#! /bin/bash

# Copyright (C) 2015 Frank Rowand
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.


usage() {

	# use spaces instead of tabs in the usage message
	cat >&2 <<eod

Usage:

   `basename $0` DTx
        decompile DTx

   `basename $0` DTx_1 DTx_2
        diff DTx_1 and DTx_2


       -f           print full dts in diff (--unified=99999)
       -h           synonym for --help
       -help        synonym for --help
      --help        print this message and exit
       -s SRCTREE   linux kernel source tree is at path SRCTREE
                        (default is current directory)
       -S           linux kernel source tree is at root of current git repo
       -u           unsorted, do not sort DTx


Each DTx is processed by the dtc compiler to produce a sorted dts source
file.  If DTx is a dts source file then it is pre-processed in the same
manner as done for the compile of the dts source file in the Linux kernel
build system ('#include' and '/include/' directives are processed).

If two DTx are provided, the resulting dts source files are diffed.

If DTx is a directory, it is treated as a DT subtree, such as
  /proc/device-tree.

If DTx contains the binary blob magic value in the first four bytes,
  it is treated as a binary blob (aka .dtb or FDT).

Otherwise DTx is treated as a dts source file (aka .dts).

   If this script is not run from the root of the linux source tree,
   and DTx utilizes '#include' or '/include/' then the path of the
   linux source tree can be provided by '-s SRCTREE' or '-S' so that
   include paths will be set properly.

   The shell variable \${ARCH} must provide the architecture containing
   the dts source file for include paths to be set properly for '#include'
   or '/include/' to be processed.

   If DTx_1 and DTx_2 are in different architectures, then this script
   may not work since \${ARCH} is part of the include path.  Two possible
   workarounds:

      `basename $0` \\
          <(ARCH=arch_of_dtx_1 `basename $0` DTx_1) \\
          <(ARCH=arch_of_dtx_2 `basename $0` DTx_2)

      `basename $0` ARCH=arch_of_dtx_1 DTx_1 >tmp_dtx_1.dts
      `basename $0` ARCH=arch_of_dtx_2 DTx_2 >tmp_dtx_2.dts
      `basename $0` tmp_dtx_1.dts tmp_dtx_2.dts
      rm tmp_dtx_1.dts tmp_dtx_2.dts

   If DTx_1 and DTx_2 are in different directories, then this script will
   add the path of DTx_1 and DTx_2 to the include paths.  If DTx_2 includes
   a local file that exists in both the path of DTx_1 and DTx_2 then the
   file in the path of DTx_1 will incorrectly be included.  Possible
   workaround:

      `basename $0` DTx_1 >tmp_dtx_1.dts
      `basename $0` DTx_2 >tmp_dtx_2.dts
      `basename $0` tmp_dtx_1.dts tmp_dtx_2.dts
      rm tmp_dtx_1.dts tmp_dtx_2.dts

eod
}


compile_to_dts() {

	dtx="$1"

	if [ -d "${dtx}" ] ; then

		# -----  input is file tree

		if ( ! ${DTC} -I fs ${dtx} ) ; then
			exit 3
		fi

	elif [ -f "${dtx}" ] && [ -r "${dtx}" ] ; then

		magic=`hexdump -n 4 -e '/1 "%02x"' ${dtx}`
		if [ "${magic}" = "d00dfeed" ] ; then

			# -----  input is FDT (binary blob)

			if ( ! ${DTC} -I dtb ${dtx} ) ; then
				exit 3
			fi

			return

		fi

		# -----  input is DTS (source)

		if ( cpp ${cpp_flags} -x assembler-with-cpp ${dtx} \
			| ${DTC} -I dts ) ; then
			return
		fi

		echo ""                                                      >&2
		echo "Possible hints to resolve the above error:"            >&2
		echo "  (hints might not fix the problem)"                   >&2

		hint_given=0

		if [ "${ARCH}" = "" ] ; then
			hint_given=1
			echo ""                                              >&2
			echo "  shell variable \$ARCH not set"               >&2
		fi

		dtx_arch=`echo "/${dtx}" | sed -e 's|.*/arch/||' -e 's|/.*||'`

		if [ "${dtx_arch}" != ""  -a "${dtx_arch}" != "${ARCH}" ] ; then
			hint_given=1
			echo ""                                              >&2
			echo "  architecture ${dtx_arch} is in file path,"   >&2
			echo "  but does not match shell variable \$ARCH"    >&2
			echo "  >>\$ARCH<< is: >>${ARCH}<<"                  >&2
		fi

		if [ ! -d ${srctree}/arch/${ARCH} ] ; then
			hint_given=1
			echo ""                                              >&2
			echo "  ${srctree}/arch/${ARCH}/ does not exist"     >&2
			echo "  Is \$ARCH='${ARCH}' correct?"                >&2
			echo "  Possible fix: use '-s' option"               >&2

			git_root=`git rev-parse --show-toplevel 2>/dev/null`
			if [ -d ${git_root}/arch/ ] ; then
				echo "  Possible fix: use '-S' option"       >&2
			fi
		fi

		if [ $hint_given = 0 ] ; then
			echo ""                                              >&2
			echo "  No hints available."                         >&2
		fi

		echo ""                                                      >&2

		exit 3

	else
		echo ""                                                     >&2
		echo "ERROR: ${dtx} does not exist or is not readable"      >&2
		echo ""                                                     >&2
		exit 2
	fi

}


# -----  start of script

cmd_diff=0
diff_flags="-u"
dtx_file_1=""
dtx_file_2=""
dtc_sort="-s"
help=0
srctree=""


while [ $# -gt 0 ] ; do

	case $1 in

	-f )
		diff_flags="--unified=999999"
		shift
		;;

	-h | -help | --help )
		help=1
		shift
		;;

	-s )
		srctree="$2"
		shift 2
		;;

	-S )
		git_root=`git rev-parse --show-toplevel 2>/dev/null`
		srctree="${git_root}"
		shift
		;;

	-u )
		dtc_sort=""
		shift
		;;

	*)
		if [ "${dtx_file_1}"  = "" ] ; then
			dtx_file_1="$1"
		elif [ "${dtx_file_2}" = "" ] ; then
			dtx_file_2="$1"
		else
			echo ""                                             >&2
			echo "ERROR: Unexpected parameter: $1"              >&2
			echo ""                                             >&2
			exit 2
		fi
		shift
		;;

	esac

done

if [ "${srctree}" = "" ] ; then
	srctree="."
fi

if [ "${dtx_file_2}" != "" ]; then
	cmd_diff=1
fi

if (( ${help} )) ; then
	usage
	exit 1
fi

# this must follow check for ${help}
if [ "${dtx_file_1}" = "" ]; then
	echo ""                                                             >&2
	echo "ERROR: parameter DTx required"                                >&2
	echo ""                                                             >&2
	exit 2
fi


# -----  prefer dtc from linux kernel, allow fallback to dtc in $PATH

if [ "${KBUILD_OUTPUT:0:2}" = ".." ] ; then
	__KBUILD_OUTPUT="${srctree}/${KBUILD_OUTPUT}"
elif [ "${KBUILD_OUTPUT}" = "" ] ; then
	__KBUILD_OUTPUT="."
else
	__KBUILD_OUTPUT="${KBUILD_OUTPUT}"
fi

DTC="${__KBUILD_OUTPUT}/scripts/dtc/dtc"

if [ ! -x ${DTC} ] ; then
	__DTC="dtc"
	if grep -q "^CONFIG_DTC=y" ${__KBUILD_OUTPUT}/.config ; then
		make_command='
         make scripts'
	else
		make_command='
         Enable CONFIG_DTC in the kernel configuration
         make scripts'
	fi
	if ( ! which ${__DTC} >/dev/null ) ; then

		# use spaces instead of tabs in the error message
		cat >&2 <<eod

ERROR: unable to find a 'dtc' program

   Preferred 'dtc' (built from Linux kernel source tree) was not found or
   is not executable.

      'dtc' is: ${DTC}

      If it does not exist, create it from the root of the Linux source tree:
${make_command}

      If not at the root of the Linux kernel source tree -s SRCTREE or -S
      may need to be specified to find 'dtc'.

      If 'O=\${dir}' is specified in your Linux builds, this script requires
      'export KBUILD_OUTPUT=\${dir}' or add \${dir}/scripts/dtc to \$PATH
      before running.

      If \${KBUILD_OUTPUT} is a relative path, then '-s SRCDIR', -S, or run
      this script from the root of the Linux kernel source tree is required.

   Fallback '${__DTC}' was also not in \${PATH} or is not executable.

eod
		exit 2
	fi
	DTC=${__DTC}
fi


# -----  cpp and dtc flags same as for linux source tree build of .dtb files,
#        plus directories of the dtx file(s)

dtx_path_1_dtc_include="-i `dirname ${dtx_file_1}`"

dtx_path_2_dtc_include=""
if (( ${cmd_diff} )) ; then
	dtx_path_2_dtc_include="-i `dirname ${dtx_file_2}`"
fi

cpp_flags="\
	-nostdinc                                  \
	-I${srctree}/arch/${ARCH}/boot/dts         \
	-I${srctree}/arch/${ARCH}/boot/dts/include \
	-I${srctree}/drivers/of/testcase-data      \
	-undef -D__DTS__"

dtc_flags="\
	-i ${srctree}/arch/${ARCH}/boot/dts/ \
	-i ${srctree}/kernel/dts             \
	${dtx_path_1_dtc_include}            \
	${dtx_path_2_dtc_include}"

DTC="${DTC} ${dtc_flags} -O dts -qq -f ${dtc_sort} -o -"


# -----  do the diff or decompile

if (( ${cmd_diff} )) ; then

	diff ${diff_flags} \
		<(compile_to_dts "${dtx_file_1}") \
		<(compile_to_dts "${dtx_file_2}")

else

	compile_to_dts "${dtx_file_1}"

fi
d class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/Kconfig</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/cops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops.c</a></td><td class='right'>1003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/cops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/cops_ffdrv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops_ffdrv.h</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/cops_ltdrv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops_ltdrv.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/ipddp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ipddp.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/ipddp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ipddp.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/ltpc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ltpc.c</a></td><td class='right'>1277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/appletalk/ltpc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ltpc.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/arc-rawmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arc-rawmode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/arc-rimi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arc-rimi.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/arcdevice.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arcdevice.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/arcnet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arcnet.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/capmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/capmode.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/com20020-isa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020-isa.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/com20020-pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020-pci.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/com20020.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/com20020_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020_cs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/com90io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com90io.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/com90xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com90xx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/rfc1051.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/rfc1051.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/arcnet/rfc1201.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/rfc1201.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/bareudp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bareudp.c</a></td><td class='right'>828</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_3ad.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_3ad.c</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_alb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_alb.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_debugfs.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_main.c</a></td><td class='right'>3305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_netlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_netlink.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_options.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_options.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_procfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_procfs.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_sysfs.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bond_sysfs_slave.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_sysfs_slave.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/bonding/bonding_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bonding_priv.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/Kconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/caif_hsi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_hsi.c</a></td><td class='right'>1469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/caif_serial.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_serial.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/caif_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_spi.c</a></td><td class='right'>874</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/caif_spi_slave.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_spi_slave.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/caif/caif_virtio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_virtio.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/Kconfig</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/at91_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/at91_can.c</a></td><td class='right'>1070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/bxcan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/bxcan.c</a></td><td class='right'>1101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/c_can.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/c_can_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can_ethtool.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/c_can_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can_main.c</a> (renamed from drivers/net/can/c_can/c_can.c)</td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/c_can_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can_pci.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/c_can/c_can_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can_platform.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/can327.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/can327.c</a></td><td class='right'>1141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/cc770/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/cc770/cc770.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/cc770/cc770.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/cc770/cc770_isa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770_isa.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/cc770/cc770_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770_platform.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/Kconfig</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/ctucanfd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/ctucanfd.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/ctucanfd_base.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/ctucanfd_base.c</a></td><td class='right'>1460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/ctucanfd_kframe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/ctucanfd_kframe.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/ctucanfd_kregs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/ctucanfd_kregs.h</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/ctucanfd_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/ctucanfd_pci.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ctucanfd/ctucanfd_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ctucanfd/ctucanfd_platform.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev.c</a></td><td class='right'>1311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/bittiming.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/bittiming.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/calc_bittiming.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/calc_bittiming.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/dev.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/length.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/length.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/netlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/netlink.c</a></td><td class='right'>1111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/rx-offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/rx-offload.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dev/skb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev/skb.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/dummy_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dummy_can.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/esd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/esd/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/esd/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/esd/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/esd/esd_402_pci-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/esd/esd_402_pci-core.c</a></td><td class='right'>515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/esd/esdacc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/esd/esdacc.c</a></td><td class='right'>769</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/esd/esdacc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/esd/esdacc.h</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/flexcan/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/flexcan/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/can/flexcan/flexcan-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/flexcan/flexcan-core.c</a> (renamed from drivers/net/can/flexcan.c)</td><td class='right'>1540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/flexcan/flexcan-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/flexcan/flexcan-ethtool.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/flexcan/flexcan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/flexcan/flexcan.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/grcan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/grcan.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ifi_canfd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ifi_canfd/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ifi_canfd/ifi_canfd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ifi_canfd/ifi_canfd.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/janz-ican3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/janz-ican3.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/kvaser_pciefd/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/kvaser_pciefd/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/kvaser_pciefd/kvaser_pciefd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/kvaser_pciefd/kvaser_pciefd.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c</a></td><td class='right'>1908</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/can/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/led.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/m_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/m_can.c</a></td><td class='right'>2589</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/m_can.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/m_can.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/m_can_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/m_can_pci.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/m_can_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/m_can_platform.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/tcan4x5x-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/tcan4x5x-core.c</a></td><td class='right'>610</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/tcan4x5x-regmap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/tcan4x5x-regmap.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/m_can/tcan4x5x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/tcan4x5x.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/mscan/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/mscan/mpc5xxx_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/mpc5xxx_can.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/mscan/mscan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/mscan.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/mscan/mscan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/mscan.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/can/pch_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/pch_can.c</a></td><td class='right'>1279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/peak_canfd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/peak_canfd/peak_canfd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/peak_canfd.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/peak_canfd/peak_canfd_user.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/peak_canfd_user.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/peak_canfd/peak_pciefd_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/peak_pciefd_main.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rcar/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rcar/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rcar/rcar_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rcar/rcar_can.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rcar/rcar_canfd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rcar/rcar_canfd.c</a></td><td class='right'>1601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/rockchip_canfd-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/rockchip_canfd-core.c</a></td><td class='right'>962</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/rockchip_canfd-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/rockchip_canfd-ethtool.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/rockchip_canfd-rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/rockchip_canfd-rx.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/rockchip_canfd-timestamp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/rockchip_canfd-timestamp.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/rockchip_canfd-tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/rockchip_canfd-tx.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rockchip/rockchip_canfd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rockchip/rockchip_canfd.h</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/can/rx-offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rx-offload.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/Kconfig</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/ems_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/ems_pci.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/ems_pcmcia.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/ems_pcmcia.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/f81601.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/f81601.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/kvaser_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/kvaser_pci.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/peak_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/peak_pci.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/peak_pcmcia.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/peak_pcmcia.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/plx_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/plx_pci.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/sja1000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/sja1000.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/sja1000_isa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000_isa.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/sja1000_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000_platform.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sja1000/tscan1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/tscan1.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/can/slcan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/slcan.c</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/slcan/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/slcan/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/slcan/slcan-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/slcan/slcan-core.c</a></td><td class='right'>953</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/slcan/slcan-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/slcan/slcan-ethtool.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/slcan/slcan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/slcan/slcan.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/softing/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/softing/softing_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_cs.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/softing/softing_fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_fw.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/softing/softing_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_main.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/softing/softing_platform.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_platform.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/hi311x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/hi311x.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251x.c</a></td><td class='right'>809</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c</a></td><td class='right'>2417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/spi/mcp251xfd/mcp251xfd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251xfd/mcp251xfd.h</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/sun4i_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sun4i_can.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/ti_hecc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ti_hecc.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/Kconfig</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/ems_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/ems_usb.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/esd_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/esd_usb.c</a></td><td class='right'>1398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/esd_usb2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/esd_usb2.c</a></td><td class='right'>1141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es581_4.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es581_4.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es581_4.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es581_4.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es58x_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es58x_core.c</a></td><td class='right'>2272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es58x_core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es58x_core.h</a></td><td class='right'>750</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es58x_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es58x_devlink.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es58x_fd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es58x_fd.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/etas_es58x/es58x_fd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/etas_es58x/es58x_fd.h</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/f81604.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/f81604.c</a></td><td class='right'>1204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/gs_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/gs_usb.c</a></td><td class='right'>1416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/kvaser_usb/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/kvaser_usb/kvaser_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c</a></td><td class='right'>588</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/mcba_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/mcba_usb.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/nct6694_canfd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/nct6694_canfd.c</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/peak_usb/pcan_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb.c</a></td><td class='right'>513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/peak_usb/pcan_usb_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_core.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/peak_usb/pcan_usb_core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_core.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/peak_usb/pcan_usb_fd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_fd.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/peak_usb/pcan_usb_pro.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_pro.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/peak_usb/pcan_usb_pro.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_pro.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/ucan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/ucan.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/usb/usb_8dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/usb_8dev.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/vcan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/vcan.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/vxcan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/vxcan.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/can/xilinx_can.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/xilinx_can.c</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/Kconfig</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_common.c</a></td><td class='right'>1850</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_mdio.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_mmap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_mmap.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_priv.h</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_regs.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_serdes.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_serdes.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_serdes.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_serdes.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_spi.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/b53/b53_srab.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_srab.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/bcm_sf2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/bcm_sf2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/bcm_sf2_cfp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2_cfp.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/bcm_sf2_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2_regs.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/dsa_loop.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/dsa_loop.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/dsa_loop.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/dsa_loop.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/dsa_loop_bdinfo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/dsa_loop_bdinfo.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/Kconfig</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/hellcreek.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/hellcreek.c</a></td><td class='right'>2117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/hellcreek.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/hellcreek.h</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/hellcreek_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/hellcreek_ptp.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/hirschmann/hellcreek_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/hirschmann/hellcreek_ptp.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ks8995.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ks8995.c</a></td><td class='right'>857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lan9303-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303-core.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lan9303.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lan9303_i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303_i2c.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lan9303_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303_mdio.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/lantiq_gswip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/lantiq_gswip.c</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/lantiq_gswip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/lantiq_gswip.h</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/lantiq_gswip_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/lantiq_gswip_common.c</a></td><td class='right'>1739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/lantiq_pce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/lantiq_pce.h</a> (renamed from drivers/net/dsa/lantiq_pce.h)</td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/mxl-gsw1xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/mxl-gsw1xx.c</a></td><td class='right'>733</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/mxl-gsw1xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/mxl-gsw1xx.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/lantiq_gswip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq_gswip.c</a></td><td class='right'>1968</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/Kconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz8.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz8.c</a></td><td class='right'>2115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz8.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz8.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz8863_smi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz8863_smi.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz8_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz8_reg.h</a></td><td class='right'>850</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477.c</a></td><td class='right'>1643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477_acl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_acl.c</a></td><td class='right'>1436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477_i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_i2c.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_reg.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_spi.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz9477_tc_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_tc_flower.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_common.c</a></td><td class='right'>5505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 90.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_common.h</a></td><td class='right'>980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_dcb.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_dcb.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_priv.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_ptp.c</a></td><td class='right'>1188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_ptp.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_ptp_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_ptp_reg.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_spi.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/ksz_spi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_spi.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/lan937x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/lan937x.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/lan937x_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/lan937x_main.c</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/microchip/lan937x_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/lan937x_reg.h</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mt7530-mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mt7530-mdio.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mt7530-mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mt7530-mmio.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mt7530.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mt7530.c</a></td><td class='right'>3213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mt7530.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mt7530.h</a></td><td class='right'>592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6060.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6060.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/chip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/chip.c</a></td><td class='right'>5252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/chip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/chip.h</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/devlink.c</a></td><td class='right'>817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/devlink.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global1.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global1_atu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1_atu.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global1_vtu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1_vtu.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2.h</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global2_avb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2_avb.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/global2_scratch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2_scratch.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/hwtstamp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/hwtstamp.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/hwtstamp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/hwtstamp.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/leds.c</a></td><td class='right'>848</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/pcs-6185.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/pcs-6185.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/pcs-6352.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/pcs-6352.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/pcs-639x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/pcs-639x.c</a></td><td class='right'>970</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/phy.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/phy.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/port.c</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/port.h</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/port_hidden.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/port_hidden.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/ptp.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/ptp.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/serdes.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/serdes.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/serdes.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/serdes.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/smi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/smi.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/switchdev.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/switchdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/switchdev.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/trace.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/mv88e6xxx/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/trace.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/Kconfig</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/felix.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/felix.c</a></td><td class='right'>2463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/felix.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/felix.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/felix_vsc9959.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/felix_vsc9959.c</a></td><td class='right'>2757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/ocelot_ext.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/ocelot_ext.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/ocelot/seville_vsc9953.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/ocelot/seville_vsc9953.c</a></td><td class='right'>1027</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/ar9331.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/ar9331.c</a></td><td class='right'>1142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/qca8k-8xxx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/qca8k-8xxx.c</a></td><td class='right'>2227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/qca8k-common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/qca8k-common.c</a></td><td class='right'>1257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/qca8k-leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/qca8k-leds.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/qca8k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/qca8k.h</a></td><td class='right'>595</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca/qca8k_leds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca/qca8k_leds.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca8k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca8k.c</a></td><td class='right'>1138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/qca8k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca8k.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek-smi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek-smi.c</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek-smi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek-smi.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/Kconfig</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/realtek-mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/realtek-mdio.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/realtek-mdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/realtek-mdio.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/realtek-smi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/realtek-smi.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/realtek-smi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/realtek-smi.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/realtek.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/realtek.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl8365mb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl8365mb.c</a></td><td class='right'>2211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl8366-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl8366-core.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl8366rb-leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl8366rb-leds.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl8366rb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl8366rb.c</a></td><td class='right'>1902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl8366rb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl8366rb.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl83xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl83xx.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/realtek/rtl83xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek/rtl83xx.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/rtl8366.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/rtl8366.c</a></td><td class='right'>515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/rtl8366rb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/rtl8366rb.c</a></td><td class='right'>1453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/rzn1_a5psw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/rzn1_a5psw.c</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/rzn1_a5psw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/rzn1_a5psw.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_clocking.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_clocking.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_devlink.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_dynamic_config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_dynamic_config.c</a></td><td class='right'>1033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_dynamic_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_dynamic_config.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_ethtool.c</a></td><td class='right'>956</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_flower.c</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_main.c</a></td><td class='right'>2992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_mdio.c</a></td><td class='right'>507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_ptp.c</a></td><td class='right'>970</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_ptp.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_spi.c</a></td><td class='right'>904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_static_config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_static_config.c</a></td><td class='right'>1029</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_static_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_static_config.h</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_tas.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_tas.c</a></td><td class='right'>898</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_tas.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_tas.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_vl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_vl.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/sja1105/sja1105_vl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_vl.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/vitesse-vsc73xx-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/vitesse-vsc73xx-core.c</a></td><td class='right'>2416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/vitesse-vsc73xx-platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/vitesse-vsc73xx-platform.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/vitesse-vsc73xx-spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/vitesse-vsc73xx-spi.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/vitesse-vsc73xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/vitesse-vsc73xx.c</a></td><td class='right'>1364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/vitesse-vsc73xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/vitesse-vsc73xx.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/xrs700x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/xrs700x.c</a></td><td class='right'>860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/xrs700x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/xrs700x.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/xrs700x_i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/xrs700x_i2c.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/xrs700x_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/xrs700x_mdio.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/xrs700x/xrs700x_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/xrs700x/xrs700x_reg.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/yt921x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/yt921x.c</a></td><td class='right'>3006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/dsa/yt921x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/yt921x.h</a></td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/dummy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dummy.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/eql.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/eql.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/3c509.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c509.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/3c515.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c515.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/3c574_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c574_cs.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/3c589_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c589_cs.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/3c59x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c59x.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/typhoon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/typhoon.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/3com/typhoon.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/typhoon.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/8390.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/8390.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/8390.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/8390.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/8390p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/8390p.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/Kconfig</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/apne.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/apne.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/ax88796.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/ax88796.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/axnet_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/axnet_cs.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/etherh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/etherh.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/hydra.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/hydra.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/lib8390.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/lib8390.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/mac8390.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/mac8390.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/mcf8390.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/mcf8390.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/ne.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/ne.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/ne2k-pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/ne2k-pci.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/pcnet_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/pcnet_cs.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/smc-ultra.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/smc-ultra.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/stnic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/stnic.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/wd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/wd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/xsurf100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/xsurf100.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/8390/zorro8390.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/zorro8390.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/Kconfig</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/actions/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/actions/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/actions/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/actions/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/actions/owl-emac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/actions/owl-emac.c</a></td><td class='right'>1612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/actions/owl-emac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/actions/owl-emac.h</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/adaptec/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adaptec/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/adaptec/starfire.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adaptec/starfire.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/adi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adi/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/adi/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adi/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/adi/adin1110.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adi/adin1110.c</a></td><td class='right'>1737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aeroflex/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aeroflex/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aeroflex/greth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aeroflex/greth.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/agere/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/agere/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/agere/et131x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/agere/et131x.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/agere/et131x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/agere/et131x.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/Kconfig</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/airoha_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/airoha_eth.c</a></td><td class='right'>3180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/airoha_eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/airoha_eth.h</a></td><td class='right'>673</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/airoha_npu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/airoha_npu.c</a></td><td class='right'>783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/airoha_ppe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/airoha_ppe.c</a></td><td class='right'>1561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/airoha_ppe_debugfs.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/airoha/airoha_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/airoha/airoha_regs.h</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/alacritech/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alacritech/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/alacritech/slic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alacritech/slic.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/alacritech/slicoss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alacritech/slicoss.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/allwinner/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/allwinner/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/allwinner/sun4i-emac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/allwinner/sun4i-emac.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/allwinner/sun4i-emac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/allwinner/sun4i-emac.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/alteon/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alteon/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/alteon/acenic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alteon/acenic.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/alteon/acenic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alteon/acenic.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/altera/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/altera/altera_sgdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_sgdma.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/altera/altera_tse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_tse.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/altera/altera_tse_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_tse_ethtool.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/altera/altera_tse_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_tse_main.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/altera/altera_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_utils.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_admin_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_admin_defs.h</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_com.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_com.c</a></td><td class='right'>1512</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_com.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_com.h</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_common_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_common_defs.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_debugfs.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_debugfs.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_devlink.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_devlink.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_eth_com.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_eth_com.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_eth_com.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_eth_com.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_ethtool.c</a></td><td class='right'>805</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_netdev.c</a></td><td class='right'>2445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_netdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_netdev.h</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_phc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_phc.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_phc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_phc.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_regs_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_regs_defs.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_xdp.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amazon/ena/ena_xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_xdp.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/7990.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/7990.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/7990.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/7990.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/Kconfig</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/a2065.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/a2065.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/am79c961a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/am79c961a.c</a></td><td class='right'>766</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/am79c961a.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/am79c961a.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/amd8111e.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/amd8111e.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/amd8111e.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/amd8111e.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/ariadne.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/ariadne.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/atarilance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/atarilance.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/au1000_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/au1000_eth.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/au1000_eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/au1000_eth.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/declance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/declance.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/hplance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/hplance.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/lance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/lance.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/mvme147.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/mvme147.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/ni65.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/ni65.c</a></td><td class='right'>1249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/ni65.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/ni65.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/nmclan_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/nmclan_cs.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pcnet32.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pcnet32.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/adminq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/adminq.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/auxbus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/auxbus.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/core.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/core.h</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/debugfs.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/dev.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/devlink.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/fw.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/pds_core/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pds_core/main.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/sun3lance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/sun3lance.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/sunlance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/sunlance.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-common.h</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-dcb.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-desc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-desc.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-dev.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-drv.c</a></td><td class='right'>824</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-i2c.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-main.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-mdio.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-pci.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c</a></td><td class='right'>716</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-platform.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-pps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-pps.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-ptp.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-selftest.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe-smn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-smn.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/amd/xgbe/xgbe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe.h</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene-v2/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene-v2/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/mac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene-v2/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/main.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene-v2/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene-v2/mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/mdio.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_hw.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene/xgene_enet_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_main.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene/xgene_enet_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_main.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apple/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apple/bmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/bmac.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apple/mace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/mace.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/apple/macmace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/macmace.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/Makefile</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_common.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_filters.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_filters.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_filters.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_filters.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_hw.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_macsec.c</a></td><td class='right'>1770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_macsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_macsec.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_main.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_main.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a></td><td class='right'>1071</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_nic.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_phy.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_phy.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ptp.c</a></td><td class='right'>1415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ptp.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a></td><td class='right'>787</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ring.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_rss.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_utils.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_vec.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/aq_vec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_vec.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</a></td><td class='right'>1031</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h</a></td><td class='right'>636</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c</a></td><td class='right'>2477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aquantia/atlantic/ver.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/ver.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/emac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/emac_arc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_arc.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/emac_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_main.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/emac_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_mdio.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/arc/emac_rockchip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_rockchip.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/Kconfig</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/ax88796c_ioctl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/ax88796c_ioctl.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/ax88796c_ioctl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/ax88796c_ioctl.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/ax88796c_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/ax88796c_main.c</a></td><td class='right'>1166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/ax88796c_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/ax88796c_main.h</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/ax88796c_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/ax88796c_spi.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/asix/ax88796c_spi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/asix/ax88796c_spi.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/ag71xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/ag71xx.c</a></td><td class='right'>2035</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/alx/alx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/alx/alx.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/alx/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/alx/ethtool.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/alx/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/alx/main.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_hw.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_hw.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_main.c</a></td><td class='right'>765</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1e/atl1e.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1e/atl1e.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1e/atl1e_main.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atlx/atl1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atlx/atl1.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atlx/atl2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atlx/atl2.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/atheros/atlx/atlx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atlx/atlx.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aurora/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aurora/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aurora/nb8800.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/nb8800.c</a></td><td class='right'>1527</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/aurora/nb8800.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/nb8800.h</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/Kconfig</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/asp2/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/asp2/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/asp2/bcmasp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/asp2/bcmasp.c</a></td><td class='right'>1469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/asp2/bcmasp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/asp2/bcmasp.h</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c</a></td><td class='right'>1423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/b44.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/b44.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bcm4908_enet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcm4908_enet.c</a></td><td class='right'>798</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bcm4908_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcm4908_enet.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bcm63xx_enet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bcm63xx_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcm63xx_enet.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bcmsysport.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcmsysport.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bcmsysport.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcmsysport.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bgmac-bcma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac-bcma.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bgmac-platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac-platform.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bgmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bgmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge.h</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_auxr.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_auxr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_auxr.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_core.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_db.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_db.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_devlink.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_devlink.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c</a></td><td class='right'>1185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_netdev.c</a></td><td class='right'>2485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_netdev.h</a></td><td class='right'>454</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_resc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_resc.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_resc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_resc.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_rmem.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnge/bnge_rmem.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c</a></td><td class='right'>3183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a></td><td class='right'>13434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.2%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 76.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a></td><td class='right'>1745</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c</a></td><td class='right'>1285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a></td><td class='right'>4531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h</a></td><td class='right'>7860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.8%;'/><td class='none' style='width: 86.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c</a></td><td class='right'>1139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c</a></td><td class='right'>903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c</a></td><td class='right'>740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/cnic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/cnic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/cnic_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic_defs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/cnic_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic_if.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmgenet.c</a></td><td class='right'>2676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/genet/bcmgenet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmgenet.h</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/genet/bcmmii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmmii.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/sb1250-mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/sb1250-mac.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/tg3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/tg3.c</a></td><td class='right'>1073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/tg3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/tg3.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/broadcom/unimac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/unimac.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfa_cee.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_cee.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfa_cs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_cs.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfa_ioc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_ioc.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfa_ioc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_ioc.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfa_msgq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_msgq.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfa_msgq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_msgq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bfi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfi.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bna_enet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_enet.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bna_hw_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_hw_defs.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bna_tx_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_tx_rx.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bna_types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_types.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bnad.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bnad.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bnad_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad_debugfs.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cadence/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cadence/macb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb.h</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cadence/macb_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb_main.c</a></td><td class='right'>3196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cadence/macb_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb_pci.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cadence/macb_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb_ptp.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/calxeda/xgmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/calxeda/xgmac.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/common/cavium_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/common/cavium_ptp.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/common/cavium_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/common/cavium_ptp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn68xx_device.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/lio_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_core.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_ethtool.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/lio_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_main.c</a></td><td class='right'>708</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/liquidio_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/liquidio_common.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_console.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_console.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_device.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_device.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_device.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_droq.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_droq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_droq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_iq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_iq.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_main.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_network.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_network.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_nic.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/octeon_nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_nic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/request_manager.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/request_manager.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/liquidio/response_manager.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/response_manager.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/nic_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nic_main.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_queues.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/nicvf_queues.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_queues.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/thunder_bgx.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cavium/thunder/thunder_bgx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/thunder_bgx.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/common.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/cphy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/cphy.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/cxgb2.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/elmer0.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/elmer0.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/espi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/espi.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/espi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/espi.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/gmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/gmac.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/mv88x201x.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/my3126.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/my3126.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/pm3393.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/pm3393.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/regs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/sge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/sge.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/sge.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/sge.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/subr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/subr.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/tp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/tp.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb/vsc7326.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/vsc7326.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/adapter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/adapter.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/ael1002.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/ael1002.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/common.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/l2t.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/sge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/sge.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/t3_hw.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/version.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/version.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb3/xgmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/xgmac.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c</a></td><td class='right'>593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.h</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a></td><td class='right'>2202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c</a></td><td class='right'>722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/l2t.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/l2t.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/l2t.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/l2t.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/sched.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/sched.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/sched.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/sched.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/sge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a></td><td class='right'>1495</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/smt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/smt.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/smt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/smt.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/srq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/srq.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/srq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/srq.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a></td><td class='right'>757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_msg.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_regs.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/adapter.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/sge.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/Kconfig</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c</a></td><td class='right'>822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c</a></td><td class='right'>2271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c</a></td><td class='right'>2336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c</a></td><td class='right'>1836</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c</a></td><td class='right'>642</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/libcxgb/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cirrus/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/Kconfig</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cirrus/cs89x0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/cs89x0.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cirrus/cs89x0.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/cs89x0.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cirrus/ep93xx_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/ep93xx_eth.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cirrus/mac89x0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/mac89x0.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/cq_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/cq_desc.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/cq_enet_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/cq_enet_desc.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_api.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_api.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_clsf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_clsf.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_clsf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_clsf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_dev.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_dev.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_ethtool.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_main.c</a></td><td class='right'>1109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_pp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_pp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_pp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_pp.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_res.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_res.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_res.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_res.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_rq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_rq.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_rq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_rq.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_wq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_wq.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/enic_wq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_wq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/rq_enet_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/rq_enet_desc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_cq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_cq.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_cq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_cq.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_dev.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_dev.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_devcmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_devcmd.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_enet.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_intr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_intr.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_intr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_intr.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_nic.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_resource.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_resource.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_rq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_rq.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_rq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_rq.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_rss.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_stats.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_vic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_vic.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_vic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_vic.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_wq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_wq.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/vnic_wq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_wq.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cisco/enic/wq_enet_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/wq_enet_desc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cortina/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cortina/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cortina/gemini.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cortina/gemini.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/cortina/gemini.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cortina/gemini.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/davicom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/davicom/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/davicom/dm9000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/dm9000.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/davicom/dm9051.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/dm9051.c</a></td><td class='right'>1258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/davicom/dm9051.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/dm9051.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/21142.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/21142.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/de2104x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/de2104x.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/de4x5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/de4x5.c</a></td><td class='right'>5581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.8%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/de4x5.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/de4x5.h</a></td><td class='right'>1017</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/dmfe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/dmfe.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/eeprom.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/interrupt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/interrupt.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/media.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/media.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/pnic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/pnic.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/pnic2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/pnic2.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/timer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/timer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/tulip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/tulip.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/tulip_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/tulip_core.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/uli526x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/uli526x.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/winbond-840.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/winbond-840.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dec/tulip/xircom_cb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/xircom_cb.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dlink/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dlink/dl2k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/dl2k.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dlink/dl2k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/dl2k.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dlink/sundance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/sundance.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dnet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dnet.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/dnet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dnet.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ec_bhf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ec_bhf.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_cmds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_cmds.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_cmds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_cmds.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_hw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_main.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_roce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_roce.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/emulex/benet/be_roce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_roce.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_ethtool.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_hw.h</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_main.c</a></td><td class='right'>2715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_ptp.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_rxnfc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_rxnfc.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_selftests.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_selftests.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_tc.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/engleder/tsnep_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/engleder/tsnep_xdp.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ethoc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ethoc.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ezchip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ezchip/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ezchip/nps_enet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ezchip/nps_enet.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ezchip/nps_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ezchip/nps_enet.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/faraday/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/faraday/ftgmac100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftgmac100.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/faraday/ftgmac100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftgmac100.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/faraday/ftmac100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftmac100.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/faraday/ftmac100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftmac100.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fealnx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fealnx.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/Kconfig</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.c</a></td><td class='right'>1442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c</a></td><td class='right'>2952</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c</a></td><td class='right'>891</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c</a></td><td class='right'>3595</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpkg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpkg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpmac.c</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpmac.h</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpni.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpni.c</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpni.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpni.h</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dprtc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dprtc.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dprtc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dprtc.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpsw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpsw.c</a></td><td class='right'>1661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/dpaa2/dpsw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpsw.h</a></td><td class='right'>791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/Kconfig</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/Makefile</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc.c</a></td><td class='right'>3313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc.h</a></td><td class='right'>526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc4_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc4_debugfs.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc4_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc4_debugfs.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc4_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc4_hw.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc4_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc4_pf.c</a></td><td class='right'>1102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_cbdr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_cbdr.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_ethtool.c</a></td><td class='right'>1075</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_hw.h</a></td><td class='right'>752</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_ierb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_ierb.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_ierb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_ierb.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_mdio.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_pci_mdio.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_pf.c</a></td><td class='right'>823</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_pf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_pf.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_pf_common.c</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_pf_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_pf_common.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_ptp.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_qos.c</a></td><td class='right'>1689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/enetc_vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/enetc_vf.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/netc_blk_ctrl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/netc_blk_ctrl.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/ntmp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/ntmp.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/enetc/ntmp_private.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/enetc/ntmp_private.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fec.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fec_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fec_main.c</a></td><td class='right'>2618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fec_mpc52xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fec_mpc52xx.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fec_mpc52xx_phy.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fec_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fec_ptp.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_dtsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_dtsec.c</a></td><td class='right'>727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_dtsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_dtsec.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_keygen.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_keygen.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_keygen.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_keygen.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_mac.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_memac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_memac.c</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_memac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_memac.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_muram.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_muram.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_muram.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_muram.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_port.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_port.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_sp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_sp.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_sp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_sp.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_tgec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_tgec.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/fman_tgec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/fman_tgec.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/mac.c</a></td><td class='right'>747</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fman/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fman/mac.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/fs_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/fs_enet.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/mac-fcc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/mac-fec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/mac-fec.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/mac-scc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/mac-scc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fs_enet/mii-fec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fs_enet/mii-fec.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/fsl_pq_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/fsl_pq_mdio.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/gianfar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/gianfar.c</a></td><td class='right'>2991</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/gianfar.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/gianfar.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/gianfar_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/gianfar_ethtool.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/ucc_geth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/ucc_geth.c</a></td><td class='right'>1188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/ucc_geth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/ucc_geth.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/ucc_geth_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/ucc_geth_ethtool.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/freescale/xgmac_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/xgmac_mdio.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fujitsu/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fujitsu/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fujitsu/fmvj18x_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fujitsu/fmvj18x_cs.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funcore/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funcore/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funcore/fun_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funcore/fun_dev.c</a></td><td class='right'>833</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funcore/fun_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funcore/fun_dev.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funcore/fun_hci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funcore/fun_hci.h</a></td><td class='right'>1242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funcore/fun_queue.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funcore/fun_queue.c</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funcore/fun_queue.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funcore/fun_queue.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/fun_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/fun_port.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_devlink.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_devlink.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_ethtool.c</a></td><td class='right'>1196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_ktls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_ktls.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_ktls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_ktls.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_main.c</a></td><td class='right'>2069</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_rx.c</a></td><td class='right'>828</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_trace.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_tx.c</a></td><td class='right'>800</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/fungible/funeth/funeth_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fungible/funeth/funeth_txrx.h</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve.h</a></td><td class='right'>1346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_adminq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_adminq.c</a></td><td class='right'>1608</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_adminq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_adminq.h</a></td><td class='right'>660</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_buffer_mgmt_dqo.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_desc.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_desc_dqo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_desc_dqo.h</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_dqo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_dqo.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_ethtool.c</a></td><td class='right'>985</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_flow_rule.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_flow_rule.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_main.c</a></td><td class='right'>2983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_ptp.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_register.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_register.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_rx.c</a></td><td class='right'>1098</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_rx_dqo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_rx_dqo.c</a></td><td class='right'>1115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_tx.c</a></td><td class='right'>1042</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_tx_dqo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_tx_dqo.c</a></td><td class='right'>1615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_utils.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/google/gve/gve_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/google/gve/gve_utils.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/Kconfig</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_common.h</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_diagnose.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_ethtool.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_ethtool.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_trace.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c</a></td><td class='right'>717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hip04_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hip04_eth.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hisi_femac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hisi_femac.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hix5hd2_gmac.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hnae.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hnae.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hnae.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hnae.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_enet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_enet.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_enet.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns/hns_ethtool.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hnae3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hnae3.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hnae3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hnae3.h</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c</a></td><td class='right'>685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.h</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c</a></td><td class='right'>1159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.c</a></td><td class='right'>4832</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_enet.h</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c</a></td><td class='right'>1456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3_trace.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h</a></td><td class='right'>712</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c</a></td><td class='right'>3377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c</a></td><td class='right'>3480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c</a></td><td class='right'>10362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.6%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 81.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c</a></td><td class='right'>1193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c</a></td><td class='right'>560</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c</a></td><td class='right'>669</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c</a></td><td class='right'>1260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_trace.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_devlink.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c</a></td><td class='right'>2901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hisilicon/hns_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hisilicon/hns_mdio.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hp/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hp/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hp/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hp/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hp/hp100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hp/hp100.c</a></td><td class='right'>3037</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/hp/hp100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/hp/hp100.h</a></td><td class='right'>611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_debugfs.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_debugfs.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_dev.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_devlink.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_devlink.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_ethtool.c</a></td><td class='right'>1835</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_if.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_if.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_if.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_io.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_io.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c</a></td><td class='right'>1515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_main.c</a></td><td class='right'>923</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_port.c</a></td><td class='right'>1114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_port.h</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_rx.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_rx.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_sriov.c</a></td><td class='right'>1364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_sriov.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_tx.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic/hinic_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic/hinic_tx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c</a></td><td class='right'>915</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_common.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_common.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_csr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_csr.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_eqs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_eqs.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hw_comm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hw_comm.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hw_comm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hw_comm.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hw_intf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hw_intf.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_hwif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_hwif.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_irq.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_lld.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_lld.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_lld.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_lld.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_main.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c</a></td><td class='right'>860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_mbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_mbox.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_mgmt_interface.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_netdev_ops.c</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_nic_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_nic_dev.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_pci_id_tbl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_pci_id_tbl.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_queue_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_queue_common.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_queue_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_queue_common.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_rss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_rss.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_rss.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_rx.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_rx.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_tx.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_tx.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_wq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_wq.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/huawei/hinic3/hinic3_wq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/huawei/hinic3/hinic3_wq.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/82596.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/82596.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/ether1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/ether1.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/ether1.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/ether1.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/lasi_82596.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/lasi_82596.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/lib82596.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/lib82596.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/sni_82596.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/sni_82596.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/sun3_82586.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/sun3_82586.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/i825xx/sun3_82586.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/i825xx/sun3_82586.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ehea/ehea.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ehea/ehea.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ehea/ehea_ethtool.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ehea/ehea_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ehea/ehea_main.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ehea/ehea_qmr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ehea/ehea_qmr.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/core.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/core.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/emac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/emac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/mal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/mal.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/mal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/mal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/rgmii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/rgmii.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/tah.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/tah.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/zmii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/zmii.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/emac/zmii.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/emac/zmii.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ibmveth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ibmveth.c</a></td><td class='right'>1180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ibmveth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ibmveth.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ibmvnic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ibmvnic.c</a></td><td class='right'>3993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ibm/ibmvnic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ibm/ibmvnic.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/Kconfig</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e100.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/e1000.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/e1000.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/e1000_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/e1000_ethtool.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/e1000_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/e1000_hw.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/e1000_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/e1000_hw.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/e1000_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/e1000_main.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000/e1000_param.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000/e1000_param.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/80003es2lan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/80003es2lan.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/82571.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/82571.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/defines.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/defines.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/e1000.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/e1000.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/e1000e_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/e1000e_trace.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/ethtool.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/hw.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/ich8lan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/ich8lan.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/ich8lan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/ich8lan.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/mac.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/netdev.c</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/nvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/nvm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/param.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/param.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/phy.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/phy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/ptp.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/e1000e/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/e1000e/regs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_common.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_iov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_iov.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_main.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_mbx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_netdev.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_pci.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_pf.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_pf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_pf.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_tlv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_tlv.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_tlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_tlv.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_type.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/fm10k/fm10k_vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/fm10k/fm10k_vf.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e.h</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_adminq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_adminq.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_adminq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_adminq.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_alloc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_alloc.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_client.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_client.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_client.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_client.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_common.c</a></td><td class='right'>3293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_dcb.c</a></td><td class='right'>1165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_dcb.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c</a></td><td class='right'>778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_ddp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_ddp.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_debug.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_debugfs.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_devids.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_devids.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_devlink.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_devlink.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_diag.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_diag.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_diag.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_diag.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_ethtool.c</a></td><td class='right'>1482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_hmc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_hmc.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_hmc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_hmc.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_io.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_main.c</a></td><td class='right'>5811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.4%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 89.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_nvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_nvm.c</a></td><td class='right'>1305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_osdep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_osdep.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_prototype.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_prototype.h</a></td><td class='right'>740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_ptp.c</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_register.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_register.h</a></td><td class='right'>4582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_status.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_status.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_trace.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_txrx.c</a></td><td class='right'>1814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_txrx.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_txrx_common.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_type.h</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c</a></td><td class='right'>1903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_xsk.c</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/i40e/i40e_xsk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/i40e/i40e_xsk.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf.h</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_adminq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_adminq.c</a> (renamed from drivers/net/ethernet/intel/iavf/i40e_adminq.c)</td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_adminq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_adminq.h</a> (renamed from drivers/net/ethernet/intel/iavf/i40e_adminq.h)</td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_adminq_cmd.h</a></td><td class='right'>449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_adv_rss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_adv_rss.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_adv_rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_adv_rss.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_alloc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_alloc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_client.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_client.c</a></td><td class='right'>579</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_client.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_client.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_common.c</a></td><td class='right'>919</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_ethtool.c</a></td><td class='right'>1382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_fdir.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_fdir.c</a></td><td class='right'>927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_fdir.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_fdir.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_main.c</a></td><td class='right'>4022</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_osdep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_osdep.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_prototype.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_prototype.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_ptp.c</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_ptp.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_register.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_register.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_status.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_status.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_trace.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_txrx.c</a></td><td class='right'>1172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_txrx.h</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_type.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_types.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/iavf/iavf_virtchnl.c</a></td><td class='right'>2095</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/Makefile</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/devlink/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/devlink/devlink.c</a></td><td class='right'>2109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/devlink/devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/devlink/devlink.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/devlink/health.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/devlink/health.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/devlink/health.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/devlink/health.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/devlink/port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/devlink/port.c</a></td><td class='right'>1001</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/devlink/port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/devlink/port.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice.h</a></td><td class='right'>989</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_adapter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_adapter.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_adapter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_adapter.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_adminq_cmd.h</a></td><td class='right'>1939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_arfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_arfs.c</a></td><td class='right'>673</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_arfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_arfs.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_base.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_base.c</a></td><td class='right'>1542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_base.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_base.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_common.c</a></td><td class='right'>5791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_common.h</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_controlq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_controlq.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_controlq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_controlq.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dcb.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dcb.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dcb_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dcb_lib.c</a></td><td class='right'>1014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dcb_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dcb_lib.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dcb_nl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dcb_nl.c</a></td><td class='right'>1146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dcb_nl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dcb_nl.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ddp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ddp.c</a></td><td class='right'>2547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ddp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ddp.h</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_debugfs.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_devids.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_devids.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dpll.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dpll.c</a></td><td class='right'>3830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_dpll.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_dpll.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_eswitch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_eswitch.c</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_eswitch.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_eswitch.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_eswitch_br.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_eswitch_br.c</a></td><td class='right'>1355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_eswitch_br.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_eswitch_br.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ethtool.c</a></td><td class='right'>4739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ethtool.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c</a></td><td class='right'>2080</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_fdir.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_fdir.c</a></td><td class='right'>1298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_fdir.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_fdir.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_flex_pipe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_flex_pipe.c</a></td><td class='right'>4385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_flex_pipe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_flex_pipe.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_flex_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_flex_type.h</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_flow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_flow.c</a></td><td class='right'>3015</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_flow.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_flow.h</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_fltr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_fltr.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_fltr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_fltr.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_fw_update.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_fw_update.c</a></td><td class='right'>1069</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_fw_update.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_fw_update.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_gnss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_gnss.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_gnss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_gnss.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_hw_autogen.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_hw_autogen.h</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_hwmon.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_hwmon.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_hwmon.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_idc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_idc.c</a></td><td class='right'>440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_idc_int.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_idc_int.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_irq.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_irq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_irq.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_lag.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_lag.c</a></td><td class='right'>2784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_lag.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_lag.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_lib.c</a></td><td class='right'>4666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_lib.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_main.c</a></td><td class='right'>8642</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.3%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 84.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_nvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_nvm.c</a></td><td class='right'>1331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_nvm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_nvm.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_osdep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_osdep.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_parser.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_parser.c</a></td><td class='right'>2430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_parser.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_parser.h</a></td><td class='right'>538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_parser_rt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_parser_rt.c</a></td><td class='right'>859</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_pf_vsi_vlan_ops.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_protocol_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_protocol_type.h</a></td><td class='right'>485</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ptp.c</a></td><td class='right'>3341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ptp.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ptp_consts.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ptp_consts.h</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ptp_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ptp_hw.c</a></td><td class='right'>5968</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_ptp_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_ptp_hw.h</a></td><td class='right'>786</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_repr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_repr.c</a></td><td class='right'>549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_repr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_repr.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sbq_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sbq_cmd.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sched.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sched.c</a></td><td class='right'>3354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sched.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sched.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sf_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sf_eth.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sf_eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sf_eth.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sriov.c</a></td><td class='right'>1909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_sriov.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_status.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_status.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_switch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_switch.c</a></td><td class='right'>4981</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_switch.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_switch.h</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_tc_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_tc_lib.c</a></td><td class='right'>2349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_tc_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_tc_lib.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_trace.h</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_tspll.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_tspll.c</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_tspll.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_tspll.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_txrx.c</a></td><td class='right'>2358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_txrx.h</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_txrx_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_txrx_lib.c</a></td><td class='right'>604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_txrx_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_txrx_lib.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_type.h</a></td><td class='right'>818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_lib.c</a></td><td class='right'>1419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_lib.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_lib_private.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_mbx.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_mbx.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c</a></td><td class='right'>2927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vlan.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vlan_mode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vlan_mode.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vlan_mode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vlan_mode.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_xsk.c</a></td><td class='right'>939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/ice_xsk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/ice_xsk.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/allowlist.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/allowlist.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/allowlist.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/allowlist.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/fdir.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/fdir.c</a></td><td class='right'>2434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/fdir.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/fdir.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/queues.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/queues.c</a></td><td class='right'>975</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/queues.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/queues.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/rss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/rss.c</a></td><td class='right'>1922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/rss.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/virtchnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/virtchnl.c</a></td><td class='right'>2936</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ice/virt/virtchnl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ice/virt/virtchnl.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/Makefile</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf.h</a></td><td class='right'>1036</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_controlq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_controlq.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_controlq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_controlq.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_controlq_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_controlq_api.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_controlq_setup.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_controlq_setup.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_dev.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_devids.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_devids.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_ethtool.c</a></td><td class='right'>1799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_idc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_idc.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_lan_pf_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_lan_pf_regs.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_lan_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_lan_txrx.h</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_lan_vf_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_lan_vf_regs.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_lib.c</a></td><td class='right'>2623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_main.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_mem.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_mem.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_ptp.c</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_ptp.h</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c</a></td><td class='right'>1183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_txrx.c</a></td><td class='right'>4706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_txrx.h</a></td><td class='right'>1118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_vf_dev.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_virtchnl.c</a></td><td class='right'>4370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_virtchnl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_virtchnl.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/idpf_virtchnl_ptp.c</a></td><td class='right'>673</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/virtchnl2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/virtchnl2.h</a></td><td class='right'>1813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/virtchnl2_lan_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/virtchnl2_lan_desc.h</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/xdp.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/xdp.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/xsk.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/idpf/xsk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/idpf/xsk.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_82575.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_82575.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_82575.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_82575.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_defines.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_defines.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_hw.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_i210.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_i210.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_mac.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_mac.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_mbx.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_nvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_nvm.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_nvm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_nvm.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_phy.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/e1000_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/e1000_regs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/igb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/igb.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/igb_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/igb_ethtool.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/igb_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/igb_hwmon.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/igb_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/igb_main.c</a></td><td class='right'>1793</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/igb_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/igb_ptp.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igb/igb_xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igb/igb_xsk.c</a></td><td class='right'>562</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/ethtool.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/igbvf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/igbvf.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/mbx.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/mbx.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/netdev.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/vf.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igbvf/vf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igbvf/vf.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc.h</a></td><td class='right'>787</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_base.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_base.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_base.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_base.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_defines.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_defines.h</a></td><td class='right'>497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_diag.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_diag.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_diag.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_diag.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_dump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_dump.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_ethtool.c</a></td><td class='right'>1462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_hw.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_i225.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_i225.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_i225.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_i225.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_leds.c</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_mac.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_mac.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_main.c</a></td><td class='right'>6733</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_nvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_nvm.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_nvm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_nvm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_phy.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_phy.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_ptp.c</a></td><td class='right'>1345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_regs.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_tsn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_tsn.c</a></td><td class='right'>722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_tsn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_tsn.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_xdp.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/igc/igc_xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/igc/igc_xdp.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_ee.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_ee.c</a></td><td class='right'>580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_ee.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_ee.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_hw.c</a></td><td class='right'>1238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_hw.h</a></td><td class='right'>767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_ids.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_ids.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_main.c</a></td><td class='right'>2292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_osdep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_osdep.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgb/ixgb_param.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgb/ixgb_param.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/devlink/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/devlink/devlink.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/devlink/devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/devlink/devlink.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/devlink/region.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/devlink/region.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe.h</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_common.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_common.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c</a></td><td class='right'>4043</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c</a></td><td class='right'>887</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_fw_update.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_main.c</a></td><td class='right'>2425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_type.h</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h</a></td><td class='right'>1032</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c</a></td><td class='right'>662</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_x550.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/defines.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/defines.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/ethtool.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/ipsec.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/ipsec.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/ixgbevf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/ixgbevf.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/mbx.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/mbx.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/vf.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/ixgbevf/vf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/ixgbevf/vf.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/priv.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/rx.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/tx.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/xdp.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libeth/xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libeth/xsk.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libie/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libie/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libie/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libie/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libie/adminq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libie/adminq.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libie/fwlog.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libie/fwlog.c</a></td><td class='right'>1115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/intel/libie/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/intel/libie/rx.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/jme.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/jme.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/jme.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/jme.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/korina.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/korina.c</a></td><td class='right'>641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/lantiq_etop.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/lantiq_etop.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/lantiq_xrx200.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/lantiq_xrx200.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/litex/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/litex/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/litex/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/litex/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/litex/litex_liteeth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/litex/litex_liteeth.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/Kconfig</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mv643xx_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mv643xx_eth.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvmdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvmdio.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvneta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvneta.c</a></td><td class='right'>2224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvneta_bm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvneta_bm.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvneta_bm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvneta_bm.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2.h</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c</a></td><td class='right'>3696</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/mvpp2/mvpp2_tai.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/mvpp2/mvpp2_tai.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c</a></td><td class='right'>897</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c</a></td><td class='right'>925</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_config.h</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_cp_version.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_cp_version.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c</a></td><td class='right'>463</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_main.c</a></td><td class='right'>1693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_main.h</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_pfvf_mbox.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_regs_cnxk_pf.h</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_rx.c</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_rx.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_tx.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep/octep_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep/octep_tx.h</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cn9k.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_config.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_ethtool.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.c</a></td><td class='right'>1220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_main.h</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_mbox.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cn9k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cn9k.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cnxk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_regs_cnxk.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.c</a></td><td class='right'>511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_rx.h</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_tx.h</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cgx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cgx.c</a></td><td class='right'>1657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cgx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cgx.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cgx_fw_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cgx_fw_if.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/api.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/mbox_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/mbox_init.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/nix.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/nix.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/npa.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/reg.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/cn20k/struct.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/cn20k/struct.h</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/common.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mbox.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mbox.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mbox.h</a></td><td class='right'>1756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mcs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mcs.c</a></td><td class='right'>1617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mcs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mcs.h</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mcs_cnf10kb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mcs_cnf10kb.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mcs_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mcs_reg.h</a></td><td class='right'>1129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c</a></td><td class='right'>932</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/npc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/npc.h</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h</a></td><td class='right'>17028</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 23.7%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 70.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/ptp.c</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/ptp.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rpm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rpm.c</a></td><td class='right'>812</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rpm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rpm.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu.c</a></td><td class='right'>1684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu.h</a></td><td class='right'>997</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c</a></td><td class='right'>978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c</a></td><td class='right'>584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c</a></td><td class='right'>4038</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c</a></td><td class='right'>1637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c</a></td><td class='right'>5025</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.6%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c</a></td><td class='right'>2280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c</a></td><td class='right'>1818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c</a></td><td class='right'>2036</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_rep.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_sdp.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h</a></td><td class='right'>872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_switch.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/Makefile</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.c</a></td><td class='right'>1042</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn10k_macsec.c</a></td><td class='right'>1815</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c</a></td><td class='right'>2158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h</a></td><td class='right'>1224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_devlink.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_dmac_flt.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c</a></td><td class='right'>1482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c</a></td><td class='right'>1526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c</a></td><td class='right'>3566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_ptp.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_reg.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_struct.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_struct.h</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c</a></td><td class='right'>1670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c</a></td><td class='right'>1584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c</a></td><td class='right'>884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/otx2_xsk.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/qos.c</a></td><td class='right'>1774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/qos.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/qos_sq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/qos_sq.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/rep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/rep.c</a></td><td class='right'>879</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/octeontx2/nic/rep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/octeontx2/nic/rep.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera.h</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_acl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_acl.c</a></td><td class='right'>927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_acl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_acl.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_counter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_counter.c</a></td><td class='right'>474</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_counter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_counter.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_devlink.c</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_devlink.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_dsa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_dsa.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_dsa.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_dsa.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_ethtool.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_ethtool.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_flow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_flow.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_flow.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_flow.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_flower.c</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_flower.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_flower.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_hw.c</a></td><td class='right'>2552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_hw.h</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_main.c</a></td><td class='right'>1526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_matchall.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_matchall.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_matchall.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_matchall.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_pci.c</a></td><td class='right'>979</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_router.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_router.c</a></td><td class='right'>1645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_router_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_router_hw.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_router_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_router_hw.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_rxtx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_rxtx.c</a></td><td class='right'>829</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_rxtx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_rxtx.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_span.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_span.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_span.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_span.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_switchdev.c</a></td><td class='right'>1918</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/prestera/prestera_switchdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/prestera/prestera_switchdev.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/pxa168_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/pxa168_eth.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/skge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/skge.c</a></td><td class='right'>188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/skge.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/skge.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/sky2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/sky2.c</a></td><td class='right'>428</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/marvell/sky2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/marvell/sky2.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_eth_path.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_eth_path.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_eth_soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_eth_soc.c</a></td><td class='right'>4599</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 92.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_eth_soc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_eth_soc.h</a></td><td class='right'>1207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_ppe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_ppe.c</a></td><td class='right'>1110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_ppe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_ppe.h</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_ppe_offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_ppe_offload.c</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_ppe_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_ppe_regs.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_star_emac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_star_emac.c</a></td><td class='right'>1761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed.c</a></td><td class='right'>2902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed_debugfs.c</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed_mcu.c</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed_ops.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed_regs.h</a></td><td class='right'>815</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed_wo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed_wo.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mediatek/mtk_wed_wo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mediatek/mtk_wed_wo.h</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/alloc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/alloc.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/catas.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/catas.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/cmd.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/cq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/cq.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/crdump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/crdump.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_clock.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_clock.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_cq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_cq.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_ethtool.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_main.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_netdev.c</a></td><td class='right'>577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_port.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_rx.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/en_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/en_tx.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/eq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/eq.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/fw.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/fw.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/fw_qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/fw_qos.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/icm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/icm.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/intf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/intf.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/main.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/mcg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/mcg.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/mlx4.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/mlx4.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/mlx4_en.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/mr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/mr.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/port.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/qp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/qp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/resource_tracker.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx4/srq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx4/srq.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/Kconfig</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/Makefile</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/accel/accel.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/accel/accel.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/alloc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/alloc.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/cmd.c</a></td><td class='right'>1317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/cq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/cq.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/debugfs.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/dev.c</a></td><td class='right'>638</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/devlink.c</a></td><td class='right'>1049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/devlink.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/cmd_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/cmd_tracepoint.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/crdump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/crdump.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/en_rep_tracepoint.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/en_tc_tracepoint.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/dpll.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/dpll.c</a></td><td class='right'>552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ecpf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/ecpf.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ecpf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/ecpf.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en.h</a></td><td class='right'>1093</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/channels.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/channels.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/channels.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/channels.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/devlink.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/devlink.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/dim.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/dim.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/fs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/fs.h</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/fs_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/fs_ethtool.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.c</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/fs_tt_redirect.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/health.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/health.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/health.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/health.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/htb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/htb.c</a></td><td class='right'>722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/htb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/htb.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/mapping.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/mapping.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/mod_hdr.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/params.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/params.c</a></td><td class='right'>1256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/params.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/params.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/pcie_cong_event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/pcie_cong_event.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/pcie_cong_event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/pcie_cong_event.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/port.c</a></td><td class='right'>556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/port.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c</a></td><td class='right'>1049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/qos.c</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/qos.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c</a></td><td class='right'>764</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/reporter.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c</a></td><td class='right'>690</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rss.c</a></td><td class='right'>717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rss.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/selq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/selq.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/selq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/selq.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/csum.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/csum.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/drop.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/drop.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mark.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mark.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred_nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mirred_nic.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mpls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/mpls.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/pedit.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/police.c</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ptype.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ptype.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/redirect_ingress.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/redirect_ingress.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/sample.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/tun.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/tun.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan_mangle.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/vlan_mangle.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/act_stats.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_dmfs.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_hmfs.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.c</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/int_port.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.c</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/meter.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_act.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/post_meter.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c</a></td><td class='right'>2538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c</a></td><td class='right'>1075</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c</a></td><td class='right'>1891</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_gre.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_mplsoudp.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tir.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/tir.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/trap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/trap.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/trap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/trap.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c</a></td><td class='right'>829</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en/xsk/tx.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c</a></td><td class='right'>1362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c</a></td><td class='right'>2922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c</a> (renamed from drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_stats.c)</td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_utils.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.c</a></td><td class='right'>1800</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.c</a></td><td class='right'>1155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/psp_rxtx.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_common.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_dim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_dim.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c</a></td><td class='right'>1726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_fs.c</a></td><td class='right'>1531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_main.c</a></td><td class='right'>6228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 89.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_rep.c</a></td><td class='right'>2328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_rep.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_rx.c</a></td><td class='right'>2272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.c</a></td><td class='right'>2307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_stats.h</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_tc.c</a></td><td class='right'>6030</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_tc.h</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_tx.c</a></td><td class='right'>1010</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/eq.c</a></td><td class='right'>1080</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/Makefile</a> (renamed from drivers/net/ethernet/mellanox/mlx5/core/accel/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_ofld.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/lgcy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/lgcy.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ofld.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/adj_vport.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/adj_vport.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c</a></td><td class='right'>1955</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_debugfs.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_mcast.c</a></td><td class='right'>1134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/bridge_priv.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/diag/qos_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/diag/qos_tracepoint.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec.c</a></td><td class='right'>369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c</a></td><td class='right'>2107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/esw/vporttbl.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.c</a></td><td class='right'>2773</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/eswitch.h</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c</a></td><td class='right'>4992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/events.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/events.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/core.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/core.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.c</a></td><td class='right'>1536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/ipsec.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c</a></td><td class='right'>763</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.c</a></td><td class='right'>2491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_core.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_ft_pool.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fw.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c</a></td><td class='right'>910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/health.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/health.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/hwmon.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/hwmon.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/hwmon.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/irq_affinity.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag.c</a></td><td class='right'>770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c</a></td><td class='right'>1806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/mp.h</a> (renamed from drivers/net/ethernet/mellanox/mlx5/core/lag_mp.h)</td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag/port_sel.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/aso.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c</a></td><td class='right'>1453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/clock.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c</a></td><td class='right'>774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/devcom.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/dm.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/events.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/events.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c</a></td><td class='right'>813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c</a></td><td class='right'>1140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/hv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/hv.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/hv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/hv.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c</a></td><td class='right'>875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c</a></td><td class='right'>2409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/nv_param.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/nv_param.c</a></td><td class='right'>799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/nv_param.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/nv_param.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/pci_vsc.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/port_tun.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/sd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/sd.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/sf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/sf.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/smfs.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/st.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/st.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/tout.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/tout.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/tout.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/lib/vxlan.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/main.c</a></td><td class='right'>1658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/mcg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/mcg.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/mr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/mr.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c</a></td><td class='right'>833</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/pci_irq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/pci_irq.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/pd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/pd.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/port.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/qos.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/qos.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/qp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/qp.c</a></td><td class='right'>737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/rdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/rdma.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/rdma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/rdma.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/rl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/rl.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/cmd.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/dev/diag/dev_tracepoint.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/diag/sf_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/diag/sf_tracepoint.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/diag/vhca_tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/diag/vhca_tracepoint.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/priv.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sf/vhca_event.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/sriov.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/Makefile</a> (renamed from drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/Makefile</a> (renamed from drivers/net/ethernet/mellanox/mlx5/core/en/Makefile)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c</a></td><td class='right'>2651</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.h</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action_ste_pool.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/buddy.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.c</a></td><td class='right'>1101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/bwc_complex.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c</a></td><td class='right'>1219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.h</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/context.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/debug.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.c</a></td><td class='right'>2329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/definer.h</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c</a></td><td class='right'>1641</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws_pools.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/internal.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.c</a></td><td class='right'>1293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/matcher.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h</a></td><td class='right'>941</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.c</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pat_arg.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/pool.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/prm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/prm.h</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.c</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/rule.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c</a></td><td class='right'>1358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.h</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.c</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/table.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/hws/vport.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_action.c</a></td><td class='right'>2245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_arg.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_buddy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_buddy.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_cmd.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.c</a></td><td class='right'>1186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_dbg.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_definer.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_domain.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_fw.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_icm_pool.c</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_matcher.c</a></td><td class='right'>1108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ptrn.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_rule.c</a></td><td class='right'>1377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_send.c</a></td><td class='right'>1318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.c</a></td><td class='right'>1465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v0.c</a></td><td class='right'>1964</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.c</a></td><td class='right'>2212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v1.h</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v2.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_ste_v3.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_table.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_types.h</a></td><td class='right'>1598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.c</a></td><td class='right'>885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/fs_dr.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr.h</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr_ste_v1.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5_ifc_dr_ste_v1.h</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5dr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/steering/sws/mlx5dr.h</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/transobj.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/transobj.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/uar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/uar.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/vport.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/vport.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/wc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/wc.c</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/wq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/wq.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlx5/core/wq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlx5/core/wq.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_ethtool.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_intr.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_tx.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/mlxfw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/mlxfw.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/mlxfw_fsm.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_format.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/Kconfig</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/cmd.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core.c</a></td><td class='right'>1860</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core.h</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c</a></td><td class='right'>1183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_env.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_env.c</a></td><td class='right'>1408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_env.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_env.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_linecard_dev.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_linecards.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_linecards.c</a></td><td class='right'>1604</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/core_thermal.c</a></td><td class='right'>999</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/emad.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/emad.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/i2c.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/ib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/ib.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/item.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/item.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/minimal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/minimal.c</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/pci.c</a></td><td class='right'>1432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/pci_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/pci_hw.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/port.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/reg.h</a></td><td class='right'>4104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/resources.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/resources.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum.c</a></td><td class='right'>5718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.5%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum.h</a></td><td class='right'>919</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum1_kvdl.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum2_kvdl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c</a></td><td class='right'>598</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c</a></td><td class='right'>2121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c</a></td><td class='right'>1847</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_flow.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_kvdl.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_matchall.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_mr_tcam.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_pgt.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_policer.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c</a></td><td class='right'>1687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c</a></td><td class='right'>2041</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c</a></td><td class='right'>7268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.6%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c</a></td><td class='right'>1279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c</a></td><td class='right'>2043</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c</a></td><td class='right'>1994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/switchib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/switchib.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/switchx2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/switchx2.c</a></td><td class='right'>1706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/trap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/trap.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mellanox/mlxsw/txheader.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mellanox/mlxsw/txheader.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/Makefile</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic.h</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_csr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_csr.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_csr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_csr.h</a></td><td class='right'>1201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_devlink.c</a></td><td class='right'>668</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_drvinfo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_drvinfo.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c</a></td><td class='right'>1924</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_fw.c</a></td><td class='right'>1920</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_fw.h</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_fw_log.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_fw_log.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.c</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_irq.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_mac.c</a></td><td class='right'>934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_mac.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_mdio.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_netdev.c</a></td><td class='right'>857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_netdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_netdev.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_pci.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_phylink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_phylink.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_rpc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_rpc.c</a></td><td class='right'>1246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_rpc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_rpc.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_time.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_time.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_tlv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_tlv.c</a></td><td class='right'>560</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_tlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_tlv.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_txrx.c</a></td><td class='right'>2930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/meta/fbnic/fbnic_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/meta/fbnic/fbnic_txrx.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8695net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8695net.c</a></td><td class='right'>1632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8695net.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8695net.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8842.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8842.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8851.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8851.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8851_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8851_common.c</a> (renamed from drivers/net/ethernet/micrel/ks8851.c)</td><td class='right'>919</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8851_mll.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8851_mll.c</a></td><td class='right'>1381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8851_par.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8851_par.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ks8851_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ks8851_spi.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/micrel/ksz884x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/micrel/ksz884x.c</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/enc28j60.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/enc28j60.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/encx24j600-regmap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/encx24j600-regmap.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/encx24j600.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/encx24j600.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/encx24j600_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/encx24j600_hw.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/fdma/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/fdma/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/fdma/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/fdma/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/fdma/fdma_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/fdma/fdma_api.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/fdma/fdma_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/fdma/fdma_api.h</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan743x_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan743x_ethtool.c</a></td><td class='right'>789</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan743x_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan743x_ethtool.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan743x_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan743x_main.c</a></td><td class='right'>1969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan743x_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan743x_main.h</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan743x_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan743x_ptp.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan743x_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan743x_ptp.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan865x/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan865x/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan865x/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan865x/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan865x/lan865x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan865x/lan865x.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_cbs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_cbs.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_dcb.c</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_ethtool.c</a></td><td class='right'>716</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_ets.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_ets.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_fdb.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_fdma.c</a></td><td class='right'>982</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_goto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_goto.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_ifh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_ifh.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_lag.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_lag.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_mac.c</a></td><td class='right'>592</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_main.c</a></td><td class='right'>1327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_main.h</a></td><td class='right'>746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_mdb.c</a></td><td class='right'>551</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_mirror.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_mirror.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_mqprio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_mqprio.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_phylink.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_police.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_police.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_port.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_ptp.c</a></td><td class='right'>1133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_regs.h</a></td><td class='right'>1888</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c</a></td><td class='right'>665</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_taprio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_taprio.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_tbf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_tbf.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_tc.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_tc_flower.c</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_tc_matchall.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_tc_matchall.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.c</a></td><td class='right'>3270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_vcap_ag_api.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_vcap_debugfs.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_vcap_impl.c</a></td><td class='right'>784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_vlan.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/lan966x/lan966x_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/lan966x/lan966x_xdp.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/Makefile</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_calendar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_calendar.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_fdma.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_regs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_regs.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_rgmii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_rgmii.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_ag_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_ag_api.c</a></td><td class='right'>3843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_impl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_impl.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c</a></td><td class='right'>1280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_main.c</a></td><td class='right'>1143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_main.h</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h</a></td><td class='right'>8258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_mirror.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_mirror.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_packet.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_pgid.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_police.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_police.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_pool.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_port.c</a></td><td class='right'>1424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_port.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_psfp.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c</a></td><td class='right'>696</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_qos.c</a></td><td class='right'>583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_qos.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_regs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_regs.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_regs.h</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_sdlb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_sdlb.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_tc.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_tc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_tc.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_tc_flower.c</a></td><td class='right'>1581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_tc_matchall.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.c</a></td><td class='right'>3874</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vcap_ag_api.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.c</a></td><td class='right'>471</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vcap_debugfs.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.c</a></td><td class='right'>2101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vcap_impl.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/Kconfig</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_ag_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_ag_api.h</a></td><td class='right'>906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api.c</a></td><td class='right'>3611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api.h</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api_client.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api_client.h</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api_debugfs.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api_debugfs_kunit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api_debugfs_kunit.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c</a></td><td class='right'>2352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_api_private.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_api_private.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_model_kunit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_model_kunit.c</a></td><td class='right'>4062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_model_kunit.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_model_kunit.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_tc.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microchip/vcap/vcap_tc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microchip/vcap/vcap_tc.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/gdma_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/gdma_main.c</a></td><td class='right'>2238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/hw_channel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/hw_channel.c</a></td><td class='right'>926</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/mana_bpf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/mana_bpf.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/mana_en.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/mana_en.c</a></td><td class='right'>3724</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/mana_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/mana_ethtool.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/microsoft/mana/shm_channel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/microsoft/mana/shm_channel.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/moxa/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/moxa/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/moxa/moxart_ether.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/moxa/moxart_ether.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot.c</a></td><td class='right'>3718</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot.h</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_ana.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_ana.h</a></td><td class='right'>625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_board.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_board.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_dev.h</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_devlink.c</a></td><td class='right'>916</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_fdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_fdma.c</a></td><td class='right'>892</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_fdma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_fdma.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_flower.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_flower.c</a></td><td class='right'>1042</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_io.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_mm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_mm.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_mrp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_mrp.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_net.c</a></td><td class='right'>1889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_police.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_police.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_police.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_police.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_ptp.c</a></td><td class='right'>912</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_qsys.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_qsys.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_regs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_regs.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_stats.c</a></td><td class='right'>1026</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_sys.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_sys.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_vcap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_vcap.c</a></td><td class='right'>1433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_vcap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_vcap.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/ocelot_vsc7514.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/ocelot_vsc7514.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mscc/vsc7514_regs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mscc/vsc7514_regs.c</a></td><td class='right'>685</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/Kconfig</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_chip.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_hw.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_main.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/mucse/rnpgbe/rnpgbe_mbx_fw.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/myricom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/myricom/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/myricom/myri10ge/myri10ge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/myricom/myri10ge/myri10ge.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/jazzsonic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/jazzsonic.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/macsonic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/macsonic.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/natsemi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/natsemi.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/ns83820.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/ns83820.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/sonic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/sonic.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/sonic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/sonic.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/natsemi/xtsonic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/natsemi/xtsonic.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/s2io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/s2io.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/s2io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/s2io.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-config.c</a></td><td class='right'>5104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.9%;'/><td class='none' style='width: 91.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-config.h</a></td><td class='right'>2091</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-ethtool.c</a></td><td class='right'>1154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-ethtool.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-main.c</a></td><td class='right'>4848</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.5%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-main.h</a></td><td class='right'>518</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-reg.h</a></td><td class='right'>4636</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-traffic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-traffic.c</a></td><td class='right'>2446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-traffic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-traffic.h</a></td><td class='right'>2290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/neterion/vxge/vxge-version.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/neterion/vxge/vxge-version.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/abm/cls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/abm/cls.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/abm/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/abm/main.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/abm/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/abm/main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/abm/qdisc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/abm/qdisc.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/cmsg.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/fw.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/jit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/jit.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/main.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/main.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/offload.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/bpf/verifier.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/bpf/verifier.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/ccm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/ccm.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/ccm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/ccm.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/ccm_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/ccm_mbox.c</a></td><td class='right'>743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/crypto/crypto.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/crypto/crypto.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/crypto/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/crypto/fw.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/crypto/ipsec.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/crypto/tls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/crypto/tls.c</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/devlink_param.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/devlink_param.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/action.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/action.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/cmsg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/cmsg.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/cmsg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/cmsg.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/conntrack.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/conntrack.c</a></td><td class='right'>2300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/conntrack.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/conntrack.h</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/lag_conf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/lag_conf.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/main.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/main.h</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/match.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/match.c</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/metadata.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/metadata.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/offload.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/offload.c</a></td><td class='right'>1007</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/qos_conf.c</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c</a></td><td class='right'>965</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfd3/dp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfd3/dp.c</a></td><td class='right'>1413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfd3/rings.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfd3/rings.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfd3/xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfd3/xsk.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfdk/dp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfdk/dp.c</a></td><td class='right'>1575</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfdk/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfdk/ipsec.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfdk/nfdk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfdk/nfdk.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfdk/rings.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfdk/rings.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_app.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_app.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_app.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_app.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_asm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_asm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_devlink.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_hwmon.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_main.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_main.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net.h</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_common.c</a></td><td class='right'>2982</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_debugdump.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_dp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_dp.c</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_dp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_dp.h</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c</a></td><td class='right'>1443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_main.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_repr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_repr.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_repr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_repr.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_xsk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_xsk.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_net_xsk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_net_xsk.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_port.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfp_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfp_port.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/crc32.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpplib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cpplib.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_dev.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_hwinfo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nffw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nic/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nic/dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nic/dcb.c</a></td><td class='right'>571</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nic/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nic/main.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netronome/nfp/nic/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netronome/nfp/nic/main.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/netx-eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/netx-eth.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ni/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ni/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ni/nixge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ni/nixge.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nuvoton/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nuvoton/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nuvoton/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nuvoton/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nuvoton/w90p910_ether.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nuvoton/w90p910_ether.c</a></td><td class='right'>1086</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nvidia/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nvidia/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nvidia/forcedeth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nvidia/forcedeth.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nxp/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nxp/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/nxp/lpc_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/nxp/lpc_eth.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oa_tc6.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oa_tc6.c</a></td><td class='right'>1369</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_phy.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/packetengines/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/packetengines/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/packetengines/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/packetengines/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/packetengines/hamachi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/packetengines/hamachi.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/packetengines/yellowfin.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/packetengines/yellowfin.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pasemi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pasemi/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pasemi/pasemi_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pasemi/pasemi_mac.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pasemi/pasemi_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pasemi/pasemi_mac.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pasemi/pasemi_mac_ethtool.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_api.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_aux.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_aux.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_aux.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_aux.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_bus.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_bus.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c</a></td><td class='right'>540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_debugfs.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_debugfs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_dev.c</a></td><td class='right'>1078</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_dev.h</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_devlink.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_devlink.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_ethtool.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_ethtool.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_fw.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_if.h</a></td><td class='right'>3400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_lif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_lif.c</a></td><td class='right'>4108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_lif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_lif.h</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_main.c</a></td><td class='right'>802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_phc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_phc.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_regs.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_rx_filter.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_stats.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_stats.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_txrx.c</a></td><td class='right'>1847</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/pensando/ionic/ionic_txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/pensando/ionic/ionic_txrx.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/netxen/netxen_nic.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/Makefile</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed.h</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_chain.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_chain.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_cxt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_cxt.c</a></td><td class='right'>596</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_cxt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_cxt.h</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_dbg_hsi.h</a></td><td class='right'>1460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_dcbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_dcbx.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_dcbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_dcbx.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_debug.c</a></td><td class='right'>4989</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 91.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_debug.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_dev.c</a></td><td class='right'>2230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_dev_api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_dev_api.h</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_devlink.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_devlink.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_fcoe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_fcoe.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_fcoe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_fcoe.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_hsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_hsi.h</a></td><td class='right'>13798</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.9%;'/><td class='rem' style='width: 14.3%;'/><td class='none' style='width: 75.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_hw.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_hw.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c</a></td><td class='right'>1146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_init_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_init_ops.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_init_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_init_ops.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_int.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_int.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_int.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_int.h</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_iro_hsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_iro_hsi.h</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_iscsi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_iscsi.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_iscsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_iscsi.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_iwarp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_iwarp.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_iwarp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_iwarp.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_l2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_l2.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_l2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_l2.h</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_ll2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_ll2.c</a></td><td class='right'>863</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_ll2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_ll2.h</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_main.c</a></td><td class='right'>1241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_mcp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_mcp.c</a></td><td class='right'>799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_mcp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_mcp.h</a></td><td class='right'>1019</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_mfw_hsi.h</a></td><td class='right'>2475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_nvmetcp.c</a></td><td class='right'>829</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_nvmetcp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_nvmetcp.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_nvmetcp_fw_funcs.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_ooo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_ooo.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_ooo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_ooo.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_ptp.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_ptp.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_rdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_rdma.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_rdma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_rdma.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_reg_addr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_reg_addr.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_roce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_roce.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_roce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_roce.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_selftest.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_selftest.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_selftest.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_selftest.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_sp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_sp.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_sp_commands.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_spq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_spq.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_sriov.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_sriov.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_vf.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qed/qed_vf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qed/qed_vf.h</a></td><td class='right'>342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede.h</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_dcbnl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_dcbnl.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_ethtool.c</a></td><td class='right'>991</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_filter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_filter.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_fp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_fp.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_main.c</a></td><td class='right'>747</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_ptp.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_ptp.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qede/qede_rdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qede/qede_rdma.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qla3xxx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qla3xxx.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qla3xxx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qla3xxx.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlge/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlge/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlge/qlge.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlge/qlge.h</a></td><td class='right'>2353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_dbg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlge/qlge_dbg.c</a></td><td class='right'>2024</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c</a></td><td class='right'>735</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlge/qlge_main.c</a></td><td class='right'>5027</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qlogic/qlge/qlge_mpi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qlogic/qlge/qlge_mpi.c</a></td><td class='right'>1285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/emac/emac-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/emac/emac-ethtool.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/emac/emac-mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/emac/emac-mac.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/emac/emac-mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/emac/emac-mac.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/emac/emac-sgmii.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/emac/emac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/emac/emac.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe_config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe_config.c</a></td><td class='right'>2034</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe_config.h</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe_debugfs.c</a></td><td class='right'>847</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe_debugfs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/ppe/ppe_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/ppe/ppe_regs.h</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_7k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_7k.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_7k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_7k.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_7k_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_7k_common.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_7k_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_7k_common.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_debug.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_debug.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_spi.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_spi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_spi.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/qca_uart.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/qca_uart.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_map_data.c</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rdc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rdc/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rdc/r6040.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rdc/r6040.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/8139cp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/8139cp.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/8139too.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/8139too.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/Kconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/atp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/atp.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/atp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/atp.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169.c</a></td><td class='right'>7361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.9%;'/><td class='none' style='width: 87.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169_firmware.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169_firmware.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169_firmware.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169_firmware.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169_leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169_leds.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169_main.c</a></td><td class='right'>5620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/r8169_phy_config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/r8169_phy_config.c</a></td><td class='right'>1354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/rtase/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/rtase/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/rtase/rtase.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/rtase/rtase.h</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/realtek/rtase/rtase_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/realtek/rtase/rtase_main.c</a></td><td class='right'>2400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/ravb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/ravb.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/ravb_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/ravb_main.c</a></td><td class='right'>2436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/ravb_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/ravb_ptp.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rcar_gen4_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rcar_gen4_ptp.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rcar_gen4_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rcar_gen4_ptp.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rswitch.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rswitch.h</a></td><td class='right'>1074</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rswitch_l2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rswitch_l2.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rswitch_l2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rswitch_l2.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rswitch_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rswitch_main.c</a></td><td class='right'>2295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rtsn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rtsn.c</a></td><td class='right'>1371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/rtsn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/rtsn.h</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/sh_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/sh_eth.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/renesas/sh_eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/renesas/sh_eth.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rocker/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rocker/Kconfig</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rocker/rocker.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rocker/rocker.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rocker/rocker_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rocker/rocker_hw.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rocker/rocker_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rocker/rocker_main.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/rocker/rocker_ofdpa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/rocker/rocker_ofdpa.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_core.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_desc.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_dma.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/samsung/sxgbe/sxgbe_reg.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/seeq/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/seeq/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/seeq/ether3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/seeq/ether3.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/seeq/ether3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/seeq/ether3.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/seeq/sgiseeq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/seeq/sgiseeq.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/Kconfig</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/bitfield.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/bitfield.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef10.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef10.c</a></td><td class='right'>3818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100.c</a></td><td class='right'>558</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_ethtool.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_ethtool.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_netdev.c</a></td><td class='right'>532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_netdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_netdev.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_nic.c</a></td><td class='right'>1386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_nic.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_regs.h</a></td><td class='right'>730</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_rep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_rep.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_rep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_rep.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_rx.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_rx.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_sriov.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_sriov.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_tx.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef100_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef100_tx.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef10_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef10_regs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef10_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef10_sriov.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ef10_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ef10_sriov.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx.c</a></td><td class='right'>3165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_channels.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_channels.c</a></td><td class='right'>1352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_channels.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_channels.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_common.c</a></td><td class='right'>1404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_common.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_devlink.c</a></td><td class='right'>746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_devlink.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_reflash.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_reflash.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/efx_reflash.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/efx_reflash.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/enum.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/enum.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ethtool.c</a></td><td class='right'>1397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ethtool_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ethtool_common.c</a></td><td class='right'>1329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ethtool_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ethtool_common.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/bitfield.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/bitfield.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/efx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/efx.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/efx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/efx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/enum.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/enum.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/ethtool.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/falcon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/falcon.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/falcon_boards.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/falcon_boards.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/farch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/farch.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/farch_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/farch_regs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/filter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/filter.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/io.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/mdio_10g.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/mdio_10g.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/mdio_10g.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/mdio_10g.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/mtd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/mtd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/net_driver.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/net_driver.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/nic.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/nic.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/phy.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/qt202x_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/qt202x_phy.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/rx.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/selftest.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/selftest.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/selftest.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/selftest.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/tenxpress.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/tenxpress.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/tx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/tx.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/txc43128_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/txc43128_phy.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/falcon/workarounds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/falcon/workarounds.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/filter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/filter.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/fw_formats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/fw_formats.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/io.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mae.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mae.c</a></td><td class='right'>2338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mae.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mae.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mae_counter_format.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mae_counter_format.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_filters.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_filters.c</a></td><td class='right'>2308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_filters.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_filters.h</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_functions.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_functions.c</a></td><td class='right'>431</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_functions.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_functions.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_mon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_mon.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_pcol.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_pcol.h</a></td><td class='right'>22104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 28.7%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 61.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_pcol_mae.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_pcol_mae.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_port.c</a></td><td class='right'>1323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_port.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_port_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_port_common.c</a></td><td class='right'>1288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mcdi_port_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mcdi_port_common.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/mtd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/mtd.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/net_driver.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/net_driver.h</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/nic.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/nic.h</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/nic_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/nic_common.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ptp.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/ptp.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/rx.c</a></td><td class='right'>946</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/rx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/rx_common.c</a></td><td class='right'>1045</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/rx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/rx_common.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/selftest.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/selftest.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/selftest.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/selftest.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/Kconfig</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/bitfield.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/bitfield.h</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/efx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/efx.c</a></td><td class='right'>1350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/efx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/efx.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/efx_channels.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/efx_channels.c</a></td><td class='right'>1371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/efx_channels.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/efx_channels.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/efx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/efx_common.c</a></td><td class='right'>1398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/efx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/efx_common.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/enum.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/enum.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/ethtool.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/ethtool_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/ethtool_common.c</a></td><td class='right'>1232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/ethtool_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/ethtool_common.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/farch.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/farch.c</a> (renamed from drivers/net/ethernet/sfc/farch.c)</td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/farch_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/farch_regs.h</a> (renamed from drivers/net/ethernet/sfc/farch_regs.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/filter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/filter.h</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/io.h</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi.c</a></td><td class='right'>2260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi.h</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi_mon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi_mon.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi_pcol.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi_pcol.h</a></td><td class='right'>17204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 30.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 69.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi_port.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi_port.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi_port_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi_port_common.c</a></td><td class='right'>1282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mcdi_port_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mcdi_port_common.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/mtd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/mtd.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/net_driver.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/net_driver.h</a></td><td class='right'>1695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/nic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/nic.c</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/nic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/nic.h</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/nic_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/nic_common.h</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/ptp.c</a></td><td class='right'>2196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/ptp.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/rx.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/rx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/rx_common.c</a></td><td class='right'>1037</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/rx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/rx_common.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/selftest.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/selftest.c</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/selftest.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/selftest.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/siena.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/siena.c</a> (renamed from drivers/net/ethernet/sfc/siena.c)</td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/siena_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/siena_sriov.c</a> (renamed from drivers/net/ethernet/sfc/siena_sriov.c)</td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/siena_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/siena_sriov.h</a> (renamed from drivers/net/ethernet/sfc/siena_sriov.h)</td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/sriov.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/tx.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/tx.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/tx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/tx_common.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/tx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/tx_common.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/vfdi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/vfdi.h</a> (renamed from drivers/net/ethernet/sfc/vfdi.h)</td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/siena/workarounds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/siena/workarounds.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/sriov.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/sriov.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc.c</a></td><td class='right'>3094</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc.h</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_bindings.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_bindings.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_bindings.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_bindings.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_conntrack.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_conntrack.c</a></td><td class='right'>625</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_conntrack.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_conntrack.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_counters.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_counters.c</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_counters.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_counters.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_encap_actions.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_encap_actions.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tc_encap_actions.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tc_encap_actions.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tx.c</a></td><td class='right'>709</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tx.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tx_common.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tx_common.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/tx_tso.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/tx_tso.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sfc/workarounds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sfc/workarounds.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sgi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sgi/Kconfig</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sgi/ioc3-eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sgi/ioc3-eth.c</a></td><td class='right'>1412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sgi/meth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sgi/meth.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sgi/meth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sgi/meth.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/silan/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/silan/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/silan/sc92031.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/silan/sc92031.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sis/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sis/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sis/sis190.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sis/sis190.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sis/sis900.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sis/sis900.c</a></td><td class='right'>297</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/Kconfig</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/epic100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/epic100.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smc911x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smc911x.c</a></td><td class='right'>2189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smc911x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smc911x.h</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smc9194.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smc9194.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smc91c92_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smc91c92_cs.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smc91x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smc91x.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smc91x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smc91x.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smsc911x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smsc911x.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smsc9420.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smsc9420.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/smsc/smsc9420.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/smsc/smsc9420.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/socionext/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/socionext/Kconfig</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/socionext/netsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/socionext/netsec.c</a></td><td class='right'>721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/socionext/sni_ave.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/socionext/sni_ave.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/spacemit/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/spacemit/Kconfig</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/spacemit/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/spacemit/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/spacemit/k1_emac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/spacemit/k1_emac.c</a></td><td class='right'>2162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/spacemit/k1_emac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/spacemit/k1_emac.h</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/Kconfig</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/Makefile</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/chain_mode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/chain_mode.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/common.h</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/descs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/descs.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-ingenic.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c</a></td><td class='right'>1408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-intel.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c</a></td><td class='right'>631</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c</a></td><td class='right'>345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c</a></td><td class='right'>818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c</a></td><td class='right'>1934</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-sun55i.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-sun55i.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac100.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac1000.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac5.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac5.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac5.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c</a></td><td class='right'>1342</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/dwxlgmac2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/dwxlgmac2.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/enh_desc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/enh_desc.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/hwif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/hwif.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/hwif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/hwif.h</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/mmc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/mmc.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/mmc_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/mmc_core.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/norm_desc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/norm_desc.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/ring_mode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/ring_mode.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac.h</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_est.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_est.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_est.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_est.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c</a></td><td class='right'>922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_libpci.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_main.c</a></td><td class='right'>6864</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.2%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c</a></td><td class='right'>2049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c</a></td><td class='right'>977</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_vlan.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/cassini.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/cassini.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/cassini.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/cassini.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/ldmvsw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/ldmvsw.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/niu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/niu.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/niu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/niu.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunbmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunbmac.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sungem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sungem.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunhme.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunhme.c</a></td><td class='right'>1751</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunhme.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunhme.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunqe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunqe.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunqe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunqe.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunvnet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunvnet.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunvnet_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunvnet_common.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sun/sunvnet_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sun/sunvnet_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/Kconfig</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_define.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_define.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_desc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_desc.c</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_desc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_driver.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_driver.c</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_int.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_int.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_int.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_int.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_mac.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_mac.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_mdio.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_mdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_mdio.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_phy.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_phy.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/sunplus/spl2sw_register.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/sunplus/spl2sw_register.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac-common.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac-net.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/synopsys/dwc-xlgmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/synopsys/dwc-xlgmac.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/Kconfig</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tehuti.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tehuti.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tehuti.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tehuti.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tn40.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tn40.c</a></td><td class='right'>1857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tn40.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tn40.h</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tn40_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tn40_mdio.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tn40_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tn40_phy.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tehuti/tn40_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tehuti/tn40_regs.h</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/Kconfig</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/Makefile</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-ethtool.c</a></td><td class='right'>1013</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-nuss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-nuss.c</a></td><td class='right'>3816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-nuss.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-nuss.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-qos.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-qos.c</a></td><td class='right'>1343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-qos.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-qos.h</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-switchdev.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpsw-switchdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpsw-switchdev.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpts.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpts.c</a></td><td class='right'>1355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/am65-cpts.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/am65-cpts.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpmac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpmac.c</a></td><td class='right'>1257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw-common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw-common.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw-phy-sel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw-phy-sel.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw.c</a></td><td class='right'>1348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_ale.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_ale.c</a></td><td class='right'>1039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_ale.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_ale.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_ethtool.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_new.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_new.c</a></td><td class='right'>2146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_priv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_priv.c</a></td><td class='right'>1442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_priv.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_switchdev.c</a></td><td class='right'>544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpsw_switchdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpsw_switchdev.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpts.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpts.c</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/cpts.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/cpts.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/davinci_cpdma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/davinci_cpdma.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/davinci_cpdma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/davinci_cpdma.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/davinci_emac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/davinci_emac.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/davinci_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/davinci_mdio.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icss_iep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icss_iep.c</a></td><td class='right'>1107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icss_iep.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icss_iep.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_classifier.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_classifier.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_common.c</a></td><td class='right'>1853</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_config.c</a></td><td class='right'>864</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_config.h</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_ethtool.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_mii_cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_mii_cfg.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_mii_rt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_mii_rt.h</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_prueth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_prueth.c</a></td><td class='right'>2364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_prueth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_prueth.h</a></td><td class='right'>526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c</a></td><td class='right'>1250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_queues.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_queues.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_stats.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_stats.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_switch_map.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_switch_map.h</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_switchdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_switchdev.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssg/icssg_switchdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssg/icssg_switchdev.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssm/icssm_prueth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssm/icssm_prueth.c</a></td><td class='right'>1746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssm/icssm_prueth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssm/icssm_prueth.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssm/icssm_prueth_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssm/icssm_prueth_ptp.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/icssm/icssm_switch.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/icssm/icssm_switch.h</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/k3-cppi-desc-pool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/k3-cppi-desc-pool.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/k3-cppi-desc-pool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/k3-cppi-desc-pool.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/netcp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/netcp.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/netcp_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/netcp_core.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/netcp_ethss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/netcp_ethss.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/ti/tlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ti/tlan.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/ps3_gelic_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/ps3_gelic_net.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/ps3_gelic_net.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/ps3_gelic_net.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/ps3_gelic_wireless.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/ps3_gelic_wireless.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/ps3_gelic_wireless.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/spider_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/spider_net.c</a></td><td class='right'>2537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/spider_net.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/spider_net.h</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/spider_net_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/spider_net_ethtool.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/toshiba/tc35815.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/toshiba/tc35815.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tundra/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tundra/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/tundra/tsi108_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/tundra/tsi108_eth.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/vertexcom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/vertexcom/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/vertexcom/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/vertexcom/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/vertexcom/mse102x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/vertexcom/mse102x.c</a></td><td class='right'>806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/via/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/via/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/via/via-rhine.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/via/via-rhine.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/via/via-velocity.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/via/via-velocity.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/via/via-velocity.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/via/via-velocity.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/Kconfig</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_ethtool.c</a></td><td class='right'>762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_ethtool.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_hw.c</a></td><td class='right'>2977</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_hw.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_lib.c</a></td><td class='right'>3358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_lib.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_mbx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_mbx.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_mbx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_mbx.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_ptp.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_ptp.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_sriov.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_sriov.c</a></td><td class='right'>929</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_sriov.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_sriov.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_type.h</a></td><td class='right'>1507</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_vf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_vf.c</a></td><td class='right'>599</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_vf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_vf.h</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_vf_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_vf_common.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_vf_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_vf_common.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_vf_lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_vf_lib.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/libwx/wx_vf_lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/libwx/wx_vf_lib.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_main.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbe/ngbe_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbe/ngbe_type.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbevf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbevf/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/ngbevf/ngbevf_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/ngbevf/ngbevf_type.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_aml.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_aml.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c</a></td><td class='right'>606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_main.c</a></td><td class='right'>986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbe/txgbe_type.h</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbevf/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbevf/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbevf/txgbevf_main.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wangxun/txgbevf/txgbevf_type.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wangxun/txgbevf/txgbevf_type.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wiznet/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wiznet/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wiznet/w5100-spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wiznet/w5100-spi.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wiznet/w5100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wiznet/w5100.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wiznet/w5100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wiznet/w5100.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/wiznet/w5300.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/wiznet/w5300.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/ll_temac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/ll_temac.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/ll_temac_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/ll_temac_main.c</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/ll_temac_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/ll_temac_mdio.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/xilinx_axienet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/xilinx_axienet.h</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/xilinx_axienet_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/xilinx_axienet_main.c</a></td><td class='right'>2843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xilinx/xilinx_emaclite.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xilinx/xilinx_emaclite.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xircom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xircom/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xircom/xirc2ps_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xircom/xirc2ps_cs.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xscale/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xscale/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xscale/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xscale/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xscale/ixp46x_ts.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xscale/ixp46x_ts.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xscale/ixp4xx_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xscale/ixp4xx_eth.c</a></td><td class='right'>492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ethernet/xscale/ptp_ixp46x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/xscale/ptp_ixp46x.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/Kconfig</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/defxx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/defxx.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/defxx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/defxx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/defza.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/defza.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/cfm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/cfm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/drvfbi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/drvfbi.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/ecm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/ecm.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/ess.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/ess.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/fplustm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/fplustm.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/h/cmtdef.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/h/cmtdef.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/h/hwmtm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/h/hwmtm.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/h/skfbi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/h/skfbi.h</a></td><td class='right'>228</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/h/smc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/h/smc.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/h/smt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/h/smt.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/h/supern_2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/h/supern_2.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/hwmtm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/hwmtm.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/hwt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/hwt.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/pcmplc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/pcmplc.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/pmf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/pmf.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/queue.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/queue.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/rmt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/rmt.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/skfddi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/skfddi.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/smt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/smt.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/smtdef.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/smtdef.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/smtinit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/smtinit.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/smttimer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/smttimer.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fddi/skfp/srf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fddi/skfp/srf.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_debugfs.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_ethtool.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_hw.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_hw.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_main.c</a></td><td class='right'>1165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_regs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_trace.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/fjes/fjes_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/fjes/fjes_trace.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/geneve.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/geneve.c</a></td><td class='right'>822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/gtp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/gtp.c</a></td><td class='right'>1689</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/6pack.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/6pack.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/Kconfig</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/baycom_epp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/baycom_epp.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/baycom_par.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/baycom_par.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/baycom_ser_fdx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/baycom_ser_fdx.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/baycom_ser_hdx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/baycom_ser_hdx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/bpqether.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/bpqether.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/dmascc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/dmascc.c</a></td><td class='right'>1452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/hdlcdrv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/hdlcdrv.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/mkiss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/mkiss.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/scc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/scc.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hamradio/yam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hamradio/yam.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hippi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hippi/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hippi/rrunner.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hippi/rrunner.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hippi/rrunner.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hippi/rrunner.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/hyperv_net.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/hyperv_net.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/netvsc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/netvsc.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/netvsc_bpf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/netvsc_bpf.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/netvsc_drv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/netvsc_drv.c</a></td><td class='right'>1131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/netvsc_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/netvsc_trace.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/hyperv/rndis_filter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/hyperv/rndis_filter.c</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/adf7242.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/adf7242.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/at86rf230.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/at86rf230.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/atusb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/atusb.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/atusb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/atusb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/ca8210.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/ca8210.c</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/cc2520.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/cc2520.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/fakelb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/fakelb.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/mac802154_hwsim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/mac802154_hwsim.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/mcr20a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/mcr20a.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ieee802154/mrf24j40.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ieee802154/mrf24j40.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ifb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ifb.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/Kconfig</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v3.1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v3.1.c</a></td><td class='right'>538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v3.5.1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v3.5.1.c</a></td><td class='right'>423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v4.11.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v4.11.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v4.2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v4.2.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v4.5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v4.5.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v4.7.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v4.7.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v4.9.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v4.9.c</a></td><td class='right'>456</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v5.0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v5.0.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/data/ipa_data-v5.5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/data/ipa_data-v5.5.c</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi.c</a></td><td class='right'>2433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi.h</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi_private.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi_private.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi_reg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi_reg.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi_reg.h</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi_trans.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi_trans.c</a></td><td class='right'>790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/gsi_trans.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/gsi_trans.h</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa.h</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_cmd.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_cmd.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_data.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_data.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_endpoint.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_endpoint.c</a></td><td class='right'>2198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_endpoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_endpoint.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_gsi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_gsi.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_gsi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_gsi.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_interrupt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_interrupt.c</a></td><td class='right'>344</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_interrupt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_interrupt.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_main.c</a></td><td class='right'>1019</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_mem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_mem.c</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_mem.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_mem.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_modem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_modem.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_modem.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_modem.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_power.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_power.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_power.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_power.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_qmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_qmi.c</a></td><td class='right'>533</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_qmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_qmi.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_qmi_msg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_qmi_msg.c</a></td><td class='right'>724</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_qmi_msg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_qmi_msg.h</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_reg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_reg.c</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_reg.h</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_resource.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_resource.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_resource.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_resource.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_smp2p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_smp2p.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_smp2p.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_smp2p.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_sysfs.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_sysfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_sysfs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_table.c</a></td><td class='right'>775</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_table.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_uc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_uc.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_uc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_uc.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/ipa_version.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/ipa_version.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v3.1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v3.1.c</a></td><td class='right'>293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v3.5.1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v3.5.1.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v4.0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v4.0.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v4.11.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v4.11.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v4.5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v4.5.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v4.9.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v4.9.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/gsi_reg-v5.0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/gsi_reg-v5.0.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v3.1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v3.1.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v3.5.1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v3.5.1.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v4.11.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v4.11.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v4.2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v4.2.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v4.5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v4.5.c</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v4.7.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v4.7.c</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v4.9.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v4.9.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v5.0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v5.0.c</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ipa/reg/ipa_reg-v5.5.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipa/reg/ipa_reg-v5.5.c</a></td><td class='right'>565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ipvlan/ipvlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipvlan/ipvlan.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ipvlan/ipvlan_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipvlan/ipvlan_core.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ipvlan/ipvlan_l3s.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipvlan/ipvlan_l3s.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ipvlan/ipvlan_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipvlan/ipvlan_main.c</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ipvlan/ipvtap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ipvlan/ipvtap.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/loopback.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/loopback.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/macsec.c</a></td><td class='right'>2156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/macvlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/macvlan.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/macvtap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/macvtap.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mctp/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mctp/Kconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mctp/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mctp/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mctp/mctp-i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mctp/mctp-i2c.c</a></td><td class='right'>1146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mctp/mctp-i3c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mctp/mctp-i3c.c</a></td><td class='right'>767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mctp/mctp-serial.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mctp/mctp-serial.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mctp/mctp-usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mctp/mctp-usb.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/Kconfig</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/Makefile</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/acpi_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/acpi_mdio.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/fwnode_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/fwnode_mdio.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-airoha.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-airoha.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-aspeed.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-aspeed.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-bcm-iproc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-bcm-iproc.c</a> (renamed from drivers/net/phy/mdio-bcm-iproc.c)</td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-bcm-unimac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-bcm-unimac.c</a> (renamed from drivers/net/phy/mdio-bcm-unimac.c)</td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-bitbang.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-bitbang.c</a> (renamed from drivers/net/phy/mdio-bitbang.c)</td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-cavium.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-cavium.c</a> (renamed from drivers/net/phy/mdio-cavium.c)</td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-cavium.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-cavium.h</a> (renamed from drivers/net/phy/mdio-cavium.h)</td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-gpio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-gpio.c</a> (renamed from drivers/net/phy/mdio-gpio.c)</td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-hisi-femac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-hisi-femac.c</a> (renamed from drivers/net/phy/mdio-hisi-femac.c)</td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-i2c.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-ipq4019.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-ipq4019.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-ipq8064.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-ipq8064.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-moxart.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-moxart.c</a> (renamed from drivers/net/phy/mdio-moxart.c)</td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mscc-miim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mscc-miim.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-bcm-iproc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-bcm-iproc.c</a> (renamed from drivers/net/phy/mdio-mux-bcm-iproc.c)</td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-bcm6368.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-bcm6368.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-gpio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-gpio.c</a> (renamed from drivers/net/phy/mdio-mux-gpio.c)</td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-meson-g12a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-meson-g12a.c</a> (renamed from drivers/net/phy/mdio-mux-meson-g12a.c)</td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-meson-gxl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-meson-gxl.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-mmioreg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-mmioreg.c</a> (renamed from drivers/net/phy/mdio-mux-mmioreg.c)</td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux-multiplexer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux-multiplexer.c</a> (renamed from drivers/net/phy/mdio-mux-multiplexer.c)</td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mux.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mux.c</a> (renamed from drivers/net/phy/mdio-mux.c)</td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-mvusb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-mvusb.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-octeon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-octeon.c</a> (renamed from drivers/net/phy/mdio-octeon.c)</td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-realtek-rtl9300.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-realtek-rtl9300.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-regmap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-regmap.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-sun4i.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-sun4i.c</a> (renamed from drivers/net/phy/mdio-sun4i.c)</td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-thunder.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-thunder.c</a> (renamed from drivers/net/phy/mdio-thunder.c)</td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/mdio-xgene.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/mdio-xgene.c</a> (renamed from drivers/net/phy/mdio-xgene.c)</td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mdio/of_mdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mdio/of_mdio.c</a></td><td class='right'>476</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/mhi_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mhi_net.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/mii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/mii.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/net_failover.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/net_failover.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netconsole.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netconsole.c</a></td><td class='right'>1537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/bpf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/bpf.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/bus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/bus.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/dev.c</a></td><td class='right'>1840</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/ethtool.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/fib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/fib.c</a></td><td class='right'>1544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/health.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/health.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/hwstats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/hwstats.c</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/ipsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/ipsec.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/macsec.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/netdev.c</a></td><td class='right'>1071</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/netdevsim.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/netdevsim.h</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/psample.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/psample.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/psp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/psp.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/sdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/sdev.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netdevsim/udp_tunnels.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netdevsim/udp_tunnels.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/netkit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/netkit.c</a></td><td class='right'>1017</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/nlmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/nlmon.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ntb_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ntb_netdev.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/Makefile</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/bind.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/bind.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/bind.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/bind.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/crypto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/crypto.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/crypto.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/crypto.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/crypto_aead.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/crypto_aead.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/crypto_aead.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/crypto_aead.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/io.c</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/io.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/main.c</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/main.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/netlink-gen.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/netlink-gen.c</a></td><td class='right'>263</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/netlink-gen.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/netlink-gen.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/netlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/netlink.c</a></td><td class='right'>1293</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/netlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/netlink.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/ovpnpriv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/ovpnpriv.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/peer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/peer.c</a></td><td class='right'>1364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/peer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/peer.h</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/pktid.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/pktid.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/pktid.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/pktid.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/proto.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/proto.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/skb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/skb.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/socket.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/socket.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/socket.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/socket.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/stats.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/stats.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/tcp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/tcp.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/tcp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/tcp.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/udp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/udp.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/ovpn/udp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ovpn/udp.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-lynx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-lynx.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-mtk-lynxi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-mtk-lynxi.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-rzn1-miic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-rzn1-miic.c</a></td><td class='right'>770</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-xpcs-nxp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-xpcs-nxp.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-xpcs-plat.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-xpcs-plat.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-xpcs-wx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-xpcs-wx.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-xpcs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-xpcs.c</a></td><td class='right'>1728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pcs/pcs-xpcs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pcs/pcs-xpcs.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pfcp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pfcp.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/Kconfig</a></td><td class='right'>582</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/Makefile</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/adin.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/adin.c</a></td><td class='right'>1049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/adin1100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/adin1100.c</a></td><td class='right'>354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/air_en8811h.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/air_en8811h.c</a></td><td class='right'>1224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/amd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/amd.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/aquantia.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/aquantia.h</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/aquantia_firmware.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/aquantia_firmware.c</a></td><td class='right'>385</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/aquantia_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/aquantia_hwmon.c</a> (renamed from drivers/net/phy/aquantia_hwmon.c)</td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/aquantia_leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/aquantia_leds.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia/aquantia_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia/aquantia_main.c</a></td><td class='right'>1593</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/aquantia_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/aquantia_main.c</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/as21xxx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/as21xxx.c</a></td><td class='right'>1088</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/asix.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/asix.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/at803x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/at803x.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/ax88796b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/ax88796b.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/ax88796b_rust.rs?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/ax88796b_rust.rs</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm-cygnus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm-cygnus.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm-phy-lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm-phy-lib.c</a></td><td class='right'>803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm-phy-lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm-phy-lib.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm-phy-ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm-phy-ptp.c</a></td><td class='right'>957</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm54140.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm54140.c</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm63xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm63xx.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm7xxx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm7xxx.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm84881.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm84881.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/bcm87xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/bcm87xx.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/broadcom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/broadcom.c</a></td><td class='right'>1567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/cicada.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/cicada.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/cortina.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/cortina.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/davicom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/davicom.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83640.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83640.c</a></td><td class='right'>479</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83640_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83640_reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83822.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83822.c</a></td><td class='right'>1033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83848.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83848.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83867.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83867.c</a></td><td class='right'>972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83869.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83869.c</a></td><td class='right'>939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83tc811.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83tc811.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83td510.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83td510.c</a></td><td class='right'>977</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/dp83tg720.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/dp83tg720.c</a></td><td class='right'>678</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/et1011c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/et1011c.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/fixed_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/fixed_phy.c</a></td><td class='right'>294</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/icplus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/icplus.c</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/intel-xway.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/intel-xway.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/linkmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/linkmode.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/lxt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/lxt.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/marvell-88q2xxx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/marvell-88q2xxx.c</a></td><td class='right'>1154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/marvell-88x2222.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/marvell-88x2222.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/marvell.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/marvell.c</a></td><td class='right'>3045</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/marvell10g.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/marvell10g.c</a></td><td class='right'>1217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-boardinfo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-boardinfo.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-boardinfo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-boardinfo.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-i2c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-i2c.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-i2c.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-i2c.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-mscc-miim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-mscc-miim.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-open-alliance.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-open-alliance.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-private.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-private.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio-xgene.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio-xgene.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio_bus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio_bus.c</a></td><td class='right'>1099</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio_bus_provider.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio_bus_provider.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio_device.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mdio_devres.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mdio_devres.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/mtk-2p5ge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/mtk-2p5ge.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/mtk-ge-soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/mtk-ge-soc.c</a></td><td class='right'>1548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/mtk-ge.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/mtk-ge.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/mtk-phy-lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/mtk-phy-lib.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mediatek/mtk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mediatek/mtk.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/meson-gxl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/meson-gxl.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/micrel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/micrel.c</a></td><td class='right'>5911</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/microchip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/microchip.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/microchip_rds_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/microchip_rds_ptp.c</a></td><td class='right'>1306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/microchip_rds_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/microchip_rds_ptp.h</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/microchip_t1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/microchip_t1.c</a></td><td class='right'>2143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/microchip_t1s.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/microchip_t1s.c</a></td><td class='right'>610</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mii_timestamper.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mii_timestamper.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/motorcomm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/motorcomm.c</a></td><td class='right'>3107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc.h</a></td><td class='right'>523</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_fc_buffer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_fc_buffer.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_mac.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_macsec.c</a></td><td class='right'>1011</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_macsec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_macsec.h</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_main.c</a> (renamed from drivers/net/phy/mscc.c)</td><td class='right'>2168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_ptp.c</a></td><td class='right'>1645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_ptp.h</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_serdes.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_serdes.c</a></td><td class='right'>650</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mscc/mscc_serdes.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mscc/mscc_serdes.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mxl-86110.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mxl-86110.c</a></td><td class='right'>978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/mxl-gpy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/mxl-gpy.c</a></td><td class='right'>1408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/national.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/national.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/ncn26000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/ncn26000.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/nxp-c45-tja11xx-macsec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/nxp-c45-tja11xx-macsec.c</a></td><td class='right'>1725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/nxp-c45-tja11xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/nxp-c45-tja11xx.c</a></td><td class='right'>2190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/nxp-c45-tja11xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/nxp-c45-tja11xx.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/nxp-cbtx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/nxp-cbtx.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/nxp-tja11xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/nxp-tja11xx.c</a></td><td class='right'>933</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/open_alliance_helpers.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/open_alliance_helpers.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/open_alliance_helpers.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/open_alliance_helpers.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy-c45.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy-c45.c</a></td><td class='right'>1462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy-caps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy-caps.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy-core.c</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy.c</a></td><td class='right'>1852</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy_caps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy_caps.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy_device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy_device.c</a></td><td class='right'>2540</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy_led_triggers.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy_led_triggers.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy_link_topology.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy_link_topology.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phy_package.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phy_package.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phylib-internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phylib-internal.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phylib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phylib.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/phylink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/phylink.c</a></td><td class='right'>3728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/Kconfig</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/at803x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/at803x.c</a></td><td class='right'>1250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/qca807x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/qca807x.c</a></td><td class='right'>868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/qca808x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/qca808x.c</a></td><td class='right'>686</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/qca83xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/qca83xx.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/qcom-phy-lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/qcom-phy-lib.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qcom/qcom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qcom/qcom.h</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qsemi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qsemi.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/qt2025.rs?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/qt2025.rs</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/realtek.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/realtek.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/realtek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/realtek/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/realtek/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/realtek/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/realtek/realtek.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/realtek/realtek.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/realtek/realtek_hwmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/realtek/realtek_hwmon.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/realtek/realtek_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/realtek/realtek_main.c</a></td><td class='right'>2277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/rockchip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/rockchip.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/sfp-bus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/sfp-bus.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/sfp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/sfp.c</a></td><td class='right'>2182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/sfp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/sfp.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/smsc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/smsc.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/spi_ks8995.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/spi_ks8995.c</a></td><td class='right'>549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/ste10Xp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/ste10Xp.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/stubs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/stubs.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/swphy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/swphy.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/teranetics.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/teranetics.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/uPD60620.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/uPD60620.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/vitesse.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/vitesse.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/phy/xilinx_gmii2rgmii.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/phy/xilinx_gmii2rgmii.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/plip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/plip/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/plip/plip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/plip/plip.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/Kconfig</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/bsd_comp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/bsd_comp.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/ppp_async.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/ppp_async.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/ppp_deflate.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/ppp_deflate.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/ppp_generic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/ppp_generic.c</a></td><td class='right'>771</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/ppp_mppe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/ppp_mppe.c</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/ppp_synctty.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/ppp_synctty.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/pppoe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/pppoe.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/pppox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/pppox.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/ppp/pptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ppp/pptp.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/Kconfig</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/pd692x0.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/pd692x0.c</a></td><td class='right'>1883</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/pse_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/pse_core.c</a></td><td class='right'>1978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/pse_regulator.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/pse_regulator.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/si3474.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/si3474.c</a></td><td class='right'>578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/pse-pd/tps23881.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/pse-pd/tps23881.c</a></td><td class='right'>1563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/rionet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/rionet.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/sb1000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/sb1000.c</a></td><td class='right'>1173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/slip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/slip/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/slip/slhc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/slip/slhc.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/slip/slip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/slip/slip.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/slip/slip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/slip/slip.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/sungem_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/sungem_phy.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/tap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/tap.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_core.c</a> (renamed from drivers/net/team/team.c)</td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_mode_activebackup.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_mode_activebackup.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_mode_broadcast.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_mode_broadcast.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_mode_loadbalance.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_mode_loadbalance.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_mode_random.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_mode_random.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_mode_roundrobin.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_mode_roundrobin.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_nl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_nl.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/team/team_nl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/team/team_nl.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/thunderbolt/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/thunderbolt/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/thunderbolt/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/thunderbolt/Makefile</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/thunderbolt/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/thunderbolt/main.c</a> (renamed from drivers/net/thunderbolt.c)</td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/thunderbolt/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/thunderbolt/trace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/thunderbolt/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/thunderbolt/trace.h</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/tun.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/tun.c</a></td><td class='right'>1195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/tun_vnet.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/tun_vnet.h</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/Kconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/aqc111.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/aqc111.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/aqc111.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/aqc111.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/asix.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/asix.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/asix_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/asix_common.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/asix_devices.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/asix_devices.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/ax88172a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/ax88172a.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/ax88179_178a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/ax88179_178a.c</a></td><td class='right'>769</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/catc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/catc.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cdc-phonet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cdc-phonet.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cdc_eem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cdc_eem.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cdc_ether.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cdc_ether.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cdc_mbim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cdc_mbim.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cdc_ncm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cdc_ncm.c</a></td><td class='right'>700</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cdc_subset.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cdc_subset.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/ch9200.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/ch9200.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/cx82310_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/cx82310_eth.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/dm9601.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/dm9601.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/gl620a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/gl620a.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/hso.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/hso.c</a></td><td class='right'>243</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/huawei_cdc_ncm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/huawei_cdc_ncm.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/int51x1.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/int51x1.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/ipheth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/ipheth.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/kalmia.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/kalmia.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/kaweth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/kaweth.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/lan78xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/lan78xx.c</a></td><td class='right'>3872</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/lg-vl600.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/lg-vl600.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/mcs7830.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/mcs7830.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/net1080.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/net1080.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/pegasus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/pegasus.c</a></td><td class='right'>299</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/pegasus.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/pegasus.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/plusb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/plusb.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/qmi_wwan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/qmi_wwan.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/r8152.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/r8152.c</a></td><td class='right'>6440</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.8%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 88.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/r8153_ecm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/r8153_ecm.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/rndis_host.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/rndis_host.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/rtl8150.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/rtl8150.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/sierra_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/sierra_net.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/smsc75xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/smsc75xx.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/smsc95xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/smsc95xx.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/sr9700.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/sr9700.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/sr9700.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/sr9700.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/sr9800.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/sr9800.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/sr9800.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/sr9800.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/usbnet.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/usbnet.c</a></td><td class='right'>675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/usb/zaurus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/usb/zaurus.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/veth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/veth.c</a></td><td class='right'>1423</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/virtio_net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/virtio_net.c</a></td><td class='right'>6014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 89.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/upt1_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/upt1_defs.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/vmxnet3_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/vmxnet3_defs.h</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/vmxnet3_drv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/vmxnet3_drv.c</a></td><td class='right'>1347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/vmxnet3_ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/vmxnet3_ethtool.c</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/vmxnet3_int.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/vmxnet3_int.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/vmxnet3_xdp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/vmxnet3_xdp.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vmxnet3/vmxnet3_xdp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vmxnet3/vmxnet3_xdp.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vrf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vrf.c</a></td><td class='right'>933</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/vsockmon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vsockmon.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vxlan/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vxlan/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/vxlan/vxlan_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vxlan/vxlan_core.c</a> (renamed from drivers/net/vxlan.c)</td><td class='right'>2746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vxlan/vxlan_mdb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vxlan/vxlan_mdb.c</a></td><td class='right'>1746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vxlan/vxlan_multicast.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vxlan/vxlan_multicast.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vxlan/vxlan_private.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vxlan/vxlan_private.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/vxlan/vxlan_vnifilter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/vxlan/vxlan_vnifilter.c</a></td><td class='right'>1005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/.gitignore?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/.gitignore</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/Kconfig</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/Makefile</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/c101.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/c101.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/cosa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/cosa.c</a></td><td class='right'>2037</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/cosa.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/cosa.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/dlci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/dlci.c</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/dscc4.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/dscc4.c</a></td><td class='right'>2057</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/farsync.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/farsync.c</a></td><td class='right'>644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/farsync.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/farsync.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/framer/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/framer/Kconfig</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/framer/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/framer/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/framer/framer-core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/framer/framer-core.c</a></td><td class='right'>873</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/framer/pef2256/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/framer/pef2256/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/framer/pef2256/pef2256-regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/framer/pef2256/pef2256-regs.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/framer/pef2256/pef2256.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/framer/pef2256/pef2256.c</a></td><td class='right'>893</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/fsl_qmc_hdlc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/fsl_qmc_hdlc.c</a></td><td class='right'>808</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/fsl_ucc_hdlc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/fsl_ucc_hdlc.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/fsl_ucc_hdlc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/fsl_ucc_hdlc.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hd64570.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hd64570.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hd64572.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hd64572.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc_cisco.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc_cisco.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc_fr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc_fr.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc_ppp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc_ppp.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc_raw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc_raw.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc_raw_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc_raw_eth.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hdlc_x25.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hdlc_x25.c</a></td><td class='right'>241</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/hostess_sv11.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/hostess_sv11.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/ixp4xx_hss.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/ixp4xx_hss.c</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lapbether.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lapbether.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/Makefile</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_debug.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_debug.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_ioctl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_ioctl.h</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_main.c</a></td><td class='right'>2104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_media.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_media.c</a></td><td class='right'>1212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_proto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_proto.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_proto.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_proto.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/lmc/lmc_var.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/lmc/lmc_var.h</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/n2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/n2.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/pc300too.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/pc300too.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/pci200syn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/pci200syn.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/sbni.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/sbni.c</a></td><td class='right'>1623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/sbni.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/sbni.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/sdla.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/sdla.c</a></td><td class='right'>1654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/sealevel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/sealevel.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/slic_ds26522.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/slic_ds26522.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/wanxl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/wanxl.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/x25_asy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/x25_asy.c</a></td><td class='right'>809</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/x25_asy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/x25_asy.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/z85230.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/z85230.c</a></td><td class='right'>1790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wan/z85230.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wan/z85230.h</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/Makefile</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/control.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/control.c</a></td><td class='right'>1436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/debug-levels.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/debug-levels.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/debugfs.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/driver.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/driver.c</a></td><td class='right'>1010</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/fw.c</a></td><td class='right'>1656</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/i2400m-usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/i2400m-usb.h</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/i2400m.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/i2400m.h</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/netdev.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/op-rfkill.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/op-rfkill.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/rx.c</a></td><td class='right'>1396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/sysfs.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/tx.c</a></td><td class='right'>1012</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/usb-debug-levels.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/usb-debug-levels.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/usb-fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/usb-fw.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/usb-notif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/usb-notif.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/usb-rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/usb-rx.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/usb-tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/usb-tx.c</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wimax/i2400m/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wimax/i2400m/usb.c</a></td><td class='right'>806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/Makefile</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/allowedips.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/allowedips.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/allowedips.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/allowedips.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/cookie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/cookie.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/cookie.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/cookie.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/device.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/device.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/device.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/device.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/generated/netlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/generated/netlink.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/generated/netlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/generated/netlink.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/main.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/messages.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/messages.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/netlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/netlink.c</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/netlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/netlink.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/noise.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/noise.c</a></td><td class='right'>861</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/noise.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/noise.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/peer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/peer.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/peer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/peer.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/peerlookup.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/peerlookup.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/peerlookup.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/peerlookup.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/queueing.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/queueing.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/queueing.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/queueing.h</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/ratelimiter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/ratelimiter.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/ratelimiter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/ratelimiter.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/receive.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/receive.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/selftest/allowedips.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/selftest/allowedips.c</a></td><td class='right'>727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/selftest/counter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/selftest/counter.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/selftest/ratelimiter.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/selftest/ratelimiter.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/send.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/send.c</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/socket.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/socket.c</a></td><td class='right'>437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/socket.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/socket.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/timers.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/timers.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/timers.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/timers.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireguard/version.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireguard/version.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/Kconfig</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/admtek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/admtek/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/admtek/adm8211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/admtek/adm8211.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/admtek/adm8211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/admtek/adm8211.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/Kconfig</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ar5523/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ar5523/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ar5523/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ar5523/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ar5523/ar5523.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ar5523/ar5523.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/Kconfig</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/ahb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/ahb.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/bmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/bmi.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/bmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/bmi.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/ce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/ce.c</a></td><td class='right'>190</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/ce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/ce.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/core.c</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/core.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/coredump.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/coredump.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/debug.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/debug.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/debugfs_sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/debugfs_sta.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/hif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/hif.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/htc.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/htc.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/htt.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/htt.h</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/htt_rx.c</a></td><td class='right'>1186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/htt_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/htt_tx.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/hw.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/hw.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/leds.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/leds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/leds.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/mac.c</a></td><td class='right'>2537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/mac.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/p2p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/p2p.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/pci.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/pci.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/qmi.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/qmi.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/rx_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/rx_desc.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/sdio.c</a></td><td class='right'>862</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/sdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/sdio.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/snoc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/snoc.c</a></td><td class='right'>720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/snoc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/snoc.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/spectral.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/spectral.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/swap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/swap.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/swap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/swap.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/targaddrs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/targaddrs.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/testmode.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/testmode_i.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/testmode_i.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/thermal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/thermal.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/thermal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/thermal.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/trace.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/trace.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/txrx.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/usb.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/usb.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi-ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/wmi-ops.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi-tlv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/wmi-tlv.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi-tlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/wmi-tlv.h</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/wmi.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/wmi.h</a></td><td class='right'>362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath10k/wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath10k/wow.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/Kconfig</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/Makefile</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ahb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/ahb.c</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ahb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/ahb.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/ce.c</a></td><td class='right'>1080</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/ce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/ce.h</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/core.c</a></td><td class='right'>2715</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/core.h</a></td><td class='right'>1354</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/coredump.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/coredump.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dbring.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dbring.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dbring.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dbring.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debug.c</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debug.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debugfs.c</a></td><td class='right'>1803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debugfs.h</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c</a></td><td class='right'>4905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h</a></td><td class='right'>2045</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debugfs_sta.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/debugfs_sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/debugfs_sta.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dp.c</a></td><td class='right'>1194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dp.h</a></td><td class='right'>1694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dp_rx.c</a></td><td class='right'>5794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dp_rx.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dp_tx.c</a></td><td class='right'>1306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/dp_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/dp_tx.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/fw.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/fw.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal.c</a></td><td class='right'>1455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal.h</a></td><td class='right'>978</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal_desc.h</a></td><td class='right'>2494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal_rx.c</a></td><td class='right'>1610</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal_rx.h</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal_tx.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hal_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hal_tx.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hif.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/htc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/htc.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/htc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/htc.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hw.c</a></td><td class='right'>2858</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/hw.h</a></td><td class='right'>439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/mac.c</a></td><td class='right'>10873</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 81.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/mac.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mhi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/mhi.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/mhi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/mhi.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/p2p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/p2p.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/p2p.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/p2p.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/pci.c</a></td><td class='right'>1322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/pci.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pcic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/pcic.c</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/pcic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/pcic.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/peer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/peer.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/peer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/peer.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/qmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/qmi.c</a></td><td class='right'>3366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/qmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/qmi.h</a></td><td class='right'>526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/reg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/reg.c</a></td><td class='right'>1066</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/reg.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/rx_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/rx_desc.h</a></td><td class='right'>1506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/spectral.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/spectral.c</a></td><td class='right'>1056</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/spectral.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/spectral.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/testmode.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/testmode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/testmode.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/thermal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/thermal.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/thermal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/thermal.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/trace.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/trace.h</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/wmi.c</a></td><td class='right'>9909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/wmi.h</a></td><td class='right'>6535</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/wow.c</a></td><td class='right'>883</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath11k/wow.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath11k/wow.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/Kconfig</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/Makefile</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/acpi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/acpi.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/acpi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/acpi.h</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ahb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/ahb.c</a></td><td class='right'>1156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ahb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/ahb.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/ce.c</a></td><td class='right'>1051</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/ce.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/ce.h</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/core.c</a></td><td class='right'>2321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/core.h</a></td><td class='right'>1519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/coredump.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/coredump.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dbring.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dbring.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dbring.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dbring.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debug.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debug.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debugfs.c</a></td><td class='right'>1515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debugfs.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debugfs_htt_stats.c</a></td><td class='right'>6178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 89.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debugfs_htt_stats.h</a></td><td class='right'>2076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debugfs_sta.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/debugfs_sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/debugfs_sta.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp.c</a></td><td class='right'>1841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp.h</a></td><td class='right'>1976</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_mon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp_mon.c</a></td><td class='right'>4438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_mon.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp_mon.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp_rx.c</a></td><td class='right'>4830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp_rx.h</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp_tx.c</a></td><td class='right'>1781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/dp_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/dp_tx.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/fw.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/fw.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal.c</a></td><td class='right'>2663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal.h</a></td><td class='right'>1181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal_desc.h</a></td><td class='right'>3045</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal_rx.c</a></td><td class='right'>947</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal_rx.h</a></td><td class='right'>1171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal_tx.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hal_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hal_tx.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hif.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/htc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/htc.c</a></td><td class='right'>795</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/htc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/htc.h</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hw.c</a></td><td class='right'>1680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/hw.h</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/mac.c</a></td><td class='right'>14996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/mac.h</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mhi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/mhi.c</a></td><td class='right'>659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/mhi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/mhi.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/p2p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/p2p.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/p2p.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/p2p.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/pci.c</a></td><td class='right'>1895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/pci.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/peer.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/peer.c</a></td><td class='right'>570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/peer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/peer.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/qmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/qmi.c</a></td><td class='right'>3917</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/qmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/qmi.h</a></td><td class='right'>635</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/reg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/reg.c</a></td><td class='right'>994</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/reg.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/rx_desc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/rx_desc.h</a></td><td class='right'>1544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/testmode.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/testmode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/testmode.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/trace.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/trace.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/wmi.c</a></td><td class='right'>11230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 80.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/wmi.h</a></td><td class='right'>6526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/wow.c</a></td><td class='right'>1029</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath12k/wow.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath12k/wow.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/ahb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/ahb.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/ani.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/ani.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/ath5k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/ath5k.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/base.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/base.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/base.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/base.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/debug.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/dma.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/eeprom.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/eeprom.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/led.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/mac80211-ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/mac80211-ops.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/pci.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/pcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/pcu.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/phy.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/reg.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/reset.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/reset.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/rfbuffer.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/rfbuffer.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/rfkill.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/rfkill.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath5k/sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath5k/sysfs.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/bmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/bmi.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/cfg80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/cfg80211.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/core.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/debug.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/hif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/hif.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/hif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/hif.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/htc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/htc.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/htc_mbox.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/htc_mbox.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/htc_pipe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/htc_pipe.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/init.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/main.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/recovery.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/recovery.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/sdio.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/testmode.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/trace.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/txrx.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/usb.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/wmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/wmi.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath6kl/wmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath6kl/wmi.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/Kconfig</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ahb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ahb.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ani.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ani.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/antenna.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/antenna.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar5008_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar5008_initvals.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar5008_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar5008_phy.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9001_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9001_initvals.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_calib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9002_calib.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9002_hw.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9002_initvals.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9002_mac.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9002_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9002_phy.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_aic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_aic.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_calib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_calib.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_eeprom.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_hw.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_mac.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_mci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_mci.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_paprd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_paprd.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_phy.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_phy.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9003_wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9003_wow.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9340_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9340_initvals.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9485_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9485_initvals.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ath9k.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ath9k.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/ath9k_pci_owl_loader.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/beacon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/beacon.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/btcoex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/btcoex.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/calib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/calib.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/channel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/channel.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-beacon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/common-beacon.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/common-debug.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/common-init.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common-spectral.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/common-spectral.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/common.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/debug.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/debug.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/debug_sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/debug_sta.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/dfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/dfs.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/dfs_debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/dfs_debug.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/dynack.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/dynack.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/eeprom.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/eeprom.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom_4k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/eeprom_4k.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom_9287.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/eeprom_9287.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/eeprom_def.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/eeprom_def.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/gpio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/gpio.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hif_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/hif_usb.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hif_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/hif_usb.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc_drv_beacon.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc_drv_debug.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc_drv_init.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc_drv_main.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc_drv_txrx.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/htc_hst.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/htc_hst.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/hw.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/hw.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/init.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/link.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/link.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/mac.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/mac.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/main.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/mci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/mci.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/pci.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/recv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/recv.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/reg.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/reg_aic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/reg_aic.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/rng.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/rng.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/tx99.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/tx99.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/wmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/wmi.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/wmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/wmi.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/wow.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/ath9k/xmit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/ath9k/xmit.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/carl9170.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/carl9170.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/cmd.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/debug.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/fw.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/fwcmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/fwcmd.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/fwdesc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/fwdesc.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/hw.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/mac.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/main.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/rx.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/tx.c</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/usb.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/carl9170/wlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/carl9170/wlan.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/dfs_pattern_detector.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/dfs_pattern_detector.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/dfs_pri_detector.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/dfs_pri_detector.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/hw.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/key.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/key.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/main.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/regd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/regd.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/regd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/regd.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/regd_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/regd_common.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/spectral_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/spectral_common.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/testmode_i.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/testmode_i.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/trace.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/debug.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/dxe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/dxe.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/dxe.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/dxe.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/firmware.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/firmware.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/firmware.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/firmware.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/hal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/hal.h</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/main.c</a></td><td class='right'>782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/pmc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/pmc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/smd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/smd.c</a></td><td class='right'>1611</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/smd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/smd.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/testmode.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/testmode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/testmode.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/txrx.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/txrx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wcn36xx/wcn36xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wcn36xx/wcn36xx.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/boot_loader.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/boot_loader.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/cfg80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/cfg80211.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/debug.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/debugfs.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/ethtool.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/fw.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/fw.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/fw_inc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/fw_inc.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/interrupt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/interrupt.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/main.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/netdev.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/p2p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/p2p.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/pcie_bus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/pcie_bus.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/pm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/pm.c</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/pmc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/pmc.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/pmc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/pmc.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/rx_reorder.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/rx_reorder.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/trace.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/trace.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/txrx.c</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/txrx.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx_edma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/txrx_edma.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/txrx_edma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/txrx_edma.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wil6210.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/wil6210.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wil_crash_dump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/wil_crash_dump.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wil_platform.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/wil_platform.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wil_platform.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/wil_platform.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/wmi.c</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ath/wil6210/wmi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ath/wil6210/wmi.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/Kconfig</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/at76c50x-usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/at76c50x-usb.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/at76c50x-usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/at76c50x-usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/atmel.c</a></td><td class='right'>4525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.9%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/atmel.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/atmel_cs.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/atmel/atmel_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/atmel/atmel_pci.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/b43.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/b43.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/debugfs.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/dma.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/lo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/lo.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/main.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/phy_common.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/phy_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_g.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/phy_g.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_ht.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/phy_ht.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_lp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/phy_lp.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/phy_n.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/phy_n.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/pio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/pio.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/radio_2056.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/radio_2056.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/sdio.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/sysfs.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/tables_lpphy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/tables_lpphy.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/tables_lpphy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/tables_lpphy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/tables_nphy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/tables_nphy.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43/xmit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43/xmit.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/b43legacy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/b43legacy.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/debugfs.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/dma.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/leds.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/main.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/phy.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/pio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/pio.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/radio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/radio.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/sysfs.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/b43legacy/xmit.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/b43legacy/xmit.c</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/Kconfig</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/Makefile</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/acpi.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/core.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/module.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bca/vops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c</a></td><td class='right'>2134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/core.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/module.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/cyw/vops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwvid.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c</a></td><td class='right'>961</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c</a></td><td class='right'>271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/core.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/module.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/wcc/vops.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_radio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_radio.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/defs.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/broadcom/brcm80211/include/soc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/broadcom/brcm80211/include/soc.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/cisco/Kconfig</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/cisco/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/airo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/cisco/airo.c</a></td><td class='right'>8214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.4%;'/><td class='none' style='width: 85.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/airo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/cisco/airo.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/cisco/airo_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/cisco/airo_cs.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/Kconfig</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/ipw.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2100.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/ipw2100.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2100.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/ipw2100.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2200.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/ipw2200.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/ipw2200.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/ipw2200.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw.h</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_crypto.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_ccmp.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_tkip.c</a></td><td class='right'>728</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_crypto_wep.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_geo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_geo.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_module.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_rx.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_spy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_spy.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_tx.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/ipw2x00/libipw_wx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/ipw2x00/libipw_wx.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945-mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/3945-mac.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945-rs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/3945-rs.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/3945.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/3945.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/3945.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965-calib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/4965-calib.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965-mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/4965-mac.c</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965-rs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/4965-rs.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/4965.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/4965.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/4965.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/commands.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/commands.h</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/common.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/common.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/debug.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/Kconfig</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/Makefile</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/1000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/1000.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/2000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/2000.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/22000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/22000.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/5000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/5000.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/6000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/6000.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/7000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/7000.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/8000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/8000.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/9000.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/9000.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/ax210.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/bz.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/bz.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/dr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/dr.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/cfg/sc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/cfg/sc.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/agn.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/agn.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/calib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/calib.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/calib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/calib.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/commands.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/commands.h</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/dev.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/devices.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/devices.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c)</td><td class='right'>562</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/led.c</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/led.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/lib.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/main.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/power.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/power.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/power.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/power.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/rs.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/rs.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/rx.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/rxon.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/scan.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/sta.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/tt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/tt.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/tt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/tt.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/tx.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/dvm/ucode.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/acpi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/acpi.c</a></td><td class='right'>1062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/acpi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/acpi.h</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/alive.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/alive.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/binding.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/binding.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/coex.h</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/commands.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/config.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/context.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/context.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/d3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/d3.h</a></td><td class='right'>608</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h</a></td><td class='right'>836</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/debug.h</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/dhc.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/filter.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/filter.h</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/led.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/location.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/location.h</a></td><td class='right'>1184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/mac.h</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/offload.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/offload.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/paging.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/paging.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/phy.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/power.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/power.h</a></td><td class='right'>465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/rs.h</a></td><td class='right'>530</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/rx.h</a></td><td class='right'>746</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/scan.h</a></td><td class='right'>656</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/sf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/sf.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/sta.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/stats.h</a></td><td class='right'>755</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/system.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/system.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/tx.h</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/api/txq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/api/txq.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dbg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/dbg.c</a></td><td class='right'>2973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dbg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/dbg.h</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/debugfs.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/debugfs.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/dhc-utils.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/dump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/dump.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/error-dump.h</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/file.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/file.h</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/img.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/img.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/img.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/img.h</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/init.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/paging.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/paging.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.c</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/pnvm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/pnvm.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/regulatory.c</a></td><td class='right'>743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/regulatory.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/regulatory.h</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/rs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/rs.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/runtime.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/runtime.h</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/smem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/smem.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/uefi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/uefi.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/fw/uefi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/fw/uefi.h</a></td><td class='right'>393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-config.h</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-csr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-csr.h</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c</a></td><td class='right'>1497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-debug.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-debug.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-drv.c</a></td><td class='right'>930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-drv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-drv.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-fh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-fh.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-io.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-io.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-modparams.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-prph.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-prph.h</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-scd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-scd.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-trans.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-trans.c</a></td><td class='right'>834</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-trans.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-trans.h</a></td><td class='right'>1401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-utils.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/iwl-utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/iwl-utils.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/internal.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/main.c</a></td><td class='right'>2216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/net.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/net.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/sap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/sap.h</a></td><td class='right'>784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/trace-data.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/trace-data.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/trace.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mei/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mei/trace.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/agg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/agg.c</a></td><td class='right'>677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/agg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/agg.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/ap.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/ap.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/coex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/coex.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/coex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/coex.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/constants.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/constants.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/d3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/d3.c</a></td><td class='right'>2065</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/d3.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/d3.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/debugfs.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/debugfs.h</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.c</a></td><td class='right'>451</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/ftm-initiator.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/fw.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/hcmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/hcmd.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/iface.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/iface.c</a></td><td class='right'>703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/iface.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/iface.h</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/key.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/key.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/key.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/key.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/led.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/led.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/link.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/link.c</a></td><td class='right'>909</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/link.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/link.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/low_latency.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/low_latency.c</a></td><td class='right'>336</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/low_latency.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/low_latency.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mac80211.c</a></td><td class='right'>2702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mac80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mac80211.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mcc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mcc.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mcc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mcc.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mld.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mld.c</a></td><td class='right'>776</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mld.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mld.h</a></td><td class='right'>615</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mlo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mlo.c</a></td><td class='right'>1199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/mlo.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/mlo.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/notif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/notif.c</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/notif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/notif.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/phy.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/phy.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/power.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/power.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/power.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/power.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/ptp.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/ptp.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/ptp.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/regulatory.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/regulatory.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/regulatory.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/roc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/roc.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/roc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/roc.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/rx.c</a></td><td class='right'>2264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/rx.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/scan.c</a></td><td class='right'>2179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/scan.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/session-protect.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/session-protect.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/session-protect.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/session-protect.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/sta.c</a></td><td class='right'>1319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/sta.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/stats.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/stats.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/stats.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/stats.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c</a></td><td class='right'>663</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/hcmd.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/link-selection.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/link.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/link.c</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/module.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/rx.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/utils.c</a></td><td class='right'>503</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tests/utils.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/thermal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/thermal.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/thermal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/thermal.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/time_sync.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/time_sync.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/time_sync.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/time_sync.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tlc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tlc.c</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tlc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tlc.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tx.c</a></td><td class='right'>1394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mld/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mld/tx.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/binding.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/binding.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/coex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/coex.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/constants.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/constants.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/d3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/d3.c</a></td><td class='right'>2902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c</a></td><td class='right'>1561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c</a></td><td class='right'>1073</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/fw.c</a></td><td class='right'>1478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/led.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/link.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/link.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c</a></td><td class='right'>1025</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c</a></td><td class='right'>5122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.6%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c</a></td><td class='right'>1283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/mvm.h</a></td><td class='right'>1619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/nvm.c</a></td><td class='right'>234</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/offloading.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/ops.c</a></td><td class='right'>1991</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/power.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/power.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/ptp.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/quota.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/quota.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rfi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/rfi.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/rs.c</a></td><td class='right'>930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/rs.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/rx.c</a></td><td class='right'>796</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c</a></td><td class='right'>2024</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/scan.c</a></td><td class='right'>2195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/sf.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/sta.c</a></td><td class='right'>1585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/sta.h</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/tdls.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/tests/hcmd.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.c</a></td><td class='right'>838</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/time-event.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/tt.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/tx.c</a></td><td class='right'>1271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/utils.c</a></td><td class='right'>1105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c</a></td><td class='right'>618</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/ctxt-info.c</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/drv.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/drv.c</a></td><td class='right'>2308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/internal.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/internal.h)</td><td class='right'>1007</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/rx.c)</td><td class='right'>1012</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c</a></td><td class='right'>654</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/trans.c)</td><td class='right'>2970</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c</a></td><td class='right'>1434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c</a> (renamed from drivers/net/wireless/intel/iwlwifi/pcie/tx.c)</td><td class='right'>2373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info-v2.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-context-info-gen3.h)</td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/iwl-context-info.h</a> (renamed from drivers/net/wireless/intel/iwlwifi/iwl-context-info.h)</td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c</a></td><td class='right'>1358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/utils.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/pcie/utils.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/pcie/utils.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/tests/Makefile</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/devinfo.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/tests/devinfo.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/module.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/tests/module.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/tests/nvm_parse.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intel/iwlwifi/tests/utils.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intel/iwlwifi/tests/utils.c</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/Kconfig</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/Kconfig</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/Makefile</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_80211.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_80211_rx.c</a></td><td class='right'>1116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_80211_tx.c</a></td><td class='right'>554</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_ap.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_ap.c</a></td><td class='right'>3277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_ap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_ap.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_common.h</a></td><td class='right'>420</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_config.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_config.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_cs.c</a></td><td class='right'>711</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_download.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_download.c</a></td><td class='right'>813</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_hw.c</a></td><td class='right'>3407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_info.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_info.c</a></td><td class='right'>509</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_ioctl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_ioctl.c</a></td><td class='right'>4047</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_main.c</a></td><td class='right'>1127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_pci.c</a></td><td class='right'>460</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_plx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_plx.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_proc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_proc.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/hostap/hostap_wlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/hostap/hostap_wlan.h</a></td><td class='right'>1049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/Kconfig</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/Makefile</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/airport.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/airport.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/cfg.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/cfg.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/fw.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/fw.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hermes.c</a></td><td class='right'>777</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hermes.h</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes_dld.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hermes_dld.c</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes_dld.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hermes_dld.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hermes_rid.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hermes_rid.h</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hw.c</a></td><td class='right'>1356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/hw.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/main.c</a></td><td class='right'>2415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/main.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/mic.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/mic.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/mic.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/mic.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco.h</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_cs.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_nortel.c</a></td><td class='right'>323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_pci.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_pci.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_plx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_plx.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_tmd.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/orinoco_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/orinoco_usb.c</a></td><td class='right'>1753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/scan.c</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/scan.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/spectrum_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/spectrum_cs.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/wext.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/wext.c</a></td><td class='right'>1413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/orinoco/wext.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/orinoco/wext.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/eeprom.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/eeprom.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/fwio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/fwio.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/led.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/lmac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/lmac.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/main.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54pci.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54pci.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54spi.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54spi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54spi.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54spi_eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54spi_eeprom.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54usb.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/p54usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/p54usb.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/p54/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/p54/txrx.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_38xx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/isl_38xx.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_38xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/isl_38xx.h</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_ioctl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/isl_ioctl.c</a></td><td class='right'>2911</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_ioctl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/isl_ioctl.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/isl_oid.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/isl_oid.h</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_dev.c</a></td><td class='right'>965</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_dev.h</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_eth.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_eth.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_eth.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_eth.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_hotplug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_hotplug.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_mgt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_mgt.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/islpci_mgt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/islpci_mgt.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/oid_mgt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/oid_mgt.c</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/oid_mgt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/oid_mgt.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/intersil/prism54/prismcompat.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/intersil/prism54/prismcompat.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mac80211_hwsim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mac80211_hwsim.c</a></td><td class='right'>3971</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/cfg.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/cmd.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/cmd.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/cmdresp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/cmdresp.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/debugfs.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/decl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/decl.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/defs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/dev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/dev.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/ethtool.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/firmware.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/firmware.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/host.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/host.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/if_cs.c</a></td><td class='right'>957</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/if_sdio.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/if_spi.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/if_usb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/if_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/if_usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/main.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/mesh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/mesh.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/mesh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/mesh.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/radiotap.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/radiotap.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/rx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/tx.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas/types.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas/types.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/cmd.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/deb_defs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/deb_defs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/if_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/if_usb.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/if_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/if_usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/libertas_tf.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/libertas_tf/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/libertas_tf/main.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11ac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11ac.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11ac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11ac.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11h.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11h.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11n.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11n.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_aggr.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11n_aggr.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_aggr.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11n_aggr.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/README?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/README</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cfg80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/cfg80211.c</a></td><td class='right'>1129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cfg80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/cfg80211.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cfp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/cfp.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/cmdevt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/cmdevt.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/debugfs.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/decl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/decl.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/ethtool.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/ethtool.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/fw.h</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/ie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/ie.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/init.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/ioctl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/ioctl.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/join.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/join.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/main.c</a></td><td class='right'>288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/main.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/pcie.c</a></td><td class='right'>782</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/pcie.h</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie_quirks.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/pcie_quirks.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/pcie_quirks.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/pcie_quirks.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/scan.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sdio.c</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sdio.h</a></td><td class='right'>466</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sta_cmd.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sta_event.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sta_ioctl.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sta_rx.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/sta_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/sta_tx.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/tdls.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/tdls.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/txrx.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/uap_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/uap_cmd.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/uap_event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/uap_event.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/uap_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/uap_txrx.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/usb.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/usb.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/util.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/util.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/util.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/util.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/wmm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/wmm.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwifiex/wmm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwifiex/wmm.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/marvell/mwl8k.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/marvell/mwl8k.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/Kconfig</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/Makefile</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/agg-rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/agg-rx.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/channel.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/channel.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/debugfs.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/dma.c</a></td><td class='right'>1055</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/dma.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/eeprom.c</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mac80211.c</a></td><td class='right'>1757</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mcu.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mmio.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76.h</a></td><td class='right'>1720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/beacon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/beacon.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/core.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/debugfs.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/dma.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/eeprom.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/init.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/mac.c</a></td><td class='right'>577</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/main.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.c</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/mcu.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/pci.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/regs.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7603/soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7603/soc.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/Kconfig</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/Makefile</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/dma.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/init.c</a></td><td class='right'>701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mac.c</a></td><td class='right'>2147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mac.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/main.c</a></td><td class='right'>1253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.c</a></td><td class='right'>3289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mcu.h</a></td><td class='right'>651</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mmio.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h</a></td><td class='right'>560</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/pci.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/regs.h</a></td><td class='right'>464</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/sdio.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/soc.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/testmode.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/trace.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/usb.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac.h</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h</a></td><td class='right'>365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c</a></td><td class='right'>1210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c</a></td><td class='right'>3266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h</a></td><td class='right'>2070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/init.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/initvals.h</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/initvals_init.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/initvals_init.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/main.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/pci.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/pci_mcu.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/phy.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/phy.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/usb.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_debugfs.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_dfs.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_dma.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_mac.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_phy.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_regs.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_trace.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_usb.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x02_util.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x02_util.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/Makefile</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/init.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/mac.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/mcu.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2u.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/pci.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_mcu.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/phy.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/usb.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mac.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_mcu.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/Kconfig</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/coredump.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/coredump.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c</a></td><td class='right'>1487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/dma.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h</a></td><td class='right'>203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/init.c</a></td><td class='right'>1304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/mac.c</a></td><td class='right'>2402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/mac.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/main.c</a></td><td class='right'>1818</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.c</a></td><td class='right'>4126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/mcu.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/mmio.c</a></td><td class='right'>1004</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/pci.c</a></td><td class='right'>242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/regs.h</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/soc.c</a></td><td class='right'>1312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.c</a></td><td class='right'>790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7915/testmode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7915/testmode.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/Kconfig</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/Makefile</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/debugfs.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/init.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/mac.c</a></td><td class='right'>868</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/main.c</a></td><td class='right'>1590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.c</a></td><td class='right'>1492</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/mcu.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/pci.c</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/regs.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/sdio.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/testmode.c</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7921/usb.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/Kconfig</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/Makefile</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/init.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/mac.c</a></td><td class='right'>1497</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/mac.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/main.c</a></td><td class='right'>2229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/mcu.c</a></td><td class='right'>3903</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/mcu.h</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h</a></td><td class='right'>380</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/pci.c</a></td><td class='right'>639</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/regd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/regd.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/regd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/regd.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/regs.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/testmode.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7925/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7925/usb.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x.h</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_core.c</a></td><td class='right'>986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_debugfs.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_dma.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_mac.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_regs.h</a></td><td class='right'>487</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_trace.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_trace.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt792x_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt792x_usb.c</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/Makefile</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/coredump.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/coredump.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/debugfs.c</a></td><td class='right'>1056</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/dma.c</a></td><td class='right'>1005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/eeprom.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/init.c</a></td><td class='right'>1745</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/mac.c</a></td><td class='right'>3321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/mac.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/main.c</a></td><td class='right'>2340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/mcu.c</a></td><td class='right'>4889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/mcu.h</a></td><td class='right'>974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/mmio.c</a></td><td class='right'>892</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/npu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/npu.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/pci.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/mt7996/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/mt7996/regs.h</a></td><td class='right'>791</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/npu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/npu.c</a></td><td class='right'>501</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/pci.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/scan.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/sdio.c</a></td><td class='right'>681</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/sdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/sdio.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/sdio_txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/sdio_txrx.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/testmode.c</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/testmode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/testmode.h</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/trace.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/trace.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/tx.c</a></td><td class='right'>891</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/usb.c</a></td><td class='right'>736</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/usb_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/usb_trace.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/usb_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/usb_trace.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/util.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/util.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/util.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/util.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt76/wed.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt76/wed.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/debugfs.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/dma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/dma.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/dma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/dma.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/eeprom.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/eeprom.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/init.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/mac.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/main.c</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/mcu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/mcu.c</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/mt7601u.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/mt7601u.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/phy.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/trace.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/tx.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/mediatek/mt7601u/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/mediatek/mt7601u/usb.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/Kconfig</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/Kconfig</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/cfg80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/cfg80211.c</a></td><td class='right'>1892</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/cfg80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/cfg80211.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/fw.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/hif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/hif.c</a></td><td class='right'>2021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/hif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/hif.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/mon.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/mon.c</a></td><td class='right'>258</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/netdev.c</a></td><td class='right'>1025</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/netdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/netdev.h</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/sdio.c</a></td><td class='right'>1076</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/spi.c</a></td><td class='right'>1374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/wlan.c</a></td><td class='right'>1810</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/wlan.h</a></td><td class='right'>475</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan_cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/wlan_cfg.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan_cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/wlan_cfg.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/microchip/wilc1000/wlan_if.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/microchip/wilc1000/wlan_if.h</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/Kconfig</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/Makefile</a> (renamed from drivers/net/ethernet/mellanox/mlx5/core/ipoib/Makefile)</td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/Kconfig</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/chip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/chip.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/chip.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/chip.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/firmware.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/firmware.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/intf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/intf.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/mac.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/mac.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/usb.c</a></td><td class='right'>896</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/purelifi/plfxlc/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/purelifi/plfxlc/usb.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/bus.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/bus.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/cfg80211.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/commands.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/commands.c</a></td><td class='right'>980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/commands.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/commands.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/core.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/core.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/event.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/pcie/pcie_priv.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/pcie/pearl_pcie.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/qlink.h</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink_util.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/qlink_util.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/qlink_util.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/quantenna/qtnfmac/switchdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/quantenna/qtnfmac/switchdev.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/Kconfig</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2400pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2400pci.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2400pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2400pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2500pci.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2500pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2500usb.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2500usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2500usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800lib.c</a></td><td class='right'>2398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.8%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800lib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800lib.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800mmio.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800pci.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800soc.c</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2800usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2800usb.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00config.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00config.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00debug.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00dev.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00link.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00link.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00mac.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00pci.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00pci.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00queue.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00soc.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00soc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00soc.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt2x00usb.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt61pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt61pci.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt61pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt61pci.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt73usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt73usb.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ralink/rt2x00/rt73usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ralink/rt2x00/rt73usb.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ray_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ray_cs.c</a></td><td class='right'>2832</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ray_cs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ray_cs.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rayctl.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rayctl.h</a></td><td class='right'>734</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/Kconfig</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/Makefile</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/grf5101.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/grf5101.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/grf5101.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/grf5101.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/max2820.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/max2820.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/max2820.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/max2820.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8180.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225se.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225se.c</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225se.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/rtl8225se.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/sa2400.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/sa2400.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8180/sa2400.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8180/sa2400.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/leds.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/rfkill.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8187.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8187.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl8187/rtl8225.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl818x/rtl818x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl818x/rtl818x.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8188e.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8188e.c</a></td><td class='right'>1885</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8188f.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8188f.c</a></td><td class='right'>1765</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8192c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8192c.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c)</td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8192e.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8192e.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c)</td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8192f.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8192f.c</a></td><td class='right'>2091</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8710b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8710b.c</a></td><td class='right'>1875</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8723a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8723a.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c)</td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/8723b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/8723b.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c)</td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/Makefile</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/core.c</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c)</td><td class='right'>3426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/regs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/regs.h</a> (renamed from drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h)</td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h</a></td><td class='right'>806</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/Kconfig</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/base.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/base.c</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/base.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/base.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c</a></td><td class='right'>723</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c</a></td><td class='right'>768</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a1ant.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c</a></td><td class='right'>803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/cam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/cam.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/cam.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/cam.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/core.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/core.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/debug.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/debug.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/efuse.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/efuse.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/efuse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/efuse.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/pci.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/pci.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/ps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/ps.c</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/ps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/ps.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rc.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/regd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/regd.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c</a></td><td class='right'>290</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h</a></td><td class='right'>1048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h</a></td><td class='right'>804</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/def.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/dm.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/led.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/mac.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/rf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.h</a></td><td class='right'>539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/Makefile</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/def.h</a> (renamed from drivers/net/wireless/realtek/rtlwifi/rtl8192de/def.h)</td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c</a></td><td class='right'>1061</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c</a></td><td class='right'>370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c</a></td><td class='right'>1225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/main.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c</a></td><td class='right'>856</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/reg.h</a> (renamed from drivers/net/wireless/realtek/rtlwifi/rtl8192de/reg.h)</td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c</a></td><td class='right'>516</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.h</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c</a></td><td class='right'>1172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/fw.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.c</a></td><td class='right'>1271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/hw.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.c</a></td><td class='right'>1278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/phy.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/rf.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c</a></td><td class='right'>790</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.h</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/Makefile</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.c</a></td><td class='right'>1212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.c</a></td><td class='right'>3118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/sw.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.c</a></td><td class='right'>1675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.c</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/dm.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/phy.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/rf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h</a></td><td class='right'>865</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/def.h</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/dm.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/fw.c</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/hw.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/phy.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/rf.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8192se/trx.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/dm.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/rf.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h</a></td><td class='right'>795</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/led.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/phy.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/rf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.h</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.c</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723be/trx.h</a></td><td class='right'>719</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/fw_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8723com/phy_common.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/def.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c</a></td><td class='right'>1108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c</a></td><td class='right'>612</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/led.h</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c</a></td><td class='right'>707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/rf.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c</a></td><td class='right'>504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.h</a></td><td class='right'>709</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/usb.c</a></td><td class='right'>358</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/usb.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtlwifi/wifi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtlwifi/wifi.h</a></td><td class='right'>302</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/Kconfig</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/Makefile</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/bf.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/bf.c</a></td><td class='right'>416</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/bf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/bf.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/coex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/coex.c</a></td><td class='right'>4188</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/coex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/coex.h</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/debug.c</a></td><td class='right'>972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/debug.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/efuse.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/efuse.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/efuse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/efuse.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/fw.c</a></td><td class='right'>2095</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/fw.h</a></td><td class='right'>732</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/hci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/hci.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/led.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/led.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/led.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/led.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/mac.c</a></td><td class='right'>758</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/mac.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/mac80211.c</a></td><td class='right'>692</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/main.c</a></td><td class='right'>1703</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/main.h</a></td><td class='right'>1352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/pci.c</a></td><td class='right'>1172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/pci.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/phy.c</a></td><td class='right'>2286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/phy.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/ps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/ps.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/ps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/ps.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/reg.h</a></td><td class='right'>587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/regd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/regd.c</a></td><td class='right'>758</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/regd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/regd.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8703b.c</a></td><td class='right'>2003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8703b.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c</a></td><td class='right'>902</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723cs.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723d.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723d.c</a></td><td class='right'>2207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723d.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723d.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723d_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723d_table.c</a></td><td class='right'>1196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723d_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723d_table.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723de.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723de.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723ds.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723ds.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723du.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723du.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723x.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723x.c</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8723x.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8723x.h</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8812a.c</a></td><td class='right'>1125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8812a.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8812a_table.c</a></td><td class='right'>2812</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812a_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8812a_table.h</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8812au.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8812au.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8814a.c</a></td><td class='right'>2270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8814a.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8814a_table.c</a></td><td class='right'>23930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 41.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 58.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814a_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8814a_table.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814ae.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8814ae.c</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8814au.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8814au.c</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821a.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821a.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821a_table.c</a></td><td class='right'>2350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821a_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821a_table.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821au.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821au.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821c.c</a></td><td class='right'>2064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821c.h</a></td><td class='right'>286</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821c_table.c</a></td><td class='right'>7504</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821c_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821c_table.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821ce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821ce.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821cs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8821cu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8821cu.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822b.c</a></td><td class='right'>1260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822b.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822b_table.c</a></td><td class='right'>2393</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822b_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822b_table.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822be.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822bs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822bs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822bu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822bu.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822c.c</a></td><td class='right'>3839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822c.h</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.c</a></td><td class='right'>39706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 64.8%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 30.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822c_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822c_table.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822ce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822ce.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822cs.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw8822cu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw8822cu.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw88xxa.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw88xxa.c</a></td><td class='right'>1989</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rtw88xxa.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rtw88xxa.h</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rx.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/rx.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/sar.c</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sar.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/sar.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/sdio.c</a></td><td class='right'>1437</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/sdio.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/sec.c</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/sec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/sec.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/tx.c</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/tx.h</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/usb.c</a></td><td class='right'>1381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/usb.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/util.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/util.c</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/util.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/util.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/wow.c</a></td><td class='right'>913</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw88/wow.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw88/wow.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/Kconfig</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/Makefile</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/acpi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/acpi.c</a></td><td class='right'>1281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/acpi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/acpi.h</a></td><td class='right'>298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/cam.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/cam.c</a></td><td class='right'>1142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/cam.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/cam.h</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/chan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/chan.c</a></td><td class='right'>3448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/chan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/chan.h</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/coex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/coex.c</a></td><td class='right'>11906</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 20.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 79.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/coex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/coex.h</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/core.c</a></td><td class='right'>6648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/core.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/core.h</a></td><td class='right'>7686</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/debug.c</a></td><td class='right'>4869</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/debug.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/efuse.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/efuse.c</a></td><td class='right'>506</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/efuse.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/efuse.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/efuse_be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/efuse_be.c</a></td><td class='right'>514</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/fw.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/fw.c</a></td><td class='right'>10212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 17.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/fw.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/fw.h</a></td><td class='right'>5333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 90.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/mac.c</a></td><td class='right'>7240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/mac.h</a></td><td class='right'>1722</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/mac80211.c</a></td><td class='right'>2006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/mac_be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/mac_be.c</a></td><td class='right'>2657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/pci.c</a></td><td class='right'>4842</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 8.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/pci.h</a></td><td class='right'>1930</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/pci_be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/pci_be.c</a></td><td class='right'>708</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/phy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/phy.c</a></td><td class='right'>8089</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 85.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/phy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/phy.h</a></td><td class='right'>1064</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/phy_be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/phy_be.c</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/ps.c</a></td><td class='right'>591</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/ps.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/reg.h</a></td><td class='right'>9522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 83.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/regd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/regd.c</a></td><td class='right'>1185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b.c</a></td><td class='right'>2721</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c</a></td><td class='right'>3784</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b_rfk_table.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b_table.c</a></td><td class='right'>14916</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 26.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 73.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851b_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851b_table.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851be.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8851bu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8851bu.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a.c</a></td><td class='right'>2406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c</a></td><td class='right'>3866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.c</a></td><td class='right'>1607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a_rfk_table.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a_table.c</a></td><td class='right'>51062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 89.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 10.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852a_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852a_table.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852ae.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852ae.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852au.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852au.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b.c</a></td><td class='right'>1033</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_common.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_common.c</a></td><td class='right'>2106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_common.h</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c</a></td><td class='right'>4212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.c</a></td><td class='right'>794</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_rfk_table.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_table.c</a></td><td class='right'>22927</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 40.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 59.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852b_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852b_table.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852be.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852be.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bt.c</a></td><td class='right'>890</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bt.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.c</a></td><td class='right'>4279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.c</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bt_rfk_table.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bte.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bte.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852bu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852bu.c</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c.c</a></td><td class='right'>3251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c</a></td><td class='right'>4491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 92.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.c</a></td><td class='right'>781</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c_rfk_table.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_table.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c_table.c</a></td><td class='right'>57159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 100.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852c_table.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852c_table.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852ce.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852ce.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8852cu.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8852cu.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8922a.c</a></td><td class='right'>3009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8922a.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/rtw8922ae.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/rtw8922ae.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/sar.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/sar.c</a></td><td class='right'>907</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/sar.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/sar.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ser.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/ser.c</a></td><td class='right'>846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/ser.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/ser.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/txrx.h</a></td><td class='right'>760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/usb.c</a></td><td class='right'>1071</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/usb.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/util.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/util.c</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/util.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/util.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/wow.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/wow.c</a></td><td class='right'>1820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/realtek/rtw89/wow.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/realtek/rtw89/wow.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rndis_wlan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rndis_wlan.c</a></td><td class='right'>3774</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/Kconfig</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_coex.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_coex.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_core.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_debugfs.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_hal.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_hal.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_mac80211.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_mac80211.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_main.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_mgmt.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_mgmt.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_ps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_ps.c</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_sdio.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_sdio_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_sdio_ops.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_usb.c</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_91x_usb_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_91x_usb_ops.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_boot_params.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_boot_params.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_coex.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_coex.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_common.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_debugfs.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_hal.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_hal.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_main.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_mgmt.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_mgmt.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_ps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_ps.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_sdio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_sdio.h</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/rsi/rsi_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/rsi/rsi_usb.h</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/Kconfig</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/Kconfig</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/Makefile</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/bh.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/bh.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bus.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/bus.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bus_sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/bus_sdio.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/bus_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/bus_spi.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/data_rx.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/data_rx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/data_tx.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/data_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/data_tx.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/debug.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/debug.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/fwio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/fwio.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/fwio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/fwio.h</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_api_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_api_cmd.h</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_api_general.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_api_general.h</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_api_mib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_api_mib.h</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_rx.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_rx.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_tx.c</a></td><td class='right'>537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_tx.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx_mib.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_tx_mib.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hif_tx_mib.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hif_tx_mib.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hwio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hwio.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/hwio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/hwio.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/key.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/key.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/key.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/key.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/main.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/main.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/main.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/queue.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/queue.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/queue.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/queue.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/scan.c</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/scan.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/sta.c</a></td><td class='right'>841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/sta.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/traces.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/traces.h</a></td><td class='right'>496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/silabs/wfx/wfx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/silabs/wfx/wfx.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/bh.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/bh.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/bh.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/bh.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/cw1200.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/cw1200.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/cw1200_sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/cw1200_sdio.c</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/cw1200_spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/cw1200_spi.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/debug.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/debug.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/debug.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/fwio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/fwio.c</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/fwio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/fwio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/hwbus.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/hwbus.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/hwio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/hwio.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/hwio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/hwio.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/main.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/pm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/pm.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/pm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/pm.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/queue.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/queue.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/queue.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/queue.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/scan.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/scan.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/sta.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/sta.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/sta.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/sta.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/txrx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/txrx.c</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/txrx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/txrx.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/wsm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/wsm.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/st/cw1200/wsm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/st/cw1200/wsm.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/Kconfig</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wilink_platform_data.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wilink_platform_data.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/acx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/acx.c</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/acx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/acx.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/boot.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/boot.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/boot.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/boot.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/cmd.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/cmd.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/debugfs.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/debugfs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/event.c</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/event.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/init.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/init.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/init.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/io.c</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/io.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/main.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/ps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/ps.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/ps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/ps.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/reg.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/rx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/rx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/sdio.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/spi.c</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/spi.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/spi.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/tx.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/tx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/wl1251.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/wl1251.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl1251/wl12xx_80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl1251/wl12xx_80211.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/Kconfig</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/acx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/acx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/acx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/acx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/cmd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/cmd.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/conf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/conf.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/debugfs.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/debugfs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/event.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/event.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/main.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/reg.h</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/scan.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/scan.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl12xx/wl12xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl12xx/wl12xx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/Kconfig</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/acx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/acx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/acx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/acx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/cmd.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/cmd.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/conf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/conf.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/debugfs.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/debugfs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/event.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/event.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/io.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/io.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/main.c</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/reg.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/scan.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/scan.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/tx.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/tx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wl18xx/wl18xx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wl18xx/wl18xx.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/Kconfig</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/acx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/acx.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/acx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/acx.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/boot.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/boot.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/boot.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/boot.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/cmd.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/cmd.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/conf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/conf.h</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/debug.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/debug.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/debugfs.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/debugfs.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/event.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/event.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/event.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/event.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/hw_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/hw_ops.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/ini.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/ini.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/init.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/init.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/init.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/init.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/io.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/io.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/io.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/io.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/main.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/main.c</a></td><td class='right'>697</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/ps.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/ps.c</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/ps.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/ps.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/rx.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/rx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/scan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/scan.c</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/scan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/scan.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/sdio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/sdio.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/spi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/spi.c</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/sysfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/sysfs.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/sysfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/sysfs.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/testmode.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/testmode.c</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/testmode.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/testmode.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/tx.c</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/tx.h</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/vendor_cmd.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/vendor_cmd.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/vendor_cmd.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/vendor_cmd.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/wl12xx_80211.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/wl12xx_80211.h</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/wlcore.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/wlcore.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/ti/wlcore/wlcore_i.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/ti/wlcore/wlcore_i.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/virtual/Kconfig</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/virtual/Makefile</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/mac80211_hwsim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/virtual/mac80211_hwsim.c</a></td><td class='right'>7235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 12.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 87.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/mac80211_hwsim.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/virtual/mac80211_hwsim.h</a> (renamed from drivers/net/wireless/mac80211_hwsim.h)</td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/virtual/virt_wifi.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/virtual/virt_wifi.c</a> (renamed from drivers/net/wireless/virt_wifi.c)</td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/wl3501.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/wl3501.h</a></td><td class='right'>616</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/wl3501_cs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/wl3501_cs.c</a></td><td class='right'>2031</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/Kconfig</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/Makefile</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1201.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1201.c</a></td><td class='right'>1912</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1201.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1201.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/Kconfig</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_chip.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_chip.c</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_def.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_def.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_mac.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_mac.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_rf.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_rf.h</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_usb.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_usb.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/wireless/zydas/zd1211rw/zd_usb.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wireless/zydas/zd1211rw/zd_usb.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/Kconfig?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/Kconfig</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/Makefile</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/Makefile</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_chnl_cfg.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_coredump.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_coredump.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_coredump.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_coredump.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_debugfs.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_debugfs.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_debugfs.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_debugfs.h</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_devlink.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_devlink.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_devlink.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_devlink.h</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_flash.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_flash.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_flash.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_flash.h</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_imem.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_imem.c</a></td><td class='right'>1499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_imem.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_imem.h</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_imem_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_imem_ops.c</a></td><td class='right'>658</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_imem_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_imem_ops.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_irq.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_irq.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_irq.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_irq.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_mmio.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_mmio.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_mmio.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_mmio.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_mux.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_mux.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_mux.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_mux.h</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_mux_codec.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_mux_codec.c</a></td><td class='right'>1553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_mux_codec.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_mux_codec.h</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_pcie.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_pcie.c</a></td><td class='right'>586</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_pcie.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_pcie.h</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_pm.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_pm.c</a></td><td class='right'>333</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_pm.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_pm.h</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_port.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_port.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_port.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_protocol.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_protocol.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_protocol.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_protocol.h</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_protocol_ops.c</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_protocol_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_protocol_ops.h</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_task_queue.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_task_queue.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_task_queue.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_task_queue.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_trace.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_trace.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_trace.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_uevent.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_uevent.c</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_uevent.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_uevent.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_wwan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_wwan.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/iosm/iosm_ipc_wwan.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/iosm/iosm_ipc_wwan.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/mhi_wwan_ctrl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/mhi_wwan_ctrl.c</a></td><td class='right'>285</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/mhi_wwan_mbim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/mhi_wwan_mbim.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/qcom_bam_dmux.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/qcom_bam_dmux.c</a></td><td class='right'>908</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/rpmsg_wwan_ctrl.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/rpmsg_wwan_ctrl.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/Makefile?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/Makefile</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_cldma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_cldma.c</a></td><td class='right'>281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_cldma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_cldma.h</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_dpmaif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_dpmaif.c</a></td><td class='right'>1281</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_dpmaif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_dpmaif.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_cldma.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_cldma.c</a></td><td class='right'>1362</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_cldma.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_cldma.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_dpmaif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_dpmaif.c</a></td><td class='right'>583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_dpmaif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_dpmaif.h</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c</a></td><td class='right'>1168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.c</a></td><td class='right'>682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_hif_dpmaif_tx.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_mhccif.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_mhccif.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_mhccif.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_mhccif.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_modem_ops.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_modem_ops.c</a></td><td class='right'>817</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_modem_ops.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_modem_ops.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_netdev.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_netdev.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_netdev.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_netdev.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_pci.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_pci.c</a></td><td class='right'>961</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_pci.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_pci.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_pcie_mac.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_pcie_mac.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_pcie_mac.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_pcie_mac.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_port.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_port.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c</a></td><td class='right'>277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_port_proxy.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_port_proxy.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_port_proxy.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_port_proxy.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_port_trace.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_port_trace.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_port_wwan.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_port_wwan.c</a></td><td class='right'>247</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_reg.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_reg.h</a></td><td class='right'>372</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_state_monitor.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_state_monitor.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/t7xx/t7xx_state_monitor.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/t7xx/t7xx_state_monitor.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/wwan_core.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/wwan_core.c</a></td><td class='right'>1271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.2%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/cgit/linux-arm.git/diff/drivers/net/wwan/wwan_hwsim.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/wwan/wwan_hwsim.c</a></td><td class='right'>559</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netback/common.h?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netback/common.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netback/hash.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netback/hash.c</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netback/interface.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netback/interface.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netback/netback.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netback/netback.c</a></td><td class='right'>469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netback/rx.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netback/rx.c</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netback/xenbus.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netback/xenbus.c</a></td><td class='right'>443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/cgit/linux-arm.git/diff/drivers/net/xen-netfront.c?id2=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/xen-netfront.c</a></td><td class='right'>1057</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>6365 files changed, 2343700 insertions, 548169 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig<br/>index 48e209e55843..ac12eaf11755 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ menuconfig NETDEVICES</div><div class='ctx'> 	default y if UML</div><div class='ctx'> 	depends on NET</div><div class='ctx'> 	bool "Network device support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  You can say N here if you don't intend to connect your Linux box to</div><div class='ctx'> 	  any other computer at all.</div><div class='ctx'> </div><div class='hunk'>@@ -32,7 +32,7 @@ config MII</div><div class='ctx'> config NET_CORE</div><div class='ctx'> 	default y</div><div class='ctx'> 	bool "Network core driver support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  You can say N here if you do not intend to use any of the</div><div class='ctx'> 	  networking core drivers (i.e. VLAN, bridging, bonding, etc.)</div><div class='ctx'> </div><div class='hunk'>@@ -42,7 +42,8 @@ config BONDING</div><div class='ctx'> 	tristate "Bonding driver support"</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	depends on IPV6 || IPV6=n</div><div class='del'>-	---help---</div><div class='add'>+	depends on TLS || TLS_DEVICE=n</div><div class='add'>+	help</div><div class='ctx'> 	  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet</div><div class='ctx'> 	  Channels together. This is called 'Etherchannel' by Cisco,</div><div class='ctx'> 	  'Trunking' by Sun, 802.3ad by the IEEE, and 'Bonding' in Linux.</div><div class='hunk'>@@ -50,7 +51,7 @@ config BONDING</div><div class='ctx'> 	  The driver supports multiple bonding modes to allow for both high</div><div class='ctx'> 	  performance and high availability operation.</div><div class='ctx'> </div><div class='del'>-	  Refer to &lt;file:Documentation/networking/bonding.txt&gt; for more</div><div class='add'>+	  Refer to &lt;file:Documentation/networking/bonding.rst&gt; for more</div><div class='ctx'> 	  information.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -58,7 +59,7 @@ config BONDING</div><div class='ctx'> </div><div class='ctx'> config DUMMY</div><div class='ctx'> 	tristate "Dummy net driver support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is essentially a bit-bucket device (i.e. traffic you send to</div><div class='ctx'> 	  this device is consigned into oblivion) with a configurable IP</div><div class='ctx'> 	  address. It is most commonly used in order to make your currently</div><div class='hunk'>@@ -71,9 +72,54 @@ config DUMMY</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called dummy.</div><div class='ctx'> </div><div class='add'>+config WIREGUARD</div><div class='add'>+	tristate "WireGuard secure network tunnel"</div><div class='add'>+	depends on NET &amp;&amp; INET</div><div class='add'>+	depends on IPV6 || !IPV6</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	select DST_CACHE</div><div class='add'>+	select CRYPTO_LIB_CURVE25519</div><div class='add'>+	select CRYPTO_LIB_CHACHA20POLY1305</div><div class='add'>+	select CRYPTO_LIB_UTILS</div><div class='add'>+	help</div><div class='add'>+	  WireGuard is a secure, fast, and easy to use replacement for IPSec</div><div class='add'>+	  that uses modern cryptography and clever networking tricks. It's</div><div class='add'>+	  designed to be fairly general purpose and abstract enough to fit most</div><div class='add'>+	  use cases, while at the same time remaining extremely simple to</div><div class='add'>+	  configure. See www.wireguard.com for more info.</div><div class='add'>+</div><div class='add'>+	  It's safe to say Y or M here, as the driver is very lightweight and</div><div class='add'>+	  is only in use when an administrator chooses to add an interface.</div><div class='add'>+</div><div class='add'>+config WIREGUARD_DEBUG</div><div class='add'>+	bool "Debugging checks and verbose messages"</div><div class='add'>+	depends on WIREGUARD</div><div class='add'>+	help</div><div class='add'>+	  This will write log messages for handshake and other events</div><div class='add'>+	  that occur for a WireGuard interface. It will also perform some</div><div class='add'>+	  extra validation checks and unit tests at various points. This is</div><div class='add'>+	  only useful for debugging.</div><div class='add'>+</div><div class='add'>+	  Say N here unless you know what you're doing.</div><div class='add'>+</div><div class='add'>+config OVPN</div><div class='add'>+	tristate "OpenVPN data channel offload"</div><div class='add'>+	depends on NET &amp;&amp; INET</div><div class='add'>+	depends on IPV6 || !IPV6</div><div class='add'>+	select DST_CACHE</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	select CRYPTO</div><div class='add'>+	select CRYPTO_AES</div><div class='add'>+	select CRYPTO_GCM</div><div class='add'>+	select CRYPTO_CHACHA20POLY1305</div><div class='add'>+	select STREAM_PARSER</div><div class='add'>+	help</div><div class='add'>+	  This module enhances the performance of the OpenVPN userspace software</div><div class='add'>+	  by offloading the data channel processing to kernelspace.</div><div class='add'>+</div><div class='ctx'> config EQUALIZER</div><div class='ctx'> 	tristate "EQL (serial line load balancing) support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have two serial connections to some other computer (this</div><div class='ctx'> 	  usually requires two modems and two telephone lines) and you use</div><div class='ctx'> 	  SLIP (the protocol for sending Internet traffic over telephone</div><div class='hunk'>@@ -83,7 +129,7 @@ config EQUALIZER</div><div class='ctx'> 	  Linux driver or with a Livingston Portmaster 2e.</div><div class='ctx'> </div><div class='ctx'> 	  Say Y if you want this and read</div><div class='del'>-	  &lt;file:Documentation/networking/eql.txt&gt;.  You may also want to read</div><div class='add'>+	  &lt;file:Documentation/networking/eql.rst&gt;.  You may also want to read</div><div class='ctx'> 	  section 6.2 of the NET-3-HOWTO, available from</div><div class='ctx'> 	  &lt;http://www.tldp.org/docs.html#howto&gt;.</div><div class='ctx'> </div><div class='hunk'>@@ -105,8 +151,9 @@ config NET_FC</div><div class='ctx'> </div><div class='ctx'> config IFB</div><div class='ctx'> 	tristate "Intermediate Functional Block support"</div><div class='del'>-	depends on NET_CLS_ACT</div><div class='del'>-	---help---</div><div class='add'>+	depends on NET_ACT_MIRRED || NFT_FWD_NETDEV</div><div class='add'>+	select NET_REDIRECT</div><div class='add'>+	help</div><div class='ctx'> 	  This is an intermediate driver that allows sharing of</div><div class='ctx'> 	  resources.</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -120,7 +167,7 @@ source "drivers/net/team/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config MACVLAN</div><div class='ctx'> 	tristate "MAC-VLAN support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This allows one to create virtual interfaces that map packets to</div><div class='ctx'> 	  or from specific MAC addresses to a particular interface.</div><div class='ctx'> </div><div class='hunk'>@@ -153,29 +200,29 @@ config IPVLAN_L3S</div><div class='ctx'> 	select NET_L3_MASTER_DEV</div><div class='ctx'> </div><div class='ctx'> config IPVLAN</div><div class='del'>-    tristate "IP-VLAN support"</div><div class='del'>-    depends on INET</div><div class='del'>-    depends on IPV6 || !IPV6</div><div class='del'>-    ---help---</div><div class='del'>-      This allows one to create virtual devices off of a main interface</div><div class='del'>-      and packets will be delivered based on the dest L3 (IPv6/IPv4 addr)</div><div class='del'>-      on packets. All interfaces (including the main interface) share L2</div><div class='del'>-      making it transparent to the connected L2 switch.</div><div class='add'>+	tristate "IP-VLAN support"</div><div class='add'>+	depends on INET</div><div class='add'>+	depends on IPV6 || !IPV6</div><div class='add'>+	help</div><div class='add'>+	  This allows one to create virtual devices off of a main interface</div><div class='add'>+	  and packets will be delivered based on the dest L3 (IPv6/IPv4 addr)</div><div class='add'>+	  on packets. All interfaces (including the main interface) share L2</div><div class='add'>+	  making it transparent to the connected L2 switch.</div><div class='ctx'> </div><div class='del'>-      Ipvlan devices can be added using the "ip" command from the</div><div class='del'>-      iproute2 package starting with the iproute2-3.19 release:</div><div class='add'>+	  Ipvlan devices can be added using the "ip" command from the</div><div class='add'>+	  iproute2 package starting with the iproute2-3.19 release:</div><div class='ctx'> </div><div class='del'>-      "ip link add link &lt;main-dev&gt; [ NAME ] type ipvlan"</div><div class='add'>+	  "ip link add link &lt;main-dev&gt; [ NAME ] type ipvlan"</div><div class='ctx'> </div><div class='del'>-      To compile this driver as a module, choose M here: the module</div><div class='del'>-      will be called ipvlan.</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called ipvlan.</div><div class='ctx'> </div><div class='ctx'> config IPVTAP</div><div class='ctx'> 	tristate "IP-VLAN based tap driver"</div><div class='ctx'> 	depends on IPVLAN</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	select TAP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This adds a specialized tap character device driver that is based</div><div class='ctx'> 	  on the IP-VLAN network interface, called ipvtap. An ipvtap device</div><div class='ctx'> 	  can be added in the same way as a ipvlan device, using 'type</div><div class='hunk'>@@ -185,11 +232,11 @@ config IPVTAP</div><div class='ctx'> 	  will be called ipvtap.</div><div class='ctx'> </div><div class='ctx'> config VXLAN</div><div class='del'>-       tristate "Virtual eXtensible Local Area Network (VXLAN)"</div><div class='del'>-       depends on INET</div><div class='del'>-       select NET_UDP_TUNNEL</div><div class='del'>-       select GRO_CELLS</div><div class='del'>-       ---help---</div><div class='add'>+	tristate "Virtual eXtensible Local Area Network (VXLAN)"</div><div class='add'>+	depends on INET</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	select GRO_CELLS</div><div class='add'>+	help</div><div class='ctx'> 	  This allows one to create vxlan virtual interfaces that provide</div><div class='ctx'> 	  Layer 2 Networks over Layer 3 Networks. VXLAN is often used</div><div class='ctx'> 	  to tunnel virtual network infrastructure in virtualized environments.</div><div class='hunk'>@@ -200,12 +247,12 @@ config VXLAN</div><div class='ctx'> 	  will be called vxlan.</div><div class='ctx'> </div><div class='ctx'> config GENEVE</div><div class='del'>-       tristate "Generic Network Virtualization Encapsulation"</div><div class='del'>-       depends on INET</div><div class='del'>-       depends on IPV6 || !IPV6</div><div class='del'>-       select NET_UDP_TUNNEL</div><div class='del'>-       select GRO_CELLS</div><div class='del'>-       ---help---</div><div class='add'>+	tristate "Generic Network Virtualization Encapsulation"</div><div class='add'>+	depends on INET</div><div class='add'>+	depends on IPV6 || !IPV6</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	select GRO_CELLS</div><div class='add'>+	help</div><div class='ctx'> 	  This allows one to create geneve virtual interfaces that provide</div><div class='ctx'> 	  Layer 2 Networks over Layer 3 Networks. GENEVE is often used</div><div class='ctx'> 	  to tunnel virtual network infrastructure in virtualized environments.</div><div class='hunk'>@@ -215,11 +262,24 @@ config GENEVE</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called geneve.</div><div class='ctx'> </div><div class='add'>+config BAREUDP</div><div class='add'>+	tristate "Bare UDP Encapsulation"</div><div class='add'>+	depends on INET</div><div class='add'>+	depends on IPV6 || !IPV6</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	select GRO_CELLS</div><div class='add'>+	help</div><div class='add'>+	  This adds a bare UDP tunnel module for tunnelling different</div><div class='add'>+	  kinds of traffic like MPLS, IP, etc. inside a UDP tunnel.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called bareudp.</div><div class='add'>+</div><div class='ctx'> config GTP</div><div class='ctx'> 	tristate "GPRS Tunneling Protocol datapath (GTP-U)"</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	select NET_UDP_TUNNEL</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This allows one to create gtp virtual interfaces that provide</div><div class='ctx'> 	  the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol</div><div class='ctx'> 	  is used to prevent subscribers from accessing mobile carrier core</div><div class='hunk'>@@ -230,7 +290,37 @@ config GTP</div><div class='ctx'> 	  3GPP TS 29.060 standards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this drivers as a module, choose M here: the module</div><div class='del'>-	  wil be called gtp.</div><div class='add'>+	  will be called gtp.</div><div class='add'>+</div><div class='add'>+config PFCP</div><div class='add'>+	tristate "Packet Forwarding Control Protocol (PFCP)"</div><div class='add'>+	depends on INET</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	help</div><div class='add'>+	  This allows one to create PFCP virtual interfaces that allows to</div><div class='add'>+	  set up software and hardware offload of PFCP packets.</div><div class='add'>+	  Note that this module does not support PFCP protocol in the kernel space.</div><div class='add'>+	  There is no support for parsing any PFCP messages.</div><div class='add'>+</div><div class='add'>+	  To compile this drivers as a module, choose M here: the module</div><div class='add'>+	  will be called pfcp.</div><div class='add'>+</div><div class='add'>+config AMT</div><div class='add'>+	tristate "Automatic Multicast Tunneling (AMT)"</div><div class='add'>+	depends on INET &amp;&amp; IP_MULTICAST</div><div class='add'>+	depends on IPV6 || !IPV6</div><div class='add'>+	select NET_UDP_TUNNEL</div><div class='add'>+	help</div><div class='add'>+	  This allows one to create AMT(Automatic Multicast Tunneling)</div><div class='add'>+	  virtual interfaces that provide multicast tunneling.</div><div class='add'>+	  There are two roles, Gateway, and Relay.</div><div class='add'>+	  Gateway Encapsulates IGMP/MLD traffic from listeners to the Relay.</div><div class='add'>+	  Gateway Decapsulates multicast traffic from the Relay to Listeners.</div><div class='add'>+	  Relay Encapsulates multicast traffic from Sources to Gateway.</div><div class='add'>+	  Relay Decapsulates IGMP/MLD traffic from Gateway.</div><div class='add'>+</div><div class='add'>+	  To compile this drivers as a module, choose M here: the module</div><div class='add'>+	  will be called amt.</div><div class='ctx'> </div><div class='ctx'> config MACSEC</div><div class='ctx'> 	tristate "IEEE 802.1AE MAC-level encryption (MACsec)"</div><div class='hunk'>@@ -238,14 +328,14 @@ config MACSEC</div><div class='ctx'> 	select CRYPTO_AES</div><div class='ctx'> 	select CRYPTO_GCM</div><div class='ctx'> 	select GRO_CELLS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	   MACsec is an encryption standard for Ethernet.</div><div class='ctx'> </div><div class='ctx'> config NETCONSOLE</div><div class='ctx'> 	tristate "Network console logging support"</div><div class='del'>-	---help---</div><div class='del'>-	If you want to log kernel messages over the network, enable this.</div><div class='del'>-	See &lt;file:Documentation/networking/netconsole.txt&gt; for details.</div><div class='add'>+	help</div><div class='add'>+	  If you want to log kernel messages over the network, enable this.</div><div class='add'>+	  See &lt;file:Documentation/networking/netconsole.rst&gt; for details.</div><div class='ctx'> </div><div class='ctx'> config NETCONSOLE_DYNAMIC</div><div class='ctx'> 	bool "Dynamic reconfiguration of logging targets"</div><div class='hunk'>@@ -255,11 +345,32 @@ config NETCONSOLE_DYNAMIC</div><div class='ctx'> 	  This option enables the ability to dynamically reconfigure target</div><div class='ctx'> 	  parameters (interface, IP addresses, port numbers, MAC addresses)</div><div class='ctx'> 	  at runtime through a userspace interface exported using configfs.</div><div class='del'>-	  See &lt;file:Documentation/networking/netconsole.txt&gt; for details.</div><div class='add'>+	  See &lt;file:Documentation/networking/netconsole.rst&gt; for details.</div><div class='add'>+</div><div class='add'>+config NETCONSOLE_EXTENDED_LOG</div><div class='add'>+	bool "Set kernel extended message by default"</div><div class='add'>+	depends on NETCONSOLE</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Set extended log support for netconsole message. If this option is</div><div class='add'>+	  set, log messages are transmitted with extended metadata header in a</div><div class='add'>+	  format similar to /dev/kmsg.  See</div><div class='add'>+	  &lt;file:Documentation/networking/netconsole.rst&gt; for details.</div><div class='add'>+</div><div class='add'>+config NETCONSOLE_PREPEND_RELEASE</div><div class='add'>+	bool "Prepend kernel release version in the message by default"</div><div class='add'>+	depends on NETCONSOLE_EXTENDED_LOG</div><div class='add'>+	default n</div><div class='add'>+	help</div><div class='add'>+	  Set kernel release to be prepended to each netconsole message by</div><div class='add'>+	  default. If this option is set, the kernel release is prepended into</div><div class='add'>+	  the first field of every netconsole message, so, the netconsole</div><div class='add'>+	  server/peer can easily identify what kernel release is logging each</div><div class='add'>+	  message.  See &lt;file:Documentation/networking/netconsole.rst&gt; for</div><div class='add'>+	  details.</div><div class='ctx'> </div><div class='ctx'> config NETPOLL</div><div class='ctx'> 	def_bool NETCONSOLE</div><div class='del'>-	select SRCU</div><div class='ctx'> </div><div class='ctx'> config NET_POLL_CONTROLLER</div><div class='ctx'> 	def_bool NETPOLL</div><div class='hunk'>@@ -286,7 +397,7 @@ config TUN</div><div class='ctx'> 	tristate "Universal TUN/TAP device driver support"</div><div class='ctx'> 	depends on INET</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  TUN/TAP provides packet reception and transmission for user space</div><div class='ctx'> 	  programs.  It can be viewed as a simple Point-to-Point or Ethernet</div><div class='ctx'> 	  device, which instead of receiving packets from a physical media,</div><div class='hunk'>@@ -298,7 +409,7 @@ config TUN</div><div class='ctx'> 	  devices, driver will automatically delete tunXX or tapXX device and</div><div class='ctx'> 	  all routes corresponding to it.</div><div class='ctx'> </div><div class='del'>-	  Please read &lt;file:Documentation/networking/tuntap.txt&gt; for more</div><div class='add'>+	  Please read &lt;file:Documentation/networking/tuntap.rst&gt; for more</div><div class='ctx'> 	  information.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -308,14 +419,14 @@ config TUN</div><div class='ctx'> </div><div class='ctx'> config TAP</div><div class='ctx'> 	tristate</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option is selected by any driver implementing tap user space</div><div class='ctx'> 	  interface for a virtual interface to re-use core tap functionality.</div><div class='ctx'> </div><div class='ctx'> config TUN_VNET_CROSS_LE</div><div class='ctx'> 	bool "Support for cross-endian vnet headers on little-endian kernels"</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option allows TUN/TAP and MACVTAP device drivers in a</div><div class='ctx'> 	  little-endian kernel to parse vnet headers that come from a</div><div class='ctx'> 	  big-endian legacy virtio device.</div><div class='hunk'>@@ -328,7 +439,8 @@ config TUN_VNET_CROSS_LE</div><div class='ctx'> </div><div class='ctx'> config VETH</div><div class='ctx'> 	tristate "Virtual ethernet pair device"</div><div class='del'>-	---help---</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	help</div><div class='ctx'> 	  This device is a local ethernet tunnel. Devices are created in pairs.</div><div class='ctx'> 	  When one end receives the packet it appears on its pair and vice</div><div class='ctx'> 	  versa.</div><div class='hunk'>@@ -337,13 +449,14 @@ config VIRTIO_NET</div><div class='ctx'> 	tristate "Virtio network driver"</div><div class='ctx'> 	depends on VIRTIO</div><div class='ctx'> 	select NET_FAILOVER</div><div class='del'>-	---help---</div><div class='add'>+	select DIMLIB</div><div class='add'>+	help</div><div class='ctx'> 	  This is the virtual network driver for virtio.  It can be used with</div><div class='ctx'> 	  QEMU based VMMs (like KVM or Xen).  Say Y or M.</div><div class='ctx'> </div><div class='ctx'> config NLMON</div><div class='ctx'> 	tristate "Virtual netlink monitoring device"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables a monitoring net device for netlink skbs. The</div><div class='ctx'> 	  purpose of this is to analyze netlink messages with packet sockets.</div><div class='ctx'> 	  Thus applications like tcpdump will be able to see local netlink</div><div class='hunk'>@@ -351,23 +464,40 @@ config NLMON</div><div class='ctx'> 	  diagnostics, etc. This is mostly intended for developers or support</div><div class='ctx'> 	  to debug netlink issues. If unsure, say N.</div><div class='ctx'> </div><div class='add'>+config NETKIT</div><div class='add'>+	bool "BPF-programmable network device"</div><div class='add'>+	depends on BPF_SYSCALL</div><div class='add'>+	help</div><div class='add'>+	  The netkit device is a virtual networking device where BPF programs</div><div class='add'>+	  can be attached to the device(s) transmission routine in order to</div><div class='add'>+	  implement the driver's internal logic. The device can be configured</div><div class='add'>+	  to operate in L3 or L2 mode. If unsure, say N.</div><div class='add'>+</div><div class='ctx'> config NET_VRF</div><div class='ctx'> 	tristate "Virtual Routing and Forwarding (Lite)"</div><div class='ctx'> 	depends on IP_MULTIPLE_TABLES</div><div class='ctx'> 	depends on NET_L3_MASTER_DEV</div><div class='ctx'> 	depends on IPV6 || IPV6=n</div><div class='ctx'> 	depends on IPV6_MULTIPLE_TABLES || IPV6=n</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables the support for mapping interfaces into VRF's. The</div><div class='ctx'> 	  support enables VRF devices.</div><div class='ctx'> </div><div class='ctx'> config VSOCKMON</div><div class='del'>-    tristate "Virtual vsock monitoring device"</div><div class='del'>-    depends on VHOST_VSOCK</div><div class='del'>-    ---help---</div><div class='del'>-     This option enables a monitoring net device for vsock sockets. It is</div><div class='del'>-     mostly intended for developers or support to debug vsock issues. If</div><div class='del'>-     unsure, say N.</div><div class='add'>+	tristate "Virtual vsock monitoring device"</div><div class='add'>+	depends on VHOST_VSOCK</div><div class='add'>+	help</div><div class='add'>+	  This option enables a monitoring net device for vsock sockets. It is</div><div class='add'>+	  mostly intended for developers or support to debug vsock issues. If</div><div class='add'>+	  unsure, say N.</div><div class='add'>+</div><div class='add'>+config MHI_NET</div><div class='add'>+	tristate "MHI network driver"</div><div class='add'>+	depends on MHI_BUS</div><div class='add'>+	help</div><div class='add'>+	  This is the network driver for MHI bus.  It can be used with</div><div class='add'>+	  QCOM based WWAN modems for IP or QMAP/rmnet protocol (like SDX55).</div><div class='add'>+	  Say Y or M.</div><div class='ctx'> </div><div class='ctx'> endif # NET_CORE</div><div class='ctx'> </div><div class='hunk'>@@ -388,32 +518,20 @@ source "drivers/net/fddi/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/hippi/Kconfig"</div><div class='ctx'> </div><div class='del'>-config NET_SB1000</div><div class='del'>-	tristate "General Instruments Surfboard 1000"</div><div class='del'>-	depends on PNP</div><div class='del'>-	---help---</div><div class='del'>-	  This is a driver for the General Instrument (also known as</div><div class='del'>-	  NextLevel) SURFboard 1000 internal</div><div class='del'>-	  cable modem. This is an ISA card which is used by a number of cable</div><div class='del'>-	  TV companies to provide cable modem access. It's a one-way</div><div class='del'>-	  downstream-only cable modem, meaning that your upstream net link is</div><div class='del'>-	  provided by your regular phone modem.</div><div class='del'>-</div><div class='del'>-	  At present this driver only compiles as a module, so say M here if</div><div class='del'>-	  you have this card. The module will be called sb1000. Then read</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/sb1000.txt&gt; for</div><div class='del'>-	  information on how to use this module, as it needs special ppp</div><div class='del'>-	  scripts for establishing a connection. Further documentation</div><div class='del'>-	  and the necessary scripts can be found at:</div><div class='del'>-</div><div class='del'>-	  &lt;http://www.jacksonville.net/~fventuri/&gt;</div><div class='del'>-	  &lt;http://home.adelphia.net/~siglercm/sb1000.html&gt;</div><div class='del'>-	  &lt;http://linuxpower.cx/~cable/&gt;</div><div class='del'>-</div><div class='del'>-	  If you don't have this card, of course say N.</div><div class='add'>+source "drivers/net/ipa/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/phy/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/net/pse-pd/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/net/can/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/net/mctp/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/net/mdio/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/net/pcs/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/net/plip/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/ppp/Kconfig"</div><div class='hunk'>@@ -426,16 +544,17 @@ source "drivers/net/usb/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/wireless/Kconfig"</div><div class='ctx'> </div><div class='del'>-source "drivers/net/wimax/Kconfig"</div><div class='del'>-</div><div class='ctx'> source "drivers/net/wan/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/ieee802154/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/net/wwan/Kconfig"</div><div class='add'>+</div><div class='ctx'> config XEN_NETDEV_FRONTEND</div><div class='ctx'> 	tristate "Xen network device frontend driver"</div><div class='ctx'> 	depends on XEN</div><div class='ctx'> 	select XEN_XENBUS_FRONTEND</div><div class='add'>+	select PAGE_POOL</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver provides support for Xen paravirtual network</div><div class='hunk'>@@ -474,9 +593,8 @@ config XEN_NETDEV_BACKEND</div><div class='ctx'> config VMXNET3</div><div class='ctx'> 	tristate "VMware VMXNET3 ethernet driver"</div><div class='ctx'> 	depends on PCI &amp;&amp; INET</div><div class='del'>-	depends on !(PAGE_SIZE_64KB || ARM64_64K_PAGES || \</div><div class='del'>-		     IA64_PAGE_SIZE_64KB || MICROBLAZE_64K_PAGES || \</div><div class='del'>-		     PARISC_PAGE_SIZE_64KB || PPC_64K_PAGES)</div><div class='add'>+	depends on PAGE_SIZE_LESS_THAN_64KB</div><div class='add'>+	select PAGE_POOL</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports VMware's vmxnet3 virtual ethernet NIC.</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the</div><div class='hunk'>@@ -487,26 +605,21 @@ config FUJITSU_ES</div><div class='ctx'> 	depends on ACPI</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver provides support for Extended Socket network device</div><div class='del'>-          on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.</div><div class='del'>-</div><div class='del'>-config THUNDERBOLT_NET</div><div class='del'>-	tristate "Networking over Thunderbolt cable"</div><div class='del'>-	depends on THUNDERBOLT &amp;&amp; INET</div><div class='del'>-	help</div><div class='del'>-	  Select this if you want to create network between two</div><div class='del'>-	  computers over a Thunderbolt cable. The driver supports Apple</div><div class='del'>-	  ThunderboltIP protocol and allows communication with any host</div><div class='del'>-	  supporting the same protocol including Windows and macOS.</div><div class='del'>-</div><div class='del'>-	  To compile this driver a module, choose M here. The module will be</div><div class='del'>-	  called thunderbolt-net.</div><div class='add'>+	  on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.</div><div class='ctx'> </div><div class='add'>+source "drivers/net/thunderbolt/Kconfig"</div><div class='ctx'> source "drivers/net/hyperv/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config NETDEVSIM</div><div class='ctx'> 	tristate "Simulated networking device"</div><div class='ctx'> 	depends on DEBUG_FS</div><div class='add'>+	depends on INET</div><div class='add'>+	depends on IPV6 || IPV6=n</div><div class='add'>+	depends on PSAMPLE || PSAMPLE=n</div><div class='add'>+	depends on PTP_1588_CLOCK_MOCK || PTP_1588_CLOCK_MOCK=n</div><div class='ctx'> 	select NET_DEVLINK</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	select NET_SHAPER</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver is a developer testing tool and software model that can</div><div class='ctx'> 	  be used to test various control path networking APIs, especially</div><div class='hunk'>@@ -527,4 +640,11 @@ config NET_FAILOVER</div><div class='ctx'> 	  a VM with direct attached VF by failing over to the paravirtual</div><div class='ctx'> 	  datapath when the VF is unplugged.</div><div class='ctx'> </div><div class='add'>+config NETDEV_LEGACY_INIT</div><div class='add'>+	bool</div><div class='add'>+	depends on ISA</div><div class='add'>+	help</div><div class='add'>+	  Drivers that call netdev_boot_setup_check() should select this</div><div class='add'>+	  symbol, everything else no longer needs it.</div><div class='add'>+</div><div class='ctx'> endif # NETDEVICES</div><div class='head'>diff --git a/drivers/net/Makefile b/drivers/net/Makefile<br/>index 0d3ba056cda3..73bc63ecd65f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/Makefile</a></div><div class='hunk'>@@ -10,41 +10,54 @@ obj-$(CONFIG_BONDING) += bonding/</div><div class='ctx'> obj-$(CONFIG_IPVLAN) += ipvlan/</div><div class='ctx'> obj-$(CONFIG_IPVTAP) += ipvlan/</div><div class='ctx'> obj-$(CONFIG_DUMMY) += dummy.o</div><div class='add'>+obj-$(CONFIG_WIREGUARD) += wireguard/</div><div class='add'>+obj-$(CONFIG_OVPN) += ovpn/</div><div class='ctx'> obj-$(CONFIG_EQUALIZER) += eql.o</div><div class='ctx'> obj-$(CONFIG_IFB) += ifb.o</div><div class='ctx'> obj-$(CONFIG_MACSEC) += macsec.o</div><div class='add'>+obj-$(CONFIG_AMT) += amt.o</div><div class='ctx'> obj-$(CONFIG_MACVLAN) += macvlan.o</div><div class='ctx'> obj-$(CONFIG_MACVTAP) += macvtap.o</div><div class='ctx'> obj-$(CONFIG_MII) += mii.o</div><div class='ctx'> obj-$(CONFIG_MDIO) += mdio.o</div><div class='del'>-obj-$(CONFIG_NET) += Space.o loopback.o</div><div class='add'>+obj-$(CONFIG_NET) += loopback.o</div><div class='add'>+obj-$(CONFIG_NETDEV_LEGACY_INIT) += Space.o</div><div class='ctx'> obj-$(CONFIG_NETCONSOLE) += netconsole.o</div><div class='add'>+obj-$(CONFIG_NETKIT) += netkit.o</div><div class='ctx'> obj-y += phy/</div><div class='add'>+obj-y += pse-pd/</div><div class='add'>+obj-y += mdio/</div><div class='add'>+obj-y += pcs/</div><div class='ctx'> obj-$(CONFIG_RIONET) += rionet.o</div><div class='ctx'> obj-$(CONFIG_NET_TEAM) += team/</div><div class='ctx'> obj-$(CONFIG_TUN) += tun.o</div><div class='ctx'> obj-$(CONFIG_TAP) += tap.o</div><div class='ctx'> obj-$(CONFIG_VETH) += veth.o</div><div class='ctx'> obj-$(CONFIG_VIRTIO_NET) += virtio_net.o</div><div class='del'>-obj-$(CONFIG_VXLAN) += vxlan.o</div><div class='add'>+obj-$(CONFIG_VXLAN) += vxlan/</div><div class='ctx'> obj-$(CONFIG_GENEVE) += geneve.o</div><div class='add'>+obj-$(CONFIG_BAREUDP) += bareudp.o</div><div class='ctx'> obj-$(CONFIG_GTP) += gtp.o</div><div class='ctx'> obj-$(CONFIG_NLMON) += nlmon.o</div><div class='add'>+obj-$(CONFIG_PFCP) += pfcp.o</div><div class='ctx'> obj-$(CONFIG_NET_VRF) += vrf.o</div><div class='ctx'> obj-$(CONFIG_VSOCKMON) += vsockmon.o</div><div class='add'>+obj-$(CONFIG_MHI_NET) += mhi_net.o</div><div class='ctx'> </div><div class='ctx'> #</div><div class='ctx'> # Networking Drivers</div><div class='ctx'> #</div><div class='ctx'> obj-$(CONFIG_ARCNET) += arcnet/</div><div class='del'>-obj-$(CONFIG_DEV_APPLETALK) += appletalk/</div><div class='ctx'> obj-$(CONFIG_CAIF) += caif/</div><div class='ctx'> obj-$(CONFIG_CAN) += can/</div><div class='add'>+ifdef CONFIG_NET_DSA</div><div class='ctx'> obj-y += dsa/</div><div class='add'>+endif</div><div class='ctx'> obj-$(CONFIG_ETHERNET) += ethernet/</div><div class='ctx'> obj-$(CONFIG_FDDI) += fddi/</div><div class='ctx'> obj-$(CONFIG_HIPPI) += hippi/</div><div class='ctx'> obj-$(CONFIG_HAMRADIO) += hamradio/</div><div class='add'>+obj-$(CONFIG_QCOM_IPA) += ipa/</div><div class='ctx'> obj-$(CONFIG_PLIP) += plip/</div><div class='ctx'> obj-$(CONFIG_PPP) += ppp/</div><div class='ctx'> obj-$(CONFIG_PPP_ASYNC) += ppp/</div><div class='hunk'>@@ -57,12 +70,12 @@ obj-$(CONFIG_PPPOL2TP) += ppp/</div><div class='ctx'> obj-$(CONFIG_PPTP) += ppp/</div><div class='ctx'> obj-$(CONFIG_SLIP) += slip/</div><div class='ctx'> obj-$(CONFIG_SLHC) += slip/</div><div class='del'>-obj-$(CONFIG_NET_SB1000) += sb1000.o</div><div class='ctx'> obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o</div><div class='ctx'> obj-$(CONFIG_WAN) += wan/</div><div class='ctx'> obj-$(CONFIG_WLAN) += wireless/</div><div class='del'>-obj-$(CONFIG_WIMAX) += wimax/</div><div class='ctx'> obj-$(CONFIG_IEEE802154) += ieee802154/</div><div class='add'>+obj-$(CONFIG_WWAN) += wwan/</div><div class='add'>+obj-$(CONFIG_MCTP) += mctp/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_VMXNET3) += vmxnet3/</div><div class='ctx'> obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o</div><div class='hunk'>@@ -74,8 +87,6 @@ obj-$(CONFIG_HYPERV_NET) += hyperv/</div><div class='ctx'> obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FUJITSU_ES) += fjes/</div><div class='del'>-</div><div class='del'>-thunderbolt-net-y += thunderbolt.o</div><div class='del'>-obj-$(CONFIG_THUNDERBOLT_NET) += thunderbolt-net.o</div><div class='add'>+obj-$(CONFIG_USB4_NET) += thunderbolt/</div><div class='ctx'> obj-$(CONFIG_NETDEVSIM) += netdevsim/</div><div class='ctx'> obj-$(CONFIG_NET_FAILOVER) += net_failover.o</div><div class='head'>diff --git a/drivers/net/Space.c b/drivers/net/Space.c<br/>index 890c86e11bcc..c01e2c2f7d6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/Space.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/Space.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/Space.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/Space.c</a></div><div class='hunk'>@@ -30,6 +30,147 @@</div><div class='ctx'> #include &lt;linux/netlink.h&gt;</div><div class='ctx'> #include &lt;net/Space.h&gt;</div><div class='ctx'> </div><div class='add'>+/*</div><div class='add'>+ * This structure holds boot-time configured netdevice settings. They</div><div class='add'>+ * are then used in the device probing.</div><div class='add'>+ */</div><div class='add'>+struct netdev_boot_setup {</div><div class='add'>+	char name[IFNAMSIZ];</div><div class='add'>+	struct ifmap map;</div><div class='add'>+};</div><div class='add'>+#define NETDEV_BOOT_SETUP_MAX 8</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ *		      Device Boot-time Settings Routines</div><div class='add'>+ *</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Boot time configuration table */</div><div class='add'>+static struct netdev_boot_setup dev_boot_setup[NETDEV_BOOT_SETUP_MAX];</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	netdev_boot_setup_add	- add new setup entry</div><div class='add'>+ *	@name: name of the device</div><div class='add'>+ *	@map: configured settings for the device</div><div class='add'>+ *</div><div class='add'>+ *	Adds new setup entry to the dev_boot_setup list.  The function</div><div class='add'>+ *	returns 0 on error and 1 on success.  This is a generic routine to</div><div class='add'>+ *	all netdevices.</div><div class='add'>+ */</div><div class='add'>+static int netdev_boot_setup_add(char *name, struct ifmap *map)</div><div class='add'>+{</div><div class='add'>+	struct netdev_boot_setup *s;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	s = dev_boot_setup;</div><div class='add'>+	for (i = 0; i &lt; NETDEV_BOOT_SETUP_MAX; i++) {</div><div class='add'>+		if (s[i].name[0] == '\0' || s[i].name[0] == ' ') {</div><div class='add'>+			strscpy_pad(s[i].name, name);</div><div class='add'>+			memcpy(&amp;s[i].map, map, sizeof(s[i].map));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i &gt;= NETDEV_BOOT_SETUP_MAX ? 0 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_boot_setup_check	- check boot time settings</div><div class='add'>+ * @dev: the netdevice</div><div class='add'>+ *</div><div class='add'>+ * Check boot time settings for the device.</div><div class='add'>+ * The found settings are set for the device to be used</div><div class='add'>+ * later in the device probing.</div><div class='add'>+ * Returns 0 if no settings found, 1 if they are.</div><div class='add'>+ */</div><div class='add'>+int netdev_boot_setup_check(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_boot_setup *s = dev_boot_setup;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NETDEV_BOOT_SETUP_MAX; i++) {</div><div class='add'>+		if (s[i].name[0] != '\0' &amp;&amp; s[i].name[0] != ' ' &amp;&amp;</div><div class='add'>+		    !strcmp(dev-&gt;name, s[i].name)) {</div><div class='add'>+			dev-&gt;irq = s[i].map.irq;</div><div class='add'>+			dev-&gt;base_addr = s[i].map.base_addr;</div><div class='add'>+			dev-&gt;mem_start = s[i].map.mem_start;</div><div class='add'>+			dev-&gt;mem_end = s[i].map.mem_end;</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(netdev_boot_setup_check);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * netdev_boot_base	- get address from boot time settings</div><div class='add'>+ * @prefix: prefix for network device</div><div class='add'>+ * @unit: id for network device</div><div class='add'>+ *</div><div class='add'>+ * Check boot time settings for the base address of device.</div><div class='add'>+ * The found settings are set for the device to be used</div><div class='add'>+ * later in the device probing.</div><div class='add'>+ * Returns 0 if no settings found.</div><div class='add'>+ */</div><div class='add'>+static unsigned long netdev_boot_base(const char *prefix, int unit)</div><div class='add'>+{</div><div class='add'>+	const struct netdev_boot_setup *s = dev_boot_setup;</div><div class='add'>+	char name[IFNAMSIZ];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	sprintf(name, "%s%d", prefix, unit);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If device already registered then return base of 1</div><div class='add'>+	 * to indicate not to probe for this interface</div><div class='add'>+	 */</div><div class='add'>+	if (__dev_get_by_name(&amp;init_net, name))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NETDEV_BOOT_SETUP_MAX; i++)</div><div class='add'>+		if (!strcmp(name, s[i].name))</div><div class='add'>+			return s[i].map.base_addr;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Saves at boot time configured settings for any netdevice.</div><div class='add'>+ */</div><div class='add'>+static int __init netdev_boot_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	int ints[5];</div><div class='add'>+	struct ifmap map;</div><div class='add'>+</div><div class='add'>+	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='add'>+	if (!str || !*str)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Save settings */</div><div class='add'>+	memset(&amp;map, 0, sizeof(map));</div><div class='add'>+	if (ints[0] &gt; 0)</div><div class='add'>+		map.irq = ints[1];</div><div class='add'>+	if (ints[0] &gt; 1)</div><div class='add'>+		map.base_addr = ints[2];</div><div class='add'>+	if (ints[0] &gt; 2)</div><div class='add'>+		map.mem_start = ints[3];</div><div class='add'>+	if (ints[0] &gt; 3)</div><div class='add'>+		map.mem_end = ints[4];</div><div class='add'>+</div><div class='add'>+	/* Add new entry to the list */</div><div class='add'>+	return netdev_boot_setup_add(str, &amp;map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+__setup("netdev=", netdev_boot_setup);</div><div class='add'>+</div><div class='add'>+static int __init ether_boot_setup(char *str)</div><div class='add'>+{</div><div class='add'>+	return netdev_boot_setup(str);</div><div class='add'>+}</div><div class='add'>+__setup("ether=", ether_boot_setup);</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* A unified ethernet device probe.  This is the easiest way to have every</div><div class='ctx'>  * ethernet adaptor have the name "eth[0123...]".</div><div class='ctx'>  */</div><div class='hunk'>@@ -59,9 +200,6 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe)</div><div class='ctx'>  * look for EISA/PCI cards in addition to ISA cards).</div><div class='ctx'>  */</div><div class='ctx'> static struct devprobe2 isa_probes[] __initdata = {</div><div class='del'>-#if defined(CONFIG_HP100) &amp;&amp; defined(CONFIG_ISA)	/* ISA, EISA */</div><div class='del'>-	{hp100_probe, 0},</div><div class='del'>-#endif</div><div class='ctx'> #ifdef CONFIG_3C515</div><div class='ctx'> 	{tc515_probe, 0},</div><div class='ctx'> #endif</div><div class='hunk'>@@ -80,36 +218,9 @@ static struct devprobe2 isa_probes[] __initdata = {</div><div class='ctx'> #ifdef CONFIG_SMC9194</div><div class='ctx'> 	{smc_init, 0},</div><div class='ctx'> #endif</div><div class='del'>-#ifdef CONFIG_CS89x0</div><div class='del'>-#ifndef CONFIG_CS89x0_PLATFORM</div><div class='add'>+#ifdef CONFIG_CS89x0_ISA</div><div class='ctx'> 	{cs89x0_probe, 0},</div><div class='ctx'> #endif</div><div class='del'>-#endif</div><div class='del'>-#if defined(CONFIG_MVME16x_NET) || defined(CONFIG_BVME6000_NET)	/* Intel */</div><div class='del'>-	{i82596_probe, 0},					/* I82596 */</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_NI65</div><div class='del'>-	{ni65_probe, 0},</div><div class='del'>-#endif</div><div class='del'>-	{NULL, 0},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct devprobe2 m68k_probes[] __initdata = {</div><div class='del'>-#ifdef CONFIG_ATARILANCE	/* Lance-based Atari ethernet boards */</div><div class='del'>-	{atarilance_probe, 0},</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SUN3LANCE         /* sun3 onboard Lance chip */</div><div class='del'>-	{sun3lance_probe, 0},</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_SUN3_82586        /* sun3 onboard Intel 82586 chip */</div><div class='del'>-	{sun3_82586_probe, 0},</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_APNE		/* A1200 PCMCIA NE2000 */</div><div class='del'>-	{apne_probe, 0},</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MVME147_NET	/* MVME147 internal Ethernet */</div><div class='del'>-	{mvme147lance_probe, 0},</div><div class='del'>-#endif</div><div class='ctx'> 	{NULL, 0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -124,8 +235,7 @@ static void __init ethif_probe2(int unit)</div><div class='ctx'> 	if (base_addr == 1)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	(void)(probe_list2(unit, m68k_probes, base_addr == 0) &amp;&amp;</div><div class='del'>-		probe_list2(unit, isa_probes, base_addr == 0));</div><div class='add'>+	probe_list2(unit, isa_probes, base_addr == 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*  Statically configured drivers -- order matters here. */</div><div class='hunk'>@@ -133,22 +243,9 @@ static int __init net_olddevs_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int num;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SBNI</div><div class='del'>-	for (num = 0; num &lt; 8; ++num)</div><div class='del'>-		sbni_probe(num);</div><div class='del'>-#endif</div><div class='ctx'> 	for (num = 0; num &lt; 8; ++num)</div><div class='ctx'> 		ethif_probe2(num);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_COPS</div><div class='del'>-	cops_probe(0);</div><div class='del'>-	cops_probe(1);</div><div class='del'>-	cops_probe(2);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_LTPC</div><div class='del'>-	ltpc_probe();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/amt.c b/drivers/net/amt.c<br/>new file mode 100644<br/>index 000000000000..902c817a0dea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/amt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/amt.c</a></div><div class='hunk'>@@ -0,0 +1,3452 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Copyright (c) 2021 Taehee Yoo &lt;ap420073@gmail.com&gt; */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;linux/jhash.h&gt;</div><div class='add'>+#include &lt;linux/if_tunnel.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/igmp.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;net/flow.h&gt;</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+#include &lt;net/net_namespace.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/icmp.h&gt;</div><div class='add'>+#include &lt;net/mld.h&gt;</div><div class='add'>+#include &lt;net/amt.h&gt;</div><div class='add'>+#include &lt;uapi/linux/amt.h&gt;</div><div class='add'>+#include &lt;linux/security.h&gt;</div><div class='add'>+#include &lt;net/gro_cells.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/if_inet6.h&gt;</div><div class='add'>+#include &lt;net/ndisc.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='add'>+#include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/inet_dscp.h&gt;</div><div class='add'>+#include &lt;net/ip6_checksum.h&gt;</div><div class='add'>+</div><div class='add'>+static struct workqueue_struct *amt_wq;</div><div class='add'>+</div><div class='add'>+static HLIST_HEAD(source_gc_list);</div><div class='add'>+/* Lock for source_gc_list */</div><div class='add'>+static spinlock_t source_gc_lock;</div><div class='add'>+static struct delayed_work source_gc_wq;</div><div class='add'>+static char *status_str[] = {</div><div class='add'>+	"AMT_STATUS_INIT",</div><div class='add'>+	"AMT_STATUS_SENT_DISCOVERY",</div><div class='add'>+	"AMT_STATUS_RECEIVED_DISCOVERY",</div><div class='add'>+	"AMT_STATUS_SENT_ADVERTISEMENT",</div><div class='add'>+	"AMT_STATUS_RECEIVED_ADVERTISEMENT",</div><div class='add'>+	"AMT_STATUS_SENT_REQUEST",</div><div class='add'>+	"AMT_STATUS_RECEIVED_REQUEST",</div><div class='add'>+	"AMT_STATUS_SENT_QUERY",</div><div class='add'>+	"AMT_STATUS_RECEIVED_QUERY",</div><div class='add'>+	"AMT_STATUS_SENT_UPDATE",</div><div class='add'>+	"AMT_STATUS_RECEIVED_UPDATE",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *type_str[] = {</div><div class='add'>+	"", /* Type 0 is not defined */</div><div class='add'>+	"AMT_MSG_DISCOVERY",</div><div class='add'>+	"AMT_MSG_ADVERTISEMENT",</div><div class='add'>+	"AMT_MSG_REQUEST",</div><div class='add'>+	"AMT_MSG_MEMBERSHIP_QUERY",</div><div class='add'>+	"AMT_MSG_MEMBERSHIP_UPDATE",</div><div class='add'>+	"AMT_MSG_MULTICAST_DATA",</div><div class='add'>+	"AMT_MSG_TEARDOWN",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static char *action_str[] = {</div><div class='add'>+	"AMT_ACT_GMI",</div><div class='add'>+	"AMT_ACT_GMI_ZERO",</div><div class='add'>+	"AMT_ACT_GT",</div><div class='add'>+	"AMT_ACT_STATUS_FWD_NEW",</div><div class='add'>+	"AMT_ACT_STATUS_D_FWD_NEW",</div><div class='add'>+	"AMT_ACT_STATUS_NONE_NEW",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct igmpv3_grec igmpv3_zero_grec;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+#define MLD2_ALL_NODE_INIT { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01 } } }</div><div class='add'>+static struct in6_addr mld2_all_node = MLD2_ALL_NODE_INIT;</div><div class='add'>+static struct mld2_grec mldv2_zero_grec;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct amt_skb_cb *amt_skb_cb(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct amt_skb_cb) + sizeof(struct tc_skb_cb) &gt;</div><div class='add'>+		     sizeof_field(struct sk_buff, cb));</div><div class='add'>+</div><div class='add'>+	return (struct amt_skb_cb *)((void *)skb-&gt;cb +</div><div class='add'>+		sizeof(struct tc_skb_cb));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __amt_source_gc_work(void)</div><div class='add'>+{</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+	struct hlist_head gc_list;</div><div class='add'>+	struct hlist_node *t;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;source_gc_lock);</div><div class='add'>+	hlist_move_list(&amp;source_gc_list, &amp;gc_list);</div><div class='add'>+	spin_unlock_bh(&amp;source_gc_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(snode, t, &amp;gc_list, node) {</div><div class='add'>+		hlist_del_rcu(&amp;snode-&gt;node);</div><div class='add'>+		kfree_rcu(snode, rcu);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_source_gc_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	__amt_source_gc_work();</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;source_gc_lock);</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;source_gc_wq,</div><div class='add'>+			 msecs_to_jiffies(AMT_GC_INTERVAL));</div><div class='add'>+	spin_unlock_bh(&amp;source_gc_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_addr_equal(union amt_addr *a, union amt_addr *b)</div><div class='add'>+{</div><div class='add'>+	return !memcmp(a, b, sizeof(union amt_addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 amt_source_hash(struct amt_tunnel_list *tunnel, union amt_addr *src)</div><div class='add'>+{</div><div class='add'>+	u32 hash = jhash(src, sizeof(*src), tunnel-&gt;amt-&gt;hash_seed);</div><div class='add'>+</div><div class='add'>+	return reciprocal_scale(hash, tunnel-&gt;amt-&gt;hash_buckets);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_status_filter(struct amt_source_node *snode,</div><div class='add'>+			      enum amt_filter filter)</div><div class='add'>+{</div><div class='add'>+	bool rc = false;</div><div class='add'>+</div><div class='add'>+	switch (filter) {</div><div class='add'>+	case AMT_FILTER_FWD:</div><div class='add'>+		if (snode-&gt;status == AMT_SOURCE_STATUS_FWD &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_OLD)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_D_FWD:</div><div class='add'>+		if (snode-&gt;status == AMT_SOURCE_STATUS_D_FWD &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_OLD)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_FWD_NEW:</div><div class='add'>+		if (snode-&gt;status == AMT_SOURCE_STATUS_FWD &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_NEW)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_D_FWD_NEW:</div><div class='add'>+		if (snode-&gt;status == AMT_SOURCE_STATUS_D_FWD &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_NEW)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_ALL:</div><div class='add'>+		rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_NONE_NEW:</div><div class='add'>+		if (snode-&gt;status == AMT_SOURCE_STATUS_NONE &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_NEW)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_BOTH:</div><div class='add'>+		if ((snode-&gt;status == AMT_SOURCE_STATUS_D_FWD ||</div><div class='add'>+		     snode-&gt;status == AMT_SOURCE_STATUS_FWD) &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_OLD)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_FILTER_BOTH_NEW:</div><div class='add'>+		if ((snode-&gt;status == AMT_SOURCE_STATUS_D_FWD ||</div><div class='add'>+		     snode-&gt;status == AMT_SOURCE_STATUS_FWD) &amp;&amp;</div><div class='add'>+		    snode-&gt;flags == AMT_SOURCE_NEW)</div><div class='add'>+			rc = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct amt_source_node *amt_lookup_src(struct amt_tunnel_list *tunnel,</div><div class='add'>+					      struct amt_group_node *gnode,</div><div class='add'>+					      enum amt_filter filter,</div><div class='add'>+					      union amt_addr *src)</div><div class='add'>+{</div><div class='add'>+	u32 hash = amt_source_hash(tunnel, src);</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(snode, &amp;gnode-&gt;sources[hash], node)</div><div class='add'>+		if (amt_status_filter(snode, filter) &amp;&amp;</div><div class='add'>+		    amt_addr_equal(&amp;snode-&gt;source_addr, src))</div><div class='add'>+			return snode;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 amt_group_hash(struct amt_tunnel_list *tunnel, union amt_addr *group)</div><div class='add'>+{</div><div class='add'>+	u32 hash = jhash(group, sizeof(*group), tunnel-&gt;amt-&gt;hash_seed);</div><div class='add'>+</div><div class='add'>+	return reciprocal_scale(hash, tunnel-&gt;amt-&gt;hash_buckets);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct amt_group_node *amt_lookup_group(struct amt_tunnel_list *tunnel,</div><div class='add'>+					       union amt_addr *group,</div><div class='add'>+					       union amt_addr *host,</div><div class='add'>+					       bool v6)</div><div class='add'>+{</div><div class='add'>+	u32 hash = amt_group_hash(tunnel, group);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(gnode, &amp;tunnel-&gt;groups[hash], node) {</div><div class='add'>+		if (amt_addr_equal(&amp;gnode-&gt;group_addr, group) &amp;&amp;</div><div class='add'>+		    amt_addr_equal(&amp;gnode-&gt;host_addr, host) &amp;&amp;</div><div class='add'>+		    gnode-&gt;v6 == v6)</div><div class='add'>+			return gnode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_destroy_source(struct amt_source_node *snode)</div><div class='add'>+{</div><div class='add'>+	struct amt_group_node *gnode = snode-&gt;gnode;</div><div class='add'>+	struct amt_tunnel_list *tunnel;</div><div class='add'>+</div><div class='add'>+	tunnel = gnode-&gt;tunnel_list;</div><div class='add'>+</div><div class='add'>+	if (!gnode-&gt;v6) {</div><div class='add'>+		netdev_dbg(snode-&gt;gnode-&gt;amt-&gt;dev,</div><div class='add'>+			   "Delete source %pI4 from %pI4\n",</div><div class='add'>+			   &amp;snode-&gt;source_addr.ip4,</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip4);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		netdev_dbg(snode-&gt;gnode-&gt;amt-&gt;dev,</div><div class='add'>+			   "Delete source %pI6 from %pI6\n",</div><div class='add'>+			   &amp;snode-&gt;source_addr.ip6,</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip6);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;snode-&gt;source_timer);</div><div class='add'>+	hlist_del_init_rcu(&amp;snode-&gt;node);</div><div class='add'>+	tunnel-&gt;nr_sources--;</div><div class='add'>+	gnode-&gt;nr_sources--;</div><div class='add'>+	spin_lock_bh(&amp;source_gc_lock);</div><div class='add'>+	hlist_add_head_rcu(&amp;snode-&gt;node, &amp;source_gc_list);</div><div class='add'>+	spin_unlock_bh(&amp;source_gc_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_del_group(struct amt_dev *amt, struct amt_group_node *gnode)</div><div class='add'>+{</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+	struct hlist_node *t;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (cancel_delayed_work(&amp;gnode-&gt;group_timer))</div><div class='add'>+		dev_put(amt-&gt;dev);</div><div class='add'>+	hlist_del_rcu(&amp;gnode-&gt;node);</div><div class='add'>+	gnode-&gt;tunnel_list-&gt;nr_groups--;</div><div class='add'>+</div><div class='add'>+	if (!gnode-&gt;v6)</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Leave group %pI4\n",</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip4);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Leave group %pI6\n",</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip6);</div><div class='add'>+#endif</div><div class='add'>+	for (i = 0; i &lt; amt-&gt;hash_buckets; i++)</div><div class='add'>+		hlist_for_each_entry_safe(snode, t, &amp;gnode-&gt;sources[i], node)</div><div class='add'>+			amt_destroy_source(snode);</div><div class='add'>+</div><div class='add'>+	/* tunnel-&gt;lock was acquired outside of amt_del_group()</div><div class='add'>+	 * But rcu_read_lock() was acquired too so It's safe.</div><div class='add'>+	 */</div><div class='add'>+	kfree_rcu(gnode, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If a source timer expires with a router filter-mode for the group of</div><div class='add'>+ * INCLUDE, the router concludes that traffic from this particular</div><div class='add'>+ * source is no longer desired on the attached network, and deletes the</div><div class='add'>+ * associated source record.</div><div class='add'>+ */</div><div class='add'>+static void amt_source_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_source_node *snode = container_of(to_delayed_work(work),</div><div class='add'>+						     struct amt_source_node,</div><div class='add'>+						     source_timer);</div><div class='add'>+	struct amt_group_node *gnode = snode-&gt;gnode;</div><div class='add'>+	struct amt_dev *amt = gnode-&gt;amt;</div><div class='add'>+	struct amt_tunnel_list *tunnel;</div><div class='add'>+</div><div class='add'>+	tunnel = gnode-&gt;tunnel_list;</div><div class='add'>+	spin_lock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+		amt_destroy_source(snode);</div><div class='add'>+		if (!gnode-&gt;nr_sources)</div><div class='add'>+			amt_del_group(amt, gnode);</div><div class='add'>+	} else {</div><div class='add'>+		/* When a router filter-mode for a group is EXCLUDE,</div><div class='add'>+		 * source records are only deleted when the group timer expires</div><div class='add'>+		 */</div><div class='add'>+		snode-&gt;status = AMT_SOURCE_STATUS_D_FWD;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_act_src(struct amt_tunnel_list *tunnel,</div><div class='add'>+			struct amt_group_node *gnode,</div><div class='add'>+			struct amt_source_node *snode,</div><div class='add'>+			enum amt_act act)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = tunnel-&gt;amt;</div><div class='add'>+</div><div class='add'>+	switch (act) {</div><div class='add'>+	case AMT_ACT_GMI:</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;snode-&gt;source_timer,</div><div class='add'>+				 msecs_to_jiffies(amt_gmi(amt)));</div><div class='add'>+		break;</div><div class='add'>+	case AMT_ACT_GMI_ZERO:</div><div class='add'>+		cancel_delayed_work(&amp;snode-&gt;source_timer);</div><div class='add'>+		break;</div><div class='add'>+	case AMT_ACT_GT:</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;snode-&gt;source_timer,</div><div class='add'>+				 gnode-&gt;group_timer.timer.expires);</div><div class='add'>+		break;</div><div class='add'>+	case AMT_ACT_STATUS_FWD_NEW:</div><div class='add'>+		snode-&gt;status = AMT_SOURCE_STATUS_FWD;</div><div class='add'>+		snode-&gt;flags = AMT_SOURCE_NEW;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_ACT_STATUS_D_FWD_NEW:</div><div class='add'>+		snode-&gt;status = AMT_SOURCE_STATUS_D_FWD;</div><div class='add'>+		snode-&gt;flags = AMT_SOURCE_NEW;</div><div class='add'>+		break;</div><div class='add'>+	case AMT_ACT_STATUS_NONE_NEW:</div><div class='add'>+		cancel_delayed_work(&amp;snode-&gt;source_timer);</div><div class='add'>+		snode-&gt;status = AMT_SOURCE_STATUS_NONE;</div><div class='add'>+		snode-&gt;flags = AMT_SOURCE_NEW;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gnode-&gt;v6)</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Source %pI4 from %pI4 Acted %s\n",</div><div class='add'>+			   &amp;snode-&gt;source_addr.ip4,</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip4,</div><div class='add'>+			   action_str[act]);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Source %pI6 from %pI6 Acted %s\n",</div><div class='add'>+			   &amp;snode-&gt;source_addr.ip6,</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip6,</div><div class='add'>+			   action_str[act]);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct amt_source_node *amt_alloc_snode(struct amt_group_node *gnode,</div><div class='add'>+					       union amt_addr *src)</div><div class='add'>+{</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+</div><div class='add'>+	snode = kzalloc(sizeof(*snode), GFP_ATOMIC);</div><div class='add'>+	if (!snode)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;snode-&gt;source_addr, src, sizeof(union amt_addr));</div><div class='add'>+	snode-&gt;gnode = gnode;</div><div class='add'>+	snode-&gt;status = AMT_SOURCE_STATUS_NONE;</div><div class='add'>+	snode-&gt;flags = AMT_SOURCE_NEW;</div><div class='add'>+	INIT_HLIST_NODE(&amp;snode-&gt;node);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;snode-&gt;source_timer, amt_source_work);</div><div class='add'>+</div><div class='add'>+	return snode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RFC 3810 - 7.2.2.  Definition of Filter Timers</div><div class='add'>+ *</div><div class='add'>+ *  Router Mode          Filter Timer         Actions/Comments</div><div class='add'>+ *  -----------       -----------------       ----------------</div><div class='add'>+ *</div><div class='add'>+ *    INCLUDE             Not Used            All listeners in</div><div class='add'>+ *                                            INCLUDE mode.</div><div class='add'>+ *</div><div class='add'>+ *    EXCLUDE             Timer &gt; 0           At least one listener</div><div class='add'>+ *                                            in EXCLUDE mode.</div><div class='add'>+ *</div><div class='add'>+ *    EXCLUDE             Timer == 0          No more listeners in</div><div class='add'>+ *                                            EXCLUDE mode for the</div><div class='add'>+ *                                            multicast address.</div><div class='add'>+ *                                            If the Requested List</div><div class='add'>+ *                                            is empty, delete</div><div class='add'>+ *                                            Multicast Address</div><div class='add'>+ *                                            Record.  If not, switch</div><div class='add'>+ *                                            to INCLUDE filter mode;</div><div class='add'>+ *                                            the sources in the</div><div class='add'>+ *                                            Requested List are</div><div class='add'>+ *                                            moved to the Include</div><div class='add'>+ *                                            List, and the Exclude</div><div class='add'>+ *                                            List is deleted.</div><div class='add'>+ */</div><div class='add'>+static void amt_group_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_group_node *gnode = container_of(to_delayed_work(work),</div><div class='add'>+						    struct amt_group_node,</div><div class='add'>+						    group_timer);</div><div class='add'>+	struct amt_tunnel_list *tunnel = gnode-&gt;tunnel_list;</div><div class='add'>+	struct amt_dev *amt = gnode-&gt;amt;</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+	bool delete_group = true;</div><div class='add'>+	struct hlist_node *t;</div><div class='add'>+	int i, buckets;</div><div class='add'>+</div><div class='add'>+	buckets = amt-&gt;hash_buckets;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+		/* Not Used */</div><div class='add'>+		spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i = 0; i &lt; buckets; i++) {</div><div class='add'>+		hlist_for_each_entry_safe(snode, t,</div><div class='add'>+					  &amp;gnode-&gt;sources[i], node) {</div><div class='add'>+			if (!delayed_work_pending(&amp;snode-&gt;source_timer) ||</div><div class='add'>+			    snode-&gt;status == AMT_SOURCE_STATUS_D_FWD) {</div><div class='add'>+				amt_destroy_source(snode);</div><div class='add'>+			} else {</div><div class='add'>+				delete_group = false;</div><div class='add'>+				snode-&gt;status = AMT_SOURCE_STATUS_FWD;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (delete_group)</div><div class='add'>+		amt_del_group(amt, gnode);</div><div class='add'>+	else</div><div class='add'>+		gnode-&gt;filter_mode = MCAST_INCLUDE;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+out:</div><div class='add'>+	dev_put(amt-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Non-existent group is created as INCLUDE {empty}:</div><div class='add'>+ *</div><div class='add'>+ * RFC 3376 - 5.1. Action on Change of Interface State</div><div class='add'>+ *</div><div class='add'>+ * If no interface state existed for that multicast address before</div><div class='add'>+ * the change (i.e., the change consisted of creating a new</div><div class='add'>+ * per-interface record), or if no state exists after the change</div><div class='add'>+ * (i.e., the change consisted of deleting a per-interface record),</div><div class='add'>+ * then the "non-existent" state is considered to have a filter mode</div><div class='add'>+ * of INCLUDE and an empty source list.</div><div class='add'>+ */</div><div class='add'>+static struct amt_group_node *amt_add_group(struct amt_dev *amt,</div><div class='add'>+					    struct amt_tunnel_list *tunnel,</div><div class='add'>+					    union amt_addr *group,</div><div class='add'>+					    union amt_addr *host,</div><div class='add'>+					    bool v6)</div><div class='add'>+{</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	u32 hash;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (tunnel-&gt;nr_groups &gt;= amt-&gt;max_groups)</div><div class='add'>+		return ERR_PTR(-ENOSPC);</div><div class='add'>+</div><div class='add'>+	gnode = kzalloc(sizeof(*gnode) +</div><div class='add'>+			(sizeof(struct hlist_head) * amt-&gt;hash_buckets),</div><div class='add'>+			GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!gnode))</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	gnode-&gt;amt = amt;</div><div class='add'>+	gnode-&gt;group_addr = *group;</div><div class='add'>+	gnode-&gt;host_addr = *host;</div><div class='add'>+	gnode-&gt;v6 = v6;</div><div class='add'>+	gnode-&gt;tunnel_list = tunnel;</div><div class='add'>+	gnode-&gt;filter_mode = MCAST_INCLUDE;</div><div class='add'>+	INIT_HLIST_NODE(&amp;gnode-&gt;node);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;gnode-&gt;group_timer, amt_group_work);</div><div class='add'>+	for (i = 0; i &lt; amt-&gt;hash_buckets; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;gnode-&gt;sources[i]);</div><div class='add'>+</div><div class='add'>+	hash = amt_group_hash(tunnel, group);</div><div class='add'>+	hlist_add_head_rcu(&amp;gnode-&gt;node, &amp;tunnel-&gt;groups[hash]);</div><div class='add'>+	tunnel-&gt;nr_groups++;</div><div class='add'>+</div><div class='add'>+	if (!gnode-&gt;v6)</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Join group %pI4\n",</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip4);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Join group %pI6\n",</div><div class='add'>+			   &amp;gnode-&gt;group_addr.ip6);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return gnode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *amt_build_igmp_gq(struct amt_dev *amt)</div><div class='add'>+{</div><div class='add'>+	u8 ra[AMT_IPHDR_OPTS] = { IPOPT_RA, 4, 0, 0 };</div><div class='add'>+	int hlen = LL_RESERVED_SPACE(amt-&gt;dev);</div><div class='add'>+	int tlen = amt-&gt;dev-&gt;needed_tailroom;</div><div class='add'>+	struct igmpv3_query *ihv3;</div><div class='add'>+	void *csum_start = NULL;</div><div class='add'>+	__sum16 *csum = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int offset;</div><div class='add'>+</div><div class='add'>+	len = hlen + tlen + sizeof(*iph) + AMT_IPHDR_OPTS + sizeof(*ihv3);</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(amt-&gt;dev, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, hlen);</div><div class='add'>+	skb_push(skb, sizeof(*eth));</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='add'>+	skb_put(skb, sizeof(*iph));</div><div class='add'>+	skb_put_data(skb, ra, sizeof(ra));</div><div class='add'>+	skb_put(skb, sizeof(*ihv3));</div><div class='add'>+	skb_pull(skb, sizeof(*eth));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	iph		= ip_hdr(skb);</div><div class='add'>+	iph-&gt;version	= 4;</div><div class='add'>+	iph-&gt;ihl	= (sizeof(struct iphdr) + AMT_IPHDR_OPTS) &gt;&gt; 2;</div><div class='add'>+	iph-&gt;tos	= AMT_TOS;</div><div class='add'>+	iph-&gt;tot_len	= htons(sizeof(*iph) + AMT_IPHDR_OPTS + sizeof(*ihv3));</div><div class='add'>+	iph-&gt;frag_off	= htons(IP_DF);</div><div class='add'>+	iph-&gt;ttl	= 1;</div><div class='add'>+	iph-&gt;id		= 0;</div><div class='add'>+	iph-&gt;protocol	= IPPROTO_IGMP;</div><div class='add'>+	iph-&gt;daddr	= htonl(INADDR_ALLHOSTS_GROUP);</div><div class='add'>+	iph-&gt;saddr	= htonl(INADDR_ANY);</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+</div><div class='add'>+	eth = eth_hdr(skb);</div><div class='add'>+	ether_addr_copy(eth-&gt;h_source, amt-&gt;dev-&gt;dev_addr);</div><div class='add'>+	ip_eth_mc_map(htonl(INADDR_ALLHOSTS_GROUP), eth-&gt;h_dest);</div><div class='add'>+	eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='add'>+</div><div class='add'>+	ihv3		= skb_pull(skb, sizeof(*iph) + AMT_IPHDR_OPTS);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	ihv3-&gt;type	= IGMP_HOST_MEMBERSHIP_QUERY;</div><div class='add'>+	ihv3-&gt;code	= 1;</div><div class='add'>+	ihv3-&gt;group	= 0;</div><div class='add'>+	ihv3-&gt;qqic	= amt-&gt;qi;</div><div class='add'>+	ihv3-&gt;nsrcs	= 0;</div><div class='add'>+	ihv3-&gt;resv	= 0;</div><div class='add'>+	ihv3-&gt;suppress	= false;</div><div class='add'>+	ihv3-&gt;qrv	= READ_ONCE(amt-&gt;net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='add'>+	ihv3-&gt;csum	= 0;</div><div class='add'>+	csum		= &amp;ihv3-&gt;csum;</div><div class='add'>+	csum_start	= (void *)ihv3;</div><div class='add'>+	*csum		= ip_compute_csum(csum_start, sizeof(*ihv3));</div><div class='add'>+	offset		= skb_transport_offset(skb);</div><div class='add'>+	skb-&gt;csum	= skb_checksum(skb, offset, skb-&gt;len - offset, 0);</div><div class='add'>+	skb-&gt;ip_summed	= CHECKSUM_NONE;</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*eth) + sizeof(*iph) + AMT_IPHDR_OPTS);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_update_gw_status(struct amt_dev *amt, enum amt_status status,</div><div class='add'>+				 bool validate)</div><div class='add'>+{</div><div class='add'>+	if (validate &amp;&amp; amt-&gt;status &gt;= status)</div><div class='add'>+		return;</div><div class='add'>+	netdev_dbg(amt-&gt;dev, "Update GW status %s -&gt; %s",</div><div class='add'>+		   status_str[amt-&gt;status], status_str[status]);</div><div class='add'>+	WRITE_ONCE(amt-&gt;status, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __amt_update_relay_status(struct amt_tunnel_list *tunnel,</div><div class='add'>+				      enum amt_status status,</div><div class='add'>+				      bool validate)</div><div class='add'>+{</div><div class='add'>+	if (validate &amp;&amp; tunnel-&gt;status &gt;= status)</div><div class='add'>+		return;</div><div class='add'>+	netdev_dbg(tunnel-&gt;amt-&gt;dev,</div><div class='add'>+		   "Update Tunnel(IP = %pI4, PORT = %u) status %s -&gt; %s",</div><div class='add'>+		   &amp;tunnel-&gt;ip4, ntohs(tunnel-&gt;source_port),</div><div class='add'>+		   status_str[tunnel-&gt;status], status_str[status]);</div><div class='add'>+	tunnel-&gt;status = status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_update_relay_status(struct amt_tunnel_list *tunnel,</div><div class='add'>+				    enum amt_status status, bool validate)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+	__amt_update_relay_status(tunnel, status, validate);</div><div class='add'>+	spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_send_discovery(struct amt_dev *amt)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_discovery *amtd;</div><div class='add'>+	int hlen, tlen, offset;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct udphdr *udph;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	u32 len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sock = rcu_dereference(amt-&gt;sock);</div><div class='add'>+	if (!sock)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(amt-&gt;stream_dev) || !netif_running(amt-&gt;dev))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rt = ip_route_output_ports(amt-&gt;net, &amp;fl4, sock-&gt;sk,</div><div class='add'>+				   amt-&gt;discovery_ip, amt-&gt;local_ip,</div><div class='add'>+				   amt-&gt;gw_port, amt-&gt;relay_port,</div><div class='add'>+				   IPPROTO_UDP, 0,</div><div class='add'>+				   amt-&gt;stream_dev-&gt;ifindex);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hlen = LL_RESERVED_SPACE(amt-&gt;dev);</div><div class='add'>+	tlen = amt-&gt;dev-&gt;needed_tailroom;</div><div class='add'>+	len = hlen + tlen + sizeof(*iph) + sizeof(*udph) + sizeof(*amtd);</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(amt-&gt;dev, len);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ip_rt_put(rt);</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='add'>+	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*iph) + sizeof(*udph) + sizeof(*amtd);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	amtd = skb_pull(skb, sizeof(*iph) + sizeof(*udph));</div><div class='add'>+	amtd-&gt;version	= 0;</div><div class='add'>+	amtd-&gt;type	= AMT_MSG_DISCOVERY;</div><div class='add'>+	amtd-&gt;reserved	= 0;</div><div class='add'>+	amtd-&gt;nonce	= amt-&gt;nonce;</div><div class='add'>+	skb_push(skb, sizeof(*udph));</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	udph		= udp_hdr(skb);</div><div class='add'>+	udph-&gt;source	= amt-&gt;gw_port;</div><div class='add'>+	udph-&gt;dest	= amt-&gt;relay_port;</div><div class='add'>+	udph-&gt;len	= htons(sizeof(*udph) + sizeof(*amtd));</div><div class='add'>+	udph-&gt;check	= 0;</div><div class='add'>+	offset = skb_transport_offset(skb);</div><div class='add'>+	skb-&gt;csum = skb_checksum(skb, offset, skb-&gt;len - offset, 0);</div><div class='add'>+	udph-&gt;check = csum_tcpudp_magic(amt-&gt;local_ip, amt-&gt;discovery_ip,</div><div class='add'>+					sizeof(*udph) + sizeof(*amtd),</div><div class='add'>+					IPPROTO_UDP, skb-&gt;csum);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*iph));</div><div class='add'>+	iph		= ip_hdr(skb);</div><div class='add'>+	iph-&gt;version	= 4;</div><div class='add'>+	iph-&gt;ihl	= (sizeof(struct iphdr)) &gt;&gt; 2;</div><div class='add'>+	iph-&gt;tos	= AMT_TOS;</div><div class='add'>+	iph-&gt;frag_off	= 0;</div><div class='add'>+	iph-&gt;ttl	= ip4_dst_hoplimit(&amp;rt-&gt;dst);</div><div class='add'>+	iph-&gt;daddr	= amt-&gt;discovery_ip;</div><div class='add'>+	iph-&gt;saddr	= amt-&gt;local_ip;</div><div class='add'>+	iph-&gt;protocol	= IPPROTO_UDP;</div><div class='add'>+	iph-&gt;tot_len	= htons(len);</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	ip_select_ident(amt-&gt;net, skb, NULL);</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+	err = ip_local_out(amt-&gt;net, sock-&gt;sk, skb);</div><div class='add'>+	if (unlikely(net_xmit_eval(err)))</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+	amt_update_gw_status(amt, AMT_STATUS_SENT_DISCOVERY, true);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_send_request(struct amt_dev *amt, bool v6)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_request *amtrh;</div><div class='add'>+	int hlen, tlen, offset;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct udphdr *udph;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	u32 len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sock = rcu_dereference(amt-&gt;sock);</div><div class='add'>+	if (!sock)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(amt-&gt;stream_dev) || !netif_running(amt-&gt;dev))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rt = ip_route_output_ports(amt-&gt;net, &amp;fl4, sock-&gt;sk,</div><div class='add'>+				   amt-&gt;remote_ip, amt-&gt;local_ip,</div><div class='add'>+				   amt-&gt;gw_port, amt-&gt;relay_port,</div><div class='add'>+				   IPPROTO_UDP, 0,</div><div class='add'>+				   amt-&gt;stream_dev-&gt;ifindex);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hlen = LL_RESERVED_SPACE(amt-&gt;dev);</div><div class='add'>+	tlen = amt-&gt;dev-&gt;needed_tailroom;</div><div class='add'>+	len = hlen + tlen + sizeof(*iph) + sizeof(*udph) + sizeof(*amtrh);</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(amt-&gt;dev, len);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ip_rt_put(rt);</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='add'>+	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*iph) + sizeof(*udph) + sizeof(*amtrh);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	amtrh = skb_pull(skb, sizeof(*iph) + sizeof(*udph));</div><div class='add'>+	amtrh-&gt;version	 = 0;</div><div class='add'>+	amtrh-&gt;type	 = AMT_MSG_REQUEST;</div><div class='add'>+	amtrh-&gt;reserved1 = 0;</div><div class='add'>+	amtrh-&gt;p	 = v6;</div><div class='add'>+	amtrh-&gt;reserved2 = 0;</div><div class='add'>+	amtrh-&gt;nonce	 = amt-&gt;nonce;</div><div class='add'>+	skb_push(skb, sizeof(*udph));</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	udph		= udp_hdr(skb);</div><div class='add'>+	udph-&gt;source	= amt-&gt;gw_port;</div><div class='add'>+	udph-&gt;dest	= amt-&gt;relay_port;</div><div class='add'>+	udph-&gt;len	= htons(sizeof(*amtrh) + sizeof(*udph));</div><div class='add'>+	udph-&gt;check	= 0;</div><div class='add'>+	offset = skb_transport_offset(skb);</div><div class='add'>+	skb-&gt;csum = skb_checksum(skb, offset, skb-&gt;len - offset, 0);</div><div class='add'>+	udph-&gt;check = csum_tcpudp_magic(amt-&gt;local_ip, amt-&gt;remote_ip,</div><div class='add'>+					sizeof(*udph) + sizeof(*amtrh),</div><div class='add'>+					IPPROTO_UDP, skb-&gt;csum);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*iph));</div><div class='add'>+	iph		= ip_hdr(skb);</div><div class='add'>+	iph-&gt;version	= 4;</div><div class='add'>+	iph-&gt;ihl	= (sizeof(struct iphdr)) &gt;&gt; 2;</div><div class='add'>+	iph-&gt;tos	= AMT_TOS;</div><div class='add'>+	iph-&gt;frag_off	= 0;</div><div class='add'>+	iph-&gt;ttl	= ip4_dst_hoplimit(&amp;rt-&gt;dst);</div><div class='add'>+	iph-&gt;daddr	= amt-&gt;remote_ip;</div><div class='add'>+	iph-&gt;saddr	= amt-&gt;local_ip;</div><div class='add'>+	iph-&gt;protocol	= IPPROTO_UDP;</div><div class='add'>+	iph-&gt;tot_len	= htons(len);</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	ip_select_ident(amt-&gt;net, skb, NULL);</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+	err = ip_local_out(amt-&gt;net, sock-&gt;sk, skb);</div><div class='add'>+	if (unlikely(net_xmit_eval(err)))</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_send_igmp_gq(struct amt_dev *amt,</div><div class='add'>+			     struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = amt_build_igmp_gq(amt);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	amt_skb_cb(skb)-&gt;tunnel = tunnel;</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static struct sk_buff *amt_build_mld_gq(struct amt_dev *amt)</div><div class='add'>+{</div><div class='add'>+	u8 ra[AMT_IP6HDR_OPTS] = { IPPROTO_ICMPV6, 0, IPV6_TLV_ROUTERALERT,</div><div class='add'>+				   2, 0, 0, IPV6_TLV_PAD1, IPV6_TLV_PAD1 };</div><div class='add'>+	int hlen = LL_RESERVED_SPACE(amt-&gt;dev);</div><div class='add'>+	int tlen = amt-&gt;dev-&gt;needed_tailroom;</div><div class='add'>+	struct mld2_query *mld2q;</div><div class='add'>+	void *csum_start = NULL;</div><div class='add'>+	struct ipv6hdr *ip6h;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	len = hlen + tlen + sizeof(*ip6h) + sizeof(ra) + sizeof(*mld2q);</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(amt-&gt;dev, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, hlen);</div><div class='add'>+	skb_push(skb, sizeof(*eth));</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	eth = eth_hdr(skb);</div><div class='add'>+	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+	skb_put_zero(skb, sizeof(*ip6h));</div><div class='add'>+	skb_put_data(skb, ra, sizeof(ra));</div><div class='add'>+	skb_put_zero(skb, sizeof(*mld2q));</div><div class='add'>+	skb_pull(skb, sizeof(*eth));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	ip6h			= ipv6_hdr(skb);</div><div class='add'>+	ip6h-&gt;payload_len	= htons(sizeof(ra) + sizeof(*mld2q));</div><div class='add'>+	ip6h-&gt;nexthdr		= NEXTHDR_HOP;</div><div class='add'>+	ip6h-&gt;hop_limit		= 1;</div><div class='add'>+	ip6h-&gt;daddr		= mld2_all_node;</div><div class='add'>+	ip6_flow_hdr(ip6h, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (ipv6_dev_get_saddr(amt-&gt;net, amt-&gt;dev, &amp;ip6h-&gt;daddr, 0,</div><div class='add'>+			       &amp;ip6h-&gt;saddr)) {</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='add'>+	ether_addr_copy(eth-&gt;h_source, amt-&gt;dev-&gt;dev_addr);</div><div class='add'>+	ipv6_eth_mc_map(&amp;mld2_all_node, eth-&gt;h_dest);</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(*ip6h) + sizeof(ra));</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	mld2q			= (struct mld2_query *)icmp6_hdr(skb);</div><div class='add'>+	mld2q-&gt;mld2q_mrc	= htons(1);</div><div class='add'>+	mld2q-&gt;mld2q_type	= ICMPV6_MGM_QUERY;</div><div class='add'>+	mld2q-&gt;mld2q_code	= 0;</div><div class='add'>+	mld2q-&gt;mld2q_cksum	= 0;</div><div class='add'>+	mld2q-&gt;mld2q_resv1	= 0;</div><div class='add'>+	mld2q-&gt;mld2q_resv2	= 0;</div><div class='add'>+	mld2q-&gt;mld2q_suppress	= 0;</div><div class='add'>+	mld2q-&gt;mld2q_qrv	= amt-&gt;qrv;</div><div class='add'>+	mld2q-&gt;mld2q_nsrcs	= 0;</div><div class='add'>+	mld2q-&gt;mld2q_qqic	= amt-&gt;qi;</div><div class='add'>+	csum_start		= (void *)mld2q;</div><div class='add'>+	mld2q-&gt;mld2q_cksum = csum_ipv6_magic(&amp;ip6h-&gt;saddr, &amp;ip6h-&gt;daddr,</div><div class='add'>+					     sizeof(*mld2q),</div><div class='add'>+					     IPPROTO_ICMPV6,</div><div class='add'>+					     csum_partial(csum_start,</div><div class='add'>+							  sizeof(*mld2q), 0));</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	skb_push(skb, sizeof(*eth) + sizeof(*ip6h) + sizeof(ra));</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_send_mld_gq(struct amt_dev *amt, struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = amt_build_mld_gq(amt);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	amt_skb_cb(skb)-&gt;tunnel = tunnel;</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static void amt_send_mld_gq(struct amt_dev *amt, struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool amt_queue_event(struct amt_dev *amt, enum amt_event event,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;amt-&gt;lock);</div><div class='add'>+	if (amt-&gt;nr_events &gt;= AMT_MAX_EVENTS) {</div><div class='add'>+		spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = (amt-&gt;event_idx + amt-&gt;nr_events) % AMT_MAX_EVENTS;</div><div class='add'>+	amt-&gt;events[index].event = event;</div><div class='add'>+	amt-&gt;events[index].skb = skb;</div><div class='add'>+	amt-&gt;nr_events++;</div><div class='add'>+	amt-&gt;event_idx %= AMT_MAX_EVENTS;</div><div class='add'>+	queue_work(amt_wq, &amp;amt-&gt;event_wq);</div><div class='add'>+	spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_secret_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = container_of(to_delayed_work(work),</div><div class='add'>+					   struct amt_dev,</div><div class='add'>+					   secret_wq);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;amt-&gt;lock);</div><div class='add'>+	get_random_bytes(&amp;amt-&gt;key, sizeof(siphash_key_t));</div><div class='add'>+	spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;amt-&gt;secret_wq,</div><div class='add'>+			 msecs_to_jiffies(AMT_SECRET_TIMEOUT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_event_send_discovery(struct amt_dev *amt)</div><div class='add'>+{</div><div class='add'>+	if (amt-&gt;status &gt; AMT_STATUS_SENT_DISCOVERY)</div><div class='add'>+		goto out;</div><div class='add'>+	get_random_bytes(&amp;amt-&gt;nonce, sizeof(__be32));</div><div class='add'>+</div><div class='add'>+	amt_send_discovery(amt);</div><div class='add'>+out:</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;amt-&gt;discovery_wq,</div><div class='add'>+			 msecs_to_jiffies(AMT_DISCOVERY_TIMEOUT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_discovery_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = container_of(to_delayed_work(work),</div><div class='add'>+					   struct amt_dev,</div><div class='add'>+					   discovery_wq);</div><div class='add'>+</div><div class='add'>+	if (amt_queue_event(amt, AMT_EVENT_SEND_DISCOVERY, NULL))</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;amt-&gt;discovery_wq,</div><div class='add'>+				 msecs_to_jiffies(AMT_DISCOVERY_TIMEOUT));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_event_send_request(struct amt_dev *amt)</div><div class='add'>+{</div><div class='add'>+	u32 exp;</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;status &lt; AMT_STATUS_RECEIVED_ADVERTISEMENT)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;req_cnt &gt; AMT_MAX_REQ_COUNT) {</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Gateway is not ready");</div><div class='add'>+		amt-&gt;qi = AMT_INIT_REQ_TIMEOUT;</div><div class='add'>+		WRITE_ONCE(amt-&gt;ready4, false);</div><div class='add'>+		WRITE_ONCE(amt-&gt;ready6, false);</div><div class='add'>+		amt-&gt;remote_ip = 0;</div><div class='add'>+		amt_update_gw_status(amt, AMT_STATUS_INIT, false);</div><div class='add'>+		amt-&gt;req_cnt = 0;</div><div class='add'>+		amt-&gt;nonce = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!amt-&gt;req_cnt) {</div><div class='add'>+		WRITE_ONCE(amt-&gt;ready4, false);</div><div class='add'>+		WRITE_ONCE(amt-&gt;ready6, false);</div><div class='add'>+		get_random_bytes(&amp;amt-&gt;nonce, sizeof(__be32));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amt_send_request(amt, false);</div><div class='add'>+	amt_send_request(amt, true);</div><div class='add'>+	amt_update_gw_status(amt, AMT_STATUS_SENT_REQUEST, true);</div><div class='add'>+	amt-&gt;req_cnt++;</div><div class='add'>+out:</div><div class='add'>+	exp = min_t(u32, (1 * (1 &lt;&lt; amt-&gt;req_cnt)), AMT_MAX_REQ_TIMEOUT);</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;amt-&gt;req_wq, secs_to_jiffies(exp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_req_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = container_of(to_delayed_work(work),</div><div class='add'>+					   struct amt_dev,</div><div class='add'>+					   req_wq);</div><div class='add'>+</div><div class='add'>+	if (amt_queue_event(amt, AMT_EVENT_SEND_REQUEST, NULL))</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;amt-&gt;req_wq,</div><div class='add'>+				 msecs_to_jiffies(100));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_send_membership_update(struct amt_dev *amt,</div><div class='add'>+				       struct sk_buff *skb,</div><div class='add'>+				       bool v6)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_membership_update *amtmu;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sock = rcu_dereference_bh(amt-&gt;sock);</div><div class='add'>+	if (!sock)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, LL_RESERVED_SPACE(amt-&gt;dev) + sizeof(*amtmu) +</div><div class='add'>+			   sizeof(*iph) + sizeof(struct udphdr));</div><div class='add'>+	if (err)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	skb_reset_inner_headers(skb);</div><div class='add'>+	memset(&amp;fl4, 0, sizeof(struct flowi4));</div><div class='add'>+	fl4.flowi4_oif         = amt-&gt;stream_dev-&gt;ifindex;</div><div class='add'>+	fl4.daddr              = amt-&gt;remote_ip;</div><div class='add'>+	fl4.saddr              = amt-&gt;local_ip;</div><div class='add'>+	fl4.flowi4_dscp        = inet_dsfield_to_dscp(AMT_TOS);</div><div class='add'>+	fl4.flowi4_proto       = IPPROTO_UDP;</div><div class='add'>+	rt = ip_route_output_key(amt-&gt;net, &amp;fl4);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "no route to %pI4\n", &amp;amt-&gt;remote_ip);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amtmu			= skb_push(skb, sizeof(*amtmu));</div><div class='add'>+	amtmu-&gt;version		= 0;</div><div class='add'>+	amtmu-&gt;type		= AMT_MSG_MEMBERSHIP_UPDATE;</div><div class='add'>+	amtmu-&gt;reserved		= 0;</div><div class='add'>+	amtmu-&gt;nonce		= amt-&gt;nonce;</div><div class='add'>+	amtmu-&gt;response_mac	= amt-&gt;mac;</div><div class='add'>+</div><div class='add'>+	if (!v6)</div><div class='add'>+		skb_set_inner_protocol(skb, htons(ETH_P_IP));</div><div class='add'>+	else</div><div class='add'>+		skb_set_inner_protocol(skb, htons(ETH_P_IPV6));</div><div class='add'>+	udp_tunnel_xmit_skb(rt, sock-&gt;sk, skb,</div><div class='add'>+			    fl4.saddr,</div><div class='add'>+			    fl4.daddr,</div><div class='add'>+			    AMT_TOS,</div><div class='add'>+			    ip4_dst_hoplimit(&amp;rt-&gt;dst),</div><div class='add'>+			    0,</div><div class='add'>+			    amt-&gt;gw_port,</div><div class='add'>+			    amt-&gt;relay_port,</div><div class='add'>+			    false,</div><div class='add'>+			    false,</div><div class='add'>+			    0);</div><div class='add'>+	amt_update_gw_status(amt, AMT_STATUS_SENT_UPDATE, true);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_send_multicast_data(struct amt_dev *amt,</div><div class='add'>+				    const struct sk_buff *oskb,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    bool v6)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_mcast_data *amtmd;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+</div><div class='add'>+	sock = rcu_dereference_bh(amt-&gt;sock);</div><div class='add'>+	if (!sock)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = skb_copy_expand(oskb, sizeof(*amtmd) + sizeof(*iph) +</div><div class='add'>+			      sizeof(struct udphdr), 0, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb_reset_inner_headers(skb);</div><div class='add'>+	memset(&amp;fl4, 0, sizeof(struct flowi4));</div><div class='add'>+	fl4.flowi4_oif         = amt-&gt;stream_dev-&gt;ifindex;</div><div class='add'>+	fl4.daddr              = tunnel-&gt;ip4;</div><div class='add'>+	fl4.saddr              = amt-&gt;local_ip;</div><div class='add'>+	fl4.flowi4_proto       = IPPROTO_UDP;</div><div class='add'>+	rt = ip_route_output_key(amt-&gt;net, &amp;fl4);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "no route to %pI4\n", &amp;tunnel-&gt;ip4);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amtmd = skb_push(skb, sizeof(*amtmd));</div><div class='add'>+	amtmd-&gt;version = 0;</div><div class='add'>+	amtmd-&gt;reserved = 0;</div><div class='add'>+	amtmd-&gt;type = AMT_MSG_MULTICAST_DATA;</div><div class='add'>+</div><div class='add'>+	if (!v6)</div><div class='add'>+		skb_set_inner_protocol(skb, htons(ETH_P_IP));</div><div class='add'>+	else</div><div class='add'>+		skb_set_inner_protocol(skb, htons(ETH_P_IPV6));</div><div class='add'>+	udp_tunnel_xmit_skb(rt, sock-&gt;sk, skb,</div><div class='add'>+			    fl4.saddr,</div><div class='add'>+			    fl4.daddr,</div><div class='add'>+			    AMT_TOS,</div><div class='add'>+			    ip4_dst_hoplimit(&amp;rt-&gt;dst),</div><div class='add'>+			    0,</div><div class='add'>+			    amt-&gt;relay_port,</div><div class='add'>+			    tunnel-&gt;source_port,</div><div class='add'>+			    false,</div><div class='add'>+			    false,</div><div class='add'>+			    0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_send_membership_query(struct amt_dev *amt,</div><div class='add'>+				      struct sk_buff *skb,</div><div class='add'>+				      struct amt_tunnel_list *tunnel,</div><div class='add'>+				      bool v6)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_membership_query *amtmq;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	sock = rcu_dereference_bh(amt-&gt;sock);</div><div class='add'>+	if (!sock)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, LL_RESERVED_SPACE(amt-&gt;dev) + sizeof(*amtmq) +</div><div class='add'>+			   sizeof(struct iphdr) + sizeof(struct udphdr));</div><div class='add'>+	if (err)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	skb_reset_inner_headers(skb);</div><div class='add'>+	memset(&amp;fl4, 0, sizeof(struct flowi4));</div><div class='add'>+	fl4.flowi4_oif         = amt-&gt;stream_dev-&gt;ifindex;</div><div class='add'>+	fl4.daddr              = tunnel-&gt;ip4;</div><div class='add'>+	fl4.saddr              = amt-&gt;local_ip;</div><div class='add'>+	fl4.flowi4_dscp        = inet_dsfield_to_dscp(AMT_TOS);</div><div class='add'>+	fl4.flowi4_proto       = IPPROTO_UDP;</div><div class='add'>+	rt = ip_route_output_key(amt-&gt;net, &amp;fl4);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "no route to %pI4\n", &amp;tunnel-&gt;ip4);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amtmq		= skb_push(skb, sizeof(*amtmq));</div><div class='add'>+	amtmq-&gt;version	= 0;</div><div class='add'>+	amtmq-&gt;type	= AMT_MSG_MEMBERSHIP_QUERY;</div><div class='add'>+	amtmq-&gt;reserved = 0;</div><div class='add'>+	amtmq-&gt;l	= 0;</div><div class='add'>+	amtmq-&gt;g	= 0;</div><div class='add'>+	amtmq-&gt;nonce	= tunnel-&gt;nonce;</div><div class='add'>+	amtmq-&gt;response_mac = tunnel-&gt;mac;</div><div class='add'>+</div><div class='add'>+	if (!v6)</div><div class='add'>+		skb_set_inner_protocol(skb, htons(ETH_P_IP));</div><div class='add'>+	else</div><div class='add'>+		skb_set_inner_protocol(skb, htons(ETH_P_IPV6));</div><div class='add'>+	udp_tunnel_xmit_skb(rt, sock-&gt;sk, skb,</div><div class='add'>+			    fl4.saddr,</div><div class='add'>+			    fl4.daddr,</div><div class='add'>+			    AMT_TOS,</div><div class='add'>+			    ip4_dst_hoplimit(&amp;rt-&gt;dst),</div><div class='add'>+			    0,</div><div class='add'>+			    amt-&gt;relay_port,</div><div class='add'>+			    tunnel-&gt;source_port,</div><div class='add'>+			    false,</div><div class='add'>+			    false,</div><div class='add'>+			    0);</div><div class='add'>+	amt_update_relay_status(tunnel, AMT_STATUS_SENT_QUERY, true);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t amt_dev_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+	struct amt_tunnel_list *tunnel;</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group = {0,};</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct ipv6hdr *ip6h;</div><div class='add'>+	struct mld_msg *mld;</div><div class='add'>+#endif</div><div class='add'>+	bool report = false;</div><div class='add'>+	struct igmphdr *ih;</div><div class='add'>+	bool query = false;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	bool data = false;</div><div class='add'>+	bool v6 = false;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	if (iph-&gt;version == 4) {</div><div class='add'>+		if (!ipv4_is_multicast(iph-&gt;daddr))</div><div class='add'>+			goto free;</div><div class='add'>+</div><div class='add'>+		if (!ip_mc_check_igmp(skb)) {</div><div class='add'>+			ih = igmp_hdr(skb);</div><div class='add'>+			switch (ih-&gt;type) {</div><div class='add'>+			case IGMPV3_HOST_MEMBERSHIP_REPORT:</div><div class='add'>+			case IGMP_HOST_MEMBERSHIP_REPORT:</div><div class='add'>+				report = true;</div><div class='add'>+				break;</div><div class='add'>+			case IGMP_HOST_MEMBERSHIP_QUERY:</div><div class='add'>+				query = true;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				goto free;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			data = true;</div><div class='add'>+		}</div><div class='add'>+		v6 = false;</div><div class='add'>+		group.ip4 = iph-&gt;daddr;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (iph-&gt;version == 6) {</div><div class='add'>+		ip6h = ipv6_hdr(skb);</div><div class='add'>+		if (!ipv6_addr_is_multicast(&amp;ip6h-&gt;daddr))</div><div class='add'>+			goto free;</div><div class='add'>+</div><div class='add'>+		if (!ipv6_mc_check_mld(skb)) {</div><div class='add'>+			mld = (struct mld_msg *)skb_transport_header(skb);</div><div class='add'>+			switch (mld-&gt;mld_type) {</div><div class='add'>+			case ICMPV6_MGM_REPORT:</div><div class='add'>+			case ICMPV6_MLD2_REPORT:</div><div class='add'>+				report = true;</div><div class='add'>+				break;</div><div class='add'>+			case ICMPV6_MGM_QUERY:</div><div class='add'>+				query = true;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				goto free;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			data = true;</div><div class='add'>+		}</div><div class='add'>+		v6 = true;</div><div class='add'>+		group.ip6 = ip6h-&gt;daddr;</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct ethhdr)))</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct ethhdr));</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;mode == AMT_MODE_GATEWAY) {</div><div class='add'>+		/* Gateway only passes IGMP/MLD packets */</div><div class='add'>+		if (!report)</div><div class='add'>+			goto free;</div><div class='add'>+		if ((!v6 &amp;&amp; !READ_ONCE(amt-&gt;ready4)) ||</div><div class='add'>+		    (v6 &amp;&amp; !READ_ONCE(amt-&gt;ready6)))</div><div class='add'>+			goto free;</div><div class='add'>+		if (amt_send_membership_update(amt, skb,  v6))</div><div class='add'>+			goto free;</div><div class='add'>+		goto unlock;</div><div class='add'>+	} else if (amt-&gt;mode == AMT_MODE_RELAY) {</div><div class='add'>+		if (query) {</div><div class='add'>+			tunnel = amt_skb_cb(skb)-&gt;tunnel;</div><div class='add'>+			if (!tunnel) {</div><div class='add'>+				WARN_ON(1);</div><div class='add'>+				goto free;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Do not forward unexpected query */</div><div class='add'>+			if (amt_send_membership_query(amt, skb, tunnel, v6))</div><div class='add'>+				goto free;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!data)</div><div class='add'>+			goto free;</div><div class='add'>+		list_for_each_entry_rcu(tunnel, &amp;amt-&gt;tunnel_list, list) {</div><div class='add'>+			hash = amt_group_hash(tunnel, &amp;group);</div><div class='add'>+			hlist_for_each_entry_rcu(gnode, &amp;tunnel-&gt;groups[hash],</div><div class='add'>+						 node) {</div><div class='add'>+				if (!v6) {</div><div class='add'>+					if (gnode-&gt;group_addr.ip4 == iph-&gt;daddr)</div><div class='add'>+						goto found;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+				} else {</div><div class='add'>+					if (ipv6_addr_equal(&amp;gnode-&gt;group_addr.ip6,</div><div class='add'>+							    &amp;ip6h-&gt;daddr))</div><div class='add'>+						goto found;</div><div class='add'>+#endif</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+found:</div><div class='add'>+			amt_send_multicast_data(amt, skb, tunnel, v6);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+free:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+unlock:</div><div class='add'>+	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_parse_type(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header *amth;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(struct udphdr) +</div><div class='add'>+			   sizeof(struct amt_header)))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	amth = (struct amt_header *)(udp_hdr(skb) + 1);</div><div class='add'>+</div><div class='add'>+	if (amth-&gt;version != 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	if (amth-&gt;type &gt;= __AMT_MSG_MAX || !amth-&gt;type)</div><div class='add'>+		return -1;</div><div class='add'>+	return amth-&gt;type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_clear_groups(struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = tunnel-&gt;amt;</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	struct hlist_node *t;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	for (i = 0; i &lt; amt-&gt;hash_buckets; i++)</div><div class='add'>+		hlist_for_each_entry_safe(gnode, t, &amp;tunnel-&gt;groups[i], node)</div><div class='add'>+			amt_del_group(amt, gnode);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_tunnel_expire(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_tunnel_list *tunnel = container_of(to_delayed_work(work),</div><div class='add'>+						      struct amt_tunnel_list,</div><div class='add'>+						      gc_wq);</div><div class='add'>+	struct amt_dev *amt = tunnel-&gt;amt;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;amt-&gt;lock);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	list_del_rcu(&amp;tunnel-&gt;list);</div><div class='add'>+	amt-&gt;nr_tunnels--;</div><div class='add'>+	amt_clear_groups(tunnel);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+	kfree_rcu(tunnel, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_cleanup_srcs(struct amt_dev *amt,</div><div class='add'>+			     struct amt_tunnel_list *tunnel,</div><div class='add'>+			     struct amt_group_node *gnode)</div><div class='add'>+{</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+	struct hlist_node *t;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Delete old sources */</div><div class='add'>+	for (i = 0; i &lt; amt-&gt;hash_buckets; i++) {</div><div class='add'>+		hlist_for_each_entry_safe(snode, t, &amp;gnode-&gt;sources[i], node) {</div><div class='add'>+			if (snode-&gt;flags == AMT_SOURCE_OLD)</div><div class='add'>+				amt_destroy_source(snode);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* switch from new to old */</div><div class='add'>+	for (i = 0; i &lt; amt-&gt;hash_buckets; i++)  {</div><div class='add'>+		hlist_for_each_entry_rcu(snode, &amp;gnode-&gt;sources[i], node) {</div><div class='add'>+			snode-&gt;flags = AMT_SOURCE_OLD;</div><div class='add'>+			if (!gnode-&gt;v6)</div><div class='add'>+				netdev_dbg(snode-&gt;gnode-&gt;amt-&gt;dev,</div><div class='add'>+					   "Add source as OLD %pI4 from %pI4\n",</div><div class='add'>+					   &amp;snode-&gt;source_addr.ip4,</div><div class='add'>+					   &amp;gnode-&gt;group_addr.ip4);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			else</div><div class='add'>+				netdev_dbg(snode-&gt;gnode-&gt;amt-&gt;dev,</div><div class='add'>+					   "Add source as OLD %pI6 from %pI6\n",</div><div class='add'>+					   &amp;snode-&gt;source_addr.ip6,</div><div class='add'>+					   &amp;gnode-&gt;group_addr.ip6);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_add_srcs(struct amt_dev *amt, struct amt_tunnel_list *tunnel,</div><div class='add'>+			 struct amt_group_node *gnode, void *grec,</div><div class='add'>+			 bool v6)</div><div class='add'>+{</div><div class='add'>+	struct igmpv3_grec *igmp_grec;</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct mld2_grec *mld_grec;</div><div class='add'>+#endif</div><div class='add'>+	union amt_addr src = {0,};</div><div class='add'>+	u16 nsrcs;</div><div class='add'>+	u32 hash;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!v6) {</div><div class='add'>+		igmp_grec = grec;</div><div class='add'>+		nsrcs = ntohs(igmp_grec-&gt;grec_nsrcs);</div><div class='add'>+	} else {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		mld_grec = grec;</div><div class='add'>+		nsrcs = ntohs(mld_grec-&gt;grec_nsrcs);</div><div class='add'>+#else</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; nsrcs; i++) {</div><div class='add'>+		if (tunnel-&gt;nr_sources &gt;= amt-&gt;max_sources)</div><div class='add'>+			return;</div><div class='add'>+		if (!v6)</div><div class='add'>+			src.ip4 = igmp_grec-&gt;grec_src[i];</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		else</div><div class='add'>+			memcpy(&amp;src.ip6, &amp;mld_grec-&gt;grec_src[i],</div><div class='add'>+			       sizeof(struct in6_addr));</div><div class='add'>+#endif</div><div class='add'>+		if (amt_lookup_src(tunnel, gnode, AMT_FILTER_ALL, &amp;src))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		snode = amt_alloc_snode(gnode, &amp;src);</div><div class='add'>+		if (snode) {</div><div class='add'>+			hash = amt_source_hash(tunnel, &amp;snode-&gt;source_addr);</div><div class='add'>+			hlist_add_head_rcu(&amp;snode-&gt;node, &amp;gnode-&gt;sources[hash]);</div><div class='add'>+			tunnel-&gt;nr_sources++;</div><div class='add'>+			gnode-&gt;nr_sources++;</div><div class='add'>+</div><div class='add'>+			if (!gnode-&gt;v6)</div><div class='add'>+				netdev_dbg(snode-&gt;gnode-&gt;amt-&gt;dev,</div><div class='add'>+					   "Add source as NEW %pI4 from %pI4\n",</div><div class='add'>+					   &amp;snode-&gt;source_addr.ip4,</div><div class='add'>+					   &amp;gnode-&gt;group_addr.ip4);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			else</div><div class='add'>+				netdev_dbg(snode-&gt;gnode-&gt;amt-&gt;dev,</div><div class='add'>+					   "Add source as NEW %pI6 from %pI6\n",</div><div class='add'>+					   &amp;snode-&gt;source_addr.ip6,</div><div class='add'>+					   &amp;gnode-&gt;group_addr.ip6);</div><div class='add'>+#endif</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Router State   Report Rec'd New Router State</div><div class='add'>+ * ------------   ------------ ----------------</div><div class='add'>+ * EXCLUDE (X,Y)  IS_IN (A)    EXCLUDE (X+A,Y-A)</div><div class='add'>+ *</div><div class='add'>+ * -----------+-----------+-----------+</div><div class='add'>+ *            |    OLD    |    NEW    |</div><div class='add'>+ * -----------+-----------+-----------+</div><div class='add'>+ *    FWD     |     X     |    X+A    |</div><div class='add'>+ * -----------+-----------+-----------+</div><div class='add'>+ *    D_FWD   |     Y     |    Y-A    |</div><div class='add'>+ * -----------+-----------+-----------+</div><div class='add'>+ *    NONE    |           |     A     |</div><div class='add'>+ * -----------+-----------+-----------+</div><div class='add'>+ *</div><div class='add'>+ * a) Received sources are NONE/NEW</div><div class='add'>+ * b) All NONE will be deleted by amt_cleanup_srcs().</div><div class='add'>+ * c) All OLD will be deleted by amt_cleanup_srcs().</div><div class='add'>+ * d) After delete, NEW source will be switched to OLD.</div><div class='add'>+ */</div><div class='add'>+static void amt_lookup_act_srcs(struct amt_tunnel_list *tunnel,</div><div class='add'>+				struct amt_group_node *gnode,</div><div class='add'>+				void *grec,</div><div class='add'>+				enum amt_ops ops,</div><div class='add'>+				enum amt_filter filter,</div><div class='add'>+				enum amt_act act,</div><div class='add'>+				bool v6)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = tunnel-&gt;amt;</div><div class='add'>+	struct amt_source_node *snode;</div><div class='add'>+	struct igmpv3_grec *igmp_grec;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct mld2_grec *mld_grec;</div><div class='add'>+#endif</div><div class='add'>+	union amt_addr src = {0,};</div><div class='add'>+	struct hlist_node *t;</div><div class='add'>+	u16 nsrcs;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!v6) {</div><div class='add'>+		igmp_grec = grec;</div><div class='add'>+		nsrcs = ntohs(igmp_grec-&gt;grec_nsrcs);</div><div class='add'>+	} else {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		mld_grec = grec;</div><div class='add'>+		nsrcs = ntohs(mld_grec-&gt;grec_nsrcs);</div><div class='add'>+#else</div><div class='add'>+	return;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;src, 0, sizeof(union amt_addr));</div><div class='add'>+	switch (ops) {</div><div class='add'>+	case AMT_OPS_INT:</div><div class='add'>+		/* A*B */</div><div class='add'>+		for (i = 0; i &lt; nsrcs; i++) {</div><div class='add'>+			if (!v6)</div><div class='add'>+				src.ip4 = igmp_grec-&gt;grec_src[i];</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			else</div><div class='add'>+				memcpy(&amp;src.ip6, &amp;mld_grec-&gt;grec_src[i],</div><div class='add'>+				       sizeof(struct in6_addr));</div><div class='add'>+#endif</div><div class='add'>+			snode = amt_lookup_src(tunnel, gnode, filter, &amp;src);</div><div class='add'>+			if (!snode)</div><div class='add'>+				continue;</div><div class='add'>+			amt_act_src(tunnel, gnode, snode, act);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AMT_OPS_UNI:</div><div class='add'>+		/* A+B */</div><div class='add'>+		for (i = 0; i &lt; amt-&gt;hash_buckets; i++) {</div><div class='add'>+			hlist_for_each_entry_safe(snode, t, &amp;gnode-&gt;sources[i],</div><div class='add'>+						  node) {</div><div class='add'>+				if (amt_status_filter(snode, filter))</div><div class='add'>+					amt_act_src(tunnel, gnode, snode, act);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; nsrcs; i++) {</div><div class='add'>+			if (!v6)</div><div class='add'>+				src.ip4 = igmp_grec-&gt;grec_src[i];</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			else</div><div class='add'>+				memcpy(&amp;src.ip6, &amp;mld_grec-&gt;grec_src[i],</div><div class='add'>+				       sizeof(struct in6_addr));</div><div class='add'>+#endif</div><div class='add'>+			snode = amt_lookup_src(tunnel, gnode, filter, &amp;src);</div><div class='add'>+			if (!snode)</div><div class='add'>+				continue;</div><div class='add'>+			amt_act_src(tunnel, gnode, snode, act);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AMT_OPS_SUB:</div><div class='add'>+		/* A-B */</div><div class='add'>+		for (i = 0; i &lt; amt-&gt;hash_buckets; i++) {</div><div class='add'>+			hlist_for_each_entry_safe(snode, t, &amp;gnode-&gt;sources[i],</div><div class='add'>+						  node) {</div><div class='add'>+				if (!amt_status_filter(snode, filter))</div><div class='add'>+					continue;</div><div class='add'>+				for (j = 0; j &lt; nsrcs; j++) {</div><div class='add'>+					if (!v6)</div><div class='add'>+						src.ip4 = igmp_grec-&gt;grec_src[j];</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+					else</div><div class='add'>+						memcpy(&amp;src.ip6,</div><div class='add'>+						       &amp;mld_grec-&gt;grec_src[j],</div><div class='add'>+						       sizeof(struct in6_addr));</div><div class='add'>+#endif</div><div class='add'>+					if (amt_addr_equal(&amp;snode-&gt;source_addr,</div><div class='add'>+							   &amp;src))</div><div class='add'>+						goto out_sub;</div><div class='add'>+				}</div><div class='add'>+				amt_act_src(tunnel, gnode, snode, act);</div><div class='add'>+				continue;</div><div class='add'>+out_sub:;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AMT_OPS_SUB_REV:</div><div class='add'>+		/* B-A */</div><div class='add'>+		for (i = 0; i &lt; nsrcs; i++) {</div><div class='add'>+			if (!v6)</div><div class='add'>+				src.ip4 = igmp_grec-&gt;grec_src[i];</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			else</div><div class='add'>+				memcpy(&amp;src.ip6, &amp;mld_grec-&gt;grec_src[i],</div><div class='add'>+				       sizeof(struct in6_addr));</div><div class='add'>+#endif</div><div class='add'>+			snode = amt_lookup_src(tunnel, gnode, AMT_FILTER_ALL,</div><div class='add'>+					       &amp;src);</div><div class='add'>+			if (!snode) {</div><div class='add'>+				snode = amt_lookup_src(tunnel, gnode,</div><div class='add'>+						       filter, &amp;src);</div><div class='add'>+				if (snode)</div><div class='add'>+					amt_act_src(tunnel, gnode, snode, act);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Invalid type\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mcast_is_in_handler(struct amt_dev *amt,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    struct amt_group_node *gnode,</div><div class='add'>+				    void *grec, void *zero_grec, bool v6)</div><div class='add'>+{</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * INCLUDE (A)    IS_IN (B)    INCLUDE (A+B)           (B)=GMI</div><div class='add'>+ */</div><div class='add'>+		/* Update IS_IN (B) as FWD/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_NONE_NEW,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Update INCLUDE (A) as NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (B)=GMI */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI,</div><div class='add'>+				    v6);</div><div class='add'>+	} else {</div><div class='add'>+/* State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * EXCLUDE (X,Y)  IS_IN (A)    EXCLUDE (X+A,Y-A)       (A)=GMI</div><div class='add'>+ */</div><div class='add'>+		/* Update (A) in (X, Y) as NONE/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_BOTH,</div><div class='add'>+				    AMT_ACT_STATUS_NONE_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Update FWD/OLD as FWD/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, zero_grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Update IS_IN (A) as FWD/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_NONE_NEW,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Update EXCLUDE (, Y-A) as D_FWD_NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mcast_is_ex_handler(struct amt_dev *amt,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    struct amt_group_node *gnode,</div><div class='add'>+				    void *grec, void *zero_grec, bool v6)</div><div class='add'>+{</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+/* Router State   Report Rec'd  New Router State         Actions</div><div class='add'>+ * ------------   ------------  ----------------         -------</div><div class='add'>+ * INCLUDE (A)    IS_EX (B)     EXCLUDE (A*B,B-A)        (B-A)=0</div><div class='add'>+ *                                                       Delete (A-B)</div><div class='add'>+ *                                                       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+		/* EXCLUDE(A*B, ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE(, B-A) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (B-A)=0 */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, zero_grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_D_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI_ZERO,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Group Timer=GMI */</div><div class='add'>+		if (!mod_delayed_work(amt_wq, &amp;gnode-&gt;group_timer,</div><div class='add'>+				      msecs_to_jiffies(amt_gmi(amt))))</div><div class='add'>+			dev_hold(amt-&gt;dev);</div><div class='add'>+		gnode-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+		/* Delete (A-B) will be worked by amt_cleanup_srcs(). */</div><div class='add'>+	} else {</div><div class='add'>+/* Router State   Report Rec'd  New Router State	Actions</div><div class='add'>+ * ------------   ------------  ----------------	-------</div><div class='add'>+ * EXCLUDE (X,Y)  IS_EX (A)     EXCLUDE (A-Y,Y*A)	(A-X-Y)=GMI</div><div class='add'>+ *							Delete (X-A)</div><div class='add'>+ *							Delete (Y-A)</div><div class='add'>+ *							Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+		/* EXCLUDE (A-Y, ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (, Y*A ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (A-X-Y)=GMI */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_BOTH_NEW,</div><div class='add'>+				    AMT_ACT_GMI,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Group Timer=GMI */</div><div class='add'>+		if (!mod_delayed_work(amt_wq, &amp;gnode-&gt;group_timer,</div><div class='add'>+				      msecs_to_jiffies(amt_gmi(amt))))</div><div class='add'>+			dev_hold(amt-&gt;dev);</div><div class='add'>+		/* Delete (X-A), (Y-A) will be worked by amt_cleanup_srcs(). */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mcast_to_in_handler(struct amt_dev *amt,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    struct amt_group_node *gnode,</div><div class='add'>+				    void *grec, void *zero_grec, bool v6)</div><div class='add'>+{</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * INCLUDE (A)    TO_IN (B)    INCLUDE (A+B)           (B)=GMI</div><div class='add'>+ *						       Send Q(G,A-B)</div><div class='add'>+ */</div><div class='add'>+		/* Update TO_IN (B) sources as FWD/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_NONE_NEW,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Update INCLUDE (A) sources as NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (B)=GMI */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI,</div><div class='add'>+				    v6);</div><div class='add'>+	} else {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * EXCLUDE (X,Y)  TO_IN (A)    EXCLUDE (X+A,Y-A)       (A)=GMI</div><div class='add'>+ *						       Send Q(G,X-A)</div><div class='add'>+ *						       Send Q(G)</div><div class='add'>+ */</div><div class='add'>+		/* Update TO_IN (A) sources as FWD/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_NONE_NEW,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Update EXCLUDE(X,) sources as FWD/NEW */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (, Y-A)</div><div class='add'>+		 * (A) are already switched to FWD_NEW.</div><div class='add'>+		 * So, D_FWD/OLD -&gt; D_FWD/NEW is okay.</div><div class='add'>+		 */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, zero_grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (A)=GMI</div><div class='add'>+		 * Only FWD_NEW will have (A) sources.</div><div class='add'>+		 */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI,</div><div class='add'>+				    v6);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mcast_to_ex_handler(struct amt_dev *amt,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    struct amt_group_node *gnode,</div><div class='add'>+				    void *grec, void *zero_grec, bool v6)</div><div class='add'>+{</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * INCLUDE (A)    TO_EX (B)    EXCLUDE (A*B,B-A)       (B-A)=0</div><div class='add'>+ *						       Delete (A-B)</div><div class='add'>+ *						       Send Q(G,A*B)</div><div class='add'>+ *						       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+		/* EXCLUDE (A*B, ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (, B-A) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (B-A)=0 */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, zero_grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_D_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI_ZERO,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Group Timer=GMI */</div><div class='add'>+		if (!mod_delayed_work(amt_wq, &amp;gnode-&gt;group_timer,</div><div class='add'>+				      msecs_to_jiffies(amt_gmi(amt))))</div><div class='add'>+			dev_hold(amt-&gt;dev);</div><div class='add'>+		gnode-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+		/* Delete (A-B) will be worked by amt_cleanup_srcs(). */</div><div class='add'>+	} else {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * EXCLUDE (X,Y)  TO_EX (A)    EXCLUDE (A-Y,Y*A)       (A-X-Y)=Group Timer</div><div class='add'>+ *						       Delete (X-A)</div><div class='add'>+ *						       Delete (Y-A)</div><div class='add'>+ *						       Send Q(G,A-Y)</div><div class='add'>+ *						       Group Timer=GMI</div><div class='add'>+ */</div><div class='add'>+		/* Update (A-X-Y) as NONE/OLD */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_BOTH,</div><div class='add'>+				    AMT_ACT_GT,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (A-Y, ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (, Y*A) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* Group Timer=GMI */</div><div class='add'>+		if (!mod_delayed_work(amt_wq, &amp;gnode-&gt;group_timer,</div><div class='add'>+				      msecs_to_jiffies(amt_gmi(amt))))</div><div class='add'>+			dev_hold(amt-&gt;dev);</div><div class='add'>+		/* Delete (X-A), (Y-A) will be worked by amt_cleanup_srcs(). */</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mcast_allow_handler(struct amt_dev *amt,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    struct amt_group_node *gnode,</div><div class='add'>+				    void *grec, void *zero_grec, bool v6)</div><div class='add'>+{</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * INCLUDE (A)    ALLOW (B)    INCLUDE (A+B)	       (B)=GMI</div><div class='add'>+ */</div><div class='add'>+		/* INCLUDE (A+B) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (B)=GMI */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI,</div><div class='add'>+				    v6);</div><div class='add'>+	} else {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * EXCLUDE (X,Y)  ALLOW (A)    EXCLUDE (X+A,Y-A)       (A)=GMI</div><div class='add'>+ */</div><div class='add'>+		/* EXCLUDE (X+A, ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (, Y-A) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* (A)=GMI</div><div class='add'>+		 * All (A) source are now FWD/NEW status.</div><div class='add'>+		 */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_INT,</div><div class='add'>+				    AMT_FILTER_FWD_NEW,</div><div class='add'>+				    AMT_ACT_GMI,</div><div class='add'>+				    v6);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mcast_block_handler(struct amt_dev *amt,</div><div class='add'>+				    struct amt_tunnel_list *tunnel,</div><div class='add'>+				    struct amt_group_node *gnode,</div><div class='add'>+				    void *grec, void *zero_grec, bool v6)</div><div class='add'>+{</div><div class='add'>+	if (gnode-&gt;filter_mode == MCAST_INCLUDE) {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * INCLUDE (A)    BLOCK (B)    INCLUDE (A)             Send Q(G,A*B)</div><div class='add'>+ */</div><div class='add'>+		/* INCLUDE (A) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, zero_grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+	} else {</div><div class='add'>+/* Router State   Report Rec'd New Router State        Actions</div><div class='add'>+ * ------------   ------------ ----------------        -------</div><div class='add'>+ * EXCLUDE (X,Y)  BLOCK (A)    EXCLUDE (X+(A-Y),Y)     (A-X-Y)=Group Timer</div><div class='add'>+ *						       Send Q(G,A-Y)</div><div class='add'>+ */</div><div class='add'>+		/* (A-X-Y)=Group Timer */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_BOTH,</div><div class='add'>+				    AMT_ACT_GT,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (X, ) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (X+(A-Y) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_SUB_REV,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+		/* EXCLUDE (, Y) */</div><div class='add'>+		amt_lookup_act_srcs(tunnel, gnode, grec, AMT_OPS_UNI,</div><div class='add'>+				    AMT_FILTER_D_FWD,</div><div class='add'>+				    AMT_ACT_STATUS_D_FWD_NEW,</div><div class='add'>+				    v6);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RFC 3376</div><div class='add'>+ * 7.3.2. In the Presence of Older Version Group Members</div><div class='add'>+ *</div><div class='add'>+ * When Group Compatibility Mode is IGMPv2, a router internally</div><div class='add'>+ * translates the following IGMPv2 messages for that group to their</div><div class='add'>+ * IGMPv3 equivalents:</div><div class='add'>+ *</div><div class='add'>+ * IGMPv2 Message                IGMPv3 Equivalent</div><div class='add'>+ * --------------                -----------------</div><div class='add'>+ * Report                        IS_EX( {} )</div><div class='add'>+ * Leave                         TO_IN( {} )</div><div class='add'>+ */</div><div class='add'>+static void amt_igmpv2_report_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				      struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct igmphdr *ih = igmp_hdr(skb);</div><div class='add'>+	struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group, host;</div><div class='add'>+</div><div class='add'>+	memset(&amp;group, 0, sizeof(union amt_addr));</div><div class='add'>+	group.ip4 = ih-&gt;group;</div><div class='add'>+	memset(&amp;host, 0, sizeof(union amt_addr));</div><div class='add'>+	host.ip4 = iph-&gt;saddr;</div><div class='add'>+</div><div class='add'>+	gnode = amt_lookup_group(tunnel, &amp;group, &amp;host, false);</div><div class='add'>+	if (!gnode) {</div><div class='add'>+		gnode = amt_add_group(amt, tunnel, &amp;group, &amp;host, false);</div><div class='add'>+		if (!IS_ERR(gnode)) {</div><div class='add'>+			gnode-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+			if (!mod_delayed_work(amt_wq, &amp;gnode-&gt;group_timer,</div><div class='add'>+					      msecs_to_jiffies(amt_gmi(amt))))</div><div class='add'>+				dev_hold(amt-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RFC 3376</div><div class='add'>+ * 7.3.2. In the Presence of Older Version Group Members</div><div class='add'>+ *</div><div class='add'>+ * When Group Compatibility Mode is IGMPv2, a router internally</div><div class='add'>+ * translates the following IGMPv2 messages for that group to their</div><div class='add'>+ * IGMPv3 equivalents:</div><div class='add'>+ *</div><div class='add'>+ * IGMPv2 Message                IGMPv3 Equivalent</div><div class='add'>+ * --------------                -----------------</div><div class='add'>+ * Report                        IS_EX( {} )</div><div class='add'>+ * Leave                         TO_IN( {} )</div><div class='add'>+ */</div><div class='add'>+static void amt_igmpv2_leave_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				     struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct igmphdr *ih = igmp_hdr(skb);</div><div class='add'>+	struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group, host;</div><div class='add'>+</div><div class='add'>+	memset(&amp;group, 0, sizeof(union amt_addr));</div><div class='add'>+	group.ip4 = ih-&gt;group;</div><div class='add'>+	memset(&amp;host, 0, sizeof(union amt_addr));</div><div class='add'>+	host.ip4 = iph-&gt;saddr;</div><div class='add'>+</div><div class='add'>+	gnode = amt_lookup_group(tunnel, &amp;group, &amp;host, false);</div><div class='add'>+	if (gnode)</div><div class='add'>+		amt_del_group(amt, gnode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_igmpv3_report_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				      struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct igmpv3_report *ihrv3 = igmpv3_report_hdr(skb);</div><div class='add'>+	int len = skb_transport_offset(skb) + sizeof(*ihrv3);</div><div class='add'>+	void *zero_grec = (void *)&amp;igmpv3_zero_grec;</div><div class='add'>+	struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group, host;</div><div class='add'>+	struct igmpv3_grec *grec;</div><div class='add'>+	u16 nsrcs;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ntohs(ihrv3-&gt;ngrec); i++) {</div><div class='add'>+		len += sizeof(*grec);</div><div class='add'>+		if (!ip_mc_may_pull(skb, len))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		grec = (void *)(skb-&gt;data + len - sizeof(*grec));</div><div class='add'>+		nsrcs = ntohs(grec-&gt;grec_nsrcs);</div><div class='add'>+</div><div class='add'>+		len += nsrcs * sizeof(__be32);</div><div class='add'>+		if (!ip_mc_may_pull(skb, len))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memset(&amp;group, 0, sizeof(union amt_addr));</div><div class='add'>+		group.ip4 = grec-&gt;grec_mca;</div><div class='add'>+		memset(&amp;host, 0, sizeof(union amt_addr));</div><div class='add'>+		host.ip4 = iph-&gt;saddr;</div><div class='add'>+		gnode = amt_lookup_group(tunnel, &amp;group, &amp;host, false);</div><div class='add'>+		if (!gnode) {</div><div class='add'>+			gnode = amt_add_group(amt, tunnel, &amp;group, &amp;host,</div><div class='add'>+					      false);</div><div class='add'>+			if (IS_ERR(gnode))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		amt_add_srcs(amt, tunnel, gnode, grec, false);</div><div class='add'>+		switch (grec-&gt;grec_type) {</div><div class='add'>+		case IGMPV3_MODE_IS_INCLUDE:</div><div class='add'>+			amt_mcast_is_in_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, false);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_MODE_IS_EXCLUDE:</div><div class='add'>+			amt_mcast_is_ex_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, false);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_CHANGE_TO_INCLUDE:</div><div class='add'>+			amt_mcast_to_in_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, false);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_CHANGE_TO_EXCLUDE:</div><div class='add'>+			amt_mcast_to_ex_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, false);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_ALLOW_NEW_SOURCES:</div><div class='add'>+			amt_mcast_allow_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, false);</div><div class='add'>+			break;</div><div class='add'>+		case IGMPV3_BLOCK_OLD_SOURCES:</div><div class='add'>+			amt_mcast_block_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, false);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		amt_cleanup_srcs(amt, tunnel, gnode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* caller held tunnel-&gt;lock */</div><div class='add'>+static void amt_igmp_report_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				    struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct igmphdr *ih = igmp_hdr(skb);</div><div class='add'>+</div><div class='add'>+	switch (ih-&gt;type) {</div><div class='add'>+	case IGMPV3_HOST_MEMBERSHIP_REPORT:</div><div class='add'>+		amt_igmpv3_report_handler(amt, skb, tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case IGMPV2_HOST_MEMBERSHIP_REPORT:</div><div class='add'>+		amt_igmpv2_report_handler(amt, skb, tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case IGMP_HOST_LEAVE_MESSAGE:</div><div class='add'>+		amt_igmpv2_leave_handler(amt, skb, tunnel);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+/* RFC 3810</div><div class='add'>+ * 8.3.2. In the Presence of MLDv1 Multicast Address Listeners</div><div class='add'>+ *</div><div class='add'>+ * When Multicast Address Compatibility Mode is MLDv2, a router acts</div><div class='add'>+ * using the MLDv2 protocol for that multicast address.  When Multicast</div><div class='add'>+ * Address Compatibility Mode is MLDv1, a router internally translates</div><div class='add'>+ * the following MLDv1 messages for that multicast address to their</div><div class='add'>+ * MLDv2 equivalents:</div><div class='add'>+ *</div><div class='add'>+ * MLDv1 Message                 MLDv2 Equivalent</div><div class='add'>+ * --------------                -----------------</div><div class='add'>+ * Report                        IS_EX( {} )</div><div class='add'>+ * Done                          TO_IN( {} )</div><div class='add'>+ */</div><div class='add'>+static void amt_mldv1_report_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				     struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct mld_msg *mld = (struct mld_msg *)icmp6_hdr(skb);</div><div class='add'>+	struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group, host;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;group.ip6, &amp;mld-&gt;mld_mca, sizeof(struct in6_addr));</div><div class='add'>+	memcpy(&amp;host.ip6, &amp;ip6h-&gt;saddr, sizeof(struct in6_addr));</div><div class='add'>+</div><div class='add'>+	gnode = amt_lookup_group(tunnel, &amp;group, &amp;host, true);</div><div class='add'>+	if (!gnode) {</div><div class='add'>+		gnode = amt_add_group(amt, tunnel, &amp;group, &amp;host, true);</div><div class='add'>+		if (!IS_ERR(gnode)) {</div><div class='add'>+			gnode-&gt;filter_mode = MCAST_EXCLUDE;</div><div class='add'>+			if (!mod_delayed_work(amt_wq, &amp;gnode-&gt;group_timer,</div><div class='add'>+					      msecs_to_jiffies(amt_gmi(amt))))</div><div class='add'>+				dev_hold(amt-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* RFC 3810</div><div class='add'>+ * 8.3.2. In the Presence of MLDv1 Multicast Address Listeners</div><div class='add'>+ *</div><div class='add'>+ * When Multicast Address Compatibility Mode is MLDv2, a router acts</div><div class='add'>+ * using the MLDv2 protocol for that multicast address.  When Multicast</div><div class='add'>+ * Address Compatibility Mode is MLDv1, a router internally translates</div><div class='add'>+ * the following MLDv1 messages for that multicast address to their</div><div class='add'>+ * MLDv2 equivalents:</div><div class='add'>+ *</div><div class='add'>+ * MLDv1 Message                 MLDv2 Equivalent</div><div class='add'>+ * --------------                -----------------</div><div class='add'>+ * Report                        IS_EX( {} )</div><div class='add'>+ * Done                          TO_IN( {} )</div><div class='add'>+ */</div><div class='add'>+static void amt_mldv1_leave_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				    struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct mld_msg *mld = (struct mld_msg *)icmp6_hdr(skb);</div><div class='add'>+	struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group, host;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;group.ip6, &amp;mld-&gt;mld_mca, sizeof(struct in6_addr));</div><div class='add'>+	memset(&amp;host, 0, sizeof(union amt_addr));</div><div class='add'>+	host.ip4 = iph-&gt;saddr;</div><div class='add'>+</div><div class='add'>+	gnode = amt_lookup_group(tunnel, &amp;group, &amp;host, true);</div><div class='add'>+	if (gnode) {</div><div class='add'>+		amt_del_group(amt, gnode);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_mldv2_report_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				     struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct mld2_report *mld2r = (struct mld2_report *)icmp6_hdr(skb);</div><div class='add'>+	int len = skb_transport_offset(skb) + sizeof(*mld2r);</div><div class='add'>+	void *zero_grec = (void *)&amp;mldv2_zero_grec;</div><div class='add'>+	struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+	struct amt_group_node *gnode;</div><div class='add'>+	union amt_addr group, host;</div><div class='add'>+	struct mld2_grec *grec;</div><div class='add'>+	u16 nsrcs;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ntohs(mld2r-&gt;mld2r_ngrec); i++) {</div><div class='add'>+		len += sizeof(*grec);</div><div class='add'>+		if (!ipv6_mc_may_pull(skb, len))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		grec = (void *)(skb-&gt;data + len - sizeof(*grec));</div><div class='add'>+		nsrcs = ntohs(grec-&gt;grec_nsrcs);</div><div class='add'>+</div><div class='add'>+		len += nsrcs * sizeof(struct in6_addr);</div><div class='add'>+		if (!ipv6_mc_may_pull(skb, len))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memset(&amp;group, 0, sizeof(union amt_addr));</div><div class='add'>+		group.ip6 = grec-&gt;grec_mca;</div><div class='add'>+		memset(&amp;host, 0, sizeof(union amt_addr));</div><div class='add'>+		host.ip6 = ip6h-&gt;saddr;</div><div class='add'>+		gnode = amt_lookup_group(tunnel, &amp;group, &amp;host, true);</div><div class='add'>+		if (!gnode) {</div><div class='add'>+			gnode = amt_add_group(amt, tunnel, &amp;group, &amp;host,</div><div class='add'>+					      ETH_P_IPV6);</div><div class='add'>+			if (IS_ERR(gnode))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		amt_add_srcs(amt, tunnel, gnode, grec, true);</div><div class='add'>+		switch (grec-&gt;grec_type) {</div><div class='add'>+		case MLD2_MODE_IS_INCLUDE:</div><div class='add'>+			amt_mcast_is_in_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, true);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_MODE_IS_EXCLUDE:</div><div class='add'>+			amt_mcast_is_ex_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, true);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_CHANGE_TO_INCLUDE:</div><div class='add'>+			amt_mcast_to_in_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, true);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_CHANGE_TO_EXCLUDE:</div><div class='add'>+			amt_mcast_to_ex_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, true);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_ALLOW_NEW_SOURCES:</div><div class='add'>+			amt_mcast_allow_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, true);</div><div class='add'>+			break;</div><div class='add'>+		case MLD2_BLOCK_OLD_SOURCES:</div><div class='add'>+			amt_mcast_block_handler(amt, tunnel, gnode, grec,</div><div class='add'>+						zero_grec, true);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		amt_cleanup_srcs(amt, tunnel, gnode);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* caller held tunnel-&gt;lock */</div><div class='add'>+static void amt_mld_report_handler(struct amt_dev *amt, struct sk_buff *skb,</div><div class='add'>+				   struct amt_tunnel_list *tunnel)</div><div class='add'>+{</div><div class='add'>+	struct mld_msg *mld = (struct mld_msg *)icmp6_hdr(skb);</div><div class='add'>+</div><div class='add'>+	switch (mld-&gt;mld_type) {</div><div class='add'>+	case ICMPV6_MGM_REPORT:</div><div class='add'>+		amt_mldv1_report_handler(amt, skb, tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case ICMPV6_MLD2_REPORT:</div><div class='add'>+		amt_mldv2_report_handler(amt, skb, tunnel);</div><div class='add'>+		break;</div><div class='add'>+	case ICMPV6_MGM_REDUCTION:</div><div class='add'>+		amt_mldv1_leave_handler(amt, skb, tunnel);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static bool amt_advertisement_handler(struct amt_dev *amt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_advertisement *amta;</div><div class='add'>+	int hdr_size;</div><div class='add'>+</div><div class='add'>+	hdr_size = sizeof(*amta) + sizeof(struct udphdr);</div><div class='add'>+	if (!pskb_may_pull(skb, hdr_size))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	amta = (struct amt_header_advertisement *)(udp_hdr(skb) + 1);</div><div class='add'>+	if (!amta-&gt;ip4)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (amta-&gt;reserved || amta-&gt;version)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (ipv4_is_loopback(amta-&gt;ip4) || ipv4_is_multicast(amta-&gt;ip4) ||</div><div class='add'>+	    ipv4_is_zeronet(amta-&gt;ip4))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;status != AMT_STATUS_SENT_DISCOVERY ||</div><div class='add'>+	    amt-&gt;nonce != amta-&gt;nonce)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	amt-&gt;remote_ip = amta-&gt;ip4;</div><div class='add'>+	netdev_dbg(amt-&gt;dev, "advertised remote ip = %pI4\n", &amp;amt-&gt;remote_ip);</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;amt-&gt;req_wq, 0);</div><div class='add'>+</div><div class='add'>+	amt_update_gw_status(amt, AMT_STATUS_RECEIVED_ADVERTISEMENT, true);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_multicast_data_handler(struct amt_dev *amt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_mcast_data *amtmd;</div><div class='add'>+	int hdr_size, len, err;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(amt-&gt;status) != AMT_STATUS_SENT_UPDATE)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	hdr_size = sizeof(*amtmd) + sizeof(struct udphdr);</div><div class='add'>+	if (!pskb_may_pull(skb, hdr_size))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	amtmd = (struct amt_header_mcast_data *)(udp_hdr(skb) + 1);</div><div class='add'>+	if (amtmd-&gt;reserved || amtmd-&gt;version)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (iptunnel_pull_header(skb, hdr_size, htons(ETH_P_IP), false))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_push(skb, sizeof(*eth));</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_pull(skb, sizeof(*eth));</div><div class='add'>+	eth = eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*iph)))</div><div class='add'>+		return true;</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (iph-&gt;version == 4) {</div><div class='add'>+		if (!ipv4_is_multicast(iph-&gt;daddr))</div><div class='add'>+			return true;</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='add'>+		ip_eth_mc_map(iph-&gt;daddr, eth-&gt;h_dest);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (iph-&gt;version == 6) {</div><div class='add'>+		struct ipv6hdr *ip6h;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, sizeof(*ip6h)))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		ip6h = ipv6_hdr(skb);</div><div class='add'>+		if (!ipv6_addr_is_multicast(&amp;ip6h-&gt;daddr))</div><div class='add'>+			return true;</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='add'>+		ipv6_eth_mc_map(&amp;ip6h-&gt;daddr, eth-&gt;h_dest);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+	err = gro_cells_receive(&amp;amt-&gt;gro_cells, skb);</div><div class='add'>+	if (likely(err == NET_RX_SUCCESS))</div><div class='add'>+		dev_sw_netstats_rx_add(amt-&gt;dev, len);</div><div class='add'>+	else</div><div class='add'>+		amt-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_membership_query_handler(struct amt_dev *amt,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_membership_query *amtmq;</div><div class='add'>+	struct igmpv3_query *ihv3;</div><div class='add'>+	struct ethhdr *eth, *oeth;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	int hdr_size, len;</div><div class='add'>+</div><div class='add'>+	hdr_size = sizeof(*amtmq) + sizeof(struct udphdr);</div><div class='add'>+	if (!pskb_may_pull(skb, hdr_size))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	amtmq = (struct amt_header_membership_query *)(udp_hdr(skb) + 1);</div><div class='add'>+	if (amtmq-&gt;reserved || amtmq-&gt;version)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (amtmq-&gt;nonce != amt-&gt;nonce)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	hdr_size -= sizeof(*eth);</div><div class='add'>+	if (iptunnel_pull_header(skb, hdr_size, htons(ETH_P_TEB), false))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	oeth = eth_hdr(skb);</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_pull(skb, sizeof(*eth));</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	eth = eth_hdr(skb);</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*iph)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	if (iph-&gt;version == 4) {</div><div class='add'>+		if (READ_ONCE(amt-&gt;ready4))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, sizeof(*iph) + AMT_IPHDR_OPTS +</div><div class='add'>+				   sizeof(*ihv3)))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		if (!ipv4_is_multicast(iph-&gt;daddr))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		ihv3 = skb_pull(skb, sizeof(*iph) + AMT_IPHDR_OPTS);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+		skb_push(skb, sizeof(*iph) + AMT_IPHDR_OPTS);</div><div class='add'>+		WRITE_ONCE(amt-&gt;ready4, true);</div><div class='add'>+		amt-&gt;mac = amtmq-&gt;response_mac;</div><div class='add'>+		amt-&gt;req_cnt = 0;</div><div class='add'>+		amt-&gt;qi = ihv3-&gt;qqic;</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='add'>+		ip_eth_mc_map(iph-&gt;daddr, eth-&gt;h_dest);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (iph-&gt;version == 6) {</div><div class='add'>+		struct mld2_query *mld2q;</div><div class='add'>+		struct ipv6hdr *ip6h;</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(amt-&gt;ready6))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		if (!pskb_may_pull(skb, sizeof(*ip6h) + AMT_IP6HDR_OPTS +</div><div class='add'>+				   sizeof(*mld2q)))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		ip6h = ipv6_hdr(skb);</div><div class='add'>+		if (!ipv6_addr_is_multicast(&amp;ip6h-&gt;daddr))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		mld2q = skb_pull(skb, sizeof(*ip6h) + AMT_IP6HDR_OPTS);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+		skb_push(skb, sizeof(*ip6h) + AMT_IP6HDR_OPTS);</div><div class='add'>+		WRITE_ONCE(amt-&gt;ready6, true);</div><div class='add'>+		amt-&gt;mac = amtmq-&gt;response_mac;</div><div class='add'>+		amt-&gt;req_cnt = 0;</div><div class='add'>+		amt-&gt;qi = mld2q-&gt;mld2q_qqic;</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='add'>+		ipv6_eth_mc_map(&amp;ip6h-&gt;daddr, eth-&gt;h_dest);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(eth-&gt;h_source, oeth-&gt;h_source);</div><div class='add'>+	skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	if (__netif_rx(skb) == NET_RX_SUCCESS) {</div><div class='add'>+		amt_update_gw_status(amt, AMT_STATUS_RECEIVED_QUERY, true);</div><div class='add'>+		dev_sw_netstats_rx_add(amt-&gt;dev, len);</div><div class='add'>+	} else {</div><div class='add'>+		amt-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+	}</div><div class='add'>+	local_bh_enable();</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_update_handler(struct amt_dev *amt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_membership_update *amtmu;</div><div class='add'>+	struct amt_tunnel_list *tunnel;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	int len, hdr_size;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	hdr_size = sizeof(*amtmu) + sizeof(struct udphdr);</div><div class='add'>+	if (!pskb_may_pull(skb, hdr_size))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	amtmu = (struct amt_header_membership_update *)(udp_hdr(skb) + 1);</div><div class='add'>+	if (amtmu-&gt;reserved || amtmu-&gt;version)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (iptunnel_pull_header(skb, hdr_size, skb-&gt;protocol, false))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(tunnel, &amp;amt-&gt;tunnel_list, list) {</div><div class='add'>+		if (tunnel-&gt;ip4 == iph-&gt;saddr) {</div><div class='add'>+			if ((amtmu-&gt;nonce == tunnel-&gt;nonce &amp;&amp;</div><div class='add'>+			     amtmu-&gt;response_mac == tunnel-&gt;mac)) {</div><div class='add'>+				mod_delayed_work(amt_wq, &amp;tunnel-&gt;gc_wq,</div><div class='add'>+						 msecs_to_jiffies(amt_gmi(amt))</div><div class='add'>+								  * 3);</div><div class='add'>+				goto report;</div><div class='add'>+			} else {</div><div class='add'>+				netdev_dbg(amt-&gt;dev, "Invalid MAC\n");</div><div class='add'>+				return true;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+report:</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*iph)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	if (iph-&gt;version == 4) {</div><div class='add'>+		if (ip_mc_check_igmp(skb)) {</div><div class='add'>+			netdev_dbg(amt-&gt;dev, "Invalid IGMP\n");</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+		amt_igmp_report_handler(amt, skb, tunnel);</div><div class='add'>+		spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+</div><div class='add'>+		skb_push(skb, sizeof(struct ethhdr));</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+		eth = eth_hdr(skb);</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IP);</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IP);</div><div class='add'>+		ip_eth_mc_map(iph-&gt;daddr, eth-&gt;h_dest);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (iph-&gt;version == 6) {</div><div class='add'>+		struct ipv6hdr *ip6h = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+		if (ipv6_mc_check_mld(skb)) {</div><div class='add'>+			netdev_dbg(amt-&gt;dev, "Invalid MLD\n");</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+		amt_mld_report_handler(amt, skb, tunnel);</div><div class='add'>+		spin_unlock_bh(&amp;tunnel-&gt;lock);</div><div class='add'>+</div><div class='add'>+		skb_push(skb, sizeof(struct ethhdr));</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+		eth = eth_hdr(skb);</div><div class='add'>+		skb-&gt;protocol = htons(ETH_P_IPV6);</div><div class='add'>+		eth-&gt;h_proto = htons(ETH_P_IPV6);</div><div class='add'>+		ipv6_eth_mc_map(&amp;ip6h-&gt;daddr, eth-&gt;h_dest);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		netdev_dbg(amt-&gt;dev, "Unsupported Protocol\n");</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(skb, sizeof(struct ethhdr));</div><div class='add'>+	skb-&gt;pkt_type = PACKET_MULTICAST;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+	if (__netif_rx(skb) == NET_RX_SUCCESS) {</div><div class='add'>+		amt_update_relay_status(tunnel, AMT_STATUS_RECEIVED_UPDATE,</div><div class='add'>+					true);</div><div class='add'>+		dev_sw_netstats_rx_add(amt-&gt;dev, len);</div><div class='add'>+	} else {</div><div class='add'>+		amt-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_send_advertisement(struct amt_dev *amt, __be32 nonce,</div><div class='add'>+				   __be32 daddr, __be16 dport)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_advertisement *amta;</div><div class='add'>+	int hlen, tlen, offset;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct udphdr *udph;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	struct flowi4 fl4;</div><div class='add'>+	u32 len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	sock = rcu_dereference(amt-&gt;sock);</div><div class='add'>+	if (!sock)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(amt-&gt;stream_dev) || !netif_running(amt-&gt;dev))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rt = ip_route_output_ports(amt-&gt;net, &amp;fl4, sock-&gt;sk,</div><div class='add'>+				   daddr, amt-&gt;local_ip,</div><div class='add'>+				   dport, amt-&gt;relay_port,</div><div class='add'>+				   IPPROTO_UDP, 0,</div><div class='add'>+				   amt-&gt;stream_dev-&gt;ifindex);</div><div class='add'>+	if (IS_ERR(rt)) {</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hlen = LL_RESERVED_SPACE(amt-&gt;dev);</div><div class='add'>+	tlen = amt-&gt;dev-&gt;needed_tailroom;</div><div class='add'>+	len = hlen + tlen + sizeof(*iph) + sizeof(*udph) + sizeof(*amta);</div><div class='add'>+	skb = netdev_alloc_skb_ip_align(amt-&gt;dev, len);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ip_rt_put(rt);</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='add'>+	skb_dst_set(skb, &amp;rt-&gt;dst);</div><div class='add'>+</div><div class='add'>+	len = sizeof(*iph) + sizeof(*udph) + sizeof(*amta);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	amta = skb_pull(skb, sizeof(*iph) + sizeof(*udph));</div><div class='add'>+	amta-&gt;version	= 0;</div><div class='add'>+	amta-&gt;type	= AMT_MSG_ADVERTISEMENT;</div><div class='add'>+	amta-&gt;reserved	= 0;</div><div class='add'>+	amta-&gt;nonce	= nonce;</div><div class='add'>+	amta-&gt;ip4	= amt-&gt;local_ip;</div><div class='add'>+	skb_push(skb, sizeof(*udph));</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	udph		= udp_hdr(skb);</div><div class='add'>+	udph-&gt;source	= amt-&gt;relay_port;</div><div class='add'>+	udph-&gt;dest	= dport;</div><div class='add'>+	udph-&gt;len	= htons(sizeof(*amta) + sizeof(*udph));</div><div class='add'>+	udph-&gt;check	= 0;</div><div class='add'>+	offset = skb_transport_offset(skb);</div><div class='add'>+	skb-&gt;csum = skb_checksum(skb, offset, skb-&gt;len - offset, 0);</div><div class='add'>+	udph-&gt;check = csum_tcpudp_magic(amt-&gt;local_ip, daddr,</div><div class='add'>+					sizeof(*udph) + sizeof(*amta),</div><div class='add'>+					IPPROTO_UDP, skb-&gt;csum);</div><div class='add'>+</div><div class='add'>+	skb_push(skb, sizeof(*iph));</div><div class='add'>+	iph		= ip_hdr(skb);</div><div class='add'>+	iph-&gt;version	= 4;</div><div class='add'>+	iph-&gt;ihl	= (sizeof(struct iphdr)) &gt;&gt; 2;</div><div class='add'>+	iph-&gt;tos	= AMT_TOS;</div><div class='add'>+	iph-&gt;frag_off	= 0;</div><div class='add'>+	iph-&gt;ttl	= ip4_dst_hoplimit(&amp;rt-&gt;dst);</div><div class='add'>+	iph-&gt;daddr	= daddr;</div><div class='add'>+	iph-&gt;saddr	= amt-&gt;local_ip;</div><div class='add'>+	iph-&gt;protocol	= IPPROTO_UDP;</div><div class='add'>+	iph-&gt;tot_len	= htons(len);</div><div class='add'>+</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+	ip_select_ident(amt-&gt;net, skb, NULL);</div><div class='add'>+	ip_send_check(iph);</div><div class='add'>+	err = ip_local_out(amt-&gt;net, sock-&gt;sk, skb);</div><div class='add'>+	if (unlikely(net_xmit_eval(err)))</div><div class='add'>+		amt-&gt;dev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_discovery_handler(struct amt_dev *amt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_discovery *amtd;</div><div class='add'>+	struct udphdr *udph;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*udph) + sizeof(*amtd)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	udph = udp_hdr(skb);</div><div class='add'>+	amtd = (struct amt_header_discovery *)(udp_hdr(skb) + 1);</div><div class='add'>+</div><div class='add'>+	if (amtd-&gt;reserved || amtd-&gt;version)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	amt_send_advertisement(amt, amtd-&gt;nonce, iph-&gt;saddr, udph-&gt;source);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool amt_request_handler(struct amt_dev *amt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_header_request *amtrh;</div><div class='add'>+	struct amt_tunnel_list *tunnel;</div><div class='add'>+	unsigned long long key;</div><div class='add'>+	struct udphdr *udph;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	u64 mac;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!pskb_may_pull(skb, sizeof(*udph) + sizeof(*amtrh)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	udph = udp_hdr(skb);</div><div class='add'>+	amtrh = (struct amt_header_request *)(udp_hdr(skb) + 1);</div><div class='add'>+</div><div class='add'>+	if (amtrh-&gt;reserved1 || amtrh-&gt;reserved2 || amtrh-&gt;version)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_rcu(tunnel, &amp;amt-&gt;tunnel_list, list)</div><div class='add'>+		if (tunnel-&gt;ip4 == iph-&gt;saddr)</div><div class='add'>+			goto send;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;amt-&gt;lock);</div><div class='add'>+	if (amt-&gt;nr_tunnels &gt;= amt-&gt;max_tunnels) {</div><div class='add'>+		spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+		icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_HOST_UNREACH, 0);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tunnel = kzalloc(sizeof(*tunnel) +</div><div class='add'>+			 (sizeof(struct hlist_head) * amt-&gt;hash_buckets),</div><div class='add'>+			 GFP_ATOMIC);</div><div class='add'>+	if (!tunnel) {</div><div class='add'>+		spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tunnel-&gt;source_port = udph-&gt;source;</div><div class='add'>+	tunnel-&gt;ip4 = iph-&gt;saddr;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;key, &amp;tunnel-&gt;key, sizeof(unsigned long long));</div><div class='add'>+	tunnel-&gt;amt = amt;</div><div class='add'>+	spin_lock_init(&amp;tunnel-&gt;lock);</div><div class='add'>+	for (i = 0; i &lt; amt-&gt;hash_buckets; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;tunnel-&gt;groups[i]);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;tunnel-&gt;gc_wq, amt_tunnel_expire);</div><div class='add'>+</div><div class='add'>+	list_add_tail_rcu(&amp;tunnel-&gt;list, &amp;amt-&gt;tunnel_list);</div><div class='add'>+	tunnel-&gt;key = amt-&gt;key;</div><div class='add'>+	__amt_update_relay_status(tunnel, AMT_STATUS_RECEIVED_REQUEST, true);</div><div class='add'>+	amt-&gt;nr_tunnels++;</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;tunnel-&gt;gc_wq,</div><div class='add'>+			 msecs_to_jiffies(amt_gmi(amt)));</div><div class='add'>+	spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+</div><div class='add'>+send:</div><div class='add'>+	tunnel-&gt;nonce = amtrh-&gt;nonce;</div><div class='add'>+	mac = siphash_3u32((__force u32)tunnel-&gt;ip4,</div><div class='add'>+			   (__force u32)tunnel-&gt;source_port,</div><div class='add'>+			   (__force u32)tunnel-&gt;nonce,</div><div class='add'>+			   &amp;tunnel-&gt;key);</div><div class='add'>+	tunnel-&gt;mac = mac &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(amt-&gt;dev) || !netif_running(amt-&gt;stream_dev))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!amtrh-&gt;p)</div><div class='add'>+		amt_send_igmp_gq(amt, tunnel);</div><div class='add'>+	else</div><div class='add'>+		amt_send_mld_gq(amt, tunnel);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_gw_rcv(struct amt_dev *amt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int type = amt_parse_type(skb);</div><div class='add'>+	int err = 1;</div><div class='add'>+</div><div class='add'>+	if (type == -1)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;mode == AMT_MODE_GATEWAY) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case AMT_MSG_ADVERTISEMENT:</div><div class='add'>+			err = amt_advertisement_handler(amt, skb);</div><div class='add'>+			break;</div><div class='add'>+		case AMT_MSG_MEMBERSHIP_QUERY:</div><div class='add'>+			err = amt_membership_query_handler(amt, skb);</div><div class='add'>+			if (!err)</div><div class='add'>+				return;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			netdev_dbg(amt-&gt;dev, "Invalid type of Gateway\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+drop:</div><div class='add'>+	if (err) {</div><div class='add'>+		amt-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	} else {</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	int type;</div><div class='add'>+	bool err;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	amt = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	if (!amt) {</div><div class='add'>+		err = true;</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = amt-&gt;dev;</div><div class='add'>+	iph = ip_hdr(skb);</div><div class='add'>+	type = amt_parse_type(skb);</div><div class='add'>+	if (type == -1) {</div><div class='add'>+		err = true;</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;mode == AMT_MODE_GATEWAY) {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case AMT_MSG_ADVERTISEMENT:</div><div class='add'>+			if (iph-&gt;saddr != amt-&gt;discovery_ip) {</div><div class='add'>+				netdev_dbg(amt-&gt;dev, "Invalid Relay IP\n");</div><div class='add'>+				err = true;</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+			if (amt_queue_event(amt, AMT_EVENT_RECEIVE, skb)) {</div><div class='add'>+				netdev_dbg(amt-&gt;dev, "AMT Event queue full\n");</div><div class='add'>+				err = true;</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+			goto out;</div><div class='add'>+		case AMT_MSG_MULTICAST_DATA:</div><div class='add'>+			if (iph-&gt;saddr != amt-&gt;remote_ip) {</div><div class='add'>+				netdev_dbg(amt-&gt;dev, "Invalid Relay IP\n");</div><div class='add'>+				err = true;</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+			err = amt_multicast_data_handler(amt, skb);</div><div class='add'>+			if (err)</div><div class='add'>+				goto drop;</div><div class='add'>+			else</div><div class='add'>+				goto out;</div><div class='add'>+		case AMT_MSG_MEMBERSHIP_QUERY:</div><div class='add'>+			if (iph-&gt;saddr != amt-&gt;remote_ip) {</div><div class='add'>+				netdev_dbg(amt-&gt;dev, "Invalid Relay IP\n");</div><div class='add'>+				err = true;</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+			if (amt_queue_event(amt, AMT_EVENT_RECEIVE, skb)) {</div><div class='add'>+				netdev_dbg(amt-&gt;dev, "AMT Event queue full\n");</div><div class='add'>+				err = true;</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+			goto out;</div><div class='add'>+		default:</div><div class='add'>+			err = true;</div><div class='add'>+			netdev_dbg(amt-&gt;dev, "Invalid type of Gateway\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (type) {</div><div class='add'>+		case AMT_MSG_DISCOVERY:</div><div class='add'>+			err = amt_discovery_handler(amt, skb);</div><div class='add'>+			break;</div><div class='add'>+		case AMT_MSG_REQUEST:</div><div class='add'>+			err = amt_request_handler(amt, skb);</div><div class='add'>+			break;</div><div class='add'>+		case AMT_MSG_MEMBERSHIP_UPDATE:</div><div class='add'>+			err = amt_update_handler(amt, skb);</div><div class='add'>+			if (err)</div><div class='add'>+				goto drop;</div><div class='add'>+			else</div><div class='add'>+				goto out;</div><div class='add'>+		default:</div><div class='add'>+			err = true;</div><div class='add'>+			netdev_dbg(amt-&gt;dev, "Invalid type of relay\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+drop:</div><div class='add'>+	if (err) {</div><div class='add'>+		amt-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	} else {</div><div class='add'>+		consume_skb(skb);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = container_of(work, struct amt_dev, event_wq);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 event;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AMT_MAX_EVENTS; i++) {</div><div class='add'>+		spin_lock_bh(&amp;amt-&gt;lock);</div><div class='add'>+		if (amt-&gt;nr_events == 0) {</div><div class='add'>+			spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		event = amt-&gt;events[amt-&gt;event_idx].event;</div><div class='add'>+		skb = amt-&gt;events[amt-&gt;event_idx].skb;</div><div class='add'>+		amt-&gt;events[amt-&gt;event_idx].event = AMT_EVENT_NONE;</div><div class='add'>+		amt-&gt;events[amt-&gt;event_idx].skb = NULL;</div><div class='add'>+		amt-&gt;nr_events--;</div><div class='add'>+		amt-&gt;event_idx++;</div><div class='add'>+		amt-&gt;event_idx %= AMT_MAX_EVENTS;</div><div class='add'>+		spin_unlock_bh(&amp;amt-&gt;lock);</div><div class='add'>+</div><div class='add'>+		switch (event) {</div><div class='add'>+		case AMT_EVENT_RECEIVE:</div><div class='add'>+			amt_gw_rcv(amt, skb);</div><div class='add'>+			break;</div><div class='add'>+		case AMT_EVENT_SEND_DISCOVERY:</div><div class='add'>+			amt_event_send_discovery(amt);</div><div class='add'>+			break;</div><div class='add'>+		case AMT_EVENT_SEND_REQUEST:</div><div class='add'>+			amt_event_send_request(amt);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_err_lookup(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt;</div><div class='add'>+	int type;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock_bh();</div><div class='add'>+	amt = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	if (!amt)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;mode != AMT_MODE_GATEWAY)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	type = amt_parse_type(skb);</div><div class='add'>+	if (type == -1)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(amt-&gt;dev, "Received IGMP Unreachable of %s\n",</div><div class='add'>+		   type_str[type]);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case AMT_MSG_DISCOVERY:</div><div class='add'>+		break;</div><div class='add'>+	case AMT_MSG_REQUEST:</div><div class='add'>+	case AMT_MSG_MEMBERSHIP_UPDATE:</div><div class='add'>+		if (READ_ONCE(amt-&gt;status) &gt;= AMT_STATUS_RECEIVED_ADVERTISEMENT)</div><div class='add'>+			mod_delayed_work(amt_wq, &amp;amt-&gt;req_wq, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='add'>+	return 0;</div><div class='add'>+drop:</div><div class='add'>+	rcu_read_unlock_bh();</div><div class='add'>+	amt-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct socket *amt_create_sock(struct net *net, __be16 port)</div><div class='add'>+{</div><div class='add'>+	struct udp_port_cfg udp_conf;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;udp_conf, 0, sizeof(udp_conf));</div><div class='add'>+	udp_conf.family = AF_INET;</div><div class='add'>+	udp_conf.local_ip.s_addr = htonl(INADDR_ANY);</div><div class='add'>+</div><div class='add'>+	udp_conf.local_udp_port = port;</div><div class='add'>+</div><div class='add'>+	err = udp_sock_create(net, &amp;udp_conf, &amp;sock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	return sock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_socket_create(struct amt_dev *amt)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_sock_cfg tunnel_cfg;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+</div><div class='add'>+	sock = amt_create_sock(amt-&gt;net, amt-&gt;relay_port);</div><div class='add'>+	if (IS_ERR(sock))</div><div class='add'>+		return PTR_ERR(sock);</div><div class='add'>+</div><div class='add'>+	/* Mark socket as an encapsulation socket */</div><div class='add'>+	memset(&amp;tunnel_cfg, 0, sizeof(tunnel_cfg));</div><div class='add'>+	tunnel_cfg.sk_user_data = amt;</div><div class='add'>+	tunnel_cfg.encap_type = 1;</div><div class='add'>+	tunnel_cfg.encap_rcv = amt_rcv;</div><div class='add'>+	tunnel_cfg.encap_err_lookup = amt_err_lookup;</div><div class='add'>+	tunnel_cfg.encap_destroy = NULL;</div><div class='add'>+	setup_udp_tunnel_sock(amt-&gt;net, sock, &amp;tunnel_cfg);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(amt-&gt;sock, sock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_dev_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	amt-&gt;ready4 = false;</div><div class='add'>+	amt-&gt;ready6 = false;</div><div class='add'>+	amt-&gt;event_idx = 0;</div><div class='add'>+	amt-&gt;nr_events = 0;</div><div class='add'>+</div><div class='add'>+	err = amt_socket_create(amt);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	amt-&gt;req_cnt = 0;</div><div class='add'>+	amt-&gt;remote_ip = 0;</div><div class='add'>+	amt-&gt;nonce = 0;</div><div class='add'>+	get_random_bytes(&amp;amt-&gt;key, sizeof(siphash_key_t));</div><div class='add'>+</div><div class='add'>+	amt-&gt;status = AMT_STATUS_INIT;</div><div class='add'>+	if (amt-&gt;mode == AMT_MODE_GATEWAY) {</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;amt-&gt;discovery_wq, 0);</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;amt-&gt;req_wq, 0);</div><div class='add'>+	} else if (amt-&gt;mode == AMT_MODE_RELAY) {</div><div class='add'>+		mod_delayed_work(amt_wq, &amp;amt-&gt;secret_wq,</div><div class='add'>+				 msecs_to_jiffies(AMT_SECRET_TIMEOUT));</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_dev_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+	struct amt_tunnel_list *tunnel, *tmp;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;amt-&gt;req_wq);</div><div class='add'>+	cancel_delayed_work_sync(&amp;amt-&gt;discovery_wq);</div><div class='add'>+	cancel_delayed_work_sync(&amp;amt-&gt;secret_wq);</div><div class='add'>+</div><div class='add'>+	/* shutdown */</div><div class='add'>+	sock = rtnl_dereference(amt-&gt;sock);</div><div class='add'>+	RCU_INIT_POINTER(amt-&gt;sock, NULL);</div><div class='add'>+	synchronize_net();</div><div class='add'>+	if (sock)</div><div class='add'>+		udp_tunnel_sock_release(sock);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;amt-&gt;event_wq);</div><div class='add'>+	for (i = 0; i &lt; AMT_MAX_EVENTS; i++) {</div><div class='add'>+		skb = amt-&gt;events[i].skb;</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		amt-&gt;events[i].event = AMT_EVENT_NONE;</div><div class='add'>+		amt-&gt;events[i].skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amt-&gt;ready4 = false;</div><div class='add'>+	amt-&gt;ready6 = false;</div><div class='add'>+	amt-&gt;req_cnt = 0;</div><div class='add'>+	amt-&gt;remote_ip = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(tunnel, tmp, &amp;amt-&gt;tunnel_list, list) {</div><div class='add'>+		list_del_rcu(&amp;tunnel-&gt;list);</div><div class='add'>+		amt-&gt;nr_tunnels--;</div><div class='add'>+		cancel_delayed_work_sync(&amp;tunnel-&gt;gc_wq);</div><div class='add'>+		amt_clear_groups(tunnel);</div><div class='add'>+		kfree_rcu(tunnel, rcu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct device_type amt_type = {</div><div class='add'>+	.name = "amt",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int amt_dev_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	amt-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	err = gro_cells_init(&amp;amt-&gt;gro_cells, dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_dev_uninit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	gro_cells_destroy(&amp;amt-&gt;gro_cells);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops amt_netdev_ops = {</div><div class='add'>+	.ndo_init               = amt_dev_init,</div><div class='add'>+	.ndo_uninit             = amt_dev_uninit,</div><div class='add'>+	.ndo_open		= amt_dev_open,</div><div class='add'>+	.ndo_stop		= amt_dev_stop,</div><div class='add'>+	.ndo_start_xmit         = amt_dev_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void amt_link_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;netdev_ops         = &amp;amt_netdev_ops;</div><div class='add'>+	dev-&gt;needs_free_netdev  = true;</div><div class='add'>+	SET_NETDEV_DEVTYPE(dev, &amp;amt_type);</div><div class='add'>+	dev-&gt;min_mtu		= ETH_MIN_MTU;</div><div class='add'>+	dev-&gt;max_mtu		= ETH_MAX_MTU;</div><div class='add'>+	dev-&gt;type		= ARPHRD_NONE;</div><div class='add'>+	dev-&gt;flags		= IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;</div><div class='add'>+	dev-&gt;hard_header_len	= 0;</div><div class='add'>+	dev-&gt;addr_len		= 0;</div><div class='add'>+	dev-&gt;priv_flags		|= IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;lltx		= true;</div><div class='add'>+	dev-&gt;netns_immutable	= true;</div><div class='add'>+	dev-&gt;features		|= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;hw_features	|= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='add'>+	dev-&gt;hw_features	|= NETIF_F_FRAGLIST | NETIF_F_RXCSUM;</div><div class='add'>+	dev-&gt;hw_features	|= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;pcpu_stat_type	= NETDEV_PCPU_STAT_TSTATS;</div><div class='add'>+	eth_hw_addr_random(dev);</div><div class='add'>+	eth_zero_addr(dev-&gt;broadcast);</div><div class='add'>+	ether_setup(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct nla_policy amt_policy[IFLA_AMT_MAX + 1] = {</div><div class='add'>+	[IFLA_AMT_MODE]		= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_AMT_RELAY_PORT]	= { .type = NLA_U16 },</div><div class='add'>+	[IFLA_AMT_GATEWAY_PORT]	= { .type = NLA_U16 },</div><div class='add'>+	[IFLA_AMT_LINK]		= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_AMT_LOCAL_IP]	= { .len = sizeof_field(struct iphdr, daddr) },</div><div class='add'>+	[IFLA_AMT_REMOTE_IP]	= { .len = sizeof_field(struct iphdr, daddr) },</div><div class='add'>+	[IFLA_AMT_DISCOVERY_IP]	= { .len = sizeof_field(struct iphdr, daddr) },</div><div class='add'>+	[IFLA_AMT_MAX_TUNNELS]	= { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int amt_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_AMT_LINK]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, data[IFLA_AMT_LINK],</div><div class='add'>+				    "Link attribute is required");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_AMT_MODE]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, data[IFLA_AMT_MODE],</div><div class='add'>+				    "Mode attribute is required");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nla_get_u32(data[IFLA_AMT_MODE]) &gt; AMT_MODE_MAX) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, data[IFLA_AMT_MODE],</div><div class='add'>+				    "Mode attribute is not valid");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_AMT_LOCAL_IP]) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, data[IFLA_AMT_DISCOVERY_IP],</div><div class='add'>+				    "Local attribute is required");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_AMT_DISCOVERY_IP] &amp;&amp;</div><div class='add'>+	    nla_get_u32(data[IFLA_AMT_MODE]) == AMT_MODE_GATEWAY) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, data[IFLA_AMT_LOCAL_IP],</div><div class='add'>+				    "Discovery attribute is required");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_newlink(struct net_device *dev,</div><div class='add'>+		       struct rtnl_newlink_params *params,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *link_net = rtnl_newlink_link_net(params);</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='add'>+	int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	amt-&gt;net = link_net;</div><div class='add'>+	amt-&gt;mode = nla_get_u32(data[IFLA_AMT_MODE]);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_AMT_MAX_TUNNELS] &amp;&amp;</div><div class='add'>+	    nla_get_u32(data[IFLA_AMT_MAX_TUNNELS]))</div><div class='add'>+		amt-&gt;max_tunnels = nla_get_u32(data[IFLA_AMT_MAX_TUNNELS]);</div><div class='add'>+	else</div><div class='add'>+		amt-&gt;max_tunnels = AMT_MAX_TUNNELS;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;amt-&gt;lock);</div><div class='add'>+	amt-&gt;max_groups = AMT_MAX_GROUP;</div><div class='add'>+	amt-&gt;max_sources = AMT_MAX_SOURCE;</div><div class='add'>+	amt-&gt;hash_buckets = AMT_HSIZE;</div><div class='add'>+	amt-&gt;nr_tunnels = 0;</div><div class='add'>+	get_random_bytes(&amp;amt-&gt;hash_seed, sizeof(amt-&gt;hash_seed));</div><div class='add'>+	amt-&gt;stream_dev = dev_get_by_index(link_net,</div><div class='add'>+					   nla_get_u32(data[IFLA_AMT_LINK]));</div><div class='add'>+	if (!amt-&gt;stream_dev) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_LINK],</div><div class='add'>+				    "Can't find stream device");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (amt-&gt;stream_dev-&gt;type != ARPHRD_ETHER) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_LINK],</div><div class='add'>+				    "Invalid stream device type");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amt-&gt;local_ip = nla_get_in_addr(data[IFLA_AMT_LOCAL_IP]);</div><div class='add'>+	if (ipv4_is_loopback(amt-&gt;local_ip) ||</div><div class='add'>+	    ipv4_is_zeronet(amt-&gt;local_ip) ||</div><div class='add'>+	    ipv4_is_multicast(amt-&gt;local_ip)) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_LOCAL_IP],</div><div class='add'>+				    "Invalid Local address");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	amt-&gt;relay_port = nla_get_be16_default(data[IFLA_AMT_RELAY_PORT],</div><div class='add'>+					       htons(IANA_AMT_UDP_PORT));</div><div class='add'>+</div><div class='add'>+	amt-&gt;gw_port = nla_get_be16_default(data[IFLA_AMT_GATEWAY_PORT],</div><div class='add'>+					    htons(IANA_AMT_UDP_PORT));</div><div class='add'>+</div><div class='add'>+	if (!amt-&gt;relay_port) {</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_DISCOVERY_IP],</div><div class='add'>+				    "relay port must not be 0");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	if (amt-&gt;mode == AMT_MODE_RELAY) {</div><div class='add'>+		amt-&gt;qrv = READ_ONCE(amt-&gt;net-&gt;ipv4.sysctl_igmp_qrv);</div><div class='add'>+		amt-&gt;qri = 10;</div><div class='add'>+		dev-&gt;needed_headroom = amt-&gt;stream_dev-&gt;needed_headroom +</div><div class='add'>+				       AMT_RELAY_HLEN;</div><div class='add'>+		dev-&gt;mtu = amt-&gt;stream_dev-&gt;mtu - AMT_RELAY_HLEN;</div><div class='add'>+		dev-&gt;max_mtu = dev-&gt;mtu;</div><div class='add'>+		dev-&gt;min_mtu = ETH_MIN_MTU + AMT_RELAY_HLEN;</div><div class='add'>+	} else {</div><div class='add'>+		if (!data[IFLA_AMT_DISCOVERY_IP]) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_DISCOVERY_IP],</div><div class='add'>+					    "discovery must be set in gateway mode");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		if (!amt-&gt;gw_port) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_DISCOVERY_IP],</div><div class='add'>+					    "gateway port must not be 0");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		amt-&gt;remote_ip = 0;</div><div class='add'>+		amt-&gt;discovery_ip = nla_get_in_addr(data[IFLA_AMT_DISCOVERY_IP]);</div><div class='add'>+		if (ipv4_is_loopback(amt-&gt;discovery_ip) ||</div><div class='add'>+		    ipv4_is_zeronet(amt-&gt;discovery_ip) ||</div><div class='add'>+		    ipv4_is_multicast(amt-&gt;discovery_ip)) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, tb[IFLA_AMT_DISCOVERY_IP],</div><div class='add'>+					    "discovery must be unicast");</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;needed_headroom = amt-&gt;stream_dev-&gt;needed_headroom +</div><div class='add'>+				       AMT_GW_HLEN;</div><div class='add'>+		dev-&gt;mtu = amt-&gt;stream_dev-&gt;mtu - AMT_GW_HLEN;</div><div class='add'>+		dev-&gt;max_mtu = dev-&gt;mtu;</div><div class='add'>+		dev-&gt;min_mtu = ETH_MIN_MTU + AMT_GW_HLEN;</div><div class='add'>+	}</div><div class='add'>+	amt-&gt;qi = AMT_INIT_QUERY_INTERVAL;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice(dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		netdev_dbg(dev, "failed to register new netdev %d\n", err);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = netdev_upper_dev_link(amt-&gt;stream_dev, dev, extack);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		unregister_netdevice(dev);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;amt-&gt;discovery_wq, amt_discovery_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;amt-&gt;req_wq, amt_req_work);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;amt-&gt;secret_wq, amt_secret_work);</div><div class='add'>+	INIT_WORK(&amp;amt-&gt;event_wq, amt_event_work);</div><div class='add'>+	INIT_LIST_HEAD(&amp;amt-&gt;tunnel_list);</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	dev_put(amt-&gt;stream_dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void amt_dellink(struct net_device *dev, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	unregister_netdevice_queue(dev, head);</div><div class='add'>+	netdev_upper_dev_unlink(amt-&gt;stream_dev, dev);</div><div class='add'>+	dev_put(amt-&gt;stream_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t amt_get_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(sizeof(__u32)) + /* IFLA_AMT_MODE */</div><div class='add'>+	       nla_total_size(sizeof(__u16)) + /* IFLA_AMT_RELAY_PORT */</div><div class='add'>+	       nla_total_size(sizeof(__u16)) + /* IFLA_AMT_GATEWAY_PORT */</div><div class='add'>+	       nla_total_size(sizeof(__u32)) + /* IFLA_AMT_LINK */</div><div class='add'>+	       nla_total_size(sizeof(__u32)) + /* IFLA_MAX_TUNNELS */</div><div class='add'>+	       nla_total_size(sizeof(struct iphdr)) + /* IFLA_AMT_DISCOVERY_IP */</div><div class='add'>+	       nla_total_size(sizeof(struct iphdr)) + /* IFLA_AMT_REMOTE_IP */</div><div class='add'>+	       nla_total_size(sizeof(struct iphdr)); /* IFLA_AMT_LOCAL_IP */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct amt_dev *amt = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IFLA_AMT_MODE, amt-&gt;mode))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_be16(skb, IFLA_AMT_RELAY_PORT, amt-&gt;relay_port))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_be16(skb, IFLA_AMT_GATEWAY_PORT, amt-&gt;gw_port))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(skb, IFLA_AMT_LINK, amt-&gt;stream_dev-&gt;ifindex))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_in_addr(skb, IFLA_AMT_LOCAL_IP, amt-&gt;local_ip))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_in_addr(skb, IFLA_AMT_DISCOVERY_IP, amt-&gt;discovery_ip))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (amt-&gt;remote_ip)</div><div class='add'>+		if (nla_put_in_addr(skb, IFLA_AMT_REMOTE_IP, amt-&gt;remote_ip))</div><div class='add'>+			goto nla_put_failure;</div><div class='add'>+	if (nla_put_u32(skb, IFLA_AMT_MAX_TUNNELS, amt-&gt;max_tunnels))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtnl_link_ops amt_link_ops __read_mostly = {</div><div class='add'>+	.kind		= "amt",</div><div class='add'>+	.maxtype	= IFLA_AMT_MAX,</div><div class='add'>+	.policy		= amt_policy,</div><div class='add'>+	.priv_size	= sizeof(struct amt_dev),</div><div class='add'>+	.setup		= amt_link_setup,</div><div class='add'>+	.validate	= amt_validate,</div><div class='add'>+	.newlink	= amt_newlink,</div><div class='add'>+	.dellink	= amt_dellink,</div><div class='add'>+	.get_size       = amt_get_size,</div><div class='add'>+	.fill_info      = amt_fill_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct net_device *amt_lookup_upper_dev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+	struct amt_dev *amt;</div><div class='add'>+</div><div class='add'>+	for_each_netdev(dev_net(dev), upper_dev) {</div><div class='add'>+		if (netif_is_amt(upper_dev)) {</div><div class='add'>+			amt = netdev_priv(upper_dev);</div><div class='add'>+			if (amt-&gt;stream_dev == dev)</div><div class='add'>+				return upper_dev;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int amt_device_event(struct notifier_block *unused,</div><div class='add'>+			    unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+	struct amt_dev *amt;</div><div class='add'>+	LIST_HEAD(list);</div><div class='add'>+	int new_mtu;</div><div class='add'>+</div><div class='add'>+	upper_dev = amt_lookup_upper_dev(dev);</div><div class='add'>+	if (!upper_dev)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	amt = netdev_priv(upper_dev);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_UNREGISTER:</div><div class='add'>+		amt_dellink(amt-&gt;dev, &amp;list);</div><div class='add'>+		unregister_netdevice_many(&amp;list);</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGEMTU:</div><div class='add'>+		if (amt-&gt;mode == AMT_MODE_RELAY)</div><div class='add'>+			new_mtu = dev-&gt;mtu - AMT_RELAY_HLEN;</div><div class='add'>+		else</div><div class='add'>+			new_mtu = dev-&gt;mtu - AMT_GW_HLEN;</div><div class='add'>+</div><div class='add'>+		dev_set_mtu(amt-&gt;dev, new_mtu);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block amt_notifier_block __read_mostly = {</div><div class='add'>+	.notifier_call = amt_device_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init amt_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;amt_notifier_block);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	err = rtnl_link_register(&amp;amt_link_ops);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto unregister_notifier;</div><div class='add'>+</div><div class='add'>+	amt_wq = alloc_workqueue("amt", WQ_UNBOUND, 0);</div><div class='add'>+	if (!amt_wq) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto rtnl_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;source_gc_lock);</div><div class='add'>+	spin_lock_bh(&amp;source_gc_lock);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;source_gc_wq, amt_source_gc_work);</div><div class='add'>+	mod_delayed_work(amt_wq, &amp;source_gc_wq,</div><div class='add'>+			 msecs_to_jiffies(AMT_GC_INTERVAL));</div><div class='add'>+	spin_unlock_bh(&amp;source_gc_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rtnl_unregister:</div><div class='add'>+	rtnl_link_unregister(&amp;amt_link_ops);</div><div class='add'>+unregister_notifier:</div><div class='add'>+	unregister_netdevice_notifier(&amp;amt_notifier_block);</div><div class='add'>+err:</div><div class='add'>+	pr_err("error loading AMT module loaded\n");</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+late_initcall(amt_init);</div><div class='add'>+</div><div class='add'>+static void __exit amt_fini(void)</div><div class='add'>+{</div><div class='add'>+	rtnl_link_unregister(&amp;amt_link_ops);</div><div class='add'>+	unregister_netdevice_notifier(&amp;amt_notifier_block);</div><div class='add'>+	cancel_delayed_work_sync(&amp;source_gc_wq);</div><div class='add'>+	__amt_source_gc_work();</div><div class='add'>+	destroy_workqueue(amt_wq);</div><div class='add'>+}</div><div class='add'>+module_exit(amt_fini);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Automatic Multicast Tunneling (AMT)");</div><div class='add'>+MODULE_AUTHOR("Taehee Yoo &lt;ap420073@gmail.com&gt;");</div><div class='add'>+MODULE_ALIAS_RTNL_LINK("amt");</div><div class='head'>diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig<br/>deleted file mode 100644<br/>index af509b05ac5c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-#</div><div class='del'>-# Appletalk driver configuration</div><div class='del'>-#</div><div class='del'>-config ATALK</div><div class='del'>-	tristate "Appletalk protocol support"</div><div class='del'>-	select LLC</div><div class='del'>-	---help---</div><div class='del'>-	  AppleTalk is the protocol that Apple computers can use to communicate</div><div class='del'>-	  on a network.  If your Linux box is connected to such a network and you</div><div class='del'>-	  wish to connect to it, say Y.  You will need to use the netatalk package</div><div class='del'>-	  so that your Linux box can act as a print and file server for Macs as</div><div class='del'>-	  well as access AppleTalk printers.  Check out</div><div class='del'>-	  &lt;http://www.zettabyte.net/netatalk/&gt; on the WWW for details.</div><div class='del'>-	  EtherTalk is the name used for AppleTalk over Ethernet and the</div><div class='del'>-	  cheaper and slower LocalTalk is AppleTalk over a proprietary Apple</div><div class='del'>-	  network using serial links.  EtherTalk and LocalTalk are fully</div><div class='del'>-	  supported by Linux.</div><div class='del'>-</div><div class='del'>-	  General information about how to connect Linux, Windows machines and</div><div class='del'>-	  Macs is on the WWW at &lt;http://www.eats.com/linux_mac_win.html&gt;.  The</div><div class='del'>-	  NET3-4-HOWTO, available from</div><div class='del'>-	  &lt;http://www.tldp.org/docs.html#howto&gt;, contains valuable</div><div class='del'>-	  information as well.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here: the module will be</div><div class='del'>-	  called appletalk. You almost certainly want to compile it as a</div><div class='del'>-	  module so you can restart your AppleTalk stack without rebooting</div><div class='del'>-	  your machine. I hear that the GNU boycott of Apple is over, so</div><div class='del'>-	  even politically correct people are allowed to say Y here.</div><div class='del'>-</div><div class='del'>-config DEV_APPLETALK</div><div class='del'>-	tristate "Appletalk interfaces support"</div><div class='del'>-	depends on ATALK</div><div class='del'>-	help</div><div class='del'>-	  AppleTalk is the protocol that Apple computers can use to communicate</div><div class='del'>-	  on a network.  If your Linux box is connected to such a network, and wish</div><div class='del'>-	  to do IP over it, or you have a LocalTalk card and wish to use it to</div><div class='del'>-	  connect to the AppleTalk network, say Y.</div><div class='del'>-	  </div><div class='del'>-</div><div class='del'>-config LTPC</div><div class='del'>-	tristate "Apple/Farallon LocalTalk PC support"</div><div class='del'>-	depends on DEV_APPLETALK &amp;&amp; (ISA || EISA) &amp;&amp; ISA_DMA_API &amp;&amp; VIRT_TO_BUS</div><div class='del'>-	help</div><div class='del'>-	  This allows you to use the AppleTalk PC card to connect to LocalTalk</div><div class='del'>-	  networks. The card is also known as the Farallon PhoneNet PC card.</div><div class='del'>-	  If you are in doubt, this card is the one with the 65C02 chip on it.</div><div class='del'>-	  You also need version 1.3.3 or later of the netatalk package.</div><div class='del'>-	  This driver is experimental, which means that it may not work.</div><div class='del'>-	  See the file &lt;file:Documentation/networking/ltpc.txt&gt;.</div><div class='del'>-</div><div class='del'>-config COPS</div><div class='del'>-	tristate "COPS LocalTalk PC support"</div><div class='del'>-	depends on DEV_APPLETALK &amp;&amp; (ISA || EISA)</div><div class='del'>-	help</div><div class='del'>-	  This allows you to use COPS AppleTalk cards to connect to LocalTalk</div><div class='del'>-	  networks. You also need version 1.3.3 or later of the netatalk</div><div class='del'>-	  package. This driver is experimental, which means that it may not</div><div class='del'>-	  work. This driver will only work if you choose "AppleTalk DDP"</div><div class='del'>-	  networking support, above.</div><div class='del'>-	  Please read the file &lt;file:Documentation/networking/cops.txt&gt;.</div><div class='del'>-</div><div class='del'>-config COPS_DAYNA</div><div class='del'>-	bool "Dayna firmware support"</div><div class='del'>-	depends on COPS</div><div class='del'>-	help</div><div class='del'>-	  Support COPS compatible cards with Dayna style firmware (Dayna</div><div class='del'>-	  DL2000/ Daynatalk/PC (half length), COPS LT-95, Farallon PhoneNET PC</div><div class='del'>-	  III, Farallon PhoneNET PC II).</div><div class='del'>-</div><div class='del'>-config COPS_TANGENT</div><div class='del'>-	bool "Tangent firmware support"</div><div class='del'>-	depends on COPS</div><div class='del'>-	help</div><div class='del'>-	  Support COPS compatible cards with Tangent style firmware (Tangent</div><div class='del'>-	  ATB_II, Novell NL-1000, Daystar Digital LT-200.</div><div class='del'>-</div><div class='del'>-config IPDDP</div><div class='del'>-	tristate "Appletalk-IP driver support"</div><div class='del'>-	depends on DEV_APPLETALK &amp;&amp; ATALK</div><div class='del'>-	---help---</div><div class='del'>-	  This allows IP networking for users who only have AppleTalk</div><div class='del'>-	  networking available. This feature is experimental. With this</div><div class='del'>-	  driver, you can encapsulate IP inside AppleTalk (e.g. if your Linux</div><div class='del'>-	  box is stuck on an AppleTalk only network) or decapsulate (e.g. if</div><div class='del'>-	  you want your Linux box to act as an Internet gateway for a zoo of</div><div class='del'>-	  AppleTalk connected Macs). Please see the file</div><div class='del'>-	  &lt;file:Documentation/networking/ipddp.txt&gt; for more information.</div><div class='del'>-</div><div class='del'>-	  If you say Y here, the AppleTalk-IP support will be compiled into</div><div class='del'>-	  the kernel. In this case, you can either use encapsulation or</div><div class='del'>-	  decapsulation, but not both. With the following two questions, you</div><div class='del'>-	  decide which one you want.</div><div class='del'>-</div><div class='del'>-	  To compile the AppleTalk-IP support as a module, choose M here: the</div><div class='del'>-	  module will be called ipddp.</div><div class='del'>-	  In this case, you will be able to use both encapsulation and</div><div class='del'>-	  decapsulation simultaneously, by loading two copies of the module</div><div class='del'>-	  and specifying different values for the module option ipddp_mode.</div><div class='del'>-</div><div class='del'>-config IPDDP_ENCAP</div><div class='del'>-	bool "IP to Appletalk-IP Encapsulation support"</div><div class='del'>-	depends on IPDDP</div><div class='del'>-	help</div><div class='del'>-	  If you say Y here, the AppleTalk-IP code will be able to encapsulate</div><div class='del'>-	  IP packets inside AppleTalk frames; this is useful if your Linux box</div><div class='del'>-	  is stuck on an AppleTalk network (which hopefully contains a</div><div class='del'>-	  decapsulator somewhere). Please see</div><div class='del'>-	  &lt;file:Documentation/networking/ipddp.txt&gt; for more information.</div><div class='head'>diff --git a/drivers/net/appletalk/Makefile b/drivers/net/appletalk/Makefile<br/>deleted file mode 100644<br/>index 903da3303f41..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-#</div><div class='del'>-# Makefile for drivers/net/appletalk</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_IPDDP) += ipddp.o</div><div class='del'>-obj-$(CONFIG_COPS) += cops.o</div><div class='del'>-obj-$(CONFIG_LTPC) += ltpc.o</div><div class='head'>diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c<br/>deleted file mode 100644<br/>index b3c63d2f16aa..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/cops.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1003 +0,0 @@</div><div class='del'>-/*      cops.c: LocalTalk driver for Linux.</div><div class='del'>- *</div><div class='del'>- *	Authors:</div><div class='del'>- *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='del'>- *</div><div class='del'>- *	With more than a little help from;</div><div class='del'>- *	- Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;</div><div class='del'>- *</div><div class='del'>- *      Derived from:</div><div class='del'>- *      - skeleton.c: A network driver outline for linux.</div><div class='del'>- *        Written 1993-94 by Donald Becker.</div><div class='del'>- *	- ltpc.c: A driver for the LocalTalk PC card.</div><div class='del'>- *	  Written by Bradford W. Johnson.</div><div class='del'>- *</div><div class='del'>- *      Copyright 1993 United States Government as represented by the</div><div class='del'>- *      Director, National Security Agency.</div><div class='del'>- *</div><div class='del'>- *      This software may be used and distributed according to the terms</div><div class='del'>- *      of the GNU General Public License, incorporated herein by reference.</div><div class='del'>- *</div><div class='del'>- *	Changes:</div><div class='del'>- *	19970608	Alan Cox	Allowed dual card type support</div><div class='del'>- *					Can set board type in insmod</div><div class='del'>- *					Hooks for cops_setup routine</div><div class='del'>- *					(not yet implemented).</div><div class='del'>- *	19971101	Jay Schulist	Fixes for multiple lt* devices.</div><div class='del'>- *	19980607	Steven Hirsch	Fixed the badly broken support</div><div class='del'>- *					for Tangent type cards. Only</div><div class='del'>- *                                      tested on Daystar LT200. Some</div><div class='del'>- *                                      cleanup of formatting and program</div><div class='del'>- *                                      logic.  Added emacs 'local-vars'</div><div class='del'>- *                                      setup for Jay's brace style.</div><div class='del'>- *	20000211	Alan Cox	Cleaned up for softnet</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const char *version =</div><div class='del'>-"cops.c:v0.04 6/7/98 Jay Schulist &lt;jschlst@samba.org&gt;\n";</div><div class='del'>-/*</div><div class='del'>- *  Sources:</div><div class='del'>- *      COPS Localtalk SDK. This provides almost all of the information</div><div class='del'>- *      needed.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * insmod/modprobe configurable stuff.</div><div class='del'>- *	- IO Port, choose one your card supports or 0 if you dare.</div><div class='del'>- *	- IRQ, also choose one your card supports or nothing and let</div><div class='del'>- *	  the driver figure it out.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/if_ltalk.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;	/* For udelay() */</div><div class='del'>-#include &lt;linux/atalk.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cops.h"		/* Our Stuff */</div><div class='del'>-#include "cops_ltdrv.h"		/* Firmware code for Tangent type cards. */</div><div class='del'>-#include "cops_ffdrv.h"		/* Firmware code for Dayna type cards. */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      The name of the card. Is used for messages and in the requests for</div><div class='del'>- *      io regions, irqs and dma channels</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static const char *cardname = "cops";</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COPS_DAYNA</div><div class='del'>-static int board_type = DAYNA;	/* Module exported */</div><div class='del'>-#else</div><div class='del'>-static int board_type = TANGENT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int io = 0x240;		/* Default IO for Dayna */</div><div class='del'>-static int irq = 5;		/* Default IRQ */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	COPS Autoprobe information.</div><div class='del'>- *	Right now if port address is right but IRQ is not 5 this will</div><div class='del'>- *      return a 5 no matter what since we will still get a status response.</div><div class='del'>- *      Need one more additional check to narrow down after we have gotten</div><div class='del'>- *      the ioaddr. But since only other possible IRQs is 3 and 4 so no real</div><div class='del'>- *	hurry on this. I *STRONGLY* recommend using IRQ 5 for your card with</div><div class='del'>- *	this driver.</div><div class='del'>- * </div><div class='del'>- *	This driver has 2 modes and they are: Dayna mode and Tangent mode.</div><div class='del'>- *	Each mode corresponds with the type of card. It has been found</div><div class='del'>- *	that there are 2 main types of cards and all other cards are</div><div class='del'>- *	the same and just have different names or only have minor differences</div><div class='del'>- *	such as more IO ports. As this driver is tested it will</div><div class='del'>- *	become more clear on exactly what cards are supported. The driver</div><div class='del'>- *	defaults to using Dayna mode. To change the drivers mode, simply</div><div class='del'>- *	select Dayna or Tangent mode when configuring the kernel.</div><div class='del'>- *</div><div class='del'>- *      This driver should support:</div><div class='del'>- *      TANGENT driver mode:</div><div class='del'>- *              Tangent ATB-II, Novell NL-1000, Daystar Digital LT-200,</div><div class='del'>- *		COPS LT-1</div><div class='del'>- *      DAYNA driver mode:</div><div class='del'>- *              Dayna DL2000/DaynaTalk PC (Half Length), COPS LT-95, </div><div class='del'>- *		Farallon PhoneNET PC III, Farallon PhoneNET PC II</div><div class='del'>- *	Other cards possibly supported mode unknown though:</div><div class='del'>- *		Dayna DL2000 (Full length), COPS LT/M (Micro-Channel)</div><div class='del'>- *</div><div class='del'>- *	Cards NOT supported by this driver but supported by the ltpc.c</div><div class='del'>- *	driver written by Bradford W. Johnson &lt;johns393@maroon.tc.umn.edu&gt;</div><div class='del'>- *		Farallon PhoneNET PC</div><div class='del'>- *		Original Apple LocalTalk PC card</div><div class='del'>- * </div><div class='del'>- *      N.B.</div><div class='del'>- *</div><div class='del'>- *      The Daystar Digital LT200 boards do not support interrupt-driven</div><div class='del'>- *      IO.  You must specify 'irq=0xff' as a module parameter to invoke</div><div class='del'>- *      polled mode.  I also believe that the port probing logic is quite</div><div class='del'>- *      dangerous at best and certainly hopeless for a polled card.  Best to </div><div class='del'>- *      specify both. - Steve H.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Zero terminated list of IO ports to probe.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static unsigned int ports[] = { </div><div class='del'>-	0x240, 0x340, 0x200, 0x210, 0x220, 0x230, 0x260, </div><div class='del'>-	0x2A0, 0x300, 0x310, 0x320, 0x330, 0x350, 0x360,</div><div class='del'>-	0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Zero terminated list of IRQ ports to probe.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int cops_irqlist[] = {</div><div class='del'>-	5, 4, 3, 0 </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct timer_list cops_timer;</div><div class='del'>-static struct net_device *cops_timer_dev;</div><div class='del'>-</div><div class='del'>-/* use 0 for production, 1 for verification, 2 for debug, 3 for verbose debug */</div><div class='del'>-#ifndef COPS_DEBUG</div><div class='del'>-#define COPS_DEBUG 1 </div><div class='del'>-#endif</div><div class='del'>-static unsigned int cops_debug = COPS_DEBUG;</div><div class='del'>-</div><div class='del'>-/* The number of low I/O ports used by the card. */</div><div class='del'>-#define COPS_IO_EXTENT       8</div><div class='del'>-</div><div class='del'>-/* Information that needs to be kept for each board. */</div><div class='del'>-</div><div class='del'>-struct cops_local</div><div class='del'>-{</div><div class='del'>-        int board;			/* Holds what board type is. */</div><div class='del'>-	int nodeid;			/* Set to 1 once have nodeid. */</div><div class='del'>-        unsigned char node_acquire;	/* Node ID when acquired. */</div><div class='del'>-        struct atalk_addr node_addr;	/* Full node address */</div><div class='del'>-	spinlock_t lock;		/* RX/TX lock */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Index to functions, as function prototypes. */</div><div class='del'>-static int  cops_probe1 (struct net_device *dev, int ioaddr);</div><div class='del'>-static int  cops_irq (int ioaddr, int board);</div><div class='del'>-</div><div class='del'>-static int  cops_open (struct net_device *dev);</div><div class='del'>-static int  cops_jumpstart (struct net_device *dev);</div><div class='del'>-static void cops_reset (struct net_device *dev, int sleep);</div><div class='del'>-static void cops_load (struct net_device *dev);</div><div class='del'>-static int  cops_nodeid (struct net_device *dev, int nodeid);</div><div class='del'>-</div><div class='del'>-static irqreturn_t cops_interrupt (int irq, void *dev_id);</div><div class='del'>-static void cops_poll(struct timer_list *t);</div><div class='del'>-static void cops_timeout(struct net_device *dev);</div><div class='del'>-static void cops_rx (struct net_device *dev);</div><div class='del'>-static netdev_tx_t  cops_send_packet (struct sk_buff *skb,</div><div class='del'>-					    struct net_device *dev);</div><div class='del'>-static void set_multicast_list (struct net_device *dev);</div><div class='del'>-static int  cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='del'>-static int  cops_close (struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static void cleanup_card(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	if (dev-&gt;irq)</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-	release_region(dev-&gt;base_addr, COPS_IO_EXTENT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      Check for a network adaptor of this type, and return '0' iff one exists.</div><div class='del'>- *      If dev-&gt;base_addr == 0, probe all likely locations.</div><div class='del'>- *      If dev-&gt;base_addr in [1..0x1ff], always return failure.</div><div class='del'>- *        otherwise go with what we pass in.</div><div class='del'>- */</div><div class='del'>-struct net_device * __init cops_probe(int unit)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	unsigned *port;</div><div class='del'>-	int base_addr;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	dev = alloc_ltalkdev(sizeof(struct cops_local));</div><div class='del'>-	if (!dev)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	if (unit &gt;= 0) {</div><div class='del'>-		sprintf(dev-&gt;name, "lt%d", unit);</div><div class='del'>-		netdev_boot_setup_check(dev);</div><div class='del'>-		irq = dev-&gt;irq;</div><div class='del'>-		base_addr = dev-&gt;base_addr;</div><div class='del'>-	} else {</div><div class='del'>-		base_addr = dev-&gt;base_addr = io;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (base_addr &gt; 0x1ff) {    /* Check a single specified location. */</div><div class='del'>-		err = cops_probe1(dev, base_addr);</div><div class='del'>-	} else if (base_addr != 0) { /* Don't probe at all. */</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME  Does this really work for cards which generate irq?</div><div class='del'>-		 * It's definitely N.G. for polled Tangent. sh</div><div class='del'>-		 * Dayna cards don't autoprobe well at all, but if your card is</div><div class='del'>-		 * at IRQ 5 &amp; IO 0x240 we find it every time. ;) JS</div><div class='del'>-		 */</div><div class='del'>-		for (port = ports; *port &amp;&amp; cops_probe1(dev, *port) &lt; 0; port++)</div><div class='del'>-			;</div><div class='del'>-		if (!*port)</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-	err = register_netdev(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out1;</div><div class='del'>-	return dev;</div><div class='del'>-out1:</div><div class='del'>-	cleanup_card(dev);</div><div class='del'>-out:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops cops_netdev_ops = {</div><div class='del'>-	.ndo_open               = cops_open,</div><div class='del'>-        .ndo_stop               = cops_close,</div><div class='del'>-	.ndo_start_xmit   	= cops_send_packet,</div><div class='del'>-	.ndo_tx_timeout		= cops_timeout,</div><div class='del'>-        .ndo_do_ioctl           = cops_ioctl,</div><div class='del'>-	.ndo_set_rx_mode	= set_multicast_list,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      This is the real probe routine. Linux has a history of friendly device</div><div class='del'>- *      probes on the ISA bus. A good device probes avoids doing writes, and</div><div class='del'>- *      verifies that the correct device exists and functions.</div><div class='del'>- */</div><div class='del'>-static int __init cops_probe1(struct net_device *dev, int ioaddr)</div><div class='del'>-{</div><div class='del'>-        struct cops_local *lp;</div><div class='del'>-	static unsigned version_printed;</div><div class='del'>-	int board = board_type;</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-        if(cops_debug &amp;&amp; version_printed++ == 0)</div><div class='del'>-		printk("%s", version);</div><div class='del'>-</div><div class='del'>-	/* Grab the region so no one else tries to probe our ioports. */</div><div class='del'>-	if (!request_region(ioaddr, COPS_IO_EXTENT, dev-&gt;name))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-        /*</div><div class='del'>-         * Since this board has jumpered interrupts, allocate the interrupt</div><div class='del'>-         * vector now. There is no point in waiting since no other device</div><div class='del'>-         * can use the interrupt, and this marks the irq as busy. Jumpered</div><div class='del'>-         * interrupts are typically not reported by the boards, and we must</div><div class='del'>-         * used AutoIRQ to find them.</div><div class='del'>-	 */</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	switch (dev-&gt;irq)</div><div class='del'>-	{</div><div class='del'>-		case 0:</div><div class='del'>-			/* COPS AutoIRQ routine */</div><div class='del'>-			dev-&gt;irq = cops_irq(ioaddr, board);</div><div class='del'>-			if (dev-&gt;irq)</div><div class='del'>-				break;</div><div class='del'>-			/* fall through - Once no IRQ found on this port. */</div><div class='del'>-		case 1:</div><div class='del'>-			retval = -EINVAL;</div><div class='del'>-			goto err_out;</div><div class='del'>-</div><div class='del'>-		/* Fixup for users that don't know that IRQ 2 is really</div><div class='del'>-		 * IRQ 9, or don't know which one to set.</div><div class='del'>-		 */</div><div class='del'>-		case 2:</div><div class='del'>-			dev-&gt;irq = 9;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Polled operation requested. Although irq of zero passed as</div><div class='del'>-		 * a parameter tells the init routines to probe, we'll</div><div class='del'>-		 * overload it to denote polled operation at runtime.</div><div class='del'>-		 */</div><div class='del'>-		case 0xff:</div><div class='del'>-			dev-&gt;irq = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reserve any actual interrupt. */</div><div class='del'>-	if (dev-&gt;irq) {</div><div class='del'>-		retval = request_irq(dev-&gt;irq, cops_interrupt, 0, dev-&gt;name, dev);</div><div class='del'>-		if (retval)</div><div class='del'>-			goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;base_addr = ioaddr;</div><div class='del'>-</div><div class='del'>-        lp = netdev_priv(dev);</div><div class='del'>-        spin_lock_init(&amp;lp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Copy local board variable to lp struct. */</div><div class='del'>-	lp-&gt;board               = board;</div><div class='del'>-</div><div class='del'>-	dev-&gt;netdev_ops 	= &amp;cops_netdev_ops;</div><div class='del'>-	dev-&gt;watchdog_timeo	= HZ * 2;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Tell the user where the card is and what mode we're in. */</div><div class='del'>-	if(board==DAYNA)</div><div class='del'>-		printk("%s: %s at %#3x, using IRQ %d, in Dayna mode.\n", </div><div class='del'>-			dev-&gt;name, cardname, ioaddr, dev-&gt;irq);</div><div class='del'>-	if(board==TANGENT) {</div><div class='del'>-		if(dev-&gt;irq)</div><div class='del'>-			printk("%s: %s at %#3x, IRQ %d, in Tangent mode\n", </div><div class='del'>-				dev-&gt;name, cardname, ioaddr, dev-&gt;irq);</div><div class='del'>-		else</div><div class='del'>-			printk("%s: %s at %#3x, using polled IO, in Tangent mode.\n", </div><div class='del'>-				dev-&gt;name, cardname, ioaddr);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-        return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	release_region(ioaddr, COPS_IO_EXTENT);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init cops_irq (int ioaddr, int board)</div><div class='del'>-{       /*</div><div class='del'>-         * This does not use the IRQ to determine where the IRQ is. We just</div><div class='del'>-         * assume that when we get a correct status response that it's the IRQ.</div><div class='del'>-         * This really just verifies the IO port but since we only have access</div><div class='del'>-         * to such a small number of IRQs (5, 4, 3) this is not bad.</div><div class='del'>-         * This will probably not work for more than one card.</div><div class='del'>-         */</div><div class='del'>-        int irqaddr=0;</div><div class='del'>-        int i, x, status;</div><div class='del'>-</div><div class='del'>-        if(board==DAYNA)</div><div class='del'>-        {</div><div class='del'>-                outb(0, ioaddr+DAYNA_RESET);</div><div class='del'>-                inb(ioaddr+DAYNA_RESET);</div><div class='del'>-                mdelay(333);</div><div class='del'>-        }</div><div class='del'>-        if(board==TANGENT)</div><div class='del'>-        {</div><div class='del'>-                inb(ioaddr);</div><div class='del'>-                outb(0, ioaddr);</div><div class='del'>-                outb(0, ioaddr+TANG_RESET);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        for(i=0; cops_irqlist[i] !=0; i++)</div><div class='del'>-        {</div><div class='del'>-                irqaddr = cops_irqlist[i];</div><div class='del'>-                for(x = 0xFFFF; x&gt;0; x --)    /* wait for response */</div><div class='del'>-                {</div><div class='del'>-                        if(board==DAYNA)</div><div class='del'>-                        {</div><div class='del'>-                                status = (inb(ioaddr+DAYNA_CARD_STATUS)&amp;3);</div><div class='del'>-                                if(status == 1)</div><div class='del'>-                                        return irqaddr;</div><div class='del'>-                        }</div><div class='del'>-                        if(board==TANGENT)</div><div class='del'>-                        {</div><div class='del'>-                                if((inb(ioaddr+TANG_CARD_STATUS)&amp; TANG_TX_READY) !=0)</div><div class='del'>-                                        return irqaddr;</div><div class='del'>-                        }</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-        return 0;       /* no IRQ found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Open/initialize the board. This is called (in the current kernel)</div><div class='del'>- * sometime after booting when the 'ifconfig' program is run.</div><div class='del'>- */</div><div class='del'>-static int cops_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if(dev-&gt;irq==0)</div><div class='del'>-	{</div><div class='del'>-		/*</div><div class='del'>-		 * I don't know if the Dayna-style boards support polled </div><div class='del'>-		 * operation.  For now, only allow it for Tangent.</div><div class='del'>-		 */</div><div class='del'>-		if(lp-&gt;board==TANGENT)	/* Poll 20 times per second */</div><div class='del'>-		{</div><div class='del'>-		    cops_timer_dev = dev;</div><div class='del'>-		    timer_setup(&amp;cops_timer, cops_poll, 0);</div><div class='del'>-		    cops_timer.expires 	= jiffies + HZ/20;</div><div class='del'>-		    add_timer(&amp;cops_timer);</div><div class='del'>-		} </div><div class='del'>-		else </div><div class='del'>-		{</div><div class='del'>-			printk(KERN_WARNING "%s: No irq line set\n", dev-&gt;name);</div><div class='del'>-			return -EAGAIN;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cops_jumpstart(dev);	/* Start the card up. */</div><div class='del'>-</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	This allows for a dynamic start/restart of the entire card.</div><div class='del'>- */</div><div class='del'>-static int cops_jumpstart(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-         *      Once the card has the firmware loaded and has acquired</div><div class='del'>-         *      the nodeid, if it is reset it will lose it all.</div><div class='del'>-         */</div><div class='del'>-        cops_reset(dev,1);	/* Need to reset card before load firmware. */</div><div class='del'>-        cops_load(dev);		/* Load the firmware. */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 *	If atalkd already gave us a nodeid we will use that</div><div class='del'>-	 *	one again, else we wait for atalkd to give us a nodeid</div><div class='del'>-	 *	in cops_ioctl. This may cause a problem if someone steals</div><div class='del'>-	 *	our nodeid while we are resetting.</div><div class='del'>-	 */	</div><div class='del'>-	if(lp-&gt;nodeid == 1)</div><div class='del'>-		cops_nodeid(dev,lp-&gt;node_acquire);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tangent_wait_reset(int ioaddr)</div><div class='del'>-{</div><div class='del'>-	int timeout=0;</div><div class='del'>-</div><div class='del'>-	while(timeout++ &lt; 5 &amp;&amp; (inb(ioaddr+TANG_CARD_STATUS)&amp;TANG_TX_READY)==0)</div><div class='del'>-		mdelay(1);   /* Wait 1 second */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      Reset the LocalTalk board.</div><div class='del'>- */</div><div class='del'>-static void cops_reset(struct net_device *dev, int sleep)</div><div class='del'>-{</div><div class='del'>-        struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-        int ioaddr=dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-        if(lp-&gt;board==TANGENT)</div><div class='del'>-        {</div><div class='del'>-                inb(ioaddr);		/* Clear request latch. */</div><div class='del'>-                outb(0,ioaddr);		/* Clear the TANG_TX_READY flop. */</div><div class='del'>-                outb(0, ioaddr+TANG_RESET);	/* Reset the adapter. */</div><div class='del'>-</div><div class='del'>-		tangent_wait_reset(ioaddr);</div><div class='del'>-                outb(0, ioaddr+TANG_CLEAR_INT);</div><div class='del'>-        }</div><div class='del'>-        if(lp-&gt;board==DAYNA)</div><div class='del'>-        {</div><div class='del'>-                outb(0, ioaddr+DAYNA_RESET);	/* Assert the reset port */</div><div class='del'>-                inb(ioaddr+DAYNA_RESET);	/* Clear the reset */</div><div class='del'>-		if (sleep)</div><div class='del'>-			msleep(333);</div><div class='del'>-		else</div><div class='del'>-			mdelay(333);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cops_load (struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        struct ifreq ifr;</div><div class='del'>-        struct ltfirmware *ltf= (struct ltfirmware *)&amp;ifr.ifr_ifru;</div><div class='del'>-        struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-        int ioaddr=dev-&gt;base_addr;</div><div class='del'>-	int length, i = 0;</div><div class='del'>-</div><div class='del'>-        strcpy(ifr.ifr_name,"lt0");</div><div class='del'>-</div><div class='del'>-        /* Get card's firmware code and do some checks on it. */</div><div class='del'>-#ifdef CONFIG_COPS_DAYNA        </div><div class='del'>-        if(lp-&gt;board==DAYNA)</div><div class='del'>-        {</div><div class='del'>-                ltf-&gt;length=sizeof(ffdrv_code);</div><div class='del'>-                ltf-&gt;data=ffdrv_code;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-#endif        </div><div class='del'>-#ifdef CONFIG_COPS_TANGENT</div><div class='del'>-        if(lp-&gt;board==TANGENT)</div><div class='del'>-        {</div><div class='del'>-                ltf-&gt;length=sizeof(ltdrv_code);</div><div class='del'>-                ltf-&gt;data=ltdrv_code;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-#endif</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_INFO "%s; unsupported board type.\n", dev-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-        /* Check to make sure firmware is correct length. */</div><div class='del'>-        if(lp-&gt;board==DAYNA &amp;&amp; ltf-&gt;length!=5983)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_WARNING "%s: Firmware is not length of FFDRV.BIN.\n", dev-&gt;name);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-        if(lp-&gt;board==TANGENT &amp;&amp; ltf-&gt;length!=2501)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_WARNING "%s: Firmware is not length of DRVCODE.BIN.\n", dev-&gt;name);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        if(lp-&gt;board==DAYNA)</div><div class='del'>-        {</div><div class='del'>-                /*</div><div class='del'>-                 *      We must wait for a status response</div><div class='del'>-                 *      with the DAYNA board.</div><div class='del'>-                 */</div><div class='del'>-                while(++i&lt;65536)</div><div class='del'>-                {</div><div class='del'>-                       if((inb(ioaddr+DAYNA_CARD_STATUS)&amp;3)==1)</div><div class='del'>-                                break;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-                if(i==65536)</div><div class='del'>-                        return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /*</div><div class='del'>-         *      Upload the firmware and kick. Byte-by-byte works nicely here.</div><div class='del'>-         */</div><div class='del'>-	i=0;</div><div class='del'>-        length = ltf-&gt;length;</div><div class='del'>-        while(length--)</div><div class='del'>-        {</div><div class='del'>-                outb(ltf-&gt;data[i], ioaddr);</div><div class='del'>-                i++;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	if(cops_debug &gt; 1)</div><div class='del'>-		printk("%s: Uploaded firmware - %d bytes of %d bytes.\n", </div><div class='del'>-			dev-&gt;name, i, ltf-&gt;length);</div><div class='del'>-</div><div class='del'>-        if(lp-&gt;board==DAYNA) 	/* Tell Dayna to run the firmware code. */</div><div class='del'>-                outb(1, ioaddr+DAYNA_INT_CARD);</div><div class='del'>-	else			/* Tell Tang to run the firmware code. */</div><div class='del'>-		inb(ioaddr);</div><div class='del'>-</div><div class='del'>-        if(lp-&gt;board==TANGENT)</div><div class='del'>-        {</div><div class='del'>-                tangent_wait_reset(ioaddr);</div><div class='del'>-                inb(ioaddr);	/* Clear initial ready signal. */</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 	Get the LocalTalk Nodeid from the card. We can suggest</div><div class='del'>- *	any nodeid 1-254. The card will try and get that exact</div><div class='del'>- *	address else we can specify 0 as the nodeid and the card</div><div class='del'>- *	will autoprobe for a nodeid.</div><div class='del'>- */</div><div class='del'>-static int cops_nodeid (struct net_device *dev, int nodeid)</div><div class='del'>-{</div><div class='del'>-	struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-	int ioaddr = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	if(lp-&gt;board == DAYNA)</div><div class='del'>-        {</div><div class='del'>-        	/* Empty any pending adapter responses. */</div><div class='del'>-                while((inb(ioaddr+DAYNA_CARD_STATUS)&amp;DAYNA_TX_READY)==0)</div><div class='del'>-                {</div><div class='del'>-			outb(0, ioaddr+COPS_CLEAR_INT);	/* Clear interrupts. */</div><div class='del'>-        		if((inb(ioaddr+DAYNA_CARD_STATUS)&amp;0x03)==DAYNA_RX_REQUEST)</div><div class='del'>-                		cops_rx(dev);	/* Kick any packets waiting. */</div><div class='del'>-			schedule();</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-                outb(2, ioaddr);       	/* Output command packet length as 2. */</div><div class='del'>-                outb(0, ioaddr);</div><div class='del'>-                outb(LAP_INIT, ioaddr);	/* Send LAP_INIT command byte. */</div><div class='del'>-                outb(nodeid, ioaddr);  	/* Suggest node address. */</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	if(lp-&gt;board == TANGENT)</div><div class='del'>-        {</div><div class='del'>-                /* Empty any pending adapter responses. */</div><div class='del'>-                while(inb(ioaddr+TANG_CARD_STATUS)&amp;TANG_RX_READY)</div><div class='del'>-                {</div><div class='del'>-			outb(0, ioaddr+COPS_CLEAR_INT);	/* Clear interrupt. */</div><div class='del'>-                	cops_rx(dev);          	/* Kick out packets waiting. */</div><div class='del'>-			schedule();</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-		/* Not sure what Tangent does if nodeid picked is used. */</div><div class='del'>-                if(nodeid == 0)	         		/* Seed. */</div><div class='del'>-                	nodeid = jiffies&amp;0xFF;		/* Get a random try */</div><div class='del'>-                outb(2, ioaddr);        		/* Command length LSB */</div><div class='del'>-                outb(0, ioaddr);       			/* Command length MSB */</div><div class='del'>-                outb(LAP_INIT, ioaddr); 		/* Send LAP_INIT byte */</div><div class='del'>-                outb(nodeid, ioaddr); 		  	/* LAP address hint. */</div><div class='del'>-                outb(0xFF, ioaddr);     		/* Int. level to use */</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	lp-&gt;node_acquire=0;		/* Set nodeid holder to 0. */</div><div class='del'>-        while(lp-&gt;node_acquire==0)	/* Get *True* nodeid finally. */</div><div class='del'>-	{</div><div class='del'>-		outb(0, ioaddr+COPS_CLEAR_INT);	/* Clear any interrupt. */</div><div class='del'>-</div><div class='del'>-		if(lp-&gt;board == DAYNA)</div><div class='del'>-		{</div><div class='del'>-                	if((inb(ioaddr+DAYNA_CARD_STATUS)&amp;0x03)==DAYNA_RX_REQUEST)</div><div class='del'>-                		cops_rx(dev);	/* Grab the nodeid put in lp-&gt;node_acquire. */</div><div class='del'>-		}</div><div class='del'>-		if(lp-&gt;board == TANGENT)</div><div class='del'>-		{	</div><div class='del'>-			if(inb(ioaddr+TANG_CARD_STATUS)&amp;TANG_RX_READY)</div><div class='del'>-                                cops_rx(dev);   /* Grab the nodeid put in lp-&gt;node_acquire. */</div><div class='del'>-		}</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(cops_debug &gt; 1)</div><div class='del'>-		printk(KERN_DEBUG "%s: Node ID %d has been acquired.\n", </div><div class='del'>-			dev-&gt;name, lp-&gt;node_acquire);</div><div class='del'>-</div><div class='del'>-	lp-&gt;nodeid=1;	/* Set got nodeid to 1. */</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Poll the Tangent type cards to see if we have work.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static void cops_poll(struct timer_list *unused)</div><div class='del'>-{</div><div class='del'>-	int ioaddr, status;</div><div class='del'>-	int boguscount = 0;</div><div class='del'>-	struct net_device *dev = cops_timer_dev;</div><div class='del'>-</div><div class='del'>-	del_timer(&amp;cops_timer);</div><div class='del'>-</div><div class='del'>-	if(dev == NULL)</div><div class='del'>-		return;	/* We've been downed */</div><div class='del'>-</div><div class='del'>-	ioaddr = dev-&gt;base_addr;</div><div class='del'>-	do {</div><div class='del'>-		status=inb(ioaddr+TANG_CARD_STATUS);</div><div class='del'>-		if(status &amp; TANG_RX_READY)</div><div class='del'>-			cops_rx(dev);</div><div class='del'>-		if(status &amp; TANG_TX_READY)</div><div class='del'>-			netif_wake_queue(dev);</div><div class='del'>-		status = inb(ioaddr+TANG_CARD_STATUS);</div><div class='del'>-	} while((++boguscount &lt; 20) &amp;&amp; (status&amp;(TANG_RX_READY|TANG_TX_READY)));</div><div class='del'>-</div><div class='del'>-	/* poll 20 times per second */</div><div class='del'>-	cops_timer.expires = jiffies + HZ/20;</div><div class='del'>-	add_timer(&amp;cops_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      The typical workload of the driver:</div><div class='del'>- *      Handle the network interface interrupts.</div><div class='del'>- */</div><div class='del'>-static irqreturn_t cops_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-        struct net_device *dev = dev_id;</div><div class='del'>-        struct cops_local *lp;</div><div class='del'>-        int ioaddr, status;</div><div class='del'>-        int boguscount = 0;</div><div class='del'>-</div><div class='del'>-        ioaddr = dev-&gt;base_addr;</div><div class='del'>-        lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if(lp-&gt;board==DAYNA)</div><div class='del'>-	{</div><div class='del'>-		do {</div><div class='del'>-			outb(0, ioaddr + COPS_CLEAR_INT);</div><div class='del'>-                       	status=inb(ioaddr+DAYNA_CARD_STATUS);</div><div class='del'>-                       	if((status&amp;0x03)==DAYNA_RX_REQUEST)</div><div class='del'>-                       	        cops_rx(dev);</div><div class='del'>-                	netif_wake_queue(dev);</div><div class='del'>-		} while(++boguscount &lt; 20);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		do {</div><div class='del'>-                       	status=inb(ioaddr+TANG_CARD_STATUS);</div><div class='del'>-			if(status &amp; TANG_RX_READY)</div><div class='del'>-				cops_rx(dev);</div><div class='del'>-			if(status &amp; TANG_TX_READY)</div><div class='del'>-				netif_wake_queue(dev);</div><div class='del'>-			status=inb(ioaddr+TANG_CARD_STATUS);</div><div class='del'>-		} while((++boguscount &lt; 20) &amp;&amp; (status&amp;(TANG_RX_READY|TANG_TX_READY)));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      We have a good packet(s), get it/them out of the buffers.</div><div class='del'>- */</div><div class='del'>-static void cops_rx(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        int pkt_len = 0;</div><div class='del'>-        int rsp_type = 0;</div><div class='del'>-        struct sk_buff *skb = NULL;</div><div class='del'>-        struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-        int ioaddr = dev-&gt;base_addr;</div><div class='del'>-        int boguscount = 0;</div><div class='del'>-        unsigned long flags;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-	</div><div class='del'>-        if(lp-&gt;board==DAYNA)</div><div class='del'>-        {</div><div class='del'>-                outb(0, ioaddr);                /* Send out Zero length. */</div><div class='del'>-                outb(0, ioaddr);</div><div class='del'>-                outb(DATA_READ, ioaddr);        /* Send read command out. */</div><div class='del'>-</div><div class='del'>-                /* Wait for DMA to turn around. */</div><div class='del'>-                while(++boguscount&lt;1000000)</div><div class='del'>-                {</div><div class='del'>-			barrier();</div><div class='del'>-                        if((inb(ioaddr+DAYNA_CARD_STATUS)&amp;0x03)==DAYNA_RX_READY)</div><div class='del'>-                                break;</div><div class='del'>-                }</div><div class='del'>-</div><div class='del'>-                if(boguscount==1000000)</div><div class='del'>-                {</div><div class='del'>-                        printk(KERN_WARNING "%s: DMA timed out.\n",dev-&gt;name);</div><div class='del'>-			spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-                        return;</div><div class='del'>-                }</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* Get response length. */</div><div class='del'>-	pkt_len = inb(ioaddr);</div><div class='del'>-        pkt_len |= (inb(ioaddr) &lt;&lt; 8);</div><div class='del'>-        /* Input IO code. */</div><div class='del'>-        rsp_type=inb(ioaddr);</div><div class='del'>-</div><div class='del'>-        /* Malloc up new buffer. */</div><div class='del'>-        skb = dev_alloc_skb(pkt_len);</div><div class='del'>-        if(skb == NULL)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n",</div><div class='del'>-			dev-&gt;name);</div><div class='del'>-                dev-&gt;stats.rx_dropped++;</div><div class='del'>-                while(pkt_len--)        /* Discard packet */</div><div class='del'>-                        inb(ioaddr);</div><div class='del'>-                spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-        skb-&gt;dev = dev;</div><div class='del'>-        skb_put(skb, pkt_len);</div><div class='del'>-        skb-&gt;protocol = htons(ETH_P_LOCALTALK);</div><div class='del'>-</div><div class='del'>-        insb(ioaddr, skb-&gt;data, pkt_len);               /* Eat the Data */</div><div class='del'>-</div><div class='del'>-        if(lp-&gt;board==DAYNA)</div><div class='del'>-                outb(1, ioaddr+DAYNA_INT_CARD);         /* Interrupt the card */</div><div class='del'>-</div><div class='del'>-        spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);  /* Restore interrupts. */</div><div class='del'>-</div><div class='del'>-        /* Check for bad response length */</div><div class='del'>-        if(pkt_len &lt; 0 || pkt_len &gt; MAX_LLAP_SIZE)</div><div class='del'>-        {</div><div class='del'>-		printk(KERN_WARNING "%s: Bad packet length of %d bytes.\n", </div><div class='del'>-			dev-&gt;name, pkt_len);</div><div class='del'>-                dev-&gt;stats.tx_errors++;</div><div class='del'>-                dev_kfree_skb_any(skb);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* Set nodeid and then get out. */</div><div class='del'>-        if(rsp_type == LAP_INIT_RSP)</div><div class='del'>-        {	/* Nodeid taken from received packet. */</div><div class='del'>-                lp-&gt;node_acquire = skb-&gt;data[0];</div><div class='del'>-                dev_kfree_skb_any(skb);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        /* One last check to make sure we have a good packet. */</div><div class='del'>-        if(rsp_type != LAP_RESPONSE)</div><div class='del'>-        {</div><div class='del'>-                printk(KERN_WARNING "%s: Bad packet type %d.\n", dev-&gt;name, rsp_type);</div><div class='del'>-                dev-&gt;stats.tx_errors++;</div><div class='del'>-                dev_kfree_skb_any(skb);</div><div class='del'>-                return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        skb_reset_mac_header(skb);    /* Point to entire packet. */</div><div class='del'>-        skb_pull(skb,3);</div><div class='del'>-        skb_reset_transport_header(skb);    /* Point to data (Skip header). */</div><div class='del'>-</div><div class='del'>-        /* Update the counters. */</div><div class='del'>-        dev-&gt;stats.rx_packets++;</div><div class='del'>-        dev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-        /* Send packet to a higher place. */</div><div class='del'>-        netif_rx(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cops_timeout(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-        int ioaddr = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='del'>-        if(lp-&gt;board==TANGENT)</div><div class='del'>-        {</div><div class='del'>-		if((inb(ioaddr+TANG_CARD_STATUS)&amp;TANG_TX_READY)==0)</div><div class='del'>-               		printk(KERN_WARNING "%s: No TX complete interrupt.\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	printk(KERN_WARNING "%s: Transmit timed out.\n", dev-&gt;name);</div><div class='del'>-	cops_jumpstart(dev);	/* Restart the card. */</div><div class='del'>-	netif_trans_update(dev); /* prevent tx timeout */</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Make the card transmit a LocalTalk packet.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static netdev_tx_t cops_send_packet(struct sk_buff *skb,</div><div class='del'>-					  struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-        int ioaddr = dev-&gt;base_addr;</div><div class='del'>-        unsigned long flags;</div><div class='del'>-</div><div class='del'>-        /*</div><div class='del'>-         * Block a timer-based transmit from overlapping. </div><div class='del'>-	 */</div><div class='del'>-	 </div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-	if(lp-&gt;board == DAYNA)	 /* Wait for adapter transmit buffer. */</div><div class='del'>-		while((inb(ioaddr+DAYNA_CARD_STATUS)&amp;DAYNA_TX_READY)==0)</div><div class='del'>-			cpu_relax();</div><div class='del'>-	if(lp-&gt;board == TANGENT) /* Wait for adapter transmit buffer. */</div><div class='del'>-		while((inb(ioaddr+TANG_CARD_STATUS)&amp;TANG_TX_READY)==0)</div><div class='del'>-			cpu_relax();</div><div class='del'>-</div><div class='del'>-	/* Output IO length. */</div><div class='del'>-	outb(skb-&gt;len, ioaddr);</div><div class='del'>-	outb(skb-&gt;len &gt;&gt; 8, ioaddr);</div><div class='del'>-</div><div class='del'>-	/* Output IO code. */</div><div class='del'>-	outb(LAP_WRITE, ioaddr);</div><div class='del'>-</div><div class='del'>-	if(lp-&gt;board == DAYNA)	/* Check the transmit buffer again. */</div><div class='del'>-        	while((inb(ioaddr+DAYNA_CARD_STATUS)&amp;DAYNA_TX_READY)==0);</div><div class='del'>-</div><div class='del'>-	outsb(ioaddr, skb-&gt;data, skb-&gt;len);	/* Send out the data. */</div><div class='del'>-</div><div class='del'>-	if(lp-&gt;board==DAYNA)	/* Dayna requires you kick the card */</div><div class='del'>-		outb(1, ioaddr+DAYNA_INT_CARD);</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);	/* Restore interrupts. */</div><div class='del'>-</div><div class='del'>-	/* Done sending packet, update counters and cleanup. */</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-	dev_kfree_skb (skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Dummy function to keep the Appletalk layer happy.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static void set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        if(cops_debug &gt;= 3)</div><div class='del'>-		printk("%s: set_multicast_list executed\n", dev-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *      System ioctls for the COPS LocalTalk card.</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-        struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-        struct sockaddr_at *sa = (struct sockaddr_at *)&amp;ifr-&gt;ifr_addr;</div><div class='del'>-        struct atalk_addr *aa = &amp;lp-&gt;node_addr;</div><div class='del'>-</div><div class='del'>-        switch(cmd)</div><div class='del'>-        {</div><div class='del'>-                case SIOCSIFADDR:</div><div class='del'>-			/* Get and set the nodeid and network # atalkd wants. */</div><div class='del'>-			cops_nodeid(dev, sa-&gt;sat_addr.s_node);</div><div class='del'>-			aa-&gt;s_net               = sa-&gt;sat_addr.s_net;</div><div class='del'>-                        aa-&gt;s_node              = lp-&gt;node_acquire;</div><div class='del'>-</div><div class='del'>-			/* Set broardcast address. */</div><div class='del'>-                        dev-&gt;broadcast[0]       = 0xFF;</div><div class='del'>-			</div><div class='del'>-			/* Set hardware address. */</div><div class='del'>-                        dev-&gt;dev_addr[0]        = aa-&gt;s_node;</div><div class='del'>-                        dev-&gt;addr_len           = 1;</div><div class='del'>-                        return 0;</div><div class='del'>-</div><div class='del'>-                case SIOCGIFADDR:</div><div class='del'>-                        sa-&gt;sat_addr.s_net      = aa-&gt;s_net;</div><div class='del'>-                        sa-&gt;sat_addr.s_node     = aa-&gt;s_node;</div><div class='del'>-                        return 0;</div><div class='del'>-</div><div class='del'>-                default:</div><div class='del'>-                        return -EOPNOTSUPP;</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The inverse routine to cops_open().</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-static int cops_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cops_local *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* If we were running polled, yank the timer.</div><div class='del'>-	 */</div><div class='del'>-	if(lp-&gt;board==TANGENT &amp;&amp; dev-&gt;irq==0)</div><div class='del'>-		del_timer(&amp;cops_timer);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static struct net_device *cops_dev;</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-module_param_hw(io, int, ioport, 0);</div><div class='del'>-module_param_hw(irq, int, irq, 0);</div><div class='del'>-module_param_hw(board_type, int, other, 0);</div><div class='del'>-</div><div class='del'>-static int __init cops_module_init(void)</div><div class='del'>-{</div><div class='del'>-	if (io == 0)</div><div class='del'>-		printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",</div><div class='del'>-			cardname);</div><div class='del'>-	cops_dev = cops_probe(-1);</div><div class='del'>-	return PTR_ERR_OR_ZERO(cops_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cops_module_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_netdev(cops_dev);</div><div class='del'>-	cleanup_card(cops_dev);</div><div class='del'>-	free_netdev(cops_dev);</div><div class='del'>-}</div><div class='del'>-module_init(cops_module_init);</div><div class='del'>-module_exit(cops_module_exit);</div><div class='del'>-#endif /* MODULE */</div><div class='head'>diff --git a/drivers/net/appletalk/cops.h b/drivers/net/appletalk/cops.h<br/>deleted file mode 100644<br/>index 7a0bfb351929..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/cops.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*      cops.h: LocalTalk driver for Linux.</div><div class='del'>- *</div><div class='del'>- *      Authors:</div><div class='del'>- *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_COPSLTALK_H</div><div class='del'>-#define __LINUX_COPSLTALK_H</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-/* Max LLAP size we will accept. */</div><div class='del'>-#define MAX_LLAP_SIZE		603</div><div class='del'>-</div><div class='del'>-/* Tangent */</div><div class='del'>-#define TANG_CARD_STATUS        1</div><div class='del'>-#define TANG_CLEAR_INT          1</div><div class='del'>-#define TANG_RESET              3</div><div class='del'>-</div><div class='del'>-#define TANG_TX_READY           1</div><div class='del'>-#define TANG_RX_READY           2</div><div class='del'>-</div><div class='del'>-/* Dayna */</div><div class='del'>-#define DAYNA_CMD_DATA          0</div><div class='del'>-#define DAYNA_CLEAR_INT         1</div><div class='del'>-#define DAYNA_CARD_STATUS       2</div><div class='del'>-#define DAYNA_INT_CARD          3</div><div class='del'>-#define DAYNA_RESET             4</div><div class='del'>-</div><div class='del'>-#define DAYNA_RX_READY          0</div><div class='del'>-#define DAYNA_TX_READY          1</div><div class='del'>-#define DAYNA_RX_REQUEST        3</div><div class='del'>-</div><div class='del'>-/* Same on both card types */</div><div class='del'>-#define COPS_CLEAR_INT  1</div><div class='del'>-</div><div class='del'>-/* LAP response codes received from the cards. */</div><div class='del'>-#define LAP_INIT        1       /* Init cmd */</div><div class='del'>-#define LAP_INIT_RSP    2       /* Init response */</div><div class='del'>-#define LAP_WRITE       3       /* Write cmd */</div><div class='del'>-#define DATA_READ       4       /* Data read */</div><div class='del'>-#define LAP_RESPONSE    4       /* Received ALAP frame response */</div><div class='del'>-#define LAP_GETSTAT     5       /* Get LAP and HW status */</div><div class='del'>-#define LAP_RSPSTAT     6       /* Status response */</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Structure to hold the firmware information.</div><div class='del'>- */</div><div class='del'>-struct ltfirmware</div><div class='del'>-{</div><div class='del'>-        unsigned int length;</div><div class='del'>-        const unsigned char *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DAYNA 1</div><div class='del'>-#define TANGENT 2</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/appletalk/cops_ffdrv.h b/drivers/net/appletalk/cops_ffdrv.h<br/>deleted file mode 100644<br/>index b02005087c1b..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/cops_ffdrv.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops_ffdrv.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,532 +0,0 @@</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	The firmware this driver downloads into the Localtalk card is a</div><div class='del'>- *	separate program and is not GPL'd source code, even though the Linux</div><div class='del'>- *	side driver and the routine that loads this data into the card are.</div><div class='del'>- *	</div><div class='del'>- *	It is taken from the COPS SDK and is under the following license</div><div class='del'>- *</div><div class='del'>- *	This material is licensed to you strictly for use in conjunction with</div><div class='del'>- *	the use of COPS LocalTalk adapters.</div><div class='del'>- *	There is no charge for this SDK. And no waranty express or implied</div><div class='del'>- *	about its fitness for any purpose. However, we will cheerefully</div><div class='del'>- *	refund every penny you paid for this SDK...</div><div class='del'>- *	Regards,</div><div class='del'>- *</div><div class='del'>- *	Thomas F. Divine</div><div class='del'>- *	Chief Scientist</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*      cops_ffdrv.h: LocalTalk driver firmware dump for Linux.</div><div class='del'>- *</div><div class='del'>- *      Authors:</div><div class='del'>- *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COPS_DAYNA</div><div class='del'>-</div><div class='del'>-static const unsigned char ffdrv_code[] = {</div><div class='del'>-	58,3,0,50,228,149,33,255,255,34,226,149,</div><div class='del'>-	249,17,40,152,33,202,154,183,237,82,77,68,</div><div class='del'>-	11,107,98,19,54,0,237,176,175,50,80,0,</div><div class='del'>-	62,128,237,71,62,32,237,57,51,62,12,237,</div><div class='del'>-	57,50,237,57,54,62,6,237,57,52,62,12,</div><div class='del'>-	237,57,49,33,107,137,34,32,128,33,83,130,</div><div class='del'>-	34,40,128,33,86,130,34,42,128,33,112,130,</div><div class='del'>-	34,36,128,33,211,130,34,38,128,62,0,237,</div><div class='del'>-	57,16,33,63,148,34,34,128,237,94,205,15,</div><div class='del'>-	130,251,205,168,145,24,141,67,111,112,121,114,</div><div class='del'>-	105,103,104,116,32,40,67,41,32,49,57,56,</div><div class='del'>-	56,32,45,32,68,97,121,110,97,32,67,111,</div><div class='del'>-	109,109,117,110,105,99,97,116,105,111,110,115,</div><div class='del'>-	32,32,32,65,108,108,32,114,105,103,104,116,</div><div class='del'>-	115,32,114,101,115,101,114,118,101,100,46,32,</div><div class='del'>-	32,40,68,40,68,7,16,8,34,7,22,6,</div><div class='del'>-	16,5,12,4,8,3,6,140,0,16,39,128,</div><div class='del'>-	0,4,96,10,224,6,0,7,126,2,64,11,</div><div class='del'>-	118,12,6,13,0,14,193,15,0,5,96,3,</div><div class='del'>-	192,1,64,9,8,62,9,211,66,62,192,211,</div><div class='del'>-	66,62,100,61,32,253,6,28,33,205,129,14,</div><div class='del'>-	66,237,163,194,253,129,6,28,33,205,129,14,</div><div class='del'>-	64,237,163,194,9,130,201,62,47,50,71,152,</div><div class='del'>-	62,47,211,68,58,203,129,237,57,20,58,204,</div><div class='del'>-	129,237,57,21,33,77,152,54,132,205,233,129,</div><div class='del'>-	58,228,149,254,209,40,6,56,4,62,0,24,</div><div class='del'>-	2,219,96,33,233,149,119,230,62,33,232,149,</div><div class='del'>-	119,213,33,8,152,17,7,0,25,119,19,25,</div><div class='del'>-	119,209,201,251,237,77,245,197,213,229,221,229,</div><div class='del'>-	205,233,129,62,1,50,106,137,205,158,139,221,</div><div class='del'>-	225,225,209,193,241,251,237,77,245,197,213,219,</div><div class='del'>-	72,237,56,16,230,46,237,57,16,237,56,12,</div><div class='del'>-	58,72,152,183,32,26,6,20,17,128,2,237,</div><div class='del'>-	56,46,187,32,35,237,56,47,186,32,29,219,</div><div class='del'>-	72,230,1,32,3,5,32,232,175,50,72,152,</div><div class='del'>-	229,221,229,62,1,50,106,137,205,158,139,221,</div><div class='del'>-	225,225,24,25,62,1,50,72,152,58,201,129,</div><div class='del'>-	237,57,12,58,202,129,237,57,13,237,56,16,</div><div class='del'>-	246,17,237,57,16,209,193,241,251,237,77,245,</div><div class='del'>-	197,229,213,221,229,237,56,16,230,17,237,57,</div><div class='del'>-	16,237,56,20,58,34,152,246,16,246,8,211,</div><div class='del'>-	68,62,6,61,32,253,58,34,152,246,8,211,</div><div class='del'>-	68,58,203,129,237,57,20,58,204,129,237,57,</div><div class='del'>-	21,237,56,16,246,34,237,57,16,221,225,209,</div><div class='del'>-	225,193,241,251,237,77,33,2,0,57,126,230,</div><div class='del'>-	3,237,100,1,40,2,246,128,230,130,245,62,</div><div class='del'>-	5,211,64,241,211,64,201,229,213,243,237,56,</div><div class='del'>-	16,230,46,237,57,16,237,56,12,251,70,35,</div><div class='del'>-	35,126,254,175,202,77,133,254,129,202,15,133,</div><div class='del'>-	230,128,194,191,132,43,58,44,152,119,33,76,</div><div class='del'>-	152,119,35,62,132,119,120,254,255,40,4,58,</div><div class='del'>-	49,152,119,219,72,43,43,112,17,3,0,237,</div><div class='del'>-	56,52,230,248,237,57,52,219,72,230,1,194,</div><div class='del'>-	141,131,209,225,237,56,52,246,6,237,57,52,</div><div class='del'>-	62,1,55,251,201,62,3,211,66,62,192,211,</div><div class='del'>-	66,62,48,211,66,0,0,219,66,230,1,40,</div><div class='del'>-	4,219,67,24,240,205,203,135,58,75,152,254,</div><div class='del'>-	255,202,128,132,58,49,152,254,161,250,207,131,</div><div class='del'>-	58,34,152,211,68,62,10,211,66,62,128,211,</div><div class='del'>-	66,62,11,211,66,62,6,211,66,24,0,62,</div><div class='del'>-	14,211,66,62,33,211,66,62,1,211,66,62,</div><div class='del'>-	64,211,66,62,3,211,66,62,209,211,66,62,</div><div class='del'>-	100,71,219,66,230,1,32,6,5,32,247,195,</div><div class='del'>-	248,132,219,67,71,58,44,152,184,194,248,132,</div><div class='del'>-	62,100,71,219,66,230,1,32,6,5,32,247,</div><div class='del'>-	195,248,132,219,67,62,100,71,219,66,230,1,</div><div class='del'>-	32,6,5,32,247,195,248,132,219,67,254,133,</div><div class='del'>-	32,7,62,0,50,74,152,24,17,254,173,32,</div><div class='del'>-	7,62,1,50,74,152,24,6,254,141,194,248,</div><div class='del'>-	132,71,209,225,58,49,152,254,132,32,10,62,</div><div class='del'>-	50,205,2,134,205,144,135,24,27,254,140,32,</div><div class='del'>-	15,62,110,205,2,134,62,141,184,32,5,205,</div><div class='del'>-	144,135,24,8,62,10,205,2,134,205,8,134,</div><div class='del'>-	62,1,50,106,137,205,158,139,237,56,52,246,</div><div class='del'>-	6,237,57,52,175,183,251,201,62,20,135,237,</div><div class='del'>-	57,20,175,237,57,21,237,56,16,246,2,237,</div><div class='del'>-	57,16,237,56,20,95,237,56,21,123,254,10,</div><div class='del'>-	48,244,237,56,16,230,17,237,57,16,209,225,</div><div class='del'>-	205,144,135,62,1,50,106,137,205,158,139,237,</div><div class='del'>-	56,52,246,6,237,57,52,175,183,251,201,209,</div><div class='del'>-	225,243,219,72,230,1,40,13,62,10,211,66,</div><div class='del'>-	0,0,219,66,230,192,202,226,132,237,56,52,</div><div class='del'>-	246,6,237,57,52,62,1,55,251,201,205,203,</div><div class='del'>-	135,62,1,50,106,137,205,158,139,237,56,52,</div><div class='del'>-	246,6,237,57,52,183,251,201,209,225,62,1,</div><div class='del'>-	50,106,137,205,158,139,237,56,52,246,6,237,</div><div class='del'>-	57,52,62,2,55,251,201,209,225,243,219,72,</div><div class='del'>-	230,1,202,213,132,62,10,211,66,0,0,219,</div><div class='del'>-	66,230,192,194,213,132,229,62,1,50,106,137,</div><div class='del'>-	42,40,152,205,65,143,225,17,3,0,205,111,</div><div class='del'>-	136,62,6,211,66,58,44,152,211,66,237,56,</div><div class='del'>-	52,246,6,237,57,52,183,251,201,209,197,237,</div><div class='del'>-	56,52,230,248,237,57,52,219,72,230,1,32,</div><div class='del'>-	15,193,225,237,56,52,246,6,237,57,52,62,</div><div class='del'>-	1,55,251,201,14,23,58,37,152,254,0,40,</div><div class='del'>-	14,14,2,254,1,32,5,62,140,119,24,3,</div><div class='del'>-	62,132,119,43,43,197,205,203,135,193,62,1,</div><div class='del'>-	211,66,62,64,211,66,62,3,211,66,62,193,</div><div class='del'>-	211,66,62,100,203,39,71,219,66,230,1,32,</div><div class='del'>-	6,5,32,247,195,229,133,33,238,151,219,67,</div><div class='del'>-	71,58,44,152,184,194,229,133,119,62,100,71,</div><div class='del'>-	219,66,230,1,32,6,5,32,247,195,229,133,</div><div class='del'>-	219,67,35,119,13,32,234,193,225,62,1,50,</div><div class='del'>-	106,137,205,158,139,237,56,52,246,6,237,57,</div><div class='del'>-	52,175,183,251,201,33,234,151,35,35,62,255,</div><div class='del'>-	119,193,225,62,1,50,106,137,205,158,139,237,</div><div class='del'>-	56,52,246,6,237,57,52,175,251,201,243,61,</div><div class='del'>-	32,253,251,201,62,3,211,66,62,192,211,66,</div><div class='del'>-	58,49,152,254,140,32,19,197,229,213,17,181,</div><div class='del'>-	129,33,185,129,1,2,0,237,176,209,225,193,</div><div class='del'>-	24,27,229,213,33,187,129,58,49,152,230,15,</div><div class='del'>-	87,30,2,237,92,25,17,181,129,126,18,19,</div><div class='del'>-	35,126,18,209,225,58,34,152,246,8,211,68,</div><div class='del'>-	58,49,152,254,165,40,14,254,164,40,10,62,</div><div class='del'>-	10,211,66,62,224,211,66,24,25,58,74,152,</div><div class='del'>-	254,0,40,10,62,10,211,66,62,160,211,66,</div><div class='del'>-	24,8,62,10,211,66,62,128,211,66,62,11,</div><div class='del'>-	211,66,62,6,211,66,205,147,143,62,5,211,</div><div class='del'>-	66,62,224,211,66,62,5,211,66,62,96,211,</div><div class='del'>-	66,62,5,61,32,253,62,5,211,66,62,224,</div><div class='del'>-	211,66,62,14,61,32,253,62,5,211,66,62,</div><div class='del'>-	233,211,66,62,128,211,66,58,181,129,61,32,</div><div class='del'>-	253,62,1,211,66,62,192,211,66,1,254,19,</div><div class='del'>-	237,56,46,187,32,6,13,32,247,195,226,134,</div><div class='del'>-	62,192,211,66,0,0,219,66,203,119,40,250,</div><div class='del'>-	219,66,203,87,40,250,243,237,56,16,230,17,</div><div class='del'>-	237,57,16,237,56,20,251,62,5,211,66,62,</div><div class='del'>-	224,211,66,58,182,129,61,32,253,229,33,181,</div><div class='del'>-	129,58,183,129,203,63,119,35,58,184,129,119,</div><div class='del'>-	225,62,10,211,66,62,224,211,66,62,11,211,</div><div class='del'>-	66,62,118,211,66,62,47,211,68,62,5,211,</div><div class='del'>-	66,62,233,211,66,58,181,129,61,32,253,62,</div><div class='del'>-	5,211,66,62,224,211,66,58,182,129,61,32,</div><div class='del'>-	253,62,5,211,66,62,96,211,66,201,229,213,</div><div class='del'>-	58,50,152,230,15,87,30,2,237,92,33,187,</div><div class='del'>-	129,25,17,181,129,126,18,35,19,126,18,209,</div><div class='del'>-	225,58,71,152,246,8,211,68,58,50,152,254,</div><div class='del'>-	165,40,14,254,164,40,10,62,10,211,66,62,</div><div class='del'>-	224,211,66,24,8,62,10,211,66,62,128,211,</div><div class='del'>-	66,62,11,211,66,62,6,211,66,195,248,135,</div><div class='del'>-	62,3,211,66,62,192,211,66,197,229,213,17,</div><div class='del'>-	181,129,33,183,129,1,2,0,237,176,209,225,</div><div class='del'>-	193,62,47,211,68,62,10,211,66,62,224,211,</div><div class='del'>-	66,62,11,211,66,62,118,211,66,62,1,211,</div><div class='del'>-	66,62,0,211,66,205,147,143,195,16,136,62,</div><div class='del'>-	3,211,66,62,192,211,66,197,229,213,17,181,</div><div class='del'>-	129,33,183,129,1,2,0,237,176,209,225,193,</div><div class='del'>-	62,47,211,68,62,10,211,66,62,224,211,66,</div><div class='del'>-	62,11,211,66,62,118,211,66,205,147,143,62,</div><div class='del'>-	5,211,66,62,224,211,66,62,5,211,66,62,</div><div class='del'>-	96,211,66,62,5,61,32,253,62,5,211,66,</div><div class='del'>-	62,224,211,66,62,14,61,32,253,62,5,211,</div><div class='del'>-	66,62,233,211,66,62,128,211,66,58,181,129,</div><div class='del'>-	61,32,253,62,1,211,66,62,192,211,66,1,</div><div class='del'>-	254,19,237,56,46,187,32,6,13,32,247,195,</div><div class='del'>-	88,136,62,192,211,66,0,0,219,66,203,119,</div><div class='del'>-	40,250,219,66,203,87,40,250,62,5,211,66,</div><div class='del'>-	62,224,211,66,58,182,129,61,32,253,62,5,</div><div class='del'>-	211,66,62,96,211,66,201,197,14,67,6,0,</div><div class='del'>-	62,3,211,66,62,192,211,66,62,48,211,66,</div><div class='del'>-	0,0,219,66,230,1,40,4,219,67,24,240,</div><div class='del'>-	62,5,211,66,62,233,211,66,62,128,211,66,</div><div class='del'>-	58,181,129,61,32,253,237,163,29,62,192,211,</div><div class='del'>-	66,219,66,230,4,40,250,237,163,29,32,245,</div><div class='del'>-	219,66,230,4,40,250,62,255,71,219,66,230,</div><div class='del'>-	4,40,3,5,32,247,219,66,230,4,40,250,</div><div class='del'>-	62,5,211,66,62,224,211,66,58,182,129,61,</div><div class='del'>-	32,253,62,5,211,66,62,96,211,66,58,71,</div><div class='del'>-	152,254,1,202,18,137,62,16,211,66,62,56,</div><div class='del'>-	211,66,62,14,211,66,62,33,211,66,62,1,</div><div class='del'>-	211,66,62,248,211,66,237,56,48,246,153,230,</div><div class='del'>-	207,237,57,48,62,3,211,66,62,221,211,66,</div><div class='del'>-	193,201,58,71,152,211,68,62,10,211,66,62,</div><div class='del'>-	128,211,66,62,11,211,66,62,6,211,66,62,</div><div class='del'>-	6,211,66,58,44,152,211,66,62,16,211,66,</div><div class='del'>-	62,56,211,66,62,48,211,66,0,0,62,14,</div><div class='del'>-	211,66,62,33,211,66,62,1,211,66,62,248,</div><div class='del'>-	211,66,237,56,48,246,145,246,8,230,207,237,</div><div class='del'>-	57,48,62,3,211,66,62,221,211,66,193,201,</div><div class='del'>-	44,3,1,0,70,69,1,245,197,213,229,175,</div><div class='del'>-	50,72,152,237,56,16,230,46,237,57,16,237,</div><div class='del'>-	56,12,62,1,211,66,0,0,219,66,95,230,</div><div class='del'>-	160,32,3,195,20,139,123,230,96,194,72,139,</div><div class='del'>-	62,48,211,66,62,1,211,66,62,64,211,66,</div><div class='del'>-	237,91,40,152,205,207,143,25,43,55,237,82,</div><div class='del'>-	218,70,139,34,42,152,98,107,58,44,152,190,</div><div class='del'>-	194,210,138,35,35,62,130,190,194,200,137,62,</div><div class='del'>-	1,50,48,152,62,175,190,202,82,139,62,132,</div><div class='del'>-	190,32,44,50,50,152,62,47,50,71,152,229,</div><div class='del'>-	175,50,106,137,42,40,152,205,65,143,225,54,</div><div class='del'>-	133,43,70,58,44,152,119,43,112,17,3,0,</div><div class='del'>-	62,10,205,2,134,205,111,136,195,158,138,62,</div><div class='del'>-	140,190,32,19,50,50,152,58,233,149,230,4,</div><div class='del'>-	202,222,138,62,1,50,71,152,195,219,137,126,</div><div class='del'>-	254,160,250,185,138,254,166,242,185,138,50,50,</div><div class='del'>-	152,43,126,35,229,213,33,234,149,95,22,0,</div><div class='del'>-	25,126,254,132,40,18,254,140,40,14,58,50,</div><div class='del'>-	152,230,15,87,126,31,21,242,65,138,56,2,</div><div class='del'>-	175,119,58,50,152,230,15,87,58,233,149,230,</div><div class='del'>-	62,31,21,242,85,138,218,98,138,209,225,195,</div><div class='del'>-	20,139,58,50,152,33,100,137,230,15,95,22,</div><div class='del'>-	0,25,126,50,71,152,209,225,58,50,152,254,</div><div class='del'>-	164,250,135,138,58,73,152,254,0,40,4,54,</div><div class='del'>-	173,24,2,54,133,43,70,58,44,152,119,43,</div><div class='del'>-	112,17,3,0,205,70,135,175,50,106,137,205,</div><div class='del'>-	208,139,58,199,129,237,57,12,58,200,129,237,</div><div class='del'>-	57,13,237,56,16,246,17,237,57,16,225,209,</div><div class='del'>-	193,241,251,237,77,62,129,190,194,227,138,54,</div><div class='del'>-	130,43,70,58,44,152,119,43,112,17,3,0,</div><div class='del'>-	205,144,135,195,20,139,35,35,126,254,132,194,</div><div class='del'>-	227,138,175,50,106,137,205,158,139,24,42,58,</div><div class='del'>-	201,154,254,1,40,7,62,1,50,106,137,24,</div><div class='del'>-	237,58,106,137,254,1,202,222,138,62,128,166,</div><div class='del'>-	194,222,138,221,229,221,33,67,152,205,127,142,</div><div class='del'>-	205,109,144,221,225,225,209,193,241,251,237,77,</div><div class='del'>-	58,106,137,254,1,202,44,139,58,50,152,254,</div><div class='del'>-	164,250,44,139,58,73,152,238,1,50,73,152,</div><div class='del'>-	221,229,221,33,51,152,205,127,142,221,225,62,</div><div class='del'>-	1,50,106,137,205,158,139,195,13,139,24,208,</div><div class='del'>-	24,206,24,204,230,64,40,3,195,20,139,195,</div><div class='del'>-	20,139,43,126,33,8,152,119,35,58,44,152,</div><div class='del'>-	119,43,237,91,35,152,205,203,135,205,158,139,</div><div class='del'>-	195,13,139,175,50,78,152,62,3,211,66,62,</div><div class='del'>-	192,211,66,201,197,33,4,0,57,126,35,102,</div><div class='del'>-	111,62,1,50,106,137,219,72,205,141,139,193,</div><div class='del'>-	201,62,1,50,78,152,34,40,152,54,0,35,</div><div class='del'>-	35,54,0,195,163,139,58,78,152,183,200,229,</div><div class='del'>-	33,181,129,58,183,129,119,35,58,184,129,119,</div><div class='del'>-	225,62,47,211,68,62,14,211,66,62,193,211,</div><div class='del'>-	66,62,10,211,66,62,224,211,66,62,11,211,</div><div class='del'>-	66,62,118,211,66,195,3,140,58,78,152,183,</div><div class='del'>-	200,58,71,152,211,68,254,69,40,4,254,70,</div><div class='del'>-	32,17,58,73,152,254,0,40,10,62,10,211,</div><div class='del'>-	66,62,160,211,66,24,8,62,10,211,66,62,</div><div class='del'>-	128,211,66,62,11,211,66,62,6,211,66,62,</div><div class='del'>-	6,211,66,58,44,152,211,66,62,16,211,66,</div><div class='del'>-	62,56,211,66,62,48,211,66,0,0,219,66,</div><div class='del'>-	230,1,40,4,219,67,24,240,62,14,211,66,</div><div class='del'>-	62,33,211,66,42,40,152,205,65,143,62,1,</div><div class='del'>-	211,66,62,248,211,66,237,56,48,246,145,246,</div><div class='del'>-	8,230,207,237,57,48,62,3,211,66,62,221,</div><div class='del'>-	211,66,201,62,16,211,66,62,56,211,66,62,</div><div class='del'>-	48,211,66,0,0,219,66,230,1,40,4,219,</div><div class='del'>-	67,24,240,62,14,211,66,62,33,211,66,62,</div><div class='del'>-	1,211,66,62,248,211,66,237,56,48,246,153,</div><div class='del'>-	230,207,237,57,48,62,3,211,66,62,221,211,</div><div class='del'>-	66,201,229,213,33,234,149,95,22,0,25,126,</div><div class='del'>-	254,132,40,4,254,140,32,2,175,119,123,209,</div><div class='del'>-	225,201,6,8,14,0,31,48,1,12,16,250,</div><div class='del'>-	121,201,33,4,0,57,94,35,86,33,2,0,</div><div class='del'>-	57,126,35,102,111,221,229,34,89,152,237,83,</div><div class='del'>-	91,152,221,33,63,152,205,127,142,58,81,152,</div><div class='del'>-	50,82,152,58,80,152,135,50,80,152,205,162,</div><div class='del'>-	140,254,3,56,16,58,81,152,135,60,230,15,</div><div class='del'>-	50,81,152,175,50,80,152,24,23,58,79,152,</div><div class='del'>-	205,162,140,254,3,48,13,58,81,152,203,63,</div><div class='del'>-	50,81,152,62,255,50,79,152,58,81,152,50,</div><div class='del'>-	82,152,58,79,152,135,50,79,152,62,32,50,</div><div class='del'>-	83,152,50,84,152,237,56,16,230,17,237,57,</div><div class='del'>-	16,219,72,62,192,50,93,152,62,93,50,94,</div><div class='del'>-	152,58,93,152,61,50,93,152,32,9,58,94,</div><div class='del'>-	152,61,50,94,152,40,44,62,170,237,57,20,</div><div class='del'>-	175,237,57,21,237,56,16,246,2,237,57,16,</div><div class='del'>-	219,72,230,1,202,29,141,237,56,20,71,237,</div><div class='del'>-	56,21,120,254,10,48,237,237,56,16,230,17,</div><div class='del'>-	237,57,16,243,62,14,211,66,62,65,211,66,</div><div class='del'>-	251,58,39,152,23,23,60,50,39,152,71,58,</div><div class='del'>-	82,152,160,230,15,40,22,71,14,10,219,66,</div><div class='del'>-	230,16,202,186,141,219,72,230,1,202,186,141,</div><div class='del'>-	13,32,239,16,235,42,89,152,237,91,91,152,</div><div class='del'>-	205,47,131,48,7,61,202,186,141,195,227,141,</div><div class='del'>-	221,225,33,0,0,201,221,33,55,152,205,127,</div><div class='del'>-	142,58,84,152,61,50,84,152,40,19,58,82,</div><div class='del'>-	152,246,1,50,82,152,58,79,152,246,1,50,</div><div class='del'>-	79,152,195,29,141,221,225,33,1,0,201,221,</div><div class='del'>-	33,59,152,205,127,142,58,80,152,246,1,50,</div><div class='del'>-	80,152,58,82,152,135,246,1,50,82,152,58,</div><div class='del'>-	83,152,61,50,83,152,194,29,141,221,225,33,</div><div class='del'>-	2,0,201,221,229,33,0,0,57,17,4,0,</div><div class='del'>-	25,126,50,44,152,230,128,50,85,152,58,85,</div><div class='del'>-	152,183,40,6,221,33,88,2,24,4,221,33,</div><div class='del'>-	150,0,58,44,152,183,40,53,60,40,50,60,</div><div class='del'>-	40,47,61,61,33,86,152,119,35,119,35,54,</div><div class='del'>-	129,175,50,48,152,221,43,221,229,225,124,181,</div><div class='del'>-	40,42,33,86,152,17,3,0,205,189,140,17,</div><div class='del'>-	232,3,27,123,178,32,251,58,48,152,183,40,</div><div class='del'>-	224,58,44,152,71,62,7,128,230,127,71,58,</div><div class='del'>-	85,152,176,50,44,152,24,162,221,225,201,183,</div><div class='del'>-	221,52,0,192,221,52,1,192,221,52,2,192,</div><div class='del'>-	221,52,3,192,55,201,245,62,1,211,100,241,</div><div class='del'>-	201,245,62,1,211,96,241,201,33,2,0,57,</div><div class='del'>-	126,35,102,111,237,56,48,230,175,237,57,48,</div><div class='del'>-	62,48,237,57,49,125,237,57,32,124,237,57,</div><div class='del'>-	33,62,0,237,57,34,62,88,237,57,35,62,</div><div class='del'>-	0,237,57,36,237,57,37,33,128,2,125,237,</div><div class='del'>-	57,38,124,237,57,39,237,56,48,246,97,230,</div><div class='del'>-	207,237,57,48,62,0,237,57,0,62,0,211,</div><div class='del'>-	96,211,100,201,33,2,0,57,126,35,102,111,</div><div class='del'>-	237,56,48,230,175,237,57,48,62,12,237,57,</div><div class='del'>-	49,62,76,237,57,32,62,0,237,57,33,237,</div><div class='del'>-	57,34,125,237,57,35,124,237,57,36,62,0,</div><div class='del'>-	237,57,37,33,128,2,125,237,57,38,124,237,</div><div class='del'>-	57,39,237,56,48,246,97,230,207,237,57,48,</div><div class='del'>-	62,1,211,96,201,33,2,0,57,126,35,102,</div><div class='del'>-	111,229,237,56,48,230,87,237,57,48,125,237,</div><div class='del'>-	57,40,124,237,57,41,62,0,237,57,42,62,</div><div class='del'>-	67,237,57,43,62,0,237,57,44,58,106,137,</div><div class='del'>-	254,1,32,5,33,6,0,24,3,33,128,2,</div><div class='del'>-	125,237,57,46,124,237,57,47,237,56,50,230,</div><div class='del'>-	252,246,2,237,57,50,225,201,33,4,0,57,</div><div class='del'>-	94,35,86,33,2,0,57,126,35,102,111,237,</div><div class='del'>-	56,48,230,87,237,57,48,125,237,57,40,124,</div><div class='del'>-	237,57,41,62,0,237,57,42,62,67,237,57,</div><div class='del'>-	43,62,0,237,57,44,123,237,57,46,122,237,</div><div class='del'>-	57,47,237,56,50,230,244,246,0,237,57,50,</div><div class='del'>-	237,56,48,246,145,230,207,237,57,48,201,213,</div><div class='del'>-	237,56,46,95,237,56,47,87,237,56,46,111,</div><div class='del'>-	237,56,47,103,183,237,82,32,235,33,128,2,</div><div class='del'>-	183,237,82,209,201,213,237,56,38,95,237,56,</div><div class='del'>-	39,87,237,56,38,111,237,56,39,103,183,237,</div><div class='del'>-	82,32,235,33,128,2,183,237,82,209,201,245,</div><div class='del'>-	197,1,52,0,237,120,230,253,237,121,193,241,</div><div class='del'>-	201,245,197,1,52,0,237,120,246,2,237,121,</div><div class='del'>-	193,241,201,33,2,0,57,126,35,102,111,126,</div><div class='del'>-	35,110,103,201,33,0,0,34,102,152,34,96,</div><div class='del'>-	152,34,98,152,33,202,154,34,104,152,237,91,</div><div class='del'>-	104,152,42,226,149,183,237,82,17,0,255,25,</div><div class='del'>-	34,100,152,203,124,40,6,33,0,125,34,100,</div><div class='del'>-	152,42,104,152,35,35,35,229,205,120,139,193,</div><div class='del'>-	201,205,186,149,229,42,40,152,35,35,35,229,</div><div class='del'>-	205,39,144,193,124,230,3,103,221,117,254,221,</div><div class='del'>-	116,255,237,91,42,152,35,35,35,183,237,82,</div><div class='del'>-	32,12,17,5,0,42,42,152,205,171,149,242,</div><div class='del'>-	169,144,42,40,152,229,205,120,139,193,195,198,</div><div class='del'>-	149,237,91,42,152,42,98,152,25,34,98,152,</div><div class='del'>-	19,19,19,42,102,152,25,34,102,152,237,91,</div><div class='del'>-	100,152,33,158,253,25,237,91,102,152,205,171,</div><div class='del'>-	149,242,214,144,33,0,0,34,102,152,62,1,</div><div class='del'>-	50,95,152,205,225,144,195,198,149,58,95,152,</div><div class='del'>-	183,200,237,91,96,152,42,102,152,205,171,149,</div><div class='del'>-	242,5,145,237,91,102,152,33,98,2,25,237,</div><div class='del'>-	91,96,152,205,171,149,250,37,145,237,91,96,</div><div class='del'>-	152,42,102,152,183,237,82,32,7,42,98,152,</div><div class='del'>-	125,180,40,13,237,91,102,152,42,96,152,205,</div><div class='del'>-	171,149,242,58,145,237,91,104,152,42,102,152,</div><div class='del'>-	25,35,35,35,229,205,120,139,193,175,50,95,</div><div class='del'>-	152,201,195,107,139,205,206,149,250,255,243,205,</div><div class='del'>-	225,144,251,58,230,149,183,194,198,149,17,1,</div><div class='del'>-	0,42,98,152,205,171,149,250,198,149,62,1,</div><div class='del'>-	50,230,149,237,91,96,152,42,104,152,25,221,</div><div class='del'>-	117,252,221,116,253,237,91,104,152,42,96,152,</div><div class='del'>-	25,35,35,35,221,117,254,221,116,255,35,35,</div><div class='del'>-	35,229,205,39,144,124,230,3,103,35,35,35,</div><div class='del'>-	221,117,250,221,116,251,235,221,110,252,221,102,</div><div class='del'>-	253,115,35,114,35,54,4,62,1,211,100,211,</div><div class='del'>-	84,195,198,149,33,0,0,34,102,152,34,96,</div><div class='del'>-	152,34,98,152,33,202,154,34,104,152,237,91,</div><div class='del'>-	104,152,42,226,149,183,237,82,17,0,255,25,</div><div class='del'>-	34,100,152,33,109,152,54,0,33,107,152,229,</div><div class='del'>-	205,240,142,193,62,47,50,34,152,62,132,50,</div><div class='del'>-	49,152,205,241,145,205,61,145,58,39,152,60,</div><div class='del'>-	50,39,152,24,241,205,206,149,251,255,33,109,</div><div class='del'>-	152,126,183,202,198,149,110,221,117,251,33,109,</div><div class='del'>-	152,54,0,221,126,251,254,1,40,28,254,3,</div><div class='del'>-	40,101,254,4,202,190,147,254,5,202,147,147,</div><div class='del'>-	254,8,40,87,33,107,152,229,205,240,142,195,</div><div class='del'>-	198,149,58,201,154,183,32,21,33,111,152,126,</div><div class='del'>-	50,229,149,205,52,144,33,110,152,110,38,0,</div><div class='del'>-	229,205,11,142,193,237,91,96,152,42,104,152,</div><div class='del'>-	25,221,117,254,221,116,255,35,35,54,2,17,</div><div class='del'>-	2,0,43,43,115,35,114,58,44,152,35,35,</div><div class='del'>-	119,58,228,149,35,119,62,1,211,100,211,84,</div><div class='del'>-	62,1,50,201,154,24,169,205,153,142,58,231,</div><div class='del'>-	149,183,40,250,175,50,231,149,33,110,152,126,</div><div class='del'>-	254,255,40,91,58,233,149,230,63,183,40,83,</div><div class='del'>-	94,22,0,33,234,149,25,126,183,40,13,33,</div><div class='del'>-	110,152,94,33,234,150,25,126,254,3,32,36,</div><div class='del'>-	205,81,148,125,180,33,110,152,94,22,0,40,</div><div class='del'>-	17,33,234,149,25,54,0,33,107,152,229,205,</div><div class='del'>-	240,142,193,195,198,149,33,234,150,25,54,0,</div><div class='del'>-	33,110,152,94,22,0,33,234,149,25,126,50,</div><div class='del'>-	49,152,254,132,32,37,62,47,50,34,152,42,</div><div class='del'>-	107,152,229,33,110,152,229,205,174,140,193,193,</div><div class='del'>-	125,180,33,110,152,94,22,0,33,234,150,202,</div><div class='del'>-	117,147,25,52,195,120,147,58,49,152,254,140,</div><div class='del'>-	32,7,62,1,50,34,152,24,210,62,32,50,</div><div class='del'>-	106,152,24,19,58,49,152,95,58,106,152,163,</div><div class='del'>-	183,58,106,152,32,11,203,63,50,106,152,58,</div><div class='del'>-	106,152,183,32,231,254,2,40,51,254,4,40,</div><div class='del'>-	38,254,8,40,26,254,16,40,13,254,32,32,</div><div class='del'>-	158,62,165,50,49,152,62,69,24,190,62,164,</div><div class='del'>-	50,49,152,62,70,24,181,62,163,50,49,152,</div><div class='del'>-	175,24,173,62,162,50,49,152,62,1,24,164,</div><div class='del'>-	62,161,50,49,152,62,3,24,155,25,54,0,</div><div class='del'>-	221,126,251,254,8,40,7,58,230,149,183,202,</div><div class='del'>-	32,146,33,107,152,229,205,240,142,193,211,84,</div><div class='del'>-	195,198,149,237,91,96,152,42,104,152,25,221,</div><div class='del'>-	117,254,221,116,255,35,35,54,6,17,2,0,</div><div class='del'>-	43,43,115,35,114,58,228,149,35,35,119,58,</div><div class='del'>-	233,149,35,119,205,146,142,195,32,146,237,91,</div><div class='del'>-	96,152,42,104,152,25,229,205,160,142,193,58,</div><div class='del'>-	231,149,183,40,250,175,50,231,149,243,237,91,</div><div class='del'>-	96,152,42,104,152,25,221,117,254,221,116,255,</div><div class='del'>-	78,35,70,221,113,252,221,112,253,89,80,42,</div><div class='del'>-	98,152,183,237,82,34,98,152,203,124,40,19,</div><div class='del'>-	33,0,0,34,98,152,34,102,152,34,96,152,</div><div class='del'>-	62,1,50,95,152,24,40,221,94,252,221,86,</div><div class='del'>-	253,19,19,19,42,96,152,25,34,96,152,237,</div><div class='del'>-	91,100,152,33,158,253,25,237,91,96,152,205,</div><div class='del'>-	171,149,242,55,148,33,0,0,34,96,152,175,</div><div class='del'>-	50,230,149,251,195,32,146,245,62,1,50,231,</div><div class='del'>-	149,62,16,237,57,0,211,80,241,251,237,77,</div><div class='del'>-	201,205,186,149,229,229,33,0,0,34,37,152,</div><div class='del'>-	33,110,152,126,50,234,151,58,44,152,33,235,</div><div class='del'>-	151,119,221,54,253,0,221,54,254,0,195,230,</div><div class='del'>-	148,33,236,151,54,175,33,3,0,229,33,234,</div><div class='del'>-	151,229,205,174,140,193,193,33,236,151,126,254,</div><div class='del'>-	255,40,74,33,245,151,110,221,117,255,33,249,</div><div class='del'>-	151,126,221,166,255,221,119,255,33,253,151,126,</div><div class='del'>-	221,166,255,221,119,255,58,232,149,95,221,126,</div><div class='del'>-	255,163,221,119,255,183,40,15,230,191,33,110,</div><div class='del'>-	152,94,22,0,33,234,149,25,119,24,12,33,</div><div class='del'>-	110,152,94,22,0,33,234,149,25,54,132,33,</div><div class='del'>-	0,0,195,198,149,221,110,253,221,102,254,35,</div><div class='del'>-	221,117,253,221,116,254,17,32,0,221,110,253,</div><div class='del'>-	221,102,254,205,171,149,250,117,148,58,233,149,</div><div class='del'>-	203,87,40,84,33,1,0,34,37,152,221,54,</div><div class='del'>-	253,0,221,54,254,0,24,53,33,236,151,54,</div><div class='del'>-	175,33,3,0,229,33,234,151,229,205,174,140,</div><div class='del'>-	193,193,33,236,151,126,254,255,40,14,33,110,</div><div class='del'>-	152,94,22,0,33,234,149,25,54,140,24,159,</div><div class='del'>-	221,110,253,221,102,254,35,221,117,253,221,116,</div><div class='del'>-	254,17,32,0,221,110,253,221,102,254,205,171,</div><div class='del'>-	149,250,12,149,33,2,0,34,37,152,221,54,</div><div class='del'>-	253,0,221,54,254,0,24,54,33,236,151,54,</div><div class='del'>-	175,33,3,0,229,33,234,151,229,205,174,140,</div><div class='del'>-	193,193,33,236,151,126,254,255,40,15,33,110,</div><div class='del'>-	152,94,22,0,33,234,149,25,54,132,195,211,</div><div class='del'>-	148,221,110,253,221,102,254,35,221,117,253,221,</div><div class='del'>-	116,254,17,32,0,221,110,253,221,102,254,205,</div><div class='del'>-	171,149,250,96,149,33,1,0,195,198,149,124,</div><div class='del'>-	170,250,179,149,237,82,201,124,230,128,237,82,</div><div class='del'>-	60,201,225,253,229,221,229,221,33,0,0,221,</div><div class='del'>-	57,233,221,249,221,225,253,225,201,233,225,253,</div><div class='del'>-	229,221,229,221,33,0,0,221,57,94,35,86,</div><div class='del'>-	35,235,57,249,235,233,0,0,0,0,0,0,</div><div class='del'>-	62,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	175,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,133,1,0,0,0,63,</div><div class='del'>-	255,255,255,255,0,0,0,63,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,24,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0</div><div class='del'>-	} ;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/appletalk/cops_ltdrv.h b/drivers/net/appletalk/cops_ltdrv.h<br/>deleted file mode 100644<br/>index c699b1ad31da..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/cops_ltdrv.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/cops_ltdrv.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,241 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	The firmware this driver downloads into the Localtalk card is a</div><div class='del'>- *	separate program and is not GPL'd source code, even though the Linux</div><div class='del'>- *	side driver and the routine that loads this data into the card are.</div><div class='del'>- *	</div><div class='del'>- *	It is taken from the COPS SDK and is under the following license</div><div class='del'>- *</div><div class='del'>- *	This material is licensed to you strictly for use in conjunction with</div><div class='del'>- *	the use of COPS LocalTalk adapters.</div><div class='del'>- *	There is no charge for this SDK. And no waranty express or implied</div><div class='del'>- *	about its fitness for any purpose. However, we will cheerefully</div><div class='del'>- *	refund every penny you paid for this SDK...</div><div class='del'>- *	Regards,</div><div class='del'>- *</div><div class='del'>- *	Thomas F. Divine</div><div class='del'>- *	Chief Scientist</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*      cops_ltdrv.h: LocalTalk driver firmware dump for Linux.</div><div class='del'>- *</div><div class='del'>- *      Authors:</div><div class='del'>- *      - Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='del'>- */</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_COPS_TANGENT</div><div class='del'>-</div><div class='del'>-static const unsigned char ltdrv_code[] = {</div><div class='del'>-	58,3,0,50,148,10,33,143,15,62,85,119,</div><div class='del'>-	190,32,9,62,170,119,190,32,3,35,24,241,</div><div class='del'>-	34,146,10,249,17,150,10,33,143,15,183,237,</div><div class='del'>-	82,77,68,11,107,98,19,54,0,237,176,62,</div><div class='del'>-	16,237,57,51,62,0,237,57,50,237,57,54,</div><div class='del'>-	62,12,237,57,49,62,195,33,39,2,50,56,</div><div class='del'>-	0,34,57,0,237,86,205,30,2,251,205,60,</div><div class='del'>-	10,24,169,67,111,112,121,114,105,103,104,116,</div><div class='del'>-	32,40,99,41,32,49,57,56,56,45,49,57,</div><div class='del'>-	57,50,44,32,80,114,105,110,116,105,110,103,</div><div class='del'>-	32,67,111,109,109,117,110,105,99,97,116,105,</div><div class='del'>-	111,110,115,32,65,115,115,111,99,105,97,116,</div><div class='del'>-	101,115,44,32,73,110,99,46,65,108,108,32,</div><div class='del'>-	114,105,103,104,116,115,32,114,101,115,101,114,</div><div class='del'>-	118,101,100,46,32,32,4,4,22,40,255,60,</div><div class='del'>-	4,96,10,224,6,0,7,126,2,64,11,246,</div><div class='del'>-	12,6,13,0,14,193,15,0,5,96,3,192,</div><div class='del'>-	1,0,9,8,62,3,211,82,62,192,211,82,</div><div class='del'>-	201,62,3,211,82,62,213,211,82,201,62,5,</div><div class='del'>-	211,82,62,224,211,82,201,62,5,211,82,62,</div><div class='del'>-	224,211,82,201,62,5,211,82,62,96,211,82,</div><div class='del'>-	201,6,28,33,180,1,14,82,237,163,194,4,</div><div class='del'>-	2,33,39,2,34,64,0,58,3,0,230,1,</div><div class='del'>-	192,62,11,237,121,62,118,237,121,201,33,182,</div><div class='del'>-	10,54,132,205,253,1,201,245,197,213,229,42,</div><div class='del'>-	150,10,14,83,17,98,2,67,20,237,162,58,</div><div class='del'>-	179,1,95,219,82,230,1,32,6,29,32,247,</div><div class='del'>-	195,17,3,62,1,211,82,219,82,95,230,160,</div><div class='del'>-	32,10,237,162,32,225,21,32,222,195,15,3,</div><div class='del'>-	237,162,123,230,96,194,21,3,62,48,211,82,</div><div class='del'>-	62,1,211,82,175,211,82,237,91,150,10,43,</div><div class='del'>-	55,237,82,218,19,3,34,152,10,98,107,58,</div><div class='del'>-	154,10,190,32,81,62,1,50,158,10,35,35,</div><div class='del'>-	62,132,190,32,44,54,133,43,70,58,154,10,</div><div class='del'>-	119,43,112,17,3,0,205,137,3,62,16,211,</div><div class='del'>-	82,62,56,211,82,205,217,1,42,150,10,14,</div><div class='del'>-	83,17,98,2,67,20,58,178,1,95,195,59,</div><div class='del'>-	2,62,129,190,194,227,2,54,130,43,70,58,</div><div class='del'>-	154,10,119,43,112,17,3,0,205,137,3,195,</div><div class='del'>-	254,2,35,35,126,254,132,194,227,2,205,61,</div><div class='del'>-	3,24,20,62,128,166,194,222,2,221,229,221,</div><div class='del'>-	33,175,10,205,93,6,205,144,7,221,225,225,</div><div class='del'>-	209,193,241,251,237,77,221,229,221,33,159,10,</div><div class='del'>-	205,93,6,221,225,205,61,3,195,247,2,24,</div><div class='del'>-	237,24,235,24,233,230,64,40,2,24,227,24,</div><div class='del'>-	225,175,50,179,10,205,208,1,201,197,33,4,</div><div class='del'>-	0,57,126,35,102,111,205,51,3,193,201,62,</div><div class='del'>-	1,50,179,10,34,150,10,54,0,58,179,10,</div><div class='del'>-	183,200,62,14,211,82,62,193,211,82,62,10,</div><div class='del'>-	211,82,62,224,211,82,62,6,211,82,58,154,</div><div class='del'>-	10,211,82,62,16,211,82,62,56,211,82,62,</div><div class='del'>-	48,211,82,219,82,230,1,40,4,219,83,24,</div><div class='del'>-	242,62,14,211,82,62,33,211,82,62,1,211,</div><div class='del'>-	82,62,9,211,82,62,32,211,82,205,217,1,</div><div class='del'>-	201,14,83,205,208,1,24,23,14,83,205,208,</div><div class='del'>-	1,205,226,1,58,174,1,61,32,253,205,244,</div><div class='del'>-	1,58,174,1,61,32,253,205,226,1,58,175,</div><div class='del'>-	1,61,32,253,62,5,211,82,62,233,211,82,</div><div class='del'>-	62,128,211,82,58,176,1,61,32,253,237,163,</div><div class='del'>-	27,62,192,211,82,219,82,230,4,40,250,237,</div><div class='del'>-	163,27,122,179,32,243,219,82,230,4,40,250,</div><div class='del'>-	58,178,1,71,219,82,230,4,40,3,5,32,</div><div class='del'>-	247,219,82,230,4,40,250,205,235,1,58,177,</div><div class='del'>-	1,61,32,253,205,244,1,201,229,213,35,35,</div><div class='del'>-	126,230,128,194,145,4,43,58,154,10,119,43,</div><div class='del'>-	70,33,181,10,119,43,112,17,3,0,243,62,</div><div class='del'>-	10,211,82,219,82,230,128,202,41,4,209,225,</div><div class='del'>-	62,1,55,251,201,205,144,3,58,180,10,254,</div><div class='del'>-	255,202,127,4,205,217,1,58,178,1,71,219,</div><div class='del'>-	82,230,1,32,6,5,32,247,195,173,4,219,</div><div class='del'>-	83,71,58,154,10,184,194,173,4,58,178,1,</div><div class='del'>-	71,219,82,230,1,32,6,5,32,247,195,173,</div><div class='del'>-	4,219,83,58,178,1,71,219,82,230,1,32,</div><div class='del'>-	6,5,32,247,195,173,4,219,83,254,133,194,</div><div class='del'>-	173,4,58,179,1,24,4,58,179,1,135,61,</div><div class='del'>-	32,253,209,225,205,137,3,205,61,3,183,251,</div><div class='del'>-	201,209,225,243,62,10,211,82,219,82,230,128,</div><div class='del'>-	202,164,4,62,1,55,251,201,205,144,3,205,</div><div class='del'>-	61,3,183,251,201,209,225,62,2,55,251,201,</div><div class='del'>-	243,62,14,211,82,62,33,211,82,251,201,33,</div><div class='del'>-	4,0,57,94,35,86,33,2,0,57,126,35,</div><div class='del'>-	102,111,221,229,34,193,10,237,83,195,10,221,</div><div class='del'>-	33,171,10,205,93,6,58,185,10,50,186,10,</div><div class='del'>-	58,184,10,135,50,184,10,205,112,6,254,3,</div><div class='del'>-	56,16,58,185,10,135,60,230,15,50,185,10,</div><div class='del'>-	175,50,184,10,24,23,58,183,10,205,112,6,</div><div class='del'>-	254,3,48,13,58,185,10,203,63,50,185,10,</div><div class='del'>-	62,255,50,183,10,58,185,10,50,186,10,58,</div><div class='del'>-	183,10,135,50,183,10,62,32,50,187,10,50,</div><div class='del'>-	188,10,6,255,219,82,230,16,32,3,5,32,</div><div class='del'>-	247,205,180,4,6,40,219,82,230,16,40,3,</div><div class='del'>-	5,32,247,62,10,211,82,219,82,230,128,194,</div><div class='del'>-	46,5,219,82,230,16,40,214,237,95,71,58,</div><div class='del'>-	186,10,160,230,15,40,32,71,14,10,62,10,</div><div class='del'>-	211,82,219,82,230,128,202,119,5,205,180,4,</div><div class='del'>-	195,156,5,219,82,230,16,202,156,5,13,32,</div><div class='del'>-	229,16,225,42,193,10,237,91,195,10,205,252,</div><div class='del'>-	3,48,7,61,202,156,5,195,197,5,221,225,</div><div class='del'>-	33,0,0,201,221,33,163,10,205,93,6,58,</div><div class='del'>-	188,10,61,50,188,10,40,19,58,186,10,246,</div><div class='del'>-	1,50,186,10,58,183,10,246,1,50,183,10,</div><div class='del'>-	195,46,5,221,225,33,1,0,201,221,33,167,</div><div class='del'>-	10,205,93,6,58,184,10,246,1,50,184,10,</div><div class='del'>-	58,186,10,135,246,1,50,186,10,58,187,10,</div><div class='del'>-	61,50,187,10,194,46,5,221,225,33,2,0,</div><div class='del'>-	201,221,229,33,0,0,57,17,4,0,25,126,</div><div class='del'>-	50,154,10,230,128,50,189,10,58,189,10,183,</div><div class='del'>-	40,6,221,33,88,2,24,4,221,33,150,0,</div><div class='del'>-	58,154,10,183,40,49,60,40,46,61,33,190,</div><div class='del'>-	10,119,35,119,35,54,129,175,50,158,10,221,</div><div class='del'>-	43,221,229,225,124,181,40,42,33,190,10,17,</div><div class='del'>-	3,0,205,206,4,17,232,3,27,123,178,32,</div><div class='del'>-	251,58,158,10,183,40,224,58,154,10,71,62,</div><div class='del'>-	7,128,230,127,71,58,189,10,176,50,154,10,</div><div class='del'>-	24,166,221,225,201,183,221,52,0,192,221,52,</div><div class='del'>-	1,192,221,52,2,192,221,52,3,192,55,201,</div><div class='del'>-	6,8,14,0,31,48,1,12,16,250,121,201,</div><div class='del'>-	33,2,0,57,94,35,86,35,78,35,70,35,</div><div class='del'>-	126,35,102,105,79,120,68,103,237,176,201,33,</div><div class='del'>-	2,0,57,126,35,102,111,62,17,237,57,48,</div><div class='del'>-	125,237,57,40,124,237,57,41,62,0,237,57,</div><div class='del'>-	42,62,64,237,57,43,62,0,237,57,44,33,</div><div class='del'>-	128,2,125,237,57,46,124,237,57,47,62,145,</div><div class='del'>-	237,57,48,211,68,58,149,10,211,66,201,33,</div><div class='del'>-	2,0,57,126,35,102,111,62,33,237,57,48,</div><div class='del'>-	62,64,237,57,32,62,0,237,57,33,237,57,</div><div class='del'>-	34,125,237,57,35,124,237,57,36,62,0,237,</div><div class='del'>-	57,37,33,128,2,125,237,57,38,124,237,57,</div><div class='del'>-	39,62,97,237,57,48,211,67,58,149,10,211,</div><div class='del'>-	66,201,237,56,46,95,237,56,47,87,237,56,</div><div class='del'>-	46,111,237,56,47,103,183,237,82,32,235,33,</div><div class='del'>-	128,2,183,237,82,201,237,56,38,95,237,56,</div><div class='del'>-	39,87,237,56,38,111,237,56,39,103,183,237,</div><div class='del'>-	82,32,235,33,128,2,183,237,82,201,205,106,</div><div class='del'>-	10,221,110,6,221,102,7,126,35,110,103,195,</div><div class='del'>-	118,10,205,106,10,33,0,0,34,205,10,34,</div><div class='del'>-	198,10,34,200,10,33,143,15,34,207,10,237,</div><div class='del'>-	91,207,10,42,146,10,183,237,82,17,0,255,</div><div class='del'>-	25,34,203,10,203,124,40,6,33,0,125,34,</div><div class='del'>-	203,10,42,207,10,229,205,37,3,195,118,10,</div><div class='del'>-	205,106,10,229,42,150,10,35,35,35,229,205,</div><div class='del'>-	70,7,193,124,230,3,103,221,117,254,221,116,</div><div class='del'>-	255,237,91,152,10,35,35,35,183,237,82,32,</div><div class='del'>-	12,17,5,0,42,152,10,205,91,10,242,203,</div><div class='del'>-	7,42,150,10,229,205,37,3,195,118,10,237,</div><div class='del'>-	91,152,10,42,200,10,25,34,200,10,42,205,</div><div class='del'>-	10,25,34,205,10,237,91,203,10,33,158,253,</div><div class='del'>-	25,237,91,205,10,205,91,10,242,245,7,33,</div><div class='del'>-	0,0,34,205,10,62,1,50,197,10,205,5,</div><div class='del'>-	8,33,0,0,57,249,195,118,10,205,106,10,</div><div class='del'>-	58,197,10,183,202,118,10,237,91,198,10,42,</div><div class='del'>-	205,10,205,91,10,242,46,8,237,91,205,10,</div><div class='del'>-	33,98,2,25,237,91,198,10,205,91,10,250,</div><div class='del'>-	78,8,237,91,198,10,42,205,10,183,237,82,</div><div class='del'>-	32,7,42,200,10,125,180,40,13,237,91,205,</div><div class='del'>-	10,42,198,10,205,91,10,242,97,8,237,91,</div><div class='del'>-	207,10,42,205,10,25,229,205,37,3,175,50,</div><div class='del'>-	197,10,195,118,10,205,29,3,33,0,0,57,</div><div class='del'>-	249,195,118,10,205,106,10,58,202,10,183,40,</div><div class='del'>-	22,205,14,7,237,91,209,10,19,19,19,205,</div><div class='del'>-	91,10,242,139,8,33,1,0,195,118,10,33,</div><div class='del'>-	0,0,195,118,10,205,126,10,252,255,205,108,</div><div class='del'>-	8,125,180,194,118,10,237,91,200,10,33,0,</div><div class='del'>-	0,205,91,10,242,118,10,237,91,207,10,42,</div><div class='del'>-	198,10,25,221,117,254,221,116,255,35,35,35,</div><div class='del'>-	229,205,70,7,193,124,230,3,103,35,35,35,</div><div class='del'>-	221,117,252,221,116,253,229,221,110,254,221,102,</div><div class='del'>-	255,229,33,212,10,229,205,124,6,193,193,221,</div><div class='del'>-	110,252,221,102,253,34,209,10,33,211,10,54,</div><div class='del'>-	4,33,209,10,227,205,147,6,193,62,1,50,</div><div class='del'>-	202,10,243,221,94,252,221,86,253,42,200,10,</div><div class='del'>-	183,237,82,34,200,10,203,124,40,17,33,0,</div><div class='del'>-	0,34,200,10,34,205,10,34,198,10,50,197,</div><div class='del'>-	10,24,37,221,94,252,221,86,253,42,198,10,</div><div class='del'>-	25,34,198,10,237,91,203,10,33,158,253,25,</div><div class='del'>-	237,91,198,10,205,91,10,242,68,9,33,0,</div><div class='del'>-	0,34,198,10,205,5,8,33,0,0,57,249,</div><div class='del'>-	251,195,118,10,205,106,10,33,49,13,126,183,</div><div class='del'>-	40,16,205,42,7,237,91,47,13,19,19,19,</div><div class='del'>-	205,91,10,242,117,9,58,142,15,198,1,50,</div><div class='del'>-	142,15,195,118,10,33,49,13,126,254,1,40,</div><div class='del'>-	25,254,3,202,7,10,254,5,202,21,10,33,</div><div class='del'>-	49,13,54,0,33,47,13,229,205,207,6,195,</div><div class='del'>-	118,10,58,141,15,183,32,72,33,51,13,126,</div><div class='del'>-	50,149,10,205,86,7,33,50,13,126,230,127,</div><div class='del'>-	183,32,40,58,142,15,230,127,50,142,15,183,</div><div class='del'>-	32,5,198,1,50,142,15,33,50,13,126,111,</div><div class='del'>-	23,159,103,203,125,58,142,15,40,5,198,128,</div><div class='del'>-	50,142,15,33,50,13,119,33,50,13,126,111,</div><div class='del'>-	23,159,103,229,205,237,5,193,33,211,10,54,</div><div class='del'>-	2,33,2,0,34,209,10,58,154,10,33,212,</div><div class='del'>-	10,119,58,148,10,33,213,10,119,33,209,10,</div><div class='del'>-	229,205,147,6,193,24,128,42,47,13,229,33,</div><div class='del'>-	50,13,229,205,191,4,193,24,239,33,211,10,</div><div class='del'>-	54,6,33,3,0,34,209,10,58,154,10,33,</div><div class='del'>-	212,10,119,58,148,10,33,213,10,119,33,214,</div><div class='del'>-	10,54,5,33,209,10,229,205,147,6,24,200,</div><div class='del'>-	205,106,10,33,49,13,54,0,33,47,13,229,</div><div class='del'>-	205,207,6,33,209,10,227,205,147,6,193,205,</div><div class='del'>-	80,9,205,145,8,24,248,124,170,250,99,10,</div><div class='del'>-	237,82,201,124,230,128,237,82,60,201,225,253,</div><div class='del'>-	229,221,229,221,33,0,0,221,57,233,221,249,</div><div class='del'>-	221,225,253,225,201,233,225,253,229,221,229,221,</div><div class='del'>-	33,0,0,221,57,94,35,86,35,235,57,249,</div><div class='del'>-	235,233,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0,0,0,0,0,0,0,0,</div><div class='del'>-	0,0,0,0,0</div><div class='del'>-	} ;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c<br/>deleted file mode 100644<br/>index 51cf5eca9c7f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/ipddp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ipddp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,340 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *	ipddp.c: IP to Appletalk-IP Encapsulation driver for Linux</div><div class='del'>- *		 Appletalk-IP to IP Decapsulation driver for Linux</div><div class='del'>- *</div><div class='del'>- *	Authors:</div><div class='del'>- *      - DDP-IP Encap by: Bradford W. Johnson &lt;johns393@maroon.tc.umn.edu&gt;</div><div class='del'>- *	- DDP-IP Decap by: Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='del'>- *</div><div class='del'>- *	Derived from:</div><div class='del'>- *	- Almost all code already existed in net/appletalk/ddp.c I just</div><div class='del'>- *	  moved/reorginized it into a driver file. Original IP-over-DDP code</div><div class='del'>- *	  was done by Bradford W. Johnson &lt;johns393@maroon.tc.umn.edu&gt;</div><div class='del'>- *      - skeleton.c: A network driver outline for linux.</div><div class='del'>- *        Written 1993-94 by Donald Becker.</div><div class='del'>- *	- dummy.c: A dummy net driver. By Nick Holloway.</div><div class='del'>- *	- MacGate: A user space Daemon for Appletalk-IP Decap for</div><div class='del'>- *	  Linux by Jay Schulist &lt;jschlst@samba.org&gt;</div><div class='del'>- *</div><div class='del'>- *      Copyright 1993 United States Government as represented by the</div><div class='del'>- *      Director, National Security Agency.</div><div class='del'>- *</div><div class='del'>- *      This software may be used and distributed according to the terms</div><div class='del'>- *      of the GNU General Public License, incorporated herein by reference.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/atalk.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;net/route.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ipddp.h"		/* Our stuff */</div><div class='del'>-</div><div class='del'>-static const char version[] = KERN_INFO "ipddp.c:v0.01 8/28/97 Bradford W. Johnson &lt;johns393@maroon.tc.umn.edu&gt;\n";</div><div class='del'>-</div><div class='del'>-static struct ipddp_route *ipddp_route_list;</div><div class='del'>-static DEFINE_SPINLOCK(ipddp_route_lock);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_IPDDP_ENCAP</div><div class='del'>-static int ipddp_mode = IPDDP_ENCAP;</div><div class='del'>-#else</div><div class='del'>-static int ipddp_mode = IPDDP_DECAP;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Index to functions, as function prototypes. */</div><div class='del'>-static netdev_tx_t ipddp_xmit(struct sk_buff *skb,</div><div class='del'>-				    struct net_device *dev);</div><div class='del'>-static int ipddp_create(struct ipddp_route *new_rt);</div><div class='del'>-static int ipddp_delete(struct ipddp_route *rt);</div><div class='del'>-static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt);</div><div class='del'>-static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops ipddp_netdev_ops = {</div><div class='del'>-	.ndo_start_xmit		= ipddp_xmit,</div><div class='del'>-	.ndo_do_ioctl   	= ipddp_ioctl,</div><div class='del'>-	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct net_device * __init ipddp_init(void)</div><div class='del'>-{</div><div class='del'>-	static unsigned version_printed;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(0);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	netif_keep_dst(dev);</div><div class='del'>-	strcpy(dev-&gt;name, "ipddp%d");</div><div class='del'>-</div><div class='del'>-	if (version_printed++ == 0)</div><div class='del'>-                printk(version);</div><div class='del'>-</div><div class='del'>-	/* Initialize the device structure. */</div><div class='del'>-	dev-&gt;netdev_ops = &amp;ipddp_netdev_ops;</div><div class='del'>-</div><div class='del'>-        dev-&gt;type = ARPHRD_IPDDP;       	/* IP over DDP tunnel */</div><div class='del'>-        dev-&gt;mtu = 585;</div><div class='del'>-        dev-&gt;flags |= IFF_NOARP;</div><div class='del'>-</div><div class='del'>-        /*</div><div class='del'>-         *      The worst case header we will need is currently a</div><div class='del'>-         *      ethernet header (14 bytes) and a ddp header (sizeof ddpehdr+1)</div><div class='del'>-         *      We send over SNAP so that takes another 8 bytes.</div><div class='del'>-         */</div><div class='del'>-        dev-&gt;hard_header_len = 14+8+sizeof(struct ddpehdr)+1;</div><div class='del'>-</div><div class='del'>-	err = register_netdev(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		free_netdev(dev);</div><div class='del'>-		return ERR_PTR(err);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Let the user now what mode we are in */</div><div class='del'>-	if(ipddp_mode == IPDDP_ENCAP)</div><div class='del'>-		printk("%s: Appletalk-IP Encap. mode by Bradford W. Johnson &lt;johns393@maroon.tc.umn.edu&gt;\n", </div><div class='del'>-			dev-&gt;name);</div><div class='del'>-	if(ipddp_mode == IPDDP_DECAP)</div><div class='del'>-		printk("%s: Appletalk-IP Decap. mode by Jay Schulist &lt;jschlst@samba.org&gt;\n", </div><div class='del'>-			dev-&gt;name);</div><div class='del'>-</div><div class='del'>-        return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Transmit LLAP/ELAP frame using aarp_send_ddp.</div><div class='del'>- */</div><div class='del'>-static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-        struct rtable *rtable = skb_rtable(skb);</div><div class='del'>-        __be32 paddr = 0;</div><div class='del'>-        struct ddpehdr *ddp;</div><div class='del'>-        struct ipddp_route *rt;</div><div class='del'>-        struct atalk_addr *our_addr;</div><div class='del'>-</div><div class='del'>-	if (rtable-&gt;rt_gw_family == AF_INET)</div><div class='del'>-		paddr = rtable-&gt;rt_gw4;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;ipddp_route_lock);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-         * Find appropriate route to use, based only on IP number.</div><div class='del'>-         */</div><div class='del'>-        for(rt = ipddp_route_list; rt != NULL; rt = rt-&gt;next)</div><div class='del'>-        {</div><div class='del'>-                if(rt-&gt;ip == paddr)</div><div class='del'>-                        break;</div><div class='del'>-        }</div><div class='del'>-        if(rt == NULL) {</div><div class='del'>-		spin_unlock(&amp;ipddp_route_lock);</div><div class='del'>-                return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        our_addr = atalk_find_dev_addr(rt-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if(ipddp_mode == IPDDP_DECAP)</div><div class='del'>-		/* </div><div class='del'>-		 * Pull off the excess room that should not be there.</div><div class='del'>-		 * This is due to a hard-header problem. This is the</div><div class='del'>-		 * quick fix for now though, till it breaks.</div><div class='del'>-		 */</div><div class='del'>-		skb_pull(skb, 35-(sizeof(struct ddpehdr)+1));</div><div class='del'>-</div><div class='del'>-	/* Create the Extended DDP header */</div><div class='del'>-	ddp = (struct ddpehdr *)skb-&gt;data;</div><div class='del'>-        ddp-&gt;deh_len_hops = htons(skb-&gt;len + (1&lt;&lt;10));</div><div class='del'>-        ddp-&gt;deh_sum = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-         * For Localtalk we need aarp_send_ddp to strip the</div><div class='del'>-         * long DDP header and place a shot DDP header on it.</div><div class='del'>-         */</div><div class='del'>-        if(rt-&gt;dev-&gt;type == ARPHRD_LOCALTLK)</div><div class='del'>-        {</div><div class='del'>-                ddp-&gt;deh_dnet  = 0;   /* FIXME more hops?? */</div><div class='del'>-                ddp-&gt;deh_snet  = 0;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-        {</div><div class='del'>-                ddp-&gt;deh_dnet  = rt-&gt;at.s_net;   /* FIXME more hops?? */</div><div class='del'>-                ddp-&gt;deh_snet  = our_addr-&gt;s_net;</div><div class='del'>-        }</div><div class='del'>-        ddp-&gt;deh_dnode = rt-&gt;at.s_node;</div><div class='del'>-        ddp-&gt;deh_snode = our_addr-&gt;s_node;</div><div class='del'>-        ddp-&gt;deh_dport = 72;</div><div class='del'>-        ddp-&gt;deh_sport = 72;</div><div class='del'>-</div><div class='del'>-        *((__u8 *)(ddp+1)) = 22;        	/* ddp type = IP */</div><div class='del'>-</div><div class='del'>-        skb-&gt;protocol = htons(ETH_P_ATALK);     /* Protocol has changed */</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	aarp_send_ddp(rt-&gt;dev, skb, &amp;rt-&gt;at, NULL);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;ipddp_route_lock);</div><div class='del'>-</div><div class='del'>-        return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Create a routing entry. We first verify that the</div><div class='del'>- * record does not already exist. If it does we return -EEXIST</div><div class='del'>- */</div><div class='del'>-static int ipddp_create(struct ipddp_route *new_rt)</div><div class='del'>-{</div><div class='del'>-        struct ipddp_route *rt = kzalloc(sizeof(*rt), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-        if (rt == NULL)</div><div class='del'>-                return -ENOMEM;</div><div class='del'>-</div><div class='del'>-        rt-&gt;ip = new_rt-&gt;ip;</div><div class='del'>-        rt-&gt;at = new_rt-&gt;at;</div><div class='del'>-        rt-&gt;next = NULL;</div><div class='del'>-        if ((rt-&gt;dev = atrtr_get_dev(&amp;rt-&gt;at)) == NULL) {</div><div class='del'>-		kfree(rt);</div><div class='del'>-                return -ENETUNREACH;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ipddp_route_lock);</div><div class='del'>-	if (__ipddp_find_route(rt)) {</div><div class='del'>-		spin_unlock_bh(&amp;ipddp_route_lock);</div><div class='del'>-		kfree(rt);</div><div class='del'>-		return -EEXIST;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        rt-&gt;next = ipddp_route_list;</div><div class='del'>-        ipddp_route_list = rt;</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;ipddp_route_lock);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Delete a route, we only delete a FULL match.</div><div class='del'>- * If route does not exist we return -ENOENT.</div><div class='del'>- */</div><div class='del'>-static int ipddp_delete(struct ipddp_route *rt)</div><div class='del'>-{</div><div class='del'>-        struct ipddp_route **r = &amp;ipddp_route_list;</div><div class='del'>-        struct ipddp_route *tmp;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;ipddp_route_lock);</div><div class='del'>-        while((tmp = *r) != NULL)</div><div class='del'>-        {</div><div class='del'>-                if(tmp-&gt;ip == rt-&gt;ip &amp;&amp;</div><div class='del'>-		   tmp-&gt;at.s_net == rt-&gt;at.s_net &amp;&amp;</div><div class='del'>-		   tmp-&gt;at.s_node == rt-&gt;at.s_node)</div><div class='del'>-                {</div><div class='del'>-                        *r = tmp-&gt;next;</div><div class='del'>-			spin_unlock_bh(&amp;ipddp_route_lock);</div><div class='del'>-                        kfree(tmp);</div><div class='del'>-                        return 0;</div><div class='del'>-                }</div><div class='del'>-                r = &amp;tmp-&gt;next;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;ipddp_route_lock);</div><div class='del'>-        return -ENOENT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Find a routing entry, we only return a FULL match</div><div class='del'>- */</div><div class='del'>-static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt)</div><div class='del'>-{</div><div class='del'>-        struct ipddp_route *f;</div><div class='del'>-</div><div class='del'>-        for(f = ipddp_route_list; f != NULL; f = f-&gt;next)</div><div class='del'>-        {</div><div class='del'>-                if(f-&gt;ip == rt-&gt;ip &amp;&amp;</div><div class='del'>-		   f-&gt;at.s_net == rt-&gt;at.s_net &amp;&amp;</div><div class='del'>-		   f-&gt;at.s_node == rt-&gt;at.s_node)</div><div class='del'>-                        return f;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-        struct ipddp_route __user *rt = ifr-&gt;ifr_data;</div><div class='del'>-        struct ipddp_route rcp, rcp2, *rp;</div><div class='del'>-</div><div class='del'>-        if(!capable(CAP_NET_ADMIN))</div><div class='del'>-                return -EPERM;</div><div class='del'>-</div><div class='del'>-	if(copy_from_user(&amp;rcp, rt, sizeof(rcp)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-        switch(cmd)</div><div class='del'>-        {</div><div class='del'>-		case SIOCADDIPDDPRT:</div><div class='del'>-                        return ipddp_create(&amp;rcp);</div><div class='del'>-</div><div class='del'>-                case SIOCFINDIPDDPRT:</div><div class='del'>-			spin_lock_bh(&amp;ipddp_route_lock);</div><div class='del'>-			rp = __ipddp_find_route(&amp;rcp);</div><div class='del'>-			if (rp) {</div><div class='del'>-				memset(&amp;rcp2, 0, sizeof(rcp2));</div><div class='del'>-				rcp2.ip    = rp-&gt;ip;</div><div class='del'>-				rcp2.at    = rp-&gt;at;</div><div class='del'>-				rcp2.flags = rp-&gt;flags;</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_bh(&amp;ipddp_route_lock);</div><div class='del'>-</div><div class='del'>-			if (rp) {</div><div class='del'>-				if (copy_to_user(rt, &amp;rcp2,</div><div class='del'>-						 sizeof(struct ipddp_route)))</div><div class='del'>-					return -EFAULT;</div><div class='del'>-				return 0;</div><div class='del'>-			} else</div><div class='del'>-				return -ENOENT;</div><div class='del'>-</div><div class='del'>-                case SIOCDELIPDDPRT:</div><div class='del'>-                        return ipddp_delete(&amp;rcp);</div><div class='del'>-</div><div class='del'>-                default:</div><div class='del'>-                        return -EINVAL;</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device *dev_ipddp;</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-module_param(ipddp_mode, int, 0);</div><div class='del'>-</div><div class='del'>-static int __init ipddp_init_module(void)</div><div class='del'>-{</div><div class='del'>-	dev_ipddp = ipddp_init();</div><div class='del'>-	return PTR_ERR_OR_ZERO(dev_ipddp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ipddp_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-        struct ipddp_route *p;</div><div class='del'>-</div><div class='del'>-	unregister_netdev(dev_ipddp);</div><div class='del'>-        free_netdev(dev_ipddp);</div><div class='del'>-</div><div class='del'>-        while (ipddp_route_list) {</div><div class='del'>-                p = ipddp_route_list-&gt;next;</div><div class='del'>-                kfree(ipddp_route_list);</div><div class='del'>-                ipddp_route_list = p;</div><div class='del'>-        }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ipddp_init_module);</div><div class='del'>-module_exit(ipddp_cleanup_module);</div><div class='head'>diff --git a/drivers/net/appletalk/ipddp.h b/drivers/net/appletalk/ipddp.h<br/>deleted file mode 100644<br/>index 9a8e45a46925..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/ipddp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ipddp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/*</div><div class='del'>- *	ipddp.h: Header for IP-over-DDP driver for Linux.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __LINUX_IPDDP_H</div><div class='del'>-#define __LINUX_IPDDP_H</div><div class='del'>-</div><div class='del'>-#ifdef __KERNEL__</div><div class='del'>-</div><div class='del'>-#define SIOCADDIPDDPRT   (SIOCDEVPRIVATE)</div><div class='del'>-#define SIOCDELIPDDPRT   (SIOCDEVPRIVATE+1)</div><div class='del'>-#define SIOCFINDIPDDPRT  (SIOCDEVPRIVATE+2)</div><div class='del'>-</div><div class='del'>-struct ipddp_route</div><div class='del'>-{</div><div class='del'>-        struct net_device *dev;             /* Carrier device */</div><div class='del'>-        __be32 ip;                       /* IP address */</div><div class='del'>-        struct atalk_addr at;              /* Gateway appletalk address */</div><div class='del'>-        int flags;</div><div class='del'>-        struct ipddp_route *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IPDDP_ENCAP	1</div><div class='del'>-#define IPDDP_DECAP	2</div><div class='del'>-</div><div class='del'>-#endif	/* __KERNEL__ */</div><div class='del'>-#endif	/* __LINUX_IPDDP_H */</div><div class='head'>diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c<br/>deleted file mode 100644<br/>index 75a5a9b87c5a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/ltpc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ltpc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1277 +0,0 @@</div><div class='del'>-/***    ltpc.c -- a driver for the LocalTalk PC card.</div><div class='del'>- *</div><div class='del'>- *      Copyright (c) 1995,1996 Bradford W. Johnson &lt;johns393@maroon.tc.umn.edu&gt;</div><div class='del'>- *</div><div class='del'>- *      This software may be used and distributed according to the terms</div><div class='del'>- *      of the GNU General Public License, incorporated herein by reference.</div><div class='del'>- *</div><div class='del'>- *      This is ALPHA code at best.  It may not work for you.  It may</div><div class='del'>- *      damage your equipment.  It may damage your relations with other</div><div class='del'>- *      users of your network.  Use it at your own risk!</div><div class='del'>- *</div><div class='del'>- *      Based in part on:</div><div class='del'>- *      skeleton.c      by Donald Becker</div><div class='del'>- *      dummy.c         by Nick Holloway and Alan Cox</div><div class='del'>- *      loopback.c      by Ross Biro, Fred van Kampen, Donald Becker</div><div class='del'>- *      the netatalk source code (UMICH)</div><div class='del'>- *      lots of work on the card...</div><div class='del'>- *</div><div class='del'>- *      I do not have access to the (proprietary) SDK that goes with the card.</div><div class='del'>- *      If you do, I don't want to know about it, and you can probably write</div><div class='del'>- *      a better driver yourself anyway.  This does mean that the pieces that</div><div class='del'>- *      talk to the card are guesswork on my part, so use at your own risk!</div><div class='del'>- *</div><div class='del'>- *      This is my first try at writing Linux networking code, and is also</div><div class='del'>- *      guesswork.  Again, use at your own risk!  (Although on this part, I'd</div><div class='del'>- *      welcome suggestions)</div><div class='del'>- *</div><div class='del'>- *      This is a loadable kernel module which seems to work at my site</div><div class='del'>- *      consisting of a 1.2.13 linux box running netatalk 1.3.3, and with</div><div class='del'>- *      the kernel support from 1.3.3b2 including patches routing.patch</div><div class='del'>- *      and ddp.disappears.from.chooser.  In order to run it, you will need</div><div class='del'>- *      to patch ddp.c and aarp.c in the kernel, but only a little...</div><div class='del'>- *</div><div class='del'>- *      I'm fairly confident that while this is arguably badly written, the</div><div class='del'>- *      problems that people experience will be "higher level", that is, with</div><div class='del'>- *      complications in the netatalk code.  The driver itself doesn't do</div><div class='del'>- *      anything terribly complicated -- it pretends to be an ether device</div><div class='del'>- *      as far as netatalk is concerned, strips the DDP data out of the ether</div><div class='del'>- *      frame and builds a LLAP packet to send out the card.  In the other</div><div class='del'>- *      direction, it receives LLAP frames from the card and builds a fake</div><div class='del'>- *      ether packet that it then tosses up to the networking code.  You can</div><div class='del'>- *      argue (correctly) that this is an ugly way to do things, but it</div><div class='del'>- *      requires a minimal amount of fooling with the code in ddp.c and aarp.c.</div><div class='del'>- *</div><div class='del'>- *      The card will do a lot more than is used here -- I *think* it has the</div><div class='del'>- *      layers up through ATP.  Even if you knew how that part works (which I</div><div class='del'>- *      don't) it would be a big job to carve up the kernel ddp code to insert</div><div class='del'>- *      things at a higher level, and probably a bad idea...</div><div class='del'>- *</div><div class='del'>- *      There are a number of other cards that do LocalTalk on the PC.  If</div><div class='del'>- *      nobody finds any insurmountable (at the netatalk level) problems</div><div class='del'>- *      here, this driver should encourage people to put some work into the</div><div class='del'>- *      other cards (some of which I gather are still commercially available)</div><div class='del'>- *      and also to put hooks for LocalTalk into the official ddp code.</div><div class='del'>- *</div><div class='del'>- *      I welcome comments and suggestions.  This is my first try at Linux</div><div class='del'>- *      networking stuff, and there are probably lots of things that I did</div><div class='del'>- *      suboptimally.  </div><div class='del'>- *</div><div class='del'>- ***/</div><div class='del'>-</div><div class='del'>-/***</div><div class='del'>- *</div><div class='del'>- * $Log: ltpc.c,v $</div><div class='del'>- * Revision 1.1.2.1  2000/03/01 05:35:07  jgarzik</div><div class='del'>- * at and tr cleanup</div><div class='del'>- *</div><div class='del'>- * Revision 1.8  1997/01/28 05:44:54  bradford</div><div class='del'>- * Clean up for non-module a little.</div><div class='del'>- * Hacked about a bit to clean things up - Alan Cox </div><div class='del'>- * Probably broken it from the origina 1.8</div><div class='del'>- *</div><div class='del'>-</div><div class='del'>- * 1998/11/09: David Huggins-Daines &lt;dhd@debian.org&gt;</div><div class='del'>- * Cleaned up the initialization code to use the standard autoirq methods,</div><div class='del'>-   and to probe for things in the standard order of i/o, irq, dma.  This</div><div class='del'>-   removes the "reset the reset" hack, because I couldn't figure out an</div><div class='del'>-   easy way to get the card to trigger an interrupt after it.</div><div class='del'>- * Added support for passing configuration parameters on the kernel command</div><div class='del'>-   line and through insmod</div><div class='del'>- * Changed the device name from "ltalk0" to "lt0", both to conform with the</div><div class='del'>-   other localtalk driver, and to clear up the inconsistency between the</div><div class='del'>-   module and the non-module versions of the driver :-)</div><div class='del'>- * Added a bunch of comments (I was going to make some enums for the state</div><div class='del'>-   codes and the register offsets, but I'm still not sure exactly what their</div><div class='del'>-   semantics are)</div><div class='del'>- * Don't poll anymore in interrupt-driven mode</div><div class='del'>- * It seems to work as a module now (as of 2.1.127), but I don't think</div><div class='del'>-   I'm responsible for that...</div><div class='del'>-</div><div class='del'>- *</div><div class='del'>- * Revision 1.7  1996/12/12 03:42:33  bradford</div><div class='del'>- * DMA alloc cribbed from 3c505.c.</div><div class='del'>- *</div><div class='del'>- * Revision 1.6  1996/12/12 03:18:58  bradford</div><div class='del'>- * Added virt_to_bus; works in 2.1.13.</div><div class='del'>- *</div><div class='del'>- * Revision 1.5  1996/12/12 03:13:22  root</div><div class='del'>- * xmitQel initialization -- think through better though.</div><div class='del'>- *</div><div class='del'>- * Revision 1.4  1996/06/18 14:55:55  root</div><div class='del'>- * Change names to ltpc. Tabs. Took a shot at dma alloc,</div><div class='del'>- * although more needs to be done eventually.</div><div class='del'>- *</div><div class='del'>- * Revision 1.3  1996/05/22 14:59:39  root</div><div class='del'>- * Change dev-&gt;open, dev-&gt;close to track dummy.c in 1.99.(around 7)</div><div class='del'>- *</div><div class='del'>- * Revision 1.2  1996/05/22 14:58:24  root</div><div class='del'>- * Change tabs mostly.</div><div class='del'>- *</div><div class='del'>- * Revision 1.1  1996/04/23 04:45:09  root</div><div class='del'>- * Initial revision</div><div class='del'>- *</div><div class='del'>- * Revision 0.16  1996/03/05 15:59:56  root</div><div class='del'>- * Change ARPHRD_LOCALTLK definition to the "real" one.</div><div class='del'>- *</div><div class='del'>- * Revision 0.15  1996/03/05 06:28:30  root</div><div class='del'>- * Changes for kernel 1.3.70.  Still need a few patches to kernel, but</div><div class='del'>- * it's getting closer.</div><div class='del'>- *</div><div class='del'>- * Revision 0.14  1996/02/25 17:38:32  root</div><div class='del'>- * More cleanups.  Removed query to card on get_stats.</div><div class='del'>- *</div><div class='del'>- * Revision 0.13  1996/02/21  16:27:40  root</div><div class='del'>- * Refix debug_print_skb.  Fix mac.raw gotcha that appeared in 1.3.65.</div><div class='del'>- * Clean up receive code a little.</div><div class='del'>- *</div><div class='del'>- * Revision 0.12  1996/02/19  16:34:53  root</div><div class='del'>- * Fix debug_print_skb.  Kludge outgoing snet to 0 when using startup</div><div class='del'>- * range.  Change debug to mask: 1 for verbose, 2 for higher level stuff</div><div class='del'>- * including packet printing, 4 for lower level (card i/o) stuff.</div><div class='del'>- *</div><div class='del'>- * Revision 0.11  1996/02/12  15:53:38  root</div><div class='del'>- * Added router sends (requires new aarp.c patch)</div><div class='del'>- *</div><div class='del'>- * Revision 0.10  1996/02/11  00:19:35  root</div><div class='del'>- * Change source LTALK_LOGGING debug switch to insmod ... debug=2.</div><div class='del'>- *</div><div class='del'>- * Revision 0.9  1996/02/10  23:59:35  root</div><div class='del'>- * Fixed those fixes for 1.2 -- DANGER!  The at.h that comes with netatalk</div><div class='del'>- * has a *different* definition of struct sockaddr_at than the Linux kernel</div><div class='del'>- * does.  This is an "insidious and invidious" bug...</div><div class='del'>- * (Actually the preceding comment is false -- it's the atalk.h in the</div><div class='del'>- * ancient atalk-0.06 that's the problem)</div><div class='del'>- *</div><div class='del'>- * Revision 0.8  1996/02/10 19:09:00  root</div><div class='del'>- * Merge 1.3 changes.  Tested OK under 1.3.60.</div><div class='del'>- *</div><div class='del'>- * Revision 0.7  1996/02/10 17:56:56  root</div><div class='del'>- * Added debug=1 parameter on insmod for debugging prints.  Tried</div><div class='del'>- * to fix timer unload on rmmod, but I don't think that's the problem.</div><div class='del'>- *</div><div class='del'>- * Revision 0.6  1995/12/31  19:01:09  root</div><div class='del'>- * Clean up rmmod, irq comments per feedback from Corin Anderson (Thanks Corey!)</div><div class='del'>- * Clean up initial probing -- sometimes the card wakes up latched in reset.</div><div class='del'>- *</div><div class='del'>- * Revision 0.5  1995/12/22  06:03:44  root</div><div class='del'>- * Added comments in front and cleaned up a bit.</div><div class='del'>- * This version sent out to people.</div><div class='del'>- *</div><div class='del'>- * Revision 0.4  1995/12/18  03:46:44  root</div><div class='del'>- * Return shortDDP to longDDP fake to 0/0.  Added command structs.</div><div class='del'>- *</div><div class='del'>- ***/</div><div class='del'>-</div><div class='del'>-/* ltpc jumpers are:</div><div class='del'>-*</div><div class='del'>-*	Interrupts -- set at most one.  If none are set, the driver uses</div><div class='del'>-*	polled mode.  Because the card was developed in the XT era, the</div><div class='del'>-*	original documentation refers to IRQ2.  Since you'll be running</div><div class='del'>-*	this on an AT (or later) class machine, that really means IRQ9.</div><div class='del'>-*</div><div class='del'>-*	SW1	IRQ 4</div><div class='del'>-*	SW2	IRQ 3</div><div class='del'>-*	SW3	IRQ 9 (2 in original card documentation only applies to XT)</div><div class='del'>-*</div><div class='del'>-*</div><div class='del'>-*	DMA -- choose DMA 1 or 3, and set both corresponding switches.</div><div class='del'>-*</div><div class='del'>-*	SW4	DMA 3</div><div class='del'>-*	SW5	DMA 1</div><div class='del'>-*	SW6	DMA 3</div><div class='del'>-*	SW7	DMA 1</div><div class='del'>-*</div><div class='del'>-*</div><div class='del'>-*	I/O address -- choose one.  </div><div class='del'>-*</div><div class='del'>-*	SW8	220 / 240</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*	To have some stuff logged, do </div><div class='del'>-*	insmod ltpc.o debug=1</div><div class='del'>-*</div><div class='del'>-*	For a whole bunch of stuff, use higher numbers.</div><div class='del'>-*</div><div class='del'>-*	The default is 0, i.e. no messages except for the probe results.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* insmod-tweakable variables */</div><div class='del'>-static int debug;</div><div class='del'>-#define DEBUG_VERBOSE 1</div><div class='del'>-#define DEBUG_UPPER 2</div><div class='del'>-#define DEBUG_LOWER 4</div><div class='del'>-</div><div class='del'>-static int io;</div><div class='del'>-static int irq;</div><div class='del'>-static int dma;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/fcntl.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/if_ltalk.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;linux/atalk.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-</div><div class='del'>-/* our stuff */</div><div class='del'>-#include "ltpc.h"</div><div class='del'>-</div><div class='del'>-static DEFINE_SPINLOCK(txqueue_lock);</div><div class='del'>-static DEFINE_SPINLOCK(mbox_lock);</div><div class='del'>-</div><div class='del'>-/* function prototypes */</div><div class='del'>-static int do_read(struct net_device *dev, void *cbuf, int cbuflen,</div><div class='del'>-	void *dbuf, int dbuflen);</div><div class='del'>-static int sendup_buffer (struct net_device *dev);</div><div class='del'>-</div><div class='del'>-/* Dma Memory related stuff, cribbed directly from 3c505.c */</div><div class='del'>-</div><div class='del'>-static unsigned long dma_mem_alloc(int size)</div><div class='del'>-{</div><div class='del'>-        int order = get_order(size);</div><div class='del'>-</div><div class='del'>-        return __get_dma_pages(GFP_KERNEL, order);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DMA data buffer, DMA command buffer */</div><div class='del'>-static unsigned char *ltdmabuf;</div><div class='del'>-static unsigned char *ltdmacbuf;</div><div class='del'>-</div><div class='del'>-/* private struct, holds our appletalk address */</div><div class='del'>-</div><div class='del'>-struct ltpc_private</div><div class='del'>-{</div><div class='del'>-	struct atalk_addr my_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* transmit queue element struct */</div><div class='del'>-</div><div class='del'>-struct xmitQel {</div><div class='del'>-	struct xmitQel *next;</div><div class='del'>-	/* command buffer */</div><div class='del'>-	unsigned char *cbuf;</div><div class='del'>-	short cbuflen;</div><div class='del'>-	/* data buffer */</div><div class='del'>-	unsigned char *dbuf;</div><div class='del'>-	short dbuflen;</div><div class='del'>-	unsigned char QWrite;	/* read or write data */</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* the transmit queue itself */</div><div class='del'>-</div><div class='del'>-static struct xmitQel *xmQhd, *xmQtl;</div><div class='del'>-</div><div class='del'>-static void enQ(struct xmitQel *qel)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	qel-&gt;next = NULL;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irqsave(&amp;txqueue_lock, flags);</div><div class='del'>-	if (xmQtl) {</div><div class='del'>-		xmQtl-&gt;next = qel;</div><div class='del'>-	} else {</div><div class='del'>-		xmQhd = qel;</div><div class='del'>-	}</div><div class='del'>-	xmQtl = qel;</div><div class='del'>-	spin_unlock_irqrestore(&amp;txqueue_lock, flags);</div><div class='del'>-</div><div class='del'>-	if (debug &amp; DEBUG_LOWER)</div><div class='del'>-		printk("enqueued a 0x%02x command\n",qel-&gt;cbuf[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct xmitQel *deQ(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-	struct xmitQel *qel=NULL;</div><div class='del'>-	</div><div class='del'>-	spin_lock_irqsave(&amp;txqueue_lock, flags);</div><div class='del'>-	if (xmQhd) {</div><div class='del'>-		qel = xmQhd;</div><div class='del'>-		xmQhd = qel-&gt;next;</div><div class='del'>-		if(!xmQhd) xmQtl = NULL;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;txqueue_lock, flags);</div><div class='del'>-</div><div class='del'>-	if ((debug &amp; DEBUG_LOWER) &amp;&amp; qel) {</div><div class='del'>-		int n;</div><div class='del'>-		printk(KERN_DEBUG "ltpc: dequeued command ");</div><div class='del'>-		n = qel-&gt;cbuflen;</div><div class='del'>-		if (n&gt;100) n=100;</div><div class='del'>-		for(i=0;i&lt;n;i++) printk("%02x ",qel-&gt;cbuf[i]);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return qel;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* and... the queue elements we'll be using */</div><div class='del'>-static struct xmitQel qels[16];</div><div class='del'>-</div><div class='del'>-/* and their corresponding mailboxes */</div><div class='del'>-static unsigned char mailbox[16];</div><div class='del'>-static unsigned char mboxinuse[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};</div><div class='del'>-</div><div class='del'>-static int wait_timeout(struct net_device *dev, int c)</div><div class='del'>-{</div><div class='del'>-	/* returns true if it stayed c */</div><div class='del'>-	/* this uses base+6, but it's ok */</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* twenty second or so total */</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;200000;i++) {</div><div class='del'>-		if ( c != inb_p(dev-&gt;base_addr+6) ) return 0;</div><div class='del'>-		udelay(100);</div><div class='del'>-	}</div><div class='del'>-	return 1; /* timed out */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get the first free mailbox */</div><div class='del'>-</div><div class='del'>-static int getmbox(void)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;mbox_lock, flags);</div><div class='del'>-	for(i=1;i&lt;16;i++) if(!mboxinuse[i]) {</div><div class='del'>-		mboxinuse[i]=1;</div><div class='del'>-		spin_unlock_irqrestore(&amp;mbox_lock, flags);</div><div class='del'>-		return i;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;mbox_lock, flags);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read a command from the card */</div><div class='del'>-static void handlefc(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* called *only* from idle, non-reentrant */</div><div class='del'>-	int dma = dev-&gt;dma;</div><div class='del'>-	int base = dev-&gt;base_addr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	flags=claim_dma_lock();</div><div class='del'>-	disable_dma(dma);</div><div class='del'>-	clear_dma_ff(dma);</div><div class='del'>-	set_dma_mode(dma,DMA_MODE_READ);</div><div class='del'>-	set_dma_addr(dma,virt_to_bus(ltdmacbuf));</div><div class='del'>-	set_dma_count(dma,50);</div><div class='del'>-	enable_dma(dma);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-	inb_p(base+3);</div><div class='del'>-	inb_p(base+2);</div><div class='del'>-</div><div class='del'>-	if ( wait_timeout(dev,0xfc) ) printk("timed out in handlefc\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* read data from the card */</div><div class='del'>-static void handlefd(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int dma = dev-&gt;dma;</div><div class='del'>-	int base = dev-&gt;base_addr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	flags=claim_dma_lock();</div><div class='del'>-	disable_dma(dma);</div><div class='del'>-	clear_dma_ff(dma);</div><div class='del'>-	set_dma_mode(dma,DMA_MODE_READ);</div><div class='del'>-	set_dma_addr(dma,virt_to_bus(ltdmabuf));</div><div class='del'>-	set_dma_count(dma,800);</div><div class='del'>-	enable_dma(dma);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-	inb_p(base+3);</div><div class='del'>-	inb_p(base+2);</div><div class='del'>-</div><div class='del'>-	if ( wait_timeout(dev,0xfd) ) printk("timed out in handlefd\n");</div><div class='del'>-	sendup_buffer(dev);</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-static void handlewrite(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* called *only* from idle, non-reentrant */</div><div class='del'>-	/* on entry, 0xfb and ltdmabuf holds data */</div><div class='del'>-	int dma = dev-&gt;dma;</div><div class='del'>-	int base = dev-&gt;base_addr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	</div><div class='del'>-	flags=claim_dma_lock();</div><div class='del'>-	disable_dma(dma);</div><div class='del'>-	clear_dma_ff(dma);</div><div class='del'>-	set_dma_mode(dma,DMA_MODE_WRITE);</div><div class='del'>-	set_dma_addr(dma,virt_to_bus(ltdmabuf));</div><div class='del'>-	set_dma_count(dma,800);</div><div class='del'>-	enable_dma(dma);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-	</div><div class='del'>-	inb_p(base+3);</div><div class='del'>-	inb_p(base+2);</div><div class='del'>-</div><div class='del'>-	if ( wait_timeout(dev,0xfb) ) {</div><div class='del'>-		flags=claim_dma_lock();</div><div class='del'>-		printk("timed out in handlewrite, dma res %d\n",</div><div class='del'>-			get_dma_residue(dev-&gt;dma) );</div><div class='del'>-		release_dma_lock(flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handleread(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* on entry, 0xfb */</div><div class='del'>-	/* on exit, ltdmabuf holds data */</div><div class='del'>-	int dma = dev-&gt;dma;</div><div class='del'>-	int base = dev-&gt;base_addr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	flags=claim_dma_lock();</div><div class='del'>-	disable_dma(dma);</div><div class='del'>-	clear_dma_ff(dma);</div><div class='del'>-	set_dma_mode(dma,DMA_MODE_READ);</div><div class='del'>-	set_dma_addr(dma,virt_to_bus(ltdmabuf));</div><div class='del'>-	set_dma_count(dma,800);</div><div class='del'>-	enable_dma(dma);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-	inb_p(base+3);</div><div class='del'>-	inb_p(base+2);</div><div class='del'>-	if ( wait_timeout(dev,0xfb) ) printk("timed out in handleread\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void handlecommand(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* on entry, 0xfa and ltdmacbuf holds command */</div><div class='del'>-	int dma = dev-&gt;dma;</div><div class='del'>-	int base = dev-&gt;base_addr;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	flags=claim_dma_lock();</div><div class='del'>-	disable_dma(dma);</div><div class='del'>-	clear_dma_ff(dma);</div><div class='del'>-	set_dma_mode(dma,DMA_MODE_WRITE);</div><div class='del'>-	set_dma_addr(dma,virt_to_bus(ltdmacbuf));</div><div class='del'>-	set_dma_count(dma,50);</div><div class='del'>-	enable_dma(dma);</div><div class='del'>-	release_dma_lock(flags);</div><div class='del'>-	inb_p(base+3);</div><div class='del'>-	inb_p(base+2);</div><div class='del'>-	if ( wait_timeout(dev,0xfa) ) printk("timed out in handlecommand\n");</div><div class='del'>-} </div><div class='del'>-</div><div class='del'>-/* ready made command for getting the result from the card */</div><div class='del'>-static unsigned char rescbuf[2] = {LT_GETRESULT,0};</div><div class='del'>-static unsigned char resdbuf[2];</div><div class='del'>-</div><div class='del'>-static int QInIdle;</div><div class='del'>-</div><div class='del'>-/* idle expects to be called with the IRQ line high -- either because of</div><div class='del'>- * an interrupt, or because the line is tri-stated</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void idle(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int state;</div><div class='del'>-	/* FIXME This is initialized to shut the warning up, but I need to</div><div class='del'>-	 * think this through again.</div><div class='del'>-	 */</div><div class='del'>-	struct xmitQel *q = NULL;</div><div class='del'>-	int oops;</div><div class='del'>-	int i;</div><div class='del'>-	int base = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;txqueue_lock, flags);</div><div class='del'>-	if(QInIdle) {</div><div class='del'>-		spin_unlock_irqrestore(&amp;txqueue_lock, flags);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	QInIdle = 1;</div><div class='del'>-	spin_unlock_irqrestore(&amp;txqueue_lock, flags);</div><div class='del'>-</div><div class='del'>-	/* this tri-states the IRQ line */</div><div class='del'>-	(void) inb_p(base+6);</div><div class='del'>-</div><div class='del'>-	oops = 100;</div><div class='del'>-</div><div class='del'>-loop:</div><div class='del'>-	if (0&gt;oops--) { </div><div class='del'>-		printk("idle: looped too many times\n");</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state = inb_p(base+6);</div><div class='del'>-	if (state != inb_p(base+6)) goto loop;</div><div class='del'>-</div><div class='del'>-	switch(state) {</div><div class='del'>-		case 0xfc:</div><div class='del'>-			/* incoming command */</div><div class='del'>-			if (debug &amp; DEBUG_LOWER) printk("idle: fc\n");</div><div class='del'>-			handlefc(dev); </div><div class='del'>-			break;</div><div class='del'>-		case 0xfd:</div><div class='del'>-			/* incoming data */</div><div class='del'>-			if(debug &amp; DEBUG_LOWER) printk("idle: fd\n");</div><div class='del'>-			handlefd(dev); </div><div class='del'>-			break;</div><div class='del'>-		case 0xf9:</div><div class='del'>-			/* result ready */</div><div class='del'>-			if (debug &amp; DEBUG_LOWER) printk("idle: f9\n");</div><div class='del'>-			if(!mboxinuse[0]) {</div><div class='del'>-				mboxinuse[0] = 1;</div><div class='del'>-				qels[0].cbuf = rescbuf;</div><div class='del'>-				qels[0].cbuflen = 2;</div><div class='del'>-				qels[0].dbuf = resdbuf;</div><div class='del'>-				qels[0].dbuflen = 2;</div><div class='del'>-				qels[0].QWrite = 0;</div><div class='del'>-				qels[0].mailbox = 0;</div><div class='del'>-				enQ(&amp;qels[0]);</div><div class='del'>-			}</div><div class='del'>-			inb_p(dev-&gt;base_addr+1);</div><div class='del'>-			inb_p(dev-&gt;base_addr+0);</div><div class='del'>-			if( wait_timeout(dev,0xf9) )</div><div class='del'>-				printk("timed out idle f9\n");</div><div class='del'>-			break;</div><div class='del'>-		case 0xf8:</div><div class='del'>-			/* ?? */</div><div class='del'>-			if (xmQhd) {</div><div class='del'>-				inb_p(dev-&gt;base_addr+1);</div><div class='del'>-				inb_p(dev-&gt;base_addr+0);</div><div class='del'>-				if(wait_timeout(dev,0xf8) )</div><div class='del'>-					printk("timed out idle f8\n");</div><div class='del'>-			} else {</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 0xfa:</div><div class='del'>-			/* waiting for command */</div><div class='del'>-			if(debug &amp; DEBUG_LOWER) printk("idle: fa\n");</div><div class='del'>-			if (xmQhd) {</div><div class='del'>-				q=deQ();</div><div class='del'>-				memcpy(ltdmacbuf,q-&gt;cbuf,q-&gt;cbuflen);</div><div class='del'>-				ltdmacbuf[1] = q-&gt;mailbox;</div><div class='del'>-				if (debug&gt;1) { </div><div class='del'>-					int n;</div><div class='del'>-					printk("ltpc: sent command     ");</div><div class='del'>-					n = q-&gt;cbuflen;</div><div class='del'>-					if (n&gt;100) n=100;</div><div class='del'>-					for(i=0;i&lt;n;i++)</div><div class='del'>-						printk("%02x ",ltdmacbuf[i]);</div><div class='del'>-					printk("\n");</div><div class='del'>-				}</div><div class='del'>-				handlecommand(dev);</div><div class='del'>-					if(0xfa==inb_p(base+6)) {</div><div class='del'>-						/* we timed out, so return */</div><div class='del'>-						goto done;</div><div class='del'>-					} </div><div class='del'>-			} else {</div><div class='del'>-				/* we don't seem to have a command */</div><div class='del'>-				if (!mboxinuse[0]) {</div><div class='del'>-					mboxinuse[0] = 1;</div><div class='del'>-					qels[0].cbuf = rescbuf;</div><div class='del'>-					qels[0].cbuflen = 2;</div><div class='del'>-					qels[0].dbuf = resdbuf;</div><div class='del'>-					qels[0].dbuflen = 2;</div><div class='del'>-					qels[0].QWrite = 0;</div><div class='del'>-					qels[0].mailbox = 0;</div><div class='del'>-					enQ(&amp;qels[0]);</div><div class='del'>-				} else {</div><div class='del'>-					printk("trouble: response command already queued\n");</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='del'>-			} </div><div class='del'>-			break;</div><div class='del'>-		case 0Xfb:</div><div class='del'>-			/* data transfer ready */</div><div class='del'>-			if(debug &amp; DEBUG_LOWER) printk("idle: fb\n");</div><div class='del'>-			if(q-&gt;QWrite) {</div><div class='del'>-				memcpy(ltdmabuf,q-&gt;dbuf,q-&gt;dbuflen);</div><div class='del'>-				handlewrite(dev);</div><div class='del'>-			} else {</div><div class='del'>-				handleread(dev);</div><div class='del'>-				/* non-zero mailbox numbers are for</div><div class='del'>-				   commmands, 0 is for GETRESULT</div><div class='del'>-				   requests */</div><div class='del'>-				if(q-&gt;mailbox) {</div><div class='del'>-					memcpy(q-&gt;dbuf,ltdmabuf,q-&gt;dbuflen);</div><div class='del'>-				} else { </div><div class='del'>-					/* this was a result */</div><div class='del'>-					mailbox[ 0x0f &amp; ltdmabuf[0] ] = ltdmabuf[1];</div><div class='del'>-					mboxinuse[0]=0;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	goto loop;</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	QInIdle=0;</div><div class='del'>-</div><div class='del'>-	/* now set the interrupts back as appropriate */</div><div class='del'>-	/* the first read takes it out of tri-state (but still high) */</div><div class='del'>-	/* the second resets it */</div><div class='del'>-	/* note that after this point, any read of base+6 will</div><div class='del'>-	   trigger an interrupt */</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;irq) {</div><div class='del'>-		inb_p(base+7);</div><div class='del'>-		inb_p(base+7);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int do_write(struct net_device *dev, void *cbuf, int cbuflen,</div><div class='del'>-	void *dbuf, int dbuflen)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int i = getmbox();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if(i) {</div><div class='del'>-		qels[i].cbuf = cbuf;</div><div class='del'>-		qels[i].cbuflen = cbuflen;</div><div class='del'>-		qels[i].dbuf = dbuf;</div><div class='del'>-		qels[i].dbuflen = dbuflen;</div><div class='del'>-		qels[i].QWrite = 1;</div><div class='del'>-		qels[i].mailbox = i;  /* this should be initted rather */</div><div class='del'>-		enQ(&amp;qels[i]);</div><div class='del'>-		idle(dev);</div><div class='del'>-		ret = mailbox[i];</div><div class='del'>-		mboxinuse[i]=0;</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	printk("ltpc: could not allocate mbox\n");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_read(struct net_device *dev, void *cbuf, int cbuflen,</div><div class='del'>-	void *dbuf, int dbuflen)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	int i = getmbox();</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if(i) {</div><div class='del'>-		qels[i].cbuf = cbuf;</div><div class='del'>-		qels[i].cbuflen = cbuflen;</div><div class='del'>-		qels[i].dbuf = dbuf;</div><div class='del'>-		qels[i].dbuflen = dbuflen;</div><div class='del'>-		qels[i].QWrite = 0;</div><div class='del'>-		qels[i].mailbox = i;  /* this should be initted rather */</div><div class='del'>-		enQ(&amp;qels[i]);</div><div class='del'>-		idle(dev);</div><div class='del'>-		ret = mailbox[i];</div><div class='del'>-		mboxinuse[i]=0;</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	printk("ltpc: could not allocate mbox\n");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* end of idle handlers -- what should be seen is do_read, do_write */</div><div class='del'>-</div><div class='del'>-static struct timer_list ltpc_timer;</div><div class='del'>-static struct net_device *ltpc_timer_dev;</div><div class='del'>-</div><div class='del'>-static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static int read_30 ( struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	lt_command c;</div><div class='del'>-	c.getflags.command = LT_GETFLAGS;</div><div class='del'>-	return do_read(dev, &amp;c, sizeof(c.getflags),&amp;c,0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int set_30 (struct net_device *dev,int x)</div><div class='del'>-{</div><div class='del'>-	lt_command c;</div><div class='del'>-	c.setflags.command = LT_SETFLAGS;</div><div class='del'>-	c.setflags.flags = x;</div><div class='del'>-	return do_write(dev, &amp;c, sizeof(c.setflags),&amp;c,0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* LLAP to DDP translation */</div><div class='del'>-</div><div class='del'>-static int sendup_buffer (struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* on entry, command is in ltdmacbuf, data in ltdmabuf */</div><div class='del'>-	/* called from idle, non-reentrant */</div><div class='del'>-</div><div class='del'>-	int dnode, snode, llaptype, len; </div><div class='del'>-	int sklen;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct lt_rcvlap *ltc = (struct lt_rcvlap *) ltdmacbuf;</div><div class='del'>-</div><div class='del'>-	if (ltc-&gt;command != LT_RCVLAP) {</div><div class='del'>-		printk("unknown command 0x%02x from ltpc card\n",ltc-&gt;command);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	dnode = ltc-&gt;dnode;</div><div class='del'>-	snode = ltc-&gt;snode;</div><div class='del'>-	llaptype = ltc-&gt;laptype;</div><div class='del'>-	len = ltc-&gt;length; </div><div class='del'>-</div><div class='del'>-	sklen = len;</div><div class='del'>-	if (llaptype == 1) </div><div class='del'>-		sklen += 8;  /* correct for short ddp */</div><div class='del'>-	if(sklen &gt; 800) {</div><div class='del'>-		printk(KERN_INFO "%s: nonsense length in ltpc command 0x14: 0x%08x\n",</div><div class='del'>-			dev-&gt;name,sklen);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( (llaptype==0) || (llaptype&gt;2) ) {</div><div class='del'>-		printk(KERN_INFO "%s: unknown LLAP type: %d\n",dev-&gt;name,llaptype);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(3+sklen);</div><div class='del'>-	if (skb == NULL) </div><div class='del'>-	{</div><div class='del'>-		printk("%s: dropping packet due to memory squeeze.\n",</div><div class='del'>-			dev-&gt;name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	skb-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	if (sklen &gt; len)</div><div class='del'>-		skb_reserve(skb,8);</div><div class='del'>-	skb_put(skb,len+3);</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_LOCALTALK);</div><div class='del'>-	/* add LLAP header */</div><div class='del'>-	skb-&gt;data[0] = dnode;</div><div class='del'>-	skb-&gt;data[1] = snode;</div><div class='del'>-	skb-&gt;data[2] = llaptype;</div><div class='del'>-	skb_reset_mac_header(skb);	/* save pointer to llap header */</div><div class='del'>-	skb_pull(skb,3);</div><div class='del'>-</div><div class='del'>-	/* copy ddp(s,e)hdr + contents */</div><div class='del'>-	skb_copy_to_linear_data(skb, ltdmabuf, len);</div><div class='del'>-</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_packets++;</div><div class='del'>-	dev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	/* toss it onwards */</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the handler for the board interrupt */</div><div class='del'>- </div><div class='del'>-static irqreturn_t</div><div class='del'>-ltpc_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_id;</div><div class='del'>-</div><div class='del'>-	if (dev==NULL) {</div><div class='del'>-		printk("ltpc_interrupt: unknown device.\n");</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inb_p(dev-&gt;base_addr+6);  /* disable further interrupts from board */</div><div class='del'>-</div><div class='del'>-	idle(dev); /* handle whatever is coming in */</div><div class='del'>- </div><div class='del'>-	/* idle re-enables interrupts from board */ </div><div class='del'>-</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***</div><div class='del'>- *</div><div class='del'>- *    The ioctls that the driver responds to are:</div><div class='del'>- *</div><div class='del'>- *    SIOCSIFADDR -- do probe using the passed node hint.</div><div class='del'>- *    SIOCGIFADDR -- return net, node.</div><div class='del'>- *</div><div class='del'>- *    some of this stuff should be done elsewhere.</div><div class='del'>- *</div><div class='del'>- ***/</div><div class='del'>-</div><div class='del'>-static int ltpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_at *sa = (struct sockaddr_at *) &amp;ifr-&gt;ifr_addr;</div><div class='del'>-	/* we'll keep the localtalk node address in dev-&gt;pa_addr */</div><div class='del'>-	struct ltpc_private *ltpc_priv = netdev_priv(dev);</div><div class='del'>-	struct atalk_addr *aa = &amp;ltpc_priv-&gt;my_addr;</div><div class='del'>-	struct lt_init c;</div><div class='del'>-	int ltflags;</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("ltpc_ioctl called\n");</div><div class='del'>-</div><div class='del'>-	switch(cmd) {</div><div class='del'>-		case SIOCSIFADDR:</div><div class='del'>-</div><div class='del'>-			aa-&gt;s_net  = sa-&gt;sat_addr.s_net;</div><div class='del'>-      </div><div class='del'>-			/* this does the probe and returns the node addr */</div><div class='del'>-			c.command = LT_INIT;</div><div class='del'>-			c.hint = sa-&gt;sat_addr.s_node;</div><div class='del'>-</div><div class='del'>-			aa-&gt;s_node = do_read(dev,&amp;c,sizeof(c),&amp;c,0);</div><div class='del'>-</div><div class='del'>-			/* get all llap frames raw */</div><div class='del'>-			ltflags = read_30(dev);</div><div class='del'>-			ltflags |= LT_FLAG_ALLLAP;</div><div class='del'>-			set_30 (dev,ltflags);  </div><div class='del'>-</div><div class='del'>-			dev-&gt;broadcast[0] = 0xFF;</div><div class='del'>-			dev-&gt;dev_addr[0] = aa-&gt;s_node;</div><div class='del'>-</div><div class='del'>-			dev-&gt;addr_len=1;</div><div class='del'>-   </div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		case SIOCGIFADDR:</div><div class='del'>-</div><div class='del'>-			sa-&gt;sat_addr.s_net = aa-&gt;s_net;</div><div class='del'>-			sa-&gt;sat_addr.s_node = aa-&gt;s_node;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		default: </div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* This needs to be present to keep netatalk happy. */</div><div class='del'>-	/* Actually netatalk needs fixing! */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ltpc_poll_counter;</div><div class='del'>-</div><div class='del'>-static void ltpc_poll(struct timer_list *unused)</div><div class='del'>-{</div><div class='del'>-	del_timer(&amp;ltpc_timer);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) {</div><div class='del'>-		if (!ltpc_poll_counter) {</div><div class='del'>-			ltpc_poll_counter = 50;</div><div class='del'>-			printk("ltpc poll is alive\n");</div><div class='del'>-		}</div><div class='del'>-		ltpc_poll_counter--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* poll 20 times per second */</div><div class='del'>-	idle(ltpc_timer_dev);</div><div class='del'>-	ltpc_timer.expires = jiffies + HZ/20;</div><div class='del'>-	add_timer(&amp;ltpc_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DDP to LLAP translation */</div><div class='del'>-</div><div class='del'>-static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	/* in kernel 1.3.xx, on entry skb-&gt;data points to ddp header,</div><div class='del'>-	 * and skb-&gt;len is the length of the ddp data + ddp header</div><div class='del'>-	 */</div><div class='del'>-	int i;</div><div class='del'>-	struct lt_sendlap cbuf;</div><div class='del'>-	unsigned char *hdr;</div><div class='del'>-</div><div class='del'>-	cbuf.command = LT_SENDLAP;</div><div class='del'>-	cbuf.dnode = skb-&gt;data[0];</div><div class='del'>-	cbuf.laptype = skb-&gt;data[2];</div><div class='del'>-	skb_pull(skb,3);	/* skip past LLAP header */</div><div class='del'>-	cbuf.length = skb-&gt;len;	/* this is host order */</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_UPPER) {</div><div class='del'>-		printk("command ");</div><div class='del'>-		for(i=0;i&lt;6;i++)</div><div class='del'>-			printk("%02x ",((unsigned char *)&amp;cbuf)[i]);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hdr = skb_transport_header(skb);</div><div class='del'>-	do_write(dev, &amp;cbuf, sizeof(cbuf), hdr, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_UPPER) {</div><div class='del'>-		printk("sent %d ddp bytes\n",skb-&gt;len);</div><div class='del'>-		for (i = 0; i &lt; skb-&gt;len; i++)</div><div class='del'>-			printk("%02x ", hdr[i]);</div><div class='del'>-		printk("\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.tx_packets++;</div><div class='del'>-	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialization stuff */</div><div class='del'>-  </div><div class='del'>-static int __init ltpc_probe_dma(int base, int dma)</div><div class='del'>-{</div><div class='del'>-	int want = (dma == 3) ? 2 : (dma == 1) ? 1 : 3;</div><div class='del'>-  	unsigned long timeout;</div><div class='del'>-  	unsigned long f;</div><div class='del'>-  </div><div class='del'>-  	if (want &amp; 1) {</div><div class='del'>-		if (request_dma(1,"ltpc")) {</div><div class='del'>-			want &amp;= ~1;</div><div class='del'>-		} else {</div><div class='del'>-			f=claim_dma_lock();</div><div class='del'>-			disable_dma(1);</div><div class='del'>-			clear_dma_ff(1);</div><div class='del'>-			set_dma_mode(1,DMA_MODE_WRITE);</div><div class='del'>-			set_dma_addr(1,virt_to_bus(ltdmabuf));</div><div class='del'>-			set_dma_count(1,sizeof(struct lt_mem));</div><div class='del'>-			enable_dma(1);</div><div class='del'>-			release_dma_lock(f);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (want &amp; 2) {</div><div class='del'>-		if (request_dma(3,"ltpc")) {</div><div class='del'>-			want &amp;= ~2;</div><div class='del'>-		} else {</div><div class='del'>-			f=claim_dma_lock();</div><div class='del'>-			disable_dma(3);</div><div class='del'>-			clear_dma_ff(3);</div><div class='del'>-			set_dma_mode(3,DMA_MODE_WRITE);</div><div class='del'>-			set_dma_addr(3,virt_to_bus(ltdmabuf));</div><div class='del'>-			set_dma_count(3,sizeof(struct lt_mem));</div><div class='del'>-			enable_dma(3);</div><div class='del'>-			release_dma_lock(f);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* set up request */</div><div class='del'>-</div><div class='del'>-	/* FIXME -- do timings better! */</div><div class='del'>-</div><div class='del'>-	ltdmabuf[0] = LT_READMEM;</div><div class='del'>-	ltdmabuf[1] = 1;  /* mailbox */</div><div class='del'>-	ltdmabuf[2] = 0; ltdmabuf[3] = 0;  /* address */</div><div class='del'>-	ltdmabuf[4] = 0; ltdmabuf[5] = 1;  /* read 0x0100 bytes */</div><div class='del'>-	ltdmabuf[6] = 0; /* dunno if this is necessary */</div><div class='del'>-</div><div class='del'>-	inb_p(io+1);</div><div class='del'>-	inb_p(io+0);</div><div class='del'>-	timeout = jiffies+100*HZ/100;</div><div class='del'>-	while(time_before(jiffies, timeout)) {</div><div class='del'>-		if ( 0xfa == inb_p(io+6) ) break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	inb_p(io+3);</div><div class='del'>-	inb_p(io+2);</div><div class='del'>-	while(time_before(jiffies, timeout)) {</div><div class='del'>-		if ( 0xfb == inb_p(io+6) ) break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* release the other dma channel (if we opened both of them) */</div><div class='del'>-</div><div class='del'>-	if ((want &amp; 2) &amp;&amp; (get_dma_residue(3)==sizeof(struct lt_mem))) {</div><div class='del'>-		want &amp;= ~2;</div><div class='del'>-		free_dma(3);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((want &amp; 1) &amp;&amp; (get_dma_residue(1)==sizeof(struct lt_mem))) {</div><div class='del'>-		want &amp;= ~1;</div><div class='del'>-		free_dma(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!want)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return (want &amp; 2) ? 3 : 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops ltpc_netdev = {</div><div class='del'>-	.ndo_start_xmit		= ltpc_xmit,</div><div class='del'>-	.ndo_do_ioctl		= ltpc_ioctl,</div><div class='del'>-	.ndo_set_rx_mode	= set_multicast_list,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct net_device * __init ltpc_probe(void)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	int err = -ENOMEM;</div><div class='del'>-	int x=0,y=0;</div><div class='del'>-	int autoirq;</div><div class='del'>-	unsigned long f;</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-</div><div class='del'>-	dev = alloc_ltalkdev(sizeof(struct ltpc_private));</div><div class='del'>-	if (!dev)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* probe for the I/O port address */</div><div class='del'>-	</div><div class='del'>-	if (io != 0x240 &amp;&amp; request_region(0x220,8,"ltpc")) {</div><div class='del'>-		x = inb_p(0x220+6);</div><div class='del'>-		if ( (x!=0xff) &amp;&amp; (x&gt;=0xf0) ) {</div><div class='del'>-			io = 0x220;</div><div class='del'>-			goto got_port;</div><div class='del'>-		}</div><div class='del'>-		release_region(0x220,8);</div><div class='del'>-	}</div><div class='del'>-	if (io != 0x220 &amp;&amp; request_region(0x240,8,"ltpc")) {</div><div class='del'>-		y = inb_p(0x240+6);</div><div class='del'>-		if ( (y!=0xff) &amp;&amp; (y&gt;=0xf0) ){ </div><div class='del'>-			io = 0x240;</div><div class='del'>-			goto got_port;</div><div class='del'>-		}</div><div class='del'>-		release_region(0x240,8);</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	/* give up in despair */</div><div class='del'>-	printk(KERN_ERR "LocalTalk card not found; 220 = %02x, 240 = %02x.\n", x,y);</div><div class='del'>-	err = -ENODEV;</div><div class='del'>-	goto out1;</div><div class='del'>-</div><div class='del'>- got_port:</div><div class='del'>-	/* probe for the IRQ line */</div><div class='del'>-	if (irq &lt; 2) {</div><div class='del'>-		unsigned long irq_mask;</div><div class='del'>-</div><div class='del'>-		irq_mask = probe_irq_on();</div><div class='del'>-		/* reset the interrupt line */</div><div class='del'>-		inb_p(io+7);</div><div class='del'>-		inb_p(io+7);</div><div class='del'>-		/* trigger an interrupt (I hope) */</div><div class='del'>-		inb_p(io+6);</div><div class='del'>-		mdelay(2);</div><div class='del'>-		autoirq = probe_irq_off(irq_mask);</div><div class='del'>-</div><div class='del'>-		if (autoirq == 0) {</div><div class='del'>-			printk(KERN_ERR "ltpc: probe at %#x failed to detect IRQ line.\n", io);</div><div class='del'>-		} else {</div><div class='del'>-			irq = autoirq;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* allocate a DMA buffer */</div><div class='del'>-	ltdmabuf = (unsigned char *) dma_mem_alloc(1000);</div><div class='del'>-	if (!ltdmabuf) {</div><div class='del'>-		printk(KERN_ERR "ltpc: mem alloc failed\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ltdmacbuf = &amp;ltdmabuf[800];</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) {</div><div class='del'>-		printk("ltdmabuf pointer %08lx\n",(unsigned long) ltdmabuf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* reset the card */</div><div class='del'>-</div><div class='del'>-	inb_p(io+1);</div><div class='del'>-	inb_p(io+3);</div><div class='del'>-</div><div class='del'>-	msleep(20);</div><div class='del'>-</div><div class='del'>-	inb_p(io+0);</div><div class='del'>-	inb_p(io+2);</div><div class='del'>-	inb_p(io+7); /* clear reset */</div><div class='del'>-	inb_p(io+4); </div><div class='del'>-	inb_p(io+5);</div><div class='del'>-	inb_p(io+5); /* enable dma */</div><div class='del'>-	inb_p(io+6); /* tri-state interrupt line */</div><div class='del'>-</div><div class='del'>-	ssleep(1);</div><div class='del'>-	</div><div class='del'>-	/* now, figure out which dma channel we're using, unless it's</div><div class='del'>-	   already been specified */</div><div class='del'>-	/* well, 0 is a legal DMA channel, but the LTPC card doesn't</div><div class='del'>-	   use it... */</div><div class='del'>-	dma = ltpc_probe_dma(io, dma);</div><div class='del'>-	if (!dma) {  /* no dma channel */</div><div class='del'>-		printk(KERN_ERR "No DMA channel found on ltpc card.\n");</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto out3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* print out friendly message */</div><div class='del'>-	if(irq)</div><div class='del'>-		printk(KERN_INFO "Apple/Farallon LocalTalk-PC card at %03x, IR%d, DMA%d.\n",io,irq,dma);</div><div class='del'>-	else</div><div class='del'>-		printk(KERN_INFO "Apple/Farallon LocalTalk-PC card at %03x, DMA%d.  Using polled mode.\n",io,dma);</div><div class='del'>-</div><div class='del'>-	dev-&gt;netdev_ops = &amp;ltpc_netdev;</div><div class='del'>-	dev-&gt;base_addr = io;</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	dev-&gt;dma = dma;</div><div class='del'>-</div><div class='del'>-	/* the card will want to send a result at this point */</div><div class='del'>-	/* (I think... leaving out this part makes the kernel crash,</div><div class='del'>-           so I put it back in...) */</div><div class='del'>-</div><div class='del'>-	f=claim_dma_lock();</div><div class='del'>-	disable_dma(dma);</div><div class='del'>-	clear_dma_ff(dma);</div><div class='del'>-	set_dma_mode(dma,DMA_MODE_READ);</div><div class='del'>-	set_dma_addr(dma,virt_to_bus(ltdmabuf));</div><div class='del'>-	set_dma_count(dma,0x100);</div><div class='del'>-	enable_dma(dma);</div><div class='del'>-	release_dma_lock(f);</div><div class='del'>-</div><div class='del'>-	(void) inb_p(io+3);</div><div class='del'>-	(void) inb_p(io+2);</div><div class='del'>-	timeout = jiffies+100*HZ/100;</div><div class='del'>-</div><div class='del'>-	while(time_before(jiffies, timeout)) {</div><div class='del'>-		if( 0xf9 == inb_p(io+6))</div><div class='del'>-			break;</div><div class='del'>-		schedule();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) {</div><div class='del'>-		printk("setting up timer and irq\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* grab it and don't let go :-) */</div><div class='del'>-	if (irq &amp;&amp; request_irq( irq, ltpc_interrupt, 0, "ltpc", dev) &gt;= 0)</div><div class='del'>-	{</div><div class='del'>-		(void) inb_p(io+7);  /* enable interrupts from board */</div><div class='del'>-		(void) inb_p(io+7);  /* and reset irq line */</div><div class='del'>-	} else {</div><div class='del'>-		if( irq )</div><div class='del'>-			printk(KERN_ERR "ltpc: IRQ already in use, using polled mode.\n");</div><div class='del'>-		dev-&gt;irq = 0;</div><div class='del'>-		/* polled mode -- 20 times per second */</div><div class='del'>-		/* this is really, really slow... should it poll more often? */</div><div class='del'>-		ltpc_timer_dev = dev;</div><div class='del'>-		timer_setup(&amp;ltpc_timer, ltpc_poll, 0);</div><div class='del'>-</div><div class='del'>-		ltpc_timer.expires = jiffies + HZ/20;</div><div class='del'>-		add_timer(&amp;ltpc_timer);</div><div class='del'>-	}</div><div class='del'>-	err = register_netdev(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out4;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-out4:</div><div class='del'>-	del_timer_sync(&amp;ltpc_timer);</div><div class='del'>-	if (dev-&gt;irq)</div><div class='del'>-		free_irq(dev-&gt;irq, dev);</div><div class='del'>-out3:</div><div class='del'>-	free_pages((unsigned long)ltdmabuf, get_order(1000));</div><div class='del'>-out2:</div><div class='del'>-	release_region(io, 8);</div><div class='del'>-out1:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-out:</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef MODULE</div><div class='del'>-/* handles "ltpc=io,irq,dma" kernel command lines */</div><div class='del'>-static int __init ltpc_setup(char *str)</div><div class='del'>-{</div><div class='del'>-	int ints[5];</div><div class='del'>-</div><div class='del'>-	str = get_options(str, ARRAY_SIZE(ints), ints);</div><div class='del'>-</div><div class='del'>-	if (ints[0] == 0) {</div><div class='del'>-		if (str &amp;&amp; !strncmp(str, "auto", 4)) {</div><div class='del'>-			/* do nothing :-) */</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			/* usage message */</div><div class='del'>-			printk (KERN_ERR</div><div class='del'>-				"ltpc: usage: ltpc=auto|iobase[,irq[,dma]]\n");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		io = ints[1];</div><div class='del'>-		if (ints[0] &gt; 1) {</div><div class='del'>-			irq = ints[2];</div><div class='del'>-		}</div><div class='del'>-		if (ints[0] &gt; 2) {</div><div class='del'>-			dma = ints[3];</div><div class='del'>-		}</div><div class='del'>-		/* ignore any other parameters */</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__setup("ltpc=", ltpc_setup);</div><div class='del'>-#endif /* MODULE */</div><div class='del'>-</div><div class='del'>-static struct net_device *dev_ltpc;</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-module_param_hw(io, int, ioport, 0);</div><div class='del'>-module_param_hw(irq, int, irq, 0);</div><div class='del'>-module_param_hw(dma, int, dma, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init ltpc_module_init(void)</div><div class='del'>-{</div><div class='del'>-        if(io == 0)</div><div class='del'>-		printk(KERN_NOTICE</div><div class='del'>-		       "ltpc: Autoprobing is not recommended for modules\n");</div><div class='del'>-</div><div class='del'>-	dev_ltpc = ltpc_probe();</div><div class='del'>-	return PTR_ERR_OR_ZERO(dev_ltpc);</div><div class='del'>-}</div><div class='del'>-module_init(ltpc_module_init);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void __exit ltpc_cleanup(void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("unregister_netdev\n");</div><div class='del'>-	unregister_netdev(dev_ltpc);</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;ltpc_timer);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("freeing irq\n");</div><div class='del'>-</div><div class='del'>-	if (dev_ltpc-&gt;irq)</div><div class='del'>-		free_irq(dev_ltpc-&gt;irq, dev_ltpc);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("freeing dma\n");</div><div class='del'>-</div><div class='del'>-	if (dev_ltpc-&gt;dma)</div><div class='del'>-		free_dma(dev_ltpc-&gt;dma);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("freeing ioaddr\n");</div><div class='del'>-</div><div class='del'>-	if (dev_ltpc-&gt;base_addr)</div><div class='del'>-		release_region(dev_ltpc-&gt;base_addr,8);</div><div class='del'>-</div><div class='del'>-	free_netdev(dev_ltpc);</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("free_pages\n");</div><div class='del'>-</div><div class='del'>-	free_pages( (unsigned long) ltdmabuf, get_order(1000));</div><div class='del'>-</div><div class='del'>-	if(debug &amp; DEBUG_VERBOSE) printk("returning from cleanup_module\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_exit(ltpc_cleanup);</div><div class='head'>diff --git a/drivers/net/appletalk/ltpc.h b/drivers/net/appletalk/ltpc.h<br/>deleted file mode 100644<br/>index 58cf945732a4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/appletalk/ltpc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/appletalk/ltpc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-/***   ltpc.h</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- ***/</div><div class='del'>-</div><div class='del'>-#define LT_GETRESULT  0x00</div><div class='del'>-#define LT_WRITEMEM   0x01</div><div class='del'>-#define LT_READMEM    0x02</div><div class='del'>-#define LT_GETFLAGS   0x04</div><div class='del'>-#define LT_SETFLAGS   0x05</div><div class='del'>-#define LT_INIT       0x10</div><div class='del'>-#define LT_SENDLAP    0x13</div><div class='del'>-#define LT_RCVLAP     0x14</div><div class='del'>-</div><div class='del'>-/* the flag that we care about */</div><div class='del'>-#define LT_FLAG_ALLLAP 0x04</div><div class='del'>-</div><div class='del'>-struct lt_getresult {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lt_mem {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-	unsigned short addr;	/* host order */</div><div class='del'>-	unsigned short length;	/* host order */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lt_setflags {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-	unsigned char flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lt_getflags {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lt_init {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-	unsigned char hint;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lt_sendlap {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char mailbox;</div><div class='del'>-	unsigned char dnode;</div><div class='del'>-	unsigned char laptype;</div><div class='del'>-	unsigned short length;	/* host order */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct lt_rcvlap {</div><div class='del'>-	unsigned char command;</div><div class='del'>-	unsigned char dnode;</div><div class='del'>-	unsigned char snode;</div><div class='del'>-	unsigned char laptype;</div><div class='del'>-	unsigned short length;	/* host order */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union lt_command {</div><div class='del'>-	struct lt_getresult getresult;</div><div class='del'>-	struct lt_mem mem;</div><div class='del'>-	struct lt_setflags setflags;</div><div class='del'>-	struct lt_getflags getflags;</div><div class='del'>-	struct lt_init init;</div><div class='del'>-	struct lt_sendlap sendlap;</div><div class='del'>-	struct lt_rcvlap rcvlap;</div><div class='del'>-};</div><div class='del'>-typedef union lt_command lt_command;</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/arcnet/Kconfig b/drivers/net/arcnet/Kconfig<br/>index faeb4419b205..d1d07a1d4fbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/Kconfig</a></div><div class='hunk'>@@ -4,12 +4,12 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> menuconfig ARCNET</div><div class='del'>-	depends on NETDEVICES &amp;&amp; (ISA || PCI || PCMCIA)</div><div class='add'>+	depends on NETDEVICES &amp;&amp; (ISA || PCI || PCMCIA) &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	tristate "ARCnet support"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network card of this type, say Y and check out the</div><div class='ctx'> 	  (arguably) beautiful poetry in</div><div class='del'>-	  &lt;file:Documentation/networking/arcnet.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/networking/arcnet.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  You need both this driver, and the driver for the particular ARCnet</div><div class='ctx'> 	  chipset of your card. If you don't know, then it's probably a</div><div class='hunk'>@@ -28,12 +28,12 @@ config ARCNET_1201</div><div class='ctx'> 	  arc0 device.  You need to say Y here to communicate with</div><div class='ctx'> 	  industry-standard RFC1201 implementations, like the arcether.com</div><div class='ctx'> 	  packet driver or most DOS/Windows ODI drivers.  Please read the</div><div class='del'>-	  ARCnet documentation in &lt;file:Documentation/networking/arcnet.txt&gt;</div><div class='add'>+	  ARCnet documentation in &lt;file:Documentation/networking/arcnet.rst&gt;</div><div class='ctx'> 	  for more information about using arc0.</div><div class='ctx'> </div><div class='ctx'> config ARCNET_1051</div><div class='ctx'> 	tristate "Enable old ARCNet packet format (RFC 1051)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This allows you to use RFC1051 with your ARCnet card via the virtual</div><div class='ctx'> 	  arc0s device. You only need arc0s if you want to talk to ARCnet</div><div class='ctx'> 	  software complying with the "old" standard, specifically, the DOS</div><div class='hunk'>@@ -42,7 +42,7 @@ config ARCNET_1051</div><div class='ctx'> 	  industry-standard RFC1201 implementations, like the arcether.com</div><div class='ctx'> 	  packet driver or most DOS/Windows ODI drivers. RFC1201 is included</div><div class='ctx'> 	  automatically as the arc0 device. Please read the ARCnet</div><div class='del'>-	  documentation in &lt;file:Documentation/networking/arcnet.txt&gt; for more</div><div class='add'>+	  documentation in &lt;file:Documentation/networking/arcnet.rst&gt; for more</div><div class='ctx'> 	  information about using arc0e and arc0s.</div><div class='ctx'> </div><div class='ctx'> config ARCNET_RAW</div><div class='hunk'>@@ -56,19 +56,19 @@ config ARCNET_CAP</div><div class='ctx'> 	tristate "Enable CAP mode packet interface"</div><div class='ctx'> 	help</div><div class='ctx'> 	  ARCnet "cap mode" packet encapsulation. Used to get the hardware</div><div class='del'>-          acknowledge back to userspace. After the initial protocol byte every</div><div class='del'>-          packet is stuffed with an extra 4 byte "cookie" which doesn't</div><div class='del'>-          actually appear on the network. After transmit the driver will send</div><div class='del'>-          back a packet with protocol byte 0 containing the status of the</div><div class='del'>-          transmission:</div><div class='del'>-             0=no hardware acknowledge</div><div class='del'>-             1=excessive nak</div><div class='del'>-             2=transmission accepted by the receiver hardware</div><div class='add'>+	  acknowledge back to userspace. After the initial protocol byte every</div><div class='add'>+	  packet is stuffed with an extra 4 byte "cookie" which doesn't</div><div class='add'>+	  actually appear on the network. After transmit the driver will send</div><div class='add'>+	  back a packet with protocol byte 0 containing the status of the</div><div class='add'>+	  transmission:</div><div class='add'>+	     0=no hardware acknowledge</div><div class='add'>+	     1=excessive nak</div><div class='add'>+	     2=transmission accepted by the receiver hardware</div><div class='ctx'> </div><div class='del'>-          Received packets are also stuffed with the extra 4 bytes but it will</div><div class='del'>-          be random data.</div><div class='add'>+	  Received packets are also stuffed with the extra 4 bytes but it will</div><div class='add'>+	  be random data.</div><div class='ctx'> </div><div class='del'>-          Cap only listens to protocol 1-8.</div><div class='add'>+	  Cap only listens to protocol 1-8.</div><div class='ctx'> </div><div class='ctx'> config ARCNET_COM90xx</div><div class='ctx'> 	tristate "ARCnet COM90xx (normal) chipset driver"</div><div class='hunk'>@@ -82,7 +82,7 @@ config ARCNET_COM90xx</div><div class='ctx'> </div><div class='ctx'> config ARCNET_COM90xxIO</div><div class='ctx'> 	tristate "ARCnet COM90xx (IO mapped) chipset driver"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is the chipset driver for the COM90xx cards, using them in</div><div class='ctx'> 	  IO-mapped mode instead of memory-mapped mode. This is slower than</div><div class='ctx'> 	  the normal driver. Only use it if your card doesn't support shared</div><div class='hunk'>@@ -93,7 +93,7 @@ config ARCNET_COM90xxIO</div><div class='ctx'> </div><div class='ctx'> config ARCNET_RIM_I</div><div class='ctx'> 	tristate "ARCnet COM90xx (RIM I) chipset driver"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This is yet another chipset driver for the COM90xx cards, but this</div><div class='ctx'> 	  time only using memory-mapped mode, and no IO ports at all. This</div><div class='ctx'> 	  driver is completely untested, so if you have one of these cards,</div><div class='head'>diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c<br/>index 8c651fdee039..57f1729066f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arc-rawmode.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arc-rawmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arc-rawmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/arc-rawmode.c</a></div><div class='hunk'>@@ -186,4 +186,5 @@ static void __exit arcnet_raw_exit(void)</div><div class='ctx'> module_init(arcnet_raw_init);</div><div class='ctx'> module_exit(arcnet_raw_exit);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCnet raw mode packet interface module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c<br/>index 11c5bad95226..53d10a04d1bd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arc-rimi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arc-rimi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arc-rimi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/arc-rimi.c</a></div><div class='hunk'>@@ -207,7 +207,8 @@ static int __init arcrimi_found(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get and check the station ID from offset 1 in shmem */</div><div class='del'>-	dev-&gt;dev_addr[0] = arcnet_readb(lp-&gt;mem_start, COM9026_REG_R_STATION);</div><div class='add'>+	arcnet_set_addr(dev, arcnet_readb(lp-&gt;mem_start,</div><div class='add'>+					  COM9026_REG_R_STATION));</div><div class='ctx'> </div><div class='ctx'> 	arc_printk(D_NORMAL, dev, "ARCnet RIM I: station %02Xh found at IRQ %d, ShMem %lXh (%ld*%d bytes)\n",</div><div class='ctx'> 		   dev-&gt;dev_addr[0],</div><div class='hunk'>@@ -311,6 +312,7 @@ module_param(node, int, 0);</div><div class='ctx'> module_param(io, int, 0);</div><div class='ctx'> module_param(irq, int, 0);</div><div class='ctx'> module_param_string(device, device, sizeof(device), 0);</div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM90xx RIM I chipset driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static struct net_device *my_dev;</div><div class='hunk'>@@ -324,7 +326,7 @@ static int __init arc_rimi_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (node &amp;&amp; node != 0xff)</div><div class='del'>-		dev-&gt;dev_addr[0] = node;</div><div class='add'>+		arcnet_set_addr(dev, node);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mem_start = io;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='hunk'>@@ -332,7 +334,7 @@ static int __init arc_rimi_init(void)</div><div class='ctx'> 		dev-&gt;irq = 9;</div><div class='ctx'> </div><div class='ctx'> 	if (arcrimi_probe(dev)) {</div><div class='del'>-		free_netdev(dev);</div><div class='add'>+		free_arcdev(dev);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -349,7 +351,7 @@ static void __exit arc_rimi_exit(void)</div><div class='ctx'> 	iounmap(lp-&gt;mem_start);</div><div class='ctx'> 	release_mem_region(dev-&gt;mem_start, dev-&gt;mem_end - dev-&gt;mem_start + 1);</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	free_netdev(dev);</div><div class='add'>+	free_arcdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='hunk'>@@ -363,10 +365,13 @@ static int __init arcrimi_setup(char *s)</div><div class='ctx'> 	switch (ints[0]) {</div><div class='ctx'> 	default:		/* ERROR */</div><div class='ctx'> 		pr_err("Too many arguments\n");</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 3:		/* Node ID */</div><div class='ctx'> 		node = ints[3];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:		/* IRQ */</div><div class='ctx'> 		irq = ints[2];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:		/* IO address */</div><div class='ctx'> 		io = ints[1];</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/arcnet/arcdevice.h b/drivers/net/arcnet/arcdevice.h<br/>index b0f5bc07aef5..bee60b377d7c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arcdevice.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arcdevice.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arcdevice.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/arcdevice.h</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> </div><div class='ctx'> #ifdef __KERNEL__</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * RECON_THRESHOLD is the maximum number of RECON messages to receive</div><div class='hunk'>@@ -186,6 +187,8 @@ do {									\</div><div class='ctx'> #define ARC_IS_5MBIT    1   /* card default speed is 5MBit */</div><div class='ctx'> #define ARC_CAN_10MBIT  2   /* card uses COM20022, supporting 10MBit,</div><div class='ctx'> 				 but default is 2.5MBit. */</div><div class='add'>+#define ARC_HAS_LED     4   /* card has software controlled LEDs */</div><div class='add'>+#define ARC_HAS_ROTARY  8   /* card has rotary encoder */</div><div class='ctx'> </div><div class='ctx'> /* information needed to define an encapsulation driver */</div><div class='ctx'> struct ArcProto {</div><div class='hunk'>@@ -266,7 +269,7 @@ struct arcnet_local {</div><div class='ctx'> </div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int reply_status;</div><div class='del'>-	struct tasklet_struct reply_tasklet;</div><div class='add'>+	struct work_struct reply_work;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Buffer management: an ARCnet card has 4 x 512-byte buffers, each of</div><div class='hunk'>@@ -298,6 +301,10 @@ struct arcnet_local {</div><div class='ctx'> </div><div class='ctx'> 	int excnak_pending;    /* We just got an excesive nak interrupt */</div><div class='ctx'> </div><div class='add'>+	/* RESET flag handling */</div><div class='add'>+	int reset_in_progress;</div><div class='add'>+	struct work_struct reset_work;</div><div class='add'>+</div><div class='ctx'> 	struct {</div><div class='ctx'> 		uint16_t sequence;	/* sequence number (incs with each packet) */</div><div class='ctx'> 		__be16 aborted_seq;</div><div class='hunk'>@@ -350,13 +357,20 @@ void arcnet_dump_skb(struct net_device *dev, struct sk_buff *skb, char *desc)</div><div class='ctx'> </div><div class='ctx'> void arcnet_unregister_proto(struct ArcProto *proto);</div><div class='ctx'> irqreturn_t arcnet_interrupt(int irq, void *dev_id);</div><div class='add'>+</div><div class='ctx'> struct net_device *alloc_arcdev(const char *name);</div><div class='add'>+void free_arcdev(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> int arcnet_open(struct net_device *dev);</div><div class='ctx'> int arcnet_close(struct net_device *dev);</div><div class='ctx'> netdev_tx_t arcnet_send_packet(struct sk_buff *skb,</div><div class='ctx'> 			       struct net_device *dev);</div><div class='del'>-void arcnet_timeout(struct net_device *dev);</div><div class='add'>+void arcnet_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='add'>+</div><div class='add'>+static inline void arcnet_set_addr(struct net_device *dev, u8 addr)</div><div class='add'>+{</div><div class='add'>+	dev_addr_set(dev, &amp;addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* I/O equivalents */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c<br/>index 8459115d9d4e..882972604c82 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arcnet.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/arcnet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/arcnet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/arcnet.c</a></div><div class='hunk'>@@ -54,6 +54,7 @@</div><div class='ctx'> #include &lt;linux/errqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "arcdevice.h"</div><div class='ctx'> #include "com9026.h"</div><div class='hunk'>@@ -108,6 +109,7 @@ static int go_tx(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> static int debug = ARCNET_DEBUG;</div><div class='ctx'> module_param(debug, int, 0);</div><div class='add'>+MODULE_DESCRIPTION("ARCnet core driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int __init arcnet_init(void)</div><div class='hunk'>@@ -196,13 +198,10 @@ static void arcnet_dump_packet(struct net_device *dev, int bufnum,</div><div class='ctx'> void arcnet_led_event(struct net_device *dev, enum arcnet_led_event event)</div><div class='ctx'> {</div><div class='ctx'> 	struct arcnet_local *lp = netdev_priv(dev);</div><div class='del'>-	unsigned long led_delay = 350;</div><div class='del'>-	unsigned long tx_delay = 50;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case ARCNET_LED_EVENT_RECON:</div><div class='del'>-		led_trigger_blink_oneshot(lp-&gt;recon_led_trig,</div><div class='del'>-					  &amp;led_delay, &amp;led_delay, 0);</div><div class='add'>+		led_trigger_blink_oneshot(lp-&gt;recon_led_trig, 350, 350, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ARCNET_LED_EVENT_OPEN:</div><div class='ctx'> 		led_trigger_event(lp-&gt;tx_led_trig, LED_OFF);</div><div class='hunk'>@@ -213,8 +212,7 @@ void arcnet_led_event(struct net_device *dev, enum arcnet_led_event event)</div><div class='ctx'> 		led_trigger_event(lp-&gt;recon_led_trig, LED_OFF);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ARCNET_LED_EVENT_TX:</div><div class='del'>-		led_trigger_blink_oneshot(lp-&gt;tx_led_trig,</div><div class='del'>-					  &amp;tx_delay, &amp;tx_delay, 0);</div><div class='add'>+		led_trigger_blink_oneshot(lp-&gt;tx_led_trig, 50, 50, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -384,18 +382,52 @@ static void arcdev_setup(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void arcnet_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct arcnet_local *lp = from_timer(lp, t, timer);</div><div class='add'>+	struct arcnet_local *lp = timer_container_of(lp, t, timer);</div><div class='ctx'> 	struct net_device *dev = lp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (!netif_carrier_ok(dev)) {</div><div class='add'>+	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!lp-&gt;reset_in_progress &amp;&amp; !netif_carrier_ok(dev)) {</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='ctx'> 		netdev_info(dev, "link up\n");</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void arcnet_reply_tasklet(unsigned long data)</div><div class='add'>+static void reset_device_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct arcnet_local *lp = (struct arcnet_local *)data;</div><div class='add'>+	struct arcnet_local *lp;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	lp = container_of(work, struct arcnet_local, reset_work);</div><div class='add'>+	dev = lp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Do not bring the network interface back up if an ifdown</div><div class='add'>+	 * was already done.</div><div class='add'>+	 */</div><div class='add'>+	if (!netif_running(dev) || !lp-&gt;reset_in_progress)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	/* Do another check, in case of an ifdown that was triggered in</div><div class='add'>+	 * the small race window between the exit condition above and</div><div class='add'>+	 * acquiring RTNL.</div><div class='add'>+	 */</div><div class='add'>+	if (!netif_running(dev) || !lp-&gt;reset_in_progress)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dev_close(dev);</div><div class='add'>+	dev_open(dev, NULL);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void arcnet_reply_work(struct work_struct *t)</div><div class='add'>+{</div><div class='add'>+	struct arcnet_local *lp = from_work(lp, t, reply_work);</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *ackskb, *skb;</div><div class='ctx'> 	struct sock_exterr_skb *serr;</div><div class='hunk'>@@ -434,7 +466,7 @@ static void arcnet_reply_tasklet(unsigned long data)</div><div class='ctx'> </div><div class='ctx'> 	ret = sock_queue_err_skb(sk, ackskb);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		kfree_skb(ackskb);</div><div class='add'>+		dev_kfree_skb_irq(ackskb);</div><div class='ctx'> </div><div class='ctx'> 	local_irq_enable();</div><div class='ctx'> };</div><div class='hunk'>@@ -452,12 +484,25 @@ struct net_device *alloc_arcdev(const char *name)</div><div class='ctx'> 		lp-&gt;dev = dev;</div><div class='ctx'> 		spin_lock_init(&amp;lp-&gt;lock);</div><div class='ctx'> 		timer_setup(&amp;lp-&gt;timer, arcnet_timer, 0);</div><div class='add'>+		INIT_WORK(&amp;lp-&gt;reset_work, reset_device_work);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(alloc_arcdev);</div><div class='ctx'> </div><div class='add'>+void free_arcdev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct arcnet_local *lp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Do not cancel this at -&gt;ndo_close(), as the workqueue itself</div><div class='add'>+	 * indirectly calls the ifdown path through dev_close().</div><div class='add'>+	 */</div><div class='add'>+	cancel_work_sync(&amp;lp-&gt;reset_work);</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(free_arcdev);</div><div class='add'>+</div><div class='ctx'> /* Open/initialize the board.  This is called sometime after booting when</div><div class='ctx'>  * the 'ifconfig' program is run.</div><div class='ctx'>  *</div><div class='hunk'>@@ -483,8 +528,7 @@ int arcnet_open(struct net_device *dev)</div><div class='ctx'> 		arc_cont(D_PROTO, "\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;lp-&gt;reply_tasklet, arcnet_reply_tasklet,</div><div class='del'>-		     (unsigned long)lp);</div><div class='add'>+	INIT_WORK(&amp;lp-&gt;reply_work, arcnet_reply_work);</div><div class='ctx'> </div><div class='ctx'> 	arc_printk(D_INIT, dev, "arcnet_open: resetting card.\n");</div><div class='ctx'> </div><div class='hunk'>@@ -572,12 +616,12 @@ int arcnet_close(struct net_device *dev)</div><div class='ctx'> 	struct arcnet_local *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	arcnet_led_event(dev, ARCNET_LED_EVENT_STOP);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> </div><div class='del'>-	tasklet_kill(&amp;lp-&gt;reply_tasklet);</div><div class='add'>+	cancel_work_sync(&amp;lp-&gt;reply_work);</div><div class='ctx'> </div><div class='ctx'> 	/* flush TX and disable RX */</div><div class='ctx'> 	lp-&gt;hw.intmask(dev, 0);</div><div class='hunk'>@@ -587,6 +631,10 @@ int arcnet_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* shut down the card */</div><div class='ctx'> 	lp-&gt;hw.close(dev);</div><div class='add'>+</div><div class='add'>+	/* reset counters */</div><div class='add'>+	lp-&gt;reset_in_progress = 0;</div><div class='add'>+</div><div class='ctx'> 	module_put(lp-&gt;hw.owner);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -763,7 +811,7 @@ static int go_tx(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called by the kernel when transmit times out */</div><div class='del'>-void arcnet_timeout(struct net_device *dev)</div><div class='add'>+void arcnet_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	struct arcnet_local *lp = netdev_priv(dev);</div><div class='hunk'>@@ -820,6 +868,9 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='add'>+	if (lp-&gt;reset_in_progress)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* RESET flag was enabled - if device is not running, we must</div><div class='ctx'> 	 * clear it right away (but nothing else).</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -852,11 +903,14 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		if (status &amp; RESETflag) {</div><div class='ctx'> 			arc_printk(D_NORMAL, dev, "spurious reset (status=%Xh)\n",</div><div class='ctx'> 				   status);</div><div class='del'>-			arcnet_close(dev);</div><div class='del'>-			arcnet_open(dev);</div><div class='add'>+</div><div class='add'>+			lp-&gt;reset_in_progress = 1;</div><div class='add'>+			netif_stop_queue(dev);</div><div class='add'>+			netif_carrier_off(dev);</div><div class='add'>+			schedule_work(&amp;lp-&gt;reset_work);</div><div class='ctx'> </div><div class='ctx'> 			/* get out of the interrupt handler! */</div><div class='del'>-			break;</div><div class='add'>+			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* RX is inhibited - we must have received something.</div><div class='ctx'> 		 * Prepare to receive into the next buffer.</div><div class='hunk'>@@ -931,7 +985,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)</div><div class='ctx'> 						-&gt;ack_tx(dev, ackstatus);</div><div class='ctx'> 				}</div><div class='ctx'> 				lp-&gt;reply_status = ackstatus;</div><div class='del'>-				tasklet_hi_schedule(&amp;lp-&gt;reply_tasklet);</div><div class='add'>+				queue_work(system_bh_highpri_wq, &amp;lp-&gt;reply_work);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (lp-&gt;cur_tx != -1)</div><div class='ctx'> 				release_arcbuf(dev, lp-&gt;cur_tx);</div><div class='hunk'>@@ -1052,6 +1106,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> 	lp-&gt;hw.intmask(dev, lp-&gt;intmask);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='hunk'>@@ -1063,31 +1118,34 @@ EXPORT_SYMBOL(arcnet_interrupt);</div><div class='ctx'> static void arcnet_rx(struct net_device *dev, int bufnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct arcnet_local *lp = netdev_priv(dev);</div><div class='del'>-	struct archdr pkt;</div><div class='add'>+	union {</div><div class='add'>+		struct archdr pkt;</div><div class='add'>+		char buf[512];</div><div class='add'>+	} rxdata;</div><div class='ctx'> 	struct arc_rfc1201 *soft;</div><div class='ctx'> 	int length, ofs;</div><div class='ctx'> </div><div class='del'>-	soft = &amp;pkt.soft.rfc1201;</div><div class='add'>+	soft = &amp;rxdata.pkt.soft.rfc1201;</div><div class='ctx'> </div><div class='del'>-	lp-&gt;hw.copy_from_card(dev, bufnum, 0, &amp;pkt, ARC_HDR_SIZE);</div><div class='del'>-	if (pkt.hard.offset[0]) {</div><div class='del'>-		ofs = pkt.hard.offset[0];</div><div class='add'>+	lp-&gt;hw.copy_from_card(dev, bufnum, 0, &amp;rxdata.pkt, ARC_HDR_SIZE);</div><div class='add'>+	if (rxdata.pkt.hard.offset[0]) {</div><div class='add'>+		ofs = rxdata.pkt.hard.offset[0];</div><div class='ctx'> 		length = 256 - ofs;</div><div class='ctx'> 	} else {</div><div class='del'>-		ofs = pkt.hard.offset[1];</div><div class='add'>+		ofs = rxdata.pkt.hard.offset[1];</div><div class='ctx'> 		length = 512 - ofs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get the full header, if possible */</div><div class='del'>-	if (sizeof(pkt.soft) &lt;= length) {</div><div class='del'>-		lp-&gt;hw.copy_from_card(dev, bufnum, ofs, soft, sizeof(pkt.soft));</div><div class='add'>+	if (sizeof(rxdata.pkt.soft) &lt;= length) {</div><div class='add'>+		lp-&gt;hw.copy_from_card(dev, bufnum, ofs, soft, sizeof(rxdata.pkt.soft));</div><div class='ctx'> 	} else {</div><div class='del'>-		memset(&amp;pkt.soft, 0, sizeof(pkt.soft));</div><div class='add'>+		memset(&amp;rxdata.pkt.soft, 0, sizeof(rxdata.pkt.soft));</div><div class='ctx'> 		lp-&gt;hw.copy_from_card(dev, bufnum, ofs, soft, length);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	arc_printk(D_DURING, dev, "Buffer #%d: received packet from %02Xh to %02Xh (%d+4 bytes)\n",</div><div class='del'>-		   bufnum, pkt.hard.source, pkt.hard.dest, length);</div><div class='add'>+		   bufnum, rxdata.pkt.hard.source, rxdata.pkt.hard.dest, length);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;stats.rx_packets++;</div><div class='ctx'> 	dev-&gt;stats.rx_bytes += length + ARC_HDR_SIZE;</div><div class='hunk'>@@ -1096,13 +1154,13 @@ static void arcnet_rx(struct net_device *dev, int bufnum)</div><div class='ctx'> 	if (arc_proto_map[soft-&gt;proto]-&gt;is_ip) {</div><div class='ctx'> 		if (BUGLVL(D_PROTO)) {</div><div class='ctx'> 			struct ArcProto</div><div class='del'>-			*oldp = arc_proto_map[lp-&gt;default_proto[pkt.hard.source]],</div><div class='add'>+			*oldp = arc_proto_map[lp-&gt;default_proto[rxdata.pkt.hard.source]],</div><div class='ctx'> 			*newp = arc_proto_map[soft-&gt;proto];</div><div class='ctx'> </div><div class='ctx'> 			if (oldp != newp) {</div><div class='ctx'> 				arc_printk(D_PROTO, dev,</div><div class='ctx'> 					   "got protocol %02Xh; encap for host %02Xh is now '%c' (was '%c')\n",</div><div class='del'>-					   soft-&gt;proto, pkt.hard.source,</div><div class='add'>+					   soft-&gt;proto, rxdata.pkt.hard.source,</div><div class='ctx'> 					   newp-&gt;suffix, oldp-&gt;suffix);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1111,10 +1169,10 @@ static void arcnet_rx(struct net_device *dev, int bufnum)</div><div class='ctx'> 		lp-&gt;default_proto[0] = soft-&gt;proto;</div><div class='ctx'> </div><div class='ctx'> 		/* in striking contrast, the following isn't a hack. */</div><div class='del'>-		lp-&gt;default_proto[pkt.hard.source] = soft-&gt;proto;</div><div class='add'>+		lp-&gt;default_proto[rxdata.pkt.hard.source] = soft-&gt;proto;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* call the protocol-specific receiver. */</div><div class='del'>-	arc_proto_map[soft-&gt;proto]-&gt;rx(dev, bufnum, &amp;pkt, length);</div><div class='add'>+	arc_proto_map[soft-&gt;proto]-&gt;rx(dev, bufnum, &amp;rxdata.pkt, length);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void null_rx(struct net_device *dev, int bufnum,</div><div class='head'>diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c<br/>index b780be6f41ff..7a0a79973769 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/capmode.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/capmode.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/capmode.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/capmode.c</a></div><div class='hunk'>@@ -44,7 +44,7 @@ static void rx(struct net_device *dev, int bufnum,</div><div class='ctx'> {</div><div class='ctx'> 	struct arcnet_local *lp = netdev_priv(dev);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct archdr *pkt = pkthdr;</div><div class='add'>+	struct archdr *pkt;</div><div class='ctx'> 	char *pktbuf, *pkthdrbuf;</div><div class='ctx'> 	int ofs;</div><div class='ctx'> </div><div class='hunk'>@@ -265,4 +265,5 @@ static void __exit capmode_module_exit(void)</div><div class='ctx'> module_init(capmode_module_init);</div><div class='ctx'> module_exit(capmode_module_exit);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCnet CAP mode packet interface module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c<br/>index 28510e33924f..fef2ac2852a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020-isa.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020-isa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020-isa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/com20020-isa.c</a></div><div class='hunk'>@@ -137,6 +137,7 @@ module_param(backplane, int, 0);</div><div class='ctx'> module_param(clockp, int, 0);</div><div class='ctx'> module_param(clockm, int, 0);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM20020 chipset ISA driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static struct net_device *my_dev;</div><div class='hunk'>@@ -151,7 +152,7 @@ static int __init com20020_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (node &amp;&amp; node != 0xff)</div><div class='del'>-		dev-&gt;dev_addr[0] = node;</div><div class='add'>+		arcnet_set_addr(dev, node);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;com20020_netdev_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +170,7 @@ static int __init com20020_init(void)</div><div class='ctx'> 		dev-&gt;irq = 9;</div><div class='ctx'> </div><div class='ctx'> 	if (com20020isa_probe(dev)) {</div><div class='del'>-		free_netdev(dev);</div><div class='add'>+		free_arcdev(dev);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -182,7 +183,7 @@ static void __exit com20020_exit(void)</div><div class='ctx'> 	unregister_netdev(my_dev);</div><div class='ctx'> 	free_irq(my_dev-&gt;irq, my_dev);</div><div class='ctx'> 	release_region(my_dev-&gt;base_addr, ARCNET_TOTAL_SIZE);</div><div class='del'>-	free_netdev(my_dev);</div><div class='add'>+	free_arcdev(my_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='hunk'>@@ -197,16 +198,22 @@ static int __init com20020isa_setup(char *s)</div><div class='ctx'> 	switch (ints[0]) {</div><div class='ctx'> 	default:		/* ERROR */</div><div class='ctx'> 		pr_info("Too many arguments\n");</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 6:		/* Timeout */</div><div class='ctx'> 		timeout = ints[6];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 5:		/* CKP value */</div><div class='ctx'> 		clockp = ints[5];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 4:		/* Backplane flag */</div><div class='ctx'> 		backplane = ints[4];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 3:		/* Node ID */</div><div class='ctx'> 		node = ints[3];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:		/* IRQ */</div><div class='ctx'> 		irq = ints[2];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:		/* IO address */</div><div class='ctx'> 		io = ints[1];</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c<br/>index eb7f76753c9c..0472bcdff130 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020-pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020-pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020-pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/com20020-pci.c</a></div><div class='hunk'>@@ -61,6 +61,7 @@ module_param(timeout, int, 0);</div><div class='ctx'> module_param(backplane, int, 0);</div><div class='ctx'> module_param(clockp, int, 0);</div><div class='ctx'> module_param(clockm, int, 0);</div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM20020 chipset PCI driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static void led_tx_set(struct led_classdev *led_cdev,</div><div class='hunk'>@@ -127,6 +128,8 @@ static int com20020pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	int i, ioaddr, ret;</div><div class='ctx'> 	struct resource *r;</div><div class='ctx'> </div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='ctx'> 	if (pci_enable_device(pdev))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -136,9 +139,14 @@ static int com20020pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	ci = (struct com20020_pci_card_info *)id-&gt;driver_data;</div><div class='add'>+	if (!ci)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;ci = ci;</div><div class='ctx'> 	mm = &amp;ci-&gt;misc_map;</div><div class='ctx'> </div><div class='add'>+	pci_set_drvdata(pdev, priv);</div><div class='add'>+</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;list_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (mm-&gt;size) {</div><div class='hunk'>@@ -161,7 +169,7 @@ static int com20020pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		dev = alloc_arcdev(device);</div><div class='ctx'> 		if (!dev) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='del'>-			goto out_port;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		dev-&gt;dev_port = i;</div><div class='ctx'> </div><div class='hunk'>@@ -178,7 +186,7 @@ static int com20020pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			pr_err("IO region %xh-%xh already allocated\n",</div><div class='ctx'> 			       ioaddr, ioaddr + cm-&gt;size - 1);</div><div class='ctx'> 			ret = -EBUSY;</div><div class='del'>-			goto out_port;</div><div class='add'>+			goto err_free_arcdev;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Dummy access after Reset</div><div class='hunk'>@@ -190,7 +198,7 @@ static int com20020pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 		SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 		dev-&gt;base_addr = ioaddr;</div><div class='del'>-		dev-&gt;dev_addr[0] = node;</div><div class='add'>+		arcnet_set_addr(dev, node);</div><div class='ctx'> 		dev-&gt;sysfs_groups[0] = &amp;com20020_state_group;</div><div class='ctx'> 		dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> 		lp-&gt;card_name = "PCI COM20020";</div><div class='hunk'>@@ -206,76 +214,94 @@ static int com20020pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		if (!strncmp(ci-&gt;name, "EAE PLX-PCI FB2", 15))</div><div class='ctx'> 			lp-&gt;backplane = 1;</div><div class='ctx'> </div><div class='del'>-		/* Get the dev_id from the PLX rotary coder */</div><div class='del'>-		if (!strncmp(ci-&gt;name, "EAE PLX-PCI MA1", 15))</div><div class='del'>-			dev_id_mask = 0x3;</div><div class='del'>-		dev-&gt;dev_id = (inb(priv-&gt;misc + ci-&gt;rotary) &gt;&gt; 4) &amp; dev_id_mask;</div><div class='del'>-</div><div class='del'>-		snprintf(dev-&gt;name, sizeof(dev-&gt;name), "arc%d-%d", dev-&gt;dev_id, i);</div><div class='add'>+		if (ci-&gt;flags &amp; ARC_HAS_ROTARY) {</div><div class='add'>+			/* Get the dev_id from the PLX rotary coder */</div><div class='add'>+			if (!strncmp(ci-&gt;name, "EAE PLX-PCI MA1", 15))</div><div class='add'>+				dev_id_mask = 0x3;</div><div class='add'>+			dev-&gt;dev_id = (inb(priv-&gt;misc + ci-&gt;rotary) &gt;&gt; 4) &amp; dev_id_mask;</div><div class='add'>+			snprintf(dev-&gt;name, sizeof(dev-&gt;name), "arc%d-%d", dev-&gt;dev_id, i);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (arcnet_inb(ioaddr, COM20020_REG_R_STATUS) == 0xFF) {</div><div class='ctx'> 			pr_err("IO address %Xh is empty!\n", ioaddr);</div><div class='ctx'> 			ret = -EIO;</div><div class='del'>-			goto out_port;</div><div class='add'>+			goto err_free_arcdev;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (com20020_check(dev)) {</div><div class='ctx'> 			ret = -EIO;</div><div class='del'>-			goto out_port;</div><div class='add'>+			goto err_free_arcdev;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		ret = com20020_found(dev, IRQF_SHARED);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_free_arcdev;</div><div class='add'>+</div><div class='ctx'> 		card = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(struct com20020_dev),</div><div class='ctx'> 				    GFP_KERNEL);</div><div class='ctx'> 		if (!card) {</div><div class='ctx'> 			ret = -ENOMEM;</div><div class='del'>-			goto out_port;</div><div class='add'>+			goto err_free_arcdev;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		card-&gt;index = i;</div><div class='ctx'> 		card-&gt;pci_priv = priv;</div><div class='del'>-		card-&gt;tx_led.brightness_set = led_tx_set;</div><div class='del'>-		card-&gt;tx_led.default_trigger = devm_kasprintf(&amp;pdev-&gt;dev,</div><div class='del'>-						GFP_KERNEL, "arc%d-%d-tx",</div><div class='del'>-						dev-&gt;dev_id, i);</div><div class='del'>-		card-&gt;tx_led.name = devm_kasprintf(&amp;pdev-&gt;dev, GFP_KERNEL,</div><div class='del'>-						"pci:green:tx:%d-%d",</div><div class='del'>-						dev-&gt;dev_id, i);</div><div class='del'>-</div><div class='del'>-		card-&gt;tx_led.dev = &amp;dev-&gt;dev;</div><div class='del'>-		card-&gt;recon_led.brightness_set = led_recon_set;</div><div class='del'>-		card-&gt;recon_led.default_trigger = devm_kasprintf(&amp;pdev-&gt;dev,</div><div class='del'>-						GFP_KERNEL, "arc%d-%d-recon",</div><div class='del'>-						dev-&gt;dev_id, i);</div><div class='del'>-		card-&gt;recon_led.name = devm_kasprintf(&amp;pdev-&gt;dev, GFP_KERNEL,</div><div class='del'>-						"pci:red:recon:%d-%d",</div><div class='del'>-						dev-&gt;dev_id, i);</div><div class='del'>-		card-&gt;recon_led.dev = &amp;dev-&gt;dev;</div><div class='del'>-		card-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-		ret = devm_led_classdev_register(&amp;pdev-&gt;dev, &amp;card-&gt;tx_led);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_port;</div><div class='del'>-</div><div class='del'>-		ret = devm_led_classdev_register(&amp;pdev-&gt;dev, &amp;card-&gt;recon_led);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_port;</div><div class='ctx'> </div><div class='del'>-		dev_set_drvdata(&amp;dev-&gt;dev, card);</div><div class='del'>-</div><div class='del'>-		ret = com20020_found(dev, IRQF_SHARED);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_port;</div><div class='del'>-</div><div class='del'>-		devm_arcnet_led_init(dev, dev-&gt;dev_id, i);</div><div class='add'>+		if (ci-&gt;flags &amp; ARC_HAS_LED) {</div><div class='add'>+			card-&gt;tx_led.brightness_set = led_tx_set;</div><div class='add'>+			card-&gt;tx_led.default_trigger = devm_kasprintf(&amp;pdev-&gt;dev,</div><div class='add'>+							GFP_KERNEL, "arc%d-%d-tx",</div><div class='add'>+							dev-&gt;dev_id, i);</div><div class='add'>+			if (!card-&gt;tx_led.default_trigger) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto err_free_arcdev;</div><div class='add'>+			}</div><div class='add'>+			card-&gt;tx_led.name = devm_kasprintf(&amp;pdev-&gt;dev, GFP_KERNEL,</div><div class='add'>+							"pci:green:tx:%d-%d",</div><div class='add'>+							dev-&gt;dev_id, i);</div><div class='add'>+			if (!card-&gt;tx_led.name) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto err_free_arcdev;</div><div class='add'>+			}</div><div class='add'>+			card-&gt;tx_led.dev = &amp;dev-&gt;dev;</div><div class='add'>+			card-&gt;recon_led.brightness_set = led_recon_set;</div><div class='add'>+			card-&gt;recon_led.default_trigger = devm_kasprintf(&amp;pdev-&gt;dev,</div><div class='add'>+							GFP_KERNEL, "arc%d-%d-recon",</div><div class='add'>+							dev-&gt;dev_id, i);</div><div class='add'>+			if (!card-&gt;recon_led.default_trigger) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto err_free_arcdev;</div><div class='add'>+			}</div><div class='add'>+			card-&gt;recon_led.name = devm_kasprintf(&amp;pdev-&gt;dev, GFP_KERNEL,</div><div class='add'>+							"pci:red:recon:%d-%d",</div><div class='add'>+							dev-&gt;dev_id, i);</div><div class='add'>+			if (!card-&gt;recon_led.name) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto err_free_arcdev;</div><div class='add'>+			}</div><div class='add'>+			card-&gt;recon_led.dev = &amp;dev-&gt;dev;</div><div class='add'>+</div><div class='add'>+			ret = devm_led_classdev_register(&amp;pdev-&gt;dev, &amp;card-&gt;tx_led);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_free_arcdev;</div><div class='add'>+</div><div class='add'>+			ret = devm_led_classdev_register(&amp;pdev-&gt;dev, &amp;card-&gt;recon_led);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_free_arcdev;</div><div class='add'>+</div><div class='add'>+			dev_set_drvdata(&amp;dev-&gt;dev, card);</div><div class='add'>+			devm_arcnet_led_init(dev, dev-&gt;dev_id, i);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		card-&gt;dev = dev;</div><div class='ctx'> 		list_add(&amp;card-&gt;list, &amp;priv-&gt;list_dev);</div><div class='del'>-	}</div><div class='add'>+		continue;</div><div class='ctx'> </div><div class='del'>-	pci_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-out_port:</div><div class='del'>-	com20020pci_remove(pdev);</div><div class='add'>+err_free_arcdev:</div><div class='add'>+		free_arcdev(dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (ret)</div><div class='add'>+		com20020pci_remove(pdev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +317,7 @@ static void com20020pci_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='del'>-		free_netdev(dev);</div><div class='add'>+		free_arcdev(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -322,7 +348,7 @@ static struct com20020_pci_card_info card_info_5mbit = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct com20020_pci_card_info card_info_sohard = {</div><div class='del'>-	.name = "PLX-PCI",</div><div class='add'>+	.name = "SOHARD SH ARC-PCI",</div><div class='ctx'> 	.devcount = 1,</div><div class='ctx'> 	/* SOHARD needs PCI base addr 4 */</div><div class='ctx'> 	.chan_map_tbl = {</div><div class='hunk'>@@ -357,7 +383,7 @@ static struct com20020_pci_card_info card_info_eae_arc1 = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.rotary = 0x0,</div><div class='del'>-	.flags = ARC_CAN_10MBIT,</div><div class='add'>+	.flags = ARC_HAS_ROTARY | ARC_HAS_LED | ARC_CAN_10MBIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct com20020_pci_card_info card_info_eae_ma1 = {</div><div class='hunk'>@@ -389,7 +415,7 @@ static struct com20020_pci_card_info card_info_eae_ma1 = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.rotary = 0x0,</div><div class='del'>-	.flags = ARC_CAN_10MBIT,</div><div class='add'>+	.flags = ARC_HAS_ROTARY | ARC_HAS_LED | ARC_CAN_10MBIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct com20020_pci_card_info card_info_eae_fb2 = {</div><div class='hunk'>@@ -414,7 +440,7 @@ static struct com20020_pci_card_info card_info_eae_fb2 = {</div><div class='ctx'> 		},</div><div class='ctx'> 	},</div><div class='ctx'> 	.rotary = 0x0,</div><div class='del'>-	.flags = ARC_CAN_10MBIT,</div><div class='add'>+	.flags = ARC_HAS_ROTARY | ARC_HAS_LED | ARC_CAN_10MBIT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id com20020pci_id_table[] = {</div><div class='head'>diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c<br/>index 78043a9c5981..a0053e3992a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/com20020.c</a></div><div class='hunk'>@@ -157,7 +157,7 @@ static int com20020_set_hwaddr(struct net_device *dev, void *addr)</div><div class='ctx'> 	struct arcnet_local *lp = netdev_priv(dev);</div><div class='ctx'> 	struct sockaddr *hwaddr = addr;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, hwaddr-&gt;sa_data, 1);</div><div class='add'>+	dev_addr_set(dev, hwaddr-&gt;sa_data);</div><div class='ctx'> 	com20020_set_subaddress(lp, ioaddr, SUB_NODE);</div><div class='ctx'> 	arcnet_outb(dev-&gt;dev_addr[0], ioaddr, COM20020_REG_W_XREG);</div><div class='ctx'> </div><div class='hunk'>@@ -220,7 +220,7 @@ int com20020_found(struct net_device *dev, int shared)</div><div class='ctx'> </div><div class='ctx'> 	/* FIXME: do this some other way! */</div><div class='ctx'> 	if (!dev-&gt;dev_addr[0])</div><div class='del'>-		dev-&gt;dev_addr[0] = arcnet_inb(ioaddr, 8);</div><div class='add'>+		arcnet_set_addr(dev, arcnet_inb(ioaddr, 8));</div><div class='ctx'> </div><div class='ctx'> 	com20020_set_subaddress(lp, ioaddr, SUB_SETUP1);</div><div class='ctx'> 	arcnet_outb(lp-&gt;setup, ioaddr, COM20020_REG_W_XREG);</div><div class='hunk'>@@ -399,6 +399,7 @@ EXPORT_SYMBOL(com20020_found);</div><div class='ctx'> EXPORT_SYMBOL(com20020_netdev_ops);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM20020 chipset core driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #ifdef MODULE</div><div class='head'>diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c<br/>index cf607ffcf358..75f08aa7528b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com20020_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com20020_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/com20020_cs.c</a></div><div class='hunk'>@@ -67,7 +67,7 @@ static void regdump(struct net_device *dev)</div><div class='ctx'> 	/* set up the address register */</div><div class='ctx'> 	count = 0;</div><div class='ctx'> 	arcnet_outb((count &gt;&gt; 8) | RDDATAflag | AUTOINCflag,</div><div class='del'>-		    ioaddr, com20020_REG_W_ADDR_HI);</div><div class='add'>+		    ioaddr, COM20020_REG_W_ADDR_HI);</div><div class='ctx'> 	arcnet_outb(count &amp; 0xff, ioaddr, COM20020_REG_W_ADDR_LO);</div><div class='ctx'> </div><div class='ctx'> 	for (count = 0; count &lt; 256 + 32; count++) {</div><div class='hunk'>@@ -97,6 +97,7 @@ module_param(backplane, int, 0);</div><div class='ctx'> module_param(clockp, int, 0);</div><div class='ctx'> module_param(clockm, int, 0);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM20020 chipset PCMCIA driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -113,6 +114,7 @@ static int com20020_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	struct com20020_dev *info;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct arcnet_local *lp;</div><div class='add'>+	int ret = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;p_dev-&gt;dev, "com20020_attach()\n");</div><div class='ctx'> </div><div class='hunk'>@@ -133,7 +135,7 @@ static int com20020_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	lp-&gt;hw.owner = THIS_MODULE;</div><div class='ctx'> </div><div class='ctx'> 	/* fill in our module parameters as defaults */</div><div class='del'>-	dev-&gt;dev_addr[0] = node;</div><div class='add'>+	arcnet_set_addr(dev, node);</div><div class='ctx'> </div><div class='ctx'> 	p_dev-&gt;resource[0]-&gt;flags |= IO_DATA_PATH_WIDTH_8;</div><div class='ctx'> 	p_dev-&gt;resource[0]-&gt;end = 16;</div><div class='hunk'>@@ -142,12 +144,18 @@ static int com20020_probe(struct pcmcia_device *p_dev)</div><div class='ctx'> 	info-&gt;dev = dev;</div><div class='ctx'> 	p_dev-&gt;priv = info;</div><div class='ctx'> </div><div class='del'>-	return com20020_config(p_dev);</div><div class='add'>+	ret = com20020_config(p_dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto fail_config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+fail_config:</div><div class='add'>+	free_arcdev(dev);</div><div class='ctx'> fail_alloc_dev:</div><div class='ctx'> 	kfree(info);</div><div class='ctx'> fail_alloc_info:</div><div class='del'>-	return -ENOMEM;</div><div class='add'>+	return ret;</div><div class='ctx'> } /* com20020_attach */</div><div class='ctx'> </div><div class='ctx'> static void com20020_detach(struct pcmcia_device *link)</div><div class='hunk'>@@ -177,7 +185,7 @@ static void com20020_detach(struct pcmcia_device *link)</div><div class='ctx'> 		dev = info-&gt;dev;</div><div class='ctx'> 		if (dev) {</div><div class='ctx'> 			dev_dbg(&amp;link-&gt;dev, "kfree...\n");</div><div class='del'>-			free_netdev(dev);</div><div class='add'>+			free_arcdev(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 		dev_dbg(&amp;link-&gt;dev, "kfree2...\n");</div><div class='ctx'> 		kfree(info);</div><div class='head'>diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c<br/>index 2c546013a980..3b463fbc6402 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com90io.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com90io.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com90io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/com90io.c</a></div><div class='hunk'>@@ -252,7 +252,7 @@ static int __init com90io_found(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* get and check the station ID from offset 1 in shmem */</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_addr[0] = get_buffer_byte(dev, 1);</div><div class='add'>+	arcnet_set_addr(dev, get_buffer_byte(dev, 1));</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -350,6 +350,7 @@ static char device[9];		/* use eg. device=arc1 to change name */</div><div class='ctx'> module_param_hw(io, int, ioport, 0);</div><div class='ctx'> module_param_hw(irq, int, irq, 0);</div><div class='ctx'> module_param_string(device, device, sizeof(device), 0);</div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM90xx IO mapped chipset driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #ifndef MODULE</div><div class='hunk'>@@ -363,8 +364,10 @@ static int __init com90io_setup(char *s)</div><div class='ctx'> 	switch (ints[0]) {</div><div class='ctx'> 	default:		/* ERROR */</div><div class='ctx'> 		pr_err("Too many arguments\n");</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:		/* IRQ */</div><div class='ctx'> 		irq = ints[2];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:		/* IO address */</div><div class='ctx'> 		io = ints[1];</div><div class='ctx'> 	}</div><div class='hunk'>@@ -394,7 +397,7 @@ static int __init com90io_init(void)</div><div class='ctx'> 	err = com90io_probe(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		free_netdev(dev);</div><div class='add'>+		free_arcdev(dev);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -417,7 +420,7 @@ static void __exit com90io_exit(void)</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	release_region(dev-&gt;base_addr, ARCNET_TOTAL_SIZE);</div><div class='del'>-	free_netdev(dev);</div><div class='add'>+	free_arcdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> module_init(com90io_init)</div><div class='head'>diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c<br/>index ca4a57c30bf8..b3b287c16561 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com90xx.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/com90xx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/com90xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/com90xx.c</a></div><div class='hunk'>@@ -531,7 +531,8 @@ static int __init com90xx_found(int ioaddr, int airq, u_long shmem,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* get and check the station ID from offset 1 in shmem */</div><div class='del'>-	dev-&gt;dev_addr[0] = arcnet_readb(lp-&gt;mem_start, COM9026_REG_R_STATION);</div><div class='add'>+	arcnet_set_addr(dev, arcnet_readb(lp-&gt;mem_start,</div><div class='add'>+					  COM9026_REG_R_STATION));</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = ioaddr;</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +555,7 @@ err_free_irq:</div><div class='ctx'> err_release_mem:</div><div class='ctx'> 	release_mem_region(dev-&gt;mem_start, dev-&gt;mem_end - dev-&gt;mem_start + 1);</div><div class='ctx'> err_free_dev:</div><div class='del'>-	free_netdev(dev);</div><div class='add'>+	free_arcdev(dev);</div><div class='ctx'> 	return -EIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -644,6 +645,7 @@ static void com90xx_copy_from_card(struct net_device *dev, int bufnum,</div><div class='ctx'> 	TIME(dev, "memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCnet COM90xx normal chipset driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int __init com90xx_init(void)</div><div class='hunk'>@@ -672,7 +674,7 @@ static void __exit com90xx_exit(void)</div><div class='ctx'> 		release_region(dev-&gt;base_addr, ARCNET_TOTAL_SIZE);</div><div class='ctx'> 		release_mem_region(dev-&gt;mem_start,</div><div class='ctx'> 				   dev-&gt;mem_end - dev-&gt;mem_start + 1);</div><div class='del'>-		free_netdev(dev);</div><div class='add'>+		free_arcdev(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -693,10 +695,13 @@ static int __init com90xx_setup(char *s)</div><div class='ctx'> 	switch (ints[0]) {</div><div class='ctx'> 	default:		/* ERROR */</div><div class='ctx'> 		pr_err("Too many arguments\n");</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 3:		/* Mem address */</div><div class='ctx'> 		shmem = ints[3];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:		/* IRQ */</div><div class='ctx'> 		irq = ints[2];</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:		/* IO address */</div><div class='ctx'> 		io = ints[1];</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c<br/>index a7752a5b647f..46519ca63a0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/rfc1051.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/rfc1051.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/rfc1051.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/rfc1051.c</a></div><div class='hunk'>@@ -78,6 +78,7 @@ static void __exit arcnet_rfc1051_exit(void)</div><div class='ctx'> module_init(arcnet_rfc1051_init);</div><div class='ctx'> module_exit(arcnet_rfc1051_exit);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCNet packet format (RFC 1051) module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* Determine a packet's protocol ID.</div><div class='head'>diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c<br/>index a4c856282674..0edf35d971c5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/rfc1201.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/arcnet/rfc1201.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/arcnet/rfc1201.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/arcnet/rfc1201.c</a></div><div class='hunk'>@@ -35,6 +35,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "arcdevice.h"</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("ARCNet packet format (RFC 1201) module");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);</div><div class='head'>diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c<br/>new file mode 100644<br/>index 000000000000..0df3208783ad<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bareudp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bareudp.c</a></div><div class='hunk'>@@ -0,0 +1,828 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Bareudp: UDP  tunnel encasulation for different Payload types like</div><div class='add'>+ * MPLS, NSH, IP, etc.</div><div class='add'>+ * Copyright (c) 2019 Nokia, Inc.</div><div class='add'>+ * Authors:  Martin Varghese, &lt;martin.varghese@nokia.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/hash.h&gt;</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/gro_cells.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+#include &lt;net/protocol.h&gt;</div><div class='add'>+#include &lt;net/ip6_tunnel.h&gt;</div><div class='add'>+#include &lt;net/ip_tunnels.h&gt;</div><div class='add'>+#include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/bareudp.h&gt;</div><div class='add'>+</div><div class='add'>+#define BAREUDP_BASE_HLEN sizeof(struct udphdr)</div><div class='add'>+#define BAREUDP_IPV4_HLEN (sizeof(struct iphdr) + \</div><div class='add'>+			   sizeof(struct udphdr))</div><div class='add'>+#define BAREUDP_IPV6_HLEN (sizeof(struct ipv6hdr) + \</div><div class='add'>+			   sizeof(struct udphdr))</div><div class='add'>+</div><div class='add'>+static bool log_ecn_error = true;</div><div class='add'>+module_param(log_ecn_error, bool, 0644);</div><div class='add'>+MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");</div><div class='add'>+</div><div class='add'>+/* per-network namespace private data for this module */</div><div class='add'>+</div><div class='add'>+static unsigned int bareudp_net_id;</div><div class='add'>+</div><div class='add'>+struct bareudp_net {</div><div class='add'>+	struct list_head        bareudp_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bareudp_conf {</div><div class='add'>+	__be16 ethertype;</div><div class='add'>+	__be16 port;</div><div class='add'>+	u16 sport_min;</div><div class='add'>+	bool multi_proto_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Pseudo network device */</div><div class='add'>+struct bareudp_dev {</div><div class='add'>+	struct net         *net;        /* netns for packet i/o */</div><div class='add'>+	struct net_device  *dev;        /* netdev for bareudp tunnel */</div><div class='add'>+	__be16		   ethertype;</div><div class='add'>+	__be16             port;</div><div class='add'>+	u16	           sport_min;</div><div class='add'>+	bool               multi_proto_mode;</div><div class='add'>+	struct socket      __rcu *sock;</div><div class='add'>+	struct list_head   next;        /* bareudp node  on namespace list */</div><div class='add'>+	struct gro_cells   gro_cells;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct metadata_dst *tun_dst = NULL;</div><div class='add'>+	IP_TUNNEL_DECLARE_FLAGS(key) = { };</div><div class='add'>+	struct bareudp_dev *bareudp;</div><div class='add'>+	unsigned short family;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	__be16 proto;</div><div class='add'>+	void *oiph;</div><div class='add'>+	int err;</div><div class='add'>+	int nh;</div><div class='add'>+</div><div class='add'>+	bareudp = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	if (!bareudp)</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol ==  htons(ETH_P_IP))</div><div class='add'>+		family = AF_INET;</div><div class='add'>+	else</div><div class='add'>+		family = AF_INET6;</div><div class='add'>+</div><div class='add'>+	if (bareudp-&gt;ethertype == htons(ETH_P_IP)) {</div><div class='add'>+		__u8 ipversion;</div><div class='add'>+</div><div class='add'>+		if (skb_copy_bits(skb, BAREUDP_BASE_HLEN, &amp;ipversion,</div><div class='add'>+				  sizeof(ipversion))) {</div><div class='add'>+			dev_dstats_rx_dropped(bareudp-&gt;dev);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+		ipversion &gt;&gt;= 4;</div><div class='add'>+</div><div class='add'>+		if (ipversion == 4) {</div><div class='add'>+			proto = htons(ETH_P_IP);</div><div class='add'>+		} else if (ipversion == 6 &amp;&amp; bareudp-&gt;multi_proto_mode) {</div><div class='add'>+			proto = htons(ETH_P_IPV6);</div><div class='add'>+		} else {</div><div class='add'>+			dev_dstats_rx_dropped(bareudp-&gt;dev);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+	} else if (bareudp-&gt;ethertype == htons(ETH_P_MPLS_UC)) {</div><div class='add'>+		struct iphdr *tunnel_hdr;</div><div class='add'>+</div><div class='add'>+		tunnel_hdr = (struct iphdr *)skb_network_header(skb);</div><div class='add'>+		if (tunnel_hdr-&gt;version == 4) {</div><div class='add'>+			if (!ipv4_is_multicast(tunnel_hdr-&gt;daddr)) {</div><div class='add'>+				proto = bareudp-&gt;ethertype;</div><div class='add'>+			} else if (bareudp-&gt;multi_proto_mode &amp;&amp;</div><div class='add'>+				   ipv4_is_multicast(tunnel_hdr-&gt;daddr)) {</div><div class='add'>+				proto = htons(ETH_P_MPLS_MC);</div><div class='add'>+			} else {</div><div class='add'>+				dev_dstats_rx_dropped(bareudp-&gt;dev);</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			int addr_type;</div><div class='add'>+			struct ipv6hdr *tunnel_hdr_v6;</div><div class='add'>+</div><div class='add'>+			tunnel_hdr_v6 = (struct ipv6hdr *)skb_network_header(skb);</div><div class='add'>+			addr_type =</div><div class='add'>+			ipv6_addr_type((struct in6_addr *)&amp;tunnel_hdr_v6-&gt;daddr);</div><div class='add'>+			if (!(addr_type &amp; IPV6_ADDR_MULTICAST)) {</div><div class='add'>+				proto = bareudp-&gt;ethertype;</div><div class='add'>+			} else if (bareudp-&gt;multi_proto_mode &amp;&amp;</div><div class='add'>+				   (addr_type &amp; IPV6_ADDR_MULTICAST)) {</div><div class='add'>+				proto = htons(ETH_P_MPLS_MC);</div><div class='add'>+			} else {</div><div class='add'>+				dev_dstats_rx_dropped(bareudp-&gt;dev);</div><div class='add'>+				goto drop;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		proto = bareudp-&gt;ethertype;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iptunnel_pull_header(skb, BAREUDP_BASE_HLEN,</div><div class='add'>+				 proto,</div><div class='add'>+				 !net_eq(bareudp-&gt;net,</div><div class='add'>+				 dev_net(bareudp-&gt;dev)))) {</div><div class='add'>+		dev_dstats_rx_dropped(bareudp-&gt;dev);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__set_bit(IP_TUNNEL_KEY_BIT, key);</div><div class='add'>+</div><div class='add'>+	tun_dst = udp_tun_rx_dst(skb, family, key, 0, 0);</div><div class='add'>+	if (!tun_dst) {</div><div class='add'>+		dev_dstats_rx_dropped(bareudp-&gt;dev);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+	skb_dst_set(skb, &amp;tun_dst-&gt;dst);</div><div class='add'>+	skb-&gt;dev = bareudp-&gt;dev;</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	/* Save offset of outer header relative to skb-&gt;head,</div><div class='add'>+	 * because we are going to reset the network header to the inner header</div><div class='add'>+	 * and might change skb-&gt;head.</div><div class='add'>+	 */</div><div class='add'>+	nh = skb_network_header(skb) - skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+</div><div class='add'>+	if (!pskb_inet_may_pull(skb)) {</div><div class='add'>+		DEV_STATS_INC(bareudp-&gt;dev, rx_length_errors);</div><div class='add'>+		DEV_STATS_INC(bareudp-&gt;dev, rx_errors);</div><div class='add'>+		goto drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the outer header. */</div><div class='add'>+	oiph = skb-&gt;head + nh;</div><div class='add'>+</div><div class='add'>+	if (!ipv6_mod_enabled() || family == AF_INET)</div><div class='add'>+		err = IP_ECN_decapsulate(oiph, skb);</div><div class='add'>+	else</div><div class='add'>+		err = IP6_ECN_decapsulate(oiph, skb);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		if (log_ecn_error) {</div><div class='add'>+			if  (!ipv6_mod_enabled() || family == AF_INET)</div><div class='add'>+				net_info_ratelimited("non-ECT from %pI4 "</div><div class='add'>+						     "with TOS=%#x\n",</div><div class='add'>+						     &amp;((struct iphdr *)oiph)-&gt;saddr,</div><div class='add'>+						     ((struct iphdr *)oiph)-&gt;tos);</div><div class='add'>+			else</div><div class='add'>+				net_info_ratelimited("non-ECT from %pI6\n",</div><div class='add'>+						     &amp;((struct ipv6hdr *)oiph)-&gt;saddr);</div><div class='add'>+		}</div><div class='add'>+		if (err &gt; 1) {</div><div class='add'>+			DEV_STATS_INC(bareudp-&gt;dev, rx_frame_errors);</div><div class='add'>+			DEV_STATS_INC(bareudp-&gt;dev, rx_errors);</div><div class='add'>+			goto drop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = skb-&gt;len;</div><div class='add'>+	err = gro_cells_receive(&amp;bareudp-&gt;gro_cells, skb);</div><div class='add'>+	if (likely(err == NET_RX_SUCCESS))</div><div class='add'>+		dev_dstats_rx_add(bareudp-&gt;dev, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+drop:</div><div class='add'>+	/* Consume bad packet */</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_err_lookup(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gro_cells_init(&amp;bareudp-&gt;gro_cells, dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bareudp_uninit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	gro_cells_destroy(&amp;bareudp-&gt;gro_cells);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct socket *bareudp_create_sock(struct net *net, __be16 port)</div><div class='add'>+{</div><div class='add'>+	struct udp_port_cfg udp_conf;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(&amp;udp_conf, 0, sizeof(udp_conf));</div><div class='add'>+</div><div class='add'>+	if (ipv6_mod_enabled())</div><div class='add'>+		udp_conf.family = AF_INET6;</div><div class='add'>+	else</div><div class='add'>+		udp_conf.family = AF_INET;</div><div class='add'>+</div><div class='add'>+	udp_conf.local_udp_port = port;</div><div class='add'>+	/* Open UDP socket */</div><div class='add'>+	err = udp_sock_create(net, &amp;udp_conf, &amp;sock);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+</div><div class='add'>+	udp_allow_gso(sock-&gt;sk);</div><div class='add'>+	return sock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Create new listen socket if needed */</div><div class='add'>+static int bareudp_socket_create(struct bareudp_dev *bareudp, __be16 port)</div><div class='add'>+{</div><div class='add'>+	struct udp_tunnel_sock_cfg tunnel_cfg;</div><div class='add'>+	struct socket *sock;</div><div class='add'>+</div><div class='add'>+	sock = bareudp_create_sock(bareudp-&gt;net, port);</div><div class='add'>+	if (IS_ERR(sock))</div><div class='add'>+		return PTR_ERR(sock);</div><div class='add'>+</div><div class='add'>+	/* Mark socket as an encapsulation socket */</div><div class='add'>+	memset(&amp;tunnel_cfg, 0, sizeof(tunnel_cfg));</div><div class='add'>+	tunnel_cfg.sk_user_data = bareudp;</div><div class='add'>+	tunnel_cfg.encap_type = 1;</div><div class='add'>+	tunnel_cfg.encap_rcv = bareudp_udp_encap_recv;</div><div class='add'>+	tunnel_cfg.encap_err_lookup = bareudp_err_lookup;</div><div class='add'>+	tunnel_cfg.encap_destroy = NULL;</div><div class='add'>+	setup_udp_tunnel_sock(bareudp-&gt;net, sock, &amp;tunnel_cfg);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(bareudp-&gt;sock, sock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	ret =  bareudp_socket_create(bareudp, bareudp-&gt;port);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bareudp_sock_release(struct bareudp_dev *bareudp)</div><div class='add'>+{</div><div class='add'>+	struct socket *sock;</div><div class='add'>+</div><div class='add'>+	sock = bareudp-&gt;sock;</div><div class='add'>+	rcu_assign_pointer(bareudp-&gt;sock, NULL);</div><div class='add'>+	synchronize_net();</div><div class='add'>+	udp_tunnel_sock_release(sock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	bareudp_sock_release(bareudp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			    struct bareudp_dev *bareudp,</div><div class='add'>+			    const struct ip_tunnel_info *info)</div><div class='add'>+{</div><div class='add'>+	bool udp_sum = test_bit(IP_TUNNEL_CSUM_BIT, info-&gt;key.tun_flags);</div><div class='add'>+	bool xnet = !net_eq(bareudp-&gt;net, dev_net(bareudp-&gt;dev));</div><div class='add'>+	bool use_cache = ip_tunnel_dst_cache_usable(skb, info);</div><div class='add'>+	struct socket *sock = rcu_dereference(bareudp-&gt;sock);</div><div class='add'>+	const struct ip_tunnel_key *key = &amp;info-&gt;key;</div><div class='add'>+	struct rtable *rt;</div><div class='add'>+	__be16 sport, df;</div><div class='add'>+	int min_headroom;</div><div class='add'>+	__u8 tos, ttl;</div><div class='add'>+	__be32 saddr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (skb_vlan_inet_prepare(skb, skb-&gt;protocol != htons(ETH_P_TEB)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sock)</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	sport = udp_flow_src_port(bareudp-&gt;net, skb,</div><div class='add'>+				  bareudp-&gt;sport_min, USHRT_MAX,</div><div class='add'>+				  true);</div><div class='add'>+	rt = udp_tunnel_dst_lookup(skb, dev, bareudp-&gt;net, 0, &amp;saddr, &amp;info-&gt;key,</div><div class='add'>+				   sport, bareudp-&gt;port, key-&gt;tos,</div><div class='add'>+				   use_cache ?</div><div class='add'>+				   (struct dst_cache *)&amp;info-&gt;dst_cache : NULL);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(rt))</div><div class='add'>+		return PTR_ERR(rt);</div><div class='add'>+</div><div class='add'>+	skb_tunnel_check_pmtu(skb, &amp;rt-&gt;dst,</div><div class='add'>+			      BAREUDP_IPV4_HLEN + info-&gt;options_len, false);</div><div class='add'>+</div><div class='add'>+	tos = ip_tunnel_ecn_encap(key-&gt;tos, ip_hdr(skb), skb);</div><div class='add'>+	ttl = key-&gt;ttl;</div><div class='add'>+	df = test_bit(IP_TUNNEL_DONT_FRAGMENT_BIT, key-&gt;tun_flags) ?</div><div class='add'>+	     htons(IP_DF) : 0;</div><div class='add'>+	skb_scrub_packet(skb, xnet);</div><div class='add'>+</div><div class='add'>+	err = -ENOSPC;</div><div class='add'>+	if (!skb_pull(skb, skb_network_offset(skb)))</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	min_headroom = LL_RESERVED_SPACE(rt-&gt;dst.dev) + rt-&gt;dst.header_len +</div><div class='add'>+		BAREUDP_BASE_HLEN + info-&gt;options_len + sizeof(struct iphdr);</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, min_headroom);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	err = udp_tunnel_handle_offloads(skb, udp_sum);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	skb_set_inner_protocol(skb, bareudp-&gt;ethertype);</div><div class='add'>+	udp_tunnel_xmit_skb(rt, sock-&gt;sk, skb, saddr, info-&gt;key.u.ipv4.dst,</div><div class='add'>+			    tos, ttl, df, sport, bareudp-&gt;port,</div><div class='add'>+			    !net_eq(bareudp-&gt;net, dev_net(bareudp-&gt;dev)),</div><div class='add'>+			    !test_bit(IP_TUNNEL_CSUM_BIT, info-&gt;key.tun_flags),</div><div class='add'>+			    0);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_dst:</div><div class='add'>+	dst_release(&amp;rt-&gt;dst);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+			     struct bareudp_dev *bareudp,</div><div class='add'>+			     const struct ip_tunnel_info *info)</div><div class='add'>+{</div><div class='add'>+	bool udp_sum = test_bit(IP_TUNNEL_CSUM_BIT, info-&gt;key.tun_flags);</div><div class='add'>+	bool xnet = !net_eq(bareudp-&gt;net, dev_net(bareudp-&gt;dev));</div><div class='add'>+	bool use_cache = ip_tunnel_dst_cache_usable(skb, info);</div><div class='add'>+	struct socket *sock  = rcu_dereference(bareudp-&gt;sock);</div><div class='add'>+	const struct ip_tunnel_key *key = &amp;info-&gt;key;</div><div class='add'>+	struct dst_entry *dst = NULL;</div><div class='add'>+	struct in6_addr saddr, daddr;</div><div class='add'>+	int min_headroom;</div><div class='add'>+	__u8 prio, ttl;</div><div class='add'>+	__be16 sport;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (skb_vlan_inet_prepare(skb, skb-&gt;protocol != htons(ETH_P_TEB)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sock)</div><div class='add'>+		return -ESHUTDOWN;</div><div class='add'>+</div><div class='add'>+	sport = udp_flow_src_port(bareudp-&gt;net, skb,</div><div class='add'>+				  bareudp-&gt;sport_min, USHRT_MAX,</div><div class='add'>+				  true);</div><div class='add'>+	dst = udp_tunnel6_dst_lookup(skb, dev, bareudp-&gt;net, sock, 0, &amp;saddr,</div><div class='add'>+				     key, sport, bareudp-&gt;port, key-&gt;tos,</div><div class='add'>+				     use_cache ?</div><div class='add'>+				     (struct dst_cache *) &amp;info-&gt;dst_cache : NULL);</div><div class='add'>+	if (IS_ERR(dst))</div><div class='add'>+		return PTR_ERR(dst);</div><div class='add'>+</div><div class='add'>+	skb_tunnel_check_pmtu(skb, dst, BAREUDP_IPV6_HLEN + info-&gt;options_len,</div><div class='add'>+			      false);</div><div class='add'>+</div><div class='add'>+	prio = ip_tunnel_ecn_encap(key-&gt;tos, ip_hdr(skb), skb);</div><div class='add'>+	ttl = key-&gt;ttl;</div><div class='add'>+</div><div class='add'>+	skb_scrub_packet(skb, xnet);</div><div class='add'>+</div><div class='add'>+	err = -ENOSPC;</div><div class='add'>+	if (!skb_pull(skb, skb_network_offset(skb)))</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	min_headroom = LL_RESERVED_SPACE(dst-&gt;dev) + dst-&gt;header_len +</div><div class='add'>+		BAREUDP_BASE_HLEN + info-&gt;options_len + sizeof(struct ipv6hdr);</div><div class='add'>+</div><div class='add'>+	err = skb_cow_head(skb, min_headroom);</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	err = udp_tunnel_handle_offloads(skb, udp_sum);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	daddr = info-&gt;key.u.ipv6.dst;</div><div class='add'>+	udp_tunnel6_xmit_skb(dst, sock-&gt;sk, skb, dev,</div><div class='add'>+			     &amp;saddr, &amp;daddr, prio, ttl,</div><div class='add'>+			     info-&gt;key.label, sport, bareudp-&gt;port,</div><div class='add'>+			     !test_bit(IP_TUNNEL_CSUM_BIT,</div><div class='add'>+				       info-&gt;key.tun_flags),</div><div class='add'>+			     0);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_dst:</div><div class='add'>+	dst_release(dst);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bareudp_proto_valid(struct bareudp_dev *bareudp, __be16 proto)</div><div class='add'>+{</div><div class='add'>+	if (bareudp-&gt;ethertype == proto)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!bareudp-&gt;multi_proto_mode)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (bareudp-&gt;ethertype == htons(ETH_P_MPLS_UC) &amp;&amp;</div><div class='add'>+	    proto == htons(ETH_P_MPLS_MC))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (bareudp-&gt;ethertype == htons(ETH_P_IP) &amp;&amp;</div><div class='add'>+	    proto == htons(ETH_P_IPV6))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t bareudp_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+	struct ip_tunnel_info *info = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!bareudp_proto_valid(bareudp, skb-&gt;protocol)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto tx_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info = skb_tunnel_info(skb);</div><div class='add'>+	if (unlikely(!info || !(info-&gt;mode &amp; IP_TUNNEL_INFO_TX))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto tx_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (ipv6_mod_enabled() &amp;&amp; info-&gt;mode &amp; IP_TUNNEL_INFO_IPV6)</div><div class='add'>+		err = bareudp6_xmit_skb(skb, dev, bareudp, info);</div><div class='add'>+	else</div><div class='add'>+		err = bareudp_xmit_skb(skb, dev, bareudp, info);</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (likely(!err))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+tx_error:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (err == -ELOOP)</div><div class='add'>+		DEV_STATS_INC(dev, collisions);</div><div class='add'>+	else if (err == -ENETUNREACH)</div><div class='add'>+		DEV_STATS_INC(dev, tx_carrier_errors);</div><div class='add'>+</div><div class='add'>+	DEV_STATS_INC(dev, tx_errors);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_fill_metadata_dst(struct net_device *dev,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ip_tunnel_info *info = skb_tunnel_info(skb);</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+	bool use_cache;</div><div class='add'>+	__be16 sport;</div><div class='add'>+</div><div class='add'>+	use_cache = ip_tunnel_dst_cache_usable(skb, info);</div><div class='add'>+	sport = udp_flow_src_port(bareudp-&gt;net, skb,</div><div class='add'>+				  bareudp-&gt;sport_min, USHRT_MAX,</div><div class='add'>+				  true);</div><div class='add'>+</div><div class='add'>+	if (!ipv6_mod_enabled() || ip_tunnel_info_af(info) == AF_INET) {</div><div class='add'>+		struct rtable *rt;</div><div class='add'>+		__be32 saddr;</div><div class='add'>+</div><div class='add'>+		rt = udp_tunnel_dst_lookup(skb, dev, bareudp-&gt;net, 0, &amp;saddr,</div><div class='add'>+					   &amp;info-&gt;key, sport, bareudp-&gt;port,</div><div class='add'>+					   info-&gt;key.tos,</div><div class='add'>+					   use_cache ? &amp;info-&gt;dst_cache : NULL);</div><div class='add'>+		if (IS_ERR(rt))</div><div class='add'>+			return PTR_ERR(rt);</div><div class='add'>+</div><div class='add'>+		ip_rt_put(rt);</div><div class='add'>+		info-&gt;key.u.ipv4.src = saddr;</div><div class='add'>+	} else if (ip_tunnel_info_af(info) == AF_INET6) {</div><div class='add'>+		struct dst_entry *dst;</div><div class='add'>+		struct in6_addr saddr;</div><div class='add'>+		struct socket *sock = rcu_dereference(bareudp-&gt;sock);</div><div class='add'>+</div><div class='add'>+		dst = udp_tunnel6_dst_lookup(skb, dev, bareudp-&gt;net, sock,</div><div class='add'>+					     0, &amp;saddr, &amp;info-&gt;key,</div><div class='add'>+					     sport, bareudp-&gt;port, info-&gt;key.tos,</div><div class='add'>+					     use_cache ? &amp;info-&gt;dst_cache : NULL);</div><div class='add'>+		if (IS_ERR(dst))</div><div class='add'>+			return PTR_ERR(dst);</div><div class='add'>+</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		info-&gt;key.u.ipv6.src = saddr;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;key.tp_src = sport;</div><div class='add'>+	info-&gt;key.tp_dst = bareudp-&gt;port;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops bareudp_netdev_ops = {</div><div class='add'>+	.ndo_init               = bareudp_init,</div><div class='add'>+	.ndo_uninit             = bareudp_uninit,</div><div class='add'>+	.ndo_open               = bareudp_open,</div><div class='add'>+	.ndo_stop               = bareudp_stop,</div><div class='add'>+	.ndo_start_xmit         = bareudp_xmit,</div><div class='add'>+	.ndo_fill_metadata_dst  = bareudp_fill_metadata_dst,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy bareudp_policy[IFLA_BAREUDP_MAX + 1] = {</div><div class='add'>+	[IFLA_BAREUDP_PORT]                = { .type = NLA_U16 },</div><div class='add'>+	[IFLA_BAREUDP_ETHERTYPE]	   = { .type = NLA_U16 },</div><div class='add'>+	[IFLA_BAREUDP_SRCPORT_MIN]         = { .type = NLA_U16 },</div><div class='add'>+	[IFLA_BAREUDP_MULTIPROTO_MODE]     = { .type = NLA_FLAG },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Info for udev, that this is a virtual tunnel endpoint */</div><div class='add'>+static const struct device_type bareudp_type = {</div><div class='add'>+	.name = "bareudp",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Initialize the device structure. */</div><div class='add'>+static void bareudp_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;netdev_ops = &amp;bareudp_netdev_ops;</div><div class='add'>+	dev-&gt;needs_free_netdev = true;</div><div class='add'>+	SET_NETDEV_DEVTYPE(dev, &amp;bareudp_type);</div><div class='add'>+	dev-&gt;features    |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_FRAGLIST;</div><div class='add'>+	dev-&gt;features    |= NETIF_F_RXCSUM;</div><div class='add'>+	dev-&gt;features    |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_FRAGLIST;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_RXCSUM;</div><div class='add'>+	dev-&gt;hw_features |= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;hard_header_len = 0;</div><div class='add'>+	dev-&gt;addr_len = 0;</div><div class='add'>+	dev-&gt;mtu = ETH_DATA_LEN;</div><div class='add'>+	dev-&gt;min_mtu = IPV4_MIN_MTU;</div><div class='add'>+	dev-&gt;max_mtu = IP_MAX_MTU - BAREUDP_BASE_HLEN;</div><div class='add'>+	dev-&gt;type = ARPHRD_NONE;</div><div class='add'>+	netif_keep_dst(dev);</div><div class='add'>+	dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='add'>+	dev-&gt;flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_DSTATS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (!data) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Not enough attributes provided to perform the operation");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp2info(struct nlattr *data[], struct bareudp_conf *conf,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	memset(conf, 0, sizeof(*conf));</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_BAREUDP_PORT]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "port not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!data[IFLA_BAREUDP_ETHERTYPE]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "ethertype not specified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conf-&gt;port = nla_get_u16(data[IFLA_BAREUDP_PORT]);</div><div class='add'>+	conf-&gt;ethertype = nla_get_u16(data[IFLA_BAREUDP_ETHERTYPE]);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BAREUDP_SRCPORT_MIN])</div><div class='add'>+		conf-&gt;sport_min =  nla_get_u16(data[IFLA_BAREUDP_SRCPORT_MIN]);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BAREUDP_MULTIPROTO_MODE])</div><div class='add'>+		conf-&gt;multi_proto_mode = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bareudp_dev *bareudp_find_dev(struct bareudp_net *bn,</div><div class='add'>+					    const struct bareudp_conf *conf)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp, *t = NULL;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(bareudp, &amp;bn-&gt;bareudp_list, next) {</div><div class='add'>+		if (conf-&gt;port == bareudp-&gt;port)</div><div class='add'>+			t = bareudp;</div><div class='add'>+	}</div><div class='add'>+	return t;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_configure(struct net *net, struct net_device *dev,</div><div class='add'>+			     struct bareudp_conf *conf,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_net *bn = net_generic(net, bareudp_net_id);</div><div class='add'>+	struct bareudp_dev *t, *bareudp = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	bareudp-&gt;net = net;</div><div class='add'>+	bareudp-&gt;dev = dev;</div><div class='add'>+	t = bareudp_find_dev(bn, conf);</div><div class='add'>+	if (t) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Another bareudp device using the same port already exists");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;multi_proto_mode &amp;&amp;</div><div class='add'>+	    (conf-&gt;ethertype != htons(ETH_P_MPLS_UC) &amp;&amp;</div><div class='add'>+	     conf-&gt;ethertype != htons(ETH_P_IP))) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Cannot set multiproto mode for this ethertype (only IPv4 and unicast MPLS are supported)");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bareudp-&gt;port = conf-&gt;port;</div><div class='add'>+	bareudp-&gt;ethertype = conf-&gt;ethertype;</div><div class='add'>+	bareudp-&gt;sport_min = conf-&gt;sport_min;</div><div class='add'>+	bareudp-&gt;multi_proto_mode = conf-&gt;multi_proto_mode;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	list_add(&amp;bareudp-&gt;next, &amp;bn-&gt;bareudp_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_link_config(struct net_device *dev,</div><div class='add'>+			       struct nlattr *tb[])</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tb[IFLA_MTU]) {</div><div class='add'>+		err = dev_set_mtu(dev, nla_get_u32(tb[IFLA_MTU]));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bareudp_dellink(struct net_device *dev, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;bareudp-&gt;next);</div><div class='add'>+	unregister_netdevice_queue(dev, head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_newlink(struct net_device *dev,</div><div class='add'>+			   struct rtnl_newlink_params *params,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net *link_net = rtnl_newlink_link_net(params);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='add'>+	struct bareudp_conf conf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bareudp2info(data, &amp;conf, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = bareudp_configure(link_net, dev, &amp;conf, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = bareudp_link_config(dev, tb);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unconfig;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unconfig:</div><div class='add'>+	bareudp_dellink(dev, NULL);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t bareudp_get_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return  nla_total_size(sizeof(__be16)) +  /* IFLA_BAREUDP_PORT */</div><div class='add'>+		nla_total_size(sizeof(__be16)) +  /* IFLA_BAREUDP_ETHERTYPE */</div><div class='add'>+		nla_total_size(sizeof(__u16))  +  /* IFLA_BAREUDP_SRCPORT_MIN */</div><div class='add'>+		nla_total_size(0)              +  /* IFLA_BAREUDP_MULTIPROTO_MODE */</div><div class='add'>+		0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bareudp_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_dev *bareudp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (nla_put_be16(skb, IFLA_BAREUDP_PORT, bareudp-&gt;port))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_be16(skb, IFLA_BAREUDP_ETHERTYPE, bareudp-&gt;ethertype))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (nla_put_u16(skb, IFLA_BAREUDP_SRCPORT_MIN, bareudp-&gt;sport_min))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	if (bareudp-&gt;multi_proto_mode &amp;&amp;</div><div class='add'>+	    nla_put_flag(skb, IFLA_BAREUDP_MULTIPROTO_MODE))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rtnl_link_ops bareudp_link_ops __read_mostly = {</div><div class='add'>+	.kind           = "bareudp",</div><div class='add'>+	.maxtype        = IFLA_BAREUDP_MAX,</div><div class='add'>+	.policy         = bareudp_policy,</div><div class='add'>+	.priv_size      = sizeof(struct bareudp_dev),</div><div class='add'>+	.setup          = bareudp_setup,</div><div class='add'>+	.validate       = bareudp_validate,</div><div class='add'>+	.newlink        = bareudp_newlink,</div><div class='add'>+	.dellink        = bareudp_dellink,</div><div class='add'>+	.get_size       = bareudp_get_size,</div><div class='add'>+	.fill_info      = bareudp_fill_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __net_init int bareudp_init_net(struct net *net)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_net *bn = net_generic(net, bareudp_net_id);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;bn-&gt;bareudp_list);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit bareudp_exit_rtnl_net(struct net *net,</div><div class='add'>+					     struct list_head *dev_kill_list)</div><div class='add'>+{</div><div class='add'>+	struct bareudp_net *bn = net_generic(net, bareudp_net_id);</div><div class='add'>+	struct bareudp_dev *bareudp, *next;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(bareudp, next, &amp;bn-&gt;bareudp_list, next)</div><div class='add'>+		bareudp_dellink(bareudp-&gt;dev, dev_kill_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pernet_operations bareudp_net_ops = {</div><div class='add'>+	.init = bareudp_init_net,</div><div class='add'>+	.exit_rtnl = bareudp_exit_rtnl_net,</div><div class='add'>+	.id   = &amp;bareudp_net_id,</div><div class='add'>+	.size = sizeof(struct bareudp_net),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bareudp_init_module(void)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = register_pernet_subsys(&amp;bareudp_net_ops);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out1;</div><div class='add'>+</div><div class='add'>+	rc = rtnl_link_register(&amp;bareudp_link_ops);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out2;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out2:</div><div class='add'>+	unregister_pernet_subsys(&amp;bareudp_net_ops);</div><div class='add'>+out1:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+late_initcall(bareudp_init_module);</div><div class='add'>+</div><div class='add'>+static void __exit bareudp_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	rtnl_link_unregister(&amp;bareudp_link_ops);</div><div class='add'>+	unregister_pernet_subsys(&amp;bareudp_net_ops);</div><div class='add'>+}</div><div class='add'>+module_exit(bareudp_cleanup_module);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_RTNL_LINK("bareudp");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Martin Varghese &lt;martin.varghese@nokia.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Interface driver for UDP encapsulated traffic");</div><div class='head'>diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c<br/>index dfd6f315d2cc..1a8de2bf8655 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_3ad.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_3ad.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_3ad.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_3ad.c</a></div><div class='hunk'>@@ -31,16 +31,6 @@</div><div class='ctx'> #define AD_CHURN_DETECTION_TIME    60</div><div class='ctx'> #define AD_AGGREGATE_WAIT_TIME     2</div><div class='ctx'> </div><div class='del'>-/* Port state definitions (43.4.2.2 in the 802.3ad standard) */</div><div class='del'>-#define AD_STATE_LACP_ACTIVITY   0x1</div><div class='del'>-#define AD_STATE_LACP_TIMEOUT    0x2</div><div class='del'>-#define AD_STATE_AGGREGATION     0x4</div><div class='del'>-#define AD_STATE_SYNCHRONIZATION 0x8</div><div class='del'>-#define AD_STATE_COLLECTING      0x10</div><div class='del'>-#define AD_STATE_DISTRIBUTING    0x20</div><div class='del'>-#define AD_STATE_DEFAULTED       0x40</div><div class='del'>-#define AD_STATE_EXPIRED         0x80</div><div class='del'>-</div><div class='ctx'> /* Port Variables definitions used by the State Machines (43.4.7 in the</div><div class='ctx'>  * 802.3ad standard)</div><div class='ctx'>  */</div><div class='hunk'>@@ -83,20 +73,22 @@ enum ad_link_speed_type {</div><div class='ctx'> 	AD_LINK_SPEED_50000MBPS,</div><div class='ctx'> 	AD_LINK_SPEED_56000MBPS,</div><div class='ctx'> 	AD_LINK_SPEED_100000MBPS,</div><div class='add'>+	AD_LINK_SPEED_200000MBPS,</div><div class='add'>+	AD_LINK_SPEED_400000MBPS,</div><div class='add'>+	AD_LINK_SPEED_800000MBPS,</div><div class='add'>+	AD_LINK_SPEED_1600000MBPS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* compare MAC addresses */</div><div class='ctx'> #define MAC_ADDRESS_EQUAL(A, B)	\</div><div class='ctx'> 	ether_addr_equal_64bits((const u8 *)A, (const u8 *)B)</div><div class='ctx'> </div><div class='del'>-static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {</div><div class='del'>-	0, 0, 0, 0, 0, 0</div><div class='del'>-};</div><div class='del'>-static u16 ad_ticks_per_sec;</div><div class='add'>+static const u16 ad_ticks_per_sec = 1000 / AD_TIMER_INTERVAL;</div><div class='ctx'> static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;</div><div class='ctx'> </div><div class='del'>-static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =</div><div class='del'>-	MULTICAST_LACPDU_ADDR;</div><div class='add'>+const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned = {</div><div class='add'>+	0x01, 0x80, 0xC2, 0x00, 0x00, 0x02</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* ================= main 802.3ad protocol functions ================== */</div><div class='ctx'> static int ad_lacpdu_send(struct port *port);</div><div class='hunk'>@@ -110,7 +102,10 @@ static void ad_agg_selection_logic(struct aggregator *aggregator,</div><div class='ctx'> 				   bool *update_slave_arr);</div><div class='ctx'> static void ad_clear_agg(struct aggregator *aggregator);</div><div class='ctx'> static void ad_initialize_agg(struct aggregator *aggregator);</div><div class='del'>-static void ad_initialize_port(struct port *port, int lacp_fast);</div><div class='add'>+static void ad_initialize_port(struct port *port, const struct bond_params *bond_params);</div><div class='add'>+static void ad_enable_collecting(struct port *port);</div><div class='add'>+static void ad_disable_distributing(struct port *port,</div><div class='add'>+				    bool *update_slave_arr);</div><div class='ctx'> static void ad_enable_collecting_distributing(struct port *port,</div><div class='ctx'> 					      bool *update_slave_arr);</div><div class='ctx'> static void ad_disable_collecting_distributing(struct port *port,</div><div class='hunk'>@@ -140,7 +135,7 @@ static inline struct bonding *__get_bond_by_port(struct port *port)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * __get_first_agg - get the first aggregator in the bond</div><div class='del'>- * @bond: the bond we're looking at</div><div class='add'>+ * @port: the port we're looking at</div><div class='ctx'>  *</div><div class='ctx'>  * Return the aggregator of the first slave in @bond, or %NULL if it can't be</div><div class='ctx'>  * found.</div><div class='hunk'>@@ -177,8 +172,37 @@ static inline int __agg_has_partner(struct aggregator *agg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * __disable_distributing_port - disable the port's slave for distributing.</div><div class='add'>+ * Port will still be able to collect.</div><div class='add'>+ * @port: the port we're looking at</div><div class='add'>+ *</div><div class='add'>+ * This will disable only distributing on the port's slave.</div><div class='add'>+ */</div><div class='add'>+static void __disable_distributing_port(struct port *port)</div><div class='add'>+{</div><div class='add'>+	bond_set_slave_tx_disabled_flags(port-&gt;slave, BOND_SLAVE_NOTIFY_LATER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __enable_collecting_port - enable the port's slave for collecting,</div><div class='add'>+ * if it's up</div><div class='add'>+ * @port: the port we're looking at</div><div class='add'>+ *</div><div class='add'>+ * This will enable only collecting on the port's slave.</div><div class='add'>+ */</div><div class='add'>+static void __enable_collecting_port(struct port *port)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave = port-&gt;slave;</div><div class='add'>+</div><div class='add'>+	if (slave-&gt;link == BOND_LINK_UP &amp;&amp; bond_slave_is_up(slave))</div><div class='add'>+		bond_set_slave_rx_enabled_flags(slave, BOND_SLAVE_NOTIFY_LATER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * __disable_port - disable the port's slave</div><div class='ctx'>  * @port: the port we're looking at</div><div class='add'>+ *</div><div class='add'>+ * This will disable both collecting and distributing on the port's slave.</div><div class='ctx'>  */</div><div class='ctx'> static inline void __disable_port(struct port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -188,6 +212,8 @@ static inline void __disable_port(struct port *port)</div><div class='ctx'> /**</div><div class='ctx'>  * __enable_port - enable the port's slave, if it's up</div><div class='ctx'>  * @port: the port we're looking at</div><div class='add'>+ *</div><div class='add'>+ * This will enable both collecting and distributing on the port's slave.</div><div class='ctx'>  */</div><div class='ctx'> static inline void __enable_port(struct port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -198,10 +224,27 @@ static inline void __enable_port(struct port *port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * __port_is_enabled - check if the port's slave is in active state</div><div class='add'>+ * __port_move_to_attached_state - check if port should transition back to attached</div><div class='add'>+ * state.</div><div class='add'>+ * @port: the port we're looking at</div><div class='add'>+ */</div><div class='add'>+static bool __port_move_to_attached_state(struct port *port)</div><div class='add'>+{</div><div class='add'>+	if (!(port-&gt;sm_vars &amp; AD_PORT_SELECTED) ||</div><div class='add'>+	    (port-&gt;sm_vars &amp; AD_PORT_STANDBY) ||</div><div class='add'>+	    !(port-&gt;partner_oper.port_state &amp; LACP_STATE_SYNCHRONIZATION) ||</div><div class='add'>+	    !(port-&gt;actor_oper_port_state &amp; LACP_STATE_SYNCHRONIZATION))</div><div class='add'>+		port-&gt;sm_mux_state = AD_MUX_ATTACHED;</div><div class='add'>+</div><div class='add'>+	return port-&gt;sm_mux_state == AD_MUX_ATTACHED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __port_is_collecting_distributing - check if the port's slave is in the</div><div class='add'>+ * combined collecting/distributing state</div><div class='ctx'>  * @port: the port we're looking at</div><div class='ctx'>  */</div><div class='del'>-static inline int __port_is_enabled(struct port *port)</div><div class='add'>+static int __port_is_collecting_distributing(struct port *port)</div><div class='ctx'> {</div><div class='ctx'> 	return bond_is_active_slave(port-&gt;slave);</div><div class='ctx'> }</div><div class='hunk'>@@ -233,7 +276,7 @@ static inline int __check_agg_selection_timer(struct port *port)</div><div class='ctx'> 	if (bond == NULL)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return BOND_AD_INFO(bond).agg_select_timer ? 1 : 0;</div><div class='add'>+	return atomic_read(&amp;BOND_AD_INFO(bond).agg_select_timer) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -255,6 +298,10 @@ static inline int __check_agg_selection_timer(struct port *port)</div><div class='ctx'>  *     %AD_LINK_SPEED_50000MBPS</div><div class='ctx'>  *     %AD_LINK_SPEED_56000MBPS</div><div class='ctx'>  *     %AD_LINK_SPEED_100000MBPS</div><div class='add'>+ *     %AD_LINK_SPEED_200000MBPS</div><div class='add'>+ *     %AD_LINK_SPEED_400000MBPS</div><div class='add'>+ *     %AD_LINK_SPEED_800000MBPS</div><div class='add'>+ *     %AD_LINK_SPEED_1600000MBPS</div><div class='ctx'>  */</div><div class='ctx'> static u16 __get_link_speed(struct port *port)</div><div class='ctx'> {</div><div class='hunk'>@@ -322,20 +369,36 @@ static u16 __get_link_speed(struct port *port)</div><div class='ctx'> 			speed = AD_LINK_SPEED_100000MBPS;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		case SPEED_200000:</div><div class='add'>+			speed = AD_LINK_SPEED_200000MBPS;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SPEED_400000:</div><div class='add'>+			speed = AD_LINK_SPEED_400000MBPS;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SPEED_800000:</div><div class='add'>+			speed = AD_LINK_SPEED_800000MBPS;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case SPEED_1600000:</div><div class='add'>+			speed = AD_LINK_SPEED_1600000MBPS;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='ctx'> 			/* unknown speed value from ethtool. shouldn't happen */</div><div class='ctx'> 			if (slave-&gt;speed != SPEED_UNKNOWN)</div><div class='del'>-				pr_warn_once("%s: unknown ethtool speed (%d) for port %d (set it to 0)\n",</div><div class='del'>-					     slave-&gt;bond-&gt;dev-&gt;name,</div><div class='del'>-					     slave-&gt;speed,</div><div class='del'>-					     port-&gt;actor_port_number);</div><div class='add'>+				pr_err_once("%s: (slave %s): unknown ethtool speed (%d) for port %d (set it to 0)\n",</div><div class='add'>+					    slave-&gt;bond-&gt;dev-&gt;name,</div><div class='add'>+					    slave-&gt;dev-&gt;name, slave-&gt;speed,</div><div class='add'>+					    port-&gt;actor_port_number);</div><div class='ctx'> 			speed = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(slave-&gt;bond-&gt;dev, "Port %d Received link speed %d update from adapter\n",</div><div class='del'>-		   port-&gt;actor_port_number, speed);</div><div class='add'>+	slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Port %d Received link speed %d update from adapter\n",</div><div class='add'>+		  port-&gt;actor_port_number, speed);</div><div class='ctx'> 	return speed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -359,14 +422,14 @@ static u8 __get_duplex(struct port *port)</div><div class='ctx'> 		switch (slave-&gt;duplex) {</div><div class='ctx'> 		case DUPLEX_FULL:</div><div class='ctx'> 			retval = 0x1;</div><div class='del'>-			netdev_dbg(slave-&gt;bond-&gt;dev, "Port %d Received status full duplex update from adapter\n",</div><div class='del'>-				   port-&gt;actor_port_number);</div><div class='add'>+			slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Port %d Received status full duplex update from adapter\n",</div><div class='add'>+				  port-&gt;actor_port_number);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DUPLEX_HALF:</div><div class='ctx'> 		default:</div><div class='ctx'> 			retval = 0x0;</div><div class='del'>-			netdev_dbg(slave-&gt;bond-&gt;dev, "Port %d Received status NOT full duplex update from adapter\n",</div><div class='del'>-				   port-&gt;actor_port_number);</div><div class='add'>+			slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Port %d Received status NOT full duplex update from adapter\n",</div><div class='add'>+				  port-&gt;actor_port_number);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -379,6 +442,7 @@ static void __ad_actor_update_port(struct port *port)</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;actor_system = BOND_AD_INFO(bond).system.sys_mac_addr;</div><div class='ctx'> 	port-&gt;actor_system_priority = BOND_AD_INFO(bond).system.sys_priority;</div><div class='add'>+	port-&gt;actor_port_priority = SLAVE_AD_INFO(port-&gt;slave)-&gt;port_priority;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Conversions */</div><div class='hunk'>@@ -457,8 +521,8 @@ static void __choose_matched(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> 	     MAC_ADDRESS_EQUAL(&amp;(lacpdu-&gt;partner_system), &amp;(port-&gt;actor_system)) &amp;&amp;</div><div class='ctx'> 	     (ntohs(lacpdu-&gt;partner_system_priority) == port-&gt;actor_system_priority) &amp;&amp;</div><div class='ctx'> 	     (ntohs(lacpdu-&gt;partner_key) == port-&gt;actor_oper_port_key) &amp;&amp;</div><div class='del'>-	     ((lacpdu-&gt;partner_state &amp; AD_STATE_AGGREGATION) == (port-&gt;actor_oper_port_state &amp; AD_STATE_AGGREGATION))) ||</div><div class='del'>-	    ((lacpdu-&gt;actor_state &amp; AD_STATE_AGGREGATION) == 0)</div><div class='add'>+	     ((lacpdu-&gt;partner_state &amp; LACP_STATE_AGGREGATION) == (port-&gt;actor_oper_port_state &amp; LACP_STATE_AGGREGATION))) ||</div><div class='add'>+	    ((lacpdu-&gt;actor_state &amp; LACP_STATE_AGGREGATION) == 0)</div><div class='ctx'> 		) {</div><div class='ctx'> 		port-&gt;sm_vars |= AD_PORT_MATCHED;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -492,18 +556,20 @@ static void __record_pdu(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> 		partner-&gt;port_state = lacpdu-&gt;actor_state;</div><div class='ctx'> </div><div class='ctx'> 		/* set actor_oper_port_state.defaulted to FALSE */</div><div class='del'>-		port-&gt;actor_oper_port_state &amp;= ~AD_STATE_DEFAULTED;</div><div class='add'>+		port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_DEFAULTED;</div><div class='ctx'> </div><div class='ctx'> 		/* set the partner sync. to on if the partner is sync,</div><div class='ctx'> 		 * and the port is matched</div><div class='ctx'> 		 */</div><div class='ctx'> 		if ((port-&gt;sm_vars &amp; AD_PORT_MATCHED) &amp;&amp;</div><div class='del'>-		    (lacpdu-&gt;actor_state &amp; AD_STATE_SYNCHRONIZATION)) {</div><div class='del'>-			partner-&gt;port_state |= AD_STATE_SYNCHRONIZATION;</div><div class='del'>-			pr_debug("%s partner sync=1\n", port-&gt;slave-&gt;dev-&gt;name);</div><div class='add'>+		    (lacpdu-&gt;actor_state &amp; LACP_STATE_SYNCHRONIZATION)) {</div><div class='add'>+			partner-&gt;port_state |= LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+			slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+				  "partner sync=1\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			partner-&gt;port_state &amp;= ~AD_STATE_SYNCHRONIZATION;</div><div class='del'>-			pr_debug("%s partner sync=0\n", port-&gt;slave-&gt;dev-&gt;name);</div><div class='add'>+			partner-&gt;port_state &amp;= ~LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+			slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+				  "partner sync=0\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -524,7 +590,7 @@ static void __record_default(struct port *port)</div><div class='ctx'> 		       sizeof(struct port_params));</div><div class='ctx'> </div><div class='ctx'> 		/* set actor_oper_port_state.defaulted to true */</div><div class='del'>-		port-&gt;actor_oper_port_state |= AD_STATE_DEFAULTED;</div><div class='add'>+		port-&gt;actor_oper_port_state |= LACP_STATE_DEFAULTED;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -554,7 +620,7 @@ static void __update_selected(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> 		    !MAC_ADDRESS_EQUAL(&amp;lacpdu-&gt;actor_system, &amp;partner-&gt;system) ||</div><div class='ctx'> 		    ntohs(lacpdu-&gt;actor_system_priority) != partner-&gt;system_priority ||</div><div class='ctx'> 		    ntohs(lacpdu-&gt;actor_key) != partner-&gt;key ||</div><div class='del'>-		    (lacpdu-&gt;actor_state &amp; AD_STATE_AGGREGATION) != (partner-&gt;port_state &amp; AD_STATE_AGGREGATION)) {</div><div class='add'>+		    (lacpdu-&gt;actor_state &amp; LACP_STATE_AGGREGATION) != (partner-&gt;port_state &amp; LACP_STATE_AGGREGATION)) {</div><div class='ctx'> 			port-&gt;sm_vars &amp;= ~AD_PORT_SELECTED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -586,8 +652,8 @@ static void __update_default_selected(struct port *port)</div><div class='ctx'> 		    !MAC_ADDRESS_EQUAL(&amp;admin-&gt;system, &amp;oper-&gt;system) ||</div><div class='ctx'> 		    admin-&gt;system_priority != oper-&gt;system_priority ||</div><div class='ctx'> 		    admin-&gt;key != oper-&gt;key ||</div><div class='del'>-		    (admin-&gt;port_state &amp; AD_STATE_AGGREGATION)</div><div class='del'>-			!= (oper-&gt;port_state &amp; AD_STATE_AGGREGATION)) {</div><div class='add'>+		    (admin-&gt;port_state &amp; LACP_STATE_AGGREGATION)</div><div class='add'>+			!= (oper-&gt;port_state &amp; LACP_STATE_AGGREGATION)) {</div><div class='ctx'> 			port-&gt;sm_vars &amp;= ~AD_PORT_SELECTED;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -617,10 +683,10 @@ static void __update_ntt(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> 		    !MAC_ADDRESS_EQUAL(&amp;(lacpdu-&gt;partner_system), &amp;(port-&gt;actor_system)) ||</div><div class='ctx'> 		    (ntohs(lacpdu-&gt;partner_system_priority) != port-&gt;actor_system_priority) ||</div><div class='ctx'> 		    (ntohs(lacpdu-&gt;partner_key) != port-&gt;actor_oper_port_key) ||</div><div class='del'>-		    ((lacpdu-&gt;partner_state &amp; AD_STATE_LACP_ACTIVITY) != (port-&gt;actor_oper_port_state &amp; AD_STATE_LACP_ACTIVITY)) ||</div><div class='del'>-		    ((lacpdu-&gt;partner_state &amp; AD_STATE_LACP_TIMEOUT) != (port-&gt;actor_oper_port_state &amp; AD_STATE_LACP_TIMEOUT)) ||</div><div class='del'>-		    ((lacpdu-&gt;partner_state &amp; AD_STATE_SYNCHRONIZATION) != (port-&gt;actor_oper_port_state &amp; AD_STATE_SYNCHRONIZATION)) ||</div><div class='del'>-		    ((lacpdu-&gt;partner_state &amp; AD_STATE_AGGREGATION) != (port-&gt;actor_oper_port_state &amp; AD_STATE_AGGREGATION))</div><div class='add'>+		    ((lacpdu-&gt;partner_state &amp; LACP_STATE_LACP_ACTIVITY) != (port-&gt;actor_oper_port_state &amp; LACP_STATE_LACP_ACTIVITY)) ||</div><div class='add'>+		    ((lacpdu-&gt;partner_state &amp; LACP_STATE_LACP_TIMEOUT) != (port-&gt;actor_oper_port_state &amp; LACP_STATE_LACP_TIMEOUT)) ||</div><div class='add'>+		    ((lacpdu-&gt;partner_state &amp; LACP_STATE_SYNCHRONIZATION) != (port-&gt;actor_oper_port_state &amp; LACP_STATE_SYNCHRONIZATION)) ||</div><div class='add'>+		    ((lacpdu-&gt;partner_state &amp; LACP_STATE_AGGREGATION) != (port-&gt;actor_oper_port_state &amp; LACP_STATE_AGGREGATION))</div><div class='ctx'> 		   ) {</div><div class='ctx'> 			port-&gt;ntt = true;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -687,6 +753,18 @@ static int __agg_active_ports(struct aggregator *agg)</div><div class='ctx'> 	return active;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int __agg_ports_priority(const struct aggregator *agg)</div><div class='add'>+{</div><div class='add'>+	struct port *port = agg-&gt;lag_ports;</div><div class='add'>+	unsigned int prio = 0;</div><div class='add'>+</div><div class='add'>+	for (; port; port = port-&gt;next_port_in_aggregator)</div><div class='add'>+		if (port-&gt;is_enabled)</div><div class='add'>+			prio += port-&gt;actor_port_priority;</div><div class='add'>+</div><div class='add'>+	return prio;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * __get_agg_bandwidth - get the total bandwidth of an aggregator</div><div class='ctx'>  * @aggregator: the aggregator we're looking at</div><div class='hunk'>@@ -741,6 +819,18 @@ static u32 __get_agg_bandwidth(struct aggregator *aggregator)</div><div class='ctx'> 		case AD_LINK_SPEED_100000MBPS:</div><div class='ctx'> 			bandwidth = nports * 100000;</div><div class='ctx'> 			break;</div><div class='add'>+		case AD_LINK_SPEED_200000MBPS:</div><div class='add'>+			bandwidth = nports * 200000;</div><div class='add'>+			break;</div><div class='add'>+		case AD_LINK_SPEED_400000MBPS:</div><div class='add'>+			bandwidth = nports * 400000;</div><div class='add'>+			break;</div><div class='add'>+		case AD_LINK_SPEED_800000MBPS:</div><div class='add'>+			bandwidth = nports * 800000;</div><div class='add'>+			break;</div><div class='add'>+		case AD_LINK_SPEED_1600000MBPS:</div><div class='add'>+			bandwidth = nports * 1600000;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			bandwidth = 0; /* to silence the compiler */</div><div class='ctx'> 		}</div><div class='hunk'>@@ -789,8 +879,9 @@ static inline void __update_lacpdu_from_port(struct port *port)</div><div class='ctx'> 	lacpdu-&gt;actor_port_priority = htons(port-&gt;actor_port_priority);</div><div class='ctx'> 	lacpdu-&gt;actor_port = htons(port-&gt;actor_port_number);</div><div class='ctx'> 	lacpdu-&gt;actor_state = port-&gt;actor_oper_port_state;</div><div class='del'>-	pr_debug("update lacpdu: %s, actor port state %x\n",</div><div class='del'>-		 port-&gt;slave-&gt;dev-&gt;name, port-&gt;actor_oper_port_state);</div><div class='add'>+	slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+		  "update lacpdu: actor port state %x\n",</div><div class='add'>+		  port-&gt;actor_oper_port_state);</div><div class='ctx'> </div><div class='ctx'> 	/* lacpdu-&gt;reserved_3_1              initialized</div><div class='ctx'> 	 * lacpdu-&gt;tlv_type_partner_info     initialized</div><div class='hunk'>@@ -913,6 +1004,17 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ad_cond_set_peer_notif(struct port *port)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = port-&gt;slave-&gt;bond;</div><div class='add'>+</div><div class='add'>+	if (bond-&gt;params.broadcast_neighbor &amp;&amp; rtnl_trylock()) {</div><div class='add'>+		bond-&gt;send_peer_notif = bond-&gt;params.num_peer_notif *</div><div class='add'>+			max(1, bond-&gt;params.peer_notif_delay);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * ad_mux_machine - handle a port's mux state machine</div><div class='ctx'>  * @port: the port we're looking at</div><div class='hunk'>@@ -920,6 +1022,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)</div><div class='ctx'>  */</div><div class='ctx'> static void ad_mux_machine(struct port *port, bool *update_slave_arr)</div><div class='ctx'> {</div><div class='add'>+	struct bonding *bond = __get_bond_by_port(port);</div><div class='ctx'> 	mux_states_t last_state;</div><div class='ctx'> </div><div class='ctx'> 	/* keep current State Machine state to compare later if it was</div><div class='hunk'>@@ -975,11 +1078,15 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 			 * edable port will take place only after this timer)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if ((port-&gt;sm_vars &amp; AD_PORT_SELECTED) &amp;&amp;</div><div class='del'>-			    (port-&gt;partner_oper.port_state &amp; AD_STATE_SYNCHRONIZATION) &amp;&amp;</div><div class='add'>+			    (port-&gt;partner_oper.port_state &amp; LACP_STATE_SYNCHRONIZATION) &amp;&amp;</div><div class='ctx'> 			    !__check_agg_selection_timer(port)) {</div><div class='del'>-				if (port-&gt;aggregator-&gt;is_active)</div><div class='del'>-					port-&gt;sm_mux_state =</div><div class='del'>-					    AD_MUX_COLLECTING_DISTRIBUTING;</div><div class='add'>+				if (port-&gt;aggregator-&gt;is_active) {</div><div class='add'>+					int state = AD_MUX_COLLECTING_DISTRIBUTING;</div><div class='add'>+</div><div class='add'>+					if (!bond-&gt;params.coupled_control)</div><div class='add'>+						state = AD_MUX_COLLECTING;</div><div class='add'>+					port-&gt;sm_mux_state = state;</div><div class='add'>+				}</div><div class='ctx'> 			} else if (!(port-&gt;sm_vars &amp; AD_PORT_SELECTED) ||</div><div class='ctx'> 				   (port-&gt;sm_vars &amp; AD_PORT_STANDBY)) {</div><div class='ctx'> 				/* if UNSELECTED or STANDBY */</div><div class='hunk'>@@ -993,15 +1100,49 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 				port-&gt;sm_mux_state = AD_MUX_DETACHED;</div><div class='ctx'> 			} else if (port-&gt;aggregator-&gt;is_active) {</div><div class='ctx'> 				port-&gt;actor_oper_port_state |=</div><div class='del'>-				    AD_STATE_SYNCHRONIZATION;</div><div class='add'>+				    LACP_STATE_SYNCHRONIZATION;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_MUX_COLLECTING_DISTRIBUTING:</div><div class='add'>+			if (!__port_move_to_attached_state(port)) {</div><div class='add'>+				/* if port state hasn't changed make</div><div class='add'>+				 * sure that a collecting distributing</div><div class='add'>+				 * port in an active aggregator is enabled</div><div class='add'>+				 */</div><div class='add'>+				if (port-&gt;aggregator-&gt;is_active &amp;&amp;</div><div class='add'>+				    !__port_is_collecting_distributing(port)) {</div><div class='add'>+					__enable_port(port);</div><div class='add'>+					*update_slave_arr = true;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case AD_MUX_COLLECTING:</div><div class='add'>+			if (!__port_move_to_attached_state(port)) {</div><div class='add'>+				if ((port-&gt;sm_vars &amp; AD_PORT_SELECTED) &amp;&amp;</div><div class='add'>+				    (port-&gt;partner_oper.port_state &amp; LACP_STATE_SYNCHRONIZATION) &amp;&amp;</div><div class='add'>+				    (port-&gt;partner_oper.port_state &amp; LACP_STATE_COLLECTING)) {</div><div class='add'>+					port-&gt;sm_mux_state = AD_MUX_DISTRIBUTING;</div><div class='add'>+				} else {</div><div class='add'>+					/* If port state hasn't changed, make sure that a collecting</div><div class='add'>+					 * port is enabled for an active aggregator.</div><div class='add'>+					 */</div><div class='add'>+					struct slave *slave = port-&gt;slave;</div><div class='add'>+</div><div class='add'>+					if (port-&gt;aggregator-&gt;is_active &amp;&amp;</div><div class='add'>+					    bond_is_slave_rx_disabled(slave)) {</div><div class='add'>+						ad_enable_collecting(port);</div><div class='add'>+						*update_slave_arr = true;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case AD_MUX_DISTRIBUTING:</div><div class='ctx'> 			if (!(port-&gt;sm_vars &amp; AD_PORT_SELECTED) ||</div><div class='ctx'> 			    (port-&gt;sm_vars &amp; AD_PORT_STANDBY) ||</div><div class='del'>-			    !(port-&gt;partner_oper.port_state &amp; AD_STATE_SYNCHRONIZATION) ||</div><div class='del'>-			    !(port-&gt;actor_oper_port_state &amp; AD_STATE_SYNCHRONIZATION)) {</div><div class='del'>-				port-&gt;sm_mux_state = AD_MUX_ATTACHED;</div><div class='add'>+			    !(port-&gt;partner_oper.port_state &amp; LACP_STATE_COLLECTING) ||</div><div class='add'>+			    !(port-&gt;partner_oper.port_state &amp; LACP_STATE_SYNCHRONIZATION) ||</div><div class='add'>+			    !(port-&gt;actor_oper_port_state &amp; LACP_STATE_SYNCHRONIZATION)) {</div><div class='add'>+				port-&gt;sm_mux_state = AD_MUX_COLLECTING;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* if port state hasn't changed make</div><div class='ctx'> 				 * sure that a collecting distributing</div><div class='hunk'>@@ -1009,9 +1150,9 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (port-&gt;aggregator &amp;&amp;</div><div class='ctx'> 				    port-&gt;aggregator-&gt;is_active &amp;&amp;</div><div class='del'>-				    !__port_is_enabled(port)) {</div><div class='del'>-</div><div class='add'>+				    !__port_is_collecting_distributing(port)) {</div><div class='ctx'> 					__enable_port(port);</div><div class='add'>+					*update_slave_arr = true;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1022,18 +1163,18 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)</div><div class='ctx'> </div><div class='ctx'> 	/* check if the state machine was changed */</div><div class='ctx'> 	if (port-&gt;sm_mux_state != last_state) {</div><div class='del'>-		pr_debug("Mux Machine: Port=%d (%s), Last State=%d, Curr State=%d\n",</div><div class='del'>-			 port-&gt;actor_port_number,</div><div class='del'>-			 port-&gt;slave-&gt;dev-&gt;name,</div><div class='del'>-			 last_state,</div><div class='del'>-			 port-&gt;sm_mux_state);</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Mux Machine: Port=%d, Last State=%d, Curr State=%d\n",</div><div class='add'>+			  port-&gt;actor_port_number,</div><div class='add'>+			  last_state,</div><div class='add'>+			  port-&gt;sm_mux_state);</div><div class='ctx'> 		switch (port-&gt;sm_mux_state) {</div><div class='ctx'> 		case AD_MUX_DETACHED:</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_SYNCHRONIZATION;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_SYNCHRONIZATION;</div><div class='ctx'> 			ad_disable_collecting_distributing(port,</div><div class='ctx'> 							   update_slave_arr);</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_COLLECTING;</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_DISTRIBUTING;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_COLLECTING;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_DISTRIBUTING;</div><div class='ctx'> 			port-&gt;ntt = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_MUX_WAITING:</div><div class='hunk'>@@ -1042,24 +1183,38 @@ static void ad_mux_machine(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 		case AD_MUX_ATTACHED:</div><div class='ctx'> 			if (port-&gt;aggregator-&gt;is_active)</div><div class='ctx'> 				port-&gt;actor_oper_port_state |=</div><div class='del'>-				    AD_STATE_SYNCHRONIZATION;</div><div class='add'>+				    LACP_STATE_SYNCHRONIZATION;</div><div class='ctx'> 			else</div><div class='ctx'> 				port-&gt;actor_oper_port_state &amp;=</div><div class='del'>-				    ~AD_STATE_SYNCHRONIZATION;</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_COLLECTING;</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_DISTRIBUTING;</div><div class='add'>+				    ~LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_COLLECTING;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_DISTRIBUTING;</div><div class='ctx'> 			ad_disable_collecting_distributing(port,</div><div class='ctx'> 							   update_slave_arr);</div><div class='ctx'> 			port-&gt;ntt = true;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_MUX_COLLECTING_DISTRIBUTING:</div><div class='del'>-			port-&gt;actor_oper_port_state |= AD_STATE_COLLECTING;</div><div class='del'>-			port-&gt;actor_oper_port_state |= AD_STATE_DISTRIBUTING;</div><div class='del'>-			port-&gt;actor_oper_port_state |= AD_STATE_SYNCHRONIZATION;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_COLLECTING;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_DISTRIBUTING;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_SYNCHRONIZATION;</div><div class='ctx'> 			ad_enable_collecting_distributing(port,</div><div class='ctx'> 							  update_slave_arr);</div><div class='ctx'> 			port-&gt;ntt = true;</div><div class='ctx'> 			break;</div><div class='add'>+		case AD_MUX_COLLECTING:</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_COLLECTING;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_DISTRIBUTING;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+			ad_enable_collecting(port);</div><div class='add'>+			ad_disable_distributing(port, update_slave_arr);</div><div class='add'>+			port-&gt;ntt = true;</div><div class='add'>+			break;</div><div class='add'>+		case AD_MUX_DISTRIBUTING:</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_DISTRIBUTING;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+			ad_enable_collecting_distributing(port,</div><div class='add'>+							  update_slave_arr);</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1140,11 +1295,11 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> </div><div class='ctx'> 	/* check if the State machine was changed or new lacpdu arrived */</div><div class='ctx'> 	if ((port-&gt;sm_rx_state != last_state) || (lacpdu)) {</div><div class='del'>-		pr_debug("Rx Machine: Port=%d (%s), Last State=%d, Curr State=%d\n",</div><div class='del'>-			 port-&gt;actor_port_number,</div><div class='del'>-			 port-&gt;slave-&gt;dev-&gt;name,</div><div class='del'>-			 last_state,</div><div class='del'>-			 port-&gt;sm_rx_state);</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Rx Machine: Port=%d, Last State=%d, Curr State=%d\n",</div><div class='add'>+			  port-&gt;actor_port_number,</div><div class='add'>+			  last_state,</div><div class='add'>+			  port-&gt;sm_rx_state);</div><div class='ctx'> 		switch (port-&gt;sm_rx_state) {</div><div class='ctx'> 		case AD_RX_INITIALIZE:</div><div class='ctx'> 			if (!(port-&gt;actor_oper_port_key &amp; AD_DUPLEX_KEY_MASKS))</div><div class='hunk'>@@ -1153,19 +1308,19 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> 				port-&gt;sm_vars |= AD_PORT_LACP_ENABLED;</div><div class='ctx'> 			port-&gt;sm_vars &amp;= ~AD_PORT_SELECTED;</div><div class='ctx'> 			__record_default(port);</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_EXPIRED;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_EXPIRED;</div><div class='ctx'> 			port-&gt;sm_rx_state = AD_RX_PORT_DISABLED;</div><div class='ctx'> </div><div class='del'>-			/* Fall Through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case AD_RX_PORT_DISABLED:</div><div class='ctx'> 			port-&gt;sm_vars &amp;= ~AD_PORT_MATCHED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_RX_LACP_DISABLED:</div><div class='ctx'> 			port-&gt;sm_vars &amp;= ~AD_PORT_SELECTED;</div><div class='ctx'> 			__record_default(port);</div><div class='del'>-			port-&gt;partner_oper.port_state &amp;= ~AD_STATE_AGGREGATION;</div><div class='add'>+			port-&gt;partner_oper.port_state &amp;= ~LACP_STATE_AGGREGATION;</div><div class='ctx'> 			port-&gt;sm_vars |= AD_PORT_MATCHED;</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_EXPIRED;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_EXPIRED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_RX_EXPIRED:</div><div class='ctx'> 			/* Reset of the Synchronization flag (Standard 43.4.12)</div><div class='hunk'>@@ -1174,34 +1329,39 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)</div><div class='ctx'> 			 * case of EXPIRED even if LINK_DOWN didn't arrive for</div><div class='ctx'> 			 * the port.</div><div class='ctx'> 			 */</div><div class='del'>-			port-&gt;partner_oper.port_state &amp;= ~AD_STATE_SYNCHRONIZATION;</div><div class='ctx'> 			port-&gt;sm_vars &amp;= ~AD_PORT_MATCHED;</div><div class='del'>-			port-&gt;partner_oper.port_state |= AD_STATE_LACP_TIMEOUT;</div><div class='del'>-			port-&gt;partner_oper.port_state |= AD_STATE_LACP_ACTIVITY;</div><div class='add'>+			/* Based on IEEE 8021AX-2014, Figure 6-18 - Receive</div><div class='add'>+			 * machine state diagram, the statue should be</div><div class='add'>+			 * Partner_Oper_Port_State.Synchronization = FALSE;</div><div class='add'>+			 * Partner_Oper_Port_State.LACP_Timeout = Short Timeout;</div><div class='add'>+			 * start current_while_timer(Short Timeout);</div><div class='add'>+			 * Actor_Oper_Port_State.Expired = TRUE;</div><div class='add'>+			 */</div><div class='add'>+			port-&gt;partner_oper.port_state &amp;= ~LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+			port-&gt;partner_oper.port_state |= LACP_STATE_LACP_TIMEOUT;</div><div class='ctx'> 			port-&gt;sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(AD_SHORT_TIMEOUT));</div><div class='del'>-			port-&gt;actor_oper_port_state |= AD_STATE_EXPIRED;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_EXPIRED;</div><div class='ctx'> 			port-&gt;sm_vars |= AD_PORT_CHURNED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_RX_DEFAULTED:</div><div class='ctx'> 			__update_default_selected(port);</div><div class='ctx'> 			__record_default(port);</div><div class='ctx'> 			port-&gt;sm_vars |= AD_PORT_MATCHED;</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_EXPIRED;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_EXPIRED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_RX_CURRENT:</div><div class='ctx'> 			/* detect loopback situation */</div><div class='ctx'> 			if (MAC_ADDRESS_EQUAL(&amp;(lacpdu-&gt;actor_system),</div><div class='ctx'> 					      &amp;(port-&gt;actor_system))) {</div><div class='del'>-				netdev_err(port-&gt;slave-&gt;bond-&gt;dev, "An illegal loopback occurred on adapter (%s)\n"</div><div class='del'>-				       "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n",</div><div class='del'>-				       port-&gt;slave-&gt;dev-&gt;name);</div><div class='add'>+				slave_err(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev, "An illegal loopback occurred on slave\n"</div><div class='add'>+					  "Check the configuration to verify that all adapters are connected to 802.3ad compliant switch ports\n");</div><div class='ctx'> 				return;</div><div class='ctx'> 			}</div><div class='ctx'> 			__update_selected(lacpdu, port);</div><div class='ctx'> 			__update_ntt(lacpdu, port);</div><div class='ctx'> 			__record_pdu(lacpdu, port);</div><div class='del'>-			port-&gt;sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(port-&gt;actor_oper_port_state &amp; AD_STATE_LACP_TIMEOUT));</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_EXPIRED;</div><div class='add'>+			port-&gt;sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(port-&gt;actor_oper_port_state &amp; LACP_STATE_LACP_TIMEOUT));</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_EXPIRED;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1229,7 +1389,7 @@ static void ad_churn_machine(struct port *port)</div><div class='ctx'> 	if (port-&gt;sm_churn_actor_timer_counter &amp;&amp;</div><div class='ctx'> 	    !(--port-&gt;sm_churn_actor_timer_counter) &amp;&amp;</div><div class='ctx'> 	    port-&gt;sm_churn_actor_state == AD_CHURN_MONITOR) {</div><div class='del'>-		if (port-&gt;actor_oper_port_state &amp; AD_STATE_SYNCHRONIZATION) {</div><div class='add'>+		if (port-&gt;actor_oper_port_state &amp; LACP_STATE_SYNCHRONIZATION) {</div><div class='ctx'> 			port-&gt;sm_churn_actor_state = AD_NO_CHURN;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			port-&gt;churn_actor_count++;</div><div class='hunk'>@@ -1239,7 +1399,7 @@ static void ad_churn_machine(struct port *port)</div><div class='ctx'> 	if (port-&gt;sm_churn_partner_timer_counter &amp;&amp;</div><div class='ctx'> 	    !(--port-&gt;sm_churn_partner_timer_counter) &amp;&amp;</div><div class='ctx'> 	    port-&gt;sm_churn_partner_state == AD_CHURN_MONITOR) {</div><div class='del'>-		if (port-&gt;partner_oper.port_state &amp; AD_STATE_SYNCHRONIZATION) {</div><div class='add'>+		if (port-&gt;partner_oper.port_state &amp; LACP_STATE_SYNCHRONIZATION) {</div><div class='ctx'> 			port-&gt;sm_churn_partner_state = AD_NO_CHURN;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			port-&gt;churn_partner_count++;</div><div class='hunk'>@@ -1257,25 +1417,28 @@ static void ad_tx_machine(struct port *port)</div><div class='ctx'> 	/* check if tx timer expired, to verify that we do not send more than</div><div class='ctx'> 	 * 3 packets per second</div><div class='ctx'> 	 */</div><div class='del'>-	if (port-&gt;sm_tx_timer_counter &amp;&amp; !(--port-&gt;sm_tx_timer_counter)) {</div><div class='add'>+	if (!port-&gt;sm_tx_timer_counter || !(--port-&gt;sm_tx_timer_counter)) {</div><div class='ctx'> 		/* check if there is something to send */</div><div class='ctx'> 		if (port-&gt;ntt &amp;&amp; (port-&gt;sm_vars &amp; AD_PORT_LACP_ENABLED)) {</div><div class='ctx'> 			__update_lacpdu_from_port(port);</div><div class='ctx'> </div><div class='ctx'> 			if (ad_lacpdu_send(port) &gt;= 0) {</div><div class='del'>-				pr_debug("Sent LACPDU on port %d\n",</div><div class='del'>-					 port-&gt;actor_port_number);</div><div class='add'>+				slave_dbg(port-&gt;slave-&gt;bond-&gt;dev,</div><div class='add'>+					  port-&gt;slave-&gt;dev,</div><div class='add'>+					  "Sent LACPDU on port %d\n",</div><div class='add'>+					  port-&gt;actor_port_number);</div><div class='ctx'> </div><div class='ctx'> 				/* mark ntt as false, so it will not be sent</div><div class='ctx'> 				 * again until demanded</div><div class='ctx'> 				 */</div><div class='ctx'> 				port-&gt;ntt = false;</div><div class='add'>+</div><div class='add'>+				/* restart tx timer(to verify that we will not</div><div class='add'>+				 * exceed AD_MAX_TX_IN_SECOND</div><div class='add'>+				 */</div><div class='add'>+				port-&gt;sm_tx_timer_counter = ad_ticks_per_sec / AD_MAX_TX_IN_SECOND;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		/* restart tx timer(to verify that we will not exceed</div><div class='del'>-		 * AD_MAX_TX_IN_SECOND</div><div class='del'>-		 */</div><div class='del'>-		port-&gt;sm_tx_timer_counter = ad_ticks_per_sec/AD_MAX_TX_IN_SECOND;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1294,8 +1457,7 @@ static void ad_periodic_machine(struct port *port)</div><div class='ctx'> </div><div class='ctx'> 	/* check if port was reinitialized */</div><div class='ctx'> 	if (((port-&gt;sm_vars &amp; AD_PORT_BEGIN) || !(port-&gt;sm_vars &amp; AD_PORT_LACP_ENABLED) || !port-&gt;is_enabled) ||</div><div class='del'>-	    (!(port-&gt;actor_oper_port_state &amp; AD_STATE_LACP_ACTIVITY) &amp;&amp; !(port-&gt;partner_oper.port_state &amp; AD_STATE_LACP_ACTIVITY))</div><div class='del'>-	   ) {</div><div class='add'>+	    (!(port-&gt;actor_oper_port_state &amp; LACP_STATE_LACP_ACTIVITY) &amp;&amp; !(port-&gt;partner_oper.port_state &amp; LACP_STATE_LACP_ACTIVITY))) {</div><div class='ctx'> 		port-&gt;sm_periodic_state = AD_NO_PERIODIC;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* check if state machine should change state */</div><div class='hunk'>@@ -1311,11 +1473,11 @@ static void ad_periodic_machine(struct port *port)</div><div class='ctx'> 			switch (port-&gt;sm_periodic_state) {</div><div class='ctx'> 			case AD_FAST_PERIODIC:</div><div class='ctx'> 				if (!(port-&gt;partner_oper.port_state</div><div class='del'>-				      &amp; AD_STATE_LACP_TIMEOUT))</div><div class='add'>+				      &amp; LACP_STATE_LACP_TIMEOUT))</div><div class='ctx'> 					port-&gt;sm_periodic_state = AD_SLOW_PERIODIC;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case AD_SLOW_PERIODIC:</div><div class='del'>-				if ((port-&gt;partner_oper.port_state &amp; AD_STATE_LACP_TIMEOUT)) {</div><div class='add'>+				if ((port-&gt;partner_oper.port_state &amp; LACP_STATE_LACP_TIMEOUT)) {</div><div class='ctx'> 					port-&gt;sm_periodic_timer_counter = 0;</div><div class='ctx'> 					port-&gt;sm_periodic_state = AD_PERIODIC_TX;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -1331,7 +1493,7 @@ static void ad_periodic_machine(struct port *port)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_PERIODIC_TX:</div><div class='ctx'> 			if (!(port-&gt;partner_oper.port_state &amp;</div><div class='del'>-			    AD_STATE_LACP_TIMEOUT))</div><div class='add'>+			    LACP_STATE_LACP_TIMEOUT))</div><div class='ctx'> 				port-&gt;sm_periodic_state = AD_SLOW_PERIODIC;</div><div class='ctx'> 			else</div><div class='ctx'> 				port-&gt;sm_periodic_state = AD_FAST_PERIODIC;</div><div class='hunk'>@@ -1343,9 +1505,10 @@ static void ad_periodic_machine(struct port *port)</div><div class='ctx'> </div><div class='ctx'> 	/* check if the state machine was changed */</div><div class='ctx'> 	if (port-&gt;sm_periodic_state != last_state) {</div><div class='del'>-		pr_debug("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",</div><div class='del'>-			 port-&gt;actor_port_number, last_state,</div><div class='del'>-			 port-&gt;sm_periodic_state);</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n",</div><div class='add'>+			  port-&gt;actor_port_number, last_state,</div><div class='add'>+			  port-&gt;sm_periodic_state);</div><div class='ctx'> 		switch (port-&gt;sm_periodic_state) {</div><div class='ctx'> 		case AD_NO_PERIODIC:</div><div class='ctx'> 			port-&gt;sm_periodic_timer_counter = 0;</div><div class='hunk'>@@ -1421,9 +1584,9 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 				port-&gt;next_port_in_aggregator = NULL;</div><div class='ctx'> 				port-&gt;actor_port_aggregator_identifier = 0;</div><div class='ctx'> </div><div class='del'>-				netdev_dbg(bond-&gt;dev, "Port %d left LAG %d\n",</div><div class='del'>-					   port-&gt;actor_port_number,</div><div class='del'>-					   temp_aggregator-&gt;aggregator_identifier);</div><div class='add'>+				slave_dbg(bond-&gt;dev, port-&gt;slave-&gt;dev, "Port %d left LAG %d\n",</div><div class='add'>+					  port-&gt;actor_port_number,</div><div class='add'>+					  temp_aggregator-&gt;aggregator_identifier);</div><div class='ctx'> 				/* if the aggregator is empty, clear its</div><div class='ctx'> 				 * parameters, and set it ready to be attached</div><div class='ctx'> 				 */</div><div class='hunk'>@@ -1436,10 +1599,10 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 			/* meaning: the port was related to an aggregator</div><div class='ctx'> 			 * but was not on the aggregator port list</div><div class='ctx'> 			 */</div><div class='del'>-			net_warn_ratelimited("%s: Warning: Port %d (on %s) was related to aggregator %d but was not on its port list\n",</div><div class='add'>+			net_warn_ratelimited("%s: (slave %s): Warning: Port %d was related to aggregator %d but was not on its port list\n",</div><div class='ctx'> 					     port-&gt;slave-&gt;bond-&gt;dev-&gt;name,</div><div class='del'>-					     port-&gt;actor_port_number,</div><div class='ctx'> 					     port-&gt;slave-&gt;dev-&gt;name,</div><div class='add'>+					     port-&gt;actor_port_number,</div><div class='ctx'> 					     port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1459,7 +1622,7 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 		     (aggregator-&gt;partner_system_priority == port-&gt;partner_oper.system_priority) &amp;&amp;</div><div class='ctx'> 		     (aggregator-&gt;partner_oper_aggregator_key == port-&gt;partner_oper.key)</div><div class='ctx'> 		    ) &amp;&amp;</div><div class='del'>-		    ((!MAC_ADDRESS_EQUAL(&amp;(port-&gt;partner_oper.system), &amp;(null_mac_addr)) &amp;&amp; /* partner answers */</div><div class='add'>+		    ((__agg_has_partner(aggregator) &amp;&amp; /* partner answers */</div><div class='ctx'> 		      !aggregator-&gt;is_individual)  /* but is not individual OR */</div><div class='ctx'> 		    )</div><div class='ctx'> 		   ) {</div><div class='hunk'>@@ -1470,9 +1633,9 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 			port-&gt;next_port_in_aggregator = aggregator-&gt;lag_ports;</div><div class='ctx'> 			port-&gt;aggregator-&gt;num_of_ports++;</div><div class='ctx'> 			aggregator-&gt;lag_ports = port;</div><div class='del'>-			netdev_dbg(bond-&gt;dev, "Port %d joined LAG %d(existing LAG)\n",</div><div class='del'>-				   port-&gt;actor_port_number,</div><div class='del'>-				   port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='add'>+			slave_dbg(bond-&gt;dev, slave-&gt;dev, "Port %d joined LAG %d (existing LAG)\n",</div><div class='add'>+				  port-&gt;actor_port_number,</div><div class='add'>+				  port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='ctx'> </div><div class='ctx'> 			/* mark this port as selected */</div><div class='ctx'> 			port-&gt;sm_vars |= AD_PORT_SELECTED;</div><div class='hunk'>@@ -1517,12 +1680,14 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 			/* mark this port as selected */</div><div class='ctx'> 			port-&gt;sm_vars |= AD_PORT_SELECTED;</div><div class='ctx'> </div><div class='del'>-			netdev_dbg(bond-&gt;dev, "Port %d joined LAG %d(new LAG)\n",</div><div class='del'>-				   port-&gt;actor_port_number,</div><div class='del'>-				   port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='add'>+			slave_dbg(bond-&gt;dev, port-&gt;slave-&gt;dev, "Port %d joined LAG %d (new LAG)\n",</div><div class='add'>+				  port-&gt;actor_port_number,</div><div class='add'>+				  port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='ctx'> 		} else {</div><div class='del'>-			netdev_err(bond-&gt;dev, "Port %d (on %s) did not find a suitable aggregator\n",</div><div class='del'>-			       port-&gt;actor_port_number, port-&gt;slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_err(bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+				  "Port %d did not find a suitable aggregator\n",</div><div class='add'>+				  port-&gt;actor_port_number);</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* if all aggregator's ports are READY_N == TRUE, set ready=TRUE</div><div class='hunk'>@@ -1536,7 +1701,7 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr)</div><div class='ctx'> 	ad_agg_selection_logic(aggregator, update_slave_arr);</div><div class='ctx'> </div><div class='ctx'> 	if (!port-&gt;aggregator-&gt;is_active)</div><div class='del'>-		port-&gt;actor_oper_port_state &amp;= ~AD_STATE_SYNCHRONIZATION;</div><div class='add'>+		port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_SYNCHRONIZATION;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Decide if "agg" is a better choice for the new active aggregator that</div><div class='hunk'>@@ -1564,6 +1729,9 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,</div><div class='ctx'> 	 * 4.  Therefore, current and best both have partner replies or</div><div class='ctx'> 	 *     both do not, so perform selection policy:</div><div class='ctx'> 	 *</div><div class='add'>+	 * BOND_AD_PRIO: Select by total priority of ports. If priority</div><div class='add'>+	 *     is equal, select by count.</div><div class='add'>+	 *</div><div class='ctx'> 	 * BOND_AD_COUNT: Select by count of ports.  If count is equal,</div><div class='ctx'> 	 *     select by bandwidth.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1585,6 +1753,14 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,</div><div class='ctx'> 		return best;</div><div class='ctx'> </div><div class='ctx'> 	switch (__get_agg_selection_mode(curr-&gt;lag_ports)) {</div><div class='add'>+	case BOND_AD_PRIO:</div><div class='add'>+		if (__agg_ports_priority(curr) &gt; __agg_ports_priority(best))</div><div class='add'>+			return curr;</div><div class='add'>+</div><div class='add'>+		if (__agg_ports_priority(curr) &lt; __agg_ports_priority(best))</div><div class='add'>+			return best;</div><div class='add'>+</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BOND_AD_COUNT:</div><div class='ctx'> 		if (__agg_active_ports(curr) &gt; __agg_active_ports(best))</div><div class='ctx'> 			return curr;</div><div class='hunk'>@@ -1592,7 +1768,7 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,</div><div class='ctx'> 		if (__agg_active_ports(curr) &lt; __agg_active_ports(best))</div><div class='ctx'> 			return best;</div><div class='ctx'> </div><div class='del'>-		/*FALLTHROUGH*/</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BOND_AD_STABLE:</div><div class='ctx'> 	case BOND_AD_BANDWIDTH:</div><div class='ctx'> 		if (__get_agg_bandwidth(curr) &gt; __get_agg_bandwidth(best))</div><div class='hunk'>@@ -1601,8 +1777,9 @@ static struct aggregator *ad_agg_selection_test(struct aggregator *best,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		net_warn_ratelimited("%s: Impossible agg select mode %d\n",</div><div class='add'>+		net_warn_ratelimited("%s: (slave %s): Impossible agg select mode %d\n",</div><div class='ctx'> 				     curr-&gt;slave-&gt;bond-&gt;dev-&gt;name,</div><div class='add'>+				     curr-&gt;slave-&gt;dev-&gt;name,</div><div class='ctx'> 				     __get_agg_selection_mode(curr-&gt;lag_ports));</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1629,7 +1806,7 @@ static int agg_device_up(const struct aggregator *agg)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ad_agg_selection_logic - select an aggregation group for a team</div><div class='del'>- * @aggregator: the aggregator we're looking at</div><div class='add'>+ * @agg: the aggregator we're looking at</div><div class='ctx'>  * @update_slave_arr: Does slave array need update?</div><div class='ctx'>  *</div><div class='ctx'>  * It is assumed that only one aggregator may be selected for a team.</div><div class='hunk'>@@ -1649,6 +1826,10 @@ static int agg_device_up(const struct aggregator *agg)</div><div class='ctx'>  * (slaves), and reselect whenever a link state change takes place or the</div><div class='ctx'>  * set of slaves in the bond changes.</div><div class='ctx'>  *</div><div class='add'>+ * BOND_AD_PRIO: select the aggregator with highest total priority of ports</div><div class='add'>+ * (slaves), and reselect whenever a link state change takes place or the</div><div class='add'>+ * set of slaves in the bond changes.</div><div class='add'>+ *</div><div class='ctx'>  * FIXME: this function MUST be called with the first agg in the bond, or</div><div class='ctx'>  * __get_active_agg() won't work correctly. This function should be better</div><div class='ctx'>  * called with the bond itself, and retrieve the first agg from it.</div><div class='hunk'>@@ -1703,36 +1884,37 @@ static void ad_agg_selection_logic(struct aggregator *agg,</div><div class='ctx'> </div><div class='ctx'> 	/* if there is new best aggregator, activate it */</div><div class='ctx'> 	if (best) {</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "(slave %s): best Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",</div><div class='add'>+			   best-&gt;slave ? best-&gt;slave-&gt;dev-&gt;name : "NULL",</div><div class='ctx'> 			   best-&gt;aggregator_identifier, best-&gt;num_of_ports,</div><div class='ctx'> 			   best-&gt;actor_oper_aggregator_key,</div><div class='ctx'> 			   best-&gt;partner_oper_aggregator_key,</div><div class='ctx'> 			   best-&gt;is_individual, best-&gt;is_active);</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "best ports %p slave %p %s\n",</div><div class='del'>-			   best-&gt;lag_ports, best-&gt;slave,</div><div class='del'>-			   best-&gt;slave ? best-&gt;slave-&gt;dev-&gt;name : "NULL");</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "(slave %s): best ports %p slave %p\n",</div><div class='add'>+			   best-&gt;slave ? best-&gt;slave-&gt;dev-&gt;name : "NULL",</div><div class='add'>+			   best-&gt;lag_ports, best-&gt;slave);</div><div class='ctx'> </div><div class='ctx'> 		bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 			agg = &amp;(SLAVE_AD_INFO(slave)-&gt;aggregator);</div><div class='ctx'> </div><div class='del'>-			netdev_dbg(bond-&gt;dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",</div><div class='del'>-				   agg-&gt;aggregator_identifier, agg-&gt;num_of_ports,</div><div class='del'>-				   agg-&gt;actor_oper_aggregator_key,</div><div class='del'>-				   agg-&gt;partner_oper_aggregator_key,</div><div class='del'>-				   agg-&gt;is_individual, agg-&gt;is_active);</div><div class='add'>+			slave_dbg(bond-&gt;dev, slave-&gt;dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",</div><div class='add'>+				  agg-&gt;aggregator_identifier, agg-&gt;num_of_ports,</div><div class='add'>+				  agg-&gt;actor_oper_aggregator_key,</div><div class='add'>+				  agg-&gt;partner_oper_aggregator_key,</div><div class='add'>+				  agg-&gt;is_individual, agg-&gt;is_active);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* check if any partner replys */</div><div class='del'>-		if (best-&gt;is_individual) {</div><div class='add'>+		/* check if any partner replies */</div><div class='add'>+		if (best-&gt;is_individual)</div><div class='ctx'> 			net_warn_ratelimited("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",</div><div class='del'>-					     best-&gt;slave ?</div><div class='del'>-					     best-&gt;slave-&gt;bond-&gt;dev-&gt;name : "NULL");</div><div class='del'>-		}</div><div class='add'>+					     bond-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 		best-&gt;is_active = 1;</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "LAG %d chosen as the active LAG\n",</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "(slave %s): LAG %d chosen as the active LAG\n",</div><div class='add'>+			   best-&gt;slave ? best-&gt;slave-&gt;dev-&gt;name : "NULL",</div><div class='ctx'> 			   best-&gt;aggregator_identifier);</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "(slave %s): Agg=%d; P=%d; a k=%d; p k=%d; Ind=%d; Act=%d\n",</div><div class='add'>+			   best-&gt;slave ? best-&gt;slave-&gt;dev-&gt;name : "NULL",</div><div class='ctx'> 			   best-&gt;aggregator_identifier, best-&gt;num_of_ports,</div><div class='ctx'> 			   best-&gt;actor_oper_aggregator_key,</div><div class='ctx'> 			   best-&gt;partner_oper_aggregator_key,</div><div class='hunk'>@@ -1762,6 +1944,7 @@ static void ad_agg_selection_logic(struct aggregator *agg,</div><div class='ctx'> 			     port = port-&gt;next_port_in_aggregator) {</div><div class='ctx'> 				__enable_port(port);</div><div class='ctx'> 			}</div><div class='add'>+			*update_slave_arr = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1788,7 +1971,9 @@ static void ad_clear_agg(struct aggregator *aggregator)</div><div class='ctx'> 		aggregator-&gt;lag_ports = NULL;</div><div class='ctx'> 		aggregator-&gt;is_active = 0;</div><div class='ctx'> 		aggregator-&gt;num_of_ports = 0;</div><div class='del'>-		pr_debug("LAG %d was cleared\n",</div><div class='add'>+		pr_debug("%s: LAG %d was cleared\n",</div><div class='add'>+			 aggregator-&gt;slave ?</div><div class='add'>+			 aggregator-&gt;slave-&gt;dev-&gt;name : "NULL",</div><div class='ctx'> 			 aggregator-&gt;aggregator_identifier);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1810,17 +1995,17 @@ static void ad_initialize_agg(struct aggregator *aggregator)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ad_initialize_port - initialize a given port's parameters</div><div class='del'>- * @aggregator: the aggregator we're looking at</div><div class='del'>- * @lacp_fast: boolean. whether fast periodic should be used</div><div class='add'>+ * @port: the port we're looking at</div><div class='add'>+ * @bond_params: bond parameters we will use</div><div class='ctx'>  */</div><div class='del'>-static void ad_initialize_port(struct port *port, int lacp_fast)</div><div class='add'>+static void ad_initialize_port(struct port *port, const struct bond_params *bond_params)</div><div class='ctx'> {</div><div class='ctx'> 	static const struct port_params tmpl = {</div><div class='ctx'> 		.system_priority = 0xffff,</div><div class='ctx'> 		.key             = 1,</div><div class='ctx'> 		.port_number     = 1,</div><div class='ctx'> 		.port_priority   = 0xff,</div><div class='del'>-		.port_state      = 1,</div><div class='add'>+		.port_state      = 0,</div><div class='ctx'> 	};</div><div class='ctx'> 	static const struct lacpdu lacpdu = {</div><div class='ctx'> 		.subtype		= 0x01,</div><div class='hunk'>@@ -1838,13 +2023,15 @@ static void ad_initialize_port(struct port *port, int lacp_fast)</div><div class='ctx'> 		port-&gt;actor_port_priority = 0xff;</div><div class='ctx'> 		port-&gt;actor_port_aggregator_identifier = 0;</div><div class='ctx'> 		port-&gt;ntt = false;</div><div class='del'>-		port-&gt;actor_admin_port_state = AD_STATE_AGGREGATION |</div><div class='del'>-					       AD_STATE_LACP_ACTIVITY;</div><div class='del'>-		port-&gt;actor_oper_port_state  = AD_STATE_AGGREGATION |</div><div class='del'>-					       AD_STATE_LACP_ACTIVITY;</div><div class='add'>+		port-&gt;actor_admin_port_state = LACP_STATE_AGGREGATION;</div><div class='add'>+		port-&gt;actor_oper_port_state  = LACP_STATE_AGGREGATION;</div><div class='add'>+		if (bond_params-&gt;lacp_active) {</div><div class='add'>+			port-&gt;actor_admin_port_state |= LACP_STATE_LACP_ACTIVITY;</div><div class='add'>+			port-&gt;actor_oper_port_state  |= LACP_STATE_LACP_ACTIVITY;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (lacp_fast)</div><div class='del'>-			port-&gt;actor_oper_port_state |= AD_STATE_LACP_TIMEOUT;</div><div class='add'>+		if (bond_params-&gt;lacp_fast)</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_LACP_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(&amp;port-&gt;partner_admin, &amp;tmpl, sizeof(tmpl));</div><div class='ctx'> 		memcpy(&amp;port-&gt;partner_oper, &amp;tmpl, sizeof(tmpl));</div><div class='hunk'>@@ -1875,6 +2062,43 @@ static void ad_initialize_port(struct port *port, int lacp_fast)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * ad_enable_collecting - enable a port's receive</div><div class='add'>+ * @port: the port we're looking at</div><div class='add'>+ *</div><div class='add'>+ * Enable @port if it's in an active aggregator</div><div class='add'>+ */</div><div class='add'>+static void ad_enable_collecting(struct port *port)</div><div class='add'>+{</div><div class='add'>+	if (port-&gt;aggregator-&gt;is_active) {</div><div class='add'>+		struct slave *slave = port-&gt;slave;</div><div class='add'>+</div><div class='add'>+		slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+			  "Enabling collecting on port %d (LAG %d)\n",</div><div class='add'>+			  port-&gt;actor_port_number,</div><div class='add'>+			  port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='add'>+		__enable_collecting_port(port);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ad_disable_distributing - disable a port's transmit</div><div class='add'>+ * @port: the port we're looking at</div><div class='add'>+ * @update_slave_arr: Does slave array need update?</div><div class='add'>+ */</div><div class='add'>+static void ad_disable_distributing(struct port *port, bool *update_slave_arr)</div><div class='add'>+{</div><div class='add'>+	if (port-&gt;aggregator &amp;&amp; __agg_has_partner(port-&gt;aggregator)) {</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Disabling distributing on port %d (LAG %d)\n",</div><div class='add'>+			  port-&gt;actor_port_number,</div><div class='add'>+			  port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='add'>+		__disable_distributing_port(port);</div><div class='add'>+		/* Slave array needs an update */</div><div class='add'>+		*update_slave_arr = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * ad_enable_collecting_distributing - enable a port's transmit/receive</div><div class='ctx'>  * @port: the port we're looking at</div><div class='ctx'>  * @update_slave_arr: Does slave array need update?</div><div class='hunk'>@@ -1885,12 +2109,15 @@ static void ad_enable_collecting_distributing(struct port *port,</div><div class='ctx'> 					      bool *update_slave_arr)</div><div class='ctx'> {</div><div class='ctx'> 	if (port-&gt;aggregator-&gt;is_active) {</div><div class='del'>-		pr_debug("Enabling port %d(LAG %d)\n",</div><div class='del'>-			 port-&gt;actor_port_number,</div><div class='del'>-			 port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Enabling port %d (LAG %d)\n",</div><div class='add'>+			  port-&gt;actor_port_number,</div><div class='add'>+			  port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='ctx'> 		__enable_port(port);</div><div class='ctx'> 		/* Slave array needs update */</div><div class='ctx'> 		*update_slave_arr = true;</div><div class='add'>+		/* Should notify peers if possible */</div><div class='add'>+		ad_cond_set_peer_notif(port);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1902,12 +2129,11 @@ static void ad_enable_collecting_distributing(struct port *port,</div><div class='ctx'> static void ad_disable_collecting_distributing(struct port *port,</div><div class='ctx'> 					       bool *update_slave_arr)</div><div class='ctx'> {</div><div class='del'>-	if (port-&gt;aggregator &amp;&amp;</div><div class='del'>-	    !MAC_ADDRESS_EQUAL(&amp;(port-&gt;aggregator-&gt;partner_system),</div><div class='del'>-			       &amp;(null_mac_addr))) {</div><div class='del'>-		pr_debug("Disabling port %d(LAG %d)\n",</div><div class='del'>-			 port-&gt;actor_port_number,</div><div class='del'>-			 port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='add'>+	if (port-&gt;aggregator &amp;&amp; __agg_has_partner(port-&gt;aggregator)) {</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Disabling port %d (LAG %d)\n",</div><div class='add'>+			  port-&gt;actor_port_number,</div><div class='add'>+			  port-&gt;aggregator-&gt;aggregator_identifier);</div><div class='ctx'> 		__disable_port(port);</div><div class='ctx'> 		/* Slave array needs an update */</div><div class='ctx'> 		*update_slave_arr = true;</div><div class='hunk'>@@ -1920,7 +2146,7 @@ static void ad_disable_collecting_distributing(struct port *port,</div><div class='ctx'>  * @port: the port we're looking at</div><div class='ctx'>  */</div><div class='ctx'> static void ad_marker_info_received(struct bond_marker *marker_info,</div><div class='del'>-	struct port *port)</div><div class='add'>+				    struct port *port)</div><div class='ctx'> {</div><div class='ctx'> 	struct bond_marker marker;</div><div class='ctx'> </div><div class='hunk'>@@ -1933,10 +2159,10 @@ static void ad_marker_info_received(struct bond_marker *marker_info,</div><div class='ctx'> 	marker.tlv_type = AD_MARKER_RESPONSE_SUBTYPE;</div><div class='ctx'> </div><div class='ctx'> 	/* send the marker response */</div><div class='del'>-	if (ad_marker_send(port, &amp;marker) &gt;= 0) {</div><div class='del'>-		pr_debug("Sent Marker Response on port %d\n",</div><div class='del'>-			 port-&gt;actor_port_number);</div><div class='del'>-	}</div><div class='add'>+	if (ad_marker_send(port, &amp;marker) &gt;= 0)</div><div class='add'>+		slave_dbg(port-&gt;slave-&gt;bond-&gt;dev, port-&gt;slave-&gt;dev,</div><div class='add'>+			  "Sent Marker Response on port %d\n",</div><div class='add'>+			  port-&gt;actor_port_number);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1965,6 +2191,7 @@ static void ad_marker_response_received(struct bond_marker *marker,</div><div class='ctx'> /**</div><div class='ctx'>  * bond_3ad_initiate_agg_selection - initate aggregator selection</div><div class='ctx'>  * @bond: bonding struct</div><div class='add'>+ * @timeout: timeout value to set</div><div class='ctx'>  *</div><div class='ctx'>  * Set the aggregation selection timer, to initiate an agg selection in</div><div class='ctx'>  * the very near future.  Called during first initialization, and during</div><div class='hunk'>@@ -1972,42 +2199,30 @@ static void ad_marker_response_received(struct bond_marker *marker,</div><div class='ctx'>  */</div><div class='ctx'> void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)</div><div class='ctx'> {</div><div class='del'>-	BOND_AD_INFO(bond).agg_select_timer = timeout;</div><div class='add'>+	atomic_set(&amp;BOND_AD_INFO(bond).agg_select_timer, timeout);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bond_3ad_initialize - initialize a bond's 802.3ad parameters and structures</div><div class='ctx'>  * @bond: bonding struct to work on</div><div class='del'>- * @tick_resolution: tick duration (millisecond resolution)</div><div class='ctx'>  *</div><div class='ctx'>  * Can be called only after the mac address of the bond is set.</div><div class='ctx'>  */</div><div class='del'>-void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)</div><div class='add'>+void bond_3ad_initialize(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	/* check that the bond is not initialized yet */</div><div class='del'>-	if (!MAC_ADDRESS_EQUAL(&amp;(BOND_AD_INFO(bond).system.sys_mac_addr),</div><div class='del'>-				bond-&gt;dev-&gt;dev_addr)) {</div><div class='del'>-</div><div class='del'>-		BOND_AD_INFO(bond).aggregator_identifier = 0;</div><div class='del'>-</div><div class='del'>-		BOND_AD_INFO(bond).system.sys_priority =</div><div class='del'>-			bond-&gt;params.ad_actor_sys_prio;</div><div class='del'>-		if (is_zero_ether_addr(bond-&gt;params.ad_actor_system))</div><div class='del'>-			BOND_AD_INFO(bond).system.sys_mac_addr =</div><div class='del'>-			    *((struct mac_addr *)bond-&gt;dev-&gt;dev_addr);</div><div class='del'>-		else</div><div class='del'>-			BOND_AD_INFO(bond).system.sys_mac_addr =</div><div class='del'>-			    *((struct mac_addr *)bond-&gt;params.ad_actor_system);</div><div class='del'>-</div><div class='del'>-		/* initialize how many times this module is called in one</div><div class='del'>-		 * second (should be about every 100ms)</div><div class='del'>-		 */</div><div class='del'>-		ad_ticks_per_sec = tick_resolution;</div><div class='add'>+	BOND_AD_INFO(bond).aggregator_identifier = 0;</div><div class='add'>+	BOND_AD_INFO(bond).system.sys_priority =</div><div class='add'>+		bond-&gt;params.ad_actor_sys_prio;</div><div class='add'>+	if (is_zero_ether_addr(bond-&gt;params.ad_actor_system))</div><div class='add'>+		BOND_AD_INFO(bond).system.sys_mac_addr =</div><div class='add'>+		    *((struct mac_addr *)bond-&gt;dev-&gt;dev_addr);</div><div class='add'>+	else</div><div class='add'>+		BOND_AD_INFO(bond).system.sys_mac_addr =</div><div class='add'>+		    *((struct mac_addr *)bond-&gt;params.ad_actor_system);</div><div class='ctx'> </div><div class='del'>-		bond_3ad_initiate_agg_selection(bond,</div><div class='del'>-						AD_AGGREGATOR_SELECTION_TIMER *</div><div class='del'>-						ad_ticks_per_sec);</div><div class='del'>-	}</div><div class='add'>+	bond_3ad_initiate_agg_selection(bond,</div><div class='add'>+					AD_AGGREGATOR_SELECTION_TIMER *</div><div class='add'>+					ad_ticks_per_sec);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2029,7 +2244,10 @@ void bond_3ad_bind_slave(struct slave *slave)</div><div class='ctx'> 		/* port initialization */</div><div class='ctx'> 		port = &amp;(SLAVE_AD_INFO(slave)-&gt;port);</div><div class='ctx'> </div><div class='del'>-		ad_initialize_port(port, bond-&gt;params.lacp_fast);</div><div class='add'>+		ad_initialize_port(port, &amp;bond-&gt;params);</div><div class='add'>+</div><div class='add'>+		/* Port priority is initialized. Update it to slave's ad info */</div><div class='add'>+		SLAVE_AD_INFO(slave)-&gt;port_priority = port-&gt;actor_port_priority;</div><div class='ctx'> </div><div class='ctx'> 		port-&gt;slave = slave;</div><div class='ctx'> 		port-&gt;actor_port_number = SLAVE_AD_INFO(slave)-&gt;id;</div><div class='hunk'>@@ -2085,19 +2303,18 @@ void bond_3ad_unbind_slave(struct slave *slave)</div><div class='ctx'> </div><div class='ctx'> 	/* if slave is null, the whole port is not initialized */</div><div class='ctx'> 	if (!port-&gt;slave) {</div><div class='del'>-		netdev_warn(bond-&gt;dev, "Trying to unbind an uninitialized port on %s\n",</div><div class='del'>-			    slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_warn(bond-&gt;dev, slave-&gt;dev, "Trying to unbind an uninitialized port\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond-&gt;dev, "Unbinding Link Aggregation Group %d\n",</div><div class='del'>-		   aggregator-&gt;aggregator_identifier);</div><div class='add'>+	slave_dbg(bond-&gt;dev, slave-&gt;dev, "Unbinding Link Aggregation Group %d\n",</div><div class='add'>+		  aggregator-&gt;aggregator_identifier);</div><div class='ctx'> </div><div class='ctx'> 	/* Tell the partner that this port is not suitable for aggregation */</div><div class='del'>-	port-&gt;actor_oper_port_state &amp;= ~AD_STATE_SYNCHRONIZATION;</div><div class='del'>-	port-&gt;actor_oper_port_state &amp;= ~AD_STATE_COLLECTING;</div><div class='del'>-	port-&gt;actor_oper_port_state &amp;= ~AD_STATE_DISTRIBUTING;</div><div class='del'>-	port-&gt;actor_oper_port_state &amp;= ~AD_STATE_AGGREGATION;</div><div class='add'>+	port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_SYNCHRONIZATION;</div><div class='add'>+	port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_COLLECTING;</div><div class='add'>+	port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_DISTRIBUTING;</div><div class='add'>+	port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_AGGREGATION;</div><div class='ctx'> 	__update_lacpdu_from_port(port);</div><div class='ctx'> 	ad_lacpdu_send(port);</div><div class='ctx'> </div><div class='hunk'>@@ -2129,13 +2346,13 @@ void bond_3ad_unbind_slave(struct slave *slave)</div><div class='ctx'> 			 * new aggregator</div><div class='ctx'> 			 */</div><div class='ctx'> 			if ((new_aggregator) &amp;&amp; ((!new_aggregator-&gt;lag_ports) || ((new_aggregator-&gt;lag_ports == port) &amp;&amp; !new_aggregator-&gt;lag_ports-&gt;next_port_in_aggregator))) {</div><div class='del'>-				netdev_dbg(bond-&gt;dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",</div><div class='del'>-					   aggregator-&gt;aggregator_identifier,</div><div class='del'>-					   new_aggregator-&gt;aggregator_identifier);</div><div class='add'>+				slave_dbg(bond-&gt;dev, slave-&gt;dev, "Some port(s) related to LAG %d - replacing with LAG %d\n",</div><div class='add'>+					  aggregator-&gt;aggregator_identifier,</div><div class='add'>+					  new_aggregator-&gt;aggregator_identifier);</div><div class='ctx'> </div><div class='ctx'> 				if ((new_aggregator-&gt;lag_ports == port) &amp;&amp;</div><div class='ctx'> 				    new_aggregator-&gt;is_active) {</div><div class='del'>-					netdev_info(bond-&gt;dev, "Removing an active aggregator\n");</div><div class='add'>+					slave_info(bond-&gt;dev, slave-&gt;dev, "Removing an active aggregator\n");</div><div class='ctx'> 					select_new_active_agg = 1;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -2166,7 +2383,7 @@ void bond_3ad_unbind_slave(struct slave *slave)</div><div class='ctx'> 					ad_agg_selection_logic(__get_first_agg(port),</div><div class='ctx'> 							       &amp;dummy_slave_update);</div><div class='ctx'> 			} else {</div><div class='del'>-				netdev_warn(bond-&gt;dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");</div><div class='add'>+				slave_warn(bond-&gt;dev, slave-&gt;dev, "unbinding aggregator, and could not find a new aggregator for its ports\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* in case that the only port related to this</div><div class='hunk'>@@ -2175,7 +2392,7 @@ void bond_3ad_unbind_slave(struct slave *slave)</div><div class='ctx'> 			select_new_active_agg = aggregator-&gt;is_active;</div><div class='ctx'> 			ad_clear_agg(aggregator);</div><div class='ctx'> 			if (select_new_active_agg) {</div><div class='del'>-				netdev_info(bond-&gt;dev, "Removing an active aggregator\n");</div><div class='add'>+				slave_info(bond-&gt;dev, slave-&gt;dev, "Removing an active aggregator\n");</div><div class='ctx'> 				/* select new active aggregator */</div><div class='ctx'> 				temp_aggregator = __get_first_agg(port);</div><div class='ctx'> 				if (temp_aggregator)</div><div class='hunk'>@@ -2185,7 +2402,7 @@ void bond_3ad_unbind_slave(struct slave *slave)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond-&gt;dev, "Unbinding port %d\n", port-&gt;actor_port_number);</div><div class='add'>+	slave_dbg(bond-&gt;dev, slave-&gt;dev, "Unbinding port %d\n", port-&gt;actor_port_number);</div><div class='ctx'> </div><div class='ctx'> 	/* find the aggregator that this port is connected to */</div><div class='ctx'> 	bond_for_each_slave(bond, slave_iter, iter) {</div><div class='hunk'>@@ -2206,9 +2423,10 @@ void bond_3ad_unbind_slave(struct slave *slave)</div><div class='ctx'> 				temp_aggregator-&gt;num_of_ports--;</div><div class='ctx'> 				if (__agg_active_ports(temp_aggregator) == 0) {</div><div class='ctx'> 					select_new_active_agg = temp_aggregator-&gt;is_active;</div><div class='del'>-					ad_clear_agg(temp_aggregator);</div><div class='add'>+					if (temp_aggregator-&gt;num_of_ports == 0)</div><div class='add'>+						ad_clear_agg(temp_aggregator);</div><div class='ctx'> 					if (select_new_active_agg) {</div><div class='del'>-						netdev_info(bond-&gt;dev, "Removing an active aggregator\n");</div><div class='add'>+						slave_info(bond-&gt;dev, slave-&gt;dev, "Removing an active aggregator\n");</div><div class='ctx'> 						/* select new active aggregator */</div><div class='ctx'> 						ad_agg_selection_logic(__get_first_agg(port),</div><div class='ctx'> 							               &amp;dummy_slave_update);</div><div class='hunk'>@@ -2257,8 +2475,30 @@ void bond_3ad_update_ad_actor_settings(struct bonding *bond)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * bond_agg_timer_advance - advance agg_select_timer</div><div class='add'>+ * @bond:  bonding structure</div><div class='add'>+ *</div><div class='add'>+ * Return true when agg_select_timer reaches 0.</div><div class='add'>+ */</div><div class='add'>+static bool bond_agg_timer_advance(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	int val, nval;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		val = atomic_read(&amp;BOND_AD_INFO(bond).agg_select_timer);</div><div class='add'>+		if (!val)</div><div class='add'>+			return false;</div><div class='add'>+		nval = val - 1;</div><div class='add'>+		if (atomic_cmpxchg(&amp;BOND_AD_INFO(bond).agg_select_timer,</div><div class='add'>+				   val, nval) == val)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return nval == 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * bond_3ad_state_machine_handler - handle state machines timeout</div><div class='del'>- * @bond: bonding struct to work on</div><div class='add'>+ * @work: work context to fetch bonding struct to work on from</div><div class='ctx'>  *</div><div class='ctx'>  * The state machine handling concept in this module is to check every tick</div><div class='ctx'>  * which state machine should operate any function. The execution order is</div><div class='hunk'>@@ -2291,9 +2531,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)</div><div class='ctx'> 	if (!bond_has_slaves(bond))</div><div class='ctx'> 		goto re_arm;</div><div class='ctx'> </div><div class='del'>-	/* check if agg_select_timer timer after initialize is timed out */</div><div class='del'>-	if (BOND_AD_INFO(bond).agg_select_timer &amp;&amp;</div><div class='del'>-	    !(--BOND_AD_INFO(bond).agg_select_timer)) {</div><div class='add'>+	if (bond_agg_timer_advance(bond)) {</div><div class='ctx'> 		slave = bond_first_slave_rcu(bond);</div><div class='ctx'> 		port = slave ? &amp;(SLAVE_AD_INFO(slave)-&gt;port) : NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -2379,9 +2617,9 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave)</div><div class='ctx'> 	switch (lacpdu-&gt;subtype) {</div><div class='ctx'> 	case AD_TYPE_LACPDU:</div><div class='ctx'> 		ret = RX_HANDLER_CONSUMED;</div><div class='del'>-		netdev_dbg(slave-&gt;bond-&gt;dev,</div><div class='del'>-			   "Received LACPDU on port %d slave %s\n",</div><div class='del'>-			   port-&gt;actor_port_number, slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+			  "Received LACPDU on port %d\n",</div><div class='add'>+			  port-&gt;actor_port_number);</div><div class='ctx'> 		/* Protect against concurrent state machines */</div><div class='ctx'> 		spin_lock(&amp;slave-&gt;bond-&gt;mode_lock);</div><div class='ctx'> 		ad_rx_machine(lacpdu, port);</div><div class='hunk'>@@ -2395,18 +2633,18 @@ static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave)</div><div class='ctx'> 		marker = (struct bond_marker *)lacpdu;</div><div class='ctx'> 		switch (marker-&gt;tlv_type) {</div><div class='ctx'> 		case AD_MARKER_INFORMATION_SUBTYPE:</div><div class='del'>-			netdev_dbg(slave-&gt;bond-&gt;dev, "Received Marker Information on port %d\n",</div><div class='del'>-				   port-&gt;actor_port_number);</div><div class='add'>+			slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Received Marker Information on port %d\n",</div><div class='add'>+				  port-&gt;actor_port_number);</div><div class='ctx'> 			ad_marker_info_received(marker, port);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case AD_MARKER_RESPONSE_SUBTYPE:</div><div class='del'>-			netdev_dbg(slave-&gt;bond-&gt;dev, "Received Marker Response on port %d\n",</div><div class='del'>-				   port-&gt;actor_port_number);</div><div class='add'>+			slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Received Marker Response on port %d\n",</div><div class='add'>+				  port-&gt;actor_port_number);</div><div class='ctx'> 			ad_marker_response_received(marker, port);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_dbg(slave-&gt;bond-&gt;dev, "Received an unknown Marker subtype on slot %d\n",</div><div class='del'>-				   port-&gt;actor_port_number);</div><div class='add'>+			slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Received an unknown Marker subtype on port %d\n",</div><div class='add'>+				  port-&gt;actor_port_number);</div><div class='ctx'> 			stat = &amp;SLAVE_AD_INFO(slave)-&gt;stats.marker_unknown_rx;</div><div class='ctx'> 			atomic64_inc(stat);</div><div class='ctx'> 			stat = &amp;BOND_AD_INFO(bond).stats.marker_unknown_rx;</div><div class='hunk'>@@ -2456,9 +2694,10 @@ static void ad_update_actor_keys(struct port *port, bool reset)</div><div class='ctx'> </div><div class='ctx'> 		if (!reset) {</div><div class='ctx'> 			if (!speed) {</div><div class='del'>-				netdev_err(port-&gt;slave-&gt;dev,</div><div class='del'>-					   "speed changed to 0 for port %s",</div><div class='del'>-					   port-&gt;slave-&gt;dev-&gt;name);</div><div class='add'>+				slave_err(port-&gt;slave-&gt;bond-&gt;dev,</div><div class='add'>+					  port-&gt;slave-&gt;dev,</div><div class='add'>+					  "speed changed to 0 on port %d\n",</div><div class='add'>+					  port-&gt;actor_port_number);</div><div class='ctx'> 			} else if (duplex &amp;&amp; ospeed != speed) {</div><div class='ctx'> 				/* Speed change restarts LACP state-machine */</div><div class='ctx'> 				port-&gt;sm_vars |= AD_PORT_BEGIN;</div><div class='hunk'>@@ -2483,23 +2722,22 @@ void bond_3ad_adapter_speed_duplex_changed(struct slave *slave)</div><div class='ctx'> </div><div class='ctx'> 	/* if slave is null, the whole port is not initialized */</div><div class='ctx'> 	if (!port-&gt;slave) {</div><div class='del'>-		netdev_warn(slave-&gt;bond-&gt;dev,</div><div class='del'>-			    "speed/duplex changed for uninitialized port %s\n",</div><div class='del'>-			    slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_warn(slave-&gt;bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+			   "speed/duplex changed for uninitialized port\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;slave-&gt;bond-&gt;mode_lock);</div><div class='ctx'> 	ad_update_actor_keys(port, false);</div><div class='ctx'> 	spin_unlock_bh(&amp;slave-&gt;bond-&gt;mode_lock);</div><div class='del'>-	netdev_dbg(slave-&gt;bond-&gt;dev, "Port %d slave %s changed speed/duplex\n",</div><div class='del'>-		   port-&gt;actor_port_number, slave-&gt;dev-&gt;name);</div><div class='add'>+	slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Port %d changed speed/duplex\n",</div><div class='add'>+		  port-&gt;actor_port_number);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bond_3ad_handle_link_change - handle a slave's link status change indication</div><div class='ctx'>  * @slave: slave struct to work on</div><div class='del'>- * @status: whether the link is now up or down</div><div class='add'>+ * @link: whether the link is now up or down</div><div class='ctx'>  *</div><div class='ctx'>  * Handle reselection of aggregator (if needed) for this port.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2513,8 +2751,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)</div><div class='ctx'> </div><div class='ctx'> 	/* if slave is null, the whole port is not initialized */</div><div class='ctx'> 	if (!port-&gt;slave) {</div><div class='del'>-		netdev_warn(slave-&gt;bond-&gt;dev, "link status changed for uninitialized port on %s\n",</div><div class='del'>-			    slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_warn(slave-&gt;bond-&gt;dev, slave-&gt;dev, "link status changed for uninitialized port\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2539,9 +2776,9 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;slave-&gt;bond-&gt;mode_lock);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(slave-&gt;bond-&gt;dev, "Port %d changed link status to %s\n",</div><div class='del'>-		   port-&gt;actor_port_number,</div><div class='del'>-		   link == BOND_LINK_UP ? "UP" : "DOWN");</div><div class='add'>+	slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev, "Port %d changed link status to %s\n",</div><div class='add'>+		  port-&gt;actor_port_number,</div><div class='add'>+		  link == BOND_LINK_UP ? "UP" : "DOWN");</div><div class='ctx'> </div><div class='ctx'> 	/* RTNL is held and mode_lock is released so it's safe</div><div class='ctx'> 	 * to update slave_array here.</div><div class='hunk'>@@ -2551,7 +2788,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bond_3ad_set_carrier - set link state for bonding master</div><div class='del'>- * @bond - bonding structure</div><div class='add'>+ * @bond: bonding structure</div><div class='ctx'>  *</div><div class='ctx'>  * if we have an active aggregator, we're up, if not, we're down.</div><div class='ctx'>  * Presumes that we cannot have an active aggregator if there are</div><div class='hunk'>@@ -2664,7 +2901,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bond_3ad_update_lacp_rate - change the lacp rate</div><div class='del'>- * @bond - bonding struct</div><div class='add'>+ * @bond: bonding struct</div><div class='ctx'>  *</div><div class='ctx'>  * When modify lacp_rate parameter via sysfs,</div><div class='ctx'>  * update actor_oper_port_state of each port.</div><div class='hunk'>@@ -2685,9 +2922,34 @@ void bond_3ad_update_lacp_rate(struct bonding *bond)</div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='ctx'> 		port = &amp;(SLAVE_AD_INFO(slave)-&gt;port);</div><div class='ctx'> 		if (lacp_fast)</div><div class='del'>-			port-&gt;actor_oper_port_state |= AD_STATE_LACP_TIMEOUT;</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_LACP_TIMEOUT;</div><div class='add'>+		else</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_LACP_TIMEOUT;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;bond-&gt;mode_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_3ad_update_lacp_active - change the lacp active</div><div class='add'>+ * @bond: bonding struct</div><div class='add'>+ *</div><div class='add'>+ * Update actor_oper_port_state when lacp_active is modified.</div><div class='add'>+ */</div><div class='add'>+void bond_3ad_update_lacp_active(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct port *port = NULL;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	int lacp_active;</div><div class='add'>+</div><div class='add'>+	lacp_active = bond-&gt;params.lacp_active;</div><div class='add'>+	spin_lock_bh(&amp;bond-&gt;mode_lock);</div><div class='add'>+	bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+		port = &amp;(SLAVE_AD_INFO(slave)-&gt;port);</div><div class='add'>+		if (lacp_active)</div><div class='add'>+			port-&gt;actor_oper_port_state |= LACP_STATE_LACP_ACTIVITY;</div><div class='ctx'> 		else</div><div class='del'>-			port-&gt;actor_oper_port_state &amp;= ~AD_STATE_LACP_TIMEOUT;</div><div class='add'>+			port-&gt;actor_oper_port_state &amp;= ~LACP_STATE_LACP_ACTIVITY;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;bond-&gt;mode_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c<br/>index 790e41c6fdd0..2d37b07c8215 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_alb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_alb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_alb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_alb.c</a></div><div class='hunk'>@@ -17,9 +17,9 @@</div><div class='ctx'> #include &lt;linux/if_bonding.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='del'>-#include &lt;net/ipx.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/ndisc.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;net/bonding.h&gt;</div><div class='ctx'> #include &lt;net/bond_alb.h&gt;</div><div class='hunk'>@@ -50,13 +50,8 @@ struct arp_pkt {</div><div class='ctx'> };</div><div class='ctx'> #pragma pack()</div><div class='ctx'> </div><div class='del'>-static inline struct arp_pkt *arp_pkt(const struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	return (struct arp_pkt *)skb_network_header(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Forward declaration */</div><div class='del'>-static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],</div><div class='add'>+static void alb_send_learning_packets(struct slave *slave, const u8 mac_addr[],</div><div class='ctx'> 				      bool strict_match);</div><div class='ctx'> static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp);</div><div class='ctx'> static void rlb_src_unlink(struct bonding *bond, u32 index);</div><div class='hunk'>@@ -109,6 +104,7 @@ static void __tlb_clear_slave(struct bonding *bond, struct slave *slave,</div><div class='ctx'> 		index = SLAVE_TLB_INFO(slave).head;</div><div class='ctx'> 		while (index != TLB_NULL_INDEX) {</div><div class='ctx'> 			u32 next_index = tx_hash_table[index].next;</div><div class='add'>+</div><div class='ctx'> 			tlb_init_table_entry(&amp;tx_hash_table[index], save_load);</div><div class='ctx'> 			index = next_index;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -233,7 +229,7 @@ static struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index,</div><div class='ctx'> {</div><div class='ctx'> 	struct slave *tx_slave;</div><div class='ctx'> </div><div class='del'>-	/* We don't need to disable softirq here, becase</div><div class='add'>+	/* We don't need to disable softirq here, because</div><div class='ctx'> 	 * tlb_choose_channel() is only called by bond_alb_xmit()</div><div class='ctx'> 	 * which already has softirq disabled.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -300,7 +296,7 @@ static int rlb_arp_recv(const struct sk_buff *skb, struct bonding *bond,</div><div class='ctx'> 	if (arp-&gt;op_code == htons(ARPOP_REPLY)) {</div><div class='ctx'> 		/* update rx hash table for this ARP */</div><div class='ctx'> 		rlb_update_entry_from_arp(bond, arp);</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "Server received an ARP Reply from client\n");</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "Server received an ARP Reply from client\n");</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	return RX_HANDLER_ANOTHER;</div><div class='hunk'>@@ -358,7 +354,8 @@ static struct slave *rlb_next_rx_slave(struct bonding *bond)</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must hold RTNL</div><div class='ctx'>  */</div><div class='del'>-static void rlb_teach_disabled_mac_on_primary(struct bonding *bond, u8 addr[])</div><div class='add'>+static void rlb_teach_disabled_mac_on_primary(struct bonding *bond,</div><div class='add'>+					      const u8 addr[])</div><div class='ctx'> {</div><div class='ctx'> 	struct slave *curr_active = rtnl_dereference(bond-&gt;curr_active_slave);</div><div class='ctx'> </div><div class='hunk'>@@ -442,8 +439,9 @@ static void rlb_update_client(struct rlb_client_info *client_info)</div><div class='ctx'> 				 client_info-&gt;slave-&gt;dev-&gt;dev_addr,</div><div class='ctx'> 				 client_info-&gt;mac_dst);</div><div class='ctx'> 		if (!skb) {</div><div class='del'>-			netdev_err(client_info-&gt;slave-&gt;bond-&gt;dev,</div><div class='del'>-				   "failed to create an ARP packet\n");</div><div class='add'>+			slave_err(client_info-&gt;slave-&gt;bond-&gt;dev,</div><div class='add'>+				  client_info-&gt;slave-&gt;dev,</div><div class='add'>+				  "failed to create an ARP packet\n");</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -552,10 +550,11 @@ static void rlb_req_update_subnet_clients(struct bonding *bond, __be32 src_ip)</div><div class='ctx'> 	spin_unlock(&amp;bond-&gt;mode_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bond)</div><div class='add'>+static struct slave *rlb_choose_channel(struct sk_buff *skb,</div><div class='add'>+					struct bonding *bond,</div><div class='add'>+					const struct arp_pkt *arp)</div><div class='ctx'> {</div><div class='ctx'> 	struct alb_bond_info *bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='del'>-	struct arp_pkt *arp = arp_pkt(skb);</div><div class='ctx'> 	struct slave *assigned_slave, *curr_active_slave;</div><div class='ctx'> 	struct rlb_client_info *client_info;</div><div class='ctx'> 	u32 hash_index = 0;</div><div class='hunk'>@@ -611,7 +610,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon</div><div class='ctx'> </div><div class='ctx'> 		client_info-&gt;ip_src = arp-&gt;ip_src;</div><div class='ctx'> 		client_info-&gt;ip_dst = arp-&gt;ip_dst;</div><div class='del'>-		/* arp-&gt;mac_dst is broadcast for arp reqeusts.</div><div class='add'>+		/* arp-&gt;mac_dst is broadcast for arp requests.</div><div class='ctx'> 		 * will be updated with clients actual unicast mac address</div><div class='ctx'> 		 * upon receiving an arp reply.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -631,6 +630,7 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon</div><div class='ctx'> </div><div class='ctx'> 		if (!client_info-&gt;assigned) {</div><div class='ctx'> 			u32 prev_tbl_head = bond_info-&gt;rx_hashtbl_used_head;</div><div class='add'>+</div><div class='ctx'> 			bond_info-&gt;rx_hashtbl_used_head = hash_index;</div><div class='ctx'> 			client_info-&gt;used_next = prev_tbl_head;</div><div class='ctx'> 			if (prev_tbl_head != RLB_NULL_INDEX) {</div><div class='hunk'>@@ -652,29 +652,44 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon</div><div class='ctx'>  */</div><div class='ctx'> static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	struct arp_pkt *arp = arp_pkt(skb);</div><div class='ctx'> 	struct slave *tx_slave = NULL;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct arp_pkt *arp;</div><div class='ctx'> </div><div class='del'>-	/* Don't modify or load balance ARPs that do not originate locally</div><div class='del'>-	 * (e.g.,arrive via a bridge).</div><div class='add'>+	if (!pskb_network_may_pull(skb, sizeof(*arp)))</div><div class='add'>+		return NULL;</div><div class='add'>+	arp = (struct arp_pkt *)skb_network_header(skb);</div><div class='add'>+</div><div class='add'>+	/* Don't modify or load balance ARPs that do not originate</div><div class='add'>+	 * from the bond itself or a VLAN directly above the bond.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!bond_slave_has_mac_rx(bond, arp-&gt;mac_src))</div><div class='add'>+	if (!bond_slave_has_mac_rcu(bond, arp-&gt;mac_src))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	dev = ip_dev_find(dev_net(bond-&gt;dev), arp-&gt;ip_src);</div><div class='add'>+	if (dev) {</div><div class='add'>+		if (netif_is_any_bridge_master(dev)) {</div><div class='add'>+			dev_put(dev);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+		dev_put(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (arp-&gt;op_code == htons(ARPOP_REPLY)) {</div><div class='ctx'> 		/* the arp must be sent on the selected rx channel */</div><div class='del'>-		tx_slave = rlb_choose_channel(skb, bond);</div><div class='add'>+		tx_slave = rlb_choose_channel(skb, bond, arp);</div><div class='ctx'> 		if (tx_slave)</div><div class='ctx'> 			bond_hw_addr_copy(arp-&gt;mac_src, tx_slave-&gt;dev-&gt;dev_addr,</div><div class='ctx'> 					  tx_slave-&gt;dev-&gt;addr_len);</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "Server sent ARP Reply packet\n");</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "(slave %s): Server sent ARP Reply packet\n",</div><div class='add'>+			   tx_slave ? tx_slave-&gt;dev-&gt;name : "NULL");</div><div class='ctx'> 	} else if (arp-&gt;op_code == htons(ARPOP_REQUEST)) {</div><div class='ctx'> 		/* Create an entry in the rx_hashtbl for this client as a</div><div class='ctx'> 		 * place holder.</div><div class='ctx'> 		 * When the arp reply is received the entry will be updated</div><div class='ctx'> 		 * with the correct unicast address of the client.</div><div class='ctx'> 		 */</div><div class='del'>-		rlb_choose_channel(skb, bond);</div><div class='add'>+		tx_slave = rlb_choose_channel(skb, bond, arp);</div><div class='ctx'> </div><div class='ctx'> 		/* The ARP reply packets must be delayed so that</div><div class='ctx'> 		 * they can cancel out the influence of the ARP request.</div><div class='hunk'>@@ -687,7 +702,8 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)</div><div class='ctx'> 		 * updated with their assigned mac.</div><div class='ctx'> 		 */</div><div class='ctx'> 		rlb_req_update_subnet_clients(bond, arp-&gt;ip_src);</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "Server sent ARP Request packet\n");</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "(slave %s): Server sent ARP Request packet\n",</div><div class='add'>+			   tx_slave ? tx_slave-&gt;dev-&gt;name : "NULL");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return tx_slave;</div><div class='hunk'>@@ -827,9 +843,10 @@ static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp)</div><div class='ctx'> 	while (index != RLB_NULL_INDEX) {</div><div class='ctx'> 		struct rlb_client_info *entry = &amp;(bond_info-&gt;rx_hashtbl[index]);</div><div class='ctx'> 		u32 next_index = entry-&gt;src_next;</div><div class='add'>+</div><div class='ctx'> 		if (entry-&gt;ip_src == arp-&gt;ip_src &amp;&amp;</div><div class='ctx'> 		    !ether_addr_equal_64bits(arp-&gt;mac_src, entry-&gt;mac_src))</div><div class='del'>-				rlb_delete_table_entry(bond, index);</div><div class='add'>+			rlb_delete_table_entry(bond, index);</div><div class='ctx'> 		index = next_index;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;bond-&gt;mode_lock);</div><div class='hunk'>@@ -899,7 +916,7 @@ static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)</div><div class='ctx'> </div><div class='ctx'> /*********************** tlb/rlb shared functions *********************/</div><div class='ctx'> </div><div class='del'>-static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],</div><div class='add'>+static void alb_send_lp_vid(struct slave *slave, const u8 mac_addr[],</div><div class='ctx'> 			    __be16 vlan_proto, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct learning_pkt pkt;</div><div class='hunk'>@@ -923,9 +940,8 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],</div><div class='ctx'> 	skb-&gt;priority = TC_PRIO_CONTROL;</div><div class='ctx'> 	skb-&gt;dev = slave-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(slave-&gt;bond-&gt;dev,</div><div class='del'>-		   "Send learning packet: dev %s mac %pM vlan %d\n",</div><div class='del'>-		   slave-&gt;dev-&gt;name, mac_addr, vid);</div><div class='add'>+	slave_dbg(slave-&gt;bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+		  "Send learning packet: mac %pM vlan %d\n", mac_addr, vid);</div><div class='ctx'> </div><div class='ctx'> 	if (vid)</div><div class='ctx'> 		__vlan_hwaccel_put_tag(skb, vlan_proto, vid);</div><div class='hunk'>@@ -936,21 +952,22 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],</div><div class='ctx'> struct alb_walk_data {</div><div class='ctx'> 	struct bonding *bond;</div><div class='ctx'> 	struct slave *slave;</div><div class='del'>-	u8 *mac_addr;</div><div class='add'>+	const u8 *mac_addr;</div><div class='ctx'> 	bool strict_match;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int alb_upper_dev_walk(struct net_device *upper, void *_data)</div><div class='add'>+static int alb_upper_dev_walk(struct net_device *upper,</div><div class='add'>+			      struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct alb_walk_data *data = _data;</div><div class='add'>+	struct alb_walk_data *data = (struct alb_walk_data *)priv-&gt;data;</div><div class='ctx'> 	bool strict_match = data-&gt;strict_match;</div><div class='add'>+	const u8 *mac_addr = data-&gt;mac_addr;</div><div class='ctx'> 	struct bonding *bond = data-&gt;bond;</div><div class='ctx'> 	struct slave *slave = data-&gt;slave;</div><div class='del'>-	u8 *mac_addr = data-&gt;mac_addr;</div><div class='ctx'> 	struct bond_vlan_tag *tags;</div><div class='ctx'> </div><div class='ctx'> 	if (is_vlan_dev(upper) &amp;&amp;</div><div class='del'>-	    bond-&gt;nest_level == vlan_get_encap_level(upper) - 1) {</div><div class='add'>+	    bond-&gt;dev-&gt;lower_level == upper-&gt;lower_level - 1) {</div><div class='ctx'> 		if (upper-&gt;addr_assign_type == NET_ADDR_STOLEN) {</div><div class='ctx'> 			alb_send_lp_vid(slave, mac_addr,</div><div class='ctx'> 					vlan_dev_vlan_proto(upper),</div><div class='hunk'>@@ -968,7 +985,8 @@ static int alb_upper_dev_walk(struct net_device *upper, void *_data)</div><div class='ctx'> 	if (netif_is_macvlan(upper) &amp;&amp; !strict_match) {</div><div class='ctx'> 		tags = bond_verify_device_path(bond-&gt;dev, upper, 0);</div><div class='ctx'> 		if (IS_ERR_OR_NULL(tags))</div><div class='del'>-			BUG();</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 		alb_send_lp_vid(slave, upper-&gt;dev_addr,</div><div class='ctx'> 				tags[0].vlan_proto, tags[0].vlan_id);</div><div class='ctx'> 		kfree(tags);</div><div class='hunk'>@@ -977,10 +995,11 @@ static int alb_upper_dev_walk(struct net_device *upper, void *_data)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],</div><div class='add'>+static void alb_send_learning_packets(struct slave *slave, const u8 mac_addr[],</div><div class='ctx'> 				      bool strict_match)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = bond_get_bond_by_slave(slave);</div><div class='add'>+	struct netdev_nested_priv priv;</div><div class='ctx'> 	struct alb_walk_data data = {</div><div class='ctx'> 		.strict_match = strict_match,</div><div class='ctx'> 		.mac_addr = mac_addr,</div><div class='hunk'>@@ -988,6 +1007,7 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],</div><div class='ctx'> 		.bond = bond,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	priv.data = (void *)&amp;data;</div><div class='ctx'> 	/* send untagged */</div><div class='ctx'> 	alb_send_lp_vid(slave, mac_addr, 0, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -995,18 +1015,18 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],</div><div class='ctx'> 	 * for that device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	netdev_walk_all_upper_dev_rcu(bond-&gt;dev, alb_upper_dev_walk, &amp;data);</div><div class='add'>+	netdev_walk_all_upper_dev_rcu(bond-&gt;dev, alb_upper_dev_walk, &amp;priv);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[],</div><div class='add'>+static int alb_set_slave_mac_addr(struct slave *slave, const u8 addr[],</div><div class='ctx'> 				  unsigned int len)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = slave-&gt;dev;</div><div class='ctx'> 	struct sockaddr_storage ss;</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(slave-&gt;bond) == BOND_MODE_TLB) {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, addr, len);</div><div class='add'>+		__dev_addr_set(dev, addr, len);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1015,9 +1035,8 @@ static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[],</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(ss.__data, addr, len);</div><div class='ctx'> 	ss.ss_family = dev-&gt;type;</div><div class='del'>-	if (dev_set_mac_address(dev, (struct sockaddr *)&amp;ss, NULL)) {</div><div class='del'>-		netdev_err(slave-&gt;bond-&gt;dev, "dev_set_mac_address of dev %s failed! ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n",</div><div class='del'>-			   dev-&gt;name);</div><div class='add'>+	if (dev_set_mac_address(dev, &amp;ss, NULL)) {</div><div class='add'>+		slave_err(slave-&gt;bond-&gt;dev, dev, "dev_set_mac_address on slave failed! ALB mode requires that the base driver support setting the hw address also when the network device's interface is open\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1094,7 +1113,7 @@ static void alb_fasten_mac_swap(struct bonding *bond, struct slave *slave1,</div><div class='ctx'>  * If @slave's permanent hw address is different both from its current</div><div class='ctx'>  * address and from @bond's address, then somewhere in the bond there's</div><div class='ctx'>  * a slave that has @slave's permanet address as its current address.</div><div class='del'>- * We'll make sure that that slave no longer uses @slave's permanent address.</div><div class='add'>+ * We'll make sure that slave no longer uses @slave's permanent address.</div><div class='ctx'>  *</div><div class='ctx'>  * Caller must hold RTNL and no other locks</div><div class='ctx'>  */</div><div class='hunk'>@@ -1192,12 +1211,11 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav</div><div class='ctx'> 		alb_set_slave_mac_addr(slave, free_mac_slave-&gt;perm_hwaddr,</div><div class='ctx'> 				       free_mac_slave-&gt;dev-&gt;addr_len);</div><div class='ctx'> </div><div class='del'>-		netdev_warn(bond-&gt;dev, "the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",</div><div class='del'>-			    slave-&gt;dev-&gt;name, free_mac_slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_warn(bond-&gt;dev, slave-&gt;dev, "the slave hw address is in use by the bond; giving it the hw address of %s\n",</div><div class='add'>+			   free_mac_slave-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	} else if (has_bond_addr) {</div><div class='del'>-		netdev_err(bond-&gt;dev, "the hw address of slave %s is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n",</div><div class='del'>-			   slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_err(bond-&gt;dev, slave-&gt;dev, "the slave hw address is in use by the bond; couldn't find a slave with a free hw address to give it (this should not have happened)\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1206,8 +1224,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * alb_set_mac_address</div><div class='del'>- * @bond:</div><div class='del'>- * @addr:</div><div class='add'>+ * @bond: bonding we're working on</div><div class='add'>+ * @addr: MAC address to set</div><div class='ctx'>  *</div><div class='ctx'>  * In TLB mode all slaves are configured to the bond's hw address, but set</div><div class='ctx'>  * their dev_addr field to different addresses (based on their permanent hw</div><div class='hunk'>@@ -1237,8 +1255,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr)</div><div class='ctx'> 		res = dev_set_mac_address(slave-&gt;dev, addr, NULL);</div><div class='ctx'> </div><div class='ctx'> 		/* restore net_device's hw address */</div><div class='del'>-		bond_hw_addr_copy(slave-&gt;dev-&gt;dev_addr, tmp_addr,</div><div class='del'>-				  slave-&gt;dev-&gt;addr_len);</div><div class='add'>+		dev_addr_set(slave-&gt;dev, tmp_addr);</div><div class='ctx'> </div><div class='ctx'> 		if (res)</div><div class='ctx'> 			goto unwind;</div><div class='hunk'>@@ -1256,16 +1273,35 @@ unwind:</div><div class='ctx'> 			break;</div><div class='ctx'> 		bond_hw_addr_copy(tmp_addr, rollback_slave-&gt;dev-&gt;dev_addr,</div><div class='ctx'> 				  rollback_slave-&gt;dev-&gt;addr_len);</div><div class='del'>-		dev_set_mac_address(rollback_slave-&gt;dev,</div><div class='del'>-				    (struct sockaddr *)&amp;ss, NULL);</div><div class='del'>-		bond_hw_addr_copy(rollback_slave-&gt;dev-&gt;dev_addr, tmp_addr,</div><div class='del'>-				  rollback_slave-&gt;dev-&gt;addr_len);</div><div class='add'>+		dev_set_mac_address(rollback_slave-&gt;dev, &amp;ss, NULL);</div><div class='add'>+		dev_addr_set(rollback_slave-&gt;dev, tmp_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/************************ exported alb funcions ************************/</div><div class='add'>+/* determine if the packet is NA or NS */</div><div class='add'>+static bool alb_determine_nd(struct sk_buff *skb, struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct ipv6hdr *ip6hdr;</div><div class='add'>+	struct icmp6hdr *hdr;</div><div class='add'>+</div><div class='add'>+	if (!pskb_network_may_pull(skb, sizeof(*ip6hdr)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	ip6hdr = ipv6_hdr(skb);</div><div class='add'>+	if (ip6hdr-&gt;nexthdr != IPPROTO_ICMPV6)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!pskb_network_may_pull(skb, sizeof(*ip6hdr) + sizeof(*hdr)))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	hdr = icmp6_hdr(skb);</div><div class='add'>+	return hdr-&gt;icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT ||</div><div class='add'>+		hdr-&gt;icmp6_type == NDISC_NEIGHBOUR_SOLICITATION;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/************************ exported alb functions ************************/</div><div class='ctx'> </div><div class='ctx'> int bond_alb_initialize(struct bonding *bond, int rlb_enabled)</div><div class='ctx'> {</div><div class='hunk'>@@ -1276,12 +1312,12 @@ int bond_alb_initialize(struct bonding *bond, int rlb_enabled)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='ctx'> 	if (rlb_enabled) {</div><div class='del'>-		bond-&gt;alb_info.rlb_enabled = 1;</div><div class='ctx'> 		res = rlb_initialize(bond);</div><div class='ctx'> 		if (res) {</div><div class='ctx'> 			tlb_deinitialize(bond);</div><div class='ctx'> 			return res;</div><div class='ctx'> 		}</div><div class='add'>+		bond-&gt;alb_info.rlb_enabled = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bond-&gt;alb_info.rlb_enabled = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1318,8 +1354,7 @@ static netdev_tx_t bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond,</div><div class='ctx'> 					tx_slave-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bond_dev_queue_xmit(bond, skb, tx_slave-&gt;dev);</div><div class='del'>-		goto out;</div><div class='add'>+		return bond_dev_queue_xmit(bond, skb, tx_slave-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tx_slave &amp;&amp; bond-&gt;params.tlb_dynamic_lb) {</div><div class='hunk'>@@ -1329,16 +1364,14 @@ static netdev_tx_t bond_do_alb_xmit(struct sk_buff *skb, struct bonding *bond,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* no suitable interface, frame not sent */</div><div class='del'>-	bond_tx_drop(bond-&gt;dev, skb);</div><div class='del'>-out:</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+	return bond_tx_drop(bond-&gt;dev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='add'>+struct slave *bond_xmit_tlb_slave_get(struct bonding *bond,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	struct ethhdr *eth_data;</div><div class='ctx'> 	struct slave *tx_slave = NULL;</div><div class='add'>+	struct ethhdr *eth_data;</div><div class='ctx'> 	u32 hash_index;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='hunk'>@@ -1347,10 +1380,11 @@ netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 	/* Do not TX balance any multicast or broadcast */</div><div class='ctx'> 	if (!is_multicast_ether_addr(eth_data-&gt;h_dest)) {</div><div class='ctx'> 		switch (skb-&gt;protocol) {</div><div class='del'>-		case htons(ETH_P_IP):</div><div class='del'>-		case htons(ETH_P_IPX):</div><div class='del'>-		    /* In case of IPX, it will falback to L2 hash */</div><div class='ctx'> 		case htons(ETH_P_IPV6):</div><div class='add'>+			if (alb_determine_nd(skb, bond))</div><div class='add'>+				break;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case htons(ETH_P_IP):</div><div class='ctx'> 			hash_index = bond_xmit_hash(bond, skb);</div><div class='ctx'> 			if (bond-&gt;params.tlb_dynamic_lb) {</div><div class='ctx'> 				tx_slave = tlb_choose_channel(bond,</div><div class='hunk'>@@ -1360,7 +1394,7 @@ netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 				struct bond_up_slave *slaves;</div><div class='ctx'> 				unsigned int count;</div><div class='ctx'> </div><div class='del'>-				slaves = rcu_dereference(bond-&gt;slave_arr);</div><div class='add'>+				slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='ctx'> 				count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='ctx'> 				if (likely(count))</div><div class='ctx'> 					tx_slave = slaves-&gt;arr[hash_index %</div><div class='hunk'>@@ -1369,40 +1403,54 @@ netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return bond_do_alb_xmit(skb, bond, tx_slave);</div><div class='add'>+	return tx_slave;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='add'>+netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	struct ethhdr *eth_data;</div><div class='add'>+	struct slave *tx_slave;</div><div class='add'>+</div><div class='add'>+	tx_slave = bond_xmit_tlb_slave_get(bond, skb);</div><div class='add'>+	return bond_do_alb_xmit(skb, bond, tx_slave);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct slave *bond_xmit_alb_slave_get(struct bonding *bond,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='ctx'> 	struct alb_bond_info *bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='del'>-	struct slave *tx_slave = NULL;</div><div class='ctx'> 	static const __be32 ip_bcast = htonl(0xffffffff);</div><div class='del'>-	int hash_size = 0;</div><div class='add'>+	struct slave *tx_slave = NULL;</div><div class='add'>+	const u8 *hash_start = NULL;</div><div class='ctx'> 	bool do_tx_balance = true;</div><div class='add'>+	struct ethhdr *eth_data;</div><div class='ctx'> 	u32 hash_index = 0;</div><div class='del'>-	const u8 *hash_start = NULL;</div><div class='del'>-	struct ipv6hdr *ip6hdr;</div><div class='add'>+	int hash_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	eth_data = eth_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 	switch (ntohs(skb-&gt;protocol)) {</div><div class='ctx'> 	case ETH_P_IP: {</div><div class='del'>-		const struct iphdr *iph = ip_hdr(skb);</div><div class='add'>+		const struct iphdr *iph;</div><div class='ctx'> </div><div class='ctx'> 		if (is_broadcast_ether_addr(eth_data-&gt;h_dest) ||</div><div class='del'>-		    iph-&gt;daddr == ip_bcast ||</div><div class='del'>-		    iph-&gt;protocol == IPPROTO_IGMP) {</div><div class='add'>+		    !pskb_network_may_pull(skb, sizeof(*iph))) {</div><div class='add'>+			do_tx_balance = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		iph = ip_hdr(skb);</div><div class='add'>+		if (iph-&gt;daddr == ip_bcast || iph-&gt;protocol == IPPROTO_IGMP) {</div><div class='ctx'> 			do_tx_balance = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		hash_start = (char *)&amp;(iph-&gt;daddr);</div><div class='ctx'> 		hash_size = sizeof(iph-&gt;daddr);</div><div class='del'>-	}</div><div class='ctx'> 		break;</div><div class='del'>-	case ETH_P_IPV6:</div><div class='add'>+	}</div><div class='add'>+	case ETH_P_IPV6: {</div><div class='add'>+		const struct ipv6hdr *ip6hdr;</div><div class='add'>+</div><div class='ctx'> 		/* IPv6 doesn't really use broadcast mac address, but leave</div><div class='ctx'> 		 * that here just in case.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1419,7 +1467,13 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Additianally, DAD probes should not be tx-balanced as that</div><div class='add'>+		if (alb_determine_nd(skb, bond)) {</div><div class='add'>+			do_tx_balance = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The IPv6 header is pulled by alb_determine_nd */</div><div class='add'>+		/* Additionally, DAD probes should not be tx-balanced as that</div><div class='ctx'> 		 * will lead to false positives for duplicate addresses and</div><div class='ctx'> 		 * prevent address configuration from working.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1429,28 +1483,10 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		hash_start = (char *)&amp;(ipv6_hdr(skb)-&gt;daddr);</div><div class='del'>-		hash_size = sizeof(ipv6_hdr(skb)-&gt;daddr);</div><div class='del'>-		break;</div><div class='del'>-	case ETH_P_IPX:</div><div class='del'>-		if (ipx_hdr(skb)-&gt;ipx_checksum != IPX_NO_CHECKSUM) {</div><div class='del'>-			/* something is wrong with this packet */</div><div class='del'>-			do_tx_balance = false;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (ipx_hdr(skb)-&gt;ipx_type != IPX_TYPE_NCP) {</div><div class='del'>-			/* The only protocol worth balancing in</div><div class='del'>-			 * this family since it has an "ARP" like</div><div class='del'>-			 * mechanism</div><div class='del'>-			 */</div><div class='del'>-			do_tx_balance = false;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hash_start = (char *)eth_data-&gt;h_dest;</div><div class='del'>-		hash_size = ETH_ALEN;</div><div class='add'>+		hash_start = (char *)&amp;ip6hdr-&gt;daddr;</div><div class='add'>+		hash_size = sizeof(ip6hdr-&gt;daddr);</div><div class='ctx'> 		break;</div><div class='add'>+	}</div><div class='ctx'> 	case ETH_P_ARP:</div><div class='ctx'> 		do_tx_balance = false;</div><div class='ctx'> 		if (bond_info-&gt;rlb_enabled)</div><div class='hunk'>@@ -1474,14 +1510,22 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='ctx'> 			struct bond_up_slave *slaves;</div><div class='ctx'> 			unsigned int count;</div><div class='ctx'> </div><div class='del'>-			slaves = rcu_dereference(bond-&gt;slave_arr);</div><div class='add'>+			slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='ctx'> 			count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='ctx'> 			if (likely(count))</div><div class='ctx'> 				tx_slave = slaves-&gt;arr[bond_xmit_hash(bond, skb) %</div><div class='ctx'> 						       count];</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	return tx_slave;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct slave *tx_slave = NULL;</div><div class='ctx'> </div><div class='add'>+	tx_slave = bond_xmit_alb_slave_get(bond, skb);</div><div class='ctx'> 	return bond_do_alb_xmit(skb, bond, tx_slave);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1494,14 +1538,14 @@ void bond_alb_monitor(struct work_struct *work)</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> </div><div class='ctx'> 	if (!bond_has_slaves(bond)) {</div><div class='del'>-		bond_info-&gt;tx_rebalance_counter = 0;</div><div class='add'>+		atomic_set(&amp;bond_info-&gt;tx_rebalance_counter, 0);</div><div class='ctx'> 		bond_info-&gt;lp_counter = 0;</div><div class='ctx'> 		goto re_arm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	bond_info-&gt;tx_rebalance_counter++;</div><div class='add'>+	atomic_inc(&amp;bond_info-&gt;tx_rebalance_counter);</div><div class='ctx'> 	bond_info-&gt;lp_counter++;</div><div class='ctx'> </div><div class='ctx'> 	/* send learning packets */</div><div class='hunk'>@@ -1510,7 +1554,7 @@ void bond_alb_monitor(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 		bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 			/* If updating current_active, use all currently</div><div class='del'>-			 * user mac addreses (!strict_match).  Otherwise, only</div><div class='add'>+			 * user mac addresses (!strict_match).  Otherwise, only</div><div class='ctx'> 			 * use mac of the slave device.</div><div class='ctx'> 			 * In RLB mode, we always use strict matches.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -1523,7 +1567,7 @@ void bond_alb_monitor(struct work_struct *work)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* rebalance tx traffic */</div><div class='del'>-	if (bond_info-&gt;tx_rebalance_counter &gt;= BOND_TLB_REBALANCE_TICKS) {</div><div class='add'>+	if (atomic_read(&amp;bond_info-&gt;tx_rebalance_counter) &gt;= BOND_TLB_REBALANCE_TICKS) {</div><div class='ctx'> 		bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 			tlb_clear_slave(bond, slave, 1);</div><div class='ctx'> 			if (slave == rcu_access_pointer(bond-&gt;curr_active_slave)) {</div><div class='hunk'>@@ -1533,7 +1577,7 @@ void bond_alb_monitor(struct work_struct *work)</div><div class='ctx'> 				bond_info-&gt;unbalanced_load = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		bond_info-&gt;tx_rebalance_counter = 0;</div><div class='add'>+		atomic_set(&amp;bond_info-&gt;tx_rebalance_counter, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bond_info-&gt;rlb_enabled) {</div><div class='hunk'>@@ -1603,7 +1647,8 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)</div><div class='ctx'> 	tlb_init_slave(slave);</div><div class='ctx'> </div><div class='ctx'> 	/* order a rebalance ASAP */</div><div class='del'>-	bond-&gt;alb_info.tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS;</div><div class='add'>+	atomic_set(&amp;bond-&gt;alb_info.tx_rebalance_counter,</div><div class='add'>+		   BOND_TLB_REBALANCE_TICKS);</div><div class='ctx'> </div><div class='ctx'> 	if (bond-&gt;alb_info.rlb_enabled)</div><div class='ctx'> 		bond-&gt;alb_info.rlb_rebalance = 1;</div><div class='hunk'>@@ -1640,7 +1685,8 @@ void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char</div><div class='ctx'> 			rlb_clear_slave(bond, slave);</div><div class='ctx'> 	} else if (link == BOND_LINK_UP) {</div><div class='ctx'> 		/* order a rebalance ASAP */</div><div class='del'>-		bond_info-&gt;tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS;</div><div class='add'>+		atomic_set(&amp;bond_info-&gt;tx_rebalance_counter,</div><div class='add'>+			   BOND_TLB_REBALANCE_TICKS);</div><div class='ctx'> 		if (bond-&gt;alb_info.rlb_enabled) {</div><div class='ctx'> 			bond-&gt;alb_info.rlb_rebalance = 1;</div><div class='ctx'> 			/* If the updelay module parameter is smaller than the</div><div class='hunk'>@@ -1716,11 +1762,9 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave</div><div class='ctx'> 				  bond-&gt;dev-&gt;addr_len);</div><div class='ctx'> 		ss.ss_family = bond-&gt;dev-&gt;type;</div><div class='ctx'> 		/* we don't care if it can't change its mac, best effort */</div><div class='del'>-		dev_set_mac_address(new_slave-&gt;dev, (struct sockaddr *)&amp;ss,</div><div class='del'>-				    NULL);</div><div class='add'>+		dev_set_mac_address(new_slave-&gt;dev, &amp;ss, NULL);</div><div class='ctx'> </div><div class='del'>-		bond_hw_addr_copy(new_slave-&gt;dev-&gt;dev_addr, tmp_addr,</div><div class='del'>-				  new_slave-&gt;dev-&gt;addr_len);</div><div class='add'>+		dev_addr_set(new_slave-&gt;dev, tmp_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* curr_active_slave must be set before calling alb_swap_mac_addr */</div><div class='hunk'>@@ -1753,7 +1797,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		return res;</div><div class='ctx'> </div><div class='del'>-	bond_hw_addr_copy(bond_dev-&gt;dev_addr, ss-&gt;__data, bond_dev-&gt;addr_len);</div><div class='add'>+	dev_addr_set(bond_dev, ss-&gt;__data);</div><div class='ctx'> </div><div class='ctx'> 	/* If there is no curr_active_slave there is nothing else to do.</div><div class='ctx'> 	 * Otherwise we'll need to pass the new address to it and handle</div><div class='head'>diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c<br/>index 1360f1ffe070..8adbec7c5084 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_debugfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_debugfs.c</a></div><div class='hunk'>@@ -49,53 +49,33 @@ DEFINE_SHOW_ATTRIBUTE(bond_debug_rlb_hash);</div><div class='ctx'> </div><div class='ctx'> void bond_debug_register(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	if (!bonding_debug_root)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	bond-&gt;debug_dir =</div><div class='ctx'> 		debugfs_create_dir(bond-&gt;dev-&gt;name, bonding_debug_root);</div><div class='ctx'> </div><div class='del'>-	if (!bond-&gt;debug_dir) {</div><div class='del'>-		netdev_warn(bond-&gt;dev, "failed to register to debugfs\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	debugfs_create_file("rlb_hash_table", 0400, bond-&gt;debug_dir,</div><div class='ctx'> 				bond, &amp;bond_debug_rlb_hash_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bond_debug_unregister(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	if (!bonding_debug_root)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	debugfs_remove_recursive(bond-&gt;debug_dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bond_debug_reregister(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *d;</div><div class='del'>-</div><div class='del'>-	if (!bonding_debug_root)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	d = debugfs_rename(bonding_debug_root, bond-&gt;debug_dir,</div><div class='del'>-			   bonding_debug_root, bond-&gt;dev-&gt;name);</div><div class='del'>-	if (d) {</div><div class='del'>-		bond-&gt;debug_dir = d;</div><div class='del'>-	} else {</div><div class='add'>+	int err = debugfs_change_name(bond-&gt;debug_dir, "%s", bond-&gt;dev-&gt;name);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		netdev_warn(bond-&gt;dev, "failed to reregister, so just unregister old one\n");</div><div class='ctx'> 		bond_debug_unregister(bond);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bond_create_debugfs(void)</div><div class='add'>+void __init bond_create_debugfs(void)</div><div class='ctx'> {</div><div class='ctx'> 	bonding_debug_root = debugfs_create_dir("bonding", NULL);</div><div class='ctx'> </div><div class='del'>-	if (!bonding_debug_root) {</div><div class='add'>+	if (IS_ERR(bonding_debug_root))</div><div class='ctx'> 		pr_warn("Warning: Cannot create bonding directory in debugfs\n");</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bond_destroy_debugfs(void)</div><div class='hunk'>@@ -119,7 +99,7 @@ void bond_debug_reregister(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bond_create_debugfs(void)</div><div class='add'>+void __init bond_create_debugfs(void)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c<br/>index 407f4095a37a..3d56339a8a10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_main.c</a></div><div class='hunk'>@@ -1,8 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='ctx'> /*</div><div class='ctx'>  * originally based on the dummy device.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 1999, Thomas Davis, tadavis@lbl.gov.</div><div class='del'>- * Licensed under the GPL. Based on dummy.c, and eql.c devices.</div><div class='add'>+ * Based on dummy.c, and eql.c devices.</div><div class='ctx'>  *</div><div class='ctx'>  * bonding.c: an Ethernet Bonding driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -35,12 +36,15 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/fcntl.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/ioport.h&gt;</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/icmp.h&gt;</div><div class='add'>+#include &lt;linux/icmpv6.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -69,6 +73,7 @@</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/if_bonding.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/preempt.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='hunk'>@@ -77,9 +82,16 @@</div><div class='ctx'> #include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> #include &lt;linux/rculist.h&gt;</div><div class='ctx'> #include &lt;net/flow_dissector.h&gt;</div><div class='add'>+#include &lt;net/xfrm.h&gt;</div><div class='ctx'> #include &lt;net/bonding.h&gt;</div><div class='ctx'> #include &lt;net/bond_3ad.h&gt;</div><div class='ctx'> #include &lt;net/bond_alb.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_TLS_DEVICE)</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#endif</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bonding_priv.h"</div><div class='ctx'> </div><div class='hunk'>@@ -130,8 +142,7 @@ module_param(downdelay, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(downdelay, "Delay before considering link down, "</div><div class='ctx'> 			    "in milliseconds");</div><div class='ctx'> module_param(use_carrier, int, 0);</div><div class='del'>-MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; "</div><div class='del'>-			      "0 for off, 1 for on (default)");</div><div class='add'>+MODULE_PARM_DESC(use_carrier, "option obsolete, use_carrier cannot be disabled");</div><div class='ctx'> module_param(mode, charp, 0);</div><div class='ctx'> MODULE_PARM_DESC(mode, "Mode of operation; 0 for balance-rr, "</div><div class='ctx'> 		       "1 for active-backup, 2 for balance-xor, "</div><div class='hunk'>@@ -161,7 +172,7 @@ module_param(xmit_hash_policy, charp, 0);</div><div class='ctx'> MODULE_PARM_DESC(xmit_hash_policy, "balance-alb, balance-tlb, balance-xor, 802.3ad hashing method; "</div><div class='ctx'> 				   "0 for layer 2 (default), 1 for layer 3+4, "</div><div class='ctx'> 				   "2 for layer 2+3, 3 for encap layer 2+3, "</div><div class='del'>-				   "4 for encap layer 3+4");</div><div class='add'>+				   "4 for encap layer 3+4, 5 for vlan+srcmac");</div><div class='ctx'> module_param(arp_interval, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");</div><div class='ctx'> module_param_array(arp_ip_target, charp, NULL, 0);</div><div class='hunk'>@@ -200,6 +211,53 @@ atomic_t netpoll_block_tx = ATOMIC_INIT(0);</div><div class='ctx'> </div><div class='ctx'> unsigned int bond_net_id __read_mostly;</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_FALSE(bond_bcast_neigh_enabled);</div><div class='add'>+</div><div class='add'>+static const struct flow_dissector_key flow_keys_bonding_keys[] = {</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_CONTROL,</div><div class='add'>+		.offset = offsetof(struct flow_keys, control),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_BASIC,</div><div class='add'>+		.offset = offsetof(struct flow_keys, basic),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_IPV4_ADDRS,</div><div class='add'>+		.offset = offsetof(struct flow_keys, addrs.v4addrs),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_IPV6_ADDRS,</div><div class='add'>+		.offset = offsetof(struct flow_keys, addrs.v6addrs),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_TIPC,</div><div class='add'>+		.offset = offsetof(struct flow_keys, addrs.tipckey),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_PORTS,</div><div class='add'>+		.offset = offsetof(struct flow_keys, ports),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_ICMP,</div><div class='add'>+		.offset = offsetof(struct flow_keys, icmp),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_VLAN,</div><div class='add'>+		.offset = offsetof(struct flow_keys, vlan),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_FLOW_LABEL,</div><div class='add'>+		.offset = offsetof(struct flow_keys, tags),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.key_id = FLOW_DISSECTOR_KEY_GRE_KEYID,</div><div class='add'>+		.offset = offsetof(struct flow_keys, keyid),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flow_dissector flow_keys_bonding __read_mostly;</div><div class='add'>+</div><div class='ctx'> /*-------------------------- Forward declarations ---------------------------*/</div><div class='ctx'> </div><div class='ctx'> static int bond_init(struct net_device *bond_dev);</div><div class='hunk'>@@ -231,8 +289,6 @@ const char *bond_mode_name(int mode)</div><div class='ctx'> 	return names[mode];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*---------------------------------- VLAN -----------------------------------*/</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * bond_dev_queue_xmit - Prepare skb for xmit.</div><div class='ctx'>  *</div><div class='hunk'>@@ -240,7 +296,7 @@ const char *bond_mode_name(int mode)</div><div class='ctx'>  * @skb: hw accel VLAN tagged skb to transmit</div><div class='ctx'>  * @slave_dev: slave that is supposed to xmit this skbuff</div><div class='ctx'>  */</div><div class='del'>-void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,</div><div class='add'>+netdev_tx_t bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,</div><div class='ctx'> 			struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='ctx'> 	skb-&gt;dev = slave_dev;</div><div class='hunk'>@@ -250,11 +306,45 @@ void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,</div><div class='ctx'> 	skb_set_queue_mapping(skb, qdisc_skb_cb(skb)-&gt;slave_dev_queue_mapping);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(netpoll_tx_running(bond-&gt;dev)))</div><div class='del'>-		bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);</div><div class='del'>-	else</div><div class='del'>-		dev_queue_xmit(skb);</div><div class='add'>+		return bond_netpoll_send_skb(bond_get_slave_by_dev(bond, slave_dev), skb);</div><div class='add'>+</div><div class='add'>+	return dev_queue_xmit(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bond_sk_check(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	switch (BOND_MODE(bond)) {</div><div class='add'>+	case BOND_MODE_8023AD:</div><div class='add'>+	case BOND_MODE_XOR:</div><div class='add'>+		if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER34)</div><div class='add'>+			return true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bond_xdp_check(struct bonding *bond, int mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case BOND_MODE_ROUNDROBIN:</div><div class='add'>+	case BOND_MODE_ACTIVEBACKUP:</div><div class='add'>+		return true;</div><div class='add'>+	case BOND_MODE_8023AD:</div><div class='add'>+	case BOND_MODE_XOR:</div><div class='add'>+		/* vlan+srcmac is not supported with XDP as in most cases the 802.1q</div><div class='add'>+		 * payload is not in the packet due to hardware offload.</div><div class='add'>+		 */</div><div class='add'>+		if (bond-&gt;params.xmit_policy != BOND_XMIT_POLICY_VLAN_SRCMAC)</div><div class='add'>+			return true;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*---------------------------------- VLAN -----------------------------------*/</div><div class='add'>+</div><div class='ctx'> /* In the following 2 functions, bond_vlan_rx_add_vid and bond_vlan_rx_kill_vid,</div><div class='ctx'>  * We don't protect the slave list iteration with a lock because:</div><div class='ctx'>  * a. This operation is performed in IOCTL context,</div><div class='hunk'>@@ -274,6 +364,7 @@ void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,</div><div class='ctx'> /**</div><div class='ctx'>  * bond_vlan_rx_add_vid - Propagates adding an id to slaves</div><div class='ctx'>  * @bond_dev: bonding net device that got called</div><div class='add'>+ * @proto: network protocol ID</div><div class='ctx'>  * @vid: vlan id being added</div><div class='ctx'>  */</div><div class='ctx'> static int bond_vlan_rx_add_vid(struct net_device *bond_dev,</div><div class='hunk'>@@ -307,6 +398,7 @@ unwind:</div><div class='ctx'> /**</div><div class='ctx'>  * bond_vlan_rx_kill_vid - Propagates deleting an id to slaves</div><div class='ctx'>  * @bond_dev: bonding net device that got called</div><div class='add'>+ * @proto: network protocol ID</div><div class='ctx'>  * @vid: vlan id being removed</div><div class='ctx'>  */</div><div class='ctx'> static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,</div><div class='hunk'>@@ -325,6 +417,331 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/*---------------------------------- XFRM -----------------------------------*/</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+/**</div><div class='add'>+ * bond_ipsec_dev - Get active device for IPsec offload</div><div class='add'>+ * @xs: pointer to transformer state struct</div><div class='add'>+ *</div><div class='add'>+ * Context: caller must hold rcu_read_lock.</div><div class='add'>+ *</div><div class='add'>+ * Return: the device for ipsec offload, or NULL if not exist.</div><div class='add'>+ **/</div><div class='add'>+static struct net_device *bond_ipsec_dev(struct xfrm_state *xs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bond_dev = xs-&gt;xso.dev;</div><div class='add'>+	struct bonding *bond;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	bond = netdev_priv(bond_dev);</div><div class='add'>+	if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	if (!slave)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!xs-&gt;xso.real_dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (xs-&gt;xso.real_dev != slave-&gt;dev)</div><div class='add'>+		pr_warn_ratelimited("%s: (slave %s): not same with IPsec offload real dev %s\n",</div><div class='add'>+				    bond_dev-&gt;name, slave-&gt;dev-&gt;name, xs-&gt;xso.real_dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	return slave-&gt;dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_ipsec_add_sa - program device with a security association</div><div class='add'>+ * @bond_dev: pointer to the bond net device</div><div class='add'>+ * @xs: pointer to transformer state struct</div><div class='add'>+ * @extack: extack point to fill failure reason</div><div class='add'>+ **/</div><div class='add'>+static int bond_ipsec_add_sa(struct net_device *bond_dev,</div><div class='add'>+			     struct xfrm_state *xs,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	netdevice_tracker tracker;</div><div class='add'>+	struct bond_ipsec *ipsec;</div><div class='add'>+	struct bonding *bond;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!bond_dev)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	bond = netdev_priv(bond_dev);</div><div class='add'>+	slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	real_dev = slave ? slave-&gt;dev : NULL;</div><div class='add'>+	netdev_hold(real_dev, &amp;tracker, GFP_ATOMIC);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!real_dev) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!real_dev-&gt;xfrmdev_ops ||</div><div class='add'>+	    !real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_add ||</div><div class='add'>+	    netif_is_bond_master(real_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Slave does not support ipsec offload");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ipsec = kmalloc(sizeof(*ipsec), GFP_KERNEL);</div><div class='add'>+	if (!ipsec) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_add(real_dev, xs, extack);</div><div class='add'>+	if (!err) {</div><div class='add'>+		xs-&gt;xso.real_dev = real_dev;</div><div class='add'>+		ipsec-&gt;xs = xs;</div><div class='add'>+		INIT_LIST_HEAD(&amp;ipsec-&gt;list);</div><div class='add'>+		mutex_lock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+		list_add(&amp;ipsec-&gt;list, &amp;bond-&gt;ipsec_list);</div><div class='add'>+		mutex_unlock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+	} else {</div><div class='add'>+		kfree(ipsec);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	netdev_put(real_dev, &amp;tracker);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_ipsec_add_sa_all(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bond_dev = bond-&gt;dev;</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	struct bond_ipsec *ipsec;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	slave = rtnl_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	real_dev = slave ? slave-&gt;dev : NULL;</div><div class='add'>+	if (!real_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+	if (!real_dev-&gt;xfrmdev_ops ||</div><div class='add'>+	    !real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_add ||</div><div class='add'>+	    netif_is_bond_master(real_dev)) {</div><div class='add'>+		if (!list_empty(&amp;bond-&gt;ipsec_list))</div><div class='add'>+			slave_warn(bond_dev, real_dev,</div><div class='add'>+				   "%s: no slave xdo_dev_state_add\n",</div><div class='add'>+				   __func__);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(ipsec, &amp;bond-&gt;ipsec_list, list) {</div><div class='add'>+		/* If new state is added before ipsec_lock acquired */</div><div class='add'>+		if (ipsec-&gt;xs-&gt;xso.real_dev == real_dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_add(real_dev,</div><div class='add'>+							     ipsec-&gt;xs, NULL)) {</div><div class='add'>+			slave_warn(bond_dev, real_dev, "%s: failed to add SA\n", __func__);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ipsec-&gt;xs-&gt;lock);</div><div class='add'>+		/* xs might have been killed by the user during the migration</div><div class='add'>+		 * to the new dev, but bond_ipsec_del_sa() should have done</div><div class='add'>+		 * nothing, as xso.real_dev is NULL.</div><div class='add'>+		 * Delete it from the device we just added it to. The pending</div><div class='add'>+		 * bond_ipsec_free_sa() call will do the rest of the cleanup.</div><div class='add'>+		 */</div><div class='add'>+		if (ipsec-&gt;xs-&gt;km.state == XFRM_STATE_DEAD &amp;&amp;</div><div class='add'>+		    real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_delete)</div><div class='add'>+			real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_delete(real_dev,</div><div class='add'>+								    ipsec-&gt;xs);</div><div class='add'>+		ipsec-&gt;xs-&gt;xso.real_dev = real_dev;</div><div class='add'>+		spin_unlock_bh(&amp;ipsec-&gt;xs-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_ipsec_del_sa - clear out this specific SA</div><div class='add'>+ * @bond_dev: pointer to the bond net device</div><div class='add'>+ * @xs: pointer to transformer state struct</div><div class='add'>+ **/</div><div class='add'>+static void bond_ipsec_del_sa(struct net_device *bond_dev,</div><div class='add'>+			      struct xfrm_state *xs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+</div><div class='add'>+	if (!bond_dev || !xs-&gt;xso.real_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	real_dev = xs-&gt;xso.real_dev;</div><div class='add'>+</div><div class='add'>+	if (!real_dev-&gt;xfrmdev_ops ||</div><div class='add'>+	    !real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_delete ||</div><div class='add'>+	    netif_is_bond_master(real_dev)) {</div><div class='add'>+		slave_warn(bond_dev, real_dev, "%s: no slave xdo_dev_state_delete\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_delete(real_dev, xs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_ipsec_del_sa_all(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bond_dev = bond-&gt;dev;</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	struct bond_ipsec *ipsec;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	slave = rtnl_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	real_dev = slave ? slave-&gt;dev : NULL;</div><div class='add'>+	if (!real_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+	list_for_each_entry(ipsec, &amp;bond-&gt;ipsec_list, list) {</div><div class='add'>+		if (!ipsec-&gt;xs-&gt;xso.real_dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!real_dev-&gt;xfrmdev_ops ||</div><div class='add'>+		    !real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_delete ||</div><div class='add'>+		    netif_is_bond_master(real_dev)) {</div><div class='add'>+			slave_warn(bond_dev, real_dev,</div><div class='add'>+				   "%s: no slave xdo_dev_state_delete\n",</div><div class='add'>+				   __func__);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;ipsec-&gt;xs-&gt;lock);</div><div class='add'>+		ipsec-&gt;xs-&gt;xso.real_dev = NULL;</div><div class='add'>+		/* Don't double delete states killed by the user. */</div><div class='add'>+		if (ipsec-&gt;xs-&gt;km.state != XFRM_STATE_DEAD)</div><div class='add'>+			real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_delete(real_dev,</div><div class='add'>+								    ipsec-&gt;xs);</div><div class='add'>+		spin_unlock_bh(&amp;ipsec-&gt;xs-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_free)</div><div class='add'>+			real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_free(real_dev,</div><div class='add'>+								  ipsec-&gt;xs);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_ipsec_free_sa(struct net_device *bond_dev,</div><div class='add'>+			       struct xfrm_state *xs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	struct bond_ipsec *ipsec;</div><div class='add'>+	struct bonding *bond;</div><div class='add'>+</div><div class='add'>+	if (!bond_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bond = netdev_priv(bond_dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+	if (!xs-&gt;xso.real_dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	real_dev = xs-&gt;xso.real_dev;</div><div class='add'>+</div><div class='add'>+	xs-&gt;xso.real_dev = NULL;</div><div class='add'>+	if (real_dev-&gt;xfrmdev_ops &amp;&amp;</div><div class='add'>+	    real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_free)</div><div class='add'>+		real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_free(real_dev, xs);</div><div class='add'>+out:</div><div class='add'>+	list_for_each_entry(ipsec, &amp;bond-&gt;ipsec_list, list) {</div><div class='add'>+		if (ipsec-&gt;xs == xs) {</div><div class='add'>+			list_del(&amp;ipsec-&gt;list);</div><div class='add'>+			kfree(ipsec);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_ipsec_offload_ok - can this packet use the xfrm hw offload</div><div class='add'>+ * @skb: current data packet</div><div class='add'>+ * @xs: pointer to transformer state struct</div><div class='add'>+ **/</div><div class='add'>+static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	real_dev = bond_ipsec_dev(xs);</div><div class='add'>+	if (!real_dev || netif_is_bond_master(real_dev)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_advance_esn_state - ESN support for IPSec HW offload</div><div class='add'>+ * @xs: pointer to transformer state struct</div><div class='add'>+ **/</div><div class='add'>+static void bond_advance_esn_state(struct xfrm_state *xs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	real_dev = bond_ipsec_dev(xs);</div><div class='add'>+	if (!real_dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!real_dev-&gt;xfrmdev_ops ||</div><div class='add'>+	    !real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_advance_esn) {</div><div class='add'>+		pr_warn_ratelimited("%s: %s doesn't support xdo_dev_state_advance_esn\n", __func__, real_dev-&gt;name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_advance_esn(xs);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_xfrm_update_stats - Update xfrm state</div><div class='add'>+ * @xs: pointer to transformer state struct</div><div class='add'>+ **/</div><div class='add'>+static void bond_xfrm_update_stats(struct xfrm_state *xs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	real_dev = bond_ipsec_dev(xs);</div><div class='add'>+	if (!real_dev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!real_dev-&gt;xfrmdev_ops ||</div><div class='add'>+	    !real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_update_stats) {</div><div class='add'>+		pr_warn_ratelimited("%s: %s doesn't support xdo_dev_state_update_stats\n", __func__, real_dev-&gt;name);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	real_dev-&gt;xfrmdev_ops-&gt;xdo_dev_state_update_stats(xs);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xfrmdev_ops bond_xfrmdev_ops = {</div><div class='add'>+	.xdo_dev_state_add = bond_ipsec_add_sa,</div><div class='add'>+	.xdo_dev_state_delete = bond_ipsec_del_sa,</div><div class='add'>+	.xdo_dev_state_free = bond_ipsec_free_sa,</div><div class='add'>+	.xdo_dev_offload_ok = bond_ipsec_offload_ok,</div><div class='add'>+	.xdo_dev_state_advance_esn = bond_advance_esn_state,</div><div class='add'>+	.xdo_dev_state_update_stats = bond_xfrm_update_stats,</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='add'>+</div><div class='ctx'> /*------------------------------- Link status -------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /* Set the carrier state for the master according to the state of its</div><div class='hunk'>@@ -412,73 +829,6 @@ const char *bond_slave_link_status(s8 link)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* if &lt;dev&gt; supports MII link status reporting, check its link status.</div><div class='del'>- *</div><div class='del'>- * We either do MII/ETHTOOL ioctls, or check netif_carrier_ok(),</div><div class='del'>- * depending upon the setting of the use_carrier parameter.</div><div class='del'>- *</div><div class='del'>- * Return either BMSR_LSTATUS, meaning that the link is up (or we</div><div class='del'>- * can't tell and just pretend it is), or 0, meaning that the link is</div><div class='del'>- * down.</div><div class='del'>- *</div><div class='del'>- * If reporting is non-zero, instead of faking link up, return -1 if</div><div class='del'>- * both ETHTOOL and MII ioctls fail (meaning the device does not</div><div class='del'>- * support them).  If use_carrier is set, return whatever it says.</div><div class='del'>- * It'd be nice if there was a good way to tell if a driver supports</div><div class='del'>- * netif_carrier, but there really isn't.</div><div class='del'>- */</div><div class='del'>-static int bond_check_dev_link(struct bonding *bond,</div><div class='del'>-			       struct net_device *slave_dev, int reporting)</div><div class='del'>-{</div><div class='del'>-	const struct net_device_ops *slave_ops = slave_dev-&gt;netdev_ops;</div><div class='del'>-	int (*ioctl)(struct net_device *, struct ifreq *, int);</div><div class='del'>-	struct ifreq ifr;</div><div class='del'>-	struct mii_ioctl_data *mii;</div><div class='del'>-</div><div class='del'>-	if (!reporting &amp;&amp; !netif_running(slave_dev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (bond-&gt;params.use_carrier)</div><div class='del'>-		return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;</div><div class='del'>-</div><div class='del'>-	/* Try to get link status using Ethtool first. */</div><div class='del'>-	if (slave_dev-&gt;ethtool_ops-&gt;get_link)</div><div class='del'>-		return slave_dev-&gt;ethtool_ops-&gt;get_link(slave_dev) ?</div><div class='del'>-			BMSR_LSTATUS : 0;</div><div class='del'>-</div><div class='del'>-	/* Ethtool can't be used, fallback to MII ioctls. */</div><div class='del'>-	ioctl = slave_ops-&gt;ndo_do_ioctl;</div><div class='del'>-	if (ioctl) {</div><div class='del'>-		/* TODO: set pointer to correct ioctl on a per team member</div><div class='del'>-		 *       bases to make this more efficient. that is, once</div><div class='del'>-		 *       we determine the correct ioctl, we will always</div><div class='del'>-		 *       call it and not the others for that team</div><div class='del'>-		 *       member.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* We cannot assume that SIOCGMIIPHY will also read a</div><div class='del'>-		 * register; not all network drivers (e.g., e100)</div><div class='del'>-		 * support that.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		/* Yes, the mii is overlaid on the ifreq.ifr_ifru */</div><div class='del'>-		strncpy(ifr.ifr_name, slave_dev-&gt;name, IFNAMSIZ);</div><div class='del'>-		mii = if_mii(&amp;ifr);</div><div class='del'>-		if (ioctl(slave_dev, &amp;ifr, SIOCGMIIPHY) == 0) {</div><div class='del'>-			mii-&gt;reg_num = MII_BMSR;</div><div class='del'>-			if (ioctl(slave_dev, &amp;ifr, SIOCGMIIREG) == 0)</div><div class='del'>-				return mii-&gt;val_out &amp; BMSR_LSTATUS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If reporting, report that either there's no dev-&gt;do_ioctl,</div><div class='del'>-	 * or both SIOCGMIIREG and get_link failed (meaning that we</div><div class='del'>-	 * cannot report link status).  If not reporting, pretend</div><div class='del'>-	 * we're ok.</div><div class='del'>-	 */</div><div class='del'>-	return reporting ? -1 : BMSR_LSTATUS;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*----------------------------- Multicast list ------------------------------*/</div><div class='ctx'> </div><div class='ctx'> /* Push the promiscuity flag down to appropriate slaves */</div><div class='hunk'>@@ -558,12 +908,8 @@ static void bond_hw_addr_flush(struct net_device *bond_dev,</div><div class='ctx'> 	dev_uc_unsync(slave_dev, bond_dev);</div><div class='ctx'> 	dev_mc_unsync(slave_dev, bond_dev);</div><div class='ctx'> </div><div class='del'>-	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='del'>-		/* del lacpdu mc addr from mc list */</div><div class='del'>-		u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;</div><div class='del'>-</div><div class='del'>-		dev_mc_del(slave_dev, lacpdu_multicast);</div><div class='del'>-	}</div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_8023AD)</div><div class='add'>+		dev_mc_del(slave_dev, lacpdu_mcast_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*--------------------------- Active slave change ---------------------------*/</div><div class='hunk'>@@ -583,7 +929,10 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,</div><div class='ctx'> 		if (bond-&gt;dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='ctx'> 			dev_set_allmulti(old_active-&gt;dev, -1);</div><div class='ctx'> </div><div class='del'>-		bond_hw_addr_flush(bond-&gt;dev, old_active-&gt;dev);</div><div class='add'>+		if (bond-&gt;dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+			bond_hw_addr_flush(bond-&gt;dev, old_active-&gt;dev);</div><div class='add'>+</div><div class='add'>+		bond_slave_ns_maddrs_add(bond, old_active);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_active) {</div><div class='hunk'>@@ -594,10 +943,14 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,</div><div class='ctx'> 		if (bond-&gt;dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='ctx'> 			dev_set_allmulti(new_active-&gt;dev, 1);</div><div class='ctx'> </div><div class='del'>-		netif_addr_lock_bh(bond-&gt;dev);</div><div class='del'>-		dev_uc_sync(new_active-&gt;dev, bond-&gt;dev);</div><div class='del'>-		dev_mc_sync(new_active-&gt;dev, bond-&gt;dev);</div><div class='del'>-		netif_addr_unlock_bh(bond-&gt;dev);</div><div class='add'>+		if (bond-&gt;dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+			netif_addr_lock_bh(bond-&gt;dev);</div><div class='add'>+			dev_uc_sync(new_active-&gt;dev, bond-&gt;dev);</div><div class='add'>+			dev_mc_sync(new_active-&gt;dev, bond-&gt;dev);</div><div class='add'>+			netif_addr_unlock_bh(bond-&gt;dev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		bond_slave_ns_maddrs_del(bond, new_active);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -613,13 +966,13 @@ static int bond_set_dev_addr(struct net_device *bond_dev,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond_dev, "bond_dev=%p slave_dev=%p slave_dev-&gt;name=%s slave_dev-&gt;addr_len=%d\n",</div><div class='del'>-		   bond_dev, slave_dev, slave_dev-&gt;name, slave_dev-&gt;addr_len);</div><div class='del'>-	err = dev_pre_changeaddr_notify(bond_dev, slave_dev-&gt;dev_addr, NULL);</div><div class='add'>+	slave_dbg(bond_dev, slave_dev, "bond_dev=%p slave_dev=%p slave_dev-&gt;addr_len=%d\n",</div><div class='add'>+		  bond_dev, slave_dev, slave_dev-&gt;addr_len);</div><div class='add'>+	err = netif_pre_changeaddr_notify(bond_dev, slave_dev-&gt;dev_addr, NULL);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	memcpy(bond_dev-&gt;dev_addr, slave_dev-&gt;dev_addr, slave_dev-&gt;addr_len);</div><div class='add'>+	__dev_addr_set(bond_dev, slave_dev-&gt;dev_addr, slave_dev-&gt;addr_len);</div><div class='ctx'> 	bond_dev-&gt;addr_assign_type = NET_ADDR_STOLEN;</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_CHANGEADDR, bond_dev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -661,8 +1014,8 @@ static void bond_do_fail_over_mac(struct bonding *bond,</div><div class='ctx'> 		if (new_active) {</div><div class='ctx'> 			rv = bond_set_dev_addr(bond-&gt;dev, new_active-&gt;dev);</div><div class='ctx'> 			if (rv)</div><div class='del'>-				netdev_err(bond-&gt;dev, "Error %d setting MAC of slave %s\n",</div><div class='del'>-					   -rv, bond-&gt;dev-&gt;name);</div><div class='add'>+				slave_err(bond-&gt;dev, new_active-&gt;dev, "Error %d setting bond MAC from slave\n",</div><div class='add'>+					  -rv);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BOND_FOM_FOLLOW:</div><div class='hunk'>@@ -689,11 +1042,10 @@ static void bond_do_fail_over_mac(struct bonding *bond,</div><div class='ctx'> 			ss.ss_family = bond-&gt;dev-&gt;type;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		rv = dev_set_mac_address(new_active-&gt;dev,</div><div class='del'>-					 (struct sockaddr *)&amp;ss, NULL);</div><div class='add'>+		rv = dev_set_mac_address(new_active-&gt;dev, &amp;ss, NULL);</div><div class='ctx'> 		if (rv) {</div><div class='del'>-			netdev_err(bond-&gt;dev, "Error %d setting MAC of slave %s\n",</div><div class='del'>-				   -rv, new_active-&gt;dev-&gt;name);</div><div class='add'>+			slave_err(bond-&gt;dev, new_active-&gt;dev, "Error %d setting MAC of new active slave\n",</div><div class='add'>+				  -rv);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -704,11 +1056,10 @@ static void bond_do_fail_over_mac(struct bonding *bond,</div><div class='ctx'> 				  new_active-&gt;dev-&gt;addr_len);</div><div class='ctx'> 		ss.ss_family = old_active-&gt;dev-&gt;type;</div><div class='ctx'> </div><div class='del'>-		rv = dev_set_mac_address(old_active-&gt;dev,</div><div class='del'>-					 (struct sockaddr *)&amp;ss, NULL);</div><div class='add'>+		rv = dev_set_mac_address(old_active-&gt;dev, &amp;ss, NULL);</div><div class='ctx'> 		if (rv)</div><div class='del'>-			netdev_err(bond-&gt;dev, "Error %d setting MAC of slave %s\n",</div><div class='del'>-				   -rv, new_active-&gt;dev-&gt;name);</div><div class='add'>+			slave_err(bond-&gt;dev, old_active-&gt;dev, "Error %d setting MAC of old active slave\n",</div><div class='add'>+				  -rv);</div><div class='ctx'> out:</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -719,12 +1070,38 @@ out:</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * bond_choose_primary_or_current - select the primary or high priority slave</div><div class='add'>+ * @bond: our bonding struct</div><div class='add'>+ *</div><div class='add'>+ * - Check if there is a primary link. If the primary link was set and is up,</div><div class='add'>+ *   go on and do link reselection.</div><div class='add'>+ *</div><div class='add'>+ * - If primary link is not set or down, find the highest priority link.</div><div class='add'>+ *   If the highest priority link is not current slave, set it as primary</div><div class='add'>+ *   link and do link reselection.</div><div class='add'>+ */</div><div class='ctx'> static struct slave *bond_choose_primary_or_current(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	struct slave *prim = rtnl_dereference(bond-&gt;primary_slave);</div><div class='ctx'> 	struct slave *curr = rtnl_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	struct slave *slave, *hprio = NULL;</div><div class='add'>+	struct list_head *iter;</div><div class='ctx'> </div><div class='ctx'> 	if (!prim || prim-&gt;link != BOND_LINK_UP) {</div><div class='add'>+		bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+			if (slave-&gt;link == BOND_LINK_UP) {</div><div class='add'>+				hprio = hprio ?: slave;</div><div class='add'>+				if (slave-&gt;prio &gt; hprio-&gt;prio)</div><div class='add'>+					hprio = slave;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (hprio &amp;&amp; hprio != curr) {</div><div class='add'>+			prim = hprio;</div><div class='add'>+			goto link_reselect;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (!curr || curr-&gt;link != BOND_LINK_UP)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		return curr;</div><div class='hunk'>@@ -735,6 +1112,7 @@ static struct slave *bond_choose_primary_or_current(struct bonding *bond)</div><div class='ctx'> 		return prim;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+link_reselect:</div><div class='ctx'> 	if (!curr || curr-&gt;link != BOND_LINK_UP)</div><div class='ctx'> 		return prim;</div><div class='ctx'> </div><div class='hunk'>@@ -784,29 +1162,43 @@ static struct slave *bond_find_best_slave(struct bonding *bond)</div><div class='ctx'> 	return bestslave;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* must be called in RCU critical section or with RTNL held */</div><div class='ctx'> static bool bond_should_notify_peers(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	struct slave *slave;</div><div class='add'>+	struct bond_up_slave *usable;</div><div class='add'>+	struct slave *slave = NULL;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	if (!bond-&gt;send_peer_notif ||</div><div class='add'>+	    bond-&gt;send_peer_notif %</div><div class='add'>+	    max(1, bond-&gt;params.peer_notif_delay) != 0 ||</div><div class='add'>+	    !netif_carrier_ok(bond-&gt;dev))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond-&gt;dev, "bond_should_notify_peers: slave %s\n",</div><div class='del'>-		   slave ? slave-&gt;dev-&gt;name : "NULL");</div><div class='add'>+	/* The send_peer_notif is set by active-backup or 8023ad</div><div class='add'>+	 * mode, and cleared in bond_close() when changing mode.</div><div class='add'>+	 * It is safe to only check bond mode here.</div><div class='add'>+	 */</div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='add'>+		usable = rcu_dereference_rtnl(bond-&gt;usable_slaves);</div><div class='add'>+		if (!usable || !READ_ONCE(usable-&gt;count))</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+		slave = rcu_dereference_rtnl(bond-&gt;curr_active_slave);</div><div class='add'>+		if (!slave || test_bit(__LINK_STATE_LINKWATCH_PENDING,</div><div class='add'>+				       &amp;slave-&gt;dev-&gt;state))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!slave || !bond-&gt;send_peer_notif ||</div><div class='del'>-	    !netif_carrier_ok(bond-&gt;dev) ||</div><div class='del'>-	    test_bit(__LINK_STATE_LINKWATCH_PENDING, &amp;slave-&gt;dev-&gt;state))</div><div class='del'>-		return false;</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "bond_should_notify_peers: slave %s\n",</div><div class='add'>+		   slave ? slave-&gt;dev-&gt;name : "all");</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * change_active_interface - change the active slave into the specified one</div><div class='add'>+ * bond_change_active_slave - change the active slave into the specified one</div><div class='ctx'>  * @bond: our bonding struct</div><div class='del'>- * @new: the new slave to make the active one</div><div class='add'>+ * @new_active: the new slave to make the active one</div><div class='ctx'>  *</div><div class='ctx'>  * Set the new slave to the bond's settings and unset them on the old</div><div class='ctx'>  * curr_active_slave.</div><div class='hunk'>@@ -829,14 +1221,17 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)</div><div class='ctx'> 	if (old_active == new_active)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+	bond_ipsec_del_sa_all(bond);</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='add'>+</div><div class='ctx'> 	if (new_active) {</div><div class='ctx'> 		new_active-&gt;last_link_up = jiffies;</div><div class='ctx'> </div><div class='ctx'> 		if (new_active-&gt;link == BOND_LINK_BACK) {</div><div class='ctx'> 			if (bond_uses_primary(bond)) {</div><div class='del'>-				netdev_info(bond-&gt;dev, "making interface %s the new active one %d ms earlier\n",</div><div class='del'>-					    new_active-&gt;dev-&gt;name,</div><div class='del'>-					    (bond-&gt;params.updelay - new_active-&gt;delay) * bond-&gt;params.miimon);</div><div class='add'>+				slave_info(bond-&gt;dev, new_active-&gt;dev, "making interface the new active one %d ms earlier\n",</div><div class='add'>+					   (bond-&gt;params.updelay - new_active-&gt;delay) * bond-&gt;params.miimon);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			new_active-&gt;delay = 0;</div><div class='hunk'>@@ -849,10 +1244,8 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)</div><div class='ctx'> 			if (bond_is_lb(bond))</div><div class='ctx'> 				bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);</div><div class='ctx'> 		} else {</div><div class='del'>-			if (bond_uses_primary(bond)) {</div><div class='del'>-				netdev_info(bond-&gt;dev, "making interface %s the new active one\n",</div><div class='del'>-					    new_active-&gt;dev-&gt;name);</div><div class='del'>-			}</div><div class='add'>+			if (bond_uses_primary(bond))</div><div class='add'>+				slave_info(bond-&gt;dev, new_active-&gt;dev, "making interface the new active one\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -888,18 +1281,25 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)</div><div class='ctx'> </div><div class='ctx'> 			if (netif_running(bond-&gt;dev)) {</div><div class='ctx'> 				bond-&gt;send_peer_notif =</div><div class='del'>-					bond-&gt;params.num_peer_notif;</div><div class='add'>+					bond-&gt;params.num_peer_notif *</div><div class='add'>+					max(1, bond-&gt;params.peer_notif_delay);</div><div class='ctx'> 				should_notify_peers =</div><div class='ctx'> 					bond_should_notify_peers(bond);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			call_netdevice_notifiers(NETDEV_BONDING_FAILOVER, bond-&gt;dev);</div><div class='del'>-			if (should_notify_peers)</div><div class='add'>+			if (should_notify_peers) {</div><div class='add'>+				bond-&gt;send_peer_notif--;</div><div class='ctx'> 				call_netdevice_notifiers(NETDEV_NOTIFY_PEERS,</div><div class='ctx'> 							 bond-&gt;dev);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+	bond_ipsec_add_sa_all(bond);</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='add'>+</div><div class='ctx'> 	/* resend IGMP joins since active slave has changed or</div><div class='ctx'> 	 * all were sent on curr_active_slave.</div><div class='ctx'> 	 * resend only if bond is brought up with the affected</div><div class='hunk'>@@ -939,7 +1339,7 @@ void bond_select_active_slave(struct bonding *bond)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		if (netif_carrier_ok(bond-&gt;dev))</div><div class='del'>-			netdev_info(bond-&gt;dev, "first active interface up!\n");</div><div class='add'>+			netdev_info(bond-&gt;dev, "active interface up!\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			netdev_info(bond-&gt;dev, "now running without any active interface!\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1016,7 +1416,7 @@ static void bond_netpoll_cleanup(struct net_device *bond_dev)</div><div class='ctx'> 			slave_disable_netpoll(slave);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni)</div><div class='add'>+static int bond_netpoll_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(dev);</div><div class='ctx'> 	struct list_head *iter;</div><div class='hunk'>@@ -1056,9 +1456,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev,</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> </div><div class='ctx'> 	mask = features;</div><div class='del'>-</div><div class='del'>-	features &amp;= ~NETIF_F_ONE_FOR_ALL;</div><div class='del'>-	features |= NETIF_F_ALL_FOR_ALL;</div><div class='add'>+	features = netdev_base_features(features);</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='ctx'> 		features = netdev_increment_features(features,</div><div class='hunk'>@@ -1070,72 +1468,29 @@ static netdev_features_t bond_fix_features(struct net_device *dev,</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BOND_VLAN_FEATURES	(NETIF_F_HW_CSUM | NETIF_F_SG | \</div><div class='del'>-				 NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \</div><div class='del'>-				 NETIF_F_HIGHDMA | NETIF_F_LRO)</div><div class='del'>-</div><div class='del'>-#define BOND_ENC_FEATURES	(NETIF_F_HW_CSUM | NETIF_F_SG | \</div><div class='del'>-				 NETIF_F_RXCSUM | NETIF_F_ALL_TSO)</div><div class='del'>-</div><div class='del'>-static void bond_compute_features(struct bonding *bond)</div><div class='del'>-{</div><div class='del'>-	unsigned int dst_release_flag = IFF_XMIT_DST_RELEASE |</div><div class='del'>-					IFF_XMIT_DST_RELEASE_PERM;</div><div class='del'>-	netdev_features_t vlan_features = BOND_VLAN_FEATURES;</div><div class='del'>-	netdev_features_t enc_features  = BOND_ENC_FEATURES;</div><div class='del'>-	struct net_device *bond_dev = bond-&gt;dev;</div><div class='del'>-	struct list_head *iter;</div><div class='del'>-	struct slave *slave;</div><div class='del'>-	unsigned short max_hard_header_len = ETH_HLEN;</div><div class='del'>-	unsigned int gso_max_size = GSO_MAX_SIZE;</div><div class='del'>-	u16 gso_max_segs = GSO_MAX_SEGS;</div><div class='del'>-</div><div class='del'>-	if (!bond_has_slaves(bond))</div><div class='del'>-		goto done;</div><div class='del'>-	vlan_features &amp;= NETIF_F_ALL_FOR_ALL;</div><div class='del'>-</div><div class='del'>-	bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-		vlan_features = netdev_increment_features(vlan_features,</div><div class='del'>-			slave-&gt;dev-&gt;vlan_features, BOND_VLAN_FEATURES);</div><div class='del'>-</div><div class='del'>-		enc_features = netdev_increment_features(enc_features,</div><div class='del'>-							 slave-&gt;dev-&gt;hw_enc_features,</div><div class='del'>-							 BOND_ENC_FEATURES);</div><div class='del'>-		dst_release_flag &amp;= slave-&gt;dev-&gt;priv_flags;</div><div class='del'>-		if (slave-&gt;dev-&gt;hard_header_len &gt; max_hard_header_len)</div><div class='del'>-			max_hard_header_len = slave-&gt;dev-&gt;hard_header_len;</div><div class='del'>-</div><div class='del'>-		gso_max_size = min(gso_max_size, slave-&gt;dev-&gt;gso_max_size);</div><div class='del'>-		gso_max_segs = min(gso_max_segs, slave-&gt;dev-&gt;gso_max_segs);</div><div class='del'>-	}</div><div class='del'>-	bond_dev-&gt;hard_header_len = max_hard_header_len;</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	bond_dev-&gt;vlan_features = vlan_features;</div><div class='del'>-	bond_dev-&gt;hw_enc_features = enc_features | NETIF_F_GSO_ENCAP_ALL |</div><div class='del'>-				    NETIF_F_GSO_UDP_L4;</div><div class='del'>-	bond_dev-&gt;gso_max_segs = gso_max_segs;</div><div class='del'>-	netif_set_gso_max_size(bond_dev, gso_max_size);</div><div class='del'>-</div><div class='del'>-	bond_dev-&gt;priv_flags &amp;= ~IFF_XMIT_DST_RELEASE;</div><div class='del'>-	if ((bond_dev-&gt;priv_flags &amp; IFF_XMIT_DST_RELEASE_PERM) &amp;&amp;</div><div class='del'>-	    dst_release_flag == (IFF_XMIT_DST_RELEASE | IFF_XMIT_DST_RELEASE_PERM))</div><div class='del'>-		bond_dev-&gt;priv_flags |= IFF_XMIT_DST_RELEASE;</div><div class='del'>-</div><div class='del'>-	netdev_change_features(bond_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bond_setup_by_slave(struct net_device *bond_dev,</div><div class='ctx'> 				struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='add'>+	bool was_up = !!(bond_dev-&gt;flags &amp; IFF_UP);</div><div class='add'>+</div><div class='add'>+	dev_close(bond_dev);</div><div class='add'>+</div><div class='ctx'> 	bond_dev-&gt;header_ops	    = slave_dev-&gt;header_ops;</div><div class='ctx'> </div><div class='ctx'> 	bond_dev-&gt;type		    = slave_dev-&gt;type;</div><div class='ctx'> 	bond_dev-&gt;hard_header_len   = slave_dev-&gt;hard_header_len;</div><div class='add'>+	bond_dev-&gt;needed_headroom   = slave_dev-&gt;needed_headroom;</div><div class='ctx'> 	bond_dev-&gt;addr_len	    = slave_dev-&gt;addr_len;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(bond_dev-&gt;broadcast, slave_dev-&gt;broadcast,</div><div class='ctx'> 		slave_dev-&gt;addr_len);</div><div class='add'>+</div><div class='add'>+	if (slave_dev-&gt;flags &amp; IFF_POINTOPOINT) {</div><div class='add'>+		bond_dev-&gt;flags &amp;= ~(IFF_BROADCAST | IFF_MULTICAST);</div><div class='add'>+		bond_dev-&gt;flags |= (IFF_POINTOPOINT | IFF_NOARP);</div><div class='add'>+	}</div><div class='add'>+	if (was_up)</div><div class='add'>+		dev_open(bond_dev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* On bonding slaves other than the currently active slave, suppress</div><div class='hunk'>@@ -1202,7 +1557,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)</div><div class='ctx'> 	skb-&gt;dev = bond-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_ALB &amp;&amp;</div><div class='del'>-	    bond-&gt;dev-&gt;priv_flags &amp; IFF_BRIDGE_PORT &amp;&amp;</div><div class='add'>+	    netif_is_bridge_port(bond-&gt;dev) &amp;&amp;</div><div class='ctx'> 	    skb-&gt;pkt_type == PACKET_HOST) {</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(skb_cow_head(skb,</div><div class='hunk'>@@ -1251,6 +1606,8 @@ static enum netdev_lag_hash bond_lag_hash_type(struct bonding *bond,</div><div class='ctx'> 		return NETDEV_LAG_HASH_E23;</div><div class='ctx'> 	case BOND_XMIT_POLICY_ENCAP34:</div><div class='ctx'> 		return NETDEV_LAG_HASH_E34;</div><div class='add'>+	case BOND_XMIT_POLICY_VLAN_SRCMAC:</div><div class='add'>+		return NETDEV_LAG_HASH_VLAN_SRCMAC;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return NETDEV_LAG_HASH_UNKNOWN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1261,13 +1618,19 @@ static int bond_master_upper_dev_link(struct bonding *bond, struct slave *slave,</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_lag_upper_info lag_upper_info;</div><div class='ctx'> 	enum netdev_lag_tx_type type;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	type = bond_lag_tx_type(bond);</div><div class='ctx'> 	lag_upper_info.tx_type = type;</div><div class='ctx'> 	lag_upper_info.hash_type = bond_lag_hash_type(bond, type);</div><div class='ctx'> </div><div class='del'>-	return netdev_master_upper_dev_link(slave-&gt;dev, bond-&gt;dev, slave,</div><div class='del'>-					    &amp;lag_upper_info, extack);</div><div class='add'>+	err = netdev_master_upper_dev_link(slave-&gt;dev, bond-&gt;dev, slave,</div><div class='add'>+					   &amp;lag_upper_info, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	slave-&gt;dev-&gt;flags |= IFF_SLAVE;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bond_upper_dev_unlink(struct bonding *bond, struct slave *slave)</div><div class='hunk'>@@ -1276,7 +1639,39 @@ static void bond_upper_dev_unlink(struct bonding *bond, struct slave *slave)</div><div class='ctx'> 	slave-&gt;dev-&gt;flags &amp;= ~IFF_SLAVE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct slave *bond_alloc_slave(struct bonding *bond)</div><div class='add'>+static void slave_kobj_release(struct kobject *kobj)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave = to_slave(kobj);</div><div class='add'>+	struct bonding *bond = bond_get_bond_by_slave(slave);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;slave-&gt;notify_work);</div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_8023AD)</div><div class='add'>+		kfree(SLAVE_AD_INFO(slave));</div><div class='add'>+</div><div class='add'>+	kfree(slave);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct kobj_type slave_ktype = {</div><div class='add'>+	.release = slave_kobj_release,</div><div class='add'>+#ifdef CONFIG_SYSFS</div><div class='add'>+	.sysfs_ops = &amp;slave_sysfs_ops,</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bond_kobj_init(struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = kobject_init_and_add(&amp;slave-&gt;kobj, &amp;slave_ktype,</div><div class='add'>+				   &amp;(slave-&gt;dev-&gt;dev.kobj), "bonding_slave");</div><div class='add'>+	if (err)</div><div class='add'>+		kobject_put(&amp;slave-&gt;kobj);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct slave *bond_alloc_slave(struct bonding *bond,</div><div class='add'>+				      struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct slave *slave = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1284,30 +1679,25 @@ static struct slave *bond_alloc_slave(struct bonding *bond)</div><div class='ctx'> 	if (!slave)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	slave-&gt;bond = bond;</div><div class='add'>+	slave-&gt;dev = slave_dev;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;slave-&gt;notify_work, bond_netdev_notify_work);</div><div class='add'>+</div><div class='add'>+	if (bond_kobj_init(slave))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		SLAVE_AD_INFO(slave) = kzalloc(sizeof(struct ad_slave_info),</div><div class='ctx'> 					       GFP_KERNEL);</div><div class='ctx'> 		if (!SLAVE_AD_INFO(slave)) {</div><div class='del'>-			kfree(slave);</div><div class='add'>+			kobject_put(&amp;slave-&gt;kobj);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	INIT_DELAYED_WORK(&amp;slave-&gt;notify_work, bond_netdev_notify_work);</div><div class='ctx'> </div><div class='ctx'> 	return slave;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bond_free_slave(struct slave *slave)</div><div class='del'>-{</div><div class='del'>-	struct bonding *bond = bond_get_bond_by_slave(slave);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;slave-&gt;notify_work);</div><div class='del'>-	if (BOND_MODE(bond) == BOND_MODE_8023AD)</div><div class='del'>-		kfree(SLAVE_AD_INFO(slave));</div><div class='del'>-</div><div class='del'>-	kfree(slave);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void bond_fill_ifbond(struct bonding *bond, struct ifbond *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;bond_mode = BOND_MODE(bond);</div><div class='hunk'>@@ -1355,6 +1745,56 @@ void bond_lower_state_changed(struct slave *slave)</div><div class='ctx'> 	netdev_lower_state_changed(slave-&gt;dev, &amp;info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BOND_NL_ERR(bond_dev, extack, errmsg) do {		\</div><div class='add'>+	if (extack)						\</div><div class='add'>+		NL_SET_ERR_MSG(extack, errmsg);			\</div><div class='add'>+	else							\</div><div class='add'>+		netdev_err(bond_dev, "Error: %s\n", errmsg);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define SLAVE_NL_ERR(bond_dev, slave_dev, extack, errmsg) do {		\</div><div class='add'>+	if (extack)							\</div><div class='add'>+		NL_SET_ERR_MSG(extack, errmsg);				\</div><div class='add'>+	else								\</div><div class='add'>+		slave_err(bond_dev, slave_dev, "Error: %s\n", errmsg);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+/* The bonding driver uses ether_setup() to convert a master bond device</div><div class='add'>+ * to ARPHRD_ETHER, that resets the target netdevice's flags so we always</div><div class='add'>+ * have to restore the IFF_MASTER flag, and only restore IFF_SLAVE and IFF_UP</div><div class='add'>+ * if they were set</div><div class='add'>+ */</div><div class='add'>+static void bond_ether_setup(struct net_device *bond_dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int flags = bond_dev-&gt;flags &amp; (IFF_SLAVE | IFF_UP);</div><div class='add'>+</div><div class='add'>+	ether_setup(bond_dev);</div><div class='add'>+	bond_dev-&gt;flags |= IFF_MASTER | flags;</div><div class='add'>+	bond_dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bond_xdp_set_features(struct net_device *bond_dev)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	xdp_features_t val = NETDEV_XDP_ACT_MASK;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!bond_xdp_check(bond, BOND_MODE(bond)) || !bond_has_slaves(bond)) {</div><div class='add'>+		xdp_clear_features_flag(bond_dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bond_for_each_slave(bond, slave, iter)</div><div class='add'>+		val &amp;= slave-&gt;dev-&gt;xdp_features;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~NETDEV_XDP_ACT_XSK_ZEROCOPY;</div><div class='add'>+</div><div class='add'>+	xdp_set_features_flag(bond_dev, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* enslave device &lt;slave&gt; to bond device &lt;master&gt; */</div><div class='ctx'> int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 		 struct netlink_ext_ack *extack)</div><div class='hunk'>@@ -1363,59 +1803,53 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 	const struct net_device_ops *slave_ops = slave_dev-&gt;netdev_ops;</div><div class='ctx'> 	struct slave *new_slave = NULL, *prev_slave;</div><div class='ctx'> 	struct sockaddr_storage ss;</div><div class='del'>-	int link_reporting;</div><div class='ctx'> 	int res = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (!bond-&gt;params.use_carrier &amp;&amp;</div><div class='del'>-	    slave_dev-&gt;ethtool_ops-&gt;get_link == NULL &amp;&amp;</div><div class='del'>-	    slave_ops-&gt;ndo_do_ioctl == NULL) {</div><div class='del'>-		netdev_warn(bond_dev, "no link monitoring support for %s\n",</div><div class='del'>-			    slave_dev-&gt;name);</div><div class='add'>+	if (slave_dev-&gt;flags &amp; IFF_MASTER &amp;&amp;</div><div class='add'>+	    !netif_is_bond_master(slave_dev)) {</div><div class='add'>+		BOND_NL_ERR(bond_dev, extack,</div><div class='add'>+			    "Device type (master device) cannot be enslaved");</div><div class='add'>+		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* already in-use? */</div><div class='ctx'> 	if (netdev_is_rx_handler_busy(slave_dev)) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Device is in use and cannot be enslaved");</div><div class='del'>-		netdev_err(bond_dev,</div><div class='del'>-			   "Error: Device is in use and cannot be enslaved\n");</div><div class='add'>+		SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+			     "Device is in use and cannot be enslaved");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bond_dev == slave_dev) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Cannot enslave bond to itself.");</div><div class='del'>-		netdev_err(bond_dev, "cannot enslave bond to itself.\n");</div><div class='add'>+		BOND_NL_ERR(bond_dev, extack, "Cannot enslave bond to itself.");</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* vlan challenged mutual exclusion */</div><div class='ctx'> 	/* no need to lock since we're protected by rtnl_lock */</div><div class='ctx'> 	if (slave_dev-&gt;features &amp; NETIF_F_VLAN_CHALLENGED) {</div><div class='del'>-		netdev_dbg(bond_dev, "%s is NETIF_F_VLAN_CHALLENGED\n",</div><div class='del'>-			   slave_dev-&gt;name);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "is NETIF_F_VLAN_CHALLENGED\n");</div><div class='ctx'> 		if (vlan_uses_dev(bond_dev)) {</div><div class='del'>-			NL_SET_ERR_MSG(extack, "Can not enslave VLAN challenged device to VLAN enabled bond");</div><div class='del'>-			netdev_err(bond_dev, "Error: cannot enslave VLAN challenged slave %s on VLAN enabled bond %s\n",</div><div class='del'>-				   slave_dev-&gt;name, bond_dev-&gt;name);</div><div class='add'>+			SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+				     "Can not enslave VLAN challenged device to VLAN enabled bond");</div><div class='ctx'> 			return -EPERM;</div><div class='ctx'> 		} else {</div><div class='del'>-			netdev_warn(bond_dev, "enslaved VLAN challenged slave %s. Adding VLANs will be blocked as long as %s is part of bond %s\n",</div><div class='del'>-				    slave_dev-&gt;name, slave_dev-&gt;name,</div><div class='del'>-				    bond_dev-&gt;name);</div><div class='add'>+			slave_warn(bond_dev, slave_dev, "enslaved VLAN challenged slave. Adding VLANs will be blocked as long as it is part of bond.\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		netdev_dbg(bond_dev, "%s is !NETIF_F_VLAN_CHALLENGED\n",</div><div class='del'>-			   slave_dev-&gt;name);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "is !NETIF_F_VLAN_CHALLENGED\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (slave_dev-&gt;features &amp; NETIF_F_HW_ESP)</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "is esp-hw-offload capable\n");</div><div class='add'>+</div><div class='ctx'> 	/* Old ifenslave binaries are no longer supported.  These can</div><div class='ctx'> 	 * be identified with moderate accuracy by the state of the slave:</div><div class='ctx'> 	 * the current ifenslave will set the interface down prior to</div><div class='ctx'> 	 * enslaving it; the old ifenslave will not.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (slave_dev-&gt;flags &amp; IFF_UP) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Device can not be enslaved while up");</div><div class='del'>-		netdev_err(bond_dev, "%s is up - this may be due to an out of date ifenslave\n",</div><div class='del'>-			   slave_dev-&gt;name);</div><div class='add'>+		SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+			     "Device can not be enslaved while up");</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1428,14 +1862,14 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!bond_has_slaves(bond)) {</div><div class='ctx'> 		if (bond_dev-&gt;type != slave_dev-&gt;type) {</div><div class='del'>-			netdev_dbg(bond_dev, "change device type from %d to %d\n",</div><div class='del'>-				   bond_dev-&gt;type, slave_dev-&gt;type);</div><div class='add'>+			slave_dbg(bond_dev, slave_dev, "change device type from %d to %d\n",</div><div class='add'>+				  bond_dev-&gt;type, slave_dev-&gt;type);</div><div class='ctx'> </div><div class='ctx'> 			res = call_netdevice_notifiers(NETDEV_PRE_TYPE_CHANGE,</div><div class='ctx'> 						       bond_dev);</div><div class='ctx'> 			res = notifier_to_errno(res);</div><div class='ctx'> 			if (res) {</div><div class='del'>-				netdev_err(bond_dev, "refused to change device type\n");</div><div class='add'>+				slave_err(bond_dev, slave_dev, "refused to change device type\n");</div><div class='ctx'> 				return -EBUSY;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -1445,41 +1879,37 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> </div><div class='ctx'> 			if (slave_dev-&gt;type != ARPHRD_ETHER)</div><div class='ctx'> 				bond_setup_by_slave(bond_dev, slave_dev);</div><div class='del'>-			else {</div><div class='del'>-				ether_setup(bond_dev);</div><div class='del'>-				bond_dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='del'>-			}</div><div class='add'>+			else</div><div class='add'>+				bond_ether_setup(bond_dev);</div><div class='ctx'> </div><div class='ctx'> 			call_netdevice_notifiers(NETDEV_POST_TYPE_CHANGE,</div><div class='ctx'> 						 bond_dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (bond_dev-&gt;type != slave_dev-&gt;type) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Device type is different from other slaves");</div><div class='del'>-		netdev_err(bond_dev, "%s ether type (%d) is different from other slaves (%d), can not enslave it\n",</div><div class='del'>-			   slave_dev-&gt;name, slave_dev-&gt;type, bond_dev-&gt;type);</div><div class='add'>+		SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+			     "Device type is different from other slaves");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (slave_dev-&gt;type == ARPHRD_INFINIBAND &amp;&amp;</div><div class='ctx'> 	    BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) {</div><div class='del'>-		NL_SET_ERR_MSG(extack, "Only active-backup mode is supported for infiniband slaves");</div><div class='del'>-		netdev_warn(bond_dev, "Type (%d) supports only active-backup mode\n",</div><div class='del'>-			    slave_dev-&gt;type);</div><div class='add'>+		SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+			     "Only active-backup mode is supported for infiniband slaves");</div><div class='ctx'> 		res = -EOPNOTSUPP;</div><div class='ctx'> 		goto err_undo_flags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!slave_ops-&gt;ndo_set_mac_address ||</div><div class='ctx'> 	    slave_dev-&gt;type == ARPHRD_INFINIBAND) {</div><div class='del'>-		netdev_warn(bond_dev, "The slave device specified does not support setting the MAC address\n");</div><div class='add'>+		slave_warn(bond_dev, slave_dev, "The slave device specified does not support setting the MAC address\n");</div><div class='ctx'> 		if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP &amp;&amp;</div><div class='ctx'> 		    bond-&gt;params.fail_over_mac != BOND_FOM_ACTIVE) {</div><div class='ctx'> 			if (!bond_has_slaves(bond)) {</div><div class='ctx'> 				bond-&gt;params.fail_over_mac = BOND_FOM_ACTIVE;</div><div class='del'>-				netdev_warn(bond_dev, "Setting fail_over_mac to active for active-backup mode\n");</div><div class='add'>+				slave_warn(bond_dev, slave_dev, "Setting fail_over_mac to active for active-backup mode\n");</div><div class='ctx'> 			} else {</div><div class='del'>-				NL_SET_ERR_MSG(extack, "Slave device does not support setting the MAC address, but fail_over_mac is not set to active");</div><div class='del'>-				netdev_err(bond_dev, "The slave device specified does not support setting the MAC address, but fail_over_mac is not set to active\n");</div><div class='add'>+				SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+					     "Slave device does not support setting the MAC address, but fail_over_mac is not set to active");</div><div class='ctx'> 				res = -EOPNOTSUPP;</div><div class='ctx'> 				goto err_undo_flags;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1498,14 +1928,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 			goto err_undo_flags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	new_slave = bond_alloc_slave(bond);</div><div class='add'>+	new_slave = bond_alloc_slave(bond, slave_dev);</div><div class='ctx'> 	if (!new_slave) {</div><div class='ctx'> 		res = -ENOMEM;</div><div class='ctx'> 		goto err_undo_flags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	new_slave-&gt;bond = bond;</div><div class='del'>-	new_slave-&gt;dev = slave_dev;</div><div class='ctx'> 	/* Set the new_slave's queue_id to be zero.  Queue ID mapping</div><div class='ctx'> 	 * is set via sysfs or module option if desired.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1515,7 +1943,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 	new_slave-&gt;original_mtu = slave_dev-&gt;mtu;</div><div class='ctx'> 	res = dev_set_mtu(slave_dev, bond-&gt;dev-&gt;mtu);</div><div class='ctx'> 	if (res) {</div><div class='del'>-		netdev_dbg(bond_dev, "Error %d calling dev_set_mtu\n", res);</div><div class='add'>+		slave_err(bond_dev, slave_dev, "Error %d calling dev_set_mtu\n", res);</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1532,22 +1960,34 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 		 * set the master's mac address to that of the first slave</div><div class='ctx'> 		 */</div><div class='ctx'> 		memcpy(ss.__data, bond_dev-&gt;dev_addr, bond_dev-&gt;addr_len);</div><div class='del'>-		ss.ss_family = slave_dev-&gt;type;</div><div class='del'>-		res = dev_set_mac_address(slave_dev, (struct sockaddr *)&amp;ss,</div><div class='del'>-					  extack);</div><div class='del'>-		if (res) {</div><div class='del'>-			netdev_dbg(bond_dev, "Error %d calling set_mac_address\n", res);</div><div class='del'>-			goto err_restore_mtu;</div><div class='del'>-		}</div><div class='add'>+	} else if (bond-&gt;params.fail_over_mac == BOND_FOM_FOLLOW &amp;&amp;</div><div class='add'>+		   BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP &amp;&amp;</div><div class='add'>+		   bond_has_slaves(bond) &amp;&amp;</div><div class='add'>+		   memcmp(slave_dev-&gt;dev_addr, bond_dev-&gt;dev_addr, bond_dev-&gt;addr_len) == 0) {</div><div class='add'>+		/* Set slave to random address to avoid duplicate mac</div><div class='add'>+		 * address in later fail over.</div><div class='add'>+		 */</div><div class='add'>+		eth_random_addr(ss.__data);</div><div class='add'>+	} else {</div><div class='add'>+		goto skip_mac_set;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* set slave flag before open to prevent IPv6 addrconf */</div><div class='del'>-	slave_dev-&gt;flags |= IFF_SLAVE;</div><div class='add'>+	ss.ss_family = slave_dev-&gt;type;</div><div class='add'>+	res = dev_set_mac_address(slave_dev, &amp;ss, extack);</div><div class='add'>+	if (res) {</div><div class='add'>+		slave_err(bond_dev, slave_dev, "Error %d calling set_mac_address\n", res);</div><div class='add'>+		goto err_restore_mtu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_mac_set:</div><div class='add'>+</div><div class='add'>+	/* set no_addrconf flag before open to prevent IPv6 addrconf */</div><div class='add'>+	slave_dev-&gt;priv_flags |= IFF_NO_ADDRCONF;</div><div class='ctx'> </div><div class='ctx'> 	/* open the slave since the application closed it */</div><div class='ctx'> 	res = dev_open(slave_dev, extack);</div><div class='ctx'> 	if (res) {</div><div class='del'>-		netdev_dbg(bond_dev, "Opening slave %s failed\n", slave_dev-&gt;name);</div><div class='add'>+		slave_err(bond_dev, slave_dev, "Opening slave failed\n");</div><div class='ctx'> 		goto err_restore_mac;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1566,8 +2006,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> </div><div class='ctx'> 	res = vlan_vids_add_by_dev(slave_dev, bond_dev);</div><div class='ctx'> 	if (res) {</div><div class='del'>-		netdev_err(bond_dev, "Couldn't add bond vlan ids to %s\n",</div><div class='del'>-			   slave_dev-&gt;name);</div><div class='add'>+		slave_err(bond_dev, slave_dev, "Couldn't add bond vlan ids\n");</div><div class='ctx'> 		goto err_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1585,31 +2024,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 	for (i = 0; i &lt; BOND_MAX_ARP_TARGETS; i++)</div><div class='ctx'> 		new_slave-&gt;target_last_arp_rx[i] = new_slave-&gt;last_rx;</div><div class='ctx'> </div><div class='del'>-	if (bond-&gt;params.miimon &amp;&amp; !bond-&gt;params.use_carrier) {</div><div class='del'>-		link_reporting = bond_check_dev_link(bond, slave_dev, 1);</div><div class='del'>-</div><div class='del'>-		if ((link_reporting == -1) &amp;&amp; !bond-&gt;params.arp_interval) {</div><div class='del'>-			/* miimon is set but a bonded network driver</div><div class='del'>-			 * does not support ETHTOOL/MII and</div><div class='del'>-			 * arp_interval is not set.  Note: if</div><div class='del'>-			 * use_carrier is enabled, we will never go</div><div class='del'>-			 * here (because netif_carrier is always</div><div class='del'>-			 * supported); thus, we don't need to change</div><div class='del'>-			 * the messages for netif_carrier.</div><div class='del'>-			 */</div><div class='del'>-			netdev_warn(bond_dev, "MII and ETHTOOL support not available for interface %s, and arp_interval/arp_ip_target module parameters not specified, thus bonding will not detect link failures! see bonding.txt for details\n",</div><div class='del'>-				    slave_dev-&gt;name);</div><div class='del'>-		} else if (link_reporting == -1) {</div><div class='del'>-			/* unable get link status using mii/ethtool */</div><div class='del'>-			netdev_warn(bond_dev, "can't get link status from interface %s; the network driver associated with this interface does not support MII or ETHTOOL link status reporting, thus miimon has no effect on this interface\n",</div><div class='del'>-				    slave_dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	new_slave-&gt;last_tx = new_slave-&gt;last_rx;</div><div class='ctx'> </div><div class='ctx'> 	/* check for initial state */</div><div class='ctx'> 	new_slave-&gt;link = BOND_LINK_NOCHANGE;</div><div class='ctx'> 	if (bond-&gt;params.miimon) {</div><div class='del'>-		if (bond_check_dev_link(bond, slave_dev, 0) == BMSR_LSTATUS) {</div><div class='add'>+		if (netif_running(slave_dev) &amp;&amp; netif_carrier_ok(slave_dev)) {</div><div class='ctx'> 			if (bond-&gt;params.updelay) {</div><div class='ctx'> 				bond_set_slave_link_state(new_slave,</div><div class='ctx'> 							  BOND_LINK_BACK,</div><div class='hunk'>@@ -1636,9 +2056,9 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> </div><div class='ctx'> 	if (new_slave-&gt;link != BOND_LINK_DOWN)</div><div class='ctx'> 		new_slave-&gt;last_link_up = jiffies;</div><div class='del'>-	netdev_dbg(bond_dev, "Initial state of slave_dev is BOND_LINK_%s\n",</div><div class='del'>-		   new_slave-&gt;link == BOND_LINK_DOWN ? "DOWN" :</div><div class='del'>-		   (new_slave-&gt;link == BOND_LINK_UP ? "UP" : "BACK"));</div><div class='add'>+	slave_dbg(bond_dev, slave_dev, "Initial state of slave is BOND_LINK_%s\n",</div><div class='add'>+		  new_slave-&gt;link == BOND_LINK_DOWN ? "DOWN" :</div><div class='add'>+		  (new_slave-&gt;link == BOND_LINK_UP ? "UP" : "BACK"));</div><div class='ctx'> </div><div class='ctx'> 	if (bond_uses_primary(bond) &amp;&amp; bond-&gt;params.primary[0]) {</div><div class='ctx'> 		/* if there is a primary slave, remember it */</div><div class='hunk'>@@ -1665,7 +2085,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 			/* Initialize AD with the number of times that the AD timer is called in 1 second</div><div class='ctx'> 			 * can be called only after the mac address of the bond is set</div><div class='ctx'> 			 */</div><div class='del'>-			bond_3ad_initialize(bond, 1000/AD_TIMER_INTERVAL);</div><div class='add'>+			bond_3ad_initialize(bond);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			SLAVE_AD_INFO(new_slave)-&gt;id =</div><div class='ctx'> 				SLAVE_AD_INFO(prev_slave)-&gt;id + 1;</div><div class='hunk'>@@ -1679,7 +2099,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 		bond_set_slave_inactive_flags(new_slave, BOND_SLAVE_NOTIFY_NOW);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		netdev_dbg(bond_dev, "This slave is always active in trunk mode\n");</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "This slave is always active in trunk mode\n");</div><div class='ctx'> </div><div class='ctx'> 		/* always active in trunk mode */</div><div class='ctx'> 		bond_set_active_slave(new_slave);</div><div class='hunk'>@@ -1698,7 +2118,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	if (bond-&gt;dev-&gt;npinfo) {</div><div class='ctx'> 		if (slave_enable_netpoll(new_slave)) {</div><div class='del'>-			netdev_info(bond_dev, "master_dev is using netpoll, but new slave device does not support netpoll\n");</div><div class='add'>+			slave_info(bond_dev, slave_dev, "master_dev is using netpoll, but new slave device does not support netpoll\n");</div><div class='ctx'> 			res = -EBUSY;</div><div class='ctx'> 			goto err_detach;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1711,24 +2131,24 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 	res = netdev_rx_handler_register(slave_dev, bond_handle_frame,</div><div class='ctx'> 					 new_slave);</div><div class='ctx'> 	if (res) {</div><div class='del'>-		netdev_dbg(bond_dev, "Error %d calling netdev_rx_handler_register\n", res);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "Error %d calling netdev_rx_handler_register\n", res);</div><div class='ctx'> 		goto err_detach;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	res = bond_master_upper_dev_link(bond, new_slave, extack);</div><div class='ctx'> 	if (res) {</div><div class='del'>-		netdev_dbg(bond_dev, "Error %d calling bond_master_upper_dev_link\n", res);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "Error %d calling bond_master_upper_dev_link\n", res);</div><div class='ctx'> 		goto err_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bond_lower_state_changed(new_slave);</div><div class='add'>+</div><div class='ctx'> 	res = bond_sysfs_slave_add(new_slave);</div><div class='ctx'> 	if (res) {</div><div class='del'>-		netdev_dbg(bond_dev, "Error %d calling bond_sysfs_slave_add\n", res);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "Error %d calling bond_sysfs_slave_add\n", res);</div><div class='ctx'> 		goto err_upper_unlink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bond-&gt;nest_level = dev_get_nest_level(bond_dev) + 1;</div><div class='del'>-</div><div class='ctx'> 	/* If the mode uses primary, then the following is handled by</div><div class='ctx'> 	 * bond_change_active_slave().</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1750,37 +2170,75 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		netif_addr_lock_bh(bond_dev);</div><div class='del'>-		dev_mc_sync_multiple(slave_dev, bond_dev);</div><div class='del'>-		dev_uc_sync_multiple(slave_dev, bond_dev);</div><div class='del'>-		netif_addr_unlock_bh(bond_dev);</div><div class='del'>-</div><div class='del'>-		if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='del'>-			/* add lacpdu mc addr to mc list */</div><div class='del'>-			u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;</div><div class='add'>+		if (bond_dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+			netif_addr_lock_bh(bond_dev);</div><div class='add'>+			dev_mc_sync_multiple(slave_dev, bond_dev);</div><div class='add'>+			dev_uc_sync_multiple(slave_dev, bond_dev);</div><div class='add'>+			netif_addr_unlock_bh(bond_dev);</div><div class='ctx'> </div><div class='del'>-			dev_mc_add(slave_dev, lacpdu_multicast);</div><div class='add'>+			if (BOND_MODE(bond) == BOND_MODE_8023AD)</div><div class='add'>+				dev_mc_add(slave_dev, lacpdu_mcast_addr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bond-&gt;slave_cnt++;</div><div class='del'>-	bond_compute_features(bond);</div><div class='add'>+	netdev_compute_master_upper_features(bond-&gt;dev, true);</div><div class='ctx'> 	bond_set_carrier(bond);</div><div class='ctx'> </div><div class='add'>+	/* Needs to be called before bond_select_active_slave(), which will</div><div class='add'>+	 * remove the maddrs if the slave is selected as active slave.</div><div class='add'>+	 */</div><div class='add'>+	bond_slave_ns_maddrs_add(bond, new_slave);</div><div class='add'>+</div><div class='ctx'> 	if (bond_uses_primary(bond)) {</div><div class='ctx'> 		block_netpoll_tx();</div><div class='ctx'> 		bond_select_active_slave(bond);</div><div class='ctx'> 		unblock_netpoll_tx();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bond_mode_can_use_xmit_hash(bond))</div><div class='add'>+	/* broadcast mode uses the all_slaves to loop through slaves. */</div><div class='add'>+	if (bond_mode_can_use_xmit_hash(bond) ||</div><div class='add'>+	    BOND_MODE(bond) == BOND_MODE_BROADCAST)</div><div class='ctx'> 		bond_update_slave_arr(bond, NULL);</div><div class='ctx'> </div><div class='add'>+	if (!slave_dev-&gt;netdev_ops-&gt;ndo_bpf ||</div><div class='add'>+	    !slave_dev-&gt;netdev_ops-&gt;ndo_xdp_xmit) {</div><div class='add'>+		if (bond-&gt;xdp_prog) {</div><div class='add'>+			SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+				     "Slave does not support XDP");</div><div class='add'>+			res = -EOPNOTSUPP;</div><div class='add'>+			goto err_sysfs_del;</div><div class='add'>+		}</div><div class='add'>+	} else if (bond-&gt;xdp_prog) {</div><div class='add'>+		struct netdev_bpf xdp = {</div><div class='add'>+			.command = XDP_SETUP_PROG,</div><div class='add'>+			.flags   = 0,</div><div class='add'>+			.prog    = bond-&gt;xdp_prog,</div><div class='add'>+			.extack  = extack,</div><div class='add'>+		};</div><div class='add'>+</div><div class='add'>+		if (dev_xdp_prog_count(slave_dev) &gt; 0) {</div><div class='add'>+			SLAVE_NL_ERR(bond_dev, slave_dev, extack,</div><div class='add'>+				     "Slave has XDP program loaded, please unload before enslaving");</div><div class='add'>+			res = -EOPNOTSUPP;</div><div class='add'>+			goto err_sysfs_del;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		res = dev_xdp_propagate(slave_dev, &amp;xdp);</div><div class='add'>+		if (res &lt; 0) {</div><div class='add'>+			/* ndo_bpf() sets extack error message */</div><div class='add'>+			slave_dbg(bond_dev, slave_dev, "Error %d calling ndo_bpf\n", res);</div><div class='add'>+			goto err_sysfs_del;</div><div class='add'>+		}</div><div class='add'>+		if (bond-&gt;xdp_prog)</div><div class='add'>+			bpf_prog_inc(bond-&gt;xdp_prog);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	netdev_info(bond_dev, "Enslaving %s as %s interface with %s link\n",</div><div class='del'>-		    slave_dev-&gt;name,</div><div class='del'>-		    bond_is_active_slave(new_slave) ? "an active" : "a backup",</div><div class='del'>-		    new_slave-&gt;link != BOND_LINK_DOWN ? "an up" : "a down");</div><div class='add'>+	bond_xdp_set_features(bond_dev);</div><div class='add'>+</div><div class='add'>+	slave_info(bond_dev, slave_dev, "Enslaving as %s interface with %s link\n",</div><div class='add'>+		   bond_is_active_slave(new_slave) ? "an active" : "a backup",</div><div class='add'>+		   new_slave-&gt;link != BOND_LINK_DOWN ? "an up" : "a down");</div><div class='ctx'> </div><div class='ctx'> 	/* enslave is successful */</div><div class='ctx'> 	bond_queue_slave_event(new_slave);</div><div class='hunk'>@@ -1811,11 +2269,12 @@ err_detach:</div><div class='ctx'> 	slave_disable_netpoll(new_slave);</div><div class='ctx'> </div><div class='ctx'> err_close:</div><div class='del'>-	slave_dev-&gt;priv_flags &amp;= ~IFF_BONDING;</div><div class='add'>+	if (!netif_is_bond_master(slave_dev))</div><div class='add'>+		slave_dev-&gt;priv_flags &amp;= ~IFF_BONDING;</div><div class='ctx'> 	dev_close(slave_dev);</div><div class='ctx'> </div><div class='ctx'> err_restore_mac:</div><div class='del'>-	slave_dev-&gt;flags &amp;= ~IFF_SLAVE;</div><div class='add'>+	slave_dev-&gt;priv_flags &amp;= ~IFF_NO_ADDRCONF;</div><div class='ctx'> 	if (!bond-&gt;params.fail_over_mac ||</div><div class='ctx'> 	    BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) {</div><div class='ctx'> 		/* XXX TODO - fom follow mode needs to change master's</div><div class='hunk'>@@ -1825,14 +2284,14 @@ err_restore_mac:</div><div class='ctx'> 		bond_hw_addr_copy(ss.__data, new_slave-&gt;perm_hwaddr,</div><div class='ctx'> 				  new_slave-&gt;dev-&gt;addr_len);</div><div class='ctx'> 		ss.ss_family = slave_dev-&gt;type;</div><div class='del'>-		dev_set_mac_address(slave_dev, (struct sockaddr *)&amp;ss, NULL);</div><div class='add'>+		dev_set_mac_address(slave_dev, &amp;ss, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_restore_mtu:</div><div class='ctx'> 	dev_set_mtu(slave_dev, new_slave-&gt;original_mtu);</div><div class='ctx'> </div><div class='ctx'> err_free:</div><div class='del'>-	bond_free_slave(new_slave);</div><div class='add'>+	kobject_put(&amp;new_slave-&gt;kobj);</div><div class='ctx'> </div><div class='ctx'> err_undo_flags:</div><div class='ctx'> 	/* Enslave of first slave has failed and we need to fix master's mac */</div><div class='hunk'>@@ -1842,9 +2301,7 @@ err_undo_flags:</div><div class='ctx'> 			eth_hw_addr_random(bond_dev);</div><div class='ctx'> 		if (bond_dev-&gt;type != ARPHRD_ETHER) {</div><div class='ctx'> 			dev_close(bond_dev);</div><div class='del'>-			ether_setup(bond_dev);</div><div class='del'>-			bond_dev-&gt;flags |= IFF_MASTER;</div><div class='del'>-			bond_dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='add'>+			bond_ether_setup(bond_dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1875,8 +2332,7 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 	/* slave is not a slave or master is not master of this slave */</div><div class='ctx'> 	if (!(slave_dev-&gt;flags &amp; IFF_SLAVE) ||</div><div class='ctx'> 	    !netdev_has_upper_dev(slave_dev, bond_dev)) {</div><div class='del'>-		netdev_dbg(bond_dev, "cannot release %s\n",</div><div class='del'>-			   slave_dev-&gt;name);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "cannot release slave\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1885,8 +2341,7 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 	slave = bond_get_slave_by_dev(bond, slave_dev);</div><div class='ctx'> 	if (!slave) {</div><div class='ctx'> 		/* not a slave of this bond */</div><div class='del'>-		netdev_info(bond_dev, "%s not enslaved\n",</div><div class='del'>-			    slave_dev-&gt;name);</div><div class='add'>+		slave_info(bond_dev, slave_dev, "interface not enslaved\n");</div><div class='ctx'> 		unblock_netpoll_tx();</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1898,7 +2353,17 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 	/* recompute stats just before removing the slave */</div><div class='ctx'> 	bond_get_stats(bond-&gt;dev, &amp;bond-&gt;bond_stats);</div><div class='ctx'> </div><div class='del'>-	bond_upper_dev_unlink(bond, slave);</div><div class='add'>+	if (bond-&gt;xdp_prog) {</div><div class='add'>+		struct netdev_bpf xdp = {</div><div class='add'>+			.command = XDP_SETUP_PROG,</div><div class='add'>+			.flags   = 0,</div><div class='add'>+			.prog	 = NULL,</div><div class='add'>+			.extack  = NULL,</div><div class='add'>+		};</div><div class='add'>+		if (dev_xdp_propagate(slave_dev, &amp;xdp))</div><div class='add'>+			slave_warn(bond_dev, slave_dev, "failed to unload XDP program\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* unregister rx_handler early so bond_handle_frame wouldn't be called</div><div class='ctx'> 	 * for this slave anymore.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1907,24 +2372,25 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD)</div><div class='ctx'> 		bond_3ad_unbind_slave(slave);</div><div class='ctx'> </div><div class='del'>-	if (bond_mode_can_use_xmit_hash(bond))</div><div class='add'>+	bond_upper_dev_unlink(bond, slave);</div><div class='add'>+</div><div class='add'>+	if (bond_mode_can_use_xmit_hash(bond) ||</div><div class='add'>+	    BOND_MODE(bond) == BOND_MODE_BROADCAST)</div><div class='ctx'> 		bond_update_slave_arr(bond, slave);</div><div class='ctx'> </div><div class='del'>-	netdev_info(bond_dev, "Releasing %s interface %s\n",</div><div class='del'>-		    bond_is_active_slave(slave) ? "active" : "backup",</div><div class='del'>-		    slave_dev-&gt;name);</div><div class='add'>+	slave_info(bond_dev, slave_dev, "Releasing %s interface\n",</div><div class='add'>+		    bond_is_active_slave(slave) ? "active" : "backup");</div><div class='ctx'> </div><div class='ctx'> 	oldcurrent = rcu_access_pointer(bond-&gt;curr_active_slave);</div><div class='ctx'> </div><div class='ctx'> 	RCU_INIT_POINTER(bond-&gt;current_arp_slave, NULL);</div><div class='ctx'> </div><div class='del'>-	if (!all &amp;&amp; (!bond-&gt;params.fail_over_mac ||</div><div class='add'>+	if (!all &amp;&amp; (bond-&gt;params.fail_over_mac != BOND_FOM_ACTIVE ||</div><div class='ctx'> 		     BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP)) {</div><div class='ctx'> 		if (ether_addr_equal_64bits(bond_dev-&gt;dev_addr, slave-&gt;perm_hwaddr) &amp;&amp;</div><div class='ctx'> 		    bond_has_slaves(bond))</div><div class='del'>-			netdev_warn(bond_dev, "the permanent HWaddr of %s - %pM - is still in use by %s - set the HWaddr of %s to a different address to avoid conflicts\n",</div><div class='del'>-				    slave_dev-&gt;name, slave-&gt;perm_hwaddr,</div><div class='del'>-				    bond_dev-&gt;name, slave_dev-&gt;name);</div><div class='add'>+			slave_warn(bond_dev, slave_dev, "the permanent HWaddr of slave - %pM - is still in use by bond - set the HWaddr of slave to a different address to avoid conflicts\n",</div><div class='add'>+				   slave-&gt;perm_hwaddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (rtnl_dereference(bond-&gt;primary_slave) == slave)</div><div class='hunk'>@@ -1933,6 +2399,12 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 	if (oldcurrent == slave)</div><div class='ctx'> 		bond_change_active_slave(bond, NULL);</div><div class='ctx'> </div><div class='add'>+	/* Must be called after bond_change_active_slave () as the slave</div><div class='add'>+	 * might change from an active slave to a backup slave. Then it is</div><div class='add'>+	 * necessary to clear the maddrs on the backup slave.</div><div class='add'>+	 */</div><div class='add'>+	bond_slave_ns_maddrs_del(bond, slave);</div><div class='add'>+</div><div class='ctx'> 	if (bond_is_lb(bond)) {</div><div class='ctx'> 		/* Must be called only after the slave has been</div><div class='ctx'> 		 * detached from the list and the curr_active_slave</div><div class='hunk'>@@ -1952,13 +2424,9 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 		bond_select_active_slave(bond);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!bond_has_slaves(bond)) {</div><div class='del'>-		bond_set_carrier(bond);</div><div class='add'>+	bond_set_carrier(bond);</div><div class='add'>+	if (!bond_has_slaves(bond))</div><div class='ctx'> 		eth_hw_addr_random(bond_dev);</div><div class='del'>-		bond-&gt;nest_level = SINGLE_DEPTH_NESTING;</div><div class='del'>-	} else {</div><div class='del'>-		bond-&gt;nest_level = dev_get_nest_level(bond_dev) + 1;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	unblock_netpoll_tx();</div><div class='ctx'> 	synchronize_rcu();</div><div class='hunk'>@@ -1969,11 +2437,10 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_RELEASE, bond-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bond_compute_features(bond);</div><div class='add'>+	netdev_compute_master_upper_features(bond-&gt;dev, true);</div><div class='ctx'> 	if (!(bond_dev-&gt;features &amp; NETIF_F_VLAN_CHALLENGED) &amp;&amp;</div><div class='ctx'> 	    (old_features &amp; NETIF_F_VLAN_CHALLENGED))</div><div class='del'>-		netdev_info(bond_dev, "last VLAN challenged slave %s left bond %s - VLAN blocking is removed\n",</div><div class='del'>-			    slave_dev-&gt;name, bond_dev-&gt;name);</div><div class='add'>+		slave_info(bond_dev, slave_dev, "last VLAN challenged slave left bond - VLAN blocking is removed\n");</div><div class='ctx'> </div><div class='ctx'> 	vlan_vids_del_by_dev(slave_dev, bond_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1995,7 +2462,8 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 		if (old_flags &amp; IFF_ALLMULTI)</div><div class='ctx'> 			dev_set_allmulti(slave_dev, -1);</div><div class='ctx'> </div><div class='del'>-		bond_hw_addr_flush(bond_dev, slave_dev);</div><div class='add'>+		if (old_flags &amp; IFF_UP)</div><div class='add'>+			bond_hw_addr_flush(bond_dev, slave_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	slave_disable_netpoll(slave);</div><div class='hunk'>@@ -2003,23 +2471,30 @@ static int __bond_release_one(struct net_device *bond_dev,</div><div class='ctx'> 	/* close slave before restoring its mac address */</div><div class='ctx'> 	dev_close(slave_dev);</div><div class='ctx'> </div><div class='add'>+	slave_dev-&gt;priv_flags &amp;= ~IFF_NO_ADDRCONF;</div><div class='add'>+</div><div class='ctx'> 	if (bond-&gt;params.fail_over_mac != BOND_FOM_ACTIVE ||</div><div class='ctx'> 	    BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) {</div><div class='ctx'> 		/* restore original ("permanent") mac address */</div><div class='ctx'> 		bond_hw_addr_copy(ss.__data, slave-&gt;perm_hwaddr,</div><div class='ctx'> 				  slave-&gt;dev-&gt;addr_len);</div><div class='ctx'> 		ss.ss_family = slave_dev-&gt;type;</div><div class='del'>-		dev_set_mac_address(slave_dev, (struct sockaddr *)&amp;ss, NULL);</div><div class='add'>+		dev_set_mac_address(slave_dev, &amp;ss, NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unregister)</div><div class='del'>-		__dev_set_mtu(slave_dev, slave-&gt;original_mtu);</div><div class='del'>-	else</div><div class='add'>+	if (unregister) {</div><div class='add'>+		netdev_lock_ops(slave_dev);</div><div class='add'>+		__netif_set_mtu(slave_dev, slave-&gt;original_mtu);</div><div class='add'>+		netdev_unlock_ops(slave_dev);</div><div class='add'>+	} else {</div><div class='ctx'> 		dev_set_mtu(slave_dev, slave-&gt;original_mtu);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	slave_dev-&gt;priv_flags &amp;= ~IFF_BONDING;</div><div class='add'>+	if (!netif_is_bond_master(slave_dev))</div><div class='add'>+		slave_dev-&gt;priv_flags &amp;= ~IFF_BONDING;</div><div class='ctx'> </div><div class='del'>-	bond_free_slave(slave);</div><div class='add'>+	bond_xdp_set_features(bond_dev);</div><div class='add'>+	kobject_put(&amp;slave-&gt;kobj);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2033,17 +2508,17 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)</div><div class='ctx'> /* First release a slave and then destroy the bond if no more slaves are left.</div><div class='ctx'>  * Must be under rtnl_lock when this function is called.</div><div class='ctx'>  */</div><div class='del'>-static int  bond_release_and_destroy(struct net_device *bond_dev,</div><div class='del'>-				     struct net_device *slave_dev)</div><div class='add'>+static int bond_release_and_destroy(struct net_device *bond_dev,</div><div class='add'>+				    struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = __bond_release_one(bond_dev, slave_dev, false, true);</div><div class='del'>-	if (ret == 0 &amp;&amp; !bond_has_slaves(bond)) {</div><div class='add'>+	if (ret == 0 &amp;&amp; !bond_has_slaves(bond) &amp;&amp;</div><div class='add'>+	    bond_dev-&gt;reg_state != NETREG_UNREGISTERING) {</div><div class='ctx'> 		bond_dev-&gt;priv_flags |= IFF_DISABLE_NETPOLL;</div><div class='del'>-		netdev_info(bond_dev, "Destroying bond %s\n",</div><div class='del'>-			    bond_dev-&gt;name);</div><div class='add'>+		netdev_info(bond_dev, "Destroying bond\n");</div><div class='ctx'> 		bond_remove_proc_entry(bond);</div><div class='ctx'> 		unregister_netdevice(bond_dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2053,6 +2528,7 @@ static int  bond_release_and_destroy(struct net_device *bond_dev,</div><div class='ctx'> static void bond_info_query(struct net_device *bond_dev, struct ifbond *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+</div><div class='ctx'> 	bond_fill_ifbond(bond, info);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2079,18 +2555,27 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in</div><div class='ctx'> /* called with rcu_read_lock() */</div><div class='ctx'> static int bond_miimon_inspect(struct bonding *bond)</div><div class='ctx'> {</div><div class='add'>+	bool ignore_updelay = false;</div><div class='ctx'> 	int link_state, commit = 0;</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='del'>-	bool ignore_updelay;</div><div class='ctx'> </div><div class='del'>-	ignore_updelay = !rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP) {</div><div class='add'>+		ignore_updelay = !rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	} else {</div><div class='add'>+		struct bond_up_slave *usable_slaves;</div><div class='add'>+</div><div class='add'>+		usable_slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='add'>+</div><div class='add'>+		if (usable_slaves &amp;&amp; usable_slaves-&gt;count == 0)</div><div class='add'>+			ignore_updelay = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='del'>-		slave-&gt;new_link = BOND_LINK_NOCHANGE;</div><div class='del'>-		slave-&gt;link_new_state = slave-&gt;link;</div><div class='add'>+		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);</div><div class='ctx'> </div><div class='del'>-		link_state = bond_check_dev_link(bond, slave-&gt;dev, 0);</div><div class='add'>+		link_state = netif_running(slave-&gt;dev) &amp;&amp;</div><div class='add'>+			     netif_carrier_ok(slave-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 		switch (slave-&gt;link) {</div><div class='ctx'> 		case BOND_LINK_UP:</div><div class='hunk'>@@ -2100,31 +2585,30 @@ static int bond_miimon_inspect(struct bonding *bond)</div><div class='ctx'> 			bond_propose_link_state(slave, BOND_LINK_FAIL);</div><div class='ctx'> 			commit++;</div><div class='ctx'> 			slave-&gt;delay = bond-&gt;params.downdelay;</div><div class='del'>-			if (slave-&gt;delay) {</div><div class='del'>-				netdev_info(bond-&gt;dev, "link status down for %sinterface %s, disabling it in %d ms\n",</div><div class='del'>-					    (BOND_MODE(bond) ==</div><div class='del'>-					     BOND_MODE_ACTIVEBACKUP) ?</div><div class='del'>-					     (bond_is_active_slave(slave) ?</div><div class='del'>-					      "active " : "backup ") : "",</div><div class='del'>-					    slave-&gt;dev-&gt;name,</div><div class='del'>-					    bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='add'>+			if (slave-&gt;delay &amp;&amp; net_ratelimit()) {</div><div class='add'>+				slave_info(bond-&gt;dev, slave-&gt;dev, "link status down for %sinterface, disabling it in %d ms\n",</div><div class='add'>+					   (BOND_MODE(bond) ==</div><div class='add'>+					    BOND_MODE_ACTIVEBACKUP) ?</div><div class='add'>+					    (bond_is_active_slave(slave) ?</div><div class='add'>+					     "active " : "backup ") : "",</div><div class='add'>+					   bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='ctx'> 			}</div><div class='del'>-			/*FALLTHRU*/</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case BOND_LINK_FAIL:</div><div class='ctx'> 			if (link_state) {</div><div class='ctx'> 				/* recovered before downdelay expired */</div><div class='ctx'> 				bond_propose_link_state(slave, BOND_LINK_UP);</div><div class='ctx'> 				slave-&gt;last_link_up = jiffies;</div><div class='del'>-				netdev_info(bond-&gt;dev, "link status up again after %d ms for interface %s\n",</div><div class='del'>-					    (bond-&gt;params.downdelay - slave-&gt;delay) *</div><div class='del'>-					    bond-&gt;params.miimon,</div><div class='del'>-					    slave-&gt;dev-&gt;name);</div><div class='add'>+				if (net_ratelimit())</div><div class='add'>+					slave_info(bond-&gt;dev, slave-&gt;dev, "link status up again after %d ms\n",</div><div class='add'>+						   (bond-&gt;params.downdelay - slave-&gt;delay) *</div><div class='add'>+						   bond-&gt;params.miimon);</div><div class='ctx'> 				commit++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			if (slave-&gt;delay &lt;= 0) {</div><div class='del'>-				slave-&gt;new_link = BOND_LINK_DOWN;</div><div class='add'>+				bond_propose_link_state(slave, BOND_LINK_DOWN);</div><div class='ctx'> 				commit++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2140,21 +2624,20 @@ static int bond_miimon_inspect(struct bonding *bond)</div><div class='ctx'> 			commit++;</div><div class='ctx'> 			slave-&gt;delay = bond-&gt;params.updelay;</div><div class='ctx'> </div><div class='del'>-			if (slave-&gt;delay) {</div><div class='del'>-				netdev_info(bond-&gt;dev, "link status up for interface %s, enabling it in %d ms\n",</div><div class='del'>-					    slave-&gt;dev-&gt;name,</div><div class='del'>-					    ignore_updelay ? 0 :</div><div class='del'>-					    bond-&gt;params.updelay *</div><div class='del'>-					    bond-&gt;params.miimon);</div><div class='add'>+			if (slave-&gt;delay &amp;&amp; net_ratelimit()) {</div><div class='add'>+				slave_info(bond-&gt;dev, slave-&gt;dev, "link status up, enabling it in %d ms\n",</div><div class='add'>+					   ignore_updelay ? 0 :</div><div class='add'>+					   bond-&gt;params.updelay *</div><div class='add'>+					   bond-&gt;params.miimon);</div><div class='ctx'> 			}</div><div class='del'>-			/*FALLTHRU*/</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case BOND_LINK_BACK:</div><div class='ctx'> 			if (!link_state) {</div><div class='ctx'> 				bond_propose_link_state(slave, BOND_LINK_DOWN);</div><div class='del'>-				netdev_info(bond-&gt;dev, "link status down again after %d ms for interface %s\n",</div><div class='del'>-					    (bond-&gt;params.updelay - slave-&gt;delay) *</div><div class='del'>-					    bond-&gt;params.miimon,</div><div class='del'>-					    slave-&gt;dev-&gt;name);</div><div class='add'>+				if (net_ratelimit())</div><div class='add'>+					slave_info(bond-&gt;dev, slave-&gt;dev, "link status down again after %d ms\n",</div><div class='add'>+						   (bond-&gt;params.updelay - slave-&gt;delay) *</div><div class='add'>+						   bond-&gt;params.miimon);</div><div class='ctx'> 				commit++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2163,7 +2646,7 @@ static int bond_miimon_inspect(struct bonding *bond)</div><div class='ctx'> 				slave-&gt;delay = 0;</div><div class='ctx'> </div><div class='ctx'> 			if (slave-&gt;delay &lt;= 0) {</div><div class='del'>-				slave-&gt;new_link = BOND_LINK_UP;</div><div class='add'>+				bond_propose_link_state(slave, BOND_LINK_UP);</div><div class='ctx'> 				commit++;</div><div class='ctx'> 				ignore_updelay = false;</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -2197,12 +2680,24 @@ static void bond_miimon_link_change(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> static void bond_miimon_commit(struct bonding *bond)</div><div class='ctx'> {</div><div class='add'>+	struct slave *slave, *primary, *active;</div><div class='add'>+	bool do_failover = false;</div><div class='ctx'> 	struct list_head *iter;</div><div class='del'>-	struct slave *slave, *primary;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-		switch (slave-&gt;new_link) {</div><div class='add'>+		switch (slave-&gt;link_new_state) {</div><div class='ctx'> 		case BOND_LINK_NOCHANGE:</div><div class='add'>+			/* For 802.3ad mode, check current slave speed and</div><div class='add'>+			 * duplex again in case its port was disabled after</div><div class='add'>+			 * invalid speed/duplex reporting but recovered before</div><div class='add'>+			 * link monitoring could make a decision on the actual</div><div class='add'>+			 * link status</div><div class='add'>+			 */</div><div class='add'>+			if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp;</div><div class='add'>+			    slave-&gt;link == BOND_LINK_UP)</div><div class='add'>+				bond_3ad_adapter_speed_duplex_changed(slave);</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		case BOND_LINK_UP:</div><div class='hunk'>@@ -2210,9 +2705,8 @@ static void bond_miimon_commit(struct bonding *bond)</div><div class='ctx'> 			    bond_needs_speed_duplex(bond)) {</div><div class='ctx'> 				slave-&gt;link = BOND_LINK_DOWN;</div><div class='ctx'> 				if (net_ratelimit())</div><div class='del'>-					netdev_warn(bond-&gt;dev,</div><div class='del'>-						    "failed to get link speed/duplex for %s\n",</div><div class='del'>-						    slave-&gt;dev-&gt;name);</div><div class='add'>+					slave_warn(bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+						   "failed to get link speed/duplex\n");</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			bond_set_slave_link_state(slave, BOND_LINK_UP,</div><div class='hunk'>@@ -2226,20 +2720,17 @@ static void bond_miimon_commit(struct bonding *bond)</div><div class='ctx'> 			} else if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) {</div><div class='ctx'> 				/* make it immediately active */</div><div class='ctx'> 				bond_set_active_slave(slave);</div><div class='del'>-			} else if (slave != primary) {</div><div class='del'>-				/* prevent it from being the active one */</div><div class='del'>-				bond_set_backup_slave(slave);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			netdev_info(bond-&gt;dev, "link status definitely up for interface %s, %u Mbps %s duplex\n",</div><div class='del'>-				    slave-&gt;dev-&gt;name,</div><div class='del'>-				    slave-&gt;speed == SPEED_UNKNOWN ? 0 : slave-&gt;speed,</div><div class='del'>-				    slave-&gt;duplex ? "full" : "half");</div><div class='add'>+			slave_info(bond-&gt;dev, slave-&gt;dev, "link status definitely up, %u Mbps %s duplex\n",</div><div class='add'>+				   slave-&gt;speed == SPEED_UNKNOWN ? 0 : slave-&gt;speed,</div><div class='add'>+				   slave-&gt;duplex ? "full" : "half");</div><div class='ctx'> </div><div class='ctx'> 			bond_miimon_link_change(bond, slave, BOND_LINK_UP);</div><div class='ctx'> </div><div class='del'>-			if (!bond-&gt;curr_active_slave || slave == primary)</div><div class='del'>-				goto do_failover;</div><div class='add'>+			active = rtnl_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+			if (!active || slave == primary || slave-&gt;prio &gt; active-&gt;prio)</div><div class='add'>+				do_failover = true;</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2255,25 +2746,25 @@ static void bond_miimon_commit(struct bonding *bond)</div><div class='ctx'> 				bond_set_slave_inactive_flags(slave,</div><div class='ctx'> 							      BOND_SLAVE_NOTIFY_NOW);</div><div class='ctx'> </div><div class='del'>-			netdev_info(bond-&gt;dev, "link status definitely down for interface %s, disabling it\n",</div><div class='del'>-				    slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_info(bond-&gt;dev, slave-&gt;dev, "link status definitely down, disabling slave\n");</div><div class='ctx'> </div><div class='ctx'> 			bond_miimon_link_change(bond, slave, BOND_LINK_DOWN);</div><div class='ctx'> </div><div class='ctx'> 			if (slave == rcu_access_pointer(bond-&gt;curr_active_slave))</div><div class='del'>-				goto do_failover;</div><div class='add'>+				do_failover = true;</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(bond-&gt;dev, "invalid new link %d on slave %s\n",</div><div class='del'>-				   slave-&gt;new_link, slave-&gt;dev-&gt;name);</div><div class='del'>-			slave-&gt;new_link = BOND_LINK_NOCHANGE;</div><div class='add'>+			slave_err(bond-&gt;dev, slave-&gt;dev, "invalid new link %d on slave\n",</div><div class='add'>+				  slave-&gt;link_new_state);</div><div class='add'>+			bond_propose_link_state(slave, BOND_LINK_NOCHANGE);</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-do_failover:</div><div class='add'>+	if (do_failover) {</div><div class='ctx'> 		block_netpoll_tx();</div><div class='ctx'> 		bond_select_active_slave(bond);</div><div class='ctx'> 		unblock_netpoll_tx();</div><div class='hunk'>@@ -2293,7 +2784,8 @@ static void bond_mii_monitor(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = container_of(work, struct bonding,</div><div class='ctx'> 					    mii_work.work);</div><div class='del'>-	bool should_notify_peers = false;</div><div class='add'>+	bool should_notify_peers;</div><div class='add'>+	bool commit;</div><div class='ctx'> 	unsigned long delay;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	struct list_head *iter;</div><div class='hunk'>@@ -2306,115 +2798,137 @@ static void bond_mii_monitor(struct work_struct *work)</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> </div><div class='ctx'> 	should_notify_peers = bond_should_notify_peers(bond);</div><div class='add'>+	commit = !!bond_miimon_inspect(bond);</div><div class='ctx'> </div><div class='del'>-	if (bond_miimon_inspect(bond)) {</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='add'>+	if (commit || bond-&gt;send_peer_notif) {</div><div class='ctx'> 		/* Race avoidance with bond_close cancel of workqueue */</div><div class='ctx'> 		if (!rtnl_trylock()) {</div><div class='ctx'> 			delay = 1;</div><div class='del'>-			should_notify_peers = false;</div><div class='ctx'> 			goto re_arm;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-			bond_commit_link_state(slave, BOND_SLAVE_NOTIFY_LATER);</div><div class='add'>+		if (commit) {</div><div class='add'>+			bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+				bond_commit_link_state(slave,</div><div class='add'>+						       BOND_SLAVE_NOTIFY_LATER);</div><div class='add'>+			}</div><div class='add'>+			bond_miimon_commit(bond);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (bond-&gt;send_peer_notif) {</div><div class='add'>+			bond-&gt;send_peer_notif--;</div><div class='add'>+			if (should_notify_peers)</div><div class='add'>+				call_netdevice_notifiers(NETDEV_NOTIFY_PEERS,</div><div class='add'>+							 bond-&gt;dev);</div><div class='ctx'> 		}</div><div class='del'>-		bond_miimon_commit(bond);</div><div class='ctx'> </div><div class='ctx'> 		rtnl_unlock();	/* might sleep, hold no other locks */</div><div class='del'>-	} else</div><div class='del'>-		rcu_read_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> re_arm:</div><div class='ctx'> 	if (bond-&gt;params.miimon)</div><div class='ctx'> 		queue_delayed_work(bond-&gt;wq, &amp;bond-&gt;mii_work, delay);</div><div class='del'>-</div><div class='del'>-	if (should_notify_peers) {</div><div class='del'>-		if (!rtnl_trylock())</div><div class='del'>-			return;</div><div class='del'>-		call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond-&gt;dev);</div><div class='del'>-		rtnl_unlock();</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bond_upper_dev_walk(struct net_device *upper, void *data)</div><div class='add'>+static int bond_upper_dev_walk(struct net_device *upper,</div><div class='add'>+			       struct netdev_nested_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	__be32 ip = *((__be32 *)data);</div><div class='add'>+	__be32 ip = *(__be32 *)priv-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	return ip == bond_confirm_addr(upper, 0, ip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool bond_has_this_ip(struct bonding *bond, __be32 ip)</div><div class='ctx'> {</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = (void *)&amp;ip,</div><div class='add'>+	};</div><div class='ctx'> 	bool ret = false;</div><div class='ctx'> </div><div class='ctx'> 	if (ip == bond_confirm_addr(bond-&gt;dev, 0, ip))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	if (netdev_walk_all_upper_dev_rcu(bond-&gt;dev, bond_upper_dev_walk, &amp;ip))</div><div class='add'>+	if (netdev_walk_all_upper_dev_rcu(bond-&gt;dev, bond_upper_dev_walk, &amp;priv))</div><div class='ctx'> 		ret = true;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* We go to the (large) trouble of VLAN tagging ARP frames because</div><div class='del'>- * switches in VLAN mode (especially if ports are configured as</div><div class='del'>- * "native" to a VLAN) might not pass non-tagged frames.</div><div class='del'>- */</div><div class='del'>-static void bond_arp_send(struct net_device *slave_dev, int arp_op,</div><div class='del'>-			  __be32 dest_ip, __be32 src_ip,</div><div class='del'>-			  struct bond_vlan_tag *tags)</div><div class='add'>+#define BOND_VLAN_PROTO_NONE cpu_to_be16(0xffff)</div><div class='add'>+</div><div class='add'>+static bool bond_handle_vlan(struct slave *slave, struct bond_vlan_tag *tags,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct net_device *bond_dev = slave-&gt;bond-&gt;dev;</div><div class='add'>+	struct net_device *slave_dev = slave-&gt;dev;</div><div class='ctx'> 	struct bond_vlan_tag *outer_tag = tags;</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(slave_dev, "arp %d on slave %s: dst %pI4 src %pI4\n",</div><div class='del'>-		   arp_op, slave_dev-&gt;name, &amp;dest_ip, &amp;src_ip);</div><div class='del'>-</div><div class='del'>-	skb = arp_create(arp_op, ETH_P_ARP, dest_ip, slave_dev, src_ip,</div><div class='del'>-			 NULL, slave_dev-&gt;dev_addr, NULL);</div><div class='del'>-</div><div class='del'>-	if (!skb) {</div><div class='del'>-		net_err_ratelimited("ARP packet allocation failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!tags || tags-&gt;vlan_proto == VLAN_N_VID)</div><div class='del'>-		goto xmit;</div><div class='add'>+	if (!tags || tags-&gt;vlan_proto == BOND_VLAN_PROTO_NONE)</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	tags++;</div><div class='ctx'> </div><div class='ctx'> 	/* Go through all the tags backwards and add them to the packet */</div><div class='del'>-	while (tags-&gt;vlan_proto != VLAN_N_VID) {</div><div class='add'>+	while (tags-&gt;vlan_proto != BOND_VLAN_PROTO_NONE) {</div><div class='ctx'> 		if (!tags-&gt;vlan_id) {</div><div class='ctx'> 			tags++;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		netdev_dbg(slave_dev, "inner tag: proto %X vid %X\n",</div><div class='del'>-			   ntohs(outer_tag-&gt;vlan_proto), tags-&gt;vlan_id);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "inner tag: proto %X vid %X\n",</div><div class='add'>+			  ntohs(outer_tag-&gt;vlan_proto), tags-&gt;vlan_id);</div><div class='ctx'> 		skb = vlan_insert_tag_set_proto(skb, tags-&gt;vlan_proto,</div><div class='ctx'> 						tags-&gt;vlan_id);</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			net_err_ratelimited("failed to insert inner VLAN tag\n");</div><div class='del'>-			return;</div><div class='add'>+			return false;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tags++;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Set the outer tag */</div><div class='ctx'> 	if (outer_tag-&gt;vlan_id) {</div><div class='del'>-		netdev_dbg(slave_dev, "outer tag: proto %X vid %X\n",</div><div class='del'>-			   ntohs(outer_tag-&gt;vlan_proto), outer_tag-&gt;vlan_id);</div><div class='add'>+		slave_dbg(bond_dev, slave_dev, "outer tag: proto %X vid %X\n",</div><div class='add'>+			  ntohs(outer_tag-&gt;vlan_proto), outer_tag-&gt;vlan_id);</div><div class='ctx'> 		__vlan_hwaccel_put_tag(skb, outer_tag-&gt;vlan_proto,</div><div class='ctx'> 				       outer_tag-&gt;vlan_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-xmit:</div><div class='del'>-	arp_xmit(skb);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We go to the (large) trouble of VLAN tagging ARP frames because</div><div class='add'>+ * switches in VLAN mode (especially if ports are configured as</div><div class='add'>+ * "native" to a VLAN) might not pass non-tagged frames.</div><div class='add'>+ */</div><div class='add'>+static void bond_arp_send(struct slave *slave, int arp_op, __be32 dest_ip,</div><div class='add'>+			  __be32 src_ip, struct bond_vlan_tag *tags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bond_dev = slave-&gt;bond-&gt;dev;</div><div class='add'>+	struct net_device *slave_dev = slave-&gt;dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	slave_dbg(bond_dev, slave_dev, "arp %d on slave: dst %pI4 src %pI4\n",</div><div class='add'>+		  arp_op, &amp;dest_ip, &amp;src_ip);</div><div class='add'>+</div><div class='add'>+	skb = arp_create(arp_op, ETH_P_ARP, dest_ip, slave_dev, src_ip,</div><div class='add'>+			 NULL, slave_dev-&gt;dev_addr, NULL);</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		net_err_ratelimited("ARP packet allocation failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bond_handle_vlan(slave, tags, skb)) {</div><div class='add'>+		slave_update_last_tx(slave);</div><div class='add'>+		arp_xmit(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Validate the device path between the @start_dev and the @end_dev.</div><div class='hunk'>@@ -2435,7 +2949,7 @@ struct bond_vlan_tag *bond_verify_device_path(struct net_device *start_dev,</div><div class='ctx'> 		tags = kcalloc(level + 1, sizeof(*tags), GFP_ATOMIC);</div><div class='ctx'> 		if (!tags)</div><div class='ctx'> 			return ERR_PTR(-ENOMEM);</div><div class='del'>-		tags[level].vlan_proto = VLAN_N_VID;</div><div class='add'>+		tags[level].vlan_proto = BOND_VLAN_PROTO_NONE;</div><div class='ctx'> 		return tags;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2465,21 +2979,22 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BOND_MAX_ARP_TARGETS &amp;&amp; targets[i]; i++) {</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "basa: target %pI4\n", &amp;targets[i]);</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: target %pI4\n",</div><div class='add'>+			  __func__, &amp;targets[i]);</div><div class='ctx'> 		tags = NULL;</div><div class='ctx'> </div><div class='ctx'> 		/* Find out through which dev should the packet go */</div><div class='del'>-		rt = ip_route_output(dev_net(bond-&gt;dev), targets[i], 0,</div><div class='del'>-				     RTO_ONLINK, 0);</div><div class='add'>+		rt = ip_route_output(dev_net(bond-&gt;dev), targets[i], 0, 0, 0,</div><div class='add'>+				     RT_SCOPE_LINK);</div><div class='ctx'> 		if (IS_ERR(rt)) {</div><div class='ctx'> 			/* there's no route to target - try to send arp</div><div class='ctx'> 			 * probe to generate any traffic (arp_validate=0)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (bond-&gt;params.arp_validate)</div><div class='del'>-				net_warn_ratelimited("%s: no route to arp_ip_target %pI4 and arp_validate is set\n",</div><div class='del'>-						     bond-&gt;dev-&gt;name,</div><div class='del'>-						     &amp;targets[i]);</div><div class='del'>-			bond_arp_send(slave-&gt;dev, ARPOP_REQUEST, targets[i],</div><div class='add'>+				pr_warn_once("%s: no route to arp_ip_target %pI4 and arp_validate is set\n",</div><div class='add'>+					     bond-&gt;dev-&gt;name,</div><div class='add'>+					     &amp;targets[i]);</div><div class='add'>+			bond_arp_send(slave, ARPOP_REQUEST, targets[i],</div><div class='ctx'> 				      0, tags);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2496,7 +3011,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)</div><div class='ctx'> 			goto found;</div><div class='ctx'> </div><div class='ctx'> 		/* Not our device - skip */</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "no path to arp_ip_target %pI4 via rt.dev %s\n",</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "no path to arp_ip_target %pI4 via rt.dev %s\n",</div><div class='ctx'> 			   &amp;targets[i], rt-&gt;dst.dev ? rt-&gt;dst.dev-&gt;name : "NULL");</div><div class='ctx'> </div><div class='ctx'> 		ip_rt_put(rt);</div><div class='hunk'>@@ -2505,8 +3020,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)</div><div class='ctx'> found:</div><div class='ctx'> 		addr = bond_confirm_addr(rt-&gt;dst.dev, targets[i], 0);</div><div class='ctx'> 		ip_rt_put(rt);</div><div class='del'>-		bond_arp_send(slave-&gt;dev, ARPOP_REQUEST, targets[i],</div><div class='del'>-			      addr, tags);</div><div class='add'>+		bond_arp_send(slave, ARPOP_REQUEST, targets[i], addr, tags);</div><div class='ctx'> 		kfree(tags);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2516,45 +3030,32 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!sip || !bond_has_this_ip(bond, tip)) {</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "bva: sip %pI4 tip %pI4 not found\n",</div><div class='del'>-			   &amp;sip, &amp;tip);</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: sip %pI4 tip %pI4 not found\n",</div><div class='add'>+			   __func__, &amp;sip, &amp;tip);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	i = bond_get_targets_ip(bond-&gt;params.arp_targets, sip);</div><div class='ctx'> 	if (i == -1) {</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "bva: sip %pI4 not found in targets\n",</div><div class='del'>-			   &amp;sip);</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: sip %pI4 not found in targets\n",</div><div class='add'>+			   __func__, &amp;sip);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	slave-&gt;last_rx = jiffies;</div><div class='ctx'> 	slave-&gt;target_last_arp_rx[i] = jiffies;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,</div><div class='del'>-		 struct slave *slave)</div><div class='add'>+static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,</div><div class='add'>+			struct slave *slave)</div><div class='ctx'> {</div><div class='ctx'> 	struct arphdr *arp = (struct arphdr *)skb-&gt;data;</div><div class='ctx'> 	struct slave *curr_active_slave, *curr_arp_slave;</div><div class='ctx'> 	unsigned char *arp_ptr;</div><div class='ctx'> 	__be32 sip, tip;</div><div class='del'>-	int is_arp = skb-&gt;protocol == __cpu_to_be16(ETH_P_ARP);</div><div class='ctx'> 	unsigned int alen;</div><div class='ctx'> </div><div class='del'>-	if (!slave_do_arp_validate(bond, slave)) {</div><div class='del'>-		if ((slave_do_arp_validate_only(bond) &amp;&amp; is_arp) ||</div><div class='del'>-		    !slave_do_arp_validate_only(bond))</div><div class='del'>-			slave-&gt;last_rx = jiffies;</div><div class='del'>-		return RX_HANDLER_ANOTHER;</div><div class='del'>-	} else if (!is_arp) {</div><div class='del'>-		return RX_HANDLER_ANOTHER;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	alen = arp_hdr_len(bond-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond-&gt;dev, "bond_arp_rcv: skb-&gt;dev %s\n",</div><div class='del'>-		   skb-&gt;dev-&gt;name);</div><div class='del'>-</div><div class='ctx'> 	if (alen &gt; skb_headlen(skb)) {</div><div class='ctx'> 		arp = kmalloc(alen, GFP_ATOMIC);</div><div class='ctx'> 		if (!arp)</div><div class='hunk'>@@ -2577,10 +3078,10 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,</div><div class='ctx'> 	arp_ptr += 4 + bond-&gt;dev-&gt;addr_len;</div><div class='ctx'> 	memcpy(&amp;tip, arp_ptr, 4);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond-&gt;dev, "bond_arp_rcv: %s/%d av %d sv %d sip %pI4 tip %pI4\n",</div><div class='del'>-		   slave-&gt;dev-&gt;name, bond_slave_state(slave),</div><div class='del'>-		     bond-&gt;params.arp_validate, slave_do_arp_validate(bond, slave),</div><div class='del'>-		     &amp;sip, &amp;tip);</div><div class='add'>+	slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: %s/%d av %d sv %d sip %pI4 tip %pI4\n",</div><div class='add'>+		  __func__, slave-&gt;dev-&gt;name, bond_slave_state(slave),</div><div class='add'>+		  bond-&gt;params.arp_validate, slave_do_arp_validate(bond, slave),</div><div class='add'>+		  &amp;sip, &amp;tip);</div><div class='ctx'> </div><div class='ctx'> 	curr_active_slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='ctx'> 	curr_arp_slave = rcu_dereference(bond-&gt;current_arp_slave);</div><div class='hunk'>@@ -2615,8 +3116,7 @@ int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,</div><div class='ctx'> 			    curr_active_slave-&gt;last_link_up))</div><div class='ctx'> 		bond_validate_arp(bond, slave, tip, sip);</div><div class='ctx'> 	else if (curr_arp_slave &amp;&amp; (arp-&gt;ar_op == htons(ARPOP_REPLY)) &amp;&amp;</div><div class='del'>-		 bond_time_in_interval(bond,</div><div class='del'>-				       dev_trans_start(curr_arp_slave-&gt;dev), 1))</div><div class='add'>+		 bond_time_in_interval(bond, slave_last_tx(curr_arp_slave), 1))</div><div class='ctx'> 		bond_validate_arp(bond, slave, sip, tip);</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -2625,6 +3125,234 @@ out_unlock:</div><div class='ctx'> 	return RX_HANDLER_ANOTHER;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static void bond_ns_send(struct slave *slave, const struct in6_addr *daddr,</div><div class='add'>+			 const struct in6_addr *saddr, struct bond_vlan_tag *tags)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bond_dev = slave-&gt;bond-&gt;dev;</div><div class='add'>+	struct net_device *slave_dev = slave-&gt;dev;</div><div class='add'>+	struct in6_addr mcaddr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	slave_dbg(bond_dev, slave_dev, "NS on slave: dst %pI6c src %pI6c\n",</div><div class='add'>+		  daddr, saddr);</div><div class='add'>+</div><div class='add'>+	skb = ndisc_ns_create(slave_dev, daddr, saddr, 0);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		net_err_ratelimited("NS packet allocation failed\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addrconf_addr_solict_mult(daddr, &amp;mcaddr);</div><div class='add'>+	if (bond_handle_vlan(slave, tags, skb)) {</div><div class='add'>+		slave_update_last_tx(slave);</div><div class='add'>+		ndisc_send_skb(skb, &amp;mcaddr, saddr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_ns_send_all(struct bonding *bond, struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr *targets = bond-&gt;params.ns_targets;</div><div class='add'>+	struct bond_vlan_tag *tags;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	struct in6_addr saddr;</div><div class='add'>+	struct flowi6 fl6;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BOND_MAX_NS_TARGETS &amp;&amp; !ipv6_addr_any(&amp;targets[i]); i++) {</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: target %pI6c\n",</div><div class='add'>+			  __func__, &amp;targets[i]);</div><div class='add'>+		tags = NULL;</div><div class='add'>+</div><div class='add'>+		/* Find out through which dev should the packet go */</div><div class='add'>+		memset(&amp;fl6, 0, sizeof(struct flowi6));</div><div class='add'>+		fl6.daddr = targets[i];</div><div class='add'>+</div><div class='add'>+		dst = ip6_route_output(dev_net(bond-&gt;dev), NULL, &amp;fl6);</div><div class='add'>+		if (dst-&gt;error) {</div><div class='add'>+			dst_release(dst);</div><div class='add'>+			/* there's no route to target - try to send arp</div><div class='add'>+			 * probe to generate any traffic (arp_validate=0)</div><div class='add'>+			 */</div><div class='add'>+			if (bond-&gt;params.arp_validate)</div><div class='add'>+				pr_warn_once("%s: no route to ns_ip6_target %pI6c and arp_validate is set\n",</div><div class='add'>+					     bond-&gt;dev-&gt;name,</div><div class='add'>+					     &amp;targets[i]);</div><div class='add'>+			bond_ns_send(slave, &amp;targets[i], &amp;in6addr_any, tags);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* bond device itself */</div><div class='add'>+		if (dst-&gt;dev == bond-&gt;dev)</div><div class='add'>+			goto found;</div><div class='add'>+</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		tags = bond_verify_device_path(bond-&gt;dev, dst-&gt;dev, 0);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+		if (!IS_ERR_OR_NULL(tags))</div><div class='add'>+			goto found;</div><div class='add'>+</div><div class='add'>+		/* Not our device - skip */</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "no path to ns_ip6_target %pI6c via dst-&gt;dev %s\n",</div><div class='add'>+			  &amp;targets[i], dst-&gt;dev ? dst-&gt;dev-&gt;name : "NULL");</div><div class='add'>+</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+found:</div><div class='add'>+		if (!ipv6_dev_get_saddr(dev_net(dst-&gt;dev), dst-&gt;dev, &amp;targets[i], 0, &amp;saddr))</div><div class='add'>+			bond_ns_send(slave, &amp;targets[i], &amp;saddr, tags);</div><div class='add'>+		else</div><div class='add'>+			bond_ns_send(slave, &amp;targets[i], &amp;in6addr_any, tags);</div><div class='add'>+</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		kfree(tags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_confirm_addr6(struct net_device *dev,</div><div class='add'>+			      struct netdev_nested_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr *addr = (struct in6_addr *)priv-&gt;data;</div><div class='add'>+</div><div class='add'>+	return ipv6_chk_addr(dev_net(dev), addr, dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bond_has_this_ip6(struct bonding *bond, struct in6_addr *addr)</div><div class='add'>+{</div><div class='add'>+	struct netdev_nested_priv priv = {</div><div class='add'>+		.data = addr,</div><div class='add'>+	};</div><div class='add'>+	int ret = false;</div><div class='add'>+</div><div class='add'>+	if (bond_confirm_addr6(bond-&gt;dev, &amp;priv))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (netdev_walk_all_upper_dev_rcu(bond-&gt;dev, bond_confirm_addr6, &amp;priv))</div><div class='add'>+		ret = true;</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_validate_na(struct bonding *bond, struct slave *slave,</div><div class='add'>+			     struct in6_addr *saddr, struct in6_addr *daddr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Ignore NAs that:</div><div class='add'>+	 * 1. Source address is unspecified address.</div><div class='add'>+	 * 2. Dest address is neither all-nodes multicast address nor</div><div class='add'>+	 *    exist on bond interface.</div><div class='add'>+	 */</div><div class='add'>+	if (ipv6_addr_any(saddr) ||</div><div class='add'>+	    (!ipv6_addr_equal(daddr, &amp;in6addr_linklocal_allnodes) &amp;&amp;</div><div class='add'>+	     !bond_has_this_ip6(bond, daddr))) {</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: sip %pI6c tip %pI6c not found\n",</div><div class='add'>+			  __func__, saddr, daddr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = bond_get_targets_ip6(bond-&gt;params.ns_targets, saddr);</div><div class='add'>+	if (i == -1) {</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: sip %pI6c not found in targets\n",</div><div class='add'>+			  __func__, saddr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	slave-&gt;last_rx = jiffies;</div><div class='add'>+	slave-&gt;target_last_arp_rx[i] = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_na_rcv(const struct sk_buff *skb, struct bonding *bond,</div><div class='add'>+		       struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	struct slave *curr_active_slave, *curr_arp_slave;</div><div class='add'>+	struct in6_addr *saddr, *daddr;</div><div class='add'>+	struct {</div><div class='add'>+		struct ipv6hdr ip6;</div><div class='add'>+		struct icmp6hdr icmp6;</div><div class='add'>+	} *combined, _combined;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;pkt_type == PACKET_OTHERHOST ||</div><div class='add'>+	    skb-&gt;pkt_type == PACKET_LOOPBACK)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	combined = skb_header_pointer(skb, 0, sizeof(_combined), &amp;_combined);</div><div class='add'>+	if (!combined || combined-&gt;ip6.nexthdr != NEXTHDR_ICMP ||</div><div class='add'>+	    (combined-&gt;icmp6.icmp6_type != NDISC_NEIGHBOUR_SOLICITATION &amp;&amp;</div><div class='add'>+	     combined-&gt;icmp6.icmp6_type != NDISC_NEIGHBOUR_ADVERTISEMENT))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	saddr = &amp;combined-&gt;ip6.saddr;</div><div class='add'>+	daddr = &amp;combined-&gt;ip6.daddr;</div><div class='add'>+</div><div class='add'>+	slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: %s/%d av %d sv %d sip %pI6c tip %pI6c\n",</div><div class='add'>+		  __func__, slave-&gt;dev-&gt;name, bond_slave_state(slave),</div><div class='add'>+		  bond-&gt;params.arp_validate, slave_do_arp_validate(bond, slave),</div><div class='add'>+		  saddr, daddr);</div><div class='add'>+</div><div class='add'>+	curr_active_slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	curr_arp_slave = rcu_dereference(bond-&gt;current_arp_slave);</div><div class='add'>+</div><div class='add'>+	/* We 'trust' the received ARP enough to validate it if:</div><div class='add'>+	 * see bond_arp_rcv().</div><div class='add'>+	 */</div><div class='add'>+	if (bond_is_active_slave(slave))</div><div class='add'>+		bond_validate_na(bond, slave, saddr, daddr);</div><div class='add'>+	else if (curr_active_slave &amp;&amp;</div><div class='add'>+		 time_after(slave_last_rx(bond, curr_active_slave),</div><div class='add'>+			    curr_active_slave-&gt;last_link_up))</div><div class='add'>+		bond_validate_na(bond, slave, daddr, saddr);</div><div class='add'>+	else if (curr_arp_slave &amp;&amp;</div><div class='add'>+		 bond_time_in_interval(bond, slave_last_tx(curr_arp_slave), 1))</div><div class='add'>+		bond_validate_na(bond, slave, saddr, daddr);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return RX_HANDLER_ANOTHER;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+int bond_rcv_validate(const struct sk_buff *skb, struct bonding *bond,</div><div class='add'>+		      struct slave *slave)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	bool is_ipv6 = skb-&gt;protocol == __cpu_to_be16(ETH_P_IPV6);</div><div class='add'>+#endif</div><div class='add'>+	bool is_arp = skb-&gt;protocol == __cpu_to_be16(ETH_P_ARP);</div><div class='add'>+</div><div class='add'>+	slave_dbg(bond-&gt;dev, slave-&gt;dev, "%s: skb-&gt;dev %s\n",</div><div class='add'>+		  __func__, skb-&gt;dev-&gt;name);</div><div class='add'>+</div><div class='add'>+	/* Use arp validate logic for both ARP and NS */</div><div class='add'>+	if (!slave_do_arp_validate(bond, slave)) {</div><div class='add'>+		if ((slave_do_arp_validate_only(bond) &amp;&amp; is_arp) ||</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		    (slave_do_arp_validate_only(bond) &amp;&amp; is_ipv6) ||</div><div class='add'>+#endif</div><div class='add'>+		    !slave_do_arp_validate_only(bond))</div><div class='add'>+			slave-&gt;last_rx = jiffies;</div><div class='add'>+		return RX_HANDLER_ANOTHER;</div><div class='add'>+	} else if (is_arp) {</div><div class='add'>+		return bond_arp_rcv(skb, bond, slave);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else if (is_ipv6) {</div><div class='add'>+		return bond_na_rcv(skb, bond, slave);</div><div class='add'>+#endif</div><div class='add'>+	} else {</div><div class='add'>+		return RX_HANDLER_ANOTHER;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_send_validate(struct bonding *bond, struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	bond_arp_send_all(bond, slave);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	bond_ns_send_all(bond, slave);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* function to verify if we're in the arp_interval timeslice, returns true if</div><div class='ctx'>  * (last_act - arp_interval) &lt;= jiffies &lt;= (last_act + mod * arp_interval +</div><div class='ctx'>  * arp_interval/2) . the arp_interval/2 is needed for really fast networks.</div><div class='hunk'>@@ -2666,15 +3394,15 @@ static void bond_loadbalance_arp_mon(struct bonding *bond)</div><div class='ctx'> 	 *       so it can wait</div><div class='ctx'> 	 */</div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='del'>-		unsigned long trans_start = dev_trans_start(slave-&gt;dev);</div><div class='add'>+		unsigned long last_tx = slave_last_tx(slave);</div><div class='ctx'> </div><div class='del'>-		slave-&gt;new_link = BOND_LINK_NOCHANGE;</div><div class='add'>+		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);</div><div class='ctx'> </div><div class='ctx'> 		if (slave-&gt;link != BOND_LINK_UP) {</div><div class='del'>-			if (bond_time_in_interval(bond, trans_start, 1) &amp;&amp;</div><div class='add'>+			if (bond_time_in_interval(bond, last_tx, 1) &amp;&amp;</div><div class='ctx'> 			    bond_time_in_interval(bond, slave-&gt;last_rx, 1)) {</div><div class='ctx'> </div><div class='del'>-				slave-&gt;new_link = BOND_LINK_UP;</div><div class='add'>+				bond_propose_link_state(slave, BOND_LINK_UP);</div><div class='ctx'> 				slave_state_changed = 1;</div><div class='ctx'> </div><div class='ctx'> 				/* primary_slave has no meaning in round-robin</div><div class='hunk'>@@ -2683,12 +3411,10 @@ static void bond_loadbalance_arp_mon(struct bonding *bond)</div><div class='ctx'> 				 * is closed.</div><div class='ctx'> 				 */</div><div class='ctx'> 				if (!oldcurrent) {</div><div class='del'>-					netdev_info(bond-&gt;dev, "link status definitely up for interface %s\n",</div><div class='del'>-						    slave-&gt;dev-&gt;name);</div><div class='add'>+					slave_info(bond-&gt;dev, slave-&gt;dev, "link status definitely up\n");</div><div class='ctx'> 					do_failover = 1;</div><div class='ctx'> 				} else {</div><div class='del'>-					netdev_info(bond-&gt;dev, "interface %s is now up\n",</div><div class='del'>-						    slave-&gt;dev-&gt;name);</div><div class='add'>+					slave_info(bond-&gt;dev, slave-&gt;dev, "interface is now up\n");</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -2698,17 +3424,16 @@ static void bond_loadbalance_arp_mon(struct bonding *bond)</div><div class='ctx'> 			 * when the source ip is 0, so don't take the link down</div><div class='ctx'> 			 * if we don't know our ip yet</div><div class='ctx'> 			 */</div><div class='del'>-			if (!bond_time_in_interval(bond, trans_start, 2) ||</div><div class='del'>-			    !bond_time_in_interval(bond, slave-&gt;last_rx, 2)) {</div><div class='add'>+			if (!bond_time_in_interval(bond, last_tx, bond-&gt;params.missed_max) ||</div><div class='add'>+			    !bond_time_in_interval(bond, slave-&gt;last_rx, bond-&gt;params.missed_max)) {</div><div class='ctx'> </div><div class='del'>-				slave-&gt;new_link = BOND_LINK_DOWN;</div><div class='add'>+				bond_propose_link_state(slave, BOND_LINK_DOWN);</div><div class='ctx'> 				slave_state_changed = 1;</div><div class='ctx'> </div><div class='ctx'> 				if (slave-&gt;link_failure_count &lt; UINT_MAX)</div><div class='ctx'> 					slave-&gt;link_failure_count++;</div><div class='ctx'> </div><div class='del'>-				netdev_info(bond-&gt;dev, "interface %s is now down\n",</div><div class='del'>-					    slave-&gt;dev-&gt;name);</div><div class='add'>+				slave_info(bond-&gt;dev, slave-&gt;dev, "interface is now down\n");</div><div class='ctx'> </div><div class='ctx'> 				if (slave == oldcurrent)</div><div class='ctx'> 					do_failover = 1;</div><div class='hunk'>@@ -2723,7 +3448,7 @@ static void bond_loadbalance_arp_mon(struct bonding *bond)</div><div class='ctx'> 		 * to be unstable during low/no traffic periods</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (bond_slave_is_up(slave))</div><div class='del'>-			bond_arp_send_all(bond, slave);</div><div class='add'>+			bond_send_validate(bond, slave);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_unlock();</div><div class='hunk'>@@ -2733,8 +3458,8 @@ static void bond_loadbalance_arp_mon(struct bonding *bond)</div><div class='ctx'> 			goto re_arm;</div><div class='ctx'> </div><div class='ctx'> 		bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-			if (slave-&gt;new_link != BOND_LINK_NOCHANGE)</div><div class='del'>-				slave-&gt;link = slave-&gt;new_link;</div><div class='add'>+			if (slave-&gt;link_new_state != BOND_LINK_NOCHANGE)</div><div class='add'>+				slave-&gt;link = slave-&gt;link_new_state;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (slave_state_changed) {</div><div class='hunk'>@@ -2757,26 +3482,29 @@ re_arm:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Called to inspect slaves for active-backup mode ARP monitor link state</div><div class='del'>- * changes.  Sets new_link in slaves to specify what action should take</div><div class='del'>- * place for the slave.  Returns 0 if no changes are found, &gt;0 if changes</div><div class='del'>- * to link states must be committed.</div><div class='add'>+ * changes.  Sets proposed link state in slaves to specify what action</div><div class='add'>+ * should take place for the slave.  Returns 0 if no changes are found, &gt;0</div><div class='add'>+ * if changes to link states must be committed.</div><div class='ctx'>  *</div><div class='ctx'>  * Called with rcu_read_lock held.</div><div class='ctx'>  */</div><div class='ctx'> static int bond_ab_arp_inspect(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	unsigned long trans_start, last_rx;</div><div class='add'>+	unsigned long last_tx, last_rx;</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	int commit = 0;</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='del'>-		slave-&gt;new_link = BOND_LINK_NOCHANGE;</div><div class='add'>+		bond_propose_link_state(slave, BOND_LINK_NOCHANGE);</div><div class='ctx'> 		last_rx = slave_last_rx(bond, slave);</div><div class='ctx'> </div><div class='ctx'> 		if (slave-&gt;link != BOND_LINK_UP) {</div><div class='ctx'> 			if (bond_time_in_interval(bond, last_rx, 1)) {</div><div class='del'>-				slave-&gt;new_link = BOND_LINK_UP;</div><div class='add'>+				bond_propose_link_state(slave, BOND_LINK_UP);</div><div class='add'>+				commit++;</div><div class='add'>+			} else if (slave-&gt;link == BOND_LINK_BACK) {</div><div class='add'>+				bond_propose_link_state(slave, BOND_LINK_FAIL);</div><div class='ctx'> 				commit++;</div><div class='ctx'> 			}</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2791,7 +3519,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)</div><div class='ctx'> </div><div class='ctx'> 		/* Backup slave is down if:</div><div class='ctx'> 		 * - No current_arp_slave AND</div><div class='del'>-		 * - more than 3*delta since last receive AND</div><div class='add'>+		 * - more than (missed_max+1)*delta since last receive AND</div><div class='ctx'> 		 * - the bond has an IP address</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * Note: a non-null current_arp_slave indicates</div><div class='hunk'>@@ -2803,21 +3531,21 @@ static int bond_ab_arp_inspect(struct bonding *bond)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!bond_is_active_slave(slave) &amp;&amp;</div><div class='ctx'> 		    !rcu_access_pointer(bond-&gt;current_arp_slave) &amp;&amp;</div><div class='del'>-		    !bond_time_in_interval(bond, last_rx, 3)) {</div><div class='del'>-			slave-&gt;new_link = BOND_LINK_DOWN;</div><div class='add'>+		    !bond_time_in_interval(bond, last_rx, bond-&gt;params.missed_max + 1)) {</div><div class='add'>+			bond_propose_link_state(slave, BOND_LINK_DOWN);</div><div class='ctx'> 			commit++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Active slave is down if:</div><div class='del'>-		 * - more than 2*delta since transmitting OR</div><div class='del'>-		 * - (more than 2*delta since receive AND</div><div class='add'>+		 * - more than missed_max*delta since transmitting OR</div><div class='add'>+		 * - (more than missed_max*delta since receive AND</div><div class='ctx'> 		 *    the bond has an IP address)</div><div class='ctx'> 		 */</div><div class='del'>-		trans_start = dev_trans_start(slave-&gt;dev);</div><div class='add'>+		last_tx = slave_last_tx(slave);</div><div class='ctx'> 		if (bond_is_active_slave(slave) &amp;&amp;</div><div class='del'>-		    (!bond_time_in_interval(bond, trans_start, 2) ||</div><div class='del'>-		     !bond_time_in_interval(bond, last_rx, 2))) {</div><div class='del'>-			slave-&gt;new_link = BOND_LINK_DOWN;</div><div class='add'>+		    (!bond_time_in_interval(bond, last_tx, bond-&gt;params.missed_max) ||</div><div class='add'>+		     !bond_time_in_interval(bond, last_rx, bond-&gt;params.missed_max))) {</div><div class='add'>+			bond_propose_link_state(slave, BOND_LINK_DOWN);</div><div class='ctx'> 			commit++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2832,20 +3560,21 @@ static int bond_ab_arp_inspect(struct bonding *bond)</div><div class='ctx'>  */</div><div class='ctx'> static void bond_ab_arp_commit(struct bonding *bond)</div><div class='ctx'> {</div><div class='del'>-	unsigned long trans_start;</div><div class='add'>+	bool do_failover = false;</div><div class='ctx'> 	struct list_head *iter;</div><div class='add'>+	unsigned long last_tx;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-		switch (slave-&gt;new_link) {</div><div class='add'>+		switch (slave-&gt;link_new_state) {</div><div class='ctx'> 		case BOND_LINK_NOCHANGE:</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		case BOND_LINK_UP:</div><div class='del'>-			trans_start = dev_trans_start(slave-&gt;dev);</div><div class='add'>+			last_tx = slave_last_tx(slave);</div><div class='ctx'> 			if (rtnl_dereference(bond-&gt;curr_active_slave) != slave ||</div><div class='ctx'> 			    (!rtnl_dereference(bond-&gt;curr_active_slave) &amp;&amp;</div><div class='del'>-			     bond_time_in_interval(bond, trans_start, 1))) {</div><div class='add'>+			     bond_time_in_interval(bond, last_tx, 1))) {</div><div class='ctx'> 				struct slave *current_arp_slave;</div><div class='ctx'> </div><div class='ctx'> 				current_arp_slave = rtnl_dereference(bond-&gt;current_arp_slave);</div><div class='hunk'>@@ -2858,12 +3587,12 @@ static void bond_ab_arp_commit(struct bonding *bond)</div><div class='ctx'> 					RCU_INIT_POINTER(bond-&gt;current_arp_slave, NULL);</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				netdev_info(bond-&gt;dev, "link status definitely up for interface %s\n",</div><div class='del'>-					    slave-&gt;dev-&gt;name);</div><div class='add'>+				slave_info(bond-&gt;dev, slave-&gt;dev, "link status definitely up\n");</div><div class='ctx'> </div><div class='ctx'> 				if (!rtnl_dereference(bond-&gt;curr_active_slave) ||</div><div class='del'>-				    slave == rtnl_dereference(bond-&gt;primary_slave))</div><div class='del'>-					goto do_failover;</div><div class='add'>+				    slave == rtnl_dereference(bond-&gt;primary_slave) ||</div><div class='add'>+				    slave-&gt;prio &gt; rtnl_dereference(bond-&gt;curr_active_slave)-&gt;prio)</div><div class='add'>+					do_failover = true;</div><div class='ctx'> </div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='hunk'>@@ -2878,23 +3607,37 @@ static void bond_ab_arp_commit(struct bonding *bond)</div><div class='ctx'> 			bond_set_slave_inactive_flags(slave,</div><div class='ctx'> 						      BOND_SLAVE_NOTIFY_NOW);</div><div class='ctx'> </div><div class='del'>-			netdev_info(bond-&gt;dev, "link status definitely down for interface %s, disabling it\n",</div><div class='del'>-				    slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_info(bond-&gt;dev, slave-&gt;dev, "link status definitely down, disabling slave\n");</div><div class='ctx'> </div><div class='ctx'> 			if (slave == rtnl_dereference(bond-&gt;curr_active_slave)) {</div><div class='ctx'> 				RCU_INIT_POINTER(bond-&gt;current_arp_slave, NULL);</div><div class='del'>-				goto do_failover;</div><div class='add'>+				do_failover = true;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		case BOND_LINK_FAIL:</div><div class='add'>+			bond_set_slave_link_state(slave, BOND_LINK_FAIL,</div><div class='add'>+						  BOND_SLAVE_NOTIFY_NOW);</div><div class='add'>+			bond_set_slave_inactive_flags(slave,</div><div class='add'>+						      BOND_SLAVE_NOTIFY_NOW);</div><div class='add'>+</div><div class='add'>+			/* A slave has just been enslaved and has become</div><div class='add'>+			 * the current active slave.</div><div class='add'>+			 */</div><div class='add'>+			if (rtnl_dereference(bond-&gt;curr_active_slave))</div><div class='add'>+				RCU_INIT_POINTER(bond-&gt;current_arp_slave, NULL);</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(bond-&gt;dev, "impossible: new_link %d on slave %s\n",</div><div class='del'>-				   slave-&gt;new_link, slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_err(bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+				  "impossible: link_new_state %d on slave\n",</div><div class='add'>+				  slave-&gt;link_new_state);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-do_failover:</div><div class='add'>+	if (do_failover) {</div><div class='ctx'> 		block_netpoll_tx();</div><div class='ctx'> 		bond_select_active_slave(bond);</div><div class='ctx'> 		unblock_netpoll_tx();</div><div class='hunk'>@@ -2922,7 +3665,7 @@ static bool bond_ab_arp_probe(struct bonding *bond)</div><div class='ctx'> 			    curr_active_slave-&gt;dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	if (curr_active_slave) {</div><div class='del'>-		bond_arp_send_all(bond, curr_active_slave);</div><div class='add'>+		bond_send_validate(bond, curr_active_slave);</div><div class='ctx'> 		return should_notify_rtnl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2937,8 +3680,6 @@ static bool bond_ab_arp_probe(struct bonding *bond)</div><div class='ctx'> 			return should_notify_rtnl;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bond_set_slave_inactive_flags(curr_arp_slave, BOND_SLAVE_NOTIFY_LATER);</div><div class='del'>-</div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 		if (!found &amp;&amp; !before &amp;&amp; bond_slave_is_up(slave))</div><div class='ctx'> 			before = slave;</div><div class='hunk'>@@ -2961,8 +3702,7 @@ static bool bond_ab_arp_probe(struct bonding *bond)</div><div class='ctx'> 			bond_set_slave_inactive_flags(slave,</div><div class='ctx'> 						      BOND_SLAVE_NOTIFY_LATER);</div><div class='ctx'> </div><div class='del'>-			netdev_info(bond-&gt;dev, "backup interface %s is now down\n",</div><div class='del'>-				    slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_info(bond-&gt;dev, slave-&gt;dev, "backup interface is now down\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		if (slave == curr_arp_slave)</div><div class='ctx'> 			found = true;</div><div class='hunk'>@@ -2977,7 +3717,7 @@ static bool bond_ab_arp_probe(struct bonding *bond)</div><div class='ctx'> 	bond_set_slave_link_state(new_slave, BOND_LINK_BACK,</div><div class='ctx'> 				  BOND_SLAVE_NOTIFY_LATER);</div><div class='ctx'> 	bond_set_slave_active_flags(new_slave, BOND_SLAVE_NOTIFY_LATER);</div><div class='del'>-	bond_arp_send_all(bond, new_slave);</div><div class='add'>+	bond_send_validate(bond, new_slave);</div><div class='ctx'> 	new_slave-&gt;last_link_up = jiffies;</div><div class='ctx'> 	rcu_assign_pointer(bond-&gt;current_arp_slave, new_slave);</div><div class='ctx'> </div><div class='hunk'>@@ -3033,9 +3773,11 @@ re_arm:</div><div class='ctx'> 		if (!rtnl_trylock())</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		if (should_notify_peers)</div><div class='add'>+		if (should_notify_peers) {</div><div class='add'>+			bond-&gt;send_peer_notif--;</div><div class='ctx'> 			call_netdevice_notifiers(NETDEV_NOTIFY_PEERS,</div><div class='ctx'> 						 bond-&gt;dev);</div><div class='add'>+		}</div><div class='ctx'> 		if (should_notify_rtnl) {</div><div class='ctx'> 			bond_slave_state_notify(bond);</div><div class='ctx'> 			bond_slave_link_notify(bond);</div><div class='hunk'>@@ -3074,19 +3816,20 @@ static int bond_master_netdev_event(unsigned long event,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *event_bond = netdev_priv(bond_dev);</div><div class='ctx'> </div><div class='add'>+	netdev_dbg(bond_dev, "%s called\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_CHANGENAME:</div><div class='ctx'> 		return bond_event_changename(event_bond);</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='ctx'> 		bond_remove_proc_entry(event_bond);</div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+		xfrm_dev_state_flush(dev_net(bond_dev), bond_dev, true);</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_REGISTER:</div><div class='ctx'> 		bond_create_proc_entry(event_bond);</div><div class='ctx'> 		break;</div><div class='del'>-	case NETDEV_NOTIFY_PEERS:</div><div class='del'>-		if (event_bond-&gt;send_peer_notif)</div><div class='del'>-			event_bond-&gt;send_peer_notif--;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3105,12 +3848,17 @@ static int bond_slave_netdev_event(unsigned long event,</div><div class='ctx'> 	 * before netdev_rx_handler_register is called in which case</div><div class='ctx'> 	 * slave will be NULL</div><div class='ctx'> 	 */</div><div class='del'>-	if (!slave)</div><div class='add'>+	if (!slave) {</div><div class='add'>+		netdev_dbg(slave_dev, "%s called on NULL slave\n", __func__);</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bond_dev = slave-&gt;bond-&gt;dev;</div><div class='ctx'> 	bond = slave-&gt;bond;</div><div class='ctx'> 	primary = rtnl_dereference(bond-&gt;primary_slave);</div><div class='ctx'> </div><div class='add'>+	slave_dbg(bond_dev, slave_dev, "%s called\n", __func__);</div><div class='add'>+</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case NETDEV_UNREGISTER:</div><div class='ctx'> 		if (bond_dev-&gt;type != ARPHRD_ETHER)</div><div class='hunk'>@@ -3137,7 +3885,7 @@ static int bond_slave_netdev_event(unsigned long event,</div><div class='ctx'> </div><div class='ctx'> 		if (BOND_MODE(bond) == BOND_MODE_8023AD)</div><div class='ctx'> 			bond_3ad_adapter_speed_duplex_changed(slave);</div><div class='del'>-		/* Fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case NETDEV_DOWN:</div><div class='ctx'> 		/* Refresh slave-array if applicable!</div><div class='ctx'> 		 * If the setup does not use miimon or arpmon (mode-specific!),</div><div class='hunk'>@@ -3187,12 +3935,19 @@ static int bond_slave_netdev_event(unsigned long event,</div><div class='ctx'> 		unblock_netpoll_tx();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_FEAT_CHANGE:</div><div class='del'>-		bond_compute_features(bond);</div><div class='add'>+		if (!bond-&gt;notifier_ctx) {</div><div class='add'>+			bond-&gt;notifier_ctx = true;</div><div class='add'>+			netdev_compute_master_upper_features(bond-&gt;dev, true);</div><div class='add'>+			bond-&gt;notifier_ctx = false;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case NETDEV_RESEND_IGMP:</div><div class='ctx'> 		/* Propagate to master device */</div><div class='ctx'> 		call_netdevice_notifiers(event, slave-&gt;bond-&gt;dev);</div><div class='ctx'> 		break;</div><div class='add'>+	case NETDEV_XDP_FEAT_CHANGE:</div><div class='add'>+		bond_xdp_set_features(bond_dev);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3212,7 +3967,8 @@ static int bond_netdev_event(struct notifier_block *this,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *event_dev = netdev_notifier_info_to_dev(ptr);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(event_dev, "event: %lx\n", event);</div><div class='add'>+	netdev_dbg(event_dev, "%s received %s\n",</div><div class='add'>+		   __func__, netdev_cmd_to_name(event));</div><div class='ctx'> </div><div class='ctx'> 	if (!(event_dev-&gt;priv_flags &amp; IFF_BONDING))</div><div class='ctx'> 		return NOTIFY_DONE;</div><div class='hunk'>@@ -3220,16 +3976,13 @@ static int bond_netdev_event(struct notifier_block *this,</div><div class='ctx'> 	if (event_dev-&gt;flags &amp; IFF_MASTER) {</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		netdev_dbg(event_dev, "IFF_MASTER\n");</div><div class='ctx'> 		ret = bond_master_netdev_event(event, event_dev);</div><div class='ctx'> 		if (ret != NOTIFY_DONE)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (event_dev-&gt;flags &amp; IFF_SLAVE) {</div><div class='del'>-		netdev_dbg(event_dev, "IFF_SLAVE\n");</div><div class='add'>+	if (event_dev-&gt;flags &amp; IFF_SLAVE)</div><div class='ctx'> 		return bond_slave_netdev_event(event, event_dev);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return NOTIFY_DONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -3240,54 +3993,183 @@ static struct notifier_block bond_netdev_notifier = {</div><div class='ctx'> </div><div class='ctx'> /*---------------------------- Hashing Policies -----------------------------*/</div><div class='ctx'> </div><div class='add'>+/* Helper to access data in a packet, with or without a backing skb.</div><div class='add'>+ * If skb is given the data is linearized if necessary via pskb_may_pull.</div><div class='add'>+ */</div><div class='add'>+static inline const void *bond_pull_data(struct sk_buff *skb,</div><div class='add'>+					 const void *data, int hlen, int n)</div><div class='add'>+{</div><div class='add'>+	if (likely(n &lt;= hlen))</div><div class='add'>+		return data;</div><div class='add'>+	else if (skb &amp;&amp; likely(pskb_may_pull(skb, n)))</div><div class='add'>+		return skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* L2 hash helper */</div><div class='del'>-static inline u32 bond_eth_hash(struct sk_buff *skb)</div><div class='add'>+static inline u32 bond_eth_hash(struct sk_buff *skb, const void *data, int mhoff, int hlen)</div><div class='ctx'> {</div><div class='del'>-	struct ethhdr *ep, hdr_tmp;</div><div class='add'>+	struct ethhdr *ep;</div><div class='ctx'> </div><div class='del'>-	ep = skb_header_pointer(skb, 0, sizeof(hdr_tmp), &amp;hdr_tmp);</div><div class='del'>-	if (ep)</div><div class='del'>-		return ep-&gt;h_dest[5] ^ ep-&gt;h_source[5] ^ ep-&gt;h_proto;</div><div class='del'>-	return 0;</div><div class='add'>+	data = bond_pull_data(skb, data, hlen, mhoff + sizeof(struct ethhdr));</div><div class='add'>+	if (!data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ep = (struct ethhdr *)(data + mhoff);</div><div class='add'>+	return ep-&gt;h_dest[5] ^ ep-&gt;h_source[5] ^ be16_to_cpu(ep-&gt;h_proto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Extract the appropriate headers based on bond's xmit policy */</div><div class='del'>-static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb,</div><div class='del'>-			      struct flow_keys *fk)</div><div class='add'>+static bool bond_flow_ip(struct sk_buff *skb, struct flow_keys *fk, const void *data,</div><div class='add'>+			 int hlen, __be16 l2_proto, int *nhoff, int *ip_proto, bool l34)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ipv6hdr *iph6;</div><div class='ctx'> 	const struct iphdr *iph;</div><div class='del'>-	int noff, proto = -1;</div><div class='del'>-</div><div class='del'>-	if (bond-&gt;params.xmit_policy &gt; BOND_XMIT_POLICY_LAYER23)</div><div class='del'>-		return skb_flow_dissect_flow_keys(skb, fk, 0);</div><div class='ctx'> </div><div class='del'>-	fk-&gt;ports.ports = 0;</div><div class='del'>-	noff = skb_network_offset(skb);</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-		if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph))))</div><div class='add'>+	if (l2_proto == htons(ETH_P_IP)) {</div><div class='add'>+		data = bond_pull_data(skb, data, hlen, *nhoff + sizeof(*iph));</div><div class='add'>+		if (!data)</div><div class='ctx'> 			return false;</div><div class='del'>-		iph = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+		iph = (const struct iphdr *)(data + *nhoff);</div><div class='ctx'> 		iph_to_flow_copy_v4addrs(fk, iph);</div><div class='del'>-		noff += iph-&gt;ihl &lt;&lt; 2;</div><div class='add'>+		*nhoff += iph-&gt;ihl &lt;&lt; 2;</div><div class='ctx'> 		if (!ip_is_fragment(iph))</div><div class='del'>-			proto = iph-&gt;protocol;</div><div class='del'>-	} else if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='del'>-		if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph6))))</div><div class='add'>+			*ip_proto = iph-&gt;protocol;</div><div class='add'>+	} else if (l2_proto == htons(ETH_P_IPV6)) {</div><div class='add'>+		data = bond_pull_data(skb, data, hlen, *nhoff + sizeof(*iph6));</div><div class='add'>+		if (!data)</div><div class='ctx'> 			return false;</div><div class='del'>-		iph6 = ipv6_hdr(skb);</div><div class='add'>+</div><div class='add'>+		iph6 = (const struct ipv6hdr *)(data + *nhoff);</div><div class='ctx'> 		iph_to_flow_copy_v6addrs(fk, iph6);</div><div class='del'>-		noff += sizeof(*iph6);</div><div class='del'>-		proto = iph6-&gt;nexthdr;</div><div class='add'>+		*nhoff += sizeof(*iph6);</div><div class='add'>+		*ip_proto = iph6-&gt;nexthdr;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='del'>-	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER34 &amp;&amp; proto &gt;= 0)</div><div class='del'>-		fk-&gt;ports.ports = skb_flow_get_ports(skb, noff, proto);</div><div class='add'>+</div><div class='add'>+	if (l34 &amp;&amp; *ip_proto &gt;= 0)</div><div class='add'>+		fk-&gt;ports.ports = skb_flow_get_ports(skb, *nhoff, *ip_proto, data, hlen);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bond_vlan_srcmac_hash(struct sk_buff *skb, const void *data, int mhoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	u32 srcmac_vendor = 0, srcmac_dev = 0;</div><div class='add'>+	struct ethhdr *mac_hdr;</div><div class='add'>+	u16 vlan = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	data = bond_pull_data(skb, data, hlen, mhoff + sizeof(struct ethhdr));</div><div class='add'>+	if (!data)</div><div class='add'>+		return 0;</div><div class='add'>+	mac_hdr = (struct ethhdr *)(data + mhoff);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='add'>+		srcmac_vendor = (srcmac_vendor &lt;&lt; 8) | mac_hdr-&gt;h_source[i];</div><div class='add'>+</div><div class='add'>+	for (i = 3; i &lt; ETH_ALEN; i++)</div><div class='add'>+		srcmac_dev = (srcmac_dev &lt;&lt; 8) | mac_hdr-&gt;h_source[i];</div><div class='add'>+</div><div class='add'>+	if (skb &amp;&amp; skb_vlan_tag_present(skb))</div><div class='add'>+		vlan = skb_vlan_tag_get(skb);</div><div class='add'>+</div><div class='add'>+	return vlan ^ srcmac_vendor ^ srcmac_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Extract the appropriate headers based on bond's xmit policy */</div><div class='add'>+static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb, const void *data,</div><div class='add'>+			      __be16 l2_proto, int nhoff, int hlen, struct flow_keys *fk)</div><div class='add'>+{</div><div class='add'>+	bool l34 = bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER34;</div><div class='add'>+	int ip_proto = -1;</div><div class='add'>+</div><div class='add'>+	switch (bond-&gt;params.xmit_policy) {</div><div class='add'>+	case BOND_XMIT_POLICY_ENCAP23:</div><div class='add'>+	case BOND_XMIT_POLICY_ENCAP34:</div><div class='add'>+		memset(fk, 0, sizeof(*fk));</div><div class='add'>+		return __skb_flow_dissect(NULL, skb, &amp;flow_keys_bonding,</div><div class='add'>+					  fk, data, l2_proto, nhoff, hlen, 0);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fk-&gt;ports.ports = 0;</div><div class='add'>+	memset(&amp;fk-&gt;icmp, 0, sizeof(fk-&gt;icmp));</div><div class='add'>+	if (!bond_flow_ip(skb, fk, data, hlen, l2_proto, &amp;nhoff, &amp;ip_proto, l34))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* ICMP error packets contains at least 8 bytes of the header</div><div class='add'>+	 * of the packet which generated the error. Use this information</div><div class='add'>+	 * to correlate ICMP error packets within the same flow which</div><div class='add'>+	 * generated the error.</div><div class='add'>+	 */</div><div class='add'>+	if (ip_proto == IPPROTO_ICMP || ip_proto == IPPROTO_ICMPV6) {</div><div class='add'>+		skb_flow_get_icmp_tci(skb, &amp;fk-&gt;icmp, data, nhoff, hlen);</div><div class='add'>+		if (ip_proto == IPPROTO_ICMP) {</div><div class='add'>+			if (!icmp_is_err(fk-&gt;icmp.type))</div><div class='add'>+				return true;</div><div class='add'>+</div><div class='add'>+			nhoff += sizeof(struct icmphdr);</div><div class='add'>+		} else if (ip_proto == IPPROTO_ICMPV6) {</div><div class='add'>+			if (!icmpv6_is_err(fk-&gt;icmp.type))</div><div class='add'>+				return true;</div><div class='add'>+</div><div class='add'>+			nhoff += sizeof(struct icmp6hdr);</div><div class='add'>+		}</div><div class='add'>+		return bond_flow_ip(skb, fk, data, hlen, l2_proto, &amp;nhoff, &amp;ip_proto, l34);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 bond_ip_hash(u32 hash, struct flow_keys *flow, int xmit_policy)</div><div class='add'>+{</div><div class='add'>+	hash ^= (__force u32)flow_get_u32_dst(flow) ^</div><div class='add'>+		(__force u32)flow_get_u32_src(flow);</div><div class='add'>+	hash ^= (hash &gt;&gt; 16);</div><div class='add'>+	hash ^= (hash &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	/* discard lowest hash bit to deal with the common even ports pattern */</div><div class='add'>+	if (xmit_policy == BOND_XMIT_POLICY_LAYER34 ||</div><div class='add'>+		xmit_policy == BOND_XMIT_POLICY_ENCAP34)</div><div class='add'>+		return hash &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+	return hash;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Generate hash based on xmit policy. If @skb is given it is used to linearize</div><div class='add'>+ * the data as required, but this function can be used without it if the data is</div><div class='add'>+ * known to be linear (e.g. with xdp_buff).</div><div class='add'>+ */</div><div class='add'>+static u32 __bond_xmit_hash(struct bonding *bond, struct sk_buff *skb, const void *data,</div><div class='add'>+			    __be16 l2_proto, int mhoff, int nhoff, int hlen)</div><div class='add'>+{</div><div class='add'>+	struct flow_keys flow;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_VLAN_SRCMAC)</div><div class='add'>+		return bond_vlan_srcmac_hash(skb, data, mhoff, hlen);</div><div class='add'>+</div><div class='add'>+	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER2 ||</div><div class='add'>+	    !bond_flow_dissect(bond, skb, data, l2_proto, nhoff, hlen, &amp;flow))</div><div class='add'>+		return bond_eth_hash(skb, data, mhoff, hlen);</div><div class='add'>+</div><div class='add'>+	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER23 ||</div><div class='add'>+	    bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_ENCAP23) {</div><div class='add'>+		hash = bond_eth_hash(skb, data, mhoff, hlen);</div><div class='add'>+	} else {</div><div class='add'>+		if (flow.icmp.id)</div><div class='add'>+			memcpy(&amp;hash, &amp;flow.icmp, sizeof(hash));</div><div class='add'>+		else</div><div class='add'>+			memcpy(&amp;hash, &amp;flow.ports.ports, sizeof(hash));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bond_ip_hash(hash, &amp;flow, bond-&gt;params.xmit_policy);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bond_xmit_hash - generate a hash value based on the xmit policy</div><div class='ctx'>  * @bond: bonding device</div><div class='hunk'>@@ -3298,28 +4180,33 @@ static bool bond_flow_dissect(struct bonding *bond, struct sk_buff *skb,</div><div class='ctx'>  */</div><div class='ctx'> u32 bond_xmit_hash(struct bonding *bond, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct flow_keys flow;</div><div class='del'>-	u32 hash;</div><div class='del'>-</div><div class='ctx'> 	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_ENCAP34 &amp;&amp;</div><div class='ctx'> 	    skb-&gt;l4_hash)</div><div class='ctx'> 		return skb-&gt;hash;</div><div class='ctx'> </div><div class='del'>-	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER2 ||</div><div class='del'>-	    !bond_flow_dissect(bond, skb, &amp;flow))</div><div class='del'>-		return bond_eth_hash(skb);</div><div class='add'>+	return __bond_xmit_hash(bond, skb, skb-&gt;data, skb-&gt;protocol,</div><div class='add'>+				0, skb_network_offset(skb),</div><div class='add'>+				skb_headlen(skb));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_LAYER23 ||</div><div class='del'>-	    bond-&gt;params.xmit_policy == BOND_XMIT_POLICY_ENCAP23)</div><div class='del'>-		hash = bond_eth_hash(skb);</div><div class='del'>-	else</div><div class='del'>-		hash = (__force u32)flow.ports.ports;</div><div class='del'>-	hash ^= (__force u32)flow_get_u32_dst(&amp;flow) ^</div><div class='del'>-		(__force u32)flow_get_u32_src(&amp;flow);</div><div class='del'>-	hash ^= (hash &gt;&gt; 16);</div><div class='del'>-	hash ^= (hash &gt;&gt; 8);</div><div class='add'>+/**</div><div class='add'>+ * bond_xmit_hash_xdp - generate a hash value based on the xmit policy</div><div class='add'>+ * @bond: bonding device</div><div class='add'>+ * @xdp: buffer to use for headers</div><div class='add'>+ *</div><div class='add'>+ * The XDP variant of bond_xmit_hash.</div><div class='add'>+ */</div><div class='add'>+static u32 bond_xmit_hash_xdp(struct bonding *bond, struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+</div><div class='add'>+	if (xdp-&gt;data + sizeof(struct ethhdr) &gt; xdp-&gt;data_end)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	eth = (struct ethhdr *)xdp-&gt;data;</div><div class='ctx'> </div><div class='del'>-	return hash &gt;&gt; 1;</div><div class='add'>+	return __bond_xmit_hash(bond, NULL, xdp-&gt;data, eth-&gt;h_proto, 0,</div><div class='add'>+				sizeof(struct ethhdr), xdp-&gt;data_end - xdp-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------- Device entry points ----------------------------*/</div><div class='hunk'>@@ -3335,7 +4222,7 @@ void bond_work_init_all(struct bonding *bond)</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;bond-&gt;slave_arr_work, bond_slave_arr_handler);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bond_work_cancel_all(struct bonding *bond)</div><div class='add'>+void bond_work_cancel_all(struct bonding *bond)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;bond-&gt;mii_work);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;bond-&gt;arp_work);</div><div class='hunk'>@@ -3351,6 +4238,12 @@ static int bond_open(struct net_device *bond_dev)</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> </div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_ROUNDROBIN &amp;&amp; !bond-&gt;rr_tx_counter) {</div><div class='add'>+		bond-&gt;rr_tx_counter = alloc_percpu(u32);</div><div class='add'>+		if (!bond-&gt;rr_tx_counter)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* reset slave-&gt;backup and slave-&gt;inactive */</div><div class='ctx'> 	if (bond_has_slaves(bond)) {</div><div class='ctx'> 		bond_for_each_slave(bond, slave, iter) {</div><div class='hunk'>@@ -3380,7 +4273,7 @@ static int bond_open(struct net_device *bond_dev)</div><div class='ctx'> </div><div class='ctx'> 	if (bond-&gt;params.arp_interval) {  /* arp interval, in milliseconds. */</div><div class='ctx'> 		queue_delayed_work(bond-&gt;wq, &amp;bond-&gt;arp_work, 0);</div><div class='del'>-		bond-&gt;recv_probe = bond_arp_rcv;</div><div class='add'>+		bond-&gt;recv_probe = bond_rcv_validate;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='hunk'>@@ -3388,6 +4281,12 @@ static int bond_open(struct net_device *bond_dev)</div><div class='ctx'> 		/* register to receive LACPDUs */</div><div class='ctx'> 		bond-&gt;recv_probe = bond_3ad_lacpdu_recv;</div><div class='ctx'> 		bond_3ad_initiate_agg_selection(bond, 1);</div><div class='add'>+</div><div class='add'>+		bond_for_each_slave(bond, slave, iter)</div><div class='add'>+			dev_mc_add(slave-&gt;dev, lacpdu_mcast_addr);</div><div class='add'>+</div><div class='add'>+		if (bond-&gt;params.broadcast_neighbor)</div><div class='add'>+			static_branch_inc(&amp;bond_bcast_neigh_enabled);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bond_mode_can_use_xmit_hash(bond))</div><div class='hunk'>@@ -3399,6 +4298,7 @@ static int bond_open(struct net_device *bond_dev)</div><div class='ctx'> static int bond_close(struct net_device *bond_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct slave *slave;</div><div class='ctx'> </div><div class='ctx'> 	bond_work_cancel_all(bond);</div><div class='ctx'> 	bond-&gt;send_peer_notif = 0;</div><div class='hunk'>@@ -3406,6 +4306,23 @@ static int bond_close(struct net_device *bond_dev)</div><div class='ctx'> 		bond_alb_deinitialize(bond);</div><div class='ctx'> 	bond-&gt;recv_probe = NULL;</div><div class='ctx'> </div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp;</div><div class='add'>+	    bond-&gt;params.broadcast_neighbor)</div><div class='add'>+		static_branch_dec(&amp;bond_bcast_neigh_enabled);</div><div class='add'>+</div><div class='add'>+	if (bond_uses_primary(bond)) {</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+		if (slave)</div><div class='add'>+			bond_hw_addr_flush(bond_dev, slave-&gt;dev);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		struct list_head *iter;</div><div class='add'>+</div><div class='add'>+		bond_for_each_slave(bond, slave, iter)</div><div class='add'>+			bond_hw_addr_flush(bond_dev, slave-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3438,12 +4355,46 @@ static void bond_fold_stats(struct rtnl_link_stats64 *_res,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bond_get_nest_level(struct net_device *bond_dev)</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+static int bond_get_lowest_level_rcu(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct net_device *ldev, *next, *now, *dev_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	struct list_head *niter, *iter, *iter_stack[MAX_NEST_DEV + 1];</div><div class='add'>+	int cur = 0, max = 0;</div><div class='add'>+</div><div class='add'>+	now = dev;</div><div class='add'>+	iter = &amp;dev-&gt;adj_list.lower;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		next = NULL;</div><div class='add'>+		while (1) {</div><div class='add'>+			ldev = netdev_next_lower_dev_rcu(now, &amp;iter);</div><div class='add'>+			if (!ldev)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			next = ldev;</div><div class='add'>+			niter = &amp;ldev-&gt;adj_list.lower;</div><div class='add'>+			dev_stack[cur] = now;</div><div class='add'>+			iter_stack[cur++] = iter;</div><div class='add'>+			if (max &lt;= cur)</div><div class='add'>+				max = cur;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!next) {</div><div class='add'>+			if (!cur)</div><div class='add'>+				return max;</div><div class='add'>+			next = dev_stack[--cur];</div><div class='add'>+			niter = iter_stack[cur];</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	return bond-&gt;nest_level;</div><div class='add'>+		now = next;</div><div class='add'>+		iter = niter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return max;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void bond_get_stats(struct net_device *bond_dev,</div><div class='ctx'> 			   struct rtnl_link_stats64 *stats)</div><div class='hunk'>@@ -3452,11 +4403,17 @@ static void bond_get_stats(struct net_device *bond_dev,</div><div class='ctx'> 	struct rtnl_link_stats64 temp;</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='add'>+	int nest_level = 0;</div><div class='ctx'> </div><div class='del'>-	spin_lock_nested(&amp;bond-&gt;stats_lock, bond_get_nest_level(bond_dev));</div><div class='del'>-	memcpy(stats, &amp;bond-&gt;bond_stats, sizeof(*stats));</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='add'>+#ifdef CONFIG_LOCKDEP</div><div class='add'>+	nest_level = bond_get_lowest_level_rcu(bond_dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	spin_lock_nested(&amp;bond-&gt;stats_lock, nest_level);</div><div class='add'>+	memcpy(stats, &amp;bond-&gt;bond_stats, sizeof(*stats));</div><div class='add'>+</div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 		const struct rtnl_link_stats64 *new =</div><div class='ctx'> 			dev_get_stats(slave-&gt;dev, &amp;temp);</div><div class='hunk'>@@ -3466,26 +4423,18 @@ static void bond_get_stats(struct net_device *bond_dev,</div><div class='ctx'> 		/* save off the slave stats for the next run */</div><div class='ctx'> 		memcpy(&amp;slave-&gt;slave_stats, new, sizeof(*new));</div><div class='ctx'> 	}</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;bond-&gt;bond_stats, stats, sizeof(*stats));</div><div class='ctx'> 	spin_unlock(&amp;bond-&gt;stats_lock);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd)</div><div class='add'>+static int bond_eth_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	struct net_device *slave_dev = NULL;</div><div class='del'>-	struct ifbond k_binfo;</div><div class='del'>-	struct ifbond __user *u_binfo = NULL;</div><div class='del'>-	struct ifslave k_sinfo;</div><div class='del'>-	struct ifslave __user *u_sinfo = NULL;</div><div class='ctx'> 	struct mii_ioctl_data *mii = NULL;</div><div class='del'>-	struct bond_opt_value newval;</div><div class='del'>-	struct net *net;</div><div class='del'>-	int res = 0;</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond_dev, "bond_ioctl: cmd=%d\n", cmd);</div><div class='add'>+	netdev_dbg(bond_dev, "bond_eth_ioctl: cmd=%d\n", cmd);</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='hunk'>@@ -3494,7 +4443,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		mii-&gt;phy_id = 0;</div><div class='del'>-		/* Fall Through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIREG:</div><div class='ctx'> 		/* We do this again just in case we were called by SIOCGMIIREG</div><div class='ctx'> 		 * instead of SIOCGMIIPHY.</div><div class='hunk'>@@ -3509,8 +4458,29 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd</div><div class='ctx'> 				mii-&gt;val_out = BMSR_LSTATUS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='del'>-	case BOND_INFO_QUERY_OLD:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct net_device *slave_dev = NULL;</div><div class='add'>+	struct ifbond k_binfo;</div><div class='add'>+	struct ifbond __user *u_binfo = NULL;</div><div class='add'>+	struct ifslave k_sinfo;</div><div class='add'>+	struct ifslave __user *u_sinfo = NULL;</div><div class='add'>+	struct bond_opt_value newval;</div><div class='add'>+	struct net *net;</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(bond_dev, "bond_ioctl: cmd=%d\n", cmd);</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='ctx'> 	case SIOCBONDINFOQUERY:</div><div class='ctx'> 		u_binfo = (struct ifbond __user *)ifr-&gt;ifr_data;</div><div class='ctx'> </div><div class='hunk'>@@ -3522,7 +4492,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd</div><div class='ctx'> 			return -EFAULT;</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='del'>-	case BOND_SLAVE_INFO_QUERY_OLD:</div><div class='ctx'> 	case SIOCBONDSLAVEINFOQUERY:</div><div class='ctx'> 		u_sinfo = (struct ifslave __user *)ifr-&gt;ifr_data;</div><div class='ctx'> </div><div class='hunk'>@@ -3546,26 +4515,21 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd</div><div class='ctx'> </div><div class='ctx'> 	slave_dev = __dev_get_by_name(net, ifr-&gt;ifr_slave);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond_dev, "slave_dev=%p:\n", slave_dev);</div><div class='add'>+	slave_dbg(bond_dev, slave_dev, "slave_dev=%p:\n", slave_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!slave_dev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond_dev, "slave_dev-&gt;name=%s:\n", slave_dev-&gt;name);</div><div class='ctx'> 	switch (cmd) {</div><div class='del'>-	case BOND_ENSLAVE_OLD:</div><div class='ctx'> 	case SIOCBONDENSLAVE:</div><div class='ctx'> 		res = bond_enslave(bond_dev, slave_dev, NULL);</div><div class='ctx'> 		break;</div><div class='del'>-	case BOND_RELEASE_OLD:</div><div class='ctx'> 	case SIOCBONDRELEASE:</div><div class='ctx'> 		res = bond_release(bond_dev, slave_dev);</div><div class='ctx'> 		break;</div><div class='del'>-	case BOND_SETHWADDR_OLD:</div><div class='ctx'> 	case SIOCBONDSETHWADDR:</div><div class='ctx'> 		res = bond_set_dev_addr(bond_dev, slave_dev);</div><div class='ctx'> 		break;</div><div class='del'>-	case BOND_CHANGE_ACTIVE_OLD:</div><div class='ctx'> 	case SIOCBONDCHANGEACTIVE:</div><div class='ctx'> 		bond_opt_initstr(&amp;newval, slave_dev-&gt;name);</div><div class='ctx'> 		res = __bond_opt_set_notify(bond, BOND_OPT_ACTIVE_SLAVE,</div><div class='hunk'>@@ -3578,6 +4542,29 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bond_siocdevprivate(struct net_device *bond_dev, struct ifreq *ifr,</div><div class='add'>+			       void __user *data, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct ifreq ifrdata = { .ifr_data = data };</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case BOND_INFO_QUERY_OLD:</div><div class='add'>+		return bond_do_ioctl(bond_dev, &amp;ifrdata, SIOCBONDINFOQUERY);</div><div class='add'>+	case BOND_SLAVE_INFO_QUERY_OLD:</div><div class='add'>+		return bond_do_ioctl(bond_dev, &amp;ifrdata, SIOCBONDSLAVEINFOQUERY);</div><div class='add'>+	case BOND_ENSLAVE_OLD:</div><div class='add'>+		return bond_do_ioctl(bond_dev, ifr, SIOCBONDENSLAVE);</div><div class='add'>+	case BOND_RELEASE_OLD:</div><div class='add'>+		return bond_do_ioctl(bond_dev, ifr, SIOCBONDRELEASE);</div><div class='add'>+	case BOND_SETHWADDR_OLD:</div><div class='add'>+		return bond_do_ioctl(bond_dev, ifr, SIOCBONDSETHWADDR);</div><div class='add'>+	case BOND_CHANGE_ACTIVE_OLD:</div><div class='add'>+		return bond_do_ioctl(bond_dev, ifr, SIOCBONDCHANGEACTIVE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bond_change_rx_flags(struct net_device *bond_dev, int change)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='hunk'>@@ -3619,32 +4606,35 @@ static int bond_neigh_init(struct neighbour *n)</div><div class='ctx'> 	const struct net_device_ops *slave_ops;</div><div class='ctx'> 	struct neigh_parms parms;</div><div class='ctx'> 	struct slave *slave;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	slave = bond_first_slave(bond);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	slave = bond_first_slave_rcu(bond);</div><div class='ctx'> 	if (!slave)</div><div class='del'>-		return 0;</div><div class='add'>+		goto out;</div><div class='ctx'> 	slave_ops = slave-&gt;dev-&gt;netdev_ops;</div><div class='ctx'> 	if (!slave_ops-&gt;ndo_neigh_setup)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	parms.neigh_setup = NULL;</div><div class='del'>-	parms.neigh_cleanup = NULL;</div><div class='del'>-	ret = slave_ops-&gt;ndo_neigh_setup(slave-&gt;dev, &amp;parms);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Assign slave's neigh_cleanup to neighbour in case cleanup is called</div><div class='del'>-	 * after the last slave has been detached.  Assumes that all slaves</div><div class='del'>-	 * utilize the same neigh_cleanup (true at this writing as only user</div><div class='del'>-	 * is ipoib).</div><div class='add'>+	/* TODO: find another way [1] to implement this.</div><div class='add'>+	 * Passing a zeroed structure is fragile,</div><div class='add'>+	 * but at least we do not pass garbage.</div><div class='add'>+	 *</div><div class='add'>+	 * [1] One way would be that ndo_neigh_setup() never touch</div><div class='add'>+	 *     struct neigh_parms, but propagate the new neigh_setup()</div><div class='add'>+	 *     back to ___neigh_create() / neigh_parms_alloc()</div><div class='ctx'> 	 */</div><div class='del'>-	n-&gt;parms-&gt;neigh_cleanup = parms.neigh_cleanup;</div><div class='add'>+	memset(&amp;parms, 0, sizeof(parms));</div><div class='add'>+	ret = slave_ops-&gt;ndo_neigh_setup(slave-&gt;dev, &amp;parms);</div><div class='ctx'> </div><div class='del'>-	if (!parms.neigh_setup)</div><div class='del'>-		return 0;</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	return parms.neigh_setup(n);</div><div class='add'>+	if (parms.neigh_setup)</div><div class='add'>+		ret = parms.neigh_setup(n);</div><div class='add'>+out:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The bonding ndo_neigh_setup is called at init time beofre any</div><div class='hunk'>@@ -3676,7 +4666,7 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)</div><div class='ctx'> 	netdev_dbg(bond_dev, "bond=%p, new_mtu=%d\n", bond, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-		netdev_dbg(bond_dev, "s %p c_m %p\n",</div><div class='add'>+		slave_dbg(bond_dev, slave-&gt;dev, "s %p c_m %p\n",</div><div class='ctx'> 			   slave, slave-&gt;dev-&gt;netdev_ops-&gt;ndo_change_mtu);</div><div class='ctx'> </div><div class='ctx'> 		res = dev_set_mtu(slave-&gt;dev, new_mtu);</div><div class='hunk'>@@ -3690,13 +4680,13 @@ static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)</div><div class='ctx'> 			 * means changing their mtu from timer context, which</div><div class='ctx'> 			 * is probably not a good idea.</div><div class='ctx'> 			 */</div><div class='del'>-			netdev_dbg(bond_dev, "err %d %s\n", res,</div><div class='del'>-				   slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_dbg(bond_dev, slave-&gt;dev, "err %d setting mtu to %d\n",</div><div class='add'>+				  res, new_mtu);</div><div class='ctx'> 			goto unwind;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bond_dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(bond_dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3709,10 +4699,9 @@ unwind:</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		tmp_res = dev_set_mtu(rollback_slave-&gt;dev, bond_dev-&gt;mtu);</div><div class='del'>-		if (tmp_res) {</div><div class='del'>-			netdev_dbg(bond_dev, "unwind err %d dev %s\n",</div><div class='del'>-				   tmp_res, rollback_slave-&gt;dev-&gt;name);</div><div class='del'>-		}</div><div class='add'>+		if (tmp_res)</div><div class='add'>+			slave_dbg(bond_dev, rollback_slave-&gt;dev, "unwind err %d\n",</div><div class='add'>+				  tmp_res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='hunk'>@@ -3736,7 +4725,7 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)</div><div class='ctx'> 		return bond_alb_set_mac_address(bond_dev, addr);</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond_dev, "bond=%p\n", bond);</div><div class='add'>+	netdev_dbg(bond_dev, "%s: bond=%p\n", __func__, bond);</div><div class='ctx'> </div><div class='ctx'> 	/* If fail_over_mac is enabled, do nothing and return success.</div><div class='ctx'> 	 * Returning an error causes ifenslave to fail.</div><div class='hunk'>@@ -3749,7 +4738,8 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='del'>-		netdev_dbg(bond_dev, "slave %p %s\n", slave, slave-&gt;dev-&gt;name);</div><div class='add'>+		slave_dbg(bond_dev, slave-&gt;dev, "%s: slave=%p\n",</div><div class='add'>+			  __func__, slave);</div><div class='ctx'> 		res = dev_set_mac_address(slave-&gt;dev, addr, NULL);</div><div class='ctx'> 		if (res) {</div><div class='ctx'> 			/* TODO: consider downing the slave</div><div class='hunk'>@@ -3758,13 +4748,14 @@ static int bond_set_mac_address(struct net_device *bond_dev, void *addr)</div><div class='ctx'> 			 * breakage anyway until ARP finish</div><div class='ctx'> 			 * updating, so...</div><div class='ctx'> 			 */</div><div class='del'>-			netdev_dbg(bond_dev, "err %d %s\n", res, slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_dbg(bond_dev, slave-&gt;dev, "%s: err %d\n",</div><div class='add'>+				  __func__, res);</div><div class='ctx'> 			goto unwind;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* success */</div><div class='del'>-	memcpy(bond_dev-&gt;dev_addr, ss-&gt;__data, bond_dev-&gt;addr_len);</div><div class='add'>+	dev_addr_set(bond_dev, ss-&gt;__data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> unwind:</div><div class='hunk'>@@ -3778,11 +4769,10 @@ unwind:</div><div class='ctx'> 		if (rollback_slave == slave)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		tmp_res = dev_set_mac_address(rollback_slave-&gt;dev,</div><div class='del'>-					      (struct sockaddr *)&amp;tmp_ss, NULL);</div><div class='add'>+		tmp_res = dev_set_mac_address(rollback_slave-&gt;dev, &amp;tmp_ss, NULL);</div><div class='ctx'> 		if (tmp_res) {</div><div class='del'>-			netdev_dbg(bond_dev, "unwind err %d dev %s\n",</div><div class='del'>-				   tmp_res, rollback_slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_dbg(bond_dev, rollback_slave-&gt;dev, "%s: unwind err %d\n",</div><div class='add'>+				   __func__, tmp_res);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3790,16 +4780,15 @@ unwind:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bond_xmit_slave_id - transmit skb through slave with slave_id</div><div class='add'>+ * bond_get_slave_by_id - get xmit slave with slave_id</div><div class='ctx'>  * @bond: bonding device that is transmitting</div><div class='del'>- * @skb: buffer to transmit</div><div class='ctx'>  * @slave_id: slave id up to slave_cnt-1 through which to transmit</div><div class='ctx'>  *</div><div class='del'>- * This function tries to transmit through slave with slave_id but in case</div><div class='add'>+ * This function tries to get slave with slave_id but in case</div><div class='ctx'>  * it fails, it tries to find the first available slave for transmission.</div><div class='del'>- * The skb is consumed in all cases, thus the function is void.</div><div class='ctx'>  */</div><div class='del'>-static void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id)</div><div class='add'>+static struct slave *bond_get_slave_by_id(struct bonding *bond,</div><div class='add'>+					  int slave_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='hunk'>@@ -3808,10 +4797,8 @@ static void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int sl</div><div class='ctx'> 	/* Here we start from the slave with slave_id */</div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 		if (--i &lt; 0) {</div><div class='del'>-			if (bond_slave_can_tx(slave)) {</div><div class='del'>-				bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='add'>+			if (bond_slave_can_tx(slave))</div><div class='add'>+				return slave;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3820,13 +4807,11 @@ static void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int sl</div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 		if (--i &lt; 0)</div><div class='ctx'> 			break;</div><div class='del'>-		if (bond_slave_can_tx(slave)) {</div><div class='del'>-			bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+		if (bond_slave_can_tx(slave))</div><div class='add'>+			return slave;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* no slave that can tx has been found */</div><div class='del'>-	bond_tx_drop(bond-&gt;dev, skb);</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3845,29 +4830,28 @@ static u32 bond_rr_gen_slave_id(struct bonding *bond)</div><div class='ctx'> </div><div class='ctx'> 	switch (packets_per_slave) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		slave_id = prandom_u32();</div><div class='add'>+		slave_id = get_random_u32();</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 1:</div><div class='del'>-		slave_id = bond-&gt;rr_tx_counter;</div><div class='add'>+		slave_id = this_cpu_inc_return(*bond-&gt;rr_tx_counter);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		reciprocal_packets_per_slave =</div><div class='ctx'> 			bond-&gt;params.reciprocal_packets_per_slave;</div><div class='del'>-		slave_id = reciprocal_divide(bond-&gt;rr_tx_counter,</div><div class='add'>+		slave_id = this_cpu_inc_return(*bond-&gt;rr_tx_counter);</div><div class='add'>+		slave_id = reciprocal_divide(slave_id,</div><div class='ctx'> 					     reciprocal_packets_per_slave);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	bond-&gt;rr_tx_counter++;</div><div class='ctx'> </div><div class='ctx'> 	return slave_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static netdev_tx_t bond_xmit_roundrobin(struct sk_buff *skb,</div><div class='del'>-					struct net_device *bond_dev)</div><div class='add'>+static struct slave *bond_xmit_roundrobin_slave_get(struct bonding *bond,</div><div class='add'>+						    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	struct iphdr *iph = ip_hdr(skb);</div><div class='ctx'> 	struct slave *slave;</div><div class='add'>+	int slave_cnt;</div><div class='ctx'> 	u32 slave_id;</div><div class='ctx'> </div><div class='ctx'> 	/* Start with the curr_active_slave that joined the bond as the</div><div class='hunk'>@@ -3876,24 +4860,88 @@ static netdev_tx_t bond_xmit_roundrobin(struct sk_buff *skb,</div><div class='ctx'> 	 * send the join/membership reports.  The curr_active_slave found</div><div class='ctx'> 	 * will send all of this type of traffic.</div><div class='ctx'> 	 */</div><div class='del'>-	if (iph-&gt;protocol == IPPROTO_IGMP &amp;&amp; skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-		slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='del'>-		if (slave)</div><div class='del'>-			bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='del'>-		else</div><div class='del'>-			bond_xmit_slave_id(bond, skb, 0);</div><div class='del'>-	} else {</div><div class='del'>-		int slave_cnt = READ_ONCE(bond-&gt;slave_cnt);</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+		int noff = skb_network_offset(skb);</div><div class='add'>+		struct iphdr *iph;</div><div class='ctx'> </div><div class='del'>-		if (likely(slave_cnt)) {</div><div class='del'>-			slave_id = bond_rr_gen_slave_id(bond);</div><div class='del'>-			bond_xmit_slave_id(bond, skb, slave_id % slave_cnt);</div><div class='del'>-		} else {</div><div class='del'>-			bond_tx_drop(bond_dev, skb);</div><div class='add'>+		if (unlikely(!pskb_may_pull(skb, noff + sizeof(*iph))))</div><div class='add'>+			goto non_igmp;</div><div class='add'>+</div><div class='add'>+		iph = ip_hdr(skb);</div><div class='add'>+		if (iph-&gt;protocol == IPPROTO_IGMP) {</div><div class='add'>+			slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+			if (slave)</div><div class='add'>+				return slave;</div><div class='add'>+			return bond_get_slave_by_id(bond, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+non_igmp:</div><div class='add'>+	slave_cnt = READ_ONCE(bond-&gt;slave_cnt);</div><div class='add'>+	if (likely(slave_cnt)) {</div><div class='add'>+		slave_id = bond_rr_gen_slave_id(bond) % slave_cnt;</div><div class='add'>+		return bond_get_slave_by_id(bond, slave_id);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct slave *bond_xdp_xmit_roundrobin_slave_get(struct bonding *bond,</div><div class='add'>+							struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	int slave_cnt;</div><div class='add'>+	u32 slave_id;</div><div class='add'>+	const struct ethhdr *eth;</div><div class='add'>+	void *data = xdp-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (data + sizeof(struct ethhdr) &gt; xdp-&gt;data_end)</div><div class='add'>+		goto non_igmp;</div><div class='add'>+</div><div class='add'>+	eth = (struct ethhdr *)data;</div><div class='add'>+	data += sizeof(struct ethhdr);</div><div class='add'>+</div><div class='add'>+	/* See comment on IGMP in bond_xmit_roundrobin_slave_get() */</div><div class='add'>+	if (eth-&gt;h_proto == htons(ETH_P_IP)) {</div><div class='add'>+		const struct iphdr *iph;</div><div class='add'>+</div><div class='add'>+		if (data + sizeof(struct iphdr) &gt; xdp-&gt;data_end)</div><div class='add'>+			goto non_igmp;</div><div class='add'>+</div><div class='add'>+		iph = (struct iphdr *)data;</div><div class='add'>+</div><div class='add'>+		if (iph-&gt;protocol == IPPROTO_IGMP) {</div><div class='add'>+			slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+			if (slave)</div><div class='add'>+				return slave;</div><div class='add'>+			return bond_get_slave_by_id(bond, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+non_igmp:</div><div class='add'>+	slave_cnt = READ_ONCE(bond-&gt;slave_cnt);</div><div class='add'>+	if (likely(slave_cnt)) {</div><div class='add'>+		slave_id = bond_rr_gen_slave_id(bond) % slave_cnt;</div><div class='add'>+		return bond_get_slave_by_id(bond, slave_id);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t bond_xmit_roundrobin(struct sk_buff *skb,</div><div class='add'>+					struct net_device *bond_dev)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	slave = bond_xmit_roundrobin_slave_get(bond, skb);</div><div class='add'>+	if (likely(slave))</div><div class='add'>+		return bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return bond_tx_drop(bond_dev, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct slave *bond_xmit_activebackup_slave_get(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	return rcu_dereference(bond-&gt;curr_active_slave);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* In active-backup mode, we know that bond-&gt;curr_active_slave is always valid if</div><div class='hunk'>@@ -3905,13 +4953,11 @@ static netdev_tx_t bond_xmit_activebackup(struct sk_buff *skb,</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> </div><div class='del'>-	slave = rcu_dereference(bond-&gt;curr_active_slave);</div><div class='add'>+	slave = bond_xmit_activebackup_slave_get(bond);</div><div class='ctx'> 	if (slave)</div><div class='del'>-		bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='del'>-	else</div><div class='del'>-		bond_tx_drop(bond_dev, skb);</div><div class='add'>+		return bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+	return bond_tx_drop(bond_dev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Use this to update slave_array when (a) it's not appropriate to update</div><div class='hunk'>@@ -3945,6 +4991,49 @@ err:</div><div class='ctx'> 	bond_slave_arr_work_rearm(bond, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bond_skip_slave(struct bond_up_slave *slaves,</div><div class='add'>+			    struct slave *skipslave)</div><div class='add'>+{</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	/* Rare situation where caller has asked to skip a specific</div><div class='add'>+	 * slave but allocation failed (most likely!). BTW this is</div><div class='add'>+	 * only possible when the call is initiated from</div><div class='add'>+	 * __bond_release_one(). In this situation; overwrite the</div><div class='add'>+	 * skipslave entry in the array with the last entry from the</div><div class='add'>+	 * array to avoid a situation where the xmit path may choose</div><div class='add'>+	 * this to-be-skipped slave to send a packet out.</div><div class='add'>+	 */</div><div class='add'>+	for (idx = 0; slaves &amp;&amp; idx &lt; slaves-&gt;count; idx++) {</div><div class='add'>+		if (skipslave == slaves-&gt;arr[idx]) {</div><div class='add'>+			slaves-&gt;arr[idx] =</div><div class='add'>+				slaves-&gt;arr[slaves-&gt;count - 1];</div><div class='add'>+			slaves-&gt;count--;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_set_slave_arr(struct bonding *bond,</div><div class='add'>+			       struct bond_up_slave *usable_slaves,</div><div class='add'>+			       struct bond_up_slave *all_slaves)</div><div class='add'>+{</div><div class='add'>+	struct bond_up_slave *usable, *all;</div><div class='add'>+</div><div class='add'>+	usable = rtnl_dereference(bond-&gt;usable_slaves);</div><div class='add'>+	rcu_assign_pointer(bond-&gt;usable_slaves, usable_slaves);</div><div class='add'>+	kfree_rcu(usable, rcu);</div><div class='add'>+</div><div class='add'>+	all = rtnl_dereference(bond-&gt;all_slaves);</div><div class='add'>+	rcu_assign_pointer(bond-&gt;all_slaves, all_slaves);</div><div class='add'>+	kfree_rcu(all, rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_reset_slave_arr(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	bond_set_slave_arr(bond, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Build the usable slaves array in control path for modes that use xmit-hash</div><div class='ctx'>  * to determine the slave interface -</div><div class='ctx'>  * (a) BOND_MODE_8023AD</div><div class='hunk'>@@ -3955,42 +5044,43 @@ err:</div><div class='ctx'>  */</div><div class='ctx'> int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)</div><div class='ctx'> {</div><div class='add'>+	struct bond_up_slave *usable_slaves = NULL, *all_slaves = NULL;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	struct list_head *iter;</div><div class='del'>-	struct bond_up_slave *new_arr, *old_arr;</div><div class='ctx'> 	int agg_id = 0;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_LOCKDEP</div><div class='del'>-	WARN_ON(lockdep_is_held(&amp;bond-&gt;mode_lock));</div><div class='del'>-#endif</div><div class='add'>+	might_sleep();</div><div class='ctx'> </div><div class='del'>-	new_arr = kzalloc(offsetof(struct bond_up_slave, arr[bond-&gt;slave_cnt]),</div><div class='del'>-			  GFP_KERNEL);</div><div class='del'>-	if (!new_arr) {</div><div class='add'>+	usable_slaves = kzalloc(struct_size(usable_slaves, arr,</div><div class='add'>+					    bond-&gt;slave_cnt), GFP_KERNEL);</div><div class='add'>+	all_slaves = kzalloc(struct_size(all_slaves, arr,</div><div class='add'>+					 bond-&gt;slave_cnt), GFP_KERNEL);</div><div class='add'>+	if (!usable_slaves || !all_slaves) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='del'>-		pr_err("Failed to build slave-array.\n");</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='ctx'> </div><div class='add'>+		spin_lock_bh(&amp;bond-&gt;mode_lock);</div><div class='ctx'> 		if (bond_3ad_get_active_agg_info(bond, &amp;ad_info)) {</div><div class='add'>+			spin_unlock_bh(&amp;bond-&gt;mode_lock);</div><div class='ctx'> 			pr_debug("bond_3ad_get_active_agg_info failed\n");</div><div class='del'>-			kfree_rcu(new_arr, rcu);</div><div class='ctx'> 			/* No active aggragator means it's not safe to use</div><div class='ctx'> 			 * the previous array.</div><div class='ctx'> 			 */</div><div class='del'>-			old_arr = rtnl_dereference(bond-&gt;slave_arr);</div><div class='del'>-			if (old_arr) {</div><div class='del'>-				RCU_INIT_POINTER(bond-&gt;slave_arr, NULL);</div><div class='del'>-				kfree_rcu(old_arr, rcu);</div><div class='del'>-			}</div><div class='add'>+			bond_reset_slave_arr(bond);</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='add'>+		spin_unlock_bh(&amp;bond-&gt;mode_lock);</div><div class='ctx'> 		agg_id = ad_info.aggregator_id;</div><div class='ctx'> 	}</div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+		if (skipslave == slave)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		all_slaves-&gt;arr[all_slaves-&gt;count++] = slave;</div><div class='ctx'> 		if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 			struct aggregator *agg;</div><div class='ctx'> </div><div class='hunk'>@@ -4000,45 +5090,92 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!bond_slave_can_tx(slave))</div><div class='ctx'> 			continue;</div><div class='del'>-		if (skipslave == slave)</div><div class='del'>-			continue;</div><div class='ctx'> </div><div class='del'>-		netdev_dbg(bond-&gt;dev,</div><div class='del'>-			   "Adding slave dev %s to tx hash array[%d]\n",</div><div class='del'>-			   slave-&gt;dev-&gt;name, new_arr-&gt;count);</div><div class='add'>+		slave_dbg(bond-&gt;dev, slave-&gt;dev, "Adding slave to tx hash array[%d]\n",</div><div class='add'>+			  usable_slaves-&gt;count);</div><div class='ctx'> </div><div class='del'>-		new_arr-&gt;arr[new_arr-&gt;count++] = slave;</div><div class='add'>+		usable_slaves-&gt;arr[usable_slaves-&gt;count++] = slave;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	old_arr = rtnl_dereference(bond-&gt;slave_arr);</div><div class='del'>-	rcu_assign_pointer(bond-&gt;slave_arr, new_arr);</div><div class='del'>-	if (old_arr)</div><div class='del'>-		kfree_rcu(old_arr, rcu);</div><div class='add'>+	bond_set_slave_arr(bond, usable_slaves, all_slaves);</div><div class='add'>+	return ret;</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret != 0 &amp;&amp; skipslave) {</div><div class='del'>-		int idx;</div><div class='del'>-</div><div class='del'>-		/* Rare situation where caller has asked to skip a specific</div><div class='del'>-		 * slave but allocation failed (most likely!). BTW this is</div><div class='del'>-		 * only possible when the call is initiated from</div><div class='del'>-		 * __bond_release_one(). In this situation; overwrite the</div><div class='del'>-		 * skipslave entry in the array with the last entry from the</div><div class='del'>-		 * array to avoid a situation where the xmit path may choose</div><div class='del'>-		 * this to-be-skipped slave to send a packet out.</div><div class='del'>-		 */</div><div class='del'>-		old_arr = rtnl_dereference(bond-&gt;slave_arr);</div><div class='del'>-		for (idx = 0; idx &lt; old_arr-&gt;count; idx++) {</div><div class='del'>-			if (skipslave == old_arr-&gt;arr[idx]) {</div><div class='del'>-				old_arr-&gt;arr[idx] =</div><div class='del'>-				    old_arr-&gt;arr[old_arr-&gt;count-1];</div><div class='del'>-				old_arr-&gt;count--;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		bond_skip_slave(rtnl_dereference(bond-&gt;all_slaves),</div><div class='add'>+				skipslave);</div><div class='add'>+		bond_skip_slave(rtnl_dereference(bond-&gt;usable_slaves),</div><div class='add'>+				skipslave);</div><div class='ctx'> 	}</div><div class='add'>+	kfree_rcu(all_slaves, rcu);</div><div class='add'>+	kfree_rcu(usable_slaves, rcu);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct slave *bond_xmit_3ad_xor_slave_get(struct bonding *bond,</div><div class='add'>+						 struct sk_buff *skb,</div><div class='add'>+						 struct bond_up_slave *slaves)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	hash = bond_xmit_hash(bond, skb);</div><div class='add'>+	count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='add'>+	if (unlikely(!count))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	slave = slaves-&gt;arr[hash % count];</div><div class='add'>+	return slave;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct slave *bond_xdp_xmit_3ad_xor_slave_get(struct bonding *bond,</div><div class='add'>+						     struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct bond_up_slave *slaves;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	hash = bond_xmit_hash_xdp(bond, xdp);</div><div class='add'>+	slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='add'>+	count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='add'>+	if (unlikely(!count))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return slaves-&gt;arr[hash % count];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bond_should_broadcast_neighbor(struct sk_buff *skb,</div><div class='add'>+					   struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(dev);</div><div class='add'>+	struct {</div><div class='add'>+		struct ipv6hdr ip6;</div><div class='add'>+		struct icmp6hdr icmp6;</div><div class='add'>+	} *combined, _combined;</div><div class='add'>+</div><div class='add'>+	if (!static_branch_unlikely(&amp;bond_bcast_neigh_enabled))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!bond-&gt;params.broadcast_neighbor)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_ARP))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		combined = skb_header_pointer(skb, skb_mac_header_len(skb),</div><div class='add'>+					      sizeof(_combined),</div><div class='add'>+					      &amp;_combined);</div><div class='add'>+		if (combined &amp;&amp; combined-&gt;ip6.nexthdr == NEXTHDR_ICMP &amp;&amp;</div><div class='add'>+		    (combined-&gt;icmp6.icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||</div><div class='add'>+		     combined-&gt;icmp6.icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Use this Xmit function for 3AD as well as XOR modes. The current</div><div class='ctx'>  * usable slave array is formed in the control path. The xmit function</div><div class='ctx'>  * just calculates hash and sends the packet out.</div><div class='hunk'>@@ -4047,50 +5184,67 @@ static netdev_tx_t bond_3ad_xor_xmit(struct sk_buff *skb,</div><div class='ctx'> 				     struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(dev);</div><div class='del'>-	struct slave *slave;</div><div class='ctx'> 	struct bond_up_slave *slaves;</div><div class='del'>-	unsigned int count;</div><div class='add'>+	struct slave *slave;</div><div class='ctx'> </div><div class='del'>-	slaves = rcu_dereference(bond-&gt;slave_arr);</div><div class='del'>-	count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='del'>-	if (likely(count)) {</div><div class='del'>-		slave = slaves-&gt;arr[bond_xmit_hash(bond, skb) % count];</div><div class='del'>-		bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='del'>-	} else {</div><div class='del'>-		bond_tx_drop(dev, skb);</div><div class='del'>-	}</div><div class='add'>+	slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='add'>+	slave = bond_xmit_3ad_xor_slave_get(bond, skb, slaves);</div><div class='add'>+	if (likely(slave))</div><div class='add'>+		return bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+	return bond_tx_drop(dev, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* in broadcast mode, we send everything to all usable interfaces. */</div><div class='add'>+/* in broadcast mode, we send everything to all or usable slave interfaces.</div><div class='add'>+ * under rcu_read_lock when this function is called.</div><div class='add'>+ */</div><div class='ctx'> static netdev_tx_t bond_xmit_broadcast(struct sk_buff *skb,</div><div class='del'>-				       struct net_device *bond_dev)</div><div class='add'>+				       struct net_device *bond_dev,</div><div class='add'>+				       bool all_slaves)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	struct slave *slave = NULL;</div><div class='del'>-	struct list_head *iter;</div><div class='add'>+	struct bond_up_slave *slaves;</div><div class='add'>+	bool xmit_suc = false;</div><div class='add'>+	bool skb_used = false;</div><div class='add'>+	int slaves_count, i;</div><div class='ctx'> </div><div class='del'>-	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='del'>-		if (bond_is_last_slave(bond, slave))</div><div class='del'>-			break;</div><div class='del'>-		if (bond_slave_is_up(slave) &amp;&amp; slave-&gt;link == BOND_LINK_UP) {</div><div class='del'>-			struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='add'>+	if (all_slaves)</div><div class='add'>+		slaves = rcu_dereference(bond-&gt;all_slaves);</div><div class='add'>+	else</div><div class='add'>+		slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='add'>+</div><div class='add'>+	slaves_count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='add'>+	for (i = 0; i &lt; slaves_count; i++) {</div><div class='add'>+		struct slave *slave = slaves-&gt;arr[i];</div><div class='add'>+		struct sk_buff *skb2;</div><div class='add'>+</div><div class='add'>+		if (!(bond_slave_is_up(slave) &amp;&amp; slave-&gt;link == BOND_LINK_UP))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='add'>+		if (bond_is_last_slave(bond, slave)) {</div><div class='add'>+			skb2 = skb;</div><div class='add'>+			skb_used = true;</div><div class='add'>+		} else {</div><div class='add'>+			skb2 = skb_clone(skb, GFP_ATOMIC);</div><div class='ctx'> 			if (!skb2) {</div><div class='ctx'> 				net_err_ratelimited("%s: Error: %s: skb_clone() failed\n",</div><div class='ctx'> 						    bond_dev-&gt;name, __func__);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='del'>-			bond_dev_queue_xmit(bond, skb2, slave-&gt;dev);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (bond_dev_queue_xmit(bond, skb2, slave-&gt;dev) == NETDEV_TX_OK)</div><div class='add'>+			xmit_suc = true;</div><div class='ctx'> 	}</div><div class='del'>-	if (slave &amp;&amp; bond_slave_is_up(slave) &amp;&amp; slave-&gt;link == BOND_LINK_UP)</div><div class='del'>-		bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='del'>-	else</div><div class='del'>-		bond_tx_drop(bond_dev, skb);</div><div class='ctx'> </div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+	if (!skb_used)</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	if (xmit_suc)</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	dev_core_stats_tx_dropped_inc(bond_dev);</div><div class='add'>+	return NET_XMIT_DROP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*------------------------- Device initialization ---------------------------*/</div><div class='hunk'>@@ -4107,7 +5261,7 @@ static inline int bond_slave_override(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> 	/* Find out if any slaves have the same mapping as this skb. */</div><div class='ctx'> 	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='del'>-		if (slave-&gt;queue_id == skb_get_queue_mapping(skb)) {</div><div class='add'>+		if (READ_ONCE(slave-&gt;queue_id) == skb_get_queue_mapping(skb)) {</div><div class='ctx'> 			if (bond_slave_is_up(slave) &amp;&amp;</div><div class='ctx'> 			    slave-&gt;link == BOND_LINK_UP) {</div><div class='ctx'> 				bond_dev_queue_xmit(bond, skb, slave-&gt;dev);</div><div class='hunk'>@@ -4143,6 +5297,143 @@ static u16 bond_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	return txq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_device *bond_xmit_get_slave(struct net_device *master_dev,</div><div class='add'>+					      struct sk_buff *skb,</div><div class='add'>+					      bool all_slaves)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(master_dev);</div><div class='add'>+	struct bond_up_slave *slaves;</div><div class='add'>+	struct slave *slave = NULL;</div><div class='add'>+</div><div class='add'>+	switch (BOND_MODE(bond)) {</div><div class='add'>+	case BOND_MODE_ROUNDROBIN:</div><div class='add'>+		slave = bond_xmit_roundrobin_slave_get(bond, skb);</div><div class='add'>+		break;</div><div class='add'>+	case BOND_MODE_ACTIVEBACKUP:</div><div class='add'>+		slave = bond_xmit_activebackup_slave_get(bond);</div><div class='add'>+		break;</div><div class='add'>+	case BOND_MODE_8023AD:</div><div class='add'>+	case BOND_MODE_XOR:</div><div class='add'>+		if (all_slaves)</div><div class='add'>+			slaves = rcu_dereference(bond-&gt;all_slaves);</div><div class='add'>+		else</div><div class='add'>+			slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='add'>+		slave = bond_xmit_3ad_xor_slave_get(bond, skb, slaves);</div><div class='add'>+		break;</div><div class='add'>+	case BOND_MODE_BROADCAST:</div><div class='add'>+		break;</div><div class='add'>+	case BOND_MODE_ALB:</div><div class='add'>+		slave = bond_xmit_alb_slave_get(bond, skb);</div><div class='add'>+		break;</div><div class='add'>+	case BOND_MODE_TLB:</div><div class='add'>+		slave = bond_xmit_tlb_slave_get(bond, skb);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Should never happen, mode already checked */</div><div class='add'>+		WARN_ONCE(true, "Unknown bonding mode");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slave)</div><div class='add'>+		return slave-&gt;dev;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bond_sk_to_flow(struct sock *sk, struct flow_keys *flow)</div><div class='add'>+{</div><div class='add'>+	switch (sk-&gt;sk_family) {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case AF_INET6:</div><div class='add'>+		if (ipv6_only_sock(sk) ||</div><div class='add'>+		    ipv6_addr_type(&amp;sk-&gt;sk_v6_daddr) != IPV6_ADDR_MAPPED) {</div><div class='add'>+			flow-&gt;control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='add'>+			flow-&gt;addrs.v6addrs.src = inet6_sk(sk)-&gt;saddr;</div><div class='add'>+			flow-&gt;addrs.v6addrs.dst = sk-&gt;sk_v6_daddr;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+#endif</div><div class='add'>+	default: /* AF_INET */</div><div class='add'>+		flow-&gt;control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+		flow-&gt;addrs.v4addrs.src = inet_sk(sk)-&gt;inet_rcv_saddr;</div><div class='add'>+		flow-&gt;addrs.v4addrs.dst = inet_sk(sk)-&gt;inet_daddr;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow-&gt;ports.src = inet_sk(sk)-&gt;inet_sport;</div><div class='add'>+	flow-&gt;ports.dst = inet_sk(sk)-&gt;inet_dport;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * bond_sk_hash_l34 - generate a hash value based on the socket's L3 and L4 fields</div><div class='add'>+ * @sk: socket to use for headers</div><div class='add'>+ *</div><div class='add'>+ * This function will extract the necessary field from the socket and use</div><div class='add'>+ * them to generate a hash based on the LAYER34 xmit_policy.</div><div class='add'>+ * Assumes that sk is a TCP or UDP socket.</div><div class='add'>+ */</div><div class='add'>+static u32 bond_sk_hash_l34(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct flow_keys flow;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	bond_sk_to_flow(sk, &amp;flow);</div><div class='add'>+</div><div class='add'>+	/* L4 */</div><div class='add'>+	memcpy(&amp;hash, &amp;flow.ports.ports, sizeof(hash));</div><div class='add'>+	/* L3 */</div><div class='add'>+	return bond_ip_hash(hash, &amp;flow, BOND_XMIT_POLICY_LAYER34);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *__bond_sk_get_lower_dev(struct bonding *bond,</div><div class='add'>+						  struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct bond_up_slave *slaves;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	slaves = rcu_dereference(bond-&gt;usable_slaves);</div><div class='add'>+	count = slaves ? READ_ONCE(slaves-&gt;count) : 0;</div><div class='add'>+	if (unlikely(!count))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	hash = bond_sk_hash_l34(sk);</div><div class='add'>+	slave = slaves-&gt;arr[hash % count];</div><div class='add'>+</div><div class='add'>+	return slave-&gt;dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *bond_sk_get_lower_dev(struct net_device *dev,</div><div class='add'>+						struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(dev);</div><div class='add'>+	struct net_device *lower = NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	if (bond_sk_check(bond))</div><div class='add'>+		lower = __bond_sk_get_lower_dev(bond, sk);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return lower;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_TLS_DEVICE)</div><div class='add'>+static netdev_tx_t bond_tls_device_xmit(struct bonding *bond, struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *tls_netdev = rcu_dereference(tls_get_ctx(skb-&gt;sk)-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	/* tls_netdev might become NULL, even if tls_is_skb_tx_device_offloaded</div><div class='add'>+	 * was true, if tls_device_down is running in parallel, but it's OK,</div><div class='add'>+	 * because bond_get_slave_by_dev has a NULL check.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(bond_get_slave_by_dev(bond, tls_netdev)))</div><div class='add'>+		return bond_dev_queue_xmit(bond, skb, tls_netdev);</div><div class='add'>+	return bond_tx_drop(dev, skb);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(dev);</div><div class='hunk'>@@ -4151,16 +5442,24 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev</div><div class='ctx'> 	    !bond_slave_override(bond, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_TLS_DEVICE)</div><div class='add'>+	if (tls_is_skb_tx_device_offloaded(skb))</div><div class='add'>+		return bond_tls_device_xmit(bond, skb, dev);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	switch (BOND_MODE(bond)) {</div><div class='ctx'> 	case BOND_MODE_ROUNDROBIN:</div><div class='ctx'> 		return bond_xmit_roundrobin(skb, dev);</div><div class='ctx'> 	case BOND_MODE_ACTIVEBACKUP:</div><div class='ctx'> 		return bond_xmit_activebackup(skb, dev);</div><div class='ctx'> 	case BOND_MODE_8023AD:</div><div class='add'>+		if (bond_should_broadcast_neighbor(skb, dev))</div><div class='add'>+			return bond_xmit_broadcast(skb, dev, false);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BOND_MODE_XOR:</div><div class='ctx'> 		return bond_3ad_xor_xmit(skb, dev);</div><div class='ctx'> 	case BOND_MODE_BROADCAST:</div><div class='del'>-		return bond_xmit_broadcast(skb, dev);</div><div class='add'>+		return bond_xmit_broadcast(skb, dev, true);</div><div class='ctx'> 	case BOND_MODE_ALB:</div><div class='ctx'> 		return bond_alb_xmit(skb, dev);</div><div class='ctx'> 	case BOND_MODE_TLB:</div><div class='hunk'>@@ -4169,8 +5468,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev</div><div class='ctx'> 		/* Should never happen, mode already checked */</div><div class='ctx'> 		netdev_err(dev, "Unknown bonding mode %d\n", BOND_MODE(bond));</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='del'>-		bond_tx_drop(dev, skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='add'>+		return bond_tx_drop(dev, skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4189,19 +5487,258 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (bond_has_slaves(bond))</div><div class='ctx'> 		ret = __bond_start_xmit(skb, dev);</div><div class='ctx'> 	else</div><div class='del'>-		bond_tx_drop(dev, skb);</div><div class='add'>+		ret = bond_tx_drop(dev, skb);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct net_device *</div><div class='add'>+bond_xdp_get_xmit_slave(struct net_device *bond_dev, struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	/* Caller needs to hold rcu_read_lock() */</div><div class='add'>+</div><div class='add'>+	switch (BOND_MODE(bond)) {</div><div class='add'>+	case BOND_MODE_ROUNDROBIN:</div><div class='add'>+		slave = bond_xdp_xmit_roundrobin_slave_get(bond, xdp);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BOND_MODE_ACTIVEBACKUP:</div><div class='add'>+		slave = bond_xmit_activebackup_slave_get(bond);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BOND_MODE_8023AD:</div><div class='add'>+	case BOND_MODE_XOR:</div><div class='add'>+		slave = bond_xdp_xmit_3ad_xor_slave_get(bond, xdp);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(bond_dev, "Unknown bonding mode %d for xdp xmit\n",</div><div class='add'>+				   BOND_MODE(bond));</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (slave)</div><div class='add'>+		return slave-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_xdp_xmit(struct net_device *bond_dev,</div><div class='add'>+			 int n, struct xdp_frame **frames, u32 flags)</div><div class='add'>+{</div><div class='add'>+	int nxmit, err = -ENXIO;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	for (nxmit = 0; nxmit &lt; n; nxmit++) {</div><div class='add'>+		struct xdp_frame *frame = frames[nxmit];</div><div class='add'>+		struct xdp_frame *frames1[] = {frame};</div><div class='add'>+		struct net_device *slave_dev;</div><div class='add'>+		struct xdp_buff xdp;</div><div class='add'>+</div><div class='add'>+		xdp_convert_frame_to_buff(frame, &amp;xdp);</div><div class='add'>+</div><div class='add'>+		slave_dev = bond_xdp_get_xmit_slave(bond_dev, &amp;xdp);</div><div class='add'>+		if (!slave_dev) {</div><div class='add'>+			err = -ENXIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = slave_dev-&gt;netdev_ops-&gt;ndo_xdp_xmit(slave_dev, 1, frames1, flags);</div><div class='add'>+		if (err &lt; 1)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	/* If error happened on the first frame then we can pass the error up, otherwise</div><div class='add'>+	 * report the number of frames that were xmitted.</div><div class='add'>+	 */</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return (nxmit == 0 ? err : nxmit);</div><div class='add'>+</div><div class='add'>+	return nxmit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(dev);</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	struct slave *slave, *rollback_slave;</div><div class='add'>+	struct bpf_prog *old_prog;</div><div class='add'>+	struct netdev_bpf xdp = {</div><div class='add'>+		.command = XDP_SETUP_PROG,</div><div class='add'>+		.flags   = 0,</div><div class='add'>+		.prog    = prog,</div><div class='add'>+		.extack  = extack,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (!bond_xdp_check(bond, BOND_MODE(bond))) {</div><div class='add'>+		BOND_NL_ERR(dev, extack,</div><div class='add'>+			    "No native XDP support for the current bonding mode");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_prog = bond-&gt;xdp_prog;</div><div class='add'>+	bond-&gt;xdp_prog = prog;</div><div class='add'>+</div><div class='add'>+	bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+		struct net_device *slave_dev = slave-&gt;dev;</div><div class='add'>+</div><div class='add'>+		if (!slave_dev-&gt;netdev_ops-&gt;ndo_bpf ||</div><div class='add'>+		    !slave_dev-&gt;netdev_ops-&gt;ndo_xdp_xmit) {</div><div class='add'>+			SLAVE_NL_ERR(dev, slave_dev, extack,</div><div class='add'>+				     "Slave device does not support XDP");</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dev_xdp_prog_count(slave_dev) &gt; 0) {</div><div class='add'>+			SLAVE_NL_ERR(dev, slave_dev, extack,</div><div class='add'>+				     "Slave has XDP program loaded, please unload before enslaving");</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dev_xdp_propagate(slave_dev, &amp;xdp);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			/* ndo_bpf() sets extack error message */</div><div class='add'>+			slave_err(dev, slave_dev, "Error %d calling ndo_bpf\n", err);</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+		if (prog)</div><div class='add'>+			bpf_prog_inc(prog);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (prog) {</div><div class='add'>+		static_branch_inc(&amp;bpf_master_redirect_enabled_key);</div><div class='add'>+	} else if (old_prog) {</div><div class='add'>+		bpf_prog_put(old_prog);</div><div class='add'>+		static_branch_dec(&amp;bpf_master_redirect_enabled_key);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	/* unwind the program changes */</div><div class='add'>+	bond-&gt;xdp_prog = old_prog;</div><div class='add'>+	xdp.prog = old_prog;</div><div class='add'>+	xdp.extack = NULL; /* do not overwrite original error */</div><div class='add'>+</div><div class='add'>+	bond_for_each_slave(bond, rollback_slave, iter) {</div><div class='add'>+		struct net_device *slave_dev = rollback_slave-&gt;dev;</div><div class='add'>+		int err_unwind;</div><div class='add'>+</div><div class='add'>+		if (slave == rollback_slave)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err_unwind = dev_xdp_propagate(slave_dev, &amp;xdp);</div><div class='add'>+		if (err_unwind &lt; 0)</div><div class='add'>+			slave_err(dev, slave_dev,</div><div class='add'>+				  "Error %d when unwinding XDP program change\n", err_unwind);</div><div class='add'>+		else if (xdp.prog)</div><div class='add'>+			bpf_prog_inc(xdp.prog);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_xdp(struct net_device *dev, struct netdev_bpf *xdp)</div><div class='add'>+{</div><div class='add'>+	switch (xdp-&gt;command) {</div><div class='add'>+	case XDP_SETUP_PROG:</div><div class='add'>+		return bond_xdp_set(dev, xdp-&gt;prog, xdp-&gt;extack);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bond_mode_bcast_speed(struct slave *slave, u32 speed)</div><div class='add'>+{</div><div class='add'>+	if (speed == 0 || speed == SPEED_UNKNOWN)</div><div class='add'>+		speed = slave-&gt;speed;</div><div class='add'>+	else</div><div class='add'>+		speed = min(speed, slave-&gt;speed);</div><div class='add'>+</div><div class='add'>+	return speed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set the BOND_PHC_INDEX flag to notify user space */</div><div class='add'>+static int bond_set_phc_index_flag(struct kernel_hwtstamp_config *kernel_cfg)</div><div class='add'>+{</div><div class='add'>+	struct ifreq *ifr = kernel_cfg-&gt;ifr;</div><div class='add'>+	struct hwtstamp_config cfg;</div><div class='add'>+</div><div class='add'>+	if (kernel_cfg-&gt;copied_to_user) {</div><div class='add'>+		/* Lower device has a legacy implementation */</div><div class='add'>+		if (copy_from_user(&amp;cfg, ifr-&gt;ifr_data, sizeof(cfg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+</div><div class='add'>+		cfg.flags |= HWTSTAMP_FLAG_BONDED_PHC_INDEX;</div><div class='add'>+		if (copy_to_user(ifr-&gt;ifr_data, &amp;cfg, sizeof(cfg)))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+	} else {</div><div class='add'>+		kernel_cfg-&gt;flags |= HWTSTAMP_FLAG_BONDED_PHC_INDEX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(dev);</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	real_dev = bond_option_active_slave_get_rcu(bond);</div><div class='add'>+	if (!real_dev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = generic_hwtstamp_get_lower(real_dev, cfg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return bond_set_phc_index_flag(cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *cfg,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(dev);</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(cfg-&gt;flags &amp; HWTSTAMP_FLAG_BONDED_PHC_INDEX))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	real_dev = bond_option_active_slave_get_rcu(bond);</div><div class='add'>+	if (!real_dev)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = generic_hwtstamp_set_lower(real_dev, cfg, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return bond_set_phc_index_flag(cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,</div><div class='ctx'> 					   struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='del'>-	unsigned long speed = 0;</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='add'>+	u32 speed = 0;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;base.duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> 	cmd-&gt;base.port = PORT_OTHER;</div><div class='hunk'>@@ -4213,8 +5750,14 @@ static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,</div><div class='ctx'> 	 */</div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='ctx'> 		if (bond_slave_can_tx(slave)) {</div><div class='del'>-			if (slave-&gt;speed != SPEED_UNKNOWN)</div><div class='del'>-				speed += slave-&gt;speed;</div><div class='add'>+			bond_update_speed_duplex(slave);</div><div class='add'>+			if (slave-&gt;speed != SPEED_UNKNOWN) {</div><div class='add'>+				if (BOND_MODE(bond) == BOND_MODE_BROADCAST)</div><div class='add'>+					speed = bond_mode_bcast_speed(slave,</div><div class='add'>+								      speed);</div><div class='add'>+				else</div><div class='add'>+					speed += slave-&gt;speed;</div><div class='add'>+			}</div><div class='ctx'> 			if (cmd-&gt;base.duplex == DUPLEX_UNKNOWN &amp;&amp;</div><div class='ctx'> 			    slave-&gt;duplex != DUPLEX_UNKNOWN)</div><div class='ctx'> 				cmd-&gt;base.duplex = slave-&gt;duplex;</div><div class='hunk'>@@ -4228,16 +5771,57 @@ static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev,</div><div class='ctx'> static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,</div><div class='ctx'> 				     struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strscpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='ctx'> 	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version), "%d",</div><div class='ctx'> 		 BOND_ABI_VERSION);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bond_ethtool_get_ts_info(struct net_device *bond_dev,</div><div class='add'>+				    struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct kernel_ethtool_ts_info ts_info;</div><div class='add'>+	struct net_device *real_dev;</div><div class='add'>+	bool sw_tx_support = false;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	real_dev = bond_option_active_slave_get_rcu(bond);</div><div class='add'>+	dev_hold(real_dev);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	if (real_dev) {</div><div class='add'>+		ret = ethtool_get_ts_info_by_layer(real_dev, info);</div><div class='add'>+	} else {</div><div class='add'>+		/* Check if all slaves support software tx timestamping */</div><div class='add'>+		rcu_read_lock();</div><div class='add'>+		bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='add'>+			ret = ethtool_get_ts_info_by_layer(slave-&gt;dev, &amp;ts_info);</div><div class='add'>+			if (!ret &amp;&amp; (ts_info.so_timestamping &amp; SOF_TIMESTAMPING_TX_SOFTWARE)) {</div><div class='add'>+				sw_tx_support = true;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sw_tx_support = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sw_tx_support)</div><div class='add'>+		info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	dev_put(real_dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops bond_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo		= bond_ethtool_get_drvinfo,</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='ctx'> 	.get_link_ksettings	= bond_ethtool_get_link_ksettings,</div><div class='add'>+	.get_ts_info		= bond_ethtool_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops bond_netdev_ops = {</div><div class='hunk'>@@ -4248,7 +5832,9 @@ static const struct net_device_ops bond_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= bond_start_xmit,</div><div class='ctx'> 	.ndo_select_queue	= bond_select_queue,</div><div class='ctx'> 	.ndo_get_stats64	= bond_get_stats,</div><div class='del'>-	.ndo_do_ioctl		= bond_do_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= bond_eth_ioctl,</div><div class='add'>+	.ndo_siocbond		= bond_do_ioctl,</div><div class='add'>+	.ndo_siocdevprivate	= bond_siocdevprivate,</div><div class='ctx'> 	.ndo_change_rx_flags	= bond_change_rx_flags,</div><div class='ctx'> 	.ndo_set_rx_mode	= bond_set_rx_mode,</div><div class='ctx'> 	.ndo_change_mtu		= bond_change_mtu,</div><div class='hunk'>@@ -4256,7 +5842,6 @@ static const struct net_device_ops bond_netdev_ops = {</div><div class='ctx'> 	.ndo_neigh_setup	= bond_neigh_setup,</div><div class='ctx'> 	.ndo_vlan_rx_add_vid	= bond_vlan_rx_add_vid,</div><div class='ctx'> 	.ndo_vlan_rx_kill_vid	= bond_vlan_rx_kill_vid,</div><div class='del'>-	.ndo_get_lock_subclass  = bond_get_nest_level,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_netpoll_setup	= bond_netpoll_setup,</div><div class='ctx'> 	.ndo_netpoll_cleanup	= bond_netpoll_cleanup,</div><div class='hunk'>@@ -4266,6 +5851,13 @@ static const struct net_device_ops bond_netdev_ops = {</div><div class='ctx'> 	.ndo_del_slave		= bond_release,</div><div class='ctx'> 	.ndo_fix_features	= bond_fix_features,</div><div class='ctx'> 	.ndo_features_check	= passthru_features_check,</div><div class='add'>+	.ndo_get_xmit_slave	= bond_xmit_get_slave,</div><div class='add'>+	.ndo_sk_get_lower_dev	= bond_sk_get_lower_dev,</div><div class='add'>+	.ndo_bpf		= bond_xdp,</div><div class='add'>+	.ndo_xdp_xmit           = bond_xdp_xmit,</div><div class='add'>+	.ndo_xdp_get_xmit_slave = bond_xdp_get_xmit_slave,</div><div class='add'>+	.ndo_hwtstamp_get	= bond_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= bond_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct device_type bond_type = {</div><div class='hunk'>@@ -4275,8 +5867,11 @@ static const struct device_type bond_type = {</div><div class='ctx'> static void bond_destructor(struct net_device *bond_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+</div><div class='ctx'> 	if (bond-&gt;wq)</div><div class='ctx'> 		destroy_workqueue(bond-&gt;wq);</div><div class='add'>+</div><div class='add'>+	free_percpu(bond-&gt;rr_tx_counter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bond_setup(struct net_device *bond_dev)</div><div class='hunk'>@@ -4284,7 +5879,6 @@ void bond_setup(struct net_device *bond_dev)</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bond-&gt;mode_lock);</div><div class='del'>-	spin_lock_init(&amp;bond-&gt;stats_lock);</div><div class='ctx'> 	bond-&gt;params = bonding_defaults;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize pointers */</div><div class='hunk'>@@ -4306,8 +5900,18 @@ void bond_setup(struct net_device *bond_dev)</div><div class='ctx'> 	bond_dev-&gt;priv_flags |= IFF_BONDING | IFF_UNICAST_FLT | IFF_NO_QUEUE;</div><div class='ctx'> 	bond_dev-&gt;priv_flags &amp;= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+	/* set up xfrm device ops (only supported in active-backup right now) */</div><div class='add'>+	bond_dev-&gt;xfrmdev_ops = &amp;bond_xfrmdev_ops;</div><div class='add'>+	INIT_LIST_HEAD(&amp;bond-&gt;ipsec_list);</div><div class='add'>+	mutex_init(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='add'>+</div><div class='ctx'> 	/* don't acquire bond device's netif_tx_lock when transmitting */</div><div class='del'>-	bond_dev-&gt;features |= NETIF_F_LLTX;</div><div class='add'>+	bond_dev-&gt;lltx = true;</div><div class='add'>+</div><div class='add'>+	/* Don't allow bond devices to change network namespaces. */</div><div class='add'>+	bond_dev-&gt;netns_immutable = true;</div><div class='ctx'> </div><div class='ctx'> 	/* By default, we declare the bond to be fully</div><div class='ctx'> 	 * VLAN hardware accelerated capable. Special</div><div class='hunk'>@@ -4316,16 +5920,22 @@ void bond_setup(struct net_device *bond_dev)</div><div class='ctx'> 	 * capable</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* Don't allow bond devices to change network namespaces. */</div><div class='del'>-	bond_dev-&gt;features |= NETIF_F_NETNS_LOCAL;</div><div class='del'>-</div><div class='del'>-	bond_dev-&gt;hw_features = BOND_VLAN_FEATURES |</div><div class='del'>-				NETIF_F_HW_VLAN_CTAG_TX |</div><div class='add'>+	bond_dev-&gt;hw_features = MASTER_UPPER_DEV_VLAN_FEATURES |</div><div class='ctx'> 				NETIF_F_HW_VLAN_CTAG_RX |</div><div class='del'>-				NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='add'>+				NETIF_F_HW_VLAN_CTAG_FILTER |</div><div class='add'>+				NETIF_F_HW_VLAN_STAG_RX |</div><div class='add'>+				NETIF_F_HW_VLAN_STAG_FILTER;</div><div class='ctx'> </div><div class='del'>-	bond_dev-&gt;hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4;</div><div class='add'>+	bond_dev-&gt;hw_features |= NETIF_F_GSO_ENCAP_ALL;</div><div class='ctx'> 	bond_dev-&gt;features |= bond_dev-&gt;hw_features;</div><div class='add'>+	bond_dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;</div><div class='add'>+	bond_dev-&gt;features |= NETIF_F_GSO_PARTIAL;</div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+	bond_dev-&gt;hw_features |= BOND_XFRM_FEATURES;</div><div class='add'>+	/* Only enable XFRM features if this is an active-backup config */</div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP)</div><div class='add'>+		bond_dev-&gt;features |= BOND_XFRM_FEATURES;</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Destroy a bonding device.</div><div class='hunk'>@@ -4336,7 +5946,6 @@ static void bond_uninit(struct net_device *bond_dev)</div><div class='ctx'> 	struct bonding *bond = netdev_priv(bond_dev);</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='del'>-	struct bond_up_slave *arr;</div><div class='ctx'> </div><div class='ctx'> 	bond_netpoll_cleanup(bond_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -4345,20 +5954,20 @@ static void bond_uninit(struct net_device *bond_dev)</div><div class='ctx'> 		__bond_release_one(bond_dev, slave-&gt;dev, true, true);</div><div class='ctx'> 	netdev_info(bond_dev, "Released all slaves\n");</div><div class='ctx'> </div><div class='del'>-	arr = rtnl_dereference(bond-&gt;slave_arr);</div><div class='del'>-	if (arr) {</div><div class='del'>-		RCU_INIT_POINTER(bond-&gt;slave_arr, NULL);</div><div class='del'>-		kfree_rcu(arr, rcu);</div><div class='del'>-	}</div><div class='add'>+#ifdef CONFIG_XFRM_OFFLOAD</div><div class='add'>+	mutex_destroy(&amp;bond-&gt;ipsec_lock);</div><div class='add'>+#endif /* CONFIG_XFRM_OFFLOAD */</div><div class='add'>+</div><div class='add'>+	bond_set_slave_arr(bond, NULL, NULL);</div><div class='ctx'> </div><div class='del'>-	list_del(&amp;bond-&gt;bond_list);</div><div class='add'>+	list_del_rcu(&amp;bond-&gt;bond_list);</div><div class='ctx'> </div><div class='ctx'> 	bond_debug_unregister(bond);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*------------------------- Module initialization ---------------------------*/</div><div class='ctx'> </div><div class='del'>-static int bond_check_params(struct bond_params *params)</div><div class='add'>+static int __init bond_check_params(struct bond_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	int arp_validate_value, fail_over_mac_value, primary_reselect_value, i;</div><div class='ctx'> 	struct bond_opt_value newval;</div><div class='hunk'>@@ -4459,10 +6068,10 @@ static int bond_check_params(struct bond_params *params)</div><div class='ctx'> 		downdelay = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((use_carrier != 0) &amp;&amp; (use_carrier != 1)) {</div><div class='del'>-		pr_warn("Warning: use_carrier module parameter (%d), not of valid value (0/1), so it was set to 1\n",</div><div class='del'>-			use_carrier);</div><div class='del'>-		use_carrier = 1;</div><div class='add'>+	if (use_carrier != 1) {</div><div class='add'>+		pr_err("Error: invalid use_carrier parameter (%d)\n",</div><div class='add'>+		       use_carrier);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (num_peer_notif &lt; 0 || num_peer_notif &gt; 255) {</div><div class='hunk'>@@ -4705,9 +6314,11 @@ static int bond_check_params(struct bond_params *params)</div><div class='ctx'> 	params-&gt;arp_interval = arp_interval;</div><div class='ctx'> 	params-&gt;arp_validate = arp_validate_value;</div><div class='ctx'> 	params-&gt;arp_all_targets = arp_all_targets_value;</div><div class='add'>+	params-&gt;missed_max = 2;</div><div class='ctx'> 	params-&gt;updelay = updelay;</div><div class='ctx'> 	params-&gt;downdelay = downdelay;</div><div class='del'>-	params-&gt;use_carrier = use_carrier;</div><div class='add'>+	params-&gt;peer_notif_delay = 0;</div><div class='add'>+	params-&gt;lacp_active = 1;</div><div class='ctx'> 	params-&gt;lacp_fast = lacp_fast;</div><div class='ctx'> 	params-&gt;primary[0] = 0;</div><div class='ctx'> 	params-&gt;primary_reselect = primary_reselect_value;</div><div class='hunk'>@@ -4722,6 +6333,8 @@ static int bond_check_params(struct bond_params *params)</div><div class='ctx'> 	params-&gt;ad_actor_sys_prio = ad_actor_sys_prio;</div><div class='ctx'> 	eth_zero_addr(params-&gt;ad_actor_system);</div><div class='ctx'> 	params-&gt;ad_user_port_key = ad_user_port_key;</div><div class='add'>+	params-&gt;coupled_control = 1;</div><div class='add'>+	params-&gt;broadcast_neighbor = 0;</div><div class='ctx'> 	if (packets_per_slave &gt; 0) {</div><div class='ctx'> 		params-&gt;reciprocal_packets_per_slave =</div><div class='ctx'> 			reciprocal_value(packets_per_slave);</div><div class='hunk'>@@ -4733,12 +6346,13 @@ static int bond_check_params(struct bond_params *params)</div><div class='ctx'> 			(struct reciprocal_value) { 0 };</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (primary) {</div><div class='del'>-		strncpy(params-&gt;primary, primary, IFNAMSIZ);</div><div class='del'>-		params-&gt;primary[IFNAMSIZ - 1] = 0;</div><div class='del'>-	}</div><div class='add'>+	if (primary)</div><div class='add'>+		strscpy_pad(params-&gt;primary, primary, sizeof(params-&gt;primary));</div><div class='ctx'> </div><div class='ctx'> 	memcpy(params-&gt;arp_targets, arp_target, sizeof(arp_target));</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	memset(params-&gt;ns_targets, 0, sizeof(struct in6_addr) * BOND_MAX_NS_TARGETS);</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4751,14 +6365,17 @@ static int bond_init(struct net_device *bond_dev)</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(bond_dev, "Begin bond_init\n");</div><div class='ctx'> </div><div class='del'>-	bond-&gt;wq = alloc_ordered_workqueue(bond_dev-&gt;name, WQ_MEM_RECLAIM);</div><div class='add'>+	bond-&gt;wq = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM,</div><div class='add'>+					   bond_dev-&gt;name);</div><div class='ctx'> 	if (!bond-&gt;wq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	bond-&gt;nest_level = SINGLE_DEPTH_NESTING;</div><div class='add'>+	bond-&gt;notifier_ctx = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;bond-&gt;stats_lock);</div><div class='ctx'> 	netdev_lockdep_set_classes(bond_dev);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;bond-&gt;bond_list, &amp;bn-&gt;dev_list);</div><div class='add'>+	list_add_tail_rcu(&amp;bond-&gt;bond_list, &amp;bn-&gt;dev_list);</div><div class='ctx'> </div><div class='ctx'> 	bond_prepare_sysfs_group(bond);</div><div class='ctx'> </div><div class='hunk'>@@ -4786,40 +6403,32 @@ int bond_create(struct net *net, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *bond_dev;</div><div class='ctx'> 	struct bonding *bond;</div><div class='del'>-	struct alb_bond_info *bond_info;</div><div class='del'>-	int res;</div><div class='add'>+	int res = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='ctx'> 	bond_dev = alloc_netdev_mq(sizeof(struct bonding),</div><div class='ctx'> 				   name ? name : "bond%d", NET_NAME_UNKNOWN,</div><div class='ctx'> 				   bond_setup, tx_queues);</div><div class='del'>-	if (!bond_dev) {</div><div class='del'>-		pr_err("%s: eek! can't alloc netdev!\n", name);</div><div class='del'>-		rtnl_unlock();</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	if (!bond_dev)</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Initialize rx_hashtbl_used_head to RLB_NULL_INDEX.</div><div class='del'>-	 * It is set to 0 by default which is wrong.</div><div class='del'>-	 */</div><div class='ctx'> 	bond = netdev_priv(bond_dev);</div><div class='del'>-	bond_info = &amp;(BOND_ALB_INFO(bond));</div><div class='del'>-	bond_info-&gt;rx_hashtbl_used_head = RLB_NULL_INDEX;</div><div class='del'>-</div><div class='ctx'> 	dev_net_set(bond_dev, net);</div><div class='ctx'> 	bond_dev-&gt;rtnl_link_ops = &amp;bond_link_ops;</div><div class='ctx'> </div><div class='ctx'> 	res = register_netdevice(bond_dev);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		free_netdev(bond_dev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(bond_dev);</div><div class='ctx'> </div><div class='ctx'> 	bond_work_init_all(bond);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	rtnl_unlock();</div><div class='del'>-	if (res &lt; 0)</div><div class='del'>-		free_netdev(bond_dev);</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4836,27 +6445,48 @@ static int __net_init bond_net_init(struct net *net)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __net_exit bond_net_exit(struct net *net)</div><div class='add'>+/* According to commit 69b0216ac255 ("bonding: fix bonding_masters</div><div class='add'>+ * race condition in bond unloading") we need to remove sysfs files</div><div class='add'>+ * before we remove our devices (done later in bond_net_exit_rtnl())</div><div class='add'>+ */</div><div class='add'>+static void __net_exit bond_net_pre_exit(struct net *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct bond_net *bn = net_generic(net, bond_net_id);</div><div class='del'>-	struct bonding *bond, *tmp_bond;</div><div class='del'>-	LIST_HEAD(list);</div><div class='ctx'> </div><div class='ctx'> 	bond_destroy_sysfs(bn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __net_exit bond_net_exit_rtnl(struct net *net,</div><div class='add'>+					  struct list_head *dev_kill_list)</div><div class='add'>+{</div><div class='add'>+	struct bond_net *bn = net_generic(net, bond_net_id);</div><div class='add'>+	struct bonding *bond, *tmp_bond;</div><div class='ctx'> </div><div class='ctx'> 	/* Kill off any bonds created after unregistering bond rtnl ops */</div><div class='del'>-	rtnl_lock();</div><div class='ctx'> 	list_for_each_entry_safe(bond, tmp_bond, &amp;bn-&gt;dev_list, bond_list)</div><div class='del'>-		unregister_netdevice_queue(bond-&gt;dev, &amp;list);</div><div class='del'>-	unregister_netdevice_many(&amp;list);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+		unregister_netdevice_queue(bond-&gt;dev, dev_kill_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* According to commit 23fa5c2caae0 ("bonding: destroy proc directory</div><div class='add'>+ * only after all bonds are gone") bond_destroy_proc_dir() is called</div><div class='add'>+ * after bond_net_exit_rtnl() has completed.</div><div class='add'>+ */</div><div class='add'>+static void __net_exit bond_net_exit_batch(struct list_head *net_list)</div><div class='add'>+{</div><div class='add'>+	struct bond_net *bn;</div><div class='add'>+	struct net *net;</div><div class='ctx'> </div><div class='del'>-	bond_destroy_proc_dir(bn);</div><div class='add'>+	list_for_each_entry(net, net_list, exit_list) {</div><div class='add'>+		bn = net_generic(net, bond_net_id);</div><div class='add'>+		bond_destroy_proc_dir(bn);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct pernet_operations bond_net_ops = {</div><div class='ctx'> 	.init = bond_net_init,</div><div class='del'>-	.exit = bond_net_exit,</div><div class='add'>+	.pre_exit = bond_net_pre_exit,</div><div class='add'>+	.exit_rtnl = bond_net_exit_rtnl,</div><div class='add'>+	.exit_batch = bond_net_exit_batch,</div><div class='ctx'> 	.id   = &amp;bond_net_id,</div><div class='ctx'> 	.size = sizeof(struct bond_net),</div><div class='ctx'> };</div><div class='hunk'>@@ -4866,36 +6496,39 @@ static int __init bonding_init(void)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int res;</div><div class='ctx'> </div><div class='del'>-	pr_info("%s", bond_version);</div><div class='del'>-</div><div class='ctx'> 	res = bond_check_params(&amp;bonding_defaults);</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	bond_create_debugfs();</div><div class='add'>+</div><div class='ctx'> 	res = register_pernet_subsys(&amp;bond_net_ops);</div><div class='ctx'> 	if (res)</div><div class='del'>-		goto out;</div><div class='add'>+		goto err_net_ops;</div><div class='ctx'> </div><div class='ctx'> 	res = bond_netlink_init();</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		goto err_link;</div><div class='ctx'> </div><div class='del'>-	bond_create_debugfs();</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; max_bonds; i++) {</div><div class='ctx'> 		res = bond_create(&amp;init_net, NULL);</div><div class='ctx'> 		if (res)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_flow_dissector_init(&amp;flow_keys_bonding,</div><div class='add'>+				flow_keys_bonding_keys,</div><div class='add'>+				ARRAY_SIZE(flow_keys_bonding_keys));</div><div class='add'>+</div><div class='ctx'> 	register_netdevice_notifier(&amp;bond_netdev_notifier);</div><div class='ctx'> out:</div><div class='ctx'> 	return res;</div><div class='ctx'> err:</div><div class='del'>-	bond_destroy_debugfs();</div><div class='ctx'> 	bond_netlink_fini();</div><div class='ctx'> err_link:</div><div class='ctx'> 	unregister_pernet_subsys(&amp;bond_net_ops);</div><div class='add'>+err_net_ops:</div><div class='add'>+	bond_destroy_debugfs();</div><div class='ctx'> 	goto out;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -4904,11 +6537,11 @@ static void __exit bonding_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_netdevice_notifier(&amp;bond_netdev_notifier);</div><div class='ctx'> </div><div class='del'>-	bond_destroy_debugfs();</div><div class='del'>-</div><div class='ctx'> 	bond_netlink_fini();</div><div class='ctx'> 	unregister_pernet_subsys(&amp;bond_net_ops);</div><div class='ctx'> </div><div class='add'>+	bond_destroy_debugfs();</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	/* Make sure we don't have an imbalance on our netpoll blocking */</div><div class='ctx'> 	WARN_ON(atomic_read(&amp;netpoll_block_tx));</div><div class='hunk'>@@ -4918,6 +6551,6 @@ static void __exit bonding_exit(void)</div><div class='ctx'> module_init(bonding_init);</div><div class='ctx'> module_exit(bonding_exit);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='del'>-MODULE_DESCRIPTION(DRV_DESCRIPTION ", v" DRV_VERSION);</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='ctx'> MODULE_AUTHOR("Thomas Davis, tadavis@lbl.gov and many others");</div><div class='add'>+MODULE_IMPORT_NS("NETDEV_INTERNAL");</div><div class='head'>diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c<br/>index b24cce48ae35..286f11c517f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_netlink.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_netlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_netlink.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;net/netlink.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;net/bonding.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> static size_t bond_get_slave_size(const struct net_device *bond_dev,</div><div class='ctx'> 				  const struct net_device *slave_dev)</div><div class='hunk'>@@ -26,6 +27,8 @@ static size_t bond_get_slave_size(const struct net_device *bond_dev,</div><div class='ctx'> 		nla_total_size(sizeof(u16)) +	/* IFLA_BOND_SLAVE_AD_AGGREGATOR_ID */</div><div class='ctx'> 		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE */</div><div class='ctx'> 		nla_total_size(sizeof(u16)) +	/* IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE */</div><div class='add'>+		nla_total_size(sizeof(s32)) +	/* IFLA_BOND_SLAVE_PRIO */</div><div class='add'>+		nla_total_size(sizeof(u16)) +	/* IFLA_BOND_SLAVE_ACTOR_PORT_PRIO */</div><div class='ctx'> 		0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -49,7 +52,11 @@ static int bond_fill_slave_info(struct sk_buff *skb,</div><div class='ctx'> 		    slave_dev-&gt;addr_len, slave-&gt;perm_hwaddr))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u16(skb, IFLA_BOND_SLAVE_QUEUE_ID, slave-&gt;queue_id))</div><div class='add'>+	if (nla_put_u16(skb, IFLA_BOND_SLAVE_QUEUE_ID,</div><div class='add'>+			READ_ONCE(slave-&gt;queue_id)))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_s32(skb, IFLA_BOND_SLAVE_PRIO, slave-&gt;prio))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(slave-&gt;bond) == BOND_MODE_8023AD) {</div><div class='hunk'>@@ -71,6 +78,10 @@ static int bond_fill_slave_info(struct sk_buff *skb,</div><div class='ctx'> 					ad_port-&gt;partner_oper.port_state))</div><div class='ctx'> 				goto nla_put_failure;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (nla_put_u16(skb, IFLA_BOND_SLAVE_ACTOR_PORT_PRIO,</div><div class='add'>+				SLAVE_AD_INFO(slave)-&gt;port_priority))</div><div class='add'>+			goto nla_put_failure;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -79,6 +90,11 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Limit the max delay range to 300s */</div><div class='add'>+static const struct netlink_range_validation delay_range = {</div><div class='add'>+	.max = 300000,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {</div><div class='ctx'> 	[IFLA_BOND_MODE]		= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BOND_ACTIVE_SLAVE]	= { .type = NLA_U32 },</div><div class='hunk'>@@ -100,6 +116,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {</div><div class='ctx'> 	[IFLA_BOND_MIN_LINKS]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_BOND_LP_INTERVAL]		= { .type = NLA_U32 },</div><div class='ctx'> 	[IFLA_BOND_PACKETS_PER_SLAVE]	= { .type = NLA_U32 },</div><div class='add'>+	[IFLA_BOND_AD_LACP_ACTIVE]	= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BOND_AD_LACP_RATE]	= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BOND_AD_SELECT]		= { .type = NLA_U8 },</div><div class='ctx'> 	[IFLA_BOND_AD_INFO]		= { .type = NLA_NESTED },</div><div class='hunk'>@@ -108,10 +125,17 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {</div><div class='ctx'> 	[IFLA_BOND_AD_ACTOR_SYSTEM]	= { .type = NLA_BINARY,</div><div class='ctx'> 					    .len  = ETH_ALEN },</div><div class='ctx'> 	[IFLA_BOND_TLB_DYNAMIC_LB]	= { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BOND_PEER_NOTIF_DELAY]    = NLA_POLICY_FULL_RANGE(NLA_U32, &amp;delay_range),</div><div class='add'>+	[IFLA_BOND_MISSED_MAX]		= { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BOND_NS_IP6_TARGET]	= { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_BOND_COUPLED_CONTROL]	= { .type = NLA_U8 },</div><div class='add'>+	[IFLA_BOND_BROADCAST_NEIGH]	= { .type = NLA_U8 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = {</div><div class='ctx'> 	[IFLA_BOND_SLAVE_QUEUE_ID]	= { .type = NLA_U16 },</div><div class='add'>+	[IFLA_BOND_SLAVE_PRIO]		= { .type = NLA_S32 },</div><div class='add'>+	[IFLA_BOND_SLAVE_ACTOR_PORT_PRIO]	= { .type = NLA_U16 },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int bond_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='hunk'>@@ -146,7 +170,28 @@ static int bond_slave_changelink(struct net_device *bond_dev,</div><div class='ctx'> 		snprintf(queue_id_str, sizeof(queue_id_str), "%s:%u\n",</div><div class='ctx'> 			 slave_dev-&gt;name, queue_id);</div><div class='ctx'> 		bond_opt_initstr(&amp;newval, queue_id_str);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_QUEUE_ID, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_QUEUE_ID, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_SLAVE_QUEUE_ID], extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BOND_SLAVE_PRIO]) {</div><div class='add'>+		int prio = nla_get_s32(data[IFLA_BOND_SLAVE_PRIO]);</div><div class='add'>+</div><div class='add'>+		bond_opt_slave_initval(&amp;newval, &amp;slave_dev, prio);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_PRIO, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_SLAVE_PRIO], extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BOND_SLAVE_ACTOR_PORT_PRIO]) {</div><div class='add'>+		u16 ad_prio = nla_get_u16(data[IFLA_BOND_SLAVE_ACTOR_PORT_PRIO]);</div><div class='add'>+</div><div class='add'>+		bond_opt_slave_initval(&amp;newval, &amp;slave_dev, ad_prio);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_ACTOR_PORT_PRIO, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_SLAVE_ACTOR_PORT_PRIO], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -170,7 +215,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 		int mode = nla_get_u8(data[IFLA_BOND_MODE]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, mode);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_MODE, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_MODE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_MODE], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -187,7 +233,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			active_slave = slave_dev-&gt;name;</div><div class='ctx'> 		}</div><div class='ctx'> 		bond_opt_initstr(&amp;newval, active_slave);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_ACTIVE_SLAVE, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_ACTIVE_SLAVE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_ACTIVE_SLAVE], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -195,7 +242,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 		miimon = nla_get_u32(data[IFLA_BOND_MIIMON]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, miimon);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_MIIMON, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_MIIMON, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_MIIMON], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -203,7 +251,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 		int updelay = nla_get_u32(data[IFLA_BOND_UPDELAY]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, updelay);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_UPDELAY, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_UPDELAY, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_UPDELAY], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -211,28 +260,39 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 		int downdelay = nla_get_u32(data[IFLA_BOND_DOWNDELAY]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, downdelay);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_DOWNDELAY, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_DOWNDELAY, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_DOWNDELAY], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='del'>-	if (data[IFLA_BOND_USE_CARRIER]) {</div><div class='del'>-		int use_carrier = nla_get_u8(data[IFLA_BOND_USE_CARRIER]);</div><div class='add'>+	if (data[IFLA_BOND_PEER_NOTIF_DELAY]) {</div><div class='add'>+		int delay = nla_get_u32(data[IFLA_BOND_PEER_NOTIF_DELAY]);</div><div class='ctx'> </div><div class='del'>-		bond_opt_initval(&amp;newval, use_carrier);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_USE_CARRIER, &amp;newval);</div><div class='add'>+		bond_opt_initval(&amp;newval, delay);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_PEER_NOTIF_DELAY, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_PEER_NOTIF_DELAY], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+	if (data[IFLA_BOND_USE_CARRIER]) {</div><div class='add'>+		if (nla_get_u8(data[IFLA_BOND_USE_CARRIER]) != 1) {</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_BOND_USE_CARRIER],</div><div class='add'>+					    "option obsolete, use_carrier cannot be disabled");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	if (data[IFLA_BOND_ARP_INTERVAL]) {</div><div class='ctx'> 		int arp_interval = nla_get_u32(data[IFLA_BOND_ARP_INTERVAL]);</div><div class='ctx'> </div><div class='ctx'> 		if (arp_interval &amp;&amp; miimon) {</div><div class='del'>-			netdev_err(bond-&gt;dev, "ARP monitoring cannot be used with MII monitoring\n");</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_BOND_ARP_INTERVAL],</div><div class='add'>+					    "ARP monitoring cannot be used with MII monitoring");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, arp_interval);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_ARP_INTERVAL, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_ARP_INTERVAL, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_ARP_INTERVAL], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -251,7 +311,9 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> </div><div class='ctx'> 			bond_opt_initval(&amp;newval, (__force u64)target);</div><div class='ctx'> 			err = __bond_opt_set(bond, BOND_OPT_ARP_TARGETS,</div><div class='del'>-					     &amp;newval);</div><div class='add'>+					     &amp;newval,</div><div class='add'>+					     data[IFLA_BOND_ARP_IP_TARGET],</div><div class='add'>+					     extack);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 			i++;</div><div class='hunk'>@@ -261,16 +323,49 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (data[IFLA_BOND_NS_IP6_TARGET]) {</div><div class='add'>+		struct nlattr *attr;</div><div class='add'>+		int i = 0, rem;</div><div class='add'>+</div><div class='add'>+		bond_option_ns_ip6_targets_clear(bond);</div><div class='add'>+		nla_for_each_nested(attr, data[IFLA_BOND_NS_IP6_TARGET], rem) {</div><div class='add'>+			struct in6_addr addr6;</div><div class='add'>+</div><div class='add'>+			if (nla_len(attr) &lt; sizeof(addr6)) {</div><div class='add'>+				NL_SET_ERR_MSG(extack, "Invalid IPv6 address");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			addr6 = nla_get_in6_addr(attr);</div><div class='add'>+</div><div class='add'>+			bond_opt_initextra(&amp;newval, &amp;addr6, sizeof(addr6));</div><div class='add'>+			err = __bond_opt_set(bond, BOND_OPT_NS_TARGETS,</div><div class='add'>+					     &amp;newval,</div><div class='add'>+					     data[IFLA_BOND_NS_IP6_TARGET],</div><div class='add'>+					     extack);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+			i++;</div><div class='add'>+		}</div><div class='add'>+		if (i == 0 &amp;&amp; bond-&gt;params.arp_interval)</div><div class='add'>+			netdev_warn(bond-&gt;dev, "Removing last ns target with arp_interval on\n");</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	if (data[IFLA_BOND_ARP_VALIDATE]) {</div><div class='ctx'> 		int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]);</div><div class='ctx'> </div><div class='ctx'> 		if (arp_validate &amp;&amp; miimon) {</div><div class='del'>-			netdev_err(bond-&gt;dev, "ARP validating cannot be used with MII monitoring\n");</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, data[IFLA_BOND_ARP_INTERVAL],</div><div class='add'>+					    "ARP validating cannot be used with MII monitoring");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, arp_validate);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_ARP_VALIDATE, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_ARP_VALIDATE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_ARP_VALIDATE], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -279,7 +374,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u32(data[IFLA_BOND_ARP_ALL_TARGETS]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, arp_all_targets);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_ARP_ALL_TARGETS, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_ARP_ALL_TARGETS, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_ARP_ALL_TARGETS], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -293,7 +389,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			primary = dev-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initstr(&amp;newval, primary);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_PRIMARY, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_PRIMARY, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_PRIMARY], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -302,7 +399,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_PRIMARY_RESELECT]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, primary_reselect);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_PRIMARY_RESELECT, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_PRIMARY_RESELECT, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_PRIMARY_RESELECT], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -311,7 +409,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_FAIL_OVER_MAC]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, fail_over_mac);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_FAIL_OVER_MAC, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_FAIL_OVER_MAC, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_FAIL_OVER_MAC], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -320,7 +419,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_XMIT_HASH_POLICY]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, xmit_hash_policy);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_XMIT_HASH, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_XMIT_HASH, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_XMIT_HASH_POLICY], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -329,7 +429,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u32(data[IFLA_BOND_RESEND_IGMP]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, resend_igmp);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_RESEND_IGMP, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_RESEND_IGMP, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_RESEND_IGMP], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -338,7 +439,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_NUM_PEER_NOTIF]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, num_peer_notif);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_NUM_PEER_NOTIF, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_NUM_PEER_NOTIF, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_NUM_PEER_NOTIF], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -347,7 +449,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_ALL_SLAVES_ACTIVE]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, all_slaves_active);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_ALL_SLAVES_ACTIVE, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_ALL_SLAVES_ACTIVE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_ALL_SLAVES_ACTIVE], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -356,7 +459,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u32(data[IFLA_BOND_MIN_LINKS]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, min_links);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_MINLINKS, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_MINLINKS, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_MIN_LINKS], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -365,7 +469,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u32(data[IFLA_BOND_LP_INTERVAL]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, lp_interval);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_LP_INTERVAL, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_LP_INTERVAL, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_LP_INTERVAL], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -374,16 +479,29 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u32(data[IFLA_BOND_PACKETS_PER_SLAVE]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, packets_per_slave);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_PACKETS_PER_SLAVE, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_PACKETS_PER_SLAVE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_PACKETS_PER_SLAVE], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BOND_AD_LACP_ACTIVE]) {</div><div class='add'>+		int lacp_active = nla_get_u8(data[IFLA_BOND_AD_LACP_ACTIVE]);</div><div class='add'>+</div><div class='add'>+		bond_opt_initval(&amp;newval, lacp_active);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_LACP_ACTIVE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_AD_LACP_ACTIVE], extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (data[IFLA_BOND_AD_LACP_RATE]) {</div><div class='ctx'> 		int lacp_rate =</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_AD_LACP_RATE]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, lacp_rate);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_LACP_RATE, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_LACP_RATE, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_AD_LACP_RATE], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -392,7 +510,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u8(data[IFLA_BOND_AD_SELECT]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, ad_select);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_AD_SELECT, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_AD_SELECT, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_AD_SELECT], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -401,7 +520,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u16(data[IFLA_BOND_AD_ACTOR_SYS_PRIO]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, actor_sys_prio);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYS_PRIO, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYS_PRIO, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_AD_ACTOR_SYS_PRIO], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -410,7 +530,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 			nla_get_u16(data[IFLA_BOND_AD_USER_PORT_KEY]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, port_key);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_AD_USER_PORT_KEY, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_AD_USER_PORT_KEY, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_AD_USER_PORT_KEY], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -420,7 +541,8 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval,</div><div class='ctx'> 				 nla_get_u64(data[IFLA_BOND_AD_ACTOR_SYSTEM]));</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_AD_ACTOR_SYSTEM], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -428,7 +550,38 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 		int dynamic_lb = nla_get_u8(data[IFLA_BOND_TLB_DYNAMIC_LB]);</div><div class='ctx'> </div><div class='ctx'> 		bond_opt_initval(&amp;newval, dynamic_lb);</div><div class='del'>-		err = __bond_opt_set(bond, BOND_OPT_TLB_DYNAMIC_LB, &amp;newval);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_TLB_DYNAMIC_LB, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_TLB_DYNAMIC_LB], extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BOND_MISSED_MAX]) {</div><div class='add'>+		int missed_max = nla_get_u8(data[IFLA_BOND_MISSED_MAX]);</div><div class='add'>+</div><div class='add'>+		bond_opt_initval(&amp;newval, missed_max);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_MISSED_MAX, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_MISSED_MAX], extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BOND_COUPLED_CONTROL]) {</div><div class='add'>+		int coupled_control = nla_get_u8(data[IFLA_BOND_COUPLED_CONTROL]);</div><div class='add'>+</div><div class='add'>+		bond_opt_initval(&amp;newval, coupled_control);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_COUPLED_CONTROL, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_COUPLED_CONTROL], extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_BOND_BROADCAST_NEIGH]) {</div><div class='add'>+		int broadcast_neigh = nla_get_u8(data[IFLA_BOND_BROADCAST_NEIGH]);</div><div class='add'>+</div><div class='add'>+		bond_opt_initval(&amp;newval, broadcast_neigh);</div><div class='add'>+		err = __bond_opt_set(bond, BOND_OPT_BROADCAST_NEIGH, &amp;newval,</div><div class='add'>+				     data[IFLA_BOND_BROADCAST_NEIGH], extack);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -436,23 +589,26 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bond_newlink(struct net *src_net, struct net_device *bond_dev,</div><div class='del'>-			struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int bond_newlink(struct net_device *bond_dev,</div><div class='add'>+			struct rtnl_newlink_params *params,</div><div class='ctx'> 			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = bond_changelink(bond_dev, tb, data, extack);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	err = register_netdevice(bond_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(bond_dev);</div><div class='del'>-	if (!err) {</div><div class='del'>-		struct bonding *bond = netdev_priv(bond_dev);</div><div class='add'>+	bond_work_init_all(bond);</div><div class='ctx'> </div><div class='del'>-		bond_work_init_all(bond);</div><div class='add'>+	err = bond_changelink(bond_dev, tb, data, extack);</div><div class='add'>+	if (err) {</div><div class='add'>+		bond_work_cancel_all(bond);</div><div class='add'>+		unregister_netdevice(bond_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -482,6 +638,7 @@ static size_t bond_get_size(const struct net_device *bond_dev)</div><div class='ctx'> 		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_MIN_LINKS */</div><div class='ctx'> 		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_LP_INTERVAL */</div><div class='ctx'> 		nla_total_size(sizeof(u32)) +  /* IFLA_BOND_PACKETS_PER_SLAVE */</div><div class='add'>+		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_AD_LACP_ACTIVE */</div><div class='ctx'> 		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_AD_LACP_RATE */</div><div class='ctx'> 		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_AD_SELECT */</div><div class='ctx'> 		nla_total_size(sizeof(struct nlattr)) + /* IFLA_BOND_AD_INFO */</div><div class='hunk'>@@ -494,6 +651,13 @@ static size_t bond_get_size(const struct net_device *bond_dev)</div><div class='ctx'> 		nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_USER_PORT_KEY */</div><div class='ctx'> 		nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_ACTOR_SYSTEM */</div><div class='ctx'> 		nla_total_size(sizeof(u8)) + /* IFLA_BOND_TLB_DYNAMIC_LB */</div><div class='add'>+		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_PEER_NOTIF_DELAY */</div><div class='add'>+		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_MISSED_MAX */</div><div class='add'>+						/* IFLA_BOND_NS_IP6_TARGET */</div><div class='add'>+		nla_total_size(sizeof(struct nlattr)) +</div><div class='add'>+		nla_total_size(sizeof(struct in6_addr)) * BOND_MAX_NS_TARGETS +</div><div class='add'>+		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_COUPLED_CONTROL */</div><div class='add'>+		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_BROADCAST_NEIGH */</div><div class='ctx'> 		0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -536,7 +700,11 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 			bond-&gt;params.downdelay * bond-&gt;params.miimon))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='del'>-	if (nla_put_u8(skb, IFLA_BOND_USE_CARRIER, bond-&gt;params.use_carrier))</div><div class='add'>+	if (nla_put_u32(skb, IFLA_BOND_PEER_NOTIF_DELAY,</div><div class='add'>+			bond-&gt;params.peer_notif_delay * bond-&gt;params.miimon))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, IFLA_BOND_USE_CARRIER, 1))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_BOND_ARP_INTERVAL, bond-&gt;params.arp_interval))</div><div class='hunk'>@@ -567,6 +735,26 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 			bond-&gt;params.arp_all_targets))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	targets = nla_nest_start(skb, IFLA_BOND_NS_IP6_TARGET);</div><div class='add'>+	if (!targets)</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	targets_added = 0;</div><div class='add'>+	for (i = 0; i &lt; BOND_MAX_NS_TARGETS; i++) {</div><div class='add'>+		if (!ipv6_addr_any(&amp;bond-&gt;params.ns_targets[i])) {</div><div class='add'>+			if (nla_put_in6_addr(skb, i, &amp;bond-&gt;params.ns_targets[i]))</div><div class='add'>+				goto nla_put_failure;</div><div class='add'>+			targets_added = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (targets_added)</div><div class='add'>+		nla_nest_end(skb, targets);</div><div class='add'>+	else</div><div class='add'>+		nla_nest_cancel(skb, targets);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	primary = rtnl_dereference(bond-&gt;primary_slave);</div><div class='ctx'> 	if (primary &amp;&amp;</div><div class='ctx'> 	    nla_put_u32(skb, IFLA_BOND_PRIMARY, primary-&gt;dev-&gt;ifindex))</div><div class='hunk'>@@ -585,7 +773,7 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u32(skb, IFLA_BOND_RESEND_IGMP,</div><div class='del'>-		        bond-&gt;params.resend_igmp))</div><div class='add'>+			bond-&gt;params.resend_igmp))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='ctx'> 	if (nla_put_u8(skb, IFLA_BOND_NUM_PEER_NOTIF,</div><div class='hunk'>@@ -609,6 +797,10 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 			packets_per_slave))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+	if (nla_put_u8(skb, IFLA_BOND_AD_LACP_ACTIVE,</div><div class='add'>+		       bond-&gt;params.lacp_active))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='ctx'> 	if (nla_put_u8(skb, IFLA_BOND_AD_LACP_RATE,</div><div class='ctx'> 		       bond-&gt;params.lacp_fast))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='hunk'>@@ -621,6 +813,18 @@ static int bond_fill_info(struct sk_buff *skb,</div><div class='ctx'> 		       bond-&gt;params.tlb_dynamic_lb))</div><div class='ctx'> 		goto nla_put_failure;</div><div class='ctx'> </div><div class='add'>+	if (nla_put_u8(skb, IFLA_BOND_MISSED_MAX,</div><div class='add'>+		       bond-&gt;params.missed_max))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, IFLA_BOND_COUPLED_CONTROL,</div><div class='add'>+		       bond-&gt;params.coupled_control))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u8(skb, IFLA_BOND_BROADCAST_NEIGH,</div><div class='add'>+		       bond-&gt;params.broadcast_neighbor))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		struct ad_info info;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c<br/>index 9677418e0362..384499c869b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_options.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_options.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_options.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_options.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/sched/signal.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/bonding.h&gt;</div><div class='add'>+#include &lt;net/ndisc.h&gt;</div><div class='ctx'> </div><div class='ctx'> static int bond_option_active_slave_set(struct bonding *bond,</div><div class='ctx'> 					const struct bond_opt_value *newval);</div><div class='hunk'>@@ -24,6 +25,8 @@ static int bond_option_updelay_set(struct bonding *bond,</div><div class='ctx'> 				   const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_downdelay_set(struct bonding *bond,</div><div class='ctx'> 				     const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_peer_notif_delay_set(struct bonding *bond,</div><div class='add'>+					    const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_use_carrier_set(struct bonding *bond,</div><div class='ctx'> 				       const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_arp_interval_set(struct bonding *bond,</div><div class='hunk'>@@ -32,10 +35,14 @@ static int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);</div><div class='ctx'> static int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);</div><div class='ctx'> static int bond_option_arp_ip_targets_set(struct bonding *bond,</div><div class='ctx'> 					  const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_ns_ip6_targets_set(struct bonding *bond,</div><div class='add'>+					  const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_arp_validate_set(struct bonding *bond,</div><div class='ctx'> 					const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_arp_all_targets_set(struct bonding *bond,</div><div class='ctx'> 					   const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_prio_set(struct bonding *bond,</div><div class='add'>+				const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_primary_set(struct bonding *bond,</div><div class='ctx'> 				   const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_primary_reselect_set(struct bonding *bond,</div><div class='hunk'>@@ -56,6 +63,8 @@ static int bond_option_lp_interval_set(struct bonding *bond,</div><div class='ctx'> 				       const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_pps_set(struct bonding *bond,</div><div class='ctx'> 			       const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_lacp_active_set(struct bonding *bond,</div><div class='add'>+				       const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_lacp_rate_set(struct bonding *bond,</div><div class='ctx'> 				     const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_ad_select_set(struct bonding *bond,</div><div class='hunk'>@@ -70,11 +79,18 @@ static int bond_option_tlb_dynamic_lb_set(struct bonding *bond,</div><div class='ctx'> 				  const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_ad_actor_sys_prio_set(struct bonding *bond,</div><div class='ctx'> 					     const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_actor_port_prio_set(struct bonding *bond,</div><div class='add'>+					   const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_ad_actor_system_set(struct bonding *bond,</div><div class='ctx'> 					   const struct bond_opt_value *newval);</div><div class='ctx'> static int bond_option_ad_user_port_key_set(struct bonding *bond,</div><div class='ctx'> 					    const struct bond_opt_value *newval);</div><div class='del'>-</div><div class='add'>+static int bond_option_missed_max_set(struct bonding *bond,</div><div class='add'>+				      const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_coupled_control_set(struct bonding *bond,</div><div class='add'>+					   const struct bond_opt_value *newval);</div><div class='add'>+static int bond_option_broadcast_neigh_set(struct bonding *bond,</div><div class='add'>+					   const struct bond_opt_value *newval);</div><div class='ctx'> </div><div class='ctx'> static const struct bond_opt_value bond_mode_tbl[] = {</div><div class='ctx'> 	{ "balance-rr",    BOND_MODE_ROUNDROBIN,   BOND_VALFLAG_DEFAULT},</div><div class='hunk'>@@ -94,12 +110,13 @@ static const struct bond_opt_value bond_pps_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bond_opt_value bond_xmit_hashtype_tbl[] = {</div><div class='del'>-	{ "layer2",   BOND_XMIT_POLICY_LAYER2, BOND_VALFLAG_DEFAULT},</div><div class='del'>-	{ "layer3+4", BOND_XMIT_POLICY_LAYER34, 0},</div><div class='del'>-	{ "layer2+3", BOND_XMIT_POLICY_LAYER23, 0},</div><div class='del'>-	{ "encap2+3", BOND_XMIT_POLICY_ENCAP23, 0},</div><div class='del'>-	{ "encap3+4", BOND_XMIT_POLICY_ENCAP34, 0},</div><div class='del'>-	{ NULL,       -1,                       0},</div><div class='add'>+	{ "layer2",      BOND_XMIT_POLICY_LAYER2,      BOND_VALFLAG_DEFAULT},</div><div class='add'>+	{ "layer3+4",    BOND_XMIT_POLICY_LAYER34,     0},</div><div class='add'>+	{ "layer2+3",    BOND_XMIT_POLICY_LAYER23,     0},</div><div class='add'>+	{ "encap2+3",    BOND_XMIT_POLICY_ENCAP23,     0},</div><div class='add'>+	{ "encap3+4",    BOND_XMIT_POLICY_ENCAP34,     0},</div><div class='add'>+	{ "vlan+srcmac", BOND_XMIT_POLICY_VLAN_SRCMAC, 0},</div><div class='add'>+	{ NULL,          -1,                           0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bond_opt_value bond_arp_validate_tbl[] = {</div><div class='hunk'>@@ -132,6 +149,12 @@ static const struct bond_opt_value bond_intmax_tbl[] = {</div><div class='ctx'> 	{ NULL,      -1,      0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct bond_opt_value bond_lacp_active[] = {</div><div class='add'>+	{ "off", 0,  0},</div><div class='add'>+	{ "on",  1,  BOND_VALFLAG_DEFAULT},</div><div class='add'>+	{ NULL,  -1, 0}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct bond_opt_value bond_lacp_rate_tbl[] = {</div><div class='ctx'> 	{ "slow", AD_LACP_SLOW, 0},</div><div class='ctx'> 	{ "fast", AD_LACP_FAST, 0},</div><div class='hunk'>@@ -139,10 +162,11 @@ static const struct bond_opt_value bond_lacp_rate_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bond_opt_value bond_ad_select_tbl[] = {</div><div class='del'>-	{ "stable",    BOND_AD_STABLE,    BOND_VALFLAG_DEFAULT},</div><div class='del'>-	{ "bandwidth", BOND_AD_BANDWIDTH, 0},</div><div class='del'>-	{ "count",     BOND_AD_COUNT,     0},</div><div class='del'>-	{ NULL,        -1,                0},</div><div class='add'>+	{ "stable",          BOND_AD_STABLE,    BOND_VALFLAG_DEFAULT},</div><div class='add'>+	{ "bandwidth",       BOND_AD_BANDWIDTH, 0},</div><div class='add'>+	{ "count",           BOND_AD_COUNT,     0},</div><div class='add'>+	{ "actor_port_prio", BOND_AD_PRIO,      0},</div><div class='add'>+	{ NULL,              -1,                0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bond_opt_value bond_num_peer_notif_tbl[] = {</div><div class='hunk'>@@ -152,6 +176,12 @@ static const struct bond_opt_value bond_num_peer_notif_tbl[] = {</div><div class='ctx'> 	{ NULL,      -1,  0}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct bond_opt_value bond_peer_notif_delay_tbl[] = {</div><div class='add'>+	{ "off",     0,   0},</div><div class='add'>+	{ "maxval",  300000, BOND_VALFLAG_MAX},</div><div class='add'>+	{ NULL,      -1,  0}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct bond_opt_value bond_primary_reselect_tbl[] = {</div><div class='ctx'> 	{ "always",  BOND_PRI_RESELECT_ALWAYS,  BOND_VALFLAG_DEFAULT},</div><div class='ctx'> 	{ "better",  BOND_PRI_RESELECT_BETTER,  0},</div><div class='hunk'>@@ -160,7 +190,6 @@ static const struct bond_opt_value bond_primary_reselect_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bond_opt_value bond_use_carrier_tbl[] = {</div><div class='del'>-	{ "off", 0,  0},</div><div class='ctx'> 	{ "on",  1,  BOND_VALFLAG_DEFAULT},</div><div class='ctx'> 	{ NULL,  -1, 0}</div><div class='ctx'> };</div><div class='hunk'>@@ -202,6 +231,25 @@ static const struct bond_opt_value bond_ad_user_port_key_tbl[] = {</div><div class='ctx'> 	{ NULL,      -1,    0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct bond_opt_value bond_missed_max_tbl[] = {</div><div class='add'>+	{ "minval",	1,	BOND_VALFLAG_MIN},</div><div class='add'>+	{ "maxval",	255,	BOND_VALFLAG_MAX},</div><div class='add'>+	{ "default",	2,	BOND_VALFLAG_DEFAULT},</div><div class='add'>+	{ NULL,		-1,	0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bond_opt_value bond_coupled_control_tbl[] = {</div><div class='add'>+	{ "on",  1,  BOND_VALFLAG_DEFAULT},</div><div class='add'>+	{ "off", 0,  0},</div><div class='add'>+	{ NULL,  -1, 0},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bond_opt_value bond_broadcast_neigh_tbl[] = {</div><div class='add'>+	{ "off", 0, BOND_VALFLAG_DEFAULT},</div><div class='add'>+	{ "on",	 1, 0},</div><div class='add'>+	{ NULL,  -1, 0}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 	[BOND_OPT_MODE] = {</div><div class='ctx'> 		.id = BOND_OPT_MODE,</div><div class='hunk'>@@ -259,6 +307,15 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 		.values = bond_intmax_tbl,</div><div class='ctx'> 		.set = bond_option_arp_interval_set</div><div class='ctx'> 	},</div><div class='add'>+	[BOND_OPT_MISSED_MAX] = {</div><div class='add'>+		.id = BOND_OPT_MISSED_MAX,</div><div class='add'>+		.name = "arp_missed_max",</div><div class='add'>+		.desc = "Maximum number of missed ARP interval",</div><div class='add'>+		.unsuppmodes = BIT(BOND_MODE_8023AD) | BIT(BOND_MODE_TLB) |</div><div class='add'>+			       BIT(BOND_MODE_ALB),</div><div class='add'>+		.values = bond_missed_max_tbl,</div><div class='add'>+		.set = bond_option_missed_max_set</div><div class='add'>+	},</div><div class='ctx'> 	[BOND_OPT_ARP_TARGETS] = {</div><div class='ctx'> 		.id = BOND_OPT_ARP_TARGETS,</div><div class='ctx'> 		.name = "arp_ip_target",</div><div class='hunk'>@@ -266,6 +323,13 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 		.flags = BOND_OPTFLAG_RAWVAL,</div><div class='ctx'> 		.set = bond_option_arp_ip_targets_set</div><div class='ctx'> 	},</div><div class='add'>+	[BOND_OPT_NS_TARGETS] = {</div><div class='add'>+		.id = BOND_OPT_NS_TARGETS,</div><div class='add'>+		.name = "ns_ip6_target",</div><div class='add'>+		.desc = "NS targets in ffff:ffff::ffff:ffff form",</div><div class='add'>+		.flags = BOND_OPTFLAG_RAWVAL,</div><div class='add'>+		.set = bond_option_ns_ip6_targets_set</div><div class='add'>+	},</div><div class='ctx'> 	[BOND_OPT_DOWNDELAY] = {</div><div class='ctx'> 		.id = BOND_OPT_DOWNDELAY,</div><div class='ctx'> 		.name = "downdelay",</div><div class='hunk'>@@ -280,6 +344,15 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 		.values = bond_intmax_tbl,</div><div class='ctx'> 		.set = bond_option_updelay_set</div><div class='ctx'> 	},</div><div class='add'>+	[BOND_OPT_LACP_ACTIVE] = {</div><div class='add'>+		.id = BOND_OPT_LACP_ACTIVE,</div><div class='add'>+		.name = "lacp_active",</div><div class='add'>+		.desc = "Send LACPDU frames with configured lacp rate or acts as speak when spoken to",</div><div class='add'>+		.flags = BOND_OPTFLAG_IFDOWN,</div><div class='add'>+		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),</div><div class='add'>+		.values = bond_lacp_active,</div><div class='add'>+		.set = bond_option_lacp_active_set</div><div class='add'>+	},</div><div class='ctx'> 	[BOND_OPT_LACP_RATE] = {</div><div class='ctx'> 		.id = BOND_OPT_LACP_RATE,</div><div class='ctx'> 		.name = "lacp_rate",</div><div class='hunk'>@@ -299,7 +372,7 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 	[BOND_OPT_AD_SELECT] = {</div><div class='ctx'> 		.id = BOND_OPT_AD_SELECT,</div><div class='ctx'> 		.name = "ad_select",</div><div class='del'>-		.desc = "803.ad aggregation selection logic",</div><div class='add'>+		.desc = "802.3ad aggregation selection logic",</div><div class='ctx'> 		.flags = BOND_OPTFLAG_IFDOWN,</div><div class='ctx'> 		.values = bond_ad_select_tbl,</div><div class='ctx'> 		.set = bond_option_ad_select_set</div><div class='hunk'>@@ -318,6 +391,16 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 		.values = bond_intmax_tbl,</div><div class='ctx'> 		.set = bond_option_miimon_set</div><div class='ctx'> 	},</div><div class='add'>+	[BOND_OPT_PRIO] = {</div><div class='add'>+		.id = BOND_OPT_PRIO,</div><div class='add'>+		.name = "prio",</div><div class='add'>+		.desc = "Link priority for failover re-selection",</div><div class='add'>+		.flags = BOND_OPTFLAG_RAWVAL,</div><div class='add'>+		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_ACTIVEBACKUP) |</div><div class='add'>+						BIT(BOND_MODE_TLB) |</div><div class='add'>+						BIT(BOND_MODE_ALB)),</div><div class='add'>+		.set = bond_option_prio_set</div><div class='add'>+	},</div><div class='ctx'> 	[BOND_OPT_PRIMARY] = {</div><div class='ctx'> 		.id = BOND_OPT_PRIMARY,</div><div class='ctx'> 		.name = "primary",</div><div class='hunk'>@@ -338,7 +421,7 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 	[BOND_OPT_USE_CARRIER] = {</div><div class='ctx'> 		.id = BOND_OPT_USE_CARRIER,</div><div class='ctx'> 		.name = "use_carrier",</div><div class='del'>-		.desc = "Use netif_carrier_ok (vs MII ioctls) in miimon",</div><div class='add'>+		.desc = "option obsolete, use_carrier cannot be disabled",</div><div class='ctx'> 		.values = bond_use_carrier_tbl,</div><div class='ctx'> 		.set = bond_option_use_carrier_set</div><div class='ctx'> 	},</div><div class='hunk'>@@ -403,6 +486,13 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 		.values = bond_ad_actor_sys_prio_tbl,</div><div class='ctx'> 		.set = bond_option_ad_actor_sys_prio_set,</div><div class='ctx'> 	},</div><div class='add'>+	[BOND_OPT_ACTOR_PORT_PRIO] = {</div><div class='add'>+		.id = BOND_OPT_ACTOR_PORT_PRIO,</div><div class='add'>+		.name = "actor_port_prio",</div><div class='add'>+		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),</div><div class='add'>+		.flags = BOND_OPTFLAG_RAWVAL,</div><div class='add'>+		.set = bond_option_actor_port_prio_set,</div><div class='add'>+	},</div><div class='ctx'> 	[BOND_OPT_AD_ACTOR_SYSTEM] = {</div><div class='ctx'> 		.id = BOND_OPT_AD_ACTOR_SYSTEM,</div><div class='ctx'> 		.name = "ad_actor_system",</div><div class='hunk'>@@ -424,6 +514,30 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = {</div><div class='ctx'> 		.desc = "Number of peer notifications to send on failover event",</div><div class='ctx'> 		.values = bond_num_peer_notif_tbl,</div><div class='ctx'> 		.set = bond_option_num_peer_notif_set</div><div class='add'>+	},</div><div class='add'>+	[BOND_OPT_PEER_NOTIF_DELAY] = {</div><div class='add'>+		.id = BOND_OPT_PEER_NOTIF_DELAY,</div><div class='add'>+		.name = "peer_notif_delay",</div><div class='add'>+		.desc = "Delay between each peer notification on failover event, in milliseconds",</div><div class='add'>+		.values = bond_peer_notif_delay_tbl,</div><div class='add'>+		.set = bond_option_peer_notif_delay_set</div><div class='add'>+	},</div><div class='add'>+	[BOND_OPT_COUPLED_CONTROL] = {</div><div class='add'>+		.id = BOND_OPT_COUPLED_CONTROL,</div><div class='add'>+		.name = "coupled_control",</div><div class='add'>+		.desc = "Opt into using coupled control MUX for LACP states",</div><div class='add'>+		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),</div><div class='add'>+		.flags = BOND_OPTFLAG_IFDOWN,</div><div class='add'>+		.values = bond_coupled_control_tbl,</div><div class='add'>+		.set = bond_option_coupled_control_set,</div><div class='add'>+	},</div><div class='add'>+	[BOND_OPT_BROADCAST_NEIGH] = {</div><div class='add'>+		.id = BOND_OPT_BROADCAST_NEIGH,</div><div class='add'>+		.name = "broadcast_neighbor",</div><div class='add'>+		.desc = "Broadcast neighbor packets to all active slaves",</div><div class='add'>+		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),</div><div class='add'>+		.values = bond_broadcast_neigh_tbl,</div><div class='add'>+		.set = bond_option_broadcast_neigh_set,</div><div class='ctx'> 	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -578,27 +692,35 @@ static int bond_opt_check_deps(struct bonding *bond,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bond_opt_dep_print(struct bonding *bond,</div><div class='del'>-			       const struct bond_option *opt)</div><div class='add'>+			       const struct bond_option *opt,</div><div class='add'>+			       struct nlattr *bad_attr,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bond_opt_value *modeval;</div><div class='ctx'> 	struct bond_params *params;</div><div class='ctx'> </div><div class='ctx'> 	params = &amp;bond-&gt;params;</div><div class='ctx'> 	modeval = bond_opt_get_val(BOND_OPT_MODE, params-&gt;mode);</div><div class='del'>-	if (test_bit(params-&gt;mode, &amp;opt-&gt;unsuppmodes))</div><div class='add'>+	if (test_bit(params-&gt;mode, &amp;opt-&gt;unsuppmodes)) {</div><div class='ctx'> 		netdev_err(bond-&gt;dev, "option %s: mode dependency failed, not supported in mode %s(%llu)\n",</div><div class='ctx'> 			   opt-&gt;name, modeval-&gt;string, modeval-&gt;value);</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, bad_attr,</div><div class='add'>+				    "option not supported in mode");</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bond_opt_error_interpret(struct bonding *bond,</div><div class='ctx'> 				     const struct bond_option *opt,</div><div class='del'>-				     int error, const struct bond_opt_value *val)</div><div class='add'>+				     int error, const struct bond_opt_value *val,</div><div class='add'>+				     struct nlattr *bad_attr,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bond_opt_value *minval, *maxval;</div><div class='ctx'> 	char *p;</div><div class='ctx'> </div><div class='ctx'> 	switch (error) {</div><div class='ctx'> 	case -EINVAL:</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, bad_attr, "invalid option value");</div><div class='ctx'> 		if (val) {</div><div class='ctx'> 			if (val-&gt;string) {</div><div class='ctx'> 				/* sometimes RAWVAL opts may have new lines */</div><div class='hunk'>@@ -620,16 +742,31 @@ static void bond_opt_error_interpret(struct bonding *bond,</div><div class='ctx'> 			   opt-&gt;name, minval ? minval-&gt;value : 0, maxval-&gt;value);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -EACCES:</div><div class='del'>-		bond_opt_dep_print(bond, opt);</div><div class='add'>+		bond_opt_dep_print(bond, opt, bad_attr, extack);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -ENOTEMPTY:</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, bad_attr,</div><div class='add'>+				    "unable to set option because the bond device has slaves");</div><div class='ctx'> 		netdev_err(bond-&gt;dev, "option %s: unable to set because the bond device has slaves\n",</div><div class='ctx'> 			   opt-&gt;name);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case -EBUSY:</div><div class='add'>+		NL_SET_ERR_MSG_ATTR(extack, bad_attr,</div><div class='add'>+				    "unable to set option because the bond is up");</div><div class='ctx'> 		netdev_err(bond-&gt;dev, "option %s: unable to set because the bond device is up\n",</div><div class='ctx'> 			   opt-&gt;name);</div><div class='ctx'> 		break;</div><div class='add'>+	case -ENODEV:</div><div class='add'>+		if (val &amp;&amp; val-&gt;string) {</div><div class='add'>+			p = strchr(val-&gt;string, '\n');</div><div class='add'>+			if (p)</div><div class='add'>+				*p = '\0';</div><div class='add'>+			netdev_err(bond-&gt;dev, "option %s: interface %s does not exist!\n",</div><div class='add'>+				   opt-&gt;name, val-&gt;string);</div><div class='add'>+			NL_SET_ERR_MSG_ATTR(extack, bad_attr,</div><div class='add'>+					    "interface does not exist");</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -640,13 +777,17 @@ static void bond_opt_error_interpret(struct bonding *bond,</div><div class='ctx'>  * @bond: target bond device</div><div class='ctx'>  * @option: option to set</div><div class='ctx'>  * @val: value to set it to</div><div class='add'>+ * @bad_attr: netlink attribue that caused the error</div><div class='add'>+ * @extack: extended netlink error structure, used when an error message</div><div class='add'>+ *          needs to be returned to the caller via netlink</div><div class='ctx'>  *</div><div class='ctx'>  * This function is used to change the bond's option value, it can be</div><div class='ctx'>  * used for both enabling/changing an option and for disabling it. RTNL lock</div><div class='ctx'>  * must be obtained before calling this function.</div><div class='ctx'>  */</div><div class='ctx'> int __bond_opt_set(struct bonding *bond,</div><div class='del'>-		   unsigned int option, struct bond_opt_value *val)</div><div class='add'>+		   unsigned int option, struct bond_opt_value *val,</div><div class='add'>+		   struct nlattr *bad_attr, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bond_opt_value *retval = NULL;</div><div class='ctx'> 	const struct bond_option *opt;</div><div class='hunk'>@@ -668,7 +809,7 @@ int __bond_opt_set(struct bonding *bond,</div><div class='ctx'> 	ret = opt-&gt;set(bond, retval);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='del'>-		bond_opt_error_interpret(bond, opt, ret, val);</div><div class='add'>+		bond_opt_error_interpret(bond, opt, ret, val, bad_attr, extack);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -686,11 +827,11 @@ out:</div><div class='ctx'> int __bond_opt_set_notify(struct bonding *bond,</div><div class='ctx'> 			  unsigned int option, struct bond_opt_value *val)</div><div class='ctx'> {</div><div class='del'>-	int ret = -ENOENT;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	ret = __bond_opt_set(bond, option, val);</div><div class='add'>+	ret = __bond_opt_set(bond, option, val, NULL, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret &amp;&amp; (bond-&gt;dev-&gt;reg_state == NETREG_REGISTERED))</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_CHANGEINFODATA, bond-&gt;dev);</div><div class='hunk'>@@ -736,9 +877,25 @@ const struct bond_option *bond_opt_get(unsigned int option)</div><div class='ctx'> 	return &amp;bond_opts[option];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool bond_set_xfrm_features(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_XFRM_OFFLOAD))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP)</div><div class='add'>+		bond-&gt;dev-&gt;wanted_features |= BOND_XFRM_FEATURES;</div><div class='add'>+	else</div><div class='add'>+		bond-&gt;dev-&gt;wanted_features &amp;= ~BOND_XFRM_FEATURES;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bond_option_mode_set(struct bonding *bond,</div><div class='ctx'> 				const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='add'>+	if (bond-&gt;xdp_prog &amp;&amp; !bond_xdp_check(bond, newval-&gt;value))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (!bond_mode_uses_arp(newval-&gt;value)) {</div><div class='ctx'> 		if (bond-&gt;params.arp_interval) {</div><div class='ctx'> 			netdev_dbg(bond-&gt;dev, "%s mode is incompatible with arp monitoring, start mii monitoring\n",</div><div class='hunk'>@@ -762,6 +919,24 @@ static int bond_option_mode_set(struct bonding *bond,</div><div class='ctx'> 	bond-&gt;params.arp_validate = BOND_ARP_VALIDATE_NONE;</div><div class='ctx'> 	bond-&gt;params.mode = newval-&gt;value;</div><div class='ctx'> </div><div class='add'>+	/* When changing mode, the bond device is down, we may reduce</div><div class='add'>+	 * the bond_bcast_neigh_enabled in bond_close() if broadcast_neighbor</div><div class='add'>+	 * enabled in 8023ad mode. Therefore, only clear broadcast_neighbor</div><div class='add'>+	 * to 0.</div><div class='add'>+	 */</div><div class='add'>+	bond-&gt;params.broadcast_neighbor = 0;</div><div class='add'>+</div><div class='add'>+	if (bond-&gt;dev-&gt;reg_state == NETREG_REGISTERED) {</div><div class='add'>+		bool update = false;</div><div class='add'>+</div><div class='add'>+		update |= bond_set_xfrm_features(bond);</div><div class='add'>+</div><div class='add'>+		if (update)</div><div class='add'>+			netdev_update_features(bond-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bond_xdp_set_features(bond-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -783,14 +958,12 @@ static int bond_option_active_slave_set(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> 	if (slave_dev) {</div><div class='ctx'> 		if (!netif_is_bond_slave(slave_dev)) {</div><div class='del'>-			netdev_err(bond-&gt;dev, "Device %s is not bonding slave\n",</div><div class='del'>-				   slave_dev-&gt;name);</div><div class='add'>+			slave_err(bond-&gt;dev, slave_dev, "Device is not bonding slave\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (bond-&gt;dev != netdev_master_upper_dev_get(slave_dev)) {</div><div class='del'>-			netdev_err(bond-&gt;dev, "Device %s is not our slave\n",</div><div class='del'>-				   slave_dev-&gt;name);</div><div class='add'>+			slave_err(bond-&gt;dev, slave_dev, "Device is not our slave\n");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -799,7 +972,7 @@ static int bond_option_active_slave_set(struct bonding *bond,</div><div class='ctx'> 	/* check to see if we are clearing active */</div><div class='ctx'> 	if (!slave_dev) {</div><div class='ctx'> 		netdev_dbg(bond-&gt;dev, "Clearing current active slave\n");</div><div class='del'>-		RCU_INIT_POINTER(bond-&gt;curr_active_slave, NULL);</div><div class='add'>+		bond_change_active_slave(bond, NULL);</div><div class='ctx'> 		bond_select_active_slave(bond);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct slave *old_active = rtnl_dereference(bond-&gt;curr_active_slave);</div><div class='hunk'>@@ -809,18 +982,15 @@ static int bond_option_active_slave_set(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> 		if (new_active == old_active) {</div><div class='ctx'> 			/* do nothing */</div><div class='del'>-			netdev_dbg(bond-&gt;dev, "%s is already the current active slave\n",</div><div class='del'>-				   new_active-&gt;dev-&gt;name);</div><div class='add'>+			slave_dbg(bond-&gt;dev, new_active-&gt;dev, "is already the current active slave\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (old_active &amp;&amp; (new_active-&gt;link == BOND_LINK_UP) &amp;&amp;</div><div class='ctx'> 			    bond_slave_is_up(new_active)) {</div><div class='del'>-				netdev_dbg(bond-&gt;dev, "Setting %s as active slave\n",</div><div class='del'>-					   new_active-&gt;dev-&gt;name);</div><div class='add'>+				slave_dbg(bond-&gt;dev, new_active-&gt;dev, "Setting as active slave\n");</div><div class='ctx'> 				bond_change_active_slave(bond, new_active);</div><div class='ctx'> 			} else {</div><div class='del'>-				netdev_err(bond-&gt;dev, "Could not set %s as active slave; either %s is down or the link is down\n",</div><div class='del'>-					   new_active-&gt;dev-&gt;name,</div><div class='del'>-					   new_active-&gt;dev-&gt;name);</div><div class='add'>+				slave_err(bond-&gt;dev, new_active-&gt;dev, "Could not set as active slave; either %s is down or the link is down\n",</div><div class='add'>+					  new_active-&gt;dev-&gt;name);</div><div class='ctx'> 				ret = -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -846,6 +1016,9 @@ static int bond_option_miimon_set(struct bonding *bond,</div><div class='ctx'> 	if (bond-&gt;params.downdelay)</div><div class='ctx'> 		netdev_dbg(bond-&gt;dev, "Note: Updating downdelay (to %d) since it is a multiple of the miimon value\n",</div><div class='ctx'> 			   bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='add'>+	if (bond-&gt;params.peer_notif_delay)</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "Note: Updating peer_notif_delay (to %d) since it is a multiple of the miimon value\n",</div><div class='add'>+			   bond-&gt;params.peer_notif_delay * bond-&gt;params.miimon);</div><div class='ctx'> 	if (newval-&gt;value &amp;&amp; bond-&gt;params.arp_interval) {</div><div class='ctx'> 		netdev_dbg(bond-&gt;dev, "MII monitoring cannot be used with ARP monitoring - disabling ARP monitoring...\n");</div><div class='ctx'> 		bond-&gt;params.arp_interval = 0;</div><div class='hunk'>@@ -869,61 +1042,64 @@ static int bond_option_miimon_set(struct bonding *bond,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set up and down delays. These must be multiples of the</div><div class='del'>- * MII monitoring value, and are stored internally as the multiplier.</div><div class='del'>- * Thus, we must translate to MS for the real world.</div><div class='add'>+/* Set up, down and peer notification delays. These must be multiples</div><div class='add'>+ * of the MII monitoring value, and are stored internally as the</div><div class='add'>+ * multiplier. Thus, we must translate to MS for the real world.</div><div class='ctx'>  */</div><div class='del'>-static int bond_option_updelay_set(struct bonding *bond,</div><div class='del'>-				   const struct bond_opt_value *newval)</div><div class='add'>+static int _bond_option_delay_set(struct bonding *bond,</div><div class='add'>+				  const struct bond_opt_value *newval,</div><div class='add'>+				  const char *name,</div><div class='add'>+				  int *target)</div><div class='ctx'> {</div><div class='ctx'> 	int value = newval-&gt;value;</div><div class='ctx'> </div><div class='ctx'> 	if (!bond-&gt;params.miimon) {</div><div class='del'>-		netdev_err(bond-&gt;dev, "Unable to set up delay as MII monitoring is disabled\n");</div><div class='add'>+		netdev_err(bond-&gt;dev, "Unable to set %s as MII monitoring is disabled\n",</div><div class='add'>+			   name);</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> 	if ((value % bond-&gt;params.miimon) != 0) {</div><div class='del'>-		netdev_warn(bond-&gt;dev, "up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",</div><div class='add'>+		netdev_warn(bond-&gt;dev,</div><div class='add'>+			    "%s (%d) is not a multiple of miimon (%d), value rounded to %d ms\n",</div><div class='add'>+			    name,</div><div class='ctx'> 			    value, bond-&gt;params.miimon,</div><div class='ctx'> 			    (value / bond-&gt;params.miimon) *</div><div class='ctx'> 			    bond-&gt;params.miimon);</div><div class='ctx'> 	}</div><div class='del'>-	bond-&gt;params.updelay = value / bond-&gt;params.miimon;</div><div class='del'>-	netdev_dbg(bond-&gt;dev, "Setting up delay to %d\n",</div><div class='del'>-		   bond-&gt;params.updelay * bond-&gt;params.miimon);</div><div class='add'>+	*target = value / bond-&gt;params.miimon;</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "Setting %s to %d\n",</div><div class='add'>+		   name,</div><div class='add'>+		   *target * bond-&gt;params.miimon);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bond_option_updelay_set(struct bonding *bond,</div><div class='add'>+				   const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	return _bond_option_delay_set(bond, newval, "up delay",</div><div class='add'>+				      &amp;bond-&gt;params.updelay);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bond_option_downdelay_set(struct bonding *bond,</div><div class='ctx'> 				     const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='del'>-	int value = newval-&gt;value;</div><div class='del'>-</div><div class='del'>-	if (!bond-&gt;params.miimon) {</div><div class='del'>-		netdev_err(bond-&gt;dev, "Unable to set down delay as MII monitoring is disabled\n");</div><div class='del'>-		return -EPERM;</div><div class='del'>-	}</div><div class='del'>-	if ((value % bond-&gt;params.miimon) != 0) {</div><div class='del'>-		netdev_warn(bond-&gt;dev, "down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",</div><div class='del'>-			    value, bond-&gt;params.miimon,</div><div class='del'>-			    (value / bond-&gt;params.miimon) *</div><div class='del'>-			    bond-&gt;params.miimon);</div><div class='del'>-	}</div><div class='del'>-	bond-&gt;params.downdelay = value / bond-&gt;params.miimon;</div><div class='del'>-	netdev_dbg(bond-&gt;dev, "Setting down delay to %d\n",</div><div class='del'>-		   bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='add'>+	return _bond_option_delay_set(bond, newval, "down delay",</div><div class='add'>+				      &amp;bond-&gt;params.downdelay);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static int bond_option_peer_notif_delay_set(struct bonding *bond,</div><div class='add'>+					    const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	int ret = _bond_option_delay_set(bond, newval,</div><div class='add'>+					 "peer notification delay",</div><div class='add'>+					 &amp;bond-&gt;params.peer_notif_delay);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bond_option_use_carrier_set(struct bonding *bond,</div><div class='ctx'> 				       const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='del'>-	netdev_dbg(bond-&gt;dev, "Setting use_carrier to %llu\n",</div><div class='del'>-		   newval-&gt;value);</div><div class='del'>-	bond-&gt;params.use_carrier = newval-&gt;value;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -957,7 +1133,7 @@ static int bond_option_arp_interval_set(struct bonding *bond,</div><div class='ctx'> 			cancel_delayed_work_sync(&amp;bond-&gt;arp_work);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* arp_validate can be set only in active-backup mode */</div><div class='del'>-			bond-&gt;recv_probe = bond_arp_rcv;</div><div class='add'>+			bond-&gt;recv_probe = bond_rcv_validate;</div><div class='ctx'> 			cancel_delayed_work_sync(&amp;bond-&gt;mii_work);</div><div class='ctx'> 			queue_delayed_work(bond-&gt;wq, &amp;bond-&gt;arp_work, 0);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1070,9 +1246,9 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,</div><div class='ctx'> 	__be32 target;</div><div class='ctx'> </div><div class='ctx'> 	if (newval-&gt;string) {</div><div class='del'>-		if (!in4_pton(newval-&gt;string+1, -1, (u8 *)&amp;target, -1, NULL)) {</div><div class='del'>-			netdev_err(bond-&gt;dev, "invalid ARP target %pI4 specified\n",</div><div class='del'>-				   &amp;target);</div><div class='add'>+		if (strlen(newval-&gt;string) &lt; 1 ||</div><div class='add'>+		    !in4_pton(newval-&gt;string + 1, -1, (u8 *)&amp;target, -1, NULL)) {</div><div class='add'>+			netdev_err(bond-&gt;dev, "invalid ARP target specified\n");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (newval-&gt;string[0] == '+')</div><div class='hunk'>@@ -1089,13 +1265,196 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+static bool slave_can_set_ns_maddr(const struct bonding *bond, struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	return BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP &amp;&amp;</div><div class='add'>+	       !bond_is_active_slave(slave) &amp;&amp;</div><div class='add'>+	       slave-&gt;dev-&gt;flags &amp; IFF_MULTICAST;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * slave_set_ns_maddrs - add/del all NS mac addresses for slave</div><div class='add'>+ * @bond: bond device</div><div class='add'>+ * @slave: slave device</div><div class='add'>+ * @add: add or remove all the NS mac addresses</div><div class='add'>+ *</div><div class='add'>+ * This function tries to add or delete all the NS mac addresses on the slave</div><div class='add'>+ *</div><div class='add'>+ * Note, the IPv6 NS target address is the unicast address in Neighbor</div><div class='add'>+ * Solicitation (NS) message. The dest address of NS message should be</div><div class='add'>+ * solicited-node multicast address of the target. The dest mac of NS message</div><div class='add'>+ * is converted from the solicited-node multicast address.</div><div class='add'>+ *</div><div class='add'>+ * This function is called when</div><div class='add'>+ *   * arp_validate changes</div><div class='add'>+ *   * enslaving, releasing new slaves</div><div class='add'>+ */</div><div class='add'>+static void slave_set_ns_maddrs(struct bonding *bond, struct slave *slave, bool add)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr *targets = bond-&gt;params.ns_targets;</div><div class='add'>+	char slot_maddr[MAX_ADDR_LEN];</div><div class='add'>+	struct in6_addr mcaddr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!slave_can_set_ns_maddr(bond, slave))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BOND_MAX_NS_TARGETS; i++) {</div><div class='add'>+		if (ipv6_addr_any(&amp;targets[i]))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		addrconf_addr_solict_mult(&amp;targets[i], &amp;mcaddr);</div><div class='add'>+		if (!ndisc_mc_map(&amp;mcaddr, slot_maddr, slave-&gt;dev, 0)) {</div><div class='add'>+			if (add)</div><div class='add'>+				dev_mc_add(slave-&gt;dev, slot_maddr);</div><div class='add'>+			else</div><div class='add'>+				dev_mc_del(slave-&gt;dev, slot_maddr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bond_slave_ns_maddrs_add(struct bonding *bond, struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	if (!bond-&gt;params.arp_validate)</div><div class='add'>+		return;</div><div class='add'>+	slave_set_ns_maddrs(bond, slave, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bond_slave_ns_maddrs_del(struct bonding *bond, struct slave *slave)</div><div class='add'>+{</div><div class='add'>+	if (!bond-&gt;params.arp_validate)</div><div class='add'>+		return;</div><div class='add'>+	slave_set_ns_maddrs(bond, slave, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * slave_set_ns_maddr - set new NS mac address for slave</div><div class='add'>+ * @bond: bond device</div><div class='add'>+ * @slave: slave device</div><div class='add'>+ * @target: the new IPv6 target</div><div class='add'>+ * @slot: the old IPv6 target in the slot</div><div class='add'>+ *</div><div class='add'>+ * This function tries to replace the old mac address to new one on the slave.</div><div class='add'>+ *</div><div class='add'>+ * Note, the target/slot IPv6 address is the unicast address in Neighbor</div><div class='add'>+ * Solicitation (NS) message. The dest address of NS message should be</div><div class='add'>+ * solicited-node multicast address of the target. The dest mac of NS message</div><div class='add'>+ * is converted from the solicited-node multicast address.</div><div class='add'>+ *</div><div class='add'>+ * This function is called when</div><div class='add'>+ *   * An IPv6 NS target is added or removed.</div><div class='add'>+ */</div><div class='add'>+static void slave_set_ns_maddr(struct bonding *bond, struct slave *slave,</div><div class='add'>+			       struct in6_addr *target, struct in6_addr *slot)</div><div class='add'>+{</div><div class='add'>+	char mac_addr[MAX_ADDR_LEN];</div><div class='add'>+	struct in6_addr mcast_addr;</div><div class='add'>+</div><div class='add'>+	if (!bond-&gt;params.arp_validate || !slave_can_set_ns_maddr(bond, slave))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* remove the previous mac addr from slave */</div><div class='add'>+	addrconf_addr_solict_mult(slot, &amp;mcast_addr);</div><div class='add'>+	if (!ipv6_addr_any(slot) &amp;&amp;</div><div class='add'>+	    !ndisc_mc_map(&amp;mcast_addr, mac_addr, slave-&gt;dev, 0))</div><div class='add'>+		dev_mc_del(slave-&gt;dev, mac_addr);</div><div class='add'>+</div><div class='add'>+	/* add new mac addr on slave if target is set */</div><div class='add'>+	addrconf_addr_solict_mult(target, &amp;mcast_addr);</div><div class='add'>+	if (!ipv6_addr_any(target) &amp;&amp;</div><div class='add'>+	    !ndisc_mc_map(&amp;mcast_addr, mac_addr, slave-&gt;dev, 0))</div><div class='add'>+		dev_mc_add(slave-&gt;dev, mac_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _bond_options_ns_ip6_target_set(struct bonding *bond, int slot,</div><div class='add'>+					    struct in6_addr *target,</div><div class='add'>+					    unsigned long last_rx)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr *targets = bond-&gt;params.ns_targets;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	if (slot &gt;= 0 &amp;&amp; slot &lt; BOND_MAX_NS_TARGETS) {</div><div class='add'>+		bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+			slave-&gt;target_last_arp_rx[slot] = last_rx;</div><div class='add'>+			slave_set_ns_maddr(bond, slave, target, &amp;targets[slot]);</div><div class='add'>+		}</div><div class='add'>+		targets[slot] = *target;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bond_option_ns_ip6_targets_clear(struct bonding *bond)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr addr_any = in6addr_any;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BOND_MAX_NS_TARGETS; i++)</div><div class='add'>+		_bond_options_ns_ip6_target_set(bond, i, &amp;addr_any, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_option_ns_ip6_targets_set(struct bonding *bond,</div><div class='add'>+					  const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	struct in6_addr *target = (struct in6_addr *)newval-&gt;extra;</div><div class='add'>+	struct in6_addr *targets = bond-&gt;params.ns_targets;</div><div class='add'>+	struct in6_addr addr_any = in6addr_any;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (!bond_is_ip6_target_ok(target)) {</div><div class='add'>+		netdev_err(bond-&gt;dev, "invalid NS target %pI6c specified for addition\n",</div><div class='add'>+			   target);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bond_get_targets_ip6(targets, target) != -1) { /* dup */</div><div class='add'>+		netdev_err(bond-&gt;dev, "NS target %pI6c is already present\n",</div><div class='add'>+			   target);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = bond_get_targets_ip6(targets, &amp;addr_any); /* first free slot */</div><div class='add'>+	if (index == -1) {</div><div class='add'>+		netdev_err(bond-&gt;dev, "NS target table is full!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "Adding NS target %pI6c\n", target);</div><div class='add'>+</div><div class='add'>+	_bond_options_ns_ip6_target_set(bond, index, target, jiffies);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static int bond_option_ns_ip6_targets_set(struct bonding *bond,</div><div class='add'>+					  const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	return -EPERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slave_set_ns_maddrs(struct bonding *bond, struct slave *slave, bool add) {}</div><div class='add'>+</div><div class='add'>+void bond_slave_ns_maddrs_add(struct bonding *bond, struct slave *slave) {}</div><div class='add'>+</div><div class='add'>+void bond_slave_ns_maddrs_del(struct bonding *bond, struct slave *slave) {}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static int bond_option_arp_validate_set(struct bonding *bond,</div><div class='ctx'> 					const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='add'>+	bool changed = !!bond-&gt;params.arp_validate != !!newval-&gt;value;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='ctx'> 	netdev_dbg(bond-&gt;dev, "Setting arp_validate to %s (%llu)\n",</div><div class='ctx'> 		   newval-&gt;string, newval-&gt;value);</div><div class='ctx'> 	bond-&gt;params.arp_validate = newval-&gt;value;</div><div class='ctx'> </div><div class='add'>+	if (changed) {</div><div class='add'>+		bond_for_each_slave(bond, slave, iter)</div><div class='add'>+			slave_set_ns_maddrs(bond, slave, !!bond-&gt;params.arp_validate);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1109,6 +1468,37 @@ static int bond_option_arp_all_targets_set(struct bonding *bond,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bond_option_missed_max_set(struct bonding *bond,</div><div class='add'>+				      const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "Setting missed max to %s (%llu)\n",</div><div class='add'>+		   newval-&gt;string, newval-&gt;value);</div><div class='add'>+	bond-&gt;params.missed_max = newval-&gt;value;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_option_prio_set(struct bonding *bond,</div><div class='add'>+				const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	slave = bond_slave_get_rtnl(newval-&gt;slave_dev);</div><div class='add'>+	if (!slave) {</div><div class='add'>+		netdev_dbg(newval-&gt;slave_dev, "%s called on NULL slave\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	slave-&gt;prio = newval-&gt;value;</div><div class='add'>+</div><div class='add'>+	if (rtnl_dereference(bond-&gt;primary_slave))</div><div class='add'>+		slave_warn(bond-&gt;dev, slave-&gt;dev,</div><div class='add'>+			   "prio updated, but will not affect failover re-selection as primary slave have been set\n");</div><div class='add'>+	else</div><div class='add'>+		bond_select_active_slave(bond);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bond_option_primary_set(struct bonding *bond,</div><div class='ctx'> 				   const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='hunk'>@@ -1132,8 +1522,7 @@ static int bond_option_primary_set(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> 	bond_for_each_slave(bond, slave, iter) {</div><div class='ctx'> 		if (strncmp(slave-&gt;dev-&gt;name, primary, IFNAMSIZ) == 0) {</div><div class='del'>-			netdev_dbg(bond-&gt;dev, "Setting %s as primary slave\n",</div><div class='del'>-				   slave-&gt;dev-&gt;name);</div><div class='add'>+			slave_dbg(bond-&gt;dev, slave-&gt;dev, "Setting as primary slave\n");</div><div class='ctx'> 			rcu_assign_pointer(bond-&gt;primary_slave, slave);</div><div class='ctx'> 			strcpy(bond-&gt;params.primary, slave-&gt;dev-&gt;name);</div><div class='ctx'> 			bond-&gt;force_primary = true;</div><div class='hunk'>@@ -1147,11 +1536,10 @@ static int bond_option_primary_set(struct bonding *bond,</div><div class='ctx'> 		RCU_INIT_POINTER(bond-&gt;primary_slave, NULL);</div><div class='ctx'> 		bond_select_active_slave(bond);</div><div class='ctx'> 	}</div><div class='del'>-	strncpy(bond-&gt;params.primary, primary, IFNAMSIZ);</div><div class='del'>-	bond-&gt;params.primary[IFNAMSIZ - 1] = 0;</div><div class='add'>+	strscpy_pad(bond-&gt;params.primary, primary, IFNAMSIZ);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(bond-&gt;dev, "Recording %s as primary, but it has not been enslaved to %s yet\n",</div><div class='del'>-		   primary, bond-&gt;dev-&gt;name);</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "Recording %s as primary, but it has not been enslaved yet\n",</div><div class='add'>+		   primary);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	unblock_netpoll_tx();</div><div class='hunk'>@@ -1271,6 +1659,17 @@ static int bond_option_pps_set(struct bonding *bond,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bond_option_lacp_active_set(struct bonding *bond,</div><div class='add'>+				       const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "Setting LACP active to %s (%llu)\n",</div><div class='add'>+		   newval-&gt;string, newval-&gt;value);</div><div class='add'>+	bond-&gt;params.lacp_active = newval-&gt;value;</div><div class='add'>+	bond_3ad_update_lacp_active(bond);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bond_option_lacp_rate_set(struct bonding *bond,</div><div class='ctx'> 				     const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='hunk'>@@ -1341,7 +1740,7 @@ static int bond_option_queue_id_set(struct bonding *bond,</div><div class='ctx'> 		goto err_no_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* Actually set the qids for the slave */</div><div class='del'>-	update_slave-&gt;queue_id = qid;</div><div class='add'>+	WRITE_ONCE(update_slave-&gt;queue_id, qid);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -1378,12 +1777,12 @@ static int bond_option_slaves_set(struct bonding *bond,</div><div class='ctx'> </div><div class='ctx'> 	switch (command[0]) {</div><div class='ctx'> 	case '+':</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "Adding slave %s\n", dev-&gt;name);</div><div class='add'>+		slave_dbg(bond-&gt;dev, dev, "Enslaving interface\n");</div><div class='ctx'> 		ret = bond_enslave(bond-&gt;dev, dev, NULL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case '-':</div><div class='del'>-		netdev_dbg(bond-&gt;dev, "Removing slave %s\n", dev-&gt;name);</div><div class='add'>+		slave_dbg(bond-&gt;dev, dev, "Releasing interface\n");</div><div class='ctx'> 		ret = bond_release(bond-&gt;dev, dev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1423,6 +1822,26 @@ static int bond_option_ad_actor_sys_prio_set(struct bonding *bond,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bond_option_actor_port_prio_set(struct bonding *bond,</div><div class='add'>+					   const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	struct slave *slave;</div><div class='add'>+</div><div class='add'>+	slave = bond_slave_get_rtnl(newval-&gt;slave_dev);</div><div class='add'>+	if (!slave) {</div><div class='add'>+		netdev_dbg(bond-&gt;dev, "%s called on NULL slave\n", __func__);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(newval-&gt;slave_dev, "Setting actor_port_prio to %llu\n",</div><div class='add'>+		   newval-&gt;value);</div><div class='add'>+</div><div class='add'>+	SLAVE_AD_INFO(slave)-&gt;port_priority = newval-&gt;value;</div><div class='add'>+	bond_3ad_update_ad_actor_settings(bond);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bond_option_ad_actor_system_set(struct bonding *bond,</div><div class='ctx'> 					   const struct bond_opt_value *newval)</div><div class='ctx'> {</div><div class='hunk'>@@ -1437,7 +1856,7 @@ static int bond_option_ad_actor_system_set(struct bonding *bond,</div><div class='ctx'> 		mac = (u8 *)&amp;newval-&gt;value;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr(mac))</div><div class='add'>+	if (is_multicast_ether_addr(mac))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(bond-&gt;dev, "Setting ad_actor_system to %pM\n", mac);</div><div class='hunk'>@@ -1447,7 +1866,7 @@ static int bond_option_ad_actor_system_set(struct bonding *bond,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	netdev_err(bond-&gt;dev, "Invalid MAC address.\n");</div><div class='add'>+	netdev_err(bond-&gt;dev, "Invalid ad_actor_system MAC address.\n");</div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1460,3 +1879,32 @@ static int bond_option_ad_user_port_key_set(struct bonding *bond,</div><div class='ctx'> 	bond-&gt;params.ad_user_port_key = newval-&gt;value;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static int bond_option_coupled_control_set(struct bonding *bond,</div><div class='add'>+					   const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	netdev_info(bond-&gt;dev, "Setting coupled_control to %s (%llu)\n",</div><div class='add'>+		    newval-&gt;string, newval-&gt;value);</div><div class='add'>+</div><div class='add'>+	bond-&gt;params.coupled_control = newval-&gt;value;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bond_option_broadcast_neigh_set(struct bonding *bond,</div><div class='add'>+					   const struct bond_opt_value *newval)</div><div class='add'>+{</div><div class='add'>+	if (bond-&gt;params.broadcast_neighbor == newval-&gt;value)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bond-&gt;params.broadcast_neighbor = newval-&gt;value;</div><div class='add'>+	if (bond-&gt;dev-&gt;flags &amp; IFF_UP) {</div><div class='add'>+		if (bond-&gt;params.broadcast_neighbor)</div><div class='add'>+			static_branch_inc(&amp;bond_bcast_neigh_enabled);</div><div class='add'>+		else</div><div class='add'>+			static_branch_dec(&amp;bond_bcast_neigh_enabled);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(bond-&gt;dev, "Setting broadcast_neighbor to %s (%llu)\n",</div><div class='add'>+		   newval-&gt;string, newval-&gt;value);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c<br/>index 9f7d83e827c3..7edf72ec816a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_procfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_procfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_procfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_procfs.c</a></div><div class='hunk'>@@ -1,5 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> #include &lt;linux/proc_fs.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;net/net_namespace.h&gt;</div><div class='ctx'> #include &lt;net/netns/generic.h&gt;</div><div class='hunk'>@@ -10,7 +11,7 @@</div><div class='ctx'> static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> 	__acquires(RCU)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bonding *bond = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	loff_t off = 0;</div><div class='hunk'>@@ -29,7 +30,7 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> </div><div class='ctx'> static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bonding *bond = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	struct list_head *iter;</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	bool found = false;</div><div class='hunk'>@@ -56,7 +57,7 @@ static void bond_info_seq_stop(struct seq_file *seq, void *v)</div><div class='ctx'> </div><div class='ctx'> static void bond_info_show_master(struct seq_file *seq)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bonding *bond = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> 	const struct bond_opt_value *optval;</div><div class='ctx'> 	struct slave *curr, *primary;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -104,13 +105,18 @@ static void bond_info_show_master(struct seq_file *seq)</div><div class='ctx'> 		   bond-&gt;params.updelay * bond-&gt;params.miimon);</div><div class='ctx'> 	seq_printf(seq, "Down Delay (ms): %d\n",</div><div class='ctx'> 		   bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='add'>+	seq_printf(seq, "Peer Notification Delay (ms): %d\n",</div><div class='add'>+		   bond-&gt;params.peer_notif_delay * bond-&gt;params.miimon);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* ARP information */</div><div class='ctx'> 	if (bond-&gt;params.arp_interval &gt; 0) {</div><div class='ctx'> 		int printed = 0;</div><div class='add'>+</div><div class='ctx'> 		seq_printf(seq, "ARP Polling Interval (ms): %d\n",</div><div class='ctx'> 				bond-&gt;params.arp_interval);</div><div class='add'>+		seq_printf(seq, "ARP Missed Max: %u\n",</div><div class='add'>+				bond-&gt;params.missed_max);</div><div class='ctx'> </div><div class='ctx'> 		seq_printf(seq, "ARP IP target/s (n.n.n.n form):");</div><div class='ctx'> </div><div class='hunk'>@@ -123,12 +129,29 @@ static void bond_info_show_master(struct seq_file *seq)</div><div class='ctx'> 			printed = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 		seq_printf(seq, "\n");</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+		printed = 0;</div><div class='add'>+		seq_printf(seq, "NS IPv6 target/s (xx::xx form):");</div><div class='add'>+</div><div class='add'>+		for (i = 0; (i &lt; BOND_MAX_NS_TARGETS); i++) {</div><div class='add'>+			if (ipv6_addr_any(&amp;bond-&gt;params.ns_targets[i]))</div><div class='add'>+				break;</div><div class='add'>+			if (printed)</div><div class='add'>+				seq_printf(seq, ",");</div><div class='add'>+			seq_printf(seq, " %pI6c", &amp;bond-&gt;params.ns_targets[i]);</div><div class='add'>+			printed = 1;</div><div class='add'>+		}</div><div class='add'>+		seq_printf(seq, "\n");</div><div class='add'>+#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='ctx'> </div><div class='ctx'> 		seq_puts(seq, "\n802.3ad info\n");</div><div class='add'>+		seq_printf(seq, "LACP active: %s\n",</div><div class='add'>+			   (bond-&gt;params.lacp_active) ? "on" : "off");</div><div class='ctx'> 		seq_printf(seq, "LACP rate: %s\n",</div><div class='ctx'> 			   (bond-&gt;params.lacp_fast) ? "fast" : "slow");</div><div class='ctx'> 		seq_printf(seq, "Min links: %d\n", bond-&gt;params.min_links);</div><div class='hunk'>@@ -167,7 +190,7 @@ static void bond_info_show_master(struct seq_file *seq)</div><div class='ctx'> static void bond_info_show_slave(struct seq_file *seq,</div><div class='ctx'> 				 const struct slave *slave)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = PDE_DATA(file_inode(seq-&gt;file));</div><div class='add'>+	struct bonding *bond = pde_data(file_inode(seq-&gt;file));</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "\nSlave Interface: %s\n", slave-&gt;dev-&gt;name);</div><div class='ctx'> 	seq_printf(seq, "MII Status: %s\n", bond_slave_link_status(slave-&gt;link));</div><div class='hunk'>@@ -186,7 +209,7 @@ static void bond_info_show_slave(struct seq_file *seq,</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(seq, "Permanent HW addr: %*phC\n",</div><div class='ctx'> 		   slave-&gt;dev-&gt;addr_len, slave-&gt;perm_hwaddr);</div><div class='del'>-	seq_printf(seq, "Slave queue ID: %d\n", slave-&gt;queue_id);</div><div class='add'>+	seq_printf(seq, "Slave queue ID: %d\n", READ_ONCE(slave-&gt;queue_id));</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		const struct port *port = &amp;SLAVE_AD_INFO(slave)-&gt;port;</div><div class='hunk'>@@ -299,7 +322,6 @@ void __net_init bond_create_proc_dir(struct bond_net *bn)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Destroy the bonding directory under /proc/net, if empty.</div><div class='del'>- * Caller must hold rtnl_lock.</div><div class='ctx'>  */</div><div class='ctx'> void __net_exit bond_destroy_proc_dir(struct bond_net *bn)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c<br/>index 94214eaf53c5..9a75ad3181ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_sysfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_sysfs.c</a></div><div class='hunk'>@@ -31,35 +31,35 @@</div><div class='ctx'> /* "show" function for the bond_masters attribute.</div><div class='ctx'>  * The class parameter is ignored.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t bonding_show_bonds(struct class *cls,</div><div class='del'>-				  struct class_attribute *attr,</div><div class='add'>+static ssize_t bonding_show_bonds(const struct class *cls,</div><div class='add'>+				  const struct class_attribute *attr,</div><div class='ctx'> 				  char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct bond_net *bn =</div><div class='del'>-		container_of(attr, struct bond_net, class_attr_bonding_masters);</div><div class='del'>-	int res = 0;</div><div class='add'>+	const struct bond_net *bn =</div><div class='add'>+		container_of_const(attr, struct bond_net, class_attr_bonding_masters);</div><div class='ctx'> 	struct bonding *bond;</div><div class='add'>+	int res = 0;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(bond, &amp;bn-&gt;dev_list, bond_list) {</div><div class='add'>+	list_for_each_entry_rcu(bond, &amp;bn-&gt;dev_list, bond_list) {</div><div class='ctx'> 		if (res &gt; (PAGE_SIZE - IFNAMSIZ)) {</div><div class='ctx'> 			/* not enough space for another interface name */</div><div class='ctx'> 			if ((PAGE_SIZE - res) &gt; 10)</div><div class='ctx'> 				res = PAGE_SIZE - 10;</div><div class='del'>-			res += sprintf(buf + res, "++more++ ");</div><div class='add'>+			res += sysfs_emit_at(buf, res, "++more++ ");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		res += sprintf(buf + res, "%s ", bond-&gt;dev-&gt;name);</div><div class='add'>+		res += sysfs_emit_at(buf, res, "%s ", bond-&gt;dev-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		buf[res-1] = '\n'; /* eat the leftover space */</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device *bond_get_by_name(struct bond_net *bn, const char *ifname)</div><div class='add'>+static struct net_device *bond_get_by_name(const struct bond_net *bn, const char *ifname)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond;</div><div class='ctx'> </div><div class='hunk'>@@ -75,12 +75,12 @@ static struct net_device *bond_get_by_name(struct bond_net *bn, const char *ifna</div><div class='ctx'>  *</div><div class='ctx'>  * The class parameter is ignored.</div><div class='ctx'>  */</div><div class='del'>-static ssize_t bonding_store_bonds(struct class *cls,</div><div class='del'>-				   struct class_attribute *attr,</div><div class='add'>+static ssize_t bonding_store_bonds(const struct class *cls,</div><div class='add'>+				   const struct class_attribute *attr,</div><div class='ctx'> 				   const char *buffer, size_t count)</div><div class='ctx'> {</div><div class='del'>-	struct bond_net *bn =</div><div class='del'>-		container_of(attr, struct bond_net, class_attr_bonding_masters);</div><div class='add'>+	const struct bond_net *bn =</div><div class='add'>+		container_of_const(attr, struct bond_net, class_attr_bonding_masters);</div><div class='ctx'> 	char command[IFNAMSIZ + 1] = {0, };</div><div class='ctx'> 	char *ifname;</div><div class='ctx'> 	int rv, res = count;</div><div class='hunk'>@@ -170,21 +170,20 @@ static ssize_t bonding_show_slaves(struct device *d,</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 		if (res &gt; (PAGE_SIZE - IFNAMSIZ)) {</div><div class='ctx'> 			/* not enough space for another interface name */</div><div class='ctx'> 			if ((PAGE_SIZE - res) &gt; 10)</div><div class='ctx'> 				res = PAGE_SIZE - 10;</div><div class='del'>-			res += sprintf(buf + res, "++more++ ");</div><div class='add'>+			res += sysfs_emit_at(buf, res, "++more++ ");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		res += sprintf(buf + res, "%s ", slave-&gt;dev-&gt;name);</div><div class='add'>+		res += sysfs_emit_at(buf, res, "%s ", slave-&gt;dev-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (res)</div><div class='ctx'> 		buf[res-1] = '\n'; /* eat the leftover space */</div><div class='hunk'>@@ -203,7 +202,7 @@ static ssize_t bonding_show_mode(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_MODE, BOND_MODE(bond));</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n", val-&gt;string, BOND_MODE(bond));</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, BOND_MODE(bond));</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(mode, 0644, bonding_show_mode, bonding_sysfs_store_option);</div><div class='ctx'> </div><div class='hunk'>@@ -217,7 +216,7 @@ static ssize_t bonding_show_xmit_hash(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_XMIT_HASH, bond-&gt;params.xmit_policy);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n", val-&gt;string, bond-&gt;params.xmit_policy);</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, bond-&gt;params.xmit_policy);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(xmit_hash_policy, 0644,</div><div class='ctx'> 		   bonding_show_xmit_hash, bonding_sysfs_store_option);</div><div class='hunk'>@@ -233,7 +232,7 @@ static ssize_t bonding_show_arp_validate(struct device *d,</div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_ARP_VALIDATE,</div><div class='ctx'> 			       bond-&gt;params.arp_validate);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n", val-&gt;string, bond-&gt;params.arp_validate);</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, bond-&gt;params.arp_validate);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(arp_validate, 0644, bonding_show_arp_validate,</div><div class='ctx'> 		   bonding_sysfs_store_option);</div><div class='hunk'>@@ -248,7 +247,7 @@ static ssize_t bonding_show_arp_all_targets(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_ARP_ALL_TARGETS,</div><div class='ctx'> 			       bond-&gt;params.arp_all_targets);</div><div class='del'>-	return sprintf(buf, "%s %d\n",</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n",</div><div class='ctx'> 		       val-&gt;string, bond-&gt;params.arp_all_targets);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(arp_all_targets, 0644,</div><div class='hunk'>@@ -265,7 +264,7 @@ static ssize_t bonding_show_fail_over_mac(struct device *d,</div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_FAIL_OVER_MAC,</div><div class='ctx'> 			       bond-&gt;params.fail_over_mac);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n", val-&gt;string, bond-&gt;params.fail_over_mac);</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, bond-&gt;params.fail_over_mac);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(fail_over_mac, 0644,</div><div class='ctx'> 		   bonding_show_fail_over_mac, bonding_sysfs_store_option);</div><div class='hunk'>@@ -277,7 +276,7 @@ static ssize_t bonding_show_arp_interval(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.arp_interval);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.arp_interval);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(arp_interval, 0644,</div><div class='ctx'> 		   bonding_show_arp_interval, bonding_sysfs_store_option);</div><div class='hunk'>@@ -292,8 +291,8 @@ static ssize_t bonding_show_arp_targets(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BOND_MAX_ARP_TARGETS; i++) {</div><div class='ctx'> 		if (bond-&gt;params.arp_targets[i])</div><div class='del'>-			res += sprintf(buf + res, "%pI4 ",</div><div class='del'>-				       &amp;bond-&gt;params.arp_targets[i]);</div><div class='add'>+			res += sysfs_emit_at(buf, res, "%pI4 ",</div><div class='add'>+					     &amp;bond-&gt;params.arp_targets[i]);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		buf[res-1] = '\n'; /* eat the leftover space */</div><div class='hunk'>@@ -303,6 +302,18 @@ static ssize_t bonding_show_arp_targets(struct device *d,</div><div class='ctx'> static DEVICE_ATTR(arp_ip_target, 0644,</div><div class='ctx'> 		   bonding_show_arp_targets, bonding_sysfs_store_option);</div><div class='ctx'> </div><div class='add'>+/* Show the arp missed max. */</div><div class='add'>+static ssize_t bonding_show_missed_max(struct device *d,</div><div class='add'>+				       struct device_attribute *attr,</div><div class='add'>+				       char *buf)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = to_bond(d);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%u\n", bond-&gt;params.missed_max);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(arp_missed_max, 0644,</div><div class='add'>+		   bonding_show_missed_max, bonding_sysfs_store_option);</div><div class='add'>+</div><div class='ctx'> /* Show the up and down delays. */</div><div class='ctx'> static ssize_t bonding_show_downdelay(struct device *d,</div><div class='ctx'> 				      struct device_attribute *attr,</div><div class='hunk'>@@ -310,7 +321,7 @@ static ssize_t bonding_show_downdelay(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.downdelay * bond-&gt;params.miimon);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(downdelay, 0644,</div><div class='ctx'> 		   bonding_show_downdelay, bonding_sysfs_store_option);</div><div class='hunk'>@@ -321,26 +332,52 @@ static ssize_t bonding_show_updelay(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.updelay * bond-&gt;params.miimon);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.updelay * bond-&gt;params.miimon);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(updelay, 0644,</div><div class='ctx'> 		   bonding_show_updelay, bonding_sysfs_store_option);</div><div class='ctx'> </div><div class='del'>-/* Show the LACP interval. */</div><div class='del'>-static ssize_t bonding_show_lacp(struct device *d,</div><div class='del'>-				 struct device_attribute *attr,</div><div class='del'>-				 char *buf)</div><div class='add'>+static ssize_t bonding_show_peer_notif_delay(struct device *d,</div><div class='add'>+					     struct device_attribute *attr,</div><div class='add'>+					     char *buf)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = to_bond(d);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%d\n",</div><div class='add'>+			  bond-&gt;params.peer_notif_delay * bond-&gt;params.miimon);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(peer_notif_delay, 0644,</div><div class='add'>+		   bonding_show_peer_notif_delay, bonding_sysfs_store_option);</div><div class='add'>+</div><div class='add'>+/* Show the LACP activity and interval. */</div><div class='add'>+static ssize_t bonding_show_lacp_active(struct device *d,</div><div class='add'>+					struct device_attribute *attr,</div><div class='add'>+					char *buf)</div><div class='add'>+{</div><div class='add'>+	struct bonding *bond = to_bond(d);</div><div class='add'>+	const struct bond_opt_value *val;</div><div class='add'>+</div><div class='add'>+	val = bond_opt_get_val(BOND_OPT_LACP_ACTIVE, bond-&gt;params.lacp_active);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, bond-&gt;params.lacp_active);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR(lacp_active, 0644,</div><div class='add'>+		   bonding_show_lacp_active, bonding_sysfs_store_option);</div><div class='add'>+</div><div class='add'>+static ssize_t bonding_show_lacp_rate(struct device *d,</div><div class='add'>+				      struct device_attribute *attr,</div><div class='add'>+				      char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> 	const struct bond_opt_value *val;</div><div class='ctx'> </div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_LACP_RATE, bond-&gt;params.lacp_fast);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n", val-&gt;string, bond-&gt;params.lacp_fast);</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, bond-&gt;params.lacp_fast);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(lacp_rate, 0644,</div><div class='del'>-		   bonding_show_lacp, bonding_sysfs_store_option);</div><div class='add'>+		   bonding_show_lacp_rate, bonding_sysfs_store_option);</div><div class='ctx'> </div><div class='ctx'> static ssize_t bonding_show_min_links(struct device *d,</div><div class='ctx'> 				      struct device_attribute *attr,</div><div class='hunk'>@@ -348,7 +385,7 @@ static ssize_t bonding_show_min_links(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", bond-&gt;params.min_links);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", bond-&gt;params.min_links);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(min_links, 0644,</div><div class='ctx'> 		   bonding_show_min_links, bonding_sysfs_store_option);</div><div class='hunk'>@@ -362,7 +399,7 @@ static ssize_t bonding_show_ad_select(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_AD_SELECT, bond-&gt;params.ad_select);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n", val-&gt;string, bond-&gt;params.ad_select);</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n", val-&gt;string, bond-&gt;params.ad_select);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(ad_select, 0644,</div><div class='ctx'> 		   bonding_show_ad_select, bonding_sysfs_store_option);</div><div class='hunk'>@@ -373,7 +410,8 @@ static ssize_t bonding_show_num_peer_notif(struct device *d,</div><div class='ctx'> 					   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.num_peer_notif);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.num_peer_notif);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(num_grat_arp, 0644,</div><div class='ctx'> 		   bonding_show_num_peer_notif, bonding_sysfs_store_option);</div><div class='hunk'>@@ -387,7 +425,7 @@ static ssize_t bonding_show_miimon(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.miimon);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.miimon);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(miimon, 0644,</div><div class='ctx'> 		   bonding_show_miimon, bonding_sysfs_store_option);</div><div class='hunk'>@@ -404,7 +442,7 @@ static ssize_t bonding_show_primary(struct device *d,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	primary = rcu_dereference(bond-&gt;primary_slave);</div><div class='ctx'> 	if (primary)</div><div class='del'>-		count = sprintf(buf, "%s\n", primary-&gt;dev-&gt;name);</div><div class='add'>+		count = sysfs_emit(buf, "%s\n", primary-&gt;dev-&gt;name);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -423,20 +461,18 @@ static ssize_t bonding_show_primary_reselect(struct device *d,</div><div class='ctx'> 	val = bond_opt_get_val(BOND_OPT_PRIMARY_RESELECT,</div><div class='ctx'> 			       bond-&gt;params.primary_reselect);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s %d\n",</div><div class='del'>-		       val-&gt;string, bond-&gt;params.primary_reselect);</div><div class='add'>+	return sysfs_emit(buf, "%s %d\n",</div><div class='add'>+			  val-&gt;string, bond-&gt;params.primary_reselect);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(primary_reselect, 0644,</div><div class='ctx'> 		   bonding_show_primary_reselect, bonding_sysfs_store_option);</div><div class='ctx'> </div><div class='del'>-/* Show the use_carrier flag. */</div><div class='add'>+/* use_carrier is obsolete, but print value for compatibility */</div><div class='ctx'> static ssize_t bonding_show_carrier(struct device *d,</div><div class='ctx'> 				    struct device_attribute *attr,</div><div class='ctx'> 				    char *buf)</div><div class='ctx'> {</div><div class='del'>-	struct bonding *bond = to_bond(d);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.use_carrier);</div><div class='add'>+	return sysfs_emit(buf, "1\n");</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(use_carrier, 0644,</div><div class='ctx'> 		   bonding_show_carrier, bonding_sysfs_store_option);</div><div class='hunk'>@@ -454,7 +490,7 @@ static ssize_t bonding_show_active_slave(struct device *d,</div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	slave_dev = bond_option_active_slave_get_rcu(bond);</div><div class='ctx'> 	if (slave_dev)</div><div class='del'>-		count = sprintf(buf, "%s\n", slave_dev-&gt;name);</div><div class='add'>+		count = sysfs_emit(buf, "%s\n", slave_dev-&gt;name);</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -470,7 +506,7 @@ static ssize_t bonding_show_mii_status(struct device *d,</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> 	bool active = netif_carrier_ok(bond-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%s\n", active ? "up" : "down");</div><div class='add'>+	return sysfs_emit(buf, "%s\n", active ? "up" : "down");</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(mii_status, 0444, bonding_show_mii_status, NULL);</div><div class='ctx'> </div><div class='hunk'>@@ -484,9 +520,10 @@ static ssize_t bonding_show_ad_aggregator(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='del'>-		count = sprintf(buf, "%d\n",</div><div class='del'>-				bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='del'>-				?  0 : ad_info.aggregator_id);</div><div class='add'>+</div><div class='add'>+		count = sysfs_emit(buf, "%d\n",</div><div class='add'>+				   bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='add'>+				   ?  0 : ad_info.aggregator_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -504,9 +541,10 @@ static ssize_t bonding_show_ad_num_ports(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='del'>-		count = sprintf(buf, "%d\n",</div><div class='del'>-				bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='del'>-				?  0 : ad_info.ports);</div><div class='add'>+</div><div class='add'>+		count = sysfs_emit(buf, "%d\n",</div><div class='add'>+				   bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='add'>+				   ?  0 : ad_info.ports);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -524,9 +562,10 @@ static ssize_t bonding_show_ad_actor_key(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp; capable(CAP_NET_ADMIN)) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='del'>-		count = sprintf(buf, "%d\n",</div><div class='del'>-				bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='del'>-				?  0 : ad_info.actor_key);</div><div class='add'>+</div><div class='add'>+		count = sysfs_emit(buf, "%d\n",</div><div class='add'>+				   bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='add'>+				   ?  0 : ad_info.actor_key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -544,9 +583,10 @@ static ssize_t bonding_show_ad_partner_key(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp; capable(CAP_NET_ADMIN)) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='del'>-		count = sprintf(buf, "%d\n",</div><div class='del'>-				bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='del'>-				?  0 : ad_info.partner_key);</div><div class='add'>+</div><div class='add'>+		count = sysfs_emit(buf, "%d\n",</div><div class='add'>+				   bond_3ad_get_active_agg_info(bond, &amp;ad_info)</div><div class='add'>+				   ?  0 : ad_info.partner_key);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -564,8 +604,9 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp; capable(CAP_NET_ADMIN)) {</div><div class='ctx'> 		struct ad_info ad_info;</div><div class='add'>+</div><div class='ctx'> 		if (!bond_3ad_get_active_agg_info(bond, &amp;ad_info))</div><div class='del'>-			count = sprintf(buf, "%pM\n", ad_info.partner_system);</div><div class='add'>+			count = sysfs_emit(buf, "%pM\n", ad_info.partner_system);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='hunk'>@@ -582,24 +623,24 @@ static ssize_t bonding_show_queue_id(struct device *d,</div><div class='ctx'> 	struct slave *slave;</div><div class='ctx'> 	int res = 0;</div><div class='ctx'> </div><div class='del'>-	if (!rtnl_trylock())</div><div class='del'>-		return restart_syscall();</div><div class='add'>+	rcu_read_lock();</div><div class='ctx'> </div><div class='del'>-	bond_for_each_slave(bond, slave, iter) {</div><div class='add'>+	bond_for_each_slave_rcu(bond, slave, iter) {</div><div class='ctx'> 		if (res &gt; (PAGE_SIZE - IFNAMSIZ - 6)) {</div><div class='ctx'> 			/* not enough space for another interface_name:queue_id pair */</div><div class='ctx'> 			if ((PAGE_SIZE - res) &gt; 10)</div><div class='ctx'> 				res = PAGE_SIZE - 10;</div><div class='del'>-			res += sprintf(buf + res, "++more++ ");</div><div class='add'>+			res += sysfs_emit_at(buf, res, "++more++ ");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		res += sprintf(buf + res, "%s:%d ",</div><div class='del'>-			       slave-&gt;dev-&gt;name, slave-&gt;queue_id);</div><div class='add'>+		res += sysfs_emit_at(buf, res, "%s:%d ",</div><div class='add'>+				     slave-&gt;dev-&gt;name,</div><div class='add'>+				     READ_ONCE(slave-&gt;queue_id));</div><div class='ctx'> 	}</div><div class='ctx'> 	if (res)</div><div class='ctx'> 		buf[res-1] = '\n'; /* eat the leftover space */</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='hunk'>@@ -614,7 +655,7 @@ static ssize_t bonding_show_slaves_active(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.all_slaves_active);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.all_slaves_active);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(all_slaves_active, 0644,</div><div class='ctx'> 		   bonding_show_slaves_active, bonding_sysfs_store_option);</div><div class='hunk'>@@ -626,7 +667,7 @@ static ssize_t bonding_show_resend_igmp(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.resend_igmp);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.resend_igmp);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(resend_igmp, 0644,</div><div class='ctx'> 		   bonding_show_resend_igmp, bonding_sysfs_store_option);</div><div class='hunk'>@@ -638,7 +679,7 @@ static ssize_t bonding_show_lp_interval(struct device *d,</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.lp_interval);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.lp_interval);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(lp_interval, 0644,</div><div class='ctx'> 		   bonding_show_lp_interval, bonding_sysfs_store_option);</div><div class='hunk'>@@ -648,7 +689,8 @@ static ssize_t bonding_show_tlb_dynamic_lb(struct device *d,</div><div class='ctx'> 					   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='del'>-	return sprintf(buf, "%d\n", bond-&gt;params.tlb_dynamic_lb);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%d\n", bond-&gt;params.tlb_dynamic_lb);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(tlb_dynamic_lb, 0644,</div><div class='ctx'> 		   bonding_show_tlb_dynamic_lb, bonding_sysfs_store_option);</div><div class='hunk'>@@ -660,7 +702,7 @@ static ssize_t bonding_show_packets_per_slave(struct device *d,</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> 	unsigned int packets_per_slave = bond-&gt;params.packets_per_slave;</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "%u\n", packets_per_slave);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", packets_per_slave);</div><div class='ctx'> }</div><div class='ctx'> static DEVICE_ATTR(packets_per_slave, 0644,</div><div class='ctx'> 		   bonding_show_packets_per_slave, bonding_sysfs_store_option);</div><div class='hunk'>@@ -672,7 +714,7 @@ static ssize_t bonding_show_ad_actor_sys_prio(struct device *d,</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp; capable(CAP_NET_ADMIN))</div><div class='del'>-		return sprintf(buf, "%hu\n", bond-&gt;params.ad_actor_sys_prio);</div><div class='add'>+		return sysfs_emit(buf, "%hu\n", bond-&gt;params.ad_actor_sys_prio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -686,7 +728,7 @@ static ssize_t bonding_show_ad_actor_system(struct device *d,</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp; capable(CAP_NET_ADMIN))</div><div class='del'>-		return sprintf(buf, "%pM\n", bond-&gt;params.ad_actor_system);</div><div class='add'>+		return sysfs_emit(buf, "%pM\n", bond-&gt;params.ad_actor_system);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -701,7 +743,7 @@ static ssize_t bonding_show_ad_user_port_key(struct device *d,</div><div class='ctx'> 	struct bonding *bond = to_bond(d);</div><div class='ctx'> </div><div class='ctx'> 	if (BOND_MODE(bond) == BOND_MODE_8023AD &amp;&amp; capable(CAP_NET_ADMIN))</div><div class='del'>-		return sprintf(buf, "%hu\n", bond-&gt;params.ad_user_port_key);</div><div class='add'>+		return sysfs_emit(buf, "%hu\n", bond-&gt;params.ad_user_port_key);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -718,6 +760,8 @@ static struct attribute *per_bond_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_arp_ip_target.attr,</div><div class='ctx'> 	&amp;dev_attr_downdelay.attr,</div><div class='ctx'> 	&amp;dev_attr_updelay.attr,</div><div class='add'>+	&amp;dev_attr_peer_notif_delay.attr,</div><div class='add'>+	&amp;dev_attr_lacp_active.attr,</div><div class='ctx'> 	&amp;dev_attr_lacp_rate.attr,</div><div class='ctx'> 	&amp;dev_attr_ad_select.attr,</div><div class='ctx'> 	&amp;dev_attr_xmit_hash_policy.attr,</div><div class='hunk'>@@ -744,6 +788,7 @@ static struct attribute *per_bond_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_ad_actor_sys_prio.attr,</div><div class='ctx'> 	&amp;dev_attr_ad_actor_system.attr,</div><div class='ctx'> 	&amp;dev_attr_ad_user_port_key.attr,</div><div class='add'>+	&amp;dev_attr_arp_missed_max.attr,</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -755,7 +800,7 @@ static const struct attribute_group bonding_group = {</div><div class='ctx'> /* Initialize sysfs.  This sets up the bonding_masters file in</div><div class='ctx'>  * /sys/class/net.</div><div class='ctx'>  */</div><div class='del'>-int bond_create_sysfs(struct bond_net *bn)</div><div class='add'>+int __net_init bond_create_sysfs(struct bond_net *bn)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -776,8 +821,8 @@ int bond_create_sysfs(struct bond_net *bn)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (ret == -EEXIST) {</div><div class='ctx'> 		/* Is someone being kinky and naming a device bonding_master? */</div><div class='del'>-		if (__dev_get_by_name(bn-&gt;net,</div><div class='del'>-				      class_attr_bonding_masters.attr.name))</div><div class='add'>+		if (netdev_name_in_use(bn-&gt;net,</div><div class='add'>+				       class_attr_bonding_masters.attr.name))</div><div class='ctx'> 			pr_err("network device named %s already exists in sysfs\n",</div><div class='ctx'> 			       class_attr_bonding_masters.attr.name);</div><div class='ctx'> 		ret = 0;</div><div class='hunk'>@@ -788,7 +833,7 @@ int bond_create_sysfs(struct bond_net *bn)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove /sys/class/net/bonding_masters. */</div><div class='del'>-void bond_destroy_sysfs(struct bond_net *bn)</div><div class='add'>+void __net_exit bond_destroy_sysfs(struct bond_net *bn)</div><div class='ctx'> {</div><div class='ctx'> 	netdev_class_remove_file_ns(&amp;bn-&gt;class_attr_bonding_masters, bn-&gt;net);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c<br/>index 007481557191..36d0e8440b5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_sysfs_slave.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bond_sysfs_slave.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bond_sysfs_slave.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bond_sysfs_slave.c</a></div><div class='hunk'>@@ -15,43 +15,37 @@ struct slave_attribute {</div><div class='ctx'> 	ssize_t (*show)(struct slave *, char *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define SLAVE_ATTR(_name, _mode, _show)				\</div><div class='del'>-const struct slave_attribute slave_attr_##_name = {		\</div><div class='del'>-	.attr = {.name = __stringify(_name),			\</div><div class='del'>-		 .mode = _mode },				\</div><div class='del'>-	.show	= _show,					\</div><div class='del'>-};</div><div class='ctx'> #define SLAVE_ATTR_RO(_name)					\</div><div class='del'>-	SLAVE_ATTR(_name, 0444, _name##_show)</div><div class='add'>+const struct slave_attribute slave_attr_##_name = __ATTR_RO(_name)</div><div class='ctx'> </div><div class='ctx'> static ssize_t state_show(struct slave *slave, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	switch (bond_slave_state(slave)) {</div><div class='ctx'> 	case BOND_STATE_ACTIVE:</div><div class='del'>-		return sprintf(buf, "active\n");</div><div class='add'>+		return sysfs_emit(buf, "active\n");</div><div class='ctx'> 	case BOND_STATE_BACKUP:</div><div class='del'>-		return sprintf(buf, "backup\n");</div><div class='add'>+		return sysfs_emit(buf, "backup\n");</div><div class='ctx'> 	default:</div><div class='del'>-		return sprintf(buf, "UNKNOWN\n");</div><div class='add'>+		return sysfs_emit(buf, "UNKNOWN\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(state);</div><div class='ctx'> </div><div class='ctx'> static ssize_t mii_status_show(struct slave *slave, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%s\n", bond_slave_link_status(slave-&gt;link));</div><div class='add'>+	return sysfs_emit(buf, "%s\n", bond_slave_link_status(slave-&gt;link));</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(mii_status);</div><div class='ctx'> </div><div class='ctx'> static ssize_t link_failure_count_show(struct slave *slave, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%d\n", slave-&gt;link_failure_count);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", slave-&gt;link_failure_count);</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(link_failure_count);</div><div class='ctx'> </div><div class='ctx'> static ssize_t perm_hwaddr_show(struct slave *slave, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%*phC\n",</div><div class='add'>+	return sysfs_emit(buf, "%*phC\n",</div><div class='ctx'> 		       slave-&gt;dev-&gt;addr_len,</div><div class='ctx'> 		       slave-&gt;perm_hwaddr);</div><div class='ctx'> }</div><div class='hunk'>@@ -59,7 +53,7 @@ static SLAVE_ATTR_RO(perm_hwaddr);</div><div class='ctx'> </div><div class='ctx'> static ssize_t queue_id_show(struct slave *slave, char *buf)</div><div class='ctx'> {</div><div class='del'>-	return sprintf(buf, "%d\n", slave-&gt;queue_id);</div><div class='add'>+	return sysfs_emit(buf, "%d\n", READ_ONCE(slave-&gt;queue_id));</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(queue_id);</div><div class='ctx'> </div><div class='hunk'>@@ -70,11 +64,11 @@ static ssize_t ad_aggregator_id_show(struct slave *slave, char *buf)</div><div class='ctx'> 	if (BOND_MODE(slave-&gt;bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		agg = SLAVE_AD_INFO(slave)-&gt;port.aggregator;</div><div class='ctx'> 		if (agg)</div><div class='del'>-			return sprintf(buf, "%d\n",</div><div class='del'>-				       agg-&gt;aggregator_identifier);</div><div class='add'>+			return sysfs_emit(buf, "%d\n",</div><div class='add'>+					  agg-&gt;aggregator_identifier);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "N/A\n");</div><div class='add'>+	return sysfs_emit(buf, "N/A\n");</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(ad_aggregator_id);</div><div class='ctx'> </div><div class='hunk'>@@ -85,11 +79,11 @@ static ssize_t ad_actor_oper_port_state_show(struct slave *slave, char *buf)</div><div class='ctx'> 	if (BOND_MODE(slave-&gt;bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		ad_port = &amp;SLAVE_AD_INFO(slave)-&gt;port;</div><div class='ctx'> 		if (ad_port-&gt;aggregator)</div><div class='del'>-			return sprintf(buf, "%u\n",</div><div class='add'>+			return sysfs_emit(buf, "%u\n",</div><div class='ctx'> 				       ad_port-&gt;actor_oper_port_state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "N/A\n");</div><div class='add'>+	return sysfs_emit(buf, "N/A\n");</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(ad_actor_oper_port_state);</div><div class='ctx'> </div><div class='hunk'>@@ -100,28 +94,27 @@ static ssize_t ad_partner_oper_port_state_show(struct slave *slave, char *buf)</div><div class='ctx'> 	if (BOND_MODE(slave-&gt;bond) == BOND_MODE_8023AD) {</div><div class='ctx'> 		ad_port = &amp;SLAVE_AD_INFO(slave)-&gt;port;</div><div class='ctx'> 		if (ad_port-&gt;aggregator)</div><div class='del'>-			return sprintf(buf, "%u\n",</div><div class='add'>+			return sysfs_emit(buf, "%u\n",</div><div class='ctx'> 				       ad_port-&gt;partner_oper.port_state);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sprintf(buf, "N/A\n");</div><div class='add'>+	return sysfs_emit(buf, "N/A\n");</div><div class='ctx'> }</div><div class='ctx'> static SLAVE_ATTR_RO(ad_partner_oper_port_state);</div><div class='ctx'> </div><div class='del'>-static const struct slave_attribute *slave_attrs[] = {</div><div class='del'>-	&amp;slave_attr_state,</div><div class='del'>-	&amp;slave_attr_mii_status,</div><div class='del'>-	&amp;slave_attr_link_failure_count,</div><div class='del'>-	&amp;slave_attr_perm_hwaddr,</div><div class='del'>-	&amp;slave_attr_queue_id,</div><div class='del'>-	&amp;slave_attr_ad_aggregator_id,</div><div class='del'>-	&amp;slave_attr_ad_actor_oper_port_state,</div><div class='del'>-	&amp;slave_attr_ad_partner_oper_port_state,</div><div class='add'>+static const struct attribute *slave_attrs[] = {</div><div class='add'>+	&amp;slave_attr_state.attr,</div><div class='add'>+	&amp;slave_attr_mii_status.attr,</div><div class='add'>+	&amp;slave_attr_link_failure_count.attr,</div><div class='add'>+	&amp;slave_attr_perm_hwaddr.attr,</div><div class='add'>+	&amp;slave_attr_queue_id.attr,</div><div class='add'>+	&amp;slave_attr_ad_aggregator_id.attr,</div><div class='add'>+	&amp;slave_attr_ad_actor_oper_port_state.attr,</div><div class='add'>+	&amp;slave_attr_ad_partner_oper_port_state.attr,</div><div class='ctx'> 	NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define to_slave_attr(_at) container_of(_at, struct slave_attribute, attr)</div><div class='del'>-#define to_slave(obj)	container_of(obj, struct slave, kobj)</div><div class='ctx'> </div><div class='ctx'> static ssize_t slave_show(struct kobject *kobj,</div><div class='ctx'> 			  struct attribute *attr, char *buf)</div><div class='hunk'>@@ -132,43 +125,16 @@ static ssize_t slave_show(struct kobject *kobj,</div><div class='ctx'> 	return slave_attr-&gt;show(slave, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct sysfs_ops slave_sysfs_ops = {</div><div class='add'>+const struct sysfs_ops slave_sysfs_ops = {</div><div class='ctx'> 	.show = slave_show,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct kobj_type slave_ktype = {</div><div class='del'>-#ifdef CONFIG_SYSFS</div><div class='del'>-	.sysfs_ops = &amp;slave_sysfs_ops,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> int bond_sysfs_slave_add(struct slave *slave)</div><div class='ctx'> {</div><div class='del'>-	const struct slave_attribute **a;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = kobject_init_and_add(&amp;slave-&gt;kobj, &amp;slave_ktype,</div><div class='del'>-				   &amp;(slave-&gt;dev-&gt;dev.kobj), "bonding_slave");</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	for (a = slave_attrs; *a; ++a) {</div><div class='del'>-		err = sysfs_create_file(&amp;slave-&gt;kobj, &amp;((*a)-&gt;attr));</div><div class='del'>-		if (err) {</div><div class='del'>-			kobject_put(&amp;slave-&gt;kobj);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return sysfs_create_files(&amp;slave-&gt;kobj, slave_attrs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bond_sysfs_slave_del(struct slave *slave)</div><div class='ctx'> {</div><div class='del'>-	const struct slave_attribute **a;</div><div class='del'>-</div><div class='del'>-	for (a = slave_attrs; *a; ++a)</div><div class='del'>-		sysfs_remove_file(&amp;slave-&gt;kobj, &amp;((*a)-&gt;attr));</div><div class='del'>-</div><div class='del'>-	kobject_put(&amp;slave-&gt;kobj);</div><div class='add'>+	sysfs_remove_files(&amp;slave-&gt;kobj, slave_attrs);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/bonding/bonding_priv.h b/drivers/net/bonding/bonding_priv.h<br/>index 5a4d81a9437c..fef6288c6944 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bonding_priv.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/bonding/bonding_priv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/bonding/bonding_priv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/bonding/bonding_priv.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-1.0+ */</div><div class='ctx'> /*</div><div class='ctx'>  * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,19 +8,15 @@</div><div class='ctx'>  * BUT, I'm the one who modified it for ethernet, so:</div><div class='ctx'>  * (c) Copyright 1999, Thomas Davis, tadavis@lbl.gov</div><div class='ctx'>  *</div><div class='del'>- *	This software may be used and distributed according to the terms</div><div class='del'>- *	of the GNU Public License, incorporated herein by reference.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _BONDING_PRIV_H</div><div class='ctx'> #define _BONDING_PRIV_H</div><div class='add'>+#include &lt;generated/utsrelease.h&gt;</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION	"3.7.1"</div><div class='del'>-#define DRV_RELDATE	"April 27, 2011"</div><div class='ctx'> #define DRV_NAME	"bonding"</div><div class='ctx'> #define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"</div><div class='ctx'> </div><div class='del'>-#define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"</div><div class='add'>+#define bond_version DRV_DESCRIPTION ": v" UTS_RELEASE "\n"</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig<br/>index 2b9a2f117113..709660cb38f8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/caif/Kconfig</a></div><div class='hunk'>@@ -3,44 +3,22 @@</div><div class='ctx'> # CAIF physical drivers</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-comment "CAIF transport drivers"</div><div class='add'>+menuconfig CAIF_DRIVERS</div><div class='add'>+	bool "CAIF transport drivers"</div><div class='add'>+	depends on CAIF</div><div class='add'>+	help</div><div class='add'>+	  Enable this to see CAIF physical drivers.</div><div class='add'>+</div><div class='add'>+if CAIF_DRIVERS</div><div class='ctx'> </div><div class='ctx'> config CAIF_TTY</div><div class='ctx'> 	tristate "CAIF TTY transport driver"</div><div class='ctx'> 	depends on CAIF &amp;&amp; TTY</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	The CAIF TTY transport driver is a Line Discipline (ldisc)</div><div class='del'>-	identified as N_CAIF. When this ldisc is opened from user space</div><div class='del'>-	it will redirect the TTY's traffic into the CAIF stack.</div><div class='del'>-</div><div class='del'>-config CAIF_SPI_SLAVE</div><div class='del'>-	tristate "CAIF SPI transport driver for slave interface"</div><div class='del'>-	depends on CAIF &amp;&amp; HAS_DMA</div><div class='del'>-	default n</div><div class='del'>-	---help---</div><div class='del'>-	The CAIF Link layer SPI Protocol driver for Slave SPI interface.</div><div class='del'>-	This driver implements a platform driver to accommodate for a</div><div class='del'>-	platform specific SPI device. A sample CAIF SPI Platform device is</div><div class='del'>-	provided in Documentation/networking/caif/spi_porting.txt</div><div class='del'>-</div><div class='del'>-config CAIF_SPI_SYNC</div><div class='del'>-	bool "Next command and length in start of frame"</div><div class='del'>-	depends on CAIF_SPI_SLAVE</div><div class='del'>-	default n</div><div class='del'>-	---help---</div><div class='del'>-	Putting the next command and length in the start of the frame can</div><div class='del'>-	help to synchronize to the next transfer in case of over or under-runs.</div><div class='del'>-	This option also needs to be enabled on the modem.</div><div class='del'>-</div><div class='del'>-config CAIF_HSI</div><div class='del'>-       tristate "CAIF HSI transport driver"</div><div class='del'>-       depends on CAIF</div><div class='del'>-       default n</div><div class='del'>-       ---help---</div><div class='del'>-       The caif low level driver for CAIF over HSI.</div><div class='del'>-       Be aware that if you enable this then you also need to</div><div class='del'>-       enable a low-level HSI driver.</div><div class='add'>+	help</div><div class='add'>+	  The CAIF TTY transport driver is a Line Discipline (ldisc)</div><div class='add'>+	  identified as N_CAIF. When this ldisc is opened from user space</div><div class='add'>+	  it will redirect the TTY's traffic into the CAIF stack.</div><div class='ctx'> </div><div class='ctx'> config CAIF_VIRTIO</div><div class='ctx'> 	tristate "CAIF virtio transport driver"</div><div class='hunk'>@@ -49,9 +27,7 @@ config CAIF_VIRTIO</div><div class='ctx'> 	select VIRTIO</div><div class='ctx'> 	select GENERIC_ALLOCATOR</div><div class='ctx'> 	default n</div><div class='del'>-	---help---</div><div class='del'>-	The caif driver for CAIF over Virtio.</div><div class='add'>+	help</div><div class='add'>+	  The CAIF driver for CAIF over Virtio.</div><div class='ctx'> </div><div class='del'>-if CAIF_VIRTIO</div><div class='del'>-source "drivers/vhost/Kconfig.vringh"</div><div class='del'>-endif</div><div class='add'>+endif # CAIF_DRIVERS</div><div class='head'>diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile<br/>index 54ae1165d60a..97f664f8016c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/caif/Makefile</a></div><div class='hunk'>@@ -4,12 +4,5 @@ ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG</div><div class='ctx'> # Serial interface</div><div class='ctx'> obj-$(CONFIG_CAIF_TTY) += caif_serial.o</div><div class='ctx'> </div><div class='del'>-# SPI slave physical interfaces module</div><div class='del'>-cfspi_slave-objs := caif_spi.o caif_spi_slave.o</div><div class='del'>-obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o</div><div class='del'>-</div><div class='del'>-# HSI interface</div><div class='del'>-obj-$(CONFIG_CAIF_HSI) += caif_hsi.o</div><div class='del'>-</div><div class='ctx'> # Virtio interface</div><div class='ctx'> obj-$(CONFIG_CAIF_VIRTIO) += caif_virtio.o</div><div class='head'>diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c<br/>deleted file mode 100644<br/>index b2f10b6ad6e5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_hsi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_hsi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1469 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) ST-Ericsson AB 2010</div><div class='del'>- * Author:  Daniel Martensson</div><div class='del'>- *	    Dmitry.Tarnyagin  / dmitry.tarnyagin@lockless.no</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME fmt</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/timer.h&gt;</div><div class='del'>-#include &lt;net/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/pkt_sched.h&gt;</div><div class='del'>-#include &lt;net/caif/caif_layer.h&gt;</div><div class='del'>-#include &lt;net/caif/caif_hsi.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Daniel Martensson");</div><div class='del'>-MODULE_DESCRIPTION("CAIF HSI driver");</div><div class='del'>-</div><div class='del'>-/* Returns the number of padding bytes for alignment. */</div><div class='del'>-#define PAD_POW2(x, pow) ((((x)&amp;((pow)-1)) == 0) ? 0 :\</div><div class='del'>-				(((pow)-((x)&amp;((pow)-1)))))</div><div class='del'>-</div><div class='del'>-static const struct cfhsi_config  hsi_default_config = {</div><div class='del'>-</div><div class='del'>-	/* Inactivity timeout on HSI, ms */</div><div class='del'>-	.inactivity_timeout = HZ,</div><div class='del'>-</div><div class='del'>-	/* Aggregation timeout (ms) of zero means no aggregation is done*/</div><div class='del'>-	.aggregation_timeout = 1,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * HSI link layer flow-control thresholds.</div><div class='del'>-	 * Threshold values for the HSI packet queue. Flow-control will be</div><div class='del'>-	 * asserted when the number of packets exceeds q_high_mark. It will</div><div class='del'>-	 * not be de-asserted before the number of packets drops below</div><div class='del'>-	 * q_low_mark.</div><div class='del'>-	 * Warning: A high threshold value might increase throughput but it</div><div class='del'>-	 * will at the same time prevent channel prioritization and increase</div><div class='del'>-	 * the risk of flooding the modem. The high threshold should be above</div><div class='del'>-	 * the low.</div><div class='del'>-	 */</div><div class='del'>-	.q_high_mark = 100,</div><div class='del'>-	.q_low_mark = 50,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * HSI padding options.</div><div class='del'>-	 * Warning: must be a base of 2 (&amp; operation used) and can not be zero !</div><div class='del'>-	 */</div><div class='del'>-	.head_align = 4,</div><div class='del'>-	.tail_align = 4,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define ON 1</div><div class='del'>-#define OFF 0</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(cfhsi_list);</div><div class='del'>-</div><div class='del'>-static void cfhsi_inactivity_tout(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = from_timer(cfhsi, t, inactivity_timer);</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	/* Schedule power down work queue. */</div><div class='del'>-	if (!test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		queue_work(cfhsi-&gt;wq, &amp;cfhsi-&gt;wake_down_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_update_aggregation_stats(struct cfhsi *cfhsi,</div><div class='del'>-					   const struct sk_buff *skb,</div><div class='del'>-					   int direction)</div><div class='del'>-{</div><div class='del'>-	struct caif_payload_info *info;</div><div class='del'>-	int hpad, tpad, len;</div><div class='del'>-</div><div class='del'>-	info = (struct caif_payload_info *)&amp;skb-&gt;cb;</div><div class='del'>-	hpad = 1 + PAD_POW2((info-&gt;hdr_len + 1), cfhsi-&gt;cfg.head_align);</div><div class='del'>-	tpad = PAD_POW2((skb-&gt;len + hpad), cfhsi-&gt;cfg.tail_align);</div><div class='del'>-	len = skb-&gt;len + hpad + tpad;</div><div class='del'>-</div><div class='del'>-	if (direction &gt; 0)</div><div class='del'>-		cfhsi-&gt;aggregation_len += len;</div><div class='del'>-	else if (direction &lt; 0)</div><div class='del'>-		cfhsi-&gt;aggregation_len -= len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool cfhsi_can_send_aggregate(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (cfhsi-&gt;cfg.aggregation_timeout == 0)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CFHSI_PRIO_BEBK; ++i) {</div><div class='del'>-		if (cfhsi-&gt;qhead[i].qlen)</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: Use aggregation_len instead */</div><div class='del'>-	if (cfhsi-&gt;qhead[CFHSI_PRIO_BEBK].qlen &gt;= CFHSI_MAX_PKTS)</div><div class='del'>-		return true;</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *cfhsi_dequeue(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CFHSI_PRIO_LAST; ++i) {</div><div class='del'>-		skb = skb_dequeue(&amp;cfhsi-&gt;qhead[i]);</div><div class='del'>-		if (skb)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_tx_queue_len(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int i, len = 0;</div><div class='del'>-	for (i = 0; i &lt; CFHSI_PRIO_LAST; ++i)</div><div class='del'>-		len += skb_queue_len(&amp;cfhsi-&gt;qhead[i]);</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_abort_tx(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-		spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		skb = cfhsi_dequeue(cfhsi);</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.tx_errors++;</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.tx_dropped++;</div><div class='del'>-		cfhsi_update_aggregation_stats(cfhsi, skb, -1);</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-	cfhsi-&gt;tx_state = CFHSI_TX_STATE_IDLE;</div><div class='del'>-	if (!test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		mod_timer(&amp;cfhsi-&gt;inactivity_timer,</div><div class='del'>-			jiffies + cfhsi-&gt;cfg.inactivity_timeout);</div><div class='del'>-	spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_flush_fifo(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	char buffer[32]; /* Any reasonable value */</div><div class='del'>-	size_t fifo_occupancy;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = cfhsi-&gt;ops-&gt;cfhsi_fifo_occupancy(cfhsi-&gt;ops,</div><div class='del'>-				&amp;fifo_occupancy);</div><div class='del'>-		if (ret) {</div><div class='del'>-			netdev_warn(cfhsi-&gt;ndev,</div><div class='del'>-				"%s: can't get FIFO occupancy: %d.\n",</div><div class='del'>-				__func__, ret);</div><div class='del'>-			break;</div><div class='del'>-		} else if (!fifo_occupancy)</div><div class='del'>-			/* No more data, exitting normally */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		fifo_occupancy = min(sizeof(buffer), fifo_occupancy);</div><div class='del'>-		set_bit(CFHSI_FLUSH_FIFO, &amp;cfhsi-&gt;bits);</div><div class='del'>-		ret = cfhsi-&gt;ops-&gt;cfhsi_rx(buffer, fifo_occupancy,</div><div class='del'>-				cfhsi-&gt;ops);</div><div class='del'>-		if (ret) {</div><div class='del'>-			clear_bit(CFHSI_FLUSH_FIFO, &amp;cfhsi-&gt;bits);</div><div class='del'>-			netdev_warn(cfhsi-&gt;ndev,</div><div class='del'>-				"%s: can't read data: %d.\n",</div><div class='del'>-				__func__, ret);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = 5 * HZ;</div><div class='del'>-		ret = wait_event_interruptible_timeout(cfhsi-&gt;flush_fifo_wait,</div><div class='del'>-			 !test_bit(CFHSI_FLUSH_FIFO, &amp;cfhsi-&gt;bits), ret);</div><div class='del'>-</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			netdev_warn(cfhsi-&gt;ndev,</div><div class='del'>-				"%s: can't wait for flush complete: %d.\n",</div><div class='del'>-				__func__, ret);</div><div class='del'>-			break;</div><div class='del'>-		} else if (!ret) {</div><div class='del'>-			ret = -ETIMEDOUT;</div><div class='del'>-			netdev_warn(cfhsi-&gt;ndev,</div><div class='del'>-				"%s: timeout waiting for flush complete.\n",</div><div class='del'>-				__func__);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int nfrms = 0;</div><div class='del'>-	int pld_len = 0;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u8 *pfrm = desc-&gt;emb_frm + CFHSI_MAX_EMB_FRM_SZ;</div><div class='del'>-</div><div class='del'>-	skb = cfhsi_dequeue(cfhsi);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Clear offset. */</div><div class='del'>-	desc-&gt;offset = 0;</div><div class='del'>-</div><div class='del'>-	/* Check if we can embed a CAIF frame. */</div><div class='del'>-	if (skb-&gt;len &lt; CFHSI_MAX_EMB_FRM_SZ) {</div><div class='del'>-		struct caif_payload_info *info;</div><div class='del'>-		int hpad;</div><div class='del'>-		int tpad;</div><div class='del'>-</div><div class='del'>-		/* Calculate needed head alignment and tail alignment. */</div><div class='del'>-		info = (struct caif_payload_info *)&amp;skb-&gt;cb;</div><div class='del'>-</div><div class='del'>-		hpad = 1 + PAD_POW2((info-&gt;hdr_len + 1), cfhsi-&gt;cfg.head_align);</div><div class='del'>-		tpad = PAD_POW2((skb-&gt;len + hpad), cfhsi-&gt;cfg.tail_align);</div><div class='del'>-</div><div class='del'>-		/* Check if frame still fits with added alignment. */</div><div class='del'>-		if ((skb-&gt;len + hpad + tpad) &lt;= CFHSI_MAX_EMB_FRM_SZ) {</div><div class='del'>-			u8 *pemb = desc-&gt;emb_frm;</div><div class='del'>-			desc-&gt;offset = CFHSI_DESC_SHORT_SZ;</div><div class='del'>-			*pemb = (u8)(hpad - 1);</div><div class='del'>-			pemb += hpad;</div><div class='del'>-</div><div class='del'>-			/* Update network statistics. */</div><div class='del'>-			spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-			cfhsi-&gt;ndev-&gt;stats.tx_packets++;</div><div class='del'>-			cfhsi-&gt;ndev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-			cfhsi_update_aggregation_stats(cfhsi, skb, -1);</div><div class='del'>-			spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-			/* Copy in embedded CAIF frame. */</div><div class='del'>-			skb_copy_bits(skb, 0, pemb, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-			/* Consume the SKB */</div><div class='del'>-			consume_skb(skb);</div><div class='del'>-			skb = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create payload CAIF frames. */</div><div class='del'>-	while (nfrms &lt; CFHSI_MAX_PKTS) {</div><div class='del'>-		struct caif_payload_info *info;</div><div class='del'>-		int hpad;</div><div class='del'>-		int tpad;</div><div class='del'>-</div><div class='del'>-		if (!skb)</div><div class='del'>-			skb = cfhsi_dequeue(cfhsi);</div><div class='del'>-</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Calculate needed head alignment and tail alignment. */</div><div class='del'>-		info = (struct caif_payload_info *)&amp;skb-&gt;cb;</div><div class='del'>-</div><div class='del'>-		hpad = 1 + PAD_POW2((info-&gt;hdr_len + 1), cfhsi-&gt;cfg.head_align);</div><div class='del'>-		tpad = PAD_POW2((skb-&gt;len + hpad), cfhsi-&gt;cfg.tail_align);</div><div class='del'>-</div><div class='del'>-		/* Fill in CAIF frame length in descriptor. */</div><div class='del'>-		desc-&gt;cffrm_len[nfrms] = hpad + skb-&gt;len + tpad;</div><div class='del'>-</div><div class='del'>-		/* Fill head padding information. */</div><div class='del'>-		*pfrm = (u8)(hpad - 1);</div><div class='del'>-		pfrm += hpad;</div><div class='del'>-</div><div class='del'>-		/* Update network statistics. */</div><div class='del'>-		spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.tx_packets++;</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-		cfhsi_update_aggregation_stats(cfhsi, skb, -1);</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/* Copy in CAIF frame. */</div><div class='del'>-		skb_copy_bits(skb, 0, pfrm, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-		/* Update payload length. */</div><div class='del'>-		pld_len += desc-&gt;cffrm_len[nfrms];</div><div class='del'>-</div><div class='del'>-		/* Update frame pointer. */</div><div class='del'>-		pfrm += skb-&gt;len + tpad;</div><div class='del'>-</div><div class='del'>-		/* Consume the SKB */</div><div class='del'>-		consume_skb(skb);</div><div class='del'>-		skb = NULL;</div><div class='del'>-</div><div class='del'>-		/* Update number of frames. */</div><div class='del'>-		nfrms++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Unused length fields should be zero-filled (according to SPEC). */</div><div class='del'>-	while (nfrms &lt; CFHSI_MAX_PKTS) {</div><div class='del'>-		desc-&gt;cffrm_len[nfrms] = 0x0000;</div><div class='del'>-		nfrms++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if we can piggy-back another descriptor. */</div><div class='del'>-	if (cfhsi_can_send_aggregate(cfhsi))</div><div class='del'>-		desc-&gt;header |= CFHSI_PIGGY_DESC;</div><div class='del'>-	else</div><div class='del'>-		desc-&gt;header &amp;= ~CFHSI_PIGGY_DESC;</div><div class='del'>-</div><div class='del'>-	return CFHSI_DESC_SZ + pld_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_start_tx(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi_desc *desc = (struct cfhsi_desc *)cfhsi-&gt;tx_buf;</div><div class='del'>-	int len, res;</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* Create HSI frame. */</div><div class='del'>-		len = cfhsi_tx_frm(desc, cfhsi);</div><div class='del'>-		if (!len) {</div><div class='del'>-			spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-			if (unlikely(cfhsi_tx_queue_len(cfhsi))) {</div><div class='del'>-				spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-				res = -EAGAIN;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			cfhsi-&gt;tx_state = CFHSI_TX_STATE_IDLE;</div><div class='del'>-			/* Start inactivity timer. */</div><div class='del'>-			mod_timer(&amp;cfhsi-&gt;inactivity_timer,</div><div class='del'>-				jiffies + cfhsi-&gt;cfg.inactivity_timeout);</div><div class='del'>-			spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set up new transfer. */</div><div class='del'>-		res = cfhsi-&gt;ops-&gt;cfhsi_tx(cfhsi-&gt;tx_buf, len, cfhsi-&gt;ops);</div><div class='del'>-		if (WARN_ON(res &lt; 0))</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: TX error %d.\n",</div><div class='del'>-				__func__, res);</div><div class='del'>-	} while (res &lt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_tx_done(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send flow on if flow off has been previously signalled</div><div class='del'>-	 * and number of packets is below low water mark.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-	if (cfhsi-&gt;flow_off_sent &amp;&amp;</div><div class='del'>-			cfhsi_tx_queue_len(cfhsi) &lt;= cfhsi-&gt;cfg.q_low_mark &amp;&amp;</div><div class='del'>-			cfhsi-&gt;cfdev.flowctrl) {</div><div class='del'>-</div><div class='del'>-		cfhsi-&gt;flow_off_sent = 0;</div><div class='del'>-		cfhsi-&gt;cfdev.flowctrl(cfhsi-&gt;ndev, ON);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfhsi_can_send_aggregate(cfhsi)) {</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		cfhsi_start_tx(cfhsi);</div><div class='del'>-	} else {</div><div class='del'>-		mod_timer(&amp;cfhsi-&gt;aggregation_timer,</div><div class='del'>-			jiffies + cfhsi-&gt;cfg.aggregation_timeout);</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_tx_done_cb(struct cfhsi_cb_ops *cb_ops)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-	cfhsi_tx_done(cfhsi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_rx_desc(struct cfhsi_desc *desc, struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int xfer_sz = 0;</div><div class='del'>-	int nfrms = 0;</div><div class='del'>-	u16 *plen = NULL;</div><div class='del'>-	u8 *pfrm = NULL;</div><div class='del'>-</div><div class='del'>-	if ((desc-&gt;header &amp; ~CFHSI_PIGGY_DESC) ||</div><div class='del'>-			(desc-&gt;offset &gt; CFHSI_MAX_EMB_FRM_SZ)) {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Invalid descriptor.\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for embedded CAIF frame. */</div><div class='del'>-	if (desc-&gt;offset) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		int len = 0;</div><div class='del'>-		pfrm = ((u8 *)desc) + desc-&gt;offset;</div><div class='del'>-</div><div class='del'>-		/* Remove offset padding. */</div><div class='del'>-		pfrm += *pfrm + 1;</div><div class='del'>-</div><div class='del'>-		/* Read length of CAIF frame (little endian). */</div><div class='del'>-		len = *pfrm;</div><div class='del'>-		len |= ((*(pfrm+1)) &lt;&lt; 8) &amp; 0xFF00;</div><div class='del'>-		len += 2;	/* Add FCS fields. */</div><div class='del'>-</div><div class='del'>-		/* Sanity check length of CAIF frame. */</div><div class='del'>-		if (unlikely(len &gt; CFHSI_MAX_CAIF_FRAME_SZ)) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: Invalid length.\n",</div><div class='del'>-				__func__);</div><div class='del'>-			return -EPROTO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Allocate SKB (OK even in IRQ context). */</div><div class='del'>-		skb = alloc_skb(len + 1, GFP_ATOMIC);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: Out of memory !\n",</div><div class='del'>-				__func__);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		caif_assert(skb != NULL);</div><div class='del'>-</div><div class='del'>-		skb_put_data(skb, pfrm, len);</div><div class='del'>-</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_CAIF);</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-		skb-&gt;dev = cfhsi-&gt;ndev;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We are in a callback handler and</div><div class='del'>-		 * unfortunately we don't know what context we're</div><div class='del'>-		 * running in.</div><div class='del'>-		 */</div><div class='del'>-		if (in_interrupt())</div><div class='del'>-			netif_rx(skb);</div><div class='del'>-		else</div><div class='del'>-			netif_rx_ni(skb);</div><div class='del'>-</div><div class='del'>-		/* Update network statistics. */</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.rx_packets++;</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.rx_bytes += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate transfer length. */</div><div class='del'>-	plen = desc-&gt;cffrm_len;</div><div class='del'>-	while (nfrms &lt; CFHSI_MAX_PKTS &amp;&amp; *plen) {</div><div class='del'>-		xfer_sz += *plen;</div><div class='del'>-		plen++;</div><div class='del'>-		nfrms++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for piggy-backed descriptor. */</div><div class='del'>-	if (desc-&gt;header &amp; CFHSI_PIGGY_DESC)</div><div class='del'>-		xfer_sz += CFHSI_DESC_SZ;</div><div class='del'>-</div><div class='del'>-	if ((xfer_sz % 4) || (xfer_sz &gt; (CFHSI_BUF_SZ_RX - CFHSI_DESC_SZ))) {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev,</div><div class='del'>-				"%s: Invalid payload len: %d, ignored.\n",</div><div class='del'>-			__func__, xfer_sz);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-	return xfer_sz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_rx_desc_len(struct cfhsi_desc *desc)</div><div class='del'>-{</div><div class='del'>-	int xfer_sz = 0;</div><div class='del'>-	int nfrms = 0;</div><div class='del'>-	u16 *plen;</div><div class='del'>-</div><div class='del'>-	if ((desc-&gt;header &amp; ~CFHSI_PIGGY_DESC) ||</div><div class='del'>-			(desc-&gt;offset &gt; CFHSI_MAX_EMB_FRM_SZ)) {</div><div class='del'>-</div><div class='del'>-		pr_err("Invalid descriptor. %x %x\n", desc-&gt;header,</div><div class='del'>-				desc-&gt;offset);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate transfer length. */</div><div class='del'>-	plen = desc-&gt;cffrm_len;</div><div class='del'>-	while (nfrms &lt; CFHSI_MAX_PKTS &amp;&amp; *plen) {</div><div class='del'>-		xfer_sz += *plen;</div><div class='del'>-		plen++;</div><div class='del'>-		nfrms++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (xfer_sz % 4) {</div><div class='del'>-		pr_err("Invalid payload len: %d, ignored.\n", xfer_sz);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-	return xfer_sz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int rx_sz = 0;</div><div class='del'>-	int nfrms = 0;</div><div class='del'>-	u16 *plen = NULL;</div><div class='del'>-	u8 *pfrm = NULL;</div><div class='del'>-</div><div class='del'>-	/* Sanity check header and offset. */</div><div class='del'>-	if (WARN_ON((desc-&gt;header &amp; ~CFHSI_PIGGY_DESC) ||</div><div class='del'>-			(desc-&gt;offset &gt; CFHSI_MAX_EMB_FRM_SZ))) {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Invalid descriptor.\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return -EPROTO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set frame pointer to start of payload. */</div><div class='del'>-	pfrm = desc-&gt;emb_frm + CFHSI_MAX_EMB_FRM_SZ;</div><div class='del'>-	plen = desc-&gt;cffrm_len;</div><div class='del'>-</div><div class='del'>-	/* Skip already processed frames. */</div><div class='del'>-	while (nfrms &lt; cfhsi-&gt;rx_state.nfrms) {</div><div class='del'>-		pfrm += *plen;</div><div class='del'>-		rx_sz += *plen;</div><div class='del'>-		plen++;</div><div class='del'>-		nfrms++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parse payload. */</div><div class='del'>-	while (nfrms &lt; CFHSI_MAX_PKTS &amp;&amp; *plen) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		u8 *pcffrm = NULL;</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		/* CAIF frame starts after head padding. */</div><div class='del'>-		pcffrm = pfrm + *pfrm + 1;</div><div class='del'>-</div><div class='del'>-		/* Read length of CAIF frame (little endian). */</div><div class='del'>-		len = *pcffrm;</div><div class='del'>-		len |= ((*(pcffrm + 1)) &lt;&lt; 8) &amp; 0xFF00;</div><div class='del'>-		len += 2;	/* Add FCS fields. */</div><div class='del'>-</div><div class='del'>-		/* Sanity check length of CAIF frames. */</div><div class='del'>-		if (unlikely(len &gt; CFHSI_MAX_CAIF_FRAME_SZ)) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: Invalid length.\n",</div><div class='del'>-				__func__);</div><div class='del'>-			return -EPROTO;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Allocate SKB (OK even in IRQ context). */</div><div class='del'>-		skb = alloc_skb(len + 1, GFP_ATOMIC);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: Out of memory !\n",</div><div class='del'>-				__func__);</div><div class='del'>-			cfhsi-&gt;rx_state.nfrms = nfrms;</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-		caif_assert(skb != NULL);</div><div class='del'>-</div><div class='del'>-		skb_put_data(skb, pcffrm, len);</div><div class='del'>-</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_CAIF);</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-		skb-&gt;dev = cfhsi-&gt;ndev;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * We're called in callback from HSI</div><div class='del'>-		 * and don't know the context we're running in.</div><div class='del'>-		 */</div><div class='del'>-		if (in_interrupt())</div><div class='del'>-			netif_rx(skb);</div><div class='del'>-		else</div><div class='del'>-			netif_rx_ni(skb);</div><div class='del'>-</div><div class='del'>-		/* Update network statistics. */</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.rx_packets++;</div><div class='del'>-		cfhsi-&gt;ndev-&gt;stats.rx_bytes += len;</div><div class='del'>-</div><div class='del'>-		pfrm += *plen;</div><div class='del'>-		rx_sz += *plen;</div><div class='del'>-		plen++;</div><div class='del'>-		nfrms++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rx_sz;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_rx_done(struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-	int desc_pld_len = 0, rx_len, rx_state;</div><div class='del'>-	struct cfhsi_desc *desc = NULL;</div><div class='del'>-	u8 *rx_ptr, *rx_buf;</div><div class='del'>-	struct cfhsi_desc *piggy_desc = NULL;</div><div class='del'>-</div><div class='del'>-	desc = (struct cfhsi_desc *)cfhsi-&gt;rx_buf;</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Update inactivity timer if pending. */</div><div class='del'>-	spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-	mod_timer_pending(&amp;cfhsi-&gt;inactivity_timer,</div><div class='del'>-			jiffies + cfhsi-&gt;cfg.inactivity_timeout);</div><div class='del'>-	spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (cfhsi-&gt;rx_state.state == CFHSI_RX_STATE_DESC) {</div><div class='del'>-		desc_pld_len = cfhsi_rx_desc_len(desc);</div><div class='del'>-</div><div class='del'>-		if (desc_pld_len &lt; 0)</div><div class='del'>-			goto out_of_sync;</div><div class='del'>-</div><div class='del'>-		rx_buf = cfhsi-&gt;rx_buf;</div><div class='del'>-		rx_len = desc_pld_len;</div><div class='del'>-		if (desc_pld_len &gt; 0 &amp;&amp; (desc-&gt;header &amp; CFHSI_PIGGY_DESC))</div><div class='del'>-			rx_len += CFHSI_DESC_SZ;</div><div class='del'>-		if (desc_pld_len == 0)</div><div class='del'>-			rx_buf = cfhsi-&gt;rx_flip_buf;</div><div class='del'>-	} else {</div><div class='del'>-		rx_buf = cfhsi-&gt;rx_flip_buf;</div><div class='del'>-</div><div class='del'>-		rx_len = CFHSI_DESC_SZ;</div><div class='del'>-		if (cfhsi-&gt;rx_state.pld_len &gt; 0 &amp;&amp;</div><div class='del'>-				(desc-&gt;header &amp; CFHSI_PIGGY_DESC)) {</div><div class='del'>-</div><div class='del'>-			piggy_desc = (struct cfhsi_desc *)</div><div class='del'>-				(desc-&gt;emb_frm + CFHSI_MAX_EMB_FRM_SZ +</div><div class='del'>-						cfhsi-&gt;rx_state.pld_len);</div><div class='del'>-</div><div class='del'>-			cfhsi-&gt;rx_state.piggy_desc = true;</div><div class='del'>-</div><div class='del'>-			/* Extract payload len from piggy-backed descriptor. */</div><div class='del'>-			desc_pld_len = cfhsi_rx_desc_len(piggy_desc);</div><div class='del'>-			if (desc_pld_len &lt; 0)</div><div class='del'>-				goto out_of_sync;</div><div class='del'>-</div><div class='del'>-			if (desc_pld_len &gt; 0) {</div><div class='del'>-				rx_len = desc_pld_len;</div><div class='del'>-				if (piggy_desc-&gt;header &amp; CFHSI_PIGGY_DESC)</div><div class='del'>-					rx_len += CFHSI_DESC_SZ;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Copy needed information from the piggy-backed</div><div class='del'>-			 * descriptor to the descriptor in the start.</div><div class='del'>-			 */</div><div class='del'>-			memcpy(rx_buf, (u8 *)piggy_desc,</div><div class='del'>-					CFHSI_DESC_SHORT_SZ);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (desc_pld_len) {</div><div class='del'>-		rx_state = CFHSI_RX_STATE_PAYLOAD;</div><div class='del'>-		rx_ptr = rx_buf + CFHSI_DESC_SZ;</div><div class='del'>-	} else {</div><div class='del'>-		rx_state = CFHSI_RX_STATE_DESC;</div><div class='del'>-		rx_ptr = rx_buf;</div><div class='del'>-		rx_len = CFHSI_DESC_SZ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initiate next read */</div><div class='del'>-	if (test_bit(CFHSI_AWAKE, &amp;cfhsi-&gt;bits)) {</div><div class='del'>-		/* Set up new transfer. */</div><div class='del'>-		netdev_dbg(cfhsi-&gt;ndev, "%s: Start RX.\n",</div><div class='del'>-				__func__);</div><div class='del'>-</div><div class='del'>-		res = cfhsi-&gt;ops-&gt;cfhsi_rx(rx_ptr, rx_len,</div><div class='del'>-				cfhsi-&gt;ops);</div><div class='del'>-		if (WARN_ON(res &lt; 0)) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: RX error %d.\n",</div><div class='del'>-				__func__, res);</div><div class='del'>-			cfhsi-&gt;ndev-&gt;stats.rx_errors++;</div><div class='del'>-			cfhsi-&gt;ndev-&gt;stats.rx_dropped++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfhsi-&gt;rx_state.state == CFHSI_RX_STATE_DESC) {</div><div class='del'>-		/* Extract payload from descriptor */</div><div class='del'>-		if (cfhsi_rx_desc(desc, cfhsi) &lt; 0)</div><div class='del'>-			goto out_of_sync;</div><div class='del'>-	} else {</div><div class='del'>-		/* Extract payload */</div><div class='del'>-		if (cfhsi_rx_pld(desc, cfhsi) &lt; 0)</div><div class='del'>-			goto out_of_sync;</div><div class='del'>-		if (piggy_desc) {</div><div class='del'>-			/* Extract any payload in piggyback descriptor. */</div><div class='del'>-			if (cfhsi_rx_desc(piggy_desc, cfhsi) &lt; 0)</div><div class='del'>-				goto out_of_sync;</div><div class='del'>-			/* Mark no embedded frame after extracting it */</div><div class='del'>-			piggy_desc-&gt;offset = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update state info */</div><div class='del'>-	memset(&amp;cfhsi-&gt;rx_state, 0, sizeof(cfhsi-&gt;rx_state));</div><div class='del'>-	cfhsi-&gt;rx_state.state = rx_state;</div><div class='del'>-	cfhsi-&gt;rx_ptr = rx_ptr;</div><div class='del'>-	cfhsi-&gt;rx_len = rx_len;</div><div class='del'>-	cfhsi-&gt;rx_state.pld_len = desc_pld_len;</div><div class='del'>-	cfhsi-&gt;rx_state.piggy_desc = desc-&gt;header &amp; CFHSI_PIGGY_DESC;</div><div class='del'>-</div><div class='del'>-	if (rx_buf != cfhsi-&gt;rx_buf)</div><div class='del'>-		swap(cfhsi-&gt;rx_buf, cfhsi-&gt;rx_flip_buf);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-out_of_sync:</div><div class='del'>-	netdev_err(cfhsi-&gt;ndev, "%s: Out of sync.\n", __func__);</div><div class='del'>-	print_hex_dump_bytes("--&gt; ", DUMP_PREFIX_NONE,</div><div class='del'>-			cfhsi-&gt;rx_buf, CFHSI_DESC_SZ);</div><div class='del'>-	schedule_work(&amp;cfhsi-&gt;out_of_sync_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_rx_slowpath(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = from_timer(cfhsi, t, rx_slowpath_timer);</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	cfhsi_rx_done(cfhsi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_rx_done_cb(struct cfhsi_cb_ops *cb_ops)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (test_and_clear_bit(CFHSI_FLUSH_FIFO, &amp;cfhsi-&gt;bits))</div><div class='del'>-		wake_up_interruptible(&amp;cfhsi-&gt;flush_fifo_wait);</div><div class='del'>-	else</div><div class='del'>-		cfhsi_rx_done(cfhsi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_wake_up(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-	int res;</div><div class='del'>-	int len;</div><div class='del'>-	long ret;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(work, struct cfhsi, wake_up_work);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (unlikely(test_bit(CFHSI_AWAKE, &amp;cfhsi-&gt;bits))) {</div><div class='del'>-		/* It happenes when wakeup is requested by</div><div class='del'>-		 * both ends at the same time. */</div><div class='del'>-		clear_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits);</div><div class='del'>-		clear_bit(CFHSI_WAKE_UP_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Activate wake line. */</div><div class='del'>-	cfhsi-&gt;ops-&gt;cfhsi_wake_up(cfhsi-&gt;ops);</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s: Start waiting.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	/* Wait for acknowledge. */</div><div class='del'>-	ret = CFHSI_WAKE_TOUT;</div><div class='del'>-	ret = wait_event_interruptible_timeout(cfhsi-&gt;wake_up_wait,</div><div class='del'>-					test_and_clear_bit(CFHSI_WAKE_UP_ACK,</div><div class='del'>-							&amp;cfhsi-&gt;bits), ret);</div><div class='del'>-	if (unlikely(ret &lt; 0)) {</div><div class='del'>-		/* Interrupted by signal. */</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Signalled: %ld.\n",</div><div class='del'>-			__func__, ret);</div><div class='del'>-</div><div class='del'>-		clear_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits);</div><div class='del'>-		cfhsi-&gt;ops-&gt;cfhsi_wake_down(cfhsi-&gt;ops);</div><div class='del'>-		return;</div><div class='del'>-	} else if (!ret) {</div><div class='del'>-		bool ca_wake = false;</div><div class='del'>-		size_t fifo_occupancy = 0;</div><div class='del'>-</div><div class='del'>-		/* Wakeup timeout */</div><div class='del'>-		netdev_dbg(cfhsi-&gt;ndev, "%s: Timeout.\n",</div><div class='del'>-			__func__);</div><div class='del'>-</div><div class='del'>-		/* Check FIFO to check if modem has sent something. */</div><div class='del'>-		WARN_ON(cfhsi-&gt;ops-&gt;cfhsi_fifo_occupancy(cfhsi-&gt;ops,</div><div class='del'>-					&amp;fifo_occupancy));</div><div class='del'>-</div><div class='del'>-		netdev_dbg(cfhsi-&gt;ndev, "%s: Bytes in FIFO: %u.\n",</div><div class='del'>-				__func__, (unsigned) fifo_occupancy);</div><div class='del'>-</div><div class='del'>-		/* Check if we misssed the interrupt. */</div><div class='del'>-		WARN_ON(cfhsi-&gt;ops-&gt;cfhsi_get_peer_wake(cfhsi-&gt;ops,</div><div class='del'>-							&amp;ca_wake));</div><div class='del'>-</div><div class='del'>-		if (ca_wake) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: CA Wake missed !.\n",</div><div class='del'>-				__func__);</div><div class='del'>-</div><div class='del'>-			/* Clear the CFHSI_WAKE_UP_ACK bit to prevent race. */</div><div class='del'>-			clear_bit(CFHSI_WAKE_UP_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-			/* Continue execution. */</div><div class='del'>-			goto wake_ack;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		clear_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits);</div><div class='del'>-		cfhsi-&gt;ops-&gt;cfhsi_wake_down(cfhsi-&gt;ops);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-wake_ack:</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s: Woken.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	/* Clear power up bit. */</div><div class='del'>-	set_bit(CFHSI_AWAKE, &amp;cfhsi-&gt;bits);</div><div class='del'>-	clear_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Resume read operation. */</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s: Start RX.\n", __func__);</div><div class='del'>-	res = cfhsi-&gt;ops-&gt;cfhsi_rx(cfhsi-&gt;rx_ptr, cfhsi-&gt;rx_len, cfhsi-&gt;ops);</div><div class='del'>-</div><div class='del'>-	if (WARN_ON(res &lt; 0))</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: RX err %d.\n", __func__, res);</div><div class='del'>-</div><div class='del'>-	/* Clear power up acknowledment. */</div><div class='del'>-	clear_bit(CFHSI_WAKE_UP_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Resume transmit if queues are not empty. */</div><div class='del'>-	if (!cfhsi_tx_queue_len(cfhsi)) {</div><div class='del'>-		netdev_dbg(cfhsi-&gt;ndev, "%s: Peer wake, start timer.\n",</div><div class='del'>-			__func__);</div><div class='del'>-		/* Start inactivity timer. */</div><div class='del'>-		mod_timer(&amp;cfhsi-&gt;inactivity_timer,</div><div class='del'>-				jiffies + cfhsi-&gt;cfg.inactivity_timeout);</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s: Host wake.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Create HSI frame. */</div><div class='del'>-	len = cfhsi_tx_frm((struct cfhsi_desc *)cfhsi-&gt;tx_buf, cfhsi);</div><div class='del'>-</div><div class='del'>-	if (likely(len &gt; 0)) {</div><div class='del'>-		/* Set up new transfer. */</div><div class='del'>-		res = cfhsi-&gt;ops-&gt;cfhsi_tx(cfhsi-&gt;tx_buf, len, cfhsi-&gt;ops);</div><div class='del'>-		if (WARN_ON(res &lt; 0)) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: TX error %d.\n",</div><div class='del'>-				__func__, res);</div><div class='del'>-			cfhsi_abort_tx(cfhsi);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev,</div><div class='del'>-				"%s: Failed to create HSI frame: %d.\n",</div><div class='del'>-				__func__, len);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_wake_down(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	long ret;</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-	size_t fifo_occupancy = 0;</div><div class='del'>-	int retry = CFHSI_WAKE_TOUT;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(work, struct cfhsi, wake_down_work);</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n", __func__);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Deactivate wake line. */</div><div class='del'>-	cfhsi-&gt;ops-&gt;cfhsi_wake_down(cfhsi-&gt;ops);</div><div class='del'>-</div><div class='del'>-	/* Wait for acknowledge. */</div><div class='del'>-	ret = CFHSI_WAKE_TOUT;</div><div class='del'>-	ret = wait_event_interruptible_timeout(cfhsi-&gt;wake_down_wait,</div><div class='del'>-					test_and_clear_bit(CFHSI_WAKE_DOWN_ACK,</div><div class='del'>-							&amp;cfhsi-&gt;bits), ret);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		/* Interrupted by signal. */</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Signalled: %ld.\n",</div><div class='del'>-			__func__, ret);</div><div class='del'>-		return;</div><div class='del'>-	} else if (!ret) {</div><div class='del'>-		bool ca_wake = true;</div><div class='del'>-</div><div class='del'>-		/* Timeout */</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Timeout.\n", __func__);</div><div class='del'>-</div><div class='del'>-		/* Check if we misssed the interrupt. */</div><div class='del'>-		WARN_ON(cfhsi-&gt;ops-&gt;cfhsi_get_peer_wake(cfhsi-&gt;ops,</div><div class='del'>-							&amp;ca_wake));</div><div class='del'>-		if (!ca_wake)</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: CA Wake missed !.\n",</div><div class='del'>-				__func__);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check FIFO occupancy. */</div><div class='del'>-	while (retry) {</div><div class='del'>-		WARN_ON(cfhsi-&gt;ops-&gt;cfhsi_fifo_occupancy(cfhsi-&gt;ops,</div><div class='del'>-							&amp;fifo_occupancy));</div><div class='del'>-</div><div class='del'>-		if (!fifo_occupancy)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		set_current_state(TASK_INTERRUPTIBLE);</div><div class='del'>-		schedule_timeout(1);</div><div class='del'>-		retry--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!retry)</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: FIFO Timeout.\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* Clear AWAKE condition. */</div><div class='del'>-	clear_bit(CFHSI_AWAKE, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Cancel pending RX requests. */</div><div class='del'>-	cfhsi-&gt;ops-&gt;cfhsi_rx_cancel(cfhsi-&gt;ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_out_of_sync(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(work, struct cfhsi, out_of_sync_work);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	dev_close(cfhsi-&gt;ndev);</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_wake_up_cb(struct cfhsi_cb_ops *cb_ops)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	set_bit(CFHSI_WAKE_UP_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-	wake_up_interruptible(&amp;cfhsi-&gt;wake_up_wait);</div><div class='del'>-</div><div class='del'>-	if (test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Schedule wake up work queue if the peer initiates. */</div><div class='del'>-	if (!test_and_set_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits))</div><div class='del'>-		queue_work(cfhsi-&gt;wq, &amp;cfhsi-&gt;wake_up_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_wake_down_cb(struct cfhsi_cb_ops *cb_ops)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-</div><div class='del'>-	cfhsi = container_of(cb_ops, struct cfhsi, cb_ops);</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	/* Initiating low power is only permitted by the host (us). */</div><div class='del'>-	set_bit(CFHSI_WAKE_DOWN_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-	wake_up_interruptible(&amp;cfhsi-&gt;wake_down_wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_aggregation_tout(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = from_timer(cfhsi, t, aggregation_timer);</div><div class='del'>-</div><div class='del'>-	netdev_dbg(cfhsi-&gt;ndev, "%s.\n",</div><div class='del'>-		__func__);</div><div class='del'>-</div><div class='del'>-	cfhsi_start_tx(cfhsi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-	int start_xfer = 0;</div><div class='del'>-	int timer_active;</div><div class='del'>-	int prio;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cfhsi = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	switch (skb-&gt;priority) {</div><div class='del'>-	case TC_PRIO_BESTEFFORT:</div><div class='del'>-	case TC_PRIO_FILLER:</div><div class='del'>-	case TC_PRIO_BULK:</div><div class='del'>-		prio = CFHSI_PRIO_BEBK;</div><div class='del'>-		break;</div><div class='del'>-	case TC_PRIO_INTERACTIVE_BULK:</div><div class='del'>-		prio = CFHSI_PRIO_VI;</div><div class='del'>-		break;</div><div class='del'>-	case TC_PRIO_INTERACTIVE:</div><div class='del'>-		prio = CFHSI_PRIO_VO;</div><div class='del'>-		break;</div><div class='del'>-	case TC_PRIO_CONTROL:</div><div class='del'>-	default:</div><div class='del'>-		prio = CFHSI_PRIO_CTL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Update aggregation statistics  */</div><div class='del'>-	cfhsi_update_aggregation_stats(cfhsi, skb, 1);</div><div class='del'>-</div><div class='del'>-	/* Queue the SKB */</div><div class='del'>-	skb_queue_tail(&amp;cfhsi-&gt;qhead[prio], skb);</div><div class='del'>-</div><div class='del'>-	/* Sanity check; xmit should not be called after unregister_netdev */</div><div class='del'>-	if (WARN_ON(test_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits))) {</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		cfhsi_abort_tx(cfhsi);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send flow off if number of packets is above high water mark. */</div><div class='del'>-	if (!cfhsi-&gt;flow_off_sent &amp;&amp;</div><div class='del'>-		cfhsi_tx_queue_len(cfhsi) &gt; cfhsi-&gt;cfg.q_high_mark &amp;&amp;</div><div class='del'>-		cfhsi-&gt;cfdev.flowctrl) {</div><div class='del'>-		cfhsi-&gt;flow_off_sent = 1;</div><div class='del'>-		cfhsi-&gt;cfdev.flowctrl(cfhsi-&gt;ndev, OFF);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cfhsi-&gt;tx_state == CFHSI_TX_STATE_IDLE) {</div><div class='del'>-		cfhsi-&gt;tx_state = CFHSI_TX_STATE_XFER;</div><div class='del'>-		start_xfer = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!start_xfer) {</div><div class='del'>-		/* Send aggregate if it is possible */</div><div class='del'>-		bool aggregate_ready =</div><div class='del'>-			cfhsi_can_send_aggregate(cfhsi) &amp;&amp;</div><div class='del'>-			del_timer(&amp;cfhsi-&gt;aggregation_timer) &gt; 0;</div><div class='del'>-		spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-		if (aggregate_ready)</div><div class='del'>-			cfhsi_start_tx(cfhsi);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Delete inactivity timer if started. */</div><div class='del'>-	timer_active = del_timer_sync(&amp;cfhsi-&gt;inactivity_timer);</div><div class='del'>-</div><div class='del'>-	spin_unlock_bh(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (timer_active) {</div><div class='del'>-		struct cfhsi_desc *desc = (struct cfhsi_desc *)cfhsi-&gt;tx_buf;</div><div class='del'>-		int len;</div><div class='del'>-		int res;</div><div class='del'>-</div><div class='del'>-		/* Create HSI frame. */</div><div class='del'>-		len = cfhsi_tx_frm(desc, cfhsi);</div><div class='del'>-		WARN_ON(!len);</div><div class='del'>-</div><div class='del'>-		/* Set up new transfer. */</div><div class='del'>-		res = cfhsi-&gt;ops-&gt;cfhsi_tx(cfhsi-&gt;tx_buf, len, cfhsi-&gt;ops);</div><div class='del'>-		if (WARN_ON(res &lt; 0)) {</div><div class='del'>-			netdev_err(cfhsi-&gt;ndev, "%s: TX error %d.\n",</div><div class='del'>-				__func__, res);</div><div class='del'>-			cfhsi_abort_tx(cfhsi);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Schedule wake up work queue if the we initiate. */</div><div class='del'>-		if (!test_and_set_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits))</div><div class='del'>-			queue_work(cfhsi-&gt;wq, &amp;cfhsi-&gt;wake_up_work);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops cfhsi_netdevops;</div><div class='del'>-</div><div class='del'>-static void cfhsi_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct cfhsi *cfhsi = netdev_priv(dev);</div><div class='del'>-	dev-&gt;features = 0;</div><div class='del'>-	dev-&gt;type = ARPHRD_CAIF;</div><div class='del'>-	dev-&gt;flags = IFF_POINTOPOINT | IFF_NOARP;</div><div class='del'>-	dev-&gt;mtu = CFHSI_MAX_CAIF_FRAME_SZ;</div><div class='del'>-	dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='del'>-	dev-&gt;needs_free_netdev = true;</div><div class='del'>-	dev-&gt;netdev_ops = &amp;cfhsi_netdevops;</div><div class='del'>-	for (i = 0; i &lt; CFHSI_PRIO_LAST; ++i)</div><div class='del'>-		skb_queue_head_init(&amp;cfhsi-&gt;qhead[i]);</div><div class='del'>-	cfhsi-&gt;cfdev.link_select = CAIF_LINK_HIGH_BANDW;</div><div class='del'>-	cfhsi-&gt;cfdev.use_frag = false;</div><div class='del'>-	cfhsi-&gt;cfdev.use_stx = false;</div><div class='del'>-	cfhsi-&gt;cfdev.use_fcs = false;</div><div class='del'>-	cfhsi-&gt;ndev = dev;</div><div class='del'>-	cfhsi-&gt;cfg = hsi_default_config;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_open(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = netdev_priv(ndev);</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	clear_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Initialize state vaiables. */</div><div class='del'>-	cfhsi-&gt;tx_state = CFHSI_TX_STATE_IDLE;</div><div class='del'>-	cfhsi-&gt;rx_state.state = CFHSI_RX_STATE_DESC;</div><div class='del'>-</div><div class='del'>-	/* Set flow info */</div><div class='del'>-	cfhsi-&gt;flow_off_sent = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate a TX buffer with the size of a HSI packet descriptors</div><div class='del'>-	 * and the necessary room for CAIF payload frames.</div><div class='del'>-	 */</div><div class='del'>-	cfhsi-&gt;tx_buf = kzalloc(CFHSI_BUF_SZ_TX, GFP_KERNEL);</div><div class='del'>-	if (!cfhsi-&gt;tx_buf) {</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_alloc_tx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Allocate a RX buffer with the size of two HSI packet descriptors and</div><div class='del'>-	 * the necessary room for CAIF payload frames.</div><div class='del'>-	 */</div><div class='del'>-	cfhsi-&gt;rx_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL);</div><div class='del'>-	if (!cfhsi-&gt;rx_buf) {</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_alloc_rx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cfhsi-&gt;rx_flip_buf = kzalloc(CFHSI_BUF_SZ_RX, GFP_KERNEL);</div><div class='del'>-	if (!cfhsi-&gt;rx_flip_buf) {</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_alloc_rx_flip;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize aggregation timeout */</div><div class='del'>-	cfhsi-&gt;cfg.aggregation_timeout = hsi_default_config.aggregation_timeout;</div><div class='del'>-</div><div class='del'>-	/* Initialize recieve vaiables. */</div><div class='del'>-	cfhsi-&gt;rx_ptr = cfhsi-&gt;rx_buf;</div><div class='del'>-	cfhsi-&gt;rx_len = CFHSI_DESC_SZ;</div><div class='del'>-</div><div class='del'>-	/* Initialize spin locks. */</div><div class='del'>-	spin_lock_init(&amp;cfhsi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Set up the driver. */</div><div class='del'>-	cfhsi-&gt;cb_ops.tx_done_cb = cfhsi_tx_done_cb;</div><div class='del'>-	cfhsi-&gt;cb_ops.rx_done_cb = cfhsi_rx_done_cb;</div><div class='del'>-	cfhsi-&gt;cb_ops.wake_up_cb = cfhsi_wake_up_cb;</div><div class='del'>-	cfhsi-&gt;cb_ops.wake_down_cb = cfhsi_wake_down_cb;</div><div class='del'>-</div><div class='del'>-	/* Initialize the work queues. */</div><div class='del'>-	INIT_WORK(&amp;cfhsi-&gt;wake_up_work, cfhsi_wake_up);</div><div class='del'>-	INIT_WORK(&amp;cfhsi-&gt;wake_down_work, cfhsi_wake_down);</div><div class='del'>-	INIT_WORK(&amp;cfhsi-&gt;out_of_sync_work, cfhsi_out_of_sync);</div><div class='del'>-</div><div class='del'>-	/* Clear all bit fields. */</div><div class='del'>-	clear_bit(CFHSI_WAKE_UP_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-	clear_bit(CFHSI_WAKE_DOWN_ACK, &amp;cfhsi-&gt;bits);</div><div class='del'>-	clear_bit(CFHSI_WAKE_UP, &amp;cfhsi-&gt;bits);</div><div class='del'>-	clear_bit(CFHSI_AWAKE, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Create work thread. */</div><div class='del'>-	cfhsi-&gt;wq = alloc_ordered_workqueue(cfhsi-&gt;ndev-&gt;name, WQ_MEM_RECLAIM);</div><div class='del'>-	if (!cfhsi-&gt;wq) {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Failed to create work queue.\n",</div><div class='del'>-			__func__);</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_create_wq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize wait queues. */</div><div class='del'>-	init_waitqueue_head(&amp;cfhsi-&gt;wake_up_wait);</div><div class='del'>-	init_waitqueue_head(&amp;cfhsi-&gt;wake_down_wait);</div><div class='del'>-	init_waitqueue_head(&amp;cfhsi-&gt;flush_fifo_wait);</div><div class='del'>-</div><div class='del'>-	/* Setup the inactivity timer. */</div><div class='del'>-	timer_setup(&amp;cfhsi-&gt;inactivity_timer, cfhsi_inactivity_tout, 0);</div><div class='del'>-	/* Setup the slowpath RX timer. */</div><div class='del'>-	timer_setup(&amp;cfhsi-&gt;rx_slowpath_timer, cfhsi_rx_slowpath, 0);</div><div class='del'>-	/* Setup the aggregation timer. */</div><div class='del'>-	timer_setup(&amp;cfhsi-&gt;aggregation_timer, cfhsi_aggregation_tout, 0);</div><div class='del'>-</div><div class='del'>-	/* Activate HSI interface. */</div><div class='del'>-	res = cfhsi-&gt;ops-&gt;cfhsi_up(cfhsi-&gt;ops);</div><div class='del'>-	if (res) {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev,</div><div class='del'>-			"%s: can't activate HSI interface: %d.\n",</div><div class='del'>-			__func__, res);</div><div class='del'>-		goto err_activate;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Flush FIFO */</div><div class='del'>-	res = cfhsi_flush_fifo(cfhsi);</div><div class='del'>-	if (res) {</div><div class='del'>-		netdev_err(cfhsi-&gt;ndev, "%s: Can't flush FIFO: %d.\n",</div><div class='del'>-			__func__, res);</div><div class='del'>-		goto err_net_reg;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-</div><div class='del'>- err_net_reg:</div><div class='del'>-	cfhsi-&gt;ops-&gt;cfhsi_down(cfhsi-&gt;ops);</div><div class='del'>- err_activate:</div><div class='del'>-	destroy_workqueue(cfhsi-&gt;wq);</div><div class='del'>- err_create_wq:</div><div class='del'>-	kfree(cfhsi-&gt;rx_flip_buf);</div><div class='del'>- err_alloc_rx_flip:</div><div class='del'>-	kfree(cfhsi-&gt;rx_buf);</div><div class='del'>- err_alloc_rx:</div><div class='del'>-	kfree(cfhsi-&gt;tx_buf);</div><div class='del'>- err_alloc_tx:</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfhsi_close(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = netdev_priv(ndev);</div><div class='del'>-	u8 *tx_buf, *rx_buf, *flip_buf;</div><div class='del'>-</div><div class='del'>-	/* going to shutdown driver */</div><div class='del'>-	set_bit(CFHSI_SHUTDOWN, &amp;cfhsi-&gt;bits);</div><div class='del'>-</div><div class='del'>-	/* Delete timers if pending */</div><div class='del'>-	del_timer_sync(&amp;cfhsi-&gt;inactivity_timer);</div><div class='del'>-	del_timer_sync(&amp;cfhsi-&gt;rx_slowpath_timer);</div><div class='del'>-	del_timer_sync(&amp;cfhsi-&gt;aggregation_timer);</div><div class='del'>-</div><div class='del'>-	/* Cancel pending RX request (if any) */</div><div class='del'>-	cfhsi-&gt;ops-&gt;cfhsi_rx_cancel(cfhsi-&gt;ops);</div><div class='del'>-</div><div class='del'>-	/* Destroy workqueue */</div><div class='del'>-	destroy_workqueue(cfhsi-&gt;wq);</div><div class='del'>-</div><div class='del'>-	/* Store bufferes: will be freed later. */</div><div class='del'>-	tx_buf = cfhsi-&gt;tx_buf;</div><div class='del'>-	rx_buf = cfhsi-&gt;rx_buf;</div><div class='del'>-	flip_buf = cfhsi-&gt;rx_flip_buf;</div><div class='del'>-	/* Flush transmit queues. */</div><div class='del'>-	cfhsi_abort_tx(cfhsi);</div><div class='del'>-</div><div class='del'>-	/* Deactivate interface */</div><div class='del'>-	cfhsi-&gt;ops-&gt;cfhsi_down(cfhsi-&gt;ops);</div><div class='del'>-</div><div class='del'>-	/* Free buffers. */</div><div class='del'>-	kfree(tx_buf);</div><div class='del'>-	kfree(rx_buf);</div><div class='del'>-	kfree(flip_buf);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfhsi_uninit(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = netdev_priv(dev);</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	symbol_put(cfhsi_get_device);</div><div class='del'>-	list_del(&amp;cfhsi-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops cfhsi_netdevops = {</div><div class='del'>-	.ndo_uninit = cfhsi_uninit,</div><div class='del'>-	.ndo_open = cfhsi_open,</div><div class='del'>-	.ndo_stop = cfhsi_close,</div><div class='del'>-	.ndo_start_xmit = cfhsi_xmit</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cfhsi_netlink_parms(struct nlattr *data[], struct cfhsi *cfhsi)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!data) {</div><div class='del'>-		pr_debug("no params data found\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = __IFLA_CAIF_HSI_INACTIVITY_TOUT;</div><div class='del'>-	/*</div><div class='del'>-	 * Inactivity timeout in millisecs. Lowest possible value is 1,</div><div class='del'>-	 * and highest possible is NEXT_TIMER_MAX_DELTA.</div><div class='del'>-	 */</div><div class='del'>-	if (data[i]) {</div><div class='del'>-		u32 inactivity_timeout = nla_get_u32(data[i]);</div><div class='del'>-		/* Pre-calculate inactivity timeout. */</div><div class='del'>-		cfhsi-&gt;cfg.inactivity_timeout =	inactivity_timeout * HZ / 1000;</div><div class='del'>-		if (cfhsi-&gt;cfg.inactivity_timeout == 0)</div><div class='del'>-			cfhsi-&gt;cfg.inactivity_timeout = 1;</div><div class='del'>-		else if (cfhsi-&gt;cfg.inactivity_timeout &gt; NEXT_TIMER_MAX_DELTA)</div><div class='del'>-			cfhsi-&gt;cfg.inactivity_timeout = NEXT_TIMER_MAX_DELTA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = __IFLA_CAIF_HSI_AGGREGATION_TOUT;</div><div class='del'>-	if (data[i])</div><div class='del'>-		cfhsi-&gt;cfg.aggregation_timeout = nla_get_u32(data[i]);</div><div class='del'>-</div><div class='del'>-	i = __IFLA_CAIF_HSI_HEAD_ALIGN;</div><div class='del'>-	if (data[i])</div><div class='del'>-		cfhsi-&gt;cfg.head_align = nla_get_u32(data[i]);</div><div class='del'>-</div><div class='del'>-	i = __IFLA_CAIF_HSI_TAIL_ALIGN;</div><div class='del'>-	if (data[i])</div><div class='del'>-		cfhsi-&gt;cfg.tail_align = nla_get_u32(data[i]);</div><div class='del'>-</div><div class='del'>-	i = __IFLA_CAIF_HSI_QHIGH_WATERMARK;</div><div class='del'>-	if (data[i])</div><div class='del'>-		cfhsi-&gt;cfg.q_high_mark = nla_get_u32(data[i]);</div><div class='del'>-</div><div class='del'>-	i = __IFLA_CAIF_HSI_QLOW_WATERMARK;</div><div class='del'>-	if (data[i])</div><div class='del'>-		cfhsi-&gt;cfg.q_low_mark = nla_get_u32(data[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int caif_hsi_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='del'>-			       struct nlattr *data[],</div><div class='del'>-			       struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	cfhsi_netlink_parms(data, netdev_priv(dev));</div><div class='del'>-	netdev_state_change(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nla_policy caif_hsi_policy[__IFLA_CAIF_HSI_MAX + 1] = {</div><div class='del'>-	[__IFLA_CAIF_HSI_INACTIVITY_TOUT] = { .type = NLA_U32, .len = 4 },</div><div class='del'>-	[__IFLA_CAIF_HSI_AGGREGATION_TOUT] = { .type = NLA_U32, .len = 4 },</div><div class='del'>-	[__IFLA_CAIF_HSI_HEAD_ALIGN] = { .type = NLA_U32, .len = 4 },</div><div class='del'>-	[__IFLA_CAIF_HSI_TAIL_ALIGN] = { .type = NLA_U32, .len = 4 },</div><div class='del'>-	[__IFLA_CAIF_HSI_QHIGH_WATERMARK] = { .type = NLA_U32, .len = 4 },</div><div class='del'>-	[__IFLA_CAIF_HSI_QLOW_WATERMARK] = { .type = NLA_U32, .len = 4 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static size_t caif_hsi_get_size(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	size_t s = 0;</div><div class='del'>-	for (i = __IFLA_CAIF_HSI_UNSPEC + 1; i &lt; __IFLA_CAIF_HSI_MAX; i++)</div><div class='del'>-		s += nla_total_size(caif_hsi_policy[i].len);</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int caif_hsi_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (nla_put_u32(skb, __IFLA_CAIF_HSI_INACTIVITY_TOUT,</div><div class='del'>-			cfhsi-&gt;cfg.inactivity_timeout) ||</div><div class='del'>-	    nla_put_u32(skb, __IFLA_CAIF_HSI_AGGREGATION_TOUT,</div><div class='del'>-			cfhsi-&gt;cfg.aggregation_timeout) ||</div><div class='del'>-	    nla_put_u32(skb, __IFLA_CAIF_HSI_HEAD_ALIGN,</div><div class='del'>-			cfhsi-&gt;cfg.head_align) ||</div><div class='del'>-	    nla_put_u32(skb, __IFLA_CAIF_HSI_TAIL_ALIGN,</div><div class='del'>-			cfhsi-&gt;cfg.tail_align) ||</div><div class='del'>-	    nla_put_u32(skb, __IFLA_CAIF_HSI_QHIGH_WATERMARK,</div><div class='del'>-			cfhsi-&gt;cfg.q_high_mark) ||</div><div class='del'>-	    nla_put_u32(skb, __IFLA_CAIF_HSI_QLOW_WATERMARK,</div><div class='del'>-			cfhsi-&gt;cfg.q_low_mark))</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int caif_hsi_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-			    struct nlattr *tb[], struct nlattr *data[],</div><div class='del'>-			    struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct cfhsi *cfhsi = NULL;</div><div class='del'>-	struct cfhsi_ops *(*get_ops)(void);</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	cfhsi = netdev_priv(dev);</div><div class='del'>-	cfhsi_netlink_parms(data, cfhsi);</div><div class='del'>-</div><div class='del'>-	get_ops = symbol_get(cfhsi_get_ops);</div><div class='del'>-	if (!get_ops) {</div><div class='del'>-		pr_err("%s: failed to get the cfhsi_ops\n", __func__);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assign the HSI device. */</div><div class='del'>-	cfhsi-&gt;ops = (*get_ops)();</div><div class='del'>-	if (!cfhsi-&gt;ops) {</div><div class='del'>-		pr_err("%s: failed to get the cfhsi_ops\n", __func__);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assign the driver to this HSI device. */</div><div class='del'>-	cfhsi-&gt;ops-&gt;cb_ops = &amp;cfhsi-&gt;cb_ops;</div><div class='del'>-	if (register_netdevice(dev)) {</div><div class='del'>-		pr_warn("%s: caif_hsi device registration failed\n", __func__);</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-	/* Add CAIF HSI device to list. */</div><div class='del'>-	list_add_tail(&amp;cfhsi-&gt;list, &amp;cfhsi_list);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	symbol_put(cfhsi_get_ops);</div><div class='del'>-	return -ENODEV;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {</div><div class='del'>-	.kind		= "cfhsi",</div><div class='del'>-	.priv_size	= sizeof(struct cfhsi),</div><div class='del'>-	.setup		= cfhsi_setup,</div><div class='del'>-	.maxtype	= __IFLA_CAIF_HSI_MAX,</div><div class='del'>-	.policy	= caif_hsi_policy,</div><div class='del'>-	.newlink	= caif_hsi_newlink,</div><div class='del'>-	.changelink	= caif_hsi_changelink,</div><div class='del'>-	.get_size	= caif_hsi_get_size,</div><div class='del'>-	.fill_info	= caif_hsi_fill_info,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void __exit cfhsi_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *list_node;</div><div class='del'>-	struct list_head *n;</div><div class='del'>-	struct cfhsi *cfhsi;</div><div class='del'>-</div><div class='del'>-	rtnl_link_unregister(&amp;caif_hsi_link_ops);</div><div class='del'>-</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	list_for_each_safe(list_node, n, &amp;cfhsi_list) {</div><div class='del'>-		cfhsi = list_entry(list_node, struct cfhsi, list);</div><div class='del'>-		unregister_netdev(cfhsi-&gt;ndev);</div><div class='del'>-	}</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init cfhsi_init_module(void)</div><div class='del'>-{</div><div class='del'>-	return rtnl_link_register(&amp;caif_hsi_link_ops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cfhsi_init_module);</div><div class='del'>-module_exit(cfhsi_exit_module);</div><div class='head'>diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c<br/>index ed3c437063dc..c398ac42eae9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_serial.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_serial.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_serial.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/caif/caif_serial.c</a></div><div class='hunk'>@@ -87,33 +87,26 @@ static void ldisc_tx_wakeup(struct tty_struct *tty);</div><div class='ctx'> static inline void update_tty_status(struct ser_device *ser)</div><div class='ctx'> {</div><div class='ctx'> 	ser-&gt;tty_status =</div><div class='del'>-		ser-&gt;tty-&gt;stopped &lt;&lt; 5 |</div><div class='del'>-		ser-&gt;tty-&gt;flow_stopped &lt;&lt; 3 |</div><div class='del'>-		ser-&gt;tty-&gt;packet &lt;&lt; 2 |</div><div class='del'>-		ser-&gt;tty-&gt;port-&gt;low_latency &lt;&lt; 1;</div><div class='add'>+		ser-&gt;tty-&gt;flow.stopped &lt;&lt; 5 |</div><div class='add'>+		ser-&gt;tty-&gt;flow.tco_stopped &lt;&lt; 3 |</div><div class='add'>+		ser-&gt;tty-&gt;ctrl.packet &lt;&lt; 2;</div><div class='ctx'> }</div><div class='ctx'> static inline void debugfs_init(struct ser_device *ser, struct tty_struct *tty)</div><div class='ctx'> {</div><div class='del'>-	ser-&gt;debugfs_tty_dir =</div><div class='del'>-			debugfs_create_dir(tty-&gt;name, debugfsdir);</div><div class='del'>-	if (!IS_ERR(ser-&gt;debugfs_tty_dir)) {</div><div class='del'>-		debugfs_create_blob("last_tx_msg", 0400,</div><div class='del'>-				    ser-&gt;debugfs_tty_dir,</div><div class='del'>-				    &amp;ser-&gt;tx_blob);</div><div class='add'>+	ser-&gt;debugfs_tty_dir = debugfs_create_dir(tty-&gt;name, debugfsdir);</div><div class='ctx'> </div><div class='del'>-		debugfs_create_blob("last_rx_msg", 0400,</div><div class='del'>-				    ser-&gt;debugfs_tty_dir,</div><div class='del'>-				    &amp;ser-&gt;rx_blob);</div><div class='add'>+	debugfs_create_blob("last_tx_msg", 0400, ser-&gt;debugfs_tty_dir,</div><div class='add'>+			    &amp;ser-&gt;tx_blob);</div><div class='ctx'> </div><div class='del'>-		debugfs_create_x32("ser_state", 0400,</div><div class='del'>-				   ser-&gt;debugfs_tty_dir,</div><div class='del'>-				   (u32 *)&amp;ser-&gt;state);</div><div class='add'>+	debugfs_create_blob("last_rx_msg", 0400, ser-&gt;debugfs_tty_dir,</div><div class='add'>+			    &amp;ser-&gt;rx_blob);</div><div class='ctx'> </div><div class='del'>-		debugfs_create_x8("tty_status", 0400,</div><div class='del'>-				  ser-&gt;debugfs_tty_dir,</div><div class='del'>-				  &amp;ser-&gt;tty_status);</div><div class='add'>+	debugfs_create_xul("ser_state", 0400, ser-&gt;debugfs_tty_dir,</div><div class='add'>+			   &amp;ser-&gt;state);</div><div class='add'>+</div><div class='add'>+	debugfs_create_x8("tty_status", 0400, ser-&gt;debugfs_tty_dir,</div><div class='add'>+			  &amp;ser-&gt;tty_status);</div><div class='ctx'> </div><div class='del'>-	}</div><div class='ctx'> 	ser-&gt;tx_blob.data = ser-&gt;tx_data;</div><div class='ctx'> 	ser-&gt;tx_blob.size = 0;</div><div class='ctx'> 	ser-&gt;rx_blob.data = ser-&gt;rx_data;</div><div class='hunk'>@@ -133,15 +126,6 @@ static inline void debugfs_rx(struct ser_device *ser, const u8 *data, int size)</div><div class='ctx'> 	ser-&gt;rx_blob.data = ser-&gt;rx_data;</div><div class='ctx'> 	ser-&gt;rx_blob.size = size;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void debugfs_tx(struct ser_device *ser, const u8 *data, int size)</div><div class='del'>-{</div><div class='del'>-	if (size &gt; sizeof(ser-&gt;tx_data))</div><div class='del'>-		size = sizeof(ser-&gt;tx_data);</div><div class='del'>-	memcpy(ser-&gt;tx_data, data, size);</div><div class='del'>-	ser-&gt;tx_blob.data = ser-&gt;tx_data;</div><div class='del'>-	ser-&gt;tx_blob.size = size;</div><div class='del'>-}</div><div class='ctx'> #else</div><div class='ctx'> static inline void debugfs_init(struct ser_device *ser, struct tty_struct *tty)</div><div class='ctx'> {</div><div class='hunk'>@@ -158,15 +142,10 @@ static inline void update_tty_status(struct ser_device *ser)</div><div class='ctx'> static inline void debugfs_rx(struct ser_device *ser, const u8 *data, int size)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static inline void debugfs_tx(struct ser_device *ser, const u8 *data, int size)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static void ldisc_receive(struct tty_struct *tty, const u8 *data,</div><div class='del'>-			char *flags, int count)</div><div class='add'>+			  const u8 *flags, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct ser_device *ser;</div><div class='hunk'>@@ -203,7 +182,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,</div><div class='ctx'> 	skb_reset_mac_header(skb);</div><div class='ctx'> 	debugfs_rx(ser, data, count);</div><div class='ctx'> 	/* Push received packet up the stack. */</div><div class='del'>-	ret = netif_rx_ni(skb);</div><div class='add'>+	ret = netif_rx(skb);</div><div class='ctx'> 	if (!ret) {</div><div class='ctx'> 		ser-&gt;dev-&gt;stats.rx_packets++;</div><div class='ctx'> 		ser-&gt;dev-&gt;stats.rx_bytes += count;</div><div class='hunk'>@@ -272,11 +251,10 @@ error:</div><div class='ctx'> 	return tty_wr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int caif_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t caif_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ser_device *ser;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(dev == NULL);</div><div class='ctx'> 	ser = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Send flow off once, on high water mark */</div><div class='hunk'>@@ -352,12 +330,13 @@ static int ldisc_open(struct tty_struct *tty)</div><div class='ctx'> 	ser-&gt;tty = tty_kref_get(tty);</div><div class='ctx'> 	ser-&gt;dev = dev;</div><div class='ctx'> 	debugfs_init(ser, tty);</div><div class='del'>-	tty-&gt;receive_room = N_TTY_BUF_SIZE;</div><div class='add'>+	tty-&gt;receive_room = 4096;</div><div class='ctx'> 	tty-&gt;disc_data = ser;</div><div class='ctx'> 	set_bit(TTY_DO_WRITE_WAKEUP, &amp;tty-&gt;flags);</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	result = register_netdevice(dev);</div><div class='ctx'> 	if (result) {</div><div class='add'>+		tty_kref_put(tty);</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -387,7 +366,7 @@ static void ldisc_close(struct tty_struct *tty)</div><div class='ctx'> /* The line discipline structure. */</div><div class='ctx'> static struct tty_ldisc_ops caif_ldisc = {</div><div class='ctx'> 	.owner =	THIS_MODULE,</div><div class='del'>-	.magic =	TTY_LDISC_MAGIC,</div><div class='add'>+	.num =		N_CAIF,</div><div class='ctx'> 	.name =		"n_caif",</div><div class='ctx'> 	.open =		ldisc_open,</div><div class='ctx'> 	.close =	ldisc_close,</div><div class='hunk'>@@ -395,18 +374,6 @@ static struct tty_ldisc_ops caif_ldisc = {</div><div class='ctx'> 	.write_wakeup =	ldisc_tx_wakeup</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int register_ldisc(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	result = tty_register_ldisc(N_CAIF, &amp;caif_ldisc);</div><div class='del'>-	if (result &lt; 0) {</div><div class='del'>-		pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF,</div><div class='del'>-			result);</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='ctx'> static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_open = caif_net_open,</div><div class='ctx'> 	.ndo_stop = caif_net_close,</div><div class='hunk'>@@ -449,7 +416,10 @@ static int __init caif_ser_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = register_ldisc();</div><div class='add'>+	ret = tty_register_ldisc(&amp;caif_ldisc);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF, ret);</div><div class='add'>+</div><div class='ctx'> 	debugfsdir = debugfs_create_dir("caif_serial", NULL);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -461,7 +431,7 @@ static void __exit caif_ser_exit(void)</div><div class='ctx'> 	spin_unlock(&amp;ser_lock);</div><div class='ctx'> 	ser_release(NULL);</div><div class='ctx'> 	cancel_work_sync(&amp;ser_release_work);</div><div class='del'>-	tty_unregister_ldisc(N_CAIF);</div><div class='add'>+	tty_unregister_ldisc(&amp;caif_ldisc);</div><div class='ctx'> 	debugfs_remove_recursive(debugfsdir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c<br/>deleted file mode 100644<br/>index 8e81bdf98ac6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_spi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_spi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,874 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) ST-Ericsson AB 2010</div><div class='del'>- * Author:  Daniel Martensson</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;net/caif/caif_layer.h&gt;</div><div class='del'>-#include &lt;net/caif/caif_spi.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_CAIF_SPI_SYNC</div><div class='del'>-#define FLAVOR "Flavour: Vanilla.\n"</div><div class='del'>-#else</div><div class='del'>-#define FLAVOR "Flavour: Master CMD&amp;LEN at start.\n"</div><div class='del'>-#endif /* CONFIG_CAIF_SPI_SYNC */</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Daniel Martensson");</div><div class='del'>-MODULE_DESCRIPTION("CAIF SPI driver");</div><div class='del'>-</div><div class='del'>-/* Returns the number of padding bytes for alignment. */</div><div class='del'>-#define PAD_POW2(x, pow) ((((x)&amp;((pow)-1))==0) ? 0 : (((pow)-((x)&amp;((pow)-1)))))</div><div class='del'>-</div><div class='del'>-static bool spi_loop;</div><div class='del'>-module_param(spi_loop, bool, 0444);</div><div class='del'>-MODULE_PARM_DESC(spi_loop, "SPI running in loopback mode.");</div><div class='del'>-</div><div class='del'>-/* SPI frame alignment. */</div><div class='del'>-module_param(spi_frm_align, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(spi_frm_align, "SPI frame alignment.");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPI padding options.</div><div class='del'>- * Warning: must be a base of 2 (&amp; operation used) and can not be zero !</div><div class='del'>- */</div><div class='del'>-module_param(spi_up_head_align, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(spi_up_head_align, "SPI uplink head alignment.");</div><div class='del'>-</div><div class='del'>-module_param(spi_up_tail_align, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(spi_up_tail_align, "SPI uplink tail alignment.");</div><div class='del'>-</div><div class='del'>-module_param(spi_down_head_align, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(spi_down_head_align, "SPI downlink head alignment.");</div><div class='del'>-</div><div class='del'>-module_param(spi_down_tail_align, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(spi_down_tail_align, "SPI downlink tail alignment.");</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_ARM</div><div class='del'>-#define BYTE_HEX_FMT "%02X"</div><div class='del'>-#else</div><div class='del'>-#define BYTE_HEX_FMT "%02hhX"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define SPI_MAX_PAYLOAD_SIZE 4096</div><div class='del'>-/*</div><div class='del'>- * Threshold values for the SPI packet queue. Flowcontrol will be asserted</div><div class='del'>- * when the number of packets exceeds HIGH_WATER_MARK. It will not be</div><div class='del'>- * deasserted before the number of packets drops below LOW_WATER_MARK.</div><div class='del'>- */</div><div class='del'>-#define LOW_WATER_MARK   100</div><div class='del'>-#define HIGH_WATER_MARK  (LOW_WATER_MARK*5)</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_HAS_DMA</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We sometimes use UML for debugging, but it cannot handle</div><div class='del'>- * dma_alloc_coherent so we have to wrap it.</div><div class='del'>- */</div><div class='del'>-static inline void *dma_alloc(struct cfspi *cfspi, dma_addr_t *daddr)</div><div class='del'>-{</div><div class='del'>-	return kmalloc(SPI_DMA_BUF_LEN, GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dma_free(struct cfspi *cfspi, void *cpu_addr,</div><div class='del'>-		dma_addr_t handle)</div><div class='del'>-{</div><div class='del'>-	kfree(cpu_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void *dma_alloc(struct cfspi *cfspi, dma_addr_t *daddr)</div><div class='del'>-{</div><div class='del'>-	return dma_alloc_coherent(&amp;cfspi-&gt;pdev-&gt;dev, SPI_DMA_BUF_LEN, daddr,</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dma_free(struct cfspi *cfspi, void *cpu_addr,</div><div class='del'>-		dma_addr_t handle)</div><div class='del'>-{</div><div class='del'>-	dma_free_coherent(&amp;cfspi-&gt;pdev-&gt;dev, SPI_DMA_BUF_LEN, cpu_addr, handle);</div><div class='del'>-}</div><div class='del'>-#endif	/* CONFIG_HAS_DMA */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-</div><div class='del'>-#define DEBUGFS_BUF_SIZE	4096</div><div class='del'>-</div><div class='del'>-static struct dentry *dbgfs_root;</div><div class='del'>-</div><div class='del'>-static inline void driver_debugfs_create(void)</div><div class='del'>-{</div><div class='del'>-	dbgfs_root = debugfs_create_dir(cfspi_spi_driver.driver.name, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void driver_debugfs_remove(void)</div><div class='del'>-{</div><div class='del'>-	debugfs_remove(dbgfs_root);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dev_debugfs_rem(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-	debugfs_remove(cfspi-&gt;dbgfs_frame);</div><div class='del'>-	debugfs_remove(cfspi-&gt;dbgfs_state);</div><div class='del'>-	debugfs_remove(cfspi-&gt;dbgfs_dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t dbgfs_state(struct file *file, char __user *user_buf,</div><div class='del'>-			   size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char *buf;</div><div class='del'>-	int len = 0;</div><div class='del'>-	ssize_t size;</div><div class='del'>-	struct cfspi *cfspi = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-	buf = kzalloc(DEBUGFS_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Print out debug information. */</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"CAIF SPI debug information:\n");</div><div class='del'>-</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len), FLAVOR);</div><div class='del'>-</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"STATE: %d\n", cfspi-&gt;dbg_state);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Previous CMD: 0x%x\n", cfspi-&gt;pcmd);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Current CMD: 0x%x\n", cfspi-&gt;cmd);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Previous TX len: %d\n", cfspi-&gt;tx_ppck_len);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Previous RX len: %d\n", cfspi-&gt;rx_ppck_len);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Current TX len: %d\n", cfspi-&gt;tx_cpck_len);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Current RX len: %d\n", cfspi-&gt;rx_cpck_len);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Next TX len: %d\n", cfspi-&gt;tx_npck_len);</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Next RX len: %d\n", cfspi-&gt;rx_npck_len);</div><div class='del'>-</div><div class='del'>-	if (len &gt; DEBUGFS_BUF_SIZE)</div><div class='del'>-		len = DEBUGFS_BUF_SIZE;</div><div class='del'>-</div><div class='del'>-	size = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='del'>-	kfree(buf);</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t print_frame(char *buf, size_t size, char *frm,</div><div class='del'>-			   size_t count, size_t cut)</div><div class='del'>-{</div><div class='del'>-	int len = 0;</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		len += snprintf((buf + len), (size - len),</div><div class='del'>-					"[0x" BYTE_HEX_FMT "]",</div><div class='del'>-					frm[i]);</div><div class='del'>-		if ((i == cut) &amp;&amp; (count &gt; (cut * 2))) {</div><div class='del'>-			/* Fast forward. */</div><div class='del'>-			i = count - cut;</div><div class='del'>-			len += snprintf((buf + len), (size - len),</div><div class='del'>-					"--- %zu bytes skipped ---\n",</div><div class='del'>-					count - (cut * 2));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((!(i % 10)) &amp;&amp; i) {</div><div class='del'>-			len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-					"\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len), "\n");</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t dbgfs_frame(struct file *file, char __user *user_buf,</div><div class='del'>-			   size_t count, loff_t *ppos)</div><div class='del'>-{</div><div class='del'>-	char *buf;</div><div class='del'>-	int len = 0;</div><div class='del'>-	ssize_t size;</div><div class='del'>-	struct cfspi *cfspi;</div><div class='del'>-</div><div class='del'>-	cfspi = file-&gt;private_data;</div><div class='del'>-	buf = kzalloc(DEBUGFS_BUF_SIZE, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Print out debug information. */</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Current frame:\n");</div><div class='del'>-</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Tx data (Len: %d):\n", cfspi-&gt;tx_cpck_len);</div><div class='del'>-</div><div class='del'>-	len += print_frame((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			   cfspi-&gt;xfer.va_tx[0],</div><div class='del'>-			   (cfspi-&gt;tx_cpck_len + SPI_CMD_SZ), 100);</div><div class='del'>-</div><div class='del'>-	len += snprintf((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			"Rx data (Len: %d):\n", cfspi-&gt;rx_cpck_len);</div><div class='del'>-</div><div class='del'>-	len += print_frame((buf + len), (DEBUGFS_BUF_SIZE - len),</div><div class='del'>-			   cfspi-&gt;xfer.va_rx,</div><div class='del'>-			   (cfspi-&gt;rx_cpck_len + SPI_CMD_SZ), 100);</div><div class='del'>-</div><div class='del'>-	size = simple_read_from_buffer(user_buf, count, ppos, buf, len);</div><div class='del'>-	kfree(buf);</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations dbgfs_state_fops = {</div><div class='del'>-	.open = simple_open,</div><div class='del'>-	.read = dbgfs_state,</div><div class='del'>-	.owner = THIS_MODULE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct file_operations dbgfs_frame_fops = {</div><div class='del'>-	.open = simple_open,</div><div class='del'>-	.read = dbgfs_frame,</div><div class='del'>-	.owner = THIS_MODULE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline void dev_debugfs_add(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-	cfspi-&gt;dbgfs_dir = debugfs_create_dir(cfspi-&gt;pdev-&gt;name, dbgfs_root);</div><div class='del'>-	cfspi-&gt;dbgfs_state = debugfs_create_file("state", 0444,</div><div class='del'>-						 cfspi-&gt;dbgfs_dir, cfspi,</div><div class='del'>-						 &amp;dbgfs_state_fops);</div><div class='del'>-	cfspi-&gt;dbgfs_frame = debugfs_create_file("frame", 0444,</div><div class='del'>-						 cfspi-&gt;dbgfs_dir, cfspi,</div><div class='del'>-						 &amp;dbgfs_frame_fops);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void cfspi_dbg_state(struct cfspi *cfspi, int state)</div><div class='del'>-{</div><div class='del'>-	cfspi-&gt;dbg_state = state;</div><div class='del'>-};</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static inline void driver_debugfs_create(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void driver_debugfs_remove(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dev_debugfs_add(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void dev_debugfs_rem(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-inline void cfspi_dbg_state(struct cfspi *cfspi, int state)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif				/* CONFIG_DEBUG_FS */</div><div class='del'>-</div><div class='del'>-static LIST_HEAD(cfspi_list);</div><div class='del'>-static spinlock_t cfspi_list_lock;</div><div class='del'>-</div><div class='del'>-/* SPI uplink head alignment. */</div><div class='del'>-static ssize_t up_head_align_show(struct device_driver *driver, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%d\n", spi_up_head_align);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DRIVER_ATTR_RO(up_head_align);</div><div class='del'>-</div><div class='del'>-/* SPI uplink tail alignment. */</div><div class='del'>-static ssize_t up_tail_align_show(struct device_driver *driver, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%d\n", spi_up_tail_align);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DRIVER_ATTR_RO(up_tail_align);</div><div class='del'>-</div><div class='del'>-/* SPI downlink head alignment. */</div><div class='del'>-static ssize_t down_head_align_show(struct device_driver *driver, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%d\n", spi_down_head_align);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DRIVER_ATTR_RO(down_head_align);</div><div class='del'>-</div><div class='del'>-/* SPI downlink tail alignment. */</div><div class='del'>-static ssize_t down_tail_align_show(struct device_driver *driver, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%d\n", spi_down_tail_align);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DRIVER_ATTR_RO(down_tail_align);</div><div class='del'>-</div><div class='del'>-/* SPI frame alignment. */</div><div class='del'>-static ssize_t frame_align_show(struct device_driver *driver, char *buf)</div><div class='del'>-{</div><div class='del'>-	return sprintf(buf, "%d\n", spi_frm_align);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static DRIVER_ATTR_RO(frame_align);</div><div class='del'>-</div><div class='del'>-int cfspi_xmitfrm(struct cfspi *cfspi, u8 *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	u8 *dst = buf;</div><div class='del'>-	caif_assert(buf);</div><div class='del'>-</div><div class='del'>-	if (cfspi-&gt;slave &amp;&amp; !cfspi-&gt;slave_talked)</div><div class='del'>-		cfspi-&gt;slave_talked = true;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		struct caif_payload_info *info;</div><div class='del'>-		int spad = 0;</div><div class='del'>-		int epad;</div><div class='del'>-</div><div class='del'>-		skb = skb_dequeue(&amp;cfspi-&gt;chead);</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate length of frame including SPI padding.</div><div class='del'>-		 * The payload position is found in the control buffer.</div><div class='del'>-		 */</div><div class='del'>-		info = (struct caif_payload_info *)&amp;skb-&gt;cb;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute head offset i.e. number of bytes to add to</div><div class='del'>-		 * get the start of the payload aligned.</div><div class='del'>-		 */</div><div class='del'>-		if (spi_up_head_align &gt; 1) {</div><div class='del'>-			spad = 1 + PAD_POW2((info-&gt;hdr_len + 1), spi_up_head_align);</div><div class='del'>-			*dst = (u8)(spad - 1);</div><div class='del'>-			dst += spad;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Copy in CAIF frame. */</div><div class='del'>-		skb_copy_bits(skb, 0, dst, skb-&gt;len);</div><div class='del'>-		dst += skb-&gt;len;</div><div class='del'>-		cfspi-&gt;ndev-&gt;stats.tx_packets++;</div><div class='del'>-		cfspi-&gt;ndev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute tail offset i.e. number of bytes to add to</div><div class='del'>-		 * get the complete CAIF frame aligned.</div><div class='del'>-		 */</div><div class='del'>-		epad = PAD_POW2((skb-&gt;len + spad), spi_up_tail_align);</div><div class='del'>-		dst += epad;</div><div class='del'>-</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-</div><div class='del'>-	} while ((dst - buf) &lt; len);</div><div class='del'>-</div><div class='del'>-	return dst - buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int cfspi_xmitlen(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	int frm_len = 0;</div><div class='del'>-	int pkts = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Decommit previously committed frames.</div><div class='del'>-	 * skb_queue_splice_tail(&amp;cfspi-&gt;chead,&amp;cfspi-&gt;qhead)</div><div class='del'>-	 */</div><div class='del'>-	while (skb_peek(&amp;cfspi-&gt;chead)) {</div><div class='del'>-		skb = skb_dequeue_tail(&amp;cfspi-&gt;chead);</div><div class='del'>-		skb_queue_head(&amp;cfspi-&gt;qhead, skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		struct caif_payload_info *info = NULL;</div><div class='del'>-		int spad = 0;</div><div class='del'>-		int epad = 0;</div><div class='del'>-</div><div class='del'>-		skb = skb_dequeue(&amp;cfspi-&gt;qhead);</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Calculate length of frame including SPI padding.</div><div class='del'>-		 * The payload position is found in the control buffer.</div><div class='del'>-		 */</div><div class='del'>-		info = (struct caif_payload_info *)&amp;skb-&gt;cb;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute head offset i.e. number of bytes to add to</div><div class='del'>-		 * get the start of the payload aligned.</div><div class='del'>-		 */</div><div class='del'>-		if (spi_up_head_align &gt; 1)</div><div class='del'>-			spad = 1 + PAD_POW2((info-&gt;hdr_len + 1), spi_up_head_align);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute tail offset i.e. number of bytes to add to</div><div class='del'>-		 * get the complete CAIF frame aligned.</div><div class='del'>-		 */</div><div class='del'>-		epad = PAD_POW2((skb-&gt;len + spad), spi_up_tail_align);</div><div class='del'>-</div><div class='del'>-		if ((skb-&gt;len + spad + epad + frm_len) &lt;= CAIF_MAX_SPI_FRAME) {</div><div class='del'>-			skb_queue_tail(&amp;cfspi-&gt;chead, skb);</div><div class='del'>-			pkts++;</div><div class='del'>-			frm_len += skb-&gt;len + spad + epad;</div><div class='del'>-		} else {</div><div class='del'>-			/* Put back packet. */</div><div class='del'>-			skb_queue_head(&amp;cfspi-&gt;qhead, skb);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (pkts &lt;= CAIF_MAX_SPI_PKTS);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Send flow on if previously sent flow off</div><div class='del'>-	 * and now go below the low water mark</div><div class='del'>-	 */</div><div class='del'>-	if (cfspi-&gt;flow_off_sent &amp;&amp; cfspi-&gt;qhead.qlen &lt; cfspi-&gt;qd_low_mark &amp;&amp;</div><div class='del'>-		cfspi-&gt;cfdev.flowctrl) {</div><div class='del'>-		cfspi-&gt;flow_off_sent = 0;</div><div class='del'>-		cfspi-&gt;cfdev.flowctrl(cfspi-&gt;ndev, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return frm_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfspi_ss_cb(bool assert, struct cfspi_ifc *ifc)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = (struct cfspi *)ifc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The slave device is the master on the link. Interrupts before the</div><div class='del'>-	 * slave has transmitted are considered spurious.</div><div class='del'>-	 */</div><div class='del'>-	if (cfspi-&gt;slave &amp;&amp; !cfspi-&gt;slave_talked) {</div><div class='del'>-		printk(KERN_WARNING "CFSPI: Spurious SS interrupt.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!in_interrupt())</div><div class='del'>-		spin_lock(&amp;cfspi-&gt;lock);</div><div class='del'>-	if (assert) {</div><div class='del'>-		set_bit(SPI_SS_ON, &amp;cfspi-&gt;state);</div><div class='del'>-		set_bit(SPI_XFER, &amp;cfspi-&gt;state);</div><div class='del'>-	} else {</div><div class='del'>-		set_bit(SPI_SS_OFF, &amp;cfspi-&gt;state);</div><div class='del'>-	}</div><div class='del'>-	if (!in_interrupt())</div><div class='del'>-		spin_unlock(&amp;cfspi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Wake up the xfer thread. */</div><div class='del'>-	if (assert)</div><div class='del'>-		wake_up_interruptible(&amp;cfspi-&gt;wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfspi_xfer_done_cb(struct cfspi_ifc *ifc)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = (struct cfspi *)ifc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Transfer done, complete work queue */</div><div class='del'>-	complete(&amp;cfspi-&gt;comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfspi_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	cfspi = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	skb_queue_tail(&amp;cfspi-&gt;qhead, skb);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;cfspi-&gt;lock, flags);</div><div class='del'>-	if (!test_and_set_bit(SPI_XFER, &amp;cfspi-&gt;state)) {</div><div class='del'>-		/* Wake up xfer thread. */</div><div class='del'>-		wake_up_interruptible(&amp;cfspi-&gt;wait);</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;cfspi-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	/* Send flow off if number of bytes is above high water mark */</div><div class='del'>-	if (!cfspi-&gt;flow_off_sent &amp;&amp;</div><div class='del'>-		cfspi-&gt;qhead.qlen &gt; cfspi-&gt;qd_high_mark &amp;&amp;</div><div class='del'>-		cfspi-&gt;cfdev.flowctrl) {</div><div class='del'>-		cfspi-&gt;flow_off_sent = 1;</div><div class='del'>-		cfspi-&gt;cfdev.flowctrl(cfspi-&gt;ndev, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len)</div><div class='del'>-{</div><div class='del'>-	u8 *src = buf;</div><div class='del'>-</div><div class='del'>-	caif_assert(buf != NULL);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		int res;</div><div class='del'>-		struct sk_buff *skb = NULL;</div><div class='del'>-		int spad = 0;</div><div class='del'>-		int epad = 0;</div><div class='del'>-		int pkt_len = 0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute head offset i.e. number of bytes added to</div><div class='del'>-		 * get the start of the payload aligned.</div><div class='del'>-		 */</div><div class='del'>-		if (spi_down_head_align &gt; 1) {</div><div class='del'>-			spad = 1 + *src;</div><div class='del'>-			src += spad;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Read length of CAIF frame (little endian). */</div><div class='del'>-		pkt_len = *src;</div><div class='del'>-		pkt_len |= ((*(src+1)) &lt;&lt; 8) &amp; 0xFF00;</div><div class='del'>-		pkt_len += 2;	/* Add FCS fields. */</div><div class='del'>-</div><div class='del'>-		/* Get a suitable caif packet and copy in data. */</div><div class='del'>-</div><div class='del'>-		skb = netdev_alloc_skb(cfspi-&gt;ndev, pkt_len + 1);</div><div class='del'>-		caif_assert(skb != NULL);</div><div class='del'>-</div><div class='del'>-		skb_put_data(skb, src, pkt_len);</div><div class='del'>-		src += pkt_len;</div><div class='del'>-</div><div class='del'>-		skb-&gt;protocol = htons(ETH_P_CAIF);</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Push received packet up the stack.</div><div class='del'>-		 */</div><div class='del'>-		if (!spi_loop)</div><div class='del'>-			res = netif_rx_ni(skb);</div><div class='del'>-		else</div><div class='del'>-			res = cfspi_xmit(skb, cfspi-&gt;ndev);</div><div class='del'>-</div><div class='del'>-		if (!res) {</div><div class='del'>-			cfspi-&gt;ndev-&gt;stats.rx_packets++;</div><div class='del'>-			cfspi-&gt;ndev-&gt;stats.rx_bytes += pkt_len;</div><div class='del'>-		} else</div><div class='del'>-			cfspi-&gt;ndev-&gt;stats.rx_dropped++;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Compute tail offset i.e. number of bytes added to</div><div class='del'>-		 * get the complete CAIF frame aligned.</div><div class='del'>-		 */</div><div class='del'>-		epad = PAD_POW2((pkt_len + spad), spi_down_tail_align);</div><div class='del'>-		src += epad;</div><div class='del'>-	} while ((src - buf) &lt; len);</div><div class='del'>-</div><div class='del'>-	return src - buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfspi_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfspi_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cfspi_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int res = 0;</div><div class='del'>-	struct cfspi *cfspi = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Set flow info. */</div><div class='del'>-	cfspi-&gt;flow_off_sent = 0;</div><div class='del'>-	cfspi-&gt;qd_low_mark = LOW_WATER_MARK;</div><div class='del'>-	cfspi-&gt;qd_high_mark = HIGH_WATER_MARK;</div><div class='del'>-</div><div class='del'>-	/* Set slave info. */</div><div class='del'>-	if (!strncmp(cfspi_spi_driver.driver.name, "cfspi_sspi", 10)) {</div><div class='del'>-		cfspi-&gt;slave = true;</div><div class='del'>-		cfspi-&gt;slave_talked = false;</div><div class='del'>-	} else {</div><div class='del'>-		cfspi-&gt;slave = false;</div><div class='del'>-		cfspi-&gt;slave_talked = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allocate DMA buffers. */</div><div class='del'>-	cfspi-&gt;xfer.va_tx[0] = dma_alloc(cfspi, &amp;cfspi-&gt;xfer.pa_tx[0]);</div><div class='del'>-	if (!cfspi-&gt;xfer.va_tx[0]) {</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_dma_alloc_tx_0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cfspi-&gt;xfer.va_rx = dma_alloc(cfspi, &amp;cfspi-&gt;xfer.pa_rx);</div><div class='del'>-</div><div class='del'>-	if (!cfspi-&gt;xfer.va_rx) {</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_dma_alloc_rx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize the work queue. */</div><div class='del'>-	INIT_WORK(&amp;cfspi-&gt;work, cfspi_xfer);</div><div class='del'>-</div><div class='del'>-	/* Initialize spin locks. */</div><div class='del'>-	spin_lock_init(&amp;cfspi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Initialize flow control state. */</div><div class='del'>-	cfspi-&gt;flow_stop = false;</div><div class='del'>-</div><div class='del'>-	/* Initialize wait queue. */</div><div class='del'>-	init_waitqueue_head(&amp;cfspi-&gt;wait);</div><div class='del'>-</div><div class='del'>-	/* Create work thread. */</div><div class='del'>-	cfspi-&gt;wq = create_singlethread_workqueue(dev-&gt;name);</div><div class='del'>-	if (!cfspi-&gt;wq) {</div><div class='del'>-		printk(KERN_WARNING "CFSPI: failed to create work queue.\n");</div><div class='del'>-		res = -ENODEV;</div><div class='del'>-		goto err_create_wq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialize work queue. */</div><div class='del'>-	init_completion(&amp;cfspi-&gt;comp);</div><div class='del'>-</div><div class='del'>-	/* Create debugfs entries. */</div><div class='del'>-	dev_debugfs_add(cfspi);</div><div class='del'>-</div><div class='del'>-	/* Set up the ifc. */</div><div class='del'>-	cfspi-&gt;ifc.ss_cb = cfspi_ss_cb;</div><div class='del'>-	cfspi-&gt;ifc.xfer_done_cb = cfspi_xfer_done_cb;</div><div class='del'>-	cfspi-&gt;ifc.priv = cfspi;</div><div class='del'>-</div><div class='del'>-	/* Add CAIF SPI device to list. */</div><div class='del'>-	spin_lock(&amp;cfspi_list_lock);</div><div class='del'>-	list_add_tail(&amp;cfspi-&gt;list, &amp;cfspi_list);</div><div class='del'>-	spin_unlock(&amp;cfspi_list_lock);</div><div class='del'>-</div><div class='del'>-	/* Schedule the work queue. */</div><div class='del'>-	queue_work(cfspi-&gt;wq, &amp;cfspi-&gt;work);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- err_create_wq:</div><div class='del'>-	dma_free(cfspi, cfspi-&gt;xfer.va_rx, cfspi-&gt;xfer.pa_rx);</div><div class='del'>- err_dma_alloc_rx:</div><div class='del'>-	dma_free(cfspi, cfspi-&gt;xfer.va_tx[0], cfspi-&gt;xfer.pa_tx[0]);</div><div class='del'>- err_dma_alloc_tx_0:</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cfspi_uninit(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Remove from list. */</div><div class='del'>-	spin_lock(&amp;cfspi_list_lock);</div><div class='del'>-	list_del(&amp;cfspi-&gt;list);</div><div class='del'>-	spin_unlock(&amp;cfspi_list_lock);</div><div class='del'>-</div><div class='del'>-	cfspi-&gt;ndev = NULL;</div><div class='del'>-	/* Free DMA buffers. */</div><div class='del'>-	dma_free(cfspi, cfspi-&gt;xfer.va_rx, cfspi-&gt;xfer.pa_rx);</div><div class='del'>-	dma_free(cfspi, cfspi-&gt;xfer.va_tx[0], cfspi-&gt;xfer.pa_tx[0]);</div><div class='del'>-	set_bit(SPI_TERMINATE, &amp;cfspi-&gt;state);</div><div class='del'>-	wake_up_interruptible(&amp;cfspi-&gt;wait);</div><div class='del'>-	destroy_workqueue(cfspi-&gt;wq);</div><div class='del'>-	/* Destroy debugfs directory and files. */</div><div class='del'>-	dev_debugfs_rem(cfspi);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops cfspi_ops = {</div><div class='del'>-	.ndo_open = cfspi_open,</div><div class='del'>-	.ndo_stop = cfspi_close,</div><div class='del'>-	.ndo_init = cfspi_init,</div><div class='del'>-	.ndo_uninit = cfspi_uninit,</div><div class='del'>-	.ndo_start_xmit = cfspi_xmit</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cfspi_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = netdev_priv(dev);</div><div class='del'>-	dev-&gt;features = 0;</div><div class='del'>-	dev-&gt;netdev_ops = &amp;cfspi_ops;</div><div class='del'>-	dev-&gt;type = ARPHRD_CAIF;</div><div class='del'>-	dev-&gt;flags = IFF_NOARP | IFF_POINTOPOINT;</div><div class='del'>-	dev-&gt;priv_flags |= IFF_NO_QUEUE;</div><div class='del'>-	dev-&gt;mtu = SPI_MAX_PAYLOAD_SIZE;</div><div class='del'>-	dev-&gt;needs_free_netdev = true;</div><div class='del'>-	skb_queue_head_init(&amp;cfspi-&gt;qhead);</div><div class='del'>-	skb_queue_head_init(&amp;cfspi-&gt;chead);</div><div class='del'>-	cfspi-&gt;cfdev.link_select = CAIF_LINK_HIGH_BANDW;</div><div class='del'>-	cfspi-&gt;cfdev.use_frag = false;</div><div class='del'>-	cfspi-&gt;cfdev.use_stx = false;</div><div class='del'>-	cfspi-&gt;cfdev.use_fcs = false;</div><div class='del'>-	cfspi-&gt;ndev = dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int cfspi_spi_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi = NULL;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct cfspi_dev *dev;</div><div class='del'>-	int res;</div><div class='del'>-	dev = (struct cfspi_dev *)pdev-&gt;dev.platform_data;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d",</div><div class='del'>-			    NET_NAME_UNKNOWN, cfspi_setup);</div><div class='del'>-	if (!ndev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	cfspi = netdev_priv(ndev);</div><div class='del'>-	netif_stop_queue(ndev);</div><div class='del'>-	cfspi-&gt;ndev = ndev;</div><div class='del'>-	cfspi-&gt;pdev = pdev;</div><div class='del'>-</div><div class='del'>-	/* Assign the SPI device. */</div><div class='del'>-	cfspi-&gt;dev = dev;</div><div class='del'>-	/* Assign the device ifc to this SPI interface. */</div><div class='del'>-	dev-&gt;ifc = &amp;cfspi-&gt;ifc;</div><div class='del'>-</div><div class='del'>-	/* Register network device. */</div><div class='del'>-	res = register_netdev(ndev);</div><div class='del'>-	if (res) {</div><div class='del'>-		printk(KERN_ERR "CFSPI: Reg. error: %d.\n", res);</div><div class='del'>-		goto err_net_reg;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-</div><div class='del'>- err_net_reg:</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int cfspi_spi_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	/* Everything is done in cfspi_uninit(). */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit cfspi_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	struct list_head *list_node;</div><div class='del'>-	struct list_head *n;</div><div class='del'>-	struct cfspi *cfspi = NULL;</div><div class='del'>-</div><div class='del'>-	list_for_each_safe(list_node, n, &amp;cfspi_list) {</div><div class='del'>-		cfspi = list_entry(list_node, struct cfspi, list);</div><div class='del'>-		unregister_netdev(cfspi-&gt;ndev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Destroy sysfs files. */</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_up_head_align);</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_up_tail_align);</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_down_head_align);</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_down_tail_align);</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver, &amp;driver_attr_frame_align);</div><div class='del'>-	/* Unregister platform driver. */</div><div class='del'>-	platform_driver_unregister(&amp;cfspi_spi_driver);</div><div class='del'>-	/* Destroy debugfs root directory. */</div><div class='del'>-	driver_debugfs_remove();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init cfspi_init_module(void)</div><div class='del'>-{</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	/* Initialize spin lock. */</div><div class='del'>-	spin_lock_init(&amp;cfspi_list_lock);</div><div class='del'>-</div><div class='del'>-	/* Register platform driver. */</div><div class='del'>-	result = platform_driver_register(&amp;cfspi_spi_driver);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "Could not register platform SPI driver.\n");</div><div class='del'>-		goto err_dev_register;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create sysfs files. */</div><div class='del'>-	result =</div><div class='del'>-	    driver_create_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			       &amp;driver_attr_up_head_align);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "Sysfs creation failed 1.\n");</div><div class='del'>-		goto err_create_up_head_align;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result =</div><div class='del'>-	    driver_create_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			       &amp;driver_attr_up_tail_align);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "Sysfs creation failed 2.\n");</div><div class='del'>-		goto err_create_up_tail_align;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result =</div><div class='del'>-	    driver_create_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			       &amp;driver_attr_down_head_align);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "Sysfs creation failed 3.\n");</div><div class='del'>-		goto err_create_down_head_align;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result =</div><div class='del'>-	    driver_create_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			       &amp;driver_attr_down_tail_align);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "Sysfs creation failed 4.\n");</div><div class='del'>-		goto err_create_down_tail_align;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result =</div><div class='del'>-	    driver_create_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			       &amp;driver_attr_frame_align);</div><div class='del'>-	if (result) {</div><div class='del'>-		printk(KERN_ERR "Sysfs creation failed 5.\n");</div><div class='del'>-		goto err_create_frame_align;</div><div class='del'>-	}</div><div class='del'>-	driver_debugfs_create();</div><div class='del'>-	return result;</div><div class='del'>-</div><div class='del'>- err_create_frame_align:</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_down_tail_align);</div><div class='del'>- err_create_down_tail_align:</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_down_head_align);</div><div class='del'>- err_create_down_head_align:</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_up_tail_align);</div><div class='del'>- err_create_up_tail_align:</div><div class='del'>-	driver_remove_file(&amp;cfspi_spi_driver.driver,</div><div class='del'>-			   &amp;driver_attr_up_head_align);</div><div class='del'>- err_create_up_head_align:</div><div class='del'>-	platform_driver_unregister(&amp;cfspi_spi_driver);</div><div class='del'>- err_dev_register:</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(cfspi_init_module);</div><div class='del'>-module_exit(cfspi_exit_module);</div><div class='head'>diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c<br/>deleted file mode 100644<br/>index bb776d33dd8f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_spi_slave.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_spi_slave.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,254 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) ST-Ericsson AB 2010</div><div class='del'>- * Author:  Daniel Martensson</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/semaphore.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/completion.h&gt;</div><div class='del'>-#include &lt;linux/list.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/debugfs.h&gt;</div><div class='del'>-#include &lt;net/caif/caif_spi.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_CAIF_SPI_SYNC</div><div class='del'>-#define SPI_DATA_POS 0</div><div class='del'>-static inline int forward_to_spi_cmd(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-	return cfspi-&gt;rx_cpck_len;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define SPI_DATA_POS SPI_CMD_SZ</div><div class='del'>-static inline int forward_to_spi_cmd(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int spi_frm_align = 2;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * SPI padding options.</div><div class='del'>- * Warning: must be a base of 2 (&amp; operation used) and can not be zero !</div><div class='del'>- */</div><div class='del'>-int spi_up_head_align   = 1 &lt;&lt; 1;</div><div class='del'>-int spi_up_tail_align   = 1 &lt;&lt; 0;</div><div class='del'>-int spi_down_head_align = 1 &lt;&lt; 2;</div><div class='del'>-int spi_down_tail_align = 1 &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-static inline void debugfs_store_prev(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-	/* Store previous command for debugging reasons.*/</div><div class='del'>-	cfspi-&gt;pcmd = cfspi-&gt;cmd;</div><div class='del'>-	/* Store previous transfer. */</div><div class='del'>-	cfspi-&gt;tx_ppck_len = cfspi-&gt;tx_cpck_len;</div><div class='del'>-	cfspi-&gt;rx_ppck_len = cfspi-&gt;rx_cpck_len;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static inline void debugfs_store_prev(struct cfspi *cfspi)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void cfspi_xfer(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct cfspi *cfspi;</div><div class='del'>-	u8 *ptr = NULL;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='del'>-	cfspi = container_of(work, struct cfspi, work);</div><div class='del'>-</div><div class='del'>-	/* Initialize state. */</div><div class='del'>-	cfspi-&gt;cmd = SPI_CMD_EOT;</div><div class='del'>-</div><div class='del'>-	for (;;) {</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_WAITING);</div><div class='del'>-</div><div class='del'>-		/* Wait for master talk or transmit event. */</div><div class='del'>-		wait_event_interruptible(cfspi-&gt;wait,</div><div class='del'>-				 test_bit(SPI_XFER, &amp;cfspi-&gt;state) ||</div><div class='del'>-				 test_bit(SPI_TERMINATE, &amp;cfspi-&gt;state));</div><div class='del'>-</div><div class='del'>-		if (test_bit(SPI_TERMINATE, &amp;cfspi-&gt;state))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-#if CFSPI_DBG_PREFILL</div><div class='del'>-		/* Prefill buffers for easier debugging. */</div><div class='del'>-		memset(cfspi-&gt;xfer.va_tx, 0xFF, SPI_DMA_BUF_LEN);</div><div class='del'>-		memset(cfspi-&gt;xfer.va_rx, 0xFF, SPI_DMA_BUF_LEN);</div><div class='del'>-#endif	/* CFSPI_DBG_PREFILL */</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_AWAKE);</div><div class='del'>-</div><div class='del'>-	/* Check whether we have a committed frame. */</div><div class='del'>-		if (cfspi-&gt;tx_cpck_len) {</div><div class='del'>-			int len;</div><div class='del'>-</div><div class='del'>-			cfspi_dbg_state(cfspi, CFSPI_STATE_FETCH_PKT);</div><div class='del'>-</div><div class='del'>-			/* Copy committed SPI frames after the SPI indication. */</div><div class='del'>-			ptr = (u8 *) cfspi-&gt;xfer.va_tx;</div><div class='del'>-			ptr += SPI_IND_SZ;</div><div class='del'>-			len = cfspi_xmitfrm(cfspi, ptr, cfspi-&gt;tx_cpck_len);</div><div class='del'>-			WARN_ON(len != cfspi-&gt;tx_cpck_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_GET_NEXT);</div><div class='del'>-</div><div class='del'>-		/* Get length of next frame to commit. */</div><div class='del'>-		cfspi-&gt;tx_npck_len = cfspi_xmitlen(cfspi);</div><div class='del'>-</div><div class='del'>-		WARN_ON(cfspi-&gt;tx_npck_len &gt; SPI_DMA_BUF_LEN);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Add indication and length at the beginning of the frame,</div><div class='del'>-		 * using little endian.</div><div class='del'>-		 */</div><div class='del'>-		ptr = (u8 *) cfspi-&gt;xfer.va_tx;</div><div class='del'>-		*ptr++ = SPI_CMD_IND;</div><div class='del'>-		*ptr++ = (SPI_CMD_IND  &amp; 0xFF00) &gt;&gt; 8;</div><div class='del'>-		*ptr++ = cfspi-&gt;tx_npck_len &amp; 0x00FF;</div><div class='del'>-		*ptr++ = (cfspi-&gt;tx_npck_len &amp; 0xFF00) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-		/* Calculate length of DMAs. */</div><div class='del'>-		cfspi-&gt;xfer.tx_dma_len = cfspi-&gt;tx_cpck_len + SPI_IND_SZ;</div><div class='del'>-		cfspi-&gt;xfer.rx_dma_len = cfspi-&gt;rx_cpck_len + SPI_CMD_SZ;</div><div class='del'>-</div><div class='del'>-		/* Add SPI TX frame alignment padding, if necessary. */</div><div class='del'>-		if (cfspi-&gt;tx_cpck_len &amp;&amp;</div><div class='del'>-			(cfspi-&gt;xfer.tx_dma_len % spi_frm_align)) {</div><div class='del'>-</div><div class='del'>-			cfspi-&gt;xfer.tx_dma_len += spi_frm_align -</div><div class='del'>-			    (cfspi-&gt;xfer.tx_dma_len % spi_frm_align);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Add SPI RX frame alignment padding, if necessary. */</div><div class='del'>-		if (cfspi-&gt;rx_cpck_len &amp;&amp;</div><div class='del'>-			(cfspi-&gt;xfer.rx_dma_len % spi_frm_align)) {</div><div class='del'>-</div><div class='del'>-			cfspi-&gt;xfer.rx_dma_len += spi_frm_align -</div><div class='del'>-			    (cfspi-&gt;xfer.rx_dma_len % spi_frm_align);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_INIT_XFER);</div><div class='del'>-</div><div class='del'>-		/* Start transfer. */</div><div class='del'>-		ret = cfspi-&gt;dev-&gt;init_xfer(&amp;cfspi-&gt;xfer, cfspi-&gt;dev);</div><div class='del'>-		WARN_ON(ret);</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_ACTIVE);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * TODO: We might be able to make an assumption if this is the</div><div class='del'>-		 * first loop. Make sure that minimum toggle time is respected.</div><div class='del'>-		 */</div><div class='del'>-		udelay(MIN_TRANSITION_TIME_USEC);</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_ACTIVE);</div><div class='del'>-</div><div class='del'>-		/* Signal that we are ready to receive data. */</div><div class='del'>-		cfspi-&gt;dev-&gt;sig_xfer(true, cfspi-&gt;dev);</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_XFER_DONE);</div><div class='del'>-</div><div class='del'>-		/* Wait for transfer completion. */</div><div class='del'>-		wait_for_completion(&amp;cfspi-&gt;comp);</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_XFER_DONE);</div><div class='del'>-</div><div class='del'>-		if (cfspi-&gt;cmd == SPI_CMD_EOT) {</div><div class='del'>-			/*</div><div class='del'>-			 * Clear the master talk bit. A xfer is always at</div><div class='del'>-			 *  least two bursts.</div><div class='del'>-			 */</div><div class='del'>-			clear_bit(SPI_SS_ON, &amp;cfspi-&gt;state);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_WAIT_INACTIVE);</div><div class='del'>-</div><div class='del'>-		/* Make sure that the minimum toggle time is respected. */</div><div class='del'>-		if (SPI_XFER_TIME_USEC(cfspi-&gt;xfer.tx_dma_len,</div><div class='del'>-					cfspi-&gt;dev-&gt;clk_mhz) &lt;</div><div class='del'>-			MIN_TRANSITION_TIME_USEC) {</div><div class='del'>-</div><div class='del'>-			udelay(MIN_TRANSITION_TIME_USEC -</div><div class='del'>-				SPI_XFER_TIME_USEC</div><div class='del'>-				(cfspi-&gt;xfer.tx_dma_len, cfspi-&gt;dev-&gt;clk_mhz));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cfspi_dbg_state(cfspi, CFSPI_STATE_SIG_INACTIVE);</div><div class='del'>-</div><div class='del'>-		/* De-assert transfer signal. */</div><div class='del'>-		cfspi-&gt;dev-&gt;sig_xfer(false, cfspi-&gt;dev);</div><div class='del'>-</div><div class='del'>-		/* Check whether we received a CAIF packet. */</div><div class='del'>-		if (cfspi-&gt;rx_cpck_len) {</div><div class='del'>-			int len;</div><div class='del'>-</div><div class='del'>-			cfspi_dbg_state(cfspi, CFSPI_STATE_DELIVER_PKT);</div><div class='del'>-</div><div class='del'>-			/* Parse SPI frame. */</div><div class='del'>-			ptr = ((u8 *)(cfspi-&gt;xfer.va_rx + SPI_DATA_POS));</div><div class='del'>-</div><div class='del'>-			len = cfspi_rxfrm(cfspi, ptr, cfspi-&gt;rx_cpck_len);</div><div class='del'>-			WARN_ON(len != cfspi-&gt;rx_cpck_len);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check the next SPI command and length. */</div><div class='del'>-		ptr = (u8 *) cfspi-&gt;xfer.va_rx;</div><div class='del'>-</div><div class='del'>-		ptr += forward_to_spi_cmd(cfspi);</div><div class='del'>-</div><div class='del'>-		cfspi-&gt;cmd = *ptr++;</div><div class='del'>-		cfspi-&gt;cmd |= ((*ptr++) &lt;&lt; 8) &amp; 0xFF00;</div><div class='del'>-		cfspi-&gt;rx_npck_len = *ptr++;</div><div class='del'>-		cfspi-&gt;rx_npck_len |= ((*ptr++) &lt;&lt; 8) &amp; 0xFF00;</div><div class='del'>-</div><div class='del'>-		WARN_ON(cfspi-&gt;rx_npck_len &gt; SPI_DMA_BUF_LEN);</div><div class='del'>-		WARN_ON(cfspi-&gt;cmd &gt; SPI_CMD_EOT);</div><div class='del'>-</div><div class='del'>-		debugfs_store_prev(cfspi);</div><div class='del'>-</div><div class='del'>-		/* Check whether the master issued an EOT command. */</div><div class='del'>-		if (cfspi-&gt;cmd == SPI_CMD_EOT) {</div><div class='del'>-			/* Reset state. */</div><div class='del'>-			cfspi-&gt;tx_cpck_len = 0;</div><div class='del'>-			cfspi-&gt;rx_cpck_len = 0;</div><div class='del'>-		} else {</div><div class='del'>-			/* Update state. */</div><div class='del'>-			cfspi-&gt;tx_cpck_len = cfspi-&gt;tx_npck_len;</div><div class='del'>-			cfspi-&gt;rx_cpck_len = cfspi-&gt;rx_npck_len;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Check whether we need to clear the xfer bit.</div><div class='del'>-		 * Spin lock needed for packet insertion.</div><div class='del'>-		 * Test and clear of different bits</div><div class='del'>-		 * are not supported.</div><div class='del'>-		 */</div><div class='del'>-		spin_lock_irqsave(&amp;cfspi-&gt;lock, flags);</div><div class='del'>-		if (cfspi-&gt;cmd == SPI_CMD_EOT &amp;&amp; !cfspi_xmitlen(cfspi)</div><div class='del'>-			&amp;&amp; !test_bit(SPI_SS_ON, &amp;cfspi-&gt;state))</div><div class='del'>-			clear_bit(SPI_XFER, &amp;cfspi-&gt;state);</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;cfspi-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct platform_driver cfspi_spi_driver = {</div><div class='del'>-	.probe = cfspi_spi_probe,</div><div class='del'>-	.remove = cfspi_spi_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		   .name = "cfspi_sspi",</div><div class='del'>-		   .owner = THIS_MODULE,</div><div class='del'>-		   },</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c<br/>index 27e93a438dd9..c60386bf2d1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_virtio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/caif/caif_virtio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/caif/caif_virtio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/caif/caif_virtio.c</a></div><div class='hunk'>@@ -315,7 +315,7 @@ exit:</div><div class='ctx'> 	case 0:</div><div class='ctx'> 		++cfv-&gt;stats.rx_napi_complete;</div><div class='ctx'> </div><div class='del'>-		/* Really out of patckets? (stolen from virtio_net)*/</div><div class='add'>+		/* Really out of packets? (stolen from virtio_net)*/</div><div class='ctx'> 		napi_complete(napi);</div><div class='ctx'> 		if (unlikely(!vringh_notify_enable_kern(cfv-&gt;vr_rx)) &amp;&amp;</div><div class='ctx'> 		    napi_schedule_prep(napi)) {</div><div class='hunk'>@@ -463,7 +463,7 @@ static int cfv_netdev_close(struct net_device *netdev)</div><div class='ctx'> 	vringh_notify_disable_kern(cfv-&gt;vr_rx);</div><div class='ctx'> 	napi_disable(&amp;cfv-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	/* Release any TX buffers on both used and avilable rings */</div><div class='add'>+	/* Release any TX buffers on both used and available rings */</div><div class='ctx'> 	cfv_release_used_buf(cfv-&gt;vq_tx);</div><div class='ctx'> 	spin_lock_irqsave(&amp;cfv-&gt;tx_lock, flags);</div><div class='ctx'> 	while ((buf_info = virtqueue_detach_unused_buf(cfv-&gt;vq_tx)))</div><div class='hunk'>@@ -497,7 +497,7 @@ static struct buf_info *cfv_alloc_and_copy_to_shm(struct cfv_info *cfv,</div><div class='ctx'> 	if (unlikely(!buf_info))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	/* Make the IP header aligned in tbe buffer */</div><div class='add'>+	/* Make the IP header aligned in the buffer */</div><div class='ctx'> 	hdr_ofs = cfv-&gt;tx_hr + info-&gt;hdr_len;</div><div class='ctx'> 	pad_len = hdr_ofs &amp; (IP_HDR_ALIGN - 1);</div><div class='ctx'> 	buf_info-&gt;size = cfv-&gt;tx_hr + skb-&gt;len + cfv-&gt;tx_tr + pad_len;</div><div class='hunk'>@@ -519,7 +519,7 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Put the CAIF packet on the virtio ring and kick the receiver */</div><div class='del'>-static int cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+static netdev_tx_t cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cfv_info *cfv = netdev_priv(netdev);</div><div class='ctx'> 	struct buf_info *buf_info;</div><div class='hunk'>@@ -598,9 +598,9 @@ err:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cfv_tx_release_tasklet(unsigned long drv)</div><div class='add'>+static void cfv_tx_release_tasklet(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct cfv_info *cfv = (struct cfv_info *)drv;</div><div class='add'>+	struct cfv_info *cfv = from_tasklet(cfv, t, tx_release_tasklet);</div><div class='ctx'> 	cfv_release_used_buf(cfv-&gt;vq_tx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -623,11 +623,7 @@ static void cfv_netdev_setup(struct net_device *netdev)</div><div class='ctx'> /* Create debugfs counters for the device */</div><div class='ctx'> static inline void debugfs_init(struct cfv_info *cfv)</div><div class='ctx'> {</div><div class='del'>-	cfv-&gt;debugfs =</div><div class='del'>-		debugfs_create_dir(netdev_name(cfv-&gt;ndev), NULL);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(cfv-&gt;debugfs))</div><div class='del'>-		return;</div><div class='add'>+	cfv-&gt;debugfs = debugfs_create_dir(netdev_name(cfv-&gt;ndev), NULL);</div><div class='ctx'> </div><div class='ctx'> 	debugfs_create_u32("rx-napi-complete", 0400, cfv-&gt;debugfs,</div><div class='ctx'> 			   &amp;cfv-&gt;stats.rx_napi_complete);</div><div class='hunk'>@@ -650,13 +646,11 @@ static inline void debugfs_init(struct cfv_info *cfv)</div><div class='ctx'> /* Setup CAIF for the a virtio device */</div><div class='ctx'> static int cfv_probe(struct virtio_device *vdev)</div><div class='ctx'> {</div><div class='del'>-	vq_callback_t *vq_cbs = cfv_release_cb;</div><div class='ctx'> 	vrh_callback_t *vrh_cbs = cfv_recv;</div><div class='del'>-	const char *names =  "output";</div><div class='ctx'> 	const char *cfv_netdev_name = "cfvrt";</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct cfv_info *cfv;</div><div class='del'>-	int err = -EINVAL;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	netdev = alloc_netdev(sizeof(struct cfv_info), cfv_netdev_name,</div><div class='ctx'> 			      NET_NAME_UNKNOWN, cfv_netdev_setup);</div><div class='hunk'>@@ -679,9 +673,11 @@ static int cfv_probe(struct virtio_device *vdev)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the TX virtio ring. This is a "guest side vring". */</div><div class='del'>-	err = virtio_find_vqs(vdev, 1, &amp;cfv-&gt;vq_tx, &amp;vq_cbs, &amp;names, NULL);</div><div class='del'>-	if (err)</div><div class='add'>+	cfv-&gt;vq_tx = virtio_find_single_vq(vdev, cfv_release_cb, "output");</div><div class='add'>+	if (IS_ERR(cfv-&gt;vq_tx)) {</div><div class='add'>+		err = PTR_ERR(cfv-&gt;vq_tx);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the CAIF configuration from virtio config space, if available */</div><div class='ctx'> 	if (vdev-&gt;config-&gt;get) {</div><div class='hunk'>@@ -718,22 +714,29 @@ static int cfv_probe(struct virtio_device *vdev)</div><div class='ctx'> 	/* Initialize NAPI poll context data */</div><div class='ctx'> 	vringh_kiov_init(&amp;cfv-&gt;ctx.riov, NULL, 0);</div><div class='ctx'> 	cfv-&gt;ctx.head = USHRT_MAX;</div><div class='del'>-	netif_napi_add(netdev, &amp;cfv-&gt;napi, cfv_rx_poll, CFV_DEFAULT_QUOTA);</div><div class='add'>+	netif_napi_add_weight(netdev, &amp;cfv-&gt;napi, cfv_rx_poll,</div><div class='add'>+			      CFV_DEFAULT_QUOTA);</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;cfv-&gt;tx_release_tasklet,</div><div class='del'>-		     cfv_tx_release_tasklet,</div><div class='del'>-		     (unsigned long)cfv);</div><div class='add'>+	tasklet_setup(&amp;cfv-&gt;tx_release_tasklet, cfv_tx_release_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	/* Carrier is off until netdevice is opened */</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='add'>+	/* serialize netdev register + virtio_device_ready() with ndo_open() */</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='ctx'> 	/* register Netdev */</div><div class='del'>-	err = register_netdev(netdev);</div><div class='add'>+	err = register_netdevice(netdev);</div><div class='ctx'> 	if (err) {</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> 		dev_err(&amp;vdev-&gt;dev, "Unable to register netdev (%d)\n", err);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	virtio_device_ready(vdev);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='ctx'> 	debugfs_init(cfv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -742,7 +745,7 @@ err:</div><div class='ctx'> </div><div class='ctx'> 	if (cfv-&gt;vr_rx)</div><div class='ctx'> 		vdev-&gt;vringh_config-&gt;del_vrhs(cfv-&gt;vdev);</div><div class='del'>-	if (cfv-&gt;vdev)</div><div class='add'>+	if (cfv-&gt;vq_tx)</div><div class='ctx'> 		vdev-&gt;config-&gt;del_vqs(cfv-&gt;vdev);</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -760,7 +763,7 @@ static void cfv_remove(struct virtio_device *vdev)</div><div class='ctx'> 	debugfs_remove_recursive(cfv-&gt;debugfs);</div><div class='ctx'> </div><div class='ctx'> 	vringh_kiov_cleanup(&amp;cfv-&gt;ctx.riov);</div><div class='del'>-	vdev-&gt;config-&gt;reset(vdev);</div><div class='add'>+	virtio_reset_device(vdev);</div><div class='ctx'> 	vdev-&gt;vringh_config-&gt;del_vrhs(cfv-&gt;vdev);</div><div class='ctx'> 	cfv-&gt;vr_rx = NULL;</div><div class='ctx'> 	vdev-&gt;config-&gt;del_vqs(cfv-&gt;vdev);</div><div class='hunk'>@@ -779,7 +782,6 @@ static struct virtio_driver caif_virtio_driver = {</div><div class='ctx'> 	.feature_table		= features,</div><div class='ctx'> 	.feature_table_size	= ARRAY_SIZE(features),</div><div class='ctx'> 	.driver.name		= KBUILD_MODNAME,</div><div class='del'>-	.driver.owner		= THIS_MODULE,</div><div class='ctx'> 	.id_table		= id_table,</div><div class='ctx'> 	.probe			= cfv_probe,</div><div class='ctx'> 	.remove			= cfv_remove,</div><div class='head'>diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig<br/>index ab585900a057..e15e320db476 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/Kconfig</a></div><div class='hunk'>@@ -1,9 +1,30 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-menu "CAN Device Drivers"</div><div class='add'>+</div><div class='add'>+menuconfig CAN_DEV</div><div class='add'>+	tristate "CAN Device Drivers"</div><div class='add'>+	default y</div><div class='add'>+	depends on CAN</div><div class='add'>+	help</div><div class='add'>+	  Controller Area Network (CAN) is serial communications protocol up to</div><div class='add'>+	  1Mbit/s for its original release (now known as Classical CAN) and up</div><div class='add'>+	  to 8Mbit/s for the more recent CAN with Flexible Data-Rate</div><div class='add'>+	  (CAN-FD). The CAN bus was originally mainly for automotive, but is now</div><div class='add'>+	  widely used in marine (NMEA2000), industrial, and medical</div><div class='add'>+	  applications. More information on the CAN network protocol family</div><div class='add'>+	  PF_CAN is contained in &lt;Documentation/networking/can.rst&gt;.</div><div class='add'>+</div><div class='add'>+	  This section contains all the CAN(-FD) device drivers including the</div><div class='add'>+	  virtual ones. If you own such devices or plan to use the virtual CAN</div><div class='add'>+	  interfaces to develop applications, say Y here.</div><div class='add'>+</div><div class='add'>+	  To compile as a module, choose M here: the module will be called</div><div class='add'>+	  can-dev.</div><div class='add'>+</div><div class='add'>+if CAN_DEV</div><div class='ctx'> </div><div class='ctx'> config CAN_VCAN</div><div class='ctx'> 	tristate "Virtual Local CAN Interface (vcan)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Similar to the network loopback devices, vcan offers a</div><div class='ctx'> 	  virtual local CAN interface.</div><div class='ctx'> </div><div class='hunk'>@@ -12,7 +33,7 @@ config CAN_VCAN</div><div class='ctx'> </div><div class='ctx'> config CAN_VXCAN</div><div class='ctx'> 	tristate "Virtual CAN Tunnel (vxcan)"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Similar to the virtual ethernet driver veth, vxcan implements a</div><div class='ctx'> 	  local CAN traffic tunnel between two virtual CAN network devices.</div><div class='ctx'> 	  When creating a vxcan, two vxcan devices are created as pair.</div><div class='hunk'>@@ -28,40 +49,27 @@ config CAN_VXCAN</div><div class='ctx'> 	  This driver can also be built as a module.  If so, the module</div><div class='ctx'> 	  will be called vxcan.</div><div class='ctx'> </div><div class='del'>-config CAN_SLCAN</div><div class='del'>-	tristate "Serial / USB serial CAN Adaptors (slcan)"</div><div class='del'>-	depends on TTY</div><div class='del'>-	---help---</div><div class='del'>-	  CAN driver for several 'low cost' CAN interfaces that are attached</div><div class='del'>-	  via serial lines or via USB-to-serial adapters using the LAWICEL</div><div class='del'>-	  ASCII protocol. The driver implements the tty linediscipline N_SLCAN.</div><div class='del'>-</div><div class='del'>-	  As only the sending and receiving of CAN frames is implemented, this</div><div class='del'>-	  driver should work with the (serial/USB) CAN hardware from:</div><div class='del'>-	  www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de</div><div class='add'>+config CAN_NETLINK</div><div class='add'>+	bool "CAN device drivers with Netlink support"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Enables the common framework for CAN device drivers. This is the</div><div class='add'>+	  standard library and provides features for the Netlink interface such</div><div class='add'>+	  as bittiming validation, support of CAN error states, device restart</div><div class='add'>+	  and others.</div><div class='ctx'> </div><div class='del'>-	  Userspace tools to attach the SLCAN line discipline (slcan_attach,</div><div class='del'>-	  slcand) can be found in the can-utils at the SocketCAN SVN, see</div><div class='del'>-	  http://developer.berlios.de/projects/socketcan for details.</div><div class='add'>+	  The additional features selected by this option will be added to the</div><div class='add'>+	  can-dev module.</div><div class='ctx'> </div><div class='del'>-	  The slcan driver supports up to 10 CAN netdevices by default which</div><div class='del'>-	  can be changed by the 'maxdev=xx' module option. This driver can</div><div class='del'>-	  also be built as a module. If so, the module will be called slcan.</div><div class='add'>+	  This is required by all platform and hardware CAN drivers. If you</div><div class='add'>+	  plan to use such devices or if unsure, say Y.</div><div class='ctx'> </div><div class='del'>-config CAN_DEV</div><div class='del'>-	tristate "Platform CAN drivers with Netlink support"</div><div class='del'>-	default y</div><div class='del'>-	---help---</div><div class='del'>-	  Enables the common framework for platform CAN drivers with Netlink</div><div class='del'>-	  support. This is the standard library for CAN drivers.</div><div class='del'>-	  If unsure, say Y.</div><div class='del'>-</div><div class='del'>-if CAN_DEV</div><div class='add'>+if CAN_NETLINK</div><div class='ctx'> </div><div class='ctx'> config CAN_CALC_BITTIMING</div><div class='ctx'> 	bool "CAN bit-timing calculation"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If enabled, CAN bit-timing parameters will be calculated for the</div><div class='ctx'> 	  bit-rate specified via Netlink argument "bitrate" when the device</div><div class='ctx'> 	  get started. This works fine for the most common CAN controllers</div><div class='hunk'>@@ -69,42 +77,82 @@ config CAN_CALC_BITTIMING</div><div class='ctx'> 	  source clock frequencies. Disabling saves some space, but then the</div><div class='ctx'> 	  bit-timing parameters must be specified directly using the Netlink</div><div class='ctx'> 	  arguments "tq", "prop_seg", "phase_seg1", "phase_seg2" and "sjw".</div><div class='add'>+</div><div class='add'>+	  The additional features selected by this option will be added to the</div><div class='add'>+	  can-dev module.</div><div class='add'>+</div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='del'>-config CAN_LEDS</div><div class='del'>-	bool "Enable LED triggers for Netlink based drivers"</div><div class='del'>-	depends on LEDS_CLASS</div><div class='del'>-	# The netdev trigger (LEDS_TRIGGER_NETDEV) should be able to do</div><div class='del'>-	# everything that this driver is doing. This is marked as broken</div><div class='del'>-	# because it uses stuff that is intended to be changed or removed.</div><div class='del'>-	# Please consider switching to the netdev trigger and confirm it</div><div class='del'>-	# fulfills your needs instead of fixing this driver.</div><div class='del'>-	depends on BROKEN</div><div class='del'>-	select LEDS_TRIGGERS</div><div class='del'>-	---help---</div><div class='del'>-	  This option adds two LED triggers for packet receive and transmit</div><div class='del'>-	  events on each supported CAN device.</div><div class='del'>-</div><div class='del'>-	  Say Y here if you are working on a system with led-class supported</div><div class='del'>-	  LEDs and you want to use them as canbus activity indicators.</div><div class='add'>+config CAN_RX_OFFLOAD</div><div class='add'>+	bool</div><div class='ctx'> </div><div class='ctx'> config CAN_AT91</div><div class='ctx'> 	tristate "Atmel AT91 onchip CAN controller"</div><div class='ctx'> 	depends on (ARCH_AT91 || COMPILE_TEST) &amp;&amp; HAS_IOMEM</div><div class='del'>-	---help---</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='ctx'> 	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263</div><div class='ctx'> 	  and AT91SAM9X5 processors.</div><div class='ctx'> </div><div class='add'>+config CAN_BXCAN</div><div class='add'>+	tristate "STM32 Basic Extended CAN (bxCAN) devices"</div><div class='add'>+	depends on ARCH_STM32 || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to build support for the STMicroelectronics STM32 basic</div><div class='add'>+	  extended CAN Controller (bxCAN).</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called bxcan.</div><div class='add'>+</div><div class='add'>+config CAN_CAN327</div><div class='add'>+	tristate "Serial / USB serial ELM327 based OBD-II Interfaces (can327)"</div><div class='add'>+	depends on TTY</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='add'>+	  CAN driver for several 'low cost' OBD-II interfaces based on the</div><div class='add'>+	  ELM327 OBD-II interpreter chip.</div><div class='add'>+</div><div class='add'>+	  This is a best effort driver - the ELM327 interface was never</div><div class='add'>+	  designed to be used as a standalone CAN interface. However, it can</div><div class='add'>+	  still be used for simple request-response protocols (such as OBD II),</div><div class='add'>+	  and to monitor broadcast messages on a bus (such as in a vehicle).</div><div class='add'>+</div><div class='add'>+	  Please refer to the documentation for information on how to use it:</div><div class='add'>+	  Documentation/networking/device_drivers/can/can327.rst</div><div class='add'>+</div><div class='add'>+	  If this driver is built as a module, it will be called can327.</div><div class='add'>+</div><div class='add'>+config CAN_DUMMY</div><div class='add'>+	tristate "Dummy CAN"</div><div class='add'>+	help</div><div class='add'>+	  A dummy CAN module supporting Classical CAN, CAN FD and CAN XL. It</div><div class='add'>+	  exposes bittiming values which can be configured through the netlink</div><div class='add'>+	  interface.</div><div class='add'>+</div><div class='add'>+	  The module will simply echo any frame sent to it. If debug messages</div><div class='add'>+	  are activated, it prints all the CAN bittiming information in the</div><div class='add'>+	  kernel log. Aside from that it does nothing.</div><div class='add'>+</div><div class='add'>+	  This is convenient for testing the CAN netlink interface. Most of the</div><div class='add'>+	  users will never need this. If unsure, say NO.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module will be</div><div class='add'>+	  called dummy-can.</div><div class='add'>+</div><div class='ctx'> config CAN_FLEXCAN</div><div class='ctx'> 	tristate "Support for Freescale FLEXCAN based chips"</div><div class='del'>-	depends on OF &amp;&amp; HAS_IOMEM</div><div class='del'>-	---help---</div><div class='add'>+	depends on OF || COLDFIRE || COMPILE_TEST</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to support for Freescale FlexCAN.</div><div class='ctx'> </div><div class='ctx'> config CAN_GRCAN</div><div class='ctx'> 	tristate "Aeroflex Gaisler GRCAN and GRHCAN CAN devices"</div><div class='del'>-	depends on OF &amp;&amp; HAS_DMA</div><div class='del'>-	---help---</div><div class='add'>+	depends on OF &amp;&amp; HAS_DMA &amp;&amp; HAS_IOMEM</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use Aeroflex Gaisler GRCAN or GRHCAN.</div><div class='ctx'> 	  Note that the driver supports little endian, even though little</div><div class='ctx'> 	  endian syntheses of the cores would need some modifications on</div><div class='hunk'>@@ -113,27 +161,68 @@ config CAN_GRCAN</div><div class='ctx'> config CAN_JANZ_ICAN3</div><div class='ctx'> 	tristate "Janz VMOD-ICAN3 Intelligent CAN controller"</div><div class='ctx'> 	depends on MFD_JANZ_CMODIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which</div><div class='ctx'> 	  connects to a MODULbus carrier board.</div><div class='ctx'> </div><div class='ctx'> 	  This driver can also be built as a module. If so, the module will be</div><div class='ctx'> 	  called janz-ican3.ko.</div><div class='ctx'> </div><div class='add'>+config CAN_KVASER_PCIEFD</div><div class='add'>+	depends on PCI</div><div class='add'>+	tristate "Kvaser PCIe FD cards"</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	help</div><div class='add'>+	  This is a driver for the Kvaser PCI Express CAN FD family.</div><div class='add'>+</div><div class='add'>+	  Supported devices:</div><div class='add'>+	    Kvaser PCIEcan 4xHS</div><div class='add'>+	    Kvaser PCIEcan 2xHS v2</div><div class='add'>+	    Kvaser PCIEcan HS v2</div><div class='add'>+	    Kvaser PCIEcan 1xCAN v3</div><div class='add'>+	    Kvaser PCIEcan 2xCAN v3</div><div class='add'>+	    Kvaser PCIEcan 4xCAN v2</div><div class='add'>+	    Kvaser Mini PCI Express HS v2</div><div class='add'>+	    Kvaser Mini PCI Express 2xHS v2</div><div class='add'>+	    Kvaser Mini PCI Express 1xCAN v3</div><div class='add'>+	    Kvaser Mini PCI Express 2xCAN v3</div><div class='add'>+	    Kvaser M.2 PCIe 4xCAN</div><div class='add'>+	    Kvaser PCIe 8xCAN</div><div class='add'>+</div><div class='add'>+config CAN_SLCAN</div><div class='add'>+	tristate "Serial / USB serial CAN Adaptors (slcan)"</div><div class='add'>+	depends on TTY</div><div class='add'>+	help</div><div class='add'>+	  CAN driver for several 'low cost' CAN interfaces that are attached</div><div class='add'>+	  via serial lines or via USB-to-serial adapters using the LAWICEL</div><div class='add'>+	  ASCII protocol. The driver implements the tty linediscipline N_SLCAN.</div><div class='add'>+</div><div class='add'>+	  As only the sending and receiving of CAN frames is implemented, this</div><div class='add'>+	  driver should work with the (serial/USB) CAN hardware from:</div><div class='add'>+	  www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de</div><div class='add'>+</div><div class='add'>+	  Userspace tools to attach the SLCAN line discipline (slcan_attach,</div><div class='add'>+	  slcand) can be found in the can-utils at the linux-can project, see</div><div class='add'>+	  https://github.com/linux-can/can-utils for details.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module</div><div class='add'>+	  will be called slcan.</div><div class='add'>+</div><div class='ctx'> config CAN_SUN4I</div><div class='ctx'> 	tristate "Allwinner A10 CAN controller"</div><div class='del'>-	depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	depends on MACH_SUN4I || MACH_SUN7I || (RISCV &amp;&amp; ARCH_SUNXI) || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use CAN controller found on Allwinner</div><div class='del'>-	  A10/A20 SoCs.</div><div class='add'>+	  A10/A20/D1 SoCs.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will</div><div class='ctx'> 	  be called sun4i_can.</div><div class='ctx'> </div><div class='ctx'> config CAN_TI_HECC</div><div class='del'>-	depends on ARM</div><div class='add'>+	depends on ARM || COMPILE_TEST</div><div class='ctx'> 	tristate "TI High End CAN Controller"</div><div class='del'>-	---help---</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for TI HECC (High End CAN Controller) module found on many</div><div class='ctx'> 	  TI devices. The device specifications are available from www.ti.com</div><div class='ctx'> </div><div class='hunk'>@@ -141,38 +230,33 @@ config CAN_XILINXCAN</div><div class='ctx'> 	tristate "Xilinx CAN"</div><div class='ctx'> 	depends on ARCH_ZYNQ || ARM64 || MICROBLAZE || COMPILE_TEST</div><div class='ctx'> 	depends on COMMON_CLK &amp;&amp; HAS_IOMEM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Xilinx CAN driver. This driver supports both soft AXI CAN IP and</div><div class='ctx'> 	  Zynq CANPS IP.</div><div class='ctx'> </div><div class='del'>-config PCH_CAN</div><div class='del'>-	tristate "Intel EG20T PCH CAN controller"</div><div class='del'>-	depends on PCI &amp;&amp; (X86_32 || COMPILE_TEST)</div><div class='del'>-	---help---</div><div class='del'>-	  This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which</div><div class='del'>-	  is an IOH for x86 embedded processor (Intel Atom E6xx series).</div><div class='del'>-	  This driver can access CAN bus.</div><div class='del'>-</div><div class='ctx'> source "drivers/net/can/c_can/Kconfig"</div><div class='ctx'> source "drivers/net/can/cc770/Kconfig"</div><div class='add'>+source "drivers/net/can/ctucanfd/Kconfig"</div><div class='add'>+source "drivers/net/can/esd/Kconfig"</div><div class='ctx'> source "drivers/net/can/ifi_canfd/Kconfig"</div><div class='ctx'> source "drivers/net/can/m_can/Kconfig"</div><div class='ctx'> source "drivers/net/can/mscan/Kconfig"</div><div class='ctx'> source "drivers/net/can/peak_canfd/Kconfig"</div><div class='ctx'> source "drivers/net/can/rcar/Kconfig"</div><div class='add'>+source "drivers/net/can/rockchip/Kconfig"</div><div class='ctx'> source "drivers/net/can/sja1000/Kconfig"</div><div class='ctx'> source "drivers/net/can/softing/Kconfig"</div><div class='ctx'> source "drivers/net/can/spi/Kconfig"</div><div class='ctx'> source "drivers/net/can/usb/Kconfig"</div><div class='ctx'> </div><div class='del'>-endif</div><div class='add'>+endif #CAN_NETLINK</div><div class='ctx'> </div><div class='ctx'> config CAN_DEBUG_DEVICES</div><div class='ctx'> 	bool "CAN devices debugging messages"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want the CAN device drivers to produce a bunch of</div><div class='ctx'> 	  debug messages to the system log.  Select this if you are having</div><div class='ctx'> 	  a problem with CAN support and want to see more of what is going</div><div class='ctx'> 	  on.</div><div class='ctx'> </div><div class='del'>-endmenu</div><div class='add'>+endif #CAN_DEV</div><div class='head'>diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile<br/>index 44922bf29b6a..d7bc10a6b8ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/Makefile</a></div><div class='hunk'>@@ -5,26 +5,28 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_VCAN)		+= vcan.o</div><div class='ctx'> obj-$(CONFIG_CAN_VXCAN)		+= vxcan.o</div><div class='del'>-obj-$(CONFIG_CAN_SLCAN)		+= slcan.o</div><div class='del'>-</div><div class='del'>-obj-$(CONFIG_CAN_DEV)		+= can-dev.o</div><div class='del'>-can-dev-y			+= dev.o</div><div class='del'>-can-dev-y			+= rx-offload.o</div><div class='del'>-</div><div class='del'>-can-dev-$(CONFIG_CAN_LEDS)	+= led.o</div><div class='add'>+obj-$(CONFIG_CAN_SLCAN)		+= slcan/</div><div class='ctx'> </div><div class='add'>+obj-y				+= dev/</div><div class='add'>+obj-y				+= esd/</div><div class='ctx'> obj-y				+= rcar/</div><div class='add'>+obj-y				+= rockchip/</div><div class='ctx'> obj-y				+= spi/</div><div class='ctx'> obj-y				+= usb/</div><div class='ctx'> obj-y				+= softing/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_AT91)		+= at91_can.o</div><div class='add'>+obj-$(CONFIG_CAN_BXCAN)		+= bxcan.o</div><div class='add'>+obj-$(CONFIG_CAN_CAN327)	+= can327.o</div><div class='ctx'> obj-$(CONFIG_CAN_CC770)		+= cc770/</div><div class='ctx'> obj-$(CONFIG_CAN_C_CAN)		+= c_can/</div><div class='del'>-obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan.o</div><div class='add'>+obj-$(CONFIG_CAN_CTUCANFD)	+= ctucanfd/</div><div class='add'>+obj-$(CONFIG_CAN_DUMMY)		+= dummy_can.o</div><div class='add'>+obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan/</div><div class='ctx'> obj-$(CONFIG_CAN_GRCAN)		+= grcan.o</div><div class='ctx'> obj-$(CONFIG_CAN_IFI_CANFD)	+= ifi_canfd/</div><div class='ctx'> obj-$(CONFIG_CAN_JANZ_ICAN3)	+= janz-ican3.o</div><div class='add'>+obj-$(CONFIG_CAN_KVASER_PCIEFD)	+= kvaser_pciefd/</div><div class='ctx'> obj-$(CONFIG_CAN_MSCAN)		+= mscan/</div><div class='ctx'> obj-$(CONFIG_CAN_M_CAN)		+= m_can/</div><div class='ctx'> obj-$(CONFIG_CAN_PEAK_PCIEFD)	+= peak_canfd/</div><div class='hunk'>@@ -32,6 +34,5 @@ obj-$(CONFIG_CAN_SJA1000)	+= sja1000/</div><div class='ctx'> obj-$(CONFIG_CAN_SUN4I)		+= sun4i_can.o</div><div class='ctx'> obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o</div><div class='ctx'> obj-$(CONFIG_CAN_XILINXCAN)	+= xilinx_can.o</div><div class='del'>-obj-$(CONFIG_PCH_CAN)		+= pch_can.o</div><div class='ctx'> </div><div class='ctx'> subdir-ccflags-$(CONFIG_CAN_DEBUG_DEVICES) += -DDEBUG</div><div class='head'>diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c<br/>index 1d4075903971..c2a3a4eef5b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/at91_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/at91_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/at91_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/at91_can.c</a></div><div class='hunk'>@@ -3,17 +3,20 @@</div><div class='ctx'>  * at91_can.c - CAN network driver for AT91 SoC CAN controller</div><div class='ctx'>  *</div><div class='ctx'>  * (C) 2007 by Hans J. Koch &lt;hjk@hansjkoch.de&gt;</div><div class='del'>- * (C) 2008, 2009, 2010, 2011 by Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ * (C) 2008, 2009, 2010, 2011, 2023 by Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='hunk'>@@ -23,91 +26,115 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='ctx'> </div><div class='del'>-#define AT91_MB_MASK(i)		((1 &lt;&lt; (i)) - 1)</div><div class='add'>+#define AT91_MB_MASK(i) ((1 &lt;&lt; (i)) - 1)</div><div class='ctx'> </div><div class='ctx'> /* Common registers */</div><div class='ctx'> enum at91_reg {</div><div class='del'>-	AT91_MR		= 0x000,</div><div class='del'>-	AT91_IER	= 0x004,</div><div class='del'>-	AT91_IDR	= 0x008,</div><div class='del'>-	AT91_IMR	= 0x00C,</div><div class='del'>-	AT91_SR		= 0x010,</div><div class='del'>-	AT91_BR		= 0x014,</div><div class='del'>-	AT91_TIM	= 0x018,</div><div class='del'>-	AT91_TIMESTP	= 0x01C,</div><div class='del'>-	AT91_ECR	= 0x020,</div><div class='del'>-	AT91_TCR	= 0x024,</div><div class='del'>-	AT91_ACR	= 0x028,</div><div class='add'>+	AT91_MR = 0x000,</div><div class='add'>+	AT91_IER = 0x004,</div><div class='add'>+	AT91_IDR = 0x008,</div><div class='add'>+	AT91_IMR = 0x00C,</div><div class='add'>+	AT91_SR = 0x010,</div><div class='add'>+	AT91_BR = 0x014,</div><div class='add'>+	AT91_TIM = 0x018,</div><div class='add'>+	AT91_TIMESTP = 0x01C,</div><div class='add'>+	AT91_ECR = 0x020,</div><div class='add'>+	AT91_TCR = 0x024,</div><div class='add'>+	AT91_ACR = 0x028,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Mailbox registers (0 &lt;= i &lt;= 15) */</div><div class='del'>-#define AT91_MMR(i)		(enum at91_reg)(0x200 + ((i) * 0x20))</div><div class='del'>-#define AT91_MAM(i)		(enum at91_reg)(0x204 + ((i) * 0x20))</div><div class='del'>-#define AT91_MID(i)		(enum at91_reg)(0x208 + ((i) * 0x20))</div><div class='del'>-#define AT91_MFID(i)		(enum at91_reg)(0x20C + ((i) * 0x20))</div><div class='del'>-#define AT91_MSR(i)		(enum at91_reg)(0x210 + ((i) * 0x20))</div><div class='del'>-#define AT91_MDL(i)		(enum at91_reg)(0x214 + ((i) * 0x20))</div><div class='del'>-#define AT91_MDH(i)		(enum at91_reg)(0x218 + ((i) * 0x20))</div><div class='del'>-#define AT91_MCR(i)		(enum at91_reg)(0x21C + ((i) * 0x20))</div><div class='add'>+#define AT91_MMR(i) ((enum at91_reg)(0x200 + ((i) * 0x20)))</div><div class='add'>+#define AT91_MAM(i) ((enum at91_reg)(0x204 + ((i) * 0x20)))</div><div class='add'>+#define AT91_MID(i) ((enum at91_reg)(0x208 + ((i) * 0x20)))</div><div class='add'>+#define AT91_MFID(i) ((enum at91_reg)(0x20C + ((i) * 0x20)))</div><div class='add'>+#define AT91_MSR(i) ((enum at91_reg)(0x210 + ((i) * 0x20)))</div><div class='add'>+#define AT91_MDL(i) ((enum at91_reg)(0x214 + ((i) * 0x20)))</div><div class='add'>+#define AT91_MDH(i) ((enum at91_reg)(0x218 + ((i) * 0x20)))</div><div class='add'>+#define AT91_MCR(i) ((enum at91_reg)(0x21C + ((i) * 0x20)))</div><div class='ctx'> </div><div class='ctx'> /* Register bits */</div><div class='del'>-#define AT91_MR_CANEN		BIT(0)</div><div class='del'>-#define AT91_MR_LPM		BIT(1)</div><div class='del'>-#define AT91_MR_ABM		BIT(2)</div><div class='del'>-#define AT91_MR_OVL		BIT(3)</div><div class='del'>-#define AT91_MR_TEOF		BIT(4)</div><div class='del'>-#define AT91_MR_TTM		BIT(5)</div><div class='del'>-#define AT91_MR_TIMFRZ		BIT(6)</div><div class='del'>-#define AT91_MR_DRPT		BIT(7)</div><div class='del'>-</div><div class='del'>-#define AT91_SR_RBSY		BIT(29)</div><div class='del'>-</div><div class='del'>-#define AT91_MMR_PRIO_SHIFT	(16)</div><div class='del'>-</div><div class='del'>-#define AT91_MID_MIDE		BIT(29)</div><div class='del'>-</div><div class='del'>-#define AT91_MSR_MRTR		BIT(20)</div><div class='del'>-#define AT91_MSR_MABT		BIT(22)</div><div class='del'>-#define AT91_MSR_MRDY		BIT(23)</div><div class='del'>-#define AT91_MSR_MMI		BIT(24)</div><div class='del'>-</div><div class='del'>-#define AT91_MCR_MRTR		BIT(20)</div><div class='del'>-#define AT91_MCR_MTCR		BIT(23)</div><div class='add'>+#define AT91_MR_CANEN BIT(0)</div><div class='add'>+#define AT91_MR_LPM BIT(1)</div><div class='add'>+#define AT91_MR_ABM BIT(2)</div><div class='add'>+#define AT91_MR_OVL BIT(3)</div><div class='add'>+#define AT91_MR_TEOF BIT(4)</div><div class='add'>+#define AT91_MR_TTM BIT(5)</div><div class='add'>+#define AT91_MR_TIMFRZ BIT(6)</div><div class='add'>+#define AT91_MR_DRPT BIT(7)</div><div class='add'>+</div><div class='add'>+#define AT91_SR_RBSY BIT(29)</div><div class='add'>+#define AT91_SR_TBSY BIT(30)</div><div class='add'>+#define AT91_SR_OVLSY BIT(31)</div><div class='add'>+</div><div class='add'>+#define AT91_BR_PHASE2_MASK GENMASK(2, 0)</div><div class='add'>+#define AT91_BR_PHASE1_MASK GENMASK(6, 4)</div><div class='add'>+#define AT91_BR_PROPAG_MASK GENMASK(10, 8)</div><div class='add'>+#define AT91_BR_SJW_MASK GENMASK(13, 12)</div><div class='add'>+#define AT91_BR_BRP_MASK GENMASK(22, 16)</div><div class='add'>+#define AT91_BR_SMP BIT(24)</div><div class='add'>+</div><div class='add'>+#define AT91_TIM_TIMER_MASK GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define AT91_ECR_REC_MASK GENMASK(8, 0)</div><div class='add'>+#define AT91_ECR_TEC_MASK GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+#define AT91_TCR_TIMRST BIT(31)</div><div class='add'>+</div><div class='add'>+#define AT91_MMR_MTIMEMARK_MASK GENMASK(15, 0)</div><div class='add'>+#define AT91_MMR_PRIOR_MASK GENMASK(19, 16)</div><div class='add'>+#define AT91_MMR_MOT_MASK GENMASK(26, 24)</div><div class='add'>+</div><div class='add'>+#define AT91_MID_MIDVB_MASK GENMASK(17, 0)</div><div class='add'>+#define AT91_MID_MIDVA_MASK GENMASK(28, 18)</div><div class='add'>+#define AT91_MID_MIDE BIT(29)</div><div class='add'>+</div><div class='add'>+#define AT91_MSR_MTIMESTAMP_MASK GENMASK(15, 0)</div><div class='add'>+#define AT91_MSR_MDLC_MASK GENMASK(19, 16)</div><div class='add'>+#define AT91_MSR_MRTR BIT(20)</div><div class='add'>+#define AT91_MSR_MABT BIT(22)</div><div class='add'>+#define AT91_MSR_MRDY BIT(23)</div><div class='add'>+#define AT91_MSR_MMI BIT(24)</div><div class='add'>+</div><div class='add'>+#define AT91_MCR_MDLC_MASK GENMASK(19, 16)</div><div class='add'>+#define AT91_MCR_MRTR BIT(20)</div><div class='add'>+#define AT91_MCR_MACR BIT(22)</div><div class='add'>+#define AT91_MCR_MTCR BIT(23)</div><div class='ctx'> </div><div class='ctx'> /* Mailbox Modes */</div><div class='ctx'> enum at91_mb_mode {</div><div class='del'>-	AT91_MB_MODE_DISABLED	= 0,</div><div class='del'>-	AT91_MB_MODE_RX		= 1,</div><div class='del'>-	AT91_MB_MODE_RX_OVRWR	= 2,</div><div class='del'>-	AT91_MB_MODE_TX		= 3,</div><div class='del'>-	AT91_MB_MODE_CONSUMER	= 4,</div><div class='del'>-	AT91_MB_MODE_PRODUCER	= 5,</div><div class='add'>+	AT91_MB_MODE_DISABLED = 0,</div><div class='add'>+	AT91_MB_MODE_RX = 1,</div><div class='add'>+	AT91_MB_MODE_RX_OVRWR = 2,</div><div class='add'>+	AT91_MB_MODE_TX = 3,</div><div class='add'>+	AT91_MB_MODE_CONSUMER = 4,</div><div class='add'>+	AT91_MB_MODE_PRODUCER = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Interrupt mask bits */</div><div class='del'>-#define AT91_IRQ_ERRA		(1 &lt;&lt; 16)</div><div class='del'>-#define AT91_IRQ_WARN		(1 &lt;&lt; 17)</div><div class='del'>-#define AT91_IRQ_ERRP		(1 &lt;&lt; 18)</div><div class='del'>-#define AT91_IRQ_BOFF		(1 &lt;&lt; 19)</div><div class='del'>-#define AT91_IRQ_SLEEP		(1 &lt;&lt; 20)</div><div class='del'>-#define AT91_IRQ_WAKEUP		(1 &lt;&lt; 21)</div><div class='del'>-#define AT91_IRQ_TOVF		(1 &lt;&lt; 22)</div><div class='del'>-#define AT91_IRQ_TSTP		(1 &lt;&lt; 23)</div><div class='del'>-#define AT91_IRQ_CERR		(1 &lt;&lt; 24)</div><div class='del'>-#define AT91_IRQ_SERR		(1 &lt;&lt; 25)</div><div class='del'>-#define AT91_IRQ_AERR		(1 &lt;&lt; 26)</div><div class='del'>-#define AT91_IRQ_FERR		(1 &lt;&lt; 27)</div><div class='del'>-#define AT91_IRQ_BERR		(1 &lt;&lt; 28)</div><div class='del'>-</div><div class='del'>-#define AT91_IRQ_ERR_ALL	(0x1fff0000)</div><div class='del'>-#define AT91_IRQ_ERR_FRAME	(AT91_IRQ_CERR | AT91_IRQ_SERR | \</div><div class='del'>-				 AT91_IRQ_AERR | AT91_IRQ_FERR | AT91_IRQ_BERR)</div><div class='del'>-#define AT91_IRQ_ERR_LINE	(AT91_IRQ_ERRA | AT91_IRQ_WARN | \</div><div class='del'>-				 AT91_IRQ_ERRP | AT91_IRQ_BOFF)</div><div class='del'>-</div><div class='del'>-#define AT91_IRQ_ALL		(0x1fffffff)</div><div class='add'>+#define AT91_IRQ_ERRA BIT(16)</div><div class='add'>+#define AT91_IRQ_WARN BIT(17)</div><div class='add'>+#define AT91_IRQ_ERRP BIT(18)</div><div class='add'>+#define AT91_IRQ_BOFF BIT(19)</div><div class='add'>+#define AT91_IRQ_SLEEP BIT(20)</div><div class='add'>+#define AT91_IRQ_WAKEUP BIT(21)</div><div class='add'>+#define AT91_IRQ_TOVF BIT(22)</div><div class='add'>+#define AT91_IRQ_TSTP BIT(23)</div><div class='add'>+#define AT91_IRQ_CERR BIT(24)</div><div class='add'>+#define AT91_IRQ_SERR BIT(25)</div><div class='add'>+#define AT91_IRQ_AERR BIT(26)</div><div class='add'>+#define AT91_IRQ_FERR BIT(27)</div><div class='add'>+#define AT91_IRQ_BERR BIT(28)</div><div class='add'>+</div><div class='add'>+#define AT91_IRQ_ERR_ALL (0x1fff0000)</div><div class='add'>+#define AT91_IRQ_ERR_FRAME (AT91_IRQ_CERR | AT91_IRQ_SERR | \</div><div class='add'>+			    AT91_IRQ_AERR | AT91_IRQ_FERR | AT91_IRQ_BERR)</div><div class='add'>+#define AT91_IRQ_ERR_LINE (AT91_IRQ_ERRA | AT91_IRQ_WARN | \</div><div class='add'>+			   AT91_IRQ_ERRP | AT91_IRQ_BOFF)</div><div class='add'>+</div><div class='add'>+#define AT91_IRQ_ALL (0x1fffffff)</div><div class='ctx'> </div><div class='ctx'> enum at91_devtype {</div><div class='ctx'> 	AT91_DEVTYPE_SAM9263,</div><div class='hunk'>@@ -116,7 +143,6 @@ enum at91_devtype {</div><div class='ctx'> </div><div class='ctx'> struct at91_devtype_data {</div><div class='ctx'> 	unsigned int rx_first;</div><div class='del'>-	unsigned int rx_split;</div><div class='ctx'> 	unsigned int rx_last;</div><div class='ctx'> 	unsigned int tx_shift;</div><div class='ctx'> 	enum at91_devtype type;</div><div class='hunk'>@@ -124,14 +150,13 @@ struct at91_devtype_data {</div><div class='ctx'> </div><div class='ctx'> struct at91_priv {</div><div class='ctx'> 	struct can_priv can;		/* must be the first member! */</div><div class='del'>-	struct napi_struct napi;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct phy *transceiver;</div><div class='ctx'> </div><div class='ctx'> 	void __iomem *reg_base;</div><div class='ctx'> </div><div class='del'>-	u32 reg_sr;</div><div class='del'>-	unsigned int tx_next;</div><div class='del'>-	unsigned int tx_echo;</div><div class='del'>-	unsigned int rx_next;</div><div class='add'>+	unsigned int tx_head;</div><div class='add'>+	unsigned int tx_tail;</div><div class='ctx'> 	struct at91_devtype_data devtype_data;</div><div class='ctx'> </div><div class='ctx'> 	struct clk *clk;</div><div class='hunk'>@@ -140,9 +165,13 @@ struct at91_priv {</div><div class='ctx'> 	canid_t mb0_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline struct at91_priv *rx_offload_to_priv(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	return container_of(offload, struct at91_priv, offload);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct at91_devtype_data at91_at91sam9263_data = {</div><div class='ctx'> 	.rx_first = 1,</div><div class='del'>-	.rx_split = 8,</div><div class='ctx'> 	.rx_last = 11,</div><div class='ctx'> 	.tx_shift = 2,</div><div class='ctx'> 	.type = AT91_DEVTYPE_SAM9263,</div><div class='hunk'>@@ -150,7 +179,6 @@ static const struct at91_devtype_data at91_at91sam9263_data = {</div><div class='ctx'> </div><div class='ctx'> static const struct at91_devtype_data at91_at91sam9x5_data = {</div><div class='ctx'> 	.rx_first = 0,</div><div class='del'>-	.rx_split = 4,</div><div class='ctx'> 	.rx_last = 5,</div><div class='ctx'> 	.tx_shift = 1,</div><div class='ctx'> 	.type = AT91_DEVTYPE_SAM9X5,</div><div class='hunk'>@@ -163,13 +191,13 @@ static const struct can_bittiming_const at91_bittiming_const = {</div><div class='ctx'> 	.tseg2_min	= 2,</div><div class='ctx'> 	.tseg2_max	= 8,</div><div class='ctx'> 	.sjw_max	= 4,</div><div class='del'>-	.brp_min 	= 2,</div><div class='add'>+	.brp_min	= 2,</div><div class='ctx'> 	.brp_max	= 128,</div><div class='ctx'> 	.brp_inc	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AT91_IS(_model) \</div><div class='del'>-static inline int at91_is_sam##_model(const struct at91_priv *priv) \</div><div class='add'>+static inline int __maybe_unused at91_is_sam##_model(const struct at91_priv *priv) \</div><div class='ctx'> { \</div><div class='ctx'> 	return priv-&gt;devtype_data.type == AT91_DEVTYPE_SAM##_model; \</div><div class='ctx'> }</div><div class='hunk'>@@ -187,27 +215,6 @@ static inline unsigned int get_mb_rx_last(const struct at91_priv *priv)</div><div class='ctx'> 	return priv-&gt;devtype_data.rx_last;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_mb_rx_split(const struct at91_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return priv-&gt;devtype_data.rx_split;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int get_mb_rx_num(const struct at91_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return get_mb_rx_last(priv) - get_mb_rx_first(priv) + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int get_mb_rx_low_last(const struct at91_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return get_mb_rx_split(priv) - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int get_mb_rx_low_mask(const struct at91_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return AT91_MB_MASK(get_mb_rx_split(priv)) &amp;</div><div class='del'>-		~AT91_MB_MASK(get_mb_rx_first(priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int get_mb_tx_shift(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return priv-&gt;devtype_data.tx_shift;</div><div class='hunk'>@@ -228,24 +235,24 @@ static inline unsigned int get_mb_tx_last(const struct at91_priv *priv)</div><div class='ctx'> 	return get_mb_tx_first(priv) + get_mb_tx_num(priv) - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_next_prio_shift(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_head_prio_shift(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return get_mb_tx_shift(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_next_prio_mask(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_head_prio_mask(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return 0xf &lt;&lt; get_mb_tx_shift(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_next_mb_mask(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_head_mb_mask(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return AT91_MB_MASK(get_mb_tx_shift(priv));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_next_mask(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_head_mask(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	return get_next_mb_mask(priv) | get_next_prio_mask(priv);</div><div class='add'>+	return get_head_mb_mask(priv) | get_head_prio_mask(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int get_irq_mb_rx(const struct at91_priv *priv)</div><div class='hunk'>@@ -260,19 +267,19 @@ static inline unsigned int get_irq_mb_tx(const struct at91_priv *priv)</div><div class='ctx'> 		~AT91_MB_MASK(get_mb_tx_first(priv));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_tx_next_mb(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_tx_head_mb(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	return (priv-&gt;tx_next &amp; get_next_mb_mask(priv)) + get_mb_tx_first(priv);</div><div class='add'>+	return (priv-&gt;tx_head &amp; get_head_mb_mask(priv)) + get_mb_tx_first(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_tx_next_prio(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_tx_head_prio(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	return (priv-&gt;tx_next &gt;&gt; get_next_prio_shift(priv)) &amp; 0xf;</div><div class='add'>+	return (priv-&gt;tx_head &gt;&gt; get_head_prio_shift(priv)) &amp; 0xf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int get_tx_echo_mb(const struct at91_priv *priv)</div><div class='add'>+static inline unsigned int get_tx_tail_mb(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	return (priv-&gt;tx_echo &amp; get_next_mb_mask(priv)) + get_mb_tx_first(priv);</div><div class='add'>+	return (priv-&gt;tx_tail &amp; get_head_mb_mask(priv)) + get_mb_tx_first(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline u32 at91_read(const struct at91_priv *priv, enum at91_reg reg)</div><div class='hunk'>@@ -281,19 +288,23 @@ static inline u32 at91_read(const struct at91_priv *priv, enum at91_reg reg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void at91_write(const struct at91_priv *priv, enum at91_reg reg,</div><div class='del'>-		u32 value)</div><div class='add'>+			      u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	writel_relaxed(value, priv-&gt;reg_base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void set_mb_mode_prio(const struct at91_priv *priv,</div><div class='del'>-		unsigned int mb, enum at91_mb_mode mode, int prio)</div><div class='add'>+				    unsigned int mb, enum at91_mb_mode mode,</div><div class='add'>+				    u8 prio)</div><div class='ctx'> {</div><div class='del'>-	at91_write(priv, AT91_MMR(mb), (mode &lt;&lt; 24) | (prio &lt;&lt; 16));</div><div class='add'>+	const u32 reg_mmr = FIELD_PREP(AT91_MMR_MOT_MASK, mode) |</div><div class='add'>+		FIELD_PREP(AT91_MMR_PRIOR_MASK, prio);</div><div class='add'>+</div><div class='add'>+	at91_write(priv, AT91_MMR(mb), reg_mmr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void set_mb_mode(const struct at91_priv *priv, unsigned int mb,</div><div class='del'>-		enum at91_mb_mode mode)</div><div class='add'>+			       enum at91_mb_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	set_mb_mode_prio(priv, mb, mode, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -303,9 +314,10 @@ static inline u32 at91_can_id_to_reg_mid(canid_t can_id)</div><div class='ctx'> 	u32 reg_mid;</div><div class='ctx'> </div><div class='ctx'> 	if (can_id &amp; CAN_EFF_FLAG)</div><div class='del'>-		reg_mid = (can_id &amp; CAN_EFF_MASK) | AT91_MID_MIDE;</div><div class='add'>+		reg_mid = FIELD_PREP(AT91_MID_MIDVA_MASK | AT91_MID_MIDVB_MASK, can_id) |</div><div class='add'>+			AT91_MID_MIDE;</div><div class='ctx'> 	else</div><div class='del'>-		reg_mid = (can_id &amp; CAN_SFF_MASK) &lt;&lt; 18;</div><div class='add'>+		reg_mid = FIELD_PREP(AT91_MID_MIDVA_MASK, can_id);</div><div class='ctx'> </div><div class='ctx'> 	return reg_mid;</div><div class='ctx'> }</div><div class='hunk'>@@ -316,10 +328,9 @@ static void at91_setup_mailboxes(struct net_device *dev)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 reg_mid;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Due to a chip bug (errata 50.2.6.3 &amp; 50.3.5.3) the first</div><div class='del'>-	 * mailbox is disabled. The next 11 mailboxes are used as a</div><div class='del'>-	 * reception FIFO. The last mailbox is configured with</div><div class='add'>+	/* Due to a chip bug (errata 50.2.6.3 &amp; 50.3.5.3) the first</div><div class='add'>+	 * mailbox is disabled. The next mailboxes are used as a</div><div class='add'>+	 * reception FIFO. The last of the RX mailboxes is configured with</div><div class='ctx'> 	 * overwrite option. The overwrite flag indicates a FIFO</div><div class='ctx'> 	 * overflow.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -340,27 +351,30 @@ static void at91_setup_mailboxes(struct net_device *dev)</div><div class='ctx'> 		at91_write(priv, AT91_MID(i), AT91_MID_MIDE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* The last 4 mailboxes are used for transmitting. */</div><div class='add'>+	/* The last mailboxes are used for transmitting. */</div><div class='ctx'> 	for (i = get_mb_tx_first(priv); i &lt;= get_mb_tx_last(priv); i++)</div><div class='ctx'> 		set_mb_mode_prio(priv, i, AT91_MB_MODE_TX, 0);</div><div class='ctx'> </div><div class='del'>-	/* Reset tx and rx helper pointers */</div><div class='del'>-	priv-&gt;tx_next = priv-&gt;tx_echo = 0;</div><div class='del'>-	priv-&gt;rx_next = get_mb_rx_first(priv);</div><div class='add'>+	/* Reset tx helper pointers */</div><div class='add'>+	priv-&gt;tx_head = priv-&gt;tx_tail = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int at91_set_bittiming(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='del'>-	u32 reg_br;</div><div class='add'>+	u32 reg_br = 0;</div><div class='ctx'> </div><div class='del'>-	reg_br = ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES) ? 1 &lt;&lt; 24 : 0) |</div><div class='del'>-		((bt-&gt;brp - 1) &lt;&lt; 16) | ((bt-&gt;sjw - 1) &lt;&lt; 12) |</div><div class='del'>-		((bt-&gt;prop_seg - 1) &lt;&lt; 8) | ((bt-&gt;phase_seg1 - 1) &lt;&lt; 4) |</div><div class='del'>-		((bt-&gt;phase_seg2 - 1) &lt;&lt; 0);</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='add'>+		reg_br |= AT91_BR_SMP;</div><div class='ctx'> </div><div class='del'>-	netdev_info(dev, "writing AT91_BR: 0x%08x\n", reg_br);</div><div class='add'>+	reg_br |= FIELD_PREP(AT91_BR_BRP_MASK, bt-&gt;brp - 1) |</div><div class='add'>+		FIELD_PREP(AT91_BR_SJW_MASK, bt-&gt;sjw - 1) |</div><div class='add'>+		FIELD_PREP(AT91_BR_PROPAG_MASK, bt-&gt;prop_seg - 1) |</div><div class='add'>+		FIELD_PREP(AT91_BR_PHASE1_MASK, bt-&gt;phase_seg1 - 1) |</div><div class='add'>+		FIELD_PREP(AT91_BR_PHASE2_MASK, bt-&gt;phase_seg2 - 1);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "writing AT91_BR: 0x%08x\n", reg_br);</div><div class='ctx'> </div><div class='ctx'> 	at91_write(priv, AT91_BR, reg_br);</div><div class='ctx'> </div><div class='hunk'>@@ -368,13 +382,13 @@ static int at91_set_bittiming(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int at91_get_berr_counter(const struct net_device *dev,</div><div class='del'>-		struct can_berr_counter *bec)</div><div class='add'>+				 struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='ctx'> 	const struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 reg_ecr = at91_read(priv, AT91_ECR);</div><div class='ctx'> </div><div class='del'>-	bec-&gt;rxerr = reg_ecr &amp; 0xff;</div><div class='del'>-	bec-&gt;txerr = reg_ecr &gt;&gt; 16;</div><div class='add'>+	bec-&gt;rxerr = FIELD_GET(AT91_ECR_REC_MASK, reg_ecr);</div><div class='add'>+	bec-&gt;txerr = FIELD_GET(AT91_ECR_TEC_MASK, reg_ecr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -403,9 +417,13 @@ static void at91_chip_start(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> </div><div class='add'>+	/* Dummy read to clear latched line error interrupts on</div><div class='add'>+	 * sam9x5 and newer SoCs.</div><div class='add'>+	 */</div><div class='add'>+	at91_read(priv, AT91_SR);</div><div class='add'>+</div><div class='ctx'> 	/* Enable interrupts */</div><div class='del'>-	reg_ier = get_irq_mb_rx(priv) | AT91_IRQ_ERRP | AT91_IRQ_ERR_FRAME;</div><div class='del'>-	at91_write(priv, AT91_IDR, AT91_IRQ_ALL);</div><div class='add'>+	reg_ier = get_irq_mb_rx(priv) | AT91_IRQ_ERR_LINE | AT91_IRQ_ERR_FRAME;</div><div class='ctx'> 	at91_write(priv, AT91_IER, reg_ier);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -414,6 +432,11 @@ static void at91_chip_stop(struct net_device *dev, enum can_state state)</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 reg_mr;</div><div class='ctx'> </div><div class='add'>+	/* Abort any pending TX requests. However this doesn't seem to</div><div class='add'>+	 * work in case of bus-off on sama5d3.</div><div class='add'>+	 */</div><div class='add'>+	at91_write(priv, AT91_ACR, get_irq_mb_tx(priv));</div><div class='add'>+</div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	at91_write(priv, AT91_IDR, AT91_IRQ_ALL);</div><div class='ctx'> </div><div class='hunk'>@@ -423,8 +446,7 @@ static void at91_chip_stop(struct net_device *dev, enum can_state state)</div><div class='ctx'> 	priv-&gt;can.state = state;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * theory of operation:</div><div class='add'>+/* theory of operation:</div><div class='ctx'>  *</div><div class='ctx'>  * According to the datasheet priority 0 is the highest priority, 15</div><div class='ctx'>  * is the lowest. If two mailboxes have the same priority level the</div><div class='hunk'>@@ -438,27 +460,26 @@ static void at91_chip_stop(struct net_device *dev, enum can_state state)</div><div class='ctx'>  * stop sending, waiting for all messages to be delivered, then start</div><div class='ctx'>  * again with mailbox AT91_MB_TX_FIRST prio 0.</div><div class='ctx'>  *</div><div class='del'>- * We use the priv-&gt;tx_next as counter for the next transmission</div><div class='add'>+ * We use the priv-&gt;tx_head as counter for the next transmission</div><div class='ctx'>  * mailbox, but without the offset AT91_MB_TX_FIRST. The lower bits</div><div class='ctx'>  * encode the mailbox number, the upper 4 bits the mailbox priority:</div><div class='ctx'>  *</div><div class='del'>- * priv-&gt;tx_next = (prio &lt;&lt; get_next_prio_shift(priv)) |</div><div class='add'>+ * priv-&gt;tx_head = (prio &lt;&lt; get_next_prio_shift(priv)) |</div><div class='ctx'>  *                 (mb - get_mb_tx_first(priv));</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> 	unsigned int mb, prio;</div><div class='ctx'> 	u32 reg_mid, reg_mcr;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>-	mb = get_tx_next_mb(priv);</div><div class='del'>-	prio = get_tx_next_prio(priv);</div><div class='add'>+	mb = get_tx_head_mb(priv);</div><div class='add'>+	prio = get_tx_head_prio(priv);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!(at91_read(priv, AT91_MSR(mb)) &amp; AT91_MSR_MRDY))) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='hunk'>@@ -467,8 +488,12 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	reg_mid = at91_can_id_to_reg_mid(cf-&gt;can_id);</div><div class='del'>-	reg_mcr = ((cf-&gt;can_id &amp; CAN_RTR_FLAG) ? AT91_MCR_MRTR : 0) |</div><div class='del'>-		(cf-&gt;can_dlc &lt;&lt; 16) | AT91_MCR_MTCR;</div><div class='add'>+</div><div class='add'>+	reg_mcr = FIELD_PREP(AT91_MCR_MDLC_MASK, cf-&gt;len) |</div><div class='add'>+		AT91_MCR_MTCR;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		reg_mcr |= AT91_MCR_MRTR;</div><div class='ctx'> </div><div class='ctx'> 	/* disable MB while writing ID (see datasheet) */</div><div class='ctx'> 	set_mb_mode(priv, mb, AT91_MB_MODE_DISABLED);</div><div class='hunk'>@@ -481,23 +506,20 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* This triggers transmission */</div><div class='ctx'> 	at91_write(priv, AT91_MCR(mb), reg_mcr);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;tx_bytes += cf-&gt;can_dlc;</div><div class='del'>-</div><div class='ctx'> 	/* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */</div><div class='del'>-	can_put_echo_skb(skb, dev, mb - get_mb_tx_first(priv));</div><div class='add'>+	can_put_echo_skb(skb, dev, mb - get_mb_tx_first(priv), 0);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * we have to stop the queue and deliver all messages in case</div><div class='add'>+	/* we have to stop the queue and deliver all messages in case</div><div class='ctx'> 	 * of a prio+mb counter wrap around. This is the case if</div><div class='del'>-	 * tx_next buffer prio and mailbox equals 0.</div><div class='add'>+	 * tx_head buffer prio and mailbox equals 0.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * also stop the queue if next buffer is still in use</div><div class='ctx'> 	 * (== not ready)</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;tx_next++;</div><div class='del'>-	if (!(at91_read(priv, AT91_MSR(get_tx_next_mb(priv))) &amp;</div><div class='add'>+	priv-&gt;tx_head++;</div><div class='add'>+	if (!(at91_read(priv, AT91_MSR(get_tx_head_mb(priv))) &amp;</div><div class='ctx'> 	      AT91_MSR_MRDY) ||</div><div class='del'>-	    (priv-&gt;tx_next &amp; get_next_mask(priv)) == 0)</div><div class='add'>+	    (priv-&gt;tx_head &amp; get_head_mask(priv)) == 0)</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupt for this mailbox */</div><div class='hunk'>@@ -506,30 +528,20 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * at91_activate_rx_low - activate lower rx mailboxes</div><div class='del'>- * @priv: a91 context</div><div class='del'>- *</div><div class='del'>- * Reenables the lower mailboxes for reception of new CAN messages</div><div class='del'>- */</div><div class='del'>-static inline void at91_activate_rx_low(const struct at91_priv *priv)</div><div class='add'>+static inline u32 at91_get_timestamp(const struct at91_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	u32 mask = get_mb_rx_low_mask(priv);</div><div class='del'>-	at91_write(priv, AT91_TCR, mask);</div><div class='add'>+	return at91_read(priv, AT91_TIM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * at91_activate_rx_mb - reactive single rx mailbox</div><div class='del'>- * @priv: a91 context</div><div class='del'>- * @mb: mailbox to reactivate</div><div class='del'>- *</div><div class='del'>- * Reenables given mailbox for reception of new CAN messages</div><div class='del'>- */</div><div class='del'>-static inline void at91_activate_rx_mb(const struct at91_priv *priv,</div><div class='del'>-		unsigned int mb)</div><div class='add'>+static inline struct sk_buff *</div><div class='add'>+at91_alloc_can_err_skb(struct net_device *dev,</div><div class='add'>+		       struct can_frame **cf, u32 *timestamp)</div><div class='ctx'> {</div><div class='del'>-	u32 mask = 1 &lt;&lt; mb;</div><div class='del'>-	at91_write(priv, AT91_TCR, mask);</div><div class='add'>+	const struct at91_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	*timestamp = at91_get_timestamp(priv);</div><div class='add'>+</div><div class='add'>+	return alloc_can_err_skb(dev, cf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -540,51 +552,75 @@ static void at91_rx_overflow_err(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct can_frame *cf;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(dev, "RX buffer overflow\n");</div><div class='ctx'> 	stats-&gt;rx_over_errors++;</div><div class='ctx'> 	stats-&gt;rx_errors++;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='add'>+	skb = at91_alloc_can_err_skb(dev, &amp;cf, &amp;timestamp);</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='ctx'> 	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * at91_read_mb - read CAN msg from mailbox (lowlevel impl)</div><div class='del'>- * @dev: net device</div><div class='add'>+ * at91_mailbox_read - read CAN msg from mailbox</div><div class='add'>+ * @offload: rx-offload</div><div class='ctx'>  * @mb: mailbox number to read from</div><div class='del'>- * @cf: can frame where to store message</div><div class='add'>+ * @timestamp: pointer to 32 bit timestamp</div><div class='add'>+ * @drop: true indicated mailbox to mark as read and drop frame</div><div class='ctx'>  *</div><div class='del'>- * Reads a CAN message from the given mailbox and stores data into</div><div class='del'>- * given can frame. "mb" and "cf" must be valid.</div><div class='add'>+ * Reads a CAN message from the given mailbox if not empty.</div><div class='ctx'>  */</div><div class='del'>-static void at91_read_mb(struct net_device *dev, unsigned int mb,</div><div class='del'>-		struct can_frame *cf)</div><div class='add'>+static struct sk_buff *at91_mailbox_read(struct can_rx_offload *offload,</div><div class='add'>+					 unsigned int mb, u32 *timestamp,</div><div class='add'>+					 bool drop)</div><div class='ctx'> {</div><div class='del'>-	const struct at91_priv *priv = netdev_priv(dev);</div><div class='add'>+	const struct at91_priv *priv = rx_offload_to_priv(offload);</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	u32 reg_msr, reg_mid;</div><div class='ctx'> </div><div class='add'>+	reg_msr = at91_read(priv, AT91_MSR(mb));</div><div class='add'>+	if (!(reg_msr &amp; AT91_MSR_MRDY))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (unlikely(drop)) {</div><div class='add'>+		skb = ERR_PTR(-ENOBUFS);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(offload-&gt;dev, &amp;cf);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		skb = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reg_mid = at91_read(priv, AT91_MID(mb));</div><div class='ctx'> 	if (reg_mid &amp; AT91_MID_MIDE)</div><div class='del'>-		cf-&gt;can_id = ((reg_mid &gt;&gt; 0) &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='add'>+		cf-&gt;can_id = FIELD_GET(AT91_MID_MIDVA_MASK | AT91_MID_MIDVB_MASK, reg_mid) |</div><div class='add'>+			CAN_EFF_FLAG;</div><div class='ctx'> 	else</div><div class='del'>-		cf-&gt;can_id = (reg_mid &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='add'>+		cf-&gt;can_id = FIELD_GET(AT91_MID_MIDVA_MASK, reg_mid);</div><div class='ctx'> </div><div class='del'>-	reg_msr = at91_read(priv, AT91_MSR(mb));</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc((reg_msr &gt;&gt; 16) &amp; 0xf);</div><div class='add'>+	/* extend timestamp to full 32 bit */</div><div class='add'>+	*timestamp = FIELD_GET(AT91_MSR_MTIMESTAMP_MASK, reg_msr) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(FIELD_GET(AT91_MSR_MDLC_MASK, reg_msr));</div><div class='ctx'> </div><div class='del'>-	if (reg_msr &amp; AT91_MSR_MRTR)</div><div class='add'>+	if (reg_msr &amp; AT91_MSR_MRTR) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		*(u32 *)(cf-&gt;data + 0) = at91_read(priv, AT91_MDL(mb));</div><div class='ctx'> 		*(u32 *)(cf-&gt;data + 4) = at91_read(priv, AT91_MDH(mb));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -593,237 +629,21 @@ static void at91_read_mb(struct net_device *dev, unsigned int mb,</div><div class='ctx'> 	at91_write(priv, AT91_MID(mb), AT91_MID_MIDE);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(mb == get_mb_rx_last(priv) &amp;&amp; reg_msr &amp; AT91_MSR_MMI))</div><div class='del'>-		at91_rx_overflow_err(dev);</div><div class='del'>-}</div><div class='add'>+		at91_rx_overflow_err(offload-&gt;dev);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * at91_read_msg - read CAN message from mailbox</div><div class='del'>- * @dev: net device</div><div class='del'>- * @mb: mail box to read from</div><div class='del'>- *</div><div class='del'>- * Reads a CAN message from given mailbox, and put into linux network</div><div class='del'>- * RX queue, does all housekeeping chores (stats, ...)</div><div class='del'>- */</div><div class='del'>-static void at91_read_msg(struct net_device *dev, unsigned int mb)</div><div class='del'>-{</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = alloc_can_skb(dev, &amp;cf);</div><div class='del'>-	if (unlikely(!skb)) {</div><div class='del'>-		stats-&gt;rx_dropped++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+ mark_as_read:</div><div class='add'>+	at91_write(priv, AT91_MCR(mb), AT91_MCR_MTCR);</div><div class='ctx'> </div><div class='del'>-	at91_read_mb(dev, mb, cf);</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_receive_skb(skb);</div><div class='del'>-</div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_RX);</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * at91_poll_rx - read multiple CAN messages from mailboxes</div><div class='del'>- * @dev: net device</div><div class='del'>- * @quota: max number of pkgs we're allowed to receive</div><div class='del'>- *</div><div class='del'>- * Theory of Operation:</div><div class='del'>- *</div><div class='del'>- * About 3/4 of the mailboxes (get_mb_rx_first()...get_mb_rx_last())</div><div class='del'>- * on the chip are reserved for RX. We split them into 2 groups. The</div><div class='del'>- * lower group ranges from get_mb_rx_first() to get_mb_rx_low_last().</div><div class='del'>- *</div><div class='del'>- * Like it or not, but the chip always saves a received CAN message</div><div class='del'>- * into the first free mailbox it finds (starting with the</div><div class='del'>- * lowest). This makes it very difficult to read the messages in the</div><div class='del'>- * right order from the chip. This is how we work around that problem:</div><div class='del'>- *</div><div class='del'>- * The first message goes into mb nr. 1 and issues an interrupt. All</div><div class='del'>- * rx ints are disabled in the interrupt handler and a napi poll is</div><div class='del'>- * scheduled. We read the mailbox, but do _not_ reenable the mb (to</div><div class='del'>- * receive another message).</div><div class='add'>+/* theory of operation:</div><div class='ctx'>  *</div><div class='del'>- *    lower mbxs      upper</div><div class='del'>- *     ____^______    __^__</div><div class='del'>- *    /           \  /     \</div><div class='del'>- * +-+-+-+-+-+-+-+-++-+-+-+-+</div><div class='del'>- * | |x|x|x|x|x|x|x|| | | | |</div><div class='del'>- * +-+-+-+-+-+-+-+-++-+-+-+-+</div><div class='del'>- *  0 0 0 0 0 0  0 0 0 0 1 1  \ mail</div><div class='del'>- *  0 1 2 3 4 5  6 7 8 9 0 1  / box</div><div class='del'>- *  ^</div><div class='del'>- *  |</div><div class='del'>- *   \</div><div class='del'>- *     unused, due to chip bug</div><div class='del'>- *</div><div class='del'>- * The variable priv-&gt;rx_next points to the next mailbox to read a</div><div class='del'>- * message from. As long we're in the lower mailboxes we just read the</div><div class='del'>- * mailbox but not reenable it.</div><div class='del'>- *</div><div class='del'>- * With completion of the last of the lower mailboxes, we reenable the</div><div class='del'>- * whole first group, but continue to look for filled mailboxes in the</div><div class='del'>- * upper mailboxes. Imagine the second group like overflow mailboxes,</div><div class='del'>- * which takes CAN messages if the lower goup is full. While in the</div><div class='del'>- * upper group we reenable the mailbox right after reading it. Giving</div><div class='del'>- * the chip more room to store messages.</div><div class='del'>- *</div><div class='del'>- * After finishing we look again in the lower group if we've still</div><div class='del'>- * quota.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-static int at91_poll_rx(struct net_device *dev, int quota)</div><div class='del'>-{</div><div class='del'>-	struct at91_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 reg_sr = at91_read(priv, AT91_SR);</div><div class='del'>-	const unsigned long *addr = (unsigned long *)&amp;reg_sr;</div><div class='del'>-	unsigned int mb;</div><div class='del'>-	int received = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;rx_next &gt; get_mb_rx_low_last(priv) &amp;&amp;</div><div class='del'>-	    reg_sr &amp; get_mb_rx_low_mask(priv))</div><div class='del'>-		netdev_info(dev,</div><div class='del'>-			"order of incoming frames cannot be guaranteed\n");</div><div class='del'>-</div><div class='del'>- again:</div><div class='del'>-	for (mb = find_next_bit(addr, get_mb_tx_first(priv), priv-&gt;rx_next);</div><div class='del'>-	     mb &lt; get_mb_tx_first(priv) &amp;&amp; quota &gt; 0;</div><div class='del'>-	     reg_sr = at91_read(priv, AT91_SR),</div><div class='del'>-	     mb = find_next_bit(addr, get_mb_tx_first(priv), ++priv-&gt;rx_next)) {</div><div class='del'>-		at91_read_msg(dev, mb);</div><div class='del'>-</div><div class='del'>-		/* reactivate mailboxes */</div><div class='del'>-		if (mb == get_mb_rx_low_last(priv))</div><div class='del'>-			/* all lower mailboxed, if just finished it */</div><div class='del'>-			at91_activate_rx_low(priv);</div><div class='del'>-		else if (mb &gt; get_mb_rx_low_last(priv))</div><div class='del'>-			/* only the mailbox we read */</div><div class='del'>-			at91_activate_rx_mb(priv, mb);</div><div class='del'>-</div><div class='del'>-		received++;</div><div class='del'>-		quota--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* upper group completed, look again in lower */</div><div class='del'>-	if (priv-&gt;rx_next &gt; get_mb_rx_low_last(priv) &amp;&amp;</div><div class='del'>-	    mb &gt; get_mb_rx_last(priv)) {</div><div class='del'>-		priv-&gt;rx_next = get_mb_rx_first(priv);</div><div class='del'>-		if (quota &gt; 0)</div><div class='del'>-			goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return received;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void at91_poll_err_frame(struct net_device *dev,</div><div class='del'>-		struct can_frame *cf, u32 reg_sr)</div><div class='del'>-{</div><div class='del'>-	struct at91_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* CRC error */</div><div class='del'>-	if (reg_sr &amp; AT91_IRQ_CERR) {</div><div class='del'>-		netdev_dbg(dev, "CERR irq\n");</div><div class='del'>-		dev-&gt;stats.rx_errors++;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Stuffing Error */</div><div class='del'>-	if (reg_sr &amp; AT91_IRQ_SERR) {</div><div class='del'>-		netdev_dbg(dev, "SERR irq\n");</div><div class='del'>-		dev-&gt;stats.rx_errors++;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Acknowledgement Error */</div><div class='del'>-	if (reg_sr &amp; AT91_IRQ_AERR) {</div><div class='del'>-		netdev_dbg(dev, "AERR irq\n");</div><div class='del'>-		dev-&gt;stats.tx_errors++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Form error */</div><div class='del'>-	if (reg_sr &amp; AT91_IRQ_FERR) {</div><div class='del'>-		netdev_dbg(dev, "FERR irq\n");</div><div class='del'>-		dev-&gt;stats.rx_errors++;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Bit Error */</div><div class='del'>-	if (reg_sr &amp; AT91_IRQ_BERR) {</div><div class='del'>-		netdev_dbg(dev, "BERR irq\n");</div><div class='del'>-		dev-&gt;stats.tx_errors++;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int at91_poll_err(struct net_device *dev, int quota, u32 reg_sr)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-</div><div class='del'>-	if (quota == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	at91_poll_err_frame(dev, cf, reg_sr);</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_packets++;</div><div class='del'>-	dev-&gt;stats.rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_receive_skb(skb);</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int at91_poll(struct napi_struct *napi, int quota)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = napi-&gt;dev;</div><div class='del'>-	const struct at91_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 reg_sr = at91_read(priv, AT91_SR);</div><div class='del'>-	int work_done = 0;</div><div class='del'>-</div><div class='del'>-	if (reg_sr &amp; get_irq_mb_rx(priv))</div><div class='del'>-		work_done += at91_poll_rx(dev, quota - work_done);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The error bits are clear on read,</div><div class='del'>-	 * so use saved value from irq handler.</div><div class='del'>-	 */</div><div class='del'>-	reg_sr |= priv-&gt;reg_sr;</div><div class='del'>-	if (reg_sr &amp; AT91_IRQ_ERR_FRAME)</div><div class='del'>-		work_done += at91_poll_err(dev, quota - work_done, reg_sr);</div><div class='del'>-</div><div class='del'>-	if (work_done &lt; quota) {</div><div class='del'>-		/* enable IRQs for frame errors and all mailboxes &gt;= rx_next */</div><div class='del'>-		u32 reg_ier = AT91_IRQ_ERR_FRAME;</div><div class='del'>-		reg_ier |= get_irq_mb_rx(priv) &amp; ~AT91_MB_MASK(priv-&gt;rx_next);</div><div class='del'>-</div><div class='del'>-		napi_complete_done(napi, work_done);</div><div class='del'>-		at91_write(priv, AT91_IER, reg_ier);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return work_done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * theory of operation:</div><div class='del'>- *</div><div class='del'>- * priv-&gt;tx_echo holds the number of the oldest can_frame put for</div><div class='add'>+ * priv-&gt;tx_tail holds the number of the oldest can_frame put for</div><div class='ctx'>  * transmission into the hardware, but not yet ACKed by the CAN tx</div><div class='ctx'>  * complete IRQ.</div><div class='ctx'>  *</div><div class='del'>- * We iterate from priv-&gt;tx_echo to priv-&gt;tx_next and check if the</div><div class='add'>+ * We iterate from priv-&gt;tx_tail to priv-&gt;tx_head and check if the</div><div class='ctx'>  * packet has been transmitted, echo it back to the CAN framework. If</div><div class='ctx'>  * we discover a not yet transmitted package, stop looking for more.</div><div class='ctx'>  *</div><div class='hunk'>@@ -834,10 +654,8 @@ static void at91_irq_tx(struct net_device *dev, u32 reg_sr)</div><div class='ctx'> 	u32 reg_msr;</div><div class='ctx'> 	unsigned int mb;</div><div class='ctx'> </div><div class='del'>-	/* masking of reg_sr not needed, already done by at91_irq */</div><div class='del'>-</div><div class='del'>-	for (/* nix */; (priv-&gt;tx_next - priv-&gt;tx_echo) &gt; 0; priv-&gt;tx_echo++) {</div><div class='del'>-		mb = get_tx_echo_mb(priv);</div><div class='add'>+	for (/* nix */; (priv-&gt;tx_head - priv-&gt;tx_tail) &gt; 0; priv-&gt;tx_tail++) {</div><div class='add'>+		mb = get_tx_tail_mb(priv);</div><div class='ctx'> </div><div class='ctx'> 		/* no event in mailbox? */</div><div class='ctx'> 		if (!(reg_sr &amp; (1 &lt;&lt; mb)))</div><div class='hunk'>@@ -846,250 +664,208 @@ static void at91_irq_tx(struct net_device *dev, u32 reg_sr)</div><div class='ctx'> 		/* Disable irq for this TX mailbox */</div><div class='ctx'> 		at91_write(priv, AT91_IDR, 1 &lt;&lt; mb);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * only echo if mailbox signals us a transfer</div><div class='add'>+		/* only echo if mailbox signals us a transfer</div><div class='ctx'> 		 * complete (MSR_MRDY). Otherwise it's a tansfer</div><div class='ctx'> 		 * abort. "can_bus_off()" takes care about the skbs</div><div class='ctx'> 		 * parked in the echo queue.</div><div class='ctx'> 		 */</div><div class='ctx'> 		reg_msr = at91_read(priv, AT91_MSR(mb));</div><div class='del'>-		if (likely(reg_msr &amp; AT91_MSR_MRDY &amp;&amp;</div><div class='del'>-			   ~reg_msr &amp; AT91_MSR_MABT)) {</div><div class='del'>-			/* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */</div><div class='del'>-			can_get_echo_skb(dev, mb - get_mb_tx_first(priv));</div><div class='del'>-			dev-&gt;stats.tx_packets++;</div><div class='del'>-			can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='del'>-		}</div><div class='add'>+		if (unlikely(!(reg_msr &amp; AT91_MSR_MRDY &amp;&amp;</div><div class='add'>+			       ~reg_msr &amp; AT91_MSR_MABT)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* _NOTE_: subtract AT91_MB_TX_FIRST offset from mb! */</div><div class='add'>+		dev-&gt;stats.tx_bytes +=</div><div class='add'>+			can_get_echo_skb(dev, mb - get_mb_tx_first(priv), NULL);</div><div class='add'>+		dev-&gt;stats.tx_packets++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * restart queue if we don't have a wrap around but restart if</div><div class='add'>+	/* restart queue if we don't have a wrap around but restart if</div><div class='ctx'> 	 * we get a TX int for the last can frame directly before a</div><div class='ctx'> 	 * wrap around.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((priv-&gt;tx_next &amp; get_next_mask(priv)) != 0 ||</div><div class='del'>-	    (priv-&gt;tx_echo &amp; get_next_mask(priv)) == 0)</div><div class='add'>+	if ((priv-&gt;tx_head &amp; get_head_mask(priv)) != 0 ||</div><div class='add'>+	    (priv-&gt;tx_tail &amp; get_head_mask(priv)) == 0)</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void at91_irq_err_state(struct net_device *dev,</div><div class='del'>-		struct can_frame *cf, enum can_state new_state)</div><div class='add'>+static void at91_irq_err_line(struct net_device *dev, const u32 reg_sr)</div><div class='ctx'> {</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	enum can_state new_state, rx_state, tx_state;</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 reg_idr = 0, reg_ier = 0;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	at91_get_berr_counter(dev, &amp;bec);</div><div class='add'>+	can_state_get_by_berr_counter(dev, &amp;bec, &amp;tx_state, &amp;rx_state);</div><div class='ctx'> </div><div class='del'>-	switch (priv-&gt;can.state) {</div><div class='del'>-	case CAN_STATE_ERROR_ACTIVE:</div><div class='del'>-		/*</div><div class='del'>-		 * from: ERROR_ACTIVE</div><div class='del'>-		 * to  : ERROR_WARNING, ERROR_PASSIVE, BUS_OFF</div><div class='del'>-		 * =&gt;  : there was a warning int</div><div class='del'>-		 */</div><div class='del'>-		if (new_state &gt;= CAN_STATE_ERROR_WARNING &amp;&amp;</div><div class='del'>-		    new_state &lt;= CAN_STATE_BUS_OFF) {</div><div class='del'>-			netdev_dbg(dev, "Error Warning IRQ\n");</div><div class='del'>-			priv-&gt;can.can_stats.error_warning++;</div><div class='del'>-</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			cf-&gt;data[1] = (bec.txerr &gt; bec.rxerr) ?</div><div class='del'>-				CAN_ERR_CRTL_TX_WARNING :</div><div class='del'>-				CAN_ERR_CRTL_RX_WARNING;</div><div class='del'>-		}</div><div class='del'>-	case CAN_STATE_ERROR_WARNING:	/* fallthrough */</div><div class='del'>-		/*</div><div class='del'>-		 * from: ERROR_ACTIVE, ERROR_WARNING</div><div class='del'>-		 * to  : ERROR_PASSIVE, BUS_OFF</div><div class='del'>-		 * =&gt;  : error passive int</div><div class='del'>-		 */</div><div class='del'>-		if (new_state &gt;= CAN_STATE_ERROR_PASSIVE &amp;&amp;</div><div class='del'>-		    new_state &lt;= CAN_STATE_BUS_OFF) {</div><div class='del'>-			netdev_dbg(dev, "Error Passive IRQ\n");</div><div class='del'>-			priv-&gt;can.can_stats.error_passive++;</div><div class='del'>-</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			cf-&gt;data[1] = (bec.txerr &gt; bec.rxerr) ?</div><div class='del'>-				CAN_ERR_CRTL_TX_PASSIVE :</div><div class='del'>-				CAN_ERR_CRTL_RX_PASSIVE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CAN_STATE_BUS_OFF:</div><div class='del'>-		/*</div><div class='del'>-		 * from: BUS_OFF</div><div class='del'>-		 * to  : ERROR_ACTIVE, ERROR_WARNING, ERROR_PASSIVE</div><div class='del'>-		 */</div><div class='del'>-		if (new_state &lt;= CAN_STATE_ERROR_PASSIVE) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='add'>+	/* The chip automatically recovers from bus-off after 128</div><div class='add'>+	 * occurrences of 11 consecutive recessive bits.</div><div class='add'>+	 *</div><div class='add'>+	 * After an auto-recovered bus-off, the error counters no</div><div class='add'>+	 * longer reflect this fact. On the sam9263 the state bits in</div><div class='add'>+	 * the SR register show the current state (based on the</div><div class='add'>+	 * current error counters), while on sam9x5 and newer SoCs</div><div class='add'>+	 * these bits are latched.</div><div class='add'>+	 *</div><div class='add'>+	 * Take any latched bus-off information from the SR register</div><div class='add'>+	 * into account when calculating the CAN new state, to start</div><div class='add'>+	 * the standard CAN bus off handling.</div><div class='add'>+	 */</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_BOFF)</div><div class='add'>+		rx_state = CAN_STATE_BUS_OFF;</div><div class='ctx'> </div><div class='del'>-			netdev_dbg(dev, "restarted\n");</div><div class='del'>-			priv-&gt;can.can_stats.restarts++;</div><div class='del'>-</div><div class='del'>-			netif_carrier_on(dev);</div><div class='del'>-			netif_wake_queue(dev);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	new_state = max(tx_state, rx_state);</div><div class='ctx'> </div><div class='add'>+	/* state hasn't changed */</div><div class='add'>+	if (likely(new_state == priv-&gt;can.state))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	/* process state changes depending on the new state */</div><div class='del'>-	switch (new_state) {</div><div class='del'>-	case CAN_STATE_ERROR_ACTIVE:</div><div class='del'>-		/*</div><div class='del'>-		 * actually we want to enable AT91_IRQ_WARN here, but</div><div class='del'>-		 * it screws up the system under certain</div><div class='del'>-		 * circumstances. so just enable AT91_IRQ_ERRP, thus</div><div class='del'>-		 * the "fallthrough"</div><div class='del'>-		 */</div><div class='del'>-		netdev_dbg(dev, "Error Active\n");</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='del'>-		cf-&gt;data[2] = CAN_ERR_PROT_ACTIVE;</div><div class='del'>-	case CAN_STATE_ERROR_WARNING:	/* fallthrough */</div><div class='del'>-		reg_idr = AT91_IRQ_ERRA | AT91_IRQ_WARN | AT91_IRQ_BOFF;</div><div class='del'>-		reg_ier = AT91_IRQ_ERRP;</div><div class='del'>-		break;</div><div class='del'>-	case CAN_STATE_ERROR_PASSIVE:</div><div class='del'>-		reg_idr = AT91_IRQ_ERRA | AT91_IRQ_WARN | AT91_IRQ_ERRP;</div><div class='del'>-		reg_ier = AT91_IRQ_BOFF;</div><div class='del'>-		break;</div><div class='del'>-	case CAN_STATE_BUS_OFF:</div><div class='del'>-		reg_idr = AT91_IRQ_ERRA | AT91_IRQ_ERRP |</div><div class='del'>-			AT91_IRQ_WARN | AT91_IRQ_BOFF;</div><div class='del'>-		reg_ier = 0;</div><div class='add'>+	/* The skb allocation might fail, but can_change_state()</div><div class='add'>+	 * handles cf == NULL.</div><div class='add'>+	 */</div><div class='add'>+	skb = at91_alloc_can_err_skb(dev, &amp;cf, &amp;timestamp);</div><div class='add'>+	can_change_state(dev, cf, tx_state, rx_state);</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		at91_chip_stop(dev, CAN_STATE_BUS_OFF);</div><div class='add'>+		can_bus_off(dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		netdev_dbg(dev, "bus-off\n");</div><div class='del'>-		netif_carrier_off(dev);</div><div class='del'>-		priv-&gt;can.can_stats.bus_off++;</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		/* turn off chip, if restart is disabled */</div><div class='del'>-		if (!priv-&gt;can.restart_ms) {</div><div class='del'>-			at91_chip_stop(dev, CAN_STATE_BUS_OFF);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	if (new_state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	at91_write(priv, AT91_IDR, reg_idr);</div><div class='del'>-	at91_write(priv, AT91_IER, reg_ier);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int at91_get_state_by_bec(const struct net_device *dev,</div><div class='del'>-		enum can_state *state)</div><div class='add'>+static void at91_irq_err_frame(struct net_device *dev, const u32 reg_sr)</div><div class='ctx'> {</div><div class='del'>-	struct can_berr_counter bec;</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct at91_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = at91_get_berr_counter(dev, &amp;bec);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	priv-&gt;can.can_stats.bus_error++;</div><div class='ctx'> </div><div class='del'>-	if (bec.txerr &lt; 96 &amp;&amp; bec.rxerr &lt; 96)</div><div class='del'>-		*state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-	else if (bec.txerr &lt; 128 &amp;&amp; bec.rxerr &lt; 128)</div><div class='del'>-		*state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-	else if (bec.txerr &lt; 256 &amp;&amp; bec.rxerr &lt; 256)</div><div class='del'>-		*state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-	else</div><div class='del'>-		*state = CAN_STATE_BUS_OFF;</div><div class='add'>+	skb = at91_alloc_can_err_skb(dev, &amp;cf, &amp;timestamp);</div><div class='add'>+	if (cf)</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_CERR) {</div><div class='add'>+		netdev_dbg(dev, "CRC error\n");</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static void at91_irq_err(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct at91_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	enum can_state new_state;</div><div class='del'>-	u32 reg_sr;</div><div class='del'>-	int err;</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_SERR) {</div><div class='add'>+		netdev_dbg(dev, "Stuff error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_AERR) {</div><div class='add'>+		netdev_dbg(dev, "NACK error\n");</div><div class='ctx'> </div><div class='del'>-	if (at91_is_sam9263(priv)) {</div><div class='del'>-		reg_sr = at91_read(priv, AT91_SR);</div><div class='del'>-</div><div class='del'>-		/* we need to look at the unmasked reg_sr */</div><div class='del'>-		if (unlikely(reg_sr &amp; AT91_IRQ_BOFF))</div><div class='del'>-			new_state = CAN_STATE_BUS_OFF;</div><div class='del'>-		else if (unlikely(reg_sr &amp; AT91_IRQ_ERRP))</div><div class='del'>-			new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-		else if (unlikely(reg_sr &amp; AT91_IRQ_WARN))</div><div class='del'>-			new_state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-		else if (likely(reg_sr &amp; AT91_IRQ_ERRA))</div><div class='del'>-			new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-		else {</div><div class='del'>-			netdev_err(dev, "BUG! hardware in undefined state\n");</div><div class='del'>-			return;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		err = at91_get_state_by_bec(dev, &amp;new_state);</div><div class='del'>-		if (err)</div><div class='del'>-			return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* state hasn't changed */</div><div class='del'>-	if (likely(new_state == priv-&gt;can.state))</div><div class='del'>-		return;</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_FERR) {</div><div class='add'>+		netdev_dbg(dev, "Format error\n");</div><div class='ctx'> </div><div class='del'>-	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='del'>-	if (unlikely(!skb))</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_BERR) {</div><div class='add'>+		netdev_dbg(dev, "Bit error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX | CAN_ERR_PROT_BIT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	at91_irq_err_state(dev, cf, new_state);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 at91_get_reg_sr_rx(const struct at91_priv *priv, u32 *reg_sr_p)</div><div class='add'>+{</div><div class='add'>+	const u32 reg_sr = at91_read(priv, AT91_SR);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;stats.rx_packets++;</div><div class='del'>-	dev-&gt;stats.rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_rx(skb);</div><div class='add'>+	*reg_sr_p |= reg_sr;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.state = new_state;</div><div class='add'>+	return reg_sr &amp; get_irq_mb_rx(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * interrupt handler</div><div class='del'>- */</div><div class='ctx'> static irqreturn_t at91_irq(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_id;</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	irqreturn_t handled = IRQ_NONE;</div><div class='del'>-	u32 reg_sr, reg_imr;</div><div class='del'>-</div><div class='del'>-	reg_sr = at91_read(priv, AT91_SR);</div><div class='del'>-	reg_imr = at91_read(priv, AT91_IMR);</div><div class='del'>-</div><div class='del'>-	/* Ignore masked interrupts */</div><div class='del'>-	reg_sr &amp;= reg_imr;</div><div class='del'>-	if (!reg_sr)</div><div class='del'>-		goto exit;</div><div class='add'>+	u32 reg_sr = 0, reg_sr_rx;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	handled = IRQ_HANDLED;</div><div class='add'>+	/* Receive interrupt</div><div class='add'>+	 * Some bits of AT91_SR are cleared on read, keep them in reg_sr.</div><div class='add'>+	 */</div><div class='add'>+	while ((reg_sr_rx = at91_get_reg_sr_rx(priv, &amp;reg_sr))) {</div><div class='add'>+		ret = can_rx_offload_irq_offload_timestamp(&amp;priv-&gt;offload,</div><div class='add'>+							   reg_sr_rx);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-	/* Receive or error interrupt? -&gt; napi */</div><div class='del'>-	if (reg_sr &amp; (get_irq_mb_rx(priv) | AT91_IRQ_ERR_FRAME)) {</div><div class='del'>-		/*</div><div class='del'>-		 * The error bits are clear on read,</div><div class='del'>-		 * save for later use.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;reg_sr = reg_sr;</div><div class='del'>-		at91_write(priv, AT91_IDR,</div><div class='del'>-			   get_irq_mb_rx(priv) | AT91_IRQ_ERR_FRAME);</div><div class='del'>-		napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+		if (!ret)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Transmission complete interrupt */</div><div class='del'>-	if (reg_sr &amp; get_irq_mb_tx(priv))</div><div class='add'>+	if (reg_sr &amp; get_irq_mb_tx(priv)) {</div><div class='ctx'> 		at91_irq_tx(dev, reg_sr);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	at91_irq_err(dev);</div><div class='add'>+	/* Line Error interrupt */</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_ERR_LINE ||</div><div class='add'>+	    priv-&gt;can.state &gt; CAN_STATE_ERROR_ACTIVE) {</div><div class='add'>+		at91_irq_err_line(dev, reg_sr);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Frame Error Interrupt */</div><div class='add'>+	if (reg_sr &amp; AT91_IRQ_ERR_FRAME) {</div><div class='add'>+		at91_irq_err_frame(dev, reg_sr);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (handled)</div><div class='add'>+		can_rx_offload_irq_finish(&amp;priv-&gt;offload);</div><div class='ctx'> </div><div class='del'>- exit:</div><div class='ctx'> 	return handled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1098,57 +874,58 @@ static int at91_open(struct net_device *dev)</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	err = phy_power_on(priv-&gt;transceiver);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* check or determine and set bittime */</div><div class='ctx'> 	err = open_candev(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_phy_power_off;</div><div class='ctx'> </div><div class='del'>-	/* register interrupt handler */</div><div class='del'>-	if (request_irq(dev-&gt;irq, at91_irq, IRQF_SHARED,</div><div class='del'>-			dev-&gt;name, dev)) {</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		goto out_close;</div><div class='del'>-	}</div><div class='add'>+	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_close_candev;</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_OPEN);</div><div class='add'>+	/* register interrupt handler */</div><div class='add'>+	err = request_irq(dev-&gt;irq, at91_irq, IRQF_SHARED,</div><div class='add'>+			  dev-&gt;name, dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_clock_disable_unprepare;</div><div class='ctx'> </div><div class='ctx'> 	/* start chip and queuing */</div><div class='ctx'> 	at91_chip_start(dev);</div><div class='del'>-	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_close:</div><div class='del'>-	close_candev(dev);</div><div class='del'>- out:</div><div class='add'>+ out_clock_disable_unprepare:</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+ out_close_candev:</div><div class='add'>+	close_candev(dev);</div><div class='add'>+ out_phy_power_off:</div><div class='add'>+	phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * stop CAN bus activity</div><div class='add'>+/* stop CAN bus activity</div><div class='ctx'>  */</div><div class='ctx'> static int at91_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='ctx'> 	at91_chip_stop(dev, CAN_STATE_STOPPED);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> </div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1171,22 +948,26 @@ static const struct net_device_ops at91_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= at91_open,</div><div class='ctx'> 	.ndo_stop	= at91_close,</div><div class='ctx'> 	.ndo_start_xmit	= at91_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static ssize_t at91_sysfs_show_mb0_id(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, char *buf)</div><div class='add'>+static const struct ethtool_ops at91_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t mb0_id_show(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr, char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(to_net_dev(dev));</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;mb0_id &amp; CAN_EFF_FLAG)</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "0x%08x\n", priv-&gt;mb0_id);</div><div class='add'>+		return sysfs_emit(buf, "0x%08x\n", priv-&gt;mb0_id);</div><div class='ctx'> 	else</div><div class='del'>-		return snprintf(buf, PAGE_SIZE, "0x%03x\n", priv-&gt;mb0_id);</div><div class='add'>+		return sysfs_emit(buf, "0x%03x\n", priv-&gt;mb0_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t at91_sysfs_set_mb0_id(struct device *dev,</div><div class='del'>-		struct device_attribute *attr, const char *buf, size_t count)</div><div class='add'>+static ssize_t mb0_id_store(struct device *dev,</div><div class='add'>+			    struct device_attribute *attr,</div><div class='add'>+			    const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = to_net_dev(dev);</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(ndev);</div><div class='hunk'>@@ -1220,7 +1001,7 @@ static ssize_t at91_sysfs_set_mb0_id(struct device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(mb0_id, 0644, at91_sysfs_show_mb0_id, at91_sysfs_set_mb0_id);</div><div class='add'>+static DEVICE_ATTR_RW(mb0_id);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *at91_sysfs_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_mb0_id.attr,</div><div class='hunk'>@@ -1265,6 +1046,7 @@ static const struct at91_devtype_data *at91_can_get_driver_data(struct platform_</div><div class='ctx'> static int at91_can_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct at91_devtype_data *devtype_data;</div><div class='add'>+	struct phy *transceiver;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct at91_priv *priv;</div><div class='ctx'> 	struct resource *res;</div><div class='hunk'>@@ -1300,7 +1082,7 @@ static int at91_can_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto exit_put;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addr = ioremap_nocache(res-&gt;start, resource_size(res));</div><div class='add'>+	addr = ioremap(res-&gt;start, resource_size(res));</div><div class='ctx'> 	if (!addr) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto exit_release;</div><div class='hunk'>@@ -1313,7 +1095,15 @@ static int at91_can_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto exit_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	transceiver = devm_phy_optional_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(transceiver)) {</div><div class='add'>+		err = PTR_ERR(transceiver);</div><div class='add'>+		dev_err_probe(&amp;pdev-&gt;dev, err, "failed to get phy\n");</div><div class='add'>+		goto exit_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;netdev_ops	= &amp;at91_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;at91_ethtool_ops;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='hunk'>@@ -1329,8 +1119,14 @@ static int at91_can_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;clk = clk;</div><div class='ctx'> 	priv-&gt;pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	priv-&gt;mb0_id = 0x7ff;</div><div class='add'>+	priv-&gt;offload.mailbox_read = at91_mailbox_read;</div><div class='add'>+	priv-&gt;offload.mb_first = devtype_data-&gt;rx_first;</div><div class='add'>+	priv-&gt;offload.mb_last = devtype_data-&gt;rx_last;</div><div class='add'>+</div><div class='add'>+	can_rx_offload_add_timestamp(dev, &amp;priv-&gt;offload);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, at91_poll, get_mb_rx_num(priv));</div><div class='add'>+	if (transceiver)</div><div class='add'>+		priv-&gt;can.bitrate_max = transceiver-&gt;attrs.max_link_rate;</div><div class='ctx'> </div><div class='ctx'> 	if (at91_is_sam9263(priv))</div><div class='ctx'> 		dev-&gt;sysfs_groups[0] = &amp;at91_sysfs_attr_group;</div><div class='hunk'>@@ -1344,8 +1140,6 @@ static int at91_can_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(dev);</div><div class='del'>-</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "device registered (reg_base=%p, irq=%d)\n",</div><div class='ctx'> 		 priv-&gt;reg_base, dev-&gt;irq);</div><div class='ctx'> </div><div class='hunk'>@@ -1363,7 +1157,7 @@ static int at91_can_probe(struct platform_device *pdev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int at91_can_remove(struct platform_device *pdev)</div><div class='add'>+static void at91_can_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct at91_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -1379,8 +1173,6 @@ static int at91_can_remove(struct platform_device *pdev)</div><div class='ctx'> 	clk_put(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	free_candev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct platform_device_id at91_can_id_table[] = {</div><div class='head'>diff --git a/drivers/net/can/bxcan.c b/drivers/net/can/bxcan.c<br/>new file mode 100644<br/>index 000000000000..baf494d20bef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/bxcan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/bxcan.c</a></div><div class='hunk'>@@ -0,0 +1,1101 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// bxcan.c - STM32 Basic Extended CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2022 Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;</div><div class='add'>+//</div><div class='add'>+// NOTE: The ST documentation uses the terms master/slave instead of</div><div class='add'>+// primary/secondary.</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#define BXCAN_NAPI_WEIGHT 3</div><div class='add'>+#define BXCAN_TIMEOUT_US 10000</div><div class='add'>+</div><div class='add'>+#define BXCAN_RX_MB_NUM 2</div><div class='add'>+#define BXCAN_TX_MB_NUM 3</div><div class='add'>+</div><div class='add'>+/* Primary control register (MCR) bits */</div><div class='add'>+#define BXCAN_MCR_RESET BIT(15)</div><div class='add'>+#define BXCAN_MCR_TTCM BIT(7)</div><div class='add'>+#define BXCAN_MCR_ABOM BIT(6)</div><div class='add'>+#define BXCAN_MCR_AWUM BIT(5)</div><div class='add'>+#define BXCAN_MCR_NART BIT(4)</div><div class='add'>+#define BXCAN_MCR_RFLM BIT(3)</div><div class='add'>+#define BXCAN_MCR_TXFP BIT(2)</div><div class='add'>+#define BXCAN_MCR_SLEEP BIT(1)</div><div class='add'>+#define BXCAN_MCR_INRQ BIT(0)</div><div class='add'>+</div><div class='add'>+/* Primary status register (MSR) bits */</div><div class='add'>+#define BXCAN_MSR_ERRI BIT(2)</div><div class='add'>+#define BXCAN_MSR_SLAK BIT(1)</div><div class='add'>+#define BXCAN_MSR_INAK BIT(0)</div><div class='add'>+</div><div class='add'>+/* Transmit status register (TSR) bits */</div><div class='add'>+#define BXCAN_TSR_RQCP2 BIT(16)</div><div class='add'>+#define BXCAN_TSR_RQCP1 BIT(8)</div><div class='add'>+#define BXCAN_TSR_RQCP0 BIT(0)</div><div class='add'>+</div><div class='add'>+/* Receive FIFO 0 register (RF0R) bits */</div><div class='add'>+#define BXCAN_RF0R_RFOM0 BIT(5)</div><div class='add'>+#define BXCAN_RF0R_FMP0_MASK GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+/* Interrupt enable register (IER) bits */</div><div class='add'>+#define BXCAN_IER_SLKIE BIT(17)</div><div class='add'>+#define BXCAN_IER_WKUIE BIT(16)</div><div class='add'>+#define BXCAN_IER_ERRIE BIT(15)</div><div class='add'>+#define BXCAN_IER_LECIE BIT(11)</div><div class='add'>+#define BXCAN_IER_BOFIE BIT(10)</div><div class='add'>+#define BXCAN_IER_EPVIE BIT(9)</div><div class='add'>+#define BXCAN_IER_EWGIE BIT(8)</div><div class='add'>+#define BXCAN_IER_FOVIE1 BIT(6)</div><div class='add'>+#define BXCAN_IER_FFIE1 BIT(5)</div><div class='add'>+#define BXCAN_IER_FMPIE1 BIT(4)</div><div class='add'>+#define BXCAN_IER_FOVIE0 BIT(3)</div><div class='add'>+#define BXCAN_IER_FFIE0 BIT(2)</div><div class='add'>+#define BXCAN_IER_FMPIE0 BIT(1)</div><div class='add'>+#define BXCAN_IER_TMEIE BIT(0)</div><div class='add'>+</div><div class='add'>+/* Error status register (ESR) bits */</div><div class='add'>+#define BXCAN_ESR_REC_MASK GENMASK(31, 24)</div><div class='add'>+#define BXCAN_ESR_TEC_MASK GENMASK(23, 16)</div><div class='add'>+#define BXCAN_ESR_LEC_MASK GENMASK(6, 4)</div><div class='add'>+#define BXCAN_ESR_BOFF BIT(2)</div><div class='add'>+#define BXCAN_ESR_EPVF BIT(1)</div><div class='add'>+#define BXCAN_ESR_EWGF BIT(0)</div><div class='add'>+</div><div class='add'>+/* Bit timing register (BTR) bits */</div><div class='add'>+#define BXCAN_BTR_SILM BIT(31)</div><div class='add'>+#define BXCAN_BTR_LBKM BIT(30)</div><div class='add'>+#define BXCAN_BTR_SJW_MASK GENMASK(25, 24)</div><div class='add'>+#define BXCAN_BTR_TS2_MASK GENMASK(22, 20)</div><div class='add'>+#define BXCAN_BTR_TS1_MASK GENMASK(19, 16)</div><div class='add'>+#define BXCAN_BTR_BRP_MASK GENMASK(9, 0)</div><div class='add'>+</div><div class='add'>+/* TX mailbox identifier register (TIxR, x = 0..2) bits */</div><div class='add'>+#define BXCAN_TIxR_STID_MASK GENMASK(31, 21)</div><div class='add'>+#define BXCAN_TIxR_EXID_MASK GENMASK(31, 3)</div><div class='add'>+#define BXCAN_TIxR_IDE BIT(2)</div><div class='add'>+#define BXCAN_TIxR_RTR BIT(1)</div><div class='add'>+#define BXCAN_TIxR_TXRQ BIT(0)</div><div class='add'>+</div><div class='add'>+/* TX mailbox data length and time stamp register (TDTxR, x = 0..2 bits */</div><div class='add'>+#define BXCAN_TDTxR_DLC_MASK GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/* RX FIFO mailbox identifier register (RIxR, x = 0..1 */</div><div class='add'>+#define BXCAN_RIxR_STID_MASK GENMASK(31, 21)</div><div class='add'>+#define BXCAN_RIxR_EXID_MASK GENMASK(31, 3)</div><div class='add'>+#define BXCAN_RIxR_IDE BIT(2)</div><div class='add'>+#define BXCAN_RIxR_RTR BIT(1)</div><div class='add'>+</div><div class='add'>+/* RX FIFO mailbox data length and timestamp register (RDTxR, x = 0..1) bits */</div><div class='add'>+#define BXCAN_RDTxR_TIME_MASK GENMASK(31, 16)</div><div class='add'>+#define BXCAN_RDTxR_DLC_MASK GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define BXCAN_FMR_REG 0x00</div><div class='add'>+#define BXCAN_FM1R_REG 0x04</div><div class='add'>+#define BXCAN_FS1R_REG 0x0c</div><div class='add'>+#define BXCAN_FFA1R_REG 0x14</div><div class='add'>+#define BXCAN_FA1R_REG 0x1c</div><div class='add'>+#define BXCAN_FiR1_REG(b) (0x40 + (b) * 8)</div><div class='add'>+#define BXCAN_FiR2_REG(b) (0x44 + (b) * 8)</div><div class='add'>+</div><div class='add'>+#define BXCAN_FILTER_ID(cfg) ((cfg) == BXCAN_CFG_DUAL_SECONDARY ? 14 : 0)</div><div class='add'>+</div><div class='add'>+/* Filter primary register (FMR) bits */</div><div class='add'>+#define BXCAN_FMR_CANSB_MASK GENMASK(13, 8)</div><div class='add'>+#define BXCAN_FMR_FINIT BIT(0)</div><div class='add'>+</div><div class='add'>+enum bxcan_lec_code {</div><div class='add'>+	BXCAN_LEC_NO_ERROR = 0,</div><div class='add'>+	BXCAN_LEC_STUFF_ERROR,</div><div class='add'>+	BXCAN_LEC_FORM_ERROR,</div><div class='add'>+	BXCAN_LEC_ACK_ERROR,</div><div class='add'>+	BXCAN_LEC_BIT1_ERROR,</div><div class='add'>+	BXCAN_LEC_BIT0_ERROR,</div><div class='add'>+	BXCAN_LEC_CRC_ERROR,</div><div class='add'>+	BXCAN_LEC_UNUSED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bxcan_cfg {</div><div class='add'>+	BXCAN_CFG_SINGLE = 0,</div><div class='add'>+	BXCAN_CFG_DUAL_PRIMARY,</div><div class='add'>+	BXCAN_CFG_DUAL_SECONDARY</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure of the message buffer */</div><div class='add'>+struct bxcan_mb {</div><div class='add'>+	u32 id;			/* can identifier */</div><div class='add'>+	u32 dlc;		/* data length control and timestamp */</div><div class='add'>+	u32 data[2];		/* data */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Structure of the hardware registers */</div><div class='add'>+struct bxcan_regs {</div><div class='add'>+	u32 mcr;			/* 0x00 - primary control */</div><div class='add'>+	u32 msr;			/* 0x04 - primary status */</div><div class='add'>+	u32 tsr;			/* 0x08 - transmit status */</div><div class='add'>+	u32 rf0r;			/* 0x0c - FIFO 0 */</div><div class='add'>+	u32 rf1r;			/* 0x10 - FIFO 1 */</div><div class='add'>+	u32 ier;			/* 0x14 - interrupt enable */</div><div class='add'>+	u32 esr;			/* 0x18 - error status */</div><div class='add'>+	u32 btr;			/* 0x1c - bit timing*/</div><div class='add'>+	u32 reserved0[88];		/* 0x20 */</div><div class='add'>+	struct bxcan_mb tx_mb[BXCAN_TX_MB_NUM];	/* 0x180 - tx mailbox */</div><div class='add'>+	struct bxcan_mb rx_mb[BXCAN_RX_MB_NUM];	/* 0x1b0 - rx mailbox */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bxcan_priv {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+	struct bxcan_regs __iomem *regs;</div><div class='add'>+	struct regmap *gcan;</div><div class='add'>+	int tx_irq;</div><div class='add'>+	int sce_irq;</div><div class='add'>+	enum bxcan_cfg cfg;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	spinlock_t rmw_lock;	/* lock for read-modify-write operations */</div><div class='add'>+	unsigned int tx_head;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const bxcan_bittiming_const = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void bxcan_rmw(struct bxcan_priv *priv, void __iomem *addr,</div><div class='add'>+			     u32 clear, u32 set)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 old, val;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;rmw_lock, flags);</div><div class='add'>+	old = readl(addr);</div><div class='add'>+	val = (old &amp; ~clear) | set;</div><div class='add'>+	if (val != old)</div><div class='add'>+		writel(val, addr);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;rmw_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bxcan_disable_filters(struct bxcan_priv *priv, enum bxcan_cfg cfg)</div><div class='add'>+{</div><div class='add'>+	unsigned int fid = BXCAN_FILTER_ID(cfg);</div><div class='add'>+	u32 fmask = BIT(fid);</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FA1R_REG, fmask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bxcan_enable_filters(struct bxcan_priv *priv, enum bxcan_cfg cfg)</div><div class='add'>+{</div><div class='add'>+	unsigned int fid = BXCAN_FILTER_ID(cfg);</div><div class='add'>+	u32 fmask = BIT(fid);</div><div class='add'>+</div><div class='add'>+	/* Filter settings:</div><div class='add'>+	 *</div><div class='add'>+	 * Accept all messages.</div><div class='add'>+	 * Assign filter 0 to CAN1 and filter 14 to CAN2 in identifier</div><div class='add'>+	 * mask mode with 32 bits width.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Enter filter initialization mode and assign filters to CAN</div><div class='add'>+	 * controllers.</div><div class='add'>+	 */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FMR_REG,</div><div class='add'>+			   BXCAN_FMR_CANSB_MASK | BXCAN_FMR_FINIT,</div><div class='add'>+			   FIELD_PREP(BXCAN_FMR_CANSB_MASK, 14) |</div><div class='add'>+			   BXCAN_FMR_FINIT);</div><div class='add'>+</div><div class='add'>+	/* Deactivate filter */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FA1R_REG, fmask, 0);</div><div class='add'>+</div><div class='add'>+	/* Two 32-bit registers in identifier mask mode */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FM1R_REG, fmask, 0);</div><div class='add'>+</div><div class='add'>+	/* Single 32-bit scale configuration */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FS1R_REG, fmask, fmask);</div><div class='add'>+</div><div class='add'>+	/* Assign filter to FIFO 0 */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FFA1R_REG, fmask, 0);</div><div class='add'>+</div><div class='add'>+	/* Accept all messages */</div><div class='add'>+	regmap_write(priv-&gt;gcan, BXCAN_FiR1_REG(fid), 0);</div><div class='add'>+	regmap_write(priv-&gt;gcan, BXCAN_FiR2_REG(fid), 0);</div><div class='add'>+</div><div class='add'>+	/* Activate filter */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FA1R_REG, fmask, fmask);</div><div class='add'>+</div><div class='add'>+	/* Exit filter initialization mode */</div><div class='add'>+	regmap_update_bits(priv-&gt;gcan, BXCAN_FMR_REG, BXCAN_FMR_FINIT, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 bxcan_get_tx_head(const struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return priv-&gt;tx_head % BXCAN_TX_MB_NUM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 bxcan_get_tx_tail(const struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return priv-&gt;tx_tail % BXCAN_TX_MB_NUM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 bxcan_get_tx_free(const struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return BXCAN_TX_MB_NUM - (priv-&gt;tx_head - priv-&gt;tx_tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bxcan_tx_busy(const struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (bxcan_get_tx_free(priv) &gt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(priv-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	/* Memory barrier before checking tx_free (head and tail) */</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	if (bxcan_get_tx_free(priv) == 0) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "Stopping tx-queue (tx_head=0x%08x, tx_tail=0x%08x, len=%d).\n",</div><div class='add'>+			   priv-&gt;tx_head, priv-&gt;tx_tail,</div><div class='add'>+			   priv-&gt;tx_head - priv-&gt;tx_tail);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_start_queue(priv-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_chip_softreset(struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;mcr, 0, BXCAN_MCR_RESET);</div><div class='add'>+	return readx_poll_timeout(readl, &amp;regs-&gt;msr, value,</div><div class='add'>+				  value &amp; BXCAN_MSR_SLAK, BXCAN_TIMEOUT_US,</div><div class='add'>+				  USEC_PER_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_enter_init_mode(struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;mcr, 0, BXCAN_MCR_INRQ);</div><div class='add'>+	return readx_poll_timeout(readl, &amp;regs-&gt;msr, value,</div><div class='add'>+				  value &amp; BXCAN_MSR_INAK, BXCAN_TIMEOUT_US,</div><div class='add'>+				  USEC_PER_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_leave_init_mode(struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;mcr, BXCAN_MCR_INRQ, 0);</div><div class='add'>+	return readx_poll_timeout(readl, &amp;regs-&gt;msr, value,</div><div class='add'>+				  !(value &amp; BXCAN_MSR_INAK), BXCAN_TIMEOUT_US,</div><div class='add'>+				  USEC_PER_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_enter_sleep_mode(struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;mcr, 0, BXCAN_MCR_SLEEP);</div><div class='add'>+	return readx_poll_timeout(readl, &amp;regs-&gt;msr, value,</div><div class='add'>+				  value &amp; BXCAN_MSR_SLAK, BXCAN_TIMEOUT_US,</div><div class='add'>+				  USEC_PER_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_leave_sleep_mode(struct bxcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 value;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;mcr, BXCAN_MCR_SLEEP, 0);</div><div class='add'>+	return readx_poll_timeout(readl, &amp;regs-&gt;msr, value,</div><div class='add'>+				  !(value &amp; BXCAN_MSR_SLAK), BXCAN_TIMEOUT_US,</div><div class='add'>+				  USEC_PER_SEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+struct bxcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	return container_of(offload, struct bxcan_priv, offload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *bxcan_mailbox_read(struct can_rx_offload *offload,</div><div class='add'>+					  unsigned int mbxno, u32 *timestamp,</div><div class='add'>+					  bool drop)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = rx_offload_to_priv(offload);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	struct bxcan_mb __iomem *mb_regs = &amp;regs-&gt;rx_mb[0];</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	u32 rf0r, id, dlc;</div><div class='add'>+</div><div class='add'>+	rf0r = readl(&amp;regs-&gt;rf0r);</div><div class='add'>+	if (unlikely(drop)) {</div><div class='add'>+		skb = ERR_PTR(-ENOBUFS);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(rf0r &amp; BXCAN_RF0R_FMP0_MASK))</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(offload-&gt;dev, &amp;cf);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		skb = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = readl(&amp;mb_regs-&gt;id);</div><div class='add'>+	if (id &amp; BXCAN_RIxR_IDE)</div><div class='add'>+		cf-&gt;can_id = FIELD_GET(BXCAN_RIxR_EXID_MASK, id) | CAN_EFF_FLAG;</div><div class='add'>+	else</div><div class='add'>+		cf-&gt;can_id = FIELD_GET(BXCAN_RIxR_STID_MASK, id) &amp; CAN_SFF_MASK;</div><div class='add'>+</div><div class='add'>+	dlc = readl(&amp;mb_regs-&gt;dlc);</div><div class='add'>+	priv-&gt;timestamp = FIELD_GET(BXCAN_RDTxR_TIME_MASK, dlc);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(FIELD_GET(BXCAN_RDTxR_DLC_MASK, dlc));</div><div class='add'>+</div><div class='add'>+	if (id &amp; BXCAN_RIxR_RTR) {</div><div class='add'>+		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	} else {</div><div class='add'>+		int i, j;</div><div class='add'>+</div><div class='add'>+		for (i = 0, j = 0; i &lt; cf-&gt;len; i += 4, j++)</div><div class='add'>+			*(u32 *)(cf-&gt;data + i) = readl(&amp;mb_regs-&gt;data[j]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ mark_as_read:</div><div class='add'>+	rf0r |= BXCAN_RF0R_RFOM0;</div><div class='add'>+	writel(rf0r, &amp;regs-&gt;rf0r);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bxcan_rx_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_id;</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 rf0r;</div><div class='add'>+</div><div class='add'>+	rf0r = readl(&amp;regs-&gt;rf0r);</div><div class='add'>+	if (!(rf0r &amp; BXCAN_RF0R_FMP0_MASK))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	can_rx_offload_irq_offload_fifo(&amp;priv-&gt;offload);</div><div class='add'>+	can_rx_offload_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bxcan_tx_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_id;</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	u32 tsr, rqcp_bit;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	tsr = readl(&amp;regs-&gt;tsr);</div><div class='add'>+	if (!(tsr &amp; (BXCAN_TSR_RQCP0 | BXCAN_TSR_RQCP1 | BXCAN_TSR_RQCP2)))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	while (priv-&gt;tx_head - priv-&gt;tx_tail &gt; 0) {</div><div class='add'>+		idx = bxcan_get_tx_tail(priv);</div><div class='add'>+		rqcp_bit = BXCAN_TSR_RQCP0 &lt;&lt; (idx &lt;&lt; 3);</div><div class='add'>+		if (!(tsr &amp; rqcp_bit))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(ndev, idx, NULL);</div><div class='add'>+		priv-&gt;tx_tail++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(tsr, &amp;regs-&gt;tsr);</div><div class='add'>+</div><div class='add'>+	if (bxcan_get_tx_free(priv)) {</div><div class='add'>+		/* Make sure that anybody stopping the queue after</div><div class='add'>+		 * this sees the new tx_ring-&gt;tail.</div><div class='add'>+		 */</div><div class='add'>+		smp_mb();</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bxcan_handle_state_change(struct net_device *ndev, u32 esr)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	enum can_state new_state = priv-&gt;can.state;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	enum can_state rx_state, tx_state;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+	/* Early exit if no error flag is set */</div><div class='add'>+	if (!(esr &amp; (BXCAN_ESR_EWGF | BXCAN_ESR_EPVF | BXCAN_ESR_BOFF)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bec.txerr = FIELD_GET(BXCAN_ESR_TEC_MASK, esr);</div><div class='add'>+	bec.rxerr = FIELD_GET(BXCAN_ESR_REC_MASK, esr);</div><div class='add'>+</div><div class='add'>+	if (esr &amp; BXCAN_ESR_BOFF)</div><div class='add'>+		new_state = CAN_STATE_BUS_OFF;</div><div class='add'>+	else if (esr &amp; BXCAN_ESR_EPVF)</div><div class='add'>+		new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	else if (esr &amp; BXCAN_ESR_EWGF)</div><div class='add'>+		new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+</div><div class='add'>+	/* state hasn't changed */</div><div class='add'>+	if (unlikely(new_state == priv-&gt;can.state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	tx_state = bec.txerr &gt;= bec.rxerr ? new_state : 0;</div><div class='add'>+	rx_state = bec.txerr &lt;= bec.rxerr ? new_state : 0;</div><div class='add'>+	can_change_state(ndev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		can_bus_off(ndev);</div><div class='add'>+	} else if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb,</div><div class='add'>+						     priv-&gt;timestamp);</div><div class='add'>+		if (err)</div><div class='add'>+			ndev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bxcan_handle_bus_err(struct net_device *ndev, u32 esr)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	enum bxcan_lec_code lec_code;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	lec_code = FIELD_GET(BXCAN_ESR_LEC_MASK, esr);</div><div class='add'>+</div><div class='add'>+	/* Early exit if no lec update or no error.</div><div class='add'>+	 * No lec update means that no CAN bus event has been detected</div><div class='add'>+	 * since CPU wrote BXCAN_LEC_UNUSED value to status reg.</div><div class='add'>+	 */</div><div class='add'>+	if (lec_code == BXCAN_LEC_UNUSED || lec_code == BXCAN_LEC_NO_ERROR)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Common for all type of bus errors */</div><div class='add'>+	priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+</div><div class='add'>+	/* Propagate the error condition to the CAN stack */</div><div class='add'>+	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+	if (skb)</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+</div><div class='add'>+	switch (lec_code) {</div><div class='add'>+	case BXCAN_LEC_STUFF_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Stuff error\n");</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+		if (skb)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BXCAN_LEC_FORM_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Form error\n");</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+		if (skb)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BXCAN_LEC_ACK_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Ack error\n");</div><div class='add'>+		ndev-&gt;stats.tx_errors++;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BXCAN_LEC_BIT1_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Bit error (recessive)\n");</div><div class='add'>+		ndev-&gt;stats.tx_errors++;</div><div class='add'>+		if (skb)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BXCAN_LEC_BIT0_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Bit error (dominant)\n");</div><div class='add'>+		ndev-&gt;stats.tx_errors++;</div><div class='add'>+		if (skb)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case BXCAN_LEC_CRC_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "CRC error\n");</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb,</div><div class='add'>+						     priv-&gt;timestamp);</div><div class='add'>+		if (err)</div><div class='add'>+			ndev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bxcan_state_change_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_id;</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 msr, esr;</div><div class='add'>+</div><div class='add'>+	msr = readl(&amp;regs-&gt;msr);</div><div class='add'>+	if (!(msr &amp; BXCAN_MSR_ERRI))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	esr = readl(&amp;regs-&gt;esr);</div><div class='add'>+	bxcan_handle_state_change(ndev, esr);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		bxcan_handle_bus_err(ndev, esr);</div><div class='add'>+</div><div class='add'>+	msr |= BXCAN_MSR_ERRI;</div><div class='add'>+	writel(msr, &amp;regs-&gt;msr);</div><div class='add'>+	can_rx_offload_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_chip_start(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	u32 clr, set;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bxcan_chip_softreset(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to reset chip, error %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bxcan_leave_sleep_mode(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to leave sleep mode, error %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		goto failed_leave_sleep;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bxcan_enter_init_mode(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to enter init mode, error %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		goto failed_enter_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MCR</div><div class='add'>+	 *</div><div class='add'>+	 * select request order priority</div><div class='add'>+	 * enable time triggered mode</div><div class='add'>+	 * bus-off state left on sw request</div><div class='add'>+	 * sleep mode left on sw request</div><div class='add'>+	 * retransmit automatically on error</div><div class='add'>+	 * do not lock RX FIFO on overrun</div><div class='add'>+	 */</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;mcr,</div><div class='add'>+		  BXCAN_MCR_ABOM | BXCAN_MCR_AWUM | BXCAN_MCR_NART |</div><div class='add'>+		  BXCAN_MCR_RFLM, BXCAN_MCR_TTCM | BXCAN_MCR_TXFP);</div><div class='add'>+</div><div class='add'>+	/* Bit timing register settings */</div><div class='add'>+	set = FIELD_PREP(BXCAN_BTR_BRP_MASK, bt-&gt;brp - 1) |</div><div class='add'>+		FIELD_PREP(BXCAN_BTR_TS1_MASK, bt-&gt;phase_seg1 +</div><div class='add'>+			   bt-&gt;prop_seg - 1) |</div><div class='add'>+		FIELD_PREP(BXCAN_BTR_TS2_MASK, bt-&gt;phase_seg2 - 1) |</div><div class='add'>+		FIELD_PREP(BXCAN_BTR_SJW_MASK, bt-&gt;sjw - 1);</div><div class='add'>+</div><div class='add'>+	/* loopback + silent mode put the controller in test mode,</div><div class='add'>+	 * useful for hot self-test</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='add'>+		set |= BXCAN_BTR_LBKM;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		set |= BXCAN_BTR_SILM;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;btr, BXCAN_BTR_SILM | BXCAN_BTR_LBKM |</div><div class='add'>+		  BXCAN_BTR_BRP_MASK | BXCAN_BTR_TS1_MASK | BXCAN_BTR_TS2_MASK |</div><div class='add'>+		  BXCAN_BTR_SJW_MASK, set);</div><div class='add'>+</div><div class='add'>+	bxcan_enable_filters(priv, priv-&gt;cfg);</div><div class='add'>+</div><div class='add'>+	/* Clear all internal status */</div><div class='add'>+	priv-&gt;tx_head = 0;</div><div class='add'>+	priv-&gt;tx_tail = 0;</div><div class='add'>+</div><div class='add'>+	err = bxcan_leave_init_mode(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to leave init mode, error %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		goto failed_leave_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set a `lec` value so that we can check for updates later */</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;esr, BXCAN_ESR_LEC_MASK,</div><div class='add'>+		  FIELD_PREP(BXCAN_ESR_LEC_MASK, BXCAN_LEC_UNUSED));</div><div class='add'>+</div><div class='add'>+	/* IER</div><div class='add'>+	 *</div><div class='add'>+	 * Enable interrupt for:</div><div class='add'>+	 * bus-off</div><div class='add'>+	 * passive error</div><div class='add'>+	 * warning error</div><div class='add'>+	 * last error code</div><div class='add'>+	 * RX FIFO pending message</div><div class='add'>+	 * TX mailbox empty</div><div class='add'>+	 */</div><div class='add'>+	clr = BXCAN_IER_WKUIE | BXCAN_IER_SLKIE |  BXCAN_IER_FOVIE1 |</div><div class='add'>+		BXCAN_IER_FFIE1 | BXCAN_IER_FMPIE1 | BXCAN_IER_FOVIE0 |</div><div class='add'>+		BXCAN_IER_FFIE0;</div><div class='add'>+	set = BXCAN_IER_ERRIE | BXCAN_IER_BOFIE | BXCAN_IER_EPVIE |</div><div class='add'>+		BXCAN_IER_EWGIE | BXCAN_IER_FMPIE0 | BXCAN_IER_TMEIE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		set |= BXCAN_IER_LECIE;</div><div class='add'>+	else</div><div class='add'>+		clr |= BXCAN_IER_LECIE;</div><div class='add'>+</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;ier, clr, set);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed_leave_init:</div><div class='add'>+failed_enter_init:</div><div class='add'>+failed_leave_sleep:</div><div class='add'>+	bxcan_chip_softreset(priv);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to enable clock, error %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = open_candev(ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "open_candev() failed, error %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		goto out_disable_clock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='add'>+	err = request_irq(ndev-&gt;irq, bxcan_rx_isr, IRQF_SHARED, ndev-&gt;name,</div><div class='add'>+			  ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to register rx irq(%d), error %pe\n",</div><div class='add'>+			   ndev-&gt;irq, ERR_PTR(err));</div><div class='add'>+		goto out_close_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(priv-&gt;tx_irq, bxcan_tx_isr, IRQF_SHARED, ndev-&gt;name,</div><div class='add'>+			  ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to register tx irq(%d), error %pe\n",</div><div class='add'>+			   priv-&gt;tx_irq, ERR_PTR(err));</div><div class='add'>+		goto out_free_rx_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(priv-&gt;sce_irq, bxcan_state_change_isr, IRQF_SHARED,</div><div class='add'>+			  ndev-&gt;name, ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to register sce irq(%d), error %pe\n",</div><div class='add'>+			   priv-&gt;sce_irq, ERR_PTR(err));</div><div class='add'>+		goto out_free_tx_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bxcan_chip_start(ndev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_sce_irq;</div><div class='add'>+</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_sce_irq:</div><div class='add'>+	free_irq(priv-&gt;sce_irq, ndev);</div><div class='add'>+out_free_tx_irq:</div><div class='add'>+	free_irq(priv-&gt;tx_irq, ndev);</div><div class='add'>+out_free_rx_irq:</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+out_close_candev:</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+out_disable_clock:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bxcan_chip_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+</div><div class='add'>+	/* disable all interrupts */</div><div class='add'>+	bxcan_rmw(priv, &amp;regs-&gt;ier, BXCAN_IER_SLKIE | BXCAN_IER_WKUIE |</div><div class='add'>+		  BXCAN_IER_ERRIE | BXCAN_IER_LECIE | BXCAN_IER_BOFIE |</div><div class='add'>+		  BXCAN_IER_EPVIE | BXCAN_IER_EWGIE | BXCAN_IER_FOVIE1 |</div><div class='add'>+		  BXCAN_IER_FFIE1 | BXCAN_IER_FMPIE1 | BXCAN_IER_FOVIE0 |</div><div class='add'>+		  BXCAN_IER_FFIE0 | BXCAN_IER_FMPIE0 | BXCAN_IER_TMEIE, 0);</div><div class='add'>+	bxcan_disable_filters(priv, priv-&gt;cfg);</div><div class='add'>+	bxcan_enter_sleep_mode(priv);</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	bxcan_chip_stop(ndev);</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+	free_irq(priv-&gt;tx_irq, ndev);</div><div class='add'>+	free_irq(priv-&gt;sce_irq, ndev);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t bxcan_start_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	struct bxcan_mb __iomem *mb_regs;</div><div class='add'>+	unsigned int idx;</div><div class='add'>+	u32 id;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	if (bxcan_tx_busy(priv))</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	idx = bxcan_get_tx_head(priv);</div><div class='add'>+	priv-&gt;tx_head++;</div><div class='add'>+	if (bxcan_get_tx_free(priv) == 0)</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	mb_regs = &amp;regs-&gt;tx_mb[idx];</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		id = FIELD_PREP(BXCAN_TIxR_EXID_MASK, cf-&gt;can_id) |</div><div class='add'>+			BXCAN_TIxR_IDE;</div><div class='add'>+	else</div><div class='add'>+		id = FIELD_PREP(BXCAN_TIxR_STID_MASK, cf-&gt;can_id);</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG) { /* Remote transmission request */</div><div class='add'>+		id |= BXCAN_TIxR_RTR;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0, j = 0; i &lt; cf-&gt;len; i += 4, j++)</div><div class='add'>+			writel(*(u32 *)(cf-&gt;data + i), &amp;mb_regs-&gt;data[j]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	writel(FIELD_PREP(BXCAN_TDTxR_DLC_MASK, cf-&gt;len), &amp;mb_regs-&gt;dlc);</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, ndev, idx, 0);</div><div class='add'>+</div><div class='add'>+	/* Start transmission */</div><div class='add'>+	writel(id | BXCAN_TIxR_TXRQ, &amp;mb_regs-&gt;id);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops bxcan_netdev_ops = {</div><div class='add'>+	.ndo_open = bxcan_open,</div><div class='add'>+	.ndo_stop = bxcan_stop,</div><div class='add'>+	.ndo_start_xmit = bxcan_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops bxcan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bxcan_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		err = bxcan_chip_start(ndev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_get_berr_counter(const struct net_device *ndev,</div><div class='add'>+				  struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct bxcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 esr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	esr = readl(&amp;regs-&gt;esr);</div><div class='add'>+	bec-&gt;txerr = FIELD_GET(BXCAN_ESR_TEC_MASK, esr);</div><div class='add'>+	bec-&gt;rxerr = FIELD_GET(BXCAN_ESR_REC_MASK, esr);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bxcan_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct bxcan_priv *priv;</div><div class='add'>+	struct clk *clk = NULL;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	struct regmap *gcan;</div><div class='add'>+	enum bxcan_cfg cfg;</div><div class='add'>+	int err, rx_irq, tx_irq, sce_irq;</div><div class='add'>+</div><div class='add'>+	regs = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(regs)) {</div><div class='add'>+		dev_err(dev, "failed to get base address\n");</div><div class='add'>+		return PTR_ERR(regs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gcan = syscon_regmap_lookup_by_phandle(np, "st,gcan");</div><div class='add'>+	if (IS_ERR(gcan)) {</div><div class='add'>+		dev_err(dev, "failed to get shared memory base address\n");</div><div class='add'>+		return PTR_ERR(gcan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(np, "st,can-primary"))</div><div class='add'>+		cfg = BXCAN_CFG_DUAL_PRIMARY;</div><div class='add'>+	else if (of_property_read_bool(np, "st,can-secondary"))</div><div class='add'>+		cfg = BXCAN_CFG_DUAL_SECONDARY;</div><div class='add'>+	else</div><div class='add'>+		cfg = BXCAN_CFG_SINGLE;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_get(dev, NULL);</div><div class='add'>+	if (IS_ERR(clk)) {</div><div class='add'>+		dev_err(dev, "failed to get clock\n");</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_irq = platform_get_irq_byname(pdev, "rx0");</div><div class='add'>+	if (rx_irq &lt; 0)</div><div class='add'>+		return rx_irq;</div><div class='add'>+</div><div class='add'>+	tx_irq = platform_get_irq_byname(pdev, "tx");</div><div class='add'>+	if (tx_irq &lt; 0)</div><div class='add'>+		return tx_irq;</div><div class='add'>+</div><div class='add'>+	sce_irq = platform_get_irq_byname(pdev, "sce");</div><div class='add'>+	if (sce_irq &lt; 0)</div><div class='add'>+		return sce_irq;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_candev(sizeof(struct bxcan_priv), BXCAN_TX_MB_NUM);</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		dev_err(dev, "alloc_candev() failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, dev);</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;bxcan_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;bxcan_ethtool_ops;</div><div class='add'>+	ndev-&gt;irq = rx_irq;</div><div class='add'>+	ndev-&gt;flags |= IFF_ECHO;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+	priv-&gt;ndev = ndev;</div><div class='add'>+	priv-&gt;regs = regs;</div><div class='add'>+	priv-&gt;gcan = gcan;</div><div class='add'>+	priv-&gt;clk = clk;</div><div class='add'>+	priv-&gt;tx_irq = tx_irq;</div><div class='add'>+	priv-&gt;sce_irq = sce_irq;</div><div class='add'>+	priv-&gt;cfg = cfg;</div><div class='add'>+	priv-&gt;can.clock.freq = clk_get_rate(clk);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;rmw_lock);</div><div class='add'>+	priv-&gt;tx_head = 0;</div><div class='add'>+	priv-&gt;tx_tail = 0;</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;bxcan_bittiming_const;</div><div class='add'>+	priv-&gt;can.do_set_mode = bxcan_do_set_mode;</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = bxcan_get_berr_counter;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='add'>+		CAN_CTRLMODE_LISTENONLY	| CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+</div><div class='add'>+	priv-&gt;offload.mailbox_read = bxcan_mailbox_read;</div><div class='add'>+	err = can_rx_offload_add_fifo(ndev, &amp;priv-&gt;offload, BXCAN_NAPI_WEIGHT);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to add FIFO rx_offload\n");</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_candev(ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to register netdev\n");</div><div class='add'>+		goto out_can_rx_offload_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "clk: %d Hz, IRQs: %d, %d, %d\n", priv-&gt;can.clock.freq,</div><div class='add'>+		 tx_irq, rx_irq, sce_irq);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_can_rx_offload_del:</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+out_free_candev:</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bxcan_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	unregister_candev(ndev);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused bxcan_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(ndev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	netif_device_detach(ndev);</div><div class='add'>+</div><div class='add'>+	bxcan_enter_sleep_mode(priv);</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused bxcan_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+	struct bxcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(ndev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	bxcan_leave_sleep_mode(priv);</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	netif_device_attach(ndev);</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(bxcan_pm_ops, bxcan_suspend, bxcan_resume);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id bxcan_of_match[] = {</div><div class='add'>+	{.compatible = "st,stm32f4-bxcan"},</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, bxcan_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver bxcan_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.pm = &amp;bxcan_pm_ops,</div><div class='add'>+		.of_match_table = bxcan_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = bxcan_probe,</div><div class='add'>+	.remove = bxcan_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(bxcan_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("STMicroelectronics Basic Extended CAN controller driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig<br/>index b0f206d36f55..1f0e9acb69ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ if CAN_C_CAN</div><div class='ctx'> </div><div class='ctx'> config CAN_C_CAN_PLATFORM</div><div class='ctx'> 	tristate "Generic Platform Bus based C_CAN/D_CAN driver"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for the C_CAN/D_CAN chips connected</div><div class='ctx'> 	  to the "platform bus" (Linux abstraction for directly to the</div><div class='ctx'> 	  processor attached devices) which can be found on various</div><div class='hunk'>@@ -18,7 +18,8 @@ config CAN_C_CAN_PLATFORM</div><div class='ctx'> config CAN_C_CAN_PCI</div><div class='ctx'> 	tristate "Generic PCI Bus based C_CAN/D_CAN driver"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for the C_CAN/D_CAN chips connected</div><div class='del'>-	  to the PCI bus.</div><div class='add'>+	  to the PCI bus. E.g. for the C_CAN controller IP inside the</div><div class='add'>+	  Intel Atom E6xx series IOH (aka EG20T 'PCH CAN').</div><div class='ctx'> endif</div><div class='head'>diff --git a/drivers/net/can/c_can/Makefile b/drivers/net/can/c_can/Makefile<br/>index e6a94c948531..6fa3b2b9e4b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/Makefile</a></div><div class='hunk'>@@ -4,5 +4,10 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_C_CAN) += c_can.o</div><div class='add'>+</div><div class='add'>+c_can-objs :=</div><div class='add'>+c_can-objs += c_can_ethtool.o</div><div class='add'>+c_can-objs += c_can_main.o</div><div class='add'>+</div><div class='ctx'> obj-$(CONFIG_CAN_C_CAN_PLATFORM) += c_can_platform.o</div><div class='ctx'> obj-$(CONFIG_CAN_C_CAN_PCI) += c_can_pci.o</div><div class='head'>diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h<br/>index 8acdc7fa4792..029cd8194ed5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/c_can.h</a></div><div class='hunk'>@@ -22,23 +22,6 @@</div><div class='ctx'> #ifndef C_CAN_H</div><div class='ctx'> #define C_CAN_H</div><div class='ctx'> </div><div class='del'>-/* message object split */</div><div class='del'>-#define C_CAN_NO_OF_OBJECTS	32</div><div class='del'>-#define C_CAN_MSG_OBJ_RX_NUM	16</div><div class='del'>-#define C_CAN_MSG_OBJ_TX_NUM	16</div><div class='del'>-</div><div class='del'>-#define C_CAN_MSG_OBJ_RX_FIRST	1</div><div class='del'>-#define C_CAN_MSG_OBJ_RX_LAST	(C_CAN_MSG_OBJ_RX_FIRST + \</div><div class='del'>-				C_CAN_MSG_OBJ_RX_NUM - 1)</div><div class='del'>-</div><div class='del'>-#define C_CAN_MSG_OBJ_TX_FIRST	(C_CAN_MSG_OBJ_RX_LAST + 1)</div><div class='del'>-#define C_CAN_MSG_OBJ_TX_LAST	(C_CAN_MSG_OBJ_TX_FIRST + \</div><div class='del'>-				C_CAN_MSG_OBJ_TX_NUM - 1)</div><div class='del'>-</div><div class='del'>-#define C_CAN_MSG_OBJ_RX_SPLIT	9</div><div class='del'>-#define C_CAN_MSG_RX_LOW_LAST	(C_CAN_MSG_OBJ_RX_SPLIT - 1)</div><div class='del'>-#define RECEIVE_OBJECT_BITS	0x0000ffff</div><div class='del'>-</div><div class='ctx'> enum reg {</div><div class='ctx'> 	C_CAN_CTRL_REG = 0,</div><div class='ctx'> 	C_CAN_CTRL_EX_REG,</div><div class='hunk'>@@ -76,12 +59,13 @@ enum reg {</div><div class='ctx'> 	C_CAN_NEWDAT2_REG,</div><div class='ctx'> 	C_CAN_INTPND1_REG,</div><div class='ctx'> 	C_CAN_INTPND2_REG,</div><div class='add'>+	C_CAN_INTPND3_REG,</div><div class='ctx'> 	C_CAN_MSGVAL1_REG,</div><div class='ctx'> 	C_CAN_MSGVAL2_REG,</div><div class='ctx'> 	C_CAN_FUNCTION_REG,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u16 reg_map_c_can[] = {</div><div class='add'>+static const u16 __maybe_unused reg_map_c_can[] = {</div><div class='ctx'> 	[C_CAN_CTRL_REG]	= 0x00,</div><div class='ctx'> 	[C_CAN_STS_REG]		= 0x02,</div><div class='ctx'> 	[C_CAN_ERR_CNT_REG]	= 0x04,</div><div class='hunk'>@@ -121,7 +105,7 @@ static const u16 reg_map_c_can[] = {</div><div class='ctx'> 	[C_CAN_MSGVAL2_REG]	= 0xB2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const u16 reg_map_d_can[] = {</div><div class='add'>+static const u16 __maybe_unused reg_map_d_can[] = {</div><div class='ctx'> 	[C_CAN_CTRL_REG]	= 0x00,</div><div class='ctx'> 	[C_CAN_CTRL_EX_REG]	= 0x02,</div><div class='ctx'> 	[C_CAN_STS_REG]		= 0x04,</div><div class='hunk'>@@ -137,6 +121,7 @@ static const u16 reg_map_d_can[] = {</div><div class='ctx'> 	[C_CAN_NEWDAT2_REG]	= 0x9E,</div><div class='ctx'> 	[C_CAN_INTPND1_REG]	= 0xB0,</div><div class='ctx'> 	[C_CAN_INTPND2_REG]	= 0xB2,</div><div class='add'>+	[C_CAN_INTPND3_REG]	= 0xB4,</div><div class='ctx'> 	[C_CAN_MSGVAL1_REG]	= 0xC4,</div><div class='ctx'> 	[C_CAN_MSGVAL2_REG]	= 0xC6,</div><div class='ctx'> 	[C_CAN_IF1_COMREQ_REG]	= 0x100,</div><div class='hunk'>@@ -164,7 +149,6 @@ static const u16 reg_map_d_can[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum c_can_dev_id {</div><div class='del'>-	BOSCH_C_CAN_PLATFORM,</div><div class='ctx'> 	BOSCH_C_CAN,</div><div class='ctx'> 	BOSCH_D_CAN,</div><div class='ctx'> };</div><div class='hunk'>@@ -176,6 +160,7 @@ struct raminit_bits {</div><div class='ctx'> </div><div class='ctx'> struct c_can_driver_data {</div><div class='ctx'> 	enum c_can_dev_id id;</div><div class='add'>+	unsigned int msg_obj_num;</div><div class='ctx'> </div><div class='ctx'> 	/* RAMINIT register description. Optional. */</div><div class='ctx'> 	const struct raminit_bits *raminit_bits; /* Array of START/DONE bit positions */</div><div class='hunk'>@@ -191,31 +176,44 @@ struct c_can_raminit {</div><div class='ctx'> 	bool needs_pulse;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* c_can tx ring structure */</div><div class='add'>+struct c_can_tx_ring {</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+	unsigned int obj_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* c_can private data structure */</div><div class='ctx'> struct c_can_priv {</div><div class='ctx'> 	struct can_priv can;	/* must be the first member */</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct device *device;</div><div class='del'>-	atomic_t tx_active;</div><div class='add'>+	unsigned int msg_obj_num;</div><div class='add'>+	unsigned int msg_obj_rx_num;</div><div class='add'>+	unsigned int msg_obj_tx_num;</div><div class='add'>+	unsigned int msg_obj_rx_first;</div><div class='add'>+	unsigned int msg_obj_rx_last;</div><div class='add'>+	unsigned int msg_obj_tx_first;</div><div class='add'>+	unsigned int msg_obj_tx_last;</div><div class='add'>+	u32 msg_obj_rx_mask;</div><div class='add'>+	atomic_t sie_pending;</div><div class='ctx'> 	unsigned long tx_dir;</div><div class='ctx'> 	int last_status;</div><div class='del'>-	u16 (*read_reg) (const struct c_can_priv *priv, enum reg index);</div><div class='del'>-	void (*write_reg) (const struct c_can_priv *priv, enum reg index, u16 val);</div><div class='del'>-	u32 (*read_reg32) (const struct c_can_priv *priv, enum reg index);</div><div class='del'>-	void (*write_reg32) (const struct c_can_priv *priv, enum reg index, u32 val);</div><div class='add'>+	struct c_can_tx_ring tx;</div><div class='add'>+	u16 (*read_reg)(const struct c_can_priv *priv, enum reg index);</div><div class='add'>+	void (*write_reg)(const struct c_can_priv *priv, enum reg index, u16 val);</div><div class='add'>+	u32 (*read_reg32)(const struct c_can_priv *priv, enum reg index);</div><div class='add'>+	void (*write_reg32)(const struct c_can_priv *priv, enum reg index, u32 val);</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	const u16 *regs;</div><div class='del'>-	void *priv;		/* for board-specific data */</div><div class='ctx'> 	enum c_can_dev_id type;</div><div class='ctx'> 	struct c_can_raminit raminit_sys;	/* RAMINIT via syscon regmap */</div><div class='del'>-	void (*raminit) (const struct c_can_priv *priv, bool enable);</div><div class='add'>+	void (*raminit)(const struct c_can_priv *priv, bool enable);</div><div class='ctx'> 	u32 comm_rcv_high;</div><div class='del'>-	u32 rxmasked;</div><div class='del'>-	u32 dlc[C_CAN_MSG_OBJ_TX_NUM];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct net_device *alloc_c_can_dev(void);</div><div class='add'>+struct net_device *alloc_c_can_dev(int msg_obj_num);</div><div class='ctx'> void free_c_can_dev(struct net_device *dev);</div><div class='ctx'> int register_c_can_dev(struct net_device *dev);</div><div class='ctx'> void unregister_c_can_dev(struct net_device *dev);</div><div class='hunk'>@@ -225,4 +223,34 @@ int c_can_power_up(struct net_device *dev);</div><div class='ctx'> int c_can_power_down(struct net_device *dev);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+extern const struct ethtool_ops c_can_ethtool_ops;</div><div class='add'>+</div><div class='add'>+static inline u8 c_can_get_tx_head(const struct c_can_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;head &amp; (ring-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 c_can_get_tx_tail(const struct c_can_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;tail &amp; (ring-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 c_can_get_tx_free(const struct c_can_priv *priv,</div><div class='add'>+				   const struct c_can_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	u8 head = c_can_get_tx_head(ring);</div><div class='add'>+	u8 tail = c_can_get_tx_tail(ring);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;type == BOSCH_D_CAN)</div><div class='add'>+		return ring-&gt;obj_num - (ring-&gt;head - ring-&gt;tail);</div><div class='add'>+</div><div class='add'>+	/* This is not a FIFO. C/D_CAN sends out the buffers</div><div class='add'>+	 * prioritized. The lowest buffer number wins.</div><div class='add'>+	 */</div><div class='add'>+	if (head &lt; tail)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ring-&gt;obj_num - head;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* C_CAN_H */</div><div class='head'>diff --git a/drivers/net/can/c_can/c_can_ethtool.c b/drivers/net/can/c_can/c_can_ethtool.c<br/>new file mode 100644<br/>index 000000000000..e41167eda673<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/c_can_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2021, Dario Binacchi &lt;dariobin@libero.it&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+</div><div class='add'>+#include "c_can.h"</div><div class='add'>+</div><div class='add'>+static void c_can_get_ringparam(struct net_device *netdev,</div><div class='add'>+				struct ethtool_ringparam *ring,</div><div class='add'>+				struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct c_can_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ring-&gt;rx_max_pending = priv-&gt;msg_obj_num;</div><div class='add'>+	ring-&gt;tx_max_pending = priv-&gt;msg_obj_num;</div><div class='add'>+	ring-&gt;rx_pending = priv-&gt;msg_obj_rx_num;</div><div class='add'>+	ring-&gt;tx_pending = priv-&gt;msg_obj_tx_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops c_can_ethtool_ops = {</div><div class='add'>+	.get_ringparam = c_can_get_ringparam,</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can_main.c<br/>index 606b7d8ffe13..3702cac7fbf0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/c_can_main.c</a></div><div class='hunk'>@@ -40,7 +40,6 @@</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "c_can.h"</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +51,7 @@</div><div class='ctx'> #define CONTROL_EX_PDR		BIT(8)</div><div class='ctx'> </div><div class='ctx'> /* control register */</div><div class='add'>+#define CONTROL_SWR		BIT(15)</div><div class='ctx'> #define CONTROL_TEST		BIT(7)</div><div class='ctx'> #define CONTROL_CCE		BIT(6)</div><div class='ctx'> #define CONTROL_DISABLE_AR	BIT(5)</div><div class='hunk'>@@ -97,6 +97,9 @@</div><div class='ctx'> #define BTR_TSEG2_SHIFT		12</div><div class='ctx'> #define BTR_TSEG2_MASK		(0x7 &lt;&lt; BTR_TSEG2_SHIFT)</div><div class='ctx'> </div><div class='add'>+/* interrupt register */</div><div class='add'>+#define INT_STS_PENDING		0x8000</div><div class='add'>+</div><div class='ctx'> /* brp extension register */</div><div class='ctx'> #define BRP_EXT_BRPE_MASK	0x0f</div><div class='ctx'> #define BRP_EXT_BRPE_SHIFT	0</div><div class='hunk'>@@ -128,7 +131,6 @@</div><div class='ctx'> /* For the high buffers we clear the interrupt bit and newdat */</div><div class='ctx'> #define IF_COMM_RCV_HIGH	(IF_COMM_RCV_LOW | IF_COMM_CLR_NEWDAT)</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* Receive setup of message objects */</div><div class='ctx'> #define IF_COMM_RCV_SETUP	(IF_COMM_MASK | IF_COMM_ARB | IF_COMM_CONTROL)</div><div class='ctx'> </div><div class='hunk'>@@ -157,10 +159,8 @@</div><div class='ctx'> </div><div class='ctx'> #define IF_MCONT_TX		(IF_MCONT_TXIE | IF_MCONT_EOB)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Use IF1 for RX and IF2 for TX</div><div class='del'>- */</div><div class='del'>-#define IF_RX			0</div><div class='add'>+/* Use IF1 in NAPI path and IF2 in TX path */</div><div class='add'>+#define IF_NAPI			0</div><div class='ctx'> #define IF_TX			1</div><div class='ctx'> </div><div class='ctx'> /* minimum timeout for checking BUSY status */</div><div class='hunk'>@@ -169,9 +169,6 @@</div><div class='ctx'> /* Wait for ~1 sec for INIT bit */</div><div class='ctx'> #define INIT_WAIT_MS		1000</div><div class='ctx'> </div><div class='del'>-/* napi related */</div><div class='del'>-#define C_CAN_NAPI_WEIGHT	C_CAN_MSG_OBJ_RX_NUM</div><div class='del'>-</div><div class='ctx'> /* c_can lec values */</div><div class='ctx'> enum c_can_lec_type {</div><div class='ctx'> 	LEC_NO_ERROR = 0,</div><div class='hunk'>@@ -185,8 +182,7 @@ enum c_can_lec_type {</div><div class='ctx'> 	LEC_MASK = LEC_UNUSED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * c_can error types:</div><div class='add'>+/* c_can error types:</div><div class='ctx'>  * Bus errors (BUS_OFF, ERROR_WARNING, ERROR_PASSIVE) are supported</div><div class='ctx'>  */</div><div class='ctx'> enum c_can_bus_error_types {</div><div class='hunk'>@@ -208,18 +204,6 @@ static const struct can_bittiming_const c_can_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void c_can_pm_runtime_enable(const struct c_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;device)</div><div class='del'>-		pm_runtime_enable(priv-&gt;device);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void c_can_pm_runtime_disable(const struct c_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	if (priv-&gt;device)</div><div class='del'>-		pm_runtime_disable(priv-&gt;device);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void c_can_pm_runtime_get_sync(const struct c_can_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (priv-&gt;device)</div><div class='hunk'>@@ -261,7 +245,6 @@ static void c_can_obj_update(struct net_device *dev, int iface, u32 cmd, u32 obj</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 	}</div><div class='ctx'> 	netdev_err(dev, "Updating object timed out\n");</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void c_can_object_get(struct net_device *dev, int iface,</div><div class='hunk'>@@ -276,8 +259,7 @@ static inline void c_can_object_put(struct net_device *dev, int iface,</div><div class='ctx'> 	c_can_obj_update(dev, iface, cmd | IF_COMM_WR, obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note: According to documentation clearing TXIE while MSGVAL is set</div><div class='add'>+/* Note: According to documentation clearing TXIE while MSGVAL is set</div><div class='ctx'>  * is not allowed, but works nicely on C/DCAN. And that lowers the I/O</div><div class='ctx'>  * load significantly.</div><div class='ctx'>  */</div><div class='hunk'>@@ -293,8 +275,7 @@ static void c_can_inval_msg_object(struct net_device *dev, int iface, int obj)</div><div class='ctx'> {</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), 0);</div><div class='del'>-	priv-&gt;write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), 0);</div><div class='add'>+	priv-&gt;write_reg32(priv, C_CAN_IFACE(ARB1_REG, iface), 0);</div><div class='ctx'> 	c_can_inval_tx_object(dev, iface, obj);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -302,7 +283,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,</div><div class='ctx'> 				  struct can_frame *frame, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	u16 ctrl = IF_MCONT_TX | frame-&gt;can_dlc;</div><div class='add'>+	u16 ctrl = IF_MCONT_TX | frame-&gt;len;</div><div class='ctx'> 	bool rtr = frame-&gt;can_id &amp; CAN_RTR_FLAG;</div><div class='ctx'> 	u32 arb = IF_ARB_MSGVAL;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -317,12 +298,11 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,</div><div class='ctx'> 	if (!rtr)</div><div class='ctx'> 		arb |= IF_ARB_TRANSMIT;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If we change the DIR bit, we need to invalidate the buffer</div><div class='add'>+	/* If we change the DIR bit, we need to invalidate the buffer</div><div class='ctx'> 	 * first, i.e. clear the MSGVAL flag in the arbiter.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (rtr != (bool)test_bit(idx, &amp;priv-&gt;tx_dir)) {</div><div class='del'>-		u32 obj = idx + C_CAN_MSG_OBJ_TX_FIRST;</div><div class='add'>+		u32 obj = idx + priv-&gt;msg_obj_tx_first;</div><div class='ctx'> </div><div class='ctx'> 		c_can_inval_msg_object(dev, iface, obj);</div><div class='ctx'> 		change_bit(idx, &amp;priv-&gt;tx_dir);</div><div class='hunk'>@@ -335,7 +315,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,</div><div class='ctx'> 	if (priv-&gt;type == BOSCH_D_CAN) {</div><div class='ctx'> 		u32 data = 0, dreg = C_CAN_IFACE(DATA1_REG, iface);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; frame-&gt;can_dlc; i += 4, dreg += 2) {</div><div class='add'>+		for (i = 0; i &lt; frame-&gt;len; i += 4, dreg += 2) {</div><div class='ctx'> 			data = (u32)frame-&gt;data[i];</div><div class='ctx'> 			data |= (u32)frame-&gt;data[i + 1] &lt;&lt; 8;</div><div class='ctx'> 			data |= (u32)frame-&gt;data[i + 2] &lt;&lt; 16;</div><div class='hunk'>@@ -343,7 +323,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,</div><div class='ctx'> 			priv-&gt;write_reg32(priv, dreg, data);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; frame-&gt;can_dlc; i += 2) {</div><div class='add'>+		for (i = 0; i &lt; frame-&gt;len; i += 2) {</div><div class='ctx'> 			priv-&gt;write_reg(priv,</div><div class='ctx'> 					C_CAN_IFACE(DATA1_REG, iface) + i / 2,</div><div class='ctx'> 					frame-&gt;data[i] |</div><div class='hunk'>@@ -352,15 +332,6 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void c_can_activate_all_lower_rx_msg_obj(struct net_device *dev,</div><div class='del'>-						       int iface)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = C_CAN_MSG_OBJ_RX_FIRST; i &lt;= C_CAN_MSG_RX_LOW_LAST; i++)</div><div class='del'>-		c_can_object_get(dev, iface, i, IF_COMM_CLR_NEWDAT);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int c_can_handle_lost_msg_obj(struct net_device *dev,</div><div class='ctx'> 				     int iface, int objno, u32 ctrl)</div><div class='ctx'> {</div><div class='hunk'>@@ -402,7 +373,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	frame-&gt;can_dlc = get_can_dlc(ctrl &amp; 0x0F);</div><div class='add'>+	frame-&gt;len = can_cc_dlc2len(ctrl &amp; 0x0F);</div><div class='ctx'> </div><div class='ctx'> 	arb = priv-&gt;read_reg32(priv, C_CAN_IFACE(ARB1_REG, iface));</div><div class='ctx'> </div><div class='hunk'>@@ -417,7 +388,7 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl)</div><div class='ctx'> 		int i, dreg = C_CAN_IFACE(DATA1_REG, iface);</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;type == BOSCH_D_CAN) {</div><div class='del'>-			for (i = 0; i &lt; frame-&gt;can_dlc; i += 4, dreg += 2) {</div><div class='add'>+			for (i = 0; i &lt; frame-&gt;len; i += 4, dreg += 2) {</div><div class='ctx'> 				data = priv-&gt;read_reg32(priv, dreg);</div><div class='ctx'> 				frame-&gt;data[i] = data;</div><div class='ctx'> 				frame-&gt;data[i + 1] = data &gt;&gt; 8;</div><div class='hunk'>@@ -425,16 +396,16 @@ static int c_can_read_msg_object(struct net_device *dev, int iface, u32 ctrl)</div><div class='ctx'> 				frame-&gt;data[i + 3] = data &gt;&gt; 24;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			for (i = 0; i &lt; frame-&gt;can_dlc; i += 2, dreg++) {</div><div class='add'>+			for (i = 0; i &lt; frame-&gt;len; i += 2, dreg++) {</div><div class='ctx'> 				data = priv-&gt;read_reg(priv, dreg);</div><div class='ctx'> 				frame-&gt;data[i] = data;</div><div class='ctx'> 				frame-&gt;data[i + 1] = data &gt;&gt; 8;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += frame-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += frame-&gt;can_dlc;</div><div class='ctx'> </div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -455,38 +426,59 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface,</div><div class='ctx'> 	c_can_object_put(dev, iface, obj, IF_COMM_RCV_SETUP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool c_can_tx_busy(const struct c_can_priv *priv,</div><div class='add'>+			  const struct c_can_tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	if (c_can_get_tx_free(priv, tx_ring) &gt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Memory barrier before checking tx_free (head and tail) */</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	if (c_can_get_tx_free(priv, tx_ring) == 0) {</div><div class='add'>+		netdev_dbg(priv-&gt;dev,</div><div class='add'>+			   "Stopping tx-queue (tx_head=0x%08x, tx_tail=0x%08x, len=%d).\n",</div><div class='add'>+			   tx_ring-&gt;head, tx_ring-&gt;tail,</div><div class='add'>+			   tx_ring-&gt;head - tx_ring-&gt;tail);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_start_queue(priv-&gt;dev);</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 				    struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct can_frame *frame = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 idx, obj;</div><div class='add'>+	struct c_can_tx_ring *tx_ring = &amp;priv-&gt;tx;</div><div class='add'>+	u32 idx, obj, cmd = IF_COMM_TX;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='del'>-	/*</div><div class='del'>-	 * This is not a FIFO. C/D_CAN sends out the buffers</div><div class='del'>-	 * prioritized. The lowest buffer number wins.</div><div class='del'>-	 */</div><div class='del'>-	idx = fls(atomic_read(&amp;priv-&gt;tx_active));</div><div class='del'>-	obj = idx + C_CAN_MSG_OBJ_TX_FIRST;</div><div class='ctx'> </div><div class='del'>-	/* If this is the last buffer, stop the xmit queue */</div><div class='del'>-	if (idx == C_CAN_MSG_OBJ_TX_NUM - 1)</div><div class='add'>+	if (c_can_tx_busy(priv, tx_ring))</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	idx = c_can_get_tx_head(tx_ring);</div><div class='add'>+	tx_ring-&gt;head++;</div><div class='add'>+	if (c_can_get_tx_free(priv, tx_ring) == 0)</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-	/*</div><div class='del'>-	 * Store the message in the interface so we can call</div><div class='add'>+</div><div class='add'>+	if (idx &lt; c_can_get_tx_tail(tx_ring))</div><div class='add'>+		cmd &amp;= ~IF_COMM_TXRQST; /* Cache the message */</div><div class='add'>+</div><div class='add'>+	/* Store the message in the interface so we can call</div><div class='ctx'> 	 * can_put_echo_skb(). We must do this before we enable</div><div class='ctx'> 	 * transmit as we might race against do_tx().</div><div class='ctx'> 	 */</div><div class='ctx'> 	c_can_setup_tx_object(dev, IF_TX, frame, idx);</div><div class='del'>-	priv-&gt;dlc[idx] = frame-&gt;can_dlc;</div><div class='del'>-	can_put_echo_skb(skb, dev, idx);</div><div class='del'>-</div><div class='del'>-	/* Update the active bits */</div><div class='del'>-	atomic_add((1 &lt;&lt; idx), &amp;priv-&gt;tx_active);</div><div class='del'>-	/* Start transmission */</div><div class='del'>-	c_can_object_put(dev, IF_TX, obj, IF_COMM_TX);</div><div class='add'>+	can_put_echo_skb(skb, dev, idx, 0);</div><div class='add'>+	obj = idx + priv-&gt;msg_obj_tx_first;</div><div class='add'>+	c_can_object_put(dev, IF_TX, obj, cmd);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='hunk'>@@ -528,7 +520,7 @@ static int c_can_set_bittiming(struct net_device *dev)</div><div class='ctx'> 	reg_brpe = brpe &amp; BRP_EXT_BRPE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(dev,</div><div class='del'>-		"setting BTR=%04x BRPE=%04x\n", reg_btr, reg_brpe);</div><div class='add'>+		    "setting BTR=%04x BRPE=%04x\n", reg_btr, reg_brpe);</div><div class='ctx'> </div><div class='ctx'> 	ctrl_save = priv-&gt;read_reg(priv, C_CAN_CTRL_REG);</div><div class='ctx'> 	ctrl_save &amp;= ~CONTROL_INIT;</div><div class='hunk'>@@ -544,8 +536,7 @@ static int c_can_set_bittiming(struct net_device *dev)</div><div class='ctx'> 	return c_can_wait_for_ctrl_init(dev, priv, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Configure C_CAN message objects for Tx and Rx purposes:</div><div class='add'>+/* Configure C_CAN message objects for Tx and Rx purposes:</div><div class='ctx'>  * C_CAN provides a total of 32 message objects that can be configured</div><div class='ctx'>  * either for Tx or Rx purposes. Here the first 16 message objects are used as</div><div class='ctx'>  * a reception FIFO. The end of reception FIFO is signified by the EoB bit</div><div class='hunk'>@@ -555,22 +546,42 @@ static int c_can_set_bittiming(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static void c_can_configure_msg_objects(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct c_can_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* first invalidate all message objects */</div><div class='del'>-	for (i = C_CAN_MSG_OBJ_RX_FIRST; i &lt;= C_CAN_NO_OF_OBJECTS; i++)</div><div class='del'>-		c_can_inval_msg_object(dev, IF_RX, i);</div><div class='add'>+	for (i = priv-&gt;msg_obj_rx_first; i &lt;= priv-&gt;msg_obj_num; i++)</div><div class='add'>+		c_can_inval_msg_object(dev, IF_NAPI, i);</div><div class='ctx'> </div><div class='ctx'> 	/* setup receive message objects */</div><div class='del'>-	for (i = C_CAN_MSG_OBJ_RX_FIRST; i &lt; C_CAN_MSG_OBJ_RX_LAST; i++)</div><div class='del'>-		c_can_setup_receive_object(dev, IF_RX, i, 0, 0, IF_MCONT_RCV);</div><div class='add'>+	for (i = priv-&gt;msg_obj_rx_first; i &lt; priv-&gt;msg_obj_rx_last; i++)</div><div class='add'>+		c_can_setup_receive_object(dev, IF_NAPI, i, 0, 0, IF_MCONT_RCV);</div><div class='ctx'> </div><div class='del'>-	c_can_setup_receive_object(dev, IF_RX, C_CAN_MSG_OBJ_RX_LAST, 0, 0,</div><div class='add'>+	c_can_setup_receive_object(dev, IF_NAPI, priv-&gt;msg_obj_rx_last, 0, 0,</div><div class='ctx'> 				   IF_MCONT_RCV_EOB);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Configure C_CAN chip:</div><div class='add'>+static int c_can_software_reset(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct c_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	int retry = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;type != BOSCH_D_CAN)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;write_reg(priv, C_CAN_CTRL_REG, CONTROL_SWR | CONTROL_INIT);</div><div class='add'>+	while (priv-&gt;read_reg(priv, C_CAN_CTRL_REG) &amp; CONTROL_SWR) {</div><div class='add'>+		msleep(20);</div><div class='add'>+		if (retry++ &gt; 100) {</div><div class='add'>+			netdev_err(dev, "CCTRL: software reset failed\n");</div><div class='add'>+			return -EIO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Configure C_CAN chip:</div><div class='ctx'>  * - enable/disable auto-retransmission</div><div class='ctx'>  * - set operating mode</div><div class='ctx'>  * - configure message objects</div><div class='hunk'>@@ -578,6 +589,12 @@ static void c_can_configure_msg_objects(struct net_device *dev)</div><div class='ctx'> static int c_can_chip_config(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct c_can_tx_ring *tx_ring = &amp;priv-&gt;tx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = c_can_software_reset(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* enable automatic retransmission */</div><div class='ctx'> 	priv-&gt;write_reg(priv, C_CAN_CTRL_REG, CONTROL_ENABLE_AR);</div><div class='hunk'>@@ -604,8 +621,8 @@ static int c_can_chip_config(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear all internal status */</div><div class='del'>-	atomic_set(&amp;priv-&gt;tx_active, 0);</div><div class='del'>-	priv-&gt;rxmasked = 0;</div><div class='add'>+	tx_ring-&gt;head = 0;</div><div class='add'>+	tx_ring-&gt;tail = 0;</div><div class='ctx'> 	priv-&gt;tx_dir = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* set bittiming params */</div><div class='hunk'>@@ -703,48 +720,69 @@ static int c_can_get_berr_counter(const struct net_device *dev,</div><div class='ctx'> static void c_can_do_tx(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct c_can_tx_ring *tx_ring = &amp;priv-&gt;tx;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	u32 idx, obj, pkts = 0, bytes = 0, pend, clr;</div><div class='add'>+	u32 idx, obj, pkts = 0, bytes = 0, pend;</div><div class='add'>+	u8 tail;</div><div class='ctx'> </div><div class='del'>-	clr = pend = priv-&gt;read_reg(priv, C_CAN_INTPND2_REG);</div><div class='add'>+	if (priv-&gt;msg_obj_tx_last &gt; 32)</div><div class='add'>+		pend = priv-&gt;read_reg32(priv, C_CAN_INTPND3_REG);</div><div class='add'>+	else</div><div class='add'>+		pend = priv-&gt;read_reg(priv, C_CAN_INTPND2_REG);</div><div class='ctx'> </div><div class='ctx'> 	while ((idx = ffs(pend))) {</div><div class='ctx'> 		idx--;</div><div class='del'>-		pend &amp;= ~(1 &lt;&lt; idx);</div><div class='del'>-		obj = idx + C_CAN_MSG_OBJ_TX_FIRST;</div><div class='del'>-		c_can_inval_tx_object(dev, IF_RX, obj);</div><div class='del'>-		can_get_echo_skb(dev, idx);</div><div class='del'>-		bytes += priv-&gt;dlc[idx];</div><div class='add'>+		pend &amp;= ~BIT(idx);</div><div class='add'>+		obj = idx + priv-&gt;msg_obj_tx_first;</div><div class='add'>+</div><div class='add'>+		/* We use IF_NAPI interface instead of IF_TX because we</div><div class='add'>+		 * are called from c_can_poll(), which runs inside</div><div class='add'>+		 * NAPI. We are not transmitting.</div><div class='add'>+		 */</div><div class='add'>+		c_can_inval_tx_object(dev, IF_NAPI, obj);</div><div class='add'>+		bytes += can_get_echo_skb(dev, idx, NULL);</div><div class='ctx'> 		pkts++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Clear the bits in the tx_active mask */</div><div class='del'>-	atomic_sub(clr, &amp;priv-&gt;tx_active);</div><div class='add'>+	if (!pkts)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (clr &amp; (1 &lt;&lt; (C_CAN_MSG_OBJ_TX_NUM - 1)))</div><div class='del'>-		netif_wake_queue(dev);</div><div class='add'>+	tx_ring-&gt;tail += pkts;</div><div class='add'>+	if (c_can_get_tx_free(priv, tx_ring)) {</div><div class='add'>+		/* Make sure that anybody stopping the queue after</div><div class='add'>+		 * this sees the new tx_ring-&gt;tail.</div><div class='add'>+		 */</div><div class='add'>+		smp_mb();</div><div class='add'>+		netif_wake_queue(priv-&gt;dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (pkts) {</div><div class='del'>-		stats-&gt;tx_bytes += bytes;</div><div class='del'>-		stats-&gt;tx_packets += pkts;</div><div class='del'>-		can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='add'>+	stats-&gt;tx_bytes += bytes;</div><div class='add'>+	stats-&gt;tx_packets += pkts;</div><div class='add'>+</div><div class='add'>+	tail = c_can_get_tx_tail(tx_ring);</div><div class='add'>+	if (priv-&gt;type == BOSCH_D_CAN &amp;&amp; tail == 0) {</div><div class='add'>+		u8 head = c_can_get_tx_head(tx_ring);</div><div class='add'>+</div><div class='add'>+		/* Start transmission for all cached messages */</div><div class='add'>+		for (idx = tail; idx &lt; head; idx++) {</div><div class='add'>+			obj = idx + priv-&gt;msg_obj_tx_first;</div><div class='add'>+			c_can_object_put(dev, IF_NAPI, obj, IF_COMM_TXRQST);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * If we have a gap in the pending bits, that means we either</div><div class='add'>+/* If we have a gap in the pending bits, that means we either</div><div class='ctx'>  * raced with the hardware or failed to readout all upper</div><div class='ctx'>  * objects in the last run due to quota limit.</div><div class='ctx'>  */</div><div class='del'>-static u32 c_can_adjust_pending(u32 pend)</div><div class='add'>+static u32 c_can_adjust_pending(u32 pend, u32 rx_mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 weight, lasts;</div><div class='ctx'> </div><div class='del'>-	if (pend == RECEIVE_OBJECT_BITS)</div><div class='add'>+	if (pend == rx_mask)</div><div class='ctx'> 		return pend;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * If the last set bit is larger than the number of pending</div><div class='add'>+	/* If the last set bit is larger than the number of pending</div><div class='ctx'> 	 * bits we have a gap.</div><div class='ctx'> 	 */</div><div class='ctx'> 	weight = hweight32(pend);</div><div class='hunk'>@@ -754,26 +792,26 @@ static u32 c_can_adjust_pending(u32 pend)</div><div class='ctx'> 	if (lasts == weight)</div><div class='ctx'> 		return pend;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Find the first set bit after the gap. We walk backwards</div><div class='add'>+	/* Find the first set bit after the gap. We walk backwards</div><div class='ctx'> 	 * from the last set bit.</div><div class='ctx'> 	 */</div><div class='del'>-	for (lasts--; pend &amp; (1 &lt;&lt; (lasts - 1)); lasts--);</div><div class='add'>+	for (lasts--; pend &amp; BIT(lasts - 1); lasts--)</div><div class='add'>+		;</div><div class='ctx'> </div><div class='del'>-	return pend &amp; ~((1 &lt;&lt; lasts) - 1);</div><div class='add'>+	return pend &amp; ~GENMASK(lasts - 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void c_can_rx_object_get(struct net_device *dev,</div><div class='ctx'> 				       struct c_can_priv *priv, u32 obj)</div><div class='ctx'> {</div><div class='del'>-		c_can_object_get(dev, IF_RX, obj, priv-&gt;comm_rcv_high);</div><div class='add'>+	c_can_object_get(dev, IF_NAPI, obj, priv-&gt;comm_rcv_high);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void c_can_rx_finalize(struct net_device *dev,</div><div class='ctx'> 				     struct c_can_priv *priv, u32 obj)</div><div class='ctx'> {</div><div class='ctx'> 	if (priv-&gt;type != BOSCH_D_CAN)</div><div class='del'>-		c_can_object_get(dev, IF_RX, obj, IF_COMM_CLR_NEWDAT);</div><div class='add'>+		c_can_object_get(dev, IF_NAPI, obj, IF_COMM_CLR_NEWDAT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv,</div><div class='hunk'>@@ -785,18 +823,19 @@ static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv,</div><div class='ctx'> 		pend &amp;= ~BIT(obj - 1);</div><div class='ctx'> </div><div class='ctx'> 		c_can_rx_object_get(dev, priv, obj);</div><div class='del'>-		ctrl = priv-&gt;read_reg(priv, C_CAN_IFACE(MSGCTRL_REG, IF_RX));</div><div class='add'>+		ctrl = priv-&gt;read_reg(priv, C_CAN_IFACE(MSGCTRL_REG, IF_NAPI));</div><div class='ctx'> </div><div class='ctx'> 		if (ctrl &amp; IF_MCONT_MSGLST) {</div><div class='del'>-			int n = c_can_handle_lost_msg_obj(dev, IF_RX, obj, ctrl);</div><div class='add'>+			int n;</div><div class='add'>+</div><div class='add'>+			n = c_can_handle_lost_msg_obj(dev, IF_NAPI, obj, ctrl);</div><div class='ctx'> </div><div class='ctx'> 			pkts += n;</div><div class='ctx'> 			quota -= n;</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * This really should not happen, but this covers some</div><div class='add'>+		/* This really should not happen, but this covers some</div><div class='ctx'> 		 * odd HW behaviour. Do not remove that unless you</div><div class='ctx'> 		 * want to brick your machine.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -804,7 +843,7 @@ static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* read the data from the message object */</div><div class='del'>-		c_can_read_msg_object(dev, IF_RX, ctrl);</div><div class='add'>+		c_can_read_msg_object(dev, IF_NAPI, ctrl);</div><div class='ctx'> </div><div class='ctx'> 		c_can_rx_finalize(dev, priv, obj);</div><div class='ctx'> </div><div class='hunk'>@@ -817,19 +856,22 @@ static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv,</div><div class='ctx'> </div><div class='ctx'> static inline u32 c_can_get_pending(struct c_can_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	u32 pend = priv-&gt;read_reg(priv, C_CAN_NEWDAT1_REG);</div><div class='add'>+	u32 pend;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;msg_obj_rx_last &gt; 16)</div><div class='add'>+		pend = priv-&gt;read_reg32(priv, C_CAN_NEWDAT1_REG);</div><div class='add'>+	else</div><div class='add'>+		pend = priv-&gt;read_reg(priv, C_CAN_NEWDAT1_REG);</div><div class='ctx'> </div><div class='ctx'> 	return pend;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * theory of operation:</div><div class='add'>+/* theory of operation:</div><div class='ctx'>  *</div><div class='ctx'>  * c_can core saves a received CAN message into the first free message</div><div class='ctx'>  * object it finds free (starting with the lowest). Bits NEWDAT and</div><div class='ctx'>  * INTPND are set for this message object indicating that a new message</div><div class='del'>- * has arrived. To work-around this issue, we keep two groups of message</div><div class='del'>- * objects whose partitioning is defined by C_CAN_MSG_OBJ_RX_SPLIT.</div><div class='add'>+ * has arrived.</div><div class='ctx'>  *</div><div class='ctx'>  * We clear the newdat bit right away.</div><div class='ctx'>  *</div><div class='hunk'>@@ -840,23 +882,16 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 pkts = 0, pend = 0, toread, n;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * It is faster to read only one 16bit register. This is only possible</div><div class='del'>-	 * for a maximum number of 16 objects.</div><div class='del'>-	 */</div><div class='del'>-	BUILD_BUG_ON_MSG(C_CAN_MSG_OBJ_RX_LAST &gt; 16,</div><div class='del'>-			"Implementation does not support more message objects than 16");</div><div class='del'>-</div><div class='ctx'> 	while (quota &gt; 0) {</div><div class='ctx'> 		if (!pend) {</div><div class='ctx'> 			pend = c_can_get_pending(priv);</div><div class='ctx'> 			if (!pend)</div><div class='ctx'> 				break;</div><div class='del'>-			/*</div><div class='del'>-			 * If the pending field has a gap, handle the</div><div class='add'>+			/* If the pending field has a gap, handle the</div><div class='ctx'> 			 * bits above the gap first.</div><div class='ctx'> 			 */</div><div class='del'>-			toread = c_can_adjust_pending(pend);</div><div class='add'>+			toread = c_can_adjust_pending(pend,</div><div class='add'>+						      priv-&gt;msg_obj_rx_mask);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			toread = pend;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -868,24 +903,23 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota)</div><div class='ctx'> 		quota -= n;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pkts)</div><div class='del'>-		can_led_event(dev, CAN_LED_EVENT_RX);</div><div class='del'>-</div><div class='ctx'> 	return pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int c_can_handle_state_change(struct net_device *dev,</div><div class='del'>-				enum c_can_bus_error_types error_type)</div><div class='add'>+				     enum c_can_bus_error_types error_type)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int reg_err_counter;</div><div class='ctx'> 	unsigned int rx_err_passive;</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='ctx'> </div><div class='ctx'> 	switch (error_type) {</div><div class='add'>+	case C_CAN_NO_ERROR:</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		break;</div><div class='ctx'> 	case C_CAN_ERROR_WARNING:</div><div class='ctx'> 		/* error warning state */</div><div class='ctx'> 		priv-&gt;can.can_stats.error_warning++;</div><div class='hunk'>@@ -916,9 +950,15 @@ static int c_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> 				ERR_CNT_RP_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	switch (error_type) {</div><div class='add'>+	case C_CAN_NO_ERROR:</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[1] = CAN_ERR_CRTL_ACTIVE;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+		break;</div><div class='ctx'> 	case C_CAN_ERROR_WARNING:</div><div class='ctx'> 		/* error warning state */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[1] = (bec.txerr &gt; bec.rxerr) ?</div><div class='ctx'> 			CAN_ERR_CRTL_TX_WARNING :</div><div class='ctx'> 			CAN_ERR_CRTL_RX_WARNING;</div><div class='hunk'>@@ -928,7 +968,7 @@ static int c_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case C_CAN_ERROR_PASSIVE:</div><div class='ctx'> 		/* error passive state */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		if (rx_err_passive)</div><div class='ctx'> 			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_PASSIVE;</div><div class='ctx'> 		if (bec.txerr &gt; 127)</div><div class='hunk'>@@ -946,8 +986,6 @@ static int c_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -961,8 +999,7 @@ static int c_can_handle_bus_err(struct net_device *dev,</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * early exit if no lec update or no error.</div><div class='add'>+	/* early exit if no lec update or no error.</div><div class='ctx'> 	 * no lec update means that no CAN bus event has been detected</div><div class='ctx'> 	 * since CPU wrote 0x7 value to status reg.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -974,50 +1011,60 @@ static int c_can_handle_bus_err(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* common for all type of bus errors */</div><div class='ctx'> 	priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='ctx'> </div><div class='ctx'> 	/* propagate the error condition to the CAN stack */</div><div class='ctx'> 	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * check for 'last error code' which tells us the</div><div class='add'>+	/* check for 'last error code' which tells us the</div><div class='ctx'> 	 * type of the last error to occur on the CAN bus</div><div class='ctx'> 	 */</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+	if (likely(skb))</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='ctx'> 	switch (lec_type) {</div><div class='ctx'> 	case LEC_STUFF_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "stuff error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_FORM_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "form error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_ACK_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "ack error\n");</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_BIT1_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "bit1 error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_BIT0_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "bit0 error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_CRC_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "CRC error\n");</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -1029,10 +1076,17 @@ static int c_can_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> 	u16 curr, last = priv-&gt;last_status;</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;last_status = curr = priv-&gt;read_reg(priv, C_CAN_STS_REG);</div><div class='del'>-	/* Ack status on C_CAN. D_CAN is self clearing */</div><div class='del'>-	if (priv-&gt;type != BOSCH_D_CAN)</div><div class='del'>-		priv-&gt;write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);</div><div class='add'>+	/* Only read the status register if a status interrupt was pending */</div><div class='add'>+	if (atomic_xchg(&amp;priv-&gt;sie_pending, 0)) {</div><div class='add'>+		priv-&gt;last_status = priv-&gt;read_reg(priv, C_CAN_STS_REG);</div><div class='add'>+		curr = priv-&gt;last_status;</div><div class='add'>+		/* Ack status on C_CAN. D_CAN is self clearing */</div><div class='add'>+		if (priv-&gt;type != BOSCH_D_CAN)</div><div class='add'>+			priv-&gt;write_reg(priv, C_CAN_STS_REG, LEC_UNUSED);</div><div class='add'>+	} else {</div><div class='add'>+		/* no change detected ... */</div><div class='add'>+		curr = last;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* handle state changes */</div><div class='ctx'> 	if ((curr &amp; STATUS_EWARN) &amp;&amp; (!(last &amp; STATUS_EWARN))) {</div><div class='hunk'>@@ -1054,11 +1108,17 @@ static int c_can_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> 	/* handle bus recovery events */</div><div class='ctx'> 	if ((!(curr &amp; STATUS_BOFF)) &amp;&amp; (last &amp; STATUS_BOFF)) {</div><div class='ctx'> 		netdev_dbg(dev, "left bus off state\n");</div><div class='del'>-		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		work_done += c_can_handle_state_change(dev, C_CAN_ERROR_PASSIVE);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if ((!(curr &amp; STATUS_EPASS)) &amp;&amp; (last &amp; STATUS_EPASS)) {</div><div class='ctx'> 		netdev_dbg(dev, "left error passive state\n");</div><div class='del'>-		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		work_done += c_can_handle_state_change(dev, C_CAN_ERROR_WARNING);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((!(curr &amp; STATUS_EWARN)) &amp;&amp; (last &amp; STATUS_EWARN)) {</div><div class='add'>+		netdev_dbg(dev, "left error warning state\n");</div><div class='add'>+		work_done += c_can_handle_state_change(dev, C_CAN_NO_ERROR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* handle lec errors on the bus */</div><div class='hunk'>@@ -1083,10 +1143,16 @@ static irqreturn_t c_can_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = (struct net_device *)dev_id;</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	int reg_int;</div><div class='ctx'> </div><div class='del'>-	if (!priv-&gt;read_reg(priv, C_CAN_INT_REG))</div><div class='add'>+	reg_int = priv-&gt;read_reg(priv, C_CAN_INT_REG);</div><div class='add'>+	if (!reg_int)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='add'>+	/* save for later use */</div><div class='add'>+	if (reg_int &amp; INT_STS_PENDING)</div><div class='add'>+		atomic_set(&amp;priv-&gt;sie_pending, 1);</div><div class='add'>+</div><div class='ctx'> 	/* disable all interrupts and schedule the NAPI */</div><div class='ctx'> 	c_can_irq_control(priv, false);</div><div class='ctx'> 	napi_schedule(&amp;priv-&gt;napi);</div><div class='hunk'>@@ -1111,7 +1177,7 @@ static int c_can_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* register interrupt handler */</div><div class='ctx'> 	err = request_irq(dev-&gt;irq, &amp;c_can_isr, IRQF_SHARED, dev-&gt;name,</div><div class='del'>-				dev);</div><div class='add'>+			  dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "failed to request interrupt\n");</div><div class='ctx'> 		goto exit_irq_fail;</div><div class='hunk'>@@ -1122,8 +1188,6 @@ static int c_can_open(struct net_device *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto exit_start_fail;</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_OPEN);</div><div class='del'>-</div><div class='ctx'> 	napi_enable(&amp;priv-&gt;napi);</div><div class='ctx'> 	/* enable status change, error and module interrupts */</div><div class='ctx'> 	c_can_irq_control(priv, true);</div><div class='hunk'>@@ -1154,22 +1218,38 @@ static int c_can_close(struct net_device *dev)</div><div class='ctx'> 	c_can_reset_ram(priv, false);</div><div class='ctx'> 	c_can_pm_runtime_put_sync(priv);</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct net_device *alloc_c_can_dev(void)</div><div class='add'>+struct net_device *alloc_c_can_dev(int msg_obj_num)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct c_can_priv *priv;</div><div class='add'>+	int msg_obj_tx_num = msg_obj_num / 2;</div><div class='ctx'> </div><div class='del'>-	dev = alloc_candev(sizeof(struct c_can_priv), C_CAN_MSG_OBJ_TX_NUM);</div><div class='add'>+	dev = alloc_candev(sizeof(*priv), msg_obj_tx_num);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, c_can_poll, C_CAN_NAPI_WEIGHT);</div><div class='add'>+	priv-&gt;msg_obj_num = msg_obj_num;</div><div class='add'>+	priv-&gt;msg_obj_rx_num = msg_obj_num - msg_obj_tx_num;</div><div class='add'>+	priv-&gt;msg_obj_rx_first = 1;</div><div class='add'>+	priv-&gt;msg_obj_rx_last =</div><div class='add'>+		priv-&gt;msg_obj_rx_first + priv-&gt;msg_obj_rx_num - 1;</div><div class='add'>+	priv-&gt;msg_obj_rx_mask = GENMASK(priv-&gt;msg_obj_rx_num - 1, 0);</div><div class='add'>+</div><div class='add'>+	priv-&gt;msg_obj_tx_num = msg_obj_tx_num;</div><div class='add'>+	priv-&gt;msg_obj_tx_first = priv-&gt;msg_obj_rx_last + 1;</div><div class='add'>+	priv-&gt;msg_obj_tx_last =</div><div class='add'>+		priv-&gt;msg_obj_tx_first + priv-&gt;msg_obj_tx_num - 1;</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx.head = 0;</div><div class='add'>+	priv-&gt;tx.tail = 0;</div><div class='add'>+	priv-&gt;tx.obj_num = msg_obj_tx_num;</div><div class='add'>+</div><div class='add'>+	netif_napi_add_weight(dev, &amp;priv-&gt;napi, c_can_poll,</div><div class='add'>+			      priv-&gt;msg_obj_rx_num);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> 	priv-&gt;can.bittiming_const = &amp;c_can_bittiming_const;</div><div class='hunk'>@@ -1203,7 +1283,7 @@ int c_can_power_down(struct net_device *dev)</div><div class='ctx'> 	/* Wait for the PDA bit to get set */</div><div class='ctx'> 	time_out = jiffies + msecs_to_jiffies(INIT_WAIT_MS);</div><div class='ctx'> 	while (!(priv-&gt;read_reg(priv, C_CAN_STS_REG) &amp; STATUS_PDA) &amp;&amp;</div><div class='del'>-				time_after(time_out, jiffies))</div><div class='add'>+	       time_after(time_out, jiffies))</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='ctx'> 	if (time_after(jiffies, time_out))</div><div class='hunk'>@@ -1244,15 +1324,25 @@ int c_can_power_up(struct net_device *dev)</div><div class='ctx'> 	/* Wait for the PDA bit to get clear */</div><div class='ctx'> 	time_out = jiffies + msecs_to_jiffies(INIT_WAIT_MS);</div><div class='ctx'> 	while ((priv-&gt;read_reg(priv, C_CAN_STS_REG) &amp; STATUS_PDA) &amp;&amp;</div><div class='del'>-				time_after(time_out, jiffies))</div><div class='add'>+	       time_after(time_out, jiffies))</div><div class='ctx'> 		cpu_relax();</div><div class='ctx'> </div><div class='del'>-	if (time_after(jiffies, time_out))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='add'>+	if (time_after(jiffies, time_out)) {</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ret = c_can_start(dev);</div><div class='del'>-	if (!ret)</div><div class='del'>-		c_can_irq_control(priv, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	c_can_irq_control(priv, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	c_can_reset_ram(priv, false);</div><div class='add'>+	c_can_pm_runtime_put_sync(priv);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1272,14 +1362,10 @@ static const struct net_device_ops c_can_netdev_ops = {</div><div class='ctx'> 	.ndo_open = c_can_open,</div><div class='ctx'> 	.ndo_stop = c_can_close,</div><div class='ctx'> 	.ndo_start_xmit = c_can_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int register_c_can_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct c_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='ctx'> 	/* Deactivate pins to prevent DRA7 DCAN IP from being</div><div class='ctx'> 	 * stuck in transition when module is disabled.</div><div class='ctx'> 	 * Pins are activated in c_can_start() and deactivated</div><div class='hunk'>@@ -1287,28 +1373,17 @@ int register_c_can_dev(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	pinctrl_pm_select_sleep_state(dev-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	c_can_pm_runtime_enable(priv);</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;c_can_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;c_can_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	err = register_candev(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		c_can_pm_runtime_disable(priv);</div><div class='del'>-	else</div><div class='del'>-		devm_can_led_init(dev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return register_candev(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(register_c_can_dev);</div><div class='ctx'> </div><div class='ctx'> void unregister_c_can_dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct c_can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='ctx'> 	unregister_candev(dev);</div><div class='del'>-</div><div class='del'>-	c_can_pm_runtime_disable(priv);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(unregister_c_can_dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c<br/>index 406b4847e5dc..093bea597f4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can_pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can_pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/c_can_pci.c</a></div><div class='hunk'>@@ -31,6 +31,8 @@ enum c_can_pci_reg_align {</div><div class='ctx'> struct c_can_pci_data {</div><div class='ctx'> 	/* Specify if is C_CAN or D_CAN */</div><div class='ctx'> 	enum c_can_dev_id type;</div><div class='add'>+	/* Number of message objects */</div><div class='add'>+	unsigned int msg_obj_num;</div><div class='ctx'> 	/* Set the register alignment in the memory */</div><div class='ctx'> 	enum c_can_pci_reg_align reg_align;</div><div class='ctx'> 	/* Set the frequency */</div><div class='hunk'>@@ -41,32 +43,31 @@ struct c_can_pci_data {</div><div class='ctx'> 	void (*init)(const struct c_can_priv *priv, bool enable);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * 16-bit c_can registers can be arranged differently in the memory</div><div class='add'>+/* 16-bit c_can registers can be arranged differently in the memory</div><div class='ctx'>  * architecture of different implementations. For example: 16-bit</div><div class='ctx'>  * registers can be aligned to a 16-bit boundary or 32-bit boundary etc.</div><div class='ctx'>  * Handle the same by providing a common read/write interface.</div><div class='ctx'>  */</div><div class='ctx'> static u16 c_can_pci_read_reg_aligned_to_16bit(const struct c_can_priv *priv,</div><div class='del'>-						enum reg index)</div><div class='add'>+					       enum reg index)</div><div class='ctx'> {</div><div class='ctx'> 	return readw(priv-&gt;base + priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c_can_pci_write_reg_aligned_to_16bit(const struct c_can_priv *priv,</div><div class='del'>-						enum reg index, u16 val)</div><div class='add'>+						 enum reg index, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	writew(val, priv-&gt;base + priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 c_can_pci_read_reg_aligned_to_32bit(const struct c_can_priv *priv,</div><div class='del'>-						enum reg index)</div><div class='add'>+					       enum reg index)</div><div class='ctx'> {</div><div class='ctx'> 	return readw(priv-&gt;base + 2 * priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c_can_pci_write_reg_aligned_to_32bit(const struct c_can_priv *priv,</div><div class='del'>-						enum reg index, u16 val)</div><div class='add'>+						 enum reg index, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	writew(val, priv-&gt;base + 2 * priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='hunk'>@@ -88,13 +89,13 @@ static u32 c_can_pci_read_reg32(const struct c_can_priv *priv, enum reg index)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = priv-&gt;read_reg(priv, index);</div><div class='del'>-	val |= ((u32) priv-&gt;read_reg(priv, index + 1)) &lt;&lt; 16;</div><div class='add'>+	val |= ((u32)priv-&gt;read_reg(priv, index + 1)) &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c_can_pci_write_reg32(const struct c_can_priv *priv, enum reg index,</div><div class='del'>-		u32 val)</div><div class='add'>+				  u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	priv-&gt;write_reg(priv, index + 1, val &gt;&gt; 16);</div><div class='ctx'> 	priv-&gt;write_reg(priv, index, val);</div><div class='hunk'>@@ -142,14 +143,13 @@ static int c_can_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			 pci_resource_len(pdev, c_can_pci_data-&gt;bar));</div><div class='ctx'> 	if (!addr) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"device has no PCI memory resources, "</div><div class='del'>-			"failing adapter\n");</div><div class='add'>+			"device has no PCI memory resources, failing adapter\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_release_regions;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* allocate the c_can device */</div><div class='del'>-	dev = alloc_c_can_dev();</div><div class='add'>+	dev = alloc_c_can_dev(c_can_pci_data-&gt;msg_obj_num);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_iounmap;</div><div class='hunk'>@@ -217,7 +217,7 @@ static int c_can_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "%s device registered (regs=%p, irq=%d)\n",</div><div class='del'>-		 KBUILD_MODNAME, priv-&gt;regs, dev-&gt;irq);</div><div class='add'>+		KBUILD_MODNAME, priv-&gt;regs, dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -227,7 +227,6 @@ out_iounmap:</div><div class='ctx'> 	pci_iounmap(pdev, addr);</div><div class='ctx'> out_release_regions:</div><div class='ctx'> 	pci_disable_msi(pdev);</div><div class='del'>-	pci_clear_master(pdev);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> out_disable_device:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -239,20 +238,21 @@ static void c_can_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct c_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	void __iomem *addr = priv-&gt;base;</div><div class='ctx'> </div><div class='ctx'> 	unregister_c_can_dev(dev);</div><div class='ctx'> </div><div class='ctx'> 	free_c_can_dev(dev);</div><div class='ctx'> </div><div class='del'>-	pci_iounmap(pdev, priv-&gt;base);</div><div class='add'>+	pci_iounmap(pdev, addr);</div><div class='ctx'> 	pci_disable_msi(pdev);</div><div class='del'>-	pci_clear_master(pdev);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct c_can_pci_data c_can_sta2x11= {</div><div class='add'>+static const struct c_can_pci_data c_can_sta2x11 = {</div><div class='ctx'> 	.type = BOSCH_C_CAN,</div><div class='add'>+	.msg_obj_num = 32,</div><div class='ctx'> 	.reg_align = C_CAN_REG_ALIGN_32,</div><div class='ctx'> 	.freq = 52000000, /* 52 Mhz */</div><div class='ctx'> 	.bar = 0,</div><div class='hunk'>@@ -260,6 +260,7 @@ static const struct c_can_pci_data c_can_sta2x11= {</div><div class='ctx'> </div><div class='ctx'> static const struct c_can_pci_data c_can_pch = {</div><div class='ctx'> 	.type = BOSCH_C_CAN,</div><div class='add'>+	.msg_obj_num = 32,</div><div class='ctx'> 	.reg_align = C_CAN_REG_32,</div><div class='ctx'> 	.freq = 50000000, /* 50 MHz */</div><div class='ctx'> 	.init = c_can_pci_reset_pch,</div><div class='hunk'>@@ -268,7 +269,7 @@ static const struct c_can_pci_data c_can_pch = {</div><div class='ctx'> </div><div class='ctx'> #define C_CAN_ID(_vend, _dev, _driverdata) {		\</div><div class='ctx'> 	PCI_DEVICE(_vend, _dev),			\</div><div class='del'>-	.driver_data = (unsigned long)&amp;_driverdata,	\</div><div class='add'>+	.driver_data = (unsigned long)&amp;(_driverdata),	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id c_can_pci_tbl[] = {</div><div class='hunk'>@@ -278,6 +279,7 @@ static const struct pci_device_id c_can_pci_tbl[] = {</div><div class='ctx'> 		 c_can_pch),</div><div class='ctx'> 	{},</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> static struct pci_driver c_can_pci_driver = {</div><div class='ctx'> 	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.id_table = c_can_pci_tbl,</div><div class='head'>diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c<br/>index b5145a7f874c..19c86b94a40e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can_platform.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/c_can/c_can_platform.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/c_can/c_can_platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/c_can/c_can_platform.c</a></div><div class='hunk'>@@ -29,9 +29,10 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -39,10 +40,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "c_can.h"</div><div class='ctx'> </div><div class='del'>-#define DCAN_RAM_INIT_BIT		(1 &lt;&lt; 3)</div><div class='add'>+#define DCAN_RAM_INIT_BIT BIT(3)</div><div class='add'>+</div><div class='ctx'> static DEFINE_SPINLOCK(raminit_lock);</div><div class='del'>-/*</div><div class='del'>- * 16-bit c_can registers can be arranged differently in the memory</div><div class='add'>+</div><div class='add'>+/* 16-bit c_can registers can be arranged differently in the memory</div><div class='ctx'>  * architecture of different implementations. For example: 16-bit</div><div class='ctx'>  * registers can be aligned to a 16-bit boundary or 32-bit boundary etc.</div><div class='ctx'>  * Handle the same by providing a common read/write interface.</div><div class='hunk'>@@ -54,7 +56,7 @@ static u16 c_can_plat_read_reg_aligned_to_16bit(const struct c_can_priv *priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c_can_plat_write_reg_aligned_to_16bit(const struct c_can_priv *priv,</div><div class='del'>-						enum reg index, u16 val)</div><div class='add'>+						  enum reg index, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	writew(val, priv-&gt;base + priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='hunk'>@@ -66,7 +68,7 @@ static u16 c_can_plat_read_reg_aligned_to_32bit(const struct c_can_priv *priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void c_can_plat_write_reg_aligned_to_32bit(const struct c_can_priv *priv,</div><div class='del'>-						enum reg index, u16 val)</div><div class='add'>+						  enum reg index, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	writew(val, priv-&gt;base + 2 * priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='hunk'>@@ -144,13 +146,13 @@ static u32 c_can_plat_read_reg32(const struct c_can_priv *priv, enum reg index)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = priv-&gt;read_reg(priv, index);</div><div class='del'>-	val |= ((u32) priv-&gt;read_reg(priv, index + 1)) &lt;&lt; 16;</div><div class='add'>+	val |= ((u32)priv-&gt;read_reg(priv, index + 1)) &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void c_can_plat_write_reg32(const struct c_can_priv *priv, enum reg index,</div><div class='del'>-		u32 val)</div><div class='add'>+static void c_can_plat_write_reg32(const struct c_can_priv *priv,</div><div class='add'>+				   enum reg index, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	priv-&gt;write_reg(priv, index + 1, val &gt;&gt; 16);</div><div class='ctx'> 	priv-&gt;write_reg(priv, index, val);</div><div class='hunk'>@@ -161,8 +163,8 @@ static u32 d_can_plat_read_reg32(const struct c_can_priv *priv, enum reg index)</div><div class='ctx'> 	return readl(priv-&gt;base + priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void d_can_plat_write_reg32(const struct c_can_priv *priv, enum reg index,</div><div class='del'>-		u32 val)</div><div class='add'>+static void d_can_plat_write_reg32(const struct c_can_priv *priv,</div><div class='add'>+				   enum reg index, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	writel(val, priv-&gt;base + priv-&gt;regs[index]);</div><div class='ctx'> }</div><div class='hunk'>@@ -191,10 +193,12 @@ static void c_can_hw_raminit(const struct c_can_priv *priv, bool enable)</div><div class='ctx'> </div><div class='ctx'> static const struct c_can_driver_data c_can_drvdata = {</div><div class='ctx'> 	.id = BOSCH_C_CAN,</div><div class='add'>+	.msg_obj_num = 32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct c_can_driver_data d_can_drvdata = {</div><div class='ctx'> 	.id = BOSCH_D_CAN,</div><div class='add'>+	.msg_obj_num = 32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct raminit_bits dra7_raminit_bits[] = {</div><div class='hunk'>@@ -204,6 +208,7 @@ static const struct raminit_bits dra7_raminit_bits[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct c_can_driver_data dra7_dcan_drvdata = {</div><div class='ctx'> 	.id = BOSCH_D_CAN,</div><div class='add'>+	.msg_obj_num = 64,</div><div class='ctx'> 	.raminit_num = ARRAY_SIZE(dra7_raminit_bits),</div><div class='ctx'> 	.raminit_bits = dra7_raminit_bits,</div><div class='ctx'> 	.raminit_pulse = true,</div><div class='hunk'>@@ -216,6 +221,7 @@ static const struct raminit_bits am3352_raminit_bits[] = {</div><div class='ctx'> </div><div class='ctx'> static const struct c_can_driver_data am3352_dcan_drvdata = {</div><div class='ctx'> 	.id = BOSCH_D_CAN,</div><div class='add'>+	.msg_obj_num = 64,</div><div class='ctx'> 	.raminit_num = ARRAY_SIZE(am3352_raminit_bits),</div><div class='ctx'> 	.raminit_bits = am3352_raminit_bits,</div><div class='ctx'> };</div><div class='hunk'>@@ -253,50 +259,32 @@ static int c_can_plat_probe(struct platform_device *pdev)</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct c_can_priv *priv;</div><div class='del'>-	const struct of_device_id *match;</div><div class='ctx'> 	struct resource *mem;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	const struct c_can_driver_data *drvdata;</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> </div><div class='del'>-	match = of_match_device(c_can_of_table, &amp;pdev-&gt;dev);</div><div class='del'>-	if (match) {</div><div class='del'>-		drvdata = match-&gt;data;</div><div class='del'>-	} else if (pdev-&gt;id_entry-&gt;driver_data) {</div><div class='del'>-		drvdata = (struct c_can_driver_data *)</div><div class='del'>-			platform_get_device_id(pdev)-&gt;driver_data;</div><div class='del'>-	} else {</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	drvdata = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	/* get the appropriate clk */</div><div class='ctx'> 	clk = devm_clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		ret = PTR_ERR(clk);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return PTR_ERR(clk);</div><div class='ctx'> </div><div class='ctx'> 	/* get the platform data */</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (irq &lt;= 0) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	addr = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='del'>-	if (IS_ERR(addr)) {</div><div class='del'>-		ret =  PTR_ERR(addr);</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	addr = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;mem);</div><div class='add'>+	if (IS_ERR(addr))</div><div class='add'>+		return PTR_ERR(addr);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate the c_can device */</div><div class='del'>-	dev = alloc_c_can_dev();</div><div class='del'>-	if (!dev) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto exit;</div><div class='del'>-	}</div><div class='add'>+	dev = alloc_c_can_dev(drvdata-&gt;msg_obj_num);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	switch (drvdata-&gt;id) {</div><div class='hunk'>@@ -328,33 +316,22 @@ static int c_can_plat_probe(struct platform_device *pdev)</div><div class='ctx'> 		/* Check if we need custom RAMINIT via syscon. Mostly for TI</div><div class='ctx'> 		 * platforms. Only supported with DT boot.</div><div class='ctx'> 		 */</div><div class='del'>-		if (np &amp;&amp; of_property_read_bool(np, "syscon-raminit")) {</div><div class='add'>+		if (np &amp;&amp; of_property_present(np, "syscon-raminit")) {</div><div class='add'>+			unsigned int args[2];</div><div class='ctx'> 			u32 id;</div><div class='ctx'> 			struct c_can_raminit *raminit = &amp;priv-&gt;raminit_sys;</div><div class='ctx'> </div><div class='ctx'> 			ret = -EINVAL;</div><div class='del'>-			raminit-&gt;syscon = syscon_regmap_lookup_by_phandle(np,</div><div class='del'>-									  "syscon-raminit");</div><div class='add'>+			raminit-&gt;syscon = syscon_regmap_lookup_by_phandle_args(np,</div><div class='add'>+									       "syscon-raminit",</div><div class='add'>+									       2, args);</div><div class='ctx'> 			if (IS_ERR(raminit-&gt;syscon)) {</div><div class='del'>-				/* can fail with -EPROBE_DEFER */</div><div class='ctx'> 				ret = PTR_ERR(raminit-&gt;syscon);</div><div class='del'>-				free_c_can_dev(dev);</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (of_property_read_u32_index(np, "syscon-raminit", 1,</div><div class='del'>-						       &amp;raminit-&gt;reg)) {</div><div class='del'>-				dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-					"couldn't get the RAMINIT reg. offset!\n");</div><div class='ctx'> 				goto exit_free_device;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (of_property_read_u32_index(np, "syscon-raminit", 2,</div><div class='del'>-						       &amp;id)) {</div><div class='del'>-				dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-					"couldn't get the CAN instance ID\n");</div><div class='del'>-				goto exit_free_device;</div><div class='del'>-			}</div><div class='add'>+			raminit-&gt;reg = args[0];</div><div class='add'>+			id = args[1];</div><div class='ctx'> </div><div class='ctx'> 			if (id &gt;= drvdata-&gt;raminit_num) {</div><div class='ctx'> 				dev_err(&amp;pdev-&gt;dev,</div><div class='hunk'>@@ -379,40 +356,39 @@ static int c_can_plat_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;base = addr;</div><div class='ctx'> 	priv-&gt;device = &amp;pdev-&gt;dev;</div><div class='ctx'> 	priv-&gt;can.clock.freq = clk_get_rate(clk);</div><div class='del'>-	priv-&gt;priv = clk;</div><div class='ctx'> 	priv-&gt;type = drvdata-&gt;id;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	pm_runtime_enable(priv-&gt;device);</div><div class='ctx'> 	ret = register_c_can_dev(dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "registering %s failed (err=%d)\n",</div><div class='ctx'> 			KBUILD_MODNAME, ret);</div><div class='del'>-		goto exit_free_device;</div><div class='add'>+		goto exit_pm_runtime;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "%s device registered (regs=%p, irq=%d)\n",</div><div class='ctx'> 		 KBUILD_MODNAME, priv-&gt;base, dev-&gt;irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+exit_pm_runtime:</div><div class='add'>+	pm_runtime_disable(priv-&gt;device);</div><div class='ctx'> exit_free_device:</div><div class='ctx'> 	free_c_can_dev(dev);</div><div class='del'>-exit:</div><div class='del'>-	dev_err(&amp;pdev-&gt;dev, "probe failed\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int c_can_plat_remove(struct platform_device *pdev)</div><div class='add'>+static void c_can_plat_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+	struct c_can_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_c_can_dev(dev);</div><div class='del'>-</div><div class='add'>+	pm_runtime_disable(priv-&gt;device);</div><div class='ctx'> 	free_c_can_dev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='head'>diff --git a/drivers/net/can/can327.c b/drivers/net/can/can327.c<br/>new file mode 100644<br/>index 000000000000..b66fc16aedd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/can327.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/can327.c</a></div><div class='hunk'>@@ -0,0 +1,1141 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* ELM327 based CAN interface driver (tty line discipline)</div><div class='add'>+ *</div><div class='add'>+ * This driver started as a derivative of linux/drivers/net/can/slcan.c</div><div class='add'>+ * and my thanks go to the original authors for their inspiration.</div><div class='add'>+ *</div><div class='add'>+ * can327.c Author : Max Staudt &lt;max-linux@enpas.org&gt;</div><div class='add'>+ * slcan.c Author  : Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='add'>+ * slip.c Authors  : Laurence Culhane &lt;loz@holmes.demon.co.uk&gt;</div><div class='add'>+ *                   Fred N. van Kempen &lt;waltje@uwalt.nl.mugnet.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/tty_ldisc.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;uapi/linux/tty.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+</div><div class='add'>+#define CAN327_NAPI_WEIGHT 4</div><div class='add'>+</div><div class='add'>+#define CAN327_SIZE_TXBUF 32</div><div class='add'>+#define CAN327_SIZE_RXBUF 1024</div><div class='add'>+</div><div class='add'>+#define CAN327_CAN_CONFIG_SEND_SFF 0x8000</div><div class='add'>+#define CAN327_CAN_CONFIG_VARIABLE_DLC 0x4000</div><div class='add'>+#define CAN327_CAN_CONFIG_RECV_BOTH_SFF_EFF 0x2000</div><div class='add'>+#define CAN327_CAN_CONFIG_BAUDRATE_MULT_8_7 0x1000</div><div class='add'>+</div><div class='add'>+#define CAN327_DUMMY_CHAR 'y'</div><div class='add'>+#define CAN327_DUMMY_STRING "y"</div><div class='add'>+#define CAN327_READY_CHAR '&gt;'</div><div class='add'>+</div><div class='add'>+/* Bits in elm-&gt;cmds_todo */</div><div class='add'>+enum can327_tx_do {</div><div class='add'>+	CAN327_TX_DO_CAN_DATA = 0,</div><div class='add'>+	CAN327_TX_DO_CANID_11BIT,</div><div class='add'>+	CAN327_TX_DO_CANID_29BIT_LOW,</div><div class='add'>+	CAN327_TX_DO_CANID_29BIT_HIGH,</div><div class='add'>+	CAN327_TX_DO_CAN_CONFIG_PART2,</div><div class='add'>+	CAN327_TX_DO_CAN_CONFIG,</div><div class='add'>+	CAN327_TX_DO_RESPONSES,</div><div class='add'>+	CAN327_TX_DO_SILENT_MONITOR,</div><div class='add'>+	CAN327_TX_DO_INIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct can327 {</div><div class='add'>+	/* This must be the first member when using alloc_candev() */</div><div class='add'>+	struct can_priv can;</div><div class='add'>+</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+</div><div class='add'>+	/* TTY buffers */</div><div class='add'>+	u8 txbuf[CAN327_SIZE_TXBUF];</div><div class='add'>+	u8 rxbuf[CAN327_SIZE_RXBUF];</div><div class='add'>+</div><div class='add'>+	/* Per-channel lock */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* TTY and netdev devices that we're bridging */</div><div class='add'>+	struct tty_struct *tty;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+</div><div class='add'>+	/* TTY buffer accounting */</div><div class='add'>+	struct work_struct tx_work;	/* Flushes TTY TX buffer */</div><div class='add'>+	u8 *txhead;			/* Next TX byte */</div><div class='add'>+	size_t txleft;			/* Bytes left to TX */</div><div class='add'>+	int rxfill;			/* Bytes already RX'd in buffer */</div><div class='add'>+</div><div class='add'>+	/* State machine */</div><div class='add'>+	enum {</div><div class='add'>+		CAN327_STATE_NOTINIT = 0,</div><div class='add'>+		CAN327_STATE_GETDUMMYCHAR,</div><div class='add'>+		CAN327_STATE_GETPROMPT,</div><div class='add'>+		CAN327_STATE_RECEIVING,</div><div class='add'>+	} state;</div><div class='add'>+</div><div class='add'>+	/* Things we have yet to send */</div><div class='add'>+	char **next_init_cmd;</div><div class='add'>+	unsigned long cmds_todo;</div><div class='add'>+</div><div class='add'>+	/* The CAN frame and config the ELM327 is sending/using,</div><div class='add'>+	 * or will send/use after finishing all cmds_todo</div><div class='add'>+	 */</div><div class='add'>+	struct can_frame can_frame_to_send;</div><div class='add'>+	u16 can_config;</div><div class='add'>+	u8 can_bitrate_divisor;</div><div class='add'>+</div><div class='add'>+	/* Parser state */</div><div class='add'>+	bool drop_next_line;</div><div class='add'>+</div><div class='add'>+	/* Stop the channel on UART side hardware failure, e.g. stray</div><div class='add'>+	 * characters or neverending lines. This may be caused by bad</div><div class='add'>+	 * UART wiring, a bad ELM327, a bad UART bridge...</div><div class='add'>+	 * Once this is true, nothing will be sent to the TTY.</div><div class='add'>+	 */</div><div class='add'>+	bool uart_side_failure;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void can327_uart_side_failure(struct can327 *elm);</div><div class='add'>+</div><div class='add'>+static void can327_send(struct can327 *elm, const void *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	int written;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (elm-&gt;uart_side_failure)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(elm-&gt;txbuf, buf, len);</div><div class='add'>+</div><div class='add'>+	/* Order of next two lines is *very* important.</div><div class='add'>+	 * When we are sending a little amount of data,</div><div class='add'>+	 * the transfer may be completed inside the ops-&gt;write()</div><div class='add'>+	 * routine, because it's running with interrupts enabled.</div><div class='add'>+	 * In this case we *never* got WRITE_WAKEUP event,</div><div class='add'>+	 * if we did not request it before write operation.</div><div class='add'>+	 *       14 Oct 1994  Dmitry Gorodchanin.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(TTY_DO_WRITE_WAKEUP, &amp;elm-&gt;tty-&gt;flags);</div><div class='add'>+	written = elm-&gt;tty-&gt;ops-&gt;write(elm-&gt;tty, elm-&gt;txbuf, len);</div><div class='add'>+	if (written &lt; 0) {</div><div class='add'>+		netdev_err(elm-&gt;dev, "Failed to write to tty %s.\n",</div><div class='add'>+			   elm-&gt;tty-&gt;name);</div><div class='add'>+		can327_uart_side_failure(elm);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	elm-&gt;txleft = len - written;</div><div class='add'>+	elm-&gt;txhead = elm-&gt;txbuf + written;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Take the ELM327 out of almost any state and back into command mode.</div><div class='add'>+ * We send CAN327_DUMMY_CHAR which will either abort any running</div><div class='add'>+ * operation, or be echoed back to us in case we're already in command</div><div class='add'>+ * mode.</div><div class='add'>+ */</div><div class='add'>+static void can327_kick_into_cmd_mode(struct can327 *elm)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (elm-&gt;state != CAN327_STATE_GETDUMMYCHAR &amp;&amp;</div><div class='add'>+	    elm-&gt;state != CAN327_STATE_GETPROMPT) {</div><div class='add'>+		can327_send(elm, CAN327_DUMMY_STRING, 1);</div><div class='add'>+</div><div class='add'>+		elm-&gt;state = CAN327_STATE_GETDUMMYCHAR;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Schedule a CAN frame and necessary config changes to be sent to the TTY. */</div><div class='add'>+static void can327_send_frame(struct can327 *elm, struct can_frame *frame)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Schedule any necessary changes in ELM327's CAN configuration */</div><div class='add'>+	if (elm-&gt;can_frame_to_send.can_id != frame-&gt;can_id) {</div><div class='add'>+		/* Set the new CAN ID for transmission. */</div><div class='add'>+		if ((frame-&gt;can_id ^ elm-&gt;can_frame_to_send.can_id)</div><div class='add'>+		    &amp; CAN_EFF_FLAG) {</div><div class='add'>+			elm-&gt;can_config =</div><div class='add'>+				(frame-&gt;can_id &amp; CAN_EFF_FLAG ? 0 : CAN327_CAN_CONFIG_SEND_SFF) |</div><div class='add'>+				CAN327_CAN_CONFIG_VARIABLE_DLC |</div><div class='add'>+				CAN327_CAN_CONFIG_RECV_BOTH_SFF_EFF |</div><div class='add'>+				elm-&gt;can_bitrate_divisor;</div><div class='add'>+</div><div class='add'>+			set_bit(CAN327_TX_DO_CAN_CONFIG, &amp;elm-&gt;cmds_todo);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (frame-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+			clear_bit(CAN327_TX_DO_CANID_11BIT, &amp;elm-&gt;cmds_todo);</div><div class='add'>+			set_bit(CAN327_TX_DO_CANID_29BIT_LOW, &amp;elm-&gt;cmds_todo);</div><div class='add'>+			set_bit(CAN327_TX_DO_CANID_29BIT_HIGH, &amp;elm-&gt;cmds_todo);</div><div class='add'>+		} else {</div><div class='add'>+			set_bit(CAN327_TX_DO_CANID_11BIT, &amp;elm-&gt;cmds_todo);</div><div class='add'>+			clear_bit(CAN327_TX_DO_CANID_29BIT_LOW,</div><div class='add'>+				  &amp;elm-&gt;cmds_todo);</div><div class='add'>+			clear_bit(CAN327_TX_DO_CANID_29BIT_HIGH,</div><div class='add'>+				  &amp;elm-&gt;cmds_todo);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Schedule the CAN frame itself. */</div><div class='add'>+	elm-&gt;can_frame_to_send = *frame;</div><div class='add'>+	set_bit(CAN327_TX_DO_CAN_DATA, &amp;elm-&gt;cmds_todo);</div><div class='add'>+</div><div class='add'>+	can327_kick_into_cmd_mode(elm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ELM327 initialisation sequence.</div><div class='add'>+ * The line length is limited by the buffer in can327_handle_prompt().</div><div class='add'>+ */</div><div class='add'>+static char *can327_init_script[] = {</div><div class='add'>+	"AT WS\r",        /* v1.0: Warm Start */</div><div class='add'>+	"AT PP FF OFF\r", /* v1.0: All Programmable Parameters Off */</div><div class='add'>+	"AT M0\r",        /* v1.0: Memory Off */</div><div class='add'>+	"AT AL\r",        /* v1.0: Allow Long messages */</div><div class='add'>+	"AT BI\r",        /* v1.0: Bypass Initialisation */</div><div class='add'>+	"AT CAF0\r",      /* v1.0: CAN Auto Formatting Off */</div><div class='add'>+	"AT CFC0\r",      /* v1.0: CAN Flow Control Off */</div><div class='add'>+	"AT CF 000\r",    /* v1.0: Reset CAN ID Filter */</div><div class='add'>+	"AT CM 000\r",    /* v1.0: Reset CAN ID Mask */</div><div class='add'>+	"AT E1\r",        /* v1.0: Echo On */</div><div class='add'>+	"AT H1\r",        /* v1.0: Headers On */</div><div class='add'>+	"AT L0\r",        /* v1.0: Linefeeds Off */</div><div class='add'>+	"AT SH 7DF\r",    /* v1.0: Set CAN sending ID to 0x7df */</div><div class='add'>+	"AT ST FF\r",     /* v1.0: Set maximum Timeout for response after TX */</div><div class='add'>+	"AT AT0\r",       /* v1.2: Adaptive Timing Off */</div><div class='add'>+	"AT D1\r",        /* v1.3: Print DLC On */</div><div class='add'>+	"AT S1\r",        /* v1.3: Spaces On */</div><div class='add'>+	"AT TP B\r",      /* v1.0: Try Protocol B */</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void can327_init_device(struct can327 *elm)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	elm-&gt;state = CAN327_STATE_NOTINIT;</div><div class='add'>+	elm-&gt;can_frame_to_send.can_id = 0x7df; /* ELM327 HW default */</div><div class='add'>+	elm-&gt;rxfill = 0;</div><div class='add'>+	elm-&gt;drop_next_line = 0;</div><div class='add'>+</div><div class='add'>+	/* We can only set the bitrate as a fraction of 500000.</div><div class='add'>+	 * The bitrates listed in can327_bitrate_const will</div><div class='add'>+	 * limit the user to the right values.</div><div class='add'>+	 */</div><div class='add'>+	elm-&gt;can_bitrate_divisor = 500000 / elm-&gt;can.bittiming.bitrate;</div><div class='add'>+	elm-&gt;can_config =</div><div class='add'>+		CAN327_CAN_CONFIG_SEND_SFF | CAN327_CAN_CONFIG_VARIABLE_DLC |</div><div class='add'>+		CAN327_CAN_CONFIG_RECV_BOTH_SFF_EFF | elm-&gt;can_bitrate_divisor;</div><div class='add'>+</div><div class='add'>+	/* Configure ELM327 and then start monitoring */</div><div class='add'>+	elm-&gt;next_init_cmd = &amp;can327_init_script[0];</div><div class='add'>+	set_bit(CAN327_TX_DO_INIT, &amp;elm-&gt;cmds_todo);</div><div class='add'>+	set_bit(CAN327_TX_DO_SILENT_MONITOR, &amp;elm-&gt;cmds_todo);</div><div class='add'>+	set_bit(CAN327_TX_DO_RESPONSES, &amp;elm-&gt;cmds_todo);</div><div class='add'>+	set_bit(CAN327_TX_DO_CAN_CONFIG, &amp;elm-&gt;cmds_todo);</div><div class='add'>+</div><div class='add'>+	can327_kick_into_cmd_mode(elm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can327_feed_frame_to_netdev(struct can327 *elm, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(elm-&gt;dev)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Queue for NAPI pickup.</div><div class='add'>+	 * rx-offload will update stats and LEDs for us.</div><div class='add'>+	 */</div><div class='add'>+	if (can_rx_offload_queue_tail(&amp;elm-&gt;offload, skb))</div><div class='add'>+		elm-&gt;dev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	/* Wake NAPI */</div><div class='add'>+	can_rx_offload_irq_finish(&amp;elm-&gt;offload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called when we're out of ideas and just want it all to end. */</div><div class='add'>+static inline void can327_uart_side_failure(struct can327 *elm)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *frame;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	elm-&gt;uart_side_failure = true;</div><div class='add'>+</div><div class='add'>+	clear_bit(TTY_DO_WRITE_WAKEUP, &amp;elm-&gt;tty-&gt;flags);</div><div class='add'>+</div><div class='add'>+	elm-&gt;can.can_stats.bus_off++;</div><div class='add'>+	netif_stop_queue(elm-&gt;dev);</div><div class='add'>+	elm-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='add'>+	can_bus_off(elm-&gt;dev);</div><div class='add'>+</div><div class='add'>+	netdev_err(elm-&gt;dev,</div><div class='add'>+		   "ELM327 misbehaved. Blocking further communication.\n");</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(elm-&gt;dev, &amp;frame);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	frame-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+	can327_feed_frame_to_netdev(elm, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Compares a byte buffer (non-NUL terminated) to the payload part of</div><div class='add'>+ * a string, and returns true iff the buffer (content *and* length) is</div><div class='add'>+ * exactly that string, without the terminating NUL byte.</div><div class='add'>+ *</div><div class='add'>+ * Example: If reference is "BUS ERROR", then this returns true iff nbytes == 9</div><div class='add'>+ *          and !memcmp(buf, "BUS ERROR", 9).</div><div class='add'>+ *</div><div class='add'>+ * The reason to use strings is so we can easily include them in the C</div><div class='add'>+ * code, and to avoid hardcoding lengths.</div><div class='add'>+ */</div><div class='add'>+static inline bool can327_rxbuf_cmp(const u8 *buf, size_t nbytes,</div><div class='add'>+				    const char *reference)</div><div class='add'>+{</div><div class='add'>+	size_t ref_len = strlen(reference);</div><div class='add'>+</div><div class='add'>+	return (nbytes == ref_len) &amp;&amp; !memcmp(buf, reference, ref_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can327_parse_error(struct can327 *elm, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *frame;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(elm-&gt;dev, &amp;frame);</div><div class='add'>+	if (!skb)</div><div class='add'>+		/* It's okay to return here:</div><div class='add'>+		 * The outer parsing loop will drop this UART buffer.</div><div class='add'>+		 */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Filter possible error messages based on length of RX'd line */</div><div class='add'>+	if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "UNABLE TO CONNECT")) {</div><div class='add'>+		netdev_err(elm-&gt;dev,</div><div class='add'>+			   "ELM327 reported UNABLE TO CONNECT. Please check your setup.\n");</div><div class='add'>+	} else if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "BUFFER FULL")) {</div><div class='add'>+		/* This will only happen if the last data line was complete.</div><div class='add'>+		 * Otherwise, can327_parse_frame() will heuristically</div><div class='add'>+		 * emit this kind of error frame instead.</div><div class='add'>+		 */</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		frame-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+	} else if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "BUS ERROR")) {</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_BUSERROR;</div><div class='add'>+	} else if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "CAN ERROR")) {</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+	} else if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "&lt;RX ERROR")) {</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+	} else if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "BUS BUSY")) {</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+		frame-&gt;data[2] = CAN_ERR_PROT_OVERLOAD;</div><div class='add'>+	} else if (can327_rxbuf_cmp(elm-&gt;rxbuf, len, "FB ERROR")) {</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+		frame-&gt;data[2] = CAN_ERR_PROT_TX;</div><div class='add'>+	} else if (len == 5 &amp;&amp; !memcmp(elm-&gt;rxbuf, "ERR", 3)) {</div><div class='add'>+		/* ERR is followed by two digits, hence line length 5 */</div><div class='add'>+		netdev_err(elm-&gt;dev, "ELM327 reported an ERR%c%c. Please power it off and on again.\n",</div><div class='add'>+			   elm-&gt;rxbuf[3], elm-&gt;rxbuf[4]);</div><div class='add'>+		frame-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+	} else {</div><div class='add'>+		/* Something else has happened.</div><div class='add'>+		 * Maybe garbage on the UART line.</div><div class='add'>+		 * Emit a generic error frame.</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can327_feed_frame_to_netdev(elm, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Parse CAN frames coming as ASCII from ELM327.</div><div class='add'>+ * They can be of various formats:</div><div class='add'>+ *</div><div class='add'>+ * 29-bit ID (EFF):  12 34 56 78 D PL PL PL PL PL PL PL PL</div><div class='add'>+ * 11-bit ID (!EFF): 123 D PL PL PL PL PL PL PL PL</div><div class='add'>+ *</div><div class='add'>+ * where D = DLC, PL = payload byte</div><div class='add'>+ *</div><div class='add'>+ * Instead of a payload, RTR indicates a remote request.</div><div class='add'>+ *</div><div class='add'>+ * We will use the spaces and line length to guess the format.</div><div class='add'>+ */</div><div class='add'>+static int can327_parse_frame(struct can327 *elm, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *frame;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int hexlen;</div><div class='add'>+	int datastart;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(elm-&gt;dev, &amp;frame);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Find first non-hex and non-space character:</div><div class='add'>+	 *  - In the simplest case, there is none.</div><div class='add'>+	 *  - For RTR frames, 'R' is the first non-hex character.</div><div class='add'>+	 *  - An error message may replace the end of the data line.</div><div class='add'>+	 */</div><div class='add'>+	for (hexlen = 0; hexlen &lt;= len; hexlen++) {</div><div class='add'>+		if (hex_to_bin(elm-&gt;rxbuf[hexlen]) &lt; 0 &amp;&amp;</div><div class='add'>+		    elm-&gt;rxbuf[hexlen] != ' ') {</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sanity check whether the line is really a clean hexdump,</div><div class='add'>+	 * or terminated by an error message, or contains garbage.</div><div class='add'>+	 */</div><div class='add'>+	if (hexlen &lt; len &amp;&amp; !isdigit(elm-&gt;rxbuf[hexlen]) &amp;&amp;</div><div class='add'>+	    !isupper(elm-&gt;rxbuf[hexlen]) &amp;&amp; '&lt;' != elm-&gt;rxbuf[hexlen] &amp;&amp;</div><div class='add'>+	    ' ' != elm-&gt;rxbuf[hexlen]) {</div><div class='add'>+		/* The line is likely garbled anyway, so bail.</div><div class='add'>+		 * The main code will restart listening.</div><div class='add'>+		 */</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use spaces in CAN ID to distinguish 29 or 11 bit address length.</div><div class='add'>+	 * No out-of-bounds access:</div><div class='add'>+	 * We use the fact that we can always read from elm-&gt;rxbuf.</div><div class='add'>+	 */</div><div class='add'>+	if (elm-&gt;rxbuf[2] == ' ' &amp;&amp; elm-&gt;rxbuf[5] == ' ' &amp;&amp;</div><div class='add'>+	    elm-&gt;rxbuf[8] == ' ' &amp;&amp; elm-&gt;rxbuf[11] == ' ' &amp;&amp;</div><div class='add'>+	    elm-&gt;rxbuf[13] == ' ') {</div><div class='add'>+		frame-&gt;can_id = CAN_EFF_FLAG;</div><div class='add'>+		datastart = 14;</div><div class='add'>+	} else if (elm-&gt;rxbuf[3] == ' ' &amp;&amp; elm-&gt;rxbuf[5] == ' ') {</div><div class='add'>+		datastart = 6;</div><div class='add'>+	} else {</div><div class='add'>+		/* This is not a well-formatted data line.</div><div class='add'>+		 * Assume it's an error message.</div><div class='add'>+		 */</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hexlen &lt; datastart) {</div><div class='add'>+		/* The line is too short to be a valid frame hex dump.</div><div class='add'>+		 * Something interrupted the hex dump or it is invalid.</div><div class='add'>+		 */</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* From here on all chars up to buf[hexlen] are hex or spaces,</div><div class='add'>+	 * at well-defined offsets.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Read CAN data length */</div><div class='add'>+	frame-&gt;len = (hex_to_bin(elm-&gt;rxbuf[datastart - 2]) &lt;&lt; 0);</div><div class='add'>+</div><div class='add'>+	/* Read CAN ID */</div><div class='add'>+	if (frame-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		frame-&gt;can_id |= (hex_to_bin(elm-&gt;rxbuf[0]) &lt;&lt; 28) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[1]) &lt;&lt; 24) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[3]) &lt;&lt; 20) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[4]) &lt;&lt; 16) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[6]) &lt;&lt; 12) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[7]) &lt;&lt; 8) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[9]) &lt;&lt; 4) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[10]) &lt;&lt; 0);</div><div class='add'>+	} else {</div><div class='add'>+		frame-&gt;can_id |= (hex_to_bin(elm-&gt;rxbuf[0]) &lt;&lt; 8) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[1]) &lt;&lt; 4) |</div><div class='add'>+				 (hex_to_bin(elm-&gt;rxbuf[2]) &lt;&lt; 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for RTR frame */</div><div class='add'>+	if (elm-&gt;rxfill &gt;= hexlen + 3 &amp;&amp;</div><div class='add'>+	    !memcmp(&amp;elm-&gt;rxbuf[hexlen], "RTR", 3)) {</div><div class='add'>+		frame-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Is the line long enough to hold the advertised payload?</div><div class='add'>+	 * Note: RTR frames have a DLC, but no actual payload.</div><div class='add'>+	 */</div><div class='add'>+	if (!(frame-&gt;can_id &amp; CAN_RTR_FLAG) &amp;&amp;</div><div class='add'>+	    (hexlen &lt; frame-&gt;len * 3 + datastart)) {</div><div class='add'>+		/* Incomplete frame.</div><div class='add'>+		 * Probably the ELM327's RS232 TX buffer was full.</div><div class='add'>+		 * Emit an error frame and exit.</div><div class='add'>+		 */</div><div class='add'>+		frame-&gt;can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;</div><div class='add'>+		frame-&gt;len = CAN_ERR_DLC;</div><div class='add'>+		frame-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+		can327_feed_frame_to_netdev(elm, skb);</div><div class='add'>+</div><div class='add'>+		/* Signal failure to parse.</div><div class='add'>+		 * The line will be re-parsed as an error line, which will fail.</div><div class='add'>+		 * However, this will correctly drop the state machine back into</div><div class='add'>+		 * command mode.</div><div class='add'>+		 */</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse the data nibbles. */</div><div class='add'>+	for (i = 0; i &lt; frame-&gt;len; i++) {</div><div class='add'>+		frame-&gt;data[i] =</div><div class='add'>+			(hex_to_bin(elm-&gt;rxbuf[datastart + 3 * i]) &lt;&lt; 4) |</div><div class='add'>+			(hex_to_bin(elm-&gt;rxbuf[datastart + 3 * i + 1]));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Feed the frame to the network layer. */</div><div class='add'>+	can327_feed_frame_to_netdev(elm, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can327_parse_line(struct can327 *elm, size_t len)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Skip empty lines */</div><div class='add'>+	if (!len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Skip echo lines */</div><div class='add'>+	if (elm-&gt;drop_next_line) {</div><div class='add'>+		elm-&gt;drop_next_line = 0;</div><div class='add'>+		return;</div><div class='add'>+	} else if (!memcmp(elm-&gt;rxbuf, "AT", 2)) {</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Regular parsing */</div><div class='add'>+	if (elm-&gt;state == CAN327_STATE_RECEIVING &amp;&amp;</div><div class='add'>+	    can327_parse_frame(elm, len)) {</div><div class='add'>+		/* Parse an error line. */</div><div class='add'>+		can327_parse_error(elm, len);</div><div class='add'>+</div><div class='add'>+		/* Start afresh. */</div><div class='add'>+		can327_kick_into_cmd_mode(elm);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can327_handle_prompt(struct can327 *elm)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *frame = &amp;elm-&gt;can_frame_to_send;</div><div class='add'>+	/* Size this buffer for the largest ELM327 line we may generate,</div><div class='add'>+	 * which is currently an 8 byte CAN frame's payload hexdump.</div><div class='add'>+	 * Items in can327_init_script must fit here, too!</div><div class='add'>+	 */</div><div class='add'>+	char local_txbuf[sizeof("0102030405060708\r")];</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!elm-&gt;cmds_todo) {</div><div class='add'>+		/* Enter CAN monitor mode */</div><div class='add'>+		can327_send(elm, "ATMA\r", 5);</div><div class='add'>+		elm-&gt;state = CAN327_STATE_RECEIVING;</div><div class='add'>+</div><div class='add'>+		/* We will be in the default state once this command is</div><div class='add'>+		 * sent, so enable the TX packet queue.</div><div class='add'>+		 */</div><div class='add'>+		netif_wake_queue(elm-&gt;dev);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reconfigure ELM327 step by step as indicated by elm-&gt;cmds_todo */</div><div class='add'>+	if (test_bit(CAN327_TX_DO_INIT, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf), "%s",</div><div class='add'>+			 *elm-&gt;next_init_cmd);</div><div class='add'>+</div><div class='add'>+		elm-&gt;next_init_cmd++;</div><div class='add'>+		if (!(*elm-&gt;next_init_cmd)) {</div><div class='add'>+			clear_bit(CAN327_TX_DO_INIT, &amp;elm-&gt;cmds_todo);</div><div class='add'>+			/* Init finished. */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_SILENT_MONITOR, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATCSM%i\r",</div><div class='add'>+			 !!(elm-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY));</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_RESPONSES, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATR%i\r",</div><div class='add'>+			 !(elm-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY));</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_CAN_CONFIG, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATPC\r");</div><div class='add'>+		set_bit(CAN327_TX_DO_CAN_CONFIG_PART2, &amp;elm-&gt;cmds_todo);</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_CAN_CONFIG_PART2, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATPB%04X\r",</div><div class='add'>+			 elm-&gt;can_config);</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_CANID_29BIT_HIGH, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATCP%02X\r",</div><div class='add'>+			 (frame-&gt;can_id &amp; CAN_EFF_MASK) &gt;&gt; 24);</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_CANID_29BIT_LOW, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATSH%06X\r",</div><div class='add'>+			 frame-&gt;can_id &amp; CAN_EFF_MASK &amp; ((1 &lt;&lt; 24) - 1));</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_CANID_11BIT, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		snprintf(local_txbuf, sizeof(local_txbuf),</div><div class='add'>+			 "ATSH%03X\r",</div><div class='add'>+			 frame-&gt;can_id &amp; CAN_SFF_MASK);</div><div class='add'>+</div><div class='add'>+	} else if (test_and_clear_bit(CAN327_TX_DO_CAN_DATA, &amp;elm-&gt;cmds_todo)) {</div><div class='add'>+		if (frame-&gt;can_id &amp; CAN_RTR_FLAG) {</div><div class='add'>+			/* Send an RTR frame. Their DLC is fixed.</div><div class='add'>+			 * Some chips don't send them at all.</div><div class='add'>+			 */</div><div class='add'>+			snprintf(local_txbuf, sizeof(local_txbuf), "ATRTR\r");</div><div class='add'>+		} else {</div><div class='add'>+			/* Send a regular CAN data frame */</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; frame-&gt;len; i++) {</div><div class='add'>+				snprintf(&amp;local_txbuf[2 * i],</div><div class='add'>+					 sizeof(local_txbuf), "%02X",</div><div class='add'>+					 frame-&gt;data[i]);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			snprintf(&amp;local_txbuf[2 * i], sizeof(local_txbuf),</div><div class='add'>+				 "\r");</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		elm-&gt;drop_next_line = 1;</div><div class='add'>+		elm-&gt;state = CAN327_STATE_RECEIVING;</div><div class='add'>+</div><div class='add'>+		/* We will be in the default state once this command is</div><div class='add'>+		 * sent, so enable the TX packet queue.</div><div class='add'>+		 */</div><div class='add'>+		netif_wake_queue(elm-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can327_send(elm, local_txbuf, strlen(local_txbuf));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool can327_is_ready_char(char c)</div><div class='add'>+{</div><div class='add'>+	/* Bits 0xc0 are sometimes set (randomly), hence the mask.</div><div class='add'>+	 * Probably bad hardware.</div><div class='add'>+	 */</div><div class='add'>+	return (c &amp; 0x3f) == CAN327_READY_CHAR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can327_drop_bytes(struct can327 *elm, size_t i)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	memmove(&amp;elm-&gt;rxbuf[0], &amp;elm-&gt;rxbuf[i], CAN327_SIZE_RXBUF - i);</div><div class='add'>+	elm-&gt;rxfill -= i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can327_parse_rxbuf(struct can327 *elm, size_t first_new_char_idx)</div><div class='add'>+{</div><div class='add'>+	size_t len, pos;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (elm-&gt;state) {</div><div class='add'>+	case CAN327_STATE_NOTINIT:</div><div class='add'>+		elm-&gt;rxfill = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN327_STATE_GETDUMMYCHAR:</div><div class='add'>+		/* Wait for 'y' or '&gt;' */</div><div class='add'>+		for (pos = 0; pos &lt; elm-&gt;rxfill; pos++) {</div><div class='add'>+			if (elm-&gt;rxbuf[pos] == CAN327_DUMMY_CHAR) {</div><div class='add'>+				can327_send(elm, "\r", 1);</div><div class='add'>+				elm-&gt;state = CAN327_STATE_GETPROMPT;</div><div class='add'>+				pos++;</div><div class='add'>+				break;</div><div class='add'>+			} else if (can327_is_ready_char(elm-&gt;rxbuf[pos])) {</div><div class='add'>+				can327_send(elm, CAN327_DUMMY_STRING, 1);</div><div class='add'>+				pos++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		can327_drop_bytes(elm, pos);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN327_STATE_GETPROMPT:</div><div class='add'>+		/* Wait for '&gt;' */</div><div class='add'>+		if (can327_is_ready_char(elm-&gt;rxbuf[elm-&gt;rxfill - 1]))</div><div class='add'>+			can327_handle_prompt(elm);</div><div class='add'>+</div><div class='add'>+		elm-&gt;rxfill = 0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CAN327_STATE_RECEIVING:</div><div class='add'>+		/* Find &lt;CR&gt; delimiting feedback lines. */</div><div class='add'>+		len = first_new_char_idx;</div><div class='add'>+		while (len &lt; elm-&gt;rxfill &amp;&amp; elm-&gt;rxbuf[len] != '\r')</div><div class='add'>+			len++;</div><div class='add'>+</div><div class='add'>+		if (len == CAN327_SIZE_RXBUF) {</div><div class='add'>+			/* Assume the buffer ran full with garbage.</div><div class='add'>+			 * Did we even connect at the right baud rate?</div><div class='add'>+			 */</div><div class='add'>+			netdev_err(elm-&gt;dev,</div><div class='add'>+				   "RX buffer overflow. Faulty ELM327 or UART?\n");</div><div class='add'>+			can327_uart_side_failure(elm);</div><div class='add'>+		} else if (len == elm-&gt;rxfill) {</div><div class='add'>+			if (can327_is_ready_char(elm-&gt;rxbuf[elm-&gt;rxfill - 1])) {</div><div class='add'>+				/* The ELM327's AT ST response timeout ran out,</div><div class='add'>+				 * so we got a prompt.</div><div class='add'>+				 * Clear RX buffer and restart listening.</div><div class='add'>+				 */</div><div class='add'>+				elm-&gt;rxfill = 0;</div><div class='add'>+</div><div class='add'>+				can327_handle_prompt(elm);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* No &lt;CR&gt; found - we haven't received a full line yet.</div><div class='add'>+			 * Wait for more data.</div><div class='add'>+			 */</div><div class='add'>+		} else {</div><div class='add'>+			/* We have a full line to parse. */</div><div class='add'>+			can327_parse_line(elm, len);</div><div class='add'>+</div><div class='add'>+			/* Remove parsed data from RX buffer. */</div><div class='add'>+			can327_drop_bytes(elm, len + 1);</div><div class='add'>+</div><div class='add'>+			/* More data to parse? */</div><div class='add'>+			if (elm-&gt;rxfill)</div><div class='add'>+				can327_parse_rxbuf(elm, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can327_netdev_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!elm-&gt;tty) {</div><div class='add'>+		spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (elm-&gt;uart_side_failure)</div><div class='add'>+		netdev_warn(elm-&gt;dev,</div><div class='add'>+			    "Reopening netdev after a UART side fault has been detected.\n");</div><div class='add'>+</div><div class='add'>+	/* Clear TTY buffers */</div><div class='add'>+	elm-&gt;rxfill = 0;</div><div class='add'>+	elm-&gt;txleft = 0;</div><div class='add'>+</div><div class='add'>+	/* open_candev() checks for elm-&gt;can.bittiming.bitrate != 0 */</div><div class='add'>+	err = open_candev(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can327_init_device(elm);</div><div class='add'>+	spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_add_manual(dev, &amp;elm-&gt;offload, CAN327_NAPI_WEIGHT);</div><div class='add'>+	if (err) {</div><div class='add'>+		close_candev(dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_rx_offload_enable(&amp;elm-&gt;offload);</div><div class='add'>+</div><div class='add'>+	elm-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can327_netdev_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Interrupt whatever the ELM327 is doing right now */</div><div class='add'>+	spin_lock_bh(&amp;elm-&gt;lock);</div><div class='add'>+	can327_send(elm, CAN327_DUMMY_STRING, 1);</div><div class='add'>+	spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	/* We don't flush the UART TX queue here, as we want final stop</div><div class='add'>+	 * commands (like the above dummy char) to be flushed out.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	can_rx_offload_disable(&amp;elm-&gt;offload);</div><div class='add'>+	elm-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	can_rx_offload_del(&amp;elm-&gt;offload);</div><div class='add'>+	close_candev(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send a can_frame to a TTY. */</div><div class='add'>+static netdev_tx_t can327_netdev_start_xmit(struct sk_buff *skb,</div><div class='add'>+					    struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = netdev_priv(dev);</div><div class='add'>+	struct can_frame *frame = (struct can_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	/* We shouldn't get here after a hardware fault:</div><div class='add'>+	 * can_bus_off() calls netif_carrier_off()</div><div class='add'>+	 */</div><div class='add'>+	if (elm-&gt;uart_side_failure) {</div><div class='add'>+		WARN_ON_ONCE(elm-&gt;uart_side_failure);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	/* BHs are already disabled, so no spin_lock_bh().</div><div class='add'>+	 * See Documentation/networking/netdevices.rst</div><div class='add'>+	 */</div><div class='add'>+	spin_lock(&amp;elm-&gt;lock);</div><div class='add'>+	can327_send_frame(elm, frame);</div><div class='add'>+	spin_unlock(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	dev-&gt;stats.tx_packets++;</div><div class='add'>+	dev-&gt;stats.tx_bytes += frame-&gt;can_id &amp; CAN_RTR_FLAG ? 0 : frame-&gt;len;</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops can327_netdev_ops = {</div><div class='add'>+	.ndo_open = can327_netdev_open,</div><div class='add'>+	.ndo_stop = can327_netdev_close,</div><div class='add'>+	.ndo_start_xmit = can327_netdev_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops can327_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool can327_is_valid_rx_char(u8 c)</div><div class='add'>+{</div><div class='add'>+	static const bool lut_char_is_valid['z'] = {</div><div class='add'>+		['\r'] = true,</div><div class='add'>+		[' '] = true,</div><div class='add'>+		['.'] = true,</div><div class='add'>+		['0'] = true, true, true, true, true,</div><div class='add'>+		['5'] = true, true, true, true, true,</div><div class='add'>+		['&lt;'] = true,</div><div class='add'>+		[CAN327_READY_CHAR] = true,</div><div class='add'>+		['?'] = true,</div><div class='add'>+		['A'] = true, true, true, true, true, true, true,</div><div class='add'>+		['H'] = true, true, true, true, true, true, true,</div><div class='add'>+		['O'] = true, true, true, true, true, true, true,</div><div class='add'>+		['V'] = true, true, true, true, true,</div><div class='add'>+		['a'] = true,</div><div class='add'>+		['b'] = true,</div><div class='add'>+		['v'] = true,</div><div class='add'>+		[CAN327_DUMMY_CHAR] = true,</div><div class='add'>+	};</div><div class='add'>+	BUILD_BUG_ON(CAN327_DUMMY_CHAR &gt;= 'z');</div><div class='add'>+</div><div class='add'>+	return (c &lt; ARRAY_SIZE(lut_char_is_valid) &amp;&amp; lut_char_is_valid[c]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Handle incoming ELM327 ASCII data.</div><div class='add'>+ * This will not be re-entered while running, but other ldisc</div><div class='add'>+ * functions may be called in parallel.</div><div class='add'>+ */</div><div class='add'>+static void can327_ldisc_rx(struct tty_struct *tty, const u8 *cp,</div><div class='add'>+			    const u8 *fp, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = tty-&gt;disc_data;</div><div class='add'>+	size_t first_new_char_idx;</div><div class='add'>+</div><div class='add'>+	if (elm-&gt;uart_side_failure)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Store old rxfill, so can327_parse_rxbuf() will have</div><div class='add'>+	 * the option of skipping already checked characters.</div><div class='add'>+	 */</div><div class='add'>+	first_new_char_idx = elm-&gt;rxfill;</div><div class='add'>+</div><div class='add'>+	while (count--) {</div><div class='add'>+		if (elm-&gt;rxfill &gt;= CAN327_SIZE_RXBUF) {</div><div class='add'>+			netdev_err(elm-&gt;dev,</div><div class='add'>+				   "Receive buffer overflowed. Bad chip or wiring? count = %zu",</div><div class='add'>+				   count);</div><div class='add'>+			goto uart_failure;</div><div class='add'>+		}</div><div class='add'>+		if (fp &amp;&amp; *fp++) {</div><div class='add'>+			netdev_err(elm-&gt;dev,</div><div class='add'>+				   "Error in received character stream. Check your wiring.");</div><div class='add'>+			goto uart_failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Ignore NUL characters, which the PIC microcontroller may</div><div class='add'>+		 * inadvertently insert due to a known hardware bug.</div><div class='add'>+		 * See ELM327 documentation, which refers to a Microchip PIC</div><div class='add'>+		 * bug description.</div><div class='add'>+		 */</div><div class='add'>+		if (*cp) {</div><div class='add'>+			/* Check for stray characters on the UART line.</div><div class='add'>+			 * Likely caused by bad hardware.</div><div class='add'>+			 */</div><div class='add'>+			if (!can327_is_valid_rx_char(*cp)) {</div><div class='add'>+				netdev_err(elm-&gt;dev,</div><div class='add'>+					   "Received illegal character %02x.\n",</div><div class='add'>+					   *cp);</div><div class='add'>+				goto uart_failure;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			elm-&gt;rxbuf[elm-&gt;rxfill++] = *cp;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cp++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can327_parse_rxbuf(elm, first_new_char_idx);</div><div class='add'>+	spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+uart_failure:</div><div class='add'>+	can327_uart_side_failure(elm);</div><div class='add'>+	spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write out remaining transmit buffer.</div><div class='add'>+ * Scheduled when TTY is writable.</div><div class='add'>+ */</div><div class='add'>+static void can327_ldisc_tx_worker(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = container_of(work, struct can327, tx_work);</div><div class='add'>+	ssize_t written;</div><div class='add'>+</div><div class='add'>+	if (elm-&gt;uart_side_failure)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (elm-&gt;txleft) {</div><div class='add'>+		written = elm-&gt;tty-&gt;ops-&gt;write(elm-&gt;tty, elm-&gt;txhead,</div><div class='add'>+					       elm-&gt;txleft);</div><div class='add'>+		if (written &lt; 0) {</div><div class='add'>+			netdev_err(elm-&gt;dev, "Failed to write to tty %s.\n",</div><div class='add'>+				   elm-&gt;tty-&gt;name);</div><div class='add'>+			can327_uart_side_failure(elm);</div><div class='add'>+</div><div class='add'>+			spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		elm-&gt;txleft -= written;</div><div class='add'>+		elm-&gt;txhead += written;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!elm-&gt;txleft)</div><div class='add'>+		clear_bit(TTY_DO_WRITE_WAKEUP, &amp;elm-&gt;tty-&gt;flags);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called by the driver when there's room for more data. */</div><div class='add'>+static void can327_ldisc_tx_wakeup(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = tty-&gt;disc_data;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;elm-&gt;tx_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ELM327 can only handle bitrates that are integer divisors of 500 kHz,</div><div class='add'>+ * or 7/8 of that. Divisors are 1 to 64.</div><div class='add'>+ * Currently we don't implement support for 7/8 rates.</div><div class='add'>+ */</div><div class='add'>+static const u32 can327_bitrate_const[] = {</div><div class='add'>+	7812,  7936,  8064,  8196,   8333,   8474,   8620,   8771,</div><div class='add'>+	8928,  9090,  9259,  9433,   9615,   9803,   10000,  10204,</div><div class='add'>+	10416, 10638, 10869, 11111,  11363,  11627,  11904,  12195,</div><div class='add'>+	12500, 12820, 13157, 13513,  13888,  14285,  14705,  15151,</div><div class='add'>+	15625, 16129, 16666, 17241,  17857,  18518,  19230,  20000,</div><div class='add'>+	20833, 21739, 22727, 23809,  25000,  26315,  27777,  29411,</div><div class='add'>+	31250, 33333, 35714, 38461,  41666,  45454,  50000,  55555,</div><div class='add'>+	62500, 71428, 83333, 100000, 125000, 166666, 250000, 500000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int can327_ldisc_open(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct can327 *elm;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (!tty-&gt;ops-&gt;write)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dev = alloc_candev(sizeof(struct can327), 0);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENFILE;</div><div class='add'>+	elm = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Configure TTY interface */</div><div class='add'>+	tty-&gt;receive_room = 65536; /* We don't flow control */</div><div class='add'>+	spin_lock_init(&amp;elm-&gt;lock);</div><div class='add'>+	INIT_WORK(&amp;elm-&gt;tx_work, can327_ldisc_tx_worker);</div><div class='add'>+</div><div class='add'>+	/* Configure CAN metadata */</div><div class='add'>+	elm-&gt;can.bitrate_const = can327_bitrate_const;</div><div class='add'>+	elm-&gt;can.bitrate_const_cnt = ARRAY_SIZE(can327_bitrate_const);</div><div class='add'>+	elm-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY;</div><div class='add'>+</div><div class='add'>+	/* Configure netdev interface */</div><div class='add'>+	elm-&gt;dev = dev;</div><div class='add'>+	dev-&gt;netdev_ops = &amp;can327_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;can327_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	/* Mark ldisc channel as alive */</div><div class='add'>+	elm-&gt;tty = tty;</div><div class='add'>+	tty-&gt;disc_data = elm;</div><div class='add'>+</div><div class='add'>+	/* Let 'er rip */</div><div class='add'>+	err = register_candev(elm-&gt;dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_candev(elm-&gt;dev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(elm-&gt;dev, "can327 on %s.\n", tty-&gt;name);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Close down a can327 channel.</div><div class='add'>+ * This means flushing out any pending queues, and then returning.</div><div class='add'>+ * This call is serialized against other ldisc functions:</div><div class='add'>+ * Once this is called, no other ldisc function of ours is entered.</div><div class='add'>+ *</div><div class='add'>+ * We also use this function for a hangup event.</div><div class='add'>+ */</div><div class='add'>+static void can327_ldisc_close(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = tty-&gt;disc_data;</div><div class='add'>+</div><div class='add'>+	/* unregister_netdev() calls .ndo_stop() so we don't have to. */</div><div class='add'>+	unregister_candev(elm-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Give UART one final chance to flush.</div><div class='add'>+	 * No need to clear TTY_DO_WRITE_WAKEUP since .write_wakeup() is</div><div class='add'>+	 * serialised against .close() and will not be called once we return.</div><div class='add'>+	 */</div><div class='add'>+	flush_work(&amp;elm-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	/* Mark channel as dead */</div><div class='add'>+	spin_lock_bh(&amp;elm-&gt;lock);</div><div class='add'>+	tty-&gt;disc_data = NULL;</div><div class='add'>+	elm-&gt;tty = NULL;</div><div class='add'>+	spin_unlock_bh(&amp;elm-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netdev_info(elm-&gt;dev, "can327 off %s.\n", tty-&gt;name);</div><div class='add'>+</div><div class='add'>+	free_candev(elm-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can327_ldisc_ioctl(struct tty_struct *tty, unsigned int cmd,</div><div class='add'>+			      unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct can327 *elm = tty-&gt;disc_data;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGIFNAME:</div><div class='add'>+		tmp = strnlen(elm-&gt;dev-&gt;name, IFNAMSIZ - 1) + 1;</div><div class='add'>+		if (copy_to_user((void __user *)arg, elm-&gt;dev-&gt;name, tmp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case SIOCSIFHWADDR:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return tty_mode_ioctl(tty, cmd, arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tty_ldisc_ops can327_ldisc = {</div><div class='add'>+	.owner = THIS_MODULE,</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.num = N_CAN327,</div><div class='add'>+	.receive_buf = can327_ldisc_rx,</div><div class='add'>+	.write_wakeup = can327_ldisc_tx_wakeup,</div><div class='add'>+	.open = can327_ldisc_open,</div><div class='add'>+	.close = can327_ldisc_close,</div><div class='add'>+	.ioctl = can327_ldisc_ioctl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init can327_init(void)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = tty_register_ldisc(&amp;can327_ldisc);</div><div class='add'>+	if (status)</div><div class='add'>+		pr_err("Can't register line discipline\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit can327_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* This will only be called when all channels have been closed by</div><div class='add'>+	 * userspace - tty_ldisc.c takes care of the module's refcount.</div><div class='add'>+	 */</div><div class='add'>+	tty_unregister_ldisc(&amp;can327_ldisc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(can327_init);</div><div class='add'>+module_exit(can327_exit);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_LDISC(N_CAN327);</div><div class='add'>+MODULE_DESCRIPTION("ELM327 based CAN interface");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Max Staudt &lt;max@enpas.org&gt;");</div><div class='head'>diff --git a/drivers/net/can/cc770/Kconfig b/drivers/net/can/cc770/Kconfig<br/>index 13a4593a52df..aae25c2f849e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/cc770/Kconfig</a></div><div class='hunk'>@@ -7,14 +7,15 @@ if CAN_CC770</div><div class='ctx'> </div><div class='ctx'> config CAN_CC770_ISA</div><div class='ctx'> 	tristate "ISA Bus based legacy CC770 driver"</div><div class='del'>-	---help---</div><div class='add'>+	depends on HAS_IOPORT</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds legacy support for CC770 and AN82527 chips</div><div class='ctx'> 	  connected to the ISA bus using I/O port, memory mapped or</div><div class='ctx'> 	  indirect access.</div><div class='ctx'> </div><div class='ctx'> config CAN_CC770_PLATFORM</div><div class='ctx'> 	tristate "Generic Platform Bus based CC770 driver"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for the CC770 and AN82527 chips</div><div class='ctx'> 	  connected to the "platform bus" (Linux abstraction for directly</div><div class='ctx'> 	  to the processor attached devices).</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770.c b/drivers/net/can/cc770/cc770.c<br/>index da636a22c542..8d5abd643c06 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/cc770/cc770.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Core driver for the CC770 and AN82527 CAN controllers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -25,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='hunk'>@@ -398,7 +391,7 @@ static void cc770_tx(struct net_device *dev, int mo)</div><div class='ctx'> 	u32 id;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	dlc = cf-&gt;can_dlc;</div><div class='add'>+	dlc = cf-&gt;len;</div><div class='ctx'> 	id = cf-&gt;can_id;</div><div class='ctx'> 	rtr = cf-&gt;can_id &amp; CAN_RTR_FLAG ? 0 : MSGCFG_DIR;</div><div class='ctx'> </div><div class='hunk'>@@ -436,7 +429,7 @@ static netdev_tx_t cc770_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct cc770_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	unsigned int mo = obj2msgobj(CC770_OBJ_TX);</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='hunk'>@@ -478,7 +471,7 @@ static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1)</div><div class='ctx'> 		cf-&gt;can_id = CAN_RTR_FLAG;</div><div class='ctx'> 		if (config &amp; MSGCFG_XTD)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='del'>-		cf-&gt;can_dlc = 0;</div><div class='add'>+		cf-&gt;len = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (config &amp; MSGCFG_XTD) {</div><div class='ctx'> 			id = cc770_read_reg(priv, msgobj[mo].id[3]);</div><div class='hunk'>@@ -494,20 +487,20 @@ static void cc770_rx(struct net_device *dev, unsigned int mo, u8 ctrl1)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		cf-&gt;can_id = id;</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc((config &amp; 0xf0) &gt;&gt; 4);</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len((config &amp; 0xf0) &gt;&gt; 4);</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 			cf-&gt;data[i] = cc770_read_reg(priv, msgobj[mo].data[i]);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cc770_err(struct net_device *dev, u8 status)</div><div class='ctx'> {</div><div class='ctx'> 	struct cc770_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u8 lec;</div><div class='hunk'>@@ -520,6 +513,7 @@ static int cc770_err(struct net_device *dev, u8 status)</div><div class='ctx'> </div><div class='ctx'> 	/* Use extended functions of the CC770 */</div><div class='ctx'> 	if (priv-&gt;control_normal_mode &amp; CTRL_EAF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[6] = cc770_read_reg(priv, tx_error_counter);</div><div class='ctx'> 		cf-&gt;data[7] = cc770_read_reg(priv, rx_error_counter);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -546,7 +540,7 @@ static int cc770_err(struct net_device *dev, u8 status)</div><div class='ctx'> 			priv-&gt;can.can_stats.error_warning++;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		/* Back to error avtive */</div><div class='add'>+		/* Back to error active */</div><div class='ctx'> 		cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='ctx'> 		cf-&gt;data[2] = CAN_ERR_PROT_ACTIVE;</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='hunk'>@@ -579,8 +573,6 @@ static int cc770_err(struct net_device *dev, u8 status)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -674,7 +666,6 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)</div><div class='ctx'> 	struct cc770_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	unsigned int mo = obj2msgobj(o);</div><div class='del'>-	struct can_frame *cf;</div><div class='ctx'> 	u8 ctrl1;</div><div class='ctx'> </div><div class='ctx'> 	ctrl1 = cc770_read_reg(priv, msgobj[mo].ctrl1);</div><div class='hunk'>@@ -706,12 +697,9 @@ static void cc770_tx_interrupt(struct net_device *dev, unsigned int o)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf = (struct can_frame *)priv-&gt;tx_skb-&gt;data;</div><div class='del'>-	stats-&gt;tx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	can_put_echo_skb(priv-&gt;tx_skb, dev, 0, 0);</div><div class='add'>+	stats-&gt;tx_bytes += can_get_echo_skb(dev, 0, NULL);</div><div class='ctx'> 	stats-&gt;tx_packets++;</div><div class='del'>-</div><div class='del'>-	can_put_echo_skb(priv-&gt;tx_skb, dev, 0);</div><div class='del'>-	can_get_echo_skb(dev, 0);</div><div class='ctx'> 	priv-&gt;tx_skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='hunk'>@@ -846,7 +834,10 @@ static const struct net_device_ops cc770_netdev_ops = {</div><div class='ctx'> 	.ndo_open = cc770_open,</div><div class='ctx'> 	.ndo_stop = cc770_close,</div><div class='ctx'> 	.ndo_start_xmit = cc770_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops cc770_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int register_cc770dev(struct net_device *dev)</div><div class='hunk'>@@ -859,6 +850,7 @@ int register_cc770dev(struct net_device *dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;cc770_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;cc770_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/can/cc770/cc770.h b/drivers/net/can/cc770/cc770.h<br/>index 95752e1d1283..0628fd9e1980 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/cc770/cc770.h</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Core driver for the CC770 and AN82527 CAN controllers</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef CC770_DEV_H</div><div class='hunk'>@@ -192,7 +184,7 @@ struct cc770_priv {</div><div class='ctx'> 	u8 control_normal_mode;	/* Control register for normal mode */</div><div class='ctx'> 	u8 cpu_interface;	/* CPU interface register */</div><div class='ctx'> 	u8 clkout;		/* Clock out register */</div><div class='del'>-	u8 bus_config;		/* Bus conffiguration register */</div><div class='add'>+	u8 bus_config;		/* Bus configuration register */</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *tx_skb;</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c<br/>index fcd34698074f..d06762817153 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770_isa.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770_isa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770_isa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/cc770/cc770_isa.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for CC770 and AN82527 CAN controllers on the legacy ISA bus</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -183,7 +175,7 @@ static int cc770_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 			err = -EBUSY;</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='del'>-		base = ioremap_nocache(mem[idx], iosize);</div><div class='add'>+		base = ioremap(mem[idx], iosize);</div><div class='ctx'> 		if (!base) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto exit_release;</div><div class='hunk'>@@ -272,26 +264,28 @@ static int cc770_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"couldn't register device (err=%d)\n", err);</div><div class='del'>-		goto exit_unmap;</div><div class='add'>+		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "device registered (reg_base=0x%p, irq=%d)\n",</div><div class='ctx'> 		 priv-&gt;reg_base, dev-&gt;irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- exit_unmap:</div><div class='add'>+exit_free:</div><div class='add'>+	free_cc770dev(dev);</div><div class='add'>+exit_unmap:</div><div class='ctx'> 	if (mem[idx])</div><div class='ctx'> 		iounmap(base);</div><div class='del'>- exit_release:</div><div class='add'>+exit_release:</div><div class='ctx'> 	if (mem[idx])</div><div class='ctx'> 		release_mem_region(mem[idx], iosize);</div><div class='ctx'> 	else</div><div class='ctx'> 		release_region(port[idx], iosize);</div><div class='del'>- exit:</div><div class='add'>+exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cc770_isa_remove(struct platform_device *pdev)</div><div class='add'>+static void cc770_isa_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct cc770_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -309,8 +303,6 @@ static int cc770_isa_remove(struct platform_device *pdev)</div><div class='ctx'> 			release_region(port[idx], CC770_IOSIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	free_cc770dev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver cc770_isa_driver = {</div><div class='head'>diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c<br/>index 866e5e12fdd2..b6c4f02ffb97 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770_platform.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/cc770/cc770_platform.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/cc770/cc770_platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/cc770/cc770_platform.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for CC770 and AN82527 CAN controllers on the platform bus</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -78,17 +70,10 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg,</div><div class='ctx'> static int cc770_get_of_node_data(struct platform_device *pdev,</div><div class='ctx'> 				  struct cc770_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	u32 clkext = CC770_PLATFORM_CAN_CLOCK, clkout = 0;</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='del'>-	const u32 *prop;</div><div class='del'>-	int prop_size;</div><div class='del'>-	u32 clkext;</div><div class='del'>-</div><div class='del'>-	prop = of_get_property(np, "bosch,external-clock-frequency",</div><div class='del'>-			       &amp;prop_size);</div><div class='del'>-	if (prop &amp;&amp; (prop_size ==  sizeof(u32)))</div><div class='del'>-		clkext = *prop;</div><div class='del'>-	else</div><div class='del'>-		clkext = CC770_PLATFORM_CAN_CLOCK; /* default */</div><div class='add'>+</div><div class='add'>+	of_property_read_u32(np, "bosch,external-clock-frequency", &amp;clkext);</div><div class='ctx'> 	priv-&gt;can.clock.freq = clkext;</div><div class='ctx'> </div><div class='ctx'> 	/* The system clock may not exceed 10 MHz */</div><div class='hunk'>@@ -101,41 +86,38 @@ static int cc770_get_of_node_data(struct platform_device *pdev,</div><div class='ctx'> 	if (priv-&gt;can.clock.freq &gt; 8000000)</div><div class='ctx'> 		priv-&gt;cpu_interface |= CPUIF_DMC;</div><div class='ctx'> </div><div class='del'>-	if (of_get_property(np, "bosch,divide-memory-clock", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "bosch,divide-memory-clock"))</div><div class='ctx'> 		priv-&gt;cpu_interface |= CPUIF_DMC;</div><div class='del'>-	if (of_get_property(np, "bosch,iso-low-speed-mux", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "bosch,iso-low-speed-mux"))</div><div class='ctx'> 		priv-&gt;cpu_interface |= CPUIF_MUX;</div><div class='ctx'> </div><div class='del'>-	if (!of_get_property(np, "bosch,no-comperator-bypass", NULL))</div><div class='add'>+	if (!of_property_read_bool(np, "bosch,no-comperator-bypass"))</div><div class='ctx'> 		priv-&gt;bus_config |= BUSCFG_CBY;</div><div class='del'>-	if (of_get_property(np, "bosch,disconnect-rx0-input", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "bosch,disconnect-rx0-input"))</div><div class='ctx'> 		priv-&gt;bus_config |= BUSCFG_DR0;</div><div class='del'>-	if (of_get_property(np, "bosch,disconnect-rx1-input", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "bosch,disconnect-rx1-input"))</div><div class='ctx'> 		priv-&gt;bus_config |= BUSCFG_DR1;</div><div class='del'>-	if (of_get_property(np, "bosch,disconnect-tx1-output", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "bosch,disconnect-tx1-output"))</div><div class='ctx'> 		priv-&gt;bus_config |= BUSCFG_DT1;</div><div class='del'>-	if (of_get_property(np, "bosch,polarity-dominant", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "bosch,polarity-dominant"))</div><div class='ctx'> 		priv-&gt;bus_config |= BUSCFG_POL;</div><div class='ctx'> </div><div class='del'>-	prop = of_get_property(np, "bosch,clock-out-frequency", &amp;prop_size);</div><div class='del'>-	if (prop &amp;&amp; (prop_size == sizeof(u32)) &amp;&amp; *prop &gt; 0) {</div><div class='del'>-		u32 cdv = clkext / *prop;</div><div class='del'>-		int slew;</div><div class='add'>+	of_property_read_u32(np, "bosch,clock-out-frequency", &amp;clkout);</div><div class='add'>+	if (clkout &gt; 0) {</div><div class='add'>+		u32 cdv = clkext / clkout;</div><div class='ctx'> </div><div class='ctx'> 		if (cdv &gt; 0 &amp;&amp; cdv &lt; 16) {</div><div class='add'>+			u32 slew;</div><div class='add'>+</div><div class='ctx'> 			priv-&gt;cpu_interface |= CPUIF_CEN;</div><div class='ctx'> 			priv-&gt;clkout |= (cdv - 1) &amp; CLKOUT_CD_MASK;</div><div class='ctx'> </div><div class='del'>-			prop = of_get_property(np, "bosch,slew-rate",</div><div class='del'>-					       &amp;prop_size);</div><div class='del'>-			if (prop &amp;&amp; (prop_size == sizeof(u32))) {</div><div class='del'>-				slew = *prop;</div><div class='del'>-			} else {</div><div class='add'>+			if (of_property_read_u32(np, "bosch,slew-rate", &amp;slew)) {</div><div class='ctx'> 				/* Determine default slew rate */</div><div class='ctx'> 				slew = (CLKOUT_SL_MASK &gt;&gt;</div><div class='ctx'> 					CLKOUT_SL_SHIFT) -</div><div class='ctx'> 					((cdv * clkext - 1) / 8000000);</div><div class='del'>-				if (slew &lt; 0)</div><div class='add'>+				if (slew &gt; (CLKOUT_SL_MASK &gt;&gt; CLKOUT_SL_SHIFT))</div><div class='ctx'> 					slew = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			priv-&gt;clkout |= (slew &lt;&lt; CLKOUT_SL_SHIFT) &amp;</div><div class='hunk'>@@ -238,7 +220,7 @@ exit_release_mem:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cc770_platform_remove(struct platform_device *pdev)</div><div class='add'>+static void cc770_platform_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct cc770_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -250,8 +232,6 @@ static int cc770_platform_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	release_mem_region(mem-&gt;start, resource_size(mem));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id cc770_platform_table[] = {</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/Kconfig b/drivers/net/can/ctucanfd/Kconfig<br/>new file mode 100644<br/>index 000000000000..f52407f5c5d8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+config CAN_CTUCANFD</div><div class='add'>+	tristate "CTU CAN-FD IP core" if COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for the CTU CAN FD open-source IP core.</div><div class='add'>+	  More documentation and core sources at project page</div><div class='add'>+	  (https://gitlab.fel.cvut.cz/canbus/ctucanfd_ip_core).</div><div class='add'>+	  The core integration to Xilinx Zynq system as platform driver</div><div class='add'>+	  is available (https://gitlab.fel.cvut.cz/canbus/zynq/zynq-can-sja1000-top).</div><div class='add'>+	  Implementation on Intel FPGA-based PCI Express board is available</div><div class='add'>+	  from project (https://gitlab.fel.cvut.cz/canbus/pcie-ctucanfd) and</div><div class='add'>+	  on Intel SoC from project (https://gitlab.fel.cvut.cz/canbus/intel-soc-ctucanfd).</div><div class='add'>+	  Guidepost CTU FEE CAN bus projects page https://canbus.pages.fel.cvut.cz/ .</div><div class='add'>+</div><div class='add'>+config CAN_CTUCANFD_PCI</div><div class='add'>+	tristate "CTU CAN-FD IP core PCI/PCIe driver"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select CAN_CTUCANFD</div><div class='add'>+	help</div><div class='add'>+	  This driver adds PCI/PCIe support for CTU CAN-FD IP core.</div><div class='add'>+	  The project providing FPGA design for Intel EP4CGX15 based DB4CGX15</div><div class='add'>+	  PCIe board with PiKRON.com designed transceiver riser shield is available</div><div class='add'>+	  at https://gitlab.fel.cvut.cz/canbus/pcie-ctucanfd .</div><div class='add'>+</div><div class='add'>+config CAN_CTUCANFD_PLATFORM</div><div class='add'>+	tristate "CTU CAN-FD IP core platform (FPGA, SoC) driver"</div><div class='add'>+	depends on HAS_IOMEM &amp;&amp; OF</div><div class='add'>+	select CAN_CTUCANFD</div><div class='add'>+	help</div><div class='add'>+	  The core has been tested together with OpenCores SJA1000</div><div class='add'>+	  modified to be CAN FD frames tolerant on MicroZed Zynq based</div><div class='add'>+	  MZ_APO education kits designed by Petr Porazil from PiKRON.com</div><div class='add'>+	  company. FPGA design https://gitlab.fel.cvut.cz/canbus/zynq/zynq-can-sja1000-top.</div><div class='add'>+	  The kit description at the Computer Architectures course pages</div><div class='add'>+	  https://cw.fel.cvut.cz/wiki/courses/b35apo/documentation/mz_apo/start .</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/Makefile b/drivers/net/can/ctucanfd/Makefile<br/>new file mode 100644<br/>index 000000000000..8078f1f2c30f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#</div><div class='add'>+# Makefile for the CTU CAN-FD IP module drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_CTUCANFD) := ctucanfd.o</div><div class='add'>+ctucanfd-y := ctucanfd_base.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_CTUCANFD_PCI) += ctucanfd_pci.o</div><div class='add'>+obj-$(CONFIG_CAN_CTUCANFD_PLATFORM) += ctucanfd_platform.o</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/ctucanfd.h b/drivers/net/can/ctucanfd/ctucanfd.h<br/>new file mode 100644<br/>index 000000000000..0e9904f6a05d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/ctucanfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/ctucanfd.h</a></div><div class='hunk'>@@ -0,0 +1,82 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * CTU CAN FD IP Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2018 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; self-funded</div><div class='add'>+ * Copyright (C) 2018-2019 Martin Jerabek &lt;martin.jerabek01@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt; FEE CTU/self-funded</div><div class='add'>+ *</div><div class='add'>+ * Project advisors:</div><div class='add'>+ *     Jiri Novak &lt;jnovak@fel.cvut.cz&gt;</div><div class='add'>+ *     Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Department of Measurement         (http://meas.fel.cvut.cz/)</div><div class='add'>+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)</div><div class='add'>+ * Czech Technical University        (http://www.cvut.cz/)</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+#ifndef __CTUCANFD__</div><div class='add'>+#define __CTUCANFD__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+</div><div class='add'>+enum ctu_can_fd_can_registers;</div><div class='add'>+</div><div class='add'>+struct ctucan_priv {</div><div class='add'>+	struct can_priv can; /* must be first member! */</div><div class='add'>+</div><div class='add'>+	void __iomem *mem_base;</div><div class='add'>+	u32 (*read_reg)(struct ctucan_priv *priv,</div><div class='add'>+			enum ctu_can_fd_can_registers reg);</div><div class='add'>+	void (*write_reg)(struct ctucan_priv *priv,</div><div class='add'>+			  enum ctu_can_fd_can_registers reg, u32 val);</div><div class='add'>+</div><div class='add'>+	unsigned int txb_head;</div><div class='add'>+	unsigned int txb_tail;</div><div class='add'>+	u32 txb_prio;</div><div class='add'>+	unsigned int ntxbufs;</div><div class='add'>+	spinlock_t tx_lock; /* spinlock to serialize allocation and processing of TX buffers */</div><div class='add'>+</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct clk *can_clk;</div><div class='add'>+</div><div class='add'>+	int irq_flags;</div><div class='add'>+	unsigned long drv_flags;</div><div class='add'>+</div><div class='add'>+	u32 rxfrm_first_word;</div><div class='add'>+</div><div class='add'>+	struct list_head peers_on_pdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_probe_common - Device type independent registration call</div><div class='add'>+ *</div><div class='add'>+ * This function does all the memory allocation and registration for the CAN</div><div class='add'>+ * device.</div><div class='add'>+ *</div><div class='add'>+ * @dev:	Handle to the generic device structure</div><div class='add'>+ * @addr:	Base address of CTU CAN FD core address</div><div class='add'>+ * @irq:	Interrupt number</div><div class='add'>+ * @ntxbufs:	Number of implemented Tx buffers</div><div class='add'>+ * @can_clk_rate: Clock rate, if 0 then clock are taken from device node</div><div class='add'>+ * @pm_enable_call: Whether pm_runtime_enable should be called</div><div class='add'>+ * @set_drvdata_fnc: Function to set network driver data for physical device</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+int ctucan_probe_common(struct device *dev, void __iomem *addr,</div><div class='add'>+			int irq, unsigned int ntxbufs,</div><div class='add'>+			unsigned long can_clk_rate,</div><div class='add'>+			int pm_enable_call,</div><div class='add'>+			void (*set_drvdata_fnc)(struct device *dev,</div><div class='add'>+						struct net_device *ndev));</div><div class='add'>+</div><div class='add'>+int ctucan_suspend(struct device *dev) __maybe_unused;</div><div class='add'>+int ctucan_resume(struct device *dev) __maybe_unused;</div><div class='add'>+</div><div class='add'>+#endif /*__CTUCANFD__*/</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/ctucanfd_base.c b/drivers/net/can/ctucanfd/ctucanfd_base.c<br/>new file mode 100644<br/>index 000000000000..1e6b9e3dc2fe<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/ctucanfd_base.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/ctucanfd_base.c</a></div><div class='hunk'>@@ -0,0 +1,1460 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * CTU CAN FD IP Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2018 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; self-funded</div><div class='add'>+ * Copyright (C) 2018-2019 Martin Jerabek &lt;martin.jerabek01@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2022 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt; FEE CTU/self-funded</div><div class='add'>+ *</div><div class='add'>+ * Project advisors:</div><div class='add'>+ *     Jiri Novak &lt;jnovak@fel.cvut.cz&gt;</div><div class='add'>+ *     Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Department of Measurement         (http://meas.fel.cvut.cz/)</div><div class='add'>+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)</div><div class='add'>+ * Czech Technical University        (http://www.cvut.cz/)</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ctucanfd.h"</div><div class='add'>+#include "ctucanfd_kregs.h"</div><div class='add'>+#include "ctucanfd_kframe.h"</div><div class='add'>+</div><div class='add'>+#ifdef DEBUG</div><div class='add'>+#define  ctucan_netdev_dbg(ndev, args...) \</div><div class='add'>+		netdev_dbg(ndev, args)</div><div class='add'>+#else</div><div class='add'>+#define ctucan_netdev_dbg(...) do { } while (0)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define CTUCANFD_ID 0xCAFD</div><div class='add'>+</div><div class='add'>+/* TX buffer rotation:</div><div class='add'>+ * - when a buffer transitions to empty state, rotate order and priorities</div><div class='add'>+ * - if more buffers seem to transition at the same time, rotate by the number of buffers</div><div class='add'>+ * - it may be assumed that buffers transition to empty state in FIFO order (because we manage</div><div class='add'>+ *   priorities that way)</div><div class='add'>+ * - at frame filling, do not rotate anything, just increment buffer modulo counter</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CTUCANFD_FLAG_RX_FFW_BUFFERED	1</div><div class='add'>+</div><div class='add'>+#define CTUCAN_STATE_TO_TEXT_ENTRY(st) \</div><div class='add'>+		[st] = #st</div><div class='add'>+</div><div class='add'>+enum ctucan_txtb_status {</div><div class='add'>+	TXT_NOT_EXIST       = 0x0,</div><div class='add'>+	TXT_RDY             = 0x1,</div><div class='add'>+	TXT_TRAN            = 0x2,</div><div class='add'>+	TXT_ABTP            = 0x3,</div><div class='add'>+	TXT_TOK             = 0x4,</div><div class='add'>+	TXT_ERR             = 0x6,</div><div class='add'>+	TXT_ABT             = 0x7,</div><div class='add'>+	TXT_ETY             = 0x8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ctucan_txtb_command {</div><div class='add'>+	TXT_CMD_SET_EMPTY   = 0x01,</div><div class='add'>+	TXT_CMD_SET_READY   = 0x02,</div><div class='add'>+	TXT_CMD_SET_ABORT   = 0x04</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const ctu_can_fd_bit_timing_max = {</div><div class='add'>+	.name = "ctu_can_fd",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 190,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 63,</div><div class='add'>+	.sjw_max = 31,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 8,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const ctu_can_fd_bit_timing_data_max = {</div><div class='add'>+	.name = "ctu_can_fd",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 94,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 31,</div><div class='add'>+	.sjw_max = 31,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 2,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const ctucan_state_strings[CAN_STATE_MAX] = {</div><div class='add'>+	CTUCAN_STATE_TO_TEXT_ENTRY(CAN_STATE_ERROR_ACTIVE),</div><div class='add'>+	CTUCAN_STATE_TO_TEXT_ENTRY(CAN_STATE_ERROR_WARNING),</div><div class='add'>+	CTUCAN_STATE_TO_TEXT_ENTRY(CAN_STATE_ERROR_PASSIVE),</div><div class='add'>+	CTUCAN_STATE_TO_TEXT_ENTRY(CAN_STATE_BUS_OFF),</div><div class='add'>+	CTUCAN_STATE_TO_TEXT_ENTRY(CAN_STATE_STOPPED),</div><div class='add'>+	CTUCAN_STATE_TO_TEXT_ENTRY(CAN_STATE_SLEEPING)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ctucan_write32_le(struct ctucan_priv *priv,</div><div class='add'>+			      enum ctu_can_fd_can_registers reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	iowrite32(val, priv-&gt;mem_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctucan_write32_be(struct ctucan_priv *priv,</div><div class='add'>+			      enum ctu_can_fd_can_registers reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	iowrite32be(val, priv-&gt;mem_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ctucan_read32_le(struct ctucan_priv *priv,</div><div class='add'>+			    enum ctu_can_fd_can_registers reg)</div><div class='add'>+{</div><div class='add'>+	return ioread32(priv-&gt;mem_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ctucan_read32_be(struct ctucan_priv *priv,</div><div class='add'>+			    enum ctu_can_fd_can_registers reg)</div><div class='add'>+{</div><div class='add'>+	return ioread32be(priv-&gt;mem_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctucan_write32(struct ctucan_priv *priv, enum ctu_can_fd_can_registers reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;write_reg(priv, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ctucan_read32(struct ctucan_priv *priv, enum ctu_can_fd_can_registers reg)</div><div class='add'>+{</div><div class='add'>+	return priv-&gt;read_reg(priv, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctucan_write_txt_buf(struct ctucan_priv *priv, enum ctu_can_fd_can_registers buf_base,</div><div class='add'>+				 u32 offset, u32 val)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;write_reg(priv, buf_base + offset, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CTU_CAN_FD_TXTNF(priv) (!!FIELD_GET(REG_STATUS_TXNF, ctucan_read32(priv, CTUCANFD_STATUS)))</div><div class='add'>+#define CTU_CAN_FD_ENABLED(priv) (!!FIELD_GET(REG_MODE_ENA, ctucan_read32(priv, CTUCANFD_MODE)))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_state_to_str() - Converts CAN controller state code to corresponding text</div><div class='add'>+ * @state:	CAN controller state code</div><div class='add'>+ *</div><div class='add'>+ * Return: Pointer to string representation of the error state</div><div class='add'>+ */</div><div class='add'>+static const char *ctucan_state_to_str(enum can_state state)</div><div class='add'>+{</div><div class='add'>+	const char *txt = NULL;</div><div class='add'>+</div><div class='add'>+	if (state &gt;= 0 &amp;&amp; state &lt; CAN_STATE_MAX)</div><div class='add'>+		txt = ctucan_state_strings[state];</div><div class='add'>+	return txt ? txt : "UNKNOWN";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_reset() - Issues software reset request to CTU CAN FD</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 for success, -%ETIMEDOUT if CAN controller does not leave reset</div><div class='add'>+ */</div><div class='add'>+static int ctucan_reset(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int i = 100;</div><div class='add'>+</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_MODE, REG_MODE_RST);</div><div class='add'>+	clear_bit(CTUCANFD_FLAG_RX_FFW_BUFFERED, &amp;priv-&gt;drv_flags);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		u16 device_id = FIELD_GET(REG_DEVICE_ID_DEVICE_ID,</div><div class='add'>+					  ctucan_read32(priv, CTUCANFD_DEVICE_ID));</div><div class='add'>+</div><div class='add'>+		if (device_id == 0xCAFD)</div><div class='add'>+			return 0;</div><div class='add'>+		if (!i--) {</div><div class='add'>+			netdev_warn(ndev, "device did not leave reset\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+	} while (1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_set_btr() - Sets CAN bus bit timing in CTU CAN FD</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ * @bt:		Pointer to Bit timing structure</div><div class='add'>+ * @nominal:	True - Nominal bit timing, False - Data bit timing</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 - OK, -%EPERM if controller is enabled</div><div class='add'>+ */</div><div class='add'>+static int ctucan_set_btr(struct net_device *ndev, struct can_bittiming *bt, bool nominal)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int max_ph1_len = 31;</div><div class='add'>+	u32 btr = 0;</div><div class='add'>+	u32 prop_seg = bt-&gt;prop_seg;</div><div class='add'>+	u32 phase_seg1 = bt-&gt;phase_seg1;</div><div class='add'>+</div><div class='add'>+	if (CTU_CAN_FD_ENABLED(priv)) {</div><div class='add'>+		netdev_err(ndev, "BUG! Cannot set bittiming - CAN is enabled\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nominal)</div><div class='add'>+		max_ph1_len = 63;</div><div class='add'>+</div><div class='add'>+	/* The timing calculation functions have only constraints on tseg1, which is prop_seg +</div><div class='add'>+	 * phase1_seg combined. tseg1 is then split in half and stored into prog_seg and phase_seg1.</div><div class='add'>+	 * In CTU CAN FD, PROP is 6/7 bits wide but PH1 only 6/5, so we must re-distribute the</div><div class='add'>+	 * values here.</div><div class='add'>+	 */</div><div class='add'>+	if (phase_seg1 &gt; max_ph1_len) {</div><div class='add'>+		prop_seg += phase_seg1 - max_ph1_len;</div><div class='add'>+		phase_seg1 = max_ph1_len;</div><div class='add'>+		bt-&gt;prop_seg = prop_seg;</div><div class='add'>+		bt-&gt;phase_seg1 = phase_seg1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nominal) {</div><div class='add'>+		btr = FIELD_PREP(REG_BTR_PROP, prop_seg);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_PH1, phase_seg1);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_PH2, bt-&gt;phase_seg2);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_BRP, bt-&gt;brp);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_SJW, bt-&gt;sjw);</div><div class='add'>+</div><div class='add'>+		ctucan_write32(priv, CTUCANFD_BTR, btr);</div><div class='add'>+	} else {</div><div class='add'>+		btr = FIELD_PREP(REG_BTR_FD_PROP_FD, prop_seg);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_FD_PH1_FD, phase_seg1);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_FD_PH2_FD, bt-&gt;phase_seg2);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_FD_BRP_FD, bt-&gt;brp);</div><div class='add'>+		btr |= FIELD_PREP(REG_BTR_FD_SJW_FD, bt-&gt;sjw);</div><div class='add'>+</div><div class='add'>+		ctucan_write32(priv, CTUCANFD_BTR_FD, btr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_set_bittiming() - CAN set nominal bit timing routine</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -%EPERM on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_set_bittiming(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+</div><div class='add'>+	/* Note that bt may be modified here */</div><div class='add'>+	return ctucan_set_btr(ndev, bt, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_set_data_bittiming() - CAN set data bit timing routine</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -%EPERM on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_set_data_bittiming(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+</div><div class='add'>+	/* Note that dbt may be modified here */</div><div class='add'>+	return ctucan_set_btr(ndev, dbt, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_set_secondary_sample_point() - Sets secondary sample point in CTU CAN FD</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, -%EPERM if controller is enabled</div><div class='add'>+ */</div><div class='add'>+static int ctucan_set_secondary_sample_point(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	int ssp_offset = 0;</div><div class='add'>+	u32 ssp_cfg = 0; /* No SSP by default */</div><div class='add'>+</div><div class='add'>+	if (CTU_CAN_FD_ENABLED(priv)) {</div><div class='add'>+		netdev_err(ndev, "BUG! Cannot set SSP - CAN is enabled\n");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use SSP for bit-rates above 1 Mbits/s */</div><div class='add'>+	if (dbt-&gt;bitrate &gt; 1000000) {</div><div class='add'>+		/* Calculate SSP in minimal time quanta */</div><div class='add'>+		ssp_offset = (priv-&gt;can.clock.freq / 1000) * dbt-&gt;sample_point / dbt-&gt;bitrate;</div><div class='add'>+</div><div class='add'>+		if (ssp_offset &gt; 127) {</div><div class='add'>+			netdev_warn(ndev, "SSP offset saturated to 127\n");</div><div class='add'>+			ssp_offset = 127;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ssp_cfg = FIELD_PREP(REG_TRV_DELAY_SSP_OFFSET, ssp_offset);</div><div class='add'>+		ssp_cfg |= FIELD_PREP(REG_TRV_DELAY_SSP_SRC, 0x1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_TRV_DELAY, ssp_cfg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_set_mode() - Sets CTU CAN FDs mode</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ * @mode:	Pointer to controller modes to be set</div><div class='add'>+ */</div><div class='add'>+static void ctucan_set_mode(struct ctucan_priv *priv, const struct can_ctrlmode *mode)</div><div class='add'>+{</div><div class='add'>+	u32 mode_reg = ctucan_read32(priv, CTUCANFD_MODE);</div><div class='add'>+</div><div class='add'>+	mode_reg = (mode-&gt;flags &amp; CAN_CTRLMODE_LOOPBACK) ?</div><div class='add'>+			(mode_reg | REG_MODE_ILBP) :</div><div class='add'>+			(mode_reg &amp; ~REG_MODE_ILBP);</div><div class='add'>+</div><div class='add'>+	mode_reg = (mode-&gt;flags &amp; CAN_CTRLMODE_LISTENONLY) ?</div><div class='add'>+			(mode_reg | REG_MODE_BMM) :</div><div class='add'>+			(mode_reg &amp; ~REG_MODE_BMM);</div><div class='add'>+</div><div class='add'>+	mode_reg = (mode-&gt;flags &amp; CAN_CTRLMODE_FD) ?</div><div class='add'>+			(mode_reg | REG_MODE_FDE) :</div><div class='add'>+			(mode_reg &amp; ~REG_MODE_FDE);</div><div class='add'>+</div><div class='add'>+	mode_reg = (mode-&gt;flags &amp; CAN_CTRLMODE_PRESUME_ACK) ?</div><div class='add'>+			(mode_reg | REG_MODE_ACF) :</div><div class='add'>+			(mode_reg &amp; ~REG_MODE_ACF);</div><div class='add'>+</div><div class='add'>+	mode_reg = (mode-&gt;flags &amp; CAN_CTRLMODE_FD_NON_ISO) ?</div><div class='add'>+			(mode_reg | REG_MODE_NISOFD) :</div><div class='add'>+			(mode_reg &amp; ~REG_MODE_NISOFD);</div><div class='add'>+</div><div class='add'>+	/* One shot mode supported indirectly via Retransmit limit */</div><div class='add'>+	mode_reg &amp;= ~FIELD_PREP(REG_MODE_RTRTH, 0xF);</div><div class='add'>+	mode_reg = (mode-&gt;flags &amp; CAN_CTRLMODE_ONE_SHOT) ?</div><div class='add'>+			(mode_reg | REG_MODE_RTRLE) :</div><div class='add'>+			(mode_reg &amp; ~REG_MODE_RTRLE);</div><div class='add'>+</div><div class='add'>+	/* Some bits fixed:</div><div class='add'>+	 *   TSTM  - Off, User shall not be able to change REC/TEC by hand during operation</div><div class='add'>+	 */</div><div class='add'>+	mode_reg &amp;= ~REG_MODE_TSTM;</div><div class='add'>+</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_MODE, mode_reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_chip_start() - This routine starts the driver</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Routine expects that chip is in reset state. It setups initial</div><div class='add'>+ * Tx buffers for FIFO priorities, sets bittiming, enables interrupts,</div><div class='add'>+ * switches core to operational mode and changes controller</div><div class='add'>+ * state to %CAN_STATE_STOPPED.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_chip_start(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 int_ena, int_msk;</div><div class='add'>+	u32 mode_reg;</div><div class='add'>+	int err;</div><div class='add'>+	struct can_ctrlmode mode;</div><div class='add'>+</div><div class='add'>+	priv-&gt;txb_prio = 0x01234567;</div><div class='add'>+	priv-&gt;txb_head = 0;</div><div class='add'>+	priv-&gt;txb_tail = 0;</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_TX_PRIORITY, priv-&gt;txb_prio);</div><div class='add'>+</div><div class='add'>+	/* Configure bit-rates and ssp */</div><div class='add'>+	err = ctucan_set_bittiming(ndev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ctucan_set_data_bittiming(ndev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ctucan_set_secondary_sample_point(ndev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Configure modes */</div><div class='add'>+	mode.flags = priv-&gt;can.ctrlmode;</div><div class='add'>+	mode.mask = 0xFFFFFFFF;</div><div class='add'>+	ctucan_set_mode(priv, &amp;mode);</div><div class='add'>+</div><div class='add'>+	/* Configure interrupts */</div><div class='add'>+	int_ena = REG_INT_STAT_RBNEI |</div><div class='add'>+		  REG_INT_STAT_TXBHCI |</div><div class='add'>+		  REG_INT_STAT_EWLI |</div><div class='add'>+		  REG_INT_STAT_FCSI;</div><div class='add'>+</div><div class='add'>+	/* Bus error reporting -&gt; Allow Error/Arb.lost interrupts */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='add'>+		int_ena |= REG_INT_STAT_ALI |</div><div class='add'>+			   REG_INT_STAT_BEI;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	int_msk = ~int_ena; /* Mask all disabled interrupts */</div><div class='add'>+</div><div class='add'>+	/* It's after reset, so there is no need to clear anything */</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_INT_MASK_SET, int_msk);</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_INT_ENA_SET, int_ena);</div><div class='add'>+</div><div class='add'>+	/* Controller enters ERROR_ACTIVE on initial FCSI */</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	/* Enable the controller */</div><div class='add'>+	mode_reg = ctucan_read32(priv, CTUCANFD_MODE);</div><div class='add'>+	mode_reg |= REG_MODE_ENA;</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_MODE, mode_reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_do_set_mode() - Sets mode of the driver</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ * @mode:	Tells the mode of the driver</div><div class='add'>+ *</div><div class='add'>+ * This check the drivers state and calls the corresponding modes to set.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		ret = ctucan_reset(ndev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = ctucan_chip_start(ndev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			netdev_err(ndev, "ctucan_chip_start failed!\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_get_tx_status() - Gets status of TXT buffer</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ * @buf:	Buffer index (0-based)</div><div class='add'>+ *</div><div class='add'>+ * Return: Status of TXT buffer</div><div class='add'>+ */</div><div class='add'>+static enum ctucan_txtb_status ctucan_get_tx_status(struct ctucan_priv *priv, u8 buf)</div><div class='add'>+{</div><div class='add'>+	u32 tx_status = ctucan_read32(priv, CTUCANFD_TX_STATUS);</div><div class='add'>+	enum ctucan_txtb_status status = (tx_status &gt;&gt; (buf * 4)) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_is_txt_buf_writable() - Checks if frame can be inserted to TXT Buffer</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ * @buf:	Buffer index (0-based)</div><div class='add'>+ *</div><div class='add'>+ * Return: True - Frame can be inserted to TXT Buffer, False - If attempted, frame will not be</div><div class='add'>+ *	   inserted to TXT Buffer</div><div class='add'>+ */</div><div class='add'>+static bool ctucan_is_txt_buf_writable(struct ctucan_priv *priv, u8 buf)</div><div class='add'>+{</div><div class='add'>+	enum ctucan_txtb_status buf_status;</div><div class='add'>+</div><div class='add'>+	buf_status = ctucan_get_tx_status(priv, buf);</div><div class='add'>+	if (buf_status == TXT_RDY || buf_status == TXT_TRAN || buf_status == TXT_ABTP)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_insert_frame() - Inserts frame to TXT buffer</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ * @cf:		Pointer to CAN frame to be inserted</div><div class='add'>+ * @buf:	TXT Buffer index to which frame is inserted (0-based)</div><div class='add'>+ * @isfdf:	True - CAN FD Frame, False - CAN 2.0 Frame</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * * True - Frame inserted successfully</div><div class='add'>+ * * False - Frame was not inserted due to one of:</div><div class='add'>+ *	1. TXT Buffer is not writable (it is in wrong state)</div><div class='add'>+ *	2. Invalid TXT buffer index</div><div class='add'>+ *	3. Invalid frame length</div><div class='add'>+ */</div><div class='add'>+static bool ctucan_insert_frame(struct ctucan_priv *priv, const struct canfd_frame *cf, u8 buf,</div><div class='add'>+				bool isfdf)</div><div class='add'>+{</div><div class='add'>+	u32 buf_base;</div><div class='add'>+	u32 ffw = 0;</div><div class='add'>+	u32 idw = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (buf &gt;= priv-&gt;ntxbufs)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!ctucan_is_txt_buf_writable(priv, buf))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;len &gt; CANFD_MAX_DLEN)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Prepare Frame format */</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		ffw |= REG_FRAME_FORMAT_W_RTR;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		ffw |= REG_FRAME_FORMAT_W_IDE;</div><div class='add'>+</div><div class='add'>+	if (isfdf) {</div><div class='add'>+		ffw |= REG_FRAME_FORMAT_W_FDF;</div><div class='add'>+		if (cf-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			ffw |= REG_FRAME_FORMAT_W_BRS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ffw |= FIELD_PREP(REG_FRAME_FORMAT_W_DLC, can_fd_len2dlc(cf-&gt;len));</div><div class='add'>+</div><div class='add'>+	/* Prepare identifier */</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		idw = cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+	else</div><div class='add'>+		idw = FIELD_PREP(REG_IDENTIFIER_W_IDENTIFIER_BASE, cf-&gt;can_id &amp; CAN_SFF_MASK);</div><div class='add'>+</div><div class='add'>+	/* Write ID, Frame format, Don't write timestamp -&gt; Time triggered transmission disabled */</div><div class='add'>+	buf_base = (buf + 1) * 0x100;</div><div class='add'>+	ctucan_write_txt_buf(priv, buf_base, CTUCANFD_FRAME_FORMAT_W, ffw);</div><div class='add'>+	ctucan_write_txt_buf(priv, buf_base, CTUCANFD_IDENTIFIER_W, idw);</div><div class='add'>+</div><div class='add'>+	/* Write Data payload */</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i += 4) {</div><div class='add'>+			u32 data = le32_to_cpu(*(__le32 *)(cf-&gt;data + i));</div><div class='add'>+</div><div class='add'>+			ctucan_write_txt_buf(priv, buf_base, CTUCANFD_DATA_1_4_W + i, data);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_give_txtb_cmd() - Applies command on TXT buffer</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ * @cmd:	Command to give</div><div class='add'>+ * @buf:	Buffer index (0-based)</div><div class='add'>+ */</div><div class='add'>+static void ctucan_give_txtb_cmd(struct ctucan_priv *priv, enum ctucan_txtb_command cmd, u8 buf)</div><div class='add'>+{</div><div class='add'>+	u32 tx_cmd = cmd;</div><div class='add'>+</div><div class='add'>+	tx_cmd |= 1 &lt;&lt; (buf + 8);</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_TX_COMMAND, tx_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_start_xmit() - Starts the transmission</div><div class='add'>+ * @skb:	sk_buff pointer that contains data to be Txed</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Invoked from upper layers to initiate transmission. Uses the next available free TXT Buffer and</div><div class='add'>+ * populates its fields to start the transmission.</div><div class='add'>+ *</div><div class='add'>+ * Return: %NETDEV_TX_OK on success, %NETDEV_TX_BUSY when no free TXT buffer is available,</div><div class='add'>+ *         negative return values reserved for error cases</div><div class='add'>+ */</div><div class='add'>+static netdev_tx_t ctucan_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	u32 txtb_id;</div><div class='add'>+	bool ok;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!CTU_CAN_FD_TXTNF(priv))) {</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+		netdev_err(ndev, "BUG!, no TXB free when queue awake!\n");</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	txtb_id = priv-&gt;txb_head % priv-&gt;ntxbufs;</div><div class='add'>+	ctucan_netdev_dbg(ndev, "%s: using TXB#%u\n", __func__, txtb_id);</div><div class='add'>+	ok = ctucan_insert_frame(priv, cf, txtb_id, can_is_canfd_skb(skb));</div><div class='add'>+</div><div class='add'>+	if (!ok) {</div><div class='add'>+		netdev_err(ndev, "BUG! TXNF set but cannot insert frame into TXTB! HW Bug?");</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		ndev-&gt;stats.tx_dropped++;</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, ndev, txtb_id, 0);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+	ctucan_give_txtb_cmd(priv, TXT_CMD_SET_READY, txtb_id);</div><div class='add'>+	priv-&gt;txb_head++;</div><div class='add'>+</div><div class='add'>+	/* Check if all TX buffers are full */</div><div class='add'>+	if (!CTU_CAN_FD_TXTNF(priv))</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_read_rx_frame() - Reads frame from RX FIFO</div><div class='add'>+ * @priv:	Pointer to CTU CAN FD's private data</div><div class='add'>+ * @cf:		Pointer to CAN frame struct</div><div class='add'>+ * @ffw:	Previously read frame format word</div><div class='add'>+ *</div><div class='add'>+ * Note: Frame format word must be read separately and provided in 'ffw'.</div><div class='add'>+ */</div><div class='add'>+static void ctucan_read_rx_frame(struct ctucan_priv *priv, struct canfd_frame *cf, u32 ffw)</div><div class='add'>+{</div><div class='add'>+	u32 idw;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	unsigned int wc;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	idw = ctucan_read32(priv, CTUCANFD_RX_DATA);</div><div class='add'>+	if (FIELD_GET(REG_FRAME_FORMAT_W_IDE, ffw))</div><div class='add'>+		cf-&gt;can_id = (idw &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='add'>+	else</div><div class='add'>+		cf-&gt;can_id = (idw &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='add'>+</div><div class='add'>+	/* BRS, ESI, RTR Flags */</div><div class='add'>+	if (FIELD_GET(REG_FRAME_FORMAT_W_FDF, ffw)) {</div><div class='add'>+		if (FIELD_GET(REG_FRAME_FORMAT_W_BRS, ffw))</div><div class='add'>+			cf-&gt;flags |= CANFD_BRS;</div><div class='add'>+		if (FIELD_GET(REG_FRAME_FORMAT_W_ESI_RSV, ffw))</div><div class='add'>+			cf-&gt;flags |= CANFD_ESI;</div><div class='add'>+	} else if (FIELD_GET(REG_FRAME_FORMAT_W_RTR, ffw)) {</div><div class='add'>+		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wc = FIELD_GET(REG_FRAME_FORMAT_W_RWCNT, ffw) - 3;</div><div class='add'>+</div><div class='add'>+	/* DLC */</div><div class='add'>+	if (FIELD_GET(REG_FRAME_FORMAT_W_DLC, ffw) &lt;= 8) {</div><div class='add'>+		len = FIELD_GET(REG_FRAME_FORMAT_W_DLC, ffw);</div><div class='add'>+	} else {</div><div class='add'>+		if (FIELD_GET(REG_FRAME_FORMAT_W_FDF, ffw))</div><div class='add'>+			len = wc &lt;&lt; 2;</div><div class='add'>+		else</div><div class='add'>+			len = 8;</div><div class='add'>+	}</div><div class='add'>+	cf-&gt;len = len;</div><div class='add'>+	if (unlikely(len &gt; wc * 4))</div><div class='add'>+		len = wc * 4;</div><div class='add'>+</div><div class='add'>+	/* Timestamp - Read and throw away */</div><div class='add'>+	ctucan_read32(priv, CTUCANFD_RX_DATA);</div><div class='add'>+	ctucan_read32(priv, CTUCANFD_RX_DATA);</div><div class='add'>+</div><div class='add'>+	/* Data */</div><div class='add'>+	for (i = 0; i &lt; len; i += 4) {</div><div class='add'>+		u32 data = ctucan_read32(priv, CTUCANFD_RX_DATA);</div><div class='add'>+		*(__le32 *)(cf-&gt;data + i) = cpu_to_le32(data);</div><div class='add'>+	}</div><div class='add'>+	while (unlikely(i &lt; wc * 4)) {</div><div class='add'>+		ctucan_read32(priv, CTUCANFD_RX_DATA);</div><div class='add'>+		i += 4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_rx() -  Called from CAN ISR to complete the received frame processing</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * This function is invoked from the CAN isr(poll) to process the Rx frames. It does minimal</div><div class='add'>+ * processing and invokes "netif_receive_skb" to complete further processing.</div><div class='add'>+ * Return: 1 when frame is passed to the network layer, 0 when the first frame word is read but</div><div class='add'>+ *	   system is out of free SKBs temporally and left code to resolve SKB allocation later,</div><div class='add'>+ *         -%EAGAIN in a case of empty Rx FIFO.</div><div class='add'>+ */</div><div class='add'>+static int ctucan_rx(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 ffw;</div><div class='add'>+</div><div class='add'>+	if (test_bit(CTUCANFD_FLAG_RX_FFW_BUFFERED, &amp;priv-&gt;drv_flags)) {</div><div class='add'>+		ffw = priv-&gt;rxfrm_first_word;</div><div class='add'>+		clear_bit(CTUCANFD_FLAG_RX_FFW_BUFFERED, &amp;priv-&gt;drv_flags);</div><div class='add'>+	} else {</div><div class='add'>+		ffw = ctucan_read32(priv, CTUCANFD_RX_DATA);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!FIELD_GET(REG_FRAME_FORMAT_W_RWCNT, ffw))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(REG_FRAME_FORMAT_W_FDF, ffw))</div><div class='add'>+		skb = alloc_canfd_skb(ndev, &amp;cf);</div><div class='add'>+	else</div><div class='add'>+		skb = alloc_can_skb(ndev, (struct can_frame **)&amp;cf);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		priv-&gt;rxfrm_first_word = ffw;</div><div class='add'>+		set_bit(CTUCANFD_FLAG_RX_FFW_BUFFERED, &amp;priv-&gt;drv_flags);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctucan_read_rx_frame(priv, cf, ffw);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+	netif_receive_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_read_fault_state() - Reads CTU CAN FDs fault confinement state.</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ *</div><div class='add'>+ * Returns: Fault confinement state of controller</div><div class='add'>+ */</div><div class='add'>+static enum can_state ctucan_read_fault_state(struct ctucan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 fs;</div><div class='add'>+	u32 rec_tec;</div><div class='add'>+	u32 ewl;</div><div class='add'>+</div><div class='add'>+	fs = ctucan_read32(priv, CTUCANFD_EWL);</div><div class='add'>+	rec_tec = ctucan_read32(priv, CTUCANFD_REC);</div><div class='add'>+	ewl = FIELD_GET(REG_EWL_EW_LIMIT, fs);</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(REG_EWL_ERA, fs)) {</div><div class='add'>+		if (ewl &gt; FIELD_GET(REG_REC_REC_VAL, rec_tec) &amp;&amp;</div><div class='add'>+		    ewl &gt; FIELD_GET(REG_REC_TEC_VAL, rec_tec))</div><div class='add'>+			return CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		else</div><div class='add'>+			return CAN_STATE_ERROR_WARNING;</div><div class='add'>+	} else if (FIELD_GET(REG_EWL_ERP, fs)) {</div><div class='add'>+		return CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	} else if (FIELD_GET(REG_EWL_BOF, fs)) {</div><div class='add'>+		return CAN_STATE_BUS_OFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN(true, "Invalid error state");</div><div class='add'>+	return CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_get_rec_tec() - Reads REC/TEC counter values from controller</div><div class='add'>+ * @priv:	Pointer to private data</div><div class='add'>+ * @bec:	Pointer to Error counter structure</div><div class='add'>+ */</div><div class='add'>+static void ctucan_get_rec_tec(struct ctucan_priv *priv, struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	u32 err_ctrs = ctucan_read32(priv, CTUCANFD_REC);</div><div class='add'>+</div><div class='add'>+	bec-&gt;rxerr = FIELD_GET(REG_REC_REC_VAL, err_ctrs);</div><div class='add'>+	bec-&gt;txerr = FIELD_GET(REG_REC_TEC_VAL, err_ctrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_err_interrupt() - Error frame ISR</div><div class='add'>+ * @ndev:	net_device pointer</div><div class='add'>+ * @isr:	interrupt status register value</div><div class='add'>+ *</div><div class='add'>+ * This is the CAN error interrupt and it will check the type of error and forward the error</div><div class='add'>+ * frame to upper layers.</div><div class='add'>+ */</div><div class='add'>+static void ctucan_err_interrupt(struct net_device *ndev, u32 isr)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	enum can_state state;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	u32 err_capt_alc;</div><div class='add'>+	int dologerr = net_ratelimit();</div><div class='add'>+</div><div class='add'>+	ctucan_get_rec_tec(priv, &amp;bec);</div><div class='add'>+	state = ctucan_read_fault_state(priv);</div><div class='add'>+	err_capt_alc = ctucan_read32(priv, CTUCANFD_ERR_CAPT);</div><div class='add'>+</div><div class='add'>+	if (dologerr)</div><div class='add'>+		netdev_info(ndev, "%s: ISR = 0x%08x, rxerr %d, txerr %d, error type %lu, pos %lu, ALC id_field %lu, bit %lu\n",</div><div class='add'>+			    __func__, isr, bec.rxerr, bec.txerr,</div><div class='add'>+			    FIELD_GET(REG_ERR_CAPT_ERR_TYPE, err_capt_alc),</div><div class='add'>+			    FIELD_GET(REG_ERR_CAPT_ERR_POS, err_capt_alc),</div><div class='add'>+			    FIELD_GET(REG_ERR_CAPT_ALC_ID_FIELD, err_capt_alc),</div><div class='add'>+			    FIELD_GET(REG_ERR_CAPT_ALC_BIT, err_capt_alc));</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	/* EWLI: error warning limit condition met</div><div class='add'>+	 * FCSI: fault confinement state changed</div><div class='add'>+	 * ALI:  arbitration lost (just informative)</div><div class='add'>+	 * BEI:  bus error interrupt</div><div class='add'>+	 */</div><div class='add'>+	if (FIELD_GET(REG_INT_STAT_FCSI, isr) || FIELD_GET(REG_INT_STAT_EWLI, isr)) {</div><div class='add'>+		netdev_info(ndev, "state changes from %s to %s\n",</div><div class='add'>+			    ctucan_state_to_str(priv-&gt;can.state),</div><div class='add'>+			    ctucan_state_to_str(state));</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;can.state == state)</div><div class='add'>+			netdev_warn(ndev,</div><div class='add'>+				    "current and previous state is the same! (missed interrupt?)\n");</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.state = state;</div><div class='add'>+		switch (state) {</div><div class='add'>+		case CAN_STATE_BUS_OFF:</div><div class='add'>+			priv-&gt;can.can_stats.bus_off++;</div><div class='add'>+			can_bus_off(ndev);</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+			break;</div><div class='add'>+		case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+			priv-&gt;can.can_stats.error_passive++;</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='add'>+				cf-&gt;data[1] = (bec.rxerr &gt; 127) ?</div><div class='add'>+						CAN_ERR_CRTL_RX_PASSIVE :</div><div class='add'>+						CAN_ERR_CRTL_TX_PASSIVE;</div><div class='add'>+				cf-&gt;data[6] = bec.txerr;</div><div class='add'>+				cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case CAN_STATE_ERROR_WARNING:</div><div class='add'>+			priv-&gt;can.can_stats.error_warning++;</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='add'>+				cf-&gt;data[1] |= (bec.txerr &gt; bec.rxerr) ?</div><div class='add'>+					CAN_ERR_CRTL_TX_WARNING :</div><div class='add'>+					CAN_ERR_CRTL_RX_WARNING;</div><div class='add'>+				cf-&gt;data[6] = bec.txerr;</div><div class='add'>+				cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+				cf-&gt;data[1] = CAN_ERR_CRTL_ACTIVE;</div><div class='add'>+				cf-&gt;data[6] = bec.txerr;</div><div class='add'>+				cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			netdev_warn(ndev, "unhandled error state (%d:%s)!\n",</div><div class='add'>+				    state, ctucan_state_to_str(state));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for Arbitration Lost interrupt */</div><div class='add'>+	if (FIELD_GET(REG_INT_STAT_ALI, isr)) {</div><div class='add'>+		if (dologerr)</div><div class='add'>+			netdev_info(ndev, "arbitration lost\n");</div><div class='add'>+		priv-&gt;can.can_stats.arbitration_lost++;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='add'>+			cf-&gt;data[0] = CAN_ERR_LOSTARB_UNSPEC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for Bus Error interrupt */</div><div class='add'>+	if (FIELD_GET(REG_INT_STAT_BEI, isr)) {</div><div class='add'>+		netdev_info(ndev, "bus error\n");</div><div class='add'>+		priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+			cf-&gt;data[2] = CAN_ERR_PROT_UNSPEC;</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_UNSPEC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		stats-&gt;rx_packets++;</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_rx_poll() - Poll routine for rx packets (NAPI)</div><div class='add'>+ * @napi:	NAPI structure pointer</div><div class='add'>+ * @quota:	Max number of rx packets to be processed.</div><div class='add'>+ *</div><div class='add'>+ * This is the poll routine for rx part. It will process the packets maximux quota value.</div><div class='add'>+ *</div><div class='add'>+ * Return: Number of packets received</div><div class='add'>+ */</div><div class='add'>+static int ctucan_rx_poll(struct napi_struct *napi, int quota)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = napi-&gt;dev;</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int work_done = 0;</div><div class='add'>+	u32 status;</div><div class='add'>+	u32 framecnt;</div><div class='add'>+	int res = 1;</div><div class='add'>+</div><div class='add'>+	framecnt = FIELD_GET(REG_RX_STATUS_RXFRC, ctucan_read32(priv, CTUCANFD_RX_STATUS));</div><div class='add'>+	while (framecnt &amp;&amp; work_done &lt; quota &amp;&amp; res &gt; 0) {</div><div class='add'>+		res = ctucan_rx(ndev);</div><div class='add'>+		work_done++;</div><div class='add'>+		framecnt = FIELD_GET(REG_RX_STATUS_RXFRC, ctucan_read32(priv, CTUCANFD_RX_STATUS));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for RX FIFO Overflow */</div><div class='add'>+	status = ctucan_read32(priv, CTUCANFD_STATUS);</div><div class='add'>+	if (FIELD_GET(REG_STATUS_DOR, status)) {</div><div class='add'>+		struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+		struct can_frame *cf;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "rx_poll: rx fifo overflow\n");</div><div class='add'>+		stats-&gt;rx_over_errors++;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+			stats-&gt;rx_packets++;</div><div class='add'>+			stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Clear Data Overrun */</div><div class='add'>+		ctucan_write32(priv, CTUCANFD_COMMAND, REG_COMMAND_CDO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!framecnt &amp;&amp; res != 0) {</div><div class='add'>+		if (napi_complete_done(napi, work_done)) {</div><div class='add'>+			/* Clear and enable RBNEI. It is level-triggered, so</div><div class='add'>+			 * there is no race condition.</div><div class='add'>+			 */</div><div class='add'>+			ctucan_write32(priv, CTUCANFD_INT_STAT, REG_INT_STAT_RBNEI);</div><div class='add'>+			ctucan_write32(priv, CTUCANFD_INT_MASK_CLR, REG_INT_STAT_RBNEI);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_rotate_txb_prio() - Rotates priorities of TXT Buffers</div><div class='add'>+ * @ndev:	net_device pointer</div><div class='add'>+ */</div><div class='add'>+static void ctucan_rotate_txb_prio(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 prio = priv-&gt;txb_prio;</div><div class='add'>+</div><div class='add'>+	prio = (prio &lt;&lt; 4) | ((prio &gt;&gt; ((priv-&gt;ntxbufs - 1) * 4)) &amp; 0xF);</div><div class='add'>+	ctucan_netdev_dbg(ndev, "%s: from 0x%08x to 0x%08x\n", __func__, priv-&gt;txb_prio, prio);</div><div class='add'>+	priv-&gt;txb_prio = prio;</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_TX_PRIORITY, prio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_tx_interrupt() - Tx done Isr</div><div class='add'>+ * @ndev:	net_device pointer</div><div class='add'>+ */</div><div class='add'>+static void ctucan_tx_interrupt(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	bool first = true;</div><div class='add'>+	bool some_buffers_processed;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	enum ctucan_txtb_status txtb_status;</div><div class='add'>+	u32 txtb_id;</div><div class='add'>+</div><div class='add'>+	/*  read tx_status</div><div class='add'>+	 *  if txb[n].finished (bit 2)</div><div class='add'>+	 *	if ok -&gt; echo</div><div class='add'>+	 *	if error / aborted -&gt; ?? (find how to handle oneshot mode)</div><div class='add'>+	 *	txb_tail++</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+		some_buffers_processed = false;</div><div class='add'>+		while ((int)(priv-&gt;txb_head - priv-&gt;txb_tail) &gt; 0) {</div><div class='add'>+			txtb_id = priv-&gt;txb_tail % priv-&gt;ntxbufs;</div><div class='add'>+			txtb_status = ctucan_get_tx_status(priv, txtb_id);</div><div class='add'>+</div><div class='add'>+			ctucan_netdev_dbg(ndev, "TXI: TXB#%u: status 0x%x\n", txtb_id, txtb_status);</div><div class='add'>+</div><div class='add'>+			switch (txtb_status) {</div><div class='add'>+			case TXT_TOK:</div><div class='add'>+				ctucan_netdev_dbg(ndev, "TXT_OK\n");</div><div class='add'>+				stats-&gt;tx_bytes += can_get_echo_skb(ndev, txtb_id, NULL);</div><div class='add'>+				stats-&gt;tx_packets++;</div><div class='add'>+				break;</div><div class='add'>+			case TXT_ERR:</div><div class='add'>+				/* This indicated that retransmit limit has been reached. Obviously</div><div class='add'>+				 * we should not echo the frame, but also not indicate any kind of</div><div class='add'>+				 * error. If desired, it was already reported (possible multiple</div><div class='add'>+				 * times) on each arbitration lost.</div><div class='add'>+				 */</div><div class='add'>+				netdev_warn(ndev, "TXB in Error state\n");</div><div class='add'>+				can_free_echo_skb(ndev, txtb_id, NULL);</div><div class='add'>+				stats-&gt;tx_dropped++;</div><div class='add'>+				break;</div><div class='add'>+			case TXT_ABT:</div><div class='add'>+				/* Same as for TXT_ERR, only with different cause. We *could*</div><div class='add'>+				 * re-queue the frame, but multiqueue/abort is not supported yet</div><div class='add'>+				 * anyway.</div><div class='add'>+				 */</div><div class='add'>+				netdev_warn(ndev, "TXB in Aborted state\n");</div><div class='add'>+				can_free_echo_skb(ndev, txtb_id, NULL);</div><div class='add'>+				stats-&gt;tx_dropped++;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				/* Bug only if the first buffer is not finished, otherwise it is</div><div class='add'>+				 * pretty much expected.</div><div class='add'>+				 */</div><div class='add'>+				if (first) {</div><div class='add'>+					netdev_err(ndev,</div><div class='add'>+						   "BUG: TXB#%u not in a finished state (0x%x)!\n",</div><div class='add'>+						   txtb_id, txtb_status);</div><div class='add'>+					spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+					/* do not clear nor wake */</div><div class='add'>+					return;</div><div class='add'>+				}</div><div class='add'>+				goto clear;</div><div class='add'>+			}</div><div class='add'>+			priv-&gt;txb_tail++;</div><div class='add'>+			first = false;</div><div class='add'>+			some_buffers_processed = true;</div><div class='add'>+			/* Adjust priorities *before* marking the buffer as empty. */</div><div class='add'>+			ctucan_rotate_txb_prio(ndev);</div><div class='add'>+			ctucan_give_txtb_cmd(priv, TXT_CMD_SET_EMPTY, txtb_id);</div><div class='add'>+		}</div><div class='add'>+clear:</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+		/* If no buffers were processed this time, we cannot clear - that would introduce</div><div class='add'>+		 * a race condition.</div><div class='add'>+		 */</div><div class='add'>+		if (some_buffers_processed) {</div><div class='add'>+			/* Clear the interrupt again. We do not want to receive again interrupt for</div><div class='add'>+			 * the buffer already handled. If it is the last finished one then it would</div><div class='add'>+			 * cause log of spurious interrupt.</div><div class='add'>+			 */</div><div class='add'>+			ctucan_write32(priv, CTUCANFD_INT_STAT, REG_INT_STAT_TXBHCI);</div><div class='add'>+		}</div><div class='add'>+	} while (some_buffers_processed);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Check if at least one TX buffer is free */</div><div class='add'>+	if (CTU_CAN_FD_TXTNF(priv))</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_interrupt() - CAN Isr</div><div class='add'>+ * @irq:	irq number</div><div class='add'>+ * @dev_id:	device id pointer</div><div class='add'>+ *</div><div class='add'>+ * This is the CTU CAN FD ISR. It checks for the type of interrupt</div><div class='add'>+ * and invokes the corresponding ISR.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * IRQ_NONE - If CAN device is in sleep mode, IRQ_HANDLED otherwise</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t ctucan_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = (struct net_device *)dev_id;</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 isr, icr;</div><div class='add'>+	u32 imask;</div><div class='add'>+	int irq_loops;</div><div class='add'>+</div><div class='add'>+	for (irq_loops = 0; irq_loops &lt; 10000; irq_loops++) {</div><div class='add'>+		/* Get the interrupt status */</div><div class='add'>+		isr = ctucan_read32(priv, CTUCANFD_INT_STAT);</div><div class='add'>+</div><div class='add'>+		if (!isr)</div><div class='add'>+			return irq_loops ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+</div><div class='add'>+		/* Receive Buffer Not Empty Interrupt */</div><div class='add'>+		if (FIELD_GET(REG_INT_STAT_RBNEI, isr)) {</div><div class='add'>+			ctucan_netdev_dbg(ndev, "RXBNEI\n");</div><div class='add'>+			/* Mask RXBNEI the first, then clear interrupt and schedule NAPI. Even if</div><div class='add'>+			 * another IRQ fires, RBNEI will always be 0 (masked).</div><div class='add'>+			 */</div><div class='add'>+			icr = REG_INT_STAT_RBNEI;</div><div class='add'>+			ctucan_write32(priv, CTUCANFD_INT_MASK_SET, icr);</div><div class='add'>+			ctucan_write32(priv, CTUCANFD_INT_STAT, icr);</div><div class='add'>+			napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* TXT Buffer HW Command Interrupt */</div><div class='add'>+		if (FIELD_GET(REG_INT_STAT_TXBHCI, isr)) {</div><div class='add'>+			ctucan_netdev_dbg(ndev, "TXBHCI\n");</div><div class='add'>+			/* Cleared inside */</div><div class='add'>+			ctucan_tx_interrupt(ndev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Error interrupts */</div><div class='add'>+		if (FIELD_GET(REG_INT_STAT_EWLI, isr) ||</div><div class='add'>+		    FIELD_GET(REG_INT_STAT_FCSI, isr) ||</div><div class='add'>+		    FIELD_GET(REG_INT_STAT_ALI, isr)) {</div><div class='add'>+			icr = isr &amp; (REG_INT_STAT_EWLI | REG_INT_STAT_FCSI | REG_INT_STAT_ALI);</div><div class='add'>+</div><div class='add'>+			ctucan_netdev_dbg(ndev, "some ERR interrupt: clearing 0x%08x\n", icr);</div><div class='add'>+			ctucan_write32(priv, CTUCANFD_INT_STAT, icr);</div><div class='add'>+			ctucan_err_interrupt(ndev, isr);</div><div class='add'>+		}</div><div class='add'>+		/* Ignore RI, TI, LFI, RFI, BSI */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_err(ndev, "%s: stuck interrupt (isr=0x%08x), stopping\n", __func__, isr);</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(REG_INT_STAT_TXBHCI, isr)) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		netdev_err(ndev, "txb_head=0x%08x txb_tail=0x%08x\n",</div><div class='add'>+			   priv-&gt;txb_head, priv-&gt;txb_tail);</div><div class='add'>+		for (i = 0; i &lt; priv-&gt;ntxbufs; i++) {</div><div class='add'>+			u32 status = ctucan_get_tx_status(priv, i);</div><div class='add'>+</div><div class='add'>+			netdev_err(ndev, "txb[%d] txb status=0x%08x\n", i, status);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	imask = 0xffffffff;</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_INT_ENA_CLR, imask);</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_INT_MASK_SET, imask);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_chip_stop() - Driver stop routine</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * This is the drivers stop routine. It will disable the</div><div class='add'>+ * interrupts and disable the controller.</div><div class='add'>+ */</div><div class='add'>+static void ctucan_chip_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 mask = 0xffffffff;</div><div class='add'>+	u32 mode;</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts and disable CAN */</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_INT_ENA_CLR, mask);</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_INT_MASK_SET, mask);</div><div class='add'>+	mode = ctucan_read32(priv, CTUCANFD_MODE);</div><div class='add'>+	mode &amp;= ~REG_MODE_ENA;</div><div class='add'>+	ctucan_write32(priv, CTUCANFD_MODE, mode);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_open() - Driver open routine</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * This is the driver open routine.</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(priv-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",</div><div class='add'>+			   __func__, ret);</div><div class='add'>+		pm_runtime_put_noidle(priv-&gt;dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ctucan_reset(ndev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_reset;</div><div class='add'>+</div><div class='add'>+	/* Common open */</div><div class='add'>+	ret = open_candev(ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_warn(ndev, "open_candev failed!\n");</div><div class='add'>+		goto err_open;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_irq(ndev-&gt;irq, ctucan_interrupt, priv-&gt;irq_flags, ndev-&gt;name, ndev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "irq allocation for CAN failed\n");</div><div class='add'>+		goto err_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ctucan_chip_start(ndev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "ctucan_chip_start failed!\n");</div><div class='add'>+		goto err_chip_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(ndev, "ctu_can_fd device registered\n");</div><div class='add'>+	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_chip_start:</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+err_irq:</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+err_open:</div><div class='add'>+err_reset:</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_close() - Driver close routine</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 always</div><div class='add'>+ */</div><div class='add'>+static int ctucan_close(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+	ctucan_chip_stop(ndev);</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_get_berr_counter() - error counter routine</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ * @bec:	Pointer to can_berr_counter structure</div><div class='add'>+ *</div><div class='add'>+ * This is the driver error counter routine.</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_get_berr_counter(const struct net_device *ndev, struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_get_sync(priv-&gt;dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n", __func__, ret);</div><div class='add'>+		pm_runtime_put_noidle(priv-&gt;dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctucan_get_rec_tec(priv, bec);</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops ctucan_netdev_ops = {</div><div class='add'>+	.ndo_open	= ctucan_open,</div><div class='add'>+	.ndo_stop	= ctucan_close,</div><div class='add'>+	.ndo_start_xmit	= ctucan_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ctucan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ctucan_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+		netif_device_detach(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ctucan_suspend);</div><div class='add'>+</div><div class='add'>+int ctucan_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		netif_device_attach(ndev);</div><div class='add'>+		netif_start_queue(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ctucan_resume);</div><div class='add'>+</div><div class='add'>+int ctucan_probe_common(struct device *dev, void __iomem *addr, int irq, unsigned int ntxbufs,</div><div class='add'>+			unsigned long can_clk_rate, int pm_enable_call,</div><div class='add'>+			void (*set_drvdata_fnc)(struct device *dev, struct net_device *ndev))</div><div class='add'>+{</div><div class='add'>+	struct ctucan_priv *priv;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Create a CAN device instance */</div><div class='add'>+	ndev = alloc_candev(sizeof(struct ctucan_priv), ntxbufs);</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;peers_on_pdev);</div><div class='add'>+	priv-&gt;ntxbufs = ntxbufs;</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;ctu_can_fd_bit_timing_max;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;ctu_can_fd_bit_timing_data_max;</div><div class='add'>+	priv-&gt;can.do_set_mode = ctucan_do_set_mode;</div><div class='add'>+</div><div class='add'>+	/* Needed for timing adjustment to be performed as soon as possible */</div><div class='add'>+	priv-&gt;can.do_set_bittiming = ctucan_set_bittiming;</div><div class='add'>+	priv-&gt;can.fd.do_set_data_bittiming = ctucan_set_data_bittiming;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = ctucan_get_berr_counter;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK</div><div class='add'>+					| CAN_CTRLMODE_LISTENONLY</div><div class='add'>+					| CAN_CTRLMODE_FD</div><div class='add'>+					| CAN_CTRLMODE_PRESUME_ACK</div><div class='add'>+					| CAN_CTRLMODE_BERR_REPORTING</div><div class='add'>+					| CAN_CTRLMODE_FD_NON_ISO</div><div class='add'>+					| CAN_CTRLMODE_ONE_SHOT;</div><div class='add'>+	priv-&gt;mem_base = addr;</div><div class='add'>+</div><div class='add'>+	/* Get IRQ for the device */</div><div class='add'>+	ndev-&gt;irq = irq;</div><div class='add'>+	ndev-&gt;flags |= IFF_ECHO;	/* We support local echo */</div><div class='add'>+</div><div class='add'>+	if (set_drvdata_fnc)</div><div class='add'>+		set_drvdata_fnc(dev, ndev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, dev);</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;ctucan_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;ctucan_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	/* Getting the can_clk info */</div><div class='add'>+	if (!can_clk_rate) {</div><div class='add'>+		priv-&gt;can_clk = devm_clk_get(dev, NULL);</div><div class='add'>+		if (IS_ERR(priv-&gt;can_clk)) {</div><div class='add'>+			dev_err(dev, "Device clock not found.\n");</div><div class='add'>+			ret = PTR_ERR(priv-&gt;can_clk);</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='add'>+		can_clk_rate = clk_get_rate(priv-&gt;can_clk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;write_reg = ctucan_write32_le;</div><div class='add'>+	priv-&gt;read_reg = ctucan_read32_le;</div><div class='add'>+</div><div class='add'>+	if (pm_enable_call)</div><div class='add'>+		pm_runtime_enable(dev);</div><div class='add'>+	ret = pm_runtime_get_sync(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",</div><div class='add'>+			   __func__, ret);</div><div class='add'>+		pm_runtime_put_noidle(priv-&gt;dev);</div><div class='add'>+		goto err_pmdisable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for big-endianity and set according IO-accessors */</div><div class='add'>+	if ((ctucan_read32(priv, CTUCANFD_DEVICE_ID) &amp; 0xFFFF) != CTUCANFD_ID) {</div><div class='add'>+		priv-&gt;write_reg = ctucan_write32_be;</div><div class='add'>+		priv-&gt;read_reg = ctucan_read32_be;</div><div class='add'>+		if ((ctucan_read32(priv, CTUCANFD_DEVICE_ID) &amp; 0xFFFF) != CTUCANFD_ID) {</div><div class='add'>+			netdev_err(ndev, "CTU_CAN_FD signature not found\n");</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto err_deviceoff;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ctucan_reset(ndev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_deviceoff;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.clock.freq = can_clk_rate;</div><div class='add'>+</div><div class='add'>+	netif_napi_add(ndev, &amp;priv-&gt;napi, ctucan_rx_poll);</div><div class='add'>+</div><div class='add'>+	ret = register_candev(ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "fail to register failed (err=%d)\n", ret);</div><div class='add'>+		goto err_deviceoff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(dev);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ndev, "mem_base=0x%p irq=%d clock=%d, no. of txt buffers:%d\n",</div><div class='add'>+		   priv-&gt;mem_base, ndev-&gt;irq, priv-&gt;can.clock.freq, priv-&gt;ntxbufs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_deviceoff:</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+err_pmdisable:</div><div class='add'>+	if (pm_enable_call)</div><div class='add'>+		pm_runtime_disable(dev);</div><div class='add'>+err_free:</div><div class='add'>+	list_del_init(&amp;priv-&gt;peers_on_pdev);</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ctucan_probe_common);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Martin Jerabek &lt;martin.jerabek01@gmail.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;");</div><div class='add'>+MODULE_AUTHOR("Ondrej Ille &lt;ondrej.ille@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CTU CAN FD interface");</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/ctucanfd_kframe.h b/drivers/net/can/ctucanfd/ctucanfd_kframe.h<br/>new file mode 100644<br/>index 000000000000..3491299eaac2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/ctucanfd_kframe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/ctucanfd_kframe.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * CTU CAN FD IP Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2018 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; self-funded</div><div class='add'>+ * Copyright (C) 2018-2019 Martin Jerabek &lt;martin.jerabek01@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt; FEE CTU/self-funded</div><div class='add'>+ *</div><div class='add'>+ * Project advisors:</div><div class='add'>+ *     Jiri Novak &lt;jnovak@fel.cvut.cz&gt;</div><div class='add'>+ *     Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Department of Measurement         (http://meas.fel.cvut.cz/)</div><div class='add'>+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)</div><div class='add'>+ * Czech Technical University        (http://www.cvut.cz/)</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/* This file is autogenerated, DO NOT EDIT! */</div><div class='add'>+</div><div class='add'>+#ifndef __CTU_CAN_FD_CAN_FD_FRAME_FORMAT__</div><div class='add'>+#define __CTU_CAN_FD_CAN_FD_FRAME_FORMAT__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+/* CAN_Frame_format memory map */</div><div class='add'>+enum ctu_can_fd_can_frame_format {</div><div class='add'>+	CTUCANFD_FRAME_FORMAT_W       = 0x0,</div><div class='add'>+	CTUCANFD_IDENTIFIER_W         = 0x4,</div><div class='add'>+	CTUCANFD_TIMESTAMP_L_W        = 0x8,</div><div class='add'>+	CTUCANFD_TIMESTAMP_U_W        = 0xc,</div><div class='add'>+	CTUCANFD_DATA_1_4_W          = 0x10,</div><div class='add'>+	CTUCANFD_DATA_5_8_W          = 0x14,</div><div class='add'>+	CTUCANFD_DATA_61_64_W        = 0x4c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CAN_FD_Frame_format memory region */</div><div class='add'>+</div><div class='add'>+/*  FRAME_FORMAT_W registers */</div><div class='add'>+#define REG_FRAME_FORMAT_W_DLC GENMASK(3, 0)</div><div class='add'>+#define REG_FRAME_FORMAT_W_RTR BIT(5)</div><div class='add'>+#define REG_FRAME_FORMAT_W_IDE BIT(6)</div><div class='add'>+#define REG_FRAME_FORMAT_W_FDF BIT(7)</div><div class='add'>+#define REG_FRAME_FORMAT_W_BRS BIT(9)</div><div class='add'>+#define REG_FRAME_FORMAT_W_ESI_RSV BIT(10)</div><div class='add'>+#define REG_FRAME_FORMAT_W_RWCNT GENMASK(15, 11)</div><div class='add'>+</div><div class='add'>+/*  IDENTIFIER_W registers */</div><div class='add'>+#define REG_IDENTIFIER_W_IDENTIFIER_EXT GENMASK(17, 0)</div><div class='add'>+#define REG_IDENTIFIER_W_IDENTIFIER_BASE GENMASK(28, 18)</div><div class='add'>+</div><div class='add'>+/*  TIMESTAMP_L_W registers */</div><div class='add'>+#define REG_TIMESTAMP_L_W_TIME_STAMP_L_W GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  TIMESTAMP_U_W registers */</div><div class='add'>+#define REG_TIMESTAMP_U_W_TIMESTAMP_U_W GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  DATA_1_4_W registers */</div><div class='add'>+#define REG_DATA_1_4_W_DATA_1 GENMASK(7, 0)</div><div class='add'>+#define REG_DATA_1_4_W_DATA_2 GENMASK(15, 8)</div><div class='add'>+#define REG_DATA_1_4_W_DATA_3 GENMASK(23, 16)</div><div class='add'>+#define REG_DATA_1_4_W_DATA_4 GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+/*  DATA_5_8_W registers */</div><div class='add'>+#define REG_DATA_5_8_W_DATA_5 GENMASK(7, 0)</div><div class='add'>+#define REG_DATA_5_8_W_DATA_6 GENMASK(15, 8)</div><div class='add'>+#define REG_DATA_5_8_W_DATA_7 GENMASK(23, 16)</div><div class='add'>+#define REG_DATA_5_8_W_DATA_8 GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+/*  DATA_61_64_W registers */</div><div class='add'>+#define REG_DATA_61_64_W_DATA_61 GENMASK(7, 0)</div><div class='add'>+#define REG_DATA_61_64_W_DATA_62 GENMASK(15, 8)</div><div class='add'>+#define REG_DATA_61_64_W_DATA_63 GENMASK(23, 16)</div><div class='add'>+#define REG_DATA_61_64_W_DATA_64 GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/ctucanfd_kregs.h b/drivers/net/can/ctucanfd/ctucanfd_kregs.h<br/>new file mode 100644<br/>index 000000000000..0c181ab51bf8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/ctucanfd_kregs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/ctucanfd_kregs.h</a></div><div class='hunk'>@@ -0,0 +1,349 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * CTU CAN FD IP Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2018 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2022 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; self-funded</div><div class='add'>+ * Copyright (C) 2018-2019 Martin Jerabek &lt;martin.jerabek01@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2022 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt; FEE CTU/self-funded</div><div class='add'>+ *</div><div class='add'>+ * Project advisors:</div><div class='add'>+ *     Jiri Novak &lt;jnovak@fel.cvut.cz&gt;</div><div class='add'>+ *     Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Department of Measurement         (http://meas.fel.cvut.cz/)</div><div class='add'>+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)</div><div class='add'>+ * Czech Technical University        (http://www.cvut.cz/)</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+/* This file is autogenerated, DO NOT EDIT! */</div><div class='add'>+</div><div class='add'>+#ifndef __CTU_CAN_FD_CAN_FD_REGISTER_MAP__</div><div class='add'>+#define __CTU_CAN_FD_CAN_FD_REGISTER_MAP__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+</div><div class='add'>+/* CAN_Registers memory map */</div><div class='add'>+enum ctu_can_fd_can_registers {</div><div class='add'>+	CTUCANFD_DEVICE_ID             = 0x0,</div><div class='add'>+	CTUCANFD_VERSION               = 0x2,</div><div class='add'>+	CTUCANFD_MODE                  = 0x4,</div><div class='add'>+	CTUCANFD_SETTINGS              = 0x6,</div><div class='add'>+	CTUCANFD_STATUS                = 0x8,</div><div class='add'>+	CTUCANFD_COMMAND               = 0xc,</div><div class='add'>+	CTUCANFD_INT_STAT             = 0x10,</div><div class='add'>+	CTUCANFD_INT_ENA_SET          = 0x14,</div><div class='add'>+	CTUCANFD_INT_ENA_CLR          = 0x18,</div><div class='add'>+	CTUCANFD_INT_MASK_SET         = 0x1c,</div><div class='add'>+	CTUCANFD_INT_MASK_CLR         = 0x20,</div><div class='add'>+	CTUCANFD_BTR                  = 0x24,</div><div class='add'>+	CTUCANFD_BTR_FD               = 0x28,</div><div class='add'>+	CTUCANFD_EWL                  = 0x2c,</div><div class='add'>+	CTUCANFD_ERP                  = 0x2d,</div><div class='add'>+	CTUCANFD_FAULT_STATE          = 0x2e,</div><div class='add'>+	CTUCANFD_REC                  = 0x30,</div><div class='add'>+	CTUCANFD_TEC                  = 0x32,</div><div class='add'>+	CTUCANFD_ERR_NORM             = 0x34,</div><div class='add'>+	CTUCANFD_ERR_FD               = 0x36,</div><div class='add'>+	CTUCANFD_CTR_PRES             = 0x38,</div><div class='add'>+	CTUCANFD_FILTER_A_MASK        = 0x3c,</div><div class='add'>+	CTUCANFD_FILTER_A_VAL         = 0x40,</div><div class='add'>+	CTUCANFD_FILTER_B_MASK        = 0x44,</div><div class='add'>+	CTUCANFD_FILTER_B_VAL         = 0x48,</div><div class='add'>+	CTUCANFD_FILTER_C_MASK        = 0x4c,</div><div class='add'>+	CTUCANFD_FILTER_C_VAL         = 0x50,</div><div class='add'>+	CTUCANFD_FILTER_RAN_LOW       = 0x54,</div><div class='add'>+	CTUCANFD_FILTER_RAN_HIGH      = 0x58,</div><div class='add'>+	CTUCANFD_FILTER_CONTROL       = 0x5c,</div><div class='add'>+	CTUCANFD_FILTER_STATUS        = 0x5e,</div><div class='add'>+	CTUCANFD_RX_MEM_INFO          = 0x60,</div><div class='add'>+	CTUCANFD_RX_POINTERS          = 0x64,</div><div class='add'>+	CTUCANFD_RX_STATUS            = 0x68,</div><div class='add'>+	CTUCANFD_RX_SETTINGS          = 0x6a,</div><div class='add'>+	CTUCANFD_RX_DATA              = 0x6c,</div><div class='add'>+	CTUCANFD_TX_STATUS            = 0x70,</div><div class='add'>+	CTUCANFD_TX_COMMAND           = 0x74,</div><div class='add'>+	CTUCANFD_TXTB_INFO            = 0x76,</div><div class='add'>+	CTUCANFD_TX_PRIORITY          = 0x78,</div><div class='add'>+	CTUCANFD_ERR_CAPT             = 0x7c,</div><div class='add'>+	CTUCANFD_RETR_CTR             = 0x7d,</div><div class='add'>+	CTUCANFD_ALC                  = 0x7e,</div><div class='add'>+	CTUCANFD_TS_INFO              = 0x7f,</div><div class='add'>+	CTUCANFD_TRV_DELAY            = 0x80,</div><div class='add'>+	CTUCANFD_SSP_CFG              = 0x82,</div><div class='add'>+	CTUCANFD_RX_FR_CTR            = 0x84,</div><div class='add'>+	CTUCANFD_TX_FR_CTR            = 0x88,</div><div class='add'>+	CTUCANFD_DEBUG_REGISTER       = 0x8c,</div><div class='add'>+	CTUCANFD_YOLO_REG             = 0x90,</div><div class='add'>+	CTUCANFD_TIMESTAMP_LOW        = 0x94,</div><div class='add'>+	CTUCANFD_TIMESTAMP_HIGH       = 0x98,</div><div class='add'>+	CTUCANFD_TXTB1_DATA_1        = 0x100,</div><div class='add'>+	CTUCANFD_TXTB1_DATA_2        = 0x104,</div><div class='add'>+	CTUCANFD_TXTB1_DATA_20       = 0x14c,</div><div class='add'>+	CTUCANFD_TXTB2_DATA_1        = 0x200,</div><div class='add'>+	CTUCANFD_TXTB2_DATA_2        = 0x204,</div><div class='add'>+	CTUCANFD_TXTB2_DATA_20       = 0x24c,</div><div class='add'>+	CTUCANFD_TXTB3_DATA_1        = 0x300,</div><div class='add'>+	CTUCANFD_TXTB3_DATA_2        = 0x304,</div><div class='add'>+	CTUCANFD_TXTB3_DATA_20       = 0x34c,</div><div class='add'>+	CTUCANFD_TXTB4_DATA_1        = 0x400,</div><div class='add'>+	CTUCANFD_TXTB4_DATA_2        = 0x404,</div><div class='add'>+	CTUCANFD_TXTB4_DATA_20       = 0x44c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Control_registers memory region */</div><div class='add'>+</div><div class='add'>+/*  DEVICE_ID VERSION registers */</div><div class='add'>+#define REG_DEVICE_ID_DEVICE_ID GENMASK(15, 0)</div><div class='add'>+#define REG_DEVICE_ID_VER_MINOR GENMASK(23, 16)</div><div class='add'>+#define REG_DEVICE_ID_VER_MAJOR GENMASK(31, 24)</div><div class='add'>+</div><div class='add'>+/*  MODE SETTINGS registers */</div><div class='add'>+#define REG_MODE_RST BIT(0)</div><div class='add'>+#define REG_MODE_BMM BIT(1)</div><div class='add'>+#define REG_MODE_STM BIT(2)</div><div class='add'>+#define REG_MODE_AFM BIT(3)</div><div class='add'>+#define REG_MODE_FDE BIT(4)</div><div class='add'>+#define REG_MODE_TTTM BIT(5)</div><div class='add'>+#define REG_MODE_ROM BIT(6)</div><div class='add'>+#define REG_MODE_ACF BIT(7)</div><div class='add'>+#define REG_MODE_TSTM BIT(8)</div><div class='add'>+#define REG_MODE_RXBAM BIT(9)</div><div class='add'>+#define REG_MODE_SAM BIT(11)</div><div class='add'>+#define REG_MODE_RTRLE BIT(16)</div><div class='add'>+#define REG_MODE_RTRTH GENMASK(20, 17)</div><div class='add'>+#define REG_MODE_ILBP BIT(21)</div><div class='add'>+#define REG_MODE_ENA BIT(22)</div><div class='add'>+#define REG_MODE_NISOFD BIT(23)</div><div class='add'>+#define REG_MODE_PEX BIT(24)</div><div class='add'>+#define REG_MODE_TBFBO BIT(25)</div><div class='add'>+#define REG_MODE_FDRF BIT(26)</div><div class='add'>+</div><div class='add'>+/*  STATUS registers */</div><div class='add'>+#define REG_STATUS_RXNE BIT(0)</div><div class='add'>+#define REG_STATUS_DOR BIT(1)</div><div class='add'>+#define REG_STATUS_TXNF BIT(2)</div><div class='add'>+#define REG_STATUS_EFT BIT(3)</div><div class='add'>+#define REG_STATUS_RXS BIT(4)</div><div class='add'>+#define REG_STATUS_TXS BIT(5)</div><div class='add'>+#define REG_STATUS_EWL BIT(6)</div><div class='add'>+#define REG_STATUS_IDLE BIT(7)</div><div class='add'>+#define REG_STATUS_PEXS BIT(8)</div><div class='add'>+#define REG_STATUS_STCNT BIT(16)</div><div class='add'>+</div><div class='add'>+/*  COMMAND registers */</div><div class='add'>+#define REG_COMMAND_RXRPMV BIT(1)</div><div class='add'>+#define REG_COMMAND_RRB BIT(2)</div><div class='add'>+#define REG_COMMAND_CDO BIT(3)</div><div class='add'>+#define REG_COMMAND_ERCRST BIT(4)</div><div class='add'>+#define REG_COMMAND_RXFCRST BIT(5)</div><div class='add'>+#define REG_COMMAND_TXFCRST BIT(6)</div><div class='add'>+#define REG_COMMAND_CPEXS BIT(7)</div><div class='add'>+</div><div class='add'>+/*  INT_STAT registers */</div><div class='add'>+#define REG_INT_STAT_RXI BIT(0)</div><div class='add'>+#define REG_INT_STAT_TXI BIT(1)</div><div class='add'>+#define REG_INT_STAT_EWLI BIT(2)</div><div class='add'>+#define REG_INT_STAT_DOI BIT(3)</div><div class='add'>+#define REG_INT_STAT_FCSI BIT(4)</div><div class='add'>+#define REG_INT_STAT_ALI BIT(5)</div><div class='add'>+#define REG_INT_STAT_BEI BIT(6)</div><div class='add'>+#define REG_INT_STAT_OFI BIT(7)</div><div class='add'>+#define REG_INT_STAT_RXFI BIT(8)</div><div class='add'>+#define REG_INT_STAT_BSI BIT(9)</div><div class='add'>+#define REG_INT_STAT_RBNEI BIT(10)</div><div class='add'>+#define REG_INT_STAT_TXBHCI BIT(11)</div><div class='add'>+</div><div class='add'>+/*  INT_ENA_SET registers */</div><div class='add'>+#define REG_INT_ENA_SET_INT_ENA_SET GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+/*  INT_ENA_CLR registers */</div><div class='add'>+#define REG_INT_ENA_CLR_INT_ENA_CLR GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+/*  INT_MASK_SET registers */</div><div class='add'>+#define REG_INT_MASK_SET_INT_MASK_SET GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+/*  INT_MASK_CLR registers */</div><div class='add'>+#define REG_INT_MASK_CLR_INT_MASK_CLR GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+/*  BTR registers */</div><div class='add'>+#define REG_BTR_PROP GENMASK(6, 0)</div><div class='add'>+#define REG_BTR_PH1 GENMASK(12, 7)</div><div class='add'>+#define REG_BTR_PH2 GENMASK(18, 13)</div><div class='add'>+#define REG_BTR_BRP GENMASK(26, 19)</div><div class='add'>+#define REG_BTR_SJW GENMASK(31, 27)</div><div class='add'>+</div><div class='add'>+/*  BTR_FD registers */</div><div class='add'>+#define REG_BTR_FD_PROP_FD GENMASK(5, 0)</div><div class='add'>+#define REG_BTR_FD_PH1_FD GENMASK(11, 7)</div><div class='add'>+#define REG_BTR_FD_PH2_FD GENMASK(17, 13)</div><div class='add'>+#define REG_BTR_FD_BRP_FD GENMASK(26, 19)</div><div class='add'>+#define REG_BTR_FD_SJW_FD GENMASK(31, 27)</div><div class='add'>+</div><div class='add'>+/*  EWL ERP FAULT_STATE registers */</div><div class='add'>+#define REG_EWL_EW_LIMIT GENMASK(7, 0)</div><div class='add'>+#define REG_EWL_ERP_LIMIT GENMASK(15, 8)</div><div class='add'>+#define REG_EWL_ERA BIT(16)</div><div class='add'>+#define REG_EWL_ERP BIT(17)</div><div class='add'>+#define REG_EWL_BOF BIT(18)</div><div class='add'>+</div><div class='add'>+/*  REC TEC registers */</div><div class='add'>+#define REG_REC_REC_VAL GENMASK(8, 0)</div><div class='add'>+#define REG_REC_TEC_VAL GENMASK(24, 16)</div><div class='add'>+</div><div class='add'>+/*  ERR_NORM ERR_FD registers */</div><div class='add'>+#define REG_ERR_NORM_ERR_NORM_VAL GENMASK(15, 0)</div><div class='add'>+#define REG_ERR_NORM_ERR_FD_VAL GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+/*  CTR_PRES registers */</div><div class='add'>+#define REG_CTR_PRES_CTPV GENMASK(8, 0)</div><div class='add'>+#define REG_CTR_PRES_PTX BIT(9)</div><div class='add'>+#define REG_CTR_PRES_PRX BIT(10)</div><div class='add'>+#define REG_CTR_PRES_ENORM BIT(11)</div><div class='add'>+#define REG_CTR_PRES_EFD BIT(12)</div><div class='add'>+</div><div class='add'>+/*  FILTER_A_MASK registers */</div><div class='add'>+#define REG_FILTER_A_MASK_BIT_MASK_A_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_A_VAL registers */</div><div class='add'>+#define REG_FILTER_A_VAL_BIT_VAL_A_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_B_MASK registers */</div><div class='add'>+#define REG_FILTER_B_MASK_BIT_MASK_B_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_B_VAL registers */</div><div class='add'>+#define REG_FILTER_B_VAL_BIT_VAL_B_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_C_MASK registers */</div><div class='add'>+#define REG_FILTER_C_MASK_BIT_MASK_C_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_C_VAL registers */</div><div class='add'>+#define REG_FILTER_C_VAL_BIT_VAL_C_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_RAN_LOW registers */</div><div class='add'>+#define REG_FILTER_RAN_LOW_BIT_RAN_LOW_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_RAN_HIGH registers */</div><div class='add'>+#define REG_FILTER_RAN_HIGH_BIT_RAN_HIGH_VAL GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/*  FILTER_CONTROL FILTER_STATUS registers */</div><div class='add'>+#define REG_FILTER_CONTROL_FANB BIT(0)</div><div class='add'>+#define REG_FILTER_CONTROL_FANE BIT(1)</div><div class='add'>+#define REG_FILTER_CONTROL_FAFB BIT(2)</div><div class='add'>+#define REG_FILTER_CONTROL_FAFE BIT(3)</div><div class='add'>+#define REG_FILTER_CONTROL_FBNB BIT(4)</div><div class='add'>+#define REG_FILTER_CONTROL_FBNE BIT(5)</div><div class='add'>+#define REG_FILTER_CONTROL_FBFB BIT(6)</div><div class='add'>+#define REG_FILTER_CONTROL_FBFE BIT(7)</div><div class='add'>+#define REG_FILTER_CONTROL_FCNB BIT(8)</div><div class='add'>+#define REG_FILTER_CONTROL_FCNE BIT(9)</div><div class='add'>+#define REG_FILTER_CONTROL_FCFB BIT(10)</div><div class='add'>+#define REG_FILTER_CONTROL_FCFE BIT(11)</div><div class='add'>+#define REG_FILTER_CONTROL_FRNB BIT(12)</div><div class='add'>+#define REG_FILTER_CONTROL_FRNE BIT(13)</div><div class='add'>+#define REG_FILTER_CONTROL_FRFB BIT(14)</div><div class='add'>+#define REG_FILTER_CONTROL_FRFE BIT(15)</div><div class='add'>+#define REG_FILTER_CONTROL_SFA BIT(16)</div><div class='add'>+#define REG_FILTER_CONTROL_SFB BIT(17)</div><div class='add'>+#define REG_FILTER_CONTROL_SFC BIT(18)</div><div class='add'>+#define REG_FILTER_CONTROL_SFR BIT(19)</div><div class='add'>+</div><div class='add'>+/*  RX_MEM_INFO registers */</div><div class='add'>+#define REG_RX_MEM_INFO_RX_BUFF_SIZE GENMASK(12, 0)</div><div class='add'>+#define REG_RX_MEM_INFO_RX_MEM_FREE GENMASK(28, 16)</div><div class='add'>+</div><div class='add'>+/*  RX_POINTERS registers */</div><div class='add'>+#define REG_RX_POINTERS_RX_WPP GENMASK(11, 0)</div><div class='add'>+#define REG_RX_POINTERS_RX_RPP GENMASK(27, 16)</div><div class='add'>+</div><div class='add'>+/*  RX_STATUS RX_SETTINGS registers */</div><div class='add'>+#define REG_RX_STATUS_RXE BIT(0)</div><div class='add'>+#define REG_RX_STATUS_RXF BIT(1)</div><div class='add'>+#define REG_RX_STATUS_RXMOF BIT(2)</div><div class='add'>+#define REG_RX_STATUS_RXFRC GENMASK(14, 4)</div><div class='add'>+#define REG_RX_STATUS_RTSOP BIT(16)</div><div class='add'>+</div><div class='add'>+/*  RX_DATA registers */</div><div class='add'>+#define REG_RX_DATA_RX_DATA GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  TX_STATUS registers */</div><div class='add'>+#define REG_TX_STATUS_TX1S GENMASK(3, 0)</div><div class='add'>+#define REG_TX_STATUS_TX2S GENMASK(7, 4)</div><div class='add'>+#define REG_TX_STATUS_TX3S GENMASK(11, 8)</div><div class='add'>+#define REG_TX_STATUS_TX4S GENMASK(15, 12)</div><div class='add'>+#define REG_TX_STATUS_TX5S GENMASK(19, 16)</div><div class='add'>+#define REG_TX_STATUS_TX6S GENMASK(23, 20)</div><div class='add'>+#define REG_TX_STATUS_TX7S GENMASK(27, 24)</div><div class='add'>+#define REG_TX_STATUS_TX8S GENMASK(31, 28)</div><div class='add'>+</div><div class='add'>+/*  TX_COMMAND TXTB_INFO registers */</div><div class='add'>+#define REG_TX_COMMAND_TXCE BIT(0)</div><div class='add'>+#define REG_TX_COMMAND_TXCR BIT(1)</div><div class='add'>+#define REG_TX_COMMAND_TXCA BIT(2)</div><div class='add'>+#define REG_TX_COMMAND_TXB1 BIT(8)</div><div class='add'>+#define REG_TX_COMMAND_TXB2 BIT(9)</div><div class='add'>+#define REG_TX_COMMAND_TXB3 BIT(10)</div><div class='add'>+#define REG_TX_COMMAND_TXB4 BIT(11)</div><div class='add'>+#define REG_TX_COMMAND_TXB5 BIT(12)</div><div class='add'>+#define REG_TX_COMMAND_TXB6 BIT(13)</div><div class='add'>+#define REG_TX_COMMAND_TXB7 BIT(14)</div><div class='add'>+#define REG_TX_COMMAND_TXB8 BIT(15)</div><div class='add'>+#define REG_TX_COMMAND_TXT_BUFFER_COUNT GENMASK(19, 16)</div><div class='add'>+</div><div class='add'>+/*  TX_PRIORITY registers */</div><div class='add'>+#define REG_TX_PRIORITY_TXT1P GENMASK(2, 0)</div><div class='add'>+#define REG_TX_PRIORITY_TXT2P GENMASK(6, 4)</div><div class='add'>+#define REG_TX_PRIORITY_TXT3P GENMASK(10, 8)</div><div class='add'>+#define REG_TX_PRIORITY_TXT4P GENMASK(14, 12)</div><div class='add'>+#define REG_TX_PRIORITY_TXT5P GENMASK(18, 16)</div><div class='add'>+#define REG_TX_PRIORITY_TXT6P GENMASK(22, 20)</div><div class='add'>+#define REG_TX_PRIORITY_TXT7P GENMASK(26, 24)</div><div class='add'>+#define REG_TX_PRIORITY_TXT8P GENMASK(30, 28)</div><div class='add'>+</div><div class='add'>+/*  ERR_CAPT RETR_CTR ALC TS_INFO registers */</div><div class='add'>+#define REG_ERR_CAPT_ERR_POS GENMASK(4, 0)</div><div class='add'>+#define REG_ERR_CAPT_ERR_TYPE GENMASK(7, 5)</div><div class='add'>+#define REG_ERR_CAPT_RETR_CTR_VAL GENMASK(11, 8)</div><div class='add'>+#define REG_ERR_CAPT_ALC_BIT GENMASK(20, 16)</div><div class='add'>+#define REG_ERR_CAPT_ALC_ID_FIELD GENMASK(23, 21)</div><div class='add'>+#define REG_ERR_CAPT_TS_BITS GENMASK(29, 24)</div><div class='add'>+</div><div class='add'>+/*  TRV_DELAY SSP_CFG registers */</div><div class='add'>+#define REG_TRV_DELAY_TRV_DELAY_VALUE GENMASK(6, 0)</div><div class='add'>+#define REG_TRV_DELAY_SSP_OFFSET GENMASK(23, 16)</div><div class='add'>+#define REG_TRV_DELAY_SSP_SRC GENMASK(25, 24)</div><div class='add'>+</div><div class='add'>+/*  RX_FR_CTR registers */</div><div class='add'>+#define REG_RX_FR_CTR_RX_FR_CTR_VAL GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  TX_FR_CTR registers */</div><div class='add'>+#define REG_TX_FR_CTR_TX_FR_CTR_VAL GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  DEBUG_REGISTER registers */</div><div class='add'>+#define REG_DEBUG_REGISTER_STUFF_COUNT GENMASK(2, 0)</div><div class='add'>+#define REG_DEBUG_REGISTER_DESTUFF_COUNT GENMASK(5, 3)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_ARB BIT(6)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_CON BIT(7)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_DAT BIT(8)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_STC BIT(9)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_CRC BIT(10)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_CRCD BIT(11)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_ACK BIT(12)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_ACKD BIT(13)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_EOF BIT(14)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_INT BIT(15)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_SUSP BIT(16)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_OVR BIT(17)</div><div class='add'>+#define REG_DEBUG_REGISTER_PC_SOF BIT(18)</div><div class='add'>+</div><div class='add'>+/*  YOLO_REG registers */</div><div class='add'>+#define REG_YOLO_REG_YOLO_VAL GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  TIMESTAMP_LOW registers */</div><div class='add'>+#define REG_TIMESTAMP_LOW_TIMESTAMP_LOW GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+/*  TIMESTAMP_HIGH registers */</div><div class='add'>+#define REG_TIMESTAMP_HIGH_TIMESTAMP_HIGH GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/ctucanfd_pci.c b/drivers/net/can/ctucanfd/ctucanfd_pci.c<br/>new file mode 100644<br/>index 000000000000..9da09e7dd63a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/ctucanfd_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/ctucanfd_pci.c</a></div><div class='hunk'>@@ -0,0 +1,290 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * CTU CAN FD IP Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2018 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; self-funded</div><div class='add'>+ * Copyright (C) 2018-2019 Martin Jerabek &lt;martin.jerabek01@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2022 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt; FEE CTU/self-funded</div><div class='add'>+ *</div><div class='add'>+ * Project advisors:</div><div class='add'>+ *     Jiri Novak &lt;jnovak@fel.cvut.cz&gt;</div><div class='add'>+ *     Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Department of Measurement         (http://meas.fel.cvut.cz/)</div><div class='add'>+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)</div><div class='add'>+ * Czech Technical University        (http://www.cvut.cz/)</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ctucanfd.h"</div><div class='add'>+</div><div class='add'>+#ifndef PCI_DEVICE_DATA</div><div class='add'>+#define PCI_DEVICE_DATA(vend, dev, data) \</div><div class='add'>+.vendor = PCI_VENDOR_ID_##vend, \</div><div class='add'>+.device = PCI_DEVICE_ID_##vend##_##dev, \</div><div class='add'>+.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0, \</div><div class='add'>+.driver_data = (kernel_ulong_t)(data)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef PCI_VENDOR_ID_TEDIA</div><div class='add'>+#define PCI_VENDOR_ID_TEDIA 0x1760</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef PCI_DEVICE_ID_TEDIA_CTUCAN_VER21</div><div class='add'>+#define PCI_DEVICE_ID_TEDIA_CTUCAN_VER21 0xff00</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define CTUCAN_BAR0_CTUCAN_ID 0x0000</div><div class='add'>+#define CTUCAN_BAR0_CRA_BASE  0x4000</div><div class='add'>+#define CYCLONE_IV_CRA_A2P_IE (0x0050)</div><div class='add'>+</div><div class='add'>+#define CTUCAN_WITHOUT_CTUCAN_ID  0</div><div class='add'>+#define CTUCAN_WITH_CTUCAN_ID     1</div><div class='add'>+</div><div class='add'>+struct ctucan_pci_board_data {</div><div class='add'>+	void __iomem *bar0_base;</div><div class='add'>+	void __iomem *cra_base;</div><div class='add'>+	void __iomem *bar1_base;</div><div class='add'>+	struct list_head ndev_list_head;</div><div class='add'>+	int use_msi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ctucan_pci_board_data *ctucan_pci_get_bdata(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return (struct ctucan_pci_board_data *)pci_get_drvdata(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ctucan_pci_set_drvdata(struct device *dev,</div><div class='add'>+				   struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct ctucan_pci_board_data *bdata = ctucan_pci_get_bdata(pdev);</div><div class='add'>+</div><div class='add'>+	list_add(&amp;priv-&gt;peers_on_pdev, &amp;bdata-&gt;ndev_list_head);</div><div class='add'>+	priv-&gt;irq_flags = IRQF_SHARED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_pci_probe - PCI registration call</div><div class='add'>+ * @pdev:	Handle to the pci device structure</div><div class='add'>+ * @ent:	Pointer to the entry from ctucan_pci_tbl</div><div class='add'>+ *</div><div class='add'>+ * This function does all the memory allocation and registration for the CAN</div><div class='add'>+ * device.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			    const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct device	*dev = &amp;pdev-&gt;dev;</div><div class='add'>+	unsigned long driver_data = ent-&gt;driver_data;</div><div class='add'>+	struct ctucan_pci_board_data *bdata;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	void __iomem *cra_addr;</div><div class='add'>+	void __iomem *bar0_base;</div><div class='add'>+	u32 cra_a2p_ie;</div><div class='add'>+	u32 ctucan_id = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int ntxbufs;</div><div class='add'>+	unsigned int num_cores = 1;</div><div class='add'>+	unsigned int core_i = 0;</div><div class='add'>+	int irq;</div><div class='add'>+	int msi_ok = 0;</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "pci_enable_device FAILED\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_request_regions(pdev, KBUILD_MODNAME);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "pci_request_regions FAILED\n");</div><div class='add'>+		goto err_disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_msi(pdev);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		dev_info(dev, "MSI enabled\n");</div><div class='add'>+		pci_set_master(pdev);</div><div class='add'>+		msi_ok = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "ctucan BAR0 0x%08llx 0x%08llx\n",</div><div class='add'>+		 (long long)pci_resource_start(pdev, 0),</div><div class='add'>+		 (long long)pci_resource_len(pdev, 0));</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "ctucan BAR1 0x%08llx 0x%08llx\n",</div><div class='add'>+		 (long long)pci_resource_start(pdev, 1),</div><div class='add'>+		 (long long)pci_resource_len(pdev, 1));</div><div class='add'>+</div><div class='add'>+	addr = pci_iomap(pdev, 1, pci_resource_len(pdev, 1));</div><div class='add'>+	if (!addr) {</div><div class='add'>+		dev_err(dev, "PCI BAR 1 cannot be mapped\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cyclone IV PCI Express Control Registers Area */</div><div class='add'>+	bar0_base = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));</div><div class='add'>+	if (!bar0_base) {</div><div class='add'>+		dev_err(dev, "PCI BAR 0 cannot be mapped\n");</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		goto err_pci_iounmap_bar1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (driver_data == CTUCAN_WITHOUT_CTUCAN_ID) {</div><div class='add'>+		cra_addr = bar0_base;</div><div class='add'>+		num_cores = 2;</div><div class='add'>+	} else {</div><div class='add'>+		cra_addr = bar0_base + CTUCAN_BAR0_CRA_BASE;</div><div class='add'>+		ctucan_id = ioread32(bar0_base + CTUCAN_BAR0_CTUCAN_ID);</div><div class='add'>+		dev_info(dev, "ctucan_id 0x%08lx\n", (unsigned long)ctucan_id);</div><div class='add'>+		num_cores = ctucan_id &amp; 0xf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = pdev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	ntxbufs = 4;</div><div class='add'>+</div><div class='add'>+	bdata = kzalloc(sizeof(*bdata), GFP_KERNEL);</div><div class='add'>+	if (!bdata) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_pci_iounmap_bar0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;bdata-&gt;ndev_list_head);</div><div class='add'>+	bdata-&gt;bar0_base = bar0_base;</div><div class='add'>+	bdata-&gt;cra_base = cra_addr;</div><div class='add'>+	bdata-&gt;bar1_base = addr;</div><div class='add'>+	bdata-&gt;use_msi = msi_ok;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, bdata);</div><div class='add'>+</div><div class='add'>+	ret = ctucan_probe_common(dev, addr, irq, ntxbufs, 100000000,</div><div class='add'>+				  0, ctucan_pci_set_drvdata);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_board;</div><div class='add'>+</div><div class='add'>+	core_i++;</div><div class='add'>+</div><div class='add'>+	while (core_i &lt; num_cores) {</div><div class='add'>+		addr += 0x4000;</div><div class='add'>+		ret = ctucan_probe_common(dev, addr, irq, ntxbufs, 100000000,</div><div class='add'>+					  0, ctucan_pci_set_drvdata);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_info(dev, "CTU CAN FD core %d initialization failed\n",</div><div class='add'>+				 core_i);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		core_i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable interrupt in</div><div class='add'>+	 * Avalon-MM to PCI Express Interrupt Enable Register</div><div class='add'>+	 */</div><div class='add'>+	cra_a2p_ie = ioread32(cra_addr + CYCLONE_IV_CRA_A2P_IE);</div><div class='add'>+	dev_info(dev, "cra_a2p_ie 0x%08x\n", cra_a2p_ie);</div><div class='add'>+	cra_a2p_ie |= 1;</div><div class='add'>+	iowrite32(cra_a2p_ie, cra_addr + CYCLONE_IV_CRA_A2P_IE);</div><div class='add'>+	cra_a2p_ie = ioread32(cra_addr + CYCLONE_IV_CRA_A2P_IE);</div><div class='add'>+	dev_info(dev, "cra_a2p_ie 0x%08x\n", cra_a2p_ie);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_board:</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(bdata);</div><div class='add'>+err_pci_iounmap_bar0:</div><div class='add'>+	pci_iounmap(pdev, cra_addr);</div><div class='add'>+err_pci_iounmap_bar1:</div><div class='add'>+	pci_iounmap(pdev, addr);</div><div class='add'>+err_release_regions:</div><div class='add'>+	if (msi_ok)</div><div class='add'>+		pci_disable_msi(pdev);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+err_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_pci_remove - Unregister the device after releasing the resources</div><div class='add'>+ * @pdev:	Handle to the pci device structure</div><div class='add'>+ *</div><div class='add'>+ * This function frees all the resources allocated to the device.</div><div class='add'>+ * Return: 0 always</div><div class='add'>+ */</div><div class='add'>+static void ctucan_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct ctucan_priv *priv = NULL;</div><div class='add'>+	struct ctucan_pci_board_data *bdata = ctucan_pci_get_bdata(pdev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(&amp;pdev-&gt;dev, "ctucan_remove");</div><div class='add'>+</div><div class='add'>+	if (!bdata) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "%s: no list of devices\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* disable interrupt in</div><div class='add'>+	 * Avalon-MM to PCI Express Interrupt Enable Register</div><div class='add'>+	 */</div><div class='add'>+	if (bdata-&gt;cra_base)</div><div class='add'>+		iowrite32(0, bdata-&gt;cra_base + CYCLONE_IV_CRA_A2P_IE);</div><div class='add'>+</div><div class='add'>+	while ((priv = list_first_entry_or_null(&amp;bdata-&gt;ndev_list_head, struct ctucan_priv,</div><div class='add'>+						peers_on_pdev)) != NULL) {</div><div class='add'>+		ndev = priv-&gt;can.dev;</div><div class='add'>+</div><div class='add'>+		unregister_candev(ndev);</div><div class='add'>+</div><div class='add'>+		netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+		list_del_init(&amp;priv-&gt;peers_on_pdev);</div><div class='add'>+		free_candev(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_iounmap(pdev, bdata-&gt;bar1_base);</div><div class='add'>+</div><div class='add'>+	if (bdata-&gt;use_msi)</div><div class='add'>+		pci_disable_msi(pdev);</div><div class='add'>+</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	pci_iounmap(pdev, bdata-&gt;bar0_base);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+	kfree(bdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(ctucan_pci_pm_ops, ctucan_suspend, ctucan_resume);</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id ctucan_pci_tbl[] = {</div><div class='add'>+	{PCI_DEVICE_DATA(TEDIA, CTUCAN_VER21,</div><div class='add'>+		CTUCAN_WITH_CTUCAN_ID)},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver ctucan_pci_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.id_table = ctucan_pci_tbl,</div><div class='add'>+	.probe = ctucan_pci_probe,</div><div class='add'>+	.remove = ctucan_pci_remove,</div><div class='add'>+	.driver.pm = &amp;ctucan_pci_pm_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(ctucan_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CTU CAN FD for PCI bus");</div><div class='head'>diff --git a/drivers/net/can/ctucanfd/ctucanfd_platform.c b/drivers/net/can/ctucanfd/ctucanfd_platform.c<br/>new file mode 100644<br/>index 000000000000..70e2577c8541<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ctucanfd/ctucanfd_platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ctucanfd/ctucanfd_platform.c</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *</div><div class='add'>+ * CTU CAN FD IP Core</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2015-2018 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2021 Ondrej Ille &lt;ondrej.ille@gmail.com&gt; self-funded</div><div class='add'>+ * Copyright (C) 2018-2019 Martin Jerabek &lt;martin.jerabek01@gmail.com&gt; FEE CTU</div><div class='add'>+ * Copyright (C) 2018-2022 Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt; FEE CTU/self-funded</div><div class='add'>+ *</div><div class='add'>+ * Project advisors:</div><div class='add'>+ *     Jiri Novak &lt;jnovak@fel.cvut.cz&gt;</div><div class='add'>+ *     Pavel Pisa &lt;pisa@cmp.felk.cvut.cz&gt;</div><div class='add'>+ *</div><div class='add'>+ * Department of Measurement         (http://meas.fel.cvut.cz/)</div><div class='add'>+ * Faculty of Electrical Engineering (http://www.fel.cvut.cz)</div><div class='add'>+ * Czech Technical University        (http://www.cvut.cz/)</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ctucanfd.h"</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"ctucanfd"</div><div class='add'>+</div><div class='add'>+static void ctucan_platform_set_drvdata(struct device *dev,</div><div class='add'>+					struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = container_of(dev, struct platform_device,</div><div class='add'>+						    dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_platform_probe - Platform registration call</div><div class='add'>+ * @pdev:	Handle to the platform device structure</div><div class='add'>+ *</div><div class='add'>+ * This function does all the memory allocation and registration for the CAN</div><div class='add'>+ * device.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success and failure value on error</div><div class='add'>+ */</div><div class='add'>+static int ctucan_platform_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device	*dev = &amp;pdev-&gt;dev;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	int ret;</div><div class='add'>+	unsigned int ntxbufs;</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	/* Get the virtual base address for the device */</div><div class='add'>+	addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(addr)) {</div><div class='add'>+		ret = PTR_ERR(addr);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		ret = irq;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Number of tx bufs might be change in HW for future. If so,</div><div class='add'>+	 * it will be passed as property via device tree</div><div class='add'>+	 */</div><div class='add'>+	ntxbufs = 4;</div><div class='add'>+	ret = ctucan_probe_common(dev, addr, irq, ntxbufs, 0,</div><div class='add'>+				  1, ctucan_platform_set_drvdata);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ctucan_platform_remove - Unregister the device after releasing the resources</div><div class='add'>+ * @pdev:	Handle to the platform device structure</div><div class='add'>+ *</div><div class='add'>+ * This function frees all the resources allocated to the device.</div><div class='add'>+ * Return: 0 always</div><div class='add'>+ */</div><div class='add'>+static void ctucan_platform_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct ctucan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ndev, "ctucan_remove");</div><div class='add'>+</div><div class='add'>+	unregister_candev(ndev);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+	netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(ctucan_platform_pm_ops, ctucan_suspend, ctucan_resume);</div><div class='add'>+</div><div class='add'>+/* Match table for OF platform binding */</div><div class='add'>+static const struct of_device_id ctucan_of_match[] = {</div><div class='add'>+	{ .compatible = "ctu,ctucanfd-2", },</div><div class='add'>+	{ .compatible = "ctu,ctucanfd", },</div><div class='add'>+	{ /* end of list */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ctucan_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver ctucanfd_driver = {</div><div class='add'>+	.probe	= ctucan_platform_probe,</div><div class='add'>+	.remove = ctucan_platform_remove,</div><div class='add'>+	.driver	= {</div><div class='add'>+		.name = DRV_NAME,</div><div class='add'>+		.pm = &amp;ctucan_platform_pm_ops,</div><div class='add'>+		.of_match_table	= ctucan_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(ctucanfd_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Martin Jerabek");</div><div class='add'>+MODULE_DESCRIPTION("CTU CAN FD for platform");</div><div class='head'>diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c<br/>deleted file mode 100644<br/>index c05e4d50d43d..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/dev.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1311 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2005 Marc Kleine-Budde, Pengutronix</div><div class='del'>- * Copyright (C) 2006 Andrey Volkov, Varma Electronics</div><div class='del'>- * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/can.h&gt;</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/can/skb.h&gt;</div><div class='del'>-#include &lt;linux/can/netlink.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;net/rtnetlink.h&gt;</div><div class='del'>-</div><div class='del'>-#define MOD_DESC "CAN device driver interface"</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION(MOD_DESC);</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_AUTHOR("Wolfgang Grandegger &lt;wg@grandegger.com&gt;");</div><div class='del'>-</div><div class='del'>-/* CAN DLC to real data length conversion helpers */</div><div class='del'>-</div><div class='del'>-static const u8 dlc2len[] = {0, 1, 2, 3, 4, 5, 6, 7,</div><div class='del'>-			     8, 12, 16, 20, 24, 32, 48, 64};</div><div class='del'>-</div><div class='del'>-/* get data length from can_dlc with sanitized can_dlc */</div><div class='del'>-u8 can_dlc2len(u8 can_dlc)</div><div class='del'>-{</div><div class='del'>-	return dlc2len[can_dlc &amp; 0x0F];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_dlc2len);</div><div class='del'>-</div><div class='del'>-static const u8 len2dlc[] = {0, 1, 2, 3, 4, 5, 6, 7, 8,		/* 0 - 8 */</div><div class='del'>-			     9, 9, 9, 9,			/* 9 - 12 */</div><div class='del'>-			     10, 10, 10, 10,			/* 13 - 16 */</div><div class='del'>-			     11, 11, 11, 11,			/* 17 - 20 */</div><div class='del'>-			     12, 12, 12, 12,			/* 21 - 24 */</div><div class='del'>-			     13, 13, 13, 13, 13, 13, 13, 13,	/* 25 - 32 */</div><div class='del'>-			     14, 14, 14, 14, 14, 14, 14, 14,	/* 33 - 40 */</div><div class='del'>-			     14, 14, 14, 14, 14, 14, 14, 14,	/* 41 - 48 */</div><div class='del'>-			     15, 15, 15, 15, 15, 15, 15, 15,	/* 49 - 56 */</div><div class='del'>-			     15, 15, 15, 15, 15, 15, 15, 15};	/* 57 - 64 */</div><div class='del'>-</div><div class='del'>-/* map the sanitized data length to an appropriate data length code */</div><div class='del'>-u8 can_len2dlc(u8 len)</div><div class='del'>-{</div><div class='del'>-	if (unlikely(len &gt; 64))</div><div class='del'>-		return 0xF;</div><div class='del'>-</div><div class='del'>-	return len2dlc[len];</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_len2dlc);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CAN_CALC_BITTIMING</div><div class='del'>-#define CAN_CALC_MAX_ERROR 50 /* in one-tenth of a percent */</div><div class='del'>-#define CAN_CALC_SYNC_SEG 1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bit-timing calculation derived from:</div><div class='del'>- *</div><div class='del'>- * Code based on LinCAN sources and H8S2638 project</div><div class='del'>- * Copyright 2004-2006 Pavel Pisa - DCE FELK CVUT cz</div><div class='del'>- * Copyright 2005      Stanislav Marek</div><div class='del'>- * email: pisa@cmp.felk.cvut.cz</div><div class='del'>- *</div><div class='del'>- * Calculates proper bit-timing parameters for a specified bit-rate</div><div class='del'>- * and sample-point, which can then be used to set the bit-timing</div><div class='del'>- * registers of the CAN controller. You can find more information</div><div class='del'>- * in the header file linux/can/netlink.h.</div><div class='del'>- */</div><div class='del'>-static int can_update_sample_point(const struct can_bittiming_const *btc,</div><div class='del'>-			  unsigned int sample_point_nominal, unsigned int tseg,</div><div class='del'>-			  unsigned int *tseg1_ptr, unsigned int *tseg2_ptr,</div><div class='del'>-			  unsigned int *sample_point_error_ptr)</div><div class='del'>-{</div><div class='del'>-	unsigned int sample_point_error, best_sample_point_error = UINT_MAX;</div><div class='del'>-	unsigned int sample_point, best_sample_point = 0;</div><div class='del'>-	unsigned int tseg1, tseg2;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= 1; i++) {</div><div class='del'>-		tseg2 = tseg + CAN_CALC_SYNC_SEG - (sample_point_nominal * (tseg + CAN_CALC_SYNC_SEG)) / 1000 - i;</div><div class='del'>-		tseg2 = clamp(tseg2, btc-&gt;tseg2_min, btc-&gt;tseg2_max);</div><div class='del'>-		tseg1 = tseg - tseg2;</div><div class='del'>-		if (tseg1 &gt; btc-&gt;tseg1_max) {</div><div class='del'>-			tseg1 = btc-&gt;tseg1_max;</div><div class='del'>-			tseg2 = tseg - tseg1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sample_point = 1000 * (tseg + CAN_CALC_SYNC_SEG - tseg2) / (tseg + CAN_CALC_SYNC_SEG);</div><div class='del'>-		sample_point_error = abs(sample_point_nominal - sample_point);</div><div class='del'>-</div><div class='del'>-		if ((sample_point &lt;= sample_point_nominal) &amp;&amp; (sample_point_error &lt; best_sample_point_error)) {</div><div class='del'>-			best_sample_point = sample_point;</div><div class='del'>-			best_sample_point_error = sample_point_error;</div><div class='del'>-			*tseg1_ptr = tseg1;</div><div class='del'>-			*tseg2_ptr = tseg2;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sample_point_error_ptr)</div><div class='del'>-		*sample_point_error_ptr = best_sample_point_error;</div><div class='del'>-</div><div class='del'>-	return best_sample_point;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt,</div><div class='del'>-			      const struct can_bittiming_const *btc)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned int bitrate;			/* current bitrate */</div><div class='del'>-	unsigned int bitrate_error;		/* difference between current and nominal value */</div><div class='del'>-	unsigned int best_bitrate_error = UINT_MAX;</div><div class='del'>-	unsigned int sample_point_error;	/* difference between current and nominal value */</div><div class='del'>-	unsigned int best_sample_point_error = UINT_MAX;</div><div class='del'>-	unsigned int sample_point_nominal;	/* nominal sample point */</div><div class='del'>-	unsigned int best_tseg = 0;		/* current best value for tseg */</div><div class='del'>-	unsigned int best_brp = 0;		/* current best value for brp */</div><div class='del'>-	unsigned int brp, tsegall, tseg, tseg1 = 0, tseg2 = 0;</div><div class='del'>-	u64 v64;</div><div class='del'>-</div><div class='del'>-	/* Use CiA recommended sample points */</div><div class='del'>-	if (bt-&gt;sample_point) {</div><div class='del'>-		sample_point_nominal = bt-&gt;sample_point;</div><div class='del'>-	} else {</div><div class='del'>-		if (bt-&gt;bitrate &gt; 800000)</div><div class='del'>-			sample_point_nominal = 750;</div><div class='del'>-		else if (bt-&gt;bitrate &gt; 500000)</div><div class='del'>-			sample_point_nominal = 800;</div><div class='del'>-		else</div><div class='del'>-			sample_point_nominal = 875;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* tseg even = round down, odd = round up */</div><div class='del'>-	for (tseg = (btc-&gt;tseg1_max + btc-&gt;tseg2_max) * 2 + 1;</div><div class='del'>-	     tseg &gt;= (btc-&gt;tseg1_min + btc-&gt;tseg2_min) * 2; tseg--) {</div><div class='del'>-		tsegall = CAN_CALC_SYNC_SEG + tseg / 2;</div><div class='del'>-</div><div class='del'>-		/* Compute all possible tseg choices (tseg=tseg1+tseg2) */</div><div class='del'>-		brp = priv-&gt;clock.freq / (tsegall * bt-&gt;bitrate) + tseg % 2;</div><div class='del'>-</div><div class='del'>-		/* choose brp step which is possible in system */</div><div class='del'>-		brp = (brp / btc-&gt;brp_inc) * btc-&gt;brp_inc;</div><div class='del'>-		if ((brp &lt; btc-&gt;brp_min) || (brp &gt; btc-&gt;brp_max))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bitrate = priv-&gt;clock.freq / (brp * tsegall);</div><div class='del'>-		bitrate_error = abs(bt-&gt;bitrate - bitrate);</div><div class='del'>-</div><div class='del'>-		/* tseg brp biterror */</div><div class='del'>-		if (bitrate_error &gt; best_bitrate_error)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* reset sample point error if we have a better bitrate */</div><div class='del'>-		if (bitrate_error &lt; best_bitrate_error)</div><div class='del'>-			best_sample_point_error = UINT_MAX;</div><div class='del'>-</div><div class='del'>-		can_update_sample_point(btc, sample_point_nominal, tseg / 2, &amp;tseg1, &amp;tseg2, &amp;sample_point_error);</div><div class='del'>-		if (sample_point_error &gt; best_sample_point_error)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		best_sample_point_error = sample_point_error;</div><div class='del'>-		best_bitrate_error = bitrate_error;</div><div class='del'>-		best_tseg = tseg / 2;</div><div class='del'>-		best_brp = brp;</div><div class='del'>-</div><div class='del'>-		if (bitrate_error == 0 &amp;&amp; sample_point_error == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (best_bitrate_error) {</div><div class='del'>-		/* Error in one-tenth of a percent */</div><div class='del'>-		v64 = (u64)best_bitrate_error * 1000;</div><div class='del'>-		do_div(v64, bt-&gt;bitrate);</div><div class='del'>-		bitrate_error = (u32)v64;</div><div class='del'>-		if (bitrate_error &gt; CAN_CALC_MAX_ERROR) {</div><div class='del'>-			netdev_err(dev,</div><div class='del'>-				   "bitrate error %d.%d%% too high\n",</div><div class='del'>-				   bitrate_error / 10, bitrate_error % 10);</div><div class='del'>-			return -EDOM;</div><div class='del'>-		}</div><div class='del'>-		netdev_warn(dev, "bitrate error %d.%d%%\n",</div><div class='del'>-			    bitrate_error / 10, bitrate_error % 10);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* real sample point */</div><div class='del'>-	bt-&gt;sample_point = can_update_sample_point(btc, sample_point_nominal, best_tseg,</div><div class='del'>-					  &amp;tseg1, &amp;tseg2, NULL);</div><div class='del'>-</div><div class='del'>-	v64 = (u64)best_brp * 1000 * 1000 * 1000;</div><div class='del'>-	do_div(v64, priv-&gt;clock.freq);</div><div class='del'>-	bt-&gt;tq = (u32)v64;</div><div class='del'>-	bt-&gt;prop_seg = tseg1 / 2;</div><div class='del'>-	bt-&gt;phase_seg1 = tseg1 - bt-&gt;prop_seg;</div><div class='del'>-	bt-&gt;phase_seg2 = tseg2;</div><div class='del'>-</div><div class='del'>-	/* check for sjw user settings */</div><div class='del'>-	if (!bt-&gt;sjw || !btc-&gt;sjw_max) {</div><div class='del'>-		bt-&gt;sjw = 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* bt-&gt;sjw is at least 1 -&gt; sanitize upper bound to sjw_max */</div><div class='del'>-		if (bt-&gt;sjw &gt; btc-&gt;sjw_max)</div><div class='del'>-			bt-&gt;sjw = btc-&gt;sjw_max;</div><div class='del'>-		/* bt-&gt;sjw must not be higher than tseg2 */</div><div class='del'>-		if (tseg2 &lt; bt-&gt;sjw)</div><div class='del'>-			bt-&gt;sjw = tseg2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bt-&gt;brp = best_brp;</div><div class='del'>-</div><div class='del'>-	/* real bitrate */</div><div class='del'>-	bt-&gt;bitrate = priv-&gt;clock.freq / (bt-&gt;brp * (CAN_CALC_SYNC_SEG + tseg1 + tseg2));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#else /* !CONFIG_CAN_CALC_BITTIMING */</div><div class='del'>-static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt,</div><div class='del'>-			      const struct can_bittiming_const *btc)</div><div class='del'>-{</div><div class='del'>-	netdev_err(dev, "bit-timing calculation not available\n");</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_CAN_CALC_BITTIMING */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Checks the validity of the specified bit-timing parameters prop_seg,</div><div class='del'>- * phase_seg1, phase_seg2 and sjw and tries to determine the bitrate</div><div class='del'>- * prescaler value brp. You can find more information in the header</div><div class='del'>- * file linux/can/netlink.h.</div><div class='del'>- */</div><div class='del'>-static int can_fixup_bittiming(struct net_device *dev, struct can_bittiming *bt,</div><div class='del'>-			       const struct can_bittiming_const *btc)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	int tseg1, alltseg;</div><div class='del'>-	u64 brp64;</div><div class='del'>-</div><div class='del'>-	tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1;</div><div class='del'>-	if (!bt-&gt;sjw)</div><div class='del'>-		bt-&gt;sjw = 1;</div><div class='del'>-	if (bt-&gt;sjw &gt; btc-&gt;sjw_max ||</div><div class='del'>-	    tseg1 &lt; btc-&gt;tseg1_min || tseg1 &gt; btc-&gt;tseg1_max ||</div><div class='del'>-	    bt-&gt;phase_seg2 &lt; btc-&gt;tseg2_min || bt-&gt;phase_seg2 &gt; btc-&gt;tseg2_max)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	brp64 = (u64)priv-&gt;clock.freq * (u64)bt-&gt;tq;</div><div class='del'>-	if (btc-&gt;brp_inc &gt; 1)</div><div class='del'>-		do_div(brp64, btc-&gt;brp_inc);</div><div class='del'>-	brp64 += 500000000UL - 1;</div><div class='del'>-	do_div(brp64, 1000000000UL); /* the practicable BRP */</div><div class='del'>-	if (btc-&gt;brp_inc &gt; 1)</div><div class='del'>-		brp64 *= btc-&gt;brp_inc;</div><div class='del'>-	bt-&gt;brp = (u32)brp64;</div><div class='del'>-</div><div class='del'>-	if (bt-&gt;brp &lt; btc-&gt;brp_min || bt-&gt;brp &gt; btc-&gt;brp_max)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	alltseg = bt-&gt;prop_seg + bt-&gt;phase_seg1 + bt-&gt;phase_seg2 + 1;</div><div class='del'>-	bt-&gt;bitrate = priv-&gt;clock.freq / (bt-&gt;brp * alltseg);</div><div class='del'>-	bt-&gt;sample_point = ((tseg1 + 1) * 1000) / alltseg;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Checks the validity of predefined bitrate settings */</div><div class='del'>-static int can_validate_bitrate(struct net_device *dev, struct can_bittiming *bt,</div><div class='del'>-				const u32 *bitrate_const,</div><div class='del'>-				const unsigned int bitrate_const_cnt)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; bitrate_const_cnt; i++) {</div><div class='del'>-		if (bt-&gt;bitrate == bitrate_const[i])</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i &gt;= priv-&gt;bitrate_const_cnt)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_get_bittiming(struct net_device *dev, struct can_bittiming *bt,</div><div class='del'>-			     const struct can_bittiming_const *btc,</div><div class='del'>-			     const u32 *bitrate_const,</div><div class='del'>-			     const unsigned int bitrate_const_cnt)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Depending on the given can_bittiming parameter structure the CAN</div><div class='del'>-	 * timing parameters are calculated based on the provided bitrate OR</div><div class='del'>-	 * alternatively the CAN timing parameters (tq, prop_seg, etc.) are</div><div class='del'>-	 * provided directly which are then checked and fixed up.</div><div class='del'>-	 */</div><div class='del'>-	if (!bt-&gt;tq &amp;&amp; bt-&gt;bitrate &amp;&amp; btc)</div><div class='del'>-		err = can_calc_bittiming(dev, bt, btc);</div><div class='del'>-	else if (bt-&gt;tq &amp;&amp; !bt-&gt;bitrate &amp;&amp; btc)</div><div class='del'>-		err = can_fixup_bittiming(dev, bt, btc);</div><div class='del'>-	else if (!bt-&gt;tq &amp;&amp; bt-&gt;bitrate &amp;&amp; bitrate_const)</div><div class='del'>-		err = can_validate_bitrate(dev, bt, bitrate_const,</div><div class='del'>-					   bitrate_const_cnt);</div><div class='del'>-	else</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void can_update_state_error_stats(struct net_device *dev,</div><div class='del'>-					 enum can_state new_state)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (new_state &lt;= priv-&gt;state)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (new_state) {</div><div class='del'>-	case CAN_STATE_ERROR_WARNING:</div><div class='del'>-		priv-&gt;can_stats.error_warning++;</div><div class='del'>-		break;</div><div class='del'>-	case CAN_STATE_ERROR_PASSIVE:</div><div class='del'>-		priv-&gt;can_stats.error_passive++;</div><div class='del'>-		break;</div><div class='del'>-	case CAN_STATE_BUS_OFF:</div><div class='del'>-		priv-&gt;can_stats.bus_off++;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_tx_state_to_frame(struct net_device *dev, enum can_state state)</div><div class='del'>-{</div><div class='del'>-	switch (state) {</div><div class='del'>-	case CAN_STATE_ERROR_ACTIVE:</div><div class='del'>-		return CAN_ERR_CRTL_ACTIVE;</div><div class='del'>-	case CAN_STATE_ERROR_WARNING:</div><div class='del'>-		return CAN_ERR_CRTL_TX_WARNING;</div><div class='del'>-	case CAN_STATE_ERROR_PASSIVE:</div><div class='del'>-		return CAN_ERR_CRTL_TX_PASSIVE;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_rx_state_to_frame(struct net_device *dev, enum can_state state)</div><div class='del'>-{</div><div class='del'>-	switch (state) {</div><div class='del'>-	case CAN_STATE_ERROR_ACTIVE:</div><div class='del'>-		return CAN_ERR_CRTL_ACTIVE;</div><div class='del'>-	case CAN_STATE_ERROR_WARNING:</div><div class='del'>-		return CAN_ERR_CRTL_RX_WARNING;</div><div class='del'>-	case CAN_STATE_ERROR_PASSIVE:</div><div class='del'>-		return CAN_ERR_CRTL_RX_PASSIVE;</div><div class='del'>-	default:</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void can_change_state(struct net_device *dev, struct can_frame *cf,</div><div class='del'>-		      enum can_state tx_state, enum can_state rx_state)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	enum can_state new_state = max(tx_state, rx_state);</div><div class='del'>-</div><div class='del'>-	if (unlikely(new_state == priv-&gt;state)) {</div><div class='del'>-		netdev_warn(dev, "%s: oops, state did not change", __func__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netdev_dbg(dev, "New error state: %d\n", new_state);</div><div class='del'>-</div><div class='del'>-	can_update_state_error_stats(dev, new_state);</div><div class='del'>-	priv-&gt;state = new_state;</div><div class='del'>-</div><div class='del'>-	if (!cf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (unlikely(new_state == CAN_STATE_BUS_OFF)) {</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-	cf-&gt;data[1] |= tx_state &gt;= rx_state ?</div><div class='del'>-		       can_tx_state_to_frame(dev, tx_state) : 0;</div><div class='del'>-	cf-&gt;data[1] |= tx_state &lt;= rx_state ?</div><div class='del'>-		       can_rx_state_to_frame(dev, rx_state) : 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_change_state);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local echo of CAN messages</div><div class='del'>- *</div><div class='del'>- * CAN network devices *should* support a local echo functionality</div><div class='del'>- * (see Documentation/networking/can.rst). To test the handling of CAN</div><div class='del'>- * interfaces that do not support the local echo both driver types are</div><div class='del'>- * implemented. In the case that the driver does not support the echo</div><div class='del'>- * the IFF_ECHO remains clear in dev-&gt;flags. This causes the PF_CAN core</div><div class='del'>- * to perform the echo as a fallback solution.</div><div class='del'>- */</div><div class='del'>-static void can_flush_echo_skb(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;echo_skb_max; i++) {</div><div class='del'>-		if (priv-&gt;echo_skb[i]) {</div><div class='del'>-			kfree_skb(priv-&gt;echo_skb[i]);</div><div class='del'>-			priv-&gt;echo_skb[i] = NULL;</div><div class='del'>-			stats-&gt;tx_dropped++;</div><div class='del'>-			stats-&gt;tx_aborted_errors++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Put the skb on the stack to be looped backed locally lateron</div><div class='del'>- *</div><div class='del'>- * The function is typically called in the start_xmit function</div><div class='del'>- * of the device driver. The driver must protect access to</div><div class='del'>- * priv-&gt;echo_skb, if necessary.</div><div class='del'>- */</div><div class='del'>-void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,</div><div class='del'>-		      unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	BUG_ON(idx &gt;= priv-&gt;echo_skb_max);</div><div class='del'>-</div><div class='del'>-	/* check flag whether this packet has to be looped back */</div><div class='del'>-	if (!(dev-&gt;flags &amp; IFF_ECHO) || skb-&gt;pkt_type != PACKET_LOOPBACK ||</div><div class='del'>-	    (skb-&gt;protocol != htons(ETH_P_CAN) &amp;&amp;</div><div class='del'>-	     skb-&gt;protocol != htons(ETH_P_CANFD))) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;echo_skb[idx]) {</div><div class='del'>-</div><div class='del'>-		skb = can_create_echo_skb(skb);</div><div class='del'>-		if (!skb)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* make settings for echo to reduce code in irq context */</div><div class='del'>-		skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='del'>-		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-		skb-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-		/* save this skb for tx interrupt echo handling */</div><div class='del'>-		priv-&gt;echo_skb[idx] = skb;</div><div class='del'>-	} else {</div><div class='del'>-		/* locking problem with netif_stop_queue() ?? */</div><div class='del'>-		netdev_err(dev, "%s: BUG! echo_skb is occupied!\n", __func__);</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_put_echo_skb);</div><div class='del'>-</div><div class='del'>-struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (idx &gt;= priv-&gt;echo_skb_max) {</div><div class='del'>-		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",</div><div class='del'>-			   __func__, idx, priv-&gt;echo_skb_max);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;echo_skb[idx]) {</div><div class='del'>-		/* Using "struct canfd_frame::len" for the frame</div><div class='del'>-		 * length is supported on both CAN and CANFD frames.</div><div class='del'>-		 */</div><div class='del'>-		struct sk_buff *skb = priv-&gt;echo_skb[idx];</div><div class='del'>-		struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='del'>-		u8 len = cf-&gt;len;</div><div class='del'>-</div><div class='del'>-		*len_ptr = len;</div><div class='del'>-		priv-&gt;echo_skb[idx] = NULL;</div><div class='del'>-</div><div class='del'>-		return skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Get the skb from the stack and loop it back locally</div><div class='del'>- *</div><div class='del'>- * The function is typically called when the TX done interrupt</div><div class='del'>- * is handled in the device driver. The driver must protect</div><div class='del'>- * access to priv-&gt;echo_skb, if necessary.</div><div class='del'>- */</div><div class='del'>-unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u8 len;</div><div class='del'>-</div><div class='del'>-	skb = __can_get_echo_skb(dev, idx, &amp;len);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_get_echo_skb);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  * Remove the skb from the stack and free it.</div><div class='del'>-  *</div><div class='del'>-  * The function is typically called when TX failed.</div><div class='del'>-  */</div><div class='del'>-void can_free_echo_skb(struct net_device *dev, unsigned int idx)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	BUG_ON(idx &gt;= priv-&gt;echo_skb_max);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;echo_skb[idx]) {</div><div class='del'>-		dev_kfree_skb_any(priv-&gt;echo_skb[idx]);</div><div class='del'>-		priv-&gt;echo_skb[idx] = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_free_echo_skb);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CAN device restart for bus-off recovery</div><div class='del'>- */</div><div class='del'>-static void can_restart(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	BUG_ON(netif_carrier_ok(dev));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * No synchronization needed because the device is bus-off and</div><div class='del'>-	 * no messages can come in or go out.</div><div class='del'>-	 */</div><div class='del'>-	can_flush_echo_skb(dev);</div><div class='del'>-</div><div class='del'>-	/* send restart message upstream */</div><div class='del'>-	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='del'>-	if (skb == NULL) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto restart;</div><div class='del'>-	}</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='del'>-</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-</div><div class='del'>-restart:</div><div class='del'>-	netdev_dbg(dev, "restarted\n");</div><div class='del'>-	priv-&gt;can_stats.restarts++;</div><div class='del'>-</div><div class='del'>-	/* Now restart the device */</div><div class='del'>-	err = priv-&gt;do_set_mode(dev, CAN_MODE_START);</div><div class='del'>-</div><div class='del'>-	netif_carrier_on(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		netdev_err(dev, "Error %d during restart", err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void can_restart_work(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct delayed_work *dwork = to_delayed_work(work);</div><div class='del'>-	struct can_priv *priv = container_of(dwork, struct can_priv, restart_work);</div><div class='del'>-</div><div class='del'>-	can_restart(priv-&gt;dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int can_restart_now(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * A manual restart is only permitted if automatic restart is</div><div class='del'>-	 * disabled and the device is in the bus-off state</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;restart_ms)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	if (priv-&gt;state != CAN_STATE_BUS_OFF)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;priv-&gt;restart_work);</div><div class='del'>-	can_restart(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CAN bus-off</div><div class='del'>- *</div><div class='del'>- * This functions should be called when the device goes bus-off to</div><div class='del'>- * tell the netif layer that no more packets can be sent or received.</div><div class='del'>- * If enabled, a timer is started to trigger bus-off recovery.</div><div class='del'>- */</div><div class='del'>-void can_bus_off(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	netdev_info(dev, "bus-off\n");</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;restart_ms)</div><div class='del'>-		schedule_delayed_work(&amp;priv-&gt;restart_work,</div><div class='del'>-				      msecs_to_jiffies(priv-&gt;restart_ms));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_bus_off);</div><div class='del'>-</div><div class='del'>-static void can_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;type = ARPHRD_CAN;</div><div class='del'>-	dev-&gt;mtu = CAN_MTU;</div><div class='del'>-	dev-&gt;hard_header_len = 0;</div><div class='del'>-	dev-&gt;addr_len = 0;</div><div class='del'>-	dev-&gt;tx_queue_len = 10;</div><div class='del'>-</div><div class='del'>-	/* New-style flags. */</div><div class='del'>-	dev-&gt;flags = IFF_NOARP;</div><div class='del'>-	dev-&gt;features = NETIF_F_HW_CSUM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) +</div><div class='del'>-			       sizeof(struct can_frame));</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_CAN);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	can_skb_reserve(skb);</div><div class='del'>-	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='del'>-</div><div class='del'>-	*cf = skb_put_zero(skb, sizeof(struct can_frame));</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(alloc_can_skb);</div><div class='del'>-</div><div class='del'>-struct sk_buff *alloc_canfd_skb(struct net_device *dev,</div><div class='del'>-				struct canfd_frame **cfd)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) +</div><div class='del'>-			       sizeof(struct canfd_frame));</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_CANFD);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-</div><div class='del'>-	skb_reset_mac_header(skb);</div><div class='del'>-	skb_reset_network_header(skb);</div><div class='del'>-	skb_reset_transport_header(skb);</div><div class='del'>-</div><div class='del'>-	can_skb_reserve(skb);</div><div class='del'>-	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='del'>-	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='del'>-</div><div class='del'>-	*cfd = skb_put_zero(skb, sizeof(struct canfd_frame));</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(alloc_canfd_skb);</div><div class='del'>-</div><div class='del'>-struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	skb = alloc_can_skb(dev, cf);</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	(*cf)-&gt;can_id = CAN_ERR_FLAG;</div><div class='del'>-	(*cf)-&gt;can_dlc = CAN_ERR_DLC;</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(alloc_can_err_skb);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Allocate and setup space for the CAN network device</div><div class='del'>- */</div><div class='del'>-struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,</div><div class='del'>-				    unsigned int txqs, unsigned int rxqs)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct can_priv *priv;</div><div class='del'>-	int size;</div><div class='del'>-</div><div class='del'>-	if (echo_skb_max)</div><div class='del'>-		size = ALIGN(sizeof_priv, sizeof(struct sk_buff *)) +</div><div class='del'>-			echo_skb_max * sizeof(struct sk_buff *);</div><div class='del'>-	else</div><div class='del'>-		size = sizeof_priv;</div><div class='del'>-</div><div class='del'>-	dev = alloc_netdev_mqs(size, "can%d", NET_NAME_UNKNOWN, can_setup,</div><div class='del'>-			       txqs, rxqs);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-	priv-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	if (echo_skb_max) {</div><div class='del'>-		priv-&gt;echo_skb_max = echo_skb_max;</div><div class='del'>-		priv-&gt;echo_skb = (void *)priv +</div><div class='del'>-			ALIGN(sizeof_priv, sizeof(struct sk_buff *));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;state = CAN_STATE_STOPPED;</div><div class='del'>-</div><div class='del'>-	INIT_DELAYED_WORK(&amp;priv-&gt;restart_work, can_restart_work);</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(alloc_candev_mqs);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Free space of the CAN network device</div><div class='del'>- */</div><div class='del'>-void free_candev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(free_candev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * changing MTU and control mode for CAN/CANFD devices</div><div class='del'>- */</div><div class='del'>-int can_change_mtu(struct net_device *dev, int new_mtu)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Do not allow changing the MTU while running */</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	/* allow change of MTU according to the CANFD ability of the device */</div><div class='del'>-	switch (new_mtu) {</div><div class='del'>-	case CAN_MTU:</div><div class='del'>-		/* 'CANFD-only' controllers can not switch to CAN_MTU */</div><div class='del'>-		if (priv-&gt;ctrlmode_static &amp; CAN_CTRLMODE_FD)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		priv-&gt;ctrlmode &amp;= ~CAN_CTRLMODE_FD;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CANFD_MTU:</div><div class='del'>-		/* check for potential CANFD ability */</div><div class='del'>-		if (!(priv-&gt;ctrlmode_supported &amp; CAN_CTRLMODE_FD) &amp;&amp;</div><div class='del'>-		    !(priv-&gt;ctrlmode_static &amp; CAN_CTRLMODE_FD))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		priv-&gt;ctrlmode |= CAN_CTRLMODE_FD;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_change_mtu);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common open function when the device gets opened.</div><div class='del'>- *</div><div class='del'>- * This function should be called in the open function of the device</div><div class='del'>- * driver.</div><div class='del'>- */</div><div class='del'>-int open_candev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;bittiming.bitrate) {</div><div class='del'>-		netdev_err(dev, "bit-timing not yet defined\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* For CAN FD the data bitrate has to be &gt;= the arbitration bitrate */</div><div class='del'>-	if ((priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD) &amp;&amp;</div><div class='del'>-	    (!priv-&gt;data_bittiming.bitrate ||</div><div class='del'>-	     (priv-&gt;data_bittiming.bitrate &lt; priv-&gt;bittiming.bitrate))) {</div><div class='del'>-		netdev_err(dev, "incorrect/missing data bit-timing\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Switch carrier on if device was stopped while in bus-off state */</div><div class='del'>-	if (!netif_carrier_ok(dev))</div><div class='del'>-		netif_carrier_on(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(open_candev);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_OF</div><div class='del'>-/* Common function that can be used to understand the limitation of</div><div class='del'>- * a transceiver when it provides no means to determine these limitations</div><div class='del'>- * at runtime.</div><div class='del'>- */</div><div class='del'>-void of_can_transceiver(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct device_node *dn;</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct device_node *np = dev-&gt;dev.parent-&gt;of_node;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dn = of_get_child_by_name(np, "can-transceiver");</div><div class='del'>-	if (!dn)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = of_property_read_u32(dn, "max-bitrate", &amp;priv-&gt;bitrate_max);</div><div class='del'>-	if ((ret &amp;&amp; ret != -EINVAL) || (!ret &amp;&amp; !priv-&gt;bitrate_max))</div><div class='del'>-		netdev_warn(dev, "Invalid value for transceiver max bitrate. Ignoring bitrate limit.\n");</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(of_can_transceiver);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Common close function for cleanup before the device gets closed.</div><div class='del'>- *</div><div class='del'>- * This function should be called in the close function of the device</div><div class='del'>- * driver.</div><div class='del'>- */</div><div class='del'>-void close_candev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	cancel_delayed_work_sync(&amp;priv-&gt;restart_work);</div><div class='del'>-	can_flush_echo_skb(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(close_candev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CAN netlink interface</div><div class='del'>- */</div><div class='del'>-static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = {</div><div class='del'>-	[IFLA_CAN_STATE]	= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_CAN_CTRLMODE]	= { .len = sizeof(struct can_ctrlmode) },</div><div class='del'>-	[IFLA_CAN_RESTART_MS]	= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_CAN_RESTART]	= { .type = NLA_U32 },</div><div class='del'>-	[IFLA_CAN_BITTIMING]	= { .len = sizeof(struct can_bittiming) },</div><div class='del'>-	[IFLA_CAN_BITTIMING_CONST]</div><div class='del'>-				= { .len = sizeof(struct can_bittiming_const) },</div><div class='del'>-	[IFLA_CAN_CLOCK]	= { .len = sizeof(struct can_clock) },</div><div class='del'>-	[IFLA_CAN_BERR_COUNTER]	= { .len = sizeof(struct can_berr_counter) },</div><div class='del'>-	[IFLA_CAN_DATA_BITTIMING]</div><div class='del'>-				= { .len = sizeof(struct can_bittiming) },</div><div class='del'>-	[IFLA_CAN_DATA_BITTIMING_CONST]</div><div class='del'>-				= { .len = sizeof(struct can_bittiming_const) },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int can_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='del'>-			struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	bool is_can_fd = false;</div><div class='del'>-</div><div class='del'>-	/* Make sure that valid CAN FD configurations always consist of</div><div class='del'>-	 * - nominal/arbitration bittiming</div><div class='del'>-	 * - data bittiming</div><div class='del'>-	 * - control mode with CAN_CTRLMODE_FD set</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (!data)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_CTRLMODE]) {</div><div class='del'>-		struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);</div><div class='del'>-</div><div class='del'>-		is_can_fd = cm-&gt;flags &amp; cm-&gt;mask &amp; CAN_CTRLMODE_FD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_can_fd) {</div><div class='del'>-		if (!data[IFLA_CAN_BITTIMING] || !data[IFLA_CAN_DATA_BITTIMING])</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_DATA_BITTIMING]) {</div><div class='del'>-		if (!is_can_fd || !data[IFLA_CAN_BITTIMING])</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='del'>-			  struct nlattr *data[],</div><div class='del'>-			  struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* We need synchronization with dev-&gt;stop() */</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_BITTIMING]) {</div><div class='del'>-		struct can_bittiming bt;</div><div class='del'>-</div><div class='del'>-		/* Do not allow changing bittiming while running */</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		/* Calculate bittiming parameters based on</div><div class='del'>-		 * bittiming_const if set, otherwise pass bitrate</div><div class='del'>-		 * directly via do_set_bitrate(). Bail out if neither</div><div class='del'>-		 * is given.</div><div class='del'>-		 */</div><div class='del'>-		if (!priv-&gt;bittiming_const &amp;&amp; !priv-&gt;do_set_bittiming)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));</div><div class='del'>-		err = can_get_bittiming(dev, &amp;bt,</div><div class='del'>-					priv-&gt;bittiming_const,</div><div class='del'>-					priv-&gt;bitrate_const,</div><div class='del'>-					priv-&gt;bitrate_const_cnt);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;bitrate_max &amp;&amp; bt.bitrate &gt; priv-&gt;bitrate_max) {</div><div class='del'>-			netdev_err(dev, "arbitration bitrate surpasses transceiver capabilities of %d bps\n",</div><div class='del'>-				   priv-&gt;bitrate_max);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;priv-&gt;bittiming, &amp;bt, sizeof(bt));</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;do_set_bittiming) {</div><div class='del'>-			/* Finally, set the bit-timing registers */</div><div class='del'>-			err = priv-&gt;do_set_bittiming(dev);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_CTRLMODE]) {</div><div class='del'>-		struct can_ctrlmode *cm;</div><div class='del'>-		u32 ctrlstatic;</div><div class='del'>-		u32 maskedflags;</div><div class='del'>-</div><div class='del'>-		/* Do not allow changing controller mode while running */</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		cm = nla_data(data[IFLA_CAN_CTRLMODE]);</div><div class='del'>-		ctrlstatic = priv-&gt;ctrlmode_static;</div><div class='del'>-		maskedflags = cm-&gt;flags &amp; cm-&gt;mask;</div><div class='del'>-</div><div class='del'>-		/* check whether provided bits are allowed to be passed */</div><div class='del'>-		if (cm-&gt;mask &amp; ~(priv-&gt;ctrlmode_supported | ctrlstatic))</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		/* do not check for static fd-non-iso if 'fd' is disabled */</div><div class='del'>-		if (!(maskedflags &amp; CAN_CTRLMODE_FD))</div><div class='del'>-			ctrlstatic &amp;= ~CAN_CTRLMODE_FD_NON_ISO;</div><div class='del'>-</div><div class='del'>-		/* make sure static options are provided by configuration */</div><div class='del'>-		if ((maskedflags &amp; ctrlstatic) != ctrlstatic)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		/* clear bits to be modified and copy the flag values */</div><div class='del'>-		priv-&gt;ctrlmode &amp;= ~cm-&gt;mask;</div><div class='del'>-		priv-&gt;ctrlmode |= maskedflags;</div><div class='del'>-</div><div class='del'>-		/* CAN_CTRLMODE_FD can only be set when driver supports FD */</div><div class='del'>-		if (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='del'>-			dev-&gt;mtu = CANFD_MTU;</div><div class='del'>-		else</div><div class='del'>-			dev-&gt;mtu = CAN_MTU;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_RESTART_MS]) {</div><div class='del'>-		/* Do not allow changing restart delay while running */</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-		priv-&gt;restart_ms = nla_get_u32(data[IFLA_CAN_RESTART_MS]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_RESTART]) {</div><div class='del'>-		/* Do not allow a restart while not running */</div><div class='del'>-		if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		err = can_restart_now(dev);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_DATA_BITTIMING]) {</div><div class='del'>-		struct can_bittiming dbt;</div><div class='del'>-</div><div class='del'>-		/* Do not allow changing bittiming while running */</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-			return -EBUSY;</div><div class='del'>-</div><div class='del'>-		/* Calculate bittiming parameters based on</div><div class='del'>-		 * data_bittiming_const if set, otherwise pass bitrate</div><div class='del'>-		 * directly via do_set_bitrate(). Bail out if neither</div><div class='del'>-		 * is given.</div><div class='del'>-		 */</div><div class='del'>-		if (!priv-&gt;data_bittiming_const &amp;&amp; !priv-&gt;do_set_data_bittiming)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;dbt, nla_data(data[IFLA_CAN_DATA_BITTIMING]),</div><div class='del'>-		       sizeof(dbt));</div><div class='del'>-		err = can_get_bittiming(dev, &amp;dbt,</div><div class='del'>-					priv-&gt;data_bittiming_const,</div><div class='del'>-					priv-&gt;data_bitrate_const,</div><div class='del'>-					priv-&gt;data_bitrate_const_cnt);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;bitrate_max &amp;&amp; dbt.bitrate &gt; priv-&gt;bitrate_max) {</div><div class='del'>-			netdev_err(dev, "canfd data bitrate surpasses transceiver capabilities of %d bps\n",</div><div class='del'>-				   priv-&gt;bitrate_max);</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;priv-&gt;data_bittiming, &amp;dbt, sizeof(dbt));</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;do_set_data_bittiming) {</div><div class='del'>-			/* Finally, set the bit-timing registers */</div><div class='del'>-			err = priv-&gt;do_set_data_bittiming(dev);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (data[IFLA_CAN_TERMINATION]) {</div><div class='del'>-		const u16 termval = nla_get_u16(data[IFLA_CAN_TERMINATION]);</div><div class='del'>-		const unsigned int num_term = priv-&gt;termination_const_cnt;</div><div class='del'>-		unsigned int i;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;do_set_termination)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		/* check whether given value is supported by the interface */</div><div class='del'>-		for (i = 0; i &lt; num_term; i++) {</div><div class='del'>-			if (termval == priv-&gt;termination_const[i])</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (i &gt;= num_term)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		/* Finally, set the termination value */</div><div class='del'>-		err = priv-&gt;do_set_termination(dev, termval);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		priv-&gt;termination = termval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t can_get_size(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	size_t size = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;bittiming.bitrate)				/* IFLA_CAN_BITTIMING */</div><div class='del'>-		size += nla_total_size(sizeof(struct can_bittiming));</div><div class='del'>-	if (priv-&gt;bittiming_const)				/* IFLA_CAN_BITTIMING_CONST */</div><div class='del'>-		size += nla_total_size(sizeof(struct can_bittiming_const));</div><div class='del'>-	size += nla_total_size(sizeof(struct can_clock));	/* IFLA_CAN_CLOCK */</div><div class='del'>-	size += nla_total_size(sizeof(u32));			/* IFLA_CAN_STATE */</div><div class='del'>-	size += nla_total_size(sizeof(struct can_ctrlmode));	/* IFLA_CAN_CTRLMODE */</div><div class='del'>-	size += nla_total_size(sizeof(u32));			/* IFLA_CAN_RESTART_MS */</div><div class='del'>-	if (priv-&gt;do_get_berr_counter)				/* IFLA_CAN_BERR_COUNTER */</div><div class='del'>-		size += nla_total_size(sizeof(struct can_berr_counter));</div><div class='del'>-	if (priv-&gt;data_bittiming.bitrate)			/* IFLA_CAN_DATA_BITTIMING */</div><div class='del'>-		size += nla_total_size(sizeof(struct can_bittiming));</div><div class='del'>-	if (priv-&gt;data_bittiming_const)				/* IFLA_CAN_DATA_BITTIMING_CONST */</div><div class='del'>-		size += nla_total_size(sizeof(struct can_bittiming_const));</div><div class='del'>-	if (priv-&gt;termination_const) {</div><div class='del'>-		size += nla_total_size(sizeof(priv-&gt;termination));		/* IFLA_CAN_TERMINATION */</div><div class='del'>-		size += nla_total_size(sizeof(*priv-&gt;termination_const) *	/* IFLA_CAN_TERMINATION_CONST */</div><div class='del'>-				       priv-&gt;termination_const_cnt);</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;bitrate_const)				/* IFLA_CAN_BITRATE_CONST */</div><div class='del'>-		size += nla_total_size(sizeof(*priv-&gt;bitrate_const) *</div><div class='del'>-				       priv-&gt;bitrate_const_cnt);</div><div class='del'>-	if (priv-&gt;data_bitrate_const)				/* IFLA_CAN_DATA_BITRATE_CONST */</div><div class='del'>-		size += nla_total_size(sizeof(*priv-&gt;data_bitrate_const) *</div><div class='del'>-				       priv-&gt;data_bitrate_const_cnt);</div><div class='del'>-	size += sizeof(priv-&gt;bitrate_max);			/* IFLA_CAN_BITRATE_MAX */</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct can_ctrlmode cm = {.flags = priv-&gt;ctrlmode};</div><div class='del'>-	struct can_berr_counter bec;</div><div class='del'>-	enum can_state state = priv-&gt;state;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;do_get_state)</div><div class='del'>-		priv-&gt;do_get_state(dev, &amp;state);</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;bittiming.bitrate &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_BITTIMING,</div><div class='del'>-		     sizeof(priv-&gt;bittiming), &amp;priv-&gt;bittiming)) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;bittiming_const &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_BITTIMING_CONST,</div><div class='del'>-		     sizeof(*priv-&gt;bittiming_const), priv-&gt;bittiming_const)) ||</div><div class='del'>-</div><div class='del'>-	    nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv-&gt;clock), &amp;priv-&gt;clock) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_CAN_STATE, state) ||</div><div class='del'>-	    nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &amp;cm) ||</div><div class='del'>-	    nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv-&gt;restart_ms) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;do_get_berr_counter &amp;&amp;</div><div class='del'>-	     !priv-&gt;do_get_berr_counter(dev, &amp;bec) &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &amp;bec)) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;data_bittiming.bitrate &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_DATA_BITTIMING,</div><div class='del'>-		     sizeof(priv-&gt;data_bittiming), &amp;priv-&gt;data_bittiming)) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;data_bittiming_const &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_DATA_BITTIMING_CONST,</div><div class='del'>-		     sizeof(*priv-&gt;data_bittiming_const),</div><div class='del'>-		     priv-&gt;data_bittiming_const)) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;termination_const &amp;&amp;</div><div class='del'>-	     (nla_put_u16(skb, IFLA_CAN_TERMINATION, priv-&gt;termination) ||</div><div class='del'>-	      nla_put(skb, IFLA_CAN_TERMINATION_CONST,</div><div class='del'>-		      sizeof(*priv-&gt;termination_const) *</div><div class='del'>-		      priv-&gt;termination_const_cnt,</div><div class='del'>-		      priv-&gt;termination_const))) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;bitrate_const &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_BITRATE_CONST,</div><div class='del'>-		     sizeof(*priv-&gt;bitrate_const) *</div><div class='del'>-		     priv-&gt;bitrate_const_cnt,</div><div class='del'>-		     priv-&gt;bitrate_const)) ||</div><div class='del'>-</div><div class='del'>-	    (priv-&gt;data_bitrate_const &amp;&amp;</div><div class='del'>-	     nla_put(skb, IFLA_CAN_DATA_BITRATE_CONST,</div><div class='del'>-		     sizeof(*priv-&gt;data_bitrate_const) *</div><div class='del'>-		     priv-&gt;data_bitrate_const_cnt,</div><div class='del'>-		     priv-&gt;data_bitrate_const)) ||</div><div class='del'>-</div><div class='del'>-	    (nla_put(skb, IFLA_CAN_BITRATE_MAX,</div><div class='del'>-		     sizeof(priv-&gt;bitrate_max),</div><div class='del'>-		     &amp;priv-&gt;bitrate_max))</div><div class='del'>-	    )</div><div class='del'>-</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t can_get_xstats_size(const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	return sizeof(struct can_device_stats);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (nla_put(skb, IFLA_INFO_XSTATS,</div><div class='del'>-		    sizeof(priv-&gt;can_stats), &amp;priv-&gt;can_stats))</div><div class='del'>-		goto nla_put_failure;</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-nla_put_failure:</div><div class='del'>-	return -EMSGSIZE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_newlink(struct net *src_net, struct net_device *dev,</div><div class='del'>-		       struct nlattr *tb[], struct nlattr *data[],</div><div class='del'>-		       struct netlink_ext_ack *extack)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void can_dellink(struct net_device *dev, struct list_head *head)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct rtnl_link_ops can_link_ops __read_mostly = {</div><div class='del'>-	.kind		= "can",</div><div class='del'>-	.maxtype	= IFLA_CAN_MAX,</div><div class='del'>-	.policy		= can_policy,</div><div class='del'>-	.setup		= can_setup,</div><div class='del'>-	.validate	= can_validate,</div><div class='del'>-	.newlink	= can_newlink,</div><div class='del'>-	.changelink	= can_changelink,</div><div class='del'>-	.dellink	= can_dellink,</div><div class='del'>-	.get_size	= can_get_size,</div><div class='del'>-	.fill_info	= can_fill_info,</div><div class='del'>-	.get_xstats_size = can_get_xstats_size,</div><div class='del'>-	.fill_xstats	= can_fill_xstats,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Register the CAN network device</div><div class='del'>- */</div><div class='del'>-int register_candev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Ensure termination_const, termination_const_cnt and</div><div class='del'>-	 * do_set_termination consistency. All must be either set or</div><div class='del'>-	 * unset.</div><div class='del'>-	 */</div><div class='del'>-	if ((!priv-&gt;termination_const != !priv-&gt;termination_const_cnt) ||</div><div class='del'>-	    (!priv-&gt;termination_const != !priv-&gt;do_set_termination))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;bitrate_const != !priv-&gt;bitrate_const_cnt)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;data_bitrate_const != !priv-&gt;data_bitrate_const_cnt)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev-&gt;rtnl_link_ops = &amp;can_link_ops;</div><div class='del'>-	return register_netdev(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(register_candev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Unregister the CAN network device</div><div class='del'>- */</div><div class='del'>-void unregister_candev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	unregister_netdev(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(unregister_candev);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Test if a network device is a candev based device</div><div class='del'>- * and return the can_priv* if so.</div><div class='del'>- */</div><div class='del'>-struct can_priv *safe_candev_priv(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	if ((dev-&gt;type != ARPHRD_CAN) || (dev-&gt;rtnl_link_ops != &amp;can_link_ops))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return netdev_priv(dev);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(safe_candev_priv);</div><div class='del'>-</div><div class='del'>-static __init int can_dev_init(void)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	can_led_notifier_init();</div><div class='del'>-</div><div class='del'>-	err = rtnl_link_register(&amp;can_link_ops);</div><div class='del'>-	if (!err)</div><div class='del'>-		printk(KERN_INFO MOD_DESC "\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-module_init(can_dev_init);</div><div class='del'>-</div><div class='del'>-static __exit void can_dev_exit(void)</div><div class='del'>-{</div><div class='del'>-	rtnl_link_unregister(&amp;can_link_ops);</div><div class='del'>-</div><div class='del'>-	can_led_notifier_exit();</div><div class='del'>-}</div><div class='del'>-module_exit(can_dev_exit);</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS_RTNL_LINK("can");</div><div class='head'>diff --git a/drivers/net/can/dev/Makefile b/drivers/net/can/dev/Makefile<br/>new file mode 100644<br/>index 000000000000..633687d6b6c0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/Makefile</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_DEV) += can-dev.o</div><div class='add'>+</div><div class='add'>+can-dev-y += skb.o</div><div class='add'>+</div><div class='add'>+can-dev-$(CONFIG_CAN_CALC_BITTIMING) += calc_bittiming.o</div><div class='add'>+can-dev-$(CONFIG_CAN_NETLINK) += bittiming.o</div><div class='add'>+can-dev-$(CONFIG_CAN_NETLINK) += dev.o</div><div class='add'>+can-dev-$(CONFIG_CAN_NETLINK) += length.o</div><div class='add'>+can-dev-$(CONFIG_CAN_NETLINK) += netlink.o</div><div class='add'>+can-dev-$(CONFIG_CAN_RX_OFFLOAD) += rx-offload.o</div><div class='head'>diff --git a/drivers/net/can/dev/bittiming.c b/drivers/net/can/dev/bittiming.c<br/>new file mode 100644<br/>index 000000000000..8f82418230ce<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/bittiming.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/bittiming.c</a></div><div class='hunk'>@@ -0,0 +1,216 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2005 Marc Kleine-Budde, Pengutronix</div><div class='add'>+ * Copyright (C) 2006 Andrey Volkov, Varma Electronics</div><div class='add'>+ * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='add'>+ * Copyright (c) 2025 Vincent Mailhol &lt;mailhol@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+</div><div class='add'>+void can_sjw_set_default(struct can_bittiming *bt)</div><div class='add'>+{</div><div class='add'>+	if (bt-&gt;sjw)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* If user space provides no sjw, use sane default of phase_seg2 / 2 */</div><div class='add'>+	bt-&gt;sjw = max(1U, min(bt-&gt;phase_seg1, bt-&gt;phase_seg2 / 2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_sjw_check(const struct net_device *dev, const struct can_bittiming *bt,</div><div class='add'>+		  const struct can_bittiming_const *btc, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (bt-&gt;sjw &gt; btc-&gt;sjw_max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "sjw: %u greater than max sjw: %u",</div><div class='add'>+				   bt-&gt;sjw, btc-&gt;sjw_max);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;sjw &gt; bt-&gt;phase_seg1) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "sjw: %u greater than phase-seg1: %u",</div><div class='add'>+				   bt-&gt;sjw, bt-&gt;phase_seg1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;sjw &gt; bt-&gt;phase_seg2) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "sjw: %u greater than phase-seg2: %u",</div><div class='add'>+				   bt-&gt;sjw, bt-&gt;phase_seg2);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Checks the validity of the specified bit-timing parameters prop_seg,</div><div class='add'>+ * phase_seg1, phase_seg2 and sjw and tries to determine the bitrate</div><div class='add'>+ * prescaler value brp. You can find more information in the header</div><div class='add'>+ * file linux/can/netlink.h.</div><div class='add'>+ */</div><div class='add'>+static int can_fixup_bittiming(const struct net_device *dev, struct can_bittiming *bt,</div><div class='add'>+			       const struct can_bittiming_const *btc,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const unsigned int tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1;</div><div class='add'>+	const struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	u64 brp64;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tseg1 &lt; btc-&gt;tseg1_min) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "prop-seg + phase-seg1: %u less than tseg1-min: %u",</div><div class='add'>+				   tseg1, btc-&gt;tseg1_min);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tseg1 &gt; btc-&gt;tseg1_max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "prop-seg + phase-seg1: %u greater than tseg1-max: %u",</div><div class='add'>+				   tseg1, btc-&gt;tseg1_max);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (bt-&gt;phase_seg2 &lt; btc-&gt;tseg2_min) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "phase-seg2: %u less than tseg2-min: %u",</div><div class='add'>+				   bt-&gt;phase_seg2, btc-&gt;tseg2_min);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (bt-&gt;phase_seg2 &gt; btc-&gt;tseg2_max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "phase-seg2: %u greater than tseg2-max: %u",</div><div class='add'>+				   bt-&gt;phase_seg2, btc-&gt;tseg2_max);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_sjw_set_default(bt);</div><div class='add'>+</div><div class='add'>+	err = can_sjw_check(dev, bt, btc, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	brp64 = (u64)priv-&gt;clock.freq * (u64)bt-&gt;tq;</div><div class='add'>+	if (btc-&gt;brp_inc &gt; 1)</div><div class='add'>+		do_div(brp64, btc-&gt;brp_inc);</div><div class='add'>+	brp64 += 500000000UL - 1;</div><div class='add'>+	do_div(brp64, 1000000000UL); /* the practicable BRP */</div><div class='add'>+	if (btc-&gt;brp_inc &gt; 1)</div><div class='add'>+		brp64 *= btc-&gt;brp_inc;</div><div class='add'>+	bt-&gt;brp = (u32)brp64;</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;brp &lt; btc-&gt;brp_min) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "resulting brp: %u less than brp-min: %u",</div><div class='add'>+				   bt-&gt;brp, btc-&gt;brp_min);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (bt-&gt;brp &gt; btc-&gt;brp_max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack, "resulting brp: %u greater than brp-max: %u",</div><div class='add'>+				   bt-&gt;brp, btc-&gt;brp_max);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bt-&gt;bitrate = priv-&gt;clock.freq / (bt-&gt;brp * can_bit_time(bt));</div><div class='add'>+	bt-&gt;sample_point = ((CAN_SYNC_SEG + tseg1) * 1000) / can_bit_time(bt);</div><div class='add'>+	bt-&gt;tq = DIV_U64_ROUND_CLOSEST(mul_u32_u32(bt-&gt;brp, NSEC_PER_SEC),</div><div class='add'>+				       priv-&gt;clock.freq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Checks the validity of predefined bitrate settings */</div><div class='add'>+static int</div><div class='add'>+can_validate_bitrate(const struct net_device *dev, const struct can_bittiming *bt,</div><div class='add'>+		     const u32 *bitrate_const,</div><div class='add'>+		     const unsigned int bitrate_const_cnt,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bitrate_const_cnt; i++) {</div><div class='add'>+		if (bt-&gt;bitrate == bitrate_const[i])</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	NL_SET_ERR_MSG_FMT(extack, "bitrate %u bps not supported",</div><div class='add'>+			   bt-&gt;brp);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_get_bittiming(const struct net_device *dev, struct can_bittiming *bt,</div><div class='add'>+		      const struct can_bittiming_const *btc,</div><div class='add'>+		      const u32 *bitrate_const,</div><div class='add'>+		      const unsigned int bitrate_const_cnt,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	/* Depending on the given can_bittiming parameter structure the CAN</div><div class='add'>+	 * timing parameters are calculated based on the provided bitrate OR</div><div class='add'>+	 * alternatively the CAN timing parameters (tq, prop_seg, etc.) are</div><div class='add'>+	 * provided directly which are then checked and fixed up.</div><div class='add'>+	 */</div><div class='add'>+	if (!bt-&gt;tq &amp;&amp; bt-&gt;bitrate &amp;&amp; btc)</div><div class='add'>+		return can_calc_bittiming(dev, bt, btc, extack);</div><div class='add'>+	if (bt-&gt;tq &amp;&amp; !bt-&gt;bitrate &amp;&amp; btc)</div><div class='add'>+		return can_fixup_bittiming(dev, bt, btc, extack);</div><div class='add'>+	if (!bt-&gt;tq &amp;&amp; bt-&gt;bitrate &amp;&amp; bitrate_const)</div><div class='add'>+		return can_validate_bitrate(dev, bt, bitrate_const,</div><div class='add'>+					    bitrate_const_cnt, extack);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_validate_pwm_bittiming(const struct net_device *dev,</div><div class='add'>+			       const struct can_pwm *pwm,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	u32 xl_bit_time_tqmin = can_bit_time_tqmin(&amp;priv-&gt;xl.data_bittiming);</div><div class='add'>+	u32 nom_bit_time_tqmin = can_bit_time_tqmin(&amp;priv-&gt;bittiming);</div><div class='add'>+	u32 pwms_ns = can_tqmin_to_ns(pwm-&gt;pwms, priv-&gt;clock.freq);</div><div class='add'>+	u32 pwml_ns = can_tqmin_to_ns(pwm-&gt;pwml, priv-&gt;clock.freq);</div><div class='add'>+</div><div class='add'>+	if (pwms_ns + pwml_ns &gt; CAN_PWM_NS_MAX) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "The PWM symbol duration: %u ns may not exceed %u ns",</div><div class='add'>+				   pwms_ns + pwml_ns, CAN_PWM_NS_MAX);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pwms_ns &lt; CAN_PWM_DECODE_NS) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "PWMS: %u ns shall be at least %u ns",</div><div class='add'>+				   pwms_ns, CAN_PWM_DECODE_NS);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pwm-&gt;pwms &gt;= pwm-&gt;pwml) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "PWMS: %u tqmin shall be smaller than PWML: %u tqmin",</div><div class='add'>+				   pwm-&gt;pwms, pwm-&gt;pwml);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pwml_ns - pwms_ns &lt; 2 * CAN_PWM_DECODE_NS) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "At least %u ns shall separate PWMS: %u ns from PMWL: %u ns",</div><div class='add'>+				   2 * CAN_PWM_DECODE_NS, pwms_ns, pwml_ns);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xl_bit_time_tqmin % (pwm-&gt;pwms + pwm-&gt;pwml) != 0) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "PWM duration: %u tqmin does not divide XL's bit time: %u tqmin",</div><div class='add'>+				   pwm-&gt;pwms + pwm-&gt;pwml, xl_bit_time_tqmin);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pwm-&gt;pwmo &gt;= pwm-&gt;pwms + pwm-&gt;pwml) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "PWMO: %u tqmin can not be greater than PWMS + PWML: %u tqmin",</div><div class='add'>+				   pwm-&gt;pwmo, pwm-&gt;pwms + pwm-&gt;pwml);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (nom_bit_time_tqmin % (pwm-&gt;pwms + pwm-&gt;pwml) != pwm-&gt;pwmo) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "Can not assemble nominal bit time: %u tqmin out of PWMS + PMWL and PWMO",</div><div class='add'>+				   nom_bit_time_tqmin);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/dev/calc_bittiming.c b/drivers/net/can/dev/calc_bittiming.c<br/>new file mode 100644<br/>index 000000000000..cc4022241553<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/calc_bittiming.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/calc_bittiming.c</a></div><div class='hunk'>@@ -0,0 +1,262 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2005 Marc Kleine-Budde, Pengutronix</div><div class='add'>+ * Copyright (C) 2006 Andrey Volkov, Varma Electronics</div><div class='add'>+ * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='add'>+ * Copyright (C) 2021-2025 Vincent Mailhol &lt;mailhol@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+</div><div class='add'>+#define CAN_CALC_MAX_ERROR 50 /* in one-tenth of a percent */</div><div class='add'>+</div><div class='add'>+/* CiA recommended sample points for Non Return to Zero encoding. */</div><div class='add'>+static int can_calc_sample_point_nrz(const struct can_bittiming *bt)</div><div class='add'>+{</div><div class='add'>+	if (bt-&gt;bitrate &gt; 800 * KILO /* BPS */)</div><div class='add'>+		return 750;</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;bitrate &gt; 500 * KILO /* BPS */)</div><div class='add'>+		return 800;</div><div class='add'>+</div><div class='add'>+	return 875;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sample points for Pulse-Width Modulation encoding. */</div><div class='add'>+static int can_calc_sample_point_pwm(const struct can_bittiming *bt)</div><div class='add'>+{</div><div class='add'>+	if (bt-&gt;bitrate &gt; 15 * MEGA /* BPS */)</div><div class='add'>+		return 625;</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;bitrate &gt; 9 * MEGA /* BPS */)</div><div class='add'>+		return 600;</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;bitrate &gt; 4 * MEGA /* BPS */)</div><div class='add'>+		return 560;</div><div class='add'>+</div><div class='add'>+	return 520;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Bit-timing calculation derived from:</div><div class='add'>+ *</div><div class='add'>+ * Code based on LinCAN sources and H8S2638 project</div><div class='add'>+ * Copyright 2004-2006 Pavel Pisa - DCE FELK CVUT cz</div><div class='add'>+ * Copyright 2005      Stanislav Marek</div><div class='add'>+ * email: pisa@cmp.felk.cvut.cz</div><div class='add'>+ *</div><div class='add'>+ * Calculates proper bit-timing parameters for a specified bit-rate</div><div class='add'>+ * and sample-point, which can then be used to set the bit-timing</div><div class='add'>+ * registers of the CAN controller. You can find more information</div><div class='add'>+ * in the header file linux/can/netlink.h.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+can_update_sample_point(const struct can_bittiming_const *btc,</div><div class='add'>+			const unsigned int sample_point_reference, const unsigned int tseg,</div><div class='add'>+			unsigned int *tseg1_ptr, unsigned int *tseg2_ptr,</div><div class='add'>+			unsigned int *sample_point_error_ptr)</div><div class='add'>+{</div><div class='add'>+	unsigned int sample_point_error, best_sample_point_error = UINT_MAX;</div><div class='add'>+	unsigned int sample_point, best_sample_point = 0;</div><div class='add'>+	unsigned int tseg1, tseg2;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= 1; i++) {</div><div class='add'>+		tseg2 = tseg + CAN_SYNC_SEG -</div><div class='add'>+			(sample_point_reference * (tseg + CAN_SYNC_SEG)) /</div><div class='add'>+			1000 - i;</div><div class='add'>+		tseg2 = clamp(tseg2, btc-&gt;tseg2_min, btc-&gt;tseg2_max);</div><div class='add'>+		tseg1 = tseg - tseg2;</div><div class='add'>+		if (tseg1 &gt; btc-&gt;tseg1_max) {</div><div class='add'>+			tseg1 = btc-&gt;tseg1_max;</div><div class='add'>+			tseg2 = tseg - tseg1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		sample_point = 1000 * (tseg + CAN_SYNC_SEG - tseg2) /</div><div class='add'>+			(tseg + CAN_SYNC_SEG);</div><div class='add'>+		sample_point_error = abs(sample_point_reference - sample_point);</div><div class='add'>+</div><div class='add'>+		if (sample_point &lt;= sample_point_reference &amp;&amp;</div><div class='add'>+		    sample_point_error &lt; best_sample_point_error) {</div><div class='add'>+			best_sample_point = sample_point;</div><div class='add'>+			best_sample_point_error = sample_point_error;</div><div class='add'>+			*tseg1_ptr = tseg1;</div><div class='add'>+			*tseg2_ptr = tseg2;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sample_point_error_ptr)</div><div class='add'>+		*sample_point_error_ptr = best_sample_point_error;</div><div class='add'>+</div><div class='add'>+	return best_sample_point;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_calc_bittiming(const struct net_device *dev, struct can_bittiming *bt,</div><div class='add'>+		       const struct can_bittiming_const *btc, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	unsigned int bitrate;			/* current bitrate */</div><div class='add'>+	unsigned int bitrate_error;		/* diff between calculated and reference value */</div><div class='add'>+	unsigned int best_bitrate_error = UINT_MAX;</div><div class='add'>+	unsigned int sample_point_error;	/* diff between calculated and reference value */</div><div class='add'>+	unsigned int best_sample_point_error = UINT_MAX;</div><div class='add'>+	unsigned int sample_point_reference;	/* reference sample point */</div><div class='add'>+	unsigned int best_tseg = 0;		/* current best value for tseg */</div><div class='add'>+	unsigned int best_brp = 0;		/* current best value for brp */</div><div class='add'>+	unsigned int brp, tsegall, tseg, tseg1 = 0, tseg2 = 0;</div><div class='add'>+	u64 v64;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;sample_point)</div><div class='add'>+		sample_point_reference = bt-&gt;sample_point;</div><div class='add'>+	else if (btc == priv-&gt;xl.data_bittiming_const &amp;&amp;</div><div class='add'>+		 (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TMS))</div><div class='add'>+		sample_point_reference = can_calc_sample_point_pwm(bt);</div><div class='add'>+	else</div><div class='add'>+		sample_point_reference = can_calc_sample_point_nrz(bt);</div><div class='add'>+</div><div class='add'>+	/* tseg even = round down, odd = round up */</div><div class='add'>+	for (tseg = (btc-&gt;tseg1_max + btc-&gt;tseg2_max) * 2 + 1;</div><div class='add'>+	     tseg &gt;= (btc-&gt;tseg1_min + btc-&gt;tseg2_min) * 2; tseg--) {</div><div class='add'>+		tsegall = CAN_SYNC_SEG + tseg / 2;</div><div class='add'>+</div><div class='add'>+		/* Compute all possible tseg choices (tseg=tseg1+tseg2) */</div><div class='add'>+		brp = priv-&gt;clock.freq / (tsegall * bt-&gt;bitrate) + tseg % 2;</div><div class='add'>+</div><div class='add'>+		/* choose brp step which is possible in system */</div><div class='add'>+		brp = (brp / btc-&gt;brp_inc) * btc-&gt;brp_inc;</div><div class='add'>+		if (brp &lt; btc-&gt;brp_min || brp &gt; btc-&gt;brp_max)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bitrate = priv-&gt;clock.freq / (brp * tsegall);</div><div class='add'>+		bitrate_error = abs(bt-&gt;bitrate - bitrate);</div><div class='add'>+</div><div class='add'>+		/* tseg brp biterror */</div><div class='add'>+		if (bitrate_error &gt; best_bitrate_error)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* reset sample point error if we have a better bitrate */</div><div class='add'>+		if (bitrate_error &lt; best_bitrate_error)</div><div class='add'>+			best_sample_point_error = UINT_MAX;</div><div class='add'>+</div><div class='add'>+		can_update_sample_point(btc, sample_point_reference, tseg / 2,</div><div class='add'>+					&amp;tseg1, &amp;tseg2, &amp;sample_point_error);</div><div class='add'>+		if (sample_point_error &gt;= best_sample_point_error)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		best_sample_point_error = sample_point_error;</div><div class='add'>+		best_bitrate_error = bitrate_error;</div><div class='add'>+		best_tseg = tseg / 2;</div><div class='add'>+		best_brp = brp;</div><div class='add'>+</div><div class='add'>+		if (bitrate_error == 0 &amp;&amp; sample_point_error == 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (best_bitrate_error) {</div><div class='add'>+		/* Error in one-hundredth of a percent */</div><div class='add'>+		v64 = (u64)best_bitrate_error * 10000;</div><div class='add'>+		do_div(v64, bt-&gt;bitrate);</div><div class='add'>+		bitrate_error = (u32)v64;</div><div class='add'>+		/* print at least 0.01% if the error is smaller */</div><div class='add'>+		bitrate_error = max(bitrate_error, 1U);</div><div class='add'>+		if (bitrate_error &gt; CAN_CALC_MAX_ERROR) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "bitrate error: %u.%02u%% too high",</div><div class='add'>+					   bitrate_error / 100,</div><div class='add'>+					   bitrate_error % 100);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "bitrate error: %u.%02u%%",</div><div class='add'>+				   bitrate_error / 100, bitrate_error % 100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* real sample point */</div><div class='add'>+	bt-&gt;sample_point = can_update_sample_point(btc, sample_point_reference,</div><div class='add'>+						   best_tseg, &amp;tseg1, &amp;tseg2,</div><div class='add'>+						   NULL);</div><div class='add'>+</div><div class='add'>+	v64 = (u64)best_brp * 1000 * 1000 * 1000;</div><div class='add'>+	do_div(v64, priv-&gt;clock.freq);</div><div class='add'>+	bt-&gt;tq = (u32)v64;</div><div class='add'>+	bt-&gt;prop_seg = tseg1 / 2;</div><div class='add'>+	bt-&gt;phase_seg1 = tseg1 - bt-&gt;prop_seg;</div><div class='add'>+	bt-&gt;phase_seg2 = tseg2;</div><div class='add'>+</div><div class='add'>+	can_sjw_set_default(bt);</div><div class='add'>+</div><div class='add'>+	err = can_sjw_check(dev, bt, btc, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bt-&gt;brp = best_brp;</div><div class='add'>+</div><div class='add'>+	/* real bitrate */</div><div class='add'>+	bt-&gt;bitrate = priv-&gt;clock.freq /</div><div class='add'>+		(bt-&gt;brp * can_bit_time(bt));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void can_calc_tdco(struct can_tdc *tdc, const struct can_tdc_const *tdc_const,</div><div class='add'>+		   const struct can_bittiming *dbt,</div><div class='add'>+		   u32 tdc_mask, u32 *ctrlmode, u32 ctrlmode_supported)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	u32 tdc_auto = tdc_mask &amp; CAN_CTRLMODE_TDC_AUTO_MASK;</div><div class='add'>+</div><div class='add'>+	if (!tdc_const || !(ctrlmode_supported &amp; tdc_auto))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*ctrlmode &amp;= ~tdc_mask;</div><div class='add'>+</div><div class='add'>+	/* As specified in ISO 11898-1 section 11.3.3 "Transmitter</div><div class='add'>+	 * delay compensation" (TDC) is only applicable if data BRP is</div><div class='add'>+	 * one or two.</div><div class='add'>+	 */</div><div class='add'>+	if (dbt-&gt;brp == 1 || dbt-&gt;brp == 2) {</div><div class='add'>+		/* Sample point in clock periods */</div><div class='add'>+		u32 sample_point_in_tc = (CAN_SYNC_SEG + dbt-&gt;prop_seg +</div><div class='add'>+					  dbt-&gt;phase_seg1) * dbt-&gt;brp;</div><div class='add'>+</div><div class='add'>+		if (sample_point_in_tc &lt; tdc_const-&gt;tdco_min)</div><div class='add'>+			return;</div><div class='add'>+		tdc-&gt;tdco = min(sample_point_in_tc, tdc_const-&gt;tdco_max);</div><div class='add'>+		*ctrlmode |= tdc_auto;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_calc_pwm(struct net_device *dev, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	const struct can_pwm_const *pwm_const = priv-&gt;xl.pwm_const;</div><div class='add'>+	struct can_pwm *pwm = &amp;priv-&gt;xl.pwm;</div><div class='add'>+	u32 xl_tqmin = can_bit_time_tqmin(&amp;priv-&gt;xl.data_bittiming);</div><div class='add'>+	u32 xl_ns = can_tqmin_to_ns(xl_tqmin, priv-&gt;clock.freq);</div><div class='add'>+	u32 nom_tqmin = can_bit_time_tqmin(&amp;priv-&gt;bittiming);</div><div class='add'>+	int pwm_per_bit_max = xl_tqmin / (pwm_const-&gt;pwms_min + pwm_const-&gt;pwml_min);</div><div class='add'>+	int pwm_per_bit;</div><div class='add'>+	u32 pwm_tqmin;</div><div class='add'>+</div><div class='add'>+	/* For 5 MB/s databitrate or greater, xl_ns &lt; CAN_PWM_NS_MAX</div><div class='add'>+	 * giving us a pwm_per_bit of 1 and the loop immediately breaks</div><div class='add'>+	 */</div><div class='add'>+	for (pwm_per_bit = DIV_ROUND_UP(xl_ns, CAN_PWM_NS_MAX);</div><div class='add'>+	     pwm_per_bit &lt;= pwm_per_bit_max; pwm_per_bit++)</div><div class='add'>+		if (xl_tqmin % pwm_per_bit == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (pwm_per_bit &gt; pwm_per_bit_max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "Can not divide the XL data phase's bit time: %u tqmin into multiple PWM symbols",</div><div class='add'>+				   xl_tqmin);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pwm_tqmin = xl_tqmin / pwm_per_bit;</div><div class='add'>+	pwm-&gt;pwms = DIV_ROUND_UP_POW2(pwm_tqmin, 4);</div><div class='add'>+	pwm-&gt;pwml = pwm_tqmin - pwm-&gt;pwms;</div><div class='add'>+	pwm-&gt;pwmo = nom_tqmin % pwm_tqmin;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c<br/>new file mode 100644<br/>index 000000000000..091f30e94c61<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/dev.c</a></div><div class='hunk'>@@ -0,0 +1,661 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2005 Marc Kleine-Budde, Pengutronix</div><div class='add'>+ * Copyright (C) 2006 Andrey Volkov, Varma Electronics</div><div class='add'>+ * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/if_arp.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+static void can_update_state_error_stats(struct net_device *dev,</div><div class='add'>+					 enum can_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (new_state &lt;= priv-&gt;state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (new_state) {</div><div class='add'>+	case CAN_STATE_ERROR_WARNING:</div><div class='add'>+		priv-&gt;can_stats.error_warning++;</div><div class='add'>+		break;</div><div class='add'>+	case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+		priv-&gt;can_stats.error_passive++;</div><div class='add'>+		break;</div><div class='add'>+	case CAN_STATE_BUS_OFF:</div><div class='add'>+		priv-&gt;can_stats.bus_off++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_tx_state_to_frame(struct net_device *dev, enum can_state state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		return CAN_ERR_CRTL_ACTIVE;</div><div class='add'>+	case CAN_STATE_ERROR_WARNING:</div><div class='add'>+		return CAN_ERR_CRTL_TX_WARNING;</div><div class='add'>+	case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+		return CAN_ERR_CRTL_TX_PASSIVE;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_rx_state_to_frame(struct net_device *dev, enum can_state state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		return CAN_ERR_CRTL_ACTIVE;</div><div class='add'>+	case CAN_STATE_ERROR_WARNING:</div><div class='add'>+		return CAN_ERR_CRTL_RX_WARNING;</div><div class='add'>+	case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+		return CAN_ERR_CRTL_RX_PASSIVE;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const char *can_get_state_str(const enum can_state state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		return "Error Active";</div><div class='add'>+	case CAN_STATE_ERROR_WARNING:</div><div class='add'>+		return "Error Warning";</div><div class='add'>+	case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+		return "Error Passive";</div><div class='add'>+	case CAN_STATE_BUS_OFF:</div><div class='add'>+		return "Bus Off";</div><div class='add'>+	case CAN_STATE_STOPPED:</div><div class='add'>+		return "Stopped";</div><div class='add'>+	case CAN_STATE_SLEEPING:</div><div class='add'>+		return "Sleeping";</div><div class='add'>+	default:</div><div class='add'>+		return "&lt;unknown&gt;";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_get_state_str);</div><div class='add'>+</div><div class='add'>+const char *can_get_ctrlmode_str(u32 ctrlmode)</div><div class='add'>+{</div><div class='add'>+	switch (ctrlmode &amp; ~(ctrlmode - 1)) {</div><div class='add'>+	case 0:</div><div class='add'>+		return "(none)";</div><div class='add'>+	case CAN_CTRLMODE_LOOPBACK:</div><div class='add'>+		return "LOOPBACK";</div><div class='add'>+	case CAN_CTRLMODE_LISTENONLY:</div><div class='add'>+		return "LISTEN-ONLY";</div><div class='add'>+	case CAN_CTRLMODE_3_SAMPLES:</div><div class='add'>+		return "TRIPLE-SAMPLING";</div><div class='add'>+	case CAN_CTRLMODE_ONE_SHOT:</div><div class='add'>+		return "ONE-SHOT";</div><div class='add'>+	case CAN_CTRLMODE_BERR_REPORTING:</div><div class='add'>+		return "BERR-REPORTING";</div><div class='add'>+	case CAN_CTRLMODE_FD:</div><div class='add'>+		return "FD";</div><div class='add'>+	case CAN_CTRLMODE_PRESUME_ACK:</div><div class='add'>+		return "PRESUME-ACK";</div><div class='add'>+	case CAN_CTRLMODE_FD_NON_ISO:</div><div class='add'>+		return "FD-NON-ISO";</div><div class='add'>+	case CAN_CTRLMODE_CC_LEN8_DLC:</div><div class='add'>+		return "CC-LEN8-DLC";</div><div class='add'>+	case CAN_CTRLMODE_TDC_AUTO:</div><div class='add'>+		return "TDC-AUTO";</div><div class='add'>+	case CAN_CTRLMODE_TDC_MANUAL:</div><div class='add'>+		return "TDC-MANUAL";</div><div class='add'>+	case CAN_CTRLMODE_RESTRICTED:</div><div class='add'>+		return "RESTRICTED";</div><div class='add'>+	case CAN_CTRLMODE_XL:</div><div class='add'>+		return "XL";</div><div class='add'>+	case CAN_CTRLMODE_XL_TDC_AUTO:</div><div class='add'>+		return "XL-TDC-AUTO";</div><div class='add'>+	case CAN_CTRLMODE_XL_TDC_MANUAL:</div><div class='add'>+		return "XL-TDC-MANUAL";</div><div class='add'>+	case CAN_CTRLMODE_XL_TMS:</div><div class='add'>+		return "TMS";</div><div class='add'>+	default:</div><div class='add'>+		return "&lt;unknown&gt;";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_get_ctrlmode_str);</div><div class='add'>+</div><div class='add'>+static enum can_state can_state_err_to_state(u16 err)</div><div class='add'>+{</div><div class='add'>+	if (err &lt; CAN_ERROR_WARNING_THRESHOLD)</div><div class='add'>+		return CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	if (err &lt; CAN_ERROR_PASSIVE_THRESHOLD)</div><div class='add'>+		return CAN_STATE_ERROR_WARNING;</div><div class='add'>+	if (err &lt; CAN_BUS_OFF_THRESHOLD)</div><div class='add'>+		return CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+</div><div class='add'>+	return CAN_STATE_BUS_OFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void can_state_get_by_berr_counter(const struct net_device *dev,</div><div class='add'>+				   const struct can_berr_counter *bec,</div><div class='add'>+				   enum can_state *tx_state,</div><div class='add'>+				   enum can_state *rx_state)</div><div class='add'>+{</div><div class='add'>+	*tx_state = can_state_err_to_state(bec-&gt;txerr);</div><div class='add'>+	*rx_state = can_state_err_to_state(bec-&gt;rxerr);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_state_get_by_berr_counter);</div><div class='add'>+</div><div class='add'>+void can_change_state(struct net_device *dev, struct can_frame *cf,</div><div class='add'>+		      enum can_state tx_state, enum can_state rx_state)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	enum can_state new_state = max(tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (unlikely(new_state == priv-&gt;state)) {</div><div class='add'>+		netdev_warn(dev, "%s: oops, state did not change", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "Controller changed from %s State (%d) into %s State (%d).\n",</div><div class='add'>+		   can_get_state_str(priv-&gt;state), priv-&gt;state,</div><div class='add'>+		   can_get_state_str(new_state), new_state);</div><div class='add'>+</div><div class='add'>+	can_update_state_error_stats(dev, new_state);</div><div class='add'>+	priv-&gt;state = new_state;</div><div class='add'>+</div><div class='add'>+	if (!cf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (unlikely(new_state == CAN_STATE_BUS_OFF)) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+	cf-&gt;data[1] |= tx_state &gt;= rx_state ?</div><div class='add'>+		       can_tx_state_to_frame(dev, tx_state) : 0;</div><div class='add'>+	cf-&gt;data[1] |= tx_state &lt;= rx_state ?</div><div class='add'>+		       can_rx_state_to_frame(dev, rx_state) : 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_change_state);</div><div class='add'>+</div><div class='add'>+/* CAN device restart for bus-off recovery */</div><div class='add'>+static int can_restart(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;do_set_mode)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(dev))</div><div class='add'>+		netdev_err(dev, "Attempt to restart for bus-off recovery, but carrier is OK?\n");</div><div class='add'>+</div><div class='add'>+	/* No synchronization needed because the device is bus-off and</div><div class='add'>+	 * no messages can come in or go out.</div><div class='add'>+	 */</div><div class='add'>+	can_flush_echo_skb(dev);</div><div class='add'>+</div><div class='add'>+	/* send restart message upstream */</div><div class='add'>+	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='add'>+	if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now restart the device */</div><div class='add'>+	netif_carrier_on(dev);</div><div class='add'>+	err = priv-&gt;do_set_mode(dev, CAN_MODE_START);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Restart failed, error %pe\n", ERR_PTR(err));</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	} else {</div><div class='add'>+		netdev_dbg(dev, "Restarted\n");</div><div class='add'>+		priv-&gt;can_stats.restarts++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can_restart_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dwork = to_delayed_work(work);</div><div class='add'>+	struct can_priv *priv = container_of(dwork, struct can_priv,</div><div class='add'>+					     restart_work);</div><div class='add'>+</div><div class='add'>+	can_restart(priv-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_restart_now(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* A manual restart is only permitted if automatic restart is</div><div class='add'>+	 * disabled and the device is in the bus-off state</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;restart_ms)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (priv-&gt;state != CAN_STATE_BUS_OFF)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;restart_work);</div><div class='add'>+</div><div class='add'>+	return can_restart(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CAN bus-off</div><div class='add'>+ *</div><div class='add'>+ * This functions should be called when the device goes bus-off to</div><div class='add'>+ * tell the netif layer that no more packets can be sent or received.</div><div class='add'>+ * If enabled, a timer is started to trigger bus-off recovery.</div><div class='add'>+ */</div><div class='add'>+void can_bus_off(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;restart_ms)</div><div class='add'>+		netdev_info(dev, "bus-off, scheduling restart in %d ms\n",</div><div class='add'>+			    priv-&gt;restart_ms);</div><div class='add'>+	else</div><div class='add'>+		netdev_info(dev, "bus-off\n");</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;restart_ms)</div><div class='add'>+		schedule_delayed_work(&amp;priv-&gt;restart_work,</div><div class='add'>+				      msecs_to_jiffies(priv-&gt;restart_ms));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_bus_off);</div><div class='add'>+</div><div class='add'>+void can_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;type = ARPHRD_CAN;</div><div class='add'>+	dev-&gt;mtu = CAN_MTU;</div><div class='add'>+	dev-&gt;min_mtu = CAN_MTU;</div><div class='add'>+	dev-&gt;max_mtu = CAN_MTU;</div><div class='add'>+	dev-&gt;hard_header_len = 0;</div><div class='add'>+	dev-&gt;addr_len = 0;</div><div class='add'>+	dev-&gt;tx_queue_len = 10;</div><div class='add'>+</div><div class='add'>+	/* New-style flags. */</div><div class='add'>+	dev-&gt;flags = IFF_NOARP;</div><div class='add'>+	dev-&gt;features = NETIF_F_HW_CSUM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate and setup space for the CAN network device */</div><div class='add'>+struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,</div><div class='add'>+				    unsigned int txqs, unsigned int rxqs)</div><div class='add'>+{</div><div class='add'>+	struct can_ml_priv *can_ml;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct can_priv *priv;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	/* We put the driver's priv, the CAN mid layer priv and the</div><div class='add'>+	 * echo skb into the netdevice's priv. The memory layout for</div><div class='add'>+	 * the netdev_priv is like this:</div><div class='add'>+	 *</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | driver's priv           |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | struct can_ml_priv      |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 * | array of struct sk_buff |</div><div class='add'>+	 * +-------------------------+</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	size = ALIGN(sizeof_priv, NETDEV_ALIGN) + sizeof(struct can_ml_priv);</div><div class='add'>+</div><div class='add'>+	if (echo_skb_max)</div><div class='add'>+		size = ALIGN(size, sizeof(struct sk_buff *)) +</div><div class='add'>+			echo_skb_max * sizeof(struct sk_buff *);</div><div class='add'>+</div><div class='add'>+	dev = alloc_netdev_mqs(size, "can%d", NET_NAME_UNKNOWN, can_setup,</div><div class='add'>+			       txqs, rxqs);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	can_ml = (void *)priv + ALIGN(sizeof_priv, NETDEV_ALIGN);</div><div class='add'>+	can_set_ml_priv(dev, can_ml);</div><div class='add'>+</div><div class='add'>+	if (echo_skb_max) {</div><div class='add'>+		priv-&gt;echo_skb_max = echo_skb_max;</div><div class='add'>+		priv-&gt;echo_skb = (void *)priv +</div><div class='add'>+			(size - echo_skb_max * sizeof(struct sk_buff *));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;restart_work, can_restart_work);</div><div class='add'>+</div><div class='add'>+	return dev;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_candev_mqs);</div><div class='add'>+</div><div class='add'>+/* Free space of the CAN network device */</div><div class='add'>+void free_candev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(free_candev);</div><div class='add'>+</div><div class='add'>+void can_set_default_mtu(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL) {</div><div class='add'>+		if (can_is_canxl_dev_mtu(dev-&gt;mtu))</div><div class='add'>+			return;</div><div class='add'>+		dev-&gt;mtu = CANXL_MTU;</div><div class='add'>+		dev-&gt;min_mtu = CANXL_MIN_MTU;</div><div class='add'>+		dev-&gt;max_mtu = CANXL_MAX_MTU;</div><div class='add'>+	} else if (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		dev-&gt;mtu = CANFD_MTU;</div><div class='add'>+		dev-&gt;min_mtu = CANFD_MTU;</div><div class='add'>+		dev-&gt;max_mtu = CANFD_MTU;</div><div class='add'>+	} else {</div><div class='add'>+		dev-&gt;mtu = CAN_MTU;</div><div class='add'>+		dev-&gt;min_mtu = CAN_MTU;</div><div class='add'>+		dev-&gt;max_mtu = CAN_MTU;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* helper to define static CAN controller features at device creation time */</div><div class='add'>+int can_set_static_ctrlmode(struct net_device *dev, u32 static_mode)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* alloc_candev() succeeded =&gt; netdev_priv() is valid at this point */</div><div class='add'>+	if (priv-&gt;ctrlmode_supported &amp; static_mode) {</div><div class='add'>+		netdev_warn(dev,</div><div class='add'>+			    "Controller features can not be supported and static at the same time\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;ctrlmode = static_mode;</div><div class='add'>+</div><div class='add'>+	/* override MTU which was set by default in can_setup()? */</div><div class='add'>+	can_set_default_mtu(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_set_static_ctrlmode);</div><div class='add'>+</div><div class='add'>+/* generic implementation of netdev_ops::ndo_hwtstamp_get for CAN devices</div><div class='add'>+ * supporting hardware timestamps</div><div class='add'>+ */</div><div class='add'>+int can_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+		     struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	cfg-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+	cfg-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(can_hwtstamp_get);</div><div class='add'>+</div><div class='add'>+/* generic implementation of netdev_ops::ndo_hwtstamp_set for CAN devices</div><div class='add'>+ * supporting hardware timestamps</div><div class='add'>+ */</div><div class='add'>+int can_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+		     struct kernel_hwtstamp_config *cfg,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (cfg-&gt;tx_type == HWTSTAMP_TX_ON &amp;&amp;</div><div class='add'>+	    cfg-&gt;rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='add'>+		return 0;</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Only TX on and RX all packets filter supported");</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(can_hwtstamp_set);</div><div class='add'>+</div><div class='add'>+/* generic implementation of ethtool_ops::get_ts_info for CAN devices</div><div class='add'>+ * supporting hardware timestamps</div><div class='add'>+ */</div><div class='add'>+int can_ethtool_op_get_ts_info_hwts(struct net_device *dev,</div><div class='add'>+				    struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	info-&gt;so_timestamping =</div><div class='add'>+		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_ON);</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_ALL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(can_ethtool_op_get_ts_info_hwts);</div><div class='add'>+</div><div class='add'>+/* Common open function when the device gets opened.</div><div class='add'>+ *</div><div class='add'>+ * This function should be called in the open function of the device</div><div class='add'>+ * driver.</div><div class='add'>+ */</div><div class='add'>+int open_candev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;bittiming.bitrate) {</div><div class='add'>+		netdev_err(dev, "bit-timing not yet defined\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For CAN FD the data bitrate has to be &gt;= the arbitration bitrate */</div><div class='add'>+	if ((priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD) &amp;&amp;</div><div class='add'>+	    (!priv-&gt;fd.data_bittiming.bitrate ||</div><div class='add'>+	     priv-&gt;fd.data_bittiming.bitrate &lt; priv-&gt;bittiming.bitrate)) {</div><div class='add'>+		netdev_err(dev, "incorrect/missing data bit-timing\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Switch carrier on if device was stopped while in bus-off state */</div><div class='add'>+	if (!netif_carrier_ok(dev))</div><div class='add'>+		netif_carrier_on(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(open_candev);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+/* Common function that can be used to understand the limitation of</div><div class='add'>+ * a transceiver when it provides no means to determine these limitations</div><div class='add'>+ * at runtime.</div><div class='add'>+ */</div><div class='add'>+void of_can_transceiver(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct device_node *np = dev-&gt;dev.parent-&gt;of_node;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dn = of_get_child_by_name(np, "can-transceiver");</div><div class='add'>+	if (!dn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(dn, "max-bitrate", &amp;priv-&gt;bitrate_max);</div><div class='add'>+	of_node_put(dn);</div><div class='add'>+	if ((ret &amp;&amp; ret != -EINVAL) || (!ret &amp;&amp; !priv-&gt;bitrate_max))</div><div class='add'>+		netdev_warn(dev, "Invalid value for transceiver max bitrate. Ignoring bitrate limit.\n");</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(of_can_transceiver);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+/* Common close function for cleanup before the device gets closed.</div><div class='add'>+ *</div><div class='add'>+ * This function should be called in the close function of the device</div><div class='add'>+ * driver.</div><div class='add'>+ */</div><div class='add'>+void close_candev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;restart_work);</div><div class='add'>+	can_flush_echo_skb(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(close_candev);</div><div class='add'>+</div><div class='add'>+static int can_set_termination(struct net_device *ndev, u16 term)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int set;</div><div class='add'>+</div><div class='add'>+	if (term == priv-&gt;termination_gpio_ohms[CAN_TERMINATION_GPIO_ENABLED])</div><div class='add'>+		set = 1;</div><div class='add'>+	else</div><div class='add'>+		set = 0;</div><div class='add'>+</div><div class='add'>+	gpiod_set_value_cansleep(priv-&gt;termination_gpio, set);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_get_termination(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='add'>+	struct gpio_desc *gpio;</div><div class='add'>+	u32 term;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Disabling termination by default is the safe choice: Else if many</div><div class='add'>+	 * bus participants enable it, no communication is possible at all.</div><div class='add'>+	 */</div><div class='add'>+	gpio = devm_gpiod_get_optional(dev, "termination", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(gpio))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gpio),</div><div class='add'>+				     "Cannot get termination-gpios\n");</div><div class='add'>+</div><div class='add'>+	if (!gpio)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = device_property_read_u32(dev, "termination-ohms", &amp;term);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(ndev, "Cannot get termination-ohms: %pe\n",</div><div class='add'>+			   ERR_PTR(ret));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (term &gt; U16_MAX) {</div><div class='add'>+		netdev_err(ndev, "Invalid termination-ohms value (%u &gt; %u)\n",</div><div class='add'>+			   term, U16_MAX);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;termination_const_cnt = ARRAY_SIZE(priv-&gt;termination_gpio_ohms);</div><div class='add'>+	priv-&gt;termination_const = priv-&gt;termination_gpio_ohms;</div><div class='add'>+	priv-&gt;termination_gpio = gpio;</div><div class='add'>+	priv-&gt;termination_gpio_ohms[CAN_TERMINATION_GPIO_DISABLED] =</div><div class='add'>+		CAN_TERMINATION_DISABLED;</div><div class='add'>+	priv-&gt;termination_gpio_ohms[CAN_TERMINATION_GPIO_ENABLED] = term;</div><div class='add'>+	priv-&gt;do_set_termination = can_set_termination;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+can_bittiming_const_valid(const struct can_bittiming_const *btc)</div><div class='add'>+{</div><div class='add'>+	if (!btc)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (!btc-&gt;sjw_max)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Register the CAN network device */</div><div class='add'>+int register_candev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Ensure termination_const, termination_const_cnt and</div><div class='add'>+	 * do_set_termination consistency. All must be either set or</div><div class='add'>+	 * unset.</div><div class='add'>+	 */</div><div class='add'>+	if ((!priv-&gt;termination_const != !priv-&gt;termination_const_cnt) ||</div><div class='add'>+	    (!priv-&gt;termination_const != !priv-&gt;do_set_termination))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;bitrate_const != !priv-&gt;bitrate_const_cnt)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;fd.data_bitrate_const != !priv-&gt;fd.data_bitrate_const_cnt)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* We only support either fixed bit rates or bit timing const. */</div><div class='add'>+	if ((priv-&gt;bitrate_const || priv-&gt;fd.data_bitrate_const) &amp;&amp;</div><div class='add'>+	    (priv-&gt;bittiming_const || priv-&gt;fd.data_bittiming_const))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!can_bittiming_const_valid(priv-&gt;bittiming_const) ||</div><div class='add'>+	    !can_bittiming_const_valid(priv-&gt;fd.data_bittiming_const))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;termination_const) {</div><div class='add'>+		err = can_get_termination(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;rtnl_link_ops = &amp;can_link_ops;</div><div class='add'>+	netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	return register_netdev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(register_candev);</div><div class='add'>+</div><div class='add'>+/* Unregister the CAN network device */</div><div class='add'>+void unregister_candev(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unregister_netdev(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(unregister_candev);</div><div class='add'>+</div><div class='add'>+/* Test if a network device is a candev based device</div><div class='add'>+ * and return the can_priv* if so.</div><div class='add'>+ */</div><div class='add'>+struct can_priv *safe_candev_priv(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (dev-&gt;type != ARPHRD_CAN || dev-&gt;rtnl_link_ops != &amp;can_link_ops)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return netdev_priv(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(safe_candev_priv);</div><div class='add'>+</div><div class='add'>+static __init int can_dev_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = can_netlink_register();</div><div class='add'>+	if (!err)</div><div class='add'>+		pr_info("CAN device driver interface\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+module_init(can_dev_init);</div><div class='add'>+</div><div class='add'>+static __exit void can_dev_exit(void)</div><div class='add'>+{</div><div class='add'>+	can_netlink_unregister();</div><div class='add'>+}</div><div class='add'>+module_exit(can_dev_exit);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_RTNL_LINK("can");</div><div class='head'>diff --git a/drivers/net/can/dev/length.c b/drivers/net/can/dev/length.c<br/>new file mode 100644<br/>index 000000000000..b7f4d76dd444<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/length.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/length.c</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2012, 2020 Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+</div><div class='add'>+/* CAN DLC to real data length conversion helpers */</div><div class='add'>+</div><div class='add'>+static const u8 dlc2len[] = {</div><div class='add'>+	0, 1, 2, 3, 4, 5, 6, 7,</div><div class='add'>+	8, 12, 16, 20, 24, 32, 48, 64</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* get data length from raw data length code (DLC) */</div><div class='add'>+u8 can_fd_dlc2len(u8 dlc)</div><div class='add'>+{</div><div class='add'>+	return dlc2len[dlc &amp; 0x0F];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_fd_dlc2len);</div><div class='add'>+</div><div class='add'>+static const u8 len2dlc[] = {</div><div class='add'>+	0, 1, 2, 3, 4, 5, 6, 7, 8,	/* 0 - 8 */</div><div class='add'>+	9, 9, 9, 9,			/* 9 - 12 */</div><div class='add'>+	10, 10, 10, 10,			/* 13 - 16 */</div><div class='add'>+	11, 11, 11, 11,			/* 17 - 20 */</div><div class='add'>+	12, 12, 12, 12,			/* 21 - 24 */</div><div class='add'>+	13, 13, 13, 13, 13, 13, 13, 13,	/* 25 - 32 */</div><div class='add'>+	14, 14, 14, 14, 14, 14, 14, 14,	/* 33 - 40 */</div><div class='add'>+	14, 14, 14, 14, 14, 14, 14, 14,	/* 41 - 48 */</div><div class='add'>+	15, 15, 15, 15, 15, 15, 15, 15,	/* 49 - 56 */</div><div class='add'>+	15, 15, 15, 15, 15, 15, 15, 15	/* 57 - 64 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* map the sanitized data length to an appropriate data length code */</div><div class='add'>+u8 can_fd_len2dlc(u8 len)</div><div class='add'>+{</div><div class='add'>+	/* check for length mapping table size at build time */</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(len2dlc) != CANFD_MAX_DLEN + 1);</div><div class='add'>+</div><div class='add'>+	if (unlikely(len &gt; CANFD_MAX_DLEN))</div><div class='add'>+		return CANFD_MAX_DLC;</div><div class='add'>+</div><div class='add'>+	return len2dlc[len];</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_fd_len2dlc);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * can_skb_get_frame_len() - Calculate the CAN Frame length in bytes</div><div class='add'>+ * 	of a given skb.</div><div class='add'>+ * @skb: socket buffer of a CAN message.</div><div class='add'>+ *</div><div class='add'>+ * Do a rough calculation: bit stuffing is ignored and length in bits</div><div class='add'>+ * is rounded up to a length in bytes.</div><div class='add'>+ *</div><div class='add'>+ * Rationale: this function is to be used for the BQL functions</div><div class='add'>+ * (netdev_sent_queue() and netdev_completed_queue()) which expect a</div><div class='add'>+ * value in bytes. Just using skb-&gt;len is insufficient because it will</div><div class='add'>+ * return the constant value of CAN(FD)_MTU. Doing the bit stuffing</div><div class='add'>+ * calculation would be too expensive in term of computing resources</div><div class='add'>+ * for no noticeable gain.</div><div class='add'>+ *</div><div class='add'>+ * Remarks: The payload of CAN FD frames with BRS flag are sent at a</div><div class='add'>+ * different bitrate. Currently, the can-utils canbusload tool does</div><div class='add'>+ * not support CAN-FD yet and so we could not run any benchmark to</div><div class='add'>+ * measure the impact. There might be possible improvement here.</div><div class='add'>+ *</div><div class='add'>+ * Return: length in bytes.</div><div class='add'>+ */</div><div class='add'>+unsigned int can_skb_get_frame_len(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct canfd_frame *cf = (const struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb))</div><div class='add'>+		len = canfd_sanitize_len(cf-&gt;len);</div><div class='add'>+	else if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		len = 0;</div><div class='add'>+	else</div><div class='add'>+		len = cf-&gt;len;</div><div class='add'>+</div><div class='add'>+	return can_frame_bytes(can_is_canfd_skb(skb), cf-&gt;can_id &amp; CAN_EFF_FLAG,</div><div class='add'>+			       false, len);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_skb_get_frame_len);</div><div class='head'>diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c<br/>new file mode 100644<br/>index 000000000000..d6b0e686fb11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/netlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/netlink.c</a></div><div class='hunk'>@@ -0,0 +1,1111 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2005 Marc Kleine-Budde, Pengutronix</div><div class='add'>+ * Copyright (C) 2006 Andrey Volkov, Varma Electronics</div><div class='add'>+ * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='add'>+ * Copyright (C) 2021-2025 Vincent Mailhol &lt;mailhol@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;net/rtnetlink.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = {</div><div class='add'>+	[IFLA_CAN_STATE] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_CTRLMODE] = { .len = sizeof(struct can_ctrlmode) },</div><div class='add'>+	[IFLA_CAN_RESTART_MS] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_RESTART] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_BITTIMING] = { .len = sizeof(struct can_bittiming) },</div><div class='add'>+	[IFLA_CAN_BITTIMING_CONST] = { .len = sizeof(struct can_bittiming_const) },</div><div class='add'>+	[IFLA_CAN_CLOCK] = { .len = sizeof(struct can_clock) },</div><div class='add'>+	[IFLA_CAN_BERR_COUNTER] = { .len = sizeof(struct can_berr_counter) },</div><div class='add'>+	[IFLA_CAN_DATA_BITTIMING] = { .len = sizeof(struct can_bittiming) },</div><div class='add'>+	[IFLA_CAN_DATA_BITTIMING_CONST] = { .len = sizeof(struct can_bittiming_const) },</div><div class='add'>+	[IFLA_CAN_TERMINATION] = { .type = NLA_U16 },</div><div class='add'>+	[IFLA_CAN_TDC] = { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_CAN_CTRLMODE_EXT] = { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_CAN_XL_DATA_BITTIMING] = { .len = sizeof(struct can_bittiming) },</div><div class='add'>+	[IFLA_CAN_XL_DATA_BITTIMING_CONST] = { .len = sizeof(struct can_bittiming_const) },</div><div class='add'>+	[IFLA_CAN_XL_TDC] = { .type = NLA_NESTED },</div><div class='add'>+	[IFLA_CAN_XL_PWM] = { .type = NLA_NESTED },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy can_tdc_policy[IFLA_CAN_TDC_MAX + 1] = {</div><div class='add'>+	[IFLA_CAN_TDC_TDCV_MIN] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCV_MAX] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCO_MIN] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCO_MAX] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCF_MIN] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCF_MAX] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCV] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCO] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_TDC_TDCF] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct nla_policy can_pwm_policy[IFLA_CAN_PWM_MAX + 1] = {</div><div class='add'>+	[IFLA_CAN_PWM_PWMS_MIN] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWMS_MAX] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWML_MIN] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWML_MAX] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWMO_MIN] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWMO_MAX] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWMS] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWML] = { .type = NLA_U32 },</div><div class='add'>+	[IFLA_CAN_PWM_PWMO] = { .type = NLA_U32 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int can_validate_bittiming(struct nlattr *data[],</div><div class='add'>+				  struct netlink_ext_ack *extack,</div><div class='add'>+				  int ifla_can_bittiming)</div><div class='add'>+{</div><div class='add'>+	struct can_bittiming *bt;</div><div class='add'>+</div><div class='add'>+	if (!data[ifla_can_bittiming])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	static_assert(__alignof__(*bt) &lt;= NLA_ALIGNTO);</div><div class='add'>+	bt = nla_data(data[ifla_can_bittiming]);</div><div class='add'>+</div><div class='add'>+	/* sample point is in one-tenth of a percent */</div><div class='add'>+	if (bt-&gt;sample_point &gt;= 1000) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "sample point must be between 0 and 100%");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_validate_tdc(struct nlattr *data_tdc,</div><div class='add'>+			    struct netlink_ext_ack *extack, u32 tdc_flags)</div><div class='add'>+{</div><div class='add'>+	bool tdc_manual = tdc_flags &amp; CAN_CTRLMODE_TDC_MANUAL_MASK;</div><div class='add'>+	bool tdc_auto = tdc_flags &amp; CAN_CTRLMODE_TDC_AUTO_MASK;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (tdc_auto &amp;&amp; tdc_manual) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "TDC manual and auto modes are mutually exclusive");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If one of the CAN_CTRLMODE_{,XL}_TDC_* flags is set then TDC</div><div class='add'>+	 * must be set and vice-versa</div><div class='add'>+	 */</div><div class='add'>+	if ((tdc_auto || tdc_manual) &amp;&amp; !data_tdc) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "TDC parameters are missing");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if (!(tdc_auto || tdc_manual) &amp;&amp; data_tdc) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "TDC mode (auto or manual) is missing");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If providing TDC parameters, at least TDCO is needed. TDCV is</div><div class='add'>+	 * needed if and only if CAN_CTRLMODE_{,XL}_TDC_MANUAL is set</div><div class='add'>+	 */</div><div class='add'>+	if (data_tdc) {</div><div class='add'>+		struct nlattr *tb_tdc[IFLA_CAN_TDC_MAX + 1];</div><div class='add'>+</div><div class='add'>+		err = nla_parse_nested(tb_tdc, IFLA_CAN_TDC_MAX,</div><div class='add'>+				       data_tdc, can_tdc_policy, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (tb_tdc[IFLA_CAN_TDC_TDCV]) {</div><div class='add'>+			if (tdc_auto) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "TDCV is incompatible with TDC auto mode");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (tdc_manual) {</div><div class='add'>+				NL_SET_ERR_MSG(extack,</div><div class='add'>+					       "TDC manual mode requires TDCV");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!tb_tdc[IFLA_CAN_TDC_TDCO]) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "TDCO is missing");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_validate_pwm(struct nlattr *data[],</div><div class='add'>+			    struct netlink_ext_ack *extack, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb_pwm[IFLA_CAN_PWM_MAX + 1];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_CAN_XL_PWM])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(flags &amp; CAN_CTRLMODE_XL_TMS)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "PWM requires TMS");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb_pwm, IFLA_CAN_PWM_MAX, data[IFLA_CAN_XL_PWM],</div><div class='add'>+			       can_pwm_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!tb_pwm[IFLA_CAN_PWM_PWMS] != !tb_pwm[IFLA_CAN_PWM_PWML]) {</div><div class='add'>+		NL_SET_ERR_MSG(extack,</div><div class='add'>+			       "Provide either both PWMS and PWML, or none for automatic calculation");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb_pwm[IFLA_CAN_PWM_PWMO] &amp;&amp;</div><div class='add'>+	    (!tb_pwm[IFLA_CAN_PWM_PWMS] || !tb_pwm[IFLA_CAN_PWM_PWML])) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "PWMO requires both PWMS and PWML");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_validate_databittiming(struct nlattr *data[],</div><div class='add'>+				      struct netlink_ext_ack *extack,</div><div class='add'>+				      int ifla_can_data_bittiming, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *data_tdc;</div><div class='add'>+	const char *type;</div><div class='add'>+	u32 tdc_flags;</div><div class='add'>+	bool is_on;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Make sure that valid CAN FD/XL configurations always consist of</div><div class='add'>+	 * - nominal/arbitration bittiming</div><div class='add'>+	 * - data bittiming</div><div class='add'>+	 * - control mode with CAN_CTRLMODE_{FD,XL} set</div><div class='add'>+	 * - TDC parameters are coherent (details in can_validate_tdc())</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (ifla_can_data_bittiming == IFLA_CAN_DATA_BITTIMING) {</div><div class='add'>+		data_tdc = data[IFLA_CAN_TDC];</div><div class='add'>+		tdc_flags = flags &amp; CAN_CTRLMODE_FD_TDC_MASK;</div><div class='add'>+		is_on = flags &amp; CAN_CTRLMODE_FD;</div><div class='add'>+		type = "FD";</div><div class='add'>+	} else {</div><div class='add'>+		data_tdc = data[IFLA_CAN_XL_TDC];</div><div class='add'>+		tdc_flags = flags &amp; CAN_CTRLMODE_XL_TDC_MASK;</div><div class='add'>+		is_on = flags &amp; CAN_CTRLMODE_XL;</div><div class='add'>+		type = "XL";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_on) {</div><div class='add'>+		if (!data[IFLA_CAN_BITTIMING] || !data[ifla_can_data_bittiming]) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "Provide both nominal and %s data bittiming",</div><div class='add'>+					   type);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (data[ifla_can_data_bittiming]) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "%s data bittiming requires CAN %s",</div><div class='add'>+					   type, type);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (data_tdc) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "%s TDC requires CAN %s",</div><div class='add'>+					   type, type);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = can_validate_bittiming(data, extack, ifla_can_data_bittiming);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = can_validate_tdc(data_tdc, extack, tdc_flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_validate_xl_flags(struct netlink_ext_ack *extack,</div><div class='add'>+				 u32 masked_flags, u32 mask)</div><div class='add'>+{</div><div class='add'>+	if (masked_flags &amp; CAN_CTRLMODE_XL) {</div><div class='add'>+		if (masked_flags &amp; CAN_CTRLMODE_XL_TMS) {</div><div class='add'>+			const u32 tms_conflicts_mask = CAN_CTRLMODE_FD |</div><div class='add'>+				CAN_CTRLMODE_XL_TDC_MASK;</div><div class='add'>+			u32 tms_conflicts = masked_flags &amp; tms_conflicts_mask;</div><div class='add'>+</div><div class='add'>+			if (tms_conflicts) {</div><div class='add'>+				NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+						   "TMS and %s are mutually exclusive",</div><div class='add'>+						   can_get_ctrlmode_str(tms_conflicts));</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (mask &amp; CAN_CTRLMODE_XL_TMS) {</div><div class='add'>+			NL_SET_ERR_MSG(extack, "TMS requires CAN XL");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_validate(struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!data)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_CAN_CTRLMODE]) {</div><div class='add'>+		struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);</div><div class='add'>+</div><div class='add'>+		flags = cm-&gt;flags &amp; cm-&gt;mask;</div><div class='add'>+</div><div class='add'>+		if ((flags &amp; CAN_CTRLMODE_LISTENONLY) &amp;&amp;</div><div class='add'>+		    (flags &amp; CAN_CTRLMODE_RESTRICTED)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "LISTEN-ONLY and RESTRICTED modes are mutually exclusive");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = can_validate_xl_flags(extack, flags, cm-&gt;mask);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = can_validate_bittiming(data, extack, IFLA_CAN_BITTIMING);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = can_validate_databittiming(data, extack,</div><div class='add'>+					 IFLA_CAN_DATA_BITTIMING, flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = can_validate_databittiming(data, extack,</div><div class='add'>+					 IFLA_CAN_XL_DATA_BITTIMING, flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = can_validate_pwm(data, extack, flags);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_ctrlmode_changelink(struct net_device *dev,</div><div class='add'>+				   struct nlattr *data[],</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct can_ctrlmode *cm;</div><div class='add'>+	u32 ctrlstatic, maskedflags, deactivated, notsupp, ctrlstatic_missing;</div><div class='add'>+</div><div class='add'>+	if (!data[IFLA_CAN_CTRLMODE])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Do not allow changing controller mode while running */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	cm = nla_data(data[IFLA_CAN_CTRLMODE]);</div><div class='add'>+	ctrlstatic = can_get_static_ctrlmode(priv);</div><div class='add'>+	maskedflags = cm-&gt;flags &amp; cm-&gt;mask;</div><div class='add'>+	deactivated = ~cm-&gt;flags &amp; cm-&gt;mask;</div><div class='add'>+	notsupp = maskedflags &amp; ~(priv-&gt;ctrlmode_supported | ctrlstatic);</div><div class='add'>+	ctrlstatic_missing = (maskedflags &amp; ctrlstatic) ^ ctrlstatic;</div><div class='add'>+</div><div class='add'>+	if (notsupp) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "requested control mode %s not supported",</div><div class='add'>+				   can_get_ctrlmode_str(notsupp));</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* do not check for static fd-non-iso if 'fd' is disabled */</div><div class='add'>+	if (!(maskedflags &amp; CAN_CTRLMODE_FD))</div><div class='add'>+		ctrlstatic &amp;= ~CAN_CTRLMODE_FD_NON_ISO;</div><div class='add'>+</div><div class='add'>+	if (ctrlstatic_missing) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "missing required %s static control mode",</div><div class='add'>+				   can_get_ctrlmode_str(ctrlstatic_missing));</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If FD was active and is not turned off, check for XL conflicts */</div><div class='add'>+	if (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD &amp; ~deactivated) {</div><div class='add'>+		if (maskedflags &amp; CAN_CTRLMODE_XL_TMS) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "TMS can not be activated while CAN FD is on");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If a top dependency flag is provided, reset all its dependencies */</div><div class='add'>+	if (cm-&gt;mask &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		priv-&gt;ctrlmode &amp;= ~CAN_CTRLMODE_FD_TDC_MASK;</div><div class='add'>+	if (cm-&gt;mask &amp; CAN_CTRLMODE_XL)</div><div class='add'>+		priv-&gt;ctrlmode &amp;= ~(CAN_CTRLMODE_XL_TDC_MASK |</div><div class='add'>+				    CAN_CTRLMODE_XL_TMS);</div><div class='add'>+</div><div class='add'>+	/* clear bits to be modified and copy the flag values */</div><div class='add'>+	priv-&gt;ctrlmode &amp;= ~cm-&gt;mask;</div><div class='add'>+	priv-&gt;ctrlmode |= maskedflags;</div><div class='add'>+</div><div class='add'>+	/* Wipe potential leftovers from previous CAN FD/XL config */</div><div class='add'>+	if (!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD)) {</div><div class='add'>+		memset(&amp;priv-&gt;fd.data_bittiming, 0,</div><div class='add'>+		       sizeof(priv-&gt;fd.data_bittiming));</div><div class='add'>+		priv-&gt;ctrlmode &amp;= ~CAN_CTRLMODE_FD_TDC_MASK;</div><div class='add'>+		memset(&amp;priv-&gt;fd.tdc, 0, sizeof(priv-&gt;fd.tdc));</div><div class='add'>+	}</div><div class='add'>+	if (!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL)) {</div><div class='add'>+		memset(&amp;priv-&gt;xl.data_bittiming, 0,</div><div class='add'>+		       sizeof(priv-&gt;fd.data_bittiming));</div><div class='add'>+		priv-&gt;ctrlmode &amp;= ~CAN_CTRLMODE_XL_TDC_MASK;</div><div class='add'>+		memset(&amp;priv-&gt;xl.tdc, 0, sizeof(priv-&gt;xl.tdc));</div><div class='add'>+		memset(&amp;priv-&gt;xl.pwm, 0, sizeof(priv-&gt;xl.pwm));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_set_default_mtu(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_tdc_changelink(struct data_bittiming_params *dbt_params,</div><div class='add'>+			      const struct nlattr *nla,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *tb_tdc[IFLA_CAN_TDC_MAX + 1];</div><div class='add'>+	struct can_tdc tdc = { 0 };</div><div class='add'>+	const struct can_tdc_const *tdc_const = dbt_params-&gt;tdc_const;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!tdc_const) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "The device does not support TDC");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb_tdc, IFLA_CAN_TDC_MAX, nla,</div><div class='add'>+			       can_tdc_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb_tdc[IFLA_CAN_TDC_TDCV]) {</div><div class='add'>+		u32 tdcv = nla_get_u32(tb_tdc[IFLA_CAN_TDC_TDCV]);</div><div class='add'>+</div><div class='add'>+		if (tdcv &lt; tdc_const-&gt;tdcv_min || tdcv &gt; tdc_const-&gt;tdcv_max)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tdc.tdcv = tdcv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb_tdc[IFLA_CAN_TDC_TDCO]) {</div><div class='add'>+		u32 tdco = nla_get_u32(tb_tdc[IFLA_CAN_TDC_TDCO]);</div><div class='add'>+</div><div class='add'>+		if (tdco &lt; tdc_const-&gt;tdco_min || tdco &gt; tdc_const-&gt;tdco_max)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tdc.tdco = tdco;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb_tdc[IFLA_CAN_TDC_TDCF]) {</div><div class='add'>+		u32 tdcf = nla_get_u32(tb_tdc[IFLA_CAN_TDC_TDCF]);</div><div class='add'>+</div><div class='add'>+		if (tdcf &lt; tdc_const-&gt;tdcf_min || tdcf &gt; tdc_const-&gt;tdcf_max)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		tdc.tdcf = tdcf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dbt_params-&gt;tdc = tdc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_dbt_changelink(struct net_device *dev, struct nlattr *data[],</div><div class='add'>+			      bool fd, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *data_bittiming, *data_tdc;</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct data_bittiming_params *dbt_params;</div><div class='add'>+	struct can_bittiming dbt;</div><div class='add'>+	bool need_tdc_calc = false;</div><div class='add'>+	u32 tdc_mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (fd) {</div><div class='add'>+		data_bittiming = data[IFLA_CAN_DATA_BITTIMING];</div><div class='add'>+		data_tdc = data[IFLA_CAN_TDC];</div><div class='add'>+		dbt_params = &amp;priv-&gt;fd;</div><div class='add'>+		tdc_mask = CAN_CTRLMODE_FD_TDC_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		data_bittiming = data[IFLA_CAN_XL_DATA_BITTIMING];</div><div class='add'>+		data_tdc = data[IFLA_CAN_XL_TDC];</div><div class='add'>+		dbt_params = &amp;priv-&gt;xl;</div><div class='add'>+		tdc_mask = CAN_CTRLMODE_XL_TDC_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!data_bittiming)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Do not allow changing bittiming while running */</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	/* Calculate bittiming parameters based on data_bittiming_const</div><div class='add'>+	 * if set, otherwise pass bitrate directly via do_set_bitrate().</div><div class='add'>+	 * Bail out if neither is given.</div><div class='add'>+	 */</div><div class='add'>+	if (!dbt_params-&gt;data_bittiming_const &amp;&amp; !dbt_params-&gt;do_set_data_bittiming &amp;&amp;</div><div class='add'>+	    !dbt_params-&gt;data_bitrate_const)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;dbt, nla_data(data_bittiming), sizeof(dbt));</div><div class='add'>+	err = can_get_bittiming(dev, &amp;dbt, dbt_params-&gt;data_bittiming_const,</div><div class='add'>+				dbt_params-&gt;data_bitrate_const,</div><div class='add'>+				dbt_params-&gt;data_bitrate_const_cnt, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;bitrate_max &amp;&amp; dbt.bitrate &gt; priv-&gt;bitrate_max) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+				   "CAN data bitrate %u bps surpasses transceiver capabilities of %u bps",</div><div class='add'>+				   dbt.bitrate, priv-&gt;bitrate_max);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;dbt_params-&gt;tdc, 0, sizeof(dbt_params-&gt;tdc));</div><div class='add'>+	if (data[IFLA_CAN_CTRLMODE]) {</div><div class='add'>+		struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);</div><div class='add'>+</div><div class='add'>+		if (fd || !(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TMS))</div><div class='add'>+			need_tdc_calc = !(cm-&gt;mask &amp; tdc_mask);</div><div class='add'>+	}</div><div class='add'>+	if (data_tdc) {</div><div class='add'>+		/* TDC parameters are provided: use them */</div><div class='add'>+		err = can_tdc_changelink(dbt_params, data_tdc, extack);</div><div class='add'>+		if (err) {</div><div class='add'>+			priv-&gt;ctrlmode &amp;= ~tdc_mask;</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	} else if (need_tdc_calc) {</div><div class='add'>+		/* Neither of TDC parameters nor TDC flags are provided:</div><div class='add'>+		 * do calculation</div><div class='add'>+		 */</div><div class='add'>+		can_calc_tdco(&amp;dbt_params-&gt;tdc, dbt_params-&gt;tdc_const, &amp;dbt,</div><div class='add'>+			      tdc_mask, &amp;priv-&gt;ctrlmode, priv-&gt;ctrlmode_supported);</div><div class='add'>+	} /* else: both CAN_CTRLMODE_{,XL}_TDC_{AUTO,MANUAL} are explicitly</div><div class='add'>+	   * turned off. TDC is disabled: do nothing</div><div class='add'>+	   */</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;dbt_params-&gt;data_bittiming, &amp;dbt, sizeof(dbt));</div><div class='add'>+</div><div class='add'>+	if (dbt_params-&gt;do_set_data_bittiming) {</div><div class='add'>+		/* Finally, set the bit-timing registers */</div><div class='add'>+		err = dbt_params-&gt;do_set_data_bittiming(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_pwm_changelink(struct net_device *dev,</div><div class='add'>+			      const struct nlattr *pwm_nla,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	const struct can_pwm_const *pwm_const = priv-&gt;xl.pwm_const;</div><div class='add'>+	struct nlattr *tb_pwm[IFLA_CAN_PWM_MAX + 1];</div><div class='add'>+	struct can_pwm pwm = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TMS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!pwm_const) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "The device does not support PWM");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pwm_nla)</div><div class='add'>+		return can_calc_pwm(dev, extack);</div><div class='add'>+</div><div class='add'>+	err = nla_parse_nested(tb_pwm, IFLA_CAN_PWM_MAX, pwm_nla,</div><div class='add'>+			       can_pwm_policy, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (tb_pwm[IFLA_CAN_PWM_PWMS]) {</div><div class='add'>+		pwm.pwms = nla_get_u32(tb_pwm[IFLA_CAN_PWM_PWMS]);</div><div class='add'>+		if (pwm.pwms &lt; pwm_const-&gt;pwms_min ||</div><div class='add'>+		    pwm.pwms &gt; pwm_const-&gt;pwms_max) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "PWMS: %u tqmin is out of range: %u...%u",</div><div class='add'>+					   pwm.pwms, pwm_const-&gt;pwms_min,</div><div class='add'>+					   pwm_const-&gt;pwms_max);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb_pwm[IFLA_CAN_PWM_PWML]) {</div><div class='add'>+		pwm.pwml = nla_get_u32(tb_pwm[IFLA_CAN_PWM_PWML]);</div><div class='add'>+		if (pwm.pwml &lt; pwm_const-&gt;pwml_min ||</div><div class='add'>+		    pwm.pwml &gt; pwm_const-&gt;pwml_max) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "PWML: %u tqmin is out of range: %u...%u",</div><div class='add'>+					   pwm.pwml, pwm_const-&gt;pwml_min,</div><div class='add'>+					   pwm_const-&gt;pwml_max);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tb_pwm[IFLA_CAN_PWM_PWMO]) {</div><div class='add'>+		pwm.pwmo = nla_get_u32(tb_pwm[IFLA_CAN_PWM_PWMO]);</div><div class='add'>+		if (pwm.pwmo &lt; pwm_const-&gt;pwmo_min ||</div><div class='add'>+		    pwm.pwmo &gt; pwm_const-&gt;pwmo_max) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "PWMO: %u tqmin is out of range: %u...%u",</div><div class='add'>+					   pwm.pwmo, pwm_const-&gt;pwmo_min,</div><div class='add'>+					   pwm_const-&gt;pwmo_max);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = can_validate_pwm_bittiming(dev, &amp;pwm, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;xl.pwm = pwm;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_changelink(struct net_device *dev, struct nlattr *tb[],</div><div class='add'>+			  struct nlattr *data[],</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* We need synchronization with dev-&gt;stop() */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	can_ctrlmode_changelink(dev, data, extack);</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_CAN_BITTIMING]) {</div><div class='add'>+		struct can_bittiming bt;</div><div class='add'>+</div><div class='add'>+		/* Do not allow changing bittiming while running */</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+		/* Calculate bittiming parameters based on</div><div class='add'>+		 * bittiming_const if set, otherwise pass bitrate</div><div class='add'>+		 * directly via do_set_bitrate(). Bail out if neither</div><div class='add'>+		 * is given.</div><div class='add'>+		 */</div><div class='add'>+		if (!priv-&gt;bittiming_const &amp;&amp; !priv-&gt;do_set_bittiming &amp;&amp;</div><div class='add'>+		    !priv-&gt;bitrate_const)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));</div><div class='add'>+		err = can_get_bittiming(dev, &amp;bt,</div><div class='add'>+					priv-&gt;bittiming_const,</div><div class='add'>+					priv-&gt;bitrate_const,</div><div class='add'>+					priv-&gt;bitrate_const_cnt,</div><div class='add'>+					extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;bitrate_max &amp;&amp; bt.bitrate &gt; priv-&gt;bitrate_max) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT(extack,</div><div class='add'>+					   "arbitration bitrate %u bps surpasses transceiver capabilities of %u bps",</div><div class='add'>+					   bt.bitrate, priv-&gt;bitrate_max);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;priv-&gt;bittiming, &amp;bt, sizeof(bt));</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;do_set_bittiming) {</div><div class='add'>+			/* Finally, set the bit-timing registers */</div><div class='add'>+			err = priv-&gt;do_set_bittiming(dev);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_CAN_RESTART_MS]) {</div><div class='add'>+		unsigned int restart_ms = nla_get_u32(data[IFLA_CAN_RESTART_MS]);</div><div class='add'>+</div><div class='add'>+		if (restart_ms != 0 &amp;&amp; !priv-&gt;do_set_mode) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Device doesn't support restart from Bus Off");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do not allow changing restart delay while running */</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_UP)</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		priv-&gt;restart_ms = restart_ms;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_CAN_RESTART]) {</div><div class='add'>+		if (!priv-&gt;do_set_mode) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Device doesn't support restart from Bus Off");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Do not allow a restart while not running */</div><div class='add'>+		if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		err = can_restart_now(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* CAN FD */</div><div class='add'>+	err = can_dbt_changelink(dev, data, true, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* CAN XL */</div><div class='add'>+	err = can_dbt_changelink(dev, data, false, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	err = can_pwm_changelink(dev, data[IFLA_CAN_XL_PWM], extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (data[IFLA_CAN_TERMINATION]) {</div><div class='add'>+		const u16 termval = nla_get_u16(data[IFLA_CAN_TERMINATION]);</div><div class='add'>+		const unsigned int num_term = priv-&gt;termination_const_cnt;</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		if (!priv-&gt;do_set_termination) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "Termination is not configurable on this device");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* check whether given value is supported by the interface */</div><div class='add'>+		for (i = 0; i &lt; num_term; i++) {</div><div class='add'>+			if (termval == priv-&gt;termination_const[i])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		if (i &gt;= num_term)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		/* Finally, set the termination value */</div><div class='add'>+		err = priv-&gt;do_set_termination(dev, termval);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		priv-&gt;termination = termval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t can_tdc_get_size(struct data_bittiming_params *dbt_params,</div><div class='add'>+			       u32 tdc_flags)</div><div class='add'>+{</div><div class='add'>+	bool tdc_manual = tdc_flags &amp; CAN_CTRLMODE_TDC_MANUAL_MASK;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (!dbt_params-&gt;tdc_const)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = nla_total_size(0);			/* nest IFLA_CAN_TDC */</div><div class='add'>+	if (tdc_manual) {</div><div class='add'>+		size += nla_total_size(sizeof(u32));	/* IFLA_CAN_TDCV_MIN */</div><div class='add'>+		size += nla_total_size(sizeof(u32));	/* IFLA_CAN_TDCV_MAX */</div><div class='add'>+	}</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_TDCO_MIN */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_TDCO_MAX */</div><div class='add'>+	if (dbt_params-&gt;tdc_const-&gt;tdcf_max) {</div><div class='add'>+		size += nla_total_size(sizeof(u32));	/* IFLA_CAN_TDCF_MIN */</div><div class='add'>+		size += nla_total_size(sizeof(u32));	/* IFLA_CAN_TDCF_MAX */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tdc_flags) {</div><div class='add'>+		if (tdc_manual || dbt_params-&gt;do_get_auto_tdcv)</div><div class='add'>+			size += nla_total_size(sizeof(u32));	/* IFLA_CAN_TDCV */</div><div class='add'>+		size += nla_total_size(sizeof(u32));		/* IFLA_CAN_TDCO */</div><div class='add'>+		if (dbt_params-&gt;tdc_const-&gt;tdcf_max)</div><div class='add'>+			size += nla_total_size(sizeof(u32));	/* IFLA_CAN_TDCF */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t can_data_bittiming_get_size(struct data_bittiming_params *dbt_params,</div><div class='add'>+					  u32 tdc_flags)</div><div class='add'>+{</div><div class='add'>+	size_t size = 0;</div><div class='add'>+</div><div class='add'>+	if (dbt_params-&gt;data_bittiming.bitrate)		/* IFLA_CAN_{,XL}_DATA_BITTIMING */</div><div class='add'>+		size += nla_total_size(sizeof(dbt_params-&gt;data_bittiming));</div><div class='add'>+	if (dbt_params-&gt;data_bittiming_const)		/* IFLA_CAN_{,XL}_DATA_BITTIMING_CONST */</div><div class='add'>+		size += nla_total_size(sizeof(*dbt_params-&gt;data_bittiming_const));</div><div class='add'>+	if (dbt_params-&gt;data_bitrate_const)		/* IFLA_CAN_{,XL}_DATA_BITRATE_CONST */</div><div class='add'>+		size += nla_total_size(sizeof(*dbt_params-&gt;data_bitrate_const) *</div><div class='add'>+				       dbt_params-&gt;data_bitrate_const_cnt);</div><div class='add'>+	size += can_tdc_get_size(dbt_params, tdc_flags);/* IFLA_CAN_{,XL}_TDC */</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t can_ctrlmode_ext_get_size(void)</div><div class='add'>+{</div><div class='add'>+	return nla_total_size(0) +		/* nest IFLA_CAN_CTRLMODE_EXT */</div><div class='add'>+		nla_total_size(sizeof(u32));	/* IFLA_CAN_CTRLMODE_SUPPORTED */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t can_pwm_get_size(const struct can_pwm_const *pwm_const,</div><div class='add'>+			       bool pwm_on)</div><div class='add'>+{</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (!pwm_const || !pwm_on)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	size = nla_total_size(0);			/* nest IFLA_CAN_PWM */</div><div class='add'>+</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWMS_MIN */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWMS_MAX */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWML_MIN */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWML_MAX */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWMO_MIN */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWMO_MAX */</div><div class='add'>+</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWMS */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWML */</div><div class='add'>+	size += nla_total_size(sizeof(u32));		/* IFLA_CAN_PWM_PWMO */</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t can_get_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	size_t size = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;bittiming.bitrate)				/* IFLA_CAN_BITTIMING */</div><div class='add'>+		size += nla_total_size(sizeof(struct can_bittiming));</div><div class='add'>+	if (priv-&gt;bittiming_const)				/* IFLA_CAN_BITTIMING_CONST */</div><div class='add'>+		size += nla_total_size(sizeof(struct can_bittiming_const));</div><div class='add'>+	size += nla_total_size(sizeof(struct can_clock));	/* IFLA_CAN_CLOCK */</div><div class='add'>+	size += nla_total_size(sizeof(u32));			/* IFLA_CAN_STATE */</div><div class='add'>+	size += nla_total_size(sizeof(struct can_ctrlmode));	/* IFLA_CAN_CTRLMODE */</div><div class='add'>+	size += nla_total_size(sizeof(u32));			/* IFLA_CAN_RESTART_MS */</div><div class='add'>+	if (priv-&gt;do_get_berr_counter)				/* IFLA_CAN_BERR_COUNTER */</div><div class='add'>+		size += nla_total_size(sizeof(struct can_berr_counter));</div><div class='add'>+	if (priv-&gt;termination_const) {</div><div class='add'>+		size += nla_total_size(sizeof(priv-&gt;termination));		/* IFLA_CAN_TERMINATION */</div><div class='add'>+		size += nla_total_size(sizeof(*priv-&gt;termination_const) *	/* IFLA_CAN_TERMINATION_CONST */</div><div class='add'>+				       priv-&gt;termination_const_cnt);</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;bitrate_const)				/* IFLA_CAN_BITRATE_CONST */</div><div class='add'>+		size += nla_total_size(sizeof(*priv-&gt;bitrate_const) *</div><div class='add'>+				       priv-&gt;bitrate_const_cnt);</div><div class='add'>+	size += sizeof(priv-&gt;bitrate_max);			/* IFLA_CAN_BITRATE_MAX */</div><div class='add'>+	size += can_ctrlmode_ext_get_size();			/* IFLA_CAN_CTRLMODE_EXT */</div><div class='add'>+</div><div class='add'>+	size += can_data_bittiming_get_size(&amp;priv-&gt;fd,</div><div class='add'>+					    priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD_TDC_MASK);</div><div class='add'>+</div><div class='add'>+	size += can_data_bittiming_get_size(&amp;priv-&gt;xl,</div><div class='add'>+					    priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TDC_MASK);</div><div class='add'>+	size += can_pwm_get_size(priv-&gt;xl.pwm_const,		/* IFLA_CAN_XL_PWM */</div><div class='add'>+				 priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TMS);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_bittiming_fill_info(struct sk_buff *skb, int ifla_can_bittiming,</div><div class='add'>+				   struct can_bittiming *bittiming)</div><div class='add'>+{</div><div class='add'>+	return bittiming-&gt;bitrate != CAN_BITRATE_UNSET &amp;&amp;</div><div class='add'>+		bittiming-&gt;bitrate != CAN_BITRATE_UNKNOWN &amp;&amp;</div><div class='add'>+		nla_put(skb, ifla_can_bittiming, sizeof(*bittiming), bittiming);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_bittiming_const_fill_info(struct sk_buff *skb,</div><div class='add'>+					 int ifla_can_bittiming_const,</div><div class='add'>+					 const struct can_bittiming_const *bittiming_const)</div><div class='add'>+{</div><div class='add'>+	return bittiming_const &amp;&amp;</div><div class='add'>+		nla_put(skb, ifla_can_bittiming_const,</div><div class='add'>+			sizeof(*bittiming_const), bittiming_const);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_bitrate_const_fill_info(struct sk_buff *skb,</div><div class='add'>+				       int ifla_can_bitrate_const,</div><div class='add'>+				       const u32 *bitrate_const, unsigned int cnt)</div><div class='add'>+{</div><div class='add'>+	return bitrate_const &amp;&amp;</div><div class='add'>+		nla_put(skb, ifla_can_bitrate_const,</div><div class='add'>+			sizeof(*bitrate_const) * cnt, bitrate_const);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_tdc_fill_info(struct sk_buff *skb, const struct net_device *dev,</div><div class='add'>+			     int ifla_can_tdc)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct data_bittiming_params *dbt_params;</div><div class='add'>+	const struct can_tdc_const *tdc_const;</div><div class='add'>+	struct can_tdc *tdc;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+	bool tdc_is_enabled, tdc_manual;</div><div class='add'>+</div><div class='add'>+	if (ifla_can_tdc == IFLA_CAN_TDC) {</div><div class='add'>+		dbt_params = &amp;priv-&gt;fd;</div><div class='add'>+		tdc_is_enabled = can_fd_tdc_is_enabled(priv);</div><div class='add'>+		tdc_manual = priv-&gt;ctrlmode &amp; CAN_CTRLMODE_TDC_MANUAL;</div><div class='add'>+	} else {</div><div class='add'>+		dbt_params = &amp;priv-&gt;xl;</div><div class='add'>+		tdc_is_enabled = can_xl_tdc_is_enabled(priv);</div><div class='add'>+		tdc_manual = priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TDC_MANUAL;</div><div class='add'>+	}</div><div class='add'>+	tdc_const = dbt_params-&gt;tdc_const;</div><div class='add'>+	tdc = &amp;dbt_params-&gt;tdc;</div><div class='add'>+</div><div class='add'>+	if (!tdc_const)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, ifla_can_tdc);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (tdc_manual &amp;&amp;</div><div class='add'>+	    (nla_put_u32(skb, IFLA_CAN_TDC_TDCV_MIN, tdc_const-&gt;tdcv_min) ||</div><div class='add'>+	     nla_put_u32(skb, IFLA_CAN_TDC_TDCV_MAX, tdc_const-&gt;tdcv_max)))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+	if (nla_put_u32(skb, IFLA_CAN_TDC_TDCO_MIN, tdc_const-&gt;tdco_min) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_TDC_TDCO_MAX, tdc_const-&gt;tdco_max))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+	if (tdc_const-&gt;tdcf_max &amp;&amp;</div><div class='add'>+	    (nla_put_u32(skb, IFLA_CAN_TDC_TDCF_MIN, tdc_const-&gt;tdcf_min) ||</div><div class='add'>+	     nla_put_u32(skb, IFLA_CAN_TDC_TDCF_MAX, tdc_const-&gt;tdcf_max)))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	if (tdc_is_enabled) {</div><div class='add'>+		u32 tdcv;</div><div class='add'>+		int err = -EINVAL;</div><div class='add'>+</div><div class='add'>+		if (tdc_manual) {</div><div class='add'>+			tdcv = tdc-&gt;tdcv;</div><div class='add'>+			err = 0;</div><div class='add'>+		} else if (dbt_params-&gt;do_get_auto_tdcv) {</div><div class='add'>+			err = dbt_params-&gt;do_get_auto_tdcv(dev, &amp;tdcv);</div><div class='add'>+		}</div><div class='add'>+		if (!err &amp;&amp; nla_put_u32(skb, IFLA_CAN_TDC_TDCV, tdcv))</div><div class='add'>+			goto err_cancel;</div><div class='add'>+		if (nla_put_u32(skb, IFLA_CAN_TDC_TDCO, tdc-&gt;tdco))</div><div class='add'>+			goto err_cancel;</div><div class='add'>+		if (tdc_const-&gt;tdcf_max &amp;&amp;</div><div class='add'>+		    nla_put_u32(skb, IFLA_CAN_TDC_TDCF, tdc-&gt;tdcf))</div><div class='add'>+			goto err_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_pwm_fill_info(struct sk_buff *skb, const struct can_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct can_pwm_const *pwm_const = priv-&gt;xl.pwm_const;</div><div class='add'>+	const struct can_pwm *pwm = &amp;priv-&gt;xl.pwm;</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	if (!pwm_const)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, IFLA_CAN_XL_PWM);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IFLA_CAN_PWM_PWMS_MIN, pwm_const-&gt;pwms_min) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_PWM_PWMS_MAX, pwm_const-&gt;pwms_max) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_PWM_PWML_MIN, pwm_const-&gt;pwml_min) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_PWM_PWML_MAX, pwm_const-&gt;pwml_max) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_PWM_PWMO_MIN, pwm_const-&gt;pwmo_min) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_PWM_PWMO_MAX, pwm_const-&gt;pwmo_max))</div><div class='add'>+		goto err_cancel;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TMS) {</div><div class='add'>+		if (nla_put_u32(skb, IFLA_CAN_PWM_PWMS, pwm-&gt;pwms) ||</div><div class='add'>+		    nla_put_u32(skb, IFLA_CAN_PWM_PWML, pwm-&gt;pwml) ||</div><div class='add'>+		    nla_put_u32(skb, IFLA_CAN_PWM_PWMO, pwm-&gt;pwmo))</div><div class='add'>+			goto err_cancel;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_cancel:</div><div class='add'>+	nla_nest_cancel(skb, nest);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_ctrlmode_ext_fill_info(struct sk_buff *skb,</div><div class='add'>+				      const struct can_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct nlattr *nest;</div><div class='add'>+</div><div class='add'>+	nest = nla_nest_start(skb, IFLA_CAN_CTRLMODE_EXT);</div><div class='add'>+	if (!nest)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (nla_put_u32(skb, IFLA_CAN_CTRLMODE_SUPPORTED,</div><div class='add'>+			priv-&gt;ctrlmode_supported)) {</div><div class='add'>+		nla_nest_cancel(skb, nest);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nla_nest_end(skb, nest);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct can_ctrlmode cm = {.flags = priv-&gt;ctrlmode};</div><div class='add'>+	struct can_berr_counter bec = { };</div><div class='add'>+	enum can_state state = priv-&gt;state;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;do_get_state)</div><div class='add'>+		priv-&gt;do_get_state(dev, &amp;state);</div><div class='add'>+</div><div class='add'>+	if (can_bittiming_fill_info(skb, IFLA_CAN_BITTIMING,</div><div class='add'>+				    &amp;priv-&gt;bittiming) ||</div><div class='add'>+</div><div class='add'>+	    can_bittiming_const_fill_info(skb, IFLA_CAN_BITTIMING_CONST,</div><div class='add'>+					  priv-&gt;bittiming_const) ||</div><div class='add'>+</div><div class='add'>+	    nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv-&gt;clock), &amp;priv-&gt;clock) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_STATE, state) ||</div><div class='add'>+	    nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &amp;cm) ||</div><div class='add'>+	    nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv-&gt;restart_ms) ||</div><div class='add'>+</div><div class='add'>+	    (priv-&gt;do_get_berr_counter &amp;&amp;</div><div class='add'>+	     !priv-&gt;do_get_berr_counter(dev, &amp;bec) &amp;&amp;</div><div class='add'>+	     nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &amp;bec)) ||</div><div class='add'>+</div><div class='add'>+	    can_bittiming_fill_info(skb, IFLA_CAN_DATA_BITTIMING,</div><div class='add'>+				    &amp;priv-&gt;fd.data_bittiming) ||</div><div class='add'>+</div><div class='add'>+	    can_bittiming_const_fill_info(skb, IFLA_CAN_DATA_BITTIMING_CONST,</div><div class='add'>+					  priv-&gt;fd.data_bittiming_const) ||</div><div class='add'>+</div><div class='add'>+	    (priv-&gt;termination_const &amp;&amp;</div><div class='add'>+	     (nla_put_u16(skb, IFLA_CAN_TERMINATION, priv-&gt;termination) ||</div><div class='add'>+	      nla_put(skb, IFLA_CAN_TERMINATION_CONST,</div><div class='add'>+		      sizeof(*priv-&gt;termination_const) *</div><div class='add'>+		      priv-&gt;termination_const_cnt,</div><div class='add'>+		      priv-&gt;termination_const))) ||</div><div class='add'>+</div><div class='add'>+	    can_bitrate_const_fill_info(skb, IFLA_CAN_BITRATE_CONST,</div><div class='add'>+					priv-&gt;bitrate_const,</div><div class='add'>+					priv-&gt;bitrate_const_cnt) ||</div><div class='add'>+</div><div class='add'>+	    can_bitrate_const_fill_info(skb, IFLA_CAN_DATA_BITRATE_CONST,</div><div class='add'>+					priv-&gt;fd.data_bitrate_const,</div><div class='add'>+					priv-&gt;fd.data_bitrate_const_cnt) ||</div><div class='add'>+</div><div class='add'>+	    (nla_put(skb, IFLA_CAN_BITRATE_MAX,</div><div class='add'>+		     sizeof(priv-&gt;bitrate_max),</div><div class='add'>+		     &amp;priv-&gt;bitrate_max)) ||</div><div class='add'>+</div><div class='add'>+	    can_tdc_fill_info(skb, dev, IFLA_CAN_TDC) ||</div><div class='add'>+</div><div class='add'>+	    can_ctrlmode_ext_fill_info(skb, priv) ||</div><div class='add'>+</div><div class='add'>+	    can_bittiming_fill_info(skb, IFLA_CAN_XL_DATA_BITTIMING,</div><div class='add'>+				    &amp;priv-&gt;xl.data_bittiming) ||</div><div class='add'>+</div><div class='add'>+	    can_bittiming_const_fill_info(skb, IFLA_CAN_XL_DATA_BITTIMING_CONST,</div><div class='add'>+					  priv-&gt;xl.data_bittiming_const) ||</div><div class='add'>+</div><div class='add'>+	    can_bitrate_const_fill_info(skb, IFLA_CAN_XL_DATA_BITRATE_CONST,</div><div class='add'>+					priv-&gt;xl.data_bitrate_const,</div><div class='add'>+					priv-&gt;xl.data_bitrate_const_cnt) ||</div><div class='add'>+</div><div class='add'>+	    can_tdc_fill_info(skb, dev, IFLA_CAN_XL_TDC) ||</div><div class='add'>+</div><div class='add'>+	    can_pwm_fill_info(skb, priv)</div><div class='add'>+	    )</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t can_get_xstats_size(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return sizeof(struct can_device_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (nla_put(skb, IFLA_INFO_XSTATS,</div><div class='add'>+		    sizeof(priv-&gt;can_stats), &amp;priv-&gt;can_stats))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_newlink(struct net_device *dev,</div><div class='add'>+		       struct rtnl_newlink_params *params,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void can_dellink(struct net_device *dev, struct list_head *head)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct rtnl_link_ops can_link_ops __read_mostly = {</div><div class='add'>+	.kind		= "can",</div><div class='add'>+	.netns_refund	= true,</div><div class='add'>+	.maxtype	= IFLA_CAN_MAX,</div><div class='add'>+	.policy		= can_policy,</div><div class='add'>+	.setup		= can_setup,</div><div class='add'>+	.validate	= can_validate,</div><div class='add'>+	.newlink	= can_newlink,</div><div class='add'>+	.changelink	= can_changelink,</div><div class='add'>+	.dellink	= can_dellink,</div><div class='add'>+	.get_size	= can_get_size,</div><div class='add'>+	.fill_info	= can_fill_info,</div><div class='add'>+	.get_xstats_size = can_get_xstats_size,</div><div class='add'>+	.fill_xstats	= can_fill_xstats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int can_netlink_register(void)</div><div class='add'>+{</div><div class='add'>+	return rtnl_link_register(&amp;can_link_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void can_netlink_unregister(void)</div><div class='add'>+{</div><div class='add'>+	rtnl_link_unregister(&amp;can_link_ops);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c<br/>new file mode 100644<br/>index 000000000000..46e7b6db4a1e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/rx-offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/rx-offload.c</a></div><div class='hunk'>@@ -0,0 +1,427 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (c) 2014      Protonic Holland,</div><div class='add'>+ *                         David Jander</div><div class='add'>+ * Copyright (C) 2014-2021, 2023 Pengutronix,</div><div class='add'>+ *                         Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+</div><div class='add'>+struct can_rx_offload_cb {</div><div class='add'>+	u32 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct can_rx_offload_cb *</div><div class='add'>+can_rx_offload_get_cb(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct can_rx_offload_cb) &gt; sizeof(skb-&gt;cb));</div><div class='add'>+</div><div class='add'>+	return (struct can_rx_offload_cb *)skb-&gt;cb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+can_rx_offload_le(struct can_rx_offload *offload,</div><div class='add'>+		  unsigned int a, unsigned int b)</div><div class='add'>+{</div><div class='add'>+	if (offload-&gt;inc)</div><div class='add'>+		return a &lt;= b;</div><div class='add'>+	else</div><div class='add'>+		return a &gt;= b;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+can_rx_offload_inc(struct can_rx_offload *offload, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	if (offload-&gt;inc)</div><div class='add'>+		return (*val)++;</div><div class='add'>+	else</div><div class='add'>+		return (*val)--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_rx_offload_napi_poll(struct napi_struct *napi, int quota)</div><div class='add'>+{</div><div class='add'>+	struct can_rx_offload *offload = container_of(napi,</div><div class='add'>+						      struct can_rx_offload,</div><div class='add'>+						      napi);</div><div class='add'>+	struct net_device *dev = offload-&gt;dev;</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int work_done = 0;</div><div class='add'>+</div><div class='add'>+	while ((work_done &lt; quota) &amp;&amp;</div><div class='add'>+	       (skb = skb_dequeue(&amp;offload-&gt;skb_queue))) {</div><div class='add'>+		struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		work_done++;</div><div class='add'>+		if (!(cf-&gt;can_id &amp; CAN_ERR_FLAG)) {</div><div class='add'>+			stats-&gt;rx_packets++;</div><div class='add'>+			if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+				stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+		}</div><div class='add'>+		netif_receive_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (work_done &lt; quota) {</div><div class='add'>+		napi_complete_done(napi, work_done);</div><div class='add'>+</div><div class='add'>+		/* Check if there was another interrupt */</div><div class='add'>+		if (!skb_queue_empty(&amp;offload-&gt;skb_queue))</div><div class='add'>+			napi_schedule(&amp;offload-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+__skb_queue_add_sort(struct sk_buff_head *head, struct sk_buff *new,</div><div class='add'>+		     int (*compare)(struct sk_buff *a, struct sk_buff *b))</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *pos, *insert = NULL;</div><div class='add'>+</div><div class='add'>+	skb_queue_reverse_walk(head, pos) {</div><div class='add'>+		const struct can_rx_offload_cb *cb_pos, *cb_new;</div><div class='add'>+</div><div class='add'>+		cb_pos = can_rx_offload_get_cb(pos);</div><div class='add'>+		cb_new = can_rx_offload_get_cb(new);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(new-&gt;dev,</div><div class='add'>+			   "%s: pos=0x%08x, new=0x%08x, diff=%10d, queue_len=%d\n",</div><div class='add'>+			   __func__,</div><div class='add'>+			   cb_pos-&gt;timestamp, cb_new-&gt;timestamp,</div><div class='add'>+			   cb_new-&gt;timestamp - cb_pos-&gt;timestamp,</div><div class='add'>+			   skb_queue_len(head));</div><div class='add'>+</div><div class='add'>+		if (compare(pos, new) &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+		insert = pos;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (!insert)</div><div class='add'>+		__skb_queue_head(head, new);</div><div class='add'>+	else</div><div class='add'>+		__skb_queue_after(head, insert, new);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int can_rx_offload_compare(struct sk_buff *a, struct sk_buff *b)</div><div class='add'>+{</div><div class='add'>+	const struct can_rx_offload_cb *cb_a, *cb_b;</div><div class='add'>+</div><div class='add'>+	cb_a = can_rx_offload_get_cb(a);</div><div class='add'>+	cb_b = can_rx_offload_get_cb(b);</div><div class='add'>+</div><div class='add'>+	/* Subtract two u32 and return result as int, to keep</div><div class='add'>+	 * difference steady around the u32 overflow.</div><div class='add'>+	 */</div><div class='add'>+	return cb_b-&gt;timestamp - cb_a-&gt;timestamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * can_rx_offload_offload_one() - Read one CAN frame from HW</div><div class='add'>+ * @offload: pointer to rx_offload context</div><div class='add'>+ * @n: number of mailbox to read</div><div class='add'>+ *</div><div class='add'>+ * The task of this function is to read a CAN frame from mailbox @n</div><div class='add'>+ * from the device and return the mailbox's content as a struct</div><div class='add'>+ * sk_buff.</div><div class='add'>+ *</div><div class='add'>+ * If the struct can_rx_offload::skb_queue exceeds the maximal queue</div><div class='add'>+ * length (struct can_rx_offload::skb_queue_len_max) or no skb can be</div><div class='add'>+ * allocated, the mailbox contents is discarded by reading it into an</div><div class='add'>+ * overflow buffer. This way the mailbox is marked as free by the</div><div class='add'>+ * driver.</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to skb containing the CAN frame on success.</div><div class='add'>+ *</div><div class='add'>+ *         NULL if the mailbox @n is empty.</div><div class='add'>+ *</div><div class='add'>+ *         ERR_PTR() in case of an error</div><div class='add'>+ */</div><div class='add'>+static struct sk_buff *</div><div class='add'>+can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_rx_offload_cb *cb;</div><div class='add'>+	bool drop = false;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+</div><div class='add'>+	/* If queue is full drop frame */</div><div class='add'>+	if (unlikely(skb_queue_len(&amp;offload-&gt;skb_queue) &gt;</div><div class='add'>+		     offload-&gt;skb_queue_len_max))</div><div class='add'>+		drop = true;</div><div class='add'>+</div><div class='add'>+	skb = offload-&gt;mailbox_read(offload, n, &amp;timestamp, drop);</div><div class='add'>+	/* Mailbox was empty. */</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* There was a problem reading the mailbox, propagate</div><div class='add'>+	 * error value.</div><div class='add'>+	 */</div><div class='add'>+	if (IS_ERR(skb)) {</div><div class='add'>+		offload-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+		offload-&gt;dev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mailbox was read. */</div><div class='add'>+	cb = can_rx_offload_get_cb(skb);</div><div class='add'>+	cb-&gt;timestamp = timestamp;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_rx_offload_irq_offload_timestamp(struct can_rx_offload *offload,</div><div class='add'>+					 u64 pending)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int received = 0;</div><div class='add'>+</div><div class='add'>+	for (i = offload-&gt;mb_first;</div><div class='add'>+	     can_rx_offload_le(offload, i, offload-&gt;mb_last);</div><div class='add'>+	     can_rx_offload_inc(offload, &amp;i)) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		if (!(pending &amp; BIT_ULL(i)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		skb = can_rx_offload_offload_one(offload, i);</div><div class='add'>+		if (IS_ERR_OR_NULL(skb))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		__skb_queue_add_sort(&amp;offload-&gt;skb_irq_queue, skb,</div><div class='add'>+				     can_rx_offload_compare);</div><div class='add'>+		received++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return received;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_irq_offload_timestamp);</div><div class='add'>+</div><div class='add'>+int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int received = 0;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		skb = can_rx_offload_offload_one(offload, 0);</div><div class='add'>+		if (IS_ERR(skb))</div><div class='add'>+			continue;</div><div class='add'>+		if (!skb)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		__skb_queue_tail(&amp;offload-&gt;skb_irq_queue, skb);</div><div class='add'>+		received++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return received;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_irq_offload_fifo);</div><div class='add'>+</div><div class='add'>+int can_rx_offload_queue_timestamp(struct can_rx_offload *offload,</div><div class='add'>+				   struct sk_buff *skb, u32 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct can_rx_offload_cb *cb;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_len(&amp;offload-&gt;skb_queue) &gt;</div><div class='add'>+	    offload-&gt;skb_queue_len_max) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cb = can_rx_offload_get_cb(skb);</div><div class='add'>+	cb-&gt;timestamp = timestamp;</div><div class='add'>+</div><div class='add'>+	__skb_queue_add_sort(&amp;offload-&gt;skb_irq_queue, skb,</div><div class='add'>+			     can_rx_offload_compare);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_queue_timestamp);</div><div class='add'>+</div><div class='add'>+unsigned int</div><div class='add'>+can_rx_offload_get_echo_skb_queue_timestamp(struct can_rx_offload *offload,</div><div class='add'>+					    unsigned int idx, u32 timestamp,</div><div class='add'>+					    unsigned int *frame_len_ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = offload-&gt;dev;</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = __can_get_echo_skb(dev, idx, &amp;len, frame_len_ptr);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(offload, skb, timestamp);</div><div class='add'>+	if (err) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		stats-&gt;tx_fifo_errors++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb_queue_timestamp);</div><div class='add'>+</div><div class='add'>+int can_rx_offload_queue_tail(struct can_rx_offload *offload,</div><div class='add'>+			      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (skb_queue_len(&amp;offload-&gt;skb_queue) &gt;</div><div class='add'>+	    offload-&gt;skb_queue_len_max) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		return -ENOBUFS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__skb_queue_tail(&amp;offload-&gt;skb_irq_queue, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_queue_tail);</div><div class='add'>+</div><div class='add'>+unsigned int</div><div class='add'>+can_rx_offload_get_echo_skb_queue_tail(struct can_rx_offload *offload,</div><div class='add'>+				       unsigned int idx,</div><div class='add'>+				       unsigned int *frame_len_ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = offload-&gt;dev;</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = __can_get_echo_skb(dev, idx, &amp;len, frame_len_ptr);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_tail(offload, skb);</div><div class='add'>+	if (err) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		stats-&gt;tx_fifo_errors++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb_queue_tail);</div><div class='add'>+</div><div class='add'>+void can_rx_offload_irq_finish(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int queue_len;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty_lockless(&amp;offload-&gt;skb_irq_queue))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='add'>+	skb_queue_splice_tail_init(&amp;offload-&gt;skb_irq_queue, &amp;offload-&gt;skb_queue);</div><div class='add'>+	spin_unlock_irqrestore(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	queue_len = skb_queue_len(&amp;offload-&gt;skb_queue);</div><div class='add'>+	if (queue_len &gt; offload-&gt;skb_queue_len_max / 8)</div><div class='add'>+		netdev_dbg(offload-&gt;dev, "%s: queue_len=%d\n",</div><div class='add'>+			   __func__, queue_len);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;offload-&gt;napi);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_irq_finish);</div><div class='add'>+</div><div class='add'>+void can_rx_offload_threaded_irq_finish(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int queue_len;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty_lockless(&amp;offload-&gt;skb_irq_queue))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='add'>+	skb_queue_splice_tail_init(&amp;offload-&gt;skb_irq_queue, &amp;offload-&gt;skb_queue);</div><div class='add'>+	spin_unlock_irqrestore(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='add'>+</div><div class='add'>+	queue_len = skb_queue_len(&amp;offload-&gt;skb_queue);</div><div class='add'>+	if (queue_len &gt; offload-&gt;skb_queue_len_max / 8)</div><div class='add'>+		netdev_dbg(offload-&gt;dev, "%s: queue_len=%d\n",</div><div class='add'>+			   __func__, queue_len);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	napi_schedule(&amp;offload-&gt;napi);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_threaded_irq_finish);</div><div class='add'>+</div><div class='add'>+static int can_rx_offload_init_queue(struct net_device *dev,</div><div class='add'>+				     struct can_rx_offload *offload,</div><div class='add'>+				     unsigned int weight)</div><div class='add'>+{</div><div class='add'>+	offload-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	/* Limit queue len to 4x the weight (rounded to next power of two) */</div><div class='add'>+	offload-&gt;skb_queue_len_max = 2 &lt;&lt; fls(weight);</div><div class='add'>+	offload-&gt;skb_queue_len_max *= 4;</div><div class='add'>+	skb_queue_head_init(&amp;offload-&gt;skb_queue);</div><div class='add'>+	__skb_queue_head_init(&amp;offload-&gt;skb_irq_queue);</div><div class='add'>+</div><div class='add'>+	netif_napi_add_weight(dev, &amp;offload-&gt;napi, can_rx_offload_napi_poll,</div><div class='add'>+			      weight);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev.parent, "%s: skb_queue_len_max=%d\n",</div><div class='add'>+		__func__, offload-&gt;skb_queue_len_max);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int can_rx_offload_add_timestamp(struct net_device *dev,</div><div class='add'>+				 struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	unsigned int weight;</div><div class='add'>+</div><div class='add'>+	if (offload-&gt;mb_first &gt; BITS_PER_LONG_LONG ||</div><div class='add'>+	    offload-&gt;mb_last &gt; BITS_PER_LONG_LONG || !offload-&gt;mailbox_read)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (offload-&gt;mb_first &lt; offload-&gt;mb_last) {</div><div class='add'>+		offload-&gt;inc = true;</div><div class='add'>+		weight = offload-&gt;mb_last - offload-&gt;mb_first;</div><div class='add'>+	} else {</div><div class='add'>+		offload-&gt;inc = false;</div><div class='add'>+		weight = offload-&gt;mb_first - offload-&gt;mb_last;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return can_rx_offload_init_queue(dev, offload, weight);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_add_timestamp);</div><div class='add'>+</div><div class='add'>+int can_rx_offload_add_fifo(struct net_device *dev,</div><div class='add'>+			    struct can_rx_offload *offload, unsigned int weight)</div><div class='add'>+{</div><div class='add'>+	if (!offload-&gt;mailbox_read)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return can_rx_offload_init_queue(dev, offload, weight);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_add_fifo);</div><div class='add'>+</div><div class='add'>+int can_rx_offload_add_manual(struct net_device *dev,</div><div class='add'>+			      struct can_rx_offload *offload,</div><div class='add'>+			      unsigned int weight)</div><div class='add'>+{</div><div class='add'>+	if (offload-&gt;mailbox_read)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return can_rx_offload_init_queue(dev, offload, weight);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_add_manual);</div><div class='add'>+</div><div class='add'>+void can_rx_offload_enable(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	napi_enable(&amp;offload-&gt;napi);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_enable);</div><div class='add'>+</div><div class='add'>+void can_rx_offload_del(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	netif_napi_del(&amp;offload-&gt;napi);</div><div class='add'>+	skb_queue_purge(&amp;offload-&gt;skb_queue);</div><div class='add'>+	__skb_queue_purge(&amp;offload-&gt;skb_irq_queue);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_rx_offload_del);</div><div class='head'>diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c<br/>new file mode 100644<br/>index 000000000000..3ebd4f779b9b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dev/skb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dev/skb.c</a></div><div class='hunk'>@@ -0,0 +1,374 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2005 Marc Kleine-Budde, Pengutronix</div><div class='add'>+ * Copyright (C) 2006 Andrey Volkov, Varma Electronics</div><div class='add'>+ * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#define MOD_DESC "CAN device driver interface"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(MOD_DESC);</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_AUTHOR("Wolfgang Grandegger &lt;wg@grandegger.com&gt;");</div><div class='add'>+</div><div class='add'>+/* Local echo of CAN messages</div><div class='add'>+ *</div><div class='add'>+ * CAN network devices *should* support a local echo functionality</div><div class='add'>+ * (see Documentation/networking/can.rst). To test the handling of CAN</div><div class='add'>+ * interfaces that do not support the local echo both driver types are</div><div class='add'>+ * implemented. In the case that the driver does not support the echo</div><div class='add'>+ * the IFF_ECHO remains clear in dev-&gt;flags. This causes the PF_CAN core</div><div class='add'>+ * to perform the echo as a fallback solution.</div><div class='add'>+ */</div><div class='add'>+void can_flush_echo_skb(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;echo_skb_max; i++) {</div><div class='add'>+		if (priv-&gt;echo_skb[i]) {</div><div class='add'>+			kfree_skb(priv-&gt;echo_skb[i]);</div><div class='add'>+			priv-&gt;echo_skb[i] = NULL;</div><div class='add'>+			stats-&gt;tx_dropped++;</div><div class='add'>+			stats-&gt;tx_aborted_errors++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Put the skb on the stack to be looped backed locally lateron</div><div class='add'>+ *</div><div class='add'>+ * The function is typically called in the start_xmit function</div><div class='add'>+ * of the device driver. The driver must protect access to</div><div class='add'>+ * priv-&gt;echo_skb, if necessary.</div><div class='add'>+ */</div><div class='add'>+int can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,</div><div class='add'>+		     unsigned int idx, unsigned int frame_len)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= priv-&gt;echo_skb_max) {</div><div class='add'>+		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",</div><div class='add'>+			   __func__, idx, priv-&gt;echo_skb_max);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check flag whether this packet has to be looped back */</div><div class='add'>+	if (!(dev-&gt;flags &amp; IFF_ECHO) ||</div><div class='add'>+	    (skb-&gt;protocol != htons(ETH_P_CAN) &amp;&amp;</div><div class='add'>+	     skb-&gt;protocol != htons(ETH_P_CANFD) &amp;&amp;</div><div class='add'>+	     skb-&gt;protocol != htons(ETH_P_CANXL))) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;echo_skb[idx]) {</div><div class='add'>+		skb = can_create_echo_skb(skb);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		/* make settings for echo to reduce code in irq context */</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+		skb-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+		/* save frame_len to reuse it when transmission is completed */</div><div class='add'>+		can_skb_prv(skb)-&gt;frame_len = frame_len;</div><div class='add'>+</div><div class='add'>+		if (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+		skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+		/* save this skb for tx interrupt echo handling */</div><div class='add'>+		priv-&gt;echo_skb[idx] = skb;</div><div class='add'>+	} else {</div><div class='add'>+		/* locking problem with netif_stop_queue() ?? */</div><div class='add'>+		netdev_err(dev, "%s: BUG! echo_skb %d is occupied!\n", __func__, idx);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_put_echo_skb);</div><div class='add'>+</div><div class='add'>+struct sk_buff *</div><div class='add'>+__can_get_echo_skb(struct net_device *dev, unsigned int idx,</div><div class='add'>+		   unsigned int *len_ptr, unsigned int *frame_len_ptr)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= priv-&gt;echo_skb_max) {</div><div class='add'>+		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",</div><div class='add'>+			   __func__, idx, priv-&gt;echo_skb_max);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;echo_skb[idx]) {</div><div class='add'>+		/* Using "struct canfd_frame::len" for the frame</div><div class='add'>+		 * length is supported on both CAN and CANFD frames.</div><div class='add'>+		 */</div><div class='add'>+		struct sk_buff *skb = priv-&gt;echo_skb[idx];</div><div class='add'>+		struct can_skb_priv *can_skb_priv = can_skb_prv(skb);</div><div class='add'>+</div><div class='add'>+		if (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_IN_PROGRESS)</div><div class='add'>+			skb_tstamp_tx(skb, skb_hwtstamps(skb));</div><div class='add'>+</div><div class='add'>+		/* get the real payload length for netdev statistics */</div><div class='add'>+		*len_ptr = can_skb_get_data_len(skb);</div><div class='add'>+</div><div class='add'>+		if (frame_len_ptr)</div><div class='add'>+			*frame_len_ptr = can_skb_priv-&gt;frame_len;</div><div class='add'>+</div><div class='add'>+		priv-&gt;echo_skb[idx] = NULL;</div><div class='add'>+</div><div class='add'>+		if (skb-&gt;pkt_type == PACKET_LOOPBACK) {</div><div class='add'>+			skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='add'>+		} else {</div><div class='add'>+			dev_consume_skb_any(skb);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get the skb from the stack and loop it back locally</div><div class='add'>+ *</div><div class='add'>+ * The function is typically called when the TX done interrupt</div><div class='add'>+ * is handled in the device driver. The driver must protect</div><div class='add'>+ * access to priv-&gt;echo_skb, if necessary.</div><div class='add'>+ */</div><div class='add'>+unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx,</div><div class='add'>+			      unsigned int *frame_len_ptr)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	skb = __can_get_echo_skb(dev, idx, &amp;len, frame_len_ptr);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	skb_get(skb);</div><div class='add'>+	if (netif_rx(skb) == NET_RX_SUCCESS)</div><div class='add'>+		dev_consume_skb_any(skb);</div><div class='add'>+	else</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_get_echo_skb);</div><div class='add'>+</div><div class='add'>+/* Remove the skb from the stack and free it.</div><div class='add'>+ *</div><div class='add'>+ * The function is typically called when TX failed.</div><div class='add'>+ */</div><div class='add'>+void can_free_echo_skb(struct net_device *dev, unsigned int idx,</div><div class='add'>+		       unsigned int *frame_len_ptr)</div><div class='add'>+{</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (idx &gt;= priv-&gt;echo_skb_max) {</div><div class='add'>+		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",</div><div class='add'>+			   __func__, idx, priv-&gt;echo_skb_max);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;echo_skb[idx]) {</div><div class='add'>+		struct sk_buff *skb = priv-&gt;echo_skb[idx];</div><div class='add'>+		struct can_skb_priv *can_skb_priv = can_skb_prv(skb);</div><div class='add'>+</div><div class='add'>+		if (frame_len_ptr)</div><div class='add'>+			*frame_len_ptr = can_skb_priv-&gt;frame_len;</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		priv-&gt;echo_skb[idx] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_free_echo_skb);</div><div class='add'>+</div><div class='add'>+/* fill common values for CAN sk_buffs */</div><div class='add'>+static void init_can_skb_reserve(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='add'>+	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) +</div><div class='add'>+			       sizeof(struct can_frame));</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		*cf = NULL;</div><div class='add'>+</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_CAN);</div><div class='add'>+	init_can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	*cf = skb_put_zero(skb, sizeof(struct can_frame));</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_can_skb);</div><div class='add'>+</div><div class='add'>+struct sk_buff *alloc_canfd_skb(struct net_device *dev,</div><div class='add'>+				struct canfd_frame **cfd)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) +</div><div class='add'>+			       sizeof(struct canfd_frame));</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		*cfd = NULL;</div><div class='add'>+</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_CANFD);</div><div class='add'>+	init_can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	*cfd = skb_put_zero(skb, sizeof(struct canfd_frame));</div><div class='add'>+</div><div class='add'>+	/* set CAN FD flag by default */</div><div class='add'>+	(*cfd)-&gt;flags = CANFD_FDF;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_canfd_skb);</div><div class='add'>+</div><div class='add'>+struct sk_buff *alloc_canxl_skb(struct net_device *dev,</div><div class='add'>+				struct canxl_frame **cxl,</div><div class='add'>+				unsigned int data_len)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (data_len &lt; CANXL_MIN_DLEN || data_len &gt; CANXL_MAX_DLEN)</div><div class='add'>+		goto out_error;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) +</div><div class='add'>+			       CANXL_HDR_SIZE + data_len);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		goto out_error;</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = htons(ETH_P_CANXL);</div><div class='add'>+	init_can_skb_reserve(skb);</div><div class='add'>+	can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+</div><div class='add'>+	*cxl = skb_put_zero(skb, CANXL_HDR_SIZE + data_len);</div><div class='add'>+</div><div class='add'>+	/* set CAN XL flag and length information by default */</div><div class='add'>+	(*cxl)-&gt;flags = CANXL_XLF;</div><div class='add'>+	(*cxl)-&gt;len = data_len;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='add'>+	*cxl = NULL;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_canxl_skb);</div><div class='add'>+</div><div class='add'>+struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(dev, cf);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	(*cf)-&gt;can_id = CAN_ERR_FLAG;</div><div class='add'>+	(*cf)-&gt;len = CAN_ERR_DLC;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(alloc_can_err_skb);</div><div class='add'>+</div><div class='add'>+/* Check for outgoing skbs that have not been created by the CAN subsystem */</div><div class='add'>+static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	/* af_packet creates a headroom of HH_DATA_MOD bytes which is fine */</div><div class='add'>+	if (WARN_ON_ONCE(skb_headroom(skb) &lt; sizeof(struct can_skb_priv)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* af_packet does not apply CAN skb specific settings */</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_NONE) {</div><div class='add'>+		/* init headroom */</div><div class='add'>+		can_skb_prv(skb)-&gt;ifindex = dev-&gt;ifindex;</div><div class='add'>+		can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='add'>+</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+		/* perform proper loopback on capable devices */</div><div class='add'>+		if (dev-&gt;flags &amp; IFF_ECHO)</div><div class='add'>+			skb-&gt;pkt_type = PACKET_LOOPBACK;</div><div class='add'>+		else</div><div class='add'>+			skb-&gt;pkt_type = PACKET_HOST;</div><div class='add'>+</div><div class='add'>+		skb_reset_mac_header(skb);</div><div class='add'>+		skb_reset_network_header(skb);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+		/* set CANFD_FDF flag for CAN FD frames */</div><div class='add'>+		if (can_is_canfd_skb(skb)) {</div><div class='add'>+			struct canfd_frame *cfd;</div><div class='add'>+</div><div class='add'>+			cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+			cfd-&gt;flags |= CANFD_FDF;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Drop a given socketbuffer if it does not contain a valid CAN frame. */</div><div class='add'>+bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	switch (ntohs(skb-&gt;protocol)) {</div><div class='add'>+	case ETH_P_CAN:</div><div class='add'>+		if (!can_is_can_skb(skb))</div><div class='add'>+			goto inval_skb;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ETH_P_CANFD:</div><div class='add'>+		if (!can_is_canfd_skb(skb))</div><div class='add'>+			goto inval_skb;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ETH_P_CANXL:</div><div class='add'>+		if (!can_is_canxl_skb(skb))</div><div class='add'>+			goto inval_skb;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		goto inval_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!can_skb_headroom_valid(dev, skb))</div><div class='add'>+		goto inval_skb;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+</div><div class='add'>+inval_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	dev-&gt;stats.tx_dropped++;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(can_dropped_invalid_skb);</div><div class='head'>diff --git a/drivers/net/can/dummy_can.c b/drivers/net/can/dummy_can.c<br/>new file mode 100644<br/>index 000000000000..41953655e3d3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/dummy_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/dummy_can.c</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* Copyright (c) 2025 Vincent Mailhol &lt;mailhol@kernel.org&gt; */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/array_size.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/bittiming.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+</div><div class='add'>+struct dummy_can {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct dummy_can *dummy_can;</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const dummy_can_bittiming_const = {</div><div class='add'>+	.name = "dummy_can CC",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const dummy_can_fd_databittiming_const = {</div><div class='add'>+	.name = "dummy_can FD",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_tdc_const dummy_can_fd_tdc_const = {</div><div class='add'>+	.tdcv_min = 0,</div><div class='add'>+	.tdcv_max = 0, /* Manual mode not supported. */</div><div class='add'>+	.tdco_min = 0,</div><div class='add'>+	.tdco_max = 127,</div><div class='add'>+	.tdcf_min = 0,</div><div class='add'>+	.tdcf_max = 127</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const dummy_can_xl_databittiming_const = {</div><div class='add'>+	.name = "dummy_can XL",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_tdc_const dummy_can_xl_tdc_const = {</div><div class='add'>+	.tdcv_min = 0,</div><div class='add'>+	.tdcv_max = 0, /* Manual mode not supported. */</div><div class='add'>+	.tdco_min = 0,</div><div class='add'>+	.tdco_max = 127,</div><div class='add'>+	.tdcf_min = 0,</div><div class='add'>+	.tdcf_max = 127</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_pwm_const dummy_can_pwm_const = {</div><div class='add'>+	.pwms_min = 1,</div><div class='add'>+	.pwms_max = 8,</div><div class='add'>+	.pwml_min = 2,</div><div class='add'>+	.pwml_max = 24,</div><div class='add'>+	.pwmo_min = 0,</div><div class='add'>+	.pwmo_max = 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dummy_can_print_bittiming(struct net_device *dev,</div><div class='add'>+				      struct can_bittiming *bt)</div><div class='add'>+{</div><div class='add'>+	netdev_dbg(dev, "\tbitrate: %u\n", bt-&gt;bitrate);</div><div class='add'>+	netdev_dbg(dev, "\tsample_point: %u\n", bt-&gt;sample_point);</div><div class='add'>+	netdev_dbg(dev, "\ttq: %u\n", bt-&gt;tq);</div><div class='add'>+	netdev_dbg(dev, "\tprop_seg: %u\n", bt-&gt;prop_seg);</div><div class='add'>+	netdev_dbg(dev, "\tphase_seg1: %u\n", bt-&gt;phase_seg1);</div><div class='add'>+	netdev_dbg(dev, "\tphase_seg2: %u\n", bt-&gt;phase_seg2);</div><div class='add'>+	netdev_dbg(dev, "\tsjw: %u\n", bt-&gt;sjw);</div><div class='add'>+	netdev_dbg(dev, "\tbrp: %u\n", bt-&gt;brp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dummy_can_print_tdc(struct net_device *dev, struct can_tdc *tdc)</div><div class='add'>+{</div><div class='add'>+	netdev_dbg(dev, "\t\ttdcv: %u\n", tdc-&gt;tdcv);</div><div class='add'>+	netdev_dbg(dev, "\t\ttdco: %u\n", tdc-&gt;tdco);</div><div class='add'>+	netdev_dbg(dev, "\t\ttdcf: %u\n", tdc-&gt;tdcf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dummy_can_print_pwm(struct net_device *dev, struct can_pwm *pwm,</div><div class='add'>+				struct can_bittiming *dbt)</div><div class='add'>+{</div><div class='add'>+	netdev_dbg(dev, "\t\tpwms: %u\n", pwm-&gt;pwms);</div><div class='add'>+	netdev_dbg(dev, "\t\tpwml: %u\n", pwm-&gt;pwml);</div><div class='add'>+	netdev_dbg(dev, "\t\tpwmo: %u\n", pwm-&gt;pwmo);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dummy_can_print_ctrlmode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dummy_can *priv = netdev_priv(dev);</div><div class='add'>+	struct can_priv *can_priv = &amp;priv-&gt;can;</div><div class='add'>+	unsigned long supported = can_priv-&gt;ctrlmode_supported;</div><div class='add'>+	u32 enabled = can_priv-&gt;ctrlmode;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "Control modes:\n");</div><div class='add'>+	netdev_dbg(dev, "\tsupported: 0x%08x\n", (u32)supported);</div><div class='add'>+	netdev_dbg(dev, "\tenabled: 0x%08x\n", enabled);</div><div class='add'>+</div><div class='add'>+	if (supported) {</div><div class='add'>+		int idx;</div><div class='add'>+</div><div class='add'>+		netdev_dbg(dev, "\tlist:");</div><div class='add'>+		for_each_set_bit(idx, &amp;supported, BITS_PER_TYPE(u32))</div><div class='add'>+			netdev_dbg(dev, "\t\t%s: %s\n",</div><div class='add'>+				   can_get_ctrlmode_str(BIT(idx)),</div><div class='add'>+				   enabled &amp; BIT(idx) ? "on" : "off");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dummy_can_print_bittiming_info(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dummy_can *priv = netdev_priv(dev);</div><div class='add'>+	struct can_priv *can_priv = &amp;priv-&gt;can;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "Clock frequency: %u\n", can_priv-&gt;clock.freq);</div><div class='add'>+	netdev_dbg(dev, "Maximum bitrate: %u\n", can_priv-&gt;bitrate_max);</div><div class='add'>+	netdev_dbg(dev, "MTU: %u\n", dev-&gt;mtu);</div><div class='add'>+	netdev_dbg(dev, "\n");</div><div class='add'>+</div><div class='add'>+	dummy_can_print_ctrlmode(dev);</div><div class='add'>+	netdev_dbg(dev, "\n");</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "Classical CAN nominal bittiming:\n");</div><div class='add'>+	dummy_can_print_bittiming(dev, &amp;can_priv-&gt;bittiming);</div><div class='add'>+	netdev_dbg(dev, "\n");</div><div class='add'>+</div><div class='add'>+	if (can_priv-&gt;ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		netdev_dbg(dev, "CAN FD databittiming:\n");</div><div class='add'>+		dummy_can_print_bittiming(dev, &amp;can_priv-&gt;fd.data_bittiming);</div><div class='add'>+		if (can_fd_tdc_is_enabled(can_priv)) {</div><div class='add'>+			netdev_dbg(dev, "\tCAN FD TDC:\n");</div><div class='add'>+			dummy_can_print_tdc(dev, &amp;can_priv-&gt;fd.tdc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	netdev_dbg(dev, "\n");</div><div class='add'>+</div><div class='add'>+	if (can_priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL) {</div><div class='add'>+		netdev_dbg(dev, "CAN XL databittiming:\n");</div><div class='add'>+		dummy_can_print_bittiming(dev, &amp;can_priv-&gt;xl.data_bittiming);</div><div class='add'>+		if (can_xl_tdc_is_enabled(can_priv)) {</div><div class='add'>+			netdev_dbg(dev, "\tCAN XL TDC:\n");</div><div class='add'>+			dummy_can_print_tdc(dev, &amp;can_priv-&gt;xl.tdc);</div><div class='add'>+		}</div><div class='add'>+		if (can_priv-&gt;ctrlmode &amp; CAN_CTRLMODE_XL_TMS) {</div><div class='add'>+			netdev_dbg(dev, "\tCAN XL PWM:\n");</div><div class='add'>+			dummy_can_print_pwm(dev, &amp;can_priv-&gt;xl.pwm,</div><div class='add'>+					    &amp;can_priv-&gt;xl.data_bittiming);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	netdev_dbg(dev, "\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dummy_can_netdev_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct can_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	dummy_can_print_bittiming_info(dev);</div><div class='add'>+	netdev_dbg(dev, "error-signalling is %s\n",</div><div class='add'>+		   str_enabled_disabled(!can_dev_in_xl_only_mode(priv)));</div><div class='add'>+</div><div class='add'>+	ret = open_candev(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+	netdev_dbg(dev, "dummy-can is up\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dummy_can_netdev_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	close_candev(dev);</div><div class='add'>+	netdev_dbg(dev, "dummy-can is down\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t dummy_can_start_xmit(struct sk_buff *skb,</div><div class='add'>+					struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, dev, 0, 0);</div><div class='add'>+	dev-&gt;stats.tx_packets++;</div><div class='add'>+	dev-&gt;stats.tx_bytes += can_get_echo_skb(dev, 0, NULL);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops dummy_can_netdev_ops = {</div><div class='add'>+	.ndo_open = dummy_can_netdev_open,</div><div class='add'>+	.ndo_stop = dummy_can_netdev_close,</div><div class='add'>+	.ndo_start_xmit = dummy_can_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops dummy_can_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init dummy_can_init(void)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct dummy_can *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = alloc_candev(sizeof(*priv), 1);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;netdev_ops = &amp;dummy_can_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;dummy_can_ethtool_ops;</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;dummy_can_bittiming_const;</div><div class='add'>+	priv-&gt;can.bitrate_max = 20 * MEGA /* BPS */;</div><div class='add'>+	priv-&gt;can.clock.freq = 160 * MEGA /* Hz */;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;dummy_can_fd_databittiming_const;</div><div class='add'>+	priv-&gt;can.fd.tdc_const = &amp;dummy_can_fd_tdc_const;</div><div class='add'>+	priv-&gt;can.xl.data_bittiming_const = &amp;dummy_can_xl_databittiming_const;</div><div class='add'>+	priv-&gt;can.xl.tdc_const = &amp;dummy_can_xl_tdc_const;</div><div class='add'>+	priv-&gt;can.xl.pwm_const = &amp;dummy_can_pwm_const;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+		CAN_CTRLMODE_FD | CAN_CTRLMODE_TDC_AUTO |</div><div class='add'>+		CAN_CTRLMODE_RESTRICTED | CAN_CTRLMODE_XL |</div><div class='add'>+		CAN_CTRLMODE_XL_TDC_AUTO | CAN_CTRLMODE_XL_TMS;</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	ret = register_candev(priv-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		free_candev(priv-&gt;dev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dummy_can = priv;</div><div class='add'>+	netdev_dbg(dev, "dummy-can ready\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit dummy_can_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dummy_can-&gt;dev;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "dummy-can bye bye\n");</div><div class='add'>+	unregister_candev(dev);</div><div class='add'>+	free_candev(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(dummy_can_init);</div><div class='add'>+module_exit(dummy_can_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("A dummy CAN driver, mainly to test the netlink interface");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Vincent Mailhol &lt;mailhol@kernel.org&gt;");</div><div class='head'>diff --git a/drivers/net/can/esd/Kconfig b/drivers/net/can/esd/Kconfig<br/>new file mode 100644<br/>index 000000000000..54bfc366634c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/esd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/esd/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config CAN_ESD_402_PCI</div><div class='add'>+	tristate "esd electronics gmbh CAN-PCI(e)/402 family"</div><div class='add'>+	depends on PCI &amp;&amp; HAS_DMA</div><div class='add'>+	help</div><div class='add'>+	  Support for C402 card family from esd electronics gmbh.</div><div class='add'>+	  This card family is based on the ESDACC CAN controller and</div><div class='add'>+	  available in several form factors:  PCI, PCIe, PCIe Mini,</div><div class='add'>+	  M.2 PCIe, CPCIserial, PMC, XMC  (see https://esd.eu/en)</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. In this case the</div><div class='add'>+	  module will be called esd_402_pci.</div><div class='head'>diff --git a/drivers/net/can/esd/Makefile b/drivers/net/can/esd/Makefile<br/>new file mode 100644<br/>index 000000000000..5dd2d470c286<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/esd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/esd/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+#  Makefile for esd gmbh ESDACC controller driver</div><div class='add'>+#</div><div class='add'>+esd_402_pci-objs := esdacc.o esd_402_pci-core.o</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_ESD_402_PCI) += esd_402_pci.o</div><div class='head'>diff --git a/drivers/net/can/esd/esd_402_pci-core.c b/drivers/net/can/esd/esd_402_pci-core.c<br/>new file mode 100644<br/>index 000000000000..c826f00c551b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/esd/esd_402_pci-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/esd/esd_402_pci-core.c</a></div><div class='hunk'>@@ -0,0 +1,515 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2015 - 2016 Thomas Körper, esd electronic system design gmbh</div><div class='add'>+ * Copyright (C) 2017 - 2023 Stefan Mätje, esd electronics gmbh</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/netlink.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "esdacc.h"</div><div class='add'>+</div><div class='add'>+#define ESD_PCI_DEVICE_ID_PCIE402 0x0402</div><div class='add'>+</div><div class='add'>+#define PCI402_FPGA_VER_MIN 0x003d</div><div class='add'>+#define PCI402_MAX_CORES 6</div><div class='add'>+#define PCI402_BAR 0</div><div class='add'>+#define PCI402_IO_OV_OFFS 0</div><div class='add'>+#define PCI402_IO_PCIEP_OFFS 0x10000</div><div class='add'>+#define PCI402_IO_LEN_TOTAL 0x20000</div><div class='add'>+#define PCI402_IO_LEN_CORE 0x2000</div><div class='add'>+#define PCI402_PCICFG_MSICAP 0x50</div><div class='add'>+</div><div class='add'>+#define PCI402_DMA_MASK DMA_BIT_MASK(32)</div><div class='add'>+#define PCI402_DMA_SIZE ALIGN(0x10000, PAGE_SIZE)</div><div class='add'>+</div><div class='add'>+#define PCI402_PCIEP_OF_INT_ENABLE 0x0050</div><div class='add'>+#define PCI402_PCIEP_OF_BM_ADDR_LO 0x1000</div><div class='add'>+#define PCI402_PCIEP_OF_BM_ADDR_HI 0x1004</div><div class='add'>+#define PCI402_PCIEP_OF_MSI_ADDR_LO 0x1008</div><div class='add'>+#define PCI402_PCIEP_OF_MSI_ADDR_HI 0x100c</div><div class='add'>+</div><div class='add'>+struct pci402_card {</div><div class='add'>+	/* Actually mapped io space, all other iomem derived from this */</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	void __iomem *addr_pciep;</div><div class='add'>+</div><div class='add'>+	void *dma_buf;</div><div class='add'>+	dma_addr_t dma_hnd;</div><div class='add'>+</div><div class='add'>+	struct acc_ov ov;</div><div class='add'>+	struct acc_core *cores;</div><div class='add'>+</div><div class='add'>+	bool msi_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The BTR register capabilities described by the can_bittiming_const structures</div><div class='add'>+ * below are valid since esdACC version 0x0032.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Used if the esdACC FPGA is built as CAN-Classic version. */</div><div class='add'>+static const struct can_bittiming_const pci402_bittiming_const = {</div><div class='add'>+	.name = "esd_402",</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Used if the esdACC FPGA is built as CAN-FD version. */</div><div class='add'>+static const struct can_bittiming_const pci402_bittiming_const_canfd = {</div><div class='add'>+	.name = "esd_402fd",</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 256,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops pci402_acc_netdev_ops = {</div><div class='add'>+	.ndo_open = acc_open,</div><div class='add'>+	.ndo_stop = acc_close,</div><div class='add'>+	.ndo_start_xmit = acc_start_xmit,</div><div class='add'>+	.ndo_hwtstamp_get = can_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = can_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops pci402_acc_ethtool_ops = {</div><div class='add'>+	.get_ts_info = can_ethtool_op_get_ts_info_hwts,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t pci402_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = dev_id;</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	irqreturn_t irq_status;</div><div class='add'>+</div><div class='add'>+	irq_status = acc_card_interrupt(&amp;card-&gt;ov, card-&gt;cores);</div><div class='add'>+</div><div class='add'>+	return irq_status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci402_set_msiconfig(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	u32 addr_lo_offs = 0;</div><div class='add'>+	u32 addr_lo = 0;</div><div class='add'>+	u32 addr_hi = 0;</div><div class='add'>+	u32 data = 0;</div><div class='add'>+	u16 csr = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The FPGA hard IP PCIe core implements a 64-bit MSI Capability</div><div class='add'>+	 * Register Format</div><div class='add'>+	 */</div><div class='add'>+	err = pci_read_config_word(pdev, PCI402_PCICFG_MSICAP + PCI_MSI_FLAGS, &amp;csr);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	err = pci_read_config_dword(pdev, PCI402_PCICFG_MSICAP + PCI_MSI_ADDRESS_LO,</div><div class='add'>+				    &amp;addr_lo);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed;</div><div class='add'>+	err = pci_read_config_dword(pdev, PCI402_PCICFG_MSICAP + PCI_MSI_ADDRESS_HI,</div><div class='add'>+				    &amp;addr_hi);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	err = pci_read_config_dword(pdev, PCI402_PCICFG_MSICAP + PCI_MSI_DATA_64,</div><div class='add'>+				    &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	addr_lo_offs = addr_lo &amp; 0x0000ffff;</div><div class='add'>+	addr_lo &amp;= 0xffff0000;</div><div class='add'>+</div><div class='add'>+	if (addr_hi)</div><div class='add'>+		addr_lo |= 1; /* To enable 64-Bit addressing in PCIe endpoint */</div><div class='add'>+</div><div class='add'>+	if (!(csr &amp; PCI_MSI_FLAGS_ENABLE)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite32(addr_lo, card-&gt;addr_pciep + PCI402_PCIEP_OF_MSI_ADDR_LO);</div><div class='add'>+	iowrite32(addr_hi, card-&gt;addr_pciep + PCI402_PCIEP_OF_MSI_ADDR_HI);</div><div class='add'>+	acc_ov_write32(&amp;card-&gt;ov, ACC_OV_OF_MSI_ADDRESSOFFSET, addr_lo_offs);</div><div class='add'>+	acc_ov_write32(&amp;card-&gt;ov, ACC_OV_OF_MSI_DATA, data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	pci_warn(pdev, "Error while setting MSI configuration:\n"</div><div class='add'>+		 "CSR: 0x%.4x, addr: 0x%.8x%.8x, offs: 0x%.4x, data: 0x%.8x\n",</div><div class='add'>+		 csr, addr_hi, addr_lo, addr_lo_offs, data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci402_init_card(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	card-&gt;ov.addr = card-&gt;addr + PCI402_IO_OV_OFFS;</div><div class='add'>+	card-&gt;addr_pciep = card-&gt;addr + PCI402_IO_PCIEP_OFFS;</div><div class='add'>+</div><div class='add'>+	acc_reset_fpga(&amp;card-&gt;ov);</div><div class='add'>+	acc_init_ov(&amp;card-&gt;ov, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (card-&gt;ov.version &lt; PCI402_FPGA_VER_MIN) {</div><div class='add'>+		pci_err(pdev,</div><div class='add'>+			"esdACC version (0x%.4x) outdated, please update\n",</div><div class='add'>+			card-&gt;ov.version);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (card-&gt;ov.timestamp_frequency != ACC_TS_FREQ_80MHZ) {</div><div class='add'>+		pci_err(pdev,</div><div class='add'>+			"esdACC timestamp frequency of %uHz not supported by driver. Aborted.\n",</div><div class='add'>+			card-&gt;ov.timestamp_frequency);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (card-&gt;ov.active_cores &gt; PCI402_MAX_CORES) {</div><div class='add'>+		pci_err(pdev,</div><div class='add'>+			"Card with %u active cores not supported by driver. Aborted.\n",</div><div class='add'>+			card-&gt;ov.active_cores);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	card-&gt;cores = devm_kcalloc(&amp;pdev-&gt;dev, card-&gt;ov.active_cores,</div><div class='add'>+				   sizeof(struct acc_core), GFP_KERNEL);</div><div class='add'>+	if (!card-&gt;cores)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (card-&gt;ov.features &amp; ACC_OV_REG_FEAT_MASK_CANFD) {</div><div class='add'>+		pci_warn(pdev,</div><div class='add'>+			 "esdACC with CAN-FD feature detected. This driver doesn't support CAN-FD yet.\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#ifdef __LITTLE_ENDIAN</div><div class='add'>+	/* So card converts all busmastered data to LE for us: */</div><div class='add'>+	acc_ov_set_bits(&amp;card-&gt;ov, ACC_OV_OF_MODE,</div><div class='add'>+			ACC_OV_REG_MODE_MASK_ENDIAN_LITTLE);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci402_init_interrupt(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_msi(pdev);</div><div class='add'>+	if (!err) {</div><div class='add'>+		err = pci402_set_msiconfig(pdev);</div><div class='add'>+		if (!err) {</div><div class='add'>+			card-&gt;msi_enabled = true;</div><div class='add'>+			acc_ov_set_bits(&amp;card-&gt;ov, ACC_OV_OF_MODE,</div><div class='add'>+					ACC_OV_REG_MODE_MASK_MSI_ENABLE);</div><div class='add'>+			pci_dbg(pdev, "MSI preparation done\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devm_request_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, pci402_interrupt,</div><div class='add'>+			       IRQF_SHARED, dev_name(&amp;pdev-&gt;dev), pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failure_msidis;</div><div class='add'>+</div><div class='add'>+	iowrite32(1, card-&gt;addr_pciep + PCI402_PCIEP_OF_INT_ENABLE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failure_msidis:</div><div class='add'>+	if (card-&gt;msi_enabled) {</div><div class='add'>+		acc_ov_clear_bits(&amp;card-&gt;ov, ACC_OV_OF_MODE,</div><div class='add'>+				  ACC_OV_REG_MODE_MASK_MSI_ENABLE);</div><div class='add'>+		pci_disable_msi(pdev);</div><div class='add'>+		card-&gt;msi_enabled = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pci402_finish_interrupt(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	iowrite32(0, card-&gt;addr_pciep + PCI402_PCIEP_OF_INT_ENABLE);</div><div class='add'>+	devm_free_irq(&amp;pdev-&gt;dev, pdev-&gt;irq, pdev);</div><div class='add'>+</div><div class='add'>+	if (card-&gt;msi_enabled) {</div><div class='add'>+		acc_ov_clear_bits(&amp;card-&gt;ov, ACC_OV_OF_MODE,</div><div class='add'>+				  ACC_OV_REG_MODE_MASK_MSI_ENABLE);</div><div class='add'>+		pci_disable_msi(pdev);</div><div class='add'>+		card-&gt;msi_enabled = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci402_init_dma(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dma_set_coherent_mask(&amp;pdev-&gt;dev, PCI402_DMA_MASK);</div><div class='add'>+	if (err) {</div><div class='add'>+		pci_err(pdev, "DMA set mask failed!\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The esdACC DMA engine needs the DMA buffer aligned to a 64k</div><div class='add'>+	 * boundary. The DMA API guarantees to align the returned buffer to the</div><div class='add'>+	 * smallest PAGE_SIZE order which is greater than or equal to the</div><div class='add'>+	 * requested size. With PCI402_DMA_SIZE == 64kB this suffices here.</div><div class='add'>+	 */</div><div class='add'>+	card-&gt;dma_buf = dma_alloc_coherent(&amp;pdev-&gt;dev, PCI402_DMA_SIZE,</div><div class='add'>+					   &amp;card-&gt;dma_hnd, GFP_KERNEL);</div><div class='add'>+	if (!card-&gt;dma_buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	acc_init_bm_ptr(&amp;card-&gt;ov, card-&gt;cores, card-&gt;dma_buf);</div><div class='add'>+</div><div class='add'>+	iowrite32(card-&gt;dma_hnd,</div><div class='add'>+		  card-&gt;addr_pciep + PCI402_PCIEP_OF_BM_ADDR_LO);</div><div class='add'>+	iowrite32(0, card-&gt;addr_pciep + PCI402_PCIEP_OF_BM_ADDR_HI);</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	acc_ov_set_bits(&amp;card-&gt;ov, ACC_OV_OF_MODE,</div><div class='add'>+			ACC_OV_REG_MODE_MASK_BM_ENABLE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pci402_finish_dma(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	acc_ov_clear_bits(&amp;card-&gt;ov, ACC_OV_OF_MODE,</div><div class='add'>+			  ACC_OV_REG_MODE_MASK_BM_ENABLE);</div><div class='add'>+</div><div class='add'>+	pci_clear_master(pdev);</div><div class='add'>+</div><div class='add'>+	iowrite32(0, card-&gt;addr_pciep + PCI402_PCIEP_OF_BM_ADDR_LO);</div><div class='add'>+	iowrite32(0, card-&gt;addr_pciep + PCI402_PCIEP_OF_BM_ADDR_HI);</div><div class='add'>+</div><div class='add'>+	card-&gt;ov.bmfifo.messages = NULL;</div><div class='add'>+	card-&gt;ov.bmfifo.irq_cnt = NULL;</div><div class='add'>+	for (i = 0; i &lt; card-&gt;ov.active_cores; i++) {</div><div class='add'>+		struct acc_core *core = &amp;card-&gt;cores[i];</div><div class='add'>+</div><div class='add'>+		core-&gt;bmfifo.messages = NULL;</div><div class='add'>+		core-&gt;bmfifo.irq_cnt = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, PCI402_DMA_SIZE, card-&gt;dma_buf,</div><div class='add'>+			  card-&gt;dma_hnd);</div><div class='add'>+	card-&gt;dma_buf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pci402_unregister_core(struct acc_core *core)</div><div class='add'>+{</div><div class='add'>+	netdev_info(core-&gt;netdev, "unregister\n");</div><div class='add'>+	unregister_candev(core-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	free_candev(core-&gt;netdev);</div><div class='add'>+	core-&gt;netdev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci402_init_cores(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; card-&gt;ov.active_cores; i++) {</div><div class='add'>+		struct acc_core *core = &amp;card-&gt;cores[i];</div><div class='add'>+		struct acc_net_priv *priv;</div><div class='add'>+		struct net_device *netdev;</div><div class='add'>+		u32 fifo_config;</div><div class='add'>+</div><div class='add'>+		core-&gt;addr = card-&gt;ov.addr + (i + 1) * PCI402_IO_LEN_CORE;</div><div class='add'>+</div><div class='add'>+		fifo_config = acc_read32(core, ACC_CORE_OF_TXFIFO_CONFIG);</div><div class='add'>+		core-&gt;tx_fifo_size = (fifo_config &gt;&gt; 24);</div><div class='add'>+		if (core-&gt;tx_fifo_size &lt;= 1) {</div><div class='add'>+			pci_err(pdev, "Invalid tx_fifo_size!\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev = alloc_candev(sizeof(*priv), core-&gt;tx_fifo_size);</div><div class='add'>+		if (!netdev) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+		core-&gt;netdev = netdev;</div><div class='add'>+</div><div class='add'>+		netdev-&gt;flags |= IFF_ECHO;</div><div class='add'>+		netdev-&gt;dev_port = i;</div><div class='add'>+		netdev-&gt;netdev_ops = &amp;pci402_acc_netdev_ops;</div><div class='add'>+		netdev-&gt;ethtool_ops = &amp;pci402_acc_ethtool_ops;</div><div class='add'>+		SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+		priv = netdev_priv(netdev);</div><div class='add'>+		priv-&gt;can.clock.freq = card-&gt;ov.core_frequency;</div><div class='add'>+		priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='add'>+			CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+			CAN_CTRLMODE_BERR_REPORTING |</div><div class='add'>+			CAN_CTRLMODE_CC_LEN8_DLC;</div><div class='add'>+		if (card-&gt;ov.features &amp; ACC_OV_REG_FEAT_MASK_DAR)</div><div class='add'>+			priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_ONE_SHOT;</div><div class='add'>+		if (card-&gt;ov.features &amp; ACC_OV_REG_FEAT_MASK_CANFD)</div><div class='add'>+			priv-&gt;can.bittiming_const = &amp;pci402_bittiming_const_canfd;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;can.bittiming_const = &amp;pci402_bittiming_const;</div><div class='add'>+		priv-&gt;can.do_set_bittiming = acc_set_bittiming;</div><div class='add'>+		priv-&gt;can.do_set_mode = acc_set_mode;</div><div class='add'>+		priv-&gt;can.do_get_berr_counter = acc_get_berr_counter;</div><div class='add'>+</div><div class='add'>+		priv-&gt;core = core;</div><div class='add'>+		priv-&gt;ov = &amp;card-&gt;ov;</div><div class='add'>+</div><div class='add'>+		err = register_candev(netdev);</div><div class='add'>+		if (err) {</div><div class='add'>+			free_candev(core-&gt;netdev);</div><div class='add'>+			core-&gt;netdev = NULL;</div><div class='add'>+			goto failure;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev_info(netdev, "registered\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failure:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		pci402_unregister_core(&amp;card-&gt;cores[i]);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pci402_finish_cores(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; card-&gt;ov.active_cores; i++)</div><div class='add'>+		pci402_unregister_core(&amp;card-&gt;cores[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pci402_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	card = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*card), GFP_KERNEL);</div><div class='add'>+	if (!card) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto failure_disable_pci;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, card);</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdev, pci_name(pdev));</div><div class='add'>+	if (err)</div><div class='add'>+		goto failure_disable_pci;</div><div class='add'>+</div><div class='add'>+	card-&gt;addr = pci_iomap(pdev, PCI402_BAR, PCI402_IO_LEN_TOTAL);</div><div class='add'>+	if (!card-&gt;addr) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto failure_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci402_init_card(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failure_unmap;</div><div class='add'>+</div><div class='add'>+	err = pci402_init_dma(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failure_unmap;</div><div class='add'>+</div><div class='add'>+	err = pci402_init_interrupt(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failure_finish_dma;</div><div class='add'>+</div><div class='add'>+	err = pci402_init_cores(pdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto failure_finish_interrupt;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failure_finish_interrupt:</div><div class='add'>+	pci402_finish_interrupt(pdev);</div><div class='add'>+</div><div class='add'>+failure_finish_dma:</div><div class='add'>+	pci402_finish_dma(pdev);</div><div class='add'>+</div><div class='add'>+failure_unmap:</div><div class='add'>+	pci_iounmap(pdev, card-&gt;addr);</div><div class='add'>+</div><div class='add'>+failure_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+</div><div class='add'>+failure_disable_pci:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pci402_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pci402_card *card = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	pci402_finish_interrupt(pdev);</div><div class='add'>+	pci402_finish_cores(pdev);</div><div class='add'>+	pci402_finish_dma(pdev);</div><div class='add'>+	pci_iounmap(pdev, card-&gt;addr);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id pci402_tbl[] = {</div><div class='add'>+	{</div><div class='add'>+		.vendor = PCI_VENDOR_ID_ESDGMBH,</div><div class='add'>+		.device = ESD_PCI_DEVICE_ID_PCIE402,</div><div class='add'>+		.subvendor = PCI_VENDOR_ID_ESDGMBH,</div><div class='add'>+		.subdevice = PCI_ANY_ID,</div><div class='add'>+	},</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pci402_tbl);</div><div class='add'>+</div><div class='add'>+static struct pci_driver pci402_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.id_table = pci402_tbl,</div><div class='add'>+	.probe = pci402_probe,</div><div class='add'>+	.remove = pci402_remove,</div><div class='add'>+};</div><div class='add'>+module_pci_driver(pci402_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Socket-CAN driver for esd CAN 402 card family with esdACC core on PCIe");</div><div class='add'>+MODULE_AUTHOR("Thomas Körper &lt;socketcan@esd.eu&gt;");</div><div class='add'>+MODULE_AUTHOR("Stefan Mätje &lt;stefan.maetje@esd.eu&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/can/esd/esdacc.c b/drivers/net/can/esd/esdacc.c<br/>new file mode 100644<br/>index 000000000000..73e66f9a3781<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/esd/esdacc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/esd/esdacc.c</a></div><div class='hunk'>@@ -0,0 +1,769 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2015 - 2016 Thomas Körper, esd electronic system design gmbh</div><div class='add'>+ * Copyright (C) 2017 - 2023 Stefan Mätje, esd electronics gmbh</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "esdacc.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='add'>+</div><div class='add'>+/* esdACC ID register layout */</div><div class='add'>+#define ACC_ID_ID_MASK GENMASK(28, 0)</div><div class='add'>+#define ACC_ID_EFF_FLAG BIT(29)</div><div class='add'>+</div><div class='add'>+/* esdACC DLC register layout */</div><div class='add'>+#define ACC_DLC_DLC_MASK GENMASK(3, 0)</div><div class='add'>+#define ACC_DLC_RTR_FLAG BIT(4)</div><div class='add'>+#define ACC_DLC_SSTX_FLAG BIT(24)	/* Single Shot TX */</div><div class='add'>+</div><div class='add'>+/* esdACC DLC in struct acc_bmmsg_rxtxdone::acc_dlc.len only! */</div><div class='add'>+#define ACC_DLC_TXD_FLAG BIT(5)</div><div class='add'>+</div><div class='add'>+/* ecc value of esdACC equals SJA1000's ECC register */</div><div class='add'>+#define ACC_ECC_SEG 0x1f</div><div class='add'>+#define ACC_ECC_DIR 0x20</div><div class='add'>+#define ACC_ECC_BIT 0x00</div><div class='add'>+#define ACC_ECC_FORM 0x40</div><div class='add'>+#define ACC_ECC_STUFF 0x80</div><div class='add'>+#define ACC_ECC_MASK 0xc0</div><div class='add'>+</div><div class='add'>+/* esdACC Status Register bits. Unused bits not documented. */</div><div class='add'>+#define ACC_REG_STATUS_MASK_STATUS_ES BIT(17)</div><div class='add'>+#define ACC_REG_STATUS_MASK_STATUS_EP BIT(18)</div><div class='add'>+#define ACC_REG_STATUS_MASK_STATUS_BS BIT(19)</div><div class='add'>+</div><div class='add'>+/* esdACC Overview Module BM_IRQ_Mask register related defines */</div><div class='add'>+/*   Two bit wide command masks to mask or unmask a single core IRQ */</div><div class='add'>+#define ACC_BM_IRQ_UNMASK BIT(0)</div><div class='add'>+#define ACC_BM_IRQ_MASK (ACC_BM_IRQ_UNMASK &lt;&lt; 1)</div><div class='add'>+/*   Command to unmask all IRQ sources. Created by shifting</div><div class='add'>+ *   and oring the two bit wide ACC_BM_IRQ_UNMASK 16 times.</div><div class='add'>+ */</div><div class='add'>+#define ACC_BM_IRQ_UNMASK_ALL 0x55555555U</div><div class='add'>+</div><div class='add'>+static void acc_resetmode_enter(struct acc_core *core)</div><div class='add'>+{</div><div class='add'>+	acc_set_bits(core, ACC_CORE_OF_CTRL,</div><div class='add'>+		     ACC_REG_CTRL_MASK_RESETMODE);</div><div class='add'>+</div><div class='add'>+	/* Read back reset mode bit to flush PCI write posting */</div><div class='add'>+	acc_resetmode_entered(core);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acc_resetmode_leave(struct acc_core *core)</div><div class='add'>+{</div><div class='add'>+	acc_clear_bits(core, ACC_CORE_OF_CTRL,</div><div class='add'>+		       ACC_REG_CTRL_MASK_RESETMODE);</div><div class='add'>+</div><div class='add'>+	/* Read back reset mode bit to flush PCI write posting */</div><div class='add'>+	acc_resetmode_entered(core);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void acc_txq_put(struct acc_core *core, u32 acc_id, u32 acc_dlc,</div><div class='add'>+			const void *data)</div><div class='add'>+{</div><div class='add'>+	acc_write32_noswap(core, ACC_CORE_OF_TXFIFO_DATA_1,</div><div class='add'>+			   *((const u32 *)(data + 4)));</div><div class='add'>+	acc_write32_noswap(core, ACC_CORE_OF_TXFIFO_DATA_0,</div><div class='add'>+			   *((const u32 *)data));</div><div class='add'>+	acc_write32(core, ACC_CORE_OF_TXFIFO_DLC, acc_dlc);</div><div class='add'>+	/* CAN id must be written at last. This write starts TX. */</div><div class='add'>+	acc_write32(core, ACC_CORE_OF_TXFIFO_ID, acc_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 acc_tx_fifo_next(struct acc_core *core, u8 tx_fifo_idx)</div><div class='add'>+{</div><div class='add'>+	++tx_fifo_idx;</div><div class='add'>+	if (tx_fifo_idx &gt;= core-&gt;tx_fifo_size)</div><div class='add'>+		tx_fifo_idx = 0U;</div><div class='add'>+	return tx_fifo_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Convert timestamp from esdACC time stamp ticks to ns</div><div class='add'>+ *</div><div class='add'>+ * The conversion factor ts2ns from time stamp counts to ns is basically</div><div class='add'>+ *	ts2ns = NSEC_PER_SEC / timestamp_frequency</div><div class='add'>+ *</div><div class='add'>+ * We handle here only a fixed timestamp frequency of 80MHz. The</div><div class='add'>+ * resulting ts2ns factor would be 12.5.</div><div class='add'>+ *</div><div class='add'>+ * At the end we multiply by 12 and add the half of the HW timestamp</div><div class='add'>+ * to get a multiplication by 12.5. This way any overflow is</div><div class='add'>+ * avoided until ktime_t itself overflows.</div><div class='add'>+ */</div><div class='add'>+#define ACC_TS_FACTOR (NSEC_PER_SEC / ACC_TS_FREQ_80MHZ)</div><div class='add'>+#define ACC_TS_80MHZ_SHIFT 1</div><div class='add'>+</div><div class='add'>+static ktime_t acc_ts2ktime(struct acc_ov *ov, u64 ts)</div><div class='add'>+{</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	ns = (ts * ACC_TS_FACTOR) + (ts &gt;&gt; ACC_TS_80MHZ_SHIFT);</div><div class='add'>+</div><div class='add'>+	return ns_to_ktime(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef ACC_TS_FACTOR</div><div class='add'>+#undef ACC_TS_80MHZ_SHIFT</div><div class='add'>+</div><div class='add'>+void acc_init_ov(struct acc_ov *ov, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 temp;</div><div class='add'>+</div><div class='add'>+	temp = acc_ov_read32(ov, ACC_OV_OF_VERSION);</div><div class='add'>+	ov-&gt;version = temp;</div><div class='add'>+	ov-&gt;features = (temp &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+	temp = acc_ov_read32(ov, ACC_OV_OF_INFO);</div><div class='add'>+	ov-&gt;total_cores = temp;</div><div class='add'>+	ov-&gt;active_cores = (temp &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	ov-&gt;core_frequency = acc_ov_read32(ov, ACC_OV_OF_CANCORE_FREQ);</div><div class='add'>+	ov-&gt;timestamp_frequency = acc_ov_read32(ov, ACC_OV_OF_TS_FREQ_LO);</div><div class='add'>+</div><div class='add'>+	/* Depending on esdACC feature NEW_PSC enable the new prescaler</div><div class='add'>+	 * or adjust core_frequency according to the implicit division by 2.</div><div class='add'>+	 */</div><div class='add'>+	if (ov-&gt;features &amp; ACC_OV_REG_FEAT_MASK_NEW_PSC) {</div><div class='add'>+		acc_ov_set_bits(ov, ACC_OV_OF_MODE,</div><div class='add'>+				ACC_OV_REG_MODE_MASK_NEW_PSC_ENABLE);</div><div class='add'>+	} else {</div><div class='add'>+		ov-&gt;core_frequency /= 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev,</div><div class='add'>+		"esdACC v%u, freq: %u/%u, feat/strap: 0x%x/0x%x, cores: %u/%u\n",</div><div class='add'>+		ov-&gt;version, ov-&gt;core_frequency, ov-&gt;timestamp_frequency,</div><div class='add'>+		ov-&gt;features, acc_ov_read32(ov, ACC_OV_OF_INFO) &gt;&gt; 16,</div><div class='add'>+		ov-&gt;active_cores, ov-&gt;total_cores);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void acc_init_bm_ptr(struct acc_ov *ov, struct acc_core *cores, const void *mem)</div><div class='add'>+{</div><div class='add'>+	unsigned int u;</div><div class='add'>+</div><div class='add'>+	/* DMA buffer layout as follows where N is the number of CAN cores</div><div class='add'>+	 * implemented in the FPGA, i.e. N = ov-&gt;total_cores</div><div class='add'>+	 *</div><div class='add'>+	 *  Section Layout           Section size</div><div class='add'>+	 * ----------------------------------------------</div><div class='add'>+	 *  FIFO Card/Overview	     ACC_CORE_DMABUF_SIZE</div><div class='add'>+	 *  FIFO Core0               ACC_CORE_DMABUF_SIZE</div><div class='add'>+	 *  ...                      ...</div><div class='add'>+	 *  FIFO CoreN               ACC_CORE_DMABUF_SIZE</div><div class='add'>+	 *  irq_cnt Card/Overview    sizeof(u32)</div><div class='add'>+	 *  irq_cnt Core0            sizeof(u32)</div><div class='add'>+	 *  ...                      ...</div><div class='add'>+	 *  irq_cnt CoreN            sizeof(u32)</div><div class='add'>+	 */</div><div class='add'>+	ov-&gt;bmfifo.messages = mem;</div><div class='add'>+	ov-&gt;bmfifo.irq_cnt = mem + (ov-&gt;total_cores + 1U) * ACC_CORE_DMABUF_SIZE;</div><div class='add'>+</div><div class='add'>+	for (u = 0U; u &lt; ov-&gt;active_cores; u++) {</div><div class='add'>+		struct acc_core *core = &amp;cores[u];</div><div class='add'>+</div><div class='add'>+		core-&gt;bmfifo.messages = mem + (u + 1U) * ACC_CORE_DMABUF_SIZE;</div><div class='add'>+		core-&gt;bmfifo.irq_cnt = ov-&gt;bmfifo.irq_cnt + (u + 1U);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acc_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct acc_core *core = priv-&gt;core;</div><div class='add'>+	u32 tx_fifo_status;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Retry to enter RESET mode if out of sync. */</div><div class='add'>+	if (priv-&gt;can.state != CAN_STATE_STOPPED) {</div><div class='add'>+		netdev_warn(netdev, "Entered %s() with bad can.state: %s\n",</div><div class='add'>+			    __func__, can_get_state_str(priv-&gt;can.state));</div><div class='add'>+		acc_resetmode_enter(core);</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = open_candev(netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ctrl = ACC_REG_CTRL_MASK_IE_RXTX |</div><div class='add'>+		ACC_REG_CTRL_MASK_IE_TXERROR |</div><div class='add'>+		ACC_REG_CTRL_MASK_IE_ERRWARN |</div><div class='add'>+		ACC_REG_CTRL_MASK_IE_OVERRUN |</div><div class='add'>+		ACC_REG_CTRL_MASK_IE_ERRPASS;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		ctrl |= ACC_REG_CTRL_MASK_IE_BUSERR;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		ctrl |= ACC_REG_CTRL_MASK_LOM;</div><div class='add'>+</div><div class='add'>+	acc_set_bits(core, ACC_CORE_OF_CTRL, ctrl);</div><div class='add'>+</div><div class='add'>+	acc_resetmode_leave(core);</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	/* Resync TX FIFO indices to HW state after (re-)start. */</div><div class='add'>+	tx_fifo_status = acc_read32(core, ACC_CORE_OF_TXFIFO_STATUS);</div><div class='add'>+	core-&gt;tx_fifo_head = tx_fifo_status &amp; 0xff;</div><div class='add'>+	core-&gt;tx_fifo_tail = (tx_fifo_status &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acc_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct acc_core *core = priv-&gt;core;</div><div class='add'>+</div><div class='add'>+	acc_clear_bits(core, ACC_CORE_OF_CTRL,</div><div class='add'>+		       ACC_REG_CTRL_MASK_IE_RXTX |</div><div class='add'>+		       ACC_REG_CTRL_MASK_IE_TXERROR |</div><div class='add'>+		       ACC_REG_CTRL_MASK_IE_ERRWARN |</div><div class='add'>+		       ACC_REG_CTRL_MASK_IE_OVERRUN |</div><div class='add'>+		       ACC_REG_CTRL_MASK_IE_ERRPASS |</div><div class='add'>+		       ACC_REG_CTRL_MASK_IE_BUSERR);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	acc_resetmode_enter(core);</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	/* Mark pending TX requests to be aborted after controller restart. */</div><div class='add'>+	acc_write32(core, ACC_CORE_OF_TX_ABORT_MASK, 0xffff);</div><div class='add'>+</div><div class='add'>+	/* ACC_REG_CTRL_MASK_LOM is only accessible in RESET mode */</div><div class='add'>+	acc_clear_bits(core, ACC_CORE_OF_CTRL,</div><div class='add'>+		       ACC_REG_CTRL_MASK_LOM);</div><div class='add'>+</div><div class='add'>+	close_candev(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netdev_tx_t acc_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct acc_core *core = priv-&gt;core;</div><div class='add'>+	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	u8 tx_fifo_head = core-&gt;tx_fifo_head;</div><div class='add'>+	int fifo_usage;</div><div class='add'>+	u32 acc_id;</div><div class='add'>+	u32 acc_dlc;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	/* Access core-&gt;tx_fifo_tail only once because it may be changed</div><div class='add'>+	 * from the interrupt level.</div><div class='add'>+	 */</div><div class='add'>+	fifo_usage = tx_fifo_head - core-&gt;tx_fifo_tail;</div><div class='add'>+	if (fifo_usage &lt; 0)</div><div class='add'>+		fifo_usage += core-&gt;tx_fifo_size;</div><div class='add'>+</div><div class='add'>+	if (fifo_usage &gt;= core-&gt;tx_fifo_size - 1) {</div><div class='add'>+		netdev_err(core-&gt;netdev,</div><div class='add'>+			   "BUG: TX ring full when queue awake!\n");</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fifo_usage == core-&gt;tx_fifo_size - 2)</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	acc_dlc = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		acc_dlc |= ACC_DLC_RTR_FLAG;</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		acc_dlc |= ACC_DLC_SSTX_FLAG;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		acc_id = cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+		acc_id |= ACC_ID_EFF_FLAG;</div><div class='add'>+	} else {</div><div class='add'>+		acc_id = cf-&gt;can_id &amp; CAN_SFF_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, netdev, core-&gt;tx_fifo_head, 0);</div><div class='add'>+</div><div class='add'>+	core-&gt;tx_fifo_head = acc_tx_fifo_next(core, tx_fifo_head);</div><div class='add'>+</div><div class='add'>+	acc_txq_put(core, acc_id, acc_dlc, cf-&gt;data);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acc_get_berr_counter(const struct net_device *netdev,</div><div class='add'>+			 struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	u32 core_status = acc_read32(priv-&gt;core, ACC_CORE_OF_STATUS);</div><div class='add'>+</div><div class='add'>+	bec-&gt;txerr = (core_status &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	bec-&gt;rxerr = core_status &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acc_set_mode(struct net_device *netdev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		/* Paranoid FIFO index check. */</div><div class='add'>+		{</div><div class='add'>+			const u32 tx_fifo_status =</div><div class='add'>+				acc_read32(priv-&gt;core, ACC_CORE_OF_TXFIFO_STATUS);</div><div class='add'>+			const u8 hw_fifo_head = tx_fifo_status;</div><div class='add'>+</div><div class='add'>+			if (hw_fifo_head != priv-&gt;core-&gt;tx_fifo_head ||</div><div class='add'>+			    hw_fifo_head != priv-&gt;core-&gt;tx_fifo_tail) {</div><div class='add'>+				netdev_warn(netdev,</div><div class='add'>+					    "TX FIFO mismatch: T %2u H %2u; TFHW %#08x\n",</div><div class='add'>+					    priv-&gt;core-&gt;tx_fifo_tail,</div><div class='add'>+					    priv-&gt;core-&gt;tx_fifo_head,</div><div class='add'>+					    tx_fifo_status);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		acc_resetmode_leave(priv-&gt;core);</div><div class='add'>+		/* To leave the bus-off state the esdACC controller begins</div><div class='add'>+		 * here a grace period where it counts 128 "idle conditions" (each</div><div class='add'>+		 * of 11 consecutive recessive bits) on the bus as required</div><div class='add'>+		 * by the CAN spec.</div><div class='add'>+		 *</div><div class='add'>+		 * During this time the TX FIFO may still contain already</div><div class='add'>+		 * aborted "zombie" frames that are only drained from the FIFO</div><div class='add'>+		 * at the end of the grace period.</div><div class='add'>+		 *</div><div class='add'>+		 * To not to interfere with this drain process we don't</div><div class='add'>+		 * call netif_wake_queue() here. When the controller reaches</div><div class='add'>+		 * the error-active state again, it informs us about that</div><div class='add'>+		 * with an acc_bmmsg_errstatechange message. Then</div><div class='add'>+		 * netif_wake_queue() is called from</div><div class='add'>+		 * handle_core_msg_errstatechange() instead.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int acc_set_bittiming(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	u32 brp;</div><div class='add'>+	u32 btr;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ov-&gt;features &amp; ACC_OV_REG_FEAT_MASK_CANFD) {</div><div class='add'>+		u32 fbtr = 0;</div><div class='add'>+</div><div class='add'>+		netdev_dbg(netdev, "bit timing: brp %u, prop %u, ph1 %u ph2 %u, sjw %u\n",</div><div class='add'>+			   bt-&gt;brp, bt-&gt;prop_seg,</div><div class='add'>+			   bt-&gt;phase_seg1, bt-&gt;phase_seg2, bt-&gt;sjw);</div><div class='add'>+</div><div class='add'>+		brp = FIELD_PREP(ACC_REG_BRP_FD_MASK_BRP, bt-&gt;brp - 1);</div><div class='add'>+</div><div class='add'>+		btr = FIELD_PREP(ACC_REG_BTR_FD_MASK_TSEG1, bt-&gt;phase_seg1 + bt-&gt;prop_seg - 1);</div><div class='add'>+		btr |= FIELD_PREP(ACC_REG_BTR_FD_MASK_TSEG2, bt-&gt;phase_seg2 - 1);</div><div class='add'>+		btr |= FIELD_PREP(ACC_REG_BTR_FD_MASK_SJW, bt-&gt;sjw - 1);</div><div class='add'>+</div><div class='add'>+		/* Keep order of accesses to ACC_CORE_OF_BRP and ACC_CORE_OF_BTR. */</div><div class='add'>+		acc_write32(priv-&gt;core, ACC_CORE_OF_BRP, brp);</div><div class='add'>+		acc_write32(priv-&gt;core, ACC_CORE_OF_BTR, btr);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(netdev, "esdACC: BRP %u, NBTR 0x%08x, DBTR 0x%08x",</div><div class='add'>+			   brp, btr, fbtr);</div><div class='add'>+	} else {</div><div class='add'>+		netdev_dbg(netdev, "bit timing: brp %u, prop %u, ph1 %u ph2 %u, sjw %u\n",</div><div class='add'>+			   bt-&gt;brp, bt-&gt;prop_seg,</div><div class='add'>+			   bt-&gt;phase_seg1, bt-&gt;phase_seg2, bt-&gt;sjw);</div><div class='add'>+</div><div class='add'>+		brp = FIELD_PREP(ACC_REG_BRP_CL_MASK_BRP, bt-&gt;brp - 1);</div><div class='add'>+</div><div class='add'>+		btr = FIELD_PREP(ACC_REG_BTR_CL_MASK_TSEG1, bt-&gt;phase_seg1 + bt-&gt;prop_seg - 1);</div><div class='add'>+		btr |= FIELD_PREP(ACC_REG_BTR_CL_MASK_TSEG2, bt-&gt;phase_seg2 - 1);</div><div class='add'>+		btr |= FIELD_PREP(ACC_REG_BTR_CL_MASK_SJW, bt-&gt;sjw - 1);</div><div class='add'>+</div><div class='add'>+		/* Keep order of accesses to ACC_CORE_OF_BRP and ACC_CORE_OF_BTR. */</div><div class='add'>+		acc_write32(priv-&gt;core, ACC_CORE_OF_BRP, brp);</div><div class='add'>+		acc_write32(priv-&gt;core, ACC_CORE_OF_BTR, btr);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(netdev, "esdACC: BRP %u, BTR 0x%08x", brp, btr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_core_msg_rxtxdone(struct acc_core *core,</div><div class='add'>+				     const struct acc_bmmsg_rxtxdone *msg)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(core-&gt;netdev);</div><div class='add'>+	struct net_device_stats *stats = &amp;core-&gt;netdev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (msg-&gt;acc_dlc.len &amp; ACC_DLC_TXD_FLAG) {</div><div class='add'>+		u8 tx_fifo_tail = core-&gt;tx_fifo_tail;</div><div class='add'>+</div><div class='add'>+		if (core-&gt;tx_fifo_head == tx_fifo_tail) {</div><div class='add'>+			netdev_warn(core-&gt;netdev,</div><div class='add'>+				    "TX interrupt, but queue is empty!?\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Direct access echo skb to attach HW time stamp. */</div><div class='add'>+		skb = priv-&gt;can.echo_skb[tx_fifo_tail];</div><div class='add'>+		if (skb) {</div><div class='add'>+			skb_hwtstamps(skb)-&gt;hwtstamp =</div><div class='add'>+				acc_ts2ktime(priv-&gt;ov, msg-&gt;ts);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(core-&gt;netdev, tx_fifo_tail,</div><div class='add'>+						    NULL);</div><div class='add'>+</div><div class='add'>+		core-&gt;tx_fifo_tail = acc_tx_fifo_next(core, tx_fifo_tail);</div><div class='add'>+</div><div class='add'>+		netif_wake_queue(core-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+		skb = alloc_can_skb(core-&gt;netdev, &amp;cf);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cf-&gt;can_id = msg-&gt;id &amp; ACC_ID_ID_MASK;</div><div class='add'>+		if (msg-&gt;id &amp; ACC_ID_EFF_FLAG)</div><div class='add'>+			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+</div><div class='add'>+		can_frame_set_cc_len(cf, msg-&gt;acc_dlc.len &amp; ACC_DLC_DLC_MASK,</div><div class='add'>+				     priv-&gt;can.ctrlmode);</div><div class='add'>+</div><div class='add'>+		if (msg-&gt;acc_dlc.len &amp; ACC_DLC_RTR_FLAG) {</div><div class='add'>+			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(cf-&gt;data, msg-&gt;data, cf-&gt;len);</div><div class='add'>+			stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+		}</div><div class='add'>+		stats-&gt;rx_packets++;</div><div class='add'>+</div><div class='add'>+		skb_hwtstamps(skb)-&gt;hwtstamp = acc_ts2ktime(priv-&gt;ov, msg-&gt;ts);</div><div class='add'>+</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_core_msg_txabort(struct acc_core *core,</div><div class='add'>+				    const struct acc_bmmsg_txabort *msg)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;core-&gt;netdev-&gt;stats;</div><div class='add'>+	u8 tx_fifo_tail = core-&gt;tx_fifo_tail;</div><div class='add'>+	u32 abort_mask = msg-&gt;abort_mask;   /* u32 extend to avoid warnings later */</div><div class='add'>+</div><div class='add'>+	/* The abort_mask shows which frames were aborted in esdACC's FIFO. */</div><div class='add'>+	while (tx_fifo_tail != core-&gt;tx_fifo_head &amp;&amp; (abort_mask)) {</div><div class='add'>+		const u32 tail_mask = (1U &lt;&lt; tx_fifo_tail);</div><div class='add'>+</div><div class='add'>+		if (!(abort_mask &amp; tail_mask))</div><div class='add'>+			break;</div><div class='add'>+		abort_mask &amp;= ~tail_mask;</div><div class='add'>+</div><div class='add'>+		can_free_echo_skb(core-&gt;netdev, tx_fifo_tail, NULL);</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+		stats-&gt;tx_aborted_errors++;</div><div class='add'>+</div><div class='add'>+		tx_fifo_tail = acc_tx_fifo_next(core, tx_fifo_tail);</div><div class='add'>+	}</div><div class='add'>+	core-&gt;tx_fifo_tail = tx_fifo_tail;</div><div class='add'>+	if (abort_mask)</div><div class='add'>+		netdev_warn(core-&gt;netdev, "Unhandled aborted messages\n");</div><div class='add'>+</div><div class='add'>+	if (!acc_resetmode_entered(core))</div><div class='add'>+		netif_wake_queue(core-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_core_msg_overrun(struct acc_core *core,</div><div class='add'>+				    const struct acc_bmmsg_overrun *msg)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(core-&gt;netdev);</div><div class='add'>+	struct net_device_stats *stats = &amp;core-&gt;netdev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* lost_cnt may be 0 if not supported by esdACC version */</div><div class='add'>+	if (msg-&gt;lost_cnt) {</div><div class='add'>+		stats-&gt;rx_errors += msg-&gt;lost_cnt;</div><div class='add'>+		stats-&gt;rx_over_errors += msg-&gt;lost_cnt;</div><div class='add'>+	} else {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		stats-&gt;rx_over_errors++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(core-&gt;netdev, &amp;cf);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	skb_hwtstamps(skb)-&gt;hwtstamp = acc_ts2ktime(priv-&gt;ov, msg-&gt;ts);</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_core_msg_buserr(struct acc_core *core,</div><div class='add'>+				   const struct acc_bmmsg_buserr *msg)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(core-&gt;netdev);</div><div class='add'>+	struct net_device_stats *stats = &amp;core-&gt;netdev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	const u32 reg_status = msg-&gt;reg_status;</div><div class='add'>+	const u8 rxerr = reg_status;</div><div class='add'>+	const u8 txerr = (reg_status &gt;&gt; 8);</div><div class='add'>+	u8 can_err_prot_type = 0U;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+</div><div class='add'>+	/* Error occurred during transmission? */</div><div class='add'>+	if (msg-&gt;ecc &amp; ACC_ECC_DIR) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+	} else {</div><div class='add'>+		can_err_prot_type |= CAN_ERR_PROT_TX;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+	}</div><div class='add'>+	/* Determine error type */</div><div class='add'>+	switch (msg-&gt;ecc &amp; ACC_ECC_MASK) {</div><div class='add'>+	case ACC_ECC_BIT:</div><div class='add'>+		can_err_prot_type |= CAN_ERR_PROT_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case ACC_ECC_FORM:</div><div class='add'>+		can_err_prot_type |= CAN_ERR_PROT_FORM;</div><div class='add'>+		break;</div><div class='add'>+	case ACC_ECC_STUFF:</div><div class='add'>+		can_err_prot_type |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		can_err_prot_type |= CAN_ERR_PROT_UNSPEC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(core-&gt;netdev, &amp;cf);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR | CAN_ERR_CNT;</div><div class='add'>+</div><div class='add'>+	/* Set protocol error type */</div><div class='add'>+	cf-&gt;data[2] = can_err_prot_type;</div><div class='add'>+	/* Set error location */</div><div class='add'>+	cf-&gt;data[3] = msg-&gt;ecc &amp; ACC_ECC_SEG;</div><div class='add'>+</div><div class='add'>+	/* Insert CAN TX and RX error counters. */</div><div class='add'>+	cf-&gt;data[6] = txerr;</div><div class='add'>+	cf-&gt;data[7] = rxerr;</div><div class='add'>+</div><div class='add'>+	skb_hwtstamps(skb)-&gt;hwtstamp = acc_ts2ktime(priv-&gt;ov, msg-&gt;ts);</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+handle_core_msg_errstatechange(struct acc_core *core,</div><div class='add'>+			       const struct acc_bmmsg_errstatechange *msg)</div><div class='add'>+{</div><div class='add'>+	struct acc_net_priv *priv = netdev_priv(core-&gt;netdev);</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	const u32 reg_status = msg-&gt;reg_status;</div><div class='add'>+	const u8 rxerr = reg_status;</div><div class='add'>+	const u8 txerr = (reg_status &gt;&gt; 8);</div><div class='add'>+	enum can_state new_state;</div><div class='add'>+</div><div class='add'>+	if (reg_status &amp; ACC_REG_STATUS_MASK_STATUS_BS) {</div><div class='add'>+		new_state = CAN_STATE_BUS_OFF;</div><div class='add'>+	} else if (reg_status &amp; ACC_REG_STATUS_MASK_STATUS_EP) {</div><div class='add'>+		new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	} else if (reg_status &amp; ACC_REG_STATUS_MASK_STATUS_ES) {</div><div class='add'>+		new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+	} else {</div><div class='add'>+		new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		if (priv-&gt;can.state == CAN_STATE_BUS_OFF) {</div><div class='add'>+			/* See comment in acc_set_mode() for CAN_MODE_START */</div><div class='add'>+			netif_wake_queue(core-&gt;netdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(core-&gt;netdev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	if (new_state != priv-&gt;can.state) {</div><div class='add'>+		enum can_state tx_state, rx_state;</div><div class='add'>+</div><div class='add'>+		tx_state = (txerr &gt;= rxerr) ?</div><div class='add'>+			new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		rx_state = (rxerr &gt;= txerr) ?</div><div class='add'>+			new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+		/* Always call can_change_state() to update the state</div><div class='add'>+		 * even if alloc_can_err_skb() may have failed.</div><div class='add'>+		 * can_change_state() can cope with a NULL cf pointer.</div><div class='add'>+		 */</div><div class='add'>+		can_change_state(core-&gt;netdev, cf, tx_state, rx_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = txerr;</div><div class='add'>+		cf-&gt;data[7] = rxerr;</div><div class='add'>+</div><div class='add'>+		skb_hwtstamps(skb)-&gt;hwtstamp = acc_ts2ktime(priv-&gt;ov, msg-&gt;ts);</div><div class='add'>+</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		acc_write32(core, ACC_CORE_OF_TX_ABORT_MASK, 0xffff);</div><div class='add'>+		can_bus_off(core-&gt;netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void handle_core_interrupt(struct acc_core *core)</div><div class='add'>+{</div><div class='add'>+	u32 msg_fifo_head = core-&gt;bmfifo.local_irq_cnt &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	while (core-&gt;bmfifo.msg_fifo_tail != msg_fifo_head) {</div><div class='add'>+		const union acc_bmmsg *msg =</div><div class='add'>+			&amp;core-&gt;bmfifo.messages[core-&gt;bmfifo.msg_fifo_tail];</div><div class='add'>+</div><div class='add'>+		switch (msg-&gt;msg_id) {</div><div class='add'>+		case BM_MSG_ID_RXTXDONE:</div><div class='add'>+			handle_core_msg_rxtxdone(core, &amp;msg-&gt;rxtxdone);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case BM_MSG_ID_TXABORT:</div><div class='add'>+			handle_core_msg_txabort(core, &amp;msg-&gt;txabort);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case BM_MSG_ID_OVERRUN:</div><div class='add'>+			handle_core_msg_overrun(core, &amp;msg-&gt;overrun);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case BM_MSG_ID_BUSERR:</div><div class='add'>+			handle_core_msg_buserr(core, &amp;msg-&gt;buserr);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case BM_MSG_ID_ERRPASSIVE:</div><div class='add'>+		case BM_MSG_ID_ERRWARN:</div><div class='add'>+			handle_core_msg_errstatechange(core,</div><div class='add'>+						       &amp;msg-&gt;errstatechange);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			/* Ignore all other BM messages (like the CAN-FD messages) */</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		core-&gt;bmfifo.msg_fifo_tail =</div><div class='add'>+				(core-&gt;bmfifo.msg_fifo_tail + 1) &amp; 0xff;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * acc_card_interrupt() - handle the interrupts of an esdACC FPGA</div><div class='add'>+ *</div><div class='add'>+ * @ov: overview module structure</div><div class='add'>+ * @cores: array of core structures</div><div class='add'>+ *</div><div class='add'>+ * This function handles all interrupts pending for the overview module and the</div><div class='add'>+ * CAN cores of the esdACC FPGA.</div><div class='add'>+ *</div><div class='add'>+ * It examines for all cores (the overview module core and the CAN cores)</div><div class='add'>+ * the bmfifo.irq_cnt and compares it with the previously saved</div><div class='add'>+ * bmfifo.local_irq_cnt. An IRQ is pending if they differ. The esdACC FPGA</div><div class='add'>+ * updates the bmfifo.irq_cnt values by DMA.</div><div class='add'>+ *</div><div class='add'>+ * The pending interrupts are masked by writing to the IRQ mask register at</div><div class='add'>+ * ACC_OV_OF_BM_IRQ_MASK. This register has for each core a two bit command</div><div class='add'>+ * field evaluated as follows:</div><div class='add'>+ *</div><div class='add'>+ * Define,   bit pattern: meaning</div><div class='add'>+ *                    00: no action</div><div class='add'>+ * ACC_BM_IRQ_UNMASK, 01: unmask interrupt</div><div class='add'>+ * ACC_BM_IRQ_MASK,   10: mask interrupt</div><div class='add'>+ *                    11: no action</div><div class='add'>+ *</div><div class='add'>+ * For each CAN core with a pending IRQ handle_core_interrupt() handles all</div><div class='add'>+ * busmaster messages from the message FIFO. The last handled message (FIFO</div><div class='add'>+ * index) is written to the CAN core to acknowledge its handling.</div><div class='add'>+ *</div><div class='add'>+ * Last step is to unmask all interrupts in the FPGA using</div><div class='add'>+ * ACC_BM_IRQ_UNMASK_ALL.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ *	IRQ_HANDLED, if card generated an interrupt that was handled</div><div class='add'>+ *	IRQ_NONE, if the interrupt is not ours</div><div class='add'>+ */</div><div class='add'>+irqreturn_t acc_card_interrupt(struct acc_ov *ov, struct acc_core *cores)</div><div class='add'>+{</div><div class='add'>+	u32 irqmask;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* First we look for whom interrupts are pending, card/overview</div><div class='add'>+	 * or any of the cores. Two bits in irqmask are used for each;</div><div class='add'>+	 * Each two bit field is set to ACC_BM_IRQ_MASK if an IRQ is</div><div class='add'>+	 * pending.</div><div class='add'>+	 */</div><div class='add'>+	irqmask = 0U;</div><div class='add'>+	if (READ_ONCE(*ov-&gt;bmfifo.irq_cnt) != ov-&gt;bmfifo.local_irq_cnt) {</div><div class='add'>+		irqmask |= ACC_BM_IRQ_MASK;</div><div class='add'>+		ov-&gt;bmfifo.local_irq_cnt = READ_ONCE(*ov-&gt;bmfifo.irq_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ov-&gt;active_cores; i++) {</div><div class='add'>+		struct acc_core *core = &amp;cores[i];</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(*core-&gt;bmfifo.irq_cnt) != core-&gt;bmfifo.local_irq_cnt) {</div><div class='add'>+			irqmask |= (ACC_BM_IRQ_MASK &lt;&lt; (2 * (i + 1)));</div><div class='add'>+			core-&gt;bmfifo.local_irq_cnt = READ_ONCE(*core-&gt;bmfifo.irq_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!irqmask)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* At second we tell the card we're working on them by writing irqmask,</div><div class='add'>+	 * call handle_{ov|core}_interrupt and then acknowledge the</div><div class='add'>+	 * interrupts by writing irq_cnt:</div><div class='add'>+	 */</div><div class='add'>+	acc_ov_write32(ov, ACC_OV_OF_BM_IRQ_MASK, irqmask);</div><div class='add'>+</div><div class='add'>+	if (irqmask &amp; ACC_BM_IRQ_MASK) {</div><div class='add'>+		/* handle_ov_interrupt(); - no use yet. */</div><div class='add'>+		acc_ov_write32(ov, ACC_OV_OF_BM_IRQ_COUNTER,</div><div class='add'>+			       ov-&gt;bmfifo.local_irq_cnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ov-&gt;active_cores; i++) {</div><div class='add'>+		struct acc_core *core = &amp;cores[i];</div><div class='add'>+</div><div class='add'>+		if (irqmask &amp; (ACC_BM_IRQ_MASK &lt;&lt; (2 * (i + 1)))) {</div><div class='add'>+			handle_core_interrupt(core);</div><div class='add'>+			acc_write32(core, ACC_OV_OF_BM_IRQ_COUNTER,</div><div class='add'>+				    core-&gt;bmfifo.local_irq_cnt);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acc_ov_write32(ov, ACC_OV_OF_BM_IRQ_MASK, ACC_BM_IRQ_UNMASK_ALL);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/esd/esdacc.h b/drivers/net/can/esd/esdacc.h<br/>new file mode 100644<br/>index 000000000000..6b7ebd8c91b2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/esd/esdacc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/esd/esdacc.h</a></div><div class='hunk'>@@ -0,0 +1,358 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2015 - 2016 Thomas Körper, esd electronic system design gmbh</div><div class='add'>+ * Copyright (C) 2017 - 2023 Stefan Mätje, esd electronics gmbh</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+</div><div class='add'>+#define ACC_TS_FREQ_80MHZ (80 * HZ_PER_MHZ)</div><div class='add'>+#define ACC_I2C_ADDON_DETECT_DELAY_MS 10</div><div class='add'>+</div><div class='add'>+/* esdACC Overview Module */</div><div class='add'>+#define ACC_OV_OF_PROBE	0x0000</div><div class='add'>+#define ACC_OV_OF_VERSION 0x0004</div><div class='add'>+#define ACC_OV_OF_INFO 0x0008</div><div class='add'>+#define ACC_OV_OF_CANCORE_FREQ 0x000c</div><div class='add'>+#define ACC_OV_OF_TS_FREQ_LO 0x0010</div><div class='add'>+#define ACC_OV_OF_TS_FREQ_HI 0x0014</div><div class='add'>+#define ACC_OV_OF_IRQ_STATUS_CORES 0x0018</div><div class='add'>+#define ACC_OV_OF_TS_CURR_LO 0x001c</div><div class='add'>+#define ACC_OV_OF_TS_CURR_HI 0x0020</div><div class='add'>+#define ACC_OV_OF_IRQ_STATUS 0x0028</div><div class='add'>+#define ACC_OV_OF_MODE 0x002c</div><div class='add'>+#define ACC_OV_OF_BM_IRQ_COUNTER 0x0070</div><div class='add'>+#define ACC_OV_OF_BM_IRQ_MASK 0x0074</div><div class='add'>+#define ACC_OV_OF_MSI_DATA 0x0080</div><div class='add'>+#define ACC_OV_OF_MSI_ADDRESSOFFSET 0x0084</div><div class='add'>+</div><div class='add'>+/* Feature flags are contained in the upper 16 bit of the version</div><div class='add'>+ * register at ACC_OV_OF_VERSION but only used with these masks after</div><div class='add'>+ * extraction into an extra variable =&gt; (xx - 16).</div><div class='add'>+ */</div><div class='add'>+#define ACC_OV_REG_FEAT_MASK_CANFD BIT(27 - 16)</div><div class='add'>+#define ACC_OV_REG_FEAT_MASK_NEW_PSC BIT(28 - 16)</div><div class='add'>+#define ACC_OV_REG_FEAT_MASK_DAR BIT(30 - 16)</div><div class='add'>+</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_ENDIAN_LITTLE BIT(0)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_BM_ENABLE BIT(1)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_MODE_LED BIT(2)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_TIMER_ENABLE BIT(4)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_TIMER_ONE_SHOT BIT(5)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_TIMER_ABSOLUTE BIT(6)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_TIMER GENMASK(6, 4)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_TS_SRC GENMASK(8, 7)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_I2C_ENABLE BIT(11)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_MSI_ENABLE BIT(14)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_NEW_PSC_ENABLE BIT(15)</div><div class='add'>+#define ACC_OV_REG_MODE_MASK_FPGA_RESET BIT(31)</div><div class='add'>+</div><div class='add'>+/* esdACC CAN Core Module */</div><div class='add'>+#define ACC_CORE_OF_CTRL 0x0000</div><div class='add'>+#define ACC_CORE_OF_STATUS_IRQ 0x0008</div><div class='add'>+#define ACC_CORE_OF_BRP	0x000c</div><div class='add'>+#define ACC_CORE_OF_BTR	0x0010</div><div class='add'>+#define ACC_CORE_OF_FBTR 0x0014</div><div class='add'>+#define ACC_CORE_OF_STATUS 0x0030</div><div class='add'>+#define ACC_CORE_OF_TXFIFO_CONFIG 0x0048</div><div class='add'>+#define ACC_CORE_OF_TXFIFO_STATUS 0x004c</div><div class='add'>+#define ACC_CORE_OF_TX_STATUS_IRQ 0x0050</div><div class='add'>+#define ACC_CORE_OF_TX_ABORT_MASK 0x0054</div><div class='add'>+#define ACC_CORE_OF_BM_IRQ_COUNTER 0x0070</div><div class='add'>+#define ACC_CORE_OF_TXFIFO_ID 0x00c0</div><div class='add'>+#define ACC_CORE_OF_TXFIFO_DLC 0x00c4</div><div class='add'>+#define ACC_CORE_OF_TXFIFO_DATA_0 0x00c8</div><div class='add'>+#define ACC_CORE_OF_TXFIFO_DATA_1 0x00cc</div><div class='add'>+</div><div class='add'>+/* CTRL register layout */</div><div class='add'>+#define ACC_REG_CTRL_MASK_RESETMODE BIT(0)</div><div class='add'>+#define ACC_REG_CTRL_MASK_LOM BIT(1)</div><div class='add'>+#define ACC_REG_CTRL_MASK_STM BIT(2)</div><div class='add'>+#define ACC_REG_CTRL_MASK_TRANSEN BIT(5)</div><div class='add'>+#define ACC_REG_CTRL_MASK_TS BIT(6)</div><div class='add'>+#define ACC_REG_CTRL_MASK_SCHEDULE BIT(7)</div><div class='add'>+</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_RXTX BIT(8)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_TXERROR BIT(9)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_ERRWARN BIT(10)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_OVERRUN BIT(11)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_TSI BIT(12)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_ERRPASS BIT(13)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_ALI BIT(14)</div><div class='add'>+#define ACC_REG_CTRL_MASK_IE_BUSERR BIT(15)</div><div class='add'>+</div><div class='add'>+/* BRP and BTR register layout for CAN-Classic version */</div><div class='add'>+#define ACC_REG_BRP_CL_MASK_BRP GENMASK(8, 0)</div><div class='add'>+#define ACC_REG_BTR_CL_MASK_TSEG1 GENMASK(3, 0)</div><div class='add'>+#define ACC_REG_BTR_CL_MASK_TSEG2 GENMASK(18, 16)</div><div class='add'>+#define ACC_REG_BTR_CL_MASK_SJW GENMASK(25, 24)</div><div class='add'>+</div><div class='add'>+/* BRP and BTR register layout for CAN-FD version */</div><div class='add'>+#define ACC_REG_BRP_FD_MASK_BRP GENMASK(7, 0)</div><div class='add'>+#define ACC_REG_BTR_FD_MASK_TSEG1 GENMASK(7, 0)</div><div class='add'>+#define ACC_REG_BTR_FD_MASK_TSEG2 GENMASK(22, 16)</div><div class='add'>+#define ACC_REG_BTR_FD_MASK_SJW GENMASK(30, 24)</div><div class='add'>+</div><div class='add'>+/* 256 BM_MSGs of 32 byte size */</div><div class='add'>+#define ACC_CORE_DMAMSG_SIZE 32U</div><div class='add'>+#define ACC_CORE_DMABUF_SIZE (256U * ACC_CORE_DMAMSG_SIZE)</div><div class='add'>+</div><div class='add'>+enum acc_bmmsg_id {</div><div class='add'>+	BM_MSG_ID_RXTXDONE = 0x01,</div><div class='add'>+	BM_MSG_ID_TXABORT = 0x02,</div><div class='add'>+	BM_MSG_ID_OVERRUN = 0x03,</div><div class='add'>+	BM_MSG_ID_BUSERR = 0x04,</div><div class='add'>+	BM_MSG_ID_ERRPASSIVE = 0x05,</div><div class='add'>+	BM_MSG_ID_ERRWARN = 0x06,</div><div class='add'>+	BM_MSG_ID_TIMESLICE = 0x07,</div><div class='add'>+	BM_MSG_ID_HWTIMER = 0x08,</div><div class='add'>+	BM_MSG_ID_HOTPLUG = 0x09,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The struct acc_bmmsg_* structure declarations that follow here provide</div><div class='add'>+ * access to the ring buffer of bus master messages maintained by the FPGA</div><div class='add'>+ * bus master engine. All bus master messages have the same size of</div><div class='add'>+ * ACC_CORE_DMAMSG_SIZE and a minimum alignment of ACC_CORE_DMAMSG_SIZE in</div><div class='add'>+ * memory.</div><div class='add'>+ *</div><div class='add'>+ * All structure members are natural aligned. Therefore we should not need</div><div class='add'>+ * a __packed attribute. All struct acc_bmmsg_* declarations have at least</div><div class='add'>+ * reserved* members to fill the structure to the full ACC_CORE_DMAMSG_SIZE.</div><div class='add'>+ *</div><div class='add'>+ * A failure of this property due padding will be detected at compile time</div><div class='add'>+ * by static_assert(sizeof(union acc_bmmsg) == ACC_CORE_DMAMSG_SIZE).</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_rxtxdone {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 txfifo_level;</div><div class='add'>+	u8 reserved1[2];</div><div class='add'>+	u8 txtsfifo_level;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+	u32 id;</div><div class='add'>+	struct {</div><div class='add'>+		u8 len;</div><div class='add'>+		u8 txdfifo_idx;</div><div class='add'>+		u8 zeroes8;</div><div class='add'>+		u8 reserved;</div><div class='add'>+	} acc_dlc;</div><div class='add'>+	u8 data[CAN_MAX_DLEN];</div><div class='add'>+	/* Time stamps in struct acc_ov::timestamp_frequency ticks. */</div><div class='add'>+	u64 ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_txabort {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 txfifo_level;</div><div class='add'>+	u16 abort_mask;</div><div class='add'>+	u8 txtsfifo_level;</div><div class='add'>+	u8 reserved2[1];</div><div class='add'>+	u16 abort_mask_txts;</div><div class='add'>+	u64 ts;</div><div class='add'>+	u32 reserved3[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_overrun {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 txfifo_level;</div><div class='add'>+	u8 lost_cnt;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u8 txtsfifo_level;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+	u64 ts;</div><div class='add'>+	u32 reserved3[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_buserr {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 txfifo_level;</div><div class='add'>+	u8 ecc;</div><div class='add'>+	u8 reserved1;</div><div class='add'>+	u8 txtsfifo_level;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+	u64 ts;</div><div class='add'>+	u32 reg_status;</div><div class='add'>+	u32 reg_btr;</div><div class='add'>+	u32 reserved3[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_errstatechange {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 txfifo_level;</div><div class='add'>+	u8 reserved1[2];</div><div class='add'>+	u8 txtsfifo_level;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+	u64 ts;</div><div class='add'>+	u32 reg_status;</div><div class='add'>+	u32 reserved3[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_timeslice {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 txfifo_level;</div><div class='add'>+	u8 reserved1[2];</div><div class='add'>+	u8 txtsfifo_level;</div><div class='add'>+	u8 reserved2[3];</div><div class='add'>+	u64 ts;</div><div class='add'>+	u32 reserved3[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_hwtimer {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	u32 reserved2[1];</div><div class='add'>+	u64 timer;</div><div class='add'>+	u32 reserved3[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_bmmsg_hotplug {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+	u32 reserved2[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union acc_bmmsg {</div><div class='add'>+	u8 msg_id;</div><div class='add'>+	struct acc_bmmsg_rxtxdone rxtxdone;</div><div class='add'>+	struct acc_bmmsg_txabort txabort;</div><div class='add'>+	struct acc_bmmsg_overrun overrun;</div><div class='add'>+	struct acc_bmmsg_buserr buserr;</div><div class='add'>+	struct acc_bmmsg_errstatechange errstatechange;</div><div class='add'>+	struct acc_bmmsg_timeslice timeslice;</div><div class='add'>+	struct acc_bmmsg_hwtimer hwtimer;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Check size of union acc_bmmsg to be of expected size. */</div><div class='add'>+static_assert(sizeof(union acc_bmmsg) == ACC_CORE_DMAMSG_SIZE);</div><div class='add'>+</div><div class='add'>+struct acc_bmfifo {</div><div class='add'>+	const union acc_bmmsg *messages;</div><div class='add'>+	/* irq_cnt points to an u32 value where the esdACC FPGA deposits</div><div class='add'>+	 * the bm_fifo head index in coherent DMA memory. Only bits 7..0</div><div class='add'>+	 * are valid. Use READ_ONCE() to access this memory location.</div><div class='add'>+	 */</div><div class='add'>+	const u32 *irq_cnt;</div><div class='add'>+	u32 local_irq_cnt;</div><div class='add'>+	u32 msg_fifo_tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_core {</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct acc_bmfifo bmfifo;</div><div class='add'>+	u8 tx_fifo_size;</div><div class='add'>+	u8 tx_fifo_head;</div><div class='add'>+	u8 tx_fifo_tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_ov {</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	struct acc_bmfifo bmfifo;</div><div class='add'>+	u32 timestamp_frequency;</div><div class='add'>+	u32 core_frequency;</div><div class='add'>+	u16 version;</div><div class='add'>+	u16 features;</div><div class='add'>+	u8 total_cores;</div><div class='add'>+	u8 active_cores;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct acc_net_priv {</div><div class='add'>+	struct can_priv can; /* must be the first member! */</div><div class='add'>+	struct acc_core *core;</div><div class='add'>+	struct acc_ov *ov;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 acc_read32(struct acc_core *core, unsigned short offs)</div><div class='add'>+{</div><div class='add'>+	return ioread32be(core-&gt;addr + offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_write32(struct acc_core *core,</div><div class='add'>+			       unsigned short offs, u32 v)</div><div class='add'>+{</div><div class='add'>+	iowrite32be(v, core-&gt;addr + offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_write32_noswap(struct acc_core *core,</div><div class='add'>+				      unsigned short offs, u32 v)</div><div class='add'>+{</div><div class='add'>+	iowrite32(v, core-&gt;addr + offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_set_bits(struct acc_core *core,</div><div class='add'>+				unsigned short offs, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 v = acc_read32(core, offs);</div><div class='add'>+</div><div class='add'>+	v |= mask;</div><div class='add'>+	acc_write32(core, offs, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_clear_bits(struct acc_core *core,</div><div class='add'>+				  unsigned short offs, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 v = acc_read32(core, offs);</div><div class='add'>+</div><div class='add'>+	v &amp;= ~mask;</div><div class='add'>+	acc_write32(core, offs, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int acc_resetmode_entered(struct acc_core *core)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl = acc_read32(core, ACC_CORE_OF_CTRL);</div><div class='add'>+</div><div class='add'>+	return (ctrl &amp; ACC_REG_CTRL_MASK_RESETMODE) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 acc_ov_read32(struct acc_ov *ov, unsigned short offs)</div><div class='add'>+{</div><div class='add'>+	return ioread32be(ov-&gt;addr + offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_ov_write32(struct acc_ov *ov,</div><div class='add'>+				  unsigned short offs, u32 v)</div><div class='add'>+{</div><div class='add'>+	iowrite32be(v, ov-&gt;addr + offs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_ov_set_bits(struct acc_ov *ov,</div><div class='add'>+				   unsigned short offs, u32 b)</div><div class='add'>+{</div><div class='add'>+	u32 v = acc_ov_read32(ov, offs);</div><div class='add'>+</div><div class='add'>+	v |= b;</div><div class='add'>+	acc_ov_write32(ov, offs, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_ov_clear_bits(struct acc_ov *ov,</div><div class='add'>+				     unsigned short offs, u32 b)</div><div class='add'>+{</div><div class='add'>+	u32 v = acc_ov_read32(ov, offs);</div><div class='add'>+</div><div class='add'>+	v &amp;= ~b;</div><div class='add'>+	acc_ov_write32(ov, offs, v);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void acc_reset_fpga(struct acc_ov *ov)</div><div class='add'>+{</div><div class='add'>+	acc_ov_write32(ov, ACC_OV_OF_MODE, ACC_OV_REG_MODE_MASK_FPGA_RESET);</div><div class='add'>+</div><div class='add'>+	/* (Re-)start and wait for completion of addon detection on the I^2C bus */</div><div class='add'>+	acc_ov_set_bits(ov, ACC_OV_OF_MODE, ACC_OV_REG_MODE_MASK_I2C_ENABLE);</div><div class='add'>+	mdelay(ACC_I2C_ADDON_DETECT_DELAY_MS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void acc_init_ov(struct acc_ov *ov, struct device *dev);</div><div class='add'>+void acc_init_bm_ptr(struct acc_ov *ov, struct acc_core *cores,</div><div class='add'>+		     const void *mem);</div><div class='add'>+int acc_open(struct net_device *netdev);</div><div class='add'>+int acc_close(struct net_device *netdev);</div><div class='add'>+netdev_tx_t acc_start_xmit(struct sk_buff *skb, struct net_device *netdev);</div><div class='add'>+int acc_get_berr_counter(const struct net_device *netdev,</div><div class='add'>+			 struct can_berr_counter *bec);</div><div class='add'>+int acc_set_mode(struct net_device *netdev, enum can_mode mode);</div><div class='add'>+int acc_set_bittiming(struct net_device *netdev);</div><div class='add'>+irqreturn_t acc_card_interrupt(struct acc_ov *ov, struct acc_core *cores);</div><div class='head'>diff --git a/drivers/net/can/flexcan/Makefile b/drivers/net/can/flexcan/Makefile<br/>new file mode 100644<br/>index 000000000000..89d5695c902e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/flexcan/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/flexcan/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o</div><div class='add'>+</div><div class='add'>+flexcan-objs :=</div><div class='add'>+flexcan-objs += flexcan-core.o</div><div class='add'>+flexcan-objs += flexcan-ethtool.o</div><div class='head'>diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan/flexcan-core.c<br/>index 1c66fb2ad76b..f5d22c61503f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/flexcan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/flexcan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/flexcan/flexcan-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/flexcan/flexcan-core.c</a></div><div class='hunk'>@@ -9,23 +9,30 @@</div><div class='ctx'> //</div><div class='ctx'> // Based on code originally by Andrey Volkov &lt;avolkov@varma-el.com&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;dt-bindings/firmware/imx/rsrc.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='del'>-#include &lt;linux/can/rx-offload.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/firmware/imx/sci.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/can/platform/flexcan.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+</div><div class='add'>+#include "flexcan.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME			"flexcan"</div><div class='ctx'> </div><div class='hunk'>@@ -51,6 +58,7 @@</div><div class='ctx'> #define FLEXCAN_MCR_IRMQ		BIT(16)</div><div class='ctx'> #define FLEXCAN_MCR_LPRIO_EN		BIT(13)</div><div class='ctx'> #define FLEXCAN_MCR_AEN			BIT(12)</div><div class='add'>+#define FLEXCAN_MCR_FDEN		BIT(11)</div><div class='ctx'> /* MCR_MAXMB: maximum used MBs is MAXMB + 1 */</div><div class='ctx'> #define FLEXCAN_MCR_MAXMB(x)		((x) &amp; 0x7f)</div><div class='ctx'> #define FLEXCAN_MCR_IDAM_A		(0x0 &lt;&lt; 8)</div><div class='hunk'>@@ -90,6 +98,7 @@</div><div class='ctx'> #define FLEXCAN_CTRL2_MRP		BIT(18)</div><div class='ctx'> #define FLEXCAN_CTRL2_RRS		BIT(17)</div><div class='ctx'> #define FLEXCAN_CTRL2_EACEN		BIT(16)</div><div class='add'>+#define FLEXCAN_CTRL2_ISOCANFDEN	BIT(12)</div><div class='ctx'> </div><div class='ctx'> /* FLEXCAN memory error control register (MECR) bits */</div><div class='ctx'> #define FLEXCAN_MECR_ECRWRDIS		BIT(31)</div><div class='hunk'>@@ -133,15 +142,42 @@</div><div class='ctx'> 	(FLEXCAN_ESR_ERR_BUS | FLEXCAN_ESR_ERR_STATE)</div><div class='ctx'> #define FLEXCAN_ESR_ALL_INT \</div><div class='ctx'> 	(FLEXCAN_ESR_TWRN_INT | FLEXCAN_ESR_RWRN_INT | \</div><div class='del'>-	 FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT | \</div><div class='del'>-	 FLEXCAN_ESR_WAK_INT)</div><div class='add'>+	 FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)</div><div class='add'>+</div><div class='add'>+/* FLEXCAN Bit Timing register (CBT) bits */</div><div class='add'>+#define FLEXCAN_CBT_BTF			BIT(31)</div><div class='add'>+#define FLEXCAN_CBT_EPRESDIV_MASK	GENMASK(30, 21)</div><div class='add'>+#define FLEXCAN_CBT_ERJW_MASK		GENMASK(20, 16)</div><div class='add'>+#define FLEXCAN_CBT_EPROPSEG_MASK	GENMASK(15, 10)</div><div class='add'>+#define FLEXCAN_CBT_EPSEG1_MASK		GENMASK(9, 5)</div><div class='add'>+#define FLEXCAN_CBT_EPSEG2_MASK		GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+/* FLEXCAN FD control register (FDCTRL) bits */</div><div class='add'>+#define FLEXCAN_FDCTRL_FDRATE		BIT(31)</div><div class='add'>+#define FLEXCAN_FDCTRL_MBDSR1		GENMASK(20, 19)</div><div class='add'>+#define FLEXCAN_FDCTRL_MBDSR0		GENMASK(17, 16)</div><div class='add'>+#define FLEXCAN_FDCTRL_MBDSR_8		0x0</div><div class='add'>+#define FLEXCAN_FDCTRL_MBDSR_12		0x1</div><div class='add'>+#define FLEXCAN_FDCTRL_MBDSR_32		0x2</div><div class='add'>+#define FLEXCAN_FDCTRL_MBDSR_64		0x3</div><div class='add'>+#define FLEXCAN_FDCTRL_TDCEN		BIT(15)</div><div class='add'>+#define FLEXCAN_FDCTRL_TDCFAIL		BIT(14)</div><div class='add'>+#define FLEXCAN_FDCTRL_TDCOFF		GENMASK(12, 8)</div><div class='add'>+#define FLEXCAN_FDCTRL_TDCVAL		GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+/* FLEXCAN FD Bit Timing register (FDCBT) bits */</div><div class='add'>+#define FLEXCAN_FDCBT_FPRESDIV_MASK	GENMASK(29, 20)</div><div class='add'>+#define FLEXCAN_FDCBT_FRJW_MASK		GENMASK(18, 16)</div><div class='add'>+#define FLEXCAN_FDCBT_FPROPSEG_MASK	GENMASK(14, 10)</div><div class='add'>+#define FLEXCAN_FDCBT_FPSEG1_MASK	GENMASK(7, 5)</div><div class='add'>+#define FLEXCAN_FDCBT_FPSEG2_MASK	GENMASK(2, 0)</div><div class='ctx'> </div><div class='ctx'> /* FLEXCAN interrupt flag register (IFLAG) bits */</div><div class='ctx'> /* Errata ERR005829 step7: Reserve first valid MB */</div><div class='del'>-#define FLEXCAN_TX_MB_RESERVED_OFF_FIFO		8</div><div class='del'>-#define FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP	0</div><div class='del'>-#define FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST	(FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP + 1)</div><div class='del'>-#define FLEXCAN_IFLAG_MB(x)		BIT((x) &amp; 0x1f)</div><div class='add'>+#define FLEXCAN_TX_MB_RESERVED_RX_FIFO	8</div><div class='add'>+#define FLEXCAN_TX_MB_RESERVED_RX_MAILBOX	0</div><div class='add'>+#define FLEXCAN_RX_MB_RX_MAILBOX_FIRST	(FLEXCAN_TX_MB_RESERVED_RX_MAILBOX + 1)</div><div class='add'>+#define FLEXCAN_IFLAG_MB(x)		BIT_ULL(x)</div><div class='ctx'> #define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW	BIT(7)</div><div class='ctx'> #define FLEXCAN_IFLAG_RX_FIFO_WARN	BIT(6)</div><div class='ctx'> #define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE	BIT(5)</div><div class='hunk'>@@ -160,37 +196,16 @@</div><div class='ctx'> #define FLEXCAN_MB_CODE_TX_DATA		(0xc &lt;&lt; 24)</div><div class='ctx'> #define FLEXCAN_MB_CODE_TX_TANSWER	(0xe &lt;&lt; 24)</div><div class='ctx'> </div><div class='add'>+#define FLEXCAN_MB_CNT_EDL		BIT(31)</div><div class='add'>+#define FLEXCAN_MB_CNT_BRS		BIT(30)</div><div class='add'>+#define FLEXCAN_MB_CNT_ESI		BIT(29)</div><div class='ctx'> #define FLEXCAN_MB_CNT_SRR		BIT(22)</div><div class='ctx'> #define FLEXCAN_MB_CNT_IDE		BIT(21)</div><div class='ctx'> #define FLEXCAN_MB_CNT_RTR		BIT(20)</div><div class='ctx'> #define FLEXCAN_MB_CNT_LENGTH(x)	(((x) &amp; 0xf) &lt;&lt; 16)</div><div class='ctx'> #define FLEXCAN_MB_CNT_TIMESTAMP(x)	((x) &amp; 0xffff)</div><div class='ctx'> </div><div class='del'>-#define FLEXCAN_TIMEOUT_US		(50)</div><div class='del'>-</div><div class='del'>-/* FLEXCAN hardware feature flags</div><div class='del'>- *</div><div class='del'>- * Below is some version info we got:</div><div class='del'>- *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-</div><div class='del'>- *                                Filter? connected?  Passive detection  ception in MB</div><div class='del'>- *   MX25  FlexCAN2  03.00.00.00     no        no        no       no        no</div><div class='del'>- *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no</div><div class='del'>- *   MX35  FlexCAN2  03.00.00.00     no        no        no       no        no</div><div class='del'>- *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no</div><div class='del'>- *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes</div><div class='del'>- *   VF610 FlexCAN3  ?               no       yes        no      yes       yes?</div><div class='del'>- * LS1021A FlexCAN2  03.00.04.00     no       yes        no       no       yes</div><div class='del'>- *</div><div class='del'>- * Some SOCs do not have the RX_WARN &amp; TX_WARN interrupt line connected.</div><div class='del'>- */</div><div class='del'>-#define FLEXCAN_QUIRK_BROKEN_WERR_STATE	BIT(1) /* [TR]WRN_INT not connected */</div><div class='del'>-#define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */</div><div class='del'>-#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */</div><div class='del'>-#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disable Memory error detection */</div><div class='del'>-#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP	BIT(5) /* Use timestamp based offloading */</div><div class='del'>-#define FLEXCAN_QUIRK_BROKEN_PERR_STATE	BIT(6) /* No interrupt for error passive */</div><div class='del'>-#define FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN	BIT(7) /* default to BE register access */</div><div class='del'>-#define FLEXCAN_QUIRK_SETUP_STOP_MODE		BIT(8) /* Setup stop mode to support wakeup */</div><div class='add'>+#define FLEXCAN_TIMEOUT_US		(250)</div><div class='ctx'> </div><div class='ctx'> /* Structure of the message buffer */</div><div class='ctx'> struct flexcan_mb {</div><div class='hunk'>@@ -202,12 +217,12 @@ struct flexcan_mb {</div><div class='ctx'> /* Structure of the hardware registers */</div><div class='ctx'> struct flexcan_regs {</div><div class='ctx'> 	u32 mcr;		/* 0x00 */</div><div class='del'>-	u32 ctrl;		/* 0x04 */</div><div class='add'>+	u32 ctrl;		/* 0x04 - Not affected by Soft Reset */</div><div class='ctx'> 	u32 timer;		/* 0x08 */</div><div class='del'>-	u32 _reserved1;		/* 0x0c */</div><div class='del'>-	u32 rxgmask;		/* 0x10 */</div><div class='del'>-	u32 rx14mask;		/* 0x14 */</div><div class='del'>-	u32 rx15mask;		/* 0x18 */</div><div class='add'>+	u32 tcr;		/* 0x0c */</div><div class='add'>+	u32 rxgmask;		/* 0x10 - Not affected by Soft Reset */</div><div class='add'>+	u32 rx14mask;		/* 0x14 - Not affected by Soft Reset */</div><div class='add'>+	u32 rx15mask;		/* 0x18 - Not affected by Soft Reset */</div><div class='ctx'> 	u32 ecr;		/* 0x1c */</div><div class='ctx'> 	u32 esr;		/* 0x20 */</div><div class='ctx'> 	u32 imask2;		/* 0x24 */</div><div class='hunk'>@@ -216,31 +231,46 @@ struct flexcan_regs {</div><div class='ctx'> 	u32 iflag1;		/* 0x30 */</div><div class='ctx'> 	union {			/* 0x34 */</div><div class='ctx'> 		u32 gfwr_mx28;	/* MX28, MX53 */</div><div class='del'>-		u32 ctrl2;	/* MX6, VF610 */</div><div class='add'>+		u32 ctrl2;	/* MX6, VF610 - Not affected by Soft Reset */</div><div class='ctx'> 	};</div><div class='ctx'> 	u32 esr2;		/* 0x38 */</div><div class='ctx'> 	u32 imeur;		/* 0x3c */</div><div class='ctx'> 	u32 lrfr;		/* 0x40 */</div><div class='ctx'> 	u32 crcr;		/* 0x44 */</div><div class='ctx'> 	u32 rxfgmask;		/* 0x48 */</div><div class='del'>-	u32 rxfir;		/* 0x4c */</div><div class='del'>-	u32 _reserved3[12];	/* 0x50 */</div><div class='del'>-	u8 mb[2][512];		/* 0x80 */</div><div class='del'>-	/* FIFO-mode:</div><div class='del'>-	 *			MB</div><div class='del'>-	 * 0x080...0x08f	0	RX message buffer</div><div class='del'>-	 * 0x090...0x0df	1-5	reserverd</div><div class='del'>-	 * 0x0e0...0x0ff	6-7	8 entry ID table</div><div class='del'>-	 *				(mx25, mx28, mx35, mx53)</div><div class='del'>-	 * 0x0e0...0x2df	6-7..37	8..128 entry ID table</div><div class='del'>-	 *				size conf'ed via ctrl2::RFFN</div><div class='del'>-	 *				(mx6, vf610)</div><div class='del'>-	 */</div><div class='del'>-	u32 _reserved4[256];	/* 0x480 */</div><div class='del'>-	u32 rximr[64];		/* 0x880 */</div><div class='del'>-	u32 _reserved5[24];	/* 0x980 */</div><div class='del'>-	u32 gfwr_mx6;		/* 0x9e0 - MX6 */</div><div class='del'>-	u32 _reserved6[63];	/* 0x9e4 */</div><div class='add'>+	u32 rxfir;		/* 0x4c - Not affected by Soft Reset */</div><div class='add'>+	u32 cbt;		/* 0x50 - Not affected by Soft Reset */</div><div class='add'>+	u32 _reserved2;		/* 0x54 */</div><div class='add'>+	u32 dbg1;		/* 0x58 */</div><div class='add'>+	u32 dbg2;		/* 0x5c */</div><div class='add'>+	u32 _reserved3[8];	/* 0x60 */</div><div class='add'>+	struct_group(init,</div><div class='add'>+		u8 mb[2][512];		/* 0x80 - Not affected by Soft Reset */</div><div class='add'>+		/* FIFO-mode:</div><div class='add'>+		 *			MB</div><div class='add'>+		 * 0x080...0x08f	0	RX message buffer</div><div class='add'>+		 * 0x090...0x0df	1-5	reserved</div><div class='add'>+		 * 0x0e0...0x0ff	6-7	8 entry ID table</div><div class='add'>+		 *				(mx25, mx28, mx35, mx53)</div><div class='add'>+		 * 0x0e0...0x2df	6-7..37	8..128 entry ID table</div><div class='add'>+		 *				size conf'ed via ctrl2::RFFN</div><div class='add'>+		 *				(mx6, vf610)</div><div class='add'>+		 */</div><div class='add'>+		u32 _reserved4[256];	/* 0x480 */</div><div class='add'>+		u32 rximr[64];		/* 0x880 - Not affected by Soft Reset */</div><div class='add'>+		u32 _reserved5[24];	/* 0x980 */</div><div class='add'>+		u32 gfwr_mx6;		/* 0x9e0 - MX6 */</div><div class='add'>+		u32 _reserved6[39];	/* 0x9e4 */</div><div class='add'>+		u32 _rxfir[6];		/* 0xa80 */</div><div class='add'>+		u32 _reserved8[2];	/* 0xa98 */</div><div class='add'>+		u32 _rxmgmask;		/* 0xaa0 */</div><div class='add'>+		u32 _rxfgmask;		/* 0xaa4 */</div><div class='add'>+		u32 _rx14mask;		/* 0xaa8 */</div><div class='add'>+		u32 _rx15mask;		/* 0xaac */</div><div class='add'>+		u32 tx_smb[4];		/* 0xab0 */</div><div class='add'>+		u32 rx_smb0[4];		/* 0xac0 */</div><div class='add'>+		u32 rx_smb1[4];		/* 0xad0 */</div><div class='add'>+	);</div><div class='ctx'> 	u32 mecr;		/* 0xae0 */</div><div class='ctx'> 	u32 erriar;		/* 0xae4 */</div><div class='ctx'> 	u32 erridpr;		/* 0xae8 */</div><div class='hunk'>@@ -249,76 +279,122 @@ struct flexcan_regs {</div><div class='ctx'> 	u32 rerrdr;		/* 0xaf4 */</div><div class='ctx'> 	u32 rerrsynr;		/* 0xaf8 */</div><div class='ctx'> 	u32 errsr;		/* 0xafc */</div><div class='add'>+	u32 _reserved7[64];	/* 0xb00 */</div><div class='add'>+	u32 fdctrl;		/* 0xc00 - Not affected by Soft Reset */</div><div class='add'>+	u32 fdcbt;		/* 0xc04 - Not affected by Soft Reset */</div><div class='add'>+	u32 fdcrc;		/* 0xc08 */</div><div class='add'>+	u32 _reserved9[199];	/* 0xc0c */</div><div class='add'>+	struct_group(init_fd,</div><div class='add'>+		u32 tx_smb_fd[18];	/* 0xf28 */</div><div class='add'>+		u32 rx_smb0_fd[18];	/* 0xf70 */</div><div class='add'>+		u32 rx_smb1_fd[18];	/* 0xfb8 */</div><div class='add'>+	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct flexcan_devtype_data {</div><div class='del'>-	u32 quirks;		/* quirks needed for different IP cores */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct flexcan_stop_mode {</div><div class='del'>-	struct regmap *gpr;</div><div class='del'>-	u8 req_gpr;</div><div class='del'>-	u8 req_bit;</div><div class='del'>-	u8 ack_gpr;</div><div class='del'>-	u8 ack_bit;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct flexcan_priv {</div><div class='del'>-	struct can_priv can;</div><div class='del'>-	struct can_rx_offload offload;</div><div class='del'>-</div><div class='del'>-	struct flexcan_regs __iomem *regs;</div><div class='del'>-	struct flexcan_mb __iomem *tx_mb;</div><div class='del'>-	struct flexcan_mb __iomem *tx_mb_reserved;</div><div class='del'>-	u8 tx_mb_idx;</div><div class='del'>-	u8 mb_count;</div><div class='del'>-	u8 mb_size;</div><div class='del'>-	u32 reg_ctrl_default;</div><div class='del'>-	u32 reg_imask1_default;</div><div class='del'>-	u32 reg_imask2_default;</div><div class='del'>-</div><div class='del'>-	struct clk *clk_ipg;</div><div class='del'>-	struct clk *clk_per;</div><div class='del'>-	const struct flexcan_devtype_data *devtype_data;</div><div class='del'>-	struct regulator *reg_xceiver;</div><div class='del'>-	struct flexcan_stop_mode stm;</div><div class='add'>+static_assert(sizeof(struct flexcan_regs) ==  0x4 * 18 + 0xfb8);</div><div class='ctx'> </div><div class='del'>-	/* Read and Write APIs */</div><div class='del'>-	u32 (*read)(void __iomem *addr);</div><div class='del'>-	void (*write)(u32 val, void __iomem *addr);</div><div class='add'>+static const struct flexcan_devtype_data fsl_mcf5441x_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='add'>+		FLEXCAN_QUIRK_NR_IRQ_3 | FLEXCAN_QUIRK_NR_MB_16 |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_FIFO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct flexcan_devtype_data fsl_p1010_devtype_data = {</div><div class='ctx'> 	.quirks = FLEXCAN_QUIRK_BROKEN_WERR_STATE |</div><div class='ctx'> 		FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='del'>-		FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN,</div><div class='add'>+		FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_FIFO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct flexcan_devtype_data fsl_imx25_devtype_data = {</div><div class='ctx'> 	.quirks = FLEXCAN_QUIRK_BROKEN_WERR_STATE |</div><div class='del'>-		FLEXCAN_QUIRK_BROKEN_PERR_STATE,</div><div class='add'>+		FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_FIFO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct flexcan_devtype_data fsl_imx28_devtype_data = {</div><div class='del'>-	.quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE,</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_FIFO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct flexcan_devtype_data fsl_imx6q_devtype_data = {</div><div class='ctx'> 	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='del'>-		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='del'>-		FLEXCAN_QUIRK_SETUP_STOP_MODE,</div><div class='add'>+		FLEXCAN_QUIRK_USE_RX_MAILBOX | FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='add'>+		FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flexcan_devtype_data fsl_imx8qm_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='add'>+		FLEXCAN_QUIRK_USE_RX_MAILBOX | FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flexcan_devtype_data fsl_imx8mp_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='add'>+		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SUPPORT_ECC |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct flexcan_devtype_data fsl_imx93_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='add'>+		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_FD | FLEXCAN_QUIRK_SUPPORT_ECC |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flexcan_devtype_data fsl_imx95_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='add'>+		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SUPPORT_FD |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_ECC | FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR | FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct flexcan_devtype_data fsl_vf610_devtype_data = {</div><div class='ctx'> 	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='del'>-		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |</div><div class='del'>-		FLEXCAN_QUIRK_BROKEN_PERR_STATE,</div><div class='add'>+		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SUPPORT_ECC |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = {</div><div class='ctx'> 	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='add'>+		FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flexcan_devtype_data fsl_lx2160a_r1_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='add'>+		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='add'>+		FLEXCAN_QUIRK_USE_RX_MAILBOX | FLEXCAN_QUIRK_SUPPORT_FD |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_ECC |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct flexcan_devtype_data nxp_s32g2_devtype_data = {</div><div class='add'>+	.quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |</div><div class='ctx'> 		FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_BROKEN_PERR_STATE |</div><div class='del'>-		FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,</div><div class='add'>+		FLEXCAN_QUIRK_USE_RX_MAILBOX | FLEXCAN_QUIRK_SUPPORT_FD |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_ECC | FLEXCAN_QUIRK_NR_IRQ_3 |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR |</div><div class='add'>+		FLEXCAN_QUIRK_SECONDARY_MB_IRQ,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct can_bittiming_const flexcan_bittiming_const = {</div><div class='hunk'>@@ -333,6 +409,30 @@ static const struct can_bittiming_const flexcan_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct can_bittiming_const flexcan_fd_bittiming_const = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 96,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 32,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const flexcan_fd_data_bittiming_const = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 39,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* FlexCAN module is essentially modelled as a little-endian IP in most</div><div class='ctx'>  * SoCs, i.e the registers as well as the message buffer areas are</div><div class='ctx'>  * implemented in a little-endian fashion.</div><div class='hunk'>@@ -385,6 +485,34 @@ static struct flexcan_mb __iomem *flexcan_get_mb(const struct flexcan_priv *priv</div><div class='ctx'> 		(&amp;priv-&gt;regs-&gt;mb[bank][priv-&gt;mb_size * mb_index]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int flexcan_low_power_enter_ack(struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	unsigned int timeout = FLEXCAN_TIMEOUT_US / 10;</div><div class='add'>+</div><div class='add'>+	while (timeout-- &amp;&amp; !(priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK))</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int flexcan_low_power_exit_ack(struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	unsigned int timeout = FLEXCAN_TIMEOUT_US / 10;</div><div class='add'>+</div><div class='add'>+	while (timeout-- &amp;&amp; (priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK))</div><div class='add'>+		udelay(10);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void flexcan_enable_wakeup_irq(struct flexcan_priv *priv, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='hunk'>@@ -400,32 +528,78 @@ static void flexcan_enable_wakeup_irq(struct flexcan_priv *priv, bool enable)</div><div class='ctx'> 	priv-&gt;write(reg_mcr, &amp;regs-&gt;mcr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void flexcan_enter_stop_mode(struct flexcan_priv *priv)</div><div class='add'>+static int flexcan_stop_mode_enable_scfw(struct flexcan_priv *priv, bool enabled)</div><div class='add'>+{</div><div class='add'>+	u8 idx = priv-&gt;scu_idx;</div><div class='add'>+	u32 rsrc_id, val;</div><div class='add'>+</div><div class='add'>+	rsrc_id = IMX_SC_R_CAN(idx);</div><div class='add'>+</div><div class='add'>+	if (enabled)</div><div class='add'>+		val = 1;</div><div class='add'>+	else</div><div class='add'>+		val = 0;</div><div class='add'>+</div><div class='add'>+	/* stop mode request via scu firmware */</div><div class='add'>+	return imx_sc_misc_set_control(priv-&gt;sc_ipc_handle, rsrc_id,</div><div class='add'>+				       IMX_SC_C_IPG_STOP, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	u32 reg_mcr;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	reg_mcr = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='ctx'> 	reg_mcr |= FLEXCAN_MCR_SLF_WAK;</div><div class='ctx'> 	priv-&gt;write(reg_mcr, &amp;regs-&gt;mcr);</div><div class='ctx'> </div><div class='ctx'> 	/* enable stop request */</div><div class='del'>-	regmap_update_bits(priv-&gt;stm.gpr, priv-&gt;stm.req_gpr,</div><div class='del'>-			   1 &lt;&lt; priv-&gt;stm.req_bit, 1 &lt;&lt; priv-&gt;stm.req_bit);</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW) {</div><div class='add'>+		ret = flexcan_stop_mode_enable_scfw(priv, true);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) {</div><div class='add'>+		regmap_update_bits(priv-&gt;stm.gpr, priv-&gt;stm.req_gpr,</div><div class='add'>+				   1 &lt;&lt; priv-&gt;stm.req_bit, 1 &lt;&lt; priv-&gt;stm.req_bit);</div><div class='add'>+	} else if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI) {</div><div class='add'>+		/* For the SCMI mode, driver do nothing, ATF will send request to</div><div class='add'>+		 * SM(system manager, M33 core) through SCMI protocol after linux</div><div class='add'>+		 * suspend. Once SM get this request, it will send IPG_STOP signal</div><div class='add'>+		 * to Flex_CAN, let CAN in STOP mode.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flexcan_low_power_enter_ack(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void flexcan_exit_stop_mode(struct flexcan_priv *priv)</div><div class='add'>+static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	u32 reg_mcr;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* remove stop request */</div><div class='del'>-	regmap_update_bits(priv-&gt;stm.gpr, priv-&gt;stm.req_gpr,</div><div class='del'>-			   1 &lt;&lt; priv-&gt;stm.req_bit, 0);</div><div class='add'>+	/* Remove stop request, for FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI,</div><div class='add'>+	 * do nothing here, because ATF already send request to SM before</div><div class='add'>+	 * linux resume. Once SM get this request, it will deassert the</div><div class='add'>+	 * IPG_STOP signal to Flex_CAN.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW) {</div><div class='add'>+		ret = flexcan_stop_mode_enable_scfw(priv, false);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) {</div><div class='add'>+		regmap_update_bits(priv-&gt;stm.gpr, priv-&gt;stm.req_gpr,</div><div class='add'>+				   1 &lt;&lt; priv-&gt;stm.req_bit, 0);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	reg_mcr = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='ctx'> 	reg_mcr &amp;= ~FLEXCAN_MCR_SLF_WAK;</div><div class='ctx'> 	priv-&gt;write(reg_mcr, &amp;regs-&gt;mcr);</div><div class='add'>+</div><div class='add'>+	return flexcan_low_power_exit_ack(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void flexcan_error_irq_enable(const struct flexcan_priv *priv)</div><div class='hunk'>@@ -444,68 +618,89 @@ static inline void flexcan_error_irq_disable(const struct flexcan_priv *priv)</div><div class='ctx'> 	priv-&gt;write(reg_ctrl, &amp;regs-&gt;ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int flexcan_clks_enable(const struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;clk_ipg) {</div><div class='add'>+		err = clk_prepare_enable(priv-&gt;clk_ipg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;clk_per) {</div><div class='add'>+		err = clk_prepare_enable(priv-&gt;clk_per);</div><div class='add'>+		if (err)</div><div class='add'>+			clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flexcan_clks_disable(const struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_per);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (!priv-&gt;reg_xceiver)</div><div class='del'>-		return 0;</div><div class='add'>+	if (priv-&gt;reg_xceiver)</div><div class='add'>+		return regulator_enable(priv-&gt;reg_xceiver);</div><div class='add'>+	else if (priv-&gt;transceiver)</div><div class='add'>+		return phy_power_on(priv-&gt;transceiver);</div><div class='ctx'> </div><div class='del'>-	return regulator_enable(priv-&gt;reg_xceiver);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int flexcan_transceiver_disable(const struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (!priv-&gt;reg_xceiver)</div><div class='del'>-		return 0;</div><div class='add'>+	if (priv-&gt;reg_xceiver)</div><div class='add'>+		return regulator_disable(priv-&gt;reg_xceiver);</div><div class='add'>+	else if (priv-&gt;transceiver)</div><div class='add'>+		return phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> </div><div class='del'>-	return regulator_disable(priv-&gt;reg_xceiver);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int flexcan_chip_enable(struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='del'>-	unsigned int timeout = FLEXCAN_TIMEOUT_US / 10;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	reg = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='ctx'> 	reg &amp;= ~FLEXCAN_MCR_MDIS;</div><div class='ctx'> 	priv-&gt;write(reg, &amp;regs-&gt;mcr);</div><div class='ctx'> </div><div class='del'>-	while (timeout-- &amp;&amp; (priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK))</div><div class='del'>-		udelay(10);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return flexcan_low_power_exit_ack(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int flexcan_chip_disable(struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='del'>-	unsigned int timeout = FLEXCAN_TIMEOUT_US / 10;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	reg = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='ctx'> 	reg |= FLEXCAN_MCR_MDIS;</div><div class='ctx'> 	priv-&gt;write(reg, &amp;regs-&gt;mcr);</div><div class='ctx'> </div><div class='del'>-	while (timeout-- &amp;&amp; !(priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK))</div><div class='del'>-		udelay(10);</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_LPM_ACK))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return flexcan_low_power_enter_ack(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int flexcan_chip_freeze(struct flexcan_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='del'>-	unsigned int timeout = 1000 * 1000 * 10 / priv-&gt;can.bittiming.bitrate;</div><div class='add'>+	unsigned int timeout;</div><div class='add'>+	u32 bitrate = priv-&gt;can.bittiming.bitrate;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='add'>+	if (bitrate)</div><div class='add'>+		timeout = 1000 * 1000 * 10 / bitrate;</div><div class='add'>+	else</div><div class='add'>+		timeout = FLEXCAN_TIMEOUT_US / 10;</div><div class='add'>+</div><div class='ctx'> 	reg = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='del'>-	reg |= FLEXCAN_MCR_HALT;</div><div class='add'>+	reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT;</div><div class='ctx'> 	priv-&gt;write(reg, &amp;regs-&gt;mcr);</div><div class='ctx'> </div><div class='ctx'> 	while (timeout-- &amp;&amp; !(priv-&gt;read(&amp;regs-&gt;mcr) &amp; FLEXCAN_MCR_FRZ_ACK))</div><div class='hunk'>@@ -570,19 +765,13 @@ static int flexcan_get_berr_counter(const struct net_device *dev,</div><div class='ctx'> 	const struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk_ipg);</div><div class='del'>-	if (err)</div><div class='add'>+	err = pm_runtime_resume_and_get(priv-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk_per);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_disable_ipg;</div><div class='del'>-</div><div class='ctx'> 	err = __flexcan_get_berr_counter(dev, bec);</div><div class='ctx'> </div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_per);</div><div class='del'>- out_disable_ipg:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -590,33 +779,40 @@ static int flexcan_get_berr_counter(const struct net_device *dev,</div><div class='ctx'> static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct flexcan_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	u32 can_id;</div><div class='ctx'> 	u32 data;</div><div class='del'>-	u32 ctrl = FLEXCAN_MB_CODE_TX_DATA | (cf-&gt;can_dlc &lt;&lt; 16);</div><div class='add'>+	u32 ctrl = FLEXCAN_MB_CODE_TX_DATA | ((can_fd_len2dlc(cfd-&gt;len)) &lt;&lt; 16);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='del'>-		can_id = cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		can_id = cfd-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='ctx'> 		ctrl |= FLEXCAN_MB_CNT_IDE | FLEXCAN_MB_CNT_SRR;</div><div class='ctx'> 	} else {</div><div class='del'>-		can_id = (cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 18;</div><div class='add'>+		can_id = (cfd-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 18;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 		ctrl |= FLEXCAN_MB_CNT_RTR;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; cf-&gt;can_dlc; i += sizeof(u32)) {</div><div class='del'>-		data = be32_to_cpup((__be32 *)&amp;cf-&gt;data[i]);</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		ctrl |= FLEXCAN_MB_CNT_EDL;</div><div class='add'>+</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			ctrl |= FLEXCAN_MB_CNT_BRS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfd-&gt;len; i += sizeof(u32)) {</div><div class='add'>+		data = be32_to_cpup((__be32 *)&amp;cfd-&gt;data[i]);</div><div class='ctx'> 		priv-&gt;write(data, &amp;priv-&gt;tx_mb-&gt;data[i / sizeof(u32)]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, dev, 0);</div><div class='add'>+	can_put_echo_skb(skb, dev, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;write(can_id, &amp;priv-&gt;tx_mb-&gt;can_id);</div><div class='ctx'> 	priv-&gt;write(ctrl, &amp;priv-&gt;tx_mb-&gt;can_ctrl);</div><div class='hunk'>@@ -640,6 +836,7 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr)</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	bool rx_errors = false, tx_errors = false;</div><div class='ctx'> 	u32 timestamp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	timestamp = priv-&gt;read(&amp;regs-&gt;timer) &lt;&lt; 16;</div><div class='ctx'> </div><div class='hunk'>@@ -688,7 +885,9 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr)</div><div class='ctx'> 	if (tx_errors)</div><div class='ctx'> 		dev-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='del'>-	can_rx_offload_queue_sorted(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		dev-&gt;stats.rx_fifo_errors++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)</div><div class='hunk'>@@ -701,8 +900,7 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)</div><div class='ctx'> 	int flt;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='ctx'> 	u32 timestamp;</div><div class='del'>-</div><div class='del'>-	timestamp = priv-&gt;read(&amp;regs-&gt;timer) &lt;&lt; 16;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	flt = reg_esr &amp; FLEXCAN_ESR_FLT_CONF_MASK;</div><div class='ctx'> 	if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {</div><div class='hunk'>@@ -723,6 +921,8 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)</div><div class='ctx'> 	if (likely(new_state == priv-&gt;can.state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	timestamp = priv-&gt;read(&amp;regs-&gt;timer) &lt;&lt; 16;</div><div class='add'>+</div><div class='ctx'> 	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -732,7 +932,39 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)</div><div class='ctx'> 	if (unlikely(new_state == CAN_STATE_BUS_OFF))</div><div class='ctx'> 		can_bus_off(dev);</div><div class='ctx'> </div><div class='del'>-	can_rx_offload_queue_sorted(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		dev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 flexcan_read64_mask(struct flexcan_priv *priv, void __iomem *addr, u64 mask)</div><div class='add'>+{</div><div class='add'>+	u64 reg = 0;</div><div class='add'>+</div><div class='add'>+	if (upper_32_bits(mask))</div><div class='add'>+		reg = (u64)priv-&gt;read(addr - 4) &lt;&lt; 32;</div><div class='add'>+	if (lower_32_bits(mask))</div><div class='add'>+		reg |= priv-&gt;read(addr);</div><div class='add'>+</div><div class='add'>+	return reg &amp; mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void flexcan_write64(struct flexcan_priv *priv, u64 val, void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+	if (upper_32_bits(val))</div><div class='add'>+		priv-&gt;write(upper_32_bits(val), addr - 4);</div><div class='add'>+	if (lower_32_bits(val))</div><div class='add'>+		priv-&gt;write(lower_32_bits(val), addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 flexcan_read_reg_iflag_rx(struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return flexcan_read64_mask(priv, &amp;priv-&gt;regs-&gt;iflag1, priv-&gt;rx_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 flexcan_read_reg_iflag_tx(struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return flexcan_read64_mask(priv, &amp;priv-&gt;regs-&gt;iflag1, priv-&gt;tx_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)</div><div class='hunk'>@@ -740,19 +972,21 @@ static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *off</div><div class='ctx'> 	return container_of(offload, struct flexcan_priv, offload);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int flexcan_mailbox_read(struct can_rx_offload *offload,</div><div class='del'>-					 struct can_frame *cf,</div><div class='del'>-					 u32 *timestamp, unsigned int n)</div><div class='add'>+static struct sk_buff *flexcan_mailbox_read(struct can_rx_offload *offload,</div><div class='add'>+					    unsigned int n, u32 *timestamp,</div><div class='add'>+					    bool drop)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_priv *priv = rx_offload_to_priv(offload);</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	struct flexcan_mb __iomem *mb;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct canfd_frame *cfd;</div><div class='ctx'> 	u32 reg_ctrl, reg_id, reg_iflag1;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	mb = flexcan_get_mb(priv, n);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX) {</div><div class='ctx'> 		u32 code;</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='hunk'>@@ -763,7 +997,7 @@ static unsigned int flexcan_mailbox_read(struct can_rx_offload *offload,</div><div class='ctx'> 		code = reg_ctrl &amp; FLEXCAN_MB_CODE_MASK;</div><div class='ctx'> 		if ((code != FLEXCAN_MB_CODE_RX_FULL) &amp;&amp;</div><div class='ctx'> 		    (code != FLEXCAN_MB_CODE_RX_OVERRUN))</div><div class='del'>-			return 0;</div><div class='add'>+			return NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (code == FLEXCAN_MB_CODE_RX_OVERRUN) {</div><div class='ctx'> 			/* This MB was overrun, we lost data */</div><div class='hunk'>@@ -773,39 +1007,59 @@ static unsigned int flexcan_mailbox_read(struct can_rx_offload *offload,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		reg_iflag1 = priv-&gt;read(&amp;regs-&gt;iflag1);</div><div class='ctx'> 		if (!(reg_iflag1 &amp; FLEXCAN_IFLAG_RX_FIFO_AVAILABLE))</div><div class='del'>-			return 0;</div><div class='add'>+			return NULL;</div><div class='ctx'> </div><div class='ctx'> 		reg_ctrl = priv-&gt;read(&amp;mb-&gt;can_ctrl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(drop)) {</div><div class='add'>+		skb = ERR_PTR(-ENOBUFS);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reg_ctrl &amp; FLEXCAN_MB_CNT_EDL)</div><div class='add'>+		skb = alloc_canfd_skb(offload-&gt;dev, &amp;cfd);</div><div class='add'>+	else</div><div class='add'>+		skb = alloc_can_skb(offload-&gt;dev, (struct can_frame **)&amp;cfd);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		skb = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* increase timstamp to full 32 bit */</div><div class='ctx'> 	*timestamp = reg_ctrl &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 	reg_id = priv-&gt;read(&amp;mb-&gt;can_id);</div><div class='ctx'> 	if (reg_ctrl &amp; FLEXCAN_MB_CNT_IDE)</div><div class='del'>-		cf-&gt;can_id = ((reg_id &gt;&gt; 0) &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='add'>+		cfd-&gt;can_id = ((reg_id &gt;&gt; 0) &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='ctx'> 	else</div><div class='del'>-		cf-&gt;can_id = (reg_id &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='add'>+		cfd-&gt;can_id = (reg_id &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='ctx'> </div><div class='del'>-	if (reg_ctrl &amp; FLEXCAN_MB_CNT_RTR)</div><div class='del'>-		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc((reg_ctrl &gt;&gt; 16) &amp; 0xf);</div><div class='add'>+	if (reg_ctrl &amp; FLEXCAN_MB_CNT_EDL) {</div><div class='add'>+		cfd-&gt;len = can_fd_dlc2len((reg_ctrl &gt;&gt; 16) &amp; 0xf);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; cf-&gt;can_dlc; i += sizeof(u32)) {</div><div class='add'>+		if (reg_ctrl &amp; FLEXCAN_MB_CNT_BRS)</div><div class='add'>+			cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+	} else {</div><div class='add'>+		cfd-&gt;len = can_cc_dlc2len((reg_ctrl &gt;&gt; 16) &amp; 0xf);</div><div class='add'>+</div><div class='add'>+		if (reg_ctrl &amp; FLEXCAN_MB_CNT_RTR)</div><div class='add'>+			cfd-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reg_ctrl &amp; FLEXCAN_MB_CNT_ESI)</div><div class='add'>+		cfd-&gt;flags |= CANFD_ESI;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cfd-&gt;len; i += sizeof(u32)) {</div><div class='ctx'> 		__be32 data = cpu_to_be32(priv-&gt;read(&amp;mb-&gt;data[i / sizeof(u32)]));</div><div class='del'>-		*(__be32 *)(cf-&gt;data + i) = data;</div><div class='add'>+		*(__be32 *)(cfd-&gt;data + i) = data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* mark as read */</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {</div><div class='del'>-		/* Clear IRQ */</div><div class='del'>-		if (n &lt; 32)</div><div class='del'>-			priv-&gt;write(BIT(n), &amp;regs-&gt;iflag1);</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;write(BIT(n - 32), &amp;regs-&gt;iflag2);</div><div class='del'>-	} else {</div><div class='add'>+ mark_as_read:</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX)</div><div class='add'>+		flexcan_write64(priv, FLEXCAN_IFLAG_MB(n), &amp;regs-&gt;iflag1);</div><div class='add'>+	else</div><div class='ctx'> 		priv-&gt;write(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, &amp;regs-&gt;iflag1);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the Free Running Timer. It is optional but recommended</div><div class='ctx'> 	 * to unlock Mailbox as soon as possible and make it available</div><div class='hunk'>@@ -813,20 +1067,7 @@ static unsigned int flexcan_mailbox_read(struct can_rx_offload *offload,</div><div class='ctx'> 	 */</div><div class='ctx'> 	priv-&gt;read(&amp;regs-&gt;timer);</div><div class='ctx'> </div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline u64 flexcan_read_reg_iflag_rx(struct flexcan_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='del'>-	u32 iflag1, iflag2;</div><div class='del'>-</div><div class='del'>-	iflag2 = priv-&gt;read(&amp;regs-&gt;iflag2) &amp; priv-&gt;reg_imask2_default &amp;</div><div class='del'>-		~FLEXCAN_IFLAG_MB(priv-&gt;tx_mb_idx);</div><div class='del'>-	iflag1 = priv-&gt;read(&amp;regs-&gt;iflag1) &amp; priv-&gt;reg_imask1_default;</div><div class='del'>-</div><div class='del'>-	return (u64)iflag2 &lt;&lt; 32 | iflag1;</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t flexcan_irq(int irq, void *dev_id)</div><div class='hunk'>@@ -836,18 +1077,19 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	irqreturn_t handled = IRQ_NONE;</div><div class='del'>-	u32 reg_iflag2, reg_esr;</div><div class='add'>+	u64 reg_iflag_tx;</div><div class='add'>+	u32 reg_esr;</div><div class='ctx'> 	enum can_state last_state = priv-&gt;can.state;</div><div class='ctx'> </div><div class='ctx'> 	/* reception interrupt */</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {</div><div class='del'>-		u64 reg_iflag;</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX) {</div><div class='add'>+		u64 reg_iflag_rx;</div><div class='ctx'> 		int ret;</div><div class='ctx'> </div><div class='del'>-		while ((reg_iflag = flexcan_read_reg_iflag_rx(priv))) {</div><div class='add'>+		while ((reg_iflag_rx = flexcan_read_reg_iflag_rx(priv))) {</div><div class='ctx'> 			handled = IRQ_HANDLED;</div><div class='ctx'> 			ret = can_rx_offload_irq_offload_timestamp(&amp;priv-&gt;offload,</div><div class='del'>-								   reg_iflag);</div><div class='add'>+								   reg_iflag_rx);</div><div class='ctx'> 			if (!ret)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -870,36 +1112,36 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reg_iflag2 = priv-&gt;read(&amp;regs-&gt;iflag2);</div><div class='add'>+	reg_iflag_tx = flexcan_read_reg_iflag_tx(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* transmission complete interrupt */</div><div class='del'>-	if (reg_iflag2 &amp; FLEXCAN_IFLAG_MB(priv-&gt;tx_mb_idx)) {</div><div class='add'>+	if (reg_iflag_tx &amp; priv-&gt;tx_mask) {</div><div class='ctx'> 		u32 reg_ctrl = priv-&gt;read(&amp;priv-&gt;tx_mb-&gt;can_ctrl);</div><div class='ctx'> </div><div class='ctx'> 		handled = IRQ_HANDLED;</div><div class='del'>-		stats-&gt;tx_bytes += can_rx_offload_get_echo_skb(&amp;priv-&gt;offload,</div><div class='del'>-							       0, reg_ctrl &lt;&lt; 16);</div><div class='add'>+		stats-&gt;tx_bytes +=</div><div class='add'>+			can_rx_offload_get_echo_skb_queue_timestamp(&amp;priv-&gt;offload, 0,</div><div class='add'>+								    reg_ctrl &lt;&lt; 16, NULL);</div><div class='ctx'> 		stats-&gt;tx_packets++;</div><div class='del'>-		can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='ctx'> </div><div class='ctx'> 		/* after sending a RTR frame MB is in RX mode */</div><div class='ctx'> 		priv-&gt;write(FLEXCAN_MB_CODE_TX_INACTIVE,</div><div class='ctx'> 			    &amp;priv-&gt;tx_mb-&gt;can_ctrl);</div><div class='del'>-		priv-&gt;write(FLEXCAN_IFLAG_MB(priv-&gt;tx_mb_idx), &amp;regs-&gt;iflag2);</div><div class='add'>+		flexcan_write64(priv, priv-&gt;tx_mask, &amp;regs-&gt;iflag1);</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	reg_esr = priv-&gt;read(&amp;regs-&gt;esr);</div><div class='ctx'> </div><div class='del'>-	/* ACK all bus error and state change IRQ sources */</div><div class='del'>-	if (reg_esr &amp; FLEXCAN_ESR_ALL_INT) {</div><div class='add'>+	/* ACK all bus error, state change and wake IRQ sources */</div><div class='add'>+	if (reg_esr &amp; (FLEXCAN_ESR_ALL_INT | FLEXCAN_ESR_WAK_INT)) {</div><div class='ctx'> 		handled = IRQ_HANDLED;</div><div class='del'>-		priv-&gt;write(reg_esr &amp; FLEXCAN_ESR_ALL_INT, &amp;regs-&gt;esr);</div><div class='add'>+		priv-&gt;write(reg_esr &amp; (FLEXCAN_ESR_ALL_INT | FLEXCAN_ESR_WAK_INT), &amp;regs-&gt;esr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* state change interrupt or broken error state quirk fix is enabled */</div><div class='ctx'> 	if ((reg_esr &amp; FLEXCAN_ESR_ERR_STATE) ||</div><div class='del'>-	    (priv-&gt;devtype_data-&gt;quirks &amp; (FLEXCAN_QUIRK_BROKEN_WERR_STATE |</div><div class='add'>+	    (priv-&gt;devtype_data.quirks &amp; (FLEXCAN_QUIRK_BROKEN_WERR_STATE |</div><div class='ctx'> 					   FLEXCAN_QUIRK_BROKEN_PERR_STATE)))</div><div class='ctx'> 		flexcan_irq_state(dev, reg_esr);</div><div class='ctx'> </div><div class='hunk'>@@ -921,11 +1163,11 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)</div><div class='ctx'> 	 * (1): enabled if FLEXCAN_QUIRK_BROKEN_WERR_STATE is enabled</div><div class='ctx'> 	 */</div><div class='ctx'> 	if ((last_state != priv-&gt;can.state) &amp;&amp;</div><div class='del'>-	    (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_BROKEN_PERR_STATE) &amp;&amp;</div><div class='add'>+	    (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_BROKEN_PERR_STATE) &amp;&amp;</div><div class='ctx'> 	    !(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)) {</div><div class='ctx'> 		switch (priv-&gt;can.state) {</div><div class='ctx'> 		case CAN_STATE_ERROR_ACTIVE:</div><div class='del'>-			if (priv-&gt;devtype_data-&gt;quirks &amp;</div><div class='add'>+			if (priv-&gt;devtype_data.quirks &amp;</div><div class='ctx'> 			    FLEXCAN_QUIRK_BROKEN_WERR_STATE)</div><div class='ctx'> 				flexcan_error_irq_enable(priv);</div><div class='ctx'> 			else</div><div class='hunk'>@@ -946,10 +1188,13 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (handled)</div><div class='add'>+		can_rx_offload_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='ctx'> 	return handled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void flexcan_set_bittiming(struct net_device *dev)</div><div class='add'>+static void flexcan_set_bittiming_ctrl(const struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='hunk'>@@ -961,10 +1206,7 @@ static void flexcan_set_bittiming(struct net_device *dev)</div><div class='ctx'> 		 FLEXCAN_CTRL_RJW(0x3) |</div><div class='ctx'> 		 FLEXCAN_CTRL_PSEG1(0x7) |</div><div class='ctx'> 		 FLEXCAN_CTRL_PSEG2(0x7) |</div><div class='del'>-		 FLEXCAN_CTRL_PROPSEG(0x7) |</div><div class='del'>-		 FLEXCAN_CTRL_LPB |</div><div class='del'>-		 FLEXCAN_CTRL_SMP |</div><div class='del'>-		 FLEXCAN_CTRL_LOM);</div><div class='add'>+		 FLEXCAN_CTRL_PROPSEG(0x7));</div><div class='ctx'> </div><div class='ctx'> 	reg |= FLEXCAN_CTRL_PRESDIV(bt-&gt;brp - 1) |</div><div class='ctx'> 		FLEXCAN_CTRL_PSEG1(bt-&gt;phase_seg1 - 1) |</div><div class='hunk'>@@ -972,6 +1214,130 @@ static void flexcan_set_bittiming(struct net_device *dev)</div><div class='ctx'> 		FLEXCAN_CTRL_RJW(bt-&gt;sjw - 1) |</div><div class='ctx'> 		FLEXCAN_CTRL_PROPSEG(bt-&gt;prop_seg - 1);</div><div class='ctx'> </div><div class='add'>+	netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);</div><div class='add'>+	priv-&gt;write(reg, &amp;regs-&gt;ctrl);</div><div class='add'>+</div><div class='add'>+	/* print chip status */</div><div class='add'>+	netdev_dbg(dev, "%s: mcr=0x%08x ctrl=0x%08x\n", __func__,</div><div class='add'>+		   priv-&gt;read(&amp;regs-&gt;mcr), priv-&gt;read(&amp;regs-&gt;ctrl));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flexcan_set_bittiming_cbt(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 reg_cbt, reg_fdctrl;</div><div class='add'>+</div><div class='add'>+	/* CBT */</div><div class='add'>+	/* CBT[EPSEG1] is 5 bit long and CBT[EPROPSEG] is 6 bit</div><div class='add'>+	 * long. The can_calc_bittiming() tries to divide the tseg1</div><div class='add'>+	 * equally between phase_seg1 and prop_seg, which may not fit</div><div class='add'>+	 * in CBT register. Therefore, if phase_seg1 is more than</div><div class='add'>+	 * possible value, increase prop_seg and decrease phase_seg1.</div><div class='add'>+	 */</div><div class='add'>+	if (bt-&gt;phase_seg1 &gt; 0x20) {</div><div class='add'>+		bt-&gt;prop_seg += (bt-&gt;phase_seg1 - 0x20);</div><div class='add'>+		bt-&gt;phase_seg1 = 0x20;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg_cbt = FLEXCAN_CBT_BTF |</div><div class='add'>+		FIELD_PREP(FLEXCAN_CBT_EPRESDIV_MASK, bt-&gt;brp - 1) |</div><div class='add'>+		FIELD_PREP(FLEXCAN_CBT_ERJW_MASK, bt-&gt;sjw - 1) |</div><div class='add'>+		FIELD_PREP(FLEXCAN_CBT_EPROPSEG_MASK, bt-&gt;prop_seg - 1) |</div><div class='add'>+		FIELD_PREP(FLEXCAN_CBT_EPSEG1_MASK, bt-&gt;phase_seg1 - 1) |</div><div class='add'>+		FIELD_PREP(FLEXCAN_CBT_EPSEG2_MASK, bt-&gt;phase_seg2 - 1);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "writing cbt=0x%08x\n", reg_cbt);</div><div class='add'>+	priv-&gt;write(reg_cbt, &amp;regs-&gt;cbt);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		u32 reg_fdcbt, reg_ctrl2;</div><div class='add'>+</div><div class='add'>+		if (bt-&gt;brp != dbt-&gt;brp)</div><div class='add'>+			netdev_warn(dev, "Data brp=%d and brp=%d don't match, this may result in a phase error. Consider using different bitrate and/or data bitrate.\n",</div><div class='add'>+				    dbt-&gt;brp, bt-&gt;brp);</div><div class='add'>+</div><div class='add'>+		/* FDCBT */</div><div class='add'>+		/* FDCBT[FPSEG1] is 3 bit long and FDCBT[FPROPSEG] is</div><div class='add'>+		 * 5 bit long. The can_calc_bittiming tries to divide</div><div class='add'>+		 * the tseg1 equally between phase_seg1 and prop_seg,</div><div class='add'>+		 * which may not fit in FDCBT register. Therefore, if</div><div class='add'>+		 * phase_seg1 is more than possible value, increase</div><div class='add'>+		 * prop_seg and decrease phase_seg1</div><div class='add'>+		 */</div><div class='add'>+		if (dbt-&gt;phase_seg1 &gt; 0x8) {</div><div class='add'>+			dbt-&gt;prop_seg += (dbt-&gt;phase_seg1 - 0x8);</div><div class='add'>+			dbt-&gt;phase_seg1 = 0x8;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		reg_fdcbt = priv-&gt;read(&amp;regs-&gt;fdcbt);</div><div class='add'>+		reg_fdcbt &amp;= ~(FIELD_PREP(FLEXCAN_FDCBT_FPRESDIV_MASK, 0x3ff) |</div><div class='add'>+			       FIELD_PREP(FLEXCAN_FDCBT_FRJW_MASK, 0x7) |</div><div class='add'>+			       FIELD_PREP(FLEXCAN_FDCBT_FPROPSEG_MASK, 0x1f) |</div><div class='add'>+			       FIELD_PREP(FLEXCAN_FDCBT_FPSEG1_MASK, 0x7) |</div><div class='add'>+			       FIELD_PREP(FLEXCAN_FDCBT_FPSEG2_MASK, 0x7));</div><div class='add'>+</div><div class='add'>+		reg_fdcbt |= FIELD_PREP(FLEXCAN_FDCBT_FPRESDIV_MASK, dbt-&gt;brp - 1) |</div><div class='add'>+			FIELD_PREP(FLEXCAN_FDCBT_FRJW_MASK, dbt-&gt;sjw - 1) |</div><div class='add'>+			FIELD_PREP(FLEXCAN_FDCBT_FPROPSEG_MASK, dbt-&gt;prop_seg) |</div><div class='add'>+			FIELD_PREP(FLEXCAN_FDCBT_FPSEG1_MASK, dbt-&gt;phase_seg1 - 1) |</div><div class='add'>+			FIELD_PREP(FLEXCAN_FDCBT_FPSEG2_MASK, dbt-&gt;phase_seg2 - 1);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(dev, "writing fdcbt=0x%08x\n", reg_fdcbt);</div><div class='add'>+		priv-&gt;write(reg_fdcbt, &amp;regs-&gt;fdcbt);</div><div class='add'>+</div><div class='add'>+		/* CTRL2 */</div><div class='add'>+		reg_ctrl2 = priv-&gt;read(&amp;regs-&gt;ctrl2);</div><div class='add'>+		reg_ctrl2 &amp;= ~FLEXCAN_CTRL2_ISOCANFDEN;</div><div class='add'>+		if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO))</div><div class='add'>+			reg_ctrl2 |= FLEXCAN_CTRL2_ISOCANFDEN;</div><div class='add'>+</div><div class='add'>+		netdev_dbg(dev, "writing ctrl2=0x%08x\n", reg_ctrl2);</div><div class='add'>+		priv-&gt;write(reg_ctrl2, &amp;regs-&gt;ctrl2);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FDCTRL */</div><div class='add'>+	reg_fdctrl = priv-&gt;read(&amp;regs-&gt;fdctrl);</div><div class='add'>+	reg_fdctrl &amp;= ~(FLEXCAN_FDCTRL_FDRATE |</div><div class='add'>+			FIELD_PREP(FLEXCAN_FDCTRL_TDCOFF, 0x1f));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		reg_fdctrl |= FLEXCAN_FDCTRL_FDRATE;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK) {</div><div class='add'>+			/* TDC must be disabled for Loop Back mode */</div><div class='add'>+			reg_fdctrl &amp;= ~FLEXCAN_FDCTRL_TDCEN;</div><div class='add'>+		} else {</div><div class='add'>+			reg_fdctrl |= FLEXCAN_FDCTRL_TDCEN |</div><div class='add'>+				FIELD_PREP(FLEXCAN_FDCTRL_TDCOFF,</div><div class='add'>+					   ((dbt-&gt;phase_seg1 - 1) +</div><div class='add'>+					    dbt-&gt;prop_seg + 2) *</div><div class='add'>+					   ((dbt-&gt;brp - 1 ) + 1));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "writing fdctrl=0x%08x\n", reg_fdctrl);</div><div class='add'>+	priv-&gt;write(reg_fdctrl, &amp;regs-&gt;fdctrl);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "%s: mcr=0x%08x ctrl=0x%08x ctrl2=0x%08x fdctrl=0x%08x cbt=0x%08x fdcbt=0x%08x\n",</div><div class='add'>+		   __func__,</div><div class='add'>+		   priv-&gt;read(&amp;regs-&gt;mcr), priv-&gt;read(&amp;regs-&gt;ctrl),</div><div class='add'>+		   priv-&gt;read(&amp;regs-&gt;ctrl2), priv-&gt;read(&amp;regs-&gt;fdctrl),</div><div class='add'>+		   priv-&gt;read(&amp;regs-&gt;cbt), priv-&gt;read(&amp;regs-&gt;fdcbt));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flexcan_set_bittiming(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = priv-&gt;read(&amp;regs-&gt;ctrl);</div><div class='add'>+	reg &amp;= ~(FLEXCAN_CTRL_LPB | FLEXCAN_CTRL_SMP |</div><div class='add'>+		 FLEXCAN_CTRL_LOM);</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='ctx'> 		reg |= FLEXCAN_CTRL_LPB;</div><div class='ctx'> 	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='hunk'>@@ -982,9 +1348,107 @@ static void flexcan_set_bittiming(struct net_device *dev)</div><div class='ctx'> 	netdev_dbg(dev, "writing ctrl=0x%08x\n", reg);</div><div class='ctx'> 	priv-&gt;write(reg, &amp;regs-&gt;ctrl);</div><div class='ctx'> </div><div class='del'>-	/* print chip status */</div><div class='del'>-	netdev_dbg(dev, "%s: mcr=0x%08x ctrl=0x%08x\n", __func__,</div><div class='del'>-		   priv-&gt;read(&amp;regs-&gt;mcr), priv-&gt;read(&amp;regs-&gt;ctrl));</div><div class='add'>+	if (priv-&gt;can.ctrlmode_supported &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		return flexcan_set_bittiming_cbt(dev);</div><div class='add'>+	else</div><div class='add'>+		return flexcan_set_bittiming_ctrl(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flexcan_ram_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u32 reg_ctrl2;</div><div class='add'>+</div><div class='add'>+	/* 11.8.3.13 Detection and correction of memory errors:</div><div class='add'>+	 * CTRL2[WRMFRZ] grants write access to all memory positions</div><div class='add'>+	 * that require initialization, ranging from 0x080 to 0xADF</div><div class='add'>+	 * and from 0xF28 to 0xFFF when the CAN FD feature is enabled.</div><div class='add'>+	 * The RXMGMASK, RX14MASK, RX15MASK, and RXFGMASK registers</div><div class='add'>+	 * need to be initialized as well. MCR[RFEN] must not be set</div><div class='add'>+	 * during memory initialization.</div><div class='add'>+	 */</div><div class='add'>+	reg_ctrl2 = priv-&gt;read(&amp;regs-&gt;ctrl2);</div><div class='add'>+	reg_ctrl2 |= FLEXCAN_CTRL2_WRMFRZ;</div><div class='add'>+	priv-&gt;write(reg_ctrl2, &amp;regs-&gt;ctrl2);</div><div class='add'>+</div><div class='add'>+	memset_io(&amp;regs-&gt;init, 0, sizeof(regs-&gt;init));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		memset_io(&amp;regs-&gt;init_fd, 0, sizeof(regs-&gt;init_fd));</div><div class='add'>+</div><div class='add'>+	reg_ctrl2 &amp;= ~FLEXCAN_CTRL2_WRMFRZ;</div><div class='add'>+	priv-&gt;write(reg_ctrl2, &amp;regs-&gt;ctrl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int flexcan_rx_offload_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		priv-&gt;mb_size = sizeof(struct flexcan_mb) + CANFD_MAX_DLEN;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mb_size = sizeof(struct flexcan_mb) + CAN_MAX_DLEN;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_NR_MB_16)</div><div class='add'>+		priv-&gt;mb_count = 16;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mb_count = (sizeof(priv-&gt;regs-&gt;mb[0]) / priv-&gt;mb_size) +</div><div class='add'>+				 (sizeof(priv-&gt;regs-&gt;mb[1]) / priv-&gt;mb_size);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX)</div><div class='add'>+		priv-&gt;tx_mb_reserved =</div><div class='add'>+			flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_RX_MAILBOX);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;tx_mb_reserved =</div><div class='add'>+			flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_RX_FIFO);</div><div class='add'>+	priv-&gt;tx_mb_idx = priv-&gt;mb_count - 1;</div><div class='add'>+	priv-&gt;tx_mb = flexcan_get_mb(priv, priv-&gt;tx_mb_idx);</div><div class='add'>+	priv-&gt;tx_mask = FLEXCAN_IFLAG_MB(priv-&gt;tx_mb_idx);</div><div class='add'>+</div><div class='add'>+	priv-&gt;offload.mailbox_read = flexcan_mailbox_read;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX) {</div><div class='add'>+		priv-&gt;offload.mb_first = FLEXCAN_RX_MB_RX_MAILBOX_FIRST;</div><div class='add'>+		priv-&gt;offload.mb_last = priv-&gt;mb_count - 2;</div><div class='add'>+</div><div class='add'>+		priv-&gt;rx_mask = GENMASK_ULL(priv-&gt;offload.mb_last,</div><div class='add'>+					    priv-&gt;offload.mb_first);</div><div class='add'>+		err = can_rx_offload_add_timestamp(dev, &amp;priv-&gt;offload);</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;rx_mask = FLEXCAN_IFLAG_RX_FIFO_OVERFLOW |</div><div class='add'>+			FLEXCAN_IFLAG_RX_FIFO_AVAILABLE;</div><div class='add'>+		err = can_rx_offload_add_fifo(dev, &amp;priv-&gt;offload,</div><div class='add'>+					      FLEXCAN_NAPI_WEIGHT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flexcan_chip_interrupts_enable(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	u64 reg_imask;</div><div class='add'>+</div><div class='add'>+	disable_irq(dev-&gt;irq);</div><div class='add'>+	priv-&gt;write(priv-&gt;reg_ctrl_default, &amp;regs-&gt;ctrl);</div><div class='add'>+	reg_imask = priv-&gt;rx_mask | priv-&gt;tx_mask;</div><div class='add'>+	priv-&gt;write(upper_32_bits(reg_imask), &amp;regs-&gt;imask2);</div><div class='add'>+	priv-&gt;write(lower_32_bits(reg_imask), &amp;regs-&gt;imask1);</div><div class='add'>+	enable_irq(dev-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void flexcan_chip_interrupts_disable(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+</div><div class='add'>+	priv-&gt;write(0, &amp;regs-&gt;imask2);</div><div class='add'>+	priv-&gt;write(0, &amp;regs-&gt;imask1);</div><div class='add'>+	priv-&gt;write(priv-&gt;reg_ctrl_default &amp; ~FLEXCAN_CTRL_ERR_ALL,</div><div class='add'>+		    &amp;regs-&gt;ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* flexcan_chip_start</div><div class='hunk'>@@ -1010,12 +1474,18 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_chip_disable;</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SUPPORT_ECC)</div><div class='add'>+		flexcan_ram_init(dev);</div><div class='add'>+</div><div class='ctx'> 	flexcan_set_bittiming(dev);</div><div class='ctx'> </div><div class='add'>+	/* set freeze, halt */</div><div class='add'>+	err = flexcan_chip_freeze(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_disable;</div><div class='add'>+</div><div class='ctx'> 	/* MCR</div><div class='ctx'> 	 *</div><div class='del'>-	 * enable freeze</div><div class='del'>-	 * halt now</div><div class='ctx'> 	 * only supervisor access</div><div class='ctx'> 	 * enable warning int</div><div class='ctx'> 	 * enable individual RX masking</div><div class='hunk'>@@ -1024,17 +1494,16 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	reg_mcr = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='ctx'> 	reg_mcr &amp;= ~FLEXCAN_MCR_MAXMB(0xff);</div><div class='del'>-	reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT | FLEXCAN_MCR_SUPV |</div><div class='del'>-		FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_IRMQ | FLEXCAN_MCR_IDAM_C |</div><div class='del'>-		FLEXCAN_MCR_MAXMB(priv-&gt;tx_mb_idx);</div><div class='add'>+	reg_mcr |= FLEXCAN_MCR_SUPV | FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_IRMQ |</div><div class='add'>+		FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_MAXMB(priv-&gt;tx_mb_idx);</div><div class='ctx'> </div><div class='ctx'> 	/* MCR</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * FIFO:</div><div class='del'>-	 * - disable for timestamp mode</div><div class='add'>+	 * - disable for mailbox mode</div><div class='ctx'> 	 * - enable for FIFO mode</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX)</div><div class='ctx'> 		reg_mcr &amp;= ~FLEXCAN_MCR_FEN;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg_mcr |= FLEXCAN_MCR_FEN;</div><div class='hunk'>@@ -1056,6 +1525,12 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		reg_mcr |= FLEXCAN_MCR_SRX_DIS;</div><div class='ctx'> </div><div class='add'>+	/* MCR - CAN-FD */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		reg_mcr |= FLEXCAN_MCR_FDEN;</div><div class='add'>+	else</div><div class='add'>+		reg_mcr &amp;= ~FLEXCAN_MCR_FDEN;</div><div class='add'>+</div><div class='ctx'> 	netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);</div><div class='ctx'> 	priv-&gt;write(reg_mcr, &amp;regs-&gt;mcr);</div><div class='ctx'> </div><div class='hunk'>@@ -1079,7 +1554,7 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 	 * on most Flexcan cores, too. Otherwise we don't get</div><div class='ctx'> 	 * any error warning or passive interrupts.</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_BROKEN_WERR_STATE ||</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_BROKEN_WERR_STATE ||</div><div class='ctx'> 	    priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='ctx'> 		reg_ctrl |= FLEXCAN_CTRL_ERR_MSK;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1092,13 +1567,39 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 	netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);</div><div class='ctx'> 	priv-&gt;write(reg_ctrl, &amp;regs-&gt;ctrl);</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {</div><div class='add'>+	if ((priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_ENABLE_EACEN_RRS)) {</div><div class='ctx'> 		reg_ctrl2 = priv-&gt;read(&amp;regs-&gt;ctrl2);</div><div class='ctx'> 		reg_ctrl2 |= FLEXCAN_CTRL2_EACEN | FLEXCAN_CTRL2_RRS;</div><div class='ctx'> 		priv-&gt;write(reg_ctrl2, &amp;regs-&gt;ctrl2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {</div><div class='add'>+	if (priv-&gt;can.ctrlmode_supported &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		u32 reg_fdctrl;</div><div class='add'>+</div><div class='add'>+		reg_fdctrl = priv-&gt;read(&amp;regs-&gt;fdctrl);</div><div class='add'>+		reg_fdctrl &amp;= ~(FIELD_PREP(FLEXCAN_FDCTRL_MBDSR1, 0x3) |</div><div class='add'>+				FIELD_PREP(FLEXCAN_FDCTRL_MBDSR0, 0x3));</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+			reg_fdctrl |=</div><div class='add'>+				FIELD_PREP(FLEXCAN_FDCTRL_MBDSR1,</div><div class='add'>+					   FLEXCAN_FDCTRL_MBDSR_64) |</div><div class='add'>+				FIELD_PREP(FLEXCAN_FDCTRL_MBDSR0,</div><div class='add'>+					   FLEXCAN_FDCTRL_MBDSR_64);</div><div class='add'>+		} else {</div><div class='add'>+			reg_fdctrl |=</div><div class='add'>+				FIELD_PREP(FLEXCAN_FDCTRL_MBDSR1,</div><div class='add'>+					   FLEXCAN_FDCTRL_MBDSR_8) |</div><div class='add'>+				FIELD_PREP(FLEXCAN_FDCTRL_MBDSR0,</div><div class='add'>+					   FLEXCAN_FDCTRL_MBDSR_8);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev_dbg(dev, "%s: writing fdctrl=0x%08x",</div><div class='add'>+			   __func__, reg_fdctrl);</div><div class='add'>+		priv-&gt;write(reg_fdctrl, &amp;regs-&gt;fdctrl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX) {</div><div class='ctx'> 		for (i = priv-&gt;offload.mb_first; i &lt;= priv-&gt;offload.mb_last; i++) {</div><div class='ctx'> 			mb = flexcan_get_mb(priv, i);</div><div class='ctx'> 			priv-&gt;write(FLEXCAN_MB_CODE_RX_EMPTY,</div><div class='hunk'>@@ -1106,7 +1607,7 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* clear and invalidate unused mailboxes first */</div><div class='del'>-		for (i = FLEXCAN_TX_MB_RESERVED_OFF_FIFO; i &lt; priv-&gt;mb_count; i++) {</div><div class='add'>+		for (i = FLEXCAN_TX_MB_RESERVED_RX_FIFO; i &lt; priv-&gt;mb_count; i++) {</div><div class='ctx'> 			mb = flexcan_get_mb(priv, i);</div><div class='ctx'> 			priv-&gt;write(FLEXCAN_MB_CODE_RX_INACTIVE,</div><div class='ctx'> 				    &amp;mb-&gt;can_ctrl);</div><div class='hunk'>@@ -1126,88 +1627,105 @@ static int flexcan_chip_start(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;write(0x0, &amp;regs-&gt;rx14mask);</div><div class='ctx'> 	priv-&gt;write(0x0, &amp;regs-&gt;rx15mask);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_DISABLE_RXFG)</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_DISABLE_RXFG)</div><div class='ctx'> 		priv-&gt;write(0x0, &amp;regs-&gt;rxfgmask);</div><div class='ctx'> </div><div class='ctx'> 	/* clear acceptance filters */</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;mb_count; i++)</div><div class='ctx'> 		priv-&gt;write(0, &amp;regs-&gt;rximr[i]);</div><div class='ctx'> </div><div class='del'>-	/* On Vybrid, disable memory error detection interrupts</div><div class='del'>-	 * and freeze mode.</div><div class='del'>-	 * This also works around errata e5295 which generates</div><div class='del'>-	 * false positive memory errors and put the device in</div><div class='del'>-	 * freeze mode.</div><div class='add'>+	/* On Vybrid, disable non-correctable errors interrupt and</div><div class='add'>+	 * freeze mode. It still can correct the correctable errors</div><div class='add'>+	 * when HW supports ECC.</div><div class='add'>+	 *</div><div class='add'>+	 * This also works around errata e5295 which generates false</div><div class='add'>+	 * positive memory errors and put the device in freeze mode.</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_DISABLE_MECR) {</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_DISABLE_MECR) {</div><div class='ctx'> 		/* Follow the protocol as described in "Detection</div><div class='ctx'> 		 * and Correction of Memory Errors" to write to</div><div class='del'>-		 * MECR register</div><div class='add'>+		 * MECR register (step 1 - 5)</div><div class='add'>+		 *</div><div class='add'>+		 * 1. By default, CTRL2[ECRWRE] = 0, MECR[ECRWRDIS] = 1</div><div class='add'>+		 * 2. set CTRL2[ECRWRE]</div><div class='ctx'> 		 */</div><div class='ctx'> 		reg_ctrl2 = priv-&gt;read(&amp;regs-&gt;ctrl2);</div><div class='ctx'> 		reg_ctrl2 |= FLEXCAN_CTRL2_ECRWRE;</div><div class='ctx'> 		priv-&gt;write(reg_ctrl2, &amp;regs-&gt;ctrl2);</div><div class='ctx'> </div><div class='add'>+		/* 3. clear MECR[ECRWRDIS] */</div><div class='ctx'> 		reg_mecr = priv-&gt;read(&amp;regs-&gt;mecr);</div><div class='ctx'> 		reg_mecr &amp;= ~FLEXCAN_MECR_ECRWRDIS;</div><div class='ctx'> 		priv-&gt;write(reg_mecr, &amp;regs-&gt;mecr);</div><div class='add'>+</div><div class='add'>+		/* 4. all writes to MECR must keep MECR[ECRWRDIS] cleared */</div><div class='ctx'> 		reg_mecr &amp;= ~(FLEXCAN_MECR_NCEFAFRZ | FLEXCAN_MECR_HANCEI_MSK |</div><div class='ctx'> 			      FLEXCAN_MECR_FANCEI_MSK);</div><div class='ctx'> 		priv-&gt;write(reg_mecr, &amp;regs-&gt;mecr);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = flexcan_transceiver_enable(priv);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_chip_disable;</div><div class='add'>+		/* 5. after configuration done, lock MECR by either</div><div class='add'>+		 * setting MECR[ECRWRDIS] or clearing CTRL2[ECRWRE]</div><div class='add'>+		 */</div><div class='add'>+		reg_mecr |= FLEXCAN_MECR_ECRWRDIS;</div><div class='add'>+		priv-&gt;write(reg_mecr, &amp;regs-&gt;mecr);</div><div class='add'>+</div><div class='add'>+		reg_ctrl2 &amp;= ~FLEXCAN_CTRL2_ECRWRE;</div><div class='add'>+		priv-&gt;write(reg_ctrl2, &amp;regs-&gt;ctrl2);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* synchronize with the can bus */</div><div class='ctx'> 	err = flexcan_chip_unfreeze(priv);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_transceiver_disable;</div><div class='add'>+		goto out_chip_disable;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> </div><div class='del'>-	/* enable interrupts atomically */</div><div class='del'>-	disable_irq(dev-&gt;irq);</div><div class='del'>-	priv-&gt;write(priv-&gt;reg_ctrl_default, &amp;regs-&gt;ctrl);</div><div class='del'>-	priv-&gt;write(priv-&gt;reg_imask1_default, &amp;regs-&gt;imask1);</div><div class='del'>-	priv-&gt;write(priv-&gt;reg_imask2_default, &amp;regs-&gt;imask2);</div><div class='del'>-	enable_irq(dev-&gt;irq);</div><div class='del'>-</div><div class='ctx'> 	/* print chip status */</div><div class='ctx'> 	netdev_dbg(dev, "%s: reading mcr=0x%08x ctrl=0x%08x\n", __func__,</div><div class='ctx'> 		   priv-&gt;read(&amp;regs-&gt;mcr), priv-&gt;read(&amp;regs-&gt;ctrl));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_transceiver_disable:</div><div class='del'>-	flexcan_transceiver_disable(priv);</div><div class='ctx'>  out_chip_disable:</div><div class='ctx'> 	flexcan_chip_disable(priv);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* flexcan_chip_stop</div><div class='add'>+/* __flexcan_chip_stop</div><div class='ctx'>  *</div><div class='del'>- * this functions is entered with clocks enabled</div><div class='add'>+ * this function is entered with clocks enabled</div><div class='ctx'>  */</div><div class='del'>-static void flexcan_chip_stop(struct net_device *dev)</div><div class='add'>+static int __flexcan_chip_stop(struct net_device *dev, bool disable_on_error)</div><div class='ctx'> {</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* freeze + disable module */</div><div class='del'>-	flexcan_chip_freeze(priv);</div><div class='del'>-	flexcan_chip_disable(priv);</div><div class='del'>-</div><div class='del'>-	/* Disable all interrupts */</div><div class='del'>-	priv-&gt;write(0, &amp;regs-&gt;imask2);</div><div class='del'>-	priv-&gt;write(0, &amp;regs-&gt;imask1);</div><div class='del'>-	priv-&gt;write(priv-&gt;reg_ctrl_default &amp; ~FLEXCAN_CTRL_ERR_ALL,</div><div class='del'>-		    &amp;regs-&gt;ctrl);</div><div class='add'>+	err = flexcan_chip_freeze(priv);</div><div class='add'>+	if (err &amp;&amp; !disable_on_error)</div><div class='add'>+		return err;</div><div class='add'>+	err = flexcan_chip_disable(priv);</div><div class='add'>+	if (err &amp;&amp; !disable_on_error)</div><div class='add'>+		goto out_chip_unfreeze;</div><div class='ctx'> </div><div class='del'>-	flexcan_transceiver_disable(priv);</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_chip_unfreeze:</div><div class='add'>+	flexcan_chip_unfreeze(priv);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int flexcan_chip_stop_disable_on_error(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return __flexcan_chip_stop(dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int flexcan_chip_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return __flexcan_chip_stop(dev, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int flexcan_open(struct net_device *dev)</div><div class='hunk'>@@ -1215,83 +1733,82 @@ static int flexcan_open(struct net_device *dev)</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk_ipg);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES) &amp;&amp;</div><div class='add'>+	    (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)) {</div><div class='add'>+		netdev_err(dev, "Three Samples mode and CAN-FD mode can't be used together\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk_per);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_disable_ipg;</div><div class='add'>+	err = pm_runtime_resume_and_get(priv-&gt;dev);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = open_candev(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_disable_per;</div><div class='add'>+		goto out_runtime_put;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(dev-&gt;irq, flexcan_irq, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+	err = flexcan_transceiver_enable(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;mb_size = sizeof(struct flexcan_mb) + CAN_MAX_DLEN;</div><div class='del'>-	priv-&gt;mb_count = (sizeof(priv-&gt;regs-&gt;mb[0]) / priv-&gt;mb_size) +</div><div class='del'>-			 (sizeof(priv-&gt;regs-&gt;mb[1]) / priv-&gt;mb_size);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)</div><div class='del'>-		priv-&gt;tx_mb_reserved =</div><div class='del'>-			flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP);</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;tx_mb_reserved =</div><div class='del'>-			flexcan_get_mb(priv, FLEXCAN_TX_MB_RESERVED_OFF_FIFO);</div><div class='del'>-	priv-&gt;tx_mb_idx = priv-&gt;mb_count - 1;</div><div class='del'>-	priv-&gt;tx_mb = flexcan_get_mb(priv, priv-&gt;tx_mb_idx);</div><div class='del'>-</div><div class='del'>-	priv-&gt;reg_imask1_default = 0;</div><div class='del'>-	priv-&gt;reg_imask2_default = FLEXCAN_IFLAG_MB(priv-&gt;tx_mb_idx);</div><div class='add'>+	err = flexcan_rx_offload_setup(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_transceiver_disable;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;offload.mailbox_read = flexcan_mailbox_read;</div><div class='add'>+	err = flexcan_chip_start(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_can_rx_offload_del;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {</div><div class='del'>-		u64 imask;</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='ctx'> </div><div class='del'>-		priv-&gt;offload.mb_first = FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST;</div><div class='del'>-		priv-&gt;offload.mb_last = priv-&gt;mb_count - 2;</div><div class='add'>+	err = request_irq(dev-&gt;irq, flexcan_irq, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_can_rx_offload_disable;</div><div class='ctx'> </div><div class='del'>-		imask = GENMASK_ULL(priv-&gt;offload.mb_last,</div><div class='del'>-				    priv-&gt;offload.mb_first);</div><div class='del'>-		priv-&gt;reg_imask1_default |= imask;</div><div class='del'>-		priv-&gt;reg_imask2_default |= imask &gt;&gt; 32;</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_NR_IRQ_3) {</div><div class='add'>+		err = request_irq(priv-&gt;irq_boff,</div><div class='add'>+				  flexcan_irq, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_irq;</div><div class='ctx'> </div><div class='del'>-		err = can_rx_offload_add_timestamp(dev, &amp;priv-&gt;offload);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;reg_imask1_default |= FLEXCAN_IFLAG_RX_FIFO_OVERFLOW |</div><div class='del'>-			FLEXCAN_IFLAG_RX_FIFO_AVAILABLE;</div><div class='del'>-		err = can_rx_offload_add_fifo(dev, &amp;priv-&gt;offload,</div><div class='del'>-					      FLEXCAN_NAPI_WEIGHT);</div><div class='add'>+		err = request_irq(priv-&gt;irq_err,</div><div class='add'>+				  flexcan_irq, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_irq_boff;</div><div class='ctx'> 	}</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_free_irq;</div><div class='ctx'> </div><div class='del'>-	/* start chip and queuing */</div><div class='del'>-	err = flexcan_chip_start(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_offload_del;</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SECONDARY_MB_IRQ) {</div><div class='add'>+		err = request_irq(priv-&gt;irq_secondary_mb,</div><div class='add'>+				  flexcan_irq, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_irq_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_OPEN);</div><div class='add'>+	flexcan_chip_interrupts_enable(dev);</div><div class='ctx'> </div><div class='del'>-	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_offload_del:</div><div class='del'>-	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+ out_free_irq_err:</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_NR_IRQ_3)</div><div class='add'>+		free_irq(priv-&gt;irq_err, dev);</div><div class='add'>+ out_free_irq_boff:</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_NR_IRQ_3)</div><div class='add'>+		free_irq(priv-&gt;irq_boff, dev);</div><div class='ctx'>  out_free_irq:</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='add'>+ out_can_rx_offload_disable:</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	flexcan_chip_stop(dev);</div><div class='add'>+ out_can_rx_offload_del:</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+ out_transceiver_disable:</div><div class='add'>+	flexcan_transceiver_disable(priv);</div><div class='ctx'>  out_close:</div><div class='ctx'> 	close_candev(dev);</div><div class='del'>- out_disable_per:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_per);</div><div class='del'>- out_disable_ipg:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+ out_runtime_put:</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1301,17 +1818,25 @@ static int flexcan_close(struct net_device *dev)</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='del'>-	flexcan_chip_stop(dev);</div><div class='add'>+	flexcan_chip_interrupts_disable(dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SECONDARY_MB_IRQ)</div><div class='add'>+		free_irq(priv-&gt;irq_secondary_mb, dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_NR_IRQ_3) {</div><div class='add'>+		free_irq(priv-&gt;irq_err, dev);</div><div class='add'>+		free_irq(priv-&gt;irq_boff, dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_per);</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	flexcan_chip_stop_disable_on_error(dev);</div><div class='ctx'> </div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+	flexcan_transceiver_disable(priv);</div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_STOP);</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1326,6 +1851,8 @@ static int flexcan_set_mode(struct net_device *dev, enum can_mode mode)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='add'>+		flexcan_chip_interrupts_enable(dev);</div><div class='add'>+</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1340,7 +1867,6 @@ static const struct net_device_ops flexcan_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= flexcan_open,</div><div class='ctx'> 	.ndo_stop	= flexcan_close,</div><div class='ctx'> 	.ndo_start_xmit	= flexcan_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int register_flexcandev(struct net_device *dev)</div><div class='hunk'>@@ -1349,30 +1875,34 @@ static int register_flexcandev(struct net_device *dev)</div><div class='ctx'> 	struct flexcan_regs __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	u32 reg, err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk_ipg);</div><div class='add'>+	err = flexcan_clks_enable(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk_per);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_disable_ipg;</div><div class='del'>-</div><div class='ctx'> 	/* select "bus clock", chip must be disabled */</div><div class='ctx'> 	err = flexcan_chip_disable(priv);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_disable_per;</div><div class='add'>+		goto out_clks_disable;</div><div class='add'>+</div><div class='ctx'> 	reg = priv-&gt;read(&amp;regs-&gt;ctrl);</div><div class='del'>-	reg |= FLEXCAN_CTRL_CLK_SRC;</div><div class='add'>+	if (priv-&gt;clk_src)</div><div class='add'>+		reg |= FLEXCAN_CTRL_CLK_SRC;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~FLEXCAN_CTRL_CLK_SRC;</div><div class='ctx'> 	priv-&gt;write(reg, &amp;regs-&gt;ctrl);</div><div class='ctx'> </div><div class='ctx'> 	err = flexcan_chip_enable(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_chip_disable;</div><div class='ctx'> </div><div class='del'>-	/* set freeze, halt and activate FIFO, restrict register access */</div><div class='add'>+	/* set freeze, halt */</div><div class='add'>+	err = flexcan_chip_freeze(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_disable;</div><div class='add'>+</div><div class='add'>+	/* activate FIFO, restrict register access */</div><div class='ctx'> 	reg = priv-&gt;read(&amp;regs-&gt;mcr);</div><div class='del'>-	reg |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT |</div><div class='del'>-		FLEXCAN_MCR_FEN | FLEXCAN_MCR_SUPV;</div><div class='add'>+	reg |=  FLEXCAN_MCR_FEN | FLEXCAN_MCR_SUPV;</div><div class='ctx'> 	priv-&gt;write(reg, &amp;regs-&gt;mcr);</div><div class='ctx'> </div><div class='ctx'> 	/* Currently we only support newer versions of this core</div><div class='hunk'>@@ -1388,15 +1918,21 @@ static int register_flexcandev(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = register_candev(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_disable;</div><div class='ctx'> </div><div class='del'>-	/* disable core and turn off clocks */</div><div class='del'>- out_chip_disable:</div><div class='add'>+	/* Disable core and let pm_runtime_put() disable the clocks.</div><div class='add'>+	 * If CONFIG_PM is not enabled, the clocks will stay powered.</div><div class='add'>+	 */</div><div class='ctx'> 	flexcan_chip_disable(priv);</div><div class='del'>- out_disable_per:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_per);</div><div class='del'>- out_disable_ipg:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+	pm_runtime_put(priv-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ out_chip_disable:</div><div class='add'>+	flexcan_chip_disable(priv);</div><div class='add'>+ out_clks_disable:</div><div class='add'>+	flexcan_clks_disable(priv);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1405,21 +1941,21 @@ static void unregister_flexcandev(struct net_device *dev)</div><div class='ctx'> 	unregister_candev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int flexcan_setup_stop_mode(struct platform_device *pdev)</div><div class='add'>+static int flexcan_setup_stop_mode_gpr(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct device_node *gpr_np;</div><div class='ctx'> 	struct flexcan_priv *priv;</div><div class='ctx'> 	phandle phandle;</div><div class='del'>-	u32 out_val[5];</div><div class='add'>+	u32 out_val[3];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!np)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* stop mode property format is:</div><div class='del'>-	 * &lt;&amp;gpr req_gpr req_bit ack_gpr ack_bit&gt;.</div><div class='add'>+	 * &lt;&amp;gpr req_gpr req_bit&gt;.</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = of_property_read_u32_array(np, "fsl,stop-mode", out_val,</div><div class='ctx'> 					 ARRAY_SIZE(out_val));</div><div class='hunk'>@@ -1437,28 +1973,93 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	priv-&gt;stm.gpr = syscon_node_to_regmap(gpr_np);</div><div class='del'>-	of_node_put(gpr_np);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;stm.gpr)) {</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "could not find gpr regmap\n");</div><div class='del'>-		return PTR_ERR(priv-&gt;stm.gpr);</div><div class='add'>+		ret = PTR_ERR(priv-&gt;stm.gpr);</div><div class='add'>+		goto out_put_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;stm.req_gpr = out_val[1];</div><div class='ctx'> 	priv-&gt;stm.req_bit = out_val[2];</div><div class='del'>-	priv-&gt;stm.ack_gpr = out_val[3];</div><div class='del'>-	priv-&gt;stm.ack_bit = out_val[4];</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev,</div><div class='del'>-		"gpr %s req_gpr=0x02%x req_bit=%u ack_gpr=0x02%x ack_bit=%u\n",</div><div class='del'>-		gpr_np-&gt;full_name, priv-&gt;stm.req_gpr, priv-&gt;stm.req_bit,</div><div class='del'>-		priv-&gt;stm.ack_gpr, priv-&gt;stm.ack_bit);</div><div class='add'>+		"gpr %s req_gpr=0x02%x req_bit=%u\n",</div><div class='add'>+		gpr_np-&gt;full_name, priv-&gt;stm.req_gpr, priv-&gt;stm.req_bit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='add'>+	of_node_put(gpr_np);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int flexcan_setup_stop_mode_scfw(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+	struct flexcan_priv *priv;</div><div class='add'>+	u8 scu_idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u8(pdev-&gt;dev.of_node, "fsl,scu-index", &amp;scu_idx);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_dbg(&amp;pdev-&gt;dev, "failed to get scu index\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+	priv-&gt;scu_idx = scu_idx;</div><div class='add'>+</div><div class='add'>+	/* this function could be deferred probe, return -EPROBE_DEFER */</div><div class='add'>+	return imx_scu_get_handle(&amp;priv-&gt;sc_ipc_handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* flexcan_setup_stop_mode - Setup stop mode for wakeup</div><div class='add'>+ *</div><div class='add'>+ * Return: = 0 setup stop mode successfully or doesn't support this feature</div><div class='add'>+ *         &lt; 0 fail to setup stop mode (could be deferred probe)</div><div class='add'>+ */</div><div class='add'>+static int flexcan_setup_stop_mode(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+	struct flexcan_priv *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW)</div><div class='add'>+		ret = flexcan_setup_stop_mode_scfw(pdev);</div><div class='add'>+	else if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR)</div><div class='add'>+		ret = flexcan_setup_stop_mode_gpr(pdev);</div><div class='add'>+	else if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI)</div><div class='add'>+		/* ATF will handle all STOP_IPG related work */</div><div class='add'>+		ret = 0;</div><div class='add'>+	else</div><div class='add'>+		/* return 0 directly if doesn't support stop mode feature */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* If ret is -EINVAL, this means SoC claim to support stop mode, but</div><div class='add'>+	 * dts file lack the stop mode property definition. For this case,</div><div class='add'>+	 * directly return 0, this will skip the wakeup capable setting and</div><div class='add'>+	 * will not block the driver probe.</div><div class='add'>+	 */</div><div class='add'>+	if (ret == -EINVAL)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	device_set_wakeup_capable(&amp;pdev-&gt;dev, true);</div><div class='ctx'> </div><div class='add'>+	if (of_property_read_bool(pdev-&gt;dev.of_node, "wakeup-source"))</div><div class='add'>+		device_set_wakeup_enable(&amp;pdev-&gt;dev, true);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id flexcan_of_match[] = {</div><div class='add'>+	{ .compatible = "fsl,imx8qm-flexcan", .data = &amp;fsl_imx8qm_devtype_data, },</div><div class='add'>+	{ .compatible = "fsl,imx8mp-flexcan", .data = &amp;fsl_imx8mp_devtype_data, },</div><div class='add'>+	{ .compatible = "fsl,imx93-flexcan", .data = &amp;fsl_imx93_devtype_data, },</div><div class='add'>+	{ .compatible = "fsl,imx95-flexcan", .data = &amp;fsl_imx95_devtype_data, },</div><div class='ctx'> 	{ .compatible = "fsl,imx6q-flexcan", .data = &amp;fsl_imx6q_devtype_data, },</div><div class='ctx'> 	{ .compatible = "fsl,imx28-flexcan", .data = &amp;fsl_imx28_devtype_data, },</div><div class='ctx'> 	{ .compatible = "fsl,imx53-flexcan", .data = &amp;fsl_imx25_devtype_data, },</div><div class='hunk'>@@ -1467,38 +2068,61 @@ static const struct of_device_id flexcan_of_match[] = {</div><div class='ctx'> 	{ .compatible = "fsl,p1010-flexcan", .data = &amp;fsl_p1010_devtype_data, },</div><div class='ctx'> 	{ .compatible = "fsl,vf610-flexcan", .data = &amp;fsl_vf610_devtype_data, },</div><div class='ctx'> 	{ .compatible = "fsl,ls1021ar2-flexcan", .data = &amp;fsl_ls1021a_r2_devtype_data, },</div><div class='add'>+	{ .compatible = "fsl,lx2160ar1-flexcan", .data = &amp;fsl_lx2160a_r1_devtype_data, },</div><div class='add'>+	{ .compatible = "nxp,s32g2-flexcan", .data = &amp;nxp_s32g2_devtype_data, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, flexcan_of_match);</div><div class='ctx'> </div><div class='ctx'> static const struct platform_device_id flexcan_id_table[] = {</div><div class='del'>-	{ .name = "flexcan", .driver_data = (kernel_ulong_t)&amp;fsl_p1010_devtype_data, },</div><div class='del'>-	{ /* sentinel */ },</div><div class='add'>+	{</div><div class='add'>+		.name = "flexcan-mcf5441x",</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;fsl_mcf5441x_devtype_data,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(platform, flexcan_id_table);</div><div class='ctx'> </div><div class='ctx'> static int flexcan_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	const struct of_device_id *of_id;</div><div class='ctx'> 	const struct flexcan_devtype_data *devtype_data;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct flexcan_priv *priv;</div><div class='ctx'> 	struct regulator *reg_xceiver;</div><div class='del'>-	struct resource *mem;</div><div class='add'>+	struct phy *transceiver;</div><div class='ctx'> 	struct clk *clk_ipg = NULL, *clk_per = NULL;</div><div class='ctx'> 	struct flexcan_regs __iomem *regs;</div><div class='add'>+	struct flexcan_platform_data *pdata;</div><div class='ctx'> 	int err, irq;</div><div class='add'>+	u8 clk_src = 1;</div><div class='ctx'> 	u32 clock_freq = 0;</div><div class='ctx'> </div><div class='del'>-	reg_xceiver = devm_regulator_get(&amp;pdev-&gt;dev, "xceiver");</div><div class='add'>+	reg_xceiver = devm_regulator_get_optional(&amp;pdev-&gt;dev, "xceiver");</div><div class='ctx'> 	if (PTR_ERR(reg_xceiver) == -EPROBE_DEFER)</div><div class='ctx'> 		return -EPROBE_DEFER;</div><div class='del'>-	else if (IS_ERR(reg_xceiver))</div><div class='add'>+	else if (PTR_ERR(reg_xceiver) == -ENODEV)</div><div class='ctx'> 		reg_xceiver = NULL;</div><div class='add'>+	else if (IS_ERR(reg_xceiver))</div><div class='add'>+		return PTR_ERR(reg_xceiver);</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;dev.of_node)</div><div class='add'>+	transceiver = devm_phy_optional_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(transceiver))</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(transceiver),</div><div class='add'>+				     "failed to get phy\n");</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;dev.of_node) {</div><div class='ctx'> 		of_property_read_u32(pdev-&gt;dev.of_node,</div><div class='ctx'> 				     "clock-frequency", &amp;clock_freq);</div><div class='add'>+		of_property_read_u8(pdev-&gt;dev.of_node,</div><div class='add'>+				    "fsl,clk-source", &amp;clk_src);</div><div class='add'>+	} else {</div><div class='add'>+		pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='add'>+		if (pdata) {</div><div class='add'>+			clock_freq = pdata-&gt;clock_frequency;</div><div class='add'>+			clk_src = pdata-&gt;clk_src;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!clock_freq) {</div><div class='ctx'> 		clk_ipg = devm_clk_get(&amp;pdev-&gt;dev, "ipg");</div><div class='hunk'>@@ -1515,23 +2139,37 @@ static int flexcan_probe(struct platform_device *pdev)</div><div class='ctx'> 		clock_freq = clk_get_rate(clk_per);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (irq &lt;= 0)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='ctx'> </div><div class='del'>-	regs = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='add'>+	regs = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(regs))</div><div class='ctx'> 		return PTR_ERR(regs);</div><div class='ctx'> </div><div class='del'>-	of_id = of_match_device(flexcan_of_match, &amp;pdev-&gt;dev);</div><div class='del'>-	if (of_id) {</div><div class='del'>-		devtype_data = of_id-&gt;data;</div><div class='del'>-	} else if (platform_get_device_id(pdev)-&gt;driver_data) {</div><div class='del'>-		devtype_data = (struct flexcan_devtype_data *)</div><div class='del'>-			platform_get_device_id(pdev)-&gt;driver_data;</div><div class='del'>-	} else {</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	devtype_data = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if ((devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_SUPPORT_FD) &amp;&amp;</div><div class='add'>+	    !((devtype_data-&gt;quirks &amp;</div><div class='add'>+	       (FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR |</div><div class='add'>+		FLEXCAN_QUIRK_SUPPORT_RX_FIFO)) ==</div><div class='add'>+	      (FLEXCAN_QUIRK_USE_RX_MAILBOX |</div><div class='add'>+	       FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+	       FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR))) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "CAN-FD mode doesn't work in RX-FIFO mode!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((devtype_data-&gt;quirks &amp;</div><div class='add'>+	     (FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+	      FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR)) ==</div><div class='add'>+	    FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Quirks (0x%08x) inconsistent: RX_MAILBOX_RX supported but not RX_MAILBOX\n",</div><div class='add'>+			devtype_data-&gt;quirks);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_candev(sizeof(struct flexcan_priv), 1);</div><div class='hunk'>@@ -1542,13 +2180,15 @@ static int flexcan_probe(struct platform_device *pdev)</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;flexcan_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;flexcan_ethtool_ops;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='add'>+	priv-&gt;devtype_data = *devtype_data;</div><div class='ctx'> </div><div class='ctx'> 	if (of_property_read_bool(pdev-&gt;dev.of_node, "big-endian") ||</div><div class='del'>-	    devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN) {</div><div class='add'>+	    priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN) {</div><div class='ctx'> 		priv-&gt;read = flexcan_read_be;</div><div class='ctx'> 		priv-&gt;write = flexcan_write_be;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1556,8 +2196,8 @@ static int flexcan_probe(struct platform_device *pdev)</div><div class='ctx'> 		priv-&gt;write = flexcan_write_le;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	priv-&gt;can.clock.freq = clock_freq;</div><div class='del'>-	priv-&gt;can.bittiming_const = &amp;flexcan_bittiming_const;</div><div class='ctx'> 	priv-&gt;can.do_set_mode = flexcan_set_mode;</div><div class='ctx'> 	priv-&gt;can.do_get_berr_counter = flexcan_get_berr_counter;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='hunk'>@@ -1566,8 +2206,47 @@ static int flexcan_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;regs = regs;</div><div class='ctx'> 	priv-&gt;clk_ipg = clk_ipg;</div><div class='ctx'> 	priv-&gt;clk_per = clk_per;</div><div class='del'>-	priv-&gt;devtype_data = devtype_data;</div><div class='add'>+	priv-&gt;clk_src = clk_src;</div><div class='ctx'> 	priv-&gt;reg_xceiver = reg_xceiver;</div><div class='add'>+	priv-&gt;transceiver = transceiver;</div><div class='add'>+</div><div class='add'>+	if (transceiver)</div><div class='add'>+		priv-&gt;can.bitrate_max = transceiver-&gt;attrs.max_link_rate;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_NR_IRQ_3) {</div><div class='add'>+		priv-&gt;irq_boff = platform_get_irq(pdev, 1);</div><div class='add'>+		if (priv-&gt;irq_boff &lt; 0) {</div><div class='add'>+			err = priv-&gt;irq_boff;</div><div class='add'>+			goto failed_platform_get_irq;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;irq_err = platform_get_irq(pdev, 2);</div><div class='add'>+		if (priv-&gt;irq_err &lt; 0) {</div><div class='add'>+			err = priv-&gt;irq_err;</div><div class='add'>+			goto failed_platform_get_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SECONDARY_MB_IRQ) {</div><div class='add'>+		priv-&gt;irq_secondary_mb = platform_get_irq_byname(pdev, "mb-1");</div><div class='add'>+		if (priv-&gt;irq_secondary_mb &lt; 0) {</div><div class='add'>+			err = priv-&gt;irq_secondary_mb;</div><div class='add'>+			goto failed_platform_get_irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SUPPORT_FD) {</div><div class='add'>+		priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD |</div><div class='add'>+			CAN_CTRLMODE_FD_NON_ISO;</div><div class='add'>+		priv-&gt;can.bittiming_const = &amp;flexcan_fd_bittiming_const;</div><div class='add'>+		priv-&gt;can.fd.data_bittiming_const =</div><div class='add'>+			&amp;flexcan_fd_data_bittiming_const;</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;can.bittiming_const = &amp;flexcan_bittiming_const;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_noresume(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_set_active(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	err = register_flexcandev(dev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1575,32 +2254,35 @@ static int flexcan_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto failed_register;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(dev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;devtype_data-&gt;quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE) {</div><div class='del'>-		err = flexcan_setup_stop_mode(pdev);</div><div class='del'>-		if (err)</div><div class='del'>-			dev_dbg(&amp;pdev-&gt;dev, "failed to setup stop-mode\n");</div><div class='add'>+	err = flexcan_setup_stop_mode(pdev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err_probe(&amp;pdev-&gt;dev, err, "setup stop mode failed\n");</div><div class='add'>+		goto failed_setup_stop_mode;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "device registered (reg_base=%p, irq=%d)\n",</div><div class='del'>-		 priv-&gt;regs, dev-&gt;irq);</div><div class='add'>+	of_can_transceiver(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+ failed_setup_stop_mode:</div><div class='add'>+	unregister_flexcandev(dev);</div><div class='ctx'>  failed_register:</div><div class='add'>+	pm_runtime_put_noidle(&amp;pdev-&gt;dev);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+ failed_platform_get_irq:</div><div class='ctx'> 	free_candev(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int flexcan_remove(struct platform_device *pdev)</div><div class='add'>+static void flexcan_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	device_set_wakeup_enable(&amp;pdev-&gt;dev, false);</div><div class='add'>+	device_set_wakeup_capable(&amp;pdev-&gt;dev, false);</div><div class='ctx'> 	unregister_flexcandev(dev);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	free_candev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused flexcan_suspend(struct device *device)</div><div class='hunk'>@@ -1615,16 +2297,29 @@ static int __maybe_unused flexcan_suspend(struct device *device)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (device_may_wakeup(device)) {</div><div class='ctx'> 			enable_irq_wake(dev-&gt;irq);</div><div class='del'>-			flexcan_enter_stop_mode(priv);</div><div class='add'>+			err = flexcan_enter_stop_mode(priv);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='ctx'> 		} else {</div><div class='del'>-			err = flexcan_chip_disable(priv);</div><div class='add'>+			err = flexcan_chip_stop(dev);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			flexcan_chip_interrupts_disable(dev);</div><div class='add'>+</div><div class='add'>+			err = flexcan_transceiver_disable(priv);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			err = pinctrl_pm_select_sleep_state(device);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='ctx'> 	}</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1635,28 +2330,81 @@ static int __maybe_unused flexcan_resume(struct device *device)</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		netif_device_attach(dev);</div><div class='ctx'> 		netif_start_queue(dev);</div><div class='ctx'> 		if (device_may_wakeup(device)) {</div><div class='ctx'> 			disable_irq_wake(dev-&gt;irq);</div><div class='add'>+			err = flexcan_exit_stop_mode(priv);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='ctx'> 		} else {</div><div class='del'>-			err = flexcan_chip_enable(priv);</div><div class='add'>+			err = pinctrl_pm_select_default_state(device);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			err = flexcan_transceiver_enable(priv);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='add'>+</div><div class='add'>+			err = flexcan_chip_start(dev);</div><div class='add'>+			if (err) {</div><div class='add'>+				flexcan_transceiver_disable(priv);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			flexcan_chip_interrupts_enable(dev);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __maybe_unused flexcan_runtime_suspend(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='add'>+	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	flexcan_clks_disable(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused flexcan_runtime_resume(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='add'>+	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return flexcan_clks_enable(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int __maybe_unused flexcan_noirq_suspend(struct device *device)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev) &amp;&amp; device_may_wakeup(device))</div><div class='del'>-		flexcan_enable_wakeup_irq(priv, true);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (device_may_wakeup(device))</div><div class='add'>+			flexcan_enable_wakeup_irq(priv, true);</div><div class='add'>+</div><div class='add'>+		/* For FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI, it need ATF to send</div><div class='add'>+		 * to SM through SCMI protocol, SM will assert the IPG_STOP</div><div class='add'>+		 * signal. But all this works need the CAN clocks keep on.</div><div class='add'>+		 * After the CAN module get the IPG_STOP mode, and switch to</div><div class='add'>+		 * STOP mode, whether still keep the CAN clocks on or gate them</div><div class='add'>+		 * off depend on the Hardware design.</div><div class='add'>+		 */</div><div class='add'>+		if (!(device_may_wakeup(device) &amp;&amp;</div><div class='add'>+		      priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI)) {</div><div class='add'>+			err = pm_runtime_force_suspend(device);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1666,9 +2414,18 @@ static int __maybe_unused flexcan_noirq_resume(struct device *device)</div><div class='ctx'> 	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct flexcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev) &amp;&amp; device_may_wakeup(device)) {</div><div class='del'>-		flexcan_enable_wakeup_irq(priv, false);</div><div class='del'>-		flexcan_exit_stop_mode(priv);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!(device_may_wakeup(device) &amp;&amp;</div><div class='add'>+		      priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI)) {</div><div class='add'>+			err = pm_runtime_force_resume(device);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (device_may_wakeup(device))</div><div class='add'>+			flexcan_enable_wakeup_irq(priv, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1676,6 +2433,7 @@ static int __maybe_unused flexcan_noirq_resume(struct device *device)</div><div class='ctx'> </div><div class='ctx'> static const struct dev_pm_ops flexcan_pm_ops = {</div><div class='ctx'> 	SET_SYSTEM_SLEEP_PM_OPS(flexcan_suspend, flexcan_resume)</div><div class='add'>+	SET_RUNTIME_PM_OPS(flexcan_runtime_suspend, flexcan_runtime_resume, NULL)</div><div class='ctx'> 	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(flexcan_noirq_suspend, flexcan_noirq_resume)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/can/flexcan/flexcan-ethtool.c b/drivers/net/can/flexcan/flexcan-ethtool.c<br/>new file mode 100644<br/>index 000000000000..50e86b2da532<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/flexcan/flexcan-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/flexcan/flexcan-ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/* Copyright (c) 2022 Amarula Solutions, Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;</div><div class='add'>+ * Copyright (c) 2022 Pengutronix, Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "flexcan.h"</div><div class='add'>+</div><div class='add'>+static const char flexcan_priv_flags_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+#define FLEXCAN_PRIV_FLAGS_RX_RTR BIT(0)</div><div class='add'>+	"rx-rtr",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+flexcan_get_ringparam(struct net_device *ndev, struct ethtool_ringparam *ring,</div><div class='add'>+		      struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+		      struct netlink_ext_ack *ext_ack)</div><div class='add'>+{</div><div class='add'>+	const struct flexcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	ring-&gt;rx_max_pending = priv-&gt;mb_count;</div><div class='add'>+	ring-&gt;tx_max_pending = priv-&gt;mb_count;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX)</div><div class='add'>+		ring-&gt;rx_pending = priv-&gt;offload.mb_last -</div><div class='add'>+			priv-&gt;offload.mb_first + 1;</div><div class='add'>+	else</div><div class='add'>+		ring-&gt;rx_pending = 6;	/* RX-FIFO depth is fixed */</div><div class='add'>+</div><div class='add'>+	/* the drive currently supports only on TX buffer */</div><div class='add'>+	ring-&gt;tx_pending = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+flexcan_get_strings(struct net_device *ndev, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		memcpy(data, flexcan_priv_flags_strings,</div><div class='add'>+		       sizeof(flexcan_priv_flags_strings));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 flexcan_get_priv_flags(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	const struct flexcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 priv_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (flexcan_active_rx_rtr(priv))</div><div class='add'>+		priv_flags |= FLEXCAN_PRIV_FLAGS_RX_RTR;</div><div class='add'>+</div><div class='add'>+	return priv_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int flexcan_set_priv_flags(struct net_device *ndev, u32 priv_flags)</div><div class='add'>+{</div><div class='add'>+	struct flexcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 quirks = priv-&gt;devtype_data.quirks;</div><div class='add'>+</div><div class='add'>+	if (priv_flags &amp; FLEXCAN_PRIV_FLAGS_RX_RTR) {</div><div class='add'>+		if (flexcan_supports_rx_mailbox_rtr(priv))</div><div class='add'>+			quirks |= FLEXCAN_QUIRK_USE_RX_MAILBOX;</div><div class='add'>+		else if (flexcan_supports_rx_fifo(priv))</div><div class='add'>+			quirks &amp;= ~FLEXCAN_QUIRK_USE_RX_MAILBOX;</div><div class='add'>+		else</div><div class='add'>+			quirks |= FLEXCAN_QUIRK_USE_RX_MAILBOX;</div><div class='add'>+	} else {</div><div class='add'>+		if (flexcan_supports_rx_mailbox(priv))</div><div class='add'>+			quirks |= FLEXCAN_QUIRK_USE_RX_MAILBOX;</div><div class='add'>+		else</div><div class='add'>+			quirks &amp;= ~FLEXCAN_QUIRK_USE_RX_MAILBOX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirks != priv-&gt;devtype_data.quirks &amp;&amp; netif_running(ndev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	priv-&gt;devtype_data.quirks = quirks;</div><div class='add'>+</div><div class='add'>+	if (!(priv_flags &amp; FLEXCAN_PRIV_FLAGS_RX_RTR) &amp;&amp;</div><div class='add'>+	    !flexcan_active_rx_rtr(priv))</div><div class='add'>+		netdev_info(ndev,</div><div class='add'>+			    "Activating RX mailbox mode, cannot receive RTR frames.\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int flexcan_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		return ARRAY_SIZE(flexcan_priv_flags_strings);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops flexcan_ethtool_ops = {</div><div class='add'>+	.get_ringparam = flexcan_get_ringparam,</div><div class='add'>+	.get_strings = flexcan_get_strings,</div><div class='add'>+	.get_priv_flags = flexcan_get_priv_flags,</div><div class='add'>+	.set_priv_flags = flexcan_set_priv_flags,</div><div class='add'>+	.get_sset_count = flexcan_get_sset_count,</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/can/flexcan/flexcan.h b/drivers/net/can/flexcan/flexcan.h<br/>new file mode 100644<br/>index 000000000000..16692a2502eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/flexcan/flexcan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/flexcan/flexcan.h</a></div><div class='hunk'>@@ -0,0 +1,171 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ * flexcan.c - FLEXCAN CAN controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2005-2006 Varma Electronics Oy</div><div class='add'>+ * Copyright (c) 2009 Sascha Hauer, Pengutronix</div><div class='add'>+ * Copyright (c) 2010-2017 Pengutronix, Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ * Copyright (c) 2014 David Jander, Protonic Holland</div><div class='add'>+ * Copyright (C) 2022 Amarula Solutions, Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;</div><div class='add'>+ *</div><div class='add'>+ * Based on code originally by Andrey Volkov &lt;avolkov@varma-el.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _FLEXCAN_H</div><div class='add'>+#define _FLEXCAN_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+</div><div class='add'>+/* FLEXCAN hardware feature flags</div><div class='add'>+ *</div><div class='add'>+ * Below is some version info we got:</div><div class='add'>+ *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR rece-   FD Mode     MB</div><div class='add'>+ *                                Filter? connected?  Passive detection  ption in MB Supported?</div><div class='add'>+ * MCF5441X FlexCAN2  ?               no       yes        no       no        no           no     16</div><div class='add'>+ *    MX25  FlexCAN2  03.00.00.00     no        no        no       no        no           no     64</div><div class='add'>+ *    MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no           no     64</div><div class='add'>+ *    MX35  FlexCAN2  03.00.00.00     no        no        no       no        no           no     64</div><div class='add'>+ *    MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no           no     64</div><div class='add'>+ *    MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes           no     64</div><div class='add'>+ *    MX8QM FlexCAN3  03.00.23.00    yes       yes        no       no       yes          yes     64</div><div class='add'>+ *    MX8MP FlexCAN3  03.00.17.01    yes       yes        no      yes       yes          yes     64</div><div class='add'>+ *    VF610 FlexCAN3  ?               no       yes        no      yes       yes?          no     64</div><div class='add'>+ *  LS1021A FlexCAN2  03.00.04.00     no       yes        no       no       yes           no     64</div><div class='add'>+ *  LX2160A FlexCAN3  03.00.23.00     no       yes        no      yes       yes          yes     64</div><div class='add'>+ *</div><div class='add'>+ * Some SOCs do not have the RX_WARN &amp; TX_WARN interrupt line connected.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* [TR]WRN_INT not connected */</div><div class='add'>+#define FLEXCAN_QUIRK_BROKEN_WERR_STATE BIT(1)</div><div class='add'>+ /* Disable RX FIFO Global mask */</div><div class='add'>+#define FLEXCAN_QUIRK_DISABLE_RXFG BIT(2)</div><div class='add'>+/* Enable EACEN and RRS bit in ctrl2 */</div><div class='add'>+#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS  BIT(3)</div><div class='add'>+/* Disable non-correctable errors interrupt and freeze mode */</div><div class='add'>+#define FLEXCAN_QUIRK_DISABLE_MECR BIT(4)</div><div class='add'>+/* Use mailboxes (not FIFO) for RX path */</div><div class='add'>+#define FLEXCAN_QUIRK_USE_RX_MAILBOX BIT(5)</div><div class='add'>+/* No interrupt for error passive */</div><div class='add'>+#define FLEXCAN_QUIRK_BROKEN_PERR_STATE BIT(6)</div><div class='add'>+/* default to BE register access */</div><div class='add'>+#define FLEXCAN_QUIRK_DEFAULT_BIG_ENDIAN BIT(7)</div><div class='add'>+/* Setup stop mode with GPR to support wakeup */</div><div class='add'>+#define FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR BIT(8)</div><div class='add'>+/* Support CAN-FD mode */</div><div class='add'>+#define FLEXCAN_QUIRK_SUPPORT_FD BIT(9)</div><div class='add'>+/* support memory detection and correction */</div><div class='add'>+#define FLEXCAN_QUIRK_SUPPORT_ECC BIT(10)</div><div class='add'>+/* Setup stop mode with SCU firmware to support wakeup */</div><div class='add'>+#define FLEXCAN_QUIRK_SETUP_STOP_MODE_SCFW BIT(11)</div><div class='add'>+/* Setup 3 separate interrupts, main, boff and err */</div><div class='add'>+#define FLEXCAN_QUIRK_NR_IRQ_3 BIT(12)</div><div class='add'>+/* Setup 16 mailboxes */</div><div class='add'>+#define FLEXCAN_QUIRK_NR_MB_16 BIT(13)</div><div class='add'>+/* Device supports RX via mailboxes */</div><div class='add'>+#define FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX BIT(14)</div><div class='add'>+/* Device supports RTR reception via mailboxes */</div><div class='add'>+#define FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR BIT(15)</div><div class='add'>+/* Device supports RX via FIFO */</div><div class='add'>+#define FLEXCAN_QUIRK_SUPPORT_RX_FIFO BIT(16)</div><div class='add'>+/* Setup stop mode with ATF SCMI protocol to support wakeup */</div><div class='add'>+#define FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI BIT(17)</div><div class='add'>+/* Device has two separate interrupt lines for two mailbox ranges, which</div><div class='add'>+ * both need to have an interrupt handler registered.</div><div class='add'>+ */</div><div class='add'>+#define FLEXCAN_QUIRK_SECONDARY_MB_IRQ	BIT(18)</div><div class='add'>+</div><div class='add'>+struct flexcan_devtype_data {</div><div class='add'>+	u32 quirks;		/* quirks needed for different IP cores */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct flexcan_stop_mode {</div><div class='add'>+	struct regmap *gpr;</div><div class='add'>+	u8 req_gpr;</div><div class='add'>+	u8 req_bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct flexcan_priv {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	struct flexcan_regs __iomem *regs;</div><div class='add'>+	struct flexcan_mb __iomem *tx_mb;</div><div class='add'>+	struct flexcan_mb __iomem *tx_mb_reserved;</div><div class='add'>+	u8 tx_mb_idx;</div><div class='add'>+	u8 mb_count;</div><div class='add'>+	u8 mb_size;</div><div class='add'>+	u8 clk_src;	/* clock source of CAN Protocol Engine */</div><div class='add'>+	u8 scu_idx;</div><div class='add'>+</div><div class='add'>+	u64 rx_mask;</div><div class='add'>+	u64 tx_mask;</div><div class='add'>+	u32 reg_ctrl_default;</div><div class='add'>+</div><div class='add'>+	struct clk *clk_ipg;</div><div class='add'>+	struct clk *clk_per;</div><div class='add'>+	struct flexcan_devtype_data devtype_data;</div><div class='add'>+	struct regulator *reg_xceiver;</div><div class='add'>+	struct phy *transceiver;</div><div class='add'>+	struct flexcan_stop_mode stm;</div><div class='add'>+</div><div class='add'>+	int irq_boff;</div><div class='add'>+	int irq_err;</div><div class='add'>+	int irq_secondary_mb;</div><div class='add'>+</div><div class='add'>+	/* IPC handle when setup stop mode by System Controller firmware(scfw) */</div><div class='add'>+	struct imx_sc_ipc *sc_ipc_handle;</div><div class='add'>+</div><div class='add'>+	/* Read and Write APIs */</div><div class='add'>+	u32 (*read)(void __iomem *addr);</div><div class='add'>+	void (*write)(u32 val, void __iomem *addr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_ops flexcan_ethtool_ops;</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+flexcan_supports_rx_mailbox(const struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const u32 quirks = priv-&gt;devtype_data.quirks;</div><div class='add'>+</div><div class='add'>+	return quirks &amp; FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+flexcan_supports_rx_mailbox_rtr(const struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const u32 quirks = priv-&gt;devtype_data.quirks;</div><div class='add'>+</div><div class='add'>+	return (quirks &amp; (FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+			  FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR)) ==</div><div class='add'>+		(FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX |</div><div class='add'>+		 FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+flexcan_supports_rx_fifo(const struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const u32 quirks = priv-&gt;devtype_data.quirks;</div><div class='add'>+</div><div class='add'>+	return quirks &amp; FLEXCAN_QUIRK_SUPPORT_RX_FIFO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+flexcan_active_rx_rtr(const struct flexcan_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const u32 quirks = priv-&gt;devtype_data.quirks;</div><div class='add'>+</div><div class='add'>+	if (quirks &amp; FLEXCAN_QUIRK_USE_RX_MAILBOX) {</div><div class='add'>+		if (quirks &amp; FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR)</div><div class='add'>+			return true;</div><div class='add'>+	} else {</div><div class='add'>+		/*  RX-FIFO is always RTR capable */</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#endif /* _FLEXCAN_H */</div><div class='head'>diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c<br/>index b8f1f2b69dd3..3b1b09943436 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/grcan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/grcan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/grcan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/grcan.c</a></div><div class='hunk'>@@ -27,10 +27,12 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='hunk'>@@ -241,13 +243,14 @@ struct grcan_device_config {</div><div class='ctx'> 		.rxsize		= GRCAN_DEFAULT_BUFFER_SIZE,	\</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-#define GRCAN_TXBUG_SAFE_GRLIB_VERSION	0x4100</div><div class='add'>+#define GRCAN_TXBUG_SAFE_GRLIB_VERSION	4100</div><div class='ctx'> #define GRLIB_VERSION_MASK		0xffff</div><div class='ctx'> </div><div class='ctx'> /* GRCAN private data structure */</div><div class='ctx'> struct grcan_priv {</div><div class='ctx'> 	struct can_priv can;	/* must be the first member */</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	struct device *ofdev_dev;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> </div><div class='ctx'> 	struct grcan_registers __iomem *regs;	/* ioremap'ed registers */</div><div class='hunk'>@@ -255,7 +258,6 @@ struct grcan_priv {</div><div class='ctx'> 	struct grcan_dma dma;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff **echo_skb;	/* We allocate this on our own */</div><div class='del'>-	u8 *txdlc;			/* Length of queued frames */</div><div class='ctx'> </div><div class='ctx'> 	/* The echo skb pointer, pointing into echo_skb and indicating which</div><div class='ctx'> 	 * frames can be echoed back. See the "Notes on the tx cyclic buffer</div><div class='hunk'>@@ -515,12 +517,10 @@ static int catch_up_echo_skb(struct net_device *dev, int budget, bool echo)</div><div class='ctx'> 		if (echo) {</div><div class='ctx'> 			/* Normal echo of messages */</div><div class='ctx'> 			stats-&gt;tx_packets++;</div><div class='del'>-			stats-&gt;tx_bytes += priv-&gt;txdlc[i];</div><div class='del'>-			priv-&gt;txdlc[i] = 0;</div><div class='del'>-			can_get_echo_skb(dev, i);</div><div class='add'>+			stats-&gt;tx_bytes += can_get_echo_skb(dev, i, NULL);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* For cleanup of untransmitted messages */</div><div class='del'>-			can_free_echo_skb(dev, i);</div><div class='add'>+			can_free_echo_skb(dev, i, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;eskbp = grcan_ring_add(priv-&gt;eskbp, GRCAN_MSG_SIZE,</div><div class='hunk'>@@ -673,6 +673,7 @@ static void grcan_err(struct net_device *dev, u32 sources, u32 status)</div><div class='ctx'> 				/* There are no others at this point */</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+			cf.can_id |= CAN_ERR_CNT;</div><div class='ctx'> 			cf.data[6] = txerr;</div><div class='ctx'> 			cf.data[7] = rxerr;</div><div class='ctx'> 			priv-&gt;can.state = state;</div><div class='hunk'>@@ -726,7 +727,7 @@ static void grcan_err(struct net_device *dev, u32 sources, u32 status)</div><div class='ctx'> 			txrx = "on rx ";</div><div class='ctx'> 			stats-&gt;rx_errors++;</div><div class='ctx'> 		}</div><div class='del'>-		netdev_err(dev, "Fatal AHB buss error %s- halting device\n",</div><div class='add'>+		netdev_err(dev, "Fatal AHB bus error %s- halting device\n",</div><div class='ctx'> 			   txrx);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -777,7 +778,7 @@ static irqreturn_t grcan_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;need_txbug_workaround &amp;&amp;</div><div class='ctx'> 	    (sources &amp; (GRCAN_IRQ_TX | GRCAN_IRQ_TXLOSS))) {</div><div class='del'>-		del_timer(&amp;priv-&gt;hang_timer);</div><div class='add'>+		timer_delete(&amp;priv-&gt;hang_timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Frame(s) received or transmitted */</div><div class='hunk'>@@ -805,7 +806,7 @@ static irqreturn_t grcan_interrupt(int irq, void *dev_id)</div><div class='ctx'>  */</div><div class='ctx'> static void grcan_running_reset(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct grcan_priv *priv = from_timer(priv, t, rr_timer);</div><div class='add'>+	struct grcan_priv *priv = timer_container_of(priv, t, rr_timer);</div><div class='ctx'> 	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct grcan_registers __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -816,8 +817,8 @@ static void grcan_running_reset(struct timer_list *t)</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;resetting = false;</div><div class='del'>-	del_timer(&amp;priv-&gt;hang_timer);</div><div class='del'>-	del_timer(&amp;priv-&gt;rr_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;hang_timer);</div><div class='add'>+	timer_delete(&amp;priv-&gt;rr_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (!priv-&gt;closing) {</div><div class='ctx'> 		/* Save and reset - config register preserved by grcan_reset */</div><div class='hunk'>@@ -896,7 +897,7 @@ static inline void grcan_reset_timer(struct timer_list *timer, __u32 bitrate)</div><div class='ctx'> /* Disable channels and schedule a running reset */</div><div class='ctx'> static void grcan_initiate_running_reset(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct grcan_priv *priv = from_timer(priv, t, hang_timer);</div><div class='add'>+	struct grcan_priv *priv = timer_container_of(priv, t, hang_timer);</div><div class='ctx'> 	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct grcan_registers __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -924,7 +925,7 @@ static void grcan_free_dma_buffers(struct net_device *dev)</div><div class='ctx'> 	struct grcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct grcan_dma *dma = &amp;priv-&gt;dma;</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(&amp;dev-&gt;dev, dma-&gt;base_size, dma-&gt;base_buf,</div><div class='add'>+	dma_free_coherent(priv-&gt;ofdev_dev, dma-&gt;base_size, dma-&gt;base_buf,</div><div class='ctx'> 			  dma-&gt;base_handle);</div><div class='ctx'> 	memset(dma, 0, sizeof(*dma));</div><div class='ctx'> }</div><div class='hunk'>@@ -949,7 +950,7 @@ static int grcan_allocate_dma_buffers(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Extra GRCAN_BUFFER_ALIGNMENT to allow for alignment */</div><div class='ctx'> 	dma-&gt;base_size = lsize + ssize + GRCAN_BUFFER_ALIGNMENT;</div><div class='del'>-	dma-&gt;base_buf = dma_alloc_coherent(&amp;dev-&gt;dev,</div><div class='add'>+	dma-&gt;base_buf = dma_alloc_coherent(priv-&gt;ofdev_dev,</div><div class='ctx'> 					   dma-&gt;base_size,</div><div class='ctx'> 					   &amp;dma-&gt;base_handle,</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='hunk'>@@ -1062,25 +1063,20 @@ static int grcan_open(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;can.echo_skb_max = dma-&gt;tx.size;</div><div class='ctx'> 	priv-&gt;can.echo_skb = priv-&gt;echo_skb;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;txdlc = kcalloc(dma-&gt;tx.size, sizeof(*priv-&gt;txdlc), GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;txdlc) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto exit_free_echo_skb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Get can device up */</div><div class='ctx'> 	err = open_candev(dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto exit_free_txdlc;</div><div class='add'>+		goto exit_free_echo_skb;</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(dev-&gt;irq, grcan_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto exit_close_candev;</div><div class='ctx'> </div><div class='add'>+	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;priv-&gt;napi);</div><div class='ctx'> 	grcan_start(dev);</div><div class='ctx'> 	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY))</div><div class='ctx'> 		netif_start_queue(dev);</div><div class='hunk'>@@ -1093,8 +1089,6 @@ static int grcan_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> exit_close_candev:</div><div class='ctx'> 	close_candev(dev);</div><div class='del'>-exit_free_txdlc:</div><div class='del'>-	kfree(priv-&gt;txdlc);</div><div class='ctx'> exit_free_echo_skb:</div><div class='ctx'> 	kfree(priv-&gt;echo_skb);</div><div class='ctx'> exit_free_dma_buffers:</div><div class='hunk'>@@ -1113,8 +1107,10 @@ static int grcan_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;closing = true;</div><div class='ctx'> 	if (priv-&gt;need_txbug_workaround) {</div><div class='del'>-		del_timer_sync(&amp;priv-&gt;hang_timer);</div><div class='del'>-		del_timer_sync(&amp;priv-&gt;rr_timer);</div><div class='add'>+		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+		timer_delete_sync(&amp;priv-&gt;hang_timer);</div><div class='add'>+		timer_delete_sync(&amp;priv-&gt;rr_timer);</div><div class='add'>+		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	grcan_stop_hardware(dev);</div><div class='hunk'>@@ -1129,12 +1125,11 @@ static int grcan_close(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;can.echo_skb_max = 0;</div><div class='ctx'> 	priv-&gt;can.echo_skb = NULL;</div><div class='ctx'> 	kfree(priv-&gt;echo_skb);</div><div class='del'>-	kfree(priv-&gt;txdlc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int grcan_transmit_catch_up(struct net_device *dev, int budget)</div><div class='add'>+static void grcan_transmit_catch_up(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct grcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1142,7 +1137,7 @@ static int grcan_transmit_catch_up(struct net_device *dev, int budget)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	work_done = catch_up_echo_skb(dev, budget, true);</div><div class='add'>+	work_done = catch_up_echo_skb(dev, -1, true);</div><div class='ctx'> 	if (work_done) {</div><div class='ctx'> 		if (!priv-&gt;resetting &amp;&amp; !priv-&gt;closing &amp;&amp;</div><div class='ctx'> 		    !(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY))</div><div class='hunk'>@@ -1152,12 +1147,10 @@ static int grcan_transmit_catch_up(struct net_device *dev, int budget)</div><div class='ctx'> 		 * so prevent a running reset while catching up</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (priv-&gt;need_txbug_workaround)</div><div class='del'>-			del_timer(&amp;priv-&gt;hang_timer);</div><div class='add'>+			timer_delete(&amp;priv-&gt;hang_timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int grcan_receive(struct net_device *dev, int budget)</div><div class='hunk'>@@ -1201,21 +1194,21 @@ static int grcan_receive(struct net_device *dev, int budget)</div><div class='ctx'> 			cf-&gt;can_id = ((slot[0] &amp; GRCAN_MSG_BID)</div><div class='ctx'> 				      &gt;&gt; GRCAN_MSG_BID_BIT);</div><div class='ctx'> 		}</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc((slot[1] &amp; GRCAN_MSG_DLC)</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len((slot[1] &amp; GRCAN_MSG_DLC)</div><div class='ctx'> 					  &gt;&gt; GRCAN_MSG_DLC_BIT);</div><div class='ctx'> 		if (rtr) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 		} else {</div><div class='del'>-			for (i = 0; i &lt; cf-&gt;can_dlc; i++) {</div><div class='add'>+			for (i = 0; i &lt; cf-&gt;len; i++) {</div><div class='ctx'> 				j = GRCAN_MSG_DATA_SLOT_INDEX(i);</div><div class='ctx'> 				shift = GRCAN_MSG_DATA_SHIFT(i);</div><div class='ctx'> 				cf-&gt;data[i] = (u8)(slot[j] &gt;&gt; shift);</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		/* Update statistics and read pointer */</div><div class='add'>+			stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+		}</div><div class='ctx'> 		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+</div><div class='ctx'> 		netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 		rd = grcan_ring_add(rd, GRCAN_MSG_SIZE, dma-&gt;rx.size);</div><div class='hunk'>@@ -1239,19 +1232,13 @@ static int grcan_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct grcan_registers __iomem *regs = priv-&gt;regs;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int tx_work_done, rx_work_done;</div><div class='del'>-	int rx_budget = budget / 2;</div><div class='del'>-	int tx_budget = budget - rx_budget;</div><div class='add'>+	int work_done;</div><div class='ctx'> </div><div class='del'>-	/* Half of the budget for receiveing messages */</div><div class='del'>-	rx_work_done = grcan_receive(dev, rx_budget);</div><div class='add'>+	work_done = grcan_receive(dev, budget);</div><div class='ctx'> </div><div class='del'>-	/* Half of the budget for transmitting messages as that can trigger echo</div><div class='del'>-	 * frames being received</div><div class='del'>-	 */</div><div class='del'>-	tx_work_done = grcan_transmit_catch_up(dev, tx_budget);</div><div class='add'>+	grcan_transmit_catch_up(dev);</div><div class='ctx'> </div><div class='del'>-	if (rx_work_done &lt; rx_budget &amp;&amp; tx_work_done &lt; tx_budget) {</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='ctx'> 		napi_complete(napi);</div><div class='ctx'> </div><div class='ctx'> 		/* Guarantee no interference with a running reset that otherwise</div><div class='hunk'>@@ -1268,7 +1255,7 @@ static int grcan_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rx_work_done + tx_work_done;</div><div class='add'>+	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Work tx bug by waiting while for the risky situation to clear. If that fails,</div><div class='hunk'>@@ -1360,7 +1347,7 @@ static netdev_tx_t grcan_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 oneshotmode = priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	/* Trying to transmit in silent mode will generate error interrupts, but</div><div class='hunk'>@@ -1399,7 +1386,7 @@ static netdev_tx_t grcan_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	eff = cf-&gt;can_id &amp; CAN_EFF_FLAG;</div><div class='ctx'> 	rtr = cf-&gt;can_id &amp; CAN_RTR_FLAG;</div><div class='ctx'> 	id = cf-&gt;can_id &amp; (eff ? CAN_EFF_MASK : CAN_SFF_MASK);</div><div class='del'>-	dlc = cf-&gt;can_dlc;</div><div class='add'>+	dlc = cf-&gt;len;</div><div class='ctx'> 	if (eff)</div><div class='ctx'> 		tmp = (id &lt;&lt; GRCAN_MSG_EID_BIT) &amp; GRCAN_MSG_EID;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1447,8 +1434,7 @@ static netdev_tx_t grcan_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	 * can_put_echo_skb would be an error unless other measures are</div><div class='ctx'> 	 * taken.</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;txdlc[slotindex] = cf-&gt;can_dlc; /* Store dlc for statistics */</div><div class='del'>-	can_put_echo_skb(skb, dev, slotindex);</div><div class='add'>+	can_put_echo_skb(skb, dev, slotindex, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure everything is written before allowing hardware to</div><div class='ctx'> 	 * read from the memory</div><div class='hunk'>@@ -1575,7 +1561,10 @@ static const struct net_device_ops grcan_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= grcan_open,</div><div class='ctx'> 	.ndo_stop	= grcan_close,</div><div class='ctx'> 	.ndo_start_xmit	= grcan_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops grcan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int grcan_setup_netdev(struct platform_device *ofdev,</div><div class='hunk'>@@ -1594,12 +1583,14 @@ static int grcan_setup_netdev(struct platform_device *ofdev,</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;grcan_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;grcan_ethtool_ops;</div><div class='ctx'> 	dev-&gt;sysfs_groups[0] = &amp;sysfs_grcan_group;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	memcpy(&amp;priv-&gt;config, &amp;grcan_module_config,</div><div class='ctx'> 	       sizeof(struct grcan_device_config));</div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='add'>+	priv-&gt;ofdev_dev = &amp;ofdev-&gt;dev;</div><div class='ctx'> 	priv-&gt;regs = base;</div><div class='ctx'> 	priv-&gt;can.bittiming_const = &amp;grcan_bittiming_const;</div><div class='ctx'> 	priv-&gt;can.do_set_bittiming = grcan_set_bittiming;</div><div class='hunk'>@@ -1626,7 +1617,7 @@ static int grcan_setup_netdev(struct platform_device *ofdev,</div><div class='ctx'> 		timer_setup(&amp;priv-&gt;hang_timer, grcan_initiate_running_reset, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, grcan_poll, GRCAN_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;priv-&gt;napi, grcan_poll, GRCAN_NAPI_WEIGHT);</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;ofdev-&gt;dev);</div><div class='ctx'> 	dev_info(&amp;ofdev-&gt;dev, "regs=0x%p, irq=%d, clock=%d\n",</div><div class='hunk'>@@ -1652,7 +1643,7 @@ exit_free_candev:</div><div class='ctx'> static int grcan_probe(struct platform_device *ofdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = ofdev-&gt;dev.of_node;</div><div class='del'>-	struct resource *res;</div><div class='add'>+	struct device_node *sysid_parent;</div><div class='ctx'> 	u32 sysid, ambafreq;</div><div class='ctx'> 	int irq, err;</div><div class='ctx'> 	void __iomem *base;</div><div class='hunk'>@@ -1661,10 +1652,14 @@ static int grcan_probe(struct platform_device *ofdev)</div><div class='ctx'> 	/* Compare GRLIB version number with the first that does not</div><div class='ctx'> 	 * have the tx bug (see start_xmit)</div><div class='ctx'> 	 */</div><div class='del'>-	err = of_property_read_u32(np, "systemid", &amp;sysid);</div><div class='del'>-	if (!err &amp;&amp; ((sysid &amp; GRLIB_VERSION_MASK)</div><div class='del'>-		     &gt;= GRCAN_TXBUG_SAFE_GRLIB_VERSION))</div><div class='del'>-		txbug = false;</div><div class='add'>+	sysid_parent = of_find_node_by_path("/ambapp0");</div><div class='add'>+	if (sysid_parent) {</div><div class='add'>+		err = of_property_read_u32(sysid_parent, "systemid", &amp;sysid);</div><div class='add'>+		if (!err &amp;&amp; ((sysid &amp; GRLIB_VERSION_MASK) &gt;=</div><div class='add'>+			     GRCAN_TXBUG_SAFE_GRLIB_VERSION))</div><div class='add'>+			txbug = false;</div><div class='add'>+		of_node_put(sysid_parent);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = of_property_read_u32(np, "freq", &amp;ambafreq);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1672,8 +1667,7 @@ static int grcan_probe(struct platform_device *ofdev)</div><div class='ctx'> 		goto exit_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);</div><div class='del'>-	base = devm_ioremap_resource(&amp;ofdev-&gt;dev, res);</div><div class='add'>+	base = devm_platform_ioremap_resource(ofdev, 0);</div><div class='ctx'> 	if (IS_ERR(base)) {</div><div class='ctx'> 		err = PTR_ERR(base);</div><div class='ctx'> 		goto exit_error;</div><div class='hunk'>@@ -1703,7 +1697,7 @@ exit_error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int grcan_remove(struct platform_device *ofdev)</div><div class='add'>+static void grcan_remove(struct platform_device *ofdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(ofdev);</div><div class='ctx'> 	struct grcan_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -1713,8 +1707,6 @@ static int grcan_remove(struct platform_device *ofdev)</div><div class='ctx'> 	irq_dispose_mapping(dev-&gt;irq);</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> 	free_candev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id grcan_match[] = {</div><div class='head'>diff --git a/drivers/net/can/ifi_canfd/Kconfig b/drivers/net/can/ifi_canfd/Kconfig<br/>index ce0197641a59..b5dd9c13d529 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ifi_canfd/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ifi_canfd/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ifi_canfd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ifi_canfd/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> config CAN_IFI_CANFD</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	tristate "IFI CAN_FD IP"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for the I/F/I CAN_FD soft IP block</div><div class='ctx'> 	  connected to the "platform bus" (Linux abstraction for directly</div><div class='ctx'> 	  to the processor attached devices). The CAN_FD is most often</div><div class='head'>diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c<br/>index fedd927ba6ed..0f83335e4d07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ifi_canfd/ifi_canfd.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ifi_canfd/ifi_canfd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ifi_canfd/ifi_canfd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ifi_canfd/ifi_canfd.c</a></div><div class='hunk'>@@ -13,13 +13,13 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='hunk'>@@ -271,9 +271,9 @@ static void ifi_canfd_read_fifo(struct net_device *ndev)</div><div class='ctx'> 	dlc = (rxdlc &gt;&gt; IFI_CANFD_RXFIFO_DLC_DLC_OFFSET) &amp;</div><div class='ctx'> 	      IFI_CANFD_RXFIFO_DLC_DLC_MASK;</div><div class='ctx'> 	if (rxdlc &amp; IFI_CANFD_RXFIFO_DLC_EDL)</div><div class='del'>-		cf-&gt;len = can_dlc2len(dlc);</div><div class='add'>+		cf-&gt;len = can_fd_dlc2len(dlc);</div><div class='ctx'> 	else</div><div class='del'>-		cf-&gt;len = get_can_dlc(dlc);</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len(dlc);</div><div class='ctx'> </div><div class='ctx'> 	rxid = readl(priv-&gt;base + IFI_CANFD_RXFIFO_ID);</div><div class='ctx'> 	id = (rxid &gt;&gt; IFI_CANFD_RXFIFO_ID_ID_OFFSET);</div><div class='hunk'>@@ -309,15 +309,15 @@ static void ifi_canfd_read_fifo(struct net_device *ndev)</div><div class='ctx'> 			*(u32 *)(cf-&gt;data + i) =</div><div class='ctx'> 				readl(priv-&gt;base + IFI_CANFD_RXFIFO_DATA + i);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	}</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	/* Remove the packet from FIFO */</div><div class='ctx'> 	writel(IFI_CANFD_RXSTCMD_REMOVE_MSG, priv-&gt;base + IFI_CANFD_RXSTCMD);</div><div class='ctx'> 	writel(rx_irq_mask, priv-&gt;base + IFI_CANFD_INTERRUPT);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;len;</div><div class='del'>-</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -345,9 +345,6 @@ static int ifi_canfd_do_rx_poll(struct net_device *ndev, int quota)</div><div class='ctx'> 		rxst = readl(priv-&gt;base + IFI_CANFD_RXSTCMD);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pkts)</div><div class='del'>-		can_led_event(ndev, CAN_LED_EVENT_RX);</div><div class='del'>-</div><div class='ctx'> 	return pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,36 +390,55 @@ static int ifi_canfd_handle_lec_err(struct net_device *ndev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='ctx'> </div><div class='ctx'> 	/* Propagate the error condition to the CAN stack. */</div><div class='ctx'> 	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the error counter register and check for new errors. */</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+	if (likely(skb))</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_OVERLOAD_FIRST)</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_OVERLOAD;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_OVERLOAD_FIRST) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_OVERLOAD;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_ACK_ERROR_FIRST)</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_ACK_ERROR_FIRST) {</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_BIT0_ERROR_FIRST)</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_BIT0_ERROR_FIRST) {</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_BIT1_ERROR_FIRST)</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_BIT1_ERROR_FIRST) {</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_STUFF_ERROR_FIRST)</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_STUFF_ERROR_FIRST) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_CRC_ERROR_FIRST)</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_CRC_ERROR_FIRST) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (errctr &amp; IFI_CANFD_ERROR_CTR_FORM_ERROR_FIRST)</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+	if (errctr &amp; IFI_CANFD_ERROR_CTR_FORM_ERROR_FIRST) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the error counter, ack the IRQ and re-enable the counter. */</div><div class='ctx'> 	writel(IFI_CANFD_ERROR_CTR_ER_RESET, priv-&gt;base + IFI_CANFD_ERROR_CTR);</div><div class='hunk'>@@ -430,8 +446,9 @@ static int ifi_canfd_handle_lec_err(struct net_device *ndev)</div><div class='ctx'> 	       priv-&gt;base + IFI_CANFD_INTERRUPT);</div><div class='ctx'> 	writel(IFI_CANFD_ERROR_CTR_ER_ENABLE, priv-&gt;base + IFI_CANFD_ERROR_CTR);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -456,7 +473,6 @@ static int ifi_canfd_handle_state_change(struct net_device *ndev,</div><div class='ctx'> 					 enum can_state new_state)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifi_canfd_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='hunk'>@@ -498,7 +514,7 @@ static int ifi_canfd_handle_state_change(struct net_device *ndev,</div><div class='ctx'> 	switch (new_state) {</div><div class='ctx'> 	case CAN_STATE_ERROR_WARNING:</div><div class='ctx'> 		/* error warning state */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[1] = (bec.txerr &gt; bec.rxerr) ?</div><div class='ctx'> 			CAN_ERR_CRTL_TX_WARNING :</div><div class='ctx'> 			CAN_ERR_CRTL_RX_WARNING;</div><div class='hunk'>@@ -507,7 +523,7 @@ static int ifi_canfd_handle_state_change(struct net_device *ndev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CAN_STATE_ERROR_PASSIVE:</div><div class='ctx'> 		/* error passive state */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[1] |= CAN_ERR_CRTL_RX_PASSIVE;</div><div class='ctx'> 		if (bec.txerr &gt; 127)</div><div class='ctx'> 			cf-&gt;data[1] |= CAN_ERR_CRTL_TX_PASSIVE;</div><div class='hunk'>@@ -522,8 +538,6 @@ static int ifi_canfd_handle_state_change(struct net_device *ndev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -629,9 +643,8 @@ static irqreturn_t ifi_canfd_isr(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	/* TX IRQ */</div><div class='ctx'> 	if (isr &amp; IFI_CANFD_INTERRUPT_TXFIFO_REMOVE) {</div><div class='del'>-		stats-&gt;tx_bytes += can_get_echo_skb(ndev, 0);</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(ndev, 0, NULL);</div><div class='ctx'> 		stats-&gt;tx_packets++;</div><div class='del'>-		can_led_event(ndev, CAN_LED_EVENT_TX);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (isr &amp; tx_irq_mask)</div><div class='hunk'>@@ -656,7 +669,7 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ifi_canfd_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='del'>-	const struct can_bittiming *dbt = &amp;priv-&gt;can.data_bittiming;</div><div class='add'>+	const struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='ctx'> 	u16 brp, sjw, tseg1, tseg2, tdc;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure bit timing */</div><div class='hunk'>@@ -835,7 +848,6 @@ static int ifi_canfd_open(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	ifi_canfd_start(ndev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	napi_enable(&amp;priv-&gt;napi);</div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -858,8 +870,6 @@ static int ifi_canfd_close(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	close_candev(ndev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -871,7 +881,7 @@ static netdev_tx_t ifi_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	u32 txst, txid, txdlc;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if the TX buffer is full */</div><div class='hunk'>@@ -900,7 +910,7 @@ static netdev_tx_t ifi_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		txid = cf-&gt;can_id &amp; CAN_SFF_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txdlc = can_len2dlc(cf-&gt;len);</div><div class='add'>+	txdlc = can_fd_len2dlc(cf-&gt;len);</div><div class='ctx'> 	if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) &amp;&amp; can_is_canfd_skb(skb)) {</div><div class='ctx'> 		txdlc |= IFI_CANFD_TXFIFO_DLC_EDL;</div><div class='ctx'> 		if (cf-&gt;flags &amp; CANFD_BRS)</div><div class='hunk'>@@ -922,7 +932,7 @@ static netdev_tx_t ifi_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	writel(0, priv-&gt;base + IFI_CANFD_TXFIFO_REPEATCOUNT);</div><div class='ctx'> 	writel(0, priv-&gt;base + IFI_CANFD_TXFIFO_SUSPEND_US);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, ndev, 0);</div><div class='add'>+	can_put_echo_skb(skb, ndev, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Start the transmission */</div><div class='ctx'> 	writel(IFI_CANFD_TXSTCMD_ADD_MSG, priv-&gt;base + IFI_CANFD_TXSTCMD);</div><div class='hunk'>@@ -934,7 +944,10 @@ static const struct net_device_ops ifi_canfd_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= ifi_canfd_open,</div><div class='ctx'> 	.ndo_stop	= ifi_canfd_close,</div><div class='ctx'> 	.ndo_start_xmit	= ifi_canfd_start_xmit,</div><div class='del'>-	.ndo_change_mtu	= can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ifi_canfd_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int ifi_canfd_plat_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -942,15 +955,16 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct ifi_canfd_priv *priv;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> 	int irq, ret;</div><div class='ctx'> 	u32 id, rev;</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	addr = devm_ioremap_resource(dev, res);</div><div class='add'>+	addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(addr))</div><div class='add'>+		return PTR_ERR(addr);</div><div class='add'>+</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (IS_ERR(addr) || irq &lt; 0)</div><div class='add'>+	if (irq &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	id = readl(addr + IFI_CANFD_IP_ID);</div><div class='hunk'>@@ -973,21 +987,22 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)</div><div class='ctx'> 	ndev-&gt;irq = irq;</div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;ifi_canfd_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;ifi_canfd_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='ctx'> 	priv-&gt;ndev = ndev;</div><div class='ctx'> 	priv-&gt;base = addr;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, ifi_canfd_poll, 64);</div><div class='add'>+	netif_napi_add(ndev, &amp;priv-&gt;napi, ifi_canfd_poll);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.clock.freq = readl(addr + IFI_CANFD_CANCLOCK);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.bittiming_const	= &amp;ifi_canfd_bittiming_const;</div><div class='del'>-	priv-&gt;can.data_bittiming_const	= &amp;ifi_canfd_bittiming_const;</div><div class='del'>-	priv-&gt;can.do_set_mode		= ifi_canfd_set_mode;</div><div class='del'>-	priv-&gt;can.do_get_berr_counter	= ifi_canfd_get_berr_counter;</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;ifi_canfd_bittiming_const;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;ifi_canfd_bittiming_const;</div><div class='add'>+	priv-&gt;can.do_set_mode = ifi_canfd_set_mode;</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = ifi_canfd_get_berr_counter;</div><div class='ctx'> </div><div class='ctx'> 	/* IFI CANFD can do both Bosch FD and ISO FD */</div><div class='ctx'> 	priv-&gt;can.ctrlmode = CAN_CTRLMODE_FD;</div><div class='hunk'>@@ -1008,8 +1023,6 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_reg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(ndev);</div><div class='del'>-</div><div class='ctx'> 	dev_info(dev, "Driver registered: regs=%p, irq=%d, clock=%d\n",</div><div class='ctx'> 		 priv-&gt;base, ndev-&gt;irq, priv-&gt;can.clock.freq);</div><div class='ctx'> </div><div class='hunk'>@@ -1020,15 +1033,13 @@ err_reg:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ifi_canfd_plat_remove(struct platform_device *pdev)</div><div class='add'>+static void ifi_canfd_plat_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_candev(ndev);</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_candev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ifi_canfd_of_table[] = {</div><div class='hunk'>@@ -1043,7 +1054,7 @@ static struct platform_driver ifi_canfd_plat_driver = {</div><div class='ctx'> 		.of_match_table	= ifi_canfd_of_table,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= ifi_canfd_plat_probe,</div><div class='del'>-	.remove	= ifi_canfd_plat_remove,</div><div class='add'>+	.remove = ifi_canfd_plat_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(ifi_canfd_plat_driver);</div><div class='head'>diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c<br/>index 19d4f52a8f90..1efdd1fd8caa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/janz-ican3.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/janz-ican3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/janz-ican3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/janz-ican3.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -916,10 +917,10 @@ static void ican3_to_can_frame(struct ican3_dev *mod,</div><div class='ctx'> </div><div class='ctx'> 		cf-&gt;can_id |= desc-&gt;data[0] &lt;&lt; 3;</div><div class='ctx'> 		cf-&gt;can_id |= (desc-&gt;data[1] &amp; 0xe0) &gt;&gt; 5;</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(desc-&gt;data[1] &amp; ICAN3_CAN_DLC_MASK);</div><div class='del'>-		memcpy(cf-&gt;data, &amp;desc-&gt;data[2], cf-&gt;can_dlc);</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len(desc-&gt;data[1] &amp; ICAN3_CAN_DLC_MASK);</div><div class='add'>+		memcpy(cf-&gt;data, &amp;desc-&gt;data[2], cf-&gt;len);</div><div class='ctx'> 	} else {</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(desc-&gt;data[0] &amp; ICAN3_CAN_DLC_MASK);</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len(desc-&gt;data[0] &amp; ICAN3_CAN_DLC_MASK);</div><div class='ctx'> 		if (desc-&gt;data[0] &amp; ICAN3_EFF_RTR)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> </div><div class='hunk'>@@ -934,7 +935,7 @@ static void ican3_to_can_frame(struct ican3_dev *mod,</div><div class='ctx'> 			cf-&gt;can_id |= desc-&gt;data[3] &gt;&gt; 5;  /* 2-0   */</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		memcpy(cf-&gt;data, &amp;desc-&gt;data[6], cf-&gt;can_dlc);</div><div class='add'>+		memcpy(cf-&gt;data, &amp;desc-&gt;data[6], cf-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -947,7 +948,7 @@ static void can_frame_to_ican3(struct ican3_dev *mod,</div><div class='ctx'> </div><div class='ctx'> 	/* we always use the extended format, with the ECHO flag set */</div><div class='ctx'> 	desc-&gt;command = ICAN3_CAN_TYPE_EFF;</div><div class='del'>-	desc-&gt;data[0] |= cf-&gt;can_dlc;</div><div class='add'>+	desc-&gt;data[0] |= cf-&gt;len;</div><div class='ctx'> 	desc-&gt;data[1] |= ICAN3_ECHO;</div><div class='ctx'> </div><div class='ctx'> 	/* support single transmission (no retries) mode */</div><div class='hunk'>@@ -970,7 +971,7 @@ static void can_frame_to_ican3(struct ican3_dev *mod,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* copy the data bits into the descriptor */</div><div class='del'>-	memcpy(&amp;desc-&gt;data[6], cf-&gt;data, cf-&gt;can_dlc);</div><div class='add'>+	memcpy(&amp;desc-&gt;data[6], cf-&gt;data, cf-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1127,7 +1128,7 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)</div><div class='ctx'> 	/* bus error interrupt */</div><div class='ctx'> 	if (isrc == CEVTIND_BEI) {</div><div class='ctx'> 		mod-&gt;can.can_stats.bus_error++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR | CAN_ERR_CNT;</div><div class='ctx'> </div><div class='ctx'> 		switch (ecc &amp; ECC_MASK) {</div><div class='ctx'> 		case ECC_BIT:</div><div class='hunk'>@@ -1153,7 +1154,7 @@ static int ican3_handle_cevtind(struct ican3_dev *mod, struct ican3_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 	if (state != mod-&gt;can.state &amp;&amp; (state == CAN_STATE_ERROR_WARNING ||</div><div class='ctx'> 					state == CAN_STATE_ERROR_PASSIVE)) {</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		if (state == CAN_STATE_ERROR_WARNING) {</div><div class='ctx'> 			mod-&gt;can.can_stats.error_warning++;</div><div class='ctx'> 			cf-&gt;data[1] = (txerr &gt; rxerr) ?</div><div class='hunk'>@@ -1277,6 +1278,8 @@ static void ican3_put_echo_skb(struct ican3_dev *mod, struct sk_buff *skb)</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='ctx'> 	/* save this skb for tx interrupt echo handling */</div><div class='ctx'> 	skb_queue_tail(&amp;mod-&gt;echoq, skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -1285,7 +1288,7 @@ static unsigned int ican3_get_echo_skb(struct ican3_dev *mod)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = skb_dequeue(&amp;mod-&gt;echoq);</div><div class='ctx'> 	struct can_frame *cf;</div><div class='del'>-	u8 dlc;</div><div class='add'>+	u8 dlc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* this should never trigger unless there is a driver bug */</div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -1294,7 +1297,8 @@ static unsigned int ican3_get_echo_skb(struct ican3_dev *mod)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cf = (struct can_frame *)skb-&gt;data;</div><div class='del'>-	dlc = cf-&gt;can_dlc;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		dlc = cf-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	/* check flag whether this packet has to be looped back */</div><div class='ctx'> 	if (skb-&gt;pkt_type != PACKET_LOOPBACK) {</div><div class='hunk'>@@ -1332,10 +1336,10 @@ static bool ican3_echo_skb_matches(struct ican3_dev *mod, struct sk_buff *skb)</div><div class='ctx'> 	if (cf-&gt;can_id != echo_cf-&gt;can_id)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	if (cf-&gt;can_dlc != echo_cf-&gt;can_dlc)</div><div class='add'>+	if (cf-&gt;len != echo_cf-&gt;len)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	return memcmp(cf-&gt;data, echo_cf-&gt;data, cf-&gt;can_dlc) == 0;</div><div class='add'>+	return memcmp(cf-&gt;data, echo_cf-&gt;data, cf-&gt;len) == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1421,7 +1425,8 @@ static int ican3_recv_skb(struct ican3_dev *mod)</div><div class='ctx'> </div><div class='ctx'> 	/* update statistics, receive the skb */</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> err_noalloc:</div><div class='hunk'>@@ -1451,7 +1456,7 @@ static int ican3_napi(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	/* process all communication messages */</div><div class='ctx'> 	while (true) {</div><div class='del'>-		struct ican3_msg uninitialized_var(msg);</div><div class='add'>+		struct ican3_msg msg;</div><div class='ctx'> 		ret = ican3_recv_msg(mod, &amp;msg);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1688,7 +1693,7 @@ static netdev_tx_t ican3_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	void __iomem *desc_addr;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;mod-&gt;lock, flags);</div><div class='hunk'>@@ -1747,7 +1752,10 @@ static const struct net_device_ops ican3_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= ican3_open,</div><div class='ctx'> 	.ndo_stop	= ican3_stop,</div><div class='ctx'> 	.ndo_start_xmit	= ican3_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ican3_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1815,9 +1823,9 @@ static int ican3_get_berr_counter(const struct net_device *ndev,</div><div class='ctx'>  * Sysfs Attributes</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static ssize_t ican3_sysfs_show_term(struct device *dev,</div><div class='del'>-				     struct device_attribute *attr,</div><div class='del'>-				     char *buf)</div><div class='add'>+static ssize_t termination_show(struct device *dev,</div><div class='add'>+				struct device_attribute *attr,</div><div class='add'>+				char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ican3_dev *mod = netdev_priv(to_net_dev(dev));</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1831,12 +1839,12 @@ static ssize_t ican3_sysfs_show_term(struct device *dev,</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return snprintf(buf, PAGE_SIZE, "%u\n", mod-&gt;termination_enabled);</div><div class='add'>+	return sysfs_emit(buf, "%u\n", mod-&gt;termination_enabled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ican3_sysfs_set_term(struct device *dev,</div><div class='del'>-				    struct device_attribute *attr,</div><div class='del'>-				    const char *buf, size_t count)</div><div class='add'>+static ssize_t termination_store(struct device *dev,</div><div class='add'>+				 struct device_attribute *attr,</div><div class='add'>+				 const char *buf, size_t count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ican3_dev *mod = netdev_priv(to_net_dev(dev));</div><div class='ctx'> 	unsigned long enable;</div><div class='hunk'>@@ -1852,18 +1860,17 @@ static ssize_t ican3_sysfs_set_term(struct device *dev,</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ssize_t ican3_sysfs_show_fwinfo(struct device *dev,</div><div class='del'>-				       struct device_attribute *attr,</div><div class='del'>-				       char *buf)</div><div class='add'>+static ssize_t fwinfo_show(struct device *dev,</div><div class='add'>+			   struct device_attribute *attr,</div><div class='add'>+			   char *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct ican3_dev *mod = netdev_priv(to_net_dev(dev));</div><div class='ctx'> </div><div class='del'>-	return scnprintf(buf, PAGE_SIZE, "%s\n", mod-&gt;fwinfo);</div><div class='add'>+	return sysfs_emit(buf, "%s\n", mod-&gt;fwinfo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static DEVICE_ATTR(termination, 0644, ican3_sysfs_show_term,</div><div class='del'>-		   ican3_sysfs_set_term);</div><div class='del'>-static DEVICE_ATTR(fwinfo, 0444, ican3_sysfs_show_fwinfo, NULL);</div><div class='add'>+static DEVICE_ATTR_RW(termination);</div><div class='add'>+static DEVICE_ATTR_RO(fwinfo);</div><div class='ctx'> </div><div class='ctx'> static struct attribute *ican3_sysfs_attrs[] = {</div><div class='ctx'> 	&amp;dev_attr_termination.attr,</div><div class='hunk'>@@ -1909,7 +1916,7 @@ static int ican3_probe(struct platform_device *pdev)</div><div class='ctx'> 	mod = netdev_priv(ndev);</div><div class='ctx'> 	mod-&gt;ndev = ndev;</div><div class='ctx'> 	mod-&gt;num = pdata-&gt;modno;</div><div class='del'>-	netif_napi_add(ndev, &amp;mod-&gt;napi, ican3_napi, ICAN3_RX_BUFFERS);</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;mod-&gt;napi, ican3_napi, ICAN3_RX_BUFFERS);</div><div class='ctx'> 	skb_queue_head_init(&amp;mod-&gt;echoq);</div><div class='ctx'> 	spin_lock_init(&amp;mod-&gt;lock);</div><div class='ctx'> 	init_completion(&amp;mod-&gt;termination_comp);</div><div class='hunk'>@@ -1922,6 +1929,7 @@ static int ican3_probe(struct platform_device *pdev)</div><div class='ctx'> 	mod-&gt;free_page = DPM_FREE_START;</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;ican3_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;ican3_ethtool_ops;</div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1936,7 +1944,6 @@ static int ican3_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* find our IRQ number */</div><div class='ctx'> 	mod-&gt;irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (mod-&gt;irq &lt; 0) {</div><div class='del'>-		dev_err(dev, "IRQ line not found\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto out_free_ndev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2015,7 +2022,7 @@ out_return:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ican3_remove(struct platform_device *pdev)</div><div class='add'>+static void ican3_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct ican3_dev *mod = netdev_priv(ndev);</div><div class='hunk'>@@ -2034,8 +2041,6 @@ static int ican3_remove(struct platform_device *pdev)</div><div class='ctx'> 	iounmap(mod-&gt;dpm);</div><div class='ctx'> </div><div class='ctx'> 	free_candev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ican3_driver = {</div><div class='head'>diff --git a/drivers/net/can/kvaser_pciefd/Makefile b/drivers/net/can/kvaser_pciefd/Makefile<br/>new file mode 100644<br/>index 000000000000..8c5b8cdc6b5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/kvaser_pciefd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/kvaser_pciefd/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+obj-$(CONFIG_CAN_KVASER_PCIEFD) += kvaser_pciefd.o</div><div class='add'>+kvaser_pciefd-y = kvaser_pciefd_core.o kvaser_pciefd_devlink.o</div><div class='head'>diff --git a/drivers/net/can/kvaser_pciefd/kvaser_pciefd.h b/drivers/net/can/kvaser_pciefd/kvaser_pciefd.h<br/>new file mode 100644<br/>index 000000000000..08c9ddc1ee85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/kvaser_pciefd/kvaser_pciefd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/kvaser_pciefd/kvaser_pciefd.h</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */</div><div class='add'>+/* kvaser_pciefd common definitions and declarations</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 KVASER AB, Sweden. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _KVASER_PCIEFD_H</div><div class='add'>+#define _KVASER_PCIEFD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#define KVASER_PCIEFD_MAX_CAN_CHANNELS 8UL</div><div class='add'>+#define KVASER_PCIEFD_DMA_COUNT 2U</div><div class='add'>+#define KVASER_PCIEFD_DMA_SIZE (4U * 1024U)</div><div class='add'>+#define KVASER_PCIEFD_CAN_TX_MAX_COUNT 17U</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd;</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_address_offset {</div><div class='add'>+	u32 serdes;</div><div class='add'>+	u32 pci_ien;</div><div class='add'>+	u32 pci_irq;</div><div class='add'>+	u32 sysid;</div><div class='add'>+	u32 loopback;</div><div class='add'>+	u32 kcan_srb_fifo;</div><div class='add'>+	u32 kcan_srb;</div><div class='add'>+	u32 kcan_ch0;</div><div class='add'>+	u32 kcan_ch1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_irq_mask {</div><div class='add'>+	u32 kcan_rx0;</div><div class='add'>+	u32 kcan_tx[KVASER_PCIEFD_MAX_CAN_CHANNELS];</div><div class='add'>+	u32 all;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_dev_ops {</div><div class='add'>+	void (*kvaser_pciefd_write_dma_map)(struct kvaser_pciefd *pcie,</div><div class='add'>+					    dma_addr_t addr, int index);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_driver_data {</div><div class='add'>+	const struct kvaser_pciefd_address_offset *address_offset;</div><div class='add'>+	const struct kvaser_pciefd_irq_mask *irq_mask;</div><div class='add'>+	const struct kvaser_pciefd_dev_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_fw_version {</div><div class='add'>+	u8 major;</div><div class='add'>+	u8 minor;</div><div class='add'>+	u16 build;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_can {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct devlink_port devlink_port;</div><div class='add'>+	struct kvaser_pciefd *kv_pcie;</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	u32 ioc;</div><div class='add'>+	u8 cmd_seq;</div><div class='add'>+	u8 tx_max_count;</div><div class='add'>+	u8 tx_idx;</div><div class='add'>+	u8 ack_idx;</div><div class='add'>+	int err_rep_cnt;</div><div class='add'>+	unsigned int completed_tx_pkts;</div><div class='add'>+	unsigned int completed_tx_bytes;</div><div class='add'>+	spinlock_t lock; /* Locks sensitive registers (e.g. MODE) */</div><div class='add'>+	struct timer_list bec_poll_timer;</div><div class='add'>+	struct completion start_comp, flush_comp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd {</div><div class='add'>+	struct pci_dev *pci;</div><div class='add'>+	void __iomem *reg_base;</div><div class='add'>+	struct kvaser_pciefd_can *can[KVASER_PCIEFD_MAX_CAN_CHANNELS];</div><div class='add'>+	const struct kvaser_pciefd_driver_data *driver_data;</div><div class='add'>+	void *dma_data[KVASER_PCIEFD_DMA_COUNT];</div><div class='add'>+	u8 nr_channels;</div><div class='add'>+	u32 bus_freq;</div><div class='add'>+	u32 freq;</div><div class='add'>+	u32 freq_to_ticks_div;</div><div class='add'>+	struct kvaser_pciefd_fw_version fw_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct devlink_ops kvaser_pciefd_devlink_ops;</div><div class='add'>+</div><div class='add'>+int kvaser_pciefd_devlink_port_register(struct kvaser_pciefd_can *can);</div><div class='add'>+void kvaser_pciefd_devlink_port_unregister(struct kvaser_pciefd_can *can);</div><div class='add'>+#endif /* _KVASER_PCIEFD_H */</div><div class='head'>diff --git a/drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c b/drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c<br/>new file mode 100644<br/>index 000000000000..d8c9bfb20230<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/kvaser_pciefd/kvaser_pciefd_core.c</a></div><div class='hunk'>@@ -0,0 +1,1908 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+/* Copyright (C) 2018 KVASER AB, Sweden. All rights reserved.</div><div class='add'>+ * Parts of this driver are based on the following:</div><div class='add'>+ *  - Kvaser linux pciefd driver (version 5.42)</div><div class='add'>+ *  - PEAK linux canfd driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "kvaser_pciefd.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='add'>+MODULE_AUTHOR("Kvaser AB &lt;support@kvaser.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CAN driver for Kvaser CAN/PCIe devices");</div><div class='add'>+</div><div class='add'>+#define KVASER_PCIEFD_DRV_NAME "kvaser_pciefd"</div><div class='add'>+</div><div class='add'>+#define KVASER_PCIEFD_WAIT_TIMEOUT msecs_to_jiffies(1000)</div><div class='add'>+#define KVASER_PCIEFD_BEC_POLL_FREQ (jiffies + msecs_to_jiffies(200))</div><div class='add'>+#define KVASER_PCIEFD_MAX_ERR_REP 256U</div><div class='add'>+</div><div class='add'>+#define KVASER_PCIEFD_VENDOR 0x1a07</div><div class='add'>+</div><div class='add'>+/* Altera based devices */</div><div class='add'>+#define KVASER_PCIEFD_4HS_DEVICE_ID 0x000d</div><div class='add'>+#define KVASER_PCIEFD_2HS_V2_DEVICE_ID 0x000e</div><div class='add'>+#define KVASER_PCIEFD_HS_V2_DEVICE_ID 0x000f</div><div class='add'>+#define KVASER_PCIEFD_MINIPCIE_HS_V2_DEVICE_ID 0x0010</div><div class='add'>+#define KVASER_PCIEFD_MINIPCIE_2HS_V2_DEVICE_ID 0x0011</div><div class='add'>+</div><div class='add'>+/* SmartFusion2 based devices */</div><div class='add'>+#define KVASER_PCIEFD_2CAN_V3_DEVICE_ID 0x0012</div><div class='add'>+#define KVASER_PCIEFD_1CAN_V3_DEVICE_ID 0x0013</div><div class='add'>+#define KVASER_PCIEFD_4CAN_V2_DEVICE_ID 0x0014</div><div class='add'>+#define KVASER_PCIEFD_MINIPCIE_2CAN_V3_DEVICE_ID 0x0015</div><div class='add'>+#define KVASER_PCIEFD_MINIPCIE_1CAN_V3_DEVICE_ID 0x0016</div><div class='add'>+</div><div class='add'>+/* Xilinx based devices */</div><div class='add'>+#define KVASER_PCIEFD_M2_4CAN_DEVICE_ID 0x0017</div><div class='add'>+#define KVASER_PCIEFD_8CAN_DEVICE_ID 0x0019</div><div class='add'>+</div><div class='add'>+/* Altera SerDes Enable 64-bit DMA address translation */</div><div class='add'>+#define KVASER_PCIEFD_ALTERA_DMA_64BIT BIT(0)</div><div class='add'>+</div><div class='add'>+/* SmartFusion2 SerDes LSB address translation mask */</div><div class='add'>+#define KVASER_PCIEFD_SF2_DMA_LSB_MASK GENMASK(31, 12)</div><div class='add'>+</div><div class='add'>+/* Xilinx SerDes LSB address translation mask */</div><div class='add'>+#define KVASER_PCIEFD_XILINX_DMA_LSB_MASK GENMASK(31, 12)</div><div class='add'>+</div><div class='add'>+/* Kvaser KCAN CAN controller registers */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_FIFO_REG 0x100</div><div class='add'>+#define KVASER_PCIEFD_KCAN_FIFO_LAST_REG 0x180</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CTRL_REG 0x2c0</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CMD_REG 0x400</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IOC_REG 0x404</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IEN_REG 0x408</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_REG 0x410</div><div class='add'>+#define KVASER_PCIEFD_KCAN_TX_NR_PACKETS_REG 0x414</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_REG 0x418</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_REG 0x41c</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BTRN_REG 0x420</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BUS_LOAD_REG 0x424</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BTRD_REG 0x428</div><div class='add'>+#define KVASER_PCIEFD_KCAN_PWM_REG 0x430</div><div class='add'>+/* System identification and information registers */</div><div class='add'>+#define KVASER_PCIEFD_SYSID_VERSION_REG 0x8</div><div class='add'>+#define KVASER_PCIEFD_SYSID_CANFREQ_REG 0xc</div><div class='add'>+#define KVASER_PCIEFD_SYSID_BUSFREQ_REG 0x10</div><div class='add'>+#define KVASER_PCIEFD_SYSID_BUILD_REG 0x14</div><div class='add'>+/* Shared receive buffer FIFO registers */</div><div class='add'>+#define KVASER_PCIEFD_SRB_FIFO_LAST_REG 0x1f4</div><div class='add'>+/* Shared receive buffer registers */</div><div class='add'>+#define KVASER_PCIEFD_SRB_CMD_REG 0x0</div><div class='add'>+#define KVASER_PCIEFD_SRB_IEN_REG 0x04</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_REG 0x0c</div><div class='add'>+#define KVASER_PCIEFD_SRB_STAT_REG 0x10</div><div class='add'>+#define KVASER_PCIEFD_SRB_RX_NR_PACKETS_REG 0x14</div><div class='add'>+#define KVASER_PCIEFD_SRB_CTRL_REG 0x18</div><div class='add'>+</div><div class='add'>+/* System build information fields */</div><div class='add'>+#define KVASER_PCIEFD_SYSID_VERSION_NR_CHAN_MASK GENMASK(31, 24)</div><div class='add'>+#define KVASER_PCIEFD_SYSID_VERSION_MAJOR_MASK GENMASK(23, 16)</div><div class='add'>+#define KVASER_PCIEFD_SYSID_VERSION_MINOR_MASK GENMASK(7, 0)</div><div class='add'>+#define KVASER_PCIEFD_SYSID_BUILD_SEQ_MASK GENMASK(15, 1)</div><div class='add'>+</div><div class='add'>+/* Reset DMA buffer 0, 1 and FIFO offset */</div><div class='add'>+#define KVASER_PCIEFD_SRB_CMD_RDB1 BIT(5)</div><div class='add'>+#define KVASER_PCIEFD_SRB_CMD_RDB0 BIT(4)</div><div class='add'>+#define KVASER_PCIEFD_SRB_CMD_FOR BIT(0)</div><div class='add'>+</div><div class='add'>+/* DMA underflow, buffer 0 and 1 */</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_DUF1 BIT(13)</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_DUF0 BIT(12)</div><div class='add'>+/* DMA overflow, buffer 0 and 1 */</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_DOF1 BIT(11)</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_DOF0 BIT(10)</div><div class='add'>+/* DMA packet done, buffer 0 and 1 */</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_DPD1 BIT(9)</div><div class='add'>+#define KVASER_PCIEFD_SRB_IRQ_DPD0 BIT(8)</div><div class='add'>+</div><div class='add'>+/* Got DMA support */</div><div class='add'>+#define KVASER_PCIEFD_SRB_STAT_DMA BIT(24)</div><div class='add'>+/* DMA idle */</div><div class='add'>+#define KVASER_PCIEFD_SRB_STAT_DI BIT(15)</div><div class='add'>+</div><div class='add'>+/* SRB current packet level */</div><div class='add'>+#define KVASER_PCIEFD_SRB_RX_NR_PACKETS_MASK GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* DMA Enable */</div><div class='add'>+#define KVASER_PCIEFD_SRB_CTRL_DMA_ENABLE BIT(0)</div><div class='add'>+</div><div class='add'>+/* KCAN CTRL packet types */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CTRL_TYPE_MASK GENMASK(31, 29)</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CTRL_TYPE_EFLUSH 0x4</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CTRL_TYPE_EFRAME 0x5</div><div class='add'>+</div><div class='add'>+/* Command sequence number */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CMD_SEQ_MASK GENMASK(23, 16)</div><div class='add'>+/* Command bits */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CMD_MASK GENMASK(5, 0)</div><div class='add'>+/* Abort, flush and reset */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CMD_AT BIT(1)</div><div class='add'>+/* Request status packet */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CMD_SRQ BIT(0)</div><div class='add'>+</div><div class='add'>+/* Control CAN LED, active low */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IOC_LED BIT(0)</div><div class='add'>+</div><div class='add'>+/* Transmitter unaligned */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_TAL BIT(17)</div><div class='add'>+/* Tx FIFO empty */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_TE BIT(16)</div><div class='add'>+/* Tx FIFO overflow */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_TOF BIT(15)</div><div class='add'>+/* Tx buffer flush done */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_TFD BIT(14)</div><div class='add'>+/* Abort done */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_ABD BIT(13)</div><div class='add'>+/* Rx FIFO overflow */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_ROF BIT(5)</div><div class='add'>+/* FDF bit when controller is in classic CAN mode */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_FDIC BIT(3)</div><div class='add'>+/* Bus parameter protection error */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_BPP BIT(2)</div><div class='add'>+/* Tx FIFO unaligned end */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_TAE BIT(1)</div><div class='add'>+/* Tx FIFO unaligned read */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_IRQ_TAR BIT(0)</div><div class='add'>+</div><div class='add'>+/* Tx FIFO size */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_TX_NR_PACKETS_MAX_MASK GENMASK(23, 16)</div><div class='add'>+/* Tx FIFO current packet level */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_TX_NR_PACKETS_CURRENT_MASK GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* Current status packet sequence number */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_SEQNO_MASK GENMASK(31, 24)</div><div class='add'>+/* Controller got CAN FD capability */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_FD BIT(19)</div><div class='add'>+/* Controller got one-shot capability */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_CAP BIT(16)</div><div class='add'>+/* Controller in reset mode */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_IRM BIT(15)</div><div class='add'>+/* Reset mode request */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_RMR BIT(14)</div><div class='add'>+/* Bus off */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_BOFF BIT(11)</div><div class='add'>+/* Idle state. Controller in reset mode and no abort or flush pending */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_IDLE BIT(10)</div><div class='add'>+/* Abort request */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_AR BIT(7)</div><div class='add'>+/* Controller is bus off */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_STAT_BUS_OFF_MASK \</div><div class='add'>+	(KVASER_PCIEFD_KCAN_STAT_AR | KVASER_PCIEFD_KCAN_STAT_BOFF | \</div><div class='add'>+	 KVASER_PCIEFD_KCAN_STAT_RMR | KVASER_PCIEFD_KCAN_STAT_IRM)</div><div class='add'>+</div><div class='add'>+/* Classic CAN mode */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_CCM BIT(31)</div><div class='add'>+/* Active error flag enable. Clear to force error passive */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_EEN BIT(23)</div><div class='add'>+/* Acknowledgment packet type */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_APT BIT(20)</div><div class='add'>+/* CAN FD non-ISO */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_NIFDEN BIT(15)</div><div class='add'>+/* Error packet enable */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_EPEN BIT(12)</div><div class='add'>+/* Listen only mode */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_LOM BIT(9)</div><div class='add'>+/* Reset mode */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_MODE_RM BIT(8)</div><div class='add'>+</div><div class='add'>+/* BTRN and BTRD fields */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BTRN_TSEG2_MASK GENMASK(30, 26)</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BTRN_TSEG1_MASK GENMASK(25, 17)</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BTRN_SJW_MASK GENMASK(16, 13)</div><div class='add'>+#define KVASER_PCIEFD_KCAN_BTRN_BRP_MASK GENMASK(12, 0)</div><div class='add'>+</div><div class='add'>+/* PWM Control fields */</div><div class='add'>+#define KVASER_PCIEFD_KCAN_PWM_TOP_MASK GENMASK(23, 16)</div><div class='add'>+#define KVASER_PCIEFD_KCAN_PWM_TRIGGER_MASK GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* KCAN packet type IDs */</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_DATA 0x0</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_ACK 0x1</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_TXRQ 0x2</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_ERROR 0x3</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_EFLUSH_ACK 0x4</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK 0x5</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_ACK_DATA 0x6</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_STATUS 0x8</div><div class='add'>+#define KVASER_PCIEFD_PACK_TYPE_BUS_LOAD 0x9</div><div class='add'>+</div><div class='add'>+/* Common KCAN packet definitions, second word */</div><div class='add'>+#define KVASER_PCIEFD_PACKET_TYPE_MASK GENMASK(31, 28)</div><div class='add'>+#define KVASER_PCIEFD_PACKET_CHID_MASK GENMASK(27, 25)</div><div class='add'>+#define KVASER_PCIEFD_PACKET_SEQ_MASK GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+/* KCAN Transmit/Receive data packet, first word */</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_IDE BIT(30)</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_RTR BIT(29)</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_ID_MASK GENMASK(28, 0)</div><div class='add'>+/* KCAN Transmit data packet, second word */</div><div class='add'>+#define KVASER_PCIEFD_TPACKET_AREQ BIT(31)</div><div class='add'>+#define KVASER_PCIEFD_TPACKET_SMS BIT(16)</div><div class='add'>+/* KCAN Transmit/Receive data packet, second word */</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_FDF BIT(15)</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_BRS BIT(14)</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_ESI BIT(13)</div><div class='add'>+#define KVASER_PCIEFD_RPACKET_DLC_MASK GENMASK(11, 8)</div><div class='add'>+</div><div class='add'>+/* KCAN Transmit acknowledge packet, first word */</div><div class='add'>+#define KVASER_PCIEFD_APACKET_NACK BIT(11)</div><div class='add'>+#define KVASER_PCIEFD_APACKET_ABL BIT(10)</div><div class='add'>+#define KVASER_PCIEFD_APACKET_CT BIT(9)</div><div class='add'>+#define KVASER_PCIEFD_APACKET_FLU BIT(8)</div><div class='add'>+</div><div class='add'>+/* KCAN Status packet, first word */</div><div class='add'>+#define KVASER_PCIEFD_SPACK_RMCD BIT(22)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_IRM BIT(21)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_IDET BIT(20)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_BOFF BIT(16)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_RXERR_MASK GENMASK(15, 8)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_TXERR_MASK GENMASK(7, 0)</div><div class='add'>+/* KCAN Status packet, second word */</div><div class='add'>+#define KVASER_PCIEFD_SPACK_EPLR BIT(24)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_EWLR BIT(23)</div><div class='add'>+#define KVASER_PCIEFD_SPACK_AUTO BIT(21)</div><div class='add'>+</div><div class='add'>+/* KCAN Error detected packet, second word */</div><div class='add'>+#define KVASER_PCIEFD_EPACK_DIR_TX BIT(0)</div><div class='add'>+</div><div class='add'>+/* Macros for calculating addresses of registers */</div><div class='add'>+#define KVASER_PCIEFD_GET_BLOCK_ADDR(pcie, block) \</div><div class='add'>+	((pcie)-&gt;reg_base + (pcie)-&gt;driver_data-&gt;address_offset-&gt;block)</div><div class='add'>+#define KVASER_PCIEFD_PCI_IEN_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), pci_ien))</div><div class='add'>+#define KVASER_PCIEFD_PCI_IRQ_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), pci_irq))</div><div class='add'>+#define KVASER_PCIEFD_SERDES_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), serdes))</div><div class='add'>+#define KVASER_PCIEFD_SYSID_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), sysid))</div><div class='add'>+#define KVASER_PCIEFD_LOOPBACK_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), loopback))</div><div class='add'>+#define KVASER_PCIEFD_SRB_FIFO_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), kcan_srb_fifo))</div><div class='add'>+#define KVASER_PCIEFD_SRB_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), kcan_srb))</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CH0_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), kcan_ch0))</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CH1_ADDR(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_GET_BLOCK_ADDR((pcie), kcan_ch1))</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CHANNEL_SPAN(pcie) \</div><div class='add'>+	(KVASER_PCIEFD_KCAN_CH1_ADDR((pcie)) - KVASER_PCIEFD_KCAN_CH0_ADDR((pcie)))</div><div class='add'>+#define KVASER_PCIEFD_KCAN_CHX_ADDR(pcie, i) \</div><div class='add'>+	(KVASER_PCIEFD_KCAN_CH0_ADDR((pcie)) + (i) * KVASER_PCIEFD_KCAN_CHANNEL_SPAN((pcie)))</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd;</div><div class='add'>+static void kvaser_pciefd_write_dma_map_altera(struct kvaser_pciefd *pcie,</div><div class='add'>+					       dma_addr_t addr, int index);</div><div class='add'>+static void kvaser_pciefd_write_dma_map_sf2(struct kvaser_pciefd *pcie,</div><div class='add'>+					    dma_addr_t addr, int index);</div><div class='add'>+static void kvaser_pciefd_write_dma_map_xilinx(struct kvaser_pciefd *pcie,</div><div class='add'>+					       dma_addr_t addr, int index);</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_address_offset kvaser_pciefd_altera_address_offset = {</div><div class='add'>+	.serdes = 0x1000,</div><div class='add'>+	.pci_ien = 0x50,</div><div class='add'>+	.pci_irq = 0x40,</div><div class='add'>+	.sysid = 0x1f020,</div><div class='add'>+	.loopback = 0x1f000,</div><div class='add'>+	.kcan_srb_fifo = 0x1f200,</div><div class='add'>+	.kcan_srb = 0x1f400,</div><div class='add'>+	.kcan_ch0 = 0x10000,</div><div class='add'>+	.kcan_ch1 = 0x11000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_address_offset kvaser_pciefd_sf2_address_offset = {</div><div class='add'>+	.serdes = 0x280c8,</div><div class='add'>+	.pci_ien = 0x102004,</div><div class='add'>+	.pci_irq = 0x102008,</div><div class='add'>+	.sysid = 0x100000,</div><div class='add'>+	.loopback = 0x103000,</div><div class='add'>+	.kcan_srb_fifo = 0x120000,</div><div class='add'>+	.kcan_srb = 0x121000,</div><div class='add'>+	.kcan_ch0 = 0x140000,</div><div class='add'>+	.kcan_ch1 = 0x142000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_address_offset kvaser_pciefd_xilinx_address_offset = {</div><div class='add'>+	.serdes = 0x00208,</div><div class='add'>+	.pci_ien = 0x102004,</div><div class='add'>+	.pci_irq = 0x102008,</div><div class='add'>+	.sysid = 0x100000,</div><div class='add'>+	.loopback = 0x103000,</div><div class='add'>+	.kcan_srb_fifo = 0x120000,</div><div class='add'>+	.kcan_srb = 0x121000,</div><div class='add'>+	.kcan_ch0 = 0x140000,</div><div class='add'>+	.kcan_ch1 = 0x142000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_irq_mask kvaser_pciefd_altera_irq_mask = {</div><div class='add'>+	.kcan_rx0 = BIT(4),</div><div class='add'>+	.kcan_tx = { BIT(0), BIT(1), BIT(2), BIT(3) },</div><div class='add'>+	.all = GENMASK(4, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_irq_mask kvaser_pciefd_sf2_irq_mask = {</div><div class='add'>+	.kcan_rx0 = BIT(4),</div><div class='add'>+	.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19) },</div><div class='add'>+	.all = GENMASK(19, 16) | BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_irq_mask kvaser_pciefd_xilinx_irq_mask = {</div><div class='add'>+	.kcan_rx0 = BIT(4),</div><div class='add'>+	.kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19), BIT(20), BIT(21), BIT(22), BIT(23) },</div><div class='add'>+	.all = GENMASK(23, 16) | BIT(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_dev_ops kvaser_pciefd_altera_dev_ops = {</div><div class='add'>+	.kvaser_pciefd_write_dma_map = kvaser_pciefd_write_dma_map_altera,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_dev_ops kvaser_pciefd_sf2_dev_ops = {</div><div class='add'>+	.kvaser_pciefd_write_dma_map = kvaser_pciefd_write_dma_map_sf2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_dev_ops kvaser_pciefd_xilinx_dev_ops = {</div><div class='add'>+	.kvaser_pciefd_write_dma_map = kvaser_pciefd_write_dma_map_xilinx,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_driver_data kvaser_pciefd_altera_driver_data = {</div><div class='add'>+	.address_offset = &amp;kvaser_pciefd_altera_address_offset,</div><div class='add'>+	.irq_mask = &amp;kvaser_pciefd_altera_irq_mask,</div><div class='add'>+	.ops = &amp;kvaser_pciefd_altera_dev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_driver_data kvaser_pciefd_sf2_driver_data = {</div><div class='add'>+	.address_offset = &amp;kvaser_pciefd_sf2_address_offset,</div><div class='add'>+	.irq_mask = &amp;kvaser_pciefd_sf2_irq_mask,</div><div class='add'>+	.ops = &amp;kvaser_pciefd_sf2_dev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_pciefd_driver_data kvaser_pciefd_xilinx_driver_data = {</div><div class='add'>+	.address_offset = &amp;kvaser_pciefd_xilinx_address_offset,</div><div class='add'>+	.irq_mask = &amp;kvaser_pciefd_xilinx_irq_mask,</div><div class='add'>+	.ops = &amp;kvaser_pciefd_xilinx_dev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_rx_packet {</div><div class='add'>+	u32 header[2];</div><div class='add'>+	u64 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_pciefd_tx_packet {</div><div class='add'>+	u32 header[2];</div><div class='add'>+	u8 data[64];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const kvaser_pciefd_bittiming_const = {</div><div class='add'>+	.name = KVASER_PCIEFD_DRV_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 512,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 32,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 8192,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_device_id kvaser_pciefd_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_4HS_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_altera_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_2HS_V2_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_altera_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_HS_V2_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_altera_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_MINIPCIE_HS_V2_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_altera_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_MINIPCIE_2HS_V2_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_altera_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_2CAN_V3_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_sf2_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_1CAN_V3_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_sf2_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_4CAN_V2_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_sf2_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_MINIPCIE_2CAN_V3_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_sf2_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_MINIPCIE_1CAN_V3_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_sf2_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_M2_4CAN_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_xilinx_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		PCI_DEVICE(KVASER_PCIEFD_VENDOR, KVASER_PCIEFD_8CAN_DEVICE_ID),</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;kvaser_pciefd_xilinx_driver_data,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		0,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, kvaser_pciefd_id_table);</div><div class='add'>+</div><div class='add'>+static inline void kvaser_pciefd_send_kcan_cmd(struct kvaser_pciefd_can *can, u32 cmd)</div><div class='add'>+{</div><div class='add'>+	iowrite32(FIELD_PREP(KVASER_PCIEFD_KCAN_CMD_MASK, cmd) |</div><div class='add'>+		  FIELD_PREP(KVASER_PCIEFD_KCAN_CMD_SEQ_MASK, ++can-&gt;cmd_seq),</div><div class='add'>+		  can-&gt;reg_base + KVASER_PCIEFD_KCAN_CMD_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvaser_pciefd_request_status(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	kvaser_pciefd_send_kcan_cmd(can, KVASER_PCIEFD_KCAN_CMD_SRQ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvaser_pciefd_abort_flush_reset(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	kvaser_pciefd_send_kcan_cmd(can, KVASER_PCIEFD_KCAN_CMD_AT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvaser_pciefd_set_led(struct kvaser_pciefd_can *can, bool on)</div><div class='add'>+{</div><div class='add'>+	if (on)</div><div class='add'>+		can-&gt;ioc &amp;= ~KVASER_PCIEFD_KCAN_IOC_LED;</div><div class='add'>+	else</div><div class='add'>+		can-&gt;ioc |= KVASER_PCIEFD_KCAN_IOC_LED;</div><div class='add'>+</div><div class='add'>+	iowrite32(can-&gt;ioc, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IOC_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_enable_err_gen(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 mode;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	mode = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	if (!(mode &amp; KVASER_PCIEFD_KCAN_MODE_EPEN)) {</div><div class='add'>+		mode |= KVASER_PCIEFD_KCAN_MODE_EPEN;</div><div class='add'>+		iowrite32(mode, can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_disable_err_gen(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 mode;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	mode = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_EPEN;</div><div class='add'>+	iowrite32(mode, can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvaser_pciefd_set_tx_irq(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 msk;</div><div class='add'>+</div><div class='add'>+	msk = KVASER_PCIEFD_KCAN_IRQ_TE | KVASER_PCIEFD_KCAN_IRQ_ROF |</div><div class='add'>+	      KVASER_PCIEFD_KCAN_IRQ_TOF | KVASER_PCIEFD_KCAN_IRQ_ABD |</div><div class='add'>+	      KVASER_PCIEFD_KCAN_IRQ_TAE | KVASER_PCIEFD_KCAN_IRQ_TAL |</div><div class='add'>+	      KVASER_PCIEFD_KCAN_IRQ_FDIC | KVASER_PCIEFD_KCAN_IRQ_BPP |</div><div class='add'>+	      KVASER_PCIEFD_KCAN_IRQ_TAR;</div><div class='add'>+</div><div class='add'>+	iowrite32(msk, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void kvaser_pciefd_set_skb_timestamp(const struct kvaser_pciefd *pcie,</div><div class='add'>+						   struct sk_buff *skb, u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	skb_hwtstamps(skb)-&gt;hwtstamp =</div><div class='add'>+		ns_to_ktime(div_u64(timestamp * 1000, pcie-&gt;freq_to_ticks_div));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_setup_controller(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 mode;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	mode = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	if (can-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_CCM;</div><div class='add'>+		if (can-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO)</div><div class='add'>+			mode |= KVASER_PCIEFD_KCAN_MODE_NIFDEN;</div><div class='add'>+		else</div><div class='add'>+			mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_NIFDEN;</div><div class='add'>+	} else {</div><div class='add'>+		mode |= KVASER_PCIEFD_KCAN_MODE_CCM;</div><div class='add'>+		mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_NIFDEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (can-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		mode |= KVASER_PCIEFD_KCAN_MODE_LOM;</div><div class='add'>+	else</div><div class='add'>+		mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_LOM;</div><div class='add'>+	mode |= KVASER_PCIEFD_KCAN_MODE_EEN;</div><div class='add'>+	mode |= KVASER_PCIEFD_KCAN_MODE_EPEN;</div><div class='add'>+	/* Use ACK packet type */</div><div class='add'>+	mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_APT;</div><div class='add'>+	mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_RM;</div><div class='add'>+	iowrite32(mode, can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_start_controller_flush(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	iowrite32(GENMASK(31, 0), can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+	iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD,</div><div class='add'>+		  can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+	status = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_STAT_REG);</div><div class='add'>+	if (status &amp; KVASER_PCIEFD_KCAN_STAT_IDLE) {</div><div class='add'>+		/* If controller is already idle, run abort, flush and reset */</div><div class='add'>+		kvaser_pciefd_abort_flush_reset(can);</div><div class='add'>+	} else if (!(status &amp; KVASER_PCIEFD_KCAN_STAT_RMR)) {</div><div class='add'>+		u32 mode;</div><div class='add'>+</div><div class='add'>+		/* Put controller in reset mode */</div><div class='add'>+		mode = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+		mode |= KVASER_PCIEFD_KCAN_MODE_RM;</div><div class='add'>+		iowrite32(mode, can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_bus_on(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 mode;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	timer_delete(&amp;can-&gt;bec_poll_timer);</div><div class='add'>+	if (!completion_done(&amp;can-&gt;flush_comp))</div><div class='add'>+		kvaser_pciefd_start_controller_flush(can);</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;can-&gt;flush_comp,</div><div class='add'>+					 KVASER_PCIEFD_WAIT_TIMEOUT)) {</div><div class='add'>+		netdev_err(can-&gt;can.dev, "Timeout during bus on flush\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	iowrite32(0, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+	iowrite32(GENMASK(31, 0), can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+	iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD,</div><div class='add'>+		  can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+	mode = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	mode &amp;= ~KVASER_PCIEFD_KCAN_MODE_RM;</div><div class='add'>+	iowrite32(mode, can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;can-&gt;start_comp,</div><div class='add'>+					 KVASER_PCIEFD_WAIT_TIMEOUT)) {</div><div class='add'>+		netdev_err(can-&gt;can.dev, "Timeout during bus on reset\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+	/* Reset interrupt handling */</div><div class='add'>+	iowrite32(0, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+	iowrite32(GENMASK(31, 0), can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+</div><div class='add'>+	kvaser_pciefd_set_tx_irq(can);</div><div class='add'>+	kvaser_pciefd_setup_controller(can);</div><div class='add'>+	can-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	netif_wake_queue(can-&gt;can.dev);</div><div class='add'>+	can-&gt;bec.txerr = 0;</div><div class='add'>+	can-&gt;bec.rxerr = 0;</div><div class='add'>+	can-&gt;err_rep_cnt = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_pwm_stop(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u8 top;</div><div class='add'>+	u32 pwm_ctrl;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	pwm_ctrl = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_PWM_REG);</div><div class='add'>+	top = FIELD_GET(KVASER_PCIEFD_KCAN_PWM_TOP_MASK, pwm_ctrl);</div><div class='add'>+	/* Set duty cycle to zero */</div><div class='add'>+	pwm_ctrl |= FIELD_PREP(KVASER_PCIEFD_KCAN_PWM_TRIGGER_MASK, top);</div><div class='add'>+	iowrite32(pwm_ctrl, can-&gt;reg_base + KVASER_PCIEFD_KCAN_PWM_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_pwm_start(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	int top, trigger;</div><div class='add'>+	u32 pwm_ctrl;</div><div class='add'>+	unsigned long irq;</div><div class='add'>+</div><div class='add'>+	kvaser_pciefd_pwm_stop(can);</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq);</div><div class='add'>+	/* Set frequency to 500 KHz */</div><div class='add'>+	top = can-&gt;kv_pcie-&gt;bus_freq / (2 * 500000) - 1;</div><div class='add'>+</div><div class='add'>+	pwm_ctrl = FIELD_PREP(KVASER_PCIEFD_KCAN_PWM_TRIGGER_MASK, top);</div><div class='add'>+	pwm_ctrl |= FIELD_PREP(KVASER_PCIEFD_KCAN_PWM_TOP_MASK, top);</div><div class='add'>+	iowrite32(pwm_ctrl, can-&gt;reg_base + KVASER_PCIEFD_KCAN_PWM_REG);</div><div class='add'>+</div><div class='add'>+	/* Set duty cycle to 95 */</div><div class='add'>+	trigger = (100 * top - 95 * (top + 1) + 50) / 100;</div><div class='add'>+	pwm_ctrl = FIELD_PREP(KVASER_PCIEFD_KCAN_PWM_TRIGGER_MASK, trigger);</div><div class='add'>+	pwm_ctrl |= FIELD_PREP(KVASER_PCIEFD_KCAN_PWM_TOP_MASK, top);</div><div class='add'>+	iowrite32(pwm_ctrl, can-&gt;reg_base + KVASER_PCIEFD_KCAN_PWM_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct kvaser_pciefd_can *can = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	can-&gt;tx_idx = 0;</div><div class='add'>+	can-&gt;ack_idx = 0;</div><div class='add'>+</div><div class='add'>+	ret = open_candev(netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = kvaser_pciefd_bus_on(can);</div><div class='add'>+	if (ret) {</div><div class='add'>+		close_candev(netdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can = netdev_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Don't interrupt ongoing flush */</div><div class='add'>+	if (!completion_done(&amp;can-&gt;flush_comp))</div><div class='add'>+		kvaser_pciefd_start_controller_flush(can);</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;can-&gt;flush_comp,</div><div class='add'>+					 KVASER_PCIEFD_WAIT_TIMEOUT)) {</div><div class='add'>+		netdev_err(can-&gt;can.dev, "Timeout during stop\n");</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	} else {</div><div class='add'>+		iowrite32(0, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+		timer_delete(&amp;can-&gt;bec_poll_timer);</div><div class='add'>+	}</div><div class='add'>+	can-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	netdev_reset_queue(netdev);</div><div class='add'>+	close_candev(netdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int kvaser_pciefd_tx_avail(const struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	return can-&gt;tx_max_count - (READ_ONCE(can-&gt;tx_idx) - READ_ONCE(can-&gt;ack_idx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_prepare_tx_packet(struct kvaser_pciefd_tx_packet *p,</div><div class='add'>+					   struct can_priv *can, u8 seq,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	int packet_size;</div><div class='add'>+</div><div class='add'>+	memset(p, 0, sizeof(*p));</div><div class='add'>+	if (can-&gt;ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		p-&gt;header[1] |= KVASER_PCIEFD_TPACKET_SMS;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		p-&gt;header[0] |= KVASER_PCIEFD_RPACKET_RTR;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		p-&gt;header[0] |= KVASER_PCIEFD_RPACKET_IDE;</div><div class='add'>+</div><div class='add'>+	p-&gt;header[0] |= FIELD_PREP(KVASER_PCIEFD_RPACKET_ID_MASK, cf-&gt;can_id);</div><div class='add'>+	p-&gt;header[1] |= KVASER_PCIEFD_TPACKET_AREQ;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		p-&gt;header[1] |= FIELD_PREP(KVASER_PCIEFD_RPACKET_DLC_MASK,</div><div class='add'>+					   can_fd_len2dlc(cf-&gt;len));</div><div class='add'>+		p-&gt;header[1] |= KVASER_PCIEFD_RPACKET_FDF;</div><div class='add'>+		if (cf-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			p-&gt;header[1] |= KVASER_PCIEFD_RPACKET_BRS;</div><div class='add'>+		if (cf-&gt;flags &amp; CANFD_ESI)</div><div class='add'>+			p-&gt;header[1] |= KVASER_PCIEFD_RPACKET_ESI;</div><div class='add'>+	} else {</div><div class='add'>+		p-&gt;header[1] |=</div><div class='add'>+			FIELD_PREP(KVASER_PCIEFD_RPACKET_DLC_MASK,</div><div class='add'>+				   can_get_cc_dlc((struct can_frame *)cf, can-&gt;ctrlmode));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;header[1] |= FIELD_PREP(KVASER_PCIEFD_PACKET_SEQ_MASK, seq);</div><div class='add'>+</div><div class='add'>+	packet_size = cf-&gt;len;</div><div class='add'>+	memcpy(p-&gt;data, cf-&gt;data, packet_size);</div><div class='add'>+</div><div class='add'>+	return DIV_ROUND_UP(packet_size, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t kvaser_pciefd_start_xmit(struct sk_buff *skb,</div><div class='add'>+					    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can = netdev_priv(netdev);</div><div class='add'>+	struct kvaser_pciefd_tx_packet packet;</div><div class='add'>+	unsigned int seq = can-&gt;tx_idx &amp; (can-&gt;can.echo_skb_max - 1);</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+	int nr_words;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	if (!netif_subqueue_maybe_stop(netdev, 0, kvaser_pciefd_tx_avail(can), 1, 1))</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	nr_words = kvaser_pciefd_prepare_tx_packet(&amp;packet, &amp;can-&gt;can, seq, skb);</div><div class='add'>+</div><div class='add'>+	/* Prepare and save echo skb in internal slot */</div><div class='add'>+	WRITE_ONCE(can-&gt;can.echo_skb[seq], NULL);</div><div class='add'>+	frame_len = can_skb_get_frame_len(skb);</div><div class='add'>+	can_put_echo_skb(skb, netdev, seq, frame_len);</div><div class='add'>+	netdev_sent_queue(netdev, frame_len);</div><div class='add'>+	WRITE_ONCE(can-&gt;tx_idx, can-&gt;tx_idx + 1);</div><div class='add'>+</div><div class='add'>+	/* Write header to fifo */</div><div class='add'>+	iowrite32(packet.header[0],</div><div class='add'>+		  can-&gt;reg_base + KVASER_PCIEFD_KCAN_FIFO_REG);</div><div class='add'>+	iowrite32(packet.header[1],</div><div class='add'>+		  can-&gt;reg_base + KVASER_PCIEFD_KCAN_FIFO_REG);</div><div class='add'>+</div><div class='add'>+	if (nr_words) {</div><div class='add'>+		u32 data_last = ((u32 *)packet.data)[nr_words - 1];</div><div class='add'>+</div><div class='add'>+		/* Write data to fifo, except last word */</div><div class='add'>+		iowrite32_rep(can-&gt;reg_base +</div><div class='add'>+			      KVASER_PCIEFD_KCAN_FIFO_REG, packet.data,</div><div class='add'>+			      nr_words - 1);</div><div class='add'>+		/* Write last word to end of fifo */</div><div class='add'>+		__raw_writel(data_last, can-&gt;reg_base +</div><div class='add'>+			     KVASER_PCIEFD_KCAN_FIFO_LAST_REG);</div><div class='add'>+	} else {</div><div class='add'>+		/* Complete write to fifo */</div><div class='add'>+		__raw_writel(0, can-&gt;reg_base +</div><div class='add'>+			     KVASER_PCIEFD_KCAN_FIFO_LAST_REG);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_subqueue_maybe_stop(netdev, 0, kvaser_pciefd_tx_avail(can), 1, 1);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_set_bittiming(struct kvaser_pciefd_can *can, bool data)</div><div class='add'>+{</div><div class='add'>+	u32 mode, test, btrn;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int ret;</div><div class='add'>+	struct can_bittiming *bt;</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		bt = &amp;can-&gt;can.fd.data_bittiming;</div><div class='add'>+	else</div><div class='add'>+		bt = &amp;can-&gt;can.bittiming;</div><div class='add'>+</div><div class='add'>+	btrn = FIELD_PREP(KVASER_PCIEFD_KCAN_BTRN_TSEG2_MASK, bt-&gt;phase_seg2 - 1) |</div><div class='add'>+	       FIELD_PREP(KVASER_PCIEFD_KCAN_BTRN_TSEG1_MASK, bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1) |</div><div class='add'>+	       FIELD_PREP(KVASER_PCIEFD_KCAN_BTRN_SJW_MASK, bt-&gt;sjw - 1) |</div><div class='add'>+	       FIELD_PREP(KVASER_PCIEFD_KCAN_BTRN_BRP_MASK, bt-&gt;brp - 1);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;can-&gt;lock, irq_flags);</div><div class='add'>+	mode = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	/* Put the circuit in reset mode */</div><div class='add'>+	iowrite32(mode | KVASER_PCIEFD_KCAN_MODE_RM,</div><div class='add'>+		  can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+</div><div class='add'>+	/* Can only set bittiming if in reset mode */</div><div class='add'>+	ret = readl_poll_timeout(can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG,</div><div class='add'>+				 test, test &amp; KVASER_PCIEFD_KCAN_MODE_RM, 0, 10);</div><div class='add'>+	if (ret) {</div><div class='add'>+		spin_unlock_irqrestore(&amp;can-&gt;lock, irq_flags);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data)</div><div class='add'>+		iowrite32(btrn, can-&gt;reg_base + KVASER_PCIEFD_KCAN_BTRD_REG);</div><div class='add'>+	else</div><div class='add'>+		iowrite32(btrn, can-&gt;reg_base + KVASER_PCIEFD_KCAN_BTRN_REG);</div><div class='add'>+	/* Restore previous reset mode status */</div><div class='add'>+	iowrite32(mode, can-&gt;reg_base + KVASER_PCIEFD_KCAN_MODE_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;can-&gt;lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_set_nominal_bittiming(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return kvaser_pciefd_set_bittiming(netdev_priv(ndev), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_set_data_bittiming(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return kvaser_pciefd_set_bittiming(netdev_priv(ndev), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can = netdev_priv(ndev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		if (!can-&gt;can.restart_ms)</div><div class='add'>+			ret = kvaser_pciefd_bus_on(can);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_get_berr_counter(const struct net_device *ndev,</div><div class='add'>+					  struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	bec-&gt;rxerr = can-&gt;bec.rxerr;</div><div class='add'>+	bec-&gt;txerr = can-&gt;bec.txerr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_bec_poll_timer(struct timer_list *data)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can = timer_container_of(can, data,</div><div class='add'>+							   bec_poll_timer);</div><div class='add'>+</div><div class='add'>+	kvaser_pciefd_enable_err_gen(can);</div><div class='add'>+	kvaser_pciefd_request_status(can);</div><div class='add'>+	can-&gt;err_rep_cnt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops kvaser_pciefd_netdev_ops = {</div><div class='add'>+	.ndo_open = kvaser_pciefd_open,</div><div class='add'>+	.ndo_stop = kvaser_pciefd_stop,</div><div class='add'>+	.ndo_start_xmit = kvaser_pciefd_start_xmit,</div><div class='add'>+	.ndo_hwtstamp_get = can_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = can_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_set_phys_id(struct net_device *netdev,</div><div class='add'>+				     enum ethtool_phys_id_state state)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ETHTOOL_ID_ACTIVE:</div><div class='add'>+		return 3; /* 3 On/Off cycles per second */</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_ON:</div><div class='add'>+		kvaser_pciefd_set_led(can, true);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_OFF:</div><div class='add'>+	case ETHTOOL_ID_INACTIVE:</div><div class='add'>+		kvaser_pciefd_set_led(can, false);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops kvaser_pciefd_ethtool_ops = {</div><div class='add'>+	.get_ts_info = can_ethtool_op_get_ts_info_hwts,</div><div class='add'>+	.set_phys_id = kvaser_pciefd_set_phys_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_setup_can_ctrls(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; i++) {</div><div class='add'>+		struct net_device *netdev;</div><div class='add'>+		struct kvaser_pciefd_can *can;</div><div class='add'>+		u32 status, tx_nr_packets_max;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		netdev = alloc_candev(sizeof(struct kvaser_pciefd_can),</div><div class='add'>+				      roundup_pow_of_two(KVASER_PCIEFD_CAN_TX_MAX_COUNT));</div><div class='add'>+		if (!netdev)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		can = netdev_priv(netdev);</div><div class='add'>+		netdev-&gt;netdev_ops = &amp;kvaser_pciefd_netdev_ops;</div><div class='add'>+		netdev-&gt;ethtool_ops = &amp;kvaser_pciefd_ethtool_ops;</div><div class='add'>+		can-&gt;reg_base = KVASER_PCIEFD_KCAN_CHX_ADDR(pcie, i);</div><div class='add'>+		can-&gt;kv_pcie = pcie;</div><div class='add'>+		can-&gt;cmd_seq = 0;</div><div class='add'>+		can-&gt;err_rep_cnt = 0;</div><div class='add'>+		can-&gt;completed_tx_pkts = 0;</div><div class='add'>+		can-&gt;completed_tx_bytes = 0;</div><div class='add'>+		can-&gt;bec.txerr = 0;</div><div class='add'>+		can-&gt;bec.rxerr = 0;</div><div class='add'>+		can-&gt;can.dev-&gt;dev_port = i;</div><div class='add'>+</div><div class='add'>+		init_completion(&amp;can-&gt;start_comp);</div><div class='add'>+		init_completion(&amp;can-&gt;flush_comp);</div><div class='add'>+		timer_setup(&amp;can-&gt;bec_poll_timer, kvaser_pciefd_bec_poll_timer, 0);</div><div class='add'>+</div><div class='add'>+		/* Disable Bus load reporting */</div><div class='add'>+		iowrite32(0, can-&gt;reg_base + KVASER_PCIEFD_KCAN_BUS_LOAD_REG);</div><div class='add'>+</div><div class='add'>+		can-&gt;ioc = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_IOC_REG);</div><div class='add'>+		kvaser_pciefd_set_led(can, false);</div><div class='add'>+</div><div class='add'>+		tx_nr_packets_max =</div><div class='add'>+			FIELD_GET(KVASER_PCIEFD_KCAN_TX_NR_PACKETS_MAX_MASK,</div><div class='add'>+				  ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_TX_NR_PACKETS_REG));</div><div class='add'>+		can-&gt;tx_max_count = min(KVASER_PCIEFD_CAN_TX_MAX_COUNT, tx_nr_packets_max - 1);</div><div class='add'>+</div><div class='add'>+		can-&gt;can.clock.freq = pcie-&gt;freq;</div><div class='add'>+		spin_lock_init(&amp;can-&gt;lock);</div><div class='add'>+</div><div class='add'>+		can-&gt;can.bittiming_const = &amp;kvaser_pciefd_bittiming_const;</div><div class='add'>+		can-&gt;can.fd.data_bittiming_const = &amp;kvaser_pciefd_bittiming_const;</div><div class='add'>+		can-&gt;can.do_set_bittiming = kvaser_pciefd_set_nominal_bittiming;</div><div class='add'>+		can-&gt;can.fd.do_set_data_bittiming = kvaser_pciefd_set_data_bittiming;</div><div class='add'>+		can-&gt;can.do_set_mode = kvaser_pciefd_set_mode;</div><div class='add'>+		can-&gt;can.do_get_berr_counter = kvaser_pciefd_get_berr_counter;</div><div class='add'>+		can-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+					      CAN_CTRLMODE_FD |</div><div class='add'>+					      CAN_CTRLMODE_FD_NON_ISO |</div><div class='add'>+					      CAN_CTRLMODE_CC_LEN8_DLC |</div><div class='add'>+					      CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+</div><div class='add'>+		status = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_STAT_REG);</div><div class='add'>+		if (!(status &amp; KVASER_PCIEFD_KCAN_STAT_FD)) {</div><div class='add'>+			dev_err(&amp;pcie-&gt;pci-&gt;dev,</div><div class='add'>+				"CAN FD not supported as expected %d\n", i);</div><div class='add'>+</div><div class='add'>+			free_candev(netdev);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; KVASER_PCIEFD_KCAN_STAT_CAP)</div><div class='add'>+			can-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_ONE_SHOT;</div><div class='add'>+</div><div class='add'>+		netdev-&gt;flags |= IFF_ECHO;</div><div class='add'>+		SET_NETDEV_DEV(netdev, &amp;pcie-&gt;pci-&gt;dev);</div><div class='add'>+</div><div class='add'>+		iowrite32(GENMASK(31, 0), can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+		iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD,</div><div class='add'>+			  can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+</div><div class='add'>+		pcie-&gt;can[i] = can;</div><div class='add'>+		kvaser_pciefd_pwm_start(can);</div><div class='add'>+		ret = kvaser_pciefd_devlink_port_register(can);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;pcie-&gt;pci-&gt;dev, "Failed to register devlink port\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_reg_candev(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; i++) {</div><div class='add'>+		int ret = register_candev(pcie-&gt;can[i]-&gt;can.dev);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			int j;</div><div class='add'>+</div><div class='add'>+			/* Unregister all successfully registered devices. */</div><div class='add'>+			for (j = 0; j &lt; i; j++)</div><div class='add'>+				unregister_candev(pcie-&gt;can[j]-&gt;can.dev);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_write_dma_map_altera(struct kvaser_pciefd *pcie,</div><div class='add'>+					       dma_addr_t addr, int index)</div><div class='add'>+{</div><div class='add'>+	void __iomem *serdes_base;</div><div class='add'>+	u32 word1, word2;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT)) {</div><div class='add'>+		word1 = lower_32_bits(addr) | KVASER_PCIEFD_ALTERA_DMA_64BIT;</div><div class='add'>+		word2 = upper_32_bits(addr);</div><div class='add'>+	} else {</div><div class='add'>+		word1 = addr;</div><div class='add'>+		word2 = 0;</div><div class='add'>+	}</div><div class='add'>+	serdes_base = KVASER_PCIEFD_SERDES_ADDR(pcie) + 0x8 * index;</div><div class='add'>+	iowrite32(word1, serdes_base);</div><div class='add'>+	iowrite32(word2, serdes_base + 0x4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_write_dma_map_sf2(struct kvaser_pciefd *pcie,</div><div class='add'>+					    dma_addr_t addr, int index)</div><div class='add'>+{</div><div class='add'>+	void __iomem *serdes_base;</div><div class='add'>+	u32 lsb = addr &amp; KVASER_PCIEFD_SF2_DMA_LSB_MASK;</div><div class='add'>+	u32 msb = 0x0;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))</div><div class='add'>+		msb = upper_32_bits(addr);</div><div class='add'>+</div><div class='add'>+	serdes_base = KVASER_PCIEFD_SERDES_ADDR(pcie) + 0x10 * index;</div><div class='add'>+	iowrite32(lsb, serdes_base);</div><div class='add'>+	iowrite32(msb, serdes_base + 0x4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_write_dma_map_xilinx(struct kvaser_pciefd *pcie,</div><div class='add'>+					       dma_addr_t addr, int index)</div><div class='add'>+{</div><div class='add'>+	void __iomem *serdes_base;</div><div class='add'>+	u32 lsb = addr &amp; KVASER_PCIEFD_XILINX_DMA_LSB_MASK;</div><div class='add'>+	u32 msb = 0x0;</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))</div><div class='add'>+		msb = upper_32_bits(addr);</div><div class='add'>+</div><div class='add'>+	serdes_base = KVASER_PCIEFD_SERDES_ADDR(pcie) + 0x8 * index;</div><div class='add'>+	iowrite32(msb, serdes_base);</div><div class='add'>+	iowrite32(lsb, serdes_base + 0x4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_setup_dma(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 srb_status;</div><div class='add'>+	u32 srb_packet_count;</div><div class='add'>+	dma_addr_t dma_addr[KVASER_PCIEFD_DMA_COUNT];</div><div class='add'>+</div><div class='add'>+	/* Disable the DMA */</div><div class='add'>+	iowrite32(0, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CTRL_REG);</div><div class='add'>+</div><div class='add'>+	dma_set_mask_and_coherent(&amp;pcie-&gt;pci-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; KVASER_PCIEFD_DMA_COUNT; i++) {</div><div class='add'>+		pcie-&gt;dma_data[i] = dmam_alloc_coherent(&amp;pcie-&gt;pci-&gt;dev,</div><div class='add'>+							KVASER_PCIEFD_DMA_SIZE,</div><div class='add'>+							&amp;dma_addr[i],</div><div class='add'>+							GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+		if (!pcie-&gt;dma_data[i] || !dma_addr[i]) {</div><div class='add'>+			dev_err(&amp;pcie-&gt;pci-&gt;dev, "Rx dma_alloc(%u) failure\n",</div><div class='add'>+				KVASER_PCIEFD_DMA_SIZE);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		pcie-&gt;driver_data-&gt;ops-&gt;kvaser_pciefd_write_dma_map(pcie, dma_addr[i], i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset Rx FIFO, and both DMA buffers */</div><div class='add'>+	iowrite32(KVASER_PCIEFD_SRB_CMD_FOR | KVASER_PCIEFD_SRB_CMD_RDB0 |</div><div class='add'>+		  KVASER_PCIEFD_SRB_CMD_RDB1,</div><div class='add'>+		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CMD_REG);</div><div class='add'>+	/* Empty Rx FIFO */</div><div class='add'>+	srb_packet_count =</div><div class='add'>+		FIELD_GET(KVASER_PCIEFD_SRB_RX_NR_PACKETS_MASK,</div><div class='add'>+			  ioread32(KVASER_PCIEFD_SRB_ADDR(pcie) +</div><div class='add'>+				   KVASER_PCIEFD_SRB_RX_NR_PACKETS_REG));</div><div class='add'>+	while (srb_packet_count) {</div><div class='add'>+		/* Drop current packet in FIFO */</div><div class='add'>+		ioread32(KVASER_PCIEFD_SRB_FIFO_ADDR(pcie) + KVASER_PCIEFD_SRB_FIFO_LAST_REG);</div><div class='add'>+		srb_packet_count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	srb_status = ioread32(KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_STAT_REG);</div><div class='add'>+	if (!(srb_status &amp; KVASER_PCIEFD_SRB_STAT_DI)) {</div><div class='add'>+		dev_err(&amp;pcie-&gt;pci-&gt;dev, "DMA not idle before enabling\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable the DMA */</div><div class='add'>+	iowrite32(KVASER_PCIEFD_SRB_CTRL_DMA_ENABLE,</div><div class='add'>+		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CTRL_REG);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_setup_board(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	u32 version, srb_status, build;</div><div class='add'>+</div><div class='add'>+	version = ioread32(KVASER_PCIEFD_SYSID_ADDR(pcie) + KVASER_PCIEFD_SYSID_VERSION_REG);</div><div class='add'>+	build = ioread32(KVASER_PCIEFD_SYSID_ADDR(pcie) + KVASER_PCIEFD_SYSID_BUILD_REG);</div><div class='add'>+	pcie-&gt;nr_channels = min(KVASER_PCIEFD_MAX_CAN_CHANNELS,</div><div class='add'>+				FIELD_GET(KVASER_PCIEFD_SYSID_VERSION_NR_CHAN_MASK, version));</div><div class='add'>+	pcie-&gt;fw_version.major = FIELD_GET(KVASER_PCIEFD_SYSID_VERSION_MAJOR_MASK, version);</div><div class='add'>+	pcie-&gt;fw_version.minor = FIELD_GET(KVASER_PCIEFD_SYSID_VERSION_MINOR_MASK, version);</div><div class='add'>+	pcie-&gt;fw_version.build = FIELD_GET(KVASER_PCIEFD_SYSID_BUILD_SEQ_MASK, build);</div><div class='add'>+</div><div class='add'>+	srb_status = ioread32(KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_STAT_REG);</div><div class='add'>+	if (!(srb_status &amp; KVASER_PCIEFD_SRB_STAT_DMA)) {</div><div class='add'>+		dev_err(&amp;pcie-&gt;pci-&gt;dev, "Hardware without DMA is not supported\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pcie-&gt;bus_freq = ioread32(KVASER_PCIEFD_SYSID_ADDR(pcie) + KVASER_PCIEFD_SYSID_BUSFREQ_REG);</div><div class='add'>+	pcie-&gt;freq = ioread32(KVASER_PCIEFD_SYSID_ADDR(pcie) + KVASER_PCIEFD_SYSID_CANFREQ_REG);</div><div class='add'>+	pcie-&gt;freq_to_ticks_div = pcie-&gt;freq / 1000000;</div><div class='add'>+	if (pcie-&gt;freq_to_ticks_div == 0)</div><div class='add'>+		pcie-&gt;freq_to_ticks_div = 1;</div><div class='add'>+	/* Turn off all loopback functionality */</div><div class='add'>+	iowrite32(0, KVASER_PCIEFD_LOOPBACK_ADDR(pcie));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_handle_data_packet(struct kvaser_pciefd *pcie,</div><div class='add'>+					    struct kvaser_pciefd_rx_packet *p,</div><div class='add'>+					    __le32 *data)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	struct can_priv *priv;</div><div class='add'>+	u8 ch_id = FIELD_GET(KVASER_PCIEFD_PACKET_CHID_MASK, p-&gt;header[1]);</div><div class='add'>+	u8 dlc;</div><div class='add'>+</div><div class='add'>+	if (ch_id &gt;= pcie-&gt;nr_channels)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	priv = &amp;pcie-&gt;can[ch_id]-&gt;can;</div><div class='add'>+	dlc = FIELD_GET(KVASER_PCIEFD_RPACKET_DLC_MASK, p-&gt;header[1]);</div><div class='add'>+</div><div class='add'>+	if (p-&gt;header[1] &amp; KVASER_PCIEFD_RPACKET_FDF) {</div><div class='add'>+		skb = alloc_canfd_skb(priv-&gt;dev, &amp;cf);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cf-&gt;len = can_fd_dlc2len(dlc);</div><div class='add'>+		if (p-&gt;header[1] &amp; KVASER_PCIEFD_RPACKET_BRS)</div><div class='add'>+			cf-&gt;flags |= CANFD_BRS;</div><div class='add'>+		if (p-&gt;header[1] &amp; KVASER_PCIEFD_RPACKET_ESI)</div><div class='add'>+			cf-&gt;flags |= CANFD_ESI;</div><div class='add'>+	} else {</div><div class='add'>+		skb = alloc_can_skb(priv-&gt;dev, (struct can_frame **)&amp;cf);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			priv-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		can_frame_set_cc_len((struct can_frame *)cf, dlc, priv-&gt;ctrlmode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id = FIELD_GET(KVASER_PCIEFD_RPACKET_ID_MASK, p-&gt;header[0]);</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_RPACKET_IDE)</div><div class='add'>+		cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_RPACKET_RTR) {</div><div class='add'>+		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(cf-&gt;data, data, cf-&gt;len);</div><div class='add'>+		priv-&gt;dev-&gt;stats.rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;dev-&gt;stats.rx_packets++;</div><div class='add'>+	kvaser_pciefd_set_skb_timestamp(pcie, skb, p-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_change_state(struct kvaser_pciefd_can *can,</div><div class='add'>+				       const struct can_berr_counter *bec,</div><div class='add'>+				       struct can_frame *cf,</div><div class='add'>+				       enum can_state new_state,</div><div class='add'>+				       enum can_state tx_state,</div><div class='add'>+				       enum can_state rx_state)</div><div class='add'>+{</div><div class='add'>+	enum can_state old_state;</div><div class='add'>+</div><div class='add'>+	old_state = can-&gt;can.state;</div><div class='add'>+	can_change_state(can-&gt;can.dev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		struct net_device *ndev = can-&gt;can.dev;</div><div class='add'>+		unsigned long irq_flags;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;can-&gt;lock, irq_flags);</div><div class='add'>+		netif_stop_queue(can-&gt;can.dev);</div><div class='add'>+		spin_unlock_irqrestore(&amp;can-&gt;lock, irq_flags);</div><div class='add'>+		/* Prevent CAN controller from auto recover from bus off */</div><div class='add'>+		if (!can-&gt;can.restart_ms) {</div><div class='add'>+			kvaser_pciefd_start_controller_flush(can);</div><div class='add'>+			can_bus_off(ndev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (old_state == CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+	    new_state == CAN_STATE_ERROR_ACTIVE &amp;&amp;</div><div class='add'>+	    can-&gt;can.restart_ms) {</div><div class='add'>+		can-&gt;can.can_stats.restarts++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='add'>+	}</div><div class='add'>+	if (cf &amp;&amp; new_state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec-&gt;txerr;</div><div class='add'>+		cf-&gt;data[7] = bec-&gt;rxerr;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_packet_to_state(struct kvaser_pciefd_rx_packet *p,</div><div class='add'>+					  struct can_berr_counter *bec,</div><div class='add'>+					  enum can_state *new_state,</div><div class='add'>+					  enum can_state *tx_state,</div><div class='add'>+					  enum can_state *rx_state)</div><div class='add'>+{</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_BOFF ||</div><div class='add'>+	    p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_IRM)</div><div class='add'>+		*new_state = CAN_STATE_BUS_OFF;</div><div class='add'>+	else if (bec-&gt;txerr &gt;= 255 || bec-&gt;rxerr &gt;= 255)</div><div class='add'>+		*new_state = CAN_STATE_BUS_OFF;</div><div class='add'>+	else if (p-&gt;header[1] &amp; KVASER_PCIEFD_SPACK_EPLR)</div><div class='add'>+		*new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	else if (bec-&gt;txerr &gt;= 128 || bec-&gt;rxerr &gt;= 128)</div><div class='add'>+		*new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	else if (p-&gt;header[1] &amp; KVASER_PCIEFD_SPACK_EWLR)</div><div class='add'>+		*new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+	else if (bec-&gt;txerr &gt;= 96 || bec-&gt;rxerr &gt;= 96)</div><div class='add'>+		*new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+	else</div><div class='add'>+		*new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	*tx_state = bec-&gt;txerr &gt;= bec-&gt;rxerr ? *new_state : 0;</div><div class='add'>+	*rx_state = bec-&gt;txerr &lt;= bec-&gt;rxerr ? *new_state : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_rx_error_frame(struct kvaser_pciefd_can *can,</div><div class='add'>+					struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	enum can_state old_state, new_state, tx_state, rx_state;</div><div class='add'>+	struct net_device *ndev = can-&gt;can.dev;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+</div><div class='add'>+	old_state = can-&gt;can.state;</div><div class='add'>+</div><div class='add'>+	bec.txerr = FIELD_GET(KVASER_PCIEFD_SPACK_TXERR_MASK, p-&gt;header[0]);</div><div class='add'>+	bec.rxerr = FIELD_GET(KVASER_PCIEFD_SPACK_RXERR_MASK, p-&gt;header[0]);</div><div class='add'>+</div><div class='add'>+	kvaser_pciefd_packet_to_state(p, &amp;bec, &amp;new_state, &amp;tx_state, &amp;rx_state);</div><div class='add'>+	if (can-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+	if (new_state != old_state) {</div><div class='add'>+		kvaser_pciefd_change_state(can, &amp;bec, cf, new_state, tx_state, rx_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can-&gt;err_rep_cnt++;</div><div class='add'>+	can-&gt;can.can_stats.bus_error++;</div><div class='add'>+	if (p-&gt;header[1] &amp; KVASER_PCIEFD_EPACK_DIR_TX)</div><div class='add'>+		ndev-&gt;stats.tx_errors++;</div><div class='add'>+	else</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+</div><div class='add'>+	can-&gt;bec.txerr = bec.txerr;</div><div class='add'>+	can-&gt;bec.rxerr = bec.rxerr;</div><div class='add'>+</div><div class='add'>+	if (can-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='add'>+		if (!skb) {</div><div class='add'>+			netdev_warn(ndev, "No memory left for err_skb\n");</div><div class='add'>+			ndev-&gt;stats.rx_dropped++;</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		kvaser_pciefd_set_skb_timestamp(can-&gt;kv_pcie, skb, p-&gt;timestamp);</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_BUSERROR | CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_handle_error_packet(struct kvaser_pciefd *pcie,</div><div class='add'>+					     struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can;</div><div class='add'>+	u8 ch_id = FIELD_GET(KVASER_PCIEFD_PACKET_CHID_MASK, p-&gt;header[1]);</div><div class='add'>+</div><div class='add'>+	if (ch_id &gt;= pcie-&gt;nr_channels)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	can = pcie-&gt;can[ch_id];</div><div class='add'>+	kvaser_pciefd_rx_error_frame(can, p);</div><div class='add'>+	if (can-&gt;err_rep_cnt &gt;= KVASER_PCIEFD_MAX_ERR_REP)</div><div class='add'>+		/* Do not report more errors, until bec_poll_timer expires */</div><div class='add'>+		kvaser_pciefd_disable_err_gen(can);</div><div class='add'>+	/* Start polling the error counters */</div><div class='add'>+	mod_timer(&amp;can-&gt;bec_poll_timer, KVASER_PCIEFD_BEC_POLL_FREQ);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_handle_status_resp(struct kvaser_pciefd_can *can,</div><div class='add'>+					    struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	enum can_state old_state, new_state, tx_state, rx_state;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	old_state = can-&gt;can.state;</div><div class='add'>+</div><div class='add'>+	bec.txerr = FIELD_GET(KVASER_PCIEFD_SPACK_TXERR_MASK, p-&gt;header[0]);</div><div class='add'>+	bec.rxerr = FIELD_GET(KVASER_PCIEFD_SPACK_RXERR_MASK, p-&gt;header[0]);</div><div class='add'>+</div><div class='add'>+	kvaser_pciefd_packet_to_state(p, &amp;bec, &amp;new_state, &amp;tx_state, &amp;rx_state);</div><div class='add'>+	if (new_state != old_state) {</div><div class='add'>+		struct net_device *ndev = can-&gt;can.dev;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+		skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+		kvaser_pciefd_change_state(can, &amp;bec, cf, new_state, tx_state, rx_state);</div><div class='add'>+		if (skb) {</div><div class='add'>+			kvaser_pciefd_set_skb_timestamp(can-&gt;kv_pcie, skb, p-&gt;timestamp);</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+		} else {</div><div class='add'>+			ndev-&gt;stats.rx_dropped++;</div><div class='add'>+			netdev_warn(ndev, "No memory left for err_skb\n");</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	can-&gt;bec.txerr = bec.txerr;</div><div class='add'>+	can-&gt;bec.rxerr = bec.rxerr;</div><div class='add'>+	/* Check if we need to poll the error counters */</div><div class='add'>+	if (bec.txerr || bec.rxerr)</div><div class='add'>+		mod_timer(&amp;can-&gt;bec_poll_timer, KVASER_PCIEFD_BEC_POLL_FREQ);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_handle_status_packet(struct kvaser_pciefd *pcie,</div><div class='add'>+					      struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can;</div><div class='add'>+	u8 cmdseq;</div><div class='add'>+	u32 status;</div><div class='add'>+	u8 ch_id = FIELD_GET(KVASER_PCIEFD_PACKET_CHID_MASK, p-&gt;header[1]);</div><div class='add'>+</div><div class='add'>+	if (ch_id &gt;= pcie-&gt;nr_channels)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	can = pcie-&gt;can[ch_id];</div><div class='add'>+</div><div class='add'>+	status = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_STAT_REG);</div><div class='add'>+	cmdseq = FIELD_GET(KVASER_PCIEFD_KCAN_STAT_SEQNO_MASK, status);</div><div class='add'>+</div><div class='add'>+	/* Reset done, start abort and flush */</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_IRM &amp;&amp;</div><div class='add'>+	    p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_RMCD &amp;&amp;</div><div class='add'>+	    p-&gt;header[1] &amp; KVASER_PCIEFD_SPACK_AUTO &amp;&amp;</div><div class='add'>+	    cmdseq == FIELD_GET(KVASER_PCIEFD_PACKET_SEQ_MASK, p-&gt;header[1]) &amp;&amp;</div><div class='add'>+	    status &amp; KVASER_PCIEFD_KCAN_STAT_IDLE) {</div><div class='add'>+		iowrite32(KVASER_PCIEFD_KCAN_IRQ_ABD,</div><div class='add'>+			  can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+		kvaser_pciefd_abort_flush_reset(can);</div><div class='add'>+	} else if (p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_IDET &amp;&amp;</div><div class='add'>+		   p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_IRM &amp;&amp;</div><div class='add'>+		   cmdseq == FIELD_GET(KVASER_PCIEFD_PACKET_SEQ_MASK, p-&gt;header[1]) &amp;&amp;</div><div class='add'>+		   status &amp; KVASER_PCIEFD_KCAN_STAT_IDLE) {</div><div class='add'>+		/* Reset detected, send end of flush if no packet are in FIFO */</div><div class='add'>+		u8 count;</div><div class='add'>+</div><div class='add'>+		count = FIELD_GET(KVASER_PCIEFD_KCAN_TX_NR_PACKETS_CURRENT_MASK,</div><div class='add'>+				  ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_TX_NR_PACKETS_REG));</div><div class='add'>+		if (!count)</div><div class='add'>+			iowrite32(FIELD_PREP(KVASER_PCIEFD_KCAN_CTRL_TYPE_MASK,</div><div class='add'>+					     KVASER_PCIEFD_KCAN_CTRL_TYPE_EFLUSH),</div><div class='add'>+				  can-&gt;reg_base + KVASER_PCIEFD_KCAN_CTRL_REG);</div><div class='add'>+	} else if (!(p-&gt;header[1] &amp; KVASER_PCIEFD_SPACK_AUTO) &amp;&amp;</div><div class='add'>+		   cmdseq == FIELD_GET(KVASER_PCIEFD_PACKET_SEQ_MASK, p-&gt;header[1])) {</div><div class='add'>+		/* Response to status request received */</div><div class='add'>+		kvaser_pciefd_handle_status_resp(can, p);</div><div class='add'>+		if (can-&gt;can.state != CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+		    can-&gt;can.state != CAN_STATE_ERROR_ACTIVE) {</div><div class='add'>+			mod_timer(&amp;can-&gt;bec_poll_timer, KVASER_PCIEFD_BEC_POLL_FREQ);</div><div class='add'>+		}</div><div class='add'>+	} else if (p-&gt;header[0] &amp; KVASER_PCIEFD_SPACK_RMCD &amp;&amp;</div><div class='add'>+		   !(status &amp; KVASER_PCIEFD_KCAN_STAT_BUS_OFF_MASK)) {</div><div class='add'>+		/* Reset to bus on detected */</div><div class='add'>+		if (!completion_done(&amp;can-&gt;start_comp))</div><div class='add'>+			complete(&amp;can-&gt;start_comp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_handle_nack_packet(struct kvaser_pciefd_can *can,</div><div class='add'>+					     struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(can-&gt;can.dev, &amp;cf);</div><div class='add'>+	can-&gt;can.dev-&gt;stats.tx_errors++;</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_APACKET_ABL) {</div><div class='add'>+		if (skb)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='add'>+		can-&gt;can.can_stats.arbitration_lost++;</div><div class='add'>+	} else if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_BUSERROR;</div><div class='add'>+		kvaser_pciefd_set_skb_timestamp(can-&gt;kv_pcie, skb, p-&gt;timestamp);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	} else {</div><div class='add'>+		can-&gt;can.dev-&gt;stats.rx_dropped++;</div><div class='add'>+		netdev_warn(can-&gt;can.dev, "No memory left for err_skb\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_handle_ack_packet(struct kvaser_pciefd *pcie,</div><div class='add'>+					   struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can;</div><div class='add'>+	bool one_shot_fail = false;</div><div class='add'>+	u8 ch_id = FIELD_GET(KVASER_PCIEFD_PACKET_CHID_MASK, p-&gt;header[1]);</div><div class='add'>+</div><div class='add'>+	if (ch_id &gt;= pcie-&gt;nr_channels)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	can = pcie-&gt;can[ch_id];</div><div class='add'>+	/* Ignore control packet ACK */</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_APACKET_CT)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_APACKET_NACK) {</div><div class='add'>+		kvaser_pciefd_handle_nack_packet(can, p);</div><div class='add'>+		one_shot_fail = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;header[0] &amp; KVASER_PCIEFD_APACKET_FLU) {</div><div class='add'>+		netdev_dbg(can-&gt;can.dev, "Packet was flushed\n");</div><div class='add'>+	} else {</div><div class='add'>+		int echo_idx = FIELD_GET(KVASER_PCIEFD_PACKET_SEQ_MASK, p-&gt;header[0]);</div><div class='add'>+		unsigned int len, frame_len = 0;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		if (echo_idx != (can-&gt;ack_idx &amp; (can-&gt;can.echo_skb_max - 1)))</div><div class='add'>+			return 0;</div><div class='add'>+		skb = can-&gt;can.echo_skb[echo_idx];</div><div class='add'>+		if (!skb)</div><div class='add'>+			return 0;</div><div class='add'>+		kvaser_pciefd_set_skb_timestamp(pcie, skb, p-&gt;timestamp);</div><div class='add'>+		len = can_get_echo_skb(can-&gt;can.dev, echo_idx, &amp;frame_len);</div><div class='add'>+</div><div class='add'>+		/* Pairs with barrier in kvaser_pciefd_start_xmit() */</div><div class='add'>+		smp_store_release(&amp;can-&gt;ack_idx, can-&gt;ack_idx + 1);</div><div class='add'>+		can-&gt;completed_tx_pkts++;</div><div class='add'>+		can-&gt;completed_tx_bytes += frame_len;</div><div class='add'>+</div><div class='add'>+		if (!one_shot_fail) {</div><div class='add'>+			can-&gt;can.dev-&gt;stats.tx_bytes += len;</div><div class='add'>+			can-&gt;can.dev-&gt;stats.tx_packets++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_handle_eflush_packet(struct kvaser_pciefd *pcie,</div><div class='add'>+					      struct kvaser_pciefd_rx_packet *p)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd_can *can;</div><div class='add'>+	u8 ch_id = FIELD_GET(KVASER_PCIEFD_PACKET_CHID_MASK, p-&gt;header[1]);</div><div class='add'>+</div><div class='add'>+	if (ch_id &gt;= pcie-&gt;nr_channels)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	can = pcie-&gt;can[ch_id];</div><div class='add'>+</div><div class='add'>+	if (!completion_done(&amp;can-&gt;flush_comp))</div><div class='add'>+		complete(&amp;can-&gt;flush_comp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_read_packet(struct kvaser_pciefd *pcie, int *start_pos,</div><div class='add'>+				     int dma_buf)</div><div class='add'>+{</div><div class='add'>+	__le32 *buffer = pcie-&gt;dma_data[dma_buf];</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	struct kvaser_pciefd_rx_packet packet;</div><div class='add'>+	struct kvaser_pciefd_rx_packet *p = &amp;packet;</div><div class='add'>+	u8 type;</div><div class='add'>+	int pos = *start_pos;</div><div class='add'>+	int size;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	size = le32_to_cpu(buffer[pos++]);</div><div class='add'>+	if (!size) {</div><div class='add'>+		*start_pos = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	p-&gt;header[0] = le32_to_cpu(buffer[pos++]);</div><div class='add'>+	p-&gt;header[1] = le32_to_cpu(buffer[pos++]);</div><div class='add'>+</div><div class='add'>+	/* Read 64-bit timestamp */</div><div class='add'>+	memcpy(&amp;timestamp, &amp;buffer[pos], sizeof(__le64));</div><div class='add'>+	pos += 2;</div><div class='add'>+	p-&gt;timestamp = le64_to_cpu(timestamp);</div><div class='add'>+</div><div class='add'>+	type = FIELD_GET(KVASER_PCIEFD_PACKET_TYPE_MASK, p-&gt;header[1]);</div><div class='add'>+	switch (type) {</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_DATA:</div><div class='add'>+		ret = kvaser_pciefd_handle_data_packet(pcie, p, &amp;buffer[pos]);</div><div class='add'>+		if (!(p-&gt;header[0] &amp; KVASER_PCIEFD_RPACKET_RTR)) {</div><div class='add'>+			u8 data_len;</div><div class='add'>+</div><div class='add'>+			data_len = can_fd_dlc2len(FIELD_GET(KVASER_PCIEFD_RPACKET_DLC_MASK,</div><div class='add'>+							    p-&gt;header[1]));</div><div class='add'>+			pos += DIV_ROUND_UP(data_len, 4);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_ACK:</div><div class='add'>+		ret = kvaser_pciefd_handle_ack_packet(pcie, p);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_STATUS:</div><div class='add'>+		ret = kvaser_pciefd_handle_status_packet(pcie, p);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_ERROR:</div><div class='add'>+		ret = kvaser_pciefd_handle_error_packet(pcie, p);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_EFLUSH_ACK:</div><div class='add'>+		ret = kvaser_pciefd_handle_eflush_packet(pcie, p);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_ACK_DATA:</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_BUS_LOAD:</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_EFRAME_ACK:</div><div class='add'>+	case KVASER_PCIEFD_PACK_TYPE_TXRQ:</div><div class='add'>+		dev_info(&amp;pcie-&gt;pci-&gt;dev,</div><div class='add'>+			 "Received unexpected packet type 0x%08X\n", type);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;pcie-&gt;pci-&gt;dev, "Unknown packet type 0x%08X\n", type);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Position does not point to the end of the package,</div><div class='add'>+	 * corrupted packet size?</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((*start_pos + size) != pos))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* Point to the next packet header, if any */</div><div class='add'>+	*start_pos = pos;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_read_buffer(struct kvaser_pciefd *pcie, int dma_buf)</div><div class='add'>+{</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int res = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		res = kvaser_pciefd_read_packet(pcie, &amp;pos, dma_buf);</div><div class='add'>+	} while (!res &amp;&amp; pos &gt; 0 &amp;&amp; pos &lt; KVASER_PCIEFD_DMA_SIZE);</div><div class='add'>+</div><div class='add'>+	/* Report ACKs in this buffer to BQL en masse for correct periods */</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; ++i) {</div><div class='add'>+		struct kvaser_pciefd_can *can = pcie-&gt;can[i];</div><div class='add'>+</div><div class='add'>+		if (!can-&gt;completed_tx_pkts)</div><div class='add'>+			continue;</div><div class='add'>+		netif_subqueue_completed_wake(can-&gt;can.dev, 0,</div><div class='add'>+					      can-&gt;completed_tx_pkts,</div><div class='add'>+					      can-&gt;completed_tx_bytes,</div><div class='add'>+					      kvaser_pciefd_tx_avail(can), 1);</div><div class='add'>+		can-&gt;completed_tx_pkts = 0;</div><div class='add'>+		can-&gt;completed_tx_bytes = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_receive_irq(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	void __iomem *srb_cmd_reg = KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CMD_REG;</div><div class='add'>+	u32 irq = ioread32(KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_IRQ_REG);</div><div class='add'>+</div><div class='add'>+	iowrite32(irq, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_IRQ_REG);</div><div class='add'>+</div><div class='add'>+	if (irq &amp; KVASER_PCIEFD_SRB_IRQ_DPD0) {</div><div class='add'>+		kvaser_pciefd_read_buffer(pcie, 0);</div><div class='add'>+		iowrite32(KVASER_PCIEFD_SRB_CMD_RDB0, srb_cmd_reg); /* Rearm buffer */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq &amp; KVASER_PCIEFD_SRB_IRQ_DPD1) {</div><div class='add'>+		kvaser_pciefd_read_buffer(pcie, 1);</div><div class='add'>+		iowrite32(KVASER_PCIEFD_SRB_CMD_RDB1, srb_cmd_reg); /* Rearm buffer */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(irq &amp; KVASER_PCIEFD_SRB_IRQ_DOF0 ||</div><div class='add'>+		     irq &amp; KVASER_PCIEFD_SRB_IRQ_DOF1 ||</div><div class='add'>+		     irq &amp; KVASER_PCIEFD_SRB_IRQ_DUF0 ||</div><div class='add'>+		     irq &amp; KVASER_PCIEFD_SRB_IRQ_DUF1))</div><div class='add'>+		dev_err(&amp;pcie-&gt;pci-&gt;dev, "DMA IRQ error 0x%08X\n", irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_transmit_irq(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	u32 irq = ioread32(can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+</div><div class='add'>+	if (irq &amp; KVASER_PCIEFD_KCAN_IRQ_TOF)</div><div class='add'>+		netdev_err(can-&gt;can.dev, "Tx FIFO overflow\n");</div><div class='add'>+</div><div class='add'>+	if (irq &amp; KVASER_PCIEFD_KCAN_IRQ_BPP)</div><div class='add'>+		netdev_err(can-&gt;can.dev,</div><div class='add'>+			   "Fail to change bittiming, when not in reset mode\n");</div><div class='add'>+</div><div class='add'>+	if (irq &amp; KVASER_PCIEFD_KCAN_IRQ_FDIC)</div><div class='add'>+		netdev_err(can-&gt;can.dev, "CAN FD frame in CAN mode\n");</div><div class='add'>+</div><div class='add'>+	if (irq &amp; KVASER_PCIEFD_KCAN_IRQ_ROF)</div><div class='add'>+		netdev_err(can-&gt;can.dev, "Rx FIFO overflow\n");</div><div class='add'>+</div><div class='add'>+	iowrite32(irq, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IRQ_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t kvaser_pciefd_irq_handler(int irq, void *dev)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd *pcie = (struct kvaser_pciefd *)dev;</div><div class='add'>+	const struct kvaser_pciefd_irq_mask *irq_mask = pcie-&gt;driver_data-&gt;irq_mask;</div><div class='add'>+	u32 pci_irq = ioread32(KVASER_PCIEFD_PCI_IRQ_ADDR(pcie));</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!(pci_irq &amp; irq_mask-&gt;all))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	iowrite32(0, KVASER_PCIEFD_PCI_IEN_ADDR(pcie));</div><div class='add'>+</div><div class='add'>+	if (pci_irq &amp; irq_mask-&gt;kcan_rx0)</div><div class='add'>+		kvaser_pciefd_receive_irq(pcie);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; i++) {</div><div class='add'>+		if (pci_irq &amp; irq_mask-&gt;kcan_tx[i])</div><div class='add'>+			kvaser_pciefd_transmit_irq(pcie-&gt;can[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite32(irq_mask-&gt;all, KVASER_PCIEFD_PCI_IEN_ADDR(pcie));</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_teardown_can_ctrls(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; i++) {</div><div class='add'>+		struct kvaser_pciefd_can *can = pcie-&gt;can[i];</div><div class='add'>+</div><div class='add'>+		if (can) {</div><div class='add'>+			iowrite32(0, can-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+			kvaser_pciefd_pwm_stop(can);</div><div class='add'>+			kvaser_pciefd_devlink_port_unregister(can);</div><div class='add'>+			free_candev(can-&gt;can.dev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_disable_irq_srcs(struct kvaser_pciefd *pcie)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Masking PCI_IRQ is insufficient as running ISR will unmask it */</div><div class='add'>+	iowrite32(0, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_IEN_REG);</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; ++i)</div><div class='add'>+		iowrite32(0, pcie-&gt;can[i]-&gt;reg_base + KVASER_PCIEFD_KCAN_IEN_REG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_probe(struct pci_dev *pdev,</div><div class='add'>+			       const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct kvaser_pciefd *pcie;</div><div class='add'>+	const struct kvaser_pciefd_irq_mask *irq_mask;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_alloc(&amp;kvaser_pciefd_devlink_ops, sizeof(*pcie), dev);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pcie = devlink_priv(devlink);</div><div class='add'>+	pci_set_drvdata(pdev, pcie);</div><div class='add'>+	pcie-&gt;pci = pdev;</div><div class='add'>+	pcie-&gt;driver_data = (const struct kvaser_pciefd_driver_data *)id-&gt;driver_data;</div><div class='add'>+	irq_mask = pcie-&gt;driver_data-&gt;irq_mask;</div><div class='add'>+</div><div class='add'>+	ret = pci_enable_device(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_devlink;</div><div class='add'>+</div><div class='add'>+	ret = pci_request_regions(pdev, KVASER_PCIEFD_DRV_NAME);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_disable_pci;</div><div class='add'>+</div><div class='add'>+	pcie-&gt;reg_base = pci_iomap(pdev, 0, 0);</div><div class='add'>+	if (!pcie-&gt;reg_base) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_release_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = kvaser_pciefd_setup_board(pcie);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pci_iounmap;</div><div class='add'>+</div><div class='add'>+	ret = kvaser_pciefd_setup_dma(pcie);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_pci_iounmap;</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	ret = kvaser_pciefd_setup_can_ctrls(pcie);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_teardown_can_ctrls;</div><div class='add'>+</div><div class='add'>+	ret = pci_alloc_irq_vectors(pcie-&gt;pci, 1, 1, PCI_IRQ_INTX | PCI_IRQ_MSI);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Failed to allocate IRQ vectors.\n");</div><div class='add'>+		goto err_teardown_can_ctrls;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pci_irq_vector(pcie-&gt;pci, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_pci_free_irq_vectors;</div><div class='add'>+</div><div class='add'>+	pcie-&gt;pci-&gt;irq = ret;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(pcie-&gt;pci-&gt;irq, kvaser_pciefd_irq_handler,</div><div class='add'>+			  IRQF_SHARED, KVASER_PCIEFD_DRV_NAME, pcie);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to request IRQ %d\n", pcie-&gt;pci-&gt;irq);</div><div class='add'>+		goto err_pci_free_irq_vectors;</div><div class='add'>+	}</div><div class='add'>+	iowrite32(KVASER_PCIEFD_SRB_IRQ_DPD0 | KVASER_PCIEFD_SRB_IRQ_DPD1,</div><div class='add'>+		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_IRQ_REG);</div><div class='add'>+</div><div class='add'>+	iowrite32(KVASER_PCIEFD_SRB_IRQ_DPD0 | KVASER_PCIEFD_SRB_IRQ_DPD1 |</div><div class='add'>+		  KVASER_PCIEFD_SRB_IRQ_DOF0 | KVASER_PCIEFD_SRB_IRQ_DOF1 |</div><div class='add'>+		  KVASER_PCIEFD_SRB_IRQ_DUF0 | KVASER_PCIEFD_SRB_IRQ_DUF1,</div><div class='add'>+		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_IEN_REG);</div><div class='add'>+</div><div class='add'>+	/* Enable PCI interrupts */</div><div class='add'>+	iowrite32(irq_mask-&gt;all, KVASER_PCIEFD_PCI_IEN_ADDR(pcie));</div><div class='add'>+	/* Ready the DMA buffers */</div><div class='add'>+	iowrite32(KVASER_PCIEFD_SRB_CMD_RDB0,</div><div class='add'>+		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CMD_REG);</div><div class='add'>+	iowrite32(KVASER_PCIEFD_SRB_CMD_RDB1,</div><div class='add'>+		  KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CMD_REG);</div><div class='add'>+</div><div class='add'>+	ret = kvaser_pciefd_reg_candev(pcie);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	devlink_register(devlink);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	kvaser_pciefd_disable_irq_srcs(pcie);</div><div class='add'>+	free_irq(pcie-&gt;pci-&gt;irq, pcie);</div><div class='add'>+</div><div class='add'>+err_pci_free_irq_vectors:</div><div class='add'>+	pci_free_irq_vectors(pcie-&gt;pci);</div><div class='add'>+</div><div class='add'>+err_teardown_can_ctrls:</div><div class='add'>+	kvaser_pciefd_teardown_can_ctrls(pcie);</div><div class='add'>+	iowrite32(0, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CTRL_REG);</div><div class='add'>+	pci_clear_master(pdev);</div><div class='add'>+</div><div class='add'>+err_pci_iounmap:</div><div class='add'>+	pci_iounmap(pdev, pcie-&gt;reg_base);</div><div class='add'>+</div><div class='add'>+err_release_regions:</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+</div><div class='add'>+err_disable_pci:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+err_free_devlink:</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_pciefd_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd *pcie = pci_get_drvdata(pdev);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; ++i) {</div><div class='add'>+		struct kvaser_pciefd_can *can = pcie-&gt;can[i];</div><div class='add'>+</div><div class='add'>+		unregister_candev(can-&gt;can.dev);</div><div class='add'>+		timer_delete(&amp;can-&gt;bec_poll_timer);</div><div class='add'>+		kvaser_pciefd_pwm_stop(can);</div><div class='add'>+		kvaser_pciefd_devlink_port_unregister(can);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kvaser_pciefd_disable_irq_srcs(pcie);</div><div class='add'>+	free_irq(pcie-&gt;pci-&gt;irq, pcie);</div><div class='add'>+	pci_free_irq_vectors(pcie-&gt;pci);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pcie-&gt;nr_channels; ++i)</div><div class='add'>+		free_candev(pcie-&gt;can[i]-&gt;can.dev);</div><div class='add'>+</div><div class='add'>+	devlink_unregister(priv_to_devlink(pcie));</div><div class='add'>+	pci_iounmap(pdev, pcie-&gt;reg_base);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	devlink_free(priv_to_devlink(pcie));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver kvaser_pciefd = {</div><div class='add'>+	.name = KVASER_PCIEFD_DRV_NAME,</div><div class='add'>+	.id_table = kvaser_pciefd_id_table,</div><div class='add'>+	.probe = kvaser_pciefd_probe,</div><div class='add'>+	.remove = kvaser_pciefd_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(kvaser_pciefd)</div><div class='head'>diff --git a/drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c b/drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c<br/>new file mode 100644<br/>index 000000000000..1d61a8b0eeba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/kvaser_pciefd/kvaser_pciefd_devlink.c</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+/* kvaser_pciefd devlink functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 KVASER AB, Sweden. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include "kvaser_pciefd.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+static int kvaser_pciefd_devlink_info_get(struct devlink *devlink,</div><div class='add'>+					  struct devlink_info_req *req,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_pciefd *pcie = devlink_priv(devlink);</div><div class='add'>+	char buf[] = "xxx.xxx.xxxxx";</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (pcie-&gt;fw_version.major) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%u.%u.%u",</div><div class='add'>+			 pcie-&gt;fw_version.major,</div><div class='add'>+			 pcie-&gt;fw_version.minor,</div><div class='add'>+			 pcie-&gt;fw_version.build);</div><div class='add'>+		ret = devlink_info_version_running_put(req,</div><div class='add'>+						       DEVLINK_INFO_VERSION_GENERIC_FW,</div><div class='add'>+						       buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct devlink_ops kvaser_pciefd_devlink_ops = {</div><div class='add'>+	.info_get = kvaser_pciefd_devlink_info_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int kvaser_pciefd_devlink_port_register(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct devlink_port_attrs attrs = {</div><div class='add'>+		.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='add'>+		.phys.port_number = can-&gt;can.dev-&gt;dev_port,</div><div class='add'>+	};</div><div class='add'>+	devlink_port_attrs_set(&amp;can-&gt;devlink_port, &amp;attrs);</div><div class='add'>+</div><div class='add'>+	ret = devlink_port_register(priv_to_devlink(can-&gt;kv_pcie),</div><div class='add'>+				    &amp;can-&gt;devlink_port, can-&gt;can.dev-&gt;dev_port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEVLINK_PORT(can-&gt;can.dev, &amp;can-&gt;devlink_port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvaser_pciefd_devlink_port_unregister(struct kvaser_pciefd_can *can)</div><div class='add'>+{</div><div class='add'>+	devlink_port_unregister(&amp;can-&gt;devlink_port);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/led.c b/drivers/net/can/led.c<br/>deleted file mode 100644<br/>index c1b667675fa1..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/led.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/led.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,143 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2012, Fabio Baltieri &lt;fabio.baltieri@gmail.com&gt;</div><div class='del'>- * Copyright 2012, Kurt Van Dijck &lt;kurt.van.dijck@eia.be&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='del'>-</div><div class='del'>-static unsigned long led_delay = 50;</div><div class='del'>-module_param(led_delay, ulong, 0644);</div><div class='del'>-MODULE_PARM_DESC(led_delay,</div><div class='del'>-		"blink delay time for activity leds (msecs, default: 50).");</div><div class='del'>-</div><div class='del'>-/* Trigger a LED event in response to a CAN device event */</div><div class='del'>-void can_led_event(struct net_device *netdev, enum can_led_event event)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(netdev);</div><div class='del'>-</div><div class='del'>-	switch (event) {</div><div class='del'>-	case CAN_LED_EVENT_OPEN:</div><div class='del'>-		led_trigger_event(priv-&gt;tx_led_trig, LED_FULL);</div><div class='del'>-		led_trigger_event(priv-&gt;rx_led_trig, LED_FULL);</div><div class='del'>-		led_trigger_event(priv-&gt;rxtx_led_trig, LED_FULL);</div><div class='del'>-		break;</div><div class='del'>-	case CAN_LED_EVENT_STOP:</div><div class='del'>-		led_trigger_event(priv-&gt;tx_led_trig, LED_OFF);</div><div class='del'>-		led_trigger_event(priv-&gt;rx_led_trig, LED_OFF);</div><div class='del'>-		led_trigger_event(priv-&gt;rxtx_led_trig, LED_OFF);</div><div class='del'>-		break;</div><div class='del'>-	case CAN_LED_EVENT_TX:</div><div class='del'>-		if (led_delay) {</div><div class='del'>-			led_trigger_blink_oneshot(priv-&gt;tx_led_trig,</div><div class='del'>-						  &amp;led_delay, &amp;led_delay, 1);</div><div class='del'>-			led_trigger_blink_oneshot(priv-&gt;rxtx_led_trig,</div><div class='del'>-						  &amp;led_delay, &amp;led_delay, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CAN_LED_EVENT_RX:</div><div class='del'>-		if (led_delay) {</div><div class='del'>-			led_trigger_blink_oneshot(priv-&gt;rx_led_trig,</div><div class='del'>-						  &amp;led_delay, &amp;led_delay, 1);</div><div class='del'>-			led_trigger_blink_oneshot(priv-&gt;rxtx_led_trig,</div><div class='del'>-						  &amp;led_delay, &amp;led_delay, 1);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_led_event);</div><div class='del'>-</div><div class='del'>-static void can_led_release(struct device *gendev, void *res)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(to_net_dev(gendev));</div><div class='del'>-</div><div class='del'>-	led_trigger_unregister_simple(priv-&gt;tx_led_trig);</div><div class='del'>-	led_trigger_unregister_simple(priv-&gt;rx_led_trig);</div><div class='del'>-	led_trigger_unregister_simple(priv-&gt;rxtx_led_trig);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Register CAN LED triggers for a CAN device</div><div class='del'>- *</div><div class='del'>- * This is normally called from a driver's probe function</div><div class='del'>- */</div><div class='del'>-void devm_can_led_init(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct can_priv *priv = netdev_priv(netdev);</div><div class='del'>-	void *res;</div><div class='del'>-</div><div class='del'>-	res = devres_alloc(can_led_release, 0, GFP_KERNEL);</div><div class='del'>-	if (!res) {</div><div class='del'>-		netdev_err(netdev, "cannot register LED triggers\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	snprintf(priv-&gt;tx_led_trig_name, sizeof(priv-&gt;tx_led_trig_name),</div><div class='del'>-		 "%s-tx", netdev-&gt;name);</div><div class='del'>-	snprintf(priv-&gt;rx_led_trig_name, sizeof(priv-&gt;rx_led_trig_name),</div><div class='del'>-		 "%s-rx", netdev-&gt;name);</div><div class='del'>-	snprintf(priv-&gt;rxtx_led_trig_name, sizeof(priv-&gt;rxtx_led_trig_name),</div><div class='del'>-		 "%s-rxtx", netdev-&gt;name);</div><div class='del'>-</div><div class='del'>-	led_trigger_register_simple(priv-&gt;tx_led_trig_name,</div><div class='del'>-				    &amp;priv-&gt;tx_led_trig);</div><div class='del'>-	led_trigger_register_simple(priv-&gt;rx_led_trig_name,</div><div class='del'>-				    &amp;priv-&gt;rx_led_trig);</div><div class='del'>-	led_trigger_register_simple(priv-&gt;rxtx_led_trig_name,</div><div class='del'>-				    &amp;priv-&gt;rxtx_led_trig);</div><div class='del'>-</div><div class='del'>-	devres_add(&amp;netdev-&gt;dev, res);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(devm_can_led_init);</div><div class='del'>-</div><div class='del'>-/* NETDEV rename notifier to rename the associated led triggers too */</div><div class='del'>-static int can_led_notifier(struct notifier_block *nb, unsigned long msg,</div><div class='del'>-			    void *ptr)</div><div class='del'>-{</div><div class='del'>-	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);</div><div class='del'>-	struct can_priv *priv = safe_candev_priv(netdev);</div><div class='del'>-	char name[CAN_LED_NAME_SZ];</div><div class='del'>-</div><div class='del'>-	if (!priv)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;tx_led_trig || !priv-&gt;rx_led_trig || !priv-&gt;rxtx_led_trig)</div><div class='del'>-		return NOTIFY_DONE;</div><div class='del'>-</div><div class='del'>-	if (msg == NETDEV_CHANGENAME) {</div><div class='del'>-		snprintf(name, sizeof(name), "%s-tx", netdev-&gt;name);</div><div class='del'>-		led_trigger_rename_static(name, priv-&gt;tx_led_trig);</div><div class='del'>-</div><div class='del'>-		snprintf(name, sizeof(name), "%s-rx", netdev-&gt;name);</div><div class='del'>-		led_trigger_rename_static(name, priv-&gt;rx_led_trig);</div><div class='del'>-</div><div class='del'>-		snprintf(name, sizeof(name), "%s-rxtx", netdev-&gt;name);</div><div class='del'>-		led_trigger_rename_static(name, priv-&gt;rxtx_led_trig);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NOTIFY_DONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* notifier block for netdevice event */</div><div class='del'>-static struct notifier_block can_netdev_notifier __read_mostly = {</div><div class='del'>-	.notifier_call = can_led_notifier,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int __init can_led_notifier_init(void)</div><div class='del'>-{</div><div class='del'>-	return register_netdevice_notifier(&amp;can_netdev_notifier);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit can_led_notifier_exit(void)</div><div class='del'>-{</div><div class='del'>-	unregister_netdevice_notifier(&amp;can_netdev_notifier);</div><div class='del'>-}</div><div class='head'>diff --git a/drivers/net/can/m_can/Kconfig b/drivers/net/can/m_can/Kconfig<br/>index ec4b2e117f66..fc2afab36279 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/Kconfig</a></div><div class='hunk'>@@ -1,6 +1,35 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config CAN_M_CAN</div><div class='add'>+menuconfig CAN_M_CAN</div><div class='add'>+	tristate "Bosch M_CAN support"</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want support for Bosch M_CAN controller framework.</div><div class='add'>+	  This is common support for devices that embed the Bosch M_CAN IP.</div><div class='add'>+</div><div class='add'>+if CAN_M_CAN</div><div class='add'>+</div><div class='add'>+config CAN_M_CAN_PCI</div><div class='add'>+	tristate "Generic PCI Bus based M_CAN driver"</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to support Bosch M_CAN controller connected</div><div class='add'>+	  to the pci bus.</div><div class='add'>+</div><div class='add'>+config CAN_M_CAN_PLATFORM</div><div class='add'>+	tristate "Bosch M_CAN support for io-mapped devices"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='del'>-	tristate "Bosch M_CAN devices"</div><div class='del'>-	---help---</div><div class='del'>-	  Say Y here if you want to support for Bosch M_CAN controller.</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want support for IO Mapped Bosch M_CAN controller.</div><div class='add'>+	  This support is for devices that have the Bosch M_CAN controller</div><div class='add'>+	  IP embedded into the device and the IP is IO Mapped to the processor.</div><div class='add'>+</div><div class='add'>+config CAN_M_CAN_TCAN4X5X</div><div class='add'>+	depends on SPI</div><div class='add'>+	select REGMAP_SPI</div><div class='add'>+	tristate "TCAN4X5X M_CAN device"</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want support for Texas Instruments TCAN4x5x</div><div class='add'>+	  M_CAN controller.  This device is a peripheral device that uses the</div><div class='add'>+	  SPI bus for communication.</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/can/m_can/Makefile b/drivers/net/can/m_can/Makefile<br/>index 599ae69cb4a1..d717bbc9e033 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/Makefile</a></div><div class='hunk'>@@ -4,3 +4,10 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_M_CAN) += m_can.o</div><div class='add'>+obj-$(CONFIG_CAN_M_CAN_PCI) += m_can_pci.o</div><div class='add'>+obj-$(CONFIG_CAN_M_CAN_PLATFORM) += m_can_platform.o</div><div class='add'>+obj-$(CONFIG_CAN_M_CAN_TCAN4X5X) += tcan4x5x.o</div><div class='add'>+</div><div class='add'>+tcan4x5x-objs :=</div><div class='add'>+tcan4x5x-objs += tcan4x5x-core.o</div><div class='add'>+tcan4x5x-objs += tcan4x5x-regmap.o</div><div class='head'>diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c<br/>index 9b449400376b..eb856547ae7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/m_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/m_can/m_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/m_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/m_can.c</a></div><div class='hunk'>@@ -1,38 +1,31 @@</div><div class='del'>-/*</div><div class='del'>- * CAN bus driver for Bosch M_CAN controller</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014 Freescale Semiconductor, Inc.</div><div class='del'>- *	Dong Aisheng &lt;b29396@freescale.com&gt;</div><div class='del'>- *</div><div class='del'>- * Bosch M_CAN user manual can be obtained from:</div><div class='del'>- * http://www.bosch-semiconductors.de/media/pdf_1/ipmodules_1/m_can/</div><div class='del'>- * mcan_users_manual_v302.pdf</div><div class='del'>- *</div><div class='del'>- * This file is licensed under the terms of the GNU General Public</div><div class='del'>- * License version 2. This program is licensed "as is" without any</div><div class='del'>- * warranty of any kind, whether express or implied.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// CAN bus driver for Bosch M_CAN controller</div><div class='add'>+// Copyright (C) 2014 Freescale Semiconductor, Inc.</div><div class='add'>+//      Dong Aisheng &lt;aisheng.dong@nxp.com&gt;</div><div class='add'>+// Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+</div><div class='add'>+/* Bosch M_CAN user manual can be obtained from:</div><div class='add'>+ * https://github.com/linux-can/can-doc/tree/master/m_can</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='del'>-#include &lt;linux/iopoll.h&gt;</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> </div><div class='del'>-/* napi related */</div><div class='del'>-#define M_CAN_NAPI_WEIGHT	64</div><div class='del'>-</div><div class='del'>-/* message ram configuration data length */</div><div class='del'>-#define MRAM_CFG_LEN	8</div><div class='add'>+#include "m_can.h"</div><div class='ctx'> </div><div class='ctx'> /* registers definition */</div><div class='ctx'> enum m_can_reg {</div><div class='hunk'>@@ -50,7 +43,7 @@ enum m_can_reg {</div><div class='ctx'> 	M_CAN_TOCV	= 0x2c,</div><div class='ctx'> 	M_CAN_ECR	= 0x40,</div><div class='ctx'> 	M_CAN_PSR	= 0x44,</div><div class='del'>-/* TDCR Register only available for version &gt;=3.1.x */</div><div class='add'>+	/* TDCR Register only available for version &gt;=3.1.x */</div><div class='ctx'> 	M_CAN_TDCR	= 0x48,</div><div class='ctx'> 	M_CAN_IR	= 0x50,</div><div class='ctx'> 	M_CAN_IE	= 0x54,</div><div class='hunk'>@@ -86,109 +79,87 @@ enum m_can_reg {</div><div class='ctx'> 	M_CAN_TXEFA	= 0xf8,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* m_can lec values */</div><div class='del'>-enum m_can_lec_type {</div><div class='del'>-	LEC_NO_ERROR = 0,</div><div class='del'>-	LEC_STUFF_ERROR,</div><div class='del'>-	LEC_FORM_ERROR,</div><div class='del'>-	LEC_ACK_ERROR,</div><div class='del'>-	LEC_BIT1_ERROR,</div><div class='del'>-	LEC_BIT0_ERROR,</div><div class='del'>-	LEC_CRC_ERROR,</div><div class='del'>-	LEC_UNUSED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum m_can_mram_cfg {</div><div class='del'>-	MRAM_SIDF = 0,</div><div class='del'>-	MRAM_XIDF,</div><div class='del'>-	MRAM_RXF0,</div><div class='del'>-	MRAM_RXF1,</div><div class='del'>-	MRAM_RXB,</div><div class='del'>-	MRAM_TXE,</div><div class='del'>-	MRAM_TXB,</div><div class='del'>-	MRAM_CFG_NUM,</div><div class='del'>-};</div><div class='add'>+/* message ram configuration data length */</div><div class='add'>+#define MRAM_CFG_LEN	8</div><div class='ctx'> </div><div class='ctx'> /* Core Release Register (CREL) */</div><div class='del'>-#define CREL_REL_SHIFT		28</div><div class='del'>-#define CREL_REL_MASK		(0xF &lt;&lt; CREL_REL_SHIFT)</div><div class='del'>-#define CREL_STEP_SHIFT		24</div><div class='del'>-#define CREL_STEP_MASK		(0xF &lt;&lt; CREL_STEP_SHIFT)</div><div class='del'>-#define CREL_SUBSTEP_SHIFT	20</div><div class='del'>-#define CREL_SUBSTEP_MASK	(0xF &lt;&lt; CREL_SUBSTEP_SHIFT)</div><div class='add'>+#define CREL_REL_MASK		GENMASK(31, 28)</div><div class='add'>+#define CREL_STEP_MASK		GENMASK(27, 24)</div><div class='add'>+#define CREL_SUBSTEP_MASK	GENMASK(23, 20)</div><div class='ctx'> </div><div class='ctx'> /* Data Bit Timing &amp; Prescaler Register (DBTP) */</div><div class='ctx'> #define DBTP_TDC		BIT(23)</div><div class='del'>-#define DBTP_DBRP_SHIFT		16</div><div class='del'>-#define DBTP_DBRP_MASK		(0x1f &lt;&lt; DBTP_DBRP_SHIFT)</div><div class='del'>-#define DBTP_DTSEG1_SHIFT	8</div><div class='del'>-#define DBTP_DTSEG1_MASK	(0x1f &lt;&lt; DBTP_DTSEG1_SHIFT)</div><div class='del'>-#define DBTP_DTSEG2_SHIFT	4</div><div class='del'>-#define DBTP_DTSEG2_MASK	(0xf &lt;&lt; DBTP_DTSEG2_SHIFT)</div><div class='del'>-#define DBTP_DSJW_SHIFT		0</div><div class='del'>-#define DBTP_DSJW_MASK		(0xf &lt;&lt; DBTP_DSJW_SHIFT)</div><div class='add'>+#define DBTP_DBRP_MASK		GENMASK(20, 16)</div><div class='add'>+#define DBTP_DTSEG1_MASK	GENMASK(12, 8)</div><div class='add'>+#define DBTP_DTSEG2_MASK	GENMASK(7, 4)</div><div class='add'>+#define DBTP_DSJW_MASK		GENMASK(3, 0)</div><div class='ctx'> </div><div class='ctx'> /* Transmitter Delay Compensation Register (TDCR) */</div><div class='del'>-#define TDCR_TDCO_SHIFT		8</div><div class='del'>-#define TDCR_TDCO_MASK		(0x7F &lt;&lt; TDCR_TDCO_SHIFT)</div><div class='del'>-#define TDCR_TDCF_SHIFT		0</div><div class='del'>-#define TDCR_TDCF_MASK		(0x7F &lt;&lt; TDCR_TDCF_SHIFT)</div><div class='add'>+#define TDCR_TDCO_MASK		GENMASK(14, 8)</div><div class='add'>+#define TDCR_TDCF_MASK		GENMASK(6, 0)</div><div class='ctx'> </div><div class='ctx'> /* Test Register (TEST) */</div><div class='ctx'> #define TEST_LBCK		BIT(4)</div><div class='ctx'> </div><div class='del'>-/* CC Control Register(CCCR) */</div><div class='del'>-#define CCCR_CMR_MASK		0x3</div><div class='del'>-#define CCCR_CMR_SHIFT		10</div><div class='del'>-#define CCCR_CMR_CANFD		0x1</div><div class='del'>-#define CCCR_CMR_CANFD_BRS	0x2</div><div class='del'>-#define CCCR_CMR_CAN		0x3</div><div class='del'>-#define CCCR_CME_MASK		0x3</div><div class='del'>-#define CCCR_CME_SHIFT		8</div><div class='del'>-#define CCCR_CME_CAN		0</div><div class='del'>-#define CCCR_CME_CANFD		0x1</div><div class='del'>-#define CCCR_CME_CANFD_BRS	0x2</div><div class='add'>+/* CC Control Register (CCCR) */</div><div class='ctx'> #define CCCR_TXP		BIT(14)</div><div class='ctx'> #define CCCR_TEST		BIT(7)</div><div class='add'>+#define CCCR_DAR		BIT(6)</div><div class='ctx'> #define CCCR_MON		BIT(5)</div><div class='ctx'> #define CCCR_CSR		BIT(4)</div><div class='ctx'> #define CCCR_CSA		BIT(3)</div><div class='ctx'> #define CCCR_ASM		BIT(2)</div><div class='ctx'> #define CCCR_CCE		BIT(1)</div><div class='ctx'> #define CCCR_INIT		BIT(0)</div><div class='del'>-#define CCCR_CANFD		0x10</div><div class='add'>+/* for version 3.0.x */</div><div class='add'>+#define CCCR_CMR_MASK		GENMASK(11, 10)</div><div class='add'>+#define CCCR_CMR_CANFD		0x1</div><div class='add'>+#define CCCR_CMR_CANFD_BRS	0x2</div><div class='add'>+#define CCCR_CMR_CAN		0x3</div><div class='add'>+#define CCCR_CME_MASK		GENMASK(9, 8)</div><div class='add'>+#define CCCR_CME_CAN		0</div><div class='add'>+#define CCCR_CME_CANFD		0x1</div><div class='add'>+#define CCCR_CME_CANFD_BRS	0x2</div><div class='ctx'> /* for version &gt;=3.1.x */</div><div class='ctx'> #define CCCR_EFBI		BIT(13)</div><div class='ctx'> #define CCCR_PXHD		BIT(12)</div><div class='ctx'> #define CCCR_BRSE		BIT(9)</div><div class='ctx'> #define CCCR_FDOE		BIT(8)</div><div class='del'>-/* only for version &gt;=3.2.x */</div><div class='add'>+/* for version &gt;=3.2.x */</div><div class='ctx'> #define CCCR_NISO		BIT(15)</div><div class='add'>+/* for version &gt;=3.3.x */</div><div class='add'>+#define CCCR_WMM		BIT(11)</div><div class='add'>+#define CCCR_UTSU		BIT(10)</div><div class='ctx'> </div><div class='ctx'> /* Nominal Bit Timing &amp; Prescaler Register (NBTP) */</div><div class='del'>-#define NBTP_NSJW_SHIFT		25</div><div class='del'>-#define NBTP_NSJW_MASK		(0x7f &lt;&lt; NBTP_NSJW_SHIFT)</div><div class='del'>-#define NBTP_NBRP_SHIFT		16</div><div class='del'>-#define NBTP_NBRP_MASK		(0x1ff &lt;&lt; NBTP_NBRP_SHIFT)</div><div class='del'>-#define NBTP_NTSEG1_SHIFT	8</div><div class='del'>-#define NBTP_NTSEG1_MASK	(0xff &lt;&lt; NBTP_NTSEG1_SHIFT)</div><div class='del'>-#define NBTP_NTSEG2_SHIFT	0</div><div class='del'>-#define NBTP_NTSEG2_MASK	(0x7f &lt;&lt; NBTP_NTSEG2_SHIFT)</div><div class='del'>-</div><div class='del'>-/* Error Counter Register(ECR) */</div><div class='add'>+#define NBTP_NSJW_MASK		GENMASK(31, 25)</div><div class='add'>+#define NBTP_NBRP_MASK		GENMASK(24, 16)</div><div class='add'>+#define NBTP_NTSEG1_MASK	GENMASK(15, 8)</div><div class='add'>+#define NBTP_NTSEG2_MASK	GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+/* Timestamp Counter Configuration Register (TSCC) */</div><div class='add'>+#define TSCC_TCP_MASK		GENMASK(19, 16)</div><div class='add'>+#define TSCC_TSS_MASK		GENMASK(1, 0)</div><div class='add'>+#define TSCC_TSS_DISABLE	0x0</div><div class='add'>+#define TSCC_TSS_INTERNAL	0x1</div><div class='add'>+#define TSCC_TSS_EXTERNAL	0x2</div><div class='add'>+</div><div class='add'>+/* Timestamp Counter Value Register (TSCV) */</div><div class='add'>+#define TSCV_TSC_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* Error Counter Register (ECR) */</div><div class='ctx'> #define ECR_RP			BIT(15)</div><div class='del'>-#define ECR_REC_SHIFT		8</div><div class='del'>-#define ECR_REC_MASK		(0x7f &lt;&lt; ECR_REC_SHIFT)</div><div class='del'>-#define ECR_TEC_SHIFT		0</div><div class='del'>-#define ECR_TEC_MASK		0xff</div><div class='add'>+#define ECR_REC_MASK		GENMASK(14, 8)</div><div class='add'>+#define ECR_TEC_MASK		GENMASK(7, 0)</div><div class='ctx'> </div><div class='del'>-/* Protocol Status Register(PSR) */</div><div class='add'>+/* Protocol Status Register (PSR) */</div><div class='ctx'> #define PSR_BO		BIT(7)</div><div class='ctx'> #define PSR_EW		BIT(6)</div><div class='ctx'> #define PSR_EP		BIT(5)</div><div class='del'>-#define PSR_LEC_MASK	0x7</div><div class='add'>+#define PSR_LEC_MASK	GENMASK(2, 0)</div><div class='add'>+#define PSR_DLEC_MASK	GENMASK(10, 8)</div><div class='ctx'> </div><div class='del'>-/* Interrupt Register(IR) */</div><div class='add'>+/* Interrupt Register (IR) */</div><div class='ctx'> #define IR_ALL_INT	0xffffffff</div><div class='ctx'> </div><div class='ctx'> /* Renamed bits for versions &gt; 3.1.x */</div><div class='hunk'>@@ -233,15 +204,16 @@ enum m_can_mram_cfg {</div><div class='ctx'> </div><div class='ctx'> /* Interrupts for version 3.0.x */</div><div class='ctx'> #define IR_ERR_LEC_30X	(IR_STE	| IR_FOE | IR_ACKE | IR_BE | IR_CRCE)</div><div class='del'>-#define IR_ERR_BUS_30X	(IR_ERR_LEC_30X | IR_WDI | IR_ELO | IR_BEU | \</div><div class='del'>-			 IR_BEC | IR_TOO | IR_MRAF | IR_TSW | IR_TEFL | \</div><div class='del'>-			 IR_RF1L | IR_RF0L)</div><div class='add'>+#define IR_ERR_BUS_30X	(IR_ERR_LEC_30X | IR_WDI | IR_BEU | IR_BEC | \</div><div class='add'>+			 IR_TOO | IR_MRAF | IR_TSW | IR_TEFL | IR_RF1L | \</div><div class='add'>+			 IR_RF0L)</div><div class='ctx'> #define IR_ERR_ALL_30X	(IR_ERR_STATE | IR_ERR_BUS_30X)</div><div class='add'>+</div><div class='ctx'> /* Interrupts for version &gt;= 3.1.x */</div><div class='ctx'> #define IR_ERR_LEC_31X	(IR_PED | IR_PEA)</div><div class='del'>-#define IR_ERR_BUS_31X      (IR_ERR_LEC_31X | IR_WDI | IR_ELO | IR_BEU | \</div><div class='del'>-			 IR_BEC | IR_TOO | IR_MRAF | IR_TSW | IR_TEFL | \</div><div class='del'>-			 IR_RF1L | IR_RF0L)</div><div class='add'>+#define IR_ERR_BUS_31X	(IR_ERR_LEC_31X | IR_WDI | IR_BEU | IR_BEC | \</div><div class='add'>+			 IR_TOO | IR_MRAF | IR_TSW | IR_TEFL | IR_RF1L | \</div><div class='add'>+			 IR_RF0L)</div><div class='ctx'> #define IR_ERR_ALL_31X	(IR_ERR_STATE | IR_ERR_BUS_31X)</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Line Select (ILS) */</div><div class='hunk'>@@ -253,58 +225,48 @@ enum m_can_mram_cfg {</div><div class='ctx'> #define ILE_EINT0	BIT(0)</div><div class='ctx'> </div><div class='ctx'> /* Rx FIFO 0/1 Configuration (RXF0C/RXF1C) */</div><div class='del'>-#define RXFC_FWM_SHIFT	24</div><div class='del'>-#define RXFC_FWM_MASK	(0x7f &lt;&lt; RXFC_FWM_SHIFT)</div><div class='del'>-#define RXFC_FS_SHIFT	16</div><div class='del'>-#define RXFC_FS_MASK	(0x7f &lt;&lt; RXFC_FS_SHIFT)</div><div class='add'>+#define RXFC_FWM_MASK	GENMASK(30, 24)</div><div class='add'>+#define RXFC_FS_MASK	GENMASK(22, 16)</div><div class='ctx'> </div><div class='ctx'> /* Rx FIFO 0/1 Status (RXF0S/RXF1S) */</div><div class='ctx'> #define RXFS_RFL	BIT(25)</div><div class='ctx'> #define RXFS_FF		BIT(24)</div><div class='del'>-#define RXFS_FPI_SHIFT	16</div><div class='del'>-#define RXFS_FPI_MASK	0x3f0000</div><div class='del'>-#define RXFS_FGI_SHIFT	8</div><div class='del'>-#define RXFS_FGI_MASK	0x3f00</div><div class='del'>-#define RXFS_FFL_MASK	0x7f</div><div class='add'>+#define RXFS_FPI_MASK	GENMASK(21, 16)</div><div class='add'>+#define RXFS_FGI_MASK	GENMASK(13, 8)</div><div class='add'>+#define RXFS_FFL_MASK	GENMASK(6, 0)</div><div class='ctx'> </div><div class='ctx'> /* Rx Buffer / FIFO Element Size Configuration (RXESC) */</div><div class='del'>-#define M_CAN_RXESC_8BYTES	0x0</div><div class='del'>-#define M_CAN_RXESC_64BYTES	0x777</div><div class='add'>+#define RXESC_RBDS_MASK		GENMASK(10, 8)</div><div class='add'>+#define RXESC_F1DS_MASK		GENMASK(6, 4)</div><div class='add'>+#define RXESC_F0DS_MASK		GENMASK(2, 0)</div><div class='add'>+#define RXESC_64B		0x7</div><div class='ctx'> </div><div class='del'>-/* Tx Buffer Configuration(TXBC) */</div><div class='del'>-#define TXBC_NDTB_SHIFT		16</div><div class='del'>-#define TXBC_NDTB_MASK		(0x3f &lt;&lt; TXBC_NDTB_SHIFT)</div><div class='del'>-#define TXBC_TFQS_SHIFT		24</div><div class='del'>-#define TXBC_TFQS_MASK		(0x3f &lt;&lt; TXBC_TFQS_SHIFT)</div><div class='add'>+/* Tx Buffer Configuration (TXBC) */</div><div class='add'>+#define TXBC_TFQS_MASK		GENMASK(29, 24)</div><div class='add'>+#define TXBC_NDTB_MASK		GENMASK(21, 16)</div><div class='ctx'> </div><div class='ctx'> /* Tx FIFO/Queue Status (TXFQS) */</div><div class='ctx'> #define TXFQS_TFQF		BIT(21)</div><div class='del'>-#define TXFQS_TFQPI_SHIFT	16</div><div class='del'>-#define TXFQS_TFQPI_MASK	(0x1f &lt;&lt; TXFQS_TFQPI_SHIFT)</div><div class='del'>-#define TXFQS_TFGI_SHIFT	8</div><div class='del'>-#define TXFQS_TFGI_MASK		(0x1f &lt;&lt; TXFQS_TFGI_SHIFT)</div><div class='del'>-#define TXFQS_TFFL_SHIFT	0</div><div class='del'>-#define TXFQS_TFFL_MASK		(0x3f &lt;&lt; TXFQS_TFFL_SHIFT)</div><div class='add'>+#define TXFQS_TFQPI_MASK	GENMASK(20, 16)</div><div class='add'>+#define TXFQS_TFGI_MASK		GENMASK(12, 8)</div><div class='add'>+#define TXFQS_TFFL_MASK		GENMASK(5, 0)</div><div class='ctx'> </div><div class='del'>-/* Tx Buffer Element Size Configuration(TXESC) */</div><div class='del'>-#define TXESC_TBDS_8BYTES	0x0</div><div class='del'>-#define TXESC_TBDS_64BYTES	0x7</div><div class='add'>+/* Tx Buffer Element Size Configuration (TXESC) */</div><div class='add'>+#define TXESC_TBDS_MASK		GENMASK(2, 0)</div><div class='add'>+#define TXESC_TBDS_64B		0x7</div><div class='ctx'> </div><div class='ctx'> /* Tx Event FIFO Configuration (TXEFC) */</div><div class='del'>-#define TXEFC_EFS_SHIFT		16</div><div class='del'>-#define TXEFC_EFS_MASK		(0x3f &lt;&lt; TXEFC_EFS_SHIFT)</div><div class='add'>+#define TXEFC_EFWM_MASK		GENMASK(29, 24)</div><div class='add'>+#define TXEFC_EFS_MASK		GENMASK(21, 16)</div><div class='ctx'> </div><div class='ctx'> /* Tx Event FIFO Status (TXEFS) */</div><div class='ctx'> #define TXEFS_TEFL		BIT(25)</div><div class='ctx'> #define TXEFS_EFF		BIT(24)</div><div class='del'>-#define TXEFS_EFGI_SHIFT	8</div><div class='del'>-#define	TXEFS_EFGI_MASK		(0x1f &lt;&lt; TXEFS_EFGI_SHIFT)</div><div class='del'>-#define TXEFS_EFFL_SHIFT	0</div><div class='del'>-#define TXEFS_EFFL_MASK		(0x3f &lt;&lt; TXEFS_EFFL_SHIFT)</div><div class='add'>+#define TXEFS_EFGI_MASK		GENMASK(12, 8)</div><div class='add'>+#define TXEFS_EFFL_MASK		GENMASK(5, 0)</div><div class='ctx'> </div><div class='ctx'> /* Tx Event FIFO Acknowledge (TXEFA) */</div><div class='del'>-#define TXEFA_EFAI_SHIFT	0</div><div class='del'>-#define TXEFA_EFAI_MASK		(0x1f &lt;&lt; TXEFA_EFAI_SHIFT)</div><div class='add'>+#define TXEFA_EFAI_MASK		GENMASK(4, 0)</div><div class='ctx'> </div><div class='ctx'> /* Message RAM Configuration (in bytes) */</div><div class='ctx'> #define SIDF_ELEMENT_SIZE	4</div><div class='hunk'>@@ -318,7 +280,7 @@ enum m_can_mram_cfg {</div><div class='ctx'> /* Message RAM Elements */</div><div class='ctx'> #define M_CAN_FIFO_ID		0x0</div><div class='ctx'> #define M_CAN_FIFO_DLC		0x4</div><div class='del'>-#define M_CAN_FIFO_DATA(n)	(0x8 + ((n) &lt;&lt; 2))</div><div class='add'>+#define M_CAN_FIFO_DATA		0x8</div><div class='ctx'> </div><div class='ctx'> /* Rx Buffer Element */</div><div class='ctx'> /* R0 */</div><div class='hunk'>@@ -329,6 +291,7 @@ enum m_can_mram_cfg {</div><div class='ctx'> #define RX_BUF_ANMF		BIT(31)</div><div class='ctx'> #define RX_BUF_FDF		BIT(21)</div><div class='ctx'> #define RX_BUF_BRS		BIT(20)</div><div class='add'>+#define RX_BUF_RXTS_MASK	GENMASK(15, 0)</div><div class='ctx'> </div><div class='ctx'> /* Tx Buffer Element */</div><div class='ctx'> /* T0 */</div><div class='hunk'>@@ -339,210 +302,371 @@ enum m_can_mram_cfg {</div><div class='ctx'> #define TX_BUF_EFC		BIT(23)</div><div class='ctx'> #define TX_BUF_FDF		BIT(21)</div><div class='ctx'> #define TX_BUF_BRS		BIT(20)</div><div class='del'>-#define TX_BUF_MM_SHIFT		24</div><div class='del'>-#define TX_BUF_MM_MASK		(0xff &lt;&lt; TX_BUF_MM_SHIFT)</div><div class='add'>+#define TX_BUF_MM_MASK		GENMASK(31, 24)</div><div class='add'>+#define TX_BUF_DLC_MASK		GENMASK(19, 16)</div><div class='ctx'> </div><div class='ctx'> /* Tx event FIFO Element */</div><div class='ctx'> /* E1 */</div><div class='del'>-#define TX_EVENT_MM_SHIFT	TX_BUF_MM_SHIFT</div><div class='del'>-#define TX_EVENT_MM_MASK	(0xff &lt;&lt; TX_EVENT_MM_SHIFT)</div><div class='add'>+#define TX_EVENT_MM_MASK	GENMASK(31, 24)</div><div class='add'>+#define TX_EVENT_TXTS_MASK	GENMASK(15, 0)</div><div class='ctx'> </div><div class='del'>-/* address offset and element number for each FIFO/Buffer in the Message RAM */</div><div class='del'>-struct mram_cfg {</div><div class='del'>-	u16 off;</div><div class='del'>-	u8  num;</div><div class='del'>-};</div><div class='add'>+/* Hrtimer polling interval */</div><div class='add'>+#define HRTIMER_POLL_INTERVAL_MS		1</div><div class='ctx'> </div><div class='del'>-/* m_can private data structure */</div><div class='del'>-struct m_can_priv {</div><div class='del'>-	struct can_priv can;	/* must be the first member */</div><div class='del'>-	struct napi_struct napi;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct device *device;</div><div class='del'>-	struct clk *hclk;</div><div class='del'>-	struct clk *cclk;</div><div class='del'>-	void __iomem *base;</div><div class='del'>-	u32 irqstatus;</div><div class='del'>-	int version;</div><div class='add'>+/* The ID and DLC registers are adjacent in M_CAN FIFO memory,</div><div class='add'>+ * and we can save a (potentially slow) bus round trip by combining</div><div class='add'>+ * reads and writes to them.</div><div class='add'>+ */</div><div class='add'>+struct id_and_dlc {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 dlc;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	/* message ram configuration */</div><div class='del'>-	void __iomem *mram_base;</div><div class='del'>-	struct mram_cfg mcfg[MRAM_CFG_NUM];</div><div class='add'>+struct m_can_fifo_element {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 dlc;</div><div class='add'>+	u8 data[CANFD_MAX_DLEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline u32 m_can_read(const struct m_can_priv *priv, enum m_can_reg reg)</div><div class='add'>+static inline u32 m_can_read(struct m_can_classdev *cdev, enum m_can_reg reg)</div><div class='ctx'> {</div><div class='del'>-	return readl(priv-&gt;base + reg);</div><div class='add'>+	return cdev-&gt;ops-&gt;read_reg(cdev, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void m_can_write(const struct m_can_priv *priv,</div><div class='del'>-			       enum m_can_reg reg, u32 val)</div><div class='add'>+static inline void m_can_write(struct m_can_classdev *cdev, enum m_can_reg reg,</div><div class='add'>+			       u32 val)</div><div class='ctx'> {</div><div class='del'>-	writel(val, priv-&gt;base + reg);</div><div class='add'>+	cdev-&gt;ops-&gt;write_reg(cdev, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 m_can_fifo_read(const struct m_can_priv *priv,</div><div class='del'>-				  u32 fgi, unsigned int offset)</div><div class='add'>+static int</div><div class='add'>+m_can_fifo_read(struct m_can_classdev *cdev,</div><div class='add'>+		u32 fgi, unsigned int offset, void *val, size_t val_count)</div><div class='ctx'> {</div><div class='del'>-	return readl(priv-&gt;mram_base + priv-&gt;mcfg[MRAM_RXF0].off +</div><div class='del'>-		     fgi * RXF0_ELEMENT_SIZE + offset);</div><div class='add'>+	u32 addr_offset = cdev-&gt;mcfg[MRAM_RXF0].off + fgi * RXF0_ELEMENT_SIZE +</div><div class='add'>+		offset;</div><div class='add'>+</div><div class='add'>+	if (val_count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return cdev-&gt;ops-&gt;read_fifo(cdev, addr_offset, val, val_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void m_can_fifo_write(const struct m_can_priv *priv,</div><div class='del'>-				    u32 fpi, unsigned int offset, u32 val)</div><div class='add'>+static int</div><div class='add'>+m_can_fifo_write(struct m_can_classdev *cdev,</div><div class='add'>+		 u32 fpi, unsigned int offset, const void *val, size_t val_count)</div><div class='ctx'> {</div><div class='del'>-	writel(val, priv-&gt;mram_base + priv-&gt;mcfg[MRAM_TXB].off +</div><div class='del'>-	       fpi * TXB_ELEMENT_SIZE + offset);</div><div class='del'>-}</div><div class='add'>+	u32 addr_offset = cdev-&gt;mcfg[MRAM_TXB].off + fpi * TXB_ELEMENT_SIZE +</div><div class='add'>+		offset;</div><div class='ctx'> </div><div class='del'>-static inline u32 m_can_txe_fifo_read(const struct m_can_priv *priv,</div><div class='del'>-				      u32 fgi,</div><div class='del'>-				      u32 offset) {</div><div class='del'>-	return readl(priv-&gt;mram_base + priv-&gt;mcfg[MRAM_TXE].off +</div><div class='del'>-			fgi * TXE_ELEMENT_SIZE + offset);</div><div class='add'>+	if (val_count == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return cdev-&gt;ops-&gt;write_fifo(cdev, addr_offset, val, val_count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool m_can_tx_fifo_full(const struct m_can_priv *priv)</div><div class='add'>+static inline int m_can_fifo_write_no_off(struct m_can_classdev *cdev,</div><div class='add'>+					  u32 fpi, u32 val)</div><div class='ctx'> {</div><div class='del'>-		return !!(m_can_read(priv, M_CAN_TXFQS) &amp; TXFQS_TFQF);</div><div class='add'>+	return cdev-&gt;ops-&gt;write_fifo(cdev, fpi, &amp;val, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void m_can_config_endisable(const struct m_can_priv *priv,</div><div class='del'>-					  bool enable)</div><div class='add'>+static int</div><div class='add'>+m_can_txe_fifo_read(struct m_can_classdev *cdev, u32 fgi, u32 offset, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	u32 cccr = m_can_read(priv, M_CAN_CCCR);</div><div class='del'>-	u32 timeout = 10;</div><div class='del'>-	u32 val = 0;</div><div class='add'>+	u32 addr_offset = cdev-&gt;mcfg[MRAM_TXE].off + fgi * TXE_ELEMENT_SIZE +</div><div class='add'>+		offset;</div><div class='ctx'> </div><div class='del'>-	if (enable) {</div><div class='del'>-		/* enable m_can configuration */</div><div class='del'>-		m_can_write(priv, M_CAN_CCCR, cccr | CCCR_INIT);</div><div class='del'>-		udelay(5);</div><div class='del'>-		/* CCCR.CCE can only be set/reset while CCCR.INIT = '1' */</div><div class='del'>-		m_can_write(priv, M_CAN_CCCR, cccr | CCCR_INIT | CCCR_CCE);</div><div class='del'>-	} else {</div><div class='del'>-		m_can_write(priv, M_CAN_CCCR, cccr &amp; ~(CCCR_INIT | CCCR_CCE));</div><div class='add'>+	return cdev-&gt;ops-&gt;read_fifo(cdev, addr_offset, val, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_cccr_update_bits(struct m_can_classdev *cdev, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 val_before = m_can_read(cdev, M_CAN_CCCR);</div><div class='add'>+	u32 val_after = (val_before &amp; ~mask) | val;</div><div class='add'>+	size_t tries = 10;</div><div class='add'>+</div><div class='add'>+	if (!(mask &amp; CCCR_INIT) &amp;&amp; !(val_before &amp; CCCR_INIT)) {</div><div class='add'>+		netdev_err(cdev-&gt;net,</div><div class='add'>+			   "refusing to configure device when in normal mode\n");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* there's a delay for module initialization */</div><div class='del'>-	if (enable)</div><div class='del'>-		val = CCCR_INIT | CCCR_CCE;</div><div class='add'>+	/* The chip should be in standby mode when changing the CCCR register,</div><div class='add'>+	 * and some chips set the CSR and CSA bits when in standby. Furthermore,</div><div class='add'>+	 * the CSR and CSA bits should be written as zeros, even when they read</div><div class='add'>+	 * ones.</div><div class='add'>+	 */</div><div class='add'>+	val_after &amp;= ~(CCCR_CSR | CCCR_CSA);</div><div class='ctx'> </div><div class='del'>-	while ((m_can_read(priv, M_CAN_CCCR) &amp; (CCCR_INIT | CCCR_CCE)) != val) {</div><div class='del'>-		if (timeout == 0) {</div><div class='del'>-			netdev_warn(priv-&gt;dev, "Failed to init module\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		timeout--;</div><div class='del'>-		udelay(1);</div><div class='add'>+	while (tries--) {</div><div class='add'>+		u32 val_read;</div><div class='add'>+</div><div class='add'>+		/* Write the desired value in each try, as setting some bits in</div><div class='add'>+		 * the CCCR register require other bits to be set first. E.g.</div><div class='add'>+		 * setting the NISO bit requires setting the CCE bit first.</div><div class='add'>+		 */</div><div class='add'>+		m_can_write(cdev, M_CAN_CCCR, val_after);</div><div class='add'>+</div><div class='add'>+		val_read = m_can_read(cdev, M_CAN_CCCR) &amp; ~(CCCR_CSR | CCCR_CSA);</div><div class='add'>+</div><div class='add'>+		if (val_read == val_after)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		usleep_range(1, 5);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_config_enable(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* CCCR_INIT must be set in order to set CCCR_CCE, but access to</div><div class='add'>+	 * configuration registers should only be enabled when in standby mode,</div><div class='add'>+	 * where CCCR_INIT is always set.</div><div class='add'>+	 */</div><div class='add'>+	err = m_can_cccr_update_bits(cdev, CCCR_CCE, CCCR_CCE);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(cdev-&gt;net, "failed to enable configuration mode\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_config_disable(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Only clear CCCR_CCE, since CCCR_INIT cannot be cleared while in</div><div class='add'>+	 * standby mode</div><div class='add'>+	 */</div><div class='add'>+	err = m_can_cccr_update_bits(cdev, CCCR_CCE, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(cdev-&gt;net, "failed to disable configuration registers\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_interrupt_enable(struct m_can_classdev *cdev, u32 interrupts)</div><div class='add'>+{</div><div class='add'>+	if (cdev-&gt;active_interrupts == interrupts)</div><div class='add'>+		return;</div><div class='add'>+	m_can_write(cdev, M_CAN_IE, interrupts);</div><div class='add'>+	cdev-&gt;active_interrupts = interrupts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_coalescing_disable(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	u32 new_interrupts = cdev-&gt;active_interrupts | IR_RF0N | IR_TEFN;</div><div class='add'>+</div><div class='add'>+	if (!cdev-&gt;net-&gt;irq)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hrtimer_cancel(&amp;cdev-&gt;hrtimer);</div><div class='add'>+	m_can_interrupt_enable(cdev, new_interrupts);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void m_can_enable_all_interrupts(const struct m_can_priv *priv)</div><div class='add'>+static inline void m_can_enable_all_interrupts(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='add'>+	if (!cdev-&gt;net-&gt;irq) {</div><div class='add'>+		netdev_dbg(cdev-&gt;net, "Start hrtimer\n");</div><div class='add'>+		hrtimer_start(&amp;cdev-&gt;hrtimer,</div><div class='add'>+			      ms_to_ktime(HRTIMER_POLL_INTERVAL_MS),</div><div class='add'>+			      HRTIMER_MODE_REL_PINNED);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Only interrupt line 0 is used in this driver */</div><div class='del'>-	m_can_write(priv, M_CAN_ILE, ILE_EINT0);</div><div class='add'>+	m_can_write(cdev, M_CAN_ILE, ILE_EINT0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void m_can_disable_all_interrupts(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	m_can_coalescing_disable(cdev);</div><div class='add'>+	m_can_write(cdev, M_CAN_ILE, 0x0);</div><div class='add'>+</div><div class='add'>+	if (!cdev-&gt;net-&gt;irq) {</div><div class='add'>+		netdev_dbg(cdev-&gt;net, "Stop hrtimer\n");</div><div class='add'>+		hrtimer_try_to_cancel(&amp;cdev-&gt;hrtimer);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Retrieve internal timestamp counter from TSCV.TSC, and shift it to 32-bit</div><div class='add'>+ * width.</div><div class='add'>+ */</div><div class='add'>+static u32 m_can_get_timestamp(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	u32 tscv;</div><div class='add'>+	u32 tsc;</div><div class='add'>+</div><div class='add'>+	tscv = m_can_read(cdev, M_CAN_TSCV);</div><div class='add'>+	tsc = FIELD_GET(TSCV_TSC_MASK, tscv);</div><div class='add'>+</div><div class='add'>+	return (tsc &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_clean(struct net_device *net)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(net);</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;tx_ops) {</div><div class='add'>+		for (int i = 0; i != cdev-&gt;tx_fifo_size; ++i) {</div><div class='add'>+			if (!cdev-&gt;tx_ops[i].skb)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			net-&gt;stats.tx_errors++;</div><div class='add'>+			cdev-&gt;tx_ops[i].skb = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i != cdev-&gt;can.echo_skb_max; ++i)</div><div class='add'>+		can_free_echo_skb(cdev-&gt;net, i, NULL);</div><div class='add'>+</div><div class='add'>+	netdev_reset_queue(cdev-&gt;net);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='add'>+	cdev-&gt;tx_fifo_in_flight = 0;</div><div class='add'>+	spin_unlock_irqrestore(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void m_can_disable_all_interrupts(const struct m_can_priv *priv)</div><div class='add'>+/* For peripherals, pass skb to rx-offload, which will push skb from</div><div class='add'>+ * napi. For non-peripherals, RX is done in napi already, so push</div><div class='add'>+ * directly. timestamp is used to ensure good skb ordering in</div><div class='add'>+ * rx-offload and is ignored for non-peripherals.</div><div class='add'>+ */</div><div class='add'>+static void m_can_receive_skb(struct m_can_classdev *cdev,</div><div class='add'>+			      struct sk_buff *skb,</div><div class='add'>+			      u32 timestamp)</div><div class='ctx'> {</div><div class='del'>-	m_can_write(priv, M_CAN_ILE, 0x0);</div><div class='add'>+	if (cdev-&gt;is_peripheral) {</div><div class='add'>+		struct net_device_stats *stats = &amp;cdev-&gt;net-&gt;stats;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = can_rx_offload_queue_timestamp(&amp;cdev-&gt;offload, skb,</div><div class='add'>+						     timestamp);</div><div class='add'>+		if (err)</div><div class='add'>+			stats-&gt;rx_fifo_errors++;</div><div class='add'>+	} else {</div><div class='add'>+		netif_receive_skb(skb);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void m_can_read_fifo(struct net_device *dev, u32 rxfs)</div><div class='add'>+static int m_can_read_fifo(struct net_device *dev, u32 fgi)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	struct canfd_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	u32 id, fgi, dlc;</div><div class='del'>-	int i;</div><div class='add'>+	struct id_and_dlc fifo_header;</div><div class='add'>+	u32 timestamp = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* calculate the fifo get index for where to read data */</div><div class='del'>-	fgi = (rxfs &amp; RXFS_FGI_MASK) &gt;&gt; RXFS_FGI_SHIFT;</div><div class='del'>-	dlc = m_can_fifo_read(priv, fgi, M_CAN_FIFO_DLC);</div><div class='del'>-	if (dlc &amp; RX_BUF_FDF)</div><div class='add'>+	err = m_can_fifo_read(cdev, fgi, M_CAN_FIFO_ID, &amp;fifo_header, 2);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_fail;</div><div class='add'>+</div><div class='add'>+	if (fifo_header.dlc &amp; RX_BUF_FDF)</div><div class='ctx'> 		skb = alloc_canfd_skb(dev, &amp;cf);</div><div class='ctx'> 	else</div><div class='ctx'> 		skb = alloc_can_skb(dev, (struct can_frame **)&amp;cf);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		stats-&gt;rx_dropped++;</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dlc &amp; RX_BUF_FDF)</div><div class='del'>-		cf-&gt;len = can_dlc2len((dlc &gt;&gt; 16) &amp; 0x0F);</div><div class='add'>+	if (fifo_header.dlc &amp; RX_BUF_FDF)</div><div class='add'>+		cf-&gt;len = can_fd_dlc2len((fifo_header.dlc &gt;&gt; 16) &amp; 0x0F);</div><div class='ctx'> 	else</div><div class='del'>-		cf-&gt;len = get_can_dlc((dlc &gt;&gt; 16) &amp; 0x0F);</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len((fifo_header.dlc &gt;&gt; 16) &amp; 0x0F);</div><div class='ctx'> </div><div class='del'>-	id = m_can_fifo_read(priv, fgi, M_CAN_FIFO_ID);</div><div class='del'>-	if (id &amp; RX_BUF_XTD)</div><div class='del'>-		cf-&gt;can_id = (id &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='add'>+	if (fifo_header.id &amp; RX_BUF_XTD)</div><div class='add'>+		cf-&gt;can_id = (fifo_header.id &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='ctx'> 	else</div><div class='del'>-		cf-&gt;can_id = (id &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='add'>+		cf-&gt;can_id = (fifo_header.id &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='ctx'> </div><div class='del'>-	if (id &amp; RX_BUF_ESI) {</div><div class='add'>+	if (fifo_header.id &amp; RX_BUF_ESI) {</div><div class='ctx'> 		cf-&gt;flags |= CANFD_ESI;</div><div class='ctx'> 		netdev_dbg(dev, "ESI Error\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(dlc &amp; RX_BUF_FDF) &amp;&amp; (id &amp; RX_BUF_RTR)) {</div><div class='add'>+	if (!(fifo_header.dlc &amp; RX_BUF_FDF) &amp;&amp; (fifo_header.id &amp; RX_BUF_RTR)) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (dlc &amp; RX_BUF_BRS)</div><div class='add'>+		if (fifo_header.dlc &amp; RX_BUF_BRS)</div><div class='ctx'> 			cf-&gt;flags |= CANFD_BRS;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; cf-&gt;len; i += 4)</div><div class='del'>-			*(u32 *)(cf-&gt;data + i) =</div><div class='del'>-				m_can_fifo_read(priv, fgi,</div><div class='del'>-						M_CAN_FIFO_DATA(i / 4));</div><div class='add'>+		err = m_can_fifo_read(cdev, fgi, M_CAN_FIFO_DATA,</div><div class='add'>+				      cf-&gt;data, DIV_ROUND_UP(cf-&gt;len, 4));</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_skb;</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	}</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='ctx'> </div><div class='del'>-	/* acknowledge rx fifo 0 */</div><div class='del'>-	m_can_write(priv, M_CAN_RXF0A, fgi);</div><div class='add'>+	timestamp = FIELD_GET(RX_BUF_RXTS_MASK, fifo_header.dlc) &lt;&lt; 16;</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	m_can_receive_skb(cdev, skb, timestamp);</div><div class='ctx'> </div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+out_fail:</div><div class='add'>+	netdev_err(dev, "FIFO read returned %d\n", err);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m_can_do_rx_poll(struct net_device *dev, int quota)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	u32 pkts = 0;</div><div class='ctx'> 	u32 rxfs;</div><div class='add'>+	u32 rx_count;</div><div class='add'>+	u32 fgi;</div><div class='add'>+	int ack_fgi = -1;</div><div class='add'>+	int i;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	rxfs = m_can_read(priv, M_CAN_RXF0S);</div><div class='add'>+	rxfs = m_can_read(cdev, M_CAN_RXF0S);</div><div class='ctx'> 	if (!(rxfs &amp; RXFS_FFL_MASK)) {</div><div class='ctx'> 		netdev_dbg(dev, "no messages in fifo0\n");</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	while ((rxfs &amp; RXFS_FFL_MASK) &amp;&amp; (quota &gt; 0)) {</div><div class='del'>-		if (rxfs &amp; RXFS_RFL)</div><div class='del'>-			netdev_warn(dev, "Rx FIFO 0 Message Lost\n");</div><div class='add'>+	rx_count = FIELD_GET(RXFS_FFL_MASK, rxfs);</div><div class='add'>+	fgi = FIELD_GET(RXFS_FGI_MASK, rxfs);</div><div class='ctx'> </div><div class='del'>-		m_can_read_fifo(dev, rxfs);</div><div class='add'>+	for (i = 0; i &lt; rx_count &amp;&amp; quota &gt; 0; ++i) {</div><div class='add'>+		err = m_can_read_fifo(dev, fgi);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		quota--;</div><div class='ctx'> 		pkts++;</div><div class='del'>-		rxfs = m_can_read(priv, M_CAN_RXF0S);</div><div class='add'>+		ack_fgi = fgi;</div><div class='add'>+		fgi = (++fgi &gt;= cdev-&gt;mcfg[MRAM_RXF0].num ? 0 : fgi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pkts)</div><div class='del'>-		can_led_event(dev, CAN_LED_EVENT_RX);</div><div class='add'>+	if (ack_fgi != -1)</div><div class='add'>+		m_can_write(cdev, M_CAN_RXF0A, ack_fgi);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	return pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m_can_handle_lost_msg(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_frame *frame;</div><div class='add'>+	u32 timestamp = 0;</div><div class='ctx'> </div><div class='del'>-	netdev_err(dev, "msg lost in rxf0\n");</div><div class='add'>+	netdev_dbg(dev, "msg lost in rxf0\n");</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;rx_errors++;</div><div class='ctx'> 	stats-&gt;rx_over_errors++;</div><div class='hunk'>@@ -554,7 +678,10 @@ static int m_can_handle_lost_msg(struct net_device *dev)</div><div class='ctx'> 	frame-&gt;can_id |= CAN_ERR_CRTL;</div><div class='ctx'> 	frame-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> </div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		timestamp = m_can_get_timestamp(cdev);</div><div class='add'>+</div><div class='add'>+	m_can_receive_skb(cdev, skb, timestamp);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -562,56 +689,71 @@ static int m_can_handle_lost_msg(struct net_device *dev)</div><div class='ctx'> static int m_can_handle_lec_err(struct net_device *dev,</div><div class='ctx'> 				enum m_can_lec_type lec_type)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp = 0;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='add'>+	cdev-&gt;can.can_stats.bus_error++;</div><div class='ctx'> </div><div class='ctx'> 	/* propagate the error condition to the CAN stack */</div><div class='ctx'> 	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='del'>-	if (unlikely(!skb))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* check for 'last error code' which tells us the</div><div class='ctx'> 	 * type of the last error to occur on the CAN bus</div><div class='ctx'> 	 */</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+	if (likely(skb))</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='ctx'> 	switch (lec_type) {</div><div class='ctx'> 	case LEC_STUFF_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "stuff error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_FORM_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "form error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_ACK_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "ack error\n");</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_BIT1_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "bit1 error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_BIT0_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "bit0 error\n");</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case LEC_CRC_ERROR:</div><div class='ctx'> 		netdev_dbg(dev, "CRC error\n");</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (likely(skb))</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		timestamp = m_can_get_timestamp(cdev);</div><div class='add'>+</div><div class='add'>+	m_can_receive_skb(cdev, skb, timestamp);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -619,47 +761,47 @@ static int m_can_handle_lec_err(struct net_device *dev,</div><div class='ctx'> static int __m_can_get_berr_counter(const struct net_device *dev,</div><div class='ctx'> 				    struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	unsigned int ecr;</div><div class='ctx'> </div><div class='del'>-	ecr = m_can_read(priv, M_CAN_ECR);</div><div class='del'>-	bec-&gt;rxerr = (ecr &amp; ECR_REC_MASK) &gt;&gt; ECR_REC_SHIFT;</div><div class='del'>-	bec-&gt;txerr = (ecr &amp; ECR_TEC_MASK) &gt;&gt; ECR_TEC_SHIFT;</div><div class='add'>+	ecr = m_can_read(cdev, M_CAN_ECR);</div><div class='add'>+	bec-&gt;rxerr = FIELD_GET(ECR_REC_MASK, ecr);</div><div class='add'>+	bec-&gt;txerr = FIELD_GET(ECR_TEC_MASK, ecr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int m_can_clk_start(struct m_can_priv *priv)</div><div class='add'>+static int m_can_clk_start(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = pm_runtime_get_sync(priv-&gt;device);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		pm_runtime_put_noidle(priv-&gt;device);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (cdev-&gt;pm_clock_support == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return pm_runtime_resume_and_get(cdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void m_can_clk_stop(struct m_can_priv *priv)</div><div class='add'>+static void m_can_clk_stop(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='del'>-	pm_runtime_put_sync(priv-&gt;device);</div><div class='add'>+	if (cdev-&gt;pm_clock_support)</div><div class='add'>+		pm_runtime_put_sync(cdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m_can_get_berr_counter(const struct net_device *dev,</div><div class='ctx'> 				  struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = m_can_clk_start(priv);</div><div class='add'>+	/* Avoid waking up the controller if the interface is down */</div><div class='add'>+	if (!(dev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = m_can_clk_start(cdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	__m_can_get_berr_counter(dev, bec);</div><div class='ctx'> </div><div class='del'>-	m_can_clk_stop(priv);</div><div class='add'>+	m_can_clk_stop(cdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -667,29 +809,32 @@ static int m_can_get_berr_counter(const struct net_device *dev,</div><div class='ctx'> static int m_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> 				     enum can_state new_state)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='ctx'> 	unsigned int ecr;</div><div class='add'>+	u32 timestamp = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (new_state) {</div><div class='ctx'> 	case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		cdev-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		break;</div><div class='add'>+	case CAN_STATE_ERROR_WARNING:</div><div class='ctx'> 		/* error warning state */</div><div class='del'>-		priv-&gt;can.can_stats.error_warning++;</div><div class='del'>-		priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+		cdev-&gt;can.can_stats.error_warning++;</div><div class='add'>+		cdev-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CAN_STATE_ERROR_PASSIVE:</div><div class='ctx'> 		/* error passive state */</div><div class='del'>-		priv-&gt;can.can_stats.error_passive++;</div><div class='del'>-		priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+		cdev-&gt;can.can_stats.error_passive++;</div><div class='add'>+		cdev-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CAN_STATE_BUS_OFF:</div><div class='ctx'> 		/* bus-off state */</div><div class='del'>-		priv-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='del'>-		m_can_disable_all_interrupts(priv);</div><div class='del'>-		priv-&gt;can.can_stats.bus_off++;</div><div class='add'>+		cdev-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='add'>+		m_can_disable_all_interrupts(cdev);</div><div class='add'>+		cdev-&gt;can.can_stats.bus_off++;</div><div class='ctx'> 		can_bus_off(dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -705,8 +850,14 @@ static int m_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (new_state) {</div><div class='ctx'> 	case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[1] = CAN_ERR_CRTL_ACTIVE;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+		break;</div><div class='add'>+	case CAN_STATE_ERROR_WARNING:</div><div class='ctx'> 		/* error warning state */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[1] = (bec.txerr &gt; bec.rxerr) ?</div><div class='ctx'> 			CAN_ERR_CRTL_TX_WARNING :</div><div class='ctx'> 			CAN_ERR_CRTL_RX_WARNING;</div><div class='hunk'>@@ -715,8 +866,8 @@ static int m_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CAN_STATE_ERROR_PASSIVE:</div><div class='ctx'> 		/* error passive state */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		ecr = m_can_read(priv, M_CAN_ECR);</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='add'>+		ecr = m_can_read(cdev, M_CAN_ECR);</div><div class='ctx'> 		if (ecr &amp; ECR_RP)</div><div class='ctx'> 			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_PASSIVE;</div><div class='ctx'> 		if (bec.txerr &gt; 127)</div><div class='hunk'>@@ -732,48 +883,47 @@ static int m_can_handle_state_change(struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		timestamp = m_can_get_timestamp(cdev);</div><div class='add'>+</div><div class='add'>+	m_can_receive_skb(cdev, skb, timestamp);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int m_can_handle_state_errors(struct net_device *dev, u32 psr)</div><div class='add'>+static enum can_state</div><div class='add'>+m_can_state_get_by_psr(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	int work_done = 0;</div><div class='add'>+	u32 reg_psr;</div><div class='ctx'> </div><div class='del'>-	if ((psr &amp; PSR_EW) &amp;&amp;</div><div class='del'>-	    (priv-&gt;can.state != CAN_STATE_ERROR_WARNING)) {</div><div class='del'>-		netdev_dbg(dev, "entered error warning state\n");</div><div class='del'>-		work_done += m_can_handle_state_change(dev,</div><div class='del'>-						       CAN_STATE_ERROR_WARNING);</div><div class='del'>-	}</div><div class='add'>+	reg_psr = m_can_read(cdev, M_CAN_PSR);</div><div class='ctx'> </div><div class='del'>-	if ((psr &amp; PSR_EP) &amp;&amp;</div><div class='del'>-	    (priv-&gt;can.state != CAN_STATE_ERROR_PASSIVE)) {</div><div class='del'>-		netdev_dbg(dev, "entered error passive state\n");</div><div class='del'>-		work_done += m_can_handle_state_change(dev,</div><div class='del'>-						       CAN_STATE_ERROR_PASSIVE);</div><div class='del'>-	}</div><div class='add'>+	if (reg_psr &amp; PSR_BO)</div><div class='add'>+		return CAN_STATE_BUS_OFF;</div><div class='add'>+	if (reg_psr &amp; PSR_EP)</div><div class='add'>+		return CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	if (reg_psr &amp; PSR_EW)</div><div class='add'>+		return CAN_STATE_ERROR_WARNING;</div><div class='ctx'> </div><div class='del'>-	if ((psr &amp; PSR_BO) &amp;&amp;</div><div class='del'>-	    (priv-&gt;can.state != CAN_STATE_BUS_OFF)) {</div><div class='del'>-		netdev_dbg(dev, "entered error bus off state\n");</div><div class='del'>-		work_done += m_can_handle_state_change(dev,</div><div class='del'>-						       CAN_STATE_BUS_OFF);</div><div class='del'>-	}</div><div class='add'>+	return CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return work_done;</div><div class='add'>+static int m_can_handle_state_errors(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	enum can_state new_state;</div><div class='add'>+</div><div class='add'>+	new_state = m_can_state_get_by_psr(cdev);</div><div class='add'>+	if (new_state == cdev-&gt;can.state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return m_can_handle_state_change(dev, new_state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus)</div><div class='ctx'> {</div><div class='ctx'> 	if (irqstatus &amp; IR_WDI)</div><div class='ctx'> 		netdev_err(dev, "Message RAM Watchdog event due to missing READY\n");</div><div class='del'>-	if (irqstatus &amp; IR_ELO)</div><div class='del'>-		netdev_err(dev, "Error Logging Overflow\n");</div><div class='ctx'> 	if (irqstatus &amp; IR_BEU)</div><div class='ctx'> 		netdev_err(dev, "Bit Error Uncorrected\n");</div><div class='ctx'> 	if (irqstatus &amp; IR_BEC)</div><div class='hunk'>@@ -784,26 +934,82 @@ static void m_can_handle_other_err(struct net_device *dev, u32 irqstatus)</div><div class='ctx'> 		netdev_err(dev, "Message RAM access failure occurred\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool is_lec_err(u32 psr)</div><div class='add'>+static inline bool is_lec_err(u8 lec)</div><div class='add'>+{</div><div class='add'>+	return lec != LEC_NO_ERROR &amp;&amp; lec != LEC_NO_CHANGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool m_can_is_protocol_err(u32 irqstatus)</div><div class='add'>+{</div><div class='add'>+	return irqstatus &amp; IR_ERR_LEC_31X;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_handle_protocol_error(struct net_device *dev, u32 irqstatus)</div><div class='ctx'> {</div><div class='del'>-	psr &amp;= LEC_UNUSED;</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp = 0;</div><div class='add'>+</div><div class='add'>+	/* propagate the error condition to the CAN stack */</div><div class='add'>+	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	/* update tx error stats since there is protocol error */</div><div class='add'>+	stats-&gt;tx_errors++;</div><div class='add'>+</div><div class='add'>+	/* update arbitration lost status */</div><div class='add'>+	if (cdev-&gt;version &gt;= 31 &amp;&amp; (irqstatus &amp; IR_PEA)) {</div><div class='add'>+		netdev_dbg(dev, "Protocol error in Arbitration fail\n");</div><div class='add'>+		cdev-&gt;can.can_stats.arbitration_lost++;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='add'>+			cf-&gt;data[0] |= CAN_ERR_LOSTARB_UNSPEC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return psr &amp;&amp; (psr != LEC_UNUSED);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		netdev_dbg(dev, "allocation of skb failed\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		timestamp = m_can_get_timestamp(cdev);</div><div class='add'>+</div><div class='add'>+	m_can_receive_skb(cdev, skb, timestamp);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,</div><div class='ctx'> 				   u32 psr)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (irqstatus &amp; IR_RF0L)</div><div class='ctx'> 		work_done += m_can_handle_lost_msg(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* handle lec errors on the bus */</div><div class='del'>-	if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) &amp;&amp;</div><div class='del'>-	    is_lec_err(psr))</div><div class='del'>-		work_done += m_can_handle_lec_err(dev, psr &amp; LEC_UNUSED);</div><div class='add'>+	if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='add'>+		u8 lec = FIELD_GET(PSR_LEC_MASK, psr);</div><div class='add'>+		u8 dlec = FIELD_GET(PSR_DLEC_MASK, psr);</div><div class='add'>+</div><div class='add'>+		if (is_lec_err(lec)) {</div><div class='add'>+			netdev_dbg(dev, "Arbitration phase error detected\n");</div><div class='add'>+			work_done += m_can_handle_lec_err(dev, lec);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_lec_err(dlec)) {</div><div class='add'>+			netdev_dbg(dev, "Data phase error detected\n");</div><div class='add'>+			work_done += m_can_handle_lec_err(dev, dlec);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* handle protocol errors in arbitration phase */</div><div class='add'>+	if ((cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) &amp;&amp;</div><div class='add'>+	    m_can_is_protocol_err(irqstatus))</div><div class='add'>+		work_done += m_can_handle_protocol_error(dev, irqstatus);</div><div class='ctx'> </div><div class='ctx'> 	/* other unproccessed error interrupts */</div><div class='ctx'> 	m_can_handle_other_err(dev, irqstatus);</div><div class='hunk'>@@ -811,122 +1017,325 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus,</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int m_can_poll(struct napi_struct *napi, int quota)</div><div class='add'>+static int m_can_rx_handler(struct net_device *dev, int quota, u32 irqstatus)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = napi-&gt;dev;</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	int rx_work_or_err;</div><div class='ctx'> 	int work_done = 0;</div><div class='del'>-	u32 irqstatus, psr;</div><div class='ctx'> </div><div class='del'>-	irqstatus = priv-&gt;irqstatus | m_can_read(priv, M_CAN_IR);</div><div class='ctx'> 	if (!irqstatus)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	psr = m_can_read(priv, M_CAN_PSR);</div><div class='add'>+	/* Errata workaround for issue "Needless activation of MRAF irq"</div><div class='add'>+	 * During frame reception while the MCAN is in Error Passive state</div><div class='add'>+	 * and the Receive Error Counter has the value MCAN_ECR.REC = 127,</div><div class='add'>+	 * it may happen that MCAN_IR.MRAF is set although there was no</div><div class='add'>+	 * Message RAM access failure.</div><div class='add'>+	 * If MCAN_IR.MRAF is enabled, an interrupt to the Host CPU is generated</div><div class='add'>+	 * The Message RAM Access Failure interrupt routine needs to check</div><div class='add'>+	 * whether MCAN_ECR.RP = ’1’ and MCAN_ECR.REC = 127.</div><div class='add'>+	 * In this case, reset MCAN_IR.MRAF. No further action is required.</div><div class='add'>+	 */</div><div class='add'>+	if (cdev-&gt;version &lt;= 31 &amp;&amp; irqstatus &amp; IR_MRAF &amp;&amp;</div><div class='add'>+	    m_can_read(cdev, M_CAN_ECR) &amp; ECR_RP) {</div><div class='add'>+		struct can_berr_counter bec;</div><div class='add'>+</div><div class='add'>+		__m_can_get_berr_counter(dev, &amp;bec);</div><div class='add'>+		if (bec.rxerr == 127) {</div><div class='add'>+			m_can_write(cdev, M_CAN_IR, IR_MRAF);</div><div class='add'>+			irqstatus &amp;= ~IR_MRAF;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (irqstatus &amp; IR_ERR_STATE)</div><div class='del'>-		work_done += m_can_handle_state_errors(dev, psr);</div><div class='add'>+		work_done += m_can_handle_state_errors(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (irqstatus &amp; IR_ERR_BUS_30X)</div><div class='del'>-		work_done += m_can_handle_bus_errors(dev, irqstatus, psr);</div><div class='add'>+		work_done += m_can_handle_bus_errors(dev, irqstatus,</div><div class='add'>+						     m_can_read(cdev, M_CAN_PSR));</div><div class='add'>+</div><div class='add'>+	if (irqstatus &amp; IR_RF0N) {</div><div class='add'>+		rx_work_or_err = m_can_do_rx_poll(dev, (quota - work_done));</div><div class='add'>+		if (rx_work_or_err &lt; 0)</div><div class='add'>+			return rx_work_or_err;</div><div class='add'>+</div><div class='add'>+		work_done += rx_work_or_err;</div><div class='add'>+	}</div><div class='add'>+end:</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_poll(struct napi_struct *napi, int quota)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = napi-&gt;dev;</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	int work_done;</div><div class='add'>+	u32 irqstatus;</div><div class='add'>+</div><div class='add'>+	irqstatus = cdev-&gt;irqstatus | m_can_read(cdev, M_CAN_IR);</div><div class='ctx'> </div><div class='del'>-	if (irqstatus &amp; IR_RF0N)</div><div class='del'>-		work_done += m_can_do_rx_poll(dev, (quota - work_done));</div><div class='add'>+	work_done = m_can_rx_handler(dev, quota, irqstatus);</div><div class='ctx'> </div><div class='del'>-	if (work_done &lt; quota) {</div><div class='add'>+	/* Don't re-enable interrupts if the driver had a fatal error</div><div class='add'>+	 * (e.g., FIFO read failure).</div><div class='add'>+	 */</div><div class='add'>+	if (work_done &gt;= 0 &amp;&amp; work_done &lt; quota) {</div><div class='ctx'> 		napi_complete_done(napi, work_done);</div><div class='del'>-		m_can_enable_all_interrupts(priv);</div><div class='add'>+		m_can_enable_all_interrupts(cdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-end:</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void m_can_echo_tx_event(struct net_device *dev)</div><div class='add'>+/* Echo tx skb and update net stats. Peripherals use rx-offload for</div><div class='add'>+ * echo. timestamp is used for peripherals to ensure correct ordering</div><div class='add'>+ * by rx-offload, and is ignored for non-peripherals.</div><div class='add'>+ */</div><div class='add'>+static unsigned int m_can_tx_update_stats(struct m_can_classdev *cdev,</div><div class='add'>+					  unsigned int msg_mark, u32 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = cdev-&gt;net;</div><div class='add'>+	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		stats-&gt;tx_bytes +=</div><div class='add'>+			can_rx_offload_get_echo_skb_queue_timestamp(&amp;cdev-&gt;offload,</div><div class='add'>+								    msg_mark,</div><div class='add'>+								    timestamp,</div><div class='add'>+								    &amp;frame_len);</div><div class='add'>+	else</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(dev, msg_mark, &amp;frame_len);</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+</div><div class='add'>+	return frame_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_finish_tx(struct m_can_classdev *cdev, int transmitted,</div><div class='add'>+			    unsigned int transmitted_frame_len)</div><div class='add'>+{</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(cdev-&gt;net, transmitted, transmitted_frame_len);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='add'>+	if (cdev-&gt;tx_fifo_in_flight &gt;= cdev-&gt;tx_fifo_size &amp;&amp; transmitted &gt; 0)</div><div class='add'>+		netif_wake_queue(cdev-&gt;net);</div><div class='add'>+	cdev-&gt;tx_fifo_in_flight -= transmitted;</div><div class='add'>+	spin_unlock_irqrestore(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t m_can_start_tx(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int tx_fifo_in_flight;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='add'>+	tx_fifo_in_flight = cdev-&gt;tx_fifo_in_flight + 1;</div><div class='add'>+	if (tx_fifo_in_flight &gt;= cdev-&gt;tx_fifo_size) {</div><div class='add'>+		netif_stop_queue(cdev-&gt;net);</div><div class='add'>+		if (tx_fifo_in_flight &gt; cdev-&gt;tx_fifo_size) {</div><div class='add'>+			netdev_err_once(cdev-&gt;net, "hard_xmit called while TX FIFO full\n");</div><div class='add'>+			spin_unlock_irqrestore(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='add'>+			return NETDEV_TX_BUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cdev-&gt;tx_fifo_in_flight = tx_fifo_in_flight;</div><div class='add'>+	spin_unlock_irqrestore(&amp;cdev-&gt;tx_handling_spinlock, irqflags);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_echo_tx_event(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 txe_count = 0;</div><div class='ctx'> 	u32 m_can_txefs;</div><div class='ctx'> 	u32 fgi = 0;</div><div class='add'>+	int ack_fgi = -1;</div><div class='ctx'> 	int i = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	unsigned int msg_mark;</div><div class='add'>+	int processed = 0;</div><div class='add'>+	unsigned int processed_frame_len = 0;</div><div class='ctx'> </div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* read tx event fifo status */</div><div class='del'>-	m_can_txefs = m_can_read(priv, M_CAN_TXEFS);</div><div class='add'>+	m_can_txefs = m_can_read(cdev, M_CAN_TXEFS);</div><div class='ctx'> </div><div class='ctx'> 	/* Get Tx Event fifo element count */</div><div class='del'>-	txe_count = (m_can_txefs &amp; TXEFS_EFFL_MASK)</div><div class='del'>-			&gt;&gt; TXEFS_EFFL_SHIFT;</div><div class='add'>+	txe_count = FIELD_GET(TXEFS_EFFL_MASK, m_can_txefs);</div><div class='add'>+	fgi = FIELD_GET(TXEFS_EFGI_MASK, m_can_txefs);</div><div class='ctx'> </div><div class='ctx'> 	/* Get and process all sent elements */</div><div class='ctx'> 	for (i = 0; i &lt; txe_count; i++) {</div><div class='del'>-		/* retrieve get index */</div><div class='del'>-		fgi = (m_can_read(priv, M_CAN_TXEFS) &amp; TXEFS_EFGI_MASK)</div><div class='del'>-			&gt;&gt; TXEFS_EFGI_SHIFT;</div><div class='add'>+		u32 txe, timestamp = 0;</div><div class='add'>+</div><div class='add'>+		/* get message marker, timestamp */</div><div class='add'>+		err = m_can_txe_fifo_read(cdev, fgi, 4, &amp;txe);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(dev, "TXE FIFO read returned %d\n", err);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/* get message marker */</div><div class='del'>-		msg_mark = (m_can_txe_fifo_read(priv, fgi, 4) &amp;</div><div class='del'>-			    TX_EVENT_MM_MASK) &gt;&gt; TX_EVENT_MM_SHIFT;</div><div class='add'>+		msg_mark = FIELD_GET(TX_EVENT_MM_MASK, txe);</div><div class='add'>+		timestamp = FIELD_GET(TX_EVENT_TXTS_MASK, txe) &lt;&lt; 16;</div><div class='ctx'> </div><div class='del'>-		/* ack txe element */</div><div class='del'>-		m_can_write(priv, M_CAN_TXEFA, (TXEFA_EFAI_MASK &amp;</div><div class='del'>-						(fgi &lt;&lt; TXEFA_EFAI_SHIFT)));</div><div class='add'>+		ack_fgi = fgi;</div><div class='add'>+		fgi = (++fgi &gt;= cdev-&gt;mcfg[MRAM_TXE].num ? 0 : fgi);</div><div class='ctx'> </div><div class='ctx'> 		/* update stats */</div><div class='del'>-		stats-&gt;tx_bytes += can_get_echo_skb(dev, msg_mark);</div><div class='del'>-		stats-&gt;tx_packets++;</div><div class='add'>+		processed_frame_len += m_can_tx_update_stats(cdev, msg_mark,</div><div class='add'>+							     timestamp);</div><div class='add'>+</div><div class='add'>+		++processed;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (ack_fgi != -1)</div><div class='add'>+		m_can_write(cdev, M_CAN_TXEFA, FIELD_PREP(TXEFA_EFAI_MASK,</div><div class='add'>+							  ack_fgi));</div><div class='add'>+</div><div class='add'>+	m_can_finish_tx(cdev, processed, processed_frame_len);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t m_can_isr(int irq, void *dev_id)</div><div class='add'>+static void m_can_coalescing_update(struct m_can_classdev *cdev, u32 ir)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *)dev_id;</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	u32 ir;</div><div class='add'>+	u32 new_interrupts = cdev-&gt;active_interrupts;</div><div class='add'>+	bool enable_rx_timer = false;</div><div class='add'>+	bool enable_tx_timer = false;</div><div class='add'>+</div><div class='add'>+	if (!cdev-&gt;net-&gt;irq)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;rx_coalesce_usecs_irq &gt; 0 &amp;&amp; (ir &amp; (IR_RF0N | IR_RF0W))) {</div><div class='add'>+		enable_rx_timer = true;</div><div class='add'>+		new_interrupts &amp;= ~IR_RF0N;</div><div class='add'>+	}</div><div class='add'>+	if (cdev-&gt;tx_coalesce_usecs_irq &gt; 0 &amp;&amp; (ir &amp; (IR_TEFN | IR_TEFW))) {</div><div class='add'>+		enable_tx_timer = true;</div><div class='add'>+		new_interrupts &amp;= ~IR_TEFN;</div><div class='add'>+	}</div><div class='add'>+	if (!enable_rx_timer &amp;&amp; !hrtimer_active(&amp;cdev-&gt;hrtimer))</div><div class='add'>+		new_interrupts |= IR_RF0N;</div><div class='add'>+	if (!enable_tx_timer &amp;&amp; !hrtimer_active(&amp;cdev-&gt;hrtimer))</div><div class='add'>+		new_interrupts |= IR_TEFN;</div><div class='add'>+</div><div class='add'>+	m_can_interrupt_enable(cdev, new_interrupts);</div><div class='add'>+	if (enable_rx_timer | enable_tx_timer)</div><div class='add'>+		hrtimer_start(&amp;cdev-&gt;hrtimer, cdev-&gt;irq_timer_wait,</div><div class='add'>+			      HRTIMER_MODE_REL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ir = m_can_read(priv, M_CAN_IR);</div><div class='add'>+/* This interrupt handler is called either from the interrupt thread or a</div><div class='add'>+ * hrtimer. This has implications like cancelling a timer won't be possible</div><div class='add'>+ * blocking.</div><div class='add'>+ */</div><div class='add'>+static int m_can_interrupt_handler(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = cdev-&gt;net;</div><div class='add'>+	u32 ir = 0, ir_read;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (pm_runtime_suspended(cdev-&gt;dev))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* The m_can controller signals its interrupt status as a level, but</div><div class='add'>+	 * depending in the integration the CPU may interpret the signal as</div><div class='add'>+	 * edge-triggered (for example with m_can_pci). For these</div><div class='add'>+	 * edge-triggered integrations, we must observe that IR is 0 at least</div><div class='add'>+	 * once to be sure that the next interrupt will generate an edge.</div><div class='add'>+	 */</div><div class='add'>+	while ((ir_read = m_can_read(cdev, M_CAN_IR)) != 0) {</div><div class='add'>+		ir |= ir_read;</div><div class='add'>+</div><div class='add'>+		/* ACK all irqs */</div><div class='add'>+		m_can_write(cdev, M_CAN_IR, ir);</div><div class='add'>+</div><div class='add'>+		if (!cdev-&gt;irq_edge_triggered)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	m_can_coalescing_update(cdev, ir);</div><div class='ctx'> 	if (!ir)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	/* ACK all irqs */</div><div class='del'>-	if (ir &amp; IR_ALL_INT)</div><div class='del'>-		m_can_write(priv, M_CAN_IR, ir);</div><div class='add'>+	if (cdev-&gt;ops-&gt;clear_interrupts)</div><div class='add'>+		cdev-&gt;ops-&gt;clear_interrupts(cdev);</div><div class='ctx'> </div><div class='ctx'> 	/* schedule NAPI in case of</div><div class='ctx'> 	 * - rx IRQ</div><div class='ctx'> 	 * - state change IRQ</div><div class='ctx'> 	 * - bus error IRQ and bus error reporting</div><div class='ctx'> 	 */</div><div class='del'>-	if ((ir &amp; IR_RF0N) || (ir &amp; IR_ERR_ALL_30X)) {</div><div class='del'>-		priv-&gt;irqstatus = ir;</div><div class='del'>-		m_can_disable_all_interrupts(priv);</div><div class='del'>-		napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+	if (ir &amp; (IR_RF0N | IR_RF0W | IR_ERR_ALL_30X)) {</div><div class='add'>+		cdev-&gt;irqstatus = ir;</div><div class='add'>+		if (!cdev-&gt;is_peripheral) {</div><div class='add'>+			m_can_disable_all_interrupts(cdev);</div><div class='add'>+			napi_schedule(&amp;cdev-&gt;napi);</div><div class='add'>+		} else {</div><div class='add'>+			ret = m_can_rx_handler(dev, NAPI_POLL_WEIGHT, ir);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;version == 30) {</div><div class='add'>+	if (cdev-&gt;version == 30) {</div><div class='ctx'> 		if (ir &amp; IR_TC) {</div><div class='ctx'> 			/* Transmission Complete Interrupt*/</div><div class='del'>-			stats-&gt;tx_bytes += can_get_echo_skb(dev, 0);</div><div class='del'>-			stats-&gt;tx_packets++;</div><div class='del'>-			can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='del'>-			netif_wake_queue(dev);</div><div class='add'>+			u32 timestamp = 0;</div><div class='add'>+			unsigned int frame_len;</div><div class='add'>+</div><div class='add'>+			if (cdev-&gt;is_peripheral)</div><div class='add'>+				timestamp = m_can_get_timestamp(cdev);</div><div class='add'>+			frame_len = m_can_tx_update_stats(cdev, 0, timestamp);</div><div class='add'>+			m_can_finish_tx(cdev, 1, frame_len);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else  {</div><div class='del'>-		if (ir &amp; IR_TEFN) {</div><div class='add'>+		if (ir &amp; (IR_TEFN | IR_TEFW)) {</div><div class='ctx'> 			/* New TX FIFO Element arrived */</div><div class='del'>-			m_can_echo_tx_event(dev);</div><div class='del'>-			can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='del'>-			if (netif_queue_stopped(dev) &amp;&amp;</div><div class='del'>-			    !m_can_tx_fifo_full(priv))</div><div class='del'>-				netif_wake_queue(dev);</div><div class='add'>+			ret = m_can_echo_tx_event(dev);</div><div class='add'>+			if (ret != 0)</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		can_rx_offload_threaded_irq_finish(&amp;cdev-&gt;offload);</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static irqreturn_t m_can_isr(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret =  m_can_interrupt_handler(cdev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		m_can_disable_all_interrupts(cdev);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart m_can_coalescing_timer(struct hrtimer *timer)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = container_of(timer, struct m_can_classdev, hrtimer);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;can.state == CAN_STATE_BUS_OFF ||</div><div class='add'>+	    cdev-&gt;can.state == CAN_STATE_STOPPED)</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	irq_wake_thread(cdev-&gt;net-&gt;irq, cdev-&gt;net);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct can_bittiming_const m_can_bittiming_const_30X = {</div><div class='ctx'> 	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.tseg1_min = 2,		/* Time segment 1 = prop_seg + phase_seg1 */</div><div class='hunk'>@@ -955,7 +1364,7 @@ static const struct can_bittiming_const m_can_bittiming_const_31X = {</div><div class='ctx'> 	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.tseg1_min = 2,		/* Time segment 1 = prop_seg + phase_seg1 */</div><div class='ctx'> 	.tseg1_max = 256,</div><div class='del'>-	.tseg2_min = 1,		/* Time segment 2 = phase_seg2 */</div><div class='add'>+	.tseg2_min = 2,		/* Time segment 2 = phase_seg2 */</div><div class='ctx'> 	.tseg2_max = 128,</div><div class='ctx'> 	.sjw_max = 128,</div><div class='ctx'> 	.brp_min = 1,</div><div class='hunk'>@@ -975,11 +1384,32 @@ static const struct can_bittiming_const m_can_data_bittiming_const_31X = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int m_can_init_ram(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	int end, i, start;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* initialize the entire Message RAM in use to avoid possible</div><div class='add'>+	 * ECC/parity checksum errors when reading an uninitialized buffer</div><div class='add'>+	 */</div><div class='add'>+	start = cdev-&gt;mcfg[MRAM_SIDF].off;</div><div class='add'>+	end = cdev-&gt;mcfg[MRAM_TXB].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE;</div><div class='add'>+</div><div class='add'>+	for (i = start; i &lt; end; i += 4) {</div><div class='add'>+		err = m_can_fifo_write_no_off(cdev, i, 0x0);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int m_can_set_bittiming(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='del'>-	const struct can_bittiming *dbt = &amp;priv-&gt;can.data_bittiming;</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	const struct can_bittiming *bt = &amp;cdev-&gt;can.bittiming;</div><div class='add'>+	const struct can_bittiming *dbt = &amp;cdev-&gt;can.fd.data_bittiming;</div><div class='ctx'> 	u16 brp, sjw, tseg1, tseg2;</div><div class='ctx'> 	u32 reg_btp;</div><div class='ctx'> </div><div class='hunk'>@@ -987,11 +1417,13 @@ static int m_can_set_bittiming(struct net_device *dev)</div><div class='ctx'> 	sjw = bt-&gt;sjw - 1;</div><div class='ctx'> 	tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1;</div><div class='ctx'> 	tseg2 = bt-&gt;phase_seg2 - 1;</div><div class='del'>-	reg_btp = (brp &lt;&lt; NBTP_NBRP_SHIFT) | (sjw &lt;&lt; NBTP_NSJW_SHIFT) |</div><div class='del'>-		(tseg1 &lt;&lt; NBTP_NTSEG1_SHIFT) | (tseg2 &lt;&lt; NBTP_NTSEG2_SHIFT);</div><div class='del'>-	m_can_write(priv, M_CAN_NBTP, reg_btp);</div><div class='add'>+	reg_btp = FIELD_PREP(NBTP_NBRP_MASK, brp) |</div><div class='add'>+		  FIELD_PREP(NBTP_NSJW_MASK, sjw) |</div><div class='add'>+		  FIELD_PREP(NBTP_NTSEG1_MASK, tseg1) |</div><div class='add'>+		  FIELD_PREP(NBTP_NTSEG2_MASK, tseg2);</div><div class='add'>+	m_can_write(cdev, M_CAN_NBTP, reg_btp);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+	if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='ctx'> 		reg_btp = 0;</div><div class='ctx'> 		brp = dbt-&gt;brp - 1;</div><div class='ctx'> 		sjw = dbt-&gt;sjw - 1;</div><div class='hunk'>@@ -1013,8 +1445,8 @@ static int m_can_set_bittiming(struct net_device *dev)</div><div class='ctx'> 			/* Equation based on Bosch's M_CAN User Manual's</div><div class='ctx'> 			 * Transmitter Delay Compensation Section</div><div class='ctx'> 			 */</div><div class='del'>-			tdco = (priv-&gt;can.clock.freq / 1000) *</div><div class='del'>-			       ssp / dbt-&gt;bitrate;</div><div class='add'>+			tdco = (cdev-&gt;can.clock.freq / 1000) *</div><div class='add'>+				ssp / dbt-&gt;bitrate;</div><div class='ctx'> </div><div class='ctx'> 			/* Max valid TDCO value is 127 */</div><div class='ctx'> 			if (tdco &gt; 127) {</div><div class='hunk'>@@ -1024,16 +1456,16 @@ static int m_can_set_bittiming(struct net_device *dev)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			reg_btp |= DBTP_TDC;</div><div class='del'>-			m_can_write(priv, M_CAN_TDCR,</div><div class='del'>-				    tdco &lt;&lt; TDCR_TDCO_SHIFT);</div><div class='add'>+			m_can_write(cdev, M_CAN_TDCR,</div><div class='add'>+				    FIELD_PREP(TDCR_TDCO_MASK, tdco));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		reg_btp |= (brp &lt;&lt; DBTP_DBRP_SHIFT) |</div><div class='del'>-			   (sjw &lt;&lt; DBTP_DSJW_SHIFT) |</div><div class='del'>-			   (tseg1 &lt;&lt; DBTP_DTSEG1_SHIFT) |</div><div class='del'>-			   (tseg2 &lt;&lt; DBTP_DTSEG2_SHIFT);</div><div class='add'>+		reg_btp |= FIELD_PREP(DBTP_DBRP_MASK, brp) |</div><div class='add'>+			FIELD_PREP(DBTP_DSJW_MASK, sjw) |</div><div class='add'>+			FIELD_PREP(DBTP_DTSEG1_MASK, tseg1) |</div><div class='add'>+			FIELD_PREP(DBTP_DTSEG2_MASK, tseg2);</div><div class='ctx'> </div><div class='del'>-		m_can_write(priv, M_CAN_DBTP, reg_btp);</div><div class='add'>+		m_can_write(cdev, M_CAN_DBTP, reg_btp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1047,132 +1479,190 @@ static int m_can_set_bittiming(struct net_device *dev)</div><div class='ctx'>  *		- &gt;= v3.1.x: TX FIFO is used</div><div class='ctx'>  * - configure mode</div><div class='ctx'>  * - setup bittiming</div><div class='add'>+ * - configure timestamp generation</div><div class='ctx'>  */</div><div class='del'>-static void m_can_chip_config(struct net_device *dev)</div><div class='add'>+static int m_can_chip_config(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	u32 interrupts = IR_ALL_INT;</div><div class='ctx'> 	u32 cccr, test;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = m_can_init_ram(cdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "Message RAM configuration failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	m_can_config_endisable(priv, true);</div><div class='add'>+	/* Disable unused interrupts */</div><div class='add'>+	interrupts &amp;= ~(IR_ARA | IR_ELO | IR_DRX | IR_TEFF | IR_TFE | IR_TCF |</div><div class='add'>+			IR_HPM | IR_RF1F | IR_RF1W | IR_RF1N | IR_RF0F |</div><div class='add'>+			IR_TSW);</div><div class='add'>+</div><div class='add'>+	err = m_can_config_enable(cdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* RX Buffer/FIFO Element Size 64 bytes data field */</div><div class='del'>-	m_can_write(priv, M_CAN_RXESC, M_CAN_RXESC_64BYTES);</div><div class='add'>+	m_can_write(cdev, M_CAN_RXESC,</div><div class='add'>+		    FIELD_PREP(RXESC_RBDS_MASK, RXESC_64B) |</div><div class='add'>+		    FIELD_PREP(RXESC_F1DS_MASK, RXESC_64B) |</div><div class='add'>+		    FIELD_PREP(RXESC_F0DS_MASK, RXESC_64B));</div><div class='ctx'> </div><div class='ctx'> 	/* Accept Non-matching Frames Into FIFO 0 */</div><div class='del'>-	m_can_write(priv, M_CAN_GFC, 0x0);</div><div class='add'>+	m_can_write(cdev, M_CAN_GFC, 0x0);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;version == 30) {</div><div class='add'>+	if (cdev-&gt;version == 30) {</div><div class='ctx'> 		/* only support one Tx Buffer currently */</div><div class='del'>-		m_can_write(priv, M_CAN_TXBC, (1 &lt;&lt; TXBC_NDTB_SHIFT) |</div><div class='del'>-				priv-&gt;mcfg[MRAM_TXB].off);</div><div class='add'>+		m_can_write(cdev, M_CAN_TXBC, FIELD_PREP(TXBC_NDTB_MASK, 1) |</div><div class='add'>+			    cdev-&gt;mcfg[MRAM_TXB].off);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* TX FIFO is used for newer IP Core versions */</div><div class='del'>-		m_can_write(priv, M_CAN_TXBC,</div><div class='del'>-			    (priv-&gt;mcfg[MRAM_TXB].num &lt;&lt; TXBC_TFQS_SHIFT) |</div><div class='del'>-			    (priv-&gt;mcfg[MRAM_TXB].off));</div><div class='add'>+		m_can_write(cdev, M_CAN_TXBC,</div><div class='add'>+			    FIELD_PREP(TXBC_TFQS_MASK,</div><div class='add'>+				       cdev-&gt;mcfg[MRAM_TXB].num) |</div><div class='add'>+			    cdev-&gt;mcfg[MRAM_TXB].off);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* support 64 bytes payload */</div><div class='del'>-	m_can_write(priv, M_CAN_TXESC, TXESC_TBDS_64BYTES);</div><div class='add'>+	m_can_write(cdev, M_CAN_TXESC,</div><div class='add'>+		    FIELD_PREP(TXESC_TBDS_MASK, TXESC_TBDS_64B));</div><div class='ctx'> </div><div class='ctx'> 	/* TX Event FIFO */</div><div class='del'>-	if (priv-&gt;version == 30) {</div><div class='del'>-		m_can_write(priv, M_CAN_TXEFC, (1 &lt;&lt; TXEFC_EFS_SHIFT) |</div><div class='del'>-				priv-&gt;mcfg[MRAM_TXE].off);</div><div class='add'>+	if (cdev-&gt;version == 30) {</div><div class='add'>+		m_can_write(cdev, M_CAN_TXEFC,</div><div class='add'>+			    FIELD_PREP(TXEFC_EFS_MASK, 1) |</div><div class='add'>+			    cdev-&gt;mcfg[MRAM_TXE].off);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Full TX Event FIFO is used */</div><div class='del'>-		m_can_write(priv, M_CAN_TXEFC,</div><div class='del'>-			    ((priv-&gt;mcfg[MRAM_TXE].num &lt;&lt; TXEFC_EFS_SHIFT)</div><div class='del'>-			     &amp; TXEFC_EFS_MASK) |</div><div class='del'>-			    priv-&gt;mcfg[MRAM_TXE].off);</div><div class='add'>+		m_can_write(cdev, M_CAN_TXEFC,</div><div class='add'>+			    FIELD_PREP(TXEFC_EFWM_MASK,</div><div class='add'>+				       cdev-&gt;tx_max_coalesced_frames_irq) |</div><div class='add'>+			    FIELD_PREP(TXEFC_EFS_MASK,</div><div class='add'>+				       cdev-&gt;mcfg[MRAM_TXE].num) |</div><div class='add'>+			    cdev-&gt;mcfg[MRAM_TXE].off);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* rx fifo configuration, blocking mode, fifo size 1 */</div><div class='del'>-	m_can_write(priv, M_CAN_RXF0C,</div><div class='del'>-		    (priv-&gt;mcfg[MRAM_RXF0].num &lt;&lt; RXFC_FS_SHIFT) |</div><div class='del'>-		     priv-&gt;mcfg[MRAM_RXF0].off);</div><div class='add'>+	m_can_write(cdev, M_CAN_RXF0C,</div><div class='add'>+		    FIELD_PREP(RXFC_FWM_MASK, cdev-&gt;rx_max_coalesced_frames_irq) |</div><div class='add'>+		    FIELD_PREP(RXFC_FS_MASK, cdev-&gt;mcfg[MRAM_RXF0].num) |</div><div class='add'>+		    cdev-&gt;mcfg[MRAM_RXF0].off);</div><div class='ctx'> </div><div class='del'>-	m_can_write(priv, M_CAN_RXF1C,</div><div class='del'>-		    (priv-&gt;mcfg[MRAM_RXF1].num &lt;&lt; RXFC_FS_SHIFT) |</div><div class='del'>-		     priv-&gt;mcfg[MRAM_RXF1].off);</div><div class='add'>+	m_can_write(cdev, M_CAN_RXF1C,</div><div class='add'>+		    FIELD_PREP(RXFC_FS_MASK, cdev-&gt;mcfg[MRAM_RXF1].num) |</div><div class='add'>+		    cdev-&gt;mcfg[MRAM_RXF1].off);</div><div class='ctx'> </div><div class='del'>-	cccr = m_can_read(priv, M_CAN_CCCR);</div><div class='del'>-	test = m_can_read(priv, M_CAN_TEST);</div><div class='add'>+	cccr = m_can_read(cdev, M_CAN_CCCR);</div><div class='add'>+	test = m_can_read(cdev, M_CAN_TEST);</div><div class='ctx'> 	test &amp;= ~TEST_LBCK;</div><div class='del'>-	if (priv-&gt;version == 30) {</div><div class='del'>-	/* Version 3.0.x */</div><div class='add'>+	if (cdev-&gt;version == 30) {</div><div class='add'>+		/* Version 3.0.x */</div><div class='ctx'> </div><div class='del'>-		cccr &amp;= ~(CCCR_TEST | CCCR_MON |</div><div class='del'>-			(CCCR_CMR_MASK &lt;&lt; CCCR_CMR_SHIFT) |</div><div class='del'>-			(CCCR_CME_MASK &lt;&lt; CCCR_CME_SHIFT));</div><div class='add'>+		cccr &amp;= ~(CCCR_TEST | CCCR_MON | CCCR_DAR |</div><div class='add'>+			  FIELD_PREP(CCCR_CMR_MASK, FIELD_MAX(CCCR_CMR_MASK)) |</div><div class='add'>+			  FIELD_PREP(CCCR_CME_MASK, FIELD_MAX(CCCR_CME_MASK)));</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='del'>-			cccr |= CCCR_CME_CANFD_BRS &lt;&lt; CCCR_CME_SHIFT;</div><div class='add'>+		if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+			cccr |= FIELD_PREP(CCCR_CME_MASK, CCCR_CME_CANFD_BRS);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-	/* Version 3.1.x or 3.2.x */</div><div class='add'>+		/* Version 3.1.x or 3.2.x */</div><div class='ctx'> 		cccr &amp;= ~(CCCR_TEST | CCCR_MON | CCCR_BRSE | CCCR_FDOE |</div><div class='del'>-			  CCCR_NISO);</div><div class='add'>+			  CCCR_NISO | CCCR_DAR);</div><div class='ctx'> </div><div class='ctx'> 		/* Only 3.2.x has NISO Bit implemented */</div><div class='del'>-		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO)</div><div class='add'>+		if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO)</div><div class='ctx'> 			cccr |= CCCR_NISO;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='ctx'> 			cccr |= (CCCR_BRSE | CCCR_FDOE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Loopback Mode */</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK) {</div><div class='add'>+	if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK) {</div><div class='ctx'> 		cccr |= CCCR_TEST | CCCR_MON;</div><div class='ctx'> 		test |= TEST_LBCK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable Monitoring (all versions) */</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+	if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='ctx'> 		cccr |= CCCR_MON;</div><div class='ctx'> </div><div class='add'>+	/* Disable Auto Retransmission (all versions) */</div><div class='add'>+	if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		cccr |= CCCR_DAR;</div><div class='add'>+</div><div class='ctx'> 	/* Write config */</div><div class='del'>-	m_can_write(priv, M_CAN_CCCR, cccr);</div><div class='del'>-	m_can_write(priv, M_CAN_TEST, test);</div><div class='add'>+	m_can_write(cdev, M_CAN_CCCR, cccr);</div><div class='add'>+	m_can_write(cdev, M_CAN_TEST, test);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupts */</div><div class='del'>-	m_can_write(priv, M_CAN_IR, IR_ALL_INT);</div><div class='del'>-	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING))</div><div class='del'>-		if (priv-&gt;version == 30)</div><div class='del'>-			m_can_write(priv, M_CAN_IE, IR_ALL_INT &amp;</div><div class='del'>-				    ~(IR_ERR_LEC_30X));</div><div class='add'>+	if (!(cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)) {</div><div class='add'>+		if (cdev-&gt;version == 30)</div><div class='add'>+			interrupts &amp;= ~(IR_ERR_LEC_30X);</div><div class='ctx'> 		else</div><div class='del'>-			m_can_write(priv, M_CAN_IE, IR_ALL_INT &amp;</div><div class='del'>-				    ~(IR_ERR_LEC_31X));</div><div class='del'>-	else</div><div class='del'>-		m_can_write(priv, M_CAN_IE, IR_ALL_INT);</div><div class='add'>+			interrupts &amp;= ~(IR_ERR_LEC_31X);</div><div class='add'>+	}</div><div class='add'>+	cdev-&gt;active_interrupts = 0;</div><div class='add'>+	m_can_interrupt_enable(cdev, interrupts);</div><div class='ctx'> </div><div class='ctx'> 	/* route all interrupts to INT0 */</div><div class='del'>-	m_can_write(priv, M_CAN_ILS, ILS_ALL_INT0);</div><div class='add'>+	m_can_write(cdev, M_CAN_ILS, ILS_ALL_INT0);</div><div class='ctx'> </div><div class='ctx'> 	/* set bittiming params */</div><div class='ctx'> 	m_can_set_bittiming(dev);</div><div class='ctx'> </div><div class='del'>-	m_can_config_endisable(priv, false);</div><div class='add'>+	/* enable internal timestamp generation, with a prescaler of 16. The</div><div class='add'>+	 * prescaler is applied to the nominal bit timing</div><div class='add'>+	 */</div><div class='add'>+	m_can_write(cdev, M_CAN_TSCC,</div><div class='add'>+		    FIELD_PREP(TSCC_TCP_MASK, 0xf) |</div><div class='add'>+		    FIELD_PREP(TSCC_TSS_MASK, TSCC_TSS_INTERNAL));</div><div class='add'>+</div><div class='add'>+	err = m_can_config_disable(cdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;ops-&gt;init)</div><div class='add'>+		cdev-&gt;ops-&gt;init(cdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void m_can_start(struct net_device *dev)</div><div class='add'>+static int m_can_start(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* basic m_can configuration */</div><div class='del'>-	m_can_chip_config(dev);</div><div class='add'>+	ret = m_can_chip_config(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netdev_queue_set_dql_min_limit(netdev_get_tx_queue(cdev-&gt;net, 0),</div><div class='add'>+				       cdev-&gt;tx_max_coalesced_frames);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	cdev-&gt;can.state = m_can_state_get_by_psr(cdev);</div><div class='ctx'> </div><div class='del'>-	m_can_enable_all_interrupts(priv);</div><div class='add'>+	m_can_enable_all_interrupts(cdev);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;version &gt; 30)</div><div class='add'>+		cdev-&gt;tx_fifo_putidx = FIELD_GET(TXFQS_TFQPI_MASK,</div><div class='add'>+						 m_can_read(cdev, M_CAN_TXFQS));</div><div class='add'>+</div><div class='add'>+	ret = m_can_cccr_update_bits(cdev, CCCR_INIT, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		netdev_err(dev, "failed to enter normal mode\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m_can_set_mode(struct net_device *dev, enum can_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case CAN_MODE_START:</div><div class='add'>+		m_can_clean(dev);</div><div class='ctx'> 		m_can_start(dev);</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1188,22 +1678,19 @@ static int m_can_set_mode(struct net_device *dev, enum can_mode mode)</div><div class='ctx'>  * else it returns the release and step coded as:</div><div class='ctx'>  * return value = 10 * &lt;release&gt; + 1 * &lt;step&gt;</div><div class='ctx'>  */</div><div class='del'>-static int m_can_check_core_release(void __iomem *m_can_base)</div><div class='add'>+static int m_can_check_core_release(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 crel_reg;</div><div class='ctx'> 	u8 rel;</div><div class='ctx'> 	u8 step;</div><div class='ctx'> 	int res;</div><div class='del'>-	struct m_can_priv temp_priv = {</div><div class='del'>-		.base = m_can_base</div><div class='del'>-	};</div><div class='ctx'> </div><div class='ctx'> 	/* Read Core Release Version and split into version number</div><div class='ctx'> 	 * Example: Version 3.2.1 =&gt; rel = 3; step = 2; substep = 1;</div><div class='ctx'> 	 */</div><div class='del'>-	crel_reg = m_can_read(&amp;temp_priv, M_CAN_CREL);</div><div class='del'>-	rel = (u8)((crel_reg &amp; CREL_REL_MASK) &gt;&gt; CREL_REL_SHIFT);</div><div class='del'>-	step = (u8)((crel_reg &amp; CREL_STEP_MASK) &gt;&gt; CREL_STEP_SHIFT);</div><div class='add'>+	crel_reg = m_can_read(cdev, M_CAN_CREL);</div><div class='add'>+	rel = (u8)FIELD_GET(CREL_REL_MASK, crel_reg);</div><div class='add'>+	step = (u8)FIELD_GET(CREL_STEP_MASK, crel_reg);</div><div class='ctx'> </div><div class='ctx'> 	if (rel == 3) {</div><div class='ctx'> 		/* M_CAN v3.x.y: create return value */</div><div class='hunk'>@@ -1217,248 +1704,232 @@ static int m_can_check_core_release(void __iomem *m_can_base)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Selectable Non ISO support only in version 3.2.x</div><div class='del'>- * This function checks if the bit is writable.</div><div class='add'>+ * Return 1 if the bit is writable, 0 if it is not, or negative on error.</div><div class='ctx'>  */</div><div class='del'>-static bool m_can_niso_supported(const struct m_can_priv *priv)</div><div class='add'>+static int m_can_niso_supported(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='del'>-	u32 cccr_reg, cccr_poll;</div><div class='del'>-	int niso_timeout;</div><div class='add'>+	int ret, niso;</div><div class='ctx'> </div><div class='del'>-	m_can_config_endisable(priv, true);</div><div class='del'>-	cccr_reg = m_can_read(priv, M_CAN_CCCR);</div><div class='del'>-	cccr_reg |= CCCR_NISO;</div><div class='del'>-	m_can_write(priv, M_CAN_CCCR, cccr_reg);</div><div class='add'>+	ret = m_can_config_enable(cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	niso_timeout = readl_poll_timeout((priv-&gt;base + M_CAN_CCCR), cccr_poll,</div><div class='del'>-					  (cccr_poll == cccr_reg), 0, 10);</div><div class='add'>+	/* First try to set the NISO bit. */</div><div class='add'>+	niso = m_can_cccr_update_bits(cdev, CCCR_NISO, CCCR_NISO);</div><div class='ctx'> </div><div class='del'>-	/* Clear NISO */</div><div class='del'>-	cccr_reg &amp;= ~(CCCR_NISO);</div><div class='del'>-	m_can_write(priv, M_CAN_CCCR, cccr_reg);</div><div class='add'>+	/* Then clear the it again. */</div><div class='add'>+	ret = m_can_cccr_update_bits(cdev, CCCR_NISO, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(cdev-&gt;net, "failed to revert the NON-ISO bit in CCCR\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	m_can_config_endisable(priv, false);</div><div class='add'>+	ret = m_can_config_disable(cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	/* return false if time out (-ETIMEDOUT), else return true */</div><div class='del'>-	return !niso_timeout;</div><div class='add'>+	return niso == 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int m_can_dev_setup(struct platform_device *pdev, struct net_device *dev,</div><div class='del'>-			   void __iomem *addr)</div><div class='add'>+static int m_can_dev_setup(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv;</div><div class='del'>-	int m_can_version;</div><div class='add'>+	struct net_device *dev = cdev-&gt;net;</div><div class='add'>+	int m_can_version, err, niso;</div><div class='ctx'> </div><div class='del'>-	m_can_version = m_can_check_core_release(addr);</div><div class='add'>+	m_can_version = m_can_check_core_release(cdev);</div><div class='ctx'> 	/* return if unsupported version */</div><div class='ctx'> 	if (!m_can_version) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Unsupported version number: %2d",</div><div class='del'>-			m_can_version);</div><div class='add'>+		netdev_err(cdev-&gt;net, "Unsupported version number: %2d",</div><div class='add'>+			   m_can_version);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, m_can_poll, M_CAN_NAPI_WEIGHT);</div><div class='add'>+	/* Write the INIT bit, in case no hardware reset has happened before</div><div class='add'>+	 * the probe (for example, it was observed that the Intel Elkhart Lake</div><div class='add'>+	 * SoCs do not properly reset the CAN controllers on reboot)</div><div class='add'>+	 */</div><div class='add'>+	err = m_can_cccr_update_bits(cdev, CCCR_INIT, CCCR_INIT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!cdev-&gt;is_peripheral)</div><div class='add'>+		netif_napi_add(dev, &amp;cdev-&gt;napi, m_can_poll);</div><div class='ctx'> </div><div class='ctx'> 	/* Shared properties of all M_CAN versions */</div><div class='del'>-	priv-&gt;version = m_can_version;</div><div class='del'>-	priv-&gt;dev = dev;</div><div class='del'>-	priv-&gt;base = addr;</div><div class='del'>-	priv-&gt;can.do_set_mode = m_can_set_mode;</div><div class='del'>-	priv-&gt;can.do_get_berr_counter = m_can_get_berr_counter;</div><div class='add'>+	cdev-&gt;version = m_can_version;</div><div class='add'>+	cdev-&gt;can.do_set_mode = m_can_set_mode;</div><div class='add'>+	cdev-&gt;can.do_get_berr_counter = m_can_get_berr_counter;</div><div class='ctx'> </div><div class='ctx'> 	/* Set M_CAN supported operations */</div><div class='del'>-	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='del'>-					CAN_CTRLMODE_LISTENONLY |</div><div class='del'>-					CAN_CTRLMODE_BERR_REPORTING |</div><div class='del'>-					CAN_CTRLMODE_FD;</div><div class='add'>+	cdev-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='add'>+		CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+		CAN_CTRLMODE_BERR_REPORTING |</div><div class='add'>+		CAN_CTRLMODE_FD |</div><div class='add'>+		CAN_CTRLMODE_ONE_SHOT;</div><div class='ctx'> </div><div class='ctx'> 	/* Set properties depending on M_CAN version */</div><div class='del'>-	switch (priv-&gt;version) {</div><div class='add'>+	switch (cdev-&gt;version) {</div><div class='ctx'> 	case 30:</div><div class='ctx'> 		/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.0.x */</div><div class='del'>-		can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);</div><div class='del'>-		priv-&gt;can.bittiming_const = &amp;m_can_bittiming_const_30X;</div><div class='del'>-		priv-&gt;can.data_bittiming_const =</div><div class='del'>-				&amp;m_can_data_bittiming_const_30X;</div><div class='add'>+		err = can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		cdev-&gt;can.bittiming_const = &amp;m_can_bittiming_const_30X;</div><div class='add'>+		cdev-&gt;can.fd.data_bittiming_const = &amp;m_can_data_bittiming_const_30X;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 31:</div><div class='ctx'> 		/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.1.x */</div><div class='del'>-		can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);</div><div class='del'>-		priv-&gt;can.bittiming_const = &amp;m_can_bittiming_const_31X;</div><div class='del'>-		priv-&gt;can.data_bittiming_const =</div><div class='del'>-				&amp;m_can_data_bittiming_const_31X;</div><div class='add'>+		err = can_set_static_ctrlmode(dev, CAN_CTRLMODE_FD_NON_ISO);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		cdev-&gt;can.bittiming_const = &amp;m_can_bittiming_const_31X;</div><div class='add'>+		cdev-&gt;can.fd.data_bittiming_const = &amp;m_can_data_bittiming_const_31X;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 32:</div><div class='del'>-		priv-&gt;can.bittiming_const = &amp;m_can_bittiming_const_31X;</div><div class='del'>-		priv-&gt;can.data_bittiming_const =</div><div class='del'>-				&amp;m_can_data_bittiming_const_31X;</div><div class='del'>-		priv-&gt;can.ctrlmode_supported |= (m_can_niso_supported(priv)</div><div class='del'>-						? CAN_CTRLMODE_FD_NON_ISO</div><div class='del'>-						: 0);</div><div class='add'>+	case 33:</div><div class='add'>+		/* Support both MCAN version v3.2.x and v3.3.0 */</div><div class='add'>+		cdev-&gt;can.bittiming_const = &amp;m_can_bittiming_const_31X;</div><div class='add'>+		cdev-&gt;can.fd.data_bittiming_const = &amp;m_can_data_bittiming_const_31X;</div><div class='add'>+</div><div class='add'>+		niso = m_can_niso_supported(cdev);</div><div class='add'>+		if (niso &lt; 0)</div><div class='add'>+			return niso;</div><div class='add'>+		if (niso)</div><div class='add'>+			cdev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD_NON_ISO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Unsupported version number: %2d",</div><div class='del'>-			priv-&gt;version);</div><div class='add'>+		netdev_err(cdev-&gt;net, "Unsupported version number: %2d",</div><div class='add'>+			   cdev-&gt;version);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int m_can_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = m_can_clk_start(priv);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* open the can device */</div><div class='del'>-	err = open_candev(dev);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_err(dev, "failed to open can device\n");</div><div class='del'>-		goto exit_disable_clks;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* register interrupt handler */</div><div class='del'>-	err = request_irq(dev-&gt;irq, m_can_isr, IRQF_SHARED, dev-&gt;name,</div><div class='del'>-			  dev);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		netdev_err(dev, "failed to request interrupt\n");</div><div class='del'>-		goto exit_irq_fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* start the m_can controller */</div><div class='del'>-	m_can_start(dev);</div><div class='del'>-</div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_OPEN);</div><div class='del'>-	napi_enable(&amp;priv-&gt;napi);</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-exit_irq_fail:</div><div class='del'>-	close_candev(dev);</div><div class='del'>-exit_disable_clks:</div><div class='del'>-	m_can_clk_stop(priv);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void m_can_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* disable all interrupts */</div><div class='del'>-	m_can_disable_all_interrupts(priv);</div><div class='add'>+	m_can_disable_all_interrupts(cdev);</div><div class='add'>+</div><div class='add'>+	/* Set init mode to disengage from the network */</div><div class='add'>+	ret = m_can_cccr_update_bits(cdev, CCCR_INIT, CCCR_INIT);</div><div class='add'>+	if (ret)</div><div class='add'>+		netdev_err(dev, "failed to enter standby mode: %pe\n",</div><div class='add'>+			   ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	/* set the state as STOPPED */</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	cdev-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;ops-&gt;deinit) {</div><div class='add'>+		ret = cdev-&gt;ops-&gt;deinit(cdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			netdev_err(dev, "failed to deinitialize: %pe\n",</div><div class='add'>+				   ERR_PTR(ret));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int m_can_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='ctx'> 	m_can_stop(dev);</div><div class='del'>-	m_can_clk_stop(priv);</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-	close_candev(dev);</div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_STOP);</div><div class='add'>+	if (dev-&gt;irq)</div><div class='add'>+		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	m_can_clean(dev);</div><div class='ctx'> </div><div class='del'>-static int m_can_next_echo_skb_occupied(struct net_device *dev, int putidx)</div><div class='del'>-{</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	/*get wrap around for loopback skb index */</div><div class='del'>-	unsigned int wrap = priv-&gt;can.echo_skb_max;</div><div class='del'>-	int next_idx;</div><div class='add'>+	if (cdev-&gt;is_peripheral) {</div><div class='add'>+		destroy_workqueue(cdev-&gt;tx_wq);</div><div class='add'>+		cdev-&gt;tx_wq = NULL;</div><div class='add'>+		can_rx_offload_disable(&amp;cdev-&gt;offload);</div><div class='add'>+	} else {</div><div class='add'>+		napi_disable(&amp;cdev-&gt;napi);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* calculate next index */</div><div class='del'>-	next_idx = (++putidx &gt;= wrap ? 0 : putidx);</div><div class='add'>+	close_candev(dev);</div><div class='ctx'> </div><div class='del'>-	/* check if occupied */</div><div class='del'>-	return !!priv-&gt;can.echo_skb[next_idx];</div><div class='add'>+	reset_control_assert(cdev-&gt;rst);</div><div class='add'>+	m_can_clk_stop(cdev);</div><div class='add'>+	phy_power_off(cdev-&gt;transceiver);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,</div><div class='del'>-				    struct net_device *dev)</div><div class='add'>+static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev,</div><div class='add'>+				    struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='del'>-	u32 id, cccr, fdflags;</div><div class='del'>-	int i;</div><div class='del'>-	int putidx;</div><div class='del'>-</div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='add'>+	u8 len_padded = DIV_ROUND_UP(cf-&gt;len, 4);</div><div class='add'>+	struct m_can_fifo_element fifo_element;</div><div class='add'>+	struct net_device *dev = cdev-&gt;net;</div><div class='add'>+	u32 cccr, fdflags;</div><div class='add'>+	int err;</div><div class='add'>+	u32 putidx;</div><div class='add'>+	unsigned int frame_len = can_skb_get_frame_len(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Generate ID field for TX buffer Element */</div><div class='ctx'> 	/* Common to all supported M_CAN versions */</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='del'>-		id = cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='del'>-		id |= TX_BUF_XTD;</div><div class='add'>+		fifo_element.id = cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+		fifo_element.id |= TX_BUF_XTD;</div><div class='ctx'> 	} else {</div><div class='del'>-		id = ((cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 18);</div><div class='add'>+		fifo_element.id = ((cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 18);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='del'>-		id |= TX_BUF_RTR;</div><div class='add'>+		fifo_element.id |= TX_BUF_RTR;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;version == 30) {</div><div class='add'>+	if (cdev-&gt;version == 30) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-		/* message ram configuration */</div><div class='del'>-		m_can_fifo_write(priv, 0, M_CAN_FIFO_ID, id);</div><div class='del'>-		m_can_fifo_write(priv, 0, M_CAN_FIFO_DLC,</div><div class='del'>-				 can_len2dlc(cf-&gt;len) &lt;&lt; 16);</div><div class='add'>+		fifo_element.dlc = can_fd_len2dlc(cf-&gt;len) &lt;&lt; 16;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; cf-&gt;len; i += 4)</div><div class='del'>-			m_can_fifo_write(priv, 0,</div><div class='del'>-					 M_CAN_FIFO_DATA(i / 4),</div><div class='del'>-					 *(u32 *)(cf-&gt;data + i));</div><div class='add'>+		/* Write the frame ID, DLC, and payload to the FIFO element. */</div><div class='add'>+		err = m_can_fifo_write(cdev, 0, M_CAN_FIFO_ID, &amp;fifo_element, 2);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_fail;</div><div class='ctx'> </div><div class='del'>-		can_put_echo_skb(skb, dev, 0);</div><div class='add'>+		err = m_can_fifo_write(cdev, 0, M_CAN_FIFO_DATA,</div><div class='add'>+				       cf-&gt;data, len_padded);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_fail;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='del'>-			cccr = m_can_read(priv, M_CAN_CCCR);</div><div class='del'>-			cccr &amp;= ~(CCCR_CMR_MASK &lt;&lt; CCCR_CMR_SHIFT);</div><div class='add'>+		if (cdev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+			cccr = m_can_read(cdev, M_CAN_CCCR);</div><div class='add'>+			cccr &amp;= ~CCCR_CMR_MASK;</div><div class='ctx'> 			if (can_is_canfd_skb(skb)) {</div><div class='ctx'> 				if (cf-&gt;flags &amp; CANFD_BRS)</div><div class='del'>-					cccr |= CCCR_CMR_CANFD_BRS &lt;&lt;</div><div class='del'>-						CCCR_CMR_SHIFT;</div><div class='add'>+					cccr |= FIELD_PREP(CCCR_CMR_MASK,</div><div class='add'>+							   CCCR_CMR_CANFD_BRS);</div><div class='ctx'> 				else</div><div class='del'>-					cccr |= CCCR_CMR_CANFD &lt;&lt;</div><div class='del'>-						CCCR_CMR_SHIFT;</div><div class='add'>+					cccr |= FIELD_PREP(CCCR_CMR_MASK,</div><div class='add'>+							   CCCR_CMR_CANFD);</div><div class='ctx'> 			} else {</div><div class='del'>-				cccr |= CCCR_CMR_CAN &lt;&lt; CCCR_CMR_SHIFT;</div><div class='add'>+				cccr |= FIELD_PREP(CCCR_CMR_MASK, CCCR_CMR_CAN);</div><div class='ctx'> 			}</div><div class='del'>-			m_can_write(priv, M_CAN_CCCR, cccr);</div><div class='add'>+			m_can_write(cdev, M_CAN_CCCR, cccr);</div><div class='ctx'> 		}</div><div class='del'>-		m_can_write(priv, M_CAN_TXBTIE, 0x1);</div><div class='del'>-		m_can_write(priv, M_CAN_TXBAR, 0x1);</div><div class='add'>+		m_can_write(cdev, M_CAN_TXBTIE, 0x1);</div><div class='add'>+</div><div class='add'>+		can_put_echo_skb(skb, dev, 0, frame_len);</div><div class='add'>+</div><div class='add'>+		m_can_write(cdev, M_CAN_TXBAR, 0x1);</div><div class='ctx'> 		/* End of xmit function for version 3.0.x */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Transmit routine for version &gt;= v3.1.x */</div><div class='ctx'> </div><div class='del'>-		/* Check if FIFO full */</div><div class='del'>-		if (m_can_tx_fifo_full(priv)) {</div><div class='del'>-			/* This shouldn't happen */</div><div class='del'>-			netif_stop_queue(dev);</div><div class='del'>-			netdev_warn(dev,</div><div class='del'>-				    "TX queue active although FIFO is full.");</div><div class='del'>-			return NETDEV_TX_BUSY;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		/* get put index for frame */</div><div class='del'>-		putidx = ((m_can_read(priv, M_CAN_TXFQS) &amp; TXFQS_TFQPI_MASK)</div><div class='del'>-				  &gt;&gt; TXFQS_TFQPI_SHIFT);</div><div class='del'>-		/* Write ID Field to FIFO Element */</div><div class='del'>-		m_can_fifo_write(priv, putidx, M_CAN_FIFO_ID, id);</div><div class='add'>+		putidx = cdev-&gt;tx_fifo_putidx;</div><div class='add'>+</div><div class='add'>+		/* Construct DLC Field, with CAN-FD configuration.</div><div class='add'>+		 * Use the put index of the fifo as the message marker,</div><div class='add'>+		 * used in the TX interrupt for sending the correct echo frame.</div><div class='add'>+		 */</div><div class='ctx'> </div><div class='ctx'> 		/* get CAN FD configuration of frame */</div><div class='ctx'> 		fdflags = 0;</div><div class='hunk'>@@ -1468,344 +1939,742 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 				fdflags |= TX_BUF_BRS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Construct DLC Field. Also contains CAN-FD configuration</div><div class='del'>-		 * use put index of fifo as message marker</div><div class='del'>-		 * it is used in TX interrupt for</div><div class='del'>-		 * sending the correct echo frame</div><div class='del'>-		 */</div><div class='del'>-		m_can_fifo_write(priv, putidx, M_CAN_FIFO_DLC,</div><div class='del'>-				 ((putidx &lt;&lt; TX_BUF_MM_SHIFT) &amp;</div><div class='del'>-				  TX_BUF_MM_MASK) |</div><div class='del'>-				 (can_len2dlc(cf-&gt;len) &lt;&lt; 16) |</div><div class='del'>-				 fdflags | TX_BUF_EFC);</div><div class='add'>+		fifo_element.dlc = FIELD_PREP(TX_BUF_MM_MASK, putidx) |</div><div class='add'>+			FIELD_PREP(TX_BUF_DLC_MASK, can_fd_len2dlc(cf-&gt;len)) |</div><div class='add'>+			fdflags | TX_BUF_EFC;</div><div class='add'>+</div><div class='add'>+		memcpy_and_pad(fifo_element.data, CANFD_MAX_DLEN, &amp;cf-&gt;data,</div><div class='add'>+			       cf-&gt;len, 0);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; cf-&gt;len; i += 4)</div><div class='del'>-			m_can_fifo_write(priv, putidx, M_CAN_FIFO_DATA(i / 4),</div><div class='del'>-					 *(u32 *)(cf-&gt;data + i));</div><div class='add'>+		err = m_can_fifo_write(cdev, putidx, M_CAN_FIFO_ID,</div><div class='add'>+				       &amp;fifo_element, 2 + len_padded);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_fail;</div><div class='ctx'> </div><div class='ctx'> 		/* Push loopback echo.</div><div class='ctx'> 		 * Will be looped back on TX interrupt based on message marker</div><div class='ctx'> 		 */</div><div class='del'>-		can_put_echo_skb(skb, dev, putidx);</div><div class='add'>+		can_put_echo_skb(skb, dev, putidx, frame_len);</div><div class='add'>+</div><div class='add'>+		if (cdev-&gt;is_peripheral) {</div><div class='add'>+			/* Delay enabling TX FIFO element */</div><div class='add'>+			cdev-&gt;tx_peripheral_submit |= BIT(putidx);</div><div class='add'>+		} else {</div><div class='add'>+			/* Enable TX FIFO element to start transfer  */</div><div class='add'>+			m_can_write(cdev, M_CAN_TXBAR, BIT(putidx));</div><div class='add'>+		}</div><div class='add'>+		cdev-&gt;tx_fifo_putidx = (++cdev-&gt;tx_fifo_putidx &gt;= cdev-&gt;can.echo_skb_max ?</div><div class='add'>+					0 : cdev-&gt;tx_fifo_putidx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+out_fail:</div><div class='add'>+	netdev_err(dev, "FIFO write returned %d\n", err);</div><div class='add'>+	m_can_disable_all_interrupts(cdev);</div><div class='add'>+	return NETDEV_TX_BUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_tx_submit(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	m_can_write(cdev, M_CAN_TXBAR, cdev-&gt;tx_peripheral_submit);</div><div class='add'>+	cdev-&gt;tx_peripheral_submit = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_tx_work_queue(struct work_struct *ws)</div><div class='add'>+{</div><div class='add'>+	struct m_can_tx_op *op = container_of(ws, struct m_can_tx_op, work);</div><div class='add'>+	struct m_can_classdev *cdev = op-&gt;cdev;</div><div class='add'>+	struct sk_buff *skb = op-&gt;skb;</div><div class='add'>+</div><div class='add'>+	op-&gt;skb = NULL;</div><div class='add'>+	m_can_tx_handler(cdev, skb);</div><div class='add'>+	if (op-&gt;submit)</div><div class='add'>+		m_can_tx_submit(cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_tx_queue_skb(struct m_can_classdev *cdev, struct sk_buff *skb,</div><div class='add'>+			       bool submit)</div><div class='add'>+{</div><div class='add'>+	cdev-&gt;tx_ops[cdev-&gt;next_tx_op].skb = skb;</div><div class='add'>+	cdev-&gt;tx_ops[cdev-&gt;next_tx_op].submit = submit;</div><div class='add'>+	queue_work(cdev-&gt;tx_wq, &amp;cdev-&gt;tx_ops[cdev-&gt;next_tx_op].work);</div><div class='add'>+</div><div class='add'>+	++cdev-&gt;next_tx_op;</div><div class='add'>+	if (cdev-&gt;next_tx_op &gt;= cdev-&gt;tx_fifo_size)</div><div class='add'>+		cdev-&gt;next_tx_op = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Enable TX FIFO element to start transfer  */</div><div class='del'>-		m_can_write(priv, M_CAN_TXBAR, (1 &lt;&lt; putidx));</div><div class='add'>+static netdev_tx_t m_can_start_peripheral_xmit(struct m_can_classdev *cdev,</div><div class='add'>+					       struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	bool submit;</div><div class='ctx'> </div><div class='del'>-		/* stop network queue if fifo full */</div><div class='del'>-			if (m_can_tx_fifo_full(priv) ||</div><div class='del'>-			    m_can_next_echo_skb_occupied(dev, putidx))</div><div class='del'>-				netif_stop_queue(dev);</div><div class='add'>+	++cdev-&gt;nr_txs_without_submit;</div><div class='add'>+	if (cdev-&gt;nr_txs_without_submit &gt;= cdev-&gt;tx_max_coalesced_frames ||</div><div class='add'>+	    !netdev_xmit_more()) {</div><div class='add'>+		cdev-&gt;nr_txs_without_submit = 0;</div><div class='add'>+		submit = true;</div><div class='add'>+	} else {</div><div class='add'>+		submit = false;</div><div class='ctx'> 	}</div><div class='add'>+	m_can_tx_queue_skb(cdev, skb, submit);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+	netdev_tx_t ret;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	frame_len = can_skb_get_frame_len(skb);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;can.state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		m_can_clean(cdev-&gt;net);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = m_can_start_tx(cdev);</div><div class='add'>+	if (ret != NETDEV_TX_OK)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netdev_sent_queue(dev, frame_len);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		ret = m_can_start_peripheral_xmit(cdev, skb);</div><div class='add'>+	else</div><div class='add'>+		ret = m_can_tx_handler(cdev, skb);</div><div class='add'>+</div><div class='add'>+	if (ret != NETDEV_TX_OK)</div><div class='add'>+		netdev_completed_queue(dev, 1, frame_len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart m_can_polling_timer(struct hrtimer *timer)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = container_of(timer, struct</div><div class='add'>+						   m_can_classdev, hrtimer);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;can.state == CAN_STATE_BUS_OFF ||</div><div class='add'>+	    cdev-&gt;can.state == CAN_STATE_STOPPED)</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	ret = m_can_interrupt_handler(cdev);</div><div class='add'>+</div><div class='add'>+	/* On error or if napi is scheduled to read, stop the timer */</div><div class='add'>+	if (ret &lt; 0 || napi_is_scheduled(&amp;cdev-&gt;napi))</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	hrtimer_forward_now(timer, ms_to_ktime(HRTIMER_POLL_INTERVAL_MS));</div><div class='add'>+</div><div class='add'>+	return HRTIMER_RESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = phy_power_on(cdev-&gt;transceiver);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = m_can_clk_start(cdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_phy_power_off;</div><div class='add'>+</div><div class='add'>+	err = reset_control_deassert(cdev-&gt;rst);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_disable_clks;</div><div class='add'>+</div><div class='add'>+	/* open the can device */</div><div class='add'>+	err = open_candev(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "failed to open can device\n");</div><div class='add'>+		goto out_reset_control_assert;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		can_rx_offload_enable(&amp;cdev-&gt;offload);</div><div class='add'>+	else</div><div class='add'>+		napi_enable(&amp;cdev-&gt;napi);</div><div class='add'>+</div><div class='add'>+	/* register interrupt handler */</div><div class='add'>+	if (cdev-&gt;is_peripheral) {</div><div class='add'>+		cdev-&gt;tx_wq = alloc_ordered_workqueue("mcan_wq",</div><div class='add'>+						      WQ_FREEZABLE | WQ_MEM_RECLAIM);</div><div class='add'>+		if (!cdev-&gt;tx_wq) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out_wq_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (int i = 0; i != cdev-&gt;tx_fifo_size; ++i) {</div><div class='add'>+			cdev-&gt;tx_ops[i].cdev = cdev;</div><div class='add'>+			INIT_WORK(&amp;cdev-&gt;tx_ops[i].work, m_can_tx_work_queue);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = request_threaded_irq(dev-&gt;irq, NULL, m_can_isr,</div><div class='add'>+					   IRQF_ONESHOT,</div><div class='add'>+					   dev-&gt;name, dev);</div><div class='add'>+	} else if (dev-&gt;irq) {</div><div class='add'>+		err = request_irq(dev-&gt;irq, m_can_isr, IRQF_SHARED, dev-&gt;name,</div><div class='add'>+				  dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		netdev_err(dev, "failed to request interrupt\n");</div><div class='add'>+		goto exit_irq_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* start the m_can controller */</div><div class='add'>+	err = m_can_start(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit_start_fail;</div><div class='add'>+</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+exit_start_fail:</div><div class='add'>+	if (cdev-&gt;is_peripheral || dev-&gt;irq)</div><div class='add'>+		free_irq(dev-&gt;irq, dev);</div><div class='add'>+exit_irq_fail:</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		destroy_workqueue(cdev-&gt;tx_wq);</div><div class='add'>+out_wq_fail:</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		can_rx_offload_disable(&amp;cdev-&gt;offload);</div><div class='add'>+	else</div><div class='add'>+		napi_disable(&amp;cdev-&gt;napi);</div><div class='add'>+	close_candev(dev);</div><div class='add'>+out_reset_control_assert:</div><div class='add'>+	reset_control_assert(cdev-&gt;rst);</div><div class='add'>+exit_disable_clks:</div><div class='add'>+	m_can_clk_stop(cdev);</div><div class='add'>+out_phy_power_off:</div><div class='add'>+	phy_power_off(cdev-&gt;transceiver);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops m_can_netdev_ops = {</div><div class='ctx'> 	.ndo_open = m_can_open,</div><div class='ctx'> 	.ndo_stop = m_can_close,</div><div class='ctx'> 	.ndo_start_xmit = m_can_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int register_m_can_dev(struct net_device *dev)</div><div class='add'>+static int m_can_get_coalesce(struct net_device *dev,</div><div class='add'>+			      struct ethtool_coalesce *ec,</div><div class='add'>+			      struct kernel_ethtool_coalesce *kec,</div><div class='add'>+			      struct netlink_ext_ack *ext_ack)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	ec-&gt;rx_max_coalesced_frames_irq = cdev-&gt;rx_max_coalesced_frames_irq;</div><div class='add'>+	ec-&gt;rx_coalesce_usecs_irq = cdev-&gt;rx_coalesce_usecs_irq;</div><div class='add'>+	ec-&gt;tx_max_coalesced_frames = cdev-&gt;tx_max_coalesced_frames;</div><div class='add'>+	ec-&gt;tx_max_coalesced_frames_irq = cdev-&gt;tx_max_coalesced_frames_irq;</div><div class='add'>+	ec-&gt;tx_coalesce_usecs_irq = cdev-&gt;tx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_set_coalesce(struct net_device *dev,</div><div class='add'>+			      struct ethtool_coalesce *ec,</div><div class='add'>+			      struct kernel_ethtool_coalesce *kec,</div><div class='add'>+			      struct netlink_ext_ack *ext_ack)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;can.state != CAN_STATE_STOPPED) {</div><div class='add'>+		netdev_err(dev, "Device is in use, please shut it down first\n");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ec-&gt;rx_max_coalesced_frames_irq &gt; cdev-&gt;mcfg[MRAM_RXF0].num) {</div><div class='add'>+		netdev_err(dev, "rx-frames-irq %u greater than the RX FIFO %u\n",</div><div class='add'>+			   ec-&gt;rx_max_coalesced_frames_irq,</div><div class='add'>+			   cdev-&gt;mcfg[MRAM_RXF0].num);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if ((ec-&gt;rx_max_coalesced_frames_irq == 0) != (ec-&gt;rx_coalesce_usecs_irq == 0)) {</div><div class='add'>+		netdev_err(dev, "rx-frames-irq and rx-usecs-irq can only be set together\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ec-&gt;tx_max_coalesced_frames_irq &gt; cdev-&gt;mcfg[MRAM_TXE].num) {</div><div class='add'>+		netdev_err(dev, "tx-frames-irq %u greater than the TX event FIFO %u\n",</div><div class='add'>+			   ec-&gt;tx_max_coalesced_frames_irq,</div><div class='add'>+			   cdev-&gt;mcfg[MRAM_TXE].num);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ec-&gt;tx_max_coalesced_frames_irq &gt; cdev-&gt;mcfg[MRAM_TXB].num) {</div><div class='add'>+		netdev_err(dev, "tx-frames-irq %u greater than the TX FIFO %u\n",</div><div class='add'>+			   ec-&gt;tx_max_coalesced_frames_irq,</div><div class='add'>+			   cdev-&gt;mcfg[MRAM_TXB].num);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if ((ec-&gt;tx_max_coalesced_frames_irq == 0) != (ec-&gt;tx_coalesce_usecs_irq == 0)) {</div><div class='add'>+		netdev_err(dev, "tx-frames-irq and tx-usecs-irq can only be set together\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ec-&gt;tx_max_coalesced_frames &gt; cdev-&gt;mcfg[MRAM_TXE].num) {</div><div class='add'>+		netdev_err(dev, "tx-frames %u greater than the TX event FIFO %u\n",</div><div class='add'>+			   ec-&gt;tx_max_coalesced_frames,</div><div class='add'>+			   cdev-&gt;mcfg[MRAM_TXE].num);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ec-&gt;tx_max_coalesced_frames &gt; cdev-&gt;mcfg[MRAM_TXB].num) {</div><div class='add'>+		netdev_err(dev, "tx-frames %u greater than the TX FIFO %u\n",</div><div class='add'>+			   ec-&gt;tx_max_coalesced_frames,</div><div class='add'>+			   cdev-&gt;mcfg[MRAM_TXB].num);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ec-&gt;rx_coalesce_usecs_irq != 0 &amp;&amp; ec-&gt;tx_coalesce_usecs_irq != 0 &amp;&amp;</div><div class='add'>+	    ec-&gt;rx_coalesce_usecs_irq != ec-&gt;tx_coalesce_usecs_irq) {</div><div class='add'>+		netdev_err(dev, "rx-usecs-irq %u needs to be equal to tx-usecs-irq %u if both are enabled\n",</div><div class='add'>+			   ec-&gt;rx_coalesce_usecs_irq,</div><div class='add'>+			   ec-&gt;tx_coalesce_usecs_irq);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cdev-&gt;rx_max_coalesced_frames_irq = ec-&gt;rx_max_coalesced_frames_irq;</div><div class='add'>+	cdev-&gt;rx_coalesce_usecs_irq = ec-&gt;rx_coalesce_usecs_irq;</div><div class='add'>+	cdev-&gt;tx_max_coalesced_frames = ec-&gt;tx_max_coalesced_frames;</div><div class='add'>+	cdev-&gt;tx_max_coalesced_frames_irq = ec-&gt;tx_max_coalesced_frames_irq;</div><div class='add'>+	cdev-&gt;tx_coalesce_usecs_irq = ec-&gt;tx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;rx_coalesce_usecs_irq)</div><div class='add'>+		cdev-&gt;irq_timer_wait = us_to_ktime(cdev-&gt;rx_coalesce_usecs_irq);</div><div class='add'>+	else</div><div class='add'>+		cdev-&gt;irq_timer_wait = us_to_ktime(cdev-&gt;tx_coalesce_usecs_irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	wol-&gt;supported = device_can_wakeup(cdev-&gt;dev) ? WAKE_PHY : 0;</div><div class='add'>+	wol-&gt;wolopts = device_may_wakeup(cdev-&gt;dev) ? WAKE_PHY : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int m_can_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = netdev_priv(dev);</div><div class='add'>+	bool wol_enable = !!(wol-&gt;wolopts &amp; WAKE_PHY);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~WAKE_PHY)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (wol_enable == device_may_wakeup(cdev-&gt;dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = device_set_wakeup_enable(cdev-&gt;dev, wol_enable);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(cdev-&gt;net, "Failed to set wakeup enable %pE\n",</div><div class='add'>+			   ERR_PTR(ret));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!IS_ERR_OR_NULL(cdev-&gt;pinctrl_state_wakeup)) {</div><div class='add'>+		if (wol_enable)</div><div class='add'>+			ret = pinctrl_select_state(cdev-&gt;pinctrl, cdev-&gt;pinctrl_state_wakeup);</div><div class='add'>+		else</div><div class='add'>+			ret = pinctrl_pm_select_default_state(cdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(cdev-&gt;net, "Failed to select pinctrl state %pE\n",</div><div class='add'>+				   ERR_PTR(ret));</div><div class='add'>+			goto err_wakeup_enable;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_wakeup_enable:</div><div class='add'>+	/* Revert wakeup enable */</div><div class='add'>+	device_set_wakeup_enable(cdev-&gt;dev, !wol_enable);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops m_can_ethtool_ops_coalescing = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS_IRQ |</div><div class='add'>+		ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ |</div><div class='add'>+		ETHTOOL_COALESCE_TX_USECS_IRQ |</div><div class='add'>+		ETHTOOL_COALESCE_TX_MAX_FRAMES |</div><div class='add'>+		ETHTOOL_COALESCE_TX_MAX_FRAMES_IRQ,</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+	.get_coalesce = m_can_get_coalesce,</div><div class='add'>+	.set_coalesce = m_can_set_coalesce,</div><div class='add'>+	.get_wol = m_can_get_wol,</div><div class='add'>+	.set_wol = m_can_set_wol,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops m_can_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+	.get_wol = m_can_get_wol,</div><div class='add'>+	.set_wol = m_can_set_wol,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int register_m_can_dev(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = cdev-&gt;net;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;m_can_netdev_ops;</div><div class='add'>+	if (dev-&gt;irq &amp;&amp; cdev-&gt;is_peripheral)</div><div class='add'>+		dev-&gt;ethtool_ops = &amp;m_can_ethtool_ops_coalescing;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;ethtool_ops = &amp;m_can_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	return register_candev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void m_can_init_ram(struct m_can_priv *priv)</div><div class='add'>+int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size)</div><div class='ctx'> {</div><div class='del'>-	int end, i, start;</div><div class='add'>+	u32 total_size;</div><div class='ctx'> </div><div class='del'>-	/* initialize the entire Message RAM in use to avoid possible</div><div class='del'>-	 * ECC/parity checksum errors when reading an uninitialized buffer</div><div class='del'>-	 */</div><div class='del'>-	start = priv-&gt;mcfg[MRAM_SIDF].off;</div><div class='del'>-	end = priv-&gt;mcfg[MRAM_TXB].off +</div><div class='del'>-		priv-&gt;mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE;</div><div class='del'>-	for (i = start; i &lt; end; i += 4)</div><div class='del'>-		writel(0x0, priv-&gt;mram_base + i);</div><div class='add'>+	total_size = cdev-&gt;mcfg[MRAM_TXB].off - cdev-&gt;mcfg[MRAM_SIDF].off +</div><div class='add'>+			cdev-&gt;mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE;</div><div class='add'>+	if (total_size &gt; mram_max_size) {</div><div class='add'>+		netdev_err(cdev-&gt;net, "Total size of mram config(%u) exceeds mram(%u)\n",</div><div class='add'>+			   total_size, mram_max_size);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_check_mram_cfg);</div><div class='ctx'> </div><div class='del'>-static void m_can_of_parse_mram(struct m_can_priv *priv,</div><div class='add'>+static void m_can_of_parse_mram(struct m_can_classdev *cdev,</div><div class='ctx'> 				const u32 *mram_config_vals)</div><div class='ctx'> {</div><div class='del'>-	priv-&gt;mcfg[MRAM_SIDF].off = mram_config_vals[0];</div><div class='del'>-	priv-&gt;mcfg[MRAM_SIDF].num = mram_config_vals[1];</div><div class='del'>-	priv-&gt;mcfg[MRAM_XIDF].off = priv-&gt;mcfg[MRAM_SIDF].off +</div><div class='del'>-			priv-&gt;mcfg[MRAM_SIDF].num * SIDF_ELEMENT_SIZE;</div><div class='del'>-	priv-&gt;mcfg[MRAM_XIDF].num = mram_config_vals[2];</div><div class='del'>-	priv-&gt;mcfg[MRAM_RXF0].off = priv-&gt;mcfg[MRAM_XIDF].off +</div><div class='del'>-			priv-&gt;mcfg[MRAM_XIDF].num * XIDF_ELEMENT_SIZE;</div><div class='del'>-	priv-&gt;mcfg[MRAM_RXF0].num = mram_config_vals[3] &amp;</div><div class='del'>-			(RXFC_FS_MASK &gt;&gt; RXFC_FS_SHIFT);</div><div class='del'>-	priv-&gt;mcfg[MRAM_RXF1].off = priv-&gt;mcfg[MRAM_RXF0].off +</div><div class='del'>-			priv-&gt;mcfg[MRAM_RXF0].num * RXF0_ELEMENT_SIZE;</div><div class='del'>-	priv-&gt;mcfg[MRAM_RXF1].num = mram_config_vals[4] &amp;</div><div class='del'>-			(RXFC_FS_MASK &gt;&gt; RXFC_FS_SHIFT);</div><div class='del'>-	priv-&gt;mcfg[MRAM_RXB].off = priv-&gt;mcfg[MRAM_RXF1].off +</div><div class='del'>-			priv-&gt;mcfg[MRAM_RXF1].num * RXF1_ELEMENT_SIZE;</div><div class='del'>-	priv-&gt;mcfg[MRAM_RXB].num = mram_config_vals[5];</div><div class='del'>-	priv-&gt;mcfg[MRAM_TXE].off = priv-&gt;mcfg[MRAM_RXB].off +</div><div class='del'>-			priv-&gt;mcfg[MRAM_RXB].num * RXB_ELEMENT_SIZE;</div><div class='del'>-	priv-&gt;mcfg[MRAM_TXE].num = mram_config_vals[6];</div><div class='del'>-	priv-&gt;mcfg[MRAM_TXB].off = priv-&gt;mcfg[MRAM_TXE].off +</div><div class='del'>-			priv-&gt;mcfg[MRAM_TXE].num * TXE_ELEMENT_SIZE;</div><div class='del'>-	priv-&gt;mcfg[MRAM_TXB].num = mram_config_vals[7] &amp;</div><div class='del'>-			(TXBC_NDTB_MASK &gt;&gt; TXBC_NDTB_SHIFT);</div><div class='del'>-</div><div class='del'>-	dev_dbg(priv-&gt;device,</div><div class='del'>-		"mram_base %p sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n",</div><div class='del'>-		priv-&gt;mram_base,</div><div class='del'>-		priv-&gt;mcfg[MRAM_SIDF].off, priv-&gt;mcfg[MRAM_SIDF].num,</div><div class='del'>-		priv-&gt;mcfg[MRAM_XIDF].off, priv-&gt;mcfg[MRAM_XIDF].num,</div><div class='del'>-		priv-&gt;mcfg[MRAM_RXF0].off, priv-&gt;mcfg[MRAM_RXF0].num,</div><div class='del'>-		priv-&gt;mcfg[MRAM_RXF1].off, priv-&gt;mcfg[MRAM_RXF1].num,</div><div class='del'>-		priv-&gt;mcfg[MRAM_RXB].off, priv-&gt;mcfg[MRAM_RXB].num,</div><div class='del'>-		priv-&gt;mcfg[MRAM_TXE].off, priv-&gt;mcfg[MRAM_TXE].num,</div><div class='del'>-		priv-&gt;mcfg[MRAM_TXB].off, priv-&gt;mcfg[MRAM_TXB].num);</div><div class='del'>-</div><div class='del'>-	m_can_init_ram(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int m_can_plat_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct m_can_priv *priv;</div><div class='del'>-	struct resource *res;</div><div class='del'>-	void __iomem *addr;</div><div class='del'>-	void __iomem *mram_addr;</div><div class='del'>-	struct clk *hclk, *cclk;</div><div class='del'>-	int irq, ret;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	u32 mram_config_vals[MRAM_CFG_LEN];</div><div class='del'>-	u32 tx_fifo_size;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_SIDF].off = mram_config_vals[0];</div><div class='add'>+	cdev-&gt;mcfg[MRAM_SIDF].num = mram_config_vals[1];</div><div class='add'>+	cdev-&gt;mcfg[MRAM_XIDF].off = cdev-&gt;mcfg[MRAM_SIDF].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_SIDF].num * SIDF_ELEMENT_SIZE;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_XIDF].num = mram_config_vals[2];</div><div class='add'>+	cdev-&gt;mcfg[MRAM_RXF0].off = cdev-&gt;mcfg[MRAM_XIDF].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_XIDF].num * XIDF_ELEMENT_SIZE;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_RXF0].num = mram_config_vals[3] &amp;</div><div class='add'>+		FIELD_MAX(RXFC_FS_MASK);</div><div class='add'>+	cdev-&gt;mcfg[MRAM_RXF1].off = cdev-&gt;mcfg[MRAM_RXF0].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_RXF0].num * RXF0_ELEMENT_SIZE;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_RXF1].num = mram_config_vals[4] &amp;</div><div class='add'>+		FIELD_MAX(RXFC_FS_MASK);</div><div class='add'>+	cdev-&gt;mcfg[MRAM_RXB].off = cdev-&gt;mcfg[MRAM_RXF1].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_RXF1].num * RXF1_ELEMENT_SIZE;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_RXB].num = mram_config_vals[5];</div><div class='add'>+	cdev-&gt;mcfg[MRAM_TXE].off = cdev-&gt;mcfg[MRAM_RXB].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_RXB].num * RXB_ELEMENT_SIZE;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_TXE].num = mram_config_vals[6];</div><div class='add'>+	cdev-&gt;mcfg[MRAM_TXB].off = cdev-&gt;mcfg[MRAM_TXE].off +</div><div class='add'>+		cdev-&gt;mcfg[MRAM_TXE].num * TXE_ELEMENT_SIZE;</div><div class='add'>+	cdev-&gt;mcfg[MRAM_TXB].num = mram_config_vals[7] &amp;</div><div class='add'>+		FIELD_MAX(TXBC_NDTB_MASK);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(cdev-&gt;net,</div><div class='add'>+		   "sidf 0x%x %d xidf 0x%x %d rxf0 0x%x %d rxf1 0x%x %d rxb 0x%x %d txe 0x%x %d txb 0x%x %d\n",</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_SIDF].off, cdev-&gt;mcfg[MRAM_SIDF].num,</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_XIDF].off, cdev-&gt;mcfg[MRAM_XIDF].num,</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_RXF0].off, cdev-&gt;mcfg[MRAM_RXF0].num,</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_RXF1].off, cdev-&gt;mcfg[MRAM_RXF1].num,</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_RXB].off, cdev-&gt;mcfg[MRAM_RXB].num,</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_TXE].off, cdev-&gt;mcfg[MRAM_TXE].num,</div><div class='add'>+		   cdev-&gt;mcfg[MRAM_TXB].off, cdev-&gt;mcfg[MRAM_TXB].num);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	np = pdev-&gt;dev.of_node;</div><div class='add'>+int m_can_class_get_clocks(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	hclk = devm_clk_get(&amp;pdev-&gt;dev, "hclk");</div><div class='del'>-	cclk = devm_clk_get(&amp;pdev-&gt;dev, "cclk");</div><div class='add'>+	cdev-&gt;hclk = devm_clk_get(cdev-&gt;dev, "hclk");</div><div class='add'>+	cdev-&gt;cclk = devm_clk_get(cdev-&gt;dev, "cclk");</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(hclk) || IS_ERR(cclk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no clock found\n");</div><div class='add'>+	if (IS_ERR(cdev-&gt;hclk) || IS_ERR(cdev-&gt;cclk)) {</div><div class='add'>+		netdev_err(cdev-&gt;net, "no clock found\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='del'>-		goto failed_ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "m_can");</div><div class='del'>-	addr = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	irq = platform_get_irq_byname(pdev, "int0");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_get_clocks);</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR(addr) || irq &lt; 0) {</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto failed_ret;</div><div class='del'>-	}</div><div class='add'>+static bool m_can_class_wakeup_pinctrl_enabled(struct m_can_classdev *class_dev)</div><div class='add'>+{</div><div class='add'>+	return device_may_wakeup(class_dev-&gt;dev) &amp;&amp; class_dev-&gt;pinctrl_state_wakeup;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* message ram could be shared */</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");</div><div class='del'>-	if (!res) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto failed_ret;</div><div class='add'>+static int m_can_class_parse_pinctrl(struct m_can_classdev *class_dev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = class_dev-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	class_dev-&gt;pinctrl = devm_pinctrl_get(dev);</div><div class='add'>+	if (IS_ERR(class_dev-&gt;pinctrl)) {</div><div class='add'>+		ret = PTR_ERR(class_dev-&gt;pinctrl);</div><div class='add'>+		class_dev-&gt;pinctrl = NULL;</div><div class='add'>+</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return dev_err_probe(dev, ret, "Failed to get pinctrl\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mram_addr = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start, resource_size(res));</div><div class='del'>-	if (!mram_addr) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto failed_ret;</div><div class='add'>+	class_dev-&gt;pinctrl_state_wakeup =</div><div class='add'>+		pinctrl_lookup_state(class_dev-&gt;pinctrl, "wakeup");</div><div class='add'>+	if (IS_ERR(class_dev-&gt;pinctrl_state_wakeup)) {</div><div class='add'>+		ret = PTR_ERR(class_dev-&gt;pinctrl_state_wakeup);</div><div class='add'>+		class_dev-&gt;pinctrl_state_wakeup = NULL;</div><div class='add'>+</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return dev_err_probe(dev, ret, "Failed to lookup pinctrl wakeup state\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* get message ram configuration */</div><div class='del'>-	ret = of_property_read_u32_array(np, "bosch,mram-cfg",</div><div class='del'>-					 mram_config_vals,</div><div class='del'>-					 sizeof(mram_config_vals) / 4);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct m_can_classdev *m_can_class_allocate_dev(struct device *dev,</div><div class='add'>+						int sizeof_priv)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *class_dev = NULL;</div><div class='add'>+	u32 mram_config_vals[MRAM_CFG_LEN];</div><div class='add'>+	struct net_device *net_dev;</div><div class='add'>+	u32 tx_fifo_size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fwnode_property_read_u32_array(dev_fwnode(dev),</div><div class='add'>+					     "bosch,mram-cfg",</div><div class='add'>+					     mram_config_vals,</div><div class='add'>+					     sizeof(mram_config_vals) / 4);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Could not get Message RAM configuration.");</div><div class='del'>-		goto failed_ret;</div><div class='add'>+		dev_err(dev, "Could not get Message RAM configuration.");</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;of_node &amp;&amp; of_property_read_bool(dev-&gt;of_node, "wakeup-source"))</div><div class='add'>+		device_set_wakeup_capable(dev, true);</div><div class='add'>+</div><div class='ctx'> 	/* Get TX FIFO size</div><div class='ctx'> 	 * Defines the total amount of echo buffers for loopback</div><div class='ctx'> 	 */</div><div class='ctx'> 	tx_fifo_size = mram_config_vals[7];</div><div class='ctx'> </div><div class='ctx'> 	/* allocate the m_can device */</div><div class='del'>-	dev = alloc_candev(sizeof(*priv), tx_fifo_size);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto failed_ret;</div><div class='add'>+	net_dev = alloc_candev(sizeof_priv, tx_fifo_size);</div><div class='add'>+	if (!net_dev) {</div><div class='add'>+		dev_err(dev, "Failed to allocate CAN device");</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	priv-&gt;device = &amp;pdev-&gt;dev;</div><div class='del'>-	priv-&gt;hclk = hclk;</div><div class='del'>-	priv-&gt;cclk = cclk;</div><div class='del'>-	priv-&gt;can.clock.freq = clk_get_rate(cclk);</div><div class='del'>-	priv-&gt;mram_base = mram_addr;</div><div class='add'>+	class_dev = netdev_priv(net_dev);</div><div class='add'>+	class_dev-&gt;net = net_dev;</div><div class='add'>+	class_dev-&gt;dev = dev;</div><div class='add'>+	SET_NETDEV_DEV(net_dev, dev);</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, dev);</div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='add'>+	m_can_of_parse_mram(class_dev, mram_config_vals);</div><div class='add'>+	spin_lock_init(&amp;class_dev-&gt;tx_handling_spinlock);</div><div class='ctx'> </div><div class='del'>-	/* Enable clocks. Necessary to read Core Release in order to determine</div><div class='del'>-	 * M_CAN version</div><div class='del'>-	 */</div><div class='del'>-	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='del'>-	ret = m_can_clk_start(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto pm_runtime_fail;</div><div class='del'>-</div><div class='del'>-	ret = m_can_dev_setup(pdev, dev, addr);</div><div class='add'>+	ret = m_can_class_parse_pinctrl(class_dev);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto clk_disable;</div><div class='del'>-</div><div class='del'>-	ret = register_m_can_dev(dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "registering %s failed (err=%d)\n",</div><div class='del'>-			KBUILD_MODNAME, ret);</div><div class='del'>-		goto clk_disable;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	m_can_of_parse_mram(priv, mram_config_vals);</div><div class='del'>-</div><div class='del'>-	devm_can_led_init(dev);</div><div class='add'>+		goto err_free_candev;</div><div class='ctx'> </div><div class='del'>-	of_can_transceiver(dev);</div><div class='add'>+	return class_dev;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "%s device registered (irq=%d, version=%d)\n",</div><div class='del'>-		 KBUILD_MODNAME, dev-&gt;irq, priv-&gt;version);</div><div class='del'>-</div><div class='del'>-	/* Probe finished</div><div class='del'>-	 * Stop clocks. They will be reactivated once the M_CAN device is opened</div><div class='del'>-	 */</div><div class='del'>-clk_disable:</div><div class='del'>-	m_can_clk_stop(priv);</div><div class='del'>-pm_runtime_fail:</div><div class='del'>-	if (ret) {</div><div class='del'>-		pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='del'>-		free_candev(dev);</div><div class='del'>-	}</div><div class='del'>-failed_ret:</div><div class='del'>-	return ret;</div><div class='add'>+err_free_candev:</div><div class='add'>+	free_candev(net_dev);</div><div class='add'>+	return ERR_PTR(ret);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_allocate_dev);</div><div class='ctx'> </div><div class='del'>-static __maybe_unused int m_can_suspend(struct device *dev)</div><div class='add'>+void m_can_class_free_dev(struct net_device *net)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(ndev);</div><div class='add'>+	free_candev(net);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_free_dev);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(ndev)) {</div><div class='del'>-		netif_stop_queue(ndev);</div><div class='del'>-		netif_device_detach(ndev);</div><div class='del'>-		m_can_stop(ndev);</div><div class='del'>-		m_can_clk_stop(priv);</div><div class='add'>+int m_can_class_register(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cdev-&gt;tx_fifo_size = max(1, min(cdev-&gt;mcfg[MRAM_TXB].num,</div><div class='add'>+					cdev-&gt;mcfg[MRAM_TXE].num));</div><div class='add'>+	if (cdev-&gt;is_peripheral) {</div><div class='add'>+		cdev-&gt;tx_ops =</div><div class='add'>+			devm_kzalloc(cdev-&gt;dev,</div><div class='add'>+				     cdev-&gt;tx_fifo_size * sizeof(*cdev-&gt;tx_ops),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!cdev-&gt;tx_ops)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pinctrl_pm_select_sleep_state(dev);</div><div class='add'>+	cdev-&gt;rst = devm_reset_control_get_optional_shared(cdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(cdev-&gt;rst))</div><div class='add'>+		return dev_err_probe(cdev-&gt;dev, PTR_ERR(cdev-&gt;rst),</div><div class='add'>+				     "Failed to get reset line\n");</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='add'>+	ret = m_can_clk_start(cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	ret = reset_control_deassert(cdev-&gt;rst);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto clk_disable;</div><div class='ctx'> </div><div class='del'>-static __maybe_unused int m_can_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(ndev);</div><div class='add'>+	if (cdev-&gt;is_peripheral) {</div><div class='add'>+		ret = can_rx_offload_add_manual(cdev-&gt;net, &amp;cdev-&gt;offload,</div><div class='add'>+						NAPI_POLL_WEIGHT);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_reset_control_assert;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	pinctrl_pm_select_default_state(dev);</div><div class='add'>+	if (!cdev-&gt;net-&gt;irq) {</div><div class='add'>+		netdev_dbg(cdev-&gt;net, "Polling enabled, initialize hrtimer");</div><div class='add'>+		hrtimer_setup(&amp;cdev-&gt;hrtimer, m_can_polling_timer, CLOCK_MONOTONIC,</div><div class='add'>+			      HRTIMER_MODE_REL_PINNED);</div><div class='add'>+	} else {</div><div class='add'>+		hrtimer_setup(&amp;cdev-&gt;hrtimer, m_can_coalescing_timer, CLOCK_MONOTONIC,</div><div class='add'>+			      HRTIMER_MODE_REL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	ret = m_can_dev_setup(cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto rx_offload_del;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(ndev)) {</div><div class='del'>-		int ret;</div><div class='add'>+	ret = register_m_can_dev(cdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(cdev-&gt;net, "registering %s failed (err=%d)\n",</div><div class='add'>+			   cdev-&gt;net-&gt;name, ret);</div><div class='add'>+		goto rx_offload_del;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		ret = m_can_clk_start(priv);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+	of_can_transceiver(cdev-&gt;net);</div><div class='ctx'> </div><div class='del'>-		m_can_init_ram(priv);</div><div class='del'>-		m_can_start(ndev);</div><div class='del'>-		netif_device_attach(ndev);</div><div class='del'>-		netif_start_queue(ndev);</div><div class='del'>-	}</div><div class='add'>+	netdev_info(cdev-&gt;net, "device registered (irq=%d, version=%d)\n",</div><div class='add'>+		    cdev-&gt;net-&gt;irq, cdev-&gt;version);</div><div class='add'>+</div><div class='add'>+	/* Probe finished</div><div class='add'>+	 * Assert reset and stop clocks.</div><div class='add'>+	 * They will be reactivated once the M_CAN device is opened</div><div class='add'>+	 */</div><div class='add'>+	reset_control_assert(cdev-&gt;rst);</div><div class='add'>+	m_can_clk_stop(cdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+rx_offload_del:</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		can_rx_offload_del(&amp;cdev-&gt;offload);</div><div class='add'>+out_reset_control_assert:</div><div class='add'>+	reset_control_assert(cdev-&gt;rst);</div><div class='add'>+clk_disable:</div><div class='add'>+	m_can_clk_stop(cdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_register);</div><div class='ctx'> </div><div class='del'>-static void unregister_m_can_dev(struct net_device *dev)</div><div class='add'>+void m_can_class_unregister(struct m_can_classdev *cdev)</div><div class='ctx'> {</div><div class='del'>-	unregister_candev(dev);</div><div class='add'>+	unregister_candev(cdev-&gt;net);</div><div class='add'>+	if (cdev-&gt;is_peripheral)</div><div class='add'>+		can_rx_offload_del(&amp;cdev-&gt;offload);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_unregister);</div><div class='ctx'> </div><div class='del'>-static int m_can_plat_remove(struct platform_device *pdev)</div><div class='add'>+int m_can_class_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+	struct m_can_classdev *cdev = dev_get_drvdata(dev);</div><div class='add'>+	struct net_device *ndev = cdev-&gt;net;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	unregister_m_can_dev(dev);</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+		netif_device_detach(ndev);</div><div class='ctx'> </div><div class='del'>-	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+		/* leave the chip running with rx interrupt enabled if it is</div><div class='add'>+		 * used as a wake-up source. Coalescing needs to be reset then,</div><div class='add'>+		 * the timer is cancelled here, interrupts are done in resume.</div><div class='add'>+		 */</div><div class='add'>+		if (cdev-&gt;pm_wake_source) {</div><div class='add'>+			hrtimer_cancel(&amp;cdev-&gt;hrtimer);</div><div class='add'>+			m_can_write(cdev, M_CAN_IE, IR_RF0N);</div><div class='add'>+</div><div class='add'>+			if (cdev-&gt;ops-&gt;deinit)</div><div class='add'>+				ret = cdev-&gt;ops-&gt;deinit(cdev);</div><div class='add'>+		} else {</div><div class='add'>+			m_can_stop(ndev);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, NULL);</div><div class='add'>+		m_can_clk_stop(cdev);</div><div class='add'>+		cdev-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	free_candev(dev);</div><div class='add'>+	if (!m_can_class_wakeup_pinctrl_enabled(cdev))</div><div class='add'>+		pinctrl_pm_select_sleep_state(dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_suspend);</div><div class='ctx'> </div><div class='del'>-static int __maybe_unused m_can_runtime_suspend(struct device *dev)</div><div class='add'>+int m_can_class_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct m_can_classdev *cdev = dev_get_drvdata(dev);</div><div class='add'>+	struct net_device *ndev = cdev-&gt;net;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	clk_disable_unprepare(priv-&gt;cclk);</div><div class='del'>-	clk_disable_unprepare(priv-&gt;hclk);</div><div class='add'>+	if (!m_can_class_wakeup_pinctrl_enabled(cdev))</div><div class='add'>+		pinctrl_pm_select_default_state(dev);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __maybe_unused m_can_runtime_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	struct m_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	int err;</div><div class='add'>+	if (netif_running(ndev)) {</div><div class='add'>+		ret = m_can_clk_start(cdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;hclk);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		if (cdev-&gt;pm_wake_source) {</div><div class='add'>+			/* Restore active interrupts but disable coalescing as</div><div class='add'>+			 * we may have missed important waterlevel interrupts</div><div class='add'>+			 * between suspend and resume. Timers are already</div><div class='add'>+			 * stopped in suspend. Here we enable all interrupts</div><div class='add'>+			 * again.</div><div class='add'>+			 */</div><div class='add'>+			cdev-&gt;active_interrupts |= IR_RF0N | IR_TEFN;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;cclk);</div><div class='del'>-	if (err)</div><div class='del'>-		clk_disable_unprepare(priv-&gt;hclk);</div><div class='add'>+			if (cdev-&gt;ops-&gt;init)</div><div class='add'>+				ret = cdev-&gt;ops-&gt;init(cdev);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+			cdev-&gt;can.state = m_can_state_get_by_psr(cdev);</div><div class='ctx'> </div><div class='del'>-static const struct dev_pm_ops m_can_pmops = {</div><div class='del'>-	SET_RUNTIME_PM_OPS(m_can_runtime_suspend,</div><div class='del'>-			   m_can_runtime_resume, NULL)</div><div class='del'>-	SET_SYSTEM_SLEEP_PM_OPS(m_can_suspend, m_can_resume)</div><div class='del'>-};</div><div class='add'>+			m_can_write(cdev, M_CAN_IE, cdev-&gt;active_interrupts);</div><div class='add'>+		} else {</div><div class='add'>+			ret  = m_can_start(ndev);</div><div class='add'>+			if (ret) {</div><div class='add'>+				m_can_clk_stop(cdev);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id m_can_of_table[] = {</div><div class='del'>-	{ .compatible = "bosch,m_can", .data = NULL },</div><div class='del'>-	{ /* sentinel */ },</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, m_can_of_table);</div><div class='del'>-</div><div class='del'>-static struct platform_driver m_can_plat_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = KBUILD_MODNAME,</div><div class='del'>-		.of_match_table = m_can_of_table,</div><div class='del'>-		.pm     = &amp;m_can_pmops,</div><div class='del'>-	},</div><div class='del'>-	.probe = m_can_plat_probe,</div><div class='del'>-	.remove = m_can_plat_remove,</div><div class='del'>-};</div><div class='add'>+		netif_device_attach(ndev);</div><div class='add'>+		netif_start_queue(ndev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-module_platform_driver(m_can_plat_driver);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(m_can_class_resume);</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Dong Aisheng &lt;b29396@freescale.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Dong Aisheng &lt;aisheng.dong@nxp.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Dan Murphy &lt;dmurphy@ti.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> MODULE_DESCRIPTION("CAN bus driver for Bosch M_CAN controller");</div><div class='head'>diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h<br/>new file mode 100644<br/>index 000000000000..4743342b2fba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/m_can.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/m_can.h</a></div><div class='hunk'>@@ -0,0 +1,146 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* CAN bus driver for Bosch M_CAN controller</div><div class='add'>+ * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _CAN_M_CAN_H_</div><div class='add'>+#define _CAN_M_CAN_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/core.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/freezer.h&gt;</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+/* m_can lec values */</div><div class='add'>+enum m_can_lec_type {</div><div class='add'>+	LEC_NO_ERROR = 0,</div><div class='add'>+	LEC_STUFF_ERROR,</div><div class='add'>+	LEC_FORM_ERROR,</div><div class='add'>+	LEC_ACK_ERROR,</div><div class='add'>+	LEC_BIT1_ERROR,</div><div class='add'>+	LEC_BIT0_ERROR,</div><div class='add'>+	LEC_CRC_ERROR,</div><div class='add'>+	LEC_NO_CHANGE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum m_can_mram_cfg {</div><div class='add'>+	MRAM_SIDF = 0,</div><div class='add'>+	MRAM_XIDF,</div><div class='add'>+	MRAM_RXF0,</div><div class='add'>+	MRAM_RXF1,</div><div class='add'>+	MRAM_RXB,</div><div class='add'>+	MRAM_TXE,</div><div class='add'>+	MRAM_TXB,</div><div class='add'>+	MRAM_CFG_NUM,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* address offset and element number for each FIFO/Buffer in the Message RAM */</div><div class='add'>+struct mram_cfg {</div><div class='add'>+	u16 off;</div><div class='add'>+	u8  num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m_can_classdev;</div><div class='add'>+struct m_can_ops {</div><div class='add'>+	/* Device specific call backs */</div><div class='add'>+	int (*clear_interrupts)(struct m_can_classdev *cdev);</div><div class='add'>+	u32 (*read_reg)(struct m_can_classdev *cdev, int reg);</div><div class='add'>+	int (*write_reg)(struct m_can_classdev *cdev, int reg, int val);</div><div class='add'>+	int (*read_fifo)(struct m_can_classdev *cdev, int addr_offset, void *val, size_t val_count);</div><div class='add'>+	int (*write_fifo)(struct m_can_classdev *cdev, int addr_offset,</div><div class='add'>+			  const void *val, size_t val_count);</div><div class='add'>+	int (*init)(struct m_can_classdev *cdev);</div><div class='add'>+	int (*deinit)(struct m_can_classdev *cdev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m_can_tx_op {</div><div class='add'>+	struct m_can_classdev *cdev;</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool submit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m_can_classdev {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	struct net_device *net;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct clk *hclk;</div><div class='add'>+	struct clk *cclk;</div><div class='add'>+	struct reset_control *rst;</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct *tx_wq;</div><div class='add'>+	struct phy *transceiver;</div><div class='add'>+</div><div class='add'>+	ktime_t irq_timer_wait;</div><div class='add'>+</div><div class='add'>+	const struct m_can_ops *ops;</div><div class='add'>+</div><div class='add'>+	int version;</div><div class='add'>+	u32 irqstatus;</div><div class='add'>+</div><div class='add'>+	int pm_clock_support;</div><div class='add'>+	int pm_wake_source;</div><div class='add'>+	int is_peripheral;</div><div class='add'>+	bool irq_edge_triggered;</div><div class='add'>+</div><div class='add'>+	// Cached M_CAN_IE register content</div><div class='add'>+	u32 active_interrupts;</div><div class='add'>+	u32 rx_max_coalesced_frames_irq;</div><div class='add'>+	u32 rx_coalesce_usecs_irq;</div><div class='add'>+	u32 tx_max_coalesced_frames;</div><div class='add'>+	u32 tx_max_coalesced_frames_irq;</div><div class='add'>+	u32 tx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	// Store this internally to avoid fetch delays on peripheral chips</div><div class='add'>+	u32 tx_fifo_putidx;</div><div class='add'>+</div><div class='add'>+	/* Protects shared state between start_xmit and m_can_isr */</div><div class='add'>+	spinlock_t tx_handling_spinlock;</div><div class='add'>+	int tx_fifo_in_flight;</div><div class='add'>+</div><div class='add'>+	struct m_can_tx_op *tx_ops;</div><div class='add'>+	int tx_fifo_size;</div><div class='add'>+	int next_tx_op;</div><div class='add'>+</div><div class='add'>+	int nr_txs_without_submit;</div><div class='add'>+	/* bitfield of fifo elements that will be submitted together */</div><div class='add'>+	u32 tx_peripheral_submit;</div><div class='add'>+</div><div class='add'>+	struct mram_cfg mcfg[MRAM_CFG_NUM];</div><div class='add'>+</div><div class='add'>+	struct hrtimer hrtimer;</div><div class='add'>+</div><div class='add'>+	struct pinctrl *pinctrl;</div><div class='add'>+	struct pinctrl_state *pinctrl_state_wakeup;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, int sizeof_priv);</div><div class='add'>+void m_can_class_free_dev(struct net_device *net);</div><div class='add'>+int m_can_class_register(struct m_can_classdev *cdev);</div><div class='add'>+void m_can_class_unregister(struct m_can_classdev *cdev);</div><div class='add'>+int m_can_class_get_clocks(struct m_can_classdev *cdev);</div><div class='add'>+int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size);</div><div class='add'>+</div><div class='add'>+int m_can_class_suspend(struct device *dev);</div><div class='add'>+int m_can_class_resume(struct device *dev);</div><div class='add'>+#endif	/* _CAN_M_H_ */</div><div class='head'>diff --git a/drivers/net/can/m_can/m_can_pci.c b/drivers/net/can/m_can/m_can_pci.c<br/>new file mode 100644<br/>index 000000000000..eb31ed1f9644<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/m_can_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/m_can_pci.c</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * PCI Specific M_CAN Glue</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018-2020 Intel Corporation</div><div class='add'>+ * Author: Felipe Balbi (Intel)</div><div class='add'>+ * Author: Jarkko Nikula &lt;jarkko.nikula@linux.intel.com&gt;</div><div class='add'>+ * Author: Raymond Tan &lt;raymond.tan@intel.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+</div><div class='add'>+#include "m_can.h"</div><div class='add'>+</div><div class='add'>+#define M_CAN_PCI_MMIO_BAR		0</div><div class='add'>+</div><div class='add'>+#define M_CAN_CLOCK_FREQ_EHL		200000000</div><div class='add'>+#define CTL_CSR_INT_CTL_OFFSET		0x508</div><div class='add'>+</div><div class='add'>+struct m_can_pci_priv {</div><div class='add'>+	struct m_can_classdev cdev;</div><div class='add'>+</div><div class='add'>+	void __iomem *base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct m_can_pci_priv *cdev_to_priv(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	return container_of(cdev, struct m_can_pci_priv, cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iomap_read_reg(struct m_can_classdev *cdev, int reg)</div><div class='add'>+{</div><div class='add'>+	struct m_can_pci_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return readl(priv-&gt;base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_read_fifo(struct m_can_classdev *cdev, int offset, void *val, size_t val_count)</div><div class='add'>+{</div><div class='add'>+	struct m_can_pci_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+	void __iomem *src = priv-&gt;base + offset;</div><div class='add'>+</div><div class='add'>+	while (val_count--) {</div><div class='add'>+		*(unsigned int *)val = ioread32(src);</div><div class='add'>+		val += 4;</div><div class='add'>+		src += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_write_reg(struct m_can_classdev *cdev, int reg, int val)</div><div class='add'>+{</div><div class='add'>+	struct m_can_pci_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	writel(val, priv-&gt;base + reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_write_fifo(struct m_can_classdev *cdev, int offset,</div><div class='add'>+			    const void *val, size_t val_count)</div><div class='add'>+{</div><div class='add'>+	struct m_can_pci_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+	void __iomem *dst = priv-&gt;base + offset;</div><div class='add'>+</div><div class='add'>+	while (val_count--) {</div><div class='add'>+		iowrite32(*(unsigned int *)val, dst);</div><div class='add'>+		val += 4;</div><div class='add'>+		dst += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct m_can_ops m_can_pci_ops = {</div><div class='add'>+	.read_reg = iomap_read_reg,</div><div class='add'>+	.write_reg = iomap_write_reg,</div><div class='add'>+	.write_fifo = iomap_write_fifo,</div><div class='add'>+	.read_fifo = iomap_read_fifo,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int m_can_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pci-&gt;dev;</div><div class='add'>+	struct m_can_classdev *mcan_class;</div><div class='add'>+	struct m_can_pci_priv *priv;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pcim_enable_device(pci);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	pci_set_master(pci);</div><div class='add'>+</div><div class='add'>+	ret = pcim_iomap_regions(pci, BIT(M_CAN_PCI_MMIO_BAR), pci_name(pci));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	base = pcim_iomap_table(pci)[M_CAN_PCI_MMIO_BAR];</div><div class='add'>+</div><div class='add'>+	if (!base) {</div><div class='add'>+		dev_err(dev, "failed to map BARs\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcan_class = m_can_class_allocate_dev(&amp;pci-&gt;dev,</div><div class='add'>+					      sizeof(struct m_can_pci_priv));</div><div class='add'>+	if (IS_ERR(mcan_class))</div><div class='add'>+		return PTR_ERR(mcan_class);</div><div class='add'>+</div><div class='add'>+	priv = cdev_to_priv(mcan_class);</div><div class='add'>+</div><div class='add'>+	priv-&gt;base = base;</div><div class='add'>+</div><div class='add'>+	ret = pci_alloc_irq_vectors(pci, 1, 1, PCI_IRQ_ALL_TYPES);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_free_dev;</div><div class='add'>+</div><div class='add'>+	mcan_class-&gt;dev = &amp;pci-&gt;dev;</div><div class='add'>+	mcan_class-&gt;net-&gt;irq = pci_irq_vector(pci, 0);</div><div class='add'>+	mcan_class-&gt;pm_clock_support = 1;</div><div class='add'>+	mcan_class-&gt;pm_wake_source = 0;</div><div class='add'>+	mcan_class-&gt;can.clock.freq = id-&gt;driver_data;</div><div class='add'>+	mcan_class-&gt;irq_edge_triggered = true;</div><div class='add'>+	mcan_class-&gt;ops = &amp;m_can_pci_ops;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pci, mcan_class);</div><div class='add'>+</div><div class='add'>+	ret = m_can_class_register(mcan_class);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	/* Enable interrupt control at CAN wrapper IP */</div><div class='add'>+	writel(0x1, base + CTL_CSR_INT_CTL_OFFSET);</div><div class='add'>+</div><div class='add'>+	pm_runtime_set_autosuspend_delay(dev, 1000);</div><div class='add'>+	pm_runtime_use_autosuspend(dev);</div><div class='add'>+	pm_runtime_put_noidle(dev);</div><div class='add'>+	pm_runtime_allow(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	pci_free_irq_vectors(pci);</div><div class='add'>+err_free_dev:</div><div class='add'>+	m_can_class_free_dev(mcan_class-&gt;net);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_pci_remove(struct pci_dev *pci)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *mcan_class = pci_get_drvdata(pci);</div><div class='add'>+	struct m_can_pci_priv *priv = cdev_to_priv(mcan_class);</div><div class='add'>+</div><div class='add'>+	pm_runtime_forbid(&amp;pci-&gt;dev);</div><div class='add'>+	pm_runtime_get_noresume(&amp;pci-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupt control at CAN wrapper IP */</div><div class='add'>+	writel(0x0, priv-&gt;base + CTL_CSR_INT_CTL_OFFSET);</div><div class='add'>+</div><div class='add'>+	m_can_class_unregister(mcan_class);</div><div class='add'>+	m_can_class_free_dev(mcan_class-&gt;net);</div><div class='add'>+	pci_free_irq_vectors(pci);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int m_can_pci_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return m_can_class_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int m_can_pci_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return m_can_class_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(m_can_pci_pm_ops,</div><div class='add'>+			 m_can_pci_suspend, m_can_pci_resume);</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id m_can_pci_id_table[] = {</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x4bc1), M_CAN_CLOCK_FREQ_EHL, },</div><div class='add'>+	{ PCI_VDEVICE(INTEL, 0x4bc2), M_CAN_CLOCK_FREQ_EHL, },</div><div class='add'>+	{  }	/* Terminating Entry */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, m_can_pci_id_table);</div><div class='add'>+</div><div class='add'>+static struct pci_driver m_can_pci_driver = {</div><div class='add'>+	.name = "m_can_pci",</div><div class='add'>+	.probe = m_can_pci_probe,</div><div class='add'>+	.remove = m_can_pci_remove,</div><div class='add'>+	.id_table = m_can_pci_id_table,</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;m_can_pci_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_pci_driver(m_can_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Felipe Balbi (Intel)");</div><div class='add'>+MODULE_AUTHOR("Jarkko Nikula &lt;jarkko.nikula@linux.intel.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Raymond Tan &lt;raymond.tan@intel.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("CAN bus driver for Bosch M_CAN controller on PCI bus");</div><div class='head'>diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c<br/>new file mode 100644<br/>index 000000000000..56da411878af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/m_can_platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/m_can_platform.c</a></div><div class='hunk'>@@ -0,0 +1,242 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// IOMapped CAN bus driver for Bosch M_CAN controller</div><div class='add'>+// Copyright (C) 2014 Freescale Semiconductor, Inc.</div><div class='add'>+//	Dong Aisheng &lt;aisheng.dong@nxp.com&gt;</div><div class='add'>+//</div><div class='add'>+// Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+</div><div class='add'>+#include &lt;linux/hrtimer.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "m_can.h"</div><div class='add'>+</div><div class='add'>+struct m_can_plat_priv {</div><div class='add'>+	struct m_can_classdev cdev;</div><div class='add'>+</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	void __iomem *mram_base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct m_can_plat_priv *cdev_to_priv(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	return container_of(cdev, struct m_can_plat_priv, cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 iomap_read_reg(struct m_can_classdev *cdev, int reg)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return readl(priv-&gt;base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_read_fifo(struct m_can_classdev *cdev, int offset, void *val, size_t val_count)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+	void __iomem *src = priv-&gt;mram_base + offset;</div><div class='add'>+</div><div class='add'>+	while (val_count--) {</div><div class='add'>+		*(unsigned int *)val = ioread32(src);</div><div class='add'>+		val += 4;</div><div class='add'>+		src += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_write_reg(struct m_can_classdev *cdev, int reg, int val)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	writel(val, priv-&gt;base + reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int iomap_write_fifo(struct m_can_classdev *cdev, int offset,</div><div class='add'>+			    const void *val, size_t val_count)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+	void __iomem *dst = priv-&gt;mram_base + offset;</div><div class='add'>+</div><div class='add'>+	while (val_count--) {</div><div class='add'>+		iowrite32(*(unsigned int *)val, dst);</div><div class='add'>+		val += 4;</div><div class='add'>+		dst += 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct m_can_ops m_can_plat_ops = {</div><div class='add'>+	.read_reg = iomap_read_reg,</div><div class='add'>+	.write_reg = iomap_write_reg,</div><div class='add'>+	.write_fifo = iomap_write_fifo,</div><div class='add'>+	.read_fifo = iomap_read_fifo,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int m_can_plat_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *mcan_class;</div><div class='add'>+	struct m_can_plat_priv *priv;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	void __iomem *mram_addr;</div><div class='add'>+	struct phy *transceiver;</div><div class='add'>+	int irq = 0, ret = 0;</div><div class='add'>+</div><div class='add'>+	mcan_class = m_can_class_allocate_dev(&amp;pdev-&gt;dev,</div><div class='add'>+					      sizeof(struct m_can_plat_priv));</div><div class='add'>+	if (IS_ERR(mcan_class))</div><div class='add'>+		return PTR_ERR(mcan_class);</div><div class='add'>+</div><div class='add'>+	priv = cdev_to_priv(mcan_class);</div><div class='add'>+</div><div class='add'>+	ret = m_can_class_get_clocks(mcan_class);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto probe_fail;</div><div class='add'>+</div><div class='add'>+	addr = devm_platform_ioremap_resource_byname(pdev, "m_can");</div><div class='add'>+	if (IS_ERR(addr)) {</div><div class='add'>+		ret = PTR_ERR(addr);</div><div class='add'>+		goto probe_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (device_property_present(mcan_class-&gt;dev, "interrupts") ||</div><div class='add'>+	    device_property_present(mcan_class-&gt;dev, "interrupt-names")) {</div><div class='add'>+		irq = platform_get_irq_byname(pdev, "int0");</div><div class='add'>+		if (irq &lt; 0) {</div><div class='add'>+			ret = irq;</div><div class='add'>+			goto probe_fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* message ram could be shared */</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram");</div><div class='add'>+	if (!res) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto probe_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mram_addr = devm_ioremap(&amp;pdev-&gt;dev, res-&gt;start, resource_size(res));</div><div class='add'>+	if (!mram_addr) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto probe_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	transceiver = devm_phy_optional_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(transceiver)) {</div><div class='add'>+		ret = PTR_ERR(transceiver);</div><div class='add'>+		dev_err_probe(&amp;pdev-&gt;dev, ret, "failed to get phy\n");</div><div class='add'>+		goto probe_fail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (transceiver)</div><div class='add'>+		mcan_class-&gt;can.bitrate_max = transceiver-&gt;attrs.max_link_rate;</div><div class='add'>+</div><div class='add'>+	priv-&gt;base = addr;</div><div class='add'>+	priv-&gt;mram_base = mram_addr;</div><div class='add'>+</div><div class='add'>+	mcan_class-&gt;net-&gt;irq = irq;</div><div class='add'>+	mcan_class-&gt;pm_clock_support = 1;</div><div class='add'>+	mcan_class-&gt;pm_wake_source = 0;</div><div class='add'>+	mcan_class-&gt;can.clock.freq = clk_get_rate(mcan_class-&gt;cclk);</div><div class='add'>+	mcan_class-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	mcan_class-&gt;transceiver = transceiver;</div><div class='add'>+</div><div class='add'>+	mcan_class-&gt;ops = &amp;m_can_plat_ops;</div><div class='add'>+</div><div class='add'>+	mcan_class-&gt;is_peripheral = false;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, mcan_class);</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(mcan_class-&gt;dev);</div><div class='add'>+	ret = m_can_class_register(mcan_class);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_runtime_disable;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+out_runtime_disable:</div><div class='add'>+	pm_runtime_disable(mcan_class-&gt;dev);</div><div class='add'>+probe_fail:</div><div class='add'>+	m_can_class_free_dev(mcan_class-&gt;net);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int m_can_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return m_can_class_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int m_can_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return m_can_class_resume(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void m_can_plat_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+	struct m_can_classdev *mcan_class = &amp;priv-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	m_can_class_unregister(mcan_class);</div><div class='add'>+	pm_runtime_disable(mcan_class-&gt;dev);</div><div class='add'>+	m_can_class_free_dev(mcan_class-&gt;net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused m_can_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	struct m_can_classdev *mcan_class = &amp;priv-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(mcan_class-&gt;cclk);</div><div class='add'>+	clk_disable_unprepare(mcan_class-&gt;hclk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused m_can_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_plat_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+	struct m_can_classdev *mcan_class = &amp;priv-&gt;cdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(mcan_class-&gt;hclk);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(mcan_class-&gt;cclk);</div><div class='add'>+	if (err)</div><div class='add'>+		clk_disable_unprepare(mcan_class-&gt;hclk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops m_can_pmops = {</div><div class='add'>+	SET_RUNTIME_PM_OPS(m_can_runtime_suspend,</div><div class='add'>+			   m_can_runtime_resume, NULL)</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(m_can_suspend, m_can_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id m_can_of_table[] = {</div><div class='add'>+	{ .compatible = "bosch,m_can", .data = NULL },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, m_can_of_table);</div><div class='add'>+</div><div class='add'>+static struct platform_driver m_can_plat_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.of_match_table = m_can_of_table,</div><div class='add'>+		.pm     = &amp;m_can_pmops,</div><div class='add'>+	},</div><div class='add'>+	.probe = m_can_plat_probe,</div><div class='add'>+	.remove = m_can_plat_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(m_can_plat_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Dong Aisheng &lt;aisheng.dong@nxp.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Dan Murphy &lt;dmurphy@ti.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("M_CAN driver for IO Mapped Bosch controllers");</div><div class='head'>diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c<br/>new file mode 100644<br/>index 000000000000..31cc9d0abd45<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/tcan4x5x-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/tcan4x5x-core.c</a></div><div class='hunk'>@@ -0,0 +1,610 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// SPI to CAN driver for the Texas Instruments TCAN4x5x</div><div class='add'>+// Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/</div><div class='add'>+</div><div class='add'>+#include "tcan4x5x.h"</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_EXT_CLK_DEF 40000000</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_DEV_ID1 0x00</div><div class='add'>+#define TCAN4X5X_DEV_ID1_TCAN 0x4e414354 /* ASCII TCAN */</div><div class='add'>+#define TCAN4X5X_DEV_ID2 0x04</div><div class='add'>+#define TCAN4X5X_REV 0x08</div><div class='add'>+#define TCAN4X5X_STATUS 0x0C</div><div class='add'>+#define TCAN4X5X_ERROR_STATUS_MASK 0x10</div><div class='add'>+#define TCAN4X5X_CONTROL 0x14</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_CONFIG 0x800</div><div class='add'>+#define TCAN4X5X_TS_PRESCALE 0x804</div><div class='add'>+#define TCAN4X5X_TEST_REG 0x808</div><div class='add'>+#define TCAN4X5X_INT_FLAGS 0x820</div><div class='add'>+#define TCAN4X5X_MCAN_INT_REG 0x824</div><div class='add'>+#define TCAN4X5X_INT_EN 0x830</div><div class='add'>+</div><div class='add'>+/* Interrupt bits */</div><div class='add'>+#define TCAN4X5X_CANBUSTERMOPEN_INT_EN BIT(30)</div><div class='add'>+#define TCAN4X5X_CANHCANL_INT_EN BIT(29)</div><div class='add'>+#define TCAN4X5X_CANHBAT_INT_EN BIT(28)</div><div class='add'>+#define TCAN4X5X_CANLGND_INT_EN BIT(27)</div><div class='add'>+#define TCAN4X5X_CANBUSOPEN_INT_EN BIT(26)</div><div class='add'>+#define TCAN4X5X_CANBUSGND_INT_EN BIT(25)</div><div class='add'>+#define TCAN4X5X_CANBUSBAT_INT_EN BIT(24)</div><div class='add'>+#define TCAN4X5X_UVSUP_INT_EN BIT(22)</div><div class='add'>+#define TCAN4X5X_UVIO_INT_EN BIT(21)</div><div class='add'>+#define TCAN4X5X_TSD_INT_EN BIT(19)</div><div class='add'>+#define TCAN4X5X_ECCERR_INT_EN BIT(16)</div><div class='add'>+#define TCAN4X5X_CANINT_INT_EN BIT(15)</div><div class='add'>+#define TCAN4X5X_LWU_INT_EN BIT(14)</div><div class='add'>+#define TCAN4X5X_CANSLNT_INT_EN BIT(10)</div><div class='add'>+#define TCAN4X5X_CANDOM_INT_EN BIT(8)</div><div class='add'>+#define TCAN4X5X_CANBUS_ERR_INT_EN BIT(5)</div><div class='add'>+#define TCAN4X5X_BUS_FAULT BIT(4)</div><div class='add'>+#define TCAN4X5X_MCAN_INT BIT(1)</div><div class='add'>+#define TCAN4X5X_ENABLE_TCAN_INT \</div><div class='add'>+	(TCAN4X5X_MCAN_INT | TCAN4X5X_BUS_FAULT | \</div><div class='add'>+	 TCAN4X5X_CANBUS_ERR_INT_EN | TCAN4X5X_CANINT_INT_EN)</div><div class='add'>+</div><div class='add'>+/* MCAN Interrupt bits */</div><div class='add'>+#define TCAN4X5X_MCAN_IR_ARA BIT(29)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_PED BIT(28)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_PEA BIT(27)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_WD BIT(26)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_BO BIT(25)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_EW BIT(24)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_EP BIT(23)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_ELO BIT(22)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_BEU BIT(21)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_BEC BIT(20)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_DRX BIT(19)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TOO BIT(18)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_MRAF BIT(17)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TSW BIT(16)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TEFL BIT(15)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TEFF BIT(14)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TEFW BIT(13)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TEFN BIT(12)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TFE BIT(11)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TCF BIT(10)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_TC BIT(9)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_HPM BIT(8)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF1L BIT(7)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF1F BIT(6)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF1W BIT(5)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF1N BIT(4)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF0L BIT(3)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF0F BIT(2)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF0W BIT(1)</div><div class='add'>+#define TCAN4X5X_MCAN_IR_RF0N BIT(0)</div><div class='add'>+#define TCAN4X5X_ENABLE_MCAN_INT \</div><div class='add'>+	(TCAN4X5X_MCAN_IR_TC | TCAN4X5X_MCAN_IR_RF0N | \</div><div class='add'>+	 TCAN4X5X_MCAN_IR_RF1N | TCAN4X5X_MCAN_IR_RF0F | \</div><div class='add'>+	 TCAN4X5X_MCAN_IR_RF1F)</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_MRAM_START 0x8000</div><div class='add'>+#define TCAN4X5X_MRAM_SIZE 0x800</div><div class='add'>+#define TCAN4X5X_MCAN_OFFSET 0x1000</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_CLEAR_ALL_INT 0xffffffff</div><div class='add'>+#define TCAN4X5X_SET_ALL_INT 0xffffffff</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_MODE_SEL_MASK (BIT(7) | BIT(6))</div><div class='add'>+#define TCAN4X5X_MODE_SLEEP 0x00</div><div class='add'>+#define TCAN4X5X_MODE_STANDBY BIT(6)</div><div class='add'>+#define TCAN4X5X_MODE_NORMAL BIT(7)</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_NWKRQ_VOLTAGE_VIO BIT(19)</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_DISABLE_WAKE_MSK	(BIT(31) | BIT(30))</div><div class='add'>+#define TCAN4X5X_DISABLE_INH_MSK	BIT(9)</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_SW_RESET BIT(2)</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_MCAN_CONFIGURED BIT(5)</div><div class='add'>+#define TCAN4X5X_WATCHDOG_EN BIT(3)</div><div class='add'>+#define TCAN4X5X_WD_60_MS_TIMER 0</div><div class='add'>+#define TCAN4X5X_WD_600_MS_TIMER BIT(28)</div><div class='add'>+#define TCAN4X5X_WD_3_S_TIMER BIT(29)</div><div class='add'>+#define TCAN4X5X_WD_6_S_TIMER (BIT(28) | BIT(29))</div><div class='add'>+</div><div class='add'>+struct tcan4x5x_version_info {</div><div class='add'>+	const char *name;</div><div class='add'>+	u32 id2_register;</div><div class='add'>+</div><div class='add'>+	bool has_wake_pin;</div><div class='add'>+	bool has_state_pin;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TCAN4552 = 0,</div><div class='add'>+	TCAN4553,</div><div class='add'>+	TCAN4X5X,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct tcan4x5x_version_info tcan4x5x_versions[] = {</div><div class='add'>+	[TCAN4552] = {</div><div class='add'>+		.name = "4552",</div><div class='add'>+		.id2_register = 0x32353534,</div><div class='add'>+	},</div><div class='add'>+	[TCAN4553] = {</div><div class='add'>+		.name = "4553",</div><div class='add'>+		.id2_register = 0x33353534,</div><div class='add'>+	},</div><div class='add'>+	/* generic version with no id2_register at the end */</div><div class='add'>+	[TCAN4X5X] = {</div><div class='add'>+		.name = "generic",</div><div class='add'>+		.has_wake_pin = true,</div><div class='add'>+		.has_state_pin = true,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct tcan4x5x_priv *cdev_to_priv(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	return container_of(cdev, struct tcan4x5x_priv, cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcan4x5x_check_wake(struct tcan4x5x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int wake_state = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;device_state_gpio)</div><div class='add'>+		wake_state = gpiod_get_value(priv-&gt;device_state_gpio);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;device_wake_gpio &amp;&amp; wake_state) {</div><div class='add'>+		gpiod_set_value(priv-&gt;device_wake_gpio, 0);</div><div class='add'>+		usleep_range(5, 50);</div><div class='add'>+		gpiod_set_value(priv-&gt;device_wake_gpio, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_reset(struct tcan4x5x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;reset_gpio) {</div><div class='add'>+		gpiod_set_value(priv-&gt;reset_gpio, 1);</div><div class='add'>+</div><div class='add'>+		/* tpulse_width minimum 30us */</div><div class='add'>+		usleep_range(30, 100);</div><div class='add'>+		gpiod_set_value(priv-&gt;reset_gpio, 0);</div><div class='add'>+	} else {</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, TCAN4X5X_CONFIG,</div><div class='add'>+				   TCAN4X5X_SW_RESET);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usleep_range(700, 1000);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 tcan4x5x_read_reg(struct m_can_classdev *cdev, int reg)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, TCAN4X5X_MCAN_OFFSET + reg, &amp;val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_read_fifo(struct m_can_classdev *cdev, int addr_offset,</div><div class='add'>+			      void *val, size_t val_count)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_read(priv-&gt;regmap, TCAN4X5X_MRAM_START + addr_offset, val, val_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_write_reg(struct m_can_classdev *cdev, int reg, int val)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;regmap, TCAN4X5X_MCAN_OFFSET + reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_write_fifo(struct m_can_classdev *cdev,</div><div class='add'>+			       int addr_offset, const void *val, size_t val_count)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_write(priv-&gt;regmap, TCAN4X5X_MRAM_START + addr_offset, val, val_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_power_enable(struct regulator *reg, int enable)</div><div class='add'>+{</div><div class='add'>+	if (IS_ERR_OR_NULL(reg))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		return regulator_enable(reg);</div><div class='add'>+	else</div><div class='add'>+		return regulator_disable(reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_write_tcan_reg(struct m_can_classdev *cdev,</div><div class='add'>+				   int reg, int val)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *priv = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;regmap, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_clear_interrupts(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_STATUS,</div><div class='add'>+				      TCAN4X5X_CLEAR_ALL_INT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_INT_FLAGS,</div><div class='add'>+				       TCAN4X5X_CLEAR_ALL_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_init(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tcan4x5x_check_wake(tcan4x5x);</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_clear_interrupts(cdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_INT_EN,</div><div class='add'>+				      TCAN4X5X_ENABLE_TCAN_INT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_ERROR_STATUS_MASK,</div><div class='add'>+				      TCAN4X5X_CLEAR_ALL_INT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(tcan4x5x-&gt;regmap, TCAN4X5X_CONFIG,</div><div class='add'>+				 TCAN4X5X_MODE_SEL_MASK, TCAN4X5X_MODE_NORMAL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tcan4x5x-&gt;nwkrq_voltage_vio) {</div><div class='add'>+		ret = regmap_set_bits(tcan4x5x-&gt;regmap, TCAN4X5X_CONFIG,</div><div class='add'>+				      TCAN4X5X_NWKRQ_VOLTAGE_VIO);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_deinit(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(tcan4x5x-&gt;regmap, TCAN4X5X_CONFIG,</div><div class='add'>+				  TCAN4X5X_MODE_SEL_MASK, TCAN4X5X_MODE_STANDBY);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_disable_wake(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(tcan4x5x-&gt;regmap, TCAN4X5X_CONFIG,</div><div class='add'>+				  TCAN4X5X_DISABLE_WAKE_MSK, 0x00);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_disable_state(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(tcan4x5x-&gt;regmap, TCAN4X5X_CONFIG,</div><div class='add'>+				  TCAN4X5X_DISABLE_INH_MSK, 0x01);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tcan4x5x_version_info</div><div class='add'>+*tcan4x5x_find_version(struct tcan4x5x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, TCAN4X5X_DEV_ID1, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	if (val != TCAN4X5X_DEV_ID1_TCAN) {</div><div class='add'>+		dev_err(&amp;priv-&gt;spi-&gt;dev, "Not a tcan device %x\n", val);</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, TCAN4X5X_DEV_ID2, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	for (int i = 0; i != ARRAY_SIZE(tcan4x5x_versions); ++i) {</div><div class='add'>+		const struct tcan4x5x_version_info *vinfo = &amp;tcan4x5x_versions[i];</div><div class='add'>+</div><div class='add'>+		if (!vinfo-&gt;id2_register || val == vinfo-&gt;id2_register) {</div><div class='add'>+			dev_info(&amp;priv-&gt;spi-&gt;dev, "Detected TCAN device version %s\n",</div><div class='add'>+				 vinfo-&gt;name);</div><div class='add'>+			return vinfo;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;tcan4x5x_versions[TCAN4X5X];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcan4x5x_get_dt_data(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+</div><div class='add'>+	tcan4x5x-&gt;nwkrq_voltage_vio =</div><div class='add'>+		of_property_read_bool(cdev-&gt;dev-&gt;of_node, "ti,nwkrq-voltage-vio");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_get_gpios(struct m_can_classdev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tcan4x5x-&gt;device_wake_gpio = devm_gpiod_get_optional(cdev-&gt;dev,</div><div class='add'>+							     "device-wake",</div><div class='add'>+							     GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(tcan4x5x-&gt;device_wake_gpio)) {</div><div class='add'>+		if (PTR_ERR(tcan4x5x-&gt;device_wake_gpio) == -EPROBE_DEFER)</div><div class='add'>+			return -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+		tcan4x5x-&gt;device_wake_gpio = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcan4x5x-&gt;reset_gpio = devm_gpiod_get_optional(cdev-&gt;dev, "reset",</div><div class='add'>+						       GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(tcan4x5x-&gt;reset_gpio))</div><div class='add'>+		tcan4x5x-&gt;reset_gpio = NULL;</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_reset(tcan4x5x);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tcan4x5x-&gt;device_state_gpio = devm_gpiod_get_optional(cdev-&gt;dev,</div><div class='add'>+							      "device-state",</div><div class='add'>+							      GPIOD_IN);</div><div class='add'>+	if (IS_ERR(tcan4x5x-&gt;device_state_gpio))</div><div class='add'>+		tcan4x5x-&gt;device_state_gpio = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_check_gpios(struct m_can_classdev *cdev,</div><div class='add'>+				const struct tcan4x5x_version_info *version_info)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (version_info-&gt;has_wake_pin &amp;&amp; !tcan4x5x-&gt;device_wake_gpio) {</div><div class='add'>+		ret = tcan4x5x_disable_wake(cdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (version_info-&gt;has_state_pin &amp;&amp; !tcan4x5x-&gt;device_state_gpio) {</div><div class='add'>+		ret = tcan4x5x_disable_state(cdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct m_can_ops tcan4x5x_ops = {</div><div class='add'>+	.init = tcan4x5x_init,</div><div class='add'>+	.deinit = tcan4x5x_deinit,</div><div class='add'>+	.read_reg = tcan4x5x_read_reg,</div><div class='add'>+	.write_reg = tcan4x5x_write_reg,</div><div class='add'>+	.write_fifo = tcan4x5x_write_fifo,</div><div class='add'>+	.read_fifo = tcan4x5x_read_fifo,</div><div class='add'>+	.clear_interrupts = tcan4x5x_clear_interrupts,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_can_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const struct tcan4x5x_version_info *version_info;</div><div class='add'>+	struct tcan4x5x_priv *priv;</div><div class='add'>+	struct m_can_classdev *mcan_class;</div><div class='add'>+	int freq, ret;</div><div class='add'>+</div><div class='add'>+	mcan_class = m_can_class_allocate_dev(&amp;spi-&gt;dev,</div><div class='add'>+					      sizeof(struct tcan4x5x_priv));</div><div class='add'>+	if (IS_ERR(mcan_class))</div><div class='add'>+		return PTR_ERR(mcan_class);</div><div class='add'>+</div><div class='add'>+	ret = m_can_check_mram_cfg(mcan_class, TCAN4X5X_MRAM_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_m_can_class_free_dev;</div><div class='add'>+</div><div class='add'>+	priv = cdev_to_priv(mcan_class);</div><div class='add'>+</div><div class='add'>+	priv-&gt;power = devm_regulator_get_optional(&amp;spi-&gt;dev, "vsup");</div><div class='add'>+	if (IS_ERR(priv-&gt;power)) {</div><div class='add'>+		if (PTR_ERR(priv-&gt;power) == -EPROBE_DEFER) {</div><div class='add'>+			ret = -EPROBE_DEFER;</div><div class='add'>+			goto out_m_can_class_free_dev;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;power = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcan_class-&gt;cclk = devm_clk_get(mcan_class-&gt;dev, "cclk");</div><div class='add'>+	if (IS_ERR(mcan_class-&gt;cclk)) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "no CAN clock source defined\n");</div><div class='add'>+		freq = TCAN4X5X_EXT_CLK_DEF;</div><div class='add'>+	} else {</div><div class='add'>+		freq = clk_get_rate(mcan_class-&gt;cclk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	if (freq &lt; 20000000 || freq &gt; TCAN4X5X_EXT_CLK_DEF) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Clock frequency is out of supported range %d\n",</div><div class='add'>+			freq);</div><div class='add'>+		ret = -ERANGE;</div><div class='add'>+		goto out_m_can_class_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;spi = spi;</div><div class='add'>+</div><div class='add'>+	mcan_class-&gt;pm_clock_support = 0;</div><div class='add'>+	mcan_class-&gt;pm_wake_source = device_property_read_bool(&amp;spi-&gt;dev, "wakeup-source");</div><div class='add'>+	mcan_class-&gt;can.clock.freq = freq;</div><div class='add'>+	mcan_class-&gt;dev = &amp;spi-&gt;dev;</div><div class='add'>+	mcan_class-&gt;ops = &amp;tcan4x5x_ops;</div><div class='add'>+	mcan_class-&gt;is_peripheral = true;</div><div class='add'>+	mcan_class-&gt;net-&gt;irq = spi-&gt;irq;</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, priv);</div><div class='add'>+</div><div class='add'>+	/* Configure the SPI bus */</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	ret = spi_setup(spi);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "SPI setup failed %pe\n", ERR_PTR(ret));</div><div class='add'>+		goto out_m_can_class_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_regmap_init(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "regmap init failed %pe\n", ERR_PTR(ret));</div><div class='add'>+		goto out_m_can_class_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_power_enable(priv-&gt;power, 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Enabling regulator failed %pe\n",</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+		goto out_m_can_class_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_get_gpios(mcan_class);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Getting gpios failed %pe\n", ERR_PTR(ret));</div><div class='add'>+		goto out_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	version_info = tcan4x5x_find_version(priv);</div><div class='add'>+	if (IS_ERR(version_info)) {</div><div class='add'>+		ret = PTR_ERR(version_info);</div><div class='add'>+		goto out_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_check_gpios(mcan_class, version_info);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Checking gpios failed %pe\n", ERR_PTR(ret));</div><div class='add'>+		goto out_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcan4x5x_get_dt_data(mcan_class);</div><div class='add'>+</div><div class='add'>+	tcan4x5x_check_wake(priv);</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_write_tcan_reg(mcan_class, TCAN4X5X_INT_EN, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Disabling interrupts failed %pe\n", ERR_PTR(ret));</div><div class='add'>+		goto out_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = tcan4x5x_clear_interrupts(mcan_class);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Clearing interrupts failed %pe\n", ERR_PTR(ret));</div><div class='add'>+		goto out_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mcan_class-&gt;pm_wake_source)</div><div class='add'>+		device_init_wakeup(&amp;spi-&gt;dev, true);</div><div class='add'>+</div><div class='add'>+	ret = m_can_class_register(mcan_class);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Failed registering m_can device %pe\n",</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+		goto out_power;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(mcan_class-&gt;net, "TCAN4X5X successfully initialized.\n");</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_power:</div><div class='add'>+	tcan4x5x_power_enable(priv-&gt;power, 0);</div><div class='add'>+ out_m_can_class_free_dev:</div><div class='add'>+	m_can_class_free_dev(mcan_class-&gt;net);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcan4x5x_can_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct tcan4x5x_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	m_can_class_unregister(&amp;priv-&gt;cdev);</div><div class='add'>+</div><div class='add'>+	tcan4x5x_power_enable(priv-&gt;power, 0);</div><div class='add'>+</div><div class='add'>+	m_can_class_free_dev(priv-&gt;cdev.net);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused tcan4x5x_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;pm_wake_source)</div><div class='add'>+		enable_irq_wake(spi-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return m_can_class_suspend(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused tcan4x5x_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct m_can_classdev *cdev = dev_get_drvdata(dev);</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	int ret = m_can_class_resume(dev);</div><div class='add'>+</div><div class='add'>+	if (cdev-&gt;pm_wake_source)</div><div class='add'>+		disable_irq_wake(spi-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id tcan4x5x_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "ti,tcan4x5x",</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, tcan4x5x_of_match);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id tcan4x5x_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "tcan4x5x",</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, tcan4x5x_id_table);</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops tcan4x5x_pm_ops = {</div><div class='add'>+	SET_SYSTEM_SLEEP_PM_OPS(tcan4x5x_suspend, tcan4x5x_resume)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver tcan4x5x_can_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.of_match_table = tcan4x5x_of_match,</div><div class='add'>+		.pm = &amp;tcan4x5x_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table = tcan4x5x_id_table,</div><div class='add'>+	.probe = tcan4x5x_can_probe,</div><div class='add'>+	.remove = tcan4x5x_can_remove,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(tcan4x5x_can_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Dan Murphy &lt;dmurphy@ti.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Texas Instruments TCAN4x5x CAN driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/m_can/tcan4x5x-regmap.c b/drivers/net/can/m_can/tcan4x5x-regmap.c<br/>new file mode 100644<br/>index 000000000000..fafa6daa67e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/tcan4x5x-regmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/tcan4x5x-regmap.c</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// tcan4x5x - Texas Instruments TCAN4x5x Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2020 Pengutronix,</div><div class='add'>+//                    Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (c) 2018-2019 Texas Instruments Incorporated</div><div class='add'>+//                    http://www.ti.com/</div><div class='add'>+</div><div class='add'>+#include "tcan4x5x.h"</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_SPI_INSTRUCTION_WRITE (0x61 &lt;&lt; 24)</div><div class='add'>+#define TCAN4X5X_SPI_INSTRUCTION_READ (0x41 &lt;&lt; 24)</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_MAX_REGISTER 0x87fc</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_regmap_gather_write(void *context,</div><div class='add'>+					const void *reg, size_t reg_len,</div><div class='add'>+					const void *val, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct tcan4x5x_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct tcan4x5x_map_buf *buf_tx = &amp;priv-&gt;map_buf_tx;</div><div class='add'>+	struct spi_transfer xfer[] = {</div><div class='add'>+		{</div><div class='add'>+			.tx_buf = buf_tx,</div><div class='add'>+			.len = sizeof(buf_tx-&gt;cmd) + val_len,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;buf_tx-&gt;cmd, reg, sizeof(buf_tx-&gt;cmd.cmd) +</div><div class='add'>+	       sizeof(buf_tx-&gt;cmd.addr));</div><div class='add'>+	tcan4x5x_spi_cmd_set_len(&amp;buf_tx-&gt;cmd, val_len);</div><div class='add'>+	memcpy(buf_tx-&gt;data, val, val_len);</div><div class='add'>+</div><div class='add'>+	return spi_sync_transfer(spi, xfer, ARRAY_SIZE(xfer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_regmap_write(void *context, const void *data, size_t count)</div><div class='add'>+{</div><div class='add'>+	return tcan4x5x_regmap_gather_write(context, data, sizeof(__be32),</div><div class='add'>+					    data + sizeof(__be32),</div><div class='add'>+					    count - sizeof(__be32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tcan4x5x_regmap_read(void *context,</div><div class='add'>+				const void *reg_buf, size_t reg_len,</div><div class='add'>+				void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct tcan4x5x_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct tcan4x5x_map_buf *buf_rx = &amp;priv-&gt;map_buf_rx;</div><div class='add'>+	struct tcan4x5x_map_buf *buf_tx = &amp;priv-&gt;map_buf_tx;</div><div class='add'>+	struct spi_transfer xfer[2] = {</div><div class='add'>+		{</div><div class='add'>+			.tx_buf = buf_tx,</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	struct spi_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;msg);</div><div class='add'>+	spi_message_add_tail(&amp;xfer[0], &amp;msg);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;buf_tx-&gt;cmd, reg_buf, sizeof(buf_tx-&gt;cmd.cmd) +</div><div class='add'>+	       sizeof(buf_tx-&gt;cmd.addr));</div><div class='add'>+	tcan4x5x_spi_cmd_set_len(&amp;buf_tx-&gt;cmd, val_len);</div><div class='add'>+</div><div class='add'>+	if (spi-&gt;controller-&gt;flags &amp; SPI_CONTROLLER_HALF_DUPLEX) {</div><div class='add'>+		xfer[0].len = sizeof(buf_tx-&gt;cmd);</div><div class='add'>+</div><div class='add'>+		xfer[1].rx_buf = val_buf;</div><div class='add'>+		xfer[1].len = val_len;</div><div class='add'>+		spi_message_add_tail(&amp;xfer[1], &amp;msg);</div><div class='add'>+	} else {</div><div class='add'>+		xfer[0].rx_buf = buf_rx;</div><div class='add'>+		xfer[0].len = sizeof(buf_tx-&gt;cmd) + val_len;</div><div class='add'>+</div><div class='add'>+		if (TCAN4X5X_SANITIZE_SPI)</div><div class='add'>+			memset(buf_tx-&gt;data, 0x0, val_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = spi_sync(spi, &amp;msg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!(spi-&gt;controller-&gt;flags &amp; SPI_CONTROLLER_HALF_DUPLEX))</div><div class='add'>+		memcpy(val_buf, buf_rx-&gt;data, val_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_range tcan4x5x_reg_table_wr_range[] = {</div><div class='add'>+	/* Device ID and SPI Registers */</div><div class='add'>+	regmap_reg_range(0x000c, 0x0010),</div><div class='add'>+	/* Device configuration registers and Interrupt Flags*/</div><div class='add'>+	regmap_reg_range(0x0800, 0x080c),</div><div class='add'>+	regmap_reg_range(0x0820, 0x0820),</div><div class='add'>+	regmap_reg_range(0x0830, 0x0830),</div><div class='add'>+	/* M_CAN */</div><div class='add'>+	regmap_reg_range(0x100c, 0x102c),</div><div class='add'>+	regmap_reg_range(0x1048, 0x1048),</div><div class='add'>+	regmap_reg_range(0x1050, 0x105c),</div><div class='add'>+	regmap_reg_range(0x1080, 0x1088),</div><div class='add'>+	regmap_reg_range(0x1090, 0x1090),</div><div class='add'>+	regmap_reg_range(0x1098, 0x10a0),</div><div class='add'>+	regmap_reg_range(0x10a8, 0x10b0),</div><div class='add'>+	regmap_reg_range(0x10b8, 0x10c0),</div><div class='add'>+	regmap_reg_range(0x10c8, 0x10c8),</div><div class='add'>+	regmap_reg_range(0x10d0, 0x10d4),</div><div class='add'>+	regmap_reg_range(0x10e0, 0x10e4),</div><div class='add'>+	regmap_reg_range(0x10f0, 0x10f0),</div><div class='add'>+	regmap_reg_range(0x10f8, 0x10f8),</div><div class='add'>+	/* MRAM */</div><div class='add'>+	regmap_reg_range(0x8000, 0x87fc),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range tcan4x5x_reg_table_rd_range[] = {</div><div class='add'>+	regmap_reg_range(0x0000, 0x0010),	/* Device ID and SPI Registers */</div><div class='add'>+	regmap_reg_range(0x0800, 0x0830),	/* Device configuration registers and Interrupt Flags*/</div><div class='add'>+	regmap_reg_range(0x1000, 0x10fc),	/* M_CAN */</div><div class='add'>+	regmap_reg_range(0x8000, 0x87fc),	/* MRAM */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table tcan4x5x_reg_table_wr = {</div><div class='add'>+	.yes_ranges = tcan4x5x_reg_table_wr_range,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(tcan4x5x_reg_table_wr_range),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table tcan4x5x_reg_table_rd = {</div><div class='add'>+	.yes_ranges = tcan4x5x_reg_table_rd_range,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(tcan4x5x_reg_table_rd_range),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config tcan4x5x_regmap = {</div><div class='add'>+	.reg_bits = 24,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.pad_bits = 8,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.wr_table = &amp;tcan4x5x_reg_table_wr,</div><div class='add'>+	.rd_table = &amp;tcan4x5x_reg_table_rd,</div><div class='add'>+	.max_register = TCAN4X5X_MAX_REGISTER,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.read_flag_mask = (__force unsigned long)</div><div class='add'>+		cpu_to_be32(TCAN4X5X_SPI_INSTRUCTION_READ),</div><div class='add'>+	.write_flag_mask = (__force unsigned long)</div><div class='add'>+		cpu_to_be32(TCAN4X5X_SPI_INSTRUCTION_WRITE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus tcan4x5x_bus = {</div><div class='add'>+	.write = tcan4x5x_regmap_write,</div><div class='add'>+	.gather_write = tcan4x5x_regmap_gather_write,</div><div class='add'>+	.read = tcan4x5x_regmap_read,</div><div class='add'>+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,</div><div class='add'>+	.val_format_endian_default = REGMAP_ENDIAN_BIG,</div><div class='add'>+	.max_raw_read = 256,</div><div class='add'>+	.max_raw_write = 256,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int tcan4x5x_regmap_init(struct tcan4x5x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init(&amp;priv-&gt;spi-&gt;dev, &amp;tcan4x5x_bus,</div><div class='add'>+					priv-&gt;spi, &amp;tcan4x5x_regmap);</div><div class='add'>+	return PTR_ERR_OR_ZERO(priv-&gt;regmap);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/m_can/tcan4x5x.h b/drivers/net/can/m_can/tcan4x5x.h<br/>new file mode 100644<br/>index 000000000000..203399d5e8cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/m_can/tcan4x5x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/m_can/tcan4x5x.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * tcan4x5x - Texas Instruments TCAN4x5x Family CAN controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2020 Pengutronix,</div><div class='add'>+ *                    Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _TCAN4X5X_H</div><div class='add'>+#define _TCAN4X5X_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "m_can.h"</div><div class='add'>+</div><div class='add'>+#define TCAN4X5X_SANITIZE_SPI 1</div><div class='add'>+</div><div class='add'>+struct __packed tcan4x5x_buf_cmd {</div><div class='add'>+	u8 cmd;</div><div class='add'>+	__be16 addr;</div><div class='add'>+	u8 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tcan4x5x_map_buf {</div><div class='add'>+	struct tcan4x5x_buf_cmd cmd;</div><div class='add'>+	u8 data[256 * sizeof(u32)];</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+struct tcan4x5x_priv {</div><div class='add'>+	struct m_can_classdev cdev;</div><div class='add'>+</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	struct gpio_desc *device_wake_gpio;</div><div class='add'>+	struct gpio_desc *device_state_gpio;</div><div class='add'>+	struct regulator *power;</div><div class='add'>+</div><div class='add'>+	struct tcan4x5x_map_buf map_buf_rx;</div><div class='add'>+	struct tcan4x5x_map_buf map_buf_tx;</div><div class='add'>+</div><div class='add'>+	bool nwkrq_voltage_vio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+tcan4x5x_spi_cmd_set_len(struct tcan4x5x_buf_cmd *cmd, u8 len)</div><div class='add'>+{</div><div class='add'>+	/* number of u32 */</div><div class='add'>+	cmd-&gt;len = len &gt;&gt; 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tcan4x5x_regmap_init(struct tcan4x5x_priv *priv);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig<br/>index 3a57a51be22e..dfe6bd9947bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/mscan/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> config CAN_MSCAN</div><div class='ctx'> 	depends on PPC</div><div class='ctx'> 	tristate "Support for Freescale MSCAN based chips"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The Motorola Scalable Controller Area Network (MSCAN) definition</div><div class='ctx'> 	  is based on the MSCAN12 definition which is the specific</div><div class='ctx'> 	  implementation of the Motorola Scalable CAN concept targeted for</div><div class='hunk'>@@ -13,7 +13,7 @@ if CAN_MSCAN</div><div class='ctx'> config CAN_MPC5XXX</div><div class='ctx'> 	tristate "Freescale MPC5xxx onboard CAN controller"</div><div class='ctx'> 	depends on (PPC_MPC52xx || PPC_MPC512x)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you say yes here you get support for Freescale's MPC5xxx</div><div class='ctx'> 	  onboard CAN controller. Currently, the MPC5200, MPC5200B and</div><div class='ctx'> 	  MPC5121 (Rev. 2 and later) are supported.</div><div class='head'>diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c<br/>index 2949a381a94d..0080c39ee182 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/mpc5xxx_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/mpc5xxx_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/mpc5xxx_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/mscan/mpc5xxx_can.c</a></div><div class='hunk'>@@ -1,30 +1,23 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAN bus driver for the Freescale MPC5xxx embedded CPU.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004-2005 Andrey Volkov &lt;avolkov@varma-el.com&gt;,</div><div class='ctx'>  *                         Varma Electronics Oy</div><div class='ctx'>  * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- * Copyright (C) 2009 Wolfram Sang, Pengutronix &lt;w.sang@pengutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ * Copyright (C) 2009 Wolfram Sang, Pengutronix &lt;kernel@pengutronix.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;sysdev/fsl_soc.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -72,7 +65,7 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		*mscan_clksrc = MSCAN_CLKSRC_XTAL;</div><div class='ctx'> </div><div class='del'>-	freq = mpc5xxx_get_bus_frequency(ofdev-&gt;dev.of_node);</div><div class='add'>+	freq = mpc5xxx_get_bus_frequency(&amp;ofdev-&gt;dev);</div><div class='ctx'> 	if (!freq)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -290,7 +283,6 @@ static u32 mpc512x_can_get_clock(struct platform_device *ofdev,</div><div class='ctx'> static const struct of_device_id mpc5xxx_can_table[];</div><div class='ctx'> static int mpc5xxx_can_probe(struct platform_device *ofdev)</div><div class='ctx'> {</div><div class='del'>-	const struct of_device_id *match;</div><div class='ctx'> 	const struct mpc5xxx_can_data *data;</div><div class='ctx'> 	struct device_node *np = ofdev-&gt;dev.of_node;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -300,16 +292,13 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)</div><div class='ctx'> 	int irq, mscan_clksrc = 0;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	match = of_match_device(mpc5xxx_can_table, &amp;ofdev-&gt;dev);</div><div class='del'>-	if (!match)</div><div class='add'>+	data = device_get_match_data(&amp;ofdev-&gt;dev);</div><div class='add'>+	if (!data)</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	data = match-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	base = of_iomap(np, 0);</div><div class='del'>-	if (!base) {</div><div class='del'>-		dev_err(&amp;ofdev-&gt;dev, "couldn't ioremap\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (!base)</div><div class='add'>+		return dev_err_probe(&amp;ofdev-&gt;dev, err, "couldn't ioremap\n");</div><div class='ctx'> </div><div class='ctx'> 	irq = irq_of_parse_and_map(np, 0);</div><div class='ctx'> 	if (!irq) {</div><div class='hunk'>@@ -330,20 +319,19 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	clock_name = of_get_property(np, "fsl,mscan-clock-source", NULL);</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!data);</div><div class='ctx'> 	priv-&gt;type = data-&gt;type;</div><div class='ctx'> 	priv-&gt;can.clock.freq = data-&gt;get_clock(ofdev, clock_name,</div><div class='ctx'> 					       &amp;mscan_clksrc);</div><div class='ctx'> 	if (!priv-&gt;can.clock.freq) {</div><div class='ctx'> 		dev_err(&amp;ofdev-&gt;dev, "couldn't get MSCAN clock properties\n");</div><div class='del'>-		goto exit_free_mscan;</div><div class='add'>+		goto exit_put_clock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = register_mscandev(dev, mscan_clksrc);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;ofdev-&gt;dev, "registering %s failed (err=%d)\n",</div><div class='ctx'> 			DRV_NAME, err);</div><div class='del'>-		goto exit_free_mscan;</div><div class='add'>+		goto exit_put_clock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;ofdev-&gt;dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n",</div><div class='hunk'>@@ -351,7 +339,9 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-exit_free_mscan:</div><div class='add'>+exit_put_clock:</div><div class='add'>+	if (data-&gt;put_clock)</div><div class='add'>+		data-&gt;put_clock(ofdev);</div><div class='ctx'> 	free_candev(dev);</div><div class='ctx'> exit_dispose_irq:</div><div class='ctx'> 	irq_dispose_mapping(irq);</div><div class='hunk'>@@ -361,15 +351,13 @@ exit_unmap_mem:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mpc5xxx_can_remove(struct platform_device *ofdev)</div><div class='add'>+static void mpc5xxx_can_remove(struct platform_device *ofdev)</div><div class='ctx'> {</div><div class='del'>-	const struct of_device_id *match;</div><div class='ctx'> 	const struct mpc5xxx_can_data *data;</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(ofdev);</div><div class='ctx'> 	struct mscan_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	match = of_match_device(mpc5xxx_can_table, &amp;ofdev-&gt;dev);</div><div class='del'>-	data = match ? match-&gt;data : NULL;</div><div class='add'>+	data = device_get_match_data(&amp;ofdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_mscandev(dev);</div><div class='ctx'> 	if (data &amp;&amp; data-&gt;put_clock)</div><div class='hunk'>@@ -377,8 +365,6 @@ static int mpc5xxx_can_remove(struct platform_device *ofdev)</div><div class='ctx'> 	iounmap(priv-&gt;reg_base);</div><div class='ctx'> 	irq_dispose_mapping(dev-&gt;irq);</div><div class='ctx'> 	free_candev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='head'>diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c<br/>index acb708fc1463..39c7aa2a0b2f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/mscan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/mscan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/mscan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/mscan/mscan.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAN bus driver for the alone generic (as possible as) MSCAN controller.</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,18 +6,6 @@</div><div class='ctx'>  *                         Varma Electronics Oy</div><div class='ctx'>  * Copyright (C) 2008-2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='ctx'>  * Copyright (C) 2008-2009 Pengutronix &lt;kernel@pengutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -45,12 +34,6 @@ static const struct can_bittiming_const mscan_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mscan_state {</div><div class='del'>-	u8 mode;</div><div class='del'>-	u8 canrier;</div><div class='del'>-	u8 cantier;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static enum can_state state_map[] = {</div><div class='ctx'> 	CAN_STATE_ERROR_ACTIVE,</div><div class='ctx'> 	CAN_STATE_ERROR_WARNING,</div><div class='hunk'>@@ -202,7 +185,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	int i, rtr, buf_id;</div><div class='ctx'> 	u32 can_id;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	out_8(&amp;regs-&gt;cantier, 0);</div><div class='hunk'>@@ -220,6 +203,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		 * since buffer with lower id have higher priority (hell..)</div><div class='ctx'> 		 */</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		if (buf_id &lt; priv-&gt;prev_buf_id) {</div><div class='ctx'> 			priv-&gt;cur_pri++;</div><div class='hunk'>@@ -260,16 +244,16 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		void __iomem *data = &amp;regs-&gt;tx.dsr1_0;</div><div class='ctx'> 		u16 *payload = (u16 *)frame-&gt;data;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; frame-&gt;can_dlc / 2; i++) {</div><div class='add'>+		for (i = 0; i &lt; frame-&gt;len / 2; i++) {</div><div class='ctx'> 			out_be16(data, *payload++);</div><div class='ctx'> 			data += 2 + _MSCAN_RESERVED_DSR_SIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* write remaining byte if necessary */</div><div class='del'>-		if (frame-&gt;can_dlc &amp; 1)</div><div class='del'>-			out_8(data, frame-&gt;data[frame-&gt;can_dlc - 1]);</div><div class='add'>+		if (frame-&gt;len &amp; 1)</div><div class='add'>+			out_8(data, frame-&gt;data[frame-&gt;len - 1]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	out_8(&amp;regs-&gt;tx.dlr, frame-&gt;can_dlc);</div><div class='add'>+	out_8(&amp;regs-&gt;tx.dlr, frame-&gt;len);</div><div class='ctx'> 	out_8(&amp;regs-&gt;tx.tbpr, priv-&gt;cur_pri);</div><div class='ctx'> </div><div class='ctx'> 	/* Start transmission. */</div><div class='hunk'>@@ -280,7 +264,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	list_add_tail(&amp;priv-&gt;tx_queue[buf_id].list, &amp;priv-&gt;tx_head);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, dev, buf_id);</div><div class='add'>+	can_put_echo_skb(skb, dev, buf_id, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupt. */</div><div class='ctx'> 	priv-&gt;tx_active |= 1 &lt;&lt; buf_id;</div><div class='hunk'>@@ -322,19 +306,19 @@ static void mscan_get_rx_frame(struct net_device *dev, struct can_frame *frame)</div><div class='ctx'> 	if (can_id &amp; 1)</div><div class='ctx'> 		frame-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> </div><div class='del'>-	frame-&gt;can_dlc = get_can_dlc(in_8(&amp;regs-&gt;rx.dlr) &amp; 0xf);</div><div class='add'>+	frame-&gt;len = can_cc_dlc2len(in_8(&amp;regs-&gt;rx.dlr) &amp; 0xf);</div><div class='ctx'> </div><div class='ctx'> 	if (!(frame-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='ctx'> 		void __iomem *data = &amp;regs-&gt;rx.dsr1_0;</div><div class='ctx'> 		u16 *payload = (u16 *)frame-&gt;data;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; frame-&gt;can_dlc / 2; i++) {</div><div class='add'>+		for (i = 0; i &lt; frame-&gt;len / 2; i++) {</div><div class='ctx'> 			*payload++ = in_be16(data);</div><div class='ctx'> 			data += 2 + _MSCAN_RESERVED_DSR_SIZE;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* read remaining byte if necessary */</div><div class='del'>-		if (frame-&gt;can_dlc &amp; 1)</div><div class='del'>-			frame-&gt;data[frame-&gt;can_dlc - 1] = in_8(data);</div><div class='add'>+		if (frame-&gt;len &amp; 1)</div><div class='add'>+			frame-&gt;data[frame-&gt;len - 1] = in_8(data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	out_8(&amp;regs-&gt;canrflg, MSCAN_RXF);</div><div class='hunk'>@@ -382,7 +366,7 @@ static void mscan_get_err_frame(struct net_device *dev, struct can_frame *frame,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;shadow_statflg = canrflg &amp; MSCAN_STAT_MSK;</div><div class='del'>-	frame-&gt;can_dlc = CAN_ERR_DLC;</div><div class='add'>+	frame-&gt;len = CAN_ERR_DLC;</div><div class='ctx'> 	out_8(&amp;regs-&gt;canrflg, MSCAN_ERR_IF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -392,13 +376,12 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> 	struct net_device *dev = napi-&gt;dev;</div><div class='ctx'> 	struct mscan_regs __iomem *regs = priv-&gt;reg_base;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	int npackets = 0;</div><div class='del'>-	int ret = 1;</div><div class='add'>+	int work_done = 0;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_frame *frame;</div><div class='ctx'> 	u8 canrflg;</div><div class='ctx'> </div><div class='del'>-	while (npackets &lt; quota) {</div><div class='add'>+	while (work_done &lt; quota) {</div><div class='ctx'> 		canrflg = in_8(&amp;regs-&gt;canrflg);</div><div class='ctx'> 		if (!(canrflg &amp; (MSCAN_RXF | MSCAN_ERR_IF)))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -412,25 +395,27 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (canrflg &amp; MSCAN_RXF)</div><div class='add'>+		if (canrflg &amp; MSCAN_RXF) {</div><div class='ctx'> 			mscan_get_rx_frame(dev, frame);</div><div class='del'>-		else if (canrflg &amp; MSCAN_ERR_IF)</div><div class='add'>+			stats-&gt;rx_packets++;</div><div class='add'>+			if (!(frame-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+				stats-&gt;rx_bytes += frame-&gt;len;</div><div class='add'>+		} else if (canrflg &amp; MSCAN_ERR_IF) {</div><div class='ctx'> 			mscan_get_err_frame(dev, frame, canrflg);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += frame-&gt;can_dlc;</div><div class='del'>-		npackets++;</div><div class='add'>+		work_done++;</div><div class='ctx'> 		netif_receive_skb(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!(in_8(&amp;regs-&gt;canrflg) &amp; (MSCAN_RXF | MSCAN_ERR_IF))) {</div><div class='del'>-		napi_complete(&amp;priv-&gt;napi);</div><div class='del'>-		clear_bit(F_RX_PROGRESS, &amp;priv-&gt;flags);</div><div class='del'>-		if (priv-&gt;can.state &lt; CAN_STATE_BUS_OFF)</div><div class='del'>-			out_8(&amp;regs-&gt;canrier, priv-&gt;shadow_canrier);</div><div class='del'>-		ret = 0;</div><div class='add'>+	if (work_done &lt; quota) {</div><div class='add'>+		if (likely(napi_complete_done(&amp;priv-&gt;napi, work_done))) {</div><div class='add'>+			clear_bit(F_RX_PROGRESS, &amp;priv-&gt;flags);</div><div class='add'>+			if (priv-&gt;can.state &lt; CAN_STATE_BUS_OFF)</div><div class='add'>+				out_8(&amp;regs-&gt;canrier, priv-&gt;shadow_canrier);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return ret;</div><div class='add'>+	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t mscan_isr(int irq, void *dev_id)</div><div class='hunk'>@@ -457,9 +442,9 @@ static irqreturn_t mscan_isr(int irq, void *dev_id)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			out_8(&amp;regs-&gt;cantbsel, mask);</div><div class='del'>-			stats-&gt;tx_bytes += in_8(&amp;regs-&gt;tx.dlr);</div><div class='add'>+			stats-&gt;tx_bytes += can_get_echo_skb(dev, entry-&gt;id,</div><div class='add'>+							    NULL);</div><div class='ctx'> 			stats-&gt;tx_packets++;</div><div class='del'>-			can_get_echo_skb(dev, entry-&gt;id);</div><div class='ctx'> 			priv-&gt;tx_active &amp;= ~mask;</div><div class='ctx'> 			list_del(pos);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -552,16 +537,12 @@ static int mscan_open(struct net_device *dev)</div><div class='ctx'> 	struct mscan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct mscan_regs __iomem *regs = priv-&gt;reg_base;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;clk_ipg) {</div><div class='del'>-		ret = clk_prepare_enable(priv-&gt;clk_ipg);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto exit_retcode;</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;clk_can) {</div><div class='del'>-		ret = clk_prepare_enable(priv-&gt;clk_can);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto exit_dis_ipg_clock;</div><div class='del'>-	}</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk_ipg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_retcode;</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk_can);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit_dis_ipg_clock;</div><div class='ctx'> </div><div class='ctx'> 	/* common open */</div><div class='ctx'> 	ret = open_candev(dev);</div><div class='hunk'>@@ -595,11 +576,9 @@ exit_napi_disable:</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'> exit_dis_can_clock:</div><div class='del'>-	if (priv-&gt;clk_can)</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk_can);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_can);</div><div class='ctx'> exit_dis_ipg_clock:</div><div class='del'>-	if (priv-&gt;clk_ipg)</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='ctx'> exit_retcode:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -618,10 +597,8 @@ static int mscan_close(struct net_device *dev)</div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;clk_can)</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk_can);</div><div class='del'>-	if (priv-&gt;clk_ipg)</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_can);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_ipg);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -630,7 +607,10 @@ static const struct net_device_ops mscan_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= mscan_open,</div><div class='ctx'> 	.ndo_stop	= mscan_close,</div><div class='ctx'> 	.ndo_start_xmit	= mscan_start_xmit,</div><div class='del'>-	.ndo_change_mtu	= can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops mscan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int register_mscandev(struct net_device *dev, int mscan_clksrc)</div><div class='hunk'>@@ -693,10 +673,11 @@ struct net_device *alloc_mscandev(void)</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;mscan_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;mscan_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, mscan_rx_poll, 8);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;priv-&gt;napi, mscan_rx_poll, 8);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.bittiming_const = &amp;mscan_bittiming_const;</div><div class='ctx'> 	priv-&gt;can.do_set_bittiming = mscan_do_set_bittiming;</div><div class='head'>diff --git a/drivers/net/can/mscan/mscan.h b/drivers/net/can/mscan/mscan.h<br/>index ad8e08f9c496..25639a5e1ca9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/mscan.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/mscan/mscan.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/mscan/mscan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/mscan/mscan.h</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Definitions of consts/structs to drive the Freescale MSCAN.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2005-2006 Andrey Volkov &lt;avolkov@varma-el.com&gt;,</div><div class='ctx'>  *                         Varma Electronics Oy</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __MSCAN_H__</div><div class='head'>diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c<br/>deleted file mode 100644<br/>index c1317889d3d8..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/pch_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/pch_can.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1279 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1999 - 2010 Intel Corporation.</div><div class='del'>- * Copyright (C) 2010 LAPIS SEMICONDUCTOR CO., LTD.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/can.h&gt;</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/can/error.h&gt;</div><div class='del'>-</div><div class='del'>-#define PCH_CTRL_INIT		BIT(0) /* The INIT bit of CANCONT register. */</div><div class='del'>-#define PCH_CTRL_IE		BIT(1) /* The IE bit of CAN control register */</div><div class='del'>-#define PCH_CTRL_IE_SIE_EIE	(BIT(3) | BIT(2) | BIT(1))</div><div class='del'>-#define PCH_CTRL_CCE		BIT(6)</div><div class='del'>-#define PCH_CTRL_OPT		BIT(7) /* The OPT bit of CANCONT register. */</div><div class='del'>-#define PCH_OPT_SILENT		BIT(3) /* The Silent bit of CANOPT reg. */</div><div class='del'>-#define PCH_OPT_LBACK		BIT(4) /* The LoopBack bit of CANOPT reg. */</div><div class='del'>-</div><div class='del'>-#define PCH_CMASK_RX_TX_SET	0x00f3</div><div class='del'>-#define PCH_CMASK_RX_TX_GET	0x0073</div><div class='del'>-#define PCH_CMASK_ALL		0xff</div><div class='del'>-#define PCH_CMASK_NEWDAT	BIT(2)</div><div class='del'>-#define PCH_CMASK_CLRINTPND	BIT(3)</div><div class='del'>-#define PCH_CMASK_CTRL		BIT(4)</div><div class='del'>-#define PCH_CMASK_ARB		BIT(5)</div><div class='del'>-#define PCH_CMASK_MASK		BIT(6)</div><div class='del'>-#define PCH_CMASK_RDWR		BIT(7)</div><div class='del'>-#define PCH_IF_MCONT_NEWDAT	BIT(15)</div><div class='del'>-#define PCH_IF_MCONT_MSGLOST	BIT(14)</div><div class='del'>-#define PCH_IF_MCONT_INTPND	BIT(13)</div><div class='del'>-#define PCH_IF_MCONT_UMASK	BIT(12)</div><div class='del'>-#define PCH_IF_MCONT_TXIE	BIT(11)</div><div class='del'>-#define PCH_IF_MCONT_RXIE	BIT(10)</div><div class='del'>-#define PCH_IF_MCONT_RMTEN	BIT(9)</div><div class='del'>-#define PCH_IF_MCONT_TXRQXT	BIT(8)</div><div class='del'>-#define PCH_IF_MCONT_EOB	BIT(7)</div><div class='del'>-#define PCH_IF_MCONT_DLC	(BIT(0) | BIT(1) | BIT(2) | BIT(3))</div><div class='del'>-#define PCH_MASK2_MDIR_MXTD	(BIT(14) | BIT(15))</div><div class='del'>-#define PCH_ID2_DIR		BIT(13)</div><div class='del'>-#define PCH_ID2_XTD		BIT(14)</div><div class='del'>-#define PCH_ID_MSGVAL		BIT(15)</div><div class='del'>-#define PCH_IF_CREQ_BUSY	BIT(15)</div><div class='del'>-</div><div class='del'>-#define PCH_STATUS_INT		0x8000</div><div class='del'>-#define PCH_RP			0x00008000</div><div class='del'>-#define PCH_REC			0x00007f00</div><div class='del'>-#define PCH_TEC			0x000000ff</div><div class='del'>-</div><div class='del'>-#define PCH_TX_OK		BIT(3)</div><div class='del'>-#define PCH_RX_OK		BIT(4)</div><div class='del'>-#define PCH_EPASSIV		BIT(5)</div><div class='del'>-#define PCH_EWARN		BIT(6)</div><div class='del'>-#define PCH_BUS_OFF		BIT(7)</div><div class='del'>-</div><div class='del'>-/* bit position of certain controller bits. */</div><div class='del'>-#define PCH_BIT_BRP_SHIFT	0</div><div class='del'>-#define PCH_BIT_SJW_SHIFT	6</div><div class='del'>-#define PCH_BIT_TSEG1_SHIFT	8</div><div class='del'>-#define PCH_BIT_TSEG2_SHIFT	12</div><div class='del'>-#define PCH_BIT_BRPE_BRPE_SHIFT	6</div><div class='del'>-</div><div class='del'>-#define PCH_MSK_BITT_BRP	0x3f</div><div class='del'>-#define PCH_MSK_BRPE_BRPE	0x3c0</div><div class='del'>-#define PCH_MSK_CTRL_IE_SIE_EIE	0x07</div><div class='del'>-#define PCH_COUNTER_LIMIT	10</div><div class='del'>-</div><div class='del'>-#define PCH_CAN_CLK		50000000	/* 50MHz */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Define the number of message object.</div><div class='del'>- * PCH CAN communications are done via Message RAM.</div><div class='del'>- * The Message RAM consists of 32 message objects.</div><div class='del'>- */</div><div class='del'>-#define PCH_RX_OBJ_NUM		26</div><div class='del'>-#define PCH_TX_OBJ_NUM		6</div><div class='del'>-#define PCH_RX_OBJ_START	1</div><div class='del'>-#define PCH_RX_OBJ_END		PCH_RX_OBJ_NUM</div><div class='del'>-#define PCH_TX_OBJ_START	(PCH_RX_OBJ_END + 1)</div><div class='del'>-#define PCH_TX_OBJ_END		(PCH_RX_OBJ_NUM + PCH_TX_OBJ_NUM)</div><div class='del'>-</div><div class='del'>-#define PCH_FIFO_THRESH		16</div><div class='del'>-</div><div class='del'>-/* TxRqst2 show status of MsgObjNo.17~32 */</div><div class='del'>-#define PCH_TREQ2_TX_MASK	(((1 &lt;&lt; PCH_TX_OBJ_NUM) - 1) &lt;&lt;\</div><div class='del'>-							(PCH_RX_OBJ_END - 16))</div><div class='del'>-</div><div class='del'>-enum pch_ifreg {</div><div class='del'>-	PCH_RX_IFREG,</div><div class='del'>-	PCH_TX_IFREG,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pch_can_err {</div><div class='del'>-	PCH_STUF_ERR = 1,</div><div class='del'>-	PCH_FORM_ERR,</div><div class='del'>-	PCH_ACK_ERR,</div><div class='del'>-	PCH_BIT1_ERR,</div><div class='del'>-	PCH_BIT0_ERR,</div><div class='del'>-	PCH_CRC_ERR,</div><div class='del'>-	PCH_LEC_ALL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum pch_can_mode {</div><div class='del'>-	PCH_CAN_ENABLE,</div><div class='del'>-	PCH_CAN_DISABLE,</div><div class='del'>-	PCH_CAN_ALL,</div><div class='del'>-	PCH_CAN_NONE,</div><div class='del'>-	PCH_CAN_STOP,</div><div class='del'>-	PCH_CAN_RUN,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pch_can_if_regs {</div><div class='del'>-	u32 creq;</div><div class='del'>-	u32 cmask;</div><div class='del'>-	u32 mask1;</div><div class='del'>-	u32 mask2;</div><div class='del'>-	u32 id1;</div><div class='del'>-	u32 id2;</div><div class='del'>-	u32 mcont;</div><div class='del'>-	u32 data[4];</div><div class='del'>-	u32 rsv[13];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pch_can_regs {</div><div class='del'>-	u32 cont;</div><div class='del'>-	u32 stat;</div><div class='del'>-	u32 errc;</div><div class='del'>-	u32 bitt;</div><div class='del'>-	u32 intr;</div><div class='del'>-	u32 opt;</div><div class='del'>-	u32 brpe;</div><div class='del'>-	u32 reserve;</div><div class='del'>-	struct pch_can_if_regs ifregs[2]; /* [0]=if1  [1]=if2 */</div><div class='del'>-	u32 reserve1[8];</div><div class='del'>-	u32 treq1;</div><div class='del'>-	u32 treq2;</div><div class='del'>-	u32 reserve2[6];</div><div class='del'>-	u32 data1;</div><div class='del'>-	u32 data2;</div><div class='del'>-	u32 reserve3[6];</div><div class='del'>-	u32 canipend1;</div><div class='del'>-	u32 canipend2;</div><div class='del'>-	u32 reserve4[6];</div><div class='del'>-	u32 canmval1;</div><div class='del'>-	u32 canmval2;</div><div class='del'>-	u32 reserve5[37];</div><div class='del'>-	u32 srst;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pch_can_priv {</div><div class='del'>-	struct can_priv can;</div><div class='del'>-	struct pci_dev *dev;</div><div class='del'>-	u32 tx_enable[PCH_TX_OBJ_END];</div><div class='del'>-	u32 rx_enable[PCH_TX_OBJ_END];</div><div class='del'>-	u32 rx_link[PCH_TX_OBJ_END];</div><div class='del'>-	u32 int_enables;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct pch_can_regs __iomem *regs;</div><div class='del'>-	struct napi_struct napi;</div><div class='del'>-	int tx_obj;	/* Point next Tx Obj index */</div><div class='del'>-	int use_msi;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct can_bittiming_const pch_can_bittiming_const = {</div><div class='del'>-	.name = KBUILD_MODNAME,</div><div class='del'>-	.tseg1_min = 2,</div><div class='del'>-	.tseg1_max = 16,</div><div class='del'>-	.tseg2_min = 1,</div><div class='del'>-	.tseg2_max = 8,</div><div class='del'>-	.sjw_max = 4,</div><div class='del'>-	.brp_min = 1,</div><div class='del'>-	.brp_max = 1024, /* 6bit + extended 4bit */</div><div class='del'>-	.brp_inc = 1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id pch_pci_tbl[] = {</div><div class='del'>-	{PCI_VENDOR_ID_INTEL, 0x8818, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{0,}</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(pci, pch_pci_tbl);</div><div class='del'>-</div><div class='del'>-static inline void pch_can_bit_set(void __iomem *addr, u32 mask)</div><div class='del'>-{</div><div class='del'>-	iowrite32(ioread32(addr) | mask, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void pch_can_bit_clear(void __iomem *addr, u32 mask)</div><div class='del'>-{</div><div class='del'>-	iowrite32(ioread32(addr) &amp; ~mask, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_run_mode(struct pch_can_priv *priv,</div><div class='del'>-				 enum pch_can_mode mode)</div><div class='del'>-{</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case PCH_CAN_RUN:</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_INIT);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PCH_CAN_STOP:</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_INIT);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		netdev_err(priv-&gt;ndev, "%s -&gt; Invalid Mode.\n", __func__);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_optmode(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 reg_val = ioread32(&amp;priv-&gt;regs-&gt;opt);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='del'>-		reg_val |= PCH_OPT_SILENT;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='del'>-		reg_val |= PCH_OPT_LBACK;</div><div class='del'>-</div><div class='del'>-	pch_can_bit_set(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_OPT);</div><div class='del'>-	iowrite32(reg_val, &amp;priv-&gt;regs-&gt;opt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_rw_msg_obj(void __iomem *creq_addr, u32 num)</div><div class='del'>-{</div><div class='del'>-	int counter = PCH_COUNTER_LIMIT;</div><div class='del'>-	u32 ifx_creq;</div><div class='del'>-</div><div class='del'>-	iowrite32(num, creq_addr);</div><div class='del'>-	while (counter) {</div><div class='del'>-		ifx_creq = ioread32(creq_addr) &amp; PCH_IF_CREQ_BUSY;</div><div class='del'>-		if (!ifx_creq)</div><div class='del'>-			break;</div><div class='del'>-		counter--;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (!counter)</div><div class='del'>-		pr_err("%s:IF1 BUSY Flag is set forever.\n", __func__);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_int_enables(struct pch_can_priv *priv,</div><div class='del'>-				    enum pch_can_mode interrupt_no)</div><div class='del'>-{</div><div class='del'>-	switch (interrupt_no) {</div><div class='del'>-	case PCH_CAN_DISABLE:</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_IE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PCH_CAN_ALL:</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_IE_SIE_EIE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PCH_CAN_NONE:</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_IE_SIE_EIE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		netdev_err(priv-&gt;ndev, "Invalid interrupt number.\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,</div><div class='del'>-			     int set, enum pch_ifreg dir)</div><div class='del'>-{</div><div class='del'>-	u32 ie;</div><div class='del'>-</div><div class='del'>-	if (dir)</div><div class='del'>-		ie = PCH_IF_MCONT_TXIE;</div><div class='del'>-	else</div><div class='del'>-		ie = PCH_IF_MCONT_RXIE;</div><div class='del'>-</div><div class='del'>-	/* Reading the Msg buffer from Message RAM to IF1/2 registers. */</div><div class='del'>-	iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[dir].cmask);</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[dir].creq, buff_num);</div><div class='del'>-</div><div class='del'>-	/* Setting the IF1/2MASK1 register to access MsgVal and RxIE bits */</div><div class='del'>-	iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL,</div><div class='del'>-		  &amp;priv-&gt;regs-&gt;ifregs[dir].cmask);</div><div class='del'>-</div><div class='del'>-	if (set) {</div><div class='del'>-		/* Setting the MsgVal and RxIE/TxIE bits */</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[dir].mcont, ie);</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[dir].id2, PCH_ID_MSGVAL);</div><div class='del'>-	} else {</div><div class='del'>-		/* Clearing the MsgVal and RxIE/TxIE bits */</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[dir].mcont, ie);</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[dir].id2, PCH_ID_MSGVAL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[dir].creq, buff_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_rx_all(struct pch_can_priv *priv, int set)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Traversing to obtain the object configured as receivers. */</div><div class='del'>-	for (i = PCH_RX_OBJ_START; i &lt;= PCH_RX_OBJ_END; i++)</div><div class='del'>-		pch_can_set_rxtx(priv, i, set, PCH_RX_IFREG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_tx_all(struct pch_can_priv *priv, int set)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Traversing to obtain the object configured as transmit object. */</div><div class='del'>-	for (i = PCH_TX_OBJ_START; i &lt;= PCH_TX_OBJ_END; i++)</div><div class='del'>-		pch_can_set_rxtx(priv, i, set, PCH_TX_IFREG);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 pch_can_int_pending(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return ioread32(&amp;priv-&gt;regs-&gt;intr) &amp; 0xffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_clear_if_buffers(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int i; /* Msg Obj ID (1~32) */</div><div class='del'>-</div><div class='del'>-	for (i = PCH_RX_OBJ_START; i &lt;= PCH_TX_OBJ_END; i++) {</div><div class='del'>-		iowrite32(PCH_CMASK_RX_TX_SET, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-		iowrite32(0xffff, &amp;priv-&gt;regs-&gt;ifregs[0].mask1);</div><div class='del'>-		iowrite32(0xffff, &amp;priv-&gt;regs-&gt;ifregs[0].mask2);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].id1);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].id2);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].mcont);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].data[0]);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].data[1]);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].data[2]);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].data[3]);</div><div class='del'>-		iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |</div><div class='del'>-			  PCH_CMASK_ARB | PCH_CMASK_CTRL,</div><div class='del'>-			  &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = PCH_RX_OBJ_START; i &lt;= PCH_RX_OBJ_END; i++) {</div><div class='del'>-		iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, i);</div><div class='del'>-</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].id1);</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[0].id2);</div><div class='del'>-</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-				PCH_IF_MCONT_UMASK);</div><div class='del'>-</div><div class='del'>-		/* In case FIFO mode, Last EoB of Rx Obj must be 1 */</div><div class='del'>-		if (i == PCH_RX_OBJ_END)</div><div class='del'>-			pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-					PCH_IF_MCONT_EOB);</div><div class='del'>-		else</div><div class='del'>-			pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-					  PCH_IF_MCONT_EOB);</div><div class='del'>-</div><div class='del'>-		iowrite32(0, &amp;priv-&gt;regs-&gt;ifregs[0].mask1);</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].mask2,</div><div class='del'>-				  0x1fff | PCH_MASK2_MDIR_MXTD);</div><div class='del'>-</div><div class='del'>-		/* Setting CMASK for writing */</div><div class='del'>-		iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB |</div><div class='del'>-			  PCH_CMASK_CTRL, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = PCH_TX_OBJ_START; i &lt;= PCH_TX_OBJ_END; i++) {</div><div class='del'>-		iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[1].cmask);</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[1].creq, i);</div><div class='del'>-</div><div class='del'>-		/* Resetting DIR bit for reception */</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[1].id1);</div><div class='del'>-		iowrite32(PCH_ID2_DIR, &amp;priv-&gt;regs-&gt;ifregs[1].id2);</div><div class='del'>-</div><div class='del'>-		/* Setting EOB bit for transmitter */</div><div class='del'>-		iowrite32(PCH_IF_MCONT_EOB | PCH_IF_MCONT_UMASK,</div><div class='del'>-			  &amp;priv-&gt;regs-&gt;ifregs[1].mcont);</div><div class='del'>-</div><div class='del'>-		iowrite32(0, &amp;priv-&gt;regs-&gt;ifregs[1].mask1);</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[1].mask2, 0x1fff);</div><div class='del'>-</div><div class='del'>-		/* Setting CMASK for writing */</div><div class='del'>-		iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB |</div><div class='del'>-			  PCH_CMASK_CTRL, &amp;priv-&gt;regs-&gt;ifregs[1].cmask);</div><div class='del'>-</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[1].creq, i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_init(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Stopping the Can device. */</div><div class='del'>-	pch_can_set_run_mode(priv, PCH_CAN_STOP);</div><div class='del'>-</div><div class='del'>-	/* Clearing all the message object buffers. */</div><div class='del'>-	pch_can_clear_if_buffers(priv);</div><div class='del'>-</div><div class='del'>-	/* Configuring the respective message object as either rx/tx object. */</div><div class='del'>-	pch_can_config_rx_tx_buffers(priv);</div><div class='del'>-</div><div class='del'>-	/* Enabling the interrupts. */</div><div class='del'>-	pch_can_set_int_enables(priv, PCH_CAN_ALL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_release(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Stooping the CAN device. */</div><div class='del'>-	pch_can_set_run_mode(priv, PCH_CAN_STOP);</div><div class='del'>-</div><div class='del'>-	/* Disabling the interrupts. */</div><div class='del'>-	pch_can_set_int_enables(priv, PCH_CAN_NONE);</div><div class='del'>-</div><div class='del'>-	/* Disabling all the receive object. */</div><div class='del'>-	pch_can_set_rx_all(priv, 0);</div><div class='del'>-</div><div class='del'>-	/* Disabling all the transmit object. */</div><div class='del'>-	pch_can_set_tx_all(priv, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function clears interrupt(s) from the CAN device. */</div><div class='del'>-static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)</div><div class='del'>-{</div><div class='del'>-	/* Clear interrupt for transmit object */</div><div class='del'>-	if ((mask &gt;= PCH_RX_OBJ_START) &amp;&amp; (mask &lt;= PCH_RX_OBJ_END)) {</div><div class='del'>-		/* Setting CMASK for clearing the reception interrupts. */</div><div class='del'>-		iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL | PCH_CMASK_ARB,</div><div class='del'>-			  &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-</div><div class='del'>-		/* Clearing the Dir bit. */</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].id2, PCH_ID2_DIR);</div><div class='del'>-</div><div class='del'>-		/* Clearing NewDat &amp; IntPnd */</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-				  PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND);</div><div class='del'>-</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, mask);</div><div class='del'>-	} else if ((mask &gt;= PCH_TX_OBJ_START) &amp;&amp; (mask &lt;= PCH_TX_OBJ_END)) {</div><div class='del'>-		/*</div><div class='del'>-		 * Setting CMASK for clearing interrupts for frame transmission.</div><div class='del'>-		 */</div><div class='del'>-		iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL | PCH_CMASK_ARB,</div><div class='del'>-			  &amp;priv-&gt;regs-&gt;ifregs[1].cmask);</div><div class='del'>-</div><div class='del'>-		/* Resetting the ID registers. */</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[1].id2,</div><div class='del'>-			       PCH_ID2_DIR | (0x7ff &lt;&lt; 2));</div><div class='del'>-		iowrite32(0x0, &amp;priv-&gt;regs-&gt;ifregs[1].id1);</div><div class='del'>-</div><div class='del'>-		/* Claring NewDat, TxRqst &amp; IntPnd */</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[1].mcont,</div><div class='del'>-				  PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND |</div><div class='del'>-				  PCH_IF_MCONT_TXRQXT);</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[1].creq, mask);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_reset(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* write to sw reset register */</div><div class='del'>-	iowrite32(1, &amp;priv-&gt;regs-&gt;srst);</div><div class='del'>-	iowrite32(0, &amp;priv-&gt;regs-&gt;srst);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_error(struct net_device *ndev, u32 status)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	u32 errc, lec;</div><div class='del'>-	struct net_device_stats *stats = &amp;(priv-&gt;ndev-&gt;stats);</div><div class='del'>-	enum can_state state = priv-&gt;can.state;</div><div class='del'>-</div><div class='del'>-	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (status &amp; PCH_BUS_OFF) {</div><div class='del'>-		pch_can_set_tx_all(priv, 0);</div><div class='del'>-		pch_can_set_rx_all(priv, 0);</div><div class='del'>-		state = CAN_STATE_BUS_OFF;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='del'>-		priv-&gt;can.can_stats.bus_off++;</div><div class='del'>-		can_bus_off(ndev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	errc = ioread32(&amp;priv-&gt;regs-&gt;errc);</div><div class='del'>-	/* Warning interrupt. */</div><div class='del'>-	if (status &amp; PCH_EWARN) {</div><div class='del'>-		state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-		priv-&gt;can.can_stats.error_warning++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		if (((errc &amp; PCH_REC) &gt;&gt; 8) &gt; 96)</div><div class='del'>-			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_WARNING;</div><div class='del'>-		if ((errc &amp; PCH_TEC) &gt; 96)</div><div class='del'>-			cf-&gt;data[1] |= CAN_ERR_CRTL_TX_WARNING;</div><div class='del'>-		netdev_dbg(ndev,</div><div class='del'>-			"%s -&gt; Error Counter is more than 96.\n", __func__);</div><div class='del'>-	}</div><div class='del'>-	/* Error passive interrupt. */</div><div class='del'>-	if (status &amp; PCH_EPASSIV) {</div><div class='del'>-		priv-&gt;can.can_stats.error_passive++;</div><div class='del'>-		state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		if (errc &amp; PCH_RP)</div><div class='del'>-			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_PASSIVE;</div><div class='del'>-		if ((errc &amp; PCH_TEC) &gt; 127)</div><div class='del'>-			cf-&gt;data[1] |= CAN_ERR_CRTL_TX_PASSIVE;</div><div class='del'>-		netdev_dbg(ndev,</div><div class='del'>-			"%s -&gt; CAN controller is ERROR PASSIVE .\n", __func__);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lec = status &amp; PCH_LEC_ALL;</div><div class='del'>-	switch (lec) {</div><div class='del'>-	case PCH_STUF_ERR:</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		break;</div><div class='del'>-	case PCH_FORM_ERR:</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		break;</div><div class='del'>-	case PCH_ACK_ERR:</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		break;</div><div class='del'>-	case PCH_BIT1_ERR:</div><div class='del'>-	case PCH_BIT0_ERR:</div><div class='del'>-		cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		break;</div><div class='del'>-	case PCH_CRC_ERR:</div><div class='del'>-		cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='del'>-		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		break;</div><div class='del'>-	case PCH_LEC_ALL: /* Written by CPU. No error status */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cf-&gt;data[6] = errc &amp; PCH_TEC;</div><div class='del'>-	cf-&gt;data[7] = (errc &amp; PCH_REC) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.state = state;</div><div class='del'>-	netif_receive_skb(skb);</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t pch_can_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = (struct net_device *)dev_id;</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	if (!pch_can_int_pending(priv))</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-</div><div class='del'>-	pch_can_set_int_enables(priv, PCH_CAN_NONE);</div><div class='del'>-	napi_schedule(&amp;priv-&gt;napi);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_fifo_thresh(struct pch_can_priv *priv, int obj_id)</div><div class='del'>-{</div><div class='del'>-	if (obj_id &lt; PCH_FIFO_THRESH) {</div><div class='del'>-		iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL |</div><div class='del'>-			  PCH_CMASK_ARB, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-</div><div class='del'>-		/* Clearing the Dir bit. */</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].id2, PCH_ID2_DIR);</div><div class='del'>-</div><div class='del'>-		/* Clearing NewDat &amp; IntPnd */</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-				  PCH_IF_MCONT_INTPND);</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, obj_id);</div><div class='del'>-	} else if (obj_id &gt; PCH_FIFO_THRESH) {</div><div class='del'>-		pch_can_int_clr(priv, obj_id);</div><div class='del'>-	} else if (obj_id == PCH_FIFO_THRESH) {</div><div class='del'>-		int cnt;</div><div class='del'>-		for (cnt = 0; cnt &lt; PCH_FIFO_THRESH; cnt++)</div><div class='del'>-			pch_can_int_clr(priv, cnt + 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_rx_msg_lost(struct net_device *ndev, int obj_id)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct net_device_stats *stats = &amp;(priv-&gt;ndev-&gt;stats);</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-</div><div class='del'>-	netdev_dbg(priv-&gt;ndev, "Msg Obj is overwritten.\n");</div><div class='del'>-	pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-			  PCH_IF_MCONT_MSGLOST);</div><div class='del'>-	iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,</div><div class='del'>-		  &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, obj_id);</div><div class='del'>-</div><div class='del'>-	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='del'>-	stats-&gt;rx_over_errors++;</div><div class='del'>-	stats-&gt;rx_errors++;</div><div class='del'>-</div><div class='del'>-	netif_receive_skb(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	canid_t id;</div><div class='del'>-	int rcv_pkts = 0;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct net_device_stats *stats = &amp;(priv-&gt;ndev-&gt;stats);</div><div class='del'>-	int i;</div><div class='del'>-	u32 id2;</div><div class='del'>-	u16 data_reg;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* Reading the message object from the Message RAM */</div><div class='del'>-		iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-		pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, obj_num);</div><div class='del'>-</div><div class='del'>-		/* Reading the MCONT register. */</div><div class='del'>-		reg = ioread32(&amp;priv-&gt;regs-&gt;ifregs[0].mcont);</div><div class='del'>-</div><div class='del'>-		if (reg &amp; PCH_IF_MCONT_EOB)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* If MsgLost bit set. */</div><div class='del'>-		if (reg &amp; PCH_IF_MCONT_MSGLOST) {</div><div class='del'>-			pch_can_rx_msg_lost(ndev, obj_num);</div><div class='del'>-			rcv_pkts++;</div><div class='del'>-			quota--;</div><div class='del'>-			obj_num++;</div><div class='del'>-			continue;</div><div class='del'>-		} else if (!(reg &amp; PCH_IF_MCONT_NEWDAT)) {</div><div class='del'>-			obj_num++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		skb = alloc_can_skb(priv-&gt;ndev, &amp;cf);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			netdev_err(ndev, "alloc_can_skb Failed\n");</div><div class='del'>-			return rcv_pkts;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Get Received data */</div><div class='del'>-		id2 = ioread32(&amp;priv-&gt;regs-&gt;ifregs[0].id2);</div><div class='del'>-		if (id2 &amp; PCH_ID2_XTD) {</div><div class='del'>-			id = (ioread32(&amp;priv-&gt;regs-&gt;ifregs[0].id1) &amp; 0xffff);</div><div class='del'>-			id |= (((id2) &amp; 0x1fff) &lt;&lt; 16);</div><div class='del'>-			cf-&gt;can_id = id | CAN_EFF_FLAG;</div><div class='del'>-		} else {</div><div class='del'>-			id = (id2 &gt;&gt; 2) &amp; CAN_SFF_MASK;</div><div class='del'>-			cf-&gt;can_id = id;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (id2 &amp; PCH_ID2_DIR)</div><div class='del'>-			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc((ioread32(&amp;priv-&gt;regs-&gt;</div><div class='del'>-						    ifregs[0].mcont)) &amp; 0xF);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i += 2) {</div><div class='del'>-			data_reg = ioread16(&amp;priv-&gt;regs-&gt;ifregs[0].data[i / 2]);</div><div class='del'>-			cf-&gt;data[i] = data_reg;</div><div class='del'>-			cf-&gt;data[i + 1] = data_reg &gt;&gt; 8;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		netif_receive_skb(skb);</div><div class='del'>-		rcv_pkts++;</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		quota--;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-</div><div class='del'>-		pch_fifo_thresh(priv, obj_num);</div><div class='del'>-		obj_num++;</div><div class='del'>-	} while (quota &gt; 0);</div><div class='del'>-</div><div class='del'>-	return rcv_pkts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct net_device_stats *stats = &amp;(priv-&gt;ndev-&gt;stats);</div><div class='del'>-	u32 dlc;</div><div class='del'>-</div><div class='del'>-	can_get_echo_skb(ndev, int_stat - PCH_RX_OBJ_END - 1);</div><div class='del'>-	iowrite32(PCH_CMASK_RX_TX_GET | PCH_CMASK_CLRINTPND,</div><div class='del'>-		  &amp;priv-&gt;regs-&gt;ifregs[1].cmask);</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[1].creq, int_stat);</div><div class='del'>-	dlc = get_can_dlc(ioread32(&amp;priv-&gt;regs-&gt;ifregs[1].mcont) &amp;</div><div class='del'>-			  PCH_IF_MCONT_DLC);</div><div class='del'>-	stats-&gt;tx_bytes += dlc;</div><div class='del'>-	stats-&gt;tx_packets++;</div><div class='del'>-	if (int_stat == PCH_TX_OBJ_END)</div><div class='del'>-		netif_wake_queue(ndev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_poll(struct napi_struct *napi, int quota)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = napi-&gt;dev;</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	u32 int_stat;</div><div class='del'>-	u32 reg_stat;</div><div class='del'>-	int quota_save = quota;</div><div class='del'>-</div><div class='del'>-	int_stat = pch_can_int_pending(priv);</div><div class='del'>-	if (!int_stat)</div><div class='del'>-		goto end;</div><div class='del'>-</div><div class='del'>-	if (int_stat == PCH_STATUS_INT) {</div><div class='del'>-		reg_stat = ioread32(&amp;priv-&gt;regs-&gt;stat);</div><div class='del'>-</div><div class='del'>-		if ((reg_stat &amp; (PCH_BUS_OFF | PCH_LEC_ALL)) &amp;&amp;</div><div class='del'>-		   ((reg_stat &amp; PCH_LEC_ALL) != PCH_LEC_ALL)) {</div><div class='del'>-			pch_can_error(ndev, reg_stat);</div><div class='del'>-			quota--;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (reg_stat &amp; (PCH_TX_OK | PCH_RX_OK))</div><div class='del'>-			pch_can_bit_clear(&amp;priv-&gt;regs-&gt;stat,</div><div class='del'>-					  reg_stat &amp; (PCH_TX_OK | PCH_RX_OK));</div><div class='del'>-</div><div class='del'>-		int_stat = pch_can_int_pending(priv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (quota == 0)</div><div class='del'>-		goto end;</div><div class='del'>-</div><div class='del'>-	if ((int_stat &gt;= PCH_RX_OBJ_START) &amp;&amp; (int_stat &lt;= PCH_RX_OBJ_END)) {</div><div class='del'>-		quota -= pch_can_rx_normal(ndev, int_stat, quota);</div><div class='del'>-	} else if ((int_stat &gt;= PCH_TX_OBJ_START) &amp;&amp;</div><div class='del'>-		   (int_stat &lt;= PCH_TX_OBJ_END)) {</div><div class='del'>-		/* Handle transmission interrupt */</div><div class='del'>-		pch_can_tx_complete(ndev, int_stat);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-end:</div><div class='del'>-	napi_complete(napi);</div><div class='del'>-	pch_can_set_int_enables(priv, PCH_CAN_ALL);</div><div class='del'>-</div><div class='del'>-	return quota_save - quota;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_set_bittiming(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='del'>-	u32 canbit;</div><div class='del'>-	u32 bepe;</div><div class='del'>-</div><div class='del'>-	/* Setting the CCE bit for accessing the Can Timing register. */</div><div class='del'>-	pch_can_bit_set(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_CCE);</div><div class='del'>-</div><div class='del'>-	canbit = (bt-&gt;brp - 1) &amp; PCH_MSK_BITT_BRP;</div><div class='del'>-	canbit |= (bt-&gt;sjw - 1) &lt;&lt; PCH_BIT_SJW_SHIFT;</div><div class='del'>-	canbit |= (bt-&gt;phase_seg1 + bt-&gt;prop_seg - 1) &lt;&lt; PCH_BIT_TSEG1_SHIFT;</div><div class='del'>-	canbit |= (bt-&gt;phase_seg2 - 1) &lt;&lt; PCH_BIT_TSEG2_SHIFT;</div><div class='del'>-	bepe = ((bt-&gt;brp - 1) &amp; PCH_MSK_BRPE_BRPE) &gt;&gt; PCH_BIT_BRPE_BRPE_SHIFT;</div><div class='del'>-	iowrite32(canbit, &amp;priv-&gt;regs-&gt;bitt);</div><div class='del'>-	iowrite32(bepe, &amp;priv-&gt;regs-&gt;brpe);</div><div class='del'>-	pch_can_bit_clear(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_CCE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_start(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;can.state != CAN_STATE_STOPPED)</div><div class='del'>-		pch_can_reset(priv);</div><div class='del'>-</div><div class='del'>-	pch_set_bittiming(ndev);</div><div class='del'>-	pch_can_set_optmode(priv);</div><div class='del'>-</div><div class='del'>-	pch_can_set_tx_all(priv, 1);</div><div class='del'>-	pch_can_set_rx_all(priv, 1);</div><div class='del'>-</div><div class='del'>-	/* Setting the CAN to run mode. */</div><div class='del'>-	pch_can_set_run_mode(priv, PCH_CAN_RUN);</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case CAN_MODE_START:</div><div class='del'>-		pch_can_start(ndev);</div><div class='del'>-		netif_wake_queue(ndev);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_open(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	/* Regstering the interrupt. */</div><div class='del'>-	retval = request_irq(priv-&gt;dev-&gt;irq, pch_can_interrupt, IRQF_SHARED,</div><div class='del'>-			     ndev-&gt;name, ndev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		netdev_err(ndev, "request_irq failed.\n");</div><div class='del'>-		goto req_irq_err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Open common can device */</div><div class='del'>-	retval = open_candev(ndev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		netdev_err(ndev, "open_candev() failed %d\n", retval);</div><div class='del'>-		goto err_open_candev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pch_can_init(priv);</div><div class='del'>-	pch_can_start(ndev);</div><div class='del'>-	napi_enable(&amp;priv-&gt;napi);</div><div class='del'>-	netif_start_queue(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_open_candev:</div><div class='del'>-	free_irq(priv-&gt;dev-&gt;irq, ndev);</div><div class='del'>-req_irq_err:</div><div class='del'>-	pch_can_release(priv);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_close(struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(ndev);</div><div class='del'>-	napi_disable(&amp;priv-&gt;napi);</div><div class='del'>-	pch_can_release(priv);</div><div class='del'>-	free_irq(priv-&gt;dev-&gt;irq, ndev);</div><div class='del'>-	close_candev(ndev);</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='del'>-	int tx_obj_no;</div><div class='del'>-	int i;</div><div class='del'>-	u32 id2;</div><div class='del'>-</div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-</div><div class='del'>-	tx_obj_no = priv-&gt;tx_obj;</div><div class='del'>-	if (priv-&gt;tx_obj == PCH_TX_OBJ_END) {</div><div class='del'>-		if (ioread32(&amp;priv-&gt;regs-&gt;treq2) &amp; PCH_TREQ2_TX_MASK)</div><div class='del'>-			netif_stop_queue(ndev);</div><div class='del'>-</div><div class='del'>-		priv-&gt;tx_obj = PCH_TX_OBJ_START;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;tx_obj++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setting the CMASK register. */</div><div class='del'>-	pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[1].cmask, PCH_CMASK_ALL);</div><div class='del'>-</div><div class='del'>-	/* If ID extended is set. */</div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='del'>-		iowrite32(cf-&gt;can_id &amp; 0xffff, &amp;priv-&gt;regs-&gt;ifregs[1].id1);</div><div class='del'>-		id2 = ((cf-&gt;can_id &gt;&gt; 16) &amp; 0x1fff) | PCH_ID2_XTD;</div><div class='del'>-	} else {</div><div class='del'>-		iowrite32(0, &amp;priv-&gt;regs-&gt;ifregs[1].id1);</div><div class='del'>-		id2 = (cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id2 |= PCH_ID_MSGVAL;</div><div class='del'>-</div><div class='del'>-	/* If remote frame has to be transmitted.. */</div><div class='del'>-	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='del'>-		id2 |= PCH_ID2_DIR;</div><div class='del'>-</div><div class='del'>-	iowrite32(id2, &amp;priv-&gt;regs-&gt;ifregs[1].id2);</div><div class='del'>-</div><div class='del'>-	/* Copy data to register */</div><div class='del'>-	for (i = 0; i &lt; cf-&gt;can_dlc; i += 2) {</div><div class='del'>-		iowrite16(cf-&gt;data[i] | (cf-&gt;data[i + 1] &lt;&lt; 8),</div><div class='del'>-			  &amp;priv-&gt;regs-&gt;ifregs[1].data[i / 2]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	can_put_echo_skb(skb, ndev, tx_obj_no - PCH_RX_OBJ_END - 1);</div><div class='del'>-</div><div class='del'>-	/* Set the size of the data. Update if2_mcont */</div><div class='del'>-	iowrite32(cf-&gt;can_dlc | PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_TXRQXT |</div><div class='del'>-		  PCH_IF_MCONT_TXIE, &amp;priv-&gt;regs-&gt;ifregs[1].mcont);</div><div class='del'>-</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[1].creq, tx_obj_no);</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops pch_can_netdev_ops = {</div><div class='del'>-	.ndo_open		= pch_can_open,</div><div class='del'>-	.ndo_stop		= pch_close,</div><div class='del'>-	.ndo_start_xmit		= pch_xmit,</div><div class='del'>-	.ndo_change_mtu		= can_change_mtu,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void pch_can_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	unregister_candev(priv-&gt;ndev);</div><div class='del'>-	if (priv-&gt;use_msi)</div><div class='del'>-		pci_disable_msi(priv-&gt;dev);</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pch_can_reset(priv);</div><div class='del'>-	pci_iounmap(pdev, priv-&gt;regs);</div><div class='del'>-	free_candev(priv-&gt;ndev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static void pch_can_set_int_custom(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Clearing the IE, SIE and EIE bits of Can control register. */</div><div class='del'>-	pch_can_bit_clear(&amp;priv-&gt;regs-&gt;cont, PCH_CTRL_IE_SIE_EIE);</div><div class='del'>-</div><div class='del'>-	/* Appropriately setting them. */</div><div class='del'>-	pch_can_bit_set(&amp;priv-&gt;regs-&gt;cont,</div><div class='del'>-			((priv-&gt;int_enables &amp; PCH_MSK_CTRL_IE_SIE_EIE) &lt;&lt; 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function retrieves interrupt enabled for the CAN device. */</div><div class='del'>-static u32 pch_can_get_int_enables(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	/* Obtaining the status of IE, SIE and EIE interrupt bits. */</div><div class='del'>-	return (ioread32(&amp;priv-&gt;regs-&gt;cont) &amp; PCH_CTRL_IE_SIE_EIE) &gt;&gt; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,</div><div class='del'>-			       enum pch_ifreg dir)</div><div class='del'>-{</div><div class='del'>-	u32 ie, enable;</div><div class='del'>-</div><div class='del'>-	if (dir)</div><div class='del'>-		ie = PCH_IF_MCONT_RXIE;</div><div class='del'>-	else</div><div class='del'>-		ie = PCH_IF_MCONT_TXIE;</div><div class='del'>-</div><div class='del'>-	iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[dir].cmask);</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[dir].creq, buff_num);</div><div class='del'>-</div><div class='del'>-	if (((ioread32(&amp;priv-&gt;regs-&gt;ifregs[dir].id2)) &amp; PCH_ID_MSGVAL) &amp;&amp;</div><div class='del'>-			((ioread32(&amp;priv-&gt;regs-&gt;ifregs[dir].mcont)) &amp; ie))</div><div class='del'>-		enable = 1;</div><div class='del'>-	else</div><div class='del'>-		enable = 0;</div><div class='del'>-</div><div class='del'>-	return enable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,</div><div class='del'>-				       u32 buffer_num, int set)</div><div class='del'>-{</div><div class='del'>-	iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, buffer_num);</div><div class='del'>-	iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,</div><div class='del'>-		  &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-	if (set)</div><div class='del'>-		pch_can_bit_clear(&amp;priv-&gt;regs-&gt;ifregs[0].mcont,</div><div class='del'>-				  PCH_IF_MCONT_EOB);</div><div class='del'>-	else</div><div class='del'>-		pch_can_bit_set(&amp;priv-&gt;regs-&gt;ifregs[0].mcont, PCH_IF_MCONT_EOB);</div><div class='del'>-</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, buffer_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 pch_can_get_rx_buffer_link(struct pch_can_priv *priv, u32 buffer_num)</div><div class='del'>-{</div><div class='del'>-	u32 link;</div><div class='del'>-</div><div class='del'>-	iowrite32(PCH_CMASK_RX_TX_GET, &amp;priv-&gt;regs-&gt;ifregs[0].cmask);</div><div class='del'>-	pch_can_rw_msg_obj(&amp;priv-&gt;regs-&gt;ifregs[0].creq, buffer_num);</div><div class='del'>-</div><div class='del'>-	if (ioread32(&amp;priv-&gt;regs-&gt;ifregs[0].mcont) &amp; PCH_IF_MCONT_EOB)</div><div class='del'>-		link = 0;</div><div class='del'>-	else</div><div class='del'>-		link = 1;</div><div class='del'>-	return link;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_get_buffer_status(struct pch_can_priv *priv)</div><div class='del'>-{</div><div class='del'>-	return (ioread32(&amp;priv-&gt;regs-&gt;treq1) &amp; 0xffff) |</div><div class='del'>-	       (ioread32(&amp;priv-&gt;regs-&gt;treq2) &lt;&lt; 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int retval;</div><div class='del'>-	u32 buf_stat;	/* Variable for reading the transmit buffer status. */</div><div class='del'>-	int counter = PCH_COUNTER_LIMIT;</div><div class='del'>-</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Stop the CAN controller */</div><div class='del'>-	pch_can_set_run_mode(priv, PCH_CAN_STOP);</div><div class='del'>-</div><div class='del'>-	/* Indicate that we are aboutto/in suspend */</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='del'>-</div><div class='del'>-	/* Waiting for all transmission to complete. */</div><div class='del'>-	while (counter) {</div><div class='del'>-		buf_stat = pch_can_get_buffer_status(priv);</div><div class='del'>-		if (!buf_stat)</div><div class='del'>-			break;</div><div class='del'>-		counter--;</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-	if (!counter)</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "%s -&gt; Transmission time out.\n", __func__);</div><div class='del'>-</div><div class='del'>-	/* Save interrupt configuration and then disable them */</div><div class='del'>-	priv-&gt;int_enables = pch_can_get_int_enables(priv);</div><div class='del'>-	pch_can_set_int_enables(priv, PCH_CAN_DISABLE);</div><div class='del'>-</div><div class='del'>-	/* Save Tx buffer enable state */</div><div class='del'>-	for (i = PCH_TX_OBJ_START; i &lt;= PCH_TX_OBJ_END; i++)</div><div class='del'>-		priv-&gt;tx_enable[i - 1] = pch_can_get_rxtx_ir(priv, i,</div><div class='del'>-							     PCH_TX_IFREG);</div><div class='del'>-</div><div class='del'>-	/* Disable all Transmit buffers */</div><div class='del'>-	pch_can_set_tx_all(priv, 0);</div><div class='del'>-</div><div class='del'>-	/* Save Rx buffer enable state */</div><div class='del'>-	for (i = PCH_RX_OBJ_START; i &lt;= PCH_RX_OBJ_END; i++) {</div><div class='del'>-		priv-&gt;rx_enable[i - 1] = pch_can_get_rxtx_ir(priv, i,</div><div class='del'>-							     PCH_RX_IFREG);</div><div class='del'>-		priv-&gt;rx_link[i - 1] = pch_can_get_rx_buffer_link(priv, i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Disable all Receive buffers */</div><div class='del'>-	pch_can_set_rx_all(priv, 0);</div><div class='del'>-	retval = pci_save_state(pdev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "pci_save_state failed.\n");</div><div class='del'>-	} else {</div><div class='del'>-		pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-		pci_disable_device(pdev);</div><div class='del'>-		pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_resume(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int retval;</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-	retval = pci_enable_device(pdev);</div><div class='del'>-	if (retval) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "pci_enable_device failed.\n");</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-</div><div class='del'>-	/* Disabling all interrupts. */</div><div class='del'>-	pch_can_set_int_enables(priv, PCH_CAN_DISABLE);</div><div class='del'>-</div><div class='del'>-	/* Setting the CAN device in Stop Mode. */</div><div class='del'>-	pch_can_set_run_mode(priv, PCH_CAN_STOP);</div><div class='del'>-</div><div class='del'>-	/* Configuring the transmit and receive buffers. */</div><div class='del'>-	pch_can_config_rx_tx_buffers(priv);</div><div class='del'>-</div><div class='del'>-	/* Restore the CAN state */</div><div class='del'>-	pch_set_bittiming(dev);</div><div class='del'>-</div><div class='del'>-	/* Listen/Active */</div><div class='del'>-	pch_can_set_optmode(priv);</div><div class='del'>-</div><div class='del'>-	/* Enabling the transmit buffer. */</div><div class='del'>-	for (i = PCH_TX_OBJ_START; i &lt;= PCH_TX_OBJ_END; i++)</div><div class='del'>-		pch_can_set_rxtx(priv, i, priv-&gt;tx_enable[i - 1], PCH_TX_IFREG);</div><div class='del'>-</div><div class='del'>-	/* Configuring the receive buffer and enabling them. */</div><div class='del'>-	for (i = PCH_RX_OBJ_START; i &lt;= PCH_RX_OBJ_END; i++) {</div><div class='del'>-		/* Restore buffer link */</div><div class='del'>-		pch_can_set_rx_buffer_link(priv, i, priv-&gt;rx_link[i - 1]);</div><div class='del'>-</div><div class='del'>-		/* Restore buffer enables */</div><div class='del'>-		pch_can_set_rxtx(priv, i, priv-&gt;rx_enable[i - 1], PCH_RX_IFREG);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable CAN Interrupts */</div><div class='del'>-	pch_can_set_int_custom(priv);</div><div class='del'>-</div><div class='del'>-	/* Restore Run Mode */</div><div class='del'>-	pch_can_set_run_mode(priv, PCH_CAN_RUN);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define pch_can_suspend NULL</div><div class='del'>-#define pch_can_resume NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int pch_can_get_berr_counter(const struct net_device *dev,</div><div class='del'>-				    struct can_berr_counter *bec)</div><div class='del'>-{</div><div class='del'>-	struct pch_can_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 errc = ioread32(&amp;priv-&gt;regs-&gt;errc);</div><div class='del'>-</div><div class='del'>-	bec-&gt;txerr = errc &amp; PCH_TEC;</div><div class='del'>-	bec-&gt;rxerr = (errc &amp; PCH_REC) &gt;&gt; 8;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int pch_can_probe(struct pci_dev *pdev,</div><div class='del'>-				   const struct pci_device_id *id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct pch_can_priv *priv;</div><div class='del'>-	int rc;</div><div class='del'>-	void __iomem *addr;</div><div class='del'>-</div><div class='del'>-	rc = pci_enable_device(pdev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed pci_enable_device %d\n", rc);</div><div class='del'>-		goto probe_exit_endev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = pci_request_regions(pdev, KBUILD_MODNAME);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed pci_request_regions %d\n", rc);</div><div class='del'>-		goto probe_exit_pcireq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addr = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (!addr) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed pci_iomap\n");</div><div class='del'>-		goto probe_exit_ipmap;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ndev = alloc_candev(sizeof(struct pch_can_priv), PCH_TX_OBJ_END);</div><div class='del'>-	if (!ndev) {</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed alloc_candev\n");</div><div class='del'>-		goto probe_exit_alloc_candev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;ndev = ndev;</div><div class='del'>-	priv-&gt;regs = addr;</div><div class='del'>-	priv-&gt;dev = pdev;</div><div class='del'>-	priv-&gt;can.bittiming_const = &amp;pch_can_bittiming_const;</div><div class='del'>-	priv-&gt;can.do_set_mode = pch_can_do_set_mode;</div><div class='del'>-	priv-&gt;can.do_get_berr_counter = pch_can_get_berr_counter;</div><div class='del'>-	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY |</div><div class='del'>-				       CAN_CTRLMODE_LOOPBACK;</div><div class='del'>-	priv-&gt;tx_obj = PCH_TX_OBJ_START; /* Point head of Tx Obj */</div><div class='del'>-</div><div class='del'>-	ndev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-	ndev-&gt;flags |= IFF_ECHO;</div><div class='del'>-</div><div class='del'>-	pci_set_drvdata(pdev, ndev);</div><div class='del'>-	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='del'>-	ndev-&gt;netdev_ops = &amp;pch_can_netdev_ops;</div><div class='del'>-	priv-&gt;can.clock.freq = PCH_CAN_CLK; /* Hz */</div><div class='del'>-</div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, pch_can_poll, PCH_RX_OBJ_END);</div><div class='del'>-</div><div class='del'>-	rc = pci_enable_msi(priv-&gt;dev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(ndev, "PCH CAN opened without MSI\n");</div><div class='del'>-		priv-&gt;use_msi = 0;</div><div class='del'>-	} else {</div><div class='del'>-		netdev_err(ndev, "PCH CAN opened with MSI\n");</div><div class='del'>-		pci_set_master(pdev);</div><div class='del'>-		priv-&gt;use_msi = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = register_candev(ndev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed register_candev %d\n", rc);</div><div class='del'>-		goto probe_exit_reg_candev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-probe_exit_reg_candev:</div><div class='del'>-	if (priv-&gt;use_msi)</div><div class='del'>-		pci_disable_msi(priv-&gt;dev);</div><div class='del'>-	free_candev(ndev);</div><div class='del'>-probe_exit_alloc_candev:</div><div class='del'>-	pci_iounmap(pdev, addr);</div><div class='del'>-probe_exit_ipmap:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-probe_exit_pcireq:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-probe_exit_endev:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct pci_driver pch_can_pci_driver = {</div><div class='del'>-	.name = "pch_can",</div><div class='del'>-	.id_table = pch_pci_tbl,</div><div class='del'>-	.probe = pch_can_probe,</div><div class='del'>-	.remove = pch_can_remove,</div><div class='del'>-	.suspend = pch_can_suspend,</div><div class='del'>-	.resume = pch_can_resume,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_pci_driver(pch_can_pci_driver);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Intel EG20T PCH CAN(Controller Area Network) Driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_VERSION("0.94");</div><div class='head'>diff --git a/drivers/net/can/peak_canfd/Kconfig b/drivers/net/can/peak_canfd/Kconfig<br/>index c29ab2150794..f7e412766dbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/peak_canfd/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> config CAN_PEAK_PCIEFD</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	tristate "PEAK-System PCAN-PCIe FD cards"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for the PEAK-System PCI Express FD</div><div class='ctx'> 	  CAN-FD cards family.</div><div class='ctx'> 	  These 1x or 2x CAN-FD channels cards offer CAN 2.0 a/b as well as</div><div class='head'>diff --git a/drivers/net/can/peak_canfd/peak_canfd.c b/drivers/net/can/peak_canfd/peak_canfd.c<br/>index 5696d7e80751..06cb2629f66a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/peak_canfd.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/peak_canfd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/peak_canfd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/peak_canfd/peak_canfd.c</a></div><div class='hunk'>@@ -1,21 +1,13 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2007, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- * Copyright (C) 2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2007, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2016  PEAK System-Technik GmbH</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+ * Copyright (C) 2016-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "peak_canfd_user.h"</div><div class='ctx'> </div><div class='hunk'>@@ -130,7 +122,8 @@ static int pucan_set_timing_slow(struct peak_canfd_priv *priv,</div><div class='ctx'> 	cmd = pucan_add_cmd(pucan_init_cmd(priv), PUCAN_CMD_TIMING_SLOW);</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;sjw_t = PUCAN_TSLOW_SJW_T(pbt-&gt;sjw - 1,</div><div class='del'>-				priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES);</div><div class='add'>+				       priv-&gt;can.ctrlmode &amp;</div><div class='add'>+				       CAN_CTRLMODE_3_SAMPLES);</div><div class='ctx'> 	cmd-&gt;tseg1 = PUCAN_TSLOW_TSEG1(pbt-&gt;prop_seg + pbt-&gt;phase_seg1 - 1);</div><div class='ctx'> 	cmd-&gt;tseg2 = PUCAN_TSLOW_TSEG2(pbt-&gt;phase_seg2 - 1);</div><div class='ctx'> 	cmd-&gt;brp = cpu_to_le16(PUCAN_TSLOW_BRP(pbt-&gt;brp - 1));</div><div class='hunk'>@@ -240,6 +233,20 @@ static int pucan_setup_rx_barrier(struct peak_canfd_priv *priv)</div><div class='ctx'> 	return pucan_write_cmd(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pucan_netif_rx(struct sk_buff *skb, __le32 ts_low, __le32 ts_high)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *hwts = skb_hwtstamps(skb);</div><div class='add'>+	u64 ts_us;</div><div class='add'>+</div><div class='add'>+	ts_us = (u64)le32_to_cpu(ts_high) &lt;&lt; 32;</div><div class='add'>+	ts_us |= le32_to_cpu(ts_low);</div><div class='add'>+</div><div class='add'>+	/* IP core timestamps are µs. */</div><div class='add'>+	hwts-&gt;hwtstamp = ns_to_ktime(ts_us * NSEC_PER_USEC);</div><div class='add'>+</div><div class='add'>+	return netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* handle the reception of one CAN frame */</div><div class='ctx'> static int pucan_handle_can_rx(struct peak_canfd_priv *priv,</div><div class='ctx'> 			       struct pucan_rx_msg *msg)</div><div class='hunk'>@@ -251,27 +258,31 @@ static int pucan_handle_can_rx(struct peak_canfd_priv *priv,</div><div class='ctx'> 	u8 cf_len;</div><div class='ctx'> </div><div class='ctx'> 	if (rx_msg_flags &amp; PUCAN_MSG_EXT_DATA_LEN)</div><div class='del'>-		cf_len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(msg)));</div><div class='add'>+		cf_len = can_fd_dlc2len(pucan_msg_get_dlc(msg));</div><div class='ctx'> 	else</div><div class='del'>-		cf_len = get_can_dlc(pucan_msg_get_dlc(msg));</div><div class='add'>+		cf_len = can_cc_dlc2len(pucan_msg_get_dlc(msg));</div><div class='ctx'> </div><div class='ctx'> 	/* if this frame is an echo, */</div><div class='del'>-	if ((rx_msg_flags &amp; PUCAN_MSG_LOOPED_BACK) &amp;&amp;</div><div class='del'>-	    !(rx_msg_flags &amp; PUCAN_MSG_SELF_RECEIVE)) {</div><div class='add'>+	if (rx_msg_flags &amp; PUCAN_MSG_LOOPED_BACK) {</div><div class='ctx'> 		unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;echo_lock, flags);</div><div class='del'>-		can_get_echo_skb(priv-&gt;ndev, msg-&gt;client);</div><div class='ctx'> </div><div class='ctx'> 		/* count bytes of the echo instead of skb */</div><div class='del'>-		stats-&gt;tx_bytes += cf_len;</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(priv-&gt;ndev, msg-&gt;client, NULL);</div><div class='ctx'> 		stats-&gt;tx_packets++;</div><div class='ctx'> </div><div class='ctx'> 		/* restart tx queue (a slot is free) */</div><div class='ctx'> 		netif_wake_queue(priv-&gt;ndev);</div><div class='ctx'> </div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;echo_lock, flags);</div><div class='del'>-		return 0;</div><div class='add'>+</div><div class='add'>+		/* if this frame is only an echo, stop here. Otherwise,</div><div class='add'>+		 * continue to push this application self-received frame into</div><div class='add'>+		 * its own rx queue.</div><div class='add'>+		 */</div><div class='add'>+		if (!(rx_msg_flags &amp; PUCAN_MSG_SELF_RECEIVE))</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* otherwise, it should be pushed into rx fifo */</div><div class='hunk'>@@ -299,15 +310,16 @@ static int pucan_handle_can_rx(struct peak_canfd_priv *priv,</div><div class='ctx'> 	if (rx_msg_flags &amp; PUCAN_MSG_EXT_ID)</div><div class='ctx'> 		cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='ctx'> </div><div class='del'>-	if (rx_msg_flags &amp; PUCAN_MSG_RTR)</div><div class='add'>+	if (rx_msg_flags &amp; PUCAN_MSG_RTR) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		memcpy(cf-&gt;data, msg-&gt;d, cf-&gt;len);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='ctx'> </div><div class='del'>-	netif_rx(skb);</div><div class='add'>+	pucan_netif_rx(skb, msg-&gt;ts_low, msg-&gt;ts_high);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -333,7 +345,6 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	/* this STATUS is the CNF of the RX_BARRIER: Tx path can be setup */</div><div class='ctx'> 	if (pucan_status_is_rx_barrier(msg)) {</div><div class='del'>-</div><div class='ctx'> 		if (priv-&gt;enable_tx_path) {</div><div class='ctx'> 			int err = priv-&gt;enable_tx_path(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -341,8 +352,8 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* start network queue (echo_skb array is empty) */</div><div class='del'>-		netif_start_queue(ndev);</div><div class='add'>+		/* wake network queue up (echo_skb array is empty) */</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -363,7 +374,7 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='ctx'> 		priv-&gt;can.can_stats.error_passive++;</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 			cf-&gt;data[1] = (priv-&gt;bec.txerr &gt; priv-&gt;bec.rxerr) ?</div><div class='ctx'> 					CAN_ERR_CRTL_TX_PASSIVE :</div><div class='ctx'> 					CAN_ERR_CRTL_RX_PASSIVE;</div><div class='hunk'>@@ -376,7 +387,7 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='ctx'> 		priv-&gt;can.can_stats.error_warning++;</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 			cf-&gt;data[1] = (priv-&gt;bec.txerr &gt; priv-&gt;bec.rxerr) ?</div><div class='ctx'> 					CAN_ERR_CRTL_TX_WARNING :</div><div class='ctx'> 					CAN_ERR_CRTL_RX_WARNING;</div><div class='hunk'>@@ -399,9 +410,7 @@ static int pucan_handle_status(struct peak_canfd_priv *priv,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_rx(skb);</div><div class='add'>+	pucan_netif_rx(skb, msg-&gt;ts_low, msg-&gt;ts_high);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -422,14 +431,12 @@ static int pucan_handle_cache_critical(struct peak_canfd_priv *priv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> </div><div class='ctx'> 	cf-&gt;data[6] = priv-&gt;bec.txerr;</div><div class='ctx'> 	cf-&gt;data[7] = priv-&gt;bec.rxerr;</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -617,7 +624,7 @@ static int peak_canfd_set_data_bittiming(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct peak_canfd_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	return pucan_set_timing_fast(priv, &amp;priv-&gt;can.data_bittiming);</div><div class='add'>+	return pucan_set_timing_fast(priv, &amp;priv-&gt;can.fd.data_bittiming);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int peak_canfd_close(struct net_device *ndev)</div><div class='hunk'>@@ -642,9 +649,9 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool should_stop_tx_queue;</div><div class='ctx'> 	int room_left;</div><div class='del'>-	u8 can_dlc;</div><div class='add'>+	u8 len;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	msg_size = ALIGN(sizeof(*msg) + cf-&gt;len, 4);</div><div class='hunk'>@@ -672,7 +679,7 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (can_is_canfd_skb(skb)) {</div><div class='ctx'> 		/* CAN FD frame format */</div><div class='del'>-		can_dlc = can_len2dlc(cf-&gt;len);</div><div class='add'>+		len = can_fd_len2dlc(cf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		msg_flags |= PUCAN_MSG_EXT_DATA_LEN;</div><div class='ctx'> </div><div class='hunk'>@@ -683,7 +690,7 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 			msg_flags |= PUCAN_MSG_ERROR_STATE_IND;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* CAN 2.0 frame format */</div><div class='del'>-		can_dlc = cf-&gt;len;</div><div class='add'>+		len = cf-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 			msg_flags |= PUCAN_MSG_RTR;</div><div class='hunk'>@@ -697,7 +704,7 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		msg_flags |= PUCAN_MSG_SELF_RECEIVE;</div><div class='ctx'> </div><div class='ctx'> 	msg-&gt;flags = cpu_to_le16(msg_flags);</div><div class='del'>-	msg-&gt;channel_dlc = PUCAN_MSG_CHANNEL_DLC(priv-&gt;index, can_dlc);</div><div class='add'>+	msg-&gt;channel_dlc = PUCAN_MSG_CHANNEL_DLC(priv-&gt;index, len);</div><div class='ctx'> 	memcpy(msg-&gt;d, cf-&gt;data, cf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* struct msg client field is used as an index in the echo skbs ring */</div><div class='hunk'>@@ -706,7 +713,7 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;echo_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* prepare and save echo skb in internal slot */</div><div class='del'>-	can_put_echo_skb(skb, ndev, priv-&gt;echo_idx);</div><div class='add'>+	can_put_echo_skb(skb, ndev, priv-&gt;echo_idx, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* move echo index to the next slot */</div><div class='ctx'> 	priv-&gt;echo_idx = (priv-&gt;echo_idx + 1) % priv-&gt;can.echo_skb_max;</div><div class='hunk'>@@ -736,11 +743,50 @@ static netdev_tx_t peak_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int peak_eth_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+				 struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;tx_type = HWTSTAMP_TX_OFF;</div><div class='add'>+	config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int peak_eth_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+				 struct kernel_hwtstamp_config *config,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (config-&gt;tx_type == HWTSTAMP_TX_OFF &amp;&amp;</div><div class='add'>+	    config-&gt;rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Only RX HWTSTAMP_FILTER_ALL is supported");</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops peak_canfd_netdev_ops = {</div><div class='ctx'> 	.ndo_open = peak_canfd_open,</div><div class='ctx'> 	.ndo_stop = peak_canfd_close,</div><div class='ctx'> 	.ndo_start_xmit = peak_canfd_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+	.ndo_hwtstamp_get = peak_eth_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = peak_eth_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int peak_get_ts_info(struct net_device *dev,</div><div class='add'>+			    struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	info-&gt;so_timestamping =</div><div class='add'>+		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_OFF);</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_ALL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops peak_canfd_ethtool_ops = {</div><div class='add'>+	.get_ts_info = peak_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct net_device *alloc_peak_canfd_dev(int sizeof_priv, int index,</div><div class='hunk'>@@ -763,12 +809,12 @@ struct net_device *alloc_peak_canfd_dev(int sizeof_priv, int index,</div><div class='ctx'> 	/* complete now socket-can initialization side */</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='ctx'> 	priv-&gt;can.bittiming_const = &amp;peak_canfd_nominal_const;</div><div class='del'>-	priv-&gt;can.data_bittiming_const = &amp;peak_canfd_data_const;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;peak_canfd_data_const;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.do_set_mode = peak_canfd_set_mode;</div><div class='ctx'> 	priv-&gt;can.do_get_berr_counter = peak_canfd_get_berr_counter;</div><div class='ctx'> 	priv-&gt;can.do_set_bittiming = peak_canfd_set_bittiming;</div><div class='del'>-	priv-&gt;can.do_set_data_bittiming = peak_canfd_set_data_bittiming;</div><div class='add'>+	priv-&gt;can.fd.do_set_data_bittiming = peak_canfd_set_data_bittiming;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='ctx'> 				       CAN_CTRLMODE_LISTENONLY |</div><div class='ctx'> 				       CAN_CTRLMODE_3_SAMPLES |</div><div class='hunk'>@@ -783,6 +829,7 @@ struct net_device *alloc_peak_canfd_dev(int sizeof_priv, int index,</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;peak_canfd_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;peak_canfd_ethtool_ops;</div><div class='ctx'> 	ndev-&gt;dev_id = index;</div><div class='ctx'> </div><div class='ctx'> 	return ndev;</div><div class='head'>diff --git a/drivers/net/can/peak_canfd/peak_canfd_user.h b/drivers/net/can/peak_canfd/peak_canfd_user.h<br/>index 95b23caa7dd6..60c6542028cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/peak_canfd_user.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/peak_canfd_user.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/peak_canfd_user.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/peak_canfd/peak_canfd_user.h</a></div><div class='hunk'>@@ -1,9 +1,8 @@</div><div class='ctx'> /* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * CAN driver for PEAK System micro-CAN based adapters</div><div class='add'>+/* CAN driver for PEAK System micro-CAN based adapters</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2011 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2011-2013 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef PEAK_CANFD_USER_H</div><div class='ctx'> #define PEAK_CANFD_USER_H</div><div class='head'>diff --git a/drivers/net/can/peak_canfd/peak_pciefd_main.c b/drivers/net/can/peak_canfd/peak_pciefd_main.c<br/>index c458d5fdc8d3..93558e33bc02 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/peak_pciefd_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/peak_canfd/peak_pciefd_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/peak_canfd/peak_pciefd_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/peak_canfd/peak_pciefd_main.c</a></div><div class='hunk'>@@ -1,19 +1,10 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2007, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- * Copyright (C) 2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2007, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_pci.c:</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001-2006  PEAK System-Technik GmbH</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+ * Copyright (C) 2001-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -28,9 +19,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "peak_canfd_user.h"</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCIe/M.2 FD family cards");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK PCAN PCIe/M.2 FD CAN cards");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> #define PCIEFD_DRV_NAME		"peak_pciefd"</div><div class='hunk'>@@ -125,8 +115,6 @@ MODULE_LICENSE("GPL v2");</div><div class='ctx'> #define CANFD_CTL_IRQ_CL_DEF	16	/* Rx msg max nb per IRQ in Rx DMA */</div><div class='ctx'> #define CANFD_CTL_IRQ_TL_DEF	10	/* Time before IRQ if &lt; CL (x100 µs) */</div><div class='ctx'> </div><div class='del'>-#define CANFD_OPTIONS_SET	(CANFD_OPTION_ERROR | CANFD_OPTION_BUSLOAD)</div><div class='del'>-</div><div class='ctx'> /* Tx anticipation window (link logical address should be aligned on 2K</div><div class='ctx'>  * boundary)</div><div class='ctx'>  */</div><div class='hunk'>@@ -155,7 +143,7 @@ struct pciefd_rx_dma {</div><div class='ctx'> 	__le32 irq_status;</div><div class='ctx'> 	__le32 sys_time_low;</div><div class='ctx'> 	__le32 sys_time_high;</div><div class='del'>-	struct pucan_rx_msg msg[0];</div><div class='add'>+	struct pucan_rx_msg msg[];</div><div class='ctx'> } __packed __aligned(4);</div><div class='ctx'> </div><div class='ctx'> /* Tx Link record */</div><div class='hunk'>@@ -203,7 +191,7 @@ struct pciefd_board {</div><div class='ctx'> 	struct pci_dev *pci_dev;</div><div class='ctx'> 	int can_count;</div><div class='ctx'> 	spinlock_t cmd_lock;		/* 64-bits cmds must be atomic */</div><div class='del'>-	struct pciefd_can *can[0];	/* array of network devices */</div><div class='add'>+	struct pciefd_can *can[];	/* array of network devices */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* supported device ids. */</div><div class='hunk'>@@ -668,7 +656,7 @@ static int pciefd_can_probe(struct pciefd_board *pciefd)</div><div class='ctx'> 		pciefd_can_writereg(priv, CANFD_CLK_SEL_80MHZ,</div><div class='ctx'> 				    PCIEFD_REG_CAN_CLK_SEL);</div><div class='ctx'> </div><div class='del'>-		/* fallthough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case CANFD_CLK_SEL_80MHZ:</div><div class='ctx'> 		priv-&gt;ucan.can.clock.freq = 80 * 1000 * 1000;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -849,7 +837,8 @@ err_disable_pci:</div><div class='ctx'> </div><div class='ctx'> 	/* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while</div><div class='ctx'> 	 * the probe() function must return a negative errno in case of failure</div><div class='del'>-	 * (err is unchanged if negative) */</div><div class='add'>+	 * (err is unchanged if negative)</div><div class='add'>+	 */</div><div class='ctx'> 	return pcibios_err_to_errno(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/can/rcar/Kconfig b/drivers/net/can/rcar/Kconfig<br/>index bd5a8fcd83e1..c66762ef631b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rcar/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rcar/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rcar/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rcar/Kconfig</a></div><div class='hunk'>@@ -1,18 +1,18 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> config CAN_RCAR</div><div class='del'>-	tristate "Renesas R-Car CAN controller"</div><div class='del'>-	depends on ARCH_RENESAS || ARM</div><div class='del'>-	---help---</div><div class='add'>+	tristate "Renesas R-Car and RZ/G CAN controller"</div><div class='add'>+	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use CAN controller found on Renesas R-Car</div><div class='del'>-	  SoCs.</div><div class='add'>+	  or RZ/G SoCs.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will</div><div class='ctx'> 	  be called rcar_can.</div><div class='ctx'> </div><div class='ctx'> config CAN_RCAR_CANFD</div><div class='ctx'> 	tristate "Renesas R-Car CAN FD controller"</div><div class='del'>-	depends on ARCH_RENESAS || ARM</div><div class='del'>-	---help---</div><div class='add'>+	depends on ARCH_RENESAS || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use CAN FD controller found on</div><div class='ctx'> 	  Renesas R-Car SoCs. The driver puts the controller in CAN FD only</div><div class='ctx'> 	  mode, which can interoperate with CAN2.0 nodes but does not support</div><div class='head'>diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c<br/>index 13e66297b65f..fc3df328e877 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rcar/rcar_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rcar/rcar_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rcar/rcar_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rcar/rcar_can.c</a></div><div class='hunk'>@@ -5,21 +5,30 @@</div><div class='ctx'>  * Copyright (C) 2013 Renesas Solutions Corp.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/can/platform/rcar_can.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define RCAR_CAN_DRV_NAME	"rcar_can"</div><div class='ctx'> </div><div class='add'>+/* Clock Select Register settings */</div><div class='add'>+enum CLKR {</div><div class='add'>+	CLKR_CLKP1 = 0, /* Peripheral clock (clkp1) */</div><div class='add'>+	CLKR_CLKP2 = 1, /* Peripheral clock (clkp2) */</div><div class='add'>+	CLKR_CLKEXT = 3, /* Externally input clock */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define RCAR_SUPPORTED_CLOCKS	(BIT(CLKR_CLKP1) | BIT(CLKR_CLKP2) | \</div><div class='ctx'> 				 BIT(CLKR_CLKEXT))</div><div class='ctx'> </div><div class='hunk'>@@ -86,9 +95,7 @@ struct rcar_can_priv {</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> 	struct rcar_can_regs __iomem *regs;</div><div class='del'>-	struct clk *clk;</div><div class='ctx'> 	struct clk *can_clk;</div><div class='del'>-	u8 tx_dlc[RCAR_CAN_FIFO_DEPTH];</div><div class='ctx'> 	u32 tx_head;</div><div class='ctx'> 	u32 tx_tail;</div><div class='ctx'> 	u8 clock_select;</div><div class='hunk'>@@ -108,100 +115,102 @@ static const struct can_bittiming_const rcar_can_bittiming_const = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Control Register bits */</div><div class='del'>-#define RCAR_CAN_CTLR_BOM	(3 &lt;&lt; 11) /* Bus-Off Recovery Mode Bits */</div><div class='del'>-#define RCAR_CAN_CTLR_BOM_ENT	(1 &lt;&lt; 11) /* Entry to halt mode */</div><div class='del'>-					/* at bus-off entry */</div><div class='del'>-#define RCAR_CAN_CTLR_SLPM	(1 &lt;&lt; 10)</div><div class='del'>-#define RCAR_CAN_CTLR_CANM	(3 &lt;&lt; 8) /* Operating Mode Select Bit */</div><div class='del'>-#define RCAR_CAN_CTLR_CANM_HALT	(1 &lt;&lt; 9)</div><div class='del'>-#define RCAR_CAN_CTLR_CANM_RESET (1 &lt;&lt; 8)</div><div class='del'>-#define RCAR_CAN_CTLR_CANM_FORCE_RESET (3 &lt;&lt; 8)</div><div class='del'>-#define RCAR_CAN_CTLR_MLM	(1 &lt;&lt; 3) /* Message Lost Mode Select */</div><div class='del'>-#define RCAR_CAN_CTLR_IDFM	(3 &lt;&lt; 1) /* ID Format Mode Select Bits */</div><div class='del'>-#define RCAR_CAN_CTLR_IDFM_MIXED (1 &lt;&lt; 2) /* Mixed ID mode */</div><div class='del'>-#define RCAR_CAN_CTLR_MBM	(1 &lt;&lt; 0) /* Mailbox Mode select */</div><div class='add'>+#define RCAR_CAN_CTLR_BOM	GENMASK(12, 11)	/* Bus-Off Recovery Mode Bits */</div><div class='add'>+#define RCAR_CAN_CTLR_BOM_ENT		1	/* Entry to halt mode */</div><div class='add'>+						/* at bus-off entry */</div><div class='add'>+#define RCAR_CAN_CTLR_SLPM	BIT(10)		/* Sleep Mode */</div><div class='add'>+#define RCAR_CAN_CTLR_CANM	GENMASK(9, 8)	/* Operating Mode Select Bit */</div><div class='add'>+#define RCAR_CAN_CTLR_CANM_OPER		0	/* Operation Mode */</div><div class='add'>+#define RCAR_CAN_CTLR_CANM_RESET	1	/* Reset Mode */</div><div class='add'>+#define RCAR_CAN_CTLR_CANM_HALT		2	/* Halt Mode */</div><div class='add'>+#define RCAR_CAN_CTLR_CANM_FORCE_RESET	3	/* Reset Mode (forcible) */</div><div class='add'>+#define RCAR_CAN_CTLR_MLM	BIT(3)		/* Message Lost Mode Select */</div><div class='add'>+#define RCAR_CAN_CTLR_IDFM	GENMASK(2, 1)	/* ID Format Mode Select Bits */</div><div class='add'>+#define RCAR_CAN_CTLR_IDFM_STD		0	/* Standard ID mode */</div><div class='add'>+#define RCAR_CAN_CTLR_IDFM_EXT		1	/* Extended ID mode */</div><div class='add'>+#define RCAR_CAN_CTLR_IDFM_MIXED	2	/* Mixed ID mode */</div><div class='add'>+#define RCAR_CAN_CTLR_MBM	BIT(0)		/* Mailbox Mode select */</div><div class='ctx'> </div><div class='ctx'> /* Status Register bits */</div><div class='del'>-#define RCAR_CAN_STR_RSTST	(1 &lt;&lt; 8) /* Reset Status Bit */</div><div class='add'>+#define RCAR_CAN_STR_RSTST	BIT(8)		/* Reset Status Bit */</div><div class='ctx'> </div><div class='ctx'> /* FIFO Received ID Compare Registers 0 and 1 bits */</div><div class='del'>-#define RCAR_CAN_FIDCR_IDE	(1 &lt;&lt; 31) /* ID Extension Bit */</div><div class='del'>-#define RCAR_CAN_FIDCR_RTR	(1 &lt;&lt; 30) /* Remote Transmission Request Bit */</div><div class='add'>+#define RCAR_CAN_FIDCR_IDE	BIT(31)		/* ID Extension Bit */</div><div class='add'>+#define RCAR_CAN_FIDCR_RTR	BIT(30)		/* Remote Transmission Request Bit */</div><div class='ctx'> </div><div class='ctx'> /* Receive FIFO Control Register bits */</div><div class='del'>-#define RCAR_CAN_RFCR_RFEST	(1 &lt;&lt; 7) /* Receive FIFO Empty Status Flag */</div><div class='del'>-#define RCAR_CAN_RFCR_RFE	(1 &lt;&lt; 0) /* Receive FIFO Enable */</div><div class='add'>+#define RCAR_CAN_RFCR_RFEST	BIT(7)		/* Receive FIFO Empty Status Flag */</div><div class='add'>+#define RCAR_CAN_RFCR_RFE	BIT(0)		/* Receive FIFO Enable */</div><div class='ctx'> </div><div class='ctx'> /* Transmit FIFO Control Register bits */</div><div class='del'>-#define RCAR_CAN_TFCR_TFUST	(7 &lt;&lt; 1) /* Transmit FIFO Unsent Message */</div><div class='del'>-					/* Number Status Bits */</div><div class='del'>-#define RCAR_CAN_TFCR_TFUST_SHIFT 1	/* Offset of Transmit FIFO Unsent */</div><div class='del'>-					/* Message Number Status Bits */</div><div class='del'>-#define RCAR_CAN_TFCR_TFE	(1 &lt;&lt; 0) /* Transmit FIFO Enable */</div><div class='del'>-</div><div class='del'>-#define RCAR_CAN_N_RX_MKREGS1	2	/* Number of mask registers */</div><div class='del'>-					/* for Rx mailboxes 0-31 */</div><div class='add'>+#define RCAR_CAN_TFCR_TFUST	GENMASK(3, 1)	/* Transmit FIFO Unsent Message */</div><div class='add'>+						/* Number Status Bits */</div><div class='add'>+#define RCAR_CAN_TFCR_TFE	BIT(0)		/* Transmit FIFO Enable */</div><div class='add'>+</div><div class='add'>+#define RCAR_CAN_N_RX_MKREGS1	2		/* Number of mask registers */</div><div class='add'>+						/* for Rx mailboxes 0-31 */</div><div class='ctx'> #define RCAR_CAN_N_RX_MKREGS2	8</div><div class='ctx'> </div><div class='ctx'> /* Bit Configuration Register settings */</div><div class='del'>-#define RCAR_CAN_BCR_TSEG1(x)	(((x) &amp; 0x0f) &lt;&lt; 20)</div><div class='del'>-#define RCAR_CAN_BCR_BPR(x)	(((x) &amp; 0x3ff) &lt;&lt; 8)</div><div class='del'>-#define RCAR_CAN_BCR_SJW(x)	(((x) &amp; 0x3) &lt;&lt; 4)</div><div class='del'>-#define RCAR_CAN_BCR_TSEG2(x)	((x) &amp; 0x07)</div><div class='add'>+#define RCAR_CAN_BCR_TSEG1	GENMASK(23, 20)</div><div class='add'>+#define RCAR_CAN_BCR_BRP	GENMASK(17, 8)</div><div class='add'>+#define RCAR_CAN_BCR_SJW	GENMASK(5, 4)</div><div class='add'>+#define RCAR_CAN_BCR_TSEG2	GENMASK(2, 0)</div><div class='ctx'> </div><div class='ctx'> /* Mailbox and Mask Registers bits */</div><div class='del'>-#define RCAR_CAN_IDE		(1 &lt;&lt; 31)</div><div class='del'>-#define RCAR_CAN_RTR		(1 &lt;&lt; 30)</div><div class='del'>-#define RCAR_CAN_SID_SHIFT	18</div><div class='add'>+#define RCAR_CAN_IDE		BIT(31)		/* ID Extension */</div><div class='add'>+#define RCAR_CAN_RTR		BIT(30)		/* Remote Transmission Request */</div><div class='add'>+#define RCAR_CAN_SID		GENMASK(28, 18)	/* Standard ID */</div><div class='add'>+#define RCAR_CAN_EID		GENMASK(28, 0)	/* Extended ID */</div><div class='ctx'> </div><div class='ctx'> /* Mailbox Interrupt Enable Register 1 bits */</div><div class='del'>-#define RCAR_CAN_MIER1_RXFIE	(1 &lt;&lt; 28) /* Receive  FIFO Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_MIER1_TXFIE	(1 &lt;&lt; 24) /* Transmit FIFO Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_MIER1_RXFIE	BIT(28)		/* Receive  FIFO Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_MIER1_TXFIE	BIT(24)		/* Transmit FIFO Interrupt Enable */</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Enable Register bits */</div><div class='del'>-#define RCAR_CAN_IER_ERSIE	(1 &lt;&lt; 5) /* Error (ERS) Interrupt Enable Bit */</div><div class='del'>-#define RCAR_CAN_IER_RXFIE	(1 &lt;&lt; 4) /* Reception FIFO Interrupt */</div><div class='del'>-					/* Enable Bit */</div><div class='del'>-#define RCAR_CAN_IER_TXFIE	(1 &lt;&lt; 3) /* Transmission FIFO Interrupt */</div><div class='del'>-					/* Enable Bit */</div><div class='add'>+#define RCAR_CAN_IER_ERSIE	BIT(5)		/* Error (ERS) Interrupt Enable Bit */</div><div class='add'>+#define RCAR_CAN_IER_RXFIE	BIT(4)		/* Reception FIFO Interrupt */</div><div class='add'>+						/* Enable Bit */</div><div class='add'>+#define RCAR_CAN_IER_TXFIE	BIT(3)		/* Transmission FIFO Interrupt */</div><div class='add'>+						/* Enable Bit */</div><div class='ctx'> /* Interrupt Status Register bits */</div><div class='del'>-#define RCAR_CAN_ISR_ERSF	(1 &lt;&lt; 5) /* Error (ERS) Interrupt Status Bit */</div><div class='del'>-#define RCAR_CAN_ISR_RXFF	(1 &lt;&lt; 4) /* Reception FIFO Interrupt */</div><div class='del'>-					/* Status Bit */</div><div class='del'>-#define RCAR_CAN_ISR_TXFF	(1 &lt;&lt; 3) /* Transmission FIFO Interrupt */</div><div class='del'>-					/* Status Bit */</div><div class='add'>+#define RCAR_CAN_ISR_ERSF	BIT(5)		/* Error (ERS) Interrupt Status Bit */</div><div class='add'>+#define RCAR_CAN_ISR_RXFF	BIT(4)		/* Reception FIFO Interrupt */</div><div class='add'>+						/* Status Bit */</div><div class='add'>+#define RCAR_CAN_ISR_TXFF	BIT(3)		/* Transmission FIFO Interrupt */</div><div class='add'>+						/* Status Bit */</div><div class='ctx'> </div><div class='ctx'> /* Error Interrupt Enable Register bits */</div><div class='del'>-#define RCAR_CAN_EIER_BLIE	(1 &lt;&lt; 7) /* Bus Lock Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_OLIE	(1 &lt;&lt; 6) /* Overload Frame Transmit */</div><div class='del'>-					/* Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_ORIE	(1 &lt;&lt; 5) /* Receive Overrun  Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_BORIE	(1 &lt;&lt; 4) /* Bus-Off Recovery Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_BOEIE	(1 &lt;&lt; 3) /* Bus-Off Entry Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_EPIE	(1 &lt;&lt; 2) /* Error Passive Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_EWIE	(1 &lt;&lt; 1) /* Error Warning Interrupt Enable */</div><div class='del'>-#define RCAR_CAN_EIER_BEIE	(1 &lt;&lt; 0) /* Bus Error Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_BLIE	BIT(7)		/* Bus Lock Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_OLIE	BIT(6)		/* Overload Frame Transmit */</div><div class='add'>+						/* Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_ORIE	BIT(5)		/* Receive Overrun  Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_BORIE	BIT(4)		/* Bus-Off Recovery Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_BOEIE	BIT(3)		/* Bus-Off Entry Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_EPIE	BIT(2)		/* Error Passive Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_EWIE	BIT(1)		/* Error Warning Interrupt Enable */</div><div class='add'>+#define RCAR_CAN_EIER_BEIE	BIT(0)		/* Bus Error Interrupt Enable */</div><div class='ctx'> </div><div class='ctx'> /* Error Interrupt Factor Judge Register bits */</div><div class='del'>-#define RCAR_CAN_EIFR_BLIF	(1 &lt;&lt; 7) /* Bus Lock Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_OLIF	(1 &lt;&lt; 6) /* Overload Frame Transmission */</div><div class='del'>-					 /* Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_ORIF	(1 &lt;&lt; 5) /* Receive Overrun Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_BORIF	(1 &lt;&lt; 4) /* Bus-Off Recovery Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_BOEIF	(1 &lt;&lt; 3) /* Bus-Off Entry Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_EPIF	(1 &lt;&lt; 2) /* Error Passive Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_EWIF	(1 &lt;&lt; 1) /* Error Warning Detect Flag */</div><div class='del'>-#define RCAR_CAN_EIFR_BEIF	(1 &lt;&lt; 0) /* Bus Error Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_BLIF	BIT(7)		/* Bus Lock Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_OLIF	BIT(6)		/* Overload Frame Transmission */</div><div class='add'>+						/* Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_ORIF	BIT(5)		/* Receive Overrun Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_BORIF	BIT(4)		/* Bus-Off Recovery Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_BOEIF	BIT(3)		/* Bus-Off Entry Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_EPIF	BIT(2)		/* Error Passive Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_EWIF	BIT(1)		/* Error Warning Detect Flag */</div><div class='add'>+#define RCAR_CAN_EIFR_BEIF	BIT(0)		/* Bus Error Detect Flag */</div><div class='ctx'> </div><div class='ctx'> /* Error Code Store Register bits */</div><div class='del'>-#define RCAR_CAN_ECSR_EDPM	(1 &lt;&lt; 7) /* Error Display Mode Select Bit */</div><div class='del'>-#define RCAR_CAN_ECSR_ADEF	(1 &lt;&lt; 6) /* ACK Delimiter Error Flag */</div><div class='del'>-#define RCAR_CAN_ECSR_BE0F	(1 &lt;&lt; 5) /* Bit Error (dominant) Flag */</div><div class='del'>-#define RCAR_CAN_ECSR_BE1F	(1 &lt;&lt; 4) /* Bit Error (recessive) Flag */</div><div class='del'>-#define RCAR_CAN_ECSR_CEF	(1 &lt;&lt; 3) /* CRC Error Flag */</div><div class='del'>-#define RCAR_CAN_ECSR_AEF	(1 &lt;&lt; 2) /* ACK Error Flag */</div><div class='del'>-#define RCAR_CAN_ECSR_FEF	(1 &lt;&lt; 1) /* Form Error Flag */</div><div class='del'>-#define RCAR_CAN_ECSR_SEF	(1 &lt;&lt; 0) /* Stuff Error Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_EDPM	BIT(7)		/* Error Display Mode Select Bit */</div><div class='add'>+#define RCAR_CAN_ECSR_ADEF	BIT(6)		/* ACK Delimiter Error Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_BE0F	BIT(5)		/* Bit Error (dominant) Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_BE1F	BIT(4)		/* Bit Error (recessive) Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_CEF	BIT(3)		/* CRC Error Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_AEF	BIT(2)		/* ACK Error Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_FEF	BIT(1)		/* Form Error Flag */</div><div class='add'>+#define RCAR_CAN_ECSR_SEF	BIT(0)		/* Stuff Error Flag */</div><div class='ctx'> </div><div class='ctx'> #define RCAR_CAN_NAPI_WEIGHT	4</div><div class='ctx'> #define MAX_STR_READS		0x100</div><div class='hunk'>@@ -211,13 +220,12 @@ static void tx_failure_cleanup(struct net_device *ndev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; RCAR_CAN_FIFO_DEPTH; i++)</div><div class='del'>-		can_free_echo_skb(ndev, i);</div><div class='add'>+		can_free_echo_skb(ndev, i, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u8 eifr, txerr = 0, rxerr = 0;</div><div class='hunk'>@@ -229,11 +237,8 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 	if (eifr &amp; (RCAR_CAN_EIFR_EWIF | RCAR_CAN_EIFR_EPIF)) {</div><div class='ctx'> 		txerr = readb(&amp;priv-&gt;regs-&gt;tecr);</div><div class='ctx'> 		rxerr = readb(&amp;priv-&gt;regs-&gt;recr);</div><div class='del'>-		if (skb) {</div><div class='add'>+		if (skb)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			cf-&gt;data[6] = txerr;</div><div class='del'>-			cf-&gt;data[7] = rxerr;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (eifr &amp; RCAR_CAN_EIFR_BEIF) {</div><div class='ctx'> 		int rx_errors = 0, tx_errors = 0;</div><div class='hunk'>@@ -247,35 +252,35 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_ADEF) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "ACK Delimiter Error\n");</div><div class='ctx'> 			tx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_ADEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_ADEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK_DEL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_BE0F) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "Bit Error (dominant)\n");</div><div class='ctx'> 			tx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_BE0F, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_BE0F, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_BE1F) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "Bit Error (recessive)\n");</div><div class='ctx'> 			tx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_BE1F, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_BE1F, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_CEF) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "CRC Error\n");</div><div class='ctx'> 			rx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_CEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_CEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_AEF) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "ACK Error\n");</div><div class='ctx'> 			tx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_AEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_AEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb) {</div><div class='ctx'> 				cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='ctx'> 				cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='hunk'>@@ -284,14 +289,14 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_FEF) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "Form Error\n");</div><div class='ctx'> 			rx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_FEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_FEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (ecsr &amp; RCAR_CAN_ECSR_SEF) {</div><div class='ctx'> 			netdev_dbg(priv-&gt;ndev, "Stuff Error\n");</div><div class='ctx'> 			rx_errors++;</div><div class='del'>-			writeb(~RCAR_CAN_ECSR_SEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='add'>+			writeb((u8)~RCAR_CAN_ECSR_SEF, &amp;priv-&gt;regs-&gt;ecsr);</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -299,14 +304,14 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 		priv-&gt;can.can_stats.bus_error++;</div><div class='ctx'> 		ndev-&gt;stats.rx_errors += rx_errors;</div><div class='ctx'> 		ndev-&gt;stats.tx_errors += tx_errors;</div><div class='del'>-		writeb(~RCAR_CAN_EIFR_BEIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='add'>+		writeb((u8)~RCAR_CAN_EIFR_BEIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (eifr &amp; RCAR_CAN_EIFR_EWIF) {</div><div class='ctx'> 		netdev_dbg(priv-&gt;ndev, "Error warning interrupt\n");</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='ctx'> 		priv-&gt;can.can_stats.error_warning++;</div><div class='ctx'> 		/* Clear interrupt condition */</div><div class='del'>-		writeb(~RCAR_CAN_EIFR_EWIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='add'>+		writeb((u8)~RCAR_CAN_EIFR_EWIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			cf-&gt;data[1] = txerr &gt; rxerr ? CAN_ERR_CRTL_TX_WARNING :</div><div class='ctx'> 					      CAN_ERR_CRTL_RX_WARNING;</div><div class='hunk'>@@ -316,7 +321,7 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='ctx'> 		priv-&gt;can.can_stats.error_passive++;</div><div class='ctx'> 		/* Clear interrupt condition */</div><div class='del'>-		writeb(~RCAR_CAN_EIFR_EPIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='add'>+		writeb((u8)~RCAR_CAN_EIFR_EPIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			cf-&gt;data[1] = txerr &gt; rxerr ? CAN_ERR_CRTL_TX_PASSIVE :</div><div class='ctx'> 					      CAN_ERR_CRTL_RX_PASSIVE;</div><div class='hunk'>@@ -328,17 +333,21 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 		writeb(priv-&gt;ier, &amp;priv-&gt;regs-&gt;ier);</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='ctx'> 		/* Clear interrupt condition */</div><div class='del'>-		writeb(~RCAR_CAN_EIFR_BOEIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='add'>+		writeb((u8)~RCAR_CAN_EIFR_BOEIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='ctx'> 		priv-&gt;can.can_stats.bus_off++;</div><div class='ctx'> 		can_bus_off(ndev);</div><div class='ctx'> 		if (skb)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+	} else if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = txerr;</div><div class='add'>+		cf-&gt;data[7] = rxerr;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (eifr &amp; RCAR_CAN_EIFR_ORIF) {</div><div class='ctx'> 		netdev_dbg(priv-&gt;ndev, "Receive overrun error interrupt\n");</div><div class='ctx'> 		ndev-&gt;stats.rx_over_errors++;</div><div class='ctx'> 		ndev-&gt;stats.rx_errors++;</div><div class='del'>-		writeb(~RCAR_CAN_EIFR_ORIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='add'>+		writeb((u8)~RCAR_CAN_EIFR_ORIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='ctx'> 		if (skb) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='ctx'> 			cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='hunk'>@@ -349,18 +358,15 @@ static void rcar_can_error(struct net_device *ndev)</div><div class='ctx'> 			   "Overload Frame Transmission error interrupt\n");</div><div class='ctx'> 		ndev-&gt;stats.rx_over_errors++;</div><div class='ctx'> 		ndev-&gt;stats.rx_errors++;</div><div class='del'>-		writeb(~RCAR_CAN_EIFR_OLIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='add'>+		writeb((u8)~RCAR_CAN_EIFR_OLIF, &amp;priv-&gt;regs-&gt;eifr);</div><div class='ctx'> 		if (skb) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='ctx'> 			cf-&gt;data[2] |= CAN_ERR_PROT_OVERLOAD;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb) {</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (skb)</div><div class='ctx'> 		netif_rx(skb);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_can_tx_done(struct net_device *ndev)</div><div class='hunk'>@@ -370,24 +376,23 @@ static void rcar_can_tx_done(struct net_device *ndev)</div><div class='ctx'> 	u8 isr;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		u8 unsent = readb(&amp;priv-&gt;regs-&gt;tfcr);</div><div class='add'>+		u8 unsent = FIELD_GET(RCAR_CAN_TFCR_TFUST,</div><div class='add'>+			    readb(&amp;priv-&gt;regs-&gt;tfcr));</div><div class='ctx'> </div><div class='del'>-		unsent = (unsent &amp; RCAR_CAN_TFCR_TFUST) &gt;&gt;</div><div class='del'>-			  RCAR_CAN_TFCR_TFUST_SHIFT;</div><div class='ctx'> 		if (priv-&gt;tx_head - priv-&gt;tx_tail &lt;= unsent)</div><div class='ctx'> 			break;</div><div class='ctx'> 		stats-&gt;tx_packets++;</div><div class='del'>-		stats-&gt;tx_bytes += priv-&gt;tx_dlc[priv-&gt;tx_tail %</div><div class='del'>-						RCAR_CAN_FIFO_DEPTH];</div><div class='del'>-		priv-&gt;tx_dlc[priv-&gt;tx_tail % RCAR_CAN_FIFO_DEPTH] = 0;</div><div class='del'>-		can_get_echo_skb(ndev, priv-&gt;tx_tail % RCAR_CAN_FIFO_DEPTH);</div><div class='add'>+		stats-&gt;tx_bytes +=</div><div class='add'>+			can_get_echo_skb(ndev,</div><div class='add'>+					 priv-&gt;tx_tail % RCAR_CAN_FIFO_DEPTH,</div><div class='add'>+					 NULL);</div><div class='add'>+</div><div class='ctx'> 		priv-&gt;tx_tail++;</div><div class='ctx'> 		netif_wake_queue(ndev);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Clear interrupt */</div><div class='ctx'> 	isr = readb(&amp;priv-&gt;regs-&gt;isr);</div><div class='ctx'> 	writeb(isr &amp; ~RCAR_CAN_ISR_TXFF, &amp;priv-&gt;regs-&gt;isr);</div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_TX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t rcar_can_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -418,15 +423,16 @@ static irqreturn_t rcar_can_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rcar_can_set_bittiming(struct net_device *dev)</div><div class='add'>+static void rcar_can_set_bittiming(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='ctx'> 	u32 bcr;</div><div class='ctx'> </div><div class='del'>-	bcr = RCAR_CAN_BCR_TSEG1(bt-&gt;phase_seg1 + bt-&gt;prop_seg - 1) |</div><div class='del'>-	      RCAR_CAN_BCR_BPR(bt-&gt;brp - 1) | RCAR_CAN_BCR_SJW(bt-&gt;sjw - 1) |</div><div class='del'>-	      RCAR_CAN_BCR_TSEG2(bt-&gt;phase_seg2 - 1);</div><div class='add'>+	bcr = FIELD_PREP(RCAR_CAN_BCR_TSEG1, bt-&gt;phase_seg1 + bt-&gt;prop_seg - 1) |</div><div class='add'>+	      FIELD_PREP(RCAR_CAN_BCR_BRP, bt-&gt;brp - 1) |</div><div class='add'>+	      FIELD_PREP(RCAR_CAN_BCR_SJW, bt-&gt;sjw - 1) |</div><div class='add'>+	      FIELD_PREP(RCAR_CAN_BCR_TSEG2, bt-&gt;phase_seg2 - 1);</div><div class='ctx'> 	/* Don't overwrite CLKR with 32-bit BCR access; CLKR has 8-bit access.</div><div class='ctx'> 	 * All the registers are big-endian but they get byte-swapped on 32-bit</div><div class='ctx'> 	 * read/write (but not on 8-bit, contrary to the manuals)...</div><div class='hunk'>@@ -450,16 +456,17 @@ static void rcar_can_start(struct net_device *ndev)</div><div class='ctx'> 	ctlr &amp;= ~RCAR_CAN_CTLR_SLPM;</div><div class='ctx'> 	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='ctx'> 	/* Go to reset mode */</div><div class='del'>-	ctlr |= RCAR_CAN_CTLR_CANM_FORCE_RESET;</div><div class='add'>+	ctlr |= FIELD_PREP(RCAR_CAN_CTLR_CANM, RCAR_CAN_CTLR_CANM_FORCE_RESET);</div><div class='ctx'> 	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_STR_READS; i++) {</div><div class='ctx'> 		if (readw(&amp;priv-&gt;regs-&gt;str) &amp; RCAR_CAN_STR_RSTST)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	rcar_can_set_bittiming(ndev);</div><div class='del'>-	ctlr |= RCAR_CAN_CTLR_IDFM_MIXED; /* Select mixed ID mode */</div><div class='del'>-	ctlr |= RCAR_CAN_CTLR_BOM_ENT;	/* Entry to halt mode automatically */</div><div class='del'>-					/* at bus-off */</div><div class='add'>+	/* Select mixed ID mode */</div><div class='add'>+	ctlr |= FIELD_PREP(RCAR_CAN_CTLR_IDFM, RCAR_CAN_CTLR_IDFM_MIXED);</div><div class='add'>+	/* Entry to halt mode automatically at bus-off */</div><div class='add'>+	ctlr |= FIELD_PREP(RCAR_CAN_CTLR_BOM, RCAR_CAN_CTLR_BOM_ENT);</div><div class='ctx'> 	ctlr |= RCAR_CAN_CTLR_MBM;	/* Select FIFO mailbox mode */</div><div class='ctx'> 	ctlr |= RCAR_CAN_CTLR_MLM;	/* Overrun mode */</div><div class='ctx'> 	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='hunk'>@@ -489,7 +496,9 @@ static void rcar_can_start(struct net_device *ndev)</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> 	/* Go to operation mode */</div><div class='del'>-	writew(ctlr &amp; ~RCAR_CAN_CTLR_CANM, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='add'>+	ctlr &amp;= ~RCAR_CAN_CTLR_CANM;</div><div class='add'>+	ctlr |= FIELD_PREP(RCAR_CAN_CTLR_CANM, RCAR_CAN_CTLR_CANM_OPER);</div><div class='add'>+	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_STR_READS; i++) {</div><div class='ctx'> 		if (!(readw(&amp;priv-&gt;regs-&gt;str) &amp; RCAR_CAN_STR_RSTST))</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -504,32 +513,30 @@ static int rcar_can_open(struct net_device *ndev)</div><div class='ctx'> 	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	err = pm_runtime_resume_and_get(ndev-&gt;dev.parent);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev,</div><div class='del'>-			   "failed to enable peripheral clock, error %d\n",</div><div class='del'>-			   err);</div><div class='add'>+		netdev_err(ndev, "pm_runtime_resume_and_get() failed %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = clk_prepare_enable(priv-&gt;can_clk);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev, "failed to enable CAN clock, error %d\n",</div><div class='del'>-			   err);</div><div class='del'>-		goto out_clock;</div><div class='add'>+		netdev_err(ndev, "failed to enable CAN clock: %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='add'>+		goto out_rpm;</div><div class='ctx'> 	}</div><div class='ctx'> 	err = open_candev(ndev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev, "open_candev() failed, error %d\n", err);</div><div class='add'>+		netdev_err(ndev, "open_candev() failed %pe\n", ERR_PTR(err));</div><div class='ctx'> 		goto out_can_clock;</div><div class='ctx'> 	}</div><div class='ctx'> 	napi_enable(&amp;priv-&gt;napi);</div><div class='ctx'> 	err = request_irq(ndev-&gt;irq, rcar_can_interrupt, 0, ndev-&gt;name, ndev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev, "request_irq(%d) failed, error %d\n",</div><div class='del'>-			   ndev-&gt;irq, err);</div><div class='add'>+		netdev_err(ndev, "request_irq(%d) failed %pe\n", ndev-&gt;irq,</div><div class='add'>+			   ERR_PTR(err));</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	}</div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	rcar_can_start(ndev);</div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -538,8 +545,8 @@ out_close:</div><div class='ctx'> 	close_candev(ndev);</div><div class='ctx'> out_can_clock:</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;can_clk);</div><div class='del'>-out_clock:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+out_rpm:</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -552,7 +559,7 @@ static void rcar_can_stop(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	/* Go to (force) reset mode */</div><div class='ctx'> 	ctlr = readw(&amp;priv-&gt;regs-&gt;ctlr);</div><div class='del'>-	ctlr |= RCAR_CAN_CTLR_CANM_FORCE_RESET;</div><div class='add'>+	ctlr |= FIELD_PREP(RCAR_CAN_CTLR_CANM, RCAR_CAN_CTLR_CANM_FORCE_RESET);</div><div class='ctx'> 	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='ctx'> 	for (i = 0; i &lt; MAX_STR_READS; i++) {</div><div class='ctx'> 		if (readw(&amp;priv-&gt;regs-&gt;str) &amp; RCAR_CAN_STR_RSTST)</div><div class='hunk'>@@ -577,9 +584,8 @@ static int rcar_can_close(struct net_device *ndev)</div><div class='ctx'> 	free_irq(ndev-&gt;irq, ndev);</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;can_clk);</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='ctx'> 	close_candev(ndev);</div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_STOP);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -590,28 +596,28 @@ static netdev_tx_t rcar_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> 	u32 data, i;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)	/* Extended frame format */</div><div class='del'>-		data = (cf-&gt;can_id &amp; CAN_EFF_MASK) | RCAR_CAN_IDE;</div><div class='add'>+		data = FIELD_PREP(RCAR_CAN_EID, cf-&gt;can_id &amp; CAN_EFF_MASK) |</div><div class='add'>+		       RCAR_CAN_IDE;</div><div class='ctx'> 	else				/* Standard frame format */</div><div class='del'>-		data = (cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; RCAR_CAN_SID_SHIFT;</div><div class='add'>+		data = FIELD_PREP(RCAR_CAN_SID, cf-&gt;can_id &amp; CAN_SFF_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG) { /* Remote transmission request */</div><div class='ctx'> 		data |= RCAR_CAN_RTR;</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 			writeb(cf-&gt;data[i],</div><div class='ctx'> 			       &amp;priv-&gt;regs-&gt;mb[RCAR_CAN_TX_FIFO_MBX].data[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	writel(data, &amp;priv-&gt;regs-&gt;mb[RCAR_CAN_TX_FIFO_MBX].id);</div><div class='ctx'> </div><div class='del'>-	writeb(cf-&gt;can_dlc, &amp;priv-&gt;regs-&gt;mb[RCAR_CAN_TX_FIFO_MBX].dlc);</div><div class='add'>+	writeb(cf-&gt;len, &amp;priv-&gt;regs-&gt;mb[RCAR_CAN_TX_FIFO_MBX].dlc);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_dlc[priv-&gt;tx_head % RCAR_CAN_FIFO_DEPTH] = cf-&gt;can_dlc;</div><div class='del'>-	can_put_echo_skb(skb, ndev, priv-&gt;tx_head % RCAR_CAN_FIFO_DEPTH);</div><div class='add'>+	can_put_echo_skb(skb, ndev, priv-&gt;tx_head % RCAR_CAN_FIFO_DEPTH, 0);</div><div class='ctx'> 	priv-&gt;tx_head++;</div><div class='ctx'> 	/* Start Tx: write 0xff to the TFPCR register to increment</div><div class='ctx'> 	 * the CPU-side pointer for the transmit FIFO to the next</div><div class='hunk'>@@ -629,7 +635,10 @@ static const struct net_device_ops rcar_can_netdev_ops = {</div><div class='ctx'> 	.ndo_open = rcar_can_open,</div><div class='ctx'> 	.ndo_stop = rcar_can_close,</div><div class='ctx'> 	.ndo_start_xmit = rcar_can_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops rcar_can_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void rcar_can_rx_pkt(struct rcar_can_priv *priv)</div><div class='hunk'>@@ -648,24 +657,23 @@ static void rcar_can_rx_pkt(struct rcar_can_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	data = readl(&amp;priv-&gt;regs-&gt;mb[RCAR_CAN_RX_FIFO_MBX].id);</div><div class='ctx'> 	if (data &amp; RCAR_CAN_IDE)</div><div class='del'>-		cf-&gt;can_id = (data &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='add'>+		cf-&gt;can_id = FIELD_GET(RCAR_CAN_EID, data) | CAN_EFF_FLAG;</div><div class='ctx'> 	else</div><div class='del'>-		cf-&gt;can_id = (data &gt;&gt; RCAR_CAN_SID_SHIFT) &amp; CAN_SFF_MASK;</div><div class='add'>+		cf-&gt;can_id = FIELD_GET(RCAR_CAN_SID, data);</div><div class='ctx'> </div><div class='ctx'> 	dlc = readb(&amp;priv-&gt;regs-&gt;mb[RCAR_CAN_RX_FIFO_MBX].dlc);</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(dlc);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(dlc);</div><div class='ctx'> 	if (data &amp; RCAR_CAN_RTR) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 	} else {</div><div class='del'>-		for (dlc = 0; dlc &lt; cf-&gt;can_dlc; dlc++)</div><div class='add'>+		for (dlc = 0; dlc &lt; cf-&gt;len; dlc++)</div><div class='ctx'> 			cf-&gt;data[dlc] =</div><div class='ctx'> 			readb(&amp;priv-&gt;regs-&gt;mb[RCAR_CAN_RX_FIFO_MBX].data[dlc]);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	can_led_event(priv-&gt;ndev, CAN_LED_EVENT_RX);</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='add'>+</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -713,18 +721,21 @@ static int rcar_can_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rcar_can_get_berr_counter(const struct net_device *dev,</div><div class='add'>+static int rcar_can_get_berr_counter(const struct net_device *ndev,</div><div class='ctx'> 				     struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_can_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	err = pm_runtime_resume_and_get(ndev-&gt;dev.parent);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='add'>+</div><div class='ctx'> 	bec-&gt;txerr = readb(&amp;priv-&gt;regs-&gt;tecr);</div><div class='ctx'> 	bec-&gt;rxerr = readb(&amp;priv-&gt;regs-&gt;recr);</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -736,36 +747,24 @@ static const char * const clock_names[] = {</div><div class='ctx'> </div><div class='ctx'> static int rcar_can_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_can_platform_data *pdata;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct rcar_can_priv *priv;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='del'>-	struct resource *mem;</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> 	u32 clock_select = CLKR_CLKP1;</div><div class='ctx'> 	int err = -ENODEV;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;dev.of_node) {</div><div class='del'>-		of_property_read_u32(pdev-&gt;dev.of_node,</div><div class='del'>-				     "renesas,can-clock-select", &amp;clock_select);</div><div class='del'>-	} else {</div><div class='del'>-		pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='del'>-		if (!pdata) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "No platform data provided!\n");</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		clock_select = pdata-&gt;clock_select;</div><div class='del'>-	}</div><div class='add'>+	of_property_read_u32(dev-&gt;of_node, "renesas,can-clock-select",</div><div class='add'>+			     &amp;clock_select);</div><div class='ctx'> </div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "No IRQ resource\n");</div><div class='ctx'> 		err = irq;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	addr = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='add'>+	addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(addr)) {</div><div class='ctx'> 		err = PTR_ERR(addr);</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -773,34 +772,26 @@ static int rcar_can_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_candev(sizeof(struct rcar_can_priv), RCAR_CAN_FIFO_DEPTH);</div><div class='ctx'> 	if (!ndev) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "alloc_candev() failed\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, "clkp1");</div><div class='del'>-	if (IS_ERR(priv-&gt;clk)) {</div><div class='del'>-		err = PTR_ERR(priv-&gt;clk);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot get peripheral clock, error %d\n",</div><div class='del'>-			err);</div><div class='del'>-		goto fail_clk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!(BIT(clock_select) &amp; RCAR_SUPPORTED_CLOCKS)) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "invalid CAN clock selected\n");</div><div class='add'>+		dev_err(dev, "invalid CAN clock selected\n");</div><div class='ctx'> 		goto fail_clk;</div><div class='ctx'> 	}</div><div class='del'>-	priv-&gt;can_clk = devm_clk_get(&amp;pdev-&gt;dev, clock_names[clock_select]);</div><div class='add'>+	priv-&gt;can_clk = devm_clk_get(dev, clock_names[clock_select]);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;can_clk)) {</div><div class='add'>+		dev_err(dev, "cannot get CAN clock: %pe\n", priv-&gt;can_clk);</div><div class='ctx'> 		err = PTR_ERR(priv-&gt;can_clk);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot get CAN clock, error %d\n", err);</div><div class='ctx'> 		goto fail_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;rcar_can_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;rcar_can_ethtool_ops;</div><div class='ctx'> 	ndev-&gt;irq = irq;</div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	priv-&gt;ndev = ndev;</div><div class='hunk'>@@ -812,23 +803,24 @@ static int rcar_can_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;can.do_get_berr_counter = rcar_can_get_berr_counter;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING;</div><div class='ctx'> 	platform_set_drvdata(pdev, ndev);</div><div class='del'>-	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, dev);</div><div class='add'>+</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;priv-&gt;napi, rcar_can_rx_poll,</div><div class='add'>+			      RCAR_CAN_NAPI_WEIGHT);</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(dev);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, rcar_can_rx_poll,</div><div class='del'>-		       RCAR_CAN_NAPI_WEIGHT);</div><div class='ctx'> 	err = register_candev(ndev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "register_candev() failed, error %d\n",</div><div class='del'>-			err);</div><div class='del'>-		goto fail_candev;</div><div class='add'>+		dev_err(dev, "register_candev() failed %pe\n", ERR_PTR(err));</div><div class='add'>+		goto fail_rpm;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(ndev);</div><div class='del'>-</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "device registered (IRQ%d)\n", ndev-&gt;irq);</div><div class='add'>+	dev_info(dev, "device registered (IRQ%d)\n", ndev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-fail_candev:</div><div class='add'>+fail_rpm:</div><div class='add'>+	pm_runtime_disable(dev);</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> fail_clk:</div><div class='ctx'> 	free_candev(ndev);</div><div class='hunk'>@@ -836,66 +828,65 @@ fail:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rcar_can_remove(struct platform_device *pdev)</div><div class='add'>+static void rcar_can_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_candev(ndev);</div><div class='add'>+	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> 	free_candev(ndev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __maybe_unused rcar_can_suspend(struct device *dev)</div><div class='add'>+static int rcar_can_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	u16 ctlr;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(ndev)) {</div><div class='del'>-		netif_stop_queue(ndev);</div><div class='del'>-		netif_device_detach(ndev);</div><div class='del'>-	}</div><div class='add'>+	if (!netif_running(ndev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	netif_device_detach(ndev);</div><div class='add'>+</div><div class='ctx'> 	ctlr = readw(&amp;priv-&gt;regs-&gt;ctlr);</div><div class='del'>-	ctlr |= RCAR_CAN_CTLR_CANM_HALT;</div><div class='add'>+	ctlr |= FIELD_PREP(RCAR_CAN_CTLR_CANM, RCAR_CAN_CTLR_CANM_HALT);</div><div class='ctx'> 	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='ctx'> 	ctlr |= RCAR_CAN_CTLR_SLPM;</div><div class='ctx'> 	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='ctx'> </div><div class='del'>-	clk_disable(priv-&gt;clk);</div><div class='add'>+	pm_runtime_put(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __maybe_unused rcar_can_resume(struct device *dev)</div><div class='add'>+static int rcar_can_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='del'>-	struct rcar_can_priv *priv = netdev_priv(ndev);</div><div class='del'>-	u16 ctlr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = clk_enable(priv-&gt;clk);</div><div class='add'>+	if (!netif_running(ndev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = pm_runtime_resume_and_get(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev, "clk_enable() failed, error %d\n", err);</div><div class='add'>+		netdev_err(ndev, "pm_runtime_resume_and_get() failed %pe\n",</div><div class='add'>+			   ERR_PTR(err));</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctlr = readw(&amp;priv-&gt;regs-&gt;ctlr);</div><div class='del'>-	ctlr &amp;= ~RCAR_CAN_CTLR_SLPM;</div><div class='del'>-	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='del'>-	ctlr &amp;= ~RCAR_CAN_CTLR_CANM;</div><div class='del'>-	writew(ctlr, &amp;priv-&gt;regs-&gt;ctlr);</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	rcar_can_start(ndev);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(ndev);</div><div class='add'>+	netif_start_queue(ndev);</div><div class='ctx'> </div><div class='del'>-	if (netif_running(ndev)) {</div><div class='del'>-		netif_device_attach(ndev);</div><div class='del'>-		netif_start_queue(ndev);</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend, rcar_can_resume);</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(rcar_can_pm_ops, rcar_can_suspend,</div><div class='add'>+				rcar_can_resume);</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id rcar_can_of_table[] __maybe_unused = {</div><div class='ctx'> 	{ .compatible = "renesas,can-r8a7778" },</div><div class='hunk'>@@ -913,7 +904,7 @@ static struct platform_driver rcar_can_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = RCAR_CAN_DRV_NAME,</div><div class='ctx'> 		.of_match_table = of_match_ptr(rcar_can_of_table),</div><div class='del'>-		.pm = &amp;rcar_can_pm_ops,</div><div class='add'>+		.pm = pm_sleep_ptr(&amp;rcar_can_pm_ops),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = rcar_can_probe,</div><div class='ctx'> 	.remove = rcar_can_remove,</div><div class='head'>diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c<br/>index 05410008aa6b..7895e1fdea1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rcar/rcar_canfd.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rcar/rcar_canfd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rcar/rcar_canfd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rcar/rcar_canfd.c</a></div><div class='hunk'>@@ -21,22 +21,24 @@</div><div class='ctx'>  * wherever it is modified to a readable name.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/bitmap.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define RCANFD_DRV_NAME			"rcar_canfd"</div><div class='ctx'> </div><div class='hunk'>@@ -73,27 +75,24 @@</div><div class='ctx'> #define RCANFD_GSTS_GNOPM		(BIT(0) | BIT(1) | BIT(2) | BIT(3))</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDGERFL / RSCFDnGERFL */</div><div class='del'>-#define RCANFD_GERFL_EEF1		BIT(17)</div><div class='del'>-#define RCANFD_GERFL_EEF0		BIT(16)</div><div class='add'>+#define RCANFD_GERFL_EEF		GENMASK(23, 16)</div><div class='ctx'> #define RCANFD_GERFL_CMPOF		BIT(3)	/* CAN FD only */</div><div class='ctx'> #define RCANFD_GERFL_THLES		BIT(2)</div><div class='ctx'> #define RCANFD_GERFL_MES		BIT(1)</div><div class='ctx'> #define RCANFD_GERFL_DEF		BIT(0)</div><div class='ctx'> </div><div class='del'>-#define RCANFD_GERFL_ERR(gpriv, x)	((x) &amp; (RCANFD_GERFL_EEF1 |\</div><div class='del'>-					RCANFD_GERFL_EEF0 | RCANFD_GERFL_MES |\</div><div class='del'>-					(gpriv-&gt;fdmode ?\</div><div class='del'>-					 RCANFD_GERFL_CMPOF : 0)))</div><div class='add'>+#define RCANFD_GERFL_ERR(gpriv, x) \</div><div class='add'>+({\</div><div class='add'>+	typeof(gpriv) (_gpriv) = (gpriv); \</div><div class='add'>+	((x) &amp; ((FIELD_PREP(RCANFD_GERFL_EEF, (_gpriv)-&gt;channels_mask)) | \</div><div class='add'>+		RCANFD_GERFL_MES | ((_gpriv)-&gt;fdmode ? RCANFD_GERFL_CMPOF : 0))); \</div><div class='add'>+})</div><div class='ctx'> </div><div class='ctx'> /* AFL Rx rules registers */</div><div class='ctx'> </div><div class='del'>-/* RSCFDnCFDGAFLCFG0 / RSCFDnGAFLCFG0 */</div><div class='del'>-#define RCANFD_GAFLCFG_SETRNC(n, x)	(((x) &amp; 0xff) &lt;&lt; (24 - n * 8))</div><div class='del'>-#define RCANFD_GAFLCFG_GETRNC(n, x)	(((x) &gt;&gt; (24 - n * 8)) &amp; 0xff)</div><div class='del'>-</div><div class='ctx'> /* RSCFDnCFDGAFLECTR / RSCFDnGAFLECTR */</div><div class='ctx'> #define RCANFD_GAFLECTR_AFLDAE		BIT(8)</div><div class='del'>-#define RCANFD_GAFLECTR_AFLPN(x)	((x) &amp; 0x1f)</div><div class='add'>+#define RCANFD_GAFLECTR_AFLPN(gpriv, page_num)	((page_num) &amp; (gpriv)-&gt;info-&gt;max_aflpn)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDGAFLIDj / RSCFDnGAFLIDj */</div><div class='ctx'> #define RCANFD_GAFLID_GAFLLB		BIT(29)</div><div class='hunk'>@@ -104,16 +103,13 @@</div><div class='ctx'> /* Channel register bits */</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCmCFG - Classical CAN only */</div><div class='del'>-#define RCANFD_CFG_SJW(x)		(((x) &amp; 0x3) &lt;&lt; 24)</div><div class='del'>-#define RCANFD_CFG_TSEG2(x)		(((x) &amp; 0x7) &lt;&lt; 20)</div><div class='del'>-#define RCANFD_CFG_TSEG1(x)		(((x) &amp; 0xf) &lt;&lt; 16)</div><div class='del'>-#define RCANFD_CFG_BRP(x)		(((x) &amp; 0x3ff) &lt;&lt; 0)</div><div class='add'>+#define RCANFD_CFG_SJW		GENMASK(25, 24)</div><div class='add'>+#define RCANFD_CFG_TSEG2	GENMASK(22, 20)</div><div class='add'>+#define RCANFD_CFG_TSEG1	GENMASK(19, 16)</div><div class='add'>+#define RCANFD_CFG_BRP		GENMASK(9, 0)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCmNCFG - CAN FD only */</div><div class='del'>-#define RCANFD_NCFG_NTSEG2(x)		(((x) &amp; 0x1f) &lt;&lt; 24)</div><div class='del'>-#define RCANFD_NCFG_NTSEG1(x)		(((x) &amp; 0x7f) &lt;&lt; 16)</div><div class='del'>-#define RCANFD_NCFG_NSJW(x)		(((x) &amp; 0x1f) &lt;&lt; 11)</div><div class='del'>-#define RCANFD_NCFG_NBRP(x)		(((x) &amp; 0x3ff) &lt;&lt; 0)</div><div class='add'>+#define RCANFD_NCFG_NBRP	GENMASK(9, 0)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCmCTR / RSCFDnCmCTR */</div><div class='ctx'> #define RCANFD_CCTR_CTME		BIT(24)</div><div class='hunk'>@@ -173,15 +169,24 @@</div><div class='ctx'> #define RCANFD_CERFL_ERR(x)		((x) &amp; (0x7fff)) /* above bits 14:0 */</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCmDCFG */</div><div class='del'>-#define RCANFD_DCFG_DSJW(x)		(((x) &amp; 0x7) &lt;&lt; 24)</div><div class='del'>-#define RCANFD_DCFG_DTSEG2(x)		(((x) &amp; 0x7) &lt;&lt; 20)</div><div class='del'>-#define RCANFD_DCFG_DTSEG1(x)		(((x) &amp; 0xf) &lt;&lt; 16)</div><div class='del'>-#define RCANFD_DCFG_DBRP(x)		(((x) &amp; 0xff) &lt;&lt; 0)</div><div class='add'>+#define RCANFD_DCFG_DBRP		GENMASK(7, 0)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCmFDCFG */</div><div class='add'>+#define RCANFD_GEN4_FDCFG_CLOE		BIT(30)</div><div class='add'>+#define RCANFD_GEN4_FDCFG_FDOE		BIT(28)</div><div class='add'>+#define RCANFD_FDCFG_TDCO		GENMASK(23, 16)</div><div class='ctx'> #define RCANFD_FDCFG_TDCE		BIT(9)</div><div class='ctx'> #define RCANFD_FDCFG_TDCOC		BIT(8)</div><div class='del'>-#define RCANFD_FDCFG_TDCO(x)		(((x) &amp; 0x7f) &gt;&gt; 16)</div><div class='add'>+</div><div class='add'>+/* RSCFDnCFDCmFDSTS */</div><div class='add'>+#define RCANFD_FDSTS_SOC		GENMASK(31, 24)</div><div class='add'>+#define RCANFD_FDSTS_EOC		GENMASK(23, 16)</div><div class='add'>+#define RCANFD_GEN4_FDSTS_TDCVF		BIT(15)</div><div class='add'>+#define RCANFD_GEN4_FDSTS_PNSTS		GENMASK(13, 12)</div><div class='add'>+#define RCANFD_FDSTS_SOCO		BIT(9)</div><div class='add'>+#define RCANFD_FDSTS_EOCO		BIT(8)</div><div class='add'>+#define RCANFD_FDSTS_TDCVF		BIT(7)</div><div class='add'>+#define RCANFD_FDSTS_TDCR		GENMASK(7, 0)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDRFCCx */</div><div class='ctx'> #define RCANFD_RFCC_RFIM		BIT(12)</div><div class='hunk'>@@ -202,8 +207,6 @@</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDRFPTRx */</div><div class='ctx'> #define RCANFD_RFPTR_RFDLC(x)		(((x) &gt;&gt; 28) &amp; 0xf)</div><div class='del'>-#define RCANFD_RFPTR_RFPTR(x)		(((x) &gt;&gt; 16) &amp; 0xfff)</div><div class='del'>-#define RCANFD_RFPTR_RFTS(x)		(((x) &gt;&gt; 0) &amp; 0xffff)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDRFFDSTSx */</div><div class='ctx'> #define RCANFD_RFFDSTS_RFFDF		BIT(2)</div><div class='hunk'>@@ -213,10 +216,14 @@</div><div class='ctx'> /* Common FIFO bits */</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCFCCk */</div><div class='del'>-#define RCANFD_CFCC_CFTML(x)		(((x) &amp; 0xf) &lt;&lt; 20)</div><div class='del'>-#define RCANFD_CFCC_CFM(x)		(((x) &amp; 0x3) &lt;&lt; 16)</div><div class='add'>+#define RCANFD_CFCC_CFTML(gpriv, cftml) \</div><div class='add'>+({\</div><div class='add'>+	typeof(gpriv) (_gpriv) = (gpriv); \</div><div class='add'>+	(((cftml) &amp; (_gpriv)-&gt;info-&gt;max_cftml) &lt;&lt; (_gpriv)-&gt;info-&gt;sh-&gt;cftml); \</div><div class='add'>+})</div><div class='add'>+#define RCANFD_CFCC_CFM(gpriv, x)	(((x) &amp; 0x3) &lt;&lt; (gpriv)-&gt;info-&gt;sh-&gt;cfm)</div><div class='ctx'> #define RCANFD_CFCC_CFIM		BIT(12)</div><div class='del'>-#define RCANFD_CFCC_CFDC(x)		(((x) &amp; 0x7) &lt;&lt; 8)</div><div class='add'>+#define RCANFD_CFCC_CFDC(gpriv, x)	(((x) &amp; 0x7) &lt;&lt; (gpriv)-&gt;info-&gt;sh-&gt;cfdc)</div><div class='ctx'> #define RCANFD_CFCC_CFPLS(x)		(((x) &amp; 0x7) &lt;&lt; 4)</div><div class='ctx'> #define RCANFD_CFCC_CFTXIE		BIT(2)</div><div class='ctx'> #define RCANFD_CFCC_CFE			BIT(0)</div><div class='hunk'>@@ -231,12 +238,9 @@</div><div class='ctx'> /* RSCFDnCFDCFIDk */</div><div class='ctx'> #define RCANFD_CFID_CFIDE		BIT(31)</div><div class='ctx'> #define RCANFD_CFID_CFRTR		BIT(30)</div><div class='del'>-#define RCANFD_CFID_CFID_MASK(x)	((x) &amp; 0x1fffffff)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCFPTRk */</div><div class='ctx'> #define RCANFD_CFPTR_CFDLC(x)		(((x) &amp; 0xf) &lt;&lt; 28)</div><div class='del'>-#define RCANFD_CFPTR_CFPTR(x)		(((x) &amp; 0xfff) &lt;&lt; 16)</div><div class='del'>-#define RCANFD_CFPTR_CFTS(x)		(((x) &amp; 0xff) &lt;&lt; 0)</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCFFDCSTSk */</div><div class='ctx'> #define RCANFD_CFFDCSTS_CFFDF		BIT(2)</div><div class='hunk'>@@ -276,87 +280,32 @@</div><div class='ctx'> #define RCANFD_GTSC			(0x0094)</div><div class='ctx'> /* RSCFDnCFDGAFLECTR / RSCFDnGAFLECTR */</div><div class='ctx'> #define RCANFD_GAFLECTR			(0x0098)</div><div class='del'>-/* RSCFDnCFDGAFLCFG0 / RSCFDnGAFLCFG0 */</div><div class='del'>-#define RCANFD_GAFLCFG0			(0x009c)</div><div class='del'>-/* RSCFDnCFDGAFLCFG1 / RSCFDnGAFLCFG1 */</div><div class='del'>-#define RCANFD_GAFLCFG1			(0x00a0)</div><div class='add'>+/* RSCFDnCFDGAFLCFG / RSCFDnGAFLCFG */</div><div class='add'>+#define RCANFD_GAFLCFG(w)		(0x009c + (0x04 * (w)))</div><div class='ctx'> /* RSCFDnCFDRMNB / RSCFDnRMNB */</div><div class='ctx'> #define RCANFD_RMNB			(0x00a4)</div><div class='ctx'> /* RSCFDnCFDRMND / RSCFDnRMND */</div><div class='ctx'> #define RCANFD_RMND(y)			(0x00a8 + (0x04 * (y)))</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDRFCCx / RSCFDnRFCCx */</div><div class='del'>-#define RCANFD_RFCC(x)			(0x00b8 + (0x04 * (x)))</div><div class='add'>+#define RCANFD_RFCC(gpriv, x)		((gpriv)-&gt;info-&gt;regs-&gt;rfcc + (0x04 * (x)))</div><div class='ctx'> /* RSCFDnCFDRFSTSx / RSCFDnRFSTSx */</div><div class='del'>-#define RCANFD_RFSTS(x)			(0x00d8 + (0x04 * (x)))</div><div class='add'>+#define RCANFD_RFSTS(gpriv, x)		(RCANFD_RFCC(gpriv, x) + 0x20)</div><div class='ctx'> /* RSCFDnCFDRFPCTRx / RSCFDnRFPCTRx */</div><div class='del'>-#define RCANFD_RFPCTR(x)		(0x00f8 + (0x04 * (x)))</div><div class='add'>+#define RCANFD_RFPCTR(gpriv, x)		(RCANFD_RFCC(gpriv, x) + 0x40)</div><div class='ctx'> </div><div class='ctx'> /* Common FIFO Control registers */</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCFCCx / RSCFDnCFCCx */</div><div class='del'>-#define RCANFD_CFCC(ch, idx)		(0x0118 + (0x0c * (ch)) + \</div><div class='del'>-					 (0x04 * (idx)))</div><div class='add'>+#define RCANFD_CFCC(gpriv, ch, idx) \</div><div class='add'>+	((gpriv)-&gt;info-&gt;regs-&gt;cfcc + (0x0c * (ch)) + (0x04 * (idx)))</div><div class='ctx'> /* RSCFDnCFDCFSTSx / RSCFDnCFSTSx */</div><div class='del'>-#define RCANFD_CFSTS(ch, idx)		(0x0178 + (0x0c * (ch)) + \</div><div class='del'>-					 (0x04 * (idx)))</div><div class='add'>+#define RCANFD_CFSTS(gpriv, ch, idx) \</div><div class='add'>+	((gpriv)-&gt;info-&gt;regs-&gt;cfsts + (0x0c * (ch)) + (0x04 * (idx)))</div><div class='ctx'> /* RSCFDnCFDCFPCTRx / RSCFDnCFPCTRx */</div><div class='del'>-#define RCANFD_CFPCTR(ch, idx)		(0x01d8 + (0x0c * (ch)) + \</div><div class='del'>-					 (0x04 * (idx)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDFESTS / RSCFDnFESTS */</div><div class='del'>-#define RCANFD_FESTS			(0x0238)</div><div class='del'>-/* RSCFDnCFDFFSTS / RSCFDnFFSTS */</div><div class='del'>-#define RCANFD_FFSTS			(0x023c)</div><div class='del'>-/* RSCFDnCFDFMSTS / RSCFDnFMSTS */</div><div class='del'>-#define RCANFD_FMSTS			(0x0240)</div><div class='del'>-/* RSCFDnCFDRFISTS / RSCFDnRFISTS */</div><div class='del'>-#define RCANFD_RFISTS			(0x0244)</div><div class='del'>-/* RSCFDnCFDCFRISTS / RSCFDnCFRISTS */</div><div class='del'>-#define RCANFD_CFRISTS			(0x0248)</div><div class='del'>-/* RSCFDnCFDCFTISTS / RSCFDnCFTISTS */</div><div class='del'>-#define RCANFD_CFTISTS			(0x024c)</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDTMCp / RSCFDnTMCp */</div><div class='del'>-#define RCANFD_TMC(p)			(0x0250 + (0x01 * (p)))</div><div class='del'>-/* RSCFDnCFDTMSTSp / RSCFDnTMSTSp */</div><div class='del'>-#define RCANFD_TMSTS(p)			(0x02d0 + (0x01 * (p)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDTMTRSTSp / RSCFDnTMTRSTSp */</div><div class='del'>-#define RCANFD_TMTRSTS(y)		(0x0350 + (0x04 * (y)))</div><div class='del'>-/* RSCFDnCFDTMTARSTSp / RSCFDnTMTARSTSp */</div><div class='del'>-#define RCANFD_TMTARSTS(y)		(0x0360 + (0x04 * (y)))</div><div class='del'>-/* RSCFDnCFDTMTCSTSp / RSCFDnTMTCSTSp */</div><div class='del'>-#define RCANFD_TMTCSTS(y)		(0x0370 + (0x04 * (y)))</div><div class='del'>-/* RSCFDnCFDTMTASTSp / RSCFDnTMTASTSp */</div><div class='del'>-#define RCANFD_TMTASTS(y)		(0x0380 + (0x04 * (y)))</div><div class='del'>-/* RSCFDnCFDTMIECy / RSCFDnTMIECy */</div><div class='del'>-#define RCANFD_TMIEC(y)			(0x0390 + (0x04 * (y)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDTXQCCm / RSCFDnTXQCCm */</div><div class='del'>-#define RCANFD_TXQCC(m)			(0x03a0 + (0x04 * (m)))</div><div class='del'>-/* RSCFDnCFDTXQSTSm / RSCFDnTXQSTSm */</div><div class='del'>-#define RCANFD_TXQSTS(m)		(0x03c0 + (0x04 * (m)))</div><div class='del'>-/* RSCFDnCFDTXQPCTRm / RSCFDnTXQPCTRm */</div><div class='del'>-#define RCANFD_TXQPCTR(m)		(0x03e0 + (0x04 * (m)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDTHLCCm / RSCFDnTHLCCm */</div><div class='del'>-#define RCANFD_THLCC(m)			(0x0400 + (0x04 * (m)))</div><div class='del'>-/* RSCFDnCFDTHLSTSm / RSCFDnTHLSTSm */</div><div class='del'>-#define RCANFD_THLSTS(m)		(0x0420 + (0x04 * (m)))</div><div class='del'>-/* RSCFDnCFDTHLPCTRm / RSCFDnTHLPCTRm */</div><div class='del'>-#define RCANFD_THLPCTR(m)		(0x0440 + (0x04 * (m)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDGTINTSTS0 / RSCFDnGTINTSTS0 */</div><div class='del'>-#define RCANFD_GTINTSTS0		(0x0460)</div><div class='del'>-/* RSCFDnCFDGTINTSTS1 / RSCFDnGTINTSTS1 */</div><div class='del'>-#define RCANFD_GTINTSTS1		(0x0464)</div><div class='del'>-/* RSCFDnCFDGTSTCFG / RSCFDnGTSTCFG */</div><div class='del'>-#define RCANFD_GTSTCFG			(0x0468)</div><div class='del'>-/* RSCFDnCFDGTSTCTR / RSCFDnGTSTCTR */</div><div class='del'>-#define RCANFD_GTSTCTR			(0x046c)</div><div class='del'>-/* RSCFDnCFDGLOCKK / RSCFDnGLOCKK */</div><div class='del'>-#define RCANFD_GLOCKK			(0x047c)</div><div class='add'>+#define RCANFD_CFPCTR(gpriv, ch, idx) \</div><div class='add'>+	((gpriv)-&gt;info-&gt;regs-&gt;cfpctr + (0x0c * (ch)) + (0x04 * (idx)))</div><div class='add'>+</div><div class='ctx'> /* RSCFDnCFDGRMCFG */</div><div class='ctx'> #define RCANFD_GRMCFG			(0x04fc)</div><div class='ctx'> </div><div class='hunk'>@@ -374,98 +323,72 @@</div><div class='ctx'> /* RSCFDnGAFLXXXj offset */</div><div class='ctx'> #define RCANFD_C_GAFL_OFFSET		(0x0500)</div><div class='ctx'> </div><div class='del'>-/* RSCFDnRMXXXq -&gt; RCANFD_C_RMXXX(q) */</div><div class='del'>-#define RCANFD_C_RMID(q)		(0x0600 + (0x10 * (q)))</div><div class='del'>-#define RCANFD_C_RMPTR(q)		(0x0604 + (0x10 * (q)))</div><div class='del'>-#define RCANFD_C_RMDF0(q)		(0x0608 + (0x10 * (q)))</div><div class='del'>-#define RCANFD_C_RMDF1(q)		(0x060c + (0x10 * (q)))</div><div class='del'>-</div><div class='ctx'> /* RSCFDnRFXXx -&gt; RCANFD_C_RFXX(x) */</div><div class='del'>-#define RCANFD_C_RFOFFSET		(0x0e00)</div><div class='del'>-#define RCANFD_C_RFID(x)		(RCANFD_C_RFOFFSET + (0x10 * (x)))</div><div class='del'>-#define RCANFD_C_RFPTR(x)		(RCANFD_C_RFOFFSET + 0x04 + \</div><div class='del'>-					 (0x10 * (x)))</div><div class='del'>-#define RCANFD_C_RFDF(x, df)		(RCANFD_C_RFOFFSET + 0x08 + \</div><div class='del'>-					 (0x10 * (x)) + (0x04 * (df)))</div><div class='add'>+#define RCANFD_C_RFOFFSET	(0x0e00)</div><div class='add'>+#define RCANFD_C_RFID(x)	(RCANFD_C_RFOFFSET + (0x10 * (x)))</div><div class='add'>+#define RCANFD_C_RFPTR(x)	(RCANFD_C_RFOFFSET + 0x04 + (0x10 * (x)))</div><div class='add'>+#define RCANFD_C_RFDF(x, df) \</div><div class='add'>+		(RCANFD_C_RFOFFSET + 0x08 + (0x10 * (x)) + (0x04 * (df)))</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFXXk -&gt; RCANFD_C_CFXX(ch, k) */</div><div class='ctx'> #define RCANFD_C_CFOFFSET		(0x0e80)</div><div class='del'>-#define RCANFD_C_CFID(ch, idx)		(RCANFD_C_CFOFFSET + (0x30 * (ch)) + \</div><div class='del'>-					 (0x10 * (idx)))</div><div class='del'>-#define RCANFD_C_CFPTR(ch, idx)		(RCANFD_C_CFOFFSET + 0x04 + \</div><div class='del'>-					 (0x30 * (ch)) + (0x10 * (idx)))</div><div class='del'>-#define RCANFD_C_CFDF(ch, idx, df)	(RCANFD_C_CFOFFSET + 0x08 + \</div><div class='del'>-					 (0x30 * (ch)) + (0x10 * (idx)) + \</div><div class='del'>-					 (0x04 * (df)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnTMXXp -&gt; RCANFD_C_TMXX(p) */</div><div class='del'>-#define RCANFD_C_TMID(p)		(0x1000 + (0x10 * (p)))</div><div class='del'>-#define RCANFD_C_TMPTR(p)		(0x1004 + (0x10 * (p)))</div><div class='del'>-#define RCANFD_C_TMDF0(p)		(0x1008 + (0x10 * (p)))</div><div class='del'>-#define RCANFD_C_TMDF1(p)		(0x100c + (0x10 * (p)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnTHLACCm */</div><div class='del'>-#define RCANFD_C_THLACC(m)		(0x1800 + (0x04 * (m)))</div><div class='del'>-/* RSCFDnRPGACCr */</div><div class='del'>-#define RCANFD_C_RPGACC(r)		(0x1900 + (0x04 * (r)))</div><div class='add'>+</div><div class='add'>+#define RCANFD_C_CFID(ch, idx) \</div><div class='add'>+	(RCANFD_C_CFOFFSET + (0x30 * (ch)) + (0x10 * (idx)))</div><div class='add'>+</div><div class='add'>+#define RCANFD_C_CFPTR(ch, idx)	\</div><div class='add'>+	(RCANFD_C_CFOFFSET + 0x04 + (0x30 * (ch)) + (0x10 * (idx)))</div><div class='add'>+</div><div class='add'>+#define RCANFD_C_CFDF(ch, idx, df) \</div><div class='add'>+	(RCANFD_C_CFOFFSET + 0x08 + (0x30 * (ch)) + (0x10 * (idx)) + (0x04 * (df)))</div><div class='add'>+</div><div class='add'>+/* R-Car Gen4 Classical and CAN FD mode specific register map */</div><div class='add'>+#define RCANFD_GEN4_GAFL_OFFSET		(0x1800)</div><div class='ctx'> </div><div class='ctx'> /* CAN FD mode specific register map */</div><div class='ctx'> </div><div class='del'>-/* RSCFDnCFDCmXXX -&gt; RCANFD_F_XXX(m) */</div><div class='del'>-#define RCANFD_F_DCFG(m)		(0x0500 + (0x20 * (m)))</div><div class='del'>-#define RCANFD_F_CFDCFG(m)		(0x0504 + (0x20 * (m)))</div><div class='del'>-#define RCANFD_F_CFDCTR(m)		(0x0508 + (0x20 * (m)))</div><div class='del'>-#define RCANFD_F_CFDSTS(m)		(0x050c + (0x20 * (m)))</div><div class='del'>-#define RCANFD_F_CFDCRC(m)		(0x0510 + (0x20 * (m)))</div><div class='add'>+/* RSCFDnCFDCmXXX -&gt; gpriv-&gt;fcbase[m].xxx */</div><div class='add'>+struct rcar_canfd_f_c {</div><div class='add'>+	u32 dcfg;</div><div class='add'>+	u32 cfdcfg;</div><div class='add'>+	u32 cfdctr;</div><div class='add'>+	u32 cfdsts;</div><div class='add'>+	u32 cfdcrc;</div><div class='add'>+	u32 pad[3];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDGAFLXXXj offset */</div><div class='ctx'> #define RCANFD_F_GAFL_OFFSET		(0x1000)</div><div class='ctx'> </div><div class='del'>-/* RSCFDnCFDRMXXXq -&gt; RCANFD_F_RMXXX(q) */</div><div class='del'>-#define RCANFD_F_RMID(q)		(0x2000 + (0x20 * (q)))</div><div class='del'>-#define RCANFD_F_RMPTR(q)		(0x2004 + (0x20 * (q)))</div><div class='del'>-#define RCANFD_F_RMFDSTS(q)		(0x2008 + (0x20 * (q)))</div><div class='del'>-#define RCANFD_F_RMDF(q, b)		(0x200c + (0x04 * (b)) + (0x20 * (q)))</div><div class='del'>-</div><div class='ctx'> /* RSCFDnCFDRFXXx -&gt; RCANFD_F_RFXX(x) */</div><div class='del'>-#define RCANFD_F_RFOFFSET		(0x3000)</div><div class='del'>-#define RCANFD_F_RFID(x)		(RCANFD_F_RFOFFSET + (0x80 * (x)))</div><div class='del'>-#define RCANFD_F_RFPTR(x)		(RCANFD_F_RFOFFSET + 0x04 + \</div><div class='del'>-					 (0x80 * (x)))</div><div class='del'>-#define RCANFD_F_RFFDSTS(x)		(RCANFD_F_RFOFFSET + 0x08 + \</div><div class='del'>-					 (0x80 * (x)))</div><div class='del'>-#define RCANFD_F_RFDF(x, df)		(RCANFD_F_RFOFFSET + 0x0c + \</div><div class='del'>-					 (0x80 * (x)) + (0x04 * (df)))</div><div class='add'>+#define RCANFD_F_RFOFFSET(gpriv)	((gpriv)-&gt;info-&gt;regs-&gt;rfoffset)</div><div class='add'>+#define RCANFD_F_RFID(gpriv, x)		(RCANFD_F_RFOFFSET(gpriv) + (0x80 * (x)))</div><div class='add'>+#define RCANFD_F_RFPTR(gpriv, x)	(RCANFD_F_RFOFFSET(gpriv) + 0x04 + (0x80 * (x)))</div><div class='add'>+#define RCANFD_F_RFFDSTS(gpriv, x)	(RCANFD_F_RFOFFSET(gpriv) + 0x08 + (0x80 * (x)))</div><div class='add'>+#define RCANFD_F_RFDF(gpriv, x, df) \</div><div class='add'>+	(RCANFD_F_RFOFFSET(gpriv) + 0x0c + (0x80 * (x)) + (0x04 * (df)))</div><div class='ctx'> </div><div class='ctx'> /* RSCFDnCFDCFXXk -&gt; RCANFD_F_CFXX(ch, k) */</div><div class='del'>-#define RCANFD_F_CFOFFSET		(0x3400)</div><div class='del'>-#define RCANFD_F_CFID(ch, idx)		(RCANFD_F_CFOFFSET + (0x180 * (ch)) + \</div><div class='del'>-					 (0x80 * (idx)))</div><div class='del'>-#define RCANFD_F_CFPTR(ch, idx)		(RCANFD_F_CFOFFSET + 0x04 + \</div><div class='del'>-					 (0x180 * (ch)) + (0x80 * (idx)))</div><div class='del'>-#define RCANFD_F_CFFDCSTS(ch, idx)	(RCANFD_F_CFOFFSET + 0x08 + \</div><div class='del'>-					 (0x180 * (ch)) + (0x80 * (idx)))</div><div class='del'>-#define RCANFD_F_CFDF(ch, idx, df)	(RCANFD_F_CFOFFSET + 0x0c + \</div><div class='del'>-					 (0x180 * (ch)) + (0x80 * (idx)) + \</div><div class='del'>-					 (0x04 * (df)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDTMXXp -&gt; RCANFD_F_TMXX(p) */</div><div class='del'>-#define RCANFD_F_TMID(p)		(0x4000 + (0x20 * (p)))</div><div class='del'>-#define RCANFD_F_TMPTR(p)		(0x4004 + (0x20 * (p)))</div><div class='del'>-#define RCANFD_F_TMFDCTR(p)		(0x4008 + (0x20 * (p)))</div><div class='del'>-#define RCANFD_F_TMDF(p, b)		(0x400c + (0x20 * (p)) + (0x04 * (b)))</div><div class='del'>-</div><div class='del'>-/* RSCFDnCFDTHLACCm */</div><div class='del'>-#define RCANFD_F_THLACC(m)		(0x6000 + (0x04 * (m)))</div><div class='del'>-/* RSCFDnCFDRPGACCr */</div><div class='del'>-#define RCANFD_F_RPGACC(r)		(0x6400 + (0x04 * (r)))</div><div class='add'>+#define RCANFD_F_CFOFFSET(gpriv)	((gpriv)-&gt;info-&gt;regs-&gt;cfoffset)</div><div class='add'>+</div><div class='add'>+#define RCANFD_F_CFID(gpriv, ch, idx) \</div><div class='add'>+	(RCANFD_F_CFOFFSET(gpriv) + (0x180 * (ch)) + (0x80 * (idx)))</div><div class='add'>+</div><div class='add'>+#define RCANFD_F_CFPTR(gpriv, ch, idx) \</div><div class='add'>+	(RCANFD_F_CFOFFSET(gpriv) + 0x04 + (0x180 * (ch)) + (0x80 * (idx)))</div><div class='add'>+</div><div class='add'>+#define RCANFD_F_CFFDCSTS(gpriv, ch, idx) \</div><div class='add'>+	(RCANFD_F_CFOFFSET(gpriv) + 0x08 + (0x180 * (ch)) + (0x80 * (idx)))</div><div class='add'>+</div><div class='add'>+#define RCANFD_F_CFDF(gpriv, ch, idx, df) \</div><div class='add'>+	(RCANFD_F_CFOFFSET(gpriv) + 0x0c + (0x180 * (ch)) + (0x80 * (idx)) + \</div><div class='add'>+	 (0x04 * (df)))</div><div class='ctx'> </div><div class='ctx'> /* Constants */</div><div class='ctx'> #define RCANFD_FIFO_DEPTH		8	/* Tx FIFO depth */</div><div class='ctx'> #define RCANFD_NAPI_WEIGHT		8	/* Rx poll quota */</div><div class='ctx'> </div><div class='del'>-#define RCANFD_NUM_CHANNELS		2	/* Two channels max */</div><div class='del'>-#define RCANFD_CHANNELS_MASK		BIT((RCANFD_NUM_CHANNELS) - 1)</div><div class='add'>+#define RCANFD_NUM_CHANNELS		8	/* Eight channels max */</div><div class='ctx'> </div><div class='ctx'> #define RCANFD_GAFL_PAGENUM(entry)	((entry) / 16)</div><div class='ctx'> #define RCANFD_CHANNEL_NUMRULES		1	/* only one rule per channel */</div><div class='hunk'>@@ -481,13 +404,47 @@</div><div class='ctx'>  */</div><div class='ctx'> #define RCANFD_CFFIFO_IDX		0</div><div class='ctx'> </div><div class='del'>-/* fCAN clock select register settings */</div><div class='del'>-enum rcar_canfd_fcanclk {</div><div class='del'>-	RCANFD_CANFDCLK = 0,		/* CANFD clock */</div><div class='del'>-	RCANFD_EXTCLK,			/* Externally input clock */</div><div class='add'>+struct rcar_canfd_global;</div><div class='add'>+</div><div class='add'>+struct rcar_canfd_regs {</div><div class='add'>+	u16 rfcc;	/* RX FIFO Configuration/Control Register */</div><div class='add'>+	u16 cfcc;	/* Common FIFO Configuration/Control Register */</div><div class='add'>+	u16 cfsts;	/* Common FIFO Status Register */</div><div class='add'>+	u16 cfpctr;	/* Common FIFO Pointer Control Register */</div><div class='add'>+	u16 coffset;	/* Channel Data Bitrate Configuration Register */</div><div class='add'>+	u16 rfoffset;	/* Receive FIFO buffer access ID register */</div><div class='add'>+	u16 cfoffset;	/* Transmit/receive FIFO buffer access ID register */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct rcar_canfd_global;</div><div class='add'>+struct rcar_canfd_shift_data {</div><div class='add'>+	u8 ntseg2;	/* Nominal Bit Rate Time Segment 2 Control */</div><div class='add'>+	u8 ntseg1;	/* Nominal Bit Rate Time Segment 1 Control */</div><div class='add'>+	u8 nsjw;	/* Nominal Bit Rate Resynchronization Jump Width Control */</div><div class='add'>+	u8 dtseg2;	/* Data Bit Rate Time Segment 2 Control */</div><div class='add'>+	u8 dtseg1;	/* Data Bit Rate Time Segment 1 Control */</div><div class='add'>+	u8 cftml;	/* Common FIFO TX Message Buffer Link */</div><div class='add'>+	u8 cfm;		/* Common FIFO Mode */</div><div class='add'>+	u8 cfdc;	/* Common FIFO Depth Configuration */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rcar_canfd_hw_info {</div><div class='add'>+	const struct can_bittiming_const *nom_bittiming;</div><div class='add'>+	const struct can_bittiming_const *data_bittiming;</div><div class='add'>+	const struct can_tdc_const *tdc_const;</div><div class='add'>+	const struct rcar_canfd_regs *regs;</div><div class='add'>+	const struct rcar_canfd_shift_data *sh;</div><div class='add'>+	u8 rnc_field_width;</div><div class='add'>+	u8 max_aflpn;</div><div class='add'>+	u8 max_cftml;</div><div class='add'>+	u8 max_channels;</div><div class='add'>+	u8 postdiv;</div><div class='add'>+	/* hardware features */</div><div class='add'>+	unsigned shared_global_irqs:1;	/* Has shared global irqs */</div><div class='add'>+	unsigned multi_channel_irqs:1;	/* Has multiple channel irqs */</div><div class='add'>+	unsigned ch_interface_mode:1;	/* Has channel interface mode */</div><div class='add'>+	unsigned shared_can_regs:1;	/* Has shared classical can registers */</div><div class='add'>+	unsigned external_clk:1;	/* Has external clock */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Channel priv data */</div><div class='ctx'> struct rcar_canfd_channel {</div><div class='hunk'>@@ -495,8 +452,8 @@ struct rcar_canfd_channel {</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct rcar_canfd_global *gpriv;	/* Controller reference */</div><div class='ctx'> 	void __iomem *base;			/* Register base address */</div><div class='add'>+	struct phy *transceiver;		/* Optional transceiver */</div><div class='ctx'> 	struct napi_struct napi;</div><div class='del'>-	u8  tx_len[RCANFD_FIFO_DEPTH];		/* For net stats */</div><div class='ctx'> 	u32 tx_head;				/* Incremented on xmit */</div><div class='ctx'> 	u32 tx_tail;				/* Incremented on xmit done */</div><div class='ctx'> 	u32 channel;				/* Channel number */</div><div class='hunk'>@@ -507,16 +464,21 @@ struct rcar_canfd_channel {</div><div class='ctx'> struct rcar_canfd_global {</div><div class='ctx'> 	struct rcar_canfd_channel *ch[RCANFD_NUM_CHANNELS];</div><div class='ctx'> 	void __iomem *base;		/* Register base address */</div><div class='add'>+	struct rcar_canfd_f_c __iomem *fcbase;</div><div class='ctx'> 	struct platform_device *pdev;	/* Respective platform device */</div><div class='ctx'> 	struct clk *clkp;		/* Peripheral clock */</div><div class='ctx'> 	struct clk *can_clk;		/* fCAN clock */</div><div class='del'>-	enum rcar_canfd_fcanclk fcan;	/* CANFD or Ext clock */</div><div class='add'>+	struct clk *clk_ram;		/* Clock RAM */</div><div class='ctx'> 	unsigned long channels_mask;	/* Enabled channels mask */</div><div class='add'>+	bool extclk;			/* CANFD or Ext clock */</div><div class='ctx'> 	bool fdmode;			/* CAN FD or Classical CAN only mode */</div><div class='add'>+	struct reset_control *rstc1;</div><div class='add'>+	struct reset_control *rstc2;</div><div class='add'>+	const struct rcar_canfd_hw_info *info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CAN FD mode nominal rate constants */</div><div class='del'>-static const struct can_bittiming_const rcar_canfd_nom_bittiming_const = {</div><div class='add'>+static const struct can_bittiming_const rcar_canfd_gen3_nom_bittiming_const = {</div><div class='ctx'> 	.name = RCANFD_DRV_NAME,</div><div class='ctx'> 	.tseg1_min = 2,</div><div class='ctx'> 	.tseg1_max = 128,</div><div class='hunk'>@@ -528,8 +490,20 @@ static const struct can_bittiming_const rcar_canfd_nom_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct can_bittiming_const rcar_canfd_gen4_nom_bittiming_const = {</div><div class='add'>+	.name = RCANFD_DRV_NAME,</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* CAN FD mode data rate constants */</div><div class='del'>-static const struct can_bittiming_const rcar_canfd_data_bittiming_const = {</div><div class='add'>+static const struct can_bittiming_const rcar_canfd_gen3_data_bittiming_const = {</div><div class='ctx'> 	.name = RCANFD_DRV_NAME,</div><div class='ctx'> 	.tseg1_min = 2,</div><div class='ctx'> 	.tseg1_max = 16,</div><div class='hunk'>@@ -541,6 +515,18 @@ static const struct can_bittiming_const rcar_canfd_data_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct can_bittiming_const rcar_canfd_gen4_data_bittiming_const = {</div><div class='add'>+	.name = RCANFD_DRV_NAME,</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 256,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Classical CAN mode bitrate constants */</div><div class='ctx'> static const struct can_bittiming_const rcar_canfd_bittiming_const = {</div><div class='ctx'> 	.name = RCANFD_DRV_NAME,</div><div class='hunk'>@@ -554,6 +540,135 @@ static const struct can_bittiming_const rcar_canfd_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* CAN FD Transmission Delay Compensation constants */</div><div class='add'>+static const struct can_tdc_const rcar_canfd_gen3_tdc_const = {</div><div class='add'>+	.tdcv_min = 1,</div><div class='add'>+	.tdcv_max = 128,</div><div class='add'>+	.tdco_min = 1,</div><div class='add'>+	.tdco_max = 128,</div><div class='add'>+	.tdcf_min = 0,	/* Filter window not supported */</div><div class='add'>+	.tdcf_max = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_tdc_const rcar_canfd_gen4_tdc_const = {</div><div class='add'>+	.tdcv_min = 1,</div><div class='add'>+	.tdcv_max = 256,</div><div class='add'>+	.tdco_min = 1,</div><div class='add'>+	.tdco_max = 256,</div><div class='add'>+	.tdcf_min = 0,	/* Filter window not supported */</div><div class='add'>+	.tdcf_max = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_regs rcar_gen3_regs = {</div><div class='add'>+	.rfcc = 0x00b8,</div><div class='add'>+	.cfcc = 0x0118,</div><div class='add'>+	.cfsts = 0x0178,</div><div class='add'>+	.cfpctr = 0x01d8,</div><div class='add'>+	.coffset = 0x0500,</div><div class='add'>+	.rfoffset = 0x3000,</div><div class='add'>+	.cfoffset = 0x3400,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_regs rcar_gen4_regs = {</div><div class='add'>+	.rfcc = 0x00c0,</div><div class='add'>+	.cfcc = 0x0120,</div><div class='add'>+	.cfsts = 0x01e0,</div><div class='add'>+	.cfpctr = 0x0240,</div><div class='add'>+	.coffset = 0x1400,</div><div class='add'>+	.rfoffset = 0x6000,</div><div class='add'>+	.cfoffset = 0x6400,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_shift_data rcar_gen3_shift_data = {</div><div class='add'>+	.ntseg2 = 24,</div><div class='add'>+	.ntseg1 = 16,</div><div class='add'>+	.nsjw = 11,</div><div class='add'>+	.dtseg2 = 20,</div><div class='add'>+	.dtseg1 = 16,</div><div class='add'>+	.cftml = 20,</div><div class='add'>+	.cfm = 16,</div><div class='add'>+	.cfdc = 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_shift_data rcar_gen4_shift_data = {</div><div class='add'>+	.ntseg2 = 25,</div><div class='add'>+	.ntseg1 = 17,</div><div class='add'>+	.nsjw = 10,</div><div class='add'>+	.dtseg2 = 16,</div><div class='add'>+	.dtseg1 = 8,</div><div class='add'>+	.cftml = 16,</div><div class='add'>+	.cfm = 8,</div><div class='add'>+	.cfdc = 21,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_hw_info rcar_gen3_hw_info = {</div><div class='add'>+	.nom_bittiming = &amp;rcar_canfd_gen3_nom_bittiming_const,</div><div class='add'>+	.data_bittiming = &amp;rcar_canfd_gen3_data_bittiming_const,</div><div class='add'>+	.tdc_const = &amp;rcar_canfd_gen3_tdc_const,</div><div class='add'>+	.regs = &amp;rcar_gen3_regs,</div><div class='add'>+	.sh = &amp;rcar_gen3_shift_data,</div><div class='add'>+	.rnc_field_width = 8,</div><div class='add'>+	.max_aflpn = 31,</div><div class='add'>+	.max_cftml = 15,</div><div class='add'>+	.max_channels = 2,</div><div class='add'>+	.postdiv = 2,</div><div class='add'>+	.shared_global_irqs = 1,</div><div class='add'>+	.ch_interface_mode = 0,</div><div class='add'>+	.shared_can_regs = 0,</div><div class='add'>+	.external_clk = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_hw_info rcar_gen4_hw_info = {</div><div class='add'>+	.nom_bittiming = &amp;rcar_canfd_gen4_nom_bittiming_const,</div><div class='add'>+	.data_bittiming = &amp;rcar_canfd_gen4_data_bittiming_const,</div><div class='add'>+	.tdc_const = &amp;rcar_canfd_gen4_tdc_const,</div><div class='add'>+	.regs = &amp;rcar_gen4_regs,</div><div class='add'>+	.sh = &amp;rcar_gen4_shift_data,</div><div class='add'>+	.rnc_field_width = 16,</div><div class='add'>+	.max_aflpn = 127,</div><div class='add'>+	.max_cftml = 31,</div><div class='add'>+	.max_channels = 8,</div><div class='add'>+	.postdiv = 2,</div><div class='add'>+	.shared_global_irqs = 1,</div><div class='add'>+	.ch_interface_mode = 1,</div><div class='add'>+	.shared_can_regs = 1,</div><div class='add'>+	.external_clk = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_hw_info rzg2l_hw_info = {</div><div class='add'>+	.nom_bittiming = &amp;rcar_canfd_gen3_nom_bittiming_const,</div><div class='add'>+	.data_bittiming = &amp;rcar_canfd_gen3_data_bittiming_const,</div><div class='add'>+	.tdc_const = &amp;rcar_canfd_gen3_tdc_const,</div><div class='add'>+	.regs = &amp;rcar_gen3_regs,</div><div class='add'>+	.sh = &amp;rcar_gen3_shift_data,</div><div class='add'>+	.rnc_field_width = 8,</div><div class='add'>+	.max_aflpn = 31,</div><div class='add'>+	.max_cftml = 15,</div><div class='add'>+	.max_channels = 2,</div><div class='add'>+	.postdiv = 1,</div><div class='add'>+	.multi_channel_irqs = 1,</div><div class='add'>+	.ch_interface_mode = 0,</div><div class='add'>+	.shared_can_regs = 0,</div><div class='add'>+	.external_clk = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rcar_canfd_hw_info r9a09g047_hw_info = {</div><div class='add'>+	.nom_bittiming = &amp;rcar_canfd_gen4_nom_bittiming_const,</div><div class='add'>+	.data_bittiming = &amp;rcar_canfd_gen4_data_bittiming_const,</div><div class='add'>+	.tdc_const = &amp;rcar_canfd_gen4_tdc_const,</div><div class='add'>+	.regs = &amp;rcar_gen4_regs,</div><div class='add'>+	.sh = &amp;rcar_gen4_shift_data,</div><div class='add'>+	.rnc_field_width = 16,</div><div class='add'>+	.max_aflpn = 63,</div><div class='add'>+	.max_cftml = 31,</div><div class='add'>+	.max_channels = 6,</div><div class='add'>+	.postdiv = 1,</div><div class='add'>+	.multi_channel_irqs = 1,</div><div class='add'>+	.ch_interface_mode = 1,</div><div class='add'>+	.shared_can_regs = 1,</div><div class='add'>+	.external_clk = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Helper functions */</div><div class='ctx'> static inline void rcar_canfd_update(u32 mask, u32 val, u32 __iomem *reg)</div><div class='ctx'> {</div><div class='hunk'>@@ -566,50 +681,65 @@ static inline void rcar_canfd_update(u32 mask, u32 val, u32 __iomem *reg)</div><div class='ctx'> </div><div class='ctx'> static inline u32 rcar_canfd_read(void __iomem *base, u32 offset)</div><div class='ctx'> {</div><div class='del'>-	return readl(base + (offset));</div><div class='add'>+	return readl(base + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void rcar_canfd_write(void __iomem *base, u32 offset, u32 val)</div><div class='ctx'> {</div><div class='del'>-	writel(val, base + (offset));</div><div class='add'>+	writel(val, base + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_set_bit(void __iomem *base, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	rcar_canfd_update(val, val, base + (reg));</div><div class='add'>+	rcar_canfd_update(val, val, base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_clear_bit(void __iomem *base, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	rcar_canfd_update(val, 0, base + (reg));</div><div class='add'>+	rcar_canfd_update(val, 0, base + reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_update_bit(void __iomem *base, u32 reg,</div><div class='ctx'> 				  u32 mask, u32 val)</div><div class='ctx'> {</div><div class='del'>-	rcar_canfd_update(mask, val, base + (reg));</div><div class='add'>+	rcar_canfd_update(mask, val, base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_set_bit_reg(void __iomem *addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	rcar_canfd_update(val, val, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_clear_bit_reg(void __iomem *addr, u32 val)</div><div class='add'>+{</div><div class='add'>+	rcar_canfd_update(val, 0, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_update_bit_reg(void __iomem *addr, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	rcar_canfd_update(mask, val, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_get_data(struct rcar_canfd_channel *priv,</div><div class='ctx'> 				struct canfd_frame *cf, u32 off)</div><div class='ctx'> {</div><div class='add'>+	u32 *data = (u32 *)cf-&gt;data;</div><div class='ctx'> 	u32 i, lwords;</div><div class='ctx'> </div><div class='ctx'> 	lwords = DIV_ROUND_UP(cf-&gt;len, sizeof(u32));</div><div class='ctx'> 	for (i = 0; i &lt; lwords; i++)</div><div class='del'>-		*((u32 *)cf-&gt;data + i) =</div><div class='del'>-			rcar_canfd_read(priv-&gt;base, off + (i * sizeof(u32)));</div><div class='add'>+		data[i] = rcar_canfd_read(priv-&gt;base, off + i * sizeof(u32));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_put_data(struct rcar_canfd_channel *priv,</div><div class='ctx'> 				struct canfd_frame *cf, u32 off)</div><div class='ctx'> {</div><div class='add'>+	const u32 *data = (u32 *)cf-&gt;data;</div><div class='ctx'> 	u32 i, lwords;</div><div class='ctx'> </div><div class='ctx'> 	lwords = DIV_ROUND_UP(cf-&gt;len, sizeof(u32));</div><div class='ctx'> 	for (i = 0; i &lt; lwords; i++)</div><div class='del'>-		rcar_canfd_write(priv-&gt;base, off + (i * sizeof(u32)),</div><div class='del'>-				 *((u32 *)cf-&gt;data + i));</div><div class='add'>+		rcar_canfd_write(priv-&gt;base, off + i * sizeof(u32), data[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_tx_failure_cleanup(struct net_device *ndev)</div><div class='hunk'>@@ -617,11 +747,23 @@ static void rcar_canfd_tx_failure_cleanup(struct net_device *ndev)</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; RCANFD_FIFO_DEPTH; i++)</div><div class='del'>-		can_free_echo_skb(ndev, i);</div><div class='add'>+		can_free_echo_skb(ndev, i, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_set_rnc(struct rcar_canfd_global *gpriv, unsigned int ch,</div><div class='add'>+			       unsigned int num_rules)</div><div class='add'>+{</div><div class='add'>+	unsigned int rnc_stride = 32 / gpriv-&gt;info-&gt;rnc_field_width;</div><div class='add'>+	unsigned int shift = 32 - (ch % rnc_stride + 1) * gpriv-&gt;info-&gt;rnc_field_width;</div><div class='add'>+	unsigned int w = ch / rnc_stride;</div><div class='add'>+	u32 rnc = num_rules &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GAFLCFG(w), rnc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;gpriv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	u32 sts, ch;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -631,7 +773,7 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> 	err = readl_poll_timeout((gpriv-&gt;base + RCANFD_GSTS), sts,</div><div class='ctx'> 				 !(sts &amp; RCANFD_GSTS_GRAMINIT), 2, 500000);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_dbg(&amp;gpriv-&gt;pdev-&gt;dev, "global raminit failed\n");</div><div class='add'>+		dev_dbg(dev, "global raminit failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -644,7 +786,7 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> 	err = readl_poll_timeout((gpriv-&gt;base + RCANFD_GSTS), sts,</div><div class='ctx'> 				 (sts &amp; RCANFD_GSTS_GRSTSTS), 2, 500000);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_dbg(&amp;gpriv-&gt;pdev-&gt;dev, "global reset failed\n");</div><div class='add'>+		dev_dbg(dev, "global reset failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -652,15 +794,17 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> 	rcar_canfd_write(gpriv-&gt;base, RCANFD_GERFL, 0x0);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the controller into appropriate mode */</div><div class='del'>-	if (gpriv-&gt;fdmode)</div><div class='del'>-		rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GRMCFG,</div><div class='del'>-				   RCANFD_GRMCFG_RCMC);</div><div class='del'>-	else</div><div class='del'>-		rcar_canfd_clear_bit(gpriv-&gt;base, RCANFD_GRMCFG,</div><div class='del'>-				     RCANFD_GRMCFG_RCMC);</div><div class='add'>+	if (!gpriv-&gt;info-&gt;ch_interface_mode) {</div><div class='add'>+		if (gpriv-&gt;fdmode)</div><div class='add'>+			rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GRMCFG,</div><div class='add'>+					   RCANFD_GRMCFG_RCMC);</div><div class='add'>+		else</div><div class='add'>+			rcar_canfd_clear_bit(gpriv-&gt;base, RCANFD_GRMCFG,</div><div class='add'>+					     RCANFD_GRMCFG_RCMC);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Transition all Channels to reset mode */</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='ctx'> 		rcar_canfd_clear_bit(gpriv-&gt;base,</div><div class='ctx'> 				     RCANFD_CCTR(ch), RCANFD_CCTR_CSLPR);</div><div class='ctx'> </div><div class='hunk'>@@ -673,11 +817,27 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> 					 (sts &amp; RCANFD_CSTS_CRSTSTS),</div><div class='ctx'> 					 2, 500000);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			dev_dbg(&amp;gpriv-&gt;pdev-&gt;dev,</div><div class='del'>-				"channel %u reset failed\n", ch);</div><div class='add'>+			dev_dbg(dev, "channel %u reset failed\n", ch);</div><div class='ctx'> 			return err;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		/* Set the controller into appropriate mode */</div><div class='add'>+		if (gpriv-&gt;info-&gt;ch_interface_mode) {</div><div class='add'>+			/* Do not set CLOE and FDOE simultaneously */</div><div class='add'>+			if (!gpriv-&gt;fdmode) {</div><div class='add'>+				rcar_canfd_clear_bit_reg(&amp;gpriv-&gt;fcbase[ch].cfdcfg,</div><div class='add'>+							 RCANFD_GEN4_FDCFG_FDOE);</div><div class='add'>+				rcar_canfd_set_bit_reg(&amp;gpriv-&gt;fcbase[ch].cfdcfg,</div><div class='add'>+						       RCANFD_GEN4_FDCFG_CLOE);</div><div class='add'>+			} else {</div><div class='add'>+				rcar_canfd_clear_bit_reg(&amp;gpriv-&gt;fcbase[ch].cfdcfg,</div><div class='add'>+							 RCANFD_GEN4_FDCFG_FDOE);</div><div class='add'>+				rcar_canfd_clear_bit_reg(&amp;gpriv-&gt;fcbase[ch].cfdcfg,</div><div class='add'>+							 RCANFD_GEN4_FDCFG_CLOE);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -695,13 +855,13 @@ static void rcar_canfd_configure_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> 		cfg |= RCANFD_GCFG_CMPOC;</div><div class='ctx'> </div><div class='ctx'> 	/* Set External Clock if selected */</div><div class='del'>-	if (gpriv-&gt;fcan != RCANFD_CANFDCLK)</div><div class='add'>+	if (gpriv-&gt;extclk)</div><div class='ctx'> 		cfg |= RCANFD_GCFG_DCS;</div><div class='ctx'> </div><div class='ctx'> 	rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GCFG, cfg);</div><div class='ctx'> </div><div class='ctx'> 	/* Channel configuration settings */</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='ctx'> 		rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_CCTR(ch),</div><div class='ctx'> 				   RCANFD_CCTR_ERRD);</div><div class='ctx'> 		rcar_canfd_update_bit(gpriv-&gt;base, RCANFD_CCTR(ch),</div><div class='hunk'>@@ -711,43 +871,36 @@ static void rcar_canfd_configure_controller(struct rcar_canfd_global *gpriv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_configure_afl_rules(struct rcar_canfd_global *gpriv,</div><div class='del'>-					   u32 ch)</div><div class='add'>+					   u32 ch, u32 rule_entry)</div><div class='ctx'> {</div><div class='del'>-	u32 cfg;</div><div class='del'>-	int offset, start, page, num_rules = RCANFD_CHANNEL_NUMRULES;</div><div class='add'>+	unsigned int offset, page, num_rules = RCANFD_CHANNEL_NUMRULES;</div><div class='add'>+	u32 rule_entry_index = rule_entry % 16;</div><div class='ctx'> 	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='ctx'> </div><div class='del'>-	if (ch == 0) {</div><div class='del'>-		start = 0; /* Channel 0 always starts from 0th rule */</div><div class='del'>-	} else {</div><div class='del'>-		/* Get number of Channel 0 rules and adjust */</div><div class='del'>-		cfg = rcar_canfd_read(gpriv-&gt;base, RCANFD_GAFLCFG0);</div><div class='del'>-		start = RCANFD_GAFLCFG_GETRNC(0, cfg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Enable write access to entry */</div><div class='del'>-	page = RCANFD_GAFL_PAGENUM(start);</div><div class='add'>+	page = RCANFD_GAFL_PAGENUM(rule_entry);</div><div class='ctx'> 	rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GAFLECTR,</div><div class='del'>-			   (RCANFD_GAFLECTR_AFLPN(page) |</div><div class='add'>+			   (RCANFD_GAFLECTR_AFLPN(gpriv, page) |</div><div class='ctx'> 			    RCANFD_GAFLECTR_AFLDAE));</div><div class='ctx'> </div><div class='ctx'> 	/* Write number of rules for channel */</div><div class='del'>-	rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GAFLCFG0,</div><div class='del'>-			   RCANFD_GAFLCFG_SETRNC(ch, num_rules));</div><div class='del'>-	if (gpriv-&gt;fdmode)</div><div class='add'>+	rcar_canfd_set_rnc(gpriv, ch, num_rules);</div><div class='add'>+	if (gpriv-&gt;info-&gt;shared_can_regs)</div><div class='add'>+		offset = RCANFD_GEN4_GAFL_OFFSET;</div><div class='add'>+	else if (gpriv-&gt;fdmode)</div><div class='ctx'> 		offset = RCANFD_F_GAFL_OFFSET;</div><div class='ctx'> 	else</div><div class='ctx'> 		offset = RCANFD_C_GAFL_OFFSET;</div><div class='ctx'> </div><div class='ctx'> 	/* Accept all IDs */</div><div class='del'>-	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLID(offset, start), 0);</div><div class='add'>+	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLID(offset, rule_entry_index), 0);</div><div class='ctx'> 	/* IDE or RTR is not considered for matching */</div><div class='del'>-	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLM(offset, start), 0);</div><div class='add'>+	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLM(offset, rule_entry_index), 0);</div><div class='ctx'> 	/* Any data length accepted */</div><div class='del'>-	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLP0(offset, start), 0);</div><div class='add'>+	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLP0(offset, rule_entry_index), 0);</div><div class='ctx'> 	/* Place the msg in corresponding Rx FIFO entry */</div><div class='del'>-	rcar_canfd_write(gpriv-&gt;base, RCANFD_GAFLP1(offset, start),</div><div class='del'>-			 RCANFD_GAFLP1_GAFLFDP(ridx));</div><div class='add'>+	rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GAFLP1(offset, rule_entry_index),</div><div class='add'>+			   RCANFD_GAFLP1_GAFLFDP(ridx));</div><div class='ctx'> </div><div class='ctx'> 	/* Disable write access to page */</div><div class='ctx'> 	rcar_canfd_clear_bit(gpriv-&gt;base,</div><div class='hunk'>@@ -771,7 +924,7 @@ static void rcar_canfd_configure_rx(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='ctx'> </div><div class='ctx'> 	cfg = (RCANFD_RFCC_RFIM | RCANFD_RFCC_RFDC(rfdc) |</div><div class='ctx'> 		RCANFD_RFCC_RFPLS(rfpls) | RCANFD_RFCC_RFIE);</div><div class='del'>-	rcar_canfd_write(gpriv-&gt;base, RCANFD_RFCC(ridx), cfg);</div><div class='add'>+	rcar_canfd_write(gpriv-&gt;base, RCANFD_RFCC(gpriv, ridx), cfg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_configure_tx(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='hunk'>@@ -793,15 +946,15 @@ static void rcar_canfd_configure_tx(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='ctx'> 	else</div><div class='ctx'> 		cfpls = 0;	/* b000 - Max 8 bytes payload */</div><div class='ctx'> </div><div class='del'>-	cfg = (RCANFD_CFCC_CFTML(cftml) | RCANFD_CFCC_CFM(cfm) |</div><div class='del'>-		RCANFD_CFCC_CFIM | RCANFD_CFCC_CFDC(cfdc) |</div><div class='add'>+	cfg = (RCANFD_CFCC_CFTML(gpriv, cftml) | RCANFD_CFCC_CFM(gpriv, cfm) |</div><div class='add'>+		RCANFD_CFCC_CFIM | RCANFD_CFCC_CFDC(gpriv, cfdc) |</div><div class='ctx'> 		RCANFD_CFCC_CFPLS(cfpls) | RCANFD_CFCC_CFTXIE);</div><div class='del'>-	rcar_canfd_write(gpriv-&gt;base, RCANFD_CFCC(ch, RCANFD_CFFIFO_IDX), cfg);</div><div class='add'>+	rcar_canfd_write(gpriv-&gt;base, RCANFD_CFCC(gpriv, ch, RCANFD_CFFIFO_IDX), cfg);</div><div class='ctx'> </div><div class='ctx'> 	if (gpriv-&gt;fdmode)</div><div class='ctx'> 		/* Clear FD mode specific control/status register */</div><div class='ctx'> 		rcar_canfd_write(gpriv-&gt;base,</div><div class='del'>-				 RCANFD_F_CFFDCSTS(ch, RCANFD_CFFIFO_IDX), 0);</div><div class='add'>+				 RCANFD_F_CFFDCSTS(gpriv, ch, RCANFD_CFFIFO_IDX), 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_enable_global_interrupts(struct rcar_canfd_global *gpriv)</div><div class='hunk'>@@ -872,30 +1025,26 @@ static void rcar_canfd_global_error(struct net_device *ndev)</div><div class='ctx'> 	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='ctx'> </div><div class='ctx'> 	gerfl = rcar_canfd_read(priv-&gt;base, RCANFD_GERFL);</div><div class='del'>-	if ((gerfl &amp; RCANFD_GERFL_EEF0) &amp;&amp; (ch == 0)) {</div><div class='del'>-		netdev_dbg(ndev, "Ch0: ECC Error flag\n");</div><div class='del'>-		stats-&gt;tx_dropped++;</div><div class='del'>-	}</div><div class='del'>-	if ((gerfl &amp; RCANFD_GERFL_EEF1) &amp;&amp; (ch == 1)) {</div><div class='del'>-		netdev_dbg(ndev, "Ch1: ECC Error flag\n");</div><div class='add'>+	if (gerfl &amp; FIELD_PREP(RCANFD_GERFL_EEF, BIT(ch))) {</div><div class='add'>+		netdev_dbg(ndev, "Ch%u: ECC Error flag\n", ch);</div><div class='ctx'> 		stats-&gt;tx_dropped++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (gerfl &amp; RCANFD_GERFL_MES) {</div><div class='ctx'> 		sts = rcar_canfd_read(priv-&gt;base,</div><div class='del'>-				      RCANFD_CFSTS(ch, RCANFD_CFFIFO_IDX));</div><div class='add'>+				      RCANFD_CFSTS(gpriv, ch, RCANFD_CFFIFO_IDX));</div><div class='ctx'> 		if (sts &amp; RCANFD_CFSTS_CFMLT) {</div><div class='ctx'> 			netdev_dbg(ndev, "Tx Message Lost flag\n");</div><div class='ctx'> 			stats-&gt;tx_dropped++;</div><div class='ctx'> 			rcar_canfd_write(priv-&gt;base,</div><div class='del'>-					 RCANFD_CFSTS(ch, RCANFD_CFFIFO_IDX),</div><div class='add'>+					 RCANFD_CFSTS(gpriv, ch, RCANFD_CFFIFO_IDX),</div><div class='ctx'> 					 sts &amp; ~RCANFD_CFSTS_CFMLT);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sts = rcar_canfd_read(priv-&gt;base, RCANFD_RFSTS(ridx));</div><div class='add'>+		sts = rcar_canfd_read(priv-&gt;base, RCANFD_RFSTS(gpriv, ridx));</div><div class='ctx'> 		if (sts &amp; RCANFD_RFSTS_RFMLT) {</div><div class='ctx'> 			netdev_dbg(ndev, "Rx Message Lost flag\n");</div><div class='ctx'> 			stats-&gt;rx_dropped++;</div><div class='del'>-			rcar_canfd_write(priv-&gt;base, RCANFD_RFSTS(ridx),</div><div class='add'>+			rcar_canfd_write(priv-&gt;base, RCANFD_RFSTS(gpriv, ridx),</div><div class='ctx'> 					 sts &amp; ~RCANFD_RFSTS_RFMLT);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -989,7 +1138,7 @@ static void rcar_canfd_error(struct net_device *ndev, u32 cerfl,</div><div class='ctx'> 		netdev_dbg(ndev, "Error warning interrupt\n");</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='ctx'> 		priv-&gt;can.can_stats.error_warning++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[1] = txerr &gt; rxerr ? CAN_ERR_CRTL_TX_WARNING :</div><div class='ctx'> 			CAN_ERR_CRTL_RX_WARNING;</div><div class='ctx'> 		cf-&gt;data[6] = txerr;</div><div class='hunk'>@@ -999,7 +1148,7 @@ static void rcar_canfd_error(struct net_device *ndev, u32 cerfl,</div><div class='ctx'> 		netdev_dbg(ndev, "Error passive interrupt\n");</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='ctx'> 		priv-&gt;can.can_stats.error_passive++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[1] = txerr &gt; rxerr ? CAN_ERR_CRTL_TX_PASSIVE :</div><div class='ctx'> 			CAN_ERR_CRTL_RX_PASSIVE;</div><div class='ctx'> 		cf-&gt;data[6] = txerr;</div><div class='hunk'>@@ -1024,14 +1173,13 @@ static void rcar_canfd_error(struct net_device *ndev, u32 cerfl,</div><div class='ctx'> 	/* Clear channel error interrupts that are handled */</div><div class='ctx'> 	rcar_canfd_write(priv-&gt;base, RCANFD_CERFL(ch),</div><div class='ctx'> 			 RCANFD_CERFL_ERR(~cerfl));</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_tx_done(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='ctx'> 	u32 sts;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1042,14 +1190,12 @@ static void rcar_canfd_tx_done(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		sent = priv-&gt;tx_tail % RCANFD_FIFO_DEPTH;</div><div class='ctx'> 		stats-&gt;tx_packets++;</div><div class='del'>-		stats-&gt;tx_bytes += priv-&gt;tx_len[sent];</div><div class='del'>-		priv-&gt;tx_len[sent] = 0;</div><div class='del'>-		can_get_echo_skb(ndev, sent);</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(ndev, sent, NULL);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 		priv-&gt;tx_tail++;</div><div class='ctx'> 		sts = rcar_canfd_read(priv-&gt;base,</div><div class='del'>-				      RCANFD_CFSTS(ch, RCANFD_CFFIFO_IDX));</div><div class='add'>+				      RCANFD_CFSTS(gpriv, ch, RCANFD_CFFIFO_IDX));</div><div class='ctx'> 		unsent = RCANFD_CFSTS_CFMC(sts);</div><div class='ctx'> </div><div class='ctx'> 		/* Wake producer only when there is room */</div><div class='hunk'>@@ -1065,43 +1211,76 @@ static void rcar_canfd_tx_done(struct net_device *ndev)</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear interrupt */</div><div class='del'>-	rcar_canfd_write(priv-&gt;base, RCANFD_CFSTS(ch, RCANFD_CFFIFO_IDX),</div><div class='add'>+	rcar_canfd_write(priv-&gt;base, RCANFD_CFSTS(gpriv, ch, RCANFD_CFFIFO_IDX),</div><div class='ctx'> 			 sts &amp; ~RCANFD_CFSTS_CFTXIF);</div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_TX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_handle_global_err(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = gpriv-&gt;ch[ch];</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	u32 gerfl;</div><div class='add'>+</div><div class='add'>+	/* Handle global error interrupts */</div><div class='add'>+	gerfl = rcar_canfd_read(priv-&gt;base, RCANFD_GERFL);</div><div class='add'>+	if (unlikely(RCANFD_GERFL_ERR(gpriv, gerfl)))</div><div class='add'>+		rcar_canfd_global_error(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rcar_canfd_global_err_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_global *gpriv = dev_id;</div><div class='add'>+	u32 ch;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels)</div><div class='add'>+		rcar_canfd_handle_global_err(gpriv, ch);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_handle_global_receive(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = gpriv-&gt;ch[ch];</div><div class='add'>+	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='add'>+	u32 sts, cc;</div><div class='add'>+</div><div class='add'>+	/* Handle Rx interrupts */</div><div class='add'>+	sts = rcar_canfd_read(priv-&gt;base, RCANFD_RFSTS(gpriv, ridx));</div><div class='add'>+	cc = rcar_canfd_read(priv-&gt;base, RCANFD_RFCC(gpriv, ridx));</div><div class='add'>+	if (likely(sts &amp; RCANFD_RFSTS_RFIF &amp;&amp;</div><div class='add'>+		   cc &amp; RCANFD_RFCC_RFIE)) {</div><div class='add'>+		if (napi_schedule_prep(&amp;priv-&gt;napi)) {</div><div class='add'>+			/* Disable Rx FIFO interrupts */</div><div class='add'>+			rcar_canfd_clear_bit(priv-&gt;base,</div><div class='add'>+					     RCANFD_RFCC(gpriv, ridx),</div><div class='add'>+					     RCANFD_RFCC_RFIE);</div><div class='add'>+			__napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rcar_canfd_global_receive_fifo_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_global *gpriv = dev_id;</div><div class='add'>+	u32 ch;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels)</div><div class='add'>+		rcar_canfd_handle_global_receive(gpriv, ch);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t rcar_canfd_global_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_global *gpriv = dev_id;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct rcar_canfd_channel *priv;</div><div class='del'>-	u32 sts, gerfl;</div><div class='del'>-	u32 ch, ridx;</div><div class='add'>+	u32 ch;</div><div class='ctx'> </div><div class='ctx'> 	/* Global error interrupts still indicate a condition specific</div><div class='ctx'> 	 * to a channel. RxFIFO interrupt is a global interrupt.</div><div class='ctx'> 	 */</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='del'>-		priv = gpriv-&gt;ch[ch];</div><div class='del'>-		ndev = priv-&gt;ndev;</div><div class='del'>-		ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='del'>-</div><div class='del'>-		/* Global error interrupts */</div><div class='del'>-		gerfl = rcar_canfd_read(priv-&gt;base, RCANFD_GERFL);</div><div class='del'>-		if (unlikely(RCANFD_GERFL_ERR(gpriv, gerfl)))</div><div class='del'>-			rcar_canfd_global_error(ndev);</div><div class='del'>-</div><div class='del'>-		/* Handle Rx interrupts */</div><div class='del'>-		sts = rcar_canfd_read(priv-&gt;base, RCANFD_RFSTS(ridx));</div><div class='del'>-		if (likely(sts &amp; RCANFD_RFSTS_RFIF)) {</div><div class='del'>-			if (napi_schedule_prep(&amp;priv-&gt;napi)) {</div><div class='del'>-				/* Disable Rx FIFO interrupts */</div><div class='del'>-				rcar_canfd_clear_bit(priv-&gt;base,</div><div class='del'>-						     RCANFD_RFCC(ridx),</div><div class='del'>-						     RCANFD_RFCC_RFIE);</div><div class='del'>-				__napi_schedule(&amp;priv-&gt;napi);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='add'>+		rcar_canfd_handle_global_err(gpriv, ch);</div><div class='add'>+		rcar_canfd_handle_global_receive(gpriv, ch);</div><div class='ctx'> 	}</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -1133,54 +1312,122 @@ static void rcar_canfd_state_change(struct net_device *ndev,</div><div class='ctx'> 		rx_state = txerr &lt;= rxerr ? state : 0;</div><div class='ctx'> </div><div class='ctx'> 		can_change_state(ndev, cf, tx_state, rx_state);</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 		netif_rx(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void rcar_canfd_handle_channel_tx(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = gpriv-&gt;ch[ch];</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	u32 sts;</div><div class='add'>+</div><div class='add'>+	/* Handle Tx interrupts */</div><div class='add'>+	sts = rcar_canfd_read(priv-&gt;base,</div><div class='add'>+			      RCANFD_CFSTS(gpriv, ch, RCANFD_CFFIFO_IDX));</div><div class='add'>+	if (likely(sts &amp; RCANFD_CFSTS_CFTXIF))</div><div class='add'>+		rcar_canfd_tx_done(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rcar_canfd_channel_tx_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = dev_id;</div><div class='add'>+</div><div class='add'>+	rcar_canfd_handle_channel_tx(priv-&gt;gpriv, priv-&gt;channel);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_handle_channel_err(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = gpriv-&gt;ch[ch];</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	u16 txerr, rxerr;</div><div class='add'>+	u32 sts, cerfl;</div><div class='add'>+</div><div class='add'>+	/* Handle channel error interrupts */</div><div class='add'>+	cerfl = rcar_canfd_read(priv-&gt;base, RCANFD_CERFL(ch));</div><div class='add'>+	sts = rcar_canfd_read(priv-&gt;base, RCANFD_CSTS(ch));</div><div class='add'>+	txerr = RCANFD_CSTS_TECCNT(sts);</div><div class='add'>+	rxerr = RCANFD_CSTS_RECCNT(sts);</div><div class='add'>+	if (unlikely(RCANFD_CERFL_ERR(cerfl)))</div><div class='add'>+		rcar_canfd_error(ndev, cerfl, txerr, rxerr);</div><div class='add'>+</div><div class='add'>+	/* Handle state change to lower states */</div><div class='add'>+	if (unlikely(priv-&gt;can.state != CAN_STATE_ERROR_ACTIVE &amp;&amp;</div><div class='add'>+		     priv-&gt;can.state != CAN_STATE_BUS_OFF))</div><div class='add'>+		rcar_canfd_state_change(ndev, txerr, rxerr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rcar_canfd_channel_err_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = dev_id;</div><div class='add'>+</div><div class='add'>+	rcar_canfd_handle_channel_err(priv-&gt;gpriv, priv-&gt;channel);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t rcar_canfd_channel_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_global *gpriv = dev_id;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct rcar_canfd_channel *priv;</div><div class='del'>-	u32 sts, ch, cerfl;</div><div class='del'>-	u16 txerr, rxerr;</div><div class='add'>+	u32 ch;</div><div class='ctx'> </div><div class='ctx'> 	/* Common FIFO is a per channel resource */</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='del'>-		priv = gpriv-&gt;ch[ch];</div><div class='del'>-		ndev = priv-&gt;ndev;</div><div class='del'>-</div><div class='del'>-		/* Channel error interrupts */</div><div class='del'>-		cerfl = rcar_canfd_read(priv-&gt;base, RCANFD_CERFL(ch));</div><div class='del'>-		sts = rcar_canfd_read(priv-&gt;base, RCANFD_CSTS(ch));</div><div class='del'>-		txerr = RCANFD_CSTS_TECCNT(sts);</div><div class='del'>-		rxerr = RCANFD_CSTS_RECCNT(sts);</div><div class='del'>-		if (unlikely(RCANFD_CERFL_ERR(cerfl)))</div><div class='del'>-			rcar_canfd_error(ndev, cerfl, txerr, rxerr);</div><div class='del'>-</div><div class='del'>-		/* Handle state change to lower states */</div><div class='del'>-		if (unlikely((priv-&gt;can.state != CAN_STATE_ERROR_ACTIVE) &amp;&amp;</div><div class='del'>-			     (priv-&gt;can.state != CAN_STATE_BUS_OFF)))</div><div class='del'>-			rcar_canfd_state_change(ndev, txerr, rxerr);</div><div class='del'>-</div><div class='del'>-		/* Handle Tx interrupts */</div><div class='del'>-		sts = rcar_canfd_read(priv-&gt;base,</div><div class='del'>-				      RCANFD_CFSTS(ch, RCANFD_CFFIFO_IDX));</div><div class='del'>-		if (likely(sts &amp; RCANFD_CFSTS_CFTXIF))</div><div class='del'>-			rcar_canfd_tx_done(ndev);</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='add'>+		rcar_canfd_handle_channel_err(gpriv, ch);</div><div class='add'>+		rcar_canfd_handle_channel_tx(gpriv, ch);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rcar_canfd_set_bittiming(struct net_device *dev)</div><div class='add'>+static inline u32 rcar_canfd_compute_nominal_bit_rate_cfg(struct rcar_canfd_channel *priv,</div><div class='add'>+							  u16 tseg1, u16 tseg2, u16 sjw, u16 brp)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='add'>+	const struct rcar_canfd_hw_info *info = gpriv-&gt;info;</div><div class='add'>+	u32 ntseg1, ntseg2, nsjw, nbrp;</div><div class='add'>+</div><div class='add'>+	if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) || gpriv-&gt;info-&gt;shared_can_regs) {</div><div class='add'>+		ntseg1 = (tseg1 &amp; (info-&gt;nom_bittiming-&gt;tseg1_max - 1)) &lt;&lt; info-&gt;sh-&gt;ntseg1;</div><div class='add'>+		ntseg2 = (tseg2 &amp; (info-&gt;nom_bittiming-&gt;tseg2_max - 1)) &lt;&lt; info-&gt;sh-&gt;ntseg2;</div><div class='add'>+		nsjw = (sjw &amp; (info-&gt;nom_bittiming-&gt;sjw_max - 1)) &lt;&lt; info-&gt;sh-&gt;nsjw;</div><div class='add'>+		nbrp = FIELD_PREP(RCANFD_NCFG_NBRP, brp);</div><div class='add'>+	} else {</div><div class='add'>+		ntseg1 = FIELD_PREP(RCANFD_CFG_TSEG1, tseg1);</div><div class='add'>+		ntseg2 = FIELD_PREP(RCANFD_CFG_TSEG2, tseg2);</div><div class='add'>+		nsjw = FIELD_PREP(RCANFD_CFG_SJW, sjw);</div><div class='add'>+		nbrp = FIELD_PREP(RCANFD_CFG_BRP, brp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return (ntseg1 | ntseg2 | nsjw | nbrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32 rcar_canfd_compute_data_bit_rate_cfg(const struct rcar_canfd_hw_info *info,</div><div class='add'>+						       u16 tseg1, u16 tseg2, u16 sjw, u16 brp)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_canfd_channel *priv = netdev_priv(dev);</div><div class='add'>+	u32 dtseg1, dtseg2, dsjw, dbrp;</div><div class='add'>+</div><div class='add'>+	dtseg1 = (tseg1 &amp; (info-&gt;data_bittiming-&gt;tseg1_max - 1)) &lt;&lt; info-&gt;sh-&gt;dtseg1;</div><div class='add'>+	dtseg2 = (tseg2 &amp; (info-&gt;data_bittiming-&gt;tseg2_max - 1)) &lt;&lt; info-&gt;sh-&gt;dtseg2;</div><div class='add'>+	dsjw = (sjw &amp; (info-&gt;data_bittiming-&gt;sjw_max - 1)) &lt;&lt; 24;</div><div class='add'>+	dbrp = FIELD_PREP(RCANFD_DCFG_DBRP, brp);</div><div class='add'>+</div><div class='add'>+	return (dtseg1 | dtseg2 | dsjw | dbrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_set_bittiming(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	u32 mask = RCANFD_FDCFG_TDCO | RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC;</div><div class='add'>+	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='del'>-	const struct can_bittiming *dbt = &amp;priv-&gt;can.data_bittiming;</div><div class='add'>+	const struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	const struct can_tdc_const *tdc_const = priv-&gt;can.fd.tdc_const;</div><div class='add'>+	const struct can_tdc *tdc = &amp;priv-&gt;can.fd.tdc;</div><div class='add'>+	u32 cfg, tdcmode = 0, tdco = 0;</div><div class='ctx'> 	u16 brp, sjw, tseg1, tseg2;</div><div class='del'>-	u32 cfg;</div><div class='ctx'> 	u32 ch = priv-&gt;channel;</div><div class='ctx'> </div><div class='ctx'> 	/* Nominal bit timing settings */</div><div class='hunk'>@@ -1188,43 +1435,39 @@ static void rcar_canfd_set_bittiming(struct net_device *dev)</div><div class='ctx'> 	sjw = bt-&gt;sjw - 1;</div><div class='ctx'> 	tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1;</div><div class='ctx'> 	tseg2 = bt-&gt;phase_seg2 - 1;</div><div class='add'>+	cfg = rcar_canfd_compute_nominal_bit_rate_cfg(priv, tseg1, tseg2, sjw, brp);</div><div class='add'>+	rcar_canfd_write(priv-&gt;base, RCANFD_CCFG(ch), cfg);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='del'>-		/* CAN FD only mode */</div><div class='del'>-		cfg = (RCANFD_NCFG_NTSEG1(tseg1) | RCANFD_NCFG_NBRP(brp) |</div><div class='del'>-		       RCANFD_NCFG_NSJW(sjw) | RCANFD_NCFG_NTSEG2(tseg2));</div><div class='del'>-</div><div class='del'>-		rcar_canfd_write(priv-&gt;base, RCANFD_CCFG(ch), cfg);</div><div class='del'>-		netdev_dbg(priv-&gt;ndev, "nrate: brp %u, sjw %u, tseg1 %u, tseg2 %u\n",</div><div class='del'>-			   brp, sjw, tseg1, tseg2);</div><div class='del'>-</div><div class='del'>-		/* Data bit timing settings */</div><div class='del'>-		brp = dbt-&gt;brp - 1;</div><div class='del'>-		sjw = dbt-&gt;sjw - 1;</div><div class='del'>-		tseg1 = dbt-&gt;prop_seg + dbt-&gt;phase_seg1 - 1;</div><div class='del'>-		tseg2 = dbt-&gt;phase_seg2 - 1;</div><div class='del'>-</div><div class='del'>-		cfg = (RCANFD_DCFG_DTSEG1(tseg1) | RCANFD_DCFG_DBRP(brp) |</div><div class='del'>-		       RCANFD_DCFG_DSJW(sjw) | RCANFD_DCFG_DTSEG2(tseg2));</div><div class='del'>-</div><div class='del'>-		rcar_canfd_write(priv-&gt;base, RCANFD_F_DCFG(ch), cfg);</div><div class='del'>-		netdev_dbg(priv-&gt;ndev, "drate: brp %u, sjw %u, tseg1 %u, tseg2 %u\n",</div><div class='del'>-			   brp, sjw, tseg1, tseg2);</div><div class='del'>-	} else {</div><div class='del'>-		/* Classical CAN only mode */</div><div class='del'>-		cfg = (RCANFD_CFG_TSEG1(tseg1) | RCANFD_CFG_BRP(brp) |</div><div class='del'>-			RCANFD_CFG_SJW(sjw) | RCANFD_CFG_TSEG2(tseg2));</div><div class='del'>-</div><div class='del'>-		rcar_canfd_write(priv-&gt;base, RCANFD_CCFG(ch), cfg);</div><div class='del'>-		netdev_dbg(priv-&gt;ndev,</div><div class='del'>-			   "rate: brp %u, sjw %u, tseg1 %u, tseg2 %u\n",</div><div class='del'>-			   brp, sjw, tseg1, tseg2);</div><div class='add'>+	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Data bit timing settings */</div><div class='add'>+	brp = dbt-&gt;brp - 1;</div><div class='add'>+	sjw = dbt-&gt;sjw - 1;</div><div class='add'>+	tseg1 = dbt-&gt;prop_seg + dbt-&gt;phase_seg1 - 1;</div><div class='add'>+	tseg2 = dbt-&gt;phase_seg2 - 1;</div><div class='add'>+	cfg = rcar_canfd_compute_data_bit_rate_cfg(gpriv-&gt;info, tseg1, tseg2, sjw, brp);</div><div class='add'>+	writel(cfg, &amp;gpriv-&gt;fcbase[ch].dcfg);</div><div class='add'>+</div><div class='add'>+	/* Transceiver Delay Compensation */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_TDC_AUTO) {</div><div class='add'>+		/* TDC enabled, measured + offset */</div><div class='add'>+		tdcmode = RCANFD_FDCFG_TDCE;</div><div class='add'>+		tdco = tdc-&gt;tdco - 1;</div><div class='add'>+	} else if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_TDC_MANUAL) {</div><div class='add'>+		/* TDC enabled, offset only */</div><div class='add'>+		tdcmode = RCANFD_FDCFG_TDCE | RCANFD_FDCFG_TDCOC;</div><div class='add'>+		tdco = min(tdc-&gt;tdcv + tdc-&gt;tdco, tdc_const-&gt;tdco_max) - 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rcar_canfd_update_bit_reg(&amp;gpriv-&gt;fcbase[ch].cfdcfg, mask,</div><div class='add'>+				  tdcmode | FIELD_PREP(RCANFD_FDCFG_TDCO, tdco));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rcar_canfd_start(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	int err = -EOPNOTSUPP;</div><div class='ctx'> 	u32 sts, ch = priv-&gt;channel;</div><div class='ctx'> 	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='hunk'>@@ -1246,9 +1489,9 @@ static int rcar_canfd_start(struct net_device *ndev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable Common &amp; Rx FIFO */</div><div class='del'>-	rcar_canfd_set_bit(priv-&gt;base, RCANFD_CFCC(ch, RCANFD_CFFIFO_IDX),</div><div class='add'>+	rcar_canfd_set_bit(priv-&gt;base, RCANFD_CFCC(gpriv, ch, RCANFD_CFFIFO_IDX),</div><div class='ctx'> 			   RCANFD_CFCC_CFE);</div><div class='del'>-	rcar_canfd_set_bit(priv-&gt;base, RCANFD_RFCC(ridx), RCANFD_RFCC_RFE);</div><div class='add'>+	rcar_canfd_set_bit(priv-&gt;base, RCANFD_RFCC(gpriv, ridx), RCANFD_RFCC_RFE);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1264,16 +1507,22 @@ static int rcar_canfd_open(struct net_device *ndev)</div><div class='ctx'> 	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = phy_power_on(priv-&gt;transceiver);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "failed to power on PHY: %pe\n", ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Peripheral clock is already enabled in probe */</div><div class='ctx'> 	err = clk_prepare_enable(gpriv-&gt;can_clk);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev, "failed to enable CAN clock, error %d\n", err);</div><div class='del'>-		goto out_clock;</div><div class='add'>+		netdev_err(ndev, "failed to enable CAN clock: %pe\n", ERR_PTR(err));</div><div class='add'>+		goto out_phy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = open_candev(ndev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		netdev_err(ndev, "open_candev() failed, error %d\n", err);</div><div class='add'>+		netdev_err(ndev, "open_candev() failed: %pe\n", ERR_PTR(err));</div><div class='ctx'> 		goto out_can_clock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1282,20 +1531,21 @@ static int rcar_canfd_open(struct net_device *ndev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	return 0;</div><div class='ctx'> out_close:</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> 	close_candev(ndev);</div><div class='ctx'> out_can_clock:</div><div class='ctx'> 	clk_disable_unprepare(gpriv-&gt;can_clk);</div><div class='del'>-out_clock:</div><div class='add'>+out_phy:</div><div class='add'>+	phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_stop(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 sts, ch = priv-&gt;channel;</div><div class='ctx'> 	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='hunk'>@@ -1313,9 +1563,9 @@ static void rcar_canfd_stop(struct net_device *ndev)</div><div class='ctx'> 	rcar_canfd_disable_channel_interrupts(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable Common &amp; Rx FIFO */</div><div class='del'>-	rcar_canfd_clear_bit(priv-&gt;base, RCANFD_CFCC(ch, RCANFD_CFFIFO_IDX),</div><div class='add'>+	rcar_canfd_clear_bit(priv-&gt;base, RCANFD_CFCC(gpriv, ch, RCANFD_CFFIFO_IDX),</div><div class='ctx'> 			     RCANFD_CFCC_CFE);</div><div class='del'>-	rcar_canfd_clear_bit(priv-&gt;base, RCANFD_RFCC(ridx), RCANFD_RFCC_RFE);</div><div class='add'>+	rcar_canfd_clear_bit(priv-&gt;base, RCANFD_RFCC(gpriv, ridx), RCANFD_RFCC_RFE);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the state as STOPPED */</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='hunk'>@@ -1329,9 +1579,9 @@ static int rcar_canfd_close(struct net_device *ndev)</div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='ctx'> 	rcar_canfd_stop(ndev);</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='del'>-	clk_disable_unprepare(gpriv-&gt;can_clk);</div><div class='ctx'> 	close_candev(ndev);</div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_STOP);</div><div class='add'>+	clk_disable_unprepare(gpriv-&gt;can_clk);</div><div class='add'>+	phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1339,12 +1589,13 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					 struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	u32 sts = 0, id, dlc;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u32 ch = priv-&gt;channel;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='hunk'>@@ -1357,13 +1608,13 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 		id |= RCANFD_CFID_CFRTR;</div><div class='ctx'> </div><div class='del'>-	dlc = RCANFD_CFPTR_CFDLC(can_len2dlc(cf-&gt;len));</div><div class='add'>+	dlc = RCANFD_CFPTR_CFDLC(can_fd_len2dlc(cf-&gt;len));</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+	if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) || gpriv-&gt;info-&gt;shared_can_regs) {</div><div class='ctx'> 		rcar_canfd_write(priv-&gt;base,</div><div class='del'>-				 RCANFD_F_CFID(ch, RCANFD_CFFIFO_IDX), id);</div><div class='add'>+				 RCANFD_F_CFID(gpriv, ch, RCANFD_CFFIFO_IDX), id);</div><div class='ctx'> 		rcar_canfd_write(priv-&gt;base,</div><div class='del'>-				 RCANFD_F_CFPTR(ch, RCANFD_CFFIFO_IDX), dlc);</div><div class='add'>+				 RCANFD_F_CFPTR(gpriv, ch, RCANFD_CFFIFO_IDX), dlc);</div><div class='ctx'> </div><div class='ctx'> 		if (can_is_canfd_skb(skb)) {</div><div class='ctx'> 			/* CAN FD frame format */</div><div class='hunk'>@@ -1376,10 +1627,10 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rcar_canfd_write(priv-&gt;base,</div><div class='del'>-				 RCANFD_F_CFFDCSTS(ch, RCANFD_CFFIFO_IDX), sts);</div><div class='add'>+				 RCANFD_F_CFFDCSTS(gpriv, ch, RCANFD_CFFIFO_IDX), sts);</div><div class='ctx'> </div><div class='ctx'> 		rcar_canfd_put_data(priv, cf,</div><div class='del'>-				    RCANFD_F_CFDF(ch, RCANFD_CFFIFO_IDX, 0));</div><div class='add'>+				    RCANFD_F_CFDF(gpriv, ch, RCANFD_CFFIFO_IDX, 0));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rcar_canfd_write(priv-&gt;base,</div><div class='ctx'> 				 RCANFD_C_CFID(ch, RCANFD_CFFIFO_IDX), id);</div><div class='hunk'>@@ -1389,8 +1640,7 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 				    RCANFD_C_CFDF(ch, RCANFD_CFFIFO_IDX, 0));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_len[priv-&gt;tx_head % RCANFD_FIFO_DEPTH] = cf-&gt;len;</div><div class='del'>-	can_put_echo_skb(skb, ndev, priv-&gt;tx_head % RCANFD_FIFO_DEPTH);</div><div class='add'>+	can_put_echo_skb(skb, ndev, priv-&gt;tx_head % RCANFD_FIFO_DEPTH, 0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 	priv-&gt;tx_head++;</div><div class='hunk'>@@ -1403,7 +1653,7 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	 * pointer for the Common FIFO</div><div class='ctx'> 	 */</div><div class='ctx'> 	rcar_canfd_write(priv-&gt;base,</div><div class='del'>-			 RCANFD_CFPCTR(ch, RCANFD_CFFIFO_IDX), 0xff);</div><div class='add'>+			 RCANFD_CFPCTR(gpriv, ch, RCANFD_CFFIFO_IDX), 0xff);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -1411,27 +1661,30 @@ static netdev_tx_t rcar_canfd_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)</div><div class='ctx'> {</div><div class='del'>-	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	struct canfd_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u32 sts = 0, id, dlc;</div><div class='ctx'> 	u32 ch = priv-&gt;channel;</div><div class='ctx'> 	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='del'>-		id = rcar_canfd_read(priv-&gt;base, RCANFD_F_RFID(ridx));</div><div class='del'>-		dlc = rcar_canfd_read(priv-&gt;base, RCANFD_F_RFPTR(ridx));</div><div class='add'>+	if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) || gpriv-&gt;info-&gt;shared_can_regs) {</div><div class='add'>+		id = rcar_canfd_read(priv-&gt;base, RCANFD_F_RFID(gpriv, ridx));</div><div class='add'>+		dlc = rcar_canfd_read(priv-&gt;base, RCANFD_F_RFPTR(gpriv, ridx));</div><div class='ctx'> </div><div class='del'>-		sts = rcar_canfd_read(priv-&gt;base, RCANFD_F_RFFDSTS(ridx));</div><div class='del'>-		if (sts &amp; RCANFD_RFFDSTS_RFFDF)</div><div class='del'>-			skb = alloc_canfd_skb(priv-&gt;ndev, &amp;cf);</div><div class='add'>+		sts = rcar_canfd_read(priv-&gt;base, RCANFD_F_RFFDSTS(gpriv, ridx));</div><div class='add'>+</div><div class='add'>+		if ((priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) &amp;&amp;</div><div class='add'>+		    sts &amp; RCANFD_RFFDSTS_RFFDF)</div><div class='add'>+			skb = alloc_canfd_skb(ndev, &amp;cf);</div><div class='ctx'> 		else</div><div class='del'>-			skb = alloc_can_skb(priv-&gt;ndev,</div><div class='del'>-					    (struct can_frame **)&amp;cf);</div><div class='add'>+			skb = alloc_can_skb(ndev, (struct can_frame **)&amp;cf);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		id = rcar_canfd_read(priv-&gt;base, RCANFD_C_RFID(ridx));</div><div class='ctx'> 		dlc = rcar_canfd_read(priv-&gt;base, RCANFD_C_RFPTR(ridx));</div><div class='del'>-		skb = alloc_can_skb(priv-&gt;ndev, (struct can_frame **)&amp;cf);</div><div class='add'>+		skb = alloc_can_skb(ndev, (struct can_frame **)&amp;cf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='hunk'>@@ -1446,13 +1699,13 @@ static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='ctx'> 		if (sts &amp; RCANFD_RFFDSTS_RFFDF)</div><div class='del'>-			cf-&gt;len = can_dlc2len(RCANFD_RFPTR_RFDLC(dlc));</div><div class='add'>+			cf-&gt;len = can_fd_dlc2len(RCANFD_RFPTR_RFDLC(dlc));</div><div class='ctx'> 		else</div><div class='del'>-			cf-&gt;len = get_can_dlc(RCANFD_RFPTR_RFDLC(dlc));</div><div class='add'>+			cf-&gt;len = can_cc_dlc2len(RCANFD_RFPTR_RFDLC(dlc));</div><div class='ctx'> </div><div class='ctx'> 		if (sts &amp; RCANFD_RFFDSTS_RFESI) {</div><div class='ctx'> 			cf-&gt;flags |= CANFD_ESI;</div><div class='del'>-			netdev_dbg(priv-&gt;ndev, "ESI Error\n");</div><div class='add'>+			netdev_dbg(ndev, "ESI Error\n");</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!(sts &amp; RCANFD_RFFDSTS_RFFDF) &amp;&amp; (id &amp; RCANFD_RFID_RFRTR)) {</div><div class='hunk'>@@ -1461,12 +1714,14 @@ static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)</div><div class='ctx'> 			if (sts &amp; RCANFD_RFFDSTS_RFBRS)</div><div class='ctx'> 				cf-&gt;flags |= CANFD_BRS;</div><div class='ctx'> </div><div class='del'>-			rcar_canfd_get_data(priv, cf, RCANFD_F_RFDF(ridx, 0));</div><div class='add'>+			rcar_canfd_get_data(priv, cf, RCANFD_F_RFDF(gpriv, ridx, 0));</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		cf-&gt;len = get_can_dlc(RCANFD_RFPTR_RFDLC(dlc));</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len(RCANFD_RFPTR_RFDLC(dlc));</div><div class='ctx'> 		if (id &amp; RCANFD_RFID_RFRTR)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+		else if (gpriv-&gt;info-&gt;shared_can_regs)</div><div class='add'>+			rcar_canfd_get_data(priv, cf, RCANFD_F_RFDF(gpriv, ridx, 0));</div><div class='ctx'> 		else</div><div class='ctx'> 			rcar_canfd_get_data(priv, cf, RCANFD_C_RFDF(ridx, 0));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1474,11 +1729,10 @@ static void rcar_canfd_rx_pkt(struct rcar_canfd_channel *priv)</div><div class='ctx'> 	/* Write 0xff to RFPC to increment the CPU-side</div><div class='ctx'> 	 * pointer of the Rx FIFO</div><div class='ctx'> 	 */</div><div class='del'>-	rcar_canfd_write(priv-&gt;base, RCANFD_RFPCTR(ridx), 0xff);</div><div class='del'>-</div><div class='del'>-	can_led_event(priv-&gt;ndev, CAN_LED_EVENT_RX);</div><div class='add'>+	rcar_canfd_write(priv-&gt;base, RCANFD_RFPCTR(gpriv, ridx), 0xff);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -1487,13 +1741,14 @@ static int rcar_canfd_rx_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_channel *priv =</div><div class='ctx'> 		container_of(napi, struct rcar_canfd_channel, napi);</div><div class='add'>+	struct rcar_canfd_global *gpriv = priv-&gt;gpriv;</div><div class='ctx'> 	int num_pkts;</div><div class='ctx'> 	u32 sts;</div><div class='ctx'> 	u32 ch = priv-&gt;channel;</div><div class='ctx'> 	u32 ridx = ch + RCANFD_RFFIFO_IDX;</div><div class='ctx'> </div><div class='ctx'> 	for (num_pkts = 0; num_pkts &lt; quota; num_pkts++) {</div><div class='del'>-		sts = rcar_canfd_read(priv-&gt;base, RCANFD_RFSTS(ridx));</div><div class='add'>+		sts = rcar_canfd_read(priv-&gt;base, RCANFD_RFSTS(gpriv, ridx));</div><div class='ctx'> 		/* Check FIFO empty condition */</div><div class='ctx'> 		if (sts &amp; RCANFD_RFSTS_RFEMP)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1502,20 +1757,44 @@ static int rcar_canfd_rx_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> </div><div class='ctx'> 		/* Clear interrupt bit */</div><div class='ctx'> 		if (sts &amp; RCANFD_RFSTS_RFIF)</div><div class='del'>-			rcar_canfd_write(priv-&gt;base, RCANFD_RFSTS(ridx),</div><div class='add'>+			rcar_canfd_write(priv-&gt;base, RCANFD_RFSTS(gpriv, ridx),</div><div class='ctx'> 					 sts &amp; ~RCANFD_RFSTS_RFIF);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* All packets processed */</div><div class='ctx'> 	if (num_pkts &lt; quota) {</div><div class='del'>-		napi_complete_done(napi, num_pkts);</div><div class='del'>-		/* Enable Rx FIFO interrupts */</div><div class='del'>-		rcar_canfd_set_bit(priv-&gt;base, RCANFD_RFCC(ridx),</div><div class='del'>-				   RCANFD_RFCC_RFIE);</div><div class='add'>+		if (napi_complete_done(napi, num_pkts)) {</div><div class='add'>+			/* Enable Rx FIFO interrupts */</div><div class='add'>+			rcar_canfd_set_bit(priv-&gt;base, RCANFD_RFCC(gpriv, ridx),</div><div class='add'>+					   RCANFD_RFCC_RFIE);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return num_pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int rcar_canfd_get_tdcr(struct rcar_canfd_global *gpriv,</div><div class='add'>+					unsigned int ch)</div><div class='add'>+{</div><div class='add'>+	u32 sts = readl(&amp;gpriv-&gt;fcbase[ch].cfdsts);</div><div class='add'>+	u32 tdcr = FIELD_GET(RCANFD_FDSTS_TDCR, sts);</div><div class='add'>+</div><div class='add'>+	return tdcr &amp; (gpriv-&gt;info-&gt;tdc_const-&gt;tdcv_max - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rcar_canfd_get_auto_tdcv(const struct net_device *ndev, u32 *tdcv)</div><div class='add'>+{</div><div class='add'>+	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='add'>+	u32 tdco = priv-&gt;can.fd.tdc.tdco;</div><div class='add'>+	u32 tdcr;</div><div class='add'>+</div><div class='add'>+	/* Transceiver Delay Compensation Result */</div><div class='add'>+	tdcr = rcar_canfd_get_tdcr(priv-&gt;gpriv, priv-&gt;channel) + 1;</div><div class='add'>+</div><div class='add'>+	*tdcv = tdcr &lt; tdco ? 0 : tdcr - tdco;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rcar_canfd_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1532,10 +1811,10 @@ static int rcar_canfd_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rcar_canfd_get_berr_counter(const struct net_device *dev,</div><div class='add'>+static int rcar_canfd_get_berr_counter(const struct net_device *ndev,</div><div class='ctx'> 				       struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='del'>-	struct rcar_canfd_channel *priv = netdev_priv(dev);</div><div class='add'>+	struct rcar_canfd_channel *priv = netdev_priv(ndev);</div><div class='ctx'> 	u32 val, ch = priv-&gt;channel;</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral clock is already enabled in probe */</div><div class='hunk'>@@ -1549,70 +1828,134 @@ static const struct net_device_ops rcar_canfd_netdev_ops = {</div><div class='ctx'> 	.ndo_open = rcar_canfd_open,</div><div class='ctx'> 	.ndo_stop = rcar_canfd_close,</div><div class='ctx'> 	.ndo_start_xmit = rcar_canfd_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops rcar_canfd_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch,</div><div class='del'>-				    u32 fcan_freq)</div><div class='add'>+				    u32 fcan_freq, struct phy *transceiver)</div><div class='ctx'> {</div><div class='add'>+	const struct rcar_canfd_hw_info *info = gpriv-&gt;info;</div><div class='ctx'> 	struct platform_device *pdev = gpriv-&gt;pdev;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct rcar_canfd_channel *priv;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	int err = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_candev(sizeof(*priv), RCANFD_FIFO_DEPTH);</div><div class='del'>-	if (!ndev) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "alloc_candev() failed\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;rcar_canfd_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;rcar_canfd_ethtool_ops;</div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	priv-&gt;ndev = ndev;</div><div class='ctx'> 	priv-&gt;base = gpriv-&gt;base;</div><div class='add'>+	priv-&gt;transceiver = transceiver;</div><div class='ctx'> 	priv-&gt;channel = ch;</div><div class='add'>+	priv-&gt;gpriv = gpriv;</div><div class='add'>+	if (transceiver)</div><div class='add'>+		priv-&gt;can.bitrate_max = transceiver-&gt;attrs.max_link_rate;</div><div class='ctx'> 	priv-&gt;can.clock.freq = fcan_freq;</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "can_clk rate is %u\n", priv-&gt;can.clock.freq);</div><div class='add'>+	dev_info(dev, "can_clk rate is %u\n", priv-&gt;can.clock.freq);</div><div class='add'>+</div><div class='add'>+	if (info-&gt;multi_channel_irqs) {</div><div class='add'>+		char *irq_name;</div><div class='add'>+		char name[10];</div><div class='add'>+		int err_irq;</div><div class='add'>+		int tx_irq;</div><div class='add'>+</div><div class='add'>+		scnprintf(name, sizeof(name), "ch%u_err", ch);</div><div class='add'>+		err_irq = platform_get_irq_byname(pdev, name);</div><div class='add'>+		if (err_irq &lt; 0) {</div><div class='add'>+			err = err_irq;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		scnprintf(name, sizeof(name), "ch%u_trx", ch);</div><div class='add'>+		tx_irq = platform_get_irq_byname(pdev, name);</div><div class='add'>+		if (tx_irq &lt; 0) {</div><div class='add'>+			err = tx_irq;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq_name = devm_kasprintf(dev, GFP_KERNEL, "canfd.ch%d_err",</div><div class='add'>+					  ch);</div><div class='add'>+		if (!irq_name) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		err = devm_request_irq(dev, err_irq,</div><div class='add'>+				       rcar_canfd_channel_err_interrupt, 0,</div><div class='add'>+				       irq_name, priv);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "devm_request_irq CH Err %d failed: %pe\n",</div><div class='add'>+				err_irq, ERR_PTR(err));</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		irq_name = devm_kasprintf(dev, GFP_KERNEL, "canfd.ch%d_trx",</div><div class='add'>+					  ch);</div><div class='add'>+		if (!irq_name) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+		err = devm_request_irq(dev, tx_irq,</div><div class='add'>+				       rcar_canfd_channel_tx_interrupt, 0,</div><div class='add'>+				       irq_name, priv);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "devm_request_irq Tx %d failed: %pe\n",</div><div class='add'>+				tx_irq, ERR_PTR(err));</div><div class='add'>+			goto fail;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (gpriv-&gt;fdmode) {</div><div class='del'>-		priv-&gt;can.bittiming_const = &amp;rcar_canfd_nom_bittiming_const;</div><div class='del'>-		priv-&gt;can.data_bittiming_const =</div><div class='del'>-			&amp;rcar_canfd_data_bittiming_const;</div><div class='add'>+		priv-&gt;can.bittiming_const = gpriv-&gt;info-&gt;nom_bittiming;</div><div class='add'>+		priv-&gt;can.fd.data_bittiming_const = gpriv-&gt;info-&gt;data_bittiming;</div><div class='add'>+		priv-&gt;can.fd.tdc_const = gpriv-&gt;info-&gt;tdc_const;</div><div class='ctx'> </div><div class='ctx'> 		/* Controller starts in CAN FD only mode */</div><div class='del'>-		can_set_static_ctrlmode(ndev, CAN_CTRLMODE_FD);</div><div class='del'>-		priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+		err = can_set_static_ctrlmode(ndev, CAN_CTRLMODE_FD);</div><div class='add'>+		if (err)</div><div class='add'>+			goto fail;</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING |</div><div class='add'>+					       CAN_CTRLMODE_TDC_AUTO |</div><div class='add'>+					       CAN_CTRLMODE_TDC_MANUAL;</div><div class='add'>+		priv-&gt;can.fd.do_get_auto_tdcv = rcar_canfd_get_auto_tdcv;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Controller starts in Classical CAN only mode */</div><div class='del'>-		priv-&gt;can.bittiming_const = &amp;rcar_canfd_bittiming_const;</div><div class='add'>+		if (gpriv-&gt;info-&gt;shared_can_regs)</div><div class='add'>+			priv-&gt;can.bittiming_const = gpriv-&gt;info-&gt;nom_bittiming;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;can.bittiming_const = &amp;rcar_canfd_bittiming_const;</div><div class='ctx'> 		priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_BERR_REPORTING;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.do_set_mode = rcar_canfd_do_set_mode;</div><div class='ctx'> 	priv-&gt;can.do_get_berr_counter = rcar_canfd_get_berr_counter;</div><div class='del'>-	priv-&gt;gpriv = gpriv;</div><div class='del'>-	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+	SET_NETDEV_DEV(ndev, dev);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, rcar_canfd_rx_poll,</div><div class='del'>-		       RCANFD_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;priv-&gt;napi, rcar_canfd_rx_poll,</div><div class='add'>+			      RCANFD_NAPI_WEIGHT);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='add'>+	gpriv-&gt;ch[priv-&gt;channel] = priv;</div><div class='ctx'> 	err = register_candev(ndev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"register_candev() failed, error %d\n", err);</div><div class='add'>+		dev_err(dev, "register_candev() failed: %pe\n", ERR_PTR(err));</div><div class='ctx'> 		goto fail_candev;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='del'>-	devm_can_led_init(ndev);</div><div class='del'>-	gpriv-&gt;ch[priv-&gt;channel] = priv;</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "device registered (channel %u)\n", priv-&gt;channel);</div><div class='add'>+	dev_info(dev, "device registered (channel %u)\n", priv-&gt;channel);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_candev:</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='del'>-	free_candev(ndev);</div><div class='ctx'> fail:</div><div class='add'>+	free_candev(ndev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1627,210 +1970,372 @@ static void rcar_canfd_channel_remove(struct rcar_canfd_global *gpriv, u32 ch)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int rcar_canfd_global_init(struct rcar_canfd_global *gpriv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;gpriv-&gt;pdev-&gt;dev;</div><div class='add'>+	u32 rule_entry = 0;</div><div class='add'>+	u32 ch, sts;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = reset_control_reset(gpriv-&gt;rstc1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = reset_control_reset(gpriv-&gt;rstc2);</div><div class='add'>+	if (err)</div><div class='add'>+		goto fail_reset1;</div><div class='add'>+</div><div class='add'>+	/* Enable peripheral clock for register access */</div><div class='add'>+	err = clk_prepare_enable(gpriv-&gt;clkp);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "failed to enable peripheral clock: %pe\n",</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+		goto fail_reset2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable RAM clock */</div><div class='add'>+	err = clk_prepare_enable(gpriv-&gt;clk_ram);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"failed to enable RAM clock, error %d\n", err);</div><div class='add'>+		goto fail_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = rcar_canfd_reset_controller(gpriv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "reset controller failed: %pe\n", ERR_PTR(err));</div><div class='add'>+		goto fail_ram_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Controller in Global reset &amp; Channel reset mode */</div><div class='add'>+	rcar_canfd_configure_controller(gpriv);</div><div class='add'>+</div><div class='add'>+	/* Configure per channel attributes */</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='add'>+		/* Configure Channel's Rx fifo */</div><div class='add'>+		rcar_canfd_configure_rx(gpriv, ch);</div><div class='add'>+</div><div class='add'>+		/* Configure Channel's Tx (Common) fifo */</div><div class='add'>+		rcar_canfd_configure_tx(gpriv, ch);</div><div class='add'>+</div><div class='add'>+		/* Configure receive rules */</div><div class='add'>+		rcar_canfd_configure_afl_rules(gpriv, ch, rule_entry);</div><div class='add'>+		rule_entry += RCANFD_CHANNEL_NUMRULES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure common interrupts */</div><div class='add'>+	rcar_canfd_enable_global_interrupts(gpriv);</div><div class='add'>+</div><div class='add'>+	/* Start Global operation mode */</div><div class='add'>+	rcar_canfd_update_bit(gpriv-&gt;base, RCANFD_GCTR, RCANFD_GCTR_GMDC_MASK,</div><div class='add'>+			      RCANFD_GCTR_GMDC_GOPM);</div><div class='add'>+</div><div class='add'>+	/* Verify mode change */</div><div class='add'>+	err = readl_poll_timeout((gpriv-&gt;base + RCANFD_GSTS), sts,</div><div class='add'>+				 !(sts &amp; RCANFD_GSTS_GNOPM), 2, 500000);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "global operational mode failed\n");</div><div class='add'>+		goto fail_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+fail_mode:</div><div class='add'>+	rcar_canfd_disable_global_interrupts(gpriv);</div><div class='add'>+fail_ram_clk:</div><div class='add'>+	clk_disable_unprepare(gpriv-&gt;clk_ram);</div><div class='add'>+fail_clk:</div><div class='add'>+	clk_disable_unprepare(gpriv-&gt;clkp);</div><div class='add'>+fail_reset2:</div><div class='add'>+	reset_control_assert(gpriv-&gt;rstc2);</div><div class='add'>+fail_reset1:</div><div class='add'>+	reset_control_assert(gpriv-&gt;rstc1);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rcar_canfd_global_deinit(struct rcar_canfd_global *gpriv, bool full)</div><div class='add'>+{</div><div class='add'>+	rcar_canfd_disable_global_interrupts(gpriv);</div><div class='add'>+</div><div class='add'>+	if (full) {</div><div class='add'>+		rcar_canfd_reset_controller(gpriv);</div><div class='add'>+</div><div class='add'>+		/* Enter global sleep mode */</div><div class='add'>+		rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GCTR, RCANFD_GCTR_GSLPR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(gpriv-&gt;clk_ram);</div><div class='add'>+	clk_disable_unprepare(gpriv-&gt;clkp);</div><div class='add'>+	reset_control_assert(gpriv-&gt;rstc2);</div><div class='add'>+	reset_control_assert(gpriv-&gt;rstc1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int rcar_canfd_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *mem;</div><div class='add'>+	struct phy *transceivers[RCANFD_NUM_CHANNELS] = { NULL, };</div><div class='add'>+	const struct rcar_canfd_hw_info *info;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	void __iomem *addr;</div><div class='del'>-	u32 sts, ch, fcan_freq;</div><div class='ctx'> 	struct rcar_canfd_global *gpriv;</div><div class='ctx'> 	struct device_node *of_child;</div><div class='ctx'> 	unsigned long channels_mask = 0;</div><div class='ctx'> 	int err, ch_irq, g_irq;</div><div class='add'>+	int g_err_irq, g_recc_irq;</div><div class='ctx'> 	bool fdmode = true;			/* CAN FD only mode - default */</div><div class='add'>+	char name[9] = "channelX";</div><div class='add'>+	u32 ch, fcan_freq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	info = of_device_get_match_data(dev);</div><div class='ctx'> </div><div class='del'>-	if (of_property_read_bool(pdev-&gt;dev.of_node, "renesas,no-can-fd"))</div><div class='add'>+	if (of_property_read_bool(dev-&gt;of_node, "renesas,no-can-fd"))</div><div class='ctx'> 		fdmode = false;			/* Classical CAN only mode */</div><div class='ctx'> </div><div class='del'>-	of_child = of_get_child_by_name(pdev-&gt;dev.of_node, "channel0");</div><div class='del'>-	if (of_child &amp;&amp; of_device_is_available(of_child))</div><div class='del'>-		channels_mask |= BIT(0);	/* Channel 0 */</div><div class='add'>+	for (i = 0; i &lt; info-&gt;max_channels; ++i) {</div><div class='add'>+		name[7] = '0' + i;</div><div class='add'>+		of_child = of_get_available_child_by_name(dev-&gt;of_node, name);</div><div class='add'>+		if (of_child) {</div><div class='add'>+			channels_mask |= BIT(i);</div><div class='add'>+			transceivers[i] = devm_of_phy_optional_get(dev,</div><div class='add'>+							of_child, NULL);</div><div class='add'>+			of_node_put(of_child);</div><div class='add'>+		}</div><div class='add'>+		if (IS_ERR(transceivers[i]))</div><div class='add'>+			return PTR_ERR(transceivers[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	of_child = of_get_child_by_name(pdev-&gt;dev.of_node, "channel1");</div><div class='del'>-	if (of_child &amp;&amp; of_device_is_available(of_child))</div><div class='del'>-		channels_mask |= BIT(1);	/* Channel 1 */</div><div class='add'>+	if (info-&gt;shared_global_irqs) {</div><div class='add'>+		ch_irq = platform_get_irq_byname_optional(pdev, "ch_int");</div><div class='add'>+		if (ch_irq &lt; 0) {</div><div class='add'>+			/* For backward compatibility get irq by index */</div><div class='add'>+			ch_irq = platform_get_irq(pdev, 0);</div><div class='add'>+			if (ch_irq &lt; 0)</div><div class='add'>+				return ch_irq;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	ch_irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (ch_irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no Channel IRQ resource\n");</div><div class='del'>-		err = ch_irq;</div><div class='del'>-		goto fail_dev;</div><div class='del'>-	}</div><div class='add'>+		g_irq = platform_get_irq_byname_optional(pdev, "g_int");</div><div class='add'>+		if (g_irq &lt; 0) {</div><div class='add'>+			/* For backward compatibility get irq by index */</div><div class='add'>+			g_irq = platform_get_irq(pdev, 1);</div><div class='add'>+			if (g_irq &lt; 0)</div><div class='add'>+				return g_irq;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		g_err_irq = platform_get_irq_byname(pdev, "g_err");</div><div class='add'>+		if (g_err_irq &lt; 0)</div><div class='add'>+			return g_err_irq;</div><div class='ctx'> </div><div class='del'>-	g_irq = platform_get_irq(pdev, 1);</div><div class='del'>-	if (g_irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no Global IRQ resource\n");</div><div class='del'>-		err = g_irq;</div><div class='del'>-		goto fail_dev;</div><div class='add'>+		g_recc_irq = platform_get_irq_byname(pdev, "g_recc");</div><div class='add'>+		if (g_recc_irq &lt; 0)</div><div class='add'>+			return g_recc_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Global controller context */</div><div class='del'>-	gpriv = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*gpriv), GFP_KERNEL);</div><div class='del'>-	if (!gpriv) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto fail_dev;</div><div class='del'>-	}</div><div class='add'>+	gpriv = devm_kzalloc(dev, sizeof(*gpriv), GFP_KERNEL);</div><div class='add'>+	if (!gpriv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	gpriv-&gt;pdev = pdev;</div><div class='ctx'> 	gpriv-&gt;channels_mask = channels_mask;</div><div class='ctx'> 	gpriv-&gt;fdmode = fdmode;</div><div class='add'>+	gpriv-&gt;info = info;</div><div class='add'>+</div><div class='add'>+	gpriv-&gt;rstc1 = devm_reset_control_get_optional_exclusive(dev, "rstp_n");</div><div class='add'>+	if (IS_ERR(gpriv-&gt;rstc1))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gpriv-&gt;rstc1),</div><div class='add'>+				     "failed to get rstp_n\n");</div><div class='add'>+</div><div class='add'>+	gpriv-&gt;rstc2 = devm_reset_control_get_optional_exclusive(dev, "rstc_n");</div><div class='add'>+	if (IS_ERR(gpriv-&gt;rstc2))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gpriv-&gt;rstc2),</div><div class='add'>+				     "failed to get rstc_n\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Peripheral clock */</div><div class='del'>-	gpriv-&gt;clkp = devm_clk_get(&amp;pdev-&gt;dev, "fck");</div><div class='del'>-	if (IS_ERR(gpriv-&gt;clkp)) {</div><div class='del'>-		err = PTR_ERR(gpriv-&gt;clkp);</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot get peripheral clock, error %d\n",</div><div class='del'>-			err);</div><div class='del'>-		goto fail_dev;</div><div class='del'>-	}</div><div class='add'>+	gpriv-&gt;clkp = devm_clk_get(dev, "fck");</div><div class='add'>+	if (IS_ERR(gpriv-&gt;clkp))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gpriv-&gt;clkp),</div><div class='add'>+				     "cannot get peripheral clock\n");</div><div class='ctx'> </div><div class='ctx'> 	/* fCAN clock: Pick External clock. If not available fallback to</div><div class='ctx'> 	 * CANFD clock</div><div class='ctx'> 	 */</div><div class='del'>-	gpriv-&gt;can_clk = devm_clk_get(&amp;pdev-&gt;dev, "can_clk");</div><div class='add'>+	gpriv-&gt;can_clk = devm_clk_get(dev, "can_clk");</div><div class='ctx'> 	if (IS_ERR(gpriv-&gt;can_clk) || (clk_get_rate(gpriv-&gt;can_clk) == 0)) {</div><div class='del'>-		gpriv-&gt;can_clk = devm_clk_get(&amp;pdev-&gt;dev, "canfd");</div><div class='del'>-		if (IS_ERR(gpriv-&gt;can_clk)) {</div><div class='del'>-			err = PTR_ERR(gpriv-&gt;can_clk);</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"cannot get canfd clock, error %d\n", err);</div><div class='del'>-			goto fail_dev;</div><div class='del'>-		}</div><div class='del'>-		gpriv-&gt;fcan = RCANFD_CANFDCLK;</div><div class='add'>+		gpriv-&gt;can_clk = devm_clk_get(dev, "canfd");</div><div class='add'>+		if (IS_ERR(gpriv-&gt;can_clk))</div><div class='add'>+			return dev_err_probe(dev, PTR_ERR(gpriv-&gt;can_clk),</div><div class='add'>+					     "cannot get canfd clock\n");</div><div class='ctx'> </div><div class='add'>+		/* CANFD clock may be further divided within the IP */</div><div class='add'>+		fcan_freq = clk_get_rate(gpriv-&gt;can_clk) / info-&gt;postdiv;</div><div class='ctx'> 	} else {</div><div class='del'>-		gpriv-&gt;fcan = RCANFD_EXTCLK;</div><div class='add'>+		fcan_freq = clk_get_rate(gpriv-&gt;can_clk);</div><div class='add'>+		gpriv-&gt;extclk = gpriv-&gt;info-&gt;external_clk;</div><div class='ctx'> 	}</div><div class='del'>-	fcan_freq = clk_get_rate(gpriv-&gt;can_clk);</div><div class='ctx'> </div><div class='del'>-	if (gpriv-&gt;fcan == RCANFD_CANFDCLK)</div><div class='del'>-		/* CANFD clock is further divided by (1/2) within the IP */</div><div class='del'>-		fcan_freq /= 2;</div><div class='add'>+	gpriv-&gt;clk_ram = devm_clk_get_optional(dev, "ram_clk");</div><div class='add'>+	if (IS_ERR(gpriv-&gt;clk_ram))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gpriv-&gt;clk_ram),</div><div class='add'>+				     "cannot get ram clock\n");</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	addr = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='add'>+	addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(addr)) {</div><div class='ctx'> 		err = PTR_ERR(addr);</div><div class='ctx'> 		goto fail_dev;</div><div class='ctx'> 	}</div><div class='ctx'> 	gpriv-&gt;base = addr;</div><div class='add'>+	gpriv-&gt;fcbase = addr + gpriv-&gt;info-&gt;regs-&gt;coffset;</div><div class='ctx'> </div><div class='ctx'> 	/* Request IRQ that's common for both channels */</div><div class='del'>-	err = devm_request_irq(&amp;pdev-&gt;dev, ch_irq,</div><div class='del'>-			       rcar_canfd_channel_interrupt, 0,</div><div class='del'>-			       "canfd.chn", gpriv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "devm_request_irq(%d) failed, error %d\n",</div><div class='del'>-			ch_irq, err);</div><div class='del'>-		goto fail_dev;</div><div class='del'>-	}</div><div class='del'>-	err = devm_request_irq(&amp;pdev-&gt;dev, g_irq,</div><div class='del'>-			       rcar_canfd_global_interrupt, 0,</div><div class='del'>-			       "canfd.gbl", gpriv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "devm_request_irq(%d) failed, error %d\n",</div><div class='del'>-			g_irq, err);</div><div class='del'>-		goto fail_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable peripheral clock for register access */</div><div class='del'>-	err = clk_prepare_enable(gpriv-&gt;clkp);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"failed to enable peripheral clock, error %d\n", err);</div><div class='del'>-		goto fail_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = rcar_canfd_reset_controller(gpriv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "reset controller failed\n");</div><div class='del'>-		goto fail_clk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Controller in Global reset &amp; Channel reset mode */</div><div class='del'>-	rcar_canfd_configure_controller(gpriv);</div><div class='add'>+	if (info-&gt;shared_global_irqs) {</div><div class='add'>+		err = devm_request_irq(dev, ch_irq,</div><div class='add'>+				       rcar_canfd_channel_interrupt, 0,</div><div class='add'>+				       "canfd.ch_int", gpriv);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "devm_request_irq %d failed: %pe\n",</div><div class='add'>+				ch_irq, ERR_PTR(err));</div><div class='add'>+			goto fail_dev;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* Configure per channel attributes */</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='del'>-		/* Configure Channel's Rx fifo */</div><div class='del'>-		rcar_canfd_configure_rx(gpriv, ch);</div><div class='add'>+		err = devm_request_irq(dev, g_irq, rcar_canfd_global_interrupt,</div><div class='add'>+				       0, "canfd.g_int", gpriv);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "devm_request_irq %d failed: %pe\n",</div><div class='add'>+				g_irq, ERR_PTR(err));</div><div class='add'>+			goto fail_dev;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = devm_request_irq(dev, g_recc_irq,</div><div class='add'>+				       rcar_canfd_global_receive_fifo_interrupt, 0,</div><div class='add'>+				       "canfd.g_recc", gpriv);</div><div class='ctx'> </div><div class='del'>-		/* Configure Channel's Tx (Common) fifo */</div><div class='del'>-		rcar_canfd_configure_tx(gpriv, ch);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "devm_request_irq %d failed: %pe\n",</div><div class='add'>+				g_recc_irq, ERR_PTR(err));</div><div class='add'>+			goto fail_dev;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/* Configure receive rules */</div><div class='del'>-		rcar_canfd_configure_afl_rules(gpriv, ch);</div><div class='add'>+		err = devm_request_irq(dev, g_err_irq,</div><div class='add'>+				       rcar_canfd_global_err_interrupt, 0,</div><div class='add'>+				       "canfd.g_err", gpriv);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "devm_request_irq %d failed: %pe\n",</div><div class='add'>+				g_err_irq, ERR_PTR(err));</div><div class='add'>+			goto fail_dev;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Configure common interrupts */</div><div class='del'>-	rcar_canfd_enable_global_interrupts(gpriv);</div><div class='del'>-</div><div class='del'>-	/* Start Global operation mode */</div><div class='del'>-	rcar_canfd_update_bit(gpriv-&gt;base, RCANFD_GCTR, RCANFD_GCTR_GMDC_MASK,</div><div class='del'>-			      RCANFD_GCTR_GMDC_GOPM);</div><div class='del'>-</div><div class='del'>-	/* Verify mode change */</div><div class='del'>-	err = readl_poll_timeout((gpriv-&gt;base + RCANFD_GSTS), sts,</div><div class='del'>-				 !(sts &amp; RCANFD_GSTS_GNOPM), 2, 500000);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "global operational mode failed\n");</div><div class='add'>+	err = rcar_canfd_global_init(gpriv);</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto fail_mode;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='del'>-		err = rcar_canfd_channel_probe(gpriv, ch, fcan_freq);</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, info-&gt;max_channels) {</div><div class='add'>+		err = rcar_canfd_channel_probe(gpriv, ch, fcan_freq,</div><div class='add'>+					       transceivers[ch]);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto fail_channel;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, gpriv);</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "global operational state (clk %d, fdmode %d)\n",</div><div class='del'>-		 gpriv-&gt;fcan, gpriv-&gt;fdmode);</div><div class='add'>+	dev_info(dev, "global operational state (%s clk, %s mode)\n",</div><div class='add'>+		 gpriv-&gt;extclk ? "ext" : "canfd",</div><div class='add'>+		 gpriv-&gt;fdmode ? "fd" : "classical");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> fail_channel:</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS)</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, info-&gt;max_channels)</div><div class='ctx'> 		rcar_canfd_channel_remove(gpriv, ch);</div><div class='ctx'> fail_mode:</div><div class='del'>-	rcar_canfd_disable_global_interrupts(gpriv);</div><div class='del'>-fail_clk:</div><div class='del'>-	clk_disable_unprepare(gpriv-&gt;clkp);</div><div class='add'>+	rcar_canfd_global_deinit(gpriv, false);</div><div class='ctx'> fail_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int rcar_canfd_remove(struct platform_device *pdev)</div><div class='add'>+static void rcar_canfd_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct rcar_canfd_global *gpriv = platform_get_drvdata(pdev);</div><div class='ctx'> 	u32 ch;</div><div class='ctx'> </div><div class='del'>-	rcar_canfd_reset_controller(gpriv);</div><div class='del'>-	rcar_canfd_disable_global_interrupts(gpriv);</div><div class='del'>-</div><div class='del'>-	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, RCANFD_NUM_CHANNELS) {</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='ctx'> 		rcar_canfd_disable_channel_interrupts(gpriv-&gt;ch[ch]);</div><div class='ctx'> 		rcar_canfd_channel_remove(gpriv, ch);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Enter global sleep mode */</div><div class='del'>-	rcar_canfd_set_bit(gpriv-&gt;base, RCANFD_GCTR, RCANFD_GCTR_GSLPR);</div><div class='del'>-	clk_disable_unprepare(gpriv-&gt;clkp);</div><div class='del'>-	return 0;</div><div class='add'>+	rcar_canfd_global_deinit(gpriv, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __maybe_unused rcar_canfd_suspend(struct device *dev)</div><div class='add'>+static int rcar_canfd_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct rcar_canfd_global *gpriv = dev_get_drvdata(dev);</div><div class='add'>+	int err;</div><div class='add'>+	u32 ch;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='add'>+		struct rcar_canfd_channel *priv = gpriv-&gt;ch[ch];</div><div class='add'>+		struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+		if (!netif_running(ndev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		netif_device_detach(ndev);</div><div class='add'>+</div><div class='add'>+		err = rcar_canfd_close(ndev);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(ndev, "rcar_canfd_close() failed %pe\n",</div><div class='add'>+				   ERR_PTR(err));</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_SLEEPING;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO Skip if wake-up (which is not yet supported) is enabled */</div><div class='add'>+	rcar_canfd_global_deinit(gpriv, false);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __maybe_unused rcar_canfd_resume(struct device *dev)</div><div class='add'>+static int rcar_canfd_resume(struct device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct rcar_canfd_global *gpriv = dev_get_drvdata(dev);</div><div class='add'>+	int err;</div><div class='add'>+	u32 ch;</div><div class='add'>+</div><div class='add'>+	err = rcar_canfd_global_init(gpriv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "rcar_canfd_global_init() failed %pe\n", ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(ch, &amp;gpriv-&gt;channels_mask, gpriv-&gt;info-&gt;max_channels) {</div><div class='add'>+		struct rcar_canfd_channel *priv = gpriv-&gt;ch[ch];</div><div class='add'>+		struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+		if (!netif_running(ndev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = rcar_canfd_open(ndev);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(ndev, "rcar_canfd_open() failed %pe\n",</div><div class='add'>+				   ERR_PTR(err));</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_device_attach(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(rcar_canfd_pm_ops, rcar_canfd_suspend,</div><div class='del'>-			 rcar_canfd_resume);</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(rcar_canfd_pm_ops, rcar_canfd_suspend,</div><div class='add'>+				rcar_canfd_resume);</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id rcar_canfd_of_table[] = {</div><div class='del'>-	{ .compatible = "renesas,rcar-gen3-canfd" },</div><div class='add'>+static const __maybe_unused struct of_device_id rcar_canfd_of_table[] = {</div><div class='add'>+	{ .compatible = "renesas,r8a779a0-canfd", .data = &amp;rcar_gen4_hw_info },</div><div class='add'>+	{ .compatible = "renesas,r9a09g047-canfd", .data = &amp;r9a09g047_hw_info },</div><div class='add'>+	{ .compatible = "renesas,rcar-gen3-canfd", .data = &amp;rcar_gen3_hw_info },</div><div class='add'>+	{ .compatible = "renesas,rcar-gen4-canfd", .data = &amp;rcar_gen4_hw_info },</div><div class='add'>+	{ .compatible = "renesas,rzg2l-canfd", .data = &amp;rzg2l_hw_info },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1840,7 +2345,7 @@ static struct platform_driver rcar_canfd_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = RCANFD_DRV_NAME,</div><div class='ctx'> 		.of_match_table = of_match_ptr(rcar_canfd_of_table),</div><div class='del'>-		.pm = &amp;rcar_canfd_pm_ops,</div><div class='add'>+		.pm = pm_sleep_ptr(&amp;rcar_canfd_pm_ops),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = rcar_canfd_probe,</div><div class='ctx'> 	.remove = rcar_canfd_remove,</div><div class='head'>diff --git a/drivers/net/can/rockchip/Kconfig b/drivers/net/can/rockchip/Kconfig<br/>new file mode 100644<br/>index 000000000000..d203c530551f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+config CAN_ROCKCHIP_CANFD</div><div class='add'>+	tristate "Rockchip CAN-FD controller"</div><div class='add'>+	depends on OF</div><div class='add'>+	depends on ARCH_ROCKCHIP || COMPILE_TEST</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you want to use CAN-FD controller found on</div><div class='add'>+	  Rockchip SoCs.</div><div class='head'>diff --git a/drivers/net/can/rockchip/Makefile b/drivers/net/can/rockchip/Makefile<br/>new file mode 100644<br/>index 000000000000..3760d3e1baa3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_ROCKCHIP_CANFD) += rockchip_canfd.o</div><div class='add'>+</div><div class='add'>+rockchip_canfd-objs :=</div><div class='add'>+rockchip_canfd-objs += rockchip_canfd-core.o</div><div class='add'>+rockchip_canfd-objs += rockchip_canfd-ethtool.o</div><div class='add'>+rockchip_canfd-objs += rockchip_canfd-rx.o</div><div class='add'>+rockchip_canfd-objs += rockchip_canfd-timestamp.o</div><div class='add'>+rockchip_canfd-objs += rockchip_canfd-tx.o</div><div class='head'>diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c<br/>new file mode 100644<br/>index 000000000000..29de0c01e4ed<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/rockchip_canfd-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/rockchip_canfd-core.c</a></div><div class='hunk'>@@ -0,0 +1,962 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2023, 2024 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// Rockchip CANFD driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2020 Rockchip Electronics Co. Ltd.</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rockchip_canfd.h"</div><div class='add'>+</div><div class='add'>+static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v2 = {</div><div class='add'>+	.model = RKCANFD_MODEL_RK3568V2,</div><div class='add'>+	.quirks = RKCANFD_QUIRK_RK3568_ERRATUM_1 | RKCANFD_QUIRK_RK3568_ERRATUM_2 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_3 | RKCANFD_QUIRK_RK3568_ERRATUM_4 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_5 | RKCANFD_QUIRK_RK3568_ERRATUM_6 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_7 | RKCANFD_QUIRK_RK3568_ERRATUM_8 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_9 | RKCANFD_QUIRK_RK3568_ERRATUM_10 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_11 | RKCANFD_QUIRK_RK3568_ERRATUM_12 |</div><div class='add'>+		RKCANFD_QUIRK_CANFD_BROKEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The rk3568 CAN-FD errata sheet as of Tue 07 Nov 2023 11:25:31 +08:00</div><div class='add'>+ * states that only the rk3568v2 is affected by erratum 5, but tests</div><div class='add'>+ * with the rk3568v2 and rk3568v3 show that the RX_FIFO_CNT is</div><div class='add'>+ * sometimes too high. In contrast to the errata sheet mark rk3568v3</div><div class='add'>+ * as effected by erratum 5, too.</div><div class='add'>+ */</div><div class='add'>+static const struct rkcanfd_devtype_data rkcanfd_devtype_data_rk3568v3 = {</div><div class='add'>+	.model = RKCANFD_MODEL_RK3568V3,</div><div class='add'>+	.quirks = RKCANFD_QUIRK_RK3568_ERRATUM_1 | RKCANFD_QUIRK_RK3568_ERRATUM_2 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_5 | RKCANFD_QUIRK_RK3568_ERRATUM_7 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_8 | RKCANFD_QUIRK_RK3568_ERRATUM_10 |</div><div class='add'>+		RKCANFD_QUIRK_RK3568_ERRATUM_11 | RKCANFD_QUIRK_RK3568_ERRATUM_12 |</div><div class='add'>+		RKCANFD_QUIRK_CANFD_BROKEN,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *__rkcanfd_get_model_str(enum rkcanfd_model model)</div><div class='add'>+{</div><div class='add'>+	switch (model) {</div><div class='add'>+	case RKCANFD_MODEL_RK3568V2:</div><div class='add'>+		return "rk3568v2";</div><div class='add'>+	case RKCANFD_MODEL_RK3568V3:</div><div class='add'>+		return "rk3568v3";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *</div><div class='add'>+rkcanfd_get_model_str(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return __rkcanfd_get_model_str(priv-&gt;devtype_data.model);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Note:</div><div class='add'>+ *</div><div class='add'>+ * The formula to calculate the CAN System Clock is:</div><div class='add'>+ *</div><div class='add'>+ * Tsclk = 2 x Tclk x (brp + 1)</div><div class='add'>+ *</div><div class='add'>+ * Double the data sheet's brp_min, brp_max and brp_inc values (both</div><div class='add'>+ * for the arbitration and data bit timing) to take the "2 x" into</div><div class='add'>+ * account.</div><div class='add'>+ */</div><div class='add'>+static const struct can_bittiming_const rkcanfd_bittiming_const = {</div><div class='add'>+	.name = DEVICE_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 2,	/* value from data sheet x2 */</div><div class='add'>+	.brp_max = 512,	/* value from data sheet x2 */</div><div class='add'>+	.brp_inc = 2,	/* value from data sheet x2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const rkcanfd_data_bittiming_const = {</div><div class='add'>+	.name = DEVICE_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 2,	/* value from data sheet x2 */</div><div class='add'>+	.brp_max = 512,	/* value from data sheet x2 */</div><div class='add'>+	.brp_inc = 2,	/* value from data sheet x2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_set_reset_mode(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	reset_control_assert(priv-&gt;reset);</div><div class='add'>+	udelay(2);</div><div class='add'>+	reset_control_deassert(priv-&gt;reset);</div><div class='add'>+</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_MODE, 0x0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_set_work_mode(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_MODE, priv-&gt;reg_mode_default);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_set_bittiming(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	u32 reg_nbt, reg_dbt, reg_tdc;</div><div class='add'>+	u32 tdco;</div><div class='add'>+</div><div class='add'>+	reg_nbt = FIELD_PREP(RKCANFD_REG_FD_NOMINAL_BITTIMING_SJW,</div><div class='add'>+			     bt-&gt;sjw - 1) |</div><div class='add'>+		FIELD_PREP(RKCANFD_REG_FD_NOMINAL_BITTIMING_BRP,</div><div class='add'>+			   (bt-&gt;brp / 2) - 1) |</div><div class='add'>+		FIELD_PREP(RKCANFD_REG_FD_NOMINAL_BITTIMING_TSEG2,</div><div class='add'>+			   bt-&gt;phase_seg2 - 1) |</div><div class='add'>+		FIELD_PREP(RKCANFD_REG_FD_NOMINAL_BITTIMING_TSEG1,</div><div class='add'>+			   bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1);</div><div class='add'>+</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_FD_NOMINAL_BITTIMING, reg_nbt);</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reg_dbt = FIELD_PREP(RKCANFD_REG_FD_DATA_BITTIMING_SJW,</div><div class='add'>+			     dbt-&gt;sjw - 1) |</div><div class='add'>+		FIELD_PREP(RKCANFD_REG_FD_DATA_BITTIMING_BRP,</div><div class='add'>+			   (dbt-&gt;brp / 2) - 1) |</div><div class='add'>+		FIELD_PREP(RKCANFD_REG_FD_DATA_BITTIMING_TSEG2,</div><div class='add'>+			   dbt-&gt;phase_seg2 - 1) |</div><div class='add'>+		FIELD_PREP(RKCANFD_REG_FD_DATA_BITTIMING_TSEG1,</div><div class='add'>+			   dbt-&gt;prop_seg + dbt-&gt;phase_seg1 - 1);</div><div class='add'>+</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_FD_DATA_BITTIMING, reg_dbt);</div><div class='add'>+</div><div class='add'>+	tdco = (priv-&gt;can.clock.freq / dbt-&gt;bitrate) * 2 / 3;</div><div class='add'>+	tdco = min(tdco, FIELD_MAX(RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION_TDC_OFFSET));</div><div class='add'>+</div><div class='add'>+	reg_tdc = FIELD_PREP(RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION_TDC_OFFSET, tdco) |</div><div class='add'>+		RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION_TDC_ENABLE;</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION,</div><div class='add'>+		      reg_tdc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_get_berr_counter_corrected(struct rkcanfd_priv *priv,</div><div class='add'>+					       struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct can_berr_counter bec_raw;</div><div class='add'>+	u32 reg_state;</div><div class='add'>+</div><div class='add'>+	bec-&gt;rxerr = rkcanfd_read(priv, RKCANFD_REG_RXERRORCNT);</div><div class='add'>+	bec-&gt;txerr = rkcanfd_read(priv, RKCANFD_REG_TXERRORCNT);</div><div class='add'>+	bec_raw = *bec;</div><div class='add'>+</div><div class='add'>+	/* Tests show that sometimes both CAN bus error counters read</div><div class='add'>+	 * 0x0, even if the controller is in warning mode</div><div class='add'>+	 * (RKCANFD_REG_STATE_ERROR_WARNING_STATE in RKCANFD_REG_STATE</div><div class='add'>+	 * set).</div><div class='add'>+	 *</div><div class='add'>+	 * In case both error counters read 0x0, use the struct</div><div class='add'>+	 * priv-&gt;bec, otherwise save the read value to priv-&gt;bec.</div><div class='add'>+	 *</div><div class='add'>+	 * rkcanfd_handle_rx_int_one() handles the decrementing of</div><div class='add'>+	 * priv-&gt;bec.rxerr for successfully RX'ed CAN frames.</div><div class='add'>+	 *</div><div class='add'>+	 * Luckily the controller doesn't decrement the RX CAN bus</div><div class='add'>+	 * error counter in hardware for self received TX'ed CAN</div><div class='add'>+	 * frames (RKCANFD_REG_MODE_RXSTX_MODE), so RXSTX doesn't</div><div class='add'>+	 * interfere with proper RX CAN bus error counters.</div><div class='add'>+	 *</div><div class='add'>+	 * rkcanfd_handle_tx_done_one() handles the decrementing of</div><div class='add'>+	 * priv-&gt;bec.txerr for successfully TX'ed CAN frames.</div><div class='add'>+	 */</div><div class='add'>+	if (!bec-&gt;rxerr &amp;&amp; !bec-&gt;txerr)</div><div class='add'>+		*bec = priv-&gt;bec;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;bec = *bec;</div><div class='add'>+</div><div class='add'>+	reg_state = rkcanfd_read(priv, RKCANFD_REG_STATE);</div><div class='add'>+	netdev_vdbg(priv-&gt;ndev,</div><div class='add'>+		    "%s: Raw/Cor: txerr=%3u/%3u rxerr=%3u/%3u Bus Off=%u Warning=%u\n",</div><div class='add'>+		    __func__,</div><div class='add'>+		    bec_raw.txerr, bec-&gt;txerr, bec_raw.rxerr, bec-&gt;rxerr,</div><div class='add'>+		    !!(reg_state &amp; RKCANFD_REG_STATE_BUS_OFF_STATE),</div><div class='add'>+		    !!(reg_state &amp; RKCANFD_REG_STATE_ERROR_WARNING_STATE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_get_berr_counter(const struct net_device *ndev,</div><div class='add'>+				    struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pm_runtime_resume_and_get(ndev-&gt;dev.parent);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rkcanfd_get_berr_counter_corrected(priv, bec);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_interrupts_enable(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_INT_MASK, priv-&gt;reg_int_mask_default);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s: reg_int_mask=0x%08x\n", __func__,</div><div class='add'>+		   rkcanfd_read(priv, RKCANFD_REG_INT_MASK));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_interrupts_disable(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_INT_MASK, RKCANFD_REG_INT_ALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_fifo_setup(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* RX FIFO */</div><div class='add'>+	reg = rkcanfd_read(priv, RKCANFD_REG_RX_FIFO_CTRL);</div><div class='add'>+	reg |= RKCANFD_REG_RX_FIFO_CTRL_RX_FIFO_ENABLE;</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_RX_FIFO_CTRL, reg);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(priv-&gt;tx_head, 0);</div><div class='add'>+	WRITE_ONCE(priv-&gt;tx_tail, 0);</div><div class='add'>+	netdev_reset_queue(priv-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_start(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_set_reset_mode(priv);</div><div class='add'>+</div><div class='add'>+	/* Receiving Filter: accept all */</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_IDCODE, 0x0);</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_IDMASK, RKCANFD_REG_IDCODE_EXTENDED_FRAME_ID);</div><div class='add'>+</div><div class='add'>+	/* enable:</div><div class='add'>+	 * - CAN_FD: enable CAN-FD</div><div class='add'>+	 * - AUTO_RETX_MODE: auto retransmission on TX error</div><div class='add'>+	 * - COVER_MODE: RX-FIFO overwrite mode, do not send OVERLOAD frames</div><div class='add'>+	 * - RXSTX_MODE: Receive Self Transmit data mode</div><div class='add'>+	 * - WORK_MODE: transition from reset to working mode</div><div class='add'>+	 */</div><div class='add'>+	reg = rkcanfd_read(priv, RKCANFD_REG_MODE);</div><div class='add'>+	priv-&gt;reg_mode_default = reg |</div><div class='add'>+		RKCANFD_REG_MODE_CAN_FD_MODE_ENABLE |</div><div class='add'>+		RKCANFD_REG_MODE_AUTO_RETX_MODE |</div><div class='add'>+		RKCANFD_REG_MODE_COVER_MODE |</div><div class='add'>+		RKCANFD_REG_MODE_RXSTX_MODE |</div><div class='add'>+		RKCANFD_REG_MODE_WORK_MODE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='add'>+		priv-&gt;reg_mode_default |= RKCANFD_REG_MODE_LBACK_MODE |</div><div class='add'>+			RKCANFD_REG_MODE_SILENT_MODE |</div><div class='add'>+			RKCANFD_REG_MODE_SELF_TEST;</div><div class='add'>+</div><div class='add'>+	/* mask, i.e. ignore:</div><div class='add'>+	 * - TIMESTAMP_COUNTER_OVERFLOW_INT - timestamp counter overflow interrupt</div><div class='add'>+	 * - TX_ARBIT_FAIL_INT - TX arbitration fail interrupt</div><div class='add'>+	 * - OVERLOAD_INT - CAN bus overload interrupt</div><div class='add'>+	 * - TX_FINISH_INT - Transmit finish interrupt</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;reg_int_mask_default =</div><div class='add'>+		RKCANFD_REG_INT_TIMESTAMP_COUNTER_OVERFLOW_INT |</div><div class='add'>+		RKCANFD_REG_INT_TX_ARBIT_FAIL_INT |</div><div class='add'>+		RKCANFD_REG_INT_OVERLOAD_INT |</div><div class='add'>+		RKCANFD_REG_INT_TX_FINISH_INT;</div><div class='add'>+</div><div class='add'>+	/* Do not mask the bus error interrupt if the bus error</div><div class='add'>+	 * reporting is requested.</div><div class='add'>+	 */</div><div class='add'>+	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING))</div><div class='add'>+		priv-&gt;reg_int_mask_default |= RKCANFD_REG_INT_ERROR_INT;</div><div class='add'>+</div><div class='add'>+	memset(&amp;priv-&gt;bec, 0x0, sizeof(priv-&gt;bec));</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_fifo_setup(priv);</div><div class='add'>+	rkcanfd_timestamp_init(priv);</div><div class='add'>+	rkcanfd_timestamp_start(priv);</div><div class='add'>+</div><div class='add'>+	rkcanfd_set_bittiming(priv);</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_interrupts_disable(priv);</div><div class='add'>+	rkcanfd_chip_set_work_mode(priv);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s: reg_mode=0x%08x\n", __func__,</div><div class='add'>+		   rkcanfd_read(priv, RKCANFD_REG_MODE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __rkcanfd_chip_stop(struct rkcanfd_priv *priv, const enum can_state state)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;can.state = state;</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_set_reset_mode(priv);</div><div class='add'>+	rkcanfd_chip_interrupts_disable(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_stop(struct rkcanfd_priv *priv, const enum can_state state)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;can.state = state;</div><div class='add'>+</div><div class='add'>+	rkcanfd_timestamp_stop(priv);</div><div class='add'>+	__rkcanfd_chip_stop(priv, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_chip_stop_sync(struct rkcanfd_priv *priv, const enum can_state state)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;can.state = state;</div><div class='add'>+</div><div class='add'>+	rkcanfd_timestamp_stop_sync(priv);</div><div class='add'>+	__rkcanfd_chip_stop(priv, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_set_mode(struct net_device *ndev,</div><div class='add'>+			    enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		rkcanfd_chip_start(priv);</div><div class='add'>+		rkcanfd_chip_interrupts_enable(priv);</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+rkcanfd_alloc_can_err_skb(struct rkcanfd_priv *priv,</div><div class='add'>+			  struct can_frame **cf, u32 *timestamp)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	*timestamp = rkcanfd_get_timestamp(priv);</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(priv-&gt;ndev, cf);</div><div class='add'>+	if (skb)</div><div class='add'>+		rkcanfd_skb_set_timestamp(priv, skb, *timestamp);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *rkcanfd_get_error_type_str(unsigned int type)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case RKCANFD_REG_ERROR_CODE_TYPE_BIT:</div><div class='add'>+		return "Bit";</div><div class='add'>+	case RKCANFD_REG_ERROR_CODE_TYPE_STUFF:</div><div class='add'>+		return "Stuff";</div><div class='add'>+	case RKCANFD_REG_ERROR_CODE_TYPE_FORM:</div><div class='add'>+		return "Form";</div><div class='add'>+	case RKCANFD_REG_ERROR_CODE_TYPE_ACK:</div><div class='add'>+		return "ACK";</div><div class='add'>+	case RKCANFD_REG_ERROR_CODE_TYPE_CRC:</div><div class='add'>+		return "CRC";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RKCAN_ERROR_CODE(reg_ec, code) \</div><div class='add'>+	((reg_ec) &amp; RKCANFD_REG_ERROR_CODE_##code ? __stringify(code) " " : "")</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rkcanfd_handle_error_int_reg_ec(struct rkcanfd_priv *priv, struct can_frame *cf,</div><div class='add'>+				const u32 reg_ec)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	u32 reg_state, reg_cmd;</div><div class='add'>+</div><div class='add'>+	type = FIELD_GET(RKCANFD_REG_ERROR_CODE_TYPE, reg_ec);</div><div class='add'>+	reg_cmd = rkcanfd_read(priv, RKCANFD_REG_CMD);</div><div class='add'>+	reg_state = rkcanfd_read(priv, RKCANFD_REG_STATE);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "%s Error in %s %s Phase: %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s(0x%08x) CMD=%u RX=%u TX=%u Error-Warning=%u Bus-Off=%u\n",</div><div class='add'>+		   rkcanfd_get_error_type_str(type),</div><div class='add'>+		   reg_ec &amp; RKCANFD_REG_ERROR_CODE_DIRECTION_RX ? "RX" : "TX",</div><div class='add'>+		   reg_ec &amp; RKCANFD_REG_ERROR_CODE_PHASE ? "Data" : "Arbitration",</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_OVERLOAD),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_ERROR),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_ACK),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_ACK_EOF),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_CRC),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_STUFF_COUNT),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_DATA),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_SOF_DLC),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, TX_IDLE),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_BUF_INT),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_SPACE),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_EOF),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_ACK_LIM),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_ACK),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_CRC_LIM),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_CRC),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_STUFF_COUNT),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_DATA),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_DLC),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_BRS_ESI),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_RES),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_FDF),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_ID2_RTR),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_SOF_IDE),</div><div class='add'>+		   RKCAN_ERROR_CODE(reg_ec, RX_IDLE),</div><div class='add'>+		   reg_ec, reg_cmd,</div><div class='add'>+		   !!(reg_state &amp; RKCANFD_REG_STATE_RX_PERIOD),</div><div class='add'>+		   !!(reg_state &amp; RKCANFD_REG_STATE_TX_PERIOD),</div><div class='add'>+		   !!(reg_state &amp; RKCANFD_REG_STATE_ERROR_WARNING_STATE),</div><div class='add'>+		   !!(reg_state &amp; RKCANFD_REG_STATE_BUS_OFF_STATE));</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+</div><div class='add'>+	if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_DIRECTION_RX)</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+	else</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+</div><div class='add'>+	if (!cf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_DIRECTION_RX) {</div><div class='add'>+		if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_SOF_IDE)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_SOF;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_ID2_RTR)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_RTR;</div><div class='add'>+		/* RKCANFD_REG_ERROR_CODE_RX_FDF */</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_RES)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_RES0;</div><div class='add'>+		/* RKCANFD_REG_ERROR_CODE_RX_BRS_ESI */</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_DLC)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_DLC;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_DATA)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_DATA;</div><div class='add'>+		/* RKCANFD_REG_ERROR_CODE_RX_STUFF_COUNT */</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_CRC)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_CRC_LIM)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK_DEL;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_ACK)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_ACK_LIM)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK_DEL;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_EOF)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_EOF;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_SPACE)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_EOF;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_RX_BUF_INT)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_INTERM;</div><div class='add'>+	} else {</div><div class='add'>+		cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+</div><div class='add'>+		if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TX_SOF_DLC)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_SOF;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TX_DATA)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_DATA;</div><div class='add'>+		/* RKCANFD_REG_ERROR_CODE_TX_STUFF_COUNT */</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TX_CRC)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TX_ACK_EOF)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK_DEL;</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TX_ACK)</div><div class='add'>+			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+		/* RKCANFD_REG_ERROR_CODE_TX_ERROR */</div><div class='add'>+		else if (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TX_OVERLOAD)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_OVERLOAD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (reg_ec &amp; RKCANFD_REG_ERROR_CODE_TYPE) {</div><div class='add'>+	case FIELD_PREP_CONST(RKCANFD_REG_ERROR_CODE_TYPE,</div><div class='add'>+			      RKCANFD_REG_ERROR_CODE_TYPE_BIT):</div><div class='add'>+</div><div class='add'>+		cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case FIELD_PREP_CONST(RKCANFD_REG_ERROR_CODE_TYPE,</div><div class='add'>+			      RKCANFD_REG_ERROR_CODE_TYPE_STUFF):</div><div class='add'>+		cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		break;</div><div class='add'>+	case FIELD_PREP_CONST(RKCANFD_REG_ERROR_CODE_TYPE,</div><div class='add'>+			      RKCANFD_REG_ERROR_CODE_TYPE_FORM):</div><div class='add'>+		cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		break;</div><div class='add'>+	case FIELD_PREP_CONST(RKCANFD_REG_ERROR_CODE_TYPE,</div><div class='add'>+			      RKCANFD_REG_ERROR_CODE_TYPE_ACK):</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+		break;</div><div class='add'>+	case FIELD_PREP_CONST(RKCANFD_REG_ERROR_CODE_TYPE,</div><div class='add'>+			      RKCANFD_REG_ERROR_CODE_TYPE_CRC):</div><div class='add'>+		cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_handle_error_int(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	u32 reg_ec, timestamp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	reg_ec = rkcanfd_read(priv, RKCANFD_REG_ERROR_CODE);</div><div class='add'>+</div><div class='add'>+	if (!reg_ec)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='add'>+		skb = rkcanfd_alloc_can_err_skb(priv, &amp;cf, &amp;timestamp);</div><div class='add'>+		if (cf) {</div><div class='add'>+			struct can_berr_counter bec;</div><div class='add'>+</div><div class='add'>+			rkcanfd_get_berr_counter_corrected(priv, &amp;bec);</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR | CAN_ERR_CNT;</div><div class='add'>+			cf-&gt;data[6] = bec.txerr;</div><div class='add'>+			cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rkcanfd_handle_error_int_reg_ec(priv, cf, reg_ec);</div><div class='add'>+</div><div class='add'>+	if (!cf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_handle_state_error_int(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	enum can_state new_state, rx_state, tx_state;</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rkcanfd_get_berr_counter_corrected(priv, &amp;bec);</div><div class='add'>+	can_state_get_by_berr_counter(ndev, &amp;bec, &amp;tx_state, &amp;rx_state);</div><div class='add'>+</div><div class='add'>+	new_state = max(tx_state, rx_state);</div><div class='add'>+	if (new_state == priv-&gt;can.state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* The skb allocation might fail, but can_change_state()</div><div class='add'>+	 * handles cf == NULL.</div><div class='add'>+	 */</div><div class='add'>+	skb = rkcanfd_alloc_can_err_skb(priv, &amp;cf, &amp;timestamp);</div><div class='add'>+	can_change_state(ndev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		rkcanfd_chip_stop(priv, CAN_STATE_BUS_OFF);</div><div class='add'>+		can_bus_off(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (new_state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rkcanfd_handle_rx_fifo_overflow_int(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_over_errors++;</div><div class='add'>+	stats-&gt;rx_errors++;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "RX-FIFO overflow\n");</div><div class='add'>+</div><div class='add'>+	skb = rkcanfd_alloc_can_err_skb(priv, &amp;cf, &amp;timestamp);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rkcanfd_get_berr_counter_corrected(priv, &amp;bec);</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_CRTL | CAN_ERR_CNT;</div><div class='add'>+	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+	cf-&gt;data[6] = bec.txerr;</div><div class='add'>+	cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define rkcanfd_handle(priv, irq, ...) \</div><div class='add'>+({ \</div><div class='add'>+	struct rkcanfd_priv *_priv = (priv); \</div><div class='add'>+	int err; \</div><div class='add'>+\</div><div class='add'>+	err = rkcanfd_handle_##irq(_priv, ## __VA_ARGS__); \</div><div class='add'>+	if (err) \</div><div class='add'>+		netdev_err(_priv-&gt;ndev, \</div><div class='add'>+			"IRQ handler rkcanfd_handle_%s() returned error: %pe\n", \</div><div class='add'>+			   __stringify(irq), ERR_PTR(err)); \</div><div class='add'>+	err; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static irqreturn_t rkcanfd_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = dev_id;</div><div class='add'>+	u32 reg_int_unmasked, reg_int;</div><div class='add'>+</div><div class='add'>+	reg_int_unmasked = rkcanfd_read(priv, RKCANFD_REG_INT);</div><div class='add'>+	reg_int = reg_int_unmasked &amp; ~priv-&gt;reg_int_mask_default;</div><div class='add'>+</div><div class='add'>+	if (!reg_int)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	/* First ACK then handle, to avoid lost-IRQ race condition on</div><div class='add'>+	 * fast re-occurring interrupts.</div><div class='add'>+	 */</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_INT, reg_int);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_RX_FINISH_INT)</div><div class='add'>+		rkcanfd_handle(priv, rx_int);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_ERROR_INT)</div><div class='add'>+		rkcanfd_handle(priv, error_int);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; (RKCANFD_REG_INT_BUS_OFF_INT |</div><div class='add'>+		       RKCANFD_REG_INT_PASSIVE_ERROR_INT |</div><div class='add'>+		       RKCANFD_REG_INT_ERROR_WARNING_INT) ||</div><div class='add'>+	    priv-&gt;can.state &gt; CAN_STATE_ERROR_ACTIVE)</div><div class='add'>+		rkcanfd_handle(priv, state_error_int);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_RX_FIFO_OVERFLOW_INT)</div><div class='add'>+		rkcanfd_handle(priv, rx_fifo_overflow_int);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; ~(RKCANFD_REG_INT_ALL_ERROR |</div><div class='add'>+			RKCANFD_REG_INT_RX_FIFO_OVERFLOW_INT |</div><div class='add'>+			RKCANFD_REG_INT_RX_FINISH_INT))</div><div class='add'>+		netdev_err(priv-&gt;ndev, "%s: int=0x%08x\n", __func__, reg_int);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_WAKEUP_INT)</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: WAKEUP_INT\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_TXE_FIFO_FULL_INT)</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: TXE_FIFO_FULL_INT\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_TXE_FIFO_OV_INT)</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: TXE_FIFO_OV_INT\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_BUS_OFF_RECOVERY_INT)</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: BUS_OFF_RECOVERY_INT\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_RX_FIFO_FULL_INT)</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: RX_FIFO_FULL_INT\n", __func__);</div><div class='add'>+</div><div class='add'>+	if (reg_int &amp; RKCANFD_REG_INT_OVERLOAD_INT)</div><div class='add'>+		netdev_info(priv-&gt;ndev, "%s: OVERLOAD_INT\n", __func__);</div><div class='add'>+</div><div class='add'>+	can_rx_offload_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = open_candev(ndev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pm_runtime_resume_and_get(ndev-&gt;dev.parent);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_close_candev;</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_start(priv);</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	err = request_irq(ndev-&gt;irq, rkcanfd_irq, IRQF_SHARED, ndev-&gt;name, priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_rkcanfd_chip_stop;</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_interrupts_enable(priv);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_rkcanfd_chip_stop:</div><div class='add'>+	rkcanfd_chip_stop_sync(priv, CAN_STATE_STOPPED);</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+out_close_candev:</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	rkcanfd_chip_interrupts_disable(priv);</div><div class='add'>+	free_irq(ndev-&gt;irq, priv);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	rkcanfd_chip_stop_sync(priv, CAN_STATE_STOPPED);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops rkcanfd_netdev_ops = {</div><div class='add'>+	.ndo_open = rkcanfd_open,</div><div class='add'>+	.ndo_stop = rkcanfd_stop,</div><div class='add'>+	.ndo_start_xmit = rkcanfd_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __maybe_unused rkcanfd_runtime_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	clk_bulk_disable_unprepare(priv-&gt;clks_num, priv-&gt;clks);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused rkcanfd_runtime_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return clk_bulk_prepare_enable(priv-&gt;clks_num, priv-&gt;clks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_register_done(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 dev_id;</div><div class='add'>+</div><div class='add'>+	dev_id = rkcanfd_read(priv, RKCANFD_REG_RTL_VERSION);</div><div class='add'>+</div><div class='add'>+	netdev_info(priv-&gt;ndev,</div><div class='add'>+		    "Rockchip-CANFD %s rev%lu.%lu (errata 0x%04x) found\n",</div><div class='add'>+		    rkcanfd_get_model_str(priv),</div><div class='add'>+		    FIELD_GET(RKCANFD_REG_RTL_VERSION_MAJOR, dev_id),</div><div class='add'>+		    FIELD_GET(RKCANFD_REG_RTL_VERSION_MINOR, dev_id),</div><div class='add'>+		    priv-&gt;devtype_data.quirks);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; RKCANFD_QUIRK_RK3568_ERRATUM_5 &amp;&amp;</div><div class='add'>+	    priv-&gt;can.clock.freq &lt; RKCANFD_ERRATUM_5_SYSCLOCK_HZ_MIN)</div><div class='add'>+		netdev_info(priv-&gt;ndev,</div><div class='add'>+			    "Erratum 5: CAN clock frequency (%luMHz) lower than known good (%luMHz), expect degraded performance\n",</div><div class='add'>+			    priv-&gt;can.clock.freq / MEGA,</div><div class='add'>+			    RKCANFD_ERRATUM_5_SYSCLOCK_HZ_MIN / MEGA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_register(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pm_runtime_enable(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	err = pm_runtime_resume_and_get(ndev-&gt;dev.parent);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_pm_runtime_disable;</div><div class='add'>+</div><div class='add'>+	rkcanfd_ethtool_init(priv);</div><div class='add'>+</div><div class='add'>+	err = register_candev(ndev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_pm_runtime_put_sync;</div><div class='add'>+</div><div class='add'>+	rkcanfd_register_done(priv);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_pm_runtime_put_sync:</div><div class='add'>+	pm_runtime_put_sync(ndev-&gt;dev.parent);</div><div class='add'>+out_pm_runtime_disable:</div><div class='add'>+	pm_runtime_disable(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void rkcanfd_unregister(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev	= priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	unregister_candev(ndev);</div><div class='add'>+	pm_runtime_disable(ndev-&gt;dev.parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id rkcanfd_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "rockchip,rk3568v2-canfd",</div><div class='add'>+		.data = &amp;rkcanfd_devtype_data_rk3568v2,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "rockchip,rk3568v3-canfd",</div><div class='add'>+		.data = &amp;rkcanfd_devtype_data_rk3568v3,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, rkcanfd_of_match);</div><div class='add'>+</div><div class='add'>+static int rkcanfd_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	const void *match;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_candev(sizeof(struct rkcanfd_priv), RKCANFD_TXFIFO_DEPTH);</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ndev-&gt;irq &lt; 0) {</div><div class='add'>+		err = ndev-&gt;irq;</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;clks_num = devm_clk_bulk_get_all(&amp;pdev-&gt;dev, &amp;priv-&gt;clks);</div><div class='add'>+	if (priv-&gt;clks_num &lt; 0) {</div><div class='add'>+		err = priv-&gt;clks_num;</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;regs = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;regs)) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;regs);</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;reset = devm_reset_control_array_get_exclusive(&amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset)) {</div><div class='add'>+		err = dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(priv-&gt;reset),</div><div class='add'>+				    "Failed to get reset line\n");</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;rkcanfd_netdev_ops;</div><div class='add'>+	ndev-&gt;flags |= IFF_ECHO;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+	priv-&gt;can.clock.freq = clk_get_rate(priv-&gt;clks[0].clk);</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;rkcanfd_bittiming_const;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;rkcanfd_data_bittiming_const;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='add'>+		CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+	priv-&gt;can.do_set_mode = rkcanfd_set_mode;</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = rkcanfd_get_berr_counter;</div><div class='add'>+	priv-&gt;ndev = ndev;</div><div class='add'>+</div><div class='add'>+	match = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (match) {</div><div class='add'>+		priv-&gt;devtype_data = *(struct rkcanfd_devtype_data *)match;</div><div class='add'>+		if (!(priv-&gt;devtype_data.quirks &amp; RKCANFD_QUIRK_CANFD_BROKEN))</div><div class='add'>+			priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_add_manual(ndev, &amp;priv-&gt;offload,</div><div class='add'>+					RKCANFD_NAPI_WEIGHT);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+</div><div class='add'>+	err = rkcanfd_register(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_can_rx_offload_del;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_can_rx_offload_del:</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+out_free_candev:</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	rkcanfd_unregister(priv);</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops rkcanfd_pm_ops = {</div><div class='add'>+	SET_RUNTIME_PM_OPS(rkcanfd_runtime_suspend,</div><div class='add'>+			   rkcanfd_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver rkcanfd_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = DEVICE_NAME,</div><div class='add'>+		.pm = &amp;rkcanfd_pm_ops,</div><div class='add'>+		.of_match_table = rkcanfd_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = rkcanfd_probe,</div><div class='add'>+	.remove = rkcanfd_remove,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(rkcanfd_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Marc Kleine-Budde &lt;mkl@pengutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Rockchip CAN-FD Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/can/rockchip/rockchip_canfd-ethtool.c b/drivers/net/can/rockchip/rockchip_canfd-ethtool.c<br/>new file mode 100644<br/>index 000000000000..5aeeef64a67a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/rockchip_canfd-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/rockchip_canfd-ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2023, 2024 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rockchip_canfd.h"</div><div class='add'>+</div><div class='add'>+enum rkcanfd_stats_type {</div><div class='add'>+	RKCANFD_STATS_TYPE_RX_FIFO_EMPTY_ERRORS,</div><div class='add'>+	RKCANFD_STATS_TYPE_TX_EXTENDED_AS_STANDARD_ERRORS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char rkcanfd_stats_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[RKCANFD_STATS_TYPE_RX_FIFO_EMPTY_ERRORS] = "rx_fifo_empty_errors",</div><div class='add'>+	[RKCANFD_STATS_TYPE_TX_EXTENDED_AS_STANDARD_ERRORS] = "tx_extended_as_standard_errors",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rkcanfd_ethtool_get_strings(struct net_device *ndev, u32 stringset, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		memcpy(buf, rkcanfd_stats_strings,</div><div class='add'>+		       sizeof(rkcanfd_stats_strings));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_ethtool_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return ARRAY_SIZE(rkcanfd_stats_strings);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rkcanfd_ethtool_get_ethtool_stats(struct net_device *ndev,</div><div class='add'>+				  struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct rkcanfd_stats *rkcanfd_stats;</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	rkcanfd_stats = &amp;priv-&gt;stats;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;rkcanfd_stats-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		data[RKCANFD_STATS_TYPE_RX_FIFO_EMPTY_ERRORS] =</div><div class='add'>+			u64_stats_read(&amp;rkcanfd_stats-&gt;rx_fifo_empty_errors);</div><div class='add'>+		data[RKCANFD_STATS_TYPE_TX_EXTENDED_AS_STANDARD_ERRORS] =</div><div class='add'>+			u64_stats_read(&amp;rkcanfd_stats-&gt;tx_extended_as_standard_errors);</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;rkcanfd_stats-&gt;syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops rkcanfd_ethtool_ops = {</div><div class='add'>+	.get_ts_info = can_ethtool_op_get_ts_info_hwts,</div><div class='add'>+	.get_strings = rkcanfd_ethtool_get_strings,</div><div class='add'>+	.get_sset_count = rkcanfd_ethtool_get_sset_count,</div><div class='add'>+	.get_ethtool_stats = rkcanfd_ethtool_get_ethtool_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void rkcanfd_ethtool_init(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;ndev-&gt;ethtool_ops = &amp;rkcanfd_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	u64_stats_init(&amp;priv-&gt;stats.syncp);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/rockchip/rockchip_canfd-rx.c b/drivers/net/can/rockchip/rockchip_canfd-rx.c<br/>new file mode 100644<br/>index 000000000000..475c0409e215<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/rockchip_canfd-rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/rockchip_canfd-rx.c</a></div><div class='hunk'>@@ -0,0 +1,299 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2023, 2024 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rockchip_canfd.h"</div><div class='add'>+</div><div class='add'>+static bool rkcanfd_can_frame_header_equal(const struct canfd_frame *const cfd1,</div><div class='add'>+					   const struct canfd_frame *const cfd2,</div><div class='add'>+					   const bool is_canfd)</div><div class='add'>+{</div><div class='add'>+	const u8 mask_flags = CANFD_BRS | CANFD_ESI | CANFD_FDF;</div><div class='add'>+	canid_t mask = CAN_EFF_FLAG;</div><div class='add'>+</div><div class='add'>+	if (canfd_sanitize_len(cfd1-&gt;len) != canfd_sanitize_len(cfd2-&gt;len))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!is_canfd)</div><div class='add'>+		mask |= CAN_RTR_FLAG;</div><div class='add'>+</div><div class='add'>+	if (cfd1-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		mask |= CAN_EFF_MASK;</div><div class='add'>+	else</div><div class='add'>+		mask |= CAN_SFF_MASK;</div><div class='add'>+</div><div class='add'>+	if ((cfd1-&gt;can_id &amp; mask) != (cfd2-&gt;can_id &amp; mask))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (is_canfd &amp;&amp;</div><div class='add'>+	    (cfd1-&gt;flags &amp; mask_flags) != (cfd2-&gt;flags &amp; mask_flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool rkcanfd_can_frame_data_equal(const struct canfd_frame *cfd1,</div><div class='add'>+					 const struct canfd_frame *cfd2,</div><div class='add'>+					 const bool is_canfd)</div><div class='add'>+{</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	if (!is_canfd &amp;&amp; (cfd1-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	len = canfd_sanitize_len(cfd1-&gt;len);</div><div class='add'>+</div><div class='add'>+	return !memcmp(cfd1-&gt;data, cfd2-&gt;data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+rkcanfd_fifo_header_to_cfd_header(const struct rkcanfd_priv *priv,</div><div class='add'>+				  const struct rkcanfd_fifo_header *header,</div><div class='add'>+				  struct canfd_frame *cfd)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = sizeof(*cfd) - sizeof(cfd-&gt;data);</div><div class='add'>+	u8 dlc;</div><div class='add'>+</div><div class='add'>+	if (header-&gt;frameinfo &amp; RKCANFD_REG_FD_FRAMEINFO_FRAME_FORMAT)</div><div class='add'>+		cfd-&gt;can_id = FIELD_GET(RKCANFD_REG_FD_ID_EFF, header-&gt;id) |</div><div class='add'>+			CAN_EFF_FLAG;</div><div class='add'>+	else</div><div class='add'>+		cfd-&gt;can_id = FIELD_GET(RKCANFD_REG_FD_ID_SFF, header-&gt;id);</div><div class='add'>+</div><div class='add'>+	dlc = FIELD_GET(RKCANFD_REG_FD_FRAMEINFO_DATA_LENGTH,</div><div class='add'>+			header-&gt;frameinfo);</div><div class='add'>+</div><div class='add'>+	/* CAN-FD */</div><div class='add'>+	if (header-&gt;frameinfo &amp; RKCANFD_REG_FD_FRAMEINFO_FDF) {</div><div class='add'>+		cfd-&gt;len = can_fd_dlc2len(dlc);</div><div class='add'>+</div><div class='add'>+		/* The cfd is not allocated by alloc_canfd_skb(), so</div><div class='add'>+		 * set CANFD_FDF here.</div><div class='add'>+		 */</div><div class='add'>+		cfd-&gt;flags |= CANFD_FDF;</div><div class='add'>+</div><div class='add'>+		if (header-&gt;frameinfo &amp; RKCANFD_REG_FD_FRAMEINFO_BRS)</div><div class='add'>+			cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+	} else {</div><div class='add'>+		cfd-&gt;len = can_cc_dlc2len(dlc);</div><div class='add'>+</div><div class='add'>+		if (header-&gt;frameinfo &amp; RKCANFD_REG_FD_FRAMEINFO_RTR) {</div><div class='add'>+			cfd-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+</div><div class='add'>+			return len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len + cfd-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_rxstx_filter(struct rkcanfd_priv *priv,</div><div class='add'>+				const struct canfd_frame *cfd_rx, const u32 ts,</div><div class='add'>+				bool *tx_done)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct rkcanfd_stats *rkcanfd_stats = &amp;priv-&gt;stats;</div><div class='add'>+	const struct canfd_frame *cfd_nominal;</div><div class='add'>+	const struct sk_buff *skb;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+</div><div class='add'>+	tx_tail = rkcanfd_get_tx_tail(priv);</div><div class='add'>+	skb = priv-&gt;can.echo_skb[tx_tail];</div><div class='add'>+	if (!skb) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "%s: echo_skb[%u]=NULL tx_head=0x%08x tx_tail=0x%08x\n",</div><div class='add'>+			   __func__, tx_tail,</div><div class='add'>+			   priv-&gt;tx_head, priv-&gt;tx_tail);</div><div class='add'>+</div><div class='add'>+		return -ENOMSG;</div><div class='add'>+	}</div><div class='add'>+	cfd_nominal = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	/* We RX'ed a frame identical to our pending TX frame. */</div><div class='add'>+	if (rkcanfd_can_frame_header_equal(cfd_rx, cfd_nominal,</div><div class='add'>+					   cfd_rx-&gt;flags &amp; CANFD_FDF) &amp;&amp;</div><div class='add'>+	    rkcanfd_can_frame_data_equal(cfd_rx, cfd_nominal,</div><div class='add'>+					 cfd_rx-&gt;flags &amp; CANFD_FDF)) {</div><div class='add'>+		unsigned int frame_len;</div><div class='add'>+</div><div class='add'>+		rkcanfd_handle_tx_done_one(priv, ts, &amp;frame_len);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(priv-&gt;tx_tail, priv-&gt;tx_tail + 1);</div><div class='add'>+		netif_subqueue_completed_wake(priv-&gt;ndev, 0, 1, frame_len,</div><div class='add'>+					      rkcanfd_get_effective_tx_free(priv),</div><div class='add'>+					      RKCANFD_TX_START_THRESHOLD);</div><div class='add'>+</div><div class='add'>+		*tx_done = true;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;devtype_data.quirks &amp; RKCANFD_QUIRK_RK3568_ERRATUM_6))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Erratum 6: Extended frames may be send as standard frames.</div><div class='add'>+	 *</div><div class='add'>+	 * Not affected if:</div><div class='add'>+	 * - TX'ed a standard frame -or-</div><div class='add'>+	 * - RX'ed an extended frame</div><div class='add'>+	 */</div><div class='add'>+	if (!(cfd_nominal-&gt;can_id &amp; CAN_EFF_FLAG) ||</div><div class='add'>+	    (cfd_rx-&gt;can_id &amp; CAN_EFF_FLAG))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Not affected if:</div><div class='add'>+	 * - standard part and RTR flag of the TX'ed frame</div><div class='add'>+	 *   is not equal the CAN-ID and RTR flag of the RX'ed frame.</div><div class='add'>+	 */</div><div class='add'>+	if ((cfd_nominal-&gt;can_id &amp; (CAN_RTR_FLAG | CAN_SFF_MASK)) !=</div><div class='add'>+	    (cfd_rx-&gt;can_id &amp; (CAN_RTR_FLAG | CAN_SFF_MASK)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Not affected if:</div><div class='add'>+	 * - length is not the same</div><div class='add'>+	 */</div><div class='add'>+	if (cfd_nominal-&gt;len != cfd_rx-&gt;len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Not affected if:</div><div class='add'>+	 * - the data of non RTR frames is different</div><div class='add'>+	 */</div><div class='add'>+	if (!(cfd_nominal-&gt;can_id &amp; CAN_RTR_FLAG) &amp;&amp;</div><div class='add'>+	    memcmp(cfd_nominal-&gt;data, cfd_rx-&gt;data, cfd_nominal-&gt;len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Affected by Erratum 6 */</div><div class='add'>+	u64_stats_update_begin(&amp;rkcanfd_stats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;rkcanfd_stats-&gt;tx_extended_as_standard_errors);</div><div class='add'>+	u64_stats_update_end(&amp;rkcanfd_stats-&gt;syncp);</div><div class='add'>+</div><div class='add'>+	/* Manual handling of CAN Bus Error counters. See</div><div class='add'>+	 * rkcanfd_get_corrected_berr_counter() for detailed</div><div class='add'>+	 * explanation.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;bec.txerr)</div><div class='add'>+		priv-&gt;bec.txerr--;</div><div class='add'>+</div><div class='add'>+	*tx_done = true;</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+	stats-&gt;tx_errors++;</div><div class='add'>+</div><div class='add'>+	rkcanfd_xmit_retry(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+rkcanfd_fifo_header_empty(const struct rkcanfd_fifo_header *header)</div><div class='add'>+{</div><div class='add'>+	/* Erratum 5: If the FIFO is empty, we read the same value for</div><div class='add'>+	 * all elements.</div><div class='add'>+	 */</div><div class='add'>+	return header-&gt;frameinfo == header-&gt;id &amp;&amp;</div><div class='add'>+		header-&gt;frameinfo == header-&gt;ts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rkcanfd_handle_rx_int_one(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct canfd_frame cfd[1] = { }, *skb_cfd;</div><div class='add'>+	struct rkcanfd_fifo_header header[1] = { };</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* read header into separate struct and convert it later */</div><div class='add'>+	rkcanfd_read_rep(priv, RKCANFD_REG_RX_FIFO_RDATA,</div><div class='add'>+			 header, sizeof(*header));</div><div class='add'>+	/* read data directly into cfd */</div><div class='add'>+	rkcanfd_read_rep(priv, RKCANFD_REG_RX_FIFO_RDATA,</div><div class='add'>+			 cfd-&gt;data, sizeof(cfd-&gt;data));</div><div class='add'>+</div><div class='add'>+	/* Erratum 5: Counters for TXEFIFO and RXFIFO may be wrong */</div><div class='add'>+	if (rkcanfd_fifo_header_empty(header)) {</div><div class='add'>+		struct rkcanfd_stats *rkcanfd_stats = &amp;priv-&gt;stats;</div><div class='add'>+</div><div class='add'>+		u64_stats_update_begin(&amp;rkcanfd_stats-&gt;syncp);</div><div class='add'>+		u64_stats_inc(&amp;rkcanfd_stats-&gt;rx_fifo_empty_errors);</div><div class='add'>+		u64_stats_update_end(&amp;rkcanfd_stats-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = rkcanfd_fifo_header_to_cfd_header(priv, header, cfd);</div><div class='add'>+</div><div class='add'>+	/* Drop any received CAN-FD frames if CAN-FD mode is not</div><div class='add'>+	 * requested.</div><div class='add'>+	 */</div><div class='add'>+	if (header-&gt;frameinfo &amp; RKCANFD_REG_FD_FRAMEINFO_FDF &amp;&amp;</div><div class='add'>+	    !(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)) {</div><div class='add'>+		stats-&gt;rx_dropped++;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rkcanfd_get_tx_pending(priv)) {</div><div class='add'>+		bool tx_done = false;</div><div class='add'>+</div><div class='add'>+		err = rkcanfd_rxstx_filter(priv, cfd, header-&gt;ts, &amp;tx_done);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		if (tx_done &amp;&amp; !(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Manual handling of CAN Bus Error counters. See</div><div class='add'>+	 * rkcanfd_get_corrected_berr_counter() for detailed</div><div class='add'>+	 * explanation.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;bec.rxerr)</div><div class='add'>+		priv-&gt;bec.rxerr = min(CAN_ERROR_PASSIVE_THRESHOLD,</div><div class='add'>+				      priv-&gt;bec.rxerr) - 1;</div><div class='add'>+</div><div class='add'>+	if (header-&gt;frameinfo &amp; RKCANFD_REG_FD_FRAMEINFO_FDF)</div><div class='add'>+		skb = alloc_canfd_skb(priv-&gt;ndev, &amp;skb_cfd);</div><div class='add'>+	else</div><div class='add'>+		skb = alloc_can_skb(priv-&gt;ndev, (struct can_frame **)&amp;skb_cfd);</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		stats-&gt;rx_dropped++;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(skb_cfd, cfd, len);</div><div class='add'>+	rkcanfd_skb_set_timestamp(priv, skb, header-&gt;ts);</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, header-&gt;ts);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+rkcanfd_rx_fifo_get_len(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const u32 reg = rkcanfd_read(priv, RKCANFD_REG_RX_FIFO_CTRL);</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(RKCANFD_REG_RX_FIFO_CTRL_RX_FIFO_CNT, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rkcanfd_handle_rx_int(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	while ((len = rkcanfd_rx_fifo_get_len(priv))) {</div><div class='add'>+		err = rkcanfd_handle_rx_int_one(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/rockchip/rockchip_canfd-timestamp.c b/drivers/net/can/rockchip/rockchip_canfd-timestamp.c<br/>new file mode 100644<br/>index 000000000000..72774cd2f94b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/rockchip_canfd-timestamp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/rockchip_canfd-timestamp.c</a></div><div class='hunk'>@@ -0,0 +1,105 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2023, 2024 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rockchip_canfd.h"</div><div class='add'>+</div><div class='add'>+static u64 rkcanfd_timestamp_read(struct cyclecounter *cc)</div><div class='add'>+{</div><div class='add'>+	const struct rkcanfd_priv *priv = container_of(cc, struct rkcanfd_priv, cc);</div><div class='add'>+</div><div class='add'>+	return rkcanfd_get_timestamp(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_skb_set_timestamp(const struct rkcanfd_priv *priv,</div><div class='add'>+			       struct sk_buff *skb, const u32 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb);</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	ns = timecounter_cyc2time(&amp;priv-&gt;tc, timestamp);</div><div class='add'>+</div><div class='add'>+	hwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_timestamp_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	const struct delayed_work *delayed_work = to_delayed_work(work);</div><div class='add'>+	struct rkcanfd_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = container_of(delayed_work, struct rkcanfd_priv, timestamp);</div><div class='add'>+	timecounter_read(&amp;priv-&gt;tc);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;timestamp, priv-&gt;work_delay_jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_timestamp_init(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	struct cyclecounter *cc = &amp;priv-&gt;cc;</div><div class='add'>+	u32 bitrate, div, reg, rate;</div><div class='add'>+	u64 work_delay_ns;</div><div class='add'>+	u64 max_cycles;</div><div class='add'>+</div><div class='add'>+	/* At the standard clock rate of 300Mhz on the rk3658, the 32</div><div class='add'>+	 * bit timer overflows every 14s. This means that we have to</div><div class='add'>+	 * poll it quite often to avoid missing a wrap around.</div><div class='add'>+	 *</div><div class='add'>+	 * Divide it down to a reasonable rate, at least twice the bit</div><div class='add'>+	 * rate.</div><div class='add'>+	 */</div><div class='add'>+	bitrate = max(bt-&gt;bitrate, dbt-&gt;bitrate);</div><div class='add'>+	div = min(DIV_ROUND_UP(priv-&gt;can.clock.freq, bitrate * 2),</div><div class='add'>+		  FIELD_MAX(RKCANFD_REG_TIMESTAMP_CTRL_TIME_BASE_COUNTER_PRESCALE) + 1);</div><div class='add'>+</div><div class='add'>+	reg = FIELD_PREP(RKCANFD_REG_TIMESTAMP_CTRL_TIME_BASE_COUNTER_PRESCALE,</div><div class='add'>+			 div - 1) |</div><div class='add'>+		RKCANFD_REG_TIMESTAMP_CTRL_TIME_BASE_COUNTER_ENABLE;</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_TIMESTAMP_CTRL, reg);</div><div class='add'>+</div><div class='add'>+	cc-&gt;read = rkcanfd_timestamp_read;</div><div class='add'>+	cc-&gt;mask = CYCLECOUNTER_MASK(32);</div><div class='add'>+</div><div class='add'>+	rate = priv-&gt;can.clock.freq / div;</div><div class='add'>+	clocks_calc_mult_shift(&amp;cc-&gt;mult, &amp;cc-&gt;shift, rate, NSEC_PER_SEC,</div><div class='add'>+			       RKCANFD_TIMESTAMP_WORK_MAX_DELAY_SEC);</div><div class='add'>+</div><div class='add'>+	max_cycles = div_u64(ULLONG_MAX, cc-&gt;mult);</div><div class='add'>+	max_cycles = min(max_cycles, cc-&gt;mask);</div><div class='add'>+	work_delay_ns = clocksource_cyc2ns(max_cycles, cc-&gt;mult, cc-&gt;shift);</div><div class='add'>+	priv-&gt;work_delay_jiffies = div_u64(work_delay_ns, 3u * NSEC_PER_SEC / HZ);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;timestamp, rkcanfd_timestamp_work);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev, "clock=%lu.%02luMHz bitrate=%lu.%02luMBit/s div=%u rate=%lu.%02luMHz mult=%u shift=%u delay=%lus\n",</div><div class='add'>+		   priv-&gt;can.clock.freq / MEGA,</div><div class='add'>+		   priv-&gt;can.clock.freq % MEGA / KILO / 10,</div><div class='add'>+		   bitrate / MEGA,</div><div class='add'>+		   bitrate % MEGA / KILO / 100,</div><div class='add'>+		   div,</div><div class='add'>+		   rate / MEGA,</div><div class='add'>+		   rate % MEGA / KILO / 10,</div><div class='add'>+		   cc-&gt;mult, cc-&gt;shift,</div><div class='add'>+		   priv-&gt;work_delay_jiffies / HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_timestamp_start(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	timecounter_init(&amp;priv-&gt;tc, &amp;priv-&gt;cc, ktime_get_real_ns());</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;timestamp, priv-&gt;work_delay_jiffies);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_timestamp_stop(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_timestamp_stop_sync(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;timestamp);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/rockchip/rockchip_canfd-tx.c b/drivers/net/can/rockchip/rockchip_canfd-tx.c<br/>new file mode 100644<br/>index 000000000000..12200dcfd338<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/rockchip_canfd-tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/rockchip_canfd-tx.c</a></div><div class='hunk'>@@ -0,0 +1,167 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2023, 2024 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rockchip_canfd.h"</div><div class='add'>+</div><div class='add'>+static bool rkcanfd_tx_tail_is_eff(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct canfd_frame *cfd;</div><div class='add'>+	const struct sk_buff *skb;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+</div><div class='add'>+	if (!rkcanfd_get_tx_pending(priv))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	tx_tail = rkcanfd_get_tx_tail(priv);</div><div class='add'>+	skb = priv-&gt;can.echo_skb[tx_tail];</div><div class='add'>+	if (!skb) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "%s: echo_skb[%u]=NULL tx_head=0x%08x tx_tail=0x%08x\n",</div><div class='add'>+			   __func__, tx_tail,</div><div class='add'>+			   priv-&gt;tx_head, priv-&gt;tx_tail);</div><div class='add'>+</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	return cfd-&gt;can_id &amp; CAN_EFF_FLAG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int rkcanfd_get_effective_tx_free(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; RKCANFD_QUIRK_RK3568_ERRATUM_6 &amp;&amp;</div><div class='add'>+	    rkcanfd_tx_tail_is_eff(priv))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return rkcanfd_get_tx_free(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rkcanfd_start_xmit_write_cmd(const struct rkcanfd_priv *priv,</div><div class='add'>+					 const u32 reg_cmd)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; RKCANFD_QUIRK_RK3568_ERRATUM_12)</div><div class='add'>+		rkcanfd_write(priv, RKCANFD_REG_MODE, priv-&gt;reg_mode_default |</div><div class='add'>+			      RKCANFD_REG_MODE_SPACE_RX_MODE);</div><div class='add'>+</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_CMD, reg_cmd);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; RKCANFD_QUIRK_RK3568_ERRATUM_12)</div><div class='add'>+		rkcanfd_write(priv, RKCANFD_REG_MODE, priv-&gt;reg_mode_default);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_xmit_retry(struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const unsigned int tx_head = rkcanfd_get_tx_head(priv);</div><div class='add'>+	const u32 reg_cmd = RKCANFD_REG_CMD_TX_REQ(tx_head);</div><div class='add'>+</div><div class='add'>+	rkcanfd_start_xmit_write_cmd(priv, reg_cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netdev_tx_t rkcanfd_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct rkcanfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 reg_frameinfo, reg_id, reg_cmd;</div><div class='add'>+	unsigned int tx_head, frame_len;</div><div class='add'>+	const struct canfd_frame *cfd;</div><div class='add'>+	int err;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	if (!netif_subqueue_maybe_stop(priv-&gt;ndev, 0,</div><div class='add'>+				       rkcanfd_get_effective_tx_free(priv),</div><div class='add'>+				       RKCANFD_TX_STOP_THRESHOLD,</div><div class='add'>+				       RKCANFD_TX_START_THRESHOLD)) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_info(priv-&gt;ndev,</div><div class='add'>+				    "Stopping tx-queue (tx_head=0x%08x, tx_tail=0x%08x, tx_pending=%d)\n",</div><div class='add'>+				    priv-&gt;tx_head, priv-&gt;tx_tail,</div><div class='add'>+				    rkcanfd_get_tx_pending(priv));</div><div class='add'>+</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		reg_frameinfo = RKCANFD_REG_FD_FRAMEINFO_FRAME_FORMAT;</div><div class='add'>+		reg_id = FIELD_PREP(RKCANFD_REG_FD_ID_EFF, cfd-&gt;can_id);</div><div class='add'>+	} else {</div><div class='add'>+		reg_frameinfo = 0;</div><div class='add'>+		reg_id = FIELD_PREP(RKCANFD_REG_FD_ID_SFF, cfd-&gt;can_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		reg_frameinfo |= RKCANFD_REG_FD_FRAMEINFO_RTR;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		reg_frameinfo |= RKCANFD_REG_FD_FRAMEINFO_FDF;</div><div class='add'>+</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			reg_frameinfo |= RKCANFD_REG_FD_FRAMEINFO_BRS;</div><div class='add'>+</div><div class='add'>+		reg_frameinfo |= FIELD_PREP(RKCANFD_REG_FD_FRAMEINFO_DATA_LENGTH,</div><div class='add'>+					    can_fd_len2dlc(cfd-&gt;len));</div><div class='add'>+	} else {</div><div class='add'>+		reg_frameinfo |= FIELD_PREP(RKCANFD_REG_FD_FRAMEINFO_DATA_LENGTH,</div><div class='add'>+					    cfd-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_head = rkcanfd_get_tx_head(priv);</div><div class='add'>+	reg_cmd = RKCANFD_REG_CMD_TX_REQ(tx_head);</div><div class='add'>+</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_FD_TXFRAMEINFO, reg_frameinfo);</div><div class='add'>+	rkcanfd_write(priv, RKCANFD_REG_FD_TXID, reg_id);</div><div class='add'>+	for (i = 0; i &lt; cfd-&gt;len; i += 4)</div><div class='add'>+		rkcanfd_write(priv, RKCANFD_REG_FD_TXDATA0 + i,</div><div class='add'>+			      *(u32 *)(cfd-&gt;data + i));</div><div class='add'>+</div><div class='add'>+	frame_len = can_skb_get_frame_len(skb);</div><div class='add'>+	err = can_put_echo_skb(skb, ndev, tx_head, frame_len);</div><div class='add'>+	if (!err)</div><div class='add'>+		netdev_sent_queue(priv-&gt;ndev, frame_len);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(priv-&gt;tx_head, priv-&gt;tx_head + 1);</div><div class='add'>+</div><div class='add'>+	rkcanfd_start_xmit_write_cmd(priv, reg_cmd);</div><div class='add'>+</div><div class='add'>+	netif_subqueue_maybe_stop(priv-&gt;ndev, 0,</div><div class='add'>+				  rkcanfd_get_effective_tx_free(priv),</div><div class='add'>+				  RKCANFD_TX_STOP_THRESHOLD,</div><div class='add'>+				  RKCANFD_TX_START_THRESHOLD);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_handle_tx_done_one(struct rkcanfd_priv *priv, const u32 ts,</div><div class='add'>+				unsigned int *frame_len_p)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	tx_tail = rkcanfd_get_tx_tail(priv);</div><div class='add'>+	skb = priv-&gt;can.echo_skb[tx_tail];</div><div class='add'>+</div><div class='add'>+	/* Manual handling of CAN Bus Error counters. See</div><div class='add'>+	 * rkcanfd_get_corrected_berr_counter() for detailed</div><div class='add'>+	 * explanation.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;bec.txerr)</div><div class='add'>+		priv-&gt;bec.txerr--;</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		rkcanfd_skb_set_timestamp(priv, skb, ts);</div><div class='add'>+	stats-&gt;tx_bytes +=</div><div class='add'>+		can_rx_offload_get_echo_skb_queue_timestamp(&amp;priv-&gt;offload,</div><div class='add'>+							    tx_tail, ts,</div><div class='add'>+							    frame_len_p);</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/rockchip/rockchip_canfd.h b/drivers/net/can/rockchip/rockchip_canfd.h<br/>new file mode 100644<br/>index 000000000000..93131c7d7f54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rockchip/rockchip_canfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/rockchip/rockchip_canfd.h</a></div><div class='hunk'>@@ -0,0 +1,553 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023, 2024 Pengutronix,</div><div class='add'>+ *               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _ROCKCHIP_CANFD_H</div><div class='add'>+#define _ROCKCHIP_CANFD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/u64_stats_sync.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_MODE 0x000</div><div class='add'>+#define RKCANFD_REG_MODE_CAN_FD_MODE_ENABLE BIT(15)</div><div class='add'>+#define RKCANFD_REG_MODE_DPEE BIT(14)</div><div class='add'>+#define RKCANFD_REG_MODE_BRSD BIT(13)</div><div class='add'>+#define RKCANFD_REG_MODE_SPACE_RX_MODE BIT(12)</div><div class='add'>+#define RKCANFD_REG_MODE_AUTO_BUS_ON BIT(11)</div><div class='add'>+#define RKCANFD_REG_MODE_AUTO_RETX_MODE BIT(10)</div><div class='add'>+#define RKCANFD_REG_MODE_OVLD_MODE BIT(9)</div><div class='add'>+#define RKCANFD_REG_MODE_COVER_MODE BIT(8)</div><div class='add'>+#define RKCANFD_REG_MODE_RXSORT_MODE BIT(7)</div><div class='add'>+#define RKCANFD_REG_MODE_TXORDER_MODE BIT(6)</div><div class='add'>+#define RKCANFD_REG_MODE_RXSTX_MODE BIT(5)</div><div class='add'>+#define RKCANFD_REG_MODE_LBACK_MODE BIT(4)</div><div class='add'>+#define RKCANFD_REG_MODE_SILENT_MODE BIT(3)</div><div class='add'>+#define RKCANFD_REG_MODE_SELF_TEST BIT(2)</div><div class='add'>+#define RKCANFD_REG_MODE_SLEEP_MODE BIT(1)</div><div class='add'>+#define RKCANFD_REG_MODE_WORK_MODE BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_CMD 0x004</div><div class='add'>+#define RKCANFD_REG_CMD_TX1_REQ BIT(1)</div><div class='add'>+#define RKCANFD_REG_CMD_TX0_REQ BIT(0)</div><div class='add'>+#define RKCANFD_REG_CMD_TX_REQ(i) (RKCANFD_REG_CMD_TX0_REQ &lt;&lt; (i))</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_STATE 0x008</div><div class='add'>+#define RKCANFD_REG_STATE_SLEEP_STATE BIT(6)</div><div class='add'>+#define RKCANFD_REG_STATE_BUS_OFF_STATE BIT(5)</div><div class='add'>+#define RKCANFD_REG_STATE_ERROR_WARNING_STATE BIT(4)</div><div class='add'>+#define RKCANFD_REG_STATE_TX_PERIOD BIT(3)</div><div class='add'>+#define RKCANFD_REG_STATE_RX_PERIOD BIT(2)</div><div class='add'>+#define RKCANFD_REG_STATE_TX_BUFFER_FULL BIT(1)</div><div class='add'>+#define RKCANFD_REG_STATE_RX_BUFFER_FULL BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_INT 0x00c</div><div class='add'>+#define RKCANFD_REG_INT_WAKEUP_INT BIT(14)</div><div class='add'>+#define RKCANFD_REG_INT_TXE_FIFO_FULL_INT BIT(13)</div><div class='add'>+#define RKCANFD_REG_INT_TXE_FIFO_OV_INT BIT(12)</div><div class='add'>+#define RKCANFD_REG_INT_TIMESTAMP_COUNTER_OVERFLOW_INT BIT(11)</div><div class='add'>+#define RKCANFD_REG_INT_BUS_OFF_RECOVERY_INT BIT(10)</div><div class='add'>+#define RKCANFD_REG_INT_BUS_OFF_INT BIT(9)</div><div class='add'>+#define RKCANFD_REG_INT_RX_FIFO_OVERFLOW_INT BIT(8)</div><div class='add'>+#define RKCANFD_REG_INT_RX_FIFO_FULL_INT BIT(7)</div><div class='add'>+#define RKCANFD_REG_INT_ERROR_INT BIT(6)</div><div class='add'>+#define RKCANFD_REG_INT_TX_ARBIT_FAIL_INT BIT(5)</div><div class='add'>+#define RKCANFD_REG_INT_PASSIVE_ERROR_INT BIT(4)</div><div class='add'>+#define RKCANFD_REG_INT_OVERLOAD_INT BIT(3)</div><div class='add'>+#define RKCANFD_REG_INT_ERROR_WARNING_INT BIT(2)</div><div class='add'>+#define RKCANFD_REG_INT_TX_FINISH_INT BIT(1)</div><div class='add'>+#define RKCANFD_REG_INT_RX_FINISH_INT BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_INT_ALL \</div><div class='add'>+	(RKCANFD_REG_INT_WAKEUP_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_TXE_FIFO_FULL_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_TXE_FIFO_OV_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_TIMESTAMP_COUNTER_OVERFLOW_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_BUS_OFF_RECOVERY_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_BUS_OFF_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_RX_FIFO_OVERFLOW_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_RX_FIFO_FULL_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_ERROR_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_TX_ARBIT_FAIL_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_PASSIVE_ERROR_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_OVERLOAD_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_ERROR_WARNING_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_TX_FINISH_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_RX_FINISH_INT)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_INT_ALL_ERROR \</div><div class='add'>+	(RKCANFD_REG_INT_BUS_OFF_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_ERROR_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_PASSIVE_ERROR_INT | \</div><div class='add'>+	 RKCANFD_REG_INT_ERROR_WARNING_INT)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_INT_MASK 0x010</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_DMA_CTL 0x014</div><div class='add'>+#define RKCANFD_REG_DMA_CTL_DMA_RX_MODE BIT(1)</div><div class='add'>+#define RKCANFD_REG_DMA_CTL_DMA_TX_MODE BIT(9)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_BITTIMING 0x018</div><div class='add'>+#define RKCANFD_REG_BITTIMING_SAMPLE_MODE BIT(16)</div><div class='add'>+#define RKCANFD_REG_BITTIMING_SJW GENMASK(15, 14)</div><div class='add'>+#define RKCANFD_REG_BITTIMING_BRP GENMASK(13, 8)</div><div class='add'>+#define RKCANFD_REG_BITTIMING_TSEG2 GENMASK(6, 4)</div><div class='add'>+#define RKCANFD_REG_BITTIMING_TSEG1 GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_ARBITFAIL 0x028</div><div class='add'>+#define RKCANFD_REG_ARBITFAIL_ARBIT_FAIL_CODE GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+/* Register seems to be clear or read */</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE 0x02c</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_PHASE BIT(29)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TYPE GENMASK(28, 26)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TYPE_BIT 0x0</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TYPE_STUFF 0x1</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TYPE_FORM 0x2</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TYPE_ACK 0x3</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TYPE_CRC 0x4</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_DIRECTION_RX BIT(25)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX GENMASK(24, 16)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_OVERLOAD BIT(24)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_ERROR BIT(23)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_ACK BIT(22)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_ACK_EOF BIT(21)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_CRC BIT(20)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_STUFF_COUNT BIT(19)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_DATA BIT(18)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_SOF_DLC BIT(17)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_TX_IDLE BIT(16)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX GENMASK(15, 0)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_BUF_INT BIT(15)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_SPACE BIT(14)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_EOF BIT(13)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_ACK_LIM BIT(12)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_ACK BIT(11)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_CRC_LIM BIT(10)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_CRC BIT(9)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_STUFF_COUNT BIT(8)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_DATA BIT(7)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_DLC BIT(6)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_BRS_ESI BIT(5)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_RES BIT(4)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_FDF BIT(3)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_ID2_RTR BIT(2)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_SOF_IDE BIT(1)</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_RX_IDLE BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_ERROR_CODE_NOACK \</div><div class='add'>+	(FIELD_PREP(RKCANFD_REG_ERROR_CODE_TYPE, \</div><div class='add'>+		    RKCANFD_REG_ERROR_CODE_TYPE_ACK) | \</div><div class='add'>+	 RKCANFD_REG_ERROR_CODE_TX_ACK_EOF | \</div><div class='add'>+	 RKCANFD_REG_ERROR_CODE_RX_ACK)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_RXERRORCNT 0x034</div><div class='add'>+#define RKCANFD_REG_RXERRORCNT_RX_ERR_CNT GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TXERRORCNT 0x038</div><div class='add'>+#define RKCANFD_REG_TXERRORCNT_TX_ERR_CNT GENMASK(8, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_IDCODE 0x03c</div><div class='add'>+#define RKCANFD_REG_IDCODE_STANDARD_FRAME_ID GENMASK(10, 0)</div><div class='add'>+#define RKCANFD_REG_IDCODE_EXTENDED_FRAME_ID GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_IDMASK 0x040</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TXFRAMEINFO 0x050</div><div class='add'>+#define RKCANFD_REG_FRAMEINFO_FRAME_FORMAT BIT(7)</div><div class='add'>+#define RKCANFD_REG_FRAMEINFO_RTR BIT(6)</div><div class='add'>+#define RKCANFD_REG_FRAMEINFO_DATA_LENGTH GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TXID 0x054</div><div class='add'>+#define RKCANFD_REG_TXID_TX_ID GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TXDATA0 0x058</div><div class='add'>+#define RKCANFD_REG_TXDATA1 0x05C</div><div class='add'>+#define RKCANFD_REG_RXFRAMEINFO 0x060</div><div class='add'>+#define RKCANFD_REG_RXID 0x064</div><div class='add'>+#define RKCANFD_REG_RXDATA0 0x068</div><div class='add'>+#define RKCANFD_REG_RXDATA1 0x06c</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_RTL_VERSION 0x070</div><div class='add'>+#define RKCANFD_REG_RTL_VERSION_MAJOR GENMASK(7, 4)</div><div class='add'>+#define RKCANFD_REG_RTL_VERSION_MINOR GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_FD_NOMINAL_BITTIMING 0x100</div><div class='add'>+#define RKCANFD_REG_FD_NOMINAL_BITTIMING_SAMPLE_MODE BIT(31)</div><div class='add'>+#define RKCANFD_REG_FD_NOMINAL_BITTIMING_SJW GENMASK(30, 24)</div><div class='add'>+#define RKCANFD_REG_FD_NOMINAL_BITTIMING_BRP GENMASK(23, 16)</div><div class='add'>+#define RKCANFD_REG_FD_NOMINAL_BITTIMING_TSEG2 GENMASK(14, 8)</div><div class='add'>+#define RKCANFD_REG_FD_NOMINAL_BITTIMING_TSEG1 GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_FD_DATA_BITTIMING 0x104</div><div class='add'>+#define RKCANFD_REG_FD_DATA_BITTIMING_SAMPLE_MODE BIT(21)</div><div class='add'>+#define RKCANFD_REG_FD_DATA_BITTIMING_SJW GENMASK(20, 17)</div><div class='add'>+#define RKCANFD_REG_FD_DATA_BITTIMING_BRP GENMASK(16, 9)</div><div class='add'>+#define RKCANFD_REG_FD_DATA_BITTIMING_TSEG2 GENMASK(8, 5)</div><div class='add'>+#define RKCANFD_REG_FD_DATA_BITTIMING_TSEG1 GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION 0x108</div><div class='add'>+#define RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION_TDC_OFFSET GENMASK(6, 1)</div><div class='add'>+#define RKCANFD_REG_TRANSMIT_DELAY_COMPENSATION_TDC_ENABLE BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TIMESTAMP_CTRL 0x10c</div><div class='add'>+/* datasheet says 6:1, which is wrong */</div><div class='add'>+#define RKCANFD_REG_TIMESTAMP_CTRL_TIME_BASE_COUNTER_PRESCALE GENMASK(5, 1)</div><div class='add'>+#define RKCANFD_REG_TIMESTAMP_CTRL_TIME_BASE_COUNTER_ENABLE BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TIMESTAMP 0x110</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_TXEVENT_FIFO_CTRL 0x114</div><div class='add'>+#define RKCANFD_REG_TXEVENT_FIFO_CTRL_TXE_FIFO_CNT GENMASK(8, 5)</div><div class='add'>+#define RKCANFD_REG_TXEVENT_FIFO_CTRL_TXE_FIFO_WATERMARK GENMASK(4, 1)</div><div class='add'>+#define RKCANFD_REG_TXEVENT_FIFO_CTRL_TXE_FIFO_ENABLE BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_RX_FIFO_CTRL 0x118</div><div class='add'>+#define RKCANFD_REG_RX_FIFO_CTRL_RX_FIFO_CNT GENMASK(6, 4)</div><div class='add'>+#define RKCANFD_REG_RX_FIFO_CTRL_RX_FIFO_FULL_WATERMARK GENMASK(3, 1)</div><div class='add'>+#define RKCANFD_REG_RX_FIFO_CTRL_RX_FIFO_ENABLE BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_AFC_CTRL 0x11c</div><div class='add'>+#define RKCANFD_REG_AFC_CTRL_UAF5 BIT(4)</div><div class='add'>+#define RKCANFD_REG_AFC_CTRL_UAF4 BIT(3)</div><div class='add'>+#define RKCANFD_REG_AFC_CTRL_UAF3 BIT(2)</div><div class='add'>+#define RKCANFD_REG_AFC_CTRL_UAF2 BIT(1)</div><div class='add'>+#define RKCANFD_REG_AFC_CTRL_UAF1 BIT(0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_IDCODE0 0x120</div><div class='add'>+#define RKCANFD_REG_IDMASK0 0x124</div><div class='add'>+#define RKCANFD_REG_IDCODE1 0x128</div><div class='add'>+#define RKCANFD_REG_IDMASK1 0x12c</div><div class='add'>+#define RKCANFD_REG_IDCODE2 0x130</div><div class='add'>+#define RKCANFD_REG_IDMASK2 0x134</div><div class='add'>+#define RKCANFD_REG_IDCODE3 0x138</div><div class='add'>+#define RKCANFD_REG_IDMASK3 0x13c</div><div class='add'>+#define RKCANFD_REG_IDCODE4 0x140</div><div class='add'>+#define RKCANFD_REG_IDMASK4 0x144</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_FD_TXFRAMEINFO 0x200</div><div class='add'>+#define RKCANFD_REG_FD_FRAMEINFO_FRAME_FORMAT BIT(7)</div><div class='add'>+#define RKCANFD_REG_FD_FRAMEINFO_RTR BIT(6)</div><div class='add'>+#define RKCANFD_REG_FD_FRAMEINFO_FDF BIT(5)</div><div class='add'>+#define RKCANFD_REG_FD_FRAMEINFO_BRS BIT(4)</div><div class='add'>+#define RKCANFD_REG_FD_FRAMEINFO_DATA_LENGTH GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_FD_TXID 0x204</div><div class='add'>+#define RKCANFD_REG_FD_ID_EFF GENMASK(28, 0)</div><div class='add'>+#define RKCANFD_REG_FD_ID_SFF GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA0 0x208</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA1 0x20c</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA2 0x210</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA3 0x214</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA4 0x218</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA5 0x21c</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA6 0x220</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA7 0x224</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA8 0x228</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA9 0x22c</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA10 0x230</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA11 0x234</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA12 0x238</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA13 0x23c</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA14 0x240</div><div class='add'>+#define RKCANFD_REG_FD_TXDATA15 0x244</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_FD_RXFRAMEINFO 0x300</div><div class='add'>+#define RKCANFD_REG_FD_RXID 0x304</div><div class='add'>+#define RKCANFD_REG_FD_RXTIMESTAMP 0x308</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA0 0x30c</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA1 0x310</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA2 0x314</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA3 0x318</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA4 0x31c</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA5 0x320</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA6 0x320</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA7 0x328</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA8 0x32c</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA9 0x330</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA10 0x334</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA11 0x338</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA12 0x33c</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA13 0x340</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA14 0x344</div><div class='add'>+#define RKCANFD_REG_FD_RXDATA15 0x348</div><div class='add'>+</div><div class='add'>+#define RKCANFD_REG_RX_FIFO_RDATA 0x400</div><div class='add'>+#define RKCANFD_REG_TXE_FIFO_RDATA 0x500</div><div class='add'>+</div><div class='add'>+#define DEVICE_NAME "rockchip_canfd"</div><div class='add'>+#define RKCANFD_NAPI_WEIGHT 32</div><div class='add'>+#define RKCANFD_TXFIFO_DEPTH 2</div><div class='add'>+#define RKCANFD_TX_STOP_THRESHOLD 1</div><div class='add'>+#define RKCANFD_TX_START_THRESHOLD 1</div><div class='add'>+</div><div class='add'>+#define RKCANFD_TIMESTAMP_WORK_MAX_DELAY_SEC 60</div><div class='add'>+#define RKCANFD_ERRATUM_5_SYSCLOCK_HZ_MIN (300 * MEGA)</div><div class='add'>+</div><div class='add'>+/* rk3568 CAN-FD Errata, as of Tue 07 Nov 2023 11:25:31 +08:00 */</div><div class='add'>+</div><div class='add'>+/* Erratum 1: The error frame sent by the CAN controller has an</div><div class='add'>+ * abnormal format.</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_1 BIT(0)</div><div class='add'>+</div><div class='add'>+/* Erratum 2: The error frame sent after detecting a CRC error has an</div><div class='add'>+ * abnormal position.</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_2 BIT(1)</div><div class='add'>+</div><div class='add'>+/* Erratum 3: Intermittent CRC calculation errors. */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_3 BIT(2)</div><div class='add'>+</div><div class='add'>+/* Erratum 4: Intermittent occurrence of stuffing errors. */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_4 BIT(3)</div><div class='add'>+</div><div class='add'>+/* Erratum 5: Counters related to the TXFIFO and RXFIFO exhibit</div><div class='add'>+ * abnormal counting behavior.</div><div class='add'>+ *</div><div class='add'>+ * The rk3568 CAN-FD errata sheet as of Tue 07 Nov 2023 11:25:31 +08:00</div><div class='add'>+ * states that only the rk3568v2 is affected by this erratum, but</div><div class='add'>+ * tests with the rk3568v2 and rk3568v3 show that the RX_FIFO_CNT is</div><div class='add'>+ * sometimes too high. This leads to CAN frames being read from the</div><div class='add'>+ * FIFO, which is then already empty.</div><div class='add'>+ *</div><div class='add'>+ * Further tests on the rk3568v2 and rk3568v3 show that in this</div><div class='add'>+ * situation (i.e. empty FIFO) all elements of the FIFO header</div><div class='add'>+ * (frameinfo, id, ts) contain the same data.</div><div class='add'>+ *</div><div class='add'>+ * On the rk3568v2 and rk3568v3, this problem only occurs extremely</div><div class='add'>+ * rarely with the standard clock of 300 MHz, but almost immediately</div><div class='add'>+ * at 80 MHz.</div><div class='add'>+ *</div><div class='add'>+ * To workaround this problem, check for empty FIFO with</div><div class='add'>+ * rkcanfd_fifo_header_empty() in rkcanfd_handle_rx_int_one() and exit</div><div class='add'>+ * early.</div><div class='add'>+ *</div><div class='add'>+ * To reproduce:</div><div class='add'>+ * assigned-clocks = &lt;&amp;cru CLK_CANx&gt;;</div><div class='add'>+ * assigned-clock-rates = &lt;80000000&gt;;</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_5 BIT(4)</div><div class='add'>+</div><div class='add'>+/* Erratum 6: The CAN controller's transmission of extended frames may</div><div class='add'>+ * intermittently change into standard frames</div><div class='add'>+ *</div><div class='add'>+ * Work around this issue by activating self reception (RXSTX). If we</div><div class='add'>+ * have pending TX CAN frames, check all RX'ed CAN frames in</div><div class='add'>+ * rkcanfd_rxstx_filter().</div><div class='add'>+ *</div><div class='add'>+ * If it's a frame we've send and it's OK, call the TX complete</div><div class='add'>+ * handler: rkcanfd_handle_tx_done_one(). Mask the TX complete IRQ.</div><div class='add'>+ *</div><div class='add'>+ * If it's a frame we've send, but the CAN-ID is mangled, resend the</div><div class='add'>+ * original extended frame.</div><div class='add'>+ *</div><div class='add'>+ * To reproduce:</div><div class='add'>+ * host:</div><div class='add'>+ *   canfdtest -evx -g can0</div><div class='add'>+ *   candump any,0:80000000 -cexdtA</div><div class='add'>+ * dut:</div><div class='add'>+ *   canfdtest -evx can0</div><div class='add'>+ *   ethtool -S can0</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_6 BIT(5)</div><div class='add'>+</div><div class='add'>+/* Erratum 7: In the passive error state, the CAN controller's</div><div class='add'>+ * interframe space segment counting is inaccurate.</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_7 BIT(6)</div><div class='add'>+</div><div class='add'>+/* Erratum 8: The Format-Error error flag is transmitted one bit</div><div class='add'>+ * later.</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_8 BIT(7)</div><div class='add'>+</div><div class='add'>+/* Erratum 9: In the arbitration segment, the CAN controller will</div><div class='add'>+ * identify stuffing errors as arbitration failures.</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_9 BIT(8)</div><div class='add'>+</div><div class='add'>+/* Erratum 10: Does not support the BUSOFF slow recovery mechanism. */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_10 BIT(9)</div><div class='add'>+</div><div class='add'>+/* Erratum 11: Arbitration error. */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_11 BIT(10)</div><div class='add'>+</div><div class='add'>+/* Erratum 12: A dominant bit at the third bit of the intermission may</div><div class='add'>+ * cause a transmission error.</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_RK3568_ERRATUM_12 BIT(11)</div><div class='add'>+</div><div class='add'>+/* Tests on the rk3568v2 and rk3568v3 show that receiving certain</div><div class='add'>+ * CAN-FD frames trigger an Error Interrupt.</div><div class='add'>+ *</div><div class='add'>+ * - Form Error in RX Arbitration Phase: TX_IDLE RX_STUFF_COUNT (0x0a010100) CMD=0 RX=0 TX=0</div><div class='add'>+ *   Error-Warning=1 Bus-Off=0</div><div class='add'>+ *   To reproduce:</div><div class='add'>+ *   host:</div><div class='add'>+ *     cansend can0 002##01f</div><div class='add'>+ *   DUT:</div><div class='add'>+ *     candump any,0:0,#FFFFFFFF -cexdHtA</div><div class='add'>+ *</div><div class='add'>+ * - Form Error in RX Arbitration Phase: TX_IDLE RX_CRC (0x0a010200) CMD=0 RX=0 TX=0</div><div class='add'>+ *   Error-Warning=1 Bus-Off=0</div><div class='add'>+ *   To reproduce:</div><div class='add'>+ *   host:</div><div class='add'>+ *     cansend can0 002##07217010000000000</div><div class='add'>+ *   DUT:</div><div class='add'>+ *     candump any,0:0,#FFFFFFFF -cexdHtA</div><div class='add'>+ */</div><div class='add'>+#define RKCANFD_QUIRK_CANFD_BROKEN BIT(12)</div><div class='add'>+</div><div class='add'>+/* known issues with rk3568v3:</div><div class='add'>+ *</div><div class='add'>+ * - Overload situation during high bus load</div><div class='add'>+ *   To reproduce:</div><div class='add'>+ *   host:</div><div class='add'>+ *     # add a 2nd CAN adapter to the CAN bus</div><div class='add'>+ *     cangen can0 -I 1 -Li -Di -p10 -g 0.3</div><div class='add'>+ *     cansequence -rve</div><div class='add'>+ *   DUT:</div><div class='add'>+ *     cangen can0 -I2 -L1 -Di -p10 -c10 -g 1 -e</div><div class='add'>+ *     cansequence -rv -i 1</div><div class='add'>+ *</div><div class='add'>+ * - TX starvation after repeated Bus-Off</div><div class='add'>+ *   To reproduce:</div><div class='add'>+ *   host:</div><div class='add'>+ *     sleep 3 &amp;&amp; cangen can0 -I2 -Li -Di -p10 -g 0.0</div><div class='add'>+ *   DUT:</div><div class='add'>+ *     cangen can0 -I2 -Li -Di -p10 -g 0.05</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+enum rkcanfd_model {</div><div class='add'>+	RKCANFD_MODEL_RK3568V2 = 0x35682,</div><div class='add'>+	RKCANFD_MODEL_RK3568V3 = 0x35683,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rkcanfd_devtype_data {</div><div class='add'>+	enum rkcanfd_model model;</div><div class='add'>+	u32 quirks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rkcanfd_fifo_header {</div><div class='add'>+	u32 frameinfo;</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rkcanfd_stats {</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+</div><div class='add'>+	/* Erratum 5 */</div><div class='add'>+	u64_stats_t rx_fifo_empty_errors;</div><div class='add'>+</div><div class='add'>+	/* Erratum 6 */</div><div class='add'>+	u64_stats_t tx_extended_as_standard_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rkcanfd_priv {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+	unsigned int tx_head;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+</div><div class='add'>+	u32 reg_mode_default;</div><div class='add'>+	u32 reg_int_mask_default;</div><div class='add'>+	struct rkcanfd_devtype_data devtype_data;</div><div class='add'>+</div><div class='add'>+	struct cyclecounter cc;</div><div class='add'>+	struct timecounter tc;</div><div class='add'>+	struct delayed_work timestamp;</div><div class='add'>+	unsigned long work_delay_jiffies;</div><div class='add'>+</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+</div><div class='add'>+	struct rkcanfd_stats stats;</div><div class='add'>+</div><div class='add'>+	struct reset_control *reset;</div><div class='add'>+	struct clk_bulk_data *clks;</div><div class='add'>+	int clks_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+rkcanfd_read(const struct rkcanfd_priv *priv, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return readl(priv-&gt;regs + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+rkcanfd_read_rep(const struct rkcanfd_priv *priv, u32 reg,</div><div class='add'>+		 void *buf, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	readsl(priv-&gt;regs + reg, buf, len / sizeof(u32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+rkcanfd_write(const struct rkcanfd_priv *priv, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, priv-&gt;regs + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+rkcanfd_get_timestamp(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return rkcanfd_read(priv, RKCANFD_REG_TIMESTAMP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+rkcanfd_get_tx_head(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(priv-&gt;tx_head) &amp; (RKCANFD_TXFIFO_DEPTH - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+rkcanfd_get_tx_tail(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(priv-&gt;tx_tail) &amp; (RKCANFD_TXFIFO_DEPTH - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+rkcanfd_get_tx_pending(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return READ_ONCE(priv-&gt;tx_head) - READ_ONCE(priv-&gt;tx_tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+rkcanfd_get_tx_free(const struct rkcanfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return RKCANFD_TXFIFO_DEPTH - rkcanfd_get_tx_pending(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rkcanfd_ethtool_init(struct rkcanfd_priv *priv);</div><div class='add'>+</div><div class='add'>+int rkcanfd_handle_rx_int(struct rkcanfd_priv *priv);</div><div class='add'>+</div><div class='add'>+void rkcanfd_skb_set_timestamp(const struct rkcanfd_priv *priv,</div><div class='add'>+			       struct sk_buff *skb, const u32 timestamp);</div><div class='add'>+void rkcanfd_timestamp_init(struct rkcanfd_priv *priv);</div><div class='add'>+void rkcanfd_timestamp_start(struct rkcanfd_priv *priv);</div><div class='add'>+void rkcanfd_timestamp_stop(struct rkcanfd_priv *priv);</div><div class='add'>+void rkcanfd_timestamp_stop_sync(struct rkcanfd_priv *priv);</div><div class='add'>+</div><div class='add'>+unsigned int rkcanfd_get_effective_tx_free(const struct rkcanfd_priv *priv);</div><div class='add'>+void rkcanfd_xmit_retry(struct rkcanfd_priv *priv);</div><div class='add'>+netdev_tx_t rkcanfd_start_xmit(struct sk_buff *skb, struct net_device *ndev);</div><div class='add'>+void rkcanfd_handle_tx_done_one(struct rkcanfd_priv *priv, const u32 ts,</div><div class='add'>+				unsigned int *frame_len_p);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/rx-offload.c<br/>deleted file mode 100644<br/>index 2ce4fa8698c7..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/rx-offload.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/rx-offload.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,338 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2014 David Jander, Protonic Holland</div><div class='del'>- * Copyright (C) 2014-2017 Pengutronix, Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/can/rx-offload.h&gt;</div><div class='del'>-</div><div class='del'>-struct can_rx_offload_cb {</div><div class='del'>-	u32 timestamp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static inline struct can_rx_offload_cb *can_rx_offload_get_cb(struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	BUILD_BUG_ON(sizeof(struct can_rx_offload_cb) &gt; sizeof(skb-&gt;cb));</div><div class='del'>-</div><div class='del'>-	return (struct can_rx_offload_cb *)skb-&gt;cb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool can_rx_offload_le(struct can_rx_offload *offload, unsigned int a, unsigned int b)</div><div class='del'>-{</div><div class='del'>-	if (offload-&gt;inc)</div><div class='del'>-		return a &lt;= b;</div><div class='del'>-	else</div><div class='del'>-		return a &gt;= b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int can_rx_offload_inc(struct can_rx_offload *offload, unsigned int *val)</div><div class='del'>-{</div><div class='del'>-	if (offload-&gt;inc)</div><div class='del'>-		return (*val)++;</div><div class='del'>-	else</div><div class='del'>-		return (*val)--;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_rx_offload_napi_poll(struct napi_struct *napi, int quota)</div><div class='del'>-{</div><div class='del'>-	struct can_rx_offload *offload = container_of(napi, struct can_rx_offload, napi);</div><div class='del'>-	struct net_device *dev = offload-&gt;dev;</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int work_done = 0;</div><div class='del'>-</div><div class='del'>-	while ((work_done &lt; quota) &amp;&amp;</div><div class='del'>-	       (skb = skb_dequeue(&amp;offload-&gt;skb_queue))) {</div><div class='del'>-		struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-		work_done++;</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-		netif_receive_skb(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (work_done &lt; quota) {</div><div class='del'>-		napi_complete_done(napi, work_done);</div><div class='del'>-</div><div class='del'>-		/* Check if there was another interrupt */</div><div class='del'>-		if (!skb_queue_empty(&amp;offload-&gt;skb_queue))</div><div class='del'>-			napi_reschedule(&amp;offload-&gt;napi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	can_led_event(offload-&gt;dev, CAN_LED_EVENT_RX);</div><div class='del'>-</div><div class='del'>-	return work_done;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __skb_queue_add_sort(struct sk_buff_head *head, struct sk_buff *new,</div><div class='del'>-					int (*compare)(struct sk_buff *a, struct sk_buff *b))</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *pos, *insert = NULL;</div><div class='del'>-</div><div class='del'>-	skb_queue_reverse_walk(head, pos) {</div><div class='del'>-		const struct can_rx_offload_cb *cb_pos, *cb_new;</div><div class='del'>-</div><div class='del'>-		cb_pos = can_rx_offload_get_cb(pos);</div><div class='del'>-		cb_new = can_rx_offload_get_cb(new);</div><div class='del'>-</div><div class='del'>-		netdev_dbg(new-&gt;dev,</div><div class='del'>-			   "%s: pos=0x%08x, new=0x%08x, diff=%10d, queue_len=%d\n",</div><div class='del'>-			   __func__,</div><div class='del'>-			   cb_pos-&gt;timestamp, cb_new-&gt;timestamp,</div><div class='del'>-			   cb_new-&gt;timestamp - cb_pos-&gt;timestamp,</div><div class='del'>-			   skb_queue_len(head));</div><div class='del'>-</div><div class='del'>-		if (compare(pos, new) &lt; 0)</div><div class='del'>-			continue;</div><div class='del'>-		insert = pos;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (!insert)</div><div class='del'>-		__skb_queue_head(head, new);</div><div class='del'>-	else</div><div class='del'>-		__skb_queue_after(head, insert, new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int can_rx_offload_compare(struct sk_buff *a, struct sk_buff *b)</div><div class='del'>-{</div><div class='del'>-	const struct can_rx_offload_cb *cb_a, *cb_b;</div><div class='del'>-</div><div class='del'>-	cb_a = can_rx_offload_get_cb(a);</div><div class='del'>-	cb_b = can_rx_offload_get_cb(b);</div><div class='del'>-</div><div class='del'>-	/* Substract two u32 and return result as int, to keep</div><div class='del'>-	 * difference steady around the u32 overflow.</div><div class='del'>-	 */</div><div class='del'>-	return cb_b-&gt;timestamp - cb_a-&gt;timestamp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *can_rx_offload_offload_one(struct can_rx_offload *offload, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb = NULL;</div><div class='del'>-	struct can_rx_offload_cb *cb;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* If queue is full or skb not available, read to discard mailbox */</div><div class='del'>-	if (likely(skb_queue_len(&amp;offload-&gt;skb_queue) &lt;=</div><div class='del'>-		   offload-&gt;skb_queue_len_max))</div><div class='del'>-		skb = alloc_can_skb(offload-&gt;dev, &amp;cf);</div><div class='del'>-</div><div class='del'>-	if (!skb) {</div><div class='del'>-		struct can_frame cf_overflow;</div><div class='del'>-		u32 timestamp;</div><div class='del'>-</div><div class='del'>-		ret = offload-&gt;mailbox_read(offload, &amp;cf_overflow,</div><div class='del'>-					    &amp;timestamp, n);</div><div class='del'>-		if (ret)</div><div class='del'>-			offload-&gt;dev-&gt;stats.rx_dropped++;</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cb = can_rx_offload_get_cb(skb);</div><div class='del'>-	ret = offload-&gt;mailbox_read(offload, cf, &amp;cb-&gt;timestamp, n);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int can_rx_offload_irq_offload_timestamp(struct can_rx_offload *offload, u64 pending)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff_head skb_queue;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	__skb_queue_head_init(&amp;skb_queue);</div><div class='del'>-</div><div class='del'>-	for (i = offload-&gt;mb_first;</div><div class='del'>-	     can_rx_offload_le(offload, i, offload-&gt;mb_last);</div><div class='del'>-	     can_rx_offload_inc(offload, &amp;i)) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-		if (!(pending &amp; BIT_ULL(i)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		skb = can_rx_offload_offload_one(offload, i);</div><div class='del'>-		if (!skb)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		__skb_queue_add_sort(&amp;skb_queue, skb, can_rx_offload_compare);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!skb_queue_empty(&amp;skb_queue)) {</div><div class='del'>-		unsigned long flags;</div><div class='del'>-		u32 queue_len;</div><div class='del'>-</div><div class='del'>-		spin_lock_irqsave(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='del'>-		skb_queue_splice_tail(&amp;skb_queue, &amp;offload-&gt;skb_queue);</div><div class='del'>-		spin_unlock_irqrestore(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='del'>-</div><div class='del'>-		if ((queue_len = skb_queue_len(&amp;offload-&gt;skb_queue)) &gt;</div><div class='del'>-		    (offload-&gt;skb_queue_len_max / 8))</div><div class='del'>-			netdev_dbg(offload-&gt;dev, "%s: queue_len=%d\n",</div><div class='del'>-				   __func__, queue_len);</div><div class='del'>-</div><div class='del'>-		can_rx_offload_schedule(offload);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return skb_queue_len(&amp;skb_queue);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_irq_offload_timestamp);</div><div class='del'>-</div><div class='del'>-int can_rx_offload_irq_offload_fifo(struct can_rx_offload *offload)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int received = 0;</div><div class='del'>-</div><div class='del'>-	while ((skb = can_rx_offload_offload_one(offload, 0))) {</div><div class='del'>-		skb_queue_tail(&amp;offload-&gt;skb_queue, skb);</div><div class='del'>-		received++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (received)</div><div class='del'>-		can_rx_offload_schedule(offload);</div><div class='del'>-</div><div class='del'>-	return received;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_irq_offload_fifo);</div><div class='del'>-</div><div class='del'>-int can_rx_offload_queue_sorted(struct can_rx_offload *offload,</div><div class='del'>-				struct sk_buff *skb, u32 timestamp)</div><div class='del'>-{</div><div class='del'>-	struct can_rx_offload_cb *cb;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (skb_queue_len(&amp;offload-&gt;skb_queue) &gt;</div><div class='del'>-	    offload-&gt;skb_queue_len_max)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	cb = can_rx_offload_get_cb(skb);</div><div class='del'>-	cb-&gt;timestamp = timestamp;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='del'>-	__skb_queue_add_sort(&amp;offload-&gt;skb_queue, skb, can_rx_offload_compare);</div><div class='del'>-	spin_unlock_irqrestore(&amp;offload-&gt;skb_queue.lock, flags);</div><div class='del'>-</div><div class='del'>-	can_rx_offload_schedule(offload);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_queue_sorted);</div><div class='del'>-</div><div class='del'>-unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,</div><div class='del'>-					 unsigned int idx, u32 timestamp)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = offload-&gt;dev;</div><div class='del'>-	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u8 len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	skb = __can_get_echo_skb(dev, idx, &amp;len);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = can_rx_offload_queue_sorted(offload, skb, timestamp);</div><div class='del'>-	if (err) {</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		stats-&gt;tx_fifo_errors++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb);</div><div class='del'>-</div><div class='del'>-int can_rx_offload_queue_tail(struct can_rx_offload *offload,</div><div class='del'>-			      struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-	if (skb_queue_len(&amp;offload-&gt;skb_queue) &gt;</div><div class='del'>-	    offload-&gt;skb_queue_len_max)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	skb_queue_tail(&amp;offload-&gt;skb_queue, skb);</div><div class='del'>-	can_rx_offload_schedule(offload);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_queue_tail);</div><div class='del'>-</div><div class='del'>-static int can_rx_offload_init_queue(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight)</div><div class='del'>-{</div><div class='del'>-	offload-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-	/* Limit queue len to 4x the weight (rounted to next power of two) */</div><div class='del'>-	offload-&gt;skb_queue_len_max = 2 &lt;&lt; fls(weight);</div><div class='del'>-	offload-&gt;skb_queue_len_max *= 4;</div><div class='del'>-	skb_queue_head_init(&amp;offload-&gt;skb_queue);</div><div class='del'>-</div><div class='del'>-	can_rx_offload_reset(offload);</div><div class='del'>-	netif_napi_add(dev, &amp;offload-&gt;napi, can_rx_offload_napi_poll, weight);</div><div class='del'>-</div><div class='del'>-	dev_dbg(dev-&gt;dev.parent, "%s: skb_queue_len_max=%d\n",</div><div class='del'>-		__func__, offload-&gt;skb_queue_len_max);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int can_rx_offload_add_timestamp(struct net_device *dev, struct can_rx_offload *offload)</div><div class='del'>-{</div><div class='del'>-	unsigned int weight;</div><div class='del'>-</div><div class='del'>-	if (offload-&gt;mb_first &gt; BITS_PER_LONG_LONG ||</div><div class='del'>-	    offload-&gt;mb_last &gt; BITS_PER_LONG_LONG || !offload-&gt;mailbox_read)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (offload-&gt;mb_first &lt; offload-&gt;mb_last) {</div><div class='del'>-		offload-&gt;inc = true;</div><div class='del'>-		weight = offload-&gt;mb_last - offload-&gt;mb_first;</div><div class='del'>-	} else {</div><div class='del'>-		offload-&gt;inc = false;</div><div class='del'>-		weight = offload-&gt;mb_first - offload-&gt;mb_last;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return can_rx_offload_init_queue(dev, offload, weight);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_add_timestamp);</div><div class='del'>-</div><div class='del'>-int can_rx_offload_add_fifo(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight)</div><div class='del'>-{</div><div class='del'>-	if (!offload-&gt;mailbox_read)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return can_rx_offload_init_queue(dev, offload, weight);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_add_fifo);</div><div class='del'>-</div><div class='del'>-void can_rx_offload_enable(struct can_rx_offload *offload)</div><div class='del'>-{</div><div class='del'>-	can_rx_offload_reset(offload);</div><div class='del'>-	napi_enable(&amp;offload-&gt;napi);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_enable);</div><div class='del'>-</div><div class='del'>-void can_rx_offload_del(struct can_rx_offload *offload)</div><div class='del'>-{</div><div class='del'>-	netif_napi_del(&amp;offload-&gt;napi);</div><div class='del'>-	skb_queue_purge(&amp;offload-&gt;skb_queue);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_del);</div><div class='del'>-</div><div class='del'>-void can_rx_offload_reset(struct can_rx_offload *offload)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(can_rx_offload_reset);</div><div class='head'>diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig<br/>index 6b72da2f18a6..e061e35769bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/Kconfig</a></div><div class='hunk'>@@ -1,56 +1,47 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='ctx'> menuconfig CAN_SJA1000</div><div class='ctx'> 	tristate "Philips/NXP SJA1000 devices"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> </div><div class='ctx'> if CAN_SJA1000</div><div class='ctx'> </div><div class='del'>-config CAN_SJA1000_ISA</div><div class='del'>-	tristate "ISA Bus based legacy SJA1000 driver"</div><div class='del'>-	---help---</div><div class='del'>-	  This driver adds legacy support for SJA1000 chips connected to</div><div class='del'>-	  the ISA bus using I/O port, memory mapped or indirect access.</div><div class='del'>-</div><div class='del'>-config CAN_SJA1000_PLATFORM</div><div class='del'>-	tristate "Generic Platform Bus based SJA1000 driver"</div><div class='del'>-	---help---</div><div class='del'>-	  This driver adds support for the SJA1000 chips connected to</div><div class='del'>-	  the "platform bus" (Linux abstraction for directly to the</div><div class='del'>-	  processor attached devices).  Which can be found on various</div><div class='del'>-	  boards from Phytec (http://www.phytec.de) like the PCM027,</div><div class='del'>-	  PCM038. It also provides the OpenFirmware "platform bus" found</div><div class='del'>-	  on embedded systems with OpenFirmware bindings, e.g. if you</div><div class='del'>-	  have a PowerPC based system you may want to enable this option.</div><div class='add'>+config CAN_EMS_PCI</div><div class='add'>+	tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  This driver is for the one, two or four channel CPC-PCI,</div><div class='add'>+	  CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche</div><div class='add'>+	  (http://www.ems-wuensche.de).</div><div class='ctx'> </div><div class='ctx'> config CAN_EMS_PCMCIA</div><div class='ctx'> 	tristate "EMS CPC-CARD Card"</div><div class='ctx'> 	depends on PCMCIA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the one or two channel CPC-CARD cards from</div><div class='ctx'> 	  EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).</div><div class='ctx'> </div><div class='del'>-config CAN_EMS_PCI</div><div class='del'>-	tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"</div><div class='add'>+config CAN_F81601</div><div class='add'>+	tristate "Fintek F81601 PCIE to 2 CAN Controller"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='del'>-	  This driver is for the one, two or four channel CPC-PCI,</div><div class='del'>-	  CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche</div><div class='del'>-	  (http://www.ems-wuensche.de).</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for Fintek F81601 PCIE to 2 CAN</div><div class='add'>+	  Controller. It had internal 24MHz clock source, but it can</div><div class='add'>+	  be changed by manufacturer. Use modinfo to get usage for</div><div class='add'>+	  parameters. Visit http://www.fintek.com.tw to get more</div><div class='add'>+	  information.</div><div class='ctx'> </div><div class='del'>-config CAN_PEAK_PCMCIA</div><div class='del'>-	tristate "PEAK PCAN-PC Card"</div><div class='del'>-	depends on PCMCIA</div><div class='del'>-	depends on HAS_IOPORT_MAP</div><div class='del'>-	---help---</div><div class='del'>-	  This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels)</div><div class='del'>-	  from PEAK-System (http://www.peak-system.com). To compile this</div><div class='del'>-	  driver as a module, choose M here: the module will be called</div><div class='del'>-	  peak_pcmcia.</div><div class='add'>+config CAN_KVASER_PCI</div><div class='add'>+	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"</div><div class='add'>+	depends on PCI</div><div class='add'>+	help</div><div class='add'>+	  This driver is for the PCIcanx and PCIcan cards (1, 2 or</div><div class='add'>+	  4 channel) from Kvaser (http://www.kvaser.com).</div><div class='ctx'> </div><div class='ctx'> config CAN_PEAK_PCI</div><div class='ctx'> 	tristate "PEAK PCAN-PCI/PCIe/miniPCI Cards"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the PCAN-PCI/PCIe/miniPCI cards</div><div class='ctx'> 	  (1, 2, 3 or 4 channels) from PEAK-System Technik</div><div class='ctx'> 	  (http://www.peak-system.com).</div><div class='hunk'>@@ -61,22 +52,25 @@ config CAN_PEAK_PCIEC</div><div class='ctx'> 	select I2C</div><div class='ctx'> 	select I2C_ALGOBIT</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use a PCAN-ExpressCard from PEAK-System</div><div class='ctx'> 	  Technik. This will also automatically select I2C and I2C_ALGO</div><div class='ctx'> 	  configuration options.</div><div class='ctx'> </div><div class='del'>-config CAN_KVASER_PCI</div><div class='del'>-	tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"</div><div class='del'>-	depends on PCI</div><div class='del'>-	---help---</div><div class='del'>-	  This driver is for the PCIcanx and PCIcan cards (1, 2 or</div><div class='del'>-	  4 channel) from Kvaser (http://www.kvaser.com).</div><div class='add'>+config CAN_PEAK_PCMCIA</div><div class='add'>+	tristate "PEAK PCAN-PC Card"</div><div class='add'>+	depends on PCMCIA</div><div class='add'>+	depends on HAS_IOPORT_MAP</div><div class='add'>+	help</div><div class='add'>+	  This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels)</div><div class='add'>+	  from PEAK-System (http://www.peak-system.com). To compile this</div><div class='add'>+	  driver as a module, choose M here: the module will be called</div><div class='add'>+	  peak_pcmcia.</div><div class='ctx'> </div><div class='ctx'> config CAN_PLX_PCI</div><div class='ctx'> 	tristate "PLX90xx PCI-bridge based Cards"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for CAN interface cards based on</div><div class='ctx'> 	  the PLX90xx PCI bridge.</div><div class='ctx'> 	  Driver supports now:</div><div class='hunk'>@@ -91,12 +85,30 @@ config CAN_PLX_PCI</div><div class='ctx'> 	   - Connect Tech Inc. CANpro/104-Plus Opto (CRG001) card (http://www.connecttech.com)</div><div class='ctx'> 	   - ASEM CAN raw - 2 isolated CAN channels (www.asem.it)</div><div class='ctx'> </div><div class='add'>+config CAN_SJA1000_ISA</div><div class='add'>+	tristate "ISA Bus based legacy SJA1000 driver"</div><div class='add'>+	depends on HAS_IOPORT</div><div class='add'>+	help</div><div class='add'>+	  This driver adds legacy support for SJA1000 chips connected to</div><div class='add'>+	  the ISA bus using I/O port, memory mapped or indirect access.</div><div class='add'>+</div><div class='add'>+config CAN_SJA1000_PLATFORM</div><div class='add'>+	tristate "Generic Platform Bus based SJA1000 driver"</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for the SJA1000 chips connected to</div><div class='add'>+	  the "platform bus" (Linux abstraction for directly to the</div><div class='add'>+	  processor attached devices).  Which can be found on various</div><div class='add'>+	  boards from Phytec (http://www.phytec.de) like the PCM027,</div><div class='add'>+	  PCM038. It also provides the OpenFirmware "platform bus" found</div><div class='add'>+	  on embedded systems with OpenFirmware bindings, e.g. if you</div><div class='add'>+	  have a PowerPC based system you may want to enable this option.</div><div class='add'>+</div><div class='ctx'> config CAN_TSCAN1</div><div class='ctx'> 	tristate "TS-CAN1 PC104 boards"</div><div class='del'>-	depends on ISA</div><div class='add'>+	depends on (ISA &amp;&amp; PC104) || (COMPILE_TEST &amp;&amp; HAS_IOPORT)</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver is for Technologic Systems' TSCAN-1 PC104 boards.</div><div class='del'>-	  http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1</div><div class='add'>+	  https://www.embeddedts.com/products/TS-CAN1</div><div class='ctx'> 	  The driver supports multiple boards and automatically configures them:</div><div class='ctx'> 	  PLD IO base addresses are read from jumpers JP1 and JP2,</div><div class='ctx'> 	  IRQ numbers are read from jumpers JP4 and JP5,</div><div class='head'>diff --git a/drivers/net/can/sja1000/Makefile b/drivers/net/can/sja1000/Makefile<br/>index 9253aaf9e739..500ce1dddaec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/Makefile</a></div><div class='hunk'>@@ -3,13 +3,14 @@</div><div class='ctx'> #  Makefile for the SJA1000 CAN controller drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_CAN_SJA1000) += sja1000.o</div><div class='del'>-obj-$(CONFIG_CAN_SJA1000_ISA) += sja1000_isa.o</div><div class='del'>-obj-$(CONFIG_CAN_SJA1000_PLATFORM) += sja1000_platform.o</div><div class='del'>-obj-$(CONFIG_CAN_EMS_PCMCIA) += ems_pcmcia.o</div><div class='ctx'> obj-$(CONFIG_CAN_EMS_PCI) += ems_pci.o</div><div class='add'>+obj-$(CONFIG_CAN_EMS_PCMCIA) += ems_pcmcia.o</div><div class='add'>+obj-$(CONFIG_CAN_F81601) += f81601.o</div><div class='ctx'> obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o</div><div class='del'>-obj-$(CONFIG_CAN_PEAK_PCMCIA) += peak_pcmcia.o</div><div class='ctx'> obj-$(CONFIG_CAN_PEAK_PCI) += peak_pci.o</div><div class='add'>+obj-$(CONFIG_CAN_PEAK_PCMCIA) += peak_pcmcia.o</div><div class='ctx'> obj-$(CONFIG_CAN_PLX_PCI) += plx_pci.o</div><div class='add'>+obj-$(CONFIG_CAN_SJA1000) += sja1000.o</div><div class='add'>+obj-$(CONFIG_CAN_SJA1000_ISA) += sja1000_isa.o</div><div class='add'>+obj-$(CONFIG_CAN_SJA1000_PLATFORM) += sja1000_platform.o</div><div class='ctx'> obj-$(CONFIG_CAN_TSCAN1) += tscan1.o</div><div class='head'>diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c<br/>index 7481c324a476..5bca719d61f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/ems_pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/ems_pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/ems_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/ems_pci.c</a></div><div class='hunk'>@@ -1,19 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='ctx'>  * Copyright (C) 2008 Markus Plessing &lt;plessing@ems-wuensche.com&gt;</div><div class='ctx'>  * Copyright (C) 2008 Sebastian Haas &lt;haas@ems-wuensche.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='add'>+ * Copyright (C) 2023 EMS Dr. Thomas Wuensche</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -30,13 +20,14 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME  "ems_pci"</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Sebastian Haas &lt;haas@ems-wuenche.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Sebastian Haas &lt;support@ems-wuensche.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Gerhard Uttenthaler &lt;uttenthaler@ems-wuensche.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Socket-CAN driver for EMS CPC-PCI/PCIe/104P CAN cards");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("EMS CPC-PCI/PCIe/104P CAN card");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> #define EMS_PCI_V1_MAX_CHAN 2</div><div class='ctx'> #define EMS_PCI_V2_MAX_CHAN 4</div><div class='add'>+#define EMS_PCI_V3_MAX_CHAN 4</div><div class='ctx'> #define EMS_PCI_MAX_CHAN    EMS_PCI_V2_MAX_CHAN</div><div class='ctx'> </div><div class='ctx'> struct ems_pci_card {</div><div class='hunk'>@@ -52,8 +43,7 @@ struct ems_pci_card {</div><div class='ctx'> </div><div class='ctx'> #define EMS_PCI_CAN_CLOCK (16000000 / 2)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Register definitions and descriptions are from LinCAN 0.3.3.</div><div class='add'>+/* Register definitions and descriptions are from LinCAN 0.3.3.</div><div class='ctx'>  *</div><div class='ctx'>  * PSB4610 PITA-2 bridge control registers</div><div class='ctx'>  */</div><div class='hunk'>@@ -64,8 +54,7 @@ struct ems_pci_card {</div><div class='ctx'> #define PITA2_MISC          0x1c	/* Miscellaneous Register */</div><div class='ctx'> #define PITA2_MISC_CONFIG   0x04000000	/* Multiplexed parallel interface */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Register definitions for the PLX 9030</div><div class='add'>+/* Register definitions for the PLX 9030</div><div class='ctx'>  */</div><div class='ctx'> #define PLX_ICSR            0x4c   /* Interrupt Control/Status register */</div><div class='ctx'> #define PLX_ICSR_LINTI1_ENA 0x0001 /* LINTi1 Enable */</div><div class='hunk'>@@ -74,8 +63,16 @@ struct ems_pci_card {</div><div class='ctx'> #define PLX_ICSR_ENA_CLR    (PLX_ICSR_LINTI1_ENA | PLX_ICSR_PCIINT_ENA | \</div><div class='ctx'> 			     PLX_ICSR_LINTI1_CLR)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * The board configuration is probably following:</div><div class='add'>+/* Register definitions for the ASIX99100</div><div class='add'>+ */</div><div class='add'>+#define ASIX_LINTSR 0x28 /* Interrupt Control/Status register */</div><div class='add'>+#define ASIX_LINTSR_INT0AC BIT(0) /* Writing 1 enables or clears interrupt */</div><div class='add'>+</div><div class='add'>+#define ASIX_LIEMR 0x24 /* Local Interrupt Enable / Miscellaneous Register */</div><div class='add'>+#define ASIX_LIEMR_L0EINTEN BIT(16) /* Local INT0 input assertion enable */</div><div class='add'>+#define ASIX_LIEMR_LRST BIT(14) /* Local Reset assert */</div><div class='add'>+</div><div class='add'>+/* The board configuration is probably following:</div><div class='ctx'>  * RX1 is connected to ground.</div><div class='ctx'>  * TX1 is not connected.</div><div class='ctx'>  * CLKO is not connected.</div><div class='hunk'>@@ -84,23 +81,35 @@ struct ems_pci_card {</div><div class='ctx'>  */</div><div class='ctx'> #define EMS_PCI_OCR         (OCR_TX0_PUSHPULL | OCR_TX1_PUSHPULL)</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * In the CDR register, you should set CBP to 1.</div><div class='add'>+/* In the CDR register, you should set CBP to 1.</div><div class='ctx'>  * You will probably also want to set the clock divider value to 7</div><div class='ctx'>  * (meaning direct oscillator output) because the second SJA1000 chip</div><div class='ctx'>  * is driven by the first one CLKOUT output.</div><div class='ctx'>  */</div><div class='ctx'> #define EMS_PCI_CDR             (CDR_CBP | CDR_CLKOUT_MASK)</div><div class='ctx'> </div><div class='del'>-#define EMS_PCI_V1_BASE_BAR     1</div><div class='del'>-#define EMS_PCI_V1_CONF_SIZE    4096 /* size of PITA control area */</div><div class='del'>-#define EMS_PCI_V2_BASE_BAR     2</div><div class='del'>-#define EMS_PCI_V2_CONF_SIZE    128 /* size of PLX control area */</div><div class='del'>-#define EMS_PCI_CAN_BASE_OFFSET 0x400 /* offset where the controllers starts */</div><div class='del'>-#define EMS_PCI_CAN_CTRL_SIZE   0x200 /* memory size for each controller */</div><div class='add'>+#define EMS_PCI_V1_BASE_BAR 1</div><div class='add'>+#define EMS_PCI_V1_CONF_BAR 0</div><div class='add'>+#define EMS_PCI_V1_CONF_SIZE 4096 /* size of PITA control area */</div><div class='add'>+#define EMS_PCI_V1_CAN_BASE_OFFSET 0x400 /* offset where the controllers start */</div><div class='add'>+#define EMS_PCI_V1_CAN_CTRL_SIZE 0x200 /* memory size for each controller */</div><div class='add'>+</div><div class='add'>+#define EMS_PCI_V2_BASE_BAR 2</div><div class='add'>+#define EMS_PCI_V2_CONF_BAR 0</div><div class='add'>+#define EMS_PCI_V2_CONF_SIZE 128 /* size of PLX control area */</div><div class='add'>+#define EMS_PCI_V2_CAN_BASE_OFFSET 0x400 /* offset where the controllers start */</div><div class='add'>+#define EMS_PCI_V2_CAN_CTRL_SIZE 0x200 /* memory size for each controller */</div><div class='add'>+</div><div class='add'>+#define EMS_PCI_V3_BASE_BAR 0</div><div class='add'>+#define EMS_PCI_V3_CONF_BAR 5</div><div class='add'>+#define EMS_PCI_V3_CONF_SIZE 128 /* size of ASIX control area */</div><div class='add'>+#define EMS_PCI_V3_CAN_BASE_OFFSET 0x00 /* offset where the controllers starts */</div><div class='add'>+#define EMS_PCI_V3_CAN_CTRL_SIZE 0x100 /* memory size for each controller */</div><div class='ctx'> </div><div class='ctx'> #define EMS_PCI_BASE_SIZE  4096 /* size of controller area */</div><div class='ctx'> </div><div class='add'>+#define PCI_SUBDEVICE_ID_EMS 0x4010</div><div class='add'>+</div><div class='ctx'> static const struct pci_device_id ems_pci_tbl[] = {</div><div class='ctx'> 	/* CPC-PCI v1 */</div><div class='ctx'> 	{PCI_VENDOR_ID_SIEMENS, 0x2104, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='hunk'>@@ -108,12 +117,13 @@ static const struct pci_device_id ems_pci_tbl[] = {</div><div class='ctx'> 	{PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4000},</div><div class='ctx'> 	/* CPC-104P v2 */</div><div class='ctx'> 	{PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002},</div><div class='add'>+	/* CPC-PCIe v3 */</div><div class='add'>+	{PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_AX99100_LB, 0xa000, PCI_SUBDEVICE_ID_EMS},</div><div class='ctx'> 	{0,}</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ems_pci_tbl);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Helper to read internal registers from card logic (not CAN)</div><div class='add'>+/* Helper to read internal registers from card logic (not CAN)</div><div class='ctx'>  */</div><div class='ctx'> static u8 ems_pci_v1_readb(struct ems_pci_card *card, unsigned int port)</div><div class='ctx'> {</div><div class='hunk'>@@ -133,7 +143,7 @@ static void ems_pci_v1_write_reg(const struct sja1000_priv *priv,</div><div class='ctx'> </div><div class='ctx'> static void ems_pci_v1_post_irq(const struct sja1000_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct ems_pci_card *card = (struct ems_pci_card *)priv-&gt;priv;</div><div class='add'>+	struct ems_pci_card *card = priv-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	/* reset int flag of pita */</div><div class='ctx'> 	writel(PITA2_ICR_INT0_EN | PITA2_ICR_INT0,</div><div class='hunk'>@@ -153,13 +163,30 @@ static void ems_pci_v2_write_reg(const struct sja1000_priv *priv,</div><div class='ctx'> </div><div class='ctx'> static void ems_pci_v2_post_irq(const struct sja1000_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct ems_pci_card *card = (struct ems_pci_card *)priv-&gt;priv;</div><div class='add'>+	struct ems_pci_card *card = priv-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	writel(PLX_ICSR_ENA_CLR, card-&gt;conf_addr + PLX_ICSR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Check if a CAN controller is present at the specified location</div><div class='add'>+static u8 ems_pci_v3_read_reg(const struct sja1000_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	return readb(priv-&gt;reg_base + port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ems_pci_v3_write_reg(const struct sja1000_priv *priv,</div><div class='add'>+				 int port, u8 val)</div><div class='add'>+{</div><div class='add'>+	writeb(val, priv-&gt;reg_base + port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ems_pci_v3_post_irq(const struct sja1000_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct ems_pci_card *card = priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	writel(ASIX_LINTSR_INT0AC, card-&gt;conf_addr + ASIX_LINTSR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if a CAN controller is present at the specified location</div><div class='ctx'>  * by trying to set 'em into the PeliCAN mode</div><div class='ctx'>  */</div><div class='ctx'> static inline int ems_pci_check_chan(const struct sja1000_priv *priv)</div><div class='hunk'>@@ -197,10 +224,10 @@ static void ems_pci_del_card(struct pci_dev *pdev)</div><div class='ctx'> 		free_sja1000dev(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;base_addr != NULL)</div><div class='add'>+	if (card-&gt;base_addr)</div><div class='ctx'> 		pci_iounmap(card-&gt;pci_dev, card-&gt;base_addr);</div><div class='ctx'> </div><div class='del'>-	if (card-&gt;conf_addr != NULL)</div><div class='add'>+	if (card-&gt;conf_addr)</div><div class='ctx'> 		pci_iounmap(card-&gt;pci_dev, card-&gt;conf_addr);</div><div class='ctx'> </div><div class='ctx'> 	kfree(card);</div><div class='hunk'>@@ -214,8 +241,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card)</div><div class='ctx'> 	writeb(0, card-&gt;base_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Probe PCI device for EMS CAN signature and register each available</div><div class='add'>+/* Probe PCI device for EMS CAN signature and register each available</div><div class='ctx'>  * CAN channel to SJA1000 Socket-CAN subsystem.</div><div class='ctx'>  */</div><div class='ctx'> static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='hunk'>@@ -224,7 +250,7 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> 	struct sja1000_priv *priv;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct ems_pci_card *card;</div><div class='del'>-	int max_chan, conf_size, base_bar;</div><div class='add'>+	int max_chan, conf_size, base_bar, conf_bar;</div><div class='ctx'> 	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	/* Enabling PCI device */</div><div class='hunk'>@@ -234,8 +260,8 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocating card structures to hold addresses, ... */</div><div class='del'>-	card = kzalloc(sizeof(struct ems_pci_card), GFP_KERNEL);</div><div class='del'>-	if (card == NULL) {</div><div class='add'>+	card = kzalloc(sizeof(*card), GFP_KERNEL);</div><div class='add'>+	if (!card) {</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -246,27 +272,35 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;channels = 0;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;vendor == PCI_VENDOR_ID_PLX) {</div><div class='add'>+	if (pdev-&gt;vendor == PCI_VENDOR_ID_ASIX) {</div><div class='add'>+		card-&gt;version = 3; /* CPC-PCI v3 */</div><div class='add'>+		max_chan = EMS_PCI_V3_MAX_CHAN;</div><div class='add'>+		base_bar = EMS_PCI_V3_BASE_BAR;</div><div class='add'>+		conf_bar = EMS_PCI_V3_CONF_BAR;</div><div class='add'>+		conf_size = EMS_PCI_V3_CONF_SIZE;</div><div class='add'>+	} else if (pdev-&gt;vendor == PCI_VENDOR_ID_PLX) {</div><div class='ctx'> 		card-&gt;version = 2; /* CPC-PCI v2 */</div><div class='ctx'> 		max_chan = EMS_PCI_V2_MAX_CHAN;</div><div class='ctx'> 		base_bar = EMS_PCI_V2_BASE_BAR;</div><div class='add'>+		conf_bar = EMS_PCI_V2_CONF_BAR;</div><div class='ctx'> 		conf_size = EMS_PCI_V2_CONF_SIZE;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		card-&gt;version = 1; /* CPC-PCI v1 */</div><div class='ctx'> 		max_chan = EMS_PCI_V1_MAX_CHAN;</div><div class='ctx'> 		base_bar = EMS_PCI_V1_BASE_BAR;</div><div class='add'>+		conf_bar = EMS_PCI_V1_CONF_BAR;</div><div class='ctx'> 		conf_size = EMS_PCI_V1_CONF_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Remap configuration space and controller memory area */</div><div class='del'>-	card-&gt;conf_addr = pci_iomap(pdev, 0, conf_size);</div><div class='del'>-	if (card-&gt;conf_addr == NULL) {</div><div class='add'>+	card-&gt;conf_addr = pci_iomap(pdev, conf_bar, conf_size);</div><div class='add'>+	if (!card-&gt;conf_addr) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto failure_cleanup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	card-&gt;base_addr = pci_iomap(pdev, base_bar, EMS_PCI_BASE_SIZE);</div><div class='del'>-	if (card-&gt;base_addr == NULL) {</div><div class='add'>+	if (!card-&gt;base_addr) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto failure_cleanup;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -288,12 +322,20 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (card-&gt;version == 3) {</div><div class='add'>+		/* ASIX chip asserts local reset to CAN controllers</div><div class='add'>+		 * after bootup until it is deasserted</div><div class='add'>+		 */</div><div class='add'>+		writel(readl(card-&gt;conf_addr + ASIX_LIEMR) &amp; ~ASIX_LIEMR_LRST,</div><div class='add'>+		       card-&gt;conf_addr + ASIX_LIEMR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ems_pci_card_reset(card);</div><div class='ctx'> </div><div class='ctx'> 	/* Detect available channels */</div><div class='ctx'> 	for (i = 0; i &lt; max_chan; i++) {</div><div class='ctx'> 		dev = alloc_sja1000dev(0);</div><div class='del'>-		if (dev == NULL) {</div><div class='add'>+		if (!dev) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto failure_cleanup;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -304,16 +346,25 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> 		priv-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;irq = pdev-&gt;irq;</div><div class='del'>-		priv-&gt;reg_base = card-&gt;base_addr + EMS_PCI_CAN_BASE_OFFSET</div><div class='del'>-					+ (i * EMS_PCI_CAN_CTRL_SIZE);</div><div class='add'>+</div><div class='ctx'> 		if (card-&gt;version == 1) {</div><div class='ctx'> 			priv-&gt;read_reg  = ems_pci_v1_read_reg;</div><div class='ctx'> 			priv-&gt;write_reg = ems_pci_v1_write_reg;</div><div class='ctx'> 			priv-&gt;post_irq  = ems_pci_v1_post_irq;</div><div class='del'>-		} else {</div><div class='add'>+			priv-&gt;reg_base = card-&gt;base_addr + EMS_PCI_V1_CAN_BASE_OFFSET</div><div class='add'>+					+ (i * EMS_PCI_V1_CAN_CTRL_SIZE);</div><div class='add'>+		} else if (card-&gt;version == 2) {</div><div class='ctx'> 			priv-&gt;read_reg  = ems_pci_v2_read_reg;</div><div class='ctx'> 			priv-&gt;write_reg = ems_pci_v2_write_reg;</div><div class='ctx'> 			priv-&gt;post_irq  = ems_pci_v2_post_irq;</div><div class='add'>+			priv-&gt;reg_base = card-&gt;base_addr + EMS_PCI_V2_CAN_BASE_OFFSET</div><div class='add'>+					+ (i * EMS_PCI_V2_CAN_CTRL_SIZE);</div><div class='add'>+		} else {</div><div class='add'>+			priv-&gt;read_reg  = ems_pci_v3_read_reg;</div><div class='add'>+			priv-&gt;write_reg = ems_pci_v3_write_reg;</div><div class='add'>+			priv-&gt;post_irq  = ems_pci_v3_post_irq;</div><div class='add'>+			priv-&gt;reg_base = card-&gt;base_addr + EMS_PCI_V3_CAN_BASE_OFFSET</div><div class='add'>+					+ (i * EMS_PCI_V3_CAN_CTRL_SIZE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check if channel is present */</div><div class='hunk'>@@ -325,20 +376,28 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> 			SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 			dev-&gt;dev_id = i;</div><div class='ctx'> </div><div class='del'>-			if (card-&gt;version == 1)</div><div class='add'>+			if (card-&gt;version == 1) {</div><div class='ctx'> 				/* reset int flag of pita */</div><div class='ctx'> 				writel(PITA2_ICR_INT0_EN | PITA2_ICR_INT0,</div><div class='ctx'> 				       card-&gt;conf_addr + PITA2_ICR);</div><div class='del'>-			else</div><div class='add'>+			} else if (card-&gt;version == 2) {</div><div class='ctx'> 				/* enable IRQ in PLX 9030 */</div><div class='ctx'> 				writel(PLX_ICSR_ENA_CLR,</div><div class='ctx'> 				       card-&gt;conf_addr + PLX_ICSR);</div><div class='add'>+			} else {</div><div class='add'>+				/* Enable IRQ in AX99100 */</div><div class='add'>+				writel(ASIX_LINTSR_INT0AC, card-&gt;conf_addr + ASIX_LINTSR);</div><div class='add'>+				/* Enable local INT0 input enable */</div><div class='add'>+				writel(readl(card-&gt;conf_addr + ASIX_LIEMR) | ASIX_LIEMR_L0EINTEN,</div><div class='add'>+				       card-&gt;conf_addr + ASIX_LIEMR);</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* Register SJA1000 device */</div><div class='ctx'> 			err = register_sja1000dev(dev);</div><div class='ctx'> 			if (err) {</div><div class='del'>-				dev_err(&amp;pdev-&gt;dev, "Registering device failed "</div><div class='del'>-							"(err=%d)\n", err);</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+					"Registering device failed: %pe\n",</div><div class='add'>+					ERR_PTR(err));</div><div class='ctx'> 				free_sja1000dev(dev);</div><div class='ctx'> 				goto failure_cleanup;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -346,7 +405,7 @@ static int ems_pci_add_card(struct pci_dev *pdev,</div><div class='ctx'> 			card-&gt;channels++;</div><div class='ctx'> </div><div class='ctx'> 			dev_info(&amp;pdev-&gt;dev, "Channel #%d at 0x%p, irq %d\n",</div><div class='del'>-					i + 1, priv-&gt;reg_base, dev-&gt;irq);</div><div class='add'>+				 i + 1, priv-&gt;reg_base, dev-&gt;irq);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			free_sja1000dev(dev);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c<br/>index 381de998d2f1..4642b6d4aaf7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/ems_pcmcia.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/ems_pcmcia.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/ems_pcmcia.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/ems_pcmcia.c</a></div><div class='hunk'>@@ -1,16 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2008 Sebastian Haas (initial chardev implementation)</div><div class='ctx'>  * Copyright (C) 2010 Markus Plessing &lt;plessing@ems-wuensche.com&gt;</div><div class='ctx'>  * Rework for mainline by Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -29,7 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Markus Plessing &lt;plessing@ems-wuensche.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Socket-CAN driver for EMS CPC-CARD cards");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("EMS CPC-CARD CAN card");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> #define EMS_PCMCIA_MAX_CHAN 2</div><div class='hunk'>@@ -243,7 +234,12 @@ static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)</div><div class='ctx'> 			free_sja1000dev(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = request_irq(dev-&gt;irq, &amp;ems_pcmcia_interrupt, IRQF_SHARED,</div><div class='add'>+	if (!card-&gt;channels) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto failure_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = request_irq(pdev-&gt;irq, &amp;ems_pcmcia_interrupt, IRQF_SHARED,</div><div class='ctx'> 			  DRV_NAME, card);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return 0;</div><div class='head'>diff --git a/drivers/net/can/sja1000/f81601.c b/drivers/net/can/sja1000/f81601.c<br/>new file mode 100644<br/>index 000000000000..8f25e95814ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/f81601.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/f81601.c</a></div><div class='hunk'>@@ -0,0 +1,211 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Fintek F81601 PCIE to 2 CAN controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Peter Hong &lt;peter_hong@fintek.com.tw&gt;</div><div class='add'>+ * Copyright (C) 2019 Linux Foundation</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "sja1000.h"</div><div class='add'>+</div><div class='add'>+#define F81601_PCI_MAX_CHAN		2</div><div class='add'>+</div><div class='add'>+#define F81601_DECODE_REG		0x209</div><div class='add'>+#define F81601_IO_MODE			BIT(7)</div><div class='add'>+#define F81601_MEM_MODE			BIT(6)</div><div class='add'>+#define F81601_CFG_MODE			BIT(5)</div><div class='add'>+#define F81601_CAN2_INTERNAL_CLK	BIT(3)</div><div class='add'>+#define F81601_CAN1_INTERNAL_CLK	BIT(2)</div><div class='add'>+#define F81601_CAN2_EN			BIT(1)</div><div class='add'>+#define F81601_CAN1_EN			BIT(0)</div><div class='add'>+</div><div class='add'>+#define F81601_TRAP_REG			0x20a</div><div class='add'>+#define F81601_CAN2_HAS_EN		BIT(4)</div><div class='add'>+</div><div class='add'>+struct f81601_pci_card {</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	spinlock_t lock;	/* use this spin lock only for write access */</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	struct net_device *net_dev[F81601_PCI_MAX_CHAN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id f81601_pci_tbl[] = {</div><div class='add'>+	{ PCI_DEVICE(0x1c29, 0x1703) },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(pci, f81601_pci_tbl);</div><div class='add'>+</div><div class='add'>+static bool internal_clk = true;</div><div class='add'>+module_param(internal_clk, bool, 0444);</div><div class='add'>+MODULE_PARM_DESC(internal_clk, "Use internal clock, default true (24MHz)");</div><div class='add'>+</div><div class='add'>+static unsigned int external_clk;</div><div class='add'>+module_param(external_clk, uint, 0444);</div><div class='add'>+MODULE_PARM_DESC(external_clk, "External clock when internal_clk disabled");</div><div class='add'>+</div><div class='add'>+static u8 f81601_pci_read_reg(const struct sja1000_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	return readb(priv-&gt;reg_base + port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81601_pci_write_reg(const struct sja1000_priv *priv, int port,</div><div class='add'>+				 u8 val)</div><div class='add'>+{</div><div class='add'>+	struct f81601_pci_card *card = priv-&gt;priv;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;card-&gt;lock, flags);</div><div class='add'>+	writeb(val, priv-&gt;reg_base + port);</div><div class='add'>+	readb(priv-&gt;reg_base);</div><div class='add'>+	spin_unlock_irqrestore(&amp;card-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81601_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct f81601_pci_card *card = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(card-&gt;net_dev); i++) {</div><div class='add'>+		dev = card-&gt;net_dev[i];</div><div class='add'>+		if (!dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "%s: Removing %s\n", __func__, dev-&gt;name);</div><div class='add'>+</div><div class='add'>+		unregister_sja1000dev(dev);</div><div class='add'>+		free_sja1000dev(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Probe F81601 based device for the SJA1000 chips and register each</div><div class='add'>+ * available CAN channel to SJA1000 Socket-CAN subsystem.</div><div class='add'>+ */</div><div class='add'>+static int f81601_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			    const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct sja1000_priv *priv;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct f81601_pci_card *card;</div><div class='add'>+	int err, i, count;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	if (pcim_enable_device(pdev) &lt; 0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to enable PCI device\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "Detected card at slot #%i\n",</div><div class='add'>+		 PCI_SLOT(pdev-&gt;devfn));</div><div class='add'>+</div><div class='add'>+	card = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*card), GFP_KERNEL);</div><div class='add'>+	if (!card)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	card-&gt;dev = pdev;</div><div class='add'>+	spin_lock_init(&amp;card-&gt;lock);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, card);</div><div class='add'>+</div><div class='add'>+	tmp = F81601_IO_MODE | F81601_MEM_MODE | F81601_CFG_MODE |</div><div class='add'>+		F81601_CAN2_EN | F81601_CAN1_EN;</div><div class='add'>+</div><div class='add'>+	if (internal_clk) {</div><div class='add'>+		tmp |= F81601_CAN2_INTERNAL_CLK | F81601_CAN1_INTERNAL_CLK;</div><div class='add'>+</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+			 "F81601 running with internal clock: 24Mhz\n");</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev,</div><div class='add'>+			 "F81601 running with external clock: %dMhz\n",</div><div class='add'>+			 external_clk / 1000000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_write_config_byte(pdev, F81601_DECODE_REG, tmp);</div><div class='add'>+</div><div class='add'>+	card-&gt;addr = pcim_iomap(pdev, 0, pci_resource_len(pdev, 0));</div><div class='add'>+</div><div class='add'>+	if (!card-&gt;addr) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "%s: Failed to remap BAR\n", __func__);</div><div class='add'>+		goto failure_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* read CAN2_HW_EN strap pin to detect how many CANBUS do we have */</div><div class='add'>+	count = ARRAY_SIZE(card-&gt;net_dev);</div><div class='add'>+	pci_read_config_byte(pdev, F81601_TRAP_REG, &amp;tmp);</div><div class='add'>+	if (!(tmp &amp; F81601_CAN2_HAS_EN))</div><div class='add'>+		count = 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		dev = alloc_sja1000dev(0);</div><div class='add'>+		if (!dev) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto failure_cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv = netdev_priv(dev);</div><div class='add'>+		priv-&gt;priv = card;</div><div class='add'>+		priv-&gt;irq_flags = IRQF_SHARED;</div><div class='add'>+		priv-&gt;reg_base = card-&gt;addr + 0x80 * i;</div><div class='add'>+		priv-&gt;read_reg = f81601_pci_read_reg;</div><div class='add'>+		priv-&gt;write_reg = f81601_pci_write_reg;</div><div class='add'>+</div><div class='add'>+		if (internal_clk)</div><div class='add'>+			priv-&gt;can.clock.freq = 24000000 / 2;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;can.clock.freq = external_clk / 2;</div><div class='add'>+</div><div class='add'>+		priv-&gt;ocr = OCR_TX0_PUSHPULL | OCR_TX1_PUSHPULL;</div><div class='add'>+		priv-&gt;cdr = CDR_CBP;</div><div class='add'>+</div><div class='add'>+		SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='add'>+		dev-&gt;dev_id = i;</div><div class='add'>+		dev-&gt;irq = pdev-&gt;irq;</div><div class='add'>+</div><div class='add'>+		/* Register SJA1000 device */</div><div class='add'>+		err = register_sja1000dev(dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+				"%s: Registering device failed: %x\n", __func__,</div><div class='add'>+				err);</div><div class='add'>+			free_sja1000dev(dev);</div><div class='add'>+			goto failure_cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		card-&gt;net_dev[i] = dev;</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Channel #%d, %s at 0x%p, irq %d\n", i,</div><div class='add'>+			 dev-&gt;name, priv-&gt;reg_base, dev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ failure_cleanup:</div><div class='add'>+	dev_err(&amp;pdev-&gt;dev, "%s: failed: %d. Cleaning Up.\n", __func__, err);</div><div class='add'>+	f81601_pci_remove(pdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver f81601_pci_driver = {</div><div class='add'>+	.name =	"f81601",</div><div class='add'>+	.id_table = f81601_pci_tbl,</div><div class='add'>+	.probe = f81601_pci_probe,</div><div class='add'>+	.remove = f81601_pci_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Fintek F81601 PCIE to 2 CANBUS adaptor driver");</div><div class='add'>+MODULE_AUTHOR("Peter Hong &lt;peter_hong@fintek.com.tw&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+module_pci_driver(f81601_pci_driver);</div><div class='head'>diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c<br/>index 15c00faeec61..95fe9ee1ce32 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/kvaser_pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/kvaser_pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/kvaser_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/kvaser_pci.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2008 Per Dalen &lt;per.dalen@cnw.se&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -15,18 +16,6 @@</div><div class='ctx'>  *   Copyright (c) 2002-2007 Volkswagen Group Electronic Research</div><div class='ctx'>  *   Copyright (c) 2003 Matthias Brukner, Trajet Gmbh, Rebenring 33,</div><div class='ctx'>  *   38106 Braunschweig, GERMANY</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -44,7 +33,6 @@</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Per Dalen &lt;per.dalen@cnw.se&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Socket-CAN driver for KVASER PCAN PCI cards");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("KVASER PCAN PCI CAN card");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> #define MAX_NO_OF_CHANNELS        4 /* max no of channels on a single card */</div><div class='head'>diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c<br/>index a97b81d1d0da..10d88cbda465 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/peak_pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/peak_pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/peak_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/peak_pci.c</a></div><div class='hunk'>@@ -1,19 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2007, 2011 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- * Copyright (C) 2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_pci.c:</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2001-2006  PEAK System-Technik GmbH</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+ * Copyright (C) 2001-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -30,14 +22,16 @@</div><div class='ctx'> </div><div class='ctx'> #include "sja1000.h"</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe/PCIeC miniPCI CAN cards");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK PCAN miniPCIe/cPCI PC/104+ PCI/104e CAN Cards");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME  "peak_pci"</div><div class='ctx'> </div><div class='add'>+/* FPGA cards FW version registers */</div><div class='add'>+#define PEAK_VER_REG1		0x40</div><div class='add'>+#define PEAK_VER_REG2		0x44</div><div class='add'>+</div><div class='ctx'> struct peak_pciec_card;</div><div class='ctx'> struct peak_pci_chan {</div><div class='ctx'> 	void __iomem *cfg_base;		/* Common for all channels */</div><div class='hunk'>@@ -51,9 +45,7 @@ struct peak_pci_chan {</div><div class='ctx'> #define PEAK_PCI_CDR		(CDR_CBP | CDR_CLKOUT_MASK)</div><div class='ctx'> #define PEAK_PCI_OCR		OCR_TX0_PUSHPULL</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Important PITA registers</div><div class='del'>- */</div><div class='add'>+/* Important PITA registers */</div><div class='ctx'> #define PITA_ICR		0x00	/* Interrupt control register */</div><div class='ctx'> #define PITA_GPIOICR		0x18	/* GPIO interface control register */</div><div class='ctx'> #define PITA_MISC		0x1C	/* Miscellaneous register */</div><div class='hunk'>@@ -80,32 +72,52 @@ static const u16 peak_pci_icr_masks[PEAK_PCI_CHAN_MAX] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id peak_pci_tbl[] = {</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_MPCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='add'>+	{</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-PCI",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-PCI Express",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-miniPCI",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_MPCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-miniPCIe",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-PC/104-Plus Quad",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-PCI/104-Express",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-cPCI",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-Chip PCIe",</div><div class='add'>+	},</div><div class='ctx'> #ifdef CONFIG_CAN_PEAK_PCIEC</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='del'>-	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC34_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},</div><div class='add'>+	{</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-ExpressCard",</div><div class='add'>+	}, {</div><div class='add'>+		PEAK_PCI_VENDOR_ID, PEAK_PCIEC34_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,</div><div class='add'>+		.driver_data = (kernel_ulong_t)"PCAN-ExpressCard 34",</div><div class='add'>+	},</div><div class='ctx'> #endif</div><div class='del'>-	{0,}</div><div class='add'>+	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, peak_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CAN_PEAK_PCIEC</div><div class='del'>-/*</div><div class='del'>- * PCAN-ExpressCard needs I2C bit-banging configuration option.</div><div class='del'>- */</div><div class='add'>+/* PCAN-ExpressCard needs I2C bit-banging configuration option. */</div><div class='ctx'> </div><div class='ctx'> /* GPIOICR byte access offsets */</div><div class='ctx'> #define PITA_GPOUT		0x18	/* GPx output value */</div><div class='ctx'> #define PITA_GPIN		0x19	/* GPx input value */</div><div class='del'>-#define PITA_GPOEN		0x1A	/* configure GPx as ouput pin */</div><div class='add'>+#define PITA_GPOEN		0x1A	/* configure GPx as output pin */</div><div class='ctx'> </div><div class='ctx'> /* I2C GP bits */</div><div class='ctx'> #define PITA_GPIN_SCL		0x01	/* Serial Clock Line */</div><div class='hunk'>@@ -166,12 +178,14 @@ static void peak_pci_write_reg(const struct sja1000_priv *priv,</div><div class='ctx'> static inline void pita_set_scl_highz(struct peak_pciec_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	u8 gp_outen = readb(card-&gt;cfg_base + PITA_GPOEN) &amp; ~PITA_GPIN_SCL;</div><div class='add'>+</div><div class='ctx'> 	writeb(gp_outen, card-&gt;cfg_base + PITA_GPOEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void pita_set_sda_highz(struct peak_pciec_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	u8 gp_outen = readb(card-&gt;cfg_base + PITA_GPOEN) &amp; ~PITA_GPIN_SDA;</div><div class='add'>+</div><div class='ctx'> 	writeb(gp_outen, card-&gt;cfg_base + PITA_GPOEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -240,9 +254,7 @@ static int pita_getscl(void *data)</div><div class='ctx'> 	return (readb(card-&gt;cfg_base + PITA_GPIN) &amp; PITA_GPIN_SCL) ? 1 : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * write commands to the LED chip though the I2C-bus of the PCAN-PCIeC</div><div class='del'>- */</div><div class='add'>+/* write commands to the LED chip though the I2C-bus of the PCAN-PCIeC */</div><div class='ctx'> static int peak_pciec_write_pca9553(struct peak_pciec_card *card,</div><div class='ctx'> 				    u8 offset, u8 data)</div><div class='ctx'> {</div><div class='hunk'>@@ -258,7 +270,7 @@ static int peak_pciec_write_pca9553(struct peak_pciec_card *card,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* cache led mask */</div><div class='del'>-	if ((offset == 5) &amp;&amp; (data == card-&gt;led_cache))</div><div class='add'>+	if (offset == 5 &amp;&amp; data == card-&gt;led_cache)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	ret = i2c_transfer(&amp;card-&gt;led_chip, &amp;msg, 1);</div><div class='hunk'>@@ -271,9 +283,7 @@ static int peak_pciec_write_pca9553(struct peak_pciec_card *card,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * delayed work callback used to control the LEDs</div><div class='del'>- */</div><div class='add'>+/* delayed work callback used to control the LEDs */</div><div class='ctx'> static void peak_pciec_led_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct peak_pciec_card *card =</div><div class='hunk'>@@ -319,9 +329,7 @@ static void peak_pciec_led_work(struct work_struct *work)</div><div class='ctx'> 		schedule_delayed_work(&amp;card-&gt;led_work, HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * set LEDs blinking state</div><div class='del'>- */</div><div class='add'>+/* set LEDs blinking state */</div><div class='ctx'> static void peak_pciec_set_leds(struct peak_pciec_card *card, u8 led_mask, u8 s)</div><div class='ctx'> {</div><div class='ctx'> 	u8 new_led = card-&gt;led_cache;</div><div class='hunk'>@@ -338,25 +346,19 @@ static void peak_pciec_set_leds(struct peak_pciec_card *card, u8 led_mask, u8 s)</div><div class='ctx'> 	peak_pciec_write_pca9553(card, 5, new_led);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * start one second delayed work to control LEDs</div><div class='del'>- */</div><div class='add'>+/* start one second delayed work to control LEDs */</div><div class='ctx'> static void peak_pciec_start_led_work(struct peak_pciec_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	schedule_delayed_work(&amp;card-&gt;led_work, HZ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * stop LEDs delayed work</div><div class='del'>- */</div><div class='add'>+/* stop LEDs delayed work */</div><div class='ctx'> static void peak_pciec_stop_led_work(struct peak_pciec_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;card-&gt;led_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * initialize the PCA9553 4-bit I2C-bus LED chip</div><div class='del'>- */</div><div class='add'>+/* initialize the PCA9553 4-bit I2C-bus LED chip */</div><div class='ctx'> static int peak_pciec_init_leds(struct peak_pciec_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -385,17 +387,14 @@ static int peak_pciec_init_leds(struct peak_pciec_card *card)</div><div class='ctx'> 	return peak_pciec_write_pca9553(card, 5, PCA9553_LS0_INIT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * restore LEDs state to off peak_pciec_leds_exit</div><div class='del'>- */</div><div class='add'>+/* restore LEDs state to off peak_pciec_leds_exit */</div><div class='ctx'> static void peak_pciec_leds_exit(struct peak_pciec_card *card)</div><div class='ctx'> {</div><div class='ctx'> 	/* switch LEDs to off */</div><div class='ctx'> 	peak_pciec_write_pca9553(card, 5, PCA9553_LED_OFF_ALL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * normal write sja1000 register method overloaded to catch when controller</div><div class='add'>+/* normal write sja1000 register method overloaded to catch when controller</div><div class='ctx'>  * is started or stopped, to control leds</div><div class='ctx'>  */</div><div class='ctx'> static void peak_pciec_write_reg(const struct sja1000_priv *priv,</div><div class='hunk'>@@ -425,7 +424,7 @@ static void peak_pciec_write_reg(const struct sja1000_priv *priv,</div><div class='ctx'> 	peak_pci_write_reg(priv, port, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct i2c_algo_bit_data peak_pciec_i2c_bit_ops = {</div><div class='add'>+static const struct i2c_algo_bit_data peak_pciec_i2c_bit_ops = {</div><div class='ctx'> 	.setsda	= pita_setsda,</div><div class='ctx'> 	.setscl	= pita_setscl,</div><div class='ctx'> 	.getsda	= pita_getsda,</div><div class='hunk'>@@ -453,7 +452,7 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	/* channel is the first one: do the init part */</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* create the bit banging I2C adapter structure */</div><div class='del'>-		card = kzalloc(sizeof(struct peak_pciec_card), GFP_KERNEL);</div><div class='add'>+		card = kzalloc(sizeof(*card), GFP_KERNEL);</div><div class='ctx'> 		if (!card)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -463,7 +462,7 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		card-&gt;led_chip.owner = THIS_MODULE;</div><div class='ctx'> 		card-&gt;led_chip.dev.parent = &amp;pdev-&gt;dev;</div><div class='ctx'> 		card-&gt;led_chip.algo_data = &amp;card-&gt;i2c_bit;</div><div class='del'>-		strncpy(card-&gt;led_chip.name, "peak_i2c",</div><div class='add'>+		strscpy(card-&gt;led_chip.name, "peak_i2c",</div><div class='ctx'> 			sizeof(card-&gt;led_chip.name));</div><div class='ctx'> </div><div class='ctx'> 		card-&gt;i2c_bit = peak_pciec_i2c_bit_ops;</div><div class='hunk'>@@ -516,9 +515,7 @@ static void peak_pciec_remove(struct peak_pciec_card *card)</div><div class='ctx'> </div><div class='ctx'> #else /* CONFIG_CAN_PEAK_PCIEC */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Placebo functions when PCAN-ExpressCard support is not selected</div><div class='del'>- */</div><div class='add'>+/* Placebo functions when PCAN-ExpressCard support is not selected */</div><div class='ctx'> static inline int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -559,6 +556,7 @@ static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	void __iomem *cfg_base, *reg_base;</div><div class='ctx'> 	u16 sub_sys_id, icr;</div><div class='ctx'> 	int i, err, channels;</div><div class='add'>+	char fw_str[14] = "";</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -612,6 +610,21 @@ static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* Leave parport mux mode */</div><div class='ctx'> 	writeb(0x04, cfg_base + PITA_MISC + 3);</div><div class='ctx'> </div><div class='add'>+	/* FPGA equipped card if not 0 */</div><div class='add'>+	if (readl(cfg_base + PEAK_VER_REG1)) {</div><div class='add'>+		/* FPGA card: display version of the running firmware */</div><div class='add'>+		u32 fw_ver = readl(cfg_base + PEAK_VER_REG2);</div><div class='add'>+</div><div class='add'>+		snprintf(fw_str, sizeof(fw_str), " FW v%u.%u.%u",</div><div class='add'>+			 (fw_ver &gt;&gt; 12) &amp; 0xf,</div><div class='add'>+			 (fw_ver &gt;&gt; 8) &amp; 0xf,</div><div class='add'>+			 (fw_ver &gt;&gt; 4) &amp; 0xf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Display commercial name (and, eventually, FW version) of the card */</div><div class='add'>+	dev_info(&amp;pdev-&gt;dev, "%ux CAN %s%s\n",</div><div class='add'>+		 channels, (const char *)ent-&gt;driver_data, fw_str);</div><div class='add'>+</div><div class='ctx'> 	icr = readw(cfg_base + PITA_ICR + 2);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; channels; i++) {</div><div class='hunk'>@@ -652,8 +665,7 @@ static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		chan-&gt;prev_dev = pci_get_drvdata(pdev);</div><div class='ctx'> 		pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-		/*</div><div class='del'>-		 * PCAN-ExpressCard needs some additional i2c init.</div><div class='add'>+		/* PCAN-ExpressCard needs some additional i2c init.</div><div class='ctx'> 		 * This must be done *before* register_sja1000dev() but</div><div class='ctx'> 		 * *after* devices linkage</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -719,7 +731,8 @@ failure_disable_pci:</div><div class='ctx'> </div><div class='ctx'> 	/* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while</div><div class='ctx'> 	 * the probe() function must return a negative errno in case of failure</div><div class='del'>-	 * (err is unchanged if negative) */</div><div class='add'>+	 * (err is unchanged if negative)</div><div class='add'>+	 */</div><div class='ctx'> 	return pcibios_err_to_errno(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -739,16 +752,15 @@ static void peak_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 		struct net_device *prev_dev = chan-&gt;prev_dev;</div><div class='ctx'> </div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev, "removing device %s\n", dev-&gt;name);</div><div class='add'>+		/* do that only for first channel */</div><div class='add'>+		if (!prev_dev &amp;&amp; chan-&gt;pciec_card)</div><div class='add'>+			peak_pciec_remove(chan-&gt;pciec_card);</div><div class='ctx'> 		unregister_sja1000dev(dev);</div><div class='ctx'> 		free_sja1000dev(dev);</div><div class='ctx'> 		dev = prev_dev;</div><div class='ctx'> </div><div class='del'>-		if (!dev) {</div><div class='del'>-			/* do that only for first channel */</div><div class='del'>-			if (chan-&gt;pciec_card)</div><div class='del'>-				peak_pciec_remove(chan-&gt;pciec_card);</div><div class='add'>+		if (!dev)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		priv = netdev_priv(dev);</div><div class='ctx'> 		chan = priv-&gt;priv;</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c<br/>index b8c39ede7cd5..e1610b527d13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/peak_pcmcia.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/peak_pcmcia.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/peak_pcmcia.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/peak_pcmcia.c</a></div><div class='hunk'>@@ -1,18 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='del'>- * Copyright (C) 2010-2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='del'>- *</div><div class='ctx'>  * CAN driver for PEAK-System PCAN-PC Card</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_pccard.c</div><div class='del'>- * Copyright (C) 2006-2010 PEAK System-Technik GmbH</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='ctx'>  *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='add'>+ * Copyright (C) 2006-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -27,10 +19,9 @@</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include "sja1000.h"</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("CAN driver for PEAK-System PCAN-PC Cards");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK PCAN-PC Card");</div><div class='ctx'> </div><div class='ctx'> /* PEAK-System PCMCIA driver name */</div><div class='ctx'> #define PCC_NAME		"peak_pcmcia"</div><div class='hunk'>@@ -176,7 +167,7 @@ static void pcan_start_led_timer(struct pcan_pccard *card)</div><div class='ctx'>  */</div><div class='ctx'> static void pcan_stop_led_timer(struct pcan_pccard *card)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;card-&gt;led_timer);</div><div class='add'>+	timer_delete_sync(&amp;card-&gt;led_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -383,7 +374,7 @@ static inline void pcan_set_can_power(struct pcan_pccard *card, int onoff)</div><div class='ctx'>  */</div><div class='ctx'> static void pcan_led_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct pcan_pccard *card = from_timer(card, t, led_timer);</div><div class='add'>+	struct pcan_pccard *card = timer_container_of(card, t, led_timer);</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	int i, up_count = 0;</div><div class='ctx'> 	u8 ccr;</div><div class='hunk'>@@ -487,7 +478,7 @@ static void pcan_free_channels(struct pcan_pccard *card)</div><div class='ctx'> 		if (!netdev)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		strncpy(name, netdev-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, netdev-&gt;name, IFNAMSIZ);</div><div class='ctx'> </div><div class='ctx'> 		unregister_sja1000dev(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -679,7 +670,7 @@ static int pcan_probe(struct pcmcia_device *pdev)</div><div class='ctx'> 	card-&gt;fw_major = pcan_read_reg(card, PCC_FW_MAJOR);</div><div class='ctx'> 	card-&gt;fw_minor = pcan_read_reg(card, PCC_FW_MINOR);</div><div class='ctx'> </div><div class='del'>-	/* display board name and firware version */</div><div class='add'>+	/* display board name and firmware version */</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "PEAK-System pcmcia card %s fw %d.%d\n",</div><div class='ctx'> 		pdev-&gt;prod_id[1] ? pdev-&gt;prod_id[1] : "PCAN-PC Card",</div><div class='ctx'> 		card-&gt;fw_major, card-&gt;fw_minor);</div><div class='head'>diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c<br/>index 9bcdefea138a..67e5316c6372 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/plx_pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/plx_pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/plx_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/plx_pci.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2008-2010 Pavel Cheblakov &lt;P.B.Cheblakov@inp.nsk.su&gt;</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,18 +6,6 @@</div><div class='ctx'>  *	Copyright (C) 2007 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='ctx'>  *	Copyright (C) 2008 Markus Plessing &lt;plessing@ems-wuensche.com&gt;</div><div class='ctx'>  *	Copyright (C) 2008 Sebastian Haas &lt;haas@ems-wuensche.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -36,18 +25,6 @@</div><div class='ctx'> MODULE_AUTHOR("Pavel Cheblakov &lt;P.B.Cheblakov@inp.nsk.su&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Socket-CAN driver for PLX90xx PCI-bridge cards with "</div><div class='ctx'> 		   "the SJA1000 chips");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("Adlink PCI-7841/cPCI-7841, "</div><div class='del'>-			"Adlink PCI-7841/cPCI-7841 SE, "</div><div class='del'>-			"Marathon CAN-bus-PCI, "</div><div class='del'>-			"Marathon CAN-bus-PCIe, "</div><div class='del'>-			"TEWS TECHNOLOGIES TPMC810, "</div><div class='del'>-			"esd CAN-PCI/CPCI/PCI104/200, "</div><div class='del'>-			"esd CAN-PCI/PMC/266, "</div><div class='del'>-			"esd CAN-PCIe/2000, "</div><div class='del'>-			"Connect Tech Inc. CANpro/104-Plus Opto (CRG001), "</div><div class='del'>-			"IXXAT PC-I 04/PCI, "</div><div class='del'>-			"ELCUS CAN-200-PCI, "</div><div class='del'>-			"ASEM DUAL CAN-RAW")</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> #define PLX_PCI_MAX_CHAN 2</div><div class='hunk'>@@ -145,7 +122,6 @@ struct plx_pci_card {</div><div class='ctx'> #define TEWS_PCI_VENDOR_ID		0x1498</div><div class='ctx'> #define TEWS_PCI_DEVICE_ID_TMPC810	0x032A</div><div class='ctx'> </div><div class='del'>-#define CTI_PCI_VENDOR_ID		0x12c4</div><div class='ctx'> #define CTI_PCI_DEVICE_ID_CRG001	0x0900</div><div class='ctx'> </div><div class='ctx'> #define MOXA_PCI_VENDOR_ID		0x1393</div><div class='hunk'>@@ -381,7 +357,7 @@ static const struct pci_device_id plx_pci_tbl[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		/* Connect Tech Inc. CANpro/104-Plus Opto (CRG001) card */</div><div class='ctx'> 		PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,</div><div class='del'>-		CTI_PCI_VENDOR_ID, CTI_PCI_DEVICE_ID_CRG001,</div><div class='add'>+		PCI_SUBVENDOR_ID_CONNECT_TECH, CTI_PCI_DEVICE_ID_CRG001,</div><div class='ctx'> 		0, 0,</div><div class='ctx'> 		(kernel_ulong_t)&amp;plx_pci_card_info_cti</div><div class='ctx'> 	},</div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c<br/>index 9f107798f904..a8fa0d6516b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/sja1000.c</a></div><div class='hunk'>@@ -52,6 +52,7 @@</div><div class='ctx'> #include &lt;linux/ptrace.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='hunk'>@@ -60,7 +61,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sja1000.h"</div><div class='ctx'> </div><div class='hunk'>@@ -184,8 +184,9 @@ static void chipset_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1000_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	/* set clock divider and output control register */</div><div class='del'>-	priv-&gt;write_reg(priv, SJA1000_CDR, priv-&gt;cdr | CDR_PELICAN);</div><div class='add'>+	if (!(priv-&gt;flags &amp; SJA1000_QUIRK_NO_CDR_REG))</div><div class='add'>+		/* set clock divider and output control register */</div><div class='add'>+		priv-&gt;write_reg(priv, SJA1000_CDR, priv-&gt;cdr | CDR_PELICAN);</div><div class='ctx'> </div><div class='ctx'> 	/* set acceptance filter (accept all) */</div><div class='ctx'> 	priv-&gt;write_reg(priv, SJA1000_ACCC0, 0x00);</div><div class='hunk'>@@ -205,12 +206,13 @@ static void sja1000_start(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1000_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	/* leave reset mode */</div><div class='add'>+	/* enter reset mode */</div><div class='ctx'> 	if (priv-&gt;can.state != CAN_STATE_STOPPED)</div><div class='ctx'> 		set_reset_mode(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize chip if uninitialized at this stage */</div><div class='del'>-	if (!(priv-&gt;read_reg(priv, SJA1000_CDR) &amp; CDR_PELICAN))</div><div class='add'>+	if (!(priv-&gt;flags &amp; SJA1000_QUIRK_NO_CDR_REG ||</div><div class='add'>+	      priv-&gt;read_reg(priv, SJA1000_CDR) &amp; CDR_PELICAN))</div><div class='ctx'> 		chipset_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear error counters and error code capture */</div><div class='hunk'>@@ -284,18 +286,17 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct sja1000_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> 	uint8_t fi;</div><div class='del'>-	uint8_t dlc;</div><div class='ctx'> 	canid_t id;</div><div class='ctx'> 	uint8_t dreg;</div><div class='ctx'> 	u8 cmd_reg_val = 0x00;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	fi = dlc = cf-&gt;can_dlc;</div><div class='add'>+	fi = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='ctx'> 	id = cf-&gt;can_id;</div><div class='ctx'> </div><div class='ctx'> 	if (id &amp; CAN_RTR_FLAG)</div><div class='hunk'>@@ -316,10 +317,10 @@ static netdev_tx_t sja1000_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		priv-&gt;write_reg(priv, SJA1000_ID2, (id &amp; 0x00000007) &lt;&lt; 5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dlc; i++)</div><div class='add'>+	for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 		priv-&gt;write_reg(priv, dreg++, cf-&gt;data[i]);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, dev, 0);</div><div class='add'>+	can_put_echo_skb(skb, dev, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='ctx'> 		cmd_reg_val |= CMD_AT;</div><div class='hunk'>@@ -367,24 +368,39 @@ static void sja1000_rx(struct net_device *dev)</div><div class='ctx'> 		    | (priv-&gt;read_reg(priv, SJA1000_ID2) &gt;&gt; 5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(fi &amp; 0x0F);</div><div class='add'>+	can_frame_set_cc_len(cf, fi &amp; 0x0F, priv-&gt;can.ctrlmode);</div><div class='ctx'> 	if (fi &amp; SJA1000_FI_RTR) {</div><div class='ctx'> 		id |= CAN_RTR_FLAG;</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 			cf-&gt;data[i] = priv-&gt;read_reg(priv, dreg++);</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	}</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	cf-&gt;can_id = id;</div><div class='ctx'> </div><div class='ctx'> 	/* release receive buffer */</div><div class='ctx'> 	sja1000_write_cmdreg(priv, CMD_RRB);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t sja1000_reset_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = (struct net_device *)dev_id;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(dev, "performing a soft reset upon overrun\n");</div><div class='add'>+</div><div class='add'>+	netif_tx_lock(dev);</div><div class='add'>+</div><div class='add'>+	can_free_echo_skb(dev, 0, NULL);</div><div class='add'>+	sja1000_set_mode(dev, CAN_MODE_START);</div><div class='add'>+</div><div class='add'>+	netif_tx_unlock(dev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_RX);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)</div><div class='hunk'>@@ -397,25 +413,33 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)</div><div class='ctx'> 	enum can_state rx_state, tx_state;</div><div class='ctx'> 	unsigned int rxerr, txerr;</div><div class='ctx'> 	uint8_t ecc, alc;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	txerr = priv-&gt;read_reg(priv, SJA1000_TXERR);</div><div class='ctx'> 	rxerr = priv-&gt;read_reg(priv, SJA1000_RXERR);</div><div class='ctx'> </div><div class='del'>-	cf-&gt;data[6] = txerr;</div><div class='del'>-	cf-&gt;data[7] = rxerr;</div><div class='del'>-</div><div class='ctx'> 	if (isrc &amp; IRQ_DOI) {</div><div class='ctx'> 		/* data overrun interrupt */</div><div class='ctx'> 		netdev_dbg(dev, "data overrun interrupt\n");</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		stats-&gt;rx_over_errors++;</div><div class='ctx'> 		stats-&gt;rx_errors++;</div><div class='ctx'> 		sja1000_write_cmdreg(priv, CMD_CDO);	/* clear bit */</div><div class='add'>+</div><div class='add'>+		/* Some controllers needs additional handling upon overrun</div><div class='add'>+		 * condition: the controller may sometimes be totally confused</div><div class='add'>+		 * and refuse any new frame while its buffer is empty. The only</div><div class='add'>+		 * way to re-sync the read vs. write buffer offsets is to</div><div class='add'>+		 * stop any current handling and perform a reset.</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;flags &amp; SJA1000_QUIRK_RESET_ON_OVERRUN)</div><div class='add'>+			ret = IRQ_WAKE_THREAD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (isrc &amp; IRQ_EI) {</div><div class='hunk'>@@ -429,36 +453,46 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)</div><div class='ctx'> 		else</div><div class='ctx'> 			state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	}</div><div class='add'>+	if (state != CAN_STATE_BUS_OFF &amp;&amp; skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = txerr;</div><div class='add'>+		cf-&gt;data[7] = rxerr;</div><div class='add'>+	}</div><div class='ctx'> 	if (isrc &amp; IRQ_BEI) {</div><div class='ctx'> 		/* bus error interrupt */</div><div class='ctx'> 		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='ctx'> </div><div class='ctx'> 		ecc = priv-&gt;read_reg(priv, SJA1000_ECC);</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='del'>-</div><div class='del'>-		/* set error type */</div><div class='del'>-		switch (ecc &amp; ECC_MASK) {</div><div class='del'>-		case ECC_BIT:</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-			break;</div><div class='del'>-		case ECC_FORM:</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-			break;</div><div class='del'>-		case ECC_STUFF:</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+			/* set error type */</div><div class='add'>+			switch (ecc &amp; ECC_MASK) {</div><div class='add'>+			case ECC_BIT:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+				break;</div><div class='add'>+			case ECC_FORM:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+				break;</div><div class='add'>+			case ECC_STUFF:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-		/* set error location */</div><div class='del'>-		cf-&gt;data[3] = ecc &amp; ECC_SEG;</div><div class='add'>+			/* set error location */</div><div class='add'>+			cf-&gt;data[3] = ecc &amp; ECC_SEG;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Error occurred during transmission? */</div><div class='del'>-		if ((ecc &amp; ECC_DIR) == 0)</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		if ((ecc &amp; ECC_DIR) == 0) {</div><div class='add'>+			stats-&gt;tx_errors++;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		} else {</div><div class='add'>+			stats-&gt;rx_errors++;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (isrc &amp; IRQ_EPI) {</div><div class='ctx'> 		/* error passive interrupt */</div><div class='hunk'>@@ -474,9 +508,10 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)</div><div class='ctx'> 		netdev_dbg(dev, "arbitration lost interrupt\n");</div><div class='ctx'> 		alc = priv-&gt;read_reg(priv, SJA1000_ALC);</div><div class='ctx'> 		priv-&gt;can.can_stats.arbitration_lost++;</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='del'>-		cf-&gt;data[0] = alc &amp; 0x1f;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='add'>+			cf-&gt;data[0] = alc &amp; 0x1f;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (state != priv-&gt;can.state) {</div><div class='hunk'>@@ -489,11 +524,12 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status)</div><div class='ctx'> 			can_bus_off(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t sja1000_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -502,7 +538,8 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct sja1000_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> 	uint8_t isrc, status;</div><div class='del'>-	int n = 0;</div><div class='add'>+	irqreturn_t ret = 0;</div><div class='add'>+	int n = 0, err;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;pre_irq)</div><div class='ctx'> 		priv-&gt;pre_irq(priv);</div><div class='hunk'>@@ -511,8 +548,8 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (priv-&gt;read_reg(priv, SJA1000_IER) == IRQ_OFF)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	while ((isrc = priv-&gt;read_reg(priv, SJA1000_IR)) &amp;&amp;</div><div class='del'>-	       (n &lt; SJA1000_MAX_IRQ)) {</div><div class='add'>+	while ((n &lt; SJA1000_MAX_IRQ) &amp;&amp;</div><div class='add'>+	       (isrc = priv-&gt;read_reg(priv, SJA1000_IR))) {</div><div class='ctx'> </div><div class='ctx'> 		status = priv-&gt;read_reg(priv, SJA1000_SR);</div><div class='ctx'> 		/* check for absent controller due to hw unplug */</div><div class='hunk'>@@ -527,16 +564,13 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT &amp;&amp;</div><div class='ctx'> 			    !(status &amp; SR_TCS)) {</div><div class='ctx'> 				stats-&gt;tx_errors++;</div><div class='del'>-				can_free_echo_skb(dev, 0);</div><div class='add'>+				can_free_echo_skb(dev, 0, NULL);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* transmission complete */</div><div class='del'>-				stats-&gt;tx_bytes +=</div><div class='del'>-					priv-&gt;read_reg(priv, SJA1000_FI) &amp; 0xf;</div><div class='add'>+				stats-&gt;tx_bytes += can_get_echo_skb(dev, 0, NULL);</div><div class='ctx'> 				stats-&gt;tx_packets++;</div><div class='del'>-				can_get_echo_skb(dev, 0);</div><div class='ctx'> 			}</div><div class='ctx'> 			netif_wake_queue(dev);</div><div class='del'>-			can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (isrc &amp; IRQ_RI) {</div><div class='ctx'> 			/* receive interrupt */</div><div class='hunk'>@@ -550,19 +584,25 @@ irqreturn_t sja1000_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (isrc &amp; (IRQ_DOI | IRQ_EI | IRQ_BEI | IRQ_EPI | IRQ_ALI)) {</div><div class='ctx'> 			/* error interrupt */</div><div class='del'>-			if (sja1000_err(dev, isrc, status))</div><div class='add'>+			err = sja1000_err(dev, isrc, status);</div><div class='add'>+			if (err == IRQ_WAKE_THREAD)</div><div class='add'>+				ret = err;</div><div class='add'>+			if (err)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> 		n++;</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = (n) ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;post_irq)</div><div class='ctx'> 		priv-&gt;post_irq(priv);</div><div class='ctx'> </div><div class='ctx'> 	if (n &gt;= SJA1000_MAX_IRQ)</div><div class='ctx'> 		netdev_dbg(dev, "%d messages handled in ISR", n);</div><div class='ctx'> </div><div class='del'>-	return (n) ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(sja1000_interrupt);</div><div class='ctx'> </div><div class='hunk'>@@ -581,8 +621,9 @@ static int sja1000_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* register interrupt handler, if not done by the device driver */</div><div class='ctx'> 	if (!(priv-&gt;flags &amp; SJA1000_CUSTOM_IRQ_HANDLER)) {</div><div class='del'>-		err = request_irq(dev-&gt;irq, sja1000_interrupt, priv-&gt;irq_flags,</div><div class='del'>-				  dev-&gt;name, (void *)dev);</div><div class='add'>+		err = request_threaded_irq(dev-&gt;irq, sja1000_interrupt,</div><div class='add'>+					   sja1000_reset_interrupt,</div><div class='add'>+					   priv-&gt;irq_flags, dev-&gt;name, (void *)dev);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			close_candev(dev);</div><div class='ctx'> 			return -EAGAIN;</div><div class='hunk'>@@ -592,8 +633,6 @@ static int sja1000_open(struct net_device *dev)</div><div class='ctx'> 	/* init and start chi */</div><div class='ctx'> 	sja1000_start(dev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_OPEN);</div><div class='del'>-</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -611,8 +650,6 @@ static int sja1000_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	close_candev(dev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -638,7 +675,8 @@ struct net_device *alloc_sja1000dev(int sizeof_priv)</div><div class='ctx'> 				       CAN_CTRLMODE_3_SAMPLES |</div><div class='ctx'> 				       CAN_CTRLMODE_ONE_SHOT |</div><div class='ctx'> 				       CAN_CTRLMODE_BERR_REPORTING |</div><div class='del'>-				       CAN_CTRLMODE_PRESUME_ACK;</div><div class='add'>+				       CAN_CTRLMODE_PRESUME_ACK |</div><div class='add'>+				       CAN_CTRLMODE_CC_LEN8_DLC;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;cmdreg_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -659,28 +697,25 @@ static const struct net_device_ops sja1000_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= sja1000_open,</div><div class='ctx'> 	.ndo_stop	= sja1000_close,</div><div class='ctx'> 	.ndo_start_xmit	= sja1000_start_xmit,</div><div class='del'>-	.ndo_change_mtu	= can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops sja1000_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int register_sja1000dev(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	if (!sja1000_probe_chip(dev))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;	/* we support local echo */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;sja1000_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;sja1000_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	set_reset_mode(dev);</div><div class='ctx'> 	chipset_init(dev);</div><div class='ctx'> </div><div class='del'>-	ret =  register_candev(dev);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		devm_can_led_init(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return register_candev(dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(register_sja1000dev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000.h b/drivers/net/can/sja1000/sja1000.h<br/>index 9d46398f8154..f015e39e2224 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/sja1000.h</a></div><div class='hunk'>@@ -145,7 +145,9 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Flags for sja1000priv.flags</div><div class='ctx'>  */</div><div class='del'>-#define SJA1000_CUSTOM_IRQ_HANDLER 0x1</div><div class='add'>+#define SJA1000_CUSTOM_IRQ_HANDLER	BIT(0)</div><div class='add'>+#define SJA1000_QUIRK_NO_CDR_REG	BIT(1)</div><div class='add'>+#define SJA1000_QUIRK_RESET_ON_OVERRUN	BIT(2)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * SJA1000 private data structure</div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c<br/>index 1a2ae6ce8d87..2d1f715459d7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000_isa.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000_isa.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000_isa.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/sja1000_isa.c</a></div><div class='hunk'>@@ -1,17 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2009 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -141,7 +130,7 @@ static int sja1000_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 			err = -EBUSY;</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='del'>-		base = ioremap_nocache(mem[idx], iosize);</div><div class='add'>+		base = ioremap(mem[idx], iosize);</div><div class='ctx'> 		if (!base) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto exit_release;</div><div class='hunk'>@@ -213,26 +202,28 @@ static int sja1000_isa_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "registering %s failed (err=%d)\n",</div><div class='ctx'> 			DRV_NAME, err);</div><div class='del'>-		goto exit_unmap;</div><div class='add'>+		goto exit_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "%s device registered (reg_base=0x%p, irq=%d)\n",</div><div class='ctx'> 		 DRV_NAME, priv-&gt;reg_base, dev-&gt;irq);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- exit_unmap:</div><div class='add'>+exit_free:</div><div class='add'>+	free_sja1000dev(dev);</div><div class='add'>+exit_unmap:</div><div class='ctx'> 	if (mem[idx])</div><div class='ctx'> 		iounmap(base);</div><div class='del'>- exit_release:</div><div class='add'>+exit_release:</div><div class='ctx'> 	if (mem[idx])</div><div class='ctx'> 		release_mem_region(mem[idx], iosize);</div><div class='ctx'> 	else</div><div class='ctx'> 		release_region(port[idx], iosize);</div><div class='del'>- exit:</div><div class='add'>+exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1000_isa_remove(struct platform_device *pdev)</div><div class='add'>+static void sja1000_isa_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct sja1000_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -250,8 +241,6 @@ static int sja1000_isa_remove(struct platform_device *pdev)</div><div class='ctx'> 			release_region(port[idx], SJA1000_IOSIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	free_sja1000dev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver sja1000_isa_driver = {</div><div class='head'>diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c<br/>index dc9c6db96c3c..2d555f854008 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000_platform.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/sja1000_platform.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/sja1000_platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/sja1000_platform.c</a></div><div class='hunk'>@@ -1,18 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 Sascha Hauer, Pengutronix</div><div class='ctx'>  * Copyright (C) 2007 Wolfgang Grandegger &lt;wg@grandegger.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -25,10 +14,9 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/platform/sja1000.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sja1000.h"</div><div class='ctx'> </div><div class='hunk'>@@ -43,7 +31,7 @@ MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> struct sja1000_of_data {</div><div class='ctx'> 	size_t  priv_sz;</div><div class='del'>-	int     (*init)(struct sja1000_priv *priv, struct device_node *of);</div><div class='add'>+	void    (*init)(struct sja1000_priv *priv, struct device_node *of);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct technologic_priv {</div><div class='hunk'>@@ -106,15 +94,18 @@ static void sp_technologic_write_reg16(const struct sja1000_priv *priv,</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;tp-&gt;io_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sp_technologic_init(struct sja1000_priv *priv, struct device_node *of)</div><div class='add'>+static void sp_technologic_init(struct sja1000_priv *priv, struct device_node *of)</div><div class='ctx'> {</div><div class='ctx'> 	struct technologic_priv *tp = priv-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;read_reg = sp_technologic_read_reg16;</div><div class='ctx'> 	priv-&gt;write_reg = sp_technologic_write_reg16;</div><div class='ctx'> 	spin_lock_init(&amp;tp-&gt;io_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void sp_rzn1_init(struct sja1000_priv *priv, struct device_node *of)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;flags = SJA1000_QUIRK_NO_CDR_REG | SJA1000_QUIRK_RESET_ON_OVERRUN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sp_populate(struct sja1000_priv *priv,</div><div class='hunk'>@@ -161,17 +152,19 @@ static void sp_populate_of(struct sja1000_priv *priv, struct device_node *of)</div><div class='ctx'> 		priv-&gt;read_reg = sp_read_reg16;</div><div class='ctx'> 		priv-&gt;write_reg = sp_write_reg16;</div><div class='ctx'> 		break;</div><div class='del'>-	case 1:	/* fallthrough */</div><div class='add'>+	case 1:</div><div class='ctx'> 	default:</div><div class='ctx'> 		priv-&gt;read_reg = sp_read_reg8;</div><div class='ctx'> 		priv-&gt;write_reg = sp_write_reg8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = of_property_read_u32(of, "nxp,external-clock-frequency", &amp;prop);</div><div class='del'>-	if (!err)</div><div class='del'>-		priv-&gt;can.clock.freq = prop / 2;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;can.clock.freq = SP_CAN_CLOCK; /* default */</div><div class='add'>+	if (!priv-&gt;can.clock.freq) {</div><div class='add'>+		err = of_property_read_u32(of, "nxp,external-clock-frequency", &amp;prop);</div><div class='add'>+		if (!err)</div><div class='add'>+			priv-&gt;can.clock.freq = prop / 2;</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;can.clock.freq = SP_CAN_CLOCK; /* default */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	err = of_property_read_u32(of, "nxp,tx-output-mode", &amp;prop);</div><div class='ctx'> 	if (!err)</div><div class='hunk'>@@ -206,8 +199,13 @@ static struct sja1000_of_data technologic_data = {</div><div class='ctx'> 	.init = sp_technologic_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct sja1000_of_data renesas_data = {</div><div class='add'>+	.init = sp_rzn1_init,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id sp_of_table[] = {</div><div class='ctx'> 	{ .compatible = "nxp,sja1000", .data = NULL, },</div><div class='add'>+	{ .compatible = "renesas,rzn1-sja1000", .data = &amp;renesas_data, },</div><div class='ctx'> 	{ .compatible = "technologic,sja1000", .data = &amp;technologic_data, },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='hunk'>@@ -222,9 +220,9 @@ static int sp_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct resource *res_mem, *res_irq = NULL;</div><div class='ctx'> 	struct sja1000_platform_data *pdata;</div><div class='ctx'> 	struct device_node *of = pdev-&gt;dev.of_node;</div><div class='del'>-	const struct of_device_id *of_id;</div><div class='ctx'> 	const struct sja1000_of_data *of_data = NULL;</div><div class='ctx'> 	size_t priv_sz = 0;</div><div class='add'>+	struct clk *clk;</div><div class='ctx'> </div><div class='ctx'> 	pdata = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!pdata &amp;&amp; !of) {</div><div class='hunk'>@@ -232,32 +230,28 @@ static int sp_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!res_mem)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (!devm_request_mem_region(&amp;pdev-&gt;dev, res_mem-&gt;start,</div><div class='del'>-				     resource_size(res_mem), DRV_NAME))</div><div class='del'>-		return -EBUSY;</div><div class='add'>+	addr = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;res_mem);</div><div class='add'>+	if (IS_ERR(addr))</div><div class='add'>+		return PTR_ERR(addr);</div><div class='ctx'> </div><div class='del'>-	addr = devm_ioremap_nocache(&amp;pdev-&gt;dev, res_mem-&gt;start,</div><div class='del'>-				    resource_size(res_mem));</div><div class='del'>-	if (!addr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (of)</div><div class='del'>-		irq = irq_of_parse_and_map(of, 0);</div><div class='del'>-	else</div><div class='add'>+	if (of) {</div><div class='add'>+		irq = platform_get_irq(pdev, 0);</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return irq;</div><div class='add'>+</div><div class='add'>+		clk = devm_clk_get_optional_enabled(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+		if (IS_ERR(clk))</div><div class='add'>+			return dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(clk),</div><div class='add'>+					     "CAN clk operation failed");</div><div class='add'>+	} else {</div><div class='ctx'> 		res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='add'>+		if (!res_irq)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!irq &amp;&amp; !res_irq)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	of_id = of_match_device(sp_of_table, &amp;pdev-&gt;dev);</div><div class='del'>-	if (of_id &amp;&amp; of_id-&gt;data) {</div><div class='del'>-		of_data = of_id-&gt;data;</div><div class='add'>+	of_data = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (of_data)</div><div class='ctx'> 		priv_sz = of_data-&gt;priv_sz;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_sja1000dev(priv_sz);</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -273,17 +267,26 @@ static int sp_probe(struct platform_device *pdev)</div><div class='ctx'> 		priv-&gt;irq_flags = IRQF_SHARED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;flags &amp; SJA1000_QUIRK_RESET_ON_OVERRUN)</div><div class='add'>+		priv-&gt;irq_flags |= IRQF_ONESHOT;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	priv-&gt;reg_base = addr;</div><div class='ctx'> </div><div class='ctx'> 	if (of) {</div><div class='del'>-		sp_populate_of(priv, of);</div><div class='del'>-</div><div class='del'>-		if (of_data &amp;&amp; of_data-&gt;init) {</div><div class='del'>-			err = of_data-&gt;init(priv, of);</div><div class='del'>-			if (err)</div><div class='add'>+		if (clk) {</div><div class='add'>+			priv-&gt;can.clock.freq  = clk_get_rate(clk) / 2;</div><div class='add'>+			if (!priv-&gt;can.clock.freq) {</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "Zero CAN clk rate");</div><div class='ctx'> 				goto exit_free;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		sp_populate_of(priv, of);</div><div class='add'>+</div><div class='add'>+		if (of_data &amp;&amp; of_data-&gt;init)</div><div class='add'>+			of_data-&gt;init(priv, of);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		sp_populate(priv, pdata, res_mem-&gt;flags);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -307,14 +310,12 @@ static int sp_probe(struct platform_device *pdev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sp_remove(struct platform_device *pdev)</div><div class='add'>+static void sp_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_sja1000dev(dev);</div><div class='ctx'> 	free_sja1000dev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver sp_driver = {</div><div class='head'>diff --git a/drivers/net/can/sja1000/tscan1.c b/drivers/net/can/sja1000/tscan1.c<br/>index 6ea802c66124..f3862bed3d40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/tscan1.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sja1000/tscan1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sja1000/tscan1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sja1000/tscan1.c</a></div><div class='hunk'>@@ -5,10 +5,9 @@</div><div class='ctx'>  * Copyright 2010 Andre B. Oliveira</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * References:</div><div class='del'>- * - Getting started with TS-CAN1, Technologic Systems, Jun 2009</div><div class='del'>- *	http://www.embeddedarm.com/documentation/ts-can1-manual.pdf</div><div class='add'>+/* References:</div><div class='add'>+ * - Getting started with TS-CAN1, Technologic Systems, Feb 2022</div><div class='add'>+ *	https://docs.embeddedts.com/TS-CAN1</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -159,7 +158,7 @@ static int tscan1_probe(struct device *dev, unsigned id)</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tscan1_remove(struct device *dev, unsigned id /*unused*/)</div><div class='add'>+static void tscan1_remove(struct device *dev, unsigned id /*unused*/)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct sja1000_priv *priv;</div><div class='hunk'>@@ -179,8 +178,6 @@ static int tscan1_remove(struct device *dev, unsigned id /*unused*/)</div><div class='ctx'> 	release_region(pld_base, TSCAN1_PLD_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	free_sja1000dev(netdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct isa_driver tscan1_isa_driver = {</div><div class='head'>diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c<br/>deleted file mode 100644<br/>index aa97dbc797b6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/slcan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/slcan.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,778 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * slcan.c - serial line CAN interface driver (using tty line discipline)</div><div class='del'>- *</div><div class='del'>- * This file is derived from linux/drivers/net/slip/slip.c</div><div class='del'>- *</div><div class='del'>- * slip.c Authors  : Laurence Culhane &lt;loz@holmes.demon.co.uk&gt;</div><div class='del'>- *                   Fred N. van Kempen &lt;waltje@uwalt.nl.mugnet.org&gt;</div><div class='del'>- * slcan.c Author  : Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published by the</div><div class='del'>- * Free Software Foundation; either version 2 of the License, or (at your</div><div class='del'>- * option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along</div><div class='del'>- * with this program; if not, see http://www.gnu.org/licenses/gpl.html</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='del'>- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='del'>- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='del'>- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='del'>- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='del'>- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='del'>- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='del'>- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='del'>- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='del'>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='del'>- * DAMAGE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/tty.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/rtnetlink.h&gt;</div><div class='del'>-#include &lt;linux/if_arp.h&gt;</div><div class='del'>-#include &lt;linux/if_ether.h&gt;</div><div class='del'>-#include &lt;linux/sched.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/workqueue.h&gt;</div><div class='del'>-#include &lt;linux/can.h&gt;</div><div class='del'>-#include &lt;linux/can/skb.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_ALIAS_LDISC(N_SLCAN);</div><div class='del'>-MODULE_DESCRIPTION("serial line CAN interface");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_AUTHOR("Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;");</div><div class='del'>-</div><div class='del'>-#define SLCAN_MAGIC 0x53CA</div><div class='del'>-</div><div class='del'>-static int maxdev = 10;		/* MAX number of SLCAN channels;</div><div class='del'>-				   This can be overridden with</div><div class='del'>-				   insmod slcan.ko maxdev=nnn	*/</div><div class='del'>-module_param(maxdev, int, 0);</div><div class='del'>-MODULE_PARM_DESC(maxdev, "Maximum number of slcan interfaces");</div><div class='del'>-</div><div class='del'>-/* maximum rx buffer len: extended CAN frame with timestamp */</div><div class='del'>-#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)</div><div class='del'>-</div><div class='del'>-#define SLC_CMD_LEN 1</div><div class='del'>-#define SLC_SFF_ID_LEN 3</div><div class='del'>-#define SLC_EFF_ID_LEN 8</div><div class='del'>-</div><div class='del'>-struct slcan {</div><div class='del'>-	int			magic;</div><div class='del'>-</div><div class='del'>-	/* Various fields. */</div><div class='del'>-	struct tty_struct	*tty;		/* ptr to TTY structure	     */</div><div class='del'>-	struct net_device	*dev;		/* easy for intr handling    */</div><div class='del'>-	spinlock_t		lock;</div><div class='del'>-	struct work_struct	tx_work;	/* Flushes transmit buffer   */</div><div class='del'>-</div><div class='del'>-	/* These are pointers to the malloc()ed frame buffers. */</div><div class='del'>-	unsigned char		rbuff[SLC_MTU];	/* receiver buffer	     */</div><div class='del'>-	int			rcount;         /* received chars counter    */</div><div class='del'>-	unsigned char		xbuff[SLC_MTU];	/* transmitter buffer	     */</div><div class='del'>-	unsigned char		*xhead;         /* pointer to next XMIT byte */</div><div class='del'>-	int			xleft;          /* bytes left in XMIT queue  */</div><div class='del'>-</div><div class='del'>-	unsigned long		flags;		/* Flag values/ mode etc     */</div><div class='del'>-#define SLF_INUSE		0		/* Channel in use            */</div><div class='del'>-#define SLF_ERROR		1               /* Parity, etc. error        */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct net_device **slcan_devs;</div><div class='del'>-</div><div class='del'>- /************************************************************************</div><div class='del'>-  *			SLCAN ENCAPSULATION FORMAT			 *</div><div class='del'>-  ************************************************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A CAN frame has a can_id (11 bit standard frame format OR 29 bit extended</div><div class='del'>- * frame format) a data length code (can_dlc) which can be from 0 to 8</div><div class='del'>- * and up to &lt;can_dlc&gt; data bytes as payload.</div><div class='del'>- * Additionally a CAN frame may become a remote transmission frame if the</div><div class='del'>- * RTR-bit is set. This causes another ECU to send a CAN frame with the</div><div class='del'>- * given can_id.</div><div class='del'>- *</div><div class='del'>- * The SLCAN ASCII representation of these different frame types is:</div><div class='del'>- * &lt;type&gt; &lt;id&gt; &lt;dlc&gt; &lt;data&gt;*</div><div class='del'>- *</div><div class='del'>- * Extended frames (29 bit) are defined by capital characters in the type.</div><div class='del'>- * RTR frames are defined as 'r' types - normal frames have 't' type:</div><div class='del'>- * t =&gt; 11 bit data frame</div><div class='del'>- * r =&gt; 11 bit RTR frame</div><div class='del'>- * T =&gt; 29 bit data frame</div><div class='del'>- * R =&gt; 29 bit RTR frame</div><div class='del'>- *</div><div class='del'>- * The &lt;id&gt; is 3 (standard) or 8 (extended) bytes in ASCII Hex (base64).</div><div class='del'>- * The &lt;dlc&gt; is a one byte ASCII number ('0' - '8')</div><div class='del'>- * The &lt;data&gt; section has at much ASCII Hex bytes as defined by the &lt;dlc&gt;</div><div class='del'>- *</div><div class='del'>- * Examples:</div><div class='del'>- *</div><div class='del'>- * t1230 : can_id 0x123, can_dlc 0, no data</div><div class='del'>- * t4563112233 : can_id 0x456, can_dlc 3, data 0x11 0x22 0x33</div><div class='del'>- * T12ABCDEF2AA55 : extended can_id 0x12ABCDEF, can_dlc 2, data 0xAA 0x55</div><div class='del'>- * r1230 : can_id 0x123, can_dlc 0, no data, remote transmission request</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>- /************************************************************************</div><div class='del'>-  *			STANDARD SLCAN DECAPSULATION			 *</div><div class='del'>-  ************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Send one completely decapsulated can_frame to the network layer */</div><div class='del'>-static void slc_bump(struct slcan *sl)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct can_frame cf;</div><div class='del'>-	int i, tmp;</div><div class='del'>-	u32 tmpid;</div><div class='del'>-	char *cmd = sl-&gt;rbuff;</div><div class='del'>-</div><div class='del'>-	cf.can_id = 0;</div><div class='del'>-</div><div class='del'>-	switch (*cmd) {</div><div class='del'>-	case 'r':</div><div class='del'>-		cf.can_id = CAN_RTR_FLAG;</div><div class='del'>-		/* fallthrough */</div><div class='del'>-	case 't':</div><div class='del'>-		/* store dlc ASCII value and terminate SFF CAN ID string */</div><div class='del'>-		cf.can_dlc = sl-&gt;rbuff[SLC_CMD_LEN + SLC_SFF_ID_LEN];</div><div class='del'>-		sl-&gt;rbuff[SLC_CMD_LEN + SLC_SFF_ID_LEN] = 0;</div><div class='del'>-		/* point to payload data behind the dlc */</div><div class='del'>-		cmd += SLC_CMD_LEN + SLC_SFF_ID_LEN + 1;</div><div class='del'>-		break;</div><div class='del'>-	case 'R':</div><div class='del'>-		cf.can_id = CAN_RTR_FLAG;</div><div class='del'>-		/* fallthrough */</div><div class='del'>-	case 'T':</div><div class='del'>-		cf.can_id |= CAN_EFF_FLAG;</div><div class='del'>-		/* store dlc ASCII value and terminate EFF CAN ID string */</div><div class='del'>-		cf.can_dlc = sl-&gt;rbuff[SLC_CMD_LEN + SLC_EFF_ID_LEN];</div><div class='del'>-		sl-&gt;rbuff[SLC_CMD_LEN + SLC_EFF_ID_LEN] = 0;</div><div class='del'>-		/* point to payload data behind the dlc */</div><div class='del'>-		cmd += SLC_CMD_LEN + SLC_EFF_ID_LEN + 1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (kstrtou32(sl-&gt;rbuff + SLC_CMD_LEN, 16, &amp;tmpid))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cf.can_id |= tmpid;</div><div class='del'>-</div><div class='del'>-	/* get can_dlc from sanitized ASCII value */</div><div class='del'>-	if (cf.can_dlc &gt;= '0' &amp;&amp; cf.can_dlc &lt; '9')</div><div class='del'>-		cf.can_dlc -= '0';</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*(u64 *) (&amp;cf.data) = 0; /* clear payload */</div><div class='del'>-</div><div class='del'>-	/* RTR frames may have a dlc &gt; 0 but they never have any data bytes */</div><div class='del'>-	if (!(cf.can_id &amp; CAN_RTR_FLAG)) {</div><div class='del'>-		for (i = 0; i &lt; cf.can_dlc; i++) {</div><div class='del'>-			tmp = hex_to_bin(*cmd++);</div><div class='del'>-			if (tmp &lt; 0)</div><div class='del'>-				return;</div><div class='del'>-			cf.data[i] = (tmp &lt;&lt; 4);</div><div class='del'>-			tmp = hex_to_bin(*cmd++);</div><div class='del'>-			if (tmp &lt; 0)</div><div class='del'>-				return;</div><div class='del'>-			cf.data[i] |= tmp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = dev_alloc_skb(sizeof(struct can_frame) +</div><div class='del'>-			    sizeof(struct can_skb_priv));</div><div class='del'>-	if (!skb)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb-&gt;dev = sl-&gt;dev;</div><div class='del'>-	skb-&gt;protocol = htons(ETH_P_CAN);</div><div class='del'>-	skb-&gt;pkt_type = PACKET_BROADCAST;</div><div class='del'>-	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-</div><div class='del'>-	can_skb_reserve(skb);</div><div class='del'>-	can_skb_prv(skb)-&gt;ifindex = sl-&gt;dev-&gt;ifindex;</div><div class='del'>-	can_skb_prv(skb)-&gt;skbcnt = 0;</div><div class='del'>-</div><div class='del'>-	skb_put_data(skb, &amp;cf, sizeof(struct can_frame));</div><div class='del'>-</div><div class='del'>-	sl-&gt;dev-&gt;stats.rx_packets++;</div><div class='del'>-	sl-&gt;dev-&gt;stats.rx_bytes += cf.can_dlc;</div><div class='del'>-	netif_rx_ni(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* parse tty input stream */</div><div class='del'>-static void slcan_unesc(struct slcan *sl, unsigned char s)</div><div class='del'>-{</div><div class='del'>-	if ((s == '\r') || (s == '\a')) { /* CR or BEL ends the pdu */</div><div class='del'>-		if (!test_and_clear_bit(SLF_ERROR, &amp;sl-&gt;flags) &amp;&amp;</div><div class='del'>-		    (sl-&gt;rcount &gt; 4))  {</div><div class='del'>-			slc_bump(sl);</div><div class='del'>-		}</div><div class='del'>-		sl-&gt;rcount = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (!test_bit(SLF_ERROR, &amp;sl-&gt;flags))  {</div><div class='del'>-			if (sl-&gt;rcount &lt; SLC_MTU)  {</div><div class='del'>-				sl-&gt;rbuff[sl-&gt;rcount++] = s;</div><div class='del'>-				return;</div><div class='del'>-			} else {</div><div class='del'>-				sl-&gt;dev-&gt;stats.rx_over_errors++;</div><div class='del'>-				set_bit(SLF_ERROR, &amp;sl-&gt;flags);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>- /************************************************************************</div><div class='del'>-  *			STANDARD SLCAN ENCAPSULATION			 *</div><div class='del'>-  ************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Encapsulate one can_frame and stuff into a TTY queue. */</div><div class='del'>-static void slc_encaps(struct slcan *sl, struct can_frame *cf)</div><div class='del'>-{</div><div class='del'>-	int actual, i;</div><div class='del'>-	unsigned char *pos;</div><div class='del'>-	unsigned char *endpos;</div><div class='del'>-	canid_t id = cf-&gt;can_id;</div><div class='del'>-</div><div class='del'>-	pos = sl-&gt;xbuff;</div><div class='del'>-</div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='del'>-		*pos = 'R'; /* becomes 'r' in standard frame format (SFF) */</div><div class='del'>-	else</div><div class='del'>-		*pos = 'T'; /* becomes 't' in standard frame format (SSF) */</div><div class='del'>-</div><div class='del'>-	/* determine number of chars for the CAN-identifier */</div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='del'>-		id &amp;= CAN_EFF_MASK;</div><div class='del'>-		endpos = pos + SLC_EFF_ID_LEN;</div><div class='del'>-	} else {</div><div class='del'>-		*pos |= 0x20; /* convert R/T to lower case for SFF */</div><div class='del'>-		id &amp;= CAN_SFF_MASK;</div><div class='del'>-		endpos = pos + SLC_SFF_ID_LEN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* build 3 (SFF) or 8 (EFF) digit CAN identifier */</div><div class='del'>-	pos++;</div><div class='del'>-	while (endpos &gt;= pos) {</div><div class='del'>-		*endpos-- = hex_asc_upper[id &amp; 0xf];</div><div class='del'>-		id &gt;&gt;= 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos += (cf-&gt;can_id &amp; CAN_EFF_FLAG) ? SLC_EFF_ID_LEN : SLC_SFF_ID_LEN;</div><div class='del'>-</div><div class='del'>-	*pos++ = cf-&gt;can_dlc + '0';</div><div class='del'>-</div><div class='del'>-	/* RTR frames may have a dlc &gt; 0 but they never have any data bytes */</div><div class='del'>-	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='del'>-			pos = hex_byte_pack_upper(pos, cf-&gt;data[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*pos++ = '\r';</div><div class='del'>-</div><div class='del'>-	/* Order of next two lines is *very* important.</div><div class='del'>-	 * When we are sending a little amount of data,</div><div class='del'>-	 * the transfer may be completed inside the ops-&gt;write()</div><div class='del'>-	 * routine, because it's running with interrupts enabled.</div><div class='del'>-	 * In this case we *never* got WRITE_WAKEUP event,</div><div class='del'>-	 * if we did not request it before write operation.</div><div class='del'>-	 *       14 Oct 1994  Dmitry Gorodchanin.</div><div class='del'>-	 */</div><div class='del'>-	set_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='del'>-	actual = sl-&gt;tty-&gt;ops-&gt;write(sl-&gt;tty, sl-&gt;xbuff, pos - sl-&gt;xbuff);</div><div class='del'>-	sl-&gt;xleft = (pos - sl-&gt;xbuff) - actual;</div><div class='del'>-	sl-&gt;xhead = sl-&gt;xbuff + actual;</div><div class='del'>-	sl-&gt;dev-&gt;stats.tx_bytes += cf-&gt;can_dlc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Write out any remaining transmit buffer. Scheduled when tty is writable */</div><div class='del'>-static void slcan_transmit(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = container_of(work, struct slcan, tx_work);</div><div class='del'>-	int actual;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;sl-&gt;lock);</div><div class='del'>-	/* First make sure we're connected. */</div><div class='del'>-	if (!sl-&gt;tty || sl-&gt;magic != SLCAN_MAGIC || !netif_running(sl-&gt;dev)) {</div><div class='del'>-		spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sl-&gt;xleft &lt;= 0)  {</div><div class='del'>-		/* Now serial buffer is almost free &amp; we can start</div><div class='del'>-		 * transmission of another packet */</div><div class='del'>-		sl-&gt;dev-&gt;stats.tx_packets++;</div><div class='del'>-		clear_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='del'>-		spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='del'>-		netif_wake_queue(sl-&gt;dev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	actual = sl-&gt;tty-&gt;ops-&gt;write(sl-&gt;tty, sl-&gt;xhead, sl-&gt;xleft);</div><div class='del'>-	sl-&gt;xleft -= actual;</div><div class='del'>-	sl-&gt;xhead += actual;</div><div class='del'>-	spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Called by the driver when there's room for more data.</div><div class='del'>- * Schedule the transmit.</div><div class='del'>- */</div><div class='del'>-static void slcan_write_wakeup(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = tty-&gt;disc_data;</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;sl-&gt;tx_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Send a can_frame to a TTY queue. */</div><div class='del'>-static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (skb-&gt;len != CAN_MTU)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;sl-&gt;lock);</div><div class='del'>-	if (!netif_running(dev))  {</div><div class='del'>-		spin_unlock(&amp;sl-&gt;lock);</div><div class='del'>-		printk(KERN_WARNING "%s: xmit: iface is down\n", dev-&gt;name);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	if (sl-&gt;tty == NULL) {</div><div class='del'>-		spin_unlock(&amp;sl-&gt;lock);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(sl-&gt;dev);</div><div class='del'>-	slc_encaps(sl, (struct can_frame *) skb-&gt;data); /* encaps &amp; send */</div><div class='del'>-	spin_unlock(&amp;sl-&gt;lock);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree_skb(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************************</div><div class='del'>- *   Routines looking at netdevice side.</div><div class='del'>- ******************************************/</div><div class='del'>-</div><div class='del'>-/* Netdevice UP -&gt; DOWN routine */</div><div class='del'>-static int slc_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;sl-&gt;lock);</div><div class='del'>-	if (sl-&gt;tty) {</div><div class='del'>-		/* TTY discipline is running. */</div><div class='del'>-		clear_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='del'>-	}</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-	sl-&gt;rcount   = 0;</div><div class='del'>-	sl-&gt;xleft    = 0;</div><div class='del'>-	spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Netdevice DOWN -&gt; UP routine */</div><div class='del'>-static int slc_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (sl-&gt;tty == NULL)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	sl-&gt;flags &amp;= (1 &lt;&lt; SLF_INUSE);</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hook the destructor so we can free slcan devs at the right point in time */</div><div class='del'>-static void slc_free_netdev(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int i = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	slcan_devs[i] = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int slcan_change_mtu(struct net_device *dev, int new_mtu)</div><div class='del'>-{</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops slc_netdev_ops = {</div><div class='del'>-	.ndo_open               = slc_open,</div><div class='del'>-	.ndo_stop               = slc_close,</div><div class='del'>-	.ndo_start_xmit         = slc_xmit,</div><div class='del'>-	.ndo_change_mtu         = slcan_change_mtu,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void slc_setup(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	dev-&gt;netdev_ops		= &amp;slc_netdev_ops;</div><div class='del'>-	dev-&gt;needs_free_netdev	= true;</div><div class='del'>-	dev-&gt;priv_destructor	= slc_free_netdev;</div><div class='del'>-</div><div class='del'>-	dev-&gt;hard_header_len	= 0;</div><div class='del'>-	dev-&gt;addr_len		= 0;</div><div class='del'>-	dev-&gt;tx_queue_len	= 10;</div><div class='del'>-</div><div class='del'>-	dev-&gt;mtu		= CAN_MTU;</div><div class='del'>-	dev-&gt;type		= ARPHRD_CAN;</div><div class='del'>-</div><div class='del'>-	/* New-style flags. */</div><div class='del'>-	dev-&gt;flags		= IFF_NOARP;</div><div class='del'>-	dev-&gt;features           = NETIF_F_HW_CSUM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/******************************************</div><div class='del'>-  Routines looking at TTY side.</div><div class='del'>- ******************************************/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Handle the 'receiver data ready' interrupt.</div><div class='del'>- * This function is called by the 'tty_io' module in the kernel when</div><div class='del'>- * a block of SLCAN data has been received, which can now be decapsulated</div><div class='del'>- * and sent on to some IP layer for further processing. This will not</div><div class='del'>- * be re-entered while running but other ldisc functions may be called</div><div class='del'>- * in parallel</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void slcan_receive_buf(struct tty_struct *tty,</div><div class='del'>-			      const unsigned char *cp, char *fp, int count)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = (struct slcan *) tty-&gt;disc_data;</div><div class='del'>-</div><div class='del'>-	if (!sl || sl-&gt;magic != SLCAN_MAGIC || !netif_running(sl-&gt;dev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Read the characters out of the buffer */</div><div class='del'>-	while (count--) {</div><div class='del'>-		if (fp &amp;&amp; *fp++) {</div><div class='del'>-			if (!test_and_set_bit(SLF_ERROR, &amp;sl-&gt;flags))</div><div class='del'>-				sl-&gt;dev-&gt;stats.rx_errors++;</div><div class='del'>-			cp++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		slcan_unesc(sl, *cp++);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/************************************</div><div class='del'>- *  slcan_open helper routines.</div><div class='del'>- ************************************/</div><div class='del'>-</div><div class='del'>-/* Collect hanged up channels */</div><div class='del'>-static void slc_sync(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct slcan	  *sl;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; maxdev; i++) {</div><div class='del'>-		dev = slcan_devs[i];</div><div class='del'>-		if (dev == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		sl = netdev_priv(dev);</div><div class='del'>-		if (sl-&gt;tty)</div><div class='del'>-			continue;</div><div class='del'>-		if (dev-&gt;flags &amp; IFF_UP)</div><div class='del'>-			dev_close(dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Find a free SLCAN channel, and link in this `tty' line. */</div><div class='del'>-static struct slcan *slc_alloc(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char name[IFNAMSIZ];</div><div class='del'>-	struct net_device *dev = NULL;</div><div class='del'>-	struct slcan       *sl;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; maxdev; i++) {</div><div class='del'>-		dev = slcan_devs[i];</div><div class='del'>-		if (dev == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sorry, too many, all slots in use */</div><div class='del'>-	if (i &gt;= maxdev)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	sprintf(name, "slcan%d", i);</div><div class='del'>-	dev = alloc_netdev(sizeof(*sl), name, NET_NAME_UNKNOWN, slc_setup);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	dev-&gt;base_addr  = i;</div><div class='del'>-	sl = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Initialize channel control data */</div><div class='del'>-	sl-&gt;magic = SLCAN_MAGIC;</div><div class='del'>-	sl-&gt;dev	= dev;</div><div class='del'>-	spin_lock_init(&amp;sl-&gt;lock);</div><div class='del'>-	INIT_WORK(&amp;sl-&gt;tx_work, slcan_transmit);</div><div class='del'>-	slcan_devs[i] = dev;</div><div class='del'>-</div><div class='del'>-	return sl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Open the high-level part of the SLCAN channel.</div><div class='del'>- * This function is called by the TTY module when the</div><div class='del'>- * SLCAN line discipline is called for.  Because we are</div><div class='del'>- * sure the tty line exists, we only have to link it to</div><div class='del'>- * a free SLCAN channel...</div><div class='del'>- *</div><div class='del'>- * Called in process context serialized from other ldisc calls.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static int slcan_open(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!capable(CAP_NET_ADMIN))</div><div class='del'>-		return -EPERM;</div><div class='del'>-</div><div class='del'>-	if (tty-&gt;ops-&gt;write == NULL)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	/* RTnetlink lock is misused here to serialize concurrent</div><div class='del'>-	   opens of slcan channels. There are better ways, but it is</div><div class='del'>-	   the simplest one.</div><div class='del'>-	 */</div><div class='del'>-	rtnl_lock();</div><div class='del'>-</div><div class='del'>-	/* Collect hanged up channels. */</div><div class='del'>-	slc_sync();</div><div class='del'>-</div><div class='del'>-	sl = tty-&gt;disc_data;</div><div class='del'>-</div><div class='del'>-	err = -EEXIST;</div><div class='del'>-	/* First make sure we're not already connected. */</div><div class='del'>-	if (sl &amp;&amp; sl-&gt;magic == SLCAN_MAGIC)</div><div class='del'>-		goto err_exit;</div><div class='del'>-</div><div class='del'>-	/* OK.  Find a free SLCAN channel to use. */</div><div class='del'>-	err = -ENFILE;</div><div class='del'>-	sl = slc_alloc();</div><div class='del'>-	if (sl == NULL)</div><div class='del'>-		goto err_exit;</div><div class='del'>-</div><div class='del'>-	sl-&gt;tty = tty;</div><div class='del'>-	tty-&gt;disc_data = sl;</div><div class='del'>-</div><div class='del'>-	if (!test_bit(SLF_INUSE, &amp;sl-&gt;flags)) {</div><div class='del'>-		/* Perform the low-level SLCAN initialization. */</div><div class='del'>-		sl-&gt;rcount   = 0;</div><div class='del'>-		sl-&gt;xleft    = 0;</div><div class='del'>-</div><div class='del'>-		set_bit(SLF_INUSE, &amp;sl-&gt;flags);</div><div class='del'>-</div><div class='del'>-		err = register_netdevice(sl-&gt;dev);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_free_chan;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Done.  We have linked the TTY line to a channel. */</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	tty-&gt;receive_room = 65536;	/* We don't flow control */</div><div class='del'>-</div><div class='del'>-	/* TTY layer expects 0 on success */</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_chan:</div><div class='del'>-	sl-&gt;tty = NULL;</div><div class='del'>-	tty-&gt;disc_data = NULL;</div><div class='del'>-	clear_bit(SLF_INUSE, &amp;sl-&gt;flags);</div><div class='del'>-</div><div class='del'>-err_exit:</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	/* Count references from TTY module */</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Close down a SLCAN channel.</div><div class='del'>- * This means flushing out any pending queues, and then returning. This</div><div class='del'>- * call is serialized against other ldisc functions.</div><div class='del'>- *</div><div class='del'>- * We also use this method for a hangup event.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void slcan_close(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = (struct slcan *) tty-&gt;disc_data;</div><div class='del'>-</div><div class='del'>-	/* First make sure we're connected. */</div><div class='del'>-	if (!sl || sl-&gt;magic != SLCAN_MAGIC || sl-&gt;tty != tty)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;sl-&gt;lock);</div><div class='del'>-	tty-&gt;disc_data = NULL;</div><div class='del'>-	sl-&gt;tty = NULL;</div><div class='del'>-	spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='del'>-</div><div class='del'>-	flush_work(&amp;sl-&gt;tx_work);</div><div class='del'>-</div><div class='del'>-	/* Flush network side */</div><div class='del'>-	unregister_netdev(sl-&gt;dev);</div><div class='del'>-	/* This will complete via sl_free_netdev */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int slcan_hangup(struct tty_struct *tty)</div><div class='del'>-{</div><div class='del'>-	slcan_close(tty);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Perform I/O control on an active SLCAN channel. */</div><div class='del'>-static int slcan_ioctl(struct tty_struct *tty, struct file *file,</div><div class='del'>-		       unsigned int cmd, unsigned long arg)</div><div class='del'>-{</div><div class='del'>-	struct slcan *sl = (struct slcan *) tty-&gt;disc_data;</div><div class='del'>-	unsigned int tmp;</div><div class='del'>-</div><div class='del'>-	/* First make sure we're connected. */</div><div class='del'>-	if (!sl || sl-&gt;magic != SLCAN_MAGIC)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGIFNAME:</div><div class='del'>-		tmp = strlen(sl-&gt;dev-&gt;name) + 1;</div><div class='del'>-		if (copy_to_user((void __user *)arg, sl-&gt;dev-&gt;name, tmp))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	case SIOCSIFHWADDR:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return tty_mode_ioctl(tty, file, cmd, arg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct tty_ldisc_ops slc_ldisc = {</div><div class='del'>-	.owner		= THIS_MODULE,</div><div class='del'>-	.magic		= TTY_LDISC_MAGIC,</div><div class='del'>-	.name		= "slcan",</div><div class='del'>-	.open		= slcan_open,</div><div class='del'>-	.close		= slcan_close,</div><div class='del'>-	.hangup		= slcan_hangup,</div><div class='del'>-	.ioctl		= slcan_ioctl,</div><div class='del'>-	.receive_buf	= slcan_receive_buf,</div><div class='del'>-	.write_wakeup	= slcan_write_wakeup,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init slcan_init(void)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	if (maxdev &lt; 4)</div><div class='del'>-		maxdev = 4; /* Sanity */</div><div class='del'>-</div><div class='del'>-	pr_info("slcan: serial line CAN interface driver\n");</div><div class='del'>-	pr_info("slcan: %d dynamic interface channels.\n", maxdev);</div><div class='del'>-</div><div class='del'>-	slcan_devs = kcalloc(maxdev, sizeof(struct net_device *), GFP_KERNEL);</div><div class='del'>-	if (!slcan_devs)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Fill in our line protocol discipline, and register it */</div><div class='del'>-	status = tty_register_ldisc(N_SLCAN, &amp;slc_ldisc);</div><div class='del'>-	if (status)  {</div><div class='del'>-		printk(KERN_ERR "slcan: can't register line discipline\n");</div><div class='del'>-		kfree(slcan_devs);</div><div class='del'>-	}</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit slcan_exit(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct slcan *sl;</div><div class='del'>-	unsigned long timeout = jiffies + HZ;</div><div class='del'>-	int busy = 0;</div><div class='del'>-</div><div class='del'>-	if (slcan_devs == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* First of all: check for active disciplines and hangup them.</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		if (busy)</div><div class='del'>-			msleep_interruptible(100);</div><div class='del'>-</div><div class='del'>-		busy = 0;</div><div class='del'>-		for (i = 0; i &lt; maxdev; i++) {</div><div class='del'>-			dev = slcan_devs[i];</div><div class='del'>-			if (!dev)</div><div class='del'>-				continue;</div><div class='del'>-			sl = netdev_priv(dev);</div><div class='del'>-			spin_lock_bh(&amp;sl-&gt;lock);</div><div class='del'>-			if (sl-&gt;tty) {</div><div class='del'>-				busy++;</div><div class='del'>-				tty_hangup(sl-&gt;tty);</div><div class='del'>-			}</div><div class='del'>-			spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='del'>-		}</div><div class='del'>-	} while (busy &amp;&amp; time_before(jiffies, timeout));</div><div class='del'>-</div><div class='del'>-	/* FIXME: hangup is async so we should wait when doing this second</div><div class='del'>-	   phase */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; maxdev; i++) {</div><div class='del'>-		dev = slcan_devs[i];</div><div class='del'>-		if (!dev)</div><div class='del'>-			continue;</div><div class='del'>-		slcan_devs[i] = NULL;</div><div class='del'>-</div><div class='del'>-		sl = netdev_priv(dev);</div><div class='del'>-		if (sl-&gt;tty) {</div><div class='del'>-			printk(KERN_ERR "%s: tty discipline still running\n",</div><div class='del'>-			       dev-&gt;name);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		unregister_netdev(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kfree(slcan_devs);</div><div class='del'>-	slcan_devs = NULL;</div><div class='del'>-</div><div class='del'>-	i = tty_unregister_ldisc(N_SLCAN);</div><div class='del'>-	if (i)</div><div class='del'>-		printk(KERN_ERR "slcan: can't unregister ldisc (err %d)\n", i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(slcan_init);</div><div class='del'>-module_exit(slcan_exit);</div><div class='head'>diff --git a/drivers/net/can/slcan/Makefile b/drivers/net/can/slcan/Makefile<br/>new file mode 100644<br/>index 000000000000..8a88e484ee21<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/slcan/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/slcan/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_SLCAN) += slcan.o</div><div class='add'>+</div><div class='add'>+slcan-objs :=</div><div class='add'>+slcan-objs += slcan-core.o</div><div class='add'>+slcan-objs += slcan-ethtool.o</div><div class='head'>diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/slcan-core.c<br/>new file mode 100644<br/>index 000000000000..cd789e178d34<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/slcan/slcan-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/slcan/slcan-core.c</a></div><div class='hunk'>@@ -0,0 +1,953 @@</div><div class='add'>+/*</div><div class='add'>+ * slcan.c - serial line CAN interface driver (using tty line discipline)</div><div class='add'>+ *</div><div class='add'>+ * This file is derived from linux/drivers/net/slip/slip.c and got</div><div class='add'>+ * inspiration from linux/drivers/net/can/can327.c for the rework made</div><div class='add'>+ * on the line discipline code.</div><div class='add'>+ *</div><div class='add'>+ * slip.c Authors  : Laurence Culhane &lt;loz@holmes.demon.co.uk&gt;</div><div class='add'>+ *                   Fred N. van Kempen &lt;waltje@uwalt.nl.mugnet.org&gt;</div><div class='add'>+ * slcan.c Author  : Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='add'>+ * can327.c Author : Max Staudt &lt;max-linux@enpas.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify it</div><div class='add'>+ * under the terms of the GNU General Public License as published by the</div><div class='add'>+ * Free Software Foundation; either version 2 of the License, or (at your</div><div class='add'>+ * option) any later version.</div><div class='add'>+ *</div><div class='add'>+ * This program is distributed in the hope that it will be useful, but</div><div class='add'>+ * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='add'>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='add'>+ * General Public License for more details.</div><div class='add'>+ *</div><div class='add'>+ * You should have received a copy of the GNU General Public License along</div><div class='add'>+ * with this program; if not, see http://www.gnu.org/licenses/gpl.html</div><div class='add'>+ *</div><div class='add'>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</div><div class='add'>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR</div><div class='add'>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT</div><div class='add'>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,</div><div class='add'>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT</div><div class='add'>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,</div><div class='add'>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY</div><div class='add'>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='add'>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE</div><div class='add'>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH</div><div class='add'>+ * DAMAGE.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/uaccess.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/tty.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/skb.h&gt;</div><div class='add'>+</div><div class='add'>+#include "slcan.h"</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS_LDISC(N_SLCAN);</div><div class='add'>+MODULE_DESCRIPTION("serial line CAN interface");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;");</div><div class='add'>+MODULE_AUTHOR("Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;");</div><div class='add'>+</div><div class='add'>+/* maximum rx buffer len: extended CAN frame with timestamp */</div><div class='add'>+#define SLCAN_MTU (sizeof("T1111222281122334455667788EA5F\r") + 1)</div><div class='add'>+</div><div class='add'>+#define SLCAN_CMD_LEN 1</div><div class='add'>+#define SLCAN_SFF_ID_LEN 3</div><div class='add'>+#define SLCAN_EFF_ID_LEN 8</div><div class='add'>+#define SLCAN_DATA_LENGTH_LEN 1</div><div class='add'>+#define SLCAN_ERROR_LEN 1</div><div class='add'>+#define SLCAN_STATE_LEN 1</div><div class='add'>+#define SLCAN_STATE_BE_RXCNT_LEN 3</div><div class='add'>+#define SLCAN_STATE_BE_TXCNT_LEN 3</div><div class='add'>+#define SLCAN_STATE_MSG_LEN     (SLCAN_CMD_LEN +		\</div><div class='add'>+                                 SLCAN_STATE_LEN +		\</div><div class='add'>+                                 SLCAN_STATE_BE_RXCNT_LEN +	\</div><div class='add'>+                                 SLCAN_STATE_BE_TXCNT_LEN)</div><div class='add'>+#define SLCAN_ERROR_MSG_LEN_MIN (SLCAN_CMD_LEN +	\</div><div class='add'>+                                 SLCAN_ERROR_LEN +	\</div><div class='add'>+                                 SLCAN_DATA_LENGTH_LEN)</div><div class='add'>+#define SLCAN_FRAME_MSG_LEN_MIN (SLCAN_CMD_LEN +	\</div><div class='add'>+                                 SLCAN_SFF_ID_LEN +	\</div><div class='add'>+                                 SLCAN_DATA_LENGTH_LEN)</div><div class='add'>+struct slcan {</div><div class='add'>+	struct can_priv         can;</div><div class='add'>+</div><div class='add'>+	/* Various fields. */</div><div class='add'>+	struct tty_struct	*tty;		/* ptr to TTY structure	     */</div><div class='add'>+	struct net_device	*dev;		/* easy for intr handling    */</div><div class='add'>+	spinlock_t		lock;</div><div class='add'>+	struct work_struct	tx_work;	/* Flushes transmit buffer   */</div><div class='add'>+</div><div class='add'>+	/* These are pointers to the malloc()ed frame buffers. */</div><div class='add'>+	unsigned char		rbuff[SLCAN_MTU];	/* receiver buffer   */</div><div class='add'>+	int			rcount;         /* received chars counter    */</div><div class='add'>+	unsigned char		xbuff[SLCAN_MTU];	/* transmitter buffer*/</div><div class='add'>+	unsigned char		*xhead;         /* pointer to next XMIT byte */</div><div class='add'>+	int			xleft;          /* bytes left in XMIT queue  */</div><div class='add'>+</div><div class='add'>+	unsigned long		flags;		/* Flag values/ mode etc     */</div><div class='add'>+#define SLF_ERROR		0               /* Parity, etc. error        */</div><div class='add'>+#define SLF_XCMD		1               /* Command transmission      */</div><div class='add'>+	unsigned long           cmd_flags;      /* Command flags             */</div><div class='add'>+#define CF_ERR_RST		0               /* Reset errors on open      */</div><div class='add'>+	wait_queue_head_t       xcmd_wait;      /* Wait queue for commands   */</div><div class='add'>+						/* transmission              */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 slcan_bitrate_const[] = {</div><div class='add'>+	10000, 20000, 50000, 100000, 125000,</div><div class='add'>+	250000, 500000, 800000, 1000000</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool slcan_err_rst_on_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return !!test_bit(CF_ERR_RST, &amp;sl-&gt;cmd_flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int slcan_enable_err_rst_on_open(struct net_device *ndev, bool on)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(ndev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		set_bit(CF_ERR_RST, &amp;sl-&gt;cmd_flags);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(CF_ERR_RST, &amp;sl-&gt;cmd_flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ *			SLCAN ENCAPSULATION FORMAT			 *</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* A CAN frame has a can_id (11 bit standard frame format OR 29 bit extended</div><div class='add'>+ * frame format) a data length code (len) which can be from 0 to 8</div><div class='add'>+ * and up to &lt;len&gt; data bytes as payload.</div><div class='add'>+ * Additionally a CAN frame may become a remote transmission frame if the</div><div class='add'>+ * RTR-bit is set. This causes another ECU to send a CAN frame with the</div><div class='add'>+ * given can_id.</div><div class='add'>+ *</div><div class='add'>+ * The SLCAN ASCII representation of these different frame types is:</div><div class='add'>+ * &lt;type&gt; &lt;id&gt; &lt;dlc&gt; &lt;data&gt;*</div><div class='add'>+ *</div><div class='add'>+ * Extended frames (29 bit) are defined by capital characters in the type.</div><div class='add'>+ * RTR frames are defined as 'r' types - normal frames have 't' type:</div><div class='add'>+ * t =&gt; 11 bit data frame</div><div class='add'>+ * r =&gt; 11 bit RTR frame</div><div class='add'>+ * T =&gt; 29 bit data frame</div><div class='add'>+ * R =&gt; 29 bit RTR frame</div><div class='add'>+ *</div><div class='add'>+ * The &lt;id&gt; is 3 (standard) or 8 (extended) bytes in ASCII Hex (base64).</div><div class='add'>+ * The &lt;dlc&gt; is a one byte ASCII number ('0' - '8')</div><div class='add'>+ * The &lt;data&gt; section has at much ASCII Hex bytes as defined by the &lt;dlc&gt;</div><div class='add'>+ *</div><div class='add'>+ * Examples:</div><div class='add'>+ *</div><div class='add'>+ * t1230 : can_id 0x123, len 0, no data</div><div class='add'>+ * t4563112233 : can_id 0x456, len 3, data 0x11 0x22 0x33</div><div class='add'>+ * T12ABCDEF2AA55 : extended can_id 0x12ABCDEF, len 2, data 0xAA 0x55</div><div class='add'>+ * r1230 : can_id 0x123, len 0, no data, remote transmission request</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ *			STANDARD SLCAN DECAPSULATION			 *</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Send one completely decapsulated can_frame to the network layer */</div><div class='add'>+static void slcan_bump_frame(struct slcan *sl)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	int i, tmp;</div><div class='add'>+	u32 tmpid;</div><div class='add'>+	char *cmd = sl-&gt;rbuff;</div><div class='add'>+</div><div class='add'>+	if (sl-&gt;rcount &lt; SLCAN_FRAME_MSG_LEN_MIN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(sl-&gt;dev, &amp;cf);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		sl-&gt;dev-&gt;stats.rx_dropped++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (*cmd) {</div><div class='add'>+	case 'r':</div><div class='add'>+		cf-&gt;can_id = CAN_RTR_FLAG;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 't':</div><div class='add'>+		/* store dlc ASCII value and terminate SFF CAN ID string */</div><div class='add'>+		cf-&gt;len = sl-&gt;rbuff[SLCAN_CMD_LEN + SLCAN_SFF_ID_LEN];</div><div class='add'>+		sl-&gt;rbuff[SLCAN_CMD_LEN + SLCAN_SFF_ID_LEN] = 0;</div><div class='add'>+		/* point to payload data behind the dlc */</div><div class='add'>+		cmd += SLCAN_CMD_LEN + SLCAN_SFF_ID_LEN + 1;</div><div class='add'>+		break;</div><div class='add'>+	case 'R':</div><div class='add'>+		cf-&gt;can_id = CAN_RTR_FLAG;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 'T':</div><div class='add'>+		cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+		/* store dlc ASCII value and terminate EFF CAN ID string */</div><div class='add'>+		cf-&gt;len = sl-&gt;rbuff[SLCAN_CMD_LEN + SLCAN_EFF_ID_LEN];</div><div class='add'>+		sl-&gt;rbuff[SLCAN_CMD_LEN + SLCAN_EFF_ID_LEN] = 0;</div><div class='add'>+		/* point to payload data behind the dlc */</div><div class='add'>+		cmd += SLCAN_CMD_LEN + SLCAN_EFF_ID_LEN + 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto decode_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (kstrtou32(sl-&gt;rbuff + SLCAN_CMD_LEN, 16, &amp;tmpid))</div><div class='add'>+		goto decode_failed;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= tmpid;</div><div class='add'>+</div><div class='add'>+	/* get len from sanitized ASCII value */</div><div class='add'>+	if (cf-&gt;len &gt;= '0' &amp;&amp; cf-&gt;len &lt; '9')</div><div class='add'>+		cf-&gt;len -= '0';</div><div class='add'>+	else</div><div class='add'>+		goto decode_failed;</div><div class='add'>+</div><div class='add'>+	/* RTR frames may have a dlc &gt; 0 but they never have any data bytes */</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++) {</div><div class='add'>+			tmp = hex_to_bin(*cmd++);</div><div class='add'>+			if (tmp &lt; 0)</div><div class='add'>+				goto decode_failed;</div><div class='add'>+</div><div class='add'>+			cf-&gt;data[i] = (tmp &lt;&lt; 4);</div><div class='add'>+			tmp = hex_to_bin(*cmd++);</div><div class='add'>+			if (tmp &lt; 0)</div><div class='add'>+				goto decode_failed;</div><div class='add'>+</div><div class='add'>+			cf-&gt;data[i] |= tmp;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sl-&gt;dev-&gt;stats.rx_packets++;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		sl-&gt;dev-&gt;stats.rx_bytes += cf-&gt;len;</div><div class='add'>+</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+decode_failed:</div><div class='add'>+	sl-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* A change state frame must contain state info and receive and transmit</div><div class='add'>+ * error counters.</div><div class='add'>+ *</div><div class='add'>+ * Examples:</div><div class='add'>+ *</div><div class='add'>+ * sb256256 : state bus-off: rx counter 256, tx counter 256</div><div class='add'>+ * sa057033 : state active, rx counter 57, tx counter 33</div><div class='add'>+ */</div><div class='add'>+static void slcan_bump_state(struct slcan *sl)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = sl-&gt;dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	char *cmd = sl-&gt;rbuff;</div><div class='add'>+	u32 rxerr, txerr;</div><div class='add'>+	enum can_state state, rx_state, tx_state;</div><div class='add'>+</div><div class='add'>+	switch (cmd[1]) {</div><div class='add'>+	case 'a':</div><div class='add'>+		state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		break;</div><div class='add'>+	case 'w':</div><div class='add'>+		state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+		break;</div><div class='add'>+	case 'p':</div><div class='add'>+		state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+		break;</div><div class='add'>+	case 'b':</div><div class='add'>+		state = CAN_STATE_BUS_OFF;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state == sl-&gt;can.state || sl-&gt;rcount != SLCAN_STATE_MSG_LEN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmd += SLCAN_STATE_BE_RXCNT_LEN + SLCAN_CMD_LEN + 1;</div><div class='add'>+	cmd[SLCAN_STATE_BE_TXCNT_LEN] = 0;</div><div class='add'>+	if (kstrtou32(cmd, 10, &amp;txerr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	*cmd = 0;</div><div class='add'>+	cmd -= SLCAN_STATE_BE_RXCNT_LEN;</div><div class='add'>+	if (kstrtou32(cmd, 10, &amp;rxerr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	tx_state = txerr &gt;= rxerr ? state : 0;</div><div class='add'>+	rx_state = txerr &lt;= rxerr ? state : 0;</div><div class='add'>+	can_change_state(dev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		can_bus_off(dev);</div><div class='add'>+	} else if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = txerr;</div><div class='add'>+		cf-&gt;data[7] = rxerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* An error frame can contain more than one type of error.</div><div class='add'>+ *</div><div class='add'>+ * Examples:</div><div class='add'>+ *</div><div class='add'>+ * e1a : len 1, errors: ACK error</div><div class='add'>+ * e3bcO: len 3, errors: Bit0 error, CRC error, Tx overrun error</div><div class='add'>+ */</div><div class='add'>+static void slcan_bump_err(struct slcan *sl)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = sl-&gt;dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	char *cmd = sl-&gt;rbuff;</div><div class='add'>+	bool rx_errors = false, tx_errors = false, rx_over_errors = false;</div><div class='add'>+	int i, len;</div><div class='add'>+</div><div class='add'>+	if (sl-&gt;rcount &lt; SLCAN_ERROR_MSG_LEN_MIN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* get len from sanitized ASCII value */</div><div class='add'>+	len = cmd[1];</div><div class='add'>+	if (len &gt;= '0' &amp;&amp; len &lt; '9')</div><div class='add'>+		len -= '0';</div><div class='add'>+	else</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if ((len + SLCAN_CMD_LEN + 1) &gt; sl-&gt;rcount)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(dev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+</div><div class='add'>+	cmd += SLCAN_CMD_LEN + 1;</div><div class='add'>+	for (i = 0; i &lt; len; i++, cmd++) {</div><div class='add'>+		switch (*cmd) {</div><div class='add'>+		case 'a':</div><div class='add'>+			netdev_dbg(dev, "ACK error\n");</div><div class='add'>+			tx_errors = true;</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+				cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 'b':</div><div class='add'>+			netdev_dbg(dev, "Bit0 error\n");</div><div class='add'>+			tx_errors = true;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 'B':</div><div class='add'>+			netdev_dbg(dev, "Bit1 error\n");</div><div class='add'>+			tx_errors = true;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 'c':</div><div class='add'>+			netdev_dbg(dev, "CRC error\n");</div><div class='add'>+			rx_errors = true;</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+				cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 'f':</div><div class='add'>+			netdev_dbg(dev, "Form Error\n");</div><div class='add'>+			rx_errors = true;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 'o':</div><div class='add'>+			netdev_dbg(dev, "Rx overrun error\n");</div><div class='add'>+			rx_over_errors = true;</div><div class='add'>+			rx_errors = true;</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+				cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 'O':</div><div class='add'>+			netdev_dbg(dev, "Tx overrun error\n");</div><div class='add'>+			tx_errors = true;</div><div class='add'>+			if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+				cf-&gt;data[1] = CAN_ERR_CRTL_TX_OVERFLOW;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case 's':</div><div class='add'>+			netdev_dbg(dev, "Stuff error\n");</div><div class='add'>+			rx_errors = true;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			if (skb)</div><div class='add'>+				dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_errors)</div><div class='add'>+		dev-&gt;stats.rx_errors++;</div><div class='add'>+</div><div class='add'>+	if (rx_over_errors)</div><div class='add'>+		dev-&gt;stats.rx_over_errors++;</div><div class='add'>+</div><div class='add'>+	if (tx_errors)</div><div class='add'>+		dev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void slcan_bump(struct slcan *sl)</div><div class='add'>+{</div><div class='add'>+	switch (sl-&gt;rbuff[0]) {</div><div class='add'>+	case 'r':</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 't':</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 'R':</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 'T':</div><div class='add'>+		return slcan_bump_frame(sl);</div><div class='add'>+	case 'e':</div><div class='add'>+		return slcan_bump_err(sl);</div><div class='add'>+	case 's':</div><div class='add'>+		return slcan_bump_state(sl);</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* parse tty input stream */</div><div class='add'>+static void slcan_unesc(struct slcan *sl, unsigned char s)</div><div class='add'>+{</div><div class='add'>+	if ((s == '\r') || (s == '\a')) { /* CR or BEL ends the pdu */</div><div class='add'>+		if (!test_and_clear_bit(SLF_ERROR, &amp;sl-&gt;flags))</div><div class='add'>+			slcan_bump(sl);</div><div class='add'>+</div><div class='add'>+		sl-&gt;rcount = 0;</div><div class='add'>+	} else {</div><div class='add'>+		if (!test_bit(SLF_ERROR, &amp;sl-&gt;flags))  {</div><div class='add'>+			if (sl-&gt;rcount &lt; SLCAN_MTU)  {</div><div class='add'>+				sl-&gt;rbuff[sl-&gt;rcount++] = s;</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			sl-&gt;dev-&gt;stats.rx_over_errors++;</div><div class='add'>+			set_bit(SLF_ERROR, &amp;sl-&gt;flags);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ *			STANDARD SLCAN ENCAPSULATION			 *</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Encapsulate one can_frame and stuff into a TTY queue. */</div><div class='add'>+static void slcan_encaps(struct slcan *sl, struct can_frame *cf)</div><div class='add'>+{</div><div class='add'>+	int actual, i;</div><div class='add'>+	unsigned char *pos;</div><div class='add'>+	unsigned char *endpos;</div><div class='add'>+	canid_t id = cf-&gt;can_id;</div><div class='add'>+</div><div class='add'>+	pos = sl-&gt;xbuff;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		*pos = 'R'; /* becomes 'r' in standard frame format (SFF) */</div><div class='add'>+	else</div><div class='add'>+		*pos = 'T'; /* becomes 't' in standard frame format (SSF) */</div><div class='add'>+</div><div class='add'>+	/* determine number of chars for the CAN-identifier */</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		id &amp;= CAN_EFF_MASK;</div><div class='add'>+		endpos = pos + SLCAN_EFF_ID_LEN;</div><div class='add'>+	} else {</div><div class='add'>+		*pos |= 0x20; /* convert R/T to lower case for SFF */</div><div class='add'>+		id &amp;= CAN_SFF_MASK;</div><div class='add'>+		endpos = pos + SLCAN_SFF_ID_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* build 3 (SFF) or 8 (EFF) digit CAN identifier */</div><div class='add'>+	pos++;</div><div class='add'>+	while (endpos &gt;= pos) {</div><div class='add'>+		*endpos-- = hex_asc_upper[id &amp; 0xf];</div><div class='add'>+		id &gt;&gt;= 4;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos += (cf-&gt;can_id &amp; CAN_EFF_FLAG) ?</div><div class='add'>+		SLCAN_EFF_ID_LEN : SLCAN_SFF_ID_LEN;</div><div class='add'>+</div><div class='add'>+	*pos++ = cf-&gt;len + '0';</div><div class='add'>+</div><div class='add'>+	/* RTR frames may have a dlc &gt; 0 but they never have any data bytes */</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='add'>+			pos = hex_byte_pack_upper(pos, cf-&gt;data[i]);</div><div class='add'>+</div><div class='add'>+		sl-&gt;dev-&gt;stats.tx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*pos++ = '\r';</div><div class='add'>+</div><div class='add'>+	/* Order of next two lines is *very* important.</div><div class='add'>+	 * When we are sending a little amount of data,</div><div class='add'>+	 * the transfer may be completed inside the ops-&gt;write()</div><div class='add'>+	 * routine, because it's running with interrupts enabled.</div><div class='add'>+	 * In this case we *never* got WRITE_WAKEUP event,</div><div class='add'>+	 * if we did not request it before write operation.</div><div class='add'>+	 *       14 Oct 1994  Dmitry Gorodchanin.</div><div class='add'>+	 */</div><div class='add'>+	set_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='add'>+	actual = sl-&gt;tty-&gt;ops-&gt;write(sl-&gt;tty, sl-&gt;xbuff, pos - sl-&gt;xbuff);</div><div class='add'>+	sl-&gt;xleft = (pos - sl-&gt;xbuff) - actual;</div><div class='add'>+	sl-&gt;xhead = sl-&gt;xbuff + actual;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write out any remaining transmit buffer. Scheduled when tty is writable */</div><div class='add'>+static void slcan_transmit(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = container_of(work, struct slcan, tx_work);</div><div class='add'>+	int actual;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;sl-&gt;lock);</div><div class='add'>+	/* First make sure we're connected. */</div><div class='add'>+	if (unlikely(!netif_running(sl-&gt;dev)) &amp;&amp;</div><div class='add'>+	    likely(!test_bit(SLF_XCMD, &amp;sl-&gt;flags))) {</div><div class='add'>+		spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sl-&gt;xleft &lt;= 0)  {</div><div class='add'>+		if (unlikely(test_bit(SLF_XCMD, &amp;sl-&gt;flags))) {</div><div class='add'>+			clear_bit(SLF_XCMD, &amp;sl-&gt;flags);</div><div class='add'>+			clear_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='add'>+			spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='add'>+			wake_up(&amp;sl-&gt;xcmd_wait);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Now serial buffer is almost free &amp; we can start</div><div class='add'>+		 * transmission of another packet</div><div class='add'>+		 */</div><div class='add'>+		sl-&gt;dev-&gt;stats.tx_packets++;</div><div class='add'>+		clear_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='add'>+		spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='add'>+		netif_wake_queue(sl-&gt;dev);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	actual = sl-&gt;tty-&gt;ops-&gt;write(sl-&gt;tty, sl-&gt;xhead, sl-&gt;xleft);</div><div class='add'>+	sl-&gt;xleft -= actual;</div><div class='add'>+	sl-&gt;xhead += actual;</div><div class='add'>+	spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called by the driver when there's room for more data.</div><div class='add'>+ * Schedule the transmit.</div><div class='add'>+ */</div><div class='add'>+static void slcan_write_wakeup(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = tty-&gt;disc_data;</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;sl-&gt;tx_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Send a can_frame to a TTY queue. */</div><div class='add'>+static netdev_tx_t slcan_netdev_xmit(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sl-&gt;lock);</div><div class='add'>+	if (!netif_running(dev))  {</div><div class='add'>+		spin_unlock(&amp;sl-&gt;lock);</div><div class='add'>+		netdev_warn(dev, "xmit: iface is down\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	if (!sl-&gt;tty) {</div><div class='add'>+		spin_unlock(&amp;sl-&gt;lock);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(sl-&gt;dev);</div><div class='add'>+	slcan_encaps(sl, (struct can_frame *)skb-&gt;data); /* encaps &amp; send */</div><div class='add'>+	spin_unlock(&amp;sl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/******************************************</div><div class='add'>+ *   Routines looking at netdevice side.</div><div class='add'>+ ******************************************/</div><div class='add'>+</div><div class='add'>+static int slcan_transmit_cmd(struct slcan *sl, const unsigned char *cmd)</div><div class='add'>+{</div><div class='add'>+	int ret, actual, n;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;sl-&gt;lock);</div><div class='add'>+	if (!sl-&gt;tty) {</div><div class='add'>+		spin_unlock(&amp;sl-&gt;lock);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	n = scnprintf(sl-&gt;xbuff, sizeof(sl-&gt;xbuff), "%s", cmd);</div><div class='add'>+	set_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='add'>+	actual = sl-&gt;tty-&gt;ops-&gt;write(sl-&gt;tty, sl-&gt;xbuff, n);</div><div class='add'>+	sl-&gt;xleft = n - actual;</div><div class='add'>+	sl-&gt;xhead = sl-&gt;xbuff + actual;</div><div class='add'>+	set_bit(SLF_XCMD, &amp;sl-&gt;flags);</div><div class='add'>+	spin_unlock(&amp;sl-&gt;lock);</div><div class='add'>+	ret = wait_event_interruptible_timeout(sl-&gt;xcmd_wait,</div><div class='add'>+					       !test_bit(SLF_XCMD, &amp;sl-&gt;flags),</div><div class='add'>+					       HZ);</div><div class='add'>+	clear_bit(SLF_XCMD, &amp;sl-&gt;flags);</div><div class='add'>+	if (ret == -ERESTARTSYS)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Netdevice UP -&gt; DOWN routine */</div><div class='add'>+static int slcan_netdev_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (sl-&gt;can.bittiming.bitrate &amp;&amp;</div><div class='add'>+	    sl-&gt;can.bittiming.bitrate != CAN_BITRATE_UNKNOWN) {</div><div class='add'>+		err = slcan_transmit_cmd(sl, "C\r");</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_warn(dev,</div><div class='add'>+				    "failed to send close command 'C\\r'\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TTY discipline is running. */</div><div class='add'>+	clear_bit(TTY_DO_WRITE_WAKEUP, &amp;sl-&gt;tty-&gt;flags);</div><div class='add'>+	flush_work(&amp;sl-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(dev);</div><div class='add'>+	sl-&gt;rcount   = 0;</div><div class='add'>+	sl-&gt;xleft    = 0;</div><div class='add'>+	close_candev(dev);</div><div class='add'>+	sl-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	if (sl-&gt;can.bittiming.bitrate == CAN_BITRATE_UNKNOWN)</div><div class='add'>+		sl-&gt;can.bittiming.bitrate = CAN_BITRATE_UNSET;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Netdevice DOWN -&gt; UP routine */</div><div class='add'>+static int slcan_netdev_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = netdev_priv(dev);</div><div class='add'>+	unsigned char cmd[SLCAN_MTU];</div><div class='add'>+	int err, s;</div><div class='add'>+</div><div class='add'>+	/* The baud rate is not set with the command</div><div class='add'>+	 * `ip link set &lt;iface&gt; type can bitrate &lt;baud&gt;' and therefore</div><div class='add'>+	 * can.bittiming.bitrate is CAN_BITRATE_UNSET (0), causing</div><div class='add'>+	 * open_candev() to fail. So let's set to a fake value.</div><div class='add'>+	 */</div><div class='add'>+	if (sl-&gt;can.bittiming.bitrate == CAN_BITRATE_UNSET)</div><div class='add'>+		sl-&gt;can.bittiming.bitrate = CAN_BITRATE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	err = open_candev(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "failed to open can device\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sl-&gt;can.bittiming.bitrate != CAN_BITRATE_UNKNOWN) {</div><div class='add'>+		for (s = 0; s &lt; ARRAY_SIZE(slcan_bitrate_const); s++) {</div><div class='add'>+			if (sl-&gt;can.bittiming.bitrate == slcan_bitrate_const[s])</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The CAN framework has already validate the bitrate value,</div><div class='add'>+		 * so we can avoid to check if `s' has been properly set.</div><div class='add'>+		 */</div><div class='add'>+		snprintf(cmd, sizeof(cmd), "C\rS%d\r", s);</div><div class='add'>+		err = slcan_transmit_cmd(sl, cmd);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(dev,</div><div class='add'>+				   "failed to send bitrate command 'C\\rS%d\\r'\n",</div><div class='add'>+				   s);</div><div class='add'>+			goto cmd_transmit_failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (test_bit(CF_ERR_RST, &amp;sl-&gt;cmd_flags)) {</div><div class='add'>+			err = slcan_transmit_cmd(sl, "F\r");</div><div class='add'>+			if (err) {</div><div class='add'>+				netdev_err(dev,</div><div class='add'>+					   "failed to send error command 'F\\r'\n");</div><div class='add'>+				goto cmd_transmit_failed;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (sl-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY) {</div><div class='add'>+			err = slcan_transmit_cmd(sl, "L\r");</div><div class='add'>+			if (err) {</div><div class='add'>+				netdev_err(dev,</div><div class='add'>+					   "failed to send listen-only command 'L\\r'\n");</div><div class='add'>+				goto cmd_transmit_failed;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			err = slcan_transmit_cmd(sl, "O\r");</div><div class='add'>+			if (err) {</div><div class='add'>+				netdev_err(dev,</div><div class='add'>+					   "failed to send open command 'O\\r'\n");</div><div class='add'>+				goto cmd_transmit_failed;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sl-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+cmd_transmit_failed:</div><div class='add'>+	close_candev(dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops slcan_netdev_ops = {</div><div class='add'>+	.ndo_open               = slcan_netdev_open,</div><div class='add'>+	.ndo_stop               = slcan_netdev_close,</div><div class='add'>+	.ndo_start_xmit         = slcan_netdev_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/******************************************</div><div class='add'>+ *  Routines looking at TTY side.</div><div class='add'>+ ******************************************/</div><div class='add'>+</div><div class='add'>+/* Handle the 'receiver data ready' interrupt.</div><div class='add'>+ * This function is called by the 'tty_io' module in the kernel when</div><div class='add'>+ * a block of SLCAN data has been received, which can now be decapsulated</div><div class='add'>+ * and sent on to some IP layer for further processing. This will not</div><div class='add'>+ * be re-entered while running but other ldisc functions may be called</div><div class='add'>+ * in parallel</div><div class='add'>+ */</div><div class='add'>+static void slcan_receive_buf(struct tty_struct *tty, const u8 *cp,</div><div class='add'>+			      const u8 *fp, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = tty-&gt;disc_data;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(sl-&gt;dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Read the characters out of the buffer */</div><div class='add'>+	while (count--) {</div><div class='add'>+		if (fp &amp;&amp; *fp++) {</div><div class='add'>+			if (!test_and_set_bit(SLF_ERROR, &amp;sl-&gt;flags))</div><div class='add'>+				sl-&gt;dev-&gt;stats.rx_errors++;</div><div class='add'>+			cp++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		slcan_unesc(sl, *cp++);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Open the high-level part of the SLCAN channel.</div><div class='add'>+ * This function is called by the TTY module when the</div><div class='add'>+ * SLCAN line discipline is called for.</div><div class='add'>+ *</div><div class='add'>+ * Called in process context serialized from other ldisc calls.</div><div class='add'>+ */</div><div class='add'>+static int slcan_open(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct slcan *sl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!capable(CAP_NET_ADMIN))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='add'>+	if (!tty-&gt;ops-&gt;write)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dev = alloc_candev(sizeof(*sl), 1);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENFILE;</div><div class='add'>+</div><div class='add'>+	sl = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	/* Configure TTY interface */</div><div class='add'>+	tty-&gt;receive_room = 65536; /* We don't flow control */</div><div class='add'>+	sl-&gt;rcount = 0;</div><div class='add'>+	sl-&gt;xleft = 0;</div><div class='add'>+	spin_lock_init(&amp;sl-&gt;lock);</div><div class='add'>+	INIT_WORK(&amp;sl-&gt;tx_work, slcan_transmit);</div><div class='add'>+	init_waitqueue_head(&amp;sl-&gt;xcmd_wait);</div><div class='add'>+</div><div class='add'>+	/* Configure CAN metadata */</div><div class='add'>+	sl-&gt;can.bitrate_const = slcan_bitrate_const;</div><div class='add'>+	sl-&gt;can.bitrate_const_cnt = ARRAY_SIZE(slcan_bitrate_const);</div><div class='add'>+	sl-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY;</div><div class='add'>+</div><div class='add'>+	/* Configure netdev interface */</div><div class='add'>+	sl-&gt;dev	= dev;</div><div class='add'>+	dev-&gt;netdev_ops = &amp;slcan_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;slcan_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	/* Mark ldisc channel as alive */</div><div class='add'>+	sl-&gt;tty = tty;</div><div class='add'>+	tty-&gt;disc_data = sl;</div><div class='add'>+</div><div class='add'>+	err = register_candev(dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		free_candev(dev);</div><div class='add'>+		pr_err("can't register candev\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(dev, "slcan on %s.\n", tty-&gt;name);</div><div class='add'>+	/* TTY layer expects 0 on success */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Close down a SLCAN channel.</div><div class='add'>+ * This means flushing out any pending queues, and then returning. This</div><div class='add'>+ * call is serialized against other ldisc functions.</div><div class='add'>+ * Once this is called, no other ldisc function of ours is entered.</div><div class='add'>+ *</div><div class='add'>+ * We also use this method for a hangup event.</div><div class='add'>+ */</div><div class='add'>+static void slcan_close(struct tty_struct *tty)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = tty-&gt;disc_data;</div><div class='add'>+</div><div class='add'>+	unregister_candev(sl-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * The netdev needn't be UP (so .ndo_stop() is not called). Hence make</div><div class='add'>+	 * sure this is not running before freeing it up.</div><div class='add'>+	 */</div><div class='add'>+	flush_work(&amp;sl-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	/* Mark channel as dead */</div><div class='add'>+	spin_lock_bh(&amp;sl-&gt;lock);</div><div class='add'>+	tty-&gt;disc_data = NULL;</div><div class='add'>+	sl-&gt;tty = NULL;</div><div class='add'>+	spin_unlock_bh(&amp;sl-&gt;lock);</div><div class='add'>+</div><div class='add'>+	netdev_info(sl-&gt;dev, "slcan off %s.\n", tty-&gt;name);</div><div class='add'>+	free_candev(sl-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Perform I/O control on an active SLCAN channel. */</div><div class='add'>+static int slcan_ioctl(struct tty_struct *tty, unsigned int cmd,</div><div class='add'>+		       unsigned long arg)</div><div class='add'>+{</div><div class='add'>+	struct slcan *sl = tty-&gt;disc_data;</div><div class='add'>+	unsigned int tmp;</div><div class='add'>+</div><div class='add'>+	switch (cmd) {</div><div class='add'>+	case SIOCGIFNAME:</div><div class='add'>+		tmp = strlen(sl-&gt;dev-&gt;name) + 1;</div><div class='add'>+		if (copy_to_user((void __user *)arg, sl-&gt;dev-&gt;name, tmp))</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case SIOCSIFHWADDR:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return tty_mode_ioctl(tty, cmd, arg);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tty_ldisc_ops slcan_ldisc = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.num		= N_SLCAN,</div><div class='add'>+	.name		= KBUILD_MODNAME,</div><div class='add'>+	.open		= slcan_open,</div><div class='add'>+	.close		= slcan_close,</div><div class='add'>+	.ioctl		= slcan_ioctl,</div><div class='add'>+	.receive_buf	= slcan_receive_buf,</div><div class='add'>+	.write_wakeup	= slcan_write_wakeup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init slcan_init(void)</div><div class='add'>+{</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	pr_info("serial line CAN interface driver\n");</div><div class='add'>+</div><div class='add'>+	/* Fill in our line protocol discipline, and register it */</div><div class='add'>+	status = tty_register_ldisc(&amp;slcan_ldisc);</div><div class='add'>+	if (status)</div><div class='add'>+		pr_err("can't register line discipline\n");</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit slcan_exit(void)</div><div class='add'>+{</div><div class='add'>+	/* This will only be called when all channels have been closed by</div><div class='add'>+	 * userspace - tty_ldisc.c takes care of the module's refcount.</div><div class='add'>+	 */</div><div class='add'>+	tty_unregister_ldisc(&amp;slcan_ldisc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(slcan_init);</div><div class='add'>+module_exit(slcan_exit);</div><div class='head'>diff --git a/drivers/net/can/slcan/slcan-ethtool.c b/drivers/net/can/slcan/slcan-ethtool.c<br/>new file mode 100644<br/>index 000000000000..f598c653fbfa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/slcan/slcan-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/slcan/slcan-ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,61 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/* Copyright (c) 2022 Amarula Solutions, Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "slcan.h"</div><div class='add'>+</div><div class='add'>+static const char slcan_priv_flags_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+#define SLCAN_PRIV_FLAGS_ERR_RST_ON_OPEN BIT(0)</div><div class='add'>+	"err-rst-on-open",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void slcan_get_strings(struct net_device *ndev, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		memcpy(data, slcan_priv_flags_strings,</div><div class='add'>+		       sizeof(slcan_priv_flags_strings));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 slcan_get_priv_flags(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (slcan_err_rst_on_open(ndev))</div><div class='add'>+		flags |= SLCAN_PRIV_FLAGS_ERR_RST_ON_OPEN;</div><div class='add'>+</div><div class='add'>+	return flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slcan_set_priv_flags(struct net_device *ndev, u32 flags)</div><div class='add'>+{</div><div class='add'>+	bool err_rst_op_open = !!(flags &amp; SLCAN_PRIV_FLAGS_ERR_RST_ON_OPEN);</div><div class='add'>+</div><div class='add'>+	return slcan_enable_err_rst_on_open(ndev, err_rst_op_open);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int slcan_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		return ARRAY_SIZE(slcan_priv_flags_strings);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops slcan_ethtool_ops = {</div><div class='add'>+	.get_strings = slcan_get_strings,</div><div class='add'>+	.get_priv_flags = slcan_get_priv_flags,</div><div class='add'>+	.set_priv_flags = slcan_set_priv_flags,</div><div class='add'>+	.get_sset_count = slcan_get_sset_count,</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/can/slcan/slcan.h b/drivers/net/can/slcan/slcan.h<br/>new file mode 100644<br/>index 000000000000..85cedf856db3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/slcan/slcan.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/slcan/slcan.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ * slcan.h - serial line CAN interface driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) Laurence Culhane &lt;loz@holmes.demon.co.uk&gt;</div><div class='add'>+ * Copyright (C) Fred N. van Kempen &lt;waltje@uwalt.nl.mugnet.org&gt;</div><div class='add'>+ * Copyright (C) Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='add'>+ * Copyright (C) 2022 Amarula Solutions, Dario Binacchi &lt;dario.binacchi@amarulasolutions.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _SLCAN_H</div><div class='add'>+#define _SLCAN_H</div><div class='add'>+</div><div class='add'>+bool slcan_err_rst_on_open(struct net_device *ndev);</div><div class='add'>+int slcan_enable_err_rst_on_open(struct net_device *ndev, bool on);</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_ops slcan_ethtool_ops;</div><div class='add'>+</div><div class='add'>+#endif /* _SLCAN_H */</div><div class='head'>diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig<br/>index 0f1708f99308..8afd7d0a1000 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/softing/Kconfig</a></div><div class='hunk'>@@ -2,17 +2,17 @@</div><div class='ctx'> config CAN_SOFTING</div><div class='ctx'> 	tristate "Softing Gmbh CAN generic support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for CAN cards from Softing Gmbh &amp; some cards</div><div class='ctx'> 	  from Vector Gmbh.</div><div class='del'>-	  Softing Gmbh CAN cards come with 1 or 2 physical busses.</div><div class='add'>+	  Softing Gmbh CAN cards come with 1 or 2 physical buses.</div><div class='ctx'> 	  Those cards typically use Dual Port RAM to communicate</div><div class='ctx'> 	  with the host CPU. The interface is then identical for PCI</div><div class='ctx'> 	  and PCMCIA cards. This driver operates on a platform device,</div><div class='ctx'> 	  which has been created by softing_cs or softing_pci driver.</div><div class='ctx'> 	  Warning:</div><div class='ctx'> 	  The API of the card does not allow fine control per bus, but</div><div class='del'>-	  controls the 2 busses on the card together.</div><div class='add'>+	  controls the 2 buses on the card together.</div><div class='ctx'> 	  As such, some actions (start/stop/busoff recovery) on 1 bus</div><div class='ctx'> 	  must bring down the other bus too temporarily.</div><div class='ctx'> </div><div class='hunk'>@@ -20,11 +20,11 @@ config CAN_SOFTING_CS</div><div class='ctx'> 	tristate "Softing Gmbh CAN pcmcia cards"</div><div class='ctx'> 	depends on PCMCIA</div><div class='ctx'> 	depends on CAN_SOFTING</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for PCMCIA cards from Softing Gmbh &amp; some cards</div><div class='ctx'> 	  from Vector Gmbh.</div><div class='ctx'> 	  You need firmware for these, which you can get at</div><div class='del'>-	  http://developer.berlios.de/projects/socketcan/</div><div class='add'>+	  https://github.com/linux-can/can-firmware</div><div class='ctx'> 	  This version of the driver is written against</div><div class='ctx'> 	  firmware version 4.6 (softing-fw-4.6-binaries.tar.gz)</div><div class='ctx'> 	  In order to use the card as CAN device, you need the Softing generic</div><div class='head'>diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c<br/>index 4d4492884e0b..e5c939b63fa6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/softing/softing_cs.c</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2008-2010</div><div class='ctx'>  *</div><div class='ctx'>  * - Kurt Van Dijck, EIA Electronics</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -304,7 +293,7 @@ static int softingcs_probe(struct pcmcia_device *pcmcia)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> platform_failed:</div><div class='del'>-	kfree(dev);</div><div class='add'>+	platform_device_put(pdev);</div><div class='ctx'> mem_failed:</div><div class='ctx'> pcmcia_bad:</div><div class='ctx'> pcmcia_failed:</div><div class='head'>diff --git a/drivers/net/can/softing/softing_fw.c b/drivers/net/can/softing/softing_fw.c<br/>index aac58ce6e371..721df91cdbfb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_fw.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_fw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/softing/softing_fw.c</a></div><div class='hunk'>@@ -1,19 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2008-2010</div><div class='ctx'>  *</div><div class='ctx'>  * - Kurt Van Dijck, EIA Electronics</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='hunk'>@@ -284,7 +273,7 @@ int softing_load_app_fw(const char *file, struct softing *card)</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* regualar data */</div><div class='add'>+		/* regular data */</div><div class='ctx'> 		for (sum = 0, j = 0; j &lt; len; ++j)</div><div class='ctx'> 			sum += dat[j];</div><div class='ctx'> 		/* work in 16bit (target) */</div><div class='hunk'>@@ -447,7 +436,7 @@ int softing_startstop(struct net_device *dev, int up)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	bus_bitmask_start = 0;</div><div class='del'>-	if (dev &amp;&amp; up)</div><div class='add'>+	if (up)</div><div class='ctx'> 		/* prepare to start this bus as well */</div><div class='ctx'> 		bus_bitmask_start |= (1 &lt;&lt; priv-&gt;index);</div><div class='ctx'> 	/* bring netdevs down */</div><div class='hunk'>@@ -485,14 +474,14 @@ int softing_startstop(struct net_device *dev, int up)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto failed;</div><div class='ctx'> 	if (!bus_bitmask_start)</div><div class='del'>-		/* no busses to be brought up */</div><div class='add'>+		/* no buses to be brought up */</div><div class='ctx'> 		goto card_done;</div><div class='ctx'> </div><div class='ctx'> 	if ((bus_bitmask_start &amp; 1) &amp;&amp; (bus_bitmask_start &amp; 2)</div><div class='ctx'> 			&amp;&amp; (softing_error_reporting(card-&gt;net[0])</div><div class='ctx'> 				!= softing_error_reporting(card-&gt;net[1]))) {</div><div class='ctx'> 		dev_alert(&amp;card-&gt;pdev-&gt;dev,</div><div class='del'>-				"err_reporting flag differs for busses\n");</div><div class='add'>+				"err_reporting flag differs for buses\n");</div><div class='ctx'> 		goto invalid;</div><div class='ctx'> 	}</div><div class='ctx'> 	error_reporting = 0;</div><div class='hunk'>@@ -576,18 +565,19 @@ int softing_startstop(struct net_device *dev, int up)</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 	}</div><div class='del'>-	/* enable_error_frame */</div><div class='del'>-	/*</div><div class='add'>+</div><div class='add'>+	/* enable_error_frame</div><div class='add'>+	 *</div><div class='ctx'> 	 * Error reporting is switched off at the moment since</div><div class='ctx'> 	 * the receiving of them is not yet 100% verified</div><div class='ctx'> 	 * This should be enabled sooner or later</div><div class='del'>-	 *</div><div class='del'>-	if (error_reporting) {</div><div class='add'>+	 */</div><div class='add'>+	if (0 &amp;&amp; error_reporting) {</div><div class='ctx'> 		ret = softing_fct_cmd(card, 51, "enable_error_frame");</div><div class='ctx'> 		if (ret &lt; 0)</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 	}</div><div class='del'>-	*/</div><div class='add'>+</div><div class='ctx'> 	/* initialize interface */</div><div class='ctx'> 	iowrite16(1, &amp;card-&gt;dpram[DPRAM_FCT_PARAM + 2]);</div><div class='ctx'> 	iowrite16(1, &amp;card-&gt;dpram[DPRAM_FCT_PARAM + 4]);</div><div class='hunk'>@@ -635,7 +625,7 @@ int softing_startstop(struct net_device *dev, int up)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;msg, 0, sizeof(msg));</div><div class='ctx'> 	msg.can_id = CAN_ERR_FLAG | CAN_ERR_RESTARTED;</div><div class='del'>-	msg.can_dlc = CAN_ERR_DLC;</div><div class='add'>+	msg.len = CAN_ERR_DLC;</div><div class='ctx'> 	for (j = 0; j &lt; ARRAY_SIZE(card-&gt;net); ++j) {</div><div class='ctx'> 		if (!(bus_bitmask_start &amp; (1 &lt;&lt; j)))</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -646,7 +636,7 @@ int softing_startstop(struct net_device *dev, int up)</div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 		open_candev(netdev);</div><div class='ctx'> 		if (dev != netdev) {</div><div class='del'>-			/* notify other busses on the restart */</div><div class='add'>+			/* notify other buses on the restart */</div><div class='ctx'> 			softing_netdev_rx(netdev, &amp;msg, 0);</div><div class='ctx'> 			++priv-&gt;can.can_stats.restarts;</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c<br/>index e22696190583..79bc64395ac4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/softing/softing_main.c</a></div><div class='hunk'>@@ -1,21 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2008-2010</div><div class='ctx'>  *</div><div class='ctx'>  * - Kurt Van Dijck, EIA Electronics</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -70,7 +60,7 @@ static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> 	uint8_t buf[DPRAM_TX_SIZE];</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;card-&gt;spin);</div><div class='hunk'>@@ -95,7 +85,7 @@ static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (priv-&gt;index)</div><div class='ctx'> 		*ptr |= CMD_BUS2;</div><div class='ctx'> 	++ptr;</div><div class='del'>-	*ptr++ = cf-&gt;can_dlc;</div><div class='add'>+	*ptr++ = cf-&gt;len;</div><div class='ctx'> 	*ptr++ = (cf-&gt;can_id &gt;&gt; 0);</div><div class='ctx'> 	*ptr++ = (cf-&gt;can_id &gt;&gt; 8);</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='hunk'>@@ -106,7 +96,7 @@ static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		ptr += 1;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='del'>-		memcpy(ptr, &amp;cf-&gt;data[0], cf-&gt;can_dlc);</div><div class='add'>+		memcpy(ptr, &amp;cf-&gt;data[0], cf-&gt;len);</div><div class='ctx'> 	memcpy_toio(&amp;card-&gt;dpram[DPRAM_TX + DPRAM_TX_SIZE * fifo_wr],</div><div class='ctx'> 			buf, DPRAM_TX_SIZE);</div><div class='ctx'> 	if (++fifo_wr &gt;= DPRAM_TX_CNT)</div><div class='hunk'>@@ -115,7 +105,7 @@ static netdev_tx_t softing_netdev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	card-&gt;tx.last_bus = priv-&gt;index;</div><div class='ctx'> 	++card-&gt;tx.pending;</div><div class='ctx'> 	++priv-&gt;tx.pending;</div><div class='del'>-	can_put_echo_skb(skb, dev, priv-&gt;tx.echo_put);</div><div class='add'>+	can_put_echo_skb(skb, dev, priv-&gt;tx.echo_put, 0);</div><div class='ctx'> 	++priv-&gt;tx.echo_put;</div><div class='ctx'> 	if (priv-&gt;tx.echo_put &gt;= TX_ECHO_SKB_MAX)</div><div class='ctx'> 		priv-&gt;tx.echo_put = 0;</div><div class='hunk'>@@ -178,11 +168,11 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 		iowrite8(0, &amp;card-&gt;dpram[DPRAM_RX_LOST]);</div><div class='ctx'> 		/* prepare msg */</div><div class='ctx'> 		msg.can_id = CAN_ERR_FLAG | CAN_ERR_CRTL;</div><div class='del'>-		msg.can_dlc = CAN_ERR_DLC;</div><div class='add'>+		msg.len = CAN_ERR_DLC;</div><div class='ctx'> 		msg.data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> 		/*</div><div class='del'>-		 * service to all busses, we don't know which it was applicable</div><div class='del'>-		 * but only service busses that are online</div><div class='add'>+		 * service to all buses, we don't know which it was applicable</div><div class='add'>+		 * but only service buses that are online</div><div class='ctx'> 		 */</div><div class='ctx'> 		for (j = 0; j &lt; ARRAY_SIZE(card-&gt;net); ++j) {</div><div class='ctx'> 			netdev = card-&gt;net[j];</div><div class='hunk'>@@ -229,7 +219,7 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 		state = *ptr++;</div><div class='ctx'> </div><div class='ctx'> 		msg.can_id = CAN_ERR_FLAG;</div><div class='del'>-		msg.can_dlc = CAN_ERR_DLC;</div><div class='add'>+		msg.len = CAN_ERR_DLC;</div><div class='ctx'> </div><div class='ctx'> 		if (state &amp; SF_MASK_BUSOFF) {</div><div class='ctx'> 			can_state = CAN_STATE_BUS_OFF;</div><div class='hunk'>@@ -250,7 +240,6 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 				DPRAM_INFO_BUSSTATE2 : DPRAM_INFO_BUSSTATE]);</div><div class='ctx'> 		/* timestamp */</div><div class='ctx'> 		tmp_u32 = le32_to_cpup((void *)ptr);</div><div class='del'>-		ptr += 4;</div><div class='ctx'> 		ktime = softing_raw2ktime(card, tmp_u32);</div><div class='ctx'> </div><div class='ctx'> 		++netdev-&gt;stats.rx_errors;</div><div class='hunk'>@@ -272,7 +261,7 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (cmd &amp; CMD_RTR)</div><div class='ctx'> 			msg.can_id |= CAN_RTR_FLAG;</div><div class='del'>-		msg.can_dlc = get_can_dlc(*ptr++);</div><div class='add'>+		msg.len = can_cc_dlc2len(*ptr++);</div><div class='ctx'> 		if (cmd &amp; CMD_XTD) {</div><div class='ctx'> 			msg.can_id |= CAN_EFF_FLAG;</div><div class='ctx'> 			msg.can_id |= le32_to_cpup((void *)ptr);</div><div class='hunk'>@@ -287,7 +276,6 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 		ktime = softing_raw2ktime(card, tmp_u32);</div><div class='ctx'> 		if (!(msg.can_id &amp; CAN_RTR_FLAG))</div><div class='ctx'> 			memcpy(&amp;msg.data[0], ptr, 8);</div><div class='del'>-		ptr += 8;</div><div class='ctx'> 		/* update socket */</div><div class='ctx'> 		if (cmd &amp; CMD_ACK) {</div><div class='ctx'> 			/* acknowledge, was tx msg */</div><div class='hunk'>@@ -295,7 +283,10 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 			skb = priv-&gt;can.echo_skb[priv-&gt;tx.echo_get];</div><div class='ctx'> 			if (skb)</div><div class='ctx'> 				skb-&gt;tstamp = ktime;</div><div class='del'>-			can_get_echo_skb(netdev, priv-&gt;tx.echo_get);</div><div class='add'>+			++netdev-&gt;stats.tx_packets;</div><div class='add'>+			netdev-&gt;stats.tx_bytes +=</div><div class='add'>+				can_get_echo_skb(netdev, priv-&gt;tx.echo_get,</div><div class='add'>+						 NULL);</div><div class='ctx'> 			++priv-&gt;tx.echo_get;</div><div class='ctx'> 			if (priv-&gt;tx.echo_get &gt;= TX_ECHO_SKB_MAX)</div><div class='ctx'> 				priv-&gt;tx.echo_get = 0;</div><div class='hunk'>@@ -303,9 +294,6 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 				--priv-&gt;tx.pending;</div><div class='ctx'> 			if (card-&gt;tx.pending)</div><div class='ctx'> 				--card-&gt;tx.pending;</div><div class='del'>-			++netdev-&gt;stats.tx_packets;</div><div class='del'>-			if (!(msg.can_id &amp; CAN_RTR_FLAG))</div><div class='del'>-				netdev-&gt;stats.tx_bytes += msg.can_dlc;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -313,7 +301,7 @@ static int softing_handle_1(struct softing *card)</div><div class='ctx'> 			if (ret == NET_RX_SUCCESS) {</div><div class='ctx'> 				++netdev-&gt;stats.rx_packets;</div><div class='ctx'> 				if (!(msg.can_id &amp; CAN_RTR_FLAG))</div><div class='del'>-					netdev-&gt;stats.rx_bytes += msg.can_dlc;</div><div class='add'>+					netdev-&gt;stats.rx_bytes += msg.len;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				++netdev-&gt;stats.rx_dropped;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -350,7 +338,7 @@ static irqreturn_t softing_irq_thread(int irq, void *dev_id)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		priv = netdev_priv(netdev);</div><div class='ctx'> 		if (!canif_is_active(netdev))</div><div class='del'>-			/* it makes no sense to wake dead busses */</div><div class='add'>+			/* it makes no sense to wake dead buses */</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (priv-&gt;tx.pending &gt;= TX_ECHO_SKB_MAX)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -385,7 +373,7 @@ static irqreturn_t softing_irq_v1(int irq, void *dev_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * netdev/candev inter-operability</div><div class='add'>+ * netdev/candev interoperability</div><div class='ctx'>  */</div><div class='ctx'> static int softing_netdev_open(struct net_device *ndev)</div><div class='ctx'> {</div><div class='hunk'>@@ -393,20 +381,22 @@ static int softing_netdev_open(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	/* check or determine and set bittime */</div><div class='ctx'> 	ret = open_candev(ndev);</div><div class='del'>-	if (!ret)</div><div class='del'>-		ret = softing_startstop(ndev, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = softing_startstop(ndev, 1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		close_candev(ndev);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int softing_netdev_stop(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* softing cycle does close_candev() */</div><div class='del'>-	ret = softing_startstop(ndev, 0);</div><div class='del'>-	return ret;</div><div class='add'>+	return softing_startstop(ndev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int softing_candev_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='hunk'>@@ -458,8 +448,9 @@ static void softing_card_shutdown(struct softing *card)</div><div class='ctx'> {</div><div class='ctx'> 	int fw_up = 0;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;card-&gt;fw.lock))</div><div class='add'>+	if (mutex_lock_interruptible(&amp;card-&gt;fw.lock)) {</div><div class='ctx'> 		/* return -ERESTARTSYS */;</div><div class='add'>+	}</div><div class='ctx'> 	fw_up = card-&gt;fw.up;</div><div class='ctx'> 	card-&gt;fw.up = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -618,11 +609,14 @@ static const struct net_device_ops softing_netdev_ops = {</div><div class='ctx'> 	.ndo_open = softing_netdev_open,</div><div class='ctx'> 	.ndo_stop = softing_netdev_stop,</div><div class='ctx'> 	.ndo_start_xmit	= softing_netdev_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops softing_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct can_bittiming_const softing_btr_const = {</div><div class='del'>-	.name = "softing",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.tseg1_min = 1,</div><div class='ctx'> 	.tseg1_max = 16,</div><div class='ctx'> 	.tseg2_min = 1,</div><div class='hunk'>@@ -659,6 +653,7 @@ static struct net_device *softing_netdev_create(struct softing *card,</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;softing_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;softing_ethtool_ops;</div><div class='ctx'> 	priv-&gt;can.do_set_mode = softing_candev_set_mode;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;</div><div class='ctx'> </div><div class='hunk'>@@ -694,7 +689,7 @@ static void softing_netdev_cleanup(struct net_device *netdev)</div><div class='ctx'> static ssize_t show_##name(struct device *dev, \</div><div class='ctx'> 		struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='del'>-	struct softing *card = platform_get_drvdata(to_platform_device(dev)); \</div><div class='add'>+	struct softing *card = dev_get_drvdata(dev); \</div><div class='ctx'> 	return sprintf(buf, "%u\n", card-&gt;member); \</div><div class='ctx'> } \</div><div class='ctx'> static DEVICE_ATTR(name, 0444, show_##name, NULL)</div><div class='hunk'>@@ -703,7 +698,7 @@ static DEVICE_ATTR(name, 0444, show_##name, NULL)</div><div class='ctx'> static ssize_t show_##name(struct device *dev, \</div><div class='ctx'> 		struct device_attribute *attr, char *buf) \</div><div class='ctx'> { \</div><div class='del'>-	struct softing *card = platform_get_drvdata(to_platform_device(dev)); \</div><div class='add'>+	struct softing *card = dev_get_drvdata(dev); \</div><div class='ctx'> 	return sprintf(buf, "%s\n", card-&gt;member); \</div><div class='ctx'> } \</div><div class='ctx'> static DEVICE_ATTR(name, 0444, show_##name, NULL)</div><div class='hunk'>@@ -733,7 +728,7 @@ static const struct attribute_group softing_pdev_group = {</div><div class='ctx'> /*</div><div class='ctx'>  * platform driver</div><div class='ctx'>  */</div><div class='del'>-static int softing_pdev_remove(struct platform_device *pdev)</div><div class='add'>+static void softing_pdev_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct softing *card = platform_get_drvdata(pdev);</div><div class='ctx'> 	int j;</div><div class='hunk'>@@ -751,7 +746,6 @@ static int softing_pdev_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	iounmap(card-&gt;dpram);</div><div class='ctx'> 	kfree(card);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int softing_pdev_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -788,7 +782,7 @@ static int softing_pdev_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto platform_resource_failed;</div><div class='ctx'> 	card-&gt;dpram_phys = pres-&gt;start;</div><div class='ctx'> 	card-&gt;dpram_size = resource_size(pres);</div><div class='del'>-	card-&gt;dpram = ioremap_nocache(card-&gt;dpram_phys, card-&gt;dpram_size);</div><div class='add'>+	card-&gt;dpram = ioremap(card-&gt;dpram_phys, card-&gt;dpram_size);</div><div class='ctx'> 	if (!card-&gt;dpram) {</div><div class='ctx'> 		dev_alert(&amp;card-&gt;pdev-&gt;dev, "dpram ioremap failed\n");</div><div class='ctx'> 		goto ioremap_failed;</div><div class='hunk'>@@ -856,7 +850,7 @@ platform_resource_failed:</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver softing_driver = {</div><div class='ctx'> 	.driver = {</div><div class='del'>-		.name = "softing",</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = softing_pdev_probe,</div><div class='ctx'> 	.remove = softing_pdev_remove,</div><div class='head'>diff --git a/drivers/net/can/softing/softing_platform.h b/drivers/net/can/softing/softing_platform.h<br/>index 68a161547644..cd8d7904c5f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_platform.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/softing/softing_platform.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/softing/softing_platform.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/softing/softing_platform.h</a></div><div class='hunk'>@@ -19,7 +19,7 @@ struct softing_platform_data {</div><div class='ctx'> 	 * 16bit, shared interrupt</div><div class='ctx'> 	 */</div><div class='ctx'> 	int generation;</div><div class='del'>-	int nbus; /* # busses on device */</div><div class='add'>+	int nbus; /* # buses on device */</div><div class='ctx'> 	unsigned int freq; /* operating frequency in Hz */</div><div class='ctx'> 	unsigned int max_brp;</div><div class='ctx'> 	unsigned int max_sjw;</div><div class='head'>diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig<br/>index 2e7e535e9237..f45449210047 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/Kconfig</a></div><div class='hunk'>@@ -4,14 +4,15 @@ menu "CAN SPI interfaces"</div><div class='ctx'> </div><div class='ctx'> config CAN_HI311X</div><div class='ctx'> 	tristate "Holt HI311x SPI CAN controllers"</div><div class='del'>-	depends on CAN_DEV &amp;&amp; SPI &amp;&amp; HAS_DMA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for the Holt HI311x SPI CAN controllers.</div><div class='ctx'> </div><div class='ctx'> config CAN_MCP251X</div><div class='del'>-	tristate "Microchip MCP251x SPI CAN controllers"</div><div class='del'>-	depends on HAS_DMA</div><div class='del'>-	---help---</div><div class='del'>-	  Driver for the Microchip MCP251x SPI CAN controllers.</div><div class='add'>+	tristate "Microchip MCP251x and MCP25625 SPI CAN controllers"</div><div class='add'>+	help</div><div class='add'>+	  Driver for the Microchip MCP251x and MCP25625 SPI CAN</div><div class='add'>+	  controllers.</div><div class='add'>+</div><div class='add'>+source "drivers/net/can/spi/mcp251xfd/Kconfig"</div><div class='ctx'> </div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/net/can/spi/Makefile b/drivers/net/can/spi/Makefile<br/>index f115b2c46623..33e3f60bbc10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/Makefile</a></div><div class='hunk'>@@ -6,3 +6,4 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_HI311X)	+= hi311x.o</div><div class='ctx'> obj-$(CONFIG_CAN_MCP251X)	+= mcp251x.o</div><div class='add'>+obj-y				+= mcp251xfd/</div><div class='head'>diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c<br/>index ddaf46239e39..e00d3dbc4cf4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/hi311x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/hi311x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/hi311x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/hi311x.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* CAN bus driver for Holt HI3110 CAN Controller with SPI Interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright(C) Timesys Corporation 2016</div><div class='hunk'>@@ -11,29 +12,24 @@</div><div class='ctx'>  * - Sascha Hauer, Marc Kleine-Budde, Pengutronix</div><div class='ctx'>  * - Simon Kallweit, intefo AG</div><div class='ctx'>  * Copyright 2007</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can/core.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='hunk'>@@ -129,10 +125,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEVICE_NAME "hi3110"</div><div class='ctx'> </div><div class='del'>-static int hi3110_enable_dma = 1; /* Enable SPI DMA. Default: 1 (On) */</div><div class='del'>-module_param(hi3110_enable_dma, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(hi3110_enable_dma, "Enable SPI DMA. Default: 1 (On)");</div><div class='del'>-</div><div class='ctx'> static const struct can_bittiming_const hi3110_bittiming_const = {</div><div class='ctx'> 	.name = DEVICE_NAME,</div><div class='ctx'> 	.tseg1_min = 2,</div><div class='hunk'>@@ -159,11 +151,8 @@ struct hi3110_priv {</div><div class='ctx'> </div><div class='ctx'> 	u8 *spi_tx_buf;</div><div class='ctx'> 	u8 *spi_rx_buf;</div><div class='del'>-	dma_addr_t spi_tx_dma;</div><div class='del'>-	dma_addr_t spi_rx_dma;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *tx_skb;</div><div class='del'>-	int tx_len;</div><div class='ctx'> </div><div class='ctx'> 	struct workqueue_struct *wq;</div><div class='ctx'> 	struct work_struct tx_work;</div><div class='hunk'>@@ -176,6 +165,8 @@ struct hi3110_priv {</div><div class='ctx'> #define HI3110_AFTER_SUSPEND_POWER 4</div><div class='ctx'> #define HI3110_AFTER_SUSPEND_RESTART 8</div><div class='ctx'> 	int restart_tx;</div><div class='add'>+	bool tx_busy;</div><div class='add'>+</div><div class='ctx'> 	struct regulator *power;</div><div class='ctx'> 	struct regulator *transceiver;</div><div class='ctx'> 	struct clk *clk;</div><div class='hunk'>@@ -185,14 +176,13 @@ static void hi3110_clean(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct hi3110_priv *priv = netdev_priv(net);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;tx_skb || priv-&gt;tx_len)</div><div class='add'>+	if (priv-&gt;tx_skb || priv-&gt;tx_busy)</div><div class='ctx'> 		net-&gt;stats.tx_errors++;</div><div class='del'>-	if (priv-&gt;tx_skb)</div><div class='del'>-		dev_kfree_skb(priv-&gt;tx_skb);</div><div class='del'>-	if (priv-&gt;tx_len)</div><div class='del'>-		can_free_echo_skb(priv-&gt;net, 0);</div><div class='add'>+	dev_kfree_skb(priv-&gt;tx_skb);</div><div class='add'>+	if (priv-&gt;tx_busy)</div><div class='add'>+		can_free_echo_skb(priv-&gt;net, 0, NULL);</div><div class='ctx'> 	priv-&gt;tx_skb = NULL;</div><div class='del'>-	priv-&gt;tx_len = 0;</div><div class='add'>+	priv-&gt;tx_busy = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Note about handling of error return of hi3110_spi_trans: accessing</div><div class='hunk'>@@ -220,13 +210,6 @@ static int hi3110_spi_trans(struct spi_device *spi, int len)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spi_message_init(&amp;m);</div><div class='del'>-</div><div class='del'>-	if (hi3110_enable_dma) {</div><div class='del'>-		t.tx_dma = priv-&gt;spi_tx_dma;</div><div class='del'>-		t.rx_dma = priv-&gt;spi_rx_dma;</div><div class='del'>-		m.is_dma_mapped = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spi_message_add_tail(&amp;t, &amp;m);</div><div class='ctx'> </div><div class='ctx'> 	ret = spi_sync(spi, &amp;m);</div><div class='hunk'>@@ -236,7 +219,7 @@ static int hi3110_spi_trans(struct spi_device *spi, int len)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 hi3110_cmd(struct spi_device *spi, u8 command)</div><div class='add'>+static int hi3110_cmd(struct spi_device *spi, u8 command)</div><div class='ctx'> {</div><div class='ctx'> 	struct hi3110_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='hunk'>@@ -295,13 +278,13 @@ static void hi3110_hw_tx(struct spi_device *spi, struct can_frame *frame)</div><div class='ctx'> 			((frame-&gt;can_id &amp; CAN_EFF_MASK) &lt;&lt; 1) |</div><div class='ctx'> 			((frame-&gt;can_id &amp; CAN_RTR_FLAG) ? 1 : 0);</div><div class='ctx'> </div><div class='del'>-		buf[HI3110_FIFO_EXT_DLC_OFF] = frame-&gt;can_dlc;</div><div class='add'>+		buf[HI3110_FIFO_EXT_DLC_OFF] = frame-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(buf + HI3110_FIFO_EXT_DATA_OFF,</div><div class='del'>-		       frame-&gt;data, frame-&gt;can_dlc);</div><div class='add'>+		       frame-&gt;data, frame-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		hi3110_hw_tx_frame(spi, buf, HI3110_TX_EXT_BUF_LEN -</div><div class='del'>-				   (HI3110_CAN_MAX_DATA_LEN - frame-&gt;can_dlc));</div><div class='add'>+				   (HI3110_CAN_MAX_DATA_LEN - frame-&gt;len));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Standard frame */</div><div class='ctx'> 		buf[HI3110_FIFO_ID_OFF] =   (frame-&gt;can_id &amp; CAN_SFF_MASK) &gt;&gt; 3;</div><div class='hunk'>@@ -309,13 +292,13 @@ static void hi3110_hw_tx(struct spi_device *spi, struct can_frame *frame)</div><div class='ctx'> 			((frame-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 5) |</div><div class='ctx'> 			((frame-&gt;can_id &amp; CAN_RTR_FLAG) ? (1 &lt;&lt; 4) : 0);</div><div class='ctx'> </div><div class='del'>-		buf[HI3110_FIFO_STD_DLC_OFF] = frame-&gt;can_dlc;</div><div class='add'>+		buf[HI3110_FIFO_STD_DLC_OFF] = frame-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 		memcpy(buf + HI3110_FIFO_STD_DATA_OFF,</div><div class='del'>-		       frame-&gt;data, frame-&gt;can_dlc);</div><div class='add'>+		       frame-&gt;data, frame-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		hi3110_hw_tx_frame(spi, buf, HI3110_TX_STD_BUF_LEN -</div><div class='del'>-				   (HI3110_CAN_MAX_DATA_LEN - frame-&gt;can_dlc));</div><div class='add'>+				   (HI3110_CAN_MAX_DATA_LEN - frame-&gt;len));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -359,20 +342,19 @@ static void hi3110_hw_rx(struct spi_device *spi)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Data length */</div><div class='del'>-	frame-&gt;can_dlc = get_can_dlc(buf[HI3110_FIFO_WOTIME_DLC_OFF] &amp; 0x0F);</div><div class='add'>+	frame-&gt;len = can_cc_dlc2len(buf[HI3110_FIFO_WOTIME_DLC_OFF] &amp; 0x0F);</div><div class='ctx'> </div><div class='del'>-	if (buf[HI3110_FIFO_WOTIME_ID_OFF + 3] &amp; HI3110_FIFO_WOTIME_ID_RTR)</div><div class='add'>+	if (buf[HI3110_FIFO_WOTIME_ID_OFF + 3] &amp; HI3110_FIFO_WOTIME_ID_RTR) {</div><div class='ctx'> 		frame-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		memcpy(frame-&gt;data, buf + HI3110_FIFO_WOTIME_DAT_OFF,</div><div class='del'>-		       frame-&gt;can_dlc);</div><div class='add'>+		       frame-&gt;len);</div><div class='ctx'> </div><div class='add'>+		priv-&gt;net-&gt;stats.rx_bytes += frame-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	priv-&gt;net-&gt;stats.rx_packets++;</div><div class='del'>-	priv-&gt;net-&gt;stats.rx_bytes += frame-&gt;can_dlc;</div><div class='ctx'> </div><div class='del'>-	can_led_event(priv-&gt;net, CAN_LED_EVENT_RX);</div><div class='del'>-</div><div class='del'>-	netif_rx_ni(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void hi3110_hw_sleep(struct spi_device *spi)</div><div class='hunk'>@@ -386,12 +368,12 @@ static netdev_tx_t hi3110_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct hi3110_priv *priv = netdev_priv(net);</div><div class='ctx'> 	struct spi_device *spi = priv-&gt;spi;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;tx_skb || priv-&gt;tx_len) {</div><div class='add'>+	if (priv-&gt;tx_skb || priv-&gt;tx_busy) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "hard_xmit called while tx busy\n");</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(net, skb))</div><div class='add'>+	if (can_dev_dropped_skb(net, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(net);</div><div class='hunk'>@@ -563,8 +545,6 @@ static int hi3110_stop(struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;force_quit = 1;</div><div class='ctx'> 	free_irq(spi-&gt;irq, priv);</div><div class='del'>-	destroy_workqueue(priv-&gt;wq);</div><div class='del'>-	priv-&gt;wq = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;hi3110_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -583,8 +563,6 @@ static int hi3110_stop(struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;hi3110_lock);</div><div class='ctx'> </div><div class='del'>-	can_led_event(net, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -603,8 +581,8 @@ static void hi3110_tx_work_handler(struct work_struct *ws)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			frame = (struct can_frame *)priv-&gt;tx_skb-&gt;data;</div><div class='ctx'> 			hi3110_hw_tx(spi, frame);</div><div class='del'>-			priv-&gt;tx_len = 1 + frame-&gt;can_dlc;</div><div class='del'>-			can_put_echo_skb(priv-&gt;tx_skb, net, 0);</div><div class='add'>+			priv-&gt;tx_busy = true;</div><div class='add'>+			can_put_echo_skb(priv-&gt;tx_skb, net, 0, 0);</div><div class='ctx'> 			priv-&gt;tx_skb = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -683,25 +661,27 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id)</div><div class='ctx'> 			u8 rxerr, txerr;</div><div class='ctx'> </div><div class='ctx'> 			skb = alloc_can_err_skb(net, &amp;cf);</div><div class='del'>-			if (!skb)</div><div class='del'>-				break;</div><div class='ctx'> </div><div class='ctx'> 			txerr = hi3110_read(spi, HI3110_READ_TEC);</div><div class='ctx'> 			rxerr = hi3110_read(spi, HI3110_READ_REC);</div><div class='del'>-			cf-&gt;data[6] = txerr;</div><div class='del'>-			cf-&gt;data[7] = rxerr;</div><div class='ctx'> 			tx_state = txerr &gt;= rxerr ? new_state : 0;</div><div class='ctx'> 			rx_state = txerr &lt;= rxerr ? new_state : 0;</div><div class='ctx'> 			can_change_state(net, cf, tx_state, rx_state);</div><div class='del'>-			netif_rx_ni(skb);</div><div class='ctx'> </div><div class='ctx'> 			if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+				if (skb)</div><div class='add'>+					netif_rx(skb);</div><div class='ctx'> 				can_bus_off(net);</div><div class='ctx'> 				if (priv-&gt;can.restart_ms == 0) {</div><div class='ctx'> 					priv-&gt;force_quit = 1;</div><div class='ctx'> 					hi3110_hw_sleep(spi);</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='add'>+			} else if (skb) {</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+				cf-&gt;data[6] = txerr;</div><div class='add'>+				cf-&gt;data[7] = rxerr;</div><div class='add'>+				netif_rx(skb);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -714,38 +694,45 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id)</div><div class='ctx'> 			/* Check for protocol errors */</div><div class='ctx'> 			if (eflag &amp; HI3110_ERR_PROTOCOL_MASK) {</div><div class='ctx'> 				skb = alloc_can_err_skb(net, &amp;cf);</div><div class='del'>-				if (!skb)</div><div class='del'>-					break;</div><div class='add'>+				if (skb)</div><div class='add'>+					cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> 				priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-				priv-&gt;net-&gt;stats.rx_errors++;</div><div class='del'>-				if (eflag &amp; HI3110_ERR_BITERR)</div><div class='del'>-					cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-				else if (eflag &amp; HI3110_ERR_FRMERR)</div><div class='del'>-					cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-				else if (eflag &amp; HI3110_ERR_STUFERR)</div><div class='del'>-					cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-				else if (eflag &amp; HI3110_ERR_CRCERR)</div><div class='del'>-					cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='del'>-				else if (eflag &amp; HI3110_ERR_ACKERR)</div><div class='del'>-					cf-&gt;data[3] |= CAN_ERR_PROT_LOC_ACK;</div><div class='del'>-</div><div class='del'>-				cf-&gt;data[6] = hi3110_read(spi, HI3110_READ_TEC);</div><div class='del'>-				cf-&gt;data[7] = hi3110_read(spi, HI3110_READ_REC);</div><div class='add'>+				if (eflag &amp; HI3110_ERR_BITERR) {</div><div class='add'>+					priv-&gt;net-&gt;stats.tx_errors++;</div><div class='add'>+					if (skb)</div><div class='add'>+						cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+				} else if (eflag &amp; HI3110_ERR_FRMERR) {</div><div class='add'>+					priv-&gt;net-&gt;stats.rx_errors++;</div><div class='add'>+					if (skb)</div><div class='add'>+						cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+				} else if (eflag &amp; HI3110_ERR_STUFERR) {</div><div class='add'>+					priv-&gt;net-&gt;stats.rx_errors++;</div><div class='add'>+					if (skb)</div><div class='add'>+						cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+				} else if (eflag &amp; HI3110_ERR_CRCERR) {</div><div class='add'>+					priv-&gt;net-&gt;stats.rx_errors++;</div><div class='add'>+					if (skb)</div><div class='add'>+						cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+				} else if (eflag &amp; HI3110_ERR_ACKERR) {</div><div class='add'>+					priv-&gt;net-&gt;stats.tx_errors++;</div><div class='add'>+					if (skb)</div><div class='add'>+						cf-&gt;data[3] |= CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+				}</div><div class='add'>+</div><div class='ctx'> 				netdev_dbg(priv-&gt;net, "Bus Error\n");</div><div class='del'>-				netif_rx_ni(skb);</div><div class='add'>+				if (skb) {</div><div class='add'>+					cf-&gt;data[6] = hi3110_read(spi, HI3110_READ_TEC);</div><div class='add'>+					cf-&gt;data[7] = hi3110_read(spi, HI3110_READ_REC);</div><div class='add'>+					netif_rx(skb);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;tx_len &amp;&amp; statf &amp; HI3110_STAT_TXMTY) {</div><div class='add'>+		if (priv-&gt;tx_busy &amp;&amp; statf &amp; HI3110_STAT_TXMTY) {</div><div class='ctx'> 			net-&gt;stats.tx_packets++;</div><div class='del'>-			net-&gt;stats.tx_bytes += priv-&gt;tx_len - 1;</div><div class='del'>-			can_led_event(net, CAN_LED_EVENT_TX);</div><div class='del'>-			if (priv-&gt;tx_len) {</div><div class='del'>-				can_get_echo_skb(net, 0);</div><div class='del'>-				priv-&gt;tx_len = 0;</div><div class='del'>-			}</div><div class='add'>+			net-&gt;stats.tx_bytes += can_get_echo_skb(net, 0, NULL);</div><div class='add'>+			priv-&gt;tx_busy = false;</div><div class='ctx'> 			netif_wake_queue(net);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -772,7 +759,7 @@ static int hi3110_open(struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;force_quit = 0;</div><div class='ctx'> 	priv-&gt;tx_skb = NULL;</div><div class='del'>-	priv-&gt;tx_len = 0;</div><div class='add'>+	priv-&gt;tx_busy = false;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_threaded_irq(spi-&gt;irq, NULL, hi3110_can_ist,</div><div class='ctx'> 				   flags, DEVICE_NAME, priv);</div><div class='hunk'>@@ -781,35 +768,23 @@ static int hi3110_open(struct net_device *net)</div><div class='ctx'> 		goto out_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;wq = alloc_workqueue("hi3110_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,</div><div class='del'>-				   0);</div><div class='del'>-	if (!priv-&gt;wq) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto out_free_irq;</div><div class='del'>-	}</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;tx_work, hi3110_tx_work_handler);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;restart_work, hi3110_restart_work_handler);</div><div class='del'>-</div><div class='ctx'> 	ret = hi3110_hw_reset(spi);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_free_wq;</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> </div><div class='ctx'> 	ret = hi3110_setup(net);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_free_wq;</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> </div><div class='ctx'> 	ret = hi3110_set_normal_mode(spi);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto out_free_wq;</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> </div><div class='del'>-	can_led_event(net, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	netif_wake_queue(net);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;hi3110_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- out_free_wq:</div><div class='del'>-	destroy_workqueue(priv-&gt;wq);</div><div class='ctx'>  out_free_irq:</div><div class='ctx'> 	free_irq(spi-&gt;irq, priv);</div><div class='ctx'> 	hi3110_hw_sleep(spi);</div><div class='hunk'>@@ -826,6 +801,10 @@ static const struct net_device_ops hi3110_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit = hi3110_hard_start_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ethtool_ops hi3110_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id hi3110_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible	= "holt,hi3110",</div><div class='hunk'>@@ -846,19 +825,24 @@ MODULE_DEVICE_TABLE(spi, hi3110_id_table);</div><div class='ctx'> </div><div class='ctx'> static int hi3110_can_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='del'>-	const struct of_device_id *of_id = of_match_device(hi3110_of_match,</div><div class='del'>-							   &amp;spi-&gt;dev);</div><div class='add'>+	struct device *dev = &amp;spi-&gt;dev;</div><div class='ctx'> 	struct net_device *net;</div><div class='ctx'> 	struct hi3110_priv *priv;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	int freq, ret;</div><div class='add'>+	u32 freq;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	clk = devm_clk_get(&amp;spi-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "no CAN clock source defined\n");</div><div class='del'>-		return PTR_ERR(clk);</div><div class='add'>+	clk = devm_clk_get_optional(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(clk), "no CAN clock source defined\n");</div><div class='add'>+</div><div class='add'>+	if (clk) {</div><div class='add'>+		freq = clk_get_rate(clk);</div><div class='add'>+	} else {</div><div class='add'>+		ret = device_property_read_u32(dev, "clock-frequency", &amp;freq);</div><div class='add'>+		if (ret)</div><div class='add'>+			return dev_err_probe(dev, ret, "Failed to get clock-frequency!\n");</div><div class='ctx'> 	}</div><div class='del'>-	freq = clk_get_rate(clk);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (freq &gt; 40000000)</div><div class='hunk'>@@ -869,13 +853,12 @@ static int hi3110_can_probe(struct spi_device *spi)</div><div class='ctx'> 	if (!net)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(clk)) {</div><div class='del'>-		ret = clk_prepare_enable(clk);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_free;</div><div class='del'>-	}</div><div class='add'>+	ret = clk_prepare_enable(clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;netdev_ops = &amp;hi3110_netdev_ops;</div><div class='add'>+	net-&gt;ethtool_ops = &amp;hi3110_ethtool_ops;</div><div class='ctx'> 	net-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(net);</div><div class='hunk'>@@ -888,10 +871,7 @@ static int hi3110_can_probe(struct spi_device *spi)</div><div class='ctx'> 		CAN_CTRLMODE_LISTENONLY |</div><div class='ctx'> 		CAN_CTRLMODE_BERR_REPORTING;</div><div class='ctx'> </div><div class='del'>-	if (of_id)</div><div class='del'>-		priv-&gt;model = (enum hi3110_model)of_id-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;model = spi_get_device_id(spi)-&gt;driver_data;</div><div class='add'>+	priv-&gt;model = (enum hi3110_model)(uintptr_t)spi_get_device_match_data(spi);</div><div class='ctx'> 	priv-&gt;net = net;</div><div class='ctx'> 	priv-&gt;clk = clk;</div><div class='ctx'> </div><div class='hunk'>@@ -915,55 +895,38 @@ static int hi3110_can_probe(struct spi_device *spi)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out_clk;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;wq = alloc_workqueue("hi3110_wq",</div><div class='add'>+				   WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_PERCPU,</div><div class='add'>+				   0);</div><div class='add'>+	if (!priv-&gt;wq) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_clk;</div><div class='add'>+	}</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;tx_work, hi3110_tx_work_handler);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;restart_work, hi3110_restart_work_handler);</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;spi = spi;</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;hi3110_lock);</div><div class='ctx'> </div><div class='del'>-	/* If requested, allocate DMA buffers */</div><div class='del'>-	if (hi3110_enable_dma) {</div><div class='del'>-		spi-&gt;dev.coherent_dma_mask = ~0;</div><div class='del'>-</div><div class='del'>-		/* Minimum coherent DMA allocation is PAGE_SIZE, so allocate</div><div class='del'>-		 * that much and share it between Tx and Rx DMA buffers.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;spi_tx_buf = dmam_alloc_coherent(&amp;spi-&gt;dev,</div><div class='del'>-						       PAGE_SIZE,</div><div class='del'>-						       &amp;priv-&gt;spi_tx_dma,</div><div class='del'>-						       GFP_DMA);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;spi_tx_buf) {</div><div class='del'>-			priv-&gt;spi_rx_buf = (priv-&gt;spi_tx_buf + (PAGE_SIZE / 2));</div><div class='del'>-			priv-&gt;spi_rx_dma = (dma_addr_t)(priv-&gt;spi_tx_dma +</div><div class='del'>-							(PAGE_SIZE / 2));</div><div class='del'>-		} else {</div><div class='del'>-			/* Fall back to non-DMA */</div><div class='del'>-			hi3110_enable_dma = 0;</div><div class='del'>-		}</div><div class='add'>+	priv-&gt;spi_tx_buf = devm_kzalloc(&amp;spi-&gt;dev, HI3110_RX_BUF_LEN,</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;spi_tx_buf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error_probe;</div><div class='ctx'> 	}</div><div class='add'>+	priv-&gt;spi_rx_buf = devm_kzalloc(&amp;spi-&gt;dev, HI3110_RX_BUF_LEN,</div><div class='add'>+					GFP_KERNEL);</div><div class='ctx'> </div><div class='del'>-	/* Allocate non-DMA buffers */</div><div class='del'>-	if (!hi3110_enable_dma) {</div><div class='del'>-		priv-&gt;spi_tx_buf = devm_kzalloc(&amp;spi-&gt;dev, HI3110_RX_BUF_LEN,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-		if (!priv-&gt;spi_tx_buf) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto error_probe;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;spi_rx_buf = devm_kzalloc(&amp;spi-&gt;dev, HI3110_RX_BUF_LEN,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;spi_rx_buf) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto error_probe;</div><div class='del'>-		}</div><div class='add'>+	if (!priv-&gt;spi_rx_buf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error_probe;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(net, &amp;spi-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = hi3110_hw_probe(spi);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		if (ret == -ENODEV)</div><div class='del'>-			dev_err(&amp;spi-&gt;dev, "Cannot initialize %x. Wrong wiring?\n",</div><div class='del'>-				priv-&gt;model);</div><div class='add'>+		dev_err_probe(dev, ret, "Cannot initialize %x. Wrong wiring?\n", priv-&gt;model);</div><div class='ctx'> 		goto error_probe;</div><div class='ctx'> 	}</div><div class='ctx'> 	hi3110_hw_sleep(spi);</div><div class='hunk'>@@ -972,26 +935,25 @@ static int hi3110_can_probe(struct spi_device *spi)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error_probe;</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(net);</div><div class='ctx'> 	netdev_info(net, "%x successfully initialized.\n", priv-&gt;model);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'>  error_probe:</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+	priv-&gt;wq = NULL;</div><div class='ctx'> 	hi3110_power_enable(priv-&gt;power, 0);</div><div class='ctx'> </div><div class='ctx'>  out_clk:</div><div class='del'>-	if (!IS_ERR(clk))</div><div class='del'>-		clk_disable_unprepare(clk);</div><div class='add'>+	clk_disable_unprepare(clk);</div><div class='ctx'> </div><div class='ctx'>  out_free:</div><div class='ctx'> 	free_candev(net);</div><div class='ctx'> </div><div class='del'>-	dev_err(&amp;spi-&gt;dev, "Probe failed, err=%d\n", -ret);</div><div class='del'>-	return ret;</div><div class='add'>+	return dev_err_probe(dev, ret, "Probe failed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hi3110_can_remove(struct spi_device *spi)</div><div class='add'>+static void hi3110_can_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct hi3110_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> 	struct net_device *net = priv-&gt;net;</div><div class='hunk'>@@ -1000,12 +962,12 @@ static int hi3110_can_remove(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	hi3110_power_enable(priv-&gt;power, 0);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(priv-&gt;clk))</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+	priv-&gt;wq = NULL;</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	free_candev(net);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused hi3110_can_suspend(struct device *dev)</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c<br/>index e90817608645..fa97adf25b73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/spi/mcp251x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251x.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * CAN bus driver for Microchip 251x CAN Controller with SPI Interface</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* CAN bus driver for Microchip 251x/25625 CAN Controller with SPI Interface</div><div class='ctx'>  *</div><div class='ctx'>  * MCP2510 support and bug fixes by Christian Pellegrin</div><div class='ctx'>  * &lt;chripell@evolware.org&gt;</div><div class='hunk'>@@ -17,65 +17,30 @@</div><div class='ctx'>  * - Sascha Hauer, Marc Kleine-Budde, Pengutronix</div><div class='ctx'>  * - Simon Kallweit, intefo AG</div><div class='ctx'>  * Copyright 2007</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Your platform definition file should specify something like:</div><div class='del'>- *</div><div class='del'>- * static struct mcp251x_platform_data mcp251x_info = {</div><div class='del'>- *         .oscillator_frequency = 8000000,</div><div class='del'>- * };</div><div class='del'>- *</div><div class='del'>- * static struct spi_board_info spi_board_info[] = {</div><div class='del'>- *         {</div><div class='del'>- *                 .modalias = "mcp2510",</div><div class='del'>- *			// or "mcp2515" depending on your controller</div><div class='del'>- *                 .platform_data = &amp;mcp251x_info,</div><div class='del'>- *                 .irq = IRQ_EINT13,</div><div class='del'>- *                 .max_speed_hz = 2*1000*1000,</div><div class='del'>- *                 .chip_select = 2,</div><div class='del'>- *         },</div><div class='del'>- * };</div><div class='del'>- *</div><div class='del'>- * Please see mcp251x.h for a description of the fields in</div><div class='del'>- * struct mcp251x_platform_data.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/can/core.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='del'>-#include &lt;linux/can/platform/mcp251x.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/freezer.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/spi/spi.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* SPI interface instruction set */</div><div class='ctx'> #define INSTRUCTION_WRITE	0x02</div><div class='hunk'>@@ -89,8 +54,31 @@</div><div class='ctx'> #define RTS_TXB2		0x04</div><div class='ctx'> #define INSTRUCTION_RTS(n)	(0x80 | ((n) &amp; 0x07))</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /* MPC251x registers */</div><div class='add'>+#define BFPCTRL			0x0c</div><div class='add'>+#  define BFPCTRL_B0BFM		BIT(0)</div><div class='add'>+#  define BFPCTRL_B1BFM		BIT(1)</div><div class='add'>+#  define BFPCTRL_BFM(n)	(BFPCTRL_B0BFM &lt;&lt; (n))</div><div class='add'>+#  define BFPCTRL_BFM_MASK	GENMASK(1, 0)</div><div class='add'>+#  define BFPCTRL_B0BFE		BIT(2)</div><div class='add'>+#  define BFPCTRL_B1BFE		BIT(3)</div><div class='add'>+#  define BFPCTRL_BFE(n)	(BFPCTRL_B0BFE &lt;&lt; (n))</div><div class='add'>+#  define BFPCTRL_BFE_MASK	GENMASK(3, 2)</div><div class='add'>+#  define BFPCTRL_B0BFS		BIT(4)</div><div class='add'>+#  define BFPCTRL_B1BFS		BIT(5)</div><div class='add'>+#  define BFPCTRL_BFS(n)	(BFPCTRL_B0BFS &lt;&lt; (n))</div><div class='add'>+#  define BFPCTRL_BFS_MASK	GENMASK(5, 4)</div><div class='add'>+#define TXRTSCTRL		0x0d</div><div class='add'>+#  define TXRTSCTRL_B0RTSM	BIT(0)</div><div class='add'>+#  define TXRTSCTRL_B1RTSM	BIT(1)</div><div class='add'>+#  define TXRTSCTRL_B2RTSM	BIT(2)</div><div class='add'>+#  define TXRTSCTRL_RTSM(n)	(TXRTSCTRL_B0RTSM &lt;&lt; (n))</div><div class='add'>+#  define TXRTSCTRL_RTSM_MASK	GENMASK(2, 0)</div><div class='add'>+#  define TXRTSCTRL_B0RTS	BIT(3)</div><div class='add'>+#  define TXRTSCTRL_B1RTS	BIT(4)</div><div class='add'>+#  define TXRTSCTRL_B2RTS	BIT(5)</div><div class='add'>+#  define TXRTSCTRL_RTS(n)	(TXRTSCTRL_B0RTS &lt;&lt; (n))</div><div class='add'>+#  define TXRTSCTRL_RTS_MASK	GENMASK(5, 3)</div><div class='ctx'> #define CANSTAT	      0x0e</div><div class='ctx'> #define CANCTRL	      0x0f</div><div class='ctx'> #  define CANCTRL_REQOP_MASK	    0xe0</div><div class='hunk'>@@ -205,8 +193,7 @@</div><div class='ctx'> #define SET_BYTE(val, byte)			\</div><div class='ctx'> 	(((val) &amp; 0xff) &lt;&lt; ((byte) * 8))</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Buffer size required for the largest SPI transfer (i.e., reading a</div><div class='add'>+/* Buffer size required for the largest SPI transfer (i.e., reading a</div><div class='ctx'>  * frame)</div><div class='ctx'>  */</div><div class='ctx'> #define CAN_FRAME_MAX_DATA_LEN	8</div><div class='hunk'>@@ -219,10 +206,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DEVICE_NAME "mcp251x"</div><div class='ctx'> </div><div class='del'>-static int mcp251x_enable_dma; /* Enable SPI DMA. Default: 0 (Off) */</div><div class='del'>-module_param(mcp251x_enable_dma, int, 0444);</div><div class='del'>-MODULE_PARM_DESC(mcp251x_enable_dma, "Enable SPI DMA. Default: 0 (Off)");</div><div class='del'>-</div><div class='ctx'> static const struct can_bittiming_const mcp251x_bittiming_const = {</div><div class='ctx'> 	.name = DEVICE_NAME,</div><div class='ctx'> 	.tseg1_min = 3,</div><div class='hunk'>@@ -238,6 +221,7 @@ static const struct can_bittiming_const mcp251x_bittiming_const = {</div><div class='ctx'> enum mcp251x_model {</div><div class='ctx'> 	CAN_MCP251X_MCP2510	= 0x2510,</div><div class='ctx'> 	CAN_MCP251X_MCP2515	= 0x2515,</div><div class='add'>+	CAN_MCP251X_MCP25625	= 0x25625,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mcp251x_priv {</div><div class='hunk'>@@ -250,11 +234,8 @@ struct mcp251x_priv {</div><div class='ctx'> </div><div class='ctx'> 	u8 *spi_tx_buf;</div><div class='ctx'> 	u8 *spi_rx_buf;</div><div class='del'>-	dma_addr_t spi_tx_dma;</div><div class='del'>-	dma_addr_t spi_rx_dma;</div><div class='ctx'> </div><div class='ctx'> 	struct sk_buff *tx_skb;</div><div class='del'>-	int tx_len;</div><div class='ctx'> </div><div class='ctx'> 	struct workqueue_struct *wq;</div><div class='ctx'> 	struct work_struct tx_work;</div><div class='hunk'>@@ -267,9 +248,15 @@ struct mcp251x_priv {</div><div class='ctx'> #define AFTER_SUSPEND_POWER 4</div><div class='ctx'> #define AFTER_SUSPEND_RESTART 8</div><div class='ctx'> 	int restart_tx;</div><div class='add'>+	bool tx_busy;</div><div class='add'>+</div><div class='ctx'> 	struct regulator *power;</div><div class='ctx'> 	struct regulator *transceiver;</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+	struct gpio_chip gpio;</div><div class='add'>+	u8 reg_bfpctrl;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define MCP251X_IS(_model) \</div><div class='hunk'>@@ -280,24 +267,21 @@ static inline int mcp251x_is_##_model(struct spi_device *spi) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> MCP251X_IS(2510);</div><div class='del'>-MCP251X_IS(2515);</div><div class='ctx'> </div><div class='ctx'> static void mcp251x_clean(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = netdev_priv(net);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;tx_skb || priv-&gt;tx_len)</div><div class='add'>+	if (priv-&gt;tx_skb || priv-&gt;tx_busy)</div><div class='ctx'> 		net-&gt;stats.tx_errors++;</div><div class='del'>-	if (priv-&gt;tx_skb)</div><div class='del'>-		dev_kfree_skb(priv-&gt;tx_skb);</div><div class='del'>-	if (priv-&gt;tx_len)</div><div class='del'>-		can_free_echo_skb(priv-&gt;net, 0);</div><div class='add'>+	dev_kfree_skb(priv-&gt;tx_skb);</div><div class='add'>+	if (priv-&gt;tx_busy)</div><div class='add'>+		can_free_echo_skb(priv-&gt;net, 0, NULL);</div><div class='ctx'> 	priv-&gt;tx_skb = NULL;</div><div class='del'>-	priv-&gt;tx_len = 0;</div><div class='add'>+	priv-&gt;tx_busy = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Note about handling of error return of mcp251x_spi_trans: accessing</div><div class='add'>+/* Note about handling of error return of mcp251x_spi_trans: accessing</div><div class='ctx'>  * registers via SPI is not really different conceptually than using</div><div class='ctx'>  * normal I/O assembler instructions, although it's much more</div><div class='ctx'>  * complicated from a practical POV. So it's not advisable to always</div><div class='hunk'>@@ -322,13 +306,6 @@ static int mcp251x_spi_trans(struct spi_device *spi, int len)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	spi_message_init(&amp;m);</div><div class='del'>-</div><div class='del'>-	if (mcp251x_enable_dma) {</div><div class='del'>-		t.tx_dma = priv-&gt;spi_tx_dma;</div><div class='del'>-		t.rx_dma = priv-&gt;spi_rx_dma;</div><div class='del'>-		m.is_dma_mapped = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	spi_message_add_tail(&amp;t, &amp;m);</div><div class='ctx'> </div><div class='ctx'> 	ret = spi_sync(spi, &amp;m);</div><div class='hunk'>@@ -337,7 +314,19 @@ static int mcp251x_spi_trans(struct spi_device *spi, int len)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)</div><div class='add'>+static int mcp251x_spi_write(struct spi_device *spi, int len)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = spi_write(spi, priv-&gt;spi_tx_buf, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "spi write failed: ret = %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 mcp251x_read_reg(struct spi_device *spi, u8 reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> 	u8 val = 0;</div><div class='hunk'>@@ -345,27 +334,38 @@ static u8 mcp251x_read_reg(struct spi_device *spi, uint8_t reg)</div><div class='ctx'> 	priv-&gt;spi_tx_buf[0] = INSTRUCTION_READ;</div><div class='ctx'> 	priv-&gt;spi_tx_buf[1] = reg;</div><div class='ctx'> </div><div class='del'>-	mcp251x_spi_trans(spi, 3);</div><div class='del'>-	val = priv-&gt;spi_rx_buf[2];</div><div class='add'>+	if (spi-&gt;controller-&gt;flags &amp; SPI_CONTROLLER_HALF_DUPLEX) {</div><div class='add'>+		spi_write_then_read(spi, priv-&gt;spi_tx_buf, 2, &amp;val, 1);</div><div class='add'>+	} else {</div><div class='add'>+		mcp251x_spi_trans(spi, 3);</div><div class='add'>+		val = priv-&gt;spi_rx_buf[2];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mcp251x_read_2regs(struct spi_device *spi, uint8_t reg,</div><div class='del'>-		uint8_t *v1, uint8_t *v2)</div><div class='add'>+static void mcp251x_read_2regs(struct spi_device *spi, u8 reg, u8 *v1, u8 *v2)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;spi_tx_buf[0] = INSTRUCTION_READ;</div><div class='ctx'> 	priv-&gt;spi_tx_buf[1] = reg;</div><div class='ctx'> </div><div class='del'>-	mcp251x_spi_trans(spi, 4);</div><div class='add'>+	if (spi-&gt;controller-&gt;flags &amp; SPI_CONTROLLER_HALF_DUPLEX) {</div><div class='add'>+		u8 val[2] = { 0 };</div><div class='add'>+</div><div class='add'>+		spi_write_then_read(spi, priv-&gt;spi_tx_buf, 2, val, 2);</div><div class='add'>+		*v1 = val[0];</div><div class='add'>+		*v2 = val[1];</div><div class='add'>+	} else {</div><div class='add'>+		mcp251x_spi_trans(spi, 4);</div><div class='ctx'> </div><div class='del'>-	*v1 = priv-&gt;spi_rx_buf[2];</div><div class='del'>-	*v2 = priv-&gt;spi_rx_buf[3];</div><div class='add'>+		*v1 = priv-&gt;spi_rx_buf[2];</div><div class='add'>+		*v2 = priv-&gt;spi_rx_buf[3];</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val)</div><div class='add'>+static void mcp251x_write_reg(struct spi_device *spi, u8 reg, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='hunk'>@@ -373,11 +373,23 @@ static void mcp251x_write_reg(struct spi_device *spi, u8 reg, uint8_t val)</div><div class='ctx'> 	priv-&gt;spi_tx_buf[1] = reg;</div><div class='ctx'> 	priv-&gt;spi_tx_buf[2] = val;</div><div class='ctx'> </div><div class='del'>-	mcp251x_spi_trans(spi, 3);</div><div class='add'>+	mcp251x_spi_write(spi, 3);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mcp251x_write_bits(struct spi_device *spi, u8 reg,</div><div class='del'>-			       u8 mask, uint8_t val)</div><div class='add'>+static void mcp251x_write_2regs(struct spi_device *spi, u8 reg, u8 v1, u8 v2)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	priv-&gt;spi_tx_buf[0] = INSTRUCTION_WRITE;</div><div class='add'>+	priv-&gt;spi_tx_buf[1] = reg;</div><div class='add'>+	priv-&gt;spi_tx_buf[2] = v1;</div><div class='add'>+	priv-&gt;spi_tx_buf[3] = v2;</div><div class='add'>+</div><div class='add'>+	mcp251x_spi_write(spi, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_write_bits(struct spi_device *spi, u8 reg,</div><div class='add'>+			      u8 mask, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='hunk'>@@ -386,9 +398,235 @@ static void mcp251x_write_bits(struct spi_device *spi, u8 reg,</div><div class='ctx'> 	priv-&gt;spi_tx_buf[2] = mask;</div><div class='ctx'> 	priv-&gt;spi_tx_buf[3] = val;</div><div class='ctx'> </div><div class='del'>-	mcp251x_spi_trans(spi, 4);</div><div class='add'>+	return mcp251x_spi_write(spi, 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 mcp251x_read_stat(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	return mcp251x_read_reg(spi, CANSTAT) &amp; CANCTRL_REQOP_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mcp251x_read_stat_poll_timeout(addr, val, cond, delay_us, timeout_us) \</div><div class='add'>+	readx_poll_timeout(mcp251x_read_stat, addr, val, cond, \</div><div class='add'>+			   delay_us, timeout_us)</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+enum {</div><div class='add'>+	MCP251X_GPIO_TX0RTS = 0,		/* inputs */</div><div class='add'>+	MCP251X_GPIO_TX1RTS,</div><div class='add'>+	MCP251X_GPIO_TX2RTS,</div><div class='add'>+	MCP251X_GPIO_RX0BF,			/* outputs */</div><div class='add'>+	MCP251X_GPIO_RX1BF,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCP251X_GPIO_INPUT_MASK \</div><div class='add'>+	GENMASK(MCP251X_GPIO_TX2RTS, MCP251X_GPIO_TX0RTS)</div><div class='add'>+#define MCP251X_GPIO_OUTPUT_MASK \</div><div class='add'>+	GENMASK(MCP251X_GPIO_RX1BF, MCP251X_GPIO_RX0BF)</div><div class='add'>+</div><div class='add'>+static const char * const mcp251x_gpio_names[] = {</div><div class='add'>+	[MCP251X_GPIO_TX0RTS] = "TX0RTS",	/* inputs */</div><div class='add'>+	[MCP251X_GPIO_TX1RTS] = "TX1RTS",</div><div class='add'>+	[MCP251X_GPIO_TX2RTS] = "TX2RTS",</div><div class='add'>+	[MCP251X_GPIO_RX0BF] = "RX0BF",		/* outputs */</div><div class='add'>+	[MCP251X_GPIO_RX1BF] = "RX1BF",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool mcp251x_gpio_is_input(unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return offset &lt;= MCP251X_GPIO_TX2RTS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_gpio_request(struct gpio_chip *chip,</div><div class='add'>+				unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* nothing to be done for inputs */</div><div class='add'>+	if (mcp251x_gpio_is_input(offset))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val = BFPCTRL_BFE(offset - MCP251X_GPIO_RX0BF);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	ret = mcp251x_write_bits(priv-&gt;spi, BFPCTRL, val, val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;reg_bfpctrl |= val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251x_gpio_free(struct gpio_chip *chip,</div><div class='add'>+			      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* nothing to be done for inputs */</div><div class='add'>+	if (mcp251x_gpio_is_input(offset))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	val = BFPCTRL_BFE(offset - MCP251X_GPIO_RX0BF);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	mcp251x_write_bits(priv-&gt;spi, BFPCTRL, val, 0);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;reg_bfpctrl &amp;= ~val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_gpio_get_direction(struct gpio_chip *chip,</div><div class='add'>+				      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	if (mcp251x_gpio_is_input(offset))</div><div class='add'>+		return GPIO_LINE_DIRECTION_IN;</div><div class='add'>+</div><div class='add'>+	return GPIO_LINE_DIRECTION_OUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_gpio_get(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u8 reg, mask, val;</div><div class='add'>+</div><div class='add'>+	if (mcp251x_gpio_is_input(offset)) {</div><div class='add'>+		reg = TXRTSCTRL;</div><div class='add'>+		mask = TXRTSCTRL_RTS(offset);</div><div class='add'>+	} else {</div><div class='add'>+		reg = BFPCTRL;</div><div class='add'>+		mask = BFPCTRL_BFS(offset - MCP251X_GPIO_RX0BF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	val = mcp251x_read_reg(priv-&gt;spi, reg);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+</div><div class='add'>+	return !!(val &amp; mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_gpio_get_multiple(struct gpio_chip *chip,</div><div class='add'>+				     unsigned long *maskp, unsigned long *bitsp)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	unsigned long bits = 0;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	if (maskp[0] &amp; MCP251X_GPIO_INPUT_MASK) {</div><div class='add'>+		val = mcp251x_read_reg(priv-&gt;spi, TXRTSCTRL);</div><div class='add'>+		val = FIELD_GET(TXRTSCTRL_RTS_MASK, val);</div><div class='add'>+		bits |= FIELD_PREP(MCP251X_GPIO_INPUT_MASK, val);</div><div class='add'>+	}</div><div class='add'>+	if (maskp[0] &amp; MCP251X_GPIO_OUTPUT_MASK) {</div><div class='add'>+		val = mcp251x_read_reg(priv-&gt;spi, BFPCTRL);</div><div class='add'>+		val = FIELD_GET(BFPCTRL_BFS_MASK, val);</div><div class='add'>+		bits |= FIELD_PREP(MCP251X_GPIO_OUTPUT_MASK, val);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+</div><div class='add'>+	bitsp[0] = bits;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_gpio_set(struct gpio_chip *chip, unsigned int offset,</div><div class='add'>+			    int value)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u8 mask, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mask = BFPCTRL_BFS(offset - MCP251X_GPIO_RX0BF);</div><div class='add'>+	val = value ? mask : 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	ret = mcp251x_write_bits(priv-&gt;spi, BFPCTRL, mask, val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;reg_bfpctrl &amp;= ~mask;</div><div class='add'>+	priv-&gt;reg_bfpctrl |= val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251x_gpio_set_multiple(struct gpio_chip *chip,</div><div class='add'>+			  unsigned long *maskp, unsigned long *bitsp)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u8 mask, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mask = FIELD_GET(MCP251X_GPIO_OUTPUT_MASK, maskp[0]);</div><div class='add'>+	mask = FIELD_PREP(BFPCTRL_BFS_MASK, mask);</div><div class='add'>+</div><div class='add'>+	val = FIELD_GET(MCP251X_GPIO_OUTPUT_MASK, bitsp[0]);</div><div class='add'>+	val = FIELD_PREP(BFPCTRL_BFS_MASK, val);</div><div class='add'>+</div><div class='add'>+	if (!mask)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	ret = mcp251x_write_bits(priv-&gt;spi, BFPCTRL, mask, val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;reg_bfpctrl &amp;= ~mask;</div><div class='add'>+	priv-&gt;reg_bfpctrl |= val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251x_gpio_restore(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	mcp251x_write_reg(spi, BFPCTRL, priv-&gt;reg_bfpctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251x_gpio_setup(struct mcp251x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct gpio_chip *gpio = &amp;priv-&gt;gpio;</div><div class='add'>+</div><div class='add'>+	if (!device_property_present(&amp;priv-&gt;spi-&gt;dev, "gpio-controller"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* gpiochip handles TX[0..2]RTS and RX[0..1]BF */</div><div class='add'>+	gpio-&gt;label = priv-&gt;spi-&gt;modalias;</div><div class='add'>+	gpio-&gt;parent = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+	gpio-&gt;owner = THIS_MODULE;</div><div class='add'>+	gpio-&gt;request = mcp251x_gpio_request;</div><div class='add'>+	gpio-&gt;free = mcp251x_gpio_free;</div><div class='add'>+	gpio-&gt;get_direction = mcp251x_gpio_get_direction;</div><div class='add'>+	gpio-&gt;get = mcp251x_gpio_get;</div><div class='add'>+	gpio-&gt;get_multiple = mcp251x_gpio_get_multiple;</div><div class='add'>+	gpio-&gt;set = mcp251x_gpio_set;</div><div class='add'>+	gpio-&gt;set_multiple = mcp251x_gpio_set_multiple;</div><div class='add'>+	gpio-&gt;base = -1;</div><div class='add'>+	gpio-&gt;ngpio = ARRAY_SIZE(mcp251x_gpio_names);</div><div class='add'>+	gpio-&gt;names = mcp251x_gpio_names;</div><div class='add'>+	gpio-&gt;can_sleep = true;</div><div class='add'>+</div><div class='add'>+	return devm_gpiochip_add_data(&amp;priv-&gt;spi-&gt;dev, gpio, priv);</div><div class='add'>+}</div><div class='add'>+#else</div><div class='add'>+static inline void mcp251x_gpio_restore(struct spi_device *spi)</div><div class='add'>+{</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int mcp251x_gpio_setup(struct mcp251x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,</div><div class='ctx'> 				int len, int tx_buf_idx)</div><div class='ctx'> {</div><div class='hunk'>@@ -402,7 +640,7 @@ static void mcp251x_hw_tx_frame(struct spi_device *spi, u8 *buf,</div><div class='ctx'> 					  buf[i]);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		memcpy(priv-&gt;spi_tx_buf, buf, TXBDAT_OFF + len);</div><div class='del'>-		mcp251x_spi_trans(spi, TXBDAT_OFF + len);</div><div class='add'>+		mcp251x_spi_write(spi, TXBDAT_OFF + len);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -428,13 +666,13 @@ static void mcp251x_hw_tx(struct spi_device *spi, struct can_frame *frame,</div><div class='ctx'> 		((eid &gt;&gt; SIDL_EID_SHIFT) &amp; SIDL_EID_MASK);</div><div class='ctx'> 	buf[TXBEID8_OFF] = GET_BYTE(eid, 1);</div><div class='ctx'> 	buf[TXBEID0_OFF] = GET_BYTE(eid, 0);</div><div class='del'>-	buf[TXBDLC_OFF] = (rtr &lt;&lt; DLC_RTR_SHIFT) | frame-&gt;can_dlc;</div><div class='del'>-	memcpy(buf + TXBDAT_OFF, frame-&gt;data, frame-&gt;can_dlc);</div><div class='del'>-	mcp251x_hw_tx_frame(spi, buf, frame-&gt;can_dlc, tx_buf_idx);</div><div class='add'>+	buf[TXBDLC_OFF] = (rtr &lt;&lt; DLC_RTR_SHIFT) | frame-&gt;len;</div><div class='add'>+	memcpy(buf + TXBDAT_OFF, frame-&gt;data, frame-&gt;len);</div><div class='add'>+	mcp251x_hw_tx_frame(spi, buf, frame-&gt;len, tx_buf_idx);</div><div class='ctx'> </div><div class='ctx'> 	/* use INSTRUCTION_RTS, to avoid "repeated frame problem" */</div><div class='ctx'> 	priv-&gt;spi_tx_buf[0] = INSTRUCTION_RTS(1 &lt;&lt; tx_buf_idx);</div><div class='del'>-	mcp251x_spi_trans(priv-&gt;spi, 1);</div><div class='add'>+	mcp251x_spi_write(priv-&gt;spi, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,</div><div class='hunk'>@@ -448,13 +686,21 @@ static void mcp251x_hw_rx_frame(struct spi_device *spi, u8 *buf,</div><div class='ctx'> 		for (i = 1; i &lt; RXBDAT_OFF; i++)</div><div class='ctx'> 			buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);</div><div class='ctx'> </div><div class='del'>-		len = get_can_dlc(buf[RXBDLC_OFF] &amp; RXBDLC_LEN_MASK);</div><div class='add'>+		len = can_cc_dlc2len(buf[RXBDLC_OFF] &amp; RXBDLC_LEN_MASK);</div><div class='ctx'> 		for (; i &lt; (RXBDAT_OFF + len); i++)</div><div class='ctx'> 			buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;spi_tx_buf[RXBCTRL_OFF] = INSTRUCTION_READ_RXB(buf_idx);</div><div class='del'>-		mcp251x_spi_trans(spi, SPI_TRANSFER_BUF_LEN);</div><div class='del'>-		memcpy(buf, priv-&gt;spi_rx_buf, SPI_TRANSFER_BUF_LEN);</div><div class='add'>+		if (spi-&gt;controller-&gt;flags &amp; SPI_CONTROLLER_HALF_DUPLEX) {</div><div class='add'>+			spi_write_then_read(spi, priv-&gt;spi_tx_buf, 1,</div><div class='add'>+					    priv-&gt;spi_rx_buf,</div><div class='add'>+					    SPI_TRANSFER_BUF_LEN);</div><div class='add'>+			memcpy(buf + 1, priv-&gt;spi_rx_buf,</div><div class='add'>+			       SPI_TRANSFER_BUF_LEN - 1);</div><div class='add'>+		} else {</div><div class='add'>+			mcp251x_spi_trans(spi, SPI_TRANSFER_BUF_LEN);</div><div class='add'>+			memcpy(buf, priv-&gt;spi_rx_buf, SPI_TRANSFER_BUF_LEN);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -496,15 +742,15 @@ static void mcp251x_hw_rx(struct spi_device *spi, int buf_idx)</div><div class='ctx'> 			frame-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Data length */</div><div class='del'>-	frame-&gt;can_dlc = get_can_dlc(buf[RXBDLC_OFF] &amp; RXBDLC_LEN_MASK);</div><div class='del'>-	memcpy(frame-&gt;data, buf + RXBDAT_OFF, frame-&gt;can_dlc);</div><div class='add'>+	frame-&gt;len = can_cc_dlc2len(buf[RXBDLC_OFF] &amp; RXBDLC_LEN_MASK);</div><div class='add'>+	if (!(frame-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='add'>+		memcpy(frame-&gt;data, buf + RXBDAT_OFF, frame-&gt;len);</div><div class='ctx'> </div><div class='add'>+		priv-&gt;net-&gt;stats.rx_bytes += frame-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	priv-&gt;net-&gt;stats.rx_packets++;</div><div class='del'>-	priv-&gt;net-&gt;stats.rx_bytes += frame-&gt;can_dlc;</div><div class='del'>-</div><div class='del'>-	can_led_event(priv-&gt;net, CAN_LED_EVENT_RX);</div><div class='ctx'> </div><div class='del'>-	netif_rx_ni(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mcp251x_hw_sleep(struct spi_device *spi)</div><div class='hunk'>@@ -512,18 +758,50 @@ static void mcp251x_hw_sleep(struct spi_device *spi)</div><div class='ctx'> 	mcp251x_write_reg(spi, CANCTRL, CANCTRL_REQOP_SLEEP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* May only be called when device is sleeping! */</div><div class='add'>+static int mcp251x_hw_wake(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	u8 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Force wakeup interrupt to wake device, but don't execute IST */</div><div class='add'>+	disable_irq_nosync(spi-&gt;irq);</div><div class='add'>+	mcp251x_write_2regs(spi, CANINTE, CANINTE_WAKIE, CANINTF_WAKIF);</div><div class='add'>+</div><div class='add'>+	/* Wait for oscillator startup timer after wake up */</div><div class='add'>+	mdelay(MCP251X_OST_DELAY_MS);</div><div class='add'>+</div><div class='add'>+	/* Put device into config mode */</div><div class='add'>+	mcp251x_write_reg(spi, CANCTRL, CANCTRL_REQOP_CONF);</div><div class='add'>+</div><div class='add'>+	/* Wait for the device to enter config mode */</div><div class='add'>+	ret = mcp251x_read_stat_poll_timeout(spi, value, value == CANCTRL_REQOP_CONF,</div><div class='add'>+					     MCP251X_OST_DELAY_MS * 1000,</div><div class='add'>+					     USEC_PER_SEC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "MCP251x didn't enter in config mode\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable and clear pending interrupts */</div><div class='add'>+	mcp251x_write_2regs(spi, CANINTE, 0x00, 0x00);</div><div class='add'>+	enable_irq(spi-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t mcp251x_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					   struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = netdev_priv(net);</div><div class='ctx'> 	struct spi_device *spi = priv-&gt;spi;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;tx_skb || priv-&gt;tx_len) {</div><div class='add'>+	if (priv-&gt;tx_skb || priv-&gt;tx_busy) {</div><div class='ctx'> 		dev_warn(&amp;spi-&gt;dev, "hard_xmit called while tx busy\n");</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(net, skb))</div><div class='add'>+	if (can_dev_dropped_skb(net, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(net);</div><div class='hunk'>@@ -557,7 +835,8 @@ static int mcp251x_do_set_mode(struct net_device *net, enum can_mode mode)</div><div class='ctx'> static int mcp251x_set_normal_mode(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='del'>-	unsigned long timeout;</div><div class='add'>+	u8 value;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupts */</div><div class='ctx'> 	mcp251x_write_reg(spi, CANINTE,</div><div class='hunk'>@@ -575,14 +854,12 @@ static int mcp251x_set_normal_mode(struct spi_device *spi)</div><div class='ctx'> 		mcp251x_write_reg(spi, CANCTRL, CANCTRL_REQOP_NORMAL);</div><div class='ctx'> </div><div class='ctx'> 		/* Wait for the device to enter normal mode */</div><div class='del'>-		timeout = jiffies + HZ;</div><div class='del'>-		while (mcp251x_read_reg(spi, CANSTAT) &amp; CANCTRL_REQOP_MASK) {</div><div class='del'>-			schedule();</div><div class='del'>-			if (time_after(jiffies, timeout)) {</div><div class='del'>-				dev_err(&amp;spi-&gt;dev, "MCP251x didn't"</div><div class='del'>-					" enter in normal mode\n");</div><div class='del'>-				return -EBUSY;</div><div class='del'>-			}</div><div class='add'>+		ret = mcp251x_read_stat_poll_timeout(spi, value, value == 0,</div><div class='add'>+						     MCP251X_OST_DELAY_MS * 1000,</div><div class='add'>+						     USEC_PER_SEC);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "MCP251x didn't enter in normal mode\n");</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='hunk'>@@ -626,25 +903,27 @@ static int mcp251x_setup(struct net_device *net, struct spi_device *spi)</div><div class='ctx'> static int mcp251x_hw_reset(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='del'>-	u8 reg;</div><div class='add'>+	u8 value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for oscillator startup timer after power up */</div><div class='ctx'> 	mdelay(MCP251X_OST_DELAY_MS);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;spi_tx_buf[0] = INSTRUCTION_RESET;</div><div class='del'>-	ret = mcp251x_spi_trans(spi, 1);</div><div class='add'>+	ret = mcp251x_spi_write(spi, 1);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for oscillator startup timer after reset */</div><div class='ctx'> 	mdelay(MCP251X_OST_DELAY_MS);</div><div class='del'>-	</div><div class='del'>-	reg = mcp251x_read_reg(spi, CANSTAT);</div><div class='del'>-	if ((reg &amp; CANCTRL_REQOP_MASK) != CANCTRL_REQOP_CONF)</div><div class='del'>-		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Wait for reset to finish */</div><div class='add'>+	ret = mcp251x_read_stat_poll_timeout(spi, value, value == CANCTRL_REQOP_CONF,</div><div class='add'>+					     MCP251X_OST_DELAY_MS * 1000,</div><div class='add'>+					     USEC_PER_SEC);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "MCP251x didn't enter in conf mode after reset\n");</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mcp251x_hw_probe(struct spi_device *spi)</div><div class='hunk'>@@ -678,17 +957,6 @@ static int mcp251x_power_enable(struct regulator *reg, int enable)</div><div class='ctx'> 		return regulator_disable(reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mcp251x_open_clean(struct net_device *net)</div><div class='del'>-{</div><div class='del'>-	struct mcp251x_priv *priv = netdev_priv(net);</div><div class='del'>-	struct spi_device *spi = priv-&gt;spi;</div><div class='del'>-</div><div class='del'>-	free_irq(spi-&gt;irq, priv);</div><div class='del'>-	mcp251x_hw_sleep(spi);</div><div class='del'>-	mcp251x_power_enable(priv-&gt;transceiver, 0);</div><div class='del'>-	close_candev(net);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int mcp251x_stop(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = netdev_priv(net);</div><div class='hunk'>@@ -698,14 +966,11 @@ static int mcp251x_stop(struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;force_quit = 1;</div><div class='ctx'> 	free_irq(spi-&gt;irq, priv);</div><div class='del'>-	destroy_workqueue(priv-&gt;wq);</div><div class='del'>-	priv-&gt;wq = NULL;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable and clear pending interrupts */</div><div class='del'>-	mcp251x_write_reg(spi, CANINTE, 0x00);</div><div class='del'>-	mcp251x_write_reg(spi, CANINTF, 0x00);</div><div class='add'>+	mcp251x_write_2regs(spi, CANINTE, 0x00, 0x00);</div><div class='ctx'> </div><div class='ctx'> 	mcp251x_write_reg(spi, TXBCTRL(0), 0);</div><div class='ctx'> 	mcp251x_clean(net);</div><div class='hunk'>@@ -718,8 +983,6 @@ static int mcp251x_stop(struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> </div><div class='del'>-	can_led_event(net, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -732,7 +995,7 @@ static void mcp251x_error_skb(struct net_device *net, int can_id, int data1)</div><div class='ctx'> 	if (skb) {</div><div class='ctx'> 		frame-&gt;can_id |= can_id;</div><div class='ctx'> 		frame-&gt;data[1] = data1;</div><div class='del'>-		netif_rx_ni(skb);</div><div class='add'>+		netif_rx(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_err(net, "cannot allocate error skb\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -753,11 +1016,11 @@ static void mcp251x_tx_work_handler(struct work_struct *ws)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			frame = (struct can_frame *)priv-&gt;tx_skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-			if (frame-&gt;can_dlc &gt; CAN_FRAME_MAX_DATA_LEN)</div><div class='del'>-				frame-&gt;can_dlc = CAN_FRAME_MAX_DATA_LEN;</div><div class='add'>+			if (frame-&gt;len &gt; CAN_FRAME_MAX_DATA_LEN)</div><div class='add'>+				frame-&gt;len = CAN_FRAME_MAX_DATA_LEN;</div><div class='ctx'> 			mcp251x_hw_tx(spi, frame, 0);</div><div class='del'>-			priv-&gt;tx_len = 1 + frame-&gt;can_dlc;</div><div class='del'>-			can_put_echo_skb(priv-&gt;tx_skb, net, 0);</div><div class='add'>+			priv-&gt;tx_busy = true;</div><div class='add'>+			can_put_echo_skb(priv-&gt;tx_skb, net, 0, 0);</div><div class='ctx'> 			priv-&gt;tx_skb = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -773,8 +1036,14 @@ static void mcp251x_restart_work_handler(struct work_struct *ws)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> 	if (priv-&gt;after_suspend) {</div><div class='del'>-		mcp251x_hw_reset(spi);</div><div class='del'>-		mcp251x_setup(net, spi);</div><div class='add'>+		if (priv-&gt;after_suspend &amp; AFTER_SUSPEND_POWER) {</div><div class='add'>+			mcp251x_hw_reset(spi);</div><div class='add'>+			mcp251x_setup(net, spi);</div><div class='add'>+			mcp251x_gpio_restore(spi);</div><div class='add'>+		} else {</div><div class='add'>+			mcp251x_hw_wake(spi);</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;force_quit = 0;</div><div class='ctx'> 		if (priv-&gt;after_suspend &amp; AFTER_SUSPEND_RESTART) {</div><div class='ctx'> 			mcp251x_set_normal_mode(spi);</div><div class='ctx'> 		} else if (priv-&gt;after_suspend &amp; AFTER_SUSPEND_UP) {</div><div class='hunk'>@@ -786,7 +1055,6 @@ static void mcp251x_restart_work_handler(struct work_struct *ws)</div><div class='ctx'> 			mcp251x_hw_sleep(spi);</div><div class='ctx'> 		}</div><div class='ctx'> 		priv-&gt;after_suspend = 0;</div><div class='del'>-		priv-&gt;force_quit = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;restart_tx) {</div><div class='hunk'>@@ -814,28 +1082,40 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		mcp251x_read_2regs(spi, CANINTF, &amp;intf, &amp;eflag);</div><div class='ctx'> </div><div class='del'>-		/* mask out flags we don't care about */</div><div class='del'>-		intf &amp;= CANINTF_RX | CANINTF_TX | CANINTF_ERR;</div><div class='del'>-</div><div class='ctx'> 		/* receive buffer 0 */</div><div class='ctx'> 		if (intf &amp; CANINTF_RX0IF) {</div><div class='ctx'> 			mcp251x_hw_rx(spi, 0);</div><div class='del'>-			/*</div><div class='del'>-			 * Free one buffer ASAP</div><div class='del'>-			 * (The MCP2515 does this automatically.)</div><div class='add'>+			/* Free one buffer ASAP</div><div class='add'>+			 * (The MCP2515/25625 does this automatically.)</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (mcp251x_is_2510(spi))</div><div class='del'>-				mcp251x_write_bits(spi, CANINTF, CANINTF_RX0IF, 0x00);</div><div class='add'>+				mcp251x_write_bits(spi, CANINTF,</div><div class='add'>+						   CANINTF_RX0IF, 0x00);</div><div class='add'>+</div><div class='add'>+			/* check if buffer 1 is already known to be full, no need to re-read */</div><div class='add'>+			if (!(intf &amp; CANINTF_RX1IF)) {</div><div class='add'>+				u8 intf1, eflag1;</div><div class='add'>+</div><div class='add'>+				/* intf needs to be read again to avoid a race condition */</div><div class='add'>+				mcp251x_read_2regs(spi, CANINTF, &amp;intf1, &amp;eflag1);</div><div class='add'>+</div><div class='add'>+				/* combine flags from both operations for error handling */</div><div class='add'>+				intf |= intf1;</div><div class='add'>+				eflag |= eflag1;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* receive buffer 1 */</div><div class='ctx'> 		if (intf &amp; CANINTF_RX1IF) {</div><div class='ctx'> 			mcp251x_hw_rx(spi, 1);</div><div class='del'>-			/* the MCP2515 does this automatically */</div><div class='add'>+			/* The MCP2515/25625 does this automatically. */</div><div class='ctx'> 			if (mcp251x_is_2510(spi))</div><div class='ctx'> 				clear_intf |= CANINTF_RX1IF;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* mask out flags we don't care about */</div><div class='add'>+		intf &amp;= CANINTF_RX | CANINTF_TX | CANINTF_ERR;</div><div class='add'>+</div><div class='ctx'> 		/* any error or tx interrupt we need to clear? */</div><div class='ctx'> 		if (intf &amp; (CANINTF_ERR | CANINTF_TX))</div><div class='ctx'> 			clear_intf |= intf &amp; (CANINTF_ERR | CANINTF_TX);</div><div class='hunk'>@@ -875,7 +1155,8 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)</div><div class='ctx'> 			if (new_state &gt;= CAN_STATE_ERROR_WARNING &amp;&amp;</div><div class='ctx'> 			    new_state &lt;= CAN_STATE_BUS_OFF)</div><div class='ctx'> 				priv-&gt;can.can_stats.error_warning++;</div><div class='del'>-		case CAN_STATE_ERROR_WARNING:	/* fallthrough */</div><div class='add'>+			fallthrough;</div><div class='add'>+		case CAN_STATE_ERROR_WARNING:</div><div class='ctx'> 			if (new_state &gt;= CAN_STATE_ERROR_PASSIVE &amp;&amp;</div><div class='ctx'> 			    new_state &lt;= CAN_STATE_BUS_OFF)</div><div class='ctx'> 				priv-&gt;can.can_stats.error_passive++;</div><div class='hunk'>@@ -916,16 +1197,14 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (intf &amp; CANINTF_TX) {</div><div class='del'>-			net-&gt;stats.tx_packets++;</div><div class='del'>-			net-&gt;stats.tx_bytes += priv-&gt;tx_len - 1;</div><div class='del'>-			can_led_event(net, CAN_LED_EVENT_TX);</div><div class='del'>-			if (priv-&gt;tx_len) {</div><div class='del'>-				can_get_echo_skb(net, 0);</div><div class='del'>-				priv-&gt;tx_len = 0;</div><div class='add'>+			if (priv-&gt;tx_busy) {</div><div class='add'>+				net-&gt;stats.tx_packets++;</div><div class='add'>+				net-&gt;stats.tx_bytes += can_get_echo_skb(net, 0,</div><div class='add'>+									NULL);</div><div class='add'>+				priv-&gt;tx_busy = false;</div><div class='ctx'> 			}</div><div class='ctx'> 			netif_wake_queue(net);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -935,7 +1214,7 @@ static int mcp251x_open(struct net_device *net)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = netdev_priv(net);</div><div class='ctx'> 	struct spi_device *spi = priv-&gt;spi;</div><div class='del'>-	unsigned long flags = IRQF_ONESHOT | IRQF_TRIGGER_FALLING;</div><div class='add'>+	unsigned long flags = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = open_candev(net);</div><div class='hunk'>@@ -949,43 +1228,40 @@ static int mcp251x_open(struct net_device *net)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;force_quit = 0;</div><div class='ctx'> 	priv-&gt;tx_skb = NULL;</div><div class='del'>-	priv-&gt;tx_len = 0;</div><div class='add'>+	priv-&gt;tx_busy = false;</div><div class='add'>+</div><div class='add'>+	if (!dev_fwnode(&amp;spi-&gt;dev))</div><div class='add'>+		flags = IRQF_TRIGGER_FALLING;</div><div class='ctx'> </div><div class='ctx'> 	ret = request_threaded_irq(spi-&gt;irq, NULL, mcp251x_can_ist,</div><div class='del'>-				   flags | IRQF_ONESHOT, DEVICE_NAME, priv);</div><div class='add'>+				   flags | IRQF_ONESHOT, dev_name(&amp;spi-&gt;dev),</div><div class='add'>+				   priv);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;spi-&gt;dev, "failed to acquire irq %d\n", spi-&gt;irq);</div><div class='del'>-		mcp251x_power_enable(priv-&gt;transceiver, 0);</div><div class='del'>-		close_candev(net);</div><div class='del'>-		goto open_unlock;</div><div class='add'>+		goto out_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;wq = alloc_workqueue("mcp251x_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,</div><div class='del'>-				   0);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;tx_work, mcp251x_tx_work_handler);</div><div class='del'>-	INIT_WORK(&amp;priv-&gt;restart_work, mcp251x_restart_work_handler);</div><div class='del'>-</div><div class='del'>-	ret = mcp251x_hw_reset(spi);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mcp251x_open_clean(net);</div><div class='del'>-		goto open_unlock;</div><div class='del'>-	}</div><div class='add'>+	ret = mcp251x_hw_wake(spi);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> 	ret = mcp251x_setup(net, spi);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mcp251x_open_clean(net);</div><div class='del'>-		goto open_unlock;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> 	ret = mcp251x_set_normal_mode(spi);</div><div class='del'>-	if (ret) {</div><div class='del'>-		mcp251x_open_clean(net);</div><div class='del'>-		goto open_unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	can_led_event(net, CAN_LED_EVENT_OPEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_irq;</div><div class='ctx'> </div><div class='ctx'> 	netif_wake_queue(net);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> </div><div class='del'>-open_unlock:</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_irq:</div><div class='add'>+	free_irq(spi-&gt;irq, priv);</div><div class='add'>+	mcp251x_hw_sleep(spi);</div><div class='add'>+out_close:</div><div class='add'>+	mcp251x_power_enable(priv-&gt;transceiver, 0);</div><div class='add'>+	close_candev(net);</div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -994,7 +1270,10 @@ static const struct net_device_ops mcp251x_netdev_ops = {</div><div class='ctx'> 	.ndo_open = mcp251x_open,</div><div class='ctx'> 	.ndo_stop = mcp251x_stop,</div><div class='ctx'> 	.ndo_start_xmit = mcp251x_hard_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops mcp251x_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id mcp251x_of_match[] = {</div><div class='hunk'>@@ -1006,6 +1285,10 @@ static const struct of_device_id mcp251x_of_match[] = {</div><div class='ctx'> 		.compatible	= "microchip,mcp2515",</div><div class='ctx'> 		.data		= (void *)CAN_MCP251X_MCP2515,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible	= "microchip,mcp25625",</div><div class='add'>+		.data		= (void *)CAN_MCP251X_MCP25625,</div><div class='add'>+	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, mcp251x_of_match);</div><div class='hunk'>@@ -1019,46 +1302,47 @@ static const struct spi_device_id mcp251x_id_table[] = {</div><div class='ctx'> 		.name		= "mcp2515",</div><div class='ctx'> 		.driver_data	= (kernel_ulong_t)CAN_MCP251X_MCP2515,</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.name		= "mcp25625",</div><div class='add'>+		.driver_data	= (kernel_ulong_t)CAN_MCP251X_MCP25625,</div><div class='add'>+	},</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(spi, mcp251x_id_table);</div><div class='ctx'> </div><div class='ctx'> static int mcp251x_can_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='del'>-	const struct of_device_id *of_id = of_match_device(mcp251x_of_match,</div><div class='del'>-							   &amp;spi-&gt;dev);</div><div class='del'>-	struct mcp251x_platform_data *pdata = dev_get_platdata(&amp;spi-&gt;dev);</div><div class='ctx'> 	struct net_device *net;</div><div class='ctx'> 	struct mcp251x_priv *priv;</div><div class='ctx'> 	struct clk *clk;</div><div class='del'>-	int freq, ret;</div><div class='del'>-</div><div class='del'>-	clk = devm_clk_get(&amp;spi-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(clk)) {</div><div class='del'>-		if (pdata)</div><div class='del'>-			freq = pdata-&gt;oscillator_frequency;</div><div class='del'>-		else</div><div class='del'>-			return PTR_ERR(clk);</div><div class='del'>-	} else {</div><div class='del'>-		freq = clk_get_rate(clk);</div><div class='del'>-	}</div><div class='add'>+	u32 freq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_get_optional(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, PTR_ERR(clk), "Cannot get clock\n");</div><div class='add'>+</div><div class='add'>+	freq = clk_get_rate(clk);</div><div class='add'>+	if (freq == 0)</div><div class='add'>+		device_property_read_u32(&amp;spi-&gt;dev, "clock-frequency", &amp;freq);</div><div class='ctx'> </div><div class='ctx'> 	/* Sanity check */</div><div class='ctx'> 	if (freq &lt; 1000000 || freq &gt; 25000000)</div><div class='del'>-		return -ERANGE;</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, -ERANGE, "clock frequency out of range\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate can/net device */</div><div class='ctx'> 	net = alloc_candev(sizeof(struct mcp251x_priv), TX_ECHO_SKB_MAX);</div><div class='ctx'> 	if (!net)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(clk)) {</div><div class='del'>-		ret = clk_prepare_enable(clk);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out_free;</div><div class='add'>+	ret = clk_prepare_enable(clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "Cannot enable clock\n");</div><div class='add'>+		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	net-&gt;netdev_ops = &amp;mcp251x_netdev_ops;</div><div class='add'>+	net-&gt;ethtool_ops = &amp;mcp251x_ethtool_ops;</div><div class='ctx'> 	net-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(net);</div><div class='hunk'>@@ -1067,10 +1351,7 @@ static int mcp251x_can_probe(struct spi_device *spi)</div><div class='ctx'> 	priv-&gt;can.clock.freq = freq / 2;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |</div><div class='ctx'> 		CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY;</div><div class='del'>-	if (of_id)</div><div class='del'>-		priv-&gt;model = (enum mcp251x_model)of_id-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;model = spi_get_device_id(spi)-&gt;driver_data;</div><div class='add'>+	priv-&gt;model = (enum mcp251x_model)(uintptr_t)spi_get_device_match_data(spi);</div><div class='ctx'> 	priv-&gt;net = net;</div><div class='ctx'> 	priv-&gt;clk = clk;</div><div class='ctx'> </div><div class='hunk'>@@ -1083,61 +1364,51 @@ static int mcp251x_can_probe(struct spi_device *spi)</div><div class='ctx'> 	else</div><div class='ctx'> 		spi-&gt;max_speed_hz = spi-&gt;max_speed_hz ? : 10 * 1000 * 1000;</div><div class='ctx'> 	ret = spi_setup(spi);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "Cannot set up spi\n");</div><div class='ctx'> 		goto out_clk;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;power = devm_regulator_get_optional(&amp;spi-&gt;dev, "vdd");</div><div class='ctx'> 	priv-&gt;transceiver = devm_regulator_get_optional(&amp;spi-&gt;dev, "xceiver");</div><div class='ctx'> 	if ((PTR_ERR(priv-&gt;power) == -EPROBE_DEFER) ||</div><div class='ctx'> 	    (PTR_ERR(priv-&gt;transceiver) == -EPROBE_DEFER)) {</div><div class='ctx'> 		ret = -EPROBE_DEFER;</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "supply deferred\n");</div><div class='ctx'> 		goto out_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = mcp251x_power_enable(priv-&gt;power, 1);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "Cannot enable power\n");</div><div class='ctx'> 		goto out_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;wq = alloc_workqueue("mcp251x_wq",</div><div class='add'>+				   WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_PERCPU,</div><div class='add'>+				   0);</div><div class='add'>+	if (!priv-&gt;wq) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_clk;</div><div class='add'>+	}</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;tx_work, mcp251x_tx_work_handler);</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;restart_work, mcp251x_restart_work_handler);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;spi = spi;</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;mcp_lock);</div><div class='ctx'> </div><div class='del'>-	/* If requested, allocate DMA buffers */</div><div class='del'>-	if (mcp251x_enable_dma) {</div><div class='del'>-		spi-&gt;dev.coherent_dma_mask = ~0;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Minimum coherent DMA allocation is PAGE_SIZE, so allocate</div><div class='del'>-		 * that much and share it between Tx and Rx DMA buffers.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;spi_tx_buf = dmam_alloc_coherent(&amp;spi-&gt;dev,</div><div class='del'>-						       PAGE_SIZE,</div><div class='del'>-						       &amp;priv-&gt;spi_tx_dma,</div><div class='del'>-						       GFP_DMA);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;spi_tx_buf) {</div><div class='del'>-			priv-&gt;spi_rx_buf = (priv-&gt;spi_tx_buf + (PAGE_SIZE / 2));</div><div class='del'>-			priv-&gt;spi_rx_dma = (dma_addr_t)(priv-&gt;spi_tx_dma +</div><div class='del'>-							(PAGE_SIZE / 2));</div><div class='del'>-		} else {</div><div class='del'>-			/* Fall back to non-DMA */</div><div class='del'>-			mcp251x_enable_dma = 0;</div><div class='del'>-		}</div><div class='add'>+	priv-&gt;spi_tx_buf = devm_kzalloc(&amp;spi-&gt;dev, SPI_TRANSFER_BUF_LEN,</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;spi_tx_buf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error_probe;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Allocate non-DMA buffers */</div><div class='del'>-	if (!mcp251x_enable_dma) {</div><div class='del'>-		priv-&gt;spi_tx_buf = devm_kzalloc(&amp;spi-&gt;dev, SPI_TRANSFER_BUF_LEN,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-		if (!priv-&gt;spi_tx_buf) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto error_probe;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;spi_rx_buf = devm_kzalloc(&amp;spi-&gt;dev, SPI_TRANSFER_BUF_LEN,</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-		if (!priv-&gt;spi_rx_buf) {</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto error_probe;</div><div class='del'>-		}</div><div class='add'>+	priv-&gt;spi_rx_buf = devm_kzalloc(&amp;spi-&gt;dev, SPI_TRANSFER_BUF_LEN,</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;spi_rx_buf) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error_probe;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(net, &amp;spi-&gt;dev);</div><div class='hunk'>@@ -1145,37 +1416,46 @@ static int mcp251x_can_probe(struct spi_device *spi)</div><div class='ctx'> 	/* Here is OK to not lock the MCP, no one knows about it yet */</div><div class='ctx'> 	ret = mcp251x_hw_probe(spi);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		if (ret == -ENODEV)</div><div class='del'>-			dev_err(&amp;spi-&gt;dev, "Cannot initialize MCP%x. Wrong wiring?\n", priv-&gt;model);</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "Cannot initialize MCP%x. Wrong wiring?\n",</div><div class='add'>+			      priv-&gt;model);</div><div class='ctx'> 		goto error_probe;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mcp251x_hw_sleep(spi);</div><div class='ctx'> </div><div class='ctx'> 	ret = register_candev(net);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "Cannot register CAN device\n");</div><div class='ctx'> 		goto error_probe;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(net);</div><div class='add'>+	ret = mcp251x_gpio_setup(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, ret, "Cannot set up gpios\n");</div><div class='add'>+		goto out_unregister_candev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(net, "MCP%x successfully initialized.\n", priv-&gt;model);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_unregister_candev:</div><div class='add'>+	unregister_candev(net);</div><div class='add'>+</div><div class='ctx'> error_probe:</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+	priv-&gt;wq = NULL;</div><div class='ctx'> 	mcp251x_power_enable(priv-&gt;power, 0);</div><div class='ctx'> </div><div class='ctx'> out_clk:</div><div class='del'>-	if (!IS_ERR(clk))</div><div class='del'>-		clk_disable_unprepare(clk);</div><div class='add'>+	clk_disable_unprepare(clk);</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='ctx'> 	free_candev(net);</div><div class='ctx'> </div><div class='del'>-	dev_err(&amp;spi-&gt;dev, "Probe failed, err=%d\n", -ret);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mcp251x_can_remove(struct spi_device *spi)</div><div class='add'>+static void mcp251x_can_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct mcp251x_priv *priv = spi_get_drvdata(spi);</div><div class='ctx'> 	struct net_device *net = priv-&gt;net;</div><div class='hunk'>@@ -1184,12 +1464,12 @@ static int mcp251x_can_remove(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	mcp251x_power_enable(priv-&gt;power, 0);</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(priv-&gt;clk))</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+	priv-&gt;wq = NULL;</div><div class='ctx'> </div><div class='del'>-	free_candev(net);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	free_candev(net);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused mcp251x_can_suspend(struct device *dev)</div><div class='hunk'>@@ -1200,8 +1480,7 @@ static int __maybe_unused mcp251x_can_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;force_quit = 1;</div><div class='ctx'> 	disable_irq(spi-&gt;irq);</div><div class='del'>-	/*</div><div class='del'>-	 * Note: at this point neither IST nor workqueues are running.</div><div class='add'>+	/* Note: at this point neither IST nor workqueues are running.</div><div class='ctx'> 	 * open/stop cannot be called anyway so locking is not needed</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (netif_running(net)) {</div><div class='hunk'>@@ -1214,10 +1493,8 @@ static int __maybe_unused mcp251x_can_suspend(struct device *dev)</div><div class='ctx'> 		priv-&gt;after_suspend = AFTER_SUSPEND_DOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR_OR_NULL(priv-&gt;power)) {</div><div class='del'>-		regulator_disable(priv-&gt;power);</div><div class='del'>-		priv-&gt;after_suspend |= AFTER_SUSPEND_POWER;</div><div class='del'>-	}</div><div class='add'>+	mcp251x_power_enable(priv-&gt;power, 0);</div><div class='add'>+	priv-&gt;after_suspend |= AFTER_SUSPEND_POWER;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1229,13 +1506,13 @@ static int __maybe_unused mcp251x_can_resume(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;after_suspend &amp; AFTER_SUSPEND_POWER)</div><div class='ctx'> 		mcp251x_power_enable(priv-&gt;power, 1);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;after_suspend &amp; AFTER_SUSPEND_UP) {</div><div class='add'>+	if (priv-&gt;after_suspend &amp; AFTER_SUSPEND_UP)</div><div class='ctx'> 		mcp251x_power_enable(priv-&gt;transceiver, 1);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;after_suspend &amp; (AFTER_SUSPEND_POWER | AFTER_SUSPEND_UP))</div><div class='ctx'> 		queue_work(priv-&gt;wq, &amp;priv-&gt;restart_work);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		priv-&gt;after_suspend = 0;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;force_quit = 0;</div><div class='ctx'> 	enable_irq(spi-&gt;irq);</div><div class='hunk'>@@ -1259,5 +1536,5 @@ module_spi_driver(mcp251x_can_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Chris Elston &lt;celston@katalix.com&gt;, "</div><div class='ctx'> 	      "Christian Pellegrin &lt;chripell@evolware.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Microchip 251x CAN driver");</div><div class='add'>+MODULE_DESCRIPTION("Microchip 251x/25625 CAN driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig<br/>new file mode 100644<br/>index 000000000000..7c29846e6051<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,20 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+config CAN_MCP251XFD</div><div class='add'>+	tristate "Microchip MCP251xFD SPI CAN controllers"</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	select REGMAP</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='add'>+	select GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Driver for the Microchip MCP251XFD SPI FD-CAN controller</div><div class='add'>+	  family.</div><div class='add'>+</div><div class='add'>+config CAN_MCP251XFD_SANITY</div><div class='add'>+	depends on CAN_MCP251XFD</div><div class='add'>+	bool "Additional Sanity Checks"</div><div class='add'>+	help</div><div class='add'>+	  This option enables additional sanity checks in the driver,</div><div class='add'>+	  that compares various internal counters with the in chip</div><div class='add'>+	  variants. This comes with a runtime overhead.</div><div class='add'>+	  Disable if unsure.</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/Makefile b/drivers/net/can/spi/mcp251xfd/Makefile<br/>new file mode 100644<br/>index 000000000000..94d7de954294<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CAN_MCP251XFD) += mcp251xfd.o</div><div class='add'>+</div><div class='add'>+mcp251xfd-objs :=</div><div class='add'>+mcp251xfd-objs += mcp251xfd-chip-fifo.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-core.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-crc16.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-ethtool.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-ram.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-regmap.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-ring.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-rx.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-tef.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-timestamp.o</div><div class='add'>+mcp251xfd-objs += mcp251xfd-tx.o</div><div class='add'>+</div><div class='add'>+mcp251xfd-$(CONFIG_DEV_COREDUMP) += mcp251xfd-dump.o</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c<br/>new file mode 100644<br/>index 000000000000..0d96097a2547<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-chip-fifo.c</a></div><div class='hunk'>@@ -0,0 +1,119 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_chip_rx_fifo_init_one(const struct mcp251xfd_priv *priv,</div><div class='add'>+				const struct mcp251xfd_rx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	u32 fifo_con;</div><div class='add'>+</div><div class='add'>+	/* Enable RXOVIE on _all_ RX FIFOs, not just the last one.</div><div class='add'>+	 *</div><div class='add'>+	 * FIFOs hit by a RX MAB overflow and RXOVIE enabled will</div><div class='add'>+	 * generate a RXOVIF, use this to properly detect RX MAB</div><div class='add'>+	 * overflows.</div><div class='add'>+	 */</div><div class='add'>+	fifo_con = FIELD_PREP(MCP251XFD_REG_FIFOCON_FSIZE_MASK,</div><div class='add'>+			      ring-&gt;obj_num - 1) |</div><div class='add'>+		MCP251XFD_REG_FIFOCON_RXTSEN |</div><div class='add'>+		MCP251XFD_REG_FIFOCON_RXOVIE |</div><div class='add'>+		MCP251XFD_REG_FIFOCON_TFNRFNIE;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_is_fd_mode(priv))</div><div class='add'>+		fifo_con |= FIELD_PREP(MCP251XFD_REG_FIFOCON_PLSIZE_MASK,</div><div class='add'>+				       MCP251XFD_REG_FIFOCON_PLSIZE_64);</div><div class='add'>+	else</div><div class='add'>+		fifo_con |= FIELD_PREP(MCP251XFD_REG_FIFOCON_PLSIZE_MASK,</div><div class='add'>+				       MCP251XFD_REG_FIFOCON_PLSIZE_8);</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;map_reg,</div><div class='add'>+			    MCP251XFD_REG_FIFOCON(ring-&gt;fifo_nr), fifo_con);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_chip_rx_filter_init_one(const struct mcp251xfd_priv *priv,</div><div class='add'>+				  const struct mcp251xfd_rx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	u32 fltcon;</div><div class='add'>+</div><div class='add'>+	fltcon = MCP251XFD_REG_FLTCON_FLTEN(ring-&gt;nr) |</div><div class='add'>+		MCP251XFD_REG_FLTCON_FBP(ring-&gt;nr, ring-&gt;fifo_nr);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg,</div><div class='add'>+				  MCP251XFD_REG_FLTCON(ring-&gt;nr &gt;&gt; 2),</div><div class='add'>+				  MCP251XFD_REG_FLTCON_FLT_MASK(ring-&gt;nr),</div><div class='add'>+				  fltcon);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mcp251xfd_chip_fifo_init(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	const struct mcp251xfd_rx_ring *rx_ring;</div><div class='add'>+	u32 val;</div><div class='add'>+	int err, n;</div><div class='add'>+</div><div class='add'>+	/* TEF */</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_TEFCON_FSIZE_MASK,</div><div class='add'>+			 tx_ring-&gt;obj_num - 1) |</div><div class='add'>+		MCP251XFD_REG_TEFCON_TEFTSEN |</div><div class='add'>+		MCP251XFD_REG_TEFCON_TEFOVIE |</div><div class='add'>+		MCP251XFD_REG_TEFCON_TEFNEIE;</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_TEFCON, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* TX FIFO */</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_FIFOCON_FSIZE_MASK,</div><div class='add'>+			 tx_ring-&gt;obj_num - 1) |</div><div class='add'>+		MCP251XFD_REG_FIFOCON_TXEN |</div><div class='add'>+		MCP251XFD_REG_FIFOCON_TXATIE;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_is_fd_mode(priv))</div><div class='add'>+		val |= FIELD_PREP(MCP251XFD_REG_FIFOCON_PLSIZE_MASK,</div><div class='add'>+				  MCP251XFD_REG_FIFOCON_PLSIZE_64);</div><div class='add'>+	else</div><div class='add'>+		val |= FIELD_PREP(MCP251XFD_REG_FIFOCON_PLSIZE_MASK,</div><div class='add'>+				  MCP251XFD_REG_FIFOCON_PLSIZE_8);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		val |= FIELD_PREP(MCP251XFD_REG_FIFOCON_TXAT_MASK,</div><div class='add'>+				  MCP251XFD_REG_FIFOCON_TXAT_ONE_SHOT);</div><div class='add'>+	else</div><div class='add'>+		val |= FIELD_PREP(MCP251XFD_REG_FIFOCON_TXAT_MASK,</div><div class='add'>+				  MCP251XFD_REG_FIFOCON_TXAT_UNLIMITED);</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg,</div><div class='add'>+			   MCP251XFD_REG_FIFOCON(priv-&gt;tx-&gt;fifo_nr),</div><div class='add'>+			   val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* RX FIFOs */</div><div class='add'>+	mcp251xfd_for_each_rx_ring(priv, rx_ring, n) {</div><div class='add'>+		err = mcp251xfd_chip_rx_fifo_init_one(priv, rx_ring);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_chip_rx_filter_init_one(priv, rx_ring);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c<br/>new file mode 100644<br/>index 000000000000..5134ebb85880<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c</a></div><div class='hunk'>@@ -0,0 +1,2417 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021, 2023 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+#define DEVICE_NAME "mcp251xfd"</div><div class='add'>+</div><div class='add'>+static const struct mcp251xfd_devtype_data mcp251xfd_devtype_data_mcp2517fd = {</div><div class='add'>+	.quirks = MCP251XFD_QUIRK_MAB_NO_WARN | MCP251XFD_QUIRK_CRC_REG |</div><div class='add'>+		MCP251XFD_QUIRK_CRC_RX | MCP251XFD_QUIRK_CRC_TX |</div><div class='add'>+		MCP251XFD_QUIRK_ECC,</div><div class='add'>+	.model = MCP251XFD_MODEL_MCP2517FD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mcp251xfd_devtype_data mcp251xfd_devtype_data_mcp2518fd = {</div><div class='add'>+	.quirks = MCP251XFD_QUIRK_CRC_REG | MCP251XFD_QUIRK_CRC_RX |</div><div class='add'>+		MCP251XFD_QUIRK_CRC_TX | MCP251XFD_QUIRK_ECC,</div><div class='add'>+	.model = MCP251XFD_MODEL_MCP2518FD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mcp251xfd_devtype_data mcp251xfd_devtype_data_mcp251863 = {</div><div class='add'>+	.quirks = MCP251XFD_QUIRK_CRC_REG | MCP251XFD_QUIRK_CRC_RX |</div><div class='add'>+		MCP251XFD_QUIRK_CRC_TX | MCP251XFD_QUIRK_ECC,</div><div class='add'>+	.model = MCP251XFD_MODEL_MCP251863,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Autodetect model, start with CRC enabled. */</div><div class='add'>+static const struct mcp251xfd_devtype_data mcp251xfd_devtype_data_mcp251xfd = {</div><div class='add'>+	.quirks = MCP251XFD_QUIRK_CRC_REG | MCP251XFD_QUIRK_CRC_RX |</div><div class='add'>+		MCP251XFD_QUIRK_CRC_TX | MCP251XFD_QUIRK_ECC,</div><div class='add'>+	.model = MCP251XFD_MODEL_MCP251XFD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const mcp251xfd_bittiming_const = {</div><div class='add'>+	.name = DEVICE_NAME,</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 256,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const mcp251xfd_data_bittiming_const = {</div><div class='add'>+	.name = DEVICE_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 256,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The datasheet of the mcp2518fd (DS20006027B) specifies a range of</div><div class='add'>+ * [-64,63] for TDCO, indicating a relative TDCO.</div><div class='add'>+ *</div><div class='add'>+ * Manual tests have shown, that using a relative TDCO configuration</div><div class='add'>+ * results in bus off, while an absolute configuration works.</div><div class='add'>+ *</div><div class='add'>+ * For TDCO use the max value (63) from the data sheet, but 0 as the</div><div class='add'>+ * minimum.</div><div class='add'>+ */</div><div class='add'>+static const struct can_tdc_const mcp251xfd_tdc_const = {</div><div class='add'>+	.tdcv_min = 0,</div><div class='add'>+	.tdcv_max = 63,</div><div class='add'>+	.tdco_min = 0,</div><div class='add'>+	.tdco_max = 63,</div><div class='add'>+	.tdcf_min = 0,</div><div class='add'>+	.tdcf_max = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char *__mcp251xfd_get_model_str(enum mcp251xfd_model model)</div><div class='add'>+{</div><div class='add'>+	switch (model) {</div><div class='add'>+	case MCP251XFD_MODEL_MCP2517FD:</div><div class='add'>+		return "MCP2517FD";</div><div class='add'>+	case MCP251XFD_MODEL_MCP2518FD:</div><div class='add'>+		return "MCP2518FD";</div><div class='add'>+	case MCP251XFD_MODEL_MCP251863:</div><div class='add'>+		return "MCP251863";</div><div class='add'>+	case MCP251XFD_MODEL_MCP251XFD:</div><div class='add'>+		return "MCP251xFD";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline const char *</div><div class='add'>+mcp251xfd_get_model_str(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return __mcp251xfd_get_model_str(priv-&gt;devtype_data.model);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *mcp251xfd_get_mode_str(const u8 mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_MIXED:</div><div class='add'>+		return "Mixed (CAN FD/CAN 2.0)";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_SLEEP:</div><div class='add'>+		return "Sleep";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_INT_LOOPBACK:</div><div class='add'>+		return "Internal Loopback";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_LISTENONLY:</div><div class='add'>+		return "Listen Only";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_CONFIG:</div><div class='add'>+		return "Configuration";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_EXT_LOOPBACK:</div><div class='add'>+		return "External Loopback";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_CAN2_0:</div><div class='add'>+		return "CAN 2.0";</div><div class='add'>+	case MCP251XFD_REG_CON_MODE_RESTRICTED:</div><div class='add'>+		return "Restricted Operation";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *</div><div class='add'>+mcp251xfd_get_osc_str(const u32 osc, const u32 osc_reference)</div><div class='add'>+{</div><div class='add'>+	switch (~osc &amp; osc_reference &amp;</div><div class='add'>+		(MCP251XFD_REG_OSC_OSCRDY | MCP251XFD_REG_OSC_PLLRDY)) {</div><div class='add'>+	case MCP251XFD_REG_OSC_PLLRDY:</div><div class='add'>+		return "PLL";</div><div class='add'>+	case MCP251XFD_REG_OSC_OSCRDY:</div><div class='add'>+		return "Oscillator";</div><div class='add'>+	case MCP251XFD_REG_OSC_PLLRDY | MCP251XFD_REG_OSC_OSCRDY:</div><div class='add'>+		return "Oscillator/PLL";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mcp251xfd_vdd_enable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;reg_vdd)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return regulator_enable(priv-&gt;reg_vdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mcp251xfd_vdd_disable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;reg_vdd)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return regulator_disable(priv-&gt;reg_vdd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_transceiver_enable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;reg_xceiver)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return regulator_enable(priv-&gt;reg_xceiver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_transceiver_disable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;reg_xceiver)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return regulator_disable(priv-&gt;reg_xceiver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_clks_and_vdd_enable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_vdd_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	/* Wait for oscillator stabilisation time after power up */</div><div class='add'>+	usleep_range(MCP251XFD_OSC_STAB_SLEEP_US,</div><div class='add'>+		     2 * MCP251XFD_OSC_STAB_SLEEP_US);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_clks_and_vdd_disable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_vdd_disable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_reg_invalid(u32 reg)</div><div class='add'>+{</div><div class='add'>+	return reg == 0x0 || reg == 0xffffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_chip_get_mode(const struct mcp251xfd_priv *priv, u8 *mode)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_CON, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*mode = FIELD_GET(MCP251XFD_REG_CON_OPMOD_MASK, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__mcp251xfd_chip_set_mode(const struct mcp251xfd_priv *priv,</div><div class='add'>+			  const u8 mode_req, bool nowait)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	unsigned long timeout_us = MCP251XFD_POLL_TIMEOUT_US;</div><div class='add'>+	u32 con = 0, con_reqop, osc = 0;</div><div class='add'>+	u8 mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	con_reqop = FIELD_PREP(MCP251XFD_REG_CON_REQOP_MASK, mode_req);</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_CON,</div><div class='add'>+				 MCP251XFD_REG_CON_REQOP_MASK, con_reqop);</div><div class='add'>+	if (err == -EBADMSG) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Failed to set Requested Operation Mode.\n");</div><div class='add'>+</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	} else if (err) {</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mode_req == MCP251XFD_REG_CON_MODE_SLEEP || nowait)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bt-&gt;bitrate)</div><div class='add'>+		timeout_us = max_t(unsigned long, timeout_us,</div><div class='add'>+				   MCP251XFD_FRAME_LEN_MAX_BITS * USEC_PER_SEC /</div><div class='add'>+				   bt-&gt;bitrate);</div><div class='add'>+</div><div class='add'>+	err = regmap_read_poll_timeout(priv-&gt;map_reg, MCP251XFD_REG_CON, con,</div><div class='add'>+				       !mcp251xfd_reg_invalid(con) &amp;&amp;</div><div class='add'>+				       FIELD_GET(MCP251XFD_REG_CON_OPMOD_MASK,</div><div class='add'>+						 con) == mode_req,</div><div class='add'>+				       MCP251XFD_POLL_SLEEP_US, timeout_us);</div><div class='add'>+	if (err != -ETIMEDOUT &amp;&amp; err != -EBADMSG)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Ignore return value.</div><div class='add'>+	 * Print below error messages, even if this fails.</div><div class='add'>+	 */</div><div class='add'>+	regmap_read(priv-&gt;map_reg, MCP251XFD_REG_OSC, &amp;osc);</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_reg_invalid(con)) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Failed to read CAN Control Register (con=0x%08x, osc=0x%08x).\n",</div><div class='add'>+			   con, osc);</div><div class='add'>+</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mode = FIELD_GET(MCP251XFD_REG_CON_OPMOD_MASK, con);</div><div class='add'>+	netdev_err(priv-&gt;ndev,</div><div class='add'>+		   "Controller failed to enter mode %s Mode (%u) and stays in %s Mode (%u) (con=0x%08x, osc=0x%08x).\n",</div><div class='add'>+		   mcp251xfd_get_mode_str(mode_req), mode_req,</div><div class='add'>+		   mcp251xfd_get_mode_str(mode), mode,</div><div class='add'>+		   con, osc);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_chip_set_mode(const struct mcp251xfd_priv *priv,</div><div class='add'>+			const u8 mode_req)</div><div class='add'>+{</div><div class='add'>+	return __mcp251xfd_chip_set_mode(priv, mode_req, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __maybe_unused</div><div class='add'>+mcp251xfd_chip_set_mode_nowait(const struct mcp251xfd_priv *priv,</div><div class='add'>+			       const u8 mode_req)</div><div class='add'>+{</div><div class='add'>+	return __mcp251xfd_chip_set_mode(priv, mode_req, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_chip_wait_for_osc_ready(const struct mcp251xfd_priv *priv,</div><div class='add'>+				  u32 osc_reference, u32 osc_mask)</div><div class='add'>+{</div><div class='add'>+	u32 osc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read_poll_timeout(priv-&gt;map_reg, MCP251XFD_REG_OSC, osc,</div><div class='add'>+				       !mcp251xfd_reg_invalid(osc) &amp;&amp;</div><div class='add'>+				       (osc &amp; osc_mask) == osc_reference,</div><div class='add'>+				       MCP251XFD_OSC_STAB_SLEEP_US,</div><div class='add'>+				       MCP251XFD_OSC_STAB_TIMEOUT_US);</div><div class='add'>+	if (err != -ETIMEDOUT)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_reg_invalid(osc)) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Failed to read Oscillator Configuration Register (osc=0x%08x).\n",</div><div class='add'>+			   osc);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_err(priv-&gt;ndev,</div><div class='add'>+		   "Timeout waiting for %s ready (osc=0x%08x, osc_reference=0x%08x, osc_mask=0x%08x).\n",</div><div class='add'>+		   mcp251xfd_get_osc_str(osc, osc_reference),</div><div class='add'>+		   osc, osc_reference, osc_mask);</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_wake(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 osc, osc_reference, osc_mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* For normal sleep on MCP2517FD and MCP2518FD, clearing</div><div class='add'>+	 * "Oscillator Disable" will wake the chip. For low power mode</div><div class='add'>+	 * on MCP2518FD, asserting the chip select will wake the</div><div class='add'>+	 * chip. Writing to the Oscillator register will wake it in</div><div class='add'>+	 * both cases.</div><div class='add'>+	 */</div><div class='add'>+	osc = FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK,</div><div class='add'>+			 MCP251XFD_REG_OSC_CLKODIV_10);</div><div class='add'>+</div><div class='add'>+	/* We cannot check for the PLL ready bit (either set or</div><div class='add'>+	 * unset), as the PLL might be enabled. This can happen if the</div><div class='add'>+	 * system reboots, while the mcp251xfd stays powered.</div><div class='add'>+	 */</div><div class='add'>+	osc_reference = MCP251XFD_REG_OSC_OSCRDY;</div><div class='add'>+	osc_mask = MCP251XFD_REG_OSC_OSCRDY;</div><div class='add'>+</div><div class='add'>+	/* If the controller is in Sleep Mode the following write only</div><div class='add'>+	 * removes the "Oscillator Disable" bit and powers it up. All</div><div class='add'>+	 * other bits are unaffected.</div><div class='add'>+	 */</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_OSC, osc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Sometimes the PLL is stuck enabled, the controller never</div><div class='add'>+	 * sets the OSC Ready bit, and we get an -ETIMEDOUT. Our</div><div class='add'>+	 * caller takes care of retry.</div><div class='add'>+	 */</div><div class='add'>+	return mcp251xfd_chip_wait_for_osc_ready(priv, osc_reference, osc_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mcp251xfd_chip_sleep(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;pll_enable) {</div><div class='add'>+		u32 osc;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		/* Turn off PLL */</div><div class='add'>+		osc = FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK,</div><div class='add'>+				 MCP251XFD_REG_OSC_CLKODIV_10);</div><div class='add'>+		err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_OSC, osc);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_err(priv-&gt;ndev,</div><div class='add'>+				   "Failed to disable PLL.\n");</div><div class='add'>+</div><div class='add'>+		priv-&gt;spi-&gt;max_speed_hz = priv-&gt;spi_max_speed_hz_slow;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mcp251xfd_chip_set_mode(priv, MCP251XFD_REG_CON_MODE_SLEEP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_softreset_do(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const __be16 cmd = mcp251xfd_cmd_reset();</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The Set Mode and SPI Reset command only works if the</div><div class='add'>+	 * controller is not in Sleep Mode.</div><div class='add'>+	 */</div><div class='add'>+	err = mcp251xfd_chip_wake(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_set_mode(priv, MCP251XFD_REG_CON_MODE_CONFIG);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* spi_write_then_read() works with non DMA-safe buffers */</div><div class='add'>+	return spi_write_then_read(priv-&gt;spi, &amp;cmd, sizeof(cmd), NULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_softreset_check(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 osc_reference, osc_mask;</div><div class='add'>+	u8 mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Check for reset defaults of OSC reg.</div><div class='add'>+	 * This will take care of stabilization period.</div><div class='add'>+	 */</div><div class='add'>+	osc_reference = MCP251XFD_REG_OSC_OSCRDY |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK,</div><div class='add'>+			   MCP251XFD_REG_OSC_CLKODIV_10);</div><div class='add'>+	osc_mask = osc_reference | MCP251XFD_REG_OSC_PLLRDY;</div><div class='add'>+	err = mcp251xfd_chip_wait_for_osc_ready(priv, osc_reference, osc_mask);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_get_mode(priv, &amp;mode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mode != MCP251XFD_REG_CON_MODE_CONFIG) {</div><div class='add'>+		netdev_info(priv-&gt;ndev,</div><div class='add'>+			    "Controller not in Config Mode after reset, but in %s Mode (%u).\n",</div><div class='add'>+			    mcp251xfd_get_mode_str(mode), mode);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_softreset(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MCP251XFD_SOFTRESET_RETRIES_MAX; i++) {</div><div class='add'>+		if (i)</div><div class='add'>+			netdev_info(priv-&gt;ndev,</div><div class='add'>+				    "Retrying to reset controller.\n");</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_chip_softreset_do(priv);</div><div class='add'>+		if (err == -ETIMEDOUT)</div><div class='add'>+			continue;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_chip_softreset_check(priv);</div><div class='add'>+		if (err == -ETIMEDOUT)</div><div class='add'>+			continue;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_clock_init(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 osc, osc_reference, osc_mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Activate Low Power Mode on Oscillator Disable. This only</div><div class='add'>+	 * works on the MCP2518FD. The MCP2517FD will go into normal</div><div class='add'>+	 * Sleep Mode instead.</div><div class='add'>+	 */</div><div class='add'>+	osc = MCP251XFD_REG_OSC_LPMEN |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK,</div><div class='add'>+			   MCP251XFD_REG_OSC_CLKODIV_10);</div><div class='add'>+	osc_reference = MCP251XFD_REG_OSC_OSCRDY;</div><div class='add'>+	osc_mask = MCP251XFD_REG_OSC_OSCRDY | MCP251XFD_REG_OSC_PLLRDY;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;pll_enable) {</div><div class='add'>+		osc |= MCP251XFD_REG_OSC_PLLEN;</div><div class='add'>+		osc_reference |= MCP251XFD_REG_OSC_PLLRDY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_OSC, osc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_wait_for_osc_ready(priv, osc_reference, osc_mask);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;spi-&gt;max_speed_hz = priv-&gt;spi_max_speed_hz_fast;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_timestamp_init(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Set Time Base Counter Prescaler to 1.</div><div class='add'>+	 *</div><div class='add'>+	 * This means an overflow of the 32 bit Time Base Counter</div><div class='add'>+	 * register at 40 MHz every 107 seconds.</div><div class='add'>+	 */</div><div class='add'>+	return regmap_write(priv-&gt;map_reg, MCP251XFD_REG_TSCON,</div><div class='add'>+			    MCP251XFD_REG_TSCON_TBCEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_set_bittiming(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	const struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	u32 tdcmod, val = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* CAN Control Register</div><div class='add'>+	 *</div><div class='add'>+	 * - no transmit bandwidth sharing</div><div class='add'>+	 * - config mode</div><div class='add'>+	 * - disable transmit queue</div><div class='add'>+	 * - store in transmit FIFO event</div><div class='add'>+	 * - transition to restricted operation mode on system error</div><div class='add'>+	 * - ESI is transmitted recessive when ESI of message is high or</div><div class='add'>+	 *   CAN controller error passive</div><div class='add'>+	 * - restricted retransmission attempts,</div><div class='add'>+	 *   use TQXCON_TXAT and FIFOCON_TXAT</div><div class='add'>+	 * - wake-up filter bits T11FILTER</div><div class='add'>+	 * - use CAN bus line filter for wakeup</div><div class='add'>+	 * - protocol exception is treated as a form error</div><div class='add'>+	 * - Do not compare data bytes</div><div class='add'>+	 */</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_CON_REQOP_MASK,</div><div class='add'>+			 MCP251XFD_REG_CON_MODE_CONFIG) |</div><div class='add'>+		MCP251XFD_REG_CON_STEF |</div><div class='add'>+		MCP251XFD_REG_CON_ESIGM |</div><div class='add'>+		MCP251XFD_REG_CON_RTXAT |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_CON_WFT_MASK,</div><div class='add'>+			   MCP251XFD_REG_CON_WFT_T11FILTER) |</div><div class='add'>+		MCP251XFD_REG_CON_WAKFIL |</div><div class='add'>+		MCP251XFD_REG_CON_PXEDIS;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO))</div><div class='add'>+		val |= MCP251XFD_REG_CON_ISOCRCEN;</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_CON, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Nominal Bit Time */</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_NBTCFG_BRP_MASK, bt-&gt;brp - 1) |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_NBTCFG_TSEG1_MASK,</div><div class='add'>+			   bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1) |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_NBTCFG_TSEG2_MASK,</div><div class='add'>+			   bt-&gt;phase_seg2 - 1) |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_NBTCFG_SJW_MASK, bt-&gt;sjw - 1);</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_NBTCFG, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Data Bit Time */</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_DBTCFG_BRP_MASK, dbt-&gt;brp - 1) |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_DBTCFG_TSEG1_MASK,</div><div class='add'>+			   dbt-&gt;prop_seg + dbt-&gt;phase_seg1 - 1) |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_DBTCFG_TSEG2_MASK,</div><div class='add'>+			   dbt-&gt;phase_seg2 - 1) |</div><div class='add'>+		FIELD_PREP(MCP251XFD_REG_DBTCFG_SJW_MASK, dbt-&gt;sjw - 1);</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_DBTCFG, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Transmitter Delay Compensation */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_TDC_AUTO)</div><div class='add'>+		tdcmod = MCP251XFD_REG_TDC_TDCMOD_AUTO;</div><div class='add'>+	else if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_TDC_MANUAL)</div><div class='add'>+		tdcmod = MCP251XFD_REG_TDC_TDCMOD_MANUAL;</div><div class='add'>+	else</div><div class='add'>+		tdcmod = MCP251XFD_REG_TDC_TDCMOD_DISABLED;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_TDC_TDCMOD_MASK, tdcmod) |</div><div class='add'>+	      FIELD_PREP(MCP251XFD_REG_TDC_TDCV_MASK, priv-&gt;can.fd.tdc.tdcv) |</div><div class='add'>+	      FIELD_PREP(MCP251XFD_REG_TDC_TDCO_MASK, priv-&gt;can.fd.tdc.tdco);</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;map_reg, MCP251XFD_REG_TDC, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_rx_int_enable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val, mask;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;rx_int)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Configure PIN1 as RX Interrupt:</div><div class='add'>+	 *</div><div class='add'>+	 * PIN1 must be Input, otherwise there is a glitch on the</div><div class='add'>+	 * rx-INT line. It happens between setting the PIN as output</div><div class='add'>+	 * (in the first byte of the SPI transfer) and configuring the</div><div class='add'>+	 * PIN as interrupt (in the last byte of the SPI transfer).</div><div class='add'>+	 */</div><div class='add'>+	val = MCP251XFD_REG_IOCON_TRIS(1);</div><div class='add'>+	mask = MCP251XFD_REG_IOCON_TRIS(1) | MCP251XFD_REG_IOCON_PM(1);</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_rx_int_disable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;rx_int)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Configure PIN1 as GPIO Input */</div><div class='add'>+	val = MCP251XFD_REG_IOCON_PM(1) | MCP251XFD_REG_IOCON_TRIS(1);</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON, val, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_ecc_init(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_ecc *ecc = &amp;priv-&gt;ecc;</div><div class='add'>+	void *ram;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ecc-&gt;ecc_stat = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_ECC)</div><div class='add'>+		val = MCP251XFD_REG_ECCCON_ECCEN;</div><div class='add'>+</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_ECCCON,</div><div class='add'>+				 MCP251XFD_REG_ECCCON_ECCEN, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ram = kzalloc(MCP251XFD_RAM_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!ram)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = regmap_raw_write(priv-&gt;map_reg, MCP251XFD_RAM_START, ram,</div><div class='add'>+			       MCP251XFD_RAM_SIZE);</div><div class='add'>+	kfree(ram);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 mcp251xfd_get_normal_mode(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u8 mode;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='add'>+		mode = MCP251XFD_REG_CON_MODE_INT_LOOPBACK;</div><div class='add'>+	else if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		mode = MCP251XFD_REG_CON_MODE_LISTENONLY;</div><div class='add'>+	else if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		mode = MCP251XFD_REG_CON_MODE_MIXED;</div><div class='add'>+	else</div><div class='add'>+		mode = MCP251XFD_REG_CON_MODE_CAN2_0;</div><div class='add'>+</div><div class='add'>+	return mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+__mcp251xfd_chip_set_normal_mode(const struct mcp251xfd_priv *priv,</div><div class='add'>+				 bool nowait)</div><div class='add'>+{</div><div class='add'>+	u8 mode;</div><div class='add'>+</div><div class='add'>+	mode = mcp251xfd_get_normal_mode(priv);</div><div class='add'>+</div><div class='add'>+	return __mcp251xfd_chip_set_mode(priv, mode, nowait);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_chip_set_normal_mode(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return __mcp251xfd_chip_set_normal_mode(priv, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_chip_set_normal_mode_nowait(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return __mcp251xfd_chip_set_normal_mode(priv, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_interrupts_enable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	val = MCP251XFD_REG_CRC_FERRIE | MCP251XFD_REG_CRC_CRCERRIE;</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_CRC, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = MCP251XFD_REG_ECCCON_DEDIE | MCP251XFD_REG_ECCCON_SECIE;</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_ECCCON, val, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = MCP251XFD_REG_INT_CERRIE |</div><div class='add'>+		MCP251XFD_REG_INT_SERRIE |</div><div class='add'>+		MCP251XFD_REG_INT_RXOVIE |</div><div class='add'>+		MCP251XFD_REG_INT_TXATIE |</div><div class='add'>+		MCP251XFD_REG_INT_SPICRCIE |</div><div class='add'>+		MCP251XFD_REG_INT_ECCIE |</div><div class='add'>+		MCP251XFD_REG_INT_TEFIE |</div><div class='add'>+		MCP251XFD_REG_INT_MODIE |</div><div class='add'>+		MCP251XFD_REG_INT_RXIE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		val |= MCP251XFD_REG_INT_IVMIE;</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;map_reg, MCP251XFD_REG_INT, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_interrupts_disable(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_INT, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mask = MCP251XFD_REG_ECCCON_DEDIE | MCP251XFD_REG_ECCCON_SECIE;</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_ECCCON,</div><div class='add'>+				 mask, 0x0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;map_reg, MCP251XFD_REG_CRC, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_chip_stop(struct mcp251xfd_priv *priv,</div><div class='add'>+				const enum can_state state)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;can.state = state;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_chip_interrupts_disable(priv);</div><div class='add'>+	mcp251xfd_chip_rx_int_disable(priv);</div><div class='add'>+	mcp251xfd_timestamp_stop(priv);</div><div class='add'>+	mcp251xfd_chip_set_mode(priv, MCP251XFD_REG_CON_MODE_CONFIG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_chip_start(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_timestamp_init(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_timestamp_start(priv);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_set_bittiming(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_rx_int_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_ecc_init(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_ring_init(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_fifo_init(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_set_normal_mode(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_stop;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_chip_stop:</div><div class='add'>+	mcp251xfd_dump(priv);</div><div class='add'>+	mcp251xfd_chip_stop(priv, CAN_STATE_STOPPED);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		err = mcp251xfd_chip_start(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_chip_interrupts_enable(priv);</div><div class='add'>+		if (err) {</div><div class='add'>+			mcp251xfd_chip_stop(priv, CAN_STATE_STOPPED);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __mcp251xfd_get_berr_counter(const struct net_device *ndev,</div><div class='add'>+					struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 trec;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_TREC, &amp;trec);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (trec &amp; MCP251XFD_REG_TREC_TXBO)</div><div class='add'>+		bec-&gt;txerr = CAN_BUS_OFF_THRESHOLD;</div><div class='add'>+	else</div><div class='add'>+		bec-&gt;txerr = FIELD_GET(MCP251XFD_REG_TREC_TEC_MASK, trec);</div><div class='add'>+	bec-&gt;rxerr = FIELD_GET(MCP251XFD_REG_TREC_REC_MASK, trec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_get_berr_counter(const struct net_device *ndev,</div><div class='add'>+				      struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	/* Avoid waking up the controller if the interface is down */</div><div class='add'>+	if (!(ndev-&gt;flags &amp; IFF_UP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* The controller is powered down during Bus Off, use saved</div><div class='add'>+	 * bec values.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;can.state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		*bec = priv-&gt;bec;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return __mcp251xfd_get_berr_counter(ndev, bec);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+mcp251xfd_alloc_can_err_skb(struct mcp251xfd_priv *priv,</div><div class='add'>+			    struct can_frame **cf, u32 *ts_raw)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_get_timestamp_raw(priv, ts_raw);</div><div class='add'>+	if (err)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(priv-&gt;ndev, cf);</div><div class='add'>+	if (skb)</div><div class='add'>+		mcp251xfd_skb_set_timestamp_raw(priv, skb, *ts_raw);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_handle_rxovif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct mcp251xfd_rx_ring *ring;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	u32 ts_raw, rxovif;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_over_errors++;</div><div class='add'>+	stats-&gt;rx_errors++;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_RXOVIF, &amp;rxovif);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_for_each_rx_ring(priv, ring, i) {</div><div class='add'>+		if (!(rxovif &amp; BIT(ring-&gt;fifo_nr)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* If SERRIF is active, there was a RX MAB overflow. */</div><div class='add'>+		if (priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_SERRIF) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				netdev_dbg(priv-&gt;ndev,</div><div class='add'>+					   "RX-%d: MAB overflow detected.\n",</div><div class='add'>+					   ring-&gt;nr);</div><div class='add'>+		} else {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				netdev_dbg(priv-&gt;ndev,</div><div class='add'>+					   "RX-%d: FIFO overflow.\n",</div><div class='add'>+					   ring-&gt;nr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = regmap_update_bits(priv-&gt;map_reg,</div><div class='add'>+					 MCP251XFD_REG_FIFOSTA(ring-&gt;fifo_nr),</div><div class='add'>+					 MCP251XFD_REG_FIFOSTA_RXOVIF,</div><div class='add'>+					 0x0);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = mcp251xfd_alloc_can_err_skb(priv, &amp;cf, &amp;ts_raw);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, ts_raw);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_handle_txatif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	netdev_info(priv-&gt;ndev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_handle_ivmif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	u32 bdiag1, ts_raw;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_get_timestamp_raw(priv, &amp;ts_raw);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_BDIAG1, &amp;bdiag1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Write 0s to clear error bits, don't write 1s to non active</div><div class='add'>+	 * bits, as they will be set.</div><div class='add'>+	 */</div><div class='add'>+	err = regmap_write(priv-&gt;map_reg, MCP251XFD_REG_BDIAG1, 0x0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(priv-&gt;ndev, &amp;cf);</div><div class='add'>+	if (cf)</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+</div><div class='add'>+	/* Controller misconfiguration */</div><div class='add'>+	if (WARN_ON(bdiag1 &amp; MCP251XFD_REG_BDIAG1_DLCMM))</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "recv'd DLC is larger than PLSIZE of FIFO element.");</div><div class='add'>+</div><div class='add'>+	/* RX errors */</div><div class='add'>+	if (bdiag1 &amp; (MCP251XFD_REG_BDIAG1_DCRCERR |</div><div class='add'>+		      MCP251XFD_REG_BDIAG1_NCRCERR)) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "CRC error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+	}</div><div class='add'>+	if (bdiag1 &amp; (MCP251XFD_REG_BDIAG1_DSTUFERR |</div><div class='add'>+		      MCP251XFD_REG_BDIAG1_NSTUFERR)) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "Stuff error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+	}</div><div class='add'>+	if (bdiag1 &amp; (MCP251XFD_REG_BDIAG1_DFORMERR |</div><div class='add'>+		      MCP251XFD_REG_BDIAG1_NFORMERR)) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "Format error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TX errors */</div><div class='add'>+	if (bdiag1 &amp; MCP251XFD_REG_BDIAG1_NACKERR) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "NACK error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (bdiag1 &amp; (MCP251XFD_REG_BDIAG1_DBIT1ERR |</div><div class='add'>+		      MCP251XFD_REG_BDIAG1_NBIT1ERR)) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "Bit1 error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX | CAN_ERR_PROT_BIT1;</div><div class='add'>+	}</div><div class='add'>+	if (bdiag1 &amp; (MCP251XFD_REG_BDIAG1_DBIT0ERR |</div><div class='add'>+		      MCP251XFD_REG_BDIAG1_NBIT0ERR)) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "Bit0 error\n");</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX | CAN_ERR_PROT_BIT0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!cf)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_skb_set_timestamp_raw(priv, skb, ts_raw);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, ts_raw);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_handle_cerrif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	enum can_state new_state, rx_state, tx_state;</div><div class='add'>+	u32 trec, ts_raw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_TREC, &amp;trec);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (trec &amp; MCP251XFD_REG_TREC_TXBO)</div><div class='add'>+		tx_state = CAN_STATE_BUS_OFF;</div><div class='add'>+	else if (trec &amp; MCP251XFD_REG_TREC_TXBP)</div><div class='add'>+		tx_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	else if (trec &amp; MCP251XFD_REG_TREC_TXWARN)</div><div class='add'>+		tx_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+	else</div><div class='add'>+		tx_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	if (trec &amp; MCP251XFD_REG_TREC_RXBP)</div><div class='add'>+		rx_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	else if (trec &amp; MCP251XFD_REG_TREC_RXWARN)</div><div class='add'>+		rx_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+	else</div><div class='add'>+		rx_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	new_state = max(tx_state, rx_state);</div><div class='add'>+	if (new_state == priv-&gt;can.state)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* The skb allocation might fail, but can_change_state()</div><div class='add'>+	 * handles cf == NULL.</div><div class='add'>+	 */</div><div class='add'>+	skb = mcp251xfd_alloc_can_err_skb(priv, &amp;cf, &amp;ts_raw);</div><div class='add'>+	can_change_state(priv-&gt;ndev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		/* As we're going to switch off the chip now, let's</div><div class='add'>+		 * save the error counters and return them to</div><div class='add'>+		 * userspace, if do_get_berr_counter() is called while</div><div class='add'>+		 * the chip is in Bus Off.</div><div class='add'>+		 */</div><div class='add'>+		err = __mcp251xfd_get_berr_counter(priv-&gt;ndev, &amp;priv-&gt;bec);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		mcp251xfd_chip_stop(priv, CAN_STATE_BUS_OFF);</div><div class='add'>+		can_bus_off(priv-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (new_state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		struct can_berr_counter bec;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_get_berr_counter(priv-&gt;ndev, &amp;bec);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, ts_raw);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_modif(const struct mcp251xfd_priv *priv, bool *set_normal_mode)</div><div class='add'>+{</div><div class='add'>+	const u8 mode_reference = mcp251xfd_get_normal_mode(priv);</div><div class='add'>+	u8 mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_get_mode(priv, &amp;mode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mode == mode_reference) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "Controller changed into %s Mode (%u).\n",</div><div class='add'>+			   mcp251xfd_get_mode_str(mode), mode);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* According to MCP2517FD errata DS80000792C 1., during a TX</div><div class='add'>+	 * MAB underflow, the controller will transition to Restricted</div><div class='add'>+	 * Operation Mode or Listen Only Mode (depending on SERR2LOM).</div><div class='add'>+	 *</div><div class='add'>+	 * However this is not always the case. If SERR2LOM is</div><div class='add'>+	 * configured for Restricted Operation Mode (SERR2LOM not set)</div><div class='add'>+	 * the MCP2517FD will sometimes transition to Listen Only Mode</div><div class='add'>+	 * first. When polling this bit we see that it will transition</div><div class='add'>+	 * to Restricted Operation Mode shortly after.</div><div class='add'>+	 */</div><div class='add'>+	if ((priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_MAB_NO_WARN) &amp;&amp;</div><div class='add'>+	    (mode == MCP251XFD_REG_CON_MODE_RESTRICTED ||</div><div class='add'>+	     mode == MCP251XFD_REG_CON_MODE_LISTENONLY))</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "Controller changed into %s Mode (%u).\n",</div><div class='add'>+			   mcp251xfd_get_mode_str(mode), mode);</div><div class='add'>+	else</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Controller changed into %s Mode (%u).\n",</div><div class='add'>+			   mcp251xfd_get_mode_str(mode), mode);</div><div class='add'>+</div><div class='add'>+	/* After the application requests Normal mode, the controller</div><div class='add'>+	 * will automatically attempt to retransmit the message that</div><div class='add'>+	 * caused the TX MAB underflow.</div><div class='add'>+	 *</div><div class='add'>+	 * However, if there is an ECC error in the TX-RAM, we first</div><div class='add'>+	 * have to reload the tx-object before requesting Normal</div><div class='add'>+	 * mode. This is done later in mcp251xfd_handle_eccif().</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_ECCIF) {</div><div class='add'>+		*set_normal_mode = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mcp251xfd_chip_set_normal_mode_nowait(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_handle_serrif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_ecc *ecc = &amp;priv-&gt;ecc;</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	bool handled = false;</div><div class='add'>+</div><div class='add'>+	/* TX MAB underflow</div><div class='add'>+	 *</div><div class='add'>+	 * According to MCP2517FD Errata DS80000792C 1. a TX MAB</div><div class='add'>+	 * underflow is indicated by SERRIF and MODIF.</div><div class='add'>+	 *</div><div class='add'>+	 * In addition to the effects mentioned in the Errata, there</div><div class='add'>+	 * are Bus Errors due to the aborted CAN frame, so a IVMIF</div><div class='add'>+	 * will be seen as well.</div><div class='add'>+	 *</div><div class='add'>+	 * Sometimes there is an ECC error in the TX-RAM, which leads</div><div class='add'>+	 * to a TX MAB underflow.</div><div class='add'>+	 *</div><div class='add'>+	 * However, probably due to a race condition, there is no</div><div class='add'>+	 * associated MODIF pending.</div><div class='add'>+	 *</div><div class='add'>+	 * Further, there are situations, where the SERRIF is caused</div><div class='add'>+	 * by an ECC error in the TX-RAM, but not even the ECCIF is</div><div class='add'>+	 * set. This only seems to happen _after_ the first occurrence</div><div class='add'>+	 * of a ECCIF (which is tracked in ecc-&gt;cnt).</div><div class='add'>+	 *</div><div class='add'>+	 * Treat all as a known system errors..</div><div class='add'>+	 */</div><div class='add'>+	if ((priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_MODIF &amp;&amp;</div><div class='add'>+	     priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_IVMIF) ||</div><div class='add'>+	    priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_ECCIF ||</div><div class='add'>+	    ecc-&gt;cnt) {</div><div class='add'>+		const char *msg;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_ECCIF ||</div><div class='add'>+		    ecc-&gt;cnt)</div><div class='add'>+			msg = "TX MAB underflow due to ECC error detected.";</div><div class='add'>+		else</div><div class='add'>+			msg = "TX MAB underflow detected.";</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_MAB_NO_WARN)</div><div class='add'>+			netdev_dbg(priv-&gt;ndev, "%s\n", msg);</div><div class='add'>+		else</div><div class='add'>+			netdev_info(priv-&gt;ndev, "%s\n", msg);</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_aborted_errors++;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		handled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RX MAB overflow</div><div class='add'>+	 *</div><div class='add'>+	 * According to MCP2517FD Errata DS80000792C 1. a RX MAB</div><div class='add'>+	 * overflow is indicated by SERRIF.</div><div class='add'>+	 *</div><div class='add'>+	 * In addition to the effects mentioned in the Errata, (most</div><div class='add'>+	 * of the times) a RXOVIF is raised, if the FIFO that is being</div><div class='add'>+	 * received into has the RXOVIE activated (and we have enabled</div><div class='add'>+	 * RXOVIE on all FIFOs).</div><div class='add'>+	 *</div><div class='add'>+	 * Sometimes there is no RXOVIF just a RXIF is pending.</div><div class='add'>+	 *</div><div class='add'>+	 * Treat all as a known system errors..</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_RXOVIF ||</div><div class='add'>+	    priv-&gt;regs_status.intf &amp; MCP251XFD_REG_INT_RXIF) {</div><div class='add'>+		stats-&gt;rx_dropped++;</div><div class='add'>+		handled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!handled)</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Unhandled System Error Interrupt (intf=0x%08x)!\n",</div><div class='add'>+			   priv-&gt;regs_status.intf);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_eccif_recover(struct mcp251xfd_priv *priv, u8 nr)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	struct mcp251xfd_ecc *ecc = &amp;priv-&gt;ecc;</div><div class='add'>+	struct mcp251xfd_tx_obj *tx_obj;</div><div class='add'>+	u8 chip_tx_tail, tx_tail, offset;</div><div class='add'>+	u16 addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	addr = FIELD_GET(MCP251XFD_REG_ECCSTAT_ERRADDR_MASK, ecc-&gt;ecc_stat);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_tx_tail_get_from_chip(priv, &amp;chip_tx_tail);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	tx_tail = mcp251xfd_get_tx_tail(tx_ring);</div><div class='add'>+	offset = (nr - chip_tx_tail) &amp; (tx_ring-&gt;obj_num - 1);</div><div class='add'>+</div><div class='add'>+	/* Bail out if one of the following is met:</div><div class='add'>+	 * - tx_tail information is inconsistent</div><div class='add'>+	 * - for mcp2517fd: offset not 0</div><div class='add'>+	 * - for mcp2518fd: offset not 0 or 1</div><div class='add'>+	 */</div><div class='add'>+	if (chip_tx_tail != tx_tail ||</div><div class='add'>+	    !(offset == 0 || (offset == 1 &amp;&amp; (mcp251xfd_is_2518FD(priv) ||</div><div class='add'>+					      mcp251xfd_is_251863(priv))))) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "ECC Error information inconsistent (addr=0x%04x, nr=%d, tx_tail=0x%08x(%d), chip_tx_tail=%d, offset=%d).\n",</div><div class='add'>+			   addr, nr, tx_ring-&gt;tail, tx_tail, chip_tx_tail,</div><div class='add'>+			   offset);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(priv-&gt;ndev,</div><div class='add'>+		    "Recovering %s ECC Error at address 0x%04x (in TX-RAM, tx_obj=%d, tx_tail=0x%08x(%d), offset=%d).\n",</div><div class='add'>+		    ecc-&gt;ecc_stat &amp; MCP251XFD_REG_ECCSTAT_SECIF ?</div><div class='add'>+		    "Single" : "Double",</div><div class='add'>+		    addr, nr, tx_ring-&gt;tail, tx_tail, offset);</div><div class='add'>+</div><div class='add'>+	/* reload tx_obj into controller RAM ... */</div><div class='add'>+	tx_obj = &amp;tx_ring-&gt;obj[nr];</div><div class='add'>+	err = spi_sync_transfer(priv-&gt;spi, tx_obj-&gt;xfer, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* ... and trigger retransmit */</div><div class='add'>+	return mcp251xfd_chip_set_normal_mode(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_eccif(struct mcp251xfd_priv *priv, bool set_normal_mode)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_ecc *ecc = &amp;priv-&gt;ecc;</div><div class='add'>+	const char *msg;</div><div class='add'>+	bool in_tx_ram;</div><div class='add'>+	u32 ecc_stat;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8 nr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_ECCSTAT, &amp;ecc_stat);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_ECCSTAT,</div><div class='add'>+				 MCP251XFD_REG_ECCSTAT_IF_MASK, ~ecc_stat);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Check if ECC error occurred in TX-RAM */</div><div class='add'>+	addr = FIELD_GET(MCP251XFD_REG_ECCSTAT_ERRADDR_MASK, ecc_stat);</div><div class='add'>+	err = mcp251xfd_get_tx_nr_by_addr(priv-&gt;tx, &amp;nr, addr);</div><div class='add'>+	if (!err)</div><div class='add'>+		in_tx_ram = true;</div><div class='add'>+	else if (err == -ENOENT)</div><div class='add'>+		in_tx_ram = false;</div><div class='add'>+	else</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Errata Reference:</div><div class='add'>+	 * mcp2517fd: DS80000789C 3., mcp2518fd: DS80000792E 2.,</div><div class='add'>+	 * mcp251863: DS80000984A 2.</div><div class='add'>+	 *</div><div class='add'>+	 * ECC single error correction does not work in all cases:</div><div class='add'>+	 *</div><div class='add'>+	 * Fix/Work Around:</div><div class='add'>+	 * Enable single error correction and double error detection</div><div class='add'>+	 * interrupts by setting SECIE and DEDIE. Handle SECIF as a</div><div class='add'>+	 * detection interrupt and do not rely on the error</div><div class='add'>+	 * correction. Instead, handle both interrupts as a</div><div class='add'>+	 * notification that the RAM word at ERRADDR was corrupted.</div><div class='add'>+	 */</div><div class='add'>+	if (ecc_stat &amp; MCP251XFD_REG_ECCSTAT_SECIF)</div><div class='add'>+		msg = "Single ECC Error detected at address";</div><div class='add'>+	else if (ecc_stat &amp; MCP251XFD_REG_ECCSTAT_DEDIF)</div><div class='add'>+		msg = "Double ECC Error detected at address";</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!in_tx_ram) {</div><div class='add'>+		ecc-&gt;ecc_stat = 0;</div><div class='add'>+</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "%s 0x%04x.\n", msg, addr);</div><div class='add'>+	} else {</div><div class='add'>+		/* Re-occurring error? */</div><div class='add'>+		if (ecc-&gt;ecc_stat == ecc_stat) {</div><div class='add'>+			ecc-&gt;cnt++;</div><div class='add'>+		} else {</div><div class='add'>+			ecc-&gt;ecc_stat = ecc_stat;</div><div class='add'>+			ecc-&gt;cnt = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev_info(priv-&gt;ndev,</div><div class='add'>+			    "%s 0x%04x (in TX-RAM, tx_obj=%d), occurred %d time%s.\n",</div><div class='add'>+			    msg, addr, nr, ecc-&gt;cnt, ecc-&gt;cnt &gt; 1 ? "s" : "");</div><div class='add'>+</div><div class='add'>+		if (ecc-&gt;cnt &gt;= MCP251XFD_ECC_CNT_MAX)</div><div class='add'>+			return mcp251xfd_handle_eccif_recover(priv, nr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (set_normal_mode)</div><div class='add'>+		return mcp251xfd_chip_set_normal_mode_nowait(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_handle_spicrcif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 crc;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_CRC, &amp;crc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_CRC,</div><div class='add'>+				 MCP251XFD_REG_CRC_IF_MASK,</div><div class='add'>+				 ~crc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (crc &amp; MCP251XFD_REG_CRC_FERRIF)</div><div class='add'>+		netdev_notice(priv-&gt;ndev, "CRC write command format error.\n");</div><div class='add'>+	else if (crc &amp; MCP251XFD_REG_CRC_CRCERRIF)</div><div class='add'>+		netdev_notice(priv-&gt;ndev,</div><div class='add'>+			      "CRC write error detected. CRC=0x%04lx.\n",</div><div class='add'>+			      FIELD_GET(MCP251XFD_REG_CRC_MASK, crc));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_read_regs_status(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const int val_bytes = regmap_get_val_bytes(priv-&gt;map_reg);</div><div class='add'>+	size_t len;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;rx_ring_num == 1)</div><div class='add'>+		len = sizeof(priv-&gt;regs_status.intf);</div><div class='add'>+	else</div><div class='add'>+		len = sizeof(priv-&gt;regs_status);</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_read(priv-&gt;map_reg, MCP251XFD_REG_INT,</div><div class='add'>+				&amp;priv-&gt;regs_status, len / val_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mcp251xfd_handle(priv, irq, ...) \</div><div class='add'>+({ \</div><div class='add'>+	struct mcp251xfd_priv *_priv = (priv); \</div><div class='add'>+	int err; \</div><div class='add'>+\</div><div class='add'>+	err = mcp251xfd_handle_##irq(_priv, ## __VA_ARGS__); \</div><div class='add'>+	if (err) \</div><div class='add'>+		netdev_err(_priv-&gt;ndev, \</div><div class='add'>+			"IRQ handler mcp251xfd_handle_%s() returned %d.\n", \</div><div class='add'>+			__stringify(irq), err); \</div><div class='add'>+	err; \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static irqreturn_t mcp251xfd_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = dev_id;</div><div class='add'>+	irqreturn_t handled = IRQ_NONE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;rx_int)</div><div class='add'>+		do {</div><div class='add'>+			int rx_pending;</div><div class='add'>+</div><div class='add'>+			rx_pending = gpiod_get_value_cansleep(priv-&gt;rx_int);</div><div class='add'>+			if (!rx_pending)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			/* Assume 1st RX-FIFO pending, if other FIFOs</div><div class='add'>+			 * are pending the main IRQ handler will take</div><div class='add'>+			 * care.</div><div class='add'>+			 */</div><div class='add'>+			priv-&gt;regs_status.rxif = BIT(priv-&gt;rx[0]-&gt;fifo_nr);</div><div class='add'>+			err = mcp251xfd_handle(priv, rxif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+</div><div class='add'>+			handled = IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+			/* We don't know which RX-FIFO is pending, but only</div><div class='add'>+			 * handle the 1st RX-FIFO. Leave loop here if we have</div><div class='add'>+			 * more than 1 RX-FIFO to avoid starvation.</div><div class='add'>+			 */</div><div class='add'>+		} while (priv-&gt;rx_ring_num == 1);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		u32 intf_pending, intf_pending_clearable;</div><div class='add'>+		bool set_normal_mode = false;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_read_regs_status(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_fail;</div><div class='add'>+</div><div class='add'>+		intf_pending = FIELD_GET(MCP251XFD_REG_INT_IF_MASK,</div><div class='add'>+					 priv-&gt;regs_status.intf) &amp;</div><div class='add'>+			FIELD_GET(MCP251XFD_REG_INT_IE_MASK,</div><div class='add'>+				  priv-&gt;regs_status.intf);</div><div class='add'>+</div><div class='add'>+		if (!(intf_pending)) {</div><div class='add'>+			can_rx_offload_threaded_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+			return handled;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Some interrupts must be ACKed in the</div><div class='add'>+		 * MCP251XFD_REG_INT register.</div><div class='add'>+		 * - First ACK then handle, to avoid lost-IRQ race</div><div class='add'>+		 *   condition on fast re-occurring interrupts.</div><div class='add'>+		 * - Write "0" to clear active IRQs, "1" to all other,</div><div class='add'>+		 *   to avoid r/m/w race condition on the</div><div class='add'>+		 *   MCP251XFD_REG_INT register.</div><div class='add'>+		 */</div><div class='add'>+		intf_pending_clearable = intf_pending &amp;</div><div class='add'>+			MCP251XFD_REG_INT_IF_CLEARABLE_MASK;</div><div class='add'>+		if (intf_pending_clearable) {</div><div class='add'>+			err = regmap_update_bits(priv-&gt;map_reg,</div><div class='add'>+						 MCP251XFD_REG_INT,</div><div class='add'>+						 MCP251XFD_REG_INT_IF_MASK,</div><div class='add'>+						 ~intf_pending_clearable);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_MODIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, modif, &amp;set_normal_mode);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_RXIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, rxif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_TEFIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, tefif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_RXOVIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, rxovif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_TXATIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, txatif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_IVMIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, ivmif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_SERRIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, serrif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_ECCIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, eccif, set_normal_mode);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_SPICRCIF) {</div><div class='add'>+			err = mcp251xfd_handle(priv, spicrcif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* On the MCP2527FD and MCP2518FD, we don't get a</div><div class='add'>+		 * CERRIF IRQ on the transition TX ERROR_WARNING -&gt; TX</div><div class='add'>+		 * ERROR_ACTIVE.</div><div class='add'>+		 */</div><div class='add'>+		if (intf_pending &amp; MCP251XFD_REG_INT_CERRIF ||</div><div class='add'>+		    priv-&gt;can.state &gt; CAN_STATE_ERROR_ACTIVE) {</div><div class='add'>+			err = mcp251xfd_handle(priv, cerrif);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_fail;</div><div class='add'>+</div><div class='add'>+			/* In Bus Off we completely shut down the</div><div class='add'>+			 * controller. Every subsequent register read</div><div class='add'>+			 * will read bogus data, and if</div><div class='add'>+			 * MCP251XFD_QUIRK_CRC_REG is enabled the CRC</div><div class='add'>+			 * check will fail, too. So leave IRQ handler</div><div class='add'>+			 * directly.</div><div class='add'>+			 */</div><div class='add'>+			if (priv-&gt;can.state == CAN_STATE_BUS_OFF) {</div><div class='add'>+				can_rx_offload_threaded_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+				return IRQ_HANDLED;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+out_fail:</div><div class='add'>+	can_rx_offload_threaded_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	netdev_err(priv-&gt;ndev, "IRQ handler returned %d (intf=0x%08x).\n",</div><div class='add'>+		   err, priv-&gt;regs_status.intf);</div><div class='add'>+	mcp251xfd_dump(priv);</div><div class='add'>+	mcp251xfd_chip_interrupts_disable(priv);</div><div class='add'>+	mcp251xfd_timestamp_stop(priv);</div><div class='add'>+</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	const struct spi_device *spi = priv-&gt;spi;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = open_candev(ndev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pm_runtime_resume_and_get(ndev-&gt;dev.parent);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -ETIMEDOUT || err == -ENODEV)</div><div class='add'>+			pm_runtime_set_suspended(ndev-&gt;dev.parent);</div><div class='add'>+		goto out_close_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_ring_alloc(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_pm_runtime_put;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_transceiver_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_mcp251xfd_ring_free;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_timestamp_init(priv);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_start(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_transceiver_disable;</div><div class='add'>+</div><div class='add'>+	clear_bit(MCP251XFD_FLAGS_DOWN, priv-&gt;flags);</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	priv-&gt;wq = alloc_ordered_workqueue("%s-mcp251xfd_wq",</div><div class='add'>+					   WQ_FREEZABLE | WQ_MEM_RECLAIM,</div><div class='add'>+					   dev_name(&amp;spi-&gt;dev));</div><div class='add'>+	if (!priv-&gt;wq) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_can_rx_offload_disable;</div><div class='add'>+	}</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;tx_work, mcp251xfd_tx_obj_write_sync);</div><div class='add'>+</div><div class='add'>+	err = request_threaded_irq(spi-&gt;irq, NULL, mcp251xfd_irq,</div><div class='add'>+				   IRQF_SHARED | IRQF_ONESHOT,</div><div class='add'>+				   dev_name(&amp;spi-&gt;dev), priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_destroy_workqueue;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_interrupts_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_irq;</div><div class='add'>+</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_irq:</div><div class='add'>+	free_irq(spi-&gt;irq, priv);</div><div class='add'>+out_destroy_workqueue:</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+out_can_rx_offload_disable:</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	set_bit(MCP251XFD_FLAGS_DOWN, priv-&gt;flags);</div><div class='add'>+out_transceiver_disable:</div><div class='add'>+	mcp251xfd_transceiver_disable(priv);</div><div class='add'>+out_mcp251xfd_ring_free:</div><div class='add'>+	mcp251xfd_ring_free(priv);</div><div class='add'>+out_pm_runtime_put:</div><div class='add'>+	mcp251xfd_chip_stop(priv, CAN_STATE_STOPPED);</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+out_close_candev:</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	set_bit(MCP251XFD_FLAGS_DOWN, priv-&gt;flags);</div><div class='add'>+	hrtimer_cancel(&amp;priv-&gt;rx_irq_timer);</div><div class='add'>+	hrtimer_cancel(&amp;priv-&gt;tx_irq_timer);</div><div class='add'>+	mcp251xfd_chip_interrupts_disable(priv);</div><div class='add'>+	free_irq(ndev-&gt;irq, priv);</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	mcp251xfd_chip_stop(priv, CAN_STATE_STOPPED);</div><div class='add'>+	mcp251xfd_transceiver_disable(priv);</div><div class='add'>+	mcp251xfd_ring_free(priv);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops mcp251xfd_netdev_ops = {</div><div class='add'>+	.ndo_open = mcp251xfd_open,</div><div class='add'>+	.ndo_stop = mcp251xfd_stop,</div><div class='add'>+	.ndo_start_xmit	= mcp251xfd_start_xmit,</div><div class='add'>+	.ndo_hwtstamp_get = can_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = can_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_register_quirks(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct spi_device *spi = priv-&gt;spi;</div><div class='add'>+	const struct spi_controller *ctlr = spi-&gt;controller;</div><div class='add'>+</div><div class='add'>+	if (ctlr-&gt;flags &amp; SPI_CONTROLLER_HALF_DUPLEX)</div><div class='add'>+		priv-&gt;devtype_data.quirks |= MCP251XFD_QUIRK_HALF_DUPLEX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_register_chip_detect(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	const struct mcp251xfd_devtype_data *devtype_data;</div><div class='add'>+	u32 osc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The OSC_LPMEN is only supported on MCP2518FD and MCP251863,</div><div class='add'>+	 * so use it to autodetect the model.</div><div class='add'>+	 */</div><div class='add'>+	err = regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_OSC,</div><div class='add'>+				 MCP251XFD_REG_OSC_LPMEN,</div><div class='add'>+				 MCP251XFD_REG_OSC_LPMEN);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_OSC, &amp;osc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (osc &amp; MCP251XFD_REG_OSC_LPMEN) {</div><div class='add'>+		/* We cannot distinguish between MCP2518FD and</div><div class='add'>+		 * MCP251863. If firmware specifies MCP251863, keep</div><div class='add'>+		 * it, otherwise set to MCP2518FD.</div><div class='add'>+		 */</div><div class='add'>+		if (mcp251xfd_is_251863(priv))</div><div class='add'>+			devtype_data = &amp;mcp251xfd_devtype_data_mcp251863;</div><div class='add'>+		else</div><div class='add'>+			devtype_data = &amp;mcp251xfd_devtype_data_mcp2518fd;</div><div class='add'>+	} else {</div><div class='add'>+		devtype_data = &amp;mcp251xfd_devtype_data_mcp2517fd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mcp251xfd_is_251XFD(priv) &amp;&amp;</div><div class='add'>+	    priv-&gt;devtype_data.model != devtype_data-&gt;model) {</div><div class='add'>+		netdev_info(ndev,</div><div class='add'>+			    "Detected %s, but firmware specifies a %s. Fixing up.\n",</div><div class='add'>+			    __mcp251xfd_get_model_str(devtype_data-&gt;model),</div><div class='add'>+			    mcp251xfd_get_model_str(priv));</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;devtype_data = *devtype_data;</div><div class='add'>+</div><div class='add'>+	/* We need to preserve the Half Duplex Quirk. */</div><div class='add'>+	mcp251xfd_register_quirks(priv);</div><div class='add'>+</div><div class='add'>+	/* Re-init regmap with quirks of detected model. */</div><div class='add'>+	return mcp251xfd_regmap_init(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_register_check_rx_int(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err, rx_pending;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;rx_int)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_rx_int_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Check if RX_INT is properly working. The RX_INT should not</div><div class='add'>+	 * be active after a softreset.</div><div class='add'>+	 */</div><div class='add'>+	rx_pending = gpiod_get_value_cansleep(priv-&gt;rx_int);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_rx_int_disable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!rx_pending)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netdev_info(priv-&gt;ndev,</div><div class='add'>+		    "RX_INT active after softreset, disabling RX_INT support.\n");</div><div class='add'>+	devm_gpiod_put(&amp;priv-&gt;spi-&gt;dev, priv-&gt;rx_int);</div><div class='add'>+	priv-&gt;rx_int = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const mcp251xfd_gpio_names[] = { "GPIO0", "GPIO1" };</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_request(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 pin_mask = MCP251XFD_REG_IOCON_PM(offset);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;rx_int &amp;&amp; offset == 1) {</div><div class='add'>+		netdev_err(priv-&gt;ndev, "Can't use GPIO 1 with RX-INT!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = pm_runtime_resume_and_get(priv-&gt;ndev-&gt;dev.parent);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON, pin_mask, pin_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_gpio_free(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(priv-&gt;ndev-&gt;dev.parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_get_direction(struct gpio_chip *chip,</div><div class='add'>+					unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 mask = MCP251XFD_REG_IOCON_TRIS(offset);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_IOCON, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mask &amp; val)</div><div class='add'>+		return GPIO_LINE_DIRECTION_IN;</div><div class='add'>+</div><div class='add'>+	return GPIO_LINE_DIRECTION_OUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_get(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 mask = MCP251XFD_REG_IOCON_GPIO(offset);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_IOCON, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return !!(mask &amp; val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask,</div><div class='add'>+				       unsigned long *bit)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_IOCON, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*bit = FIELD_GET(MCP251XFD_REG_IOCON_GPIO_MASK, val) &amp; *mask;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_direction_output(struct gpio_chip *chip,</div><div class='add'>+					   unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 dir_mask = MCP251XFD_REG_IOCON_TRIS(offset);</div><div class='add'>+	u32 val_mask = MCP251XFD_REG_IOCON_LAT(offset);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		val = val_mask;</div><div class='add'>+	else</div><div class='add'>+		val = 0;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON,</div><div class='add'>+				  dir_mask | val_mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_direction_input(struct gpio_chip *chip,</div><div class='add'>+					  unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 dir_mask = MCP251XFD_REG_IOCON_TRIS(offset);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON, dir_mask, dir_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 val_mask = MCP251XFD_REG_IOCON_LAT(offset);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		val = val_mask;</div><div class='add'>+	else</div><div class='add'>+		val = 0;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON, val_mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_gpio_set_multiple(struct gpio_chip *chip, unsigned long *mask,</div><div class='add'>+				       unsigned long *bits)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = gpiochip_get_data(chip);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(MCP251XFD_REG_IOCON_LAT_MASK, *bits);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map_reg, MCP251XFD_REG_IOCON,</div><div class='add'>+				  MCP251XFD_REG_IOCON_LAT_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251fdx_gpio_setup(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct gpio_chip *gc = &amp;priv-&gt;gc;</div><div class='add'>+</div><div class='add'>+	if (!device_property_present(&amp;priv-&gt;spi-&gt;dev, "gpio-controller"))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	gc-&gt;label = dev_name(&amp;priv-&gt;spi-&gt;dev);</div><div class='add'>+	gc-&gt;parent = &amp;priv-&gt;spi-&gt;dev;</div><div class='add'>+	gc-&gt;owner = THIS_MODULE;</div><div class='add'>+	gc-&gt;request = mcp251xfd_gpio_request;</div><div class='add'>+	gc-&gt;free = mcp251xfd_gpio_free;</div><div class='add'>+	gc-&gt;get_direction = mcp251xfd_gpio_get_direction;</div><div class='add'>+	gc-&gt;direction_output = mcp251xfd_gpio_direction_output;</div><div class='add'>+	gc-&gt;direction_input = mcp251xfd_gpio_direction_input;</div><div class='add'>+	gc-&gt;get = mcp251xfd_gpio_get;</div><div class='add'>+	gc-&gt;get_multiple = mcp251xfd_gpio_get_multiple;</div><div class='add'>+	gc-&gt;set = mcp251xfd_gpio_set;</div><div class='add'>+	gc-&gt;set_multiple = mcp251xfd_gpio_set_multiple;</div><div class='add'>+	gc-&gt;base = -1;</div><div class='add'>+	gc-&gt;can_sleep = true;</div><div class='add'>+	gc-&gt;ngpio = ARRAY_SIZE(mcp251xfd_gpio_names);</div><div class='add'>+	gc-&gt;names = mcp251xfd_gpio_names;</div><div class='add'>+</div><div class='add'>+	return devm_gpiochip_add_data(&amp;priv-&gt;spi-&gt;dev, gc, priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_register_get_dev_id(const struct mcp251xfd_priv *priv, u32 *dev_id,</div><div class='add'>+			      u32 *effective_speed_hz_slow,</div><div class='add'>+			      u32 *effective_speed_hz_fast)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_rx;</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_tx;</div><div class='add'>+	struct spi_transfer xfer[2] = { };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	buf_rx = kzalloc(sizeof(*buf_rx), GFP_KERNEL);</div><div class='add'>+	if (!buf_rx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf_tx = kzalloc(sizeof(*buf_tx), GFP_KERNEL);</div><div class='add'>+	if (!buf_tx) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_kfree_buf_rx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xfer[0].tx_buf = buf_tx;</div><div class='add'>+	xfer[0].len = sizeof(buf_tx-&gt;cmd);</div><div class='add'>+	xfer[0].speed_hz = priv-&gt;spi_max_speed_hz_slow;</div><div class='add'>+	xfer[1].rx_buf = buf_rx-&gt;data;</div><div class='add'>+	xfer[1].len = sizeof(*dev_id);</div><div class='add'>+	xfer[1].speed_hz = priv-&gt;spi_max_speed_hz_fast;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_spi_cmd_read_nocrc(&amp;buf_tx-&gt;cmd, MCP251XFD_REG_DEVID);</div><div class='add'>+</div><div class='add'>+	err = spi_sync_transfer(priv-&gt;spi, xfer, ARRAY_SIZE(xfer));</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_kfree_buf_tx;</div><div class='add'>+</div><div class='add'>+	*dev_id = get_unaligned_le32(buf_rx-&gt;data);</div><div class='add'>+	*effective_speed_hz_slow = xfer[0].effective_speed_hz;</div><div class='add'>+	*effective_speed_hz_fast = xfer[1].effective_speed_hz;</div><div class='add'>+</div><div class='add'>+out_kfree_buf_tx:</div><div class='add'>+	kfree(buf_tx);</div><div class='add'>+out_kfree_buf_rx:</div><div class='add'>+	kfree(buf_rx);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_QUIRK_ACTIVE(quirk) \</div><div class='add'>+	(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_##quirk ? '+' : '-')</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_register_done(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 dev_id, effective_speed_hz_slow, effective_speed_hz_fast;</div><div class='add'>+	unsigned long clk_rate;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_register_get_dev_id(priv, &amp;dev_id,</div><div class='add'>+					    &amp;effective_speed_hz_slow,</div><div class='add'>+					    &amp;effective_speed_hz_fast);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	clk_rate = clk_get_rate(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	netdev_info(priv-&gt;ndev,</div><div class='add'>+		    "%s rev%lu.%lu (%cRX_INT %cPLL %cMAB_NO_WARN %cCRC_REG %cCRC_RX %cCRC_TX %cECC %cHD o:%lu.%02luMHz c:%u.%02uMHz m:%u.%02uMHz rs:%u.%02uMHz es:%u.%02uMHz rf:%u.%02uMHz ef:%u.%02uMHz) successfully initialized.\n",</div><div class='add'>+		    mcp251xfd_get_model_str(priv),</div><div class='add'>+		    FIELD_GET(MCP251XFD_REG_DEVID_ID_MASK, dev_id),</div><div class='add'>+		    FIELD_GET(MCP251XFD_REG_DEVID_REV_MASK, dev_id),</div><div class='add'>+		    priv-&gt;rx_int ? '+' : '-',</div><div class='add'>+		    priv-&gt;pll_enable ? '+' : '-',</div><div class='add'>+		    MCP251XFD_QUIRK_ACTIVE(MAB_NO_WARN),</div><div class='add'>+		    MCP251XFD_QUIRK_ACTIVE(CRC_REG),</div><div class='add'>+		    MCP251XFD_QUIRK_ACTIVE(CRC_RX),</div><div class='add'>+		    MCP251XFD_QUIRK_ACTIVE(CRC_TX),</div><div class='add'>+		    MCP251XFD_QUIRK_ACTIVE(ECC),</div><div class='add'>+		    MCP251XFD_QUIRK_ACTIVE(HALF_DUPLEX),</div><div class='add'>+		    clk_rate / 1000000,</div><div class='add'>+		    clk_rate % 1000000 / 1000 / 10,</div><div class='add'>+		    priv-&gt;can.clock.freq / 1000000,</div><div class='add'>+		    priv-&gt;can.clock.freq % 1000000 / 1000 / 10,</div><div class='add'>+		    priv-&gt;spi_max_speed_hz_orig / 1000000,</div><div class='add'>+		    priv-&gt;spi_max_speed_hz_orig % 1000000 / 1000 / 10,</div><div class='add'>+		    priv-&gt;spi_max_speed_hz_slow / 1000000,</div><div class='add'>+		    priv-&gt;spi_max_speed_hz_slow % 1000000 / 1000 / 10,</div><div class='add'>+		    effective_speed_hz_slow / 1000000,</div><div class='add'>+		    effective_speed_hz_slow % 1000000 / 1000 / 10,</div><div class='add'>+		    priv-&gt;spi_max_speed_hz_fast / 1000000,</div><div class='add'>+		    priv-&gt;spi_max_speed_hz_fast % 1000000 / 1000 / 10,</div><div class='add'>+		    effective_speed_hz_fast / 1000000,</div><div class='add'>+		    effective_speed_hz_fast % 1000000 / 1000 / 10);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_register(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_register_quirks(priv);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_clks_and_vdd_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_softreset(priv);</div><div class='add'>+	if (err == -ENODEV)</div><div class='add'>+		goto out_clks_and_vdd_disable;</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_sleep;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_clock_init(priv);</div><div class='add'>+	if (err == -ENODEV)</div><div class='add'>+		goto out_clks_and_vdd_disable;</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_sleep;</div><div class='add'>+</div><div class='add'>+	pm_runtime_get_noresume(ndev-&gt;dev.parent);</div><div class='add'>+	err = pm_runtime_set_active(ndev-&gt;dev.parent);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_runtime_put_noidle;</div><div class='add'>+	pm_runtime_enable(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_register_chip_detect(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_runtime_disable;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_register_check_rx_int(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_runtime_disable;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_ethtool_init(priv);</div><div class='add'>+</div><div class='add'>+	err = mcp251fdx_gpio_setup(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err_probe(&amp;priv-&gt;spi-&gt;dev, err, "Failed to register gpio-controller.\n");</div><div class='add'>+		goto out_runtime_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_candev(ndev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_runtime_disable;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_register_done(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unregister_candev;</div><div class='add'>+</div><div class='add'>+	/* Put controller into Config mode and let pm_runtime_put()</div><div class='add'>+	 * put in sleep mode, disable the clocks and vdd. If CONFIG_PM</div><div class='add'>+	 * is not enabled, the clocks and vdd will stay powered.</div><div class='add'>+	 */</div><div class='add'>+	err = mcp251xfd_chip_set_mode(priv, MCP251XFD_REG_CON_MODE_CONFIG);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unregister_candev;</div><div class='add'>+</div><div class='add'>+	pm_runtime_put(ndev-&gt;dev.parent);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_unregister_candev:</div><div class='add'>+	unregister_candev(ndev);</div><div class='add'>+out_runtime_disable:</div><div class='add'>+	pm_runtime_disable(ndev-&gt;dev.parent);</div><div class='add'>+out_runtime_put_noidle:</div><div class='add'>+	pm_runtime_put_noidle(ndev-&gt;dev.parent);</div><div class='add'>+out_chip_sleep:</div><div class='add'>+	mcp251xfd_chip_sleep(priv);</div><div class='add'>+out_clks_and_vdd_disable:</div><div class='add'>+	mcp251xfd_clks_and_vdd_disable(priv);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mcp251xfd_unregister(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev	= priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	unregister_candev(ndev);</div><div class='add'>+</div><div class='add'>+	if (pm_runtime_enabled(ndev-&gt;dev.parent)) {</div><div class='add'>+		pm_runtime_disable(ndev-&gt;dev.parent);</div><div class='add'>+	} else {</div><div class='add'>+		mcp251xfd_chip_sleep(priv);</div><div class='add'>+		mcp251xfd_clks_and_vdd_disable(priv);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mcp251xfd_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,mcp2517fd",</div><div class='add'>+		.data = &amp;mcp251xfd_devtype_data_mcp2517fd,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "microchip,mcp2518fd",</div><div class='add'>+		.data = &amp;mcp251xfd_devtype_data_mcp2518fd,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "microchip,mcp251863",</div><div class='add'>+		.data = &amp;mcp251xfd_devtype_data_mcp251863,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "microchip,mcp251xfd",</div><div class='add'>+		.data = &amp;mcp251xfd_devtype_data_mcp251xfd,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, mcp251xfd_of_match);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id mcp251xfd_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "mcp2517fd",</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;mcp251xfd_devtype_data_mcp2517fd,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "mcp2518fd",</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;mcp251xfd_devtype_data_mcp2518fd,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "mcp251863",</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;mcp251xfd_devtype_data_mcp251863,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "mcp251xfd",</div><div class='add'>+		.driver_data = (kernel_ulong_t)&amp;mcp251xfd_devtype_data_mcp251xfd,</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, mcp251xfd_id_table);</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct mcp251xfd_priv *priv;</div><div class='add'>+	struct gpio_desc *rx_int;</div><div class='add'>+	struct regulator *reg_vdd, *reg_xceiver;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	bool pll_enable = false;</div><div class='add'>+	u32 freq = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!spi-&gt;irq)</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, -ENXIO,</div><div class='add'>+				     "No IRQ specified (maybe node \"interrupts-extended\" in DT missing)!\n");</div><div class='add'>+</div><div class='add'>+	rx_int = devm_gpiod_get_optional(&amp;spi-&gt;dev, "microchip,rx-int",</div><div class='add'>+					 GPIOD_IN);</div><div class='add'>+	if (IS_ERR(rx_int))</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, PTR_ERR(rx_int),</div><div class='add'>+				     "Failed to get RX-INT!\n");</div><div class='add'>+</div><div class='add'>+	reg_vdd = devm_regulator_get_optional(&amp;spi-&gt;dev, "vdd");</div><div class='add'>+	if (PTR_ERR(reg_vdd) == -ENODEV)</div><div class='add'>+		reg_vdd = NULL;</div><div class='add'>+	else if (IS_ERR(reg_vdd))</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, PTR_ERR(reg_vdd),</div><div class='add'>+				     "Failed to get VDD regulator!\n");</div><div class='add'>+</div><div class='add'>+	reg_xceiver = devm_regulator_get_optional(&amp;spi-&gt;dev, "xceiver");</div><div class='add'>+	if (PTR_ERR(reg_xceiver) == -ENODEV)</div><div class='add'>+		reg_xceiver = NULL;</div><div class='add'>+	else if (IS_ERR(reg_xceiver))</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, PTR_ERR(reg_xceiver),</div><div class='add'>+				     "Failed to get Transceiver regulator!\n");</div><div class='add'>+</div><div class='add'>+	clk = devm_clk_get_optional(&amp;spi-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, PTR_ERR(clk),</div><div class='add'>+				     "Failed to get Oscillator (clock)!\n");</div><div class='add'>+	if (clk) {</div><div class='add'>+		freq = clk_get_rate(clk);</div><div class='add'>+	} else {</div><div class='add'>+		err = device_property_read_u32(&amp;spi-&gt;dev, "clock-frequency",</div><div class='add'>+					       &amp;freq);</div><div class='add'>+		if (err)</div><div class='add'>+			return dev_err_probe(&amp;spi-&gt;dev, err,</div><div class='add'>+					     "Failed to get clock-frequency!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Sanity check */</div><div class='add'>+	if (freq &lt; MCP251XFD_SYSCLOCK_HZ_MIN ||</div><div class='add'>+	    freq &gt; MCP251XFD_SYSCLOCK_HZ_MAX) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev,</div><div class='add'>+			"Oscillator frequency (%u Hz) is too low or high.\n",</div><div class='add'>+			freq);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (freq &lt;= MCP251XFD_SYSCLOCK_HZ_MAX / MCP251XFD_OSC_PLL_MULTIPLIER)</div><div class='add'>+		pll_enable = true;</div><div class='add'>+</div><div class='add'>+	ndev = alloc_candev(sizeof(struct mcp251xfd_priv),</div><div class='add'>+			    MCP251XFD_TX_OBJ_NUM_MAX);</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;mcp251xfd_netdev_ops;</div><div class='add'>+	ndev-&gt;irq = spi-&gt;irq;</div><div class='add'>+	ndev-&gt;flags |= IFF_ECHO;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	spi_set_drvdata(spi, priv);</div><div class='add'>+	priv-&gt;can.clock.freq = freq;</div><div class='add'>+	if (pll_enable)</div><div class='add'>+		priv-&gt;can.clock.freq *= MCP251XFD_OSC_PLL_MULTIPLIER;</div><div class='add'>+	priv-&gt;can.do_set_mode = mcp251xfd_set_mode;</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = mcp251xfd_get_berr_counter;</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;mcp251xfd_bittiming_const;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;mcp251xfd_data_bittiming_const;</div><div class='add'>+	priv-&gt;can.fd.tdc_const = &amp;mcp251xfd_tdc_const;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='add'>+		CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_BERR_REPORTING |</div><div class='add'>+		CAN_CTRLMODE_FD | CAN_CTRLMODE_FD_NON_ISO |</div><div class='add'>+		CAN_CTRLMODE_CC_LEN8_DLC | CAN_CTRLMODE_TDC_AUTO |</div><div class='add'>+		CAN_CTRLMODE_TDC_MANUAL;</div><div class='add'>+	set_bit(MCP251XFD_FLAGS_DOWN, priv-&gt;flags);</div><div class='add'>+	priv-&gt;ndev = ndev;</div><div class='add'>+	priv-&gt;spi = spi;</div><div class='add'>+	priv-&gt;rx_int = rx_int;</div><div class='add'>+	priv-&gt;clk = clk;</div><div class='add'>+	priv-&gt;pll_enable = pll_enable;</div><div class='add'>+	priv-&gt;reg_vdd = reg_vdd;</div><div class='add'>+	priv-&gt;reg_xceiver = reg_xceiver;</div><div class='add'>+	priv-&gt;devtype_data = *(struct mcp251xfd_devtype_data *)spi_get_device_match_data(spi);</div><div class='add'>+</div><div class='add'>+	/* Errata Reference:</div><div class='add'>+	 * mcp2517fd: DS80000792C 5., mcp2518fd: DS80000789E 4.,</div><div class='add'>+	 * mcp251863: DS80000984A 4.</div><div class='add'>+	 *</div><div class='add'>+	 * The SPI can write corrupted data to the RAM at fast SPI</div><div class='add'>+	 * speeds:</div><div class='add'>+	 *</div><div class='add'>+	 * Simultaneous activity on the CAN bus while writing data to</div><div class='add'>+	 * RAM via the SPI interface, with high SCK frequency, can</div><div class='add'>+	 * lead to corrupted data being written to RAM.</div><div class='add'>+	 *</div><div class='add'>+	 * Fix/Work Around:</div><div class='add'>+	 * Ensure that FSCK is less than or equal to 0.85 *</div><div class='add'>+	 * (FSYSCLK/2).</div><div class='add'>+	 *</div><div class='add'>+	 * Known good combinations are:</div><div class='add'>+	 *</div><div class='add'>+	 * MCP	ext-clk	SoC			SPI			SPI-clk		max-clk	parent-clk	config</div><div class='add'>+	 *</div><div class='add'>+	 * 2518	20 MHz	allwinner,sun8i-h3	allwinner,sun8i-h3-spi	 8333333 Hz	 83.33%	600000000 Hz	assigned-clocks = &lt;&amp;ccu CLK_SPIx&gt;</div><div class='add'>+	 * 2518	40 MHz	allwinner,sun8i-h3	allwinner,sun8i-h3-spi	16666667 Hz	 83.33%	600000000 Hz	assigned-clocks = &lt;&amp;ccu CLK_SPIx&gt;</div><div class='add'>+	 * 2517	40 MHz	atmel,sama5d27		atmel,at91rm9200-spi	16400000 Hz	 82.00%	 82000000 Hz	default</div><div class='add'>+	 * 2518	40 MHz	atmel,sama5d27		atmel,at91rm9200-spi	16400000 Hz	 82.00%	 82000000 Hz	default</div><div class='add'>+	 * 2518	40 MHz	fsl,imx6dl		fsl,imx51-ecspi		15000000 Hz	 75.00%	 30000000 Hz	default</div><div class='add'>+	 * 2517	20 MHz	fsl,imx8mm		fsl,imx51-ecspi		 8333333 Hz	 83.33%	 16666667 Hz	assigned-clocks = &lt;&amp;clk IMX8MM_CLK_ECSPIx_ROOT&gt;</div><div class='add'>+	 *</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;spi_max_speed_hz_orig = spi-&gt;max_speed_hz;</div><div class='add'>+	priv-&gt;spi_max_speed_hz_slow = min(spi-&gt;max_speed_hz,</div><div class='add'>+					  freq / 2 / 1000 * 850);</div><div class='add'>+	if (priv-&gt;pll_enable)</div><div class='add'>+		priv-&gt;spi_max_speed_hz_fast = min(spi-&gt;max_speed_hz,</div><div class='add'>+						  freq *</div><div class='add'>+						  MCP251XFD_OSC_PLL_MULTIPLIER /</div><div class='add'>+						  2 / 1000 * 850);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;spi_max_speed_hz_fast = priv-&gt;spi_max_speed_hz_slow;</div><div class='add'>+	spi-&gt;max_speed_hz = priv-&gt;spi_max_speed_hz_slow;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi-&gt;rt = true;</div><div class='add'>+	err = spi_setup(spi);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_regmap_init(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+</div><div class='add'>+	err = can_rx_offload_add_manual(ndev, &amp;priv-&gt;offload,</div><div class='add'>+					MCP251XFD_NAPI_WEIGHT);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_free_candev;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_register(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err_probe(&amp;spi-&gt;dev, err, "Failed to detect %s.\n",</div><div class='add'>+			      mcp251xfd_get_model_str(priv));</div><div class='add'>+		goto out_can_rx_offload_del;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_can_rx_offload_del:</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+out_free_candev:</div><div class='add'>+	spi-&gt;max_speed_hz = priv-&gt;spi_max_speed_hz_orig;</div><div class='add'>+</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_unregister(priv);</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+	spi-&gt;max_speed_hz = priv-&gt;spi_max_speed_hz_orig;</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused mcp251xfd_runtime_suspend(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = dev_get_drvdata(device);</div><div class='add'>+</div><div class='add'>+	mcp251xfd_chip_sleep(priv);</div><div class='add'>+	return mcp251xfd_clks_and_vdd_disable(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused mcp251xfd_runtime_resume(struct device *device)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = dev_get_drvdata(device);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_clks_and_vdd_enable(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_softreset(priv);</div><div class='add'>+	if (err == -ENODEV)</div><div class='add'>+		goto out_clks_and_vdd_disable;</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_sleep;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_chip_clock_init(priv);</div><div class='add'>+	if (err == -ENODEV)</div><div class='add'>+		goto out_clks_and_vdd_disable;</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_chip_sleep;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_chip_sleep:</div><div class='add'>+	mcp251xfd_chip_sleep(priv);</div><div class='add'>+out_clks_and_vdd_disable:</div><div class='add'>+	mcp251xfd_clks_and_vdd_disable(priv);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops mcp251xfd_pm_ops = {</div><div class='add'>+	SET_RUNTIME_PM_OPS(mcp251xfd_runtime_suspend,</div><div class='add'>+			   mcp251xfd_runtime_resume, NULL)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver mcp251xfd_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = DEVICE_NAME,</div><div class='add'>+		.pm = &amp;mcp251xfd_pm_ops,</div><div class='add'>+		.of_match_table = mcp251xfd_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = mcp251xfd_probe,</div><div class='add'>+	.remove = mcp251xfd_remove,</div><div class='add'>+	.id_table = mcp251xfd_id_table,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(mcp251xfd_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Marc Kleine-Budde &lt;mkl@pengutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Microchip MCP251xFD Family CAN controller driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c<br/>new file mode 100644<br/>index 000000000000..a02ca76ac239<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2020 Pengutronix,</div><div class='add'>+//                    Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+/* The standard crc16 in linux/crc16.h is unfortunately not computing</div><div class='add'>+ * the correct results (left shift vs. right shift). So here an</div><div class='add'>+ * implementation with a table generated with the help of:</div><div class='add'>+ *</div><div class='add'>+ * http://lkml.iu.edu/hypermail/linux/kernel/0508.1/1085.html</div><div class='add'>+ */</div><div class='add'>+static const u16 mcp251xfd_crc16_table[] = {</div><div class='add'>+	0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,</div><div class='add'>+	0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,</div><div class='add'>+	0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,</div><div class='add'>+	0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,</div><div class='add'>+	0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,</div><div class='add'>+	0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,</div><div class='add'>+	0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,</div><div class='add'>+	0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,</div><div class='add'>+	0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,</div><div class='add'>+	0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,</div><div class='add'>+	0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,</div><div class='add'>+	0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,</div><div class='add'>+	0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,</div><div class='add'>+	0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,</div><div class='add'>+	0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,</div><div class='add'>+	0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,</div><div class='add'>+	0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,</div><div class='add'>+	0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,</div><div class='add'>+	0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,</div><div class='add'>+	0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,</div><div class='add'>+	0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,</div><div class='add'>+	0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,</div><div class='add'>+	0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,</div><div class='add'>+	0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,</div><div class='add'>+	0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,</div><div class='add'>+	0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,</div><div class='add'>+	0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,</div><div class='add'>+	0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,</div><div class='add'>+	0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,</div><div class='add'>+	0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,</div><div class='add'>+	0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,</div><div class='add'>+	0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u16 mcp251xfd_crc16_byte(u16 crc, const u8 data)</div><div class='add'>+{</div><div class='add'>+	u8 index = (crc &gt;&gt; 8) ^ data;</div><div class='add'>+</div><div class='add'>+	return (crc &lt;&lt; 8) ^ mcp251xfd_crc16_table[index];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 mcp251xfd_crc16(u16 crc, u8 const *buffer, size_t len)</div><div class='add'>+{</div><div class='add'>+	while (len--)</div><div class='add'>+		crc = mcp251xfd_crc16_byte(crc, *buffer++);</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 mcp251xfd_crc16_compute(const void *data, size_t data_size)</div><div class='add'>+{</div><div class='add'>+	u16 crc = 0xffff;</div><div class='add'>+</div><div class='add'>+	return mcp251xfd_crc16(crc, data, data_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 mcp251xfd_crc16_compute2(const void *cmd, size_t cmd_size,</div><div class='add'>+			     const void *data, size_t data_size)</div><div class='add'>+{</div><div class='add'>+	u16 crc;</div><div class='add'>+</div><div class='add'>+	crc = mcp251xfd_crc16_compute(cmd, cmd_size);</div><div class='add'>+	crc = mcp251xfd_crc16(crc, data, data_size);</div><div class='add'>+</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c<br/>new file mode 100644<br/>index 000000000000..050321345304<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c</a></div><div class='hunk'>@@ -0,0 +1,285 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2020, 2021 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+// Copyright (C) 2015-2018 Etnaviv Project</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+#include "mcp251xfd-dump.h"</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_dump_iter {</div><div class='add'>+	void *start;</div><div class='add'>+	struct mcp251xfd_dump_object_header *hdr;</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_dump_reg_space {</div><div class='add'>+	u16 base;</div><div class='add'>+	u16 size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_dump_ring {</div><div class='add'>+	enum mcp251xfd_dump_object_ring_key key;</div><div class='add'>+	u32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mcp251xfd_dump_reg_space mcp251xfd_dump_reg_space[] = {</div><div class='add'>+	{</div><div class='add'>+		.base = MCP251XFD_REG_CON,</div><div class='add'>+		.size = MCP251XFD_REG_FLTOBJ(32) - MCP251XFD_REG_CON,</div><div class='add'>+	}, {</div><div class='add'>+		.base = MCP251XFD_RAM_START,</div><div class='add'>+		.size = MCP251XFD_RAM_SIZE,</div><div class='add'>+	}, {</div><div class='add'>+		.base = MCP251XFD_REG_OSC,</div><div class='add'>+		.size = MCP251XFD_REG_DEVID - MCP251XFD_REG_OSC,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_header(struct mcp251xfd_dump_iter *iter,</div><div class='add'>+				  enum mcp251xfd_dump_object_type object_type,</div><div class='add'>+				  const void *data_end)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_dump_object_header *hdr = iter-&gt;hdr;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	len = data_end - iter-&gt;data;</div><div class='add'>+	if (!len)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;magic = cpu_to_le32(MCP251XFD_DUMP_MAGIC);</div><div class='add'>+	hdr-&gt;type = cpu_to_le32(object_type);</div><div class='add'>+	hdr-&gt;offset = cpu_to_le32(iter-&gt;data - iter-&gt;start);</div><div class='add'>+	hdr-&gt;len = cpu_to_le32(len);</div><div class='add'>+</div><div class='add'>+	iter-&gt;hdr++;</div><div class='add'>+	iter-&gt;data += len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_registers(const struct mcp251xfd_priv *priv,</div><div class='add'>+				     struct mcp251xfd_dump_iter *iter)</div><div class='add'>+{</div><div class='add'>+	const int val_bytes = regmap_get_val_bytes(priv-&gt;map_rx);</div><div class='add'>+	struct mcp251xfd_dump_object_reg *reg = iter-&gt;data;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mcp251xfd_dump_reg_space); i++) {</div><div class='add'>+		const struct mcp251xfd_dump_reg_space *reg_space;</div><div class='add'>+		void *buf;</div><div class='add'>+</div><div class='add'>+		reg_space = &amp;mcp251xfd_dump_reg_space[i];</div><div class='add'>+</div><div class='add'>+		buf = kmalloc(reg_space-&gt;size, GFP_KERNEL);</div><div class='add'>+		if (!buf)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		err = regmap_bulk_read(priv-&gt;map_reg, reg_space-&gt;base,</div><div class='add'>+				       buf, reg_space-&gt;size / val_bytes);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(buf);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; reg_space-&gt;size; j += sizeof(u32), reg++) {</div><div class='add'>+			reg-&gt;reg = cpu_to_le32(reg_space-&gt;base + j);</div><div class='add'>+			reg-&gt;val = cpu_to_le32p(buf + j);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		kfree(buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mcp251xfd_dump_header(iter, MCP251XFD_DUMP_OBJECT_TYPE_REG, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_ring(struct mcp251xfd_dump_iter *iter,</div><div class='add'>+				enum mcp251xfd_dump_object_type object_type,</div><div class='add'>+				const struct mcp251xfd_dump_ring *dump_ring,</div><div class='add'>+				unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_dump_object_reg *reg = iter-&gt;data;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++, reg++) {</div><div class='add'>+		reg-&gt;reg = cpu_to_le32(dump_ring[i].key);</div><div class='add'>+		reg-&gt;val = cpu_to_le32(dump_ring[i].val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcp251xfd_dump_header(iter, object_type, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_tef_ring(const struct mcp251xfd_priv *priv,</div><div class='add'>+				    struct mcp251xfd_dump_iter *iter)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_tef_ring *tef = priv-&gt;tef;</div><div class='add'>+	const struct mcp251xfd_tx_ring *tx = priv-&gt;tx;</div><div class='add'>+	const struct mcp251xfd_dump_ring dump_ring[] = {</div><div class='add'>+		{</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_HEAD,</div><div class='add'>+			.val = tef-&gt;head,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_TAIL,</div><div class='add'>+			.val = tef-&gt;tail,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_BASE,</div><div class='add'>+			.val = 0,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_NR,</div><div class='add'>+			.val = 0,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_FIFO_NR,</div><div class='add'>+			.val = 0,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_NUM,</div><div class='add'>+			.val = tx-&gt;obj_num,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_SIZE,</div><div class='add'>+			.val = sizeof(struct mcp251xfd_hw_tef_obj),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mcp251xfd_dump_ring(iter, MCP251XFD_DUMP_OBJECT_TYPE_TEF,</div><div class='add'>+			    dump_ring, ARRAY_SIZE(dump_ring));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_rx_ring_one(const struct mcp251xfd_priv *priv,</div><div class='add'>+				       struct mcp251xfd_dump_iter *iter,</div><div class='add'>+				       const struct mcp251xfd_rx_ring *rx)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_dump_ring dump_ring[] = {</div><div class='add'>+		{</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_HEAD,</div><div class='add'>+			.val = rx-&gt;head,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_TAIL,</div><div class='add'>+			.val = rx-&gt;tail,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_BASE,</div><div class='add'>+			.val = rx-&gt;base,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_NR,</div><div class='add'>+			.val = rx-&gt;nr,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_FIFO_NR,</div><div class='add'>+			.val = rx-&gt;fifo_nr,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_NUM,</div><div class='add'>+			.val = rx-&gt;obj_num,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_SIZE,</div><div class='add'>+			.val = rx-&gt;obj_size,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mcp251xfd_dump_ring(iter, MCP251XFD_DUMP_OBJECT_TYPE_RX,</div><div class='add'>+			    dump_ring, ARRAY_SIZE(dump_ring));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_rx_ring(const struct mcp251xfd_priv *priv,</div><div class='add'>+				   struct mcp251xfd_dump_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_rx_ring *rx_ring;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_for_each_rx_ring(priv, rx_ring, i)</div><div class='add'>+		mcp251xfd_dump_rx_ring_one(priv, iter, rx_ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_tx_ring(const struct mcp251xfd_priv *priv,</div><div class='add'>+				   struct mcp251xfd_dump_iter *iter)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_tx_ring *tx = priv-&gt;tx;</div><div class='add'>+	const struct mcp251xfd_dump_ring dump_ring[] = {</div><div class='add'>+		{</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_HEAD,</div><div class='add'>+			.val = tx-&gt;head,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_TAIL,</div><div class='add'>+			.val = tx-&gt;tail,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_BASE,</div><div class='add'>+			.val = tx-&gt;base,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_NR,</div><div class='add'>+			.val = tx-&gt;nr,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_FIFO_NR,</div><div class='add'>+			.val = tx-&gt;fifo_nr,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_NUM,</div><div class='add'>+			.val = tx-&gt;obj_num,</div><div class='add'>+		}, {</div><div class='add'>+			.key = MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_SIZE,</div><div class='add'>+			.val = tx-&gt;obj_size,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	mcp251xfd_dump_ring(iter, MCP251XFD_DUMP_OBJECT_TYPE_TX,</div><div class='add'>+			    dump_ring, ARRAY_SIZE(dump_ring));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_dump_end(const struct mcp251xfd_priv *priv,</div><div class='add'>+			       struct mcp251xfd_dump_iter *iter)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_dump_object_header *hdr = iter-&gt;hdr;</div><div class='add'>+</div><div class='add'>+	hdr-&gt;magic = cpu_to_le32(MCP251XFD_DUMP_MAGIC);</div><div class='add'>+	hdr-&gt;type = cpu_to_le32(MCP251XFD_DUMP_OBJECT_TYPE_END);</div><div class='add'>+	hdr-&gt;offset = cpu_to_le32(0);</div><div class='add'>+	hdr-&gt;len = cpu_to_le32(0);</div><div class='add'>+</div><div class='add'>+	/* provoke NULL pointer access, if used after END object */</div><div class='add'>+	iter-&gt;hdr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mcp251xfd_dump(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_dump_iter iter;</div><div class='add'>+	unsigned int rings_num, obj_num;</div><div class='add'>+	unsigned int file_size = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* register space + end marker */</div><div class='add'>+	obj_num = 2;</div><div class='add'>+</div><div class='add'>+	/* register space */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mcp251xfd_dump_reg_space); i++)</div><div class='add'>+		file_size += mcp251xfd_dump_reg_space[i].size / sizeof(u32) *</div><div class='add'>+			sizeof(struct mcp251xfd_dump_object_reg);</div><div class='add'>+</div><div class='add'>+	/* TEF ring, RX rings, TX ring */</div><div class='add'>+	rings_num = 1 + priv-&gt;rx_ring_num + 1;</div><div class='add'>+	obj_num += rings_num;</div><div class='add'>+	file_size += rings_num * __MCP251XFD_DUMP_OBJECT_RING_KEY_MAX  *</div><div class='add'>+		sizeof(struct mcp251xfd_dump_object_reg);</div><div class='add'>+</div><div class='add'>+	/* size of the headers */</div><div class='add'>+	file_size += sizeof(*iter.hdr) * obj_num;</div><div class='add'>+</div><div class='add'>+	/* allocate the file in vmalloc memory, it's likely to be big */</div><div class='add'>+	iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN |</div><div class='add'>+			       __GFP_ZERO | __GFP_NORETRY);</div><div class='add'>+	if (!iter.start) {</div><div class='add'>+		netdev_warn(priv-&gt;ndev, "Failed to allocate devcoredump file.\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* point the data member after the headers */</div><div class='add'>+	iter.hdr = iter.start;</div><div class='add'>+	iter.data = &amp;iter.hdr[obj_num];</div><div class='add'>+</div><div class='add'>+	mcp251xfd_dump_registers(priv, &amp;iter);</div><div class='add'>+	mcp251xfd_dump_tef_ring(priv, &amp;iter);</div><div class='add'>+	mcp251xfd_dump_rx_ring(priv, &amp;iter);</div><div class='add'>+	mcp251xfd_dump_tx_ring(priv, &amp;iter);</div><div class='add'>+	mcp251xfd_dump_end(priv, &amp;iter);</div><div class='add'>+</div><div class='add'>+	dev_coredumpv(&amp;priv-&gt;spi-&gt;dev, iter.start,</div><div class='add'>+		      iter.data - iter.start, GFP_KERNEL);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h<br/>new file mode 100644<br/>index 000000000000..e7560b0712eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019, 2020, 2021 Pengutronix,</div><div class='add'>+ *               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MCP251XFD_DUMP_H</div><div class='add'>+#define _MCP251XFD_DUMP_H</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_DUMP_MAGIC 0x1825434d</div><div class='add'>+</div><div class='add'>+enum mcp251xfd_dump_object_type {</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_TYPE_REG,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_TYPE_TEF,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_TYPE_RX,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_TYPE_TX,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_TYPE_END = -1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mcp251xfd_dump_object_ring_key {</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_HEAD,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_TAIL,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_BASE,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_NR,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_FIFO_NR,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_NUM,</div><div class='add'>+	MCP251XFD_DUMP_OBJECT_RING_KEY_OBJ_SIZE,</div><div class='add'>+	__MCP251XFD_DUMP_OBJECT_RING_KEY_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_dump_object_header {</div><div class='add'>+	__le32 magic;</div><div class='add'>+	__le32 type;</div><div class='add'>+	__le32 offset;</div><div class='add'>+	__le32 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_dump_object_reg {</div><div class='add'>+	__le32 reg;</div><div class='add'>+	__le32 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c<br/>new file mode 100644<br/>index 000000000000..57eeb066a945<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,145 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021, 2022 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+#include "mcp251xfd-ram.h"</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_ring_get_ringparam(struct net_device *ndev,</div><div class='add'>+			     struct ethtool_ringparam *ring,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	const bool fd_mode = mcp251xfd_is_fd_mode(priv);</div><div class='add'>+	struct can_ram_layout layout;</div><div class='add'>+</div><div class='add'>+	can_ram_get_layout(&amp;layout, &amp;mcp251xfd_ram_config, NULL, NULL, fd_mode);</div><div class='add'>+	ring-&gt;rx_max_pending = layout.max_rx;</div><div class='add'>+	ring-&gt;tx_max_pending = layout.max_tx;</div><div class='add'>+</div><div class='add'>+	ring-&gt;rx_pending = priv-&gt;rx_obj_num;</div><div class='add'>+	ring-&gt;tx_pending = priv-&gt;tx-&gt;obj_num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_ring_set_ringparam(struct net_device *ndev,</div><div class='add'>+			     struct ethtool_ringparam *ring,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	const bool fd_mode = mcp251xfd_is_fd_mode(priv);</div><div class='add'>+	struct can_ram_layout layout;</div><div class='add'>+</div><div class='add'>+	can_ram_get_layout(&amp;layout, &amp;mcp251xfd_ram_config, ring, NULL, fd_mode);</div><div class='add'>+	if ((layout.cur_rx != priv-&gt;rx_obj_num ||</div><div class='add'>+	     layout.cur_tx != priv-&gt;tx-&gt;obj_num) &amp;&amp;</div><div class='add'>+	    netif_running(ndev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_obj_num = layout.cur_rx;</div><div class='add'>+	priv-&gt;rx_obj_num_coalesce_irq = layout.rx_coalesce;</div><div class='add'>+	priv-&gt;tx-&gt;obj_num = layout.cur_tx;</div><div class='add'>+	priv-&gt;tx_obj_num_coalesce_irq = layout.tx_coalesce;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_ring_get_coalesce(struct net_device *ndev,</div><div class='add'>+				       struct ethtool_coalesce *ec,</div><div class='add'>+				       struct kernel_ethtool_coalesce *kec,</div><div class='add'>+				       struct netlink_ext_ack *ext_ack)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 rx_max_frames, tx_max_frames;</div><div class='add'>+</div><div class='add'>+	/* The ethtool doc says:</div><div class='add'>+	 * To disable coalescing, set usecs = 0 and max_frames = 1.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;rx_obj_num_coalesce_irq == 0)</div><div class='add'>+		rx_max_frames = 1;</div><div class='add'>+	else</div><div class='add'>+		rx_max_frames = priv-&gt;rx_obj_num_coalesce_irq;</div><div class='add'>+</div><div class='add'>+	ec-&gt;rx_max_coalesced_frames_irq = rx_max_frames;</div><div class='add'>+	ec-&gt;rx_coalesce_usecs_irq = priv-&gt;rx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_obj_num_coalesce_irq == 0)</div><div class='add'>+		tx_max_frames = 1;</div><div class='add'>+	else</div><div class='add'>+		tx_max_frames = priv-&gt;tx_obj_num_coalesce_irq;</div><div class='add'>+</div><div class='add'>+	ec-&gt;tx_max_coalesced_frames_irq = tx_max_frames;</div><div class='add'>+	ec-&gt;tx_coalesce_usecs_irq = priv-&gt;tx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_ring_set_coalesce(struct net_device *ndev,</div><div class='add'>+				       struct ethtool_coalesce *ec,</div><div class='add'>+				       struct kernel_ethtool_coalesce *kec,</div><div class='add'>+				       struct netlink_ext_ack *ext_ack)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	const bool fd_mode = mcp251xfd_is_fd_mode(priv);</div><div class='add'>+	const struct ethtool_ringparam ring = {</div><div class='add'>+		.rx_pending = priv-&gt;rx_obj_num,</div><div class='add'>+		.tx_pending = priv-&gt;tx-&gt;obj_num,</div><div class='add'>+	};</div><div class='add'>+	struct can_ram_layout layout;</div><div class='add'>+</div><div class='add'>+	can_ram_get_layout(&amp;layout, &amp;mcp251xfd_ram_config, &amp;ring, ec, fd_mode);</div><div class='add'>+</div><div class='add'>+	if ((layout.rx_coalesce != priv-&gt;rx_obj_num_coalesce_irq ||</div><div class='add'>+	     ec-&gt;rx_coalesce_usecs_irq != priv-&gt;rx_coalesce_usecs_irq ||</div><div class='add'>+	     layout.tx_coalesce != priv-&gt;tx_obj_num_coalesce_irq ||</div><div class='add'>+	     ec-&gt;tx_coalesce_usecs_irq != priv-&gt;tx_coalesce_usecs_irq) &amp;&amp;</div><div class='add'>+	    netif_running(ndev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_obj_num = layout.cur_rx;</div><div class='add'>+	priv-&gt;rx_obj_num_coalesce_irq = layout.rx_coalesce;</div><div class='add'>+	priv-&gt;rx_coalesce_usecs_irq = ec-&gt;rx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx-&gt;obj_num = layout.cur_tx;</div><div class='add'>+	priv-&gt;tx_obj_num_coalesce_irq = layout.tx_coalesce;</div><div class='add'>+	priv-&gt;tx_coalesce_usecs_irq = ec-&gt;tx_coalesce_usecs_irq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops mcp251xfd_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS_IRQ |</div><div class='add'>+		ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ |</div><div class='add'>+		ETHTOOL_COALESCE_TX_USECS_IRQ |</div><div class='add'>+		ETHTOOL_COALESCE_TX_MAX_FRAMES_IRQ,</div><div class='add'>+	.get_ringparam = mcp251xfd_ring_get_ringparam,</div><div class='add'>+	.set_ringparam = mcp251xfd_ring_set_ringparam,</div><div class='add'>+	.get_coalesce = mcp251xfd_ring_get_coalesce,</div><div class='add'>+	.set_coalesce = mcp251xfd_ring_set_coalesce,</div><div class='add'>+	.get_ts_info = can_ethtool_op_get_ts_info_hwts,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void mcp251xfd_ethtool_init(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct can_ram_layout layout;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ndev-&gt;ethtool_ops = &amp;mcp251xfd_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	can_ram_get_layout(&amp;layout, &amp;mcp251xfd_ram_config, NULL, NULL, false);</div><div class='add'>+	priv-&gt;rx_obj_num = layout.default_rx;</div><div class='add'>+	priv-&gt;tx-&gt;obj_num = layout.default_tx;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_obj_num_coalesce_irq = 0;</div><div class='add'>+	priv-&gt;tx_obj_num_coalesce_irq = 0;</div><div class='add'>+	priv-&gt;rx_coalesce_usecs_irq = 0;</div><div class='add'>+	priv-&gt;tx_coalesce_usecs_irq = 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c<br/>new file mode 100644<br/>index 000000000000..61b0d6fa52dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.c</a></div><div class='hunk'>@@ -0,0 +1,162 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021, 2022 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd-ram.h"</div><div class='add'>+</div><div class='add'>+static inline u8 can_ram_clamp(const struct can_ram_config *config,</div><div class='add'>+			       const struct can_ram_obj_config *obj,</div><div class='add'>+			       u8 val)</div><div class='add'>+{</div><div class='add'>+	u8 max;</div><div class='add'>+</div><div class='add'>+	max = min_t(u8, obj-&gt;max, obj-&gt;fifo_num * config-&gt;fifo_depth);</div><div class='add'>+	return clamp(val, obj-&gt;min, max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8</div><div class='add'>+can_ram_rounddown_pow_of_two(const struct can_ram_config *config,</div><div class='add'>+			     const struct can_ram_obj_config *obj,</div><div class='add'>+			     const u8 coalesce, u8 val)</div><div class='add'>+{</div><div class='add'>+	u8 fifo_num = obj-&gt;fifo_num;</div><div class='add'>+	u8 ret = 0, i;</div><div class='add'>+</div><div class='add'>+	val = can_ram_clamp(config, obj, val);</div><div class='add'>+</div><div class='add'>+	if (coalesce) {</div><div class='add'>+		/* Use 1st FIFO for coalescing, if requested.</div><div class='add'>+		 *</div><div class='add'>+		 * Either use complete FIFO (and FIFO Full IRQ) for</div><div class='add'>+		 * coalescing or only half of FIFO (FIFO Half Full</div><div class='add'>+		 * IRQ) and use remaining half for normal objects.</div><div class='add'>+		 */</div><div class='add'>+		ret = min_t(u8, coalesce * 2, config-&gt;fifo_depth);</div><div class='add'>+		val -= ret;</div><div class='add'>+		fifo_num--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; fifo_num &amp;&amp; val; i++) {</div><div class='add'>+		u8 n;</div><div class='add'>+</div><div class='add'>+		n = min_t(u8, rounddown_pow_of_two(val),</div><div class='add'>+			  config-&gt;fifo_depth);</div><div class='add'>+</div><div class='add'>+		/* skip small FIFOs */</div><div class='add'>+		if (n &lt; obj-&gt;fifo_depth_min)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret += n;</div><div class='add'>+		val -= n;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void can_ram_get_layout(struct can_ram_layout *layout,</div><div class='add'>+			const struct can_ram_config *config,</div><div class='add'>+			const struct ethtool_ringparam *ring,</div><div class='add'>+			const struct ethtool_coalesce *ec,</div><div class='add'>+			const bool fd_mode)</div><div class='add'>+{</div><div class='add'>+	u8 num_rx, num_tx;</div><div class='add'>+	u16 ram_free;</div><div class='add'>+</div><div class='add'>+	/* default CAN */</div><div class='add'>+</div><div class='add'>+	num_tx = config-&gt;tx.def[fd_mode];</div><div class='add'>+	num_tx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;tx, 0, num_tx);</div><div class='add'>+</div><div class='add'>+	ram_free = config-&gt;size;</div><div class='add'>+	ram_free -= config-&gt;tx.size[fd_mode] * num_tx;</div><div class='add'>+</div><div class='add'>+	num_rx = ram_free / config-&gt;rx.size[fd_mode];</div><div class='add'>+</div><div class='add'>+	layout-&gt;default_rx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;rx, 0, num_rx);</div><div class='add'>+	layout-&gt;default_tx = num_tx;</div><div class='add'>+</div><div class='add'>+	/* MAX CAN */</div><div class='add'>+</div><div class='add'>+	ram_free = config-&gt;size;</div><div class='add'>+	ram_free -= config-&gt;tx.size[fd_mode] * config-&gt;tx.min;</div><div class='add'>+	num_rx = ram_free / config-&gt;rx.size[fd_mode];</div><div class='add'>+</div><div class='add'>+	ram_free = config-&gt;size;</div><div class='add'>+	ram_free -= config-&gt;rx.size[fd_mode] * config-&gt;rx.min;</div><div class='add'>+	num_tx = ram_free / config-&gt;tx.size[fd_mode];</div><div class='add'>+</div><div class='add'>+	layout-&gt;max_rx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;rx, 0, num_rx);</div><div class='add'>+	layout-&gt;max_tx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;tx, 0, num_tx);</div><div class='add'>+</div><div class='add'>+	/* cur CAN */</div><div class='add'>+</div><div class='add'>+	if (ring) {</div><div class='add'>+		u8 num_rx_coalesce = 0, num_tx_coalesce = 0;</div><div class='add'>+</div><div class='add'>+		/* If the ring parameters have been configured in</div><div class='add'>+		 * CAN-CC mode, but and we are in CAN-FD mode now,</div><div class='add'>+		 * they might be to big. Use the default CAN-FD values</div><div class='add'>+		 * in this case.</div><div class='add'>+		 */</div><div class='add'>+		num_rx = ring-&gt;rx_pending;</div><div class='add'>+		if (num_rx &gt; layout-&gt;max_rx)</div><div class='add'>+			num_rx = layout-&gt;default_rx;</div><div class='add'>+</div><div class='add'>+		num_rx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;rx, 0, num_rx);</div><div class='add'>+</div><div class='add'>+		/* The ethtool doc says:</div><div class='add'>+		 * To disable coalescing, set usecs = 0 and max_frames = 1.</div><div class='add'>+		 */</div><div class='add'>+		if (ec &amp;&amp; !(ec-&gt;rx_coalesce_usecs_irq == 0 &amp;&amp;</div><div class='add'>+			    ec-&gt;rx_max_coalesced_frames_irq == 1)) {</div><div class='add'>+			u8 max;</div><div class='add'>+</div><div class='add'>+			/* use only max half of available objects for coalescing */</div><div class='add'>+			max = min_t(u8, num_rx / 2, config-&gt;fifo_depth);</div><div class='add'>+			num_rx_coalesce = clamp(ec-&gt;rx_max_coalesced_frames_irq,</div><div class='add'>+						(u32)config-&gt;rx.fifo_depth_coalesce_min,</div><div class='add'>+						(u32)max);</div><div class='add'>+			num_rx_coalesce = rounddown_pow_of_two(num_rx_coalesce);</div><div class='add'>+</div><div class='add'>+			num_rx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;rx,</div><div class='add'>+							      num_rx_coalesce, num_rx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ram_free = config-&gt;size - config-&gt;rx.size[fd_mode] * num_rx;</div><div class='add'>+		num_tx = ram_free / config-&gt;tx.size[fd_mode];</div><div class='add'>+		num_tx = min_t(u8, ring-&gt;tx_pending, num_tx);</div><div class='add'>+		num_tx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;tx, 0, num_tx);</div><div class='add'>+</div><div class='add'>+		/* The ethtool doc says:</div><div class='add'>+		 * To disable coalescing, set usecs = 0 and max_frames = 1.</div><div class='add'>+		 */</div><div class='add'>+		if (ec &amp;&amp; !(ec-&gt;tx_coalesce_usecs_irq == 0 &amp;&amp;</div><div class='add'>+			    ec-&gt;tx_max_coalesced_frames_irq == 1)) {</div><div class='add'>+			u8 max;</div><div class='add'>+</div><div class='add'>+			/* use only max half of available objects for coalescing */</div><div class='add'>+			max = min_t(u8, num_tx / 2, config-&gt;fifo_depth);</div><div class='add'>+			num_tx_coalesce = clamp(ec-&gt;tx_max_coalesced_frames_irq,</div><div class='add'>+						(u32)config-&gt;tx.fifo_depth_coalesce_min,</div><div class='add'>+						(u32)max);</div><div class='add'>+			num_tx_coalesce = rounddown_pow_of_two(num_tx_coalesce);</div><div class='add'>+</div><div class='add'>+			num_tx = can_ram_rounddown_pow_of_two(config, &amp;config-&gt;tx,</div><div class='add'>+							      num_tx_coalesce, num_tx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		layout-&gt;cur_rx = num_rx;</div><div class='add'>+		layout-&gt;cur_tx = num_tx;</div><div class='add'>+		layout-&gt;rx_coalesce = num_rx_coalesce;</div><div class='add'>+		layout-&gt;tx_coalesce = num_tx_coalesce;</div><div class='add'>+	} else {</div><div class='add'>+		layout-&gt;cur_rx = layout-&gt;default_rx;</div><div class='add'>+		layout-&gt;cur_tx = layout-&gt;default_tx;</div><div class='add'>+		layout-&gt;rx_coalesce = 0;</div><div class='add'>+		layout-&gt;tx_coalesce = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h<br/>new file mode 100644<br/>index 000000000000..7558c1510cbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ram.h</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2021, 2022 Pengutronix,</div><div class='add'>+ *               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MCP251XFD_RAM_H</div><div class='add'>+#define _MCP251XFD_RAM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#define CAN_RAM_NUM_MAX (-1)</div><div class='add'>+</div><div class='add'>+enum can_ram_mode {</div><div class='add'>+	CAN_RAM_MODE_CAN,</div><div class='add'>+	CAN_RAM_MODE_CANFD,</div><div class='add'>+	__CAN_RAM_MODE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct can_ram_obj_config {</div><div class='add'>+	u8 size[__CAN_RAM_MODE_MAX];</div><div class='add'>+</div><div class='add'>+	u8 def[__CAN_RAM_MODE_MAX];</div><div class='add'>+	u8 min;</div><div class='add'>+	u8 max;</div><div class='add'>+</div><div class='add'>+	u8 fifo_num;</div><div class='add'>+	u8 fifo_depth_min;</div><div class='add'>+	u8 fifo_depth_coalesce_min;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct can_ram_config {</div><div class='add'>+	const struct can_ram_obj_config rx;</div><div class='add'>+	const struct can_ram_obj_config tx;</div><div class='add'>+</div><div class='add'>+	u16 size;</div><div class='add'>+	u8 fifo_depth;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct can_ram_layout {</div><div class='add'>+	u8 default_rx;</div><div class='add'>+	u8 default_tx;</div><div class='add'>+</div><div class='add'>+	u8 max_rx;</div><div class='add'>+	u8 max_tx;</div><div class='add'>+</div><div class='add'>+	u8 cur_rx;</div><div class='add'>+	u8 cur_tx;</div><div class='add'>+</div><div class='add'>+	u8 rx_coalesce;</div><div class='add'>+	u8 tx_coalesce;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void can_ram_get_layout(struct can_ram_layout *layout,</div><div class='add'>+			const struct can_ram_config *config,</div><div class='add'>+			const struct ethtool_ringparam *ring,</div><div class='add'>+			const struct ethtool_coalesce *ec,</div><div class='add'>+			const bool fd_mode);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c<br/>new file mode 100644<br/>index 000000000000..70d5ff0ae7ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c</a></div><div class='hunk'>@@ -0,0 +1,687 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+static const struct regmap_config mcp251xfd_regmap_crc;</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+_mcp251xfd_regmap_nocrc_gather_write(void *context,</div><div class='add'>+				     const void *reg, size_t reg_len,</div><div class='add'>+				     const void *val, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_tx = priv-&gt;map_buf_nocrc_tx;</div><div class='add'>+	struct spi_transfer xfer[] = {</div><div class='add'>+		{</div><div class='add'>+			.tx_buf = buf_tx,</div><div class='add'>+			.len = sizeof(buf_tx-&gt;cmd) + val_len,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_tx-&gt;cmd) != sizeof(__be16));</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &amp;&amp;</div><div class='add'>+	    reg_len != sizeof(buf_tx-&gt;cmd.cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;buf_tx-&gt;cmd, reg, sizeof(buf_tx-&gt;cmd));</div><div class='add'>+	memcpy(buf_tx-&gt;data, val, val_len);</div><div class='add'>+</div><div class='add'>+	return spi_sync_transfer(spi, xfer, ARRAY_SIZE(xfer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_nocrc_gather_write(void *context,</div><div class='add'>+				    const void *reg_p, size_t reg_len,</div><div class='add'>+				    const void *val, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	const u16 byte_exclude = MCP251XFD_REG_IOCON +</div><div class='add'>+				 mcp251xfd_first_byte_set(MCP251XFD_REG_IOCON_GPIO_MASK);</div><div class='add'>+	u16 reg = be16_to_cpu(*(__be16 *)reg_p) &amp; MCP251XFD_SPI_ADDRESS_MASK;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Never write to bits 16..23 of IOCON register to avoid clearing of LAT0/LAT1</div><div class='add'>+	 *</div><div class='add'>+	 * According to MCP2518FD Errata DS80000789E 5 writing IOCON register using one</div><div class='add'>+	 * SPI write command clears LAT0/LAT1.</div><div class='add'>+	 *</div><div class='add'>+	 * Errata Fix/Work Around suggests to write registers with single byte</div><div class='add'>+	 * write instructions. However, it seems that the byte at 0xe06(IOCON[23:16])</div><div class='add'>+	 * is for read-only access and writing to it causes the clearing of LAT0/LAT1.</div><div class='add'>+	 */</div><div class='add'>+	if (reg &lt;= byte_exclude &amp;&amp; reg + val_len &gt; byte_exclude) {</div><div class='add'>+		size_t len = byte_exclude - reg;</div><div class='add'>+</div><div class='add'>+		/* Write up to 0xe05 */</div><div class='add'>+		ret = _mcp251xfd_regmap_nocrc_gather_write(context, reg_p, reg_len, val, len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Write from 0xe07 on */</div><div class='add'>+		reg += len + 1;</div><div class='add'>+		reg = (__force unsigned short)cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_WRITE | reg);</div><div class='add'>+		return _mcp251xfd_regmap_nocrc_gather_write(context, &amp;reg, reg_len,</div><div class='add'>+							    val + len + 1,</div><div class='add'>+							    val_len - len - 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return _mcp251xfd_regmap_nocrc_gather_write(context, reg_p, reg_len,</div><div class='add'>+						  val, val_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_nocrc_write(void *context, const void *data, size_t count)</div><div class='add'>+{</div><div class='add'>+	const size_t data_offset = sizeof(__be16);</div><div class='add'>+</div><div class='add'>+	return mcp251xfd_regmap_nocrc_gather_write(context, data, data_offset,</div><div class='add'>+						   data + data_offset, count - data_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+mcp251xfd_update_bits_read_reg(const struct mcp251xfd_priv *priv,</div><div class='add'>+			       unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_rx_ring *ring;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case MCP251XFD_REG_INT:</div><div class='add'>+	case MCP251XFD_REG_TEFCON:</div><div class='add'>+	case MCP251XFD_REG_FLTCON(0):</div><div class='add'>+	case MCP251XFD_REG_ECCSTAT:</div><div class='add'>+	case MCP251XFD_REG_CRC:</div><div class='add'>+		return false;</div><div class='add'>+	case MCP251XFD_REG_CON:</div><div class='add'>+	case MCP251XFD_REG_OSC:</div><div class='add'>+	case MCP251XFD_REG_ECCCON:</div><div class='add'>+	case MCP251XFD_REG_IOCON:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		mcp251xfd_for_each_rx_ring(priv, ring, n) {</div><div class='add'>+			if (reg == MCP251XFD_REG_FIFOCON(ring-&gt;fifo_nr))</div><div class='add'>+				return false;</div><div class='add'>+			if (reg == MCP251XFD_REG_FIFOSTA(ring-&gt;fifo_nr))</div><div class='add'>+				return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WARN(1, "Status of reg 0x%04x unknown.\n", reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_nocrc_update_bits(void *context, unsigned int reg,</div><div class='add'>+				   unsigned int mask, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_rx = priv-&gt;map_buf_nocrc_rx;</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_tx = priv-&gt;map_buf_nocrc_tx;</div><div class='add'>+	__le32 orig_le32 = 0, mask_le32, val_le32, tmp_le32;</div><div class='add'>+	u8 first_byte, last_byte, len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_rx-&gt;cmd) != sizeof(__be16));</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_tx-&gt;cmd) != sizeof(__be16));</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &amp;&amp;</div><div class='add'>+	    mask == 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	first_byte = mcp251xfd_first_byte_set(mask);</div><div class='add'>+	last_byte = mcp251xfd_last_byte_set(mask);</div><div class='add'>+	len = last_byte - first_byte + 1;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_update_bits_read_reg(priv, reg)) {</div><div class='add'>+		struct spi_transfer xfer[2] = { };</div><div class='add'>+		struct spi_message msg;</div><div class='add'>+</div><div class='add'>+		spi_message_init(&amp;msg);</div><div class='add'>+		spi_message_add_tail(&amp;xfer[0], &amp;msg);</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_HALF_DUPLEX) {</div><div class='add'>+			xfer[0].tx_buf = buf_tx;</div><div class='add'>+			xfer[0].len = sizeof(buf_tx-&gt;cmd);</div><div class='add'>+</div><div class='add'>+			xfer[1].rx_buf = buf_rx-&gt;data;</div><div class='add'>+			xfer[1].len = len;</div><div class='add'>+			spi_message_add_tail(&amp;xfer[1], &amp;msg);</div><div class='add'>+		} else {</div><div class='add'>+			xfer[0].tx_buf = buf_tx;</div><div class='add'>+			xfer[0].rx_buf = buf_rx;</div><div class='add'>+			xfer[0].len = sizeof(buf_tx-&gt;cmd) + len;</div><div class='add'>+</div><div class='add'>+			if (MCP251XFD_SANITIZE_SPI)</div><div class='add'>+				memset(buf_tx-&gt;data, 0x0, len);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mcp251xfd_spi_cmd_read_nocrc(&amp;buf_tx-&gt;cmd, reg + first_byte);</div><div class='add'>+		err = spi_sync(spi, &amp;msg);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;orig_le32, buf_rx-&gt;data, len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask_le32 = cpu_to_le32(mask &gt;&gt; BITS_PER_BYTE * first_byte);</div><div class='add'>+	val_le32 = cpu_to_le32(val &gt;&gt; BITS_PER_BYTE * first_byte);</div><div class='add'>+</div><div class='add'>+	tmp_le32 = orig_le32 &amp; ~mask_le32;</div><div class='add'>+	tmp_le32 |= val_le32 &amp; mask_le32;</div><div class='add'>+</div><div class='add'>+	reg += first_byte;</div><div class='add'>+	mcp251xfd_spi_cmd_write_nocrc(&amp;buf_tx-&gt;cmd, reg);</div><div class='add'>+	return mcp251xfd_regmap_nocrc_gather_write(context, &amp;buf_tx-&gt;cmd, 2, &amp;tmp_le32, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_nocrc_read(void *context,</div><div class='add'>+			    const void *reg, size_t reg_len,</div><div class='add'>+			    void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_rx = priv-&gt;map_buf_nocrc_rx;</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *buf_tx = priv-&gt;map_buf_nocrc_tx;</div><div class='add'>+	struct spi_transfer xfer[2] = { };</div><div class='add'>+	struct spi_message msg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_rx-&gt;cmd) != sizeof(__be16));</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_tx-&gt;cmd) != sizeof(__be16));</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &amp;&amp;</div><div class='add'>+	    reg_len != sizeof(buf_tx-&gt;cmd.cmd))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;msg);</div><div class='add'>+	spi_message_add_tail(&amp;xfer[0], &amp;msg);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_HALF_DUPLEX) {</div><div class='add'>+		xfer[0].tx_buf = reg;</div><div class='add'>+		xfer[0].len = sizeof(buf_tx-&gt;cmd);</div><div class='add'>+</div><div class='add'>+		xfer[1].rx_buf = val_buf;</div><div class='add'>+		xfer[1].len = val_len;</div><div class='add'>+		spi_message_add_tail(&amp;xfer[1], &amp;msg);</div><div class='add'>+	} else {</div><div class='add'>+		xfer[0].tx_buf = buf_tx;</div><div class='add'>+		xfer[0].rx_buf = buf_rx;</div><div class='add'>+		xfer[0].len = sizeof(buf_tx-&gt;cmd) + val_len;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;buf_tx-&gt;cmd, reg, sizeof(buf_tx-&gt;cmd));</div><div class='add'>+		if (MCP251XFD_SANITIZE_SPI)</div><div class='add'>+			memset(buf_tx-&gt;data, 0x0, val_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = spi_sync(spi, &amp;msg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_HALF_DUPLEX))</div><div class='add'>+		memcpy(val_buf, buf_rx-&gt;data, val_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+_mcp251xfd_regmap_crc_gather_write(void *context,</div><div class='add'>+				   const void *reg_p, size_t reg_len,</div><div class='add'>+				   const void *val, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct mcp251xfd_map_buf_crc *buf_tx = priv-&gt;map_buf_crc_tx;</div><div class='add'>+	struct spi_transfer xfer[] = {</div><div class='add'>+		{</div><div class='add'>+			.tx_buf = buf_tx,</div><div class='add'>+			.len = sizeof(buf_tx-&gt;cmd) + val_len +</div><div class='add'>+				sizeof(buf_tx-&gt;crc),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	u16 reg = *(u16 *)reg_p;</div><div class='add'>+	u16 crc;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_tx-&gt;cmd) != sizeof(__be16) + sizeof(u8));</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &amp;&amp;</div><div class='add'>+	    reg_len != sizeof(buf_tx-&gt;cmd.cmd) +</div><div class='add'>+	    mcp251xfd_regmap_crc.pad_bits / BITS_PER_BYTE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_spi_cmd_write_crc(&amp;buf_tx-&gt;cmd, reg, val_len);</div><div class='add'>+	memcpy(buf_tx-&gt;data, val, val_len);</div><div class='add'>+</div><div class='add'>+	crc = mcp251xfd_crc16_compute(buf_tx, sizeof(buf_tx-&gt;cmd) + val_len);</div><div class='add'>+	put_unaligned_be16(crc, buf_tx-&gt;data + val_len);</div><div class='add'>+</div><div class='add'>+	return spi_sync_transfer(spi, xfer, ARRAY_SIZE(xfer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_crc_gather_write(void *context,</div><div class='add'>+				  const void *reg_p, size_t reg_len,</div><div class='add'>+				  const void *val, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	const u16 byte_exclude = MCP251XFD_REG_IOCON +</div><div class='add'>+				 mcp251xfd_first_byte_set(MCP251XFD_REG_IOCON_GPIO_MASK);</div><div class='add'>+	u16 reg = *(u16 *)reg_p;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Never write to bits 16..23 of IOCON register to avoid clearing of LAT0/LAT1</div><div class='add'>+	 *</div><div class='add'>+	 * According to MCP2518FD Errata DS80000789E 5 writing IOCON register using one</div><div class='add'>+	 * SPI write command clears LAT0/LAT1.</div><div class='add'>+	 *</div><div class='add'>+	 * Errata Fix/Work Around suggests to write registers with single byte</div><div class='add'>+	 * write instructions. However, it seems that the byte at 0xe06(IOCON[23:16])</div><div class='add'>+	 * is for read-only access and writing to it causes the clearing of LAT0/LAT1.</div><div class='add'>+	 */</div><div class='add'>+	if (reg &lt;= byte_exclude  &amp;&amp; reg + val_len &gt; byte_exclude) {</div><div class='add'>+		size_t len = byte_exclude - reg;</div><div class='add'>+</div><div class='add'>+		/* Write up to 0xe05 */</div><div class='add'>+		ret = _mcp251xfd_regmap_crc_gather_write(context, &amp;reg, reg_len, val, len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* Write from 0xe07 on */</div><div class='add'>+		reg += len + 1;</div><div class='add'>+		return _mcp251xfd_regmap_crc_gather_write(context, &amp;reg, reg_len,</div><div class='add'>+							  val + len + 1,</div><div class='add'>+							  val_len - len - 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return _mcp251xfd_regmap_crc_gather_write(context, reg_p, reg_len,</div><div class='add'>+						  val, val_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_crc_write(void *context,</div><div class='add'>+			   const void *data, size_t count)</div><div class='add'>+{</div><div class='add'>+	const size_t data_offset = sizeof(__be16) +</div><div class='add'>+		mcp251xfd_regmap_crc.pad_bits / BITS_PER_BYTE;</div><div class='add'>+</div><div class='add'>+	return mcp251xfd_regmap_crc_gather_write(context,</div><div class='add'>+						 data, data_offset,</div><div class='add'>+						 data + data_offset,</div><div class='add'>+						 count - data_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_crc_read_check_crc(const struct mcp251xfd_map_buf_crc * const buf_rx,</div><div class='add'>+				    const struct mcp251xfd_map_buf_crc * const buf_tx,</div><div class='add'>+				    unsigned int data_len)</div><div class='add'>+{</div><div class='add'>+	u16 crc_received, crc_calculated;</div><div class='add'>+</div><div class='add'>+	crc_received = get_unaligned_be16(buf_rx-&gt;data + data_len);</div><div class='add'>+	crc_calculated = mcp251xfd_crc16_compute2(&amp;buf_tx-&gt;cmd,</div><div class='add'>+						  sizeof(buf_tx-&gt;cmd),</div><div class='add'>+						  buf_rx-&gt;data,</div><div class='add'>+						  data_len);</div><div class='add'>+	if (crc_received != crc_calculated)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_crc_read_one(struct mcp251xfd_priv *priv,</div><div class='add'>+			      struct spi_message *msg, unsigned int data_len)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_map_buf_crc *buf_rx = priv-&gt;map_buf_crc_rx;</div><div class='add'>+	const struct mcp251xfd_map_buf_crc *buf_tx = priv-&gt;map_buf_crc_tx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_rx-&gt;cmd) != sizeof(__be16) + sizeof(u8));</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_tx-&gt;cmd) != sizeof(__be16) + sizeof(u8));</div><div class='add'>+</div><div class='add'>+	err = spi_sync(priv-&gt;spi, msg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mcp251xfd_regmap_crc_read_check_crc(buf_rx, buf_tx, data_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_crc_read(void *context,</div><div class='add'>+			  const void *reg_p, size_t reg_len,</div><div class='add'>+			  void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = context;</div><div class='add'>+	struct mcp251xfd_priv *priv = spi_get_drvdata(spi);</div><div class='add'>+	struct mcp251xfd_map_buf_crc *buf_rx = priv-&gt;map_buf_crc_rx;</div><div class='add'>+	struct mcp251xfd_map_buf_crc *buf_tx = priv-&gt;map_buf_crc_tx;</div><div class='add'>+	struct spi_transfer xfer[2] = { };</div><div class='add'>+	struct spi_message msg;</div><div class='add'>+	u16 reg = *(u16 *)reg_p;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_rx-&gt;cmd) != sizeof(__be16) + sizeof(u8));</div><div class='add'>+	BUILD_BUG_ON(sizeof(buf_tx-&gt;cmd) != sizeof(__be16) + sizeof(u8));</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &amp;&amp;</div><div class='add'>+	    reg_len != sizeof(buf_tx-&gt;cmd.cmd) +</div><div class='add'>+	    mcp251xfd_regmap_crc.pad_bits / BITS_PER_BYTE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;msg);</div><div class='add'>+	spi_message_add_tail(&amp;xfer[0], &amp;msg);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_HALF_DUPLEX) {</div><div class='add'>+		xfer[0].tx_buf = buf_tx;</div><div class='add'>+		xfer[0].len = sizeof(buf_tx-&gt;cmd);</div><div class='add'>+</div><div class='add'>+		xfer[1].rx_buf = buf_rx-&gt;data;</div><div class='add'>+		xfer[1].len = val_len + sizeof(buf_tx-&gt;crc);</div><div class='add'>+		spi_message_add_tail(&amp;xfer[1], &amp;msg);</div><div class='add'>+	} else {</div><div class='add'>+		xfer[0].tx_buf = buf_tx;</div><div class='add'>+		xfer[0].rx_buf = buf_rx;</div><div class='add'>+		xfer[0].len = sizeof(buf_tx-&gt;cmd) + val_len +</div><div class='add'>+			sizeof(buf_tx-&gt;crc);</div><div class='add'>+</div><div class='add'>+		if (MCP251XFD_SANITIZE_SPI)</div><div class='add'>+			memset(buf_tx-&gt;data, 0x0, val_len +</div><div class='add'>+			       sizeof(buf_tx-&gt;crc));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcp251xfd_spi_cmd_read_crc(&amp;buf_tx-&gt;cmd, reg, val_len);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MCP251XFD_READ_CRC_RETRIES_MAX; i++) {</div><div class='add'>+		err = mcp251xfd_regmap_crc_read_one(priv, &amp;msg, val_len);</div><div class='add'>+		if (!err)</div><div class='add'>+			goto out;</div><div class='add'>+		if (err != -EBADMSG)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* MCP251XFD_REG_TBC is the time base counter</div><div class='add'>+		 * register. It increments once per SYS clock tick,</div><div class='add'>+		 * which is 20 or 40 MHz.</div><div class='add'>+		 *</div><div class='add'>+		 * Observation on the mcp2518fd shows that if the</div><div class='add'>+		 * lowest byte (which is transferred first on the SPI</div><div class='add'>+		 * bus) of that register is 0x00 or 0x80 the</div><div class='add'>+		 * calculated CRC doesn't always match the transferred</div><div class='add'>+		 * one. On the mcp2517fd this problem is not limited</div><div class='add'>+		 * to the first byte being 0x00 or 0x80.</div><div class='add'>+		 *</div><div class='add'>+		 * If the highest bit in the lowest byte is flipped</div><div class='add'>+		 * the transferred CRC matches the calculated one. We</div><div class='add'>+		 * assume for now the CRC operates on the correct</div><div class='add'>+		 * data.</div><div class='add'>+		 */</div><div class='add'>+		if (reg == MCP251XFD_REG_TBC &amp;&amp;</div><div class='add'>+		    ((buf_rx-&gt;data[0] &amp; 0xf8) == 0x0 ||</div><div class='add'>+		     (buf_rx-&gt;data[0] &amp; 0xf8) == 0x80)) {</div><div class='add'>+			/* Flip highest bit in lowest byte of le32 */</div><div class='add'>+			buf_rx-&gt;data[0] ^= 0x80;</div><div class='add'>+</div><div class='add'>+			/* re-check CRC */</div><div class='add'>+			err = mcp251xfd_regmap_crc_read_check_crc(buf_rx,</div><div class='add'>+								  buf_tx,</div><div class='add'>+								  val_len);</div><div class='add'>+			if (!err) {</div><div class='add'>+				/* If CRC is now correct, assume</div><div class='add'>+				 * flipped data is OK.</div><div class='add'>+				 */</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* MCP251XFD_REG_OSC is the first ever reg we read from.</div><div class='add'>+		 *</div><div class='add'>+		 * The chip may be in deep sleep and this SPI transfer</div><div class='add'>+		 * (i.e. the assertion of the CS) will wake the chip</div><div class='add'>+		 * up. This takes about 3ms. The CRC of this transfer</div><div class='add'>+		 * is wrong.</div><div class='add'>+		 *</div><div class='add'>+		 * Or there isn't a chip at all, in this case the CRC</div><div class='add'>+		 * will be wrong, too.</div><div class='add'>+		 *</div><div class='add'>+		 * In both cases ignore the CRC and copy the read data</div><div class='add'>+		 * to the caller. It will take care of both cases.</div><div class='add'>+		 *</div><div class='add'>+		 */</div><div class='add'>+		if (reg == MCP251XFD_REG_OSC &amp;&amp; val_len == sizeof(__le32)) {</div><div class='add'>+			err = 0;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev_info(priv-&gt;ndev,</div><div class='add'>+			    "CRC read error at address 0x%04x (length=%zd, data=%*ph, CRC=0x%04x) retrying.\n",</div><div class='add'>+			    reg, val_len, (int)val_len, buf_rx-&gt;data,</div><div class='add'>+			    get_unaligned_be16(buf_rx-&gt;data + val_len));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "CRC read error at address 0x%04x (length=%zd, data=%*ph, CRC=0x%04x).\n",</div><div class='add'>+			   reg, val_len, (int)val_len, buf_rx-&gt;data,</div><div class='add'>+			   get_unaligned_be16(buf_rx-&gt;data + val_len));</div><div class='add'>+</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	memcpy(val_buf, buf_rx-&gt;data, val_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_range mcp251xfd_reg_table_yes_range[] = {</div><div class='add'>+	regmap_reg_range(0x000, 0x2ec),	/* CAN FD Controller Module SFR */</div><div class='add'>+	regmap_reg_range(0x400, 0xbfc),	/* RAM */</div><div class='add'>+	regmap_reg_range(0xe00, 0xe14),	/* MCP2517/18FD SFR */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table mcp251xfd_reg_table = {</div><div class='add'>+	.yes_ranges = mcp251xfd_reg_table_yes_range,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(mcp251xfd_reg_table_yes_range),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config mcp251xfd_regmap_nocrc = {</div><div class='add'>+	.name = "nocrc",</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.pad_bits = 0,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.max_register = 0xffc,</div><div class='add'>+	.wr_table = &amp;mcp251xfd_reg_table,</div><div class='add'>+	.rd_table = &amp;mcp251xfd_reg_table,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.read_flag_mask = (__force unsigned long)</div><div class='add'>+		cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_READ),</div><div class='add'>+	.write_flag_mask = (__force unsigned long)</div><div class='add'>+		cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_WRITE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus mcp251xfd_bus_nocrc = {</div><div class='add'>+	.write = mcp251xfd_regmap_nocrc_write,</div><div class='add'>+	.gather_write = mcp251xfd_regmap_nocrc_gather_write,</div><div class='add'>+	.reg_update_bits = mcp251xfd_regmap_nocrc_update_bits,</div><div class='add'>+	.read = mcp251xfd_regmap_nocrc_read,</div><div class='add'>+	.reg_format_endian_default = REGMAP_ENDIAN_BIG,</div><div class='add'>+	.val_format_endian_default = REGMAP_ENDIAN_LITTLE,</div><div class='add'>+	.max_raw_read = sizeof_field(struct mcp251xfd_map_buf_nocrc, data),</div><div class='add'>+	.max_raw_write = sizeof_field(struct mcp251xfd_map_buf_nocrc, data),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config mcp251xfd_regmap_crc = {</div><div class='add'>+	.name = "crc",</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.pad_bits = 16,		/* keep data bits aligned */</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.max_register = 0xffc,</div><div class='add'>+	.wr_table = &amp;mcp251xfd_reg_table,</div><div class='add'>+	.rd_table = &amp;mcp251xfd_reg_table,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus mcp251xfd_bus_crc = {</div><div class='add'>+	.write = mcp251xfd_regmap_crc_write,</div><div class='add'>+	.gather_write = mcp251xfd_regmap_crc_gather_write,</div><div class='add'>+	.read = mcp251xfd_regmap_crc_read,</div><div class='add'>+	.reg_format_endian_default = REGMAP_ENDIAN_NATIVE,</div><div class='add'>+	.val_format_endian_default = REGMAP_ENDIAN_LITTLE,</div><div class='add'>+	.max_raw_read = sizeof_field(struct mcp251xfd_map_buf_crc, data),</div><div class='add'>+	.max_raw_write = sizeof_field(struct mcp251xfd_map_buf_crc, data),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+mcp251xfd_regmap_use_nocrc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return (!(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_REG)) ||</div><div class='add'>+		(!(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_RX));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+mcp251xfd_regmap_use_crc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_REG) ||</div><div class='add'>+		(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_RX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_init_nocrc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;map_nocrc) {</div><div class='add'>+		struct regmap *map;</div><div class='add'>+</div><div class='add'>+		map = devm_regmap_init(&amp;priv-&gt;spi-&gt;dev, &amp;mcp251xfd_bus_nocrc,</div><div class='add'>+				       priv-&gt;spi, &amp;mcp251xfd_regmap_nocrc);</div><div class='add'>+		if (IS_ERR(map))</div><div class='add'>+			return PTR_ERR(map);</div><div class='add'>+</div><div class='add'>+		priv-&gt;map_nocrc = map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;map_buf_nocrc_rx) {</div><div class='add'>+		priv-&gt;map_buf_nocrc_rx =</div><div class='add'>+			devm_kzalloc(&amp;priv-&gt;spi-&gt;dev,</div><div class='add'>+				     sizeof(*priv-&gt;map_buf_nocrc_rx),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;map_buf_nocrc_rx)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;map_buf_nocrc_tx) {</div><div class='add'>+		priv-&gt;map_buf_nocrc_tx =</div><div class='add'>+			devm_kzalloc(&amp;priv-&gt;spi-&gt;dev,</div><div class='add'>+				     sizeof(*priv-&gt;map_buf_nocrc_tx),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;map_buf_nocrc_tx)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_REG))</div><div class='add'>+		priv-&gt;map_reg = priv-&gt;map_nocrc;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_RX))</div><div class='add'>+		priv-&gt;map_rx = priv-&gt;map_nocrc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_regmap_destroy_nocrc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;map_buf_nocrc_rx) {</div><div class='add'>+		devm_kfree(&amp;priv-&gt;spi-&gt;dev, priv-&gt;map_buf_nocrc_rx);</div><div class='add'>+		priv-&gt;map_buf_nocrc_rx = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;map_buf_nocrc_tx) {</div><div class='add'>+		devm_kfree(&amp;priv-&gt;spi-&gt;dev, priv-&gt;map_buf_nocrc_tx);</div><div class='add'>+		priv-&gt;map_buf_nocrc_tx = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_regmap_init_crc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;map_crc) {</div><div class='add'>+		struct regmap *map;</div><div class='add'>+</div><div class='add'>+		map = devm_regmap_init(&amp;priv-&gt;spi-&gt;dev, &amp;mcp251xfd_bus_crc,</div><div class='add'>+				       priv-&gt;spi, &amp;mcp251xfd_regmap_crc);</div><div class='add'>+		if (IS_ERR(map))</div><div class='add'>+			return PTR_ERR(map);</div><div class='add'>+</div><div class='add'>+		priv-&gt;map_crc = map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;map_buf_crc_rx) {</div><div class='add'>+		priv-&gt;map_buf_crc_rx =</div><div class='add'>+			devm_kzalloc(&amp;priv-&gt;spi-&gt;dev,</div><div class='add'>+				     sizeof(*priv-&gt;map_buf_crc_rx),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;map_buf_crc_rx)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;map_buf_crc_tx) {</div><div class='add'>+		priv-&gt;map_buf_crc_tx =</div><div class='add'>+			devm_kzalloc(&amp;priv-&gt;spi-&gt;dev,</div><div class='add'>+				     sizeof(*priv-&gt;map_buf_crc_tx),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;map_buf_crc_tx)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_REG)</div><div class='add'>+		priv-&gt;map_reg = priv-&gt;map_crc;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_RX)</div><div class='add'>+		priv-&gt;map_rx = priv-&gt;map_crc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_regmap_destroy_crc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;map_buf_crc_rx) {</div><div class='add'>+		devm_kfree(&amp;priv-&gt;spi-&gt;dev, priv-&gt;map_buf_crc_rx);</div><div class='add'>+		priv-&gt;map_buf_crc_rx = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;map_buf_crc_tx) {</div><div class='add'>+		devm_kfree(&amp;priv-&gt;spi-&gt;dev, priv-&gt;map_buf_crc_tx);</div><div class='add'>+		priv-&gt;map_buf_crc_tx = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mcp251xfd_regmap_init(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_regmap_use_nocrc(priv)) {</div><div class='add'>+		err = mcp251xfd_regmap_init_nocrc(priv);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		mcp251xfd_regmap_destroy_nocrc(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_regmap_use_crc(priv)) {</div><div class='add'>+		err = mcp251xfd_regmap_init_crc(priv);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		mcp251xfd_regmap_destroy_crc(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c<br/>new file mode 100644<br/>index 000000000000..c34f2067a989<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c</a></div><div class='hunk'>@@ -0,0 +1,551 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021, 2024 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+#include "mcp251xfd-ram.h"</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+mcp251xfd_cmd_prepare_write_reg(const struct mcp251xfd_priv *priv,</div><div class='add'>+				union mcp251xfd_write_reg_buf *write_reg_buf,</div><div class='add'>+				const u16 reg, const u32 mask, const u32 val)</div><div class='add'>+{</div><div class='add'>+	u8 first_byte, last_byte, len;</div><div class='add'>+	u8 *data;</div><div class='add'>+	__le32 val_le32;</div><div class='add'>+</div><div class='add'>+	first_byte = mcp251xfd_first_byte_set(mask);</div><div class='add'>+	last_byte = mcp251xfd_last_byte_set(mask);</div><div class='add'>+	len = last_byte - first_byte + 1;</div><div class='add'>+</div><div class='add'>+	data = mcp251xfd_spi_cmd_write(priv, write_reg_buf, reg + first_byte, len);</div><div class='add'>+	val_le32 = cpu_to_le32(val &gt;&gt; BITS_PER_BYTE * first_byte);</div><div class='add'>+	memcpy(data, &amp;val_le32, len);</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_REG)) {</div><div class='add'>+		len += sizeof(write_reg_buf-&gt;nocrc.cmd);</div><div class='add'>+	} else if (len == 1) {</div><div class='add'>+		u16 crc;</div><div class='add'>+</div><div class='add'>+		/* CRC */</div><div class='add'>+		len += sizeof(write_reg_buf-&gt;safe.cmd);</div><div class='add'>+		crc = mcp251xfd_crc16_compute(&amp;write_reg_buf-&gt;safe, len);</div><div class='add'>+		put_unaligned_be16(crc, (void *)write_reg_buf + len);</div><div class='add'>+</div><div class='add'>+		/* Total length */</div><div class='add'>+		len += sizeof(write_reg_buf-&gt;safe.crc);</div><div class='add'>+	} else {</div><div class='add'>+		u16 crc;</div><div class='add'>+</div><div class='add'>+		mcp251xfd_spi_cmd_crc_set_len_in_reg(&amp;write_reg_buf-&gt;crc.cmd,</div><div class='add'>+						     len);</div><div class='add'>+		/* CRC */</div><div class='add'>+		len += sizeof(write_reg_buf-&gt;crc.cmd);</div><div class='add'>+		crc = mcp251xfd_crc16_compute(&amp;write_reg_buf-&gt;crc, len);</div><div class='add'>+		put_unaligned_be16(crc, (void *)write_reg_buf + len);</div><div class='add'>+</div><div class='add'>+		/* Total length */</div><div class='add'>+		len += sizeof(write_reg_buf-&gt;crc.crc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_ring_init_tef(struct mcp251xfd_priv *priv, u16 *base)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_tef_ring *tef_ring;</div><div class='add'>+	struct spi_transfer *xfer;</div><div class='add'>+	u32 val;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8 len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* TEF */</div><div class='add'>+	tef_ring = priv-&gt;tef;</div><div class='add'>+	tef_ring-&gt;head = 0;</div><div class='add'>+	tef_ring-&gt;tail = 0;</div><div class='add'>+</div><div class='add'>+	/* TEF- and TX-FIFO have same number of objects */</div><div class='add'>+	*base = mcp251xfd_get_tef_obj_addr(priv-&gt;tx-&gt;obj_num);</div><div class='add'>+</div><div class='add'>+	/* FIFO IRQ enable */</div><div class='add'>+	addr = MCP251XFD_REG_TEFCON;</div><div class='add'>+	val = MCP251XFD_REG_TEFCON_TEFOVIE | MCP251XFD_REG_TEFCON_TEFNEIE;</div><div class='add'>+</div><div class='add'>+	len = mcp251xfd_cmd_prepare_write_reg(priv, &amp;tef_ring-&gt;irq_enable_buf,</div><div class='add'>+					      addr, val, val);</div><div class='add'>+	tef_ring-&gt;irq_enable_xfer.tx_buf = &amp;tef_ring-&gt;irq_enable_buf;</div><div class='add'>+	tef_ring-&gt;irq_enable_xfer.len = len;</div><div class='add'>+	spi_message_init_with_transfers(&amp;tef_ring-&gt;irq_enable_msg,</div><div class='add'>+					&amp;tef_ring-&gt;irq_enable_xfer, 1);</div><div class='add'>+</div><div class='add'>+	/* FIFO increment TEF tail pointer */</div><div class='add'>+	addr = MCP251XFD_REG_TEFCON;</div><div class='add'>+	val = MCP251XFD_REG_TEFCON_UINC;</div><div class='add'>+	len = mcp251xfd_cmd_prepare_write_reg(priv, &amp;tef_ring-&gt;uinc_buf,</div><div class='add'>+					      addr, val, val);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tef_ring-&gt;uinc_xfer); i++) {</div><div class='add'>+		xfer = &amp;tef_ring-&gt;uinc_xfer[i];</div><div class='add'>+		xfer-&gt;tx_buf = &amp;tef_ring-&gt;uinc_buf;</div><div class='add'>+		xfer-&gt;len = len;</div><div class='add'>+		xfer-&gt;cs_change = 1;</div><div class='add'>+		xfer-&gt;cs_change_delay.value = 0;</div><div class='add'>+		xfer-&gt;cs_change_delay.unit = SPI_DELAY_UNIT_NSECS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* "cs_change == 1" on the last transfer results in an active</div><div class='add'>+	 * chip select after the complete SPI message. This causes the</div><div class='add'>+	 * controller to interpret the next register access as</div><div class='add'>+	 * data. Set "cs_change" of the last transfer to "0" to</div><div class='add'>+	 * properly deactivate the chip select at the end of the</div><div class='add'>+	 * message.</div><div class='add'>+	 */</div><div class='add'>+	xfer-&gt;cs_change = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_coalesce_usecs_irq || priv-&gt;tx_obj_num_coalesce_irq) {</div><div class='add'>+		val = MCP251XFD_REG_TEFCON_UINC |</div><div class='add'>+			MCP251XFD_REG_TEFCON_TEFOVIE |</div><div class='add'>+			MCP251XFD_REG_TEFCON_TEFHIE;</div><div class='add'>+</div><div class='add'>+		len = mcp251xfd_cmd_prepare_write_reg(priv,</div><div class='add'>+						      &amp;tef_ring-&gt;uinc_irq_disable_buf,</div><div class='add'>+						      addr, val, val);</div><div class='add'>+		xfer-&gt;tx_buf = &amp;tef_ring-&gt;uinc_irq_disable_buf;</div><div class='add'>+		xfer-&gt;len = len;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_tx_ring_init_tx_obj(const struct mcp251xfd_priv *priv,</div><div class='add'>+			      const struct mcp251xfd_tx_ring *ring,</div><div class='add'>+			      struct mcp251xfd_tx_obj *tx_obj,</div><div class='add'>+			      const u8 rts_buf_len,</div><div class='add'>+			      const u8 n)</div><div class='add'>+{</div><div class='add'>+	struct spi_transfer *xfer;</div><div class='add'>+	u16 addr;</div><div class='add'>+</div><div class='add'>+	/* FIFO load */</div><div class='add'>+	addr = mcp251xfd_get_tx_obj_addr(ring, n);</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_TX)</div><div class='add'>+		mcp251xfd_spi_cmd_write_crc_set_addr(&amp;tx_obj-&gt;buf.crc.cmd,</div><div class='add'>+						     addr);</div><div class='add'>+	else</div><div class='add'>+		mcp251xfd_spi_cmd_write_nocrc(&amp;tx_obj-&gt;buf.nocrc.cmd,</div><div class='add'>+					      addr);</div><div class='add'>+</div><div class='add'>+	xfer = &amp;tx_obj-&gt;xfer[0];</div><div class='add'>+	xfer-&gt;tx_buf = &amp;tx_obj-&gt;buf;</div><div class='add'>+	xfer-&gt;len = 0;	/* actual len is assigned on the fly */</div><div class='add'>+	xfer-&gt;cs_change = 1;</div><div class='add'>+	xfer-&gt;cs_change_delay.value = 0;</div><div class='add'>+	xfer-&gt;cs_change_delay.unit = SPI_DELAY_UNIT_NSECS;</div><div class='add'>+</div><div class='add'>+	/* FIFO request to send */</div><div class='add'>+	xfer = &amp;tx_obj-&gt;xfer[1];</div><div class='add'>+	xfer-&gt;tx_buf = &amp;ring-&gt;rts_buf;</div><div class='add'>+	xfer-&gt;len = rts_buf_len;</div><div class='add'>+</div><div class='add'>+	/* SPI message */</div><div class='add'>+	spi_message_init_with_transfers(&amp;tx_obj-&gt;msg, tx_obj-&gt;xfer,</div><div class='add'>+					ARRAY_SIZE(tx_obj-&gt;xfer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_ring_init_tx(struct mcp251xfd_priv *priv, u16 *base, u8 *fifo_nr)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_tx_ring *tx_ring;</div><div class='add'>+	struct mcp251xfd_tx_obj *tx_obj;</div><div class='add'>+	u32 val;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8 len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tx_ring = priv-&gt;tx;</div><div class='add'>+	tx_ring-&gt;head = 0;</div><div class='add'>+	tx_ring-&gt;tail = 0;</div><div class='add'>+	tx_ring-&gt;base = *base;</div><div class='add'>+	tx_ring-&gt;nr = 0;</div><div class='add'>+	tx_ring-&gt;fifo_nr = *fifo_nr;</div><div class='add'>+</div><div class='add'>+	*base = mcp251xfd_get_tx_obj_addr(tx_ring, tx_ring-&gt;obj_num);</div><div class='add'>+	*fifo_nr += 1;</div><div class='add'>+</div><div class='add'>+	/* FIFO request to send */</div><div class='add'>+	addr = MCP251XFD_REG_FIFOCON(tx_ring-&gt;fifo_nr);</div><div class='add'>+	val = MCP251XFD_REG_FIFOCON_TXREQ | MCP251XFD_REG_FIFOCON_UINC;</div><div class='add'>+	len = mcp251xfd_cmd_prepare_write_reg(priv, &amp;tx_ring-&gt;rts_buf,</div><div class='add'>+					      addr, val, val);</div><div class='add'>+</div><div class='add'>+	mcp251xfd_for_each_tx_obj(tx_ring, tx_obj, i)</div><div class='add'>+		mcp251xfd_tx_ring_init_tx_obj(priv, tx_ring, tx_obj, len, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_ring_init_rx(struct mcp251xfd_priv *priv, u16 *base, u8 *fifo_nr)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_rx_ring *rx_ring;</div><div class='add'>+	struct spi_transfer *xfer;</div><div class='add'>+	u32 val;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u8 len;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_for_each_rx_ring(priv, rx_ring, i) {</div><div class='add'>+		rx_ring-&gt;last_valid = timecounter_read(&amp;priv-&gt;tc);</div><div class='add'>+		rx_ring-&gt;head = 0;</div><div class='add'>+		rx_ring-&gt;tail = 0;</div><div class='add'>+		rx_ring-&gt;base = *base;</div><div class='add'>+		rx_ring-&gt;nr = i;</div><div class='add'>+		rx_ring-&gt;fifo_nr = *fifo_nr;</div><div class='add'>+</div><div class='add'>+		*base = mcp251xfd_get_rx_obj_addr(rx_ring, rx_ring-&gt;obj_num);</div><div class='add'>+		*fifo_nr += 1;</div><div class='add'>+</div><div class='add'>+		/* FIFO IRQ enable */</div><div class='add'>+		addr = MCP251XFD_REG_FIFOCON(rx_ring-&gt;fifo_nr);</div><div class='add'>+		val = MCP251XFD_REG_FIFOCON_RXOVIE |</div><div class='add'>+			MCP251XFD_REG_FIFOCON_TFNRFNIE;</div><div class='add'>+		len = mcp251xfd_cmd_prepare_write_reg(priv, &amp;rx_ring-&gt;irq_enable_buf,</div><div class='add'>+						      addr, val, val);</div><div class='add'>+		rx_ring-&gt;irq_enable_xfer.tx_buf = &amp;rx_ring-&gt;irq_enable_buf;</div><div class='add'>+		rx_ring-&gt;irq_enable_xfer.len = len;</div><div class='add'>+		spi_message_init_with_transfers(&amp;rx_ring-&gt;irq_enable_msg,</div><div class='add'>+						&amp;rx_ring-&gt;irq_enable_xfer, 1);</div><div class='add'>+</div><div class='add'>+		/* FIFO increment RX tail pointer */</div><div class='add'>+		val = MCP251XFD_REG_FIFOCON_UINC;</div><div class='add'>+		len = mcp251xfd_cmd_prepare_write_reg(priv, &amp;rx_ring-&gt;uinc_buf,</div><div class='add'>+						      addr, val, val);</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(rx_ring-&gt;uinc_xfer); j++) {</div><div class='add'>+			xfer = &amp;rx_ring-&gt;uinc_xfer[j];</div><div class='add'>+			xfer-&gt;tx_buf = &amp;rx_ring-&gt;uinc_buf;</div><div class='add'>+			xfer-&gt;len = len;</div><div class='add'>+			xfer-&gt;cs_change = 1;</div><div class='add'>+			xfer-&gt;cs_change_delay.value = 0;</div><div class='add'>+			xfer-&gt;cs_change_delay.unit = SPI_DELAY_UNIT_NSECS;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* "cs_change == 1" on the last transfer results in an</div><div class='add'>+		 * active chip select after the complete SPI</div><div class='add'>+		 * message. This causes the controller to interpret</div><div class='add'>+		 * the next register access as data. Set "cs_change"</div><div class='add'>+		 * of the last transfer to "0" to properly deactivate</div><div class='add'>+		 * the chip select at the end of the message.</div><div class='add'>+		 */</div><div class='add'>+		xfer-&gt;cs_change = 0;</div><div class='add'>+</div><div class='add'>+		/* Use 1st RX-FIFO for IRQ coalescing. If enabled</div><div class='add'>+		 * (rx_coalesce_usecs_irq or rx_max_coalesce_frames_irq</div><div class='add'>+		 * is activated), use the last transfer to disable:</div><div class='add'>+		 *</div><div class='add'>+		 * - TFNRFNIE (Receive FIFO Not Empty Interrupt)</div><div class='add'>+		 *</div><div class='add'>+		 * and enable:</div><div class='add'>+		 *</div><div class='add'>+		 * - TFHRFHIE (Receive FIFO Half Full Interrupt)</div><div class='add'>+		 *   - or -</div><div class='add'>+		 * - TFERFFIE (Receive FIFO Full Interrupt)</div><div class='add'>+		 *</div><div class='add'>+		 * depending on rx_max_coalesce_frames_irq.</div><div class='add'>+		 *</div><div class='add'>+		 * The RXOVIE (Overflow Interrupt) is always enabled.</div><div class='add'>+		 */</div><div class='add'>+		if (rx_ring-&gt;nr == 0 &amp;&amp; (priv-&gt;rx_coalesce_usecs_irq ||</div><div class='add'>+					 priv-&gt;rx_obj_num_coalesce_irq)) {</div><div class='add'>+			val = MCP251XFD_REG_FIFOCON_UINC |</div><div class='add'>+				MCP251XFD_REG_FIFOCON_RXOVIE;</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;rx_obj_num_coalesce_irq == rx_ring-&gt;obj_num)</div><div class='add'>+				val |= MCP251XFD_REG_FIFOCON_TFERFFIE;</div><div class='add'>+			else if (priv-&gt;rx_obj_num_coalesce_irq)</div><div class='add'>+				val |= MCP251XFD_REG_FIFOCON_TFHRFHIE;</div><div class='add'>+</div><div class='add'>+			len = mcp251xfd_cmd_prepare_write_reg(priv,</div><div class='add'>+							      &amp;rx_ring-&gt;uinc_irq_disable_buf,</div><div class='add'>+							      addr, val, val);</div><div class='add'>+			xfer-&gt;tx_buf = &amp;rx_ring-&gt;uinc_irq_disable_buf;</div><div class='add'>+			xfer-&gt;len = len;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mcp251xfd_ring_init(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_rx_ring *rx_ring;</div><div class='add'>+	u16 base = 0, ram_used;</div><div class='add'>+	u8 fifo_nr = 1;</div><div class='add'>+	int err = 0, i;</div><div class='add'>+</div><div class='add'>+	netdev_reset_queue(priv-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	mcp251xfd_ring_init_tef(priv, &amp;base);</div><div class='add'>+	mcp251xfd_ring_init_rx(priv, &amp;base, &amp;fifo_nr);</div><div class='add'>+	mcp251xfd_ring_init_tx(priv, &amp;base, &amp;fifo_nr);</div><div class='add'>+</div><div class='add'>+	/* mcp251xfd_handle_rxif() will iterate over all RX rings.</div><div class='add'>+	 * Rings with their corresponding bit set in</div><div class='add'>+	 * priv-&gt;regs_status.rxif are read out.</div><div class='add'>+	 *</div><div class='add'>+	 * If the chip is configured for only 1 RX-FIFO, and if there</div><div class='add'>+	 * is an RX interrupt pending (RXIF in INT register is set),</div><div class='add'>+	 * it must be the 1st RX-FIFO.</div><div class='add'>+	 *</div><div class='add'>+	 * We mark the RXIF of the 1st FIFO as pending here, so that</div><div class='add'>+	 * we can skip the read of the RXIF register in</div><div class='add'>+	 * mcp251xfd_read_regs_status() for the 1 RX-FIFO only case.</div><div class='add'>+	 *</div><div class='add'>+	 * If we use more than 1 RX-FIFO, this value gets overwritten</div><div class='add'>+	 * in mcp251xfd_read_regs_status(), so set it unconditionally</div><div class='add'>+	 * here.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;regs_status.rxif = BIT(priv-&gt;rx[0]-&gt;fifo_nr);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_obj_num_coalesce_irq) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "FIFO setup: TEF:         0x%03x: %2d*%zu bytes = %4zu bytes (coalesce)\n",</div><div class='add'>+			   mcp251xfd_get_tef_obj_addr(0),</div><div class='add'>+			   priv-&gt;tx_obj_num_coalesce_irq,</div><div class='add'>+			   sizeof(struct mcp251xfd_hw_tef_obj),</div><div class='add'>+			   priv-&gt;tx_obj_num_coalesce_irq *</div><div class='add'>+			   sizeof(struct mcp251xfd_hw_tef_obj));</div><div class='add'>+</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "                         0x%03x: %2d*%zu bytes = %4zu bytes\n",</div><div class='add'>+			   mcp251xfd_get_tef_obj_addr(priv-&gt;tx_obj_num_coalesce_irq),</div><div class='add'>+			   priv-&gt;tx-&gt;obj_num - priv-&gt;tx_obj_num_coalesce_irq,</div><div class='add'>+			   sizeof(struct mcp251xfd_hw_tef_obj),</div><div class='add'>+			   (priv-&gt;tx-&gt;obj_num - priv-&gt;tx_obj_num_coalesce_irq) *</div><div class='add'>+			   sizeof(struct mcp251xfd_hw_tef_obj));</div><div class='add'>+	} else {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "FIFO setup: TEF:         0x%03x: %2d*%zu bytes = %4zu bytes\n",</div><div class='add'>+			   mcp251xfd_get_tef_obj_addr(0),</div><div class='add'>+			   priv-&gt;tx-&gt;obj_num, sizeof(struct mcp251xfd_hw_tef_obj),</div><div class='add'>+			   priv-&gt;tx-&gt;obj_num * sizeof(struct mcp251xfd_hw_tef_obj));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcp251xfd_for_each_rx_ring(priv, rx_ring, i) {</div><div class='add'>+		if (rx_ring-&gt;nr == 0 &amp;&amp; priv-&gt;rx_obj_num_coalesce_irq) {</div><div class='add'>+			netdev_dbg(priv-&gt;ndev,</div><div class='add'>+				   "FIFO setup: RX-%u: FIFO %u/0x%03x: %2u*%u bytes = %4u bytes (coalesce)\n",</div><div class='add'>+				   rx_ring-&gt;nr, rx_ring-&gt;fifo_nr,</div><div class='add'>+				   mcp251xfd_get_rx_obj_addr(rx_ring, 0),</div><div class='add'>+				   priv-&gt;rx_obj_num_coalesce_irq, rx_ring-&gt;obj_size,</div><div class='add'>+				   priv-&gt;rx_obj_num_coalesce_irq * rx_ring-&gt;obj_size);</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;rx_obj_num_coalesce_irq == MCP251XFD_FIFO_DEPTH)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			netdev_dbg(priv-&gt;ndev,</div><div class='add'>+				   "                         0x%03x: %2u*%u bytes = %4u bytes\n",</div><div class='add'>+				   mcp251xfd_get_rx_obj_addr(rx_ring,</div><div class='add'>+							     priv-&gt;rx_obj_num_coalesce_irq),</div><div class='add'>+				   rx_ring-&gt;obj_num - priv-&gt;rx_obj_num_coalesce_irq,</div><div class='add'>+				   rx_ring-&gt;obj_size,</div><div class='add'>+				   (rx_ring-&gt;obj_num - priv-&gt;rx_obj_num_coalesce_irq) *</div><div class='add'>+				   rx_ring-&gt;obj_size);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_dbg(priv-&gt;ndev,</div><div class='add'>+				   "FIFO setup: RX-%u: FIFO %u/0x%03x: %2u*%u bytes = %4u bytes\n",</div><div class='add'>+				   rx_ring-&gt;nr, rx_ring-&gt;fifo_nr,</div><div class='add'>+				   mcp251xfd_get_rx_obj_addr(rx_ring, 0),</div><div class='add'>+				   rx_ring-&gt;obj_num, rx_ring-&gt;obj_size,</div><div class='add'>+				   rx_ring-&gt;obj_num * rx_ring-&gt;obj_size);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev,</div><div class='add'>+		   "FIFO setup: TX:   FIFO %u/0x%03x: %2u*%u bytes = %4u bytes\n",</div><div class='add'>+		   priv-&gt;tx-&gt;fifo_nr,</div><div class='add'>+		   mcp251xfd_get_tx_obj_addr(priv-&gt;tx, 0),</div><div class='add'>+		   priv-&gt;tx-&gt;obj_num, priv-&gt;tx-&gt;obj_size,</div><div class='add'>+		   priv-&gt;tx-&gt;obj_num * priv-&gt;tx-&gt;obj_size);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;ndev,</div><div class='add'>+		   "FIFO setup: free:                             %4d bytes\n",</div><div class='add'>+		   MCP251XFD_RAM_SIZE - (base - MCP251XFD_RAM_START));</div><div class='add'>+</div><div class='add'>+	ram_used = base - MCP251XFD_RAM_START;</div><div class='add'>+	if (ram_used &gt; MCP251XFD_RAM_SIZE) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Error during ring configuration, using more RAM (%u bytes) than available (%u bytes).\n",</div><div class='add'>+			   ram_used, MCP251XFD_RAM_SIZE);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_obj_num_coalesce_irq &amp;&amp;</div><div class='add'>+	    priv-&gt;tx_obj_num_coalesce_irq * 2 != priv-&gt;tx-&gt;obj_num) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Error during ring configuration, number of TEF coalescing buffers (%u) must be half of TEF buffers (%u).\n",</div><div class='add'>+			   priv-&gt;tx_obj_num_coalesce_irq, priv-&gt;tx-&gt;obj_num);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mcp251xfd_ring_free(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = ARRAY_SIZE(priv-&gt;rx) - 1; i &gt;= 0; i--) {</div><div class='add'>+		kfree(priv-&gt;rx[i]);</div><div class='add'>+		priv-&gt;rx[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart mcp251xfd_rx_irq_timer(struct hrtimer *t)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = container_of(t, struct mcp251xfd_priv,</div><div class='add'>+						   rx_irq_timer);</div><div class='add'>+	struct mcp251xfd_rx_ring *ring = priv-&gt;rx[0];</div><div class='add'>+</div><div class='add'>+	if (test_bit(MCP251XFD_FLAGS_DOWN, priv-&gt;flags))</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	spi_async(priv-&gt;spi, &amp;ring-&gt;irq_enable_msg);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum hrtimer_restart mcp251xfd_tx_irq_timer(struct hrtimer *t)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = container_of(t, struct mcp251xfd_priv,</div><div class='add'>+						   tx_irq_timer);</div><div class='add'>+	struct mcp251xfd_tef_ring *ring = priv-&gt;tef;</div><div class='add'>+</div><div class='add'>+	if (test_bit(MCP251XFD_FLAGS_DOWN, priv-&gt;flags))</div><div class='add'>+		return HRTIMER_NORESTART;</div><div class='add'>+</div><div class='add'>+	spi_async(priv-&gt;spi, &amp;ring-&gt;irq_enable_msg);</div><div class='add'>+</div><div class='add'>+	return HRTIMER_NORESTART;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct can_ram_config mcp251xfd_ram_config = {</div><div class='add'>+	.rx = {</div><div class='add'>+		.size[CAN_RAM_MODE_CAN] = sizeof(struct mcp251xfd_hw_rx_obj_can),</div><div class='add'>+		.size[CAN_RAM_MODE_CANFD] = sizeof(struct mcp251xfd_hw_rx_obj_canfd),</div><div class='add'>+		.min = MCP251XFD_RX_OBJ_NUM_MIN,</div><div class='add'>+		.max = MCP251XFD_RX_OBJ_NUM_MAX,</div><div class='add'>+		.def[CAN_RAM_MODE_CAN] = CAN_RAM_NUM_MAX,</div><div class='add'>+		.def[CAN_RAM_MODE_CANFD] = CAN_RAM_NUM_MAX,</div><div class='add'>+		.fifo_num = MCP251XFD_FIFO_RX_NUM,</div><div class='add'>+		.fifo_depth_min = MCP251XFD_RX_FIFO_DEPTH_MIN,</div><div class='add'>+		.fifo_depth_coalesce_min = MCP251XFD_RX_FIFO_DEPTH_COALESCE_MIN,</div><div class='add'>+	},</div><div class='add'>+	.tx = {</div><div class='add'>+		.size[CAN_RAM_MODE_CAN] = sizeof(struct mcp251xfd_hw_tef_obj) +</div><div class='add'>+			sizeof(struct mcp251xfd_hw_tx_obj_can),</div><div class='add'>+		.size[CAN_RAM_MODE_CANFD] = sizeof(struct mcp251xfd_hw_tef_obj) +</div><div class='add'>+			sizeof(struct mcp251xfd_hw_tx_obj_canfd),</div><div class='add'>+		.min = MCP251XFD_TX_OBJ_NUM_MIN,</div><div class='add'>+		.max = MCP251XFD_TX_OBJ_NUM_MAX,</div><div class='add'>+		.def[CAN_RAM_MODE_CAN] = MCP251XFD_TX_OBJ_NUM_CAN_DEFAULT,</div><div class='add'>+		.def[CAN_RAM_MODE_CANFD] = MCP251XFD_TX_OBJ_NUM_CANFD_DEFAULT,</div><div class='add'>+		.fifo_num = MCP251XFD_FIFO_TX_NUM,</div><div class='add'>+		.fifo_depth_min = MCP251XFD_TX_FIFO_DEPTH_MIN,</div><div class='add'>+		.fifo_depth_coalesce_min = MCP251XFD_TX_FIFO_DEPTH_COALESCE_MIN,</div><div class='add'>+	},</div><div class='add'>+	.size = MCP251XFD_RAM_SIZE,</div><div class='add'>+	.fifo_depth = MCP251XFD_FIFO_DEPTH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mcp251xfd_ring_alloc(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const bool fd_mode = mcp251xfd_is_fd_mode(priv);</div><div class='add'>+	struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	struct mcp251xfd_rx_ring *rx_ring;</div><div class='add'>+	u8 tx_obj_size, rx_obj_size;</div><div class='add'>+	u8 rem, i;</div><div class='add'>+</div><div class='add'>+	/* switching from CAN-2.0 to CAN-FD mode or vice versa */</div><div class='add'>+	if (fd_mode != test_bit(MCP251XFD_FLAGS_FD_MODE, priv-&gt;flags)) {</div><div class='add'>+		const struct ethtool_ringparam ring = {</div><div class='add'>+			.rx_pending = priv-&gt;rx_obj_num,</div><div class='add'>+			.tx_pending = priv-&gt;tx-&gt;obj_num,</div><div class='add'>+		};</div><div class='add'>+		const struct ethtool_coalesce ec = {</div><div class='add'>+			.rx_coalesce_usecs_irq = priv-&gt;rx_coalesce_usecs_irq,</div><div class='add'>+			.rx_max_coalesced_frames_irq = priv-&gt;rx_obj_num_coalesce_irq == 0 ?</div><div class='add'>+				1 : priv-&gt;rx_obj_num_coalesce_irq,</div><div class='add'>+			.tx_coalesce_usecs_irq = priv-&gt;tx_coalesce_usecs_irq,</div><div class='add'>+			.tx_max_coalesced_frames_irq = priv-&gt;tx_obj_num_coalesce_irq == 0 ?</div><div class='add'>+				1 : priv-&gt;tx_obj_num_coalesce_irq,</div><div class='add'>+		};</div><div class='add'>+		struct can_ram_layout layout;</div><div class='add'>+</div><div class='add'>+		can_ram_get_layout(&amp;layout, &amp;mcp251xfd_ram_config, &amp;ring, &amp;ec, fd_mode);</div><div class='add'>+</div><div class='add'>+		priv-&gt;rx_obj_num = layout.cur_rx;</div><div class='add'>+		priv-&gt;rx_obj_num_coalesce_irq = layout.rx_coalesce;</div><div class='add'>+</div><div class='add'>+		tx_ring-&gt;obj_num = layout.cur_tx;</div><div class='add'>+		priv-&gt;tx_obj_num_coalesce_irq = layout.tx_coalesce;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fd_mode) {</div><div class='add'>+		tx_obj_size = sizeof(struct mcp251xfd_hw_tx_obj_canfd);</div><div class='add'>+		rx_obj_size = sizeof(struct mcp251xfd_hw_rx_obj_canfd);</div><div class='add'>+		set_bit(MCP251XFD_FLAGS_FD_MODE, priv-&gt;flags);</div><div class='add'>+	} else {</div><div class='add'>+		tx_obj_size = sizeof(struct mcp251xfd_hw_tx_obj_can);</div><div class='add'>+		rx_obj_size = sizeof(struct mcp251xfd_hw_rx_obj_can);</div><div class='add'>+		clear_bit(MCP251XFD_FLAGS_FD_MODE, priv-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;obj_num_shift_to_u8 = BITS_PER_TYPE(tx_ring-&gt;obj_num) -</div><div class='add'>+		ilog2(tx_ring-&gt;obj_num);</div><div class='add'>+	tx_ring-&gt;obj_size = tx_obj_size;</div><div class='add'>+</div><div class='add'>+	rem = priv-&gt;rx_obj_num;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;rx) &amp;&amp; rem; i++) {</div><div class='add'>+		u8 rx_obj_num;</div><div class='add'>+</div><div class='add'>+		if (i == 0 &amp;&amp; priv-&gt;rx_obj_num_coalesce_irq)</div><div class='add'>+			rx_obj_num = min_t(u8, priv-&gt;rx_obj_num_coalesce_irq * 2,</div><div class='add'>+					   MCP251XFD_FIFO_DEPTH);</div><div class='add'>+		else</div><div class='add'>+			rx_obj_num = min_t(u8, rounddown_pow_of_two(rem),</div><div class='add'>+					   MCP251XFD_FIFO_DEPTH);</div><div class='add'>+		rem -= rx_obj_num;</div><div class='add'>+</div><div class='add'>+		rx_ring = kzalloc(sizeof(*rx_ring) + rx_obj_size * rx_obj_num,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+		if (!rx_ring) {</div><div class='add'>+			mcp251xfd_ring_free(priv);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_ring-&gt;obj_num = rx_obj_num;</div><div class='add'>+		rx_ring-&gt;obj_num_shift_to_u8 = BITS_PER_TYPE(rx_ring-&gt;obj_num_shift_to_u8) -</div><div class='add'>+			ilog2(rx_obj_num);</div><div class='add'>+		rx_ring-&gt;obj_size = rx_obj_size;</div><div class='add'>+		priv-&gt;rx[i] = rx_ring;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;rx_ring_num = i;</div><div class='add'>+</div><div class='add'>+	hrtimer_setup(&amp;priv-&gt;rx_irq_timer, mcp251xfd_rx_irq_timer, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL);</div><div class='add'>+</div><div class='add'>+	hrtimer_setup(&amp;priv-&gt;tx_irq_timer, mcp251xfd_tx_irq_timer, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c<br/>new file mode 100644<br/>index 000000000000..fe897f3e4c12<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c</a></div><div class='hunk'>@@ -0,0 +1,333 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021, 2023 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_rx_fifo_sta_empty(const u32 fifo_sta)</div><div class='add'>+{</div><div class='add'>+	return !(fifo_sta &amp; MCP251XFD_REG_FIFOSTA_TFNRFNIF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_rx_fifo_sta_full(const u32 fifo_sta)</div><div class='add'>+{</div><div class='add'>+	return fifo_sta &amp; MCP251XFD_REG_FIFOSTA_TFERFFIF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_rx_tail_get_from_chip(const struct mcp251xfd_priv *priv,</div><div class='add'>+				const struct mcp251xfd_rx_ring *ring,</div><div class='add'>+				u8 *rx_tail)</div><div class='add'>+{</div><div class='add'>+	u32 fifo_ua;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_FIFOUA(ring-&gt;fifo_nr),</div><div class='add'>+			  &amp;fifo_ua);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	fifo_ua -= ring-&gt;base - MCP251XFD_RAM_START;</div><div class='add'>+	*rx_tail = fifo_ua / ring-&gt;obj_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_check_rx_tail(const struct mcp251xfd_priv *priv,</div><div class='add'>+			const struct mcp251xfd_rx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	u8 rx_tail_chip, rx_tail;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_rx_tail_get_from_chip(priv, ring, &amp;rx_tail_chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rx_tail = mcp251xfd_get_rx_tail(ring);</div><div class='add'>+	if (rx_tail_chip != rx_tail) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "RX tail of chip (%d) and ours (%d) inconsistent.\n",</div><div class='add'>+			   rx_tail_chip, rx_tail);</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_get_rx_len(const struct mcp251xfd_priv *priv,</div><div class='add'>+		     const struct mcp251xfd_rx_ring *ring,</div><div class='add'>+		     u8 *len_p)</div><div class='add'>+{</div><div class='add'>+	const u8 shift = ring-&gt;obj_num_shift_to_u8;</div><div class='add'>+	u8 chip_head, tail, len;</div><div class='add'>+	u32 fifo_sta;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_FIFOSTA(ring-&gt;fifo_nr),</div><div class='add'>+			  &amp;fifo_sta);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_rx_fifo_sta_empty(fifo_sta)) {</div><div class='add'>+		*len_p = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_rx_fifo_sta_full(fifo_sta)) {</div><div class='add'>+		*len_p = ring-&gt;obj_num;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip_head = FIELD_GET(MCP251XFD_REG_FIFOSTA_FIFOCI_MASK, fifo_sta);</div><div class='add'>+</div><div class='add'>+	err =  mcp251xfd_check_rx_tail(priv, ring);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	tail = mcp251xfd_get_rx_tail(ring);</div><div class='add'>+</div><div class='add'>+	/* First shift to full u8. The subtraction works on signed</div><div class='add'>+	 * values, that keeps the difference steady around the u8</div><div class='add'>+	 * overflow. The right shift acts on len, which is an u8.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(sizeof(ring-&gt;obj_num) != sizeof(chip_head));</div><div class='add'>+	BUILD_BUG_ON(sizeof(ring-&gt;obj_num) != sizeof(tail));</div><div class='add'>+	BUILD_BUG_ON(sizeof(ring-&gt;obj_num) != sizeof(len));</div><div class='add'>+</div><div class='add'>+	len = (chip_head &lt;&lt; shift) - (tail &lt;&lt; shift);</div><div class='add'>+	*len_p = len &gt;&gt; shift;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_hw_rx_obj_to_skb(const struct mcp251xfd_priv *priv,</div><div class='add'>+			   const struct mcp251xfd_hw_rx_obj_canfd *hw_rx_obj,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	u8 dlc;</div><div class='add'>+</div><div class='add'>+	if (hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_IDE) {</div><div class='add'>+		u32 sid, eid;</div><div class='add'>+</div><div class='add'>+		eid = FIELD_GET(MCP251XFD_OBJ_ID_EID_MASK, hw_rx_obj-&gt;id);</div><div class='add'>+		sid = FIELD_GET(MCP251XFD_OBJ_ID_SID_MASK, hw_rx_obj-&gt;id);</div><div class='add'>+</div><div class='add'>+		cfd-&gt;can_id = CAN_EFF_FLAG |</div><div class='add'>+			FIELD_PREP(MCP251XFD_REG_FRAME_EFF_EID_MASK, eid) |</div><div class='add'>+			FIELD_PREP(MCP251XFD_REG_FRAME_EFF_SID_MASK, sid);</div><div class='add'>+	} else {</div><div class='add'>+		cfd-&gt;can_id = FIELD_GET(MCP251XFD_OBJ_ID_SID_MASK,</div><div class='add'>+					hw_rx_obj-&gt;id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dlc = FIELD_GET(MCP251XFD_OBJ_FLAGS_DLC_MASK, hw_rx_obj-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* CANFD */</div><div class='add'>+	if (hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_FDF) {</div><div class='add'>+		if (hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_ESI)</div><div class='add'>+			cfd-&gt;flags |= CANFD_ESI;</div><div class='add'>+</div><div class='add'>+		if (hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_BRS)</div><div class='add'>+			cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+</div><div class='add'>+		cfd-&gt;len = can_fd_dlc2len(dlc);</div><div class='add'>+	} else {</div><div class='add'>+		if (hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_RTR)</div><div class='add'>+			cfd-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+</div><div class='add'>+		can_frame_set_cc_len((struct can_frame *)cfd, dlc,</div><div class='add'>+				     priv-&gt;can.ctrlmode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_RTR))</div><div class='add'>+		memcpy(cfd-&gt;data, hw_rx_obj-&gt;data, cfd-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_rxif_one(struct mcp251xfd_priv *priv,</div><div class='add'>+			  struct mcp251xfd_rx_ring *ring,</div><div class='add'>+			  const struct mcp251xfd_hw_rx_obj_canfd *hw_rx_obj)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct canfd_frame *cfd;</div><div class='add'>+	u64 timestamp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* According to mcp2518fd erratum DS80000789E 6. the FIFOCI</div><div class='add'>+	 * bits of a FIFOSTA register, here the RX FIFO head index</div><div class='add'>+	 * might be corrupted and we might process past the RX FIFO's</div><div class='add'>+	 * head into old CAN frames.</div><div class='add'>+	 *</div><div class='add'>+	 * Compare the timestamp of currently processed CAN frame with</div><div class='add'>+	 * last valid frame received. Abort with -EBADMSG if an old</div><div class='add'>+	 * CAN frame is detected.</div><div class='add'>+	 */</div><div class='add'>+	timestamp = timecounter_cyc2time(&amp;priv-&gt;tc, hw_rx_obj-&gt;ts);</div><div class='add'>+	if (timestamp &lt;= ring-&gt;last_valid) {</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+	ring-&gt;last_valid = timestamp;</div><div class='add'>+</div><div class='add'>+	if (hw_rx_obj-&gt;flags &amp; MCP251XFD_OBJ_FLAGS_FDF)</div><div class='add'>+		skb = alloc_canfd_skb(priv-&gt;ndev, &amp;cfd);</div><div class='add'>+	else</div><div class='add'>+		skb = alloc_can_skb(priv-&gt;ndev, (struct can_frame **)&amp;cfd);</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		stats-&gt;rx_dropped++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcp251xfd_skb_set_timestamp(skb, timestamp);</div><div class='add'>+	mcp251xfd_hw_rx_obj_to_skb(priv, hw_rx_obj, skb);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, hw_rx_obj-&gt;ts);</div><div class='add'>+	if (err)</div><div class='add'>+		stats-&gt;rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_rx_obj_read(const struct mcp251xfd_priv *priv,</div><div class='add'>+		      const struct mcp251xfd_rx_ring *ring,</div><div class='add'>+		      struct mcp251xfd_hw_rx_obj_canfd *hw_rx_obj,</div><div class='add'>+		      const u8 offset, const u8 len)</div><div class='add'>+{</div><div class='add'>+	const int val_bytes = regmap_get_val_bytes(priv-&gt;map_rx);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_bulk_read(priv-&gt;map_rx,</div><div class='add'>+			       mcp251xfd_get_rx_obj_addr(ring, offset),</div><div class='add'>+			       hw_rx_obj,</div><div class='add'>+			       len * ring-&gt;obj_size / val_bytes);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_rxif_ring_uinc(const struct mcp251xfd_priv *priv,</div><div class='add'>+				struct mcp251xfd_rx_ring *ring,</div><div class='add'>+				u8 len)</div><div class='add'>+{</div><div class='add'>+	int offset;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ring-&gt;head += len;</div><div class='add'>+</div><div class='add'>+	/* Increment the RX FIFO tail pointer 'len' times in a</div><div class='add'>+	 * single SPI message.</div><div class='add'>+	 *</div><div class='add'>+	 * Note:</div><div class='add'>+	 * Calculate offset, so that the SPI transfer ends on</div><div class='add'>+	 * the last message of the uinc_xfer array, which has</div><div class='add'>+	 * "cs_change == 0", to properly deactivate the chip</div><div class='add'>+	 * select.</div><div class='add'>+	 */</div><div class='add'>+	offset = ARRAY_SIZE(ring-&gt;uinc_xfer) - len;</div><div class='add'>+	err = spi_sync_transfer(priv-&gt;spi,</div><div class='add'>+				ring-&gt;uinc_xfer + offset, len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ring-&gt;tail += len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_rxif_ring(struct mcp251xfd_priv *priv,</div><div class='add'>+			   struct mcp251xfd_rx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_hw_rx_obj_canfd *hw_rx_obj = ring-&gt;obj;</div><div class='add'>+	u8 rx_tail, len, l;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_get_rx_len(priv, ring, &amp;len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	while ((l = mcp251xfd_get_rx_linear_len(ring, len))) {</div><div class='add'>+		rx_tail = mcp251xfd_get_rx_tail(ring);</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_rx_obj_read(priv, ring, hw_rx_obj,</div><div class='add'>+					    rx_tail, l);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; l; i++) {</div><div class='add'>+			err = mcp251xfd_handle_rxif_one(priv, ring,</div><div class='add'>+							(void *)hw_rx_obj +</div><div class='add'>+							i * ring-&gt;obj_size);</div><div class='add'>+</div><div class='add'>+			/* -EBADMSG means we're affected by mcp2518fd</div><div class='add'>+			 * erratum DS80000789E 6., i.e. the timestamp</div><div class='add'>+			 * in the RX object is older that the last</div><div class='add'>+			 * valid received CAN frame. Don't process any</div><div class='add'>+			 * further and mark processed frames as good.</div><div class='add'>+			 */</div><div class='add'>+			if (err == -EBADMSG)</div><div class='add'>+				return mcp251xfd_handle_rxif_ring_uinc(priv, ring, i);</div><div class='add'>+			else if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_handle_rxif_ring_uinc(priv, ring, l);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		len -= l;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mcp251xfd_handle_rxif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_rx_ring *ring;</div><div class='add'>+	int err, n;</div><div class='add'>+</div><div class='add'>+	mcp251xfd_for_each_rx_ring(priv, ring, n) {</div><div class='add'>+		/* - if RX IRQ coalescing is active always handle ring 0</div><div class='add'>+		 * - only handle rings if RX IRQ is active</div><div class='add'>+		 */</div><div class='add'>+		if ((ring-&gt;nr &gt; 0 || !priv-&gt;rx_obj_num_coalesce_irq) &amp;&amp;</div><div class='add'>+		    !(priv-&gt;regs_status.rxif &amp; BIT(ring-&gt;fifo_nr)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_handle_rxif_ring(priv, ring);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;rx_coalesce_usecs_irq)</div><div class='add'>+		hrtimer_start(&amp;priv-&gt;rx_irq_timer,</div><div class='add'>+			      ns_to_ktime(priv-&gt;rx_coalesce_usecs_irq *</div><div class='add'>+					  NSEC_PER_USEC),</div><div class='add'>+			      HRTIMER_MODE_REL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c<br/>new file mode 100644<br/>index 000000000000..e94321849fd7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c</a></div><div class='hunk'>@@ -0,0 +1,302 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021, 2023 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_tx_fifo_sta_empty(u32 fifo_sta)</div><div class='add'>+{</div><div class='add'>+	return fifo_sta &amp; MCP251XFD_REG_FIFOSTA_TFERFFIF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_tx_fifo_sta_less_than_half_full(u32 fifo_sta)</div><div class='add'>+{</div><div class='add'>+	return fifo_sta &amp; MCP251XFD_REG_FIFOSTA_TFHRFHIF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_tef_tail_get_from_chip(const struct mcp251xfd_priv *priv,</div><div class='add'>+				 u8 *tef_tail)</div><div class='add'>+{</div><div class='add'>+	u32 tef_ua;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_TEFUA, &amp;tef_ua);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*tef_tail = tef_ua / sizeof(struct mcp251xfd_hw_tef_obj);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_check_tef_tail(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u8 tef_tail_chip, tef_tail;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_tef_tail_get_from_chip(priv, &amp;tef_tail_chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	tef_tail = mcp251xfd_get_tef_tail(priv);</div><div class='add'>+	if (tef_tail_chip != tef_tail) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "TEF tail of chip (0x%02x) and ours (0x%08x) inconsistent.\n",</div><div class='add'>+			   tef_tail_chip, tef_tail);</div><div class='add'>+		return -EILSEQ;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_handle_tefif_one(struct mcp251xfd_priv *priv,</div><div class='add'>+			   const struct mcp251xfd_hw_tef_obj *hw_tef_obj,</div><div class='add'>+			   unsigned int *frame_len_ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='add'>+	u32 seq, tef_tail_masked, tef_tail;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	 /* Use the MCP2517FD mask on the MCP2518FD, too. We only</div><div class='add'>+	  * compare 7 bits, this is enough to detect old TEF objects.</div><div class='add'>+	  */</div><div class='add'>+	seq = FIELD_GET(MCP251XFD_OBJ_FLAGS_SEQ_MCP2517FD_MASK,</div><div class='add'>+			hw_tef_obj-&gt;flags);</div><div class='add'>+	tef_tail_masked = priv-&gt;tef-&gt;tail &amp;</div><div class='add'>+		field_mask(MCP251XFD_OBJ_FLAGS_SEQ_MCP2517FD_MASK);</div><div class='add'>+</div><div class='add'>+	/* According to mcp2518fd erratum DS80000789E 6. the FIFOCI</div><div class='add'>+	 * bits of a FIFOSTA register, here the TX FIFO tail index</div><div class='add'>+	 * might be corrupted and we might process past the TEF FIFO's</div><div class='add'>+	 * head into old CAN frames.</div><div class='add'>+	 *</div><div class='add'>+	 * Compare the sequence number of the currently processed CAN</div><div class='add'>+	 * frame with the expected sequence number. Abort with</div><div class='add'>+	 * -EBADMSG if an old CAN frame is detected.</div><div class='add'>+	 */</div><div class='add'>+	if (seq != tef_tail_masked) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev, "%s: chip=0x%02x ring=0x%02x\n", __func__,</div><div class='add'>+			   seq, tef_tail_masked);</div><div class='add'>+		stats-&gt;tx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tef_tail = mcp251xfd_get_tef_tail(priv);</div><div class='add'>+	skb = priv-&gt;can.echo_skb[tef_tail];</div><div class='add'>+	if (skb)</div><div class='add'>+		mcp251xfd_skb_set_timestamp_raw(priv, skb, hw_tef_obj-&gt;ts);</div><div class='add'>+	stats-&gt;tx_bytes +=</div><div class='add'>+		can_rx_offload_get_echo_skb_queue_timestamp(&amp;priv-&gt;offload,</div><div class='add'>+							    tef_tail, hw_tef_obj-&gt;ts,</div><div class='add'>+							    frame_len_ptr);</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+	priv-&gt;tef-&gt;tail++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mcp251xfd_get_tef_len(struct mcp251xfd_priv *priv, u8 *len_p)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	const u8 shift = tx_ring-&gt;obj_num_shift_to_u8;</div><div class='add'>+	u8 chip_tx_tail, tail, len;</div><div class='add'>+	u32 fifo_sta;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg, MCP251XFD_REG_FIFOSTA(priv-&gt;tx-&gt;fifo_nr),</div><div class='add'>+			  &amp;fifo_sta);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If the chip says the TX-FIFO is empty, but there are no TX</div><div class='add'>+	 * buffers free in the ring, we assume all have been sent.</div><div class='add'>+	 */</div><div class='add'>+	if (mcp251xfd_tx_fifo_sta_empty(fifo_sta) &amp;&amp;</div><div class='add'>+	    mcp251xfd_get_tx_free(tx_ring) == 0) {</div><div class='add'>+		*len_p = tx_ring-&gt;obj_num;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip_tx_tail = FIELD_GET(MCP251XFD_REG_FIFOSTA_FIFOCI_MASK, fifo_sta);</div><div class='add'>+</div><div class='add'>+	err =  mcp251xfd_check_tef_tail(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	tail = mcp251xfd_get_tef_tail(priv);</div><div class='add'>+</div><div class='add'>+	/* First shift to full u8. The subtraction works on signed</div><div class='add'>+	 * values, that keeps the difference steady around the u8</div><div class='add'>+	 * overflow. The right shift acts on len, which is an u8.</div><div class='add'>+	 */</div><div class='add'>+	BUILD_BUG_ON(sizeof(tx_ring-&gt;obj_num) != sizeof(chip_tx_tail));</div><div class='add'>+	BUILD_BUG_ON(sizeof(tx_ring-&gt;obj_num) != sizeof(tail));</div><div class='add'>+	BUILD_BUG_ON(sizeof(tx_ring-&gt;obj_num) != sizeof(len));</div><div class='add'>+</div><div class='add'>+	len = (chip_tx_tail &lt;&lt; shift) - (tail &lt;&lt; shift);</div><div class='add'>+	len &gt;&gt;= shift;</div><div class='add'>+</div><div class='add'>+	/* According to mcp2518fd erratum DS80000789E 6. the FIFOCI</div><div class='add'>+	 * bits of a FIFOSTA register, here the TX-FIFO tail index</div><div class='add'>+	 * might be corrupted.</div><div class='add'>+	 *</div><div class='add'>+	 * However here it seems the bit indicating that the TX-FIFO</div><div class='add'>+	 * is empty (MCP251XFD_REG_FIFOSTA_TFERFFIF) is not correct</div><div class='add'>+	 * while the TX-FIFO tail index is.</div><div class='add'>+	 *</div><div class='add'>+	 * We assume the TX-FIFO is empty, i.e. all pending CAN frames</div><div class='add'>+	 * haven been send, if:</div><div class='add'>+	 * - Chip's head and tail index are equal (len == 0).</div><div class='add'>+	 * - The TX-FIFO is less than half full.</div><div class='add'>+	 *   (The TX-FIFO empty case has already been checked at the</div><div class='add'>+	 *    beginning of this function.)</div><div class='add'>+	 * - No free buffers in the TX ring.</div><div class='add'>+	 */</div><div class='add'>+	if (len == 0 &amp;&amp; mcp251xfd_tx_fifo_sta_less_than_half_full(fifo_sta) &amp;&amp;</div><div class='add'>+	    mcp251xfd_get_tx_free(tx_ring) == 0)</div><div class='add'>+		len = tx_ring-&gt;obj_num;</div><div class='add'>+</div><div class='add'>+	*len_p = len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_tef_obj_read(const struct mcp251xfd_priv *priv,</div><div class='add'>+		       struct mcp251xfd_hw_tef_obj *hw_tef_obj,</div><div class='add'>+		       const u8 offset, const u8 len)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	const int val_bytes = regmap_get_val_bytes(priv-&gt;map_rx);</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_CAN_MCP251XFD_SANITY) &amp;&amp;</div><div class='add'>+	    (offset &gt; tx_ring-&gt;obj_num ||</div><div class='add'>+	     len &gt; tx_ring-&gt;obj_num ||</div><div class='add'>+	     offset + len &gt; tx_ring-&gt;obj_num)) {</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Trying to read too many TEF objects (max=%d, offset=%d, len=%d).\n",</div><div class='add'>+			   tx_ring-&gt;obj_num, offset, len);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_read(priv-&gt;map_rx,</div><div class='add'>+				mcp251xfd_get_tef_obj_addr(offset),</div><div class='add'>+				hw_tef_obj,</div><div class='add'>+				sizeof(*hw_tef_obj) / val_bytes * len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mcp251xfd_ecc_tefif_successful(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_ecc *ecc = &amp;priv-&gt;ecc;</div><div class='add'>+</div><div class='add'>+	ecc-&gt;ecc_stat = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mcp251xfd_handle_tefif(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_hw_tef_obj hw_tef_obj[MCP251XFD_TX_OBJ_NUM_MAX];</div><div class='add'>+	unsigned int total_frame_len = 0;</div><div class='add'>+	u8 tef_tail, len, l;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_get_tef_len(priv, &amp;len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	tef_tail = mcp251xfd_get_tef_tail(priv);</div><div class='add'>+	l = mcp251xfd_get_tef_linear_len(priv, len);</div><div class='add'>+	err = mcp251xfd_tef_obj_read(priv, hw_tef_obj, tef_tail, l);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (l &lt; len) {</div><div class='add'>+		err = mcp251xfd_tef_obj_read(priv, &amp;hw_tef_obj[l], 0, len - l);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i++) {</div><div class='add'>+		unsigned int frame_len = 0;</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_handle_tefif_one(priv, &amp;hw_tef_obj[i], &amp;frame_len);</div><div class='add'>+		/* -EBADMSG means we're affected by mcp2518fd erratum</div><div class='add'>+		 * DS80000789E 6., i.e. the Sequence Number in the TEF</div><div class='add'>+		 * doesn't match our tef_tail. Don't process any</div><div class='add'>+		 * further and mark processed frames as good.</div><div class='add'>+		 */</div><div class='add'>+		if (err == -EBADMSG)</div><div class='add'>+			goto out_netif_wake_queue;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		total_frame_len += frame_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_netif_wake_queue:</div><div class='add'>+	len = i;	/* number of handled goods TEFs */</div><div class='add'>+	if (len) {</div><div class='add'>+		struct mcp251xfd_tef_ring *ring = priv-&gt;tef;</div><div class='add'>+		struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+		int offset;</div><div class='add'>+</div><div class='add'>+		ring-&gt;head += len;</div><div class='add'>+</div><div class='add'>+		/* Increment the TEF FIFO tail pointer 'len' times in</div><div class='add'>+		 * a single SPI message.</div><div class='add'>+		 *</div><div class='add'>+		 * Note:</div><div class='add'>+		 * Calculate offset, so that the SPI transfer ends on</div><div class='add'>+		 * the last message of the uinc_xfer array, which has</div><div class='add'>+		 * "cs_change == 0", to properly deactivate the chip</div><div class='add'>+		 * select.</div><div class='add'>+		 */</div><div class='add'>+		offset = ARRAY_SIZE(ring-&gt;uinc_xfer) - len;</div><div class='add'>+		err = spi_sync_transfer(priv-&gt;spi,</div><div class='add'>+					ring-&gt;uinc_xfer + offset, len);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		tx_ring-&gt;tail += len;</div><div class='add'>+		netdev_completed_queue(priv-&gt;ndev, len, total_frame_len);</div><div class='add'>+</div><div class='add'>+		err = mcp251xfd_check_tef_tail(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mcp251xfd_ecc_tefif_successful(priv);</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_get_tx_free(priv-&gt;tx)) {</div><div class='add'>+		/* Make sure that anybody stopping the queue after</div><div class='add'>+		 * this sees the new tx_ring-&gt;tail.</div><div class='add'>+		 */</div><div class='add'>+		smp_mb();</div><div class='add'>+		netif_wake_queue(priv-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_coalesce_usecs_irq)</div><div class='add'>+		hrtimer_start(&amp;priv-&gt;tx_irq_timer,</div><div class='add'>+			      ns_to_ktime(priv-&gt;tx_coalesce_usecs_irq *</div><div class='add'>+					  NSEC_PER_USEC),</div><div class='add'>+			      HRTIMER_MODE_REL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c<br/>new file mode 100644<br/>index 000000000000..413a5cb75c13<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-timestamp.c</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2021, 2023 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+static u64 mcp251xfd_timestamp_raw_read(struct cyclecounter *cc)</div><div class='add'>+{</div><div class='add'>+	const struct mcp251xfd_priv *priv;</div><div class='add'>+	u32 ts_raw = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	priv = container_of(cc, struct mcp251xfd_priv, cc);</div><div class='add'>+	err = mcp251xfd_get_timestamp_raw(priv, &amp;ts_raw);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(priv-&gt;ndev,</div><div class='add'>+			   "Error %d while reading timestamp. HW timestamps may be inaccurate.",</div><div class='add'>+			   err);</div><div class='add'>+</div><div class='add'>+	return ts_raw;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_timestamp_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *delayed_work = to_delayed_work(work);</div><div class='add'>+	struct mcp251xfd_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = container_of(delayed_work, struct mcp251xfd_priv, timestamp);</div><div class='add'>+	timecounter_read(&amp;priv-&gt;tc);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;timestamp,</div><div class='add'>+			      MCP251XFD_TIMESTAMP_WORK_DELAY_SEC * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mcp251xfd_timestamp_init(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct cyclecounter *cc = &amp;priv-&gt;cc;</div><div class='add'>+</div><div class='add'>+	cc-&gt;read = mcp251xfd_timestamp_raw_read;</div><div class='add'>+	cc-&gt;mask = CYCLECOUNTER_MASK(32);</div><div class='add'>+	cc-&gt;shift = 1;</div><div class='add'>+	cc-&gt;mult = clocksource_hz2mult(priv-&gt;can.clock.freq, cc-&gt;shift);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;timestamp, mcp251xfd_timestamp_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mcp251xfd_timestamp_start(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	timecounter_init(&amp;priv-&gt;tc, &amp;priv-&gt;cc, ktime_get_real_ns());</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;timestamp,</div><div class='add'>+			      MCP251XFD_TIMESTAMP_WORK_DELAY_SEC * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mcp251xfd_timestamp_stop(struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;timestamp);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c<br/>new file mode 100644<br/>index 000000000000..747ae3e8a768<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c</a></div><div class='hunk'>@@ -0,0 +1,244 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+//</div><div class='add'>+// mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019, 2020, 2021 Pengutronix,</div><div class='add'>+//               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+//</div><div class='add'>+// Based on:</div><div class='add'>+//</div><div class='add'>+// CAN bus driver for Microchip 25XXFD CAN Controller with SPI Interface</div><div class='add'>+//</div><div class='add'>+// Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+//</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mcp251xfd.h"</div><div class='add'>+</div><div class='add'>+static inline struct</div><div class='add'>+mcp251xfd_tx_obj *mcp251xfd_get_tx_obj_next(struct mcp251xfd_tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	u8 tx_head;</div><div class='add'>+</div><div class='add'>+	tx_head = mcp251xfd_get_tx_head(tx_ring);</div><div class='add'>+</div><div class='add'>+	return &amp;tx_ring-&gt;obj[tx_head];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mcp251xfd_tx_obj_from_skb(const struct mcp251xfd_priv *priv,</div><div class='add'>+			  struct mcp251xfd_tx_obj *tx_obj,</div><div class='add'>+			  const struct sk_buff *skb,</div><div class='add'>+			  unsigned int seq)</div><div class='add'>+{</div><div class='add'>+	const struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	struct mcp251xfd_hw_tx_obj_raw *hw_tx_obj;</div><div class='add'>+	union mcp251xfd_tx_obj_load_buf *load_buf;</div><div class='add'>+	u8 dlc;</div><div class='add'>+	u32 id, flags;</div><div class='add'>+	int len_sanitized = 0, len;</div><div class='add'>+</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		u32 sid, eid;</div><div class='add'>+</div><div class='add'>+		sid = FIELD_GET(MCP251XFD_REG_FRAME_EFF_SID_MASK, cfd-&gt;can_id);</div><div class='add'>+		eid = FIELD_GET(MCP251XFD_REG_FRAME_EFF_EID_MASK, cfd-&gt;can_id);</div><div class='add'>+</div><div class='add'>+		id = FIELD_PREP(MCP251XFD_OBJ_ID_EID_MASK, eid) |</div><div class='add'>+			FIELD_PREP(MCP251XFD_OBJ_ID_SID_MASK, sid);</div><div class='add'>+</div><div class='add'>+		flags = MCP251XFD_OBJ_FLAGS_IDE;</div><div class='add'>+	} else {</div><div class='add'>+		id = FIELD_PREP(MCP251XFD_OBJ_ID_SID_MASK, cfd-&gt;can_id);</div><div class='add'>+		flags = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use the MCP2518FD mask even on the MCP2517FD. It doesn't</div><div class='add'>+	 * harm, only the lower 7 bits will be transferred into the</div><div class='add'>+	 * TEF object.</div><div class='add'>+	 */</div><div class='add'>+	flags |= FIELD_PREP(MCP251XFD_OBJ_FLAGS_SEQ_MCP2518FD_MASK, seq);</div><div class='add'>+</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		flags |= MCP251XFD_OBJ_FLAGS_RTR;</div><div class='add'>+	else</div><div class='add'>+		len_sanitized = canfd_sanitize_len(cfd-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* CANFD */</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_ESI)</div><div class='add'>+			flags |= MCP251XFD_OBJ_FLAGS_ESI;</div><div class='add'>+</div><div class='add'>+		flags |= MCP251XFD_OBJ_FLAGS_FDF;</div><div class='add'>+</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			flags |= MCP251XFD_OBJ_FLAGS_BRS;</div><div class='add'>+</div><div class='add'>+		dlc = can_fd_len2dlc(cfd-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		dlc = can_get_cc_dlc((struct can_frame *)cfd,</div><div class='add'>+				     priv-&gt;can.ctrlmode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flags |= FIELD_PREP(MCP251XFD_OBJ_FLAGS_DLC_MASK, dlc);</div><div class='add'>+</div><div class='add'>+	load_buf = &amp;tx_obj-&gt;buf;</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_TX)</div><div class='add'>+		hw_tx_obj = &amp;load_buf-&gt;crc.hw_tx_obj;</div><div class='add'>+	else</div><div class='add'>+		hw_tx_obj = &amp;load_buf-&gt;nocrc.hw_tx_obj;</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(id, &amp;hw_tx_obj-&gt;id);</div><div class='add'>+	put_unaligned_le32(flags, &amp;hw_tx_obj-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* Copy data */</div><div class='add'>+	memcpy(hw_tx_obj-&gt;data, cfd-&gt;data, cfd-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Clear unused data at end of CAN frame */</div><div class='add'>+	if (MCP251XFD_SANITIZE_CAN &amp;&amp; len_sanitized) {</div><div class='add'>+		int pad_len;</div><div class='add'>+</div><div class='add'>+		pad_len = len_sanitized - cfd-&gt;len;</div><div class='add'>+		if (pad_len)</div><div class='add'>+			memset(hw_tx_obj-&gt;data + cfd-&gt;len, 0x0, pad_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Number of bytes to be written into the RAM of the controller */</div><div class='add'>+	len = sizeof(hw_tx_obj-&gt;id) + sizeof(hw_tx_obj-&gt;flags);</div><div class='add'>+	if (MCP251XFD_SANITIZE_CAN)</div><div class='add'>+		len += round_up(len_sanitized, sizeof(u32));</div><div class='add'>+	else</div><div class='add'>+		len += round_up(cfd-&gt;len, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_TX) {</div><div class='add'>+		u16 crc;</div><div class='add'>+</div><div class='add'>+		mcp251xfd_spi_cmd_crc_set_len_in_ram(&amp;load_buf-&gt;crc.cmd,</div><div class='add'>+						     len);</div><div class='add'>+		/* CRC */</div><div class='add'>+		len += sizeof(load_buf-&gt;crc.cmd);</div><div class='add'>+		crc = mcp251xfd_crc16_compute(&amp;load_buf-&gt;crc, len);</div><div class='add'>+		put_unaligned_be16(crc, (void *)load_buf + len);</div><div class='add'>+</div><div class='add'>+		/* Total length */</div><div class='add'>+		len += sizeof(load_buf-&gt;crc.crc);</div><div class='add'>+	} else {</div><div class='add'>+		len += sizeof(load_buf-&gt;nocrc.cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_obj-&gt;xfer[0].len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mcp251xfd_tx_failure_drop(const struct mcp251xfd_priv *priv,</div><div class='add'>+				      struct mcp251xfd_tx_ring *tx_ring,</div><div class='add'>+				      int err)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	unsigned int frame_len = 0;</div><div class='add'>+	u8 tx_head;</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;head--;</div><div class='add'>+	stats-&gt;tx_dropped++;</div><div class='add'>+	tx_head = mcp251xfd_get_tx_head(tx_ring);</div><div class='add'>+	can_free_echo_skb(ndev, tx_head, &amp;frame_len);</div><div class='add'>+	netdev_completed_queue(ndev, 1, frame_len);</div><div class='add'>+	netif_wake_queue(ndev);</div><div class='add'>+</div><div class='add'>+	if (net_ratelimit())</div><div class='add'>+		netdev_err(priv-&gt;ndev, "ERROR in %s: %d\n", __func__, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mcp251xfd_tx_obj_write_sync(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = container_of(work, struct mcp251xfd_priv,</div><div class='add'>+						   tx_work);</div><div class='add'>+	struct mcp251xfd_tx_obj *tx_obj = priv-&gt;tx_work_obj;</div><div class='add'>+	struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = spi_sync(priv-&gt;spi, &amp;tx_obj-&gt;msg);</div><div class='add'>+	if (err)</div><div class='add'>+		mcp251xfd_tx_failure_drop(priv, tx_ring, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mcp251xfd_tx_obj_write(const struct mcp251xfd_priv *priv,</div><div class='add'>+				  struct mcp251xfd_tx_obj *tx_obj)</div><div class='add'>+{</div><div class='add'>+	return spi_async(priv-&gt;spi, &amp;tx_obj-&gt;msg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mcp251xfd_tx_busy(const struct mcp251xfd_priv *priv,</div><div class='add'>+			      struct mcp251xfd_tx_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	if (mcp251xfd_get_tx_free(tx_ring) &gt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(priv-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	/* Memory barrier before checking tx_free (head and tail) */</div><div class='add'>+	smp_mb();</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_get_tx_free(tx_ring) == 0) {</div><div class='add'>+		netdev_dbg(priv-&gt;ndev,</div><div class='add'>+			   "Stopping tx-queue (tx_head=0x%08x, tx_tail=0x%08x, len=%d).\n",</div><div class='add'>+			   tx_ring-&gt;head, tx_ring-&gt;tail,</div><div class='add'>+			   tx_ring-&gt;head - tx_ring-&gt;tail);</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_start_queue(priv-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mcp251xfd_work_busy(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	return work_busy(work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+netdev_tx_t mcp251xfd_start_xmit(struct sk_buff *skb,</div><div class='add'>+				 struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct mcp251xfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct mcp251xfd_tx_ring *tx_ring = priv-&gt;tx;</div><div class='add'>+	struct mcp251xfd_tx_obj *tx_obj;</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+	u8 tx_head;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	if (mcp251xfd_tx_busy(priv, tx_ring) ||</div><div class='add'>+	    mcp251xfd_work_busy(&amp;priv-&gt;tx_work))</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	tx_obj = mcp251xfd_get_tx_obj_next(tx_ring);</div><div class='add'>+	mcp251xfd_tx_obj_from_skb(priv, tx_obj, skb, tx_ring-&gt;head);</div><div class='add'>+</div><div class='add'>+	/* Stop queue if we occupy the complete TX FIFO */</div><div class='add'>+	tx_head = mcp251xfd_get_tx_head(tx_ring);</div><div class='add'>+	tx_ring-&gt;head++;</div><div class='add'>+	if (mcp251xfd_get_tx_free(tx_ring) == 0)</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	frame_len = can_skb_get_frame_len(skb);</div><div class='add'>+	err = can_put_echo_skb(skb, ndev, tx_head, frame_len);</div><div class='add'>+	if (!err)</div><div class='add'>+		netdev_sent_queue(priv-&gt;ndev, frame_len);</div><div class='add'>+</div><div class='add'>+	err = mcp251xfd_tx_obj_write(priv, tx_obj);</div><div class='add'>+	if (err == -EBUSY) {</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+		priv-&gt;tx_work_obj = tx_obj;</div><div class='add'>+		queue_work(priv-&gt;wq, &amp;priv-&gt;tx_work);</div><div class='add'>+	} else if (err) {</div><div class='add'>+		mcp251xfd_tx_failure_drop(priv, tx_ring, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h<br/>new file mode 100644<br/>index 000000000000..085d7101e595<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/spi/mcp251xfd/mcp251xfd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/spi/mcp251xfd/mcp251xfd.h</a></div><div class='hunk'>@@ -0,0 +1,983 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0</div><div class='add'>+ *</div><div class='add'>+ * mcp251xfd - Microchip MCP251xFD Family CAN controller driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019, 2020, 2021, 2023 Pengutronix,</div><div class='add'>+ *               Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ * Copyright (c) 2019 Martin Sperl &lt;kernel@martin.sperl.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MCP251XFD_H</div><div class='add'>+#define _MCP251XFD_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/can/core.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+/* MPC251x registers */</div><div class='add'>+</div><div class='add'>+/* CAN FD Controller Module SFR */</div><div class='add'>+#define MCP251XFD_REG_CON 0x00</div><div class='add'>+#define MCP251XFD_REG_CON_TXBWS_MASK GENMASK(31, 28)</div><div class='add'>+#define MCP251XFD_REG_CON_ABAT BIT(27)</div><div class='add'>+#define MCP251XFD_REG_CON_REQOP_MASK GENMASK(26, 24)</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_MIXED 0</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_SLEEP 1</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_INT_LOOPBACK 2</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_LISTENONLY 3</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_CONFIG 4</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_EXT_LOOPBACK 5</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_CAN2_0 6</div><div class='add'>+#define MCP251XFD_REG_CON_MODE_RESTRICTED 7</div><div class='add'>+#define MCP251XFD_REG_CON_OPMOD_MASK GENMASK(23, 21)</div><div class='add'>+#define MCP251XFD_REG_CON_TXQEN BIT(20)</div><div class='add'>+#define MCP251XFD_REG_CON_STEF BIT(19)</div><div class='add'>+#define MCP251XFD_REG_CON_SERR2LOM BIT(18)</div><div class='add'>+#define MCP251XFD_REG_CON_ESIGM BIT(17)</div><div class='add'>+#define MCP251XFD_REG_CON_RTXAT BIT(16)</div><div class='add'>+#define MCP251XFD_REG_CON_BRSDIS BIT(12)</div><div class='add'>+#define MCP251XFD_REG_CON_BUSY BIT(11)</div><div class='add'>+#define MCP251XFD_REG_CON_WFT_MASK GENMASK(10, 9)</div><div class='add'>+#define MCP251XFD_REG_CON_WFT_T00FILTER 0x0</div><div class='add'>+#define MCP251XFD_REG_CON_WFT_T01FILTER 0x1</div><div class='add'>+#define MCP251XFD_REG_CON_WFT_T10FILTER 0x2</div><div class='add'>+#define MCP251XFD_REG_CON_WFT_T11FILTER 0x3</div><div class='add'>+#define MCP251XFD_REG_CON_WAKFIL BIT(8)</div><div class='add'>+#define MCP251XFD_REG_CON_PXEDIS BIT(6)</div><div class='add'>+#define MCP251XFD_REG_CON_ISOCRCEN BIT(5)</div><div class='add'>+#define MCP251XFD_REG_CON_DNCNT_MASK GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_NBTCFG 0x04</div><div class='add'>+#define MCP251XFD_REG_NBTCFG_BRP_MASK GENMASK(31, 24)</div><div class='add'>+#define MCP251XFD_REG_NBTCFG_TSEG1_MASK GENMASK(23, 16)</div><div class='add'>+#define MCP251XFD_REG_NBTCFG_TSEG2_MASK GENMASK(14, 8)</div><div class='add'>+#define MCP251XFD_REG_NBTCFG_SJW_MASK GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_DBTCFG 0x08</div><div class='add'>+#define MCP251XFD_REG_DBTCFG_BRP_MASK GENMASK(31, 24)</div><div class='add'>+#define MCP251XFD_REG_DBTCFG_TSEG1_MASK GENMASK(20, 16)</div><div class='add'>+#define MCP251XFD_REG_DBTCFG_TSEG2_MASK GENMASK(11, 8)</div><div class='add'>+#define MCP251XFD_REG_DBTCFG_SJW_MASK GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TDC 0x0c</div><div class='add'>+#define MCP251XFD_REG_TDC_EDGFLTEN BIT(25)</div><div class='add'>+#define MCP251XFD_REG_TDC_SID11EN BIT(24)</div><div class='add'>+#define MCP251XFD_REG_TDC_TDCMOD_MASK GENMASK(17, 16)</div><div class='add'>+#define MCP251XFD_REG_TDC_TDCMOD_AUTO 2</div><div class='add'>+#define MCP251XFD_REG_TDC_TDCMOD_MANUAL 1</div><div class='add'>+#define MCP251XFD_REG_TDC_TDCMOD_DISABLED 0</div><div class='add'>+#define MCP251XFD_REG_TDC_TDCO_MASK GENMASK(14, 8)</div><div class='add'>+#define MCP251XFD_REG_TDC_TDCV_MASK GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TBC 0x10</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TSCON 0x14</div><div class='add'>+#define MCP251XFD_REG_TSCON_TSRES BIT(18)</div><div class='add'>+#define MCP251XFD_REG_TSCON_TSEOF BIT(17)</div><div class='add'>+#define MCP251XFD_REG_TSCON_TBCEN BIT(16)</div><div class='add'>+#define MCP251XFD_REG_TSCON_TBCPRE_MASK GENMASK(9, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_VEC 0x18</div><div class='add'>+#define MCP251XFD_REG_VEC_RXCODE_MASK GENMASK(30, 24)</div><div class='add'>+#define MCP251XFD_REG_VEC_TXCODE_MASK GENMASK(22, 16)</div><div class='add'>+#define MCP251XFD_REG_VEC_FILHIT_MASK GENMASK(12, 8)</div><div class='add'>+#define MCP251XFD_REG_VEC_ICODE_MASK GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_INT 0x1c</div><div class='add'>+#define MCP251XFD_REG_INT_IF_MASK GENMASK(15, 0)</div><div class='add'>+#define MCP251XFD_REG_INT_IE_MASK GENMASK(31, 16)</div><div class='add'>+#define MCP251XFD_REG_INT_IVMIE BIT(31)</div><div class='add'>+#define MCP251XFD_REG_INT_WAKIE BIT(30)</div><div class='add'>+#define MCP251XFD_REG_INT_CERRIE BIT(29)</div><div class='add'>+#define MCP251XFD_REG_INT_SERRIE BIT(28)</div><div class='add'>+#define MCP251XFD_REG_INT_RXOVIE BIT(27)</div><div class='add'>+#define MCP251XFD_REG_INT_TXATIE BIT(26)</div><div class='add'>+#define MCP251XFD_REG_INT_SPICRCIE BIT(25)</div><div class='add'>+#define MCP251XFD_REG_INT_ECCIE BIT(24)</div><div class='add'>+#define MCP251XFD_REG_INT_TEFIE BIT(20)</div><div class='add'>+#define MCP251XFD_REG_INT_MODIE BIT(19)</div><div class='add'>+#define MCP251XFD_REG_INT_TBCIE BIT(18)</div><div class='add'>+#define MCP251XFD_REG_INT_RXIE BIT(17)</div><div class='add'>+#define MCP251XFD_REG_INT_TXIE BIT(16)</div><div class='add'>+#define MCP251XFD_REG_INT_IVMIF BIT(15)</div><div class='add'>+#define MCP251XFD_REG_INT_WAKIF BIT(14)</div><div class='add'>+#define MCP251XFD_REG_INT_CERRIF BIT(13)</div><div class='add'>+#define MCP251XFD_REG_INT_SERRIF BIT(12)</div><div class='add'>+#define MCP251XFD_REG_INT_RXOVIF BIT(11)</div><div class='add'>+#define MCP251XFD_REG_INT_TXATIF BIT(10)</div><div class='add'>+#define MCP251XFD_REG_INT_SPICRCIF BIT(9)</div><div class='add'>+#define MCP251XFD_REG_INT_ECCIF BIT(8)</div><div class='add'>+#define MCP251XFD_REG_INT_TEFIF BIT(4)</div><div class='add'>+#define MCP251XFD_REG_INT_MODIF BIT(3)</div><div class='add'>+#define MCP251XFD_REG_INT_TBCIF BIT(2)</div><div class='add'>+#define MCP251XFD_REG_INT_RXIF BIT(1)</div><div class='add'>+#define MCP251XFD_REG_INT_TXIF BIT(0)</div><div class='add'>+/* These IRQ flags must be cleared by SW in the CAN_INT register */</div><div class='add'>+#define MCP251XFD_REG_INT_IF_CLEARABLE_MASK \</div><div class='add'>+	(MCP251XFD_REG_INT_IVMIF | MCP251XFD_REG_INT_WAKIF | \</div><div class='add'>+	 MCP251XFD_REG_INT_CERRIF |  MCP251XFD_REG_INT_SERRIF | \</div><div class='add'>+	 MCP251XFD_REG_INT_MODIF)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_RXIF 0x20</div><div class='add'>+#define MCP251XFD_REG_TXIF 0x24</div><div class='add'>+#define MCP251XFD_REG_RXOVIF 0x28</div><div class='add'>+#define MCP251XFD_REG_TXATIF 0x2c</div><div class='add'>+#define MCP251XFD_REG_TXREQ 0x30</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TREC 0x34</div><div class='add'>+#define MCP251XFD_REG_TREC_TXBO BIT(21)</div><div class='add'>+#define MCP251XFD_REG_TREC_TXBP BIT(20)</div><div class='add'>+#define MCP251XFD_REG_TREC_RXBP BIT(19)</div><div class='add'>+#define MCP251XFD_REG_TREC_TXWARN BIT(18)</div><div class='add'>+#define MCP251XFD_REG_TREC_RXWARN BIT(17)</div><div class='add'>+#define MCP251XFD_REG_TREC_EWARN BIT(16)</div><div class='add'>+#define MCP251XFD_REG_TREC_TEC_MASK GENMASK(15, 8)</div><div class='add'>+#define MCP251XFD_REG_TREC_REC_MASK GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_BDIAG0 0x38</div><div class='add'>+#define MCP251XFD_REG_BDIAG0_DTERRCNT_MASK GENMASK(31, 24)</div><div class='add'>+#define MCP251XFD_REG_BDIAG0_DRERRCNT_MASK GENMASK(23, 16)</div><div class='add'>+#define MCP251XFD_REG_BDIAG0_NTERRCNT_MASK GENMASK(15, 8)</div><div class='add'>+#define MCP251XFD_REG_BDIAG0_NRERRCNT_MASK GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_BDIAG1 0x3c</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_DLCMM BIT(31)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_ESI BIT(30)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_DCRCERR BIT(29)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_DSTUFERR BIT(28)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_DFORMERR BIT(27)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_DBIT1ERR BIT(25)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_DBIT0ERR BIT(24)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_TXBOERR BIT(23)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_NCRCERR BIT(21)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_NSTUFERR BIT(20)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_NFORMERR BIT(19)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_NACKERR BIT(18)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_NBIT1ERR BIT(17)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_NBIT0ERR BIT(16)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_BERR_MASK \</div><div class='add'>+	(MCP251XFD_REG_BDIAG1_DLCMM | MCP251XFD_REG_BDIAG1_ESI | \</div><div class='add'>+	 MCP251XFD_REG_BDIAG1_DCRCERR | MCP251XFD_REG_BDIAG1_DSTUFERR | \</div><div class='add'>+	 MCP251XFD_REG_BDIAG1_DFORMERR | MCP251XFD_REG_BDIAG1_DBIT1ERR | \</div><div class='add'>+	 MCP251XFD_REG_BDIAG1_DBIT0ERR | MCP251XFD_REG_BDIAG1_TXBOERR | \</div><div class='add'>+	 MCP251XFD_REG_BDIAG1_NCRCERR | MCP251XFD_REG_BDIAG1_NSTUFERR | \</div><div class='add'>+	 MCP251XFD_REG_BDIAG1_NFORMERR | MCP251XFD_REG_BDIAG1_NACKERR | \</div><div class='add'>+	 MCP251XFD_REG_BDIAG1_NBIT1ERR | MCP251XFD_REG_BDIAG1_NBIT0ERR)</div><div class='add'>+#define MCP251XFD_REG_BDIAG1_EFMSGCNT_MASK GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TEFCON 0x40</div><div class='add'>+#define MCP251XFD_REG_TEFCON_FSIZE_MASK GENMASK(28, 24)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_FRESET BIT(10)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_UINC BIT(8)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_TEFTSEN BIT(5)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_TEFOVIE BIT(3)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_TEFFIE BIT(2)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_TEFHIE BIT(1)</div><div class='add'>+#define MCP251XFD_REG_TEFCON_TEFNEIE BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TEFSTA 0x44</div><div class='add'>+#define MCP251XFD_REG_TEFSTA_TEFOVIF BIT(3)</div><div class='add'>+#define MCP251XFD_REG_TEFSTA_TEFFIF BIT(2)</div><div class='add'>+#define MCP251XFD_REG_TEFSTA_TEFHIF BIT(1)</div><div class='add'>+#define MCP251XFD_REG_TEFSTA_TEFNEIF BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TEFUA 0x48</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TXQCON 0x50</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_MASK GENMASK(31, 29)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_8 0</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_12 1</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_16 2</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_20 3</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_24 4</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_32 5</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_48 6</div><div class='add'>+#define MCP251XFD_REG_TXQCON_PLSIZE_64 7</div><div class='add'>+#define MCP251XFD_REG_TXQCON_FSIZE_MASK GENMASK(28, 24)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXAT_UNLIMITED 3</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXAT_THREE_SHOT 1</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXAT_ONE_SHOT 0</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXAT_MASK GENMASK(22, 21)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXPRI_MASK GENMASK(20, 16)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_FRESET BIT(10)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXREQ BIT(9)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_UINC BIT(8)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXEN BIT(7)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXATIE BIT(4)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXQEIE BIT(2)</div><div class='add'>+#define MCP251XFD_REG_TXQCON_TXQNIE BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TXQSTA 0x54</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXQCI_MASK GENMASK(12, 8)</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXABT BIT(7)</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXLARB BIT(6)</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXERR BIT(5)</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXATIF BIT(4)</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXQEIF BIT(2)</div><div class='add'>+#define MCP251XFD_REG_TXQSTA_TXQNIF BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_TXQUA 0x58</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FIFOCON(x) (0x50 + 0xc * (x))</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_MASK GENMASK(31, 29)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_8 0</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_12 1</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_16 2</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_20 3</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_24 4</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_32 5</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_48 6</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_PLSIZE_64 7</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_FSIZE_MASK GENMASK(28, 24)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXAT_MASK GENMASK(22, 21)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXAT_ONE_SHOT 0</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXAT_THREE_SHOT 1</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXAT_UNLIMITED 3</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXPRI_MASK GENMASK(20, 16)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_FRESET BIT(10)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXREQ BIT(9)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_UINC BIT(8)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXEN BIT(7)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_RTREN BIT(6)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_RXTSEN BIT(5)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TXATIE BIT(4)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_RXOVIE BIT(3)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TFERFFIE BIT(2)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TFHRFHIE BIT(1)</div><div class='add'>+#define MCP251XFD_REG_FIFOCON_TFNRFNIE BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA(x) (0x54 + 0xc * (x))</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_FIFOCI_MASK GENMASK(12, 8)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TXABT BIT(7)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TXLARB BIT(6)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TXERR BIT(5)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TXATIF BIT(4)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_RXOVIF BIT(3)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TFERFFIF BIT(2)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TFHRFHIF BIT(1)</div><div class='add'>+#define MCP251XFD_REG_FIFOSTA_TFNRFNIF BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FIFOUA(x) (0x58 + 0xc * (x))</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FLTCON(x) (0x1d0 + 0x4 * (x))</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FLTEN3 BIT(31)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_F3BP_MASK GENMASK(28, 24)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FLTEN2 BIT(23)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_F2BP_MASK GENMASK(20, 16)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FLTEN1 BIT(15)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_F1BP_MASK GENMASK(12, 8)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FLTEN0 BIT(7)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_F0BP_MASK GENMASK(4, 0)</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FLTEN(x) (BIT(7) &lt;&lt; 8 * ((x) &amp; 0x3))</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FLT_MASK(x) (GENMASK(7, 0) &lt;&lt; (8 * ((x) &amp; 0x3)))</div><div class='add'>+#define MCP251XFD_REG_FLTCON_FBP(x, fifo) ((fifo) &lt;&lt; 8 * ((x) &amp; 0x3))</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FLTOBJ(x) (0x1f0 + 0x8 * (x))</div><div class='add'>+#define MCP251XFD_REG_FLTOBJ_EXIDE BIT(30)</div><div class='add'>+#define MCP251XFD_REG_FLTOBJ_SID11 BIT(29)</div><div class='add'>+#define MCP251XFD_REG_FLTOBJ_EID_MASK GENMASK(28, 11)</div><div class='add'>+#define MCP251XFD_REG_FLTOBJ_SID_MASK GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FLTMASK(x) (0x1f4 + 0x8 * (x))</div><div class='add'>+#define MCP251XFD_REG_MASK_MIDE BIT(30)</div><div class='add'>+#define MCP251XFD_REG_MASK_MSID11 BIT(29)</div><div class='add'>+#define MCP251XFD_REG_MASK_MEID_MASK GENMASK(28, 11)</div><div class='add'>+#define MCP251XFD_REG_MASK_MSID_MASK GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+/* RAM */</div><div class='add'>+#define MCP251XFD_RAM_START 0x400</div><div class='add'>+#define MCP251XFD_RAM_SIZE SZ_2K</div><div class='add'>+</div><div class='add'>+/* Message Object */</div><div class='add'>+#define MCP251XFD_OBJ_ID_SID11 BIT(29)</div><div class='add'>+#define MCP251XFD_OBJ_ID_EID_MASK GENMASK(28, 11)</div><div class='add'>+#define MCP251XFD_OBJ_ID_SID_MASK GENMASK(10, 0)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_SEQ_MCP2518FD_MASK GENMASK(31, 9)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_SEQ_MCP2517FD_MASK GENMASK(15, 9)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_SEQ_MASK MCP251XFD_OBJ_FLAGS_SEQ_MCP2518FD_MASK</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_ESI BIT(8)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_FDF BIT(7)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_BRS BIT(6)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_RTR BIT(5)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_IDE BIT(4)</div><div class='add'>+#define MCP251XFD_OBJ_FLAGS_DLC_MASK GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_FRAME_EFF_SID_MASK GENMASK(28, 18)</div><div class='add'>+#define MCP251XFD_REG_FRAME_EFF_EID_MASK GENMASK(17, 0)</div><div class='add'>+</div><div class='add'>+/* MCP2517/18FD SFR */</div><div class='add'>+#define MCP251XFD_REG_OSC 0xe00</div><div class='add'>+#define MCP251XFD_REG_OSC_SCLKRDY BIT(12)</div><div class='add'>+#define MCP251XFD_REG_OSC_OSCRDY BIT(10)</div><div class='add'>+#define MCP251XFD_REG_OSC_PLLRDY BIT(8)</div><div class='add'>+#define MCP251XFD_REG_OSC_CLKODIV_10 3</div><div class='add'>+#define MCP251XFD_REG_OSC_CLKODIV_4 2</div><div class='add'>+#define MCP251XFD_REG_OSC_CLKODIV_2 1</div><div class='add'>+#define MCP251XFD_REG_OSC_CLKODIV_1 0</div><div class='add'>+#define MCP251XFD_REG_OSC_CLKODIV_MASK GENMASK(6, 5)</div><div class='add'>+#define MCP251XFD_REG_OSC_SCLKDIV BIT(4)</div><div class='add'>+#define MCP251XFD_REG_OSC_LPMEN BIT(3)	/* MCP2518FD only */</div><div class='add'>+#define MCP251XFD_REG_OSC_OSCDIS BIT(2)</div><div class='add'>+#define MCP251XFD_REG_OSC_PLLEN BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_IOCON 0xe04</div><div class='add'>+#define MCP251XFD_REG_IOCON_INTOD BIT(30)</div><div class='add'>+#define MCP251XFD_REG_IOCON_SOF BIT(29)</div><div class='add'>+#define MCP251XFD_REG_IOCON_TXCANOD BIT(28)</div><div class='add'>+#define MCP251XFD_REG_IOCON_PM1 BIT(25)</div><div class='add'>+#define MCP251XFD_REG_IOCON_PM0 BIT(24)</div><div class='add'>+#define MCP251XFD_REG_IOCON_PM(n) (MCP251XFD_REG_IOCON_PM0 &lt;&lt; (n))</div><div class='add'>+#define MCP251XFD_REG_IOCON_GPIO1 BIT(17)</div><div class='add'>+#define MCP251XFD_REG_IOCON_GPIO0 BIT(16)</div><div class='add'>+#define MCP251XFD_REG_IOCON_GPIO(n) (MCP251XFD_REG_IOCON_GPIO0 &lt;&lt; (n))</div><div class='add'>+#define MCP251XFD_REG_IOCON_GPIO_MASK GENMASK(17, 16)</div><div class='add'>+#define MCP251XFD_REG_IOCON_LAT1 BIT(9)</div><div class='add'>+#define MCP251XFD_REG_IOCON_LAT0 BIT(8)</div><div class='add'>+#define MCP251XFD_REG_IOCON_LAT(n) (MCP251XFD_REG_IOCON_LAT0 &lt;&lt; (n))</div><div class='add'>+#define MCP251XFD_REG_IOCON_LAT_MASK GENMASK(9, 8)</div><div class='add'>+#define MCP251XFD_REG_IOCON_XSTBYEN BIT(6)</div><div class='add'>+#define MCP251XFD_REG_IOCON_TRIS1 BIT(1)</div><div class='add'>+#define MCP251XFD_REG_IOCON_TRIS0 BIT(0)</div><div class='add'>+#define MCP251XFD_REG_IOCON_TRIS(n) (MCP251XFD_REG_IOCON_TRIS0 &lt;&lt; (n))</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_CRC 0xe08</div><div class='add'>+#define MCP251XFD_REG_CRC_FERRIE BIT(25)</div><div class='add'>+#define MCP251XFD_REG_CRC_CRCERRIE BIT(24)</div><div class='add'>+#define MCP251XFD_REG_CRC_FERRIF BIT(17)</div><div class='add'>+#define MCP251XFD_REG_CRC_CRCERRIF BIT(16)</div><div class='add'>+#define MCP251XFD_REG_CRC_IF_MASK GENMASK(17, 16)</div><div class='add'>+#define MCP251XFD_REG_CRC_MASK GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_ECCCON 0xe0c</div><div class='add'>+#define MCP251XFD_REG_ECCCON_PARITY_MASK GENMASK(14, 8)</div><div class='add'>+#define MCP251XFD_REG_ECCCON_DEDIE BIT(2)</div><div class='add'>+#define MCP251XFD_REG_ECCCON_SECIE BIT(1)</div><div class='add'>+#define MCP251XFD_REG_ECCCON_ECCEN BIT(0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_ECCSTAT 0xe10</div><div class='add'>+#define MCP251XFD_REG_ECCSTAT_ERRADDR_MASK GENMASK(27, 16)</div><div class='add'>+#define MCP251XFD_REG_ECCSTAT_IF_MASK GENMASK(2, 1)</div><div class='add'>+#define MCP251XFD_REG_ECCSTAT_DEDIF BIT(2)</div><div class='add'>+#define MCP251XFD_REG_ECCSTAT_SECIF BIT(1)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_REG_DEVID 0xe14	/* MCP2518FD only */</div><div class='add'>+#define MCP251XFD_REG_DEVID_ID_MASK GENMASK(7, 4)</div><div class='add'>+#define MCP251XFD_REG_DEVID_REV_MASK GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/* SPI commands */</div><div class='add'>+#define MCP251XFD_SPI_INSTRUCTION_RESET 0x0000</div><div class='add'>+#define MCP251XFD_SPI_INSTRUCTION_WRITE 0x2000</div><div class='add'>+#define MCP251XFD_SPI_INSTRUCTION_READ 0x3000</div><div class='add'>+#define MCP251XFD_SPI_INSTRUCTION_WRITE_CRC 0xa000</div><div class='add'>+#define MCP251XFD_SPI_INSTRUCTION_READ_CRC 0xb000</div><div class='add'>+#define MCP251XFD_SPI_INSTRUCTION_WRITE_CRC_SAFE 0xc000</div><div class='add'>+#define MCP251XFD_SPI_ADDRESS_MASK GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_SYSCLOCK_HZ_MAX 40000000</div><div class='add'>+#define MCP251XFD_SYSCLOCK_HZ_MIN 1000000</div><div class='add'>+#define MCP251XFD_SPICLOCK_HZ_MAX 20000000</div><div class='add'>+#define MCP251XFD_TIMESTAMP_WORK_DELAY_SEC 45</div><div class='add'>+static_assert(MCP251XFD_TIMESTAMP_WORK_DELAY_SEC &lt;</div><div class='add'>+	      CYCLECOUNTER_MASK(32) / MCP251XFD_SYSCLOCK_HZ_MAX / 2);</div><div class='add'>+#define MCP251XFD_OSC_PLL_MULTIPLIER 10</div><div class='add'>+#define MCP251XFD_OSC_STAB_SLEEP_US (3 * USEC_PER_MSEC)</div><div class='add'>+#define MCP251XFD_OSC_STAB_TIMEOUT_US (10 * MCP251XFD_OSC_STAB_SLEEP_US)</div><div class='add'>+#define MCP251XFD_POLL_SLEEP_US (10)</div><div class='add'>+#define MCP251XFD_POLL_TIMEOUT_US (USEC_PER_MSEC)</div><div class='add'>+#define MCP251XFD_FRAME_LEN_MAX_BITS (736)</div><div class='add'>+</div><div class='add'>+/* Misc */</div><div class='add'>+#define MCP251XFD_NAPI_WEIGHT 32</div><div class='add'>+#define MCP251XFD_SOFTRESET_RETRIES_MAX 3</div><div class='add'>+#define MCP251XFD_READ_CRC_RETRIES_MAX 3</div><div class='add'>+#define MCP251XFD_ECC_CNT_MAX 2</div><div class='add'>+#define MCP251XFD_SANITIZE_SPI 1</div><div class='add'>+#define MCP251XFD_SANITIZE_CAN 1</div><div class='add'>+</div><div class='add'>+/* FIFO and Ring */</div><div class='add'>+#define MCP251XFD_FIFO_TEF_NUM 1U</div><div class='add'>+#define MCP251XFD_FIFO_RX_NUM 3U</div><div class='add'>+#define MCP251XFD_FIFO_TX_NUM 1U</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_FIFO_DEPTH 32U</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_RX_OBJ_NUM_MIN 16U</div><div class='add'>+#define MCP251XFD_RX_OBJ_NUM_MAX (MCP251XFD_FIFO_RX_NUM * MCP251XFD_FIFO_DEPTH)</div><div class='add'>+#define MCP251XFD_RX_FIFO_DEPTH_MIN 4U</div><div class='add'>+#define MCP251XFD_RX_FIFO_DEPTH_COALESCE_MIN 8U</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_TX_OBJ_NUM_MIN 2U</div><div class='add'>+#define MCP251XFD_TX_OBJ_NUM_MAX 16U</div><div class='add'>+#define MCP251XFD_TX_OBJ_NUM_CAN_DEFAULT 8U</div><div class='add'>+#define MCP251XFD_TX_OBJ_NUM_CANFD_DEFAULT 4U</div><div class='add'>+#define MCP251XFD_TX_FIFO_DEPTH_MIN 2U</div><div class='add'>+#define MCP251XFD_TX_FIFO_DEPTH_COALESCE_MIN 2U</div><div class='add'>+</div><div class='add'>+static_assert(MCP251XFD_FIFO_TEF_NUM == 1U);</div><div class='add'>+static_assert(MCP251XFD_FIFO_TEF_NUM == MCP251XFD_FIFO_TX_NUM);</div><div class='add'>+static_assert(MCP251XFD_FIFO_RX_NUM &lt;= 4U);</div><div class='add'>+</div><div class='add'>+/* Silence TX MAB overflow warnings */</div><div class='add'>+#define MCP251XFD_QUIRK_MAB_NO_WARN BIT(0)</div><div class='add'>+/* Use CRC to access registers */</div><div class='add'>+#define MCP251XFD_QUIRK_CRC_REG BIT(1)</div><div class='add'>+/* Use CRC to access RX/TEF-RAM */</div><div class='add'>+#define MCP251XFD_QUIRK_CRC_RX BIT(2)</div><div class='add'>+/* Use CRC to access TX-RAM */</div><div class='add'>+#define MCP251XFD_QUIRK_CRC_TX BIT(3)</div><div class='add'>+/* Enable ECC for RAM */</div><div class='add'>+#define MCP251XFD_QUIRK_ECC BIT(4)</div><div class='add'>+/* Use Half Duplex SPI transfers */</div><div class='add'>+#define MCP251XFD_QUIRK_HALF_DUPLEX BIT(5)</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_hw_tef_obj {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The tx_obj_raw version is used in spi async, i.e. without</div><div class='add'>+ * regmap. We have to take care of endianness ourselves.</div><div class='add'>+ */</div><div class='add'>+struct __packed mcp251xfd_hw_tx_obj_raw {</div><div class='add'>+	__le32 id;</div><div class='add'>+	__le32 flags;</div><div class='add'>+	u8 data[sizeof_field(struct canfd_frame, data)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_hw_tx_obj_can {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 data[sizeof_field(struct can_frame, data)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_hw_tx_obj_canfd {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u8 data[sizeof_field(struct canfd_frame, data)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_hw_rx_obj_can {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 ts;</div><div class='add'>+	u8 data[sizeof_field(struct can_frame, data)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_hw_rx_obj_canfd {</div><div class='add'>+	u32 id;</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 ts;</div><div class='add'>+	u8 data[sizeof_field(struct canfd_frame, data)];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed mcp251xfd_buf_cmd {</div><div class='add'>+	__be16 cmd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed mcp251xfd_buf_cmd_crc {</div><div class='add'>+	__be16 cmd;</div><div class='add'>+	u8 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union mcp251xfd_tx_obj_load_buf {</div><div class='add'>+	struct __packed {</div><div class='add'>+		struct mcp251xfd_buf_cmd cmd;</div><div class='add'>+		struct mcp251xfd_hw_tx_obj_raw hw_tx_obj;</div><div class='add'>+	} nocrc;</div><div class='add'>+	struct __packed {</div><div class='add'>+		struct mcp251xfd_buf_cmd_crc cmd;</div><div class='add'>+		struct mcp251xfd_hw_tx_obj_raw hw_tx_obj;</div><div class='add'>+		__be16 crc;</div><div class='add'>+	} crc;</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+union mcp251xfd_write_reg_buf {</div><div class='add'>+	struct __packed {</div><div class='add'>+		struct mcp251xfd_buf_cmd cmd;</div><div class='add'>+		u8 data[4];</div><div class='add'>+	} nocrc;</div><div class='add'>+	struct __packed {</div><div class='add'>+		struct mcp251xfd_buf_cmd_crc cmd;</div><div class='add'>+		u8 data[4];</div><div class='add'>+		__be16 crc;</div><div class='add'>+	} crc;</div><div class='add'>+	struct __packed {</div><div class='add'>+		struct mcp251xfd_buf_cmd cmd;</div><div class='add'>+		u8 data[1];</div><div class='add'>+		__be16 crc;</div><div class='add'>+	} safe;</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_tx_obj {</div><div class='add'>+	struct spi_message msg;</div><div class='add'>+	struct spi_transfer xfer[2];</div><div class='add'>+	union mcp251xfd_tx_obj_load_buf buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_tef_ring {</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+</div><div class='add'>+	/* u8 obj_num equals tx_ring-&gt;obj_num */</div><div class='add'>+	/* u8 obj_size equals sizeof(struct mcp251xfd_hw_tef_obj) */</div><div class='add'>+	/* u8 obj_num_shift_to_u8 equals tx_ring-&gt;obj_num_shift_to_u8 */</div><div class='add'>+</div><div class='add'>+	union mcp251xfd_write_reg_buf irq_enable_buf;</div><div class='add'>+	struct spi_transfer irq_enable_xfer;</div><div class='add'>+	struct spi_message irq_enable_msg;</div><div class='add'>+</div><div class='add'>+	union mcp251xfd_write_reg_buf uinc_buf;</div><div class='add'>+	union mcp251xfd_write_reg_buf uinc_irq_disable_buf;</div><div class='add'>+	struct spi_transfer uinc_xfer[MCP251XFD_TX_OBJ_NUM_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_tx_ring {</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+</div><div class='add'>+	u16 base;</div><div class='add'>+	u8 nr;</div><div class='add'>+	u8 fifo_nr;</div><div class='add'>+	u8 obj_num;</div><div class='add'>+	u8 obj_num_shift_to_u8;</div><div class='add'>+	u8 obj_size;</div><div class='add'>+</div><div class='add'>+	struct mcp251xfd_tx_obj obj[MCP251XFD_TX_OBJ_NUM_MAX];</div><div class='add'>+	union mcp251xfd_write_reg_buf rts_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_rx_ring {</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+</div><div class='add'>+	/* timestamp of the last valid received CAN frame */</div><div class='add'>+	u64 last_valid;</div><div class='add'>+</div><div class='add'>+	u16 base;</div><div class='add'>+	u8 nr;</div><div class='add'>+	u8 fifo_nr;</div><div class='add'>+	u8 obj_num;</div><div class='add'>+	u8 obj_num_shift_to_u8;</div><div class='add'>+	u8 obj_size;</div><div class='add'>+</div><div class='add'>+	union mcp251xfd_write_reg_buf irq_enable_buf;</div><div class='add'>+	struct spi_transfer irq_enable_xfer;</div><div class='add'>+	struct spi_message irq_enable_msg;</div><div class='add'>+</div><div class='add'>+	union mcp251xfd_write_reg_buf uinc_buf;</div><div class='add'>+	union mcp251xfd_write_reg_buf uinc_irq_disable_buf;</div><div class='add'>+	struct spi_transfer uinc_xfer[MCP251XFD_FIFO_DEPTH];</div><div class='add'>+	struct mcp251xfd_hw_rx_obj_canfd obj[];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed mcp251xfd_map_buf_nocrc {</div><div class='add'>+	struct mcp251xfd_buf_cmd cmd;</div><div class='add'>+	u8 data[256];</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+struct __packed mcp251xfd_map_buf_crc {</div><div class='add'>+	struct mcp251xfd_buf_cmd_crc cmd;</div><div class='add'>+	u8 data[256 - 4];</div><div class='add'>+	__be16 crc;</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_ecc {</div><div class='add'>+	u32 ecc_stat;</div><div class='add'>+	int cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_regs_status {</div><div class='add'>+	u32 intf;</div><div class='add'>+	u32 rxif;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mcp251xfd_model {</div><div class='add'>+	MCP251XFD_MODEL_MCP2517FD = 0x2517,</div><div class='add'>+	MCP251XFD_MODEL_MCP2518FD = 0x2518,</div><div class='add'>+	MCP251XFD_MODEL_MCP251863 = 0x251863,</div><div class='add'>+	MCP251XFD_MODEL_MCP251XFD = 0xffffffff,	/* autodetect model */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_devtype_data {</div><div class='add'>+	enum mcp251xfd_model model;</div><div class='add'>+	u32 quirks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mcp251xfd_flags {</div><div class='add'>+	MCP251XFD_FLAGS_DOWN,</div><div class='add'>+	MCP251XFD_FLAGS_FD_MODE,</div><div class='add'>+</div><div class='add'>+	__MCP251XFD_FLAGS_SIZE__</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mcp251xfd_priv {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+	struct regmap *map_reg;			/* register access */</div><div class='add'>+	struct regmap *map_rx;			/* RX/TEF RAM access */</div><div class='add'>+</div><div class='add'>+	struct regmap *map_nocrc;</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *map_buf_nocrc_rx;</div><div class='add'>+	struct mcp251xfd_map_buf_nocrc *map_buf_nocrc_tx;</div><div class='add'>+</div><div class='add'>+	struct regmap *map_crc;</div><div class='add'>+	struct mcp251xfd_map_buf_crc *map_buf_crc_rx;</div><div class='add'>+	struct mcp251xfd_map_buf_crc *map_buf_crc_tx;</div><div class='add'>+</div><div class='add'>+	struct spi_device *spi;</div><div class='add'>+	u32 spi_max_speed_hz_orig;</div><div class='add'>+	u32 spi_max_speed_hz_fast;</div><div class='add'>+	u32 spi_max_speed_hz_slow;</div><div class='add'>+</div><div class='add'>+	struct mcp251xfd_tef_ring tef[MCP251XFD_FIFO_TEF_NUM];</div><div class='add'>+	struct mcp251xfd_rx_ring *rx[MCP251XFD_FIFO_RX_NUM];</div><div class='add'>+	struct mcp251xfd_tx_ring tx[MCP251XFD_FIFO_TX_NUM];</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='add'>+	struct work_struct tx_work;</div><div class='add'>+	struct mcp251xfd_tx_obj *tx_work_obj;</div><div class='add'>+</div><div class='add'>+	DECLARE_BITMAP(flags, __MCP251XFD_FLAGS_SIZE__);</div><div class='add'>+</div><div class='add'>+	u8 rx_ring_num;</div><div class='add'>+	u8 rx_obj_num;</div><div class='add'>+	u8 rx_obj_num_coalesce_irq;</div><div class='add'>+	u8 tx_obj_num_coalesce_irq;</div><div class='add'>+</div><div class='add'>+	u32 rx_coalesce_usecs_irq;</div><div class='add'>+	u32 tx_coalesce_usecs_irq;</div><div class='add'>+	struct hrtimer rx_irq_timer;</div><div class='add'>+	struct hrtimer tx_irq_timer;</div><div class='add'>+</div><div class='add'>+	struct mcp251xfd_ecc ecc;</div><div class='add'>+	struct mcp251xfd_regs_status regs_status;</div><div class='add'>+</div><div class='add'>+	struct cyclecounter cc;</div><div class='add'>+	struct timecounter tc;</div><div class='add'>+	struct delayed_work timestamp;</div><div class='add'>+</div><div class='add'>+	struct gpio_desc *rx_int;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	bool pll_enable;</div><div class='add'>+	struct regulator *reg_vdd;</div><div class='add'>+	struct regulator *reg_xceiver;</div><div class='add'>+</div><div class='add'>+	struct mcp251xfd_devtype_data devtype_data;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	struct gpio_chip gc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MCP251XFD_IS(_model) \</div><div class='add'>+static inline bool \</div><div class='add'>+mcp251xfd_is_##_model(const struct mcp251xfd_priv *priv) \</div><div class='add'>+{ \</div><div class='add'>+	return priv-&gt;devtype_data.model == MCP251XFD_MODEL_MCP##_model; \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MCP251XFD_IS(2517FD);</div><div class='add'>+MCP251XFD_IS(2518FD);</div><div class='add'>+MCP251XFD_IS(251863);</div><div class='add'>+MCP251XFD_IS(251XFD);</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_is_fd_mode(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* listen-only mode works like FD mode */</div><div class='add'>+	return priv-&gt;can.ctrlmode &amp; (CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_FD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_first_byte_set(u32 mask)</div><div class='add'>+{</div><div class='add'>+	return (mask &amp; 0x0000ffff) ?</div><div class='add'>+		((mask &amp; 0x000000ff) ? 0 : 1) :</div><div class='add'>+		((mask &amp; 0x00ff0000) ? 2 : 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_last_byte_set(u32 mask)</div><div class='add'>+{</div><div class='add'>+	return (mask &amp; 0xffff0000) ?</div><div class='add'>+		((mask &amp; 0xff000000) ? 3 : 2) :</div><div class='add'>+		((mask &amp; 0x0000ff00) ? 1 : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline __be16 mcp251xfd_cmd_reset(void)</div><div class='add'>+{</div><div class='add'>+	return cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_RESET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_read_nocrc(struct mcp251xfd_buf_cmd *cmd, u16 addr)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;cmd = cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_READ | addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_write_nocrc(struct mcp251xfd_buf_cmd *cmd, u16 addr)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;cmd = cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_WRITE | addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool mcp251xfd_reg_in_ram(unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	static const struct regmap_range range =</div><div class='add'>+		regmap_reg_range(MCP251XFD_RAM_START,</div><div class='add'>+				 MCP251XFD_RAM_START + MCP251XFD_RAM_SIZE - 4);</div><div class='add'>+</div><div class='add'>+	return regmap_reg_in_range(reg, &amp;range);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+__mcp251xfd_spi_cmd_crc_set_len(struct mcp251xfd_buf_cmd_crc *cmd,</div><div class='add'>+				u16 len, bool in_ram)</div><div class='add'>+{</div><div class='add'>+	/* Number of u32 for RAM access, number of u8 otherwise. */</div><div class='add'>+	if (in_ram)</div><div class='add'>+		cmd-&gt;len = len &gt;&gt; 2;</div><div class='add'>+	else</div><div class='add'>+		cmd-&gt;len = len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_crc_set_len_in_ram(struct mcp251xfd_buf_cmd_crc *cmd, u16 len)</div><div class='add'>+{</div><div class='add'>+	__mcp251xfd_spi_cmd_crc_set_len(cmd, len, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_crc_set_len_in_reg(struct mcp251xfd_buf_cmd_crc *cmd, u16 len)</div><div class='add'>+{</div><div class='add'>+	__mcp251xfd_spi_cmd_crc_set_len(cmd, len, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_read_crc_set_addr(struct mcp251xfd_buf_cmd_crc *cmd, u16 addr)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;cmd = cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_READ_CRC | addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_read_crc(struct mcp251xfd_buf_cmd_crc *cmd,</div><div class='add'>+			   u16 addr, u16 len)</div><div class='add'>+{</div><div class='add'>+	mcp251xfd_spi_cmd_read_crc_set_addr(cmd, addr);</div><div class='add'>+	__mcp251xfd_spi_cmd_crc_set_len(cmd, len, mcp251xfd_reg_in_ram(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_write_crc_set_addr(struct mcp251xfd_buf_cmd_crc *cmd,</div><div class='add'>+				     u16 addr)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;cmd = cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_WRITE_CRC | addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_write_safe_set_addr(struct mcp251xfd_buf_cmd *cmd,</div><div class='add'>+				     u16 addr)</div><div class='add'>+{</div><div class='add'>+	cmd-&gt;cmd = cpu_to_be16(MCP251XFD_SPI_INSTRUCTION_WRITE_CRC_SAFE | addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+mcp251xfd_spi_cmd_write_crc(struct mcp251xfd_buf_cmd_crc *cmd,</div><div class='add'>+			    u16 addr, u16 len)</div><div class='add'>+{</div><div class='add'>+	mcp251xfd_spi_cmd_write_crc_set_addr(cmd, addr);</div><div class='add'>+	__mcp251xfd_spi_cmd_crc_set_len(cmd, len, mcp251xfd_reg_in_ram(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *</div><div class='add'>+mcp251xfd_spi_cmd_write(const struct mcp251xfd_priv *priv,</div><div class='add'>+			union mcp251xfd_write_reg_buf *write_reg_buf,</div><div class='add'>+			u16 addr, u8 len)</div><div class='add'>+{</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;devtype_data.quirks &amp; MCP251XFD_QUIRK_CRC_REG) {</div><div class='add'>+		if (len == 1) {</div><div class='add'>+			mcp251xfd_spi_cmd_write_safe_set_addr(&amp;write_reg_buf-&gt;safe.cmd,</div><div class='add'>+							     addr);</div><div class='add'>+			data = write_reg_buf-&gt;safe.data;</div><div class='add'>+		} else {</div><div class='add'>+			mcp251xfd_spi_cmd_write_crc_set_addr(&amp;write_reg_buf-&gt;crc.cmd,</div><div class='add'>+							     addr);</div><div class='add'>+			data = write_reg_buf-&gt;crc.data;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		mcp251xfd_spi_cmd_write_nocrc(&amp;write_reg_buf-&gt;nocrc.cmd,</div><div class='add'>+					      addr);</div><div class='add'>+		data = write_reg_buf-&gt;nocrc.data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int mcp251xfd_get_timestamp_raw(const struct mcp251xfd_priv *priv,</div><div class='add'>+					      u32 *ts_raw)</div><div class='add'>+{</div><div class='add'>+	return regmap_read(priv-&gt;map_reg, MCP251XFD_REG_TBC, ts_raw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mcp251xfd_skb_set_timestamp(struct sk_buff *skb, u64 ns)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb);</div><div class='add'>+</div><div class='add'>+	hwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline</div><div class='add'>+void mcp251xfd_skb_set_timestamp_raw(const struct mcp251xfd_priv *priv,</div><div class='add'>+				     struct sk_buff *skb, u32 ts_raw)</div><div class='add'>+{</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	ns = timecounter_cyc2time(&amp;priv-&gt;tc, ts_raw);</div><div class='add'>+	mcp251xfd_skb_set_timestamp(skb, ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 mcp251xfd_get_tef_obj_addr(u8 n)</div><div class='add'>+{</div><div class='add'>+	return MCP251XFD_RAM_START +</div><div class='add'>+		sizeof(struct mcp251xfd_hw_tef_obj) * n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16</div><div class='add'>+mcp251xfd_get_tx_obj_addr(const struct mcp251xfd_tx_ring *ring, u8 n)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;base + ring-&gt;obj_size * n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16</div><div class='add'>+mcp251xfd_get_rx_obj_addr(const struct mcp251xfd_rx_ring *ring, u8 n)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;base + ring-&gt;obj_size * n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_tx_tail_get_from_chip(const struct mcp251xfd_priv *priv,</div><div class='add'>+				u8 *tx_tail)</div><div class='add'>+{</div><div class='add'>+	u32 fifo_sta;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;map_reg,</div><div class='add'>+			  MCP251XFD_REG_FIFOSTA(priv-&gt;tx-&gt;fifo_nr),</div><div class='add'>+			  &amp;fifo_sta);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*tx_tail = FIELD_GET(MCP251XFD_REG_FIFOSTA_FIFOCI_MASK, fifo_sta);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_tef_head(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return priv-&gt;tef-&gt;head &amp; (priv-&gt;tx-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_tef_tail(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return priv-&gt;tef-&gt;tail &amp; (priv-&gt;tx-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_tef_linear_len(const struct mcp251xfd_priv *priv, u8 len)</div><div class='add'>+{</div><div class='add'>+	return min_t(u8, len, priv-&gt;tx-&gt;obj_num - mcp251xfd_get_tef_tail(priv));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_tx_head(const struct mcp251xfd_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;head &amp; (ring-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_tx_tail(const struct mcp251xfd_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;tail &amp; (ring-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_tx_free(const struct mcp251xfd_tx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;obj_num - (ring-&gt;head - ring-&gt;tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int</div><div class='add'>+mcp251xfd_get_tx_nr_by_addr(const struct mcp251xfd_tx_ring *tx_ring, u8 *nr,</div><div class='add'>+			    u16 addr)</div><div class='add'>+{</div><div class='add'>+	if (addr &lt; mcp251xfd_get_tx_obj_addr(tx_ring, 0) ||</div><div class='add'>+	    addr &gt;= mcp251xfd_get_tx_obj_addr(tx_ring, tx_ring-&gt;obj_num))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	*nr = (addr - mcp251xfd_get_tx_obj_addr(tx_ring, 0)) /</div><div class='add'>+		tx_ring-&gt;obj_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_rx_head(const struct mcp251xfd_rx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;head &amp; (ring-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 mcp251xfd_get_rx_tail(const struct mcp251xfd_rx_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return ring-&gt;tail &amp; (ring-&gt;obj_num - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8</div><div class='add'>+mcp251xfd_get_rx_linear_len(const struct mcp251xfd_rx_ring *ring, u8 len)</div><div class='add'>+{</div><div class='add'>+	return min_t(u8, len, ring-&gt;obj_num - mcp251xfd_get_rx_tail(ring));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define mcp251xfd_for_each_tx_obj(ring, _obj, n) \</div><div class='add'>+	for ((n) = 0, (_obj) = &amp;(ring)-&gt;obj[(n)]; \</div><div class='add'>+	     (n) &lt; (ring)-&gt;obj_num; \</div><div class='add'>+	     (n)++, (_obj) = &amp;(ring)-&gt;obj[(n)])</div><div class='add'>+</div><div class='add'>+#define mcp251xfd_for_each_rx_ring(priv, ring, n) \</div><div class='add'>+	for ((n) = 0, (ring) = *((priv)-&gt;rx + (n)); \</div><div class='add'>+	     (n) &lt; (priv)-&gt;rx_ring_num; \</div><div class='add'>+	     (n)++, (ring) = *((priv)-&gt;rx + (n)))</div><div class='add'>+</div><div class='add'>+int mcp251xfd_chip_fifo_init(const struct mcp251xfd_priv *priv);</div><div class='add'>+u16 mcp251xfd_crc16_compute2(const void *cmd, size_t cmd_size,</div><div class='add'>+			     const void *data, size_t data_size);</div><div class='add'>+u16 mcp251xfd_crc16_compute(const void *data, size_t data_size);</div><div class='add'>+void mcp251xfd_ethtool_init(struct mcp251xfd_priv *priv);</div><div class='add'>+int mcp251xfd_regmap_init(struct mcp251xfd_priv *priv);</div><div class='add'>+extern const struct can_ram_config mcp251xfd_ram_config;</div><div class='add'>+int mcp251xfd_ring_init(struct mcp251xfd_priv *priv);</div><div class='add'>+void mcp251xfd_ring_free(struct mcp251xfd_priv *priv);</div><div class='add'>+int mcp251xfd_ring_alloc(struct mcp251xfd_priv *priv);</div><div class='add'>+int mcp251xfd_handle_rxif(struct mcp251xfd_priv *priv);</div><div class='add'>+int mcp251xfd_handle_tefif(struct mcp251xfd_priv *priv);</div><div class='add'>+void mcp251xfd_timestamp_init(struct mcp251xfd_priv *priv);</div><div class='add'>+void mcp251xfd_timestamp_start(struct mcp251xfd_priv *priv);</div><div class='add'>+void mcp251xfd_timestamp_stop(struct mcp251xfd_priv *priv);</div><div class='add'>+</div><div class='add'>+void mcp251xfd_tx_obj_write_sync(struct work_struct *work);</div><div class='add'>+netdev_tx_t mcp251xfd_start_xmit(struct sk_buff *skb,</div><div class='add'>+				 struct net_device *ndev);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_DEV_COREDUMP)</div><div class='add'>+void mcp251xfd_dump(const struct mcp251xfd_priv *priv);</div><div class='add'>+#else</div><div class='add'>+static inline void mcp251xfd_dump(const struct mcp251xfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c<br/>index 093fc9a529f0..af52285d5a4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sun4i_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/sun4i_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/sun4i_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/sun4i_can.c</a></div><div class='hunk'>@@ -51,16 +51,16 @@</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "sun4i_can"</div><div class='ctx'> </div><div class='hunk'>@@ -90,6 +90,8 @@</div><div class='ctx'> #define SUN4I_REG_BUF12_ADDR	0x0070	/* CAN Tx/Rx Buffer 12 */</div><div class='ctx'> #define SUN4I_REG_ACPC_ADDR	0x0040	/* CAN Acceptance Code 0 */</div><div class='ctx'> #define SUN4I_REG_ACPM_ADDR	0x0044	/* CAN Acceptance Mask 0 */</div><div class='add'>+#define SUN4I_REG_ACPC_ADDR_D1	0x0028	/* CAN Acceptance Code 0 on the D1 */</div><div class='add'>+#define SUN4I_REG_ACPM_ADDR_D1	0x002C	/* CAN Acceptance Mask 0 on the D1 */</div><div class='ctx'> #define SUN4I_REG_RBUF_RBACK_START_ADDR	0x0180	/* CAN transmit buffer start */</div><div class='ctx'> #define SUN4I_REG_RBUF_RBACK_END_ADDR	0x01b0	/* CAN transmit buffer end */</div><div class='ctx'> </div><div class='hunk'>@@ -200,11 +202,24 @@</div><div class='ctx'> #define SUN4I_CAN_MAX_IRQ	20</div><div class='ctx'> #define SUN4I_MODE_MAX_RETRIES	100</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * struct sun4ican_quirks - Differences between SoC variants.</div><div class='add'>+ *</div><div class='add'>+ * @has_reset: SoC needs reset deasserted.</div><div class='add'>+ * @acp_offset: Offset of ACPC and ACPM registers</div><div class='add'>+ */</div><div class='add'>+struct sun4ican_quirks {</div><div class='add'>+	bool has_reset;</div><div class='add'>+	int acp_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sun4ican_priv {</div><div class='ctx'> 	struct can_priv can;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	struct reset_control *reset;</div><div class='ctx'> 	spinlock_t cmdreg_lock;	/* lock for concurrent cmd register writes */</div><div class='add'>+	int acp_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct can_bittiming_const sun4ican_bittiming_const = {</div><div class='hunk'>@@ -327,8 +342,8 @@ static int sun4i_can_start(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set filters - we accept all */</div><div class='del'>-	writel(0x00000000, priv-&gt;base + SUN4I_REG_ACPC_ADDR);</div><div class='del'>-	writel(0xFFFFFFFF, priv-&gt;base + SUN4I_REG_ACPM_ADDR);</div><div class='add'>+	writel(0x00000000, priv-&gt;base + SUN4I_REG_ACPC_ADDR + priv-&gt;acp_offset);</div><div class='add'>+	writel(0xFFFFFFFF, priv-&gt;base + SUN4I_REG_ACPM_ADDR + priv-&gt;acp_offset);</div><div class='ctx'> </div><div class='ctx'> 	/* clear error counters and error code capture */</div><div class='ctx'> 	writel(0, priv-&gt;base + SUN4I_REG_ERRC_ADDR);</div><div class='hunk'>@@ -418,13 +433,13 @@ static netdev_tx_t sun4ican_start_xmit(struct sk_buff *skb, struct net_device *d</div><div class='ctx'> 	canid_t id;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	id = cf-&gt;can_id;</div><div class='del'>-	dlc = cf-&gt;can_dlc;</div><div class='add'>+	dlc = cf-&gt;len;</div><div class='ctx'> 	msg_flag_n = dlc;</div><div class='ctx'> </div><div class='ctx'> 	if (id &amp; CAN_RTR_FLAG)</div><div class='hunk'>@@ -448,7 +463,7 @@ static netdev_tx_t sun4ican_start_xmit(struct sk_buff *skb, struct net_device *d</div><div class='ctx'> </div><div class='ctx'> 	writel(msg_flag_n, priv-&gt;base + SUN4I_REG_BUF0_ADDR);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, dev, 0);</div><div class='add'>+	can_put_echo_skb(skb, dev, 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='ctx'> 		sun4i_can_write_cmdreg(priv, SUN4I_CMD_SELF_RCV_REQ);</div><div class='hunk'>@@ -475,7 +490,7 @@ static void sun4i_can_rx(struct net_device *dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	fi = readl(priv-&gt;base + SUN4I_REG_BUF0_ADDR);</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(fi &amp; 0x0F);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(fi &amp; 0x0F);</div><div class='ctx'> 	if (fi &amp; SUN4I_MSG_EFF_FLAG) {</div><div class='ctx'> 		dreg = SUN4I_REG_BUF5_ADDR;</div><div class='ctx'> 		id = (readl(priv-&gt;base + SUN4I_REG_BUF1_ADDR) &lt;&lt; 21) |</div><div class='hunk'>@@ -490,21 +505,21 @@ static void sun4i_can_rx(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* remote frame ? */</div><div class='del'>-	if (fi &amp; SUN4I_MSG_RTR_FLAG)</div><div class='add'>+	if (fi &amp; SUN4I_MSG_RTR_FLAG) {</div><div class='ctx'> 		id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 			cf-&gt;data[i] = readl(priv-&gt;base + dreg + i * 4);</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+</div><div class='ctx'> 	cf-&gt;can_id = id;</div><div class='ctx'> </div><div class='ctx'> 	sun4i_can_write_cmdreg(priv, SUN4I_CMD_RELEASE_RBUF);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='del'>-</div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_RX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)</div><div class='hunk'>@@ -525,11 +540,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)</div><div class='ctx'> 	rxerr = (errc &gt;&gt; 16) &amp; 0xFF;</div><div class='ctx'> 	txerr = errc &amp; 0xFF;</div><div class='ctx'> </div><div class='del'>-	if (skb) {</div><div class='del'>-		cf-&gt;data[6] = txerr;</div><div class='del'>-		cf-&gt;data[7] = rxerr;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (isrc &amp; SUN4I_INT_DATA_OR) {</div><div class='ctx'> 		/* data overrun interrupt */</div><div class='ctx'> 		netdev_dbg(dev, "data overrun interrupt\n");</div><div class='hunk'>@@ -560,15 +570,18 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)</div><div class='ctx'> 		else</div><div class='ctx'> 			state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	}</div><div class='add'>+	if (likely(skb) &amp;&amp; state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = txerr;</div><div class='add'>+		cf-&gt;data[7] = rxerr;</div><div class='add'>+	}</div><div class='ctx'> 	if (isrc &amp; SUN4I_INT_BUS_ERR) {</div><div class='ctx'> 		/* bus error interrupt */</div><div class='ctx'> 		netdev_dbg(dev, "bus error interrupt\n");</div><div class='ctx'> 		priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='add'>+		ecc = readl(priv-&gt;base + SUN4I_REG_STA_ADDR);</div><div class='ctx'> </div><div class='ctx'> 		if (likely(skb)) {</div><div class='del'>-			ecc = readl(priv-&gt;base + SUN4I_REG_STA_ADDR);</div><div class='del'>-</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='ctx'> 			switch (ecc &amp; SUN4I_STA_MASK_ERR) {</div><div class='hunk'>@@ -586,9 +599,15 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)</div><div class='ctx'> 					       &gt;&gt; 16;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* error occurred during transmission? */</div><div class='del'>-			if ((ecc &amp; SUN4I_STA_ERR_DIR) == 0)</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* error occurred during transmission? */</div><div class='add'>+		if ((ecc &amp; SUN4I_STA_ERR_DIR) == 0) {</div><div class='add'>+			if (likely(skb))</div><div class='ctx'> 				cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+			stats-&gt;tx_errors++;</div><div class='add'>+		} else {</div><div class='add'>+			stats-&gt;rx_errors++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (isrc &amp; SUN4I_INT_ERR_PASSIVE) {</div><div class='hunk'>@@ -604,7 +623,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)</div><div class='ctx'> 		netdev_dbg(dev, "arbitration lost interrupt\n");</div><div class='ctx'> 		alc = readl(priv-&gt;base + SUN4I_REG_STA_ADDR);</div><div class='ctx'> 		priv-&gt;can.can_stats.arbitration_lost++;</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='ctx'> 		if (likely(skb)) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='ctx'> 			cf-&gt;data[0] = (alc &gt;&gt; 8) &amp; 0x1f;</div><div class='hunk'>@@ -615,21 +633,18 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status)</div><div class='ctx'> 		tx_state = txerr &gt;= rxerr ? state : 0;</div><div class='ctx'> 		rx_state = txerr &lt;= rxerr ? state : 0;</div><div class='ctx'> </div><div class='del'>-		if (likely(skb))</div><div class='del'>-			can_change_state(dev, cf, tx_state, rx_state);</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;can.state = state;</div><div class='add'>+		/* The skb allocation might fail, but can_change_state()</div><div class='add'>+		 * handles cf == NULL.</div><div class='add'>+		 */</div><div class='add'>+		can_change_state(dev, cf, tx_state, rx_state);</div><div class='ctx'> 		if (state == CAN_STATE_BUS_OFF)</div><div class='ctx'> 			can_bus_off(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (likely(skb)) {</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (likely(skb))</div><div class='ctx'> 		netif_rx(skb);</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -642,8 +657,8 @@ static irqreturn_t sun4i_can_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	u8 isrc, status;</div><div class='ctx'> 	int n = 0;</div><div class='ctx'> </div><div class='del'>-	while ((isrc = readl(priv-&gt;base + SUN4I_REG_INT_ADDR)) &amp;&amp;</div><div class='del'>-	       (n &lt; SUN4I_CAN_MAX_IRQ)) {</div><div class='add'>+	while ((n &lt; SUN4I_CAN_MAX_IRQ) &amp;&amp;</div><div class='add'>+	       (isrc = readl(priv-&gt;base + SUN4I_REG_INT_ADDR))) {</div><div class='ctx'> 		n++;</div><div class='ctx'> 		status = readl(priv-&gt;base + SUN4I_REG_STA_ADDR);</div><div class='ctx'> </div><div class='hunk'>@@ -652,13 +667,9 @@ static irqreturn_t sun4i_can_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		if (isrc &amp; SUN4I_INT_TBUF_VLD) {</div><div class='ctx'> 			/* transmission complete interrupt */</div><div class='del'>-			stats-&gt;tx_bytes +=</div><div class='del'>-			    readl(priv-&gt;base +</div><div class='del'>-				  SUN4I_REG_RBUF_RBACK_START_ADDR) &amp; 0xf;</div><div class='add'>+			stats-&gt;tx_bytes += can_get_echo_skb(dev, 0, NULL);</div><div class='ctx'> 			stats-&gt;tx_packets++;</div><div class='del'>-			can_get_echo_skb(dev, 0);</div><div class='ctx'> 			netif_wake_queue(dev);</div><div class='del'>-			can_led_event(dev, CAN_LED_EVENT_TX);</div><div class='ctx'> 		}</div><div class='ctx'> 		if ((isrc &amp; SUN4I_INT_RBUF_VLD) &amp;&amp;</div><div class='ctx'> 		    !(isrc &amp; SUN4I_INT_DATA_OR)) {</div><div class='hunk'>@@ -703,6 +714,13 @@ static int sun4ican_open(struct net_device *dev)</div><div class='ctx'> 		goto exit_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* software reset deassert */</div><div class='add'>+	err = reset_control_deassert(priv-&gt;reset);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "could not deassert CAN reset\n");</div><div class='add'>+		goto exit_soft_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* turn on clocking for CAN peripheral block */</div><div class='ctx'> 	err = clk_prepare_enable(priv-&gt;clk);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -716,7 +734,6 @@ static int sun4ican_open(struct net_device *dev)</div><div class='ctx'> 		goto exit_can_start;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -724,6 +741,8 @@ static int sun4ican_open(struct net_device *dev)</div><div class='ctx'> exit_can_start:</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> exit_clock:</div><div class='add'>+	reset_control_assert(priv-&gt;reset);</div><div class='add'>+exit_soft_reset:</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> exit_irq:</div><div class='ctx'> 	close_candev(dev);</div><div class='hunk'>@@ -737,10 +756,10 @@ static int sun4ican_close(struct net_device *dev)</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	sun4i_can_stop(dev);</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	reset_control_assert(priv-&gt;reset);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	close_candev(dev);</div><div class='del'>-	can_led_event(dev, CAN_LED_EVENT_STOP);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -751,32 +770,79 @@ static const struct net_device_ops sun4ican_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit = sun4ican_start_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ethtool_ops sun4ican_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sun4ican_quirks sun4ican_quirks_a10 = {</div><div class='add'>+	.has_reset = false,</div><div class='add'>+	.acp_offset = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sun4ican_quirks sun4ican_quirks_r40 = {</div><div class='add'>+	.has_reset = true,</div><div class='add'>+	.acp_offset = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct sun4ican_quirks sun4ican_quirks_d1 = {</div><div class='add'>+	.has_reset = true,</div><div class='add'>+	.acp_offset = (SUN4I_REG_ACPC_ADDR_D1 - SUN4I_REG_ACPC_ADDR),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id sun4ican_of_match[] = {</div><div class='del'>-	{.compatible = "allwinner,sun4i-a10-can"},</div><div class='del'>-	{},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "allwinner,sun4i-a10-can",</div><div class='add'>+		.data = &amp;sun4ican_quirks_a10</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "allwinner,sun7i-a20-can",</div><div class='add'>+		.data = &amp;sun4ican_quirks_a10</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "allwinner,sun8i-r40-can",</div><div class='add'>+		.data = &amp;sun4ican_quirks_r40</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "allwinner,sun20i-d1-can",</div><div class='add'>+		.data = &amp;sun4ican_quirks_d1</div><div class='add'>+	}, {</div><div class='add'>+		/* sentinel */</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(of, sun4ican_of_match);</div><div class='ctx'> </div><div class='del'>-static int sun4ican_remove(struct platform_device *pdev)</div><div class='add'>+static void sun4ican_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	free_candev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sun4ican_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='del'>-	struct resource *mem;</div><div class='ctx'> 	struct clk *clk;</div><div class='add'>+	struct reset_control *reset = NULL;</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> 	int err, irq;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct sun4ican_priv *priv;</div><div class='add'>+	const struct sun4ican_quirks *quirks;</div><div class='add'>+</div><div class='add'>+	quirks = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!quirks) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to determine the quirks to use\n");</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (quirks-&gt;has_reset) {</div><div class='add'>+		reset = devm_reset_control_get_exclusive(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+		if (IS_ERR(reset)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "unable to request reset\n");</div><div class='add'>+			err = PTR_ERR(reset);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	clk = of_clk_get(np, 0);</div><div class='ctx'> 	if (IS_ERR(clk)) {</div><div class='hunk'>@@ -787,15 +853,13 @@ static int sun4ican_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "could not get a valid irq\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	addr = devm_ioremap_resource(&amp;pdev-&gt;dev, mem);</div><div class='add'>+	addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(addr)) {</div><div class='del'>-		err = -EBUSY;</div><div class='add'>+		err = PTR_ERR(addr);</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -808,6 +872,7 @@ static int sun4ican_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;sun4ican_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;sun4ican_ethtool_ops;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='hunk'>@@ -822,6 +887,8 @@ static int sun4ican_probe(struct platform_device *pdev)</div><div class='ctx'> 				       CAN_CTRLMODE_3_SAMPLES;</div><div class='ctx'> 	priv-&gt;base = addr;</div><div class='ctx'> 	priv-&gt;clk = clk;</div><div class='add'>+	priv-&gt;reset = reset;</div><div class='add'>+	priv-&gt;acp_offset = quirks-&gt;acp_offset;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;cmdreg_lock);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='hunk'>@@ -833,7 +900,6 @@ static int sun4ican_probe(struct platform_device *pdev)</div><div class='ctx'> 			DRV_NAME, err);</div><div class='ctx'> 		goto exit_free;</div><div class='ctx'> 	}</div><div class='del'>-	devm_can_led_init(dev);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "device registered (base=%p, irq=%d)\n",</div><div class='ctx'> 		 priv-&gt;base, dev-&gt;irq);</div><div class='hunk'>@@ -860,4 +926,4 @@ module_platform_driver(sun4i_can_driver);</div><div class='ctx'> MODULE_AUTHOR("Peter Chen &lt;xingkongcp@gmail.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Gerhard Bertelsmann &lt;info@gerhard-bertelsmann.de&gt;");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_DESCRIPTION("CAN driver for Allwinner SoCs (A10/A20)");</div><div class='add'>+MODULE_DESCRIPTION("CAN driver for Allwinner SoCs (A10/A20/D1)");</div><div class='head'>diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c<br/>index db6ea936dc3f..1d3dbf28b105 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ti_hecc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/ti_hecc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/ti_hecc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/ti_hecc.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * TI HECC (CAN) device driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,16 +6,7 @@</div><div class='ctx'>  * specs for the same is available at &lt;http://www.ti.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation version 2.</div><div class='del'>- *</div><div class='del'>- * This program is distributed as is WITHOUT ANY WARRANTY of any</div><div class='del'>- * kind, whether express or implied; without even the implied warranty</div><div class='del'>- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='add'>+ * Copyright (C) 2019 Jeroen Hofstee &lt;jhofstee@victronenergy.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -22,18 +14,18 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "ti_hecc"</div><div class='ctx'> #define HECC_MODULE_VERSION     "0.7"</div><div class='hunk'>@@ -44,8 +36,7 @@ MODULE_VERSION(HECC_MODULE_VERSION);</div><div class='ctx'> #define HECC_MAX_MAILBOXES	32	/* hardware mailboxes - do not change */</div><div class='ctx'> #define MAX_TX_PRIO		0x3F	/* hardware value - do not change */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Important Note: TX mailbox configuration</div><div class='add'>+/* Important Note: TX mailbox configuration</div><div class='ctx'>  * TX mailboxes should be restricted to the number of SKB buffers to avoid</div><div class='ctx'>  * maintaining SKB buffers separately. TX mailboxes should be a power of 2</div><div class='ctx'>  * for the mailbox logic to work.  Top mailbox numbers are reserved for RX</div><div class='hunk'>@@ -63,29 +54,16 @@ MODULE_VERSION(HECC_MODULE_VERSION);</div><div class='ctx'> #define HECC_TX_PRIO_MASK	(MAX_TX_PRIO &lt;&lt; HECC_MB_TX_SHIFT)</div><div class='ctx'> #define HECC_TX_MB_MASK		(HECC_MAX_TX_MBOX - 1)</div><div class='ctx'> #define HECC_TX_MASK		((HECC_MAX_TX_MBOX - 1) | HECC_TX_PRIO_MASK)</div><div class='del'>-#define HECC_TX_MBOX_MASK	(~(BIT(HECC_MAX_TX_MBOX) - 1))</div><div class='del'>-#define HECC_DEF_NAPI_WEIGHT	HECC_MAX_RX_MBOX</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Important Note: RX mailbox configuration</div><div class='del'>- * RX mailboxes are further logically split into two - main and buffer</div><div class='del'>- * mailboxes. The goal is to get all packets into main mailboxes as</div><div class='del'>- * driven by mailbox number and receive priority (higher to lower) and</div><div class='del'>- * buffer mailboxes are used to receive pkts while main mailboxes are being</div><div class='del'>- * processed. This ensures in-order packet reception.</div><div class='del'>- *</div><div class='del'>- * Here are the recommended values for buffer mailbox. Note that RX mailboxes</div><div class='del'>- * start after TX mailboxes:</div><div class='add'>+/* RX mailbox configuration</div><div class='ctx'>  *</div><div class='del'>- * HECC_MAX_RX_MBOX		HECC_RX_BUFFER_MBOX	No of buffer mailboxes</div><div class='del'>- * 28				12			8</div><div class='del'>- * 16				20			4</div><div class='add'>+ * The remaining mailboxes are used for reception and are delivered</div><div class='add'>+ * based on their timestamp, to avoid a hardware race when CANME is</div><div class='add'>+ * changed while CAN-bus traffic is being received.</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> #define HECC_MAX_RX_MBOX	(HECC_MAX_MAILBOXES - HECC_MAX_TX_MBOX)</div><div class='del'>-#define HECC_RX_BUFFER_MBOX	12 /* as per table above */</div><div class='ctx'> #define HECC_RX_FIRST_MBOX	(HECC_MAX_MAILBOXES - 1)</div><div class='del'>-#define HECC_RX_HIGH_MBOX_MASK	(~(BIT(HECC_RX_BUFFER_MBOX) - 1))</div><div class='add'>+#define HECC_RX_LAST_MBOX	(HECC_MAX_TX_MBOX)</div><div class='ctx'> </div><div class='ctx'> /* TI HECC module registers */</div><div class='ctx'> #define HECC_CANME		0x0	/* Mailbox enable */</div><div class='hunk'>@@ -95,7 +73,7 @@ MODULE_VERSION(HECC_MODULE_VERSION);</div><div class='ctx'> #define HECC_CANTA		0x10	/* Transmission acknowledge */</div><div class='ctx'> #define HECC_CANAA		0x14	/* Abort acknowledge */</div><div class='ctx'> #define HECC_CANRMP		0x18	/* Receive message pending */</div><div class='del'>-#define HECC_CANRML		0x1C	/* Remote message lost */</div><div class='add'>+#define HECC_CANRML		0x1C	/* Receive message lost */</div><div class='ctx'> #define HECC_CANRFP		0x20	/* Remote frame pending */</div><div class='ctx'> #define HECC_CANGAM		0x24	/* SECC only:Global acceptance mask */</div><div class='ctx'> #define HECC_CANMC		0x28	/* Master control */</div><div class='hunk'>@@ -117,6 +95,9 @@ MODULE_VERSION(HECC_MODULE_VERSION);</div><div class='ctx'> #define HECC_CANTIOCE		0x68	/* SCC only:Enhanced TX I/O control */</div><div class='ctx'> #define HECC_CANRIOCE		0x6C	/* SCC only:Enhanced RX I/O control */</div><div class='ctx'> </div><div class='add'>+/* TI HECC RAM registers */</div><div class='add'>+#define HECC_CANMOTS		0x80	/* Message object time stamp */</div><div class='add'>+</div><div class='ctx'> /* Mailbox registers */</div><div class='ctx'> #define HECC_CANMID		0x0</div><div class='ctx'> #define HECC_CANMCF		0x4</div><div class='hunk'>@@ -159,6 +140,8 @@ MODULE_VERSION(HECC_MODULE_VERSION);</div><div class='ctx'> #define HECC_BUS_ERROR		(HECC_CANES_FE | HECC_CANES_BE |\</div><div class='ctx'> 				HECC_CANES_CRCE | HECC_CANES_SE |\</div><div class='ctx'> 				HECC_CANES_ACKE)</div><div class='add'>+#define HECC_CANES_FLAGS	(HECC_BUS_ERROR | HECC_CANES_BO |\</div><div class='add'>+				HECC_CANES_EP | HECC_CANES_EW)</div><div class='ctx'> </div><div class='ctx'> #define HECC_CANMCF_RTR		BIT(4)	/* Remote transmit request */</div><div class='ctx'> </div><div class='hunk'>@@ -193,7 +176,7 @@ static const struct can_bittiming_const ti_hecc_bittiming_const = {</div><div class='ctx'> </div><div class='ctx'> struct ti_hecc_priv {</div><div class='ctx'> 	struct can_priv can;	/* MUST be first member/field */</div><div class='del'>-	struct napi_struct napi;</div><div class='add'>+	struct can_rx_offload offload;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> 	void __iomem *base;</div><div class='hunk'>@@ -203,7 +186,6 @@ struct ti_hecc_priv {</div><div class='ctx'> 	spinlock_t mbx_lock; /* CANME register needs protection */</div><div class='ctx'> 	u32 tx_head;</div><div class='ctx'> 	u32 tx_tail;</div><div class='del'>-	u32 rx_next;</div><div class='ctx'> 	struct regulator *reg_xceiver;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -227,8 +209,13 @@ static inline void hecc_write_lam(struct ti_hecc_priv *priv, u32 mbxno, u32 val)</div><div class='ctx'> 	__raw_writel(val, priv-&gt;hecc_ram + mbxno * 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 hecc_read_stamp(struct ti_hecc_priv *priv, u32 mbxno)</div><div class='add'>+{</div><div class='add'>+	return __raw_readl(priv-&gt;hecc_ram + HECC_CANMOTS + mbxno * 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void hecc_write_mbx(struct ti_hecc_priv *priv, u32 mbxno,</div><div class='del'>-	u32 reg, u32 val)</div><div class='add'>+				  u32 reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	__raw_writel(val, priv-&gt;mbx + mbxno * 0x10 + reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -249,13 +236,13 @@ static inline u32 hecc_read(struct ti_hecc_priv *priv, int reg)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void hecc_set_bit(struct ti_hecc_priv *priv, int reg,</div><div class='del'>-	u32 bit_mask)</div><div class='add'>+				u32 bit_mask)</div><div class='ctx'> {</div><div class='ctx'> 	hecc_write(priv, reg, hecc_read(priv, reg) | bit_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void hecc_clear_bit(struct ti_hecc_priv *priv, int reg,</div><div class='del'>-	u32 bit_mask)</div><div class='add'>+				  u32 bit_mask)</div><div class='ctx'> {</div><div class='ctx'> 	hecc_write(priv, reg, hecc_read(priv, reg) &amp; ~bit_mask);</div><div class='ctx'> }</div><div class='hunk'>@@ -277,8 +264,8 @@ static int ti_hecc_set_btc(struct ti_hecc_priv *priv)</div><div class='ctx'> 		if (bit_timing-&gt;brp &gt; 4)</div><div class='ctx'> 			can_btc |= HECC_CANBTC_SAM;</div><div class='ctx'> 		else</div><div class='del'>-			netdev_warn(priv-&gt;ndev, "WARN: Triple"</div><div class='del'>-				"sampling not set due to h/w limitations");</div><div class='add'>+			netdev_warn(priv-&gt;ndev,</div><div class='add'>+				    "WARN: Triple sampling not set due to h/w limitations");</div><div class='ctx'> 	}</div><div class='ctx'> 	can_btc |= ((bit_timing-&gt;sjw - 1) &amp; 0x3) &lt;&lt; 8;</div><div class='ctx'> 	can_btc |= ((bit_timing-&gt;brp - 1) &amp; 0xFF) &lt;&lt; 16;</div><div class='hunk'>@@ -314,8 +301,7 @@ static void ti_hecc_reset(struct net_device *ndev)</div><div class='ctx'> 	/* Set change control request and wait till enabled */</div><div class='ctx'> 	hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_CCR);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * INFO: It has been observed that at times CCE bit may not be</div><div class='add'>+	/* INFO: It has been observed that at times CCE bit may not be</div><div class='ctx'> 	 * set and hw seems to be ok even if this bit is not set so</div><div class='ctx'> 	 * timing out with a timing of 1ms to respect the specs</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -325,8 +311,7 @@ static void ti_hecc_reset(struct net_device *ndev)</div><div class='ctx'> 		udelay(10);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Note: On HECC, BTC can be programmed only in initialization mode, so</div><div class='add'>+	/* Note: On HECC, BTC can be programmed only in initialization mode, so</div><div class='ctx'> 	 * it is expected that the can bittiming parameters are set via ip</div><div class='ctx'> 	 * utility before the device is opened</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -335,13 +320,11 @@ static void ti_hecc_reset(struct net_device *ndev)</div><div class='ctx'> 	/* Clear CCR (and CANMC register) and wait for CCE = 0 enable */</div><div class='ctx'> 	hecc_write(priv, HECC_CANMC, 0);</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * INFO: CAN net stack handles bus off and hence disabling auto-bus-on</div><div class='add'>+	/* INFO: CAN net stack handles bus off and hence disabling auto-bus-on</div><div class='ctx'> 	 * hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_ABO);</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * INFO: It has been observed that at times CCE bit may not be</div><div class='add'>+	/* INFO: It has been observed that at times CCE bit may not be</div><div class='ctx'> 	 * set and hw seems to be ok even if this bit is not set so</div><div class='ctx'> 	 */</div><div class='ctx'> 	cnt = HECC_CCE_WAIT_COUNT;</div><div class='hunk'>@@ -374,8 +357,8 @@ static void ti_hecc_start(struct net_device *ndev)</div><div class='ctx'> 	/* put HECC in initialization mode and set btc */</div><div class='ctx'> 	ti_hecc_reset(ndev);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_head = priv-&gt;tx_tail = HECC_TX_MASK;</div><div class='del'>-	priv-&gt;rx_next = HECC_RX_FIRST_MBOX;</div><div class='add'>+	priv-&gt;tx_head = HECC_TX_MASK;</div><div class='add'>+	priv-&gt;tx_tail = HECC_TX_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable local and global acceptance mask registers */</div><div class='ctx'> 	hecc_write(priv, HECC_CANGAM, HECC_SET_REG);</div><div class='hunk'>@@ -392,8 +375,18 @@ static void ti_hecc_start(struct net_device *ndev)</div><div class='ctx'> 		hecc_set_bit(priv, HECC_CANMIM, mbx_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Prevent message over-write &amp; Enable interrupts */</div><div class='del'>-	hecc_write(priv, HECC_CANOPC, HECC_SET_REG);</div><div class='add'>+	/* Enable tx interrupts */</div><div class='add'>+	hecc_set_bit(priv, HECC_CANMIM, BIT(HECC_MAX_TX_MBOX) - 1);</div><div class='add'>+</div><div class='add'>+	/* Prevent message over-write to create a rx fifo, but not for</div><div class='add'>+	 * the lowest priority mailbox, since that allows detecting</div><div class='add'>+	 * overflows instead of the hardware silently dropping the</div><div class='add'>+	 * messages.</div><div class='add'>+	 */</div><div class='add'>+	mbx_mask = ~BIT_U32(HECC_RX_LAST_MBOX);</div><div class='add'>+	hecc_write(priv, HECC_CANOPC, mbx_mask);</div><div class='add'>+</div><div class='add'>+	/* Enable interrupts */</div><div class='ctx'> 	if (priv-&gt;use_hecc1int) {</div><div class='ctx'> 		hecc_write(priv, HECC_CANMIL, HECC_SET_REG);</div><div class='ctx'> 		hecc_write(priv, HECC_CANGIM, HECC_CANGIM_DEF_MASK |</div><div class='hunk'>@@ -401,7 +394,7 @@ static void ti_hecc_start(struct net_device *ndev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hecc_write(priv, HECC_CANMIL, 0);</div><div class='ctx'> 		hecc_write(priv, HECC_CANGIM,</div><div class='del'>-			HECC_CANGIM_DEF_MASK | HECC_CANGIM_I0EN);</div><div class='add'>+			   HECC_CANGIM_DEF_MASK | HECC_CANGIM_I0EN);</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> }</div><div class='hunk'>@@ -410,6 +403,9 @@ static void ti_hecc_stop(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='add'>+	/* Disable the CPK; stop sending, erroring and acking */</div><div class='add'>+	hecc_set_bit(priv, HECC_CANMC, HECC_CANMC_CCR);</div><div class='add'>+</div><div class='ctx'> 	/* Disable interrupts and disable mailboxes */</div><div class='ctx'> 	hecc_write(priv, HECC_CANGIM, 0);</div><div class='ctx'> 	hecc_write(priv, HECC_CANMIM, 0);</div><div class='hunk'>@@ -435,7 +431,7 @@ static int ti_hecc_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ti_hecc_get_berr_counter(const struct net_device *ndev,</div><div class='del'>-					struct can_berr_counter *bec)</div><div class='add'>+				    struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='ctx'> 	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -445,11 +441,10 @@ static int ti_hecc_get_berr_counter(const struct net_device *ndev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * ti_hecc_xmit: HECC Transmit</div><div class='add'>+/* ti_hecc_xmit: HECC Transmit</div><div class='ctx'>  *</div><div class='ctx'>  * The transmit mailboxes start from 0 to HECC_MAX_TX_MBOX. In HECC the</div><div class='del'>- * priority of the mailbox for tranmission is dependent upon priority setting</div><div class='add'>+ * priority of the mailbox for transmission is dependent upon priority setting</div><div class='ctx'>  * field in mailbox registers. The mailbox with highest value in priority field</div><div class='ctx'>  * is transmitted first. Only when two mailboxes have the same value in</div><div class='ctx'>  * priority field the highest numbered mailbox is transmitted first.</div><div class='hunk'>@@ -474,7 +469,7 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	u32 mbxno, mbx_mask, data;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	mbxno = get_tx_head_mb(priv);</div><div class='hunk'>@@ -484,14 +479,14 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;priv-&gt;mbx_lock, flags);</div><div class='ctx'> 		netif_stop_queue(ndev);</div><div class='ctx'> 		netdev_err(priv-&gt;ndev,</div><div class='del'>-			"BUG: TX mbx not ready tx_head=%08X, tx_tail=%08X\n",</div><div class='del'>-			priv-&gt;tx_head, priv-&gt;tx_tail);</div><div class='add'>+			   "BUG: TX mbx not ready tx_head=%08X, tx_tail=%08X\n",</div><div class='add'>+			   priv-&gt;tx_head, priv-&gt;tx_tail);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;mbx_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare mailbox for transmission */</div><div class='del'>-	data = cf-&gt;can_dlc | (get_tx_head_prio(priv) &lt;&lt; 8);</div><div class='add'>+	data = cf-&gt;len | (get_tx_head_prio(priv) &lt;&lt; 8);</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG) /* Remote transmission request */</div><div class='ctx'> 		data |= HECC_CANMCF_RTR;</div><div class='ctx'> 	hecc_write_mbx(priv, mbxno, HECC_CANMCF, data);</div><div class='hunk'>@@ -502,261 +497,243 @@ static netdev_tx_t ti_hecc_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		data = (cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; 18;</div><div class='ctx'> 	hecc_write_mbx(priv, mbxno, HECC_CANMID, data);</div><div class='ctx'> 	hecc_write_mbx(priv, mbxno, HECC_CANMDL,</div><div class='del'>-		be32_to_cpu(*(__be32 *)(cf-&gt;data)));</div><div class='del'>-	if (cf-&gt;can_dlc &gt; 4)</div><div class='add'>+		       be32_to_cpu(*(__be32 *)(cf-&gt;data)));</div><div class='add'>+	if (cf-&gt;len &gt; 4)</div><div class='ctx'> 		hecc_write_mbx(priv, mbxno, HECC_CANMDH,</div><div class='del'>-			be32_to_cpu(*(__be32 *)(cf-&gt;data + 4)));</div><div class='add'>+			       be32_to_cpu(*(__be32 *)(cf-&gt;data + 4)));</div><div class='ctx'> 	else</div><div class='ctx'> 		*(u32 *)(cf-&gt;data + 4) = 0;</div><div class='del'>-	can_put_echo_skb(skb, ndev, mbxno);</div><div class='add'>+	can_put_echo_skb(skb, ndev, mbxno, 0);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;mbx_lock, flags);</div><div class='ctx'> 	--priv-&gt;tx_head;</div><div class='ctx'> 	if ((hecc_read(priv, HECC_CANME) &amp; BIT(get_tx_head_mb(priv))) ||</div><div class='del'>-		(priv-&gt;tx_head &amp; HECC_TX_MASK) == HECC_TX_MASK) {</div><div class='add'>+	    (priv-&gt;tx_head &amp; HECC_TX_MASK) == HECC_TX_MASK) {</div><div class='ctx'> 		netif_stop_queue(ndev);</div><div class='ctx'> 	}</div><div class='ctx'> 	hecc_set_bit(priv, HECC_CANME, mbx_mask);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;mbx_lock, flags);</div><div class='ctx'> </div><div class='del'>-	hecc_clear_bit(priv, HECC_CANMD, mbx_mask);</div><div class='del'>-	hecc_set_bit(priv, HECC_CANMIM, mbx_mask);</div><div class='ctx'> 	hecc_write(priv, HECC_CANTRS, mbx_mask);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ti_hecc_rx_pkt(struct ti_hecc_priv *priv, int mbxno)</div><div class='add'>+static inline</div><div class='add'>+struct ti_hecc_priv *rx_offload_to_priv(struct can_rx_offload *offload)</div><div class='ctx'> {</div><div class='del'>-	struct net_device_stats *stats = &amp;priv-&gt;ndev-&gt;stats;</div><div class='del'>-	struct can_frame *cf;</div><div class='add'>+	return container_of(offload, struct ti_hecc_priv, offload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *ti_hecc_mailbox_read(struct can_rx_offload *offload,</div><div class='add'>+					    unsigned int mbxno, u32 *timestamp,</div><div class='add'>+					    bool drop)</div><div class='add'>+{</div><div class='add'>+	struct ti_hecc_priv *priv = rx_offload_to_priv(offload);</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf;</div><div class='ctx'> 	u32 data, mbx_mask;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_can_skb(priv-&gt;ndev, &amp;cf);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		if (printk_ratelimit())</div><div class='del'>-			netdev_err(priv-&gt;ndev,</div><div class='del'>-				"ti_hecc_rx_pkt: alloc_can_skb() failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	mbx_mask = BIT(mbxno);</div><div class='add'>+</div><div class='add'>+	if (unlikely(drop)) {</div><div class='add'>+		skb = ERR_PTR(-ENOBUFS);</div><div class='add'>+		goto mark_as_read;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(offload-&gt;dev, &amp;cf);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		skb = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto mark_as_read;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mbx_mask = BIT(mbxno);</div><div class='ctx'> 	data = hecc_read_mbx(priv, mbxno, HECC_CANMID);</div><div class='ctx'> 	if (data &amp; HECC_CANMID_IDE)</div><div class='ctx'> 		cf-&gt;can_id = (data &amp; CAN_EFF_MASK) | CAN_EFF_FLAG;</div><div class='ctx'> 	else</div><div class='ctx'> 		cf-&gt;can_id = (data &gt;&gt; 18) &amp; CAN_SFF_MASK;</div><div class='add'>+</div><div class='ctx'> 	data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);</div><div class='ctx'> 	if (data &amp; HECC_CANMCF_RTR)</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(data &amp; 0xF);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(data &amp; 0xF);</div><div class='add'>+</div><div class='ctx'> 	data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);</div><div class='ctx'> 	*(__be32 *)(cf-&gt;data) = cpu_to_be32(data);</div><div class='del'>-	if (cf-&gt;can_dlc &gt; 4) {</div><div class='add'>+	if (cf-&gt;len &gt; 4) {</div><div class='ctx'> 		data = hecc_read_mbx(priv, mbxno, HECC_CANMDH);</div><div class='ctx'> 		*(__be32 *)(cf-&gt;data + 4) = cpu_to_be32(data);</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;mbx_lock, flags);</div><div class='del'>-	hecc_clear_bit(priv, HECC_CANME, mbx_mask);</div><div class='del'>-	hecc_write(priv, HECC_CANRMP, mbx_mask);</div><div class='del'>-	/* enable mailbox only if it is part of rx buffer mailboxes */</div><div class='del'>-	if (priv-&gt;rx_next &lt; HECC_RX_BUFFER_MBOX)</div><div class='del'>-		hecc_set_bit(priv, HECC_CANME, mbx_mask);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;mbx_lock, flags);</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	can_led_event(priv-&gt;ndev, CAN_LED_EVENT_RX);</div><div class='del'>-	netif_receive_skb(skb);</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ti_hecc_rx_poll - HECC receive pkts</div><div class='del'>- *</div><div class='del'>- * The receive mailboxes start from highest numbered mailbox till last xmit</div><div class='del'>- * mailbox. On CAN frame reception the hardware places the data into highest</div><div class='del'>- * numbered mailbox that matches the CAN ID filter. Since all receive mailboxes</div><div class='del'>- * have same filtering (ALL CAN frames) packets will arrive in the highest</div><div class='del'>- * available RX mailbox and we need to ensure in-order packet reception.</div><div class='del'>- *</div><div class='del'>- * To ensure the packets are received in the right order we logically divide</div><div class='del'>- * the RX mailboxes into main and buffer mailboxes. Packets are received as per</div><div class='del'>- * mailbox priotity (higher to lower) in the main bank and once it is full we</div><div class='del'>- * disable further reception into main mailboxes. While the main mailboxes are</div><div class='del'>- * processed in NAPI, further packets are received in buffer mailboxes.</div><div class='del'>- *</div><div class='del'>- * We maintain a RX next mailbox counter to process packets and once all main</div><div class='del'>- * mailboxe packets are passed to the upper stack we enable all of them but</div><div class='del'>- * continue to process packets received in buffer mailboxes. With each packet</div><div class='del'>- * received from buffer mailbox we enable it immediately so as to handle the</div><div class='del'>- * overflow from higher mailboxes.</div><div class='del'>- */</div><div class='del'>-static int ti_hecc_rx_poll(struct napi_struct *napi, int quota)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = napi-&gt;dev;</div><div class='del'>-	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='del'>-	u32 num_pkts = 0;</div><div class='del'>-	u32 mbx_mask;</div><div class='del'>-	unsigned long pending_pkts, flags;</div><div class='del'>-</div><div class='del'>-	if (!netif_running(ndev))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='del'>-	while ((pending_pkts = hecc_read(priv, HECC_CANRMP)) &amp;&amp;</div><div class='del'>-		num_pkts &lt; quota) {</div><div class='del'>-		mbx_mask = BIT(priv-&gt;rx_next); /* next rx mailbox to process */</div><div class='del'>-		if (mbx_mask &amp; pending_pkts) {</div><div class='del'>-			if (ti_hecc_rx_pkt(priv, priv-&gt;rx_next) &lt; 0)</div><div class='del'>-				return num_pkts;</div><div class='del'>-			++num_pkts;</div><div class='del'>-		} else if (priv-&gt;rx_next &gt; HECC_RX_BUFFER_MBOX) {</div><div class='del'>-			break; /* pkt not received yet */</div><div class='del'>-		}</div><div class='del'>-		--priv-&gt;rx_next;</div><div class='del'>-		if (priv-&gt;rx_next == HECC_RX_BUFFER_MBOX) {</div><div class='del'>-			/* enable high bank mailboxes */</div><div class='del'>-			spin_lock_irqsave(&amp;priv-&gt;mbx_lock, flags);</div><div class='del'>-			mbx_mask = hecc_read(priv, HECC_CANME);</div><div class='del'>-			mbx_mask |= HECC_RX_HIGH_MBOX_MASK;</div><div class='del'>-			hecc_write(priv, HECC_CANME, mbx_mask);</div><div class='del'>-			spin_unlock_irqrestore(&amp;priv-&gt;mbx_lock, flags);</div><div class='del'>-		} else if (priv-&gt;rx_next == HECC_MAX_TX_MBOX - 1) {</div><div class='del'>-			priv-&gt;rx_next = HECC_RX_FIRST_MBOX;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	*timestamp = hecc_read_stamp(priv, mbxno);</div><div class='add'>+</div><div class='add'>+	/* Check for FIFO overrun.</div><div class='add'>+	 *</div><div class='add'>+	 * All but the last RX mailbox have activated overwrite</div><div class='add'>+	 * protection. So skip check for overrun, if we're not</div><div class='add'>+	 * handling the last RX mailbox.</div><div class='add'>+	 *</div><div class='add'>+	 * As the overwrite protection for the last RX mailbox is</div><div class='add'>+	 * disabled, the CAN core might update while we're reading</div><div class='add'>+	 * it. This means the skb might be inconsistent.</div><div class='add'>+	 *</div><div class='add'>+	 * Return an error to let rx-offload discard this CAN frame.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(mbxno == HECC_RX_LAST_MBOX &amp;&amp;</div><div class='add'>+		     hecc_read(priv, HECC_CANRML) &amp; mbx_mask))</div><div class='add'>+		skb = ERR_PTR(-ENOBUFS);</div><div class='ctx'> </div><div class='del'>-	/* Enable packet interrupt if all pkts are handled */</div><div class='del'>-	if (hecc_read(priv, HECC_CANRMP) == 0) {</div><div class='del'>-		napi_complete(napi);</div><div class='del'>-		/* Re-enable RX mailbox interrupts */</div><div class='del'>-		mbx_mask = hecc_read(priv, HECC_CANMIM);</div><div class='del'>-		mbx_mask |= HECC_TX_MBOX_MASK;</div><div class='del'>-		hecc_write(priv, HECC_CANMIM, mbx_mask);</div><div class='del'>-	} else {</div><div class='del'>-		/* repoll is done only if whole budget is used */</div><div class='del'>-		num_pkts = quota;</div><div class='del'>-	}</div><div class='add'>+ mark_as_read:</div><div class='add'>+	hecc_write(priv, HECC_CANRMP, mbx_mask);</div><div class='ctx'> </div><div class='del'>-	return num_pkts;</div><div class='add'>+	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ti_hecc_error(struct net_device *ndev, int int_status,</div><div class='del'>-	int err_status)</div><div class='add'>+			 int err_status)</div><div class='ctx'> {</div><div class='ctx'> 	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='del'>-	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* propagate the error condition to the can stack */</div><div class='del'>-	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		if (printk_ratelimit())</div><div class='del'>-			netdev_err(priv-&gt;ndev,</div><div class='del'>-				"ti_hecc_error: alloc_can_err_skb() failed\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (int_status &amp; HECC_CANGIF_WLIF) { /* warning level int */</div><div class='del'>-		if ((int_status &amp; HECC_CANGIF_BOIF) == 0) {</div><div class='del'>-			priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-			++priv-&gt;can.can_stats.error_warning;</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			if (hecc_read(priv, HECC_CANTEC) &gt; 96)</div><div class='del'>-				cf-&gt;data[1] |= CAN_ERR_CRTL_TX_WARNING;</div><div class='del'>-			if (hecc_read(priv, HECC_CANREC) &gt; 96)</div><div class='del'>-				cf-&gt;data[1] |= CAN_ERR_CRTL_RX_WARNING;</div><div class='del'>-		}</div><div class='del'>-		hecc_set_bit(priv, HECC_CANES, HECC_CANES_EW);</div><div class='del'>-		netdev_dbg(priv-&gt;ndev, "Error Warning interrupt\n");</div><div class='del'>-		hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (int_status &amp; HECC_CANGIF_EPIF) { /* error passive int */</div><div class='del'>-		if ((int_status &amp; HECC_CANGIF_BOIF) == 0) {</div><div class='del'>-			priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-			++priv-&gt;can.can_stats.error_passive;</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			if (hecc_read(priv, HECC_CANTEC) &gt; 127)</div><div class='del'>-				cf-&gt;data[1] |= CAN_ERR_CRTL_TX_PASSIVE;</div><div class='del'>-			if (hecc_read(priv, HECC_CANREC) &gt; 127)</div><div class='del'>-				cf-&gt;data[1] |= CAN_ERR_CRTL_RX_PASSIVE;</div><div class='add'>+	if (err_status &amp; HECC_BUS_ERROR) {</div><div class='add'>+		/* propagate the error condition to the can stack */</div><div class='add'>+		skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				netdev_err(priv-&gt;ndev,</div><div class='add'>+					   "%s: alloc_can_err_skb() failed\n",</div><div class='add'>+					   __func__);</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='del'>-		hecc_set_bit(priv, HECC_CANES, HECC_CANES_EP);</div><div class='del'>-		netdev_dbg(priv-&gt;ndev, "Error passive interrupt\n");</div><div class='del'>-		hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * Need to check busoff condition in error status register too to</div><div class='del'>-	 * ensure warning interrupts don't hog the system</div><div class='del'>-	 */</div><div class='del'>-	if ((int_status &amp; HECC_CANGIF_BOIF) || (err_status &amp; HECC_CANES_BO)) {</div><div class='del'>-		priv-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='del'>-		hecc_set_bit(priv, HECC_CANES, HECC_CANES_BO);</div><div class='del'>-		hecc_clear_bit(priv, HECC_CANMC, HECC_CANMC_CCR);</div><div class='del'>-		/* Disable all interrupts in bus-off to avoid int hog */</div><div class='del'>-		hecc_write(priv, HECC_CANGIM, 0);</div><div class='del'>-		++priv-&gt;can.can_stats.bus_off;</div><div class='del'>-		can_bus_off(ndev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (err_status &amp; HECC_BUS_ERROR) {</div><div class='ctx'> 		++priv-&gt;can.can_stats.bus_error;</div><div class='ctx'> 		cf-&gt;can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT;</div><div class='del'>-		if (err_status &amp; HECC_CANES_FE) {</div><div class='del'>-			hecc_set_bit(priv, HECC_CANES, HECC_CANES_FE);</div><div class='add'>+		if (err_status &amp; HECC_CANES_FE)</div><div class='ctx'> 			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-		}</div><div class='del'>-		if (err_status &amp; HECC_CANES_BE) {</div><div class='del'>-			hecc_set_bit(priv, HECC_CANES, HECC_CANES_BE);</div><div class='add'>+		if (err_status &amp; HECC_CANES_BE)</div><div class='ctx'> 			cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-		}</div><div class='del'>-		if (err_status &amp; HECC_CANES_SE) {</div><div class='del'>-			hecc_set_bit(priv, HECC_CANES, HECC_CANES_SE);</div><div class='add'>+		if (err_status &amp; HECC_CANES_SE)</div><div class='ctx'> 			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-		}</div><div class='del'>-		if (err_status &amp; HECC_CANES_CRCE) {</div><div class='del'>-			hecc_set_bit(priv, HECC_CANES, HECC_CANES_CRCE);</div><div class='add'>+		if (err_status &amp; HECC_CANES_CRCE)</div><div class='ctx'> 			cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='del'>-		}</div><div class='del'>-		if (err_status &amp; HECC_CANES_ACKE) {</div><div class='del'>-			hecc_set_bit(priv, HECC_CANES, HECC_CANES_ACKE);</div><div class='add'>+		if (err_status &amp; HECC_CANES_ACKE)</div><div class='ctx'> 			cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		timestamp = hecc_read(priv, HECC_CANLNT);</div><div class='add'>+		err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb,</div><div class='add'>+						     timestamp);</div><div class='add'>+		if (err)</div><div class='add'>+			ndev-&gt;stats.rx_fifo_errors++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_rx(skb);</div><div class='add'>+	hecc_write(priv, HECC_CANES, HECC_CANES_FLAGS);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ti_hecc_change_state(struct net_device *ndev,</div><div class='add'>+				 enum can_state rx_state,</div><div class='add'>+				 enum can_state tx_state)</div><div class='add'>+{</div><div class='add'>+	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 timestamp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(priv-&gt;ndev, &amp;cf);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		priv-&gt;can.state = max(tx_state, rx_state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_change_state(priv-&gt;ndev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (max(tx_state, rx_state) != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = hecc_read(priv, HECC_CANTEC);</div><div class='add'>+		cf-&gt;data[7] = hecc_read(priv, HECC_CANREC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timestamp = hecc_read(priv, HECC_CANLNT);</div><div class='add'>+	err = can_rx_offload_queue_timestamp(&amp;priv-&gt;offload, skb, timestamp);</div><div class='add'>+	if (err)</div><div class='add'>+		ndev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t ti_hecc_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = (struct net_device *)dev_id;</div><div class='ctx'> 	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='del'>-	u32 mbxno, mbx_mask, int_status, err_status;</div><div class='del'>-	unsigned long ack, flags;</div><div class='add'>+	u32 mbxno, mbx_mask, int_status, err_status, stamp;</div><div class='add'>+	unsigned long flags, rx_pending;</div><div class='add'>+	u32 handled = 0;</div><div class='ctx'> </div><div class='ctx'> 	int_status = hecc_read(priv,</div><div class='del'>-		(priv-&gt;use_hecc1int) ? HECC_CANGIF1 : HECC_CANGIF0);</div><div class='add'>+			       priv-&gt;use_hecc1int ?</div><div class='add'>+			       HECC_CANGIF1 : HECC_CANGIF0);</div><div class='ctx'> </div><div class='ctx'> 	if (!int_status)</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	err_status = hecc_read(priv, HECC_CANES);</div><div class='del'>-	if (err_status &amp; (HECC_BUS_ERROR | HECC_CANES_BO |</div><div class='del'>-		HECC_CANES_EP | HECC_CANES_EW))</div><div class='del'>-			ti_hecc_error(ndev, int_status, err_status);</div><div class='add'>+	if (unlikely(err_status &amp; HECC_CANES_FLAGS))</div><div class='add'>+		ti_hecc_error(ndev, int_status, err_status);</div><div class='add'>+</div><div class='add'>+	if (unlikely(int_status &amp; HECC_CANGIM_DEF_MASK)) {</div><div class='add'>+		enum can_state rx_state, tx_state;</div><div class='add'>+		u32 rec = hecc_read(priv, HECC_CANREC);</div><div class='add'>+		u32 tec = hecc_read(priv, HECC_CANTEC);</div><div class='add'>+</div><div class='add'>+		if (int_status &amp; HECC_CANGIF_WLIF) {</div><div class='add'>+			handled |= HECC_CANGIF_WLIF;</div><div class='add'>+			rx_state = rec &gt;= tec ? CAN_STATE_ERROR_WARNING : 0;</div><div class='add'>+			tx_state = rec &lt;= tec ? CAN_STATE_ERROR_WARNING : 0;</div><div class='add'>+			netdev_dbg(priv-&gt;ndev, "Error Warning interrupt\n");</div><div class='add'>+			ti_hecc_change_state(ndev, rx_state, tx_state);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (int_status &amp; HECC_CANGIF_EPIF) {</div><div class='add'>+			handled |= HECC_CANGIF_EPIF;</div><div class='add'>+			rx_state = rec &gt;= tec ? CAN_STATE_ERROR_PASSIVE : 0;</div><div class='add'>+			tx_state = rec &lt;= tec ? CAN_STATE_ERROR_PASSIVE : 0;</div><div class='add'>+			netdev_dbg(priv-&gt;ndev, "Error passive interrupt\n");</div><div class='add'>+			ti_hecc_change_state(ndev, rx_state, tx_state);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (int_status &amp; HECC_CANGIF_BOIF) {</div><div class='add'>+			handled |= HECC_CANGIF_BOIF;</div><div class='add'>+			rx_state = CAN_STATE_BUS_OFF;</div><div class='add'>+			tx_state = CAN_STATE_BUS_OFF;</div><div class='add'>+			netdev_dbg(priv-&gt;ndev, "Bus off interrupt\n");</div><div class='add'>+</div><div class='add'>+			/* Disable all interrupts */</div><div class='add'>+			hecc_write(priv, HECC_CANGIM, 0);</div><div class='add'>+			can_bus_off(ndev);</div><div class='add'>+			ti_hecc_change_state(ndev, rx_state, tx_state);</div><div class='add'>+		}</div><div class='add'>+	} else if (unlikely(priv-&gt;can.state != CAN_STATE_ERROR_ACTIVE)) {</div><div class='add'>+		enum can_state new_state, tx_state, rx_state;</div><div class='add'>+		u32 rec = hecc_read(priv, HECC_CANREC);</div><div class='add'>+		u32 tec = hecc_read(priv, HECC_CANTEC);</div><div class='add'>+</div><div class='add'>+		if (rec &gt;= 128 || tec &gt;= 128)</div><div class='add'>+			new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+		else if (rec &gt;= 96 || tec &gt;= 96)</div><div class='add'>+			new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+		else</div><div class='add'>+			new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+		if (new_state &lt; priv-&gt;can.state) {</div><div class='add'>+			rx_state = rec &gt;= tec ? new_state : 0;</div><div class='add'>+			tx_state = rec &lt;= tec ? new_state : 0;</div><div class='add'>+			ti_hecc_change_state(ndev, rx_state, tx_state);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (int_status &amp; HECC_CANGIF_GMIF) {</div><div class='ctx'> 		while (priv-&gt;tx_tail - priv-&gt;tx_head &gt; 0) {</div><div class='hunk'>@@ -764,44 +741,43 @@ static irqreturn_t ti_hecc_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			mbx_mask = BIT(mbxno);</div><div class='ctx'> 			if (!(mbx_mask &amp; hecc_read(priv, HECC_CANTA)))</div><div class='ctx'> 				break;</div><div class='del'>-			hecc_clear_bit(priv, HECC_CANMIM, mbx_mask);</div><div class='ctx'> 			hecc_write(priv, HECC_CANTA, mbx_mask);</div><div class='ctx'> 			spin_lock_irqsave(&amp;priv-&gt;mbx_lock, flags);</div><div class='ctx'> 			hecc_clear_bit(priv, HECC_CANME, mbx_mask);</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;priv-&gt;mbx_lock, flags);</div><div class='del'>-			stats-&gt;tx_bytes += hecc_read_mbx(priv, mbxno,</div><div class='del'>-						HECC_CANMCF) &amp; 0xF;</div><div class='add'>+			stamp = hecc_read_stamp(priv, mbxno);</div><div class='add'>+			stats-&gt;tx_bytes +=</div><div class='add'>+				can_rx_offload_get_echo_skb_queue_timestamp(&amp;priv-&gt;offload,</div><div class='add'>+									    mbxno, stamp, NULL);</div><div class='ctx'> 			stats-&gt;tx_packets++;</div><div class='del'>-			can_led_event(ndev, CAN_LED_EVENT_TX);</div><div class='del'>-			can_get_echo_skb(ndev, mbxno);</div><div class='ctx'> 			--priv-&gt;tx_tail;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* restart queue if wrap-up or if queue stalled on last pkt */</div><div class='del'>-		if (((priv-&gt;tx_head == priv-&gt;tx_tail) &amp;&amp;</div><div class='del'>-		((priv-&gt;tx_head &amp; HECC_TX_MASK) != HECC_TX_MASK)) ||</div><div class='del'>-		(((priv-&gt;tx_tail &amp; HECC_TX_MASK) == HECC_TX_MASK) &amp;&amp;</div><div class='del'>-		((priv-&gt;tx_head &amp; HECC_TX_MASK) == HECC_TX_MASK)))</div><div class='add'>+		if ((priv-&gt;tx_head == priv-&gt;tx_tail &amp;&amp;</div><div class='add'>+		     ((priv-&gt;tx_head &amp; HECC_TX_MASK) != HECC_TX_MASK)) ||</div><div class='add'>+		    (((priv-&gt;tx_tail &amp; HECC_TX_MASK) == HECC_TX_MASK) &amp;&amp;</div><div class='add'>+		     ((priv-&gt;tx_head &amp; HECC_TX_MASK) == HECC_TX_MASK)))</div><div class='ctx'> 			netif_wake_queue(ndev);</div><div class='ctx'> </div><div class='del'>-		/* Disable RX mailbox interrupts and let NAPI reenable them */</div><div class='del'>-		if (hecc_read(priv, HECC_CANRMP)) {</div><div class='del'>-			ack = hecc_read(priv, HECC_CANMIM);</div><div class='del'>-			ack &amp;= BIT(HECC_MAX_TX_MBOX) - 1;</div><div class='del'>-			hecc_write(priv, HECC_CANMIM, ack);</div><div class='del'>-			napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+		/* offload RX mailboxes and let NAPI deliver them */</div><div class='add'>+		while ((rx_pending = hecc_read(priv, HECC_CANRMP))) {</div><div class='add'>+			can_rx_offload_irq_offload_timestamp(&amp;priv-&gt;offload,</div><div class='add'>+							     rx_pending);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* clear all interrupt conditions - read back to avoid spurious ints */</div><div class='ctx'> 	if (priv-&gt;use_hecc1int) {</div><div class='del'>-		hecc_write(priv, HECC_CANGIF1, HECC_SET_REG);</div><div class='add'>+		hecc_write(priv, HECC_CANGIF1, handled);</div><div class='ctx'> 		int_status = hecc_read(priv, HECC_CANGIF1);</div><div class='ctx'> 	} else {</div><div class='del'>-		hecc_write(priv, HECC_CANGIF0, HECC_SET_REG);</div><div class='add'>+		hecc_write(priv, HECC_CANGIF0, handled);</div><div class='ctx'> 		int_status = hecc_read(priv, HECC_CANGIF0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	can_rx_offload_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -811,7 +787,7 @@ static int ti_hecc_open(struct net_device *ndev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(ndev-&gt;irq, ti_hecc_interrupt, IRQF_SHARED,</div><div class='del'>-			ndev-&gt;name, ndev);</div><div class='add'>+			  ndev-&gt;name, ndev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		netdev_err(ndev, "error requesting interrupt\n");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -828,10 +804,8 @@ static int ti_hecc_open(struct net_device *ndev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_OPEN);</div><div class='del'>-</div><div class='ctx'> 	ti_hecc_start(ndev);</div><div class='del'>-	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -842,14 +816,12 @@ static int ti_hecc_close(struct net_device *ndev)</div><div class='ctx'> 	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(ndev);</div><div class='del'>-	napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='ctx'> 	ti_hecc_stop(ndev);</div><div class='ctx'> 	free_irq(ndev-&gt;irq, ndev);</div><div class='ctx'> 	close_candev(ndev);</div><div class='ctx'> 	ti_hecc_transceiver_switch(priv, 0);</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -857,7 +829,10 @@ static const struct net_device_ops ti_hecc_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ti_hecc_open,</div><div class='ctx'> 	.ndo_stop		= ti_hecc_close,</div><div class='ctx'> 	.ndo_start_xmit		= ti_hecc_xmit,</div><div class='del'>-	.ndo_change_mtu		= can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ti_hecc_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ti_hecc_dt_ids[] = {</div><div class='hunk'>@@ -873,7 +848,6 @@ static int ti_hecc_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *ndev = (struct net_device *)0;</div><div class='ctx'> 	struct ti_hecc_priv *priv;</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='del'>-	struct resource *res, *irq;</div><div class='ctx'> 	struct regulator *reg_xceiver;</div><div class='ctx'> 	int err = -ENODEV;</div><div class='ctx'> </div><div class='hunk'>@@ -894,48 +868,34 @@ static int ti_hecc_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* handle hecc memory */</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hecc");</div><div class='del'>-	if (!res) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can't get IORESOURCE_MEM hecc\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	priv-&gt;base = devm_platform_ioremap_resource_byname(pdev, "hecc");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;base)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "hecc ioremap failed\n");</div><div class='del'>-		return PTR_ERR(priv-&gt;base);</div><div class='add'>+		err = PTR_ERR(priv-&gt;base);</div><div class='add'>+		goto probe_exit_candev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* handle hecc-ram memory */</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hecc-ram");</div><div class='del'>-	if (!res) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can't get IORESOURCE_MEM hecc-ram\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;hecc_ram = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	priv-&gt;hecc_ram = devm_platform_ioremap_resource_byname(pdev,</div><div class='add'>+							       "hecc-ram");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;hecc_ram)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "hecc-ram ioremap failed\n");</div><div class='del'>-		return PTR_ERR(priv-&gt;hecc_ram);</div><div class='add'>+		err = PTR_ERR(priv-&gt;hecc_ram);</div><div class='add'>+		goto probe_exit_candev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* handle mbx memory */</div><div class='del'>-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mbx");</div><div class='del'>-	if (!res) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can't get IORESOURCE_MEM mbx\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;mbx = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	priv-&gt;mbx = devm_platform_ioremap_resource_byname(pdev, "mbx");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;mbx)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "mbx ioremap failed\n");</div><div class='del'>-		return PTR_ERR(priv-&gt;mbx);</div><div class='add'>+		err = PTR_ERR(priv-&gt;mbx);</div><div class='add'>+		goto probe_exit_candev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	if (!irq) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "No irq resource\n");</div><div class='del'>-		goto probe_exit;</div><div class='add'>+	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ndev-&gt;irq &lt; 0) {</div><div class='add'>+		err = ndev-&gt;irq;</div><div class='add'>+		goto probe_exit_candev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;ndev = ndev;</div><div class='hunk'>@@ -948,11 +908,11 @@ static int ti_hecc_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;mbx_lock);</div><div class='del'>-	ndev-&gt;irq = irq-&gt;start;</div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> 	platform_set_drvdata(pdev, ndev);</div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;ti_hecc_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;ti_hecc_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;clk = clk_get(&amp;pdev-&gt;dev, "hecc_ck");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;clk)) {</div><div class='hunk'>@@ -962,37 +922,46 @@ static int ti_hecc_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto probe_exit_candev;</div><div class='ctx'> 	}</div><div class='ctx'> 	priv-&gt;can.clock.freq = clk_get_rate(priv-&gt;clk);</div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, ti_hecc_rx_poll,</div><div class='del'>-		HECC_DEF_NAPI_WEIGHT);</div><div class='ctx'> </div><div class='ctx'> 	err = clk_prepare_enable(priv-&gt;clk);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "clk_prepare_enable() failed\n");</div><div class='del'>-		goto probe_exit_clk;</div><div class='add'>+		goto probe_exit_release_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;offload.mailbox_read = ti_hecc_mailbox_read;</div><div class='add'>+	priv-&gt;offload.mb_first = HECC_RX_FIRST_MBOX;</div><div class='add'>+	priv-&gt;offload.mb_last = HECC_RX_LAST_MBOX;</div><div class='add'>+	err = can_rx_offload_add_timestamp(ndev, &amp;priv-&gt;offload);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "can_rx_offload_add_timestamp() failed\n");</div><div class='add'>+		goto probe_exit_disable_clk;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = register_candev(ndev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "register_candev() failed\n");</div><div class='del'>-		goto probe_exit_clk;</div><div class='add'>+		goto probe_exit_offload;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(ndev);</div><div class='del'>-</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "device registered (reg_base=%p, irq=%u)\n",</div><div class='del'>-		priv-&gt;base, (u32) ndev-&gt;irq);</div><div class='add'>+		 priv-&gt;base, (u32)ndev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-probe_exit_clk:</div><div class='add'>+probe_exit_offload:</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+probe_exit_disable_clk:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+probe_exit_release_clk:</div><div class='ctx'> 	clk_put(priv-&gt;clk);</div><div class='ctx'> probe_exit_candev:</div><div class='ctx'> 	free_candev(ndev);</div><div class='del'>-probe_exit:</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ti_hecc_remove(struct platform_device *pdev)</div><div class='add'>+static void ti_hecc_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct ti_hecc_priv *priv = netdev_priv(ndev);</div><div class='hunk'>@@ -1000,9 +969,8 @@ static int ti_hecc_remove(struct platform_device *pdev)</div><div class='ctx'> 	unregister_candev(ndev);</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> 	clk_put(priv-&gt;clk);</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='ctx'> 	free_candev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='head'>diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig<br/>index ac3522b77303..cf65a90816b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/Kconfig</a></div><div class='hunk'>@@ -4,34 +4,70 @@ menu "CAN USB interfaces"</div><div class='ctx'> </div><div class='ctx'> config CAN_8DEV_USB</div><div class='ctx'> 	tristate "8 devices USB2CAN interface"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the USB2CAN interface</div><div class='ctx'> 	  from 8 devices (http://www.8devices.com).</div><div class='ctx'> </div><div class='ctx'> config CAN_EMS_USB</div><div class='ctx'> 	tristate "EMS CPC-USB/ARM7 CAN/USB interface"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the one channel CPC-USB/ARM7 CAN/USB interface</div><div class='ctx'> 	  from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).</div><div class='ctx'> </div><div class='del'>-config CAN_ESD_USB2</div><div class='del'>-        tristate "ESD USB/2 CAN/USB interface"</div><div class='del'>-        ---help---</div><div class='del'>-          This driver supports the CAN-USB/2 interface</div><div class='del'>-          from esd electronic system design gmbh (http://www.esd.eu).</div><div class='add'>+config CAN_ESD_USB</div><div class='add'>+	tristate "esd electronics gmbh CAN/USB interfaces"</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for several CAN/USB interfaces</div><div class='add'>+	  from esd electronics gmbh (https://www.esd.eu).</div><div class='add'>+</div><div class='add'>+	  The drivers supports the following devices:</div><div class='add'>+	    - esd CAN-USB/2</div><div class='add'>+	    - esd CAN-USB/3-FD</div><div class='add'>+	    - esd CAN-USB/Micro</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called esd_usb.</div><div class='add'>+</div><div class='add'>+config CAN_ETAS_ES58X</div><div class='add'>+	tristate "ETAS ES58X CAN/USB interfaces"</div><div class='add'>+	select CRC16</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the ES581.4, ES582.1 and ES584.1 interfaces</div><div class='add'>+	  from ETAS GmbH (https://www.etas.com/en/products/es58x.php).</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called etas_es58x.</div><div class='add'>+</div><div class='add'>+config CAN_F81604</div><div class='add'>+        tristate "Fintek F81604 USB to 2CAN interface"</div><div class='add'>+        help</div><div class='add'>+          This driver supports the Fintek F81604 USB to 2CAN interface.</div><div class='add'>+          The device can support CAN2.0A/B protocol and also support</div><div class='add'>+          2 output pins to control external terminator (optional).</div><div class='add'>+</div><div class='add'>+          To compile this driver as a module, choose M here: the module will</div><div class='add'>+          be called f81604.</div><div class='add'>+</div><div class='add'>+          (see also https://www.fintek.com.tw).</div><div class='ctx'> </div><div class='ctx'> config CAN_GS_USB</div><div class='del'>-	tristate "Geschwister Schneider UG interfaces"</div><div class='del'>-	---help---</div><div class='del'>-	  This driver supports the Geschwister Schneider and bytewerk.org</div><div class='del'>-	  candleLight USB CAN interfaces USB/CAN devices</div><div class='add'>+	tristate "Geschwister Schneider UG and candleLight compatible interfaces"</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the Geschwister Schneider and</div><div class='add'>+	  bytewerk.org candleLight compatible</div><div class='add'>+	  (https://github.com/candle-usb/candleLight_fw) USB/CAN</div><div class='add'>+	  interfaces.</div><div class='add'>+</div><div class='ctx'> 	  If unsure choose N,</div><div class='ctx'> 	  choose Y for built in support,</div><div class='ctx'> 	  M to compile as module (module will be named: gs_usb).</div><div class='ctx'> </div><div class='ctx'> config CAN_KVASER_USB</div><div class='ctx'> 	tristate "Kvaser CAN/USB interface"</div><div class='del'>-	---help---</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for Kvaser CAN/USB devices like Kvaser</div><div class='ctx'> 	  Leaf Light, Kvaser USBcan II and Kvaser Memorator Pro 5xHS.</div><div class='ctx'> </div><div class='hunk'>@@ -52,9 +88,12 @@ config CAN_KVASER_USB</div><div class='ctx'> 	    - Kvaser Leaf Light "China"</div><div class='ctx'> 	    - Kvaser BlackBird SemiPro</div><div class='ctx'> 	    - Kvaser USBcan R</div><div class='add'>+	    - Kvaser USBcan R v2</div><div class='ctx'> 	    - Kvaser Leaf Light v2</div><div class='add'>+	    - Kvaser Leaf Light R v2</div><div class='ctx'> 	    - Kvaser Mini PCI Express HS</div><div class='ctx'> 	    - Kvaser Mini PCI Express 2xHS</div><div class='add'>+	    - Kvaser Mini PCIe 1xCAN</div><div class='ctx'> 	    - Kvaser USBcan Light 2xHS</div><div class='ctx'> 	    - Kvaser USBcan II HS/HS</div><div class='ctx'> 	    - Kvaser USBcan II HS/LS</div><div class='hunk'>@@ -64,16 +103,25 @@ config CAN_KVASER_USB</div><div class='ctx'> 	    - Scania VCI2 (if you have the Kvaser logo on top)</div><div class='ctx'> 	    - Kvaser BlackBird v2</div><div class='ctx'> 	    - Kvaser Leaf Pro HS v2</div><div class='add'>+	    - Kvaser Leaf v3</div><div class='add'>+	    - Kvaser Hybrid CAN/LIN</div><div class='ctx'> 	    - Kvaser Hybrid 2xCAN/LIN</div><div class='add'>+	    - Kvaser Hybrid Pro CAN/LIN</div><div class='ctx'> 	    - Kvaser Hybrid Pro 2xCAN/LIN</div><div class='ctx'> 	    - Kvaser Memorator 2xHS v2</div><div class='ctx'> 	    - Kvaser Memorator Pro 2xHS v2</div><div class='ctx'> 	    - Kvaser Memorator Pro 5xHS</div><div class='ctx'> 	    - Kvaser USBcan Light 4xHS</div><div class='ctx'> 	    - Kvaser USBcan Pro 2xHS v2</div><div class='add'>+	    - Kvaser USBcan Pro 4xHS</div><div class='add'>+	    - Kvaser USBcan Pro 5xCAN</div><div class='ctx'> 	    - Kvaser USBcan Pro 5xHS</div><div class='add'>+	    - Kvaser U100</div><div class='add'>+	    - Kvaser U100P</div><div class='add'>+	    - Kvaser U100S</div><div class='ctx'> 	    - ATI Memorator Pro 2xHS v2</div><div class='ctx'> 	    - ATI USBcan Pro 2xHS v2</div><div class='add'>+	    - Vining 800</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -82,15 +130,26 @@ config CAN_KVASER_USB</div><div class='ctx'> </div><div class='ctx'> config CAN_MCBA_USB</div><div class='ctx'> 	tristate "Microchip CAN BUS Analyzer interface"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the CAN BUS Analyzer interface</div><div class='ctx'> 	  from Microchip (http://www.microchip.com/development-tools/).</div><div class='ctx'> </div><div class='add'>+config CAN_NCT6694</div><div class='add'>+	tristate "Nuvoton NCT6694 Socket CANfd support"</div><div class='add'>+	depends on MFD_NCT6694</div><div class='add'>+	select CAN_RX_OFFLOAD</div><div class='add'>+	help</div><div class='add'>+	  If you say yes to this option, support will be included for Nuvoton</div><div class='add'>+	  NCT6694, a USB device to socket CANfd controller.</div><div class='add'>+</div><div class='add'>+	  This driver can also be built as a module. If so, the module will</div><div class='add'>+	  be called nct6694_canfd.</div><div class='add'>+</div><div class='ctx'> config CAN_PEAK_USB</div><div class='ctx'> 	tristate "PEAK PCAN-USB/USB Pro interfaces for CAN 2.0b/CAN-FD"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the PEAK-System Technik USB adapters that enable</div><div class='del'>-	  access to the CAN bus, with repect to the CAN 2.0b and/or CAN-FD</div><div class='add'>+	  access to the CAN bus, with respect to the CAN 2.0b and/or CAN-FD</div><div class='ctx'> 	  standards, that is:</div><div class='ctx'> </div><div class='ctx'> 	  PCAN-USB             single CAN 2.0b channel USB adapter</div><div class='hunk'>@@ -102,15 +161,9 @@ config CAN_PEAK_USB</div><div class='ctx'> </div><div class='ctx'> 	  (see also http://www.peak-system.com).</div><div class='ctx'> </div><div class='del'>-config CAN_MCBA_USB</div><div class='del'>-	tristate "Microchip CAN BUS Analyzer interface"</div><div class='del'>-	---help---</div><div class='del'>-	  This driver supports the CAN BUS Analyzer interface</div><div class='del'>-	  from Microchip (http://www.microchip.com/development-tools/).</div><div class='del'>-</div><div class='ctx'> config CAN_UCAN</div><div class='ctx'> 	tristate "Theobroma Systems UCAN interface"</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Theobroma Systems</div><div class='ctx'> 	  UCAN USB-CAN interface.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/can/usb/Makefile b/drivers/net/can/usb/Makefile<br/>index aa0f17c0b2ed..fcafb1ac262e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/Makefile</a></div><div class='hunk'>@@ -5,9 +5,12 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CAN_8DEV_USB) += usb_8dev.o</div><div class='ctx'> obj-$(CONFIG_CAN_EMS_USB) += ems_usb.o</div><div class='del'>-obj-$(CONFIG_CAN_ESD_USB2) += esd_usb2.o</div><div class='add'>+obj-$(CONFIG_CAN_ESD_USB) += esd_usb.o</div><div class='add'>+obj-$(CONFIG_CAN_ETAS_ES58X) += etas_es58x/</div><div class='add'>+obj-$(CONFIG_CAN_F81604) += f81604.o</div><div class='ctx'> obj-$(CONFIG_CAN_GS_USB) += gs_usb.o</div><div class='ctx'> obj-$(CONFIG_CAN_KVASER_USB) += kvaser_usb/</div><div class='ctx'> obj-$(CONFIG_CAN_MCBA_USB) += mcba_usb.o</div><div class='add'>+obj-$(CONFIG_CAN_NCT6694) += nct6694_canfd.o</div><div class='ctx'> obj-$(CONFIG_CAN_PEAK_USB) += peak_usb/</div><div class='ctx'> obj-$(CONFIG_CAN_UCAN) += ucan.o</div><div class='head'>diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c<br/>index 4f52810bebf8..de8e212a1366 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/ems_usb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/ems_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/ems_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/ems_usb.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004-2009 EMS Dr. Thomas Wuensche</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -194,7 +195,7 @@ struct __packed ems_cpc_msg {</div><div class='ctx'> 	__le32 ts_sec;	/* timestamp in seconds */</div><div class='ctx'> 	__le32 ts_nsec;	/* timestamp in nano seconds */</div><div class='ctx'> </div><div class='del'>-	union {</div><div class='add'>+	union __packed {</div><div class='ctx'> 		u8 generic[64];</div><div class='ctx'> 		struct cpc_can_msg can_msg;</div><div class='ctx'> 		struct cpc_can_params can_params;</div><div class='hunk'>@@ -230,7 +231,6 @@ struct ems_tx_urb_context {</div><div class='ctx'> 	struct ems_usb *dev;</div><div class='ctx'> </div><div class='ctx'> 	u32 echo_index;</div><div class='del'>-	u8 dlc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ems_usb {</div><div class='hunk'>@@ -255,6 +255,8 @@ struct ems_usb {</div><div class='ctx'> 	unsigned int free_slots; /* remember number of available slots */</div><div class='ctx'> </div><div class='ctx'> 	struct ems_cpc_msg active_params; /* active controller parameters */</div><div class='add'>+	void *rxbuf[MAX_RX_URBS];</div><div class='add'>+	dma_addr_t rxbuf_dma[MAX_RX_URBS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void ems_usb_read_interrupt_callback(struct urb *urb)</div><div class='hunk'>@@ -306,7 +308,7 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	cf-&gt;can_id = le32_to_cpu(msg-&gt;msg.can_msg.id);</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(msg-&gt;msg.can_msg.length &amp; 0xF);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(msg-&gt;msg.can_msg.length &amp; 0xF);</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;type == CPC_MSG_TYPE_EXT_CAN_FRAME ||</div><div class='ctx'> 	    msg-&gt;type == CPC_MSG_TYPE_EXT_RTR_FRAME)</div><div class='hunk'>@@ -316,12 +318,13 @@ static void ems_usb_rx_can_msg(struct ems_usb *dev, struct ems_cpc_msg *msg)</div><div class='ctx'> 	    msg-&gt;type == CPC_MSG_TYPE_EXT_RTR_FRAME) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 			cf-&gt;data[i] = msg-&gt;msg.can_msg.msg[i];</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -332,15 +335,14 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;netdev-&gt;stats;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_can_err_skb(dev-&gt;netdev, &amp;cf);</div><div class='del'>-	if (skb == NULL)</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	if (msg-&gt;type == CPC_MSG_TYPE_CAN_STATE) {</div><div class='ctx'> 		u8 state = msg-&gt;msg.can_state;</div><div class='ctx'> </div><div class='ctx'> 		if (state &amp; SJA1000_SR_BS) {</div><div class='ctx'> 			dev-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='ctx'> </div><div class='ctx'> 			dev-&gt;can.can_stats.bus_off++;</div><div class='ctx'> 			can_bus_off(dev-&gt;netdev);</div><div class='hunk'>@@ -358,46 +360,53 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)</div><div class='ctx'> </div><div class='ctx'> 		/* bus error interrupt */</div><div class='ctx'> 		dev-&gt;can.can_stats.bus_error++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='ctx'> </div><div class='del'>-		switch (ecc &amp; SJA1000_ECC_MASK) {</div><div class='del'>-		case SJA1000_ECC_BIT:</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-			break;</div><div class='del'>-		case SJA1000_ECC_FORM:</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-			break;</div><div class='del'>-		case SJA1000_ECC_STUFF:</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			cf-&gt;data[3] = ecc &amp; SJA1000_ECC_SEG;</div><div class='del'>-			break;</div><div class='add'>+			switch (ecc &amp; SJA1000_ECC_MASK) {</div><div class='add'>+			case SJA1000_ECC_BIT:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+				break;</div><div class='add'>+			case SJA1000_ECC_FORM:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+				break;</div><div class='add'>+			case SJA1000_ECC_STUFF:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				cf-&gt;data[3] = ecc &amp; SJA1000_ECC_SEG;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Error occurred during transmission? */</div><div class='del'>-		if ((ecc &amp; SJA1000_ECC_DIR) == 0)</div><div class='del'>-			cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		if ((ecc &amp; SJA1000_ECC_DIR) == 0) {</div><div class='add'>+			stats-&gt;tx_errors++;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		} else {</div><div class='add'>+			stats-&gt;rx_errors++;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;can.state == CAN_STATE_ERROR_WARNING ||</div><div class='del'>-		    dev-&gt;can.state == CAN_STATE_ERROR_PASSIVE) {</div><div class='add'>+		if (skb &amp;&amp; (dev-&gt;can.state == CAN_STATE_ERROR_WARNING ||</div><div class='add'>+			    dev-&gt;can.state == CAN_STATE_ERROR_PASSIVE)) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='ctx'> 			cf-&gt;data[1] = (txerr &gt; rxerr) ?</div><div class='ctx'> 			    CAN_ERR_CRTL_TX_PASSIVE : CAN_ERR_CRTL_RX_PASSIVE;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (msg-&gt;type == CPC_MSG_TYPE_OVERRUN) {</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;rx_over_errors++;</div><div class='ctx'> 		stats-&gt;rx_errors++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_rx(skb);</div><div class='add'>+	if (skb)</div><div class='add'>+		netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -516,9 +525,8 @@ static void ems_usb_write_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 	/* transmission complete interrupt */</div><div class='ctx'> 	netdev-&gt;stats.tx_packets++;</div><div class='del'>-	netdev-&gt;stats.tx_bytes += context-&gt;dlc;</div><div class='del'>-</div><div class='del'>-	can_get_echo_skb(netdev, context-&gt;echo_index);</div><div class='add'>+	netdev-&gt;stats.tx_bytes += can_get_echo_skb(netdev, context-&gt;echo_index,</div><div class='add'>+						   NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Release context */</div><div class='ctx'> 	context-&gt;echo_index = MAX_TX_URBS;</div><div class='hunk'>@@ -587,6 +595,7 @@ static int ems_usb_start(struct ems_usb *dev)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_RX_URBS; i++) {</div><div class='ctx'> 		struct urb *urb = NULL;</div><div class='ctx'> 		u8 *buf = NULL;</div><div class='add'>+		dma_addr_t buf_dma;</div><div class='ctx'> </div><div class='ctx'> 		/* create a URB, and a buffer for it */</div><div class='ctx'> 		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='hunk'>@@ -596,7 +605,7 @@ static int ems_usb_start(struct ems_usb *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		buf = usb_alloc_coherent(dev-&gt;udev, RX_BUFFER_SIZE, GFP_KERNEL,</div><div class='del'>-					 &amp;urb-&gt;transfer_dma);</div><div class='add'>+					 &amp;buf_dma);</div><div class='ctx'> 		if (!buf) {</div><div class='ctx'> 			netdev_err(netdev, "No memory left for USB buffer\n");</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='hunk'>@@ -604,6 +613,8 @@ static int ems_usb_start(struct ems_usb *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		urb-&gt;transfer_dma = buf_dma;</div><div class='add'>+</div><div class='ctx'> 		usb_fill_bulk_urb(urb, dev-&gt;udev, usb_rcvbulkpipe(dev-&gt;udev, 2),</div><div class='ctx'> 				  buf, RX_BUFFER_SIZE,</div><div class='ctx'> 				  ems_usb_read_bulk_callback, dev);</div><div class='hunk'>@@ -619,6 +630,9 @@ static int ems_usb_start(struct ems_usb *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		dev-&gt;rxbuf[i] = buf;</div><div class='add'>+		dev-&gt;rxbuf_dma[i] = buf_dma;</div><div class='add'>+</div><div class='ctx'> 		/* Drop reference, USB core will take care of freeing it */</div><div class='ctx'> 		usb_free_urb(urb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -684,6 +698,10 @@ static void unlink_all_urbs(struct ems_usb *dev)</div><div class='ctx'> </div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;dev-&gt;rx_submitted);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; MAX_RX_URBS; ++i)</div><div class='add'>+		usb_free_coherent(dev-&gt;udev, RX_BUFFER_SIZE,</div><div class='add'>+				  dev-&gt;rxbuf[i], dev-&gt;rxbuf_dma[i]);</div><div class='add'>+</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;dev-&gt;tx_submitted);</div><div class='ctx'> 	atomic_set(&amp;dev-&gt;active_tx_urbs, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -737,7 +755,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne</div><div class='ctx'> 	size_t size = CPC_HEADER_SIZE + CPC_MSG_HEADER_LEN</div><div class='ctx'> 			+ sizeof(struct cpc_can_msg);</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	/* create a URB, and a buffer for it, and copy the data to the URB */</div><div class='hunk'>@@ -755,7 +773,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne</div><div class='ctx'> 	msg = (struct ems_cpc_msg *)&amp;buf[CPC_HEADER_SIZE];</div><div class='ctx'> </div><div class='ctx'> 	msg-&gt;msg.can_msg.id = cpu_to_le32(cf-&gt;can_id &amp; CAN_ERR_MASK);</div><div class='del'>-	msg-&gt;msg.can_msg.length = cf-&gt;can_dlc;</div><div class='add'>+	msg-&gt;msg.can_msg.length = cf-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG) {</div><div class='ctx'> 		msg-&gt;type = cf-&gt;can_id &amp; CAN_EFF_FLAG ?</div><div class='hunk'>@@ -766,10 +784,10 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne</div><div class='ctx'> 		msg-&gt;type = cf-&gt;can_id &amp; CAN_EFF_FLAG ?</div><div class='ctx'> 			CPC_CMD_TYPE_EXT_CAN_FRAME : CPC_CMD_TYPE_CAN_FRAME;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i++)</div><div class='ctx'> 			msg-&gt;msg.can_msg.msg[i] = cf-&gt;data[i];</div><div class='ctx'> </div><div class='del'>-		msg-&gt;length = CPC_CAN_MSG_MIN_SIZE + cf-&gt;can_dlc;</div><div class='add'>+		msg-&gt;length = CPC_CAN_MSG_MIN_SIZE + cf-&gt;len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_TX_URBS; i++) {</div><div class='hunk'>@@ -794,24 +812,22 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne</div><div class='ctx'> </div><div class='ctx'> 	context-&gt;dev = dev;</div><div class='ctx'> 	context-&gt;echo_index = i;</div><div class='del'>-	context-&gt;dlc = cf-&gt;can_dlc;</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_bulk_urb(urb, dev-&gt;udev, usb_sndbulkpipe(dev-&gt;udev, 2), buf,</div><div class='ctx'> 			  size, ems_usb_write_bulk_callback, context);</div><div class='ctx'> 	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> 	usb_anchor_urb(urb, &amp;dev-&gt;tx_submitted);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, netdev, context-&gt;echo_index);</div><div class='add'>+	can_put_echo_skb(skb, netdev, context-&gt;echo_index, 0);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;dev-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='del'>-		can_free_echo_skb(netdev, context-&gt;echo_index);</div><div class='add'>+		can_free_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='ctx'> </div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='ctx'> 		usb_free_coherent(dev-&gt;udev, size, buf, urb-&gt;transfer_dma);</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 		atomic_dec(&amp;dev-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='hunk'>@@ -869,11 +885,14 @@ static const struct net_device_ops ems_usb_netdev_ops = {</div><div class='ctx'> 	.ndo_open = ems_usb_open,</div><div class='ctx'> 	.ndo_stop = ems_usb_close,</div><div class='ctx'> 	.ndo_start_xmit = ems_usb_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ems_usb_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct can_bittiming_const ems_usb_bittiming_const = {</div><div class='del'>-	.name = "ems_usb",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.tseg1_min = 1,</div><div class='ctx'> 	.tseg1_max = 16,</div><div class='ctx'> 	.tseg2_min = 1,</div><div class='hunk'>@@ -983,6 +1002,7 @@ static int ems_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	dev-&gt;can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;ems_usb_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;ems_usb_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO; /* we support local echo */</div><div class='ctx'> </div><div class='hunk'>@@ -1053,7 +1073,6 @@ static void ems_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		unregister_netdev(dev-&gt;netdev);</div><div class='del'>-		free_candev(dev-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 		unlink_all_urbs(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1061,12 +1080,14 @@ static void ems_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 		kfree(dev-&gt;intr_in_buffer);</div><div class='ctx'> 		kfree(dev-&gt;tx_msg_buffer);</div><div class='add'>+</div><div class='add'>+		free_candev(dev-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* usb specific object needed to register this driver with the usb subsystem */</div><div class='ctx'> static struct usb_driver ems_usb_driver = {</div><div class='del'>-	.name = "ems_usb",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.probe = ems_usb_probe,</div><div class='ctx'> 	.disconnect = ems_usb_disconnect,</div><div class='ctx'> 	.id_table = ems_usb_table,</div><div class='head'>diff --git a/drivers/net/can/usb/esd_usb.c b/drivers/net/can/usb/esd_usb.c<br/>new file mode 100644<br/>index 000000000000..08da507faef4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/esd_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/esd_usb.c</a></div><div class='hunk'>@@ -0,0 +1,1398 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * CAN driver for esd electronics gmbh CAN-USB/2, CAN-USB/3 and CAN-USB/Micro</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs &lt;socketcan@esd.eu&gt;</div><div class='add'>+ * Copyright (C) 2022-2024 esd electronics gmbh, Frank Jungclaus &lt;frank.jungclaus@esd.eu&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Matthias Fuchs &lt;socketcan@esd.eu&gt;");</div><div class='add'>+MODULE_AUTHOR("Frank Jungclaus &lt;frank.jungclaus@esd.eu&gt;");</div><div class='add'>+MODULE_DESCRIPTION("CAN driver for esd electronics gmbh CAN-USB/2, CAN-USB/3 and CAN-USB/Micro interfaces");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+/* USB vendor and product ID */</div><div class='add'>+#define ESD_USB_ESDGMBH_VENDOR_ID	0x0ab4</div><div class='add'>+#define ESD_USB_CANUSB2_PRODUCT_ID	0x0010</div><div class='add'>+#define ESD_USB_CANUSBM_PRODUCT_ID	0x0011</div><div class='add'>+#define ESD_USB_CANUSB3_PRODUCT_ID	0x0014</div><div class='add'>+</div><div class='add'>+/* CAN controller clock frequencies */</div><div class='add'>+#define ESD_USB_2_CAN_CLOCK	(60 * MEGA) /* Hz */</div><div class='add'>+#define ESD_USB_M_CAN_CLOCK	(36 * MEGA) /* Hz */</div><div class='add'>+#define ESD_USB_3_CAN_CLOCK	(80 * MEGA) /* Hz */</div><div class='add'>+</div><div class='add'>+/* Maximum number of CAN nets */</div><div class='add'>+#define ESD_USB_MAX_NETS	2</div><div class='add'>+</div><div class='add'>+/* USB commands */</div><div class='add'>+#define ESD_USB_CMD_VERSION		1 /* also used for VERSION_REPLY */</div><div class='add'>+#define ESD_USB_CMD_CAN_RX		2 /* device to host only */</div><div class='add'>+#define ESD_USB_CMD_CAN_TX		3 /* also used for TX_DONE */</div><div class='add'>+#define ESD_USB_CMD_SETBAUD		4 /* also used for SETBAUD_REPLY */</div><div class='add'>+#define ESD_USB_CMD_TS			5 /* also used for TS_REPLY */</div><div class='add'>+#define ESD_USB_CMD_IDADD		6 /* also used for IDADD_REPLY */</div><div class='add'>+</div><div class='add'>+/* esd CAN message flags - dlc field */</div><div class='add'>+#define ESD_USB_RTR	BIT(4)</div><div class='add'>+#define ESD_USB_NO_BRS	BIT(4)</div><div class='add'>+#define ESD_USB_ESI	BIT(5)</div><div class='add'>+#define ESD_USB_FD	BIT(7)</div><div class='add'>+</div><div class='add'>+/* esd CAN message flags - id field */</div><div class='add'>+#define ESD_USB_EXTID	BIT(29)</div><div class='add'>+#define ESD_USB_EVENT	BIT(30)</div><div class='add'>+#define ESD_USB_IDMASK	GENMASK(28, 0)</div><div class='add'>+</div><div class='add'>+/* esd CAN event ids */</div><div class='add'>+#define ESD_USB_EV_CAN_ERROR_EXT	2 /* CAN controller specific diagnostic data */</div><div class='add'>+</div><div class='add'>+/* baudrate message flags */</div><div class='add'>+#define ESD_USB_LOM	BIT(30) /* Listen Only Mode */</div><div class='add'>+#define ESD_USB_UBR	BIT(31) /* User Bit Rate (controller BTR) in bits 0..27 */</div><div class='add'>+#define ESD_USB_NO_BAUDRATE	GENMASK(30, 0) /* bit rate unconfigured */</div><div class='add'>+</div><div class='add'>+/* bit timing esd CAN-USB */</div><div class='add'>+#define ESD_USB_2_TSEG1_SHIFT	16</div><div class='add'>+#define ESD_USB_2_TSEG2_SHIFT	20</div><div class='add'>+#define ESD_USB_2_SJW_SHIFT	14</div><div class='add'>+#define ESD_USB_M_SJW_SHIFT	24</div><div class='add'>+#define ESD_USB_TRIPLE_SAMPLES	BIT(23)</div><div class='add'>+</div><div class='add'>+/* Transmitter Delay Compensation */</div><div class='add'>+#define ESD_USB_3_TDC_MODE_AUTO	0</div><div class='add'>+</div><div class='add'>+/* esd IDADD message */</div><div class='add'>+#define ESD_USB_ID_ENABLE	BIT(7)</div><div class='add'>+#define ESD_USB_MAX_ID_SEGMENT	64</div><div class='add'>+</div><div class='add'>+/* SJA1000 ECC register (emulated by usb firmware) */</div><div class='add'>+#define ESD_USB_SJA1000_ECC_SEG		GENMASK(4, 0)</div><div class='add'>+#define ESD_USB_SJA1000_ECC_DIR		BIT(5)</div><div class='add'>+#define ESD_USB_SJA1000_ECC_ERR		BIT(2, 1)</div><div class='add'>+#define ESD_USB_SJA1000_ECC_BIT		0x00</div><div class='add'>+#define ESD_USB_SJA1000_ECC_FORM	BIT(6)</div><div class='add'>+#define ESD_USB_SJA1000_ECC_STUFF	BIT(7)</div><div class='add'>+#define ESD_USB_SJA1000_ECC_MASK	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+/* esd bus state event codes */</div><div class='add'>+#define ESD_USB_BUSSTATE_MASK	GENMASK(7, 6)</div><div class='add'>+#define ESD_USB_BUSSTATE_WARN	BIT(6)</div><div class='add'>+#define ESD_USB_BUSSTATE_ERRPASSIVE	BIT(7)</div><div class='add'>+#define ESD_USB_BUSSTATE_BUSOFF	GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define ESD_USB_RX_BUFFER_SIZE		1024</div><div class='add'>+#define ESD_USB_MAX_RX_URBS		4</div><div class='add'>+#define ESD_USB_MAX_TX_URBS		16 /* must be power of 2 */</div><div class='add'>+</div><div class='add'>+/* Modes for CAN-USB/3, to be used for esd_usb_3_set_baudrate_msg_x.mode */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_MODE_DISABLE		0 /* remove from bus */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_MODE_INDEX		1 /* ESD (CiA) bit rate idx */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_MODE_BTR_CTRL	2 /* BTR values (controller)*/</div><div class='add'>+#define ESD_USB_3_BAUDRATE_MODE_BTR_CANONICAL	3 /* BTR values (canonical) */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_MODE_NUM		4 /* numerical bit rate */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_MODE_AUTOBAUD	5 /* autobaud */</div><div class='add'>+</div><div class='add'>+/* Flags for CAN-USB/3, to be used for esd_usb_3_set_baudrate_msg_x.flags */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_FLAG_FD	BIT(0) /* enable CAN FD mode */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_FLAG_LOM	BIT(1) /* enable listen only mode */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_FLAG_STM	BIT(2) /* enable self test mode */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_FLAG_TRS	BIT(3) /* enable triple sampling */</div><div class='add'>+#define ESD_USB_3_BAUDRATE_FLAG_TXP	BIT(4) /* enable transmit pause */</div><div class='add'>+</div><div class='add'>+struct esd_usb_header_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 rsvd[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_version_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 rsvd;</div><div class='add'>+	u8 flags;</div><div class='add'>+	__le32 drv_version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_version_reply_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 nets;</div><div class='add'>+	u8 features;</div><div class='add'>+	__le32 version;</div><div class='add'>+	u8 name[16];</div><div class='add'>+	__le32 rsvd;</div><div class='add'>+	__le32 ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_rx_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 net;</div><div class='add'>+	u8 dlc;</div><div class='add'>+	__le32 ts;</div><div class='add'>+	__le32 id; /* upper 3 bits contain flags */</div><div class='add'>+	union {</div><div class='add'>+		u8 data[CAN_MAX_DLEN];</div><div class='add'>+		u8 data_fd[CANFD_MAX_DLEN];</div><div class='add'>+		struct {</div><div class='add'>+			u8 status; /* CAN Controller Status */</div><div class='add'>+			u8 ecc;    /* Error Capture Register */</div><div class='add'>+			u8 rec;    /* RX Error Counter */</div><div class='add'>+			u8 tec;    /* TX Error Counter */</div><div class='add'>+		} ev_can_err_ext;  /* For ESD_EV_CAN_ERROR_EXT */</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_tx_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 net;</div><div class='add'>+	u8 dlc;</div><div class='add'>+	u32 hnd;	/* opaque handle, not used by device */</div><div class='add'>+	__le32 id; /* upper 3 bits contain flags */</div><div class='add'>+	union {</div><div class='add'>+		u8 data[CAN_MAX_DLEN];</div><div class='add'>+		u8 data_fd[CANFD_MAX_DLEN];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_tx_done_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 net;</div><div class='add'>+	u8 status;</div><div class='add'>+	u32 hnd;	/* opaque handle, not used by device */</div><div class='add'>+	__le32 ts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_id_filter_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 net;</div><div class='add'>+	u8 option;</div><div class='add'>+	__le32 mask[ESD_USB_MAX_ID_SEGMENT + 1]; /* +1 for 29bit extended IDs */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_set_baudrate_msg {</div><div class='add'>+	u8 len; /* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 net;</div><div class='add'>+	u8 rsvd;</div><div class='add'>+	__le32 baud;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CAN-USB/3 baudrate configuration, used for nominal as well as for data bit rate */</div><div class='add'>+struct esd_usb_3_baudrate_cfg {</div><div class='add'>+	__le16 brp;	/* bit rate pre-scaler */</div><div class='add'>+	__le16 tseg1;	/* time segment before sample point */</div><div class='add'>+	__le16 tseg2;	/* time segment after sample point */</div><div class='add'>+	__le16 sjw;	/* synchronization jump Width */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* In principle, the esd CAN-USB/3 supports Transmitter Delay Compensation (TDC),</div><div class='add'>+ * but currently only the automatic TDC mode is supported by this driver.</div><div class='add'>+ * An implementation for manual TDC configuration will follow.</div><div class='add'>+ *</div><div class='add'>+ * For information about struct esd_usb_3_tdc_cfg, see</div><div class='add'>+ * NTCAN Application Developers Manual, 6.2.25 NTCAN_TDC_CFG + related chapters</div><div class='add'>+ * https://esd.eu/fileadmin/esd/docs/manuals/NTCAN_Part1_Function_API_Manual_en_56.pdf</div><div class='add'>+ */</div><div class='add'>+struct esd_usb_3_tdc_cfg {</div><div class='add'>+	u8 tdc_mode;	/* transmitter delay compensation mode  */</div><div class='add'>+	u8 ssp_offset;	/* secondary sample point offset in mtq */</div><div class='add'>+	s8 ssp_shift;	/* secondary sample point shift in mtq */</div><div class='add'>+	u8 tdc_filter;	/* TDC filter in mtq */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Extended version of the above set_baudrate_msg for a CAN-USB/3</div><div class='add'>+ * to define the CAN bit timing configuration of the CAN controller in</div><div class='add'>+ * CAN FD mode as well as in Classical CAN mode.</div><div class='add'>+ *</div><div class='add'>+ * The payload of this command is a NTCAN_BAUDRATE_X structure according to</div><div class='add'>+ * esd electronics gmbh, NTCAN Application Developers Manual, 6.2.15 NTCAN_BAUDRATE_X</div><div class='add'>+ * https://esd.eu/fileadmin/esd/docs/manuals/NTCAN_Part1_Function_API_Manual_en_56.pdf</div><div class='add'>+ */</div><div class='add'>+struct esd_usb_3_set_baudrate_msg_x {</div><div class='add'>+	u8 len;	/* total message length in 32bit words */</div><div class='add'>+	u8 cmd;</div><div class='add'>+	u8 net;</div><div class='add'>+	u8 rsvd;	/*reserved */</div><div class='add'>+	/* Payload ... */</div><div class='add'>+	__le16 mode;	/* mode word, see ESD_USB_3_BAUDRATE_MODE_xxx */</div><div class='add'>+	__le16 flags;	/* control flags, see ESD_USB_3_BAUDRATE_FLAG_xxx */</div><div class='add'>+	struct esd_usb_3_tdc_cfg tdc;	/* TDC configuration */</div><div class='add'>+	struct esd_usb_3_baudrate_cfg nom;	/* nominal bit rate */</div><div class='add'>+	struct esd_usb_3_baudrate_cfg data;	/* data bit rate */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Main message type used between library and application */</div><div class='add'>+union __packed esd_usb_msg {</div><div class='add'>+	struct esd_usb_header_msg hdr;</div><div class='add'>+	struct esd_usb_version_msg version;</div><div class='add'>+	struct esd_usb_version_reply_msg version_reply;</div><div class='add'>+	struct esd_usb_rx_msg rx;</div><div class='add'>+	struct esd_usb_tx_msg tx;</div><div class='add'>+	struct esd_usb_tx_done_msg txdone;</div><div class='add'>+	struct esd_usb_set_baudrate_msg setbaud;</div><div class='add'>+	struct esd_usb_3_set_baudrate_msg_x setbaud_x;</div><div class='add'>+	struct esd_usb_id_filter_msg filter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct usb_device_id esd_usb_table[] = {</div><div class='add'>+	{USB_DEVICE(ESD_USB_ESDGMBH_VENDOR_ID, ESD_USB_CANUSB2_PRODUCT_ID)},</div><div class='add'>+	{USB_DEVICE(ESD_USB_ESDGMBH_VENDOR_ID, ESD_USB_CANUSBM_PRODUCT_ID)},</div><div class='add'>+	{USB_DEVICE(ESD_USB_ESDGMBH_VENDOR_ID, ESD_USB_CANUSB3_PRODUCT_ID)},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(usb, esd_usb_table);</div><div class='add'>+</div><div class='add'>+struct esd_usb_net_priv;</div><div class='add'>+</div><div class='add'>+struct esd_tx_urb_context {</div><div class='add'>+	struct esd_usb_net_priv *priv;</div><div class='add'>+	u32 echo_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb {</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct esd_usb_net_priv *nets[ESD_USB_MAX_NETS];</div><div class='add'>+</div><div class='add'>+	struct usb_anchor rx_submitted;</div><div class='add'>+</div><div class='add'>+	int net_count;</div><div class='add'>+	u32 version;</div><div class='add'>+	int rxinitdone;</div><div class='add'>+	int in_usb_disconnect;</div><div class='add'>+	void *rxbuf[ESD_USB_MAX_RX_URBS];</div><div class='add'>+	dma_addr_t rxbuf_dma[ESD_USB_MAX_RX_URBS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct esd_usb_net_priv {</div><div class='add'>+	struct can_priv can; /* must be the first member */</div><div class='add'>+</div><div class='add'>+	atomic_t active_tx_jobs;</div><div class='add'>+	struct usb_anchor tx_submitted;</div><div class='add'>+	struct esd_tx_urb_context tx_contexts[ESD_USB_MAX_TX_URBS];</div><div class='add'>+</div><div class='add'>+	struct esd_usb *usb;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int index;</div><div class='add'>+	u8 old_state;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void esd_usb_rx_event(struct esd_usb_net_priv *priv,</div><div class='add'>+			     union esd_usb_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 id = le32_to_cpu(msg-&gt;rx.id) &amp; ESD_USB_IDMASK;</div><div class='add'>+</div><div class='add'>+	if (id == ESD_USB_EV_CAN_ERROR_EXT) {</div><div class='add'>+		u8 state = msg-&gt;rx.ev_can_err_ext.status;</div><div class='add'>+		u8 ecc = msg-&gt;rx.ev_can_err_ext.ecc;</div><div class='add'>+</div><div class='add'>+		priv-&gt;bec.rxerr = msg-&gt;rx.ev_can_err_ext.rec;</div><div class='add'>+		priv-&gt;bec.txerr = msg-&gt;rx.ev_can_err_ext.tec;</div><div class='add'>+</div><div class='add'>+		netdev_dbg(priv-&gt;netdev,</div><div class='add'>+			   "CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n",</div><div class='add'>+			   msg-&gt;rx.dlc, state, ecc,</div><div class='add'>+			   priv-&gt;bec.rxerr, priv-&gt;bec.txerr);</div><div class='add'>+</div><div class='add'>+		/* if berr-reporting is off, only pass through on state change ... */</div><div class='add'>+		if (!(priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) &amp;&amp;</div><div class='add'>+		    state == priv-&gt;old_state)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		skb = alloc_can_err_skb(priv-&gt;netdev, &amp;cf);</div><div class='add'>+		if (!skb)</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+</div><div class='add'>+		if (state != priv-&gt;old_state) {</div><div class='add'>+			enum can_state tx_state, rx_state;</div><div class='add'>+			enum can_state new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+			priv-&gt;old_state = state;</div><div class='add'>+</div><div class='add'>+			switch (state &amp; ESD_USB_BUSSTATE_MASK) {</div><div class='add'>+			case ESD_USB_BUSSTATE_BUSOFF:</div><div class='add'>+				new_state = CAN_STATE_BUS_OFF;</div><div class='add'>+				can_bus_off(priv-&gt;netdev);</div><div class='add'>+				break;</div><div class='add'>+			case ESD_USB_BUSSTATE_WARN:</div><div class='add'>+				new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+				break;</div><div class='add'>+			case ESD_USB_BUSSTATE_ERRPASSIVE:</div><div class='add'>+				new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+				priv-&gt;bec.txerr = 0;</div><div class='add'>+				priv-&gt;bec.rxerr = 0;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (new_state != priv-&gt;can.state) {</div><div class='add'>+				tx_state = (priv-&gt;bec.txerr &gt;= priv-&gt;bec.rxerr) ? new_state : 0;</div><div class='add'>+				rx_state = (priv-&gt;bec.txerr &lt;= priv-&gt;bec.rxerr) ? new_state : 0;</div><div class='add'>+				can_change_state(priv-&gt;netdev, cf,</div><div class='add'>+						 tx_state, rx_state);</div><div class='add'>+			}</div><div class='add'>+		} else if (skb) {</div><div class='add'>+			priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+			stats-&gt;rx_errors++;</div><div class='add'>+</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+</div><div class='add'>+			switch (ecc &amp; ESD_USB_SJA1000_ECC_MASK) {</div><div class='add'>+			case ESD_USB_SJA1000_ECC_BIT:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+				break;</div><div class='add'>+			case ESD_USB_SJA1000_ECC_FORM:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+				break;</div><div class='add'>+			case ESD_USB_SJA1000_ECC_STUFF:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Error occurred during transmission? */</div><div class='add'>+			if (!(ecc &amp; ESD_USB_SJA1000_ECC_DIR))</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+</div><div class='add'>+			/* Bit stream position in CAN frame as the error was detected */</div><div class='add'>+			cf-&gt;data[3] = ecc &amp; ESD_USB_SJA1000_ECC_SEG;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+			cf-&gt;data[6] = priv-&gt;bec.txerr;</div><div class='add'>+			cf-&gt;data[7] = priv-&gt;bec.rxerr;</div><div class='add'>+</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void esd_usb_rx_can_msg(struct esd_usb_net_priv *priv,</div><div class='add'>+			       union esd_usb_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct canfd_frame *cfd;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 id;</div><div class='add'>+	u8 len;</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(priv-&gt;netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	id = le32_to_cpu(msg-&gt;rx.id);</div><div class='add'>+</div><div class='add'>+	if (id &amp; ESD_USB_EVENT) {</div><div class='add'>+		esd_usb_rx_event(priv, msg);</div><div class='add'>+	} else {</div><div class='add'>+		if (msg-&gt;rx.dlc &amp; ESD_USB_FD) {</div><div class='add'>+			skb = alloc_canfd_skb(priv-&gt;netdev, &amp;cfd);</div><div class='add'>+		} else {</div><div class='add'>+			skb = alloc_can_skb(priv-&gt;netdev, &amp;cf);</div><div class='add'>+			cfd = (struct canfd_frame *)cf;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (skb == NULL) {</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfd-&gt;can_id = id &amp; ESD_USB_IDMASK;</div><div class='add'>+</div><div class='add'>+		if (msg-&gt;rx.dlc &amp; ESD_USB_FD) {</div><div class='add'>+			/* masking by 0x0F is already done within can_fd_dlc2len() */</div><div class='add'>+			cfd-&gt;len = can_fd_dlc2len(msg-&gt;rx.dlc);</div><div class='add'>+			len = cfd-&gt;len;</div><div class='add'>+			if ((msg-&gt;rx.dlc &amp; ESD_USB_NO_BRS) == 0)</div><div class='add'>+				cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+			if (msg-&gt;rx.dlc &amp; ESD_USB_ESI)</div><div class='add'>+				cfd-&gt;flags |= CANFD_ESI;</div><div class='add'>+		} else {</div><div class='add'>+			can_frame_set_cc_len(cf, msg-&gt;rx.dlc &amp; ~ESD_USB_RTR, priv-&gt;can.ctrlmode);</div><div class='add'>+			len = cf-&gt;len;</div><div class='add'>+			if (msg-&gt;rx.dlc &amp; ESD_USB_RTR) {</div><div class='add'>+				cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+				len = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (id &amp; ESD_USB_EXTID)</div><div class='add'>+			cfd-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+</div><div class='add'>+		memcpy(cfd-&gt;data, msg-&gt;rx.data_fd, len);</div><div class='add'>+		stats-&gt;rx_bytes += len;</div><div class='add'>+		stats-&gt;rx_packets++;</div><div class='add'>+</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void esd_usb_tx_done_msg(struct esd_usb_net_priv *priv,</div><div class='add'>+				union esd_usb_msg *msg)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct esd_tx_urb_context *context;</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	context = &amp;priv-&gt;tx_contexts[msg-&gt;txdone.hnd &amp; (ESD_USB_MAX_TX_URBS - 1)];</div><div class='add'>+</div><div class='add'>+	if (!msg-&gt;txdone.status) {</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(netdev, context-&gt;echo_index,</div><div class='add'>+						    NULL);</div><div class='add'>+	} else {</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		can_free_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Release context */</div><div class='add'>+	context-&gt;echo_index = ESD_USB_MAX_TX_URBS;</div><div class='add'>+	atomic_dec(&amp;priv-&gt;active_tx_jobs);</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void esd_usb_read_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb *dev = urb-&gt;context;</div><div class='add'>+	int err;</div><div class='add'>+	int pos = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0: /* success */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+	case -EPROTO:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_info(dev-&gt;udev-&gt;dev.parent,</div><div class='add'>+			 "Rx URB aborted (%pe)\n", ERR_PTR(urb-&gt;status));</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (pos &lt; urb-&gt;actual_length) {</div><div class='add'>+		union esd_usb_msg *msg;</div><div class='add'>+</div><div class='add'>+		msg = (union esd_usb_msg *)(urb-&gt;transfer_buffer + pos);</div><div class='add'>+</div><div class='add'>+		switch (msg-&gt;hdr.cmd) {</div><div class='add'>+		case ESD_USB_CMD_CAN_RX:</div><div class='add'>+			if (msg-&gt;rx.net &gt;= dev-&gt;net_count) {</div><div class='add'>+				dev_err(dev-&gt;udev-&gt;dev.parent, "format error\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			esd_usb_rx_can_msg(dev-&gt;nets[msg-&gt;rx.net], msg);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ESD_USB_CMD_CAN_TX:</div><div class='add'>+			if (msg-&gt;txdone.net &gt;= dev-&gt;net_count) {</div><div class='add'>+				dev_err(dev-&gt;udev-&gt;dev.parent, "format error\n");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			esd_usb_tx_done_msg(dev-&gt;nets[msg-&gt;txdone.net],</div><div class='add'>+					    msg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pos += msg-&gt;hdr.len * sizeof(u32); /* convert to # of bytes */</div><div class='add'>+</div><div class='add'>+		if (pos &gt; urb-&gt;actual_length) {</div><div class='add'>+			dev_err(dev-&gt;udev-&gt;dev.parent, "format error\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+resubmit_urb:</div><div class='add'>+	usb_fill_bulk_urb(urb, dev-&gt;udev, usb_rcvbulkpipe(dev-&gt;udev, 1),</div><div class='add'>+			  urb-&gt;transfer_buffer, ESD_USB_RX_BUFFER_SIZE,</div><div class='add'>+			  esd_usb_read_bulk_callback, dev);</div><div class='add'>+</div><div class='add'>+	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (err == -ENODEV) {</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;net_count; i++) {</div><div class='add'>+			if (dev-&gt;nets[i])</div><div class='add'>+				netif_device_detach(dev-&gt;nets[i]-&gt;netdev);</div><div class='add'>+		}</div><div class='add'>+	} else if (err) {</div><div class='add'>+		dev_err(dev-&gt;udev-&gt;dev.parent,</div><div class='add'>+			"failed resubmitting read bulk urb: %pe\n", ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* callback for bulk IN urb */</div><div class='add'>+static void esd_usb_write_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct esd_tx_urb_context *context = urb-&gt;context;</div><div class='add'>+	struct esd_usb_net_priv *priv;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	size_t size = sizeof(union esd_usb_msg);</div><div class='add'>+</div><div class='add'>+	WARN_ON(!context);</div><div class='add'>+</div><div class='add'>+	priv = context-&gt;priv;</div><div class='add'>+	netdev = priv-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	/* free up our allocated buffer */</div><div class='add'>+	usb_free_coherent(urb-&gt;dev, size,</div><div class='add'>+			  urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status)</div><div class='add'>+		netdev_info(netdev, "Tx URB aborted (%pe)\n", ERR_PTR(urb-&gt;status));</div><div class='add'>+</div><div class='add'>+	netif_trans_update(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t firmware_show(struct device *d,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(d);</div><div class='add'>+	struct esd_usb *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d.%d.%d\n",</div><div class='add'>+		       (dev-&gt;version &gt;&gt; 12) &amp; 0xf,</div><div class='add'>+		       (dev-&gt;version &gt;&gt; 8) &amp; 0xf,</div><div class='add'>+		       dev-&gt;version &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(firmware);</div><div class='add'>+</div><div class='add'>+static ssize_t hardware_show(struct device *d,</div><div class='add'>+			     struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(d);</div><div class='add'>+	struct esd_usb *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d.%d.%d\n",</div><div class='add'>+		       (dev-&gt;version &gt;&gt; 28) &amp; 0xf,</div><div class='add'>+		       (dev-&gt;version &gt;&gt; 24) &amp; 0xf,</div><div class='add'>+		       (dev-&gt;version &gt;&gt; 16) &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(hardware);</div><div class='add'>+</div><div class='add'>+static ssize_t nets_show(struct device *d,</div><div class='add'>+			 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct usb_interface *intf = to_usb_interface(d);</div><div class='add'>+	struct esd_usb *dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	return sprintf(buf, "%d", dev-&gt;net_count);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(nets);</div><div class='add'>+</div><div class='add'>+static int esd_usb_send_msg(struct esd_usb *dev, union esd_usb_msg *msg)</div><div class='add'>+{</div><div class='add'>+	int actual_length;</div><div class='add'>+</div><div class='add'>+	return usb_bulk_msg(dev-&gt;udev,</div><div class='add'>+			    usb_sndbulkpipe(dev-&gt;udev, 2),</div><div class='add'>+			    msg,</div><div class='add'>+			    msg-&gt;hdr.len * sizeof(u32), /* convert to # of bytes */</div><div class='add'>+			    &amp;actual_length,</div><div class='add'>+			    1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_wait_msg(struct esd_usb *dev,</div><div class='add'>+			    union esd_usb_msg *msg)</div><div class='add'>+{</div><div class='add'>+	int actual_length;</div><div class='add'>+</div><div class='add'>+	return usb_bulk_msg(dev-&gt;udev,</div><div class='add'>+			    usb_rcvbulkpipe(dev-&gt;udev, 1),</div><div class='add'>+			    msg,</div><div class='add'>+			    sizeof(*msg),</div><div class='add'>+			    &amp;actual_length,</div><div class='add'>+			    1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_setup_rx_urbs(struct esd_usb *dev)</div><div class='add'>+{</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;rxinitdone)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ESD_USB_MAX_RX_URBS; i++) {</div><div class='add'>+		struct urb *urb = NULL;</div><div class='add'>+		u8 *buf = NULL;</div><div class='add'>+		dma_addr_t buf_dma;</div><div class='add'>+</div><div class='add'>+		/* create a URB, and a buffer for it */</div><div class='add'>+		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+		if (!urb) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buf = usb_alloc_coherent(dev-&gt;udev, ESD_USB_RX_BUFFER_SIZE, GFP_KERNEL,</div><div class='add'>+					 &amp;buf_dma);</div><div class='add'>+		if (!buf) {</div><div class='add'>+			dev_warn(dev-&gt;udev-&gt;dev.parent,</div><div class='add'>+				 "No memory left for USB buffer\n");</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto freeurb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		urb-&gt;transfer_dma = buf_dma;</div><div class='add'>+</div><div class='add'>+		usb_fill_bulk_urb(urb, dev-&gt;udev,</div><div class='add'>+				  usb_rcvbulkpipe(dev-&gt;udev, 1),</div><div class='add'>+				  buf, ESD_USB_RX_BUFFER_SIZE,</div><div class='add'>+				  esd_usb_read_bulk_callback, dev);</div><div class='add'>+		urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+		usb_anchor_urb(urb, &amp;dev-&gt;rx_submitted);</div><div class='add'>+</div><div class='add'>+		err = usb_submit_urb(urb, GFP_KERNEL);</div><div class='add'>+		if (err) {</div><div class='add'>+			usb_unanchor_urb(urb);</div><div class='add'>+			usb_free_coherent(dev-&gt;udev, ESD_USB_RX_BUFFER_SIZE, buf,</div><div class='add'>+					  urb-&gt;transfer_dma);</div><div class='add'>+			goto freeurb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;rxbuf[i] = buf;</div><div class='add'>+		dev-&gt;rxbuf_dma[i] = buf_dma;</div><div class='add'>+</div><div class='add'>+freeurb:</div><div class='add'>+		/* Drop reference, USB core will take care of freeing it */</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Did we submit any URBs */</div><div class='add'>+	if (i == 0) {</div><div class='add'>+		dev_err(dev-&gt;udev-&gt;dev.parent, "couldn't setup read URBs\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Warn if we've couldn't transmit all the URBs */</div><div class='add'>+	if (i &lt; ESD_USB_MAX_RX_URBS) {</div><div class='add'>+		dev_warn(dev-&gt;udev-&gt;dev.parent,</div><div class='add'>+			 "rx performance may be slow\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;rxinitdone = 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Start interface */</div><div class='add'>+static int esd_usb_start(struct esd_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb *dev = priv-&gt;usb;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	union esd_usb_msg *msg;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='add'>+	if (!msg) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable all IDs</div><div class='add'>+	 * The IDADD message takes up to 64 32 bit bitmasks (2048 bits).</div><div class='add'>+	 * Each bit represents one 11 bit CAN identifier. A set bit</div><div class='add'>+	 * enables reception of the corresponding CAN identifier. A cleared</div><div class='add'>+	 * bit disabled this identifier. An additional bitmask value</div><div class='add'>+	 * following the CAN 2.0A bits is used to enable reception of</div><div class='add'>+	 * extended CAN frames. Only the LSB of this final mask is checked</div><div class='add'>+	 * for the complete 29 bit ID range. The IDADD message also allows</div><div class='add'>+	 * filter configuration for an ID subset. In this case you can add</div><div class='add'>+	 * the number of the starting bitmask (0..64) to the filter.option</div><div class='add'>+	 * field followed by only some bitmasks.</div><div class='add'>+	 */</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_IDADD;</div><div class='add'>+	msg-&gt;hdr.len = sizeof(struct esd_usb_id_filter_msg) / sizeof(u32); /* # of 32bit words */</div><div class='add'>+	msg-&gt;filter.net = priv-&gt;index;</div><div class='add'>+	msg-&gt;filter.option = ESD_USB_ID_ENABLE; /* start with segment 0 */</div><div class='add'>+	for (i = 0; i &lt; ESD_USB_MAX_ID_SEGMENT; i++)</div><div class='add'>+		msg-&gt;filter.mask[i] = cpu_to_le32(GENMASK(31, 0));</div><div class='add'>+	/* enable 29bit extended IDs */</div><div class='add'>+	msg-&gt;filter.mask[ESD_USB_MAX_ID_SEGMENT] = cpu_to_le32(BIT(0));</div><div class='add'>+</div><div class='add'>+	err = esd_usb_send_msg(dev, msg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = esd_usb_setup_rx_urbs(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (err == -ENODEV)</div><div class='add'>+		netif_device_detach(netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(netdev, "couldn't start device: %pe\n", ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	kfree(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unlink_all_urbs(struct esd_usb *dev)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb_net_priv *priv;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	usb_kill_anchored_urbs(&amp;dev-&gt;rx_submitted);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ESD_USB_MAX_RX_URBS; ++i)</div><div class='add'>+		usb_free_coherent(dev-&gt;udev, ESD_USB_RX_BUFFER_SIZE,</div><div class='add'>+				  dev-&gt;rxbuf[i], dev-&gt;rxbuf_dma[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;net_count; i++) {</div><div class='add'>+		priv = dev-&gt;nets[i];</div><div class='add'>+		if (priv) {</div><div class='add'>+			usb_kill_anchored_urbs(&amp;priv-&gt;tx_submitted);</div><div class='add'>+			atomic_set(&amp;priv-&gt;active_tx_jobs, 0);</div><div class='add'>+</div><div class='add'>+			for (j = 0; j &lt; ESD_USB_MAX_TX_URBS; j++)</div><div class='add'>+				priv-&gt;tx_contexts[j].echo_index = ESD_USB_MAX_TX_URBS;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* common open */</div><div class='add'>+	err = open_candev(netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* finally start device */</div><div class='add'>+	err = esd_usb_start(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		close_candev(netdev);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t esd_usb_start_xmit(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct esd_usb *dev = priv-&gt;usb;</div><div class='add'>+	struct esd_tx_urb_context *context = NULL;</div><div class='add'>+	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='add'>+	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	union esd_usb_msg *msg;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int i, err;</div><div class='add'>+	int ret = NETDEV_TX_OK;</div><div class='add'>+	size_t size = sizeof(union esd_usb_msg);</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	/* create a URB, and a buffer for it, and copy the data to the URB */</div><div class='add'>+	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='add'>+	if (!urb) {</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto nourbmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf = usb_alloc_coherent(dev-&gt;udev, size, GFP_ATOMIC,</div><div class='add'>+				 &amp;urb-&gt;transfer_dma);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		netdev_err(netdev, "No memory left for USB buffer\n");</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		goto nobufmem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg = (union esd_usb_msg *)buf;</div><div class='add'>+</div><div class='add'>+	/* minimal length as # of 32bit words */</div><div class='add'>+	msg-&gt;hdr.len = offsetof(struct esd_usb_tx_msg, data) / sizeof(u32);</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_CAN_TX;</div><div class='add'>+	msg-&gt;tx.net = priv-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		msg-&gt;tx.dlc = can_fd_len2dlc(cfd-&gt;len);</div><div class='add'>+		msg-&gt;tx.dlc |= ESD_USB_FD;</div><div class='add'>+</div><div class='add'>+		if ((cfd-&gt;flags &amp; CANFD_BRS) == 0)</div><div class='add'>+			msg-&gt;tx.dlc |= ESD_USB_NO_BRS;</div><div class='add'>+	} else {</div><div class='add'>+		msg-&gt;tx.dlc = can_get_cc_dlc((struct can_frame *)cfd, priv-&gt;can.ctrlmode);</div><div class='add'>+</div><div class='add'>+		if (cfd-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+			msg-&gt;tx.dlc |= ESD_USB_RTR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg-&gt;tx.id = cpu_to_le32(cfd-&gt;can_id &amp; CAN_ERR_MASK);</div><div class='add'>+</div><div class='add'>+	if (cfd-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		msg-&gt;tx.id |= cpu_to_le32(ESD_USB_EXTID);</div><div class='add'>+</div><div class='add'>+	memcpy(msg-&gt;tx.data_fd, cfd-&gt;data, cfd-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* round up, then divide by 4 to add the payload length as # of 32bit words */</div><div class='add'>+	msg-&gt;hdr.len += DIV_ROUND_UP(cfd-&gt;len, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ESD_USB_MAX_TX_URBS; i++) {</div><div class='add'>+		if (priv-&gt;tx_contexts[i].echo_index == ESD_USB_MAX_TX_URBS) {</div><div class='add'>+			context = &amp;priv-&gt;tx_contexts[i];</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This may never happen */</div><div class='add'>+	if (!context) {</div><div class='add'>+		netdev_warn(netdev, "couldn't find free context\n");</div><div class='add'>+		ret = NETDEV_TX_BUSY;</div><div class='add'>+		goto releasebuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	context-&gt;priv = priv;</div><div class='add'>+	context-&gt;echo_index = i;</div><div class='add'>+</div><div class='add'>+	/* hnd must not be 0 - MSB is stripped in txdone handling */</div><div class='add'>+	msg-&gt;tx.hnd = BIT(31) | i; /* returned in TX done message */</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(urb, dev-&gt;udev, usb_sndbulkpipe(dev-&gt;udev, 2), buf,</div><div class='add'>+			  msg-&gt;hdr.len * sizeof(u32), /* convert to # of bytes */</div><div class='add'>+			  esd_usb_write_bulk_callback, context);</div><div class='add'>+</div><div class='add'>+	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+</div><div class='add'>+	usb_anchor_urb(urb, &amp;priv-&gt;tx_submitted);</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, netdev, context-&gt;echo_index, 0);</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;priv-&gt;active_tx_jobs);</div><div class='add'>+</div><div class='add'>+	/* Slow down tx path */</div><div class='add'>+	if (atomic_read(&amp;priv-&gt;active_tx_jobs) &gt;= ESD_USB_MAX_TX_URBS)</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (err) {</div><div class='add'>+		can_free_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='add'>+</div><div class='add'>+		atomic_dec(&amp;priv-&gt;active_tx_jobs);</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+</div><div class='add'>+		if (err == -ENODEV)</div><div class='add'>+			netif_device_detach(netdev);</div><div class='add'>+		else</div><div class='add'>+			netdev_warn(netdev, "failed tx_urb %pe\n", ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+		goto releasebuf;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_trans_update(netdev);</div><div class='add'>+</div><div class='add'>+	/* Release our reference to this URB, the USB core will eventually free</div><div class='add'>+	 * it entirely.</div><div class='add'>+	 */</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+releasebuf:</div><div class='add'>+	usb_free_coherent(dev-&gt;udev, size, buf, urb-&gt;transfer_dma);</div><div class='add'>+</div><div class='add'>+nobufmem:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+</div><div class='add'>+nourbmem:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Stop interface */</div><div class='add'>+static int esd_usb_stop(struct esd_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	union esd_usb_msg *msg;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Disable all IDs (see esd_usb_start()) */</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_IDADD;</div><div class='add'>+	msg-&gt;hdr.len = sizeof(struct esd_usb_id_filter_msg) / sizeof(u32);/* # of 32bit words */</div><div class='add'>+	msg-&gt;filter.net = priv-&gt;index;</div><div class='add'>+	msg-&gt;filter.option = ESD_USB_ID_ENABLE; /* start with segment 0 */</div><div class='add'>+	for (i = 0; i &lt;= ESD_USB_MAX_ID_SEGMENT; i++)</div><div class='add'>+		msg-&gt;filter.mask[i] = 0;</div><div class='add'>+	err = esd_usb_send_msg(priv-&gt;usb, msg);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		netdev_err(priv-&gt;netdev, "sending idadd message failed: %pe\n", ERR_PTR(err));</div><div class='add'>+		goto bail;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set CAN controller to reset mode */</div><div class='add'>+	msg-&gt;hdr.len = sizeof(struct esd_usb_set_baudrate_msg) / sizeof(u32); /* # of 32bit words */</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_SETBAUD;</div><div class='add'>+	msg-&gt;setbaud.net = priv-&gt;index;</div><div class='add'>+	msg-&gt;setbaud.rsvd = 0;</div><div class='add'>+	msg-&gt;setbaud.baud = cpu_to_le32(ESD_USB_NO_BAUDRATE);</div><div class='add'>+	err = esd_usb_send_msg(priv-&gt;usb, msg);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		netdev_err(priv-&gt;netdev, "sending setbaud message failed: %pe\n", ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+bail:</div><div class='add'>+	kfree(msg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;usb-&gt;in_usb_disconnect) {</div><div class='add'>+		/* It's moot to try this in usb_disconnect()! */</div><div class='add'>+		err = esd_usb_stop(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	close_candev(netdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops esd_usb_netdev_ops = {</div><div class='add'>+	.ndo_open = esd_usb_open,</div><div class='add'>+	.ndo_stop = esd_usb_close,</div><div class='add'>+	.ndo_start_xmit = esd_usb_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops esd_usb_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const esd_usb_2_bittiming_const = {</div><div class='add'>+	.name = "esd_usb_2",</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int esd_usb_2_set_bittiming(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming_const *btc = &amp;esd_usb_2_bittiming_const;</div><div class='add'>+	struct esd_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	union esd_usb_msg *msg;</div><div class='add'>+	int err;</div><div class='add'>+	u32 canbtr;</div><div class='add'>+	int sjw_shift;</div><div class='add'>+</div><div class='add'>+	canbtr = ESD_USB_UBR;</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		canbtr |= ESD_USB_LOM;</div><div class='add'>+</div><div class='add'>+	canbtr |= (bt-&gt;brp - 1) &amp; (btc-&gt;brp_max - 1);</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(priv-&gt;usb-&gt;udev-&gt;descriptor.idProduct) ==</div><div class='add'>+	    ESD_USB_CANUSBM_PRODUCT_ID)</div><div class='add'>+		sjw_shift = ESD_USB_M_SJW_SHIFT;</div><div class='add'>+	else</div><div class='add'>+		sjw_shift = ESD_USB_2_SJW_SHIFT;</div><div class='add'>+</div><div class='add'>+	canbtr |= ((bt-&gt;sjw - 1) &amp; (btc-&gt;sjw_max - 1))</div><div class='add'>+		&lt;&lt; sjw_shift;</div><div class='add'>+	canbtr |= ((bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1)</div><div class='add'>+		   &amp; (btc-&gt;tseg1_max - 1))</div><div class='add'>+		&lt;&lt; ESD_USB_2_TSEG1_SHIFT;</div><div class='add'>+	canbtr |= ((bt-&gt;phase_seg2 - 1) &amp; (btc-&gt;tseg2_max - 1))</div><div class='add'>+		&lt;&lt; ESD_USB_2_TSEG2_SHIFT;</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='add'>+		canbtr |= ESD_USB_TRIPLE_SAMPLES;</div><div class='add'>+</div><div class='add'>+	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	msg-&gt;hdr.len = sizeof(struct esd_usb_set_baudrate_msg) / sizeof(u32); /* # of 32bit words */</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_SETBAUD;</div><div class='add'>+	msg-&gt;setbaud.net = priv-&gt;index;</div><div class='add'>+	msg-&gt;setbaud.rsvd = 0;</div><div class='add'>+	msg-&gt;setbaud.baud = cpu_to_le32(canbtr);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(netdev, "setting BTR=%#x\n", canbtr);</div><div class='add'>+</div><div class='add'>+	err = esd_usb_send_msg(priv-&gt;usb, msg);</div><div class='add'>+</div><div class='add'>+	kfree(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Nominal bittiming constants, see</div><div class='add'>+ * Microchip SAM E70/S70/V70/V71, Data Sheet, Rev. G - 07/2022</div><div class='add'>+ * 48.6.8 MCAN Nominal Bit Timing and Prescaler Register</div><div class='add'>+ */</div><div class='add'>+static const struct can_bittiming_const esd_usb_3_nom_bittiming_const = {</div><div class='add'>+	.name = "esd_usb_3",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Data bittiming constants, see</div><div class='add'>+ * Microchip SAM E70/S70/V70/V71, Data Sheet, Rev. G - 07/2022</div><div class='add'>+ * 48.6.4 MCAN Data Bit Timing and Prescaler Register</div><div class='add'>+ */</div><div class='add'>+static const struct can_bittiming_const esd_usb_3_data_bittiming_const = {</div><div class='add'>+	.name = "esd_usb_3",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 8,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 32,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int esd_usb_3_set_bittiming(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	const struct can_bittiming_const *nom_btc = &amp;esd_usb_3_nom_bittiming_const;</div><div class='add'>+	const struct can_bittiming_const *data_btc = &amp;esd_usb_3_data_bittiming_const;</div><div class='add'>+	struct esd_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct can_bittiming *nom_bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	struct can_bittiming *data_bt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	struct esd_usb_3_set_baudrate_msg_x *baud_x;</div><div class='add'>+	union esd_usb_msg *msg;</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='add'>+	if (!msg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	baud_x = &amp;msg-&gt;setbaud_x;</div><div class='add'>+</div><div class='add'>+	/* Canonical is the most reasonable mode for SocketCAN on CAN-USB/3 ... */</div><div class='add'>+	baud_x-&gt;mode = cpu_to_le16(ESD_USB_3_BAUDRATE_MODE_BTR_CANONICAL);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		flags |= ESD_USB_3_BAUDRATE_FLAG_LOM;</div><div class='add'>+</div><div class='add'>+	baud_x-&gt;nom.brp = cpu_to_le16(nom_bt-&gt;brp &amp; (nom_btc-&gt;brp_max - 1));</div><div class='add'>+	baud_x-&gt;nom.sjw = cpu_to_le16(nom_bt-&gt;sjw &amp; (nom_btc-&gt;sjw_max - 1));</div><div class='add'>+	baud_x-&gt;nom.tseg1 = cpu_to_le16((nom_bt-&gt;prop_seg + nom_bt-&gt;phase_seg1)</div><div class='add'>+					&amp; (nom_btc-&gt;tseg1_max - 1));</div><div class='add'>+	baud_x-&gt;nom.tseg2 = cpu_to_le16(nom_bt-&gt;phase_seg2 &amp; (nom_btc-&gt;tseg2_max - 1));</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		baud_x-&gt;data.brp = cpu_to_le16(data_bt-&gt;brp &amp; (data_btc-&gt;brp_max - 1));</div><div class='add'>+		baud_x-&gt;data.sjw = cpu_to_le16(data_bt-&gt;sjw &amp; (data_btc-&gt;sjw_max - 1));</div><div class='add'>+		baud_x-&gt;data.tseg1 = cpu_to_le16((data_bt-&gt;prop_seg + data_bt-&gt;phase_seg1)</div><div class='add'>+						 &amp; (data_btc-&gt;tseg1_max - 1));</div><div class='add'>+		baud_x-&gt;data.tseg2 = cpu_to_le16(data_bt-&gt;phase_seg2 &amp; (data_btc-&gt;tseg2_max - 1));</div><div class='add'>+		flags |= ESD_USB_3_BAUDRATE_FLAG_FD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Currently this driver only supports the automatic TDC mode */</div><div class='add'>+	baud_x-&gt;tdc.tdc_mode = ESD_USB_3_TDC_MODE_AUTO;</div><div class='add'>+	baud_x-&gt;tdc.ssp_offset = 0;</div><div class='add'>+	baud_x-&gt;tdc.ssp_shift = 0;</div><div class='add'>+	baud_x-&gt;tdc.tdc_filter = 0;</div><div class='add'>+</div><div class='add'>+	baud_x-&gt;flags = cpu_to_le16(flags);</div><div class='add'>+	baud_x-&gt;net = priv-&gt;index;</div><div class='add'>+	baud_x-&gt;rsvd = 0;</div><div class='add'>+</div><div class='add'>+	/* set len as # of 32bit words */</div><div class='add'>+	msg-&gt;hdr.len = sizeof(struct esd_usb_3_set_baudrate_msg_x) / sizeof(u32);</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_SETBAUD;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(netdev,</div><div class='add'>+		   "ctrlmode=%#x/%#x, esd-net=%u, esd-mode=%#x, esd-flags=%#x\n",</div><div class='add'>+		   priv-&gt;can.ctrlmode, priv-&gt;can.ctrlmode_supported,</div><div class='add'>+		   priv-&gt;index, le16_to_cpu(baud_x-&gt;mode), flags);</div><div class='add'>+</div><div class='add'>+	err = esd_usb_send_msg(priv-&gt;usb, msg);</div><div class='add'>+</div><div class='add'>+	kfree(msg);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_get_berr_counter(const struct net_device *netdev,</div><div class='add'>+				    struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	bec-&gt;txerr = priv-&gt;bec.txerr;</div><div class='add'>+	bec-&gt;rxerr = priv-&gt;bec.rxerr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_set_mode(struct net_device *netdev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		netif_wake_queue(netdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int esd_usb_probe_one_net(struct usb_interface *intf, int index)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb *dev = usb_get_intfdata(intf);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct esd_usb_net_priv *priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_candev(sizeof(*priv), ESD_USB_MAX_TX_URBS);</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "couldn't alloc candev\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	init_usb_anchor(&amp;priv-&gt;tx_submitted);</div><div class='add'>+	atomic_set(&amp;priv-&gt;active_tx_jobs, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ESD_USB_MAX_TX_URBS; i++)</div><div class='add'>+		priv-&gt;tx_contexts[i].echo_index = ESD_USB_MAX_TX_URBS;</div><div class='add'>+</div><div class='add'>+	priv-&gt;usb = dev;</div><div class='add'>+	priv-&gt;netdev = netdev;</div><div class='add'>+	priv-&gt;index = index;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+		CAN_CTRLMODE_CC_LEN8_DLC |</div><div class='add'>+		CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+</div><div class='add'>+	switch (le16_to_cpu(dev-&gt;udev-&gt;descriptor.idProduct)) {</div><div class='add'>+	case ESD_USB_CANUSB3_PRODUCT_ID:</div><div class='add'>+		priv-&gt;can.clock.freq = ESD_USB_3_CAN_CLOCK;</div><div class='add'>+		priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD;</div><div class='add'>+		priv-&gt;can.bittiming_const = &amp;esd_usb_3_nom_bittiming_const;</div><div class='add'>+		priv-&gt;can.fd.data_bittiming_const = &amp;esd_usb_3_data_bittiming_const;</div><div class='add'>+		priv-&gt;can.do_set_bittiming = esd_usb_3_set_bittiming;</div><div class='add'>+		priv-&gt;can.fd.do_set_data_bittiming = esd_usb_3_set_bittiming;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ESD_USB_CANUSBM_PRODUCT_ID:</div><div class='add'>+		priv-&gt;can.clock.freq = ESD_USB_M_CAN_CLOCK;</div><div class='add'>+		priv-&gt;can.bittiming_const = &amp;esd_usb_2_bittiming_const;</div><div class='add'>+		priv-&gt;can.do_set_bittiming = esd_usb_2_set_bittiming;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ESD_USB_CANUSB2_PRODUCT_ID:</div><div class='add'>+	default:</div><div class='add'>+		priv-&gt;can.clock.freq = ESD_USB_2_CAN_CLOCK;</div><div class='add'>+		priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;</div><div class='add'>+		priv-&gt;can.bittiming_const = &amp;esd_usb_2_bittiming_const;</div><div class='add'>+		priv-&gt;can.do_set_bittiming = esd_usb_2_set_bittiming;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.do_set_mode = esd_usb_set_mode;</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = esd_usb_get_berr_counter;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;flags |= IFF_ECHO; /* we support local echo */</div><div class='add'>+</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;esd_usb_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;esd_usb_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='add'>+	netdev-&gt;dev_id = index;</div><div class='add'>+</div><div class='add'>+	err = register_candev(netdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "couldn't register CAN device: %pe\n", ERR_PTR(err));</div><div class='add'>+		free_candev(netdev);</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;nets[index] = priv;</div><div class='add'>+	netdev_info(netdev, "registered\n");</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* probe function for new USB devices</div><div class='add'>+ *</div><div class='add'>+ * check version information and number of available</div><div class='add'>+ * CAN interfaces</div><div class='add'>+ */</div><div class='add'>+static int esd_usb_probe(struct usb_interface *intf,</div><div class='add'>+			 const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb *dev;</div><div class='add'>+	union esd_usb_msg *msg;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;udev = interface_to_usbdev(intf);</div><div class='add'>+</div><div class='add'>+	init_usb_anchor(&amp;dev-&gt;rx_submitted);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, dev);</div><div class='add'>+</div><div class='add'>+	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='add'>+	if (!msg) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* query number of CAN interfaces (nets) */</div><div class='add'>+	msg-&gt;hdr.cmd = ESD_USB_CMD_VERSION;</div><div class='add'>+	msg-&gt;hdr.len = sizeof(struct esd_usb_version_msg) / sizeof(u32); /* # of 32bit words */</div><div class='add'>+	msg-&gt;version.rsvd = 0;</div><div class='add'>+	msg-&gt;version.flags = 0;</div><div class='add'>+	msg-&gt;version.drv_version = 0;</div><div class='add'>+</div><div class='add'>+	err = esd_usb_send_msg(dev, msg);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "sending version message failed\n");</div><div class='add'>+		goto free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = esd_usb_wait_msg(dev, msg);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "no version message answer\n");</div><div class='add'>+		goto free_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev-&gt;net_count = (int)msg-&gt;version_reply.nets;</div><div class='add'>+	dev-&gt;version = le32_to_cpu(msg-&gt;version_reply.version);</div><div class='add'>+</div><div class='add'>+	if (device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_firmware))</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+			"Couldn't create device file for firmware\n");</div><div class='add'>+</div><div class='add'>+	if (device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_hardware))</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+			"Couldn't create device file for hardware\n");</div><div class='add'>+</div><div class='add'>+	if (device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_nets))</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+			"Couldn't create device file for nets\n");</div><div class='add'>+</div><div class='add'>+	/* do per device probing */</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;net_count; i++)</div><div class='add'>+		esd_usb_probe_one_net(intf, i);</div><div class='add'>+</div><div class='add'>+free_msg:</div><div class='add'>+	kfree(msg);</div><div class='add'>+	if (err)</div><div class='add'>+		kfree(dev);</div><div class='add'>+done:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called by the usb core when the device is removed from the system */</div><div class='add'>+static void esd_usb_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct esd_usb *dev = usb_get_intfdata(intf);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_firmware);</div><div class='add'>+	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_hardware);</div><div class='add'>+	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_nets);</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+</div><div class='add'>+	if (dev) {</div><div class='add'>+		dev-&gt;in_usb_disconnect = 1;</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;net_count; i++) {</div><div class='add'>+			if (dev-&gt;nets[i]) {</div><div class='add'>+				netdev = dev-&gt;nets[i]-&gt;netdev;</div><div class='add'>+				netdev_info(netdev, "unregister\n");</div><div class='add'>+				unregister_netdev(netdev);</div><div class='add'>+				free_candev(netdev);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		unlink_all_urbs(dev);</div><div class='add'>+		kfree(dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* usb specific object needed to register this driver with the usb subsystem */</div><div class='add'>+static struct usb_driver esd_usb_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.probe = esd_usb_probe,</div><div class='add'>+	.disconnect = esd_usb_disconnect,</div><div class='add'>+	.id_table = esd_usb_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_usb_driver(esd_usb_driver);</div><div class='head'>diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c<br/>deleted file mode 100644<br/>index b5d7ed21d7d9..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/esd_usb2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/esd_usb2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1141 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-/*</div><div class='del'>- * CAN driver for esd CAN-USB/2 and CAN-USB/Micro</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010-2012 Matthias Fuchs &lt;matthias.fuchs@esd.eu&gt;, esd gmbh</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/usb.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/can.h&gt;</div><div class='del'>-#include &lt;linux/can/dev.h&gt;</div><div class='del'>-#include &lt;linux/can/error.h&gt;</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Matthias Fuchs &lt;matthias.fuchs@esd.eu&gt;");</div><div class='del'>-MODULE_DESCRIPTION("CAN driver for esd CAN-USB/2 and CAN-USB/Micro interfaces");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-</div><div class='del'>-/* Define these values to match your devices */</div><div class='del'>-#define USB_ESDGMBH_VENDOR_ID	0x0ab4</div><div class='del'>-#define USB_CANUSB2_PRODUCT_ID	0x0010</div><div class='del'>-#define USB_CANUSBM_PRODUCT_ID	0x0011</div><div class='del'>-</div><div class='del'>-#define ESD_USB2_CAN_CLOCK	60000000</div><div class='del'>-#define ESD_USBM_CAN_CLOCK	36000000</div><div class='del'>-#define ESD_USB2_MAX_NETS	2</div><div class='del'>-</div><div class='del'>-/* USB2 commands */</div><div class='del'>-#define CMD_VERSION		1 /* also used for VERSION_REPLY */</div><div class='del'>-#define CMD_CAN_RX		2 /* device to host only */</div><div class='del'>-#define CMD_CAN_TX		3 /* also used for TX_DONE */</div><div class='del'>-#define CMD_SETBAUD		4 /* also used for SETBAUD_REPLY */</div><div class='del'>-#define CMD_TS			5 /* also used for TS_REPLY */</div><div class='del'>-#define CMD_IDADD		6 /* also used for IDADD_REPLY */</div><div class='del'>-</div><div class='del'>-/* esd CAN message flags - dlc field */</div><div class='del'>-#define ESD_RTR			0x10</div><div class='del'>-</div><div class='del'>-/* esd CAN message flags - id field */</div><div class='del'>-#define ESD_EXTID		0x20000000</div><div class='del'>-#define ESD_EVENT		0x40000000</div><div class='del'>-#define ESD_IDMASK		0x1fffffff</div><div class='del'>-</div><div class='del'>-/* esd CAN event ids used by this driver */</div><div class='del'>-#define ESD_EV_CAN_ERROR_EXT	2</div><div class='del'>-</div><div class='del'>-/* baudrate message flags */</div><div class='del'>-#define ESD_USB2_UBR		0x80000000</div><div class='del'>-#define ESD_USB2_LOM		0x40000000</div><div class='del'>-#define ESD_USB2_NO_BAUDRATE	0x7fffffff</div><div class='del'>-#define ESD_USB2_TSEG1_MIN	1</div><div class='del'>-#define ESD_USB2_TSEG1_MAX	16</div><div class='del'>-#define ESD_USB2_TSEG1_SHIFT	16</div><div class='del'>-#define ESD_USB2_TSEG2_MIN	1</div><div class='del'>-#define ESD_USB2_TSEG2_MAX	8</div><div class='del'>-#define ESD_USB2_TSEG2_SHIFT	20</div><div class='del'>-#define ESD_USB2_SJW_MAX	4</div><div class='del'>-#define ESD_USB2_SJW_SHIFT	14</div><div class='del'>-#define ESD_USBM_SJW_SHIFT	24</div><div class='del'>-#define ESD_USB2_BRP_MIN	1</div><div class='del'>-#define ESD_USB2_BRP_MAX	1024</div><div class='del'>-#define ESD_USB2_BRP_INC	1</div><div class='del'>-#define ESD_USB2_3_SAMPLES	0x00800000</div><div class='del'>-</div><div class='del'>-/* esd IDADD message */</div><div class='del'>-#define ESD_ID_ENABLE		0x80</div><div class='del'>-#define ESD_MAX_ID_SEGMENT	64</div><div class='del'>-</div><div class='del'>-/* SJA1000 ECC register (emulated by usb2 firmware) */</div><div class='del'>-#define SJA1000_ECC_SEG		0x1F</div><div class='del'>-#define SJA1000_ECC_DIR		0x20</div><div class='del'>-#define SJA1000_ECC_ERR		0x06</div><div class='del'>-#define SJA1000_ECC_BIT		0x00</div><div class='del'>-#define SJA1000_ECC_FORM	0x40</div><div class='del'>-#define SJA1000_ECC_STUFF	0x80</div><div class='del'>-#define SJA1000_ECC_MASK	0xc0</div><div class='del'>-</div><div class='del'>-/* esd bus state event codes */</div><div class='del'>-#define ESD_BUSSTATE_MASK	0xc0</div><div class='del'>-#define ESD_BUSSTATE_WARN	0x40</div><div class='del'>-#define ESD_BUSSTATE_ERRPASSIVE	0x80</div><div class='del'>-#define ESD_BUSSTATE_BUSOFF	0xc0</div><div class='del'>-</div><div class='del'>-#define RX_BUFFER_SIZE		1024</div><div class='del'>-#define MAX_RX_URBS		4</div><div class='del'>-#define MAX_TX_URBS		16 /* must be power of 2 */</div><div class='del'>-</div><div class='del'>-struct header_msg {</div><div class='del'>-	u8 len; /* len is always the total message length in 32bit words */</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 rsvd[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct version_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 rsvd;</div><div class='del'>-	u8 flags;</div><div class='del'>-	__le32 drv_version;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct version_reply_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 nets;</div><div class='del'>-	u8 features;</div><div class='del'>-	__le32 version;</div><div class='del'>-	u8 name[16];</div><div class='del'>-	__le32 rsvd;</div><div class='del'>-	__le32 ts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rx_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 net;</div><div class='del'>-	u8 dlc;</div><div class='del'>-	__le32 ts;</div><div class='del'>-	__le32 id; /* upper 3 bits contain flags */</div><div class='del'>-	u8 data[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tx_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 net;</div><div class='del'>-	u8 dlc;</div><div class='del'>-	u32 hnd;	/* opaque handle, not used by device */</div><div class='del'>-	__le32 id; /* upper 3 bits contain flags */</div><div class='del'>-	u8 data[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tx_done_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 net;</div><div class='del'>-	u8 status;</div><div class='del'>-	u32 hnd;	/* opaque handle, not used by device */</div><div class='del'>-	__le32 ts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct id_filter_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 net;</div><div class='del'>-	u8 option;</div><div class='del'>-	__le32 mask[ESD_MAX_ID_SEGMENT + 1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct set_baudrate_msg {</div><div class='del'>-	u8 len;</div><div class='del'>-	u8 cmd;</div><div class='del'>-	u8 net;</div><div class='del'>-	u8 rsvd;</div><div class='del'>-	__le32 baud;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Main message type used between library and application */</div><div class='del'>-struct __attribute__ ((packed)) esd_usb2_msg {</div><div class='del'>-	union {</div><div class='del'>-		struct header_msg hdr;</div><div class='del'>-		struct version_msg version;</div><div class='del'>-		struct version_reply_msg version_reply;</div><div class='del'>-		struct rx_msg rx;</div><div class='del'>-		struct tx_msg tx;</div><div class='del'>-		struct tx_done_msg txdone;</div><div class='del'>-		struct set_baudrate_msg setbaud;</div><div class='del'>-		struct id_filter_msg filter;</div><div class='del'>-	} msg;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct usb_device_id esd_usb2_table[] = {</div><div class='del'>-	{USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSB2_PRODUCT_ID)},</div><div class='del'>-	{USB_DEVICE(USB_ESDGMBH_VENDOR_ID, USB_CANUSBM_PRODUCT_ID)},</div><div class='del'>-	{}</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(usb, esd_usb2_table);</div><div class='del'>-</div><div class='del'>-struct esd_usb2_net_priv;</div><div class='del'>-</div><div class='del'>-struct esd_tx_urb_context {</div><div class='del'>-	struct esd_usb2_net_priv *priv;</div><div class='del'>-	u32 echo_index;</div><div class='del'>-	int dlc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct esd_usb2 {</div><div class='del'>-	struct usb_device *udev;</div><div class='del'>-	struct esd_usb2_net_priv *nets[ESD_USB2_MAX_NETS];</div><div class='del'>-</div><div class='del'>-	struct usb_anchor rx_submitted;</div><div class='del'>-</div><div class='del'>-	int net_count;</div><div class='del'>-	u32 version;</div><div class='del'>-	int rxinitdone;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct esd_usb2_net_priv {</div><div class='del'>-	struct can_priv can; /* must be the first member */</div><div class='del'>-</div><div class='del'>-	atomic_t active_tx_jobs;</div><div class='del'>-	struct usb_anchor tx_submitted;</div><div class='del'>-	struct esd_tx_urb_context tx_contexts[MAX_TX_URBS];</div><div class='del'>-</div><div class='del'>-	struct esd_usb2 *usb2;</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	int index;</div><div class='del'>-	u8 old_state;</div><div class='del'>-	struct can_berr_counter bec;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv,</div><div class='del'>-			      struct esd_usb2_msg *msg)</div><div class='del'>-{</div><div class='del'>-	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	u32 id = le32_to_cpu(msg-&gt;msg.rx.id) &amp; ESD_IDMASK;</div><div class='del'>-</div><div class='del'>-	if (id == ESD_EV_CAN_ERROR_EXT) {</div><div class='del'>-		u8 state = msg-&gt;msg.rx.data[0];</div><div class='del'>-		u8 ecc = msg-&gt;msg.rx.data[1];</div><div class='del'>-		u8 txerr = msg-&gt;msg.rx.data[2];</div><div class='del'>-		u8 rxerr = msg-&gt;msg.rx.data[3];</div><div class='del'>-</div><div class='del'>-		skb = alloc_can_err_skb(priv-&gt;netdev, &amp;cf);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			stats-&gt;rx_dropped++;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (state != priv-&gt;old_state) {</div><div class='del'>-			priv-&gt;old_state = state;</div><div class='del'>-</div><div class='del'>-			switch (state &amp; ESD_BUSSTATE_MASK) {</div><div class='del'>-			case ESD_BUSSTATE_BUSOFF:</div><div class='del'>-				priv-&gt;can.state = CAN_STATE_BUS_OFF;</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='del'>-				priv-&gt;can.can_stats.bus_off++;</div><div class='del'>-				can_bus_off(priv-&gt;netdev);</div><div class='del'>-				break;</div><div class='del'>-			case ESD_BUSSTATE_WARN:</div><div class='del'>-				priv-&gt;can.state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-				priv-&gt;can.can_stats.error_warning++;</div><div class='del'>-				break;</div><div class='del'>-			case ESD_BUSSTATE_ERRPASSIVE:</div><div class='del'>-				priv-&gt;can.state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-				priv-&gt;can.can_stats.error_passive++;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;can.can_stats.bus_error++;</div><div class='del'>-			stats-&gt;rx_errors++;</div><div class='del'>-</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='del'>-</div><div class='del'>-			switch (ecc &amp; SJA1000_ECC_MASK) {</div><div class='del'>-			case SJA1000_ECC_BIT:</div><div class='del'>-				cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='del'>-				break;</div><div class='del'>-			case SJA1000_ECC_FORM:</div><div class='del'>-				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='del'>-				break;</div><div class='del'>-			case SJA1000_ECC_STUFF:</div><div class='del'>-				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				cf-&gt;data[3] = ecc &amp; SJA1000_ECC_SEG;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Error occurred during transmission? */</div><div class='del'>-			if (!(ecc &amp; SJA1000_ECC_DIR))</div><div class='del'>-				cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;can.state == CAN_STATE_ERROR_WARNING ||</div><div class='del'>-			    priv-&gt;can.state == CAN_STATE_ERROR_PASSIVE) {</div><div class='del'>-				cf-&gt;data[1] = (txerr &gt; rxerr) ?</div><div class='del'>-					CAN_ERR_CRTL_TX_PASSIVE :</div><div class='del'>-					CAN_ERR_CRTL_RX_PASSIVE;</div><div class='del'>-			}</div><div class='del'>-			cf-&gt;data[6] = txerr;</div><div class='del'>-			cf-&gt;data[7] = rxerr;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;bec.txerr = txerr;</div><div class='del'>-		priv-&gt;bec.rxerr = rxerr;</div><div class='del'>-</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void esd_usb2_rx_can_msg(struct esd_usb2_net_priv *priv,</div><div class='del'>-				struct esd_usb2_msg *msg)</div><div class='del'>-{</div><div class='del'>-	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	int i;</div><div class='del'>-	u32 id;</div><div class='del'>-</div><div class='del'>-	if (!netif_device_present(priv-&gt;netdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	id = le32_to_cpu(msg-&gt;msg.rx.id);</div><div class='del'>-</div><div class='del'>-	if (id &amp; ESD_EVENT) {</div><div class='del'>-		esd_usb2_rx_event(priv, msg);</div><div class='del'>-	} else {</div><div class='del'>-		skb = alloc_can_skb(priv-&gt;netdev, &amp;cf);</div><div class='del'>-		if (skb == NULL) {</div><div class='del'>-			stats-&gt;rx_dropped++;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cf-&gt;can_id = id &amp; ESD_IDMASK;</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(msg-&gt;msg.rx.dlc &amp; ~ESD_RTR);</div><div class='del'>-</div><div class='del'>-		if (id &amp; ESD_EXTID)</div><div class='del'>-			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='del'>-</div><div class='del'>-		if (msg-&gt;msg.rx.dlc &amp; ESD_RTR) {</div><div class='del'>-			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-		} else {</div><div class='del'>-			for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='del'>-				cf-&gt;data[i] = msg-&gt;msg.rx.data[i];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-		netif_rx(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void esd_usb2_tx_done_msg(struct esd_usb2_net_priv *priv,</div><div class='del'>-				 struct esd_usb2_msg *msg)</div><div class='del'>-{</div><div class='del'>-	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='del'>-	struct net_device *netdev = priv-&gt;netdev;</div><div class='del'>-	struct esd_tx_urb_context *context;</div><div class='del'>-</div><div class='del'>-	if (!netif_device_present(netdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	context = &amp;priv-&gt;tx_contexts[msg-&gt;msg.txdone.hnd &amp; (MAX_TX_URBS - 1)];</div><div class='del'>-</div><div class='del'>-	if (!msg-&gt;msg.txdone.status) {</div><div class='del'>-		stats-&gt;tx_packets++;</div><div class='del'>-		stats-&gt;tx_bytes += context-&gt;dlc;</div><div class='del'>-		can_get_echo_skb(netdev, context-&gt;echo_index);</div><div class='del'>-	} else {</div><div class='del'>-		stats-&gt;tx_errors++;</div><div class='del'>-		can_free_echo_skb(netdev, context-&gt;echo_index);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Release context */</div><div class='del'>-	context-&gt;echo_index = MAX_TX_URBS;</div><div class='del'>-	atomic_dec(&amp;priv-&gt;active_tx_jobs);</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(netdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void esd_usb2_read_bulk_callback(struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2 *dev = urb-&gt;context;</div><div class='del'>-	int retval;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	switch (urb-&gt;status) {</div><div class='del'>-	case 0: /* success */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case -ENOENT:</div><div class='del'>-	case -EPIPE:</div><div class='del'>-	case -EPROTO:</div><div class='del'>-	case -ESHUTDOWN:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_info(dev-&gt;udev-&gt;dev.parent,</div><div class='del'>-			 "Rx URB aborted (%d)\n", urb-&gt;status);</div><div class='del'>-		goto resubmit_urb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (pos &lt; urb-&gt;actual_length) {</div><div class='del'>-		struct esd_usb2_msg *msg;</div><div class='del'>-</div><div class='del'>-		msg = (struct esd_usb2_msg *)(urb-&gt;transfer_buffer + pos);</div><div class='del'>-</div><div class='del'>-		switch (msg-&gt;msg.hdr.cmd) {</div><div class='del'>-		case CMD_CAN_RX:</div><div class='del'>-			if (msg-&gt;msg.rx.net &gt;= dev-&gt;net_count) {</div><div class='del'>-				dev_err(dev-&gt;udev-&gt;dev.parent, "format error\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			esd_usb2_rx_can_msg(dev-&gt;nets[msg-&gt;msg.rx.net], msg);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CMD_CAN_TX:</div><div class='del'>-			if (msg-&gt;msg.txdone.net &gt;= dev-&gt;net_count) {</div><div class='del'>-				dev_err(dev-&gt;udev-&gt;dev.parent, "format error\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			esd_usb2_tx_done_msg(dev-&gt;nets[msg-&gt;msg.txdone.net],</div><div class='del'>-					     msg);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pos += msg-&gt;msg.hdr.len &lt;&lt; 2;</div><div class='del'>-</div><div class='del'>-		if (pos &gt; urb-&gt;actual_length) {</div><div class='del'>-			dev_err(dev-&gt;udev-&gt;dev.parent, "format error\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-resubmit_urb:</div><div class='del'>-	usb_fill_bulk_urb(urb, dev-&gt;udev, usb_rcvbulkpipe(dev-&gt;udev, 1),</div><div class='del'>-			  urb-&gt;transfer_buffer, RX_BUFFER_SIZE,</div><div class='del'>-			  esd_usb2_read_bulk_callback, dev);</div><div class='del'>-</div><div class='del'>-	retval = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='del'>-	if (retval == -ENODEV) {</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;net_count; i++) {</div><div class='del'>-			if (dev-&gt;nets[i])</div><div class='del'>-				netif_device_detach(dev-&gt;nets[i]-&gt;netdev);</div><div class='del'>-		}</div><div class='del'>-	} else if (retval) {</div><div class='del'>-		dev_err(dev-&gt;udev-&gt;dev.parent,</div><div class='del'>-			"failed resubmitting read bulk urb: %d\n", retval);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * callback for bulk IN urb</div><div class='del'>- */</div><div class='del'>-static void esd_usb2_write_bulk_callback(struct urb *urb)</div><div class='del'>-{</div><div class='del'>-	struct esd_tx_urb_context *context = urb-&gt;context;</div><div class='del'>-	struct esd_usb2_net_priv *priv;</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	size_t size = sizeof(struct esd_usb2_msg);</div><div class='del'>-</div><div class='del'>-	WARN_ON(!context);</div><div class='del'>-</div><div class='del'>-	priv = context-&gt;priv;</div><div class='del'>-	netdev = priv-&gt;netdev;</div><div class='del'>-</div><div class='del'>-	/* free up our allocated buffer */</div><div class='del'>-	usb_free_coherent(urb-&gt;dev, size,</div><div class='del'>-			  urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='del'>-</div><div class='del'>-	if (!netif_device_present(netdev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (urb-&gt;status)</div><div class='del'>-		netdev_info(netdev, "Tx URB aborted (%d)\n", urb-&gt;status);</div><div class='del'>-</div><div class='del'>-	netif_trans_update(netdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t show_firmware(struct device *d,</div><div class='del'>-			     struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(d);</div><div class='del'>-	struct esd_usb2 *dev = usb_get_intfdata(intf);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d.%d.%d\n",</div><div class='del'>-		       (dev-&gt;version &gt;&gt; 12) &amp; 0xf,</div><div class='del'>-		       (dev-&gt;version &gt;&gt; 8) &amp; 0xf,</div><div class='del'>-		       dev-&gt;version &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-static DEVICE_ATTR(firmware, 0444, show_firmware, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t show_hardware(struct device *d,</div><div class='del'>-			     struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(d);</div><div class='del'>-	struct esd_usb2 *dev = usb_get_intfdata(intf);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d.%d.%d\n",</div><div class='del'>-		       (dev-&gt;version &gt;&gt; 28) &amp; 0xf,</div><div class='del'>-		       (dev-&gt;version &gt;&gt; 24) &amp; 0xf,</div><div class='del'>-		       (dev-&gt;version &gt;&gt; 16) &amp; 0xff);</div><div class='del'>-}</div><div class='del'>-static DEVICE_ATTR(hardware, 0444, show_hardware, NULL);</div><div class='del'>-</div><div class='del'>-static ssize_t show_nets(struct device *d,</div><div class='del'>-			 struct device_attribute *attr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct usb_interface *intf = to_usb_interface(d);</div><div class='del'>-	struct esd_usb2 *dev = usb_get_intfdata(intf);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%d", dev-&gt;net_count);</div><div class='del'>-}</div><div class='del'>-static DEVICE_ATTR(nets, 0444, show_nets, NULL);</div><div class='del'>-</div><div class='del'>-static int esd_usb2_send_msg(struct esd_usb2 *dev, struct esd_usb2_msg *msg)</div><div class='del'>-{</div><div class='del'>-	int actual_length;</div><div class='del'>-</div><div class='del'>-	return usb_bulk_msg(dev-&gt;udev,</div><div class='del'>-			    usb_sndbulkpipe(dev-&gt;udev, 2),</div><div class='del'>-			    msg,</div><div class='del'>-			    msg-&gt;msg.hdr.len &lt;&lt; 2,</div><div class='del'>-			    &amp;actual_length,</div><div class='del'>-			    1000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_wait_msg(struct esd_usb2 *dev,</div><div class='del'>-			     struct esd_usb2_msg *msg)</div><div class='del'>-{</div><div class='del'>-	int actual_length;</div><div class='del'>-</div><div class='del'>-	return usb_bulk_msg(dev-&gt;udev,</div><div class='del'>-			    usb_rcvbulkpipe(dev-&gt;udev, 1),</div><div class='del'>-			    msg,</div><div class='del'>-			    sizeof(*msg),</div><div class='del'>-			    &amp;actual_length,</div><div class='del'>-			    1000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev)</div><div class='del'>-{</div><div class='del'>-	int i, err = 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;rxinitdone)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_RX_URBS; i++) {</div><div class='del'>-		struct urb *urb = NULL;</div><div class='del'>-		u8 *buf = NULL;</div><div class='del'>-</div><div class='del'>-		/* create a URB, and a buffer for it */</div><div class='del'>-		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-		if (!urb) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		buf = usb_alloc_coherent(dev-&gt;udev, RX_BUFFER_SIZE, GFP_KERNEL,</div><div class='del'>-					 &amp;urb-&gt;transfer_dma);</div><div class='del'>-		if (!buf) {</div><div class='del'>-			dev_warn(dev-&gt;udev-&gt;dev.parent,</div><div class='del'>-				 "No memory left for USB buffer\n");</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto freeurb;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		usb_fill_bulk_urb(urb, dev-&gt;udev,</div><div class='del'>-				  usb_rcvbulkpipe(dev-&gt;udev, 1),</div><div class='del'>-				  buf, RX_BUFFER_SIZE,</div><div class='del'>-				  esd_usb2_read_bulk_callback, dev);</div><div class='del'>-		urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='del'>-		usb_anchor_urb(urb, &amp;dev-&gt;rx_submitted);</div><div class='del'>-</div><div class='del'>-		err = usb_submit_urb(urb, GFP_KERNEL);</div><div class='del'>-		if (err) {</div><div class='del'>-			usb_unanchor_urb(urb);</div><div class='del'>-			usb_free_coherent(dev-&gt;udev, RX_BUFFER_SIZE, buf,</div><div class='del'>-					  urb-&gt;transfer_dma);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-freeurb:</div><div class='del'>-		/* Drop reference, USB core will take care of freeing it */</div><div class='del'>-		usb_free_urb(urb);</div><div class='del'>-		if (err)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Did we submit any URBs */</div><div class='del'>-	if (i == 0) {</div><div class='del'>-		dev_err(dev-&gt;udev-&gt;dev.parent, "couldn't setup read URBs\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Warn if we've couldn't transmit all the URBs */</div><div class='del'>-	if (i &lt; MAX_RX_URBS) {</div><div class='del'>-		dev_warn(dev-&gt;udev-&gt;dev.parent,</div><div class='del'>-			 "rx performance may be slow\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;rxinitdone = 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Start interface</div><div class='del'>- */</div><div class='del'>-static int esd_usb2_start(struct esd_usb2_net_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2 *dev = priv-&gt;usb2;</div><div class='del'>-	struct net_device *netdev = priv-&gt;netdev;</div><div class='del'>-	struct esd_usb2_msg *msg;</div><div class='del'>-	int err, i;</div><div class='del'>-</div><div class='del'>-	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='del'>-	if (!msg) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Enable all IDs</div><div class='del'>-	 * The IDADD message takes up to 64 32 bit bitmasks (2048 bits).</div><div class='del'>-	 * Each bit represents one 11 bit CAN identifier. A set bit</div><div class='del'>-	 * enables reception of the corresponding CAN identifier. A cleared</div><div class='del'>-	 * bit disabled this identifier. An additional bitmask value</div><div class='del'>-	 * following the CAN 2.0A bits is used to enable reception of</div><div class='del'>-	 * extended CAN frames. Only the LSB of this final mask is checked</div><div class='del'>-	 * for the complete 29 bit ID range. The IDADD message also allows</div><div class='del'>-	 * filter configuration for an ID subset. In this case you can add</div><div class='del'>-	 * the number of the starting bitmask (0..64) to the filter.option</div><div class='del'>-	 * field followed by only some bitmasks.</div><div class='del'>-	 */</div><div class='del'>-	msg-&gt;msg.hdr.cmd = CMD_IDADD;</div><div class='del'>-	msg-&gt;msg.hdr.len = 2 + ESD_MAX_ID_SEGMENT;</div><div class='del'>-	msg-&gt;msg.filter.net = priv-&gt;index;</div><div class='del'>-	msg-&gt;msg.filter.option = ESD_ID_ENABLE; /* start with segment 0 */</div><div class='del'>-	for (i = 0; i &lt; ESD_MAX_ID_SEGMENT; i++)</div><div class='del'>-		msg-&gt;msg.filter.mask[i] = cpu_to_le32(0xffffffff);</div><div class='del'>-	/* enable 29bit extended IDs */</div><div class='del'>-	msg-&gt;msg.filter.mask[ESD_MAX_ID_SEGMENT] = cpu_to_le32(0x00000001);</div><div class='del'>-</div><div class='del'>-	err = esd_usb2_send_msg(dev, msg);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = esd_usb2_setup_rx_urbs(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	if (err == -ENODEV)</div><div class='del'>-		netif_device_detach(netdev);</div><div class='del'>-	if (err)</div><div class='del'>-		netdev_err(netdev, "couldn't start device: %d\n", err);</div><div class='del'>-</div><div class='del'>-	kfree(msg);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unlink_all_urbs(struct esd_usb2 *dev)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2_net_priv *priv;</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	usb_kill_anchored_urbs(&amp;dev-&gt;rx_submitted);</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;net_count; i++) {</div><div class='del'>-		priv = dev-&gt;nets[i];</div><div class='del'>-		if (priv) {</div><div class='del'>-			usb_kill_anchored_urbs(&amp;priv-&gt;tx_submitted);</div><div class='del'>-			atomic_set(&amp;priv-&gt;active_tx_jobs, 0);</div><div class='del'>-</div><div class='del'>-			for (j = 0; j &lt; MAX_TX_URBS; j++)</div><div class='del'>-				priv-&gt;tx_contexts[j].echo_index = MAX_TX_URBS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_open(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* common open */</div><div class='del'>-	err = open_candev(netdev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* finally start device */</div><div class='del'>-	err = esd_usb2_start(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_warn(netdev, "couldn't start device: %d\n", err);</div><div class='del'>-		close_candev(netdev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_start_queue(netdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb,</div><div class='del'>-				      struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	struct esd_usb2 *dev = priv-&gt;usb2;</div><div class='del'>-	struct esd_tx_urb_context *context = NULL;</div><div class='del'>-	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='del'>-	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='del'>-	struct esd_usb2_msg *msg;</div><div class='del'>-	struct urb *urb;</div><div class='del'>-	u8 *buf;</div><div class='del'>-	int i, err;</div><div class='del'>-	int ret = NETDEV_TX_OK;</div><div class='del'>-	size_t size = sizeof(struct esd_usb2_msg);</div><div class='del'>-</div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-</div><div class='del'>-	/* create a URB, and a buffer for it, and copy the data to the URB */</div><div class='del'>-	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='del'>-	if (!urb) {</div><div class='del'>-		stats-&gt;tx_dropped++;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		goto nourbmem;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buf = usb_alloc_coherent(dev-&gt;udev, size, GFP_ATOMIC,</div><div class='del'>-				 &amp;urb-&gt;transfer_dma);</div><div class='del'>-	if (!buf) {</div><div class='del'>-		netdev_err(netdev, "No memory left for USB buffer\n");</div><div class='del'>-		stats-&gt;tx_dropped++;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		goto nobufmem;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg = (struct esd_usb2_msg *)buf;</div><div class='del'>-</div><div class='del'>-	msg-&gt;msg.hdr.len = 3; /* minimal length */</div><div class='del'>-	msg-&gt;msg.hdr.cmd = CMD_CAN_TX;</div><div class='del'>-	msg-&gt;msg.tx.net = priv-&gt;index;</div><div class='del'>-	msg-&gt;msg.tx.dlc = cf-&gt;can_dlc;</div><div class='del'>-	msg-&gt;msg.tx.id = cpu_to_le32(cf-&gt;can_id &amp; CAN_ERR_MASK);</div><div class='del'>-</div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='del'>-		msg-&gt;msg.tx.dlc |= ESD_RTR;</div><div class='del'>-</div><div class='del'>-	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='del'>-		msg-&gt;msg.tx.id |= cpu_to_le32(ESD_EXTID);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cf-&gt;can_dlc; i++)</div><div class='del'>-		msg-&gt;msg.tx.data[i] = cf-&gt;data[i];</div><div class='del'>-</div><div class='del'>-	msg-&gt;msg.hdr.len += (cf-&gt;can_dlc + 3) &gt;&gt; 2;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_TX_URBS; i++) {</div><div class='del'>-		if (priv-&gt;tx_contexts[i].echo_index == MAX_TX_URBS) {</div><div class='del'>-			context = &amp;priv-&gt;tx_contexts[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This may never happen.</div><div class='del'>-	 */</div><div class='del'>-	if (!context) {</div><div class='del'>-		netdev_warn(netdev, "couldn't find free context\n");</div><div class='del'>-		ret = NETDEV_TX_BUSY;</div><div class='del'>-		goto releasebuf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	context-&gt;priv = priv;</div><div class='del'>-	context-&gt;echo_index = i;</div><div class='del'>-	context-&gt;dlc = cf-&gt;can_dlc;</div><div class='del'>-</div><div class='del'>-	/* hnd must not be 0 - MSB is stripped in txdone handling */</div><div class='del'>-	msg-&gt;msg.tx.hnd = 0x80000000 | i; /* returned in TX done message */</div><div class='del'>-</div><div class='del'>-	usb_fill_bulk_urb(urb, dev-&gt;udev, usb_sndbulkpipe(dev-&gt;udev, 2), buf,</div><div class='del'>-			  msg-&gt;msg.hdr.len &lt;&lt; 2,</div><div class='del'>-			  esd_usb2_write_bulk_callback, context);</div><div class='del'>-</div><div class='del'>-	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='del'>-</div><div class='del'>-	usb_anchor_urb(urb, &amp;priv-&gt;tx_submitted);</div><div class='del'>-</div><div class='del'>-	can_put_echo_skb(skb, netdev, context-&gt;echo_index);</div><div class='del'>-</div><div class='del'>-	atomic_inc(&amp;priv-&gt;active_tx_jobs);</div><div class='del'>-</div><div class='del'>-	/* Slow down tx path */</div><div class='del'>-	if (atomic_read(&amp;priv-&gt;active_tx_jobs) &gt;= MAX_TX_URBS)</div><div class='del'>-		netif_stop_queue(netdev);</div><div class='del'>-</div><div class='del'>-	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='del'>-	if (err) {</div><div class='del'>-		can_free_echo_skb(netdev, context-&gt;echo_index);</div><div class='del'>-</div><div class='del'>-		atomic_dec(&amp;priv-&gt;active_tx_jobs);</div><div class='del'>-		usb_unanchor_urb(urb);</div><div class='del'>-</div><div class='del'>-		stats-&gt;tx_dropped++;</div><div class='del'>-</div><div class='del'>-		if (err == -ENODEV)</div><div class='del'>-			netif_device_detach(netdev);</div><div class='del'>-		else</div><div class='del'>-			netdev_warn(netdev, "failed tx_urb %d\n", err);</div><div class='del'>-</div><div class='del'>-		goto releasebuf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_trans_update(netdev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Release our reference to this URB, the USB core will eventually free</div><div class='del'>-	 * it entirely.</div><div class='del'>-	 */</div><div class='del'>-	usb_free_urb(urb);</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-</div><div class='del'>-releasebuf:</div><div class='del'>-	usb_free_coherent(dev-&gt;udev, size, buf, urb-&gt;transfer_dma);</div><div class='del'>-</div><div class='del'>-nobufmem:</div><div class='del'>-	usb_free_urb(urb);</div><div class='del'>-</div><div class='del'>-nourbmem:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_close(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	struct esd_usb2_msg *msg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* Disable all IDs (see esd_usb2_start()) */</div><div class='del'>-	msg-&gt;msg.hdr.cmd = CMD_IDADD;</div><div class='del'>-	msg-&gt;msg.hdr.len = 2 + ESD_MAX_ID_SEGMENT;</div><div class='del'>-	msg-&gt;msg.filter.net = priv-&gt;index;</div><div class='del'>-	msg-&gt;msg.filter.option = ESD_ID_ENABLE; /* start with segment 0 */</div><div class='del'>-	for (i = 0; i &lt;= ESD_MAX_ID_SEGMENT; i++)</div><div class='del'>-		msg-&gt;msg.filter.mask[i] = 0;</div><div class='del'>-	if (esd_usb2_send_msg(priv-&gt;usb2, msg) &lt; 0)</div><div class='del'>-		netdev_err(netdev, "sending idadd message failed\n");</div><div class='del'>-</div><div class='del'>-	/* set CAN controller to reset mode */</div><div class='del'>-	msg-&gt;msg.hdr.len = 2;</div><div class='del'>-	msg-&gt;msg.hdr.cmd = CMD_SETBAUD;</div><div class='del'>-	msg-&gt;msg.setbaud.net = priv-&gt;index;</div><div class='del'>-	msg-&gt;msg.setbaud.rsvd = 0;</div><div class='del'>-	msg-&gt;msg.setbaud.baud = cpu_to_le32(ESD_USB2_NO_BAUDRATE);</div><div class='del'>-	if (esd_usb2_send_msg(priv-&gt;usb2, msg) &lt; 0)</div><div class='del'>-		netdev_err(netdev, "sending setbaud message failed\n");</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(netdev);</div><div class='del'>-</div><div class='del'>-	close_candev(netdev);</div><div class='del'>-</div><div class='del'>-	kfree(msg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops esd_usb2_netdev_ops = {</div><div class='del'>-	.ndo_open = esd_usb2_open,</div><div class='del'>-	.ndo_stop = esd_usb2_close,</div><div class='del'>-	.ndo_start_xmit = esd_usb2_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct can_bittiming_const esd_usb2_bittiming_const = {</div><div class='del'>-	.name = "esd_usb2",</div><div class='del'>-	.tseg1_min = ESD_USB2_TSEG1_MIN,</div><div class='del'>-	.tseg1_max = ESD_USB2_TSEG1_MAX,</div><div class='del'>-	.tseg2_min = ESD_USB2_TSEG2_MIN,</div><div class='del'>-	.tseg2_max = ESD_USB2_TSEG2_MAX,</div><div class='del'>-	.sjw_max = ESD_USB2_SJW_MAX,</div><div class='del'>-	.brp_min = ESD_USB2_BRP_MIN,</div><div class='del'>-	.brp_max = ESD_USB2_BRP_MAX,</div><div class='del'>-	.brp_inc = ESD_USB2_BRP_INC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int esd_usb2_set_bittiming(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='del'>-	struct esd_usb2_msg *msg;</div><div class='del'>-	int err;</div><div class='del'>-	u32 canbtr;</div><div class='del'>-	int sjw_shift;</div><div class='del'>-</div><div class='del'>-	canbtr = ESD_USB2_UBR;</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='del'>-		canbtr |= ESD_USB2_LOM;</div><div class='del'>-</div><div class='del'>-	canbtr |= (bt-&gt;brp - 1) &amp; (ESD_USB2_BRP_MAX - 1);</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(priv-&gt;usb2-&gt;udev-&gt;descriptor.idProduct) ==</div><div class='del'>-	    USB_CANUSBM_PRODUCT_ID)</div><div class='del'>-		sjw_shift = ESD_USBM_SJW_SHIFT;</div><div class='del'>-	else</div><div class='del'>-		sjw_shift = ESD_USB2_SJW_SHIFT;</div><div class='del'>-</div><div class='del'>-	canbtr |= ((bt-&gt;sjw - 1) &amp; (ESD_USB2_SJW_MAX - 1))</div><div class='del'>-		&lt;&lt; sjw_shift;</div><div class='del'>-	canbtr |= ((bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1)</div><div class='del'>-		   &amp; (ESD_USB2_TSEG1_MAX - 1))</div><div class='del'>-		&lt;&lt; ESD_USB2_TSEG1_SHIFT;</div><div class='del'>-	canbtr |= ((bt-&gt;phase_seg2 - 1) &amp; (ESD_USB2_TSEG2_MAX - 1))</div><div class='del'>-		&lt;&lt; ESD_USB2_TSEG2_SHIFT;</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='del'>-		canbtr |= ESD_USB2_3_SAMPLES;</div><div class='del'>-</div><div class='del'>-	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	msg-&gt;msg.hdr.len = 2;</div><div class='del'>-	msg-&gt;msg.hdr.cmd = CMD_SETBAUD;</div><div class='del'>-	msg-&gt;msg.setbaud.net = priv-&gt;index;</div><div class='del'>-	msg-&gt;msg.setbaud.rsvd = 0;</div><div class='del'>-	msg-&gt;msg.setbaud.baud = cpu_to_le32(canbtr);</div><div class='del'>-</div><div class='del'>-	netdev_info(netdev, "setting BTR=%#x\n", canbtr);</div><div class='del'>-</div><div class='del'>-	err = esd_usb2_send_msg(priv-&gt;usb2, msg);</div><div class='del'>-</div><div class='del'>-	kfree(msg);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_get_berr_counter(const struct net_device *netdev,</div><div class='del'>-				     struct can_berr_counter *bec)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-</div><div class='del'>-	bec-&gt;txerr = priv-&gt;bec.txerr;</div><div class='del'>-	bec-&gt;rxerr = priv-&gt;bec.rxerr;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_set_mode(struct net_device *netdev, enum can_mode mode)</div><div class='del'>-{</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case CAN_MODE_START:</div><div class='del'>-		netif_wake_queue(netdev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int esd_usb2_probe_one_net(struct usb_interface *intf, int index)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2 *dev = usb_get_intfdata(intf);</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	struct esd_usb2_net_priv *priv;</div><div class='del'>-	int err = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	netdev = alloc_candev(sizeof(*priv), MAX_TX_URBS);</div><div class='del'>-	if (!netdev) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "couldn't alloc candev\n");</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(netdev);</div><div class='del'>-</div><div class='del'>-	init_usb_anchor(&amp;priv-&gt;tx_submitted);</div><div class='del'>-	atomic_set(&amp;priv-&gt;active_tx_jobs, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_TX_URBS; i++)</div><div class='del'>-		priv-&gt;tx_contexts[i].echo_index = MAX_TX_URBS;</div><div class='del'>-</div><div class='del'>-	priv-&gt;usb2 = dev;</div><div class='del'>-	priv-&gt;netdev = netdev;</div><div class='del'>-	priv-&gt;index = index;</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='del'>-	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY;</div><div class='del'>-</div><div class='del'>-	if (le16_to_cpu(dev-&gt;udev-&gt;descriptor.idProduct) ==</div><div class='del'>-	    USB_CANUSBM_PRODUCT_ID)</div><div class='del'>-		priv-&gt;can.clock.freq = ESD_USBM_CAN_CLOCK;</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;can.clock.freq = ESD_USB2_CAN_CLOCK;</div><div class='del'>-		priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;can.bittiming_const = &amp;esd_usb2_bittiming_const;</div><div class='del'>-	priv-&gt;can.do_set_bittiming = esd_usb2_set_bittiming;</div><div class='del'>-	priv-&gt;can.do_set_mode = esd_usb2_set_mode;</div><div class='del'>-	priv-&gt;can.do_get_berr_counter = esd_usb2_get_berr_counter;</div><div class='del'>-</div><div class='del'>-	netdev-&gt;flags |= IFF_ECHO; /* we support local echo */</div><div class='del'>-</div><div class='del'>-	netdev-&gt;netdev_ops = &amp;esd_usb2_netdev_ops;</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='del'>-	netdev-&gt;dev_id = index;</div><div class='del'>-</div><div class='del'>-	err = register_candev(netdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "couldn't register CAN device: %d\n", err);</div><div class='del'>-		free_candev(netdev);</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;nets[index] = priv;</div><div class='del'>-	netdev_info(netdev, "device %s registered\n", netdev-&gt;name);</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * probe function for new USB2 devices</div><div class='del'>- *</div><div class='del'>- * check version information and number of available</div><div class='del'>- * CAN interfaces</div><div class='del'>- */</div><div class='del'>-static int esd_usb2_probe(struct usb_interface *intf,</div><div class='del'>-			 const struct usb_device_id *id)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2 *dev;</div><div class='del'>-	struct esd_usb2_msg *msg;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;udev = interface_to_usbdev(intf);</div><div class='del'>-</div><div class='del'>-	init_usb_anchor(&amp;dev-&gt;rx_submitted);</div><div class='del'>-</div><div class='del'>-	usb_set_intfdata(intf, dev);</div><div class='del'>-</div><div class='del'>-	msg = kmalloc(sizeof(*msg), GFP_KERNEL);</div><div class='del'>-	if (!msg) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto free_msg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* query number of CAN interfaces (nets) */</div><div class='del'>-	msg-&gt;msg.hdr.cmd = CMD_VERSION;</div><div class='del'>-	msg-&gt;msg.hdr.len = 2;</div><div class='del'>-	msg-&gt;msg.version.rsvd = 0;</div><div class='del'>-	msg-&gt;msg.version.flags = 0;</div><div class='del'>-	msg-&gt;msg.version.drv_version = 0;</div><div class='del'>-</div><div class='del'>-	err = esd_usb2_send_msg(dev, msg);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "sending version message failed\n");</div><div class='del'>-		goto free_msg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = esd_usb2_wait_msg(dev, msg);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "no version message answer\n");</div><div class='del'>-		goto free_msg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;net_count = (int)msg-&gt;msg.version_reply.nets;</div><div class='del'>-	dev-&gt;version = le32_to_cpu(msg-&gt;msg.version_reply.version);</div><div class='del'>-</div><div class='del'>-	if (device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_firmware))</div><div class='del'>-		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Couldn't create device file for firmware\n");</div><div class='del'>-</div><div class='del'>-	if (device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_hardware))</div><div class='del'>-		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Couldn't create device file for hardware\n");</div><div class='del'>-</div><div class='del'>-	if (device_create_file(&amp;intf-&gt;dev, &amp;dev_attr_nets))</div><div class='del'>-		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Couldn't create device file for nets\n");</div><div class='del'>-</div><div class='del'>-	/* do per device probing */</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;net_count; i++)</div><div class='del'>-		esd_usb2_probe_one_net(intf, i);</div><div class='del'>-</div><div class='del'>-free_msg:</div><div class='del'>-	kfree(msg);</div><div class='del'>-	if (err)</div><div class='del'>-		kfree(dev);</div><div class='del'>-done:</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * called by the usb core when the device is removed from the system</div><div class='del'>- */</div><div class='del'>-static void esd_usb2_disconnect(struct usb_interface *intf)</div><div class='del'>-{</div><div class='del'>-	struct esd_usb2 *dev = usb_get_intfdata(intf);</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_firmware);</div><div class='del'>-	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_hardware);</div><div class='del'>-	device_remove_file(&amp;intf-&gt;dev, &amp;dev_attr_nets);</div><div class='del'>-</div><div class='del'>-	usb_set_intfdata(intf, NULL);</div><div class='del'>-</div><div class='del'>-	if (dev) {</div><div class='del'>-		for (i = 0; i &lt; dev-&gt;net_count; i++) {</div><div class='del'>-			if (dev-&gt;nets[i]) {</div><div class='del'>-				netdev = dev-&gt;nets[i]-&gt;netdev;</div><div class='del'>-				unregister_netdev(netdev);</div><div class='del'>-				free_candev(netdev);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		unlink_all_urbs(dev);</div><div class='del'>-		kfree(dev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* usb specific object needed to register this driver with the usb subsystem */</div><div class='del'>-static struct usb_driver esd_usb2_driver = {</div><div class='del'>-	.name = "esd_usb2",</div><div class='del'>-	.probe = esd_usb2_probe,</div><div class='del'>-	.disconnect = esd_usb2_disconnect,</div><div class='del'>-	.id_table = esd_usb2_table,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_usb_driver(esd_usb2_driver);</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/Makefile b/drivers/net/can/usb/etas_es58x/Makefile<br/>new file mode 100644<br/>index 000000000000..d6667ebe259f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+obj-$(CONFIG_CAN_ETAS_ES58X) += etas_es58x.o</div><div class='add'>+etas_es58x-y = es58x_core.o es58x_devlink.o es581_4.o es58x_fd.o</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es581_4.c b/drivers/net/can/usb/etas_es58x/es581_4.c<br/>new file mode 100644<br/>index 000000000000..1888ca1de7b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es581_4.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es581_4.c</a></div><div class='hunk'>@@ -0,0 +1,507 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es581_4.c: Adds support to ETAS ES581.4.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020 ETAS K.K.. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020-2022 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+</div><div class='add'>+#include "es58x_core.h"</div><div class='add'>+#include "es581_4.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es581_4_sizeof_rx_tx_msg() - Calculate the actual length of the</div><div class='add'>+ *	structure of a rx or tx message.</div><div class='add'>+ * @msg: message of variable length, must have a dlc field.</div><div class='add'>+ *</div><div class='add'>+ * Even if RTR frames have actually no payload, the ES58X devices</div><div class='add'>+ * still expect it. Must be a macro in order to accept several types</div><div class='add'>+ * (struct es581_4_tx_can_msg and struct es581_4_rx_can_msg) as an</div><div class='add'>+ * input.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the message.</div><div class='add'>+ */</div><div class='add'>+#define es581_4_sizeof_rx_tx_msg(msg)				\</div><div class='add'>+	offsetof(typeof(msg), data[can_cc_dlc2len((msg).dlc)])</div><div class='add'>+</div><div class='add'>+static u16 es581_4_get_msg_len(const union es58x_urb_cmd *urb_cmd)</div><div class='add'>+{</div><div class='add'>+	return get_unaligned_le16(&amp;urb_cmd-&gt;es581_4_urb_cmd.msg_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_echo_msg(struct es58x_device *es58x_dev,</div><div class='add'>+			    const struct es581_4_urb_cmd *es581_4_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	const struct es581_4_bulk_echo_msg *bulk_echo_msg;</div><div class='add'>+	const struct es581_4_echo_msg *echo_msg;</div><div class='add'>+	u64 *tstamps = es58x_dev-&gt;timestamps;</div><div class='add'>+	u16 msg_len;</div><div class='add'>+	u32 first_packet_idx, packet_idx;</div><div class='add'>+	unsigned int dropped = 0;</div><div class='add'>+	int i, num_element, ret;</div><div class='add'>+</div><div class='add'>+	bulk_echo_msg = &amp;es581_4_urb_cmd-&gt;bulk_echo_msg;</div><div class='add'>+	msg_len = get_unaligned_le16(&amp;es581_4_urb_cmd-&gt;msg_len) -</div><div class='add'>+	    sizeof(bulk_echo_msg-&gt;channel_no);</div><div class='add'>+	num_element = es58x_msg_num_element(es58x_dev-&gt;dev,</div><div class='add'>+					    bulk_echo_msg-&gt;echo_msg, msg_len);</div><div class='add'>+	if (num_element &lt;= 0)</div><div class='add'>+		return num_element;</div><div class='add'>+</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, bulk_echo_msg-&gt;channel_no,</div><div class='add'>+			       ES581_4_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	echo_msg = &amp;bulk_echo_msg-&gt;echo_msg[0];</div><div class='add'>+	first_packet_idx = get_unaligned_le32(&amp;echo_msg-&gt;packet_idx);</div><div class='add'>+	packet_idx = first_packet_idx;</div><div class='add'>+	for (i = 0; i &lt; num_element; i++) {</div><div class='add'>+		u32 tmp_idx;</div><div class='add'>+</div><div class='add'>+		echo_msg = &amp;bulk_echo_msg-&gt;echo_msg[i];</div><div class='add'>+		tmp_idx = get_unaligned_le32(&amp;echo_msg-&gt;packet_idx);</div><div class='add'>+		if (tmp_idx == packet_idx - 1) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				netdev_warn(netdev,</div><div class='add'>+					    "Received echo packet idx %u twice\n",</div><div class='add'>+					    packet_idx - 1);</div><div class='add'>+			dropped++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		if (tmp_idx != packet_idx) {</div><div class='add'>+			netdev_err(netdev, "Echo packet idx jumped from %u to %u\n",</div><div class='add'>+				   packet_idx - 1, echo_msg-&gt;packet_idx);</div><div class='add'>+			return -EBADMSG;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tstamps[i] = get_unaligned_le64(&amp;echo_msg-&gt;timestamp);</div><div class='add'>+		packet_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;stats.tx_dropped += dropped;</div><div class='add'>+	return es58x_can_get_echo_skb(netdev, first_packet_idx,</div><div class='add'>+				      tstamps, num_element - dropped);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_rx_can_msg(struct es58x_device *es58x_dev,</div><div class='add'>+			      const struct es581_4_urb_cmd *es581_4_urb_cmd,</div><div class='add'>+			      u16 msg_len)</div><div class='add'>+{</div><div class='add'>+	const struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int pkts, num_element, channel_no, ret;</div><div class='add'>+</div><div class='add'>+	num_element = es58x_msg_num_element(dev, es581_4_urb_cmd-&gt;rx_can_msg,</div><div class='add'>+					    msg_len);</div><div class='add'>+	if (num_element &lt;= 0)</div><div class='add'>+		return num_element;</div><div class='add'>+</div><div class='add'>+	channel_no = es581_4_urb_cmd-&gt;rx_can_msg[0].channel_no;</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, channel_no,</div><div class='add'>+			       ES581_4_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(netdev)) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_info(netdev,</div><div class='add'>+				    "%s: %s is down, dropping %d rx packets\n",</div><div class='add'>+				    __func__, netdev-&gt;name, num_element);</div><div class='add'>+		netdev-&gt;stats.rx_dropped += num_element;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (pkts = 0; pkts &lt; num_element; pkts++) {</div><div class='add'>+		const struct es581_4_rx_can_msg *rx_can_msg =</div><div class='add'>+		    &amp;es581_4_urb_cmd-&gt;rx_can_msg[pkts];</div><div class='add'>+		u64 tstamp = get_unaligned_le64(&amp;rx_can_msg-&gt;timestamp);</div><div class='add'>+		canid_t can_id = get_unaligned_le32(&amp;rx_can_msg-&gt;can_id);</div><div class='add'>+</div><div class='add'>+		if (channel_no != rx_can_msg-&gt;channel_no)</div><div class='add'>+			return -EBADMSG;</div><div class='add'>+</div><div class='add'>+		ret = es58x_rx_can_msg(netdev, tstamp, rx_can_msg-&gt;data,</div><div class='add'>+				       can_id, rx_can_msg-&gt;flags,</div><div class='add'>+				       rx_can_msg-&gt;dlc);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_rx_err_msg(struct es58x_device *es58x_dev,</div><div class='add'>+			      const struct es581_4_rx_err_msg *rx_err_msg)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	enum es58x_err error = get_unaligned_le32(&amp;rx_err_msg-&gt;error);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, rx_err_msg-&gt;channel_no,</div><div class='add'>+			       ES581_4_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_rx_err_msg(netdev, error, 0,</div><div class='add'>+				get_unaligned_le64(&amp;rx_err_msg-&gt;timestamp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_rx_event_msg(struct es58x_device *es58x_dev,</div><div class='add'>+				const struct es581_4_rx_event_msg *rx_event_msg)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	enum es58x_event event = get_unaligned_le32(&amp;rx_event_msg-&gt;event);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, rx_event_msg-&gt;channel_no,</div><div class='add'>+			       ES581_4_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_rx_err_msg(netdev, 0, event,</div><div class='add'>+				get_unaligned_le64(&amp;rx_event_msg-&gt;timestamp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_rx_cmd_ret_u32(struct es58x_device *es58x_dev,</div><div class='add'>+				  const struct es581_4_urb_cmd *es581_4_urb_cmd,</div><div class='add'>+				  enum es58x_ret_type ret_type)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	const struct es581_4_rx_cmd_ret *rx_cmd_ret;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es581_4_urb_cmd-&gt;msg_len);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_check_msg_len(es58x_dev-&gt;dev,</div><div class='add'>+				  es581_4_urb_cmd-&gt;rx_cmd_ret, msg_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rx_cmd_ret = &amp;es581_4_urb_cmd-&gt;rx_cmd_ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, rx_cmd_ret-&gt;channel_no,</div><div class='add'>+			       ES581_4_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_rx_cmd_ret_u32(netdev, ret_type,</div><div class='add'>+				    get_unaligned_le32(&amp;rx_cmd_ret-&gt;rx_cmd_ret_le32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_tx_ack_msg(struct es58x_device *es58x_dev,</div><div class='add'>+			      const struct es581_4_urb_cmd *es581_4_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	const struct es581_4_tx_ack_msg *tx_ack_msg;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es581_4_urb_cmd-&gt;msg_len);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tx_ack_msg = &amp;es581_4_urb_cmd-&gt;tx_ack_msg;</div><div class='add'>+	ret = es58x_check_msg_len(es58x_dev-&gt;dev, *tx_ack_msg, msg_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (tx_ack_msg-&gt;rx_cmd_ret_u8 != ES58X_RET_U8_OK)</div><div class='add'>+		return es58x_rx_cmd_ret_u8(es58x_dev-&gt;dev,</div><div class='add'>+					   ES58X_RET_TYPE_TX_MSG,</div><div class='add'>+					   tx_ack_msg-&gt;rx_cmd_ret_u8);</div><div class='add'>+</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, tx_ack_msg-&gt;channel_no,</div><div class='add'>+			       ES581_4_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_tx_ack_msg(netdev,</div><div class='add'>+				get_unaligned_le16(&amp;tx_ack_msg-&gt;tx_free_entries),</div><div class='add'>+				ES58X_RET_U32_OK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_dispatch_rx_cmd(struct es58x_device *es58x_dev,</div><div class='add'>+				   const struct es581_4_urb_cmd *es581_4_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	const struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es581_4_urb_cmd-&gt;msg_len);</div><div class='add'>+	enum es581_4_rx_type rx_type = es581_4_urb_cmd-&gt;rx_can_msg[0].rx_type;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (rx_type) {</div><div class='add'>+	case ES581_4_RX_TYPE_MESSAGE:</div><div class='add'>+		return es581_4_rx_can_msg(es58x_dev, es581_4_urb_cmd, msg_len);</div><div class='add'>+</div><div class='add'>+	case ES581_4_RX_TYPE_ERROR:</div><div class='add'>+		ret = es58x_check_msg_len(dev, es581_4_urb_cmd-&gt;rx_err_msg,</div><div class='add'>+					  msg_len);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		return es581_4_rx_err_msg(es58x_dev,</div><div class='add'>+					  &amp;es581_4_urb_cmd-&gt;rx_err_msg);</div><div class='add'>+</div><div class='add'>+	case ES581_4_RX_TYPE_EVENT:</div><div class='add'>+		ret = es58x_check_msg_len(dev, es581_4_urb_cmd-&gt;rx_event_msg,</div><div class='add'>+					  msg_len);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		return es581_4_rx_event_msg(es58x_dev,</div><div class='add'>+					    &amp;es581_4_urb_cmd-&gt;rx_event_msg);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "%s: Unknown rx_type 0x%02X\n", __func__, rx_type);</div><div class='add'>+		return -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_handle_urb_cmd(struct es58x_device *es58x_dev,</div><div class='add'>+				  const union es58x_urb_cmd *urb_cmd)</div><div class='add'>+{</div><div class='add'>+	const struct es581_4_urb_cmd *es581_4_urb_cmd;</div><div class='add'>+	struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	u16 msg_len = es581_4_get_msg_len(urb_cmd);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	es581_4_urb_cmd = &amp;urb_cmd-&gt;es581_4_urb_cmd;</div><div class='add'>+</div><div class='add'>+	if (es581_4_urb_cmd-&gt;cmd_type != ES581_4_CAN_COMMAND_TYPE) {</div><div class='add'>+		dev_err(dev, "%s: Unknown command type (0x%02X)\n",</div><div class='add'>+			__func__, es581_4_urb_cmd-&gt;cmd_type);</div><div class='add'>+		return -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch ((enum es581_4_cmd_id)es581_4_urb_cmd-&gt;cmd_id) {</div><div class='add'>+	case ES581_4_CMD_ID_SET_BITTIMING:</div><div class='add'>+		return es581_4_rx_cmd_ret_u32(es58x_dev, es581_4_urb_cmd,</div><div class='add'>+					      ES58X_RET_TYPE_SET_BITTIMING);</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_ENABLE_CHANNEL:</div><div class='add'>+		return es581_4_rx_cmd_ret_u32(es58x_dev, es581_4_urb_cmd,</div><div class='add'>+					      ES58X_RET_TYPE_ENABLE_CHANNEL);</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_TX_MSG:</div><div class='add'>+		return es581_4_tx_ack_msg(es58x_dev, es581_4_urb_cmd);</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_RX_MSG:</div><div class='add'>+		return es581_4_dispatch_rx_cmd(es58x_dev, es581_4_urb_cmd);</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_RESET_RX:</div><div class='add'>+		ret = es581_4_rx_cmd_ret_u32(es58x_dev, es581_4_urb_cmd,</div><div class='add'>+					     ES58X_RET_TYPE_RESET_RX);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_RESET_TX:</div><div class='add'>+		ret = es581_4_rx_cmd_ret_u32(es58x_dev, es581_4_urb_cmd,</div><div class='add'>+					     ES58X_RET_TYPE_RESET_TX);</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_DISABLE_CHANNEL:</div><div class='add'>+		return es581_4_rx_cmd_ret_u32(es58x_dev, es581_4_urb_cmd,</div><div class='add'>+					      ES58X_RET_TYPE_DISABLE_CHANNEL);</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_TIMESTAMP:</div><div class='add'>+		ret = es58x_check_msg_len(dev, es581_4_urb_cmd-&gt;timestamp,</div><div class='add'>+					  msg_len);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		es58x_rx_timestamp(es58x_dev,</div><div class='add'>+				   get_unaligned_le64(&amp;es581_4_urb_cmd-&gt;timestamp));</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_ECHO:</div><div class='add'>+		return es581_4_echo_msg(es58x_dev, es581_4_urb_cmd);</div><div class='add'>+</div><div class='add'>+	case ES581_4_CMD_ID_DEVICE_ERR:</div><div class='add'>+		ret = es58x_check_msg_len(dev, es581_4_urb_cmd-&gt;rx_cmd_ret_u8,</div><div class='add'>+					  msg_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		return es58x_rx_cmd_ret_u8(dev, ES58X_RET_TYPE_DEVICE_ERR,</div><div class='add'>+					   es581_4_urb_cmd-&gt;rx_cmd_ret_u8);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(dev, "%s: Unexpected command ID: 0x%02X\n",</div><div class='add'>+			 __func__, es581_4_urb_cmd-&gt;cmd_id);</div><div class='add'>+		return -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void es581_4_fill_urb_header(union es58x_urb_cmd *urb_cmd, u8 cmd_type,</div><div class='add'>+				    u8 cmd_id, u8 channel_idx, u16 msg_len)</div><div class='add'>+{</div><div class='add'>+	struct es581_4_urb_cmd *es581_4_urb_cmd = &amp;urb_cmd-&gt;es581_4_urb_cmd;</div><div class='add'>+</div><div class='add'>+	es581_4_urb_cmd-&gt;SOF = cpu_to_le16(es581_4_param.tx_start_of_frame);</div><div class='add'>+	es581_4_urb_cmd-&gt;cmd_type = cmd_type;</div><div class='add'>+	es581_4_urb_cmd-&gt;cmd_id = cmd_id;</div><div class='add'>+	es581_4_urb_cmd-&gt;msg_len = cpu_to_le16(msg_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_tx_can_msg(struct es58x_priv *priv,</div><div class='add'>+			      const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+	union es58x_urb_cmd *urb_cmd = priv-&gt;tx_urb-&gt;transfer_buffer;</div><div class='add'>+	struct es581_4_urb_cmd *es581_4_urb_cmd = &amp;urb_cmd-&gt;es581_4_urb_cmd;</div><div class='add'>+	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	struct es581_4_tx_can_msg *tx_can_msg;</div><div class='add'>+	u16 msg_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb))</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_can_msg_cnt == 0) {</div><div class='add'>+		msg_len = sizeof(es581_4_urb_cmd-&gt;bulk_tx_can_msg.num_can_msg);</div><div class='add'>+		es581_4_fill_urb_header(urb_cmd, ES581_4_CAN_COMMAND_TYPE,</div><div class='add'>+					ES581_4_CMD_ID_TX_MSG,</div><div class='add'>+					priv-&gt;channel_idx, msg_len);</div><div class='add'>+		es581_4_urb_cmd-&gt;bulk_tx_can_msg.num_can_msg = 0;</div><div class='add'>+	} else {</div><div class='add'>+		msg_len = es581_4_get_msg_len(urb_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = es58x_check_msg_max_len(es58x_dev-&gt;dev,</div><div class='add'>+				      es581_4_urb_cmd-&gt;bulk_tx_can_msg,</div><div class='add'>+				      msg_len + sizeof(*tx_can_msg));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Fill message contents. */</div><div class='add'>+	tx_can_msg = (typeof(tx_can_msg))&amp;es581_4_urb_cmd-&gt;raw_msg[msg_len];</div><div class='add'>+	put_unaligned_le32(es58x_get_raw_can_id(cf), &amp;tx_can_msg-&gt;can_id);</div><div class='add'>+	put_unaligned_le32(priv-&gt;tx_head, &amp;tx_can_msg-&gt;packet_idx);</div><div class='add'>+	put_unaligned_le16((u16)es58x_get_flags(skb), &amp;tx_can_msg-&gt;flags);</div><div class='add'>+	tx_can_msg-&gt;channel_no = priv-&gt;channel_idx + ES581_4_CHANNEL_IDX_OFFSET;</div><div class='add'>+	tx_can_msg-&gt;dlc = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='add'>+</div><div class='add'>+	memcpy(tx_can_msg-&gt;data, cf-&gt;data, cf-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Calculate new sizes. */</div><div class='add'>+	es581_4_urb_cmd-&gt;bulk_tx_can_msg.num_can_msg++;</div><div class='add'>+	msg_len += es581_4_sizeof_rx_tx_msg(*tx_can_msg);</div><div class='add'>+	priv-&gt;tx_urb-&gt;transfer_buffer_length = es58x_get_urb_cmd_len(es58x_dev,</div><div class='add'>+								     msg_len);</div><div class='add'>+	es581_4_urb_cmd-&gt;msg_len = cpu_to_le16(msg_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_set_bittiming(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct es581_4_tx_conf_msg tx_conf_msg = { 0 };</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+</div><div class='add'>+	tx_conf_msg.bitrate = cpu_to_le32(bt-&gt;bitrate);</div><div class='add'>+	/* bt-&gt;sample_point is in tenth of percent. Convert it to percent. */</div><div class='add'>+	tx_conf_msg.sample_point = cpu_to_le32(bt-&gt;sample_point / 10U);</div><div class='add'>+	tx_conf_msg.samples_per_bit = cpu_to_le32(ES58X_SAMPLES_PER_BIT_ONE);</div><div class='add'>+	tx_conf_msg.bit_time = cpu_to_le32(can_bit_time(bt));</div><div class='add'>+	tx_conf_msg.sjw = cpu_to_le32(bt-&gt;sjw);</div><div class='add'>+	tx_conf_msg.sync_edge = cpu_to_le32(ES58X_SYNC_EDGE_SINGLE);</div><div class='add'>+	tx_conf_msg.physical_layer =</div><div class='add'>+	    cpu_to_le32(ES58X_PHYSICAL_LAYER_HIGH_SPEED);</div><div class='add'>+	tx_conf_msg.echo_mode = cpu_to_le32(ES58X_ECHO_ON);</div><div class='add'>+	tx_conf_msg.channel_no = priv-&gt;channel_idx + ES581_4_CHANNEL_IDX_OFFSET;</div><div class='add'>+</div><div class='add'>+	return es58x_send_msg(priv-&gt;es58x_dev, ES581_4_CAN_COMMAND_TYPE,</div><div class='add'>+			      ES581_4_CMD_ID_SET_BITTIMING, &amp;tx_conf_msg,</div><div class='add'>+			      sizeof(tx_conf_msg), priv-&gt;channel_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_enable_channel(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 msg = priv-&gt;channel_idx + ES581_4_CHANNEL_IDX_OFFSET;</div><div class='add'>+</div><div class='add'>+	ret = es581_4_set_bittiming(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_send_msg(priv-&gt;es58x_dev, ES581_4_CAN_COMMAND_TYPE,</div><div class='add'>+			      ES581_4_CMD_ID_ENABLE_CHANNEL, &amp;msg, sizeof(msg),</div><div class='add'>+			      priv-&gt;channel_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_disable_channel(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u8 msg = priv-&gt;channel_idx + ES581_4_CHANNEL_IDX_OFFSET;</div><div class='add'>+</div><div class='add'>+	return es58x_send_msg(priv-&gt;es58x_dev, ES581_4_CAN_COMMAND_TYPE,</div><div class='add'>+			      ES581_4_CMD_ID_DISABLE_CHANNEL, &amp;msg, sizeof(msg),</div><div class='add'>+			      priv-&gt;channel_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_reset_device(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	return es58x_send_msg(es58x_dev, ES581_4_CAN_COMMAND_TYPE,</div><div class='add'>+			      ES581_4_CMD_ID_RESET_DEVICE,</div><div class='add'>+			      ES58X_EMPTY_MSG, 0, ES58X_CHANNEL_IDX_NA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es581_4_get_timestamp(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	return es58x_send_msg(es58x_dev, ES581_4_CAN_COMMAND_TYPE,</div><div class='add'>+			      ES581_4_CMD_ID_TIMESTAMP,</div><div class='add'>+			      ES58X_EMPTY_MSG, 0, ES58X_CHANNEL_IDX_NA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Nominal bittiming constants for ES581.4 as specified in the</div><div class='add'>+ * microcontroller datasheet: "Stellaris(R) LM3S5B91 Microcontroller"</div><div class='add'>+ * table 17-4 "CAN Protocol Ranges" from Texas Instruments.</div><div class='add'>+ */</div><div class='add'>+static const struct can_bittiming_const es581_4_bittiming_const = {</div><div class='add'>+	.name = "ES581.4",</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 8,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 128,</div><div class='add'>+	.brp_inc = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct es58x_parameters es581_4_param = {</div><div class='add'>+	.bittiming_const = &amp;es581_4_bittiming_const,</div><div class='add'>+	.data_bittiming_const = NULL,</div><div class='add'>+	.tdc_const = NULL,</div><div class='add'>+	.bitrate_max = 1 * MEGA /* BPS */,</div><div class='add'>+	.clock = {.freq = 50 * MEGA /* Hz */},</div><div class='add'>+	.ctrlmode_supported = CAN_CTRLMODE_CC_LEN8_DLC,</div><div class='add'>+	.tx_start_of_frame = 0xAFAF,</div><div class='add'>+	.rx_start_of_frame = 0xFAFA,</div><div class='add'>+	.tx_urb_cmd_max_len = ES581_4_TX_URB_CMD_MAX_LEN,</div><div class='add'>+	.rx_urb_cmd_max_len = ES581_4_RX_URB_CMD_MAX_LEN,</div><div class='add'>+	/* Size of internal device TX queue is 330.</div><div class='add'>+	 *</div><div class='add'>+	 * However, we witnessed some ES58X_ERR_PROT_CRC errors from</div><div class='add'>+	 * the device and thus, echo_skb_max was lowered to the</div><div class='add'>+	 * empirical value of 75 which seems stable and then rounded</div><div class='add'>+	 * down to become a power of two.</div><div class='add'>+	 *</div><div class='add'>+	 * Root cause of those ES58X_ERR_PROT_CRC errors is still</div><div class='add'>+	 * unclear.</div><div class='add'>+	 */</div><div class='add'>+	.fifo_mask = 63, /* echo_skb_max = 64 */</div><div class='add'>+	.dql_min_limit = CAN_FRAME_LEN_MAX * 50, /* Empirical value. */</div><div class='add'>+	.tx_bulk_max = ES581_4_TX_BULK_MAX,</div><div class='add'>+	.urb_cmd_header_len = ES581_4_URB_CMD_HEADER_LEN,</div><div class='add'>+	.rx_urb_max = ES58X_RX_URBS_MAX,</div><div class='add'>+	.tx_urb_max = ES58X_TX_URBS_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct es58x_operators es581_4_ops = {</div><div class='add'>+	.get_msg_len = es581_4_get_msg_len,</div><div class='add'>+	.handle_urb_cmd = es581_4_handle_urb_cmd,</div><div class='add'>+	.fill_urb_header = es581_4_fill_urb_header,</div><div class='add'>+	.tx_can_msg = es581_4_tx_can_msg,</div><div class='add'>+	.enable_channel = es581_4_enable_channel,</div><div class='add'>+	.disable_channel = es581_4_disable_channel,</div><div class='add'>+	.reset_device = es581_4_reset_device,</div><div class='add'>+	.get_timestamp = es581_4_get_timestamp</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es581_4.h b/drivers/net/can/usb/etas_es58x/es581_4.h<br/>new file mode 100644<br/>index 000000000000..667ecb77168c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es581_4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es581_4.h</a></div><div class='hunk'>@@ -0,0 +1,207 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es581_4.h: Definitions and declarations specific to ETAS</div><div class='add'>+ * ES581.4.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020 ETAS K.K.. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020, 2021 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ES581_4_H__</div><div class='add'>+#define __ES581_4_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define ES581_4_NUM_CAN_CH 2</div><div class='add'>+#define ES581_4_CHANNEL_IDX_OFFSET 1</div><div class='add'>+</div><div class='add'>+#define ES581_4_TX_BULK_MAX 25</div><div class='add'>+#define ES581_4_RX_BULK_MAX 30</div><div class='add'>+#define ES581_4_ECHO_BULK_MAX 30</div><div class='add'>+</div><div class='add'>+enum es581_4_cmd_type {</div><div class='add'>+	ES581_4_CAN_COMMAND_TYPE = 0x45</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum es581_4_cmd_id {</div><div class='add'>+	ES581_4_CMD_ID_OPEN_CHANNEL = 0x01,</div><div class='add'>+	ES581_4_CMD_ID_CLOSE_CHANNEL = 0x02,</div><div class='add'>+	ES581_4_CMD_ID_SET_BITTIMING = 0x03,</div><div class='add'>+	ES581_4_CMD_ID_ENABLE_CHANNEL = 0x04,</div><div class='add'>+	ES581_4_CMD_ID_TX_MSG = 0x05,</div><div class='add'>+	ES581_4_CMD_ID_RX_MSG = 0x06,</div><div class='add'>+	ES581_4_CMD_ID_RESET_RX = 0x0A,</div><div class='add'>+	ES581_4_CMD_ID_RESET_TX = 0x0B,</div><div class='add'>+	ES581_4_CMD_ID_DISABLE_CHANNEL = 0x0C,</div><div class='add'>+	ES581_4_CMD_ID_TIMESTAMP = 0x0E,</div><div class='add'>+	ES581_4_CMD_ID_RESET_DEVICE = 0x28,</div><div class='add'>+	ES581_4_CMD_ID_ECHO = 0x71,</div><div class='add'>+	ES581_4_CMD_ID_DEVICE_ERR = 0x72</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum es581_4_rx_type {</div><div class='add'>+	ES581_4_RX_TYPE_MESSAGE = 1,</div><div class='add'>+	ES581_4_RX_TYPE_ERROR = 3,</div><div class='add'>+	ES581_4_RX_TYPE_EVENT = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es581_4_tx_conf_msg - Channel configuration.</div><div class='add'>+ * @bitrate: Bitrate.</div><div class='add'>+ * @sample_point: Sample point is in percent [0..100].</div><div class='add'>+ * @samples_per_bit: type enum es58x_samples_per_bit.</div><div class='add'>+ * @bit_time: Number of time quanta in one bit.</div><div class='add'>+ * @sjw: Synchronization Jump Width.</div><div class='add'>+ * @sync_edge: type enum es58x_sync_edge.</div><div class='add'>+ * @physical_layer: type enum es58x_physical_layer.</div><div class='add'>+ * @echo_mode: type enum es58x_echo_mode.</div><div class='add'>+ * @channel_no: Channel number, starting from 1. Not to be confused</div><div class='add'>+ *	with channed_idx of the ES58X FD which starts from 0.</div><div class='add'>+ */</div><div class='add'>+struct es581_4_tx_conf_msg {</div><div class='add'>+	__le32 bitrate;</div><div class='add'>+	__le32 sample_point;</div><div class='add'>+	__le32 samples_per_bit;</div><div class='add'>+	__le32 bit_time;</div><div class='add'>+	__le32 sjw;</div><div class='add'>+	__le32 sync_edge;</div><div class='add'>+	__le32 physical_layer;</div><div class='add'>+	__le32 echo_mode;</div><div class='add'>+	u8 channel_no;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_tx_can_msg {</div><div class='add'>+	__le32 can_id;</div><div class='add'>+	__le32 packet_idx;</div><div class='add'>+	__le16 flags;</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	u8 dlc;</div><div class='add'>+	u8 data[CAN_MAX_DLEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* The ES581.4 allows bulk transfer.  */</div><div class='add'>+struct es581_4_bulk_tx_can_msg {</div><div class='add'>+	u8 num_can_msg;</div><div class='add'>+	/* Using type "u8[]" instead of "struct es581_4_tx_can_msg[]"</div><div class='add'>+	 * for tx_msg_buf because each member has a flexible size.</div><div class='add'>+	 */</div><div class='add'>+	u8 tx_can_msg_buf[ES581_4_TX_BULK_MAX *</div><div class='add'>+			  sizeof(struct es581_4_tx_can_msg)];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_echo_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	__le32 packet_idx;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_bulk_echo_msg {</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	struct es581_4_echo_msg echo_msg[ES581_4_ECHO_BULK_MAX];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Normal Rx CAN Message */</div><div class='add'>+struct es581_4_rx_can_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	u8 rx_type;		/* type enum es581_4_rx_type */</div><div class='add'>+	u8 flags;		/* type enum es58x_flag */</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	u8 dlc;</div><div class='add'>+	__le32 can_id;</div><div class='add'>+	u8 data[CAN_MAX_DLEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_rx_err_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	__le16 rx_type;		/* type enum es581_4_rx_type */</div><div class='add'>+	__le16 flags;		/* type enum es58x_flag */</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	u8 __padding[2];</div><div class='add'>+	u8 dlc;</div><div class='add'>+	__le32 tag;		/* Related to the CAN filtering. Unused in this module */</div><div class='add'>+	__le32 can_id;</div><div class='add'>+	__le32 error;		/* type enum es58x_error */</div><div class='add'>+	__le32 destination;	/* Unused in this module */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_rx_event_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	__le16 rx_type;		/* type enum es581_4_rx_type */</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	u8 __padding;</div><div class='add'>+	__le32 tag;		/* Related to the CAN filtering. Unused in this module */</div><div class='add'>+	__le32 event;		/* type enum es58x_event */</div><div class='add'>+	__le32 destination;	/* Unused in this module */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_tx_ack_msg {</div><div class='add'>+	__le16 tx_free_entries;	/* Number of remaining free entries in the device TX queue */</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	u8 rx_cmd_ret_u8;	/* type enum es58x_cmd_ret_code_u8 */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es581_4_rx_cmd_ret {</div><div class='add'>+	__le32 rx_cmd_ret_le32;</div><div class='add'>+	u8 channel_no;</div><div class='add'>+	u8 __padding[3];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es581_4_urb_cmd - Commands received from or sent to the</div><div class='add'>+ *	ES581.4 device.</div><div class='add'>+ * @SOF: Start of Frame.</div><div class='add'>+ * @cmd_type: Command Type (type: enum es581_4_cmd_type). The CRC</div><div class='add'>+ *	calculation starts at this position.</div><div class='add'>+ * @cmd_id: Command ID (type: enum es581_4_cmd_id).</div><div class='add'>+ * @msg_len: Length of the message, excluding CRC (i.e. length of the</div><div class='add'>+ *	union).</div><div class='add'>+ * @tx_conf_msg: Channel configuration.</div><div class='add'>+ * @bulk_tx_can_msg: Tx messages.</div><div class='add'>+ * @rx_can_msg: Array of Rx messages.</div><div class='add'>+ * @bulk_echo_msg: Tx message being looped back.</div><div class='add'>+ * @rx_err_msg: Error message.</div><div class='add'>+ * @rx_event_msg: Event message.</div><div class='add'>+ * @tx_ack_msg: Tx acknowledgment message.</div><div class='add'>+ * @rx_cmd_ret: Command return code.</div><div class='add'>+ * @timestamp: Timestamp reply.</div><div class='add'>+ * @rx_cmd_ret_u8: Rx 8 bits return code (type: enum</div><div class='add'>+ *	es58x_cmd_ret_code_u8).</div><div class='add'>+ * @raw_msg: Message raw payload.</div><div class='add'>+ * @reserved_for_crc16_do_not_use: The structure ends with a</div><div class='add'>+ *	CRC16. Because the structures in above union are of variable</div><div class='add'>+ *	lengths, we can not predict the offset of the CRC in</div><div class='add'>+ *	advance. Use functions es58x_get_crc() and es58x_set_crc() to</div><div class='add'>+ *	manipulate it.</div><div class='add'>+ */</div><div class='add'>+struct es581_4_urb_cmd {</div><div class='add'>+	__le16 SOF;</div><div class='add'>+	u8 cmd_type;</div><div class='add'>+	u8 cmd_id;</div><div class='add'>+	__le16 msg_len;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct es581_4_tx_conf_msg tx_conf_msg;</div><div class='add'>+		struct es581_4_bulk_tx_can_msg bulk_tx_can_msg;</div><div class='add'>+		struct es581_4_rx_can_msg rx_can_msg[ES581_4_RX_BULK_MAX];</div><div class='add'>+		struct es581_4_bulk_echo_msg bulk_echo_msg;</div><div class='add'>+		struct es581_4_rx_err_msg rx_err_msg;</div><div class='add'>+		struct es581_4_rx_event_msg rx_event_msg;</div><div class='add'>+		struct es581_4_tx_ack_msg tx_ack_msg;</div><div class='add'>+		struct es581_4_rx_cmd_ret rx_cmd_ret;</div><div class='add'>+		__le64 timestamp;</div><div class='add'>+		u8 rx_cmd_ret_u8;</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, raw_msg);</div><div class='add'>+	} __packed;</div><div class='add'>+</div><div class='add'>+	__le16 reserved_for_crc16_do_not_use;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ES581_4_URB_CMD_HEADER_LEN (offsetof(struct es581_4_urb_cmd, raw_msg))</div><div class='add'>+#define ES581_4_TX_URB_CMD_MAX_LEN					\</div><div class='add'>+	ES58X_SIZEOF_URB_CMD(struct es581_4_urb_cmd, bulk_tx_can_msg)</div><div class='add'>+#define ES581_4_RX_URB_CMD_MAX_LEN					\</div><div class='add'>+	ES58X_SIZEOF_URB_CMD(struct es581_4_urb_cmd, rx_can_msg)</div><div class='add'>+</div><div class='add'>+#endif /* __ES581_4_H__ */</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c<br/>new file mode 100644<br/>index 000000000000..f799233c2b72<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es58x_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es58x_core.c</a></div><div class='hunk'>@@ -0,0 +1,2272 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es58x_core.c: Core logic to manage the network devices and the</div><div class='add'>+ * USB interface.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020 ETAS K.K.. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020-2025 Vincent Mailhol &lt;mailhol@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/crc16.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "es58x_core.h"</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;");</div><div class='add'>+MODULE_AUTHOR("Arunachalam Santhanam &lt;arunachalam.santhanam@in.bosch.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Socket CAN driver for ETAS ES58X USB adapters");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+</div><div class='add'>+#define ES58X_VENDOR_ID 0x108C</div><div class='add'>+#define ES581_4_PRODUCT_ID 0x0159</div><div class='add'>+#define ES582_1_PRODUCT_ID 0x0168</div><div class='add'>+#define ES584_1_PRODUCT_ID 0x0169</div><div class='add'>+</div><div class='add'>+/* ES58X FD has some interface protocols unsupported by this driver. */</div><div class='add'>+#define ES58X_FD_INTERFACE_PROTOCOL 0</div><div class='add'>+</div><div class='add'>+/* Table of devices which work with this driver. */</div><div class='add'>+static const struct usb_device_id es58x_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		/* ETAS GmbH ES581.4 USB dual-channel CAN Bus Interface module. */</div><div class='add'>+		USB_DEVICE(ES58X_VENDOR_ID, ES581_4_PRODUCT_ID),</div><div class='add'>+		.driver_info = ES58X_DUAL_CHANNEL</div><div class='add'>+	}, {</div><div class='add'>+		/* ETAS GmbH ES582.1 USB dual-channel CAN FD Bus Interface module. */</div><div class='add'>+		USB_DEVICE_INTERFACE_PROTOCOL(ES58X_VENDOR_ID, ES582_1_PRODUCT_ID,</div><div class='add'>+					      ES58X_FD_INTERFACE_PROTOCOL),</div><div class='add'>+		.driver_info = ES58X_DUAL_CHANNEL | ES58X_FD_FAMILY</div><div class='add'>+	}, {</div><div class='add'>+		/* ETAS GmbH ES584.1 USB single-channel CAN FD Bus Interface module. */</div><div class='add'>+		USB_DEVICE_INTERFACE_PROTOCOL(ES58X_VENDOR_ID, ES584_1_PRODUCT_ID,</div><div class='add'>+					      ES58X_FD_INTERFACE_PROTOCOL),</div><div class='add'>+		.driver_info = ES58X_FD_FAMILY</div><div class='add'>+	}, {</div><div class='add'>+		/* Terminating entry */</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, es58x_id_table);</div><div class='add'>+</div><div class='add'>+#define es58x_print_hex_dump(buf, len)					\</div><div class='add'>+	print_hex_dump(KERN_DEBUG,					\</div><div class='add'>+		       KBUILD_MODNAME " " __stringify(buf) ": ",	\</div><div class='add'>+		       DUMP_PREFIX_NONE, 16, 1, buf, len, false)</div><div class='add'>+</div><div class='add'>+#define es58x_print_hex_dump_debug(buf, len)				 \</div><div class='add'>+	print_hex_dump_debug(KBUILD_MODNAME " " __stringify(buf) ": ",\</div><div class='add'>+			     DUMP_PREFIX_NONE, 16, 1, buf, len, false)</div><div class='add'>+</div><div class='add'>+/* The last two bytes of an ES58X command is a CRC16. The first two</div><div class='add'>+ * bytes (the start of frame) are skipped and the CRC calculation</div><div class='add'>+ * starts on the third byte.</div><div class='add'>+ */</div><div class='add'>+#define ES58X_CRC_CALC_OFFSET sizeof_field(union es58x_urb_cmd, sof)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_calculate_crc() - Compute the crc16 of a given URB.</div><div class='add'>+ * @urb_cmd: The URB command for which we want to calculate the CRC.</div><div class='add'>+ * @urb_len: Length of @urb_cmd. Must be at least bigger than 4</div><div class='add'>+ *	(ES58X_CRC_CALC_OFFSET + sizeof(crc))</div><div class='add'>+ *</div><div class='add'>+ * Return: crc16 value.</div><div class='add'>+ */</div><div class='add'>+static u16 es58x_calculate_crc(const union es58x_urb_cmd *urb_cmd, u16 urb_len)</div><div class='add'>+{</div><div class='add'>+	u16 crc;</div><div class='add'>+	ssize_t len = urb_len - ES58X_CRC_CALC_OFFSET - sizeof(crc);</div><div class='add'>+</div><div class='add'>+	crc = crc16(0, &amp;urb_cmd-&gt;raw_cmd[ES58X_CRC_CALC_OFFSET], len);</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_get_crc() - Get the CRC value of a given URB.</div><div class='add'>+ * @urb_cmd: The URB command for which we want to get the CRC.</div><div class='add'>+ * @urb_len: Length of @urb_cmd. Must be at least bigger than 4</div><div class='add'>+ *	(ES58X_CRC_CALC_OFFSET + sizeof(crc))</div><div class='add'>+ *</div><div class='add'>+ * Return: crc16 value.</div><div class='add'>+ */</div><div class='add'>+static u16 es58x_get_crc(const union es58x_urb_cmd *urb_cmd, u16 urb_len)</div><div class='add'>+{</div><div class='add'>+	u16 crc;</div><div class='add'>+	const __le16 *crc_addr;</div><div class='add'>+</div><div class='add'>+	crc_addr = (__le16 *)&amp;urb_cmd-&gt;raw_cmd[urb_len - sizeof(crc)];</div><div class='add'>+	crc = get_unaligned_le16(crc_addr);</div><div class='add'>+	return crc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_set_crc() - Set the CRC value of a given URB.</div><div class='add'>+ * @urb_cmd: The URB command for which we want to get the CRC.</div><div class='add'>+ * @urb_len: Length of @urb_cmd. Must be at least bigger than 4</div><div class='add'>+ *	(ES58X_CRC_CALC_OFFSET + sizeof(crc))</div><div class='add'>+ */</div><div class='add'>+static void es58x_set_crc(union es58x_urb_cmd *urb_cmd, u16 urb_len)</div><div class='add'>+{</div><div class='add'>+	u16 crc;</div><div class='add'>+	__le16 *crc_addr;</div><div class='add'>+</div><div class='add'>+	crc = es58x_calculate_crc(urb_cmd, urb_len);</div><div class='add'>+	crc_addr = (__le16 *)&amp;urb_cmd-&gt;raw_cmd[urb_len - sizeof(crc)];</div><div class='add'>+	put_unaligned_le16(crc, crc_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_check_crc() - Validate the CRC value of a given URB.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb_cmd: The URB command for which we want to check the CRC.</div><div class='add'>+ * @urb_len: Length of @urb_cmd. Must be at least bigger than 4</div><div class='add'>+ *	(ES58X_CRC_CALC_OFFSET + sizeof(crc))</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -EBADMSG if the CRC check fails.</div><div class='add'>+ */</div><div class='add'>+static int es58x_check_crc(struct es58x_device *es58x_dev,</div><div class='add'>+			   const union es58x_urb_cmd *urb_cmd, u16 urb_len)</div><div class='add'>+{</div><div class='add'>+	u16 calculated_crc = es58x_calculate_crc(urb_cmd, urb_len);</div><div class='add'>+	u16 expected_crc = es58x_get_crc(urb_cmd, urb_len);</div><div class='add'>+</div><div class='add'>+	if (expected_crc != calculated_crc) {</div><div class='add'>+		dev_err_ratelimited(es58x_dev-&gt;dev,</div><div class='add'>+				    "%s: Bad CRC, urb_len: %d\n",</div><div class='add'>+				    __func__, urb_len);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_timestamp_to_ns() - Convert a timestamp value received from a</div><div class='add'>+ *	ES58X device to nanoseconds.</div><div class='add'>+ * @timestamp: Timestamp received from a ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * The timestamp received from ES58X is expressed in multiples of 0.5</div><div class='add'>+ * micro seconds. This function converts it in to nanoseconds.</div><div class='add'>+ *</div><div class='add'>+ * Return: Timestamp value in nanoseconds.</div><div class='add'>+ */</div><div class='add'>+static u64 es58x_timestamp_to_ns(u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	const u64 es58x_timestamp_ns_mult_coef = 500ULL;</div><div class='add'>+</div><div class='add'>+	return es58x_timestamp_ns_mult_coef * timestamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_set_skb_timestamp() - Set the hardware timestamp of an skb.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @skb: socket buffer of a CAN message.</div><div class='add'>+ * @timestamp: Timestamp received from an ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Used for both received and echo messages.</div><div class='add'>+ */</div><div class='add'>+static void es58x_set_skb_timestamp(struct net_device *netdev,</div><div class='add'>+				    struct sk_buff *skb, u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+	struct skb_shared_hwtstamps *hwts;</div><div class='add'>+</div><div class='add'>+	hwts = skb_hwtstamps(skb);</div><div class='add'>+	/* Ignoring overflow (overflow on 64 bits timestamp with nano</div><div class='add'>+	 * second precision would occur after more than 500 years).</div><div class='add'>+	 */</div><div class='add'>+	hwts-&gt;hwtstamp = ns_to_ktime(es58x_timestamp_to_ns(timestamp) +</div><div class='add'>+				     es58x_dev-&gt;realtime_diff_ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_rx_timestamp() - Handle a received timestamp.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @timestamp: Timestamp received from a ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Calculate the difference between the ES58X device and the kernel</div><div class='add'>+ * internal clocks. This difference will be later used as an offset to</div><div class='add'>+ * convert the timestamps of RX and echo messages to match the kernel</div><div class='add'>+ * system time (e.g. convert to UNIX time).</div><div class='add'>+ */</div><div class='add'>+void es58x_rx_timestamp(struct es58x_device *es58x_dev, u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	u64 ktime_real_ns = ktime_get_real_ns();</div><div class='add'>+	u64 device_timestamp = es58x_timestamp_to_ns(timestamp);</div><div class='add'>+</div><div class='add'>+	dev_dbg(es58x_dev-&gt;dev, "%s: request round-trip time: %llu ns\n",</div><div class='add'>+		__func__, ktime_real_ns - es58x_dev-&gt;ktime_req_ns);</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;realtime_diff_ns =</div><div class='add'>+	    (es58x_dev-&gt;ktime_req_ns + ktime_real_ns) / 2 - device_timestamp;</div><div class='add'>+	es58x_dev-&gt;ktime_req_ns = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(es58x_dev-&gt;dev,</div><div class='add'>+		"%s: Device timestamp: %llu, diff with kernel: %llu\n",</div><div class='add'>+		__func__, device_timestamp, es58x_dev-&gt;realtime_diff_ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_set_realtime_diff_ns() - Calculate difference between the</div><div class='add'>+ *	clocks of the ES58X device and the kernel</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Request a timestamp from the ES58X device. Once the answer is</div><div class='add'>+ * received, the timestamp difference will be set by the callback</div><div class='add'>+ * function es58x_rx_timestamp().</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_set_realtime_diff_ns(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	if (es58x_dev-&gt;ktime_req_ns) {</div><div class='add'>+		dev_warn(es58x_dev-&gt;dev,</div><div class='add'>+			 "%s: Previous request to set timestamp has not completed yet\n",</div><div class='add'>+			 __func__);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;ktime_req_ns = ktime_get_real_ns();</div><div class='add'>+	return es58x_dev-&gt;ops-&gt;get_timestamp(es58x_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_is_can_state_active() - Is the network device in an active</div><div class='add'>+ *	CAN state?</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * The device is considered active if it is able to send or receive</div><div class='add'>+ * CAN frames, that is to say if it is in any of</div><div class='add'>+ * CAN_STATE_ERROR_ACTIVE, CAN_STATE_ERROR_WARNING or</div><div class='add'>+ * CAN_STATE_ERROR_PASSIVE states.</div><div class='add'>+ *</div><div class='add'>+ * Caution: when recovering from a bus-off,</div><div class='add'>+ * net/core/dev.c#can_restart() will call</div><div class='add'>+ * net/core/dev.c#can_flush_echo_skb() without using any kind of</div><div class='add'>+ * locks. For this reason, it is critical to guarantee that no TX or</div><div class='add'>+ * echo operations (i.e. any access to priv-&gt;echo_skb[]) can be done</div><div class='add'>+ * while this function is returning false.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the device is active, else returns false.</div><div class='add'>+ */</div><div class='add'>+static bool es58x_is_can_state_active(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return es58x_priv(netdev)-&gt;can.state &lt; CAN_STATE_BUS_OFF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_is_echo_skb_threshold_reached() - Determine the limit of how</div><div class='add'>+ *	many skb slots can be taken before we should stop the network</div><div class='add'>+ *	queue.</div><div class='add'>+ * @priv: ES58X private parameters related to the network device.</div><div class='add'>+ *</div><div class='add'>+ * We need to save enough free skb slots in order to be able to do</div><div class='add'>+ * bulk send. This function can be used to determine when to wake or</div><div class='add'>+ * stop the network queue in regard to the number of skb slots already</div><div class='add'>+ * taken if the echo FIFO.</div><div class='add'>+ *</div><div class='add'>+ * Return: boolean.</div><div class='add'>+ */</div><div class='add'>+static bool es58x_is_echo_skb_threshold_reached(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 num_echo_skb =  priv-&gt;tx_head - priv-&gt;tx_tail;</div><div class='add'>+	u32 threshold = priv-&gt;can.echo_skb_max -</div><div class='add'>+		priv-&gt;es58x_dev-&gt;param-&gt;tx_bulk_max + 1;</div><div class='add'>+</div><div class='add'>+	return num_echo_skb &gt;= threshold;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_can_free_echo_skb_tail() - Remove the oldest echo skb of the</div><div class='add'>+ *	echo FIFO.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Naming convention: the tail is the beginning of the FIFO, i.e. the</div><div class='add'>+ * first skb to have entered the FIFO.</div><div class='add'>+ */</div><div class='add'>+static void es58x_can_free_echo_skb_tail(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	u16 fifo_mask = priv-&gt;es58x_dev-&gt;param-&gt;fifo_mask;</div><div class='add'>+	unsigned int frame_len = 0;</div><div class='add'>+</div><div class='add'>+	can_free_echo_skb(netdev, priv-&gt;tx_tail &amp; fifo_mask, &amp;frame_len);</div><div class='add'>+	netdev_completed_queue(netdev, 1, frame_len);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_tail++;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;stats.tx_dropped++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_can_get_echo_skb_recovery() - Try to re-sync the echo FIFO.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @rcv_packet_idx: Index</div><div class='add'>+ *</div><div class='add'>+ * This function should not be called under normal circumstances. In</div><div class='add'>+ * the unlikely case that one or several URB packages get dropped by</div><div class='add'>+ * the device, the index will get out of sync. Try to recover by</div><div class='add'>+ * dropping the echo skb packets with older indexes.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero if recovery was successful, -EINVAL otherwise.</div><div class='add'>+ */</div><div class='add'>+static int es58x_can_get_echo_skb_recovery(struct net_device *netdev,</div><div class='add'>+					   u32 rcv_packet_idx)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+	if (net_ratelimit())</div><div class='add'>+		netdev_warn(netdev,</div><div class='add'>+			    "Bad echo packet index: %u. First index: %u, end index %u, num_echo_skb: %02u/%02u\n",</div><div class='add'>+			    rcv_packet_idx, priv-&gt;tx_tail, priv-&gt;tx_head,</div><div class='add'>+			    priv-&gt;tx_head - priv-&gt;tx_tail,</div><div class='add'>+			    priv-&gt;can.echo_skb_max);</div><div class='add'>+</div><div class='add'>+	if ((s32)(rcv_packet_idx - priv-&gt;tx_tail) &lt; 0) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_warn(netdev,</div><div class='add'>+				    "Received echo index is from the past. Ignoring it\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	} else if ((s32)(rcv_packet_idx - priv-&gt;tx_head) &gt;= 0) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "Received echo index is from the future. Ignoring it\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+	} else {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_warn(netdev,</div><div class='add'>+				    "Recovery: dropping %u echo skb from index %u to %u\n",</div><div class='add'>+				    rcv_packet_idx - priv-&gt;tx_tail,</div><div class='add'>+				    priv-&gt;tx_tail, rcv_packet_idx - 1);</div><div class='add'>+		while (priv-&gt;tx_tail != rcv_packet_idx) {</div><div class='add'>+			if (priv-&gt;tx_tail == priv-&gt;tx_head)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			es58x_can_free_echo_skb_tail(netdev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_can_get_echo_skb() - Get the skb from the echo FIFO and loop</div><div class='add'>+ *	it back locally.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @rcv_packet_idx: Index of the first packet received from the device.</div><div class='add'>+ * @tstamps: Array of hardware timestamps received from a ES58X device.</div><div class='add'>+ * @pkts: Number of packets (and so, length of @tstamps).</div><div class='add'>+ *</div><div class='add'>+ * Callback function for when we receive a self reception</div><div class='add'>+ * acknowledgment.  Retrieves the skb from the echo FIFO, sets its</div><div class='add'>+ * hardware timestamp (the actual time it was sent) and loops it back</div><div class='add'>+ * locally.</div><div class='add'>+ *</div><div class='add'>+ * The device has to be active (i.e. network interface UP and not in</div><div class='add'>+ * bus off state or restarting).</div><div class='add'>+ *</div><div class='add'>+ * Packet indexes must be consecutive (i.e. index of first packet is</div><div class='add'>+ * @rcv_packet_idx, index of second packet is @rcv_packet_idx + 1 and</div><div class='add'>+ * index of last packet is @rcv_packet_idx + @pkts - 1).</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success.</div><div class='add'>+ */</div><div class='add'>+int es58x_can_get_echo_skb(struct net_device *netdev, u32 rcv_packet_idx,</div><div class='add'>+			   u64 *tstamps, unsigned int pkts)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	unsigned int rx_total_frame_len = 0;</div><div class='add'>+	unsigned int num_echo_skb = priv-&gt;tx_head - priv-&gt;tx_tail;</div><div class='add'>+	int i;</div><div class='add'>+	u16 fifo_mask = priv-&gt;es58x_dev-&gt;param-&gt;fifo_mask;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(netdev)) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_info(netdev,</div><div class='add'>+				    "%s: %s is down, dropping %d echo packets\n",</div><div class='add'>+				    __func__, netdev-&gt;name, pkts);</div><div class='add'>+		netdev-&gt;stats.tx_dropped += pkts;</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (!es58x_is_can_state_active(netdev)) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev,</div><div class='add'>+				   "Bus is off or device is restarting. Ignoring %u echo packets from index %u\n",</div><div class='add'>+				   pkts, rcv_packet_idx);</div><div class='add'>+		/* stats.tx_dropped will be (or was already)</div><div class='add'>+		 * incremented by</div><div class='add'>+		 * drivers/net/can/net/dev.c:can_flush_echo_skb().</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (num_echo_skb == 0) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_warn(netdev,</div><div class='add'>+				    "Received %u echo packets from index: %u but echo skb queue is empty.\n",</div><div class='add'>+				    pkts, rcv_packet_idx);</div><div class='add'>+		netdev-&gt;stats.tx_dropped += pkts;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_tail != rcv_packet_idx) {</div><div class='add'>+		if (es58x_can_get_echo_skb_recovery(netdev, rcv_packet_idx) &lt; 0) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				netdev_warn(netdev,</div><div class='add'>+					    "Could not find echo skb for echo packet index: %u\n",</div><div class='add'>+					    rcv_packet_idx);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (num_echo_skb &lt; pkts) {</div><div class='add'>+		int pkts_drop = pkts - num_echo_skb;</div><div class='add'>+</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "Received %u echo packets but have only %d echo skb. Dropping %d echo skb\n",</div><div class='add'>+				   pkts, num_echo_skb, pkts_drop);</div><div class='add'>+		netdev-&gt;stats.tx_dropped += pkts_drop;</div><div class='add'>+		pkts -= pkts_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pkts; i++) {</div><div class='add'>+		unsigned int skb_idx = priv-&gt;tx_tail &amp; fifo_mask;</div><div class='add'>+		struct sk_buff *skb = priv-&gt;can.echo_skb[skb_idx];</div><div class='add'>+		unsigned int frame_len = 0;</div><div class='add'>+</div><div class='add'>+		if (skb)</div><div class='add'>+			es58x_set_skb_timestamp(netdev, skb, tstamps[i]);</div><div class='add'>+</div><div class='add'>+		netdev-&gt;stats.tx_bytes += can_get_echo_skb(netdev, skb_idx,</div><div class='add'>+							   &amp;frame_len);</div><div class='add'>+		rx_total_frame_len += frame_len;</div><div class='add'>+</div><div class='add'>+		priv-&gt;tx_tail++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(netdev, pkts, rx_total_frame_len);</div><div class='add'>+	netdev-&gt;stats.tx_packets += pkts;</div><div class='add'>+</div><div class='add'>+	priv-&gt;err_passive_before_rtx_success = 0;</div><div class='add'>+	if (!es58x_is_echo_skb_threshold_reached(priv))</div><div class='add'>+		netif_wake_queue(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_can_reset_echo_fifo() - Reset the echo FIFO.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * The echo_skb array of struct can_priv will be flushed by</div><div class='add'>+ * drivers/net/can/dev.c:can_flush_echo_skb(). This function resets</div><div class='add'>+ * the parameters of the struct es58x_priv of our device and reset the</div><div class='add'>+ * queue (c.f. BQL).</div><div class='add'>+ */</div><div class='add'>+static void es58x_can_reset_echo_fifo(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_tail = 0;</div><div class='add'>+	priv-&gt;tx_head = 0;</div><div class='add'>+	priv-&gt;tx_urb = NULL;</div><div class='add'>+	priv-&gt;err_passive_before_rtx_success = 0;</div><div class='add'>+	netdev_reset_queue(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_flush_pending_tx_msg() - Reset the buffer for transmission messages.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * es58x_start_xmit() will queue up to tx_bulk_max messages in</div><div class='add'>+ * &amp;tx_urb buffer and do a bulk send of all messages in one single URB</div><div class='add'>+ * (c.f. xmit_more flag). When the device recovers from a bus off</div><div class='add'>+ * state or when the device stops, the tx_urb buffer might still have</div><div class='add'>+ * pending messages in it and thus need to be flushed.</div><div class='add'>+ */</div><div class='add'>+static void es58x_flush_pending_tx_msg(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_urb) {</div><div class='add'>+		netdev_warn(netdev, "%s: dropping %d TX messages\n",</div><div class='add'>+			    __func__, priv-&gt;tx_can_msg_cnt);</div><div class='add'>+		netdev-&gt;stats.tx_dropped += priv-&gt;tx_can_msg_cnt;</div><div class='add'>+		while (priv-&gt;tx_can_msg_cnt &gt; 0) {</div><div class='add'>+			unsigned int frame_len = 0;</div><div class='add'>+			u16 fifo_mask = priv-&gt;es58x_dev-&gt;param-&gt;fifo_mask;</div><div class='add'>+</div><div class='add'>+			priv-&gt;tx_head--;</div><div class='add'>+			priv-&gt;tx_can_msg_cnt--;</div><div class='add'>+			can_free_echo_skb(netdev, priv-&gt;tx_head &amp; fifo_mask,</div><div class='add'>+					  &amp;frame_len);</div><div class='add'>+			netdev_completed_queue(netdev, 1, frame_len);</div><div class='add'>+		}</div><div class='add'>+		usb_anchor_urb(priv-&gt;tx_urb, &amp;priv-&gt;es58x_dev-&gt;tx_urbs_idle);</div><div class='add'>+		atomic_inc(&amp;es58x_dev-&gt;tx_urbs_idle_cnt);</div><div class='add'>+		usb_free_urb(priv-&gt;tx_urb);</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;tx_urb = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_tx_ack_msg() - Handle acknowledgment messages.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @tx_free_entries: Number of free entries in the device transmit FIFO.</div><div class='add'>+ * @rx_cmd_ret_u32: error code as returned by the ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * ES58X sends an acknowledgment message after a transmission request</div><div class='add'>+ * is done. This is mandatory for the ES581.4 but is optional (and</div><div class='add'>+ * deactivated in this driver) for the ES58X_FD family.</div><div class='add'>+ *</div><div class='add'>+ * Under normal circumstances, this function should never throw an</div><div class='add'>+ * error message.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+int es58x_tx_ack_msg(struct net_device *netdev, u16 tx_free_entries,</div><div class='add'>+		     enum es58x_ret_u32 rx_cmd_ret_u32)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (tx_free_entries &lt;= priv-&gt;es58x_dev-&gt;param-&gt;tx_bulk_max) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "Only %d entries left in device queue, num_echo_skb: %d/%d\n",</div><div class='add'>+				   tx_free_entries,</div><div class='add'>+				   priv-&gt;tx_head - priv-&gt;tx_tail,</div><div class='add'>+				   priv-&gt;can.echo_skb_max);</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return es58x_rx_cmd_ret_u32(netdev, ES58X_RET_TYPE_TX_MSG,</div><div class='add'>+				    rx_cmd_ret_u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_rx_can_msg() - Handle a received a CAN message.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @timestamp: Hardware time stamp (only relevant in rx branches).</div><div class='add'>+ * @data: CAN payload.</div><div class='add'>+ * @can_id: CAN ID.</div><div class='add'>+ * @es58x_flags: Please refer to enum es58x_flag.</div><div class='add'>+ * @dlc: Data Length Code (raw value).</div><div class='add'>+ *</div><div class='add'>+ * Fill up a CAN skb and post it.</div><div class='add'>+ *</div><div class='add'>+ * This function handles the case where the DLC of a classical CAN</div><div class='add'>+ * frame is greater than CAN_MAX_DLEN (c.f. the len8_dlc field of</div><div class='add'>+ * struct can_frame).</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success.</div><div class='add'>+ */</div><div class='add'>+int es58x_rx_can_msg(struct net_device *netdev, u64 timestamp, const u8 *data,</div><div class='add'>+		     canid_t can_id, enum es58x_flag es58x_flags, u8 dlc)</div><div class='add'>+{</div><div class='add'>+	struct canfd_frame *cfd;</div><div class='add'>+	struct can_frame *ccf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 len;</div><div class='add'>+	bool is_can_fd = !!(es58x_flags &amp; ES58X_FLAG_FD_DATA);</div><div class='add'>+</div><div class='add'>+	if (dlc &gt; CAN_MAX_RAW_DLC) {</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "%s: DLC is %d but maximum should be %d\n",</div><div class='add'>+			   __func__, dlc, CAN_MAX_RAW_DLC);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_can_fd) {</div><div class='add'>+		len = can_fd_dlc2len(dlc);</div><div class='add'>+		skb = alloc_canfd_skb(netdev, &amp;cfd);</div><div class='add'>+	} else {</div><div class='add'>+		len = can_cc_dlc2len(dlc);</div><div class='add'>+		skb = alloc_can_skb(netdev, &amp;ccf);</div><div class='add'>+		cfd = (struct canfd_frame *)ccf;</div><div class='add'>+	}</div><div class='add'>+	if (!skb) {</div><div class='add'>+		netdev-&gt;stats.rx_dropped++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfd-&gt;can_id = can_id;</div><div class='add'>+	if (es58x_flags &amp; ES58X_FLAG_EFF)</div><div class='add'>+		cfd-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+	if (is_can_fd) {</div><div class='add'>+		cfd-&gt;len = len;</div><div class='add'>+		if (es58x_flags &amp; ES58X_FLAG_FD_BRS)</div><div class='add'>+			cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+		if (es58x_flags &amp; ES58X_FLAG_FD_ESI)</div><div class='add'>+			cfd-&gt;flags |= CANFD_ESI;</div><div class='add'>+	} else {</div><div class='add'>+		can_frame_set_cc_len(ccf, dlc, es58x_priv(netdev)-&gt;can.ctrlmode);</div><div class='add'>+		if (es58x_flags &amp; ES58X_FLAG_RTR) {</div><div class='add'>+			ccf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+			len = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	memcpy(cfd-&gt;data, data, len);</div><div class='add'>+	netdev-&gt;stats.rx_packets++;</div><div class='add'>+	netdev-&gt;stats.rx_bytes += len;</div><div class='add'>+</div><div class='add'>+	es58x_set_skb_timestamp(netdev, skb, timestamp);</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+</div><div class='add'>+	es58x_priv(netdev)-&gt;err_passive_before_rtx_success = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_rx_err_msg() - Handle a received CAN event or error message.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @error: Error code.</div><div class='add'>+ * @event: Event code.</div><div class='add'>+ * @timestamp: Timestamp received from a ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Handle the errors and events received by the ES58X device, create</div><div class='add'>+ * a CAN error skb and post it.</div><div class='add'>+ *</div><div class='add'>+ * In some rare cases the devices might get stuck alternating between</div><div class='add'>+ * CAN_STATE_ERROR_PASSIVE and CAN_STATE_ERROR_WARNING. To prevent</div><div class='add'>+ * this behavior, we force a bus off state if the device goes in</div><div class='add'>+ * CAN_STATE_ERROR_WARNING for ES58X_MAX_CONSECUTIVE_WARN consecutive</div><div class='add'>+ * times with no successful transmission or reception in between.</div><div class='add'>+ *</div><div class='add'>+ * Once the device is in bus off state, the only way to restart it is</div><div class='add'>+ * through the drivers/net/can/dev.c:can_restart() function. The</div><div class='add'>+ * device is technically capable to recover by itself under certain</div><div class='add'>+ * circumstances, however, allowing self recovery would create</div><div class='add'>+ * complex race conditions with drivers/net/can/dev.c:can_restart()</div><div class='add'>+ * and thus was not implemented. To activate automatic restart, please</div><div class='add'>+ * set the restart-ms parameter (e.g. ip link set can0 type can</div><div class='add'>+ * restart-ms 100).</div><div class='add'>+ *</div><div class='add'>+ * If the bus is really instable, this function would try to send a</div><div class='add'>+ * lot of log messages. Those are rate limited (i.e. you will see</div><div class='add'>+ * messages such as "net_ratelimit: XXX callbacks suppressed" in</div><div class='add'>+ * dmesg).</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+int es58x_rx_err_msg(struct net_device *netdev, enum es58x_err error,</div><div class='add'>+		     enum es58x_event event, u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	struct can_priv *can = netdev_priv(netdev);</div><div class='add'>+	struct can_device_stats *can_stats = &amp;can-&gt;can_stats;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(netdev)) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_info(netdev, "%s: %s is down, dropping packet\n",</div><div class='add'>+				    __func__, netdev-&gt;name);</div><div class='add'>+		netdev-&gt;stats.rx_dropped++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (error == ES58X_ERR_OK &amp;&amp; event == ES58X_EVENT_OK) {</div><div class='add'>+		netdev_err(netdev, "%s: Both error and event are zero\n",</div><div class='add'>+			   __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	switch (error) {</div><div class='add'>+	case ES58X_ERR_OK:	/* 0: No error */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_STUFF:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Error BITSTUFF\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_FORM:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Error FORMAT\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_ACK:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Error ACK\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_BIT:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Error BIT\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_CRC:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Error CRC\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_BIT1:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev,</div><div class='add'>+				   "Error: expected a recessive bit but monitored a dominant one\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT1;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_BIT0:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev,</div><div class='add'>+				   "Error expected a dominant bit but monitored a recessive one\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_BIT0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_OVERLOAD:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Error OVERLOAD\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_OVERLOAD;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_ERR_PROT_UNSPEC:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Unspecified error\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "%s: Unspecified error code 0x%04X\n",</div><div class='add'>+				   __func__, (int)error);</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case ES58X_EVENT_OK:	/* 0: No event */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_EVENT_CRTL_ACTIVE:</div><div class='add'>+		if (can-&gt;state == CAN_STATE_BUS_OFF) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "%s: state transition: BUS OFF -&gt; ACTIVE\n",</div><div class='add'>+				   __func__);</div><div class='add'>+		}</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Event CAN BUS ACTIVE\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_ACTIVE;</div><div class='add'>+		can-&gt;state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_EVENT_CRTL_PASSIVE:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Event CAN BUS PASSIVE\n");</div><div class='add'>+		/* Either TX or RX error count reached passive state</div><div class='add'>+		 * but we do not know which. Setting both flags by</div><div class='add'>+		 * default.</div><div class='add'>+		 */</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_PASSIVE;</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_TX_PASSIVE;</div><div class='add'>+		}</div><div class='add'>+		if (can-&gt;state &lt; CAN_STATE_BUS_OFF)</div><div class='add'>+			can-&gt;state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+		can_stats-&gt;error_passive++;</div><div class='add'>+		if (priv-&gt;err_passive_before_rtx_success &lt; U8_MAX)</div><div class='add'>+			priv-&gt;err_passive_before_rtx_success++;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_EVENT_CRTL_WARNING:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Event CAN BUS WARNING\n");</div><div class='add'>+		/* Either TX or RX error count reached warning state</div><div class='add'>+		 * but we do not know which. Setting both flags by</div><div class='add'>+		 * default.</div><div class='add'>+		 */</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_WARNING;</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_TX_WARNING;</div><div class='add'>+		}</div><div class='add'>+		if (can-&gt;state &lt; CAN_STATE_BUS_OFF)</div><div class='add'>+			can-&gt;state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+		can_stats-&gt;error_warning++;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_EVENT_BUSOFF:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "Event CAN BUS OFF\n");</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+		can_stats-&gt;bus_off++;</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		if (can-&gt;state != CAN_STATE_BUS_OFF) {</div><div class='add'>+			can-&gt;state = CAN_STATE_BUS_OFF;</div><div class='add'>+			can_bus_off(netdev);</div><div class='add'>+			ret = can-&gt;do_set_mode(netdev, CAN_MODE_STOP);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_EVENT_SINGLE_WIRE:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_warn(netdev,</div><div class='add'>+				    "Lost connection on either CAN high or CAN low\n");</div><div class='add'>+		/* Lost connection on either CAN high or CAN</div><div class='add'>+		 * low. Setting both flags by default.</div><div class='add'>+		 */</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;data[4] |= CAN_ERR_TRX_CANH_NO_WIRE;</div><div class='add'>+			cf-&gt;data[4] |= CAN_ERR_TRX_CANL_NO_WIRE;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "%s: Unspecified event code 0x%04X\n",</div><div class='add'>+				   __func__, (int)event);</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cf) {</div><div class='add'>+		if (cf-&gt;data[1])</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+		if (cf-&gt;data[2] || cf-&gt;data[3]) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='add'>+			can_stats-&gt;bus_error++;</div><div class='add'>+		}</div><div class='add'>+		if (cf-&gt;data[4])</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_TRX;</div><div class='add'>+</div><div class='add'>+		es58x_set_skb_timestamp(netdev, skb, timestamp);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((event &amp; ES58X_EVENT_CRTL_PASSIVE) &amp;&amp;</div><div class='add'>+	    priv-&gt;err_passive_before_rtx_success == ES58X_CONSECUTIVE_ERR_PASSIVE_MAX) {</div><div class='add'>+		netdev_info(netdev,</div><div class='add'>+			    "Got %d consecutive warning events with no successful RX or TX. Forcing bus-off\n",</div><div class='add'>+			    priv-&gt;err_passive_before_rtx_success);</div><div class='add'>+		return es58x_rx_err_msg(netdev, ES58X_ERR_OK,</div><div class='add'>+					ES58X_EVENT_BUSOFF, timestamp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_cmd_ret_desc() - Convert a command type to a string.</div><div class='add'>+ * @cmd_ret_type: Type of the command which triggered the return code.</div><div class='add'>+ *</div><div class='add'>+ * The final line (return "&lt;unknown&gt;") should not be reached. If this</div><div class='add'>+ * is the case, there is an implementation bug.</div><div class='add'>+ *</div><div class='add'>+ * Return: a readable description of the @cmd_ret_type.</div><div class='add'>+ */</div><div class='add'>+static const char *es58x_cmd_ret_desc(enum es58x_ret_type cmd_ret_type)</div><div class='add'>+{</div><div class='add'>+	switch (cmd_ret_type) {</div><div class='add'>+	case ES58X_RET_TYPE_SET_BITTIMING:</div><div class='add'>+		return "Set bittiming";</div><div class='add'>+	case ES58X_RET_TYPE_ENABLE_CHANNEL:</div><div class='add'>+		return "Enable channel";</div><div class='add'>+	case ES58X_RET_TYPE_DISABLE_CHANNEL:</div><div class='add'>+		return "Disable channel";</div><div class='add'>+	case ES58X_RET_TYPE_TX_MSG:</div><div class='add'>+		return "Transmit message";</div><div class='add'>+	case ES58X_RET_TYPE_RESET_RX:</div><div class='add'>+		return "Reset RX";</div><div class='add'>+	case ES58X_RET_TYPE_RESET_TX:</div><div class='add'>+		return "Reset TX";</div><div class='add'>+	case ES58X_RET_TYPE_DEVICE_ERR:</div><div class='add'>+		return "Device error";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return "&lt;unknown&gt;";</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_rx_cmd_ret_u8() - Handle the command's return code received</div><div class='add'>+ *	from the ES58X device.</div><div class='add'>+ * @dev: Device, only used for the dev_XXX() print functions.</div><div class='add'>+ * @cmd_ret_type: Type of the command which triggered the return code.</div><div class='add'>+ * @rx_cmd_ret_u8: Command error code as returned by the ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Handles the 8 bits command return code. Those are specific to the</div><div class='add'>+ * ES581.4 device. The return value will eventually be used by</div><div class='add'>+ * es58x_handle_urb_cmd() function which will take proper actions in</div><div class='add'>+ * case of critical issues such and memory errors or bad CRC values.</div><div class='add'>+ *</div><div class='add'>+ * In contrast with es58x_rx_cmd_ret_u32(), the network device is</div><div class='add'>+ * unknown.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, return errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+int es58x_rx_cmd_ret_u8(struct device *dev,</div><div class='add'>+			enum es58x_ret_type cmd_ret_type,</div><div class='add'>+			enum es58x_ret_u8 rx_cmd_ret_u8)</div><div class='add'>+{</div><div class='add'>+	const char *ret_desc = es58x_cmd_ret_desc(cmd_ret_type);</div><div class='add'>+</div><div class='add'>+	switch (rx_cmd_ret_u8) {</div><div class='add'>+	case ES58X_RET_U8_OK:</div><div class='add'>+		dev_dbg_ratelimited(dev, "%s: OK\n", ret_desc);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U8_ERR_UNSPECIFIED_FAILURE:</div><div class='add'>+		dev_err(dev, "%s: unspecified failure\n", ret_desc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U8_ERR_NO_MEM:</div><div class='add'>+		dev_err(dev, "%s: device ran out of memory\n", ret_desc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U8_ERR_BAD_CRC:</div><div class='add'>+		dev_err(dev, "%s: CRC of previous command is incorrect\n",</div><div class='add'>+			ret_desc);</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "%s: returned unknown value: 0x%02X\n",</div><div class='add'>+			ret_desc, rx_cmd_ret_u8);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_rx_cmd_ret_u32() - Handle the command return code received</div><div class='add'>+ *	from the ES58X device.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @cmd_ret_type: Type of the command which triggered the return code.</div><div class='add'>+ * @rx_cmd_ret_u32: error code as returned by the ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Handles the 32 bits command return code. The return value will</div><div class='add'>+ * eventually be used by es58x_handle_urb_cmd() function which will</div><div class='add'>+ * take proper actions in case of critical issues such and memory</div><div class='add'>+ * errors or bad CRC values.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+int es58x_rx_cmd_ret_u32(struct net_device *netdev,</div><div class='add'>+			 enum es58x_ret_type cmd_ret_type,</div><div class='add'>+			 enum es58x_ret_u32 rx_cmd_ret_u32)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	const struct es58x_operators *ops = priv-&gt;es58x_dev-&gt;ops;</div><div class='add'>+	const char *ret_desc = es58x_cmd_ret_desc(cmd_ret_type);</div><div class='add'>+</div><div class='add'>+	switch (rx_cmd_ret_u32) {</div><div class='add'>+	case ES58X_RET_U32_OK:</div><div class='add'>+		switch (cmd_ret_type) {</div><div class='add'>+		case ES58X_RET_TYPE_ENABLE_CHANNEL:</div><div class='add'>+			es58x_can_reset_echo_fifo(netdev);</div><div class='add'>+			priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+			netif_wake_queue(netdev);</div><div class='add'>+			netdev_info(netdev,</div><div class='add'>+				    "%s: %s (Serial Number %s): CAN%d channel becomes ready\n",</div><div class='add'>+				    ret_desc, priv-&gt;es58x_dev-&gt;udev-&gt;product,</div><div class='add'>+				    priv-&gt;es58x_dev-&gt;udev-&gt;serial,</div><div class='add'>+				    priv-&gt;channel_idx + 1);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case ES58X_RET_TYPE_TX_MSG:</div><div class='add'>+			if (IS_ENABLED(CONFIG_VERBOSE_DEBUG) &amp;&amp; net_ratelimit())</div><div class='add'>+				netdev_vdbg(netdev, "%s: OK\n", ret_desc);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			netdev_dbg(netdev, "%s: OK\n", ret_desc);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_ERR_UNSPECIFIED_FAILURE:</div><div class='add'>+		if (cmd_ret_type == ES58X_RET_TYPE_ENABLE_CHANNEL) {</div><div class='add'>+			int ret;</div><div class='add'>+</div><div class='add'>+			netdev_warn(netdev,</div><div class='add'>+				    "%s: channel is already opened, closing and re-opening it to reflect new configuration\n",</div><div class='add'>+				    ret_desc);</div><div class='add'>+			ret = ops-&gt;disable_channel(es58x_priv(netdev));</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			return ops-&gt;enable_channel(es58x_priv(netdev));</div><div class='add'>+		}</div><div class='add'>+		if (cmd_ret_type == ES58X_RET_TYPE_DISABLE_CHANNEL) {</div><div class='add'>+			netdev_info(netdev,</div><div class='add'>+				    "%s: channel is already closed\n", ret_desc);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "%s: unspecified failure\n", ret_desc);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_ERR_NO_MEM:</div><div class='add'>+		netdev_err(netdev, "%s: device ran out of memory\n", ret_desc);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_WARN_PARAM_ADJUSTED:</div><div class='add'>+		netdev_warn(netdev,</div><div class='add'>+			    "%s: some incompatible parameters have been adjusted\n",</div><div class='add'>+			    ret_desc);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_WARN_TX_MAYBE_REORDER:</div><div class='add'>+		netdev_warn(netdev,</div><div class='add'>+			    "%s: TX messages might have been reordered\n",</div><div class='add'>+			    ret_desc);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_ERR_TIMEDOUT:</div><div class='add'>+		netdev_err(netdev, "%s: command timed out\n", ret_desc);</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_ERR_FIFO_FULL:</div><div class='add'>+		netdev_warn(netdev, "%s: fifo is full\n", ret_desc);</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_ERR_BAD_CONFIG:</div><div class='add'>+		netdev_err(netdev, "%s: bad configuration\n", ret_desc);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	case ES58X_RET_U32_ERR_NO_RESOURCE:</div><div class='add'>+		netdev_err(netdev, "%s: no resource available\n", ret_desc);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(netdev, "%s returned unknown value: 0x%08X\n",</div><div class='add'>+			   ret_desc, rx_cmd_ret_u32);</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_increment_rx_errors() - Increment the network devices' error</div><div class='add'>+ *	count.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * If an error occurs on the early stages on receiving an URB command,</div><div class='add'>+ * we might not be able to figure out on which network device the</div><div class='add'>+ * error occurred. In such case, we arbitrarily increment the error</div><div class='add'>+ * count of all the network devices attached to our ES58X device.</div><div class='add'>+ */</div><div class='add'>+static void es58x_increment_rx_errors(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; es58x_dev-&gt;num_can_ch; i++)</div><div class='add'>+		if (es58x_dev-&gt;netdev[i])</div><div class='add'>+			es58x_dev-&gt;netdev[i]-&gt;stats.rx_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_handle_urb_cmd() - Handle the URB command</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb_cmd: The URB command received from the ES58X device, might not</div><div class='add'>+ *	be aligned.</div><div class='add'>+ *</div><div class='add'>+ * Sends the URB command to the device specific function. Manages the</div><div class='add'>+ * errors thrown back by those functions.</div><div class='add'>+ */</div><div class='add'>+static void es58x_handle_urb_cmd(struct es58x_device *es58x_dev,</div><div class='add'>+				 const union es58x_urb_cmd *urb_cmd)</div><div class='add'>+{</div><div class='add'>+	const struct es58x_operators *ops = es58x_dev-&gt;ops;</div><div class='add'>+	size_t cmd_len;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;handle_urb_cmd(es58x_dev, urb_cmd);</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case 0:		/* OK */</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	case -ENODEV:</div><div class='add'>+		dev_err_ratelimited(es58x_dev-&gt;dev, "Device is not ready\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EINVAL:</div><div class='add'>+	case -EMSGSIZE:</div><div class='add'>+	case -EBADRQC:</div><div class='add'>+	case -EBADMSG:</div><div class='add'>+	case -ECHRNG:</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		cmd_len = es58x_get_urb_cmd_len(es58x_dev,</div><div class='add'>+						ops-&gt;get_msg_len(urb_cmd));</div><div class='add'>+		dev_err(es58x_dev-&gt;dev,</div><div class='add'>+			"ops-&gt;handle_urb_cmd() returned error %pe",</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+		es58x_print_hex_dump(urb_cmd, cmd_len);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EFAULT:</div><div class='add'>+	case -ENOMEM:</div><div class='add'>+	case -EIO:</div><div class='add'>+	default:</div><div class='add'>+		dev_crit(es58x_dev-&gt;dev,</div><div class='add'>+			 "ops-&gt;handle_urb_cmd() returned error %pe, detaching all network devices\n",</div><div class='add'>+			 ERR_PTR(ret));</div><div class='add'>+		for (i = 0; i &lt; es58x_dev-&gt;num_can_ch; i++)</div><div class='add'>+			if (es58x_dev-&gt;netdev[i])</div><div class='add'>+				netif_device_detach(es58x_dev-&gt;netdev[i]);</div><div class='add'>+		if (es58x_dev-&gt;ops-&gt;reset_device)</div><div class='add'>+			es58x_dev-&gt;ops-&gt;reset_device(es58x_dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Because the urb command could not fully be parsed,</div><div class='add'>+	 * channel_id is not confirmed. Incrementing rx_errors count</div><div class='add'>+	 * of all channels.</div><div class='add'>+	 */</div><div class='add'>+	es58x_increment_rx_errors(es58x_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_check_rx_urb() - Check the length and format of the URB command.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb_cmd: The URB command received from the ES58X device, might not</div><div class='add'>+ *	be aligned.</div><div class='add'>+ * @urb_actual_len: The actual length of the URB command.</div><div class='add'>+ *</div><div class='add'>+ * Check if the first message of the received urb is valid, that is to</div><div class='add'>+ * say that both the header and the length are coherent.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * the length of the first message of the URB on success.</div><div class='add'>+ *</div><div class='add'>+ * -ENODATA if the URB command is incomplete (in which case, the URB</div><div class='add'>+ * command should be buffered and combined with the next URB to try to</div><div class='add'>+ * reconstitute the URB command).</div><div class='add'>+ *</div><div class='add'>+ * -EOVERFLOW if the length is bigger than the maximum expected one.</div><div class='add'>+ *</div><div class='add'>+ * -EBADRQC if the start of frame does not match the expected value.</div><div class='add'>+ */</div><div class='add'>+static signed int es58x_check_rx_urb(struct es58x_device *es58x_dev,</div><div class='add'>+				     const union es58x_urb_cmd *urb_cmd,</div><div class='add'>+				     u32 urb_actual_len)</div><div class='add'>+{</div><div class='add'>+	const struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	const struct es58x_parameters *param = es58x_dev-&gt;param;</div><div class='add'>+	u16 sof, msg_len;</div><div class='add'>+	signed int urb_cmd_len, ret;</div><div class='add'>+</div><div class='add'>+	if (urb_actual_len &lt; param-&gt;urb_cmd_header_len) {</div><div class='add'>+		dev_vdbg(dev,</div><div class='add'>+			 "%s: Received %d bytes [%*ph]: header incomplete\n",</div><div class='add'>+			 __func__, urb_actual_len, urb_actual_len,</div><div class='add'>+			 urb_cmd-&gt;raw_cmd);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sof = get_unaligned_le16(&amp;urb_cmd-&gt;sof);</div><div class='add'>+	if (sof != param-&gt;rx_start_of_frame) {</div><div class='add'>+		dev_err_ratelimited(es58x_dev-&gt;dev,</div><div class='add'>+				    "%s: Expected sequence 0x%04X for start of frame but got 0x%04X.\n",</div><div class='add'>+				    __func__, param-&gt;rx_start_of_frame, sof);</div><div class='add'>+		return -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	msg_len = es58x_dev-&gt;ops-&gt;get_msg_len(urb_cmd);</div><div class='add'>+	urb_cmd_len = es58x_get_urb_cmd_len(es58x_dev, msg_len);</div><div class='add'>+	if (urb_cmd_len &gt; param-&gt;rx_urb_cmd_max_len) {</div><div class='add'>+		dev_err_ratelimited(es58x_dev-&gt;dev,</div><div class='add'>+				    "%s: Biggest expected size for rx urb_cmd is %u but receive a command of size %d\n",</div><div class='add'>+				    __func__,</div><div class='add'>+				    param-&gt;rx_urb_cmd_max_len, urb_cmd_len);</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+	} else if (urb_actual_len &lt; urb_cmd_len) {</div><div class='add'>+		dev_vdbg(dev, "%s: Received %02d/%02d bytes\n",</div><div class='add'>+			 __func__, urb_actual_len, urb_cmd_len);</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = es58x_check_crc(es58x_dev, urb_cmd, urb_cmd_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return urb_cmd_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_copy_to_cmd_buf() - Copy an array to the URB command buffer.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @raw_cmd: the buffer we want to copy.</div><div class='add'>+ * @raw_cmd_len: length of @raw_cmd.</div><div class='add'>+ *</div><div class='add'>+ * Concatenates @raw_cmd_len bytes of @raw_cmd to the end of the URB</div><div class='add'>+ * command buffer.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -EMSGSIZE if not enough space is available</div><div class='add'>+ * to do the copy.</div><div class='add'>+ */</div><div class='add'>+static int es58x_copy_to_cmd_buf(struct es58x_device *es58x_dev,</div><div class='add'>+				 u8 *raw_cmd, int raw_cmd_len)</div><div class='add'>+{</div><div class='add'>+	if (es58x_dev-&gt;rx_cmd_buf_len + raw_cmd_len &gt;</div><div class='add'>+	    es58x_dev-&gt;param-&gt;rx_urb_cmd_max_len)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;es58x_dev-&gt;rx_cmd_buf.raw_cmd[es58x_dev-&gt;rx_cmd_buf_len],</div><div class='add'>+	       raw_cmd, raw_cmd_len);</div><div class='add'>+	es58x_dev-&gt;rx_cmd_buf_len += raw_cmd_len;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_split_urb_try_recovery() - Try to recover bad URB sequences.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @raw_cmd: pointer to the buffer we want to copy.</div><div class='add'>+ * @raw_cmd_len: length of @raw_cmd.</div><div class='add'>+ *</div><div class='add'>+ * Under some rare conditions, we might get incorrect URBs from the</div><div class='add'>+ * device. From our observations, one of the valid URB gets replaced</div><div class='add'>+ * by one from the past. The full root cause is not identified.</div><div class='add'>+ *</div><div class='add'>+ * This function looks for the next start of frame in the urb buffer</div><div class='add'>+ * in order to try to recover.</div><div class='add'>+ *</div><div class='add'>+ * Such behavior was not observed on the devices of the ES58X FD</div><div class='add'>+ * family and only seems to impact the ES581.4.</div><div class='add'>+ *</div><div class='add'>+ * Return: the number of bytes dropped on success, -EBADMSG if recovery failed.</div><div class='add'>+ */</div><div class='add'>+static int es58x_split_urb_try_recovery(struct es58x_device *es58x_dev,</div><div class='add'>+					u8 *raw_cmd, size_t raw_cmd_len)</div><div class='add'>+{</div><div class='add'>+	union es58x_urb_cmd *urb_cmd;</div><div class='add'>+	signed int urb_cmd_len;</div><div class='add'>+	u16 sof;</div><div class='add'>+	int dropped_bytes = 0;</div><div class='add'>+</div><div class='add'>+	es58x_increment_rx_errors(es58x_dev);</div><div class='add'>+</div><div class='add'>+	while (raw_cmd_len &gt; sizeof(sof)) {</div><div class='add'>+		urb_cmd = (union es58x_urb_cmd *)raw_cmd;</div><div class='add'>+		sof = get_unaligned_le16(&amp;urb_cmd-&gt;sof);</div><div class='add'>+</div><div class='add'>+		if (sof == es58x_dev-&gt;param-&gt;rx_start_of_frame) {</div><div class='add'>+			urb_cmd_len = es58x_check_rx_urb(es58x_dev,</div><div class='add'>+							 urb_cmd, raw_cmd_len);</div><div class='add'>+			if ((urb_cmd_len == -ENODATA) || urb_cmd_len &gt; 0) {</div><div class='add'>+				dev_info_ratelimited(es58x_dev-&gt;dev,</div><div class='add'>+						     "Recovery successful! Dropped %d bytes (urb_cmd_len: %d)\n",</div><div class='add'>+						     dropped_bytes,</div><div class='add'>+						     urb_cmd_len);</div><div class='add'>+				return dropped_bytes;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		raw_cmd++;</div><div class='add'>+		raw_cmd_len--;</div><div class='add'>+		dropped_bytes++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn_ratelimited(es58x_dev-&gt;dev, "%s: Recovery failed\n", __func__);</div><div class='add'>+	return -EBADMSG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_handle_incomplete_cmd() - Reconstitute an URB command from</div><div class='add'>+ *	different URB pieces.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb: last urb buffer received.</div><div class='add'>+ *</div><div class='add'>+ * The device might split the URB commands in an arbitrary amount of</div><div class='add'>+ * pieces. This function concatenates those in an URB buffer until a</div><div class='add'>+ * full URB command is reconstituted and consume it.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * number of bytes consumed from @urb if successful.</div><div class='add'>+ *</div><div class='add'>+ * -ENODATA if the URB command is still incomplete.</div><div class='add'>+ *</div><div class='add'>+ * -EBADMSG if the URB command is incorrect.</div><div class='add'>+ */</div><div class='add'>+static signed int es58x_handle_incomplete_cmd(struct es58x_device *es58x_dev,</div><div class='add'>+					      struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	size_t cpy_len;</div><div class='add'>+	signed int urb_cmd_len, tmp_cmd_buf_len, ret;</div><div class='add'>+</div><div class='add'>+	tmp_cmd_buf_len = es58x_dev-&gt;rx_cmd_buf_len;</div><div class='add'>+	cpy_len = min_t(int, es58x_dev-&gt;param-&gt;rx_urb_cmd_max_len -</div><div class='add'>+			es58x_dev-&gt;rx_cmd_buf_len, urb-&gt;actual_length);</div><div class='add'>+	ret = es58x_copy_to_cmd_buf(es58x_dev, urb-&gt;transfer_buffer, cpy_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	urb_cmd_len = es58x_check_rx_urb(es58x_dev, &amp;es58x_dev-&gt;rx_cmd_buf,</div><div class='add'>+					 es58x_dev-&gt;rx_cmd_buf_len);</div><div class='add'>+	if (urb_cmd_len == -ENODATA) {</div><div class='add'>+		return -ENODATA;</div><div class='add'>+	} else if (urb_cmd_len &lt; 0) {</div><div class='add'>+		dev_err_ratelimited(es58x_dev-&gt;dev,</div><div class='add'>+				    "Could not reconstitute incomplete command from previous URB, dropping %d bytes\n",</div><div class='add'>+				    tmp_cmd_buf_len + urb-&gt;actual_length);</div><div class='add'>+		dev_err_ratelimited(es58x_dev-&gt;dev,</div><div class='add'>+				    "Error code: %pe, es58x_dev-&gt;rx_cmd_buf_len: %d, urb-&gt;actual_length: %u\n",</div><div class='add'>+				    ERR_PTR(urb_cmd_len),</div><div class='add'>+				    tmp_cmd_buf_len, urb-&gt;actual_length);</div><div class='add'>+		es58x_print_hex_dump(&amp;es58x_dev-&gt;rx_cmd_buf, tmp_cmd_buf_len);</div><div class='add'>+		es58x_print_hex_dump(urb-&gt;transfer_buffer, urb-&gt;actual_length);</div><div class='add'>+		return urb-&gt;actual_length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	es58x_handle_urb_cmd(es58x_dev, &amp;es58x_dev-&gt;rx_cmd_buf);</div><div class='add'>+	return urb_cmd_len - tmp_cmd_buf_len;	/* consumed length */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_split_urb() - Cut the received URB in individual URB commands.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb: last urb buffer received.</div><div class='add'>+ *</div><div class='add'>+ * The device might send urb in bulk format (i.e. several URB commands</div><div class='add'>+ * concatenated together). This function will split all the commands</div><div class='add'>+ * contained in the urb.</div><div class='add'>+ *</div><div class='add'>+ * Return:</div><div class='add'>+ * number of bytes consumed from @urb if successful.</div><div class='add'>+ *</div><div class='add'>+ * -ENODATA if the URB command is incomplete.</div><div class='add'>+ *</div><div class='add'>+ * -EBADMSG if the URB command is incorrect.</div><div class='add'>+ */</div><div class='add'>+static signed int es58x_split_urb(struct es58x_device *es58x_dev,</div><div class='add'>+				  struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	union es58x_urb_cmd *urb_cmd;</div><div class='add'>+	u8 *raw_cmd = urb-&gt;transfer_buffer;</div><div class='add'>+	s32 raw_cmd_len = urb-&gt;actual_length;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (es58x_dev-&gt;rx_cmd_buf_len != 0) {</div><div class='add'>+		ret = es58x_handle_incomplete_cmd(es58x_dev, urb);</div><div class='add'>+		if (ret != -ENODATA)</div><div class='add'>+			es58x_dev-&gt;rx_cmd_buf_len = 0;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		raw_cmd += ret;</div><div class='add'>+		raw_cmd_len -= ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (raw_cmd_len &gt; 0) {</div><div class='add'>+		if (raw_cmd[0] == ES58X_HEARTBEAT) {</div><div class='add'>+			raw_cmd++;</div><div class='add'>+			raw_cmd_len--;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		urb_cmd = (union es58x_urb_cmd *)raw_cmd;</div><div class='add'>+		ret = es58x_check_rx_urb(es58x_dev, urb_cmd, raw_cmd_len);</div><div class='add'>+		if (ret &gt; 0) {</div><div class='add'>+			es58x_handle_urb_cmd(es58x_dev, urb_cmd);</div><div class='add'>+		} else if (ret == -ENODATA) {</div><div class='add'>+			es58x_copy_to_cmd_buf(es58x_dev, raw_cmd, raw_cmd_len);</div><div class='add'>+			return -ENODATA;</div><div class='add'>+		} else if (ret &lt; 0) {</div><div class='add'>+			ret = es58x_split_urb_try_recovery(es58x_dev, raw_cmd,</div><div class='add'>+							   raw_cmd_len);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		raw_cmd += ret;</div><div class='add'>+		raw_cmd_len -= ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_read_bulk_callback() - Callback for reading data from device.</div><div class='add'>+ * @urb: last urb buffer received.</div><div class='add'>+ *</div><div class='add'>+ * This function gets eventually called each time an URB is received</div><div class='add'>+ * from the ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Checks urb status, calls read function and resubmits urb read</div><div class='add'>+ * operation.</div><div class='add'>+ */</div><div class='add'>+static void es58x_read_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = urb-&gt;context;</div><div class='add'>+	const struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:		/* success */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+		dev_err_ratelimited(dev, "%s: error %pe\n",</div><div class='add'>+				    __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		es58x_print_hex_dump_debug(urb-&gt;transfer_buffer,</div><div class='add'>+					   urb-&gt;transfer_buffer_length);</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+</div><div class='add'>+	case -EPROTO:</div><div class='add'>+		dev_warn_ratelimited(dev, "%s: error %pe. Device unplugged?\n",</div><div class='add'>+				     __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		goto free_urb;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+		dev_err_ratelimited(dev, "%s: error %pe\n",</div><div class='add'>+				    __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		goto free_urb;</div><div class='add'>+</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		dev_dbg_ratelimited(dev, "%s: error %pe\n",</div><div class='add'>+				    __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		goto free_urb;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err_ratelimited(dev, "%s: error %pe\n",</div><div class='add'>+				    __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = es58x_split_urb(es58x_dev, urb);</div><div class='add'>+	if ((ret != -ENODATA) &amp;&amp; ret &lt; 0) {</div><div class='add'>+		dev_err(es58x_dev-&gt;dev, "es58x_split_urb() returned error %pe",</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+		es58x_print_hex_dump_debug(urb-&gt;transfer_buffer,</div><div class='add'>+					   urb-&gt;actual_length);</div><div class='add'>+</div><div class='add'>+		/* Because the urb command could not be parsed,</div><div class='add'>+		 * channel_id is not confirmed. Incrementing rx_errors</div><div class='add'>+		 * count of all channels.</div><div class='add'>+		 */</div><div class='add'>+		es58x_increment_rx_errors(es58x_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ resubmit_urb:</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (ret == -ENODEV) {</div><div class='add'>+		for (i = 0; i &lt; es58x_dev-&gt;num_can_ch; i++)</div><div class='add'>+			if (es58x_dev-&gt;netdev[i])</div><div class='add'>+				netif_device_detach(es58x_dev-&gt;netdev[i]);</div><div class='add'>+	} else if (ret)</div><div class='add'>+		dev_err_ratelimited(dev,</div><div class='add'>+				    "Failed resubmitting read bulk urb: %pe\n",</div><div class='add'>+				    ERR_PTR(ret));</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+ free_urb:</div><div class='add'>+	usb_free_coherent(urb-&gt;dev, urb-&gt;transfer_buffer_length,</div><div class='add'>+			  urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_write_bulk_callback() - Callback after writing data to the device.</div><div class='add'>+ * @urb: urb buffer which was previously submitted.</div><div class='add'>+ *</div><div class='add'>+ * This function gets eventually called each time an URB was sent to</div><div class='add'>+ * the ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Puts the @urb back to the urbs idle anchor and tries to restart the</div><div class='add'>+ * network queue.</div><div class='add'>+ */</div><div class='add'>+static void es58x_write_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = urb-&gt;context;</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0:		/* success */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -EOVERFLOW:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev, "%s: error %pe\n",</div><div class='add'>+				   __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		es58x_print_hex_dump(urb-&gt;transfer_buffer,</div><div class='add'>+				     urb-&gt;transfer_buffer_length);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_dbg(netdev, "%s: error %pe\n",</div><div class='add'>+				   __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		usb_free_coherent(urb-&gt;dev,</div><div class='add'>+				  es58x_dev-&gt;param-&gt;tx_urb_cmd_max_len,</div><div class='add'>+				  urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_info(netdev, "%s: error %pe\n",</div><div class='add'>+				    __func__, ERR_PTR(urb-&gt;status));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_anchor_urb(urb, &amp;es58x_dev-&gt;tx_urbs_idle);</div><div class='add'>+	atomic_inc(&amp;es58x_dev-&gt;tx_urbs_idle_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_alloc_urb() - Allocate memory for an URB and its transfer</div><div class='add'>+ *	buffer.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb: URB to be allocated.</div><div class='add'>+ * @buf: used to return DMA address of buffer.</div><div class='add'>+ * @buf_len: requested buffer size.</div><div class='add'>+ * @mem_flags: affect whether allocation may block.</div><div class='add'>+ *</div><div class='add'>+ * Allocates an URB and its @transfer_buffer and set its @transfer_dma</div><div class='add'>+ * address.</div><div class='add'>+ *</div><div class='add'>+ * This function is used at start-up to allocate all RX URBs at once</div><div class='add'>+ * and during run time for TX URBs.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -ENOMEM if no memory is available.</div><div class='add'>+ */</div><div class='add'>+static int es58x_alloc_urb(struct es58x_device *es58x_dev, struct urb **urb,</div><div class='add'>+			   u8 **buf, size_t buf_len, gfp_t mem_flags)</div><div class='add'>+{</div><div class='add'>+	*urb = usb_alloc_urb(0, mem_flags);</div><div class='add'>+	if (!*urb) {</div><div class='add'>+		dev_err(es58x_dev-&gt;dev, "No memory left for URBs\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*buf = usb_alloc_coherent(es58x_dev-&gt;udev, buf_len,</div><div class='add'>+				  mem_flags, &amp;(*urb)-&gt;transfer_dma);</div><div class='add'>+	if (!*buf) {</div><div class='add'>+		dev_err(es58x_dev-&gt;dev, "No memory left for USB buffer\n");</div><div class='add'>+		usb_free_urb(*urb);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	(*urb)-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_get_tx_urb() - Get an URB for transmission.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Gets an URB from the idle urbs anchor or allocate a new one if the</div><div class='add'>+ * anchor is empty.</div><div class='add'>+ *</div><div class='add'>+ * If there are more than ES58X_TX_URBS_MAX in the idle anchor, do</div><div class='add'>+ * some garbage collection. The garbage collection is done here</div><div class='add'>+ * instead of within es58x_write_bulk_callback() because</div><div class='add'>+ * usb_free_coherent() should not be used in IRQ context:</div><div class='add'>+ * c.f. WARN_ON(irqs_disabled()) in dma_free_attrs().</div><div class='add'>+ *</div><div class='add'>+ * Return: a pointer to an URB on success, NULL if no memory is</div><div class='add'>+ * available.</div><div class='add'>+ */</div><div class='add'>+static struct urb *es58x_get_tx_urb(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	atomic_t *idle_cnt = &amp;es58x_dev-&gt;tx_urbs_idle_cnt;</div><div class='add'>+	struct urb *urb = usb_get_from_anchor(&amp;es58x_dev-&gt;tx_urbs_idle);</div><div class='add'>+</div><div class='add'>+	if (!urb) {</div><div class='add'>+		size_t tx_buf_len;</div><div class='add'>+		u8 *buf;</div><div class='add'>+</div><div class='add'>+		tx_buf_len = es58x_dev-&gt;param-&gt;tx_urb_cmd_max_len;</div><div class='add'>+		if (es58x_alloc_urb(es58x_dev, &amp;urb, &amp;buf, tx_buf_len,</div><div class='add'>+				    GFP_ATOMIC))</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		usb_fill_bulk_urb(urb, es58x_dev-&gt;udev, es58x_dev-&gt;tx_pipe,</div><div class='add'>+				  buf, tx_buf_len, es58x_write_bulk_callback,</div><div class='add'>+				  NULL);</div><div class='add'>+		return urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (atomic_dec_return(idle_cnt) &gt; ES58X_TX_URBS_MAX) {</div><div class='add'>+		/* Garbage collector */</div><div class='add'>+		struct urb *tmp = usb_get_from_anchor(&amp;es58x_dev-&gt;tx_urbs_idle);</div><div class='add'>+</div><div class='add'>+		if (!tmp)</div><div class='add'>+			break;</div><div class='add'>+		usb_free_coherent(tmp-&gt;dev,</div><div class='add'>+				  es58x_dev-&gt;param-&gt;tx_urb_cmd_max_len,</div><div class='add'>+				  tmp-&gt;transfer_buffer, tmp-&gt;transfer_dma);</div><div class='add'>+		usb_free_urb(tmp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return urb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_submit_urb() - Send data to the device.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @urb: URB to be sent.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_submit_urb(struct es58x_device *es58x_dev, struct urb *urb,</div><div class='add'>+			    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	es58x_set_crc(urb-&gt;transfer_buffer, urb-&gt;transfer_buffer_length);</div><div class='add'>+	urb-&gt;context = netdev;</div><div class='add'>+	usb_anchor_urb(urb, &amp;es58x_dev-&gt;tx_urbs_busy);</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(netdev, "%s: USB send urb failure: %pe\n",</div><div class='add'>+			   __func__, ERR_PTR(ret));</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+		usb_free_coherent(urb-&gt;dev,</div><div class='add'>+				  es58x_dev-&gt;param-&gt;tx_urb_cmd_max_len,</div><div class='add'>+				  urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+	}</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_send_msg() - Prepare an URB and submit it.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @cmd_type: Command type.</div><div class='add'>+ * @cmd_id: Command ID.</div><div class='add'>+ * @msg: ES58X message to be sent.</div><div class='add'>+ * @msg_len: Length of @msg.</div><div class='add'>+ * @channel_idx: Index of the network device.</div><div class='add'>+ *</div><div class='add'>+ * Creates an URB command from a given message, sets the header and the</div><div class='add'>+ * CRC and then submits it.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+int es58x_send_msg(struct es58x_device *es58x_dev, u8 cmd_type, u8 cmd_id,</div><div class='add'>+		   const void *msg, u16 msg_len, int channel_idx)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	union es58x_urb_cmd *urb_cmd;</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	int urb_cmd_len;</div><div class='add'>+</div><div class='add'>+	if (channel_idx == ES58X_CHANNEL_IDX_NA)</div><div class='add'>+		netdev = es58x_dev-&gt;netdev[0];	/* Default to first channel */</div><div class='add'>+	else</div><div class='add'>+		netdev = es58x_dev-&gt;netdev[channel_idx];</div><div class='add'>+</div><div class='add'>+	urb_cmd_len = es58x_get_urb_cmd_len(es58x_dev, msg_len);</div><div class='add'>+	if (urb_cmd_len &gt; es58x_dev-&gt;param-&gt;tx_urb_cmd_max_len)</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+</div><div class='add'>+	urb = es58x_get_tx_urb(es58x_dev);</div><div class='add'>+	if (!urb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	urb_cmd = urb-&gt;transfer_buffer;</div><div class='add'>+	es58x_dev-&gt;ops-&gt;fill_urb_header(urb_cmd, cmd_type, cmd_id,</div><div class='add'>+					channel_idx, msg_len);</div><div class='add'>+	memcpy(&amp;urb_cmd-&gt;raw_cmd[es58x_dev-&gt;param-&gt;urb_cmd_header_len],</div><div class='add'>+	       msg, msg_len);</div><div class='add'>+	urb-&gt;transfer_buffer_length = urb_cmd_len;</div><div class='add'>+</div><div class='add'>+	return es58x_submit_urb(es58x_dev, urb, netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_alloc_rx_urbs() - Allocate RX URBs.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Allocate URBs for reception and anchor them.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_alloc_rx_urbs(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	const struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	const struct es58x_parameters *param = es58x_dev-&gt;param;</div><div class='add'>+	u16 rx_buf_len = usb_maxpacket(es58x_dev-&gt;udev, es58x_dev-&gt;rx_pipe);</div><div class='add'>+	struct urb *urb;</div><div class='add'>+	u8 *buf;</div><div class='add'>+	int i;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; param-&gt;rx_urb_max; i++) {</div><div class='add'>+		ret = es58x_alloc_urb(es58x_dev, &amp;urb, &amp;buf, rx_buf_len,</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		usb_fill_bulk_urb(urb, es58x_dev-&gt;udev, es58x_dev-&gt;rx_pipe,</div><div class='add'>+				  buf, rx_buf_len, es58x_read_bulk_callback,</div><div class='add'>+				  es58x_dev);</div><div class='add'>+		usb_anchor_urb(urb, &amp;es58x_dev-&gt;rx_urbs);</div><div class='add'>+</div><div class='add'>+		ret = usb_submit_urb(urb, GFP_KERNEL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			usb_unanchor_urb(urb);</div><div class='add'>+			usb_free_coherent(es58x_dev-&gt;udev, rx_buf_len,</div><div class='add'>+					  buf, urb-&gt;transfer_dma);</div><div class='add'>+			usb_free_urb(urb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i == 0) {</div><div class='add'>+		dev_err(dev, "%s: Could not setup any rx URBs\n", __func__);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	dev_dbg(dev, "%s: Allocated %d rx URBs each of size %u\n",</div><div class='add'>+		__func__, i, rx_buf_len);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_free_urbs() - Free all the TX and RX URBs.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ */</div><div class='add'>+static void es58x_free_urbs(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	struct urb *urb;</div><div class='add'>+</div><div class='add'>+	if (!usb_wait_anchor_empty_timeout(&amp;es58x_dev-&gt;tx_urbs_busy, 1000)) {</div><div class='add'>+		dev_err(es58x_dev-&gt;dev, "%s: Timeout, some TX urbs still remain\n",</div><div class='add'>+			__func__);</div><div class='add'>+		usb_kill_anchored_urbs(&amp;es58x_dev-&gt;tx_urbs_busy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while ((urb = usb_get_from_anchor(&amp;es58x_dev-&gt;tx_urbs_idle)) != NULL) {</div><div class='add'>+		usb_free_coherent(urb-&gt;dev, es58x_dev-&gt;param-&gt;tx_urb_cmd_max_len,</div><div class='add'>+				  urb-&gt;transfer_buffer, urb-&gt;transfer_dma);</div><div class='add'>+		usb_free_urb(urb);</div><div class='add'>+		atomic_dec(&amp;es58x_dev-&gt;tx_urbs_idle_cnt);</div><div class='add'>+	}</div><div class='add'>+	if (atomic_read(&amp;es58x_dev-&gt;tx_urbs_idle_cnt))</div><div class='add'>+		dev_err(es58x_dev-&gt;dev,</div><div class='add'>+			"All idle urbs were freed but tx_urb_idle_cnt is %d\n",</div><div class='add'>+			atomic_read(&amp;es58x_dev-&gt;tx_urbs_idle_cnt));</div><div class='add'>+</div><div class='add'>+	usb_kill_anchored_urbs(&amp;es58x_dev-&gt;rx_urbs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_open() - Enable the network device.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Called when the network transitions to the up state. Allocate the</div><div class='add'>+ * URB resources if needed and open the channel.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!es58x_dev-&gt;opened_channel_cnt) {</div><div class='add'>+		ret = es58x_alloc_rx_urbs(es58x_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = es58x_set_realtime_diff_ns(es58x_dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto free_urbs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = open_candev(netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_urbs;</div><div class='add'>+</div><div class='add'>+	ret = es58x_dev-&gt;ops-&gt;enable_channel(es58x_priv(netdev));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_urbs;</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;opened_channel_cnt++;</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+ free_urbs:</div><div class='add'>+	if (!es58x_dev-&gt;opened_channel_cnt)</div><div class='add'>+		es58x_free_urbs(es58x_dev);</div><div class='add'>+	netdev_err(netdev, "%s: Could not open the network device: %pe\n",</div><div class='add'>+		   __func__, ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_stop() - Disable the network device.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Called when the network transitions to the down state. If all the</div><div class='add'>+ * channels of the device are closed, free the URB resources which are</div><div class='add'>+ * not needed anymore.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	ret = es58x_dev-&gt;ops-&gt;disable_channel(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+	es58x_can_reset_echo_fifo(netdev);</div><div class='add'>+	close_candev(netdev);</div><div class='add'>+</div><div class='add'>+	es58x_flush_pending_tx_msg(netdev);</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;opened_channel_cnt--;</div><div class='add'>+	if (!es58x_dev-&gt;opened_channel_cnt)</div><div class='add'>+		es58x_free_urbs(es58x_dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_xmit_commit() - Send the bulk urb.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Do the bulk send. This function should be called only once by bulk</div><div class='add'>+ * transmission.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_xmit_commit(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!es58x_is_can_state_active(netdev))</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	if (es58x_is_echo_skb_threshold_reached(priv))</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	ret = es58x_submit_urb(priv-&gt;es58x_dev, priv-&gt;tx_urb, netdev);</div><div class='add'>+	if (ret == 0)</div><div class='add'>+		priv-&gt;tx_urb = NULL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_xmit_more() - Can we put more packets?</div><div class='add'>+ * @priv: ES58X private parameters related to the network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if we can put more, false if it is time to send.</div><div class='add'>+ */</div><div class='add'>+static bool es58x_xmit_more(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned int free_slots =</div><div class='add'>+	    priv-&gt;can.echo_skb_max - (priv-&gt;tx_head - priv-&gt;tx_tail);</div><div class='add'>+</div><div class='add'>+	return netdev_xmit_more() &amp;&amp; free_slots &gt; 0 &amp;&amp;</div><div class='add'>+		priv-&gt;tx_can_msg_cnt &lt; priv-&gt;es58x_dev-&gt;param-&gt;tx_bulk_max;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_start_xmit() - Transmit an skb.</div><div class='add'>+ * @skb: socket buffer of a CAN message.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Called when a packet needs to be transmitted.</div><div class='add'>+ *</div><div class='add'>+ * This function relies on Byte Queue Limits (BQL). The main benefit</div><div class='add'>+ * is to increase the throughput by allowing bulk transfers</div><div class='add'>+ * (c.f. xmit_more flag).</div><div class='add'>+ *</div><div class='add'>+ * Queues up to tx_bulk_max messages in &amp;tx_urb buffer and does</div><div class='add'>+ * a bulk send of all messages in one single URB.</div><div class='add'>+ *</div><div class='add'>+ * Return: NETDEV_TX_OK regardless of if we could transmit the @skb or</div><div class='add'>+ *	had to drop it.</div><div class='add'>+ */</div><div class='add'>+static netdev_tx_t es58x_start_xmit(struct sk_buff *skb,</div><div class='add'>+				    struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+	unsigned int frame_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb)) {</div><div class='add'>+		if (priv-&gt;tx_urb)</div><div class='add'>+			goto xmit_commit;</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_urb &amp;&amp; priv-&gt;tx_can_msg_is_fd != can_is_canfd_skb(skb)) {</div><div class='add'>+		/* Can not do bulk send with mixed CAN and CAN FD frames. */</div><div class='add'>+		ret = es58x_xmit_commit(netdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto drop_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;tx_urb) {</div><div class='add'>+		priv-&gt;tx_urb = es58x_get_tx_urb(es58x_dev);</div><div class='add'>+		if (!priv-&gt;tx_urb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto drop_skb;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;tx_can_msg_cnt = 0;</div><div class='add'>+		priv-&gt;tx_can_msg_is_fd = can_is_canfd_skb(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = es58x_dev-&gt;ops-&gt;tx_can_msg(priv, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto drop_skb;</div><div class='add'>+</div><div class='add'>+	frame_len = can_skb_get_frame_len(skb);</div><div class='add'>+	ret = can_put_echo_skb(skb, netdev,</div><div class='add'>+			       priv-&gt;tx_head &amp; es58x_dev-&gt;param-&gt;fifo_mask,</div><div class='add'>+			       frame_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto xmit_failure;</div><div class='add'>+	netdev_sent_queue(netdev, frame_len);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_head++;</div><div class='add'>+	priv-&gt;tx_can_msg_cnt++;</div><div class='add'>+</div><div class='add'>+ xmit_commit:</div><div class='add'>+	if (!es58x_xmit_more(priv)) {</div><div class='add'>+		ret = es58x_xmit_commit(netdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto xmit_failure;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+ drop_skb:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	netdev-&gt;stats.tx_dropped++;</div><div class='add'>+ xmit_failure:</div><div class='add'>+	netdev_warn(netdev, "%s: send message failure: %pe\n",</div><div class='add'>+		    __func__, ERR_PTR(ret));</div><div class='add'>+	netdev-&gt;stats.tx_errors++;</div><div class='add'>+	es58x_flush_pending_tx_msg(netdev);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops es58x_netdev_ops = {</div><div class='add'>+	.ndo_open = es58x_open,</div><div class='add'>+	.ndo_stop = es58x_stop,</div><div class='add'>+	.ndo_start_xmit = es58x_start_xmit,</div><div class='add'>+	.ndo_hwtstamp_get = can_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = can_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops es58x_ethtool_ops = {</div><div class='add'>+	.get_ts_info = can_ethtool_op_get_ts_info_hwts,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_set_mode() - Change network device mode.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ * @mode: either %CAN_MODE_START, %CAN_MODE_STOP or %CAN_MODE_SLEEP</div><div class='add'>+ *</div><div class='add'>+ * Currently, this function is only used to stop and restart the</div><div class='add'>+ * channel during a bus off event (c.f. es58x_rx_err_msg() and</div><div class='add'>+ * drivers/net/can/dev.c:can_restart() which are the two only</div><div class='add'>+ * callers).</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_set_mode(struct net_device *netdev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		switch (priv-&gt;can.state) {</div><div class='add'>+		case CAN_STATE_BUS_OFF:</div><div class='add'>+			return priv-&gt;es58x_dev-&gt;ops-&gt;enable_channel(priv);</div><div class='add'>+</div><div class='add'>+		case CAN_STATE_STOPPED:</div><div class='add'>+			return es58x_open(netdev);</div><div class='add'>+</div><div class='add'>+		case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		case CAN_STATE_ERROR_WARNING:</div><div class='add'>+		case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+		default:</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case CAN_MODE_STOP:</div><div class='add'>+		switch (priv-&gt;can.state) {</div><div class='add'>+		case CAN_STATE_STOPPED:</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		case CAN_STATE_ERROR_ACTIVE:</div><div class='add'>+		case CAN_STATE_ERROR_WARNING:</div><div class='add'>+		case CAN_STATE_ERROR_PASSIVE:</div><div class='add'>+		case CAN_STATE_BUS_OFF:</div><div class='add'>+		default:</div><div class='add'>+			return priv-&gt;es58x_dev-&gt;ops-&gt;disable_channel(priv);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	case CAN_MODE_SLEEP:</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_init_priv() - Initialize private parameters.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @priv: ES58X private parameters related to the network device.</div><div class='add'>+ * @channel_idx: Index of the network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno if devlink port could not be</div><div class='add'>+ *	properly registered.</div><div class='add'>+ */</div><div class='add'>+static int es58x_init_priv(struct es58x_device *es58x_dev,</div><div class='add'>+			   struct es58x_priv *priv, int channel_idx)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port_attrs attrs = {</div><div class='add'>+		.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='add'>+	};</div><div class='add'>+	const struct es58x_parameters *param = es58x_dev-&gt;param;</div><div class='add'>+	struct can_priv *can = &amp;priv-&gt;can;</div><div class='add'>+</div><div class='add'>+	priv-&gt;es58x_dev = es58x_dev;</div><div class='add'>+	priv-&gt;channel_idx = channel_idx;</div><div class='add'>+	priv-&gt;tx_urb = NULL;</div><div class='add'>+	priv-&gt;tx_can_msg_cnt = 0;</div><div class='add'>+</div><div class='add'>+	can-&gt;bittiming_const = param-&gt;bittiming_const;</div><div class='add'>+	if (param-&gt;ctrlmode_supported &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		can-&gt;fd.data_bittiming_const = param-&gt;data_bittiming_const;</div><div class='add'>+		can-&gt;fd.tdc_const = param-&gt;tdc_const;</div><div class='add'>+	}</div><div class='add'>+	can-&gt;bitrate_max = param-&gt;bitrate_max;</div><div class='add'>+	can-&gt;clock = param-&gt;clock;</div><div class='add'>+	can-&gt;state = CAN_STATE_STOPPED;</div><div class='add'>+	can-&gt;ctrlmode_supported = param-&gt;ctrlmode_supported;</div><div class='add'>+	can-&gt;do_set_mode = es58x_set_mode;</div><div class='add'>+</div><div class='add'>+	devlink_port_attrs_set(&amp;priv-&gt;devlink_port, &amp;attrs);</div><div class='add'>+	return devlink_port_register(priv_to_devlink(es58x_dev),</div><div class='add'>+				     &amp;priv-&gt;devlink_port, channel_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_init_netdev() - Initialize the network device.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @channel_idx: Index of the network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_init_netdev(struct es58x_device *es58x_dev, int channel_idx)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct device *dev = es58x_dev-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_candev(sizeof(struct es58x_priv),</div><div class='add'>+			      es58x_dev-&gt;param-&gt;fifo_mask + 1);</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		dev_err(dev, "Could not allocate candev\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	SET_NETDEV_DEV(netdev, dev);</div><div class='add'>+	es58x_dev-&gt;netdev[channel_idx] = netdev;</div><div class='add'>+	ret = es58x_init_priv(es58x_dev, es58x_priv(netdev), channel_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_candev;</div><div class='add'>+	SET_NETDEV_DEVLINK_PORT(netdev, &amp;es58x_priv(netdev)-&gt;devlink_port);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;es58x_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;es58x_ethtool_ops;</div><div class='add'>+	netdev-&gt;flags |= IFF_ECHO;	/* We support local echo */</div><div class='add'>+	netdev-&gt;dev_port = channel_idx;</div><div class='add'>+</div><div class='add'>+	ret = register_candev(netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto devlink_port_unregister;</div><div class='add'>+</div><div class='add'>+	netdev_queue_set_dql_min_limit(netdev_get_tx_queue(netdev, 0),</div><div class='add'>+				       es58x_dev-&gt;param-&gt;dql_min_limit);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+ devlink_port_unregister:</div><div class='add'>+	devlink_port_unregister(&amp;es58x_priv(netdev)-&gt;devlink_port);</div><div class='add'>+ free_candev:</div><div class='add'>+	es58x_dev-&gt;netdev[channel_idx] = NULL;</div><div class='add'>+	free_candev(netdev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_free_netdevs() - Release all network resources of the device.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ */</div><div class='add'>+static void es58x_free_netdevs(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; es58x_dev-&gt;num_can_ch; i++) {</div><div class='add'>+		struct net_device *netdev = es58x_dev-&gt;netdev[i];</div><div class='add'>+</div><div class='add'>+		if (!netdev)</div><div class='add'>+			continue;</div><div class='add'>+		unregister_candev(netdev);</div><div class='add'>+		devlink_port_unregister(&amp;es58x_priv(netdev)-&gt;devlink_port);</div><div class='add'>+		es58x_dev-&gt;netdev[i] = NULL;</div><div class='add'>+		free_candev(netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_init_es58x_dev() - Initialize the ES58X device.</div><div class='add'>+ * @intf: USB interface.</div><div class='add'>+ * @driver_info: Quirks of the device.</div><div class='add'>+ *</div><div class='add'>+ * Return: pointer to an ES58X device on success, error pointer when</div><div class='add'>+ *	any error occurs.</div><div class='add'>+ */</div><div class='add'>+static struct es58x_device *es58x_init_es58x_dev(struct usb_interface *intf,</div><div class='add'>+						 kernel_ulong_t driver_info)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;intf-&gt;dev;</div><div class='add'>+	struct es58x_device *es58x_dev;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	const struct es58x_parameters *param;</div><div class='add'>+	const struct es58x_operators *ops;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct usb_endpoint_descriptor *ep_in, *ep_out;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Starting %s %s (Serial Number %s)\n",</div><div class='add'>+		 udev-&gt;manufacturer, udev-&gt;product, udev-&gt;serial);</div><div class='add'>+</div><div class='add'>+	ret = usb_find_common_endpoints(intf-&gt;cur_altsetting, &amp;ep_in, &amp;ep_out,</div><div class='add'>+					NULL, NULL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+</div><div class='add'>+	if (driver_info &amp; ES58X_FD_FAMILY) {</div><div class='add'>+		param = &amp;es58x_fd_param;</div><div class='add'>+		ops = &amp;es58x_fd_ops;</div><div class='add'>+	} else {</div><div class='add'>+		param = &amp;es581_4_param;</div><div class='add'>+		ops = &amp;es581_4_ops;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink = devlink_alloc(&amp;es58x_dl_ops, es58x_sizeof_es58x_device(param),</div><div class='add'>+				dev);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	es58x_dev = devlink_priv(devlink);</div><div class='add'>+	es58x_dev-&gt;param = param;</div><div class='add'>+	es58x_dev-&gt;ops = ops;</div><div class='add'>+	es58x_dev-&gt;dev = dev;</div><div class='add'>+	es58x_dev-&gt;udev = udev;</div><div class='add'>+</div><div class='add'>+	if (driver_info &amp; ES58X_DUAL_CHANNEL)</div><div class='add'>+		es58x_dev-&gt;num_can_ch = 2;</div><div class='add'>+	else</div><div class='add'>+		es58x_dev-&gt;num_can_ch = 1;</div><div class='add'>+</div><div class='add'>+	init_usb_anchor(&amp;es58x_dev-&gt;rx_urbs);</div><div class='add'>+	init_usb_anchor(&amp;es58x_dev-&gt;tx_urbs_idle);</div><div class='add'>+	init_usb_anchor(&amp;es58x_dev-&gt;tx_urbs_busy);</div><div class='add'>+	atomic_set(&amp;es58x_dev-&gt;tx_urbs_idle_cnt, 0);</div><div class='add'>+	usb_set_intfdata(intf, es58x_dev);</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;rx_pipe = usb_rcvbulkpipe(es58x_dev-&gt;udev,</div><div class='add'>+					     ep_in-&gt;bEndpointAddress);</div><div class='add'>+	es58x_dev-&gt;tx_pipe = usb_sndbulkpipe(es58x_dev-&gt;udev,</div><div class='add'>+					     ep_out-&gt;bEndpointAddress);</div><div class='add'>+</div><div class='add'>+	return es58x_dev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_probe() - Initialize the USB device.</div><div class='add'>+ * @intf: USB interface.</div><div class='add'>+ * @id: USB device ID.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -ENODEV if the interface is not supported</div><div class='add'>+ * or errno when any other error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_probe(struct usb_interface *intf,</div><div class='add'>+		       const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev;</div><div class='add'>+	int ch_idx;</div><div class='add'>+</div><div class='add'>+	es58x_dev = es58x_init_es58x_dev(intf, id-&gt;driver_info);</div><div class='add'>+	if (IS_ERR(es58x_dev))</div><div class='add'>+		return PTR_ERR(es58x_dev);</div><div class='add'>+</div><div class='add'>+	es58x_parse_product_info(es58x_dev);</div><div class='add'>+	devlink_register(priv_to_devlink(es58x_dev));</div><div class='add'>+</div><div class='add'>+	for (ch_idx = 0; ch_idx &lt; es58x_dev-&gt;num_can_ch; ch_idx++) {</div><div class='add'>+		int ret = es58x_init_netdev(es58x_dev, ch_idx);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			es58x_free_netdevs(es58x_dev);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_disconnect() - Disconnect the USB device.</div><div class='add'>+ * @intf: USB interface</div><div class='add'>+ *</div><div class='add'>+ * Called by the usb core when driver is unloaded or device is</div><div class='add'>+ * removed.</div><div class='add'>+ */</div><div class='add'>+static void es58x_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = usb_get_intfdata(intf);</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Disconnecting %s %s\n",</div><div class='add'>+		 es58x_dev-&gt;udev-&gt;manufacturer, es58x_dev-&gt;udev-&gt;product);</div><div class='add'>+</div><div class='add'>+	devlink_unregister(priv_to_devlink(es58x_dev));</div><div class='add'>+	es58x_free_netdevs(es58x_dev);</div><div class='add'>+	es58x_free_urbs(es58x_dev);</div><div class='add'>+	devlink_free(priv_to_devlink(es58x_dev));</div><div class='add'>+	usb_set_intfdata(intf, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver es58x_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.probe = es58x_probe,</div><div class='add'>+	.disconnect = es58x_disconnect,</div><div class='add'>+	.id_table = es58x_id_table</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_usb_driver(es58x_driver);</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.h b/drivers/net/can/usb/etas_es58x/es58x_core.h<br/>new file mode 100644<br/>index 000000000000..2e183bdeedd7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es58x_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es58x_core.h</a></div><div class='hunk'>@@ -0,0 +1,750 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es58x_core.h: All common definitions and declarations.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020 ETAS K.K.. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020-2022 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ES58X_COMMON_H__</div><div class='add'>+#define __ES58X_COMMON_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "es581_4.h"</div><div class='add'>+#include "es58x_fd.h"</div><div class='add'>+</div><div class='add'>+/* Driver constants */</div><div class='add'>+#define ES58X_RX_URBS_MAX 5	/* Empirical value */</div><div class='add'>+#define ES58X_TX_URBS_MAX 6	/* Empirical value */</div><div class='add'>+</div><div class='add'>+#define ES58X_MAX(param)				\</div><div class='add'>+	(ES581_4_##param &gt; ES58X_FD_##param ?		\</div><div class='add'>+		ES581_4_##param : ES58X_FD_##param)</div><div class='add'>+#define ES58X_TX_BULK_MAX ES58X_MAX(TX_BULK_MAX)</div><div class='add'>+#define ES58X_RX_BULK_MAX ES58X_MAX(RX_BULK_MAX)</div><div class='add'>+#define ES58X_ECHO_BULK_MAX ES58X_MAX(ECHO_BULK_MAX)</div><div class='add'>+#define ES58X_NUM_CAN_CH_MAX ES58X_MAX(NUM_CAN_CH)</div><div class='add'>+</div><div class='add'>+/* Use this when channel index is irrelevant (e.g. device</div><div class='add'>+ * timestamp).</div><div class='add'>+ */</div><div class='add'>+#define ES58X_CHANNEL_IDX_NA 0xFF</div><div class='add'>+#define ES58X_EMPTY_MSG NULL</div><div class='add'>+</div><div class='add'>+/* Threshold on consecutive CAN_STATE_ERROR_PASSIVE. If we receive</div><div class='add'>+ * ES58X_CONSECUTIVE_ERR_PASSIVE_MAX times the event</div><div class='add'>+ * ES58X_ERR_CRTL_PASSIVE in a row without any successful RX or TX,</div><div class='add'>+ * we force the device to switch to CAN_STATE_BUS_OFF state.</div><div class='add'>+ */</div><div class='add'>+#define ES58X_CONSECUTIVE_ERR_PASSIVE_MAX 254</div><div class='add'>+</div><div class='add'>+/* A magic number sent by the ES581.4 to inform it is alive. */</div><div class='add'>+#define ES58X_HEARTBEAT 0x11</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_driver_info - Quirks of the device.</div><div class='add'>+ * @ES58X_DUAL_CHANNEL: Device has two CAN channels. If this flag is</div><div class='add'>+ *	not set, it is implied that the device has only one CAN</div><div class='add'>+ *	channel.</div><div class='add'>+ * @ES58X_FD_FAMILY: Device is CAN-FD capable. If this flag is not</div><div class='add'>+ *	set, the device only supports classical CAN.</div><div class='add'>+ */</div><div class='add'>+enum es58x_driver_info {</div><div class='add'>+	ES58X_DUAL_CHANNEL = BIT(0),</div><div class='add'>+	ES58X_FD_FAMILY = BIT(1)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum es58x_echo {</div><div class='add'>+	ES58X_ECHO_OFF = 0,</div><div class='add'>+	ES58X_ECHO_ON = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_physical_layer - Type of the physical layer.</div><div class='add'>+ * @ES58X_PHYSICAL_LAYER_HIGH_SPEED: High-speed CAN (c.f. ISO</div><div class='add'>+ *	11898-2).</div><div class='add'>+ *</div><div class='add'>+ * Some products of the ETAS portfolio also support low-speed CAN</div><div class='add'>+ * (c.f. ISO 11898-3). However, all the devices in scope of this</div><div class='add'>+ * driver do not support the option, thus, the enum has only one</div><div class='add'>+ * member.</div><div class='add'>+ */</div><div class='add'>+enum es58x_physical_layer {</div><div class='add'>+	ES58X_PHYSICAL_LAYER_HIGH_SPEED = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum es58x_samples_per_bit {</div><div class='add'>+	ES58X_SAMPLES_PER_BIT_ONE = 1,</div><div class='add'>+	ES58X_SAMPLES_PER_BIT_THREE = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_sync_edge - Synchronization method.</div><div class='add'>+ * @ES58X_SYNC_EDGE_SINGLE: ISO CAN specification defines the use of a</div><div class='add'>+ *	single edge synchronization.  The synchronization should be</div><div class='add'>+ *	done on recessive to dominant level change.</div><div class='add'>+ *</div><div class='add'>+ * For information, ES582.1 and ES584.1 also support a double</div><div class='add'>+ * synchronization, requiring both recessive to dominant then dominant</div><div class='add'>+ * to recessive level change. However, this is not supported in</div><div class='add'>+ * SocketCAN framework, thus, the enum has only one member.</div><div class='add'>+ */</div><div class='add'>+enum es58x_sync_edge {</div><div class='add'>+	ES58X_SYNC_EDGE_SINGLE = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_flag - CAN flags for RX/TX messages.</div><div class='add'>+ * @ES58X_FLAG_EFF: Extended Frame Format (EFF).</div><div class='add'>+ * @ES58X_FLAG_RTR: Remote Transmission Request (RTR).</div><div class='add'>+ * @ES58X_FLAG_FD_BRS: Bit rate switch (BRS): second bitrate for</div><div class='add'>+ *	payload data.</div><div class='add'>+ * @ES58X_FLAG_FD_ESI: Error State Indicator (ESI): tell if the</div><div class='add'>+ *	transmitting node is in error passive mode.</div><div class='add'>+ * @ES58X_FLAG_FD_DATA: CAN FD frame.</div><div class='add'>+ */</div><div class='add'>+enum es58x_flag {</div><div class='add'>+	ES58X_FLAG_EFF = BIT(0),</div><div class='add'>+	ES58X_FLAG_RTR = BIT(1),</div><div class='add'>+	ES58X_FLAG_FD_BRS = BIT(3),</div><div class='add'>+	ES58X_FLAG_FD_ESI = BIT(5),</div><div class='add'>+	ES58X_FLAG_FD_DATA = BIT(6)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_err - CAN error detection.</div><div class='add'>+ * @ES58X_ERR_OK: No errors.</div><div class='add'>+ * @ES58X_ERR_PROT_STUFF: Bit stuffing error: more than 5 consecutive</div><div class='add'>+ *	equal bits.</div><div class='add'>+ * @ES58X_ERR_PROT_FORM: Frame format error.</div><div class='add'>+ * @ES58X_ERR_ACK: Received no ACK on transmission.</div><div class='add'>+ * @ES58X_ERR_PROT_BIT: Single bit error.</div><div class='add'>+ * @ES58X_ERR_PROT_CRC: Incorrect 15, 17 or 21 bits CRC.</div><div class='add'>+ * @ES58X_ERR_PROT_BIT1: Unable to send recessive bit: tried to send</div><div class='add'>+ *	recessive bit 1 but monitored dominant bit 0.</div><div class='add'>+ * @ES58X_ERR_PROT_BIT0: Unable to send dominant bit: tried to send</div><div class='add'>+ *	dominant bit 0 but monitored recessive bit 1.</div><div class='add'>+ * @ES58X_ERR_PROT_OVERLOAD: Bus overload.</div><div class='add'>+ * @ES58X_ERR_PROT_UNSPEC: Unspecified.</div><div class='add'>+ *</div><div class='add'>+ * Please refer to ISO 11898-1:2015, section 10.11 "Error detection"</div><div class='add'>+ * and section 10.13 "Overload signaling" for additional details.</div><div class='add'>+ */</div><div class='add'>+enum es58x_err {</div><div class='add'>+	ES58X_ERR_OK = 0,</div><div class='add'>+	ES58X_ERR_PROT_STUFF = BIT(0),</div><div class='add'>+	ES58X_ERR_PROT_FORM = BIT(1),</div><div class='add'>+	ES58X_ERR_ACK = BIT(2),</div><div class='add'>+	ES58X_ERR_PROT_BIT = BIT(3),</div><div class='add'>+	ES58X_ERR_PROT_CRC = BIT(4),</div><div class='add'>+	ES58X_ERR_PROT_BIT1 = BIT(5),</div><div class='add'>+	ES58X_ERR_PROT_BIT0 = BIT(6),</div><div class='add'>+	ES58X_ERR_PROT_OVERLOAD = BIT(7),</div><div class='add'>+	ES58X_ERR_PROT_UNSPEC = BIT(31)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_event - CAN error codes returned by the device.</div><div class='add'>+ * @ES58X_EVENT_OK: No errors.</div><div class='add'>+ * @ES58X_EVENT_CRTL_ACTIVE: Active state: both TR and RX error count</div><div class='add'>+ *	is less than 128.</div><div class='add'>+ * @ES58X_EVENT_CRTL_PASSIVE: Passive state: either TX or RX error</div><div class='add'>+ *	count is greater than 127.</div><div class='add'>+ * @ES58X_EVENT_CRTL_WARNING: Warning state: either TX or RX error</div><div class='add'>+ *	count is greater than 96.</div><div class='add'>+ * @ES58X_EVENT_BUSOFF: Bus off.</div><div class='add'>+ * @ES58X_EVENT_SINGLE_WIRE: Lost connection on either CAN high or CAN</div><div class='add'>+ *	low.</div><div class='add'>+ *</div><div class='add'>+ * Please refer to ISO 11898-1:2015, section 12.1.4 "Rules of fault</div><div class='add'>+ * confinement" for additional details.</div><div class='add'>+ */</div><div class='add'>+enum es58x_event {</div><div class='add'>+	ES58X_EVENT_OK = 0,</div><div class='add'>+	ES58X_EVENT_CRTL_ACTIVE = BIT(0),</div><div class='add'>+	ES58X_EVENT_CRTL_PASSIVE = BIT(1),</div><div class='add'>+	ES58X_EVENT_CRTL_WARNING = BIT(2),</div><div class='add'>+	ES58X_EVENT_BUSOFF = BIT(3),</div><div class='add'>+	ES58X_EVENT_SINGLE_WIRE = BIT(4)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* enum es58x_ret_u8 - Device return error codes, 8 bit format.</div><div class='add'>+ *</div><div class='add'>+ * Specific to ES581.4.</div><div class='add'>+ */</div><div class='add'>+enum es58x_ret_u8 {</div><div class='add'>+	ES58X_RET_U8_OK = 0x00,</div><div class='add'>+	ES58X_RET_U8_ERR_UNSPECIFIED_FAILURE = 0x80,</div><div class='add'>+	ES58X_RET_U8_ERR_NO_MEM = 0x81,</div><div class='add'>+	ES58X_RET_U8_ERR_BAD_CRC = 0x99</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* enum es58x_ret_u32 - Device return error codes, 32 bit format.</div><div class='add'>+ */</div><div class='add'>+enum es58x_ret_u32 {</div><div class='add'>+	ES58X_RET_U32_OK = 0x00000000UL,</div><div class='add'>+	ES58X_RET_U32_ERR_UNSPECIFIED_FAILURE = 0x80000000UL,</div><div class='add'>+	ES58X_RET_U32_ERR_NO_MEM = 0x80004001UL,</div><div class='add'>+	ES58X_RET_U32_WARN_PARAM_ADJUSTED = 0x40004000UL,</div><div class='add'>+	ES58X_RET_U32_WARN_TX_MAYBE_REORDER = 0x40004001UL,</div><div class='add'>+	ES58X_RET_U32_ERR_TIMEDOUT = 0x80000008UL,</div><div class='add'>+	ES58X_RET_U32_ERR_FIFO_FULL = 0x80003002UL,</div><div class='add'>+	ES58X_RET_U32_ERR_BAD_CONFIG = 0x80004000UL,</div><div class='add'>+	ES58X_RET_U32_ERR_NO_RESOURCE = 0x80004002UL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* enum es58x_ret_type - Type of the command returned by the ES58X</div><div class='add'>+ *	device.</div><div class='add'>+ */</div><div class='add'>+enum es58x_ret_type {</div><div class='add'>+	ES58X_RET_TYPE_SET_BITTIMING,</div><div class='add'>+	ES58X_RET_TYPE_ENABLE_CHANNEL,</div><div class='add'>+	ES58X_RET_TYPE_DISABLE_CHANNEL,</div><div class='add'>+	ES58X_RET_TYPE_TX_MSG,</div><div class='add'>+	ES58X_RET_TYPE_RESET_RX,</div><div class='add'>+	ES58X_RET_TYPE_RESET_TX,</div><div class='add'>+	ES58X_RET_TYPE_DEVICE_ERR</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+union es58x_urb_cmd {</div><div class='add'>+	struct es581_4_urb_cmd es581_4_urb_cmd;</div><div class='add'>+	struct es58x_fd_urb_cmd es58x_fd_urb_cmd;</div><div class='add'>+	struct {		/* Common header parts of all variants */</div><div class='add'>+		__le16 sof;</div><div class='add'>+		u8 cmd_type;</div><div class='add'>+		u8 cmd_id;</div><div class='add'>+	} __packed;</div><div class='add'>+	DECLARE_FLEX_ARRAY(u8, raw_cmd);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_priv - All information specific to a CAN channel.</div><div class='add'>+ * @can: struct can_priv must be the first member (Socket CAN relies</div><div class='add'>+ *	on the fact that function netdev_priv() returns a pointer to</div><div class='add'>+ *	a struct can_priv).</div><div class='add'>+ * @devlink_port: devlink instance for the network interface.</div><div class='add'>+ * @es58x_dev: pointer to the corresponding ES58X device.</div><div class='add'>+ * @tx_urb: Used as a buffer to concatenate the TX messages and to do</div><div class='add'>+ *	a bulk send. Please refer to es58x_start_xmit() for more</div><div class='add'>+ *	details.</div><div class='add'>+ * @tx_tail: Index of the oldest packet still pending for</div><div class='add'>+ *	completion. @tx_tail &amp; echo_skb_mask represents the beginning</div><div class='add'>+ *	of the echo skb FIFO, i.e. index of the first element.</div><div class='add'>+ * @tx_head: Index of the next packet to be sent to the</div><div class='add'>+ *	device. @tx_head &amp; echo_skb_mask represents the end of the</div><div class='add'>+ *	echo skb FIFO plus one, i.e. the first free index.</div><div class='add'>+ * @tx_can_msg_cnt: Number of messages in @tx_urb.</div><div class='add'>+ * @tx_can_msg_is_fd: false: all messages in @tx_urb are Classical</div><div class='add'>+ *	CAN, true: all messages in @tx_urb are CAN FD. Rationale:</div><div class='add'>+ *	ES58X FD devices do not allow to mix Classical CAN and FD CAN</div><div class='add'>+ *	frames in one single bulk transmission.</div><div class='add'>+ * @err_passive_before_rtx_success: The ES58X device might enter in a</div><div class='add'>+ *	state in which it keeps alternating between error passive</div><div class='add'>+ *	and active states. This counter keeps track of the number of</div><div class='add'>+ *	error passive and if it gets bigger than</div><div class='add'>+ *	ES58X_CONSECUTIVE_ERR_PASSIVE_MAX, es58x_rx_err_msg() will</div><div class='add'>+ *	force the status to bus-off.</div><div class='add'>+ * @channel_idx: Channel index, starts at zero.</div><div class='add'>+ */</div><div class='add'>+struct es58x_priv {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct devlink_port devlink_port;</div><div class='add'>+	struct es58x_device *es58x_dev;</div><div class='add'>+	struct urb *tx_urb;</div><div class='add'>+</div><div class='add'>+	u32 tx_tail;</div><div class='add'>+	u32 tx_head;</div><div class='add'>+</div><div class='add'>+	u8 tx_can_msg_cnt;</div><div class='add'>+	bool tx_can_msg_is_fd;</div><div class='add'>+</div><div class='add'>+	u8 err_passive_before_rtx_success;</div><div class='add'>+</div><div class='add'>+	u8 channel_idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_parameters - Constant parameters of a given hardware</div><div class='add'>+ *	variant.</div><div class='add'>+ * @bittiming_const: Nominal bittimming constant parameters.</div><div class='add'>+ * @data_bittiming_const: Data bittiming constant parameters.</div><div class='add'>+ * @tdc_const: Transmission Delay Compensation constant parameters.</div><div class='add'>+ * @bitrate_max: Maximum bitrate supported by the device.</div><div class='add'>+ * @clock: CAN clock parameters.</div><div class='add'>+ * @ctrlmode_supported: List of supported modes. Please refer to</div><div class='add'>+ *	can/netlink.h file for additional details.</div><div class='add'>+ * @tx_start_of_frame: Magic number at the beginning of each TX URB</div><div class='add'>+ *	command.</div><div class='add'>+ * @rx_start_of_frame: Magic number at the beginning of each RX URB</div><div class='add'>+ *	command.</div><div class='add'>+ * @tx_urb_cmd_max_len: Maximum length of a TX URB command.</div><div class='add'>+ * @rx_urb_cmd_max_len: Maximum length of a RX URB command.</div><div class='add'>+ * @fifo_mask: Bit mask to quickly convert the tx_tail and tx_head</div><div class='add'>+ *	field of the struct es58x_priv into echo_skb</div><div class='add'>+ *	indexes. Properties: @fifo_mask = echo_skb_max - 1 where</div><div class='add'>+ *	echo_skb_max must be a power of two. Also, echo_skb_max must</div><div class='add'>+ *	not exceed the maximum size of the device internal TX FIFO</div><div class='add'>+ *	length. This parameter is used to control the network queue</div><div class='add'>+ *	wake/stop logic.</div><div class='add'>+ * @dql_min_limit: Dynamic Queue Limits (DQL) absolute minimum limit</div><div class='add'>+ *	of bytes allowed to be queued on this network device transmit</div><div class='add'>+ *	queue. Used by the Byte Queue Limits (BQL) to determine how</div><div class='add'>+ *	frequently the xmit_more flag will be set to true in</div><div class='add'>+ *	es58x_start_xmit(). Set this value higher to optimize for</div><div class='add'>+ *	throughput but be aware that it might have a negative impact</div><div class='add'>+ *	on the latency! This value can also be set dynamically. Please</div><div class='add'>+ *	refer to Documentation/ABI/testing/sysfs-class-net-queues for</div><div class='add'>+ *	more details.</div><div class='add'>+ * @tx_bulk_max: Maximum number of TX messages that can be sent in one</div><div class='add'>+ *	single URB packet.</div><div class='add'>+ * @urb_cmd_header_len: Length of the URB command header.</div><div class='add'>+ * @rx_urb_max: Number of RX URB to be allocated during device probe.</div><div class='add'>+ * @tx_urb_max: Number of TX URB to be allocated during device probe.</div><div class='add'>+ */</div><div class='add'>+struct es58x_parameters {</div><div class='add'>+	const struct can_bittiming_const *bittiming_const;</div><div class='add'>+	const struct can_bittiming_const *data_bittiming_const;</div><div class='add'>+	const struct can_tdc_const *tdc_const;</div><div class='add'>+	u32 bitrate_max;</div><div class='add'>+	struct can_clock clock;</div><div class='add'>+	u32 ctrlmode_supported;</div><div class='add'>+	u16 tx_start_of_frame;</div><div class='add'>+	u16 rx_start_of_frame;</div><div class='add'>+	u16 tx_urb_cmd_max_len;</div><div class='add'>+	u16 rx_urb_cmd_max_len;</div><div class='add'>+	u16 fifo_mask;</div><div class='add'>+	u16 dql_min_limit;</div><div class='add'>+	u8 tx_bulk_max;</div><div class='add'>+	u8 urb_cmd_header_len;</div><div class='add'>+	u8 rx_urb_max;</div><div class='add'>+	u8 tx_urb_max;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_operators - Function pointers used to encode/decode</div><div class='add'>+ *	the TX/RX messages.</div><div class='add'>+ * @get_msg_len: Get field msg_len of the urb_cmd. The offset of</div><div class='add'>+ *	msg_len inside urb_cmd depends of the device model.</div><div class='add'>+ * @handle_urb_cmd: Decode the URB command received from the device</div><div class='add'>+ *	and dispatch it to the relevant sub function.</div><div class='add'>+ * @fill_urb_header: Fill the header of urb_cmd.</div><div class='add'>+ * @tx_can_msg: Encode a TX CAN message and add it to the bulk buffer</div><div class='add'>+ *	cmd_buf of es58x_dev.</div><div class='add'>+ * @enable_channel: Start the CAN channel.</div><div class='add'>+ * @disable_channel: Stop the CAN channel.</div><div class='add'>+ * @reset_device: Full reset of the device. N.B: this feature is only</div><div class='add'>+ *	present on the ES581.4. For ES58X FD devices, this field is</div><div class='add'>+ *	set to NULL.</div><div class='add'>+ * @get_timestamp: Request a timestamp from the ES58X device.</div><div class='add'>+ */</div><div class='add'>+struct es58x_operators {</div><div class='add'>+	u16 (*get_msg_len)(const union es58x_urb_cmd *urb_cmd);</div><div class='add'>+	int (*handle_urb_cmd)(struct es58x_device *es58x_dev,</div><div class='add'>+			      const union es58x_urb_cmd *urb_cmd);</div><div class='add'>+	void (*fill_urb_header)(union es58x_urb_cmd *urb_cmd, u8 cmd_type,</div><div class='add'>+				u8 cmd_id, u8 channel_idx, u16 cmd_len);</div><div class='add'>+	int (*tx_can_msg)(struct es58x_priv *priv, const struct sk_buff *skb);</div><div class='add'>+	int (*enable_channel)(struct es58x_priv *priv);</div><div class='add'>+	int (*disable_channel)(struct es58x_priv *priv);</div><div class='add'>+	int (*reset_device)(struct es58x_device *es58x_dev);</div><div class='add'>+	int (*get_timestamp)(struct es58x_device *es58x_dev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_sw_version - Version number of the firmware or the</div><div class='add'>+ *	bootloader.</div><div class='add'>+ * @major: Version major number, represented on two digits.</div><div class='add'>+ * @minor: Version minor number, represented on two digits.</div><div class='add'>+ * @revision: Version revision number, represented on two digits.</div><div class='add'>+ *</div><div class='add'>+ * The firmware and the bootloader share the same format: "xx.xx.xx"</div><div class='add'>+ * where 'x' is a digit. Both can be retrieved from the product</div><div class='add'>+ * information string.</div><div class='add'>+ */</div><div class='add'>+struct es58x_sw_version {</div><div class='add'>+	u8 major;</div><div class='add'>+	u8 minor;</div><div class='add'>+	u8 revision;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_hw_revision - Hardware revision number.</div><div class='add'>+ * @letter: Revision letter, an alphanumeric character.</div><div class='add'>+ * @major: Version major number, represented on three digits.</div><div class='add'>+ * @minor: Version minor number, represented on three digits.</div><div class='add'>+ *</div><div class='add'>+ * The hardware revision uses its own format: "axxx/xxx" where 'a' is</div><div class='add'>+ * an alphanumeric character and 'x' a digit. It can be retrieved from</div><div class='add'>+ * the product information string.</div><div class='add'>+ */</div><div class='add'>+struct es58x_hw_revision {</div><div class='add'>+	char letter;</div><div class='add'>+	u16 major;</div><div class='add'>+	u16 minor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_device - All information specific to an ES58X device.</div><div class='add'>+ * @dev: Device information.</div><div class='add'>+ * @udev: USB device information.</div><div class='add'>+ * @netdev: Array of our CAN channels.</div><div class='add'>+ * @param: The constant parameters.</div><div class='add'>+ * @ops: Operators.</div><div class='add'>+ * @rx_pipe: USB reception pipe.</div><div class='add'>+ * @tx_pipe: USB transmission pipe.</div><div class='add'>+ * @rx_urbs: Anchor for received URBs.</div><div class='add'>+ * @tx_urbs_busy: Anchor for TX URBs which were send to the device.</div><div class='add'>+ * @tx_urbs_idle: Anchor for TX USB which are idle. This driver</div><div class='add'>+ *	allocates the memory for the URBs during the probe. When a TX</div><div class='add'>+ *	URB is needed, it can be taken from this anchor. The network</div><div class='add'>+ *	queue wake/stop logic should prevent this URB from getting</div><div class='add'>+ *	empty. Please refer to es58x_get_tx_urb() for more details.</div><div class='add'>+ * @tx_urbs_idle_cnt: number of urbs in @tx_urbs_idle.</div><div class='add'>+ * @firmware_version: The firmware version number.</div><div class='add'>+ * @bootloader_version: The bootloader version number.</div><div class='add'>+ * @hardware_revision: The hardware revision number.</div><div class='add'>+ * @ktime_req_ns: kernel timestamp when es58x_set_realtime_diff_ns()</div><div class='add'>+ *	was called.</div><div class='add'>+ * @realtime_diff_ns: difference in nanoseconds between the clocks of</div><div class='add'>+ *	the ES58X device and the kernel.</div><div class='add'>+ * @timestamps: a temporary buffer to store the time stamps before</div><div class='add'>+ *	feeding them to es58x_can_get_echo_skb(). Can only be used</div><div class='add'>+ *	in RX branches.</div><div class='add'>+ * @num_can_ch: Number of CAN channel (i.e. number of elements of @netdev).</div><div class='add'>+ * @opened_channel_cnt: number of channels opened. Free of race</div><div class='add'>+ *	conditions because its two users (net_device_ops:ndo_open()</div><div class='add'>+ *	and net_device_ops:ndo_close()) guarantee that the network</div><div class='add'>+ *	stack big kernel lock (a.k.a. rtnl_mutex) is being hold.</div><div class='add'>+ * @rx_cmd_buf_len: Length of @rx_cmd_buf.</div><div class='add'>+ * @rx_cmd_buf: The device might split the URB commands in an</div><div class='add'>+ *	arbitrary amount of pieces. This buffer is used to concatenate</div><div class='add'>+ *	all those pieces. Can only be used in RX branches. This field</div><div class='add'>+ *	has to be the last one of the structure because it is has a</div><div class='add'>+ *	flexible size (c.f. es58x_sizeof_es58x_device() function).</div><div class='add'>+ */</div><div class='add'>+struct es58x_device {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct usb_device *udev;</div><div class='add'>+	struct net_device *netdev[ES58X_NUM_CAN_CH_MAX];</div><div class='add'>+</div><div class='add'>+	const struct es58x_parameters *param;</div><div class='add'>+	const struct es58x_operators *ops;</div><div class='add'>+</div><div class='add'>+	unsigned int rx_pipe;</div><div class='add'>+	unsigned int tx_pipe;</div><div class='add'>+</div><div class='add'>+	struct usb_anchor rx_urbs;</div><div class='add'>+	struct usb_anchor tx_urbs_busy;</div><div class='add'>+	struct usb_anchor tx_urbs_idle;</div><div class='add'>+	atomic_t tx_urbs_idle_cnt;</div><div class='add'>+</div><div class='add'>+	struct es58x_sw_version firmware_version;</div><div class='add'>+	struct es58x_sw_version bootloader_version;</div><div class='add'>+	struct es58x_hw_revision hardware_revision;</div><div class='add'>+</div><div class='add'>+	u64 ktime_req_ns;</div><div class='add'>+	s64 realtime_diff_ns;</div><div class='add'>+</div><div class='add'>+	u64 timestamps[ES58X_ECHO_BULK_MAX];</div><div class='add'>+</div><div class='add'>+	u8 num_can_ch;</div><div class='add'>+	u8 opened_channel_cnt;</div><div class='add'>+</div><div class='add'>+	u16 rx_cmd_buf_len;</div><div class='add'>+	union es58x_urb_cmd rx_cmd_buf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_sizeof_es58x_device() - Calculate the maximum length of</div><div class='add'>+ *	struct es58x_device.</div><div class='add'>+ * @es58x_dev_param: The constant parameters of the device.</div><div class='add'>+ *</div><div class='add'>+ * The length of struct es58x_device depends on the length of its last</div><div class='add'>+ * field: rx_cmd_buf. This macro allows to optimize the memory</div><div class='add'>+ * allocation.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of struct es58x_device.</div><div class='add'>+ */</div><div class='add'>+static inline size_t es58x_sizeof_es58x_device(const struct es58x_parameters</div><div class='add'>+					       *es58x_dev_param)</div><div class='add'>+{</div><div class='add'>+	return offsetof(struct es58x_device, rx_cmd_buf) +</div><div class='add'>+		es58x_dev_param-&gt;rx_urb_cmd_max_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __es58x_check_msg_len(const struct device *dev,</div><div class='add'>+					const char *stringified_msg,</div><div class='add'>+					size_t actual_len, size_t expected_len)</div><div class='add'>+{</div><div class='add'>+	if (expected_len != actual_len) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Length of %s is %zu but received command is %zu.\n",</div><div class='add'>+			stringified_msg, expected_len, actual_len);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_check_msg_len() - Check the size of a received message.</div><div class='add'>+ * @dev: Device, used to print error messages.</div><div class='add'>+ * @msg: Received message, must not be a pointer.</div><div class='add'>+ * @actual_len: Length of the message as advertised in the command header.</div><div class='add'>+ *</div><div class='add'>+ * Must be a macro in order to accept the different types of messages</div><div class='add'>+ * as an input. Can be use with any of the messages which have a fixed</div><div class='add'>+ * length. Check for an exact match of the size.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -EMSGSIZE if @actual_len differs from the</div><div class='add'>+ * expected length.</div><div class='add'>+ */</div><div class='add'>+#define es58x_check_msg_len(dev, msg, actual_len)			\</div><div class='add'>+	__es58x_check_msg_len(dev, __stringify(msg),			\</div><div class='add'>+			      actual_len, sizeof(msg))</div><div class='add'>+</div><div class='add'>+static inline int __es58x_check_msg_max_len(const struct device *dev,</div><div class='add'>+					    const char *stringified_msg,</div><div class='add'>+					    size_t actual_len,</div><div class='add'>+					    size_t expected_len)</div><div class='add'>+{</div><div class='add'>+	if (actual_len &gt; expected_len) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Maximum length for %s is %zu but received command is %zu.\n",</div><div class='add'>+			stringified_msg, expected_len, actual_len);</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_check_msg_max_len() - Check the maximum size of a received message.</div><div class='add'>+ * @dev: Device, used to print error messages.</div><div class='add'>+ * @msg: Received message, must not be a pointer.</div><div class='add'>+ * @actual_len: Length of the message as advertised in the command header.</div><div class='add'>+ *</div><div class='add'>+ * Must be a macro in order to accept the different types of messages</div><div class='add'>+ * as an input. To be used with the messages of variable sizes. Only</div><div class='add'>+ * check that the message is not bigger than the maximum expected</div><div class='add'>+ * size.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -EOVERFLOW if @actual_len is greater than</div><div class='add'>+ * the expected length.</div><div class='add'>+ */</div><div class='add'>+#define es58x_check_msg_max_len(dev, msg, actual_len)			\</div><div class='add'>+	__es58x_check_msg_max_len(dev, __stringify(msg),		\</div><div class='add'>+				  actual_len, sizeof(msg))</div><div class='add'>+</div><div class='add'>+static inline int __es58x_msg_num_element(const struct device *dev,</div><div class='add'>+					  const char *stringified_msg,</div><div class='add'>+					  size_t actual_len, size_t msg_len,</div><div class='add'>+					  size_t elem_len)</div><div class='add'>+{</div><div class='add'>+	size_t actual_num_elem = actual_len / elem_len;</div><div class='add'>+	size_t expected_num_elem = msg_len / elem_len;</div><div class='add'>+</div><div class='add'>+	if (actual_num_elem == 0) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Minimum length for %s is %zu but received command is %zu.\n",</div><div class='add'>+			stringified_msg, elem_len, actual_len);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	} else if ((actual_len % elem_len) != 0) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Received command length: %zu is not a multiple of %s[0]: %zu\n",</div><div class='add'>+			actual_len, stringified_msg, elem_len);</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+	} else if (actual_num_elem &gt; expected_num_elem) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Array %s is supposed to have %zu elements each of size %zu...\n",</div><div class='add'>+			stringified_msg, expected_num_elem, elem_len);</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"... But received command has %zu elements (total length %zu).\n",</div><div class='add'>+			actual_num_elem, actual_len);</div><div class='add'>+		return -EOVERFLOW;</div><div class='add'>+	}</div><div class='add'>+	return actual_num_elem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_msg_num_element() - Check size and give the number of</div><div class='add'>+ *	elements in a message of array type.</div><div class='add'>+ * @dev: Device, used to print error messages.</div><div class='add'>+ * @msg: Received message, must be an array.</div><div class='add'>+ * @actual_len: Length of the message as advertised in the command</div><div class='add'>+ *	header.</div><div class='add'>+ *</div><div class='add'>+ * Must be a macro in order to accept the different types of messages</div><div class='add'>+ * as an input. To be used on message of array type. Array's element</div><div class='add'>+ * has to be of fixed size (else use es58x_check_msg_max_len()). Check</div><div class='add'>+ * that the total length is an exact multiple of the length of a</div><div class='add'>+ * single element.</div><div class='add'>+ *</div><div class='add'>+ * Return: number of elements in the array on success, -EOVERFLOW if</div><div class='add'>+ * @actual_len is greater than the expected length, -EMSGSIZE if</div><div class='add'>+ * @actual_len is not a multiple of a single element.</div><div class='add'>+ */</div><div class='add'>+#define es58x_msg_num_element(dev, msg, actual_len)			\</div><div class='add'>+({									\</div><div class='add'>+	size_t __elem_len = sizeof((msg)[0]) + __must_be_array(msg);	\</div><div class='add'>+	__es58x_msg_num_element(dev, __stringify(msg), actual_len,	\</div><div class='add'>+				sizeof(msg), __elem_len);		\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_priv() - Get the priv member and cast it to struct es58x_priv.</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Return: ES58X device.</div><div class='add'>+ */</div><div class='add'>+static inline struct es58x_priv *es58x_priv(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return (struct es58x_priv *)netdev_priv(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ES58X_SIZEOF_URB_CMD() - Calculate the maximum length of an urb</div><div class='add'>+ *	command for a given message field name.</div><div class='add'>+ * @es58x_urb_cmd_type: type (either "struct es581_4_urb_cmd" or</div><div class='add'>+ *	"struct es58x_fd_urb_cmd").</div><div class='add'>+ * @msg_field: name of the message field.</div><div class='add'>+ *</div><div class='add'>+ * Must be a macro in order to accept the different command types as</div><div class='add'>+ * an input.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the urb command.</div><div class='add'>+ */</div><div class='add'>+#define ES58X_SIZEOF_URB_CMD(es58x_urb_cmd_type, msg_field)		\</div><div class='add'>+	(offsetof(es58x_urb_cmd_type, raw_msg)				\</div><div class='add'>+		+ sizeof_field(es58x_urb_cmd_type, msg_field)		\</div><div class='add'>+		+ sizeof_field(es58x_urb_cmd_type,			\</div><div class='add'>+			       reserved_for_crc16_do_not_use))</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_get_urb_cmd_len() - Calculate the actual length of an urb</div><div class='add'>+ *	command for a given message length.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @msg_len: Length of the message.</div><div class='add'>+ *</div><div class='add'>+ * Add the header and CRC lengths to the message length.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the urb command.</div><div class='add'>+ */</div><div class='add'>+static inline size_t es58x_get_urb_cmd_len(struct es58x_device *es58x_dev,</div><div class='add'>+					   u16 msg_len)</div><div class='add'>+{</div><div class='add'>+	return es58x_dev-&gt;param-&gt;urb_cmd_header_len + msg_len + sizeof(u16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_get_netdev() - Get the network device.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @channel_no: The channel number as advertised in the urb command.</div><div class='add'>+ * @channel_idx_offset: Some of the ES58x starts channel numbering</div><div class='add'>+ *	from 0 (ES58X FD), others from 1 (ES581.4).</div><div class='add'>+ * @netdev: CAN network device.</div><div class='add'>+ *</div><div class='add'>+ * Do a sanity check on the index provided by the device.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -ECHRNG if the received channel number is</div><div class='add'>+ *	out of range and -ENODEV if the network device is not yet</div><div class='add'>+ *	configured.</div><div class='add'>+ */</div><div class='add'>+static inline int es58x_get_netdev(struct es58x_device *es58x_dev,</div><div class='add'>+				   int channel_no, int channel_idx_offset,</div><div class='add'>+				   struct net_device **netdev)</div><div class='add'>+{</div><div class='add'>+	int channel_idx = channel_no - channel_idx_offset;</div><div class='add'>+</div><div class='add'>+	*netdev = NULL;</div><div class='add'>+	if (channel_idx &lt; 0 || channel_idx &gt;= es58x_dev-&gt;num_can_ch)</div><div class='add'>+		return -ECHRNG;</div><div class='add'>+</div><div class='add'>+	*netdev = es58x_dev-&gt;netdev[channel_idx];</div><div class='add'>+	if (!*netdev || !netif_device_present(*netdev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_get_raw_can_id() - Get the CAN ID.</div><div class='add'>+ * @cf: CAN frame.</div><div class='add'>+ *</div><div class='add'>+ * Mask the CAN ID in order to only keep the significant bits.</div><div class='add'>+ *</div><div class='add'>+ * Return: the raw value of the CAN ID.</div><div class='add'>+ */</div><div class='add'>+static inline int es58x_get_raw_can_id(const struct can_frame *cf)</div><div class='add'>+{</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		return cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+	else</div><div class='add'>+		return cf-&gt;can_id &amp; CAN_SFF_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_get_flags() - Get the CAN flags.</div><div class='add'>+ * @skb: socket buffer of a CAN message.</div><div class='add'>+ *</div><div class='add'>+ * Return: the CAN flag as an enum es58x_flag.</div><div class='add'>+ */</div><div class='add'>+static inline enum es58x_flag es58x_get_flags(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	enum es58x_flag es58x_flags = 0;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='add'>+		es58x_flags |= ES58X_FLAG_EFF;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		es58x_flags |= ES58X_FLAG_FD_DATA;</div><div class='add'>+		if (cf-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			es58x_flags |= ES58X_FLAG_FD_BRS;</div><div class='add'>+		if (cf-&gt;flags &amp; CANFD_ESI)</div><div class='add'>+			es58x_flags |= ES58X_FLAG_FD_ESI;</div><div class='add'>+	} else if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		/* Remote frames are only defined in Classical CAN frames */</div><div class='add'>+		es58x_flags |= ES58X_FLAG_RTR;</div><div class='add'>+</div><div class='add'>+	return es58x_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* es58x_core.c. */</div><div class='add'>+int es58x_can_get_echo_skb(struct net_device *netdev, u32 packet_idx,</div><div class='add'>+			   u64 *tstamps, unsigned int pkts);</div><div class='add'>+int es58x_tx_ack_msg(struct net_device *netdev, u16 tx_free_entries,</div><div class='add'>+		     enum es58x_ret_u32 rx_cmd_ret_u32);</div><div class='add'>+int es58x_rx_can_msg(struct net_device *netdev, u64 timestamp, const u8 *data,</div><div class='add'>+		     canid_t can_id, enum es58x_flag es58x_flags, u8 dlc);</div><div class='add'>+int es58x_rx_err_msg(struct net_device *netdev, enum es58x_err error,</div><div class='add'>+		     enum es58x_event event, u64 timestamp);</div><div class='add'>+void es58x_rx_timestamp(struct es58x_device *es58x_dev, u64 timestamp);</div><div class='add'>+int es58x_rx_cmd_ret_u8(struct device *dev, enum es58x_ret_type cmd_ret_type,</div><div class='add'>+			enum es58x_ret_u8 rx_cmd_ret_u8);</div><div class='add'>+int es58x_rx_cmd_ret_u32(struct net_device *netdev,</div><div class='add'>+			 enum es58x_ret_type cmd_ret_type,</div><div class='add'>+			 enum es58x_ret_u32 rx_cmd_ret_u32);</div><div class='add'>+int es58x_send_msg(struct es58x_device *es58x_dev, u8 cmd_type, u8 cmd_id,</div><div class='add'>+		   const void *msg, u16 cmd_len, int channel_idx);</div><div class='add'>+</div><div class='add'>+/* es58x_devlink.c. */</div><div class='add'>+void es58x_parse_product_info(struct es58x_device *es58x_dev);</div><div class='add'>+extern const struct devlink_ops es58x_dl_ops;</div><div class='add'>+</div><div class='add'>+/* es581_4.c. */</div><div class='add'>+extern const struct es58x_parameters es581_4_param;</div><div class='add'>+extern const struct es58x_operators es581_4_ops;</div><div class='add'>+</div><div class='add'>+/* es58x_fd.c. */</div><div class='add'>+extern const struct es58x_parameters es58x_fd_param;</div><div class='add'>+extern const struct es58x_operators es58x_fd_ops;</div><div class='add'>+</div><div class='add'>+#endif /* __ES58X_COMMON_H__ */</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es58x_devlink.c b/drivers/net/can/usb/etas_es58x/es58x_devlink.c<br/>new file mode 100644<br/>index 000000000000..0d155eb1b9e9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es58x_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es58x_devlink.c</a></div><div class='hunk'>@@ -0,0 +1,260 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es58x_devlink.c: report the product information using devlink.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2022 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ctype.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "es58x_core.h"</div><div class='add'>+</div><div class='add'>+/* USB descriptor index containing the product information string. */</div><div class='add'>+#define ES58X_PROD_INFO_IDX 6</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_parse_sw_version() - Extract boot loader or firmware version.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @prod_info: USB custom string returned by the device.</div><div class='add'>+ * @prefix: Select which information should be parsed. Set it to "FW"</div><div class='add'>+ *	to parse the firmware version or to "BL" to parse the</div><div class='add'>+ *	bootloader version.</div><div class='add'>+ *</div><div class='add'>+ * The @prod_info string contains the firmware and the bootloader</div><div class='add'>+ * version number all prefixed by a magic string and concatenated with</div><div class='add'>+ * other numbers. Depending on the device, the firmware (bootloader)</div><div class='add'>+ * format is either "FW_Vxx.xx.xx" ("BL_Vxx.xx.xx") or "FW:xx.xx.xx"</div><div class='add'>+ * ("BL:xx.xx.xx") where 'x' represents a digit. @prod_info must</div><div class='add'>+ * contains the common part of those prefixes: "FW" or "BL".</div><div class='add'>+ *</div><div class='add'>+ * Parse @prod_info and store the version number in</div><div class='add'>+ * &amp;es58x_dev.firmware_version or &amp;es58x_dev.bootloader_version</div><div class='add'>+ * according to @prefix value.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -EINVAL if @prefix contains an invalid</div><div class='add'>+ *	value and -EBADMSG if @prod_info could not be parsed.</div><div class='add'>+ */</div><div class='add'>+static int es58x_parse_sw_version(struct es58x_device *es58x_dev,</div><div class='add'>+				  const char *prod_info, const char *prefix)</div><div class='add'>+{</div><div class='add'>+	struct es58x_sw_version *version;</div><div class='add'>+	int major, minor, revision;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(prefix, "FW"))</div><div class='add'>+		version = &amp;es58x_dev-&gt;firmware_version;</div><div class='add'>+	else if (!strcmp(prefix, "BL"))</div><div class='add'>+		version = &amp;es58x_dev-&gt;bootloader_version;</div><div class='add'>+	else</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Go to prefix */</div><div class='add'>+	prod_info = strstr(prod_info, prefix);</div><div class='add'>+	if (!prod_info)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	/* Go to beginning of the version number */</div><div class='add'>+	while (!isdigit(*prod_info)) {</div><div class='add'>+		prod_info++;</div><div class='add'>+		if (!*prod_info)</div><div class='add'>+			return -EBADMSG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sscanf(prod_info, "%2u.%2u.%2u", &amp;major, &amp;minor, &amp;revision) != 3)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	version-&gt;major = major;</div><div class='add'>+	version-&gt;minor = minor;</div><div class='add'>+	version-&gt;revision = revision;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_parse_hw_rev() - Extract hardware revision number.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ * @prod_info: USB custom string returned by the device.</div><div class='add'>+ *</div><div class='add'>+ * @prod_info contains the hardware revision prefixed by a magic</div><div class='add'>+ * string and conquenated together with other numbers. Depending on</div><div class='add'>+ * the device, the hardware revision format is either</div><div class='add'>+ * "HW_VER:axxx/xxx" or "HR:axxx/xxx" where 'a' represents a letter</div><div class='add'>+ * and 'x' a digit.</div><div class='add'>+ *</div><div class='add'>+ * Parse @prod_info and store the hardware revision number in</div><div class='add'>+ * &amp;es58x_dev.hardware_revision.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, -EBADMSG if @prod_info could not be</div><div class='add'>+ *	parsed.</div><div class='add'>+ */</div><div class='add'>+static int es58x_parse_hw_rev(struct es58x_device *es58x_dev,</div><div class='add'>+			      const char *prod_info)</div><div class='add'>+{</div><div class='add'>+	char letter;</div><div class='add'>+	int major, minor;</div><div class='add'>+</div><div class='add'>+	/* The only occurrence of 'H' is in the hardware revision prefix. */</div><div class='add'>+	prod_info = strchr(prod_info, 'H');</div><div class='add'>+	if (!prod_info)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	/* Go to beginning of the hardware revision */</div><div class='add'>+	prod_info = strchr(prod_info, ':');</div><div class='add'>+	if (!prod_info)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+	prod_info++;</div><div class='add'>+</div><div class='add'>+	if (sscanf(prod_info, "%c%3u/%3u", &amp;letter, &amp;major, &amp;minor) != 3)</div><div class='add'>+		return -EBADMSG;</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;hardware_revision.letter = letter;</div><div class='add'>+	es58x_dev-&gt;hardware_revision.major = major;</div><div class='add'>+	es58x_dev-&gt;hardware_revision.minor = minor;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_parse_product_info() - Parse the ES58x product information</div><div class='add'>+ *	string.</div><div class='add'>+ * @es58x_dev: ES58X device.</div><div class='add'>+ *</div><div class='add'>+ * Retrieve the product information string and parse it to extract the</div><div class='add'>+ * firmware version, the bootloader version and the hardware</div><div class='add'>+ * revision.</div><div class='add'>+ *</div><div class='add'>+ * If the function fails, set the version or revision to an invalid</div><div class='add'>+ * value and emit an informal message. Continue probing because the</div><div class='add'>+ * product information is not critical for the driver to operate.</div><div class='add'>+ */</div><div class='add'>+void es58x_parse_product_info(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	static const struct es58x_sw_version sw_version_not_set = {</div><div class='add'>+		.major = -1,</div><div class='add'>+		.minor = -1,</div><div class='add'>+		.revision = -1,</div><div class='add'>+	};</div><div class='add'>+	static const struct es58x_hw_revision hw_revision_not_set = {</div><div class='add'>+		.letter = '\0',</div><div class='add'>+		.major = -1,</div><div class='add'>+		.minor = -1,</div><div class='add'>+	};</div><div class='add'>+	char *prod_info;</div><div class='add'>+</div><div class='add'>+	es58x_dev-&gt;firmware_version = sw_version_not_set;</div><div class='add'>+	es58x_dev-&gt;bootloader_version = sw_version_not_set;</div><div class='add'>+	es58x_dev-&gt;hardware_revision = hw_revision_not_set;</div><div class='add'>+</div><div class='add'>+	prod_info = usb_cache_string(es58x_dev-&gt;udev, ES58X_PROD_INFO_IDX);</div><div class='add'>+	if (!prod_info) {</div><div class='add'>+		dev_warn(es58x_dev-&gt;dev,</div><div class='add'>+			 "could not retrieve the product info string\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (es58x_parse_sw_version(es58x_dev, prod_info, "FW") ||</div><div class='add'>+	    es58x_parse_sw_version(es58x_dev, prod_info, "BL") ||</div><div class='add'>+	    es58x_parse_hw_rev(es58x_dev, prod_info))</div><div class='add'>+		dev_info(es58x_dev-&gt;dev,</div><div class='add'>+			 "could not parse product info: '%s'\n", prod_info);</div><div class='add'>+</div><div class='add'>+	kfree(prod_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_sw_version_is_valid() - Check if the version is a valid number.</div><div class='add'>+ * @sw_ver: Version number of either the firmware or the bootloader.</div><div class='add'>+ *</div><div class='add'>+ * If any of the software version sub-numbers do not fit on two</div><div class='add'>+ * digits, the version is invalid, most probably because the product</div><div class='add'>+ * string could not be parsed.</div><div class='add'>+ *</div><div class='add'>+ * Return: @true if the software version is valid, @false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool es58x_sw_version_is_valid(struct es58x_sw_version *sw_ver)</div><div class='add'>+{</div><div class='add'>+	return sw_ver-&gt;major &lt; 100 &amp;&amp; sw_ver-&gt;minor &lt; 100 &amp;&amp;</div><div class='add'>+		sw_ver-&gt;revision &lt; 100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_hw_revision_is_valid() - Check if the revision is a valid number.</div><div class='add'>+ * @hw_rev: Revision number of the hardware.</div><div class='add'>+ *</div><div class='add'>+ * If &amp;es58x_hw_revision.letter is not a alphanumeric character or if</div><div class='add'>+ * any of the hardware revision sub-numbers do not fit on three</div><div class='add'>+ * digits, the revision is invalid, most probably because the product</div><div class='add'>+ * string could not be parsed.</div><div class='add'>+ *</div><div class='add'>+ * Return: @true if the hardware revision is valid, @false otherwise.</div><div class='add'>+ */</div><div class='add'>+static inline bool es58x_hw_revision_is_valid(struct es58x_hw_revision *hw_rev)</div><div class='add'>+{</div><div class='add'>+	return isalnum(hw_rev-&gt;letter) &amp;&amp; hw_rev-&gt;major &lt; 1000 &amp;&amp;</div><div class='add'>+		hw_rev-&gt;minor &lt; 1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_devlink_info_get() - Report the product information.</div><div class='add'>+ * @devlink: Devlink.</div><div class='add'>+ * @req: skb wrapper where to put requested information.</div><div class='add'>+ * @extack: Unused.</div><div class='add'>+ *</div><div class='add'>+ * Report the firmware version, the bootloader version, the hardware</div><div class='add'>+ * revision and the serial number through netlink.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, errno when any error occurs.</div><div class='add'>+ */</div><div class='add'>+static int es58x_devlink_info_get(struct devlink *devlink,</div><div class='add'>+				  struct devlink_info_req *req,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = devlink_priv(devlink);</div><div class='add'>+	struct es58x_sw_version *fw_ver = &amp;es58x_dev-&gt;firmware_version;</div><div class='add'>+	struct es58x_sw_version *bl_ver = &amp;es58x_dev-&gt;bootloader_version;</div><div class='add'>+	struct es58x_hw_revision *hw_rev = &amp;es58x_dev-&gt;hardware_revision;</div><div class='add'>+	char buf[MAX(sizeof("xx.xx.xx"), sizeof("axxx/xxx"))];</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (es58x_sw_version_is_valid(fw_ver)) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%02u.%02u.%02u",</div><div class='add'>+			 fw_ver-&gt;major, fw_ver-&gt;minor, fw_ver-&gt;revision);</div><div class='add'>+		ret = devlink_info_version_running_put(req,</div><div class='add'>+						       DEVLINK_INFO_VERSION_GENERIC_FW,</div><div class='add'>+						       buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (es58x_sw_version_is_valid(bl_ver)) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%02u.%02u.%02u",</div><div class='add'>+			 bl_ver-&gt;major, bl_ver-&gt;minor, bl_ver-&gt;revision);</div><div class='add'>+		ret = devlink_info_version_running_put(req,</div><div class='add'>+						       DEVLINK_INFO_VERSION_GENERIC_FW_BOOTLOADER,</div><div class='add'>+						       buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (es58x_hw_revision_is_valid(hw_rev)) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%c%03u/%03u",</div><div class='add'>+			 hw_rev-&gt;letter, hw_rev-&gt;major, hw_rev-&gt;minor);</div><div class='add'>+		ret = devlink_info_version_fixed_put(req,</div><div class='add'>+						     DEVLINK_INFO_VERSION_GENERIC_BOARD_REV,</div><div class='add'>+						     buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (es58x_dev-&gt;udev-&gt;serial)</div><div class='add'>+		ret = devlink_info_serial_number_put(req,</div><div class='add'>+						     es58x_dev-&gt;udev-&gt;serial);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct devlink_ops es58x_dl_ops = {</div><div class='add'>+	.info_get = es58x_devlink_info_get,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es58x_fd.c b/drivers/net/can/usb/etas_es58x/es58x_fd.c<br/>new file mode 100644<br/>index 000000000000..6476add1c105<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es58x_fd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es58x_fd.c</a></div><div class='hunk'>@@ -0,0 +1,565 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es58x_fd.c: Adds support to ETAS ES582.1 and ES584.1 (naming</div><div class='add'>+ * convention: we use the term "ES58X FD" when referring to those two</div><div class='add'>+ * variants together).</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020 ETAS K.K.. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020-2022 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+</div><div class='add'>+#include "es58x_core.h"</div><div class='add'>+#include "es58x_fd.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * es58x_fd_sizeof_rx_tx_msg() - Calculate the actual length of the</div><div class='add'>+ *	structure of a rx or tx message.</div><div class='add'>+ * @msg: message of variable length, must have a dlc and a len fields.</div><div class='add'>+ *</div><div class='add'>+ * Even if RTR frames have actually no payload, the ES58X devices</div><div class='add'>+ * still expect it. Must be a macro in order to accept several types</div><div class='add'>+ * (struct es58x_fd_tx_can_msg and struct es58x_fd_rx_can_msg) as an</div><div class='add'>+ * input.</div><div class='add'>+ *</div><div class='add'>+ * Return: length of the message.</div><div class='add'>+ */</div><div class='add'>+#define es58x_fd_sizeof_rx_tx_msg(msg)					\</div><div class='add'>+({									\</div><div class='add'>+	typeof(msg) __msg = (msg);					\</div><div class='add'>+	size_t __msg_len;						\</div><div class='add'>+									\</div><div class='add'>+	if (__msg.flags &amp; ES58X_FLAG_FD_DATA)				\</div><div class='add'>+		__msg_len = canfd_sanitize_len(__msg.len);		\</div><div class='add'>+	else								\</div><div class='add'>+		__msg_len = can_cc_dlc2len(__msg.dlc);			\</div><div class='add'>+									\</div><div class='add'>+	offsetof(typeof(__msg), data[__msg_len]);			\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static enum es58x_fd_cmd_type es58x_fd_cmd_type(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	u32 ctrlmode = es58x_priv(netdev)-&gt;can.ctrlmode;</div><div class='add'>+</div><div class='add'>+	if (ctrlmode &amp; (CAN_CTRLMODE_FD | CAN_CTRLMODE_FD_NON_ISO))</div><div class='add'>+		return ES58X_FD_CMD_TYPE_CANFD;</div><div class='add'>+	else</div><div class='add'>+		return ES58X_FD_CMD_TYPE_CAN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 es58x_fd_get_msg_len(const union es58x_urb_cmd *urb_cmd)</div><div class='add'>+{</div><div class='add'>+	return get_unaligned_le16(&amp;urb_cmd-&gt;es58x_fd_urb_cmd.msg_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_echo_msg(struct net_device *netdev,</div><div class='add'>+			     const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct es58x_priv *priv = es58x_priv(netdev);</div><div class='add'>+	const struct es58x_fd_echo_msg *echo_msg;</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+	u64 *tstamps = es58x_dev-&gt;timestamps;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+	int i, num_element;</div><div class='add'>+	u32 rcv_packet_idx;</div><div class='add'>+</div><div class='add'>+	const u32 mask = GENMASK(BITS_PER_TYPE(mask) - 1,</div><div class='add'>+				 BITS_PER_TYPE(echo_msg-&gt;packet_idx));</div><div class='add'>+</div><div class='add'>+	num_element = es58x_msg_num_element(es58x_dev-&gt;dev,</div><div class='add'>+					    es58x_fd_urb_cmd-&gt;echo_msg,</div><div class='add'>+					    msg_len);</div><div class='add'>+	if (num_element &lt; 0)</div><div class='add'>+		return num_element;</div><div class='add'>+	echo_msg = es58x_fd_urb_cmd-&gt;echo_msg;</div><div class='add'>+</div><div class='add'>+	rcv_packet_idx = (priv-&gt;tx_tail &amp; mask) | echo_msg[0].packet_idx;</div><div class='add'>+	for (i = 0; i &lt; num_element; i++) {</div><div class='add'>+		if ((u8)rcv_packet_idx != echo_msg[i].packet_idx) {</div><div class='add'>+			netdev_err(netdev, "Packet idx jumped from %u to %u\n",</div><div class='add'>+				   (u8)rcv_packet_idx - 1,</div><div class='add'>+				   echo_msg[i].packet_idx);</div><div class='add'>+			return -EBADMSG;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tstamps[i] = get_unaligned_le64(&amp;echo_msg[i].timestamp);</div><div class='add'>+		rcv_packet_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return es58x_can_get_echo_skb(netdev, priv-&gt;tx_tail, tstamps, num_element);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_rx_can_msg(struct net_device *netdev,</div><div class='add'>+			       const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+	const u8 *rx_can_msg_buf = es58x_fd_urb_cmd-&gt;rx_can_msg_buf;</div><div class='add'>+	u16 rx_can_msg_buf_len = get_unaligned_le16(&amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+	int pkts, ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_check_msg_max_len(es58x_dev-&gt;dev,</div><div class='add'>+				      es58x_fd_urb_cmd-&gt;rx_can_msg_buf,</div><div class='add'>+				      rx_can_msg_buf_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (pkts = 0; rx_can_msg_buf_len &gt; 0; pkts++) {</div><div class='add'>+		const struct es58x_fd_rx_can_msg *rx_can_msg =</div><div class='add'>+		    (const struct es58x_fd_rx_can_msg *)rx_can_msg_buf;</div><div class='add'>+		bool is_can_fd = !!(rx_can_msg-&gt;flags &amp; ES58X_FLAG_FD_DATA);</div><div class='add'>+		/* rx_can_msg_len is the length of the rx_can_msg</div><div class='add'>+		 * buffer. Not to be confused with rx_can_msg-&gt;len</div><div class='add'>+		 * which is the length of the CAN payload</div><div class='add'>+		 * rx_can_msg-&gt;data.</div><div class='add'>+		 */</div><div class='add'>+		u16 rx_can_msg_len = es58x_fd_sizeof_rx_tx_msg(*rx_can_msg);</div><div class='add'>+</div><div class='add'>+		if (rx_can_msg_len &gt; rx_can_msg_buf_len) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "%s: Expected a rx_can_msg of size %d but only %d bytes are left in rx_can_msg_buf\n",</div><div class='add'>+				   __func__,</div><div class='add'>+				   rx_can_msg_len, rx_can_msg_buf_len);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+		if (rx_can_msg-&gt;len &gt; CANFD_MAX_DLEN) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "%s: Data length is %d but maximum should be %d\n",</div><div class='add'>+				   __func__, rx_can_msg-&gt;len, CANFD_MAX_DLEN);</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (netif_running(netdev)) {</div><div class='add'>+			u64 tstamp = get_unaligned_le64(&amp;rx_can_msg-&gt;timestamp);</div><div class='add'>+			canid_t can_id = get_unaligned_le32(&amp;rx_can_msg-&gt;can_id);</div><div class='add'>+			u8 dlc;</div><div class='add'>+</div><div class='add'>+			if (is_can_fd)</div><div class='add'>+				dlc = can_fd_len2dlc(rx_can_msg-&gt;len);</div><div class='add'>+			else</div><div class='add'>+				dlc = rx_can_msg-&gt;dlc;</div><div class='add'>+</div><div class='add'>+			ret = es58x_rx_can_msg(netdev, tstamp, rx_can_msg-&gt;data,</div><div class='add'>+					       can_id, rx_can_msg-&gt;flags, dlc);</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx_can_msg_buf_len -= rx_can_msg_len;</div><div class='add'>+		rx_can_msg_buf += rx_can_msg_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netif_running(netdev)) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_info(netdev,</div><div class='add'>+				    "%s: %s is down, dropping %d rx packets\n",</div><div class='add'>+				    __func__, netdev-&gt;name, pkts);</div><div class='add'>+		netdev-&gt;stats.rx_dropped += pkts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_rx_event_msg(struct net_device *netdev,</div><div class='add'>+				 const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+	const struct es58x_fd_rx_event_msg *rx_event_msg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rx_event_msg = &amp;es58x_fd_urb_cmd-&gt;rx_event_msg;</div><div class='add'>+	ret = es58x_check_msg_len(es58x_dev-&gt;dev, *rx_event_msg, msg_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_rx_err_msg(netdev, rx_event_msg-&gt;error_code,</div><div class='add'>+				rx_event_msg-&gt;event_code,</div><div class='add'>+				get_unaligned_le64(&amp;rx_event_msg-&gt;timestamp));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_rx_cmd_ret_u32(struct net_device *netdev,</div><div class='add'>+				   const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd,</div><div class='add'>+				   enum es58x_ret_type cmd_ret_type)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_check_msg_len(es58x_dev-&gt;dev,</div><div class='add'>+				  es58x_fd_urb_cmd-&gt;rx_cmd_ret_le32, msg_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_rx_cmd_ret_u32(netdev, cmd_ret_type,</div><div class='add'>+				    get_unaligned_le32(&amp;es58x_fd_urb_cmd-&gt;rx_cmd_ret_le32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_tx_ack_msg(struct net_device *netdev,</div><div class='add'>+			       const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = es58x_priv(netdev)-&gt;es58x_dev;</div><div class='add'>+	const struct es58x_fd_tx_ack_msg *tx_ack_msg;</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tx_ack_msg = &amp;es58x_fd_urb_cmd-&gt;tx_ack_msg;</div><div class='add'>+	ret = es58x_check_msg_len(es58x_dev-&gt;dev, *tx_ack_msg, msg_len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return es58x_tx_ack_msg(netdev,</div><div class='add'>+				get_unaligned_le16(&amp;tx_ack_msg-&gt;tx_free_entries),</div><div class='add'>+				get_unaligned_le32(&amp;tx_ack_msg-&gt;rx_cmd_ret_le32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_can_cmd_id(struct es58x_device *es58x_dev,</div><div class='add'>+			       const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = es58x_get_netdev(es58x_dev, es58x_fd_urb_cmd-&gt;channel_idx,</div><div class='add'>+			       ES58X_FD_CHANNEL_IDX_OFFSET, &amp;netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch ((enum es58x_fd_can_cmd_id)es58x_fd_urb_cmd-&gt;cmd_id) {</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_ENABLE_CHANNEL:</div><div class='add'>+		return es58x_fd_rx_cmd_ret_u32(netdev, es58x_fd_urb_cmd,</div><div class='add'>+					       ES58X_RET_TYPE_ENABLE_CHANNEL);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_DISABLE_CHANNEL:</div><div class='add'>+		return es58x_fd_rx_cmd_ret_u32(netdev, es58x_fd_urb_cmd,</div><div class='add'>+					       ES58X_RET_TYPE_DISABLE_CHANNEL);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_TX_MSG:</div><div class='add'>+		return es58x_fd_tx_ack_msg(netdev, es58x_fd_urb_cmd);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_ECHO_MSG:</div><div class='add'>+		return es58x_fd_echo_msg(netdev, es58x_fd_urb_cmd);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_RX_MSG:</div><div class='add'>+		return es58x_fd_rx_can_msg(netdev, es58x_fd_urb_cmd);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_RESET_RX:</div><div class='add'>+		return es58x_fd_rx_cmd_ret_u32(netdev, es58x_fd_urb_cmd,</div><div class='add'>+					       ES58X_RET_TYPE_RESET_RX);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_RESET_TX:</div><div class='add'>+		return es58x_fd_rx_cmd_ret_u32(netdev, es58x_fd_urb_cmd,</div><div class='add'>+					       ES58X_RET_TYPE_RESET_TX);</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CAN_CMD_ID_ERROR_OR_EVENT_MSG:</div><div class='add'>+		return es58x_fd_rx_event_msg(netdev, es58x_fd_urb_cmd);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_device_cmd_id(struct es58x_device *es58x_dev,</div><div class='add'>+				  const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd)</div><div class='add'>+{</div><div class='add'>+	u16 msg_len = get_unaligned_le16(&amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch ((enum es58x_fd_dev_cmd_id)es58x_fd_urb_cmd-&gt;cmd_id) {</div><div class='add'>+	case ES58X_FD_DEV_CMD_ID_TIMESTAMP:</div><div class='add'>+		ret = es58x_check_msg_len(es58x_dev-&gt;dev,</div><div class='add'>+					  es58x_fd_urb_cmd-&gt;timestamp, msg_len);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		es58x_rx_timestamp(es58x_dev,</div><div class='add'>+				   get_unaligned_le64(&amp;es58x_fd_urb_cmd-&gt;timestamp));</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EBADRQC;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_handle_urb_cmd(struct es58x_device *es58x_dev,</div><div class='add'>+				   const union es58x_urb_cmd *urb_cmd)</div><div class='add'>+{</div><div class='add'>+	const struct es58x_fd_urb_cmd *es58x_fd_urb_cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	es58x_fd_urb_cmd = &amp;urb_cmd-&gt;es58x_fd_urb_cmd;</div><div class='add'>+</div><div class='add'>+	switch ((enum es58x_fd_cmd_type)es58x_fd_urb_cmd-&gt;cmd_type) {</div><div class='add'>+	case ES58X_FD_CMD_TYPE_CAN:</div><div class='add'>+	case ES58X_FD_CMD_TYPE_CANFD:</div><div class='add'>+		ret = es58x_fd_can_cmd_id(es58x_dev, es58x_fd_urb_cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ES58X_FD_CMD_TYPE_DEVICE:</div><div class='add'>+		ret = es58x_fd_device_cmd_id(es58x_dev, es58x_fd_urb_cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -EBADRQC;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret == -EBADRQC)</div><div class='add'>+		dev_err(es58x_dev-&gt;dev,</div><div class='add'>+			"%s: Unknown command type (0x%02X) and command ID (0x%02X) combination\n",</div><div class='add'>+			__func__, es58x_fd_urb_cmd-&gt;cmd_type,</div><div class='add'>+			es58x_fd_urb_cmd-&gt;cmd_id);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void es58x_fd_fill_urb_header(union es58x_urb_cmd *urb_cmd, u8 cmd_type,</div><div class='add'>+				     u8 cmd_id, u8 channel_idx, u16 msg_len)</div><div class='add'>+{</div><div class='add'>+	struct es58x_fd_urb_cmd *es58x_fd_urb_cmd = &amp;urb_cmd-&gt;es58x_fd_urb_cmd;</div><div class='add'>+</div><div class='add'>+	es58x_fd_urb_cmd-&gt;SOF = cpu_to_le16(es58x_fd_param.tx_start_of_frame);</div><div class='add'>+	es58x_fd_urb_cmd-&gt;cmd_type = cmd_type;</div><div class='add'>+	es58x_fd_urb_cmd-&gt;cmd_id = cmd_id;</div><div class='add'>+	es58x_fd_urb_cmd-&gt;channel_idx = channel_idx;</div><div class='add'>+	es58x_fd_urb_cmd-&gt;msg_len = cpu_to_le16(msg_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_tx_can_msg(struct es58x_priv *priv,</div><div class='add'>+			       const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+	union es58x_urb_cmd *urb_cmd = priv-&gt;tx_urb-&gt;transfer_buffer;</div><div class='add'>+	struct es58x_fd_urb_cmd *es58x_fd_urb_cmd = &amp;urb_cmd-&gt;es58x_fd_urb_cmd;</div><div class='add'>+	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	struct es58x_fd_tx_can_msg *tx_can_msg;</div><div class='add'>+	bool is_fd = can_is_canfd_skb(skb);</div><div class='add'>+	u16 msg_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_can_msg_cnt == 0) {</div><div class='add'>+		msg_len = 0;</div><div class='add'>+		es58x_fd_fill_urb_header(urb_cmd,</div><div class='add'>+					 is_fd ? ES58X_FD_CMD_TYPE_CANFD</div><div class='add'>+					       : ES58X_FD_CMD_TYPE_CAN,</div><div class='add'>+					 ES58X_FD_CAN_CMD_ID_TX_MSG_NO_ACK,</div><div class='add'>+					 priv-&gt;channel_idx, msg_len);</div><div class='add'>+	} else {</div><div class='add'>+		msg_len = es58x_fd_get_msg_len(urb_cmd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = es58x_check_msg_max_len(es58x_dev-&gt;dev,</div><div class='add'>+				      es58x_fd_urb_cmd-&gt;tx_can_msg_buf,</div><div class='add'>+				      msg_len + sizeof(*tx_can_msg));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Fill message contents. */</div><div class='add'>+	tx_can_msg = (typeof(tx_can_msg))&amp;es58x_fd_urb_cmd-&gt;raw_msg[msg_len];</div><div class='add'>+	tx_can_msg-&gt;packet_idx = (u8)priv-&gt;tx_head;</div><div class='add'>+	put_unaligned_le32(es58x_get_raw_can_id(cf), &amp;tx_can_msg-&gt;can_id);</div><div class='add'>+	tx_can_msg-&gt;flags = (u8)es58x_get_flags(skb);</div><div class='add'>+	if (is_fd)</div><div class='add'>+		tx_can_msg-&gt;len = cf-&gt;len;</div><div class='add'>+	else</div><div class='add'>+		tx_can_msg-&gt;dlc = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='add'>+	memcpy(tx_can_msg-&gt;data, cf-&gt;data, cf-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Calculate new sizes */</div><div class='add'>+	msg_len += es58x_fd_sizeof_rx_tx_msg(*tx_can_msg);</div><div class='add'>+	priv-&gt;tx_urb-&gt;transfer_buffer_length = es58x_get_urb_cmd_len(es58x_dev,</div><div class='add'>+								     msg_len);</div><div class='add'>+	put_unaligned_le16(msg_len, &amp;es58x_fd_urb_cmd-&gt;msg_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void es58x_fd_convert_bittiming(struct es58x_fd_bittiming *es58x_fd_bt,</div><div class='add'>+				       struct can_bittiming *bt)</div><div class='add'>+{</div><div class='add'>+	/* The actual value set in the hardware registers is one less</div><div class='add'>+	 * than the functional value.</div><div class='add'>+	 */</div><div class='add'>+	const int offset = 1;</div><div class='add'>+</div><div class='add'>+	es58x_fd_bt-&gt;bitrate = cpu_to_le32(bt-&gt;bitrate);</div><div class='add'>+	es58x_fd_bt-&gt;tseg1 =</div><div class='add'>+	    cpu_to_le16(bt-&gt;prop_seg + bt-&gt;phase_seg1 - offset);</div><div class='add'>+	es58x_fd_bt-&gt;tseg2 = cpu_to_le16(bt-&gt;phase_seg2 - offset);</div><div class='add'>+	es58x_fd_bt-&gt;brp = cpu_to_le16(bt-&gt;brp - offset);</div><div class='add'>+	es58x_fd_bt-&gt;sjw = cpu_to_le16(bt-&gt;sjw - offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_enable_channel(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct es58x_device *es58x_dev = priv-&gt;es58x_dev;</div><div class='add'>+	struct net_device *netdev = es58x_dev-&gt;netdev[priv-&gt;channel_idx];</div><div class='add'>+	struct es58x_fd_tx_conf_msg tx_conf_msg = { 0 };</div><div class='add'>+	u32 ctrlmode;</div><div class='add'>+	size_t conf_len = 0;</div><div class='add'>+</div><div class='add'>+	es58x_fd_convert_bittiming(&amp;tx_conf_msg.nominal_bittiming,</div><div class='add'>+				   &amp;priv-&gt;can.bittiming);</div><div class='add'>+	ctrlmode = priv-&gt;can.ctrlmode;</div><div class='add'>+</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='add'>+		tx_conf_msg.samples_per_bit = ES58X_SAMPLES_PER_BIT_THREE;</div><div class='add'>+	else</div><div class='add'>+		tx_conf_msg.samples_per_bit = ES58X_SAMPLES_PER_BIT_ONE;</div><div class='add'>+	tx_conf_msg.sync_edge = ES58X_SYNC_EDGE_SINGLE;</div><div class='add'>+	tx_conf_msg.physical_layer = ES58X_PHYSICAL_LAYER_HIGH_SPEED;</div><div class='add'>+	tx_conf_msg.echo_mode = ES58X_ECHO_ON;</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		tx_conf_msg.ctrlmode |= ES58X_FD_CTRLMODE_PASSIVE;</div><div class='add'>+	else</div><div class='add'>+		tx_conf_msg.ctrlmode |=  ES58X_FD_CTRLMODE_ACTIVE;</div><div class='add'>+</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO) {</div><div class='add'>+		tx_conf_msg.ctrlmode |= ES58X_FD_CTRLMODE_FD_NON_ISO;</div><div class='add'>+		tx_conf_msg.canfd_enabled = 1;</div><div class='add'>+	} else if (ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		tx_conf_msg.ctrlmode |= ES58X_FD_CTRLMODE_FD;</div><div class='add'>+		tx_conf_msg.canfd_enabled = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_conf_msg.canfd_enabled) {</div><div class='add'>+		es58x_fd_convert_bittiming(&amp;tx_conf_msg.data_bittiming,</div><div class='add'>+					   &amp;priv-&gt;can.fd.data_bittiming);</div><div class='add'>+</div><div class='add'>+		if (can_fd_tdc_is_enabled(&amp;priv-&gt;can)) {</div><div class='add'>+			tx_conf_msg.tdc_enabled = 1;</div><div class='add'>+			tx_conf_msg.tdco = cpu_to_le16(priv-&gt;can.fd.tdc.tdco);</div><div class='add'>+			tx_conf_msg.tdcf = cpu_to_le16(priv-&gt;can.fd.tdc.tdcf);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		conf_len = ES58X_FD_CANFD_CONF_LEN;</div><div class='add'>+	} else {</div><div class='add'>+		conf_len = ES58X_FD_CAN_CONF_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return es58x_send_msg(es58x_dev, es58x_fd_cmd_type(netdev),</div><div class='add'>+			      ES58X_FD_CAN_CMD_ID_ENABLE_CHANNEL,</div><div class='add'>+			      &amp;tx_conf_msg, conf_len, priv-&gt;channel_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_disable_channel(struct es58x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* The type (ES58X_FD_CMD_TYPE_CAN or ES58X_FD_CMD_TYPE_CANFD) does</div><div class='add'>+	 * not matter here.</div><div class='add'>+	 */</div><div class='add'>+	return es58x_send_msg(priv-&gt;es58x_dev, ES58X_FD_CMD_TYPE_CAN,</div><div class='add'>+			      ES58X_FD_CAN_CMD_ID_DISABLE_CHANNEL,</div><div class='add'>+			      ES58X_EMPTY_MSG, 0, priv-&gt;channel_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int es58x_fd_get_timestamp(struct es58x_device *es58x_dev)</div><div class='add'>+{</div><div class='add'>+	return es58x_send_msg(es58x_dev, ES58X_FD_CMD_TYPE_DEVICE,</div><div class='add'>+			      ES58X_FD_DEV_CMD_ID_TIMESTAMP, ES58X_EMPTY_MSG,</div><div class='add'>+			      0, ES58X_CHANNEL_IDX_NA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Nominal bittiming constants for ES582.1 and ES584.1 as specified in</div><div class='add'>+ * the microcontroller datasheet: "SAM E70/S70/V70/V71 Family" section</div><div class='add'>+ * 49.6.8 "MCAN Nominal Bit Timing and Prescaler Register" from</div><div class='add'>+ * Microchip.</div><div class='add'>+ *</div><div class='add'>+ * The values from the specification are the hardware register</div><div class='add'>+ * values. To convert them to the functional values, all ranges were</div><div class='add'>+ * incremented by 1 (e.g. range [0..n-1] changed to [1..n]).</div><div class='add'>+ */</div><div class='add'>+static const struct can_bittiming_const es58x_fd_nom_bittiming_const = {</div><div class='add'>+	.name = "ES582.1/ES584.1",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Data bittiming constants for ES582.1 and ES584.1 as specified in</div><div class='add'>+ * the microcontroller datasheet: "SAM E70/S70/V70/V71 Family" section</div><div class='add'>+ * 49.6.4 "MCAN Data Bit Timing and Prescaler Register" from</div><div class='add'>+ * Microchip.</div><div class='add'>+ */</div><div class='add'>+static const struct can_bittiming_const es58x_fd_data_bittiming_const = {</div><div class='add'>+	.name = "ES582.1/ES584.1",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 8,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 32,</div><div class='add'>+	.brp_inc = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Transmission Delay Compensation constants for ES582.1 and ES584.1</div><div class='add'>+ * as specified in the microcontroller datasheet: "SAM E70/S70/V70/V71</div><div class='add'>+ * Family" section 49.6.15 "MCAN Transmitter Delay Compensation</div><div class='add'>+ * Register" from Microchip.</div><div class='add'>+ */</div><div class='add'>+static const struct can_tdc_const es58x_tdc_const = {</div><div class='add'>+	.tdcv_min = 0,</div><div class='add'>+	.tdcv_max = 0, /* Manual mode not supported. */</div><div class='add'>+	.tdco_min = 0,</div><div class='add'>+	.tdco_max = 127,</div><div class='add'>+	.tdcf_min = 0,</div><div class='add'>+	.tdcf_max = 127</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct es58x_parameters es58x_fd_param = {</div><div class='add'>+	.bittiming_const = &amp;es58x_fd_nom_bittiming_const,</div><div class='add'>+	.data_bittiming_const = &amp;es58x_fd_data_bittiming_const,</div><div class='add'>+	.tdc_const = &amp;es58x_tdc_const,</div><div class='add'>+	/* The devices use NXP TJA1044G transievers which guarantee</div><div class='add'>+	 * the timing for data rates up to 5 Mbps. Bitrates up to 8</div><div class='add'>+	 * Mbps work in an optimal environment but are not recommended</div><div class='add'>+	 * for production environment.</div><div class='add'>+	 */</div><div class='add'>+	.bitrate_max = 8 * MEGA /* BPS */,</div><div class='add'>+	.clock = {.freq = 80 * MEGA /* Hz */},</div><div class='add'>+	.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+	    CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_FD | CAN_CTRLMODE_FD_NON_ISO |</div><div class='add'>+	    CAN_CTRLMODE_CC_LEN8_DLC | CAN_CTRLMODE_TDC_AUTO,</div><div class='add'>+	.tx_start_of_frame = 0xCEFA,	/* FACE in little endian */</div><div class='add'>+	.rx_start_of_frame = 0xFECA,	/* CAFE in little endian */</div><div class='add'>+	.tx_urb_cmd_max_len = ES58X_FD_TX_URB_CMD_MAX_LEN,</div><div class='add'>+	.rx_urb_cmd_max_len = ES58X_FD_RX_URB_CMD_MAX_LEN,</div><div class='add'>+	/* Size of internal device TX queue is 500.</div><div class='add'>+	 *</div><div class='add'>+	 * However, when reaching value around 278, the device's busy</div><div class='add'>+	 * LED turns on and thus maximum value of 500 is never reached</div><div class='add'>+	 * in practice. Also, when this value is too high, some error</div><div class='add'>+	 * on the echo_msg were witnessed when the device is</div><div class='add'>+	 * recovering from bus off.</div><div class='add'>+	 *</div><div class='add'>+	 * For above reasons, a value that would prevent the device</div><div class='add'>+	 * from becoming busy was chosen. In practice, BQL would</div><div class='add'>+	 * prevent the value from even getting closer to below</div><div class='add'>+	 * maximum, so no impact on performance was measured.</div><div class='add'>+	 */</div><div class='add'>+	.fifo_mask = 255, /* echo_skb_max = 256 */</div><div class='add'>+	.dql_min_limit = CAN_FRAME_LEN_MAX * 15, /* Empirical value. */</div><div class='add'>+	.tx_bulk_max = ES58X_FD_TX_BULK_MAX,</div><div class='add'>+	.urb_cmd_header_len = ES58X_FD_URB_CMD_HEADER_LEN,</div><div class='add'>+	.rx_urb_max = ES58X_RX_URBS_MAX,</div><div class='add'>+	.tx_urb_max = ES58X_TX_URBS_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct es58x_operators es58x_fd_ops = {</div><div class='add'>+	.get_msg_len = es58x_fd_get_msg_len,</div><div class='add'>+	.handle_urb_cmd = es58x_fd_handle_urb_cmd,</div><div class='add'>+	.fill_urb_header = es58x_fd_fill_urb_header,</div><div class='add'>+	.tx_can_msg = es58x_fd_tx_can_msg,</div><div class='add'>+	.enable_channel = es58x_fd_enable_channel,</div><div class='add'>+	.disable_channel = es58x_fd_disable_channel,</div><div class='add'>+	.reset_device = NULL, /* Not implemented in the device firmware. */</div><div class='add'>+	.get_timestamp = es58x_fd_get_timestamp</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/can/usb/etas_es58x/es58x_fd.h b/drivers/net/can/usb/etas_es58x/es58x_fd.h<br/>new file mode 100644<br/>index 000000000000..c4b19a6a33ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/etas_es58x/es58x_fd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/etas_es58x/es58x_fd.h</a></div><div class='hunk'>@@ -0,0 +1,234 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/* Driver for ETAS GmbH ES58X USB CAN(-FD) Bus Interfaces.</div><div class='add'>+ *</div><div class='add'>+ * File es58x_fd.h: Definitions and declarations specific to ETAS</div><div class='add'>+ * ES582.1 and ES584.1 (naming convention: we use the term "ES58X FD"</div><div class='add'>+ * when referring to those two variants together).</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020 ETAS K.K.. All rights reserved.</div><div class='add'>+ * Copyright (c) 2020, 2021 Vincent Mailhol &lt;mailhol.vincent@wanadoo.fr&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ES58X_FD_H__</div><div class='add'>+#define __ES58X_FD_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define ES582_1_NUM_CAN_CH 2</div><div class='add'>+#define ES584_1_NUM_CAN_CH 1</div><div class='add'>+#define ES58X_FD_NUM_CAN_CH 2</div><div class='add'>+#define ES58X_FD_CHANNEL_IDX_OFFSET 0</div><div class='add'>+</div><div class='add'>+#define ES58X_FD_TX_BULK_MAX 100</div><div class='add'>+#define ES58X_FD_RX_BULK_MAX 100</div><div class='add'>+#define ES58X_FD_ECHO_BULK_MAX 100</div><div class='add'>+</div><div class='add'>+enum es58x_fd_cmd_type {</div><div class='add'>+	ES58X_FD_CMD_TYPE_CAN = 0x03,</div><div class='add'>+	ES58X_FD_CMD_TYPE_CANFD = 0x04,</div><div class='add'>+	ES58X_FD_CMD_TYPE_DEVICE = 0xFF</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command IDs for ES58X_FD_CMD_TYPE_{CAN,CANFD}. */</div><div class='add'>+enum es58x_fd_can_cmd_id {</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_ENABLE_CHANNEL = 0x01,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_DISABLE_CHANNEL = 0x02,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_TX_MSG = 0x05,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_ECHO_MSG = 0x07,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_RX_MSG = 0x10,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_ERROR_OR_EVENT_MSG = 0x11,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_RESET_RX = 0x20,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_RESET_TX = 0x21,</div><div class='add'>+	ES58X_FD_CAN_CMD_ID_TX_MSG_NO_ACK = 0x55</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command IDs for ES58X_FD_CMD_TYPE_DEVICE. */</div><div class='add'>+enum es58x_fd_dev_cmd_id {</div><div class='add'>+	ES58X_FD_DEV_CMD_ID_GETTIMETICKS = 0x01,</div><div class='add'>+	ES58X_FD_DEV_CMD_ID_TIMESTAMP = 0x02</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum es58x_fd_ctrlmode - Controller mode.</div><div class='add'>+ * @ES58X_FD_CTRLMODE_ACTIVE: send and receive messages.</div><div class='add'>+ * @ES58X_FD_CTRLMODE_PASSIVE: only receive messages (monitor). Do not</div><div class='add'>+ *	send anything, not even the acknowledgment bit.</div><div class='add'>+ * @ES58X_FD_CTRLMODE_FD: CAN FD according to ISO11898-1.</div><div class='add'>+ * @ES58X_FD_CTRLMODE_FD_NON_ISO: follow Bosch CAN FD Specification</div><div class='add'>+ *	V1.0</div><div class='add'>+ * @ES58X_FD_CTRLMODE_DISABLE_PROTOCOL_EXCEPTION_HANDLING: How to</div><div class='add'>+ *	behave when CAN FD reserved bit is monitored as</div><div class='add'>+ *	dominant. (c.f. ISO 11898-1:2015, section 10.4.2.4 "Control</div><div class='add'>+ *	field", paragraph "r0 bit"). 0 (not disable = enable): send</div><div class='add'>+ *	error frame. 1 (disable): goes into bus integration mode</div><div class='add'>+ *	(c.f. below).</div><div class='add'>+ * @ES58X_FD_CTRLMODE_EDGE_FILTER_DURING_BUS_INTEGRATION: 0: Edge</div><div class='add'>+ *	filtering is disabled. 1: Edge filtering is enabled. Two</div><div class='add'>+ *	consecutive dominant bits required to detect an edge for hard</div><div class='add'>+ *	synchronization.</div><div class='add'>+ */</div><div class='add'>+enum es58x_fd_ctrlmode {</div><div class='add'>+	ES58X_FD_CTRLMODE_ACTIVE = 0,</div><div class='add'>+	ES58X_FD_CTRLMODE_PASSIVE = BIT(0),</div><div class='add'>+	ES58X_FD_CTRLMODE_FD = BIT(4),</div><div class='add'>+	ES58X_FD_CTRLMODE_FD_NON_ISO = BIT(5),</div><div class='add'>+	ES58X_FD_CTRLMODE_DISABLE_PROTOCOL_EXCEPTION_HANDLING = BIT(6),</div><div class='add'>+	ES58X_FD_CTRLMODE_EDGE_FILTER_DURING_BUS_INTEGRATION = BIT(7)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct es58x_fd_bittiming {</div><div class='add'>+	__le32 bitrate;</div><div class='add'>+	__le16 tseg1;		/* range: [tseg1_min-1..tseg1_max-1] */</div><div class='add'>+	__le16 tseg2;		/* range: [tseg2_min-1..tseg2_max-1] */</div><div class='add'>+	__le16 brp;		/* range: [brp_min-1..brp_max-1] */</div><div class='add'>+	__le16 sjw;		/* range: [0..sjw_max-1] */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_fd_tx_conf_msg - Channel configuration.</div><div class='add'>+ * @nominal_bittiming: Nominal bittiming.</div><div class='add'>+ * @samples_per_bit: type enum es58x_samples_per_bit.</div><div class='add'>+ * @sync_edge: type enum es58x_sync_edge.</div><div class='add'>+ * @physical_layer: type enum es58x_physical_layer.</div><div class='add'>+ * @echo_mode: type enum es58x_echo_mode.</div><div class='add'>+ * @ctrlmode: type enum es58x_fd_ctrlmode.</div><div class='add'>+ * @canfd_enabled: boolean (0: Classical CAN, 1: CAN and/or CANFD).</div><div class='add'>+ * @data_bittiming: Bittiming for flexible data-rate transmission.</div><div class='add'>+ * @tdc_enabled: Transmitter Delay Compensation switch (0: TDC is</div><div class='add'>+ *	disabled, 1: TDC is enabled).</div><div class='add'>+ * @tdco: Transmitter Delay Compensation Offset.</div><div class='add'>+ * @tdcf: Transmitter Delay Compensation Filter window.</div><div class='add'>+ *</div><div class='add'>+ * Please refer to the microcontroller datasheet: "SAM E70/S70/V70/V71</div><div class='add'>+ * Family" section 49 "Controller Area Network (MCAN)" for additional</div><div class='add'>+ * information.</div><div class='add'>+ */</div><div class='add'>+struct es58x_fd_tx_conf_msg {</div><div class='add'>+	struct es58x_fd_bittiming nominal_bittiming;</div><div class='add'>+	u8 samples_per_bit;</div><div class='add'>+	u8 sync_edge;</div><div class='add'>+	u8 physical_layer;</div><div class='add'>+	u8 echo_mode;</div><div class='add'>+	u8 ctrlmode;</div><div class='add'>+	u8 canfd_enabled;</div><div class='add'>+	struct es58x_fd_bittiming data_bittiming;</div><div class='add'>+	u8 tdc_enabled;</div><div class='add'>+	__le16 tdco;</div><div class='add'>+	__le16 tdcf;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ES58X_FD_CAN_CONF_LEN					\</div><div class='add'>+	(offsetof(struct es58x_fd_tx_conf_msg, canfd_enabled))</div><div class='add'>+#define ES58X_FD_CANFD_CONF_LEN (sizeof(struct es58x_fd_tx_conf_msg))</div><div class='add'>+</div><div class='add'>+struct es58x_fd_tx_can_msg {</div><div class='add'>+	u8 packet_idx;</div><div class='add'>+	__le32 can_id;</div><div class='add'>+	u8 flags;</div><div class='add'>+	union {</div><div class='add'>+		u8 dlc;		/* Only if cmd_id is ES58X_FD_CMD_TYPE_CAN */</div><div class='add'>+		u8 len;		/* Only if cmd_id is ES58X_FD_CMD_TYPE_CANFD */</div><div class='add'>+	} __packed;</div><div class='add'>+	u8 data[CANFD_MAX_DLEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ES58X_FD_CAN_TX_LEN						\</div><div class='add'>+	(offsetof(struct es58x_fd_tx_can_msg, data[CAN_MAX_DLEN]))</div><div class='add'>+#define ES58X_FD_CANFD_TX_LEN (sizeof(struct es58x_fd_tx_can_msg))</div><div class='add'>+</div><div class='add'>+struct es58x_fd_rx_can_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	__le32 can_id;</div><div class='add'>+	u8 flags;</div><div class='add'>+	union {</div><div class='add'>+		u8 dlc;		/* Only if cmd_id is ES58X_FD_CMD_TYPE_CAN */</div><div class='add'>+		u8 len;		/* Only if cmd_id is ES58X_FD_CMD_TYPE_CANFD */</div><div class='add'>+	} __packed;</div><div class='add'>+	u8 data[CANFD_MAX_DLEN];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ES58X_FD_CAN_RX_LEN						\</div><div class='add'>+	(offsetof(struct es58x_fd_rx_can_msg, data[CAN_MAX_DLEN]))</div><div class='add'>+#define ES58X_FD_CANFD_RX_LEN (sizeof(struct es58x_fd_rx_can_msg))</div><div class='add'>+</div><div class='add'>+struct es58x_fd_echo_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	u8 packet_idx;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es58x_fd_rx_event_msg {</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	__le32 can_id;</div><div class='add'>+	u8 flags;		/* type enum es58x_flag */</div><div class='add'>+	u8 error_type;		/* 0: event, 1: error */</div><div class='add'>+	u8 error_code;</div><div class='add'>+	u8 event_code;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct es58x_fd_tx_ack_msg {</div><div class='add'>+	__le32 rx_cmd_ret_le32;	/* type enum es58x_cmd_ret_code_u32 */</div><div class='add'>+	__le16 tx_free_entries;	/* Number of remaining free entries in the device TX queue */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct es58x_fd_urb_cmd - Commands received from or sent to the</div><div class='add'>+ *	ES58X FD device.</div><div class='add'>+ * @SOF: Start of Frame.</div><div class='add'>+ * @cmd_type: Command Type (type: enum es58x_fd_cmd_type). The CRC</div><div class='add'>+ *	calculation starts at this position.</div><div class='add'>+ * @cmd_id: Command ID (type: enum es58x_fd_cmd_id).</div><div class='add'>+ * @channel_idx: Channel index starting at 0.</div><div class='add'>+ * @msg_len: Length of the message, excluding CRC (i.e. length of the</div><div class='add'>+ *	union).</div><div class='add'>+ * @tx_conf_msg: Channel configuration.</div><div class='add'>+ * @tx_can_msg_buf: Concatenation of Tx messages. Type is "u8[]"</div><div class='add'>+ *	instead of "struct es58x_fd_tx_msg[]" because the structure</div><div class='add'>+ *	has a flexible size.</div><div class='add'>+ * @rx_can_msg_buf: Concatenation Rx messages. Type is "u8[]" instead</div><div class='add'>+ *	of "struct es58x_fd_rx_msg[]" because the structure has a</div><div class='add'>+ *	flexible size.</div><div class='add'>+ * @echo_msg: Array of echo messages (e.g. Tx messages being looped</div><div class='add'>+ *	back).</div><div class='add'>+ * @rx_event_msg: Error or event message.</div><div class='add'>+ * @tx_ack_msg: Tx acknowledgment message.</div><div class='add'>+ * @timestamp: Timestamp reply.</div><div class='add'>+ * @rx_cmd_ret_le32: Rx 32 bits return code (type: enum</div><div class='add'>+ *	es58x_cmd_ret_code_u32).</div><div class='add'>+ * @raw_msg: Message raw payload.</div><div class='add'>+ * @reserved_for_crc16_do_not_use: The structure ends with a</div><div class='add'>+ *	CRC16. Because the structures in above union are of variable</div><div class='add'>+ *	lengths, we can not predict the offset of the CRC in</div><div class='add'>+ *	advance. Use functions es58x_get_crc() and es58x_set_crc() to</div><div class='add'>+ *	manipulate it.</div><div class='add'>+ */</div><div class='add'>+struct es58x_fd_urb_cmd {</div><div class='add'>+	__le16 SOF;</div><div class='add'>+	u8 cmd_type;</div><div class='add'>+	u8 cmd_id;</div><div class='add'>+	u8 channel_idx;</div><div class='add'>+	__le16 msg_len;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct es58x_fd_tx_conf_msg tx_conf_msg;</div><div class='add'>+		u8 tx_can_msg_buf[ES58X_FD_TX_BULK_MAX * ES58X_FD_CANFD_TX_LEN];</div><div class='add'>+		u8 rx_can_msg_buf[ES58X_FD_RX_BULK_MAX * ES58X_FD_CANFD_RX_LEN];</div><div class='add'>+		struct es58x_fd_echo_msg echo_msg[ES58X_FD_ECHO_BULK_MAX];</div><div class='add'>+		struct es58x_fd_rx_event_msg rx_event_msg;</div><div class='add'>+		struct es58x_fd_tx_ack_msg tx_ack_msg;</div><div class='add'>+		__le64 timestamp;</div><div class='add'>+		__le32 rx_cmd_ret_le32;</div><div class='add'>+		DECLARE_FLEX_ARRAY(u8, raw_msg);</div><div class='add'>+	} __packed;</div><div class='add'>+</div><div class='add'>+	__le16 reserved_for_crc16_do_not_use;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define ES58X_FD_URB_CMD_HEADER_LEN (offsetof(struct es58x_fd_urb_cmd, raw_msg))</div><div class='add'>+#define ES58X_FD_TX_URB_CMD_MAX_LEN					\</div><div class='add'>+	ES58X_SIZEOF_URB_CMD(struct es58x_fd_urb_cmd, tx_can_msg_buf)</div><div class='add'>+#define ES58X_FD_RX_URB_CMD_MAX_LEN					\</div><div class='add'>+	ES58X_SIZEOF_URB_CMD(struct es58x_fd_urb_cmd, rx_can_msg_buf)</div><div class='add'>+</div><div class='add'>+#endif /* __ES58X_FD_H__ */</div><div class='head'>diff --git a/drivers/net/can/usb/f81604.c b/drivers/net/can/usb/f81604.c<br/>new file mode 100644<br/>index 000000000000..efe61ece79ea<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/f81604.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/f81604.c</a></div><div class='hunk'>@@ -0,0 +1,1204 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Fintek F81604 USB-to-2CAN controller driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023 Ji-Ze Hong (Peter Hong) &lt;peter_hong@fintek.com.tw&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+#include &lt;linux/usb.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/can/platform/sja1000.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+/* vendor and product id */</div><div class='add'>+#define F81604_VENDOR_ID 0x2c42</div><div class='add'>+#define F81604_PRODUCT_ID 0x1709</div><div class='add'>+#define F81604_CAN_CLOCK (12 * MEGA)</div><div class='add'>+#define F81604_MAX_DEV 2</div><div class='add'>+#define F81604_SET_DEVICE_RETRY 10</div><div class='add'>+</div><div class='add'>+#define F81604_USB_TIMEOUT 2000</div><div class='add'>+#define F81604_SET_GET_REGISTER 0xA0</div><div class='add'>+#define F81604_PORT_OFFSET 0x1000</div><div class='add'>+#define F81604_MAX_RX_URBS 4</div><div class='add'>+</div><div class='add'>+#define F81604_CMD_DATA 0x00</div><div class='add'>+</div><div class='add'>+#define F81604_DLC_LEN_MASK GENMASK(3, 0)</div><div class='add'>+#define F81604_DLC_EFF_BIT BIT(7)</div><div class='add'>+#define F81604_DLC_RTR_BIT BIT(6)</div><div class='add'>+</div><div class='add'>+#define F81604_SFF_SHIFT 5</div><div class='add'>+#define F81604_EFF_SHIFT 3</div><div class='add'>+</div><div class='add'>+#define F81604_BRP_MASK GENMASK(5, 0)</div><div class='add'>+#define F81604_SJW_MASK GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define F81604_SEG1_MASK GENMASK(3, 0)</div><div class='add'>+#define F81604_SEG2_MASK GENMASK(6, 4)</div><div class='add'>+</div><div class='add'>+#define F81604_CLEAR_ALC 0</div><div class='add'>+#define F81604_CLEAR_ECC 1</div><div class='add'>+#define F81604_CLEAR_OVERRUN 2</div><div class='add'>+</div><div class='add'>+/* device setting */</div><div class='add'>+#define F81604_CTRL_MODE_REG 0x80</div><div class='add'>+#define F81604_TX_ONESHOT (0x03 &lt;&lt; 3)</div><div class='add'>+#define F81604_TX_NORMAL (0x01 &lt;&lt; 3)</div><div class='add'>+#define F81604_RX_AUTO_RELEASE_BUF BIT(1)</div><div class='add'>+#define F81604_INT_WHEN_CHANGE BIT(0)</div><div class='add'>+</div><div class='add'>+#define F81604_TERMINATOR_REG 0x105</div><div class='add'>+#define F81604_CAN0_TERM BIT(2)</div><div class='add'>+#define F81604_CAN1_TERM BIT(3)</div><div class='add'>+</div><div class='add'>+#define F81604_TERMINATION_DISABLED CAN_TERMINATION_DISABLED</div><div class='add'>+#define F81604_TERMINATION_ENABLED 120</div><div class='add'>+</div><div class='add'>+/* SJA1000 registers - manual section 6.4 (Pelican Mode) */</div><div class='add'>+#define F81604_SJA1000_MOD 0x00</div><div class='add'>+#define F81604_SJA1000_CMR 0x01</div><div class='add'>+#define F81604_SJA1000_IR 0x03</div><div class='add'>+#define F81604_SJA1000_IER 0x04</div><div class='add'>+#define F81604_SJA1000_ALC 0x0B</div><div class='add'>+#define F81604_SJA1000_ECC 0x0C</div><div class='add'>+#define F81604_SJA1000_RXERR 0x0E</div><div class='add'>+#define F81604_SJA1000_TXERR 0x0F</div><div class='add'>+#define F81604_SJA1000_ACCC0 0x10</div><div class='add'>+#define F81604_SJA1000_ACCM0 0x14</div><div class='add'>+#define F81604_MAX_FILTER_CNT 4</div><div class='add'>+</div><div class='add'>+/* Common registers - manual section 6.5 */</div><div class='add'>+#define F81604_SJA1000_BTR0 0x06</div><div class='add'>+#define F81604_SJA1000_BTR1 0x07</div><div class='add'>+#define F81604_SJA1000_BTR1_SAMPLE_TRIPLE BIT(7)</div><div class='add'>+#define F81604_SJA1000_OCR 0x08</div><div class='add'>+#define F81604_SJA1000_CDR 0x1F</div><div class='add'>+</div><div class='add'>+/* mode register */</div><div class='add'>+#define F81604_SJA1000_MOD_RM 0x01</div><div class='add'>+#define F81604_SJA1000_MOD_LOM 0x02</div><div class='add'>+#define F81604_SJA1000_MOD_STM 0x04</div><div class='add'>+</div><div class='add'>+/* commands */</div><div class='add'>+#define F81604_SJA1000_CMD_CDO 0x08</div><div class='add'>+</div><div class='add'>+/* interrupt sources */</div><div class='add'>+#define F81604_SJA1000_IRQ_BEI 0x80</div><div class='add'>+#define F81604_SJA1000_IRQ_ALI 0x40</div><div class='add'>+#define F81604_SJA1000_IRQ_EPI 0x20</div><div class='add'>+#define F81604_SJA1000_IRQ_DOI 0x08</div><div class='add'>+#define F81604_SJA1000_IRQ_EI 0x04</div><div class='add'>+#define F81604_SJA1000_IRQ_TI 0x02</div><div class='add'>+#define F81604_SJA1000_IRQ_RI 0x01</div><div class='add'>+#define F81604_SJA1000_IRQ_ALL 0xFF</div><div class='add'>+#define F81604_SJA1000_IRQ_OFF 0x00</div><div class='add'>+</div><div class='add'>+/* status register content */</div><div class='add'>+#define F81604_SJA1000_SR_BS 0x80</div><div class='add'>+#define F81604_SJA1000_SR_ES 0x40</div><div class='add'>+#define F81604_SJA1000_SR_TCS 0x08</div><div class='add'>+</div><div class='add'>+/* ECC register */</div><div class='add'>+#define F81604_SJA1000_ECC_SEG 0x1F</div><div class='add'>+#define F81604_SJA1000_ECC_DIR 0x20</div><div class='add'>+#define F81604_SJA1000_ECC_BIT 0x00</div><div class='add'>+#define F81604_SJA1000_ECC_FORM 0x40</div><div class='add'>+#define F81604_SJA1000_ECC_STUFF 0x80</div><div class='add'>+#define F81604_SJA1000_ECC_MASK 0xc0</div><div class='add'>+</div><div class='add'>+/* ALC register */</div><div class='add'>+#define F81604_SJA1000_ALC_MASK 0x1f</div><div class='add'>+</div><div class='add'>+/* table of devices that work with this driver */</div><div class='add'>+static const struct usb_device_id f81604_table[] = {</div><div class='add'>+	{ USB_DEVICE(F81604_VENDOR_ID, F81604_PRODUCT_ID) },</div><div class='add'>+	{} /* Terminating entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(usb, f81604_table);</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops f81604_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 f81604_termination[] = { F81604_TERMINATION_DISABLED,</div><div class='add'>+					  F81604_TERMINATION_ENABLED };</div><div class='add'>+</div><div class='add'>+struct f81604_priv {</div><div class='add'>+	struct net_device *netdev[F81604_MAX_DEV];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct f81604_port_priv {</div><div class='add'>+	struct can_priv can;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct sk_buff *echo_skb;</div><div class='add'>+</div><div class='add'>+	unsigned long clear_flags;</div><div class='add'>+	struct work_struct clear_reg_work;</div><div class='add'>+</div><div class='add'>+	struct usb_device *dev;</div><div class='add'>+	struct usb_interface *intf;</div><div class='add'>+</div><div class='add'>+	struct usb_anchor urbs_anchor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Interrupt endpoint data format:</div><div class='add'>+ *	Byte 0: Status register.</div><div class='add'>+ *	Byte 1: Interrupt register.</div><div class='add'>+ *	Byte 2: Interrupt enable register.</div><div class='add'>+ *	Byte 3: Arbitration lost capture(ALC) register.</div><div class='add'>+ *	Byte 4: Error code capture(ECC) register.</div><div class='add'>+ *	Byte 5: Error warning limit register.</div><div class='add'>+ *	Byte 6: RX error counter register.</div><div class='add'>+ *	Byte 7: TX error counter register.</div><div class='add'>+ *	Byte 8: Reserved.</div><div class='add'>+ */</div><div class='add'>+struct f81604_int_data {</div><div class='add'>+	u8 sr;</div><div class='add'>+	u8 isrc;</div><div class='add'>+	u8 ier;</div><div class='add'>+	u8 alc;</div><div class='add'>+	u8 ecc;</div><div class='add'>+	u8 ewlr;</div><div class='add'>+	u8 rxerr;</div><div class='add'>+	u8 txerr;</div><div class='add'>+	u8 val;</div><div class='add'>+} __packed __aligned(4);</div><div class='add'>+</div><div class='add'>+struct f81604_sff {</div><div class='add'>+	__be16 id;</div><div class='add'>+	u8 data[CAN_MAX_DLEN];</div><div class='add'>+} __packed __aligned(2);</div><div class='add'>+</div><div class='add'>+struct f81604_eff {</div><div class='add'>+	__be32 id;</div><div class='add'>+	u8 data[CAN_MAX_DLEN];</div><div class='add'>+} __packed __aligned(2);</div><div class='add'>+</div><div class='add'>+struct f81604_can_frame {</div><div class='add'>+	u8 cmd;</div><div class='add'>+</div><div class='add'>+	/* According for F81604 DLC define:</div><div class='add'>+	 *	bit 3~0: data length (0~8)</div><div class='add'>+	 *	bit6: is RTR flag.</div><div class='add'>+	 *	bit7: is EFF frame.</div><div class='add'>+	 */</div><div class='add'>+	u8 dlc;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct f81604_sff sff;</div><div class='add'>+		struct f81604_eff eff;</div><div class='add'>+	};</div><div class='add'>+} __packed __aligned(2);</div><div class='add'>+</div><div class='add'>+static const u8 bulk_in_addr[F81604_MAX_DEV] = { 2, 4 };</div><div class='add'>+static const u8 bulk_out_addr[F81604_MAX_DEV] = { 1, 3 };</div><div class='add'>+static const u8 int_in_addr[F81604_MAX_DEV] = { 1, 3 };</div><div class='add'>+</div><div class='add'>+static int f81604_write(struct usb_device *dev, u16 reg, u8 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg_send(dev, 0, F81604_SET_GET_REGISTER,</div><div class='add'>+				   USB_TYPE_VENDOR | USB_DIR_OUT, 0, reg,</div><div class='add'>+				   &amp;data, sizeof(data), F81604_USB_TIMEOUT,</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: reg: %x data: %x failed: %pe\n",</div><div class='add'>+			__func__, reg, data, ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_read(struct usb_device *dev, u16 reg, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg_recv(dev, 0, F81604_SET_GET_REGISTER,</div><div class='add'>+				   USB_TYPE_VENDOR | USB_DIR_IN, 0, reg, data,</div><div class='add'>+				   sizeof(*data), F81604_USB_TIMEOUT,</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(&amp;dev-&gt;dev, "%s: reg: %x failed: %pe\n", __func__, reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_update_bits(struct usb_device *dev, u16 reg, u8 mask,</div><div class='add'>+			      u8 data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	ret = f81604_read(dev, reg, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tmp &amp;= ~mask;</div><div class='add'>+	tmp |= (mask &amp; data);</div><div class='add'>+</div><div class='add'>+	return f81604_write(dev, reg, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_sja1000_write(struct f81604_port_priv *priv, u16 reg,</div><div class='add'>+				u8 data)</div><div class='add'>+{</div><div class='add'>+	int port = priv-&gt;netdev-&gt;dev_port;</div><div class='add'>+	int real_reg;</div><div class='add'>+</div><div class='add'>+	real_reg = reg + F81604_PORT_OFFSET * port + F81604_PORT_OFFSET;</div><div class='add'>+	return f81604_write(priv-&gt;dev, real_reg, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_sja1000_read(struct f81604_port_priv *priv, u16 reg,</div><div class='add'>+			       u8 *data)</div><div class='add'>+{</div><div class='add'>+	int port = priv-&gt;netdev-&gt;dev_port;</div><div class='add'>+	int real_reg;</div><div class='add'>+</div><div class='add'>+	real_reg = reg + F81604_PORT_OFFSET * port + F81604_PORT_OFFSET;</div><div class='add'>+	return f81604_read(priv-&gt;dev, real_reg, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_set_reset_mode(struct f81604_port_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	/* disable interrupts */</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_SJA1000_IER,</div><div class='add'>+				   F81604_SJA1000_IRQ_OFF);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; F81604_SET_DEVICE_RETRY; i++) {</div><div class='add'>+		ret = f81604_sja1000_read(priv, F81604_SJA1000_MOD, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* check reset bit */</div><div class='add'>+		if (tmp &amp; F81604_SJA1000_MOD_RM) {</div><div class='add'>+			priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* reset chip */</div><div class='add'>+		ret = f81604_sja1000_write(priv, F81604_SJA1000_MOD,</div><div class='add'>+					   F81604_SJA1000_MOD_RM);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EPERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_set_normal_mode(struct f81604_port_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u8 tmp, ier = 0;</div><div class='add'>+	u8 mod_reg = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; F81604_SET_DEVICE_RETRY; i++) {</div><div class='add'>+		ret = f81604_sja1000_read(priv, F81604_SJA1000_MOD, &amp;tmp);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* check reset bit */</div><div class='add'>+		if ((tmp &amp; F81604_SJA1000_MOD_RM) == 0) {</div><div class='add'>+			priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+			/* enable interrupts, RI handled by bulk-in */</div><div class='add'>+			ier = F81604_SJA1000_IRQ_ALL &amp; ~F81604_SJA1000_IRQ_RI;</div><div class='add'>+			if (!(priv-&gt;can.ctrlmode &amp;</div><div class='add'>+			      CAN_CTRLMODE_BERR_REPORTING))</div><div class='add'>+				ier &amp;= ~F81604_SJA1000_IRQ_BEI;</div><div class='add'>+</div><div class='add'>+			return f81604_sja1000_write(priv, F81604_SJA1000_IER,</div><div class='add'>+						    ier);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* set chip to normal mode */</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+			mod_reg |= F81604_SJA1000_MOD_LOM;</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_PRESUME_ACK)</div><div class='add'>+			mod_reg |= F81604_SJA1000_MOD_STM;</div><div class='add'>+</div><div class='add'>+		ret = f81604_sja1000_write(priv, F81604_SJA1000_MOD, mod_reg);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EPERM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_chipset_init(struct f81604_port_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* set clock divider and output control register */</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_SJA1000_CDR,</div><div class='add'>+				   CDR_CBP | CDR_PELICAN);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set acceptance filter (accept all) */</div><div class='add'>+	for (i = 0; i &lt; F81604_MAX_FILTER_CNT; ++i) {</div><div class='add'>+		ret = f81604_sja1000_write(priv, F81604_SJA1000_ACCC0 + i, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; F81604_MAX_FILTER_CNT; ++i) {</div><div class='add'>+		ret = f81604_sja1000_write(priv, F81604_SJA1000_ACCM0 + i,</div><div class='add'>+					   0xFF);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return f81604_sja1000_write(priv, F81604_SJA1000_OCR,</div><div class='add'>+				    OCR_TX0_PUSHPULL | OCR_TX1_PUSHPULL |</div><div class='add'>+					    OCR_MODE_NORMAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_process_rx_packet(struct net_device *netdev,</div><div class='add'>+				     struct f81604_can_frame *frame)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;cmd != F81604_CMD_DATA)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_skb(netdev, &amp;cf);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		stats-&gt;rx_dropped++;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(frame-&gt;dlc &amp; F81604_DLC_LEN_MASK);</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;dlc &amp; F81604_DLC_EFF_BIT) {</div><div class='add'>+		cf-&gt;can_id = get_unaligned_be32(&amp;frame-&gt;eff.id) &gt;&gt;</div><div class='add'>+			     F81604_EFF_SHIFT;</div><div class='add'>+		cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+</div><div class='add'>+		if (!(frame-&gt;dlc &amp; F81604_DLC_RTR_BIT))</div><div class='add'>+			memcpy(cf-&gt;data, frame-&gt;eff.data, cf-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		cf-&gt;can_id = get_unaligned_be16(&amp;frame-&gt;sff.id) &gt;&gt;</div><div class='add'>+			     F81604_SFF_SHIFT;</div><div class='add'>+</div><div class='add'>+		if (!(frame-&gt;dlc &amp; F81604_DLC_RTR_BIT))</div><div class='add'>+			memcpy(cf-&gt;data, frame-&gt;sff.data, cf-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;dlc &amp; F81604_DLC_RTR_BIT)</div><div class='add'>+		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	else</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_read_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct f81604_can_frame *frame = urb-&gt;transfer_buffer;</div><div class='add'>+	struct net_device *netdev = urb-&gt;context;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status)</div><div class='add'>+		netdev_info(netdev, "%s: URB aborted %pe\n", __func__,</div><div class='add'>+			    ERR_PTR(urb-&gt;status));</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0: /* success */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+	case -EPROTO:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;actual_length != sizeof(*frame)) {</div><div class='add'>+		netdev_warn(netdev, "URB length %u not equal to %zu\n",</div><div class='add'>+			    urb-&gt;actual_length, sizeof(*frame));</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	f81604_process_rx_packet(netdev, frame);</div><div class='add'>+</div><div class='add'>+resubmit_urb:</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (ret == -ENODEV)</div><div class='add'>+		netif_device_detach(netdev);</div><div class='add'>+	else if (ret)</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "%s: failed to resubmit read bulk urb: %pe\n",</div><div class='add'>+			   __func__, ERR_PTR(ret));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_handle_tx(struct f81604_port_priv *priv,</div><div class='add'>+			     struct f81604_int_data *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='add'>+</div><div class='add'>+	/* transmission buffer released */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT &amp;&amp;</div><div class='add'>+	    !(data-&gt;sr &amp; F81604_SJA1000_SR_TCS)) {</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		can_free_echo_skb(netdev, 0, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		/* transmission complete */</div><div class='add'>+		stats-&gt;tx_bytes += can_get_echo_skb(netdev, 0, NULL);</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_handle_can_bus_errors(struct f81604_port_priv *priv,</div><div class='add'>+					 struct f81604_int_data *data)</div><div class='add'>+{</div><div class='add'>+	enum can_state can_state = priv-&gt;can.state;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* Note: ALC/ECC will not auto clear by read here, must be cleared by</div><div class='add'>+	 * read register (via clear_reg_work).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='add'>+	if (skb) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = data-&gt;txerr;</div><div class='add'>+		cf-&gt;data[7] = data-&gt;rxerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;isrc &amp; F81604_SJA1000_IRQ_DOI) {</div><div class='add'>+		/* data overrun interrupt */</div><div class='add'>+		netdev_dbg(netdev, "data overrun interrupt\n");</div><div class='add'>+</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_over_errors++;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+</div><div class='add'>+		set_bit(F81604_CLEAR_OVERRUN, &amp;priv-&gt;clear_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;isrc &amp; F81604_SJA1000_IRQ_EI) {</div><div class='add'>+		/* error warning interrupt */</div><div class='add'>+		netdev_dbg(netdev, "error warning interrupt\n");</div><div class='add'>+</div><div class='add'>+		if (data-&gt;sr &amp; F81604_SJA1000_SR_BS)</div><div class='add'>+			can_state = CAN_STATE_BUS_OFF;</div><div class='add'>+		else if (data-&gt;sr &amp; F81604_SJA1000_SR_ES)</div><div class='add'>+			can_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+		else</div><div class='add'>+			can_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;isrc &amp; F81604_SJA1000_IRQ_BEI) {</div><div class='add'>+		/* bus error interrupt */</div><div class='add'>+		netdev_dbg(netdev, "bus error interrupt\n");</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+</div><div class='add'>+			/* set error type */</div><div class='add'>+			switch (data-&gt;ecc &amp; F81604_SJA1000_ECC_MASK) {</div><div class='add'>+			case F81604_SJA1000_ECC_BIT:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_BIT;</div><div class='add'>+				break;</div><div class='add'>+			case F81604_SJA1000_ECC_FORM:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+				break;</div><div class='add'>+			case F81604_SJA1000_ECC_STUFF:</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* set error location */</div><div class='add'>+			cf-&gt;data[3] = data-&gt;ecc &amp; F81604_SJA1000_ECC_SEG;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Error occurred during transmission? */</div><div class='add'>+		if ((data-&gt;ecc &amp; F81604_SJA1000_ECC_DIR) == 0) {</div><div class='add'>+			stats-&gt;tx_errors++;</div><div class='add'>+			if (skb)</div><div class='add'>+				cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		} else {</div><div class='add'>+			stats-&gt;rx_errors++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		set_bit(F81604_CLEAR_ECC, &amp;priv-&gt;clear_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;isrc &amp; F81604_SJA1000_IRQ_EPI) {</div><div class='add'>+		if (can_state == CAN_STATE_ERROR_PASSIVE)</div><div class='add'>+			can_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+		else</div><div class='add'>+			can_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+</div><div class='add'>+		/* error passive interrupt */</div><div class='add'>+		netdev_dbg(netdev, "error passive interrupt: %d\n", can_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;isrc &amp; F81604_SJA1000_IRQ_ALI) {</div><div class='add'>+		/* arbitration lost interrupt */</div><div class='add'>+		netdev_dbg(netdev, "arbitration lost interrupt\n");</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.can_stats.arbitration_lost++;</div><div class='add'>+</div><div class='add'>+		if (skb) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='add'>+			cf-&gt;data[0] = data-&gt;alc &amp; F81604_SJA1000_ALC_MASK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		set_bit(F81604_CLEAR_ALC, &amp;priv-&gt;clear_flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (can_state != priv-&gt;can.state) {</div><div class='add'>+		enum can_state tx_state, rx_state;</div><div class='add'>+</div><div class='add'>+		tx_state = data-&gt;txerr &gt;= data-&gt;rxerr ? can_state : 0;</div><div class='add'>+		rx_state = data-&gt;txerr &lt;= data-&gt;rxerr ? can_state : 0;</div><div class='add'>+</div><div class='add'>+		can_change_state(netdev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+		if (can_state == CAN_STATE_BUS_OFF)</div><div class='add'>+			can_bus_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;clear_flags)</div><div class='add'>+		schedule_work(&amp;priv-&gt;clear_reg_work);</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_read_int_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct f81604_int_data *data = urb-&gt;transfer_buffer;</div><div class='add'>+	struct net_device *netdev = urb-&gt;context;</div><div class='add'>+	struct f81604_port_priv *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status)</div><div class='add'>+		netdev_info(netdev, "%s: Int URB aborted: %pe\n", __func__,</div><div class='add'>+			    ERR_PTR(urb-&gt;status));</div><div class='add'>+</div><div class='add'>+	switch (urb-&gt;status) {</div><div class='add'>+	case 0: /* success */</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case -ENOENT:</div><div class='add'>+	case -EPIPE:</div><div class='add'>+	case -EPROTO:</div><div class='add'>+	case -ESHUTDOWN:</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* handle Errors */</div><div class='add'>+	if (data-&gt;isrc &amp; (F81604_SJA1000_IRQ_DOI | F81604_SJA1000_IRQ_EI |</div><div class='add'>+			  F81604_SJA1000_IRQ_BEI | F81604_SJA1000_IRQ_EPI |</div><div class='add'>+			  F81604_SJA1000_IRQ_ALI))</div><div class='add'>+		f81604_handle_can_bus_errors(priv, data);</div><div class='add'>+</div><div class='add'>+	/* handle TX */</div><div class='add'>+	if (priv-&gt;can.state != CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+	    (data-&gt;isrc &amp; F81604_SJA1000_IRQ_TI))</div><div class='add'>+		f81604_handle_tx(priv, data);</div><div class='add'>+</div><div class='add'>+resubmit_urb:</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='add'>+	if (ret == -ENODEV)</div><div class='add'>+		netif_device_detach(netdev);</div><div class='add'>+	else if (ret)</div><div class='add'>+		netdev_err(netdev, "%s: failed to resubmit int urb: %pe\n",</div><div class='add'>+			   __func__, ERR_PTR(ret));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_unregister_urbs(struct f81604_port_priv *priv)</div><div class='add'>+{</div><div class='add'>+	usb_kill_anchored_urbs(&amp;priv-&gt;urbs_anchor);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_register_urbs(struct f81604_port_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct f81604_int_data *int_data;</div><div class='add'>+	int id = netdev-&gt;dev_port;</div><div class='add'>+	struct urb *int_urb;</div><div class='add'>+	int rx_urb_cnt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (rx_urb_cnt = 0; rx_urb_cnt &lt; F81604_MAX_RX_URBS; ++rx_urb_cnt) {</div><div class='add'>+		struct f81604_can_frame *frame;</div><div class='add'>+		struct urb *rx_urb;</div><div class='add'>+</div><div class='add'>+		rx_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+		if (!rx_urb) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		frame = kmalloc(sizeof(*frame), GFP_KERNEL);</div><div class='add'>+		if (!frame) {</div><div class='add'>+			usb_free_urb(rx_urb);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		usb_fill_bulk_urb(rx_urb, priv-&gt;dev,</div><div class='add'>+				  usb_rcvbulkpipe(priv-&gt;dev, bulk_in_addr[id]),</div><div class='add'>+				  frame, sizeof(*frame),</div><div class='add'>+				  f81604_read_bulk_callback, netdev);</div><div class='add'>+</div><div class='add'>+		rx_urb-&gt;transfer_flags |= URB_FREE_BUFFER;</div><div class='add'>+		usb_anchor_urb(rx_urb, &amp;priv-&gt;urbs_anchor);</div><div class='add'>+</div><div class='add'>+		ret = usb_submit_urb(rx_urb, GFP_KERNEL);</div><div class='add'>+		if (ret) {</div><div class='add'>+			usb_unanchor_urb(rx_urb);</div><div class='add'>+			usb_free_urb(rx_urb);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Drop reference, USB core will take care of freeing it */</div><div class='add'>+		usb_free_urb(rx_urb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_urb_cnt == 0) {</div><div class='add'>+		netdev_warn(netdev, "%s: submit rx urb failed: %pe\n",</div><div class='add'>+			    __func__, ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	int_urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='add'>+	if (!int_urb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	int_data = kmalloc(sizeof(*int_data), GFP_KERNEL);</div><div class='add'>+	if (!int_data) {</div><div class='add'>+		usb_free_urb(int_urb);</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	usb_fill_int_urb(int_urb, priv-&gt;dev,</div><div class='add'>+			 usb_rcvintpipe(priv-&gt;dev, int_in_addr[id]), int_data,</div><div class='add'>+			 sizeof(*int_data), f81604_read_int_callback, netdev,</div><div class='add'>+			 1);</div><div class='add'>+</div><div class='add'>+	int_urb-&gt;transfer_flags |= URB_FREE_BUFFER;</div><div class='add'>+	usb_anchor_urb(int_urb, &amp;priv-&gt;urbs_anchor);</div><div class='add'>+</div><div class='add'>+	ret = usb_submit_urb(int_urb, GFP_KERNEL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		usb_unanchor_urb(int_urb);</div><div class='add'>+		usb_free_urb(int_urb);</div><div class='add'>+</div><div class='add'>+		netdev_warn(netdev, "%s: submit int urb failed: %pe\n",</div><div class='add'>+			    __func__, ERR_PTR(ret));</div><div class='add'>+		goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Drop reference, USB core will take care of freeing it */</div><div class='add'>+	usb_free_urb(int_urb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	f81604_unregister_urbs(priv);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_start(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct f81604_port_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+	u8 mode;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	mode = F81604_RX_AUTO_RELEASE_BUF | F81604_INT_WHEN_CHANGE;</div><div class='add'>+</div><div class='add'>+	/* Set TR/AT mode */</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		mode |= F81604_TX_ONESHOT;</div><div class='add'>+	else</div><div class='add'>+		mode |= F81604_TX_NORMAL;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_CTRL_MODE_REG, mode);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* set reset mode */</div><div class='add'>+	ret = f81604_set_reset_mode(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_chipset_init(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Clear error counters and error code capture */</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_SJA1000_TXERR, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_SJA1000_RXERR, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Read clear for ECC/ALC/IR register */</div><div class='add'>+	ret = f81604_sja1000_read(priv, F81604_SJA1000_ECC, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_read(priv, F81604_SJA1000_ALC, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_read(priv, F81604_SJA1000_IR, &amp;tmp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_register_urbs(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_set_normal_mode(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		f81604_unregister_urbs(priv);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_set_bittiming(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct f81604_port_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	u8 btr0, btr1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	btr0 = FIELD_PREP(F81604_BRP_MASK, bt-&gt;brp - 1) |</div><div class='add'>+	       FIELD_PREP(F81604_SJW_MASK, bt-&gt;sjw - 1);</div><div class='add'>+</div><div class='add'>+	btr1 = FIELD_PREP(F81604_SEG1_MASK,</div><div class='add'>+			  bt-&gt;prop_seg + bt-&gt;phase_seg1 - 1) |</div><div class='add'>+	       FIELD_PREP(F81604_SEG2_MASK, bt-&gt;phase_seg2 - 1);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='add'>+		btr1 |= F81604_SJA1000_BTR1_SAMPLE_TRIPLE;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_SJA1000_BTR0, btr0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_warn(dev, "%s: Set BTR0 failed: %pe\n", __func__,</div><div class='add'>+			    ERR_PTR(ret));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_write(priv, F81604_SJA1000_BTR1, btr1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_warn(dev, "%s: Set BTR1 failed: %pe\n", __func__,</div><div class='add'>+			    ERR_PTR(ret));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_set_mode(struct net_device *netdev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		ret = f81604_start(netdev);</div><div class='add'>+		if (!ret &amp;&amp; netif_queue_stopped(netdev))</div><div class='add'>+			netif_wake_queue(netdev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_write_bulk_callback(struct urb *urb)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = urb-&gt;context;</div><div class='add'>+</div><div class='add'>+	if (!netif_device_present(netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status)</div><div class='add'>+		netdev_info(netdev, "%s: Tx URB error: %pe\n", __func__,</div><div class='add'>+			    ERR_PTR(urb-&gt;status));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void f81604_clear_reg_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct f81604_port_priv *priv;</div><div class='add'>+	u8 tmp;</div><div class='add'>+</div><div class='add'>+	priv = container_of(work, struct f81604_port_priv, clear_reg_work);</div><div class='add'>+</div><div class='add'>+	/* dummy read for clear Arbitration lost capture(ALC) register. */</div><div class='add'>+	if (test_and_clear_bit(F81604_CLEAR_ALC, &amp;priv-&gt;clear_flags))</div><div class='add'>+		f81604_sja1000_read(priv, F81604_SJA1000_ALC, &amp;tmp);</div><div class='add'>+</div><div class='add'>+	/* dummy read for clear Error code capture(ECC) register. */</div><div class='add'>+	if (test_and_clear_bit(F81604_CLEAR_ECC, &amp;priv-&gt;clear_flags))</div><div class='add'>+		f81604_sja1000_read(priv, F81604_SJA1000_ECC, &amp;tmp);</div><div class='add'>+</div><div class='add'>+	/* dummy write for clear data overrun flag. */</div><div class='add'>+	if (test_and_clear_bit(F81604_CLEAR_OVERRUN, &amp;priv-&gt;clear_flags))</div><div class='add'>+		f81604_sja1000_write(priv, F81604_SJA1000_CMR,</div><div class='add'>+				     F81604_SJA1000_CMD_CDO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t f81604_start_xmit(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	struct f81604_port_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='add'>+	struct f81604_can_frame *frame;</div><div class='add'>+	struct urb *write_urb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	write_urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='add'>+	if (!write_urb)</div><div class='add'>+		goto nomem_urb;</div><div class='add'>+</div><div class='add'>+	frame = kzalloc(sizeof(*frame), GFP_ATOMIC);</div><div class='add'>+	if (!frame)</div><div class='add'>+		goto nomem_buf;</div><div class='add'>+</div><div class='add'>+	usb_fill_bulk_urb(write_urb, priv-&gt;dev,</div><div class='add'>+			  usb_sndbulkpipe(priv-&gt;dev,</div><div class='add'>+					  bulk_out_addr[netdev-&gt;dev_port]),</div><div class='add'>+			  frame, sizeof(*frame), f81604_write_bulk_callback,</div><div class='add'>+			  priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	write_urb-&gt;transfer_flags |= URB_FREE_BUFFER;</div><div class='add'>+</div><div class='add'>+	frame-&gt;cmd = F81604_CMD_DATA;</div><div class='add'>+	frame-&gt;dlc = cf-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+		frame-&gt;dlc |= F81604_DLC_RTR_BIT;</div><div class='add'>+</div><div class='add'>+	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+		u32 id = (cf-&gt;can_id &amp; CAN_EFF_MASK) &lt;&lt; F81604_EFF_SHIFT;</div><div class='add'>+</div><div class='add'>+		put_unaligned_be32(id, &amp;frame-&gt;eff.id);</div><div class='add'>+</div><div class='add'>+		frame-&gt;dlc |= F81604_DLC_EFF_BIT;</div><div class='add'>+</div><div class='add'>+		if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+			memcpy(&amp;frame-&gt;eff.data, cf-&gt;data, cf-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		u32 id = (cf-&gt;can_id &amp; CAN_SFF_MASK) &lt;&lt; F81604_SFF_SHIFT;</div><div class='add'>+</div><div class='add'>+		put_unaligned_be16(id, &amp;frame-&gt;sff.id);</div><div class='add'>+</div><div class='add'>+		if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+			memcpy(&amp;frame-&gt;sff.data, cf-&gt;data, cf-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_put_echo_skb(skb, netdev, 0, 0);</div><div class='add'>+</div><div class='add'>+	ret = usb_submit_urb(write_urb, GFP_ATOMIC);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(netdev, "%s: failed to resubmit tx bulk urb: %pe\n",</div><div class='add'>+			   __func__, ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+		can_free_echo_skb(netdev, 0, NULL);</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netif_device_detach(netdev);</div><div class='add'>+		else</div><div class='add'>+			netif_wake_queue(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* let usb core take care of this urb */</div><div class='add'>+	usb_free_urb(write_urb);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+nomem_buf:</div><div class='add'>+	usb_free_urb(write_urb);</div><div class='add'>+</div><div class='add'>+nomem_urb:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	stats-&gt;tx_dropped++;</div><div class='add'>+	stats-&gt;tx_errors++;</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_get_berr_counter(const struct net_device *netdev,</div><div class='add'>+				   struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct f81604_port_priv *priv = netdev_priv(netdev);</div><div class='add'>+	u8 txerr, rxerr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_read(priv, F81604_SJA1000_TXERR, &amp;txerr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_sja1000_read(priv, F81604_SJA1000_RXERR, &amp;rxerr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bec-&gt;txerr = txerr;</div><div class='add'>+	bec-&gt;rxerr = rxerr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Open USB device */</div><div class='add'>+static int f81604_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = open_candev(netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = f81604_start(netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netif_device_detach(netdev);</div><div class='add'>+</div><div class='add'>+		close_candev(netdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Close USB device */</div><div class='add'>+static int f81604_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct f81604_port_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	f81604_set_reset_mode(priv);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	cancel_work_sync(&amp;priv-&gt;clear_reg_work);</div><div class='add'>+	close_candev(netdev);</div><div class='add'>+</div><div class='add'>+	f81604_unregister_urbs(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops f81604_netdev_ops = {</div><div class='add'>+	.ndo_open = f81604_open,</div><div class='add'>+	.ndo_stop = f81604_close,</div><div class='add'>+	.ndo_start_xmit = f81604_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const f81604_bittiming_const = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 64,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Called by the usb core when driver is unloaded or device is removed */</div><div class='add'>+static void f81604_disconnect(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct f81604_priv *priv = usb_get_intfdata(intf);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;netdev); ++i) {</div><div class='add'>+		if (!priv-&gt;netdev[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		unregister_netdev(priv-&gt;netdev[i]);</div><div class='add'>+		free_candev(priv-&gt;netdev[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __f81604_set_termination(struct usb_device *dev, int idx, u16 term)</div><div class='add'>+{</div><div class='add'>+	u8 mask, data = 0;</div><div class='add'>+</div><div class='add'>+	if (idx == 0)</div><div class='add'>+		mask = F81604_CAN0_TERM;</div><div class='add'>+	else</div><div class='add'>+		mask = F81604_CAN1_TERM;</div><div class='add'>+</div><div class='add'>+	if (term)</div><div class='add'>+		data = mask;</div><div class='add'>+</div><div class='add'>+	return f81604_update_bits(dev, F81604_TERMINATOR_REG, mask, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_set_termination(struct net_device *netdev, u16 term)</div><div class='add'>+{</div><div class='add'>+	struct f81604_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	return __f81604_set_termination(port_priv-&gt;dev, netdev-&gt;dev_port,</div><div class='add'>+					term);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int f81604_probe(struct usb_interface *intf,</div><div class='add'>+			const struct usb_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct usb_device *dev = interface_to_usbdev(intf);</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct f81604_priv *priv;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;intf-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	usb_set_intfdata(intf, priv);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;netdev); ++i) {</div><div class='add'>+		ret = __f81604_set_termination(dev, i, 0);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;intf-&gt;dev,</div><div class='add'>+				"Setting termination of CH#%d failed: %pe\n",</div><div class='add'>+				i, ERR_PTR(ret));</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;netdev); ++i) {</div><div class='add'>+		struct f81604_port_priv *port_priv;</div><div class='add'>+</div><div class='add'>+		netdev = alloc_candev(sizeof(*port_priv), 1);</div><div class='add'>+		if (!netdev) {</div><div class='add'>+			dev_err(&amp;intf-&gt;dev, "Couldn't alloc candev: %d\n", i);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+</div><div class='add'>+			goto failure_cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port_priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;port_priv-&gt;clear_reg_work, f81604_clear_reg_work);</div><div class='add'>+		init_usb_anchor(&amp;port_priv-&gt;urbs_anchor);</div><div class='add'>+</div><div class='add'>+		port_priv-&gt;intf = intf;</div><div class='add'>+		port_priv-&gt;dev = dev;</div><div class='add'>+		port_priv-&gt;netdev = netdev;</div><div class='add'>+		port_priv-&gt;can.clock.freq = F81604_CAN_CLOCK;</div><div class='add'>+</div><div class='add'>+		port_priv-&gt;can.termination_const = f81604_termination;</div><div class='add'>+		port_priv-&gt;can.termination_const_cnt =</div><div class='add'>+			ARRAY_SIZE(f81604_termination);</div><div class='add'>+		port_priv-&gt;can.bittiming_const = &amp;f81604_bittiming_const;</div><div class='add'>+		port_priv-&gt;can.do_set_bittiming = f81604_set_bittiming;</div><div class='add'>+		port_priv-&gt;can.do_set_mode = f81604_set_mode;</div><div class='add'>+		port_priv-&gt;can.do_set_termination = f81604_set_termination;</div><div class='add'>+		port_priv-&gt;can.do_get_berr_counter = f81604_get_berr_counter;</div><div class='add'>+		port_priv-&gt;can.ctrlmode_supported =</div><div class='add'>+			CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_3_SAMPLES |</div><div class='add'>+			CAN_CTRLMODE_ONE_SHOT | CAN_CTRLMODE_BERR_REPORTING |</div><div class='add'>+			CAN_CTRLMODE_PRESUME_ACK;</div><div class='add'>+</div><div class='add'>+		netdev-&gt;ethtool_ops = &amp;f81604_ethtool_ops;</div><div class='add'>+		netdev-&gt;netdev_ops = &amp;f81604_netdev_ops;</div><div class='add'>+		netdev-&gt;flags |= IFF_ECHO;</div><div class='add'>+		netdev-&gt;dev_port = i;</div><div class='add'>+</div><div class='add'>+		SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='add'>+</div><div class='add'>+		ret = register_candev(netdev);</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(netdev, "register CAN device failed: %pe\n",</div><div class='add'>+				   ERR_PTR(ret));</div><div class='add'>+			free_candev(netdev);</div><div class='add'>+</div><div class='add'>+			goto failure_cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv-&gt;netdev[i] = netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failure_cleanup:</div><div class='add'>+	f81604_disconnect(intf);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct usb_driver f81604_driver = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.probe = f81604_probe,</div><div class='add'>+	.disconnect = f81604_disconnect,</div><div class='add'>+	.id_table = f81604_table,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_usb_driver(f81604_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Ji-Ze Hong (Peter Hong) &lt;peter_hong@fintek.com.tw&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Fintek F81604 USB to 2xCANBUS");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c<br/>index bd6eb9967630..e29e85b67fd4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/gs_usb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/gs_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/gs_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/gs_usb.c</a></div><div class='hunk'>@@ -5,29 +5,54 @@</div><div class='ctx'>  * Copyright (C) 2013-2016 Geschwister Schneider Technologie-,</div><div class='ctx'>  * Entwicklungs- und Vertriebs UG (Haftungsbeschränkt).</div><div class='ctx'>  * Copyright (C) 2016 Hubert Denkmair</div><div class='add'>+ * Copyright (c) 2023 Pengutronix, Marc Kleine-Budde &lt;kernel@pengutronix.de&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Many thanks to all socketcan devs!</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* Device specific constants */</div><div class='del'>-#define USB_GSUSB_1_VENDOR_ID      0x1d50</div><div class='del'>-#define USB_GSUSB_1_PRODUCT_ID     0x606f</div><div class='add'>+#define USB_GS_USB_1_VENDOR_ID 0x1d50</div><div class='add'>+#define USB_GS_USB_1_PRODUCT_ID 0x606f</div><div class='ctx'> </div><div class='del'>-#define USB_CANDLELIGHT_VENDOR_ID  0x1209</div><div class='add'>+#define USB_CANDLELIGHT_VENDOR_ID 0x1209</div><div class='ctx'> #define USB_CANDLELIGHT_PRODUCT_ID 0x2323</div><div class='ctx'> </div><div class='del'>-#define GSUSB_ENDPOINT_IN          1</div><div class='del'>-#define GSUSB_ENDPOINT_OUT         2</div><div class='add'>+#define USB_CES_CANEXT_FD_VENDOR_ID 0x1cd2</div><div class='add'>+#define USB_CES_CANEXT_FD_PRODUCT_ID 0x606f</div><div class='add'>+</div><div class='add'>+#define USB_ABE_CANDEBUGGER_FD_VENDOR_ID 0x16d0</div><div class='add'>+#define USB_ABE_CANDEBUGGER_FD_PRODUCT_ID 0x10b8</div><div class='add'>+</div><div class='add'>+#define USB_XYLANTA_SAINT3_VENDOR_ID 0x16d0</div><div class='add'>+#define USB_XYLANTA_SAINT3_PRODUCT_ID 0x0f30</div><div class='add'>+</div><div class='add'>+#define USB_CANNECTIVITY_VENDOR_ID 0x1209</div><div class='add'>+#define USB_CANNECTIVITY_PRODUCT_ID 0xca01</div><div class='add'>+</div><div class='add'>+/* Timestamp 32 bit timer runs at 1 MHz (1 µs tick). Worker accounts</div><div class='add'>+ * for timer overflow (will be after ~71 minutes)</div><div class='add'>+ */</div><div class='add'>+#define GS_USB_TIMESTAMP_TIMER_HZ (1 * HZ_PER_MHZ)</div><div class='add'>+#define GS_USB_TIMESTAMP_WORK_DELAY_SEC 1800</div><div class='add'>+static_assert(GS_USB_TIMESTAMP_WORK_DELAY_SEC &lt;</div><div class='add'>+	      CYCLECOUNTER_MASK(32) / GS_USB_TIMESTAMP_TIMER_HZ / 2);</div><div class='ctx'> </div><div class='ctx'> /* Device specific constants */</div><div class='ctx'> enum gs_usb_breq {</div><div class='hunk'>@@ -39,6 +64,14 @@ enum gs_usb_breq {</div><div class='ctx'> 	GS_USB_BREQ_DEVICE_CONFIG,</div><div class='ctx'> 	GS_USB_BREQ_TIMESTAMP,</div><div class='ctx'> 	GS_USB_BREQ_IDENTIFY,</div><div class='add'>+	GS_USB_BREQ_GET_USER_ID,</div><div class='add'>+	GS_USB_BREQ_QUIRK_CANTACT_PRO_DATA_BITTIMING = GS_USB_BREQ_GET_USER_ID,</div><div class='add'>+	GS_USB_BREQ_SET_USER_ID,</div><div class='add'>+	GS_USB_BREQ_DATA_BITTIMING,</div><div class='add'>+	GS_USB_BREQ_BT_CONST_EXT,</div><div class='add'>+	GS_USB_BREQ_SET_TERMINATION,</div><div class='add'>+	GS_USB_BREQ_GET_TERMINATION,</div><div class='add'>+	GS_USB_BREQ_GET_STATE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum gs_can_mode {</div><div class='hunk'>@@ -62,85 +95,196 @@ enum gs_can_identify_mode {</div><div class='ctx'> 	GS_CAN_IDENTIFY_ON</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum gs_can_termination_state {</div><div class='add'>+	GS_CAN_TERMINATION_STATE_OFF = 0,</div><div class='add'>+	GS_CAN_TERMINATION_STATE_ON</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define GS_USB_TERMINATION_DISABLED CAN_TERMINATION_DISABLED</div><div class='add'>+#define GS_USB_TERMINATION_ENABLED 120</div><div class='add'>+</div><div class='ctx'> /* data types passed between host and device */</div><div class='add'>+</div><div class='add'>+/* The firmware on the original USB2CAN by Geschwister Schneider</div><div class='add'>+ * Technologie Entwicklungs- und Vertriebs UG exchanges all data</div><div class='add'>+ * between the host and the device in host byte order. This is done</div><div class='add'>+ * with the struct gs_host_config::byte_order member, which is sent</div><div class='add'>+ * first to indicate the desired byte order.</div><div class='add'>+ *</div><div class='add'>+ * The widely used open source firmware candleLight doesn't support</div><div class='add'>+ * this feature and exchanges the data in little endian byte order.</div><div class='add'>+ */</div><div class='ctx'> struct gs_host_config {</div><div class='del'>-	u32 byte_order;</div><div class='add'>+	__le32 byte_order;</div><div class='ctx'> } __packed;</div><div class='del'>-/* All data exchanged between host and device is exchanged in host byte order,</div><div class='del'>- * thanks to the struct gs_host_config byte_order member, which is sent first</div><div class='del'>- * to indicate the desired byte order.</div><div class='del'>- */</div><div class='ctx'> </div><div class='ctx'> struct gs_device_config {</div><div class='ctx'> 	u8 reserved1;</div><div class='ctx'> 	u8 reserved2;</div><div class='ctx'> 	u8 reserved3;</div><div class='ctx'> 	u8 icount;</div><div class='del'>-	u32 sw_version;</div><div class='del'>-	u32 hw_version;</div><div class='add'>+	__le32 sw_version;</div><div class='add'>+	__le32 hw_version;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define GS_CAN_MODE_NORMAL               0</div><div class='del'>-#define GS_CAN_MODE_LISTEN_ONLY          BIT(0)</div><div class='del'>-#define GS_CAN_MODE_LOOP_BACK            BIT(1)</div><div class='del'>-#define GS_CAN_MODE_TRIPLE_SAMPLE        BIT(2)</div><div class='del'>-#define GS_CAN_MODE_ONE_SHOT             BIT(3)</div><div class='add'>+#define GS_CAN_MODE_NORMAL 0</div><div class='add'>+#define GS_CAN_MODE_LISTEN_ONLY BIT(0)</div><div class='add'>+#define GS_CAN_MODE_LOOP_BACK BIT(1)</div><div class='add'>+#define GS_CAN_MODE_TRIPLE_SAMPLE BIT(2)</div><div class='add'>+#define GS_CAN_MODE_ONE_SHOT BIT(3)</div><div class='add'>+#define GS_CAN_MODE_HW_TIMESTAMP BIT(4)</div><div class='add'>+/* GS_CAN_FEATURE_IDENTIFY BIT(5) */</div><div class='add'>+/* GS_CAN_FEATURE_USER_ID BIT(6) */</div><div class='add'>+#define GS_CAN_MODE_PAD_PKTS_TO_MAX_PKT_SIZE BIT(7)</div><div class='add'>+#define GS_CAN_MODE_FD BIT(8)</div><div class='add'>+/* GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX BIT(9) */</div><div class='add'>+/* GS_CAN_FEATURE_BT_CONST_EXT BIT(10) */</div><div class='add'>+/* GS_CAN_FEATURE_TERMINATION BIT(11) */</div><div class='add'>+#define GS_CAN_MODE_BERR_REPORTING BIT(12)</div><div class='add'>+/* GS_CAN_FEATURE_GET_STATE BIT(13) */</div><div class='ctx'> </div><div class='ctx'> struct gs_device_mode {</div><div class='del'>-	u32 mode;</div><div class='del'>-	u32 flags;</div><div class='add'>+	__le32 mode;</div><div class='add'>+	__le32 flags;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct gs_device_state {</div><div class='del'>-	u32 state;</div><div class='del'>-	u32 rxerr;</div><div class='del'>-	u32 txerr;</div><div class='add'>+	__le32 state;</div><div class='add'>+	__le32 rxerr;</div><div class='add'>+	__le32 txerr;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct gs_device_bittiming {</div><div class='del'>-	u32 prop_seg;</div><div class='del'>-	u32 phase_seg1;</div><div class='del'>-	u32 phase_seg2;</div><div class='del'>-	u32 sjw;</div><div class='del'>-	u32 brp;</div><div class='add'>+	__le32 prop_seg;</div><div class='add'>+	__le32 phase_seg1;</div><div class='add'>+	__le32 phase_seg2;</div><div class='add'>+	__le32 sjw;</div><div class='add'>+	__le32 brp;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct gs_identify_mode {</div><div class='del'>-	u32 mode;</div><div class='add'>+	__le32 mode;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define GS_CAN_FEATURE_LISTEN_ONLY      BIT(0)</div><div class='del'>-#define GS_CAN_FEATURE_LOOP_BACK        BIT(1)</div><div class='del'>-#define GS_CAN_FEATURE_TRIPLE_SAMPLE    BIT(2)</div><div class='del'>-#define GS_CAN_FEATURE_ONE_SHOT         BIT(3)</div><div class='del'>-#define GS_CAN_FEATURE_HW_TIMESTAMP     BIT(4)</div><div class='del'>-#define GS_CAN_FEATURE_IDENTIFY         BIT(5)</div><div class='add'>+struct gs_device_termination_state {</div><div class='add'>+	__le32 state;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+#define GS_CAN_FEATURE_LISTEN_ONLY BIT(0)</div><div class='add'>+#define GS_CAN_FEATURE_LOOP_BACK BIT(1)</div><div class='add'>+#define GS_CAN_FEATURE_TRIPLE_SAMPLE BIT(2)</div><div class='add'>+#define GS_CAN_FEATURE_ONE_SHOT BIT(3)</div><div class='add'>+#define GS_CAN_FEATURE_HW_TIMESTAMP BIT(4)</div><div class='add'>+#define GS_CAN_FEATURE_IDENTIFY BIT(5)</div><div class='add'>+#define GS_CAN_FEATURE_USER_ID BIT(6)</div><div class='add'>+#define GS_CAN_FEATURE_PAD_PKTS_TO_MAX_PKT_SIZE BIT(7)</div><div class='add'>+#define GS_CAN_FEATURE_FD BIT(8)</div><div class='add'>+#define GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX BIT(9)</div><div class='add'>+#define GS_CAN_FEATURE_BT_CONST_EXT BIT(10)</div><div class='add'>+#define GS_CAN_FEATURE_TERMINATION BIT(11)</div><div class='add'>+#define GS_CAN_FEATURE_BERR_REPORTING BIT(12)</div><div class='add'>+#define GS_CAN_FEATURE_GET_STATE BIT(13)</div><div class='add'>+#define GS_CAN_FEATURE_MASK GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+/* internal quirks - keep in GS_CAN_FEATURE space for now */</div><div class='add'>+</div><div class='add'>+/* CANtact Pro original firmware:</div><div class='add'>+ * BREQ DATA_BITTIMING overlaps with GET_USER_ID</div><div class='add'>+ */</div><div class='add'>+#define GS_CAN_FEATURE_QUIRK_BREQ_CANTACT_PRO BIT(31)</div><div class='ctx'> </div><div class='ctx'> struct gs_device_bt_const {</div><div class='del'>-	u32 feature;</div><div class='del'>-	u32 fclk_can;</div><div class='del'>-	u32 tseg1_min;</div><div class='del'>-	u32 tseg1_max;</div><div class='del'>-	u32 tseg2_min;</div><div class='del'>-	u32 tseg2_max;</div><div class='del'>-	u32 sjw_max;</div><div class='del'>-	u32 brp_min;</div><div class='del'>-	u32 brp_max;</div><div class='del'>-	u32 brp_inc;</div><div class='add'>+	__le32 feature;</div><div class='add'>+	__le32 fclk_can;</div><div class='add'>+	__le32 tseg1_min;</div><div class='add'>+	__le32 tseg1_max;</div><div class='add'>+	__le32 tseg2_min;</div><div class='add'>+	__le32 tseg2_max;</div><div class='add'>+	__le32 sjw_max;</div><div class='add'>+	__le32 brp_min;</div><div class='add'>+	__le32 brp_max;</div><div class='add'>+	__le32 brp_inc;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct gs_device_bt_const_extended {</div><div class='add'>+	__le32 feature;</div><div class='add'>+	__le32 fclk_can;</div><div class='add'>+	__le32 tseg1_min;</div><div class='add'>+	__le32 tseg1_max;</div><div class='add'>+	__le32 tseg2_min;</div><div class='add'>+	__le32 tseg2_max;</div><div class='add'>+	__le32 sjw_max;</div><div class='add'>+	__le32 brp_min;</div><div class='add'>+	__le32 brp_max;</div><div class='add'>+	__le32 brp_inc;</div><div class='add'>+</div><div class='add'>+	__le32 dtseg1_min;</div><div class='add'>+	__le32 dtseg1_max;</div><div class='add'>+	__le32 dtseg2_min;</div><div class='add'>+	__le32 dtseg2_max;</div><div class='add'>+	__le32 dsjw_max;</div><div class='add'>+	__le32 dbrp_min;</div><div class='add'>+	__le32 dbrp_max;</div><div class='add'>+	__le32 dbrp_inc;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-#define GS_CAN_FLAG_OVERFLOW 1</div><div class='add'>+#define GS_CAN_FLAG_OVERFLOW BIT(0)</div><div class='add'>+#define GS_CAN_FLAG_FD BIT(1)</div><div class='add'>+#define GS_CAN_FLAG_BRS BIT(2)</div><div class='add'>+#define GS_CAN_FLAG_ESI BIT(3)</div><div class='ctx'> </div><div class='del'>-struct gs_host_frame {</div><div class='del'>-	u32 echo_id;</div><div class='del'>-	u32 can_id;</div><div class='add'>+struct classic_can {</div><div class='add'>+	u8 data[8];</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='del'>-	u8 can_dlc;</div><div class='del'>-	u8 channel;</div><div class='del'>-	u8 flags;</div><div class='del'>-	u8 reserved;</div><div class='add'>+struct classic_can_ts {</div><div class='add'>+	u8 data[8];</div><div class='add'>+	__le32 timestamp_us;</div><div class='add'>+} __packed;</div><div class='ctx'> </div><div class='add'>+struct classic_can_quirk {</div><div class='ctx'> 	u8 data[8];</div><div class='add'>+	u8 quirk;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct canfd {</div><div class='add'>+	u8 data[64];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct canfd_ts {</div><div class='add'>+	u8 data[64];</div><div class='add'>+	__le32 timestamp_us;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct canfd_quirk {</div><div class='add'>+	u8 data[64];</div><div class='add'>+	u8 quirk;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* struct gs_host_frame::echo_id == GS_HOST_FRAME_ECHO_ID_RX indicates</div><div class='add'>+ * a regular RX'ed CAN frame</div><div class='add'>+ */</div><div class='add'>+#define GS_HOST_FRAME_ECHO_ID_RX 0xffffffff</div><div class='add'>+</div><div class='add'>+struct gs_host_frame {</div><div class='add'>+	struct_group(header,</div><div class='add'>+		u32 echo_id;</div><div class='add'>+		__le32 can_id;</div><div class='add'>+</div><div class='add'>+		u8 can_dlc;</div><div class='add'>+		u8 channel;</div><div class='add'>+		u8 flags;</div><div class='add'>+		u8 reserved;</div><div class='add'>+	);</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct classic_can, classic_can);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct classic_can_ts, classic_can_ts);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct classic_can_quirk, classic_can_quirk);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct canfd, canfd);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct canfd_ts, canfd_ts);</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct canfd_quirk, canfd_quirk);</div><div class='add'>+	};</div><div class='ctx'> } __packed;</div><div class='ctx'> /* The GS USB devices make use of the same flags and masks as in</div><div class='ctx'>  * linux/can.h and linux/can/error.h, and no additional mapping is necessary.</div><div class='hunk'>@@ -150,10 +294,7 @@ struct gs_host_frame {</div><div class='ctx'> #define GS_MAX_TX_URBS 10</div><div class='ctx'> /* Only launch a max of GS_MAX_RX_URBS usb requests at a time. */</div><div class='ctx'> #define GS_MAX_RX_URBS 30</div><div class='del'>-/* Maximum number of interfaces the driver supports per device.</div><div class='del'>- * Current hardware only supports 2 interfaces. The future may vary.</div><div class='del'>- */</div><div class='del'>-#define GS_MAX_INTF 2</div><div class='add'>+#define GS_NAPI_WEIGHT 32</div><div class='ctx'> </div><div class='ctx'> struct gs_tx_context {</div><div class='ctx'> 	struct gs_can *dev;</div><div class='hunk'>@@ -163,15 +304,18 @@ struct gs_tx_context {</div><div class='ctx'> struct gs_can {</div><div class='ctx'> 	struct can_priv can; /* must be the first member */</div><div class='ctx'> </div><div class='add'>+	struct can_rx_offload offload;</div><div class='ctx'> 	struct gs_usb *parent;</div><div class='ctx'> </div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct usb_device *udev;</div><div class='del'>-	struct usb_interface *iface;</div><div class='ctx'> </div><div class='del'>-	struct can_bittiming_const bt_const;</div><div class='add'>+	struct can_bittiming_const bt_const, data_bt_const;</div><div class='ctx'> 	unsigned int channel;	/* channel number */</div><div class='ctx'> </div><div class='add'>+	u32 feature;</div><div class='add'>+	unsigned int hf_size_tx;</div><div class='add'>+</div><div class='ctx'> 	/* This lock prevents a race condition between xmit and receive. */</div><div class='ctx'> 	spinlock_t tx_ctx_lock;</div><div class='ctx'> 	struct gs_tx_context tx_context[GS_MAX_TX_URBS];</div><div class='hunk'>@@ -182,10 +326,22 @@ struct gs_can {</div><div class='ctx'> </div><div class='ctx'> /* usb interface struct */</div><div class='ctx'> struct gs_usb {</div><div class='del'>-	struct gs_can *canch[GS_MAX_INTF];</div><div class='ctx'> 	struct usb_anchor rx_submitted;</div><div class='del'>-	atomic_t active_channels;</div><div class='ctx'> 	struct usb_device *udev;</div><div class='add'>+</div><div class='add'>+	/* time counter for hardware timestamps */</div><div class='add'>+	struct cyclecounter cc;</div><div class='add'>+	struct timecounter tc;</div><div class='add'>+	spinlock_t tc_lock; /* spinlock to guard access tc-&gt;cycle_last */</div><div class='add'>+	struct delayed_work timestamp;</div><div class='add'>+</div><div class='add'>+	unsigned int hf_size_rx;</div><div class='add'>+	u8 active_channels;</div><div class='add'>+	u8 channel_cnt;</div><div class='add'>+</div><div class='add'>+	unsigned int pipe_in;</div><div class='add'>+	unsigned int pipe_out;</div><div class='add'>+	struct gs_can *canch[] __counted_by(channel_cnt);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 'allocate' a tx context.</div><div class='hunk'>@@ -235,31 +391,108 @@ static struct gs_tx_context *gs_get_tx_context(struct gs_can *dev,</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gs_cmd_reset(struct gs_can *gsdev)</div><div class='add'>+static int gs_cmd_reset(struct gs_can *dev)</div><div class='add'>+{</div><div class='add'>+	struct gs_device_mode dm = {</div><div class='add'>+		.mode = cpu_to_le32(GS_CAN_MODE_RESET),</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return usb_control_msg_send(dev-&gt;udev, 0, GS_USB_BREQ_MODE,</div><div class='add'>+				    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				    dev-&gt;channel, 0, &amp;dm, sizeof(dm), 1000,</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int gs_usb_get_timestamp(const struct gs_usb *parent,</div><div class='add'>+				       u32 *timestamp_p)</div><div class='ctx'> {</div><div class='del'>-	struct gs_device_mode *dm;</div><div class='del'>-	struct usb_interface *intf = gsdev-&gt;iface;</div><div class='add'>+	__le32 timestamp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	dm = kzalloc(sizeof(*dm), GFP_KERNEL);</div><div class='del'>-	if (!dm)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	rc = usb_control_msg_recv(parent-&gt;udev, 0, GS_USB_BREQ_TIMESTAMP,</div><div class='add'>+				  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  0, 0,</div><div class='add'>+				  &amp;timestamp, sizeof(timestamp),</div><div class='add'>+				  USB_CTRL_GET_TIMEOUT,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	dm-&gt;mode = GS_CAN_MODE_RESET;</div><div class='add'>+	*timestamp_p = le32_to_cpu(timestamp);</div><div class='ctx'> </div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(intf),</div><div class='del'>-			     usb_sndctrlpipe(interface_to_usbdev(intf), 0),</div><div class='del'>-			     GS_USB_BREQ_MODE,</div><div class='del'>-			     USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-			     gsdev-&gt;channel,</div><div class='del'>-			     0,</div><div class='del'>-			     dm,</div><div class='del'>-			     sizeof(*dm),</div><div class='del'>-			     1000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	kfree(dm);</div><div class='add'>+static u64 gs_usb_timestamp_read(struct cyclecounter *cc) __must_hold(&amp;dev-&gt;tc_lock)</div><div class='add'>+{</div><div class='add'>+	struct gs_usb *parent = container_of(cc, struct gs_usb, cc);</div><div class='add'>+	u32 timestamp = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;parent-&gt;tc_lock);</div><div class='add'>+</div><div class='add'>+	/* drop lock for synchronous USB transfer */</div><div class='add'>+	spin_unlock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+	err = gs_usb_get_timestamp(parent, &amp;timestamp);</div><div class='add'>+	spin_lock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(&amp;parent-&gt;udev-&gt;dev,</div><div class='add'>+			"Error %d while reading timestamp. HW timestamps may be inaccurate.",</div><div class='add'>+			err);</div><div class='add'>+</div><div class='add'>+	return timestamp;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+static void gs_usb_timestamp_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *delayed_work = to_delayed_work(work);</div><div class='add'>+	struct gs_usb *parent;</div><div class='add'>+</div><div class='add'>+	parent = container_of(delayed_work, struct gs_usb, timestamp);</div><div class='add'>+	spin_lock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+	timecounter_read(&amp;parent-&gt;tc);</div><div class='add'>+	spin_unlock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;parent-&gt;timestamp,</div><div class='add'>+			      GS_USB_TIMESTAMP_WORK_DELAY_SEC * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gs_usb_skb_set_timestamp(struct gs_can *dev,</div><div class='add'>+				     struct sk_buff *skb, u32 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb);</div><div class='add'>+	struct gs_usb *parent = dev-&gt;parent;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+	ns = timecounter_cyc2time(&amp;parent-&gt;tc, timestamp);</div><div class='add'>+	spin_unlock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+</div><div class='add'>+	hwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gs_usb_timestamp_init(struct gs_usb *parent)</div><div class='add'>+{</div><div class='add'>+	struct cyclecounter *cc = &amp;parent-&gt;cc;</div><div class='add'>+</div><div class='add'>+	cc-&gt;read = gs_usb_timestamp_read;</div><div class='add'>+	cc-&gt;mask = CYCLECOUNTER_MASK(32);</div><div class='add'>+	cc-&gt;shift = 32 - bits_per(NSEC_PER_SEC / GS_USB_TIMESTAMP_TIMER_HZ);</div><div class='add'>+	cc-&gt;mult = clocksource_hz2mult(GS_USB_TIMESTAMP_TIMER_HZ, cc-&gt;shift);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;parent-&gt;tc_lock);</div><div class='add'>+	spin_lock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+	timecounter_init(&amp;parent-&gt;tc, &amp;parent-&gt;cc, ktime_get_real_ns());</div><div class='add'>+	spin_unlock_bh(&amp;parent-&gt;tc_lock);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;parent-&gt;timestamp, gs_usb_timestamp_work);</div><div class='add'>+	schedule_delayed_work(&amp;parent-&gt;timestamp,</div><div class='add'>+			      GS_USB_TIMESTAMP_WORK_DELAY_SEC * HZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gs_usb_timestamp_stop(struct gs_usb *parent)</div><div class='add'>+{</div><div class='add'>+	cancel_delayed_work_sync(&amp;parent-&gt;timestamp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gs_update_state(struct gs_can *dev, struct can_frame *cf)</div><div class='hunk'>@@ -287,19 +520,107 @@ static void gs_update_state(struct gs_can *dev, struct can_frame *cf)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 gs_usb_set_timestamp(struct gs_can *dev, struct sk_buff *skb,</div><div class='add'>+				const struct gs_host_frame *hf)</div><div class='add'>+{</div><div class='add'>+	u32 timestamp;</div><div class='add'>+</div><div class='add'>+	if (hf-&gt;flags &amp; GS_CAN_FLAG_FD)</div><div class='add'>+		timestamp = le32_to_cpu(hf-&gt;canfd_ts-&gt;timestamp_us);</div><div class='add'>+	else</div><div class='add'>+		timestamp = le32_to_cpu(hf-&gt;classic_can_ts-&gt;timestamp_us);</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		gs_usb_skb_set_timestamp(dev, skb, timestamp);</div><div class='add'>+</div><div class='add'>+	return timestamp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gs_usb_rx_offload(struct gs_can *dev, struct sk_buff *skb,</div><div class='add'>+			      const struct gs_host_frame *hf)</div><div class='add'>+{</div><div class='add'>+	struct can_rx_offload *offload = &amp;dev-&gt;offload;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP) {</div><div class='add'>+		const u32 ts = gs_usb_set_timestamp(dev, skb, hf);</div><div class='add'>+</div><div class='add'>+		rc = can_rx_offload_queue_timestamp(offload, skb, ts);</div><div class='add'>+	} else {</div><div class='add'>+		rc = can_rx_offload_queue_tail(offload, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		dev-&gt;netdev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+gs_usb_get_echo_skb(struct gs_can *dev, struct sk_buff *skb,</div><div class='add'>+		    const struct gs_host_frame *hf)</div><div class='add'>+{</div><div class='add'>+	struct can_rx_offload *offload = &amp;dev-&gt;offload;</div><div class='add'>+	const u32 echo_id = hf-&gt;echo_id;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP) {</div><div class='add'>+		const u32 ts = gs_usb_set_timestamp(dev, skb, hf);</div><div class='add'>+</div><div class='add'>+		len = can_rx_offload_get_echo_skb_queue_timestamp(offload, echo_id,</div><div class='add'>+								  ts, NULL);</div><div class='add'>+	} else {</div><div class='add'>+		len = can_rx_offload_get_echo_skb_queue_tail(offload, echo_id,</div><div class='add'>+							     NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int</div><div class='add'>+gs_usb_get_minimum_rx_length(const struct gs_can *dev, const struct gs_host_frame *hf,</div><div class='add'>+			     unsigned int *data_length_p)</div><div class='add'>+{</div><div class='add'>+	unsigned int minimum_length, data_length = 0;</div><div class='add'>+</div><div class='add'>+	if (hf-&gt;flags &amp; GS_CAN_FLAG_FD) {</div><div class='add'>+		if (hf-&gt;echo_id == GS_HOST_FRAME_ECHO_ID_RX)</div><div class='add'>+			data_length = can_fd_dlc2len(hf-&gt;can_dlc);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+			/* timestamp follows data field of max size */</div><div class='add'>+			minimum_length = struct_size(hf, canfd_ts, 1);</div><div class='add'>+		else</div><div class='add'>+			minimum_length = sizeof(hf-&gt;header) + data_length;</div><div class='add'>+	} else {</div><div class='add'>+		if (hf-&gt;echo_id == GS_HOST_FRAME_ECHO_ID_RX &amp;&amp;</div><div class='add'>+		    !(hf-&gt;can_id &amp; cpu_to_le32(CAN_RTR_FLAG)))</div><div class='add'>+			data_length = can_cc_dlc2len(hf-&gt;can_dlc);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+			/* timestamp follows data field of max size */</div><div class='add'>+			minimum_length = struct_size(hf, classic_can_ts, 1);</div><div class='add'>+		else</div><div class='add'>+			minimum_length = sizeof(hf-&gt;header) + data_length;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data_length_p = data_length;</div><div class='add'>+	return minimum_length;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gs_usb_receive_bulk_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='del'>-	struct gs_usb *usbcan = urb-&gt;context;</div><div class='add'>+	struct gs_usb *parent = urb-&gt;context;</div><div class='ctx'> 	struct gs_can *dev;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	struct net_device_stats *stats;</div><div class='ctx'> 	struct gs_host_frame *hf = urb-&gt;transfer_buffer;</div><div class='add'>+	unsigned int minimum_length, data_length;</div><div class='ctx'> 	struct gs_tx_context *txc;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='add'>+	struct canfd_frame *cfd;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(!usbcan);</div><div class='add'>+	BUG_ON(!parent);</div><div class='ctx'> </div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0: /* success */</div><div class='hunk'>@@ -312,11 +633,20 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* device reports out of range channel id */</div><div class='del'>-	if (hf-&gt;channel &gt;= GS_MAX_INTF)</div><div class='add'>+	minimum_length = sizeof(hf-&gt;header);</div><div class='add'>+	if (urb-&gt;actual_length &lt; minimum_length) {</div><div class='add'>+		dev_err_ratelimited(&amp;parent-&gt;udev-&gt;dev,</div><div class='add'>+				    "short read (actual_length=%u, minimum_length=%u)\n",</div><div class='add'>+				    urb-&gt;actual_length, minimum_length);</div><div class='add'>+</div><div class='ctx'> 		goto resubmit_urb;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev = usbcan-&gt;canch[hf-&gt;channel];</div><div class='add'>+	/* device reports out of range channel id */</div><div class='add'>+	if (hf-&gt;channel &gt;= parent-&gt;channel_cnt)</div><div class='add'>+		goto device_detach;</div><div class='add'>+</div><div class='add'>+	dev = parent-&gt;canch[hf-&gt;channel];</div><div class='ctx'> </div><div class='ctx'> 	netdev = dev-&gt;netdev;</div><div class='ctx'> 	stats = &amp;netdev-&gt;stats;</div><div class='hunk'>@@ -324,47 +654,73 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)</div><div class='ctx'> 	if (!netif_device_present(netdev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (hf-&gt;echo_id == -1) { /* normal rx */</div><div class='del'>-		skb = alloc_can_skb(dev-&gt;netdev, &amp;cf);</div><div class='del'>-		if (!skb)</div><div class='del'>-			return;</div><div class='add'>+	if (!netif_running(netdev))</div><div class='add'>+		goto resubmit_urb;</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_id = hf-&gt;can_id;</div><div class='add'>+	minimum_length = gs_usb_get_minimum_rx_length(dev, hf, &amp;data_length);</div><div class='add'>+	if (urb-&gt;actual_length &lt; minimum_length) {</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+		stats-&gt;rx_length_errors++;</div><div class='add'>+</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "short read (actual_length=%u, minimum_length=%u)\n",</div><div class='add'>+				   urb-&gt;actual_length, minimum_length);</div><div class='add'>+</div><div class='add'>+		goto resubmit_urb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hf-&gt;echo_id == GS_HOST_FRAME_ECHO_ID_RX) { /* normal rx */</div><div class='add'>+		if (hf-&gt;flags &amp; GS_CAN_FLAG_FD) {</div><div class='add'>+			skb = alloc_canfd_skb(netdev, &amp;cfd);</div><div class='add'>+			if (!skb)</div><div class='add'>+				return;</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(hf-&gt;can_dlc);</div><div class='del'>-		memcpy(cf-&gt;data, hf-&gt;data, 8);</div><div class='add'>+			cfd-&gt;can_id = le32_to_cpu(hf-&gt;can_id);</div><div class='add'>+			cfd-&gt;len = data_length;</div><div class='add'>+			if (hf-&gt;flags &amp; GS_CAN_FLAG_BRS)</div><div class='add'>+				cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+			if (hf-&gt;flags &amp; GS_CAN_FLAG_ESI)</div><div class='add'>+				cfd-&gt;flags |= CANFD_ESI;</div><div class='ctx'> </div><div class='del'>-		/* ERROR frames tell us information about the controller */</div><div class='del'>-		if (hf-&gt;can_id &amp; CAN_ERR_FLAG)</div><div class='del'>-			gs_update_state(dev, cf);</div><div class='add'>+			memcpy(cfd-&gt;data, hf-&gt;canfd-&gt;data, data_length);</div><div class='add'>+		} else {</div><div class='add'>+			skb = alloc_can_skb(netdev, &amp;cf);</div><div class='add'>+			if (!skb)</div><div class='add'>+				return;</div><div class='ctx'> </div><div class='del'>-		netdev-&gt;stats.rx_packets++;</div><div class='del'>-		netdev-&gt;stats.rx_bytes += hf-&gt;can_dlc;</div><div class='add'>+			cf-&gt;can_id = le32_to_cpu(hf-&gt;can_id);</div><div class='add'>+			can_frame_set_cc_len(cf, hf-&gt;can_dlc, dev-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='del'>-		netif_rx(skb);</div><div class='add'>+			memcpy(cf-&gt;data, hf-&gt;classic_can-&gt;data, data_length);</div><div class='add'>+</div><div class='add'>+			/* ERROR frames tell us information about the controller */</div><div class='add'>+			if (le32_to_cpu(hf-&gt;can_id) &amp; CAN_ERR_FLAG)</div><div class='add'>+				gs_update_state(dev, cf);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gs_usb_rx_offload(dev, skb, hf);</div><div class='ctx'> 	} else { /* echo_id == hf-&gt;echo_id */</div><div class='ctx'> 		if (hf-&gt;echo_id &gt;= GS_MAX_TX_URBS) {</div><div class='ctx'> 			netdev_err(netdev,</div><div class='del'>-				   "Unexpected out of range echo id %d\n",</div><div class='add'>+				   "Unexpected out of range echo id %u\n",</div><div class='ctx'> 				   hf-&gt;echo_id);</div><div class='ctx'> 			goto resubmit_urb;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		netdev-&gt;stats.tx_packets++;</div><div class='del'>-		netdev-&gt;stats.tx_bytes += hf-&gt;can_dlc;</div><div class='del'>-</div><div class='ctx'> 		txc = gs_get_tx_context(dev, hf-&gt;echo_id);</div><div class='ctx'> </div><div class='ctx'> 		/* bad devices send bad echo_ids. */</div><div class='ctx'> 		if (!txc) {</div><div class='ctx'> 			netdev_err(netdev,</div><div class='del'>-				   "Unexpected unused echo id %d\n",</div><div class='add'>+				   "Unexpected unused echo id %u\n",</div><div class='ctx'> 				   hf-&gt;echo_id);</div><div class='ctx'> 			goto resubmit_urb;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		can_get_echo_skb(netdev, hf-&gt;echo_id);</div><div class='del'>-</div><div class='add'>+		skb = dev-&gt;can.echo_skb[hf-&gt;echo_id];</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+		stats-&gt;tx_bytes += gs_usb_get_echo_skb(dev, skb, hf);</div><div class='ctx'> 		gs_free_tx_context(txc);</div><div class='ctx'> </div><div class='ctx'> 		atomic_dec(&amp;dev-&gt;active_tx_urbs);</div><div class='hunk'>@@ -373,35 +729,36 @@ static void gs_usb_receive_bulk_callback(struct urb *urb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (hf-&gt;flags &amp; GS_CAN_FLAG_OVERFLOW) {</div><div class='add'>+		stats-&gt;rx_over_errors++;</div><div class='add'>+		stats-&gt;rx_errors++;</div><div class='add'>+</div><div class='ctx'> 		skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto resubmit_urb;</div><div class='ctx'> </div><div class='ctx'> 		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		cf-&gt;can_dlc = CAN_ERR_DLC;</div><div class='add'>+		cf-&gt;len = CAN_ERR_DLC;</div><div class='ctx'> 		cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='del'>-		stats-&gt;rx_over_errors++;</div><div class='del'>-		stats-&gt;rx_errors++;</div><div class='del'>-		netif_rx(skb);</div><div class='add'>+</div><div class='add'>+		gs_usb_rx_offload(dev, skb, hf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- resubmit_urb:</div><div class='del'>-	usb_fill_bulk_urb(urb,</div><div class='del'>-			  usbcan-&gt;udev,</div><div class='del'>-			  usb_rcvbulkpipe(usbcan-&gt;udev, GSUSB_ENDPOINT_IN),</div><div class='del'>-			  hf,</div><div class='del'>-			  sizeof(struct gs_host_frame),</div><div class='del'>-			  gs_usb_receive_bulk_callback,</div><div class='del'>-			  usbcan</div><div class='del'>-			  );</div><div class='add'>+	can_rx_offload_irq_finish(&amp;dev-&gt;offload);</div><div class='add'>+</div><div class='add'>+resubmit_urb:</div><div class='add'>+	usb_fill_bulk_urb(urb, parent-&gt;udev,</div><div class='add'>+			  parent-&gt;pipe_in,</div><div class='add'>+			  hf, parent-&gt;hf_size_rx,</div><div class='add'>+			  gs_usb_receive_bulk_callback, parent);</div><div class='ctx'> </div><div class='ctx'> 	rc = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	/* USB failure take down all interfaces */</div><div class='ctx'> 	if (rc == -ENODEV) {</div><div class='del'>-		for (rc = 0; rc &lt; GS_MAX_INTF; rc++) {</div><div class='del'>-			if (usbcan-&gt;canch[rc])</div><div class='del'>-				netif_device_detach(usbcan-&gt;canch[rc]-&gt;netdev);</div><div class='add'>+device_detach:</div><div class='add'>+		for (rc = 0; rc &lt; parent-&gt;channel_cnt; rc++) {</div><div class='add'>+			if (parent-&gt;canch[rc])</div><div class='add'>+				netif_device_detach(parent-&gt;canch[rc]-&gt;netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -410,38 +767,42 @@ static int gs_usb_set_bittiming(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gs_can *dev = netdev_priv(netdev);</div><div class='ctx'> 	struct can_bittiming *bt = &amp;dev-&gt;can.bittiming;</div><div class='del'>-	struct usb_interface *intf = dev-&gt;iface;</div><div class='del'>-	int rc;</div><div class='del'>-	struct gs_device_bittiming *dbt;</div><div class='del'>-</div><div class='del'>-	dbt = kmalloc(sizeof(*dbt), GFP_KERNEL);</div><div class='del'>-	if (!dbt)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	dbt-&gt;prop_seg = bt-&gt;prop_seg;</div><div class='del'>-	dbt-&gt;phase_seg1 = bt-&gt;phase_seg1;</div><div class='del'>-	dbt-&gt;phase_seg2 = bt-&gt;phase_seg2;</div><div class='del'>-	dbt-&gt;sjw = bt-&gt;sjw;</div><div class='del'>-	dbt-&gt;brp = bt-&gt;brp;</div><div class='add'>+	struct gs_device_bittiming dbt = {</div><div class='add'>+		.prop_seg = cpu_to_le32(bt-&gt;prop_seg),</div><div class='add'>+		.phase_seg1 = cpu_to_le32(bt-&gt;phase_seg1),</div><div class='add'>+		.phase_seg2 = cpu_to_le32(bt-&gt;phase_seg2),</div><div class='add'>+		.sjw = cpu_to_le32(bt-&gt;sjw),</div><div class='add'>+		.brp = cpu_to_le32(bt-&gt;brp),</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	/* request bit timings */</div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(intf),</div><div class='del'>-			     usb_sndctrlpipe(interface_to_usbdev(intf), 0),</div><div class='del'>-			     GS_USB_BREQ_BITTIMING,</div><div class='del'>-			     USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-			     dev-&gt;channel,</div><div class='del'>-			     0,</div><div class='del'>-			     dbt,</div><div class='del'>-			     sizeof(*dbt),</div><div class='del'>-			     1000);</div><div class='del'>-</div><div class='del'>-	kfree(dbt);</div><div class='del'>-</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		dev_err(netdev-&gt;dev.parent, "Couldn't set bittimings (err=%d)",</div><div class='del'>-			rc);</div><div class='add'>+	return usb_control_msg_send(dev-&gt;udev, 0, GS_USB_BREQ_BITTIMING,</div><div class='add'>+				    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				    dev-&gt;channel, 0, &amp;dbt, sizeof(dbt), 1000,</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return (rc &gt; 0) ? 0 : rc;</div><div class='add'>+static int gs_usb_set_data_bittiming(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+	struct can_bittiming *bt = &amp;dev-&gt;can.fd.data_bittiming;</div><div class='add'>+	struct gs_device_bittiming dbt = {</div><div class='add'>+		.prop_seg = cpu_to_le32(bt-&gt;prop_seg),</div><div class='add'>+		.phase_seg1 = cpu_to_le32(bt-&gt;phase_seg1),</div><div class='add'>+		.phase_seg2 = cpu_to_le32(bt-&gt;phase_seg2),</div><div class='add'>+		.sjw = cpu_to_le32(bt-&gt;sjw),</div><div class='add'>+		.brp = cpu_to_le32(bt-&gt;brp),</div><div class='add'>+	};</div><div class='add'>+	u8 request = GS_USB_BREQ_DATA_BITTIMING;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_QUIRK_BREQ_CANTACT_PRO)</div><div class='add'>+		request = GS_USB_BREQ_QUIRK_CANTACT_PRO_DATA_BITTIMING;</div><div class='add'>+</div><div class='add'>+	/* request data bit timings */</div><div class='add'>+	return usb_control_msg_send(dev-&gt;udev, 0, request,</div><div class='add'>+				    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				    dev-&gt;channel, 0, &amp;dbt, sizeof(dbt), 1000,</div><div class='add'>+				    GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gs_usb_xmit_callback(struct urb *urb)</div><div class='hunk'>@@ -450,13 +811,21 @@ static void gs_usb_xmit_callback(struct urb *urb)</div><div class='ctx'> 	struct gs_can *dev = txc-&gt;dev;</div><div class='ctx'> 	struct net_device *netdev = dev-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-	if (urb-&gt;status)</div><div class='del'>-		netdev_info(netdev, "usb xmit fail %d\n", txc-&gt;echo_id);</div><div class='add'>+	if (!urb-&gt;status)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (urb-&gt;status != -ESHUTDOWN &amp;&amp; net_ratelimit())</div><div class='add'>+		netdev_info(netdev, "failed to xmit URB %u: %pe\n",</div><div class='add'>+			    txc-&gt;echo_id, ERR_PTR(urb-&gt;status));</div><div class='add'>+</div><div class='add'>+	netdev-&gt;stats.tx_dropped++;</div><div class='add'>+	netdev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+	can_free_echo_skb(netdev, txc-&gt;echo_id, NULL);</div><div class='add'>+	gs_free_tx_context(txc);</div><div class='add'>+	atomic_dec(&amp;dev-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='del'>-	usb_free_coherent(urb-&gt;dev,</div><div class='del'>-			  urb-&gt;transfer_buffer_length,</div><div class='del'>-			  urb-&gt;transfer_buffer,</div><div class='del'>-			  urb-&gt;transfer_dma);</div><div class='add'>+	netif_wake_queue(netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,</div><div class='hunk'>@@ -467,11 +836,12 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	struct gs_host_frame *hf;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='add'>+	struct canfd_frame *cfd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	unsigned int idx;</div><div class='ctx'> 	struct gs_tx_context *txc;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	/* find an empty context to keep track of transmission */</div><div class='hunk'>@@ -484,40 +854,52 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (!urb)</div><div class='ctx'> 		goto nomem_urb;</div><div class='ctx'> </div><div class='del'>-	hf = usb_alloc_coherent(dev-&gt;udev, sizeof(*hf), GFP_ATOMIC,</div><div class='del'>-				&amp;urb-&gt;transfer_dma);</div><div class='del'>-	if (!hf) {</div><div class='del'>-		netdev_err(netdev, "No memory left for USB buffer\n");</div><div class='add'>+	hf = kmalloc(dev-&gt;hf_size_tx, GFP_ATOMIC);</div><div class='add'>+	if (!hf)</div><div class='ctx'> 		goto nomem_hf;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	idx = txc-&gt;echo_id;</div><div class='ctx'> </div><div class='ctx'> 	if (idx &gt;= GS_MAX_TX_URBS) {</div><div class='del'>-		netdev_err(netdev, "Invalid tx context %d\n", idx);</div><div class='add'>+		netdev_err(netdev, "Invalid tx context %u\n", idx);</div><div class='ctx'> 		goto badidx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hf-&gt;echo_id = idx;</div><div class='ctx'> 	hf-&gt;channel = dev-&gt;channel;</div><div class='add'>+	hf-&gt;flags = 0;</div><div class='add'>+	hf-&gt;reserved = 0;</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		hf-&gt;can_id = cpu_to_le32(cfd-&gt;can_id);</div><div class='add'>+		hf-&gt;can_dlc = can_fd_len2dlc(cfd-&gt;len);</div><div class='add'>+		hf-&gt;flags |= GS_CAN_FLAG_FD;</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			hf-&gt;flags |= GS_CAN_FLAG_BRS;</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_ESI)</div><div class='add'>+			hf-&gt;flags |= GS_CAN_FLAG_ESI;</div><div class='add'>+</div><div class='add'>+		memcpy(hf-&gt;canfd-&gt;data, cfd-&gt;data, cfd-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+		hf-&gt;can_id = cpu_to_le32(cf-&gt;can_id);</div><div class='add'>+		hf-&gt;can_dlc = can_get_cc_dlc(cf, dev-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='del'>-	hf-&gt;can_id = cf-&gt;can_id;</div><div class='del'>-	hf-&gt;can_dlc = cf-&gt;can_dlc;</div><div class='del'>-	memcpy(hf-&gt;data, cf-&gt;data, cf-&gt;can_dlc);</div><div class='add'>+		memcpy(hf-&gt;classic_can-&gt;data, cf-&gt;data, cf-&gt;len);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_bulk_urb(urb, dev-&gt;udev,</div><div class='del'>-			  usb_sndbulkpipe(dev-&gt;udev, GSUSB_ENDPOINT_OUT),</div><div class='del'>-			  hf,</div><div class='del'>-			  sizeof(*hf),</div><div class='del'>-			  gs_usb_xmit_callback,</div><div class='del'>-			  txc);</div><div class='add'>+			  dev-&gt;parent-&gt;pipe_out,</div><div class='add'>+			  hf, dev-&gt;hf_size_tx,</div><div class='add'>+			  gs_usb_xmit_callback, txc);</div><div class='ctx'> </div><div class='del'>-	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+	urb-&gt;transfer_flags |= URB_FREE_BUFFER;</div><div class='ctx'> 	usb_anchor_urb(urb, &amp;dev-&gt;tx_submitted);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, netdev, idx);</div><div class='add'>+	can_put_echo_skb(skb, netdev, idx, 0);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;dev-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='hunk'>@@ -525,14 +907,10 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (unlikely(rc)) {			/* usb send failed */</div><div class='ctx'> 		atomic_dec(&amp;dev-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='del'>-		can_free_echo_skb(netdev, idx);</div><div class='add'>+		can_free_echo_skb(netdev, idx, NULL);</div><div class='ctx'> 		gs_free_tx_context(txc);</div><div class='ctx'> </div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='del'>-		usb_free_coherent(dev-&gt;udev,</div><div class='del'>-				  sizeof(*hf),</div><div class='del'>-				  hf,</div><div class='del'>-				  urb-&gt;transfer_dma);</div><div class='ctx'> </div><div class='ctx'> 		if (rc == -ENODEV) {</div><div class='ctx'> 			netif_device_detach(netdev);</div><div class='hunk'>@@ -551,15 +929,12 @@ static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>- badidx:</div><div class='del'>-	usb_free_coherent(dev-&gt;udev,</div><div class='del'>-			  sizeof(*hf),</div><div class='del'>-			  hf,</div><div class='del'>-			  urb-&gt;transfer_dma);</div><div class='del'>- nomem_hf:</div><div class='add'>+badidx:</div><div class='add'>+	kfree(hf);</div><div class='add'>+nomem_hf:</div><div class='ctx'> 	usb_free_urb(urb);</div><div class='ctx'> </div><div class='del'>- nomem_urb:</div><div class='add'>+nomem_urb:</div><div class='ctx'> 	gs_free_tx_context(txc);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	stats-&gt;tx_dropped++;</div><div class='hunk'>@@ -570,46 +945,64 @@ static int gs_can_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gs_can *dev = netdev_priv(netdev);</div><div class='ctx'> 	struct gs_usb *parent = dev-&gt;parent;</div><div class='del'>-	int rc, i;</div><div class='del'>-	struct gs_device_mode *dm;</div><div class='add'>+	struct gs_device_mode dm = {</div><div class='add'>+		.mode = cpu_to_le32(GS_CAN_MODE_START),</div><div class='add'>+	};</div><div class='add'>+	struct gs_host_frame *hf;</div><div class='add'>+	struct urb *urb = NULL;</div><div class='ctx'> 	u32 ctrlmode;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+	int rc, i;</div><div class='ctx'> </div><div class='ctx'> 	rc = open_candev(netdev);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (atomic_add_return(1, &amp;parent-&gt;active_channels) == 1) {</div><div class='add'>+	ctrlmode = dev-&gt;can.ctrlmode;</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX)</div><div class='add'>+			dev-&gt;hf_size_tx = struct_size(hf, canfd_quirk, 1);</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;hf_size_tx = struct_size(hf, canfd, 1);</div><div class='add'>+	} else {</div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX)</div><div class='add'>+			dev-&gt;hf_size_tx = struct_size(hf, classic_can_quirk, 1);</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;hf_size_tx = struct_size(hf, classic_can, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_rx_offload_enable(&amp;dev-&gt;offload);</div><div class='add'>+</div><div class='add'>+	if (!parent-&gt;active_channels) {</div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+			gs_usb_timestamp_init(parent);</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; GS_MAX_RX_URBS; i++) {</div><div class='del'>-			struct urb *urb;</div><div class='ctx'> 			u8 *buf;</div><div class='ctx'> </div><div class='ctx'> 			/* alloc rx urb */</div><div class='ctx'> 			urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='del'>-			if (!urb)</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+			if (!urb) {</div><div class='add'>+				rc = -ENOMEM;</div><div class='add'>+				goto out_usb_kill_anchored_urbs;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			/* alloc rx buffer */</div><div class='del'>-			buf = usb_alloc_coherent(dev-&gt;udev,</div><div class='del'>-						 sizeof(struct gs_host_frame),</div><div class='del'>-						 GFP_KERNEL,</div><div class='del'>-						 &amp;urb-&gt;transfer_dma);</div><div class='add'>+			buf = kmalloc(dev-&gt;parent-&gt;hf_size_rx,</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 			if (!buf) {</div><div class='del'>-				netdev_err(netdev,</div><div class='del'>-					   "No memory left for USB buffer\n");</div><div class='del'>-				usb_free_urb(urb);</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+				rc = -ENOMEM;</div><div class='add'>+				goto out_usb_free_urb;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* fill, anchor, and submit rx urb */</div><div class='ctx'> 			usb_fill_bulk_urb(urb,</div><div class='ctx'> 					  dev-&gt;udev,</div><div class='del'>-					  usb_rcvbulkpipe(dev-&gt;udev,</div><div class='del'>-							  GSUSB_ENDPOINT_IN),</div><div class='add'>+					  dev-&gt;parent-&gt;pipe_in,</div><div class='ctx'> 					  buf,</div><div class='del'>-					  sizeof(struct gs_host_frame),</div><div class='del'>-					  gs_usb_receive_bulk_callback,</div><div class='del'>-					  parent);</div><div class='del'>-			urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='add'>+					  dev-&gt;parent-&gt;hf_size_rx,</div><div class='add'>+					  gs_usb_receive_bulk_callback, parent);</div><div class='add'>+			urb-&gt;transfer_flags |= URB_FREE_BUFFER;</div><div class='ctx'> </div><div class='ctx'> 			usb_anchor_urb(urb, &amp;parent-&gt;rx_submitted);</div><div class='ctx'> </div><div class='hunk'>@@ -619,11 +1012,10 @@ static int gs_can_open(struct net_device *netdev)</div><div class='ctx'> 					netif_device_detach(dev-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 				netdev_err(netdev,</div><div class='del'>-					   "usb_submit failed (err=%d)\n",</div><div class='del'>-					   rc);</div><div class='add'>+					   "usb_submit_urb() failed, error %pe\n",</div><div class='add'>+					   ERR_PTR(rc));</div><div class='ctx'> </div><div class='del'>-				usb_unanchor_urb(urb);</div><div class='del'>-				break;</div><div class='add'>+				goto out_usb_unanchor_urb;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Drop reference,</div><div class='hunk'>@@ -633,55 +1025,100 @@ static int gs_can_open(struct net_device *netdev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dm = kmalloc(sizeof(*dm), GFP_KERNEL);</div><div class='del'>-	if (!dm)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	/* flags */</div><div class='del'>-	ctrlmode = dev-&gt;can.ctrlmode;</div><div class='del'>-	dm-&gt;flags = 0;</div><div class='del'>-</div><div class='ctx'> 	if (ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='del'>-		dm-&gt;flags |= GS_CAN_MODE_LOOP_BACK;</div><div class='del'>-	else if (ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='del'>-		dm-&gt;flags |= GS_CAN_MODE_LISTEN_ONLY;</div><div class='add'>+		flags |= GS_CAN_MODE_LOOP_BACK;</div><div class='ctx'> </div><div class='del'>-	/* Controller is not allowed to retry TX</div><div class='del'>-	 * this mode is unavailable on atmels uc3c hardware</div><div class='del'>-	 */</div><div class='del'>-	if (ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='del'>-		dm-&gt;flags |= GS_CAN_MODE_ONE_SHOT;</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		flags |= GS_CAN_MODE_LISTEN_ONLY;</div><div class='ctx'> </div><div class='ctx'> 	if (ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='del'>-		dm-&gt;flags |= GS_CAN_MODE_TRIPLE_SAMPLE;</div><div class='add'>+		flags |= GS_CAN_MODE_TRIPLE_SAMPLE;</div><div class='ctx'> </div><div class='del'>-	/* finally start device */</div><div class='del'>-	dm-&gt;mode = GS_CAN_MODE_START;</div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(dev-&gt;iface),</div><div class='del'>-			     usb_sndctrlpipe(interface_to_usbdev(dev-&gt;iface), 0),</div><div class='del'>-			     GS_USB_BREQ_MODE,</div><div class='del'>-			     USB_DIR_OUT | USB_TYPE_VENDOR |</div><div class='del'>-			     USB_RECIP_INTERFACE,</div><div class='del'>-			     dev-&gt;channel,</div><div class='del'>-			     0,</div><div class='del'>-			     dm,</div><div class='del'>-			     sizeof(*dm),</div><div class='del'>-			     1000);</div><div class='del'>-</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		netdev_err(netdev, "Couldn't start device (err=%d)\n", rc);</div><div class='del'>-		kfree(dm);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		flags |= GS_CAN_MODE_ONE_SHOT;</div><div class='ctx'> </div><div class='del'>-	kfree(dm);</div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		flags |= GS_CAN_MODE_BERR_REPORTING;</div><div class='ctx'> </div><div class='add'>+	if (ctrlmode &amp; CAN_CTRLMODE_FD)</div><div class='add'>+		flags |= GS_CAN_MODE_FD;</div><div class='add'>+</div><div class='add'>+	/* if hardware supports timestamps, enable it */</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+		flags |= GS_CAN_MODE_HW_TIMESTAMP;</div><div class='add'>+</div><div class='add'>+	/* finally start device */</div><div class='ctx'> 	dev-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	dm.flags = cpu_to_le32(flags);</div><div class='add'>+	rc = usb_control_msg_send(dev-&gt;udev, 0, GS_USB_BREQ_MODE,</div><div class='add'>+				  USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  dev-&gt;channel, 0, &amp;dm, sizeof(dm), 1000,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(netdev, "Couldn't start device (err=%d)\n", rc);</div><div class='add'>+		dev-&gt;can.state = CAN_STATE_STOPPED;</div><div class='ctx'> </div><div class='add'>+		goto out_usb_kill_anchored_urbs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	parent-&gt;active_channels++;</div><div class='ctx'> 	if (!(dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY))</div><div class='ctx'> 		netif_start_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_usb_unanchor_urb:</div><div class='add'>+	usb_unanchor_urb(urb);</div><div class='add'>+out_usb_free_urb:</div><div class='add'>+	usb_free_urb(urb);</div><div class='add'>+out_usb_kill_anchored_urbs:</div><div class='add'>+	if (!parent-&gt;active_channels) {</div><div class='add'>+		usb_kill_anchored_urbs(&amp;dev-&gt;tx_submitted);</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+			gs_usb_timestamp_stop(parent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_rx_offload_disable(&amp;dev-&gt;offload);</div><div class='add'>+	close_candev(netdev);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gs_usb_get_state(const struct net_device *netdev,</div><div class='add'>+			    struct can_berr_counter *bec,</div><div class='add'>+			    enum can_state *state)</div><div class='add'>+{</div><div class='add'>+	struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+	struct gs_device_state ds;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg_recv(dev-&gt;udev, 0, GS_USB_BREQ_GET_STATE,</div><div class='add'>+				  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  dev-&gt;channel, 0,</div><div class='add'>+				  &amp;ds, sizeof(ds),</div><div class='add'>+				  USB_CTRL_GET_TIMEOUT,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (le32_to_cpu(ds.state) &gt;= CAN_STATE_MAX)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	*state = le32_to_cpu(ds.state);</div><div class='add'>+	bec-&gt;txerr = le32_to_cpu(ds.txerr);</div><div class='add'>+	bec-&gt;rxerr = le32_to_cpu(ds.rxerr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gs_usb_can_get_berr_counter(const struct net_device *netdev,</div><div class='add'>+				       struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	enum can_state state;</div><div class='add'>+</div><div class='add'>+	return gs_usb_get_state(netdev, bec, &amp;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gs_can_close(struct net_device *netdev)</div><div class='hunk'>@@ -693,17 +1130,22 @@ static int gs_can_close(struct net_device *netdev)</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop polling */</div><div class='del'>-	if (atomic_dec_and_test(&amp;parent-&gt;active_channels))</div><div class='add'>+	parent-&gt;active_channels--;</div><div class='add'>+	if (!parent-&gt;active_channels) {</div><div class='ctx'> 		usb_kill_anchored_urbs(&amp;parent-&gt;rx_submitted);</div><div class='ctx'> </div><div class='add'>+		if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+			gs_usb_timestamp_stop(parent);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Stop sending URBs */</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;dev-&gt;tx_submitted);</div><div class='ctx'> 	atomic_set(&amp;dev-&gt;active_tx_urbs, 0);</div><div class='ctx'> </div><div class='add'>+	dev-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='ctx'> 	/* reset the device */</div><div class='del'>-	rc = gs_cmd_reset(dev);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		netdev_warn(netdev, "Couldn't shutdown device (err=%d)", rc);</div><div class='add'>+	gs_cmd_reset(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* reset tx contexts */</div><div class='ctx'> 	for (rc = 0; rc &lt; GS_MAX_TX_URBS; rc++) {</div><div class='hunk'>@@ -711,64 +1153,77 @@ static int gs_can_close(struct net_device *netdev)</div><div class='ctx'> 		dev-&gt;tx_context[rc].echo_id = GS_MAX_TX_URBS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	can_rx_offload_disable(&amp;dev-&gt;offload);</div><div class='add'>+</div><div class='ctx'> 	/* close the netdev */</div><div class='ctx'> 	close_candev(netdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gs_can_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+			       struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	const struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+		return can_hwtstamp_get(netdev, cfg);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gs_can_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+			       struct kernel_hwtstamp_config *cfg,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+		return can_hwtstamp_set(netdev, cfg, extack);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops gs_usb_netdev_ops = {</div><div class='ctx'> 	.ndo_open = gs_can_open,</div><div class='ctx'> 	.ndo_stop = gs_can_close,</div><div class='ctx'> 	.ndo_start_xmit = gs_can_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+	.ndo_hwtstamp_get = gs_can_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = gs_can_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int gs_usb_set_identify(struct net_device *netdev, bool do_identify)</div><div class='ctx'> {</div><div class='ctx'> 	struct gs_can *dev = netdev_priv(netdev);</div><div class='del'>-	struct gs_identify_mode *imode;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	imode = kmalloc(sizeof(*imode), GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	if (!imode)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	struct gs_identify_mode imode;</div><div class='ctx'> </div><div class='ctx'> 	if (do_identify)</div><div class='del'>-		imode-&gt;mode = GS_CAN_IDENTIFY_ON;</div><div class='add'>+		imode.mode = cpu_to_le32(GS_CAN_IDENTIFY_ON);</div><div class='ctx'> 	else</div><div class='del'>-		imode-&gt;mode = GS_CAN_IDENTIFY_OFF;</div><div class='del'>-</div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(dev-&gt;iface),</div><div class='del'>-			     usb_sndctrlpipe(interface_to_usbdev(dev-&gt;iface),</div><div class='del'>-					     0),</div><div class='del'>-			     GS_USB_BREQ_IDENTIFY,</div><div class='del'>-			     USB_DIR_OUT | USB_TYPE_VENDOR |</div><div class='del'>-			     USB_RECIP_INTERFACE,</div><div class='del'>-			     dev-&gt;channel,</div><div class='del'>-			     0,</div><div class='del'>-			     imode,</div><div class='del'>-			     sizeof(*imode),</div><div class='del'>-			     100);</div><div class='del'>-</div><div class='del'>-	kfree(imode);</div><div class='del'>-</div><div class='del'>-	return (rc &gt; 0) ? 0 : rc;</div><div class='add'>+		imode.mode = cpu_to_le32(GS_CAN_IDENTIFY_OFF);</div><div class='add'>+</div><div class='add'>+	return usb_control_msg_send(dev-&gt;udev, 0, GS_USB_BREQ_IDENTIFY,</div><div class='add'>+				    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				    dev-&gt;channel, 0, &amp;imode, sizeof(imode), 100,</div><div class='add'>+				    GFP_KERNEL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* blink LED's for finding the this interface */</div><div class='del'>-static int gs_usb_set_phys_id(struct net_device *dev,</div><div class='add'>+static int gs_usb_set_phys_id(struct net_device *netdev,</div><div class='ctx'> 			      enum ethtool_phys_id_state state)</div><div class='ctx'> {</div><div class='add'>+	const struct gs_can *dev = netdev_priv(netdev);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='add'>+	if (!(dev-&gt;feature &amp; GS_CAN_FEATURE_IDENTIFY))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case ETHTOOL_ID_ACTIVE:</div><div class='del'>-		rc = gs_usb_set_identify(dev, GS_CAN_IDENTIFY_ON);</div><div class='add'>+		rc = gs_usb_set_identify(netdev, GS_CAN_IDENTIFY_ON);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_ID_INACTIVE:</div><div class='del'>-		rc = gs_usb_set_identify(dev, GS_CAN_IDENTIFY_OFF);</div><div class='add'>+		rc = gs_usb_set_identify(netdev, GS_CAN_IDENTIFY_OFF);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -777,8 +1232,65 @@ static int gs_usb_set_phys_id(struct net_device *dev,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gs_usb_get_ts_info(struct net_device *netdev,</div><div class='add'>+			      struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* report if device supports HW timestamps */</div><div class='add'>+	if (dev-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+		return can_ethtool_op_get_ts_info_hwts(netdev, info);</div><div class='add'>+</div><div class='add'>+	return ethtool_op_get_ts_info(netdev, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops gs_usb_ethtool_ops = {</div><div class='ctx'> 	.set_phys_id = gs_usb_set_phys_id,</div><div class='add'>+	.get_ts_info = gs_usb_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gs_usb_get_termination(struct net_device *netdev, u16 *term)</div><div class='add'>+{</div><div class='add'>+	struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+	struct gs_device_termination_state term_state;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = usb_control_msg_recv(dev-&gt;udev, 0, GS_USB_BREQ_GET_TERMINATION,</div><div class='add'>+				  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  dev-&gt;channel, 0,</div><div class='add'>+				  &amp;term_state, sizeof(term_state), 1000,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (term_state.state == cpu_to_le32(GS_CAN_TERMINATION_STATE_ON))</div><div class='add'>+		*term = GS_USB_TERMINATION_ENABLED;</div><div class='add'>+	else</div><div class='add'>+		*term = GS_USB_TERMINATION_DISABLED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gs_usb_set_termination(struct net_device *netdev, u16 term)</div><div class='add'>+{</div><div class='add'>+	struct gs_can *dev = netdev_priv(netdev);</div><div class='add'>+	struct gs_device_termination_state term_state;</div><div class='add'>+</div><div class='add'>+	if (term == GS_USB_TERMINATION_ENABLED)</div><div class='add'>+		term_state.state = cpu_to_le32(GS_CAN_TERMINATION_STATE_ON);</div><div class='add'>+	else</div><div class='add'>+		term_state.state = cpu_to_le32(GS_CAN_TERMINATION_STATE_OFF);</div><div class='add'>+</div><div class='add'>+	return usb_control_msg_send(dev-&gt;udev, 0, GS_USB_BREQ_SET_TERMINATION,</div><div class='add'>+				    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				    dev-&gt;channel, 0,</div><div class='add'>+				    &amp;term_state, sizeof(term_state), 1000,</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u16 gs_usb_termination_const[] = {</div><div class='add'>+	GS_USB_TERMINATION_DISABLED,</div><div class='add'>+	GS_USB_TERMINATION_ENABLED</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct gs_can *gs_make_candev(unsigned int channel,</div><div class='hunk'>@@ -788,28 +1300,21 @@ static struct gs_can *gs_make_candev(unsigned int channel,</div><div class='ctx'> 	struct gs_can *dev;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct gs_device_bt_const *bt_const;</div><div class='del'>-</div><div class='del'>-	bt_const = kmalloc(sizeof(*bt_const), GFP_KERNEL);</div><div class='del'>-	if (!bt_const)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='add'>+	struct gs_device_bt_const_extended bt_const_extended;</div><div class='add'>+	struct gs_device_bt_const bt_const;</div><div class='add'>+	u32 feature;</div><div class='ctx'> </div><div class='ctx'> 	/* fetch bit timing constants */</div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(intf),</div><div class='del'>-			     usb_rcvctrlpipe(interface_to_usbdev(intf), 0),</div><div class='del'>-			     GS_USB_BREQ_BT_CONST,</div><div class='del'>-			     USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-			     channel,</div><div class='del'>-			     0,</div><div class='del'>-			     bt_const,</div><div class='del'>-			     sizeof(*bt_const),</div><div class='del'>-			     1000);</div><div class='del'>-</div><div class='del'>-	if (rc &lt; 0) {</div><div class='add'>+	rc = usb_control_msg_recv(interface_to_usbdev(intf), 0,</div><div class='add'>+				  GS_USB_BREQ_BT_CONST,</div><div class='add'>+				  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  channel, 0, &amp;bt_const, sizeof(bt_const), 1000,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Couldn't get bit timing const for channel (err=%d)\n",</div><div class='del'>-			rc);</div><div class='del'>-		kfree(bt_const);</div><div class='add'>+			"Couldn't get bit timing const for channel %d (%pe)\n",</div><div class='add'>+			channel, ERR_PTR(rc));</div><div class='ctx'> 		return ERR_PTR(rc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -817,29 +1322,30 @@ static struct gs_can *gs_make_candev(unsigned int channel,</div><div class='ctx'> 	netdev = alloc_candev(sizeof(struct gs_can), GS_MAX_TX_URBS);</div><div class='ctx'> 	if (!netdev) {</div><div class='ctx'> 		dev_err(&amp;intf-&gt;dev, "Couldn't allocate candev\n");</div><div class='del'>-		kfree(bt_const);</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;gs_usb_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;gs_usb_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO; /* we support full roundtrip echo */</div><div class='del'>-</div><div class='del'>-	/* dev settup */</div><div class='del'>-	strcpy(dev-&gt;bt_const.name, "gs_usb");</div><div class='del'>-	dev-&gt;bt_const.tseg1_min = bt_const-&gt;tseg1_min;</div><div class='del'>-	dev-&gt;bt_const.tseg1_max = bt_const-&gt;tseg1_max;</div><div class='del'>-	dev-&gt;bt_const.tseg2_min = bt_const-&gt;tseg2_min;</div><div class='del'>-	dev-&gt;bt_const.tseg2_max = bt_const-&gt;tseg2_max;</div><div class='del'>-	dev-&gt;bt_const.sjw_max = bt_const-&gt;sjw_max;</div><div class='del'>-	dev-&gt;bt_const.brp_min = bt_const-&gt;brp_min;</div><div class='del'>-	dev-&gt;bt_const.brp_max = bt_const-&gt;brp_max;</div><div class='del'>-	dev-&gt;bt_const.brp_inc = bt_const-&gt;brp_inc;</div><div class='add'>+	netdev-&gt;dev_id = channel;</div><div class='add'>+	netdev-&gt;dev_port = channel;</div><div class='add'>+</div><div class='add'>+	/* dev setup */</div><div class='add'>+	strcpy(dev-&gt;bt_const.name, KBUILD_MODNAME);</div><div class='add'>+	dev-&gt;bt_const.tseg1_min = le32_to_cpu(bt_const.tseg1_min);</div><div class='add'>+	dev-&gt;bt_const.tseg1_max = le32_to_cpu(bt_const.tseg1_max);</div><div class='add'>+	dev-&gt;bt_const.tseg2_min = le32_to_cpu(bt_const.tseg2_min);</div><div class='add'>+	dev-&gt;bt_const.tseg2_max = le32_to_cpu(bt_const.tseg2_max);</div><div class='add'>+	dev-&gt;bt_const.sjw_max = le32_to_cpu(bt_const.sjw_max);</div><div class='add'>+	dev-&gt;bt_const.brp_min = le32_to_cpu(bt_const.brp_min);</div><div class='add'>+	dev-&gt;bt_const.brp_max = le32_to_cpu(bt_const.brp_max);</div><div class='add'>+	dev-&gt;bt_const.brp_inc = le32_to_cpu(bt_const.brp_inc);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;udev = interface_to_usbdev(intf);</div><div class='del'>-	dev-&gt;iface = intf;</div><div class='ctx'> 	dev-&gt;netdev = netdev;</div><div class='ctx'> 	dev-&gt;channel = channel;</div><div class='ctx'> </div><div class='hunk'>@@ -851,188 +1357,296 @@ static struct gs_can *gs_make_candev(unsigned int channel,</div><div class='ctx'> 		dev-&gt;tx_context[rc].echo_id = GS_MAX_TX_URBS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* can settup */</div><div class='add'>+	/* can setup */</div><div class='ctx'> 	dev-&gt;can.state = CAN_STATE_STOPPED;</div><div class='del'>-	dev-&gt;can.clock.freq = bt_const-&gt;fclk_can;</div><div class='add'>+	dev-&gt;can.clock.freq = le32_to_cpu(bt_const.fclk_can);</div><div class='ctx'> 	dev-&gt;can.bittiming_const = &amp;dev-&gt;bt_const;</div><div class='ctx'> 	dev-&gt;can.do_set_bittiming = gs_usb_set_bittiming;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;can.ctrlmode_supported = 0;</div><div class='add'>+	dev-&gt;can.ctrlmode_supported = CAN_CTRLMODE_CC_LEN8_DLC;</div><div class='ctx'> </div><div class='del'>-	if (bt_const-&gt;feature &amp; GS_CAN_FEATURE_LISTEN_ONLY)</div><div class='add'>+	feature = le32_to_cpu(bt_const.feature);</div><div class='add'>+	dev-&gt;feature = FIELD_GET(GS_CAN_FEATURE_MASK, feature);</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_LISTEN_ONLY)</div><div class='ctx'> 		dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;</div><div class='ctx'> </div><div class='del'>-	if (bt_const-&gt;feature &amp; GS_CAN_FEATURE_LOOP_BACK)</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_LOOP_BACK)</div><div class='ctx'> 		dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_LOOPBACK;</div><div class='ctx'> </div><div class='del'>-	if (bt_const-&gt;feature &amp; GS_CAN_FEATURE_TRIPLE_SAMPLE)</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_TRIPLE_SAMPLE)</div><div class='ctx'> 		dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;</div><div class='ctx'> </div><div class='del'>-	if (bt_const-&gt;feature &amp; GS_CAN_FEATURE_ONE_SHOT)</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_ONE_SHOT)</div><div class='ctx'> 		dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_ONE_SHOT;</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_FD) {</div><div class='add'>+		dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD;</div><div class='add'>+		/* The data bit timing will be overwritten, if</div><div class='add'>+		 * GS_CAN_FEATURE_BT_CONST_EXT is set.</div><div class='add'>+		 */</div><div class='add'>+		dev-&gt;can.fd.data_bittiming_const = &amp;dev-&gt;bt_const;</div><div class='add'>+		dev-&gt;can.fd.do_set_data_bittiming = gs_usb_set_data_bittiming;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (dconf-&gt;sw_version &gt; 1)</div><div class='del'>-		if (bt_const-&gt;feature &amp; GS_CAN_FEATURE_IDENTIFY)</div><div class='del'>-			netdev-&gt;ethtool_ops = &amp;gs_usb_ethtool_ops;</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_TERMINATION) {</div><div class='add'>+		rc = gs_usb_get_termination(netdev, &amp;dev-&gt;can.termination);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev-&gt;feature &amp;= ~GS_CAN_FEATURE_TERMINATION;</div><div class='ctx'> </div><div class='del'>-	kfree(bt_const);</div><div class='add'>+			dev_info(&amp;intf-&gt;dev,</div><div class='add'>+				 "Disabling termination support for channel %d (%pe)\n",</div><div class='add'>+				 channel, ERR_PTR(rc));</div><div class='add'>+		} else {</div><div class='add'>+			dev-&gt;can.termination_const = gs_usb_termination_const;</div><div class='add'>+			dev-&gt;can.termination_const_cnt = ARRAY_SIZE(gs_usb_termination_const);</div><div class='add'>+			dev-&gt;can.do_set_termination = gs_usb_set_termination;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_BERR_REPORTING)</div><div class='add'>+		dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_GET_STATE)</div><div class='add'>+		dev-&gt;can.do_get_berr_counter = gs_usb_can_get_berr_counter;</div><div class='add'>+</div><div class='add'>+	/* The CANtact Pro from LinkLayer Labs is based on the</div><div class='add'>+	 * LPC54616 µC, which is affected by the NXP LPC USB transfer</div><div class='add'>+	 * erratum. However, the current firmware (version 2) doesn't</div><div class='add'>+	 * set the GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX bit. Set the</div><div class='add'>+	 * feature GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX to workaround</div><div class='add'>+	 * this issue.</div><div class='add'>+	 *</div><div class='add'>+	 * For the GS_USB_BREQ_DATA_BITTIMING USB control message the</div><div class='add'>+	 * CANtact Pro firmware uses a request value, which is already</div><div class='add'>+	 * used by the candleLight firmware for a different purpose</div><div class='add'>+	 * (GS_USB_BREQ_GET_USER_ID). Set the feature</div><div class='add'>+	 * GS_CAN_FEATURE_QUIRK_BREQ_CANTACT_PRO to workaround this</div><div class='add'>+	 * issue.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;udev-&gt;descriptor.idVendor == cpu_to_le16(USB_GS_USB_1_VENDOR_ID) &amp;&amp;</div><div class='add'>+	    dev-&gt;udev-&gt;descriptor.idProduct == cpu_to_le16(USB_GS_USB_1_PRODUCT_ID) &amp;&amp;</div><div class='add'>+	    dev-&gt;udev-&gt;manufacturer &amp;&amp; dev-&gt;udev-&gt;product &amp;&amp;</div><div class='add'>+	    !strcmp(dev-&gt;udev-&gt;manufacturer, "LinkLayer Labs") &amp;&amp;</div><div class='add'>+	    !strcmp(dev-&gt;udev-&gt;product, "CANtact Pro") &amp;&amp;</div><div class='add'>+	    (le32_to_cpu(dconf-&gt;sw_version) &lt;= 2))</div><div class='add'>+		dev-&gt;feature |= GS_CAN_FEATURE_REQ_USB_QUIRK_LPC546XX |</div><div class='add'>+			GS_CAN_FEATURE_QUIRK_BREQ_CANTACT_PRO;</div><div class='add'>+</div><div class='add'>+	/* GS_CAN_FEATURE_IDENTIFY is only supported for sw_version &gt; 1 */</div><div class='add'>+	if (!(le32_to_cpu(dconf-&gt;sw_version) &gt; 1 &amp;&amp;</div><div class='add'>+	      feature &amp; GS_CAN_FEATURE_IDENTIFY))</div><div class='add'>+		dev-&gt;feature &amp;= ~GS_CAN_FEATURE_IDENTIFY;</div><div class='add'>+</div><div class='add'>+	/* fetch extended bit timing constants if device has feature</div><div class='add'>+	 * GS_CAN_FEATURE_FD and GS_CAN_FEATURE_BT_CONST_EXT</div><div class='add'>+	 */</div><div class='add'>+	if (feature &amp; GS_CAN_FEATURE_FD &amp;&amp;</div><div class='add'>+	    feature &amp; GS_CAN_FEATURE_BT_CONST_EXT) {</div><div class='add'>+		rc = usb_control_msg_recv(interface_to_usbdev(intf), 0,</div><div class='add'>+					  GS_USB_BREQ_BT_CONST_EXT,</div><div class='add'>+					  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+					  channel, 0, &amp;bt_const_extended,</div><div class='add'>+					  sizeof(bt_const_extended),</div><div class='add'>+					  1000, GFP_KERNEL);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(&amp;intf-&gt;dev,</div><div class='add'>+				"Couldn't get extended bit timing const for channel %d (%pe)\n",</div><div class='add'>+				channel, ERR_PTR(rc));</div><div class='add'>+			goto out_free_candev;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		strcpy(dev-&gt;data_bt_const.name, KBUILD_MODNAME);</div><div class='add'>+		dev-&gt;data_bt_const.tseg1_min = le32_to_cpu(bt_const_extended.dtseg1_min);</div><div class='add'>+		dev-&gt;data_bt_const.tseg1_max = le32_to_cpu(bt_const_extended.dtseg1_max);</div><div class='add'>+		dev-&gt;data_bt_const.tseg2_min = le32_to_cpu(bt_const_extended.dtseg2_min);</div><div class='add'>+		dev-&gt;data_bt_const.tseg2_max = le32_to_cpu(bt_const_extended.dtseg2_max);</div><div class='add'>+		dev-&gt;data_bt_const.sjw_max = le32_to_cpu(bt_const_extended.dsjw_max);</div><div class='add'>+		dev-&gt;data_bt_const.brp_min = le32_to_cpu(bt_const_extended.dbrp_min);</div><div class='add'>+		dev-&gt;data_bt_const.brp_max = le32_to_cpu(bt_const_extended.dbrp_max);</div><div class='add'>+		dev-&gt;data_bt_const.brp_inc = le32_to_cpu(bt_const_extended.dbrp_inc);</div><div class='add'>+</div><div class='add'>+		dev-&gt;can.fd.data_bittiming_const = &amp;dev-&gt;data_bt_const;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	can_rx_offload_add_manual(netdev, &amp;dev-&gt;offload, GS_NAPI_WEIGHT);</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	rc = register_candev(dev-&gt;netdev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		free_candev(dev-&gt;netdev);</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "Couldn't register candev (err=%d)\n", rc);</div><div class='del'>-		return ERR_PTR(rc);</div><div class='add'>+		dev_err(&amp;intf-&gt;dev,</div><div class='add'>+			"Couldn't register candev for channel %d (%pe)\n",</div><div class='add'>+			channel, ERR_PTR(rc));</div><div class='add'>+		goto out_can_rx_offload_del;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='add'>+</div><div class='add'>+out_can_rx_offload_del:</div><div class='add'>+	can_rx_offload_del(&amp;dev-&gt;offload);</div><div class='add'>+out_free_candev:</div><div class='add'>+	free_candev(dev-&gt;netdev);</div><div class='add'>+	return ERR_PTR(rc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gs_destroy_candev(struct gs_can *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_candev(dev-&gt;netdev);</div><div class='del'>-	usb_kill_anchored_urbs(&amp;dev-&gt;tx_submitted);</div><div class='add'>+	can_rx_offload_del(&amp;dev-&gt;offload);</div><div class='ctx'> 	free_candev(dev-&gt;netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gs_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 			const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct gs_usb *dev;</div><div class='del'>-	int rc = -ENOMEM;</div><div class='add'>+	struct usb_device *udev = interface_to_usbdev(intf);</div><div class='add'>+	struct usb_endpoint_descriptor *ep_in, *ep_out;</div><div class='add'>+	struct gs_host_frame *hf;</div><div class='add'>+	struct gs_usb *parent;</div><div class='add'>+	struct gs_host_config hconf = {</div><div class='add'>+		.byte_order = cpu_to_le32(0x0000beef),</div><div class='add'>+	};</div><div class='add'>+	struct gs_device_config dconf;</div><div class='ctx'> 	unsigned int icount, i;</div><div class='del'>-	struct gs_host_config *hconf;</div><div class='del'>-	struct gs_device_config *dconf;</div><div class='del'>-</div><div class='del'>-	hconf = kmalloc(sizeof(*hconf), GFP_KERNEL);</div><div class='del'>-	if (!hconf)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	hconf-&gt;byte_order = 0x0000beef;</div><div class='add'>+	rc = usb_find_common_endpoints(intf-&gt;cur_altsetting,</div><div class='add'>+				       &amp;ep_in, &amp;ep_out, NULL, NULL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Required endpoints not found\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* send host config */</div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(intf),</div><div class='del'>-			     usb_sndctrlpipe(interface_to_usbdev(intf), 0),</div><div class='del'>-			     GS_USB_BREQ_HOST_FORMAT,</div><div class='del'>-			     USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-			     1,</div><div class='del'>-			     intf-&gt;altsetting[0].desc.bInterfaceNumber,</div><div class='del'>-			     hconf,</div><div class='del'>-			     sizeof(*hconf),</div><div class='del'>-			     1000);</div><div class='del'>-</div><div class='del'>-	kfree(hconf);</div><div class='del'>-</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "Couldn't send data format (err=%d)\n",</div><div class='del'>-			rc);</div><div class='add'>+	rc = usb_control_msg_send(udev, 0,</div><div class='add'>+				  GS_USB_BREQ_HOST_FORMAT,</div><div class='add'>+				  USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  1, intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber,</div><div class='add'>+				  &amp;hconf, sizeof(hconf), 1000,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Couldn't send data format (err=%d)\n", rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dconf = kmalloc(sizeof(*dconf), GFP_KERNEL);</div><div class='del'>-	if (!dconf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='ctx'> 	/* read device config */</div><div class='del'>-	rc = usb_control_msg(interface_to_usbdev(intf),</div><div class='del'>-			     usb_rcvctrlpipe(interface_to_usbdev(intf), 0),</div><div class='del'>-			     GS_USB_BREQ_DEVICE_CONFIG,</div><div class='del'>-			     USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='del'>-			     1,</div><div class='del'>-			     intf-&gt;altsetting[0].desc.bInterfaceNumber,</div><div class='del'>-			     dconf,</div><div class='del'>-			     sizeof(*dconf),</div><div class='del'>-			     1000);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='add'>+	rc = usb_control_msg_recv(udev, 0,</div><div class='add'>+				  GS_USB_BREQ_DEVICE_CONFIG,</div><div class='add'>+				  USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,</div><div class='add'>+				  1, intf-&gt;cur_altsetting-&gt;desc.bInterfaceNumber,</div><div class='add'>+				  &amp;dconf, sizeof(dconf), 1000,</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		dev_err(&amp;intf-&gt;dev, "Couldn't get device config: (err=%d)\n",</div><div class='ctx'> 			rc);</div><div class='del'>-		kfree(dconf);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	icount = dconf-&gt;icount + 1;</div><div class='del'>-	dev_info(&amp;intf-&gt;dev, "Configuring for %d interfaces\n", icount);</div><div class='add'>+	icount = dconf.icount + 1;</div><div class='add'>+	dev_info(&amp;intf-&gt;dev, "Configuring for %u interfaces\n", icount);</div><div class='ctx'> </div><div class='del'>-	if (icount &gt; GS_MAX_INTF) {</div><div class='add'>+	if (icount &gt; type_max(parent-&gt;channel_cnt)) {</div><div class='ctx'> 		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Driver cannot handle more that %d CAN interfaces\n",</div><div class='del'>-			GS_MAX_INTF);</div><div class='del'>-		kfree(dconf);</div><div class='add'>+			"Driver cannot handle more that %u CAN interfaces\n",</div><div class='add'>+			type_max(parent-&gt;channel_cnt));</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);</div><div class='del'>-	if (!dev) {</div><div class='del'>-		kfree(dconf);</div><div class='add'>+	parent = kzalloc(struct_size(parent, canch, icount), GFP_KERNEL);</div><div class='add'>+	if (!parent)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	init_usb_anchor(&amp;dev-&gt;rx_submitted);</div><div class='add'>+	parent-&gt;channel_cnt = icount;</div><div class='ctx'> </div><div class='del'>-	atomic_set(&amp;dev-&gt;active_channels, 0);</div><div class='add'>+	init_usb_anchor(&amp;parent-&gt;rx_submitted);</div><div class='ctx'> </div><div class='del'>-	usb_set_intfdata(intf, dev);</div><div class='del'>-	dev-&gt;udev = interface_to_usbdev(intf);</div><div class='add'>+	usb_set_intfdata(intf, parent);</div><div class='add'>+	parent-&gt;udev = udev;</div><div class='add'>+</div><div class='add'>+	/* store the detected endpoints */</div><div class='add'>+	parent-&gt;pipe_in = usb_rcvbulkpipe(parent-&gt;udev, ep_in-&gt;bEndpointAddress);</div><div class='add'>+	parent-&gt;pipe_out = usb_sndbulkpipe(parent-&gt;udev, ep_out-&gt;bEndpointAddress);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; icount; i++) {</div><div class='del'>-		dev-&gt;canch[i] = gs_make_candev(i, intf, dconf);</div><div class='del'>-		if (IS_ERR_OR_NULL(dev-&gt;canch[i])) {</div><div class='add'>+		unsigned int hf_size_rx = 0;</div><div class='add'>+</div><div class='add'>+		parent-&gt;canch[i] = gs_make_candev(i, intf, &amp;dconf);</div><div class='add'>+		if (IS_ERR_OR_NULL(parent-&gt;canch[i])) {</div><div class='ctx'> 			/* save error code to return later */</div><div class='del'>-			rc = PTR_ERR(dev-&gt;canch[i]);</div><div class='add'>+			rc = PTR_ERR(parent-&gt;canch[i]);</div><div class='ctx'> </div><div class='ctx'> 			/* on failure destroy previously created candevs */</div><div class='ctx'> 			icount = i;</div><div class='ctx'> 			for (i = 0; i &lt; icount; i++)</div><div class='del'>-				gs_destroy_candev(dev-&gt;canch[i]);</div><div class='add'>+				gs_destroy_candev(parent-&gt;canch[i]);</div><div class='ctx'> </div><div class='del'>-			usb_kill_anchored_urbs(&amp;dev-&gt;rx_submitted);</div><div class='del'>-			kfree(dconf);</div><div class='del'>-			kfree(dev);</div><div class='add'>+			usb_kill_anchored_urbs(&amp;parent-&gt;rx_submitted);</div><div class='add'>+			kfree(parent);</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='del'>-		dev-&gt;canch[i]-&gt;parent = dev;</div><div class='add'>+		parent-&gt;canch[i]-&gt;parent = parent;</div><div class='add'>+</div><div class='add'>+		/* set RX packet size based on FD and if hardware</div><div class='add'>+		 * timestamps are supported.</div><div class='add'>+		 */</div><div class='add'>+		if (parent-&gt;canch[i]-&gt;can.ctrlmode_supported &amp; CAN_CTRLMODE_FD) {</div><div class='add'>+			if (parent-&gt;canch[i]-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+				hf_size_rx = struct_size(hf, canfd_ts, 1);</div><div class='add'>+			else</div><div class='add'>+				hf_size_rx = struct_size(hf, canfd, 1);</div><div class='add'>+		} else {</div><div class='add'>+			if (parent-&gt;canch[i]-&gt;feature &amp; GS_CAN_FEATURE_HW_TIMESTAMP)</div><div class='add'>+				hf_size_rx = struct_size(hf, classic_can_ts, 1);</div><div class='add'>+			else</div><div class='add'>+				hf_size_rx = struct_size(hf, classic_can, 1);</div><div class='add'>+		}</div><div class='add'>+		parent-&gt;hf_size_rx = max(parent-&gt;hf_size_rx, hf_size_rx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	kfree(dconf);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gs_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> {</div><div class='del'>-	unsigned i;</div><div class='del'>-	struct gs_usb *dev = usb_get_intfdata(intf);</div><div class='add'>+	struct gs_usb *parent = usb_get_intfdata(intf);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> </div><div class='del'>-	if (!dev) {</div><div class='add'>+	if (!parent) {</div><div class='ctx'> 		dev_err(&amp;intf-&gt;dev, "Disconnect (nodata)\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; GS_MAX_INTF; i++)</div><div class='del'>-		if (dev-&gt;canch[i])</div><div class='del'>-			gs_destroy_candev(dev-&gt;canch[i]);</div><div class='add'>+	for (i = 0; i &lt; parent-&gt;channel_cnt; i++)</div><div class='add'>+		if (parent-&gt;canch[i])</div><div class='add'>+			gs_destroy_candev(parent-&gt;canch[i]);</div><div class='ctx'> </div><div class='del'>-	usb_kill_anchored_urbs(&amp;dev-&gt;rx_submitted);</div><div class='del'>-	kfree(dev);</div><div class='add'>+	kfree(parent);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id gs_usb_table[] = {</div><div class='del'>-	{ USB_DEVICE_INTERFACE_NUMBER(USB_GSUSB_1_VENDOR_ID,</div><div class='del'>-				      USB_GSUSB_1_PRODUCT_ID, 0) },</div><div class='add'>+	{ USB_DEVICE_INTERFACE_NUMBER(USB_GS_USB_1_VENDOR_ID,</div><div class='add'>+				      USB_GS_USB_1_PRODUCT_ID, 0) },</div><div class='ctx'> 	{ USB_DEVICE_INTERFACE_NUMBER(USB_CANDLELIGHT_VENDOR_ID,</div><div class='ctx'> 				      USB_CANDLELIGHT_PRODUCT_ID, 0) },</div><div class='add'>+	{ USB_DEVICE_INTERFACE_NUMBER(USB_CES_CANEXT_FD_VENDOR_ID,</div><div class='add'>+				      USB_CES_CANEXT_FD_PRODUCT_ID, 0) },</div><div class='add'>+	{ USB_DEVICE_INTERFACE_NUMBER(USB_ABE_CANDEBUGGER_FD_VENDOR_ID,</div><div class='add'>+				      USB_ABE_CANDEBUGGER_FD_PRODUCT_ID, 0) },</div><div class='add'>+	{ USB_DEVICE_INTERFACE_NUMBER(USB_XYLANTA_SAINT3_VENDOR_ID,</div><div class='add'>+				      USB_XYLANTA_SAINT3_PRODUCT_ID, 0) },</div><div class='add'>+	{ USB_DEVICE_INTERFACE_NUMBER(USB_CANNECTIVITY_VENDOR_ID,</div><div class='add'>+				      USB_CANNECTIVITY_PRODUCT_ID, 0) },</div><div class='ctx'> 	{} /* Terminating entry */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(usb, gs_usb_table);</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver gs_usb_driver = {</div><div class='del'>-	.name       = "gs_usb",</div><div class='del'>-	.probe      = gs_usb_probe,</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.probe = gs_usb_probe,</div><div class='ctx'> 	.disconnect = gs_usb_disconnect,</div><div class='del'>-	.id_table   = gs_usb_table,</div><div class='add'>+	.id_table = gs_usb_table,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_usb_driver(gs_usb_driver);</div><div class='head'>diff --git a/drivers/net/can/usb/kvaser_usb/Makefile b/drivers/net/can/usb/kvaser_usb/Makefile<br/>index cf260044f0b9..41b4a11555aa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/kvaser_usb/Makefile</a></div><div class='hunk'>@@ -1,3 +1,3 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_CAN_KVASER_USB) += kvaser_usb.o</div><div class='del'>-kvaser_usb-y = kvaser_usb_core.o kvaser_usb_leaf.o kvaser_usb_hydra.o</div><div class='add'>+kvaser_usb-y = kvaser_usb_core.o kvaser_usb_devlink.o kvaser_usb_leaf.o kvaser_usb_hydra.o</div><div class='head'>diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h<br/>index 390b6bde883c..46a1b6907a50 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/kvaser_usb/kvaser_usb.h</a></div><div class='hunk'>@@ -22,9 +22,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='add'>+#include &lt;linux/ktime.h&gt;</div><div class='add'>+#include &lt;linux/math64.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='hunk'>@@ -35,15 +38,20 @@</div><div class='ctx'> #define KVASER_USB_RX_BUFFER_SIZE		3072</div><div class='ctx'> #define KVASER_USB_MAX_NET_DEVICES		5</div><div class='ctx'> </div><div class='del'>-/* USB devices features */</div><div class='del'>-#define KVASER_USB_HAS_SILENT_MODE		BIT(0)</div><div class='del'>-#define KVASER_USB_HAS_TXRX_ERRORS		BIT(1)</div><div class='add'>+/* Kvaser USB device quirks */</div><div class='add'>+#define KVASER_USB_QUIRK_HAS_SILENT_MODE	BIT(0)</div><div class='add'>+#define KVASER_USB_QUIRK_HAS_TXRX_ERRORS	BIT(1)</div><div class='add'>+#define KVASER_USB_QUIRK_IGNORE_CLK_FREQ	BIT(2)</div><div class='ctx'> </div><div class='ctx'> /* Device capabilities */</div><div class='ctx'> #define KVASER_USB_CAP_BERR_CAP			0x01</div><div class='ctx'> #define KVASER_USB_CAP_EXT_CAP			0x02</div><div class='ctx'> #define KVASER_USB_HYDRA_CAP_EXT_CMD		0x04</div><div class='ctx'> </div><div class='add'>+#define KVASER_USB_SW_VERSION_MAJOR_MASK GENMASK(31, 24)</div><div class='add'>+#define KVASER_USB_SW_VERSION_MINOR_MASK GENMASK(23, 16)</div><div class='add'>+#define KVASER_USB_SW_VERSION_BUILD_MASK GENMASK(15, 0)</div><div class='add'>+</div><div class='ctx'> struct kvaser_usb_dev_cfg;</div><div class='ctx'> </div><div class='ctx'> enum kvaser_usb_leaf_family {</div><div class='hunk'>@@ -51,6 +59,11 @@ enum kvaser_usb_leaf_family {</div><div class='ctx'> 	KVASER_USBCAN,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum kvaser_usb_led_state {</div><div class='add'>+	KVASER_USB_LED_ON = 0,</div><div class='add'>+	KVASER_USB_LED_OFF = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define KVASER_USB_HYDRA_MAX_CMD_LEN		128</div><div class='ctx'> struct kvaser_usb_dev_card_data_hydra {</div><div class='ctx'> 	u8 channel_to_he[KVASER_USB_MAX_NET_DEVICES];</div><div class='hunk'>@@ -65,37 +78,49 @@ struct kvaser_usb_dev_card_data_hydra {</div><div class='ctx'> struct kvaser_usb_dev_card_data {</div><div class='ctx'> 	u32 ctrlmode_supported;</div><div class='ctx'> 	u32 capabilities;</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			enum kvaser_usb_leaf_family family;</div><div class='del'>-		} leaf;</div><div class='del'>-		struct kvaser_usb_dev_card_data_hydra hydra;</div><div class='del'>-	};</div><div class='add'>+	struct kvaser_usb_dev_card_data_hydra hydra;</div><div class='add'>+	u32 usbcan_timestamp_msb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Context for an outstanding, not yet ACKed, transmission */</div><div class='ctx'> struct kvaser_usb_tx_urb_context {</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv;</div><div class='ctx'> 	u32 echo_index;</div><div class='del'>-	int dlc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct kvaser_usb_fw_version {</div><div class='add'>+	u8 major;</div><div class='add'>+	u8 minor;</div><div class='add'>+	u16 build;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_usb_busparams {</div><div class='add'>+	__le32 bitrate;</div><div class='add'>+	u8 tseg1;</div><div class='add'>+	u8 tseg2;</div><div class='add'>+	u8 sjw;</div><div class='add'>+	u8 nsamples;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct kvaser_usb {</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct usb_interface *intf;</div><div class='ctx'> 	struct kvaser_usb_net_priv *nets[KVASER_USB_MAX_NET_DEVICES];</div><div class='del'>-	const struct kvaser_usb_dev_ops *ops;</div><div class='add'>+	const struct kvaser_usb_driver_info *driver_info;</div><div class='ctx'> 	const struct kvaser_usb_dev_cfg *cfg;</div><div class='ctx'> </div><div class='ctx'> 	struct usb_endpoint_descriptor *bulk_in, *bulk_out;</div><div class='ctx'> 	struct usb_anchor rx_submitted;</div><div class='ctx'> </div><div class='add'>+	u32 ean[2];</div><div class='add'>+	u32 serial_number;</div><div class='add'>+	struct kvaser_usb_fw_version fw_version;</div><div class='add'>+	u8 hw_revision;</div><div class='add'>+	unsigned int nchannels;</div><div class='ctx'> 	/* @max_tx_urbs: Firmware-reported maximum number of outstanding,</div><div class='ctx'> 	 * not yet ACKed, transmissions on this device. This value is</div><div class='ctx'> 	 * also used as a sentinel for marking free tx contexts.</div><div class='ctx'> 	 */</div><div class='del'>-	u32 fw_version;</div><div class='del'>-	unsigned int nchannels;</div><div class='ctx'> 	unsigned int max_tx_urbs;</div><div class='ctx'> 	struct kvaser_usb_dev_card_data card_data;</div><div class='ctx'> </div><div class='hunk'>@@ -106,15 +131,22 @@ struct kvaser_usb {</div><div class='ctx'> </div><div class='ctx'> struct kvaser_usb_net_priv {</div><div class='ctx'> 	struct can_priv can;</div><div class='add'>+	struct devlink_port devlink_port;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='ctx'> </div><div class='add'>+	/* subdriver-specific data */</div><div class='add'>+	void *sub_priv;</div><div class='add'>+</div><div class='ctx'> 	struct kvaser_usb *dev;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	int channel;</div><div class='ctx'> </div><div class='del'>-	struct completion start_comp, stop_comp, flush_comp;</div><div class='add'>+	struct completion start_comp, stop_comp, flush_comp,</div><div class='add'>+			  get_busparams_comp;</div><div class='ctx'> 	struct usb_anchor tx_submitted;</div><div class='ctx'> </div><div class='add'>+	struct kvaser_usb_busparams busparams_nominal, busparams_data;</div><div class='add'>+</div><div class='ctx'> 	spinlock_t tx_contexts_lock; /* lock for active_tx_contexts */</div><div class='ctx'> 	int active_tx_contexts;</div><div class='ctx'> 	struct kvaser_usb_tx_urb_context tx_contexts[];</div><div class='hunk'>@@ -124,15 +156,20 @@ struct kvaser_usb_net_priv {</div><div class='ctx'>  * struct kvaser_usb_dev_ops - Device specific functions</div><div class='ctx'>  * @dev_set_mode:		used for can.do_set_mode</div><div class='ctx'>  * @dev_set_bittiming:		used for can.do_set_bittiming</div><div class='del'>- * @dev_set_data_bittiming:	used for can.do_set_data_bittiming</div><div class='add'>+ * @dev_get_busparams:		readback arbitration busparams</div><div class='add'>+ * @dev_set_data_bittiming:	used for can.fd.do_set_data_bittiming</div><div class='add'>+ * @dev_get_data_busparams:	readback data busparams</div><div class='ctx'>  * @dev_get_berr_counter:	used for can.do_get_berr_counter</div><div class='ctx'>  *</div><div class='ctx'>  * @dev_setup_endpoints:	setup USB in and out endpoints</div><div class='ctx'>  * @dev_init_card:		initialize card</div><div class='add'>+ * @dev_init_channel:		initialize channel</div><div class='add'>+ * @dev_remove_channel:		uninitialize channel</div><div class='ctx'>  * @dev_get_software_info:	get software info</div><div class='ctx'>  * @dev_get_software_details:	get software details</div><div class='ctx'>  * @dev_get_card_info:		get card info</div><div class='ctx'>  * @dev_get_capabilities:	discover device capabilities</div><div class='add'>+ * @dev_set_led:		turn on/off device LED</div><div class='ctx'>  *</div><div class='ctx'>  * @dev_set_opt_mode:		set ctrlmod</div><div class='ctx'>  * @dev_start_chip:		start the CAN controller</div><div class='hunk'>@@ -144,16 +181,25 @@ struct kvaser_usb_net_priv {</div><div class='ctx'>  */</div><div class='ctx'> struct kvaser_usb_dev_ops {</div><div class='ctx'> 	int (*dev_set_mode)(struct net_device *netdev, enum can_mode mode);</div><div class='del'>-	int (*dev_set_bittiming)(struct net_device *netdev);</div><div class='del'>-	int (*dev_set_data_bittiming)(struct net_device *netdev);</div><div class='add'>+	int (*dev_set_bittiming)(const struct net_device *netdev,</div><div class='add'>+				 const struct kvaser_usb_busparams *busparams);</div><div class='add'>+	int (*dev_get_busparams)(struct kvaser_usb_net_priv *priv);</div><div class='add'>+	int (*dev_set_data_bittiming)(const struct net_device *netdev,</div><div class='add'>+				      const struct kvaser_usb_busparams *busparams);</div><div class='add'>+	int (*dev_get_data_busparams)(struct kvaser_usb_net_priv *priv);</div><div class='ctx'> 	int (*dev_get_berr_counter)(const struct net_device *netdev,</div><div class='ctx'> 				    struct can_berr_counter *bec);</div><div class='ctx'> 	int (*dev_setup_endpoints)(struct kvaser_usb *dev);</div><div class='ctx'> 	int (*dev_init_card)(struct kvaser_usb *dev);</div><div class='add'>+	int (*dev_init_channel)(struct kvaser_usb_net_priv *priv);</div><div class='add'>+	void (*dev_remove_channel)(struct kvaser_usb_net_priv *priv);</div><div class='ctx'> 	int (*dev_get_software_info)(struct kvaser_usb *dev);</div><div class='ctx'> 	int (*dev_get_software_details)(struct kvaser_usb *dev);</div><div class='ctx'> 	int (*dev_get_card_info)(struct kvaser_usb *dev);</div><div class='ctx'> 	int (*dev_get_capabilities)(struct kvaser_usb *dev);</div><div class='add'>+	int (*dev_set_led)(struct kvaser_usb_net_priv *priv,</div><div class='add'>+			   enum kvaser_usb_led_state state,</div><div class='add'>+			   u16 duration_ms);</div><div class='ctx'> 	int (*dev_set_opt_mode)(const struct kvaser_usb_net_priv *priv);</div><div class='ctx'> 	int (*dev_start_chip)(struct kvaser_usb_net_priv *priv);</div><div class='ctx'> 	int (*dev_stop_chip)(struct kvaser_usb_net_priv *priv);</div><div class='hunk'>@@ -162,8 +208,14 @@ struct kvaser_usb_dev_ops {</div><div class='ctx'> 	void (*dev_read_bulk_callback)(struct kvaser_usb *dev, void *buf,</div><div class='ctx'> 				       int len);</div><div class='ctx'> 	void *(*dev_frame_to_cmd)(const struct kvaser_usb_net_priv *priv,</div><div class='del'>-				  const struct sk_buff *skb, int *frame_len,</div><div class='del'>-				  int *cmd_len, u16 transid);</div><div class='add'>+				  const struct sk_buff *skb, int *cmd_len,</div><div class='add'>+				  u16 transid);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct kvaser_usb_driver_info {</div><div class='add'>+	u32 quirks;</div><div class='add'>+	enum kvaser_usb_leaf_family family;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct kvaser_usb_dev_cfg {</div><div class='hunk'>@@ -176,6 +228,13 @@ struct kvaser_usb_dev_cfg {</div><div class='ctx'> extern const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops;</div><div class='ctx'> extern const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops;</div><div class='ctx'> </div><div class='add'>+extern const struct devlink_ops kvaser_usb_devlink_ops;</div><div class='add'>+</div><div class='add'>+int kvaser_usb_devlink_port_register(struct kvaser_usb_net_priv *priv);</div><div class='add'>+void kvaser_usb_devlink_port_unregister(struct kvaser_usb_net_priv *priv);</div><div class='add'>+</div><div class='add'>+void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv);</div><div class='add'>+</div><div class='ctx'> int kvaser_usb_recv_cmd(const struct kvaser_usb *dev, void *cmd, int len,</div><div class='ctx'> 			int *actual_len);</div><div class='ctx'> </div><div class='hunk'>@@ -185,4 +244,29 @@ int kvaser_usb_send_cmd_async(struct kvaser_usb_net_priv *priv, void *cmd,</div><div class='ctx'> 			      int len);</div><div class='ctx'> </div><div class='ctx'> int kvaser_usb_can_rx_over_error(struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+extern const struct can_bittiming_const kvaser_usb_flexc_bittiming_const;</div><div class='add'>+</div><div class='add'>+static inline ktime_t kvaser_usb_ticks_to_ktime(const struct kvaser_usb_dev_cfg *cfg,</div><div class='add'>+						u64 ticks)</div><div class='add'>+{</div><div class='add'>+	return ns_to_ktime(div_u64(ticks * 1000, cfg-&gt;timestamp_freq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline ktime_t kvaser_usb_timestamp48_to_ktime(const struct kvaser_usb_dev_cfg *cfg,</div><div class='add'>+						      const __le16 *timestamp)</div><div class='add'>+{</div><div class='add'>+	u64 ticks = le16_to_cpu(timestamp[0]) |</div><div class='add'>+		    (u64)(le16_to_cpu(timestamp[1])) &lt;&lt; 16 |</div><div class='add'>+		    (u64)(le16_to_cpu(timestamp[2])) &lt;&lt; 32;</div><div class='add'>+</div><div class='add'>+	return kvaser_usb_ticks_to_ktime(cfg, ticks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline ktime_t kvaser_usb_timestamp64_to_ktime(const struct kvaser_usb_dev_cfg *cfg,</div><div class='add'>+						      __le64 timestamp)</div><div class='add'>+{</div><div class='add'>+	return kvaser_usb_ticks_to_ktime(cfg, le64_to_cpu(timestamp));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* KVASER_USB_H */</div><div class='head'>diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c<br/>index c89c7d4900d7..62701ec34272 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/if.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -30,165 +31,233 @@</div><div class='ctx'> #include "kvaser_usb.h"</div><div class='ctx'> </div><div class='ctx'> /* Kvaser USB vendor id. */</div><div class='del'>-#define KVASER_VENDOR_ID			0x0bfd</div><div class='add'>+#define KVASER_VENDOR_ID 0x0bfd</div><div class='ctx'> </div><div class='ctx'> /* Kvaser Leaf USB devices product ids */</div><div class='del'>-#define USB_LEAF_DEVEL_PRODUCT_ID		10</div><div class='del'>-#define USB_LEAF_LITE_PRODUCT_ID		11</div><div class='del'>-#define USB_LEAF_PRO_PRODUCT_ID			12</div><div class='del'>-#define USB_LEAF_SPRO_PRODUCT_ID		14</div><div class='del'>-#define USB_LEAF_PRO_LS_PRODUCT_ID		15</div><div class='del'>-#define USB_LEAF_PRO_SWC_PRODUCT_ID		16</div><div class='del'>-#define USB_LEAF_PRO_LIN_PRODUCT_ID		17</div><div class='del'>-#define USB_LEAF_SPRO_LS_PRODUCT_ID		18</div><div class='del'>-#define USB_LEAF_SPRO_SWC_PRODUCT_ID		19</div><div class='del'>-#define USB_MEMO2_DEVEL_PRODUCT_ID		22</div><div class='del'>-#define USB_MEMO2_HSHS_PRODUCT_ID		23</div><div class='del'>-#define USB_UPRO_HSHS_PRODUCT_ID		24</div><div class='del'>-#define USB_LEAF_LITE_GI_PRODUCT_ID		25</div><div class='del'>-#define USB_LEAF_PRO_OBDII_PRODUCT_ID		26</div><div class='del'>-#define USB_MEMO2_HSLS_PRODUCT_ID		27</div><div class='del'>-#define USB_LEAF_LITE_CH_PRODUCT_ID		28</div><div class='del'>-#define USB_BLACKBIRD_SPRO_PRODUCT_ID		29</div><div class='del'>-#define USB_OEM_MERCURY_PRODUCT_ID		34</div><div class='del'>-#define USB_OEM_LEAF_PRODUCT_ID			35</div><div class='del'>-#define USB_CAN_R_PRODUCT_ID			39</div><div class='del'>-#define USB_LEAF_LITE_V2_PRODUCT_ID		288</div><div class='del'>-#define USB_MINI_PCIE_HS_PRODUCT_ID		289</div><div class='del'>-#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID	290</div><div class='del'>-#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID		291</div><div class='del'>-#define USB_MINI_PCIE_2HS_PRODUCT_ID		292</div><div class='add'>+#define USB_LEAF_DEVEL_PRODUCT_ID 0x000a</div><div class='add'>+#define USB_LEAF_LITE_PRODUCT_ID 0x000b</div><div class='add'>+#define USB_LEAF_PRO_PRODUCT_ID 0x000c</div><div class='add'>+#define USB_LEAF_SPRO_PRODUCT_ID 0x000e</div><div class='add'>+#define USB_LEAF_PRO_LS_PRODUCT_ID 0x000f</div><div class='add'>+#define USB_LEAF_PRO_SWC_PRODUCT_ID 0x0010</div><div class='add'>+#define USB_LEAF_PRO_LIN_PRODUCT_ID 0x0011</div><div class='add'>+#define USB_LEAF_SPRO_LS_PRODUCT_ID 0x0012</div><div class='add'>+#define USB_LEAF_SPRO_SWC_PRODUCT_ID 0x0013</div><div class='add'>+#define USB_MEMO2_DEVEL_PRODUCT_ID 0x0016</div><div class='add'>+#define USB_MEMO2_HSHS_PRODUCT_ID 0x0017</div><div class='add'>+#define USB_UPRO_HSHS_PRODUCT_ID 0x0018</div><div class='add'>+#define USB_LEAF_LITE_GI_PRODUCT_ID 0x0019</div><div class='add'>+#define USB_LEAF_PRO_OBDII_PRODUCT_ID 0x001a</div><div class='add'>+#define USB_MEMO2_HSLS_PRODUCT_ID 0x001b</div><div class='add'>+#define USB_LEAF_LITE_CH_PRODUCT_ID 0x001c</div><div class='add'>+#define USB_BLACKBIRD_SPRO_PRODUCT_ID 0x001d</div><div class='add'>+#define USB_OEM_MERCURY_PRODUCT_ID 0x0022</div><div class='add'>+#define USB_OEM_LEAF_PRODUCT_ID 0x0023</div><div class='add'>+#define USB_CAN_R_PRODUCT_ID 0x0027</div><div class='add'>+#define USB_LEAF_LITE_V2_PRODUCT_ID 0x0120</div><div class='add'>+#define USB_MINI_PCIE_HS_PRODUCT_ID 0x0121</div><div class='add'>+#define USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID 0x0122</div><div class='add'>+#define USB_USBCAN_LIGHT_2HS_PRODUCT_ID 0x0123</div><div class='add'>+#define USB_MINI_PCIE_2HS_PRODUCT_ID 0x0124</div><div class='add'>+#define USB_USBCAN_R_V2_PRODUCT_ID 0x0126</div><div class='add'>+#define USB_LEAF_LIGHT_R_V2_PRODUCT_ID 0x0127</div><div class='add'>+#define USB_LEAF_LIGHT_HS_V2_OEM2_PRODUCT_ID 0x0128</div><div class='ctx'> </div><div class='ctx'> /* Kvaser USBCan-II devices product ids */</div><div class='del'>-#define USB_USBCAN_REVB_PRODUCT_ID		2</div><div class='del'>-#define USB_VCI2_PRODUCT_ID			3</div><div class='del'>-#define USB_USBCAN2_PRODUCT_ID			4</div><div class='del'>-#define USB_MEMORATOR_PRODUCT_ID		5</div><div class='add'>+#define USB_USBCAN_REVB_PRODUCT_ID 0x0002</div><div class='add'>+#define USB_VCI2_PRODUCT_ID 0x0003</div><div class='add'>+#define USB_USBCAN2_PRODUCT_ID 0x0004</div><div class='add'>+#define USB_MEMORATOR_PRODUCT_ID 0x0005</div><div class='ctx'> </div><div class='ctx'> /* Kvaser Minihydra USB devices product ids */</div><div class='del'>-#define USB_BLACKBIRD_V2_PRODUCT_ID		258</div><div class='del'>-#define USB_MEMO_PRO_5HS_PRODUCT_ID		260</div><div class='del'>-#define USB_USBCAN_PRO_5HS_PRODUCT_ID		261</div><div class='del'>-#define USB_USBCAN_LIGHT_4HS_PRODUCT_ID		262</div><div class='del'>-#define USB_LEAF_PRO_HS_V2_PRODUCT_ID		263</div><div class='del'>-#define USB_USBCAN_PRO_2HS_V2_PRODUCT_ID	264</div><div class='del'>-#define USB_MEMO_2HS_PRODUCT_ID			265</div><div class='del'>-#define USB_MEMO_PRO_2HS_V2_PRODUCT_ID		266</div><div class='del'>-#define USB_HYBRID_CANLIN_PRODUCT_ID		267</div><div class='del'>-#define USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID	268</div><div class='del'>-#define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID	269</div><div class='del'>-#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID	270</div><div class='del'>-</div><div class='del'>-static inline bool kvaser_is_leaf(const struct usb_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return (id-&gt;idProduct &gt;= USB_LEAF_DEVEL_PRODUCT_ID &amp;&amp;</div><div class='del'>-		id-&gt;idProduct &lt;= USB_CAN_R_PRODUCT_ID) ||</div><div class='del'>-		(id-&gt;idProduct &gt;= USB_LEAF_LITE_V2_PRODUCT_ID &amp;&amp;</div><div class='del'>-		 id-&gt;idProduct &lt;= USB_MINI_PCIE_2HS_PRODUCT_ID);</div><div class='del'>-}</div><div class='add'>+#define USB_BLACKBIRD_V2_PRODUCT_ID 0x0102</div><div class='add'>+#define USB_MEMO_PRO_5HS_PRODUCT_ID 0x0104</div><div class='add'>+#define USB_USBCAN_PRO_5HS_PRODUCT_ID 0x0105</div><div class='add'>+#define USB_USBCAN_LIGHT_4HS_PRODUCT_ID 0x0106</div><div class='add'>+#define USB_LEAF_PRO_HS_V2_PRODUCT_ID 0x0107</div><div class='add'>+#define USB_USBCAN_PRO_2HS_V2_PRODUCT_ID 0x0108</div><div class='add'>+#define USB_MEMO_2HS_PRODUCT_ID 0x0109</div><div class='add'>+#define USB_MEMO_PRO_2HS_V2_PRODUCT_ID 0x010a</div><div class='add'>+#define USB_HYBRID_2CANLIN_PRODUCT_ID 0x010b</div><div class='add'>+#define USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID 0x010c</div><div class='add'>+#define USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID 0x010d</div><div class='add'>+#define USB_HYBRID_PRO_2CANLIN_PRODUCT_ID 0x010e</div><div class='add'>+#define USB_U100_PRODUCT_ID 0x0111</div><div class='add'>+#define USB_U100P_PRODUCT_ID 0x0112</div><div class='add'>+#define USB_U100S_PRODUCT_ID 0x0113</div><div class='add'>+#define USB_USBCAN_PRO_4HS_PRODUCT_ID 0x0114</div><div class='add'>+#define USB_HYBRID_CANLIN_PRODUCT_ID 0x0115</div><div class='add'>+#define USB_HYBRID_PRO_CANLIN_PRODUCT_ID 0x0116</div><div class='add'>+#define USB_LEAF_V3_PRODUCT_ID 0x0117</div><div class='add'>+#define USB_VINING_800_PRODUCT_ID 0x0119</div><div class='add'>+#define USB_USBCAN_PRO_5XCAN_PRODUCT_ID 0x011A</div><div class='add'>+#define USB_MINI_PCIE_1XCAN_PRODUCT_ID 0x011B</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_hydra = {</div><div class='add'>+	.quirks = 0,</div><div class='add'>+	.ops = &amp;kvaser_usb_hydra_dev_ops,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static inline bool kvaser_is_usbcan(const struct usb_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return id-&gt;idProduct &gt;= USB_USBCAN_REVB_PRODUCT_ID &amp;&amp;</div><div class='del'>-	       id-&gt;idProduct &lt;= USB_MEMORATOR_PRODUCT_ID;</div><div class='del'>-}</div><div class='add'>+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_usbcan = {</div><div class='add'>+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |</div><div class='add'>+		  KVASER_USB_QUIRK_HAS_SILENT_MODE,</div><div class='add'>+	.family = KVASER_USBCAN,</div><div class='add'>+	.ops = &amp;kvaser_usb_leaf_dev_ops,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static inline bool kvaser_is_hydra(const struct usb_device_id *id)</div><div class='del'>-{</div><div class='del'>-	return id-&gt;idProduct &gt;= USB_BLACKBIRD_V2_PRODUCT_ID &amp;&amp;</div><div class='del'>-	       id-&gt;idProduct &lt;= USB_HYBRID_PRO_CANLIN_PRODUCT_ID;</div><div class='del'>-}</div><div class='add'>+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf = {</div><div class='add'>+	.quirks = KVASER_USB_QUIRK_IGNORE_CLK_FREQ,</div><div class='add'>+	.family = KVASER_LEAF,</div><div class='add'>+	.ops = &amp;kvaser_usb_leaf_dev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err = {</div><div class='add'>+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |</div><div class='add'>+		  KVASER_USB_QUIRK_IGNORE_CLK_FREQ,</div><div class='add'>+	.family = KVASER_LEAF,</div><div class='add'>+	.ops = &amp;kvaser_usb_leaf_dev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leaf_err_listen = {</div><div class='add'>+	.quirks = KVASER_USB_QUIRK_HAS_TXRX_ERRORS |</div><div class='add'>+		  KVASER_USB_QUIRK_HAS_SILENT_MODE |</div><div class='add'>+		  KVASER_USB_QUIRK_IGNORE_CLK_FREQ,</div><div class='add'>+	.family = KVASER_LEAF,</div><div class='add'>+	.ops = &amp;kvaser_usb_leaf_dev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_driver_info kvaser_usb_driver_info_leafimx = {</div><div class='add'>+	.quirks = 0,</div><div class='add'>+	.family = KVASER_LEAF,</div><div class='add'>+	.ops = &amp;kvaser_usb_leaf_dev_ops,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static const struct usb_device_id kvaser_usb_table[] = {</div><div class='del'>-	/* Leaf USB product IDs */</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID) },</div><div class='add'>+	/* Leaf M32C USB product IDs */</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_DEVEL_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LS_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_SWC_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_LIN_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_LS_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_SPRO_SWC_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_DEVEL_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSHS_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_UPRO_HSHS_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID) },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_GI_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_OBDII_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS |</div><div class='del'>-			       KVASER_USB_HAS_SILENT_MODE },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err_listen },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO2_HSLS_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_CH_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_SPRO_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_MERCURY_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_OEM_LEAF_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_CAN_R_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID) },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leaf_err },</div><div class='add'>+</div><div class='add'>+	/* Leaf i.MX28 USB product IDs */</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LITE_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_2HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_2HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_R_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_R_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_LIGHT_HS_V2_OEM2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_leafimx },</div><div class='ctx'> </div><div class='ctx'> 	/* USBCANII USB product IDs */</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN2_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_usbcan },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_REVB_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_usbcan },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMORATOR_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_usbcan },</div><div class='ctx'> 	{ USB_DEVICE(KVASER_VENDOR_ID, USB_VCI2_PRODUCT_ID),</div><div class='del'>-		.driver_info = KVASER_USB_HAS_TXRX_ERRORS },</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_usbcan },</div><div class='ctx'> </div><div class='ctx'> 	/* Minihydra USB product IDs */</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID) },</div><div class='del'>-	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID) },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_BLACKBIRD_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_5HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_LIGHT_4HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_PRO_HS_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_2HS_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_2HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MEMO_PRO_2HS_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_2CANLIN_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_USBCAN_PRO_2HS_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_ATI_MEMO_PRO_2HS_V2_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_2CANLIN_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_U100_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_U100P_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_U100S_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_4HS_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_CANLIN_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_HYBRID_PRO_CANLIN_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_LEAF_V3_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_VINING_800_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_USBCAN_PRO_5XCAN_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='add'>+	{ USB_DEVICE(KVASER_VENDOR_ID, USB_MINI_PCIE_1XCAN_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;kvaser_usb_driver_info_hydra },</div><div class='ctx'> 	{ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(usb, kvaser_usb_table);</div><div class='ctx'> </div><div class='ctx'> int kvaser_usb_send_cmd(const struct kvaser_usb *dev, void *cmd, int len)</div><div class='ctx'> {</div><div class='del'>-	int actual_len; /* Not used */</div><div class='del'>-</div><div class='ctx'> 	return usb_bulk_msg(dev-&gt;udev,</div><div class='ctx'> 			    usb_sndbulkpipe(dev-&gt;udev,</div><div class='ctx'> 					    dev-&gt;bulk_out-&gt;bEndpointAddress),</div><div class='del'>-			    cmd, len, &amp;actual_len, KVASER_USB_TIMEOUT);</div><div class='add'>+			    cmd, len, NULL, KVASER_USB_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvaser_usb_recv_cmd(const struct kvaser_usb *dev, void *cmd, int len,</div><div class='hunk'>@@ -235,7 +304,7 @@ int kvaser_usb_send_cmd_async(struct kvaser_usb_net_priv *priv, void *cmd,</div><div class='ctx'> 	}</div><div class='ctx'> 	usb_free_urb(urb);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int kvaser_usb_can_rx_over_error(struct net_device *netdev)</div><div class='hunk'>@@ -257,8 +326,6 @@ int kvaser_usb_can_rx_over_error(struct net_device *netdev)</div><div class='ctx'> 	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='ctx'> 	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -267,6 +334,7 @@ int kvaser_usb_can_rx_over_error(struct net_device *netdev)</div><div class='ctx'> static void kvaser_usb_read_bulk_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb *dev = urb-&gt;context;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +351,8 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)</div><div class='ctx'> 		goto resubmit_urb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ops-&gt;dev_read_bulk_callback(dev, urb-&gt;transfer_buffer,</div><div class='del'>-					 urb-&gt;actual_length);</div><div class='add'>+	ops-&gt;dev_read_bulk_callback(dev, urb-&gt;transfer_buffer,</div><div class='add'>+				    urb-&gt;actual_length);</div><div class='ctx'> </div><div class='ctx'> resubmit_urb:</div><div class='ctx'> 	usb_fill_bulk_urb(urb, dev-&gt;udev,</div><div class='hunk'>@@ -296,10 +364,13 @@ resubmit_urb:</div><div class='ctx'> 	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (err == -ENODEV) {</div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;nchannels; i++) {</div><div class='del'>-			if (!dev-&gt;nets[i])</div><div class='add'>+			struct kvaser_usb_net_priv *priv;</div><div class='add'>+</div><div class='add'>+			priv = dev-&gt;nets[i];</div><div class='add'>+			if (!priv)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			netif_device_detach(dev-&gt;nets[i]-&gt;netdev);</div><div class='add'>+			netif_device_detach(priv-&gt;netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (err) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;intf-&gt;dev,</div><div class='hunk'>@@ -378,21 +449,18 @@ static int kvaser_usb_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = open_candev(netdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_setup_rx_urbs(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	err = dev-&gt;ops-&gt;dev_set_opt_mode(priv);</div><div class='add'>+	err = ops-&gt;dev_set_opt_mode(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	err = dev-&gt;ops-&gt;dev_start_chip(priv);</div><div class='add'>+	err = ops-&gt;dev_start_chip(priv);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		netdev_warn(netdev, "Cannot start device, error %d\n", err);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -421,7 +489,7 @@ static void kvaser_usb_reset_tx_urb_contexts(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> /* This method might sleep. Do not call it in the atomic context</div><div class='ctx'>  * of URB completions.</div><div class='ctx'>  */</div><div class='del'>-static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)</div><div class='add'>+void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;priv-&gt;tx_submitted);</div><div class='ctx'> 	kvaser_usb_reset_tx_urb_contexts(priv);</div><div class='hunk'>@@ -449,22 +517,23 @@ static int kvaser_usb_close(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='del'>-	err = dev-&gt;ops-&gt;dev_flush_queue(priv);</div><div class='add'>+	err = ops-&gt;dev_flush_queue(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		netdev_warn(netdev, "Cannot flush queue, error %d\n", err);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ops-&gt;dev_reset_chip) {</div><div class='del'>-		err = dev-&gt;ops-&gt;dev_reset_chip(dev, priv-&gt;channel);</div><div class='add'>+	if (ops-&gt;dev_reset_chip) {</div><div class='add'>+		err = ops-&gt;dev_reset_chip(dev, priv-&gt;channel);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			netdev_warn(netdev, "Cannot reset card, error %d\n",</div><div class='ctx'> 				    err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = dev-&gt;ops-&gt;dev_stop_chip(priv);</div><div class='add'>+	err = ops-&gt;dev_stop_chip(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		netdev_warn(netdev, "Cannot stop device, error %d\n", err);</div><div class='ctx'> </div><div class='hunk'>@@ -477,6 +546,91 @@ static int kvaser_usb_close(struct net_device *netdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvaser_usb_set_bittiming(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='add'>+	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	struct kvaser_usb_busparams busparams;</div><div class='add'>+	int tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1;</div><div class='add'>+	int tseg2 = bt-&gt;phase_seg2;</div><div class='add'>+	int sjw = bt-&gt;sjw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	busparams.bitrate = cpu_to_le32(bt-&gt;bitrate);</div><div class='add'>+	busparams.sjw = (u8)sjw;</div><div class='add'>+	busparams.tseg1 = (u8)tseg1;</div><div class='add'>+	busparams.tseg2 = (u8)tseg2;</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='add'>+		busparams.nsamples = 3;</div><div class='add'>+	else</div><div class='add'>+		busparams.nsamples = 1;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;dev_set_bittiming(netdev, &amp;busparams);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_setup_rx_urbs(priv-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;dev_get_busparams(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		/* Treat EOPNOTSUPP as success */</div><div class='add'>+		if (err == -EOPNOTSUPP)</div><div class='add'>+			err = 0;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;busparams, &amp;priv-&gt;busparams_nominal,</div><div class='add'>+		   sizeof(priv-&gt;busparams_nominal)) != 0)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_set_data_bittiming(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='add'>+	struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	struct kvaser_usb_busparams busparams;</div><div class='add'>+	int tseg1 = dbt-&gt;prop_seg + dbt-&gt;phase_seg1;</div><div class='add'>+	int tseg2 = dbt-&gt;phase_seg2;</div><div class='add'>+	int sjw = dbt-&gt;sjw;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!ops-&gt;dev_set_data_bittiming ||</div><div class='add'>+	    !ops-&gt;dev_get_data_busparams)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	busparams.bitrate = cpu_to_le32(dbt-&gt;bitrate);</div><div class='add'>+	busparams.sjw = (u8)sjw;</div><div class='add'>+	busparams.tseg1 = (u8)tseg1;</div><div class='add'>+	busparams.tseg2 = (u8)tseg2;</div><div class='add'>+	busparams.nsamples = 1;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;dev_set_data_bittiming(netdev, &amp;busparams);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_setup_rx_urbs(priv-&gt;dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ops-&gt;dev_get_data_busparams(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;busparams, &amp;priv-&gt;busparams_data,</div><div class='add'>+		   sizeof(priv-&gt;busparams_data)) != 0)</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kvaser_usb_write_bulk_callback(struct urb *urb)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_tx_urb_context *context = urb-&gt;context;</div><div class='hunk'>@@ -503,6 +657,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='ctx'> 	struct kvaser_usb_tx_urb_context *context = NULL;</div><div class='ctx'> 	struct urb *urb;</div><div class='hunk'>@@ -512,7 +667,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	urb = usb_alloc_urb(0, GFP_ATOMIC);</div><div class='hunk'>@@ -545,8 +700,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		goto freeurb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	buf = dev-&gt;ops-&gt;dev_frame_to_cmd(priv, skb, &amp;context-&gt;dlc, &amp;cmd_len,</div><div class='del'>-					 context-&gt;echo_index);</div><div class='add'>+	buf = ops-&gt;dev_frame_to_cmd(priv, skb, &amp;cmd_len, context-&gt;echo_index);</div><div class='ctx'> 	if (!buf) {</div><div class='ctx'> 		stats-&gt;tx_dropped++;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -562,7 +716,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	context-&gt;priv = priv;</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, netdev, context-&gt;echo_index);</div><div class='add'>+	can_put_echo_skb(skb, netdev, context-&gt;echo_index, 0);</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_bulk_urb(urb, dev-&gt;udev,</div><div class='ctx'> 			  usb_sndbulkpipe(dev-&gt;udev,</div><div class='hunk'>@@ -575,7 +729,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (unlikely(err)) {</div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;tx_contexts_lock, flags);</div><div class='ctx'> </div><div class='del'>-		can_free_echo_skb(netdev, context-&gt;echo_index);</div><div class='add'>+		can_free_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='ctx'> 		context-&gt;echo_index = dev-&gt;max_tx_urbs;</div><div class='ctx'> 		--priv-&gt;active_tx_contexts;</div><div class='ctx'> 		netif_wake_queue(netdev);</div><div class='hunk'>@@ -602,49 +756,88 @@ freeurb:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvaser_usb_set_phys_id(struct net_device *netdev,</div><div class='add'>+				  enum ethtool_phys_id_state state)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = priv-&gt;dev-&gt;driver_info-&gt;ops;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ETHTOOL_ID_ACTIVE:</div><div class='add'>+		return 3; /* 3 On/Off cycles per second */</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_ON:</div><div class='add'>+		return ops-&gt;dev_set_led(priv, KVASER_USB_LED_ON, 1000);</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_OFF:</div><div class='add'>+		return ops-&gt;dev_set_led(priv, KVASER_USB_LED_OFF, 1000);</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_INACTIVE:</div><div class='add'>+		/* Turn LED off and restore standard function after 1ms */</div><div class='add'>+		return ops-&gt;dev_set_led(priv, KVASER_USB_LED_OFF, 1);</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops kvaser_usb_netdev_ops = {</div><div class='ctx'> 	.ndo_open = kvaser_usb_open,</div><div class='ctx'> 	.ndo_stop = kvaser_usb_close,</div><div class='ctx'> 	.ndo_start_xmit = kvaser_usb_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+	.ndo_hwtstamp_get = can_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = can_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops kvaser_usb_ethtool_ops = {</div><div class='add'>+	.get_ts_info = can_ethtool_op_get_ts_info_hwts,</div><div class='add'>+	.set_phys_id = kvaser_usb_set_phys_id,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev)</div><div class='ctx'> {</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = dev-&gt;driver_info-&gt;ops;</div><div class='ctx'> 	int i;</div><div class='add'>+	struct kvaser_usb_net_priv *priv;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;nchannels; i++) {</div><div class='del'>-		if (!dev-&gt;nets[i])</div><div class='add'>+		priv = dev-&gt;nets[i];</div><div class='add'>+		if (!priv)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		unregister_candev(dev-&gt;nets[i]-&gt;netdev);</div><div class='add'>+		unregister_candev(priv-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kvaser_usb_unlink_all_urbs(dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;nchannels; i++) {</div><div class='del'>-		if (!dev-&gt;nets[i])</div><div class='add'>+		priv = dev-&gt;nets[i];</div><div class='add'>+		if (!priv)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		free_candev(dev-&gt;nets[i]-&gt;netdev);</div><div class='add'>+		if (ops-&gt;dev_remove_channel)</div><div class='add'>+			ops-&gt;dev_remove_channel(priv);</div><div class='add'>+</div><div class='add'>+		kvaser_usb_devlink_port_unregister(priv);</div><div class='add'>+		free_candev(priv-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvaser_usb_init_one(struct kvaser_usb *dev,</div><div class='del'>-			       const struct usb_device_id *id, int channel)</div><div class='add'>+static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv;</div><div class='add'>+	const struct kvaser_usb_driver_info *driver_info = dev-&gt;driver_info;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops = driver_info-&gt;ops;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ops-&gt;dev_reset_chip) {</div><div class='del'>-		err = dev-&gt;ops-&gt;dev_reset_chip(dev, channel);</div><div class='add'>+	if (ops-&gt;dev_reset_chip) {</div><div class='add'>+		err = ops-&gt;dev_reset_chip(dev, channel);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev = alloc_candev(sizeof(*priv) +</div><div class='del'>-			      dev-&gt;max_tx_urbs * sizeof(*priv-&gt;tx_contexts),</div><div class='add'>+	netdev = alloc_candev(struct_size(priv, tx_contexts, dev-&gt;max_tx_urbs),</div><div class='ctx'> 			      dev-&gt;max_tx_urbs);</div><div class='ctx'> 	if (!netdev) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;intf-&gt;dev, "Cannot alloc candev\n");</div><div class='hunk'>@@ -656,7 +849,10 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev,</div><div class='ctx'> 	init_usb_anchor(&amp;priv-&gt;tx_submitted);</div><div class='ctx'> 	init_completion(&amp;priv-&gt;start_comp);</div><div class='ctx'> 	init_completion(&amp;priv-&gt;stop_comp);</div><div class='del'>-	priv-&gt;can.ctrlmode_supported = 0;</div><div class='add'>+	init_completion(&amp;priv-&gt;flush_comp);</div><div class='add'>+	init_completion(&amp;priv-&gt;get_busparams_comp);</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_CC_LEN8_DLC |</div><div class='add'>+				       CAN_CTRLMODE_BERR_REPORTING;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> 	priv-&gt;netdev = netdev;</div><div class='hunk'>@@ -668,76 +864,88 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev,</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='ctx'> 	priv-&gt;can.clock.freq = dev-&gt;cfg-&gt;clock.freq;</div><div class='ctx'> 	priv-&gt;can.bittiming_const = dev-&gt;cfg-&gt;bittiming_const;</div><div class='del'>-	priv-&gt;can.do_set_bittiming = dev-&gt;ops-&gt;dev_set_bittiming;</div><div class='del'>-	priv-&gt;can.do_set_mode = dev-&gt;ops-&gt;dev_set_mode;</div><div class='del'>-	if ((id-&gt;driver_info &amp; KVASER_USB_HAS_TXRX_ERRORS) ||</div><div class='add'>+	priv-&gt;can.do_set_bittiming = kvaser_usb_set_bittiming;</div><div class='add'>+	priv-&gt;can.do_set_mode = ops-&gt;dev_set_mode;</div><div class='add'>+	if ((driver_info-&gt;quirks &amp; KVASER_USB_QUIRK_HAS_TXRX_ERRORS) ||</div><div class='ctx'> 	    (priv-&gt;dev-&gt;card_data.capabilities &amp; KVASER_USB_CAP_BERR_CAP))</div><div class='del'>-		priv-&gt;can.do_get_berr_counter = dev-&gt;ops-&gt;dev_get_berr_counter;</div><div class='del'>-	if (id-&gt;driver_info &amp; KVASER_USB_HAS_SILENT_MODE)</div><div class='add'>+		priv-&gt;can.do_get_berr_counter = ops-&gt;dev_get_berr_counter;</div><div class='add'>+	if (driver_info-&gt;quirks &amp; KVASER_USB_QUIRK_HAS_SILENT_MODE)</div><div class='ctx'> 		priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_LISTENONLY;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported |= dev-&gt;card_data.ctrlmode_supported;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;can.ctrlmode_supported &amp; CAN_CTRLMODE_FD) {</div><div class='del'>-		priv-&gt;can.data_bittiming_const = dev-&gt;cfg-&gt;data_bittiming_const;</div><div class='del'>-		priv-&gt;can.do_set_data_bittiming =</div><div class='del'>-					dev-&gt;ops-&gt;dev_set_data_bittiming;</div><div class='add'>+		priv-&gt;can.fd.data_bittiming_const = dev-&gt;cfg-&gt;data_bittiming_const;</div><div class='add'>+		priv-&gt;can.fd.do_set_data_bittiming = kvaser_usb_set_data_bittiming;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;kvaser_usb_netdev_ops;</div><div class='del'>-</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;kvaser_usb_ethtool_ops;</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;dev-&gt;intf-&gt;dev);</div><div class='ctx'> 	netdev-&gt;dev_id = channel;</div><div class='add'>+	netdev-&gt;dev_port = channel;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;nets[channel] = priv;</div><div class='ctx'> </div><div class='add'>+	if (ops-&gt;dev_init_channel) {</div><div class='add'>+		err = ops-&gt;dev_init_channel(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			goto candev_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_devlink_port_register(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;dev-&gt;intf-&gt;dev, "Failed to register devlink port\n");</div><div class='add'>+		goto candev_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = register_candev(netdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;intf-&gt;dev, "Failed to register CAN device\n");</div><div class='del'>-		free_candev(netdev);</div><div class='del'>-		dev-&gt;nets[channel] = NULL;</div><div class='del'>-		return err;</div><div class='add'>+		goto unregister_devlink_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(netdev, "device registered\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+unregister_devlink_port:</div><div class='add'>+	kvaser_usb_devlink_port_unregister(priv);</div><div class='add'>+candev_free:</div><div class='add'>+	free_candev(netdev);</div><div class='add'>+	dev-&gt;nets[channel] = NULL;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvaser_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 			    const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb *dev;</div><div class='add'>+	struct devlink *devlink;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='add'>+	const struct kvaser_usb_driver_info *driver_info;</div><div class='add'>+	const struct kvaser_usb_dev_ops *ops;</div><div class='ctx'> </div><div class='del'>-	dev = devm_kzalloc(&amp;intf-&gt;dev, sizeof(*dev), GFP_KERNEL);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (kvaser_is_leaf(id)) {</div><div class='del'>-		dev-&gt;card_data.leaf.family = KVASER_LEAF;</div><div class='del'>-		dev-&gt;ops = &amp;kvaser_usb_leaf_dev_ops;</div><div class='del'>-	} else if (kvaser_is_usbcan(id)) {</div><div class='del'>-		dev-&gt;card_data.leaf.family = KVASER_USBCAN;</div><div class='del'>-		dev-&gt;ops = &amp;kvaser_usb_leaf_dev_ops;</div><div class='del'>-	} else if (kvaser_is_hydra(id)) {</div><div class='del'>-		dev-&gt;ops = &amp;kvaser_usb_hydra_dev_ops;</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Product ID (%d) is not a supported Kvaser USB device\n",</div><div class='del'>-			id-&gt;idProduct);</div><div class='add'>+	driver_info = (const struct kvaser_usb_driver_info *)id-&gt;driver_info;</div><div class='add'>+	if (!driver_info)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	devlink = devlink_alloc(&amp;kvaser_usb_devlink_ops, sizeof(*dev), &amp;intf-&gt;dev);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = devlink_priv(devlink);</div><div class='ctx'> 	dev-&gt;intf = intf;</div><div class='add'>+	dev-&gt;driver_info = driver_info;</div><div class='add'>+	ops = driver_info-&gt;ops;</div><div class='ctx'> </div><div class='del'>-	err = dev-&gt;ops-&gt;dev_setup_endpoints(dev);</div><div class='add'>+	err = ops-&gt;dev_setup_endpoints(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "Cannot get usb endpoint(s)");</div><div class='del'>-		return err;</div><div class='add'>+		dev_err_probe(&amp;intf-&gt;dev, err, "Cannot get usb endpoint(s)");</div><div class='add'>+		goto free_devlink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;udev = interface_to_usbdev(intf);</div><div class='hunk'>@@ -748,64 +956,67 @@ static int kvaser_usb_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;card_data.ctrlmode_supported = 0;</div><div class='ctx'> 	dev-&gt;card_data.capabilities = 0;</div><div class='del'>-	err = dev-&gt;ops-&gt;dev_init_card(dev);</div><div class='add'>+	err = ops-&gt;dev_init_card(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Failed to initialize card, error %d\n", err);</div><div class='del'>-		return err;</div><div class='add'>+		dev_err_probe(&amp;intf-&gt;dev, err,</div><div class='add'>+			      "Failed to initialize card\n");</div><div class='add'>+		goto free_devlink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = dev-&gt;ops-&gt;dev_get_software_info(dev);</div><div class='add'>+	err = ops-&gt;dev_get_software_info(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev,</div><div class='del'>-			"Cannot get software info, error %d\n", err);</div><div class='del'>-		return err;</div><div class='add'>+		dev_err_probe(&amp;intf-&gt;dev, err,</div><div class='add'>+			      "Cannot get software info\n");</div><div class='add'>+		goto free_devlink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ops-&gt;dev_get_software_details) {</div><div class='del'>-		err = dev-&gt;ops-&gt;dev_get_software_details(dev);</div><div class='add'>+	if (ops-&gt;dev_get_software_details) {</div><div class='add'>+		err = ops-&gt;dev_get_software_details(dev);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			dev_err(&amp;intf-&gt;dev,</div><div class='del'>-				"Cannot get software details, error %d\n", err);</div><div class='del'>-			return err;</div><div class='add'>+			dev_err_probe(&amp;intf-&gt;dev, err,</div><div class='add'>+				      "Cannot get software details\n");</div><div class='add'>+			goto free_devlink;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (WARN_ON(!dev-&gt;cfg))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;intf-&gt;dev, "Firmware version: %d.%d.%d\n",</div><div class='del'>-		((dev-&gt;fw_version &gt;&gt; 24) &amp; 0xff),</div><div class='del'>-		((dev-&gt;fw_version &gt;&gt; 16) &amp; 0xff),</div><div class='del'>-		(dev-&gt;fw_version &amp; 0xffff));</div><div class='add'>+	if (WARN_ON(!dev-&gt;cfg)) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto free_devlink;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;intf-&gt;dev, "Max outstanding tx = %d URBs\n", dev-&gt;max_tx_urbs);</div><div class='ctx'> </div><div class='del'>-	err = dev-&gt;ops-&gt;dev_get_card_info(dev);</div><div class='add'>+	err = ops-&gt;dev_get_card_info(dev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(&amp;intf-&gt;dev, "Cannot get card info, error %d\n", err);</div><div class='del'>-		return err;</div><div class='add'>+		dev_err_probe(&amp;intf-&gt;dev, err,</div><div class='add'>+			      "Cannot get card info\n");</div><div class='add'>+		goto free_devlink;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;ops-&gt;dev_get_capabilities) {</div><div class='del'>-		err = dev-&gt;ops-&gt;dev_get_capabilities(dev);</div><div class='add'>+	if (ops-&gt;dev_get_capabilities) {</div><div class='add'>+		err = ops-&gt;dev_get_capabilities(dev);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			dev_err(&amp;intf-&gt;dev,</div><div class='del'>-				"Cannot get capabilities, error %d\n", err);</div><div class='del'>-			kvaser_usb_remove_interfaces(dev);</div><div class='del'>-			return err;</div><div class='add'>+			dev_err_probe(&amp;intf-&gt;dev, err,</div><div class='add'>+				      "Cannot get capabilities\n");</div><div class='add'>+			goto remove_interfaces;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;nchannels; i++) {</div><div class='del'>-		err = kvaser_usb_init_one(dev, id, i);</div><div class='del'>-		if (err) {</div><div class='del'>-			kvaser_usb_remove_interfaces(dev);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='add'>+		err = kvaser_usb_init_one(dev, i);</div><div class='add'>+		if (err)</div><div class='add'>+			goto remove_interfaces;</div><div class='ctx'> 	}</div><div class='add'>+	devlink_register(devlink);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+remove_interfaces:</div><div class='add'>+	kvaser_usb_remove_interfaces(dev);</div><div class='add'>+free_devlink:</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvaser_usb_disconnect(struct usb_interface *intf)</div><div class='hunk'>@@ -818,10 +1029,12 @@ static void kvaser_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	kvaser_usb_remove_interfaces(dev);</div><div class='add'>+	devlink_unregister(priv_to_devlink(dev));</div><div class='add'>+	devlink_free(priv_to_devlink(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver kvaser_usb_driver = {</div><div class='del'>-	.name = "kvaser_usb",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.probe = kvaser_usb_probe,</div><div class='ctx'> 	.disconnect = kvaser_usb_disconnect,</div><div class='ctx'> 	.id_table = kvaser_usb_table,</div><div class='head'>diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c<br/>new file mode 100644<br/>index 000000000000..e838b82298ae<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/kvaser_usb/kvaser_usb_devlink.c</a></div><div class='hunk'>@@ -0,0 +1,87 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* kvaser_usb devlink functions</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 KVASER AB, Sweden. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#include "kvaser_usb.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#define KVASER_USB_EAN_MSB 0x00073301</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_devlink_info_get(struct devlink *devlink,</div><div class='add'>+				       struct devlink_info_req *req,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb *dev = devlink_priv(devlink);</div><div class='add'>+	char buf[] = "73301XXXXXXXXXX";</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;serial_number) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%u", dev-&gt;serial_number);</div><div class='add'>+		ret = devlink_info_serial_number_put(req, buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;fw_version.major) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%u.%u.%u",</div><div class='add'>+			 dev-&gt;fw_version.major,</div><div class='add'>+			 dev-&gt;fw_version.minor,</div><div class='add'>+			 dev-&gt;fw_version.build);</div><div class='add'>+		ret = devlink_info_version_running_put(req,</div><div class='add'>+						       DEVLINK_INFO_VERSION_GENERIC_FW,</div><div class='add'>+						       buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;hw_revision) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%u", dev-&gt;hw_revision);</div><div class='add'>+		ret = devlink_info_version_fixed_put(req,</div><div class='add'>+						     DEVLINK_INFO_VERSION_GENERIC_BOARD_REV,</div><div class='add'>+						     buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ean[1] == KVASER_USB_EAN_MSB) {</div><div class='add'>+		snprintf(buf, sizeof(buf), "%x%08x", dev-&gt;ean[1], dev-&gt;ean[0]);</div><div class='add'>+		ret = devlink_info_version_fixed_put(req,</div><div class='add'>+						     DEVLINK_INFO_VERSION_GENERIC_BOARD_ID,</div><div class='add'>+						     buf);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct devlink_ops kvaser_usb_devlink_ops = {</div><div class='add'>+	.info_get = kvaser_usb_devlink_info_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int kvaser_usb_devlink_port_register(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	struct devlink_port_attrs attrs = {</div><div class='add'>+		.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='add'>+		.phys.port_number = priv-&gt;channel,</div><div class='add'>+	};</div><div class='add'>+	devlink_port_attrs_set(&amp;priv-&gt;devlink_port, &amp;attrs);</div><div class='add'>+</div><div class='add'>+	ret = devlink_port_register(priv_to_devlink(priv-&gt;dev),</div><div class='add'>+				    &amp;priv-&gt;devlink_port, priv-&gt;channel);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEVLINK_PORT(priv-&gt;netdev, &amp;priv-&gt;devlink_port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void kvaser_usb_devlink_port_unregister(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	devlink_port_unregister(&amp;priv-&gt;devlink_port);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c<br/>index 5fc0be564274..a59f20dad692 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c</a></div><div class='hunk'>@@ -10,9 +10,9 @@</div><div class='ctx'>  *  - Transition from CAN_STATE_ERROR_WARNING to CAN_STATE_ERROR_ACTIVE is only</div><div class='ctx'>  *    reported after a call to do_get_berr_counter(), since firmware does not</div><div class='ctx'>  *    distinguish between ERROR_WARNING and ERROR_ACTIVE.</div><div class='del'>- *  - Hardware timestamps are not set for CAN Tx frames.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='hunk'>@@ -34,6 +35,7 @@</div><div class='ctx'> /* Forward declarations */</div><div class='ctx'> static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan;</div><div class='ctx'> static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc;</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt;</div><div class='ctx'> </div><div class='ctx'> #define KVASER_USB_HYDRA_BULK_EP_IN_ADDR	0x82</div><div class='ctx'> #define KVASER_USB_HYDRA_BULK_EP_OUT_ADDR	0x02</div><div class='hunk'>@@ -43,6 +45,8 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc;</div><div class='ctx'> </div><div class='ctx'> /* Minihydra command IDs */</div><div class='ctx'> #define CMD_SET_BUSPARAMS_REQ			16</div><div class='add'>+#define CMD_GET_BUSPARAMS_REQ			17</div><div class='add'>+#define CMD_GET_BUSPARAMS_RESP			18</div><div class='ctx'> #define CMD_GET_CHIP_STATE_REQ			19</div><div class='ctx'> #define CMD_CHIP_STATE_EVENT			20</div><div class='ctx'> #define CMD_SET_DRIVERMODE_REQ			21</div><div class='hunk'>@@ -64,6 +68,8 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc;</div><div class='ctx'> #define CMD_SET_BUSPARAMS_RESP			85</div><div class='ctx'> #define CMD_GET_CAPABILITIES_REQ		95</div><div class='ctx'> #define CMD_GET_CAPABILITIES_RESP		96</div><div class='add'>+#define CMD_LED_ACTION_REQ			101</div><div class='add'>+#define CMD_LED_ACTION_RESP			102</div><div class='ctx'> #define CMD_RX_MESSAGE				106</div><div class='ctx'> #define CMD_MAP_CHANNEL_REQ			200</div><div class='ctx'> #define CMD_MAP_CHANNEL_RESP			201</div><div class='hunk'>@@ -108,7 +114,7 @@ struct kvaser_cmd_card_info {</div><div class='ctx'> 	__le32 clock_res;</div><div class='ctx'> 	__le32 mfg_date;</div><div class='ctx'> 	__le32 ean[2];</div><div class='del'>-	u8 hw_version;</div><div class='add'>+	u8 hw_revision;</div><div class='ctx'> 	u8 usb_mode;</div><div class='ctx'> 	u8 hw_type;</div><div class='ctx'> 	u8 reserved0;</div><div class='hunk'>@@ -135,6 +141,7 @@ struct kvaser_cmd_sw_detail_req {</div><div class='ctx'> #define KVASER_USB_HYDRA_SW_FLAG_CANFD		BIT(10)</div><div class='ctx'> #define KVASER_USB_HYDRA_SW_FLAG_NONISO		BIT(11)</div><div class='ctx'> #define KVASER_USB_HYDRA_SW_FLAG_EXT_CAP	BIT(12)</div><div class='add'>+#define KVASER_USB_HYDRA_SW_FLAG_CAN_FREQ_80M	BIT(13)</div><div class='ctx'> struct kvaser_cmd_sw_detail_res {</div><div class='ctx'> 	__le32 sw_flags;</div><div class='ctx'> 	__le32 sw_version;</div><div class='hunk'>@@ -193,21 +200,42 @@ struct kvaser_cmd_chip_state_event {</div><div class='ctx'> #define KVASER_USB_HYDRA_BUS_MODE_CANFD_ISO	0x01</div><div class='ctx'> #define KVASER_USB_HYDRA_BUS_MODE_NONISO	0x02</div><div class='ctx'> struct kvaser_cmd_set_busparams {</div><div class='del'>-	__le32 bitrate;</div><div class='del'>-	u8 tseg1;</div><div class='del'>-	u8 tseg2;</div><div class='del'>-	u8 sjw;</div><div class='del'>-	u8 nsamples;</div><div class='add'>+	struct kvaser_usb_busparams busparams_nominal;</div><div class='ctx'> 	u8 reserved0[4];</div><div class='del'>-	__le32 bitrate_d;</div><div class='del'>-	u8 tseg1_d;</div><div class='del'>-	u8 tseg2_d;</div><div class='del'>-	u8 sjw_d;</div><div class='del'>-	u8 nsamples_d;</div><div class='add'>+	struct kvaser_usb_busparams busparams_data;</div><div class='ctx'> 	u8 canfd_mode;</div><div class='ctx'> 	u8 reserved1[7];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* Busparam type */</div><div class='add'>+#define KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN	0x00</div><div class='add'>+#define KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD	0x01</div><div class='add'>+struct kvaser_cmd_get_busparams_req {</div><div class='add'>+	u8 type;</div><div class='add'>+	u8 reserved[27];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct kvaser_cmd_get_busparams_res {</div><div class='add'>+	struct kvaser_usb_busparams busparams;</div><div class='add'>+	u8 reserved[20];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* The device has two LEDs per CAN channel</div><div class='add'>+ * The LSB of action field controls the state:</div><div class='add'>+ *   0 = ON</div><div class='add'>+ *   1 = OFF</div><div class='add'>+ * The remaining bits of action field is the LED index</div><div class='add'>+ */</div><div class='add'>+#define KVASER_USB_HYDRA_LED_IDX_MASK GENMASK(31, 1)</div><div class='add'>+#define KVASER_USB_HYDRA_LED_YELLOW_CH0_IDX 3</div><div class='add'>+#define KVASER_USB_HYDRA_LEDS_PER_CHANNEL 2</div><div class='add'>+struct kvaser_cmd_led_action_req {</div><div class='add'>+	u8 action;</div><div class='add'>+	u8 padding;</div><div class='add'>+	__le16 duration_ms;</div><div class='add'>+	u8 reserved[24];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> /* Ctrl modes */</div><div class='ctx'> #define KVASER_USB_HYDRA_CTRLMODE_NORMAL	0x01</div><div class='ctx'> #define KVASER_USB_HYDRA_CTRLMODE_LISTEN	0x02</div><div class='hunk'>@@ -251,6 +279,15 @@ struct kvaser_cmd_tx_can {</div><div class='ctx'> 	u8 reserved[11];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct kvaser_cmd_tx_ack {</div><div class='add'>+	__le32 id;</div><div class='add'>+	u8 data[8];</div><div class='add'>+	u8 dlc;</div><div class='add'>+	u8 flags;</div><div class='add'>+	__le16 timestamp[3];</div><div class='add'>+	u8 reserved0[8];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct kvaser_cmd_header {</div><div class='ctx'> 	u8 cmd_no;</div><div class='ctx'> 	/* The destination HE address is stored in 0..5 of he_addr.</div><div class='hunk'>@@ -278,6 +315,10 @@ struct kvaser_cmd {</div><div class='ctx'> 		struct kvaser_cmd_error_event error_event;</div><div class='ctx'> </div><div class='ctx'> 		struct kvaser_cmd_set_busparams set_busparams_req;</div><div class='add'>+		struct kvaser_cmd_get_busparams_req get_busparams_req;</div><div class='add'>+		struct kvaser_cmd_get_busparams_res get_busparams_res;</div><div class='add'>+</div><div class='add'>+		struct kvaser_cmd_led_action_req led_action_req;</div><div class='ctx'> </div><div class='ctx'> 		struct kvaser_cmd_chip_state_event chip_state_event;</div><div class='ctx'> </div><div class='hunk'>@@ -285,6 +326,7 @@ struct kvaser_cmd {</div><div class='ctx'> </div><div class='ctx'> 		struct kvaser_cmd_rx_can rx_can;</div><div class='ctx'> 		struct kvaser_cmd_tx_can tx_can;</div><div class='add'>+		struct kvaser_cmd_tx_ack tx_ack;</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='hunk'>@@ -293,6 +335,7 @@ struct kvaser_cmd {</div><div class='ctx'> #define KVASER_USB_HYDRA_CF_FLAG_OVERRUN	BIT(1)</div><div class='ctx'> #define KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME	BIT(4)</div><div class='ctx'> #define KVASER_USB_HYDRA_CF_FLAG_EXTENDED_ID	BIT(5)</div><div class='add'>+#define KVASER_USB_HYDRA_CF_FLAG_TX_ACK		BIT(6)</div><div class='ctx'> /* CAN frame flags. Used in ext_rx_can and ext_tx_can */</div><div class='ctx'> #define KVASER_USB_HYDRA_CF_FLAG_OSM_NACK	BIT(12)</div><div class='ctx'> #define KVASER_USB_HYDRA_CF_FLAG_ABL		BIT(13)</div><div class='hunk'>@@ -359,6 +402,10 @@ struct kvaser_cmd_ext {</div><div class='ctx'> 	} __packed;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+struct kvaser_usb_net_hydra_priv {</div><div class='add'>+	int pending_get_busparams_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct can_bittiming_const kvaser_usb_hydra_kcan_bittiming_c = {</div><div class='ctx'> 	.name = "kvaser_usb_kcan",</div><div class='ctx'> 	.tseg1_min = 1,</div><div class='hunk'>@@ -367,11 +414,11 @@ static const struct can_bittiming_const kvaser_usb_hydra_kcan_bittiming_c = {</div><div class='ctx'> 	.tseg2_max = 32,</div><div class='ctx'> 	.sjw_max = 16,</div><div class='ctx'> 	.brp_min = 1,</div><div class='del'>-	.brp_max = 4096,</div><div class='add'>+	.brp_max = 8192,</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct can_bittiming_const kvaser_usb_hydra_flexc_bittiming_c = {</div><div class='add'>+const struct can_bittiming_const kvaser_usb_flexc_bittiming_const = {</div><div class='ctx'> 	.name = "kvaser_usb_flex",</div><div class='ctx'> 	.tseg1_min = 4,</div><div class='ctx'> 	.tseg1_max = 16,</div><div class='hunk'>@@ -383,6 +430,30 @@ static const struct can_bittiming_const kvaser_usb_hydra_flexc_bittiming_c = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct can_bittiming_const kvaser_usb_hydra_rt_bittiming_c = {</div><div class='add'>+	.name = "kvaser_usb_rt",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 96,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 32,</div><div class='add'>+	.sjw_max = 32,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const kvaser_usb_hydra_rtd_bittiming_c = {</div><div class='add'>+	.name = "kvaser_usb_rt",</div><div class='add'>+	.tseg1_min = 2,</div><div class='add'>+	.tseg1_max = 39,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 8,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 1024,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define KVASER_USB_HYDRA_TRANSID_BITS		12</div><div class='ctx'> #define KVASER_USB_HYDRA_TRANSID_MASK \</div><div class='ctx'> 				GENMASK(KVASER_USB_HYDRA_TRANSID_BITS - 1, 0)</div><div class='hunk'>@@ -481,36 +552,40 @@ kvaser_usb_hydra_net_priv_from_cmd(const struct kvaser_usb *dev,</div><div class='ctx'> 	return priv;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static ktime_t</div><div class='del'>-kvaser_usb_hydra_ktime_from_rx_cmd(const struct kvaser_usb_dev_cfg *cfg,</div><div class='del'>-				   const struct kvaser_cmd *cmd)</div><div class='add'>+static ktime_t kvaser_usb_hydra_ktime_from_cmd(const struct kvaser_usb_dev_cfg *cfg,</div><div class='add'>+					       const struct kvaser_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	u64 ticks;</div><div class='add'>+	ktime_t hwtstamp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;header.cmd_no == CMD_EXTENDED) {</div><div class='ctx'> 		struct kvaser_cmd_ext *cmd_ext = (struct kvaser_cmd_ext *)cmd;</div><div class='ctx'> </div><div class='del'>-		ticks = le64_to_cpu(cmd_ext-&gt;rx_can.timestamp);</div><div class='del'>-	} else {</div><div class='del'>-		ticks = le16_to_cpu(cmd-&gt;rx_can.timestamp[0]);</div><div class='del'>-		ticks += (u64)(le16_to_cpu(cmd-&gt;rx_can.timestamp[1])) &lt;&lt; 16;</div><div class='del'>-		ticks += (u64)(le16_to_cpu(cmd-&gt;rx_can.timestamp[2])) &lt;&lt; 32;</div><div class='add'>+		if (cmd_ext-&gt;cmd_no_ext == CMD_RX_MESSAGE_FD)</div><div class='add'>+			hwtstamp = kvaser_usb_timestamp64_to_ktime(cfg, cmd_ext-&gt;rx_can.timestamp);</div><div class='add'>+		else if (cmd_ext-&gt;cmd_no_ext == CMD_TX_ACKNOWLEDGE_FD)</div><div class='add'>+			hwtstamp = kvaser_usb_timestamp64_to_ktime(cfg, cmd_ext-&gt;tx_ack.timestamp);</div><div class='add'>+	} else if (cmd-&gt;header.cmd_no == CMD_RX_MESSAGE) {</div><div class='add'>+		hwtstamp = kvaser_usb_timestamp48_to_ktime(cfg, cmd-&gt;rx_can.timestamp);</div><div class='add'>+	} else if (cmd-&gt;header.cmd_no == CMD_TX_ACKNOWLEDGE) {</div><div class='add'>+		hwtstamp = kvaser_usb_timestamp48_to_ktime(cfg, cmd-&gt;tx_ack.timestamp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ns_to_ktime(div_u64(ticks * 1000, cfg-&gt;timestamp_freq));</div><div class='add'>+	return hwtstamp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev,</div><div class='ctx'> 					    u8 cmd_no, int channel)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = cmd_no;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='ctx'> 	if (channel &lt; 0) {</div><div class='ctx'> 		kvaser_usb_hydra_set_cmd_dest_he</div><div class='ctx'> 				(cmd, KVASER_USB_HYDRA_HE_ADDRESS_ILLEGAL);</div><div class='hunk'>@@ -527,7 +602,7 @@ static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev,</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='ctx'> 				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='hunk'>@@ -543,21 +618,22 @@ kvaser_usb_hydra_send_simple_cmd_async(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_ATOMIC);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = cmd_no;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='ctx'> </div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_dest_he</div><div class='ctx'> 		(cmd, dev-&gt;card_data.hydra.channel_to_he[priv-&gt;channel]);</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='ctx'> 				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd_async(priv, cmd,</div><div class='del'>-					kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd_async(priv, cmd, cmd_len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		kfree(cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -666,7 +742,7 @@ static int kvaser_usb_hydra_map_channel(struct kvaser_usb *dev, u16 transid,</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -701,24 +777,26 @@ static int kvaser_usb_hydra_get_single_capability(struct kvaser_usb *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_dev_card_data *card_data = &amp;dev-&gt;card_data;</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	u32 value = 0;</div><div class='ctx'> 	u32 mask = 0;</div><div class='ctx'> 	u16 cap_cmd_res;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = CMD_GET_CAPABILITIES_REQ;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='ctx'> 	cmd-&gt;cap_req.cap_cmd = cpu_to_le16(cap_cmd_req);</div><div class='ctx'> </div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_dest_he(cmd, card_data-&gt;hydra.sysdbg_he);</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='ctx'> 				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='hunk'>@@ -812,6 +890,39 @@ static void kvaser_usb_hydra_flush_queue_reply(const struct kvaser_usb *dev,</div><div class='ctx'> 	complete(&amp;priv-&gt;flush_comp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvaser_usb_hydra_get_busparams_reply(const struct kvaser_usb *dev,</div><div class='add'>+						 const struct kvaser_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_priv *priv;</div><div class='add'>+	struct kvaser_usb_net_hydra_priv *hydra;</div><div class='add'>+</div><div class='add'>+	priv = kvaser_usb_hydra_net_priv_from_cmd(dev, cmd);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hydra = priv-&gt;sub_priv;</div><div class='add'>+	if (!hydra)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (hydra-&gt;pending_get_busparams_type) {</div><div class='add'>+	case KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN:</div><div class='add'>+		memcpy(&amp;priv-&gt;busparams_nominal, &amp;cmd-&gt;get_busparams_res.busparams,</div><div class='add'>+		       sizeof(priv-&gt;busparams_nominal));</div><div class='add'>+		break;</div><div class='add'>+	case KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD:</div><div class='add'>+		memcpy(&amp;priv-&gt;busparams_data, &amp;cmd-&gt;get_busparams_res.busparams,</div><div class='add'>+		       sizeof(priv-&gt;busparams_nominal));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(&amp;dev-&gt;intf-&gt;dev, "Unknown get_busparams_type %d\n",</div><div class='add'>+			 hydra-&gt;pending_get_busparams_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	hydra-&gt;pending_get_busparams_type = -1;</div><div class='add'>+</div><div class='add'>+	complete(&amp;priv-&gt;get_busparams_comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> kvaser_usb_hydra_bus_status_to_can_state(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 					 u8 bus_status,</div><div class='hunk'>@@ -836,6 +947,42 @@ kvaser_usb_hydra_bus_status_to_can_state(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvaser_usb_hydra_change_state(struct kvaser_usb_net_priv *priv,</div><div class='add'>+					  const struct can_berr_counter *bec,</div><div class='add'>+					  struct can_frame *cf,</div><div class='add'>+					  enum can_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	enum can_state old_state = priv-&gt;can.state;</div><div class='add'>+	enum can_state tx_state, rx_state;</div><div class='add'>+</div><div class='add'>+	tx_state = (bec-&gt;txerr &gt;= bec-&gt;rxerr) ?</div><div class='add'>+				new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	rx_state = (bec-&gt;txerr &lt;= bec-&gt;rxerr) ?</div><div class='add'>+				new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	can_change_state(netdev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF &amp;&amp; old_state &lt; CAN_STATE_BUS_OFF) {</div><div class='add'>+		if (priv-&gt;can.restart_ms == 0)</div><div class='add'>+			kvaser_usb_hydra_send_simple_cmd_async(priv, CMD_STOP_CHIP_REQ);</div><div class='add'>+</div><div class='add'>+		can_bus_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.restart_ms &amp;&amp;</div><div class='add'>+	    old_state &gt;= CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+	    new_state &lt; CAN_STATE_BUS_OFF) {</div><div class='add'>+		priv-&gt;can.can_stats.restarts++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='add'>+	}</div><div class='add'>+	if (cf &amp;&amp; new_state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec-&gt;txerr;</div><div class='add'>+		cf-&gt;data[7] = bec-&gt;rxerr;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kvaser_usb_hydra_update_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 					  u8 bus_status,</div><div class='ctx'> 					  const struct can_berr_counter *bec)</div><div class='hunk'>@@ -843,7 +990,6 @@ static void kvaser_usb_hydra_update_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	struct net_device *netdev = priv-&gt;netdev;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct net_device_stats *stats;</div><div class='ctx'> 	enum can_state new_state, old_state;</div><div class='ctx'> </div><div class='ctx'> 	old_state = priv-&gt;can.state;</div><div class='hunk'>@@ -862,41 +1008,11 @@ static void kvaser_usb_hydra_update_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='del'>-	if (skb) {</div><div class='del'>-		enum can_state tx_state, rx_state;</div><div class='del'>-</div><div class='del'>-		tx_state = (bec-&gt;txerr &gt;= bec-&gt;rxerr) ?</div><div class='del'>-					new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-		rx_state = (bec-&gt;txerr &lt;= bec-&gt;rxerr) ?</div><div class='del'>-					new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-		can_change_state(netdev, cf, tx_state, rx_state);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_state == CAN_STATE_BUS_OFF &amp;&amp; old_state &lt; CAN_STATE_BUS_OFF) {</div><div class='del'>-		if (!priv-&gt;can.restart_ms)</div><div class='del'>-			kvaser_usb_hydra_send_simple_cmd_async</div><div class='del'>-						(priv, CMD_STOP_CHIP_REQ);</div><div class='del'>-</div><div class='del'>-		can_bus_off(netdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!skb) {</div><div class='add'>+	kvaser_usb_hydra_change_state(priv, bec, cf, new_state);</div><div class='add'>+	if (skb)</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	else</div><div class='ctx'> 		netdev_warn(netdev, "No memory left for err_skb\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;can.restart_ms &amp;&amp;</div><div class='del'>-	    old_state &gt;= CAN_STATE_BUS_OFF &amp;&amp;</div><div class='del'>-	    new_state &lt; CAN_STATE_BUS_OFF)</div><div class='del'>-		priv-&gt;can.can_stats.restarts++;</div><div class='del'>-</div><div class='del'>-	cf-&gt;data[6] = bec-&gt;txerr;</div><div class='del'>-	cf-&gt;data[7] = bec-&gt;rxerr;</div><div class='del'>-</div><div class='del'>-	stats = &amp;netdev-&gt;stats;</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvaser_usb_hydra_state_event(const struct kvaser_usb *dev,</div><div class='hunk'>@@ -989,9 +1105,8 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = priv-&gt;netdev;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct skb_shared_hwtstamps *shhwtstamps;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct can_berr_counter bec;</div><div class='ctx'> 	enum can_state new_state, old_state;</div><div class='ctx'> 	u8 bus_status;</div><div class='hunk'>@@ -1007,51 +1122,26 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	kvaser_usb_hydra_bus_status_to_can_state(priv, bus_status, &amp;bec,</div><div class='ctx'> 						 &amp;new_state);</div><div class='ctx'> </div><div class='del'>-	skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='add'>+	if (new_state != old_state)</div><div class='add'>+		kvaser_usb_hydra_change_state(priv, &amp;bec, cf, new_state);</div><div class='ctx'> </div><div class='del'>-	if (new_state != old_state) {</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			enum can_state tx_state, rx_state;</div><div class='del'>-</div><div class='del'>-			tx_state = (bec.txerr &gt;= bec.rxerr) ?</div><div class='del'>-					new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-			rx_state = (bec.txerr &lt;= bec.rxerr) ?</div><div class='del'>-					new_state : CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-</div><div class='del'>-			can_change_state(netdev, cf, tx_state, rx_state);</div><div class='del'>-</div><div class='del'>-			if (priv-&gt;can.restart_ms &amp;&amp;</div><div class='del'>-			    old_state &gt;= CAN_STATE_BUS_OFF &amp;&amp;</div><div class='del'>-			    new_state &lt; CAN_STATE_BUS_OFF)</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='del'>-		}</div><div class='add'>+			struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);</div><div class='ctx'> </div><div class='del'>-		if (new_state == CAN_STATE_BUS_OFF) {</div><div class='del'>-			if (!priv-&gt;can.restart_ms)</div><div class='del'>-				kvaser_usb_hydra_send_simple_cmd_async</div><div class='del'>-						(priv, CMD_STOP_CHIP_REQ);</div><div class='del'>-</div><div class='del'>-			can_bus_off(netdev);</div><div class='add'>+			shhwtstamps-&gt;hwtstamp = hwtstamp;</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_BUSERROR | CAN_ERR_CNT;</div><div class='add'>+			cf-&gt;data[6] = bec.txerr;</div><div class='add'>+			cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+		} else {</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+			netdev_warn(netdev, "No memory left for err_skb\n");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!skb) {</div><div class='del'>-		stats-&gt;rx_dropped++;</div><div class='del'>-		netdev_warn(netdev, "No memory left for err_skb\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shhwtstamps = skb_hwtstamps(skb);</div><div class='del'>-	shhwtstamps-&gt;hwtstamp = hwtstamp;</div><div class='del'>-</div><div class='del'>-	cf-&gt;can_id |= CAN_ERR_BUSERROR;</div><div class='del'>-	cf-&gt;data[6] = bec.txerr;</div><div class='del'>-	cf-&gt;data[7] = bec.rxerr;</div><div class='del'>-</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-	netif_rx(skb);</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;bec.txerr = bec.txerr;</div><div class='ctx'> 	priv-&gt;bec.rxerr = bec.rxerr;</div><div class='ctx'> }</div><div class='hunk'>@@ -1083,8 +1173,6 @@ static void kvaser_usb_hydra_one_shot_fail(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;tx_errors++;</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1094,8 +1182,11 @@ static void kvaser_usb_hydra_tx_acknowledge(const struct kvaser_usb *dev,</div><div class='ctx'> 	struct kvaser_usb_tx_urb_context *context;</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv;</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='add'>+	unsigned int len;</div><div class='ctx'> 	bool one_shot_fail = false;</div><div class='add'>+	bool is_err_frame = false;</div><div class='ctx'> 	u16 transid = kvaser_usb_hydra_get_cmd_transid(cmd);</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	priv = kvaser_usb_hydra_net_priv_from_cmd(dev, cmd);</div><div class='ctx'> 	if (!priv)</div><div class='hunk'>@@ -1113,24 +1204,31 @@ static void kvaser_usb_hydra_tx_acknowledge(const struct kvaser_usb *dev,</div><div class='ctx'> 			kvaser_usb_hydra_one_shot_fail(priv, cmd_ext);</div><div class='ctx'> 			one_shot_fail = true;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		is_err_frame = flags &amp; KVASER_USB_HYDRA_CF_FLAG_TX_ACK &amp;&amp;</div><div class='add'>+			       flags &amp; KVASER_USB_HYDRA_CF_FLAG_ERROR_FRAME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	context = &amp;priv-&gt;tx_contexts[transid % dev-&gt;max_tx_urbs];</div><div class='del'>-	if (!one_shot_fail) {</div><div class='del'>-		struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='del'>-</div><div class='del'>-		stats-&gt;tx_packets++;</div><div class='del'>-		stats-&gt;tx_bytes += can_dlc2len(context-&gt;dlc);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_contexts_lock, irq_flags);</div><div class='ctx'> </div><div class='del'>-	can_get_echo_skb(priv-&gt;netdev, context-&gt;echo_index);</div><div class='add'>+	skb = priv-&gt;can.echo_skb[context-&gt;echo_index];</div><div class='add'>+	if (skb)</div><div class='add'>+		skb_hwtstamps(skb)-&gt;hwtstamp = kvaser_usb_hydra_ktime_from_cmd(dev-&gt;cfg, cmd);</div><div class='add'>+	len = can_get_echo_skb(priv-&gt;netdev, context-&gt;echo_index, NULL);</div><div class='ctx'> 	context-&gt;echo_index = dev-&gt;max_tx_urbs;</div><div class='ctx'> 	--priv-&gt;active_tx_contexts;</div><div class='ctx'> 	netif_wake_queue(priv-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;tx_contexts_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+	if (!one_shot_fail &amp;&amp; !is_err_frame) {</div><div class='add'>+		struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_packets++;</div><div class='add'>+		stats-&gt;tx_bytes += len;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void kvaser_usb_hydra_rx_msg_std(const struct kvaser_usb *dev,</div><div class='hunk'>@@ -1151,7 +1249,7 @@ static void kvaser_usb_hydra_rx_msg_std(const struct kvaser_usb *dev,</div><div class='ctx'> 	stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='ctx'> </div><div class='ctx'> 	flags = cmd-&gt;rx_can.flags;</div><div class='del'>-	hwtstamp = kvaser_usb_hydra_ktime_from_rx_cmd(dev-&gt;cfg, cmd);</div><div class='add'>+	hwtstamp = kvaser_usb_hydra_ktime_from_cmd(dev-&gt;cfg, cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_ERROR_FRAME) {</div><div class='ctx'> 		kvaser_usb_hydra_error_frame(priv, &amp;cmd-&gt;rx_can.err_frame_data,</div><div class='hunk'>@@ -1180,15 +1278,17 @@ static void kvaser_usb_hydra_rx_msg_std(const struct kvaser_usb *dev,</div><div class='ctx'> 	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_OVERRUN)</div><div class='ctx'> 		kvaser_usb_can_rx_over_error(priv-&gt;netdev);</div><div class='ctx'> </div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(cmd-&gt;rx_can.dlc);</div><div class='add'>+	can_frame_set_cc_len((struct can_frame *)cf, cmd-&gt;rx_can.dlc, priv-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME)</div><div class='add'>+	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='del'>-		memcpy(cf-&gt;data, cmd-&gt;rx_can.data, cf-&gt;can_dlc);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(cf-&gt;data, cmd-&gt;rx_can.data, cf-&gt;len);</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1217,7 +1317,7 @@ static void kvaser_usb_hydra_rx_msg_ext(const struct kvaser_usb *dev,</div><div class='ctx'> 		KVASER_USB_KCAN_DATA_DLC_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	flags = le32_to_cpu(cmd-&gt;rx_can.flags);</div><div class='del'>-	hwtstamp = kvaser_usb_hydra_ktime_from_rx_cmd(dev-&gt;cfg, std_cmd);</div><div class='add'>+	hwtstamp = kvaser_usb_hydra_ktime_from_cmd(dev-&gt;cfg, std_cmd);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_ERROR_FRAME) {</div><div class='ctx'> 		kvaser_usb_hydra_error_frame(priv, &amp;cmd-&gt;rx_can.err_frame_data,</div><div class='hunk'>@@ -1251,22 +1351,24 @@ static void kvaser_usb_hydra_rx_msg_ext(const struct kvaser_usb *dev,</div><div class='ctx'> 		kvaser_usb_can_rx_over_error(priv-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_FDF) {</div><div class='del'>-		cf-&gt;len = can_dlc2len(get_canfd_dlc(dlc));</div><div class='add'>+		cf-&gt;len = can_fd_dlc2len(dlc);</div><div class='ctx'> 		if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_BRS)</div><div class='ctx'> 			cf-&gt;flags |= CANFD_BRS;</div><div class='ctx'> 		if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_ESI)</div><div class='ctx'> 			cf-&gt;flags |= CANFD_ESI;</div><div class='ctx'> 	} else {</div><div class='del'>-		cf-&gt;len = get_can_dlc(dlc);</div><div class='add'>+		can_frame_set_cc_len((struct can_frame *)cf, dlc, priv-&gt;can.ctrlmode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME)</div><div class='add'>+	if (flags &amp; KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME) {</div><div class='ctx'> 		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		memcpy(cf-&gt;data, cmd-&gt;rx_can.kcan_payload, cf-&gt;len);</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1290,6 +1392,10 @@ static void kvaser_usb_hydra_handle_cmd_std(const struct kvaser_usb *dev,</div><div class='ctx'> 		kvaser_usb_hydra_state_event(dev, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	case CMD_GET_BUSPARAMS_RESP:</div><div class='add'>+		kvaser_usb_hydra_get_busparams_reply(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case CMD_ERROR_EVENT:</div><div class='ctx'> 		kvaser_usb_hydra_error_event(dev, cmd);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1305,6 +1411,7 @@ static void kvaser_usb_hydra_handle_cmd_std(const struct kvaser_usb *dev,</div><div class='ctx'> 	/* Ignored commands */</div><div class='ctx'> 	case CMD_SET_BUSPARAMS_RESP:</div><div class='ctx'> 	case CMD_SET_BUSPARAMS_FD_RESP:</div><div class='add'>+	case CMD_LED_ACTION_RESP:</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1345,22 +1452,20 @@ static void kvaser_usb_hydra_handle_cmd(const struct kvaser_usb *dev,</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> kvaser_usb_hydra_frame_to_cmd_ext(const struct kvaser_usb_net_priv *priv,</div><div class='del'>-				  const struct sk_buff *skb, int *frame_len,</div><div class='del'>-				  int *cmd_len, u16 transid)</div><div class='add'>+				  const struct sk_buff *skb, int *cmd_len,</div><div class='add'>+				  u16 transid)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='ctx'> 	struct kvaser_cmd_ext *cmd;</div><div class='ctx'> 	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='del'>-	u8 dlc = can_len2dlc(cf-&gt;len);</div><div class='add'>+	u8 dlc;</div><div class='ctx'> 	u8 nbr_of_bytes = cf-&gt;len;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	u32 id;</div><div class='ctx'> 	u32 kcan_id;</div><div class='ctx'> 	u32 kcan_header;</div><div class='ctx'> </div><div class='del'>-	*frame_len = nbr_of_bytes;</div><div class='del'>-</div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd_ext), GFP_ATOMIC);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1378,6 +1483,11 @@ kvaser_usb_hydra_frame_to_cmd_ext(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;len = cpu_to_le16(*cmd_len);</div><div class='ctx'> </div><div class='add'>+	if (can_is_canfd_skb(skb))</div><div class='add'>+		dlc = can_fd_len2dlc(cf-&gt;len);</div><div class='add'>+	else</div><div class='add'>+		dlc = can_get_cc_dlc((struct can_frame *)cf, priv-&gt;can.ctrlmode);</div><div class='add'>+</div><div class='ctx'> 	cmd-&gt;tx_can.databytes = nbr_of_bytes;</div><div class='ctx'> 	cmd-&gt;tx_can.dlc = dlc;</div><div class='ctx'> </div><div class='hunk'>@@ -1425,8 +1535,8 @@ kvaser_usb_hydra_frame_to_cmd_ext(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> kvaser_usb_hydra_frame_to_cmd_std(const struct kvaser_usb_net_priv *priv,</div><div class='del'>-				  const struct sk_buff *skb, int *frame_len,</div><div class='del'>-				  int *cmd_len, u16 transid)</div><div class='add'>+				  const struct sk_buff *skb, int *cmd_len,</div><div class='add'>+				  u16 transid)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='hunk'>@@ -1434,9 +1544,7 @@ kvaser_usb_hydra_frame_to_cmd_std(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	u32 id;</div><div class='ctx'> </div><div class='del'>-	*frame_len = cf-&gt;can_dlc;</div><div class='del'>-</div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_ATOMIC);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -1455,7 +1563,7 @@ kvaser_usb_hydra_frame_to_cmd_std(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 		id = cf-&gt;can_id &amp; CAN_SFF_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;tx_can.dlc = cf-&gt;can_dlc;</div><div class='add'>+	cmd-&gt;tx_can.dlc = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='ctx'> 	flags = (cf-&gt;can_id &amp; CAN_EFF_FLAG ?</div><div class='ctx'> 		 KVASER_USB_HYDRA_CF_FLAG_EXTENDED_ID : 0);</div><div class='hunk'>@@ -1469,7 +1577,7 @@ kvaser_usb_hydra_frame_to_cmd_std(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	cmd-&gt;tx_can.id = cpu_to_le32(id);</div><div class='ctx'> 	cmd-&gt;tx_can.flags = flags;</div><div class='ctx'> </div><div class='del'>-	memcpy(cmd-&gt;tx_can.data, cf-&gt;data, *frame_len);</div><div class='add'>+	memcpy(cmd-&gt;tx_can.data, cf-&gt;data, cf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	return cmd;</div><div class='ctx'> }</div><div class='hunk'>@@ -1490,61 +1598,101 @@ static int kvaser_usb_hydra_set_mode(struct net_device *netdev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvaser_usb_hydra_set_bittiming(struct net_device *netdev)</div><div class='add'>+static int kvaser_usb_hydra_get_busparams(struct kvaser_usb_net_priv *priv,</div><div class='add'>+					  int busparams_type)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	struct kvaser_usb_net_hydra_priv *hydra = priv-&gt;sub_priv;</div><div class='add'>+	struct kvaser_cmd *cmd;</div><div class='add'>+	size_t cmd_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!hydra)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;header.cmd_no = CMD_GET_BUSPARAMS_REQ;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='add'>+	kvaser_usb_hydra_set_cmd_dest_he</div><div class='add'>+		(cmd, dev-&gt;card_data.hydra.channel_to_he[priv-&gt;channel]);</div><div class='add'>+	kvaser_usb_hydra_set_cmd_transid</div><div class='add'>+				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='add'>+	cmd-&gt;get_busparams_req.type = busparams_type;</div><div class='add'>+	hydra-&gt;pending_get_busparams_type = busparams_type;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;priv-&gt;get_busparams_comp);</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;priv-&gt;get_busparams_comp,</div><div class='add'>+					 msecs_to_jiffies(KVASER_USB_TIMEOUT)))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_hydra_get_nominal_busparams(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return kvaser_usb_hydra_get_busparams(priv, KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_hydra_get_data_busparams(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return kvaser_usb_hydra_get_busparams(priv, KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_hydra_set_bittiming(const struct net_device *netdev,</div><div class='add'>+					  const struct kvaser_usb_busparams *busparams)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='del'>-	int tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1;</div><div class='del'>-	int tseg2 = bt-&gt;phase_seg2;</div><div class='del'>-	int sjw = bt-&gt;sjw;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = CMD_SET_BUSPARAMS_REQ;</div><div class='del'>-	cmd-&gt;set_busparams_req.bitrate = cpu_to_le32(bt-&gt;bitrate);</div><div class='del'>-	cmd-&gt;set_busparams_req.sjw = (u8)sjw;</div><div class='del'>-	cmd-&gt;set_busparams_req.tseg1 = (u8)tseg1;</div><div class='del'>-	cmd-&gt;set_busparams_req.tseg2 = (u8)tseg2;</div><div class='del'>-	cmd-&gt;set_busparams_req.nsamples = 1;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='add'>+	memcpy(&amp;cmd-&gt;set_busparams_req.busparams_nominal, busparams,</div><div class='add'>+	       sizeof(cmd-&gt;set_busparams_req.busparams_nominal));</div><div class='ctx'> </div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_dest_he</div><div class='ctx'> 		(cmd, dev-&gt;card_data.hydra.channel_to_he[priv-&gt;channel]);</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='ctx'> 				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='ctx'> </div><div class='ctx'> 	kfree(cmd);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int kvaser_usb_hydra_set_data_bittiming(struct net_device *netdev)</div><div class='add'>+static int kvaser_usb_hydra_set_data_bittiming(const struct net_device *netdev,</div><div class='add'>+					       const struct kvaser_usb_busparams *busparams)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	struct can_bittiming *dbt = &amp;priv-&gt;can.data_bittiming;</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='del'>-	int tseg1 = dbt-&gt;prop_seg + dbt-&gt;phase_seg1;</div><div class='del'>-	int tseg2 = dbt-&gt;phase_seg2;</div><div class='del'>-	int sjw = dbt-&gt;sjw;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = CMD_SET_BUSPARAMS_FD_REQ;</div><div class='del'>-	cmd-&gt;set_busparams_req.bitrate_d = cpu_to_le32(dbt-&gt;bitrate);</div><div class='del'>-	cmd-&gt;set_busparams_req.sjw_d = (u8)sjw;</div><div class='del'>-	cmd-&gt;set_busparams_req.tseg1_d = (u8)tseg1;</div><div class='del'>-	cmd-&gt;set_busparams_req.tseg2_d = (u8)tseg2;</div><div class='del'>-	cmd-&gt;set_busparams_req.nsamples_d = 1;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='add'>+	memcpy(&amp;cmd-&gt;set_busparams_req.busparams_data, busparams,</div><div class='add'>+	       sizeof(cmd-&gt;set_busparams_req.busparams_data));</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD) {</div><div class='ctx'> 		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO)</div><div class='hunk'>@@ -1560,7 +1708,7 @@ static int kvaser_usb_hydra_set_data_bittiming(struct net_device *netdev)</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='ctx'> 				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='ctx'> </div><div class='ctx'> 	kfree(cmd);</div><div class='ctx'> </div><div class='hunk'>@@ -1590,7 +1738,7 @@ static int kvaser_usb_hydra_setup_endpoints(struct kvaser_usb *dev)</div><div class='ctx'> 	struct usb_endpoint_descriptor *ep;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	iface_desc = &amp;dev-&gt;intf-&gt;altsetting[0];</div><div class='add'>+	iface_desc = dev-&gt;intf-&gt;cur_altsetting;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; ++i) {</div><div class='ctx'> 		ep = &amp;iface_desc-&gt;endpoint[i].desc;</div><div class='hunk'>@@ -1651,6 +1799,19 @@ static int kvaser_usb_hydra_init_card(struct kvaser_usb *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvaser_usb_hydra_init_channel(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_hydra_priv *hydra;</div><div class='add'>+</div><div class='add'>+	hydra = devm_kzalloc(&amp;priv-&gt;dev-&gt;intf-&gt;dev, sizeof(*hydra), GFP_KERNEL);</div><div class='add'>+	if (!hydra)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;sub_priv = hydra;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvaser_usb_hydra_get_software_info(struct kvaser_usb *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd cmd;</div><div class='hunk'>@@ -1675,15 +1836,18 @@ static int kvaser_usb_hydra_get_software_info(struct kvaser_usb *dev)</div><div class='ctx'> static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 flags;</div><div class='add'>+	u32 fw_version;</div><div class='ctx'> 	struct kvaser_usb_dev_card_data *card_data = &amp;dev-&gt;card_data;</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = CMD_GET_SOFTWARE_DETAILS_REQ;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='ctx'> 	cmd-&gt;sw_detail_req.use_ext_cmd = 1;</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_dest_he</div><div class='ctx'> 				(cmd, KVASER_USB_HYDRA_HE_ADDRESS_ILLEGAL);</div><div class='hunk'>@@ -1691,7 +1855,7 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='ctx'> 				(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='hunk'>@@ -1700,7 +1864,10 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto end;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;fw_version = le32_to_cpu(cmd-&gt;sw_detail_res.sw_version);</div><div class='add'>+	fw_version = le32_to_cpu(cmd-&gt;sw_detail_res.sw_version);</div><div class='add'>+	dev-&gt;fw_version.major = FIELD_GET(KVASER_USB_SW_VERSION_MAJOR_MASK, fw_version);</div><div class='add'>+	dev-&gt;fw_version.minor = FIELD_GET(KVASER_USB_SW_VERSION_MINOR_MASK, fw_version);</div><div class='add'>+	dev-&gt;fw_version.build = FIELD_GET(KVASER_USB_SW_VERSION_BUILD_MASK, fw_version);</div><div class='ctx'> 	flags = le32_to_cpu(cmd-&gt;sw_detail_res.sw_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp; KVASER_USB_HYDRA_SW_FLAG_FW_BAD) {</div><div class='hunk'>@@ -1727,6 +1894,8 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (flags &amp;  KVASER_USB_HYDRA_SW_FLAG_FREQ_80M)</div><div class='ctx'> 		dev-&gt;cfg = &amp;kvaser_usb_hydra_dev_cfg_kcan;</div><div class='add'>+	else if (flags &amp; KVASER_USB_HYDRA_SW_FLAG_CAN_FREQ_80M)</div><div class='add'>+		dev-&gt;cfg = &amp;kvaser_usb_hydra_dev_cfg_rt;</div><div class='ctx'> 	else</div><div class='ctx'> 		dev-&gt;cfg = &amp;kvaser_usb_hydra_dev_cfg_flexc;</div><div class='ctx'> </div><div class='hunk'>@@ -1749,6 +1918,10 @@ static int kvaser_usb_hydra_get_card_info(struct kvaser_usb *dev)</div><div class='ctx'> 	err = kvaser_usb_hydra_wait_cmd(dev, CMD_GET_CARD_INFO_RESP, &amp;cmd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='add'>+	dev-&gt;ean[1] = le32_to_cpu(cmd.card_info.ean[1]);</div><div class='add'>+	dev-&gt;ean[0] = le32_to_cpu(cmd.card_info.ean[0]);</div><div class='add'>+	dev-&gt;serial_number = le32_to_cpu(cmd.card_info.serial_number);</div><div class='add'>+	dev-&gt;hw_revision = cmd.card_info.hw_revision;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;nchannels = cmd.card_info.nchannels;</div><div class='ctx'> 	if (dev-&gt;nchannels &gt; KVASER_USB_MAX_NET_DEVICES)</div><div class='hunk'>@@ -1803,10 +1976,41 @@ static int kvaser_usb_hydra_get_capabilities(struct kvaser_usb *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvaser_usb_hydra_set_led(struct kvaser_usb_net_priv *priv,</div><div class='add'>+				    enum kvaser_usb_led_state state,</div><div class='add'>+				    u16 duration_ms)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	struct kvaser_cmd *cmd;</div><div class='add'>+	size_t cmd_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;header.cmd_no = CMD_LED_ACTION_REQ;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='add'>+	kvaser_usb_hydra_set_cmd_dest_he(cmd, dev-&gt;card_data.hydra.sysdbg_he);</div><div class='add'>+	kvaser_usb_hydra_set_cmd_transid(cmd, kvaser_usb_hydra_get_next_transid(dev));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;led_action_req.duration_ms = cpu_to_le16(duration_ms);</div><div class='add'>+	cmd-&gt;led_action_req.action = state |</div><div class='add'>+				     FIELD_PREP(KVASER_USB_HYDRA_LED_IDX_MASK,</div><div class='add'>+						KVASER_USB_HYDRA_LED_YELLOW_CH0_IDX +</div><div class='add'>+						KVASER_USB_HYDRA_LEDS_PER_CHANNEL * priv-&gt;channel);</div><div class='add'>+</div><div class='add'>+	ret = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='add'>+	kfree(cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='add'>+	size_t cmd_len;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if ((priv-&gt;can.ctrlmode &amp;</div><div class='hunk'>@@ -1817,11 +2021,12 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;header.cmd_no = CMD_SET_DRIVERMODE_REQ;</div><div class='add'>+	cmd_len = kvaser_usb_hydra_cmd_size(cmd);</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_dest_he</div><div class='ctx'> 		(cmd, dev-&gt;card_data.hydra.channel_to_he[priv-&gt;channel]);</div><div class='ctx'> 	kvaser_usb_hydra_set_cmd_transid</div><div class='hunk'>@@ -1831,7 +2036,7 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv)</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd-&gt;set_ctrlmode.mode = KVASER_USB_HYDRA_CTRLMODE_NORMAL;</div><div class='ctx'> </div><div class='del'>-	err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd));</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd_len);</div><div class='ctx'> 	kfree(cmd);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1841,7 +2046,7 @@ static int kvaser_usb_hydra_start_chip(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;priv-&gt;start_comp);</div><div class='add'>+	reinit_completion(&amp;priv-&gt;start_comp);</div><div class='ctx'> </div><div class='ctx'> 	err = kvaser_usb_hydra_send_simple_cmd(priv-&gt;dev, CMD_START_CHIP_REQ,</div><div class='ctx'> 					       priv-&gt;channel);</div><div class='hunk'>@@ -1859,7 +2064,7 @@ static int kvaser_usb_hydra_stop_chip(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;priv-&gt;stop_comp);</div><div class='add'>+	reinit_completion(&amp;priv-&gt;stop_comp);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we do not report invalid BUS_OFF from CMD_CHIP_STATE_EVENT</div><div class='ctx'> 	 * see comment in kvaser_usb_hydra_update_state()</div><div class='hunk'>@@ -1882,7 +2087,7 @@ static int kvaser_usb_hydra_flush_queue(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;priv-&gt;flush_comp);</div><div class='add'>+	reinit_completion(&amp;priv-&gt;flush_comp);</div><div class='ctx'> </div><div class='ctx'> 	err = kvaser_usb_hydra_send_simple_cmd(priv-&gt;dev, CMD_FLUSH_QUEUE,</div><div class='ctx'> 					       priv-&gt;channel);</div><div class='hunk'>@@ -1975,17 +2180,17 @@ static void kvaser_usb_hydra_read_bulk_callback(struct kvaser_usb *dev,</div><div class='ctx'> </div><div class='ctx'> static void *</div><div class='ctx'> kvaser_usb_hydra_frame_to_cmd(const struct kvaser_usb_net_priv *priv,</div><div class='del'>-			      const struct sk_buff *skb, int *frame_len,</div><div class='del'>-			      int *cmd_len, u16 transid)</div><div class='add'>+			      const struct sk_buff *skb, int *cmd_len,</div><div class='add'>+			      u16 transid)</div><div class='ctx'> {</div><div class='ctx'> 	void *buf;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;dev-&gt;card_data.capabilities &amp; KVASER_USB_HYDRA_CAP_EXT_CMD)</div><div class='del'>-		buf = kvaser_usb_hydra_frame_to_cmd_ext(priv, skb, frame_len,</div><div class='del'>-							cmd_len, transid);</div><div class='add'>+		buf = kvaser_usb_hydra_frame_to_cmd_ext(priv, skb, cmd_len,</div><div class='add'>+							transid);</div><div class='ctx'> 	else</div><div class='del'>-		buf = kvaser_usb_hydra_frame_to_cmd_std(priv, skb, frame_len,</div><div class='del'>-							cmd_len, transid);</div><div class='add'>+		buf = kvaser_usb_hydra_frame_to_cmd_std(priv, skb, cmd_len,</div><div class='add'>+							transid);</div><div class='ctx'> </div><div class='ctx'> 	return buf;</div><div class='ctx'> }</div><div class='hunk'>@@ -1993,14 +2198,18 @@ kvaser_usb_hydra_frame_to_cmd(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops = {</div><div class='ctx'> 	.dev_set_mode = kvaser_usb_hydra_set_mode,</div><div class='ctx'> 	.dev_set_bittiming = kvaser_usb_hydra_set_bittiming,</div><div class='add'>+	.dev_get_busparams = kvaser_usb_hydra_get_nominal_busparams,</div><div class='ctx'> 	.dev_set_data_bittiming = kvaser_usb_hydra_set_data_bittiming,</div><div class='add'>+	.dev_get_data_busparams = kvaser_usb_hydra_get_data_busparams,</div><div class='ctx'> 	.dev_get_berr_counter = kvaser_usb_hydra_get_berr_counter,</div><div class='ctx'> 	.dev_setup_endpoints = kvaser_usb_hydra_setup_endpoints,</div><div class='ctx'> 	.dev_init_card = kvaser_usb_hydra_init_card,</div><div class='add'>+	.dev_init_channel = kvaser_usb_hydra_init_channel,</div><div class='ctx'> 	.dev_get_software_info = kvaser_usb_hydra_get_software_info,</div><div class='ctx'> 	.dev_get_software_details = kvaser_usb_hydra_get_software_details,</div><div class='ctx'> 	.dev_get_card_info = kvaser_usb_hydra_get_card_info,</div><div class='ctx'> 	.dev_get_capabilities = kvaser_usb_hydra_get_capabilities,</div><div class='add'>+	.dev_set_led = kvaser_usb_hydra_set_led,</div><div class='ctx'> 	.dev_set_opt_mode = kvaser_usb_hydra_set_opt_mode,</div><div class='ctx'> 	.dev_start_chip = kvaser_usb_hydra_start_chip,</div><div class='ctx'> 	.dev_stop_chip = kvaser_usb_hydra_stop_chip,</div><div class='hunk'>@@ -2012,7 +2221,7 @@ const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops = {</div><div class='ctx'> </div><div class='ctx'> static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan = {</div><div class='ctx'> 	.clock = {</div><div class='del'>-		.freq = 80000000,</div><div class='add'>+		.freq = 80 * MEGA /* Hz */,</div><div class='ctx'> 	},</div><div class='ctx'> 	.timestamp_freq = 80,</div><div class='ctx'> 	.bittiming_const = &amp;kvaser_usb_hydra_kcan_bittiming_c,</div><div class='hunk'>@@ -2021,8 +2230,17 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan = {</div><div class='ctx'> </div><div class='ctx'> static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc = {</div><div class='ctx'> 	.clock = {</div><div class='del'>-		.freq = 24000000,</div><div class='add'>+		.freq = 24 * MEGA /* Hz */,</div><div class='ctx'> 	},</div><div class='ctx'> 	.timestamp_freq = 1,</div><div class='del'>-	.bittiming_const = &amp;kvaser_usb_hydra_flexc_bittiming_c,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_flexc_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 80 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 24,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_hydra_rt_bittiming_c,</div><div class='add'>+	.data_bittiming_const = &amp;kvaser_usb_hydra_rtd_bittiming_c,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c<br/>index 07d2f3aa2c02..1167d38344f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'>  * Copyright (C) 2015 Valeo S.A.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/completion.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='hunk'>@@ -19,7 +20,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='hunk'>@@ -28,10 +31,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "kvaser_usb.h"</div><div class='ctx'> </div><div class='del'>-/* Forward declaration */</div><div class='del'>-static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg;</div><div class='del'>-</div><div class='del'>-#define CAN_USB_CLOCK			8000000</div><div class='ctx'> #define MAX_USBCAN_NET_DEVICES		2</div><div class='ctx'> </div><div class='ctx'> /* Command header size */</div><div class='hunk'>@@ -59,6 +58,9 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg;</div><div class='ctx'> #define CMD_RX_EXT_MESSAGE		14</div><div class='ctx'> #define CMD_TX_EXT_MESSAGE		15</div><div class='ctx'> #define CMD_SET_BUS_PARAMS		16</div><div class='add'>+#define CMD_GET_BUS_PARAMS		17</div><div class='add'>+#define CMD_GET_BUS_PARAMS_REPLY	18</div><div class='add'>+#define CMD_GET_CHIP_STATE		19</div><div class='ctx'> #define CMD_CHIP_STATE_EVENT		20</div><div class='ctx'> #define CMD_SET_CTRL_MODE		21</div><div class='ctx'> #define CMD_RESET_CHIP			24</div><div class='hunk'>@@ -73,13 +75,26 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg;</div><div class='ctx'> #define CMD_GET_CARD_INFO_REPLY		35</div><div class='ctx'> #define CMD_GET_SOFTWARE_INFO		38</div><div class='ctx'> #define CMD_GET_SOFTWARE_INFO_REPLY	39</div><div class='add'>+#define CMD_ERROR_EVENT			45</div><div class='ctx'> #define CMD_FLUSH_QUEUE			48</div><div class='ctx'> #define CMD_TX_ACKNOWLEDGE		50</div><div class='ctx'> #define CMD_CAN_ERROR_EVENT		51</div><div class='ctx'> #define CMD_FLUSH_QUEUE_REPLY		68</div><div class='add'>+#define CMD_GET_CAPABILITIES_REQ	95</div><div class='add'>+#define CMD_GET_CAPABILITIES_RESP	96</div><div class='add'>+#define CMD_LED_ACTION_REQ		101</div><div class='add'>+#define CMD_LED_ACTION_RESP		102</div><div class='ctx'> </div><div class='ctx'> #define CMD_LEAF_LOG_MESSAGE		106</div><div class='ctx'> </div><div class='add'>+/* Leaf frequency options */</div><div class='add'>+#define KVASER_USB_LEAF_SWOPTION_FREQ_MASK 0x60</div><div class='add'>+#define KVASER_USB_LEAF_SWOPTION_FREQ_16_MHZ_CLK 0</div><div class='add'>+#define KVASER_USB_LEAF_SWOPTION_FREQ_32_MHZ_CLK BIT(5)</div><div class='add'>+#define KVASER_USB_LEAF_SWOPTION_FREQ_24_MHZ_CLK BIT(6)</div><div class='add'>+</div><div class='add'>+#define KVASER_USB_LEAF_SWOPTION_EXT_CAP BIT(12)</div><div class='add'>+</div><div class='ctx'> /* error factors */</div><div class='ctx'> #define M16C_EF_ACKE			BIT(0)</div><div class='ctx'> #define M16C_EF_CRCE			BIT(1)</div><div class='hunk'>@@ -98,16 +113,6 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg;</div><div class='ctx'> #define USBCAN_ERROR_STATE_RX_ERROR	BIT(1)</div><div class='ctx'> #define USBCAN_ERROR_STATE_BUSERROR	BIT(2)</div><div class='ctx'> </div><div class='del'>-/* bittiming parameters */</div><div class='del'>-#define KVASER_USB_TSEG1_MIN		1</div><div class='del'>-#define KVASER_USB_TSEG1_MAX		16</div><div class='del'>-#define KVASER_USB_TSEG2_MIN		1</div><div class='del'>-#define KVASER_USB_TSEG2_MAX		8</div><div class='del'>-#define KVASER_USB_SJW_MAX		4</div><div class='del'>-#define KVASER_USB_BRP_MIN		1</div><div class='del'>-#define KVASER_USB_BRP_MAX		64</div><div class='del'>-#define KVASER_USB_BRP_INC		1</div><div class='del'>-</div><div class='ctx'> /* ctrl modes */</div><div class='ctx'> #define KVASER_CTRL_MODE_NORMAL		1</div><div class='ctx'> #define KVASER_CTRL_MODE_SILENT		2</div><div class='hunk'>@@ -117,6 +122,10 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg;</div><div class='ctx'> /* Extended CAN identifier flag */</div><div class='ctx'> #define KVASER_EXTENDED_FRAME		BIT(31)</div><div class='ctx'> </div><div class='add'>+/* USBCanII timestamp */</div><div class='add'>+#define KVASER_USB_USBCAN_CLK_OVERFLOW_MASK GENMASK(31, 16)</div><div class='add'>+#define KVASER_USB_USBCAN_TIMESTAMP_FACTOR 10</div><div class='add'>+</div><div class='ctx'> struct kvaser_cmd_simple {</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	u8 channel;</div><div class='hunk'>@@ -129,7 +138,7 @@ struct kvaser_cmd_cardinfo {</div><div class='ctx'> 	__le32 padding0;</div><div class='ctx'> 	__le32 clock_resolution;</div><div class='ctx'> 	__le32 mfgdate;</div><div class='del'>-	u8 ean[8];</div><div class='add'>+	__le32 ean[2];</div><div class='ctx'> 	u8 hw_revision;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -164,11 +173,22 @@ struct usbcan_cmd_softinfo {</div><div class='ctx'> struct kvaser_cmd_busparams {</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	u8 channel;</div><div class='del'>-	__le32 bitrate;</div><div class='del'>-	u8 tseg1;</div><div class='del'>-	u8 tseg2;</div><div class='del'>-	u8 sjw;</div><div class='del'>-	u8 no_samp;</div><div class='add'>+	struct kvaser_usb_busparams busparams;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* The device has one LED per CAN channel</div><div class='add'>+ * The LSB of action field controls the state:</div><div class='add'>+ *   0 = ON</div><div class='add'>+ *   1 = OFF</div><div class='add'>+ * The remaining bits of action field is the LED index</div><div class='add'>+ */</div><div class='add'>+#define KVASER_USB_LEAF_LED_IDX_MASK GENMASK(31, 1)</div><div class='add'>+#define KVASER_USB_LEAF_LED_YELLOW_CH0_IDX 2</div><div class='add'>+struct kvaser_cmd_led_action_req {</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 action;</div><div class='add'>+	__le16 duration_ms;</div><div class='add'>+	u8 padding[24];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct kvaser_cmd_tx_can {</div><div class='hunk'>@@ -237,7 +257,21 @@ struct kvaser_cmd_tx_acknowledge_header {</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct leaf_cmd_error_event {</div><div class='add'>+struct leaf_cmd_tx_acknowledge {</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 tid;</div><div class='add'>+	__le16 time[3];</div><div class='add'>+	u8 padding[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbcan_cmd_tx_acknowledge {</div><div class='add'>+	u8 channel;</div><div class='add'>+	u8 tid;</div><div class='add'>+	__le16 time;</div><div class='add'>+	u8 padding[2];</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct leaf_cmd_can_error_event {</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> 	__le16 time[3];</div><div class='hunk'>@@ -249,7 +283,7 @@ struct leaf_cmd_error_event {</div><div class='ctx'> 	u8 error_factor;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='del'>-struct usbcan_cmd_error_event {</div><div class='add'>+struct usbcan_cmd_can_error_event {</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	u8 padding;</div><div class='ctx'> 	u8 tx_errors_count_ch0;</div><div class='hunk'>@@ -261,6 +295,34 @@ struct usbcan_cmd_error_event {</div><div class='ctx'> 	__le16 time;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* CMD_ERROR_EVENT error codes */</div><div class='add'>+#define KVASER_USB_LEAF_ERROR_EVENT_TX_QUEUE_FULL 0x8</div><div class='add'>+#define KVASER_USB_LEAF_ERROR_EVENT_PARAM 0x9</div><div class='add'>+</div><div class='add'>+struct leaf_cmd_error_event {</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 error_code;</div><div class='add'>+	__le16 timestamp[3];</div><div class='add'>+	__le16 padding;</div><div class='add'>+	__le16 info1;</div><div class='add'>+	__le16 info2;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbcan_cmd_error_event {</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 error_code;</div><div class='add'>+	__le16 info1;</div><div class='add'>+	__le16 info2;</div><div class='add'>+	__le16 timestamp;</div><div class='add'>+	__le16 padding;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct usbcan_cmd_clk_overflow_event {</div><div class='add'>+	u8 tid;</div><div class='add'>+	u8 padding;</div><div class='add'>+	__le32 time;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct kvaser_cmd_ctrl_mode {</div><div class='ctx'> 	u8 tid;</div><div class='ctx'> 	u8 channel;</div><div class='hunk'>@@ -285,6 +347,28 @@ struct leaf_cmd_log_message {</div><div class='ctx'> 	u8 data[8];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+/* Sub commands for cap_req and cap_res */</div><div class='add'>+#define KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE 0x02</div><div class='add'>+#define KVASER_USB_LEAF_CAP_CMD_ERR_REPORT 0x05</div><div class='add'>+struct kvaser_cmd_cap_req {</div><div class='add'>+	__le16 padding0;</div><div class='add'>+	__le16 cap_cmd;</div><div class='add'>+	__le16 padding1;</div><div class='add'>+	__le16 channel;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* Status codes for cap_res */</div><div class='add'>+#define KVASER_USB_LEAF_CAP_STAT_OK 0x00</div><div class='add'>+#define KVASER_USB_LEAF_CAP_STAT_NOT_IMPL 0x01</div><div class='add'>+#define KVASER_USB_LEAF_CAP_STAT_UNAVAIL 0x02</div><div class='add'>+struct kvaser_cmd_cap_res {</div><div class='add'>+	__le16 padding;</div><div class='add'>+	__le16 cap_cmd;</div><div class='add'>+	__le16 status;</div><div class='add'>+	__le32 mask;</div><div class='add'>+	__le32 value;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='ctx'> struct kvaser_cmd {</div><div class='ctx'> 	u8 len;</div><div class='ctx'> 	u8 id;</div><div class='hunk'>@@ -293,6 +377,8 @@ struct kvaser_cmd {</div><div class='ctx'> 		struct kvaser_cmd_cardinfo cardinfo;</div><div class='ctx'> 		struct kvaser_cmd_busparams busparams;</div><div class='ctx'> </div><div class='add'>+		struct kvaser_cmd_led_action_req led_action_req;</div><div class='add'>+</div><div class='ctx'> 		struct kvaser_cmd_rx_can_header rx_can_header;</div><div class='ctx'> 		struct kvaser_cmd_tx_acknowledge_header tx_acknowledge_header;</div><div class='ctx'> </div><div class='hunk'>@@ -300,15 +386,22 @@ struct kvaser_cmd {</div><div class='ctx'> 			struct leaf_cmd_softinfo softinfo;</div><div class='ctx'> 			struct leaf_cmd_rx_can rx_can;</div><div class='ctx'> 			struct leaf_cmd_chip_state_event chip_state_event;</div><div class='del'>-			struct leaf_cmd_error_event error_event;</div><div class='add'>+			struct leaf_cmd_can_error_event can_error_event;</div><div class='ctx'> 			struct leaf_cmd_log_message log_message;</div><div class='add'>+			struct leaf_cmd_error_event error_event;</div><div class='add'>+			struct kvaser_cmd_cap_req cap_req;</div><div class='add'>+			struct kvaser_cmd_cap_res cap_res;</div><div class='add'>+			struct leaf_cmd_tx_acknowledge tx_ack;</div><div class='ctx'> 		} __packed leaf;</div><div class='ctx'> </div><div class='ctx'> 		union {</div><div class='ctx'> 			struct usbcan_cmd_softinfo softinfo;</div><div class='ctx'> 			struct usbcan_cmd_rx_can rx_can;</div><div class='ctx'> 			struct usbcan_cmd_chip_state_event chip_state_event;</div><div class='add'>+			struct usbcan_cmd_can_error_event can_error_event;</div><div class='ctx'> 			struct usbcan_cmd_error_event error_event;</div><div class='add'>+			struct usbcan_cmd_tx_acknowledge tx_ack;</div><div class='add'>+			struct usbcan_cmd_clk_overflow_event clk_overflow_event;</div><div class='ctx'> 		} __packed usbcan;</div><div class='ctx'> </div><div class='ctx'> 		struct kvaser_cmd_tx_can tx_can;</div><div class='hunk'>@@ -317,6 +410,44 @@ struct kvaser_cmd {</div><div class='ctx'> 	} u;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define CMD_SIZE_ANY 0xff</div><div class='add'>+#define kvaser_fsize(field) sizeof_field(struct kvaser_cmd, field)</div><div class='add'>+</div><div class='add'>+static const u8 kvaser_usb_leaf_cmd_sizes_leaf[] = {</div><div class='add'>+	[CMD_START_CHIP_REPLY]		= kvaser_fsize(u.simple),</div><div class='add'>+	[CMD_STOP_CHIP_REPLY]		= kvaser_fsize(u.simple),</div><div class='add'>+	[CMD_GET_CARD_INFO_REPLY]	= kvaser_fsize(u.cardinfo),</div><div class='add'>+	[CMD_TX_ACKNOWLEDGE]		= kvaser_fsize(u.leaf.tx_ack),</div><div class='add'>+	[CMD_GET_SOFTWARE_INFO_REPLY]	= kvaser_fsize(u.leaf.softinfo),</div><div class='add'>+	[CMD_RX_STD_MESSAGE]		= kvaser_fsize(u.leaf.rx_can),</div><div class='add'>+	[CMD_RX_EXT_MESSAGE]		= kvaser_fsize(u.leaf.rx_can),</div><div class='add'>+	[CMD_LEAF_LOG_MESSAGE]		= kvaser_fsize(u.leaf.log_message),</div><div class='add'>+	[CMD_CHIP_STATE_EVENT]		= kvaser_fsize(u.leaf.chip_state_event),</div><div class='add'>+	[CMD_CAN_ERROR_EVENT]		= kvaser_fsize(u.leaf.can_error_event),</div><div class='add'>+	[CMD_GET_CAPABILITIES_RESP]	= kvaser_fsize(u.leaf.cap_res),</div><div class='add'>+	[CMD_GET_BUS_PARAMS_REPLY]	= kvaser_fsize(u.busparams),</div><div class='add'>+	[CMD_ERROR_EVENT]		= kvaser_fsize(u.leaf.error_event),</div><div class='add'>+	/* ignored events: */</div><div class='add'>+	[CMD_FLUSH_QUEUE_REPLY]		= CMD_SIZE_ANY,</div><div class='add'>+	[CMD_LED_ACTION_RESP]		= CMD_SIZE_ANY,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 kvaser_usb_leaf_cmd_sizes_usbcan[] = {</div><div class='add'>+	[CMD_START_CHIP_REPLY]		= kvaser_fsize(u.simple),</div><div class='add'>+	[CMD_STOP_CHIP_REPLY]		= kvaser_fsize(u.simple),</div><div class='add'>+	[CMD_GET_CARD_INFO_REPLY]	= kvaser_fsize(u.cardinfo),</div><div class='add'>+	[CMD_TX_ACKNOWLEDGE]		= kvaser_fsize(u.usbcan.tx_ack),</div><div class='add'>+	[CMD_GET_SOFTWARE_INFO_REPLY]	= kvaser_fsize(u.usbcan.softinfo),</div><div class='add'>+	[CMD_RX_STD_MESSAGE]		= kvaser_fsize(u.usbcan.rx_can),</div><div class='add'>+	[CMD_RX_EXT_MESSAGE]		= kvaser_fsize(u.usbcan.rx_can),</div><div class='add'>+	[CMD_CHIP_STATE_EVENT]		= kvaser_fsize(u.usbcan.chip_state_event),</div><div class='add'>+	[CMD_CAN_ERROR_EVENT]		= kvaser_fsize(u.usbcan.can_error_event),</div><div class='add'>+	[CMD_ERROR_EVENT]		= kvaser_fsize(u.usbcan.error_event),</div><div class='add'>+	[CMD_USBCAN_CLOCK_OVERFLOW_EVENT] = kvaser_fsize(u.usbcan.clk_overflow_event),</div><div class='add'>+	/* ignored events: */</div><div class='add'>+	[CMD_LED_ACTION_RESP]		= CMD_SIZE_ANY,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Summary of a kvaser error event, for a unified Leaf/Usbcan error</div><div class='ctx'>  * handling. Some discrepancies between the two families exist:</div><div class='ctx'>  *</div><div class='hunk'>@@ -340,18 +471,151 @@ struct kvaser_usb_err_summary {</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct kvaser_usb_net_leaf_priv {</div><div class='add'>+	struct kvaser_usb_net_priv *net;</div><div class='add'>+</div><div class='add'>+	struct delayed_work chip_state_req_work;</div><div class='add'>+</div><div class='add'>+	/* started but not reported as bus-on yet */</div><div class='add'>+	bool joining_bus;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const kvaser_usb_leaf_m16c_bittiming_const = {</div><div class='add'>+	.name = "kvaser_usb_ucii",</div><div class='add'>+	.tseg1_min = 4,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 16,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const kvaser_usb_leaf_m32c_bittiming_const = {</div><div class='add'>+	.name = "kvaser_usb_leaf",</div><div class='add'>+	.tseg1_min = 3,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 2,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 4,</div><div class='add'>+	.brp_min = 2,</div><div class='add'>+	.brp_max = 128,</div><div class='add'>+	.brp_inc = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_usbcan_dev_cfg = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 8 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 1,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_leaf_m16c_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_m32c_dev_cfg_16mhz = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 16 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 16,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_leaf_m32c_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_m32c_dev_cfg_24mhz = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 16 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 24,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_leaf_m32c_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_m32c_dev_cfg_32mhz = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 16 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 32,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_leaf_m32c_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_16mhz = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 16 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 16,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_flexc_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_24mhz = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 24 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 24,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_flexc_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_32mhz = {</div><div class='add'>+	.clock = {</div><div class='add'>+		.freq = 32 * MEGA /* Hz */,</div><div class='add'>+	},</div><div class='add'>+	.timestamp_freq = 32,</div><div class='add'>+	.bittiming_const = &amp;kvaser_usb_flexc_bittiming_const,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline ktime_t kvaser_usb_usbcan_timestamp_to_ktime(const struct kvaser_usb *dev,</div><div class='add'>+							   __le16 timestamp)</div><div class='add'>+{</div><div class='add'>+	u64 ticks = le16_to_cpu(timestamp) |</div><div class='add'>+		    dev-&gt;card_data.usbcan_timestamp_msb;</div><div class='add'>+</div><div class='add'>+	return kvaser_usb_ticks_to_ktime(dev-&gt;cfg, ticks * KVASER_USB_USBCAN_TIMESTAMP_FACTOR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_leaf_verify_size(const struct kvaser_usb *dev,</div><div class='add'>+				       const struct kvaser_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	/* buffer size &gt;= cmd-&gt;len ensured by caller */</div><div class='add'>+	u8 min_size = 0;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='add'>+	case KVASER_LEAF:</div><div class='add'>+		if (cmd-&gt;id &lt; ARRAY_SIZE(kvaser_usb_leaf_cmd_sizes_leaf))</div><div class='add'>+			min_size = kvaser_usb_leaf_cmd_sizes_leaf[cmd-&gt;id];</div><div class='add'>+		break;</div><div class='add'>+	case KVASER_USBCAN:</div><div class='add'>+		if (cmd-&gt;id &lt; ARRAY_SIZE(kvaser_usb_leaf_cmd_sizes_usbcan))</div><div class='add'>+			min_size = kvaser_usb_leaf_cmd_sizes_usbcan[cmd-&gt;id];</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (min_size == CMD_SIZE_ANY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (min_size) {</div><div class='add'>+		min_size += CMD_HEADER_LEN;</div><div class='add'>+		if (cmd-&gt;len &gt;= min_size)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		dev_err_ratelimited(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+				    "Received command %u too short (size %u, needed %u)",</div><div class='add'>+				    cmd-&gt;id, cmd-&gt;len, min_size);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_warn_ratelimited(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			     "Unhandled command (%d, size %d)\n",</div><div class='add'>+			     cmd-&gt;id, cmd-&gt;len);</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void *</div><div class='ctx'> kvaser_usb_leaf_frame_to_cmd(const struct kvaser_usb_net_priv *priv,</div><div class='del'>-			     const struct sk_buff *skb, int *frame_len,</div><div class='del'>-			     int *cmd_len, u16 transid)</div><div class='add'>+			     const struct sk_buff *skb, int *cmd_len,</div><div class='add'>+			     u16 transid)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	u8 *cmd_tx_can_flags = NULL;		/* GCC */</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	*frame_len = cf-&gt;can_dlc;</div><div class='del'>-</div><div class='ctx'> 	cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);</div><div class='ctx'> 	if (cmd) {</div><div class='ctx'> 		cmd-&gt;u.tx_can.tid = transid &amp; 0xff;</div><div class='hunk'>@@ -359,7 +623,7 @@ kvaser_usb_leaf_frame_to_cmd(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 				      sizeof(struct kvaser_cmd_tx_can);</div><div class='ctx'> 		cmd-&gt;u.tx_can.channel = priv-&gt;channel;</div><div class='ctx'> </div><div class='del'>-		switch (dev-&gt;card_data.leaf.family) {</div><div class='add'>+		switch (dev-&gt;driver_info-&gt;family) {</div><div class='ctx'> 		case KVASER_LEAF:</div><div class='ctx'> 			cmd_tx_can_flags = &amp;cmd-&gt;u.tx_can.leaf.flags;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -383,8 +647,8 @@ kvaser_usb_leaf_frame_to_cmd(const struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 			cmd-&gt;u.tx_can.data[1] = cf-&gt;can_id &amp; 0x3f;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cmd-&gt;u.tx_can.data[5] = cf-&gt;can_dlc;</div><div class='del'>-		memcpy(&amp;cmd-&gt;u.tx_can.data[6], cf-&gt;data, cf-&gt;can_dlc);</div><div class='add'>+		cmd-&gt;u.tx_can.data[5] = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='add'>+		memcpy(&amp;cmd-&gt;u.tx_can.data[6], cf-&gt;data, cf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 			*cmd_tx_can_flags |= MSG_FLAG_REMOTE_FRAME;</div><div class='hunk'>@@ -421,7 +685,7 @@ static int kvaser_usb_leaf_wait_cmd(const struct kvaser_usb *dev, u8 id,</div><div class='ctx'> 			 * for further details.</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (tmp-&gt;len == 0) {</div><div class='del'>-				pos = round_up(pos,</div><div class='add'>+				pos = round_up(pos + 1,</div><div class='ctx'> 					       le16_to_cpu</div><div class='ctx'> 						(dev-&gt;bulk_in-&gt;wMaxPacketSize));</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -447,6 +711,9 @@ static int kvaser_usb_leaf_wait_cmd(const struct kvaser_usb *dev, u8 id,</div><div class='ctx'> end:</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> </div><div class='add'>+	if (err == 0)</div><div class='add'>+		err = kvaser_usb_leaf_verify_size(dev, cmd);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -471,10 +738,57 @@ static int kvaser_usb_leaf_send_simple_cmd(const struct kvaser_usb *dev,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvaser_usb_leaf_get_software_info_leaf(struct kvaser_usb *dev,</div><div class='add'>+						   const struct leaf_cmd_softinfo *softinfo)</div><div class='add'>+{</div><div class='add'>+	u32 fw_version;</div><div class='add'>+	u32 sw_options = le32_to_cpu(softinfo-&gt;sw_options);</div><div class='add'>+</div><div class='add'>+	fw_version = le32_to_cpu(softinfo-&gt;fw_version);</div><div class='add'>+	dev-&gt;fw_version.major = FIELD_GET(KVASER_USB_SW_VERSION_MAJOR_MASK, fw_version);</div><div class='add'>+	dev-&gt;fw_version.minor = FIELD_GET(KVASER_USB_SW_VERSION_MINOR_MASK, fw_version);</div><div class='add'>+	dev-&gt;fw_version.build = FIELD_GET(KVASER_USB_SW_VERSION_BUILD_MASK, fw_version);</div><div class='add'>+	dev-&gt;max_tx_urbs = le16_to_cpu(softinfo-&gt;max_outstanding_tx);</div><div class='add'>+</div><div class='add'>+	if (sw_options &amp; KVASER_USB_LEAF_SWOPTION_EXT_CAP)</div><div class='add'>+		dev-&gt;card_data.capabilities |= KVASER_USB_CAP_EXT_CAP;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver_info-&gt;quirks &amp; KVASER_USB_QUIRK_IGNORE_CLK_FREQ) {</div><div class='add'>+		/* Firmware expects bittiming parameters calculated for 16MHz</div><div class='add'>+		 * clock, regardless of the actual clock</div><div class='add'>+		 * Though, the reported freq is used for timestamps</div><div class='add'>+		 */</div><div class='add'>+		switch (sw_options &amp; KVASER_USB_LEAF_SWOPTION_FREQ_MASK) {</div><div class='add'>+		case KVASER_USB_LEAF_SWOPTION_FREQ_16_MHZ_CLK:</div><div class='add'>+			dev-&gt;cfg = &amp;kvaser_usb_leaf_m32c_dev_cfg_16mhz;</div><div class='add'>+			break;</div><div class='add'>+		case KVASER_USB_LEAF_SWOPTION_FREQ_24_MHZ_CLK:</div><div class='add'>+			dev-&gt;cfg = &amp;kvaser_usb_leaf_m32c_dev_cfg_24mhz;</div><div class='add'>+			break;</div><div class='add'>+		case KVASER_USB_LEAF_SWOPTION_FREQ_32_MHZ_CLK:</div><div class='add'>+			dev-&gt;cfg = &amp;kvaser_usb_leaf_m32c_dev_cfg_32mhz;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		switch (sw_options &amp; KVASER_USB_LEAF_SWOPTION_FREQ_MASK) {</div><div class='add'>+		case KVASER_USB_LEAF_SWOPTION_FREQ_16_MHZ_CLK:</div><div class='add'>+			dev-&gt;cfg = &amp;kvaser_usb_leaf_imx_dev_cfg_16mhz;</div><div class='add'>+			break;</div><div class='add'>+		case KVASER_USB_LEAF_SWOPTION_FREQ_24_MHZ_CLK:</div><div class='add'>+			dev-&gt;cfg = &amp;kvaser_usb_leaf_imx_dev_cfg_24mhz;</div><div class='add'>+			break;</div><div class='add'>+		case KVASER_USB_LEAF_SWOPTION_FREQ_32_MHZ_CLK:</div><div class='add'>+			dev-&gt;cfg = &amp;kvaser_usb_leaf_imx_dev_cfg_32mhz;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvaser_usb_leaf_get_software_info_inner(struct kvaser_usb *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_cmd cmd;</div><div class='ctx'> 	int err;</div><div class='add'>+	u32 fw_version;</div><div class='ctx'> </div><div class='ctx'> 	err = kvaser_usb_leaf_send_simple_cmd(dev, CMD_GET_SOFTWARE_INFO, 0);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -484,16 +798,21 @@ static int kvaser_usb_leaf_get_software_info_inner(struct kvaser_usb *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	switch (dev-&gt;card_data.leaf.family) {</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='ctx'> 	case KVASER_LEAF:</div><div class='del'>-		dev-&gt;fw_version = le32_to_cpu(cmd.u.leaf.softinfo.fw_version);</div><div class='del'>-		dev-&gt;max_tx_urbs =</div><div class='del'>-			le16_to_cpu(cmd.u.leaf.softinfo.max_outstanding_tx);</div><div class='add'>+		kvaser_usb_leaf_get_software_info_leaf(dev, &amp;cmd.u.leaf.softinfo);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVASER_USBCAN:</div><div class='del'>-		dev-&gt;fw_version = le32_to_cpu(cmd.u.usbcan.softinfo.fw_version);</div><div class='add'>+		fw_version = le32_to_cpu(cmd.u.usbcan.softinfo.fw_version);</div><div class='add'>+		dev-&gt;fw_version.major = FIELD_GET(KVASER_USB_SW_VERSION_MAJOR_MASK,</div><div class='add'>+						  fw_version);</div><div class='add'>+		dev-&gt;fw_version.minor = FIELD_GET(KVASER_USB_SW_VERSION_MINOR_MASK,</div><div class='add'>+						  fw_version);</div><div class='add'>+		dev-&gt;fw_version.build = FIELD_GET(KVASER_USB_SW_VERSION_BUILD_MASK,</div><div class='add'>+						  fw_version);</div><div class='ctx'> 		dev-&gt;max_tx_urbs =</div><div class='ctx'> 			le16_to_cpu(cmd.u.usbcan.softinfo.max_outstanding_tx);</div><div class='add'>+		dev-&gt;cfg = &amp;kvaser_usb_leaf_usbcan_dev_cfg;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -532,13 +851,155 @@ static int kvaser_usb_leaf_get_card_info(struct kvaser_usb *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;nchannels = cmd.u.cardinfo.nchannels;</div><div class='ctx'> 	if (dev-&gt;nchannels &gt; KVASER_USB_MAX_NET_DEVICES ||</div><div class='del'>-	    (dev-&gt;card_data.leaf.family == KVASER_USBCAN &amp;&amp;</div><div class='add'>+	    (dev-&gt;driver_info-&gt;family == KVASER_USBCAN &amp;&amp;</div><div class='ctx'> 	     dev-&gt;nchannels &gt; MAX_USBCAN_NET_DEVICES))</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	dev-&gt;ean[1] = le32_to_cpu(cmd.u.cardinfo.ean[1]);</div><div class='add'>+	dev-&gt;ean[0] = le32_to_cpu(cmd.u.cardinfo.ean[0]);</div><div class='add'>+	dev-&gt;serial_number = le32_to_cpu(cmd.u.cardinfo.serial_number);</div><div class='add'>+	dev-&gt;hw_revision = cmd.u.cardinfo.hw_revision;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvaser_usb_leaf_get_single_capability(struct kvaser_usb *dev,</div><div class='add'>+						 u16 cap_cmd_req, u16 *status)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_dev_card_data *card_data = &amp;dev-&gt;card_data;</div><div class='add'>+	struct kvaser_cmd *cmd;</div><div class='add'>+	u32 value = 0;</div><div class='add'>+	u32 mask = 0;</div><div class='add'>+	u16 cap_cmd_res;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;id = CMD_GET_CAPABILITIES_REQ;</div><div class='add'>+	cmd-&gt;u.leaf.cap_req.cap_cmd = cpu_to_le16(cap_cmd_req);</div><div class='add'>+	cmd-&gt;len = CMD_HEADER_LEN + sizeof(struct kvaser_cmd_cap_req);</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_send_cmd(dev, cmd, cmd-&gt;len);</div><div class='add'>+	if (err)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_leaf_wait_cmd(dev, CMD_GET_CAPABILITIES_RESP, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	*status = le16_to_cpu(cmd-&gt;u.leaf.cap_res.status);</div><div class='add'>+</div><div class='add'>+	if (*status != KVASER_USB_LEAF_CAP_STAT_OK)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	cap_cmd_res = le16_to_cpu(cmd-&gt;u.leaf.cap_res.cap_cmd);</div><div class='add'>+	switch (cap_cmd_res) {</div><div class='add'>+	case KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE:</div><div class='add'>+	case KVASER_USB_LEAF_CAP_CMD_ERR_REPORT:</div><div class='add'>+		value = le32_to_cpu(cmd-&gt;u.leaf.cap_res.value);</div><div class='add'>+		mask = le32_to_cpu(cmd-&gt;u.leaf.cap_res.mask);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(&amp;dev-&gt;intf-&gt;dev, "Unknown capability command %u\n",</div><div class='add'>+			 cap_cmd_res);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;nchannels; i++) {</div><div class='add'>+		if (BIT(i) &amp; (value &amp; mask)) {</div><div class='add'>+			switch (cap_cmd_res) {</div><div class='add'>+			case KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE:</div><div class='add'>+				card_data-&gt;ctrlmode_supported |=</div><div class='add'>+						CAN_CTRLMODE_LISTENONLY;</div><div class='add'>+				break;</div><div class='add'>+			case KVASER_USB_LEAF_CAP_CMD_ERR_REPORT:</div><div class='add'>+				card_data-&gt;capabilities |=</div><div class='add'>+						KVASER_USB_CAP_BERR_CAP;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	kfree(cmd);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_leaf_get_capabilities_leaf(struct kvaser_usb *dev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u16 status;</div><div class='add'>+</div><div class='add'>+	if (!(dev-&gt;card_data.capabilities &amp; KVASER_USB_CAP_EXT_CAP)) {</div><div class='add'>+		dev_info(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "No extended capability support. Upgrade device firmware.\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_leaf_get_single_capability(dev,</div><div class='add'>+						    KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE,</div><div class='add'>+						    &amp;status);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (status)</div><div class='add'>+		dev_info(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE failed %u\n",</div><div class='add'>+			 status);</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_leaf_get_single_capability(dev,</div><div class='add'>+						    KVASER_USB_LEAF_CAP_CMD_ERR_REPORT,</div><div class='add'>+						    &amp;status);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (status)</div><div class='add'>+		dev_info(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "KVASER_USB_LEAF_CAP_CMD_ERR_REPORT failed %u\n",</div><div class='add'>+			 status);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_leaf_set_led(struct kvaser_usb_net_priv *priv,</div><div class='add'>+				   enum kvaser_usb_led_state state,</div><div class='add'>+				   u16 duration_ms)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='add'>+	struct kvaser_cmd *cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='add'>+	if (!cmd)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;id = CMD_LED_ACTION_REQ;</div><div class='add'>+	cmd-&gt;len = CMD_HEADER_LEN + sizeof(struct kvaser_cmd_led_action_req);</div><div class='add'>+	cmd-&gt;u.led_action_req.tid = 0xff;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;u.led_action_req.duration_ms = cpu_to_le16(duration_ms);</div><div class='add'>+	cmd-&gt;u.led_action_req.action = state |</div><div class='add'>+				       FIELD_PREP(KVASER_USB_LEAF_LED_IDX_MASK,</div><div class='add'>+						  KVASER_USB_LEAF_LED_YELLOW_CH0_IDX +</div><div class='add'>+						  priv-&gt;channel);</div><div class='add'>+</div><div class='add'>+	ret = kvaser_usb_send_cmd(dev, cmd, cmd-&gt;len);</div><div class='add'>+	kfree(cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_leaf_get_capabilities(struct kvaser_usb *dev)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;driver_info-&gt;family == KVASER_LEAF)</div><div class='add'>+		err = kvaser_usb_leaf_get_capabilities_leaf(dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev,</div><div class='ctx'> 					   const struct kvaser_cmd *cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -547,6 +1008,8 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev,</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u8 channel, tid;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	ktime_t hwtstamp = 0;</div><div class='ctx'> </div><div class='ctx'> 	channel = cmd-&gt;u.tx_acknowledge_header.channel;</div><div class='ctx'> 	tid = cmd-&gt;u.tx_acknowledge_header.tid;</div><div class='hunk'>@@ -567,17 +1030,15 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev,</div><div class='ctx'> 	context = &amp;priv-&gt;tx_contexts[tid % dev-&gt;max_tx_urbs];</div><div class='ctx'> </div><div class='ctx'> 	/* Sometimes the state change doesn't come after a bus-off event */</div><div class='del'>-	if (priv-&gt;can.restart_ms &amp;&amp; priv-&gt;can.state &gt;= CAN_STATE_BUS_OFF) {</div><div class='del'>-		struct sk_buff *skb;</div><div class='add'>+	if (priv-&gt;can.restart_ms &amp;&amp; priv-&gt;can.state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		struct sk_buff *err_skb;</div><div class='ctx'> 		struct can_frame *cf;</div><div class='ctx'> </div><div class='del'>-		skb = alloc_can_err_skb(priv-&gt;netdev, &amp;cf);</div><div class='del'>-		if (skb) {</div><div class='add'>+		err_skb = alloc_can_err_skb(priv-&gt;netdev, &amp;cf);</div><div class='add'>+		if (err_skb) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='ctx'> </div><div class='del'>-			stats-&gt;rx_packets++;</div><div class='del'>-			stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-			netif_rx(skb);</div><div class='add'>+			netif_rx(err_skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			netdev_err(priv-&gt;netdev,</div><div class='ctx'> 				   "No memory left for err_skb\n");</div><div class='hunk'>@@ -588,13 +1049,23 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev,</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	stats-&gt;tx_packets++;</div><div class='del'>-	stats-&gt;tx_bytes += context-&gt;dlc;</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='add'>+	case KVASER_LEAF:</div><div class='add'>+		hwtstamp = kvaser_usb_timestamp48_to_ktime(dev-&gt;cfg, cmd-&gt;u.leaf.tx_ack.time);</div><div class='add'>+		break;</div><div class='add'>+	case KVASER_USBCAN:</div><div class='add'>+		hwtstamp = kvaser_usb_usbcan_timestamp_to_ktime(dev, cmd-&gt;u.usbcan.tx_ack.time);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_contexts_lock, flags);</div><div class='ctx'> </div><div class='del'>-	can_get_echo_skb(priv-&gt;netdev, context-&gt;echo_index);</div><div class='add'>+	skb = priv-&gt;can.echo_skb[context-&gt;echo_index];</div><div class='add'>+	if (skb)</div><div class='add'>+		skb_hwtstamps(skb)-&gt;hwtstamp = hwtstamp;</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+	stats-&gt;tx_bytes += can_get_echo_skb(priv-&gt;netdev,</div><div class='add'>+					    context-&gt;echo_index, NULL);</div><div class='ctx'> 	context-&gt;echo_index = dev-&gt;max_tx_urbs;</div><div class='ctx'> 	--priv-&gt;active_tx_contexts;</div><div class='ctx'> 	netif_wake_queue(priv-&gt;netdev);</div><div class='hunk'>@@ -608,7 +1079,7 @@ static int kvaser_usb_leaf_simple_cmd_async(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -623,11 +1094,22 @@ static int kvaser_usb_leaf_simple_cmd_async(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvaser_usb_leaf_chip_state_req_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf =</div><div class='add'>+		container_of(work, struct kvaser_usb_net_leaf_priv,</div><div class='add'>+			     chip_state_req_work.work);</div><div class='add'>+	struct kvaser_usb_net_priv *priv = leaf-&gt;net;</div><div class='add'>+</div><div class='add'>+	kvaser_usb_leaf_simple_cmd_async(priv, CMD_GET_CHIP_STATE);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 					const struct kvaser_usb_err_summary *es,</div><div class='ctx'> 					struct can_frame *cf)</div><div class='ctx'> {</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf = priv-&gt;sub_priv;</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='ctx'> 	enum can_state cur_state, new_state, tx_state, rx_state;</div><div class='hunk'>@@ -641,20 +1123,32 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 		new_state = CAN_STATE_BUS_OFF;</div><div class='ctx'> 	} else if (es-&gt;status &amp; M16C_STATE_BUS_PASSIVE) {</div><div class='ctx'> 		new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-	} else if (es-&gt;status &amp; M16C_STATE_BUS_ERROR) {</div><div class='add'>+	} else if ((es-&gt;status &amp; M16C_STATE_BUS_ERROR) &amp;&amp;</div><div class='add'>+		   cur_state &gt;= CAN_STATE_BUS_OFF) {</div><div class='ctx'> 		/* Guard against spurious error events after a busoff */</div><div class='del'>-		if (cur_state &lt; CAN_STATE_BUS_OFF) {</div><div class='del'>-			if (es-&gt;txerr &gt;= 128 || es-&gt;rxerr &gt;= 128)</div><div class='del'>-				new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-			else if (es-&gt;txerr &gt;= 96 || es-&gt;rxerr &gt;= 96)</div><div class='del'>-				new_state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-			else if (cur_state &gt; CAN_STATE_ERROR_ACTIVE)</div><div class='del'>-				new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-		}</div><div class='add'>+	} else if (es-&gt;txerr &gt;= 128 || es-&gt;rxerr &gt;= 128) {</div><div class='add'>+		new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='add'>+	} else if (es-&gt;txerr &gt;= 96 || es-&gt;rxerr &gt;= 96) {</div><div class='add'>+		new_state = CAN_STATE_ERROR_WARNING;</div><div class='add'>+	} else {</div><div class='add'>+		new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!es-&gt;status)</div><div class='del'>-		new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	/* 0bfd:0124 FW 4.18.778 was observed to send the initial</div><div class='add'>+	 * CMD_CHIP_STATE_EVENT after CMD_START_CHIP with M16C_STATE_BUS_OFF</div><div class='add'>+	 * bit set if the channel was bus-off when it was last stopped (even</div><div class='add'>+	 * across chip resets). This bit will clear shortly afterwards, without</div><div class='add'>+	 * triggering a second unsolicited chip state event.</div><div class='add'>+	 * Ignore this initial bus-off.</div><div class='add'>+	 */</div><div class='add'>+	if (leaf-&gt;joining_bus) {</div><div class='add'>+		if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+			netdev_dbg(priv-&gt;netdev, "ignoring bus-off during startup");</div><div class='add'>+			new_state = cur_state;</div><div class='add'>+		} else {</div><div class='add'>+			leaf-&gt;joining_bus = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (new_state != cur_state) {</div><div class='ctx'> 		tx_state = (es-&gt;txerr &gt;= es-&gt;rxerr) ? new_state : 0;</div><div class='hunk'>@@ -664,11 +1158,11 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;can.restart_ms &amp;&amp;</div><div class='del'>-	    cur_state &gt;= CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+	    cur_state == CAN_STATE_BUS_OFF &amp;&amp;</div><div class='ctx'> 	    new_state &lt; CAN_STATE_BUS_OFF)</div><div class='ctx'> 		priv-&gt;can.can_stats.restarts++;</div><div class='ctx'> </div><div class='del'>-	switch (dev-&gt;card_data.leaf.family) {</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='ctx'> 	case KVASER_LEAF:</div><div class='ctx'> 		if (es-&gt;leaf.error_factor) {</div><div class='ctx'> 			priv-&gt;can.can_stats.bus_error++;</div><div class='hunk'>@@ -692,12 +1186,11 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv,</div><div class='ctx'> static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> 				     const struct kvaser_usb_err_summary *es)</div><div class='ctx'> {</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct can_frame tmp_cf = { .can_id = CAN_ERR_FLAG,</div><div class='del'>-				    .can_dlc = CAN_ERR_DLC };</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct can_frame *cf = NULL;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct net_device_stats *stats;</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv;</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf;</div><div class='ctx'> 	enum can_state old_state, new_state;</div><div class='ctx'> </div><div class='ctx'> 	if (es-&gt;channel &gt;= dev-&gt;nchannels) {</div><div class='hunk'>@@ -707,28 +1200,29 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv = dev-&gt;nets[es-&gt;channel];</div><div class='add'>+	leaf = priv-&gt;sub_priv;</div><div class='ctx'> 	stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='ctx'> </div><div class='del'>-	/* Update all of the CAN interface's state and error counters before</div><div class='del'>-	 * trying any memory allocation that can actually fail with -ENOMEM.</div><div class='del'>-	 *</div><div class='del'>-	 * We send a temporary stack-allocated error CAN frame to</div><div class='del'>-	 * can_change_state() for the very same reason.</div><div class='del'>-	 *</div><div class='del'>-	 * TODO: Split can_change_state() responsibility between updating the</div><div class='del'>-	 * CAN interface's state and counters, and the setting up of CAN error</div><div class='del'>-	 * frame ID and data to userspace. Remove stack allocation afterwards.</div><div class='del'>-	 */</div><div class='add'>+	/* Ignore e.g. state change to bus-off reported just after stopping */</div><div class='add'>+	if (!netif_running(priv-&gt;netdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	old_state = priv-&gt;can.state;</div><div class='del'>-	kvaser_usb_leaf_rx_error_update_can_state(priv, es, &amp;tmp_cf);</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+		skb = alloc_can_err_skb(priv-&gt;netdev, &amp;cf);</div><div class='add'>+	kvaser_usb_leaf_rx_error_update_can_state(priv, es, cf);</div><div class='ctx'> 	new_state = priv-&gt;can.state;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_can_err_skb(priv-&gt;netdev, &amp;cf);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		stats-&gt;rx_dropped++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	memcpy(cf, &amp;tmp_cf, sizeof(*cf));</div><div class='add'>+	/* If there are errors, request status updates periodically as we do</div><div class='add'>+	 * not get automatic notifications of improved state.</div><div class='add'>+	 * Also request updates if we saw a stale BUS_OFF during startup</div><div class='add'>+	 * (joining_bus).</div><div class='add'>+	 */</div><div class='add'>+	if (new_state &lt; CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+	    (es-&gt;rxerr || es-&gt;txerr || new_state == CAN_STATE_ERROR_PASSIVE ||</div><div class='add'>+	     leaf-&gt;joining_bus))</div><div class='add'>+		schedule_delayed_work(&amp;leaf-&gt;chip_state_req_work,</div><div class='add'>+				      msecs_to_jiffies(500));</div><div class='ctx'> </div><div class='ctx'> 	if (new_state != old_state) {</div><div class='ctx'> 		if (es-&gt;status &amp;</div><div class='hunk'>@@ -740,14 +1234,23 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;can.restart_ms &amp;&amp;</div><div class='del'>-		    old_state &gt;= CAN_STATE_BUS_OFF &amp;&amp;</div><div class='add'>+		    old_state == CAN_STATE_BUS_OFF &amp;&amp;</div><div class='ctx'> 		    new_state &lt; CAN_STATE_BUS_OFF) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='add'>+			if (cf)</div><div class='add'>+				cf-&gt;can_id |= CAN_ERR_RESTARTED;</div><div class='ctx'> 			netif_carrier_on(priv-&gt;netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (dev-&gt;card_data.leaf.family) {</div><div class='add'>+	if (!skb) {</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+			netdev_warn(priv-&gt;netdev, "No memory left for err_skb\n");</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='ctx'> 	case KVASER_LEAF:</div><div class='ctx'> 		if (es-&gt;leaf.error_factor) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_ERR_BUSERROR | CAN_ERR_PROT;</div><div class='hunk'>@@ -774,11 +1277,12 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;data[6] = es-&gt;txerr;</div><div class='del'>-	cf-&gt;data[7] = es-&gt;rxerr;</div><div class='add'>+	if (new_state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = es-&gt;txerr;</div><div class='add'>+		cf-&gt;data[7] = es-&gt;rxerr;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -838,11 +1342,11 @@ static void kvaser_usb_leaf_usbcan_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> </div><div class='ctx'> 	case CMD_CAN_ERROR_EVENT:</div><div class='ctx'> 		es.channel = 0;</div><div class='del'>-		es.status = cmd-&gt;u.usbcan.error_event.status_ch0;</div><div class='del'>-		es.txerr = cmd-&gt;u.usbcan.error_event.tx_errors_count_ch0;</div><div class='del'>-		es.rxerr = cmd-&gt;u.usbcan.error_event.rx_errors_count_ch0;</div><div class='add'>+		es.status = cmd-&gt;u.usbcan.can_error_event.status_ch0;</div><div class='add'>+		es.txerr = cmd-&gt;u.usbcan.can_error_event.tx_errors_count_ch0;</div><div class='add'>+		es.rxerr = cmd-&gt;u.usbcan.can_error_event.rx_errors_count_ch0;</div><div class='ctx'> 		es.usbcan.other_ch_status =</div><div class='del'>-			cmd-&gt;u.usbcan.error_event.status_ch1;</div><div class='add'>+			cmd-&gt;u.usbcan.can_error_event.status_ch1;</div><div class='ctx'> 		kvaser_usb_leaf_usbcan_conditionally_rx_error(dev, &amp;es);</div><div class='ctx'> </div><div class='ctx'> 		/* The USBCAN firmware supports up to 2 channels.</div><div class='hunk'>@@ -850,13 +1354,13 @@ static void kvaser_usb_leaf_usbcan_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (dev-&gt;nchannels == MAX_USBCAN_NET_DEVICES) {</div><div class='ctx'> 			es.channel = 1;</div><div class='del'>-			es.status = cmd-&gt;u.usbcan.error_event.status_ch1;</div><div class='add'>+			es.status = cmd-&gt;u.usbcan.can_error_event.status_ch1;</div><div class='ctx'> 			es.txerr =</div><div class='del'>-				cmd-&gt;u.usbcan.error_event.tx_errors_count_ch1;</div><div class='add'>+				cmd-&gt;u.usbcan.can_error_event.tx_errors_count_ch1;</div><div class='ctx'> 			es.rxerr =</div><div class='del'>-				cmd-&gt;u.usbcan.error_event.rx_errors_count_ch1;</div><div class='add'>+				cmd-&gt;u.usbcan.can_error_event.rx_errors_count_ch1;</div><div class='ctx'> 			es.usbcan.other_ch_status =</div><div class='del'>-				cmd-&gt;u.usbcan.error_event.status_ch0;</div><div class='add'>+				cmd-&gt;u.usbcan.can_error_event.status_ch0;</div><div class='ctx'> 			kvaser_usb_leaf_usbcan_conditionally_rx_error(dev, &amp;es);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -873,11 +1377,11 @@ static void kvaser_usb_leaf_leaf_rx_error(const struct kvaser_usb *dev,</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd-&gt;id) {</div><div class='ctx'> 	case CMD_CAN_ERROR_EVENT:</div><div class='del'>-		es.channel = cmd-&gt;u.leaf.error_event.channel;</div><div class='del'>-		es.status = cmd-&gt;u.leaf.error_event.status;</div><div class='del'>-		es.txerr = cmd-&gt;u.leaf.error_event.tx_errors_count;</div><div class='del'>-		es.rxerr = cmd-&gt;u.leaf.error_event.rx_errors_count;</div><div class='del'>-		es.leaf.error_factor = cmd-&gt;u.leaf.error_event.error_factor;</div><div class='add'>+		es.channel = cmd-&gt;u.leaf.can_error_event.channel;</div><div class='add'>+		es.status = cmd-&gt;u.leaf.can_error_event.status;</div><div class='add'>+		es.txerr = cmd-&gt;u.leaf.can_error_event.tx_errors_count;</div><div class='add'>+		es.rxerr = cmd-&gt;u.leaf.can_error_event.rx_errors_count;</div><div class='add'>+		es.leaf.error_factor = cmd-&gt;u.leaf.can_error_event.error_factor;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case CMD_LEAF_LOG_MESSAGE:</div><div class='ctx'> 		es.channel = cmd-&gt;u.leaf.log_message.channel;</div><div class='hunk'>@@ -928,6 +1432,7 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev,</div><div class='ctx'> 	struct net_device_stats *stats;</div><div class='ctx'> 	u8 channel = cmd-&gt;u.rx_can_header.channel;</div><div class='ctx'> 	const u8 *rx_data = NULL;	/* GCC */</div><div class='add'>+	ktime_t hwtstamp = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (channel &gt;= dev-&gt;nchannels) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;intf-&gt;dev,</div><div class='hunk'>@@ -939,7 +1444,7 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev,</div><div class='ctx'> 	stats = &amp;priv-&gt;netdev-&gt;stats;</div><div class='ctx'> </div><div class='ctx'> 	if ((cmd-&gt;u.rx_can_header.flag &amp; MSG_FLAG_ERROR_FRAME) &amp;&amp;</div><div class='del'>-	    (dev-&gt;card_data.leaf.family == KVASER_LEAF &amp;&amp;</div><div class='add'>+	    (dev-&gt;driver_info-&gt;family == KVASER_LEAF &amp;&amp;</div><div class='ctx'> 	     cmd-&gt;id == CMD_LEAF_LOG_MESSAGE)) {</div><div class='ctx'> 		kvaser_usb_leaf_leaf_rx_error(dev, cmd);</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -955,12 +1460,14 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (dev-&gt;card_data.leaf.family) {</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='ctx'> 	case KVASER_LEAF:</div><div class='ctx'> 		rx_data = cmd-&gt;u.leaf.rx_can.data;</div><div class='add'>+		hwtstamp = kvaser_usb_timestamp48_to_ktime(dev-&gt;cfg, cmd-&gt;u.leaf.rx_can.time);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case KVASER_USBCAN:</div><div class='ctx'> 		rx_data = cmd-&gt;u.usbcan.rx_can.data;</div><div class='add'>+		hwtstamp = kvaser_usb_usbcan_timestamp_to_ktime(dev, cmd-&gt;u.usbcan.rx_can.time);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -970,7 +1477,7 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;card_data.leaf.family == KVASER_LEAF &amp;&amp; cmd-&gt;id ==</div><div class='add'>+	if (dev-&gt;driver_info-&gt;family == KVASER_LEAF &amp;&amp; cmd-&gt;id ==</div><div class='ctx'> 	    CMD_LEAF_LOG_MESSAGE) {</div><div class='ctx'> 		cf-&gt;can_id = le32_to_cpu(cmd-&gt;u.leaf.log_message.id);</div><div class='ctx'> 		if (cf-&gt;can_id &amp; KVASER_EXTENDED_FRAME)</div><div class='hunk'>@@ -978,13 +1485,13 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev,</div><div class='ctx'> 		else</div><div class='ctx'> 			cf-&gt;can_id &amp;= CAN_SFF_MASK;</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(cmd-&gt;u.leaf.log_message.dlc);</div><div class='add'>+		can_frame_set_cc_len(cf, cmd-&gt;u.leaf.log_message.dlc &amp; 0xF, priv-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd-&gt;u.leaf.log_message.flags &amp; MSG_FLAG_REMOTE_FRAME)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 		else</div><div class='ctx'> 			memcpy(cf-&gt;data, &amp;cmd-&gt;u.leaf.log_message.data,</div><div class='del'>-			       cf-&gt;can_dlc);</div><div class='add'>+			       cf-&gt;len);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		cf-&gt;can_id = ((rx_data[0] &amp; 0x1f) &lt;&lt; 6) | (rx_data[1] &amp; 0x3f);</div><div class='ctx'> </div><div class='hunk'>@@ -996,19 +1503,89 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev,</div><div class='ctx'> 			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(rx_data[5]);</div><div class='add'>+		can_frame_set_cc_len(cf, rx_data[5] &amp; 0xF, priv-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='ctx'> 		if (cmd-&gt;u.rx_can_header.flag &amp; MSG_FLAG_REMOTE_FRAME)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='ctx'> 		else</div><div class='del'>-			memcpy(cf-&gt;data, &amp;rx_data[6], cf-&gt;can_dlc);</div><div class='add'>+			memcpy(cf-&gt;data, &amp;rx_data[6], cf-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_hwtstamps(skb)-&gt;hwtstamp = hwtstamp;</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void kvaser_usb_leaf_error_event_parameter(const struct kvaser_usb *dev,</div><div class='add'>+						  const struct kvaser_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	u16 info1 = 0;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='add'>+	case KVASER_LEAF:</div><div class='add'>+		info1 = le16_to_cpu(cmd-&gt;u.leaf.error_event.info1);</div><div class='add'>+		break;</div><div class='add'>+	case KVASER_USBCAN:</div><div class='add'>+		info1 = le16_to_cpu(cmd-&gt;u.usbcan.error_event.info1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* info1 will contain the offending cmd_no */</div><div class='add'>+	switch (info1) {</div><div class='add'>+	case CMD_SET_CTRL_MODE:</div><div class='add'>+		dev_warn(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "CMD_SET_CTRL_MODE error in parameter\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CMD_SET_BUS_PARAMS:</div><div class='add'>+		dev_warn(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "CMD_SET_BUS_PARAMS error in parameter\n");</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "Unhandled parameter error event cmd_no (%u)\n",</div><div class='add'>+			 info1);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_usb_leaf_error_event(const struct kvaser_usb *dev,</div><div class='add'>+					const struct kvaser_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	u8 error_code = 0;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;driver_info-&gt;family) {</div><div class='add'>+	case KVASER_LEAF:</div><div class='add'>+		error_code = cmd-&gt;u.leaf.error_event.error_code;</div><div class='add'>+		break;</div><div class='add'>+	case KVASER_USBCAN:</div><div class='add'>+		error_code = cmd-&gt;u.usbcan.error_event.error_code;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (error_code) {</div><div class='add'>+	case KVASER_USB_LEAF_ERROR_EVENT_TX_QUEUE_FULL:</div><div class='add'>+		/* Received additional CAN message, when firmware TX queue is</div><div class='add'>+		 * already full. Something is wrong with the driver.</div><div class='add'>+		 * This should never happen!</div><div class='add'>+		 */</div><div class='add'>+		dev_err(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			"Received error event TX_QUEUE_FULL\n");</div><div class='add'>+		break;</div><div class='add'>+	case KVASER_USB_LEAF_ERROR_EVENT_PARAM:</div><div class='add'>+		kvaser_usb_leaf_error_event_parameter(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_warn(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			 "Unhandled error event (%d)\n", error_code);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void kvaser_usb_leaf_start_chip_reply(const struct kvaser_usb *dev,</div><div class='ctx'> 					     const struct kvaser_cmd *cmd)</div><div class='ctx'> {</div><div class='hunk'>@@ -1049,9 +1626,31 @@ static void kvaser_usb_leaf_stop_chip_reply(const struct kvaser_usb *dev,</div><div class='ctx'> 	complete(&amp;priv-&gt;stop_comp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev,</div><div class='add'>+static void kvaser_usb_leaf_get_busparams_reply(const struct kvaser_usb *dev,</div><div class='add'>+						const struct kvaser_cmd *cmd)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_priv *priv;</div><div class='add'>+	u8 channel = cmd-&gt;u.busparams.channel;</div><div class='add'>+</div><div class='add'>+	if (channel &gt;= dev-&gt;nchannels) {</div><div class='add'>+		dev_err(&amp;dev-&gt;intf-&gt;dev,</div><div class='add'>+			"Invalid channel number (%d)\n", channel);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv = dev-&gt;nets[channel];</div><div class='add'>+	memcpy(&amp;priv-&gt;busparams_nominal, &amp;cmd-&gt;u.busparams.busparams,</div><div class='add'>+	       sizeof(priv-&gt;busparams_nominal));</div><div class='add'>+</div><div class='add'>+	complete(&amp;priv-&gt;get_busparams_comp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_usb_leaf_handle_command(struct kvaser_usb *dev,</div><div class='ctx'> 					   const struct kvaser_cmd *cmd)</div><div class='ctx'> {</div><div class='add'>+	if (kvaser_usb_leaf_verify_size(dev, cmd) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	switch (cmd-&gt;id) {</div><div class='ctx'> 	case CMD_START_CHIP_REPLY:</div><div class='ctx'> 		kvaser_usb_leaf_start_chip_reply(dev, cmd);</div><div class='hunk'>@@ -1067,14 +1666,14 @@ static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CMD_LEAF_LOG_MESSAGE:</div><div class='del'>-		if (dev-&gt;card_data.leaf.family != KVASER_LEAF)</div><div class='add'>+		if (dev-&gt;driver_info-&gt;family != KVASER_LEAF)</div><div class='ctx'> 			goto warn;</div><div class='ctx'> 		kvaser_usb_leaf_rx_can_msg(dev, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CMD_CHIP_STATE_EVENT:</div><div class='ctx'> 	case CMD_CAN_ERROR_EVENT:</div><div class='del'>-		if (dev-&gt;card_data.leaf.family == KVASER_LEAF)</div><div class='add'>+		if (dev-&gt;driver_info-&gt;family == KVASER_LEAF)</div><div class='ctx'> 			kvaser_usb_leaf_leaf_rx_error(dev, cmd);</div><div class='ctx'> 		else</div><div class='ctx'> 			kvaser_usb_leaf_usbcan_rx_error(dev, cmd);</div><div class='hunk'>@@ -1084,16 +1683,29 @@ static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev,</div><div class='ctx'> 		kvaser_usb_leaf_tx_acknowledge(dev, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	/* Ignored commands */</div><div class='add'>+	case CMD_ERROR_EVENT:</div><div class='add'>+		kvaser_usb_leaf_error_event(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case CMD_GET_BUS_PARAMS_REPLY:</div><div class='add'>+		kvaser_usb_leaf_get_busparams_reply(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case CMD_USBCAN_CLOCK_OVERFLOW_EVENT:</div><div class='del'>-		if (dev-&gt;card_data.leaf.family != KVASER_USBCAN)</div><div class='add'>+		if (dev-&gt;driver_info-&gt;family != KVASER_USBCAN)</div><div class='ctx'> 			goto warn;</div><div class='add'>+		dev-&gt;card_data.usbcan_timestamp_msb =</div><div class='add'>+					le32_to_cpu(cmd-&gt;u.usbcan.clk_overflow_event.time) &amp;</div><div class='add'>+					KVASER_USB_USBCAN_CLK_OVERFLOW_MASK;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='add'>+	/* Ignored commands */</div><div class='ctx'> 	case CMD_FLUSH_QUEUE_REPLY:</div><div class='del'>-		if (dev-&gt;card_data.leaf.family != KVASER_LEAF)</div><div class='add'>+		if (dev-&gt;driver_info-&gt;family != KVASER_LEAF)</div><div class='ctx'> 			goto warn;</div><div class='ctx'> 		break;</div><div class='add'>+	case CMD_LED_ACTION_RESP:</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> warn:		dev_warn(&amp;dev-&gt;intf-&gt;dev, "Unhandled command (%d)\n", cmd-&gt;id);</div><div class='hunk'>@@ -1120,7 +1732,7 @@ static void kvaser_usb_leaf_read_bulk_callback(struct kvaser_usb *dev,</div><div class='ctx'> 		 * number of events in case of a heavy rx load on the bus.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (cmd-&gt;len == 0) {</div><div class='del'>-			pos = round_up(pos, le16_to_cpu</div><div class='add'>+			pos = round_up(pos + 1, le16_to_cpu</div><div class='ctx'> 						(dev-&gt;bulk_in-&gt;wMaxPacketSize));</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1140,7 +1752,7 @@ static int kvaser_usb_leaf_set_opt_mode(const struct kvaser_usb_net_priv *priv)</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1162,9 +1774,12 @@ static int kvaser_usb_leaf_set_opt_mode(const struct kvaser_usb_net_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf = priv-&gt;sub_priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;priv-&gt;start_comp);</div><div class='add'>+	leaf-&gt;joining_bus = true;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;priv-&gt;start_comp);</div><div class='ctx'> </div><div class='ctx'> 	err = kvaser_usb_leaf_send_simple_cmd(priv-&gt;dev, CMD_START_CHIP,</div><div class='ctx'> 					      priv-&gt;channel);</div><div class='hunk'>@@ -1180,9 +1795,12 @@ static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static int kvaser_usb_leaf_stop_chip(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf = priv-&gt;sub_priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	init_completion(&amp;priv-&gt;stop_comp);</div><div class='add'>+	reinit_completion(&amp;priv-&gt;stop_comp);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work(&amp;leaf-&gt;chip_state_req_work);</div><div class='ctx'> </div><div class='ctx'> 	err = kvaser_usb_leaf_send_simple_cmd(priv-&gt;dev, CMD_STOP_CHIP,</div><div class='ctx'> 					      priv-&gt;channel);</div><div class='hunk'>@@ -1206,7 +1824,7 @@ static int kvaser_usb_leaf_flush_queue(struct kvaser_usb_net_priv *priv)</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	cmd = kmalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='add'>+	cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);</div><div class='ctx'> 	if (!cmd)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1225,28 +1843,40 @@ static int kvaser_usb_leaf_init_card(struct kvaser_usb *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_dev_card_data *card_data = &amp;dev-&gt;card_data;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;cfg = &amp;kvaser_usb_leaf_dev_cfg;</div><div class='ctx'> 	card_data-&gt;ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct can_bittiming_const kvaser_usb_leaf_bittiming_const = {</div><div class='del'>-	.name = "kvaser_usb",</div><div class='del'>-	.tseg1_min = KVASER_USB_TSEG1_MIN,</div><div class='del'>-	.tseg1_max = KVASER_USB_TSEG1_MAX,</div><div class='del'>-	.tseg2_min = KVASER_USB_TSEG2_MIN,</div><div class='del'>-	.tseg2_max = KVASER_USB_TSEG2_MAX,</div><div class='del'>-	.sjw_max = KVASER_USB_SJW_MAX,</div><div class='del'>-	.brp_min = KVASER_USB_BRP_MIN,</div><div class='del'>-	.brp_max = KVASER_USB_BRP_MAX,</div><div class='del'>-	.brp_inc = KVASER_USB_BRP_INC,</div><div class='del'>-};</div><div class='add'>+static int kvaser_usb_leaf_init_channel(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf;</div><div class='add'>+</div><div class='add'>+	leaf = devm_kzalloc(&amp;priv-&gt;dev-&gt;intf-&gt;dev, sizeof(*leaf), GFP_KERNEL);</div><div class='add'>+	if (!leaf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	leaf-&gt;net = priv;</div><div class='add'>+	INIT_DELAYED_WORK(&amp;leaf-&gt;chip_state_req_work,</div><div class='add'>+			  kvaser_usb_leaf_chip_state_req_work);</div><div class='ctx'> </div><div class='del'>-static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev)</div><div class='add'>+	priv-&gt;sub_priv = leaf;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void kvaser_usb_leaf_remove_channel(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf = priv-&gt;sub_priv;</div><div class='add'>+</div><div class='add'>+	if (leaf)</div><div class='add'>+		cancel_delayed_work_sync(&amp;leaf-&gt;chip_state_req_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int kvaser_usb_leaf_set_bittiming(const struct net_device *netdev,</div><div class='add'>+					 const struct kvaser_usb_busparams *busparams)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='del'>-	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='ctx'> 	struct kvaser_usb *dev = priv-&gt;dev;</div><div class='ctx'> 	struct kvaser_cmd *cmd;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -1259,15 +1889,8 @@ static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev)</div><div class='ctx'> 	cmd-&gt;len = CMD_HEADER_LEN + sizeof(struct kvaser_cmd_busparams);</div><div class='ctx'> 	cmd-&gt;u.busparams.channel = priv-&gt;channel;</div><div class='ctx'> 	cmd-&gt;u.busparams.tid = 0xff;</div><div class='del'>-	cmd-&gt;u.busparams.bitrate = cpu_to_le32(bt-&gt;bitrate);</div><div class='del'>-	cmd-&gt;u.busparams.sjw = bt-&gt;sjw;</div><div class='del'>-	cmd-&gt;u.busparams.tseg1 = bt-&gt;prop_seg + bt-&gt;phase_seg1;</div><div class='del'>-	cmd-&gt;u.busparams.tseg2 = bt-&gt;phase_seg2;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_3_SAMPLES)</div><div class='del'>-		cmd-&gt;u.busparams.no_samp = 3;</div><div class='del'>-	else</div><div class='del'>-		cmd-&gt;u.busparams.no_samp = 1;</div><div class='add'>+	memcpy(&amp;cmd-&gt;u.busparams.busparams, busparams,</div><div class='add'>+	       sizeof(cmd-&gt;u.busparams.busparams));</div><div class='ctx'> </div><div class='ctx'> 	rc = kvaser_usb_send_cmd(dev, cmd, cmd-&gt;len);</div><div class='ctx'> </div><div class='hunk'>@@ -1275,17 +1898,45 @@ static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int kvaser_usb_leaf_get_busparams(struct kvaser_usb_net_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;dev-&gt;driver_info-&gt;family == KVASER_USBCAN)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;priv-&gt;get_busparams_comp);</div><div class='add'>+</div><div class='add'>+	err = kvaser_usb_leaf_send_simple_cmd(priv-&gt;dev, CMD_GET_BUS_PARAMS,</div><div class='add'>+					      priv-&gt;channel);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!wait_for_completion_timeout(&amp;priv-&gt;get_busparams_comp,</div><div class='add'>+					 msecs_to_jiffies(KVASER_USB_TIMEOUT)))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int kvaser_usb_leaf_set_mode(struct net_device *netdev,</div><div class='ctx'> 				    enum can_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct kvaser_usb_net_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct kvaser_usb_net_leaf_priv *leaf = priv-&gt;sub_priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case CAN_MODE_START:</div><div class='add'>+		kvaser_usb_unlink_tx_urbs(priv);</div><div class='add'>+</div><div class='add'>+		leaf-&gt;joining_bus = true;</div><div class='add'>+</div><div class='ctx'> 		err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+</div><div class='add'>+		priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1310,7 +1961,7 @@ static int kvaser_usb_leaf_setup_endpoints(struct kvaser_usb *dev)</div><div class='ctx'> 	struct usb_endpoint_descriptor *endpoint;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	iface_desc = &amp;dev-&gt;intf-&gt;altsetting[0];</div><div class='add'>+	iface_desc = dev-&gt;intf-&gt;cur_altsetting;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; iface_desc-&gt;desc.bNumEndpoints; ++i) {</div><div class='ctx'> 		endpoint = &amp;iface_desc-&gt;endpoint[i].desc;</div><div class='hunk'>@@ -1332,14 +1983,19 @@ static int kvaser_usb_leaf_setup_endpoints(struct kvaser_usb *dev)</div><div class='ctx'> const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops = {</div><div class='ctx'> 	.dev_set_mode = kvaser_usb_leaf_set_mode,</div><div class='ctx'> 	.dev_set_bittiming = kvaser_usb_leaf_set_bittiming,</div><div class='add'>+	.dev_get_busparams = kvaser_usb_leaf_get_busparams,</div><div class='ctx'> 	.dev_set_data_bittiming = NULL,</div><div class='add'>+	.dev_get_data_busparams = NULL,</div><div class='ctx'> 	.dev_get_berr_counter = kvaser_usb_leaf_get_berr_counter,</div><div class='ctx'> 	.dev_setup_endpoints = kvaser_usb_leaf_setup_endpoints,</div><div class='ctx'> 	.dev_init_card = kvaser_usb_leaf_init_card,</div><div class='add'>+	.dev_init_channel = kvaser_usb_leaf_init_channel,</div><div class='add'>+	.dev_remove_channel = kvaser_usb_leaf_remove_channel,</div><div class='ctx'> 	.dev_get_software_info = kvaser_usb_leaf_get_software_info,</div><div class='ctx'> 	.dev_get_software_details = NULL,</div><div class='ctx'> 	.dev_get_card_info = kvaser_usb_leaf_get_card_info,</div><div class='del'>-	.dev_get_capabilities = NULL,</div><div class='add'>+	.dev_get_capabilities = kvaser_usb_leaf_get_capabilities,</div><div class='add'>+	.dev_set_led = kvaser_usb_leaf_set_led,</div><div class='ctx'> 	.dev_set_opt_mode = kvaser_usb_leaf_set_opt_mode,</div><div class='ctx'> 	.dev_start_chip = kvaser_usb_leaf_start_chip,</div><div class='ctx'> 	.dev_stop_chip = kvaser_usb_leaf_stop_chip,</div><div class='hunk'>@@ -1348,11 +2004,3 @@ const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops = {</div><div class='ctx'> 	.dev_read_bulk_callback = kvaser_usb_leaf_read_bulk_callback,</div><div class='ctx'> 	.dev_frame_to_cmd = kvaser_usb_leaf_frame_to_cmd,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_dev_cfg = {</div><div class='del'>-	.clock = {</div><div class='del'>-		.freq = CAN_USB_CLOCK,</div><div class='del'>-	},</div><div class='del'>-	.timestamp_freq = 1,</div><div class='del'>-	.bittiming_const = &amp;kvaser_usb_leaf_bittiming_const,</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/can/usb/mcba_usb.c b/drivers/net/can/usb/mcba_usb.c<br/>index 8d8c2086424d..41c0a1c399bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/mcba_usb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/mcba_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/mcba_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/mcba_usb.c</a></div><div class='hunk'>@@ -1,27 +1,16 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* SocketCAN driver for Microchip CAN BUS Analyzer Tool</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2017 Mobica Limited</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published</div><div class='del'>- * by the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along</div><div class='del'>- * with this program.</div><div class='del'>- *</div><div class='ctx'>  * This driver is inspired by the 4.6.2 version of net/can/usb/usb_8dev.c</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -39,15 +28,11 @@</div><div class='ctx'> #define MCBA_CTX_FREE MCBA_MAX_TX_URBS</div><div class='ctx'> </div><div class='ctx'> /* RX buffer must be bigger than msg size since at the</div><div class='del'>- * beggining USB messages are stacked.</div><div class='add'>+ * beginning USB messages are stacked.</div><div class='ctx'>  */</div><div class='ctx'> #define MCBA_USB_RX_BUFF_SIZE 64</div><div class='ctx'> #define MCBA_USB_TX_BUFF_SIZE (sizeof(struct mcba_usb_msg))</div><div class='ctx'> </div><div class='del'>-/* MCBA endpoint numbers */</div><div class='del'>-#define MCBA_USB_EP_IN 1</div><div class='del'>-#define MCBA_USB_EP_OUT 1</div><div class='del'>-</div><div class='ctx'> /* Microchip command id */</div><div class='ctx'> #define MBCA_CMD_RECEIVE_MESSAGE 0xE3</div><div class='ctx'> #define MBCA_CMD_I_AM_ALIVE_FROM_CAN 0xF5</div><div class='hunk'>@@ -62,6 +47,10 @@</div><div class='ctx'> #define MCBA_VER_REQ_USB 1</div><div class='ctx'> #define MCBA_VER_REQ_CAN 2</div><div class='ctx'> </div><div class='add'>+/* Drive the CAN_RES signal LOW "0" to activate R24 and R25 */</div><div class='add'>+#define MCBA_VER_TERMINATION_ON 0</div><div class='add'>+#define MCBA_VER_TERMINATION_OFF 1</div><div class='add'>+</div><div class='ctx'> #define MCBA_SIDL_EXID_MASK 0x8</div><div class='ctx'> #define MCBA_DLC_MASK 0xf</div><div class='ctx'> #define MCBA_DLC_RTR_MASK 0x40</div><div class='hunk'>@@ -75,7 +64,6 @@</div><div class='ctx'> struct mcba_usb_ctx {</div><div class='ctx'> 	struct mcba_priv *priv;</div><div class='ctx'> 	u32 ndx;</div><div class='del'>-	u8 dlc;</div><div class='ctx'> 	bool can;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -93,6 +81,10 @@ struct mcba_priv {</div><div class='ctx'> 	bool can_ka_first_pass;</div><div class='ctx'> 	bool can_speed_check;</div><div class='ctx'> 	atomic_t free_ctx_cnt;</div><div class='add'>+	void *rxbuf[MCBA_MAX_RX_URBS];</div><div class='add'>+	dma_addr_t rxbuf_dma[MCBA_MAX_RX_URBS];</div><div class='add'>+	int rx_pipe;</div><div class='add'>+	int tx_pipe;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CAN frame */</div><div class='hunk'>@@ -193,13 +185,10 @@ static inline struct mcba_usb_ctx *mcba_usb_get_free_ctx(struct mcba_priv *priv,</div><div class='ctx'> 			ctx = &amp;priv-&gt;tx_context[i];</div><div class='ctx'> 			ctx-&gt;ndx = i;</div><div class='ctx'> </div><div class='del'>-			if (cf) {</div><div class='add'>+			if (cf)</div><div class='ctx'> 				ctx-&gt;can = true;</div><div class='del'>-				ctx-&gt;dlc = cf-&gt;can_dlc;</div><div class='del'>-			} else {</div><div class='add'>+			else</div><div class='ctx'> 				ctx-&gt;can = false;</div><div class='del'>-				ctx-&gt;dlc = 0;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='ctx'> 			atomic_dec(&amp;priv-&gt;free_ctx_cnt);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -245,10 +234,8 @@ static void mcba_usb_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;stats.tx_packets++;</div><div class='del'>-		netdev-&gt;stats.tx_bytes += ctx-&gt;dlc;</div><div class='del'>-</div><div class='del'>-		can_led_event(netdev, CAN_LED_EVENT_TX);</div><div class='del'>-		can_get_echo_skb(netdev, ctx-&gt;ndx);</div><div class='add'>+		netdev-&gt;stats.tx_bytes += can_get_echo_skb(netdev, ctx-&gt;ndx,</div><div class='add'>+							   NULL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (urb-&gt;status)</div><div class='hunk'>@@ -281,10 +268,8 @@ static netdev_tx_t mcba_usb_xmit(struct mcba_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(buf, usb_msg, MCBA_USB_TX_BUFF_SIZE);</div><div class='ctx'> </div><div class='del'>-	usb_fill_bulk_urb(urb, priv-&gt;udev,</div><div class='del'>-			  usb_sndbulkpipe(priv-&gt;udev, MCBA_USB_EP_OUT), buf,</div><div class='del'>-			  MCBA_USB_TX_BUFF_SIZE, mcba_usb_write_bulk_callback,</div><div class='del'>-			  ctx);</div><div class='add'>+	usb_fill_bulk_urb(urb, priv-&gt;udev, priv-&gt;tx_pipe, buf, MCBA_USB_TX_BUFF_SIZE,</div><div class='add'>+			  mcba_usb_write_bulk_callback, ctx);</div><div class='ctx'> </div><div class='ctx'> 	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> 	usb_anchor_urb(urb, &amp;priv-&gt;tx_submitted);</div><div class='hunk'>@@ -330,15 +315,13 @@ static netdev_tx_t mcba_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		.cmd_id = MBCA_CMD_TRANSMIT_MESSAGE_EV</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	ctx = mcba_usb_get_free_ctx(priv, cf);</div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, priv-&gt;netdev, ctx-&gt;ndx);</div><div class='del'>-</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='ctx'> 		/* SIDH    | SIDL                 | EIDH   | EIDL</div><div class='ctx'> 		 * 28 - 21 | 20 19 18 x x x 17 16 | 15 - 8 | 7 - 0</div><div class='hunk'>@@ -361,13 +344,15 @@ static netdev_tx_t mcba_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		usb_msg.eid = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	usb_msg.dlc = cf-&gt;can_dlc;</div><div class='add'>+	usb_msg.dlc = cf-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(usb_msg.data, cf-&gt;data, usb_msg.dlc);</div><div class='ctx'> </div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 		usb_msg.dlc |= MCBA_DLC_RTR_MASK;</div><div class='ctx'> </div><div class='add'>+	can_put_echo_skb(skb, priv-&gt;netdev, ctx-&gt;ndx, 0);</div><div class='add'>+</div><div class='ctx'> 	err = mcba_usb_xmit(priv, (struct mcba_usb_msg *)&amp;usb_msg, ctx);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto xmit_failed;</div><div class='hunk'>@@ -375,9 +360,8 @@ static netdev_tx_t mcba_usb_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> xmit_failed:</div><div class='del'>-	can_free_echo_skb(priv-&gt;netdev, ctx-&gt;ndx);</div><div class='add'>+	can_free_echo_skb(priv-&gt;netdev, ctx-&gt;ndx, NULL);</div><div class='ctx'> 	mcba_usb_free_ctx(ctx);</div><div class='del'>-	dev_kfree_skb(skb);</div><div class='ctx'> 	stats-&gt;tx_dropped++;</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -459,17 +443,17 @@ static void mcba_usb_process_can(struct mcba_priv *priv,</div><div class='ctx'> 		cf-&gt;can_id = (sid &amp; 0xffe0) &gt;&gt; 5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (msg-&gt;dlc &amp; MCBA_DLC_RTR_MASK)</div><div class='del'>-		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(msg-&gt;dlc &amp; MCBA_DLC_MASK);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(msg-&gt;dlc &amp; MCBA_DLC_MASK);</div><div class='ctx'> </div><div class='del'>-	memcpy(cf-&gt;data, msg-&gt;data, cf-&gt;can_dlc);</div><div class='add'>+	if (msg-&gt;dlc &amp; MCBA_DLC_RTR_MASK) {</div><div class='add'>+		cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(cf-&gt;data, msg-&gt;data, cf-&gt;len);</div><div class='ctx'> </div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> </div><div class='del'>-	can_led_event(priv-&gt;netdev, CAN_LED_EVENT_RX);</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -477,13 +461,13 @@ static void mcba_usb_process_ka_usb(struct mcba_priv *priv,</div><div class='ctx'> 				    struct mcba_usb_msg_ka_usb *msg)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(priv-&gt;usb_ka_first_pass)) {</div><div class='del'>-		netdev_info(priv-&gt;netdev, "PIC USB version %hhu.%hhu\n",</div><div class='add'>+		netdev_info(priv-&gt;netdev, "PIC USB version %u.%u\n",</div><div class='ctx'> 			    msg-&gt;soft_ver_major, msg-&gt;soft_ver_minor);</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;usb_ka_first_pass = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (msg-&gt;termination_state)</div><div class='add'>+	if (msg-&gt;termination_state == MCBA_VER_TERMINATION_ON)</div><div class='ctx'> 		priv-&gt;can.termination = MCBA_TERMINATION_ENABLED;</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;can.termination = MCBA_TERMINATION_DISABLED;</div><div class='hunk'>@@ -503,7 +487,7 @@ static void mcba_usb_process_ka_can(struct mcba_priv *priv,</div><div class='ctx'> 				    struct mcba_usb_msg_ka_can *msg)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(priv-&gt;can_ka_first_pass)) {</div><div class='del'>-		netdev_info(priv-&gt;netdev, "PIC CAN version %hhu.%hhu\n",</div><div class='add'>+		netdev_info(priv-&gt;netdev, "PIC CAN version %u.%u\n",</div><div class='ctx'> 			    msg-&gt;soft_ver_major, msg-&gt;soft_ver_minor);</div><div class='ctx'> </div><div class='ctx'> 		priv-&gt;can_ka_first_pass = false;</div><div class='hunk'>@@ -565,7 +549,7 @@ static void mcba_usb_process_rx(struct mcba_priv *priv,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		netdev_warn(priv-&gt;netdev, "Unsupported msg (0x%hhX)",</div><div class='add'>+		netdev_warn(priv-&gt;netdev, "Unsupported msg (0x%X)",</div><div class='ctx'> 			    msg-&gt;cmd_id);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -620,7 +604,7 @@ static void mcba_usb_read_bulk_callback(struct urb *urb)</div><div class='ctx'> resubmit_urb:</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_bulk_urb(urb, priv-&gt;udev,</div><div class='del'>-			  usb_rcvbulkpipe(priv-&gt;udev, MCBA_USB_EP_OUT),</div><div class='add'>+			  priv-&gt;rx_pipe,</div><div class='ctx'> 			  urb-&gt;transfer_buffer, MCBA_USB_RX_BUFF_SIZE,</div><div class='ctx'> 			  mcba_usb_read_bulk_callback, priv);</div><div class='ctx'> </div><div class='hunk'>@@ -644,6 +628,7 @@ static int mcba_usb_start(struct mcba_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; MCBA_MAX_RX_URBS; i++) {</div><div class='ctx'> 		struct urb *urb = NULL;</div><div class='ctx'> 		u8 *buf;</div><div class='add'>+		dma_addr_t buf_dma;</div><div class='ctx'> </div><div class='ctx'> 		/* create a URB, and a buffer for it */</div><div class='ctx'> 		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='hunk'>@@ -653,7 +638,7 @@ static int mcba_usb_start(struct mcba_priv *priv)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		buf = usb_alloc_coherent(priv-&gt;udev, MCBA_USB_RX_BUFF_SIZE,</div><div class='del'>-					 GFP_KERNEL, &amp;urb-&gt;transfer_dma);</div><div class='add'>+					 GFP_KERNEL, &amp;buf_dma);</div><div class='ctx'> 		if (!buf) {</div><div class='ctx'> 			netdev_err(netdev, "No memory left for USB buffer\n");</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='hunk'>@@ -661,8 +646,10 @@ static int mcba_usb_start(struct mcba_priv *priv)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		urb-&gt;transfer_dma = buf_dma;</div><div class='add'>+</div><div class='ctx'> 		usb_fill_bulk_urb(urb, priv-&gt;udev,</div><div class='del'>-				  usb_rcvbulkpipe(priv-&gt;udev, MCBA_USB_EP_IN),</div><div class='add'>+				  priv-&gt;rx_pipe,</div><div class='ctx'> 				  buf, MCBA_USB_RX_BUFF_SIZE,</div><div class='ctx'> 				  mcba_usb_read_bulk_callback, priv);</div><div class='ctx'> 		urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='hunk'>@@ -672,11 +659,14 @@ static int mcba_usb_start(struct mcba_priv *priv)</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			usb_unanchor_urb(urb);</div><div class='ctx'> 			usb_free_coherent(priv-&gt;udev, MCBA_USB_RX_BUFF_SIZE,</div><div class='del'>-					  buf, urb-&gt;transfer_dma);</div><div class='add'>+					  buf, buf_dma);</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		priv-&gt;rxbuf[i] = buf;</div><div class='add'>+		priv-&gt;rxbuf_dma[i] = buf_dma;</div><div class='add'>+</div><div class='ctx'> 		/* Drop reference, USB core will take care of freeing it */</div><div class='ctx'> 		usb_free_urb(urb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -711,7 +701,6 @@ static int mcba_usb_open(struct net_device *netdev)</div><div class='ctx'> 	priv-&gt;can_speed_check = true;</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> </div><div class='del'>-	can_led_event(netdev, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	netif_start_queue(netdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -719,7 +708,14 @@ static int mcba_usb_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> static void mcba_urb_unlink(struct mcba_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;priv-&gt;rx_submitted);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MCBA_MAX_RX_URBS; ++i)</div><div class='add'>+		usb_free_coherent(priv-&gt;udev, MCBA_USB_RX_BUFF_SIZE,</div><div class='add'>+				  priv-&gt;rxbuf[i], priv-&gt;rxbuf_dma[i]);</div><div class='add'>+</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;priv-&gt;tx_submitted);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -736,7 +732,6 @@ static int mcba_usb_close(struct net_device *netdev)</div><div class='ctx'> 	mcba_urb_unlink(priv);</div><div class='ctx'> </div><div class='ctx'> 	close_candev(netdev);</div><div class='del'>-	can_led_event(netdev, CAN_LED_EVENT_STOP);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -768,6 +763,10 @@ static const struct net_device_ops mcba_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit = mcba_usb_start_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ethtool_ops mcba_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Microchip CANBUS has hardcoded bittiming values by default.</div><div class='ctx'>  * This function sends request via USB to change the speed and align bittiming</div><div class='ctx'>  * values for presentation purposes only</div><div class='hunk'>@@ -790,9 +789,9 @@ static int mcba_set_termination(struct net_device *netdev, u16 term)</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	if (term == MCBA_TERMINATION_ENABLED)</div><div class='del'>-		usb_msg.termination = 1;</div><div class='add'>+		usb_msg.termination = MCBA_VER_TERMINATION_ON;</div><div class='ctx'> 	else</div><div class='del'>-		usb_msg.termination = 0;</div><div class='add'>+		usb_msg.termination = MCBA_VER_TERMINATION_OFF;</div><div class='ctx'> </div><div class='ctx'> 	mcba_usb_xmit_cmd(priv, (struct mcba_usb_msg *)&amp;usb_msg);</div><div class='ctx'> </div><div class='hunk'>@@ -804,8 +803,15 @@ static int mcba_usb_probe(struct usb_interface *intf,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct mcba_priv *priv;</div><div class='del'>-	int err = -ENOMEM;</div><div class='add'>+	int err;</div><div class='ctx'> 	struct usb_device *usbdev = interface_to_usbdev(intf);</div><div class='add'>+	struct usb_endpoint_descriptor *in, *out;</div><div class='add'>+</div><div class='add'>+	err = usb_find_common_endpoints(intf-&gt;cur_altsetting, &amp;in, &amp;out, NULL, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;intf-&gt;dev, "Can't find endpoints\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netdev = alloc_candev(sizeof(struct mcba_priv), MCBA_MAX_TX_URBS);</div><div class='ctx'> 	if (!netdev) {</div><div class='hunk'>@@ -839,6 +845,7 @@ static int mcba_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 	priv-&gt;can.do_set_bittiming = mcba_net_set_bittiming;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;mcba_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;mcba_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO; /* we support local echo */</div><div class='ctx'> </div><div class='hunk'>@@ -851,7 +858,8 @@ static int mcba_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 		goto cleanup_free_candev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(netdev);</div><div class='add'>+	priv-&gt;rx_pipe = usb_rcvbulkpipe(priv-&gt;udev, in-&gt;bEndpointAddress);</div><div class='add'>+	priv-&gt;tx_pipe = usb_sndbulkpipe(priv-&gt;udev, out-&gt;bEndpointAddress);</div><div class='ctx'> </div><div class='ctx'> 	/* Start USB dev only if we have successfully registered CAN device */</div><div class='ctx'> 	err = mcba_usb_start(priv);</div><div class='hunk'>@@ -887,9 +895,8 @@ static void mcba_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	netdev_info(priv-&gt;netdev, "device disconnected\n");</div><div class='ctx'> </div><div class='ctx'> 	unregister_candev(priv-&gt;netdev);</div><div class='del'>-	free_candev(priv-&gt;netdev);</div><div class='del'>-</div><div class='ctx'> 	mcba_urb_unlink(priv);</div><div class='add'>+	free_candev(priv-&gt;netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver mcba_usb_driver = {</div><div class='head'>diff --git a/drivers/net/can/usb/nct6694_canfd.c b/drivers/net/can/usb/nct6694_canfd.c<br/>new file mode 100644<br/>index 000000000000..dd6df2ec3742<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/nct6694_canfd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/nct6694_canfd.c</a></div><div class='hunk'>@@ -0,0 +1,831 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Nuvoton NCT6694 Socket CANfd driver based on USB interface.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Nuvoton Technology Corp.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/can/dev.h&gt;</div><div class='add'>+#include &lt;linux/can/rx-offload.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mfd/nct6694.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#define DEVICE_NAME "nct6694-canfd"</div><div class='add'>+</div><div class='add'>+/* USB command module type for NCT6694 CANfd controller.</div><div class='add'>+ * This defines the module type used for communication with the NCT6694</div><div class='add'>+ * CANfd controller over the USB interface.</div><div class='add'>+ */</div><div class='add'>+#define NCT6694_CANFD_MOD			0x05</div><div class='add'>+</div><div class='add'>+/* Command 00h - CAN Setting and Initialization */</div><div class='add'>+#define NCT6694_CANFD_SETTING			0x00</div><div class='add'>+#define NCT6694_CANFD_SETTING_ACTIVE_CTRL1	BIT(0)</div><div class='add'>+#define NCT6694_CANFD_SETTING_ACTIVE_CTRL2	BIT(1)</div><div class='add'>+#define NCT6694_CANFD_SETTING_ACTIVE_NBTP_DBTP	BIT(2)</div><div class='add'>+#define NCT6694_CANFD_SETTING_CTRL1_MON		BIT(0)</div><div class='add'>+#define NCT6694_CANFD_SETTING_CTRL1_NISO	BIT(1)</div><div class='add'>+#define NCT6694_CANFD_SETTING_CTRL1_LBCK	BIT(2)</div><div class='add'>+#define NCT6694_CANFD_SETTING_NBTP_NTSEG2	GENMASK(6, 0)</div><div class='add'>+#define NCT6694_CANFD_SETTING_NBTP_NTSEG1	GENMASK(15, 8)</div><div class='add'>+#define NCT6694_CANFD_SETTING_NBTP_NBRP		GENMASK(24, 16)</div><div class='add'>+#define NCT6694_CANFD_SETTING_NBTP_NSJW		GENMASK(31, 25)</div><div class='add'>+#define NCT6694_CANFD_SETTING_DBTP_DSJW		GENMASK(3, 0)</div><div class='add'>+#define NCT6694_CANFD_SETTING_DBTP_DTSEG2	GENMASK(7, 4)</div><div class='add'>+#define NCT6694_CANFD_SETTING_DBTP_DTSEG1	GENMASK(12, 8)</div><div class='add'>+#define NCT6694_CANFD_SETTING_DBTP_DBRP		GENMASK(20, 16)</div><div class='add'>+#define NCT6694_CANFD_SETTING_DBTP_TDC		BIT(23)</div><div class='add'>+</div><div class='add'>+/* Command 01h - CAN Information */</div><div class='add'>+#define NCT6694_CANFD_INFORMATION		0x01</div><div class='add'>+#define NCT6694_CANFD_INFORMATION_SEL		0x00</div><div class='add'>+</div><div class='add'>+/* Command 02h - CAN Event */</div><div class='add'>+#define NCT6694_CANFD_EVENT			0x02</div><div class='add'>+#define NCT6694_CANFD_EVENT_SEL(idx, mask)	\</div><div class='add'>+	((idx ? 0x80 : 0x00) | ((mask) &amp; 0x7F))</div><div class='add'>+</div><div class='add'>+#define NCT6694_CANFD_EVENT_MASK		GENMASK(5, 0)</div><div class='add'>+#define NCT6694_CANFD_EVT_TX_FIFO_EMPTY		BIT(7)	/* Read-clear */</div><div class='add'>+#define NCT6694_CANFD_EVT_RX_DATA_LOST		BIT(5)	/* Read-clear */</div><div class='add'>+#define NCT6694_CANFD_EVT_RX_DATA_IN		BIT(7)	/* Read-clear */</div><div class='add'>+</div><div class='add'>+/* Command 10h - CAN Deliver */</div><div class='add'>+#define NCT6694_CANFD_DELIVER			0x10</div><div class='add'>+#define NCT6694_CANFD_DELIVER_SEL(buf_cnt)	\</div><div class='add'>+	((buf_cnt) &amp; 0xFF)</div><div class='add'>+</div><div class='add'>+/* Command 11h - CAN Receive */</div><div class='add'>+#define NCT6694_CANFD_RECEIVE			0x11</div><div class='add'>+#define NCT6694_CANFD_RECEIVE_SEL(idx, buf_cnt)	\</div><div class='add'>+	((idx ? 0x80 : 0x00) | ((buf_cnt) &amp; 0x7F))</div><div class='add'>+</div><div class='add'>+#define NCT6694_CANFD_FRAME_TAG(idx)		(0xC0 | (idx))</div><div class='add'>+#define NCT6694_CANFD_FRAME_FLAG_EFF		BIT(0)</div><div class='add'>+#define NCT6694_CANFD_FRAME_FLAG_RTR		BIT(1)</div><div class='add'>+#define NCT6694_CANFD_FRAME_FLAG_FD		BIT(2)</div><div class='add'>+#define NCT6694_CANFD_FRAME_FLAG_BRS		BIT(3)</div><div class='add'>+#define NCT6694_CANFD_FRAME_FLAG_ERR		BIT(4)</div><div class='add'>+</div><div class='add'>+#define NCT6694_NAPI_WEIGHT			32</div><div class='add'>+</div><div class='add'>+enum nct6694_event_err {</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_NO_ERROR = 0,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_CRC_ERROR,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_STUFF_ERROR,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_ACK_ERROR,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_FORM_ERROR,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_BIT_ERROR,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_TIMEOUT_ERROR,</div><div class='add'>+	NCT6694_CANFD_EVT_ERR_UNKNOWN_ERROR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum nct6694_event_status {</div><div class='add'>+	NCT6694_CANFD_EVT_STS_ERROR_ACTIVE = 0,</div><div class='add'>+	NCT6694_CANFD_EVT_STS_ERROR_PASSIVE,</div><div class='add'>+	NCT6694_CANFD_EVT_STS_BUS_OFF,</div><div class='add'>+	NCT6694_CANFD_EVT_STS_WARNING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed nct6694_canfd_setting {</div><div class='add'>+	__le32 nbr;</div><div class='add'>+	__le32 dbr;</div><div class='add'>+	u8 active;</div><div class='add'>+	u8 reserved[3];</div><div class='add'>+	__le16 ctrl1;</div><div class='add'>+	__le16 ctrl2;</div><div class='add'>+	__le32 nbtp;</div><div class='add'>+	__le32 dbtp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed nct6694_canfd_information {</div><div class='add'>+	u8 tx_fifo_cnt;</div><div class='add'>+	u8 rx_fifo_cnt;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+	__le32 can_clk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed nct6694_canfd_event {</div><div class='add'>+	u8 err;</div><div class='add'>+	u8 status;</div><div class='add'>+	u8 tx_evt;</div><div class='add'>+	u8 rx_evt;</div><div class='add'>+	u8 rec;</div><div class='add'>+	u8 tec;</div><div class='add'>+	u8 reserved[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed nct6694_canfd_frame {</div><div class='add'>+	u8 tag;</div><div class='add'>+	u8 flag;</div><div class='add'>+	u8 reserved;</div><div class='add'>+	u8 length;</div><div class='add'>+	__le32 id;</div><div class='add'>+	u8 data[CANFD_MAX_DLEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct nct6694_canfd_priv {</div><div class='add'>+	struct can_priv can;	/* must be the first member */</div><div class='add'>+	struct can_rx_offload offload;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct nct6694 *nct6694;</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='add'>+	struct work_struct tx_work;</div><div class='add'>+	struct nct6694_canfd_frame tx;</div><div class='add'>+	struct nct6694_canfd_frame rx;</div><div class='add'>+	struct nct6694_canfd_event event[2];</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct nct6694_canfd_priv *rx_offload_to_priv(struct can_rx_offload *offload)</div><div class='add'>+{</div><div class='add'>+	return container_of(offload, struct nct6694_canfd_priv, offload);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const nct6694_canfd_bittiming_nominal_const = {</div><div class='add'>+	.name = DEVICE_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 256,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 128,</div><div class='add'>+	.sjw_max = 128,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 512,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct can_bittiming_const nct6694_canfd_bittiming_data_const = {</div><div class='add'>+	.name = DEVICE_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 32,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_rx_offload(struct can_rx_offload *offload,</div><div class='add'>+				     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = rx_offload_to_priv(offload);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = can_rx_offload_queue_tail(offload, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		priv-&gt;ndev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_handle_lost_msg(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ndev, "RX FIFO overflow, message(s) lost.\n");</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_errors++;</div><div class='add'>+	stats-&gt;rx_over_errors++;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+	cf-&gt;data[1] = CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='add'>+</div><div class='add'>+	nct6694_canfd_rx_offload(&amp;priv-&gt;offload, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_handle_rx(struct net_device *ndev, u8 rx_evt)</div><div class='add'>+{</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct nct6694_canfd_frame *frame = &amp;priv-&gt;rx;</div><div class='add'>+	const struct nct6694_cmd_header cmd_hd = {</div><div class='add'>+		.mod = NCT6694_CANFD_MOD,</div><div class='add'>+		.cmd = NCT6694_CANFD_RECEIVE,</div><div class='add'>+		.sel = NCT6694_CANFD_RECEIVE_SEL(ndev-&gt;dev_port, 1),</div><div class='add'>+		.len = cpu_to_le16(sizeof(*frame))</div><div class='add'>+	};</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nct6694_read_msg(priv-&gt;nct6694, &amp;cmd_hd, frame);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (frame-&gt;flag &amp; NCT6694_CANFD_FRAME_FLAG_FD) {</div><div class='add'>+		struct canfd_frame *cfd;</div><div class='add'>+</div><div class='add'>+		skb = alloc_canfd_skb(priv-&gt;ndev, &amp;cfd);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cfd-&gt;can_id = le32_to_cpu(frame-&gt;id);</div><div class='add'>+		cfd-&gt;len = canfd_sanitize_len(frame-&gt;length);</div><div class='add'>+		if (frame-&gt;flag &amp; NCT6694_CANFD_FRAME_FLAG_EFF)</div><div class='add'>+			cfd-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+		if (frame-&gt;flag &amp; NCT6694_CANFD_FRAME_FLAG_BRS)</div><div class='add'>+			cfd-&gt;flags |= CANFD_BRS;</div><div class='add'>+		if (frame-&gt;flag &amp; NCT6694_CANFD_FRAME_FLAG_ERR)</div><div class='add'>+			cfd-&gt;flags |= CANFD_ESI;</div><div class='add'>+</div><div class='add'>+		memcpy(cfd-&gt;data, frame-&gt;data, cfd-&gt;len);</div><div class='add'>+	} else {</div><div class='add'>+		struct can_frame *cf;</div><div class='add'>+</div><div class='add'>+		skb = alloc_can_skb(priv-&gt;ndev, &amp;cf);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			stats-&gt;rx_dropped++;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cf-&gt;can_id = le32_to_cpu(frame-&gt;id);</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len(frame-&gt;length);</div><div class='add'>+		if (frame-&gt;flag &amp; NCT6694_CANFD_FRAME_FLAG_EFF)</div><div class='add'>+			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+</div><div class='add'>+		if (frame-&gt;flag &amp; NCT6694_CANFD_FRAME_FLAG_RTR)</div><div class='add'>+			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+		else</div><div class='add'>+			memcpy(cf-&gt;data, frame-&gt;data, cf-&gt;len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nct6694_canfd_rx_offload(&amp;priv-&gt;offload, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_get_berr_counter(const struct net_device *ndev,</div><div class='add'>+					  struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	*bec = priv-&gt;bec;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_handle_state_change(struct net_device *ndev, u8 status)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	enum can_state new_state, rx_state, tx_state;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	nct6694_canfd_get_berr_counter(ndev, &amp;bec);</div><div class='add'>+	can_state_get_by_berr_counter(ndev, &amp;bec, &amp;tx_state, &amp;rx_state);</div><div class='add'>+</div><div class='add'>+	new_state = max(tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	/* state hasn't changed */</div><div class='add'>+	if (new_state == priv-&gt;can.state)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+</div><div class='add'>+	can_change_state(ndev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+	if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+		can_bus_off(ndev);</div><div class='add'>+	} else if (cf) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = bec.txerr;</div><div class='add'>+		cf-&gt;data[7] = bec.rxerr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		nct6694_canfd_rx_offload(&amp;priv-&gt;offload, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_handle_bus_err(struct net_device *ndev, u8 bus_err)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct can_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+</div><div class='add'>+	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='add'>+	if (cf)</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+</div><div class='add'>+	switch (bus_err) {</div><div class='add'>+	case NCT6694_CANFD_EVT_ERR_CRC_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "CRC error\n");</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[3] |= CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NCT6694_CANFD_EVT_ERR_STUFF_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Stuff error\n");</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_STUFF;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NCT6694_CANFD_EVT_ERR_ACK_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Ack error\n");</div><div class='add'>+		ndev-&gt;stats.tx_errors++;</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NCT6694_CANFD_EVT_ERR_FORM_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Form error\n");</div><div class='add'>+		ndev-&gt;stats.rx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_FORM;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case NCT6694_CANFD_EVT_ERR_BIT_ERROR:</div><div class='add'>+		netdev_dbg(ndev, "Bit error\n");</div><div class='add'>+		ndev-&gt;stats.tx_errors++;</div><div class='add'>+		if (cf)</div><div class='add'>+			cf-&gt;data[2] |= CAN_ERR_PROT_TX | CAN_ERR_PROT_BIT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		nct6694_canfd_rx_offload(&amp;priv-&gt;offload, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_handle_tx(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_bytes += can_rx_offload_get_echo_skb_queue_tail(&amp;priv-&gt;offload,</div><div class='add'>+								  0, NULL);</div><div class='add'>+	stats-&gt;tx_packets++;</div><div class='add'>+	netif_wake_queue(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t nct6694_canfd_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = data;</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct nct6694_canfd_event *event = &amp;priv-&gt;event[ndev-&gt;dev_port];</div><div class='add'>+	const struct nct6694_cmd_header cmd_hd = {</div><div class='add'>+		.mod = NCT6694_CANFD_MOD,</div><div class='add'>+		.cmd = NCT6694_CANFD_EVENT,</div><div class='add'>+		.sel = NCT6694_CANFD_EVENT_SEL(ndev-&gt;dev_port, NCT6694_CANFD_EVENT_MASK),</div><div class='add'>+		.len = cpu_to_le16(sizeof(priv-&gt;event))</div><div class='add'>+	};</div><div class='add'>+	irqreturn_t handled = IRQ_NONE;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = nct6694_read_msg(priv-&gt;nct6694, &amp;cmd_hd, priv-&gt;event);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return handled;</div><div class='add'>+</div><div class='add'>+	if (event-&gt;rx_evt &amp; NCT6694_CANFD_EVT_RX_DATA_IN) {</div><div class='add'>+		nct6694_canfd_handle_rx(ndev, event-&gt;rx_evt);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event-&gt;rx_evt &amp; NCT6694_CANFD_EVT_RX_DATA_LOST) {</div><div class='add'>+		nct6694_canfd_handle_lost_msg(ndev);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event-&gt;status) {</div><div class='add'>+		nct6694_canfd_handle_state_change(ndev, event-&gt;status);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event-&gt;err != NCT6694_CANFD_EVT_ERR_NO_ERROR) {</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING)</div><div class='add'>+			nct6694_canfd_handle_bus_err(ndev, event-&gt;err);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (event-&gt;tx_evt &amp; NCT6694_CANFD_EVT_TX_FIFO_EMPTY) {</div><div class='add'>+		nct6694_canfd_handle_tx(ndev);</div><div class='add'>+		handled = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (handled)</div><div class='add'>+		can_rx_offload_threaded_irq_finish(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	priv-&gt;bec.rxerr = event-&gt;rec;</div><div class='add'>+	priv-&gt;bec.txerr = event-&gt;tec;</div><div class='add'>+</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = container_of(work,</div><div class='add'>+						       struct nct6694_canfd_priv,</div><div class='add'>+						       tx_work);</div><div class='add'>+	struct nct6694_canfd_frame *frame = &amp;priv-&gt;tx;</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb = priv-&gt;can.echo_skb[0];</div><div class='add'>+	static const struct nct6694_cmd_header cmd_hd = {</div><div class='add'>+		.mod = NCT6694_CANFD_MOD,</div><div class='add'>+		.cmd = NCT6694_CANFD_DELIVER,</div><div class='add'>+		.sel = NCT6694_CANFD_DELIVER_SEL(1),</div><div class='add'>+		.len = cpu_to_le16(sizeof(*frame))</div><div class='add'>+	};</div><div class='add'>+	u32 txid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	memset(frame, 0, sizeof(*frame));</div><div class='add'>+</div><div class='add'>+	frame-&gt;tag = NCT6694_CANFD_FRAME_TAG(ndev-&gt;dev_port);</div><div class='add'>+</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (cfd-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			frame-&gt;flag |= NCT6694_CANFD_FRAME_FLAG_BRS;</div><div class='add'>+</div><div class='add'>+		if (cfd-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+			txid = cfd-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+			frame-&gt;flag |= NCT6694_CANFD_FRAME_FLAG_EFF;</div><div class='add'>+		} else {</div><div class='add'>+			txid = cfd-&gt;can_id &amp; CAN_SFF_MASK;</div><div class='add'>+		}</div><div class='add'>+		frame-&gt;flag |= NCT6694_CANFD_FRAME_FLAG_FD;</div><div class='add'>+		frame-&gt;id = cpu_to_le32(txid);</div><div class='add'>+		frame-&gt;length = canfd_sanitize_len(cfd-&gt;len);</div><div class='add'>+</div><div class='add'>+		memcpy(frame-&gt;data, cfd-&gt;data, frame-&gt;length);</div><div class='add'>+	} else {</div><div class='add'>+		struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='add'>+			txid = cf-&gt;can_id &amp; CAN_EFF_MASK;</div><div class='add'>+			frame-&gt;flag |= NCT6694_CANFD_FRAME_FLAG_EFF;</div><div class='add'>+		} else {</div><div class='add'>+			txid = cf-&gt;can_id &amp; CAN_SFF_MASK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='add'>+			frame-&gt;flag |= NCT6694_CANFD_FRAME_FLAG_RTR;</div><div class='add'>+		else</div><div class='add'>+			memcpy(frame-&gt;data, cf-&gt;data, cf-&gt;len);</div><div class='add'>+</div><div class='add'>+		frame-&gt;id = cpu_to_le32(txid);</div><div class='add'>+		frame-&gt;length = cf-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = nct6694_write_msg(priv-&gt;nct6694, &amp;cmd_hd, frame);</div><div class='add'>+	if (err) {</div><div class='add'>+		can_free_echo_skb(ndev, 0, NULL);</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+		stats-&gt;tx_errors++;</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t nct6694_canfd_start_xmit(struct sk_buff *skb,</div><div class='add'>+					    struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	can_put_echo_skb(skb, ndev, 0, 0);</div><div class='add'>+	queue_work(priv-&gt;wq, &amp;priv-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_start(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	const struct can_bittiming *n_bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	const struct can_bittiming *d_bt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='add'>+	struct nct6694_canfd_setting *setting __free(kfree) = NULL;</div><div class='add'>+	const struct nct6694_cmd_header cmd_hd = {</div><div class='add'>+		.mod = NCT6694_CANFD_MOD,</div><div class='add'>+		.cmd = NCT6694_CANFD_SETTING,</div><div class='add'>+		.sel = ndev-&gt;dev_port,</div><div class='add'>+		.len = cpu_to_le16(sizeof(*setting))</div><div class='add'>+	};</div><div class='add'>+	u32 en_tdc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	setting = kzalloc(sizeof(*setting), GFP_KERNEL);</div><div class='add'>+	if (!setting)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY)</div><div class='add'>+		setting-&gt;ctrl1 |= cpu_to_le16(NCT6694_CANFD_SETTING_CTRL1_MON);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_FD_NON_ISO)</div><div class='add'>+		setting-&gt;ctrl1 |= cpu_to_le16(NCT6694_CANFD_SETTING_CTRL1_NISO);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='add'>+		setting-&gt;ctrl1 |= cpu_to_le16(NCT6694_CANFD_SETTING_CTRL1_LBCK);</div><div class='add'>+</div><div class='add'>+	/* Disable clock divider */</div><div class='add'>+	setting-&gt;ctrl2 = 0;</div><div class='add'>+</div><div class='add'>+	setting-&gt;nbtp = cpu_to_le32(FIELD_PREP(NCT6694_CANFD_SETTING_NBTP_NSJW,</div><div class='add'>+					       n_bt-&gt;sjw - 1) |</div><div class='add'>+				    FIELD_PREP(NCT6694_CANFD_SETTING_NBTP_NBRP,</div><div class='add'>+					       n_bt-&gt;brp - 1) |</div><div class='add'>+				    FIELD_PREP(NCT6694_CANFD_SETTING_NBTP_NTSEG2,</div><div class='add'>+					       n_bt-&gt;phase_seg2 - 1) |</div><div class='add'>+				    FIELD_PREP(NCT6694_CANFD_SETTING_NBTP_NTSEG1,</div><div class='add'>+					       n_bt-&gt;prop_seg + n_bt-&gt;phase_seg1 - 1));</div><div class='add'>+</div><div class='add'>+	if (d_bt-&gt;brp &lt;= 2)</div><div class='add'>+		en_tdc = NCT6694_CANFD_SETTING_DBTP_TDC;</div><div class='add'>+	else</div><div class='add'>+		en_tdc = 0;</div><div class='add'>+</div><div class='add'>+	setting-&gt;dbtp = cpu_to_le32(FIELD_PREP(NCT6694_CANFD_SETTING_DBTP_DSJW,</div><div class='add'>+					       d_bt-&gt;sjw - 1) |</div><div class='add'>+				    FIELD_PREP(NCT6694_CANFD_SETTING_DBTP_DBRP,</div><div class='add'>+					       d_bt-&gt;brp - 1) |</div><div class='add'>+				    FIELD_PREP(NCT6694_CANFD_SETTING_DBTP_DTSEG2,</div><div class='add'>+					       d_bt-&gt;phase_seg2 - 1) |</div><div class='add'>+				    FIELD_PREP(NCT6694_CANFD_SETTING_DBTP_DTSEG1,</div><div class='add'>+					       d_bt-&gt;prop_seg + d_bt-&gt;phase_seg1 - 1) |</div><div class='add'>+				    en_tdc);</div><div class='add'>+</div><div class='add'>+	setting-&gt;active = NCT6694_CANFD_SETTING_ACTIVE_CTRL1 |</div><div class='add'>+			  NCT6694_CANFD_SETTING_ACTIVE_CTRL2 |</div><div class='add'>+			  NCT6694_CANFD_SETTING_ACTIVE_NBTP_DBTP;</div><div class='add'>+</div><div class='add'>+	ret = nct6694_write_msg(priv-&gt;nct6694, &amp;cmd_hd, setting);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct nct6694_canfd_setting *setting __free(kfree) = NULL;</div><div class='add'>+	const struct nct6694_cmd_header cmd_hd = {</div><div class='add'>+		.mod = NCT6694_CANFD_MOD,</div><div class='add'>+		.cmd = NCT6694_CANFD_SETTING,</div><div class='add'>+		.sel = ndev-&gt;dev_port,</div><div class='add'>+		.len = cpu_to_le16(sizeof(*setting))</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* The NCT6694 cannot be stopped. To ensure safe operation and avoid</div><div class='add'>+	 * interference, the control mode is set to Listen-Only mode. This</div><div class='add'>+	 * mode allows the device to monitor bus activity without actively</div><div class='add'>+	 * participating in communication.</div><div class='add'>+	 */</div><div class='add'>+	setting = kzalloc(sizeof(*setting), GFP_KERNEL);</div><div class='add'>+	if (!setting)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	nct6694_read_msg(priv-&gt;nct6694, &amp;cmd_hd, setting);</div><div class='add'>+	setting-&gt;ctrl1 = cpu_to_le16(NCT6694_CANFD_SETTING_CTRL1_MON);</div><div class='add'>+	setting-&gt;active = NCT6694_CANFD_SETTING_ACTIVE_CTRL1;</div><div class='add'>+	nct6694_write_msg(priv-&gt;nct6694, &amp;cmd_hd, setting);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_close(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+	nct6694_canfd_stop(ndev);</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case CAN_MODE_START:</div><div class='add'>+		ret = nct6694_canfd_start(ndev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		netif_wake_queue(ndev);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = open_candev(ndev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	can_rx_offload_enable(&amp;priv-&gt;offload);</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(ndev-&gt;irq, NULL,</div><div class='add'>+				   nct6694_canfd_irq, IRQF_ONESHOT,</div><div class='add'>+				   "nct6694_canfd", ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(ndev, "Failed to request IRQ\n");</div><div class='add'>+		goto can_rx_offload_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;wq = alloc_ordered_workqueue("%s-nct6694_wq",</div><div class='add'>+					   WQ_FREEZABLE | WQ_MEM_RECLAIM,</div><div class='add'>+					   ndev-&gt;name);</div><div class='add'>+	if (!priv-&gt;wq) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = nct6694_canfd_start(ndev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto destroy_wq;</div><div class='add'>+</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+destroy_wq:</div><div class='add'>+	destroy_workqueue(priv-&gt;wq);</div><div class='add'>+free_irq:</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+can_rx_offload_disable:</div><div class='add'>+	can_rx_offload_disable(&amp;priv-&gt;offload);</div><div class='add'>+	close_candev(ndev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops nct6694_canfd_netdev_ops = {</div><div class='add'>+	.ndo_open = nct6694_canfd_open,</div><div class='add'>+	.ndo_stop = nct6694_canfd_close,</div><div class='add'>+	.ndo_start_xmit = nct6694_canfd_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops nct6694_canfd_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_get_clock(struct nct6694_canfd_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_information *info __free(kfree) = NULL;</div><div class='add'>+	static const struct nct6694_cmd_header cmd_hd = {</div><div class='add'>+		.mod = NCT6694_CANFD_MOD,</div><div class='add'>+		.cmd = NCT6694_CANFD_INFORMATION,</div><div class='add'>+		.sel = NCT6694_CANFD_INFORMATION_SEL,</div><div class='add'>+		.len = cpu_to_le16(sizeof(*info))</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	info = kzalloc(sizeof(*info), GFP_KERNEL);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = nct6694_read_msg(priv-&gt;nct6694, &amp;cmd_hd, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return le32_to_cpu(info-&gt;can_clk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nct6694_canfd_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694 *nct6694 = dev_get_drvdata(pdev-&gt;dev.parent);</div><div class='add'>+	struct nct6694_canfd_priv *priv;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	int port, irq, ret, can_clk;</div><div class='add'>+</div><div class='add'>+	port = ida_alloc(&amp;nct6694-&gt;canfd_ida, GFP_KERNEL);</div><div class='add'>+	if (port &lt; 0)</div><div class='add'>+		return port;</div><div class='add'>+</div><div class='add'>+	irq = irq_create_mapping(nct6694-&gt;domain,</div><div class='add'>+				 NCT6694_IRQ_CAN0 + port);</div><div class='add'>+	if (!irq) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto free_ida;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev = alloc_candev(sizeof(struct nct6694_canfd_priv), 1);</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto dispose_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = irq;</div><div class='add'>+	ndev-&gt;flags |= IFF_ECHO;</div><div class='add'>+	ndev-&gt;dev_port = port;</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;nct6694_canfd_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;nct6694_canfd_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(ndev);</div><div class='add'>+	priv-&gt;nct6694 = nct6694;</div><div class='add'>+	priv-&gt;ndev = ndev;</div><div class='add'>+</div><div class='add'>+	can_clk = nct6694_canfd_get_clock(priv);</div><div class='add'>+	if (can_clk &lt; 0) {</div><div class='add'>+		ret = dev_err_probe(&amp;pdev-&gt;dev, can_clk,</div><div class='add'>+				    "Failed to get clock\n");</div><div class='add'>+		goto free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;tx_work, nct6694_canfd_tx_work);</div><div class='add'>+</div><div class='add'>+	priv-&gt;can.clock.freq = can_clk;</div><div class='add'>+	priv-&gt;can.bittiming_const = &amp;nct6694_canfd_bittiming_nominal_const;</div><div class='add'>+	priv-&gt;can.fd.data_bittiming_const = &amp;nct6694_canfd_bittiming_data_const;</div><div class='add'>+	priv-&gt;can.do_set_mode = nct6694_canfd_set_mode;</div><div class='add'>+	priv-&gt;can.do_get_berr_counter = nct6694_canfd_get_berr_counter;</div><div class='add'>+	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='add'>+		CAN_CTRLMODE_LISTENONLY | CAN_CTRLMODE_BERR_REPORTING |</div><div class='add'>+		CAN_CTRLMODE_FD_NON_ISO;</div><div class='add'>+</div><div class='add'>+	ret = can_set_static_ctrlmode(ndev, CAN_CTRLMODE_FD);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_candev;</div><div class='add'>+</div><div class='add'>+	ret = can_rx_offload_add_manual(ndev, &amp;priv-&gt;offload,</div><div class='add'>+					NCT6694_NAPI_WEIGHT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(&amp;pdev-&gt;dev, ret, "Failed to add rx_offload\n");</div><div class='add'>+		goto free_candev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+	SET_NETDEV_DEV(priv-&gt;ndev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ret = register_candev(priv-&gt;ndev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto rx_offload_del;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rx_offload_del:</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+free_candev:</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+dispose_irq:</div><div class='add'>+	irq_dispose_mapping(irq);</div><div class='add'>+free_ida:</div><div class='add'>+	ida_free(&amp;nct6694-&gt;canfd_ida, port);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void nct6694_canfd_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct nct6694_canfd_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+	struct nct6694 *nct6694 = priv-&gt;nct6694;</div><div class='add'>+	struct net_device *ndev = priv-&gt;ndev;</div><div class='add'>+	int port = ndev-&gt;dev_port;</div><div class='add'>+	int irq = ndev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	unregister_candev(ndev);</div><div class='add'>+	can_rx_offload_del(&amp;priv-&gt;offload);</div><div class='add'>+	free_candev(ndev);</div><div class='add'>+	irq_dispose_mapping(irq);</div><div class='add'>+	ida_free(&amp;nct6694-&gt;canfd_ida, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver nct6694_canfd_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= DEVICE_NAME,</div><div class='add'>+	},</div><div class='add'>+	.probe		= nct6694_canfd_probe,</div><div class='add'>+	.remove		= nct6694_canfd_remove,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(nct6694_canfd_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("USB-CAN FD driver for NCT6694");</div><div class='add'>+MODULE_AUTHOR("Ming Yu &lt;tmyu0@nuvoton.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/can/usb/peak_usb/pcan_usb.c b/drivers/net/can/usb/peak_usb/pcan_usb.c<br/>index 15ce5ad1d632..9278a1522aae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/peak_usb/pcan_usb.c</a></div><div class='hunk'>@@ -3,14 +3,17 @@</div><div class='ctx'>  * CAN driver for PEAK System PCAN-USB adapter</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_usb.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2010 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2011-2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Many thanks to Klaus Hitschler &lt;klaus.hitschler@gmx.de&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='hunk'>@@ -18,8 +21,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "pcan_usb_core.h"</div><div class='ctx'> </div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB adapter");</div><div class='del'>-</div><div class='ctx'> /* PCAN-USB Endpoints */</div><div class='ctx'> #define PCAN_USB_EP_CMDOUT		1</div><div class='ctx'> #define PCAN_USB_EP_CMDIN		(PCAN_USB_EP_CMDOUT | USB_DIR_IN)</div><div class='hunk'>@@ -34,6 +35,24 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB adapter");</div><div class='ctx'> #define PCAN_USB_CMD_LEN		(PCAN_USB_CMD_ARGS + \</div><div class='ctx'> 					 PCAN_USB_CMD_ARGS_LEN)</div><div class='ctx'> </div><div class='add'>+/* PCAN-USB commands */</div><div class='add'>+#define PCAN_USB_CMD_BITRATE	1</div><div class='add'>+#define PCAN_USB_CMD_SET_BUS	3</div><div class='add'>+#define PCAN_USB_CMD_DEVID	4</div><div class='add'>+#define PCAN_USB_CMD_SN		6</div><div class='add'>+#define PCAN_USB_CMD_REGISTER	9</div><div class='add'>+#define PCAN_USB_CMD_EXT_VCC	10</div><div class='add'>+#define PCAN_USB_CMD_ERR_FR	11</div><div class='add'>+#define PCAN_USB_CMD_LED	12</div><div class='add'>+</div><div class='add'>+/* PCAN_USB_CMD_SET_BUS number arg */</div><div class='add'>+#define PCAN_USB_BUS_XCVER		2</div><div class='add'>+#define PCAN_USB_BUS_SILENT_MODE	3</div><div class='add'>+</div><div class='add'>+/* PCAN_USB_CMD_xxx functions */</div><div class='add'>+#define PCAN_USB_GET		1</div><div class='add'>+#define PCAN_USB_SET		2</div><div class='add'>+</div><div class='ctx'> /* PCAN-USB command timeout (ms.) */</div><div class='ctx'> #define PCAN_USB_COMMAND_TIMEOUT	1000</div><div class='ctx'> </div><div class='hunk'>@@ -46,6 +65,8 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB adapter");</div><div class='ctx'> </div><div class='ctx'> #define PCAN_USB_MSG_HEADER_LEN		2</div><div class='ctx'> </div><div class='add'>+#define PCAN_USB_MSG_TX_CAN		2	/* Tx msg is a CAN frame */</div><div class='add'>+</div><div class='ctx'> /* PCAN-USB adapter internal clock (MHz) */</div><div class='ctx'> #define PCAN_USB_CRYSTAL_HZ		16000000</div><div class='ctx'> </div><div class='hunk'>@@ -56,6 +77,10 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB adapter");</div><div class='ctx'> #define PCAN_USB_STATUSLEN_RTR		(1 &lt;&lt; 4)</div><div class='ctx'> #define PCAN_USB_STATUSLEN_DLC		(0xf)</div><div class='ctx'> </div><div class='add'>+/* PCAN-USB 4.1 CAN Id tx extended flags */</div><div class='add'>+#define PCAN_USB_TX_SRR			0x01	/* SJA1000 SRR command */</div><div class='add'>+#define PCAN_USB_TX_AT			0x02	/* SJA1000 AT command */</div><div class='add'>+</div><div class='ctx'> /* PCAN-USB error flags */</div><div class='ctx'> #define PCAN_USB_ERROR_TXFULL		0x01</div><div class='ctx'> #define PCAN_USB_ERROR_RXQOVR		0x02</div><div class='hunk'>@@ -66,6 +91,10 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB adapter");</div><div class='ctx'> #define PCAN_USB_ERROR_QOVR		0x40</div><div class='ctx'> #define PCAN_USB_ERROR_TXQFULL		0x80</div><div class='ctx'> </div><div class='add'>+#define PCAN_USB_ERROR_BUS		(PCAN_USB_ERROR_BUS_LIGHT | \</div><div class='add'>+					 PCAN_USB_ERROR_BUS_HEAVY | \</div><div class='add'>+					 PCAN_USB_ERROR_BUS_OFF)</div><div class='add'>+</div><div class='ctx'> /* SJA1000 modes */</div><div class='ctx'> #define SJA1000_MODE_NORMAL		0x00</div><div class='ctx'> #define SJA1000_MODE_INIT		0x01</div><div class='hunk'>@@ -85,11 +114,26 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB adapter");</div><div class='ctx'> #define PCAN_USB_REC_TS			4</div><div class='ctx'> #define PCAN_USB_REC_BUSEVT		5</div><div class='ctx'> </div><div class='add'>+/* CAN bus events notifications selection mask */</div><div class='add'>+#define PCAN_USB_ERR_RXERR		0x02	/* ask for rxerr counter */</div><div class='add'>+#define PCAN_USB_ERR_TXERR		0x04	/* ask for txerr counter */</div><div class='add'>+</div><div class='add'>+/* This mask generates an usb packet each time the state of the bus changes.</div><div class='add'>+ * In other words, its interest is to know which side among rx and tx is</div><div class='add'>+ * responsible of the change of the bus state.</div><div class='add'>+ */</div><div class='add'>+#define PCAN_USB_BERR_MASK	(PCAN_USB_ERR_RXERR | PCAN_USB_ERR_TXERR)</div><div class='add'>+</div><div class='add'>+/* identify bus event packets with rx/tx error counters */</div><div class='add'>+#define PCAN_USB_ERR_CNT_DEC		0x00	/* counters are decreasing */</div><div class='add'>+#define PCAN_USB_ERR_CNT_INC		0x80	/* counters are increasing */</div><div class='add'>+</div><div class='ctx'> /* private to PCAN-USB adapter */</div><div class='ctx'> struct pcan_usb {</div><div class='ctx'> 	struct peak_usb_device dev;</div><div class='ctx'> 	struct peak_time_ref time_ref;</div><div class='ctx'> 	struct timer_list restart_timer;</div><div class='add'>+	struct can_berr_counter bec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* incoming message context for decoding */</div><div class='hunk'>@@ -100,7 +144,7 @@ struct pcan_usb_msg_context {</div><div class='ctx'> 	u8 *end;</div><div class='ctx'> 	u8 rec_cnt;</div><div class='ctx'> 	u8 rec_idx;</div><div class='del'>-	u8 rec_data_idx;</div><div class='add'>+	u8 rec_ts_idx;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct pcan_usb *pdev;</div><div class='ctx'> };</div><div class='hunk'>@@ -172,7 +216,8 @@ static int pcan_usb_set_sja1000(struct peak_usb_device *dev, u8 mode)</div><div class='ctx'> 		[1] = mode,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return pcan_usb_send_cmd(dev, 9, 2, args);</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_REGISTER, PCAN_USB_SET,</div><div class='add'>+				 args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pcan_usb_set_bus(struct peak_usb_device *dev, u8 onoff)</div><div class='hunk'>@@ -181,7 +226,8 @@ static int pcan_usb_set_bus(struct peak_usb_device *dev, u8 onoff)</div><div class='ctx'> 		[0] = !!onoff,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return pcan_usb_send_cmd(dev, 3, 2, args);</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_SET_BUS, PCAN_USB_BUS_XCVER,</div><div class='add'>+				 args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pcan_usb_set_silent(struct peak_usb_device *dev, u8 onoff)</div><div class='hunk'>@@ -190,7 +236,18 @@ static int pcan_usb_set_silent(struct peak_usb_device *dev, u8 onoff)</div><div class='ctx'> 		[0] = !!onoff,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return pcan_usb_send_cmd(dev, 3, 3, args);</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_SET_BUS,</div><div class='add'>+				 PCAN_USB_BUS_SILENT_MODE, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* send the cmd to be notified from bus errors */</div><div class='add'>+static int pcan_usb_set_err_frame(struct peak_usb_device *dev, u8 err_mask)</div><div class='add'>+{</div><div class='add'>+	u8 args[PCAN_USB_CMD_ARGS_LEN] = {</div><div class='add'>+		[0] = err_mask,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_ERR_FR, PCAN_USB_SET, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pcan_usb_set_ext_vcc(struct peak_usb_device *dev, u8 onoff)</div><div class='hunk'>@@ -199,7 +256,16 @@ static int pcan_usb_set_ext_vcc(struct peak_usb_device *dev, u8 onoff)</div><div class='ctx'> 		[0] = !!onoff,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	return pcan_usb_send_cmd(dev, 10, 2, args);</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_EXT_VCC, PCAN_USB_SET, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pcan_usb_set_led(struct peak_usb_device *dev, u8 onoff)</div><div class='add'>+{</div><div class='add'>+	u8 args[PCAN_USB_CMD_ARGS_LEN] = {</div><div class='add'>+		[0] = !!onoff,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_LED, PCAN_USB_SET, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -223,7 +289,7 @@ static int pcan_usb_set_bittiming(struct peak_usb_device *dev,</div><div class='ctx'> 	args[0] = btr1;</div><div class='ctx'> 	args[1] = btr0;</div><div class='ctx'> </div><div class='del'>-	return pcan_usb_send_cmd(dev, 1, 2, args);</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_BITRATE, PCAN_USB_SET, args);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -253,7 +319,7 @@ static int pcan_usb_write_mode(struct peak_usb_device *dev, u8 onoff)</div><div class='ctx'>  */</div><div class='ctx'> static void pcan_usb_restart(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct pcan_usb *pdev = from_timer(pdev, t, restart_timer);</div><div class='add'>+	struct pcan_usb *pdev = timer_container_of(pdev, t, restart_timer);</div><div class='ctx'> 	struct peak_usb_device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/* notify candev and netdev */</div><div class='hunk'>@@ -307,49 +373,60 @@ static int pcan_usb_get_serial(struct peak_usb_device *dev, u32 *serial_number)</div><div class='ctx'> 	u8 args[PCAN_USB_CMD_ARGS_LEN];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = pcan_usb_wait_rsp(dev, 6, 1, args);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_err(dev-&gt;netdev, "getting serial failure: %d\n", err);</div><div class='del'>-	} else if (serial_number) {</div><div class='del'>-		__le32 tmp32;</div><div class='del'>-</div><div class='del'>-		memcpy(&amp;tmp32, args, 4);</div><div class='del'>-		*serial_number = le32_to_cpu(tmp32);</div><div class='del'>-	}</div><div class='add'>+	err = pcan_usb_wait_rsp(dev, PCAN_USB_CMD_SN, PCAN_USB_GET, args);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	*serial_number = le32_to_cpup((__le32 *)args);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * read device id from device</div><div class='add'>+ * read can channel id from device</div><div class='ctx'>  */</div><div class='del'>-static int pcan_usb_get_device_id(struct peak_usb_device *dev, u32 *device_id)</div><div class='add'>+static int pcan_usb_get_can_channel_id(struct peak_usb_device *dev, u32 *can_ch_id)</div><div class='ctx'> {</div><div class='ctx'> 	u8 args[PCAN_USB_CMD_ARGS_LEN];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = pcan_usb_wait_rsp(dev, 4, 1, args);</div><div class='add'>+	err = pcan_usb_wait_rsp(dev, PCAN_USB_CMD_DEVID, PCAN_USB_GET, args);</div><div class='ctx'> 	if (err)</div><div class='del'>-		netdev_err(dev-&gt;netdev, "getting device id failure: %d\n", err);</div><div class='del'>-	else if (device_id)</div><div class='del'>-		*device_id = args[0];</div><div class='add'>+		netdev_err(dev-&gt;netdev, "getting can channel id failure: %d\n", err);</div><div class='add'>+</div><div class='add'>+	else</div><div class='add'>+		*can_ch_id = args[0];</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* set a new CAN channel id in the flash memory of the device */</div><div class='add'>+static int pcan_usb_set_can_channel_id(struct peak_usb_device *dev, u32 can_ch_id)</div><div class='add'>+{</div><div class='add'>+	u8 args[PCAN_USB_CMD_ARGS_LEN];</div><div class='add'>+</div><div class='add'>+	/* this kind of device supports 8-bit values only */</div><div class='add'>+	if (can_ch_id &gt; U8_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* during the flash process the device disconnects during ~1.25 s.:</div><div class='add'>+	 * prohibit access when interface is UP</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;netdev-&gt;flags &amp; IFF_UP)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	args[0] = can_ch_id;</div><div class='add'>+	return pcan_usb_send_cmd(dev, PCAN_USB_CMD_DEVID, PCAN_USB_SET, args);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * update current time ref with received timestamp</div><div class='ctx'>  */</div><div class='ctx'> static int pcan_usb_update_ts(struct pcan_usb_msg_context *mc)</div><div class='ctx'> {</div><div class='del'>-	__le16 tmp16;</div><div class='del'>-</div><div class='del'>-	if ((mc-&gt;ptr+2) &gt; mc-&gt;end)</div><div class='add'>+	if ((mc-&gt;ptr + 2) &gt; mc-&gt;end)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;tmp16, mc-&gt;ptr, 2);</div><div class='del'>-</div><div class='del'>-	mc-&gt;ts16 = le16_to_cpu(tmp16);</div><div class='add'>+	mc-&gt;ts16 = get_unaligned_le16(mc-&gt;ptr);</div><div class='ctx'> </div><div class='ctx'> 	if (mc-&gt;rec_idx &gt; 0)</div><div class='ctx'> 		peak_usb_update_ts_now(&amp;mc-&gt;pdev-&gt;time_ref, mc-&gt;ts16);</div><div class='hunk'>@@ -366,16 +443,13 @@ static int pcan_usb_decode_ts(struct pcan_usb_msg_context *mc, u8 first_packet)</div><div class='ctx'> {</div><div class='ctx'> 	/* only 1st packet supplies a word timestamp */</div><div class='ctx'> 	if (first_packet) {</div><div class='del'>-		__le16 tmp16;</div><div class='del'>-</div><div class='ctx'> 		if ((mc-&gt;ptr + 2) &gt; mc-&gt;end)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;tmp16, mc-&gt;ptr, 2);</div><div class='del'>-		mc-&gt;ptr += 2;</div><div class='del'>-</div><div class='del'>-		mc-&gt;ts16 = le16_to_cpu(tmp16);</div><div class='add'>+		mc-&gt;ts16 = get_unaligned_le16(mc-&gt;ptr);</div><div class='ctx'> 		mc-&gt;prev_ts8 = mc-&gt;ts16 &amp; 0x00ff;</div><div class='add'>+</div><div class='add'>+		mc-&gt;ptr += 2;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u8 ts8;</div><div class='ctx'> </div><div class='hunk'>@@ -400,120 +474,67 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n,</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='del'>-	enum can_state new_state;</div><div class='add'>+	enum can_state new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> </div><div class='ctx'> 	/* ignore this error until 1st ts received */</div><div class='ctx'> 	if (n == PCAN_USB_ERROR_QOVR)</div><div class='ctx'> 		if (!mc-&gt;pdev-&gt;time_ref.tick_count)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-	new_state = mc-&gt;pdev-&gt;dev.can.state;</div><div class='add'>+	/* allocate an skb to store the error frame */</div><div class='add'>+	skb = alloc_can_err_skb(mc-&gt;netdev, &amp;cf);</div><div class='ctx'> </div><div class='del'>-	switch (mc-&gt;pdev-&gt;dev.can.state) {</div><div class='del'>-	case CAN_STATE_ERROR_ACTIVE:</div><div class='del'>-		if (n &amp; PCAN_USB_ERROR_BUS_LIGHT) {</div><div class='del'>-			new_state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-			break;</div><div class='add'>+	if (n &amp; PCAN_USB_ERROR_RXQOVR) {</div><div class='add'>+		/* data overrun interrupt */</div><div class='add'>+		netdev_dbg(mc-&gt;netdev, "data overrun interrupt\n");</div><div class='add'>+		mc-&gt;netdev-&gt;stats.rx_over_errors++;</div><div class='add'>+		mc-&gt;netdev-&gt;stats.rx_errors++;</div><div class='add'>+		if (cf) {</div><div class='add'>+			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='add'>+			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> 		}</div><div class='del'>-		/* else: fall through */</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	case CAN_STATE_ERROR_WARNING:</div><div class='del'>-		if (n &amp; PCAN_USB_ERROR_BUS_HEAVY) {</div><div class='del'>-			new_state = CAN_STATE_ERROR_PASSIVE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (n &amp; PCAN_USB_ERROR_BUS_OFF) {</div><div class='del'>-			new_state = CAN_STATE_BUS_OFF;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (n &amp; (PCAN_USB_ERROR_RXQOVR | PCAN_USB_ERROR_QOVR)) {</div><div class='del'>-			/*</div><div class='del'>-			 * trick to bypass next comparison and process other</div><div class='del'>-			 * errors</div><div class='del'>-			 */</div><div class='del'>-			new_state = CAN_STATE_MAX;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if ((n &amp; PCAN_USB_ERROR_BUS_LIGHT) == 0) {</div><div class='del'>-			/* no error (back to active state) */</div><div class='del'>-			mc-&gt;pdev-&gt;dev.can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+	if (n &amp; PCAN_USB_ERROR_TXQFULL)</div><div class='add'>+		netdev_dbg(mc-&gt;netdev, "device Tx queue full)\n");</div><div class='ctx'> </div><div class='del'>-	case CAN_STATE_ERROR_PASSIVE:</div><div class='del'>-		if (n &amp; PCAN_USB_ERROR_BUS_OFF) {</div><div class='del'>-			new_state = CAN_STATE_BUS_OFF;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (n &amp; PCAN_USB_ERROR_BUS_LIGHT) {</div><div class='del'>-			new_state = CAN_STATE_ERROR_WARNING;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		if (n &amp; (PCAN_USB_ERROR_RXQOVR | PCAN_USB_ERROR_QOVR)) {</div><div class='del'>-			/*</div><div class='del'>-			 * trick to bypass next comparison and process other</div><div class='del'>-			 * errors</div><div class='del'>-			 */</div><div class='del'>-			new_state = CAN_STATE_MAX;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	if (n &amp; PCAN_USB_ERROR_BUS_OFF) {</div><div class='add'>+		new_state = CAN_STATE_BUS_OFF;</div><div class='add'>+	} else if (n &amp; PCAN_USB_ERROR_BUS_HEAVY) {</div><div class='add'>+		new_state = ((mc-&gt;pdev-&gt;bec.txerr &gt;= 128) ||</div><div class='add'>+			     (mc-&gt;pdev-&gt;bec.rxerr &gt;= 128)) ?</div><div class='add'>+				CAN_STATE_ERROR_PASSIVE :</div><div class='add'>+				CAN_STATE_ERROR_WARNING;</div><div class='add'>+	} else {</div><div class='add'>+		new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if ((n &amp; PCAN_USB_ERROR_BUS_HEAVY) == 0) {</div><div class='del'>-			/* no error (back to active state) */</div><div class='del'>-			mc-&gt;pdev-&gt;dev.can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='del'>-			return 0;</div><div class='add'>+	/* handle change of state */</div><div class='add'>+	if (new_state != mc-&gt;pdev-&gt;dev.can.state) {</div><div class='add'>+		enum can_state tx_state =</div><div class='add'>+			(mc-&gt;pdev-&gt;bec.txerr &gt;= mc-&gt;pdev-&gt;bec.rxerr) ?</div><div class='add'>+				new_state : 0;</div><div class='add'>+		enum can_state rx_state =</div><div class='add'>+			(mc-&gt;pdev-&gt;bec.txerr &lt;= mc-&gt;pdev-&gt;bec.rxerr) ?</div><div class='add'>+				new_state : 0;</div><div class='add'>+</div><div class='add'>+		can_change_state(mc-&gt;netdev, cf, tx_state, rx_state);</div><div class='add'>+</div><div class='add'>+		if (new_state == CAN_STATE_BUS_OFF) {</div><div class='add'>+			can_bus_off(mc-&gt;netdev);</div><div class='add'>+		} else if (cf &amp;&amp; (cf-&gt;can_id &amp; CAN_ERR_CRTL)) {</div><div class='add'>+			/* Supply TX/RX error counters in case of</div><div class='add'>+			 * controller error.</div><div class='add'>+			 */</div><div class='add'>+			cf-&gt;can_id = CAN_ERR_CNT;</div><div class='add'>+			cf-&gt;data[6] = mc-&gt;pdev-&gt;bec.txerr;</div><div class='add'>+			cf-&gt;data[7] = mc-&gt;pdev-&gt;bec.rxerr;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* do nothing waiting for restart */</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* donot post any error if current state didn't change */</div><div class='del'>-	if (mc-&gt;pdev-&gt;dev.can.state == new_state)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* allocate an skb to store the error frame */</div><div class='del'>-	skb = alloc_can_err_skb(mc-&gt;netdev, &amp;cf);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	switch (new_state) {</div><div class='del'>-	case CAN_STATE_BUS_OFF:</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='del'>-		mc-&gt;pdev-&gt;dev.can.can_stats.bus_off++;</div><div class='del'>-		can_bus_off(mc-&gt;netdev);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAN_STATE_ERROR_PASSIVE:</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		cf-&gt;data[1] |= CAN_ERR_CRTL_TX_PASSIVE |</div><div class='del'>-			       CAN_ERR_CRTL_RX_PASSIVE;</div><div class='del'>-		mc-&gt;pdev-&gt;dev.can.can_stats.error_passive++;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAN_STATE_ERROR_WARNING:</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		cf-&gt;data[1] |= CAN_ERR_CRTL_TX_WARNING |</div><div class='del'>-			       CAN_ERR_CRTL_RX_WARNING;</div><div class='del'>-		mc-&gt;pdev-&gt;dev.can.can_stats.error_warning++;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* CAN_STATE_MAX (trick to handle other errors) */</div><div class='del'>-		cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-		cf-&gt;data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='del'>-		mc-&gt;netdev-&gt;stats.rx_over_errors++;</div><div class='del'>-		mc-&gt;netdev-&gt;stats.rx_errors++;</div><div class='del'>-</div><div class='del'>-		new_state = mc-&gt;pdev-&gt;dev.can.state;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mc-&gt;pdev-&gt;dev.can.state = new_state;</div><div class='del'>-</div><div class='ctx'> 	if (status_len &amp; PCAN_USB_STATUSLEN_TIMESTAMP) {</div><div class='ctx'> 		struct skb_shared_hwtstamps *hwts = skb_hwtstamps(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -521,13 +542,36 @@ static int pcan_usb_decode_error(struct pcan_usb_msg_context *mc, u8 n,</div><div class='ctx'> 				     &amp;hwts-&gt;hwtstamp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mc-&gt;netdev-&gt;stats.rx_packets++;</div><div class='del'>-	mc-&gt;netdev-&gt;stats.rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* decode bus event usb packet: first byte contains rxerr while 2nd one contains</div><div class='add'>+ * txerr.</div><div class='add'>+ */</div><div class='add'>+static int pcan_usb_handle_bus_evt(struct pcan_usb_msg_context *mc, u8 ir)</div><div class='add'>+{</div><div class='add'>+	struct pcan_usb *pdev = mc-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	/* according to the content of the packet */</div><div class='add'>+	switch (ir) {</div><div class='add'>+	case PCAN_USB_ERR_CNT_DEC:</div><div class='add'>+	case PCAN_USB_ERR_CNT_INC:</div><div class='add'>+</div><div class='add'>+		/* save rx/tx error counters from in the device context */</div><div class='add'>+		pdev-&gt;bec.rxerr = mc-&gt;ptr[1];</div><div class='add'>+		pdev-&gt;bec.txerr = mc-&gt;ptr[2];</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* reserved */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * decode non-data usb message</div><div class='ctx'>  */</div><div class='hunk'>@@ -547,10 +591,15 @@ static int pcan_usb_decode_status(struct pcan_usb_msg_context *mc,</div><div class='ctx'> 	mc-&gt;ptr += PCAN_USB_CMD_ARGS;</div><div class='ctx'> </div><div class='ctx'> 	if (status_len &amp; PCAN_USB_STATUSLEN_TIMESTAMP) {</div><div class='del'>-		int err = pcan_usb_decode_ts(mc, !mc-&gt;rec_idx);</div><div class='add'>+		int err = pcan_usb_decode_ts(mc, !mc-&gt;rec_ts_idx);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+</div><div class='add'>+		/* Next packet in the buffer will have a timestamp on a single</div><div class='add'>+		 * byte</div><div class='add'>+		 */</div><div class='add'>+		mc-&gt;rec_ts_idx++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (f) {</div><div class='hunk'>@@ -577,9 +626,10 @@ static int pcan_usb_decode_status(struct pcan_usb_msg_context *mc,</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PCAN_USB_REC_BUSEVT:</div><div class='del'>-		/* error frame/bus event */</div><div class='del'>-		if (n &amp; PCAN_USB_ERROR_TXQFULL)</div><div class='del'>-			netdev_dbg(mc-&gt;netdev, "device Tx queue full)\n");</div><div class='add'>+		/* bus event notifications (get rxerr/txerr) */</div><div class='add'>+		err = pcan_usb_handle_bus_evt(mc, n);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(mc-&gt;netdev, "unexpected function %u\n", f);</div><div class='hunk'>@@ -603,39 +653,37 @@ static int pcan_usb_decode_data(struct pcan_usb_msg_context *mc, u8 status_len)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct skb_shared_hwtstamps *hwts;</div><div class='add'>+	u32 can_id_flags;</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_can_skb(mc-&gt;netdev, &amp;cf);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (status_len &amp; PCAN_USB_STATUSLEN_EXT_ID) {</div><div class='del'>-		__le32 tmp32;</div><div class='del'>-</div><div class='ctx'> 		if ((mc-&gt;ptr + 4) &gt; mc-&gt;end)</div><div class='ctx'> 			goto decode_failed;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;tmp32, mc-&gt;ptr, 4);</div><div class='add'>+		can_id_flags = get_unaligned_le32(mc-&gt;ptr);</div><div class='add'>+		cf-&gt;can_id = can_id_flags &gt;&gt; 3 | CAN_EFF_FLAG;</div><div class='ctx'> 		mc-&gt;ptr += 4;</div><div class='del'>-</div><div class='del'>-		cf-&gt;can_id = (le32_to_cpu(tmp32) &gt;&gt; 3) | CAN_EFF_FLAG;</div><div class='ctx'> 	} else {</div><div class='del'>-		__le16 tmp16;</div><div class='del'>-</div><div class='ctx'> 		if ((mc-&gt;ptr + 2) &gt; mc-&gt;end)</div><div class='ctx'> 			goto decode_failed;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;tmp16, mc-&gt;ptr, 2);</div><div class='add'>+		can_id_flags = get_unaligned_le16(mc-&gt;ptr);</div><div class='add'>+		cf-&gt;can_id = can_id_flags &gt;&gt; 5;</div><div class='ctx'> 		mc-&gt;ptr += 2;</div><div class='del'>-</div><div class='del'>-		cf-&gt;can_id = le16_to_cpu(tmp16) &gt;&gt; 5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(rec_len);</div><div class='add'>+	can_frame_set_cc_len(cf, rec_len, mc-&gt;pdev-&gt;dev.can.ctrlmode);</div><div class='ctx'> </div><div class='del'>-	/* first data packet timestamp is a word */</div><div class='del'>-	if (pcan_usb_decode_ts(mc, !mc-&gt;rec_data_idx))</div><div class='add'>+	/* Only first packet timestamp is a word */</div><div class='add'>+	if (pcan_usb_decode_ts(mc, !mc-&gt;rec_ts_idx))</div><div class='ctx'> 		goto decode_failed;</div><div class='ctx'> </div><div class='add'>+	/* Next packet in the buffer will have a timestamp on a single byte */</div><div class='add'>+	mc-&gt;rec_ts_idx++;</div><div class='add'>+</div><div class='ctx'> 	/* read data */</div><div class='ctx'> 	memset(cf-&gt;data, 0x0, sizeof(cf-&gt;data));</div><div class='ctx'> 	if (status_len &amp; PCAN_USB_STATUSLEN_RTR) {</div><div class='hunk'>@@ -644,17 +692,22 @@ static int pcan_usb_decode_data(struct pcan_usb_msg_context *mc, u8 status_len)</div><div class='ctx'> 		if ((mc-&gt;ptr + rec_len) &gt; mc-&gt;end)</div><div class='ctx'> 			goto decode_failed;</div><div class='ctx'> </div><div class='del'>-		memcpy(cf-&gt;data, mc-&gt;ptr, cf-&gt;can_dlc);</div><div class='add'>+		memcpy(cf-&gt;data, mc-&gt;ptr, cf-&gt;len);</div><div class='ctx'> 		mc-&gt;ptr += rec_len;</div><div class='add'>+</div><div class='add'>+		/* Ignore next byte (client private id) if SRR bit is set */</div><div class='add'>+		if (can_id_flags &amp; PCAN_USB_TX_SRR)</div><div class='add'>+			mc-&gt;ptr++;</div><div class='add'>+</div><div class='add'>+		/* update statistics */</div><div class='add'>+		mc-&gt;netdev-&gt;stats.rx_bytes += cf-&gt;len;</div><div class='ctx'> 	}</div><div class='add'>+	mc-&gt;netdev-&gt;stats.rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	/* convert timestamp into kernel time */</div><div class='ctx'> 	hwts = skb_hwtstamps(skb);</div><div class='ctx'> 	peak_usb_get_ts_time(&amp;mc-&gt;pdev-&gt;time_ref, mc-&gt;ts16, &amp;hwts-&gt;hwtstamp);</div><div class='ctx'> </div><div class='del'>-	/* update statistics */</div><div class='del'>-	mc-&gt;netdev-&gt;stats.rx_packets++;</div><div class='del'>-	mc-&gt;netdev-&gt;stats.rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	/* push the skb */</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -688,7 +741,6 @@ static int pcan_usb_decode_msg(struct peak_usb_device *dev, u8 *ibuf, u32 lbuf)</div><div class='ctx'> 		/* handle normal can frames here */</div><div class='ctx'> 		} else {</div><div class='ctx'> 			err = pcan_usb_decode_data(&amp;mc, sl);</div><div class='del'>-			mc.rec_data_idx++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -724,57 +776,103 @@ static int pcan_usb_encode_msg(struct peak_usb_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	struct net_device *netdev = dev-&gt;netdev;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	u32 can_id_flags = cf-&gt;can_id &amp; CAN_ERR_MASK;</div><div class='ctx'> 	u8 *pc;</div><div class='ctx'> </div><div class='del'>-	obuf[0] = 2;</div><div class='del'>-	obuf[1] = 1;</div><div class='add'>+	obuf[0] = PCAN_USB_MSG_TX_CAN;</div><div class='add'>+	obuf[1] = 1;	/* only one CAN frame is stored in the packet */</div><div class='ctx'> </div><div class='ctx'> 	pc = obuf + PCAN_USB_MSG_HEADER_LEN;</div><div class='ctx'> </div><div class='ctx'> 	/* status/len byte */</div><div class='del'>-	*pc = cf-&gt;can_dlc;</div><div class='add'>+	*pc = can_get_cc_dlc(cf, dev-&gt;can.ctrlmode);</div><div class='add'>+</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 		*pc |= PCAN_USB_STATUSLEN_RTR;</div><div class='ctx'> </div><div class='ctx'> 	/* can id */</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='del'>-		__le32 tmp32 = cpu_to_le32((cf-&gt;can_id &amp; CAN_ERR_MASK) &lt;&lt; 3);</div><div class='del'>-</div><div class='ctx'> 		*pc |= PCAN_USB_STATUSLEN_EXT_ID;</div><div class='del'>-		memcpy(++pc, &amp;tmp32, 4);</div><div class='add'>+		pc++;</div><div class='add'>+</div><div class='add'>+		can_id_flags &lt;&lt;= 3;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='add'>+			can_id_flags |= PCAN_USB_TX_SRR;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+			can_id_flags |= PCAN_USB_TX_AT;</div><div class='add'>+</div><div class='add'>+		put_unaligned_le32(can_id_flags, pc);</div><div class='ctx'> 		pc += 4;</div><div class='ctx'> 	} else {</div><div class='del'>-		__le16 tmp16 = cpu_to_le16((cf-&gt;can_id &amp; CAN_ERR_MASK) &lt;&lt; 5);</div><div class='add'>+		pc++;</div><div class='ctx'> </div><div class='del'>-		memcpy(++pc, &amp;tmp16, 2);</div><div class='add'>+		can_id_flags &lt;&lt;= 5;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='add'>+			can_id_flags |= PCAN_USB_TX_SRR;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+			can_id_flags |= PCAN_USB_TX_AT;</div><div class='add'>+</div><div class='add'>+		put_unaligned_le16(can_id_flags, pc);</div><div class='ctx'> 		pc += 2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* can data */</div><div class='ctx'> 	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='del'>-		memcpy(pc, cf-&gt;data, cf-&gt;can_dlc);</div><div class='del'>-		pc += cf-&gt;can_dlc;</div><div class='add'>+		memcpy(pc, cf-&gt;data, cf-&gt;len);</div><div class='add'>+		pc += cf-&gt;len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* SRR bit needs a writer id (useless here) */</div><div class='add'>+	if (can_id_flags &amp; PCAN_USB_TX_SRR)</div><div class='add'>+		*pc++ = 0x80;</div><div class='add'>+</div><div class='ctx'> 	obuf[(*size)-1] = (u8)(stats-&gt;tx_packets &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* socket callback used to copy berr counters values received through USB */</div><div class='add'>+static int pcan_usb_get_berr_counter(const struct net_device *netdev,</div><div class='add'>+				     struct can_berr_counter *bec)</div><div class='add'>+{</div><div class='add'>+	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='add'>+	struct pcan_usb *pdev = container_of(dev, struct pcan_usb, dev);</div><div class='add'>+</div><div class='add'>+	*bec = pdev-&gt;bec;</div><div class='add'>+</div><div class='add'>+	/* must return 0 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * start interface</div><div class='ctx'>  */</div><div class='ctx'> static int pcan_usb_start(struct peak_usb_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcan_usb *pdev = container_of(dev, struct pcan_usb, dev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* number of bits used in timestamps read from adapter struct */</div><div class='ctx'> 	peak_usb_init_time_ref(&amp;pdev-&gt;time_ref, &amp;pcan_usb);</div><div class='ctx'> </div><div class='add'>+	pdev-&gt;bec.rxerr = 0;</div><div class='add'>+	pdev-&gt;bec.txerr = 0;</div><div class='add'>+</div><div class='add'>+	/* always ask the device for BERR reporting, to be able to switch from</div><div class='add'>+	 * WARNING to PASSIVE state</div><div class='add'>+	 */</div><div class='add'>+	err = pcan_usb_set_err_frame(dev, PCAN_USB_BERR_MASK);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_warn(dev-&gt;netdev,</div><div class='add'>+			    "Asking for BERR reporting error %u\n",</div><div class='add'>+			    err);</div><div class='add'>+</div><div class='ctx'> 	/* if revision greater than 3, can put silent mode on/off */</div><div class='ctx'> 	if (dev-&gt;device_rev &gt; 3) {</div><div class='del'>-		int err;</div><div class='del'>-</div><div class='ctx'> 		err = pcan_usb_set_silent(dev,</div><div class='ctx'> 				dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LISTENONLY);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -811,6 +909,19 @@ static int pcan_usb_init(struct peak_usb_device *dev)</div><div class='ctx'> 		 pcan_usb.name, dev-&gt;device_rev, serial_number,</div><div class='ctx'> 		 pcan_usb.ctrl_count);</div><div class='ctx'> </div><div class='add'>+	/* Since rev 4.1, PCAN-USB is able to make single-shot as well as</div><div class='add'>+	 * looped back frames.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;device_rev &gt;= 41) {</div><div class='add'>+		struct can_priv *priv = netdev_priv(dev-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		priv-&gt;ctrlmode_supported |= CAN_CTRLMODE_ONE_SHOT |</div><div class='add'>+					    CAN_CTRLMODE_LOOPBACK;</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(dev-&gt;netdev-&gt;dev.parent,</div><div class='add'>+			 "Firmware update available. Please contact support.peak@hms-networks.com\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -842,6 +953,50 @@ static int pcan_usb_probe(struct usb_interface *intf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pcan_usb_set_phys_id(struct net_device *netdev,</div><div class='add'>+				enum ethtool_phys_id_state state)</div><div class='add'>+{</div><div class='add'>+	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ETHTOOL_ID_ACTIVE:</div><div class='add'>+		/* call ON/OFF twice a second */</div><div class='add'>+		return 2;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_OFF:</div><div class='add'>+		err = pcan_usb_set_led(dev, 0);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_ON:</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_INACTIVE:</div><div class='add'>+		/* restore LED default */</div><div class='add'>+		err = pcan_usb_set_led(dev, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This device only handles 8-bit CAN channel id. */</div><div class='add'>+static int pcan_usb_get_eeprom_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return sizeof(u8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops pcan_usb_ethtool_ops = {</div><div class='add'>+	.set_phys_id = pcan_usb_set_phys_id,</div><div class='add'>+	.get_ts_info = pcan_get_ts_info,</div><div class='add'>+	.get_eeprom_len	= pcan_usb_get_eeprom_len,</div><div class='add'>+	.get_eeprom = peak_usb_get_eeprom,</div><div class='add'>+	.set_eeprom = peak_usb_set_eeprom,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * describe the PCAN-USB adapter</div><div class='ctx'>  */</div><div class='hunk'>@@ -861,18 +1016,20 @@ const struct peak_usb_adapter pcan_usb = {</div><div class='ctx'> 	.name = "PCAN-USB",</div><div class='ctx'> 	.device_id = PCAN_USB_PRODUCT_ID,</div><div class='ctx'> 	.ctrl_count = 1,</div><div class='del'>-	.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,</div><div class='add'>+	.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+			      CAN_CTRLMODE_CC_LEN8_DLC,</div><div class='ctx'> 	.clock = {</div><div class='del'>-		.freq = PCAN_USB_CRYSTAL_HZ / 2 ,</div><div class='add'>+		.freq = PCAN_USB_CRYSTAL_HZ / 2,</div><div class='ctx'> 	},</div><div class='ctx'> 	.bittiming_const = &amp;pcan_usb_const,</div><div class='ctx'> </div><div class='ctx'> 	/* size of device private data */</div><div class='ctx'> 	.sizeof_dev_private = sizeof(struct pcan_usb),</div><div class='ctx'> </div><div class='add'>+	.ethtool_ops = &amp;pcan_usb_ethtool_ops,</div><div class='add'>+</div><div class='ctx'> 	/* timestamps usage */</div><div class='ctx'> 	.ts_used_bits = 16,</div><div class='del'>-	.ts_period = 24575, /* calibration period in ts. */</div><div class='ctx'> 	.us_per_ts_scale = PCAN_USB_TS_US_PER_TICK, /* us=(ts*scale) */</div><div class='ctx'> 	.us_per_ts_shift = PCAN_USB_TS_DIV_SHIFTER, /*  &gt;&gt; shift     */</div><div class='ctx'> </div><div class='hunk'>@@ -889,9 +1046,11 @@ const struct peak_usb_adapter pcan_usb = {</div><div class='ctx'> 	.dev_init = pcan_usb_init,</div><div class='ctx'> 	.dev_set_bus = pcan_usb_write_mode,</div><div class='ctx'> 	.dev_set_bittiming = pcan_usb_set_bittiming,</div><div class='del'>-	.dev_get_device_id = pcan_usb_get_device_id,</div><div class='add'>+	.dev_get_can_channel_id = pcan_usb_get_can_channel_id,</div><div class='add'>+	.dev_set_can_channel_id = pcan_usb_set_can_channel_id,</div><div class='ctx'> 	.dev_decode_buf = pcan_usb_decode_buf,</div><div class='ctx'> 	.dev_encode_msg = pcan_usb_encode_msg,</div><div class='ctx'> 	.dev_start = pcan_usb_start,</div><div class='ctx'> 	.dev_restart_async = pcan_usb_restart_async,</div><div class='add'>+	.do_get_berr_counter = pcan_usb_get_berr_counter,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c<br/>index 458154c9b482..cf48bb26d46d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_core.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/peak_usb/pcan_usb_core.c</a></div><div class='hunk'>@@ -3,16 +3,19 @@</div><div class='ctx'>  * CAN driver for PEAK System USB adapters</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_usb_core.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2010 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2010-2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Many thanks to Klaus Hitschler &lt;klaus.hitschler@gmx.de&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/signal.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/signal.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/sysfs.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='hunk'>@@ -21,38 +24,62 @@</div><div class='ctx'> </div><div class='ctx'> #include "pcan_usb_core.h"</div><div class='ctx'> </div><div class='del'>-MODULE_AUTHOR("Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("CAN driver for PEAK-System USB adapters");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='ctx'> </div><div class='ctx'> /* Table of devices that work with this driver */</div><div class='del'>-static struct usb_device_id peak_usb_table[] = {</div><div class='del'>-	{USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USB_PRODUCT_ID)},</div><div class='del'>-	{USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBPRO_PRODUCT_ID)},</div><div class='del'>-	{USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBFD_PRODUCT_ID)},</div><div class='del'>-	{USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBPROFD_PRODUCT_ID)},</div><div class='del'>-	{USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBCHIP_PRODUCT_ID)},</div><div class='del'>-	{USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBX6_PRODUCT_ID)},</div><div class='del'>-	{} /* Terminating entry */</div><div class='add'>+static const struct usb_device_id peak_usb_table[] = {</div><div class='add'>+	{</div><div class='add'>+		USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USB_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;pcan_usb,</div><div class='add'>+	}, {</div><div class='add'>+		USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBPRO_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;pcan_usb_pro,</div><div class='add'>+	}, {</div><div class='add'>+		USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBFD_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;pcan_usb_fd,</div><div class='add'>+	}, {</div><div class='add'>+		USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBPROFD_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;pcan_usb_pro_fd,</div><div class='add'>+	}, {</div><div class='add'>+		USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBCHIP_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;pcan_usb_chip,</div><div class='add'>+	}, {</div><div class='add'>+		USB_DEVICE(PCAN_USB_VENDOR_ID, PCAN_USBX6_PRODUCT_ID),</div><div class='add'>+		.driver_info = (kernel_ulong_t)&amp;pcan_usb_x6,</div><div class='add'>+	}, {</div><div class='add'>+		/* Terminating entry */</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(usb, peak_usb_table);</div><div class='ctx'> </div><div class='del'>-/* List of supported PCAN-USB adapters (NULL terminated list) */</div><div class='del'>-static const struct peak_usb_adapter *const peak_usb_adapters_list[] = {</div><div class='del'>-	&amp;pcan_usb,</div><div class='del'>-	&amp;pcan_usb_pro,</div><div class='del'>-	&amp;pcan_usb_fd,</div><div class='del'>-	&amp;pcan_usb_pro_fd,</div><div class='del'>-	&amp;pcan_usb_chip,</div><div class='del'>-	&amp;pcan_usb_x6,</div><div class='add'>+static ssize_t can_channel_id_show(struct device *dev, struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = to_net_dev(dev);</div><div class='add'>+	struct peak_usb_device *peak_dev = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%08X\n", peak_dev-&gt;can_channel_id);</div><div class='add'>+}</div><div class='add'>+static DEVICE_ATTR_RO(can_channel_id);</div><div class='add'>+</div><div class='add'>+/* mutable to avoid cast in attribute_group */</div><div class='add'>+static struct attribute *peak_usb_sysfs_attrs[] = {</div><div class='add'>+	&amp;dev_attr_can_channel_id.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct attribute_group peak_usb_sysfs_group = {</div><div class='add'>+	.name	= "peak_usb",</div><div class='add'>+	.attrs	= peak_usb_sysfs_attrs,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * dump memory</div><div class='ctx'>  */</div><div class='ctx'> #define DUMP_WIDTH	16</div><div class='del'>-void pcan_dump_mem(char *prompt, void *p, int l)</div><div class='add'>+void pcan_dump_mem(const char *prompt, const void *p, int l)</div><div class='ctx'> {</div><div class='ctx'> 	pr_info("%s dumping %s (%d bytes):\n",</div><div class='ctx'> 		PCAN_USB_DRIVER_NAME, prompt ? prompt : "memory", l);</div><div class='hunk'>@@ -84,7 +111,7 @@ void peak_usb_update_ts_now(struct peak_time_ref *time_ref, u32 ts_now)</div><div class='ctx'> 		u32 delta_ts = time_ref-&gt;ts_dev_2 - time_ref-&gt;ts_dev_1;</div><div class='ctx'> </div><div class='ctx'> 		if (time_ref-&gt;ts_dev_2 &lt; time_ref-&gt;ts_dev_1)</div><div class='del'>-			delta_ts &amp;= (1 &lt;&lt; time_ref-&gt;adapter-&gt;ts_used_bits) - 1;</div><div class='add'>+			delta_ts &amp;= (1ULL &lt;&lt; time_ref-&gt;adapter-&gt;ts_used_bits) - 1;</div><div class='ctx'> </div><div class='ctx'> 		time_ref-&gt;ts_total += delta_ts;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -130,14 +157,55 @@ void peak_usb_get_ts_time(struct peak_time_ref *time_ref, u32 ts, ktime_t *time)</div><div class='ctx'> 	/* protect from getting time before setting now */</div><div class='ctx'> 	if (ktime_to_ns(time_ref-&gt;tv_host)) {</div><div class='ctx'> 		u64 delta_us;</div><div class='add'>+		s64 delta_ts = 0;</div><div class='add'>+</div><div class='add'>+		/* General case: dev_ts_1 &lt; dev_ts_2 &lt; ts, with:</div><div class='add'>+		 *</div><div class='add'>+		 * - dev_ts_1 = previous sync timestamp</div><div class='add'>+		 * - dev_ts_2 = last sync timestamp</div><div class='add'>+		 * - ts = event timestamp</div><div class='add'>+		 * - ts_period = known sync period (theoretical)</div><div class='add'>+		 *             ~ dev_ts2 - dev_ts1</div><div class='add'>+		 * *but*:</div><div class='add'>+		 *</div><div class='add'>+		 * - time counters wrap (see adapter-&gt;ts_used_bits)</div><div class='add'>+		 * - sometimes, dev_ts_1 &lt; ts &lt; dev_ts2</div><div class='add'>+		 *</div><div class='add'>+		 * "normal" case (sync time counters increase):</div><div class='add'>+		 * must take into account case when ts wraps (tsw)</div><div class='add'>+		 *</div><div class='add'>+		 *      &lt; ts_period &gt; &lt;          &gt;</div><div class='add'>+		 *     |             |            |</div><div class='add'>+		 *  ---+--------+----+-------0-+--+--&gt;</div><div class='add'>+		 *     ts_dev_1 |    ts_dev_2  |</div><div class='add'>+		 *              ts             tsw</div><div class='add'>+		 */</div><div class='add'>+		if (time_ref-&gt;ts_dev_1 &lt; time_ref-&gt;ts_dev_2) {</div><div class='add'>+			/* case when event time (tsw) wraps */</div><div class='add'>+			if (ts &lt; time_ref-&gt;ts_dev_1)</div><div class='add'>+				delta_ts = BIT_ULL(time_ref-&gt;adapter-&gt;ts_used_bits);</div><div class='add'>+</div><div class='add'>+		/* Otherwise, sync time counter (ts_dev_2) has wrapped:</div><div class='add'>+		 * handle case when event time (tsn) hasn't.</div><div class='add'>+		 *</div><div class='add'>+		 *      &lt; ts_period &gt; &lt;          &gt;</div><div class='add'>+		 *     |             |            |</div><div class='add'>+		 *  ---+--------+--0-+---------+--+--&gt;</div><div class='add'>+		 *     ts_dev_1 |    ts_dev_2  |</div><div class='add'>+		 *              tsn            ts</div><div class='add'>+		 */</div><div class='add'>+		} else if (time_ref-&gt;ts_dev_1 &lt; ts) {</div><div class='add'>+			delta_ts = -BIT_ULL(time_ref-&gt;adapter-&gt;ts_used_bits);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		delta_us = ts - time_ref-&gt;ts_dev_2;</div><div class='del'>-		if (ts &lt; time_ref-&gt;ts_dev_2)</div><div class='del'>-			delta_us &amp;= (1 &lt;&lt; time_ref-&gt;adapter-&gt;ts_used_bits) - 1;</div><div class='add'>+		/* add delay between last sync and event timestamps */</div><div class='add'>+		delta_ts += (signed int)(ts - time_ref-&gt;ts_dev_2);</div><div class='ctx'> </div><div class='del'>-		delta_us += time_ref-&gt;ts_total;</div><div class='add'>+		/* add time from beginning to last sync */</div><div class='add'>+		delta_ts += time_ref-&gt;ts_total;</div><div class='ctx'> </div><div class='del'>-		delta_us *= time_ref-&gt;adapter-&gt;us_per_ts_scale;</div><div class='add'>+		/* convert ticks number into microseconds */</div><div class='add'>+		delta_us = delta_ts * time_ref-&gt;adapter-&gt;us_per_ts_scale;</div><div class='ctx'> 		delta_us &gt;&gt;= time_ref-&gt;adapter-&gt;us_per_ts_shift;</div><div class='ctx'> </div><div class='ctx'> 		*time = ktime_add_us(time_ref-&gt;tv_host_0, delta_us);</div><div class='hunk'>@@ -146,15 +214,15 @@ void peak_usb_get_ts_time(struct peak_time_ref *time_ref, u32 ts, ktime_t *time)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * post received skb after having set any hw timestamp</div><div class='del'>- */</div><div class='del'>-int peak_usb_netif_rx(struct sk_buff *skb,</div><div class='del'>-		      struct peak_time_ref *time_ref, u32 ts_low)</div><div class='add'>+/* post received skb with native 64-bit hw timestamp */</div><div class='add'>+int peak_usb_netif_rx_64(struct sk_buff *skb, u32 ts_low, u32 ts_high)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_shared_hwtstamps *hwts = skb_hwtstamps(skb);</div><div class='add'>+	u64 ns_ts;</div><div class='ctx'> </div><div class='del'>-	peak_usb_get_ts_time(time_ref, ts_low, &amp;hwts-&gt;hwtstamp);</div><div class='add'>+	ns_ts = (u64)ts_high &lt;&lt; 32 | ts_low;</div><div class='add'>+	ns_ts *= NSEC_PER_USEC;</div><div class='add'>+	hwts-&gt;hwtstamp = ns_to_ktime(ns_ts);</div><div class='ctx'> </div><div class='ctx'> 	return netif_rx(skb);</div><div class='ctx'> }</div><div class='hunk'>@@ -232,6 +300,7 @@ static void peak_usb_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 	struct peak_tx_urb_context *context = urb-&gt;context;</div><div class='ctx'> 	struct peak_usb_device *dev;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='add'>+	int tx_bytes;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!context);</div><div class='ctx'> </div><div class='hunk'>@@ -246,33 +315,35 @@ static void peak_usb_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 	/* check tx status */</div><div class='ctx'> 	switch (urb-&gt;status) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		/* transmission complete */</div><div class='del'>-		netdev-&gt;stats.tx_packets++;</div><div class='del'>-		netdev-&gt;stats.tx_bytes += context-&gt;data_len;</div><div class='del'>-</div><div class='ctx'> 		/* prevent tx timeout */</div><div class='ctx'> 		netif_trans_update(netdev);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			netdev_err(netdev, "Tx urb aborted (%d)\n",</div><div class='del'>-				   urb-&gt;status);</div><div class='ctx'> 	case -EPROTO:</div><div class='ctx'> 	case -ENOENT:</div><div class='ctx'> 	case -ECONNRESET:</div><div class='ctx'> 	case -ESHUTDOWN:</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='add'>+	default:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(netdev, "Tx urb aborted (%d)\n",</div><div class='add'>+				   urb-&gt;status);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* should always release echo skb and corresponding context */</div><div class='del'>-	can_get_echo_skb(netdev, context-&gt;echo_index);</div><div class='add'>+	tx_bytes = can_get_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='ctx'> 	context-&gt;echo_index = PCAN_USB_MAX_TX_URBS;</div><div class='ctx'> </div><div class='del'>-	/* do wakeup tx queue in case of success only */</div><div class='del'>-	if (!urb-&gt;status)</div><div class='add'>+	if (!urb-&gt;status) {</div><div class='add'>+		/* transmission complete */</div><div class='add'>+		netdev-&gt;stats.tx_packets++;</div><div class='add'>+		netdev-&gt;stats.tx_bytes += tx_bytes;</div><div class='add'>+</div><div class='add'>+		/* do wakeup tx queue in case of success only */</div><div class='ctx'> 		netif_wake_queue(netdev);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -284,13 +355,12 @@ static netdev_tx_t peak_usb_ndo_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='ctx'> 	struct peak_tx_urb_context *context = NULL;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;netdev-&gt;stats;</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> 	u8 *obuf;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	size_t size = dev-&gt;adapter-&gt;tx_buffer_size;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; PCAN_USB_MAX_TX_URBS; i++)</div><div class='hunk'>@@ -318,18 +388,15 @@ static netdev_tx_t peak_usb_ndo_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	context-&gt;echo_index = i;</div><div class='ctx'> </div><div class='del'>-	/* Note: this works with CANFD frames too */</div><div class='del'>-	context-&gt;data_len = cfd-&gt;len;</div><div class='del'>-</div><div class='ctx'> 	usb_anchor_urb(urb, &amp;dev-&gt;tx_submitted);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, netdev, context-&gt;echo_index);</div><div class='add'>+	can_put_echo_skb(skb, netdev, context-&gt;echo_index, 0);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;dev-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		can_free_echo_skb(netdev, context-&gt;echo_index);</div><div class='add'>+		can_free_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='ctx'> </div><div class='ctx'> 		usb_unanchor_urb(urb);</div><div class='ctx'> </div><div class='hunk'>@@ -345,7 +412,7 @@ static netdev_tx_t peak_usb_ndo_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		default:</div><div class='ctx'> 			netdev_warn(netdev, "tx urb submitting failed err=%d\n",</div><div class='ctx'> 				    err);</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case -ENOENT:</div><div class='ctx'> 			/* cable unplugged */</div><div class='ctx'> 			stats-&gt;tx_dropped++;</div><div class='hunk'>@@ -568,19 +635,20 @@ static int peak_usb_ndo_stop(struct net_device *netdev)</div><div class='ctx'> 	dev-&gt;state &amp;= ~PCAN_USB_STATE_STARTED;</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='add'>+	close_candev(netdev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;can.state = CAN_STATE_STOPPED;</div><div class='add'>+</div><div class='ctx'> 	/* unlink all pending urbs and free used memory */</div><div class='ctx'> 	peak_usb_unlink_all_urbs(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;adapter-&gt;dev_stop)</div><div class='ctx'> 		dev-&gt;adapter-&gt;dev_stop(dev);</div><div class='ctx'> </div><div class='del'>-	close_candev(netdev);</div><div class='del'>-</div><div class='del'>-	dev-&gt;can.state = CAN_STATE_STOPPED;</div><div class='del'>-</div><div class='ctx'> 	/* can set bus off now */</div><div class='ctx'> 	if (dev-&gt;adapter-&gt;dev_set_bus) {</div><div class='ctx'> 		int err = dev-&gt;adapter-&gt;dev_set_bus(dev, 0);</div><div class='add'>+</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -702,7 +770,7 @@ static int peak_usb_set_data_bittiming(struct net_device *netdev)</div><div class='ctx'> 	const struct peak_usb_adapter *pa = dev-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	if (pa-&gt;dev_set_data_bittiming) {</div><div class='del'>-		struct can_bittiming *bt = &amp;dev-&gt;can.data_bittiming;</div><div class='add'>+		struct can_bittiming *bt = &amp;dev-&gt;can.fd.data_bittiming;</div><div class='ctx'> 		int err = pa-&gt;dev_set_data_bittiming(dev, bt);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -716,13 +784,127 @@ static int peak_usb_set_data_bittiming(struct net_device *netdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int peak_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+			     struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;tx_type = HWTSTAMP_TX_OFF;</div><div class='add'>+	config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int peak_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+			     struct kernel_hwtstamp_config *config,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (config-&gt;tx_type == HWTSTAMP_TX_OFF &amp;&amp;</div><div class='add'>+	    config-&gt;rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Only RX HWTSTAMP_FILTER_ALL is supported");</div><div class='add'>+	return -ERANGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops peak_usb_netdev_ops = {</div><div class='ctx'> 	.ndo_open = peak_usb_ndo_open,</div><div class='ctx'> 	.ndo_stop = peak_usb_ndo_stop,</div><div class='ctx'> 	.ndo_start_xmit = peak_usb_ndo_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+	.ndo_hwtstamp_get = peak_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = peak_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* CAN-USB devices generally handle 32-bit CAN channel IDs.</div><div class='add'>+ * In case one doesn't, then it have to overload this function.</div><div class='add'>+ */</div><div class='add'>+int peak_usb_get_eeprom_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return sizeof(u32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Every CAN-USB device exports the dev_get_can_channel_id() operation. It is used</div><div class='add'>+ * here to fill the data buffer with the user defined CAN channel ID.</div><div class='add'>+ */</div><div class='add'>+int peak_usb_get_eeprom(struct net_device *netdev,</div><div class='add'>+			struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='add'>+	u32 ch_id;</div><div class='add'>+	__le32 ch_id_le;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dev-&gt;adapter-&gt;dev_get_can_channel_id(dev, &amp;ch_id);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* ethtool operates on individual bytes. The byte order of the CAN</div><div class='add'>+	 * channel id in memory depends on the kernel architecture. We</div><div class='add'>+	 * convert the CAN channel id back to the native byte order of the PEAK</div><div class='add'>+	 * device itself to ensure that the order is consistent for all</div><div class='add'>+	 * host architectures.</div><div class='add'>+	 */</div><div class='add'>+	ch_id_le = cpu_to_le32(ch_id);</div><div class='add'>+	memcpy(data, (u8 *)&amp;ch_id_le + eeprom-&gt;offset, eeprom-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* update cached value */</div><div class='add'>+	dev-&gt;can_channel_id = ch_id;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Every CAN-USB device exports the dev_get_can_channel_id()/dev_set_can_channel_id()</div><div class='add'>+ * operations. They are used here to set the new user defined CAN channel ID.</div><div class='add'>+ */</div><div class='add'>+int peak_usb_set_eeprom(struct net_device *netdev,</div><div class='add'>+			struct ethtool_eeprom *eeprom, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='add'>+	u32 ch_id;</div><div class='add'>+	__le32 ch_id_le;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* first, read the current user defined CAN channel ID */</div><div class='add'>+	err = dev-&gt;adapter-&gt;dev_get_can_channel_id(dev, &amp;ch_id);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "Failed to init CAN channel id (err %d)\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* do update the value with user given bytes.</div><div class='add'>+	 * ethtool operates on individual bytes. The byte order of the CAN</div><div class='add'>+	 * channel ID in memory depends on the kernel architecture. We</div><div class='add'>+	 * convert the CAN channel ID back to the native byte order of the PEAK</div><div class='add'>+	 * device itself to ensure that the order is consistent for all</div><div class='add'>+	 * host architectures.</div><div class='add'>+	 */</div><div class='add'>+	ch_id_le = cpu_to_le32(ch_id);</div><div class='add'>+	memcpy((u8 *)&amp;ch_id_le + eeprom-&gt;offset, data, eeprom-&gt;len);</div><div class='add'>+	ch_id = le32_to_cpu(ch_id_le);</div><div class='add'>+</div><div class='add'>+	/* flash the new value now */</div><div class='add'>+	err = dev-&gt;adapter-&gt;dev_set_can_channel_id(dev, ch_id);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "Failed to write new CAN channel id (err %d)\n",</div><div class='add'>+			   err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* update cached value with the new one */</div><div class='add'>+	dev-&gt;can_channel_id = ch_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pcan_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	info-&gt;so_timestamping =</div><div class='add'>+		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_OFF);</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_ALL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * create one device which is attached to CAN controller #ctrl_idx of the</div><div class='ctx'>  * usb adapter.</div><div class='hunk'>@@ -750,7 +932,7 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,</div><div class='ctx'> 	dev = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* allocate a buffer large enough to send commands */</div><div class='del'>-	dev-&gt;cmd_buf = kmalloc(PCAN_USB_MAX_CMD_LEN, GFP_KERNEL);</div><div class='add'>+	dev-&gt;cmd_buf = kzalloc(PCAN_USB_MAX_CMD_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!dev-&gt;cmd_buf) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto lbl_free_candev;</div><div class='hunk'>@@ -768,8 +950,8 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,</div><div class='ctx'> 	dev-&gt;can.clock = peak_usb_adapter-&gt;clock;</div><div class='ctx'> 	dev-&gt;can.bittiming_const = peak_usb_adapter-&gt;bittiming_const;</div><div class='ctx'> 	dev-&gt;can.do_set_bittiming = peak_usb_set_bittiming;</div><div class='del'>-	dev-&gt;can.data_bittiming_const = peak_usb_adapter-&gt;data_bittiming_const;</div><div class='del'>-	dev-&gt;can.do_set_data_bittiming = peak_usb_set_data_bittiming;</div><div class='add'>+	dev-&gt;can.fd.data_bittiming_const = peak_usb_adapter-&gt;data_bittiming_const;</div><div class='add'>+	dev-&gt;can.fd.do_set_data_bittiming = peak_usb_set_data_bittiming;</div><div class='ctx'> 	dev-&gt;can.do_set_mode = peak_usb_set_mode;</div><div class='ctx'> 	dev-&gt;can.do_get_berr_counter = peak_usb_adapter-&gt;do_get_berr_counter;</div><div class='ctx'> 	dev-&gt;can.ctrlmode_supported = peak_usb_adapter-&gt;ctrlmode_supported;</div><div class='hunk'>@@ -778,6 +960,12 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO; /* we support local echo */</div><div class='ctx'> </div><div class='add'>+	/* add ethtool support */</div><div class='add'>+	netdev-&gt;ethtool_ops = peak_usb_adapter-&gt;ethtool_ops;</div><div class='add'>+</div><div class='add'>+	/* register peak_usb sysfs files */</div><div class='add'>+	netdev-&gt;sysfs_groups[0] = &amp;peak_usb_sysfs_group;</div><div class='add'>+</div><div class='ctx'> 	init_usb_anchor(&amp;dev-&gt;rx_submitted);</div><div class='ctx'> </div><div class='ctx'> 	init_usb_anchor(&amp;dev-&gt;tx_submitted);</div><div class='hunk'>@@ -815,18 +1003,21 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,</div><div class='ctx'> 	if (dev-&gt;adapter-&gt;dev_set_bus) {</div><div class='ctx'> 		err = dev-&gt;adapter-&gt;dev_set_bus(dev, 0);</div><div class='ctx'> 		if (err)</div><div class='del'>-			goto lbl_unregister_candev;</div><div class='add'>+			goto adap_dev_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* get device number early */</div><div class='del'>-	if (dev-&gt;adapter-&gt;dev_get_device_id)</div><div class='del'>-		dev-&gt;adapter-&gt;dev_get_device_id(dev, &amp;dev-&gt;device_number);</div><div class='add'>+	/* get CAN channel id early */</div><div class='add'>+	dev-&gt;adapter-&gt;dev_get_can_channel_id(dev, &amp;dev-&gt;can_channel_id);</div><div class='ctx'> </div><div class='del'>-	netdev_info(netdev, "attached to %s channel %u (device %u)\n",</div><div class='del'>-			peak_usb_adapter-&gt;name, ctrl_idx, dev-&gt;device_number);</div><div class='add'>+	netdev_info(netdev, "attached to %s channel %u (device 0x%08X)\n",</div><div class='add'>+		    peak_usb_adapter-&gt;name, ctrl_idx, dev-&gt;can_channel_id);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+adap_dev_free:</div><div class='add'>+	if (dev-&gt;adapter-&gt;dev_free)</div><div class='add'>+		dev-&gt;adapter-&gt;dev_free(dev);</div><div class='add'>+</div><div class='ctx'> lbl_unregister_candev:</div><div class='ctx'> 	unregister_candev(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -855,9 +1046,9 @@ static void peak_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> </div><div class='ctx'> 		dev_prev_siblings = dev-&gt;prev_siblings;</div><div class='ctx'> 		dev-&gt;state &amp;= ~PCAN_USB_STATE_CONNECTED;</div><div class='del'>-		strncpy(name, netdev-&gt;name, IFNAMSIZ);</div><div class='add'>+		strscpy(name, netdev-&gt;name, IFNAMSIZ);</div><div class='ctx'> </div><div class='del'>-		unregister_netdev(netdev);</div><div class='add'>+		unregister_candev(netdev);</div><div class='ctx'> </div><div class='ctx'> 		kfree(dev-&gt;cmd_buf);</div><div class='ctx'> 		dev-&gt;next_siblings = NULL;</div><div class='hunk'>@@ -877,24 +1068,11 @@ static void peak_usb_disconnect(struct usb_interface *intf)</div><div class='ctx'> static int peak_usb_probe(struct usb_interface *intf,</div><div class='ctx'> 			  const struct usb_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct usb_device *usb_dev = interface_to_usbdev(intf);</div><div class='del'>-	const u16 usb_id_product = le16_to_cpu(usb_dev-&gt;descriptor.idProduct);</div><div class='del'>-	const struct peak_usb_adapter *peak_usb_adapter = NULL;</div><div class='add'>+	const struct peak_usb_adapter *peak_usb_adapter;</div><div class='ctx'> 	int i, err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* get corresponding PCAN-USB adapter */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(peak_usb_adapters_list); i++)</div><div class='del'>-		if (peak_usb_adapters_list[i]-&gt;device_id == usb_id_product) {</div><div class='del'>-			peak_usb_adapter = peak_usb_adapters_list[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	if (!peak_usb_adapter) {</div><div class='del'>-		/* should never come except device_id bad usage in this file */</div><div class='del'>-		pr_err("%s: didn't find device id. 0x%x in devices list\n",</div><div class='del'>-			PCAN_USB_DRIVER_NAME, usb_id_product);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	peak_usb_adapter = (const struct peak_usb_adapter *)id-&gt;driver_info;</div><div class='ctx'> </div><div class='ctx'> 	/* got corresponding adapter: check if it handles current interface */</div><div class='ctx'> 	if (peak_usb_adapter-&gt;intf_probe) {</div><div class='hunk'>@@ -958,7 +1136,7 @@ static void __exit peak_usb_exit(void)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* last chance do send any synchronous commands here */</div><div class='del'>-	err = driver_for_each_device(&amp;peak_usb_driver.drvwrap.driver, NULL,</div><div class='add'>+	err = driver_for_each_device(&amp;peak_usb_driver.driver, NULL,</div><div class='ctx'> 				     NULL, peak_usb_do_device_exit);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		pr_err("%s: failed to stop all can devices (err %d)\n",</div><div class='head'>diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.h b/drivers/net/can/usb/peak_usb/pcan_usb_core.h<br/>index 4b1528a42a7b..d1c1897d47b9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_core.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_core.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/peak_usb/pcan_usb_core.h</a></div><div class='hunk'>@@ -3,8 +3,8 @@</div><div class='ctx'>  * CAN driver for PEAK System USB adapters</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_usb_core.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2010 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2010-2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Many thanks to Klaus Hitschler &lt;klaus.hitschler@gmx.de&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> /* usb adapters maximum channels per usb interface */</div><div class='ctx'> #define PCAN_USB_MAX_CHANNEL		2</div><div class='ctx'> </div><div class='del'>-/* maximum length of the usb commands sent to/received from  the devices */</div><div class='add'>+/* maximum length of the usb commands sent to/received from the devices */</div><div class='ctx'> #define PCAN_USB_MAX_CMD_LEN		32</div><div class='ctx'> </div><div class='ctx'> struct peak_usb_device;</div><div class='hunk'>@@ -46,6 +46,8 @@ struct peak_usb_adapter {</div><div class='ctx'> 	const struct can_bittiming_const * const data_bittiming_const;</div><div class='ctx'> 	unsigned int ctrl_count;</div><div class='ctx'> </div><div class='add'>+	const struct ethtool_ops *ethtool_ops;</div><div class='add'>+</div><div class='ctx'> 	int (*intf_probe)(struct usb_interface *intf);</div><div class='ctx'> </div><div class='ctx'> 	int (*dev_init)(struct peak_usb_device *dev);</div><div class='hunk'>@@ -58,7 +60,8 @@ struct peak_usb_adapter {</div><div class='ctx'> 	int (*dev_set_data_bittiming)(struct peak_usb_device *dev,</div><div class='ctx'> 				      struct can_bittiming *bt);</div><div class='ctx'> 	int (*dev_set_bus)(struct peak_usb_device *dev, u8 onoff);</div><div class='del'>-	int (*dev_get_device_id)(struct peak_usb_device *dev, u32 *device_id);</div><div class='add'>+	int (*dev_get_can_channel_id)(struct peak_usb_device *dev, u32 *can_ch_id);</div><div class='add'>+	int (*dev_set_can_channel_id)(struct peak_usb_device *dev, u32 can_ch_id);</div><div class='ctx'> 	int (*dev_decode_buf)(struct peak_usb_device *dev, struct urb *urb);</div><div class='ctx'> 	int (*dev_encode_msg)(struct peak_usb_device *dev, struct sk_buff *skb,</div><div class='ctx'> 					u8 *obuf, size_t *size);</div><div class='hunk'>@@ -71,7 +74,6 @@ struct peak_usb_adapter {</div><div class='ctx'> 	u8 ep_msg_in;</div><div class='ctx'> 	u8 ep_msg_out[PCAN_USB_MAX_CHANNEL];</div><div class='ctx'> 	u8 ts_used_bits;</div><div class='del'>-	u32 ts_period;</div><div class='ctx'> 	u8 us_per_ts_shift;</div><div class='ctx'> 	u32 us_per_ts_scale;</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +100,6 @@ struct peak_time_ref {</div><div class='ctx'> struct peak_tx_urb_context {</div><div class='ctx'> 	struct peak_usb_device *dev;</div><div class='ctx'> 	u32 echo_index;</div><div class='del'>-	u8 data_len;</div><div class='ctx'> 	struct urb *urb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -112,8 +113,6 @@ struct peak_usb_device {</div><div class='ctx'> 	unsigned int ctrl_idx;</div><div class='ctx'> 	u32 state;</div><div class='ctx'> </div><div class='del'>-	struct sk_buff *echo_skb[PCAN_USB_MAX_TX_URBS];</div><div class='del'>-</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> </div><div class='hunk'>@@ -124,19 +123,18 @@ struct peak_usb_device {</div><div class='ctx'> 	u8 *cmd_buf;</div><div class='ctx'> 	struct usb_anchor rx_submitted;</div><div class='ctx'> </div><div class='del'>-	u32 device_number;</div><div class='add'>+	/* equivalent to the device ID in the Windows API */</div><div class='add'>+	u32 can_channel_id;</div><div class='ctx'> 	u8 device_rev;</div><div class='ctx'> </div><div class='ctx'> 	u8 ep_msg_in;</div><div class='ctx'> 	u8 ep_msg_out;</div><div class='ctx'> </div><div class='del'>-	u16 bus_load;</div><div class='del'>-</div><div class='ctx'> 	struct peak_usb_device *prev_siblings;</div><div class='ctx'> 	struct peak_usb_device *next_siblings;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void pcan_dump_mem(char *prompt, void *p, int l);</div><div class='add'>+void pcan_dump_mem(const char *prompt, const void *p, int l);</div><div class='ctx'> </div><div class='ctx'> /* common timestamp management */</div><div class='ctx'> void peak_usb_init_time_ref(struct peak_time_ref *time_ref,</div><div class='hunk'>@@ -144,9 +142,15 @@ void peak_usb_init_time_ref(struct peak_time_ref *time_ref,</div><div class='ctx'> void peak_usb_update_ts_now(struct peak_time_ref *time_ref, u32 ts_now);</div><div class='ctx'> void peak_usb_set_ts_now(struct peak_time_ref *time_ref, u32 ts_now);</div><div class='ctx'> void peak_usb_get_ts_time(struct peak_time_ref *time_ref, u32 ts, ktime_t *tv);</div><div class='del'>-int peak_usb_netif_rx(struct sk_buff *skb,</div><div class='del'>-		      struct peak_time_ref *time_ref, u32 ts_low);</div><div class='add'>+int peak_usb_netif_rx_64(struct sk_buff *skb, u32 ts_low, u32 ts_high);</div><div class='ctx'> void peak_usb_async_complete(struct urb *urb);</div><div class='ctx'> void peak_usb_restart_complete(struct peak_usb_device *dev);</div><div class='del'>-</div><div class='add'>+int pcan_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info);</div><div class='add'>+</div><div class='add'>+/* common 32-bit CAN channel ID ethtool management */</div><div class='add'>+int peak_usb_get_eeprom_len(struct net_device *netdev);</div><div class='add'>+int peak_usb_get_eeprom(struct net_device *netdev,</div><div class='add'>+			struct ethtool_eeprom *eeprom, u8 *data);</div><div class='add'>+int peak_usb_set_eeprom(struct net_device *netdev,</div><div class='add'>+			struct ethtool_eeprom *eeprom, u8 *data);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c<br/>index 34761c3a6286..be84191cde56 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_fd.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_fd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_fd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/peak_usb/pcan_usb_fd.c</a></div><div class='hunk'>@@ -2,11 +2,13 @@</div><div class='ctx'> /*</div><div class='ctx'>  * CAN driver for PEAK System PCAN-USB FD / PCAN-USB Pro FD adapter</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2013-2014 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2013-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='hunk'>@@ -16,9 +18,6 @@</div><div class='ctx'> #include "pcan_usb_core.h"</div><div class='ctx'> #include "pcan_usb_pro.h"</div><div class='ctx'> </div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter");</div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter");</div><div class='del'>-</div><div class='ctx'> #define PCAN_USBPROFD_CHANNEL_COUNT	2</div><div class='ctx'> #define PCAN_USBFD_CHANNEL_COUNT	1</div><div class='ctx'> </div><div class='hunk'>@@ -35,7 +34,11 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter");</div><div class='ctx'> #define PCAN_UFD_RX_BUFFER_SIZE		2048</div><div class='ctx'> #define PCAN_UFD_TX_BUFFER_SIZE		512</div><div class='ctx'> </div><div class='del'>-/* read some versions info from the hw devcie */</div><div class='add'>+/* struct pcan_ufd_fw_info::type */</div><div class='add'>+#define PCAN_USBFD_TYPE_STD		1</div><div class='add'>+#define PCAN_USBFD_TYPE_EXT		2	/* includes EP numbers */</div><div class='add'>+</div><div class='add'>+/* read some versions info from the hw device */</div><div class='ctx'> struct __packed pcan_ufd_fw_info {</div><div class='ctx'> 	__le16	size_of;	/* sizeof this */</div><div class='ctx'> 	__le16	type;		/* type of this structure */</div><div class='hunk'>@@ -46,6 +49,13 @@ struct __packed pcan_ufd_fw_info {</div><div class='ctx'> 	__le32	dev_id[2];	/* "device id" per CAN */</div><div class='ctx'> 	__le32	ser_no;		/* S/N */</div><div class='ctx'> 	__le32	flags;		/* special functions */</div><div class='add'>+</div><div class='add'>+	/* extended data when type &gt;= PCAN_USBFD_TYPE_EXT */</div><div class='add'>+	u8	cmd_out_ep;	/* ep for cmd */</div><div class='add'>+	u8	cmd_in_ep;	/* ep for replies */</div><div class='add'>+	u8	data_out_ep[2];	/* ep for CANx TX */</div><div class='add'>+	u8	data_in_ep;	/* ep for CAN RX */</div><div class='add'>+	u8	dummy[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* handle device specific info used by the netdevices */</div><div class='hunk'>@@ -138,6 +148,15 @@ struct __packed pcan_ufd_ovr_msg {</div><div class='ctx'> 	u8	unused[3];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PCAN_UFD_CMD_DEVID_SET		0x81</div><div class='add'>+</div><div class='add'>+struct __packed pcan_ufd_device_id {</div><div class='add'>+	__le16	opcode_channel;</div><div class='add'>+</div><div class='add'>+	u16	unused;</div><div class='add'>+	__le32	device_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static inline int pufd_omsg_get_channel(struct pcan_ufd_ovr_msg *om)</div><div class='ctx'> {</div><div class='ctx'> 	return om-&gt;channel &amp; 0xf;</div><div class='hunk'>@@ -173,6 +192,9 @@ static inline void *pcan_usb_fd_cmd_buffer(struct peak_usb_device *dev)</div><div class='ctx'> /* send PCAN-USB Pro FD commands synchronously */</div><div class='ctx'> static int pcan_usb_fd_send_cmd(struct peak_usb_device *dev, void *cmd_tail)</div><div class='ctx'> {</div><div class='add'>+	struct pcan_usb_fd_device *pdev =</div><div class='add'>+		container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='add'>+	struct pcan_ufd_fw_info *fw_info = &amp;pdev-&gt;usb_if-&gt;fw_info;</div><div class='ctx'> 	void *cmd_head = pcan_usb_fd_cmd_buffer(dev);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u8 *packet_ptr;</div><div class='hunk'>@@ -202,7 +224,7 @@ static int pcan_usb_fd_send_cmd(struct peak_usb_device *dev, void *cmd_tail)</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = usb_bulk_msg(dev-&gt;udev,</div><div class='ctx'> 				   usb_sndbulkpipe(dev-&gt;udev,</div><div class='del'>-						   PCAN_USBPRO_EP_CMDOUT),</div><div class='add'>+						   fw_info-&gt;cmd_out_ep),</div><div class='ctx'> 				   packet_ptr, packet_len,</div><div class='ctx'> 				   NULL, PCAN_UFD_CMD_TIMEOUT_MS);</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -222,6 +244,15 @@ static int pcan_usb_fd_send_cmd(struct peak_usb_device *dev, void *cmd_tail)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pcan_usb_fd_read_fwinfo(struct peak_usb_device *dev,</div><div class='add'>+				   struct pcan_ufd_fw_info *fw_info)</div><div class='add'>+{</div><div class='add'>+	return pcan_usb_pro_send_req(dev, PCAN_USBPRO_REQ_INFO,</div><div class='add'>+				     PCAN_USBPRO_INFO_FW,</div><div class='add'>+				     fw_info,</div><div class='add'>+				     sizeof(*fw_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* build the commands list in the given buffer, to enter operational mode */</div><div class='ctx'> static int pcan_usb_fd_build_restart_cmd(struct peak_usb_device *dev, u8 *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -422,12 +453,43 @@ static int pcan_usb_fd_set_bittiming_fast(struct peak_usb_device *dev,</div><div class='ctx'> 	return pcan_usb_fd_send_cmd(dev, ++cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* read user CAN channel id from device */</div><div class='add'>+static int pcan_usb_fd_get_can_channel_id(struct peak_usb_device *dev,</div><div class='add'>+					  u32 *can_ch_id)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	struct pcan_usb_fd_if *usb_if = pcan_usb_fd_dev_if(dev);</div><div class='add'>+</div><div class='add'>+	err = pcan_usb_fd_read_fwinfo(dev, &amp;usb_if-&gt;fw_info);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*can_ch_id = le32_to_cpu(usb_if-&gt;fw_info.dev_id[dev-&gt;ctrl_idx]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set a new CAN channel id in the flash memory of the device */</div><div class='add'>+static int pcan_usb_fd_set_can_channel_id(struct peak_usb_device *dev, u32 can_ch_id)</div><div class='add'>+{</div><div class='add'>+	struct pcan_ufd_device_id *cmd = pcan_usb_fd_cmd_buffer(dev);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;opcode_channel = pucan_cmd_opcode_channel(dev-&gt;ctrl_idx,</div><div class='add'>+						       PCAN_UFD_CMD_DEVID_SET);</div><div class='add'>+	cmd-&gt;device_id = cpu_to_le32(can_ch_id);</div><div class='add'>+</div><div class='add'>+	/* send the command */</div><div class='add'>+	return pcan_usb_fd_send_cmd(dev, ++cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* handle restart but in asynchronously way</div><div class='ctx'>  * (uses PCAN-USB Pro code to complete asynchronous request)</div><div class='ctx'>  */</div><div class='ctx'> static int pcan_usb_fd_restart_async(struct peak_usb_device *dev,</div><div class='ctx'> 				     struct urb *urb, u8 *buf)</div><div class='ctx'> {</div><div class='add'>+	struct pcan_usb_fd_device *pdev =</div><div class='add'>+		container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='add'>+	struct pcan_ufd_fw_info *fw_info = &amp;pdev-&gt;usb_if-&gt;fw_info;</div><div class='ctx'> 	u8 *pc = buf;</div><div class='ctx'> </div><div class='ctx'> 	/* build the entire cmds list in the provided buffer, to go back into</div><div class='hunk'>@@ -441,7 +503,7 @@ static int pcan_usb_fd_restart_async(struct peak_usb_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* complete the URB */</div><div class='ctx'> 	usb_fill_bulk_urb(urb, dev-&gt;udev,</div><div class='del'>-			  usb_sndbulkpipe(dev-&gt;udev, PCAN_USBPRO_EP_CMDOUT),</div><div class='add'>+			  usb_sndbulkpipe(dev-&gt;udev, fw_info-&gt;cmd_out_ep),</div><div class='ctx'> 			  buf, pc - buf,</div><div class='ctx'> 			  pcan_usb_pro_restart_complete, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -468,12 +530,18 @@ static int pcan_usb_fd_decode_canmsg(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 				     struct pucan_msg *rx_msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pucan_rx_msg *rm = (struct pucan_rx_msg *)rx_msg;</div><div class='del'>-	struct peak_usb_device *dev = usb_if-&gt;dev[pucan_msg_get_channel(rm)];</div><div class='del'>-	struct net_device *netdev = dev-&gt;netdev;</div><div class='add'>+	struct peak_usb_device *dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='ctx'> 	struct canfd_frame *cfd;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	const u16 rx_msg_flags = le16_to_cpu(rm-&gt;flags);</div><div class='ctx'> </div><div class='add'>+	if (pucan_msg_get_channel(rm) &gt;= ARRAY_SIZE(usb_if-&gt;dev))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = usb_if-&gt;dev[pucan_msg_get_channel(rm)];</div><div class='add'>+	netdev = dev-&gt;netdev;</div><div class='add'>+</div><div class='ctx'> 	if (rx_msg_flags &amp; PUCAN_MSG_EXT_DATA_LEN) {</div><div class='ctx'> 		/* CANFD frame case */</div><div class='ctx'> 		skb = alloc_canfd_skb(netdev, &amp;cfd);</div><div class='hunk'>@@ -486,14 +554,16 @@ static int pcan_usb_fd_decode_canmsg(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 		if (rx_msg_flags &amp; PUCAN_MSG_ERROR_STATE_IND)</div><div class='ctx'> 			cfd-&gt;flags |= CANFD_ESI;</div><div class='ctx'> </div><div class='del'>-		cfd-&gt;len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(rm)));</div><div class='add'>+		cfd-&gt;len = can_fd_dlc2len(pucan_msg_get_dlc(rm));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* CAN 2.0 frame case */</div><div class='ctx'> 		skb = alloc_can_skb(netdev, (struct can_frame **)&amp;cfd);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		cfd-&gt;len = get_can_dlc(pucan_msg_get_dlc(rm));</div><div class='add'>+		can_frame_set_cc_len((struct can_frame *)cfd,</div><div class='add'>+				     pucan_msg_get_dlc(rm),</div><div class='add'>+				     dev-&gt;can.ctrlmode);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cfd-&gt;can_id = le32_to_cpu(rm-&gt;can_id);</div><div class='hunk'>@@ -501,15 +571,16 @@ static int pcan_usb_fd_decode_canmsg(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 	if (rx_msg_flags &amp; PUCAN_MSG_EXT_ID)</div><div class='ctx'> 		cfd-&gt;can_id |= CAN_EFF_FLAG;</div><div class='ctx'> </div><div class='del'>-	if (rx_msg_flags &amp; PUCAN_MSG_RTR)</div><div class='add'>+	if (rx_msg_flags &amp; PUCAN_MSG_RTR) {</div><div class='ctx'> 		cfd-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='ctx'> 		memcpy(cfd-&gt;data, rm-&gt;d, cfd-&gt;len);</div><div class='del'>-</div><div class='del'>-	peak_usb_netif_rx(skb, &amp;usb_if-&gt;time_ref, le32_to_cpu(rm-&gt;ts_low));</div><div class='del'>-</div><div class='add'>+		netdev-&gt;stats.rx_bytes += cfd-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> 	netdev-&gt;stats.rx_packets++;</div><div class='del'>-	netdev-&gt;stats.rx_bytes += cfd-&gt;len;</div><div class='add'>+</div><div class='add'>+	peak_usb_netif_rx_64(skb, le32_to_cpu(rm-&gt;ts_low),</div><div class='add'>+			     le32_to_cpu(rm-&gt;ts_high));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -519,15 +590,21 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 				     struct pucan_msg *rx_msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pucan_status_msg *sm = (struct pucan_status_msg *)rx_msg;</div><div class='del'>-	struct peak_usb_device *dev = usb_if-&gt;dev[pucan_stmsg_get_channel(sm)];</div><div class='del'>-	struct pcan_usb_fd_device *pdev =</div><div class='del'>-			container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='add'>+	struct pcan_usb_fd_device *pdev;</div><div class='ctx'> 	enum can_state new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	enum can_state rx_state, tx_state;</div><div class='del'>-	struct net_device *netdev = dev-&gt;netdev;</div><div class='add'>+	struct peak_usb_device *dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+	if (pucan_stmsg_get_channel(sm) &gt;= ARRAY_SIZE(usb_if-&gt;dev))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev = usb_if-&gt;dev[pucan_stmsg_get_channel(sm)];</div><div class='add'>+	pdev = container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='add'>+	netdev = dev-&gt;netdev;</div><div class='add'>+</div><div class='ctx'> 	/* nothing should be sent while in BUS_OFF state */</div><div class='ctx'> 	if (dev-&gt;can.state == CAN_STATE_BUS_OFF)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -539,11 +616,10 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 	} else if (sm-&gt;channel_p_w_b &amp; PUCAN_BUS_WARNING) {</div><div class='ctx'> 		new_state = CAN_STATE_ERROR_WARNING;</div><div class='ctx'> 	} else {</div><div class='del'>-		/* no error bit (so, no error skb, back to active state) */</div><div class='del'>-		dev-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='add'>+		/* back to (or still in) ERROR_ACTIVE state */</div><div class='add'>+		new_state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 		pdev-&gt;bec.txerr = 0;</div><div class='ctx'> 		pdev-&gt;bec.rxerr = 0;</div><div class='del'>-		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* state hasn't changed */</div><div class='hunk'>@@ -556,8 +632,7 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> </div><div class='ctx'> 	/* allocate an skb to store the error frame */</div><div class='ctx'> 	skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='del'>-	if (skb)</div><div class='del'>-		can_change_state(netdev, cf, tx_state, rx_state);</div><div class='add'>+	can_change_state(netdev, cf, tx_state, rx_state);</div><div class='ctx'> </div><div class='ctx'> 	/* things must be done even in case of OOM */</div><div class='ctx'> 	if (new_state == CAN_STATE_BUS_OFF)</div><div class='hunk'>@@ -566,10 +641,8 @@ static int pcan_usb_fd_decode_status(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	peak_usb_netif_rx(skb, &amp;usb_if-&gt;time_ref, le32_to_cpu(sm-&gt;ts_low));</div><div class='del'>-</div><div class='del'>-	netdev-&gt;stats.rx_packets++;</div><div class='del'>-	netdev-&gt;stats.rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	peak_usb_netif_rx_64(skb, le32_to_cpu(sm-&gt;ts_low),</div><div class='add'>+			     le32_to_cpu(sm-&gt;ts_high));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -579,9 +652,14 @@ static int pcan_usb_fd_decode_error(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 				    struct pucan_msg *rx_msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pucan_error_msg *er = (struct pucan_error_msg *)rx_msg;</div><div class='del'>-	struct peak_usb_device *dev = usb_if-&gt;dev[pucan_ermsg_get_channel(er)];</div><div class='del'>-	struct pcan_usb_fd_device *pdev =</div><div class='del'>-			container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='add'>+	struct pcan_usb_fd_device *pdev;</div><div class='add'>+	struct peak_usb_device *dev;</div><div class='add'>+</div><div class='add'>+	if (pucan_ermsg_get_channel(er) &gt;= ARRAY_SIZE(usb_if-&gt;dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev = usb_if-&gt;dev[pucan_ermsg_get_channel(er)];</div><div class='add'>+	pdev = container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='ctx'> </div><div class='ctx'> 	/* keep a trace of tx and rx error counters for later use */</div><div class='ctx'> 	pdev-&gt;bec.txerr = er-&gt;tx_err_cnt;</div><div class='hunk'>@@ -595,11 +673,17 @@ static int pcan_usb_fd_decode_overrun(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 				      struct pucan_msg *rx_msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcan_ufd_ovr_msg *ov = (struct pcan_ufd_ovr_msg *)rx_msg;</div><div class='del'>-	struct peak_usb_device *dev = usb_if-&gt;dev[pufd_omsg_get_channel(ov)];</div><div class='del'>-	struct net_device *netdev = dev-&gt;netdev;</div><div class='add'>+	struct peak_usb_device *dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='ctx'> 	struct can_frame *cf;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+	if (pufd_omsg_get_channel(ov) &gt;= ARRAY_SIZE(usb_if-&gt;dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev = usb_if-&gt;dev[pufd_omsg_get_channel(ov)];</div><div class='add'>+	netdev = dev-&gt;netdev;</div><div class='add'>+</div><div class='ctx'> 	/* allocate an skb to store the error frame */</div><div class='ctx'> 	skb = alloc_can_err_skb(netdev, &amp;cf);</div><div class='ctx'> 	if (!skb)</div><div class='hunk'>@@ -608,7 +692,8 @@ static int pcan_usb_fd_decode_overrun(struct pcan_usb_fd_if *usb_if,</div><div class='ctx'> 	cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='ctx'> 	cf-&gt;data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> </div><div class='del'>-	peak_usb_netif_rx(skb, &amp;usb_if-&gt;time_ref, le32_to_cpu(ov-&gt;ts_low));</div><div class='add'>+	peak_usb_netif_rx_64(skb, le32_to_cpu(ov-&gt;ts_low),</div><div class='add'>+			     le32_to_cpu(ov-&gt;ts_high));</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;stats.rx_over_errors++;</div><div class='ctx'> 	netdev-&gt;stats.rx_errors++;</div><div class='hunk'>@@ -714,7 +799,10 @@ static int pcan_usb_fd_encode_msg(struct peak_usb_device *dev,</div><div class='ctx'> 	struct pucan_tx_msg *tx_msg = (struct pucan_tx_msg *)obuf;</div><div class='ctx'> 	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	u16 tx_msg_size, tx_msg_flags;</div><div class='del'>-	u8 can_dlc;</div><div class='add'>+	u8 dlc;</div><div class='add'>+</div><div class='add'>+	if (cfd-&gt;len &gt; CANFD_MAX_DLEN)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tx_msg_size = ALIGN(sizeof(struct pucan_tx_msg) + cfd-&gt;len, 4);</div><div class='ctx'> 	tx_msg-&gt;size = cpu_to_le16(tx_msg_size);</div><div class='hunk'>@@ -730,7 +818,7 @@ static int pcan_usb_fd_encode_msg(struct peak_usb_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (can_is_canfd_skb(skb)) {</div><div class='ctx'> 		/* considering a CANFD frame */</div><div class='del'>-		can_dlc = can_len2dlc(cfd-&gt;len);</div><div class='add'>+		dlc = can_fd_len2dlc(cfd-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 		tx_msg_flags |= PUCAN_MSG_EXT_DATA_LEN;</div><div class='ctx'> </div><div class='hunk'>@@ -741,14 +829,19 @@ static int pcan_usb_fd_encode_msg(struct peak_usb_device *dev,</div><div class='ctx'> 			tx_msg_flags |= PUCAN_MSG_ERROR_STATE_IND;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* CAND 2.0 frames */</div><div class='del'>-		can_dlc = cfd-&gt;len;</div><div class='add'>+		dlc = can_get_cc_dlc((struct can_frame *)cfd,</div><div class='add'>+				     dev-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='ctx'> 		if (cfd-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='ctx'> 			tx_msg_flags |= PUCAN_MSG_RTR;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Single-Shot frame */</div><div class='add'>+	if (dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		tx_msg_flags |= PUCAN_MSG_SINGLE_SHOT;</div><div class='add'>+</div><div class='ctx'> 	tx_msg-&gt;flags = cpu_to_le16(tx_msg_flags);</div><div class='del'>-	tx_msg-&gt;channel_dlc = PUCAN_MSG_CHANNEL_DLC(dev-&gt;ctrl_idx, can_dlc);</div><div class='add'>+	tx_msg-&gt;channel_dlc = PUCAN_MSG_CHANNEL_DLC(dev-&gt;ctrl_idx, dlc);</div><div class='ctx'> 	memcpy(tx_msg-&gt;d, cfd-&gt;data, cfd-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* add null size message to tag the end (messages are 32-bits aligned)</div><div class='hunk'>@@ -796,7 +889,7 @@ static int pcan_usb_fd_start(struct peak_usb_device *dev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* socket callback used to copy berr counters values receieved through USB */</div><div class='add'>+/* socket callback used to copy berr counters values received through USB */</div><div class='ctx'> static int pcan_usb_fd_get_berr_counter(const struct net_device *netdev,</div><div class='ctx'> 					struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='hunk'>@@ -810,6 +903,15 @@ static int pcan_usb_fd_get_berr_counter(const struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* probe function for all PCAN-USB FD family usb interfaces */</div><div class='add'>+static int pcan_usb_fd_probe(struct usb_interface *intf)</div><div class='add'>+{</div><div class='add'>+	struct usb_host_interface *iface_desc = &amp;intf-&gt;altsetting[0];</div><div class='add'>+</div><div class='add'>+	/* CAN interface is always interface #0 */</div><div class='add'>+	return iface_desc-&gt;desc.bInterfaceNumber;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* stop interface (last chance before set bus off) */</div><div class='ctx'> static int pcan_usb_fd_stop(struct peak_usb_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -831,6 +933,7 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcan_usb_fd_device *pdev =</div><div class='ctx'> 			container_of(dev, struct pcan_usb_fd_device, dev);</div><div class='add'>+	struct pcan_ufd_fw_info *fw_info;</div><div class='ctx'> 	int i, err = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* do this for 1st channel only */</div><div class='hunk'>@@ -841,7 +944,7 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='ctx'> 		/* allocate command buffer once for all for the interface */</div><div class='del'>-		pdev-&gt;cmd_buffer_addr = kmalloc(PCAN_UFD_CMD_BUFFER_SIZE,</div><div class='add'>+		pdev-&gt;cmd_buffer_addr = kzalloc(PCAN_UFD_CMD_BUFFER_SIZE,</div><div class='ctx'> 						GFP_KERNEL);</div><div class='ctx'> 		if (!pdev-&gt;cmd_buffer_addr)</div><div class='ctx'> 			goto err_out_1;</div><div class='hunk'>@@ -849,10 +952,9 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)</div><div class='ctx'> 		/* number of ts msgs to ignore before taking one into account */</div><div class='ctx'> 		pdev-&gt;usb_if-&gt;cm_ignore_count = 5;</div><div class='ctx'> </div><div class='del'>-		err = pcan_usb_pro_send_req(dev, PCAN_USBPRO_REQ_INFO,</div><div class='del'>-					    PCAN_USBPRO_INFO_FW,</div><div class='del'>-					    &amp;pdev-&gt;usb_if-&gt;fw_info,</div><div class='del'>-					    sizeof(pdev-&gt;usb_if-&gt;fw_info));</div><div class='add'>+		fw_info = &amp;pdev-&gt;usb_if-&gt;fw_info;</div><div class='add'>+</div><div class='add'>+		err = pcan_usb_fd_read_fwinfo(dev, fw_info);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(dev-&gt;netdev-&gt;dev.parent,</div><div class='ctx'> 				"unable to read %s firmware info (err %d)\n",</div><div class='hunk'>@@ -866,14 +968,14 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev_info(dev-&gt;netdev-&gt;dev.parent,</div><div class='ctx'> 			 "PEAK-System %s v%u fw v%u.%u.%u (%u channels)\n",</div><div class='del'>-			 dev-&gt;adapter-&gt;name, pdev-&gt;usb_if-&gt;fw_info.hw_version,</div><div class='del'>-			 pdev-&gt;usb_if-&gt;fw_info.fw_version[0],</div><div class='del'>-			 pdev-&gt;usb_if-&gt;fw_info.fw_version[1],</div><div class='del'>-			 pdev-&gt;usb_if-&gt;fw_info.fw_version[2],</div><div class='add'>+			 dev-&gt;adapter-&gt;name, fw_info-&gt;hw_version,</div><div class='add'>+			 fw_info-&gt;fw_version[0],</div><div class='add'>+			 fw_info-&gt;fw_version[1],</div><div class='add'>+			 fw_info-&gt;fw_version[2],</div><div class='ctx'> 			 dev-&gt;adapter-&gt;ctrl_count);</div><div class='ctx'> </div><div class='ctx'> 		/* check for ability to switch between ISO/non-ISO modes */</div><div class='del'>-		if (pdev-&gt;usb_if-&gt;fw_info.fw_version[0] &gt;= 2) {</div><div class='add'>+		if (fw_info-&gt;fw_version[0] &gt;= 2) {</div><div class='ctx'> 			/* firmware &gt;= 2.x supports ISO/non-ISO switching */</div><div class='ctx'> 			dev-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD_NON_ISO;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -881,6 +983,15 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)</div><div class='ctx'> 			dev-&gt;can.ctrlmode |= CAN_CTRLMODE_FD_NON_ISO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		/* if vendor rsp type is greater than or equal to 2, then it</div><div class='add'>+		 * contains EP numbers to use for cmds pipes. If not, then</div><div class='add'>+		 * default EP should be used.</div><div class='add'>+		 */</div><div class='add'>+		if (le16_to_cpu(fw_info-&gt;type) &lt; PCAN_USBFD_TYPE_EXT) {</div><div class='add'>+			fw_info-&gt;cmd_out_ep = PCAN_USBPRO_EP_CMDOUT;</div><div class='add'>+			fw_info-&gt;cmd_in_ep = PCAN_USBPRO_EP_CMDIN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* tell the hardware the can driver is running */</div><div class='ctx'> 		err = pcan_usb_fd_drv_loaded(dev, 1);</div><div class='ctx'> 		if (err) {</div><div class='hunk'>@@ -901,12 +1012,23 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev)</div><div class='ctx'> 		/* do a copy of the ctrlmode[_supported] too */</div><div class='ctx'> 		dev-&gt;can.ctrlmode = ppdev-&gt;dev.can.ctrlmode;</div><div class='ctx'> 		dev-&gt;can.ctrlmode_supported = ppdev-&gt;dev.can.ctrlmode_supported;</div><div class='add'>+</div><div class='add'>+		fw_info = &amp;pdev-&gt;usb_if-&gt;fw_info;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pdev-&gt;usb_if-&gt;dev[dev-&gt;ctrl_idx] = dev;</div><div class='del'>-	dev-&gt;device_number =</div><div class='add'>+	dev-&gt;can_channel_id =</div><div class='ctx'> 		le32_to_cpu(pdev-&gt;usb_if-&gt;fw_info.dev_id[dev-&gt;ctrl_idx]);</div><div class='ctx'> </div><div class='add'>+	/* if vendor rsp type is greater than or equal to 2, then it contains EP</div><div class='add'>+	 * numbers to use for data pipes. If not, then statically defined EP are</div><div class='add'>+	 * used (see peak_usb_create_dev()).</div><div class='add'>+	 */</div><div class='add'>+	if (le16_to_cpu(fw_info-&gt;type) &gt;= PCAN_USBFD_TYPE_EXT) {</div><div class='add'>+		dev-&gt;ep_msg_in = fw_info-&gt;data_in_ep;</div><div class='add'>+		dev-&gt;ep_msg_out = fw_info-&gt;data_out_ep[dev-&gt;ctrl_idx];</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* set clock domain */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(pcan_usb_fd_clk_freq); i++)</div><div class='ctx'> 		if (dev-&gt;adapter-&gt;clock.freq == pcan_usb_fd_clk_freq[i])</div><div class='hunk'>@@ -980,6 +1102,35 @@ static void pcan_usb_fd_free(struct peak_usb_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* blink LED's */</div><div class='add'>+static int pcan_usb_fd_set_phys_id(struct net_device *netdev,</div><div class='add'>+				   enum ethtool_phys_id_state state)</div><div class='add'>+{</div><div class='add'>+	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ETHTOOL_ID_ACTIVE:</div><div class='add'>+		err = pcan_usb_fd_set_can_led(dev, PCAN_UFD_LED_FAST);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_ID_INACTIVE:</div><div class='add'>+		err = pcan_usb_fd_set_can_led(dev, PCAN_UFD_LED_DEF);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops pcan_usb_fd_ethtool_ops = {</div><div class='add'>+	.set_phys_id = pcan_usb_fd_set_phys_id,</div><div class='add'>+	.get_ts_info = pcan_get_ts_info,</div><div class='add'>+	.get_eeprom_len	= peak_usb_get_eeprom_len,</div><div class='add'>+	.get_eeprom = peak_usb_get_eeprom,</div><div class='add'>+	.set_eeprom = peak_usb_set_eeprom,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* describes the PCAN-USB FD adapter */</div><div class='ctx'> static const struct can_bittiming_const pcan_usb_fd_const = {</div><div class='ctx'> 	.name = "pcan_usb_fd",</div><div class='hunk'>@@ -1010,7 +1161,8 @@ const struct peak_usb_adapter pcan_usb_fd = {</div><div class='ctx'> 	.device_id = PCAN_USBFD_PRODUCT_ID,</div><div class='ctx'> 	.ctrl_count = PCAN_USBFD_CHANNEL_COUNT,</div><div class='ctx'> 	.ctrlmode_supported = CAN_CTRLMODE_FD |</div><div class='del'>-			CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,</div><div class='add'>+			CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+			CAN_CTRLMODE_ONE_SHOT | CAN_CTRLMODE_CC_LEN8_DLC,</div><div class='ctx'> 	.clock = {</div><div class='ctx'> 		.freq = PCAN_UFD_CRYSTAL_HZ,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1020,9 +1172,10 @@ const struct peak_usb_adapter pcan_usb_fd = {</div><div class='ctx'> 	/* size of device private data */</div><div class='ctx'> 	.sizeof_dev_private = sizeof(struct pcan_usb_fd_device),</div><div class='ctx'> </div><div class='add'>+	.ethtool_ops = &amp;pcan_usb_fd_ethtool_ops,</div><div class='add'>+</div><div class='ctx'> 	/* timestamps usage */</div><div class='ctx'> 	.ts_used_bits = 32,</div><div class='del'>-	.ts_period = 1000000, /* calibration period in ts. */</div><div class='ctx'> 	.us_per_ts_scale = 1, /* us = (ts * scale) &gt;&gt; shift */</div><div class='ctx'> 	.us_per_ts_shift = 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1035,7 +1188,7 @@ const struct peak_usb_adapter pcan_usb_fd = {</div><div class='ctx'> 	.tx_buffer_size = PCAN_UFD_TX_BUFFER_SIZE,</div><div class='ctx'> </div><div class='ctx'> 	/* device callbacks */</div><div class='del'>-	.intf_probe = pcan_usb_pro_probe,	/* same as PCAN-USB Pro */</div><div class='add'>+	.intf_probe = pcan_usb_fd_probe,</div><div class='ctx'> 	.dev_init = pcan_usb_fd_init,</div><div class='ctx'> </div><div class='ctx'> 	.dev_exit = pcan_usb_fd_exit,</div><div class='hunk'>@@ -1043,6 +1196,8 @@ const struct peak_usb_adapter pcan_usb_fd = {</div><div class='ctx'> 	.dev_set_bus = pcan_usb_fd_set_bus,</div><div class='ctx'> 	.dev_set_bittiming = pcan_usb_fd_set_bittiming_slow,</div><div class='ctx'> 	.dev_set_data_bittiming = pcan_usb_fd_set_bittiming_fast,</div><div class='add'>+	.dev_get_can_channel_id = pcan_usb_fd_get_can_channel_id,</div><div class='add'>+	.dev_set_can_channel_id = pcan_usb_fd_set_can_channel_id,</div><div class='ctx'> 	.dev_decode_buf = pcan_usb_fd_decode_buf,</div><div class='ctx'> 	.dev_start = pcan_usb_fd_start,</div><div class='ctx'> 	.dev_stop = pcan_usb_fd_stop,</div><div class='hunk'>@@ -1082,7 +1237,8 @@ const struct peak_usb_adapter pcan_usb_chip = {</div><div class='ctx'> 	.device_id = PCAN_USBCHIP_PRODUCT_ID,</div><div class='ctx'> 	.ctrl_count = PCAN_USBFD_CHANNEL_COUNT,</div><div class='ctx'> 	.ctrlmode_supported = CAN_CTRLMODE_FD |</div><div class='del'>-		CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,</div><div class='add'>+		CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+		CAN_CTRLMODE_ONE_SHOT | CAN_CTRLMODE_CC_LEN8_DLC,</div><div class='ctx'> 	.clock = {</div><div class='ctx'> 		.freq = PCAN_UFD_CRYSTAL_HZ,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1092,9 +1248,10 @@ const struct peak_usb_adapter pcan_usb_chip = {</div><div class='ctx'> 	/* size of device private data */</div><div class='ctx'> 	.sizeof_dev_private = sizeof(struct pcan_usb_fd_device),</div><div class='ctx'> </div><div class='add'>+	.ethtool_ops = &amp;pcan_usb_fd_ethtool_ops,</div><div class='add'>+</div><div class='ctx'> 	/* timestamps usage */</div><div class='ctx'> 	.ts_used_bits = 32,</div><div class='del'>-	.ts_period = 1000000, /* calibration period in ts. */</div><div class='ctx'> 	.us_per_ts_scale = 1, /* us = (ts * scale) &gt;&gt; shift */</div><div class='ctx'> 	.us_per_ts_shift = 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1115,6 +1272,8 @@ const struct peak_usb_adapter pcan_usb_chip = {</div><div class='ctx'> 	.dev_set_bus = pcan_usb_fd_set_bus,</div><div class='ctx'> 	.dev_set_bittiming = pcan_usb_fd_set_bittiming_slow,</div><div class='ctx'> 	.dev_set_data_bittiming = pcan_usb_fd_set_bittiming_fast,</div><div class='add'>+	.dev_get_can_channel_id = pcan_usb_fd_get_can_channel_id,</div><div class='add'>+	.dev_set_can_channel_id = pcan_usb_fd_set_can_channel_id,</div><div class='ctx'> 	.dev_decode_buf = pcan_usb_fd_decode_buf,</div><div class='ctx'> 	.dev_start = pcan_usb_fd_start,</div><div class='ctx'> 	.dev_stop = pcan_usb_fd_stop,</div><div class='hunk'>@@ -1154,7 +1313,8 @@ const struct peak_usb_adapter pcan_usb_pro_fd = {</div><div class='ctx'> 	.device_id = PCAN_USBPROFD_PRODUCT_ID,</div><div class='ctx'> 	.ctrl_count = PCAN_USBPROFD_CHANNEL_COUNT,</div><div class='ctx'> 	.ctrlmode_supported = CAN_CTRLMODE_FD |</div><div class='del'>-			CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,</div><div class='add'>+			CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+			CAN_CTRLMODE_ONE_SHOT | CAN_CTRLMODE_CC_LEN8_DLC,</div><div class='ctx'> 	.clock = {</div><div class='ctx'> 		.freq = PCAN_UFD_CRYSTAL_HZ,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1164,9 +1324,10 @@ const struct peak_usb_adapter pcan_usb_pro_fd = {</div><div class='ctx'> 	/* size of device private data */</div><div class='ctx'> 	.sizeof_dev_private = sizeof(struct pcan_usb_fd_device),</div><div class='ctx'> </div><div class='add'>+	.ethtool_ops = &amp;pcan_usb_fd_ethtool_ops,</div><div class='add'>+</div><div class='ctx'> 	/* timestamps usage */</div><div class='ctx'> 	.ts_used_bits = 32,</div><div class='del'>-	.ts_period = 1000000, /* calibration period in ts. */</div><div class='ctx'> 	.us_per_ts_scale = 1, /* us = (ts * scale) &gt;&gt; shift */</div><div class='ctx'> 	.us_per_ts_shift = 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1187,6 +1348,8 @@ const struct peak_usb_adapter pcan_usb_pro_fd = {</div><div class='ctx'> 	.dev_set_bus = pcan_usb_fd_set_bus,</div><div class='ctx'> 	.dev_set_bittiming = pcan_usb_fd_set_bittiming_slow,</div><div class='ctx'> 	.dev_set_data_bittiming = pcan_usb_fd_set_bittiming_fast,</div><div class='add'>+	.dev_get_can_channel_id = pcan_usb_fd_get_can_channel_id,</div><div class='add'>+	.dev_set_can_channel_id = pcan_usb_fd_set_can_channel_id,</div><div class='ctx'> 	.dev_decode_buf = pcan_usb_fd_decode_buf,</div><div class='ctx'> 	.dev_start = pcan_usb_fd_start,</div><div class='ctx'> 	.dev_stop = pcan_usb_fd_stop,</div><div class='hunk'>@@ -1226,7 +1389,8 @@ const struct peak_usb_adapter pcan_usb_x6 = {</div><div class='ctx'> 	.device_id = PCAN_USBX6_PRODUCT_ID,</div><div class='ctx'> 	.ctrl_count = PCAN_USBPROFD_CHANNEL_COUNT,</div><div class='ctx'> 	.ctrlmode_supported = CAN_CTRLMODE_FD |</div><div class='del'>-			CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,</div><div class='add'>+			CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+			CAN_CTRLMODE_ONE_SHOT | CAN_CTRLMODE_CC_LEN8_DLC,</div><div class='ctx'> 	.clock = {</div><div class='ctx'> 		.freq = PCAN_UFD_CRYSTAL_HZ,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1236,9 +1400,10 @@ const struct peak_usb_adapter pcan_usb_x6 = {</div><div class='ctx'> 	/* size of device private data */</div><div class='ctx'> 	.sizeof_dev_private = sizeof(struct pcan_usb_fd_device),</div><div class='ctx'> </div><div class='add'>+	.ethtool_ops = &amp;pcan_usb_fd_ethtool_ops,</div><div class='add'>+</div><div class='ctx'> 	/* timestamps usage */</div><div class='ctx'> 	.ts_used_bits = 32,</div><div class='del'>-	.ts_period = 1000000, /* calibration period in ts. */</div><div class='ctx'> 	.us_per_ts_scale = 1, /* us = (ts * scale) &gt;&gt; shift */</div><div class='ctx'> 	.us_per_ts_shift = 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1259,6 +1424,8 @@ const struct peak_usb_adapter pcan_usb_x6 = {</div><div class='ctx'> 	.dev_set_bus = pcan_usb_fd_set_bus,</div><div class='ctx'> 	.dev_set_bittiming = pcan_usb_fd_set_bittiming_slow,</div><div class='ctx'> 	.dev_set_data_bittiming = pcan_usb_fd_set_bittiming_fast,</div><div class='add'>+	.dev_get_can_channel_id = pcan_usb_fd_get_can_channel_id,</div><div class='add'>+	.dev_set_can_channel_id = pcan_usb_fd_set_can_channel_id,</div><div class='ctx'> 	.dev_decode_buf = pcan_usb_fd_decode_buf,</div><div class='ctx'> 	.dev_start = pcan_usb_fd_start,</div><div class='ctx'> 	.dev_stop = pcan_usb_fd_stop,</div><div class='head'>diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.c b/drivers/net/can/usb/peak_usb/pcan_usb_pro.c<br/>index 178bb7cff0c1..7be286293b1a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_pro.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_pro.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_pro.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/peak_usb/pcan_usb_pro.c</a></div><div class='hunk'>@@ -3,12 +3,13 @@</div><div class='ctx'>  * CAN driver for PEAK System PCAN-USB Pro adapter</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_usbpro.c</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2011 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2011-2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/usb.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='hunk'>@@ -17,8 +18,6 @@</div><div class='ctx'> #include "pcan_usb_core.h"</div><div class='ctx'> #include "pcan_usb_pro.h"</div><div class='ctx'> </div><div class='del'>-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro adapter");</div><div class='del'>-</div><div class='ctx'> #define PCAN_USBPRO_CHANNEL_COUNT	2</div><div class='ctx'> </div><div class='ctx'> /* PCAN-USB Pro adapter internal clock (MHz) */</div><div class='hunk'>@@ -38,6 +37,7 @@ MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro adapter");</div><div class='ctx'> </div><div class='ctx'> #define PCAN_USBPRO_RTR			0x01</div><div class='ctx'> #define PCAN_USBPRO_EXT			0x02</div><div class='add'>+#define PCAN_USBPRO_SS			0x08</div><div class='ctx'> </div><div class='ctx'> #define PCAN_USBPRO_CMD_BUFFER_SIZE	512</div><div class='ctx'> </div><div class='hunk'>@@ -76,6 +76,7 @@ static u16 pcan_usb_pro_sizeof_rec[256] = {</div><div class='ctx'> 	[PCAN_USBPRO_SETFILTR] = sizeof(struct pcan_usb_pro_filter),</div><div class='ctx'> 	[PCAN_USBPRO_SETTS] = sizeof(struct pcan_usb_pro_setts),</div><div class='ctx'> 	[PCAN_USBPRO_GETDEVID] = sizeof(struct pcan_usb_pro_devid),</div><div class='add'>+	[PCAN_USBPRO_SETDEVID] = sizeof(struct pcan_usb_pro_devid),</div><div class='ctx'> 	[PCAN_USBPRO_SETLED] = sizeof(struct pcan_usb_pro_setled),</div><div class='ctx'> 	[PCAN_USBPRO_RXMSG8] = sizeof(struct pcan_usb_pro_rxmsg),</div><div class='ctx'> 	[PCAN_USBPRO_RXMSG4] = sizeof(struct pcan_usb_pro_rxmsg) - 4,</div><div class='hunk'>@@ -133,10 +134,10 @@ static int pcan_msg_add_rec(struct pcan_usb_pro_msg *pm, int id, ...)</div><div class='ctx'> 	switch (id) {</div><div class='ctx'> 	case PCAN_USBPRO_TXMSG8:</div><div class='ctx'> 		i += 4;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PCAN_USBPRO_TXMSG4:</div><div class='ctx'> 		i += 4;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PCAN_USBPRO_TXMSG0:</div><div class='ctx'> 		*pc++ = va_arg(ap, int);</div><div class='ctx'> 		*pc++ = va_arg(ap, int);</div><div class='hunk'>@@ -149,6 +150,7 @@ static int pcan_msg_add_rec(struct pcan_usb_pro_msg *pm, int id, ...)</div><div class='ctx'> </div><div class='ctx'> 	case PCAN_USBPRO_SETBTR:</div><div class='ctx'> 	case PCAN_USBPRO_GETDEVID:</div><div class='add'>+	case PCAN_USBPRO_SETDEVID:</div><div class='ctx'> 		*pc++ = va_arg(ap, int);</div><div class='ctx'> 		pc += 2;</div><div class='ctx'> 		*(__le32 *)pc = cpu_to_le32(va_arg(ap, u32));</div><div class='hunk'>@@ -186,7 +188,7 @@ static int pcan_msg_add_rec(struct pcan_usb_pro_msg *pm, int id, ...)</div><div class='ctx'> </div><div class='ctx'> 	len = pc - pm-&gt;rec_ptr;</div><div class='ctx'> 	if (len &gt; 0) {</div><div class='del'>-		*pm-&gt;u.rec_cnt = cpu_to_le32(le32_to_cpu(*pm-&gt;u.rec_cnt) + 1);</div><div class='add'>+		le32_add_cpu(pm-&gt;u.rec_cnt, 1);</div><div class='ctx'> 		*pm-&gt;rec_ptr = id;</div><div class='ctx'> </div><div class='ctx'> 		pm-&gt;rec_ptr = pc;</div><div class='hunk'>@@ -290,7 +292,7 @@ static int pcan_usb_pro_wait_rsp(struct peak_usb_device *dev,</div><div class='ctx'> 					   pr-&gt;data_type);</div><div class='ctx'> </div><div class='ctx'> 			/* check if channel in response corresponds too */</div><div class='del'>-			else if ((req_channel != 0xff) &amp;&amp; \</div><div class='add'>+			else if ((req_channel != 0xff) &amp;&amp;</div><div class='ctx'> 				(pr-&gt;bus_act.channel != req_channel))</div><div class='ctx'> 				netdev_err(dev-&gt;netdev,</div><div class='ctx'> 					"got rsp %xh but on chan%u: ignored\n",</div><div class='hunk'>@@ -419,8 +421,8 @@ static int pcan_usb_pro_set_led(struct peak_usb_device *dev, u8 mode,</div><div class='ctx'> 	return pcan_usb_pro_send_cmd(dev, &amp;um);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pcan_usb_pro_get_device_id(struct peak_usb_device *dev,</div><div class='del'>-				      u32 *device_id)</div><div class='add'>+static int pcan_usb_pro_get_can_channel_id(struct peak_usb_device *dev,</div><div class='add'>+					   u32 *can_ch_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcan_usb_pro_devid *pdn;</div><div class='ctx'> 	struct pcan_usb_pro_msg um;</div><div class='hunk'>@@ -439,12 +441,23 @@ static int pcan_usb_pro_get_device_id(struct peak_usb_device *dev,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	pdn = (struct pcan_usb_pro_devid *)pc;</div><div class='del'>-	if (device_id)</div><div class='del'>-		*device_id = le32_to_cpu(pdn-&gt;serial_num);</div><div class='add'>+	*can_ch_id = le32_to_cpu(pdn-&gt;dev_num);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pcan_usb_pro_set_can_channel_id(struct peak_usb_device *dev,</div><div class='add'>+					   u32 can_ch_id)</div><div class='add'>+{</div><div class='add'>+	struct pcan_usb_pro_msg um;</div><div class='add'>+</div><div class='add'>+	pcan_msg_init_empty(&amp;um, dev-&gt;cmd_buf, PCAN_USB_MAX_CMD_LEN);</div><div class='add'>+	pcan_msg_add_rec(&amp;um, PCAN_USBPRO_SETDEVID, dev-&gt;ctrl_idx,</div><div class='add'>+			 can_ch_id);</div><div class='add'>+</div><div class='add'>+	return pcan_usb_pro_send_cmd(dev, &amp;um);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int pcan_usb_pro_set_bittiming(struct peak_usb_device *dev,</div><div class='ctx'> 				      struct can_bittiming *bt)</div><div class='ctx'> {</div><div class='hunk'>@@ -494,7 +507,7 @@ static int pcan_usb_pro_drv_loaded(struct peak_usb_device *dev, int loaded)</div><div class='ctx'> 	u8 *buffer;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	buffer = kmalloc(PCAN_USBPRO_FCT_DRVLD_REQ_LEN, GFP_KERNEL);</div><div class='add'>+	buffer = kzalloc(PCAN_USBPRO_FCT_DRVLD_REQ_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!buffer)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -532,22 +545,24 @@ static int pcan_usb_pro_handle_canmsg(struct pcan_usb_pro_interface *usb_if,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	can_frame-&gt;can_id = le32_to_cpu(rx-&gt;id);</div><div class='del'>-	can_frame-&gt;can_dlc = rx-&gt;len &amp; 0x0f;</div><div class='add'>+	can_frame-&gt;len = rx-&gt;len &amp; 0x0f;</div><div class='ctx'> </div><div class='ctx'> 	if (rx-&gt;flags &amp; PCAN_USBPRO_EXT)</div><div class='ctx'> 		can_frame-&gt;can_id |= CAN_EFF_FLAG;</div><div class='ctx'> </div><div class='del'>-	if (rx-&gt;flags &amp; PCAN_USBPRO_RTR)</div><div class='add'>+	if (rx-&gt;flags &amp; PCAN_USBPRO_RTR) {</div><div class='ctx'> 		can_frame-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-	else</div><div class='del'>-		memcpy(can_frame-&gt;data, rx-&gt;data, can_frame-&gt;can_dlc);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(can_frame-&gt;data, rx-&gt;data, can_frame-&gt;len);</div><div class='add'>+</div><div class='add'>+		netdev-&gt;stats.rx_bytes += can_frame-&gt;len;</div><div class='add'>+	}</div><div class='add'>+	netdev-&gt;stats.rx_packets++;</div><div class='ctx'> </div><div class='ctx'> 	hwts = skb_hwtstamps(skb);</div><div class='ctx'> 	peak_usb_get_ts_time(&amp;usb_if-&gt;time_ref, le32_to_cpu(rx-&gt;ts32),</div><div class='ctx'> 			     &amp;hwts-&gt;hwtstamp);</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;stats.rx_packets++;</div><div class='del'>-	netdev-&gt;stats.rx_bytes += can_frame-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -661,8 +676,6 @@ static int pcan_usb_pro_handle_error(struct pcan_usb_pro_interface *usb_if,</div><div class='ctx'> </div><div class='ctx'> 	hwts = skb_hwtstamps(skb);</div><div class='ctx'> 	peak_usb_get_ts_time(&amp;usb_if-&gt;time_ref, le32_to_cpu(er-&gt;ts32), &amp;hwts-&gt;hwtstamp);</div><div class='del'>-	netdev-&gt;stats.rx_packets++;</div><div class='del'>-	netdev-&gt;stats.rx_bytes += can_frame-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -767,20 +780,24 @@ static int pcan_usb_pro_encode_msg(struct peak_usb_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	pcan_msg_init_empty(&amp;usb_msg, obuf, *size);</div><div class='ctx'> </div><div class='del'>-	if ((cf-&gt;can_id &amp; CAN_RTR_FLAG) || (cf-&gt;can_dlc == 0))</div><div class='add'>+	if ((cf-&gt;can_id &amp; CAN_RTR_FLAG) || (cf-&gt;len == 0))</div><div class='ctx'> 		data_type = PCAN_USBPRO_TXMSG0;</div><div class='del'>-	else if (cf-&gt;can_dlc &lt;= 4)</div><div class='add'>+	else if (cf-&gt;len &lt;= 4)</div><div class='ctx'> 		data_type = PCAN_USBPRO_TXMSG4;</div><div class='ctx'> 	else</div><div class='ctx'> 		data_type = PCAN_USBPRO_TXMSG8;</div><div class='ctx'> </div><div class='del'>-	len = (dev-&gt;ctrl_idx &lt;&lt; 4) | (cf-&gt;can_dlc &amp; 0x0f);</div><div class='add'>+	len = (dev-&gt;ctrl_idx &lt;&lt; 4) | (cf-&gt;len &amp; 0x0f);</div><div class='ctx'> </div><div class='ctx'> 	flags = 0;</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG)</div><div class='del'>-		flags |= 0x02;</div><div class='add'>+		flags |= PCAN_USBPRO_EXT;</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_RTR_FLAG)</div><div class='del'>-		flags |= 0x01;</div><div class='add'>+		flags |= PCAN_USBPRO_RTR;</div><div class='add'>+</div><div class='add'>+	/* Single-Shot frame */</div><div class='add'>+	if (dev-&gt;can.ctrlmode &amp; CAN_CTRLMODE_ONE_SHOT)</div><div class='add'>+		flags |= PCAN_USBPRO_SS;</div><div class='ctx'> </div><div class='ctx'> 	pcan_msg_add_rec(&amp;usb_msg, data_type, 0, flags, len, cf-&gt;can_id,</div><div class='ctx'> 			 cf-&gt;data);</div><div class='hunk'>@@ -908,7 +925,7 @@ static int pcan_usb_pro_init(struct peak_usb_device *dev)</div><div class='ctx'> 	usb_if-&gt;dev[dev-&gt;ctrl_idx] = dev;</div><div class='ctx'> </div><div class='ctx'> 	/* set LED in default state (end of init phase) */</div><div class='del'>-	pcan_usb_pro_set_led(dev, 0, 1);</div><div class='add'>+	pcan_usb_pro_set_led(dev, PCAN_USBPRO_LED_DEVICE, 1);</div><div class='ctx'> </div><div class='ctx'> 	kfree(bi);</div><div class='ctx'> 	kfree(fi);</div><div class='hunk'>@@ -973,7 +990,7 @@ int pcan_usb_pro_probe(struct usb_interface *intf)</div><div class='ctx'> 		struct usb_endpoint_descriptor *ep = &amp;if_desc-&gt;endpoint[i].desc;</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='del'>-		 * below is the list of valid ep addreses. Any other ep address</div><div class='add'>+		 * below is the list of valid ep addresses. Any other ep address</div><div class='ctx'> 		 * is considered as not-CAN interface address =&gt; no dev created</div><div class='ctx'> 		 */</div><div class='ctx'> 		switch (ep-&gt;bEndpointAddress) {</div><div class='hunk'>@@ -992,6 +1009,39 @@ int pcan_usb_pro_probe(struct usb_interface *intf)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int pcan_usb_pro_set_phys_id(struct net_device *netdev,</div><div class='add'>+				    enum ethtool_phys_id_state state)</div><div class='add'>+{</div><div class='add'>+	struct peak_usb_device *dev = netdev_priv(netdev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ETHTOOL_ID_ACTIVE:</div><div class='add'>+		/* fast blinking forever */</div><div class='add'>+		err = pcan_usb_pro_set_led(dev, PCAN_USBPRO_LED_BLINK_FAST,</div><div class='add'>+					   0xffffffff);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_ID_INACTIVE:</div><div class='add'>+		/* restore LED default */</div><div class='add'>+		err = pcan_usb_pro_set_led(dev, PCAN_USBPRO_LED_DEVICE, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops pcan_usb_pro_ethtool_ops = {</div><div class='add'>+	.set_phys_id = pcan_usb_pro_set_phys_id,</div><div class='add'>+	.get_ts_info = pcan_get_ts_info,</div><div class='add'>+	.get_eeprom_len	= peak_usb_get_eeprom_len,</div><div class='add'>+	.get_eeprom = peak_usb_get_eeprom,</div><div class='add'>+	.set_eeprom = peak_usb_set_eeprom,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * describe the PCAN-USB Pro adapter</div><div class='ctx'>  */</div><div class='hunk'>@@ -1011,7 +1061,8 @@ const struct peak_usb_adapter pcan_usb_pro = {</div><div class='ctx'> 	.name = "PCAN-USB Pro",</div><div class='ctx'> 	.device_id = PCAN_USBPRO_PRODUCT_ID,</div><div class='ctx'> 	.ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,</div><div class='del'>-	.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,</div><div class='add'>+	.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY |</div><div class='add'>+			      CAN_CTRLMODE_ONE_SHOT,</div><div class='ctx'> 	.clock = {</div><div class='ctx'> 		.freq = PCAN_USBPRO_CRYSTAL_HZ,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1020,9 +1071,10 @@ const struct peak_usb_adapter pcan_usb_pro = {</div><div class='ctx'> 	/* size of device private data */</div><div class='ctx'> 	.sizeof_dev_private = sizeof(struct pcan_usb_pro_device),</div><div class='ctx'> </div><div class='add'>+	.ethtool_ops = &amp;pcan_usb_pro_ethtool_ops,</div><div class='add'>+</div><div class='ctx'> 	/* timestamps usage */</div><div class='ctx'> 	.ts_used_bits = 32,</div><div class='del'>-	.ts_period = 1000000, /* calibration period in ts. */</div><div class='ctx'> 	.us_per_ts_scale = 1, /* us = (ts * scale) &gt;&gt; shift */</div><div class='ctx'> 	.us_per_ts_shift = 0,</div><div class='ctx'> </div><div class='hunk'>@@ -1041,7 +1093,8 @@ const struct peak_usb_adapter pcan_usb_pro = {</div><div class='ctx'> 	.dev_free = pcan_usb_pro_free,</div><div class='ctx'> 	.dev_set_bus = pcan_usb_pro_set_bus,</div><div class='ctx'> 	.dev_set_bittiming = pcan_usb_pro_set_bittiming,</div><div class='del'>-	.dev_get_device_id = pcan_usb_pro_get_device_id,</div><div class='add'>+	.dev_get_can_channel_id = pcan_usb_pro_get_can_channel_id,</div><div class='add'>+	.dev_set_can_channel_id = pcan_usb_pro_set_can_channel_id,</div><div class='ctx'> 	.dev_decode_buf = pcan_usb_pro_decode_buf,</div><div class='ctx'> 	.dev_encode_msg = pcan_usb_pro_encode_msg,</div><div class='ctx'> 	.dev_start = pcan_usb_pro_start,</div><div class='head'>diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.h b/drivers/net/can/usb/peak_usb/pcan_usb_pro.h<br/>index 6bb12357d078..162c7546d3a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_pro.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/peak_usb/pcan_usb_pro.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/peak_usb/pcan_usb_pro.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/peak_usb/pcan_usb_pro.h</a></div><div class='hunk'>@@ -3,8 +3,8 @@</div><div class='ctx'>  * CAN driver for PEAK System PCAN-USB Pro adapter</div><div class='ctx'>  * Derived from the PCAN project file driver/src/pcan_usbpro_fw.h</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2003-2011 PEAK System-Technik GmbH</div><div class='del'>- * Copyright (C) 2011-2012 Stephane Grosjean &lt;s.grosjean@peak-system.com&gt;</div><div class='add'>+ * Copyright (C) 2003-2025 PEAK System-Technik GmbH</div><div class='add'>+ * Author: Stéphane Grosjean &lt;stephane.grosjean@hms-networks.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef PCAN_USB_PRO_H</div><div class='ctx'> #define PCAN_USB_PRO_H</div><div class='hunk'>@@ -34,11 +34,11 @@</div><div class='ctx'> /* PCAN_USBPRO_INFO_BL vendor request record type */</div><div class='ctx'> struct __packed pcan_usb_pro_blinfo {</div><div class='ctx'> 	__le32 ctrl_type;</div><div class='del'>-	u8  version[4];</div><div class='del'>-	u8  day;</div><div class='del'>-	u8  month;</div><div class='del'>-	u8  year;</div><div class='del'>-	u8  dummy;</div><div class='add'>+	u8 version[4];</div><div class='add'>+	u8 day;</div><div class='add'>+	u8 month;</div><div class='add'>+	u8 year;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> 	__le32 serial_num_hi;</div><div class='ctx'> 	__le32 serial_num_lo;</div><div class='ctx'> 	__le32 hw_type;</div><div class='hunk'>@@ -48,11 +48,11 @@ struct __packed pcan_usb_pro_blinfo {</div><div class='ctx'> /* PCAN_USBPRO_INFO_FW vendor request record type */</div><div class='ctx'> struct __packed pcan_usb_pro_fwinfo {</div><div class='ctx'> 	__le32 ctrl_type;</div><div class='del'>-	u8  version[4];</div><div class='del'>-	u8  day;</div><div class='del'>-	u8  month;</div><div class='del'>-	u8  year;</div><div class='del'>-	u8  dummy;</div><div class='add'>+	u8 version[4];</div><div class='add'>+	u8 day;</div><div class='add'>+	u8 month;</div><div class='add'>+	u8 year;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> 	__le32 fw_type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -62,6 +62,7 @@ struct __packed pcan_usb_pro_fwinfo {</div><div class='ctx'> #define PCAN_USBPRO_SETBTR	0x02</div><div class='ctx'> #define PCAN_USBPRO_SETBUSACT	0x04</div><div class='ctx'> #define PCAN_USBPRO_SETSILENT	0x05</div><div class='add'>+#define PCAN_USBPRO_SETDEVID	0x06</div><div class='ctx'> #define PCAN_USBPRO_SETFILTR	0x0a</div><div class='ctx'> #define PCAN_USBPRO_SETTS	0x10</div><div class='ctx'> #define PCAN_USBPRO_GETDEVID	0x12</div><div class='hunk'>@@ -78,59 +79,65 @@ struct __packed pcan_usb_pro_fwinfo {</div><div class='ctx'> </div><div class='ctx'> /* record structures */</div><div class='ctx'> struct __packed pcan_usb_pro_btr {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  channel;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 channel;</div><div class='ctx'> 	__le16 dummy;</div><div class='ctx'> 	__le32 CCBT;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_busact {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  channel;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 channel;</div><div class='ctx'> 	__le16 onoff;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_silent {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  channel;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 channel;</div><div class='ctx'> 	__le16 onoff;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_filter {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  dummy;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> 	__le16 filter_mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_setts {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  dummy;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 dummy;</div><div class='ctx'> 	__le16 mode;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_devid {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  channel;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 channel;</div><div class='ctx'> 	__le16 dummy;</div><div class='del'>-	__le32 serial_num;</div><div class='add'>+	__le32 dev_num;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define PCAN_USBPRO_LED_DEVICE		0x00</div><div class='add'>+#define PCAN_USBPRO_LED_BLINK_FAST	0x01</div><div class='add'>+#define PCAN_USBPRO_LED_BLINK_SLOW	0x02</div><div class='add'>+#define PCAN_USBPRO_LED_ON		0x03</div><div class='add'>+#define PCAN_USBPRO_LED_OFF		0x04</div><div class='add'>+</div><div class='ctx'> struct __packed pcan_usb_pro_setled {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  channel;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 channel;</div><div class='ctx'> 	__le16 mode;</div><div class='ctx'> 	__le32 timeout;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_rxmsg {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  client;</div><div class='del'>-	u8  flags;</div><div class='del'>-	u8  len;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 client;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 len;</div><div class='ctx'> 	__le32 ts32;</div><div class='ctx'> 	__le32 id;</div><div class='ctx'> </div><div class='del'>-	u8  data[8];</div><div class='add'>+	u8 data[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define PCAN_USBPRO_STATUS_ERROR	0x0001</div><div class='hunk'>@@ -139,26 +146,26 @@ struct __packed pcan_usb_pro_rxmsg {</div><div class='ctx'> #define PCAN_USBPRO_STATUS_QOVERRUN	0x0008</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_rxstatus {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  channel;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 channel;</div><div class='ctx'> 	__le16 status;</div><div class='ctx'> 	__le32 ts32;</div><div class='ctx'> 	__le32 err_frm;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_rxts {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  dummy[3];</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 dummy[3];</div><div class='ctx'> 	__le32 ts64[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed pcan_usb_pro_txmsg {</div><div class='del'>-	u8  data_type;</div><div class='del'>-	u8  client;</div><div class='del'>-	u8  flags;</div><div class='del'>-	u8  len;</div><div class='add'>+	u8 data_type;</div><div class='add'>+	u8 client;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 len;</div><div class='ctx'> 	__le32 id;</div><div class='del'>-	u8  data[8];</div><div class='add'>+	u8 data[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> union pcan_usb_pro_rec {</div><div class='head'>diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c<br/>index 04aac3bb54ef..de61d9da99e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/ucan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/ucan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/ucan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/ucan.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='hunk'>@@ -185,7 +186,7 @@ union ucan_ctl_payload {</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct ucan_ctl_cmd_get_protocol_version cmd_get_protocol_version;</div><div class='ctx'> </div><div class='del'>-	u8 raw[128];</div><div class='add'>+	u8 fw_str[128];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -244,9 +245,10 @@ struct ucan_message_in {</div><div class='ctx'> 		/* CAN transmission complete</div><div class='ctx'> 		 * (type == UCAN_IN_TX_COMPLETE)</div><div class='ctx'> 		 */</div><div class='del'>-		struct ucan_tx_complete_entry_t can_tx_complete_msg[0];</div><div class='add'>+		DECLARE_FLEX_ARRAY(struct ucan_tx_complete_entry_t,</div><div class='add'>+				   can_tx_complete_msg);</div><div class='ctx'> 	} __aligned(0x4) msg;</div><div class='del'>-} __packed;</div><div class='add'>+} __packed __aligned(0x4);</div><div class='ctx'> </div><div class='ctx'> /* Macros to calculate message lengths */</div><div class='ctx'> #define UCAN_OUT_HDR_SIZE offsetof(struct ucan_message_out, msg)</div><div class='hunk'>@@ -259,7 +261,6 @@ struct ucan_priv;</div><div class='ctx'> /* Context Information for transmission URBs */</div><div class='ctx'> struct ucan_urb_context {</div><div class='ctx'> 	struct ucan_priv *up;</div><div class='del'>-	u8 dlc;</div><div class='ctx'> 	bool allocated;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -276,7 +277,6 @@ struct ucan_priv {</div><div class='ctx'> </div><div class='ctx'> 	/* linux USB device structures */</div><div class='ctx'> 	struct usb_device *udev;</div><div class='del'>-	struct usb_interface *intf;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> </div><div class='ctx'> 	/* lock for can-&gt;echo_skb (used around</div><div class='hunk'>@@ -284,7 +284,7 @@ struct ucan_priv {</div><div class='ctx'> 	 */</div><div class='ctx'> 	spinlock_t echo_skb_lock;</div><div class='ctx'> </div><div class='del'>-	/* usb device information information */</div><div class='add'>+	/* usb device information */</div><div class='ctx'> 	u8 intf_index;</div><div class='ctx'> 	u8 in_ep_addr;</div><div class='ctx'> 	u8 out_ep_addr;</div><div class='hunk'>@@ -303,12 +303,12 @@ struct ucan_priv {</div><div class='ctx'> 	struct ucan_urb_context *context_array;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u8 ucan_get_can_dlc(struct ucan_can_msg *msg, u16 len)</div><div class='add'>+static u8 ucan_can_cc_dlc2len(struct ucan_can_msg *msg, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	if (le32_to_cpu(msg-&gt;id) &amp; CAN_RTR_FLAG)</div><div class='del'>-		return get_can_dlc(msg-&gt;dlc);</div><div class='add'>+		return can_cc_dlc2len(msg-&gt;dlc);</div><div class='ctx'> 	else</div><div class='del'>-		return get_can_dlc(len - (UCAN_IN_HDR_SIZE + sizeof(msg-&gt;id)));</div><div class='add'>+		return can_cc_dlc2len(len - (UCAN_IN_HDR_SIZE + sizeof(msg-&gt;id)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ucan_release_context_array(struct ucan_priv *up)</div><div class='hunk'>@@ -424,18 +424,20 @@ static int ucan_ctrl_command_out(struct ucan_priv *up,</div><div class='ctx'> 			       UCAN_USB_CTL_PIPE_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ucan_device_request_in(struct ucan_priv *up,</div><div class='del'>-				  u8 cmd, u16 subcmd, u16 datalen)</div><div class='add'>+static void ucan_get_fw_str(struct ucan_priv *up, char *fw_str, size_t size)</div><div class='ctx'> {</div><div class='del'>-	return usb_control_msg(up-&gt;udev,</div><div class='del'>-			       usb_rcvctrlpipe(up-&gt;udev, 0),</div><div class='del'>-			       cmd,</div><div class='del'>-			       USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,</div><div class='del'>-			       subcmd,</div><div class='del'>-			       0,</div><div class='del'>-			       up-&gt;ctl_msg_buffer,</div><div class='del'>-			       datalen,</div><div class='del'>-			       UCAN_USB_CTL_PIPE_TIMEOUT);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = usb_control_msg(up-&gt;udev, usb_rcvctrlpipe(up-&gt;udev, 0),</div><div class='add'>+			      UCAN_DEVICE_GET_FW_STRING,</div><div class='add'>+			      USB_DIR_IN | USB_TYPE_VENDOR |</div><div class='add'>+			      USB_RECIP_DEVICE,</div><div class='add'>+			      0, 0, fw_str, size - 1,</div><div class='add'>+			      UCAN_USB_CTL_PIPE_TIMEOUT);</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		fw_str[ret] = '\0';</div><div class='add'>+	else</div><div class='add'>+		strscpy(fw_str, "unknown", size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Parse the device information structure reported by the device and</div><div class='hunk'>@@ -614,15 +616,18 @@ static void ucan_rx_can_msg(struct ucan_priv *up, struct ucan_message_in *m)</div><div class='ctx'> 	cf-&gt;can_id = canid;</div><div class='ctx'> </div><div class='ctx'> 	/* compute DLC taking RTR_FLAG into account */</div><div class='del'>-	cf-&gt;can_dlc = ucan_get_can_dlc(&amp;m-&gt;msg.can_msg, len);</div><div class='add'>+	cf-&gt;len = ucan_can_cc_dlc2len(&amp;m-&gt;msg.can_msg, len);</div><div class='ctx'> </div><div class='ctx'> 	/* copy the payload of non RTR frames */</div><div class='ctx'> 	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG) || (cf-&gt;can_id &amp; CAN_ERR_FLAG))</div><div class='del'>-		memcpy(cf-&gt;data, m-&gt;msg.can_msg.data, cf-&gt;can_dlc);</div><div class='add'>+		memcpy(cf-&gt;data, m-&gt;msg.can_msg.data, cf-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* don't count error frames as real packets */</div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_ERR_FLAG)) {</div><div class='add'>+		stats-&gt;rx_packets++;</div><div class='add'>+		if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+			stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* pass it to Linux */</div><div class='ctx'> 	netif_rx(skb);</div><div class='hunk'>@@ -634,7 +639,7 @@ static void ucan_tx_complete_msg(struct ucan_priv *up,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	u16 count, i;</div><div class='del'>-	u8 echo_index, dlc;</div><div class='add'>+	u8 echo_index;</div><div class='ctx'> 	u16 len = le16_to_cpu(m-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	struct ucan_urb_context *context;</div><div class='hunk'>@@ -658,7 +663,6 @@ static void ucan_tx_complete_msg(struct ucan_priv *up,</div><div class='ctx'> </div><div class='ctx'> 		/* gather information from the context */</div><div class='ctx'> 		context = &amp;up-&gt;context_array[echo_index];</div><div class='del'>-		dlc = READ_ONCE(context-&gt;dlc);</div><div class='ctx'> </div><div class='ctx'> 		/* Release context and restart queue if necessary.</div><div class='ctx'> 		 * Also check if the context was allocated</div><div class='hunk'>@@ -671,11 +675,11 @@ static void ucan_tx_complete_msg(struct ucan_priv *up,</div><div class='ctx'> 		    UCAN_TX_COMPLETE_SUCCESS) {</div><div class='ctx'> 			/* update statistics */</div><div class='ctx'> 			up-&gt;netdev-&gt;stats.tx_packets++;</div><div class='del'>-			up-&gt;netdev-&gt;stats.tx_bytes += dlc;</div><div class='del'>-			can_get_echo_skb(up-&gt;netdev, echo_index);</div><div class='add'>+			up-&gt;netdev-&gt;stats.tx_bytes +=</div><div class='add'>+				can_get_echo_skb(up-&gt;netdev, echo_index, NULL);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			up-&gt;netdev-&gt;stats.tx_dropped++;</div><div class='del'>-			can_free_echo_skb(up-&gt;netdev, echo_index);</div><div class='add'>+			can_free_echo_skb(up-&gt;netdev, echo_index, NULL);</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;up-&gt;echo_skb_lock, flags);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -792,7 +796,7 @@ resubmit:</div><div class='ctx'> 			  up);</div><div class='ctx'> </div><div class='ctx'> 	usb_anchor_urb(urb, &amp;up-&gt;rx_urbs);</div><div class='del'>-	ret = usb_submit_urb(urb, GFP_KERNEL);</div><div class='add'>+	ret = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='ctx'> </div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netdev_err(up-&gt;netdev,</div><div class='hunk'>@@ -843,7 +847,7 @@ static void ucan_write_bulk_callback(struct urb *urb)</div><div class='ctx'> </div><div class='ctx'> 		/* update counters an cleanup */</div><div class='ctx'> 		spin_lock_irqsave(&amp;up-&gt;echo_skb_lock, flags);</div><div class='del'>-		can_free_echo_skb(up-&gt;netdev, context - up-&gt;context_array);</div><div class='add'>+		can_free_echo_skb(up-&gt;netdev, context - up-&gt;context_array, NULL);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;up-&gt;echo_skb_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		up-&gt;netdev-&gt;stats.tx_dropped++;</div><div class='hunk'>@@ -1078,16 +1082,14 @@ static struct urb *ucan_prepare_tx_urb(struct ucan_priv *up,</div><div class='ctx'> 		mlen = UCAN_OUT_HDR_SIZE +</div><div class='ctx'> 			offsetof(struct ucan_can_msg, dlc) +</div><div class='ctx'> 			sizeof(m-&gt;msg.can_msg.dlc);</div><div class='del'>-		m-&gt;msg.can_msg.dlc = cf-&gt;can_dlc;</div><div class='add'>+		m-&gt;msg.can_msg.dlc = cf-&gt;len;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mlen = UCAN_OUT_HDR_SIZE +</div><div class='del'>-			sizeof(m-&gt;msg.can_msg.id) + cf-&gt;can_dlc;</div><div class='del'>-		memcpy(m-&gt;msg.can_msg.data, cf-&gt;data, cf-&gt;can_dlc);</div><div class='add'>+			sizeof(m-&gt;msg.can_msg.id) + cf-&gt;len;</div><div class='add'>+		memcpy(m-&gt;msg.can_msg.data, cf-&gt;data, cf-&gt;len);</div><div class='ctx'> 	}</div><div class='ctx'> 	m-&gt;len = cpu_to_le16(mlen);</div><div class='ctx'> </div><div class='del'>-	context-&gt;dlc = cf-&gt;can_dlc;</div><div class='del'>-</div><div class='ctx'> 	m-&gt;subtype = echo_index;</div><div class='ctx'> </div><div class='ctx'> 	/* build the urb */</div><div class='hunk'>@@ -1120,7 +1122,7 @@ static netdev_tx_t ucan_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 	/* check skb */</div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate a context and slow down tx path, if fifo state is low */</div><div class='hunk'>@@ -1137,7 +1139,7 @@ static netdev_tx_t ucan_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* put the skb on can loopback stack */</div><div class='ctx'> 	spin_lock_irqsave(&amp;up-&gt;echo_skb_lock, flags);</div><div class='del'>-	can_put_echo_skb(skb, up-&gt;netdev, echo_index);</div><div class='add'>+	can_put_echo_skb(skb, up-&gt;netdev, echo_index, 0);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;up-&gt;echo_skb_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* transmit it */</div><div class='hunk'>@@ -1157,7 +1159,7 @@ static netdev_tx_t ucan_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		 * frees the skb</div><div class='ctx'> 		 */</div><div class='ctx'> 		spin_lock_irqsave(&amp;up-&gt;echo_skb_lock, flags);</div><div class='del'>-		can_free_echo_skb(up-&gt;netdev, echo_index);</div><div class='add'>+		can_free_echo_skb(up-&gt;netdev, echo_index, NULL);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;up-&gt;echo_skb_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 		if (ret == -ENODEV) {</div><div class='hunk'>@@ -1231,7 +1233,10 @@ static const struct net_device_ops ucan_netdev_ops = {</div><div class='ctx'> 	.ndo_open = ucan_open,</div><div class='ctx'> 	.ndo_stop = ucan_close,</div><div class='ctx'> 	.ndo_start_xmit = ucan_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ucan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Request to set bittiming</div><div class='hunk'>@@ -1310,7 +1315,6 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> 	u8 in_ep_addr;</div><div class='ctx'> 	u8 out_ep_addr;</div><div class='ctx'> 	union ucan_ctl_payload *ctl_msg_buffer;</div><div class='del'>-	char firmware_str[sizeof(union ucan_ctl_payload) + 1];</div><div class='ctx'> </div><div class='ctx'> 	udev = interface_to_usbdev(intf);</div><div class='ctx'> </div><div class='hunk'>@@ -1393,7 +1397,7 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> 	 * Stage 3 for the final driver initialisation.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* Prepare Memory for control transferes */</div><div class='add'>+	/* Prepare Memory for control transfers */</div><div class='ctx'> 	ctl_msg_buffer = devm_kzalloc(&amp;udev-&gt;dev,</div><div class='ctx'> 				      sizeof(union ucan_ctl_payload),</div><div class='ctx'> 				      GFP_KERNEL);</div><div class='hunk'>@@ -1445,7 +1449,7 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	/* request the device information and store it in ctl_msg_buffer</div><div class='ctx'> 	 *</div><div class='del'>-	 * note: ucan_ctrl_command_* wrappers connot be used yet</div><div class='add'>+	 * note: ucan_ctrl_command_* wrappers cannot be used yet</div><div class='ctx'> 	 * because `up` is initialised in Stage 3</div><div class='ctx'> 	 */</div><div class='ctx'> 	ret = usb_control_msg(udev,</div><div class='hunk'>@@ -1494,9 +1498,8 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	up = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	/* initialze data */</div><div class='add'>+	/* initialize data */</div><div class='ctx'> 	up-&gt;udev = udev;</div><div class='del'>-	up-&gt;intf = intf;</div><div class='ctx'> 	up-&gt;netdev = netdev;</div><div class='ctx'> 	up-&gt;intf_index = iface_desc-&gt;desc.bInterfaceNumber;</div><div class='ctx'> 	up-&gt;in_ep_addr = in_ep_addr;</div><div class='hunk'>@@ -1513,6 +1516,7 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> 	spin_lock_init(&amp;up-&gt;context_lock);</div><div class='ctx'> 	spin_lock_init(&amp;up-&gt;echo_skb_lock);</div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;ucan_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;ucan_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	usb_set_intfdata(intf, up);</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;intf-&gt;dev);</div><div class='hunk'>@@ -1523,18 +1527,6 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> 	 */</div><div class='ctx'> 	ucan_parse_device_info(up, &amp;ctl_msg_buffer-&gt;cmd_get_device_info);</div><div class='ctx'> </div><div class='del'>-	/* just print some device information - if available */</div><div class='del'>-	ret = ucan_device_request_in(up, UCAN_DEVICE_GET_FW_STRING, 0,</div><div class='del'>-				     sizeof(union ucan_ctl_payload));</div><div class='del'>-	if (ret &gt; 0) {</div><div class='del'>-		/* copy string while ensuring zero terminiation */</div><div class='del'>-		strncpy(firmware_str, up-&gt;ctl_msg_buffer-&gt;raw,</div><div class='del'>-			sizeof(union ucan_ctl_payload));</div><div class='del'>-		firmware_str[sizeof(union ucan_ctl_payload)] = '\0';</div><div class='del'>-	} else {</div><div class='del'>-		strcpy(firmware_str, "unknown");</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* device is compatible, reset it */</div><div class='ctx'> 	ret = ucan_ctrl_command_out(up, UCAN_COMMAND_RESET, 0, 0);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -1552,7 +1544,10 @@ static int ucan_probe(struct usb_interface *intf,</div><div class='ctx'> </div><div class='ctx'> 	/* initialisation complete, log device info */</div><div class='ctx'> 	netdev_info(up-&gt;netdev, "registered device\n");</div><div class='del'>-	netdev_info(up-&gt;netdev, "firmware string: %s\n", firmware_str);</div><div class='add'>+	ucan_get_fw_str(up, up-&gt;ctl_msg_buffer-&gt;fw_str,</div><div class='add'>+			sizeof(up-&gt;ctl_msg_buffer-&gt;fw_str));</div><div class='add'>+	netdev_info(up-&gt;netdev, "firmware string: %s\n",</div><div class='add'>+		    up-&gt;ctl_msg_buffer-&gt;fw_str);</div><div class='ctx'> </div><div class='ctx'> 	/* success */</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1576,7 +1571,7 @@ static void ucan_disconnect(struct usb_interface *intf)</div><div class='ctx'> 	usb_set_intfdata(intf, NULL);</div><div class='ctx'> </div><div class='ctx'> 	if (up) {</div><div class='del'>-		unregister_netdev(up-&gt;netdev);</div><div class='add'>+		unregister_candev(up-&gt;netdev);</div><div class='ctx'> 		free_candev(up-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c<br/>index 27861c417c94..7449328f7cd7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/usb_8dev.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/usb/usb_8dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/usb/usb_8dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/usb/usb_8dev.c</a></div><div class='hunk'>@@ -1,20 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * CAN driver for "8 devices" USB2CAN converter</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2012 Bernd Krumboeck (krumboeck@universalnet.at)</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License as published</div><div class='del'>- * by the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License along</div><div class='del'>- * with this program.</div><div class='del'>- *</div><div class='ctx'>  * This driver is inspired by the 3.2.0 version of drivers/net/can/usb/ems_usb.c</div><div class='ctx'>  * and drivers/net/can/usb/esd_usb2.c</div><div class='ctx'>  *</div><div class='hunk'>@@ -23,6 +12,7 @@</div><div class='ctx'>  * who were very cooperative and answered my questions.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/signal.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -32,7 +22,6 @@</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* driver constants */</div><div class='ctx'> #define MAX_RX_URBS			20</div><div class='hunk'>@@ -99,7 +88,7 @@ enum usb_8dev_cmd {</div><div class='ctx'> </div><div class='ctx'> /* status */</div><div class='ctx'> #define USB_8DEV_STATUSMSG_OK		0x00  /* Normal condition. */</div><div class='del'>-#define USB_8DEV_STATUSMSG_OVERRUN	0x01  /* Overrun occured when sending */</div><div class='add'>+#define USB_8DEV_STATUSMSG_OVERRUN	0x01  /* Overrun occurred when sending */</div><div class='ctx'> #define USB_8DEV_STATUSMSG_BUSLIGHT	0x02  /* Error counter has reached 96 */</div><div class='ctx'> #define USB_8DEV_STATUSMSG_BUSHEAVY	0x03  /* Error count. has reached 128 */</div><div class='ctx'> #define USB_8DEV_STATUSMSG_BUSOFF	0x04  /* Device is in BUSOFF */</div><div class='hunk'>@@ -125,15 +114,12 @@ struct usb_8dev_tx_urb_context {</div><div class='ctx'> 	struct usb_8dev_priv *priv;</div><div class='ctx'> </div><div class='ctx'> 	u32 echo_index;</div><div class='del'>-	u8 dlc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Structure to hold all of our device specific stuff */</div><div class='ctx'> struct usb_8dev_priv {</div><div class='ctx'> 	struct can_priv can; /* must be the first member */</div><div class='ctx'> </div><div class='del'>-	struct sk_buff *echo_skb[MAX_TX_URBS];</div><div class='del'>-</div><div class='ctx'> 	struct usb_device *udev;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> </div><div class='hunk'>@@ -148,7 +134,8 @@ struct usb_8dev_priv {</div><div class='ctx'> 	u8 *cmd_msg_buffer;</div><div class='ctx'> </div><div class='ctx'> 	struct mutex usb_8dev_cmd_lock;</div><div class='del'>-</div><div class='add'>+	void *rxbuf[MAX_RX_URBS];</div><div class='add'>+	dma_addr_t rxbuf_dma[MAX_RX_URBS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* tx frame */</div><div class='hunk'>@@ -176,7 +163,7 @@ struct __packed usb_8dev_rx_msg {</div><div class='ctx'> /* command frame */</div><div class='ctx'> struct __packed usb_8dev_cmd_msg {</div><div class='ctx'> 	u8 begin;</div><div class='del'>-	u8 channel;	/* unkown - always 0 */</div><div class='add'>+	u8 channel;	/* unknown - always 0 */</div><div class='ctx'> 	u8 command;	/* command to execute */</div><div class='ctx'> 	u8 opt1;	/* optional parameter / return value */</div><div class='ctx'> 	u8 opt2;	/* optional parameter 2 */</div><div class='hunk'>@@ -452,15 +439,15 @@ static void usb_8dev_rx_err_msg(struct usb_8dev_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (rx_errors)</div><div class='ctx'> 		stats-&gt;rx_errors++;</div><div class='del'>-</div><div class='del'>-	cf-&gt;data[6] = txerr;</div><div class='del'>-	cf-&gt;data[7] = rxerr;</div><div class='add'>+	if (priv-&gt;can.state != CAN_STATE_BUS_OFF) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='add'>+		cf-&gt;data[6] = txerr;</div><div class='add'>+		cf-&gt;data[7] = rxerr;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;bec.txerr = txerr;</div><div class='ctx'> 	priv-&gt;bec.rxerr = rxerr;</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='ctx'> 	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -481,21 +468,20 @@ static void usb_8dev_rx_can_msg(struct usb_8dev_priv *priv,</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		cf-&gt;can_id = be32_to_cpu(msg-&gt;id);</div><div class='del'>-		cf-&gt;can_dlc = get_can_dlc(msg-&gt;dlc &amp; 0xF);</div><div class='add'>+		can_frame_set_cc_len(cf, msg-&gt;dlc &amp; 0xF, priv-&gt;can.ctrlmode);</div><div class='ctx'> </div><div class='ctx'> 		if (msg-&gt;flags &amp; USB_8DEV_EXTID)</div><div class='ctx'> 			cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='ctx'> </div><div class='del'>-		if (msg-&gt;flags &amp; USB_8DEV_RTR)</div><div class='add'>+		if (msg-&gt;flags &amp; USB_8DEV_RTR) {</div><div class='ctx'> 			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='del'>-		else</div><div class='del'>-			memcpy(cf-&gt;data, msg-&gt;data, cf-&gt;can_dlc);</div><div class='del'>-</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(cf-&gt;data, msg-&gt;data, cf-&gt;len);</div><div class='add'>+			stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+		}</div><div class='ctx'> 		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-		netif_rx(skb);</div><div class='ctx'> </div><div class='del'>-		can_led_event(priv-&gt;netdev, CAN_LED_EVENT_RX);</div><div class='add'>+		netif_rx(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_warn(priv-&gt;netdev, "frame type %d unknown",</div><div class='ctx'> 			 msg-&gt;type);</div><div class='hunk'>@@ -594,11 +580,7 @@ static void usb_8dev_write_bulk_callback(struct urb *urb)</div><div class='ctx'> 			 urb-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;stats.tx_packets++;</div><div class='del'>-	netdev-&gt;stats.tx_bytes += context-&gt;dlc;</div><div class='del'>-</div><div class='del'>-	can_get_echo_skb(netdev, context-&gt;echo_index);</div><div class='del'>-</div><div class='del'>-	can_led_event(netdev, CAN_LED_EVENT_TX);</div><div class='add'>+	netdev-&gt;stats.tx_bytes += can_get_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Release context */</div><div class='ctx'> 	context-&gt;echo_index = MAX_TX_URBS;</div><div class='hunk'>@@ -620,7 +602,7 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	size_t size = sizeof(struct usb_8dev_tx_msg);</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(netdev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(netdev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	/* create a URB, and a buffer for it, and copy the data to the URB */</div><div class='hunk'>@@ -648,8 +630,8 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		msg-&gt;flags |= USB_8DEV_EXTID;</div><div class='ctx'> </div><div class='ctx'> 	msg-&gt;id = cpu_to_be32(cf-&gt;can_id &amp; CAN_ERR_MASK);</div><div class='del'>-	msg-&gt;dlc = cf-&gt;can_dlc;</div><div class='del'>-	memcpy(msg-&gt;data, cf-&gt;data, cf-&gt;can_dlc);</div><div class='add'>+	msg-&gt;dlc = can_get_cc_dlc(cf, priv-&gt;can.ctrlmode);</div><div class='add'>+	memcpy(msg-&gt;data, cf-&gt;data, cf-&gt;len);</div><div class='ctx'> 	msg-&gt;end = USB_8DEV_DATA_END;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_TX_URBS; i++) {</div><div class='hunk'>@@ -667,7 +649,6 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	context-&gt;priv = priv;</div><div class='ctx'> 	context-&gt;echo_index = i;</div><div class='del'>-	context-&gt;dlc = cf-&gt;can_dlc;</div><div class='ctx'> </div><div class='ctx'> 	usb_fill_bulk_urb(urb, priv-&gt;udev,</div><div class='ctx'> 			  usb_sndbulkpipe(priv-&gt;udev, USB_8DEV_ENDP_DATA_TX),</div><div class='hunk'>@@ -675,14 +656,25 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	urb-&gt;transfer_flags |= URB_NO_TRANSFER_DMA_MAP;</div><div class='ctx'> 	usb_anchor_urb(urb, &amp;priv-&gt;tx_submitted);</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, netdev, context-&gt;echo_index);</div><div class='add'>+	can_put_echo_skb(skb, netdev, context-&gt;echo_index, 0);</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;priv-&gt;active_tx_urbs);</div><div class='ctx'> </div><div class='ctx'> 	err = usb_submit_urb(urb, GFP_ATOMIC);</div><div class='del'>-	if (unlikely(err))</div><div class='del'>-		goto failed;</div><div class='del'>-	else if (atomic_read(&amp;priv-&gt;active_tx_urbs) &gt;= MAX_TX_URBS)</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		can_free_echo_skb(netdev, context-&gt;echo_index, NULL);</div><div class='add'>+</div><div class='add'>+		usb_unanchor_urb(urb);</div><div class='add'>+		usb_free_coherent(priv-&gt;udev, size, buf, urb-&gt;transfer_dma);</div><div class='add'>+</div><div class='add'>+		atomic_dec(&amp;priv-&gt;active_tx_urbs);</div><div class='add'>+</div><div class='add'>+		if (err == -ENODEV)</div><div class='add'>+			netif_device_detach(netdev);</div><div class='add'>+		else</div><div class='add'>+			netdev_warn(netdev, "failed tx_urb %d\n", err);</div><div class='add'>+		stats-&gt;tx_dropped++;</div><div class='add'>+	} else if (atomic_read(&amp;priv-&gt;active_tx_urbs) &gt;= MAX_TX_URBS)</div><div class='ctx'> 		/* Slow down tx path */</div><div class='ctx'> 		netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -701,19 +693,6 @@ nofreecontext:</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_BUSY;</div><div class='ctx'> </div><div class='del'>-failed:</div><div class='del'>-	can_free_echo_skb(netdev, context-&gt;echo_index);</div><div class='del'>-</div><div class='del'>-	usb_unanchor_urb(urb);</div><div class='del'>-	usb_free_coherent(priv-&gt;udev, size, buf, urb-&gt;transfer_dma);</div><div class='del'>-</div><div class='del'>-	atomic_dec(&amp;priv-&gt;active_tx_urbs);</div><div class='del'>-</div><div class='del'>-	if (err == -ENODEV)</div><div class='del'>-		netif_device_detach(netdev);</div><div class='del'>-	else</div><div class='del'>-		netdev_warn(netdev, "failed tx_urb %d\n", err);</div><div class='del'>-</div><div class='ctx'> nomembuf:</div><div class='ctx'> 	usb_free_urb(urb);</div><div class='ctx'> </div><div class='hunk'>@@ -744,6 +723,7 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; MAX_RX_URBS; i++) {</div><div class='ctx'> 		struct urb *urb = NULL;</div><div class='ctx'> 		u8 *buf;</div><div class='add'>+		dma_addr_t buf_dma;</div><div class='ctx'> </div><div class='ctx'> 		/* create a URB, and a buffer for it */</div><div class='ctx'> 		urb = usb_alloc_urb(0, GFP_KERNEL);</div><div class='hunk'>@@ -753,7 +733,7 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		buf = usb_alloc_coherent(priv-&gt;udev, RX_BUFFER_SIZE, GFP_KERNEL,</div><div class='del'>-					 &amp;urb-&gt;transfer_dma);</div><div class='add'>+					 &amp;buf_dma);</div><div class='ctx'> 		if (!buf) {</div><div class='ctx'> 			netdev_err(netdev, "No memory left for USB buffer\n");</div><div class='ctx'> 			usb_free_urb(urb);</div><div class='hunk'>@@ -761,6 +741,8 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		urb-&gt;transfer_dma = buf_dma;</div><div class='add'>+</div><div class='ctx'> 		usb_fill_bulk_urb(urb, priv-&gt;udev,</div><div class='ctx'> 				  usb_rcvbulkpipe(priv-&gt;udev,</div><div class='ctx'> 						  USB_8DEV_ENDP_DATA_RX),</div><div class='hunk'>@@ -778,6 +760,9 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		priv-&gt;rxbuf[i] = buf;</div><div class='add'>+		priv-&gt;rxbuf_dma[i] = buf_dma;</div><div class='add'>+</div><div class='ctx'> 		/* Drop reference, USB core will take care of freeing it */</div><div class='ctx'> 		usb_free_urb(urb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -820,8 +805,6 @@ static int usb_8dev_open(struct net_device *netdev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	can_led_event(netdev, CAN_LED_EVENT_OPEN);</div><div class='del'>-</div><div class='ctx'> 	/* finally start device */</div><div class='ctx'> 	err = usb_8dev_start(priv);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -847,6 +830,10 @@ static void unlink_all_urbs(struct usb_8dev_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;priv-&gt;rx_submitted);</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; MAX_RX_URBS; ++i)</div><div class='add'>+		usb_free_coherent(priv-&gt;udev, RX_BUFFER_SIZE,</div><div class='add'>+				  priv-&gt;rxbuf[i], priv-&gt;rxbuf_dma[i]);</div><div class='add'>+</div><div class='ctx'> 	usb_kill_anchored_urbs(&amp;priv-&gt;tx_submitted);</div><div class='ctx'> 	atomic_set(&amp;priv-&gt;active_tx_urbs, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -874,8 +861,6 @@ static int usb_8dev_close(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	close_candev(netdev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(netdev, CAN_LED_EVENT_STOP);</div><div class='del'>-</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -883,11 +868,14 @@ static const struct net_device_ops usb_8dev_netdev_ops = {</div><div class='ctx'> 	.ndo_open = usb_8dev_open,</div><div class='ctx'> 	.ndo_stop = usb_8dev_close,</div><div class='ctx'> 	.ndo_start_xmit = usb_8dev_start_xmit,</div><div class='del'>-	.ndo_change_mtu = can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops usb_8dev_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct can_bittiming_const usb_8dev_bittiming_const = {</div><div class='del'>-	.name = "usb_8dev",</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='ctx'> 	.tseg1_min = 1,</div><div class='ctx'> 	.tseg1_max = 16,</div><div class='ctx'> 	.tseg2_min = 1,</div><div class='hunk'>@@ -939,9 +927,11 @@ static int usb_8dev_probe(struct usb_interface *intf,</div><div class='ctx'> 	priv-&gt;can.do_get_berr_counter = usb_8dev_get_berr_counter;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='ctx'> 				      CAN_CTRLMODE_LISTENONLY |</div><div class='del'>-				      CAN_CTRLMODE_ONE_SHOT;</div><div class='add'>+				      CAN_CTRLMODE_ONE_SHOT |</div><div class='add'>+				      CAN_CTRLMODE_CC_LEN8_DLC;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;usb_8dev_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;usb_8dev_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_ECHO; /* we support local echo */</div><div class='ctx'> </div><div class='hunk'>@@ -982,8 +972,6 @@ static int usb_8dev_probe(struct usb_interface *intf,</div><div class='ctx'> 			 (version&gt;&gt;8) &amp; 0xff, version &amp; 0xff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(netdev);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> cleanup_unregister_candev:</div><div class='hunk'>@@ -1007,15 +995,14 @@ static void usb_8dev_disconnect(struct usb_interface *intf)</div><div class='ctx'> 		netdev_info(priv-&gt;netdev, "device disconnected\n");</div><div class='ctx'> </div><div class='ctx'> 		unregister_netdev(priv-&gt;netdev);</div><div class='del'>-		free_candev(priv-&gt;netdev);</div><div class='del'>-</div><div class='ctx'> 		unlink_all_urbs(priv);</div><div class='add'>+		free_candev(priv-&gt;netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct usb_driver usb_8dev_driver = {</div><div class='del'>-	.name =		"usb_8dev",</div><div class='add'>+	.name =		KBUILD_MODNAME,</div><div class='ctx'> 	.probe =	usb_8dev_probe,</div><div class='ctx'> 	.disconnect =	usb_8dev_disconnect,</div><div class='ctx'> 	.id_table =	usb_8dev_table,</div><div class='head'>diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c<br/>index d200a5b0651c..fdc662aea279 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/vcan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/vcan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/vcan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/vcan.c</a></div><div class='hunk'>@@ -1,5 +1,4 @@</div><div class='del'>-/*</div><div class='del'>- * vcan.c - Virtual CAN interface</div><div class='add'>+/* vcan.c - Virtual CAN interface</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2002-2017 Volkswagen Group Electronic Research</div><div class='ctx'>  * All rights reserved.</div><div class='hunk'>@@ -39,12 +38,16 @@</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_arp.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/can.h&gt;</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/skb.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='hunk'>@@ -57,9 +60,7 @@ MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_AUTHOR("Urs Thuermann &lt;urs.thuermann@volkswagen.de&gt;");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK(DRV_NAME);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CAN test feature:</div><div class='add'>+/* CAN test feature:</div><div class='ctx'>  * Enable the echo on driver level for testing the CAN core echo modes.</div><div class='ctx'>  * See Documentation/networking/can.rst for details.</div><div class='ctx'>  */</div><div class='hunk'>@@ -68,47 +69,46 @@ static bool echo; /* echo testing. Default: 0 (Off) */</div><div class='ctx'> module_param(echo, bool, 0444);</div><div class='ctx'> MODULE_PARM_DESC(echo, "Echo sent frames (for testing). Default: 0 (Off)");</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> static void vcan_rx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='del'>-	stats-&gt;rx_bytes += cfd-&gt;len;</div><div class='add'>+	stats-&gt;rx_bytes += can_skb_get_data_len(skb);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;pkt_type  = PACKET_BROADCAST;</div><div class='ctx'> 	skb-&gt;dev       = dev;</div><div class='ctx'> 	skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='ctx'> </div><div class='del'>-	netif_rx_ni(skb);</div><div class='add'>+	netif_rx(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;dev-&gt;stats;</div><div class='add'>+	unsigned int len;</div><div class='ctx'> 	int loop;</div><div class='ctx'> </div><div class='ctx'> 	if (can_dropped_invalid_skb(dev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='add'>+	len = can_skb_get_data_len(skb);</div><div class='ctx'> 	stats-&gt;tx_packets++;</div><div class='del'>-	stats-&gt;tx_bytes += cfd-&gt;len;</div><div class='add'>+	stats-&gt;tx_bytes += len;</div><div class='ctx'> </div><div class='ctx'> 	/* set flag whether this packet has to be looped back */</div><div class='ctx'> 	loop = skb-&gt;pkt_type == PACKET_LOOPBACK;</div><div class='ctx'> </div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='ctx'> 	if (!echo) {</div><div class='ctx'> 		/* no echo handling available inside this driver */</div><div class='del'>-</div><div class='ctx'> 		if (loop) {</div><div class='del'>-			/*</div><div class='del'>-			 * only count the packets here, because the</div><div class='add'>+			/* only count the packets here, because the</div><div class='ctx'> 			 * CAN core already did the echo for us</div><div class='ctx'> 			 */</div><div class='ctx'> 			stats-&gt;rx_packets++;</div><div class='del'>-			stats-&gt;rx_bytes += cfd-&gt;len;</div><div class='add'>+			stats-&gt;rx_bytes += len;</div><div class='ctx'> 		}</div><div class='ctx'> 		consume_skb(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='hunk'>@@ -117,7 +117,6 @@ static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* perform standard echo handling for CAN network interfaces */</div><div class='ctx'> </div><div class='ctx'> 	if (loop) {</div><div class='del'>-</div><div class='ctx'> 		skb = can_create_echo_skb(skb);</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			return NETDEV_TX_OK;</div><div class='hunk'>@@ -137,10 +136,11 @@ static int vcan_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (new_mtu != CAN_MTU &amp;&amp; new_mtu != CANFD_MTU)</div><div class='add'>+	if (new_mtu != CAN_MTU &amp;&amp; new_mtu != CANFD_MTU &amp;&amp;</div><div class='add'>+	    !can_is_canxl_dev_mtu(new_mtu))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -149,34 +149,41 @@ static const struct net_device_ops vcan_netdev_ops = {</div><div class='ctx'> 	.ndo_change_mtu = vcan_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ethtool_ops vcan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void vcan_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	dev-&gt;type		= ARPHRD_CAN;</div><div class='del'>-	dev-&gt;mtu		= CANFD_MTU;</div><div class='add'>+	dev-&gt;mtu		= CANXL_MTU;</div><div class='ctx'> 	dev-&gt;hard_header_len	= 0;</div><div class='ctx'> 	dev-&gt;addr_len		= 0;</div><div class='ctx'> 	dev-&gt;tx_queue_len	= 0;</div><div class='ctx'> 	dev-&gt;flags		= IFF_NOARP;</div><div class='add'>+	can_set_ml_priv(dev, netdev_priv(dev));</div><div class='ctx'> </div><div class='ctx'> 	/* set flags according to driver capabilities */</div><div class='ctx'> 	if (echo)</div><div class='ctx'> 		dev-&gt;flags |= IFF_ECHO;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;vcan_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops	= &amp;vcan_ethtool_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct rtnl_link_ops vcan_link_ops __read_mostly = {</div><div class='del'>-	.kind	= DRV_NAME,</div><div class='del'>-	.setup	= vcan_setup,</div><div class='add'>+	.kind = DRV_NAME,</div><div class='add'>+	.priv_size = sizeof(struct can_ml_priv),</div><div class='add'>+	.setup = vcan_setup,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static __init int vcan_init_module(void)</div><div class='ctx'> {</div><div class='del'>-	pr_info("vcan: Virtual CAN interface driver\n");</div><div class='add'>+	pr_info("Virtual CAN interface driver\n");</div><div class='ctx'> </div><div class='ctx'> 	if (echo)</div><div class='del'>-		printk(KERN_INFO "vcan: enabled echo on driver level.\n");</div><div class='add'>+		pr_info("enabled echo on driver level.\n");</div><div class='ctx'> </div><div class='ctx'> 	return rtnl_link_register(&amp;vcan_link_ops);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c<br/>index 80af658e530d..b2c19f8c5f8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/vxcan.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/vxcan.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/vxcan.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/vxcan.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * vxcan.c - Virtual CAN Tunnel for cross namespace communication</div><div class='ctx'>  *</div><div class='hunk'>@@ -6,20 +7,9 @@</div><div class='ctx'>  * for network interface pairs in a common and established way.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (c) 2017 Oliver Hartkopp &lt;socketcan@hartkopp.net&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the version 2 of the GNU General Public License</div><div class='del'>- * as published by the Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -29,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/skb.h&gt;</div><div class='ctx'> #include &lt;linux/can/vxcan.h&gt;</div><div class='add'>+#include &lt;linux/can/can-ml.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -43,27 +34,34 @@ struct vxcan_priv {</div><div class='ctx'> 	struct net_device __rcu	*peer;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static netdev_tx_t vxcan_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t vxcan_xmit(struct sk_buff *oskb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct vxcan_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct net_device *peer;</div><div class='del'>-	struct canfd_frame *cfd = (struct canfd_frame *)skb-&gt;data;</div><div class='ctx'> 	struct net_device_stats *peerstats, *srcstats = &amp;dev-&gt;stats;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(dev, skb))</div><div class='add'>+	if (can_dropped_invalid_skb(dev, oskb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	peer = rcu_dereference(priv-&gt;peer);</div><div class='ctx'> 	if (unlikely(!peer)) {</div><div class='del'>-		kfree_skb(skb);</div><div class='add'>+		kfree_skb(oskb);</div><div class='ctx'> 		dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = can_create_echo_skb(skb);</div><div class='del'>-	if (!skb)</div><div class='add'>+	skb_tx_timestamp(oskb);</div><div class='add'>+</div><div class='add'>+	skb = skb_clone(oskb, GFP_ATOMIC);</div><div class='add'>+	if (skb) {</div><div class='add'>+		consume_skb(oskb);</div><div class='add'>+	} else {</div><div class='add'>+		kfree_skb(oskb);</div><div class='ctx'> 		goto out_unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* reset CAN GW hop counter */</div><div class='ctx'> 	skb-&gt;csum_start = 0;</div><div class='hunk'>@@ -71,12 +69,13 @@ static netdev_tx_t vxcan_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	skb-&gt;dev        = peer;</div><div class='ctx'> 	skb-&gt;ip_summed  = CHECKSUM_UNNECESSARY;</div><div class='ctx'> </div><div class='del'>-	if (netif_rx_ni(skb) == NET_RX_SUCCESS) {</div><div class='add'>+	len = can_skb_get_data_len(skb);</div><div class='add'>+	if (netif_rx(skb) == NET_RX_SUCCESS) {</div><div class='ctx'> 		srcstats-&gt;tx_packets++;</div><div class='del'>-		srcstats-&gt;tx_bytes += cfd-&gt;len;</div><div class='add'>+		srcstats-&gt;tx_bytes += len;</div><div class='ctx'> 		peerstats = &amp;peer-&gt;stats;</div><div class='ctx'> 		peerstats-&gt;rx_packets++;</div><div class='del'>-		peerstats-&gt;rx_bytes += cfd-&gt;len;</div><div class='add'>+		peerstats-&gt;rx_bytes += len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_unlock:</div><div class='hunk'>@@ -120,7 +119,7 @@ static int vxcan_get_iflink(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='ctx'> 	peer = rcu_dereference(priv-&gt;peer);</div><div class='del'>-	iflink = peer ? peer-&gt;ifindex : 0;</div><div class='add'>+	iflink = peer ? READ_ONCE(peer-&gt;ifindex) : 0;</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return iflink;</div><div class='hunk'>@@ -132,10 +131,11 @@ static int vxcan_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_UP)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (new_mtu != CAN_MTU &amp;&amp; new_mtu != CANFD_MTU)</div><div class='add'>+	if (new_mtu != CAN_MTU &amp;&amp; new_mtu != CANFD_MTU &amp;&amp;</div><div class='add'>+	    !can_is_canxl_dev_mtu(new_mtu))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -147,28 +147,40 @@ static const struct net_device_ops vxcan_netdev_ops = {</div><div class='ctx'> 	.ndo_change_mtu = vxcan_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct ethtool_ops vxcan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void vxcan_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct can_ml_priv *can_ml;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;type		= ARPHRD_CAN;</div><div class='del'>-	dev-&gt;mtu		= CANFD_MTU;</div><div class='add'>+	dev-&gt;mtu		= CANXL_MTU;</div><div class='ctx'> 	dev-&gt;hard_header_len	= 0;</div><div class='ctx'> 	dev-&gt;addr_len		= 0;</div><div class='ctx'> 	dev-&gt;tx_queue_len	= 0;</div><div class='del'>-	dev-&gt;flags		= (IFF_NOARP|IFF_ECHO);</div><div class='add'>+	dev-&gt;flags		= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;vxcan_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops	= &amp;vxcan_ethtool_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev	= true;</div><div class='add'>+</div><div class='add'>+	can_ml = netdev_priv(dev) + ALIGN(sizeof(struct vxcan_priv), NETDEV_ALIGN);</div><div class='add'>+	can_set_ml_priv(dev, can_ml);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* forward declaration for rtnl_create_link() */</div><div class='ctx'> static struct rtnl_link_ops vxcan_link_ops;</div><div class='ctx'> </div><div class='del'>-static int vxcan_newlink(struct net *net, struct net_device *dev,</div><div class='del'>-			 struct nlattr *tb[], struct nlattr *data[],</div><div class='add'>+static int vxcan_newlink(struct net_device *dev,</div><div class='add'>+			 struct rtnl_newlink_params *params,</div><div class='ctx'> 			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct net *peer_net = rtnl_newlink_peer_net(params);</div><div class='add'>+	struct nlattr **data = params-&gt;data;</div><div class='add'>+	struct nlattr **tb = params-&gt;tb;</div><div class='ctx'> 	struct vxcan_priv *priv;</div><div class='ctx'> 	struct net_device *peer;</div><div class='del'>-	struct net *peer_net;</div><div class='ctx'> </div><div class='ctx'> 	struct nlattr *peer_tb[IFLA_MAX + 1], **tbp = tb;</div><div class='ctx'> 	char ifname[IFNAMSIZ];</div><div class='hunk'>@@ -178,47 +190,30 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* register peer device */</div><div class='ctx'> 	if (data &amp;&amp; data[VXCAN_INFO_PEER]) {</div><div class='del'>-		struct nlattr *nla_peer;</div><div class='add'>+		struct nlattr *nla_peer = data[VXCAN_INFO_PEER];</div><div class='ctx'> </div><div class='del'>-		nla_peer = data[VXCAN_INFO_PEER];</div><div class='ctx'> 		ifmp = nla_data(nla_peer);</div><div class='del'>-		err = rtnl_nla_parse_ifla(peer_tb,</div><div class='del'>-					  nla_data(nla_peer) +</div><div class='del'>-					  sizeof(struct ifinfomsg),</div><div class='del'>-					  nla_len(nla_peer) -</div><div class='del'>-					  sizeof(struct ifinfomsg),</div><div class='del'>-					  NULL);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='add'>+		rtnl_nla_parse_ifinfomsg(peer_tb, nla_peer, extack);</div><div class='ctx'> 		tbp = peer_tb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifmp &amp;&amp; tbp[IFLA_IFNAME]) {</div><div class='del'>-		nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);</div><div class='add'>+		nla_strscpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);</div><div class='ctx'> 		name_assign_type = NET_NAME_USER;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		snprintf(ifname, IFNAMSIZ, DRV_NAME "%%d");</div><div class='ctx'> 		name_assign_type = NET_NAME_ENUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	peer_net = rtnl_link_get_net(net, tbp);</div><div class='del'>-	if (IS_ERR(peer_net))</div><div class='del'>-		return PTR_ERR(peer_net);</div><div class='del'>-</div><div class='ctx'> 	peer = rtnl_create_link(peer_net, ifname, name_assign_type,</div><div class='ctx'> 				&amp;vxcan_link_ops, tbp, extack);</div><div class='del'>-	if (IS_ERR(peer)) {</div><div class='del'>-		put_net(peer_net);</div><div class='add'>+	if (IS_ERR(peer))</div><div class='ctx'> 		return PTR_ERR(peer);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (ifmp &amp;&amp; dev-&gt;ifindex)</div><div class='ctx'> 		peer-&gt;ifindex = ifmp-&gt;ifi_index;</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdevice(peer);</div><div class='del'>-	put_net(peer_net);</div><div class='del'>-	peer_net = NULL;</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		free_netdev(peer);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -226,13 +221,13 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(peer);</div><div class='ctx'> </div><div class='del'>-	err = rtnl_configure_link(peer, ifmp);</div><div class='add'>+	err = rtnl_configure_link(peer, ifmp, 0, NULL);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto unregister_network_device;</div><div class='ctx'> </div><div class='ctx'> 	/* register first device */</div><div class='ctx'> 	if (tb[IFLA_IFNAME])</div><div class='del'>-		nla_strlcpy(dev-&gt;name, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='add'>+		nla_strscpy(dev-&gt;name, tb[IFLA_IFNAME], IFNAMSIZ);</div><div class='ctx'> 	else</div><div class='ctx'> 		snprintf(dev-&gt;name, IFNAMSIZ, DRV_NAME "%%d");</div><div class='ctx'> </div><div class='hunk'>@@ -292,11 +287,12 @@ static struct net *vxcan_get_link_net(const struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static struct rtnl_link_ops vxcan_link_ops = {</div><div class='ctx'> 	.kind		= DRV_NAME,</div><div class='del'>-	.priv_size	= sizeof(struct vxcan_priv),</div><div class='add'>+	.priv_size	= ALIGN(sizeof(struct vxcan_priv), NETDEV_ALIGN) + sizeof(struct can_ml_priv),</div><div class='ctx'> 	.setup		= vxcan_setup,</div><div class='ctx'> 	.newlink	= vxcan_newlink,</div><div class='ctx'> 	.dellink	= vxcan_dellink,</div><div class='ctx'> 	.policy		= vxcan_policy,</div><div class='add'>+	.peer_type	= VXCAN_INFO_PEER,</div><div class='ctx'> 	.maxtype	= VXCAN_INFO_MAX,</div><div class='ctx'> 	.get_link_net	= vxcan_get_link_net,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c<br/>index f2024404b8d6..43d7f22820b8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/can/xilinx_can.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/can/xilinx_can.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/can/xilinx_can.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/can/xilinx_can.c</a></div><div class='hunk'>@@ -1,16 +1,18 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-or-later</div><div class='ctx'> /* Xilinx CAN device driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2012 - 2014 Xilinx, Inc.</div><div class='add'>+ * Copyright (C) 2012 - 2022 Xilinx, Inc.</div><div class='ctx'>  * Copyright (C) 2009 PetaLogix. All rights reserved.</div><div class='ctx'>  * Copyright (C) 2017 - 2018 Sandvik Mining and Construction Oy</div><div class='ctx'>  *</div><div class='ctx'>  * Description:</div><div class='del'>- * This driver is developed for Axi CAN IP and for Zynq CANPS Controller.</div><div class='add'>+ * This driver is developed for AXI CAN IP, AXI CANFD IP, CANPS and CANFD PS Controller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -18,16 +20,18 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/can/dev.h&gt;</div><div class='ctx'> #include &lt;linux/can/error.h&gt;</div><div class='del'>-#include &lt;linux/can/led.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/u64_stats_sync.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME	"xilinx_can"</div><div class='ctx'> </div><div class='hunk'>@@ -50,18 +54,32 @@ enum xcan_reg {</div><div class='ctx'> 	XCAN_AFR_OFFSET		= 0x60, /* Acceptance Filter */</div><div class='ctx'> </div><div class='ctx'> 	/* only on CAN FD cores */</div><div class='add'>+	XCAN_F_BRPR_OFFSET	= 0x088, /* Data Phase Baud Rate</div><div class='add'>+					  * Prescaler</div><div class='add'>+					  */</div><div class='add'>+	XCAN_F_BTR_OFFSET	= 0x08C, /* Data Phase Bit Timing */</div><div class='ctx'> 	XCAN_TRR_OFFSET		= 0x0090, /* TX Buffer Ready Request */</div><div class='add'>+</div><div class='add'>+	/* only on AXI CAN cores */</div><div class='add'>+	XCAN_ECC_CFG_OFFSET	= 0xC8, /* ECC Configuration */</div><div class='add'>+	XCAN_TXTLFIFO_ECC_OFFSET	= 0xCC, /* TXTL FIFO ECC error counter */</div><div class='add'>+	XCAN_TXOLFIFO_ECC_OFFSET	= 0xD0, /* TXOL FIFO ECC error counter */</div><div class='add'>+	XCAN_RXFIFO_ECC_OFFSET	= 0xD4, /* RX FIFO ECC error counter */</div><div class='add'>+</div><div class='ctx'> 	XCAN_AFR_EXT_OFFSET	= 0x00E0, /* Acceptance Filter */</div><div class='ctx'> 	XCAN_FSR_OFFSET		= 0x00E8, /* RX FIFO Status */</div><div class='ctx'> 	XCAN_TXMSG_BASE_OFFSET	= 0x0100, /* TX Message Space */</div><div class='ctx'> 	XCAN_RXMSG_BASE_OFFSET	= 0x1100, /* RX Message Space */</div><div class='ctx'> 	XCAN_RXMSG_2_BASE_OFFSET	= 0x2100, /* RX Message Space */</div><div class='add'>+	XCAN_AFR_2_MASK_OFFSET	= 0x0A00, /* Acceptance Filter MASK */</div><div class='add'>+	XCAN_AFR_2_ID_OFFSET	= 0x0A04, /* Acceptance Filter ID */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define XCAN_FRAME_ID_OFFSET(frame_base)	((frame_base) + 0x00)</div><div class='ctx'> #define XCAN_FRAME_DLC_OFFSET(frame_base)	((frame_base) + 0x04)</div><div class='ctx'> #define XCAN_FRAME_DW1_OFFSET(frame_base)	((frame_base) + 0x08)</div><div class='ctx'> #define XCAN_FRAME_DW2_OFFSET(frame_base)	((frame_base) + 0x0C)</div><div class='add'>+#define XCANFD_FRAME_DW_OFFSET(frame_base)	((frame_base) + 0x08)</div><div class='ctx'> </div><div class='ctx'> #define XCAN_CANFD_FRAME_SIZE		0x48</div><div class='ctx'> #define XCAN_TXMSG_FRAME_OFFSET(n)	(XCAN_TXMSG_BASE_OFFSET + \</div><div class='hunk'>@@ -80,6 +98,8 @@ enum xcan_reg {</div><div class='ctx'> #define XCAN_MSR_LBACK_MASK		0x00000002 /* Loop back mode select */</div><div class='ctx'> #define XCAN_MSR_SLEEP_MASK		0x00000001 /* Sleep mode select */</div><div class='ctx'> #define XCAN_BRPR_BRP_MASK		0x000000FF /* Baud rate prescaler */</div><div class='add'>+#define XCAN_BRPR_TDCO_MASK		GENMASK(12, 8)  /* TDCO */</div><div class='add'>+#define XCAN_2_BRPR_TDCO_MASK		GENMASK(13, 8)  /* TDCO for CANFD 2.0 */</div><div class='ctx'> #define XCAN_BTR_SJW_MASK		0x00000180 /* Synchronous jump width */</div><div class='ctx'> #define XCAN_BTR_TS2_MASK		0x00000070 /* Time segment 2 */</div><div class='ctx'> #define XCAN_BTR_TS1_MASK		0x0000000F /* Time segment 1 */</div><div class='hunk'>@@ -93,6 +113,7 @@ enum xcan_reg {</div><div class='ctx'> #define XCAN_ESR_STER_MASK		0x00000004 /* Stuff error */</div><div class='ctx'> #define XCAN_ESR_FMER_MASK		0x00000002 /* Form error */</div><div class='ctx'> #define XCAN_ESR_CRCER_MASK		0x00000001 /* CRC error */</div><div class='add'>+#define XCAN_SR_TDCV_MASK		GENMASK(22, 16) /* TDCV Value */</div><div class='ctx'> #define XCAN_SR_TXFLL_MASK		0x00000400 /* TX FIFO is full */</div><div class='ctx'> #define XCAN_SR_ESTAT_MASK		0x00000180 /* Error status */</div><div class='ctx'> #define XCAN_SR_ERRWRN_MASK		0x00000040 /* Error warning */</div><div class='hunk'>@@ -111,6 +132,18 @@ enum xcan_reg {</div><div class='ctx'> #define XCAN_IXR_TXFLL_MASK		0x00000004 /* Tx FIFO Full intr */</div><div class='ctx'> #define XCAN_IXR_TXOK_MASK		0x00000002 /* TX successful intr */</div><div class='ctx'> #define XCAN_IXR_ARBLST_MASK		0x00000001 /* Arbitration lost intr */</div><div class='add'>+#define XCAN_IXR_E2BERX_MASK		BIT(23) /* RX FIFO two bit ECC error */</div><div class='add'>+#define XCAN_IXR_E1BERX_MASK		BIT(22) /* RX FIFO one bit ECC error */</div><div class='add'>+#define XCAN_IXR_E2BETXOL_MASK		BIT(21) /* TXOL FIFO two bit ECC error */</div><div class='add'>+#define XCAN_IXR_E1BETXOL_MASK		BIT(20) /* TXOL FIFO One bit ECC error */</div><div class='add'>+#define XCAN_IXR_E2BETXTL_MASK		BIT(19) /* TXTL FIFO Two bit ECC error */</div><div class='add'>+#define XCAN_IXR_E1BETXTL_MASK		BIT(18) /* TXTL FIFO One bit ECC error */</div><div class='add'>+#define XCAN_IXR_ECC_MASK		(XCAN_IXR_E2BERX_MASK | \</div><div class='add'>+					XCAN_IXR_E1BERX_MASK | \</div><div class='add'>+					XCAN_IXR_E2BETXOL_MASK | \</div><div class='add'>+					XCAN_IXR_E1BETXOL_MASK | \</div><div class='add'>+					XCAN_IXR_E2BETXTL_MASK | \</div><div class='add'>+					XCAN_IXR_E1BETXTL_MASK)</div><div class='ctx'> #define XCAN_IDR_ID1_MASK		0xFFE00000 /* Standard msg identifier */</div><div class='ctx'> #define XCAN_IDR_SRR_MASK		0x00100000 /* Substitute remote TXreq */</div><div class='ctx'> #define XCAN_IDR_IDE_MASK		0x00080000 /* Identifier extension */</div><div class='hunk'>@@ -118,10 +151,20 @@ enum xcan_reg {</div><div class='ctx'> #define XCAN_IDR_RTR_MASK		0x00000001 /* Remote TX request */</div><div class='ctx'> #define XCAN_DLCR_DLC_MASK		0xF0000000 /* Data length code */</div><div class='ctx'> #define XCAN_FSR_FL_MASK		0x00003F00 /* RX Fill Level */</div><div class='add'>+#define XCAN_2_FSR_FL_MASK		0x00007F00 /* RX Fill Level */</div><div class='ctx'> #define XCAN_FSR_IRI_MASK		0x00000080 /* RX Increment Read Index */</div><div class='ctx'> #define XCAN_FSR_RI_MASK		0x0000001F /* RX Read Index */</div><div class='add'>+#define XCAN_2_FSR_RI_MASK		0x0000003F /* RX Read Index */</div><div class='add'>+#define XCAN_DLCR_EDL_MASK		0x08000000 /* EDL Mask in DLC */</div><div class='add'>+#define XCAN_DLCR_BRS_MASK		0x04000000 /* BRS Mask in DLC */</div><div class='add'>+#define XCAN_ECC_CFG_REECRX_MASK	BIT(2) /* Reset RX FIFO ECC error counters */</div><div class='add'>+#define XCAN_ECC_CFG_REECTXOL_MASK	BIT(1) /* Reset TXOL FIFO ECC error counters */</div><div class='add'>+#define XCAN_ECC_CFG_REECTXTL_MASK	BIT(0) /* Reset TXTL FIFO ECC error counters */</div><div class='add'>+#define XCAN_ECC_1BIT_CNT_MASK		GENMASK(15, 0) /* FIFO ECC 1bit count mask */</div><div class='add'>+#define XCAN_ECC_2BIT_CNT_MASK		GENMASK(31, 16) /* FIFO ECC 2bit count mask */</div><div class='ctx'> </div><div class='ctx'> /* CAN register bit shift - XCAN_&lt;REG&gt;_&lt;BIT&gt;_SHIFT */</div><div class='add'>+#define XCAN_BRPR_TDC_ENABLE		BIT(16) /* Transmitter Delay Compensation (TDC) Enable */</div><div class='ctx'> #define XCAN_BTR_SJW_SHIFT		7  /* Synchronous jump width */</div><div class='ctx'> #define XCAN_BTR_TS2_SHIFT		4  /* Time segment 2 */</div><div class='ctx'> #define XCAN_BTR_SJW_SHIFT_CANFD	16 /* Synchronous jump width */</div><div class='hunk'>@@ -133,6 +176,7 @@ enum xcan_reg {</div><div class='ctx'> </div><div class='ctx'> /* CAN frame length constants */</div><div class='ctx'> #define XCAN_FRAME_MAX_DATA_LEN		8</div><div class='add'>+#define XCANFD_DW_BYTES			4</div><div class='ctx'> #define XCAN_TIMEOUT			(1 * HZ)</div><div class='ctx'> </div><div class='ctx'> /* TX-FIFO-empty interrupt available */</div><div class='hunk'>@@ -149,7 +193,15 @@ enum xcan_reg {</div><div class='ctx'> #define XCAN_FLAG_RX_FIFO_MULTI	0x0010</div><div class='ctx'> #define XCAN_FLAG_CANFD_2	0x0020</div><div class='ctx'> </div><div class='add'>+enum xcan_ip_type {</div><div class='add'>+	XAXI_CAN = 0,</div><div class='add'>+	XZYNQ_CANPS,</div><div class='add'>+	XAXI_CANFD,</div><div class='add'>+	XAXI_CANFD_2_0,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct xcan_devtype_data {</div><div class='add'>+	enum xcan_ip_type cantype;</div><div class='ctx'> 	unsigned int flags;</div><div class='ctx'> 	const struct can_bittiming_const *bittiming_const;</div><div class='ctx'> 	const char *bus_clk_name;</div><div class='hunk'>@@ -173,23 +225,43 @@ struct xcan_devtype_data {</div><div class='ctx'>  * @bus_clk:			Pointer to struct clk</div><div class='ctx'>  * @can_clk:			Pointer to struct clk</div><div class='ctx'>  * @devtype:			Device type specific constants</div><div class='add'>+ * @transceiver:		Optional pointer to associated CAN transceiver</div><div class='add'>+ * @rstc:			Pointer to reset control</div><div class='add'>+ * @ecc_enable:			ECC enable flag</div><div class='add'>+ * @syncp:			synchronization for ECC error stats</div><div class='add'>+ * @ecc_rx_2_bit_errors:	RXFIFO 2bit ECC count</div><div class='add'>+ * @ecc_rx_1_bit_errors:	RXFIFO 1bit ECC count</div><div class='add'>+ * @ecc_txol_2_bit_errors:	TXOLFIFO 2bit ECC count</div><div class='add'>+ * @ecc_txol_1_bit_errors:	TXOLFIFO 1bit ECC count</div><div class='add'>+ * @ecc_txtl_2_bit_errors:	TXTLFIFO 2bit ECC count</div><div class='add'>+ * @ecc_txtl_1_bit_errors:	TXTLFIFO 1bit ECC count</div><div class='ctx'>  */</div><div class='ctx'> struct xcan_priv {</div><div class='ctx'> 	struct can_priv can;</div><div class='del'>-	spinlock_t tx_lock;</div><div class='add'>+	spinlock_t tx_lock; /* Lock for synchronizing TX interrupt handling */</div><div class='ctx'> 	unsigned int tx_head;</div><div class='ctx'> 	unsigned int tx_tail;</div><div class='ctx'> 	unsigned int tx_max;</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> 	u32 (*read_reg)(const struct xcan_priv *priv, enum xcan_reg reg);</div><div class='ctx'> 	void (*write_reg)(const struct xcan_priv *priv, enum xcan_reg reg,</div><div class='del'>-			u32 val);</div><div class='add'>+			  u32 val);</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	void __iomem *reg_base;</div><div class='ctx'> 	unsigned long irq_flags;</div><div class='ctx'> 	struct clk *bus_clk;</div><div class='ctx'> 	struct clk *can_clk;</div><div class='ctx'> 	struct xcan_devtype_data devtype;</div><div class='add'>+	struct phy *transceiver;</div><div class='add'>+	struct reset_control *rstc;</div><div class='add'>+	bool ecc_enable;</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+	u64_stats_t ecc_rx_2_bit_errors;</div><div class='add'>+	u64_stats_t ecc_rx_1_bit_errors;</div><div class='add'>+	u64_stats_t ecc_txol_2_bit_errors;</div><div class='add'>+	u64_stats_t ecc_txol_1_bit_errors;</div><div class='add'>+	u64_stats_t ecc_txtl_2_bit_errors;</div><div class='add'>+	u64_stats_t ecc_txtl_1_bit_errors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CAN Bittiming constants as per Xilinx CAN specs */</div><div class='hunk'>@@ -205,6 +277,7 @@ static const struct can_bittiming_const xcan_bittiming_const = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* AXI CANFD Arbitration Bittiming constants as per AXI CANFD 1.0 spec */</div><div class='ctx'> static const struct can_bittiming_const xcan_bittiming_const_canfd = {</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.tseg1_min = 1,</div><div class='hunk'>@@ -217,6 +290,20 @@ static const struct can_bittiming_const xcan_bittiming_const_canfd = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* AXI CANFD Data Bittiming constants as per AXI CANFD 1.0 specs */</div><div class='add'>+static const struct can_bittiming_const xcan_data_bittiming_const_canfd = {</div><div class='add'>+	.name = DRIVER_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 16,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 8,</div><div class='add'>+	.sjw_max = 8,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 256,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* AXI CANFD 2.0 Arbitration Bittiming constants as per AXI CANFD 2.0 spec */</div><div class='ctx'> static const struct can_bittiming_const xcan_bittiming_const_canfd2 = {</div><div class='ctx'> 	.name = DRIVER_NAME,</div><div class='ctx'> 	.tseg1_min = 1,</div><div class='hunk'>@@ -229,6 +316,57 @@ static const struct can_bittiming_const xcan_bittiming_const_canfd2 = {</div><div class='ctx'> 	.brp_inc = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* AXI CANFD 2.0 Data Bittiming constants as per AXI CANFD 2.0 spec */</div><div class='add'>+static const struct can_bittiming_const xcan_data_bittiming_const_canfd2 = {</div><div class='add'>+	.name = DRIVER_NAME,</div><div class='add'>+	.tseg1_min = 1,</div><div class='add'>+	.tseg1_max = 32,</div><div class='add'>+	.tseg2_min = 1,</div><div class='add'>+	.tseg2_max = 16,</div><div class='add'>+	.sjw_max = 16,</div><div class='add'>+	.brp_min = 1,</div><div class='add'>+	.brp_max = 256,</div><div class='add'>+	.brp_inc = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Transmission Delay Compensation constants for CANFD 1.0 */</div><div class='add'>+static const struct can_tdc_const xcan_tdc_const_canfd = {</div><div class='add'>+	.tdcv_min = 0,</div><div class='add'>+	.tdcv_max = 0, /* Manual mode not supported. */</div><div class='add'>+	.tdco_min = 0,</div><div class='add'>+	.tdco_max = 32,</div><div class='add'>+	.tdcf_min = 0, /* Filter window not supported */</div><div class='add'>+	.tdcf_max = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Transmission Delay Compensation constants for CANFD 2.0 */</div><div class='add'>+static const struct can_tdc_const xcan_tdc_const_canfd2 = {</div><div class='add'>+	.tdcv_min = 0,</div><div class='add'>+	.tdcv_max = 0, /* Manual mode not supported. */</div><div class='add'>+	.tdco_min = 0,</div><div class='add'>+	.tdco_max = 64,</div><div class='add'>+	.tdcf_min = 0, /* Filter window not supported */</div><div class='add'>+	.tdcf_max = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum xcan_stats_type {</div><div class='add'>+	XCAN_ECC_RX_2_BIT_ERRORS,</div><div class='add'>+	XCAN_ECC_RX_1_BIT_ERRORS,</div><div class='add'>+	XCAN_ECC_TXOL_2_BIT_ERRORS,</div><div class='add'>+	XCAN_ECC_TXOL_1_BIT_ERRORS,</div><div class='add'>+	XCAN_ECC_TXTL_2_BIT_ERRORS,</div><div class='add'>+	XCAN_ECC_TXTL_1_BIT_ERRORS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char xcan_priv_flags_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[XCAN_ECC_RX_2_BIT_ERRORS] = "ecc_rx_2_bit_errors",</div><div class='add'>+	[XCAN_ECC_RX_1_BIT_ERRORS] = "ecc_rx_1_bit_errors",</div><div class='add'>+	[XCAN_ECC_TXOL_2_BIT_ERRORS] = "ecc_txol_2_bit_errors",</div><div class='add'>+	[XCAN_ECC_TXOL_1_BIT_ERRORS] = "ecc_txol_1_bit_errors",</div><div class='add'>+	[XCAN_ECC_TXTL_2_BIT_ERRORS] = "ecc_txtl_2_bit_errors",</div><div class='add'>+	[XCAN_ECC_TXTL_1_BIT_ERRORS] = "ecc_txtl_1_bit_errors",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * xcan_write_reg_le - Write a value to the device register little endian</div><div class='ctx'>  * @priv:	Driver private data structure</div><div class='hunk'>@@ -238,7 +376,7 @@ static const struct can_bittiming_const xcan_bittiming_const_canfd2 = {</div><div class='ctx'>  * Write data to the paricular CAN register</div><div class='ctx'>  */</div><div class='ctx'> static void xcan_write_reg_le(const struct xcan_priv *priv, enum xcan_reg reg,</div><div class='del'>-			u32 val)</div><div class='add'>+			      u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	iowrite32(val, priv-&gt;reg_base + reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -265,7 +403,7 @@ static u32 xcan_read_reg_le(const struct xcan_priv *priv, enum xcan_reg reg)</div><div class='ctx'>  * Write data to the paricular CAN register</div><div class='ctx'>  */</div><div class='ctx'> static void xcan_write_reg_be(const struct xcan_priv *priv, enum xcan_reg reg,</div><div class='del'>-			u32 val)</div><div class='add'>+			      u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	iowrite32be(val, priv-&gt;reg_base + reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -343,6 +481,7 @@ static int xcan_set_bittiming(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	struct can_bittiming *bt = &amp;priv-&gt;can.bittiming;</div><div class='add'>+	struct can_bittiming *dbt = &amp;priv-&gt;can.fd.data_bittiming;</div><div class='ctx'> 	u32 btr0, btr1;</div><div class='ctx'> 	u32 is_config_mode;</div><div class='ctx'> </div><div class='hunk'>@@ -353,11 +492,11 @@ static int xcan_set_bittiming(struct net_device *ndev)</div><div class='ctx'> 				XCAN_SR_CONFIG_MASK;</div><div class='ctx'> 	if (!is_config_mode) {</div><div class='ctx'> 		netdev_alert(ndev,</div><div class='del'>-		     "BUG! Cannot set bittiming - CAN is not in config mode\n");</div><div class='add'>+			     "BUG! Cannot set bittiming - CAN is not in config mode\n");</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Setting Baud Rate prescalar value in BRPR Register */</div><div class='add'>+	/* Setting Baud Rate prescaler value in BRPR Register */</div><div class='ctx'> 	btr0 = (bt-&gt;brp - 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Setting Time Segment 1 in BTR Register */</div><div class='hunk'>@@ -372,9 +511,35 @@ static int xcan_set_bittiming(struct net_device *ndev)</div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_BRPR_OFFSET, btr0);</div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_BTR_OFFSET, btr1);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;devtype.cantype == XAXI_CANFD ||</div><div class='add'>+	    priv-&gt;devtype.cantype == XAXI_CANFD_2_0) {</div><div class='add'>+		/* Setting Baud Rate prescaler value in F_BRPR Register */</div><div class='add'>+		btr0 = dbt-&gt;brp - 1;</div><div class='add'>+		if (can_fd_tdc_is_enabled(&amp;priv-&gt;can)) {</div><div class='add'>+			if (priv-&gt;devtype.cantype == XAXI_CANFD)</div><div class='add'>+				btr0 |= FIELD_PREP(XCAN_BRPR_TDCO_MASK, priv-&gt;can.fd.tdc.tdco) |</div><div class='add'>+					XCAN_BRPR_TDC_ENABLE;</div><div class='add'>+			else</div><div class='add'>+				btr0 |= FIELD_PREP(XCAN_2_BRPR_TDCO_MASK, priv-&gt;can.fd.tdc.tdco) |</div><div class='add'>+					XCAN_BRPR_TDC_ENABLE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Setting Time Segment 1 in BTR Register */</div><div class='add'>+		btr1 = dbt-&gt;prop_seg + dbt-&gt;phase_seg1 - 1;</div><div class='add'>+</div><div class='add'>+		/* Setting Time Segment 2 in BTR Register */</div><div class='add'>+		btr1 |= (dbt-&gt;phase_seg2 - 1) &lt;&lt; priv-&gt;devtype.btr_ts2_shift;</div><div class='add'>+</div><div class='add'>+		/* Setting Synchronous jump width in BTR Register */</div><div class='add'>+		btr1 |= (dbt-&gt;sjw - 1) &lt;&lt; priv-&gt;devtype.btr_sjw_shift;</div><div class='add'>+</div><div class='add'>+		priv-&gt;write_reg(priv, XCAN_F_BRPR_OFFSET, btr0);</div><div class='add'>+		priv-&gt;write_reg(priv, XCAN_F_BTR_OFFSET, btr1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	netdev_dbg(ndev, "BRPR=0x%08x, BTR=0x%08x\n",</div><div class='del'>-			priv-&gt;read_reg(priv, XCAN_BRPR_OFFSET),</div><div class='del'>-			priv-&gt;read_reg(priv, XCAN_BTR_OFFSET));</div><div class='add'>+		   priv-&gt;read_reg(priv, XCAN_BRPR_OFFSET),</div><div class='add'>+		   priv-&gt;read_reg(priv, XCAN_BTR_OFFSET));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -392,9 +557,8 @@ static int xcan_set_bittiming(struct net_device *ndev)</div><div class='ctx'> static int xcan_chip_start(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='del'>-	u32 reg_msr, reg_sr_mask;</div><div class='add'>+	u32 reg_msr;</div><div class='ctx'> 	int err;</div><div class='del'>-	unsigned long timeout;</div><div class='ctx'> 	u32 ier;</div><div class='ctx'> </div><div class='ctx'> 	/* Check if it is in reset mode */</div><div class='hunk'>@@ -406,25 +570,31 @@ static int xcan_chip_start(struct net_device *ndev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* Enable interrupts */</div><div class='add'>+	/* Enable interrupts</div><div class='add'>+	 *</div><div class='add'>+	 * We enable the ERROR interrupt even with</div><div class='add'>+	 * CAN_CTRLMODE_BERR_REPORTING disabled as there is no</div><div class='add'>+	 * dedicated interrupt for a state change to</div><div class='add'>+	 * ERROR_WARNING/ERROR_PASSIVE.</div><div class='add'>+	 */</div><div class='ctx'> 	ier = XCAN_IXR_TXOK_MASK | XCAN_IXR_BSOFF_MASK |</div><div class='ctx'> 		XCAN_IXR_WKUP_MASK | XCAN_IXR_SLP_MASK |</div><div class='ctx'> 		XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK |</div><div class='ctx'> 		XCAN_IXR_ARBLST_MASK | xcan_rx_int_mask(priv);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;ecc_enable)</div><div class='add'>+		ier |= XCAN_IXR_ECC_MASK;</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;devtype.flags &amp; XCAN_FLAG_RXMNF)</div><div class='ctx'> 		ier |= XCAN_IXR_RXMNF_MASK;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_IER_OFFSET, ier);</div><div class='ctx'> </div><div class='ctx'> 	/* Check whether it is loopback mode or normal mode  */</div><div class='del'>-	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK) {</div><div class='add'>+	if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_LOOPBACK)</div><div class='ctx'> 		reg_msr = XCAN_MSR_LBACK_MASK;</div><div class='del'>-		reg_sr_mask = XCAN_SR_LBACK_MASK;</div><div class='del'>-	} else {</div><div class='add'>+	else</div><div class='ctx'> 		reg_msr = 0x0;</div><div class='del'>-		reg_sr_mask = XCAN_SR_NORMAL_MASK;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* enable the first extended filter, if any, as cores with extended</div><div class='ctx'> 	 * filtering default to non-receipt if all filters are disabled</div><div class='hunk'>@@ -435,16 +605,8 @@ static int xcan_chip_start(struct net_device *ndev)</div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_MSR_OFFSET, reg_msr);</div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_SRR_OFFSET, XCAN_SRR_CEN_MASK);</div><div class='ctx'> </div><div class='del'>-	timeout = jiffies + XCAN_TIMEOUT;</div><div class='del'>-	while (!(priv-&gt;read_reg(priv, XCAN_SR_OFFSET) &amp; reg_sr_mask)) {</div><div class='del'>-		if (time_after(jiffies, timeout)) {</div><div class='del'>-			netdev_warn(ndev,</div><div class='del'>-				"timed out for correct mode\n");</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	netdev_dbg(ndev, "status:#x%08x\n",</div><div class='del'>-			priv-&gt;read_reg(priv, XCAN_SR_OFFSET));</div><div class='add'>+		   priv-&gt;read_reg(priv, XCAN_SR_OFFSET));</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_ERROR_ACTIVE;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -455,8 +617,7 @@ static int xcan_chip_start(struct net_device *ndev)</div><div class='ctx'>  * @ndev:	Pointer to net_device structure</div><div class='ctx'>  * @mode:	Tells the mode of the driver</div><div class='ctx'>  *</div><div class='del'>- * This check the drivers state and calls the</div><div class='del'>- * the corresponding modes to set.</div><div class='add'>+ * This check the drivers state and calls the corresponding modes to set.</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success and failure value on error</div><div class='ctx'>  */</div><div class='hunk'>@@ -483,14 +644,17 @@ static int xcan_do_set_mode(struct net_device *ndev, enum can_mode mode)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * xcan_write_frame - Write a frame to HW</div><div class='add'>+ * @ndev:		Pointer to net_device structure</div><div class='ctx'>  * @skb:		sk_buff pointer that contains data to be Txed</div><div class='ctx'>  * @frame_offset:	Register offset to write the frame to</div><div class='ctx'>  */</div><div class='del'>-static void xcan_write_frame(struct xcan_priv *priv, struct sk_buff *skb,</div><div class='add'>+static void xcan_write_frame(struct net_device *ndev, struct sk_buff *skb,</div><div class='ctx'> 			     int frame_offset)</div><div class='ctx'> {</div><div class='ctx'> 	u32 id, dlc, data[2] = {0, 0};</div><div class='del'>-	struct can_frame *cf = (struct can_frame *)skb-&gt;data;</div><div class='add'>+	struct canfd_frame *cf = (struct canfd_frame *)skb-&gt;data;</div><div class='add'>+	u32 ramoff, dwindex = 0, i;</div><div class='add'>+	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* Watch carefully on the bit sequence */</div><div class='ctx'> 	if (cf-&gt;can_id &amp; CAN_EFF_FLAG) {</div><div class='hunk'>@@ -498,7 +662,7 @@ static void xcan_write_frame(struct xcan_priv *priv, struct sk_buff *skb,</div><div class='ctx'> 		id = ((cf-&gt;can_id &amp; CAN_EFF_MASK) &lt;&lt; XCAN_IDR_ID2_SHIFT) &amp;</div><div class='ctx'> 			XCAN_IDR_ID2_MASK;</div><div class='ctx'> 		id |= (((cf-&gt;can_id &amp; CAN_EFF_MASK) &gt;&gt;</div><div class='del'>-			(CAN_EFF_ID_BITS-CAN_SFF_ID_BITS)) &lt;&lt;</div><div class='add'>+			(CAN_EFF_ID_BITS - CAN_SFF_ID_BITS)) &lt;&lt;</div><div class='ctx'> 			XCAN_IDR_ID1_SHIFT) &amp; XCAN_IDR_ID1_MASK;</div><div class='ctx'> </div><div class='ctx'> 		/* The substibute remote TX request bit should be "1"</div><div class='hunk'>@@ -519,31 +683,59 @@ static void xcan_write_frame(struct xcan_priv *priv, struct sk_buff *skb,</div><div class='ctx'> 			id |= XCAN_IDR_SRR_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dlc = cf-&gt;can_dlc &lt;&lt; XCAN_DLCR_DLC_SHIFT;</div><div class='del'>-</div><div class='del'>-	if (cf-&gt;can_dlc &gt; 0)</div><div class='del'>-		data[0] = be32_to_cpup((__be32 *)(cf-&gt;data + 0));</div><div class='del'>-	if (cf-&gt;can_dlc &gt; 4)</div><div class='del'>-		data[1] = be32_to_cpup((__be32 *)(cf-&gt;data + 4));</div><div class='add'>+	dlc = can_fd_len2dlc(cf-&gt;len) &lt;&lt; XCAN_DLCR_DLC_SHIFT;</div><div class='add'>+	if (can_is_canfd_skb(skb)) {</div><div class='add'>+		if (cf-&gt;flags &amp; CANFD_BRS)</div><div class='add'>+			dlc |= XCAN_DLCR_BRS_MASK;</div><div class='add'>+		dlc |= XCAN_DLCR_EDL_MASK;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_FRAME_ID_OFFSET(frame_offset), id);</div><div class='ctx'> 	/* If the CAN frame is RTR frame this write triggers transmission</div><div class='ctx'> 	 * (not on CAN FD)</div><div class='ctx'> 	 */</div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_FRAME_DLC_OFFSET(frame_offset), dlc);</div><div class='del'>-	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='del'>-		priv-&gt;write_reg(priv, XCAN_FRAME_DW1_OFFSET(frame_offset),</div><div class='del'>-				data[0]);</div><div class='del'>-		/* If the CAN frame is Standard/Extended frame this</div><div class='del'>-		 * write triggers transmission (not on CAN FD)</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;write_reg(priv, XCAN_FRAME_DW2_OFFSET(frame_offset),</div><div class='del'>-				data[1]);</div><div class='add'>+	if (priv-&gt;devtype.cantype == XAXI_CANFD ||</div><div class='add'>+	    priv-&gt;devtype.cantype == XAXI_CANFD_2_0) {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i += 4) {</div><div class='add'>+			ramoff = XCANFD_FRAME_DW_OFFSET(frame_offset) +</div><div class='add'>+					(dwindex * XCANFD_DW_BYTES);</div><div class='add'>+			priv-&gt;write_reg(priv, ramoff,</div><div class='add'>+					be32_to_cpup((__be32 *)(cf-&gt;data + i)));</div><div class='add'>+			dwindex++;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (cf-&gt;len &gt; 0)</div><div class='add'>+			data[0] = be32_to_cpup((__be32 *)(cf-&gt;data + 0));</div><div class='add'>+		if (cf-&gt;len &gt; 4)</div><div class='add'>+			data[1] = be32_to_cpup((__be32 *)(cf-&gt;data + 4));</div><div class='add'>+</div><div class='add'>+		if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='add'>+			priv-&gt;write_reg(priv,</div><div class='add'>+					XCAN_FRAME_DW1_OFFSET(frame_offset),</div><div class='add'>+					data[0]);</div><div class='add'>+			/* If the CAN frame is Standard/Extended frame this</div><div class='add'>+			 * write triggers transmission (not on CAN FD)</div><div class='add'>+			 */</div><div class='add'>+			priv-&gt;write_reg(priv,</div><div class='add'>+					XCAN_FRAME_DW2_OFFSET(frame_offset),</div><div class='add'>+					data[1]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;devtype.flags &amp; XCAN_FLAG_TX_MAILBOXES) &amp;&amp;</div><div class='add'>+	    (priv-&gt;devtype.flags &amp; XCAN_FLAG_TXFEMP))</div><div class='add'>+		can_put_echo_skb(skb, ndev, priv-&gt;tx_head % priv-&gt;tx_max, 0);</div><div class='add'>+	else</div><div class='add'>+		can_put_echo_skb(skb, ndev, 0, 0);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_head++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * xcan_start_xmit_fifo - Starts the transmission (FIFO mode)</div><div class='add'>+ * @skb:	sk_buff pointer that contains data to be Txed</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success, -ENOSPC if FIFO is full.</div><div class='ctx'>  */</div><div class='hunk'>@@ -557,13 +749,9 @@ static int xcan_start_xmit_fifo(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 			XCAN_SR_TXFLL_MASK))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, ndev, priv-&gt;tx_head % priv-&gt;tx_max);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_head++;</div><div class='del'>-</div><div class='del'>-	xcan_write_frame(priv, skb, XCAN_TXFIFO_OFFSET);</div><div class='add'>+	xcan_write_frame(ndev, skb, XCAN_TXFIFO_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear TX-FIFO-empty interrupt for xcan_tx_interrupt() */</div><div class='ctx'> 	if (priv-&gt;tx_max &gt; 1)</div><div class='hunk'>@@ -580,6 +768,8 @@ static int xcan_start_xmit_fifo(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * xcan_start_xmit_mailbox - Starts the transmission (mailbox mode)</div><div class='add'>+ * @skb:	sk_buff pointer that contains data to be Txed</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='ctx'>  *</div><div class='ctx'>  * Return: 0 on success, -ENOSPC if there is no space</div><div class='ctx'>  */</div><div class='hunk'>@@ -592,13 +782,9 @@ static int xcan_start_xmit_mailbox(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		     BIT(XCAN_TX_MAILBOX_IDX)))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='del'>-	can_put_echo_skb(skb, ndev, 0);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_head++;</div><div class='del'>-</div><div class='del'>-	xcan_write_frame(priv, skb,</div><div class='add'>+	xcan_write_frame(ndev, skb,</div><div class='ctx'> 			 XCAN_TXMSG_FRAME_OFFSET(XCAN_TX_MAILBOX_IDX));</div><div class='ctx'> </div><div class='ctx'> 	/* Mark buffer as ready for transmit */</div><div class='hunk'>@@ -625,7 +811,7 @@ static netdev_tx_t xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (can_dropped_invalid_skb(ndev, skb))</div><div class='add'>+	if (can_dev_dropped_skb(ndev, skb))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;devtype.flags &amp; XCAN_FLAG_TX_MAILBOXES)</div><div class='hunk'>@@ -673,7 +859,7 @@ static int xcan_rx(struct net_device *ndev, int frame_base)</div><div class='ctx'> 				   XCAN_DLCR_DLC_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	/* Change Xilinx CAN data length format to socketCAN data format */</div><div class='del'>-	cf-&gt;can_dlc = get_can_dlc(dlc);</div><div class='add'>+	cf-&gt;len = can_cc_dlc2len(dlc);</div><div class='ctx'> </div><div class='ctx'> 	/* Change Xilinx CAN ID format to socketCAN ID format */</div><div class='ctx'> 	if (id_xcan &amp; XCAN_IDR_IDE_MASK) {</div><div class='hunk'>@@ -698,14 +884,100 @@ static int xcan_rx(struct net_device *ndev, int frame_base)</div><div class='ctx'> </div><div class='ctx'> 	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG)) {</div><div class='ctx'> 		/* Change Xilinx CAN data format to socketCAN data format */</div><div class='del'>-		if (cf-&gt;can_dlc &gt; 0)</div><div class='add'>+		if (cf-&gt;len &gt; 0)</div><div class='ctx'> 			*(__be32 *)(cf-&gt;data) = cpu_to_be32(data[0]);</div><div class='del'>-		if (cf-&gt;can_dlc &gt; 4)</div><div class='add'>+		if (cf-&gt;len &gt; 4)</div><div class='ctx'> 			*(__be32 *)(cf-&gt;data + 4) = cpu_to_be32(data[1]);</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='add'>+	}</div><div class='add'>+	stats-&gt;rx_packets++;</div><div class='add'>+</div><div class='add'>+	netif_receive_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * xcanfd_rx -  Is called from CAN isr to complete the received</div><div class='add'>+ *		frame  processing</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ * @frame_base:	Register offset to the frame to be read</div><div class='add'>+ *</div><div class='add'>+ * This function is invoked from the CAN isr(poll) to process the Rx frames. It</div><div class='add'>+ * does minimal processing and invokes "netif_receive_skb" to complete further</div><div class='add'>+ * processing.</div><div class='add'>+ * Return: 1 on success and 0 on failure.</div><div class='add'>+ */</div><div class='add'>+static int xcanfd_rx(struct net_device *ndev, int frame_base)</div><div class='add'>+{</div><div class='add'>+	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct canfd_frame *cf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u32 id_xcan, dlc, data[2] = {0, 0}, dwindex = 0, i, dw_offset;</div><div class='add'>+</div><div class='add'>+	id_xcan = priv-&gt;read_reg(priv, XCAN_FRAME_ID_OFFSET(frame_base));</div><div class='add'>+	dlc = priv-&gt;read_reg(priv, XCAN_FRAME_DLC_OFFSET(frame_base));</div><div class='add'>+	if (dlc &amp; XCAN_DLCR_EDL_MASK)</div><div class='add'>+		skb = alloc_canfd_skb(ndev, &amp;cf);</div><div class='add'>+	else</div><div class='add'>+		skb = alloc_can_skb(ndev, (struct can_frame **)&amp;cf);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		stats-&gt;rx_dropped++;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Change Xilinx CANFD data length format to socketCAN data</div><div class='add'>+	 * format</div><div class='add'>+	 */</div><div class='add'>+	if (dlc &amp; XCAN_DLCR_EDL_MASK)</div><div class='add'>+		cf-&gt;len = can_fd_dlc2len((dlc &amp; XCAN_DLCR_DLC_MASK) &gt;&gt;</div><div class='add'>+				  XCAN_DLCR_DLC_SHIFT);</div><div class='add'>+	else</div><div class='add'>+		cf-&gt;len = can_cc_dlc2len((dlc &amp; XCAN_DLCR_DLC_MASK) &gt;&gt;</div><div class='add'>+					  XCAN_DLCR_DLC_SHIFT);</div><div class='add'>+</div><div class='add'>+	/* Change Xilinx CAN ID format to socketCAN ID format */</div><div class='add'>+	if (id_xcan &amp; XCAN_IDR_IDE_MASK) {</div><div class='add'>+		/* The received frame is an Extended format frame */</div><div class='add'>+		cf-&gt;can_id = (id_xcan &amp; XCAN_IDR_ID1_MASK) &gt;&gt; 3;</div><div class='add'>+		cf-&gt;can_id |= (id_xcan &amp; XCAN_IDR_ID2_MASK) &gt;&gt;</div><div class='add'>+				XCAN_IDR_ID2_SHIFT;</div><div class='add'>+		cf-&gt;can_id |= CAN_EFF_FLAG;</div><div class='add'>+		if (id_xcan &amp; XCAN_IDR_RTR_MASK)</div><div class='add'>+			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	} else {</div><div class='add'>+		/* The received frame is a standard format frame */</div><div class='add'>+		cf-&gt;can_id = (id_xcan &amp; XCAN_IDR_ID1_MASK) &gt;&gt;</div><div class='add'>+				XCAN_IDR_ID1_SHIFT;</div><div class='add'>+		if (!(dlc &amp; XCAN_DLCR_EDL_MASK) &amp;&amp; (id_xcan &amp;</div><div class='add'>+					XCAN_IDR_SRR_MASK))</div><div class='add'>+			cf-&gt;can_id |= CAN_RTR_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check the frame received is FD or not*/</div><div class='add'>+	if (dlc &amp; XCAN_DLCR_EDL_MASK) {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i += 4) {</div><div class='add'>+			dw_offset = XCANFD_FRAME_DW_OFFSET(frame_base) +</div><div class='add'>+					(dwindex * XCANFD_DW_BYTES);</div><div class='add'>+			data[0] = priv-&gt;read_reg(priv, dw_offset);</div><div class='add'>+			*(__be32 *)(cf-&gt;data + i) = cpu_to_be32(data[0]);</div><div class='add'>+			dwindex++;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; cf-&gt;len; i += 4) {</div><div class='add'>+			dw_offset = XCANFD_FRAME_DW_OFFSET(frame_base);</div><div class='add'>+			data[0] = priv-&gt;read_reg(priv, dw_offset + i);</div><div class='add'>+			*(__be32 *)(cf-&gt;data + i) = cpu_to_be32(data[0]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+	if (!(cf-&gt;can_id &amp; CAN_RTR_FLAG))</div><div class='add'>+		stats-&gt;rx_bytes += cf-&gt;len;</div><div class='ctx'> 	stats-&gt;rx_packets++;</div><div class='add'>+</div><div class='ctx'> 	netif_receive_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return 1;</div><div class='hunk'>@@ -762,6 +1034,7 @@ static void xcan_set_error_state(struct net_device *ndev,</div><div class='ctx'> 	can_change_state(ndev, cf, tx_state, rx_state);</div><div class='ctx'> </div><div class='ctx'> 	if (cf) {</div><div class='add'>+		cf-&gt;can_id |= CAN_ERR_CNT;</div><div class='ctx'> 		cf-&gt;data[6] = txerr;</div><div class='ctx'> 		cf-&gt;data[7] = rxerr;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -798,13 +1071,8 @@ static void xcan_update_error_state_after_rxtx(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 		xcan_set_error_state(ndev, new_state, skb ? cf : NULL);</div><div class='ctx'> </div><div class='del'>-		if (skb) {</div><div class='del'>-			struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='del'>-</div><div class='del'>-			stats-&gt;rx_packets++;</div><div class='del'>-			stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='add'>+		if (skb)</div><div class='ctx'> 			netif_rx(skb);</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -814,19 +1082,16 @@ static void xcan_update_error_state_after_rxtx(struct net_device *ndev)</div><div class='ctx'>  * @isr:	interrupt status register value</div><div class='ctx'>  *</div><div class='ctx'>  * This is the CAN error interrupt and it will</div><div class='del'>- * check the the type of error and forward the error</div><div class='add'>+ * check the type of error and forward the error</div><div class='ctx'>  * frame to upper layers.</div><div class='ctx'>  */</div><div class='ctx'> static void xcan_err_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> {</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='del'>-	struct can_frame *cf;</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	struct can_frame cf = { };</div><div class='ctx'> 	u32 err_status;</div><div class='ctx'> </div><div class='del'>-	skb = alloc_can_err_skb(ndev, &amp;cf);</div><div class='del'>-</div><div class='ctx'> 	err_status = priv-&gt;read_reg(priv, XCAN_ESR_OFFSET);</div><div class='ctx'> 	priv-&gt;write_reg(priv, XCAN_ESR_OFFSET, err_status);</div><div class='ctx'> </div><div class='hunk'>@@ -836,32 +1101,27 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> 		/* Leave device in Config Mode in bus-off state */</div><div class='ctx'> 		priv-&gt;write_reg(priv, XCAN_SRR_OFFSET, XCAN_SRR_RESET_MASK);</div><div class='ctx'> 		can_bus_off(ndev);</div><div class='del'>-		if (skb)</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_BUSOFF;</div><div class='add'>+		cf.can_id |= CAN_ERR_BUSOFF;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		enum can_state new_state = xcan_current_error_state(ndev);</div><div class='ctx'> </div><div class='ctx'> 		if (new_state != priv-&gt;can.state)</div><div class='del'>-			xcan_set_error_state(ndev, new_state, skb ? cf : NULL);</div><div class='add'>+			xcan_set_error_state(ndev, new_state, &amp;cf);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for Arbitration lost interrupt */</div><div class='ctx'> 	if (isr &amp; XCAN_IXR_ARBLST_MASK) {</div><div class='ctx'> 		priv-&gt;can.can_stats.arbitration_lost++;</div><div class='del'>-		if (skb) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_LOSTARB;</div><div class='del'>-			cf-&gt;data[0] = CAN_ERR_LOSTARB_UNSPEC;</div><div class='del'>-		}</div><div class='add'>+		cf.can_id |= CAN_ERR_LOSTARB;</div><div class='add'>+		cf.data[0] = CAN_ERR_LOSTARB_UNSPEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for RX FIFO Overflow interrupt */</div><div class='ctx'> 	if (isr &amp; XCAN_IXR_RXOFLW_MASK) {</div><div class='ctx'> 		stats-&gt;rx_over_errors++;</div><div class='ctx'> 		stats-&gt;rx_errors++;</div><div class='del'>-		if (skb) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			cf-&gt;data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='del'>-		}</div><div class='add'>+		cf.can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf.data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for RX Match Not Finished interrupt */</div><div class='hunk'>@@ -869,72 +1129,127 @@ static void xcan_err_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> 		stats-&gt;rx_dropped++;</div><div class='ctx'> 		stats-&gt;rx_errors++;</div><div class='ctx'> 		netdev_err(ndev, "RX match not finished, frame discarded\n");</div><div class='del'>-		if (skb) {</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_CRTL;</div><div class='del'>-			cf-&gt;data[1] |= CAN_ERR_CRTL_UNSPEC;</div><div class='del'>-		}</div><div class='add'>+		cf.can_id |= CAN_ERR_CRTL;</div><div class='add'>+		cf.data[1] |= CAN_ERR_CRTL_UNSPEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check for error interrupt */</div><div class='ctx'> 	if (isr &amp; XCAN_IXR_ERROR_MASK) {</div><div class='del'>-		if (skb)</div><div class='del'>-			cf-&gt;can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+		bool berr_reporting = false;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;can.ctrlmode &amp; CAN_CTRLMODE_BERR_REPORTING) {</div><div class='add'>+			berr_reporting = true;</div><div class='add'>+			cf.can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check for Ack error interrupt */</div><div class='ctx'> 		if (err_status &amp; XCAN_ESR_ACKER_MASK) {</div><div class='ctx'> 			stats-&gt;tx_errors++;</div><div class='del'>-			if (skb) {</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_ACK;</div><div class='del'>-				cf-&gt;data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='add'>+			if (berr_reporting) {</div><div class='add'>+				cf.can_id |= CAN_ERR_ACK;</div><div class='add'>+				cf.data[3] = CAN_ERR_PROT_LOC_ACK;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check for Bit error interrupt */</div><div class='ctx'> 		if (err_status &amp; XCAN_ESR_BERR_MASK) {</div><div class='ctx'> 			stats-&gt;tx_errors++;</div><div class='del'>-			if (skb) {</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='del'>-				cf-&gt;data[2] = CAN_ERR_PROT_BIT;</div><div class='add'>+			if (berr_reporting) {</div><div class='add'>+				cf.can_id |= CAN_ERR_PROT;</div><div class='add'>+				cf.data[2] = CAN_ERR_PROT_BIT;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check for Stuff error interrupt */</div><div class='ctx'> 		if (err_status &amp; XCAN_ESR_STER_MASK) {</div><div class='ctx'> 			stats-&gt;rx_errors++;</div><div class='del'>-			if (skb) {</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='del'>-				cf-&gt;data[2] = CAN_ERR_PROT_STUFF;</div><div class='add'>+			if (berr_reporting) {</div><div class='add'>+				cf.can_id |= CAN_ERR_PROT;</div><div class='add'>+				cf.data[2] = CAN_ERR_PROT_STUFF;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check for Form error interrupt */</div><div class='ctx'> 		if (err_status &amp; XCAN_ESR_FMER_MASK) {</div><div class='ctx'> 			stats-&gt;rx_errors++;</div><div class='del'>-			if (skb) {</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='del'>-				cf-&gt;data[2] = CAN_ERR_PROT_FORM;</div><div class='add'>+			if (berr_reporting) {</div><div class='add'>+				cf.can_id |= CAN_ERR_PROT;</div><div class='add'>+				cf.data[2] = CAN_ERR_PROT_FORM;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Check for CRC error interrupt */</div><div class='ctx'> 		if (err_status &amp; XCAN_ESR_CRCER_MASK) {</div><div class='ctx'> 			stats-&gt;rx_errors++;</div><div class='del'>-			if (skb) {</div><div class='del'>-				cf-&gt;can_id |= CAN_ERR_PROT;</div><div class='del'>-				cf-&gt;data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='add'>+			if (berr_reporting) {</div><div class='add'>+				cf.can_id |= CAN_ERR_PROT;</div><div class='add'>+				cf.data[3] = CAN_ERR_PROT_LOC_CRC_SEQ;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-			priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+		priv-&gt;can.can_stats.bus_error++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ecc_enable &amp;&amp; isr &amp; XCAN_IXR_ECC_MASK) {</div><div class='add'>+		u32 reg_rx_ecc, reg_txol_ecc, reg_txtl_ecc;</div><div class='add'>+</div><div class='add'>+		reg_rx_ecc = priv-&gt;read_reg(priv, XCAN_RXFIFO_ECC_OFFSET);</div><div class='add'>+		reg_txol_ecc = priv-&gt;read_reg(priv, XCAN_TXOLFIFO_ECC_OFFSET);</div><div class='add'>+		reg_txtl_ecc = priv-&gt;read_reg(priv, XCAN_TXTLFIFO_ECC_OFFSET);</div><div class='add'>+</div><div class='add'>+		/* The counter reaches its maximum at 0xffff and does not overflow.</div><div class='add'>+		 * Accept the small race window between reading and resetting ECC counters.</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;write_reg(priv, XCAN_ECC_CFG_OFFSET, XCAN_ECC_CFG_REECRX_MASK |</div><div class='add'>+				XCAN_ECC_CFG_REECTXOL_MASK | XCAN_ECC_CFG_REECTXTL_MASK);</div><div class='add'>+</div><div class='add'>+		u64_stats_update_begin(&amp;priv-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		if (isr &amp; XCAN_IXR_E2BERX_MASK) {</div><div class='add'>+			u64_stats_add(&amp;priv-&gt;ecc_rx_2_bit_errors,</div><div class='add'>+				      FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_rx_ecc));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (isr &amp; XCAN_IXR_E1BERX_MASK) {</div><div class='add'>+			u64_stats_add(&amp;priv-&gt;ecc_rx_1_bit_errors,</div><div class='add'>+				      FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_rx_ecc));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (isr &amp; XCAN_IXR_E2BETXOL_MASK) {</div><div class='add'>+			u64_stats_add(&amp;priv-&gt;ecc_txol_2_bit_errors,</div><div class='add'>+				      FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_txol_ecc));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (isr &amp; XCAN_IXR_E1BETXOL_MASK) {</div><div class='add'>+			u64_stats_add(&amp;priv-&gt;ecc_txol_1_bit_errors,</div><div class='add'>+				      FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_txol_ecc));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (isr &amp; XCAN_IXR_E2BETXTL_MASK) {</div><div class='add'>+			u64_stats_add(&amp;priv-&gt;ecc_txtl_2_bit_errors,</div><div class='add'>+				      FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_txtl_ecc));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (isr &amp; XCAN_IXR_E1BETXTL_MASK) {</div><div class='add'>+			u64_stats_add(&amp;priv-&gt;ecc_txtl_1_bit_errors,</div><div class='add'>+				      FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_txtl_ecc));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		u64_stats_update_end(&amp;priv-&gt;syncp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb) {</div><div class='del'>-		stats-&gt;rx_packets++;</div><div class='del'>-		stats-&gt;rx_bytes += cf-&gt;can_dlc;</div><div class='del'>-		netif_rx(skb);</div><div class='add'>+	if (cf.can_id) {</div><div class='add'>+		struct can_frame *skb_cf;</div><div class='add'>+		struct sk_buff *skb = alloc_can_err_skb(ndev, &amp;skb_cf);</div><div class='add'>+</div><div class='add'>+		if (skb) {</div><div class='add'>+			skb_cf-&gt;can_id |= cf.can_id;</div><div class='add'>+			memcpy(skb_cf-&gt;data, cf.data, CAN_ERR_DLC);</div><div class='add'>+			netif_rx(skb);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(ndev, "%s: error status register:0x%x\n",</div><div class='del'>-			__func__, priv-&gt;read_reg(priv, XCAN_ESR_OFFSET));</div><div class='add'>+		   __func__, priv-&gt;read_reg(priv, XCAN_ESR_OFFSET));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -960,6 +1275,7 @@ static void xcan_state_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * xcan_rx_fifo_get_next_frame - Get register offset of next RX frame</div><div class='add'>+ * @priv:	Driver private data structure</div><div class='ctx'>  *</div><div class='ctx'>  * Return: Register offset of the next frame in RX FIFO.</div><div class='ctx'>  */</div><div class='hunk'>@@ -968,7 +1284,7 @@ static int xcan_rx_fifo_get_next_frame(struct xcan_priv *priv)</div><div class='ctx'> 	int offset;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;devtype.flags &amp; XCAN_FLAG_RX_FIFO_MULTI) {</div><div class='del'>-		u32 fsr;</div><div class='add'>+		u32 fsr, mask;</div><div class='ctx'> </div><div class='ctx'> 		/* clear RXOK before the is-empty check so that any newly</div><div class='ctx'> 		 * received frame will reassert it without a race</div><div class='hunk'>@@ -978,13 +1294,20 @@ static int xcan_rx_fifo_get_next_frame(struct xcan_priv *priv)</div><div class='ctx'> 		fsr = priv-&gt;read_reg(priv, XCAN_FSR_OFFSET);</div><div class='ctx'> </div><div class='ctx'> 		/* check if RX FIFO is empty */</div><div class='del'>-		if (!(fsr &amp; XCAN_FSR_FL_MASK))</div><div class='add'>+		if (priv-&gt;devtype.flags &amp; XCAN_FLAG_CANFD_2)</div><div class='add'>+			mask = XCAN_2_FSR_FL_MASK;</div><div class='add'>+		else</div><div class='add'>+			mask = XCAN_FSR_FL_MASK;</div><div class='add'>+</div><div class='add'>+		if (!(fsr &amp; mask))</div><div class='ctx'> 			return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;devtype.flags &amp; XCAN_FLAG_CANFD_2)</div><div class='del'>-			offset = XCAN_RXMSG_2_FRAME_OFFSET(fsr &amp; XCAN_FSR_RI_MASK);</div><div class='add'>+			offset =</div><div class='add'>+			  XCAN_RXMSG_2_FRAME_OFFSET(fsr &amp; XCAN_2_FSR_RI_MASK);</div><div class='ctx'> 		else</div><div class='del'>-			offset = XCAN_RXMSG_FRAME_OFFSET(fsr &amp; XCAN_FSR_RI_MASK);</div><div class='add'>+			offset =</div><div class='add'>+			  XCAN_RXMSG_FRAME_OFFSET(fsr &amp; XCAN_FSR_RI_MASK);</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* check if RX FIFO is empty */</div><div class='hunk'>@@ -1019,7 +1342,10 @@ static int xcan_rx_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> </div><div class='ctx'> 	while ((frame_offset = xcan_rx_fifo_get_next_frame(priv)) &gt;= 0 &amp;&amp;</div><div class='ctx'> 	       (work_done &lt; quota)) {</div><div class='del'>-		work_done += xcan_rx(ndev, frame_offset);</div><div class='add'>+		if (xcan_rx_int_mask(priv) &amp; XCAN_IXR_RXOK_MASK)</div><div class='add'>+			work_done += xcanfd_rx(ndev, frame_offset);</div><div class='add'>+		else</div><div class='add'>+			work_done += xcan_rx(ndev, frame_offset);</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;devtype.flags &amp; XCAN_FLAG_RX_FIFO_MULTI)</div><div class='ctx'> 			/* increment read index */</div><div class='hunk'>@@ -1033,16 +1359,15 @@ static int xcan_rx_poll(struct napi_struct *napi, int quota)</div><div class='ctx'> 					XCAN_IXR_RXNEMP_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (work_done) {</div><div class='del'>-		can_led_event(ndev, CAN_LED_EVENT_RX);</div><div class='add'>+	if (work_done)</div><div class='ctx'> 		xcan_update_error_state_after_rxtx(ndev);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (work_done &lt; quota) {</div><div class='del'>-		napi_complete_done(napi, work_done);</div><div class='del'>-		ier = priv-&gt;read_reg(priv, XCAN_IER_OFFSET);</div><div class='del'>-		ier |= xcan_rx_int_mask(priv);</div><div class='del'>-		priv-&gt;write_reg(priv, XCAN_IER_OFFSET, ier);</div><div class='add'>+		if (napi_complete_done(napi, work_done)) {</div><div class='add'>+			ier = priv-&gt;read_reg(priv, XCAN_IER_OFFSET);</div><div class='add'>+			ier |= xcan_rx_int_mask(priv);</div><div class='add'>+			priv-&gt;write_reg(priv, XCAN_IER_OFFSET, ier);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='hunk'>@@ -1094,8 +1419,10 @@ static void xcan_tx_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> 		 *     via TXFEMP handling as we read TXFEMP *after* TXOK</div><div class='ctx'> 		 *     clear to satisfy (1).</div><div class='ctx'> 		 */</div><div class='del'>-		while ((isr &amp; XCAN_IXR_TXOK_MASK) &amp;&amp; !WARN_ON(++retries == 100)) {</div><div class='del'>-			priv-&gt;write_reg(priv, XCAN_ICR_OFFSET, XCAN_IXR_TXOK_MASK);</div><div class='add'>+		while ((isr &amp; XCAN_IXR_TXOK_MASK) &amp;&amp;</div><div class='add'>+		       !WARN_ON(++retries == 100)) {</div><div class='add'>+			priv-&gt;write_reg(priv, XCAN_ICR_OFFSET,</div><div class='add'>+					XCAN_IXR_TXOK_MASK);</div><div class='ctx'> 			isr = priv-&gt;read_reg(priv, XCAN_ISR_OFFSET);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1110,7 +1437,7 @@ static void xcan_tx_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> </div><div class='ctx'> 	while (frames_sent--) {</div><div class='ctx'> 		stats-&gt;tx_bytes += can_get_echo_skb(ndev, priv-&gt;tx_tail %</div><div class='del'>-						    priv-&gt;tx_max);</div><div class='add'>+						    priv-&gt;tx_max, NULL);</div><div class='ctx'> 		priv-&gt;tx_tail++;</div><div class='ctx'> 		stats-&gt;tx_packets++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1119,14 +1446,13 @@ static void xcan_tx_interrupt(struct net_device *ndev, u32 isr)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;tx_lock, flags);</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_TX);</div><div class='ctx'> 	xcan_update_error_state_after_rxtx(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * xcan_interrupt - CAN Isr</div><div class='ctx'>  * @irq:	irq number</div><div class='del'>- * @dev_id:	device id poniter</div><div class='add'>+ * @dev_id:	device id pointer</div><div class='ctx'>  *</div><div class='ctx'>  * This is the xilinx CAN Isr. It checks for the type of interrupt</div><div class='ctx'>  * and invokes the corresponding ISR.</div><div class='hunk'>@@ -1138,8 +1464,8 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = (struct net_device *)dev_id;</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	u32 isr_errors, mask;</div><div class='ctx'> 	u32 isr, ier;</div><div class='del'>-	u32 isr_errors;</div><div class='ctx'> 	u32 rx_int_mask = xcan_rx_int_mask(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the interrupt status from Xilinx CAN */</div><div class='hunk'>@@ -1158,10 +1484,15 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	if (isr &amp; XCAN_IXR_TXOK_MASK)</div><div class='ctx'> 		xcan_tx_interrupt(ndev, isr);</div><div class='ctx'> </div><div class='add'>+	mask = XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK |</div><div class='add'>+		XCAN_IXR_BSOFF_MASK | XCAN_IXR_ARBLST_MASK |</div><div class='add'>+		XCAN_IXR_RXMNF_MASK;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ecc_enable)</div><div class='add'>+		mask |= XCAN_IXR_ECC_MASK;</div><div class='add'>+</div><div class='ctx'> 	/* Check for the type of error interrupt and Processing it */</div><div class='del'>-	isr_errors = isr &amp; (XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK |</div><div class='del'>-			    XCAN_IXR_BSOFF_MASK | XCAN_IXR_ARBLST_MASK |</div><div class='del'>-			    XCAN_IXR_RXMNF_MASK);</div><div class='add'>+	isr_errors = isr &amp; mask;</div><div class='ctx'> 	if (isr_errors) {</div><div class='ctx'> 		priv-&gt;write_reg(priv, XCAN_ICR_OFFSET, isr_errors);</div><div class='ctx'> 		xcan_err_interrupt(ndev, isr);</div><div class='hunk'>@@ -1187,9 +1518,13 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_id)</div><div class='ctx'> static void xcan_chip_stop(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable interrupts and leave the can in configuration mode */</div><div class='del'>-	set_reset_mode(ndev);</div><div class='add'>+	ret = set_reset_mode(ndev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netdev_dbg(ndev, "set_reset_mode() Failed\n");</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;can.state = CAN_STATE_STOPPED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1205,15 +1540,19 @@ static int xcan_open(struct net_device *ndev)</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = phy_power_on(priv-&gt;transceiver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	ret = pm_runtime_get_sync(priv-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",</div><div class='del'>-				__func__, ret);</div><div class='del'>-		return ret;</div><div class='add'>+			   __func__, ret);</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = request_irq(ndev-&gt;irq, xcan_interrupt, priv-&gt;irq_flags,</div><div class='del'>-			ndev-&gt;name, ndev);</div><div class='add'>+			  ndev-&gt;name, ndev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netdev_err(ndev, "irq allocation for CAN failed\n");</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -1237,7 +1576,6 @@ static int xcan_open(struct net_device *ndev)</div><div class='ctx'> 		goto err_candev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_OPEN);</div><div class='ctx'> 	napi_enable(&amp;priv-&gt;napi);</div><div class='ctx'> 	netif_start_queue(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -1249,6 +1587,7 @@ err_irq:</div><div class='ctx'> 	free_irq(ndev-&gt;irq, ndev);</div><div class='ctx'> err:</div><div class='ctx'> 	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+	phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1269,8 +1608,8 @@ static int xcan_close(struct net_device *ndev)</div><div class='ctx'> 	free_irq(ndev-&gt;irq, ndev);</div><div class='ctx'> 	close_candev(ndev);</div><div class='ctx'> </div><div class='del'>-	can_led_event(ndev, CAN_LED_EVENT_STOP);</div><div class='ctx'> 	pm_runtime_put(priv-&gt;dev);</div><div class='add'>+	phy_power_off(priv-&gt;transceiver);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1284,7 +1623,7 @@ static int xcan_close(struct net_device *ndev)</div><div class='ctx'>  * Return: 0 on success and failure value on error</div><div class='ctx'>  */</div><div class='ctx'> static int xcan_get_berr_counter(const struct net_device *ndev,</div><div class='del'>-					struct can_berr_counter *bec)</div><div class='add'>+				 struct can_berr_counter *bec)</div><div class='ctx'> {</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1292,7 +1631,8 @@ static int xcan_get_berr_counter(const struct net_device *ndev,</div><div class='ctx'> 	ret = pm_runtime_get_sync(priv-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",</div><div class='del'>-				__func__, ret);</div><div class='add'>+			   __func__, ret);</div><div class='add'>+		pm_runtime_put(priv-&gt;dev);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1305,12 +1645,70 @@ static int xcan_get_berr_counter(const struct net_device *ndev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * xcan_get_auto_tdcv - Get Transmitter Delay Compensation Value</div><div class='add'>+ * @ndev:	Pointer to net_device structure</div><div class='add'>+ * @tdcv:	Pointer to TDCV value</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success</div><div class='add'>+ */</div><div class='add'>+static int xcan_get_auto_tdcv(const struct net_device *ndev, u32 *tdcv)</div><div class='add'>+{</div><div class='add'>+	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	*tdcv = FIELD_GET(XCAN_SR_TDCV_MASK, priv-&gt;read_reg(priv, XCAN_SR_OFFSET));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xcan_get_strings(struct net_device *ndev, u32 stringset, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		memcpy(buf, &amp;xcan_priv_flags_strings,</div><div class='add'>+		       sizeof(xcan_priv_flags_strings));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xcan_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return ARRAY_SIZE(xcan_priv_flags_strings);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xcan_get_ethtool_stats(struct net_device *ndev,</div><div class='add'>+				   struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;priv-&gt;syncp);</div><div class='add'>+</div><div class='add'>+		data[XCAN_ECC_RX_2_BIT_ERRORS] = u64_stats_read(&amp;priv-&gt;ecc_rx_2_bit_errors);</div><div class='add'>+		data[XCAN_ECC_RX_1_BIT_ERRORS] = u64_stats_read(&amp;priv-&gt;ecc_rx_1_bit_errors);</div><div class='add'>+		data[XCAN_ECC_TXOL_2_BIT_ERRORS] = u64_stats_read(&amp;priv-&gt;ecc_txol_2_bit_errors);</div><div class='add'>+		data[XCAN_ECC_TXOL_1_BIT_ERRORS] = u64_stats_read(&amp;priv-&gt;ecc_txol_1_bit_errors);</div><div class='add'>+		data[XCAN_ECC_TXTL_2_BIT_ERRORS] = u64_stats_read(&amp;priv-&gt;ecc_txtl_2_bit_errors);</div><div class='add'>+		data[XCAN_ECC_TXTL_1_BIT_ERRORS] = u64_stats_read(&amp;priv-&gt;ecc_txtl_1_bit_errors);</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;priv-&gt;syncp, start));</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops xcan_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= xcan_open,</div><div class='ctx'> 	.ndo_stop	= xcan_close,</div><div class='ctx'> 	.ndo_start_xmit	= xcan_start_xmit,</div><div class='del'>-	.ndo_change_mtu	= can_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops xcan_ethtool_ops = {</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='add'>+	.get_strings = xcan_get_strings,</div><div class='add'>+	.get_sset_count = xcan_get_sset_count,</div><div class='add'>+	.get_ethtool_stats = xcan_get_ethtool_stats,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1417,6 +1815,8 @@ static const struct dev_pm_ops xcan_dev_pm_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xcan_devtype_data xcan_zynq_data = {</div><div class='add'>+	.cantype = XZYNQ_CANPS,</div><div class='add'>+	.flags = XCAN_FLAG_TXFEMP,</div><div class='ctx'> 	.bittiming_const = &amp;xcan_bittiming_const,</div><div class='ctx'> 	.btr_ts2_shift = XCAN_BTR_TS2_SHIFT,</div><div class='ctx'> 	.btr_sjw_shift = XCAN_BTR_SJW_SHIFT,</div><div class='hunk'>@@ -1424,6 +1824,7 @@ static const struct xcan_devtype_data xcan_zynq_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xcan_devtype_data xcan_axi_data = {</div><div class='add'>+	.cantype = XAXI_CAN,</div><div class='ctx'> 	.bittiming_const = &amp;xcan_bittiming_const,</div><div class='ctx'> 	.btr_ts2_shift = XCAN_BTR_TS2_SHIFT,</div><div class='ctx'> 	.btr_sjw_shift = XCAN_BTR_SJW_SHIFT,</div><div class='hunk'>@@ -1431,17 +1832,19 @@ static const struct xcan_devtype_data xcan_axi_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xcan_devtype_data xcan_canfd_data = {</div><div class='add'>+	.cantype = XAXI_CANFD,</div><div class='ctx'> 	.flags = XCAN_FLAG_EXT_FILTERS |</div><div class='ctx'> 		 XCAN_FLAG_RXMNF |</div><div class='ctx'> 		 XCAN_FLAG_TX_MAILBOXES |</div><div class='ctx'> 		 XCAN_FLAG_RX_FIFO_MULTI,</div><div class='del'>-	.bittiming_const = &amp;xcan_bittiming_const,</div><div class='add'>+	.bittiming_const = &amp;xcan_bittiming_const_canfd,</div><div class='ctx'> 	.btr_ts2_shift = XCAN_BTR_TS2_SHIFT_CANFD,</div><div class='ctx'> 	.btr_sjw_shift = XCAN_BTR_SJW_SHIFT_CANFD,</div><div class='ctx'> 	.bus_clk_name = "s_axi_aclk",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct xcan_devtype_data xcan_canfd2_data = {</div><div class='add'>+	.cantype = XAXI_CANFD_2_0,</div><div class='ctx'> 	.flags = XCAN_FLAG_EXT_FILTERS |</div><div class='ctx'> 		 XCAN_FLAG_RXMNF |</div><div class='ctx'> 		 XCAN_FLAG_TX_MAILBOXES |</div><div class='hunk'>@@ -1474,28 +1877,24 @@ MODULE_DEVICE_TABLE(of, xcan_of_match);</div><div class='ctx'>  */</div><div class='ctx'> static int xcan_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *res; /* IO mem resources */</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct xcan_priv *priv;</div><div class='del'>-	const struct of_device_id *of_id;</div><div class='del'>-	const struct xcan_devtype_data *devtype = &amp;xcan_axi_data;</div><div class='add'>+	struct phy *transceiver;</div><div class='add'>+	const struct xcan_devtype_data *devtype;</div><div class='ctx'> 	void __iomem *addr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	int rx_max, tx_max;</div><div class='del'>-	int hw_tx_max, hw_rx_max;</div><div class='add'>+	u32 hw_tx_max = 0, hw_rx_max = 0;</div><div class='ctx'> 	const char *hw_tx_max_property;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the virtual base address for the device */</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	addr = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(addr)) {</div><div class='ctx'> 		ret = PTR_ERR(addr);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	of_id = of_match_device(xcan_of_match, &amp;pdev-&gt;dev);</div><div class='del'>-	if (of_id &amp;&amp; of_id-&gt;data)</div><div class='del'>-		devtype = of_id-&gt;data;</div><div class='add'>+	devtype = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	hw_tx_max_property = devtype-&gt;flags &amp; XCAN_FLAG_TX_MAILBOXES ?</div><div class='ctx'> 			     "tx-mailbox-count" : "tx-fifo-depth";</div><div class='hunk'>@@ -1536,7 +1935,7 @@ static int xcan_probe(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(devtype-&gt;flags &amp; XCAN_FLAG_TX_MAILBOXES) &amp;&amp;</div><div class='ctx'> 	    (devtype-&gt;flags &amp; XCAN_FLAG_TXFEMP))</div><div class='del'>-		tx_max = min(hw_tx_max, 2);</div><div class='add'>+		tx_max = min(hw_tx_max, 2U);</div><div class='ctx'> 	else</div><div class='ctx'> 		tx_max = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1548,39 +1947,84 @@ static int xcan_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='add'>+	priv-&gt;ecc_enable = of_property_read_bool(pdev-&gt;dev.of_node, "xlnx,has-ecc");</div><div class='ctx'> 	priv-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	priv-&gt;can.bittiming_const = devtype-&gt;bittiming_const;</div><div class='ctx'> 	priv-&gt;can.do_set_mode = xcan_do_set_mode;</div><div class='ctx'> 	priv-&gt;can.do_get_berr_counter = xcan_get_berr_counter;</div><div class='ctx'> 	priv-&gt;can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |</div><div class='ctx'> 					CAN_CTRLMODE_BERR_REPORTING;</div><div class='add'>+	priv-&gt;rstc = devm_reset_control_get_optional_exclusive(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(priv-&gt;rstc)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot get CAN reset.\n");</div><div class='add'>+		ret = PTR_ERR(priv-&gt;rstc);</div><div class='add'>+		goto err_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = reset_control_reset(priv-&gt;rstc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	if (devtype-&gt;cantype == XAXI_CANFD) {</div><div class='add'>+		priv-&gt;can.fd.data_bittiming_const =</div><div class='add'>+			&amp;xcan_data_bittiming_const_canfd;</div><div class='add'>+		priv-&gt;can.fd.tdc_const = &amp;xcan_tdc_const_canfd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devtype-&gt;cantype == XAXI_CANFD_2_0) {</div><div class='add'>+		priv-&gt;can.fd.data_bittiming_const =</div><div class='add'>+			&amp;xcan_data_bittiming_const_canfd2;</div><div class='add'>+		priv-&gt;can.fd.tdc_const = &amp;xcan_tdc_const_canfd2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (devtype-&gt;cantype == XAXI_CANFD ||</div><div class='add'>+	    devtype-&gt;cantype == XAXI_CANFD_2_0) {</div><div class='add'>+		priv-&gt;can.ctrlmode_supported |= CAN_CTRLMODE_FD |</div><div class='add'>+						CAN_CTRLMODE_TDC_AUTO;</div><div class='add'>+		priv-&gt;can.fd.do_get_auto_tdcv = xcan_get_auto_tdcv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;reg_base = addr;</div><div class='ctx'> 	priv-&gt;tx_max = tx_max;</div><div class='ctx'> 	priv-&gt;devtype = *devtype;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Get IRQ for the device */</div><div class='del'>-	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	ret = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_reset;</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = ret;</div><div class='add'>+</div><div class='ctx'> 	ndev-&gt;flags |= IFF_ECHO;	/* We support local echo */</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, ndev);</div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	ndev-&gt;netdev_ops = &amp;xcan_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;xcan_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Getting the CAN can_clk info */</div><div class='ctx'> 	priv-&gt;can_clk = devm_clk_get(&amp;pdev-&gt;dev, "can_clk");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;can_clk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Device clock not found.\n");</div><div class='del'>-		ret = PTR_ERR(priv-&gt;can_clk);</div><div class='del'>-		goto err_free;</div><div class='add'>+		ret = dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(priv-&gt;can_clk),</div><div class='add'>+				    "device clock not found\n");</div><div class='add'>+		goto err_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;bus_clk = devm_clk_get(&amp;pdev-&gt;dev, devtype-&gt;bus_clk_name);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;bus_clk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "bus clock not found\n");</div><div class='del'>-		ret = PTR_ERR(priv-&gt;bus_clk);</div><div class='del'>-		goto err_free;</div><div class='add'>+		ret = dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(priv-&gt;bus_clk),</div><div class='add'>+				    "bus clock not found\n");</div><div class='add'>+		goto err_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	transceiver = devm_phy_optional_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(transceiver)) {</div><div class='add'>+		ret = PTR_ERR(transceiver);</div><div class='add'>+		dev_err_probe(&amp;pdev-&gt;dev, ret, "failed to get phy\n");</div><div class='add'>+		goto err_reset;</div><div class='ctx'> 	}</div><div class='add'>+	priv-&gt;transceiver = transceiver;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;write_reg = xcan_write_reg_le;</div><div class='ctx'> 	priv-&gt;read_reg = xcan_read_reg_le;</div><div class='hunk'>@@ -1589,8 +2033,8 @@ static int xcan_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = pm_runtime_get_sync(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",</div><div class='del'>-			__func__, ret);</div><div class='del'>-		goto err_pmdisable;</div><div class='add'>+			   __func__, ret);</div><div class='add'>+		goto err_disableclks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;read_reg(priv, XCAN_SR_OFFSET) != XCAN_SR_CONFIG_MASK) {</div><div class='hunk'>@@ -1600,7 +2044,7 @@ static int xcan_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;can.clock.freq = clk_get_rate(priv-&gt;can_clk);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, xcan_rx_poll, rx_max);</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;priv-&gt;napi, xcan_rx_poll, rx_max);</div><div class='ctx'> </div><div class='ctx'> 	ret = register_candev(ndev);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1608,20 +2052,30 @@ static int xcan_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_disableclks;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	devm_can_led_init(ndev);</div><div class='del'>-</div><div class='add'>+	of_can_transceiver(ndev);</div><div class='ctx'> 	pm_runtime_put(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;devtype.flags &amp; XCAN_FLAG_CANFD_2) {</div><div class='add'>+		priv-&gt;write_reg(priv, XCAN_AFR_2_ID_OFFSET, 0x00000000);</div><div class='add'>+		priv-&gt;write_reg(priv, XCAN_AFR_2_MASK_OFFSET, 0x00000000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	netdev_dbg(ndev, "reg_base=0x%p irq=%d clock=%d, tx buffers: actual %d, using %d\n",</div><div class='ctx'> 		   priv-&gt;reg_base, ndev-&gt;irq, priv-&gt;can.clock.freq,</div><div class='ctx'> 		   hw_tx_max, priv-&gt;tx_max);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;ecc_enable) {</div><div class='add'>+		/* Reset FIFO ECC counters */</div><div class='add'>+		priv-&gt;write_reg(priv, XCAN_ECC_CFG_OFFSET, XCAN_ECC_CFG_REECRX_MASK |</div><div class='add'>+			XCAN_ECC_CFG_REECTXOL_MASK | XCAN_ECC_CFG_REECTXTL_MASK);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_disableclks:</div><div class='ctx'> 	pm_runtime_put(priv-&gt;dev);</div><div class='del'>-err_pmdisable:</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='add'>+err_reset:</div><div class='add'>+	reset_control_assert(priv-&gt;rstc);</div><div class='ctx'> err_free:</div><div class='ctx'> 	free_candev(ndev);</div><div class='ctx'> err:</div><div class='hunk'>@@ -1635,22 +2089,20 @@ err:</div><div class='ctx'>  * This function frees all the resources allocated to the device.</div><div class='ctx'>  * Return: 0 always</div><div class='ctx'>  */</div><div class='del'>-static int xcan_remove(struct platform_device *pdev)</div><div class='add'>+static void xcan_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct xcan_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_candev(ndev);</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='del'>-	netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+	reset_control_assert(priv-&gt;rstc);</div><div class='ctx'> 	free_candev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver xcan_driver = {</div><div class='ctx'> 	.probe = xcan_probe,</div><div class='del'>-	.remove	= xcan_remove,</div><div class='add'>+	.remove = xcan_remove,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name = DRIVER_NAME,</div><div class='ctx'> 		.pm = &amp;xcan_dev_pm_ops,</div><div class='head'>diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig<br/>index b91e78e3598f..7eb301fd987d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/Kconfig</a></div><div class='hunk'>@@ -1,50 +1,72 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> menu "Distributed Switch Architecture drivers"</div><div class='del'>-	depends on HAVE_NET_DSA</div><div class='add'>+	depends on NET_DSA</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/dsa/b53/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_BCM_SF2</div><div class='ctx'> 	tristate "Broadcom Starfighter 2 Ethernet switch support"</div><div class='del'>-	depends on HAS_IOMEM &amp;&amp; NET_DSA</div><div class='add'>+	depends on HAS_IOMEM</div><div class='ctx'> 	select NET_DSA_TAG_BRCM</div><div class='ctx'> 	select FIXED_PHY</div><div class='ctx'> 	select BCM7XXX_PHY</div><div class='ctx'> 	select MDIO_BCM_UNIMAC</div><div class='ctx'> 	select B53</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables support for the Broadcom Starfighter 2 Ethernet</div><div class='ctx'> 	  switch chips.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_LOOP</div><div class='ctx'> 	tristate "DSA mock-up Ethernet switch chip support"</div><div class='del'>-	depends on NET_DSA</div><div class='add'>+	select NET_DSA_TAG_NONE</div><div class='ctx'> 	select FIXED_PHY</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables support for a fake mock-up switch chip which</div><div class='ctx'> 	  exercises the DSA APIs.</div><div class='ctx'> </div><div class='del'>-config NET_DSA_LANTIQ_GSWIP</div><div class='del'>-	tristate "Lantiq / Intel GSWIP"</div><div class='del'>-	depends on HAS_IOMEM &amp;&amp; NET_DSA</div><div class='del'>-	select NET_DSA_TAG_GSWIP</div><div class='del'>-	---help---</div><div class='del'>-	  This enables support for the Lantiq / Intel GSWIP 2.1 found in</div><div class='del'>-	  the xrx200 / VR9 SoC.</div><div class='add'>+source "drivers/net/dsa/hirschmann/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/net/dsa/lantiq/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_MT7530</div><div class='del'>-	tristate "Mediatek MT7530 Ethernet switch support"</div><div class='del'>-	depends on NET_DSA</div><div class='add'>+	tristate "MediaTek MT7530 and MT7531 Ethernet switch support"</div><div class='ctx'> 	select NET_DSA_TAG_MTK</div><div class='del'>-	---help---</div><div class='del'>-	  This enables support for the Mediatek MT7530 Ethernet switch</div><div class='del'>-	  chip.</div><div class='add'>+	select REGMAP_IRQ</div><div class='add'>+	imply NET_DSA_MT7530_MDIO</div><div class='add'>+	imply NET_DSA_MT7530_MMIO</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the MediaTek MT7530 and MT7531 Ethernet</div><div class='add'>+	  switch chips. Multi-chip module MT7530 in MT7621AT, MT7621DAT,</div><div class='add'>+	  MT7621ST and MT7623AI SoCs, and built-in switch in MT7988 SoC are</div><div class='add'>+	  supported as well.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MT7530_MDIO</div><div class='add'>+	tristate "MediaTek MT7530 MDIO interface driver"</div><div class='add'>+	depends on NET_DSA_MT7530</div><div class='add'>+	select MEDIATEK_GE_PHY</div><div class='add'>+	select PCS_MTK_LYNXI</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the MediaTek MT7530 and MT7531 switch</div><div class='add'>+	  chips which are connected via MDIO, as well as multi-chip</div><div class='add'>+	  module MT7530 which can be found in the MT7621AT, MT7621DAT,</div><div class='add'>+	  MT7621ST and MT7623AI SoCs.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MT7530_MMIO</div><div class='add'>+	tristate "MediaTek MT7530 MMIO interface driver"</div><div class='add'>+	depends on NET_DSA_MT7530</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	imply MEDIATEK_GE_SOC_PHY</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the built-in Ethernet switch found</div><div class='add'>+	  in the MediaTek MT7988 SoC.</div><div class='add'>+	  The switch is a similar design as MT7531, but the switch registers</div><div class='add'>+	  are directly mapped into the SoCs register space rather than being</div><div class='add'>+	  accessible via MDIO.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_MV88E6060</div><div class='ctx'> 	tristate "Marvell 88E6060 ethernet switch chip support"</div><div class='del'>-	depends on NET_DSA</div><div class='ctx'> 	select NET_DSA_TAG_TRAILER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables support for the Marvell 88E6060 ethernet switch</div><div class='ctx'> 	  chip.</div><div class='ctx'> </div><div class='hunk'>@@ -52,61 +74,91 @@ source "drivers/net/dsa/microchip/Kconfig"</div><div class='ctx'> </div><div class='ctx'> source "drivers/net/dsa/mv88e6xxx/Kconfig"</div><div class='ctx'> </div><div class='add'>+source "drivers/net/dsa/ocelot/Kconfig"</div><div class='add'>+</div><div class='add'>+source "drivers/net/dsa/qca/Kconfig"</div><div class='add'>+</div><div class='ctx'> source "drivers/net/dsa/sja1105/Kconfig"</div><div class='ctx'> </div><div class='del'>-config NET_DSA_QCA8K</div><div class='del'>-	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"</div><div class='del'>-	depends on NET_DSA</div><div class='del'>-	select NET_DSA_TAG_QCA</div><div class='del'>-	select REGMAP</div><div class='del'>-	---help---</div><div class='del'>-	  This enables support for the Qualcomm Atheros QCA8K Ethernet</div><div class='del'>-	  switch chips.</div><div class='add'>+source "drivers/net/dsa/xrs700x/Kconfig"</div><div class='ctx'> </div><div class='del'>-config NET_DSA_REALTEK_SMI</div><div class='del'>-	tristate "Realtek SMI Ethernet switch family support"</div><div class='del'>-	depends on NET_DSA</div><div class='del'>-	select FIXED_PHY</div><div class='del'>-	select IRQ_DOMAIN</div><div class='del'>-	select REALTEK_PHY</div><div class='del'>-	select REGMAP</div><div class='del'>-	---help---</div><div class='del'>-	  This enables support for the Realtek SMI-based switch</div><div class='del'>-	  chips, currently only RTL8366RB.</div><div class='add'>+source "drivers/net/dsa/realtek/Kconfig"</div><div class='add'>+</div><div class='add'>+config NET_DSA_RZN1_A5PSW</div><div class='add'>+	tristate "Renesas RZ/N1 A5PSW Ethernet switch support"</div><div class='add'>+	depends on OF &amp;&amp; (ARCH_RZN1 || COMPILE_TEST)</div><div class='add'>+	select NET_DSA_TAG_RZN1_A5PSW</div><div class='add'>+	select PCS_RZN1_MIIC</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the A5PSW switch, which is embedded in Renesas</div><div class='add'>+	  RZ/N1 SoC.</div><div class='add'>+</div><div class='add'>+config NET_DSA_KS8995</div><div class='add'>+	tristate "Micrel KS8995 family 5-ports 10/100 Ethernet switches"</div><div class='add'>+	depends on SPI</div><div class='add'>+	select NET_DSA_TAG_NONE</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the Micrel KS8995 family of 10/100 Mbit ethernet</div><div class='add'>+	  switches, managed over SPI.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_SMSC_LAN9303</div><div class='ctx'> 	tristate</div><div class='ctx'> 	select NET_DSA_TAG_LAN9303</div><div class='del'>-	---help---</div><div class='del'>-	  This enables support for the SMSC/Microchip LAN9303 3 port ethernet</div><div class='add'>+	select REGMAP</div><div class='add'>+	imply SMSC_PHY</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Microchip LAN9303/LAN9354 3 port ethernet</div><div class='ctx'> 	  switch chips.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_SMSC_LAN9303_I2C</div><div class='ctx'> 	tristate "SMSC/Microchip LAN9303 3-ports 10/100 ethernet switch in I2C managed mode"</div><div class='del'>-	depends on NET_DSA &amp;&amp; I2C</div><div class='add'>+	depends on I2C</div><div class='add'>+	depends on VLAN_8021Q || VLAN_8021Q=n</div><div class='ctx'> 	select NET_DSA_SMSC_LAN9303</div><div class='ctx'> 	select REGMAP_I2C</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable access functions if the SMSC/Microchip LAN9303 is configured</div><div class='ctx'> 	  for I2C managed mode.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_SMSC_LAN9303_MDIO</div><div class='del'>-	tristate "SMSC/Microchip LAN9303 3-ports 10/100 ethernet switch in MDIO managed mode"</div><div class='del'>-	depends on NET_DSA</div><div class='add'>+	tristate "Microchip LAN9303/LAN9354 3-ports 10/100 ethernet switch in MDIO managed mode"</div><div class='ctx'> 	select NET_DSA_SMSC_LAN9303</div><div class='del'>-	---help---</div><div class='del'>-	  Enable access functions if the SMSC/Microchip LAN9303 is configured</div><div class='add'>+	depends on VLAN_8021Q || VLAN_8021Q=n</div><div class='add'>+	help</div><div class='add'>+	  Enable access functions if the Microchip LAN9303/LAN9354 is configured</div><div class='ctx'> 	  for MDIO managed mode.</div><div class='ctx'> </div><div class='ctx'> config NET_DSA_VITESSE_VSC73XX</div><div class='del'>-	tristate "Vitesse VSC7385/7388/7395/7398 support"</div><div class='del'>-	depends on OF &amp;&amp; SPI</div><div class='del'>-	depends on NET_DSA</div><div class='add'>+	tristate</div><div class='add'>+	select NET_DSA_TAG_VSC73XX_8021Q</div><div class='ctx'> 	select FIXED_PHY</div><div class='ctx'> 	select VITESSE_PHY</div><div class='ctx'> 	select GPIOLIB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This enables support for the Vitesse VSC7385, VSC7388,</div><div class='ctx'> 	  VSC7395 and VSC7398 SparX integrated ethernet switches.</div><div class='ctx'> </div><div class='add'>+config NET_DSA_VITESSE_VSC73XX_SPI</div><div class='add'>+	tristate "Vitesse VSC7385/7388/7395/7398 SPI mode support"</div><div class='add'>+	depends on SPI</div><div class='add'>+	select NET_DSA_VITESSE_VSC73XX</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Vitesse VSC7385, VSC7388, VSC7395</div><div class='add'>+	  and VSC7398 SparX integrated ethernet switches in SPI managed mode.</div><div class='add'>+</div><div class='add'>+config NET_DSA_VITESSE_VSC73XX_PLATFORM</div><div class='add'>+	tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	select NET_DSA_VITESSE_VSC73XX</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Vitesse VSC7385, VSC7388, VSC7395</div><div class='add'>+	  and VSC7398 SparX integrated ethernet switches, connected over</div><div class='add'>+	  a CPU-attached address bus and work in memory-mapped I/O mode.</div><div class='add'>+</div><div class='add'>+config NET_DSA_YT921X</div><div class='add'>+	tristate "Motorcomm YT9215 ethernet switch chip support"</div><div class='add'>+	select NET_DSA_TAG_YT921X</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Motorcomm YT9215 ethernet switch</div><div class='add'>+	  chip.</div><div class='ctx'> endmenu</div><div class='head'>diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile<br/>index fefb6aaa82ba..16de4ba3fa38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/Makefile</a></div><div class='hunk'>@@ -2,20 +2,26 @@</div><div class='ctx'> obj-$(CONFIG_NET_DSA_BCM_SF2)	+= bcm-sf2.o</div><div class='ctx'> bcm-sf2-objs			:= bcm_sf2.o bcm_sf2_cfp.o</div><div class='ctx'> obj-$(CONFIG_NET_DSA_LOOP)	+= dsa_loop.o</div><div class='del'>-ifdef CONFIG_NET_DSA_LOOP</div><div class='del'>-obj-$(CONFIG_FIXED_PHY)		+= dsa_loop_bdinfo.o</div><div class='del'>-endif</div><div class='del'>-obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_KS8995) 	+= ks8995.o</div><div class='ctx'> obj-$(CONFIG_NET_DSA_MT7530)	+= mt7530.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MT7530_MDIO) += mt7530-mdio.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MT7530_MMIO) += mt7530-mmio.o</div><div class='ctx'> obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o</div><div class='del'>-obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o</div><div class='del'>-obj-$(CONFIG_NET_DSA_REALTEK_SMI) += realtek.o</div><div class='del'>-realtek-objs			:= realtek-smi.o rtl8366.o rtl8366rb.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_RZN1_A5PSW) += rzn1_a5psw.o</div><div class='ctx'> obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o</div><div class='ctx'> obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o</div><div class='ctx'> obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o</div><div class='del'>-obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx-core.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) += vitesse-vsc73xx-platform.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_YT921X) += yt921x.o</div><div class='ctx'> obj-y				+= b53/</div><div class='add'>+obj-y				+= hirschmann/</div><div class='add'>+obj-y				+= lantiq/</div><div class='ctx'> obj-y				+= microchip/</div><div class='ctx'> obj-y				+= mv88e6xxx/</div><div class='add'>+obj-y				+= ocelot/</div><div class='add'>+obj-y				+= qca/</div><div class='add'>+obj-y				+= realtek/</div><div class='ctx'> obj-y				+= sja1105/</div><div class='add'>+obj-y				+= xrs700x/</div><div class='head'>diff --git a/drivers/net/dsa/b53/Kconfig b/drivers/net/dsa/b53/Kconfig<br/>index f9891a81c808..915008e8eff5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,10 @@</div><div class='ctx'> menuconfig B53</div><div class='ctx'> 	tristate "Broadcom BCM53xx managed switch support"</div><div class='ctx'> 	depends on NET_DSA</div><div class='add'>+	select NET_DSA_TAG_NONE</div><div class='ctx'> 	select NET_DSA_TAG_BRCM</div><div class='add'>+	select NET_DSA_TAG_BRCM_LEGACY</div><div class='add'>+	select NET_DSA_TAG_BRCM_LEGACY_FCS</div><div class='ctx'> 	select NET_DSA_TAG_BRCM_PREPEND</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver adds support for Broadcom managed switch chips. It supports</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c<br/>index c8040ecf4425..a1a177713d99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_common.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_common.c</a></div><div class='hunk'>@@ -17,18 +17,19 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/gpio.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/math.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/b53.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/phylink.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "b53_regs.h"</div><div class='hunk'>@@ -226,6 +227,9 @@ static const struct b53_mib_desc b53_mibs_58xx[] = {</div><div class='ctx'> </div><div class='ctx'> #define B53_MIBS_58XX_SIZE	ARRAY_SIZE(b53_mibs_58xx)</div><div class='ctx'> </div><div class='add'>+#define B53_MAX_MTU_25		(1536 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)</div><div class='add'>+#define B53_MAX_MTU		(9720 - ETH_HLEN - VLAN_HLEN - ETH_FCS_LEN)</div><div class='add'>+</div><div class='ctx'> static int b53_do_vlan_op(struct b53_device *dev, u8 op)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -324,6 +328,26 @@ static void b53_get_vlan_entry(struct b53_device *dev, u16 vid,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void b53_set_eap_mode(struct b53_device *dev, int port, int mode)</div><div class='add'>+{</div><div class='add'>+	u64 eap_conf;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev) || is5365(dev) || dev-&gt;chip_id == BCM5389_DEVICE_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b53_read64(dev, B53_EAP_PAGE, B53_PORT_EAP_CONF(port), &amp;eap_conf);</div><div class='add'>+</div><div class='add'>+	if (is63xx(dev)) {</div><div class='add'>+		eap_conf &amp;= ~EAP_MODE_MASK_63XX;</div><div class='add'>+		eap_conf |= (u64)mode &lt;&lt; EAP_MODE_SHIFT_63XX;</div><div class='add'>+	} else {</div><div class='add'>+		eap_conf &amp;= ~EAP_MODE_MASK;</div><div class='add'>+		eap_conf |= (u64)mode &lt;&lt; EAP_MODE_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b53_write64(dev, B53_EAP_PAGE, B53_PORT_EAP_CONF(port), eap_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void b53_set_forwarding(struct b53_device *dev, int enable)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mgmt;</div><div class='hunk'>@@ -337,14 +361,26 @@ static void b53_set_forwarding(struct b53_device *dev, int enable)</div><div class='ctx'> </div><div class='ctx'> 	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);</div><div class='ctx'> </div><div class='del'>-	/* Include IMP port in dumb forwarding mode</div><div class='del'>-	 */</div><div class='del'>-	b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &amp;mgmt);</div><div class='del'>-	mgmt |= B53_MII_DUMB_FWDG_EN;</div><div class='del'>-	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);</div><div class='add'>+	if (!is5325(dev)) {</div><div class='add'>+		/* Include IMP port in dumb forwarding mode */</div><div class='add'>+		b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, &amp;mgmt);</div><div class='add'>+		mgmt |= B53_MII_DUMB_FWDG_EN;</div><div class='add'>+		b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_CTRL, mgmt);</div><div class='add'>+</div><div class='add'>+		/* Look at B53_UC_FWD_EN and B53_MC_FWD_EN to decide whether</div><div class='add'>+		 * frames should be flooded or not.</div><div class='add'>+		 */</div><div class='add'>+		b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &amp;mgmt);</div><div class='add'>+		mgmt |= B53_UC_FWD_EN | B53_MC_FWD_EN | B53_IP_MC;</div><div class='add'>+		b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);</div><div class='add'>+	} else {</div><div class='add'>+		b53_read8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, &amp;mgmt);</div><div class='add'>+		mgmt |= B53_IP_MC;</div><div class='add'>+		b53_write8(dev, B53_CTRL_PAGE, B53_IP_MULTICAST_CTRL, mgmt);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b53_enable_vlan(struct b53_device *dev, bool enable,</div><div class='add'>+static void b53_enable_vlan(struct b53_device *dev, int port, bool enable,</div><div class='ctx'> 			    bool enable_filtering)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mgmt, vc0, vc1, vc4 = 0, vc5;</div><div class='hunk'>@@ -364,17 +400,17 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable,</div><div class='ctx'> 		b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5, &amp;vc5);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mgmt &amp;= ~SM_SW_FWD_MODE;</div><div class='add'>+	vc1 &amp;= ~VC1_RX_MCST_FWD_EN;</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='ctx'> 		vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID;</div><div class='del'>-		vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN;</div><div class='add'>+		vc1 |= VC1_RX_MCST_UNTAG_EN;</div><div class='ctx'> 		vc4 &amp;= ~VC4_ING_VID_CHECK_MASK;</div><div class='ctx'> 		if (enable_filtering) {</div><div class='ctx'> 			vc4 |= VC4_ING_VID_VIO_DROP &lt;&lt; VC4_ING_VID_CHECK_S;</div><div class='ctx'> 			vc5 |= VC5_DROP_VTABLE_MISS;</div><div class='ctx'> 		} else {</div><div class='del'>-			vc4 |= VC4_ING_VID_VIO_FWD &lt;&lt; VC4_ING_VID_CHECK_S;</div><div class='add'>+			vc4 |= VC4_NO_ING_VID_CHK &lt;&lt; VC4_ING_VID_CHECK_S;</div><div class='ctx'> 			vc5 &amp;= ~VC5_DROP_VTABLE_MISS;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -386,7 +422,7 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable,</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		vc0 &amp;= ~(VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID);</div><div class='del'>-		vc1 &amp;= ~(VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN);</div><div class='add'>+		vc1 &amp;= ~VC1_RX_MCST_UNTAG_EN;</div><div class='ctx'> 		vc4 &amp;= ~VC4_ING_VID_CHECK_MASK;</div><div class='ctx'> 		vc5 &amp;= ~VC5_DROP_VTABLE_MISS;</div><div class='ctx'> </div><div class='hunk'>@@ -428,6 +464,9 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable,</div><div class='ctx'> 	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;vlan_enabled = enable;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "Port %d VLAN enabled: %d, filtering: %d\n",</div><div class='add'>+		port, enable, enable_filtering);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100)</div><div class='hunk'>@@ -453,6 +492,9 @@ static int b53_flush_arl(struct b53_device *dev, u8 mask)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	if (is5325(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	b53_write8(dev, B53_CTRL_PAGE, B53_FAST_AGE_CTRL,</div><div class='ctx'> 		   FAST_AGE_DONE | FAST_AGE_DYNAMIC | mask);</div><div class='ctx'> </div><div class='hunk'>@@ -477,6 +519,9 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int b53_fast_age_port(struct b53_device *dev, int port)</div><div class='ctx'> {</div><div class='add'>+	if (is5325(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	b53_write8(dev, B53_CTRL_PAGE, B53_FAST_AGE_PORT_CTRL, port);</div><div class='ctx'> </div><div class='ctx'> 	return b53_flush_arl(dev, FAST_AGE_PORT);</div><div class='hunk'>@@ -484,6 +529,9 @@ static int b53_fast_age_port(struct b53_device *dev, int port)</div><div class='ctx'> </div><div class='ctx'> static int b53_fast_age_vlan(struct b53_device *dev, u16 vid)</div><div class='ctx'> {</div><div class='add'>+	if (is5325(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	b53_write16(dev, B53_CTRL_PAGE, B53_FAST_AGE_VID_CTRL, vid);</div><div class='ctx'> </div><div class='ctx'> 	return b53_flush_arl(dev, FAST_AGE_VLAN);</div><div class='hunk'>@@ -495,6 +543,10 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u16 pvlan;</div><div class='ctx'> </div><div class='add'>+	/* BCM5325 CPU port is at 8 */</div><div class='add'>+	if ((is5325(dev) || is5365(dev)) &amp;&amp; cpu_port == B53_CPU_PORT_25)</div><div class='add'>+		cpu_port = B53_CPU_PORT;</div><div class='add'>+</div><div class='ctx'> 	/* Enable the IMP port to be in the same VLAN as the other ports</div><div class='ctx'> 	 * on a per-port basis such that we only have Port i and IMP in</div><div class='ctx'> 	 * the same VLAN.</div><div class='hunk'>@@ -507,13 +559,159 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_imp_vlan_setup);</div><div class='ctx'> </div><div class='add'>+static void b53_port_set_ucast_flood(struct b53_device *dev, int port,</div><div class='add'>+				     bool unicast)</div><div class='add'>+{</div><div class='add'>+	u16 uc;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev)) {</div><div class='add'>+		if (port == B53_CPU_PORT_25)</div><div class='add'>+			port = B53_CPU_PORT;</div><div class='add'>+</div><div class='add'>+		b53_read16(dev, B53_IEEE_PAGE, B53_IEEE_UCAST_DLF, &amp;uc);</div><div class='add'>+		if (unicast)</div><div class='add'>+			uc |= BIT(port) | B53_IEEE_UCAST_DROP_EN;</div><div class='add'>+		else</div><div class='add'>+			uc &amp;= ~BIT(port);</div><div class='add'>+		b53_write16(dev, B53_IEEE_PAGE, B53_IEEE_UCAST_DLF, uc);</div><div class='add'>+	} else {</div><div class='add'>+		b53_read16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, &amp;uc);</div><div class='add'>+		if (unicast)</div><div class='add'>+			uc |= BIT(port);</div><div class='add'>+		else</div><div class='add'>+			uc &amp;= ~BIT(port);</div><div class='add'>+		b53_write16(dev, B53_CTRL_PAGE, B53_UC_FLOOD_MASK, uc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_port_set_mcast_flood(struct b53_device *dev, int port,</div><div class='add'>+				     bool multicast)</div><div class='add'>+{</div><div class='add'>+	u16 mc;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev)) {</div><div class='add'>+		if (port == B53_CPU_PORT_25)</div><div class='add'>+			port = B53_CPU_PORT;</div><div class='add'>+</div><div class='add'>+		b53_read16(dev, B53_IEEE_PAGE, B53_IEEE_MCAST_DLF, &amp;mc);</div><div class='add'>+		if (multicast)</div><div class='add'>+			mc |= BIT(port) | B53_IEEE_MCAST_DROP_EN;</div><div class='add'>+		else</div><div class='add'>+			mc &amp;= ~BIT(port);</div><div class='add'>+		b53_write16(dev, B53_IEEE_PAGE, B53_IEEE_MCAST_DLF, mc);</div><div class='add'>+	} else {</div><div class='add'>+		b53_read16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, &amp;mc);</div><div class='add'>+		if (multicast)</div><div class='add'>+			mc |= BIT(port);</div><div class='add'>+		else</div><div class='add'>+			mc &amp;= ~BIT(port);</div><div class='add'>+		b53_write16(dev, B53_CTRL_PAGE, B53_MC_FLOOD_MASK, mc);</div><div class='add'>+</div><div class='add'>+		b53_read16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, &amp;mc);</div><div class='add'>+		if (multicast)</div><div class='add'>+			mc |= BIT(port);</div><div class='add'>+		else</div><div class='add'>+			mc &amp;= ~BIT(port);</div><div class='add'>+		b53_write16(dev, B53_CTRL_PAGE, B53_IPMC_FLOOD_MASK, mc);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_port_set_learning(struct b53_device *dev, int port,</div><div class='add'>+				  bool learning)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b53_read16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, &amp;reg);</div><div class='add'>+	if (learning)</div><div class='add'>+		reg &amp;= ~BIT(port);</div><div class='add'>+	else</div><div class='add'>+		reg |= BIT(port);</div><div class='add'>+	b53_write16(dev, B53_CTRL_PAGE, B53_DIS_LEARNING, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_port_set_isolated(struct b53_device *dev, int port,</div><div class='add'>+				  bool isolated)</div><div class='add'>+{</div><div class='add'>+	u8 offset;</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev))</div><div class='add'>+		offset = B53_PROTECTED_PORT_SEL_25;</div><div class='add'>+	else</div><div class='add'>+		offset = B53_PROTECTED_PORT_SEL;</div><div class='add'>+</div><div class='add'>+	b53_read16(dev, B53_CTRL_PAGE, offset, &amp;reg);</div><div class='add'>+	if (isolated)</div><div class='add'>+		reg |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~BIT(port);</div><div class='add'>+	b53_write16(dev, B53_CTRL_PAGE, offset, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	b53_read16(dev, B53_EEE_PAGE, B53_EEE_EN_CTRL, &amp;reg);</div><div class='add'>+	if (enable)</div><div class='add'>+		reg |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~BIT(port);</div><div class='add'>+	b53_write16(dev, B53_EEE_PAGE, B53_EEE_EN_CTRL, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int b53_setup_port(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	b53_port_set_ucast_flood(dev, port, true);</div><div class='add'>+	b53_port_set_mcast_flood(dev, port, true);</div><div class='add'>+	b53_port_set_learning(dev, port, false);</div><div class='add'>+	b53_port_set_isolated(dev, port, false);</div><div class='add'>+</div><div class='add'>+	/* Force all traffic to go to the CPU port to prevent the ASIC from</div><div class='add'>+	 * trying to forward to bridged ports on matching FDB entries, then</div><div class='add'>+	 * dropping frames because it isn't allowed to forward there.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_user_port(ds, port))</div><div class='add'>+		b53_set_eap_mode(dev, port, EAP_MODE_SIMPLIFIED);</div><div class='add'>+</div><div class='add'>+	if (is5325(dev) &amp;&amp;</div><div class='add'>+	    in_range(port, 1, 4)) {</div><div class='add'>+		u8 reg;</div><div class='add'>+</div><div class='add'>+		b53_read8(dev, B53_CTRL_PAGE, B53_PD_MODE_CTRL_25, &amp;reg);</div><div class='add'>+		reg &amp;= ~PD_MODE_POWER_DOWN_PORT(0);</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			reg |= PD_MODE_POWER_DOWN_PORT(port);</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~PD_MODE_POWER_DOWN_PORT(port);</div><div class='add'>+		b53_write8(dev, B53_CTRL_PAGE, B53_PD_MODE_CTRL_25, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_setup_port);</div><div class='add'>+</div><div class='ctx'> int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	unsigned int cpu_port = ds-&gt;ports[port].cpu_dp-&gt;index;</div><div class='add'>+	unsigned int cpu_port;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u16 pvlan;</div><div class='ctx'> </div><div class='add'>+	if (!dsa_is_user_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	cpu_port = dsa_to_port(ds, port)-&gt;cpu_dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;ops-&gt;phy_enable)</div><div class='add'>+		dev-&gt;ops-&gt;phy_enable(dev, port);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;ops-&gt;irq_enable)</div><div class='ctx'> 		ret = dev-&gt;ops-&gt;irq_enable(dev, port);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -552,6 +750,9 @@ void b53_disable_port(struct dsa_switch *ds, int port)</div><div class='ctx'> 	reg |= PORT_CTRL_RX_DISABLE | PORT_CTRL_TX_DISABLE;</div><div class='ctx'> 	b53_write8(dev, B53_CTRL_PAGE, B53_PORT_CTRL(port), reg);</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;ops-&gt;phy_disable)</div><div class='add'>+		dev-&gt;ops-&gt;phy_disable(dev, port);</div><div class='add'>+</div><div class='ctx'> 	if (dev-&gt;ops-&gt;irq_disable)</div><div class='ctx'> 		dev-&gt;ops-&gt;irq_disable(dev, port);</div><div class='ctx'> }</div><div class='hunk'>@@ -559,9 +760,8 @@ EXPORT_SYMBOL(b53_disable_port);</div><div class='ctx'> </div><div class='ctx'> void b53_brcm_hdr_setup(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='del'>-	bool tag_en = !(ds-&gt;ops-&gt;get_tag_protocol(ds, port) ==</div><div class='del'>-			 DSA_TAG_PROTO_NONE);</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	bool tag_en = !(dev-&gt;tag_protocol == DSA_TAG_PROTO_NONE);</div><div class='ctx'> 	u8 hdr_ctl, val;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='hunk'>@@ -581,6 +781,27 @@ void b53_brcm_hdr_setup(struct dsa_switch *ds, int port)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Enable management mode if tagging is requested */</div><div class='add'>+	b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &amp;hdr_ctl);</div><div class='add'>+	if (tag_en)</div><div class='add'>+		hdr_ctl |= SM_SW_FWD_MODE;</div><div class='add'>+	else</div><div class='add'>+		hdr_ctl &amp;= ~SM_SW_FWD_MODE;</div><div class='add'>+	b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, hdr_ctl);</div><div class='add'>+</div><div class='add'>+	/* Configure the appropriate IMP port */</div><div class='add'>+	b53_read8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, &amp;hdr_ctl);</div><div class='add'>+	if (port == 8)</div><div class='add'>+		hdr_ctl |= GC_FRM_MGMT_PORT_MII;</div><div class='add'>+	else if (port == 5)</div><div class='add'>+		hdr_ctl |= GC_FRM_MGMT_PORT_M;</div><div class='add'>+	b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, hdr_ctl);</div><div class='add'>+</div><div class='add'>+	/* B53_BRCM_HDR not present on devices with legacy tags */</div><div class='add'>+	if (dev-&gt;tag_protocol == DSA_TAG_PROTO_BRCM_LEGACY ||</div><div class='add'>+	    dev-&gt;tag_protocol == DSA_TAG_PROTO_BRCM_LEGACY_FCS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* Enable Broadcom tags for IMP port */</div><div class='ctx'> 	b53_read8(dev, B53_MGMT_PAGE, B53_BRCM_HDR, &amp;hdr_ctl);</div><div class='ctx'> 	if (tag_en)</div><div class='hunk'>@@ -640,19 +861,50 @@ static void b53_enable_mib(struct b53_device *dev)</div><div class='ctx'> 	b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void b53_enable_stp(struct b53_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 gc;</div><div class='add'>+</div><div class='add'>+	b53_read8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, &amp;gc);</div><div class='add'>+	gc |= GC_RX_BPDU_EN;</div><div class='add'>+	b53_write8(dev, B53_MGMT_PAGE, B53_GLOBAL_CONFIG, gc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u16 b53_default_pvid(struct b53_device *dev)</div><div class='ctx'> {</div><div class='del'>-	if (is5325(dev) || is5365(dev))</div><div class='del'>-		return 1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool b53_vlan_port_needs_forced_tagged(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;tag_protocol == DSA_TAG_PROTO_NONE &amp;&amp; dsa_is_cpu_port(ds, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool b53_vlan_port_may_join_untagged(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;vlan_filtering)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	dp = dsa_to_port(ds, port);</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(dp))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return dp-&gt;bridge == NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int b53_configure_vlan(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='ctx'> 	struct b53_vlan vl = { 0 };</div><div class='add'>+	struct b53_vlan *v;</div><div class='ctx'> 	int i, def_vid;</div><div class='add'>+	u16 vid;</div><div class='ctx'> </div><div class='ctx'> 	def_vid = b53_default_pvid(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -664,14 +916,48 @@ int b53_configure_vlan(struct dsa_switch *ds)</div><div class='ctx'> 		b53_do_vlan_op(dev, VTA_CMD_CLEAR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	b53_enable_vlan(dev, false, ds-&gt;vlan_filtering);</div><div class='add'>+	b53_enable_vlan(dev, -1, dev-&gt;vlan_enabled, dev-&gt;vlan_filtering);</div><div class='ctx'> </div><div class='del'>-	b53_for_each_port(dev, i)</div><div class='del'>-		b53_write16(dev, B53_VLAN_PAGE,</div><div class='del'>-			    B53_VLAN_PORT_DEF_TAG(i), def_vid);</div><div class='add'>+	/* Create an untagged VLAN entry for the default PVID in case</div><div class='add'>+	 * CONFIG_VLAN_8021Q is disabled and there are no calls to</div><div class='add'>+	 * dsa_user_vlan_rx_add_vid() to create the default VLAN</div><div class='add'>+	 * entry. Do this only when the tagging protocol is not</div><div class='add'>+	 * DSA_TAG_PROTO_NONE</div><div class='add'>+	 */</div><div class='add'>+	v = &amp;dev-&gt;vlans[def_vid];</div><div class='add'>+	b53_for_each_port(dev, i) {</div><div class='add'>+		if (!b53_vlan_port_may_join_untagged(ds, i))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	if (!is5325(dev) &amp;&amp; !is5365(dev))</div><div class='del'>-		b53_set_jumbo(dev, dev-&gt;enable_jumbo, false);</div><div class='add'>+		vl.members |= BIT(i);</div><div class='add'>+		if (!b53_vlan_port_needs_forced_tagged(ds, i))</div><div class='add'>+			vl.untag = vl.members;</div><div class='add'>+		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(i),</div><div class='add'>+			    def_vid);</div><div class='add'>+	}</div><div class='add'>+	b53_set_vlan_entry(dev, def_vid, &amp;vl);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vlan_filtering) {</div><div class='add'>+		/* Upon initial call we have not set-up any VLANs, but upon</div><div class='add'>+		 * system resume, we need to restore all VLAN entries.</div><div class='add'>+		 */</div><div class='add'>+		for (vid = def_vid + 1; vid &lt; dev-&gt;num_vlans; vid++) {</div><div class='add'>+			v = &amp;dev-&gt;vlans[vid];</div><div class='add'>+</div><div class='add'>+			if (!v-&gt;members)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			b53_set_vlan_entry(dev, vid, v);</div><div class='add'>+			b53_fast_age_vlan(dev, vid);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		b53_for_each_port(dev, i) {</div><div class='add'>+			if (!dsa_is_cpu_port(ds, i))</div><div class='add'>+				b53_write16(dev, B53_VLAN_PAGE,</div><div class='add'>+					    B53_VLAN_PORT_DEF_TAG(i),</div><div class='add'>+					    dev-&gt;ports[i].pvid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -726,8 +1012,11 @@ static int b53_switch_reset(struct b53_device *dev)</div><div class='ctx'> 			usleep_range(1000, 2000);</div><div class='ctx'> 		} while (timeout-- &gt; 0);</div><div class='ctx'> </div><div class='del'>-		if (timeout == 0)</div><div class='add'>+		if (timeout == 0) {</div><div class='add'>+			dev_err(dev-&gt;dev,</div><div class='add'>+				"Timeout waiting for SW_RST to clear!\n");</div><div class='ctx'> 			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	b53_read8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, &amp;mgmt);</div><div class='hunk'>@@ -746,6 +1035,7 @@ static int b53_switch_reset(struct b53_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	b53_enable_mib(dev);</div><div class='add'>+	b53_enable_stp(dev);</div><div class='ctx'> </div><div class='ctx'> 	return b53_flush_arl(dev, FAST_AGE_STATIC);</div><div class='ctx'> }</div><div class='hunk'>@@ -778,8 +1068,6 @@ static int b53_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)</div><div class='ctx'> static int b53_reset_switch(struct b53_device *priv)</div><div class='ctx'> {</div><div class='ctx'> 	/* reset vlans */</div><div class='del'>-	priv-&gt;enable_jumbo = false;</div><div class='del'>-</div><div class='ctx'> 	memset(priv-&gt;vlans, 0, sizeof(*priv-&gt;vlans) * priv-&gt;num_vlans);</div><div class='ctx'> 	memset(priv-&gt;ports, 0, sizeof(*priv-&gt;ports) * priv-&gt;num_ports);</div><div class='ctx'> </div><div class='hunk'>@@ -847,7 +1135,7 @@ static struct phy_device *b53_get_phy_device(struct dsa_switch *ds, int port)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mdiobus_get_phy(ds-&gt;slave_mii_bus, port);</div><div class='add'>+	return mdiobus_get_phy(ds-&gt;user_mii_bus, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='hunk'>@@ -861,8 +1149,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='ctx'> </div><div class='ctx'> 	if (stringset == ETH_SS_STATS) {</div><div class='ctx'> 		for (i = 0; i &lt; mib_size; i++)</div><div class='del'>-			strlcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-				mibs[i].name, ETH_GSTRING_LEN);</div><div class='add'>+			ethtool_puts(&amp;data, mibs[i].name);</div><div class='ctx'> 	} else if (stringset == ETH_SS_PHY_STATS) {</div><div class='ctx'> 		phydev = b53_get_phy_device(ds, port);</div><div class='ctx'> 		if (!phydev)</div><div class='hunk'>@@ -937,42 +1224,121 @@ int b53_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_get_sset_count);</div><div class='ctx'> </div><div class='add'>+enum b53_devlink_resource_id {</div><div class='add'>+	B53_DEVLINK_PARAM_ID_VLAN_TABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 b53_devlink_vlan_table_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = priv;</div><div class='add'>+	struct b53_vlan *vl;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u64 count = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_vlans; i++) {</div><div class='add'>+		vl = &amp;dev-&gt;vlans[i];</div><div class='add'>+		if (vl-&gt;members)</div><div class='add'>+			count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int b53_setup_devlink_resources(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource_size_params size_params;</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_resource_size_params_init(&amp;size_params, dev-&gt;num_vlans,</div><div class='add'>+					  dev-&gt;num_vlans,</div><div class='add'>+					  1, DEVLINK_RESOURCE_UNIT_ENTRY);</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "VLAN", dev-&gt;num_vlans,</div><div class='add'>+					    B53_DEVLINK_PARAM_ID_VLAN_TABLE,</div><div class='add'>+					    DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      B53_DEVLINK_PARAM_ID_VLAN_TABLE,</div><div class='add'>+					      b53_devlink_vlan_table_get, dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_setup_devlink_resources);</div><div class='add'>+</div><div class='ctx'> static int b53_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	struct b53_vlan *vl;</div><div class='ctx'> 	unsigned int port;</div><div class='add'>+	u16 pvid;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	/* Request bridge PVID untagged when DSA_TAG_PROTO_NONE is set</div><div class='add'>+	 * which forces the CPU port to be tagged in all VLANs.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;untag_bridge_pvid = dev-&gt;tag_protocol == DSA_TAG_PROTO_NONE;</div><div class='add'>+</div><div class='add'>+	/* The switch does not tell us the original VLAN for untagged</div><div class='add'>+	 * packets, so keep the CPU port always tagged.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;untag_vlan_aware_bridge_pvid = true;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id == BCM53101_DEVICE_ID) {</div><div class='add'>+		/* BCM53101 uses 0.5 second increments */</div><div class='add'>+		ds-&gt;ageing_time_min = 1 * 500;</div><div class='add'>+		ds-&gt;ageing_time_max = AGE_TIME_MAX * 500;</div><div class='add'>+	} else {</div><div class='add'>+		/* Everything else uses 1 second increments */</div><div class='add'>+		ds-&gt;ageing_time_min = 1 * 1000;</div><div class='add'>+		ds-&gt;ageing_time_max = AGE_TIME_MAX * 1000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = b53_reset_switch(dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(ds-&gt;dev, "failed to reset switch\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* setup default vlan for filtering mode */</div><div class='add'>+	pvid = b53_default_pvid(dev);</div><div class='add'>+	vl = &amp;dev-&gt;vlans[pvid];</div><div class='add'>+	b53_for_each_port(dev, port) {</div><div class='add'>+		vl-&gt;members |= BIT(port);</div><div class='add'>+		if (!b53_vlan_port_needs_forced_tagged(ds, port))</div><div class='add'>+			vl-&gt;untag |= BIT(port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	b53_reset_mib(dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = b53_apply_config(dev);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_err(ds-&gt;dev, "failed to apply configuration\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* Configure IMP/CPU port, disable unused ports. Enabled</div><div class='add'>+	/* Configure IMP/CPU port, disable all other ports. Enabled</div><div class='ctx'> 	 * ports will be configured with .port_enable</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (port = 0; port &lt; dev-&gt;num_ports; port++) {</div><div class='ctx'> 		if (dsa_is_cpu_port(ds, port))</div><div class='ctx'> 			b53_enable_cpu_port(dev, port);</div><div class='del'>-		else if (dsa_is_unused_port(ds, port))</div><div class='add'>+		else</div><div class='ctx'> 			b53_disable_port(ds, port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Let DSA handle the case were multiple bridges span the same switch</div><div class='del'>-	 * device and different VLAN awareness settings are requested, which</div><div class='del'>-	 * would be breaking filtering semantics for any of the other bridge</div><div class='del'>-	 * devices. (not hardware supported)</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;vlan_filtering_is_global = true;</div><div class='add'>+	return b53_setup_devlink_resources(ds);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+static void b53_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b53_force_link(struct b53_device *dev, int port, int link)</div><div class='hunk'>@@ -980,9 +1346,11 @@ static void b53_force_link(struct b53_device *dev, int port, int link)</div><div class='ctx'> 	u8 reg, val, off;</div><div class='ctx'> </div><div class='ctx'> 	/* Override the port settings */</div><div class='del'>-	if (port == dev-&gt;cpu_port) {</div><div class='add'>+	if (port == dev-&gt;imp_port) {</div><div class='ctx'> 		off = B53_PORT_OVERRIDE_CTRL;</div><div class='ctx'> 		val = PORT_OVERRIDE_EN;</div><div class='add'>+	} else if (is5325(dev)) {</div><div class='add'>+		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		off = B53_GMII_PORT_OVERRIDE_CTRL(port);</div><div class='ctx'> 		val = GMII_PO_EN;</div><div class='hunk'>@@ -998,14 +1366,17 @@ static void b53_force_link(struct b53_device *dev, int port, int link)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b53_force_port_config(struct b53_device *dev, int port,</div><div class='del'>-				  int speed, int duplex, int pause)</div><div class='add'>+				  int speed, int duplex,</div><div class='add'>+				  bool tx_pause, bool rx_pause)</div><div class='ctx'> {</div><div class='ctx'> 	u8 reg, val, off;</div><div class='ctx'> </div><div class='ctx'> 	/* Override the port settings */</div><div class='del'>-	if (port == dev-&gt;cpu_port) {</div><div class='add'>+	if (port == dev-&gt;imp_port) {</div><div class='ctx'> 		off = B53_PORT_OVERRIDE_CTRL;</div><div class='ctx'> 		val = PORT_OVERRIDE_EN;</div><div class='add'>+	} else if (is5325(dev)) {</div><div class='add'>+		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		off = B53_GMII_PORT_OVERRIDE_CTRL(port);</div><div class='ctx'> 		val = GMII_PO_EN;</div><div class='hunk'>@@ -1018,10 +1389,14 @@ static void b53_force_port_config(struct b53_device *dev, int port,</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~PORT_OVERRIDE_FULL_DUPLEX;</div><div class='ctx'> </div><div class='add'>+	reg &amp;= ~(0x3 &lt;&lt; GMII_PO_SPEED_S);</div><div class='add'>+	if (is5301x(dev) || is58xx(dev))</div><div class='add'>+		reg &amp;= ~PORT_OVERRIDE_SPEED_2000M;</div><div class='add'>+</div><div class='ctx'> 	switch (speed) {</div><div class='ctx'> 	case 2000:</div><div class='ctx'> 		reg |= PORT_OVERRIDE_SPEED_2000M;</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SPEED_1000:</div><div class='ctx'> 		reg |= PORT_OVERRIDE_SPEED_1000M;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1036,104 +1411,114 @@ static void b53_force_port_config(struct b53_device *dev, int port,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pause &amp; MLO_PAUSE_RX)</div><div class='del'>-		reg |= PORT_OVERRIDE_RX_FLOW;</div><div class='del'>-	if (pause &amp; MLO_PAUSE_TX)</div><div class='del'>-		reg |= PORT_OVERRIDE_TX_FLOW;</div><div class='add'>+	if (is5325(dev))</div><div class='add'>+		reg &amp;= ~PORT_OVERRIDE_LP_FLOW_25;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~(PORT_OVERRIDE_RX_FLOW | PORT_OVERRIDE_TX_FLOW);</div><div class='add'>+</div><div class='add'>+	if (rx_pause) {</div><div class='add'>+		if (is5325(dev))</div><div class='add'>+			reg |= PORT_OVERRIDE_LP_FLOW_25;</div><div class='add'>+		else</div><div class='add'>+			reg |= PORT_OVERRIDE_RX_FLOW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_pause) {</div><div class='add'>+		if (is5325(dev))</div><div class='add'>+			reg |= PORT_OVERRIDE_LP_FLOW_25;</div><div class='add'>+		else</div><div class='add'>+			reg |= PORT_OVERRIDE_TX_FLOW;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	b53_write8(dev, B53_CTRL_PAGE, off, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b53_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-			    struct phy_device *phydev)</div><div class='add'>+static void b53_adjust_63xx_rgmii(struct dsa_switch *ds, int port,</div><div class='add'>+				  phy_interface_t interface)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	struct ethtool_eee *p = &amp;dev-&gt;ports[port].eee;</div><div class='del'>-	u8 rgmii_ctrl = 0, reg = 0, off;</div><div class='del'>-	int pause = 0;</div><div class='add'>+	u8 rgmii_ctrl = 0;</div><div class='ctx'> </div><div class='del'>-	if (!phy_is_pseudo_fixed_link(phydev))</div><div class='del'>-		return;</div><div class='add'>+	b53_read8(dev, B53_CTRL_PAGE, B53_RGMII_CTRL_P(port), &amp;rgmii_ctrl);</div><div class='add'>+	rgmii_ctrl &amp;= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);</div><div class='ctx'> </div><div class='del'>-	/* Enable flow control on BCM5301x's CPU port */</div><div class='del'>-	if (is5301x(dev) &amp;&amp; port == dev-&gt;cpu_port)</div><div class='del'>-		pause = MLO_PAUSE_TXRX_MASK;</div><div class='add'>+	if (is6318_268(dev))</div><div class='add'>+		rgmii_ctrl |= RGMII_CTRL_MII_OVERRIDE;</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;pause) {</div><div class='del'>-		if (phydev-&gt;asym_pause)</div><div class='del'>-			pause |= MLO_PAUSE_TX;</div><div class='del'>-		pause |= MLO_PAUSE_RX;</div><div class='del'>-	}</div><div class='add'>+	rgmii_ctrl |= RGMII_CTRL_ENABLE_GMII;</div><div class='ctx'> </div><div class='del'>-	b53_force_port_config(dev, port, phydev-&gt;speed, phydev-&gt;duplex, pause);</div><div class='del'>-	b53_force_link(dev, port, phydev-&gt;link);</div><div class='add'>+	b53_write8(dev, B53_CTRL_PAGE, B53_RGMII_CTRL_P(port), rgmii_ctrl);</div><div class='ctx'> </div><div class='del'>-	if (is531x5(dev) &amp;&amp; phy_interface_is_rgmii(phydev)) {</div><div class='del'>-		if (port == 8)</div><div class='del'>-			off = B53_RGMII_CTRL_IMP;</div><div class='del'>-		else</div><div class='del'>-			off = B53_RGMII_CTRL_P(port);</div><div class='add'>+	dev_dbg(ds-&gt;dev, "Configured port %d for %s\n", port,</div><div class='add'>+		phy_modes(interface));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Configure the port RGMII clock delay by DLL disabled and</div><div class='del'>-		 * tx_clk aligned timing (restoring to reset defaults)</div><div class='del'>-		 */</div><div class='del'>-		b53_read8(dev, B53_CTRL_PAGE, off, &amp;rgmii_ctrl);</div><div class='del'>-		rgmii_ctrl &amp;= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC |</div><div class='del'>-				RGMII_CTRL_TIMING_SEL);</div><div class='del'>-</div><div class='del'>-		/* PHY_INTERFACE_MODE_RGMII_TXID means TX internal delay, make</div><div class='del'>-		 * sure that we enable the port TX clock internal delay to</div><div class='del'>-		 * account for this internal delay that is inserted, otherwise</div><div class='del'>-		 * the switch won't be able to receive correctly.</div><div class='del'>-		 *</div><div class='del'>-		 * PHY_INTERFACE_MODE_RGMII means that we are not introducing</div><div class='del'>-		 * any delay neither on transmission nor reception, so the</div><div class='del'>-		 * BCM53125 must also be configured accordingly to account for</div><div class='del'>-		 * the lack of delay and introduce</div><div class='del'>-		 *</div><div class='del'>-		 * The BCM53125 switch has its RX clock and TX clock control</div><div class='del'>-		 * swapped, hence the reason why we modify the TX clock path in</div><div class='del'>-		 * the "RGMII" case</div><div class='del'>-		 */</div><div class='del'>-		if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII_TXID)</div><div class='del'>-			rgmii_ctrl |= RGMII_CTRL_DLL_TXC;</div><div class='del'>-		if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII)</div><div class='del'>-			rgmii_ctrl |= RGMII_CTRL_DLL_TXC | RGMII_CTRL_DLL_RXC;</div><div class='add'>+static void b53_adjust_531x5_rgmii(struct dsa_switch *ds, int port,</div><div class='add'>+				   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	u8 rgmii_ctrl = 0, off;</div><div class='add'>+</div><div class='add'>+	if (port == dev-&gt;imp_port)</div><div class='add'>+		off = B53_RGMII_CTRL_IMP;</div><div class='add'>+	else</div><div class='add'>+		off = B53_RGMII_CTRL_P(port);</div><div class='add'>+</div><div class='add'>+	/* Configure the port RGMII clock delay by DLL disabled and</div><div class='add'>+	 * tx_clk aligned timing (restoring to reset defaults)</div><div class='add'>+	 */</div><div class='add'>+	b53_read8(dev, B53_CTRL_PAGE, off, &amp;rgmii_ctrl);</div><div class='add'>+	rgmii_ctrl &amp;= ~(RGMII_CTRL_DLL_RXC | RGMII_CTRL_DLL_TXC);</div><div class='add'>+</div><div class='add'>+	/* PHY_INTERFACE_MODE_RGMII_TXID means TX internal delay, make</div><div class='add'>+	 * sure that we enable the port TX clock internal delay to</div><div class='add'>+	 * account for this internal delay that is inserted, otherwise</div><div class='add'>+	 * the switch won't be able to receive correctly.</div><div class='add'>+	 *</div><div class='add'>+	 * PHY_INTERFACE_MODE_RGMII means that we are not introducing</div><div class='add'>+	 * any delay neither on transmission nor reception, so the</div><div class='add'>+	 * BCM53125 must also be configured accordingly to account for</div><div class='add'>+	 * the lack of delay and introduce</div><div class='add'>+	 *</div><div class='add'>+	 * The BCM53125 switch has its RX clock and TX clock control</div><div class='add'>+	 * swapped, hence the reason why we modify the TX clock path in</div><div class='add'>+	 * the "RGMII" case</div><div class='add'>+	 */</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_RGMII_TXID)</div><div class='add'>+		rgmii_ctrl |= RGMII_CTRL_DLL_TXC;</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_RGMII)</div><div class='add'>+		rgmii_ctrl |= RGMII_CTRL_DLL_TXC | RGMII_CTRL_DLL_RXC;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id != BCM53115_DEVICE_ID)</div><div class='ctx'> 		rgmii_ctrl |= RGMII_CTRL_TIMING_SEL;</div><div class='del'>-		b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);</div><div class='ctx'> </div><div class='del'>-		dev_info(ds-&gt;dev, "Configured port %d for %s\n", port,</div><div class='del'>-			 phy_modes(phydev-&gt;interface));</div><div class='del'>-	}</div><div class='add'>+	b53_write8(dev, B53_CTRL_PAGE, off, rgmii_ctrl);</div><div class='ctx'> </div><div class='del'>-	/* configure MII port if necessary */</div><div class='del'>-	if (is5325(dev)) {</div><div class='add'>+	dev_info(ds-&gt;dev, "Configured port %d for %s\n", port,</div><div class='add'>+		 phy_modes(interface));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_adjust_5325_mii(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	u8 reg = 0;</div><div class='add'>+</div><div class='add'>+	b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,</div><div class='add'>+		  &amp;reg);</div><div class='add'>+</div><div class='add'>+	/* reverse mii needs to be enabled */</div><div class='add'>+	if (!(reg &amp; PORT_OVERRIDE_RV_MII_25)) {</div><div class='add'>+		b53_write8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,</div><div class='add'>+			   reg | PORT_OVERRIDE_RV_MII_25);</div><div class='ctx'> 		b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,</div><div class='ctx'> 			  &amp;reg);</div><div class='ctx'> </div><div class='del'>-		/* reverse mii needs to be enabled */</div><div class='ctx'> 		if (!(reg &amp; PORT_OVERRIDE_RV_MII_25)) {</div><div class='del'>-			b53_write8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,</div><div class='del'>-				   reg | PORT_OVERRIDE_RV_MII_25);</div><div class='del'>-			b53_read8(dev, B53_CTRL_PAGE, B53_PORT_OVERRIDE_CTRL,</div><div class='del'>-				  &amp;reg);</div><div class='del'>-</div><div class='del'>-			if (!(reg &amp; PORT_OVERRIDE_RV_MII_25)) {</div><div class='del'>-				dev_err(ds-&gt;dev,</div><div class='del'>-					"Failed to enable reverse MII mode\n");</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (is5301x(dev)) {</div><div class='del'>-		if (port != dev-&gt;cpu_port) {</div><div class='del'>-			b53_force_port_config(dev, dev-&gt;cpu_port, 2000,</div><div class='del'>-					      DUPLEX_FULL, MLO_PAUSE_TXRX_MASK);</div><div class='del'>-			b53_force_link(dev, dev-&gt;cpu_port, 1);</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Failed to enable reverse MII mode\n");</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* Re-negotiate EEE if it was enabled already */</div><div class='del'>-	p-&gt;eee_enabled = b53_eee_init(ds, port, phydev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void b53_port_event(struct dsa_switch *ds, int port)</div><div class='hunk'>@@ -1148,103 +1533,97 @@ void b53_port_event(struct dsa_switch *ds, int port)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_port_event);</div><div class='ctx'> </div><div class='del'>-void b53_phylink_validate(struct dsa_switch *ds, int port,</div><div class='del'>-			  unsigned long *supported,</div><div class='del'>-			  struct phylink_link_state *state)</div><div class='add'>+static void b53_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct phylink_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;ops-&gt;serdes_phylink_validate)</div><div class='del'>-		dev-&gt;ops-&gt;serdes_phylink_validate(dev, port, mask, state);</div><div class='del'>-</div><div class='del'>-	/* Allow all the expected bits */</div><div class='del'>-	phylink_set(mask, Autoneg);</div><div class='del'>-	phylink_set_port_modes(mask);</div><div class='del'>-	phylink_set(mask, Pause);</div><div class='del'>-	phylink_set(mask, Asym_Pause);</div><div class='ctx'> </div><div class='del'>-	/* With the exclusion of 5325/5365, MII, Reverse MII and 802.3z, we</div><div class='del'>-	 * support Gigabit, including Half duplex.</div><div class='add'>+	/* Internal ports need GMII for PHYLIB */</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_GMII, config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	/* These switches appear to support MII and RevMII too, but beyond</div><div class='add'>+	 * this, the code gives very few clues. FIXME: We probably need more</div><div class='add'>+	 * interface modes here.</div><div class='add'>+	 *</div><div class='add'>+	 * According to b53_srab_mux_init(), ports 3..5 can support:</div><div class='add'>+	 *  SGMII, MII, GMII, RGMII or INTERNAL depending on the MUX setting.</div><div class='add'>+	 * However, the interface mode read from the MUX configuration is</div><div class='add'>+	 * not passed back to DSA, so phylink uses NA.</div><div class='add'>+	 * DT can specify RGMII for ports 0, 1.</div><div class='add'>+	 * For MDIO, port 8 can be RGMII_TXID.</div><div class='ctx'> 	 */</div><div class='del'>-	if (state-&gt;interface != PHY_INTERFACE_MODE_MII &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_REVMII &amp;&amp;</div><div class='del'>-	    !phy_interface_mode_is_8023z(state-&gt;interface) &amp;&amp;</div><div class='del'>-	    !(is5325(dev) || is5365(dev))) {</div><div class='del'>-		phylink_set(mask, 1000baseT_Full);</div><div class='del'>-		phylink_set(mask, 1000baseT_Half);</div><div class='del'>-	}</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_MII, config-&gt;supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_REVMII, config-&gt;supported_interfaces);</div><div class='ctx'> </div><div class='del'>-	if (!phy_interface_mode_is_8023z(state-&gt;interface)) {</div><div class='del'>-		phylink_set(mask, 10baseT_Half);</div><div class='del'>-		phylink_set(mask, 10baseT_Full);</div><div class='del'>-		phylink_set(mask, 100baseT_Half);</div><div class='del'>-		phylink_set(mask, 100baseT_Full);</div><div class='del'>-	}</div><div class='add'>+	/* BCM63xx RGMII ports support RGMII */</div><div class='add'>+	if (is63xx(dev) &amp;&amp; in_range(port, B53_63XX_RGMII0, 4))</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='ctx'> </div><div class='del'>-	bitmap_and(supported, supported, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	bitmap_and(state-&gt;advertising, state-&gt;advertising, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100;</div><div class='ctx'> </div><div class='del'>-	phylink_helper_basex_speed(state);</div><div class='add'>+	/* 5325/5365 are not capable of gigabit speeds, everything else is.</div><div class='add'>+	 * Note: the original code also exclulded Gigagbit for MII, RevMII</div><div class='add'>+	 * and 802.3z modes. MII and RevMII are not able to work above 100M,</div><div class='add'>+	 * so will be excluded by the generic validator implementation.</div><div class='add'>+	 * However, the exclusion of Gigabit for 802.3z just seems wrong.</div><div class='add'>+	 */</div><div class='add'>+	if (!(is5325(dev) || is5365(dev)))</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_1000;</div><div class='add'>+</div><div class='add'>+	/* Get the implementation specific capabilities */</div><div class='add'>+	if (dev-&gt;ops-&gt;phylink_get_caps)</div><div class='add'>+		dev-&gt;ops-&gt;phylink_get_caps(dev, port, config);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_phylink_validate);</div><div class='ctx'> </div><div class='del'>-int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,</div><div class='del'>-			       struct phylink_link_state *state)</div><div class='add'>+static struct phylink_pcs *b53_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+						      phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct b53_device *dev = dp-&gt;ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if ((phy_interface_mode_is_8023z(state-&gt;interface) ||</div><div class='del'>-	     state-&gt;interface == PHY_INTERFACE_MODE_SGMII) &amp;&amp;</div><div class='del'>-	     dev-&gt;ops-&gt;serdes_link_state)</div><div class='del'>-		ret = dev-&gt;ops-&gt;serdes_link_state(dev, port, state);</div><div class='add'>+	if (!dev-&gt;ops-&gt;phylink_mac_select_pcs)</div><div class='add'>+		return NULL;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return dev-&gt;ops-&gt;phylink_mac_select_pcs(dev, dp-&gt;index, interface);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_phylink_mac_link_state);</div><div class='ctx'> </div><div class='del'>-void b53_phylink_mac_config(struct dsa_switch *ds, int port,</div><div class='del'>-			    unsigned int mode,</div><div class='del'>-			    const struct phylink_link_state *state)</div><div class='add'>+static void b53_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				   unsigned int mode,</div><div class='add'>+				   const struct phylink_link_state *state)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	phy_interface_t interface = state-&gt;interface;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='ctx'> </div><div class='del'>-	if (mode == MLO_AN_PHY)</div><div class='del'>-		return;</div><div class='add'>+	if (is63xx(dev) &amp;&amp; in_range(port, B53_63XX_RGMII0, 4))</div><div class='add'>+		b53_adjust_63xx_rgmii(ds, port, interface);</div><div class='ctx'> </div><div class='ctx'> 	if (mode == MLO_AN_FIXED) {</div><div class='del'>-		b53_force_port_config(dev, port, state-&gt;speed,</div><div class='del'>-				      state-&gt;duplex, state-&gt;pause);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((phy_interface_mode_is_8023z(state-&gt;interface) ||</div><div class='del'>-	     state-&gt;interface == PHY_INTERFACE_MODE_SGMII) &amp;&amp;</div><div class='del'>-	     dev-&gt;ops-&gt;serdes_config)</div><div class='del'>-		dev-&gt;ops-&gt;serdes_config(dev, port, mode, state);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(b53_phylink_mac_config);</div><div class='add'>+		if (is531x5(dev) &amp;&amp; phy_interface_mode_is_rgmii(interface))</div><div class='add'>+			b53_adjust_531x5_rgmii(ds, port, interface);</div><div class='ctx'> </div><div class='del'>-void b53_phylink_mac_an_restart(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;ops-&gt;serdes_an_restart)</div><div class='del'>-		dev-&gt;ops-&gt;serdes_an_restart(dev, port);</div><div class='add'>+		/* configure MII port if necessary */</div><div class='add'>+		if (is5325(dev))</div><div class='add'>+			b53_adjust_5325_mii(ds, port);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_phylink_mac_an_restart);</div><div class='ctx'> </div><div class='del'>-void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,</div><div class='del'>-			       unsigned int mode,</div><div class='del'>-			       phy_interface_t interface)</div><div class='add'>+static void b53_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+				      unsigned int mode,</div><div class='add'>+				      phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct b53_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='ctx'> </div><div class='del'>-	if (mode == MLO_AN_PHY)</div><div class='add'>+	if (mode == MLO_AN_PHY) {</div><div class='add'>+		if (is63xx(dev) &amp;&amp; in_range(port, B53_63XX_RGMII0, 4))</div><div class='add'>+			b53_force_link(dev, port, false);</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (mode == MLO_AN_FIXED) {</div><div class='ctx'> 		b53_force_link(dev, port, false);</div><div class='hunk'>@@ -1255,19 +1634,40 @@ void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,</div><div class='ctx'> 	    dev-&gt;ops-&gt;serdes_link_set)</div><div class='ctx'> 		dev-&gt;ops-&gt;serdes_link_set(dev, port, mode, interface, false);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_phylink_mac_link_down);</div><div class='ctx'> </div><div class='del'>-void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,</div><div class='del'>-			     unsigned int mode,</div><div class='del'>-			     phy_interface_t interface,</div><div class='del'>-			     struct phy_device *phydev)</div><div class='add'>+static void b53_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+				    struct phy_device *phydev,</div><div class='add'>+				    unsigned int mode,</div><div class='add'>+				    phy_interface_t interface,</div><div class='add'>+				    int speed, int duplex,</div><div class='add'>+				    bool tx_pause, bool rx_pause)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ethtool_keee *p = &amp;dev-&gt;ports[dp-&gt;index].eee;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (mode == MLO_AN_PHY) {</div><div class='add'>+		/* Re-negotiate EEE if it was enabled already */</div><div class='add'>+		p-&gt;eee_enabled = b53_eee_init(ds, port, phydev);</div><div class='add'>+</div><div class='add'>+		if (is63xx(dev) &amp;&amp; in_range(port, B53_63XX_RGMII0, 4)) {</div><div class='add'>+			b53_force_port_config(dev, port, speed, duplex,</div><div class='add'>+					      tx_pause, rx_pause);</div><div class='add'>+			b53_force_link(dev, port, true);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (mode == MLO_AN_PHY)</div><div class='ctx'> 		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (mode == MLO_AN_FIXED) {</div><div class='add'>+		/* Force flow control on BCM5301x's CPU port */</div><div class='add'>+		if (is5301x(dev) &amp;&amp; dsa_is_cpu_port(ds, port))</div><div class='add'>+			tx_pause = rx_pause = true;</div><div class='add'>+</div><div class='add'>+		b53_force_port_config(dev, port, speed, duplex,</div><div class='add'>+				      tx_pause, rx_pause);</div><div class='ctx'> 		b53_force_link(dev, port, true);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1276,82 +1676,93 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,</div><div class='ctx'> 	    dev-&gt;ops-&gt;serdes_link_set)</div><div class='ctx'> 		dev-&gt;ops-&gt;serdes_link_set(dev, port, mode, interface, true);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_phylink_mac_link_up);</div><div class='ctx'> </div><div class='del'>-int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)</div><div class='add'>+int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	u16 pvid, new_pvid;</div><div class='ctx'> </div><div class='del'>-	b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &amp;pvid);</div><div class='del'>-	new_pvid = pvid;</div><div class='del'>-	if (!vlan_filtering) {</div><div class='del'>-		/* Filtering is currently enabled, use the default PVID since</div><div class='del'>-		 * the bridge does not expect tagging anymore</div><div class='del'>-		 */</div><div class='del'>-		dev-&gt;ports[port].pvid = pvid;</div><div class='del'>-		new_pvid = b53_default_pvid(dev);</div><div class='del'>-	} else {</div><div class='del'>-		/* Filtering is currently disabled, restore the previous PVID */</div><div class='del'>-		new_pvid = dev-&gt;ports[port].pvid;</div><div class='add'>+	if (dev-&gt;vlan_filtering != vlan_filtering) {</div><div class='add'>+		dev-&gt;vlan_filtering = vlan_filtering;</div><div class='add'>+		b53_apply_config(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pvid != new_pvid)</div><div class='del'>-		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),</div><div class='del'>-			    new_pvid);</div><div class='del'>-</div><div class='del'>-	b53_enable_vlan(dev, dev-&gt;vlan_enabled, vlan_filtering);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_vlan_filtering);</div><div class='ctx'> </div><div class='del'>-int b53_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+static int b53_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='add'>+			    const struct switchdev_obj_port_vlan *vlan)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if ((is5325(dev) || is5365(dev)) &amp;&amp; vlan-&gt;vid_begin == 0)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	/* Port 7 on 7278 connects to the ASP's UniMAC which is not capable of</div><div class='add'>+	 * receiving VLAN tagged frames at all, we can still allow the port to</div><div class='add'>+	 * be configured for egress untagged.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;chip_id == BCM7278_DEVICE_ID &amp;&amp; port == 7 &amp;&amp;</div><div class='add'>+	    !(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (vlan-&gt;vid_end &gt; dev-&gt;num_vlans)</div><div class='add'>+	if (vlan-&gt;vid &gt;= dev-&gt;num_vlans)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	b53_enable_vlan(dev, true, ds-&gt;vlan_filtering);</div><div class='add'>+	b53_enable_vlan(dev, port, true, dev-&gt;vlan_filtering);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_vlan_prepare);</div><div class='ctx'> </div><div class='del'>-void b53_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-		  const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+int b53_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+		 const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='ctx'> 	struct b53_vlan *vl;</div><div class='del'>-	u16 vid;</div><div class='add'>+	u16 old_pvid, new_pvid;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		vl = &amp;dev-&gt;vlans[vid];</div><div class='add'>+	err = b53_vlan_prepare(ds, port, vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-		b53_get_vlan_entry(dev, vid, vl);</div><div class='add'>+	if (vlan-&gt;vid == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		vl-&gt;members |= BIT(port);</div><div class='del'>-		if (untagged &amp;&amp; !dsa_is_cpu_port(ds, port))</div><div class='del'>-			vl-&gt;untag |= BIT(port);</div><div class='del'>-		else</div><div class='del'>-			vl-&gt;untag &amp;= ~BIT(port);</div><div class='add'>+	old_pvid = dev-&gt;ports[port].pvid;</div><div class='add'>+	if (pvid)</div><div class='add'>+		new_pvid = vlan-&gt;vid;</div><div class='add'>+	else if (!pvid &amp;&amp; vlan-&gt;vid == old_pvid)</div><div class='add'>+		new_pvid = b53_default_pvid(dev);</div><div class='add'>+	else</div><div class='add'>+		new_pvid = old_pvid;</div><div class='add'>+	dev-&gt;ports[port].pvid = new_pvid;</div><div class='ctx'> </div><div class='del'>-		b53_set_vlan_entry(dev, vid, vl);</div><div class='del'>-		b53_fast_age_vlan(dev, vid);</div><div class='del'>-	}</div><div class='add'>+	vl = &amp;dev-&gt;vlans[vlan-&gt;vid];</div><div class='ctx'> </div><div class='del'>-	if (pvid &amp;&amp; !dsa_is_cpu_port(ds, port)) {</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		untagged = false;</div><div class='add'>+</div><div class='add'>+	vl-&gt;members |= BIT(port);</div><div class='add'>+	if (untagged &amp;&amp; !b53_vlan_port_needs_forced_tagged(ds, port))</div><div class='add'>+		vl-&gt;untag |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		vl-&gt;untag &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;vlan_filtering)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	b53_set_vlan_entry(dev, vlan-&gt;vid, vl);</div><div class='add'>+	b53_fast_age_vlan(dev, vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port) &amp;&amp; new_pvid != old_pvid) {</div><div class='ctx'> 		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),</div><div class='del'>-			    vlan-&gt;vid_end);</div><div class='del'>-		b53_fast_age_vlan(dev, vid);</div><div class='add'>+			    new_pvid);</div><div class='add'>+		b53_fast_age_vlan(dev, old_pvid);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_vlan_add);</div><div class='ctx'> </div><div class='hunk'>@@ -1361,27 +1772,29 @@ int b53_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	struct b53_vlan *vl;</div><div class='del'>-	u16 vid;</div><div class='ctx'> 	u16 pvid;</div><div class='ctx'> </div><div class='del'>-	b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &amp;pvid);</div><div class='add'>+	if (vlan-&gt;vid == 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		vl = &amp;dev-&gt;vlans[vid];</div><div class='add'>+	pvid = dev-&gt;ports[port].pvid;</div><div class='ctx'> </div><div class='del'>-		b53_get_vlan_entry(dev, vid, vl);</div><div class='add'>+	vl = &amp;dev-&gt;vlans[vlan-&gt;vid];</div><div class='ctx'> </div><div class='del'>-		vl-&gt;members &amp;= ~BIT(port);</div><div class='add'>+	vl-&gt;members &amp;= ~BIT(port);</div><div class='ctx'> </div><div class='del'>-		if (pvid == vid)</div><div class='del'>-			pvid = b53_default_pvid(dev);</div><div class='add'>+	if (pvid == vlan-&gt;vid)</div><div class='add'>+		pvid = b53_default_pvid(dev);</div><div class='add'>+	dev-&gt;ports[port].pvid = pvid;</div><div class='ctx'> </div><div class='del'>-		if (untagged &amp;&amp; !dsa_is_cpu_port(ds, port))</div><div class='del'>-			vl-&gt;untag &amp;= ~(BIT(port));</div><div class='add'>+	if (untagged &amp;&amp; !b53_vlan_port_needs_forced_tagged(ds, port))</div><div class='add'>+		vl-&gt;untag &amp;= ~(BIT(port));</div><div class='ctx'> </div><div class='del'>-		b53_set_vlan_entry(dev, vid, vl);</div><div class='del'>-		b53_fast_age_vlan(dev, vid);</div><div class='del'>-	}</div><div class='add'>+	if (!dev-&gt;vlan_filtering)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	b53_set_vlan_entry(dev, vlan-&gt;vid, vl);</div><div class='add'>+	b53_fast_age_vlan(dev, vlan-&gt;vid);</div><div class='ctx'> </div><div class='ctx'> 	b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), pvid);</div><div class='ctx'> 	b53_fast_age_vlan(dev, pvid);</div><div class='hunk'>@@ -1390,7 +1803,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_vlan_del);</div><div class='ctx'> </div><div class='del'>-/* Address Resolution Logic routines */</div><div class='add'>+/* Address Resolution Logic routines. Caller must hold &amp;dev-&gt;arl_mutex. */</div><div class='ctx'> static int b53_arl_op_wait(struct b53_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int timeout = 10;</div><div class='hunk'>@@ -1422,15 +1835,94 @@ static int b53_arl_rw_op(struct b53_device *dev, unsigned int op)</div><div class='ctx'> 		reg |= ARLTBL_RW;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~ARLTBL_RW;</div><div class='add'>+	if (dev-&gt;vlan_enabled)</div><div class='add'>+		reg &amp;= ~ARLTBL_IVL_SVL_SELECT;</div><div class='add'>+	else</div><div class='add'>+		reg |= ARLTBL_IVL_SVL_SELECT;</div><div class='ctx'> 	b53_write8(dev, B53_ARLIO_PAGE, B53_ARLTBL_RW_CTRL, reg);</div><div class='ctx'> </div><div class='ctx'> 	return b53_arl_op_wait(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b53_arl_read(struct b53_device *dev, u64 mac,</div><div class='del'>-			u16 vid, struct b53_arl_entry *ent, u8 *idx,</div><div class='del'>-			bool is_valid)</div><div class='add'>+static void b53_arl_read_entry_25(struct b53_device *dev,</div><div class='add'>+				  struct b53_arl_entry *ent, u8 idx)</div><div class='ctx'> {</div><div class='add'>+	u8 vid_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_read8(dev, B53_ARLIO_PAGE, B53_ARLTBL_VID_ENTRY_25(idx),</div><div class='add'>+		  &amp;vid_entry);</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARLTBL_MAC_VID_ENTRY(idx),</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_arl_to_entry_25(ent, mac_vid, vid_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_write_entry_25(struct b53_device *dev,</div><div class='add'>+				   const struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	u8 vid_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_arl_from_entry_25(&amp;mac_vid, &amp;vid_entry, ent);</div><div class='add'>+	b53_write8(dev, B53_ARLIO_PAGE, B53_ARLTBL_VID_ENTRY_25(idx), vid_entry);</div><div class='add'>+	b53_write64(dev, B53_ARLIO_PAGE, B53_ARLTBL_MAC_VID_ENTRY(idx),</div><div class='add'>+		    mac_vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_read_entry_89(struct b53_device *dev,</div><div class='add'>+				  struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+	u16 fwd_entry;</div><div class='add'>+</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARLTBL_MAC_VID_ENTRY(idx),</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_read16(dev, B53_ARLIO_PAGE, B53_ARLTBL_DATA_ENTRY(idx), &amp;fwd_entry);</div><div class='add'>+	b53_arl_to_entry_89(ent, mac_vid, fwd_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_write_entry_89(struct b53_device *dev,</div><div class='add'>+				   const struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	u32 fwd_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_arl_from_entry_89(&amp;mac_vid, &amp;fwd_entry, ent);</div><div class='add'>+	b53_write64(dev, B53_ARLIO_PAGE,</div><div class='add'>+		    B53_ARLTBL_MAC_VID_ENTRY(idx), mac_vid);</div><div class='add'>+	b53_write16(dev, B53_ARLIO_PAGE,</div><div class='add'>+		    B53_ARLTBL_DATA_ENTRY(idx), fwd_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_read_entry_95(struct b53_device *dev,</div><div class='add'>+				  struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	u32 fwd_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARLTBL_MAC_VID_ENTRY(idx),</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_read32(dev, B53_ARLIO_PAGE, B53_ARLTBL_DATA_ENTRY(idx), &amp;fwd_entry);</div><div class='add'>+	b53_arl_to_entry(ent, mac_vid, fwd_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_write_entry_95(struct b53_device *dev,</div><div class='add'>+				   const struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	u32 fwd_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_arl_from_entry(&amp;mac_vid, &amp;fwd_entry, ent);</div><div class='add'>+	b53_write64(dev, B53_ARLIO_PAGE, B53_ARLTBL_MAC_VID_ENTRY(idx),</div><div class='add'>+		    mac_vid);</div><div class='add'>+	b53_write32(dev, B53_ARLIO_PAGE, B53_ARLTBL_DATA_ENTRY(idx),</div><div class='add'>+		    fwd_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b53_arl_read(struct b53_device *dev, const u8 *mac,</div><div class='add'>+			u16 vid, struct b53_arl_entry *ent, u8 *idx)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(free_bins, B53_ARLTBL_MAX_BIN_ENTRIES);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1438,34 +1930,34 @@ static int b53_arl_read(struct b53_device *dev, u64 mac,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Read the bins */</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;num_arl_entries; i++) {</div><div class='del'>-		u64 mac_vid;</div><div class='del'>-		u32 fwd_entry;</div><div class='add'>+	bitmap_zero(free_bins, dev-&gt;num_arl_bins);</div><div class='ctx'> </div><div class='del'>-		b53_read64(dev, B53_ARLIO_PAGE,</div><div class='del'>-			   B53_ARLTBL_MAC_VID_ENTRY(i), &amp;mac_vid);</div><div class='del'>-		b53_read32(dev, B53_ARLIO_PAGE,</div><div class='del'>-			   B53_ARLTBL_DATA_ENTRY(i), &amp;fwd_entry);</div><div class='del'>-		b53_arl_to_entry(ent, mac_vid, fwd_entry);</div><div class='add'>+	/* Read the bins */</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;num_arl_bins; i++) {</div><div class='add'>+		b53_arl_read_entry(dev, ent, i);</div><div class='ctx'> </div><div class='del'>-		if (!(fwd_entry &amp; ARLTBL_VALID))</div><div class='add'>+		if (!ent-&gt;is_valid) {</div><div class='add'>+			set_bit(i, free_bins);</div><div class='ctx'> 			continue;</div><div class='del'>-		if ((mac_vid &amp; ARLTBL_MAC_MASK) != mac)</div><div class='add'>+		}</div><div class='add'>+		if (!ether_addr_equal(ent-&gt;mac, mac))</div><div class='add'>+			continue;</div><div class='add'>+		if (dev-&gt;vlan_enabled &amp;&amp; ent-&gt;vid != vid)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		*idx = i;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -ENOENT;</div><div class='add'>+	*idx = find_first_bit(free_bins, dev-&gt;num_arl_bins);</div><div class='add'>+	return *idx &gt;= dev-&gt;num_arl_bins ? -ENOSPC : -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b53_arl_op(struct b53_device *dev, int op, int port,</div><div class='ctx'> 		      const unsigned char *addr, u16 vid, bool is_valid)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_arl_entry ent;</div><div class='del'>-	u32 fwd_entry;</div><div class='del'>-	u64 mac, mac_vid = 0;</div><div class='ctx'> 	u8 idx = 0;</div><div class='add'>+	u64 mac;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Convert the array into a 64-bit MAC */</div><div class='hunk'>@@ -1473,73 +1965,145 @@ static int b53_arl_op(struct b53_device *dev, int op, int port,</div><div class='ctx'> </div><div class='ctx'> 	/* Perform a read for the given MAC and VID */</div><div class='ctx'> 	b53_write48(dev, B53_ARLIO_PAGE, B53_MAC_ADDR_IDX, mac);</div><div class='del'>-	b53_write16(dev, B53_ARLIO_PAGE, B53_VLAN_ID_IDX, vid);</div><div class='add'>+	if (!is5325m(dev)) {</div><div class='add'>+		if (is5325(dev) || is5365(dev))</div><div class='add'>+			b53_write8(dev, B53_ARLIO_PAGE, B53_VLAN_ID_IDX, vid);</div><div class='add'>+		else</div><div class='add'>+			b53_write16(dev, B53_ARLIO_PAGE, B53_VLAN_ID_IDX, vid);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Issue a read operation for this MAC */</div><div class='ctx'> 	ret = b53_arl_rw_op(dev, 1);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ret = b53_arl_read(dev, mac, vid, &amp;ent, &amp;idx, is_valid);</div><div class='add'>+	ret = b53_arl_read(dev, addr, vid, &amp;ent, &amp;idx);</div><div class='add'>+</div><div class='ctx'> 	/* If this is a read, just finish now */</div><div class='ctx'> 	if (op)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* We could not find a matching MAC, so reset to a new entry */</div><div class='del'>-	if (ret) {</div><div class='del'>-		fwd_entry = 0;</div><div class='del'>-		idx = 1;</div><div class='add'>+	switch (ret) {</div><div class='add'>+	case -ETIMEDOUT:</div><div class='add'>+		return ret;</div><div class='add'>+	case -ENOSPC:</div><div class='add'>+		dev_dbg(dev-&gt;dev, "{%pM,%.4d} no space left in ARL\n",</div><div class='add'>+			addr, vid);</div><div class='add'>+		return is_valid ? ret : 0;</div><div class='add'>+	case -ENOENT:</div><div class='add'>+		/* We could not find a matching MAC, so reset to a new entry */</div><div class='add'>+		dev_dbg(dev-&gt;dev, "{%pM,%.4d} not found, using idx: %d\n",</div><div class='add'>+			addr, vid, idx);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(dev-&gt;dev, "{%pM,%.4d} found, using idx: %d\n",</div><div class='add'>+			addr, vid, idx);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For multicast address, the port is a bitmask and the validity</div><div class='add'>+	 * is determined by having at least one port being still active</div><div class='add'>+	 */</div><div class='add'>+	if (!is_multicast_ether_addr(addr)) {</div><div class='add'>+		ent.port = port;</div><div class='add'>+		ent.is_valid = is_valid;</div><div class='add'>+	} else {</div><div class='add'>+		if (is_valid)</div><div class='add'>+			ent.port |= BIT(port);</div><div class='add'>+		else</div><div class='add'>+			ent.port &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+		ent.is_valid = !!(ent.port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(&amp;ent, 0, sizeof(ent));</div><div class='del'>-	ent.port = port;</div><div class='del'>-	ent.is_valid = is_valid;</div><div class='ctx'> 	ent.vid = vid;</div><div class='ctx'> 	ent.is_static = true;</div><div class='add'>+	ent.is_age = false;</div><div class='ctx'> 	memcpy(ent.mac, addr, ETH_ALEN);</div><div class='del'>-	b53_arl_from_entry(&amp;mac_vid, &amp;fwd_entry, &amp;ent);</div><div class='del'>-</div><div class='del'>-	b53_write64(dev, B53_ARLIO_PAGE,</div><div class='del'>-		    B53_ARLTBL_MAC_VID_ENTRY(idx), mac_vid);</div><div class='del'>-	b53_write32(dev, B53_ARLIO_PAGE,</div><div class='del'>-		    B53_ARLTBL_DATA_ENTRY(idx), fwd_entry);</div><div class='add'>+	b53_arl_write_entry(dev, &amp;ent, idx);</div><div class='ctx'> </div><div class='ctx'> 	return b53_arl_rw_op(dev, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int b53_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-		const unsigned char *addr, u16 vid)</div><div class='add'>+		const unsigned char *addr, u16 vid,</div><div class='add'>+		struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* 5325 and 5365 require some more massaging, but could</div><div class='del'>-	 * be supported eventually</div><div class='del'>-	 */</div><div class='del'>-	if (is5325(priv) || is5365(priv))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	mutex_lock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+	ret = b53_arl_op(priv, 0, port, addr, vid, true);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;arl_mutex);</div><div class='ctx'> </div><div class='del'>-	return b53_arl_op(priv, 0, port, addr, vid, true);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_fdb_add);</div><div class='ctx'> </div><div class='ctx'> int b53_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-		const unsigned char *addr, u16 vid)</div><div class='add'>+		const unsigned char *addr, u16 vid,</div><div class='add'>+		struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return b53_arl_op(priv, 0, port, addr, vid, false);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+	ret = b53_arl_op(priv, 0, port, addr, vid, false);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_fdb_del);</div><div class='ctx'> </div><div class='add'>+static void b53_read_arl_srch_ctl(struct b53_device *dev, u8 *val)</div><div class='add'>+{</div><div class='add'>+	u8 offset;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev) || is5365(dev))</div><div class='add'>+		offset = B53_ARL_SRCH_CTL_25;</div><div class='add'>+	else if (dev-&gt;chip_id == BCM5389_DEVICE_ID || is5397_98(dev) ||</div><div class='add'>+		 is63xx(dev))</div><div class='add'>+		offset = B53_ARL_SRCH_CTL_89;</div><div class='add'>+	else</div><div class='add'>+		offset = B53_ARL_SRCH_CTL;</div><div class='add'>+</div><div class='add'>+	if (is63xx(dev)) {</div><div class='add'>+		u16 val16;</div><div class='add'>+</div><div class='add'>+		b53_read16(dev, B53_ARLIO_PAGE, offset, &amp;val16);</div><div class='add'>+		*val = val16 &amp; 0xff;</div><div class='add'>+	} else {</div><div class='add'>+		b53_read8(dev, B53_ARLIO_PAGE, offset, val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_write_arl_srch_ctl(struct b53_device *dev, u8 val)</div><div class='add'>+{</div><div class='add'>+	u8 offset;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev) || is5365(dev))</div><div class='add'>+		offset = B53_ARL_SRCH_CTL_25;</div><div class='add'>+	else if (dev-&gt;chip_id == BCM5389_DEVICE_ID || is5397_98(dev) ||</div><div class='add'>+		 is63xx(dev))</div><div class='add'>+		offset = B53_ARL_SRCH_CTL_89;</div><div class='add'>+	else</div><div class='add'>+		offset = B53_ARL_SRCH_CTL;</div><div class='add'>+</div><div class='add'>+	if (is63xx(dev))</div><div class='add'>+		b53_write16(dev, B53_ARLIO_PAGE, offset, val);</div><div class='add'>+	else</div><div class='add'>+		b53_write8(dev, B53_ARLIO_PAGE, offset, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int b53_arl_search_wait(struct b53_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int timeout = 1000;</div><div class='ctx'> 	u8 reg;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		b53_read8(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_CTL, &amp;reg);</div><div class='add'>+		b53_read_arl_srch_ctl(dev, &amp;reg);</div><div class='ctx'> 		if (!(reg &amp; ARL_SRCH_STDN))</div><div class='del'>-			return 0;</div><div class='add'>+			return -ENOENT;</div><div class='ctx'> </div><div class='ctx'> 		if (reg &amp; ARL_SRCH_VLID)</div><div class='ctx'> 			return 0;</div><div class='hunk'>@@ -1550,16 +2114,52 @@ static int b53_arl_search_wait(struct b53_device *dev)</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b53_arl_search_rd(struct b53_device *dev, u8 idx,</div><div class='del'>-			      struct b53_arl_entry *ent)</div><div class='add'>+static void b53_arl_search_read_25(struct b53_device *dev, u8 idx,</div><div class='add'>+				   struct b53_arl_entry *ent)</div><div class='ctx'> {</div><div class='ctx'> 	u64 mac_vid;</div><div class='add'>+	u8 ext;</div><div class='add'>+</div><div class='add'>+	b53_read8(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSLT_EXT_25, &amp;ext);</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSTL_0_MACVID_25,</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_arl_search_to_entry_25(ent, mac_vid, ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_search_read_89(struct b53_device *dev, u8 idx,</div><div class='add'>+				   struct b53_arl_entry *ent)</div><div class='add'>+{</div><div class='add'>+	u16 fwd_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSLT_MACVID_89,</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_read16(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSLT_89, &amp;fwd_entry);</div><div class='add'>+	b53_arl_to_entry_89(ent, mac_vid, fwd_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_search_read_63xx(struct b53_device *dev, u8 idx,</div><div class='add'>+				     struct b53_arl_entry *ent)</div><div class='add'>+{</div><div class='add'>+	u16 fwd_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='add'>+</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSLT_MACVID_63XX,</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_read16(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSLT_63XX, &amp;fwd_entry);</div><div class='add'>+	b53_arl_search_to_entry_63xx(ent, mac_vid, fwd_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_arl_search_read_95(struct b53_device *dev, u8 idx,</div><div class='add'>+				   struct b53_arl_entry *ent)</div><div class='add'>+{</div><div class='ctx'> 	u32 fwd_entry;</div><div class='add'>+	u64 mac_vid;</div><div class='ctx'> </div><div class='del'>-	b53_read64(dev, B53_ARLIO_PAGE,</div><div class='del'>-		   B53_ARL_SRCH_RSTL_MACVID(idx), &amp;mac_vid);</div><div class='del'>-	b53_read32(dev, B53_ARLIO_PAGE,</div><div class='del'>-		   B53_ARL_SRCH_RSTL(idx), &amp;fwd_entry);</div><div class='add'>+	b53_read64(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSTL_MACVID(idx),</div><div class='add'>+		   &amp;mac_vid);</div><div class='add'>+	b53_read32(dev, B53_ARLIO_PAGE, B53_ARL_SRCH_RSTL(idx),</div><div class='add'>+		   &amp;fwd_entry);</div><div class='ctx'> 	b53_arl_to_entry(ent, mac_vid, fwd_entry);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1578,64 +2178,126 @@ static int b53_fdb_copy(int port, const struct b53_arl_entry *ent,</div><div class='ctx'> int b53_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 dsa_fdb_dump_cb_t *cb, void *data)</div><div class='ctx'> {</div><div class='add'>+	unsigned int count = 0, results_per_hit = 1;</div><div class='ctx'> 	struct b53_device *priv = ds-&gt;priv;</div><div class='ctx'> 	struct b53_arl_entry results[2];</div><div class='del'>-	unsigned int count = 0;</div><div class='ctx'> 	int ret;</div><div class='del'>-	u8 reg;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;num_arl_bins &gt; 2)</div><div class='add'>+		results_per_hit = 2;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;arl_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Start search operation */</div><div class='del'>-	reg = ARL_SRCH_STDN;</div><div class='del'>-	b53_write8(priv, B53_ARLIO_PAGE, B53_ARL_SRCH_CTL, reg);</div><div class='add'>+	b53_write_arl_srch_ctl(priv, ARL_SRCH_STDN);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		ret = b53_arl_search_wait(priv);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		b53_arl_search_rd(priv, 0, &amp;results[0]);</div><div class='add'>+		b53_arl_search_read(priv, 0, &amp;results[0]);</div><div class='ctx'> 		ret = b53_fdb_copy(port, &amp;results[0], cb, data);</div><div class='ctx'> 		if (ret)</div><div class='del'>-			return ret;</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;num_arl_entries &gt; 2) {</div><div class='del'>-			b53_arl_search_rd(priv, 1, &amp;results[1]);</div><div class='add'>+		if (results_per_hit == 2) {</div><div class='add'>+			b53_arl_search_read(priv, 1, &amp;results[1]);</div><div class='ctx'> 			ret = b53_fdb_copy(port, &amp;results[1], cb, data);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				return ret;</div><div class='add'>+				break;</div><div class='ctx'> </div><div class='ctx'> 			if (!results[0].is_valid &amp;&amp; !results[1].is_valid)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	} while (count++ &lt; 1024);</div><div class='add'>+	} while (count++ &lt; b53_max_arl_entries(priv) / results_per_hit);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;arl_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_fdb_dump);</div><div class='ctx'> </div><div class='del'>-int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='add'>+int b53_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* 5325 and 5365 require some more massaging, but could</div><div class='add'>+	 * be supported eventually</div><div class='add'>+	 */</div><div class='add'>+	if (is5325(priv) || is5365(priv))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+	ret = b53_arl_op(priv, 0, port, mdb-&gt;addr, mdb-&gt;vid, true);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_mdb_add);</div><div class='add'>+</div><div class='add'>+int b53_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+	ret = b53_arl_op(priv, 0, port, mdb-&gt;addr, mdb-&gt;vid, false);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;arl_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ds-&gt;dev, "failed to delete MDB entry\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_mdb_del);</div><div class='add'>+</div><div class='add'>+int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge,</div><div class='add'>+		bool *tx_fwd_offload, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	s8 cpu_port = ds-&gt;ports[port].cpu_dp-&gt;index;</div><div class='del'>-	u16 pvlan, reg;</div><div class='add'>+	struct b53_vlan *vl;</div><div class='add'>+	s8 cpu_port = dsa_to_port(ds, port)-&gt;cpu_dp-&gt;index;</div><div class='add'>+	u16 pvlan, reg, pvid;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	/* Make this port leave the all VLANs join since we will have proper</div><div class='del'>-	 * VLAN entries from now on</div><div class='add'>+	/* On 7278, port 7 which connects to the ASP should only receive</div><div class='add'>+	 * traffic from matching CFP rules.</div><div class='ctx'> 	 */</div><div class='del'>-	if (is58xx(dev)) {</div><div class='del'>-		b53_read16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, &amp;reg);</div><div class='del'>-		reg &amp;= ~BIT(port);</div><div class='del'>-		if ((reg &amp; BIT(cpu_port)) == BIT(cpu_port))</div><div class='del'>-			reg &amp;= ~BIT(cpu_port);</div><div class='del'>-		b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, reg);</div><div class='add'>+	if (dev-&gt;chip_id == BCM7278_DEVICE_ID &amp;&amp; port == 7)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pvid = b53_default_pvid(dev);</div><div class='add'>+	vl = &amp;dev-&gt;vlans[pvid];</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vlan_filtering) {</div><div class='add'>+		/* Make this port leave the all VLANs join since we will have</div><div class='add'>+		 * proper VLAN entries from now on</div><div class='add'>+		 */</div><div class='add'>+		if (is58xx(dev)) {</div><div class='add'>+			b53_read16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN,</div><div class='add'>+				   &amp;reg);</div><div class='add'>+			reg &amp;= ~BIT(port);</div><div class='add'>+			if ((reg &amp; BIT(cpu_port)) == BIT(cpu_port))</div><div class='add'>+				reg &amp;= ~BIT(cpu_port);</div><div class='add'>+			b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN,</div><div class='add'>+				    reg);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		b53_get_vlan_entry(dev, pvid, vl);</div><div class='add'>+		vl-&gt;members &amp;= ~BIT(port);</div><div class='add'>+		b53_set_vlan_entry(dev, pvid, vl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), &amp;pvlan);</div><div class='ctx'> </div><div class='ctx'> 	b53_for_each_port(dev, i) {</div><div class='del'>-		if (dsa_to_port(ds, i)-&gt;bridge_dev != br)</div><div class='add'>+		if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Add this local port to the remote port VLAN control</div><div class='hunk'>@@ -1649,6 +2311,9 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='ctx'> 		pvlan |= BIT(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Disable redirection of unknown SA to the CPU port */</div><div class='add'>+	b53_set_eap_mode(dev, port, EAP_MODE_BASIC);</div><div class='add'>+</div><div class='ctx'> 	/* Configure the local port VLAN control membership to include</div><div class='ctx'> 	 * remote ports and update the local port bitmask</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1659,11 +2324,11 @@ int b53_br_join(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_br_join);</div><div class='ctx'> </div><div class='del'>-void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='add'>+void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	struct b53_vlan *vl = &amp;dev-&gt;vlans[0];</div><div class='del'>-	s8 cpu_port = ds-&gt;ports[port].cpu_dp-&gt;index;</div><div class='add'>+	struct b53_vlan *vl;</div><div class='add'>+	s8 cpu_port = dsa_to_port(ds, port)-&gt;cpu_dp-&gt;index;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u16 pvlan, reg, pvid;</div><div class='ctx'> </div><div class='hunk'>@@ -1671,7 +2336,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='ctx'> </div><div class='ctx'> 	b53_for_each_port(dev, i) {</div><div class='ctx'> 		/* Don't touch the remaining ports */</div><div class='del'>-		if (dsa_to_port(ds, i)-&gt;bridge_dev != br)</div><div class='add'>+		if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(i), &amp;reg);</div><div class='hunk'>@@ -1684,22 +2349,27 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='ctx'> 			pvlan &amp;= ~BIT(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Enable redirection of unknown SA to the CPU port */</div><div class='add'>+	b53_set_eap_mode(dev, port, EAP_MODE_SIMPLIFIED);</div><div class='add'>+</div><div class='ctx'> 	b53_write16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), pvlan);</div><div class='ctx'> 	dev-&gt;ports[port].vlan_ctl_mask = pvlan;</div><div class='ctx'> </div><div class='ctx'> 	pvid = b53_default_pvid(dev);</div><div class='add'>+	vl = &amp;dev-&gt;vlans[pvid];</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;vlan_filtering) {</div><div class='add'>+		/* Make this port join all VLANs without VLAN entries */</div><div class='add'>+		if (is58xx(dev)) {</div><div class='add'>+			b53_read16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, &amp;reg);</div><div class='add'>+			reg |= BIT(port);</div><div class='add'>+			if (!(reg &amp; BIT(cpu_port)))</div><div class='add'>+				reg |= BIT(cpu_port);</div><div class='add'>+			b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, reg);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	/* Make this port join all VLANs without VLAN entries */</div><div class='del'>-	if (is58xx(dev)) {</div><div class='del'>-		b53_read16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, &amp;reg);</div><div class='del'>-		reg |= BIT(port);</div><div class='del'>-		if (!(reg &amp; BIT(cpu_port)))</div><div class='del'>-			reg |= BIT(cpu_port);</div><div class='del'>-		b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, reg);</div><div class='del'>-	} else {</div><div class='ctx'> 		b53_get_vlan_entry(dev, pvid, vl);</div><div class='del'>-		vl-&gt;members |= BIT(port) | BIT(cpu_port);</div><div class='del'>-		vl-&gt;untag |= BIT(port) | BIT(cpu_port);</div><div class='add'>+		vl-&gt;members |= BIT(port);</div><div class='ctx'> 		b53_set_vlan_entry(dev, pvid, vl);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1748,6 +2418,44 @@ void b53_br_fast_age(struct dsa_switch *ds, int port)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_br_fast_age);</div><div class='ctx'> </div><div class='add'>+int b53_br_flags_pre(struct dsa_switch *ds, int port,</div><div class='add'>+		     struct switchdev_brport_flags flags,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	unsigned long mask = (BR_FLOOD | BR_MCAST_FLOOD | BR_ISOLATED);</div><div class='add'>+</div><div class='add'>+	if (!is5325(dev))</div><div class='add'>+		mask |= BR_LEARNING;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; ~mask)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_br_flags_pre);</div><div class='add'>+</div><div class='add'>+int b53_br_flags(struct dsa_switch *ds, int port,</div><div class='add'>+		 struct switchdev_brport_flags flags,</div><div class='add'>+		 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD)</div><div class='add'>+		b53_port_set_ucast_flood(ds-&gt;priv, port,</div><div class='add'>+					 !!(flags.val &amp; BR_FLOOD));</div><div class='add'>+	if (flags.mask &amp; BR_MCAST_FLOOD)</div><div class='add'>+		b53_port_set_mcast_flood(ds-&gt;priv, port,</div><div class='add'>+					 !!(flags.val &amp; BR_MCAST_FLOOD));</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING)</div><div class='add'>+		b53_port_set_learning(ds-&gt;priv, port,</div><div class='add'>+				      !!(flags.val &amp; BR_LEARNING));</div><div class='add'>+	if (flags.mask &amp; BR_ISOLATED)</div><div class='add'>+		b53_port_set_isolated(ds-&gt;priv, port,</div><div class='add'>+				      !!(flags.val &amp; BR_ISOLATED));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_br_flags);</div><div class='add'>+</div><div class='ctx'> static bool b53_possible_cpu_port(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	/* Broadcom switches will accept enabling Broadcom tags on the</div><div class='hunk'>@@ -1763,41 +2471,68 @@ static bool b53_possible_cpu_port(struct dsa_switch *ds, int port)</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool b53_can_enable_brcm_tags(struct dsa_switch *ds, int port)</div><div class='add'>+static bool b53_can_enable_brcm_tags(struct dsa_switch *ds, int port,</div><div class='add'>+				     enum dsa_tag_protocol tag_protocol)</div><div class='ctx'> {</div><div class='ctx'> 	bool ret = b53_possible_cpu_port(ds, port);</div><div class='ctx'> </div><div class='del'>-	if (!ret)</div><div class='add'>+	if (!ret) {</div><div class='ctx'> 		dev_warn(ds-&gt;dev, "Port %d is not Broadcom tag capable\n",</div><div class='ctx'> 			 port);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tag_protocol) {</div><div class='add'>+	case DSA_TAG_PROTO_BRCM:</div><div class='add'>+	case DSA_TAG_PROTO_BRCM_PREPEND:</div><div class='add'>+		dev_warn(ds-&gt;dev,</div><div class='add'>+			 "Port %d is stacked to Broadcom tag switch\n", port);</div><div class='add'>+		ret = false;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = true;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port)</div><div class='add'>+enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+					   enum dsa_tag_protocol mprot)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	/* Older models (5325, 5365) support a different tag format that we do</div><div class='del'>-	 * not support in net/dsa/tag_brcm.c yet. 539x and 531x5 require managed</div><div class='del'>-	 * mode to be turned on which means we need to specifically manage ARL</div><div class='del'>-	 * misses on multicast addresses (TBD).</div><div class='del'>-	 */</div><div class='del'>-	if (is5325(dev) || is5365(dev) || is539x(dev) || is531x5(dev) ||</div><div class='del'>-	    !b53_can_enable_brcm_tags(ds, port))</div><div class='del'>-		return DSA_TAG_PROTO_NONE;</div><div class='add'>+	if (!b53_can_enable_brcm_tags(ds, port, mprot)) {</div><div class='add'>+		dev-&gt;tag_protocol = DSA_TAG_PROTO_NONE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Older models require different 6 byte tags */</div><div class='add'>+	if (is5325(dev) || is5365(dev)) {</div><div class='add'>+		dev-&gt;tag_protocol = DSA_TAG_PROTO_BRCM_LEGACY_FCS;</div><div class='add'>+		goto out;</div><div class='add'>+	} else if (is63xx(dev)) {</div><div class='add'>+		dev-&gt;tag_protocol = DSA_TAG_PROTO_BRCM_LEGACY;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Broadcom BCM58xx chips have a flow accelerator on Port 8</div><div class='ctx'> 	 * which requires us to use the prepended Broadcom tag type</div><div class='ctx'> 	 */</div><div class='del'>-	if (dev-&gt;chip_id == BCM58XX_DEVICE_ID &amp;&amp; port == B53_CPU_PORT)</div><div class='del'>-		return DSA_TAG_PROTO_BRCM_PREPEND;</div><div class='add'>+	if (dev-&gt;chip_id == BCM58XX_DEVICE_ID &amp;&amp; port == B53_CPU_PORT) {</div><div class='add'>+		dev-&gt;tag_protocol = DSA_TAG_PROTO_BRCM_PREPEND;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return DSA_TAG_PROTO_BRCM;</div><div class='add'>+	dev-&gt;tag_protocol = DSA_TAG_PROTO_BRCM;</div><div class='add'>+out:</div><div class='add'>+	return dev-&gt;tag_protocol;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_get_tag_protocol);</div><div class='ctx'> </div><div class='ctx'> int b53_mirror_add(struct dsa_switch *ds, int port,</div><div class='del'>-		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress)</div><div class='add'>+		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u16 reg, loc;</div><div class='hunk'>@@ -1808,7 +2543,6 @@ int b53_mirror_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 		loc = B53_EG_MIR_CTL;</div><div class='ctx'> </div><div class='ctx'> 	b53_read16(dev, B53_MGMT_PAGE, loc, &amp;reg);</div><div class='del'>-	reg &amp;= ~MIRROR_MASK;</div><div class='ctx'> 	reg |= BIT(port);</div><div class='ctx'> 	b53_write16(dev, B53_MGMT_PAGE, loc, reg);</div><div class='ctx'> </div><div class='hunk'>@@ -1861,28 +2595,16 @@ void b53_mirror_del(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_mirror_del);</div><div class='ctx'> </div><div class='del'>-void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	u16 reg;</div><div class='del'>-</div><div class='del'>-	b53_read16(dev, B53_EEE_PAGE, B53_EEE_EN_CTRL, &amp;reg);</div><div class='del'>-	if (enable)</div><div class='del'>-		reg |= BIT(port);</div><div class='del'>-	else</div><div class='del'>-		reg &amp;= ~BIT(port);</div><div class='del'>-	b53_write16(dev, B53_EEE_PAGE, B53_EEE_EN_CTRL, reg);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(b53_eee_enable_set);</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* Returns 0 if EEE was not enabled, or 1 otherwise</div><div class='ctx'>  */</div><div class='ctx'> int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = phy_init_eee(phy, 0);</div><div class='add'>+	if (!b53_support_eee(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = phy_init_eee(phy, false);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1892,64 +2614,110 @@ int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_eee_init);</div><div class='ctx'> </div><div class='del'>-int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e)</div><div class='add'>+bool b53_support_eee(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	struct ethtool_eee *p = &amp;dev-&gt;ports[port].eee;</div><div class='del'>-	u16 reg;</div><div class='ctx'> </div><div class='del'>-	if (is5325(dev) || is5365(dev))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	return !is5325(dev) &amp;&amp; !is5365(dev) &amp;&amp; !is63xx(dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_support_eee);</div><div class='ctx'> </div><div class='del'>-	b53_read16(dev, B53_EEE_PAGE, B53_EEE_LPI_INDICATE, &amp;reg);</div><div class='del'>-	e-&gt;eee_enabled = p-&gt;eee_enabled;</div><div class='del'>-	e-&gt;eee_active = !!(reg &amp; BIT(port));</div><div class='add'>+int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ethtool_keee *p = &amp;dev-&gt;ports[port].eee;</div><div class='add'>+</div><div class='add'>+	p-&gt;eee_enabled = e-&gt;eee_enabled;</div><div class='add'>+	b53_eee_enable_set(ds, port, e-&gt;eee_enabled);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_get_mac_eee);</div><div class='add'>+EXPORT_SYMBOL(b53_set_mac_eee);</div><div class='ctx'> </div><div class='del'>-int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e)</div><div class='add'>+static int b53_change_mtu(struct dsa_switch *ds, int port, int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = ds-&gt;priv;</div><div class='del'>-	struct ethtool_eee *p = &amp;dev-&gt;ports[port].eee;</div><div class='add'>+	bool enable_jumbo;</div><div class='add'>+	bool allow_10_100;</div><div class='ctx'> </div><div class='ctx'> 	if (is5325(dev) || is5365(dev))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	p-&gt;eee_enabled = e-&gt;eee_enabled;</div><div class='del'>-	b53_eee_enable_set(ds, port, e-&gt;eee_enabled);</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	enable_jumbo = (mtu &gt; ETH_DATA_LEN);</div><div class='add'>+	allow_10_100 = !is63xx(dev);</div><div class='add'>+</div><div class='add'>+	return b53_set_jumbo(dev, enable_jumbo, allow_10_100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b53_get_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (is5325(dev) || is5365(dev))</div><div class='add'>+		return B53_MAX_MTU_25;</div><div class='add'>+</div><div class='add'>+	return B53_MAX_MTU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int b53_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = ds-&gt;priv;</div><div class='add'>+	u32 atc;</div><div class='add'>+	int reg;</div><div class='add'>+</div><div class='add'>+	if (is63xx(dev))</div><div class='add'>+		reg = B53_AGING_TIME_CONTROL_63XX;</div><div class='add'>+	else</div><div class='add'>+		reg = B53_AGING_TIME_CONTROL;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id == BCM53101_DEVICE_ID)</div><div class='add'>+		atc = DIV_ROUND_CLOSEST(msecs, 500);</div><div class='add'>+	else</div><div class='add'>+		atc = DIV_ROUND_CLOSEST(msecs, 1000);</div><div class='add'>+</div><div class='add'>+	if (!is5325(dev) &amp;&amp; !is5365(dev))</div><div class='add'>+		atc |= AGE_CHANGE;</div><div class='add'>+</div><div class='add'>+	b53_write32(dev, B53_MGMT_PAGE, reg, atc);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_set_mac_eee);</div><div class='add'>+EXPORT_SYMBOL_GPL(b53_set_ageing_time);</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops b53_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs	= b53_phylink_mac_select_pcs,</div><div class='add'>+	.mac_config	= b53_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= b53_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= b53_phylink_mac_link_up,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static const struct dsa_switch_ops b53_switch_ops = {</div><div class='ctx'> 	.get_tag_protocol	= b53_get_tag_protocol,</div><div class='ctx'> 	.setup			= b53_setup,</div><div class='add'>+	.teardown		= b53_teardown,</div><div class='ctx'> 	.get_strings		= b53_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= b53_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count		= b53_get_sset_count,</div><div class='ctx'> 	.get_ethtool_phy_stats	= b53_get_ethtool_phy_stats,</div><div class='ctx'> 	.phy_read		= b53_phy_read16,</div><div class='ctx'> 	.phy_write		= b53_phy_write16,</div><div class='del'>-	.adjust_link		= b53_adjust_link,</div><div class='del'>-	.phylink_validate	= b53_phylink_validate,</div><div class='del'>-	.phylink_mac_link_state	= b53_phylink_mac_link_state,</div><div class='del'>-	.phylink_mac_config	= b53_phylink_mac_config,</div><div class='del'>-	.phylink_mac_an_restart	= b53_phylink_mac_an_restart,</div><div class='del'>-	.phylink_mac_link_down	= b53_phylink_mac_link_down,</div><div class='del'>-	.phylink_mac_link_up	= b53_phylink_mac_link_up,</div><div class='add'>+	.phylink_get_caps	= b53_phylink_get_caps,</div><div class='add'>+	.port_setup		= b53_setup_port,</div><div class='ctx'> 	.port_enable		= b53_enable_port,</div><div class='ctx'> 	.port_disable		= b53_disable_port,</div><div class='del'>-	.get_mac_eee		= b53_get_mac_eee,</div><div class='add'>+	.support_eee		= b53_support_eee,</div><div class='ctx'> 	.set_mac_eee		= b53_set_mac_eee,</div><div class='add'>+	.set_ageing_time	= b53_set_ageing_time,</div><div class='ctx'> 	.port_bridge_join	= b53_br_join,</div><div class='ctx'> 	.port_bridge_leave	= b53_br_leave,</div><div class='add'>+	.port_pre_bridge_flags	= b53_br_flags_pre,</div><div class='add'>+	.port_bridge_flags	= b53_br_flags,</div><div class='ctx'> 	.port_stp_state_set	= b53_br_set_stp_state,</div><div class='ctx'> 	.port_fast_age		= b53_br_fast_age,</div><div class='ctx'> 	.port_vlan_filtering	= b53_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= b53_vlan_prepare,</div><div class='ctx'> 	.port_vlan_add		= b53_vlan_add,</div><div class='ctx'> 	.port_vlan_del		= b53_vlan_del,</div><div class='ctx'> 	.port_fdb_dump		= b53_fdb_dump,</div><div class='hunk'>@@ -1957,6 +2725,34 @@ static const struct dsa_switch_ops b53_switch_ops = {</div><div class='ctx'> 	.port_fdb_del		= b53_fdb_del,</div><div class='ctx'> 	.port_mirror_add	= b53_mirror_add,</div><div class='ctx'> 	.port_mirror_del	= b53_mirror_del,</div><div class='add'>+	.port_mdb_add		= b53_mdb_add,</div><div class='add'>+	.port_mdb_del		= b53_mdb_del,</div><div class='add'>+	.port_max_mtu		= b53_get_max_mtu,</div><div class='add'>+	.port_change_mtu	= b53_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct b53_arl_ops b53_arl_ops_25 = {</div><div class='add'>+	.arl_read_entry = b53_arl_read_entry_25,</div><div class='add'>+	.arl_write_entry = b53_arl_write_entry_25,</div><div class='add'>+	.arl_search_read = b53_arl_search_read_25,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct b53_arl_ops b53_arl_ops_89 = {</div><div class='add'>+	.arl_read_entry = b53_arl_read_entry_89,</div><div class='add'>+	.arl_write_entry = b53_arl_write_entry_89,</div><div class='add'>+	.arl_search_read = b53_arl_search_read_89,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct b53_arl_ops b53_arl_ops_63xx = {</div><div class='add'>+	.arl_read_entry = b53_arl_read_entry_89,</div><div class='add'>+	.arl_write_entry = b53_arl_write_entry_89,</div><div class='add'>+	.arl_search_read = b53_arl_search_read_63xx,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct b53_arl_ops b53_arl_ops_95 = {</div><div class='add'>+	.arl_read_entry = b53_arl_read_entry_95,</div><div class='add'>+	.arl_write_entry = b53_arl_write_entry_95,</div><div class='add'>+	.arl_search_read = b53_arl_search_read_95,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct b53_chip_data {</div><div class='hunk'>@@ -1964,12 +2760,15 @@ struct b53_chip_data {</div><div class='ctx'> 	const char *dev_name;</div><div class='ctx'> 	u16 vlans;</div><div class='ctx'> 	u16 enabled_ports;</div><div class='add'>+	u8 imp_port;</div><div class='ctx'> 	u8 cpu_port;</div><div class='ctx'> 	u8 vta_regs[3];</div><div class='del'>-	u8 arl_entries;</div><div class='add'>+	u8 arl_bins;</div><div class='add'>+	u16 arl_buckets;</div><div class='ctx'> 	u8 duplex_reg;</div><div class='ctx'> 	u8 jumbo_pm_reg;</div><div class='ctx'> 	u8 jumbo_size_reg;</div><div class='add'>+	const struct b53_arl_ops *arl_ops;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define B53_VTA_REGS	\</div><div class='hunk'>@@ -1984,235 +2783,321 @@ static const struct b53_chip_data b53_switch_chips[] = {</div><div class='ctx'> 		.chip_id = BCM5325_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM5325",</div><div class='ctx'> 		.vlans = 16,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 2,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25,</div><div class='add'>+		.enabled_ports = 0x3f,</div><div class='add'>+		.arl_bins = 2,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 5,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_FE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_25,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM5365_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM5365",</div><div class='ctx'> 		.vlans = 256,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 2,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25,</div><div class='add'>+		.enabled_ports = 0x3f,</div><div class='add'>+		.arl_bins = 2,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 5,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_FE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_25,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM5389_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM5389",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.enabled_ports = 0x11f,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_89,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM5395_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM5395",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.enabled_ports = 0x11f,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM5397_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM5397",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.enabled_ports = 0x11f,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS_9798,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_89,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM5398_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM5398",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x7f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.enabled_ports = 0x17f,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS_9798,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_89,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip_id = BCM53101_DEVICE_ID,</div><div class='add'>+		.dev_name = "BCM53101",</div><div class='add'>+		.vlans = 4096,</div><div class='add'>+		.enabled_ports = 0x11f,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 512,</div><div class='add'>+		.vta_regs = B53_VTA_REGS,</div><div class='add'>+		.imp_port = 8,</div><div class='add'>+		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='add'>+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='add'>+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53115_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53115",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='add'>+		.enabled_ports = 0x11f,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53125_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53125",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0xff,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.enabled_ports = 0x1ff,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53128_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53128",</div><div class='ctx'> 		.vlans = 4096,</div><div class='ctx'> 		.enabled_ports = 0x1ff,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM63XX_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM63xx",</div><div class='ctx'> 		.vlans = 4096,</div><div class='ctx'> 		.enabled_ports = 0, /* pdata must provide them */</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.arl_bins = 1,</div><div class='add'>+		.arl_buckets = 4096,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS_63XX,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_63XX,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK_63XX,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE_63XX,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_63xx,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53010_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53010",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */</div><div class='add'>+		.enabled_ports = 0x1bf,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53011_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53011",</div><div class='ctx'> 		.vlans = 4096,</div><div class='ctx'> 		.enabled_ports = 0x1bf,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53012_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53012",</div><div class='ctx'> 		.vlans = 4096,</div><div class='ctx'> 		.enabled_ports = 0x1bf,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53018_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53018",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */</div><div class='add'>+		.enabled_ports = 0x1bf,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM53019_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM53019",</div><div class='ctx'> 		.vlans = 4096,</div><div class='del'>-		.enabled_ports = 0x1f,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT_25, /* TODO: auto detect */</div><div class='add'>+		.enabled_ports = 0x1bf,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM58XX_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM585xx/586xx/88312",</div><div class='ctx'> 		.vlans	= 4096,</div><div class='ctx'> 		.enabled_ports = 0x1ff,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM583XX_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM583xx/11360",</div><div class='ctx'> 		.vlans = 4096,</div><div class='ctx'> 		.enabled_ports = 0x103,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='add'>+	},</div><div class='add'>+	/* Starfighter 2 */</div><div class='add'>+	{</div><div class='add'>+		.chip_id = BCM4908_DEVICE_ID,</div><div class='add'>+		.dev_name = "BCM4908",</div><div class='add'>+		.vlans = 4096,</div><div class='add'>+		.enabled_ports = 0x1bf,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 256,</div><div class='add'>+		.imp_port = 8,</div><div class='add'>+		.vta_regs = B53_VTA_REGS,</div><div class='add'>+		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='add'>+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='add'>+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM7445_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM7445",</div><div class='ctx'> 		.vlans	= 4096,</div><div class='ctx'> 		.enabled_ports = 0x1ff,</div><div class='del'>-		.arl_entries = 4,</div><div class='del'>-		.cpu_port = B53_CPU_PORT,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.chip_id = BCM7278_DEVICE_ID,</div><div class='ctx'> 		.dev_name = "BCM7278",</div><div class='ctx'> 		.vlans = 4096,</div><div class='ctx'> 		.enabled_ports = 0x1ff,</div><div class='del'>-		.arl_entries= 4,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 256,</div><div class='add'>+		.imp_port = 8,</div><div class='add'>+		.vta_regs = B53_VTA_REGS,</div><div class='add'>+		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='add'>+		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='add'>+		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip_id = BCM53134_DEVICE_ID,</div><div class='add'>+		.dev_name = "BCM53134",</div><div class='add'>+		.vlans = 4096,</div><div class='add'>+		.enabled_ports = 0x12f,</div><div class='add'>+		.imp_port = 8,</div><div class='ctx'> 		.cpu_port = B53_CPU_PORT,</div><div class='ctx'> 		.vta_regs = B53_VTA_REGS,</div><div class='add'>+		.arl_bins = 4,</div><div class='add'>+		.arl_buckets = 1024,</div><div class='ctx'> 		.duplex_reg = B53_DUPLEX_STAT_GE,</div><div class='ctx'> 		.jumbo_pm_reg = B53_JUMBO_PORT_MASK,</div><div class='ctx'> 		.jumbo_size_reg = B53_JUMBO_MAX_SIZE,</div><div class='add'>+		.arl_ops = &amp;b53_arl_ops_95,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int b53_switch_init(struct b53_device *dev)</div><div class='ctx'> {</div><div class='add'>+	u32 chip_id = dev-&gt;chip_id;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (is63xx(dev))</div><div class='add'>+		chip_id = BCM63XX_DEVICE_ID;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(b53_switch_chips); i++) {</div><div class='ctx'> 		const struct b53_chip_data *chip = &amp;b53_switch_chips[i];</div><div class='ctx'> </div><div class='del'>-		if (chip-&gt;chip_id == dev-&gt;chip_id) {</div><div class='add'>+		if (chip-&gt;chip_id == chip_id) {</div><div class='ctx'> 			if (!dev-&gt;enabled_ports)</div><div class='ctx'> 				dev-&gt;enabled_ports = chip-&gt;enabled_ports;</div><div class='ctx'> 			dev-&gt;name = chip-&gt;dev_name;</div><div class='hunk'>@@ -2221,9 +3106,11 @@ static int b53_switch_init(struct b53_device *dev)</div><div class='ctx'> 			dev-&gt;vta_regs[1] = chip-&gt;vta_regs[1];</div><div class='ctx'> 			dev-&gt;vta_regs[2] = chip-&gt;vta_regs[2];</div><div class='ctx'> 			dev-&gt;jumbo_pm_reg = chip-&gt;jumbo_pm_reg;</div><div class='del'>-			dev-&gt;cpu_port = chip-&gt;cpu_port;</div><div class='add'>+			dev-&gt;imp_port = chip-&gt;imp_port;</div><div class='ctx'> 			dev-&gt;num_vlans = chip-&gt;vlans;</div><div class='del'>-			dev-&gt;num_arl_entries = chip-&gt;arl_entries;</div><div class='add'>+			dev-&gt;num_arl_bins = chip-&gt;arl_bins;</div><div class='add'>+			dev-&gt;num_arl_buckets = chip-&gt;arl_buckets;</div><div class='add'>+			dev-&gt;arl_ops = chip-&gt;arl_ops;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2252,18 +3139,14 @@ static int b53_switch_init(struct b53_device *dev)</div><div class='ctx'> 			break;</div><div class='ctx'> #endif</div><div class='ctx'> 		}</div><div class='del'>-	} else if (dev-&gt;chip_id == BCM53115_DEVICE_ID) {</div><div class='del'>-		u64 strap_value;</div><div class='del'>-</div><div class='del'>-		b53_read48(dev, B53_STAT_PAGE, B53_STRAP_VALUE, &amp;strap_value);</div><div class='del'>-		/* use second IMP port if GMII is enabled */</div><div class='del'>-		if (strap_value &amp; SV_GMII_CTRL_115)</div><div class='del'>-			dev-&gt;cpu_port = 5;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* cpu port is always last */</div><div class='del'>-	dev-&gt;num_ports = dev-&gt;cpu_port + 1;</div><div class='del'>-	dev-&gt;enabled_ports |= BIT(dev-&gt;cpu_port);</div><div class='add'>+	if (is5325e(dev))</div><div class='add'>+		dev-&gt;num_arl_buckets = 512;</div><div class='add'>+</div><div class='add'>+	dev-&gt;num_ports = fls(dev-&gt;enabled_ports);</div><div class='add'>+</div><div class='add'>+	dev-&gt;ds-&gt;num_ports = min_t(unsigned int, dev-&gt;num_ports, DSA_MAX_PORTS);</div><div class='ctx'> </div><div class='ctx'> 	/* Include non standard CPU port built-in PHYs to be probed */</div><div class='ctx'> 	if (is539x(dev) || is531x5(dev)) {</div><div class='hunk'>@@ -2304,10 +3187,12 @@ struct b53_device *b53_switch_alloc(struct device *base,</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> 	struct b53_device *dev;</div><div class='ctx'> </div><div class='del'>-	ds = dsa_switch_alloc(base, DSA_MAX_PORTS);</div><div class='add'>+	ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL);</div><div class='ctx'> 	if (!ds)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	ds-&gt;dev = base;</div><div class='add'>+</div><div class='ctx'> 	dev = devm_kzalloc(base, sizeof(*dev), GFP_KERNEL);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -2319,8 +3204,19 @@ struct b53_device *b53_switch_alloc(struct device *base,</div><div class='ctx'> 	dev-&gt;priv = priv;</div><div class='ctx'> 	dev-&gt;ops = ops;</div><div class='ctx'> 	ds-&gt;ops = &amp;b53_switch_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;b53_phylink_mac_ops;</div><div class='add'>+	dev-&gt;vlan_enabled = true;</div><div class='add'>+	dev-&gt;vlan_filtering = false;</div><div class='add'>+	/* Let DSA handle the case were multiple bridges span the same switch</div><div class='add'>+	 * device and different VLAN awareness settings are requested, which</div><div class='add'>+	 * would be breaking filtering semantics for any of the other bridge</div><div class='add'>+	 * devices. (not hardware supported)</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;vlan_filtering_is_global = true;</div><div class='add'>+</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;reg_mutex);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;stats_mutex);</div><div class='add'>+	mutex_init(&amp;dev-&gt;arl_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='hunk'>@@ -2349,10 +3245,24 @@ int b53_switch_detect(struct b53_device *dev)</div><div class='ctx'> 		b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, 0xf);</div><div class='ctx'> 		b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, &amp;tmp);</div><div class='ctx'> </div><div class='del'>-		if (tmp == 0xf)</div><div class='add'>+		if (tmp == 0xf) {</div><div class='add'>+			u32 phy_id;</div><div class='add'>+			int val;</div><div class='add'>+</div><div class='ctx'> 			dev-&gt;chip_id = BCM5325_DEVICE_ID;</div><div class='del'>-		else</div><div class='add'>+</div><div class='add'>+			val = b53_phy_read16(dev-&gt;ds, 0, MII_PHYSID1);</div><div class='add'>+			phy_id = (val &amp; 0xffff) &lt;&lt; 16;</div><div class='add'>+			val = b53_phy_read16(dev-&gt;ds, 0, MII_PHYSID2);</div><div class='add'>+			phy_id |= (val &amp; 0xfff0);</div><div class='add'>+</div><div class='add'>+			if (phy_id == 0x00406330)</div><div class='add'>+				dev-&gt;variant_id = B53_VARIANT_5325M;</div><div class='add'>+			else if (phy_id == 0x0143bc30)</div><div class='add'>+				dev-&gt;variant_id = B53_VARIANT_5325E;</div><div class='add'>+		} else {</div><div class='ctx'> 			dev-&gt;chip_id = BCM5365_DEVICE_ID;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BCM5389_DEVICE_ID:</div><div class='ctx'> 	case BCM5395_DEVICE_ID:</div><div class='hunk'>@@ -2366,6 +3276,7 @@ int b53_switch_detect(struct b53_device *dev)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='ctx'> 		switch (id32) {</div><div class='add'>+		case BCM53101_DEVICE_ID:</div><div class='ctx'> 		case BCM53115_DEVICE_ID:</div><div class='ctx'> 		case BCM53125_DEVICE_ID:</div><div class='ctx'> 		case BCM53128_DEVICE_ID:</div><div class='hunk'>@@ -2374,11 +3285,13 @@ int b53_switch_detect(struct b53_device *dev)</div><div class='ctx'> 		case BCM53012_DEVICE_ID:</div><div class='ctx'> 		case BCM53018_DEVICE_ID:</div><div class='ctx'> 		case BCM53019_DEVICE_ID:</div><div class='add'>+		case BCM53134_DEVICE_ID:</div><div class='ctx'> 			dev-&gt;chip_id = id32;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			pr_err("unsupported switch detected (BCM53%02x/BCM%x)\n",</div><div class='del'>-			       id8, id32);</div><div class='add'>+			dev_err(dev-&gt;dev,</div><div class='add'>+				"unsupported switch detected (BCM53%02x/BCM%x)\n",</div><div class='add'>+				id8, id32);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2408,7 +3321,8 @@ int b53_switch_register(struct b53_device *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	pr_info("found switch: %s, rev %i\n", dev-&gt;name, dev-&gt;core_rev);</div><div class='add'>+	dev_info(dev-&gt;dev, "found switch: %s, rev %i\n",</div><div class='add'>+		 dev-&gt;name, dev-&gt;core_rev);</div><div class='ctx'> </div><div class='ctx'> 	return dsa_register_switch(dev-&gt;ds);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_mdio.c b/drivers/net/dsa/b53/b53_mdio.c<br/>index a533a90e3904..43a3b37b731b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_mdio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_mdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_mdio.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/brcmphy.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='hunk'>@@ -286,6 +287,7 @@ static const struct b53_io_ops b53_mdio_ops = {</div><div class='ctx'> #define B53_BRCM_OUI_2	0x03625c00</div><div class='ctx'> #define B53_BRCM_OUI_3	0x00406000</div><div class='ctx'> #define B53_BRCM_OUI_4	0x01410c00</div><div class='add'>+#define B53_BRCM_OUI_5	0xae025000</div><div class='ctx'> </div><div class='ctx'> static int b53_mdio_probe(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='hunk'>@@ -313,7 +315,8 @@ static int b53_mdio_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	if ((phy_id &amp; 0xfffffc00) != B53_BRCM_OUI_1 &amp;&amp;</div><div class='ctx'> 	    (phy_id &amp; 0xfffffc00) != B53_BRCM_OUI_2 &amp;&amp;</div><div class='ctx'> 	    (phy_id &amp; 0xfffffc00) != B53_BRCM_OUI_3 &amp;&amp;</div><div class='del'>-	    (phy_id &amp; 0xfffffc00) != B53_BRCM_OUI_4) {</div><div class='add'>+	    (phy_id &amp; 0xfffffc00) != B53_BRCM_OUI_4 &amp;&amp;</div><div class='add'>+	    (phy_id &amp; 0xfffffc00) != B53_BRCM_OUI_5) {</div><div class='ctx'> 		dev_err(&amp;mdiodev-&gt;dev, "Unsupported device: 0x%08x\n", phy_id);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -326,7 +329,7 @@ static int b53_mdio_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	 * layer setup</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (of_machine_is_compatible("brcm,bcm7445d0") &amp;&amp;</div><div class='del'>-	    strcmp(mdiodev-&gt;bus-&gt;name, "sf2 slave mii"))</div><div class='add'>+	    strcmp(mdiodev-&gt;bus-&gt;name, "sf2 user mii"))</div><div class='ctx'> 		return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='ctx'> 	dev = b53_switch_alloc(&amp;mdiodev-&gt;dev, &amp;b53_mdio_ops, mdiodev-&gt;bus);</div><div class='hunk'>@@ -340,10 +343,9 @@ static int b53_mdio_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	dev_set_drvdata(&amp;mdiodev-&gt;dev, dev);</div><div class='ctx'> </div><div class='ctx'> 	ret = b53_switch_register(dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;mdiodev-&gt;dev, "failed to register switch: %i\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(&amp;mdiodev-&gt;dev, ret,</div><div class='add'>+				     "failed to register switch\n");</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -351,16 +353,32 @@ static int b53_mdio_probe(struct mdio_device *mdiodev)</div><div class='ctx'> static void b53_mdio_remove(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='del'>-	struct dsa_switch *ds = dev-&gt;ds;</div><div class='ctx'> </div><div class='del'>-	dsa_unregister_switch(ds);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b53_switch_remove(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_mdio_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b53_switch_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id b53_of_match[] = {</div><div class='ctx'> 	{ .compatible = "brcm,bcm5325" },</div><div class='add'>+	{ .compatible = "brcm,bcm53101" },</div><div class='ctx'> 	{ .compatible = "brcm,bcm53115" },</div><div class='ctx'> 	{ .compatible = "brcm,bcm53125" },</div><div class='ctx'> 	{ .compatible = "brcm,bcm53128" },</div><div class='add'>+	{ .compatible = "brcm,bcm53134" },</div><div class='ctx'> 	{ .compatible = "brcm,bcm5365" },</div><div class='ctx'> 	{ .compatible = "brcm,bcm5389" },</div><div class='ctx'> 	{ .compatible = "brcm,bcm5395" },</div><div class='hunk'>@@ -373,6 +391,7 @@ MODULE_DEVICE_TABLE(of, b53_of_match);</div><div class='ctx'> static struct mdio_driver b53_mdio_driver = {</div><div class='ctx'> 	.probe	= b53_mdio_probe,</div><div class='ctx'> 	.remove	= b53_mdio_remove,</div><div class='add'>+	.shutdown = b53_mdio_shutdown,</div><div class='ctx'> 	.mdiodrv.driver = {</div><div class='ctx'> 		.name = "bcm53xx",</div><div class='ctx'> 		.of_match_table = b53_of_match,</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_mmap.c b/drivers/net/dsa/b53/b53_mmap.c<br/>index c628d0980c0b..f4a59d8fbdd6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_mmap.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_mmap.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_mmap.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_mmap.c</a></div><div class='hunk'>@@ -16,16 +16,65 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/b53.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "b53_priv.h"</div><div class='ctx'> </div><div class='add'>+#define BCM63XX_EPHY_REG 0x3C</div><div class='add'>+#define BCM63268_GPHY_REG 0x54</div><div class='add'>+</div><div class='add'>+#define GPHY_CTRL_LOW_PWR	BIT(3)</div><div class='add'>+#define GPHY_CTRL_IDDQ_BIAS	BIT(0)</div><div class='add'>+</div><div class='add'>+struct b53_phy_info {</div><div class='add'>+	u32 gphy_port_mask;</div><div class='add'>+	u32 ephy_enable_mask;</div><div class='add'>+	u32 ephy_port_mask;</div><div class='add'>+	u32 ephy_bias_bit;</div><div class='add'>+	const u32 *ephy_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct b53_mmap_priv {</div><div class='ctx'> 	void __iomem *regs;</div><div class='add'>+	struct regmap *gpio_ctrl;</div><div class='add'>+	const struct b53_phy_info *phy_info;</div><div class='add'>+	u32 phys_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 bcm6318_ephy_offsets[] = {4, 5, 6, 7};</div><div class='add'>+</div><div class='add'>+static const struct b53_phy_info bcm6318_ephy_info = {</div><div class='add'>+	.ephy_enable_mask = BIT(0) | BIT(4) | BIT(8) | BIT(12) | BIT(16),</div><div class='add'>+	.ephy_port_mask = GENMASK((ARRAY_SIZE(bcm6318_ephy_offsets) - 1), 0),</div><div class='add'>+	.ephy_bias_bit = 24,</div><div class='add'>+	.ephy_offset = bcm6318_ephy_offsets,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 bcm6368_ephy_offsets[] = {2, 3, 4, 5};</div><div class='add'>+</div><div class='add'>+static const struct b53_phy_info bcm6368_ephy_info = {</div><div class='add'>+	.ephy_enable_mask = BIT(0),</div><div class='add'>+	.ephy_port_mask = GENMASK((ARRAY_SIZE(bcm6368_ephy_offsets) - 1), 0),</div><div class='add'>+	.ephy_bias_bit = 0,</div><div class='add'>+	.ephy_offset = bcm6368_ephy_offsets,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 bcm63268_ephy_offsets[] = {4, 9, 14};</div><div class='add'>+</div><div class='add'>+static const struct b53_phy_info bcm63268_ephy_info = {</div><div class='add'>+	.gphy_port_mask = BIT(3),</div><div class='add'>+	.ephy_enable_mask = GENMASK(4, 0),</div><div class='add'>+	.ephy_port_mask = GENMASK((ARRAY_SIZE(bcm63268_ephy_offsets) - 1), 0),</div><div class='add'>+	.ephy_bias_bit = 24,</div><div class='add'>+	.ephy_offset = bcm63268_ephy_offsets,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int b53_mmap_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)</div><div class='hunk'>@@ -215,6 +264,83 @@ static int b53_mmap_write64(struct b53_device *dev, u8 page, u8 reg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int b53_mmap_phy_read16(struct b53_device *dev, int addr, int reg,</div><div class='add'>+			       u16 *value)</div><div class='add'>+{</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int b53_mmap_phy_write16(struct b53_device *dev, int addr, int reg,</div><div class='add'>+				u16 value)</div><div class='add'>+{</div><div class='add'>+	return -EIO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm63xx_ephy_set(struct b53_device *dev, int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct b53_mmap_priv *priv = dev-&gt;priv;</div><div class='add'>+	const struct b53_phy_info *info = priv-&gt;phy_info;</div><div class='add'>+	struct regmap *gpio_ctrl = priv-&gt;gpio_ctrl;</div><div class='add'>+	u32 mask, val;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		mask = (info-&gt;ephy_enable_mask &lt;&lt; info-&gt;ephy_offset[port])</div><div class='add'>+				| BIT(info-&gt;ephy_bias_bit);</div><div class='add'>+		val = 0;</div><div class='add'>+	} else {</div><div class='add'>+		mask = (info-&gt;ephy_enable_mask &lt;&lt; info-&gt;ephy_offset[port]);</div><div class='add'>+		if (!((priv-&gt;phys_enabled &amp; ~BIT(port)) &amp; info-&gt;ephy_port_mask))</div><div class='add'>+			mask |= BIT(info-&gt;ephy_bias_bit);</div><div class='add'>+		val = mask;</div><div class='add'>+	}</div><div class='add'>+	return regmap_update_bits(gpio_ctrl, BCM63XX_EPHY_REG, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm63268_gphy_set(struct b53_device *dev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct b53_mmap_priv *priv = dev-&gt;priv;</div><div class='add'>+	struct regmap *gpio_ctrl = priv-&gt;gpio_ctrl;</div><div class='add'>+	u32 mask = GPHY_CTRL_IDDQ_BIAS | GPHY_CTRL_LOW_PWR;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	if (!enable)</div><div class='add'>+		val = mask;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(gpio_ctrl, BCM63268_GPHY_REG, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_mmap_phy_enable(struct b53_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_mmap_priv *priv = dev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;phy_info) {</div><div class='add'>+		if (BIT(port) &amp; priv-&gt;phy_info-&gt;ephy_port_mask)</div><div class='add'>+			ret = bcm63xx_ephy_set(dev, port, true);</div><div class='add'>+		else if (BIT(port) &amp; priv-&gt;phy_info-&gt;gphy_port_mask)</div><div class='add'>+			ret = bcm63268_gphy_set(dev, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		priv-&gt;phys_enabled |= BIT(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_mmap_phy_disable(struct b53_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct b53_mmap_priv *priv = dev-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;phy_info) {</div><div class='add'>+		if (BIT(port) &amp; priv-&gt;phy_info-&gt;ephy_port_mask)</div><div class='add'>+			ret = bcm63xx_ephy_set(dev, port, false);</div><div class='add'>+		else if (BIT(port) &amp; priv-&gt;phy_info-&gt;gphy_port_mask)</div><div class='add'>+			ret = bcm63268_gphy_set(dev, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		priv-&gt;phys_enabled &amp;= ~BIT(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct b53_io_ops b53_mmap_ops = {</div><div class='ctx'> 	.read8 = b53_mmap_read8,</div><div class='ctx'> 	.read16 = b53_mmap_read16,</div><div class='hunk'>@@ -226,13 +352,71 @@ static const struct b53_io_ops b53_mmap_ops = {</div><div class='ctx'> 	.write32 = b53_mmap_write32,</div><div class='ctx'> 	.write48 = b53_mmap_write48,</div><div class='ctx'> 	.write64 = b53_mmap_write64,</div><div class='add'>+	.phy_read16 = b53_mmap_phy_read16,</div><div class='add'>+	.phy_write16 = b53_mmap_phy_write16,</div><div class='add'>+	.phy_enable = b53_mmap_phy_enable,</div><div class='add'>+	.phy_disable = b53_mmap_phy_disable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int b53_mmap_probe_of(struct platform_device *pdev,</div><div class='add'>+			     struct b53_platform_data **ppdata)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct device_node *of_ports, *of_port;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct b53_platform_data *pdata;</div><div class='add'>+	void __iomem *mem;</div><div class='add'>+</div><div class='add'>+	mem = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(mem))</div><div class='add'>+		return PTR_ERR(mem);</div><div class='add'>+</div><div class='add'>+	pdata = devm_kzalloc(dev, sizeof(struct b53_platform_data),</div><div class='add'>+			     GFP_KERNEL);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	pdata-&gt;regs = mem;</div><div class='add'>+	pdata-&gt;chip_id = (u32)(unsigned long)device_get_match_data(dev);</div><div class='add'>+	pdata-&gt;big_endian = of_property_read_bool(np, "big-endian");</div><div class='add'>+</div><div class='add'>+	of_ports = of_get_child_by_name(np, "ports");</div><div class='add'>+	if (!of_ports) {</div><div class='add'>+		dev_err(dev, "no ports child node found\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node(of_ports, of_port) {</div><div class='add'>+		u32 reg;</div><div class='add'>+</div><div class='add'>+		if (of_property_read_u32(of_port, "reg", &amp;reg))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (reg &lt; B53_N_PORTS)</div><div class='add'>+			pdata-&gt;enabled_ports |= BIT(reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_node_put(of_ports);</div><div class='add'>+	*ppdata = pdata;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int b53_mmap_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct b53_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct b53_mmap_priv *priv;</div><div class='ctx'> 	struct b53_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!pdata &amp;&amp; np) {</div><div class='add'>+		ret = b53_mmap_probe_of(pdev, &amp;pdata);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "OF probe error\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -243,6 +427,18 @@ static int b53_mmap_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;regs = pdata-&gt;regs;</div><div class='ctx'> </div><div class='add'>+	priv-&gt;gpio_ctrl = syscon_regmap_lookup_by_phandle(np, "brcm,gpio-ctrl");</div><div class='add'>+	if (!IS_ERR(priv-&gt;gpio_ctrl)) {</div><div class='add'>+		if (pdata-&gt;chip_id == BCM6318_DEVICE_ID ||</div><div class='add'>+		    pdata-&gt;chip_id == BCM6328_DEVICE_ID ||</div><div class='add'>+		    pdata-&gt;chip_id == BCM6362_DEVICE_ID)</div><div class='add'>+			priv-&gt;phy_info = &amp;bcm6318_ephy_info;</div><div class='add'>+		else if (pdata-&gt;chip_id == BCM6368_DEVICE_ID)</div><div class='add'>+			priv-&gt;phy_info = &amp;bcm6368_ephy_info;</div><div class='add'>+		else if (pdata-&gt;chip_id == BCM63268_DEVICE_ID)</div><div class='add'>+			priv-&gt;phy_info = &amp;bcm63268_ephy_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev = b53_switch_alloc(&amp;pdev-&gt;dev, &amp;b53_mmap_ops, priv);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -254,28 +450,54 @@ static int b53_mmap_probe(struct platform_device *pdev)</div><div class='ctx'> 	return b53_switch_register(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b53_mmap_remove(struct platform_device *pdev)</div><div class='add'>+static void b53_mmap_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev)</div><div class='ctx'> 		b53_switch_remove(dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void b53_mmap_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		b53_switch_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id b53_mmap_of_table[] = {</div><div class='del'>-	{ .compatible = "brcm,bcm3384-switch" },</div><div class='del'>-	{ .compatible = "brcm,bcm6328-switch" },</div><div class='del'>-	{ .compatible = "brcm,bcm6368-switch" },</div><div class='del'>-	{ .compatible = "brcm,bcm63xx-switch" },</div><div class='del'>-	{ /* sentinel */ },</div><div class='add'>+	{</div><div class='add'>+		.compatible = "brcm,bcm3384-switch",</div><div class='add'>+		.data = (void *)BCM63XX_DEVICE_ID,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "brcm,bcm6318-switch",</div><div class='add'>+		.data = (void *)BCM6318_DEVICE_ID,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "brcm,bcm6328-switch",</div><div class='add'>+		.data = (void *)BCM6328_DEVICE_ID,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "brcm,bcm6362-switch",</div><div class='add'>+		.data = (void *)BCM6362_DEVICE_ID,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "brcm,bcm6368-switch",</div><div class='add'>+		.data = (void *)BCM6368_DEVICE_ID,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "brcm,bcm63268-switch",</div><div class='add'>+		.data = (void *)BCM63268_DEVICE_ID,</div><div class='add'>+	}, {</div><div class='add'>+		.compatible = "brcm,bcm63xx-switch",</div><div class='add'>+		.data = (void *)BCM63XX_DEVICE_ID,</div><div class='add'>+	}, { /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, b53_mmap_of_table);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver b53_mmap_driver = {</div><div class='ctx'> 	.probe = b53_mmap_probe,</div><div class='ctx'> 	.remove = b53_mmap_remove,</div><div class='add'>+	.shutdown = b53_mmap_shutdown,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "b53-switch",</div><div class='ctx'> 		.of_match_table = b53_mmap_of_table,</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h<br/>index f25bc80c4ffc..bd6849e5bb93 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_priv.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_priv.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_priv.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_priv.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> </div><div class='ctx'> struct b53_device;</div><div class='ctx'> struct net_device;</div><div class='del'>-struct phylink_link_state;</div><div class='ctx'> </div><div class='ctx'> struct b53_io_ops {</div><div class='ctx'> 	int (*read8)(struct b53_device *dev, u8 page, u8 reg, u8 *value);</div><div class='hunk'>@@ -46,34 +45,50 @@ struct b53_io_ops {</div><div class='ctx'> 	int (*phy_write16)(struct b53_device *dev, int addr, int reg, u16 value);</div><div class='ctx'> 	int (*irq_enable)(struct b53_device *dev, int port);</div><div class='ctx'> 	void (*irq_disable)(struct b53_device *dev, int port);</div><div class='add'>+	void (*phy_enable)(struct b53_device *dev, int port);</div><div class='add'>+	void (*phy_disable)(struct b53_device *dev, int port);</div><div class='add'>+	void (*phylink_get_caps)(struct b53_device *dev, int port,</div><div class='add'>+				 struct phylink_config *config);</div><div class='add'>+	struct phylink_pcs *(*phylink_mac_select_pcs)(struct b53_device *dev,</div><div class='add'>+						      int port,</div><div class='add'>+						      phy_interface_t interface);</div><div class='ctx'> 	u8 (*serdes_map_lane)(struct b53_device *dev, int port);</div><div class='del'>-	int (*serdes_link_state)(struct b53_device *dev, int port,</div><div class='del'>-				 struct phylink_link_state *state);</div><div class='del'>-	void (*serdes_config)(struct b53_device *dev, int port,</div><div class='del'>-			      unsigned int mode,</div><div class='del'>-			      const struct phylink_link_state *state);</div><div class='del'>-	void (*serdes_an_restart)(struct b53_device *dev, int port);</div><div class='ctx'> 	void (*serdes_link_set)(struct b53_device *dev, int port,</div><div class='ctx'> 				unsigned int mode, phy_interface_t interface,</div><div class='ctx'> 				bool link_up);</div><div class='del'>-	void (*serdes_phylink_validate)(struct b53_device *dev, int port,</div><div class='del'>-					unsigned long *supported,</div><div class='del'>-					struct phylink_link_state *state);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct b53_arl_entry;</div><div class='add'>+</div><div class='add'>+struct b53_arl_ops {</div><div class='add'>+	void (*arl_read_entry)(struct b53_device *dev,</div><div class='add'>+			       struct b53_arl_entry *ent, u8 idx);</div><div class='add'>+	void (*arl_write_entry)(struct b53_device *dev,</div><div class='add'>+				const struct b53_arl_entry *ent, u8 idx);</div><div class='add'>+	void (*arl_search_read)(struct b53_device *dev, u8 idx,</div><div class='add'>+				struct b53_arl_entry *ent);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define B53_INVALID_LANE	0xff</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='add'>+	BCM4908_DEVICE_ID = 0x4908,</div><div class='ctx'> 	BCM5325_DEVICE_ID = 0x25,</div><div class='ctx'> 	BCM5365_DEVICE_ID = 0x65,</div><div class='ctx'> 	BCM5389_DEVICE_ID = 0x89,</div><div class='ctx'> 	BCM5395_DEVICE_ID = 0x95,</div><div class='ctx'> 	BCM5397_DEVICE_ID = 0x97,</div><div class='ctx'> 	BCM5398_DEVICE_ID = 0x98,</div><div class='add'>+	BCM53101_DEVICE_ID = 0x53101,</div><div class='ctx'> 	BCM53115_DEVICE_ID = 0x53115,</div><div class='ctx'> 	BCM53125_DEVICE_ID = 0x53125,</div><div class='ctx'> 	BCM53128_DEVICE_ID = 0x53128,</div><div class='ctx'> 	BCM63XX_DEVICE_ID = 0x6300,</div><div class='add'>+	BCM6318_DEVICE_ID = 0x6318,</div><div class='add'>+	BCM6328_DEVICE_ID = 0x6328,</div><div class='add'>+	BCM6362_DEVICE_ID = 0x6362,</div><div class='add'>+	BCM6368_DEVICE_ID = 0x6368,</div><div class='add'>+	BCM63268_DEVICE_ID = 0x63268,</div><div class='ctx'> 	BCM53010_DEVICE_ID = 0x53010,</div><div class='ctx'> 	BCM53011_DEVICE_ID = 0x53011,</div><div class='ctx'> 	BCM53012_DEVICE_ID = 0x53012,</div><div class='hunk'>@@ -83,15 +98,29 @@ enum {</div><div class='ctx'> 	BCM583XX_DEVICE_ID = 0x58300,</div><div class='ctx'> 	BCM7445_DEVICE_ID = 0x7445,</div><div class='ctx'> 	BCM7278_DEVICE_ID = 0x7278,</div><div class='add'>+	BCM53134_DEVICE_ID = 0x5075,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum b53_variant_id {</div><div class='add'>+	B53_VARIANT_NONE = 0,</div><div class='add'>+	B53_VARIANT_5325E,</div><div class='add'>+	B53_VARIANT_5325M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct b53_pcs {</div><div class='add'>+	struct phylink_pcs pcs;</div><div class='add'>+	struct b53_device *dev;</div><div class='add'>+	u8 lane;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define B53_N_PORTS	9</div><div class='ctx'> #define B53_N_PORTS_25	6</div><div class='add'>+#define B53_N_PCS	2</div><div class='ctx'> </div><div class='ctx'> struct b53_port {</div><div class='ctx'> 	u16		vlan_ctl_mask;</div><div class='del'>-	struct ethtool_eee eee;</div><div class='ctx'> 	u16		pvid;</div><div class='add'>+	struct ethtool_keee eee;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct b53_vlan {</div><div class='hunk'>@@ -107,21 +136,26 @@ struct b53_device {</div><div class='ctx'> </div><div class='ctx'> 	struct mutex reg_mutex;</div><div class='ctx'> 	struct mutex stats_mutex;</div><div class='add'>+	struct mutex arl_mutex;</div><div class='ctx'> 	const struct b53_io_ops *ops;</div><div class='add'>+	const struct b53_arl_ops *arl_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* chip specific data */</div><div class='ctx'> 	u32 chip_id;</div><div class='add'>+	enum b53_variant_id variant_id;</div><div class='ctx'> 	u8 core_rev;</div><div class='ctx'> 	u8 vta_regs[3];</div><div class='ctx'> 	u8 duplex_reg;</div><div class='ctx'> 	u8 jumbo_pm_reg;</div><div class='ctx'> 	u8 jumbo_size_reg;</div><div class='ctx'> 	int reset_gpio;</div><div class='del'>-	u8 num_arl_entries;</div><div class='add'>+	u8 num_arl_bins;</div><div class='add'>+	u16 num_arl_buckets;</div><div class='add'>+	enum dsa_tag_protocol tag_protocol;</div><div class='ctx'> </div><div class='ctx'> 	/* used ports mask */</div><div class='ctx'> 	u16 enabled_ports;</div><div class='del'>-	unsigned int cpu_port;</div><div class='add'>+	unsigned int imp_port;</div><div class='ctx'> </div><div class='ctx'> 	/* connect specific data */</div><div class='ctx'> 	u8 current_page;</div><div class='hunk'>@@ -139,8 +173,11 @@ struct b53_device {</div><div class='ctx'> 	unsigned int num_vlans;</div><div class='ctx'> 	struct b53_vlan *vlans;</div><div class='ctx'> 	bool vlan_enabled;</div><div class='add'>+	bool vlan_filtering;</div><div class='ctx'> 	unsigned int num_ports;</div><div class='ctx'> 	struct b53_port *ports;</div><div class='add'>+</div><div class='add'>+	struct b53_pcs pcs[B53_N_PCS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define b53_for_each_port(dev, i) \</div><div class='hunk'>@@ -153,6 +190,18 @@ static inline int is5325(struct b53_device *dev)</div><div class='ctx'> 	return dev-&gt;chip_id == BCM5325_DEVICE_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int is5325e(struct b53_device *dev)</div><div class='add'>+{</div><div class='add'>+	return is5325(dev) &amp;&amp;</div><div class='add'>+		dev-&gt;variant_id == B53_VARIANT_5325E;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is5325m(struct b53_device *dev)</div><div class='add'>+{</div><div class='add'>+	return is5325(dev) &amp;&amp;</div><div class='add'>+		dev-&gt;variant_id == B53_VARIANT_5325M;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int is5365(struct b53_device *dev)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BCM47XX</div><div class='hunk'>@@ -179,16 +228,25 @@ static inline int is531x5(struct b53_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return dev-&gt;chip_id == BCM53115_DEVICE_ID ||</div><div class='ctx'> 		dev-&gt;chip_id == BCM53125_DEVICE_ID ||</div><div class='del'>-		dev-&gt;chip_id == BCM53128_DEVICE_ID;</div><div class='add'>+		dev-&gt;chip_id == BCM53101_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM53128_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM53134_DEVICE_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int is63xx(struct b53_device *dev)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_BCM63XX</div><div class='del'>-	return dev-&gt;chip_id == BCM63XX_DEVICE_ID;</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='add'>+	return dev-&gt;chip_id == BCM63XX_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM6318_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM6328_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM6362_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM6368_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM63268_DEVICE_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is6318_268(struct b53_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == BCM6318_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM63268_DEVICE_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int is5301x(struct b53_device *dev)</div><div class='hunk'>@@ -205,12 +263,19 @@ static inline int is58xx(struct b53_device *dev)</div><div class='ctx'> 	return dev-&gt;chip_id == BCM58XX_DEVICE_ID ||</div><div class='ctx'> 		dev-&gt;chip_id == BCM583XX_DEVICE_ID ||</div><div class='ctx'> 		dev-&gt;chip_id == BCM7445_DEVICE_ID ||</div><div class='del'>-		dev-&gt;chip_id == BCM7278_DEVICE_ID;</div><div class='add'>+		dev-&gt;chip_id == BCM7278_DEVICE_ID ||</div><div class='add'>+		dev-&gt;chip_id == BCM53134_DEVICE_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define B53_63XX_RGMII0	4</div><div class='ctx'> #define B53_CPU_PORT_25	5</div><div class='ctx'> #define B53_CPU_PORT	8</div><div class='ctx'> </div><div class='add'>+static inline unsigned int b53_max_arl_entries(struct b53_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;num_arl_buckets * dev-&gt;num_arl_bins;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct b53_device *b53_switch_alloc(struct device *base,</div><div class='ctx'> 				    const struct b53_io_ops *ops,</div><div class='ctx'> 				    void *priv);</div><div class='hunk'>@@ -224,6 +289,11 @@ static inline void b53_switch_remove(struct b53_device *dev)</div><div class='ctx'> 	dsa_unregister_switch(dev-&gt;ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void b53_switch_shutdown(struct b53_device *dev)</div><div class='add'>+{</div><div class='add'>+	dsa_switch_shutdown(dev-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define b53_build_op(type_op_size, val_type)				\</div><div class='ctx'> static inline int b53_##type_op_size(struct b53_device *dev, u8 page,	\</div><div class='ctx'> 				     u8 reg, val_type val)		\</div><div class='hunk'>@@ -250,7 +320,7 @@ b53_build_op(write48, u64);</div><div class='ctx'> b53_build_op(write64, u64);</div><div class='ctx'> </div><div class='ctx'> struct b53_arl_entry {</div><div class='del'>-	u8 port;</div><div class='add'>+	u16 port;</div><div class='ctx'> 	u8 mac[ETH_ALEN];</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> 	u8 is_valid:1;</div><div class='hunk'>@@ -270,6 +340,33 @@ static inline void b53_arl_to_entry(struct b53_arl_entry *ent,</div><div class='ctx'> 	ent-&gt;vid = mac_vid &gt;&gt; ARLTBL_VID_S;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void b53_arl_to_entry_25(struct b53_arl_entry *ent,</div><div class='add'>+				       u64 mac_vid, u8 vid_entry)</div><div class='add'>+{</div><div class='add'>+	memset(ent, 0, sizeof(*ent));</div><div class='add'>+	ent-&gt;is_valid = !!(mac_vid &amp; ARLTBL_VALID_25);</div><div class='add'>+	ent-&gt;is_age = !!(mac_vid &amp; ARLTBL_AGE_25);</div><div class='add'>+	ent-&gt;is_static = !!(mac_vid &amp; ARLTBL_STATIC_25);</div><div class='add'>+	u64_to_ether_addr(mac_vid, ent-&gt;mac);</div><div class='add'>+	ent-&gt;port = (mac_vid &amp; ARLTBL_DATA_PORT_ID_MASK_25) &gt;&gt;</div><div class='add'>+		     ARLTBL_DATA_PORT_ID_S_25;</div><div class='add'>+	if (is_unicast_ether_addr(ent-&gt;mac) &amp;&amp; ent-&gt;port == B53_CPU_PORT)</div><div class='add'>+		ent-&gt;port = B53_CPU_PORT_25;</div><div class='add'>+	ent-&gt;vid = vid_entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_to_entry_89(struct b53_arl_entry *ent,</div><div class='add'>+				       u64 mac_vid, u16 fwd_entry)</div><div class='add'>+{</div><div class='add'>+	memset(ent, 0, sizeof(*ent));</div><div class='add'>+	ent-&gt;port = fwd_entry &amp; ARLTBL_DATA_PORT_ID_MASK_89;</div><div class='add'>+	ent-&gt;is_valid = !!(fwd_entry &amp; ARLTBL_VALID_89);</div><div class='add'>+	ent-&gt;is_age = !!(fwd_entry &amp; ARLTBL_AGE_89);</div><div class='add'>+	ent-&gt;is_static = !!(fwd_entry &amp; ARLTBL_STATIC_89);</div><div class='add'>+	u64_to_ether_addr(mac_vid, ent-&gt;mac);</div><div class='add'>+	ent-&gt;vid = mac_vid &gt;&gt; ARLTBL_VID_S;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void b53_arl_from_entry(u64 *mac_vid, u32 *fwd_entry,</div><div class='ctx'> 				      const struct b53_arl_entry *ent)</div><div class='ctx'> {</div><div class='hunk'>@@ -284,6 +381,89 @@ static inline void b53_arl_from_entry(u64 *mac_vid, u32 *fwd_entry,</div><div class='ctx'> 		*fwd_entry |= ARLTBL_AGE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void b53_arl_from_entry_25(u64 *mac_vid, u8 *vid_entry,</div><div class='add'>+					 const struct b53_arl_entry *ent)</div><div class='add'>+{</div><div class='add'>+	*mac_vid = ether_addr_to_u64(ent-&gt;mac);</div><div class='add'>+	if (is_unicast_ether_addr(ent-&gt;mac) &amp;&amp; ent-&gt;port == B53_CPU_PORT_25)</div><div class='add'>+		*mac_vid |= (u64)B53_CPU_PORT &lt;&lt; ARLTBL_DATA_PORT_ID_S_25;</div><div class='add'>+	else</div><div class='add'>+		*mac_vid |= ((u64)ent-&gt;port &lt;&lt; ARLTBL_DATA_PORT_ID_S_25) &amp;</div><div class='add'>+			    ARLTBL_DATA_PORT_ID_MASK_25;</div><div class='add'>+	if (ent-&gt;is_valid)</div><div class='add'>+		*mac_vid |= ARLTBL_VALID_25;</div><div class='add'>+	if (ent-&gt;is_static)</div><div class='add'>+		*mac_vid |= ARLTBL_STATIC_25;</div><div class='add'>+	if (ent-&gt;is_age)</div><div class='add'>+		*mac_vid |= ARLTBL_AGE_25;</div><div class='add'>+	*vid_entry = ent-&gt;vid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_from_entry_89(u64 *mac_vid, u32 *fwd_entry,</div><div class='add'>+					 const struct b53_arl_entry *ent)</div><div class='add'>+{</div><div class='add'>+	*mac_vid = ether_addr_to_u64(ent-&gt;mac);</div><div class='add'>+	*mac_vid |= (u64)(ent-&gt;vid &amp; ARLTBL_VID_MASK) &lt;&lt; ARLTBL_VID_S;</div><div class='add'>+	*fwd_entry = ent-&gt;port &amp; ARLTBL_DATA_PORT_ID_MASK_89;</div><div class='add'>+	if (ent-&gt;is_valid)</div><div class='add'>+		*fwd_entry |= ARLTBL_VALID_89;</div><div class='add'>+	if (ent-&gt;is_static)</div><div class='add'>+		*fwd_entry |= ARLTBL_STATIC_89;</div><div class='add'>+	if (ent-&gt;is_age)</div><div class='add'>+		*fwd_entry |= ARLTBL_AGE_89;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_search_to_entry_25(struct b53_arl_entry *ent,</div><div class='add'>+					      u64 mac_vid, u8 ext)</div><div class='add'>+{</div><div class='add'>+	memset(ent, 0, sizeof(*ent));</div><div class='add'>+	ent-&gt;is_valid = !!(mac_vid &amp; ARLTBL_VALID_25);</div><div class='add'>+	ent-&gt;is_age = !!(mac_vid &amp; ARLTBL_AGE_25);</div><div class='add'>+	ent-&gt;is_static = !!(mac_vid &amp; ARLTBL_STATIC_25);</div><div class='add'>+	u64_to_ether_addr(mac_vid, ent-&gt;mac);</div><div class='add'>+	ent-&gt;vid = (mac_vid &amp; ARL_SRCH_RSLT_VID_MASK_25) &gt;&gt;</div><div class='add'>+		   ARL_SRCH_RSLT_VID_S_25;</div><div class='add'>+	ent-&gt;port = (mac_vid &amp; ARL_SRCH_RSLT_PORT_ID_MASK_25) &gt;&gt;</div><div class='add'>+		    ARL_SRCH_RSLT_PORT_ID_S_25;</div><div class='add'>+	if (is_multicast_ether_addr(ent-&gt;mac) &amp;&amp; (ext &amp; ARL_SRCH_RSLT_EXT_MC_MII))</div><div class='add'>+		ent-&gt;port |= BIT(B53_CPU_PORT_25);</div><div class='add'>+	else if (!is_multicast_ether_addr(ent-&gt;mac) &amp;&amp; ent-&gt;port == B53_CPU_PORT)</div><div class='add'>+		ent-&gt;port = B53_CPU_PORT_25;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_search_to_entry_63xx(struct b53_arl_entry *ent,</div><div class='add'>+						u64 mac_vid, u16 fwd_entry)</div><div class='add'>+{</div><div class='add'>+	memset(ent, 0, sizeof(*ent));</div><div class='add'>+	u64_to_ether_addr(mac_vid, ent-&gt;mac);</div><div class='add'>+	ent-&gt;vid = mac_vid &gt;&gt; ARLTBL_VID_S;</div><div class='add'>+</div><div class='add'>+	ent-&gt;port = fwd_entry &amp; ARL_SRST_PORT_ID_MASK_63XX;</div><div class='add'>+	ent-&gt;port &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	ent-&gt;is_age = !!(fwd_entry &amp; ARL_SRST_AGE_63XX);</div><div class='add'>+	ent-&gt;is_static = !!(fwd_entry &amp; ARL_SRST_STATIC_63XX);</div><div class='add'>+	ent-&gt;is_valid = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_read_entry(struct b53_device *dev,</div><div class='add'>+				      struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;arl_ops-&gt;arl_read_entry(dev, ent, idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_write_entry(struct b53_device *dev,</div><div class='add'>+				       const struct b53_arl_entry *ent, u8 idx)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;arl_ops-&gt;arl_write_entry(dev, ent, idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void b53_arl_search_read(struct b53_device *dev, u8 idx,</div><div class='add'>+				       struct b53_arl_entry *ent)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;arl_ops-&gt;arl_search_read(dev, idx, ent);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BCM47XX</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bcm47xx_nvram.h&gt;</div><div class='hunk'>@@ -315,51 +495,54 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='ctx'> void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);</div><div class='ctx'> int b53_get_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='ctx'> void b53_get_ethtool_phy_stats(struct dsa_switch *ds, int port, uint64_t *data);</div><div class='del'>-int b53_br_join(struct dsa_switch *ds, int port, struct net_device *bridge);</div><div class='del'>-void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *bridge);</div><div class='add'>+int b53_set_ageing_time(struct dsa_switch *ds, unsigned int msecs);</div><div class='add'>+int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge,</div><div class='add'>+		bool *tx_fwd_offload, struct netlink_ext_ack *extack);</div><div class='add'>+void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge);</div><div class='ctx'> void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state);</div><div class='ctx'> void b53_br_fast_age(struct dsa_switch *ds, int port);</div><div class='add'>+int b53_br_flags_pre(struct dsa_switch *ds, int port,</div><div class='add'>+		     struct switchdev_brport_flags flags,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+int b53_br_flags(struct dsa_switch *ds, int port,</div><div class='add'>+		 struct switchdev_brport_flags flags,</div><div class='add'>+		 struct netlink_ext_ack *extack);</div><div class='add'>+int b53_setup_devlink_resources(struct dsa_switch *ds);</div><div class='ctx'> void b53_port_event(struct dsa_switch *ds, int port);</div><div class='del'>-void b53_phylink_validate(struct dsa_switch *ds, int port,</div><div class='del'>-			  unsigned long *supported,</div><div class='del'>-			  struct phylink_link_state *state);</div><div class='del'>-int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,</div><div class='del'>-			       struct phylink_link_state *state);</div><div class='del'>-void b53_phylink_mac_config(struct dsa_switch *ds, int port,</div><div class='del'>-			    unsigned int mode,</div><div class='del'>-			    const struct phylink_link_state *state);</div><div class='del'>-void b53_phylink_mac_an_restart(struct dsa_switch *ds, int port);</div><div class='del'>-void b53_phylink_mac_link_down(struct dsa_switch *ds, int port,</div><div class='del'>-			       unsigned int mode,</div><div class='del'>-			       phy_interface_t interface);</div><div class='del'>-void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,</div><div class='del'>-			     unsigned int mode,</div><div class='del'>-			     phy_interface_t interface,</div><div class='del'>-			     struct phy_device *phydev);</div><div class='del'>-int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering);</div><div class='del'>-int b53_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_vlan *vlan);</div><div class='del'>-void b53_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-		  const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+int b53_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+		 const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		 struct netlink_ext_ack *extack);</div><div class='ctx'> int b53_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 const struct switchdev_obj_port_vlan *vlan);</div><div class='ctx'> int b53_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-		const unsigned char *addr, u16 vid);</div><div class='add'>+		const unsigned char *addr, u16 vid,</div><div class='add'>+		struct dsa_db db);</div><div class='ctx'> int b53_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-		const unsigned char *addr, u16 vid);</div><div class='add'>+		const unsigned char *addr, u16 vid,</div><div class='add'>+		struct dsa_db db);</div><div class='ctx'> int b53_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 dsa_fdb_dump_cb_t *cb, void *data);</div><div class='add'>+int b53_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		struct dsa_db db);</div><div class='add'>+int b53_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		struct dsa_db db);</div><div class='ctx'> int b53_mirror_add(struct dsa_switch *ds, int port,</div><div class='del'>-		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress);</div><div class='del'>-enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port);</div><div class='add'>+		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress,</div><div class='add'>+		   struct netlink_ext_ack *extack);</div><div class='add'>+enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+					   enum dsa_tag_protocol mprot);</div><div class='ctx'> void b53_mirror_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 		    struct dsa_mall_mirror_tc_entry *mirror);</div><div class='add'>+int b53_setup_port(struct dsa_switch *ds, int port);</div><div class='ctx'> int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);</div><div class='ctx'> void b53_disable_port(struct dsa_switch *ds, int port);</div><div class='ctx'> void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);</div><div class='del'>-void b53_eee_enable_set(struct dsa_switch *ds, int port, bool enable);</div><div class='ctx'> int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);</div><div class='del'>-int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e);</div><div class='del'>-int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e);</div><div class='add'>+bool b53_support_eee(struct dsa_switch *ds, int port);</div><div class='add'>+int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_regs.h b/drivers/net/dsa/b53/b53_regs.h<br/>index 2a9f421680aa..54a278db67c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_regs.h</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'> #define B53_ARLIO_PAGE			0x05 /* ARL Access */</div><div class='ctx'> #define B53_FRAMEBUF_PAGE		0x06 /* Management frame access */</div><div class='ctx'> #define B53_MEM_ACCESS_PAGE		0x08 /* Memory access */</div><div class='add'>+#define B53_IEEE_PAGE			0x0a /* IEEE 802.1X */</div><div class='ctx'> </div><div class='ctx'> /* PHY Registers */</div><div class='ctx'> #define B53_PORT_MII_PAGE(i)		(0x10 + (i)) /* Port i MII Registers */</div><div class='hunk'>@@ -50,6 +51,9 @@</div><div class='ctx'> /* Jumbo Frame Registers */</div><div class='ctx'> #define B53_JUMBO_PAGE			0x40</div><div class='ctx'> </div><div class='add'>+/* EAP Registers */</div><div class='add'>+#define B53_EAP_PAGE			0x42</div><div class='add'>+</div><div class='ctx'> /* EEE Control Registers Page */</div><div class='ctx'> #define B53_EEE_PAGE			0x92</div><div class='ctx'> </div><div class='hunk'>@@ -92,18 +96,22 @@</div><div class='ctx'> #define   PORT_OVERRIDE_SPEED_10M	(0 &lt;&lt; PORT_OVERRIDE_SPEED_S)</div><div class='ctx'> #define   PORT_OVERRIDE_SPEED_100M	(1 &lt;&lt; PORT_OVERRIDE_SPEED_S)</div><div class='ctx'> #define   PORT_OVERRIDE_SPEED_1000M	(2 &lt;&lt; PORT_OVERRIDE_SPEED_S)</div><div class='add'>+#define   PORT_OVERRIDE_LP_FLOW_25	BIT(3) /* BCM5325 only */</div><div class='ctx'> #define   PORT_OVERRIDE_RV_MII_25	BIT(4) /* BCM5325 only */</div><div class='ctx'> #define   PORT_OVERRIDE_RX_FLOW		BIT(4)</div><div class='ctx'> #define   PORT_OVERRIDE_TX_FLOW		BIT(5)</div><div class='ctx'> #define   PORT_OVERRIDE_SPEED_2000M	BIT(6) /* BCM5301X only, requires setting 1000M */</div><div class='ctx'> #define   PORT_OVERRIDE_EN		BIT(7) /* Use the register contents */</div><div class='ctx'> </div><div class='del'>-/* Power-down mode control */</div><div class='add'>+/* Power-down mode control (8 bit) */</div><div class='ctx'> #define B53_PD_MODE_CTRL_25		0x0f</div><div class='add'>+#define  PD_MODE_PORT_MASK		0x1f</div><div class='add'>+/* Bit 0 also powers down the switch. */</div><div class='add'>+#define  PD_MODE_POWER_DOWN_PORT(i)	BIT(i)</div><div class='ctx'> </div><div class='ctx'> /* IP Multicast control (8 bit) */</div><div class='ctx'> #define B53_IP_MULTICAST_CTRL		0x21</div><div class='del'>-#define  B53_IPMC_FWD_EN		BIT(1)</div><div class='add'>+#define  B53_IP_MC			BIT(0)</div><div class='ctx'> #define  B53_UC_FWD_EN			BIT(6)</div><div class='ctx'> #define  B53_MC_FWD_EN			BIT(7)</div><div class='ctx'> </div><div class='hunk'>@@ -111,10 +119,15 @@</div><div class='ctx'> #define B53_SWITCH_CTRL			0x22</div><div class='ctx'> #define  B53_MII_DUMB_FWDG_EN		BIT(6)</div><div class='ctx'> </div><div class='add'>+/* Protected Port Selection (16 bit) */</div><div class='add'>+#define B53_PROTECTED_PORT_SEL		0x24</div><div class='add'>+#define B53_PROTECTED_PORT_SEL_25	0x26</div><div class='add'>+</div><div class='ctx'> /* (16 bit) */</div><div class='ctx'> #define B53_UC_FLOOD_MASK		0x32</div><div class='ctx'> #define B53_MC_FLOOD_MASK		0x34</div><div class='ctx'> #define B53_IPMC_FLOOD_MASK		0x36</div><div class='add'>+#define B53_DIS_LEARNING		0x3c</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Override Ports 0-7 State on devices with xMII interfaces (8 bit)</div><div class='hunk'>@@ -137,6 +150,7 @@</div><div class='ctx'> </div><div class='ctx'> #define B53_RGMII_CTRL_IMP		0x60</div><div class='ctx'> #define   RGMII_CTRL_ENABLE_GMII	BIT(7)</div><div class='add'>+#define   RGMII_CTRL_MII_OVERRIDE	BIT(6)</div><div class='ctx'> #define   RGMII_CTRL_TIMING_SEL		BIT(2)</div><div class='ctx'> #define   RGMII_CTRL_DLL_RXC		BIT(1)</div><div class='ctx'> #define   RGMII_CTRL_DLL_TXC		BIT(0)</div><div class='hunk'>@@ -215,6 +229,13 @@</div><div class='ctx'> #define   BRCM_HDR_P5_EN		BIT(1) /* Enable tagging on port 5 */</div><div class='ctx'> #define   BRCM_HDR_P7_EN		BIT(2) /* Enable tagging on port 7 */</div><div class='ctx'> </div><div class='add'>+/* Aging Time control register (32 bit) */</div><div class='add'>+#define B53_AGING_TIME_CONTROL		0x06</div><div class='add'>+#define B53_AGING_TIME_CONTROL_63XX	0x08</div><div class='add'>+#define  AGE_CHANGE			BIT(20)</div><div class='add'>+#define  AGE_TIME_MASK			0x7ffff</div><div class='add'>+#define  AGE_TIME_MAX			1048575</div><div class='add'>+</div><div class='ctx'> /* Mirror capture control register (16 bit) */</div><div class='ctx'> #define B53_MIR_CAP_CTL			0x10</div><div class='ctx'> #define  CAP_PORT_MASK			0xf</div><div class='hunk'>@@ -292,6 +313,7 @@</div><div class='ctx'> /* ARL Table Read/Write Register (8 bit) */</div><div class='ctx'> #define B53_ARLTBL_RW_CTRL		0x00</div><div class='ctx'> #define    ARLTBL_RW			BIT(0)</div><div class='add'>+#define    ARLTBL_IVL_SVL_SELECT	BIT(6)</div><div class='ctx'> #define    ARLTBL_START_DONE		BIT(7)</div><div class='ctx'> </div><div class='ctx'> /* MAC Address Index Register (48 bit) */</div><div class='hunk'>@@ -304,28 +326,41 @@</div><div class='ctx'>  *</div><div class='ctx'>  * BCM5325 and BCM5365 share most definitions below</div><div class='ctx'>  */</div><div class='del'>-#define B53_ARLTBL_MAC_VID_ENTRY(n)	(0x10 * (n))</div><div class='add'>+#define B53_ARLTBL_MAC_VID_ENTRY(n)	((0x10 * (n)) + 0x10)</div><div class='ctx'> #define   ARLTBL_MAC_MASK		0xffffffffffffULL</div><div class='ctx'> #define   ARLTBL_VID_S			48</div><div class='del'>-#define   ARLTBL_VID_MASK_25		0xff</div><div class='ctx'> #define   ARLTBL_VID_MASK		0xfff</div><div class='ctx'> #define   ARLTBL_DATA_PORT_ID_S_25	48</div><div class='del'>-#define   ARLTBL_DATA_PORT_ID_MASK_25	0xf</div><div class='del'>-#define   ARLTBL_AGE_25			BIT(61)</div><div class='del'>-#define   ARLTBL_STATIC_25		BIT(62)</div><div class='del'>-#define   ARLTBL_VALID_25		BIT(63)</div><div class='add'>+#define   ARLTBL_DATA_PORT_ID_MASK_25	GENMASK_ULL(53, 48)</div><div class='add'>+#define   ARLTBL_AGE_25			BIT_ULL(61)</div><div class='add'>+#define   ARLTBL_STATIC_25		BIT_ULL(62)</div><div class='add'>+#define   ARLTBL_VALID_25		BIT_ULL(63)</div><div class='ctx'> </div><div class='ctx'> /* ARL Table Data Entry N Registers (32 bit) */</div><div class='del'>-#define B53_ARLTBL_DATA_ENTRY(n)	((0x10 * (n)) + 0x08)</div><div class='add'>+#define B53_ARLTBL_DATA_ENTRY(n)	((0x10 * (n)) + 0x18)</div><div class='ctx'> #define   ARLTBL_DATA_PORT_ID_MASK	0x1ff</div><div class='ctx'> #define   ARLTBL_TC(tc)			((3 &amp; tc) &lt;&lt; 11)</div><div class='ctx'> #define   ARLTBL_AGE			BIT(14)</div><div class='ctx'> #define   ARLTBL_STATIC			BIT(15)</div><div class='ctx'> #define   ARLTBL_VALID			BIT(16)</div><div class='ctx'> </div><div class='add'>+/* BCM5389 ARL Table Data Entry N Register format (16 bit) */</div><div class='add'>+#define   ARLTBL_DATA_PORT_ID_MASK_89	GENMASK(8, 0)</div><div class='add'>+#define   ARLTBL_TC_MASK_89		GENMASK(12, 10)</div><div class='add'>+#define   ARLTBL_AGE_89			BIT(13)</div><div class='add'>+#define   ARLTBL_STATIC_89		BIT(14)</div><div class='add'>+#define   ARLTBL_VALID_89		BIT(15)</div><div class='add'>+</div><div class='add'>+/* BCM5325/BCM565 ARL Table VID Entry N Registers (8 bit) */</div><div class='add'>+#define B53_ARLTBL_VID_ENTRY_25(n)	((0x2 * (n)) + 0x30)</div><div class='add'>+</div><div class='add'>+/* Maximum number of bin entries in the ARL for all switches */</div><div class='add'>+#define B53_ARLTBL_MAX_BIN_ENTRIES	4</div><div class='add'>+</div><div class='ctx'> /* ARL Search Control Register (8 bit) */</div><div class='ctx'> #define B53_ARL_SRCH_CTL		0x50</div><div class='ctx'> #define B53_ARL_SRCH_CTL_25		0x20</div><div class='add'>+#define B53_ARL_SRCH_CTL_89		0x30</div><div class='ctx'> #define   ARL_SRCH_VLID			BIT(0)</div><div class='ctx'> #define   ARL_SRCH_STDN			BIT(7)</div><div class='ctx'> </div><div class='hunk'>@@ -333,22 +368,54 @@</div><div class='ctx'> #define B53_ARL_SRCH_ADDR		0x51</div><div class='ctx'> #define B53_ARL_SRCH_ADDR_25		0x22</div><div class='ctx'> #define B53_ARL_SRCH_ADDR_65		0x24</div><div class='add'>+#define B53_ARL_SRCH_ADDR_89		0x31</div><div class='add'>+#define B53_ARL_SRCH_ADDR_63XX		0x32</div><div class='ctx'> #define  ARL_ADDR_MASK			GENMASK(14, 0)</div><div class='ctx'> </div><div class='ctx'> /* ARL Search MAC/VID Result (64 bit) */</div><div class='ctx'> #define B53_ARL_SRCH_RSTL_0_MACVID	0x60</div><div class='add'>+#define B53_ARL_SRCH_RSLT_MACVID_89	0x33</div><div class='add'>+#define B53_ARL_SRCH_RSLT_MACVID_63XX	0x34</div><div class='ctx'> </div><div class='del'>-/* Single register search result on 5325 */</div><div class='add'>+/* Single register search result on 5325/5365 */</div><div class='ctx'> #define B53_ARL_SRCH_RSTL_0_MACVID_25	0x24</div><div class='del'>-/* Single register search result on 5365 */</div><div class='del'>-#define B53_ARL_SRCH_RSTL_0_MACVID_65	0x30</div><div class='add'>+#define   ARL_SRCH_RSLT_PORT_ID_S_25	48</div><div class='add'>+#define   ARL_SRCH_RSLT_PORT_ID_MASK_25	GENMASK_ULL(52, 48)</div><div class='add'>+#define   ARL_SRCH_RSLT_VID_S_25	53</div><div class='add'>+#define   ARL_SRCH_RSLT_VID_MASK_25	GENMASK_ULL(60, 53)</div><div class='add'>+</div><div class='add'>+/* BCM5325/5365 Search result extend register (8 bit) */</div><div class='add'>+#define B53_ARL_SRCH_RSLT_EXT_25	0x2c</div><div class='add'>+#define   ARL_SRCH_RSLT_EXT_MC_MII	BIT(2)</div><div class='ctx'> </div><div class='ctx'> /* ARL Search Data Result (32 bit) */</div><div class='ctx'> #define B53_ARL_SRCH_RSTL_0		0x68</div><div class='ctx'> </div><div class='add'>+/* BCM5389 ARL Search Data Result (16 bit) */</div><div class='add'>+#define B53_ARL_SRCH_RSLT_89		0x3b</div><div class='add'>+</div><div class='ctx'> #define B53_ARL_SRCH_RSTL_MACVID(x)	(B53_ARL_SRCH_RSTL_0_MACVID + ((x) * 0x10))</div><div class='ctx'> #define B53_ARL_SRCH_RSTL(x)		(B53_ARL_SRCH_RSTL_0 + ((x) * 0x10))</div><div class='ctx'> </div><div class='add'>+/* 63XX ARL Search Data Result (16 bit) */</div><div class='add'>+#define B53_ARL_SRCH_RSLT_63XX		0x3c</div><div class='add'>+#define   ARL_SRST_PORT_ID_MASK_63XX	GENMASK(9, 1)</div><div class='add'>+#define   ARL_SRST_TC_MASK_63XX		GENMASK(13, 11)</div><div class='add'>+#define   ARL_SRST_AGE_63XX		BIT(14)</div><div class='add'>+#define   ARL_SRST_STATIC_63XX		BIT(15)</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='add'>+ * IEEE 802.1X Registers</div><div class='add'>+ *************************************************************************/</div><div class='add'>+</div><div class='add'>+/* Multicast DLF Drop Control register (16 bit) */</div><div class='add'>+#define B53_IEEE_MCAST_DLF		0x94</div><div class='add'>+#define B53_IEEE_MCAST_DROP_EN		BIT(11)</div><div class='add'>+</div><div class='add'>+/* Unicast DLF Drop Control register (16 bit) */</div><div class='add'>+#define B53_IEEE_UCAST_DLF		0x96</div><div class='add'>+#define B53_IEEE_UCAST_DROP_EN		BIT(11)</div><div class='add'>+</div><div class='ctx'> /*************************************************************************</div><div class='ctx'>  * Port VLAN Registers</div><div class='ctx'>  *************************************************************************/</div><div class='hunk'>@@ -475,6 +542,17 @@</div><div class='ctx'> #define   JMS_MAX_SIZE			9724</div><div class='ctx'> </div><div class='ctx'> /*************************************************************************</div><div class='add'>+ * EAP Page Registers</div><div class='add'>+ *************************************************************************/</div><div class='add'>+#define B53_PORT_EAP_CONF(i)		(0x20 + 8 * (i))</div><div class='add'>+#define  EAP_MODE_SHIFT			51</div><div class='add'>+#define  EAP_MODE_SHIFT_63XX		50</div><div class='add'>+#define  EAP_MODE_MASK			(0x3ull &lt;&lt; EAP_MODE_SHIFT)</div><div class='add'>+#define  EAP_MODE_MASK_63XX		(0x3ull &lt;&lt; EAP_MODE_SHIFT_63XX)</div><div class='add'>+#define  EAP_MODE_BASIC			0</div><div class='add'>+#define  EAP_MODE_SIMPLIFIED		3</div><div class='add'>+</div><div class='add'>+/*************************************************************************</div><div class='ctx'>  * EEE Configuration Page Registers</div><div class='ctx'>  *************************************************************************/</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_serdes.c b/drivers/net/dsa/b53/b53_serdes.c<br/>index 629bf14128a2..7460122f6abc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_serdes.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_serdes.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_serdes.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_serdes.c</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause</div><div class='ctx'> /*</div><div class='ctx'>  * Northstar Plus switch SerDes/SGMII PHY main logic</div><div class='ctx'>  *</div><div class='hunk'>@@ -17,6 +17,11 @@</div><div class='ctx'> #include "b53_serdes.h"</div><div class='ctx'> #include "b53_regs.h"</div><div class='ctx'> </div><div class='add'>+static inline struct b53_pcs *pcs_to_b53_pcs(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct b53_pcs, pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void b53_serdes_write_blk(struct b53_device *dev, u8 offset, u16 block,</div><div class='ctx'> 				 u16 value)</div><div class='ctx'> {</div><div class='hunk'>@@ -60,51 +65,47 @@ static u16 b53_serdes_read(struct b53_device *dev, u8 lane,</div><div class='ctx'> 	return b53_serdes_read_blk(dev, offset, block);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void b53_serdes_config(struct b53_device *dev, int port, unsigned int mode,</div><div class='del'>-		       const struct phylink_link_state *state)</div><div class='add'>+static int b53_serdes_config(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+			     phy_interface_t interface,</div><div class='add'>+			     const unsigned long *advertising,</div><div class='add'>+			     bool permit_pause_to_mac)</div><div class='ctx'> {</div><div class='del'>-	u8 lane = b53_serdes_map_lane(dev, port);</div><div class='add'>+	struct b53_device *dev = pcs_to_b53_pcs(pcs)-&gt;dev;</div><div class='add'>+	u8 lane = pcs_to_b53_pcs(pcs)-&gt;lane;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	if (lane == B53_INVALID_LANE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	reg = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_CONTROL(1),</div><div class='ctx'> 			      SERDES_DIGITAL_BLK);</div><div class='del'>-	if (state-&gt;interface == PHY_INTERFACE_MODE_1000BASEX)</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_1000BASEX)</div><div class='ctx'> 		reg |= FIBER_MODE_1000X;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~FIBER_MODE_1000X;</div><div class='ctx'> 	b53_serdes_write(dev, lane, B53_SERDES_DIGITAL_CONTROL(1),</div><div class='ctx'> 			 SERDES_DIGITAL_BLK, reg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_serdes_config);</div><div class='ctx'> </div><div class='del'>-void b53_serdes_an_restart(struct b53_device *dev, int port)</div><div class='add'>+static void b53_serdes_an_restart(struct phylink_pcs *pcs)</div><div class='ctx'> {</div><div class='del'>-	u8 lane = b53_serdes_map_lane(dev, port);</div><div class='add'>+	struct b53_device *dev = pcs_to_b53_pcs(pcs)-&gt;dev;</div><div class='add'>+	u8 lane = pcs_to_b53_pcs(pcs)-&gt;lane;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	if (lane == B53_INVALID_LANE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	reg = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMCR),</div><div class='ctx'> 			      SERDES_MII_BLK);</div><div class='ctx'> 	reg |= BMCR_ANRESTART;</div><div class='ctx'> 	b53_serdes_write(dev, lane, B53_SERDES_MII_REG(MII_BMCR),</div><div class='ctx'> 			 SERDES_MII_BLK, reg);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_serdes_an_restart);</div><div class='ctx'> </div><div class='del'>-int b53_serdes_link_state(struct b53_device *dev, int port,</div><div class='del'>-			  struct phylink_link_state *state)</div><div class='add'>+static void b53_serdes_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+				 struct phylink_link_state *state)</div><div class='ctx'> {</div><div class='del'>-	u8 lane = b53_serdes_map_lane(dev, port);</div><div class='add'>+	struct b53_device *dev = pcs_to_b53_pcs(pcs)-&gt;dev;</div><div class='add'>+	u8 lane = pcs_to_b53_pcs(pcs)-&gt;lane;</div><div class='ctx'> 	u16 dig, bmsr;</div><div class='ctx'> </div><div class='del'>-	if (lane == B53_INVALID_LANE)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='ctx'> 	dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS,</div><div class='ctx'> 			      SERDES_DIGITAL_BLK);</div><div class='ctx'> 	bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR),</div><div class='hunk'>@@ -133,10 +134,7 @@ int b53_serdes_link_state(struct b53_device *dev, int port,</div><div class='ctx'> 		state-&gt;pause |= MLO_PAUSE_RX;</div><div class='ctx'> 	if (dig &amp; PAUSE_RESOLUTION_TX_SIDE)</div><div class='ctx'> 		state-&gt;pause |= MLO_PAUSE_TX;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_serdes_link_state);</div><div class='ctx'> </div><div class='ctx'> void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,</div><div class='ctx'> 			 phy_interface_t interface, bool link_up)</div><div class='hunk'>@@ -158,9 +156,14 @@ void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_serdes_link_set);</div><div class='ctx'> </div><div class='del'>-void b53_serdes_phylink_validate(struct b53_device *dev, int port,</div><div class='del'>-				 unsigned long *supported,</div><div class='del'>-				 struct phylink_link_state *state)</div><div class='add'>+static const struct phylink_pcs_ops b53_pcs_ops = {</div><div class='add'>+	.pcs_get_state = b53_serdes_get_state,</div><div class='add'>+	.pcs_config = b53_serdes_config,</div><div class='add'>+	.pcs_an_restart = b53_serdes_an_restart,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,</div><div class='add'>+				 struct phylink_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	u8 lane = b53_serdes_map_lane(dev, port);</div><div class='ctx'> </div><div class='hunk'>@@ -169,20 +172,47 @@ void b53_serdes_phylink_validate(struct b53_device *dev, int port,</div><div class='ctx'> </div><div class='ctx'> 	switch (lane) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		phylink_set(supported, 2500baseX_Full);</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		/* It appears lane 0 supports 2500base-X and 1000base-X */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_2500BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 1:</div><div class='del'>-		phylink_set(supported, 1000baseX_Full);</div><div class='add'>+		/* It appears lane 1 only supports 1000base-X and SGMII */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_1000FD;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL(b53_serdes_phylink_validate);</div><div class='add'>+EXPORT_SYMBOL(b53_serdes_phylink_get_caps);</div><div class='add'>+</div><div class='add'>+struct phylink_pcs *b53_serdes_phylink_mac_select_pcs(struct b53_device *dev,</div><div class='add'>+						      int port,</div><div class='add'>+						      phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	u8 lane = b53_serdes_map_lane(dev, port);</div><div class='add'>+</div><div class='add'>+	if (lane == B53_INVALID_LANE || lane &gt;= B53_N_PCS ||</div><div class='add'>+	    !dev-&gt;pcs[lane].dev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!phy_interface_mode_is_8023z(interface) &amp;&amp;</div><div class='add'>+	    interface != PHY_INTERFACE_MODE_SGMII)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return &amp;dev-&gt;pcs[lane].pcs;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(b53_serdes_phylink_mac_select_pcs);</div><div class='ctx'> </div><div class='ctx'> int b53_serdes_init(struct b53_device *dev, int port)</div><div class='ctx'> {</div><div class='ctx'> 	u8 lane = b53_serdes_map_lane(dev, port);</div><div class='add'>+	struct b53_pcs *pcs;</div><div class='ctx'> 	u16 id0, msb, lsb;</div><div class='ctx'> </div><div class='ctx'> 	if (lane == B53_INVALID_LANE)</div><div class='hunk'>@@ -205,6 +235,11 @@ int b53_serdes_init(struct b53_device *dev, int port)</div><div class='ctx'> 		 (id0 &gt;&gt; SERDES_ID0_REV_NUM_SHIFT) &amp; SERDES_ID0_REV_NUM_MASK,</div><div class='ctx'> 		 (u32)msb &lt;&lt; 16 | lsb);</div><div class='ctx'> </div><div class='add'>+	pcs = &amp;dev-&gt;pcs[lane];</div><div class='add'>+	pcs-&gt;dev = dev;</div><div class='add'>+	pcs-&gt;lane = lane;</div><div class='add'>+	pcs-&gt;pcs.ops = &amp;b53_pcs_ops;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(b53_serdes_init);</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_serdes.h b/drivers/net/dsa/b53/b53_serdes.h<br/>index 3bb4f91aec9e..3d367c4df4d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_serdes.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_serdes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_serdes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_serdes.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause</div><div class='del'>- *</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */</div><div class='add'>+/*</div><div class='ctx'>  * Northstar Plus switch SerDes/SGMII PHY definitions</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2018 Florian Fainelli &lt;f.fainelli@gmail.com&gt;</div><div class='hunk'>@@ -107,17 +107,13 @@ static inline u8 b53_serdes_map_lane(struct b53_device *dev, int port)</div><div class='ctx'> 	return dev-&gt;ops-&gt;serdes_map_lane(dev, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int b53_serdes_get_link(struct b53_device *dev, int port);</div><div class='del'>-int b53_serdes_link_state(struct b53_device *dev, int port,</div><div class='del'>-			  struct phylink_link_state *state);</div><div class='del'>-void b53_serdes_config(struct b53_device *dev, int port, unsigned int mode,</div><div class='del'>-		       const struct phylink_link_state *state);</div><div class='del'>-void b53_serdes_an_restart(struct b53_device *dev, int port);</div><div class='ctx'> void b53_serdes_link_set(struct b53_device *dev, int port, unsigned int mode,</div><div class='ctx'> 			 phy_interface_t interface, bool link_up);</div><div class='del'>-void b53_serdes_phylink_validate(struct b53_device *dev, int port,</div><div class='del'>-				unsigned long *supported,</div><div class='del'>-				struct phylink_link_state *state);</div><div class='add'>+struct phylink_pcs *b53_serdes_phylink_mac_select_pcs(struct b53_device *dev,</div><div class='add'>+						      int port,</div><div class='add'>+						      phy_interface_t interface);</div><div class='add'>+void b53_serdes_phylink_get_caps(struct b53_device *dev, int port,</div><div class='add'>+				 struct phylink_config *config);</div><div class='ctx'> #if IS_ENABLED(CONFIG_B53_SERDES)</div><div class='ctx'> int b53_serdes_init(struct b53_device *dev, int port);</div><div class='ctx'> #else</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_spi.c b/drivers/net/dsa/b53/b53_spi.c<br/>index f89f5308a99b..467da057579e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_spi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_spi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_spi.c</a></div><div class='hunk'>@@ -16,7 +16,7 @@</div><div class='ctx'>  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -145,42 +145,52 @@ static int b53_spi_read8(struct b53_device *dev, u8 page, u8 reg, u8 *val)</div><div class='ctx'> </div><div class='ctx'> static int b53_spi_read16(struct b53_device *dev, u8 page, u8 reg, u16 *val)</div><div class='ctx'> {</div><div class='del'>-	int ret = b53_spi_read(dev, page, reg, (u8 *)val, 2);</div><div class='add'>+	__le16 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = b53_spi_read(dev, page, reg, (u8 *)&amp;value, 2);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		*val = le16_to_cpu(*val);</div><div class='add'>+		*val = le16_to_cpu(value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b53_spi_read32(struct b53_device *dev, u8 page, u8 reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	int ret = b53_spi_read(dev, page, reg, (u8 *)val, 4);</div><div class='add'>+	__le32 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = b53_spi_read(dev, page, reg, (u8 *)&amp;value, 4);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		*val = le32_to_cpu(*val);</div><div class='add'>+		*val = le32_to_cpu(value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b53_spi_read48(struct b53_device *dev, u8 page, u8 reg, u64 *val)</div><div class='ctx'> {</div><div class='add'>+	__le64 value;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	*val = 0;</div><div class='del'>-	ret = b53_spi_read(dev, page, reg, (u8 *)val, 6);</div><div class='add'>+	ret = b53_spi_read(dev, page, reg, (u8 *)&amp;value, 6);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		*val = le64_to_cpu(*val);</div><div class='add'>+		*val = le64_to_cpu(value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b53_spi_read64(struct b53_device *dev, u8 page, u8 reg, u64 *val)</div><div class='ctx'> {</div><div class='del'>-	int ret = b53_spi_read(dev, page, reg, (u8 *)val, 8);</div><div class='add'>+	__le64 value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = b53_spi_read(dev, page, reg, (u8 *)&amp;value, 8);</div><div class='ctx'> </div><div class='ctx'> 	if (!ret)</div><div class='del'>-		*val = le64_to_cpu(*val);</div><div class='add'>+		*val = le64_to_cpu(value);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -304,22 +314,59 @@ static int b53_spi_probe(struct spi_device *spi)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b53_spi_remove(struct spi_device *spi)</div><div class='add'>+static void b53_spi_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='ctx'> 	if (dev)</div><div class='ctx'> 		b53_switch_remove(dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void b53_spi_shutdown(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		b53_switch_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id b53_spi_of_match[] = {</div><div class='add'>+	{ .compatible = "brcm,bcm5325" },</div><div class='add'>+	{ .compatible = "brcm,bcm5365" },</div><div class='add'>+	{ .compatible = "brcm,bcm5395" },</div><div class='add'>+	{ .compatible = "brcm,bcm5397" },</div><div class='add'>+	{ .compatible = "brcm,bcm5398" },</div><div class='add'>+	{ .compatible = "brcm,bcm53115" },</div><div class='add'>+	{ .compatible = "brcm,bcm53125" },</div><div class='add'>+	{ .compatible = "brcm,bcm53128" },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, b53_spi_of_match);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id b53_spi_ids[] = {</div><div class='add'>+	{ .name = "bcm5325" },</div><div class='add'>+	{ .name = "bcm5365" },</div><div class='add'>+	{ .name = "bcm5395" },</div><div class='add'>+	{ .name = "bcm5397" },</div><div class='add'>+	{ .name = "bcm5398" },</div><div class='add'>+	{ .name = "bcm53115" },</div><div class='add'>+	{ .name = "bcm53125" },</div><div class='add'>+	{ .name = "bcm53128" },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, b53_spi_ids);</div><div class='add'>+</div><div class='ctx'> static struct spi_driver b53_spi_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name	= "b53-switch",</div><div class='add'>+		.of_match_table = b53_spi_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= b53_spi_probe,</div><div class='ctx'> 	.remove	= b53_spi_remove,</div><div class='add'>+	.shutdown = b53_spi_shutdown,</div><div class='add'>+	.id_table = b53_spi_ids,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_spi_driver(b53_spi_driver);</div><div class='head'>diff --git a/drivers/net/dsa/b53/b53_srab.c b/drivers/net/dsa/b53/b53_srab.c<br/>index d9c56a779c08..b9939bbd2cd5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_srab.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/b53/b53_srab.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/b53/b53_srab.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/b53/b53_srab.c</a></div><div class='hunk'>@@ -443,6 +443,39 @@ static void b53_srab_irq_disable(struct b53_device *dev, int port)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void b53_srab_phylink_get_caps(struct b53_device *dev, int port,</div><div class='add'>+				      struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct b53_srab_priv *priv = dev-&gt;priv;</div><div class='add'>+	struct b53_srab_port_priv *p = &amp;priv-&gt;port_intrs[port];</div><div class='add'>+</div><div class='add'>+	switch (p-&gt;mode) {</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+#if IS_ENABLED(CONFIG_B53_SERDES)</div><div class='add'>+		/* If p-&gt;mode indicates SGMII mode, that essentially means we</div><div class='add'>+		 * are using a serdes. As the serdes for the capabilities.</div><div class='add'>+		 */</div><div class='add'>+		b53_serdes_phylink_get_caps(dev, port, config);</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PHY_INTERFACE_MODE_NA:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+		/* If we support RGMII, support all RGMII modes, since</div><div class='add'>+		 * that dictates the PHY delay settings.</div><div class='add'>+		 */</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		/* Some other mode (e.g. MII, GMII etc) */</div><div class='add'>+		__set_bit(p-&gt;mode, config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct b53_io_ops b53_srab_ops = {</div><div class='ctx'> 	.read8 = b53_srab_read8,</div><div class='ctx'> 	.read16 = b53_srab_read16,</div><div class='hunk'>@@ -456,13 +489,11 @@ static const struct b53_io_ops b53_srab_ops = {</div><div class='ctx'> 	.write64 = b53_srab_write64,</div><div class='ctx'> 	.irq_enable = b53_srab_irq_enable,</div><div class='ctx'> 	.irq_disable = b53_srab_irq_disable,</div><div class='add'>+	.phylink_get_caps = b53_srab_phylink_get_caps,</div><div class='ctx'> #if IS_ENABLED(CONFIG_B53_SERDES)</div><div class='add'>+	.phylink_mac_select_pcs = b53_serdes_phylink_mac_select_pcs,</div><div class='ctx'> 	.serdes_map_lane = b53_srab_serdes_map_lane,</div><div class='del'>-	.serdes_link_state = b53_serdes_link_state,</div><div class='del'>-	.serdes_config = b53_serdes_config,</div><div class='del'>-	.serdes_an_restart = b53_serdes_an_restart,</div><div class='ctx'> 	.serdes_link_set = b53_serdes_link_set,</div><div class='del'>-	.serdes_phylink_validate = b53_serdes_phylink_validate,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +555,7 @@ static void b53_srab_prepare_irq(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		port-&gt;num = i;</div><div class='ctx'> 		port-&gt;dev = dev;</div><div class='del'>-		port-&gt;irq = platform_get_irq_byname(pdev, name);</div><div class='add'>+		port-&gt;irq = platform_get_irq_byname_optional(pdev, name);</div><div class='ctx'> 		kfree(name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -536,7 +567,6 @@ static void b53_srab_mux_init(struct platform_device *pdev)</div><div class='ctx'> 	struct b53_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct b53_srab_priv *priv = dev-&gt;priv;</div><div class='ctx'> 	struct b53_srab_port_priv *p;</div><div class='del'>-	struct resource *r;</div><div class='ctx'> 	unsigned int port;</div><div class='ctx'> 	u32 reg, off = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -544,8 +574,7 @@ static void b53_srab_mux_init(struct platform_device *pdev)</div><div class='ctx'> 	if (dev-&gt;pdata &amp;&amp; dev-&gt;pdata-&gt;chip_id != BCM58XX_DEVICE_ID)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	r = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	priv-&gt;mux_config = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='add'>+	priv-&gt;mux_config = devm_platform_ioremap_resource(pdev, 1);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;mux_config))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -593,7 +622,6 @@ static int b53_srab_probe(struct platform_device *pdev)</div><div class='ctx'> 	const struct of_device_id *of_id = NULL;</div><div class='ctx'> 	struct b53_srab_priv *priv;</div><div class='ctx'> 	struct b53_device *dev;</div><div class='del'>-	struct resource *r;</div><div class='ctx'> </div><div class='ctx'> 	if (dn)</div><div class='ctx'> 		of_id = of_match_node(b53_srab_of_match, dn);</div><div class='hunk'>@@ -610,10 +638,9 @@ static int b53_srab_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	priv-&gt;regs = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='add'>+	priv-&gt;regs = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;regs))</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return PTR_ERR(priv-&gt;regs);</div><div class='ctx'> </div><div class='ctx'> 	dev = b53_switch_alloc(&amp;pdev-&gt;dev, &amp;b53_srab_ops, priv);</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -630,21 +657,33 @@ static int b53_srab_probe(struct platform_device *pdev)</div><div class='ctx'> 	return b53_switch_register(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b53_srab_remove(struct platform_device *pdev)</div><div class='add'>+static void b53_srab_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b53_device *dev = platform_get_drvdata(pdev);</div><div class='del'>-	struct b53_srab_priv *priv = dev-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	b53_srab_intr_set(priv, false);</div><div class='del'>-	if (dev)</div><div class='del'>-		b53_switch_remove(dev);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	b53_srab_intr_set(dev-&gt;priv, false);</div><div class='add'>+	b53_switch_remove(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void b53_srab_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct b53_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	b53_switch_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver b53_srab_driver = {</div><div class='ctx'> 	.probe = b53_srab_probe,</div><div class='ctx'> 	.remove = b53_srab_remove,</div><div class='add'>+	.shutdown = b53_srab_shutdown,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "b53-srab-switch",</div><div class='ctx'> 		.of_match_table = b53_srab_of_match,</div><div class='head'>diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c<br/>index 3811fdbda13e..960685596093 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/bcm_sf2.c</a></div><div class='hunk'>@@ -14,6 +14,7 @@</div><div class='ctx'> #include &lt;linux/phy_fixed.h&gt;</div><div class='ctx'> #include &lt;linux/phylink.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='hunk'>@@ -31,28 +32,140 @@</div><div class='ctx'> #include "b53/b53_priv.h"</div><div class='ctx'> #include "b53/b53_regs.h"</div><div class='ctx'> </div><div class='del'>-static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)</div><div class='add'>+static u16 bcm_sf2_reg_rgmii_cntrl(struct bcm_sf2_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	switch (priv-&gt;type) {</div><div class='add'>+	case BCM4908_DEVICE_ID:</div><div class='add'>+		switch (port) {</div><div class='add'>+		case 7:</div><div class='add'>+			return REG_RGMII_11_CNTRL;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		switch (port) {</div><div class='add'>+		case 0:</div><div class='add'>+			return REG_RGMII_0_CNTRL;</div><div class='add'>+		case 1:</div><div class='add'>+			return REG_RGMII_1_CNTRL;</div><div class='add'>+		case 2:</div><div class='add'>+			return REG_RGMII_2_CNTRL;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(1, "Unsupported port %d\n", port);</div><div class='add'>+</div><div class='add'>+	/* RO fallback reg */</div><div class='add'>+	return REG_SWITCH_STATUS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bcm_sf2_reg_led_base(struct bcm_sf2_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+		return REG_LED_0_CNTRL;</div><div class='add'>+	case 1:</div><div class='add'>+		return REG_LED_1_CNTRL;</div><div class='add'>+	case 2:</div><div class='add'>+		return REG_LED_2_CNTRL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;type) {</div><div class='add'>+	case BCM4908_DEVICE_ID:</div><div class='add'>+		switch (port) {</div><div class='add'>+		case 3:</div><div class='add'>+			return REG_LED_3_CNTRL;</div><div class='add'>+		case 7:</div><div class='add'>+			return REG_LED_4_CNTRL;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(1, "Unsupported port %d\n", port);</div><div class='add'>+</div><div class='add'>+	/* RO fallback reg */</div><div class='add'>+	return REG_SWITCH_STATUS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bcm_sf2_port_override_offset(struct bcm_sf2_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	switch (priv-&gt;type) {</div><div class='add'>+	case BCM4908_DEVICE_ID:</div><div class='add'>+	case BCM7445_DEVICE_ID:</div><div class='add'>+		return port == 8 ? CORE_STS_OVERRIDE_IMP :</div><div class='add'>+				   CORE_STS_OVERRIDE_GMIIP_PORT(port);</div><div class='add'>+	case BCM7278_DEVICE_ID:</div><div class='add'>+		return port == 8 ? CORE_STS_OVERRIDE_IMP2 :</div><div class='add'>+				   CORE_STS_OVERRIDE_GMIIP2_PORT(port);</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(1, "Unsupported device: %d\n", priv-&gt;type);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RO fallback register */</div><div class='add'>+	return REG_SWITCH_STATUS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Return the number of active ports, not counting the IMP (CPU) port */</div><div class='add'>+static unsigned int bcm_sf2_num_active_ports(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='del'>-	unsigned int i;</div><div class='del'>-	u32 reg, offset;</div><div class='add'>+	unsigned int port, count = 0;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_cpu_port(ds, port))</div><div class='add'>+			continue;</div><div class='add'>+		if (priv-&gt;port_sts[port].enabled)</div><div class='add'>+			count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm_sf2_recalc_clock(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='add'>+	unsigned long new_rate;</div><div class='add'>+	unsigned int ports_active;</div><div class='add'>+	/* Frequenty in Mhz */</div><div class='add'>+	static const unsigned long rate_table[] = {</div><div class='add'>+		59220000,</div><div class='add'>+		60820000,</div><div class='add'>+		62500000,</div><div class='add'>+		62500000,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	ports_active = bcm_sf2_num_active_ports(ds);</div><div class='add'>+	if (ports_active == 0 || !priv-&gt;clk_mdiv)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;type == BCM7445_DEVICE_ID)</div><div class='del'>-		offset = CORE_STS_OVERRIDE_IMP;</div><div class='add'>+	/* If we overflow our table, just use the recommended operational</div><div class='add'>+	 * frequency</div><div class='add'>+	 */</div><div class='add'>+	if (ports_active &gt; ARRAY_SIZE(rate_table))</div><div class='add'>+		new_rate = 90000000;</div><div class='ctx'> 	else</div><div class='del'>-		offset = CORE_STS_OVERRIDE_IMP2;</div><div class='add'>+		new_rate = rate_table[ports_active - 1];</div><div class='add'>+	clk_set_rate(priv-&gt;clk_mdiv, new_rate);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable the port memories */</div><div class='ctx'> 	reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);</div><div class='ctx'> 	reg &amp;= ~P_TXQ_PSM_VDD(port);</div><div class='ctx'> 	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);</div><div class='ctx'> </div><div class='del'>-	/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */</div><div class='del'>-	reg = core_readl(priv, CORE_IMP_CTL);</div><div class='del'>-	reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);</div><div class='del'>-	reg &amp;= ~(RX_DIS | TX_DIS);</div><div class='del'>-	core_writel(priv, reg, CORE_IMP_CTL);</div><div class='del'>-</div><div class='ctx'> 	/* Enable forwarding */</div><div class='ctx'> 	core_writel(priv, SW_FWDG_EN, CORE_SWMODE);</div><div class='ctx'> </div><div class='hunk'>@@ -71,10 +184,19 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)</div><div class='ctx'> </div><div class='ctx'> 	b53_brcm_hdr_setup(ds, port);</div><div class='ctx'> </div><div class='del'>-	/* Force link status for IMP port */</div><div class='del'>-	reg = core_readl(priv, offset);</div><div class='del'>-	reg |= (MII_SW_OR | LINK_STS);</div><div class='del'>-	core_writel(priv, reg, offset);</div><div class='add'>+	if (port == 8) {</div><div class='add'>+		/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */</div><div class='add'>+		reg = core_readl(priv, CORE_IMP_CTL);</div><div class='add'>+		reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);</div><div class='add'>+		reg &amp;= ~(RX_DIS | TX_DIS);</div><div class='add'>+		core_writel(priv, reg, CORE_IMP_CTL);</div><div class='add'>+	} else {</div><div class='add'>+		reg = core_readl(priv, CORE_G_PCTL_PORT(port));</div><div class='add'>+		reg &amp;= ~(RX_DIS | TX_DIS);</div><div class='add'>+		core_writel(priv, reg, CORE_G_PCTL_PORT(port));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;port_sts[port].enabled = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)</div><div class='hunk'>@@ -100,9 +222,14 @@ static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)</div><div class='ctx'> </div><div class='ctx'> 	/* Use PHY-driven LED signaling */</div><div class='ctx'> 	if (!enable) {</div><div class='del'>-		reg = reg_readl(priv, REG_LED_CNTRL(0));</div><div class='del'>-		reg |= SPDLNK_SRC_SEL;</div><div class='del'>-		reg_writel(priv, reg, REG_LED_CNTRL(0));</div><div class='add'>+		u16 led_ctrl = bcm_sf2_reg_led_base(priv, 0);</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;type == BCM7278_DEVICE_ID ||</div><div class='add'>+		    priv-&gt;type == BCM7445_DEVICE_ID) {</div><div class='add'>+			reg = reg_led_readl(priv, led_ctrl, 0);</div><div class='add'>+			reg |= LED_CNTRL_SPDLNK_SRC_SEL;</div><div class='add'>+			reg_led_writel(priv, reg, led_ctrl, 0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -157,16 +284,18 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='add'>+	if (!dsa_is_user_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	priv-&gt;port_sts[port].enabled = true;</div><div class='add'>+</div><div class='add'>+	bcm_sf2_recalc_clock(ds);</div><div class='add'>+</div><div class='ctx'> 	/* Clear the memory power down */</div><div class='ctx'> 	reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);</div><div class='ctx'> 	reg &amp;= ~P_TXQ_PSM_VDD(port);</div><div class='ctx'> 	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);</div><div class='ctx'> </div><div class='del'>-	/* Enable learning */</div><div class='del'>-	reg = core_readl(priv, CORE_DIS_LEARN);</div><div class='del'>-	reg &amp;= ~BIT(port);</div><div class='del'>-	core_writel(priv, reg, CORE_DIS_LEARN);</div><div class='del'>-</div><div class='ctx'> 	/* Enable Broadcom tags for that port if requested */</div><div class='ctx'> 	if (priv-&gt;brcm_tag_mask &amp; BIT(port))</div><div class='ctx'> 		b53_brcm_hdr_setup(ds, port);</div><div class='hunk'>@@ -242,6 +371,10 @@ static void bcm_sf2_port_disable(struct dsa_switch *ds, int port)</div><div class='ctx'> 	reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);</div><div class='ctx'> 	reg |= P_TXQ_PSM_VDD(port);</div><div class='ctx'> 	core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);</div><div class='add'>+</div><div class='add'>+	priv-&gt;port_sts[port].enabled = false;</div><div class='add'>+</div><div class='add'>+	bcm_sf2_recalc_clock(ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -341,6 +474,18 @@ static int bcm_sf2_sw_rst(struct bcm_sf2_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int timeout = 1000;</div><div class='ctx'> 	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* The watchdog reset does not work on 7278, we need to hit the</div><div class='add'>+	 * "external" reset line through the reset controller.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;type == BCM7278_DEVICE_ID) {</div><div class='add'>+		ret = reset_control_assert(priv-&gt;rcdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return reset_control_deassert(priv-&gt;rcdev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	reg = core_readl(priv, CORE_WATCHDOG_CTRL);</div><div class='ctx'> 	reg |= SOFTWARE_RESET | EN_CHIP_RST | EN_SW_RESET;</div><div class='hunk'>@@ -360,6 +505,44 @@ static int bcm_sf2_sw_rst(struct bcm_sf2_priv *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bcm_sf2_crossbar_setup(struct bcm_sf2_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev-&gt;ds-&gt;dev;</div><div class='add'>+	int shift;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mask = BIT(priv-&gt;num_crossbar_ext_bits) - 1;</div><div class='add'>+</div><div class='add'>+	reg = reg_readl(priv, REG_CROSSBAR);</div><div class='add'>+	switch (priv-&gt;type) {</div><div class='add'>+	case BCM4908_DEVICE_ID:</div><div class='add'>+		shift = CROSSBAR_BCM4908_INT_P7 * priv-&gt;num_crossbar_ext_bits;</div><div class='add'>+		reg &amp;= ~(mask &lt;&lt; shift);</div><div class='add'>+		if (0) /* FIXME */</div><div class='add'>+			reg |= CROSSBAR_BCM4908_EXT_SERDES &lt;&lt; shift;</div><div class='add'>+		else if (priv-&gt;int_phy_mask &amp; BIT(7))</div><div class='add'>+			reg |= CROSSBAR_BCM4908_EXT_GPHY4 &lt;&lt; shift;</div><div class='add'>+		else if (phy_interface_mode_is_rgmii(priv-&gt;port_sts[7].mode))</div><div class='add'>+			reg |= CROSSBAR_BCM4908_EXT_RGMII &lt;&lt; shift;</div><div class='add'>+		else if (WARN(1, "Invalid port mode\n"))</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	reg_writel(priv, reg, REG_CROSSBAR);</div><div class='add'>+</div><div class='add'>+	reg = reg_readl(priv, REG_CROSSBAR);</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_crossbar_int_ports; i++) {</div><div class='add'>+		shift = i * priv-&gt;num_crossbar_ext_bits;</div><div class='add'>+</div><div class='add'>+		dev_dbg(dev, "crossbar int port #%d - ext port #%d\n", i,</div><div class='add'>+			(reg &gt;&gt; shift) &amp; mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	intrl2_0_mask_set(priv, 0xffffffff);</div><div class='hunk'>@@ -371,9 +554,12 @@ static void bcm_sf2_intr_disable(struct bcm_sf2_priv *priv)</div><div class='ctx'> static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,</div><div class='ctx'> 				   struct device_node *dn)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = priv-&gt;dev-&gt;ds-&gt;dev;</div><div class='add'>+	struct bcm_sf2_port_status *port_st;</div><div class='ctx'> 	struct device_node *port;</div><div class='del'>-	int mode;</div><div class='ctx'> 	unsigned int port_num;</div><div class='add'>+	struct property *prop;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;moca_port = -1;</div><div class='ctx'> </div><div class='hunk'>@@ -381,53 +567,72 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,</div><div class='ctx'> 		if (of_property_read_u32(port, "reg", &amp;port_num))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='add'>+		if (port_num &gt;= DSA_MAX_PORTS) {</div><div class='add'>+			dev_err(dev, "Invalid port number %d\n", port_num);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port_st = &amp;priv-&gt;port_sts[port_num];</div><div class='add'>+</div><div class='ctx'> 		/* Internal PHYs get assigned a specific 'phy-mode' property</div><div class='ctx'> 		 * value: "internal" to help flag them before MDIO probing</div><div class='ctx'> 		 * has completed, since they might be turned off at that</div><div class='ctx'> 		 * time</div><div class='ctx'> 		 */</div><div class='del'>-		mode = of_get_phy_mode(port);</div><div class='del'>-		if (mode &lt; 0)</div><div class='add'>+		err = of_get_phy_mode(port, &amp;port_st-&gt;mode);</div><div class='add'>+		if (err)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (mode == PHY_INTERFACE_MODE_INTERNAL)</div><div class='add'>+		if (port_st-&gt;mode == PHY_INTERFACE_MODE_INTERNAL)</div><div class='ctx'> 			priv-&gt;int_phy_mask |= 1 &lt;&lt; port_num;</div><div class='ctx'> </div><div class='del'>-		if (mode == PHY_INTERFACE_MODE_MOCA)</div><div class='add'>+		if (port_st-&gt;mode == PHY_INTERFACE_MODE_MOCA)</div><div class='ctx'> 			priv-&gt;moca_port = port_num;</div><div class='ctx'> </div><div class='ctx'> 		if (of_property_read_bool(port, "brcm,use-bcm-hdr"))</div><div class='ctx'> 			priv-&gt;brcm_tag_mask |= 1 &lt;&lt; port_num;</div><div class='add'>+</div><div class='add'>+		/* Ensure that port 5 is not picked up as a DSA CPU port</div><div class='add'>+		 * flavour but a regular port instead. We should be using</div><div class='add'>+		 * devlink to be able to set the port flavour.</div><div class='add'>+		 */</div><div class='add'>+		if (port_num == 5 &amp;&amp; priv-&gt;type == BCM7278_DEVICE_ID) {</div><div class='add'>+			prop = of_find_property(port, "ethernet", NULL);</div><div class='add'>+			if (prop)</div><div class='add'>+				of_remove_property(port, prop);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_sf2_mdio_register(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='del'>-	struct device_node *dn;</div><div class='add'>+	struct device_node *dn, *child;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	struct property *prop;</div><div class='ctx'> 	static int index;</div><div class='del'>-	int err;</div><div class='add'>+	int err, reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Find our integrated MDIO bus node */</div><div class='ctx'> 	dn = of_find_compatible_node(NULL, NULL, "brcm,unimac-mdio");</div><div class='ctx'> 	priv-&gt;master_mii_bus = of_mdio_find_bus(dn);</div><div class='del'>-	if (!priv-&gt;master_mii_bus)</div><div class='del'>-		return -EPROBE_DEFER;</div><div class='del'>-</div><div class='del'>-	get_device(&amp;priv-&gt;master_mii_bus-&gt;dev);</div><div class='del'>-	priv-&gt;master_mii_dn = dn;</div><div class='add'>+	if (!priv-&gt;master_mii_bus) {</div><div class='add'>+		err = -EPROBE_DEFER;</div><div class='add'>+		goto err_of_node_put;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;slave_mii_bus = devm_mdiobus_alloc(ds-&gt;dev);</div><div class='del'>-	if (!priv-&gt;slave_mii_bus)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	priv-&gt;user_mii_bus = mdiobus_alloc();</div><div class='add'>+	if (!priv-&gt;user_mii_bus) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_put_master_mii_bus_dev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;priv = priv;</div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;name = "sf2 slave mii";</div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;read = bcm_sf2_sw_mdio_read;</div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;write = bcm_sf2_sw_mdio_write;</div><div class='del'>-	snprintf(priv-&gt;slave_mii_bus-&gt;id, MII_BUS_ID_SIZE, "sf2-%d",</div><div class='add'>+	priv-&gt;user_mii_bus-&gt;priv = priv;</div><div class='add'>+	priv-&gt;user_mii_bus-&gt;name = "sf2 user mii";</div><div class='add'>+	priv-&gt;user_mii_bus-&gt;read = bcm_sf2_sw_mdio_read;</div><div class='add'>+	priv-&gt;user_mii_bus-&gt;write = bcm_sf2_sw_mdio_write;</div><div class='add'>+	snprintf(priv-&gt;user_mii_bus-&gt;id, MII_BUS_ID_SIZE, "sf2-%d",</div><div class='ctx'> 		 index++);</div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;dev.of_node = dn;</div><div class='ctx'> </div><div class='ctx'> 	/* Include the pseudo-PHY address to divert reads towards our</div><div class='ctx'> 	 * workaround. This is only required for 7445D0, since 7445E0</div><div class='hunk'>@@ -440,26 +645,64 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)</div><div class='ctx'> 	 * driver.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (of_machine_is_compatible("brcm,bcm7445d0"))</div><div class='del'>-		priv-&gt;indir_phy_mask |= (1 &lt;&lt; BRCM_PSEUDO_PHY_ADDR);</div><div class='add'>+		priv-&gt;indir_phy_mask |= (1 &lt;&lt; BRCM_PSEUDO_PHY_ADDR) | (1 &lt;&lt; 0);</div><div class='ctx'> 	else</div><div class='ctx'> 		priv-&gt;indir_phy_mask = 0;</div><div class='ctx'> </div><div class='ctx'> 	ds-&gt;phys_mii_mask = priv-&gt;indir_phy_mask;</div><div class='del'>-	ds-&gt;slave_mii_bus = priv-&gt;slave_mii_bus;</div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;parent = ds-&gt;dev-&gt;parent;</div><div class='del'>-	priv-&gt;slave_mii_bus-&gt;phy_mask = ~priv-&gt;indir_phy_mask;</div><div class='add'>+	ds-&gt;user_mii_bus = priv-&gt;user_mii_bus;</div><div class='add'>+	priv-&gt;user_mii_bus-&gt;parent = ds-&gt;dev-&gt;parent;</div><div class='add'>+	priv-&gt;user_mii_bus-&gt;phy_mask = ~priv-&gt;indir_phy_mask;</div><div class='add'>+</div><div class='add'>+	/* We need to make sure that of_phy_connect() will not work by</div><div class='add'>+	 * removing the 'phandle' and 'linux,phandle' properties and</div><div class='add'>+	 * unregister the existing PHY device that was already registered.</div><div class='add'>+	 */</div><div class='add'>+	for_each_available_child_of_node(dn, child) {</div><div class='add'>+		if (of_property_read_u32(child, "reg", &amp;reg) ||</div><div class='add'>+		    reg &gt;= PHY_MAX_ADDR)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(priv-&gt;indir_phy_mask &amp; BIT(reg)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(child, "phandle", NULL);</div><div class='add'>+		if (prop)</div><div class='add'>+			of_remove_property(child, prop);</div><div class='add'>+</div><div class='add'>+		prop = of_find_property(child, "linux,phandle", NULL);</div><div class='add'>+		if (prop)</div><div class='add'>+			of_remove_property(child, prop);</div><div class='add'>+</div><div class='add'>+		phydev = of_phy_find_device(child);</div><div class='add'>+		if (phydev) {</div><div class='add'>+			phy_device_remove(phydev);</div><div class='add'>+			phy_device_free(phydev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mdiobus_register(priv-&gt;user_mii_bus);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_user_mii_bus;</div><div class='ctx'> </div><div class='del'>-	err = of_mdiobus_register(priv-&gt;slave_mii_bus, dn);</div><div class='del'>-	if (err &amp;&amp; dn)</div><div class='del'>-		of_node_put(dn);</div><div class='add'>+	of_node_put(dn);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='add'>+err_free_user_mii_bus:</div><div class='add'>+	mdiobus_free(priv-&gt;user_mii_bus);</div><div class='add'>+err_put_master_mii_bus_dev:</div><div class='add'>+	put_device(&amp;priv-&gt;master_mii_bus-&gt;dev);</div><div class='add'>+err_of_node_put:</div><div class='add'>+	of_node_put(dn);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_mdio_unregister(struct bcm_sf2_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	mdiobus_unregister(priv-&gt;slave_mii_bus);</div><div class='del'>-	of_node_put(priv-&gt;master_mii_dn);</div><div class='add'>+	mdiobus_unregister(priv-&gt;user_mii_bus);</div><div class='add'>+	mdiobus_free(priv-&gt;user_mii_bus);</div><div class='add'>+	put_device(&amp;priv-&gt;master_mii_bus-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bcm_sf2_sw_get_phy_flags(struct dsa_switch *ds, int port)</div><div class='hunk'>@@ -470,71 +713,54 @@ static u32 bcm_sf2_sw_get_phy_flags(struct dsa_switch *ds, int port)</div><div class='ctx'> 	 * in bits 15:8 and the patch level in bits 7:0 which is exactly what</div><div class='ctx'> 	 * the REG_PHY_REVISION register layout is.</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='del'>-	return priv-&gt;hw_params.gphy_rev;</div><div class='add'>+	if (priv-&gt;int_phy_mask &amp; BIT(port))</div><div class='add'>+		return priv-&gt;hw_params.gphy_rev;</div><div class='add'>+	else</div><div class='add'>+		return PHY_BRCM_AUTO_PWRDWN_ENABLE |</div><div class='add'>+		       PHY_BRCM_DIS_TXCRXC_NOENRGY |</div><div class='add'>+		       PHY_BRCM_IDDQ_SUSPEND;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_sf2_sw_validate(struct dsa_switch *ds, int port,</div><div class='del'>-				unsigned long *supported,</div><div class='del'>-				struct phylink_link_state *state)</div><div class='add'>+static void bcm_sf2_sw_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='del'>-</div><div class='del'>-	if (!phy_interface_mode_is_rgmii(state-&gt;interface) &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_MII &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_REVMII &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_GMII &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_INTERNAL &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_MOCA) {</div><div class='del'>-		bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-		dev_err(ds-&gt;dev,</div><div class='del'>-			"Unsupported interface: %d\n", state-&gt;interface);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allow all the expected bits */</div><div class='del'>-	phylink_set(mask, Autoneg);</div><div class='del'>-	phylink_set_port_modes(mask);</div><div class='del'>-	phylink_set(mask, Pause);</div><div class='del'>-	phylink_set(mask, Asym_Pause);</div><div class='add'>+	unsigned long *interfaces = config-&gt;supported_interfaces;</div><div class='add'>+	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='ctx'> </div><div class='del'>-	/* With the exclusion of MII and Reverse MII, we support Gigabit,</div><div class='del'>-	 * including Half duplex</div><div class='del'>-	 */</div><div class='del'>-	if (state-&gt;interface != PHY_INTERFACE_MODE_MII &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_REVMII) {</div><div class='del'>-		phylink_set(mask, 1000baseT_Full);</div><div class='del'>-		phylink_set(mask, 1000baseT_Half);</div><div class='add'>+	if (priv-&gt;int_phy_mask &amp; BIT(port)) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL, interfaces);</div><div class='add'>+	} else if (priv-&gt;moca_port == port) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MOCA, interfaces);</div><div class='add'>+	} else {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVMII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, interfaces);</div><div class='add'>+		phy_interface_set_rgmii(interfaces);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phylink_set(mask, 10baseT_Half);</div><div class='del'>-	phylink_set(mask, 10baseT_Full);</div><div class='del'>-	phylink_set(mask, 100baseT_Half);</div><div class='del'>-	phylink_set(mask, 100baseT_Full);</div><div class='del'>-</div><div class='del'>-	bitmap_and(supported, supported, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	bitmap_and(state-&gt;advertising, state-&gt;advertising, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100 | MAC_1000;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,</div><div class='add'>+static void bcm_sf2_sw_mac_config(struct phylink_config *config,</div><div class='ctx'> 				  unsigned int mode,</div><div class='ctx'> 				  const struct phylink_link_state *state)</div><div class='ctx'> {</div><div class='del'>-	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='ctx'> 	u32 id_mode_dis = 0, port_mode;</div><div class='del'>-	u32 reg, offset;</div><div class='add'>+	struct bcm_sf2_priv *priv;</div><div class='add'>+	u32 reg_rgmii_ctrl;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;type == BCM7445_DEVICE_ID)</div><div class='del'>-		offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);</div><div class='del'>-	else</div><div class='del'>-		offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);</div><div class='add'>+	priv = bcm_sf2_to_priv(dp-&gt;ds);</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;index == core_readl(priv, CORE_IMP0_PRT_ID))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	switch (state-&gt;interface) {</div><div class='ctx'> 	case PHY_INTERFACE_MODE_RGMII:</div><div class='ctx'> 		id_mode_dis = 1;</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='ctx'> 		port_mode = EXT_GPHY;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -545,54 +771,31 @@ static void bcm_sf2_sw_mac_config(struct dsa_switch *ds, int port,</div><div class='ctx'> 		port_mode = EXT_REVMII;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		/* all other PHYs: internal and MoCA */</div><div class='del'>-		goto force_link;</div><div class='add'>+		/* Nothing required for all other PHYs: internal and MoCA */</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, dp-&gt;index);</div><div class='add'>+</div><div class='ctx'> 	/* Clear id_mode_dis bit, and the existing port mode, let</div><div class='ctx'> 	 * RGMII_MODE_EN bet set by mac_link_{up,down}</div><div class='ctx'> 	 */</div><div class='del'>-	reg = reg_readl(priv, REG_RGMII_CNTRL_P(port));</div><div class='add'>+	reg = reg_readl(priv, reg_rgmii_ctrl);</div><div class='ctx'> 	reg &amp;= ~ID_MODE_DIS;</div><div class='ctx'> 	reg &amp;= ~(PORT_MODE_MASK &lt;&lt; PORT_MODE_SHIFT);</div><div class='del'>-	reg &amp;= ~(RX_PAUSE_EN | TX_PAUSE_EN);</div><div class='ctx'> </div><div class='ctx'> 	reg |= port_mode;</div><div class='ctx'> 	if (id_mode_dis)</div><div class='ctx'> 		reg |= ID_MODE_DIS;</div><div class='ctx'> </div><div class='del'>-	if (state-&gt;pause &amp; MLO_PAUSE_TXRX_MASK) {</div><div class='del'>-		if (state-&gt;pause &amp; MLO_PAUSE_TX)</div><div class='del'>-			reg |= TX_PAUSE_EN;</div><div class='del'>-		reg |= RX_PAUSE_EN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	reg_writel(priv, reg, REG_RGMII_CNTRL_P(port));</div><div class='del'>-</div><div class='del'>-force_link:</div><div class='del'>-	/* Force link settings detected from the PHY */</div><div class='del'>-	reg = SW_OVERRIDE;</div><div class='del'>-	switch (state-&gt;speed) {</div><div class='del'>-	case SPEED_1000:</div><div class='del'>-		reg |= SPDSTS_1000 &lt;&lt; SPEED_SHIFT;</div><div class='del'>-		break;</div><div class='del'>-	case SPEED_100:</div><div class='del'>-		reg |= SPDSTS_100 &lt;&lt; SPEED_SHIFT;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (state-&gt;link)</div><div class='del'>-		reg |= LINK_STS;</div><div class='del'>-	if (state-&gt;duplex == DUPLEX_FULL)</div><div class='del'>-		reg |= DUPLX_MODE;</div><div class='del'>-</div><div class='del'>-	core_writel(priv, reg, offset);</div><div class='add'>+	reg_writel(priv, reg, reg_rgmii_ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_sw_mac_link_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 				    phy_interface_t interface, bool link)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='add'>+	u32 reg_rgmii_ctrl;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (!phy_interface_mode_is_rgmii(interface) &amp;&amp;</div><div class='hunk'>@@ -600,34 +803,104 @@ static void bcm_sf2_sw_mac_link_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 	    interface != PHY_INTERFACE_MODE_REVMII)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);</div><div class='add'>+</div><div class='ctx'> 	/* If the link is down, just disable the interface to conserve power */</div><div class='del'>-	reg = reg_readl(priv, REG_RGMII_CNTRL_P(port));</div><div class='add'>+	reg = reg_readl(priv, reg_rgmii_ctrl);</div><div class='ctx'> 	if (link)</div><div class='ctx'> 		reg |= RGMII_MODE_EN;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~RGMII_MODE_EN;</div><div class='del'>-	reg_writel(priv, reg, REG_RGMII_CNTRL_P(port));</div><div class='add'>+	reg_writel(priv, reg, reg_rgmii_ctrl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,</div><div class='add'>+static void bcm_sf2_sw_mac_link_down(struct phylink_config *config,</div><div class='ctx'> 				     unsigned int mode,</div><div class='ctx'> 				     phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	bcm_sf2_sw_mac_link_set(ds, port, interface, false);</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct bcm_sf2_priv *priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 reg, offset;</div><div class='add'>+</div><div class='add'>+	priv = bcm_sf2_to_priv(dp-&gt;ds);</div><div class='add'>+	if (priv-&gt;wol_ports_mask &amp; BIT(port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	offset = bcm_sf2_port_override_offset(priv, port);</div><div class='add'>+	reg = core_readl(priv, offset);</div><div class='add'>+	reg &amp;= ~LINK_STS;</div><div class='add'>+	core_writel(priv, reg, offset);</div><div class='add'>+</div><div class='add'>+	bcm_sf2_sw_mac_link_set(dp-&gt;ds, port, interface, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,</div><div class='add'>+static void bcm_sf2_sw_mac_link_up(struct phylink_config *config,</div><div class='add'>+				   struct phy_device *phydev,</div><div class='ctx'> 				   unsigned int mode,</div><div class='ctx'> 				   phy_interface_t interface,</div><div class='del'>-				   struct phy_device *phydev)</div><div class='add'>+				   int speed, int duplex,</div><div class='add'>+				   bool tx_pause, bool rx_pause)</div><div class='ctx'> {</div><div class='del'>-	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='del'>-	struct ethtool_eee *p = &amp;priv-&gt;dev-&gt;ports[port].eee;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct bcm_sf2_priv *priv;</div><div class='add'>+	u32 reg_rgmii_ctrl = 0;</div><div class='add'>+	struct ethtool_keee *p;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 reg, offset;</div><div class='add'>+</div><div class='add'>+	bcm_sf2_sw_mac_link_set(dp-&gt;ds, port, interface, true);</div><div class='ctx'> </div><div class='del'>-	bcm_sf2_sw_mac_link_set(ds, port, interface, true);</div><div class='add'>+	priv = bcm_sf2_to_priv(dp-&gt;ds);</div><div class='add'>+	offset = bcm_sf2_port_override_offset(priv, port);</div><div class='ctx'> </div><div class='del'>-	if (mode == MLO_AN_PHY &amp;&amp; phydev)</div><div class='del'>-		p-&gt;eee_enabled = b53_eee_init(ds, port, phydev);</div><div class='add'>+	if (phy_interface_mode_is_rgmii(interface) ||</div><div class='add'>+	    interface == PHY_INTERFACE_MODE_MII ||</div><div class='add'>+	    interface == PHY_INTERFACE_MODE_REVMII) {</div><div class='add'>+		reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);</div><div class='add'>+		reg = reg_readl(priv, reg_rgmii_ctrl);</div><div class='add'>+		reg &amp;= ~(RX_PAUSE_EN | TX_PAUSE_EN);</div><div class='add'>+</div><div class='add'>+		if (tx_pause)</div><div class='add'>+			reg |= TX_PAUSE_EN;</div><div class='add'>+		if (rx_pause)</div><div class='add'>+			reg |= RX_PAUSE_EN;</div><div class='add'>+</div><div class='add'>+		reg_writel(priv, reg, reg_rgmii_ctrl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = LINK_STS;</div><div class='add'>+	if (port == 8) {</div><div class='add'>+		if (priv-&gt;type == BCM4908_DEVICE_ID)</div><div class='add'>+			reg |= GMII_SPEED_UP_2G;</div><div class='add'>+		reg |= MII_SW_OR;</div><div class='add'>+	} else {</div><div class='add'>+		reg |= SW_OVERRIDE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		reg |= SPDSTS_1000 &lt;&lt; SPEED_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		reg |= SPDSTS_100 &lt;&lt; SPEED_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		reg |= DUPLX_MODE;</div><div class='add'>+</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		reg |= TXFLOW_CNTL;</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		reg |= RXFLOW_CNTL;</div><div class='add'>+</div><div class='add'>+	core_writel(priv, reg, offset);</div><div class='add'>+</div><div class='add'>+	if (mode == MLO_AN_PHY &amp;&amp; phydev) {</div><div class='add'>+		p = &amp;priv-&gt;dev-&gt;ports[port].eee;</div><div class='add'>+		p-&gt;eee_enabled = b53_eee_init(dp-&gt;ds, port, phydev);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_sw_fixed_state(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -653,7 +926,7 @@ static void bcm_sf2_sw_fixed_state(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 * state machine and make it go in PHY_FORCING state instead.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!status-&gt;link)</div><div class='del'>-			netif_carrier_off(ds-&gt;ports[port].slave);</div><div class='add'>+			netif_carrier_off(dsa_to_port(ds, port)-&gt;user);</div><div class='ctx'> 		status-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		status-&gt;link = true;</div><div class='hunk'>@@ -690,6 +963,9 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds)</div><div class='ctx'> 			bcm_sf2_port_disable(ds, port);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;wol_ports_mask)</div><div class='add'>+		clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -698,12 +974,17 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (!priv-&gt;wol_ports_mask)</div><div class='add'>+		clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	ret = bcm_sf2_sw_rst(priv);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("%s: failed to software reset switch\n", __func__);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bcm_sf2_crossbar_setup(priv);</div><div class='add'>+</div><div class='ctx'> 	ret = bcm_sf2_cfp_resume(ds);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -719,7 +1000,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)</div><div class='ctx'> static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,</div><div class='ctx'> 			       struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *p = ds-&gt;ports[port].cpu_dp-&gt;master;</div><div class='add'>+	struct net_device *p = dsa_port_to_conduit(dsa_to_port(ds, port));</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='ctx'> 	struct ethtool_wolinfo pwol = { };</div><div class='ctx'> </div><div class='hunk'>@@ -743,9 +1024,9 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,</div><div class='ctx'> static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,</div><div class='ctx'> 			      struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *p = ds-&gt;ports[port].cpu_dp-&gt;master;</div><div class='add'>+	struct net_device *p = dsa_port_to_conduit(dsa_to_port(ds, port));</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='del'>-	s8 cpu_port = ds-&gt;ports[port].cpu_dp-&gt;index;</div><div class='add'>+	s8 cpu_port = dsa_to_port(ds, port)-&gt;cpu_dp-&gt;index;</div><div class='ctx'> 	struct ethtool_wolinfo pwol =  { };</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;ethtool_ops-&gt;get_wol)</div><div class='hunk'>@@ -789,7 +1070,12 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)</div><div class='ctx'> 	b53_configure_vlan(ds);</div><div class='ctx'> 	bcm_sf2_enable_acb(ds);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return b53_setup_devlink_resources(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm_sf2_sw_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The SWITCH_CORE register space is managed by b53 but operates on a page +</div><div class='hunk'>@@ -897,8 +1183,8 @@ static void bcm_sf2_sw_get_strings(struct dsa_switch *ds, int port,</div><div class='ctx'> 	int cnt = b53_get_sset_count(ds, port, stringset);</div><div class='ctx'> </div><div class='ctx'> 	b53_get_strings(ds, port, stringset, data);</div><div class='del'>-	bcm_sf2_cfp_get_strings(ds, port, stringset,</div><div class='del'>-				data + cnt * ETH_GSTRING_LEN);</div><div class='add'>+	data += cnt * ETH_GSTRING_LEN;</div><div class='add'>+	bcm_sf2_cfp_get_strings(ds, port, stringset, &amp;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_sw_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -923,33 +1209,40 @@ static int bcm_sf2_sw_get_sset_count(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return cnt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct phylink_mac_ops bcm_sf2_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= bcm_sf2_sw_mac_config,</div><div class='add'>+	.mac_link_down	= bcm_sf2_sw_mac_link_down,</div><div class='add'>+	.mac_link_up	= bcm_sf2_sw_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops bcm_sf2_ops = {</div><div class='ctx'> 	.get_tag_protocol	= b53_get_tag_protocol,</div><div class='ctx'> 	.setup			= bcm_sf2_sw_setup,</div><div class='add'>+	.teardown		= bcm_sf2_sw_teardown,</div><div class='ctx'> 	.get_strings		= bcm_sf2_sw_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= bcm_sf2_sw_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count		= bcm_sf2_sw_get_sset_count,</div><div class='ctx'> 	.get_ethtool_phy_stats	= b53_get_ethtool_phy_stats,</div><div class='ctx'> 	.get_phy_flags		= bcm_sf2_sw_get_phy_flags,</div><div class='del'>-	.phylink_validate	= bcm_sf2_sw_validate,</div><div class='del'>-	.phylink_mac_config	= bcm_sf2_sw_mac_config,</div><div class='del'>-	.phylink_mac_link_down	= bcm_sf2_sw_mac_link_down,</div><div class='del'>-	.phylink_mac_link_up	= bcm_sf2_sw_mac_link_up,</div><div class='add'>+	.phylink_get_caps	= bcm_sf2_sw_get_caps,</div><div class='ctx'> 	.phylink_fixed_state	= bcm_sf2_sw_fixed_state,</div><div class='ctx'> 	.suspend		= bcm_sf2_sw_suspend,</div><div class='ctx'> 	.resume			= bcm_sf2_sw_resume,</div><div class='ctx'> 	.get_wol		= bcm_sf2_sw_get_wol,</div><div class='ctx'> 	.set_wol		= bcm_sf2_sw_set_wol,</div><div class='add'>+	.port_setup		= b53_setup_port,</div><div class='ctx'> 	.port_enable		= bcm_sf2_port_setup,</div><div class='ctx'> 	.port_disable		= bcm_sf2_port_disable,</div><div class='del'>-	.get_mac_eee		= b53_get_mac_eee,</div><div class='add'>+	.support_eee		= b53_support_eee,</div><div class='ctx'> 	.set_mac_eee		= b53_set_mac_eee,</div><div class='add'>+	.set_ageing_time	= b53_set_ageing_time,</div><div class='ctx'> 	.port_bridge_join	= b53_br_join,</div><div class='ctx'> 	.port_bridge_leave	= b53_br_leave,</div><div class='add'>+	.port_pre_bridge_flags	= b53_br_flags_pre,</div><div class='add'>+	.port_bridge_flags	= b53_br_flags,</div><div class='ctx'> 	.port_stp_state_set	= b53_br_set_stp_state,</div><div class='ctx'> 	.port_fast_age		= b53_br_fast_age,</div><div class='ctx'> 	.port_vlan_filtering	= b53_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= b53_vlan_prepare,</div><div class='ctx'> 	.port_vlan_add		= b53_vlan_add,</div><div class='ctx'> 	.port_vlan_del		= b53_vlan_del,</div><div class='ctx'> 	.port_fdb_dump		= b53_fdb_dump,</div><div class='hunk'>@@ -959,6 +1252,8 @@ static const struct dsa_switch_ops bcm_sf2_ops = {</div><div class='ctx'> 	.set_rxnfc		= bcm_sf2_set_rxnfc,</div><div class='ctx'> 	.port_mirror_add	= b53_mirror_add,</div><div class='ctx'> 	.port_mirror_del	= b53_mirror_del,</div><div class='add'>+	.port_mdb_add		= b53_mdb_add,</div><div class='add'>+	.port_mdb_del		= b53_mdb_del,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcm_sf2_of_data {</div><div class='hunk'>@@ -966,6 +1261,37 @@ struct bcm_sf2_of_data {</div><div class='ctx'> 	const u16 *reg_offsets;</div><div class='ctx'> 	unsigned int core_reg_align;</div><div class='ctx'> 	unsigned int num_cfp_rules;</div><div class='add'>+	unsigned int num_crossbar_int_ports;</div><div class='add'>+	unsigned int num_crossbar_ext_bits;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 bcm_sf2_4908_reg_offsets[] = {</div><div class='add'>+	[REG_SWITCH_CNTRL]	= 0x00,</div><div class='add'>+	[REG_SWITCH_STATUS]	= 0x04,</div><div class='add'>+	[REG_DIR_DATA_WRITE]	= 0x08,</div><div class='add'>+	[REG_DIR_DATA_READ]	= 0x0c,</div><div class='add'>+	[REG_SWITCH_REVISION]	= 0x10,</div><div class='add'>+	[REG_PHY_REVISION]	= 0x14,</div><div class='add'>+	[REG_SPHY_CNTRL]	= 0x24,</div><div class='add'>+	[REG_CROSSBAR]		= 0xc8,</div><div class='add'>+	[REG_RGMII_11_CNTRL]	= 0x014c,</div><div class='add'>+	[REG_LED_0_CNTRL]		= 0x40,</div><div class='add'>+	[REG_LED_1_CNTRL]		= 0x4c,</div><div class='add'>+	[REG_LED_2_CNTRL]		= 0x58,</div><div class='add'>+	[REG_LED_3_CNTRL]		= 0x64,</div><div class='add'>+	[REG_LED_4_CNTRL]		= 0x88,</div><div class='add'>+	[REG_LED_5_CNTRL]		= 0xa0,</div><div class='add'>+	[REG_LED_AGGREGATE_CTRL]	= 0xb8,</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcm_sf2_of_data bcm_sf2_4908_data = {</div><div class='add'>+	.type		= BCM4908_DEVICE_ID,</div><div class='add'>+	.core_reg_align	= 0,</div><div class='add'>+	.reg_offsets	= bcm_sf2_4908_reg_offsets,</div><div class='add'>+	.num_cfp_rules	= 256,</div><div class='add'>+	.num_crossbar_int_ports = 2,</div><div class='add'>+	.num_crossbar_ext_bits = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Register offsets for the SWITCH_REG_* block */</div><div class='hunk'>@@ -1016,6 +1342,9 @@ static const struct bcm_sf2_of_data bcm_sf2_7278_data = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id bcm_sf2_of_match[] = {</div><div class='add'>+	{ .compatible = "brcm,bcm4908-switch",</div><div class='add'>+	  .data = &amp;bcm_sf2_4908_data</div><div class='add'>+	},</div><div class='ctx'> 	{ .compatible = "brcm,bcm7445-switch-v4.0",</div><div class='ctx'> 	  .data = &amp;bcm_sf2_7445_data</div><div class='ctx'> 	},</div><div class='hunk'>@@ -1037,11 +1366,11 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> 	const struct bcm_sf2_of_data *data;</div><div class='ctx'> 	struct b53_platform_data *pdata;</div><div class='ctx'> 	struct dsa_switch_ops *ops;</div><div class='add'>+	struct device_node *ports;</div><div class='ctx'> 	struct bcm_sf2_priv *priv;</div><div class='ctx'> 	struct b53_device *dev;</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> 	void __iomem **base;</div><div class='del'>-	struct resource *r;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	u32 reg, rev;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1073,6 +1402,13 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;reg_offsets = data-&gt;reg_offsets;</div><div class='ctx'> 	priv-&gt;core_reg_align = data-&gt;core_reg_align;</div><div class='ctx'> 	priv-&gt;num_cfp_rules = data-&gt;num_cfp_rules;</div><div class='add'>+	priv-&gt;num_crossbar_int_ports = data-&gt;num_crossbar_int_ports;</div><div class='add'>+	priv-&gt;num_crossbar_ext_bits = data-&gt;num_crossbar_ext_bits;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rcdev = devm_reset_control_get_optional_exclusive(&amp;pdev-&gt;dev,</div><div class='add'>+								"switch");</div><div class='add'>+	if (IS_ERR(priv-&gt;rcdev))</div><div class='add'>+		return PTR_ERR(priv-&gt;rcdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Auto-detection using standard registers will not work, so</div><div class='ctx'> 	 * provide an indication of what kind of device we are for</div><div class='hunk'>@@ -1084,6 +1420,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> 	ds = dev-&gt;ds;</div><div class='ctx'> 	ds-&gt;ops = &amp;bcm_sf2_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;bcm_sf2_phylink_mac_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Advertise the 8 egress queues */</div><div class='ctx'> 	ds-&gt;num_tx_queues = SF2_NUM_EGRESS_QUEUES;</div><div class='hunk'>@@ -1100,15 +1437,20 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> 	set_bit(0, priv-&gt;cfp.used);</div><div class='ctx'> 	set_bit(0, priv-&gt;cfp.unique);</div><div class='ctx'> </div><div class='del'>-	bcm_sf2_identify_ports(priv, dn-&gt;child);</div><div class='add'>+	/* Balance of_node_put() done by of_find_node_by_name() */</div><div class='add'>+	of_node_get(dn);</div><div class='add'>+	ports = of_find_node_by_name(dn, "ports");</div><div class='add'>+	if (ports) {</div><div class='add'>+		bcm_sf2_identify_ports(priv, ports);</div><div class='add'>+		of_node_put(ports);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;irq0 = irq_of_parse_and_map(dn, 0);</div><div class='ctx'> 	priv-&gt;irq1 = irq_of_parse_and_map(dn, 1);</div><div class='ctx'> </div><div class='ctx'> 	base = &amp;priv-&gt;core;</div><div class='ctx'> 	for (i = 0; i &lt; BCM_SF2_REGS_NUM; i++) {</div><div class='del'>-		r = platform_get_resource(pdev, IORESOURCE_MEM, i);</div><div class='del'>-		*base = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='add'>+		*base = devm_platform_ioremap_resource(pdev, i);</div><div class='ctx'> 		if (IS_ERR(*base)) {</div><div class='ctx'> 			pr_err("unable to find register: %s\n", reg_names[i]);</div><div class='ctx'> 			return PTR_ERR(*base);</div><div class='hunk'>@@ -1116,18 +1458,38 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> 		base++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	priv-&gt;clk = devm_clk_get_optional(&amp;pdev-&gt;dev, "sw_switch");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk))</div><div class='add'>+		return PTR_ERR(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;clk_mdiv = devm_clk_get_optional(&amp;pdev-&gt;dev, "sw_switch_mdiv");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk_mdiv)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;clk_mdiv);</div><div class='add'>+		goto out_clk;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk_mdiv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_clk;</div><div class='add'>+</div><div class='ctx'> 	ret = bcm_sf2_sw_rst(priv);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("unable to software reset switch: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_clk_mdiv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bcm_sf2_crossbar_setup(priv);</div><div class='add'>+</div><div class='ctx'> 	bcm_sf2_gphy_enable_set(priv-&gt;dev-&gt;ds, true);</div><div class='ctx'> </div><div class='ctx'> 	ret = bcm_sf2_mdio_register(ds);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		pr_err("failed to register MDIO bus\n");</div><div class='del'>-		return ret;</div><div class='add'>+		goto out_clk_mdiv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bcm_sf2_gphy_enable_set(priv-&gt;dev-&gt;ds, false);</div><div class='hunk'>@@ -1194,27 +1556,39 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> out_mdio:</div><div class='ctx'> 	bcm_sf2_mdio_unregister(priv);</div><div class='add'>+out_clk_mdiv:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_mdiv);</div><div class='add'>+out_clk:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_sf2_sw_remove(struct platform_device *pdev)</div><div class='add'>+static void bcm_sf2_sw_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;wol_ports_mask = 0;</div><div class='add'>+	/* Disable interrupts */</div><div class='add'>+	bcm_sf2_intr_disable(priv);</div><div class='ctx'> 	dsa_unregister_switch(priv-&gt;dev-&gt;ds);</div><div class='ctx'> 	bcm_sf2_cfp_exit(priv-&gt;dev-&gt;ds);</div><div class='del'>-	/* Disable all ports and interrupts */</div><div class='del'>-	bcm_sf2_sw_suspend(priv-&gt;dev-&gt;ds);</div><div class='ctx'> 	bcm_sf2_mdio_unregister(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_mdiv);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+	if (priv-&gt;type == BCM7278_DEVICE_ID)</div><div class='add'>+		reset_control_assert(priv-&gt;rcdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_sw_shutdown(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	/* For a kernel about to be kexec'd we want to keep the GPHY on for a</div><div class='ctx'> 	 * successful MDIO bus scan to occur. If we did turn off the GPHY</div><div class='ctx'> 	 * before (e.g: port_disable), this will also power it back on.</div><div class='hunk'>@@ -1223,6 +1597,10 @@ static void bcm_sf2_sw_shutdown(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;hw_params.num_gphy == 1)</div><div class='ctx'> 		bcm_sf2_gphy_enable_set(priv-&gt;dev-&gt;ds, true);</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;dev-&gt;ds);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -1247,7 +1625,7 @@ static SIMPLE_DEV_PM_OPS(bcm_sf2_pm_ops,</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver bcm_sf2_driver = {</div><div class='ctx'> 	.probe	= bcm_sf2_sw_probe,</div><div class='del'>-	.remove	= bcm_sf2_sw_remove,</div><div class='add'>+	.remove = bcm_sf2_sw_remove,</div><div class='ctx'> 	.shutdown = bcm_sf2_sw_shutdown,</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "brcm-sf2",</div><div class='head'>diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h<br/>index 1df30ccec42d..be9f3b29019f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/bcm_sf2.h</a></div><div class='hunk'>@@ -18,6 +18,7 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -43,7 +44,9 @@ struct bcm_sf2_hw_params {</div><div class='ctx'> #define BCM_SF2_REGS_NUM	6</div><div class='ctx'> </div><div class='ctx'> struct bcm_sf2_port_status {</div><div class='add'>+	phy_interface_t mode;</div><div class='ctx'> 	unsigned int link;</div><div class='add'>+	bool enabled;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcm_sf2_cfp_priv {</div><div class='hunk'>@@ -64,11 +67,15 @@ struct bcm_sf2_priv {</div><div class='ctx'> 	void __iomem			*fcb;</div><div class='ctx'> 	void __iomem			*acb;</div><div class='ctx'> </div><div class='add'>+	struct reset_control		*rcdev;</div><div class='add'>+</div><div class='ctx'> 	/* Register offsets indirection tables */</div><div class='ctx'> 	u32 				type;</div><div class='ctx'> 	const u16			*reg_offsets;</div><div class='ctx'> 	unsigned int			core_reg_align;</div><div class='ctx'> 	unsigned int			num_cfp_rules;</div><div class='add'>+	unsigned int			num_crossbar_int_ports;</div><div class='add'>+	unsigned int			num_crossbar_ext_bits;</div><div class='ctx'> </div><div class='ctx'> 	/* spinlock protecting access to the indirect registers */</div><div class='ctx'> 	spinlock_t			indir_lock;</div><div class='hunk'>@@ -90,6 +97,9 @@ struct bcm_sf2_priv {</div><div class='ctx'> 	/* Mask of ports enabled for Wake-on-LAN */</div><div class='ctx'> 	u32				wol_ports_mask;</div><div class='ctx'> </div><div class='add'>+	struct clk			*clk;</div><div class='add'>+	struct clk			*clk_mdiv;</div><div class='add'>+</div><div class='ctx'> 	/* MoCA port location */</div><div class='ctx'> 	int				moca_port;</div><div class='ctx'> </div><div class='hunk'>@@ -98,8 +108,7 @@ struct bcm_sf2_priv {</div><div class='ctx'> </div><div class='ctx'> 	/* Master and slave MDIO bus controller */</div><div class='ctx'> 	unsigned int			indir_phy_mask;</div><div class='del'>-	struct device_node		*master_mii_dn;</div><div class='del'>-	struct mii_bus			*slave_mii_bus;</div><div class='add'>+	struct mii_bus			*user_mii_bus;</div><div class='ctx'> 	struct mii_bus			*master_mii_bus;</div><div class='ctx'> </div><div class='ctx'> 	/* Bitmask of ports needing BRCM tags */</div><div class='hunk'>@@ -201,6 +210,16 @@ SF2_IO_MACRO(acb);</div><div class='ctx'> SWITCH_INTR_L2(0);</div><div class='ctx'> SWITCH_INTR_L2(1);</div><div class='ctx'> </div><div class='add'>+static inline u32 reg_led_readl(struct bcm_sf2_priv *priv, u16 off, u16 reg)</div><div class='add'>+{</div><div class='add'>+	return readl_relaxed(priv-&gt;reg + priv-&gt;reg_offsets[off] + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void reg_led_writel(struct bcm_sf2_priv *priv, u32 val, u16 off, u16 reg)</div><div class='add'>+{</div><div class='add'>+	writel_relaxed(val, priv-&gt;reg + priv-&gt;reg_offsets[off] + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* RXNFC */</div><div class='ctx'> int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,</div><div class='ctx'> 		      struct ethtool_rxnfc *nfc, u32 *rule_locs);</div><div class='hunk'>@@ -209,8 +228,8 @@ int bcm_sf2_set_rxnfc(struct dsa_switch *ds, int port,</div><div class='ctx'> int bcm_sf2_cfp_rst(struct bcm_sf2_priv *priv);</div><div class='ctx'> void bcm_sf2_cfp_exit(struct dsa_switch *ds);</div><div class='ctx'> int bcm_sf2_cfp_resume(struct dsa_switch *ds);</div><div class='del'>-void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port,</div><div class='del'>-			     u32 stringset, uint8_t *data);</div><div class='add'>+void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+			     uint8_t **data);</div><div class='ctx'> void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='ctx'> 				   uint64_t *data);</div><div class='ctx'> int bcm_sf2_cfp_get_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='head'>diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c<br/>index d264776a95a3..e22362e6f0cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2_cfp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2_cfp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2_cfp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/bcm_sf2_cfp.c</a></div><div class='hunk'>@@ -13,6 +13,8 @@</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;net/flow_offload.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include &lt;uapi/linux/if_bridge.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bcm_sf2.h"</div><div class='ctx'> #include "bcm_sf2_regs.h"</div><div class='hunk'>@@ -126,12 +128,12 @@ static inline unsigned int bcm_sf2_get_num_udf_slices(const u8 *layout)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 udf_upper_bits(unsigned int num_udf)</div><div class='add'>+static inline u32 udf_upper_bits(int num_udf)</div><div class='ctx'> {</div><div class='ctx'> 	return GENMASK(num_udf - 1, 0) &gt;&gt; (UDFS_PER_SLICE - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 udf_lower_bits(unsigned int num_udf)</div><div class='add'>+static inline u32 udf_lower_bits(int num_udf)</div><div class='ctx'> {</div><div class='ctx'> 	return (u8)GENMASK(num_udf - 1, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -261,16 +263,27 @@ static int bcm_sf2_cfp_act_pol_set(struct bcm_sf2_priv *priv,</div><div class='ctx'> static void bcm_sf2_cfp_slice_ipv4(struct bcm_sf2_priv *priv,</div><div class='ctx'> 				   struct flow_dissector_key_ipv4_addrs *addrs,</div><div class='ctx'> 				   struct flow_dissector_key_ports *ports,</div><div class='del'>-				   unsigned int slice_num,</div><div class='add'>+				   const __be16 vlan_tci,</div><div class='add'>+				   unsigned int slice_num, u8 num_udf,</div><div class='ctx'> 				   bool mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg, offset;</div><div class='ctx'> </div><div class='add'>+	/* UDF_Valid[7:0]	[31:24]</div><div class='add'>+	 * S-Tag		[23:8]</div><div class='add'>+	 * C-Tag		[7:0]</div><div class='add'>+	 */</div><div class='add'>+	reg = udf_lower_bits(num_udf) &lt;&lt; 24 | be16_to_cpu(vlan_tci) &gt;&gt; 8;</div><div class='add'>+	if (mask)</div><div class='add'>+		core_writel(priv, reg, CORE_CFP_MASK_PORT(5));</div><div class='add'>+	else</div><div class='add'>+		core_writel(priv, reg, CORE_CFP_DATA_PORT(5));</div><div class='add'>+</div><div class='ctx'> 	/* C-Tag		[31:24]</div><div class='ctx'> 	 * UDF_n_A8		[23:8]</div><div class='ctx'> 	 * UDF_n_A7		[7:0]</div><div class='ctx'> 	 */</div><div class='del'>-	reg = 0;</div><div class='add'>+	reg = (u32)(be16_to_cpu(vlan_tci) &amp; 0xff) &lt;&lt; 24;</div><div class='ctx'> 	if (mask)</div><div class='ctx'> 		offset = CORE_CFP_MASK_PORT(4);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -335,6 +348,7 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 				     unsigned int queue_num,</div><div class='ctx'> 				     struct ethtool_rx_flow_spec *fs)</div><div class='ctx'> {</div><div class='add'>+	__be16 vlan_tci = 0, vlan_m_tci = htons(0xffff);</div><div class='ctx'> 	struct ethtool_rx_flow_spec_input input = {};</div><div class='ctx'> 	const struct cfp_udf_layout *layout;</div><div class='ctx'> 	unsigned int slice_num, rule_index;</div><div class='hunk'>@@ -358,7 +372,13 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ip_frag = be32_to_cpu(fs-&gt;m_ext.data[0]);</div><div class='add'>+	ip_frag = !!(be32_to_cpu(fs-&gt;h_ext.data[0]) &amp; 1);</div><div class='add'>+</div><div class='add'>+	/* Extract VLAN TCI */</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+		vlan_tci = fs-&gt;h_ext.vlan_tci;</div><div class='add'>+		vlan_m_tci = fs-&gt;m_ext.vlan_tci;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Locate the first rule available */</div><div class='ctx'> 	if (fs-&gt;location == RX_CLS_LOC_ANY)</div><div class='hunk'>@@ -421,18 +441,11 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 	core_writel(priv, layout-&gt;udfs[slice_num].mask_value |</div><div class='ctx'> 		    udf_upper_bits(num_udf), CORE_CFP_MASK_PORT(6));</div><div class='ctx'> </div><div class='del'>-	/* UDF_Valid[7:0]	[31:24]</div><div class='del'>-	 * S-Tag		[23:8]</div><div class='del'>-	 * C-Tag		[7:0]</div><div class='del'>-	 */</div><div class='del'>-	core_writel(priv, udf_lower_bits(num_udf) &lt;&lt; 24, CORE_CFP_DATA_PORT(5));</div><div class='del'>-</div><div class='del'>-	/* Mask all but valid UDFs */</div><div class='del'>-	core_writel(priv, udf_lower_bits(num_udf) &lt;&lt; 24, CORE_CFP_MASK_PORT(5));</div><div class='del'>-</div><div class='ctx'> 	/* Program the match and the mask */</div><div class='del'>-	bcm_sf2_cfp_slice_ipv4(priv, ipv4.key, ports.key, slice_num, false);</div><div class='del'>-	bcm_sf2_cfp_slice_ipv4(priv, ipv4.mask, ports.mask, SLICE_NUM_MASK, true);</div><div class='add'>+	bcm_sf2_cfp_slice_ipv4(priv, ipv4.key, ports.key, vlan_tci,</div><div class='add'>+			       slice_num, num_udf, false);</div><div class='add'>+	bcm_sf2_cfp_slice_ipv4(priv, ipv4.mask, ports.mask, vlan_m_tci,</div><div class='add'>+			       SLICE_NUM_MASK, num_udf, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Insert into TCAM now */</div><div class='ctx'> 	bcm_sf2_cfp_rule_addr_set(priv, rule_index);</div><div class='hunk'>@@ -468,17 +481,29 @@ out_err_flow_rule:</div><div class='ctx'> </div><div class='ctx'> static void bcm_sf2_cfp_slice_ipv6(struct bcm_sf2_priv *priv,</div><div class='ctx'> 				   const __be32 *ip6_addr, const __be16 port,</div><div class='del'>-				   unsigned int slice_num,</div><div class='add'>+				   const __be16 vlan_tci,</div><div class='add'>+				   unsigned int slice_num, u32 udf_bits,</div><div class='ctx'> 				   bool mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg, tmp, val, offset;</div><div class='ctx'> </div><div class='add'>+	/* UDF_Valid[7:0]	[31:24]</div><div class='add'>+	 * S-Tag		[23:8]</div><div class='add'>+	 * C-Tag		[7:0]</div><div class='add'>+	 */</div><div class='add'>+	reg = udf_bits &lt;&lt; 24 | be16_to_cpu(vlan_tci) &gt;&gt; 8;</div><div class='add'>+	if (mask)</div><div class='add'>+		core_writel(priv, reg, CORE_CFP_MASK_PORT(5));</div><div class='add'>+	else</div><div class='add'>+		core_writel(priv, reg, CORE_CFP_DATA_PORT(5));</div><div class='add'>+</div><div class='ctx'> 	/* C-Tag		[31:24]</div><div class='ctx'> 	 * UDF_n_B8		[23:8]	(port)</div><div class='ctx'> 	 * UDF_n_B7 (upper)	[7:0]	(addr[15:8])</div><div class='ctx'> 	 */</div><div class='ctx'> 	reg = be32_to_cpu(ip6_addr[3]);</div><div class='ctx'> 	val = (u32)be16_to_cpu(port) &lt;&lt; 8 | ((reg &gt;&gt; 8) &amp; 0xff);</div><div class='add'>+	val |= (u32)(be16_to_cpu(vlan_tci) &amp; 0xff) &lt;&lt; 24;</div><div class='ctx'> 	if (mask)</div><div class='ctx'> 		offset = CORE_CFP_MASK_PORT(4);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -542,14 +567,14 @@ static void bcm_sf2_cfp_slice_ipv6(struct bcm_sf2_priv *priv,</div><div class='ctx'> static struct cfp_rule *bcm_sf2_cfp_rule_find(struct bcm_sf2_priv *priv,</div><div class='ctx'> 					      int port, u32 location)</div><div class='ctx'> {</div><div class='del'>-	struct cfp_rule *rule = NULL;</div><div class='add'>+	struct cfp_rule *rule;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry(rule, &amp;priv-&gt;cfp.rules_list, next) {</div><div class='ctx'> 		if (rule-&gt;port == port &amp;&amp; rule-&gt;fs.location == location)</div><div class='del'>-			break;</div><div class='add'>+			return rule;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rule;</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,</div><div class='hunk'>@@ -569,7 +594,7 @@ static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> </div><div class='ctx'> 		if (rule-&gt;fs.flow_type != fs-&gt;flow_type ||</div><div class='ctx'> 		    rule-&gt;fs.ring_cookie != fs-&gt;ring_cookie ||</div><div class='del'>-		    rule-&gt;fs.m_ext.data[0] != fs-&gt;m_ext.data[0])</div><div class='add'>+		    rule-&gt;fs.h_ext.data[0] != fs-&gt;h_ext.data[0])</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		switch (fs-&gt;flow_type &amp; ~FLOW_EXT) {</div><div class='hunk'>@@ -587,6 +612,11 @@ static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> </div><div class='ctx'> 		ret = memcmp(&amp;rule-&gt;fs.h_u, &amp;fs-&gt;h_u, fs_size);</div><div class='ctx'> 		ret |= memcmp(&amp;rule-&gt;fs.m_u, &amp;fs-&gt;m_u, fs_size);</div><div class='add'>+		/* Compare VLAN TCI values as well */</div><div class='add'>+		if (rule-&gt;fs.flow_type &amp; FLOW_EXT) {</div><div class='add'>+			ret |= rule-&gt;fs.h_ext.vlan_tci != fs-&gt;h_ext.vlan_tci;</div><div class='add'>+			ret |= rule-&gt;fs.m_ext.vlan_tci != fs-&gt;m_ext.vlan_tci;</div><div class='add'>+		}</div><div class='ctx'> 		if (ret == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -599,6 +629,7 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 				     unsigned int queue_num,</div><div class='ctx'> 				     struct ethtool_rx_flow_spec *fs)</div><div class='ctx'> {</div><div class='add'>+	__be16 vlan_tci = 0, vlan_m_tci = htons(0xffff);</div><div class='ctx'> 	struct ethtool_rx_flow_spec_input input = {};</div><div class='ctx'> 	unsigned int slice_num, rule_index[2];</div><div class='ctx'> 	const struct cfp_udf_layout *layout;</div><div class='hunk'>@@ -621,7 +652,13 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ip_frag = be32_to_cpu(fs-&gt;m_ext.data[0]);</div><div class='add'>+	ip_frag = !!(be32_to_cpu(fs-&gt;h_ext.data[0]) &amp; 1);</div><div class='add'>+</div><div class='add'>+	/* Extract VLAN TCI */</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+		vlan_tci = fs-&gt;h_ext.vlan_tci;</div><div class='add'>+		vlan_m_tci = fs-&gt;m_ext.vlan_tci;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	layout = &amp;udf_tcpip6_layout;</div><div class='ctx'> 	slice_num = bcm_sf2_get_slice_number(layout, 0);</div><div class='hunk'>@@ -704,20 +741,13 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 	reg = layout-&gt;udfs[slice_num].mask_value | udf_upper_bits(num_udf);</div><div class='ctx'> 	core_writel(priv, reg, CORE_CFP_MASK_PORT(6));</div><div class='ctx'> </div><div class='del'>-	/* UDF_Valid[7:0]	[31:24]</div><div class='del'>-	 * S-Tag		[23:8]</div><div class='del'>-	 * C-Tag		[7:0]</div><div class='del'>-	 */</div><div class='del'>-	core_writel(priv, udf_lower_bits(num_udf) &lt;&lt; 24, CORE_CFP_DATA_PORT(5));</div><div class='del'>-</div><div class='del'>-	/* Mask all but valid UDFs */</div><div class='del'>-	core_writel(priv, udf_lower_bits(num_udf) &lt;&lt; 24, CORE_CFP_MASK_PORT(5));</div><div class='del'>-</div><div class='ctx'> 	/* Slice the IPv6 source address and port */</div><div class='ctx'> 	bcm_sf2_cfp_slice_ipv6(priv, ipv6.key-&gt;src.in6_u.u6_addr32,</div><div class='del'>-			       ports.key-&gt;src, slice_num, false);</div><div class='add'>+			       ports.key-&gt;src, vlan_tci, slice_num,</div><div class='add'>+			       udf_lower_bits(num_udf), false);</div><div class='ctx'> 	bcm_sf2_cfp_slice_ipv6(priv, ipv6.mask-&gt;src.in6_u.u6_addr32,</div><div class='del'>-			       ports.mask-&gt;src, SLICE_NUM_MASK, true);</div><div class='add'>+			       ports.mask-&gt;src, vlan_m_tci, SLICE_NUM_MASK,</div><div class='add'>+			       udf_lower_bits(num_udf), true);</div><div class='ctx'> </div><div class='ctx'> 	/* Insert into TCAM now because we need to insert a second rule */</div><div class='ctx'> 	bcm_sf2_cfp_rule_addr_set(priv, rule_index[0]);</div><div class='hunk'>@@ -768,16 +798,12 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,</div><div class='ctx'> 		udf_lower_bits(num_udf) &lt;&lt; 8;</div><div class='ctx'> 	core_writel(priv, reg, CORE_CFP_MASK_PORT(6));</div><div class='ctx'> </div><div class='del'>-	/* Don't care */</div><div class='del'>-	core_writel(priv, 0, CORE_CFP_DATA_PORT(5));</div><div class='del'>-</div><div class='del'>-	/* Mask all */</div><div class='del'>-	core_writel(priv, 0, CORE_CFP_MASK_PORT(5));</div><div class='del'>-</div><div class='ctx'> 	bcm_sf2_cfp_slice_ipv6(priv, ipv6.key-&gt;dst.in6_u.u6_addr32,</div><div class='del'>-			       ports.key-&gt;dst, slice_num, false);</div><div class='add'>+			       ports.key-&gt;dst, 0, slice_num,</div><div class='add'>+			       0, false);</div><div class='ctx'> 	bcm_sf2_cfp_slice_ipv6(priv, ipv6.mask-&gt;dst.in6_u.u6_addr32,</div><div class='del'>-			       ports.key-&gt;dst, SLICE_NUM_MASK, true);</div><div class='add'>+			       ports.key-&gt;dst, 0, SLICE_NUM_MASK,</div><div class='add'>+			       0, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Insert into TCAM now */</div><div class='ctx'> 	bcm_sf2_cfp_rule_addr_set(priv, rule_index[1]);</div><div class='hunk'>@@ -821,9 +847,11 @@ static int bcm_sf2_cfp_rule_insert(struct dsa_switch *ds, int port,</div><div class='ctx'> 				   struct ethtool_rx_flow_spec *fs)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='del'>-	s8 cpu_port = ds-&gt;ports[port].cpu_dp-&gt;index;</div><div class='add'>+	s8 cpu_port = dsa_to_port(ds, port)-&gt;cpu_dp-&gt;index;</div><div class='ctx'> 	__u64 ring_cookie = fs-&gt;ring_cookie;</div><div class='add'>+	struct switchdev_obj_port_vlan vlan;</div><div class='ctx'> 	unsigned int queue_num, port_num;</div><div class='add'>+	u16 vid;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* This rule is a Wake-on-LAN filter and we must specifically</div><div class='hunk'>@@ -843,6 +871,31 @@ static int bcm_sf2_cfp_rule_insert(struct dsa_switch *ds, int port,</div><div class='ctx'> 	      dsa_is_cpu_port(ds, port_num)) ||</div><div class='ctx'> 	    port_num &gt;= priv-&gt;hw_params.num_ports)</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the rule is matching a particular VLAN, make sure that we honor</div><div class='add'>+	 * the matching and have it tagged or untagged on the destination port,</div><div class='add'>+	 * we do this on egress with a VLAN entry. The egress tagging attribute</div><div class='add'>+	 * is expected to be provided in h_ext.data[1] bit 0. A 1 means untagged,</div><div class='add'>+	 * a 0 means tagged.</div><div class='add'>+	 */</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+		/* We cannot support matching multiple VLAN IDs yet */</div><div class='add'>+		if ((be16_to_cpu(fs-&gt;m_ext.vlan_tci) &amp; VLAN_VID_MASK) !=</div><div class='add'>+		    VLAN_VID_MASK)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		vid = be16_to_cpu(fs-&gt;h_ext.vlan_tci) &amp; VLAN_VID_MASK;</div><div class='add'>+		vlan.vid = vid;</div><div class='add'>+		if (be32_to_cpu(fs-&gt;h_ext.data[1]) &amp; 1)</div><div class='add'>+			vlan.flags = BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+		else</div><div class='add'>+			vlan.flags = 0;</div><div class='add'>+</div><div class='add'>+		ret = ds-&gt;ops-&gt;port_vlan_add(ds, port_num, &amp;vlan, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We have a small oddity where Port 6 just does not have a</div><div class='ctx'> 	 * valid bit here (so we substract by one).</div><div class='hunk'>@@ -878,21 +931,21 @@ static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for unsupported extensions */</div><div class='del'>-	if ((fs-&gt;flow_type &amp; FLOW_EXT) &amp;&amp; (fs-&gt;m_ext.vlan_etype ||</div><div class='del'>-	     fs-&gt;m_ext.data[1]))</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_MAC_EXT)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (fs-&gt;location != RX_CLS_LOC_ANY &amp;&amp; fs-&gt;location &gt;= CFP_NUM_RULES)</div><div class='add'>+	if (fs-&gt;location != RX_CLS_LOC_ANY &amp;&amp;</div><div class='add'>+	    fs-&gt;location &gt; bcm_sf2_cfp_rule_size(priv))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if ((fs-&gt;flow_type &amp; FLOW_EXT) &amp;&amp;</div><div class='add'>+	    !(ds-&gt;ops-&gt;port_vlan_add || ds-&gt;ops-&gt;port_vlan_del))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (fs-&gt;location != RX_CLS_LOC_ANY &amp;&amp;</div><div class='ctx'> 	    test_bit(fs-&gt;location, priv-&gt;cfp.used))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	if (fs-&gt;location != RX_CLS_LOC_ANY &amp;&amp;</div><div class='del'>-	    fs-&gt;location &gt; bcm_sf2_cfp_rule_size(priv))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	ret = bcm_sf2_cfp_rule_cmp(priv, port, fs);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		return -EEXIST;</div><div class='hunk'>@@ -973,7 +1026,7 @@ static int bcm_sf2_cfp_rule_del(struct bcm_sf2_priv *priv, int port, u32 loc)</div><div class='ctx'> 	struct cfp_rule *rule;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (loc &gt;= CFP_NUM_RULES)</div><div class='add'>+	if (loc &gt; bcm_sf2_cfp_rule_size(priv))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	/* Refuse deleting unused rules, and those that are not unique since</div><div class='hunk'>@@ -1049,7 +1102,7 @@ static int bcm_sf2_cfp_rule_get_all(struct bcm_sf2_priv *priv,</div><div class='ctx'> int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,</div><div class='ctx'> 		      struct ethtool_rxnfc *nfc, u32 *rule_locs)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *p = ds-&gt;ports[port].cpu_dp-&gt;master;</div><div class='add'>+	struct net_device *p = dsa_port_to_conduit(dsa_to_port(ds, port));</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1092,7 +1145,7 @@ int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,</div><div class='ctx'> int bcm_sf2_set_rxnfc(struct dsa_switch *ds, int port,</div><div class='ctx'> 		      struct ethtool_rxnfc *nfc)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *p = ds-&gt;ports[port].cpu_dp-&gt;master;</div><div class='add'>+	struct net_device *p = dsa_port_to_conduit(dsa_to_port(ds, port));</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1226,27 +1279,19 @@ static const struct bcm_sf2_cfp_stat {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port,</div><div class='del'>-			     u32 stringset, uint8_t *data)</div><div class='add'>+void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+			     uint8_t **data)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);</div><div class='del'>-	unsigned int s = ARRAY_SIZE(bcm_sf2_cfp_stats);</div><div class='del'>-	char buf[ETH_GSTRING_LEN];</div><div class='del'>-	unsigned int i, j, iter;</div><div class='add'>+	unsigned int i, j;</div><div class='ctx'> </div><div class='ctx'> 	if (stringset != ETH_SS_STATS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 1; i &lt; priv-&gt;num_cfp_rules; i++) {</div><div class='del'>-		for (j = 0; j &lt; s; j++) {</div><div class='del'>-			snprintf(buf, sizeof(buf),</div><div class='del'>-				 "CFP%03d_%sCntr",</div><div class='del'>-				 i, bcm_sf2_cfp_stats[j].name);</div><div class='del'>-			iter = (i - 1) * s + j;</div><div class='del'>-			strlcpy(data + iter * ETH_GSTRING_LEN,</div><div class='del'>-				buf, ETH_GSTRING_LEN);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	for (i = 1; i &lt; priv-&gt;num_cfp_rules; i++)</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(bcm_sf2_cfp_stats); j++)</div><div class='add'>+			ethtool_sprintf(data, "CFP%03d_%sCntr", i,</div><div class='add'>+					bcm_sf2_cfp_stats[j].name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='head'>diff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h<br/>index d8a5e6269c0e..da0dedbd6555 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/bcm_sf2_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/bcm_sf2_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/bcm_sf2_regs.h</a></div><div class='hunk'>@@ -17,12 +17,18 @@ enum bcm_sf2_reg_offs {</div><div class='ctx'> 	REG_SWITCH_REVISION,</div><div class='ctx'> 	REG_PHY_REVISION,</div><div class='ctx'> 	REG_SPHY_CNTRL,</div><div class='add'>+	REG_CROSSBAR,</div><div class='ctx'> 	REG_RGMII_0_CNTRL,</div><div class='ctx'> 	REG_RGMII_1_CNTRL,</div><div class='ctx'> 	REG_RGMII_2_CNTRL,</div><div class='add'>+	REG_RGMII_11_CNTRL,</div><div class='ctx'> 	REG_LED_0_CNTRL,</div><div class='ctx'> 	REG_LED_1_CNTRL,</div><div class='ctx'> 	REG_LED_2_CNTRL,</div><div class='add'>+	REG_LED_3_CNTRL,</div><div class='add'>+	REG_LED_4_CNTRL,</div><div class='add'>+	REG_LED_5_CNTRL,</div><div class='add'>+	REG_LED_AGGREGATE_CTRL,</div><div class='ctx'> 	REG_SWITCH_REG_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +53,69 @@ enum bcm_sf2_reg_offs {</div><div class='ctx'> #define  PHY_PHYAD_SHIFT		8</div><div class='ctx'> #define  PHY_PHYAD_MASK			0x1F</div><div class='ctx'> </div><div class='del'>-#define REG_RGMII_CNTRL_P(x)		(REG_RGMII_0_CNTRL + (x))</div><div class='add'>+/* Relative to REG_CROSSBAR */</div><div class='add'>+#define CROSSBAR_BCM4908_INT_P7		0</div><div class='add'>+#define CROSSBAR_BCM4908_INT_RUNNER	1</div><div class='add'>+#define CROSSBAR_BCM4908_EXT_SERDES	0</div><div class='add'>+#define CROSSBAR_BCM4908_EXT_GPHY4	1</div><div class='add'>+#define CROSSBAR_BCM4908_EXT_RGMII	2</div><div class='add'>+</div><div class='add'>+/* Relative to REG_LED_*_CNTRL (BCM7278, BCM7445) */</div><div class='add'>+#define  LED_CNTRL_NO_LINK_ENCODE_SHIFT		0</div><div class='add'>+#define  LED_CNTRL_M10_ENCODE_SHIFT		2</div><div class='add'>+#define  LED_CNTRL_M100_ENCODE_SHIFT		4</div><div class='add'>+#define  LED_CNTRL_M1000_ENCODE_SHIFT		6</div><div class='add'>+#define  LED_CNTRL_SEL_NO_LINK_ENCODE_SHIFT	8</div><div class='add'>+#define  LED_CNTRL_SEL_10M_ENCODE_SHIFT		10</div><div class='add'>+#define  LED_CNTRL_SEL_100M_ENCODE_SHIFT	12</div><div class='add'>+#define  LED_CNTRL_SEL_1000M_ENCODE_SHIFT	14</div><div class='add'>+#define  LED_CNTRL_RX_DV_EN			(1 &lt;&lt; 16)</div><div class='add'>+#define  LED_CNTRL_TX_EN_EN			(1 &lt;&lt; 17)</div><div class='add'>+#define  LED_CNTRL_SPDLNK_LED0_ACT_SEL_SHIFT	18</div><div class='add'>+#define  LED_CNTRL_SPDLNK_LED1_ACT_SEL_SHIFT	20</div><div class='add'>+#define  LED_CNTRL_ACT_LED_ACT_SEL_SHIFT	22</div><div class='add'>+#define  LED_CNTRL_SPDLNK_SRC_SEL		(1 &lt;&lt; 24)</div><div class='add'>+#define  LED_CNTRL_SPDLNK_LED0_ACT_POL_SEL	(1 &lt;&lt; 25)</div><div class='add'>+#define  LED_CNTRL_SPDLNK_LED1_ACT_POL_SEL	(1 &lt;&lt; 26)</div><div class='add'>+#define  LED_CNTRL_ACT_LED_POL_SEL		(1 &lt;&lt; 27)</div><div class='add'>+#define  LED_CNTRL_MASK				0x3</div><div class='add'>+</div><div class='add'>+/* Register relative to REG_LED_*_CNTRL (BCM4908) */</div><div class='add'>+#define REG_LED_CTRL				0x0</div><div class='add'>+#define  LED_CTRL_RX_ACT_EN			0x00000001</div><div class='add'>+#define  LED_CTRL_TX_ACT_EN			0x00000002</div><div class='add'>+#define  LED_CTRL_SPDLNK_LED0_ACT_SEL		0x00000004</div><div class='add'>+#define  LED_CTRL_SPDLNK_LED1_ACT_SEL		0x00000008</div><div class='add'>+#define  LED_CTRL_SPDLNK_LED2_ACT_SEL		0x00000010</div><div class='add'>+#define  LED_CTRL_ACT_LED_ACT_SEL		0x00000020</div><div class='add'>+#define  LED_CTRL_SPDLNK_LED0_ACT_POL_SEL	0x00000040</div><div class='add'>+#define  LED_CTRL_SPDLNK_LED1_ACT_POL_SEL	0x00000080</div><div class='add'>+#define  LED_CTRL_SPDLNK_LED2_ACT_POL_SEL	0x00000100</div><div class='add'>+#define  LED_CTRL_ACT_LED_POL_SEL		0x00000200</div><div class='add'>+#define  LED_CTRL_LED_SPD_OVRD			0x00001c00</div><div class='add'>+#define  LED_CTRL_LNK_STATUS_OVRD		0x00002000</div><div class='add'>+#define  LED_CTRL_SPD_OVRD_EN			0x00004000</div><div class='add'>+#define  LED_CTRL_LNK_OVRD_EN			0x00008000</div><div class='add'>+</div><div class='add'>+/* Register relative to REG_LED_*_CNTRL (BCM4908) */</div><div class='add'>+#define REG_LED_LINK_SPEED_ENC_SEL		0x4</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_NO_LINK_SHIFT	0</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_10M_SHIFT	3</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_100M_SHIFT	6</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_1000M_SHIFT	9</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_2500M_SHIFT	12</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_10G_SHIFT	15</div><div class='add'>+#define  LED_LINK_SPEED_ENC_SEL_MASK		0x7</div><div class='add'>+</div><div class='add'>+/* Register relative to REG_LED_*_CNTRL (BCM4908) */</div><div class='add'>+#define REG_LED_LINK_SPEED_ENC			0x8</div><div class='add'>+#define  LED_LINK_SPEED_ENC_NO_LINK_SHIFT	0</div><div class='add'>+#define  LED_LINK_SPEED_ENC_M10_SHIFT		3</div><div class='add'>+#define  LED_LINK_SPEED_ENC_M100_SHIFT		6</div><div class='add'>+#define  LED_LINK_SPEED_ENC_M1000_SHIFT		9</div><div class='add'>+#define  LED_LINK_SPEED_ENC_M2500_SHIFT		12</div><div class='add'>+#define  LED_LINK_SPEED_ENC_M10G_SHIFT		15</div><div class='add'>+#define  LED_LINK_SPEED_ENC_MASK		0x7</div><div class='ctx'> </div><div class='ctx'> /* Relative to REG_RGMII_CNTRL */</div><div class='ctx'> #define  RGMII_MODE_EN			(1 &lt;&lt; 0)</div><div class='hunk'>@@ -66,10 +134,6 @@ enum bcm_sf2_reg_offs {</div><div class='ctx'> #define  LPI_COUNT_SHIFT		9</div><div class='ctx'> #define  LPI_COUNT_MASK			0x3F</div><div class='ctx'> </div><div class='del'>-#define REG_LED_CNTRL(x)		(REG_LED_0_CNTRL + (x))</div><div class='del'>-</div><div class='del'>-#define  SPDLNK_SRC_SEL			(1 &lt;&lt; 24)</div><div class='del'>-</div><div class='ctx'> /* Register set relative to 'INTRL2_0' and 'INTRL2_1' */</div><div class='ctx'> #define INTRL2_CPU_STATUS		0x00</div><div class='ctx'> #define INTRL2_CPU_SET			0x04</div><div class='head'>diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c<br/>index 925ed135a4d9..4a416f2717ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/dsa_loop.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/dsa_loop.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/dsa_loop.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/dsa_loop.c</a></div><div class='hunk'>@@ -14,26 +14,21 @@</div><div class='ctx'> #include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/dsa/loop.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "dsa_loop.h"</div><div class='del'>-</div><div class='del'>-struct dsa_loop_vlan {</div><div class='del'>-	u16 members;</div><div class='del'>-	u16 untagged;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct dsa_loop_mib_entry {</div><div class='del'>-	char name[ETH_GSTRING_LEN];</div><div class='del'>-	unsigned long val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum dsa_loop_mib_counters {</div><div class='del'>-	DSA_LOOP_PHY_READ_OK,</div><div class='del'>-	DSA_LOOP_PHY_READ_ERR,</div><div class='del'>-	DSA_LOOP_PHY_WRITE_OK,</div><div class='del'>-	DSA_LOOP_PHY_WRITE_ERR,</div><div class='del'>-	__DSA_LOOP_CNT_MAX,</div><div class='add'>+#define DSA_LOOP_NUM_PORTS	6</div><div class='add'>+#define DSA_LOOP_CPU_PORT	(DSA_LOOP_NUM_PORTS - 1)</div><div class='add'>+#define NUM_FIXED_PHYS		(DSA_LOOP_NUM_PORTS - 2)</div><div class='add'>+</div><div class='add'>+struct dsa_loop_pdata {</div><div class='add'>+	/* Must be first, such that dsa_register_switch() can access this</div><div class='add'>+	 * without gory pointer manipulations</div><div class='add'>+	 */</div><div class='add'>+	struct dsa_chip_data cd;</div><div class='add'>+	const char *name;</div><div class='add'>+	unsigned int enabled_ports;</div><div class='add'>+	const char *netdev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct dsa_loop_mib_entry dsa_loop_mibs[] = {</div><div class='hunk'>@@ -43,25 +38,59 @@ static struct dsa_loop_mib_entry dsa_loop_mibs[] = {</div><div class='ctx'> 	[DSA_LOOP_PHY_WRITE_ERR] = { "phy_write_err", },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dsa_loop_port {</div><div class='del'>-	struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX];</div><div class='add'>+static struct phy_device *phydevs[PHY_MAX_ADDR];</div><div class='add'>+static struct mdio_device *switch_mdiodev;</div><div class='add'>+</div><div class='add'>+enum dsa_loop_devlink_resource_id {</div><div class='add'>+	DSA_LOOP_DEVLINK_PARAM_ID_VTU,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define DSA_LOOP_VLANS	5</div><div class='add'>+static u64 dsa_loop_devlink_vtu_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_loop_priv *ps = priv;</div><div class='add'>+	unsigned int i, count = 0;</div><div class='add'>+	struct dsa_loop_vlan *vl;</div><div class='ctx'> </div><div class='del'>-struct dsa_loop_priv {</div><div class='del'>-	struct mii_bus	*bus;</div><div class='del'>-	unsigned int	port_base;</div><div class='del'>-	struct dsa_loop_vlan vlans[DSA_LOOP_VLANS];</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	struct dsa_loop_port ports[DSA_MAX_PORTS];</div><div class='del'>-	u16 pvid;</div><div class='del'>-};</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ps-&gt;vlans); i++) {</div><div class='add'>+		vl = &amp;ps-&gt;vlans[i];</div><div class='add'>+		if (vl-&gt;members)</div><div class='add'>+			count++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-static struct phy_device *phydevs[PHY_MAX_ADDR];</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_loop_setup_devlink_resources(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource_size_params size_params;</div><div class='add'>+	struct dsa_loop_priv *ps = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_resource_size_params_init(&amp;size_params, ARRAY_SIZE(ps-&gt;vlans),</div><div class='add'>+					  ARRAY_SIZE(ps-&gt;vlans),</div><div class='add'>+					  1, DEVLINK_RESOURCE_UNIT_ENTRY);</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "VTU", ARRAY_SIZE(ps-&gt;vlans),</div><div class='add'>+					    DSA_LOOP_DEVLINK_PARAM_ID_VTU,</div><div class='add'>+					    DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      DSA_LOOP_DEVLINK_PARAM_ID_VTU,</div><div class='add'>+					      dsa_loop_devlink_vtu_get, ps);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static enum dsa_tag_protocol dsa_loop_get_protocol(struct dsa_switch *ds,</div><div class='del'>-						   int port)</div><div class='add'>+						   int port,</div><div class='add'>+						   enum dsa_tag_protocol mp)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(ds-&gt;dev, "%s: port: %d\n", __func__, port);</div><div class='ctx'> </div><div class='hunk'>@@ -79,7 +108,12 @@ static int dsa_loop_setup(struct dsa_switch *ds)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(ds-&gt;dev, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return dsa_loop_setup_devlink_resources(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_loop_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_loop_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='hunk'>@@ -100,8 +134,7 @@ static void dsa_loop_get_strings(struct dsa_switch *ds, int port,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; __DSA_LOOP_CNT_MAX; i++)</div><div class='del'>-		memcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-		       ps-&gt;ports[port].mib[i].name, ETH_GSTRING_LEN);</div><div class='add'>+		ethtool_puts(&amp;data, ps-&gt;ports[port].mib[i].name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dsa_loop_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -146,19 +179,21 @@ static int dsa_loop_phy_write(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_loop_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-				     struct net_device *bridge)</div><div class='add'>+				     struct dsa_bridge bridge,</div><div class='add'>+				     bool *tx_fwd_offload,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(ds-&gt;dev, "%s: port: %d, bridge: %s\n",</div><div class='del'>-		__func__, port, bridge-&gt;name);</div><div class='add'>+		__func__, port, bridge.dev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dsa_loop_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-				       struct net_device *bridge)</div><div class='add'>+				       struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(ds-&gt;dev, "%s: port: %d, bridge: %s\n",</div><div class='del'>-		__func__, port, bridge-&gt;name);</div><div class='add'>+		__func__, port, bridge.dev-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dsa_loop_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -169,7 +204,8 @@ static void dsa_loop_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_loop_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='del'>-					bool vlan_filtering)</div><div class='add'>+					bool vlan_filtering,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	dev_dbg(ds-&gt;dev, "%s: port: %d, vlan_filtering: %d\n",</div><div class='ctx'> 		__func__, port, vlan_filtering);</div><div class='hunk'>@@ -177,53 +213,37 @@ static int dsa_loop_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			   const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct dsa_loop_priv *ps = ds-&gt;priv;</div><div class='del'>-	struct mii_bus *bus = ps-&gt;bus;</div><div class='del'>-</div><div class='del'>-	dev_dbg(ds-&gt;dev, "%s: port: %d, vlan: %d-%d",</div><div class='del'>-		__func__, port, vlan-&gt;vid_begin, vlan-&gt;vid_end);</div><div class='del'>-</div><div class='del'>-	/* Just do a sleeping operation to make lockdep checks effective */</div><div class='del'>-	mdiobus_read(bus, ps-&gt;port_base + port, MII_BMSR);</div><div class='del'>-</div><div class='del'>-	if (vlan-&gt;vid_end &gt; DSA_LOOP_VLANS)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void dsa_loop_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-				   const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+static int dsa_loop_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+				  const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='ctx'> 	struct dsa_loop_priv *ps = ds-&gt;priv;</div><div class='ctx'> 	struct mii_bus *bus = ps-&gt;bus;</div><div class='ctx'> 	struct dsa_loop_vlan *vl;</div><div class='del'>-	u16 vid;</div><div class='add'>+</div><div class='add'>+	if (vlan-&gt;vid &gt;= ARRAY_SIZE(ps-&gt;vlans))</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	/* Just do a sleeping operation to make lockdep checks effective */</div><div class='ctx'> 	mdiobus_read(bus, ps-&gt;port_base + port, MII_BMSR);</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		vl = &amp;ps-&gt;vlans[vid];</div><div class='add'>+	vl = &amp;ps-&gt;vlans[vlan-&gt;vid];</div><div class='ctx'> </div><div class='del'>-		vl-&gt;members |= BIT(port);</div><div class='del'>-		if (untagged)</div><div class='del'>-			vl-&gt;untagged |= BIT(port);</div><div class='del'>-		else</div><div class='del'>-			vl-&gt;untagged &amp;= ~BIT(port);</div><div class='add'>+	vl-&gt;members |= BIT(port);</div><div class='add'>+	if (untagged)</div><div class='add'>+		vl-&gt;untagged |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		vl-&gt;untagged &amp;= ~BIT(port);</div><div class='ctx'> </div><div class='del'>-		dev_dbg(ds-&gt;dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",</div><div class='del'>-			__func__, port, vid, untagged ? "un" : "", pvid);</div><div class='del'>-	}</div><div class='add'>+	dev_dbg(ds-&gt;dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",</div><div class='add'>+		__func__, port, vlan-&gt;vid, untagged ? "un" : "", pvid);</div><div class='ctx'> </div><div class='ctx'> 	if (pvid)</div><div class='del'>-		ps-&gt;pvid = vid;</div><div class='add'>+		ps-&gt;ports[port].pvid = vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -231,34 +251,56 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> {</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	struct dsa_loop_priv *ps = ds-&gt;priv;</div><div class='add'>+	u16 pvid = ps-&gt;ports[port].pvid;</div><div class='ctx'> 	struct mii_bus *bus = ps-&gt;bus;</div><div class='ctx'> 	struct dsa_loop_vlan *vl;</div><div class='del'>-	u16 vid, pvid = ps-&gt;pvid;</div><div class='ctx'> </div><div class='ctx'> 	/* Just do a sleeping operation to make lockdep checks effective */</div><div class='ctx'> 	mdiobus_read(bus, ps-&gt;port_base + port, MII_BMSR);</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		vl = &amp;ps-&gt;vlans[vid];</div><div class='add'>+	vl = &amp;ps-&gt;vlans[vlan-&gt;vid];</div><div class='ctx'> </div><div class='del'>-		vl-&gt;members &amp;= ~BIT(port);</div><div class='del'>-		if (untagged)</div><div class='del'>-			vl-&gt;untagged &amp;= ~BIT(port);</div><div class='add'>+	vl-&gt;members &amp;= ~BIT(port);</div><div class='add'>+	if (untagged)</div><div class='add'>+		vl-&gt;untagged &amp;= ~BIT(port);</div><div class='ctx'> </div><div class='del'>-		if (pvid == vid)</div><div class='del'>-			pvid = 1;</div><div class='add'>+	if (pvid == vlan-&gt;vid)</div><div class='add'>+		pvid = 1;</div><div class='ctx'> </div><div class='del'>-		dev_dbg(ds-&gt;dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",</div><div class='del'>-			__func__, port, vid, untagged ? "un" : "", pvid);</div><div class='del'>-	}</div><div class='del'>-	ps-&gt;pvid = pvid;</div><div class='add'>+	dev_dbg(ds-&gt;dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n",</div><div class='add'>+		__func__, port, vlan-&gt;vid, untagged ? "un" : "", pvid);</div><div class='add'>+	ps-&gt;ports[port].pvid = pvid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dsa_loop_port_change_mtu(struct dsa_switch *ds, int port,</div><div class='add'>+				    int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct dsa_loop_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ports[port].mtu = new_mtu;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dsa_loop_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return ETH_MAX_MTU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dsa_loop_phylink_get_caps(struct dsa_switch *dsa, int port,</div><div class='add'>+				      struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	bitmap_fill(config-&gt;supported_interfaces, PHY_INTERFACE_MODE_MAX);</div><div class='add'>+	__clear_bit(PHY_INTERFACE_MODE_NA, config-&gt;supported_interfaces);</div><div class='add'>+	config-&gt;mac_capabilities = ~0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops dsa_loop_driver = {</div><div class='ctx'> 	.get_tag_protocol	= dsa_loop_get_protocol,</div><div class='ctx'> 	.setup			= dsa_loop_setup,</div><div class='add'>+	.teardown		= dsa_loop_teardown,</div><div class='ctx'> 	.get_strings		= dsa_loop_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= dsa_loop_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count		= dsa_loop_get_sset_count,</div><div class='hunk'>@@ -269,9 +311,11 @@ static const struct dsa_switch_ops dsa_loop_driver = {</div><div class='ctx'> 	.port_bridge_leave	= dsa_loop_port_bridge_leave,</div><div class='ctx'> 	.port_stp_state_set	= dsa_loop_port_stp_state_set,</div><div class='ctx'> 	.port_vlan_filtering	= dsa_loop_port_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= dsa_loop_port_vlan_prepare,</div><div class='ctx'> 	.port_vlan_add		= dsa_loop_port_vlan_add,</div><div class='ctx'> 	.port_vlan_del		= dsa_loop_port_vlan_del,</div><div class='add'>+	.port_change_mtu	= dsa_loop_port_change_mtu,</div><div class='add'>+	.port_max_mtu		= dsa_loop_port_max_mtu,</div><div class='add'>+	.phylink_get_caps	= dsa_loop_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int dsa_loop_drv_probe(struct mdio_device *mdiodev)</div><div class='hunk'>@@ -279,17 +323,18 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	struct dsa_loop_pdata *pdata = mdiodev-&gt;dev.platform_data;</div><div class='ctx'> 	struct dsa_loop_priv *ps;</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;mdiodev-&gt;dev, "%s: 0x%0x\n",</div><div class='del'>-		 pdata-&gt;name, pdata-&gt;enabled_ports);</div><div class='del'>-</div><div class='del'>-	ds = dsa_switch_alloc(&amp;mdiodev-&gt;dev, DSA_MAX_PORTS);</div><div class='add'>+	ds = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*ds), GFP_KERNEL);</div><div class='ctx'> 	if (!ds)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	ds-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	ds-&gt;num_ports = DSA_LOOP_NUM_PORTS;</div><div class='add'>+</div><div class='ctx'> 	ps = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*ps), GFP_KERNEL);</div><div class='ctx'> 	if (!ps)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -307,52 +352,122 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;mdiodev-&gt;dev, ds);</div><div class='ctx'> </div><div class='del'>-	return dsa_register_switch(ds);</div><div class='add'>+	ret = dsa_register_switch(ds);</div><div class='add'>+	if (!ret)</div><div class='add'>+		dev_info(&amp;mdiodev-&gt;dev, "%s: 0x%0x\n",</div><div class='add'>+			 pdata-&gt;name, pdata-&gt;enabled_ports);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dsa_loop_drv_remove(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='del'>-	struct dsa_loop_priv *ps = ds-&gt;priv;</div><div class='add'>+	struct dsa_loop_priv *ps;</div><div class='add'>+</div><div class='add'>+	if (!ds)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ps = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	dsa_unregister_switch(ds);</div><div class='ctx'> 	dev_put(ps-&gt;netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dsa_loop_drv_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!ds)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mdio_driver dsa_loop_drv = {</div><div class='ctx'> 	.mdiodrv.driver	= {</div><div class='ctx'> 		.name	= "dsa-loop",</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe	= dsa_loop_drv_probe,</div><div class='ctx'> 	.remove	= dsa_loop_drv_remove,</div><div class='add'>+	.shutdown = dsa_loop_drv_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define NUM_FIXED_PHYS	(DSA_LOOP_NUM_PORTS - 2)</div><div class='add'>+static void dsa_loop_phydevs_unregister(void)</div><div class='add'>+{</div><div class='add'>+	for (int i = 0; i &lt; NUM_FIXED_PHYS; i++) {</div><div class='add'>+		if (!IS_ERR(phydevs[i]))</div><div class='add'>+			fixed_phy_unregister(phydevs[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int __init dsa_loop_init(void)</div><div class='add'>+static int __init dsa_loop_create_switch_mdiodev(void)</div><div class='ctx'> {</div><div class='del'>-	struct fixed_phy_status status = {</div><div class='del'>-		.link = 1,</div><div class='del'>-		.speed = SPEED_100,</div><div class='del'>-		.duplex = DUPLEX_FULL,</div><div class='add'>+	static struct dsa_loop_pdata dsa_loop_pdata = {</div><div class='add'>+		.cd = {</div><div class='add'>+			.port_names[0] = "lan1",</div><div class='add'>+			.port_names[1] = "lan2",</div><div class='add'>+			.port_names[2] = "lan3",</div><div class='add'>+			.port_names[3] = "lan4",</div><div class='add'>+			.port_names[DSA_LOOP_CPU_PORT] = "cpu",</div><div class='add'>+		},</div><div class='add'>+		.name = "DSA mockup driver",</div><div class='add'>+		.enabled_ports = 0x1f,</div><div class='add'>+		.netdev = "eth0",</div><div class='ctx'> 	};</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+</div><div class='add'>+	bus = mdio_find_bus("fixed-0");</div><div class='add'>+	if (WARN_ON(!bus))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	switch_mdiodev = mdio_device_create(bus, 31);</div><div class='add'>+	if (IS_ERR(switch_mdiodev))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	strscpy(switch_mdiodev-&gt;modalias, "dsa-loop");</div><div class='add'>+	switch_mdiodev-&gt;dev.platform_data = &amp;dsa_loop_pdata;</div><div class='add'>+</div><div class='add'>+	ret = mdio_device_register(switch_mdiodev);</div><div class='add'>+	if (ret)</div><div class='add'>+		mdio_device_free(switch_mdiodev);</div><div class='add'>+out:</div><div class='add'>+	put_device(&amp;bus-&gt;dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init dsa_loop_init(void)</div><div class='add'>+{</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dsa_loop_create_switch_mdiodev();</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; NUM_FIXED_PHYS; i++)</div><div class='del'>-		phydevs[i] = fixed_phy_register(PHY_POLL, &amp;status, NULL);</div><div class='add'>+		phydevs[i] = fixed_phy_register_100fd();</div><div class='add'>+</div><div class='add'>+	ret = mdio_driver_register(&amp;dsa_loop_drv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dsa_loop_phydevs_unregister();</div><div class='add'>+		mdio_device_remove(switch_mdiodev);</div><div class='add'>+		mdio_device_free(switch_mdiodev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mdio_driver_register(&amp;dsa_loop_drv);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> module_init(dsa_loop_init);</div><div class='ctx'> </div><div class='ctx'> static void __exit dsa_loop_exit(void)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='ctx'> 	mdio_driver_unregister(&amp;dsa_loop_drv);</div><div class='del'>-	for (i = 0; i &lt; NUM_FIXED_PHYS; i++)</div><div class='del'>-		if (!IS_ERR(phydevs[i]))</div><div class='del'>-			fixed_phy_unregister(phydevs[i]);</div><div class='add'>+	dsa_loop_phydevs_unregister();</div><div class='add'>+	mdio_device_remove(switch_mdiodev);</div><div class='add'>+	mdio_device_free(switch_mdiodev);</div><div class='ctx'> }</div><div class='ctx'> module_exit(dsa_loop_exit);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/dsa_loop.h b/drivers/net/dsa/dsa_loop.h<br/>deleted file mode 100644<br/>index 93e5c15d0efd..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/dsa_loop.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/dsa_loop.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef __DSA_LOOP_H</div><div class='del'>-#define __DSA_LOOP_H</div><div class='del'>-</div><div class='del'>-struct dsa_chip_data;</div><div class='del'>-</div><div class='del'>-struct dsa_loop_pdata {</div><div class='del'>-	/* Must be first, such that dsa_register_switch() can access this</div><div class='del'>-	 * without gory pointer manipulations</div><div class='del'>-	 */</div><div class='del'>-	struct dsa_chip_data cd;</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int enabled_ports;</div><div class='del'>-	const char *netdev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DSA_LOOP_NUM_PORTS	6</div><div class='del'>-#define DSA_LOOP_CPU_PORT	(DSA_LOOP_NUM_PORTS - 1)</div><div class='del'>-</div><div class='del'>-#endif /* __DSA_LOOP_H */</div><div class='head'>diff --git a/drivers/net/dsa/dsa_loop_bdinfo.c b/drivers/net/dsa/dsa_loop_bdinfo.c<br/>deleted file mode 100644<br/>index 237066d30704..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/dsa_loop_bdinfo.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/dsa_loop_bdinfo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-</div><div class='del'>-#include "dsa_loop.h"</div><div class='del'>-</div><div class='del'>-static struct dsa_loop_pdata dsa_loop_pdata = {</div><div class='del'>-	.cd = {</div><div class='del'>-		.port_names[0] = "lan1",</div><div class='del'>-		.port_names[1] = "lan2",</div><div class='del'>-		.port_names[2] = "lan3",</div><div class='del'>-		.port_names[3] = "lan4",</div><div class='del'>-		.port_names[DSA_LOOP_CPU_PORT] = "cpu",</div><div class='del'>-	},</div><div class='del'>-	.name = "DSA mockup driver",</div><div class='del'>-	.enabled_ports = 0x1f,</div><div class='del'>-	.netdev = "eth0",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct mdio_board_info bdinfo = {</div><div class='del'>-	.bus_id	= "fixed-0",</div><div class='del'>-	.modalias = "dsa-loop",</div><div class='del'>-	.mdio_addr = 31,</div><div class='del'>-	.platform_data = &amp;dsa_loop_pdata,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init dsa_loop_bdinfo_init(void)</div><div class='del'>-{</div><div class='del'>-	return mdiobus_register_board_info(&amp;bdinfo, 1);</div><div class='del'>-}</div><div class='del'>-arch_initcall(dsa_loop_bdinfo_init)</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/Kconfig b/drivers/net/dsa/hirschmann/Kconfig<br/>new file mode 100644<br/>index 000000000000..9ea2c643f8f8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,11 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+config NET_DSA_HIRSCHMANN_HELLCREEK</div><div class='add'>+	tristate "Hirschmann Hellcreek TSN Switch support"</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+	depends on PTP_1588_CLOCK</div><div class='add'>+	depends on LEDS_CLASS</div><div class='add'>+	depends on NET_SCH_TAPRIO</div><div class='add'>+	select NET_DSA_TAG_HELLCREEK</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for Hirschmann Hellcreek TSN switches.</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/Makefile b/drivers/net/dsa/hirschmann/Makefile<br/>new file mode 100644<br/>index 000000000000..f4075c2998b5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+obj-$(CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK)	+= hellcreek_sw.o</div><div class='add'>+hellcreek_sw-objs := hellcreek.o</div><div class='add'>+hellcreek_sw-objs += hellcreek_ptp.o</div><div class='add'>+hellcreek_sw-objs += hellcreek_hwtstamp.o</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c<br/>new file mode 100644<br/>index 000000000000..dd5f263ab984<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/hellcreek.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/hellcreek.c</a></div><div class='hunk'>@@ -0,0 +1,2117 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/*</div><div class='add'>+ * DSA driver for:</div><div class='add'>+ * Hirschmann Hellcreek TSN switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019-2021 Linutronix GmbH</div><div class='add'>+ * Author Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hellcreek.h"</div><div class='add'>+#include "hellcreek_ptp.h"</div><div class='add'>+#include "hellcreek_hwtstamp.h"</div><div class='add'>+</div><div class='add'>+static const struct hellcreek_counter hellcreek_counter[] = {</div><div class='add'>+	{ 0x00, "RxFiltered", },</div><div class='add'>+	{ 0x01, "RxOctets1k", },</div><div class='add'>+	{ 0x02, "RxVTAG", },</div><div class='add'>+	{ 0x03, "RxL2BAD", },</div><div class='add'>+	{ 0x04, "RxOverloadDrop", },</div><div class='add'>+	{ 0x05, "RxUC", },</div><div class='add'>+	{ 0x06, "RxMC", },</div><div class='add'>+	{ 0x07, "RxBC", },</div><div class='add'>+	{ 0x08, "RxRS&lt;64", },</div><div class='add'>+	{ 0x09, "RxRS64", },</div><div class='add'>+	{ 0x0a, "RxRS65_127", },</div><div class='add'>+	{ 0x0b, "RxRS128_255", },</div><div class='add'>+	{ 0x0c, "RxRS256_511", },</div><div class='add'>+	{ 0x0d, "RxRS512_1023", },</div><div class='add'>+	{ 0x0e, "RxRS1024_1518", },</div><div class='add'>+	{ 0x0f, "RxRS&gt;1518", },</div><div class='add'>+	{ 0x10, "TxTailDropQueue0", },</div><div class='add'>+	{ 0x11, "TxTailDropQueue1", },</div><div class='add'>+	{ 0x12, "TxTailDropQueue2", },</div><div class='add'>+	{ 0x13, "TxTailDropQueue3", },</div><div class='add'>+	{ 0x14, "TxTailDropQueue4", },</div><div class='add'>+	{ 0x15, "TxTailDropQueue5", },</div><div class='add'>+	{ 0x16, "TxTailDropQueue6", },</div><div class='add'>+	{ 0x17, "TxTailDropQueue7", },</div><div class='add'>+	{ 0x18, "RxTrafficClass0", },</div><div class='add'>+	{ 0x19, "RxTrafficClass1", },</div><div class='add'>+	{ 0x1a, "RxTrafficClass2", },</div><div class='add'>+	{ 0x1b, "RxTrafficClass3", },</div><div class='add'>+	{ 0x1c, "RxTrafficClass4", },</div><div class='add'>+	{ 0x1d, "RxTrafficClass5", },</div><div class='add'>+	{ 0x1e, "RxTrafficClass6", },</div><div class='add'>+	{ 0x1f, "RxTrafficClass7", },</div><div class='add'>+	{ 0x21, "TxOctets1k", },</div><div class='add'>+	{ 0x22, "TxVTAG", },</div><div class='add'>+	{ 0x23, "TxL2BAD", },</div><div class='add'>+	{ 0x25, "TxUC", },</div><div class='add'>+	{ 0x26, "TxMC", },</div><div class='add'>+	{ 0x27, "TxBC", },</div><div class='add'>+	{ 0x28, "TxTS&lt;64", },</div><div class='add'>+	{ 0x29, "TxTS64", },</div><div class='add'>+	{ 0x2a, "TxTS65_127", },</div><div class='add'>+	{ 0x2b, "TxTS128_255", },</div><div class='add'>+	{ 0x2c, "TxTS256_511", },</div><div class='add'>+	{ 0x2d, "TxTS512_1023", },</div><div class='add'>+	{ 0x2e, "TxTS1024_1518", },</div><div class='add'>+	{ 0x2f, "TxTS&gt;1518", },</div><div class='add'>+	{ 0x30, "TxTrafficClassOverrun0", },</div><div class='add'>+	{ 0x31, "TxTrafficClassOverrun1", },</div><div class='add'>+	{ 0x32, "TxTrafficClassOverrun2", },</div><div class='add'>+	{ 0x33, "TxTrafficClassOverrun3", },</div><div class='add'>+	{ 0x34, "TxTrafficClassOverrun4", },</div><div class='add'>+	{ 0x35, "TxTrafficClassOverrun5", },</div><div class='add'>+	{ 0x36, "TxTrafficClassOverrun6", },</div><div class='add'>+	{ 0x37, "TxTrafficClassOverrun7", },</div><div class='add'>+	{ 0x38, "TxTrafficClass0", },</div><div class='add'>+	{ 0x39, "TxTrafficClass1", },</div><div class='add'>+	{ 0x3a, "TxTrafficClass2", },</div><div class='add'>+	{ 0x3b, "TxTrafficClass3", },</div><div class='add'>+	{ 0x3c, "TxTrafficClass4", },</div><div class='add'>+	{ 0x3d, "TxTrafficClass5", },</div><div class='add'>+	{ 0x3e, "TxTrafficClass6", },</div><div class='add'>+	{ 0x3f, "TxTrafficClass7", },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u16 hellcreek_read(struct hellcreek *hellcreek, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readw(hellcreek-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 hellcreek_read_ctrl(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	return readw(hellcreek-&gt;base + HR_CTRL_C);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 hellcreek_read_stat(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	return readw(hellcreek-&gt;base + HR_SWSTAT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_write(struct hellcreek *hellcreek, u16 data,</div><div class='add'>+			    unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	writew(data, hellcreek-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_port(struct hellcreek *hellcreek, int port)</div><div class='add'>+{</div><div class='add'>+	u16 val = port &lt;&lt; HR_PSEL_PTWSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PSEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_prio(struct hellcreek *hellcreek, int prio)</div><div class='add'>+{</div><div class='add'>+	u16 val = prio &lt;&lt; HR_PSEL_PRTCWSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PSEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_port_prio(struct hellcreek *hellcreek, int port,</div><div class='add'>+				       int prio)</div><div class='add'>+{</div><div class='add'>+	u16 val = port &lt;&lt; HR_PSEL_PTWSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	val |= prio &lt;&lt; HR_PSEL_PRTCWSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PSEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_counter(struct hellcreek *hellcreek, int counter)</div><div class='add'>+{</div><div class='add'>+	u16 val = counter &lt;&lt; HR_CSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_CSEL);</div><div class='add'>+</div><div class='add'>+	/* Data sheet states to wait at least 20 internal clock cycles */</div><div class='add'>+	ndelay(200);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_vlan(struct hellcreek *hellcreek, int vid,</div><div class='add'>+				  bool pvid)</div><div class='add'>+{</div><div class='add'>+	u16 val = 0;</div><div class='add'>+</div><div class='add'>+	/* Set pvid bit first */</div><div class='add'>+	if (pvid)</div><div class='add'>+		val |= HR_VIDCFG_PVID;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_VIDCFG);</div><div class='add'>+</div><div class='add'>+	/* Set vlan */</div><div class='add'>+	val |= vid &lt;&lt; HR_VIDCFG_VID_SHIFT;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_VIDCFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_tgd(struct hellcreek *hellcreek, int port)</div><div class='add'>+{</div><div class='add'>+	u16 val = port &lt;&lt; TR_TGDSEL_TDGSEL_SHIFT;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, TR_TGDSEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_wait_until_ready(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	/* Wait up to 1ms, although 3 us should be enough */</div><div class='add'>+	return readx_poll_timeout(hellcreek_read_ctrl, hellcreek,</div><div class='add'>+				  val, val &amp; HR_CTRL_C_READY,</div><div class='add'>+				  3, 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_wait_until_transitioned(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout_atomic(hellcreek_read_ctrl, hellcreek,</div><div class='add'>+					 val, !(val &amp; HR_CTRL_C_TRANSITION),</div><div class='add'>+					 1, 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_wait_fdb_ready(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout_atomic(hellcreek_read_stat, hellcreek,</div><div class='add'>+					 val, !(val &amp; HR_SWSTAT_BUSY),</div><div class='add'>+					 1, 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_detect(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	u16 id, rel_low, rel_high, date_low, date_high, tgd_ver;</div><div class='add'>+	u8 tgd_maj, tgd_min;</div><div class='add'>+	u32 rel, date;</div><div class='add'>+</div><div class='add'>+	id	  = hellcreek_read(hellcreek, HR_MODID_C);</div><div class='add'>+	rel_low	  = hellcreek_read(hellcreek, HR_REL_L_C);</div><div class='add'>+	rel_high  = hellcreek_read(hellcreek, HR_REL_H_C);</div><div class='add'>+	date_low  = hellcreek_read(hellcreek, HR_BLD_L_C);</div><div class='add'>+	date_high = hellcreek_read(hellcreek, HR_BLD_H_C);</div><div class='add'>+	tgd_ver   = hellcreek_read(hellcreek, TR_TGDVER);</div><div class='add'>+</div><div class='add'>+	if (id != hellcreek-&gt;pdata-&gt;module_id)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	rel	= rel_low | (rel_high &lt;&lt; 16);</div><div class='add'>+	date	= date_low | (date_high &lt;&lt; 16);</div><div class='add'>+	tgd_maj = (tgd_ver &amp; TR_TGDVER_REV_MAJ_MASK) &gt;&gt; TR_TGDVER_REV_MAJ_SHIFT;</div><div class='add'>+	tgd_min = (tgd_ver &amp; TR_TGDVER_REV_MIN_MASK) &gt;&gt; TR_TGDVER_REV_MIN_SHIFT;</div><div class='add'>+</div><div class='add'>+	dev_info(hellcreek-&gt;dev, "Module ID=%02x Release=%04x Date=%04x TGD Version=%02x.%02x\n",</div><div class='add'>+		 id, rel, date, tgd_maj, tgd_min);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_feature_detect(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	u16 features;</div><div class='add'>+</div><div class='add'>+	features = hellcreek_read(hellcreek, HR_FEABITS0);</div><div class='add'>+</div><div class='add'>+	/* Only detect the size of the FDB table. The size and current</div><div class='add'>+	 * utilization can be queried via devlink.</div><div class='add'>+	 */</div><div class='add'>+	hellcreek-&gt;fdb_entries = ((features &amp; HR_FEABITS0_FDBBINS_MASK) &gt;&gt;</div><div class='add'>+			       HR_FEABITS0_FDBBINS_SHIFT) * 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol hellcreek_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+							int port,</div><div class='add'>+							enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_HELLCREEK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Enable port %d\n", port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	val = hellcreek_port-&gt;ptcfg;</div><div class='add'>+	val |= HR_PTCFG_ADMIN_EN;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PTCFG);</div><div class='add'>+	hellcreek_port-&gt;ptcfg = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Disable port %d\n", port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	val = hellcreek_port-&gt;ptcfg;</div><div class='add'>+	val &amp;= ~HR_PTCFG_ADMIN_EN;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PTCFG);</div><div class='add'>+	hellcreek_port-&gt;ptcfg = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_get_strings(struct dsa_switch *ds, int port,</div><div class='add'>+				  u32 stringset, uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hellcreek_counter); ++i)</div><div class='add'>+		ethtool_puts(&amp;data, hellcreek_counter[i].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ARRAY_SIZE(hellcreek_counter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+					uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hellcreek_counter); ++i) {</div><div class='add'>+		const struct hellcreek_counter *counter = &amp;hellcreek_counter[i];</div><div class='add'>+		u8 offset = counter-&gt;offset + port * 64;</div><div class='add'>+		u16 high, low;</div><div class='add'>+		u64 value;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+		hellcreek_select_counter(hellcreek, offset);</div><div class='add'>+</div><div class='add'>+		/* The registers are locked internally by selecting the</div><div class='add'>+		 * counter. So low and high can be read without reading high</div><div class='add'>+		 * again.</div><div class='add'>+		 */</div><div class='add'>+		high  = hellcreek_read(hellcreek, HR_CRDH);</div><div class='add'>+		low   = hellcreek_read(hellcreek, HR_CRDL);</div><div class='add'>+		value = ((u64)high &lt;&lt; 16) | low;</div><div class='add'>+</div><div class='add'>+		hellcreek_port-&gt;counter_values[i] += value;</div><div class='add'>+		data[i] = hellcreek_port-&gt;counter_values[i];</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 hellcreek_private_vid(int port)</div><div class='add'>+{</div><div class='add'>+	return VLAN_N_VID - port + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='add'>+				  const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "VLAN prepare for port %d\n", port);</div><div class='add'>+</div><div class='add'>+	/* Restriction: Make sure that nobody uses the "private" VLANs. These</div><div class='add'>+	 * VLANs are internally used by the driver to ensure port</div><div class='add'>+	 * separation. Thus, they cannot be used by someone else.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; hellcreek-&gt;pdata-&gt;num_ports; ++i) {</div><div class='add'>+		const u16 restricted_vid = hellcreek_private_vid(i);</div><div class='add'>+</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (vlan-&gt;vid == restricted_vid) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "VID restricted by driver");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_select_vlan_params(struct hellcreek *hellcreek, int port,</div><div class='add'>+					 int *shift, int *mask)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+		*shift = HR_VIDMBRCFG_P0MBR_SHIFT;</div><div class='add'>+		*mask  = HR_VIDMBRCFG_P0MBR_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		*shift = HR_VIDMBRCFG_P1MBR_SHIFT;</div><div class='add'>+		*mask  = HR_VIDMBRCFG_P1MBR_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		*shift = HR_VIDMBRCFG_P2MBR_SHIFT;</div><div class='add'>+		*mask  = HR_VIDMBRCFG_P2MBR_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		*shift = HR_VIDMBRCFG_P3MBR_SHIFT;</div><div class='add'>+		*mask  = HR_VIDMBRCFG_P3MBR_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*shift = *mask = 0;</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "Unknown port %d selected!\n", port);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_apply_vlan(struct hellcreek *hellcreek, int port, u16 vid,</div><div class='add'>+				 bool pvid, bool untagged)</div><div class='add'>+{</div><div class='add'>+	int shift, mask;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Apply VLAN: port=%d vid=%u pvid=%d untagged=%d",</div><div class='add'>+		port, vid, pvid, untagged);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	hellcreek_select_vlan(hellcreek, vid, pvid);</div><div class='add'>+</div><div class='add'>+	/* Setup port vlan membership */</div><div class='add'>+	hellcreek_select_vlan_params(hellcreek, port, &amp;shift, &amp;mask);</div><div class='add'>+	val = hellcreek-&gt;vidmbrcfg[vid];</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+	if (untagged)</div><div class='add'>+		val |= HELLCREEK_VLAN_UNTAGGED_MEMBER &lt;&lt; shift;</div><div class='add'>+	else</div><div class='add'>+		val |= HELLCREEK_VLAN_TAGGED_MEMBER &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_VIDMBRCFG);</div><div class='add'>+	hellcreek-&gt;vidmbrcfg[vid] = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_unapply_vlan(struct hellcreek *hellcreek, int port,</div><div class='add'>+				   u16 vid)</div><div class='add'>+{</div><div class='add'>+	int shift, mask;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Unapply VLAN: port=%d vid=%u\n", port, vid);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_vlan(hellcreek, vid, false);</div><div class='add'>+</div><div class='add'>+	/* Setup port vlan membership */</div><div class='add'>+	hellcreek_select_vlan_params(hellcreek, port, &amp;shift, &amp;mask);</div><div class='add'>+	val = hellcreek-&gt;vidmbrcfg[vid];</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+	val |= HELLCREEK_VLAN_NO_MEMBER &lt;&lt; shift;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_VIDMBRCFG);</div><div class='add'>+	hellcreek-&gt;vidmbrcfg[vid] = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			      const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hellcreek_vlan_prepare(ds, port, vlan, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Add VLAN %d on port %d, %s, %s\n",</div><div class='add'>+		vlan-&gt;vid, port, untagged ? "untagged" : "tagged",</div><div class='add'>+		pvid ? "PVID" : "no PVID");</div><div class='add'>+</div><div class='add'>+	hellcreek_apply_vlan(hellcreek, port, vlan-&gt;vid, pvid, untagged);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			      const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Remove VLAN %d on port %d\n", vlan-&gt;vid, port);</div><div class='add'>+</div><div class='add'>+	hellcreek_unapply_vlan(hellcreek, port, vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+					 u8 state)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	const char *new_state;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+	val = hellcreek_port-&gt;ptcfg;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		new_state = "DISABLED";</div><div class='add'>+		val |= HR_PTCFG_BLOCKED;</div><div class='add'>+		val &amp;= ~HR_PTCFG_LEARNING_EN;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		new_state = "BLOCKING";</div><div class='add'>+		val |= HR_PTCFG_BLOCKED;</div><div class='add'>+		val &amp;= ~HR_PTCFG_LEARNING_EN;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		new_state = "LISTENING";</div><div class='add'>+		val |= HR_PTCFG_BLOCKED;</div><div class='add'>+		val &amp;= ~HR_PTCFG_LEARNING_EN;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		new_state = "LEARNING";</div><div class='add'>+		val |= HR_PTCFG_BLOCKED;</div><div class='add'>+		val |= HR_PTCFG_LEARNING_EN;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		new_state = "FORWARDING";</div><div class='add'>+		val &amp;= ~HR_PTCFG_BLOCKED;</div><div class='add'>+		val |= HR_PTCFG_LEARNING_EN;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		new_state = "UNKNOWN";</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PTCFG);</div><div class='add'>+	hellcreek_port-&gt;ptcfg = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Configured STP state for port %d: %s\n",</div><div class='add'>+		port, new_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_setup_ingressflt(struct hellcreek *hellcreek, int port,</div><div class='add'>+				       bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port *hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+	u16 ptcfg;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	ptcfg = hellcreek_port-&gt;ptcfg;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		ptcfg |= HR_PTCFG_INGRESSFLT;</div><div class='add'>+	else</div><div class='add'>+		ptcfg &amp;= ~HR_PTCFG_INGRESSFLT;</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	hellcreek_write(hellcreek, ptcfg, HR_PTCFG);</div><div class='add'>+	hellcreek_port-&gt;ptcfg = ptcfg;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_setup_vlan_awareness(struct hellcreek *hellcreek,</div><div class='add'>+					   bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 swcfg;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	swcfg = hellcreek-&gt;swcfg;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		swcfg |= HR_SWCFG_VLAN_UNAWARE;</div><div class='add'>+	else</div><div class='add'>+		swcfg &amp;= ~HR_SWCFG_VLAN_UNAWARE;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, swcfg, HR_SWCFG);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Default setup for DSA: VLAN &lt;X&gt;: CPU and Port &lt;X&gt; egress untagged. */</div><div class='add'>+static void hellcreek_setup_vlan_membership(struct dsa_switch *ds, int port,</div><div class='add'>+					    bool enabled)</div><div class='add'>+{</div><div class='add'>+	const u16 vid = hellcreek_private_vid(port);</div><div class='add'>+	int upstream = dsa_upstream_port(ds, port);</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Apply vid to port as egress untagged and port vlan id */</div><div class='add'>+	if (enabled)</div><div class='add'>+		hellcreek_apply_vlan(hellcreek, port, vid, true, true);</div><div class='add'>+	else</div><div class='add'>+		hellcreek_unapply_vlan(hellcreek, port, vid);</div><div class='add'>+</div><div class='add'>+	/* Apply vid to cpu port as well */</div><div class='add'>+	if (enabled)</div><div class='add'>+		hellcreek_apply_vlan(hellcreek, upstream, vid, false, true);</div><div class='add'>+	else</div><div class='add'>+		hellcreek_unapply_vlan(hellcreek, upstream, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_port_set_ucast_flood(struct hellcreek *hellcreek,</div><div class='add'>+					   int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "%s unicast flooding on port %d\n",</div><div class='add'>+		enable ? "Enable" : "Disable", port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	val = hellcreek_port-&gt;ptcfg;</div><div class='add'>+	if (enable)</div><div class='add'>+		val &amp;= ~HR_PTCFG_UUC_FLT;</div><div class='add'>+	else</div><div class='add'>+		val |= HR_PTCFG_UUC_FLT;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PTCFG);</div><div class='add'>+	hellcreek_port-&gt;ptcfg = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_port_set_mcast_flood(struct hellcreek *hellcreek,</div><div class='add'>+					   int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "%s multicast flooding on port %d\n",</div><div class='add'>+		enable ? "Enable" : "Disable", port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, port);</div><div class='add'>+	val = hellcreek_port-&gt;ptcfg;</div><div class='add'>+	if (enable)</div><div class='add'>+		val &amp;= ~HR_PTCFG_UMC_FLT;</div><div class='add'>+	else</div><div class='add'>+		val |= HR_PTCFG_UMC_FLT;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_PTCFG);</div><div class='add'>+	hellcreek_port-&gt;ptcfg = val;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				      struct switchdev_brport_flags flags,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_FLOOD | BR_MCAST_FLOOD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct switchdev_brport_flags flags,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD)</div><div class='add'>+		hellcreek_port_set_ucast_flood(hellcreek, port,</div><div class='add'>+					       !!(flags.val &amp; BR_FLOOD));</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_MCAST_FLOOD)</div><div class='add'>+		hellcreek_port_set_mcast_flood(hellcreek, port,</div><div class='add'>+					       !!(flags.val &amp; BR_MCAST_FLOOD));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+				      struct dsa_bridge bridge,</div><div class='add'>+				      bool *tx_fwd_offload,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Port %d joins a bridge\n", port);</div><div class='add'>+</div><div class='add'>+	/* When joining a vlan_filtering bridge, keep the switch VLAN aware */</div><div class='add'>+	if (!ds-&gt;vlan_filtering)</div><div class='add'>+		hellcreek_setup_vlan_awareness(hellcreek, false);</div><div class='add'>+</div><div class='add'>+	/* Drop private vlans */</div><div class='add'>+	hellcreek_setup_vlan_membership(ds, port, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+					struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Port %d leaves a bridge\n", port);</div><div class='add'>+</div><div class='add'>+	/* Enable VLAN awareness */</div><div class='add'>+	hellcreek_setup_vlan_awareness(hellcreek, true);</div><div class='add'>+</div><div class='add'>+	/* Enable private vlans */</div><div class='add'>+	hellcreek_setup_vlan_membership(ds, port, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __hellcreek_fdb_add(struct hellcreek *hellcreek,</div><div class='add'>+			       const struct hellcreek_fdb_entry *entry)</div><div class='add'>+{</div><div class='add'>+	u16 meta = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Add static FDB entry: MAC=%pM, MASK=0x%02x, "</div><div class='add'>+		"OBT=%d, PASS_BLOCKED=%d, REPRIO_EN=%d, PRIO=%d\n", entry-&gt;mac,</div><div class='add'>+		entry-&gt;portmask, entry-&gt;is_obt, entry-&gt;pass_blocked,</div><div class='add'>+		entry-&gt;reprio_en, entry-&gt;reprio_tc);</div><div class='add'>+</div><div class='add'>+	/* Add mac address */</div><div class='add'>+	hellcreek_write(hellcreek, entry-&gt;mac[1] | (entry-&gt;mac[0] &lt;&lt; 8), HR_FDBWDH);</div><div class='add'>+	hellcreek_write(hellcreek, entry-&gt;mac[3] | (entry-&gt;mac[2] &lt;&lt; 8), HR_FDBWDM);</div><div class='add'>+	hellcreek_write(hellcreek, entry-&gt;mac[5] | (entry-&gt;mac[4] &lt;&lt; 8), HR_FDBWDL);</div><div class='add'>+</div><div class='add'>+	/* Meta data */</div><div class='add'>+	meta |= entry-&gt;portmask &lt;&lt; HR_FDBWRM0_PORTMASK_SHIFT;</div><div class='add'>+	if (entry-&gt;is_obt)</div><div class='add'>+		meta |= HR_FDBWRM0_OBT;</div><div class='add'>+	if (entry-&gt;pass_blocked)</div><div class='add'>+		meta |= HR_FDBWRM0_PASS_BLOCKED;</div><div class='add'>+	if (entry-&gt;reprio_en) {</div><div class='add'>+		meta |= HR_FDBWRM0_REPRIO_EN;</div><div class='add'>+		meta |= entry-&gt;reprio_tc &lt;&lt; HR_FDBWRM0_REPRIO_TC_SHIFT;</div><div class='add'>+	}</div><div class='add'>+	hellcreek_write(hellcreek, meta, HR_FDBWRM0);</div><div class='add'>+</div><div class='add'>+	/* Commit */</div><div class='add'>+	hellcreek_write(hellcreek, 0x00, HR_FDBWRCMD);</div><div class='add'>+</div><div class='add'>+	/* Wait until done */</div><div class='add'>+	return hellcreek_wait_fdb_ready(hellcreek);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __hellcreek_fdb_del(struct hellcreek *hellcreek,</div><div class='add'>+			       const struct hellcreek_fdb_entry *entry)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Delete FDB entry: MAC=%pM!\n", entry-&gt;mac);</div><div class='add'>+</div><div class='add'>+	/* Delete by matching idx */</div><div class='add'>+	hellcreek_write(hellcreek, entry-&gt;idx | HR_FDBWRCMD_FDBDEL, HR_FDBWRCMD);</div><div class='add'>+</div><div class='add'>+	/* Wait until done */</div><div class='add'>+	return hellcreek_wait_fdb_ready(hellcreek);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_populate_fdb_entry(struct hellcreek *hellcreek,</div><div class='add'>+					 struct hellcreek_fdb_entry *entry,</div><div class='add'>+					 size_t idx)</div><div class='add'>+{</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+	u16 meta, mac;</div><div class='add'>+</div><div class='add'>+	/* Read values */</div><div class='add'>+	meta	= hellcreek_read(hellcreek, HR_FDBMDRD);</div><div class='add'>+	mac	= hellcreek_read(hellcreek, HR_FDBRDL);</div><div class='add'>+	addr[5] = mac &amp; 0xff;</div><div class='add'>+	addr[4] = (mac &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+	mac	= hellcreek_read(hellcreek, HR_FDBRDM);</div><div class='add'>+	addr[3] = mac &amp; 0xff;</div><div class='add'>+	addr[2] = (mac &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+	mac	= hellcreek_read(hellcreek, HR_FDBRDH);</div><div class='add'>+	addr[1] = mac &amp; 0xff;</div><div class='add'>+	addr[0] = (mac &amp; 0xff00) &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+	/* Populate @entry */</div><div class='add'>+	memcpy(entry-&gt;mac, addr, sizeof(addr));</div><div class='add'>+	entry-&gt;idx	    = idx;</div><div class='add'>+	entry-&gt;portmask	    = (meta &amp; HR_FDBMDRD_PORTMASK_MASK) &gt;&gt;</div><div class='add'>+		HR_FDBMDRD_PORTMASK_SHIFT;</div><div class='add'>+	entry-&gt;age	    = (meta &amp; HR_FDBMDRD_AGE_MASK) &gt;&gt;</div><div class='add'>+		HR_FDBMDRD_AGE_SHIFT;</div><div class='add'>+	entry-&gt;is_obt	    = !!(meta &amp; HR_FDBMDRD_OBT);</div><div class='add'>+	entry-&gt;pass_blocked = !!(meta &amp; HR_FDBMDRD_PASS_BLOCKED);</div><div class='add'>+	entry-&gt;is_static    = !!(meta &amp; HR_FDBMDRD_STATIC);</div><div class='add'>+	entry-&gt;reprio_tc    = (meta &amp; HR_FDBMDRD_REPRIO_TC_MASK) &gt;&gt;</div><div class='add'>+		HR_FDBMDRD_REPRIO_TC_SHIFT;</div><div class='add'>+	entry-&gt;reprio_en    = !!(meta &amp; HR_FDBMDRD_REPRIO_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Retrieve the index of a FDB entry by mac address. Currently we search through</div><div class='add'>+ * the complete table in hardware. If that's too slow, we might have to cache</div><div class='add'>+ * the complete FDB table in software.</div><div class='add'>+ */</div><div class='add'>+static int hellcreek_fdb_get(struct hellcreek *hellcreek,</div><div class='add'>+			     const unsigned char *dest,</div><div class='add'>+			     struct hellcreek_fdb_entry *entry)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	/* Set read pointer to zero: The read of HR_FDBMAX (read-only register)</div><div class='add'>+	 * should reset the internal pointer. But, that doesn't work. The vendor</div><div class='add'>+	 * suggested a subsequent write as workaround. Same for HR_FDBRDH below.</div><div class='add'>+	 */</div><div class='add'>+	hellcreek_read(hellcreek, HR_FDBMAX);</div><div class='add'>+	hellcreek_write(hellcreek, 0x00, HR_FDBMAX);</div><div class='add'>+</div><div class='add'>+	/* We have to read the complete table, because the switch/driver might</div><div class='add'>+	 * enter new entries anywhere.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; hellcreek-&gt;fdb_entries; ++i) {</div><div class='add'>+		struct hellcreek_fdb_entry tmp = { 0 };</div><div class='add'>+</div><div class='add'>+		/* Read entry */</div><div class='add'>+		hellcreek_populate_fdb_entry(hellcreek, &amp;tmp, i);</div><div class='add'>+</div><div class='add'>+		/* Force next entry */</div><div class='add'>+		hellcreek_write(hellcreek, 0x00, HR_FDBRDH);</div><div class='add'>+</div><div class='add'>+		if (memcmp(tmp.mac, dest, ETH_ALEN))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Match found */</div><div class='add'>+		memcpy(entry, &amp;tmp, sizeof(*entry));</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			     const unsigned char *addr, u16 vid,</div><div class='add'>+			     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_fdb_entry entry = { 0 };</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Add FDB entry for MAC=%pM\n", addr);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_fdb_get(hellcreek, addr, &amp;entry);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Not found */</div><div class='add'>+		memcpy(entry.mac, addr, sizeof(entry.mac));</div><div class='add'>+		entry.portmask = BIT(port);</div><div class='add'>+</div><div class='add'>+		ret = __hellcreek_fdb_add(hellcreek, &amp;entry);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(hellcreek-&gt;dev, "Failed to add FDB entry!\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Found */</div><div class='add'>+		ret = __hellcreek_fdb_del(hellcreek, &amp;entry);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(hellcreek-&gt;dev, "Failed to delete FDB entry!\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		entry.portmask |= BIT(port);</div><div class='add'>+</div><div class='add'>+		ret = __hellcreek_fdb_add(hellcreek, &amp;entry);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(hellcreek-&gt;dev, "Failed to add FDB entry!\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			     const unsigned char *addr, u16 vid,</div><div class='add'>+			     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_fdb_entry entry = { 0 };</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Delete FDB entry for MAC=%pM\n", addr);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_fdb_get(hellcreek, addr, &amp;entry);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* Not found */</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "FDB entry for deletion not found!\n");</div><div class='add'>+	} else {</div><div class='add'>+		/* Found */</div><div class='add'>+		ret = __hellcreek_fdb_del(hellcreek, &amp;entry);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(hellcreek-&gt;dev, "Failed to delete FDB entry!\n");</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		entry.portmask &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+		if (entry.portmask != 0x00) {</div><div class='add'>+			ret = __hellcreek_fdb_add(hellcreek, &amp;entry);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(hellcreek-&gt;dev, "Failed to add FDB entry!\n");</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			      dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	u16 entries;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	/* Set read pointer to zero: The read of HR_FDBMAX (read-only register)</div><div class='add'>+	 * should reset the internal pointer. But, that doesn't work. The vendor</div><div class='add'>+	 * suggested a subsequent write as workaround. Same for HR_FDBRDH below.</div><div class='add'>+	 */</div><div class='add'>+	entries = hellcreek_read(hellcreek, HR_FDBMAX);</div><div class='add'>+	hellcreek_write(hellcreek, 0x00, HR_FDBMAX);</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "FDB dump for port %d, entries=%d!\n", port, entries);</div><div class='add'>+</div><div class='add'>+	/* Read table */</div><div class='add'>+	for (i = 0; i &lt; hellcreek-&gt;fdb_entries; ++i) {</div><div class='add'>+		struct hellcreek_fdb_entry entry = { 0 };</div><div class='add'>+</div><div class='add'>+		/* Read entry */</div><div class='add'>+		hellcreek_populate_fdb_entry(hellcreek, &amp;entry, i);</div><div class='add'>+</div><div class='add'>+		/* Force next entry */</div><div class='add'>+		hellcreek_write(hellcreek, 0x00, HR_FDBRDH);</div><div class='add'>+</div><div class='add'>+		/* Check valid */</div><div class='add'>+		if (is_zero_ether_addr(entry.mac))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Check port mask */</div><div class='add'>+		if (!(entry.portmask &amp; BIT(port)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = cb(entry.mac, 0, entry.is_static, data);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+				    bool vlan_filtering,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "%s VLAN filtering on port %d\n",</div><div class='add'>+		vlan_filtering ? "Enable" : "Disable", port);</div><div class='add'>+</div><div class='add'>+	/* Configure port to drop packages with not known vids */</div><div class='add'>+	hellcreek_setup_ingressflt(hellcreek, port, vlan_filtering);</div><div class='add'>+</div><div class='add'>+	/* Enable VLAN awareness on the switch. This save due to</div><div class='add'>+	 * ds-&gt;vlan_filtering_is_global.</div><div class='add'>+	 */</div><div class='add'>+	hellcreek_setup_vlan_awareness(hellcreek, vlan_filtering);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_enable_ip_core(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	val = hellcreek_read(hellcreek, HR_CTRL_C);</div><div class='add'>+	val |= HR_CTRL_C_ENABLE;</div><div class='add'>+	hellcreek_write(hellcreek, val, HR_CTRL_C);</div><div class='add'>+	ret = hellcreek_wait_until_transitioned(hellcreek);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_setup_cpu_and_tunnel_port(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port *tunnel_port = &amp;hellcreek-&gt;ports[TUNNEL_PORT];</div><div class='add'>+	struct hellcreek_port *cpu_port = &amp;hellcreek-&gt;ports[CPU_PORT];</div><div class='add'>+	u16 ptcfg = 0;</div><div class='add'>+</div><div class='add'>+	ptcfg |= HR_PTCFG_LEARNING_EN | HR_PTCFG_ADMIN_EN;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, CPU_PORT);</div><div class='add'>+	hellcreek_write(hellcreek, ptcfg, HR_PTCFG);</div><div class='add'>+</div><div class='add'>+	hellcreek_select_port(hellcreek, TUNNEL_PORT);</div><div class='add'>+	hellcreek_write(hellcreek, ptcfg, HR_PTCFG);</div><div class='add'>+</div><div class='add'>+	cpu_port-&gt;ptcfg	   = ptcfg;</div><div class='add'>+	tunnel_port-&gt;ptcfg = ptcfg;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_setup_tc_identity_mapping(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* The switch has multiple egress queues per port. The queue is selected</div><div class='add'>+	 * via the PCP field in the VLAN header. The switch internally deals</div><div class='add'>+	 * with traffic classes instead of PCP values and this mapping is</div><div class='add'>+	 * configurable.</div><div class='add'>+	 *</div><div class='add'>+	 * The default mapping is (PCP - TC):</div><div class='add'>+	 *  7 - 7</div><div class='add'>+	 *  6 - 6</div><div class='add'>+	 *  5 - 5</div><div class='add'>+	 *  4 - 4</div><div class='add'>+	 *  3 - 3</div><div class='add'>+	 *  2 - 1</div><div class='add'>+	 *  1 - 0</div><div class='add'>+	 *  0 - 2</div><div class='add'>+	 *</div><div class='add'>+	 * The default should be an identity mapping.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; ++i) {</div><div class='add'>+		mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+		hellcreek_select_prio(hellcreek, i);</div><div class='add'>+		hellcreek_write(hellcreek,</div><div class='add'>+				i &lt;&lt; HR_PRTCCFG_PCP_TC_MAP_SHIFT,</div><div class='add'>+				HR_PRTCCFG);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_setup_fdb(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	static const struct hellcreek_fdb_entry l2_ptp = {</div><div class='add'>+		/* MAC: 01-1B-19-00-00-00 */</div><div class='add'>+		.mac	      = { 0x01, 0x1b, 0x19, 0x00, 0x00, 0x00 },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 0,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,	/* TC: 6 as per IEEE 802.1AS */</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	static const struct hellcreek_fdb_entry udp4_ptp = {</div><div class='add'>+		/* MAC: 01-00-5E-00-01-81 */</div><div class='add'>+		.mac	      = { 0x01, 0x00, 0x5e, 0x00, 0x01, 0x81 },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 0,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	static const struct hellcreek_fdb_entry udp6_ptp = {</div><div class='add'>+		/* MAC: 33-33-00-00-01-81 */</div><div class='add'>+		.mac	      = { 0x33, 0x33, 0x00, 0x00, 0x01, 0x81 },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 0,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	static const struct hellcreek_fdb_entry l2_p2p = {</div><div class='add'>+		/* MAC: 01-80-C2-00-00-0E */</div><div class='add'>+		.mac	      = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 1,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,	/* TC: 6 as per IEEE 802.1AS */</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	static const struct hellcreek_fdb_entry udp4_p2p = {</div><div class='add'>+		/* MAC: 01-00-5E-00-00-6B */</div><div class='add'>+		.mac	      = { 0x01, 0x00, 0x5e, 0x00, 0x00, 0x6b },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 1,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	static const struct hellcreek_fdb_entry udp6_p2p = {</div><div class='add'>+		/* MAC: 33-33-00-00-00-6B */</div><div class='add'>+		.mac	      = { 0x33, 0x33, 0x00, 0x00, 0x00, 0x6b },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 1,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	static const struct hellcreek_fdb_entry stp = {</div><div class='add'>+		/* MAC: 01-80-C2-00-00-00 */</div><div class='add'>+		.mac	      = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 },</div><div class='add'>+		.portmask     = 0x03,	/* Management ports */</div><div class='add'>+		.age	      = 0,</div><div class='add'>+		.is_obt	      = 0,</div><div class='add'>+		.pass_blocked = 1,</div><div class='add'>+		.is_static    = 1,</div><div class='add'>+		.reprio_tc    = 6,</div><div class='add'>+		.reprio_en    = 1,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;l2_ptp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;udp4_ptp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;udp6_ptp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;l2_p2p);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;udp4_p2p);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;udp6_p2p);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = __hellcreek_fdb_add(hellcreek, &amp;stp);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_devlink_info_get(struct dsa_switch *ds,</div><div class='add'>+				      struct devlink_info_req *req,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return devlink_info_version_fixed_put(req,</div><div class='add'>+					      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,</div><div class='add'>+					      hellcreek-&gt;pdata-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 hellcreek_devlink_vlan_table_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = priv;</div><div class='add'>+	u64 count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	for (i = 0; i &lt; VLAN_N_VID; ++i)</div><div class='add'>+		if (hellcreek-&gt;vidmbrcfg[i])</div><div class='add'>+			count++;</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 hellcreek_devlink_fdb_table_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = priv;</div><div class='add'>+	u64 count = 0;</div><div class='add'>+</div><div class='add'>+	/* Reading this register has side effects. Synchronize against the other</div><div class='add'>+	 * FDB operations.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	count = hellcreek_read(hellcreek, HR_FDBMAX);</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_setup_devlink_resources(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource_size_params size_vlan_params;</div><div class='add'>+	struct devlink_resource_size_params size_fdb_params;</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_resource_size_params_init(&amp;size_vlan_params, VLAN_N_VID,</div><div class='add'>+					  VLAN_N_VID,</div><div class='add'>+					  1, DEVLINK_RESOURCE_UNIT_ENTRY);</div><div class='add'>+</div><div class='add'>+	devlink_resource_size_params_init(&amp;size_fdb_params,</div><div class='add'>+					  hellcreek-&gt;fdb_entries,</div><div class='add'>+					  hellcreek-&gt;fdb_entries,</div><div class='add'>+					  1, DEVLINK_RESOURCE_UNIT_ENTRY);</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "VLAN", VLAN_N_VID,</div><div class='add'>+					    HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE,</div><div class='add'>+					    DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					    &amp;size_vlan_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "FDB", hellcreek-&gt;fdb_entries,</div><div class='add'>+					    HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE,</div><div class='add'>+					    DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					    &amp;size_fdb_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE,</div><div class='add'>+					      hellcreek_devlink_vlan_table_get,</div><div class='add'>+					      hellcreek);</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE,</div><div class='add'>+					      hellcreek_devlink_fdb_table_get,</div><div class='add'>+					      hellcreek);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_devlink_region_vlan_snapshot(struct devlink *dl,</div><div class='add'>+						  const struct devlink_region_ops *ops,</div><div class='add'>+						  struct netlink_ext_ack *extack,</div><div class='add'>+						  u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_devlink_vlan_entry *table, *entry;</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	table = kcalloc(VLAN_N_VID, sizeof(*entry), GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry = table;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	for (i = 0; i &lt; VLAN_N_VID; ++i, ++entry) {</div><div class='add'>+		entry-&gt;member = hellcreek-&gt;vidmbrcfg[i];</div><div class='add'>+		entry-&gt;vid    = i;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	*data = (u8 *)table;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_devlink_region_fdb_snapshot(struct devlink *dl,</div><div class='add'>+						 const struct devlink_region_ops *ops,</div><div class='add'>+						 struct netlink_ext_ack *extack,</div><div class='add'>+						 u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct hellcreek_fdb_entry *table, *entry;</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	table = kcalloc(hellcreek-&gt;fdb_entries, sizeof(*entry), GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry = table;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	/* Start table read */</div><div class='add'>+	hellcreek_read(hellcreek, HR_FDBMAX);</div><div class='add'>+	hellcreek_write(hellcreek, 0x00, HR_FDBMAX);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hellcreek-&gt;fdb_entries; ++i, ++entry) {</div><div class='add'>+		/* Read current entry */</div><div class='add'>+		hellcreek_populate_fdb_entry(hellcreek, entry, i);</div><div class='add'>+</div><div class='add'>+		/* Advance read pointer */</div><div class='add'>+		hellcreek_write(hellcreek, 0x00, HR_FDBRDH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	*data = (u8 *)table;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops hellcreek_region_vlan_ops = {</div><div class='add'>+	.name	    = "vlan",</div><div class='add'>+	.snapshot   = hellcreek_devlink_region_vlan_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops hellcreek_region_fdb_ops = {</div><div class='add'>+	.name	    = "fdb",</div><div class='add'>+	.snapshot   = hellcreek_devlink_region_fdb_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hellcreek_setup_devlink_regions(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	const struct devlink_region_ops *ops;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	u64 size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* VLAN table */</div><div class='add'>+	size = VLAN_N_VID * sizeof(struct hellcreek_devlink_vlan_entry);</div><div class='add'>+	ops  = &amp;hellcreek_region_vlan_ops;</div><div class='add'>+</div><div class='add'>+	region = dsa_devlink_region_create(ds, ops, 1, size);</div><div class='add'>+	if (IS_ERR(region))</div><div class='add'>+		return PTR_ERR(region);</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;vlan_region = region;</div><div class='add'>+</div><div class='add'>+	/* FDB table */</div><div class='add'>+	size = hellcreek-&gt;fdb_entries * sizeof(struct hellcreek_fdb_entry);</div><div class='add'>+	ops  = &amp;hellcreek_region_fdb_ops;</div><div class='add'>+</div><div class='add'>+	region = dsa_devlink_region_create(ds, ops, 1, size);</div><div class='add'>+	if (IS_ERR(region)) {</div><div class='add'>+		ret = PTR_ERR(region);</div><div class='add'>+		goto err_fdb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;fdb_region = region;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_fdb:</div><div class='add'>+	dsa_devlink_region_destroy(hellcreek-&gt;vlan_region);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_teardown_devlink_regions(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dsa_devlink_region_destroy(hellcreek-&gt;fdb_region);</div><div class='add'>+	dsa_devlink_region_destroy(hellcreek-&gt;vlan_region);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	u16 swcfg = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Set up the switch\n");</div><div class='add'>+</div><div class='add'>+	/* Let's go */</div><div class='add'>+	ret = hellcreek_enable_ip_core(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "Failed to enable IP core!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable CPU/Tunnel ports */</div><div class='add'>+	hellcreek_setup_cpu_and_tunnel_port(hellcreek);</div><div class='add'>+</div><div class='add'>+	/* Switch config: Keep defaults, enable FDB aging and learning and tag</div><div class='add'>+	 * each frame from/to cpu port for DSA tagging.  Also enable the length</div><div class='add'>+	 * aware shaping mode. This eliminates the need for Qbv guard bands.</div><div class='add'>+	 */</div><div class='add'>+	swcfg |= HR_SWCFG_FDBAGE_EN |</div><div class='add'>+		HR_SWCFG_FDBLRN_EN  |</div><div class='add'>+		HR_SWCFG_ALWAYS_OBT |</div><div class='add'>+		(HR_SWCFG_LAS_ON &lt;&lt; HR_SWCFG_LAS_MODE_SHIFT);</div><div class='add'>+	hellcreek-&gt;swcfg = swcfg;</div><div class='add'>+	hellcreek_write(hellcreek, swcfg, HR_SWCFG);</div><div class='add'>+</div><div class='add'>+	/* Initial vlan membership to reflect port separation */</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; ++i) {</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hellcreek_setup_vlan_membership(ds, i, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure PCP &lt;-&gt; TC mapping */</div><div class='add'>+	hellcreek_setup_tc_identity_mapping(hellcreek);</div><div class='add'>+</div><div class='add'>+	/* The VLAN awareness is a global switch setting. Therefore, mixed vlan</div><div class='add'>+	 * filtering setups are not supported.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;vlan_filtering_is_global = true;</div><div class='add'>+	ds-&gt;needs_standalone_vlan_filtering = true;</div><div class='add'>+</div><div class='add'>+	/* Intercept _all_ PTP multicast traffic */</div><div class='add'>+	ret = hellcreek_setup_fdb(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev,</div><div class='add'>+			"Failed to insert static PTP FDB entries\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register devlink resources with DSA */</div><div class='add'>+	ret = hellcreek_setup_devlink_resources(ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev,</div><div class='add'>+			"Failed to setup devlink resources!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_setup_devlink_regions(ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev,</div><div class='add'>+			"Failed to setup devlink regions!\n");</div><div class='add'>+		goto err_regions;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_regions:</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	hellcreek_teardown_devlink_regions(ds);</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_MII, config-&gt;supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_RGMII, config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	/* Include GMII - the hardware does not support this interface</div><div class='add'>+	 * mode, but it's the default interface mode for phylib, so we</div><div class='add'>+	 * need it for compatibility with existing DT.</div><div class='add'>+	 */</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_GMII, config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	/* The MAC settings are a hardware configuration option and cannot be</div><div class='add'>+	 * changed at run time or by strapping. Therefore the attached PHYs</div><div class='add'>+	 * should be programmed to only advertise settings which are supported</div><div class='add'>+	 * by the hardware.</div><div class='add'>+	 */</div><div class='add'>+	if (hellcreek-&gt;pdata-&gt;is_100_mbits)</div><div class='add'>+		config-&gt;mac_capabilities = MAC_100FD;</div><div class='add'>+	else</div><div class='add'>+		config-&gt;mac_capabilities = MAC_1000FD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+hellcreek_port_prechangeupper(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	bool used = true;</div><div class='add'>+	int ret = -EBUSY;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Pre change upper for port %d\n", port);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Deny VLAN devices on top of lan ports with the same VLAN ids, because</div><div class='add'>+	 * it breaks the port separation due to the private VLANs. Example:</div><div class='add'>+	 *</div><div class='add'>+	 * lan0.100 *and* lan1.100 cannot be used in parallel. However, lan0.99</div><div class='add'>+	 * and lan1.100 works.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!is_vlan_dev(info-&gt;upper_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vid = vlan_dev_vlan_id(info-&gt;upper_dev);</div><div class='add'>+</div><div class='add'>+	/* For all ports, check bitmaps */</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;vlan_lock);</div><div class='add'>+	for (i = 0; i &lt; hellcreek-&gt;pdata-&gt;num_ports; ++i) {</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (port == i)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		used = used &amp;&amp; test_bit(vid, hellcreek-&gt;ports[i].vlan_dev_bitmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (used)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Update bitmap */</div><div class='add'>+	set_bit(vid, hellcreek-&gt;ports[port].vlan_dev_bitmap);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;vlan_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_setup_maxsdu(struct hellcreek *hellcreek, int port,</div><div class='add'>+				   const struct tc_taprio_qopt_offload *schedule)</div><div class='add'>+{</div><div class='add'>+	int tc;</div><div class='add'>+</div><div class='add'>+	for (tc = 0; tc &lt; 8; ++tc) {</div><div class='add'>+		u32 max_sdu = schedule-&gt;max_sdu[tc] + VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+		u16 val;</div><div class='add'>+</div><div class='add'>+		if (!schedule-&gt;max_sdu[tc])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev_dbg(hellcreek-&gt;dev, "Configure max-sdu %u for tc %d on port %d\n",</div><div class='add'>+			max_sdu, tc, port);</div><div class='add'>+</div><div class='add'>+		hellcreek_select_port_prio(hellcreek, port, tc);</div><div class='add'>+</div><div class='add'>+		val = (max_sdu &amp; HR_PTPRTCCFG_MAXSDU_MASK) &lt;&lt; HR_PTPRTCCFG_MAXSDU_SHIFT;</div><div class='add'>+</div><div class='add'>+		hellcreek_write(hellcreek, val, HR_PTPRTCCFG);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_reset_maxsdu(struct hellcreek *hellcreek, int port)</div><div class='add'>+{</div><div class='add'>+	int tc;</div><div class='add'>+</div><div class='add'>+	for (tc = 0; tc &lt; 8; ++tc) {</div><div class='add'>+		u16 val;</div><div class='add'>+</div><div class='add'>+		hellcreek_select_port_prio(hellcreek, port, tc);</div><div class='add'>+</div><div class='add'>+		val = (HELLCREEK_DEFAULT_MAX_SDU &amp; HR_PTPRTCCFG_MAXSDU_MASK)</div><div class='add'>+			&lt;&lt; HR_PTPRTCCFG_MAXSDU_SHIFT;</div><div class='add'>+</div><div class='add'>+		hellcreek_write(hellcreek, val, HR_PTPRTCCFG);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_setup_gcl(struct hellcreek *hellcreek, int port,</div><div class='add'>+				const struct tc_taprio_qopt_offload *schedule)</div><div class='add'>+{</div><div class='add'>+	const struct tc_taprio_sched_entry *cur, *initial, *next;</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	cur = initial = &amp;schedule-&gt;entries[0];</div><div class='add'>+	next = cur + 1;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt;= schedule-&gt;num_entries; ++i) {</div><div class='add'>+		u16 data;</div><div class='add'>+		u8 gates;</div><div class='add'>+</div><div class='add'>+		if (i == schedule-&gt;num_entries)</div><div class='add'>+			gates = initial-&gt;gate_mask ^</div><div class='add'>+				cur-&gt;gate_mask;</div><div class='add'>+		else</div><div class='add'>+			gates = next-&gt;gate_mask ^</div><div class='add'>+				cur-&gt;gate_mask;</div><div class='add'>+</div><div class='add'>+		data = gates;</div><div class='add'>+</div><div class='add'>+		if (i == schedule-&gt;num_entries)</div><div class='add'>+			data |= TR_GCLDAT_GCLWRLAST;</div><div class='add'>+</div><div class='add'>+		/* Gates states */</div><div class='add'>+		hellcreek_write(hellcreek, data, TR_GCLDAT);</div><div class='add'>+</div><div class='add'>+		/* Time interval */</div><div class='add'>+		hellcreek_write(hellcreek,</div><div class='add'>+				cur-&gt;interval &amp; 0x0000ffff,</div><div class='add'>+				TR_GCLTIL);</div><div class='add'>+		hellcreek_write(hellcreek,</div><div class='add'>+				(cur-&gt;interval &amp; 0xffff0000) &gt;&gt; 16,</div><div class='add'>+				TR_GCLTIH);</div><div class='add'>+</div><div class='add'>+		/* Commit entry */</div><div class='add'>+		data = ((i - 1) &lt;&lt; TR_GCLCMD_GCLWRADR_SHIFT) |</div><div class='add'>+			(initial-&gt;gate_mask &lt;&lt;</div><div class='add'>+			 TR_GCLCMD_INIT_GATE_STATES_SHIFT);</div><div class='add'>+		hellcreek_write(hellcreek, data, TR_GCLCMD);</div><div class='add'>+</div><div class='add'>+		cur++;</div><div class='add'>+		next++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_set_cycle_time(struct hellcreek *hellcreek,</div><div class='add'>+				     const struct tc_taprio_qopt_offload *schedule)</div><div class='add'>+{</div><div class='add'>+	u32 cycle_time = schedule-&gt;cycle_time;</div><div class='add'>+</div><div class='add'>+	hellcreek_write(hellcreek, cycle_time &amp; 0x0000ffff, TR_CTWRL);</div><div class='add'>+	hellcreek_write(hellcreek, (cycle_time &amp; 0xffff0000) &gt;&gt; 16, TR_CTWRH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_switch_schedule(struct hellcreek *hellcreek,</div><div class='add'>+				      ktime_t start_time)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 ts = ktime_to_timespec64(start_time);</div><div class='add'>+</div><div class='add'>+	/* Start schedule at this point of time */</div><div class='add'>+	hellcreek_write(hellcreek, ts.tv_nsec &amp; 0x0000ffff, TR_ESTWRL);</div><div class='add'>+	hellcreek_write(hellcreek, (ts.tv_nsec &amp; 0xffff0000) &gt;&gt; 16, TR_ESTWRH);</div><div class='add'>+</div><div class='add'>+	/* Arm timer, set seconds and switch schedule */</div><div class='add'>+	hellcreek_write(hellcreek, TR_ESTCMD_ESTARM | TR_ESTCMD_ESTSWCFG |</div><div class='add'>+			((ts.tv_sec &amp; TR_ESTCMD_ESTSEC_MASK) &lt;&lt;</div><div class='add'>+			 TR_ESTCMD_ESTSEC_SHIFT), TR_ESTCMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hellcreek_schedule_startable(struct hellcreek *hellcreek, int port)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port *hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+	s64 base_time_ns, current_ns;</div><div class='add'>+</div><div class='add'>+	/* The switch allows a schedule to be started only eight seconds within</div><div class='add'>+	 * the future. Therefore, check the current PTP time if the schedule is</div><div class='add'>+	 * startable or not.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Use the "cached" time. That should be alright, as it's updated quite</div><div class='add'>+	 * frequently in the PTP code.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+	current_ns = hellcreek-&gt;seconds * NSEC_PER_SEC + hellcreek-&gt;last_ts;</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	/* Calculate difference to admin base time */</div><div class='add'>+	base_time_ns = ktime_to_ns(hellcreek_port-&gt;current_schedule-&gt;base_time);</div><div class='add'>+</div><div class='add'>+	return base_time_ns - current_ns &lt; (s64)4 * NSEC_PER_SEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_start_schedule(struct hellcreek *hellcreek, int port)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port *hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+	ktime_t base_time, current_time;</div><div class='add'>+	s64 current_ns;</div><div class='add'>+	u32 cycle_time;</div><div class='add'>+</div><div class='add'>+	/* First select port */</div><div class='add'>+	hellcreek_select_tgd(hellcreek, port);</div><div class='add'>+</div><div class='add'>+	/* Forward base time into the future if needed */</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+	current_ns = hellcreek-&gt;seconds * NSEC_PER_SEC + hellcreek-&gt;last_ts;</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	current_time = ns_to_ktime(current_ns);</div><div class='add'>+	base_time    = hellcreek_port-&gt;current_schedule-&gt;base_time;</div><div class='add'>+	cycle_time   = hellcreek_port-&gt;current_schedule-&gt;cycle_time;</div><div class='add'>+</div><div class='add'>+	if (ktime_compare(current_time, base_time) &gt; 0) {</div><div class='add'>+		s64 n;</div><div class='add'>+</div><div class='add'>+		n = div64_s64(ktime_sub_ns(current_time, base_time),</div><div class='add'>+			      cycle_time);</div><div class='add'>+		base_time = ktime_add_ns(base_time, (n + 1) * cycle_time);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set admin base time and switch schedule */</div><div class='add'>+	hellcreek_switch_schedule(hellcreek, base_time);</div><div class='add'>+</div><div class='add'>+	taprio_offload_free(hellcreek_port-&gt;current_schedule);</div><div class='add'>+	hellcreek_port-&gt;current_schedule = NULL;</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Armed EST timer for port %d\n",</div><div class='add'>+		hellcreek_port-&gt;port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_check_schedule(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dw = to_delayed_work(work);</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	struct hellcreek *hellcreek;</div><div class='add'>+	bool startable;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = dw_to_hellcreek_port(dw);</div><div class='add'>+	hellcreek = hellcreek_port-&gt;hellcreek;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	/* Check starting time */</div><div class='add'>+	startable = hellcreek_schedule_startable(hellcreek,</div><div class='add'>+						 hellcreek_port-&gt;port);</div><div class='add'>+	if (startable) {</div><div class='add'>+		hellcreek_start_schedule(hellcreek, hellcreek_port-&gt;port);</div><div class='add'>+		mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	/* Reschedule */</div><div class='add'>+	schedule_delayed_work(&amp;hellcreek_port-&gt;schedule_work,</div><div class='add'>+			      HELLCREEK_SCHEDULE_PERIOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_port_set_schedule(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct tc_taprio_qopt_offload *taprio)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+	bool startable;</div><div class='add'>+	u16 ctrl;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Configure traffic schedule on port %d\n",</div><div class='add'>+		port);</div><div class='add'>+</div><div class='add'>+	/* First cancel delayed work */</div><div class='add'>+	cancel_delayed_work_sync(&amp;hellcreek_port-&gt;schedule_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (hellcreek_port-&gt;current_schedule) {</div><div class='add'>+		taprio_offload_free(hellcreek_port-&gt;current_schedule);</div><div class='add'>+		hellcreek_port-&gt;current_schedule = NULL;</div><div class='add'>+	}</div><div class='add'>+	hellcreek_port-&gt;current_schedule = taprio_offload_get(taprio);</div><div class='add'>+</div><div class='add'>+	/* Configure max sdu */</div><div class='add'>+	hellcreek_setup_maxsdu(hellcreek, port, hellcreek_port-&gt;current_schedule);</div><div class='add'>+</div><div class='add'>+	/* Select tdg */</div><div class='add'>+	hellcreek_select_tgd(hellcreek, port);</div><div class='add'>+</div><div class='add'>+	/* Enable gating and keep defaults */</div><div class='add'>+	ctrl = (0xff &lt;&lt; TR_TGDCTRL_ADMINGATESTATES_SHIFT) | TR_TGDCTRL_GATE_EN;</div><div class='add'>+	hellcreek_write(hellcreek, ctrl, TR_TGDCTRL);</div><div class='add'>+</div><div class='add'>+	/* Cancel pending schedule */</div><div class='add'>+	hellcreek_write(hellcreek, 0x00, TR_ESTCMD);</div><div class='add'>+</div><div class='add'>+	/* Setup a new schedule */</div><div class='add'>+	hellcreek_setup_gcl(hellcreek, port, hellcreek_port-&gt;current_schedule);</div><div class='add'>+</div><div class='add'>+	/* Configure cycle time */</div><div class='add'>+	hellcreek_set_cycle_time(hellcreek, hellcreek_port-&gt;current_schedule);</div><div class='add'>+</div><div class='add'>+	/* Check starting time */</div><div class='add'>+	startable = hellcreek_schedule_startable(hellcreek, port);</div><div class='add'>+	if (startable) {</div><div class='add'>+		hellcreek_start_schedule(hellcreek, port);</div><div class='add'>+		mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	/* Schedule periodic schedule check */</div><div class='add'>+	schedule_delayed_work(&amp;hellcreek_port-&gt;schedule_work,</div><div class='add'>+			      HELLCREEK_SCHEDULE_PERIOD);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_port_del_schedule(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port *hellcreek_port;</div><div class='add'>+</div><div class='add'>+	hellcreek_port = &amp;hellcreek-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	dev_dbg(hellcreek-&gt;dev, "Remove traffic schedule on port %d\n", port);</div><div class='add'>+</div><div class='add'>+	/* First cancel delayed work */</div><div class='add'>+	cancel_delayed_work_sync(&amp;hellcreek_port-&gt;schedule_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (hellcreek_port-&gt;current_schedule) {</div><div class='add'>+		taprio_offload_free(hellcreek_port-&gt;current_schedule);</div><div class='add'>+		hellcreek_port-&gt;current_schedule = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset max sdu */</div><div class='add'>+	hellcreek_reset_maxsdu(hellcreek, port);</div><div class='add'>+</div><div class='add'>+	/* Select tgd */</div><div class='add'>+	hellcreek_select_tgd(hellcreek, port);</div><div class='add'>+</div><div class='add'>+	/* Disable gating and return to regular switching flow */</div><div class='add'>+	hellcreek_write(hellcreek, 0xff &lt;&lt; TR_TGDCTRL_ADMINGATESTATES_SHIFT,</div><div class='add'>+			TR_TGDCTRL);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hellcreek_validate_schedule(struct hellcreek *hellcreek,</div><div class='add'>+					struct tc_taprio_qopt_offload *schedule)</div><div class='add'>+{</div><div class='add'>+	size_t i;</div><div class='add'>+</div><div class='add'>+	/* Does this hellcreek version support Qbv in hardware? */</div><div class='add'>+	if (!hellcreek-&gt;pdata-&gt;qbv_support)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* cycle time can only be 32bit */</div><div class='add'>+	if (schedule-&gt;cycle_time &gt; (u32)-1)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* cycle time extension is not supported */</div><div class='add'>+	if (schedule-&gt;cycle_time_extension)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Only set command is supported */</div><div class='add'>+	for (i = 0; i &lt; schedule-&gt;num_entries; ++i)</div><div class='add'>+		if (schedule-&gt;entries[i].command != TC_TAPRIO_CMD_SET_GATES)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_tc_query_caps(struct tc_query_caps_base *base)</div><div class='add'>+{</div><div class='add'>+	switch (base-&gt;type) {</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO: {</div><div class='add'>+		struct tc_taprio_caps *caps = base-&gt;caps;</div><div class='add'>+</div><div class='add'>+		caps-&gt;supports_queue_max_sdu = true;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_port_setup_tc(struct dsa_switch *ds, int port,</div><div class='add'>+				   enum tc_setup_type type, void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_QUERY_CAPS:</div><div class='add'>+		return hellcreek_tc_query_caps(type_data);</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO: {</div><div class='add'>+		struct tc_taprio_qopt_offload *taprio = type_data;</div><div class='add'>+</div><div class='add'>+		switch (taprio-&gt;cmd) {</div><div class='add'>+		case TAPRIO_CMD_REPLACE:</div><div class='add'>+			if (!hellcreek_validate_schedule(hellcreek, taprio))</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+			return hellcreek_port_set_schedule(ds, port, taprio);</div><div class='add'>+		case TAPRIO_CMD_DESTROY:</div><div class='add'>+			return hellcreek_port_del_schedule(ds, port);</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops hellcreek_ds_ops = {</div><div class='add'>+	.devlink_info_get      = hellcreek_devlink_info_get,</div><div class='add'>+	.get_ethtool_stats     = hellcreek_get_ethtool_stats,</div><div class='add'>+	.get_sset_count	       = hellcreek_get_sset_count,</div><div class='add'>+	.get_strings	       = hellcreek_get_strings,</div><div class='add'>+	.get_tag_protocol      = hellcreek_get_tag_protocol,</div><div class='add'>+	.get_ts_info	       = hellcreek_get_ts_info,</div><div class='add'>+	.phylink_get_caps      = hellcreek_phylink_get_caps,</div><div class='add'>+	.port_bridge_flags     = hellcreek_bridge_flags,</div><div class='add'>+	.port_bridge_join      = hellcreek_port_bridge_join,</div><div class='add'>+	.port_bridge_leave     = hellcreek_port_bridge_leave,</div><div class='add'>+	.port_disable	       = hellcreek_port_disable,</div><div class='add'>+	.port_enable	       = hellcreek_port_enable,</div><div class='add'>+	.port_fdb_add	       = hellcreek_fdb_add,</div><div class='add'>+	.port_fdb_del	       = hellcreek_fdb_del,</div><div class='add'>+	.port_fdb_dump	       = hellcreek_fdb_dump,</div><div class='add'>+	.port_hwtstamp_set     = hellcreek_port_hwtstamp_set,</div><div class='add'>+	.port_hwtstamp_get     = hellcreek_port_hwtstamp_get,</div><div class='add'>+	.port_pre_bridge_flags = hellcreek_pre_bridge_flags,</div><div class='add'>+	.port_prechangeupper   = hellcreek_port_prechangeupper,</div><div class='add'>+	.port_rxtstamp	       = hellcreek_port_rxtstamp,</div><div class='add'>+	.port_setup_tc	       = hellcreek_port_setup_tc,</div><div class='add'>+	.port_stp_state_set    = hellcreek_port_stp_state_set,</div><div class='add'>+	.port_txtstamp	       = hellcreek_port_txtstamp,</div><div class='add'>+	.port_vlan_add	       = hellcreek_vlan_add,</div><div class='add'>+	.port_vlan_del	       = hellcreek_vlan_del,</div><div class='add'>+	.port_vlan_filtering   = hellcreek_vlan_filtering,</div><div class='add'>+	.setup		       = hellcreek_setup,</div><div class='add'>+	.teardown	       = hellcreek_teardown,</div><div class='add'>+	.port_hsr_join	       = dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave	       = dsa_port_simple_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int hellcreek_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct hellcreek *hellcreek;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	hellcreek = devm_kzalloc(dev, sizeof(*hellcreek), GFP_KERNEL);</div><div class='add'>+	if (!hellcreek)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;vidmbrcfg = devm_kcalloc(dev, VLAN_N_VID,</div><div class='add'>+					    sizeof(*hellcreek-&gt;vidmbrcfg),</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (!hellcreek-&gt;vidmbrcfg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;pdata = of_device_get_match_data(dev);</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;ports = devm_kcalloc(dev, hellcreek-&gt;pdata-&gt;num_ports,</div><div class='add'>+					sizeof(*hellcreek-&gt;ports),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!hellcreek-&gt;ports)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; hellcreek-&gt;pdata-&gt;num_ports; ++i) {</div><div class='add'>+		struct hellcreek_port *port = &amp;hellcreek-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		port-&gt;counter_values =</div><div class='add'>+			devm_kcalloc(dev,</div><div class='add'>+				     ARRAY_SIZE(hellcreek_counter),</div><div class='add'>+				     sizeof(*port-&gt;counter_values),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!port-&gt;counter_values)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		port-&gt;vlan_dev_bitmap = devm_bitmap_zalloc(dev, VLAN_N_VID,</div><div class='add'>+							   GFP_KERNEL);</div><div class='add'>+		if (!port-&gt;vlan_dev_bitmap)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		port-&gt;hellcreek	= hellcreek;</div><div class='add'>+		port-&gt;port	= i;</div><div class='add'>+</div><div class='add'>+		INIT_DELAYED_WORK(&amp;port-&gt;schedule_work,</div><div class='add'>+				  hellcreek_check_schedule);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;hellcreek-&gt;reg_lock);</div><div class='add'>+	mutex_init(&amp;hellcreek-&gt;vlan_lock);</div><div class='add'>+	mutex_init(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tsn");</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(dev, "No memory region provided!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(hellcreek-&gt;base))</div><div class='add'>+		return PTR_ERR(hellcreek-&gt;base);</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ptp");</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(dev, "No PTP memory region provided!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;ptp_base = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(hellcreek-&gt;ptp_base))</div><div class='add'>+		return PTR_ERR(hellcreek-&gt;ptp_base);</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_detect(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "No (known) chip found!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_wait_until_ready(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Switch didn't become ready!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek_feature_detect(hellcreek);</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;ds = devm_kzalloc(dev, sizeof(*hellcreek-&gt;ds), GFP_KERNEL);</div><div class='add'>+	if (!hellcreek-&gt;ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;ds-&gt;dev	     = dev;</div><div class='add'>+	hellcreek-&gt;ds-&gt;priv	     = hellcreek;</div><div class='add'>+	hellcreek-&gt;ds-&gt;ops	     = &amp;hellcreek_ds_ops;</div><div class='add'>+	hellcreek-&gt;ds-&gt;num_ports     = hellcreek-&gt;pdata-&gt;num_ports;</div><div class='add'>+	hellcreek-&gt;ds-&gt;num_tx_queues = HELLCREEK_NUM_EGRESS_QUEUES;</div><div class='add'>+</div><div class='add'>+	ret = dsa_register_switch(hellcreek-&gt;ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(dev, ret, "Unable to register switch\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_ptp_setup(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to setup PTP!\n");</div><div class='add'>+		goto err_ptp_setup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hellcreek_hwtstamp_setup(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to setup hardware timestamping!\n");</div><div class='add'>+		goto err_tstamp_setup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, hellcreek);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_tstamp_setup:</div><div class='add'>+	hellcreek_ptp_free(hellcreek);</div><div class='add'>+err_ptp_setup:</div><div class='add'>+	dsa_unregister_switch(hellcreek-&gt;ds);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!hellcreek)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hellcreek_hwtstamp_free(hellcreek);</div><div class='add'>+	hellcreek_ptp_free(hellcreek);</div><div class='add'>+	dsa_unregister_switch(hellcreek-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!hellcreek)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(hellcreek-&gt;ds);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hellcreek_platform_data de1soc_r1_pdata = {</div><div class='add'>+	.name		 = "r4c30",</div><div class='add'>+	.num_ports	 = 4,</div><div class='add'>+	.is_100_mbits	 = 1,</div><div class='add'>+	.qbv_support	 = 1,</div><div class='add'>+	.qbv_on_cpu_port = 1,</div><div class='add'>+	.qbu_support	 = 0,</div><div class='add'>+	.module_id	 = 0x4c30,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id hellcreek_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "hirschmann,hellcreek-de1soc-r1",</div><div class='add'>+		.data	    = &amp;de1soc_r1_pdata,</div><div class='add'>+	},</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, hellcreek_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver hellcreek_driver = {</div><div class='add'>+	.probe	= hellcreek_probe,</div><div class='add'>+	.remove = hellcreek_remove,</div><div class='add'>+	.shutdown = hellcreek_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "hellcreek",</div><div class='add'>+		.of_match_table = hellcreek_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(hellcreek_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Kurt Kanzenbach &lt;kurt@linutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Hirschmann Hellcreek driver");</div><div class='add'>+MODULE_LICENSE("Dual MIT/GPL");</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/hellcreek.h b/drivers/net/dsa/hirschmann/hellcreek.h<br/>new file mode 100644<br/>index 000000000000..bebf0d3ff330<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/hellcreek.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/hellcreek.h</a></div><div class='hunk'>@@ -0,0 +1,323 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * DSA driver for:</div><div class='add'>+ * Hirschmann Hellcreek TSN switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019-2021 Linutronix GmbH</div><div class='add'>+ * Author Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HELLCREEK_H_</div><div class='add'>+#define _HELLCREEK_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/container_of.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/hirschmann-hellcreek.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+</div><div class='add'>+/* Ports:</div><div class='add'>+ *  - 0: CPU</div><div class='add'>+ *  - 1: Tunnel</div><div class='add'>+ *  - 2: TSN front port 1</div><div class='add'>+ *  - 3: TSN front port 2</div><div class='add'>+ *  - ...</div><div class='add'>+ */</div><div class='add'>+#define CPU_PORT			0</div><div class='add'>+#define TUNNEL_PORT			1</div><div class='add'>+</div><div class='add'>+#define HELLCREEK_VLAN_NO_MEMBER	0x0</div><div class='add'>+#define HELLCREEK_VLAN_UNTAGGED_MEMBER	0x1</div><div class='add'>+#define HELLCREEK_VLAN_TAGGED_MEMBER	0x3</div><div class='add'>+#define HELLCREEK_NUM_EGRESS_QUEUES	8</div><div class='add'>+#define HELLCREEK_DEFAULT_MAX_SDU	1536</div><div class='add'>+</div><div class='add'>+/* Register definitions */</div><div class='add'>+#define HR_MODID_C			(0 * 2)</div><div class='add'>+#define HR_REL_L_C			(1 * 2)</div><div class='add'>+#define HR_REL_H_C			(2 * 2)</div><div class='add'>+#define HR_BLD_L_C			(3 * 2)</div><div class='add'>+#define HR_BLD_H_C			(4 * 2)</div><div class='add'>+#define HR_CTRL_C			(5 * 2)</div><div class='add'>+#define HR_CTRL_C_READY			BIT(14)</div><div class='add'>+#define HR_CTRL_C_TRANSITION		BIT(13)</div><div class='add'>+#define HR_CTRL_C_ENABLE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define HR_PSEL				(0xa6 * 2)</div><div class='add'>+#define HR_PSEL_PTWSEL_SHIFT		4</div><div class='add'>+#define HR_PSEL_PTWSEL_MASK		GENMASK(5, 4)</div><div class='add'>+#define HR_PSEL_PRTCWSEL_SHIFT		0</div><div class='add'>+#define HR_PSEL_PRTCWSEL_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define HR_PTCFG			(0xa7 * 2)</div><div class='add'>+#define HR_PTCFG_MLIMIT_EN		BIT(13)</div><div class='add'>+#define HR_PTCFG_UMC_FLT		BIT(10)</div><div class='add'>+#define HR_PTCFG_UUC_FLT		BIT(9)</div><div class='add'>+#define HR_PTCFG_UNTRUST		BIT(8)</div><div class='add'>+#define HR_PTCFG_TAG_REQUIRED		BIT(7)</div><div class='add'>+#define HR_PTCFG_PPRIO_SHIFT		4</div><div class='add'>+#define HR_PTCFG_PPRIO_MASK		GENMASK(6, 4)</div><div class='add'>+#define HR_PTCFG_INGRESSFLT		BIT(3)</div><div class='add'>+#define HR_PTCFG_BLOCKED		BIT(2)</div><div class='add'>+#define HR_PTCFG_LEARNING_EN		BIT(1)</div><div class='add'>+#define HR_PTCFG_ADMIN_EN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define HR_PRTCCFG			(0xa8 * 2)</div><div class='add'>+#define HR_PRTCCFG_PCP_TC_MAP_SHIFT	0</div><div class='add'>+#define HR_PRTCCFG_PCP_TC_MAP_MASK	GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define HR_PTPRTCCFG			(0xa9 * 2)</div><div class='add'>+#define HR_PTPRTCCFG_SET_QTRACK		BIT(15)</div><div class='add'>+#define HR_PTPRTCCFG_REJECT		BIT(14)</div><div class='add'>+#define HR_PTPRTCCFG_MAXSDU_SHIFT	0</div><div class='add'>+#define HR_PTPRTCCFG_MAXSDU_MASK	GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+#define HR_CSEL				(0x8d * 2)</div><div class='add'>+#define HR_CSEL_SHIFT			0</div><div class='add'>+#define HR_CSEL_MASK			GENMASK(7, 0)</div><div class='add'>+#define HR_CRDL				(0x8e * 2)</div><div class='add'>+#define HR_CRDH				(0x8f * 2)</div><div class='add'>+</div><div class='add'>+#define HR_SWTRC_CFG			(0x90 * 2)</div><div class='add'>+#define HR_SWTRC0			(0x91 * 2)</div><div class='add'>+#define HR_SWTRC1			(0x92 * 2)</div><div class='add'>+#define HR_PFREE			(0x93 * 2)</div><div class='add'>+#define HR_MFREE			(0x94 * 2)</div><div class='add'>+</div><div class='add'>+#define HR_FDBAGE			(0x97 * 2)</div><div class='add'>+#define HR_FDBMAX			(0x98 * 2)</div><div class='add'>+#define HR_FDBRDL			(0x99 * 2)</div><div class='add'>+#define HR_FDBRDM			(0x9a * 2)</div><div class='add'>+#define HR_FDBRDH			(0x9b * 2)</div><div class='add'>+</div><div class='add'>+#define HR_FDBMDRD			(0x9c * 2)</div><div class='add'>+#define HR_FDBMDRD_PORTMASK_SHIFT	0</div><div class='add'>+#define HR_FDBMDRD_PORTMASK_MASK	GENMASK(3, 0)</div><div class='add'>+#define HR_FDBMDRD_AGE_SHIFT		4</div><div class='add'>+#define HR_FDBMDRD_AGE_MASK		GENMASK(7, 4)</div><div class='add'>+#define HR_FDBMDRD_OBT			BIT(8)</div><div class='add'>+#define HR_FDBMDRD_PASS_BLOCKED		BIT(9)</div><div class='add'>+#define HR_FDBMDRD_STATIC		BIT(11)</div><div class='add'>+#define HR_FDBMDRD_REPRIO_TC_SHIFT	12</div><div class='add'>+#define HR_FDBMDRD_REPRIO_TC_MASK	GENMASK(14, 12)</div><div class='add'>+#define HR_FDBMDRD_REPRIO_EN		BIT(15)</div><div class='add'>+</div><div class='add'>+#define HR_FDBWDL			(0x9d * 2)</div><div class='add'>+#define HR_FDBWDM			(0x9e * 2)</div><div class='add'>+#define HR_FDBWDH			(0x9f * 2)</div><div class='add'>+#define HR_FDBWRM0			(0xa0 * 2)</div><div class='add'>+#define HR_FDBWRM0_PORTMASK_SHIFT	0</div><div class='add'>+#define HR_FDBWRM0_PORTMASK_MASK	GENMASK(3, 0)</div><div class='add'>+#define HR_FDBWRM0_OBT			BIT(8)</div><div class='add'>+#define HR_FDBWRM0_PASS_BLOCKED		BIT(9)</div><div class='add'>+#define HR_FDBWRM0_REPRIO_TC_SHIFT	12</div><div class='add'>+#define HR_FDBWRM0_REPRIO_TC_MASK	GENMASK(14, 12)</div><div class='add'>+#define HR_FDBWRM0_REPRIO_EN		BIT(15)</div><div class='add'>+#define HR_FDBWRM1			(0xa1 * 2)</div><div class='add'>+</div><div class='add'>+#define HR_FDBWRCMD			(0xa2 * 2)</div><div class='add'>+#define HR_FDBWRCMD_FDBDEL		BIT(9)</div><div class='add'>+</div><div class='add'>+#define HR_SWCFG			(0xa3 * 2)</div><div class='add'>+#define HR_SWCFG_GM_STATEMD		BIT(15)</div><div class='add'>+#define HR_SWCFG_LAS_MODE_SHIFT		12</div><div class='add'>+#define HR_SWCFG_LAS_MODE_MASK		GENMASK(13, 12)</div><div class='add'>+#define HR_SWCFG_LAS_OFF		(0x00)</div><div class='add'>+#define HR_SWCFG_LAS_ON			(0x01)</div><div class='add'>+#define HR_SWCFG_LAS_STATIC		(0x10)</div><div class='add'>+#define HR_SWCFG_CT_EN			BIT(11)</div><div class='add'>+#define HR_SWCFG_VLAN_UNAWARE		BIT(10)</div><div class='add'>+#define HR_SWCFG_ALWAYS_OBT		BIT(9)</div><div class='add'>+#define HR_SWCFG_FDBAGE_EN		BIT(5)</div><div class='add'>+#define HR_SWCFG_FDBLRN_EN		BIT(4)</div><div class='add'>+</div><div class='add'>+#define HR_SWSTAT			(0xa4 * 2)</div><div class='add'>+#define HR_SWSTAT_FAIL			BIT(4)</div><div class='add'>+#define HR_SWSTAT_BUSY			BIT(0)</div><div class='add'>+</div><div class='add'>+#define HR_SWCMD			(0xa5 * 2)</div><div class='add'>+#define HW_SWCMD_FLUSH			BIT(0)</div><div class='add'>+</div><div class='add'>+#define HR_VIDCFG			(0xaa * 2)</div><div class='add'>+#define HR_VIDCFG_VID_SHIFT		0</div><div class='add'>+#define HR_VIDCFG_VID_MASK		GENMASK(11, 0)</div><div class='add'>+#define HR_VIDCFG_PVID			BIT(12)</div><div class='add'>+</div><div class='add'>+#define HR_VIDMBRCFG			(0xab * 2)</div><div class='add'>+#define HR_VIDMBRCFG_P0MBR_SHIFT	0</div><div class='add'>+#define HR_VIDMBRCFG_P0MBR_MASK		GENMASK(1, 0)</div><div class='add'>+#define HR_VIDMBRCFG_P1MBR_SHIFT	2</div><div class='add'>+#define HR_VIDMBRCFG_P1MBR_MASK		GENMASK(3, 2)</div><div class='add'>+#define HR_VIDMBRCFG_P2MBR_SHIFT	4</div><div class='add'>+#define HR_VIDMBRCFG_P2MBR_MASK		GENMASK(5, 4)</div><div class='add'>+#define HR_VIDMBRCFG_P3MBR_SHIFT	6</div><div class='add'>+#define HR_VIDMBRCFG_P3MBR_MASK		GENMASK(7, 6)</div><div class='add'>+</div><div class='add'>+#define HR_FEABITS0			(0xac * 2)</div><div class='add'>+#define HR_FEABITS0_FDBBINS_SHIFT	4</div><div class='add'>+#define HR_FEABITS0_FDBBINS_MASK	GENMASK(7, 4)</div><div class='add'>+#define HR_FEABITS0_PCNT_SHIFT		8</div><div class='add'>+#define HR_FEABITS0_PCNT_MASK		GENMASK(11, 8)</div><div class='add'>+#define HR_FEABITS0_MCNT_SHIFT		12</div><div class='add'>+#define HR_FEABITS0_MCNT_MASK		GENMASK(15, 12)</div><div class='add'>+</div><div class='add'>+#define TR_QTRACK			(0xb1 * 2)</div><div class='add'>+#define TR_TGDVER			(0xb3 * 2)</div><div class='add'>+#define TR_TGDVER_REV_MIN_MASK		GENMASK(7, 0)</div><div class='add'>+#define TR_TGDVER_REV_MIN_SHIFT		0</div><div class='add'>+#define TR_TGDVER_REV_MAJ_MASK		GENMASK(15, 8)</div><div class='add'>+#define TR_TGDVER_REV_MAJ_SHIFT		8</div><div class='add'>+#define TR_TGDSEL			(0xb4 * 2)</div><div class='add'>+#define TR_TGDSEL_TDGSEL_MASK		GENMASK(1, 0)</div><div class='add'>+#define TR_TGDSEL_TDGSEL_SHIFT		0</div><div class='add'>+#define TR_TGDCTRL			(0xb5 * 2)</div><div class='add'>+#define TR_TGDCTRL_GATE_EN		BIT(0)</div><div class='add'>+#define TR_TGDCTRL_CYC_SNAP		BIT(4)</div><div class='add'>+#define TR_TGDCTRL_SNAP_EST		BIT(5)</div><div class='add'>+#define TR_TGDCTRL_ADMINGATESTATES_MASK	GENMASK(15, 8)</div><div class='add'>+#define TR_TGDCTRL_ADMINGATESTATES_SHIFT	8</div><div class='add'>+#define TR_TGDSTAT0			(0xb6 * 2)</div><div class='add'>+#define TR_TGDSTAT1			(0xb7 * 2)</div><div class='add'>+#define TR_ESTWRL			(0xb8 * 2)</div><div class='add'>+#define TR_ESTWRH			(0xb9 * 2)</div><div class='add'>+#define TR_ESTCMD			(0xba * 2)</div><div class='add'>+#define TR_ESTCMD_ESTSEC_MASK		GENMASK(2, 0)</div><div class='add'>+#define TR_ESTCMD_ESTSEC_SHIFT		0</div><div class='add'>+#define TR_ESTCMD_ESTARM		BIT(4)</div><div class='add'>+#define TR_ESTCMD_ESTSWCFG		BIT(5)</div><div class='add'>+#define TR_EETWRL			(0xbb * 2)</div><div class='add'>+#define TR_EETWRH			(0xbc * 2)</div><div class='add'>+#define TR_EETCMD			(0xbd * 2)</div><div class='add'>+#define TR_EETCMD_EETSEC_MASK		GEMASK(2, 0)</div><div class='add'>+#define TR_EETCMD_EETSEC_SHIFT		0</div><div class='add'>+#define TR_EETCMD_EETARM		BIT(4)</div><div class='add'>+#define TR_CTWRL			(0xbe * 2)</div><div class='add'>+#define TR_CTWRH			(0xbf * 2)</div><div class='add'>+#define TR_LCNSL			(0xc1 * 2)</div><div class='add'>+#define TR_LCNSH			(0xc2 * 2)</div><div class='add'>+#define TR_LCS				(0xc3 * 2)</div><div class='add'>+#define TR_GCLDAT			(0xc4 * 2)</div><div class='add'>+#define TR_GCLDAT_GCLWRGATES_MASK	GENMASK(7, 0)</div><div class='add'>+#define TR_GCLDAT_GCLWRGATES_SHIFT	0</div><div class='add'>+#define TR_GCLDAT_GCLWRLAST		BIT(8)</div><div class='add'>+#define TR_GCLDAT_GCLOVRI		BIT(9)</div><div class='add'>+#define TR_GCLTIL			(0xc5 * 2)</div><div class='add'>+#define TR_GCLTIH			(0xc6 * 2)</div><div class='add'>+#define TR_GCLCMD			(0xc7 * 2)</div><div class='add'>+#define TR_GCLCMD_GCLWRADR_MASK		GENMASK(7, 0)</div><div class='add'>+#define TR_GCLCMD_GCLWRADR_SHIFT	0</div><div class='add'>+#define TR_GCLCMD_INIT_GATE_STATES_MASK	GENMASK(15, 8)</div><div class='add'>+#define TR_GCLCMD_INIT_GATE_STATES_SHIFT	8</div><div class='add'>+</div><div class='add'>+struct hellcreek_counter {</div><div class='add'>+	u8 offset;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hellcreek;</div><div class='add'>+</div><div class='add'>+/* State flags for hellcreek_port_hwtstamp::state */</div><div class='add'>+enum {</div><div class='add'>+	HELLCREEK_HWTSTAMP_ENABLED,</div><div class='add'>+	HELLCREEK_HWTSTAMP_TX_IN_PROGRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A structure to hold hardware timestamping information per port */</div><div class='add'>+struct hellcreek_port_hwtstamp {</div><div class='add'>+	/* Timestamping state */</div><div class='add'>+	unsigned long state;</div><div class='add'>+</div><div class='add'>+	/* Resources for receive timestamping */</div><div class='add'>+	struct sk_buff_head rx_queue; /* For synchronization messages */</div><div class='add'>+</div><div class='add'>+	/* Resources for transmit timestamping */</div><div class='add'>+	unsigned long tx_tstamp_start;</div><div class='add'>+	struct sk_buff *tx_skb;</div><div class='add'>+</div><div class='add'>+	/* Current timestamp configuration */</div><div class='add'>+	struct kernel_hwtstamp_config tstamp_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hellcreek_port {</div><div class='add'>+	struct hellcreek *hellcreek;</div><div class='add'>+	unsigned long *vlan_dev_bitmap;</div><div class='add'>+	int port;</div><div class='add'>+	u16 ptcfg;		/* ptcfg shadow */</div><div class='add'>+	u64 *counter_values;</div><div class='add'>+</div><div class='add'>+	/* Per-port timestamping resources */</div><div class='add'>+	struct hellcreek_port_hwtstamp port_hwtstamp;</div><div class='add'>+</div><div class='add'>+	/* Per-port Qbv schedule information */</div><div class='add'>+	struct tc_taprio_qopt_offload *current_schedule;</div><div class='add'>+	struct delayed_work schedule_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hellcreek_fdb_entry {</div><div class='add'>+	size_t idx;</div><div class='add'>+	unsigned char mac[ETH_ALEN];</div><div class='add'>+	u8 portmask;</div><div class='add'>+	u8 age;</div><div class='add'>+	u8 is_obt;</div><div class='add'>+	u8 pass_blocked;</div><div class='add'>+	u8 is_static;</div><div class='add'>+	u8 reprio_tc;</div><div class='add'>+	u8 reprio_en;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hellcreek {</div><div class='add'>+	const struct hellcreek_platform_data *pdata;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct ptp_clock *ptp_clock;</div><div class='add'>+	struct ptp_clock_info ptp_clock_info;</div><div class='add'>+	struct hellcreek_port *ports;</div><div class='add'>+	struct delayed_work overflow_work;</div><div class='add'>+	struct led_classdev led_is_gm;</div><div class='add'>+	struct led_classdev led_sync_good;</div><div class='add'>+	struct mutex reg_lock;	/* Switch IP register lock */</div><div class='add'>+	struct mutex vlan_lock;	/* VLAN bitmaps lock */</div><div class='add'>+	struct mutex ptp_lock;	/* PTP IP register lock */</div><div class='add'>+	struct devlink_region *vlan_region;</div><div class='add'>+	struct devlink_region *fdb_region;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	void __iomem *ptp_base;</div><div class='add'>+	u16 swcfg;		/* swcfg shadow */</div><div class='add'>+	u8 *vidmbrcfg;		/* vidmbrcfg shadow */</div><div class='add'>+	u64 seconds;		/* PTP seconds */</div><div class='add'>+	u64 last_ts;		/* Used for overflow detection */</div><div class='add'>+	u16 status_out;		/* ptp.status_out shadow */</div><div class='add'>+	size_t fdb_entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A Qbv schedule can only started up to 8 seconds in the future. If the delta</div><div class='add'>+ * between the base time and the current ptp time is larger than 8 seconds, then</div><div class='add'>+ * use periodic work to check for the schedule to be started. The delayed work</div><div class='add'>+ * cannot be armed directly to $base_time - 8 + X, because for large deltas the</div><div class='add'>+ * PTP frequency matters.</div><div class='add'>+ */</div><div class='add'>+#define HELLCREEK_SCHEDULE_PERIOD	(2 * HZ)</div><div class='add'>+#define dw_to_hellcreek_port(dw)				\</div><div class='add'>+	container_of(dw, struct hellcreek_port, schedule_work)</div><div class='add'>+</div><div class='add'>+/* Devlink resources */</div><div class='add'>+enum hellcreek_devlink_resource_id {</div><div class='add'>+	HELLCREEK_DEVLINK_PARAM_ID_VLAN_TABLE,</div><div class='add'>+	HELLCREEK_DEVLINK_PARAM_ID_FDB_TABLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hellcreek_devlink_vlan_entry {</div><div class='add'>+	u16 vid;</div><div class='add'>+	u16 member;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* _HELLCREEK_H_ */</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c b/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c<br/>new file mode 100644<br/>index 000000000000..99941ff1ebf9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c</a></div><div class='hunk'>@@ -0,0 +1,468 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/*</div><div class='add'>+ * DSA driver for:</div><div class='add'>+ * Hirschmann Hellcreek TSN switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019,2020 Hochschule Offenburg</div><div class='add'>+ * Copyright (C) 2019,2020 Linutronix GmbH</div><div class='add'>+ * Authors: Kamil Alkhouri &lt;kamil.alkhouri@hs-offenburg.de&gt;</div><div class='add'>+ *	    Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hellcreek.h"</div><div class='add'>+#include "hellcreek_hwtstamp.h"</div><div class='add'>+#include "hellcreek_ptp.h"</div><div class='add'>+</div><div class='add'>+int hellcreek_get_ts_info(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	info-&gt;phc_index = hellcreek-&gt;ptp_clock ?</div><div class='add'>+		ptp_clock_index(hellcreek-&gt;ptp_clock) : -1;</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+</div><div class='add'>+	/* enabled tx timestamping */</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_ON);</div><div class='add'>+</div><div class='add'>+	/* L2 &amp; L4 PTPv2 event rx messages are timestamped */</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Enabling/disabling TX and RX HW timestamping for different PTP messages is</div><div class='add'>+ * not available in the switch. Thus, this function only serves as a check if</div><div class='add'>+ * the user requested what is actually available or not</div><div class='add'>+ */</div><div class='add'>+static int hellcreek_set_hwtstamp_config(struct hellcreek *hellcreek, int port,</div><div class='add'>+					 struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps =</div><div class='add'>+		&amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+	bool tx_tstamp_enable = false;</div><div class='add'>+	bool rx_tstamp_enable = false;</div><div class='add'>+</div><div class='add'>+	/* Interaction with the timestamp hardware is prevented here.  It is</div><div class='add'>+	 * enabled when this config function ends successfully</div><div class='add'>+	 */</div><div class='add'>+	clear_bit_unlock(HELLCREEK_HWTSTAMP_ENABLED, &amp;ps-&gt;state);</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		tx_tstamp_enable = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* TX HW timestamping can't be disabled on the switch */</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+		config-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	/* RX HW timestamping can't be disabled on the switch */</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		rx_tstamp_enable = true;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* RX HW timestamping can't be enabled for all messages on the switch */</div><div class='add'>+	case HWTSTAMP_FILTER_ALL:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tx_tstamp_enable)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (!rx_tstamp_enable)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* If this point is reached, then the requested hwtstamp config is</div><div class='add'>+	 * compatible with the hwtstamp offered by the switch.  Therefore,</div><div class='add'>+	 * enable the interaction with the HW timestamping</div><div class='add'>+	 */</div><div class='add'>+	set_bit(HELLCREEK_HWTSTAMP_ENABLED, &amp;ps-&gt;state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hellcreek_port_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+				struct kernel_hwtstamp_config *config,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ps = &amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+</div><div class='add'>+	err = hellcreek_set_hwtstamp_config(hellcreek, port, config);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Save the chosen configuration to be returned later */</div><div class='add'>+	ps-&gt;tstamp_config = *config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hellcreek_port_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+				struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps;</div><div class='add'>+</div><div class='add'>+	ps = &amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+	*config = ps-&gt;tstamp_config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns a pointer to the PTP header if the caller should time stamp, or NULL</div><div class='add'>+ * if the caller should not.</div><div class='add'>+ */</div><div class='add'>+static struct ptp_header *hellcreek_should_tstamp(struct hellcreek *hellcreek,</div><div class='add'>+						  int port, struct sk_buff *skb,</div><div class='add'>+						  unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps =</div><div class='add'>+		&amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+</div><div class='add'>+	hdr = ptp_parse_header(skb, type);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(HELLCREEK_HWTSTAMP_ENABLED, &amp;ps-&gt;state))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return hdr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 hellcreek_get_reserved_field(const struct ptp_header *hdr)</div><div class='add'>+{</div><div class='add'>+	return be32_to_cpu(hdr-&gt;reserved2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_clear_reserved_field(struct ptp_header *hdr)</div><div class='add'>+{</div><div class='add'>+	hdr-&gt;reserved2 = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_ptp_hwtstamp_available(struct hellcreek *hellcreek,</div><div class='add'>+					    unsigned int ts_reg)</div><div class='add'>+{</div><div class='add'>+	u16 status;</div><div class='add'>+</div><div class='add'>+	status = hellcreek_ptp_read(hellcreek, ts_reg);</div><div class='add'>+</div><div class='add'>+	if (status &amp; PR_TS_STATUS_TS_LOST)</div><div class='add'>+		dev_err(hellcreek-&gt;dev,</div><div class='add'>+			"Tx time stamp lost! This should never happen!\n");</div><div class='add'>+</div><div class='add'>+	/* If hwtstamp is not available, this means the previous hwtstamp was</div><div class='add'>+	 * successfully read, and the one we need is not yet available</div><div class='add'>+	 */</div><div class='add'>+	return (status &amp; PR_TS_STATUS_TS_AVAIL) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get nanoseconds timestamp from timestamping unit */</div><div class='add'>+static u64 hellcreek_ptp_hwtstamp_read(struct hellcreek *hellcreek,</div><div class='add'>+				       unsigned int ts_reg)</div><div class='add'>+{</div><div class='add'>+	u16 nsl, nsh;</div><div class='add'>+</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, ts_reg);</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, ts_reg);</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, ts_reg);</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, ts_reg);</div><div class='add'>+	nsl = hellcreek_ptp_read(hellcreek, ts_reg);</div><div class='add'>+</div><div class='add'>+	return (u64)nsl | ((u64)nsh &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_txtstamp_work(struct hellcreek *hellcreek,</div><div class='add'>+				   struct hellcreek_port_hwtstamp *ps, int port)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps shhwtstamps;</div><div class='add'>+	unsigned int status_reg, data_reg;</div><div class='add'>+	struct sk_buff *tmp_skb;</div><div class='add'>+	int ts_status;</div><div class='add'>+	u64 ns = 0;</div><div class='add'>+</div><div class='add'>+	if (!ps-&gt;tx_skb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 2:</div><div class='add'>+		status_reg = PR_TS_TX_P1_STATUS_C;</div><div class='add'>+		data_reg   = PR_TS_TX_P1_DATA_C;</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		status_reg = PR_TS_TX_P2_STATUS_C;</div><div class='add'>+		data_reg   = PR_TS_TX_P2_DATA_C;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "Wrong port for timestamping!\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts_status = hellcreek_ptp_hwtstamp_available(hellcreek, status_reg);</div><div class='add'>+</div><div class='add'>+	/* Not available yet? */</div><div class='add'>+	if (ts_status == 0) {</div><div class='add'>+		/* Check whether the operation of reading the tx timestamp has</div><div class='add'>+		 * exceeded its allowed period</div><div class='add'>+		 */</div><div class='add'>+		if (time_is_before_jiffies(ps-&gt;tx_tstamp_start +</div><div class='add'>+					   TX_TSTAMP_TIMEOUT)) {</div><div class='add'>+			dev_err(hellcreek-&gt;dev,</div><div class='add'>+				"Timeout while waiting for Tx timestamp!\n");</div><div class='add'>+			goto free_and_clear_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* The timestamp should be available quickly, while getting it</div><div class='add'>+		 * in high priority. Restart the work</div><div class='add'>+		 */</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+	ns  = hellcreek_ptp_hwtstamp_read(hellcreek, data_reg);</div><div class='add'>+	ns += hellcreek_ptp_gettime_seconds(hellcreek, ns);</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	/* Now we have the timestamp in nanoseconds, store it in the correct</div><div class='add'>+	 * structure in order to send it to the user</div><div class='add'>+	 */</div><div class='add'>+	memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='add'>+	shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='add'>+</div><div class='add'>+	tmp_skb = ps-&gt;tx_skb;</div><div class='add'>+	ps-&gt;tx_skb = NULL;</div><div class='add'>+</div><div class='add'>+	/* skb_complete_tx_timestamp() frees up the client to make another</div><div class='add'>+	 * timestampable transmit.  We have to be ready for it by clearing the</div><div class='add'>+	 * ps-&gt;tx_skb "flag" beforehand</div><div class='add'>+	 */</div><div class='add'>+	clear_bit_unlock(HELLCREEK_HWTSTAMP_TX_IN_PROGRESS, &amp;ps-&gt;state);</div><div class='add'>+</div><div class='add'>+	/* Deliver a clone of the original outgoing tx_skb with tx hwtstamp */</div><div class='add'>+	skb_complete_tx_timestamp(tmp_skb, &amp;shhwtstamps);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_and_clear_skb:</div><div class='add'>+	dev_kfree_skb_any(ps-&gt;tx_skb);</div><div class='add'>+	ps-&gt;tx_skb = NULL;</div><div class='add'>+	clear_bit_unlock(HELLCREEK_HWTSTAMP_TX_IN_PROGRESS, &amp;ps-&gt;state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_get_rxts(struct hellcreek *hellcreek,</div><div class='add'>+			       struct hellcreek_port_hwtstamp *ps,</div><div class='add'>+			       struct sk_buff *skb, struct sk_buff_head *rxq,</div><div class='add'>+			       int port)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *shwt;</div><div class='add'>+	struct sk_buff_head received;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Construct Rx timestamps for all received PTP packets. */</div><div class='add'>+	__skb_queue_head_init(&amp;received);</div><div class='add'>+	spin_lock_irqsave(&amp;rxq-&gt;lock, flags);</div><div class='add'>+	skb_queue_splice_tail_init(rxq, &amp;received);</div><div class='add'>+	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	for (; skb; skb = __skb_dequeue(&amp;received)) {</div><div class='add'>+		struct ptp_header *hdr;</div><div class='add'>+		unsigned int type;</div><div class='add'>+		u64 ns;</div><div class='add'>+</div><div class='add'>+		/* Get nanoseconds from ptp packet */</div><div class='add'>+		type = SKB_PTP_TYPE(skb);</div><div class='add'>+		hdr  = ptp_parse_header(skb, type);</div><div class='add'>+		ns   = hellcreek_get_reserved_field(hdr);</div><div class='add'>+		hellcreek_clear_reserved_field(hdr);</div><div class='add'>+</div><div class='add'>+		/* Add seconds part */</div><div class='add'>+		mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+		ns += hellcreek_ptp_gettime_seconds(hellcreek, ns);</div><div class='add'>+		mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+		/* Save time stamp */</div><div class='add'>+		shwt = skb_hwtstamps(skb);</div><div class='add'>+		memset(shwt, 0, sizeof(*shwt));</div><div class='add'>+		shwt-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_rxtstamp_work(struct hellcreek *hellcreek,</div><div class='add'>+				    struct hellcreek_port_hwtstamp *ps,</div><div class='add'>+				    int port)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = skb_dequeue(&amp;ps-&gt;rx_queue);</div><div class='add'>+	if (skb)</div><div class='add'>+		hellcreek_get_rxts(hellcreek, ps, skb, &amp;ps-&gt;rx_queue, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+long hellcreek_hwtstamp_work(struct ptp_clock_info *ptp)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ptp_to_hellcreek(ptp);</div><div class='add'>+	struct dsa_switch *ds = hellcreek-&gt;ds;</div><div class='add'>+	int i, restart = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		struct hellcreek_port_hwtstamp *ps;</div><div class='add'>+</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ps = &amp;hellcreek-&gt;ports[i].port_hwtstamp;</div><div class='add'>+</div><div class='add'>+		if (test_bit(HELLCREEK_HWTSTAMP_TX_IN_PROGRESS, &amp;ps-&gt;state))</div><div class='add'>+			restart |= hellcreek_txtstamp_work(hellcreek, ps, i);</div><div class='add'>+</div><div class='add'>+		hellcreek_rxtstamp_work(hellcreek, ps, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return restart ? 1 : -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hellcreek_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+	struct sk_buff *clone;</div><div class='add'>+	unsigned int type;</div><div class='add'>+</div><div class='add'>+	ps = &amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+</div><div class='add'>+	type = ptp_classify_raw(skb);</div><div class='add'>+	if (type == PTP_CLASS_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Make sure the message is a PTP message that needs to be timestamped</div><div class='add'>+	 * and the interaction with the HW timestamping is enabled. If not, stop</div><div class='add'>+	 * here</div><div class='add'>+	 */</div><div class='add'>+	hdr = hellcreek_should_tstamp(hellcreek, port, skb, type);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clone = skb_clone_sk(skb);</div><div class='add'>+	if (!clone)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit_lock(HELLCREEK_HWTSTAMP_TX_IN_PROGRESS,</div><div class='add'>+				  &amp;ps-&gt;state)) {</div><div class='add'>+		kfree_skb(clone);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ps-&gt;tx_skb = clone;</div><div class='add'>+</div><div class='add'>+	/* store the number of ticks occurred since system start-up till this</div><div class='add'>+	 * moment</div><div class='add'>+	 */</div><div class='add'>+	ps-&gt;tx_tstamp_start = jiffies;</div><div class='add'>+</div><div class='add'>+	ptp_schedule_worker(hellcreek-&gt;ptp_clock, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool hellcreek_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct sk_buff *skb, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ds-&gt;priv;</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+</div><div class='add'>+	ps = &amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+</div><div class='add'>+	/* This check only fails if the user did not initialize hardware</div><div class='add'>+	 * timestamping beforehand.</div><div class='add'>+	 */</div><div class='add'>+	if (ps-&gt;tstamp_config.rx_filter != HWTSTAMP_FILTER_PTP_V2_EVENT)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Make sure the message is a PTP message that needs to be timestamped</div><div class='add'>+	 * and the interaction with the HW timestamping is enabled. If not, stop</div><div class='add'>+	 * here</div><div class='add'>+	 */</div><div class='add'>+	hdr = hellcreek_should_tstamp(hellcreek, port, skb, type);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	SKB_PTP_TYPE(skb) = type;</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;ps-&gt;rx_queue, skb);</div><div class='add'>+</div><div class='add'>+	ptp_schedule_worker(hellcreek-&gt;ptp_clock, 0);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_hwtstamp_port_setup(struct hellcreek *hellcreek, int port)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek_port_hwtstamp *ps =</div><div class='add'>+		&amp;hellcreek-&gt;ports[port].port_hwtstamp;</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;ps-&gt;rx_queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hellcreek_hwtstamp_setup(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = hellcreek-&gt;ds;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Initialize timestamping ports. */</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; ++i) {</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		hellcreek_hwtstamp_port_setup(hellcreek, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Select the synchronized clock as the source timekeeper for the</div><div class='add'>+	 * timestamps and enable inline timestamping.</div><div class='add'>+	 */</div><div class='add'>+	hellcreek_ptp_write(hellcreek, PR_SETTINGS_C_TS_SRC_TK_MASK |</div><div class='add'>+			    PR_SETTINGS_C_RES3TS,</div><div class='add'>+			    PR_SETTINGS_C);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hellcreek_hwtstamp_free(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	/* Nothing todo */</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h b/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h<br/>new file mode 100644<br/>index 000000000000..388821c4aa10<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h</a></div><div class='hunk'>@@ -0,0 +1,59 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * DSA driver for:</div><div class='add'>+ * Hirschmann Hellcreek TSN switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019,2020 Hochschule Offenburg</div><div class='add'>+ * Copyright (C) 2019,2020 Linutronix GmbH</div><div class='add'>+ * Authors: Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ *	    Kamil Alkhouri &lt;kamil.alkhouri@hs-offenburg.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HELLCREEK_HWTSTAMP_H_</div><div class='add'>+#define _HELLCREEK_HWTSTAMP_H_</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include "hellcreek.h"</div><div class='add'>+</div><div class='add'>+/* Timestamp Register */</div><div class='add'>+#define PR_TS_RX_P1_STATUS_C	(0x1d * 2)</div><div class='add'>+#define PR_TS_RX_P1_DATA_C	(0x1e * 2)</div><div class='add'>+#define PR_TS_TX_P1_STATUS_C	(0x1f * 2)</div><div class='add'>+#define PR_TS_TX_P1_DATA_C	(0x20 * 2)</div><div class='add'>+#define PR_TS_RX_P2_STATUS_C	(0x25 * 2)</div><div class='add'>+#define PR_TS_RX_P2_DATA_C	(0x26 * 2)</div><div class='add'>+#define PR_TS_TX_P2_STATUS_C	(0x27 * 2)</div><div class='add'>+#define PR_TS_TX_P2_DATA_C	(0x28 * 2)</div><div class='add'>+</div><div class='add'>+#define PR_TS_STATUS_TS_AVAIL	BIT(2)</div><div class='add'>+#define PR_TS_STATUS_TS_LOST	BIT(3)</div><div class='add'>+</div><div class='add'>+#define SKB_PTP_TYPE(__skb) (*(unsigned int *)((__skb)-&gt;cb))</div><div class='add'>+</div><div class='add'>+/* TX_TSTAMP_TIMEOUT: This limits the time spent polling for a TX</div><div class='add'>+ * timestamp. When working properly, hardware will produce a timestamp</div><div class='add'>+ * within 1ms. Software may enounter delays, so the timeout is set</div><div class='add'>+ * accordingly.</div><div class='add'>+ */</div><div class='add'>+#define TX_TSTAMP_TIMEOUT	msecs_to_jiffies(40)</div><div class='add'>+</div><div class='add'>+int hellcreek_port_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+				struct kernel_hwtstamp_config *config,</div><div class='add'>+				struct netlink_ext_ack *extack);</div><div class='add'>+int hellcreek_port_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+				struct kernel_hwtstamp_config *config);</div><div class='add'>+</div><div class='add'>+bool hellcreek_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct sk_buff *clone, unsigned int type);</div><div class='add'>+void hellcreek_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+int hellcreek_get_ts_info(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct kernel_ethtool_ts_info *info);</div><div class='add'>+</div><div class='add'>+long hellcreek_hwtstamp_work(struct ptp_clock_info *ptp);</div><div class='add'>+</div><div class='add'>+int hellcreek_hwtstamp_setup(struct hellcreek *chip);</div><div class='add'>+void hellcreek_hwtstamp_free(struct hellcreek *chip);</div><div class='add'>+</div><div class='add'>+#endif /* _HELLCREEK_HWTSTAMP_H_ */</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/hellcreek_ptp.c b/drivers/net/dsa/hirschmann/hellcreek_ptp.c<br/>new file mode 100644<br/>index 000000000000..cb23bea9c21b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/hellcreek_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/hellcreek_ptp.c</a></div><div class='hunk'>@@ -0,0 +1,472 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/*</div><div class='add'>+ * DSA driver for:</div><div class='add'>+ * Hirschmann Hellcreek TSN switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019,2020 Hochschule Offenburg</div><div class='add'>+ * Copyright (C) 2019,2020 Linutronix GmbH</div><div class='add'>+ * Authors: Kamil Alkhouri &lt;kamil.alkhouri@hs-offenburg.de&gt;</div><div class='add'>+ *	    Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include "hellcreek.h"</div><div class='add'>+#include "hellcreek_ptp.h"</div><div class='add'>+#include "hellcreek_hwtstamp.h"</div><div class='add'>+</div><div class='add'>+u16 hellcreek_ptp_read(struct hellcreek *hellcreek, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	return readw(hellcreek-&gt;ptp_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hellcreek_ptp_write(struct hellcreek *hellcreek, u16 data,</div><div class='add'>+			 unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	writew(data, hellcreek-&gt;ptp_base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Get nanoseconds from PTP clock */</div><div class='add'>+static u64 hellcreek_ptp_clock_read(struct hellcreek *hellcreek,</div><div class='add'>+				    struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	u16 nsl, nsh;</div><div class='add'>+</div><div class='add'>+	/* Take a snapshot */</div><div class='add'>+	hellcreek_ptp_write(hellcreek, PR_COMMAND_C_SS, PR_COMMAND_C);</div><div class='add'>+</div><div class='add'>+	/* The time of the day is saved as 96 bits. However, due to hardware</div><div class='add'>+	 * limitations the seconds are not or only partly kept in the PTP</div><div class='add'>+	 * core. Currently only three bits for the seconds are available. That's</div><div class='add'>+	 * why only the nanoseconds are used and the seconds are tracked in</div><div class='add'>+	 * software. Anyway due to internal locking all five registers should be</div><div class='add'>+	 * read.</div><div class='add'>+	 */</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, PR_SS_SYNC_DATA_C);</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, PR_SS_SYNC_DATA_C);</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, PR_SS_SYNC_DATA_C);</div><div class='add'>+	nsh = hellcreek_ptp_read(hellcreek, PR_SS_SYNC_DATA_C);</div><div class='add'>+	ptp_read_system_prets(sts);</div><div class='add'>+	nsl = hellcreek_ptp_read(hellcreek, PR_SS_SYNC_DATA_C);</div><div class='add'>+	ptp_read_system_postts(sts);</div><div class='add'>+</div><div class='add'>+	return (u64)nsl | ((u64)nsh &lt;&lt; 16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 __hellcreek_ptp_gettime(struct hellcreek *hellcreek,</div><div class='add'>+				   struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	ns = hellcreek_ptp_clock_read(hellcreek, sts);</div><div class='add'>+	if (ns &lt; hellcreek-&gt;last_ts)</div><div class='add'>+		hellcreek-&gt;seconds++;</div><div class='add'>+	hellcreek-&gt;last_ts = ns;</div><div class='add'>+	ns += hellcreek-&gt;seconds * NSEC_PER_SEC;</div><div class='add'>+</div><div class='add'>+	return ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Retrieve the seconds parts in nanoseconds for a packet timestamped with @ns.</div><div class='add'>+ * There has to be a check whether an overflow occurred between the packet</div><div class='add'>+ * arrival and now. If so use the correct seconds (-1) for calculating the</div><div class='add'>+ * packet arrival time.</div><div class='add'>+ */</div><div class='add'>+u64 hellcreek_ptp_gettime_seconds(struct hellcreek *hellcreek, u64 ns)</div><div class='add'>+{</div><div class='add'>+	u64 s;</div><div class='add'>+</div><div class='add'>+	__hellcreek_ptp_gettime(hellcreek, NULL);</div><div class='add'>+	if (hellcreek-&gt;last_ts &gt; ns)</div><div class='add'>+		s = hellcreek-&gt;seconds * NSEC_PER_SEC;</div><div class='add'>+	else</div><div class='add'>+		s = (hellcreek-&gt;seconds - 1) * NSEC_PER_SEC;</div><div class='add'>+</div><div class='add'>+	return s;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_ptp_gettimex(struct ptp_clock_info *ptp,</div><div class='add'>+				  struct timespec64 *ts,</div><div class='add'>+				  struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ptp_to_hellcreek(ptp);</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+	ns = __hellcreek_ptp_gettime(hellcreek, sts);</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(ns);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_ptp_settime(struct ptp_clock_info *ptp,</div><div class='add'>+				 const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ptp_to_hellcreek(ptp);</div><div class='add'>+	u16 secl, nsh, nsl;</div><div class='add'>+</div><div class='add'>+	secl = ts-&gt;tv_sec &amp; 0xffff;</div><div class='add'>+	nsh  = ((u32)ts-&gt;tv_nsec &amp; 0xffff0000) &gt;&gt; 16;</div><div class='add'>+	nsl  = ts-&gt;tv_nsec &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	/* Update overflow data structure */</div><div class='add'>+	hellcreek-&gt;seconds = ts-&gt;tv_sec;</div><div class='add'>+	hellcreek-&gt;last_ts = ts-&gt;tv_nsec;</div><div class='add'>+</div><div class='add'>+	/* Set time in clock */</div><div class='add'>+	hellcreek_ptp_write(hellcreek, 0x00, PR_CLOCK_WRITE_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, 0x00, PR_CLOCK_WRITE_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, secl, PR_CLOCK_WRITE_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, nsh,  PR_CLOCK_WRITE_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, nsl,  PR_CLOCK_WRITE_C);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ptp_to_hellcreek(ptp);</div><div class='add'>+	u16 negative = 0, addendh, addendl;</div><div class='add'>+	u32 addend;</div><div class='add'>+	u64 adj;</div><div class='add'>+</div><div class='add'>+	if (scaled_ppm &lt; 0) {</div><div class='add'>+		negative = 1;</div><div class='add'>+		scaled_ppm = -scaled_ppm;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* IP-Core adjusts the nominal frequency by adding or subtracting 1 ns</div><div class='add'>+	 * from the 8 ns (period of the oscillator) every time the accumulator</div><div class='add'>+	 * register overflows. The value stored in the addend register is added</div><div class='add'>+	 * to the accumulator register every 8 ns.</div><div class='add'>+	 *</div><div class='add'>+	 * addend value = (2^30 * accumulator_overflow_rate) /</div><div class='add'>+	 *                oscillator_frequency</div><div class='add'>+	 * where:</div><div class='add'>+	 *</div><div class='add'>+	 * oscillator_frequency = 125 MHz</div><div class='add'>+	 * accumulator_overflow_rate = 125 MHz * scaled_ppm * 2^-16 * 10^-6 * 8</div><div class='add'>+	 */</div><div class='add'>+	adj = scaled_ppm;</div><div class='add'>+	adj &lt;&lt;= 11;</div><div class='add'>+	addend = (u32)div_u64(adj, 15625);</div><div class='add'>+</div><div class='add'>+	addendh = (addend &amp; 0xffff0000) &gt;&gt; 16;</div><div class='add'>+	addendl = addend &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	negative = (negative &lt;&lt; 15) &amp; 0x8000;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	/* Set drift register */</div><div class='add'>+	hellcreek_ptp_write(hellcreek, negative, PR_CLOCK_DRIFT_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, 0x00, PR_CLOCK_DRIFT_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, 0x00, PR_CLOCK_DRIFT_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, addendh,  PR_CLOCK_DRIFT_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, addendl,  PR_CLOCK_DRIFT_C);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = ptp_to_hellcreek(ptp);</div><div class='add'>+	u16 negative = 0, counth, countl;</div><div class='add'>+	u32 count_val;</div><div class='add'>+</div><div class='add'>+	/* If the offset is larger than IP-Core slow offset resources. Don't</div><div class='add'>+	 * consider slow adjustment. Rather, add the offset directly to the</div><div class='add'>+	 * current time</div><div class='add'>+	 */</div><div class='add'>+	if (abs(delta) &gt; MAX_SLOW_OFFSET_ADJ) {</div><div class='add'>+		struct timespec64 now, then = ns_to_timespec64(delta);</div><div class='add'>+</div><div class='add'>+		hellcreek_ptp_gettimex(ptp, &amp;now, NULL);</div><div class='add'>+		now = timespec64_add(now, then);</div><div class='add'>+		hellcreek_ptp_settime(ptp, &amp;now);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (delta &lt; 0) {</div><div class='add'>+		negative = 1;</div><div class='add'>+		delta = -delta;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 'count_val' does not exceed the maximum register size (2^30) */</div><div class='add'>+	count_val = div_s64(delta, MAX_NS_PER_STEP);</div><div class='add'>+</div><div class='add'>+	counth = (count_val &amp; 0xffff0000) &gt;&gt; 16;</div><div class='add'>+	countl = count_val &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	negative = (negative &lt;&lt; 15) &amp; 0x8000;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	/* Set offset write register */</div><div class='add'>+	hellcreek_ptp_write(hellcreek, negative, PR_CLOCK_OFFSET_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, MAX_NS_PER_STEP, PR_CLOCK_OFFSET_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, MIN_CLK_CYCLES_BETWEEN_STEPS,</div><div class='add'>+			    PR_CLOCK_OFFSET_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, countl,  PR_CLOCK_OFFSET_C);</div><div class='add'>+	hellcreek_ptp_write(hellcreek, counth,  PR_CLOCK_OFFSET_C);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hellcreek_ptp_enable(struct ptp_clock_info *ptp,</div><div class='add'>+				struct ptp_clock_request *rq, int on)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_ptp_overflow_check(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dw = to_delayed_work(work);</div><div class='add'>+	struct hellcreek *hellcreek;</div><div class='add'>+</div><div class='add'>+	hellcreek = dw_overflow_to_hellcreek(dw);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+	__hellcreek_ptp_gettime(hellcreek, NULL);</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;hellcreek-&gt;overflow_work,</div><div class='add'>+			      HELLCREEK_OVERFLOW_PERIOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum led_brightness hellcreek_get_brightness(struct hellcreek *hellcreek,</div><div class='add'>+						    int led)</div><div class='add'>+{</div><div class='add'>+	return (hellcreek-&gt;status_out &amp; led) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_set_brightness(struct hellcreek *hellcreek, int led,</div><div class='add'>+				     enum led_brightness b)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	if (b)</div><div class='add'>+		hellcreek-&gt;status_out |= led;</div><div class='add'>+	else</div><div class='add'>+		hellcreek-&gt;status_out &amp;= ~led;</div><div class='add'>+</div><div class='add'>+	hellcreek_ptp_write(hellcreek, hellcreek-&gt;status_out, STATUS_OUT);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;hellcreek-&gt;ptp_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_led_sync_good_set(struct led_classdev *ldev,</div><div class='add'>+					enum led_brightness b)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_sync_good);</div><div class='add'>+</div><div class='add'>+	hellcreek_set_brightness(hellcreek, STATUS_OUT_SYNC_GOOD, b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum led_brightness hellcreek_led_sync_good_get(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_sync_good);</div><div class='add'>+</div><div class='add'>+	return hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hellcreek_led_is_gm_set(struct led_classdev *ldev,</div><div class='add'>+				    enum led_brightness b)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_is_gm);</div><div class='add'>+</div><div class='add'>+	hellcreek_set_brightness(hellcreek, STATUS_OUT_IS_GM, b);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum led_brightness hellcreek_led_is_gm_get(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct hellcreek *hellcreek = led_to_hellcreek(ldev, led_is_gm);</div><div class='add'>+</div><div class='add'>+	return hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There two available LEDs internally called sync_good and is_gm. However, the</div><div class='add'>+ * user might want to use a different label and specify the default state. Take</div><div class='add'>+ * those properties from device tree.</div><div class='add'>+ */</div><div class='add'>+static int hellcreek_led_setup(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	struct device_node *leds, *led = NULL;</div><div class='add'>+	enum led_default_state state;</div><div class='add'>+	const char *label;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	of_node_get(hellcreek-&gt;dev-&gt;of_node);</div><div class='add'>+	leds = of_find_node_by_name(hellcreek-&gt;dev-&gt;of_node, "leds");</div><div class='add'>+	if (!leds) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "No LEDs specified in device tree!\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;status_out = 0;</div><div class='add'>+</div><div class='add'>+	led = of_get_next_available_child(leds, led);</div><div class='add'>+	if (!led) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "First LED not specified!\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_string(led, "label", &amp;label);</div><div class='add'>+	hellcreek-&gt;led_sync_good.name = ret ? "sync_good" : label;</div><div class='add'>+</div><div class='add'>+	state = led_init_default_state_get(of_fwnode_handle(led));</div><div class='add'>+	switch (state) {</div><div class='add'>+	case LEDS_DEFSTATE_ON:</div><div class='add'>+		hellcreek-&gt;led_sync_good.brightness = 1;</div><div class='add'>+		break;</div><div class='add'>+	case LEDS_DEFSTATE_KEEP:</div><div class='add'>+		hellcreek-&gt;led_sync_good.brightness =</div><div class='add'>+			hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		hellcreek-&gt;led_sync_good.brightness = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;led_sync_good.max_brightness = 1;</div><div class='add'>+	hellcreek-&gt;led_sync_good.brightness_set = hellcreek_led_sync_good_set;</div><div class='add'>+	hellcreek-&gt;led_sync_good.brightness_get = hellcreek_led_sync_good_get;</div><div class='add'>+</div><div class='add'>+	led = of_get_next_available_child(leds, led);</div><div class='add'>+	if (!led) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "Second LED not specified!\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_string(led, "label", &amp;label);</div><div class='add'>+	hellcreek-&gt;led_is_gm.name = ret ? "is_gm" : label;</div><div class='add'>+</div><div class='add'>+	state = led_init_default_state_get(of_fwnode_handle(led));</div><div class='add'>+	switch (state) {</div><div class='add'>+	case LEDS_DEFSTATE_ON:</div><div class='add'>+		hellcreek-&gt;led_is_gm.brightness = 1;</div><div class='add'>+		break;</div><div class='add'>+	case LEDS_DEFSTATE_KEEP:</div><div class='add'>+		hellcreek-&gt;led_is_gm.brightness =</div><div class='add'>+			hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		hellcreek-&gt;led_is_gm.brightness = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;led_is_gm.max_brightness = 1;</div><div class='add'>+	hellcreek-&gt;led_is_gm.brightness_set = hellcreek_led_is_gm_set;</div><div class='add'>+	hellcreek-&gt;led_is_gm.brightness_get = hellcreek_led_is_gm_get;</div><div class='add'>+</div><div class='add'>+	/* Set initial state */</div><div class='add'>+	if (hellcreek-&gt;led_sync_good.brightness == 1)</div><div class='add'>+		hellcreek_set_brightness(hellcreek, STATUS_OUT_SYNC_GOOD, 1);</div><div class='add'>+	if (hellcreek-&gt;led_is_gm.brightness == 1)</div><div class='add'>+		hellcreek_set_brightness(hellcreek, STATUS_OUT_IS_GM, 1);</div><div class='add'>+</div><div class='add'>+	/* Register both leds */</div><div class='add'>+	ret = led_classdev_register(hellcreek-&gt;dev, &amp;hellcreek-&gt;led_sync_good);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "Failed to register sync_good LED\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = led_classdev_register(hellcreek-&gt;dev, &amp;hellcreek-&gt;led_is_gm);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(hellcreek-&gt;dev, "Failed to register is_gm LED\n");</div><div class='add'>+		led_classdev_unregister(&amp;hellcreek-&gt;led_sync_good);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	of_node_put(leds);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hellcreek_ptp_setup(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	u16 status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Set up the overflow work */</div><div class='add'>+	INIT_DELAYED_WORK(&amp;hellcreek-&gt;overflow_work,</div><div class='add'>+			  hellcreek_ptp_overflow_check);</div><div class='add'>+</div><div class='add'>+	/* Setup PTP clock */</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.owner = THIS_MODULE;</div><div class='add'>+	snprintf(hellcreek-&gt;ptp_clock_info.name,</div><div class='add'>+		 sizeof(hellcreek-&gt;ptp_clock_info.name),</div><div class='add'>+		 dev_name(hellcreek-&gt;dev));</div><div class='add'>+</div><div class='add'>+	/* IP-Core can add up to 0.5 ns per 8 ns cycle, which means</div><div class='add'>+	 * accumulator_overflow_rate shall not exceed 62.5 MHz (which adjusts</div><div class='add'>+	 * the nominal frequency by 6.25%)</div><div class='add'>+	 */</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.max_adj     = 62500000;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.n_alarm     = 0;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.n_pins      = 0;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.n_ext_ts    = 0;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.n_per_out   = 0;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.pps	      = 0;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.adjfine     = hellcreek_ptp_adjfine;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.adjtime     = hellcreek_ptp_adjtime;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.gettimex64  = hellcreek_ptp_gettimex;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.settime64   = hellcreek_ptp_settime;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.enable      = hellcreek_ptp_enable;</div><div class='add'>+	hellcreek-&gt;ptp_clock_info.do_aux_work = hellcreek_hwtstamp_work;</div><div class='add'>+</div><div class='add'>+	hellcreek-&gt;ptp_clock = ptp_clock_register(&amp;hellcreek-&gt;ptp_clock_info,</div><div class='add'>+						  hellcreek-&gt;dev);</div><div class='add'>+	if (IS_ERR(hellcreek-&gt;ptp_clock))</div><div class='add'>+		return PTR_ERR(hellcreek-&gt;ptp_clock);</div><div class='add'>+</div><div class='add'>+	/* Enable the offset correction process, if no offset correction is</div><div class='add'>+	 * already taking place</div><div class='add'>+	 */</div><div class='add'>+	status = hellcreek_ptp_read(hellcreek, PR_CLOCK_STATUS_C);</div><div class='add'>+	if (!(status &amp; PR_CLOCK_STATUS_C_OFS_ACT))</div><div class='add'>+		hellcreek_ptp_write(hellcreek,</div><div class='add'>+				    status | PR_CLOCK_STATUS_C_ENA_OFS,</div><div class='add'>+				    PR_CLOCK_STATUS_C);</div><div class='add'>+</div><div class='add'>+	/* Enable the drift correction process */</div><div class='add'>+	hellcreek_ptp_write(hellcreek, status | PR_CLOCK_STATUS_C_ENA_DRIFT,</div><div class='add'>+			    PR_CLOCK_STATUS_C);</div><div class='add'>+</div><div class='add'>+	/* LED setup */</div><div class='add'>+	ret = hellcreek_led_setup(hellcreek);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (hellcreek-&gt;ptp_clock)</div><div class='add'>+			ptp_clock_unregister(hellcreek-&gt;ptp_clock);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;hellcreek-&gt;overflow_work,</div><div class='add'>+			      HELLCREEK_OVERFLOW_PERIOD);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hellcreek_ptp_free(struct hellcreek *hellcreek)</div><div class='add'>+{</div><div class='add'>+	led_classdev_unregister(&amp;hellcreek-&gt;led_is_gm);</div><div class='add'>+	led_classdev_unregister(&amp;hellcreek-&gt;led_sync_good);</div><div class='add'>+	cancel_delayed_work_sync(&amp;hellcreek-&gt;overflow_work);</div><div class='add'>+	if (hellcreek-&gt;ptp_clock)</div><div class='add'>+		ptp_clock_unregister(hellcreek-&gt;ptp_clock);</div><div class='add'>+	hellcreek-&gt;ptp_clock = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/hirschmann/hellcreek_ptp.h b/drivers/net/dsa/hirschmann/hellcreek_ptp.h<br/>new file mode 100644<br/>index 000000000000..0b51392c7e56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/hirschmann/hellcreek_ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/hirschmann/hellcreek_ptp.h</a></div><div class='hunk'>@@ -0,0 +1,76 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */</div><div class='add'>+/*</div><div class='add'>+ * DSA driver for:</div><div class='add'>+ * Hirschmann Hellcreek TSN switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019,2020 Hochschule Offenburg</div><div class='add'>+ * Copyright (C) 2019,2020 Linutronix GmbH</div><div class='add'>+ * Authors: Kurt Kanzenbach &lt;kurt@linutronix.de&gt;</div><div class='add'>+ *	    Kamil Alkhouri &lt;kamil.alkhouri@hs-offenburg.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _HELLCREEK_PTP_H_</div><div class='add'>+#define _HELLCREEK_PTP_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hellcreek.h"</div><div class='add'>+</div><div class='add'>+/* Every jump in time is 7 ns */</div><div class='add'>+#define MAX_NS_PER_STEP			7L</div><div class='add'>+</div><div class='add'>+/* Correct offset at every clock cycle */</div><div class='add'>+#define MIN_CLK_CYCLES_BETWEEN_STEPS	0</div><div class='add'>+</div><div class='add'>+/* Maximum available slow offset resources */</div><div class='add'>+#define MAX_SLOW_OFFSET_ADJ					\</div><div class='add'>+	((unsigned long long)((1 &lt;&lt; 30) - 1) * MAX_NS_PER_STEP)</div><div class='add'>+</div><div class='add'>+/* four times a second overflow check */</div><div class='add'>+#define HELLCREEK_OVERFLOW_PERIOD	(HZ / 4)</div><div class='add'>+</div><div class='add'>+/* PTP Register */</div><div class='add'>+#define PR_SETTINGS_C			(0x09 * 2)</div><div class='add'>+#define PR_SETTINGS_C_RES3TS		BIT(4)</div><div class='add'>+#define PR_SETTINGS_C_TS_SRC_TK_SHIFT	8</div><div class='add'>+#define PR_SETTINGS_C_TS_SRC_TK_MASK	GENMASK(9, 8)</div><div class='add'>+#define PR_COMMAND_C			(0x0a * 2)</div><div class='add'>+#define PR_COMMAND_C_SS			BIT(0)</div><div class='add'>+</div><div class='add'>+#define PR_CLOCK_STATUS_C		(0x0c * 2)</div><div class='add'>+#define PR_CLOCK_STATUS_C_ENA_DRIFT	BIT(12)</div><div class='add'>+#define PR_CLOCK_STATUS_C_OFS_ACT	BIT(13)</div><div class='add'>+#define PR_CLOCK_STATUS_C_ENA_OFS	BIT(14)</div><div class='add'>+</div><div class='add'>+#define PR_CLOCK_READ_C			(0x0d * 2)</div><div class='add'>+#define PR_CLOCK_WRITE_C		(0x0e * 2)</div><div class='add'>+#define PR_CLOCK_OFFSET_C		(0x0f * 2)</div><div class='add'>+#define PR_CLOCK_DRIFT_C		(0x10 * 2)</div><div class='add'>+</div><div class='add'>+#define PR_SS_FREE_DATA_C		(0x12 * 2)</div><div class='add'>+#define PR_SS_SYNT_DATA_C		(0x14 * 2)</div><div class='add'>+#define PR_SS_SYNC_DATA_C		(0x16 * 2)</div><div class='add'>+#define PR_SS_DRAC_DATA_C		(0x18 * 2)</div><div class='add'>+</div><div class='add'>+#define STATUS_OUT			(0x60 * 2)</div><div class='add'>+#define STATUS_OUT_SYNC_GOOD		BIT(0)</div><div class='add'>+#define STATUS_OUT_IS_GM		BIT(1)</div><div class='add'>+</div><div class='add'>+int hellcreek_ptp_setup(struct hellcreek *hellcreek);</div><div class='add'>+void hellcreek_ptp_free(struct hellcreek *hellcreek);</div><div class='add'>+u16 hellcreek_ptp_read(struct hellcreek *hellcreek, unsigned int offset);</div><div class='add'>+void hellcreek_ptp_write(struct hellcreek *hellcreek, u16 data,</div><div class='add'>+			 unsigned int offset);</div><div class='add'>+u64 hellcreek_ptp_gettime_seconds(struct hellcreek *hellcreek, u64 ns);</div><div class='add'>+</div><div class='add'>+#define ptp_to_hellcreek(ptp)					\</div><div class='add'>+	container_of(ptp, struct hellcreek, ptp_clock_info)</div><div class='add'>+</div><div class='add'>+#define dw_overflow_to_hellcreek(dw)				\</div><div class='add'>+	container_of(dw, struct hellcreek, overflow_work)</div><div class='add'>+</div><div class='add'>+#define led_to_hellcreek(ldev, led)				\</div><div class='add'>+	container_of(ldev, struct hellcreek, led)</div><div class='add'>+</div><div class='add'>+#endif /* _HELLCREEK_PTP_H_ */</div><div class='head'>diff --git a/drivers/net/dsa/ks8995.c b/drivers/net/dsa/ks8995.c<br/>new file mode 100644<br/>index 000000000000..77d8b842693c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ks8995.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ks8995.c</a></div><div class='hunk'>@@ -0,0 +1,857 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * SPI driver for Micrel/Kendin KS8995M and KSZ8864RMN ethernet switches</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2008 Gabor Juhos &lt;juhosg at openwrt.org&gt;</div><div class='add'>+ * Copyright (C) 2025 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ *</div><div class='add'>+ * This file was based on: drivers/spi/at25.c</div><div class='add'>+ *     Copyright (C) 2006 David Brownell</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#define DRV_VERSION		"0.1.1"</div><div class='add'>+#define DRV_DESC		"Micrel KS8995 Ethernet switch SPI driver"</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_ID0		0x00    /* Chip ID0 */</div><div class='add'>+#define KS8995_REG_ID1		0x01    /* Chip ID1 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_GC0		0x02    /* Global Control 0 */</div><div class='add'>+</div><div class='add'>+#define KS8995_GC0_P5_PHY	BIT(3)	/* Port 5 PHY enabled */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_GC1		0x03    /* Global Control 1 */</div><div class='add'>+#define KS8995_REG_GC2		0x04    /* Global Control 2 */</div><div class='add'>+</div><div class='add'>+#define KS8995_GC2_HUGE		BIT(2)	/* Huge packet support */</div><div class='add'>+#define KS8995_GC2_LEGAL	BIT(1)	/* Legal size override */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_GC3		0x05    /* Global Control 3 */</div><div class='add'>+#define KS8995_REG_GC4		0x06    /* Global Control 4 */</div><div class='add'>+</div><div class='add'>+#define KS8995_GC4_10BT		BIT(4)	/* Force switch to 10Mbit */</div><div class='add'>+#define KS8995_GC4_MII_FLOW	BIT(5)	/* MII full-duplex flow control enable */</div><div class='add'>+#define KS8995_GC4_MII_HD	BIT(6)	/* MII half-duplex mode enable */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_GC5		0x07    /* Global Control 5 */</div><div class='add'>+#define KS8995_REG_GC6		0x08    /* Global Control 6 */</div><div class='add'>+#define KS8995_REG_GC7		0x09    /* Global Control 7 */</div><div class='add'>+#define KS8995_REG_GC8		0x0a    /* Global Control 8 */</div><div class='add'>+#define KS8995_REG_GC9		0x0b    /* Global Control 9 */</div><div class='add'>+</div><div class='add'>+#define KS8995_GC9_SPECIAL	BIT(0)	/* Special tagging mode (DSA) */</div><div class='add'>+</div><div class='add'>+/* In DSA the ports 1-4 are numbered 0-3 and the CPU port is port 4 */</div><div class='add'>+#define KS8995_REG_PC(p, r)	(0x10 + (0x10 * (p)) + (r)) /* Port Control */</div><div class='add'>+#define KS8995_REG_PS(p, r)	(0x1e + (0x10 * (p)) + (r)) /* Port Status */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_PC0		0x00    /* Port Control 0 */</div><div class='add'>+#define KS8995_REG_PC1		0x01    /* Port Control 1 */</div><div class='add'>+#define KS8995_REG_PC2		0x02    /* Port Control 2 */</div><div class='add'>+#define KS8995_REG_PC3		0x03    /* Port Control 3 */</div><div class='add'>+#define KS8995_REG_PC4		0x04    /* Port Control 4 */</div><div class='add'>+#define KS8995_REG_PC5		0x05    /* Port Control 5 */</div><div class='add'>+#define KS8995_REG_PC6		0x06    /* Port Control 6 */</div><div class='add'>+#define KS8995_REG_PC7		0x07    /* Port Control 7 */</div><div class='add'>+#define KS8995_REG_PC8		0x08    /* Port Control 8 */</div><div class='add'>+#define KS8995_REG_PC9		0x09    /* Port Control 9 */</div><div class='add'>+#define KS8995_REG_PC10		0x0a    /* Port Control 10 */</div><div class='add'>+#define KS8995_REG_PC11		0x0b    /* Port Control 11 */</div><div class='add'>+#define KS8995_REG_PC12		0x0c    /* Port Control 12 */</div><div class='add'>+#define KS8995_REG_PC13		0x0d    /* Port Control 13 */</div><div class='add'>+</div><div class='add'>+#define KS8995_PC0_TAG_INS	BIT(2)	/* Enable tag insertion on port */</div><div class='add'>+#define KS8995_PC0_TAG_REM	BIT(1)	/* Enable tag removal on port */</div><div class='add'>+#define KS8995_PC0_PRIO_EN	BIT(0)	/* Enable priority handling */</div><div class='add'>+</div><div class='add'>+#define KS8995_PC2_TXEN		BIT(2)	/* Enable TX on port */</div><div class='add'>+#define KS8995_PC2_RXEN		BIT(1)	/* Enable RX on port */</div><div class='add'>+#define KS8995_PC2_LEARN_DIS	BIT(0)	/* Disable learning on port */</div><div class='add'>+</div><div class='add'>+#define KS8995_PC13_TXDIS	BIT(6)	/* Disable transmitter */</div><div class='add'>+#define KS8995_PC13_PWDN	BIT(3)	/* Power down */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_TPC0		0x60    /* TOS Priority Control 0 */</div><div class='add'>+#define KS8995_REG_TPC1		0x61    /* TOS Priority Control 1 */</div><div class='add'>+#define KS8995_REG_TPC2		0x62    /* TOS Priority Control 2 */</div><div class='add'>+#define KS8995_REG_TPC3		0x63    /* TOS Priority Control 3 */</div><div class='add'>+#define KS8995_REG_TPC4		0x64    /* TOS Priority Control 4 */</div><div class='add'>+#define KS8995_REG_TPC5		0x65    /* TOS Priority Control 5 */</div><div class='add'>+#define KS8995_REG_TPC6		0x66    /* TOS Priority Control 6 */</div><div class='add'>+#define KS8995_REG_TPC7		0x67    /* TOS Priority Control 7 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_MAC0		0x68    /* MAC address 0 */</div><div class='add'>+#define KS8995_REG_MAC1		0x69    /* MAC address 1 */</div><div class='add'>+#define KS8995_REG_MAC2		0x6a    /* MAC address 2 */</div><div class='add'>+#define KS8995_REG_MAC3		0x6b    /* MAC address 3 */</div><div class='add'>+#define KS8995_REG_MAC4		0x6c    /* MAC address 4 */</div><div class='add'>+#define KS8995_REG_MAC5		0x6d    /* MAC address 5 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REG_IAC0		0x6e    /* Indirect Access Control 0 */</div><div class='add'>+#define KS8995_REG_IAC1		0x6f    /* Indirect Access Control 0 */</div><div class='add'>+#define KS8995_REG_IAD7		0x70    /* Indirect Access Data 7 */</div><div class='add'>+#define KS8995_REG_IAD6		0x71    /* Indirect Access Data 6 */</div><div class='add'>+#define KS8995_REG_IAD5		0x72    /* Indirect Access Data 5 */</div><div class='add'>+#define KS8995_REG_IAD4		0x73    /* Indirect Access Data 4 */</div><div class='add'>+#define KS8995_REG_IAD3		0x74    /* Indirect Access Data 3 */</div><div class='add'>+#define KS8995_REG_IAD2		0x75    /* Indirect Access Data 2 */</div><div class='add'>+#define KS8995_REG_IAD1		0x76    /* Indirect Access Data 1 */</div><div class='add'>+#define KS8995_REG_IAD0		0x77    /* Indirect Access Data 0 */</div><div class='add'>+</div><div class='add'>+#define KSZ8864_REG_ID1		0xfe	/* Chip ID in bit 7 */</div><div class='add'>+</div><div class='add'>+#define KS8995_REGS_SIZE	0x80</div><div class='add'>+#define KSZ8864_REGS_SIZE	0x100</div><div class='add'>+#define KSZ8795_REGS_SIZE	0x100</div><div class='add'>+</div><div class='add'>+#define ID1_CHIPID_M		0xf</div><div class='add'>+#define ID1_CHIPID_S		4</div><div class='add'>+#define ID1_REVISION_M		0x7</div><div class='add'>+#define ID1_REVISION_S		1</div><div class='add'>+#define ID1_START_SW		1	/* start the switch */</div><div class='add'>+</div><div class='add'>+#define FAMILY_KS8995		0x95</div><div class='add'>+#define FAMILY_KSZ8795		0x87</div><div class='add'>+#define CHIPID_M		0</div><div class='add'>+#define KS8995_CHIP_ID		0x00</div><div class='add'>+#define KSZ8864_CHIP_ID		0x01</div><div class='add'>+#define KSZ8795_CHIP_ID		0x09</div><div class='add'>+</div><div class='add'>+#define KS8995_CMD_WRITE	0x02U</div><div class='add'>+#define KS8995_CMD_READ		0x03U</div><div class='add'>+</div><div class='add'>+#define KS8995_CPU_PORT		4</div><div class='add'>+#define KS8995_NUM_PORTS	5 /* 5 ports including the CPU port */</div><div class='add'>+#define KS8995_RESET_DELAY	10 /* usec */</div><div class='add'>+</div><div class='add'>+enum ks8995_chip_variant {</div><div class='add'>+	ks8995,</div><div class='add'>+	ksz8864,</div><div class='add'>+	ksz8795,</div><div class='add'>+	max_variant</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ks8995_chip_params {</div><div class='add'>+	char *name;</div><div class='add'>+	int family_id;</div><div class='add'>+	int chip_id;</div><div class='add'>+	int regs_size;</div><div class='add'>+	int addr_width;</div><div class='add'>+	int addr_shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ks8995_chip_params ks8995_chip[] = {</div><div class='add'>+	[ks8995] = {</div><div class='add'>+		.name = "KS8995MA",</div><div class='add'>+		.family_id = FAMILY_KS8995,</div><div class='add'>+		.chip_id = KS8995_CHIP_ID,</div><div class='add'>+		.regs_size = KS8995_REGS_SIZE,</div><div class='add'>+		.addr_width = 8,</div><div class='add'>+		.addr_shift = 0,</div><div class='add'>+	},</div><div class='add'>+	[ksz8864] = {</div><div class='add'>+		.name = "KSZ8864RMN",</div><div class='add'>+		.family_id = FAMILY_KS8995,</div><div class='add'>+		.chip_id = KSZ8864_CHIP_ID,</div><div class='add'>+		.regs_size = KSZ8864_REGS_SIZE,</div><div class='add'>+		.addr_width = 8,</div><div class='add'>+		.addr_shift = 0,</div><div class='add'>+	},</div><div class='add'>+	[ksz8795] = {</div><div class='add'>+		.name = "KSZ8795CLX",</div><div class='add'>+		.family_id = FAMILY_KSZ8795,</div><div class='add'>+		.chip_id = KSZ8795_CHIP_ID,</div><div class='add'>+		.regs_size = KSZ8795_REGS_SIZE,</div><div class='add'>+		.addr_width = 12,</div><div class='add'>+		.addr_shift = 1,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ks8995_switch {</div><div class='add'>+	struct spi_device	*spi;</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	struct dsa_switch	*ds;</div><div class='add'>+	struct mutex		lock;</div><div class='add'>+	struct gpio_desc	*reset_gpio;</div><div class='add'>+	struct bin_attribute	regs_attr;</div><div class='add'>+	const struct ks8995_chip_params	*chip;</div><div class='add'>+	int			revision_id;</div><div class='add'>+	unsigned int max_mtu[KS8995_NUM_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id ks8995_id[] = {</div><div class='add'>+	{"ks8995", ks8995},</div><div class='add'>+	{"ksz8864", ksz8864},</div><div class='add'>+	{"ksz8795", ksz8795},</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, ks8995_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ks8995_spi_of_match[] = {</div><div class='add'>+	{ .compatible = "micrel,ks8995" },</div><div class='add'>+	{ .compatible = "micrel,ksz8864" },</div><div class='add'>+	{ .compatible = "micrel,ksz8795" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ks8995_spi_of_match);</div><div class='add'>+</div><div class='add'>+static inline u8 get_chip_id(u8 val)</div><div class='add'>+{</div><div class='add'>+	return (val &gt;&gt; ID1_CHIPID_S) &amp; ID1_CHIPID_M;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 get_chip_rev(u8 val)</div><div class='add'>+{</div><div class='add'>+	return (val &gt;&gt; ID1_REVISION_S) &amp; ID1_REVISION_M;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* create_spi_cmd - create a chip specific SPI command header</div><div class='add'>+ * @ks: pointer to switch instance</div><div class='add'>+ * @cmd: SPI command for switch</div><div class='add'>+ * @address: register address for command</div><div class='add'>+ *</div><div class='add'>+ * Different chip families use different bit pattern to address the switches</div><div class='add'>+ * registers:</div><div class='add'>+ *</div><div class='add'>+ * KS8995: 8bit command + 8bit address</div><div class='add'>+ * KSZ8795: 3bit command + 12bit address + 1bit TR (?)</div><div class='add'>+ */</div><div class='add'>+static inline __be16 create_spi_cmd(struct ks8995_switch *ks, int cmd,</div><div class='add'>+				    unsigned address)</div><div class='add'>+{</div><div class='add'>+	u16 result = cmd;</div><div class='add'>+</div><div class='add'>+	/* make room for address (incl. address shift) */</div><div class='add'>+	result &lt;&lt;= ks-&gt;chip-&gt;addr_width + ks-&gt;chip-&gt;addr_shift;</div><div class='add'>+	/* add address */</div><div class='add'>+	result |= address &lt;&lt; ks-&gt;chip-&gt;addr_shift;</div><div class='add'>+	/* SPI protocol needs big endian */</div><div class='add'>+	return cpu_to_be16(result);</div><div class='add'>+}</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+static int ks8995_read(struct ks8995_switch *ks, char *buf,</div><div class='add'>+		 unsigned offset, size_t count)</div><div class='add'>+{</div><div class='add'>+	__be16 cmd;</div><div class='add'>+	struct spi_transfer t[2];</div><div class='add'>+	struct spi_message m;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd = create_spi_cmd(ks, KS8995_CMD_READ, offset);</div><div class='add'>+	spi_message_init(&amp;m);</div><div class='add'>+</div><div class='add'>+	memset(&amp;t, 0, sizeof(t));</div><div class='add'>+</div><div class='add'>+	t[0].tx_buf = &amp;cmd;</div><div class='add'>+	t[0].len = sizeof(cmd);</div><div class='add'>+	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='add'>+</div><div class='add'>+	t[1].rx_buf = buf;</div><div class='add'>+	t[1].len = count;</div><div class='add'>+	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ks-&gt;lock);</div><div class='add'>+	err = spi_sync(ks-&gt;spi, &amp;m);</div><div class='add'>+	mutex_unlock(&amp;ks-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err ? err : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_write(struct ks8995_switch *ks, char *buf,</div><div class='add'>+		 unsigned offset, size_t count)</div><div class='add'>+{</div><div class='add'>+	__be16 cmd;</div><div class='add'>+	struct spi_transfer t[2];</div><div class='add'>+	struct spi_message m;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd = create_spi_cmd(ks, KS8995_CMD_WRITE, offset);</div><div class='add'>+	spi_message_init(&amp;m);</div><div class='add'>+</div><div class='add'>+	memset(&amp;t, 0, sizeof(t));</div><div class='add'>+</div><div class='add'>+	t[0].tx_buf = &amp;cmd;</div><div class='add'>+	t[0].len = sizeof(cmd);</div><div class='add'>+	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='add'>+</div><div class='add'>+	t[1].tx_buf = buf;</div><div class='add'>+	t[1].len = count;</div><div class='add'>+	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ks-&gt;lock);</div><div class='add'>+	err = spi_sync(ks-&gt;spi, &amp;m);</div><div class='add'>+	mutex_unlock(&amp;ks-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return err ? err : count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ks8995_read_reg(struct ks8995_switch *ks, u8 addr, u8 *buf)</div><div class='add'>+{</div><div class='add'>+	return ks8995_read(ks, buf, addr, 1) != 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ks8995_write_reg(struct ks8995_switch *ks, u8 addr, u8 val)</div><div class='add'>+{</div><div class='add'>+	char buf = val;</div><div class='add'>+</div><div class='add'>+	return ks8995_write(ks, &amp;buf, addr, 1) != 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+</div><div class='add'>+static int ks8995_stop(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	return ks8995_write_reg(ks, KS8995_REG_ID1, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_start(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	return ks8995_write_reg(ks, KS8995_REG_ID1, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_reset(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ks8995_stop(ks);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	udelay(KS8995_RESET_DELAY);</div><div class='add'>+</div><div class='add'>+	return ks8995_start(ks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ks8995_get_revision - get chip revision</div><div class='add'>+ * @ks: pointer to switch instance</div><div class='add'>+ *</div><div class='add'>+ * Verify chip family and id and get chip revision.</div><div class='add'>+ */</div><div class='add'>+static int ks8995_get_revision(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u8 id0, id1, ksz8864_id;</div><div class='add'>+</div><div class='add'>+	/* read family id */</div><div class='add'>+	err = ks8995_read_reg(ks, KS8995_REG_ID0, &amp;id0);</div><div class='add'>+	if (err) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* verify family id */</div><div class='add'>+	if (id0 != ks-&gt;chip-&gt;family_id) {</div><div class='add'>+		dev_err(&amp;ks-&gt;spi-&gt;dev, "chip family id mismatch: expected 0x%02x but 0x%02x read\n",</div><div class='add'>+			ks-&gt;chip-&gt;family_id, id0);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ks-&gt;chip-&gt;family_id) {</div><div class='add'>+	case FAMILY_KS8995:</div><div class='add'>+		/* try reading chip id at CHIP ID1 */</div><div class='add'>+		err = ks8995_read_reg(ks, KS8995_REG_ID1, &amp;id1);</div><div class='add'>+		if (err) {</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* verify chip id */</div><div class='add'>+		if ((get_chip_id(id1) == CHIPID_M) &amp;&amp;</div><div class='add'>+		    (get_chip_id(id1) == ks-&gt;chip-&gt;chip_id)) {</div><div class='add'>+			/* KS8995MA */</div><div class='add'>+			ks-&gt;revision_id = get_chip_rev(id1);</div><div class='add'>+		} else if (get_chip_id(id1) != CHIPID_M) {</div><div class='add'>+			/* KSZ8864RMN */</div><div class='add'>+			err = ks8995_read_reg(ks, KS8995_REG_ID1, &amp;ksz8864_id);</div><div class='add'>+			if (err) {</div><div class='add'>+				err = -EIO;</div><div class='add'>+				goto err_out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if ((ksz8864_id &amp; 0x80) &amp;&amp;</div><div class='add'>+			    (ks-&gt;chip-&gt;chip_id == KSZ8864_CHIP_ID)) {</div><div class='add'>+				ks-&gt;revision_id = get_chip_rev(id1);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(&amp;ks-&gt;spi-&gt;dev, "unsupported chip id for KS8995 family: 0x%02x\n",</div><div class='add'>+				id1);</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case FAMILY_KSZ8795:</div><div class='add'>+		/* try reading chip id at CHIP ID1 */</div><div class='add'>+		err = ks8995_read_reg(ks, KS8995_REG_ID1, &amp;id1);</div><div class='add'>+		if (err) {</div><div class='add'>+			err = -EIO;</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (get_chip_id(id1) == ks-&gt;chip-&gt;chip_id) {</div><div class='add'>+			ks-&gt;revision_id = get_chip_rev(id1);</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(&amp;ks-&gt;spi-&gt;dev, "unsupported chip id for KSZ8795 family: 0x%02x\n",</div><div class='add'>+				id1);</div><div class='add'>+			err = -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(&amp;ks-&gt;spi-&gt;dev, "unsupported family id: 0x%02x\n", id0);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+err_out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_check_config(struct ks8995_switch *ks)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ret = ks8995_read_reg(ks, KS8995_REG_GC0, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to read KS8995_REG_GC0\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "port 5 PHY %senabled\n",</div><div class='add'>+		(val &amp; KS8995_GC0_P5_PHY) ? "" : "not ");</div><div class='add'>+</div><div class='add'>+	val |= KS8995_GC0_P5_PHY;</div><div class='add'>+	ret = ks8995_write_reg(ks, KS8995_REG_GC0, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to set KS8995_REG_GC0\n");</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "set KS8995_REG_GC0 to 0x%02x\n", val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ks8995_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+		  const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ks8995_mac_link_up(struct phylink_config *config, struct phy_device *phydev,</div><div class='add'>+		   unsigned int mode, phy_interface_t interface,</div><div class='add'>+		   int speed, int duplex, bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ks8995_switch *ks = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* Allow forcing the mode on the fixed CPU port, no autonegotiation.</div><div class='add'>+	 * We assume autonegotiation works on the PHY-facing ports.</div><div class='add'>+	 */</div><div class='add'>+	if (port != KS8995_CPU_PORT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "MAC link up on CPU port (%d)\n", port);</div><div class='add'>+</div><div class='add'>+	ret = ks8995_read_reg(ks, KS8995_REG_GC4, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to read KS8995_REG_GC4\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Conjure port config */</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		dev_dbg(ks-&gt;dev, "set switch MII to 100Mbit mode\n");</div><div class='add'>+		val |= KS8995_GC4_10BT;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(ks-&gt;dev, "set switch MII to 100Mbit mode\n");</div><div class='add'>+		val &amp;= ~KS8995_GC4_10BT;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_HALF) {</div><div class='add'>+		dev_dbg(ks-&gt;dev, "set switch MII to half duplex\n");</div><div class='add'>+		val |= KS8995_GC4_MII_HD;</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(ks-&gt;dev, "set switch MII to full duplex\n");</div><div class='add'>+		val &amp;= ~KS8995_GC4_MII_HD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "set KS8995_REG_GC4 to %02x\n", val);</div><div class='add'>+</div><div class='add'>+	/* Enable the CPU port */</div><div class='add'>+	ret = ks8995_write_reg(ks, KS8995_REG_GC4, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to set KS8995_REG_GC4\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ks8995_mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='add'>+		     phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ks8995_switch *ks = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (port != KS8995_CPU_PORT)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "MAC link down on CPU port (%d)\n", port);</div><div class='add'>+</div><div class='add'>+	/* Disable the CPU port */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops ks8995_phylink_mac_ops = {</div><div class='add'>+	.mac_config = ks8995_mac_config,</div><div class='add'>+	.mac_link_up = ks8995_mac_link_up,</div><div class='add'>+	.mac_link_down = ks8995_mac_link_down,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum</div><div class='add'>+dsa_tag_protocol ks8995_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+					 int port,</div><div class='add'>+					 enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	/* This switch actually uses the 6 byte KS8995 protocol */</div><div class='add'>+	return DSA_TAG_PROTO_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "enable port %d\n", port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ks8995_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "disable port %d\n", port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+					struct switchdev_brport_flags flags,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	/* We support enabling/disabling learning */</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct switchdev_brport_flags flags,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		ret = ks8995_read_reg(ks, KS8995_REG_PC(port, KS8995_REG_PC2), &amp;val);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(ks-&gt;dev, "failed to read KS8995_REG_PC2 on port %d\n", port);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (flags.val &amp; BR_LEARNING)</div><div class='add'>+			val &amp;= ~KS8995_PC2_LEARN_DIS;</div><div class='add'>+		else</div><div class='add'>+			val |= KS8995_PC2_LEARN_DIS;</div><div class='add'>+</div><div class='add'>+		ret = ks8995_write_reg(ks, KS8995_REG_PC(port, KS8995_REG_PC2), val);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(ks-&gt;dev, "failed to write KS8995_REG_PC2 on port %d\n", port);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ks8995_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ret = ks8995_read_reg(ks, KS8995_REG_PC(port, KS8995_REG_PC2), &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to read KS8995_REG_PC2 on port %d\n", port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the bits for the different STP states in accordance with</div><div class='add'>+	 * the datasheet, pages 36-37 "Spanning tree support".</div><div class='add'>+	 */</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		val &amp;= ~KS8995_PC2_TXEN;</div><div class='add'>+		val &amp;= ~KS8995_PC2_RXEN;</div><div class='add'>+		val |= KS8995_PC2_LEARN_DIS;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		val &amp;= ~KS8995_PC2_TXEN;</div><div class='add'>+		val &amp;= ~KS8995_PC2_RXEN;</div><div class='add'>+		val &amp;= ~KS8995_PC2_LEARN_DIS;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		val |= KS8995_PC2_TXEN;</div><div class='add'>+		val |= KS8995_PC2_RXEN;</div><div class='add'>+		val &amp;= ~KS8995_PC2_LEARN_DIS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ks-&gt;dev, "unknown bridge state requested\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ks8995_write_reg(ks, KS8995_REG_PC(port, KS8995_REG_PC2), val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to write KS8995_REG_PC2 on port %d\n", port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "set KS8995_REG_PC2 for port %d to %02x\n", port, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ks8995_phylink_get_caps(struct dsa_switch *dsa, int port,</div><div class='add'>+				    struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long *interfaces = config-&gt;supported_interfaces;</div><div class='add'>+</div><div class='add'>+	if (port == KS8995_CPU_PORT)</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, interfaces);</div><div class='add'>+</div><div class='add'>+	if (port &lt;= 3) {</div><div class='add'>+		/* Internal PHYs */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL, interfaces);</div><div class='add'>+		/* phylib default */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, interfaces);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Huge packet support up to 1916 byte packages "inclusive"</div><div class='add'>+ * which means that tags are included. If the bit is not set</div><div class='add'>+ * it is 1536 bytes "inclusive". We present the length without</div><div class='add'>+ * tags or ethernet headers. The setting affects all ports.</div><div class='add'>+ */</div><div class='add'>+static int ks8995_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks = ds-&gt;priv;</div><div class='add'>+	unsigned int max_mtu;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ks-&gt;max_mtu[port] = new_mtu;</div><div class='add'>+</div><div class='add'>+	/* Roof out the MTU for the entire switch to the greatest</div><div class='add'>+	 * common denominator: the biggest set for any one port will</div><div class='add'>+	 * be the biggest MTU for the switch.</div><div class='add'>+	 */</div><div class='add'>+	max_mtu = ETH_DATA_LEN;</div><div class='add'>+	for (i = 0; i &lt; KS8995_NUM_PORTS; i++) {</div><div class='add'>+		if (ks-&gt;max_mtu[i] &gt; max_mtu)</div><div class='add'>+			max_mtu = ks-&gt;max_mtu[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Translate to layer 2 size.</div><div class='add'>+	 * Add ethernet and (possible) VLAN headers, and checksum to the size.</div><div class='add'>+	 * For ETH_DATA_LEN (1500 bytes) this will add up to 1522 bytes.</div><div class='add'>+	 */</div><div class='add'>+	max_mtu += VLAN_ETH_HLEN;</div><div class='add'>+	max_mtu += ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	ret = ks8995_read_reg(ks, KS8995_REG_GC2, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to read KS8995_REG_GC2\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (max_mtu &lt;= 1522) {</div><div class='add'>+		val &amp;= ~KS8995_GC2_HUGE;</div><div class='add'>+		val &amp;= ~KS8995_GC2_LEGAL;</div><div class='add'>+	} else if (max_mtu &gt; 1522 &amp;&amp; max_mtu &lt;= 1536) {</div><div class='add'>+		/* This accepts packets up to 1536 bytes */</div><div class='add'>+		val &amp;= ~KS8995_GC2_HUGE;</div><div class='add'>+		val |= KS8995_GC2_LEGAL;</div><div class='add'>+	} else {</div><div class='add'>+		/* This accepts packets up to 1916 bytes */</div><div class='add'>+		val |= KS8995_GC2_HUGE;</div><div class='add'>+		val |= KS8995_GC2_LEGAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(ks-&gt;dev, "new max MTU %d bytes (inclusive)\n", max_mtu);</div><div class='add'>+</div><div class='add'>+	ret = ks8995_write_reg(ks, KS8995_REG_GC2, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(ks-&gt;dev, "failed to set KS8995_REG_GC2\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ks8995_get_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return 1916 - ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops ks8995_ds_ops = {</div><div class='add'>+	.get_tag_protocol = ks8995_get_tag_protocol,</div><div class='add'>+	.setup = ks8995_setup,</div><div class='add'>+	.port_pre_bridge_flags = ks8995_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags = ks8995_port_bridge_flags,</div><div class='add'>+	.port_enable = ks8995_port_enable,</div><div class='add'>+	.port_disable = ks8995_port_disable,</div><div class='add'>+	.port_stp_state_set = ks8995_port_stp_state_set,</div><div class='add'>+	.port_change_mtu = ks8995_change_mtu,</div><div class='add'>+	.port_max_mtu = ks8995_get_max_mtu,</div><div class='add'>+	.phylink_get_caps = ks8995_phylink_get_caps,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+static int ks8995_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks;</div><div class='add'>+	int err;</div><div class='add'>+	int variant = spi_get_device_id(spi)-&gt;driver_data;</div><div class='add'>+</div><div class='add'>+	if (variant &gt;= max_variant) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "bad chip variant %d\n", variant);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ks = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*ks), GFP_KERNEL);</div><div class='add'>+	if (!ks)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;ks-&gt;lock);</div><div class='add'>+	ks-&gt;spi = spi;</div><div class='add'>+	ks-&gt;dev = &amp;spi-&gt;dev;</div><div class='add'>+	ks-&gt;chip = &amp;ks8995_chip[variant];</div><div class='add'>+</div><div class='add'>+	ks-&gt;reset_gpio = devm_gpiod_get_optional(&amp;spi-&gt;dev, "reset",</div><div class='add'>+						 GPIOD_OUT_HIGH);</div><div class='add'>+	err = PTR_ERR_OR_ZERO(ks-&gt;reset_gpio);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev,</div><div class='add'>+			"failed to get reset gpio: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = gpiod_set_consumer_name(ks-&gt;reset_gpio, "switch-reset");</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (ks-&gt;reset_gpio) {</div><div class='add'>+		/*</div><div class='add'>+		 * If a reset line was obtained, wait for 100us after</div><div class='add'>+		 * de-asserting RESET before accessing any registers, see</div><div class='add'>+		 * the KS8995MA datasheet, page 44.</div><div class='add'>+		 */</div><div class='add'>+		gpiod_set_value_cansleep(ks-&gt;reset_gpio, 0);</div><div class='add'>+		udelay(100);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, ks);</div><div class='add'>+</div><div class='add'>+	spi-&gt;mode = SPI_MODE_0;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	err = spi_setup(spi);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "spi_setup failed, err=%d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ks8995_get_revision(ks);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ks8995_reset(ks);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;spi-&gt;dev, "%s device found, Chip ID:%x, Revision:%x\n",</div><div class='add'>+		 ks-&gt;chip-&gt;name, ks-&gt;chip-&gt;chip_id, ks-&gt;revision_id);</div><div class='add'>+</div><div class='add'>+	err = ks8995_check_config(ks);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ks-&gt;ds = devm_kzalloc(&amp;spi-&gt;dev, sizeof(*ks-&gt;ds), GFP_KERNEL);</div><div class='add'>+	if (!ks-&gt;ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ks-&gt;ds-&gt;dev = &amp;spi-&gt;dev;</div><div class='add'>+	ks-&gt;ds-&gt;num_ports = KS8995_NUM_PORTS;</div><div class='add'>+	ks-&gt;ds-&gt;ops = &amp;ks8995_ds_ops;</div><div class='add'>+	ks-&gt;ds-&gt;phylink_mac_ops = &amp;ks8995_phylink_mac_ops;</div><div class='add'>+	ks-&gt;ds-&gt;priv = ks;</div><div class='add'>+</div><div class='add'>+	err = dsa_register_switch(ks-&gt;ds);</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;spi-&gt;dev, err,</div><div class='add'>+				     "unable to register DSA switch\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ks8995_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ks8995_switch *ks = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(ks-&gt;ds);</div><div class='add'>+	/* assert reset */</div><div class='add'>+	gpiod_set_value_cansleep(ks-&gt;reset_gpio, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------ */</div><div class='add'>+static struct spi_driver ks8995_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	    = "spi-ks8995",</div><div class='add'>+		.of_match_table = ks8995_spi_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe	  = ks8995_probe,</div><div class='add'>+	.remove	  = ks8995_remove,</div><div class='add'>+	.id_table = ks8995_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_spi_driver(ks8995_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESC);</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='add'>+MODULE_AUTHOR("Gabor Juhos &lt;juhosg at openwrt.org&gt;");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c<br/>index 7a2063e7737a..d246f95d57ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303-core.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303-core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lan9303-core.c</a></div><div class='hunk'>@@ -6,14 +6,20 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "lan9303.h"</div><div class='ctx'> </div><div class='add'>+/* For the LAN9303 and LAN9354, only port 0 is an XMII port. */</div><div class='add'>+#define IS_PORT_XMII(port)	((port) == 0)</div><div class='add'>+</div><div class='ctx'> #define LAN9303_NUM_PORTS 3</div><div class='ctx'> </div><div class='ctx'> /* 13.2 System Control and Status Registers</div><div class='hunk'>@@ -21,6 +27,10 @@</div><div class='ctx'>  */</div><div class='ctx'> #define LAN9303_CHIP_REV 0x14</div><div class='ctx'> # define LAN9303_CHIP_ID 0x9303</div><div class='add'>+# define LAN9352_CHIP_ID 0x9352</div><div class='add'>+# define LAN9353_CHIP_ID 0x9353</div><div class='add'>+# define LAN9354_CHIP_ID 0x9354</div><div class='add'>+# define LAN9355_CHIP_ID 0x9355</div><div class='ctx'> #define LAN9303_IRQ_CFG 0x15</div><div class='ctx'> # define LAN9303_IRQ_CFG_IRQ_ENABLE BIT(8)</div><div class='ctx'> # define LAN9303_IRQ_CFG_IRQ_POL BIT(4)</div><div class='hunk'>@@ -31,6 +41,7 @@</div><div class='ctx'> #define LAN9303_INT_EN 0x17</div><div class='ctx'> # define LAN9303_INT_EN_PHY_INT2_EN BIT(27)</div><div class='ctx'> # define LAN9303_INT_EN_PHY_INT1_EN BIT(26)</div><div class='add'>+#define LAN9303_BYTE_ORDER 0x19</div><div class='ctx'> #define LAN9303_HW_CFG 0x1D</div><div class='ctx'> # define LAN9303_HW_CFG_READY BIT(27)</div><div class='ctx'> # define LAN9303_HW_CFG_AMDX_EN_PORT2 BIT(26)</div><div class='hunk'>@@ -44,6 +55,9 @@</div><div class='ctx'> #define LAN9303_MANUAL_FC_1 0x68</div><div class='ctx'> #define LAN9303_MANUAL_FC_2 0x69</div><div class='ctx'> #define LAN9303_MANUAL_FC_0 0x6a</div><div class='add'>+# define LAN9303_BP_EN BIT(6)</div><div class='add'>+# define LAN9303_RX_FC_EN BIT(2)</div><div class='add'>+# define LAN9303_TX_FC_EN BIT(1)</div><div class='ctx'> #define LAN9303_SWITCH_CSR_DATA 0x6b</div><div class='ctx'> #define LAN9303_SWITCH_CSR_CMD 0x6c</div><div class='ctx'> #define LAN9303_SWITCH_CSR_CMD_BUSY BIT(31)</div><div class='hunk'>@@ -219,6 +233,13 @@ const struct regmap_access_table lan9303_register_set = {</div><div class='ctx'> };</div><div class='ctx'> EXPORT_SYMBOL(lan9303_register_set);</div><div class='ctx'> </div><div class='add'>+/* Flow Control registers indexed by port number */</div><div class='add'>+static unsigned int flow_ctl_reg[] = {</div><div class='add'>+	LAN9303_MANUAL_FC_0,</div><div class='add'>+	LAN9303_MANUAL_FC_1,</div><div class='add'>+	LAN9303_MANUAL_FC_2</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int lan9303_read(struct regmap *regmap, unsigned int offset, u32 *reg)</div><div class='ctx'> {</div><div class='ctx'> 	int ret, i;</div><div class='hunk'>@@ -557,12 +578,12 @@ static int lan9303_alr_make_entry_raw(struct lan9303 *chip, u32 dat0, u32 dat1)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-typedef void alr_loop_cb_t(struct lan9303 *chip, u32 dat0, u32 dat1,</div><div class='del'>-			   int portmap, void *ctx);</div><div class='add'>+typedef int alr_loop_cb_t(struct lan9303 *chip, u32 dat0, u32 dat1,</div><div class='add'>+			  int portmap, void *ctx);</div><div class='ctx'> </div><div class='del'>-static void lan9303_alr_loop(struct lan9303 *chip, alr_loop_cb_t *cb, void *ctx)</div><div class='add'>+static int lan9303_alr_loop(struct lan9303 *chip, alr_loop_cb_t *cb, void *ctx)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int ret = 0, i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;chip-&gt;alr_mutex);</div><div class='ctx'> 	lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD,</div><div class='hunk'>@@ -582,13 +603,17 @@ static void lan9303_alr_loop(struct lan9303 *chip, alr_loop_cb_t *cb, void *ctx)</div><div class='ctx'> 						LAN9303_ALR_DAT1_PORT_BITOFFS;</div><div class='ctx'> 		portmap = alrport_2_portmap[alrport];</div><div class='ctx'> </div><div class='del'>-		cb(chip, dat0, dat1, portmap, ctx);</div><div class='add'>+		ret = cb(chip, dat0, dat1, portmap, ctx);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='ctx'> 		lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD,</div><div class='ctx'> 					 LAN9303_ALR_CMD_GET_NEXT);</div><div class='ctx'> 		lan9303_write_switch_reg(chip, LAN9303_SWE_ALR_CMD, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;chip-&gt;alr_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alr_reg_to_mac(u32 dat0, u32 dat1, u8 mac[6])</div><div class='hunk'>@@ -606,18 +631,20 @@ struct del_port_learned_ctx {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Clear learned (non-static) entry on given port */</div><div class='del'>-static void alr_loop_cb_del_port_learned(struct lan9303 *chip, u32 dat0,</div><div class='del'>-					 u32 dat1, int portmap, void *ctx)</div><div class='add'>+static int alr_loop_cb_del_port_learned(struct lan9303 *chip, u32 dat0,</div><div class='add'>+					u32 dat1, int portmap, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct del_port_learned_ctx *del_ctx = ctx;</div><div class='ctx'> 	int port = del_ctx-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	if (((BIT(port) &amp; portmap) == 0) || (dat1 &amp; LAN9303_ALR_DAT1_STATIC))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* learned entries has only one port, we can just delete */</div><div class='ctx'> 	dat1 &amp;= ~LAN9303_ALR_DAT1_VALID; /* delete entry */</div><div class='ctx'> 	lan9303_alr_make_entry_raw(chip, dat0, dat1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct port_fdb_dump_ctx {</div><div class='hunk'>@@ -626,19 +653,19 @@ struct port_fdb_dump_ctx {</div><div class='ctx'> 	dsa_fdb_dump_cb_t *cb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void alr_loop_cb_fdb_port_dump(struct lan9303 *chip, u32 dat0,</div><div class='del'>-				      u32 dat1, int portmap, void *ctx)</div><div class='add'>+static int alr_loop_cb_fdb_port_dump(struct lan9303 *chip, u32 dat0,</div><div class='add'>+				     u32 dat1, int portmap, void *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_fdb_dump_ctx *dump_ctx = ctx;</div><div class='ctx'> 	u8 mac[ETH_ALEN];</div><div class='ctx'> 	bool is_static;</div><div class='ctx'> </div><div class='ctx'> 	if ((BIT(dump_ctx-&gt;port) &amp; portmap) == 0)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	alr_reg_to_mac(dat0, dat1, mac);</div><div class='ctx'> 	is_static = !!(dat1 &amp; LAN9303_ALR_DAT1_STATIC);</div><div class='del'>-	dump_ctx-&gt;cb(mac, 0, is_static, dump_ctx-&gt;data);</div><div class='add'>+	return dump_ctx-&gt;cb(mac, 0, is_static, dump_ctx-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set a static ALR entry. Delete entry if port_map is zero */</div><div class='hunk'>@@ -813,6 +840,8 @@ static void lan9303_handle_reset(struct lan9303 *chip)</div><div class='ctx'> 	if (!chip-&gt;reset_gpio)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	gpiod_set_value_cansleep(chip-&gt;reset_gpio, 1);</div><div class='add'>+</div><div class='ctx'> 	if (chip-&gt;reset_duration != 0)</div><div class='ctx'> 		msleep(chip-&gt;reset_duration);</div><div class='ctx'> </div><div class='hunk'>@@ -838,21 +867,44 @@ static int lan9303_disable_processing(struct lan9303 *chip)</div><div class='ctx'> static int lan9303_check_device(struct lan9303 *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	int err;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='add'>+	/* In I2C-managed configurations this polling loop will clash with</div><div class='add'>+	 * switch's reading of EEPROM right after reset and this behaviour is</div><div class='add'>+	 * not configurable. While lan9303_read() already has quite long retry</div><div class='add'>+	 * timeout, seems not all cases are being detected as arbitration error.</div><div class='add'>+	 *</div><div class='add'>+	 * According to datasheet, EEPROM loader has 30ms timeout (in case of</div><div class='add'>+	 * missing EEPROM).</div><div class='add'>+	 *</div><div class='add'>+	 * Loading of the largest supported EEPROM is expected to take at least</div><div class='add'>+	 * 5.9s.</div><div class='add'>+	 */</div><div class='add'>+	err = read_poll_timeout(lan9303_read, ret,</div><div class='add'>+				!ret &amp;&amp; reg &amp; LAN9303_HW_CFG_READY,</div><div class='add'>+				20000, 6000000, false,</div><div class='add'>+				chip-&gt;regmap, LAN9303_HW_CFG, &amp;reg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to read HW_CFG reg: %pe\n",</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "HW_CFG not ready: 0x%08x\n", reg);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = lan9303_read(chip-&gt;regmap, LAN9303_CHIP_REV, &amp;reg);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(chip-&gt;dev, "failed to read chip revision register: %d\n",</div><div class='ctx'> 			ret);</div><div class='del'>-		if (!chip-&gt;reset_gpio) {</div><div class='del'>-			dev_dbg(chip-&gt;dev,</div><div class='del'>-				"hint: maybe failed due to missing reset GPIO\n");</div><div class='del'>-		}</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((reg &gt;&gt; 16) != LAN9303_CHIP_ID) {</div><div class='del'>-		dev_err(chip-&gt;dev, "expecting LAN9303 chip, but found: %X\n",</div><div class='add'>+	if (((reg &gt;&gt; 16) != LAN9303_CHIP_ID) &amp;&amp;</div><div class='add'>+	    ((reg &gt;&gt; 16) != LAN9354_CHIP_ID)) {</div><div class='add'>+		dev_err(chip-&gt;dev, "unexpected device found: LAN%4.4X\n",</div><div class='ctx'> 			reg &gt;&gt; 16);</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -868,7 +920,7 @@ static int lan9303_check_device(struct lan9303 *chip)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dev_warn(chip-&gt;dev, "failed to disable switching %d\n", ret);</div><div class='ctx'> </div><div class='del'>-	dev_info(chip-&gt;dev, "Found LAN9303 rev. %u\n", reg &amp; 0xffff);</div><div class='add'>+	dev_info(chip-&gt;dev, "Found LAN%4.4X rev. %u\n", (reg &gt;&gt; 16), reg &amp; 0xffff);</div><div class='ctx'> </div><div class='ctx'> 	ret = lan9303_detect_phy_setup(chip);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -883,7 +935,8 @@ static int lan9303_check_device(struct lan9303 *chip)</div><div class='ctx'> /* ---------------------------- DSA -----------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static enum dsa_tag_protocol lan9303_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-						      int port)</div><div class='add'>+						      int port,</div><div class='add'>+						      enum dsa_tag_protocol mp)</div><div class='ctx'> {</div><div class='ctx'> 	return DSA_TAG_PROTO_LAN9303;</div><div class='ctx'> }</div><div class='hunk'>@@ -892,6 +945,7 @@ static int lan9303_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure that port 0 is the cpu port */</div><div class='ctx'> 	if (!dsa_is_cpu_port(ds, 0)) {</div><div class='hunk'>@@ -899,6 +953,17 @@ static int lan9303_setup(struct dsa_switch *ds)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Virtual Phy: Remove Turbo 200Mbit mode */</div><div class='add'>+	ret = lan9303_read(chip-&gt;regmap, LAN9303_VIRT_SPECIAL_CTRL, &amp;reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return (ret);</div><div class='add'>+</div><div class='add'>+	/* Clear the TURBO Mode bit if it was set. */</div><div class='add'>+	if (reg &amp; LAN9303_VIRT_SPECIAL_TURBO) {</div><div class='add'>+		reg &amp;= ~LAN9303_VIRT_SPECIAL_TURBO;</div><div class='add'>+		regmap_write(chip-&gt;regmap, LAN9303_VIRT_SPECIAL_CTRL, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = lan9303_setup_tagging(chip);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dev_err(chip-&gt;dev, "failed to setup port tagging %d\n", ret);</div><div class='hunk'>@@ -951,7 +1016,7 @@ static const struct lan9303_mib_desc lan9303_mib[] = {</div><div class='ctx'> 	{ .offset = LAN9303_MAC_TX_BRDCST_CNT_0, .name = "TxBroad", },</div><div class='ctx'> 	{ .offset = LAN9303_MAC_TX_PAUSE_CNT_0, .name = "TxPause", },</div><div class='ctx'> 	{ .offset = LAN9303_MAC_TX_MULCST_CNT_0, .name = "TxMulti", },</div><div class='del'>-	{ .offset = LAN9303_MAC_RX_UNDSZE_CNT_0, .name = "TxUnderRun", },</div><div class='add'>+	{ .offset = LAN9303_MAC_RX_UNDSZE_CNT_0, .name = "RxShort", },</div><div class='ctx'> 	{ .offset = LAN9303_MAC_TX_64_CNT_0, .name = "Tx64Byte", },</div><div class='ctx'> 	{ .offset = LAN9303_MAC_TX_127_CNT_0, .name = "Tx128Byte", },</div><div class='ctx'> 	{ .offset = LAN9303_MAC_TX_255_CNT_0, .name = "Tx256Byte", },</div><div class='hunk'>@@ -971,15 +1036,14 @@ static const struct lan9303_mib_desc lan9303_mib[] = {</div><div class='ctx'> static void lan9303_get_strings(struct dsa_switch *ds, int port,</div><div class='ctx'> 				u32 stringset, uint8_t *data)</div><div class='ctx'> {</div><div class='add'>+	u8 *buf = data;</div><div class='ctx'> 	unsigned int u;</div><div class='ctx'> </div><div class='ctx'> 	if (stringset != ETH_SS_STATS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (u = 0; u &lt; ARRAY_SIZE(lan9303_mib); u++) {</div><div class='del'>-		strncpy(data + u * ETH_GSTRING_LEN, lan9303_mib[u].name,</div><div class='del'>-			ETH_GSTRING_LEN);</div><div class='del'>-	}</div><div class='add'>+	for (u = 0; u &lt; ARRAY_SIZE(lan9303_mib); u++)</div><div class='add'>+		ethtool_puts(&amp;buf, lan9303_mib[u].name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -995,9 +1059,11 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='ctx'> 		ret = lan9303_read_switch_port(</div><div class='ctx'> 			chip, port, lan9303_mib[u].offset, &amp;reg);</div><div class='ctx'> </div><div class='del'>-		if (ret)</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			dev_warn(chip-&gt;dev, "Reading status port %d reg %u failed\n",</div><div class='ctx'> 				 port, lan9303_mib[u].offset);</div><div class='add'>+			reg = 0;</div><div class='add'>+		}</div><div class='ctx'> 		data[u] = reg;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1010,93 +1076,70 @@ static int lan9303_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> 	return ARRAY_SIZE(lan9303_mib);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lan9303_phy_read(struct dsa_switch *ds, int phy, int regnum)</div><div class='add'>+static int lan9303_phy_read(struct dsa_switch *ds, int port, int regnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> 	int phy_base = chip-&gt;phy_addr_base;</div><div class='ctx'> </div><div class='del'>-	if (phy == phy_base)</div><div class='add'>+	if (port == 0)</div><div class='ctx'> 		return lan9303_virt_phy_reg_read(chip, regnum);</div><div class='del'>-	if (phy &gt; phy_base + 2)</div><div class='add'>+	if (port &gt; 2)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return chip-&gt;ops-&gt;phy_read(chip, phy, regnum);</div><div class='add'>+	return chip-&gt;ops-&gt;phy_read(chip, phy_base + port, regnum);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lan9303_phy_write(struct dsa_switch *ds, int phy, int regnum,</div><div class='add'>+static int lan9303_phy_write(struct dsa_switch *ds, int port, int regnum,</div><div class='ctx'> 			     u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> 	int phy_base = chip-&gt;phy_addr_base;</div><div class='ctx'> </div><div class='del'>-	if (phy == phy_base)</div><div class='add'>+	if (port == 0)</div><div class='ctx'> 		return lan9303_virt_phy_reg_write(chip, regnum, val);</div><div class='del'>-	if (phy &gt; phy_base + 2)</div><div class='add'>+	if (port &gt; 2)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	return chip-&gt;ops-&gt;phy_write(chip, phy, regnum, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lan9303_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-				struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	struct lan9303 *chip = ds-&gt;priv;</div><div class='del'>-	int ctl, res;</div><div class='del'>-</div><div class='del'>-	if (!phy_is_pseudo_fixed_link(phydev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ctl = lan9303_phy_read(ds, port, MII_BMCR);</div><div class='del'>-</div><div class='del'>-	ctl &amp;= ~BMCR_ANENABLE;</div><div class='del'>-</div><div class='del'>-	if (phydev-&gt;speed == SPEED_100)</div><div class='del'>-		ctl |= BMCR_SPEED100;</div><div class='del'>-	else if (phydev-&gt;speed == SPEED_10)</div><div class='del'>-		ctl &amp;= ~BMCR_SPEED100;</div><div class='del'>-	else</div><div class='del'>-		dev_err(ds-&gt;dev, "unsupported speed: %d\n", phydev-&gt;speed);</div><div class='del'>-</div><div class='del'>-	if (phydev-&gt;duplex == DUPLEX_FULL)</div><div class='del'>-		ctl |= BMCR_FULLDPLX;</div><div class='del'>-	else</div><div class='del'>-		ctl &amp;= ~BMCR_FULLDPLX;</div><div class='del'>-</div><div class='del'>-	res =  lan9303_phy_write(ds, port, MII_BMCR, ctl);</div><div class='del'>-</div><div class='del'>-	if (port == chip-&gt;phy_addr_base) {</div><div class='del'>-		/* Virtual Phy: Remove Turbo 200Mbit mode */</div><div class='del'>-		lan9303_read(chip-&gt;regmap, LAN9303_VIRT_SPECIAL_CTRL, &amp;ctl);</div><div class='del'>-</div><div class='del'>-		ctl &amp;= ~LAN9303_VIRT_SPECIAL_TURBO;</div><div class='del'>-		res =  regmap_write(chip-&gt;regmap,</div><div class='del'>-				    LAN9303_VIRT_SPECIAL_CTRL, ctl);</div><div class='del'>-	}</div><div class='add'>+	return chip-&gt;ops-&gt;phy_write(chip, phy_base + port, regnum, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lan9303_port_enable(struct dsa_switch *ds, int port,</div><div class='ctx'> 			       struct phy_device *phy)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlan_vid_add(dsa_port_to_conduit(dp), htons(ETH_P_8021Q), port);</div><div class='add'>+</div><div class='ctx'> 	return lan9303_enable_processing_port(chip, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lan9303_port_disable(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vlan_vid_del(dsa_port_to_conduit(dp), htons(ETH_P_8021Q), port);</div><div class='add'>+</div><div class='ctx'> 	lan9303_disable_processing_port(chip, port);</div><div class='del'>-	lan9303_phy_write(ds, chip-&gt;phy_addr_base + port, MII_BMCR, BMCR_PDOWN);</div><div class='add'>+	lan9303_phy_write(ds, port, MII_BMCR, BMCR_PDOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-				    struct net_device *br)</div><div class='add'>+				    struct dsa_bridge bridge,</div><div class='add'>+				    bool *tx_fwd_offload,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev, "%s(port %d)\n", __func__, port);</div><div class='del'>-	if (dsa_to_port(ds, 1)-&gt;bridge_dev == dsa_to_port(ds, 2)-&gt;bridge_dev) {</div><div class='add'>+	if (dsa_port_bridge_same(dsa_to_port(ds, 1), dsa_to_port(ds, 2))) {</div><div class='ctx'> 		lan9303_bridge_ports(chip);</div><div class='ctx'> 		chip-&gt;is_bridged = true;  /* unleash stp_state_set() */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1105,7 +1148,7 @@ static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lan9303_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-				      struct net_device *br)</div><div class='add'>+				      struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1168,26 +1211,23 @@ static void lan9303_port_fast_age(struct dsa_switch *ds, int port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lan9303_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-				const unsigned char *addr, u16 vid)</div><div class='add'>+				const unsigned char *addr, u16 vid,</div><div class='add'>+				struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev, "%s(%d, %pM, %d)\n", __func__, port, addr, vid);</div><div class='del'>-	if (vid)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	return lan9303_alr_add_port(chip, addr, port, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lan9303_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-				const unsigned char *addr, u16 vid)</div><div class='del'>-</div><div class='add'>+				const unsigned char *addr, u16 vid,</div><div class='add'>+				struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev, "%s(%d, %pM, %d)\n", __func__, port, addr, vid);</div><div class='del'>-	if (vid)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='ctx'> 	lan9303_alr_del_port(chip, addr, port);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1204,9 +1244,7 @@ static int lan9303_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev, "%s(%d)\n", __func__, port);</div><div class='del'>-	lan9303_alr_loop(chip, alr_loop_cb_fdb_port_dump, &amp;dump_ctx);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return lan9303_alr_loop(chip, alr_loop_cb_fdb_port_dump, &amp;dump_ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lan9303_port_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -1226,18 +1264,25 @@ static int lan9303_port_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lan9303_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-				 const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+static int lan9303_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+				const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = lan9303_port_mdb_prepare(ds, port, mdb);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev, "%s(%d, %pM, %d)\n", __func__, port, mdb-&gt;addr,</div><div class='ctx'> 		mdb-&gt;vid);</div><div class='del'>-	lan9303_alr_add_port(chip, mdb-&gt;addr, port, false);</div><div class='add'>+	return lan9303_alr_add_port(chip, mdb-&gt;addr, port, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lan9303_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-				const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+				const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303 *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1250,41 +1295,124 @@ static int lan9303_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lan9303_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct lan9303 *chip = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_dbg(chip-&gt;dev, "%s(%d) entered.", __func__, port);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_10 | MAC_100 | MAC_ASYM_PAUSE |</div><div class='add'>+				   MAC_SYM_PAUSE;</div><div class='add'>+</div><div class='add'>+	if (port == 0) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+	} else {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		/* Compatibility for phylib's default interface type when the</div><div class='add'>+		 * phy-mode property is absent</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan9303_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				       unsigned int mode,</div><div class='add'>+				       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan9303_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					  unsigned int mode,</div><div class='add'>+					  phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan9303_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+					struct phy_device *phydev,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					phy_interface_t interface,</div><div class='add'>+					int speed, int duplex, bool tx_pause,</div><div class='add'>+					bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct lan9303 *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 ctl;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* On this device, we are only interested in doing something here if</div><div class='add'>+	 * this is the xMII port. All other ports are 10/100 phys using MDIO</div><div class='add'>+	 * to control there link settings.</div><div class='add'>+	 */</div><div class='add'>+	if (!IS_PORT_XMII(port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Disable auto-negotiation and force the speed/duplex settings. */</div><div class='add'>+	ctl = lan9303_phy_read(ds, port, MII_BMCR);</div><div class='add'>+	ctl &amp;= ~(BMCR_ANENABLE | BMCR_SPEED100 | BMCR_FULLDPLX);</div><div class='add'>+	if (speed == SPEED_100)</div><div class='add'>+		ctl |= BMCR_SPEED100;</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		ctl |= BMCR_FULLDPLX;</div><div class='add'>+	lan9303_phy_write(ds, port, MII_BMCR, ctl);</div><div class='add'>+</div><div class='add'>+	/* Force the flow control settings. */</div><div class='add'>+	lan9303_read(chip-&gt;regmap, flow_ctl_reg[port], &amp;reg);</div><div class='add'>+	reg &amp;= ~(LAN9303_BP_EN | LAN9303_RX_FC_EN | LAN9303_TX_FC_EN);</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		reg |= (LAN9303_RX_FC_EN | LAN9303_BP_EN);</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		reg |= LAN9303_TX_FC_EN;</div><div class='add'>+	regmap_write(chip-&gt;regmap, flow_ctl_reg[port], reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops lan9303_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= lan9303_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= lan9303_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= lan9303_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops lan9303_switch_ops = {</div><div class='del'>-	.get_tag_protocol = lan9303_get_tag_protocol,</div><div class='del'>-	.setup = lan9303_setup,</div><div class='del'>-	.get_strings = lan9303_get_strings,</div><div class='del'>-	.phy_read = lan9303_phy_read,</div><div class='del'>-	.phy_write = lan9303_phy_write,</div><div class='del'>-	.adjust_link = lan9303_adjust_link,</div><div class='del'>-	.get_ethtool_stats = lan9303_get_ethtool_stats,</div><div class='del'>-	.get_sset_count = lan9303_get_sset_count,</div><div class='del'>-	.port_enable = lan9303_port_enable,</div><div class='del'>-	.port_disable = lan9303_port_disable,</div><div class='del'>-	.port_bridge_join       = lan9303_port_bridge_join,</div><div class='del'>-	.port_bridge_leave      = lan9303_port_bridge_leave,</div><div class='del'>-	.port_stp_state_set     = lan9303_port_stp_state_set,</div><div class='del'>-	.port_fast_age          = lan9303_port_fast_age,</div><div class='del'>-	.port_fdb_add           = lan9303_port_fdb_add,</div><div class='del'>-	.port_fdb_del           = lan9303_port_fdb_del,</div><div class='del'>-	.port_fdb_dump          = lan9303_port_fdb_dump,</div><div class='del'>-	.port_mdb_prepare       = lan9303_port_mdb_prepare,</div><div class='del'>-	.port_mdb_add           = lan9303_port_mdb_add,</div><div class='del'>-	.port_mdb_del           = lan9303_port_mdb_del,</div><div class='add'>+	.get_tag_protocol	= lan9303_get_tag_protocol,</div><div class='add'>+	.setup			= lan9303_setup,</div><div class='add'>+	.get_strings		= lan9303_get_strings,</div><div class='add'>+	.phy_read		= lan9303_phy_read,</div><div class='add'>+	.phy_write		= lan9303_phy_write,</div><div class='add'>+	.phylink_get_caps	= lan9303_phylink_get_caps,</div><div class='add'>+	.get_ethtool_stats	= lan9303_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= lan9303_get_sset_count,</div><div class='add'>+	.port_enable		= lan9303_port_enable,</div><div class='add'>+	.port_disable		= lan9303_port_disable,</div><div class='add'>+	.port_bridge_join	= lan9303_port_bridge_join,</div><div class='add'>+	.port_bridge_leave	= lan9303_port_bridge_leave,</div><div class='add'>+	.port_stp_state_set	= lan9303_port_stp_state_set,</div><div class='add'>+	.port_fast_age		= lan9303_port_fast_age,</div><div class='add'>+	.port_fdb_add		= lan9303_port_fdb_add,</div><div class='add'>+	.port_fdb_del		= lan9303_port_fdb_del,</div><div class='add'>+	.port_fdb_dump		= lan9303_port_fdb_dump,</div><div class='add'>+	.port_mdb_add		= lan9303_port_mdb_add,</div><div class='add'>+	.port_mdb_del		= lan9303_port_mdb_del,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int lan9303_register_switch(struct lan9303 *chip)</div><div class='ctx'> {</div><div class='del'>-	int base;</div><div class='del'>-</div><div class='del'>-	chip-&gt;ds = dsa_switch_alloc(chip-&gt;dev, LAN9303_NUM_PORTS);</div><div class='add'>+	chip-&gt;ds = devm_kzalloc(chip-&gt;dev, sizeof(*chip-&gt;ds), GFP_KERNEL);</div><div class='ctx'> 	if (!chip-&gt;ds)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	chip-&gt;ds-&gt;dev = chip-&gt;dev;</div><div class='add'>+	chip-&gt;ds-&gt;num_ports = LAN9303_NUM_PORTS;</div><div class='ctx'> 	chip-&gt;ds-&gt;priv = chip;</div><div class='ctx'> 	chip-&gt;ds-&gt;ops = &amp;lan9303_switch_ops;</div><div class='del'>-	base = chip-&gt;phy_addr_base;</div><div class='del'>-	chip-&gt;ds-&gt;phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1 + base, base);</div><div class='add'>+	chip-&gt;ds-&gt;phylink_mac_ops = &amp;lan9303_phylink_mac_ops;</div><div class='add'>+	chip-&gt;ds-&gt;phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1, 0);</div><div class='ctx'> </div><div class='ctx'> 	return dsa_register_switch(chip-&gt;ds);</div><div class='ctx'> }</div><div class='hunk'>@@ -1293,7 +1421,7 @@ static int lan9303_probe_reset_gpio(struct lan9303 *chip,</div><div class='ctx'> 				     struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	chip-&gt;reset_gpio = devm_gpiod_get_optional(chip-&gt;dev, "reset",</div><div class='del'>-						   GPIOD_OUT_LOW);</div><div class='add'>+						   GPIOD_OUT_HIGH);</div><div class='ctx'> 	if (IS_ERR(chip-&gt;reset_gpio))</div><div class='ctx'> 		return PTR_ERR(chip-&gt;reset_gpio);</div><div class='ctx'> </div><div class='hunk'>@@ -1321,6 +1449,7 @@ static int lan9303_probe_reset_gpio(struct lan9303 *chip,</div><div class='ctx'> int lan9303_probe(struct lan9303 *chip, struct device_node *np)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;chip-&gt;indirect_mutex);</div><div class='ctx'> 	mutex_init(&amp;chip-&gt;alr_mutex);</div><div class='hunk'>@@ -1331,6 +1460,19 @@ int lan9303_probe(struct lan9303 *chip, struct device_node *np)</div><div class='ctx'> </div><div class='ctx'> 	lan9303_handle_reset(chip);</div><div class='ctx'> </div><div class='add'>+	/* First read to the device.  This is a Dummy read to ensure MDIO */</div><div class='add'>+	/* access is in 32-bit sync. */</div><div class='add'>+	ret = lan9303_read(chip-&gt;regmap, LAN9303_BYTE_ORDER, &amp;reg);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to access the device: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		if (!chip-&gt;reset_gpio) {</div><div class='add'>+			dev_dbg(chip-&gt;dev,</div><div class='add'>+				"hint: maybe failed due to missing reset GPIO\n");</div><div class='add'>+		}</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = lan9303_check_device(chip);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -1357,12 +1499,17 @@ int lan9303_remove(struct lan9303 *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* assert reset to the whole device to prevent it from doing anything */</div><div class='ctx'> 	gpiod_set_value_cansleep(chip-&gt;reset_gpio, 1);</div><div class='del'>-	gpiod_unexport(chip-&gt;reset_gpio);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(lan9303_remove);</div><div class='ctx'> </div><div class='add'>+void lan9303_shutdown(struct lan9303 *chip)</div><div class='add'>+{</div><div class='add'>+	dsa_switch_shutdown(chip-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(lan9303_shutdown);</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Juergen Borleis &lt;kernel@pengutronix.de&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Core driver for SMSC/Microchip LAN9303 three port ethernet switch");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/lan9303.h b/drivers/net/dsa/lan9303.h<br/>index 11f590b64701..c7f73efa50f0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lan9303.h</a></div><div class='hunk'>@@ -10,3 +10,4 @@ extern const struct lan9303_phy_ops lan9303_indirect_phy_ops;</div><div class='ctx'> </div><div class='ctx'> int lan9303_probe(struct lan9303 *chip, struct device_node *np);</div><div class='ctx'> int lan9303_remove(struct lan9303 *chip);</div><div class='add'>+void lan9303_shutdown(struct lan9303 *chip);</div><div class='head'>diff --git a/drivers/net/dsa/lan9303_i2c.c b/drivers/net/dsa/lan9303_i2c.c<br/>index 9bffaef65a04..c62d27cdc117 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303_i2c.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303_i2c.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303_i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lan9303_i2c.c</a></div><div class='hunk'>@@ -29,8 +29,7 @@ static const struct regmap_config lan9303_i2c_regmap_config = {</div><div class='ctx'> 	.cache_type = REGCACHE_NONE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int lan9303_i2c_probe(struct i2c_client *client,</div><div class='del'>-			     const struct i2c_device_id *id)</div><div class='add'>+static int lan9303_i2c_probe(struct i2c_client *client)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303_i2c *sw_dev;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -65,21 +64,32 @@ static int lan9303_i2c_probe(struct i2c_client *client,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lan9303_i2c_remove(struct i2c_client *client)</div><div class='add'>+static void lan9303_i2c_remove(struct i2c_client *client)</div><div class='ctx'> {</div><div class='del'>-	struct lan9303_i2c *sw_dev;</div><div class='add'>+	struct lan9303_i2c *sw_dev = i2c_get_clientdata(client);</div><div class='add'>+</div><div class='add'>+	if (!sw_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lan9303_remove(&amp;sw_dev-&gt;chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan9303_i2c_shutdown(struct i2c_client *client)</div><div class='add'>+{</div><div class='add'>+	struct lan9303_i2c *sw_dev = i2c_get_clientdata(client);</div><div class='ctx'> </div><div class='del'>-	sw_dev = i2c_get_clientdata(client);</div><div class='ctx'> 	if (!sw_dev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lan9303_shutdown(&amp;sw_dev-&gt;chip);</div><div class='ctx'> </div><div class='del'>-	return lan9303_remove(&amp;sw_dev-&gt;chip);</div><div class='add'>+	i2c_set_clientdata(client, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static const struct i2c_device_id lan9303_i2c_id[] = {</div><div class='del'>-	{ "lan9303", 0 },</div><div class='add'>+	{ "lan9303" },</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(i2c, lan9303_i2c_id);</div><div class='hunk'>@@ -93,10 +103,11 @@ MODULE_DEVICE_TABLE(of, lan9303_i2c_of_match);</div><div class='ctx'> static struct i2c_driver lan9303_i2c_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "LAN9303_I2C",</div><div class='del'>-		.of_match_table = of_match_ptr(lan9303_i2c_of_match),</div><div class='add'>+		.of_match_table = lan9303_i2c_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = lan9303_i2c_probe,</div><div class='ctx'> 	.remove = lan9303_i2c_remove,</div><div class='add'>+	.shutdown = lan9303_i2c_shutdown,</div><div class='ctx'> 	.id_table = lan9303_i2c_id,</div><div class='ctx'> };</div><div class='ctx'> module_i2c_driver(lan9303_i2c_driver);</div><div class='head'>diff --git a/drivers/net/dsa/lan9303_mdio.c b/drivers/net/dsa/lan9303_mdio.c<br/>index 9cbe80460b53..0ac4857e5ee8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303_mdio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lan9303_mdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lan9303_mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lan9303_mdio.c</a></div><div class='hunk'>@@ -32,7 +32,7 @@ static int lan9303_mdio_write(void *ctx, uint32_t reg, uint32_t val)</div><div class='ctx'> 	struct lan9303_mdio *sw_dev = (struct lan9303_mdio *)ctx;</div><div class='ctx'> </div><div class='ctx'> 	reg &lt;&lt;= 2; /* reg num to offset */</div><div class='del'>-	mutex_lock(&amp;sw_dev-&gt;device-&gt;bus-&gt;mdio_lock);</div><div class='add'>+	mutex_lock_nested(&amp;sw_dev-&gt;device-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='ctx'> 	lan9303_mdio_real_write(sw_dev-&gt;device, reg, val &amp; 0xffff);</div><div class='ctx'> 	lan9303_mdio_real_write(sw_dev-&gt;device, reg + 2, (val &gt;&gt; 16) &amp; 0xffff);</div><div class='ctx'> 	mutex_unlock(&amp;sw_dev-&gt;device-&gt;bus-&gt;mdio_lock);</div><div class='hunk'>@@ -50,7 +50,7 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val)</div><div class='ctx'> 	struct lan9303_mdio *sw_dev = (struct lan9303_mdio *)ctx;</div><div class='ctx'> </div><div class='ctx'> 	reg &lt;&lt;= 2; /* reg num to offset */</div><div class='del'>-	mutex_lock(&amp;sw_dev-&gt;device-&gt;bus-&gt;mdio_lock);</div><div class='add'>+	mutex_lock_nested(&amp;sw_dev-&gt;device-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='ctx'> 	*val = lan9303_mdio_real_read(sw_dev-&gt;device, reg);</div><div class='ctx'> 	*val |= (lan9303_mdio_real_read(sw_dev-&gt;device, reg + 2) &lt;&lt; 16);</div><div class='ctx'> 	mutex_unlock(&amp;sw_dev-&gt;device-&gt;bus-&gt;mdio_lock);</div><div class='hunk'>@@ -58,19 +58,19 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lan9303_mdio_phy_write(struct lan9303 *chip, int phy, int reg,</div><div class='add'>+static int lan9303_mdio_phy_write(struct lan9303 *chip, int addr, int reg,</div><div class='ctx'> 				  u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303_mdio *sw_dev = dev_get_drvdata(chip-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return mdiobus_write_nested(sw_dev-&gt;device-&gt;bus, phy, reg, val);</div><div class='add'>+	return mdiobus_write_nested(sw_dev-&gt;device-&gt;bus, addr, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lan9303_mdio_phy_read(struct lan9303 *chip, int phy,  int reg)</div><div class='add'>+static int lan9303_mdio_phy_read(struct lan9303 *chip, int addr, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct lan9303_mdio *sw_dev = dev_get_drvdata(chip-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	return mdiobus_read_nested(sw_dev-&gt;device-&gt;bus, phy, reg);</div><div class='add'>+	return mdiobus_read_nested(sw_dev-&gt;device-&gt;bus, addr, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct lan9303_phy_ops lan9303_mdio_phy_ops = {</div><div class='hunk'>@@ -140,10 +140,23 @@ static void lan9303_mdio_remove(struct mdio_device *mdiodev)</div><div class='ctx'> 	lan9303_remove(&amp;sw_dev-&gt;chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void lan9303_mdio_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct lan9303_mdio *sw_dev = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!sw_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	lan9303_shutdown(&amp;sw_dev-&gt;chip);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*-------------------------------------------------------------------------*/</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id lan9303_mdio_of_match[] = {</div><div class='ctx'> 	{ .compatible = "smsc,lan9303-mdio" },</div><div class='add'>+	{ .compatible = "microchip,lan9354-mdio" },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, lan9303_mdio_of_match);</div><div class='hunk'>@@ -151,10 +164,11 @@ MODULE_DEVICE_TABLE(of, lan9303_mdio_of_match);</div><div class='ctx'> static struct mdio_driver lan9303_mdio_driver = {</div><div class='ctx'> 	.mdiodrv.driver = {</div><div class='ctx'> 		.name = "LAN9303_MDIO",</div><div class='del'>-		.of_match_table = of_match_ptr(lan9303_mdio_of_match),</div><div class='add'>+		.of_match_table = lan9303_mdio_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe  = lan9303_mdio_probe,</div><div class='ctx'> 	.remove = lan9303_mdio_remove,</div><div class='add'>+	.shutdown = lan9303_mdio_shutdown,</div><div class='ctx'> };</div><div class='ctx'> mdio_module_driver(lan9303_mdio_driver);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/lantiq/Kconfig b/drivers/net/dsa/lantiq/Kconfig<br/>new file mode 100644<br/>index 000000000000..4a9771be5d58<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+config NET_DSA_LANTIQ_COMMON</div><div class='add'>+	tristate</div><div class='add'>+	select REGMAP</div><div class='add'>+</div><div class='add'>+config NET_DSA_LANTIQ_GSWIP</div><div class='add'>+	tristate "Lantiq / Intel GSWIP"</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	select NET_DSA_TAG_GSWIP</div><div class='add'>+	select NET_DSA_LANTIQ_COMMON</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Lantiq / Intel GSWIP 2.1 found in</div><div class='add'>+	  the xrx200 / VR9 SoC.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MXL_GSW1XX</div><div class='add'>+	tristate "MaxLinear GSW1xx Ethernet switch support"</div><div class='add'>+	select NET_DSA_TAG_MXL_GSW1XX</div><div class='add'>+	select NET_DSA_LANTIQ_COMMON</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the MaxLinear GSW1xx family of 1GE switches</div><div class='add'>+	    GSW120 4 port, 2 PHYs, RGMII &amp; SGMII/2500Base-X</div><div class='add'>+	    GSW125 4 port, 2 PHYs, RGMII &amp; SGMII/2500Base-X, industrial temperature</div><div class='add'>+	    GSW140 6 port, 4 PHYs, RGMII &amp; SGMII/2500Base-X</div><div class='add'>+	    GSW141 6 port, 4 PHYs, RGMII &amp; SGMII</div><div class='add'>+	    GSW145 6 port, 4 PHYs, RGMII &amp; SGMII/2500Base-X, industrial temperature</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/Makefile b/drivers/net/dsa/lantiq/Makefile<br/>new file mode 100644<br/>index 000000000000..85fce605310b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/Makefile</a></div><div class='hunk'>@@ -0,0 +1,3 @@</div><div class='add'>+obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_LANTIQ_COMMON) += lantiq_gswip_common.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MXL_GSW1XX) += mxl-gsw1xx.o</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/lantiq_gswip.c b/drivers/net/dsa/lantiq/lantiq_gswip.c<br/>new file mode 100644<br/>index 000000000000..57dd063c0740<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/lantiq_gswip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/lantiq_gswip.c</a></div><div class='hunk'>@@ -0,0 +1,518 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Lantiq / Intel GSWIP switch driver for VRX200, xRX300 and xRX330 SoCs</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Daniel Golle &lt;daniel@makrotopia.org&gt;</div><div class='add'>+ * Copyright (C) 2017 - 2019 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ * Copyright (C) 2012 John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Lantiq Deutschland</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "lantiq_gswip.h"</div><div class='add'>+#include "lantiq_pce.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;dt-bindings/mips/lantiq_rcu_gphy.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+struct xway_gphy_match_data {</div><div class='add'>+	char *fe_firmware_name;</div><div class='add'>+	char *ge_firmware_name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gswip_xrx200_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+					  struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+	case 1:</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 6:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5:</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100 | MAC_1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_xrx300_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+					  struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 6:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 5:</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100 | MAC_1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xway_gphy_match_data xrx200a1x_gphy_data = {</div><div class='add'>+	.fe_firmware_name = "lantiq/xrx200_phy22f_a14.bin",</div><div class='add'>+	.ge_firmware_name = "lantiq/xrx200_phy11g_a14.bin",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct xway_gphy_match_data xrx200a2x_gphy_data = {</div><div class='add'>+	.fe_firmware_name = "lantiq/xrx200_phy22f_a22.bin",</div><div class='add'>+	.ge_firmware_name = "lantiq/xrx200_phy11g_a22.bin",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct xway_gphy_match_data xrx300_gphy_data = {</div><div class='add'>+	.fe_firmware_name = "lantiq/xrx300_phy22f_a21.bin",</div><div class='add'>+	.ge_firmware_name = "lantiq/xrx300_phy11g_a21.bin",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id xway_gphy_match[] __maybe_unused = {</div><div class='add'>+	{ .compatible = "lantiq,xrx200-gphy-fw", .data = NULL },</div><div class='add'>+	{ .compatible = "lantiq,xrx200a1x-gphy-fw", .data = &amp;xrx200a1x_gphy_data },</div><div class='add'>+	{ .compatible = "lantiq,xrx200a2x-gphy-fw", .data = &amp;xrx200a2x_gphy_data },</div><div class='add'>+	{ .compatible = "lantiq,xrx300-gphy-fw", .data = &amp;xrx300_gphy_data },</div><div class='add'>+	{ .compatible = "lantiq,xrx330-gphy-fw", .data = &amp;xrx300_gphy_data },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gphy_fw)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	void *fw_addr;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	dma_addr_t dev_addr;</div><div class='add'>+	size_t size;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(gphy_fw-&gt;clk_gate);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reset_control_assert(gphy_fw-&gt;reset);</div><div class='add'>+</div><div class='add'>+	/* The vendor BSP uses a 200ms delay after asserting the reset line.</div><div class='add'>+	 * Without this some users are observing that the PHY is not coming up</div><div class='add'>+	 * on the MDIO bus.</div><div class='add'>+	 */</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, gphy_fw-&gt;fw_name, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(dev, ret, "failed to load firmware: %s\n",</div><div class='add'>+				     gphy_fw-&gt;fw_name);</div><div class='add'>+</div><div class='add'>+	/* GPHY cores need the firmware code in a persistent and contiguous</div><div class='add'>+	 * memory area with a 16 kB boundary aligned start address.</div><div class='add'>+	 */</div><div class='add'>+	size = fw-&gt;size + XRX200_GPHY_FW_ALIGN;</div><div class='add'>+</div><div class='add'>+	fw_addr = dmam_alloc_coherent(dev, size, &amp;dma_addr, GFP_KERNEL);</div><div class='add'>+	if (fw_addr) {</div><div class='add'>+		fw_addr = PTR_ALIGN(fw_addr, XRX200_GPHY_FW_ALIGN);</div><div class='add'>+		dev_addr = ALIGN(dma_addr, XRX200_GPHY_FW_ALIGN);</div><div class='add'>+		memcpy(fw_addr, fw-&gt;data, fw-&gt;size);</div><div class='add'>+	} else {</div><div class='add'>+		release_firmware(fw);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;rcu_regmap, gphy_fw-&gt;fw_addr_offset, dev_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	reset_control_deassert(gphy_fw-&gt;reset);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_gphy_fw_probe(struct gswip_priv *priv,</div><div class='add'>+			       struct gswip_gphy_fw *gphy_fw,</div><div class='add'>+			       struct device_node *gphy_fw_np, int i)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	u32 gphy_mode;</div><div class='add'>+	int ret;</div><div class='add'>+	char gphyname[10];</div><div class='add'>+</div><div class='add'>+	snprintf(gphyname, sizeof(gphyname), "gphy%d", i);</div><div class='add'>+</div><div class='add'>+	gphy_fw-&gt;clk_gate = devm_clk_get(dev, gphyname);</div><div class='add'>+	if (IS_ERR(gphy_fw-&gt;clk_gate)) {</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gphy_fw-&gt;clk_gate),</div><div class='add'>+				     "Failed to lookup gate clock\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(gphy_fw_np, "reg", &amp;gphy_fw-&gt;fw_addr_offset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = of_property_read_u32(gphy_fw_np, "lantiq,gphy-mode", &amp;gphy_mode);</div><div class='add'>+	/* Default to GE mode */</div><div class='add'>+	if (ret)</div><div class='add'>+		gphy_mode = GPHY_MODE_GE;</div><div class='add'>+</div><div class='add'>+	switch (gphy_mode) {</div><div class='add'>+	case GPHY_MODE_FE:</div><div class='add'>+		gphy_fw-&gt;fw_name = priv-&gt;gphy_fw_name_cfg-&gt;fe_firmware_name;</div><div class='add'>+		break;</div><div class='add'>+	case GPHY_MODE_GE:</div><div class='add'>+		gphy_fw-&gt;fw_name = priv-&gt;gphy_fw_name_cfg-&gt;ge_firmware_name;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return dev_err_probe(dev, -EINVAL, "Unknown GPHY mode %d\n",</div><div class='add'>+				     gphy_mode);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gphy_fw-&gt;reset = of_reset_control_array_get_exclusive(gphy_fw_np);</div><div class='add'>+	if (IS_ERR(gphy_fw-&gt;reset))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(gphy_fw-&gt;reset),</div><div class='add'>+				     "Failed to lookup gphy reset\n");</div><div class='add'>+</div><div class='add'>+	return gswip_gphy_fw_load(priv, gphy_fw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_gphy_fw_remove(struct gswip_priv *priv,</div><div class='add'>+				 struct gswip_gphy_fw *gphy_fw)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* check if the device was fully probed */</div><div class='add'>+	if (!gphy_fw-&gt;fw_name)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;rcu_regmap, gphy_fw-&gt;fw_addr_offset, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "can not reset GPHY FW pointer\n");</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(gphy_fw-&gt;clk_gate);</div><div class='add'>+</div><div class='add'>+	reset_control_put(gphy_fw-&gt;reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_gphy_fw_list(struct gswip_priv *priv,</div><div class='add'>+			      struct device_node *gphy_fw_list_np, u32 version)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	struct device_node *gphy_fw_np;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	int err;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	/* The VRX200 rev 1.1 uses the GSWIP 2.0 and needs the older</div><div class='add'>+	 * GPHY firmware. The VRX200 rev 1.2 uses the GSWIP 2.1 and also</div><div class='add'>+	 * needs a different GPHY firmware.</div><div class='add'>+	 */</div><div class='add'>+	if (of_device_is_compatible(gphy_fw_list_np, "lantiq,xrx200-gphy-fw")) {</div><div class='add'>+		switch (version) {</div><div class='add'>+		case GSWIP_VERSION_2_0:</div><div class='add'>+			priv-&gt;gphy_fw_name_cfg = &amp;xrx200a1x_gphy_data;</div><div class='add'>+			break;</div><div class='add'>+		case GSWIP_VERSION_2_1:</div><div class='add'>+			priv-&gt;gphy_fw_name_cfg = &amp;xrx200a2x_gphy_data;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return dev_err_probe(dev, -ENOENT,</div><div class='add'>+					     "unknown GSWIP version: 0x%x\n",</div><div class='add'>+					     version);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	match = of_match_node(xway_gphy_match, gphy_fw_list_np);</div><div class='add'>+	if (match &amp;&amp; match-&gt;data)</div><div class='add'>+		priv-&gt;gphy_fw_name_cfg = match-&gt;data;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;gphy_fw_name_cfg)</div><div class='add'>+		return dev_err_probe(dev, -ENOENT,</div><div class='add'>+				     "GPHY compatible type not supported\n");</div><div class='add'>+</div><div class='add'>+	priv-&gt;num_gphy_fw = of_get_available_child_count(gphy_fw_list_np);</div><div class='add'>+	if (!priv-&gt;num_gphy_fw)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rcu_regmap = syscon_regmap_lookup_by_phandle(gphy_fw_list_np,</div><div class='add'>+							   "lantiq,rcu");</div><div class='add'>+	if (IS_ERR(priv-&gt;rcu_regmap))</div><div class='add'>+		return PTR_ERR(priv-&gt;rcu_regmap);</div><div class='add'>+</div><div class='add'>+	priv-&gt;gphy_fw = devm_kmalloc_array(dev, priv-&gt;num_gphy_fw,</div><div class='add'>+					   sizeof(*priv-&gt;gphy_fw),</div><div class='add'>+					   GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+	if (!priv-&gt;gphy_fw)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node(gphy_fw_list_np, gphy_fw_np) {</div><div class='add'>+		err = gswip_gphy_fw_probe(priv, &amp;priv-&gt;gphy_fw[i],</div><div class='add'>+					  gphy_fw_np, i);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_node_put(gphy_fw_np);</div><div class='add'>+			goto remove_gphy;</div><div class='add'>+		}</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The standalone PHY11G requires 300ms to be fully</div><div class='add'>+	 * initialized and ready for any MDIO communication after being</div><div class='add'>+	 * taken out of reset. For the SoC-internal GPHY variant there</div><div class='add'>+	 * is no (known) documentation for the minimum time after a</div><div class='add'>+	 * reset. Use the same value as for the standalone variant as</div><div class='add'>+	 * some users have reported internal PHYs not being detected</div><div class='add'>+	 * without any delay.</div><div class='add'>+	 */</div><div class='add'>+	msleep(300);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+remove_gphy:</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_gphy_fw; i++)</div><div class='add'>+		gswip_gphy_fw_remove(priv, &amp;priv-&gt;gphy_fw[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_config sw_regmap_config = {</div><div class='add'>+	.name = "switch",</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_shift = REGMAP_UPSHIFT(2),</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_NATIVE,</div><div class='add'>+	.max_register = GSWIP_SDMA_PCTRLp(6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config mdio_regmap_config = {</div><div class='add'>+	.name = "mdio",</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_shift = REGMAP_UPSHIFT(2),</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_NATIVE,</div><div class='add'>+	.max_register = GSWIP_MDIO_PHYp(0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config mii_regmap_config = {</div><div class='add'>+	.name = "mii",</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_shift = REGMAP_UPSHIFT(2),</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_NATIVE,</div><div class='add'>+	.max_register = GSWIP_MII_CFGp(6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gswip_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np, *gphy_fw_np;</div><div class='add'>+	__iomem void *gswip, *mdio, *mii;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct gswip_priv *priv;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+	u32 version;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	gswip = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(gswip))</div><div class='add'>+		return PTR_ERR(gswip);</div><div class='add'>+</div><div class='add'>+	mdio = devm_platform_ioremap_resource(pdev, 1);</div><div class='add'>+	if (IS_ERR(mdio))</div><div class='add'>+		return PTR_ERR(mdio);</div><div class='add'>+</div><div class='add'>+	mii = devm_platform_ioremap_resource(pdev, 2);</div><div class='add'>+	if (IS_ERR(mii))</div><div class='add'>+		return PTR_ERR(mii);</div><div class='add'>+</div><div class='add'>+	priv-&gt;gswip = devm_regmap_init_mmio(dev, gswip, &amp;sw_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;gswip))</div><div class='add'>+		return PTR_ERR(priv-&gt;gswip);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio = devm_regmap_init_mmio(dev, mdio, &amp;mdio_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;mdio))</div><div class='add'>+		return PTR_ERR(priv-&gt;mdio);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mii = devm_regmap_init_mmio(dev, mii, &amp;mii_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;mii))</div><div class='add'>+		return PTR_ERR(priv-&gt;mii);</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_info = of_device_get_match_data(dev);</div><div class='add'>+	if (!priv-&gt;hw_info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ds = devm_kzalloc(dev, sizeof(*priv-&gt;ds), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;gswip, GSWIP_VERSION, &amp;version);</div><div class='add'>+</div><div class='add'>+	np = dev-&gt;of_node;</div><div class='add'>+	switch (version) {</div><div class='add'>+	case GSWIP_VERSION_2_0:</div><div class='add'>+	case GSWIP_VERSION_2_1:</div><div class='add'>+		if (!of_device_is_compatible(np, "lantiq,xrx200-gswip"))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	case GSWIP_VERSION_2_2:</div><div class='add'>+	case GSWIP_VERSION_2_2_ETC:</div><div class='add'>+		if (!of_device_is_compatible(np, "lantiq,xrx300-gswip") &amp;&amp;</div><div class='add'>+		    !of_device_is_compatible(np, "lantiq,xrx330-gswip"))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return dev_err_probe(dev, -ENOENT,</div><div class='add'>+				     "unknown GSWIP version: 0x%x\n", version);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* bring up the mdio bus */</div><div class='add'>+	gphy_fw_np = of_get_compatible_child(dev-&gt;of_node, "lantiq,gphy-fw");</div><div class='add'>+	if (gphy_fw_np) {</div><div class='add'>+		err = gswip_gphy_fw_list(priv, gphy_fw_np, version);</div><div class='add'>+		of_node_put(gphy_fw_np);</div><div class='add'>+		if (err)</div><div class='add'>+			return dev_err_probe(dev, err,</div><div class='add'>+					     "gphy fw probe failed\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = gswip_probe_common(priv, version);</div><div class='add'>+	if (err)</div><div class='add'>+		goto gphy_fw_remove;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+gphy_fw_remove:</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_gphy_fw; i++)</div><div class='add'>+		gswip_gphy_fw_remove(priv, &amp;priv-&gt;gphy_fw[i]);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* disable the switch */</div><div class='add'>+	gswip_disable_switch(priv);</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_gphy_fw; i++)</div><div class='add'>+		gswip_gphy_fw_remove(priv, &amp;priv-&gt;gphy_fw[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct gswip_hw_info gswip_xrx200 = {</div><div class='add'>+	.max_ports = 7,</div><div class='add'>+	.allowed_cpu_ports = BIT(6),</div><div class='add'>+	.mii_ports = BIT(0) | BIT(1) | BIT(5),</div><div class='add'>+	.mii_port_reg_offset = 0,</div><div class='add'>+	.phylink_get_caps = gswip_xrx200_phylink_get_caps,</div><div class='add'>+	.pce_microcode = &amp;gswip_pce_microcode,</div><div class='add'>+	.pce_microcode_size = ARRAY_SIZE(gswip_pce_microcode),</div><div class='add'>+	.tag_protocol = DSA_TAG_PROTO_GSWIP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gswip_hw_info gswip_xrx300 = {</div><div class='add'>+	.max_ports = 7,</div><div class='add'>+	.allowed_cpu_ports = BIT(6),</div><div class='add'>+	.mii_ports = BIT(0) | BIT(5),</div><div class='add'>+	.mii_port_reg_offset = 0,</div><div class='add'>+	.phylink_get_caps = gswip_xrx300_phylink_get_caps,</div><div class='add'>+	.pce_microcode = &amp;gswip_pce_microcode,</div><div class='add'>+	.pce_microcode_size = ARRAY_SIZE(gswip_pce_microcode),</div><div class='add'>+	.tag_protocol = DSA_TAG_PROTO_GSWIP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id gswip_of_match[] = {</div><div class='add'>+	{ .compatible = "lantiq,xrx200-gswip", .data = &amp;gswip_xrx200 },</div><div class='add'>+	{ .compatible = "lantiq,xrx300-gswip", .data = &amp;gswip_xrx300 },</div><div class='add'>+	{ .compatible = "lantiq,xrx330-gswip", .data = &amp;gswip_xrx300 },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, gswip_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver gswip_driver = {</div><div class='add'>+	.probe = gswip_probe,</div><div class='add'>+	.remove = gswip_remove,</div><div class='add'>+	.shutdown = gswip_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "gswip",</div><div class='add'>+		.of_match_table = gswip_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(gswip_driver);</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE("lantiq/xrx300_phy11g_a21.bin");</div><div class='add'>+MODULE_FIRMWARE("lantiq/xrx300_phy22f_a21.bin");</div><div class='add'>+MODULE_FIRMWARE("lantiq/xrx200_phy11g_a14.bin");</div><div class='add'>+MODULE_FIRMWARE("lantiq/xrx200_phy11g_a22.bin");</div><div class='add'>+MODULE_FIRMWARE("lantiq/xrx200_phy22f_a14.bin");</div><div class='add'>+MODULE_FIRMWARE("lantiq/xrx200_phy22f_a22.bin");</div><div class='add'>+MODULE_AUTHOR("Hauke Mehrtens &lt;hauke@hauke-m.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Lantiq / Intel GSWIP driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/lantiq_gswip.h b/drivers/net/dsa/lantiq/lantiq_gswip.h<br/>new file mode 100644<br/>index 000000000000..9c38e51a75e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/lantiq_gswip.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/lantiq_gswip.h</a></div><div class='hunk'>@@ -0,0 +1,301 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#ifndef __LANTIQ_GSWIP_H</div><div class='add'>+#define __LANTIQ_GSWIP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/swab.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+/* GSWIP MDIO Registers */</div><div class='add'>+#define GSWIP_MDIO_GLOB			0x00</div><div class='add'>+#define  GSWIP_MDIO_GLOB_ENABLE		BIT(15)</div><div class='add'>+#define GSWIP_MDIO_CTRL			0x08</div><div class='add'>+#define  GSWIP_MDIO_CTRL_BUSY		BIT(12)</div><div class='add'>+#define  GSWIP_MDIO_CTRL_RD		BIT(11)</div><div class='add'>+#define  GSWIP_MDIO_CTRL_WR		BIT(10)</div><div class='add'>+#define  GSWIP_MDIO_CTRL_PHYAD_MASK	0x1f</div><div class='add'>+#define  GSWIP_MDIO_CTRL_PHYAD_SHIFT	5</div><div class='add'>+#define  GSWIP_MDIO_CTRL_REGAD_MASK	0x1f</div><div class='add'>+#define GSWIP_MDIO_READ			0x09</div><div class='add'>+#define GSWIP_MDIO_WRITE		0x0A</div><div class='add'>+#define GSWIP_MDIO_MDC_CFG0		0x0B</div><div class='add'>+#define GSWIP_MDIO_MDC_CFG1		0x0C</div><div class='add'>+#define GSWIP_MDIO_PHYp(p)		(0x15 - (p))</div><div class='add'>+#define  GSWIP_MDIO_PHY_LINK_MASK	0x6000</div><div class='add'>+#define  GSWIP_MDIO_PHY_LINK_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MDIO_PHY_LINK_DOWN	0x4000</div><div class='add'>+#define  GSWIP_MDIO_PHY_LINK_UP		0x2000</div><div class='add'>+#define  GSWIP_MDIO_PHY_SPEED_MASK	0x1800</div><div class='add'>+#define  GSWIP_MDIO_PHY_SPEED_AUTO	0x1800</div><div class='add'>+#define  GSWIP_MDIO_PHY_SPEED_M10	0x0000</div><div class='add'>+#define  GSWIP_MDIO_PHY_SPEED_M100	0x0800</div><div class='add'>+#define  GSWIP_MDIO_PHY_SPEED_G1	0x1000</div><div class='add'>+#define  GSWIP_MDIO_PHY_FDUP_MASK	0x0600</div><div class='add'>+#define  GSWIP_MDIO_PHY_FDUP_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MDIO_PHY_FDUP_EN		0x0200</div><div class='add'>+#define  GSWIP_MDIO_PHY_FDUP_DIS	0x0600</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONTX_MASK	0x0180</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONTX_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONTX_EN	0x0100</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONTX_DIS	0x0180</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONRX_MASK	0x0060</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONRX_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONRX_EN	0x0020</div><div class='add'>+#define  GSWIP_MDIO_PHY_FCONRX_DIS	0x0060</div><div class='add'>+#define  GSWIP_MDIO_PHY_ADDR_MASK	0x001f</div><div class='add'>+#define  GSWIP_MDIO_PHY_MASK		(GSWIP_MDIO_PHY_ADDR_MASK | \</div><div class='add'>+					 GSWIP_MDIO_PHY_FCONRX_MASK | \</div><div class='add'>+					 GSWIP_MDIO_PHY_FCONTX_MASK | \</div><div class='add'>+					 GSWIP_MDIO_PHY_LINK_MASK | \</div><div class='add'>+					 GSWIP_MDIO_PHY_SPEED_MASK | \</div><div class='add'>+					 GSWIP_MDIO_PHY_FDUP_MASK)</div><div class='add'>+</div><div class='add'>+/* GSWIP MII Registers */</div><div class='add'>+#define GSWIP_MII_CFGp(p)		(0x2 * (p))</div><div class='add'>+#define  GSWIP_MII_CFG_RESET		BIT(15)</div><div class='add'>+#define  GSWIP_MII_CFG_EN		BIT(14)</div><div class='add'>+#define  GSWIP_MII_CFG_ISOLATE		BIT(13)</div><div class='add'>+#define  GSWIP_MII_CFG_LDCLKDIS		BIT(12)</div><div class='add'>+#define  GSWIP_MII_CFG_RGMII_IBS	BIT(8)</div><div class='add'>+#define  GSWIP_MII_CFG_RMII_CLK		BIT(7)</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_MIIP	0x0</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_MIIM	0x1</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_RMIIP	0x2</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_RMIIM	0x3</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_RGMII	0x4</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_GMII	0x9</div><div class='add'>+#define  GSWIP_MII_CFG_MODE_MASK	0xf</div><div class='add'>+#define  GSWIP_MII_CFG_RATE_M2P5	0x00</div><div class='add'>+#define  GSWIP_MII_CFG_RATE_M25	0x10</div><div class='add'>+#define  GSWIP_MII_CFG_RATE_M125	0x20</div><div class='add'>+#define  GSWIP_MII_CFG_RATE_M50	0x30</div><div class='add'>+#define  GSWIP_MII_CFG_RATE_AUTO	0x40</div><div class='add'>+#define  GSWIP_MII_CFG_RATE_MASK	0x70</div><div class='add'>+#define GSWIP_MII_PCDU0			0x01</div><div class='add'>+#define GSWIP_MII_PCDU1			0x03</div><div class='add'>+#define GSWIP_MII_PCDU5			0x05</div><div class='add'>+#define  GSWIP_MII_PCDU_TXDLY_MASK	GENMASK(2, 0)</div><div class='add'>+#define  GSWIP_MII_PCDU_RXDLY_MASK	GENMASK(9, 7)</div><div class='add'>+#define  GSWIP_MII_PCDU_TXDLY(x)	u16_encode_bits(((x) / 500), GSWIP_MII_PCDU_TXDLY_MASK)</div><div class='add'>+#define  GSWIP_MII_PCDU_RXDLY(x)	u16_encode_bits(((x) / 500), GSWIP_MII_PCDU_RXDLY_MASK)</div><div class='add'>+#define GSWIP_MII_PCDU_RXDLY_DEFAULT	2000 /* picoseconds */</div><div class='add'>+#define GSWIP_MII_PCDU_TXDLY_DEFAULT	2000 /* picoseconds */</div><div class='add'>+</div><div class='add'>+/* GSWIP Core Registers */</div><div class='add'>+#define GSWIP_SWRES			0x000</div><div class='add'>+#define  GSWIP_SWRES_R1			BIT(1)	/* GSWIP Software reset */</div><div class='add'>+#define  GSWIP_SWRES_R0			BIT(0)	/* GSWIP Hardware reset */</div><div class='add'>+#define GSWIP_VERSION			0x013</div><div class='add'>+#define  GSWIP_VERSION_REV_MASK		GENMASK(7, 0)</div><div class='add'>+#define  GSWIP_VERSION_MOD_MASK		GENMASK(15, 8)</div><div class='add'>+#define  GSWIP_VERSION_REV(v)		FIELD_GET(GSWIP_VERSION_REV_MASK, v)</div><div class='add'>+#define  GSWIP_VERSION_MOD(v)		FIELD_GET(GSWIP_VERSION_MOD_MASK, v)</div><div class='add'>+#define   GSWIP_VERSION_2_0		0x100</div><div class='add'>+#define   GSWIP_VERSION_2_1		0x021</div><div class='add'>+#define   GSWIP_VERSION_2_2		0x122</div><div class='add'>+#define   GSWIP_VERSION_2_2_ETC		0x022</div><div class='add'>+/* The hardware has the 'major/minor' version bytes in the wrong order</div><div class='add'>+ * preventing numerical comparisons. Swap the bytes of the 16-bit value</div><div class='add'>+ * to end up with REV being the most significant byte and MOD being the</div><div class='add'>+ * least significant byte, which then allows comparing it with the</div><div class='add'>+ * value stored in struct gswip_priv.</div><div class='add'>+ */</div><div class='add'>+#define GSWIP_VERSION_GE(priv, ver)	((priv)-&gt;version &gt;= swab16(ver))</div><div class='add'>+</div><div class='add'>+#define GSWIP_BM_RAM_VAL(x)		(0x043 - (x))</div><div class='add'>+#define GSWIP_BM_RAM_ADDR		0x044</div><div class='add'>+#define GSWIP_BM_RAM_CTRL		0x045</div><div class='add'>+#define  GSWIP_BM_RAM_CTRL_BAS		BIT(15)</div><div class='add'>+#define  GSWIP_BM_RAM_CTRL_OPMOD	BIT(5)</div><div class='add'>+#define  GSWIP_BM_RAM_CTRL_ADDR_MASK	GENMASK(4, 0)</div><div class='add'>+#define GSWIP_BM_QUEUE_GCTRL		0x04A</div><div class='add'>+#define  GSWIP_BM_QUEUE_GCTRL_GL_MOD	BIT(10)</div><div class='add'>+/* buffer management Port Configuration Register */</div><div class='add'>+#define GSWIP_BM_PCFGp(p)		(0x080 + ((p) * 2))</div><div class='add'>+#define  GSWIP_BM_PCFG_CNTEN		BIT(0)	/* RMON Counter Enable */</div><div class='add'>+#define  GSWIP_BM_PCFG_IGCNT		BIT(1)	/* Ingres Special Tag RMON count */</div><div class='add'>+/* buffer management Port Control Register */</div><div class='add'>+#define GSWIP_BM_RMON_CTRLp(p)		(0x81 + ((p) * 2))</div><div class='add'>+#define  GSWIP_BM_CTRL_RMON_RAM1_RES	BIT(0)	/* Software Reset for RMON RAM 1 */</div><div class='add'>+#define  GSWIP_BM_CTRL_RMON_RAM2_RES	BIT(1)	/* Software Reset for RMON RAM 2 */</div><div class='add'>+</div><div class='add'>+/* PCE */</div><div class='add'>+#define GSWIP_PCE_TBL_KEY(x)		(0x447 - (x))</div><div class='add'>+#define GSWIP_PCE_TBL_MASK		0x448</div><div class='add'>+#define GSWIP_PCE_TBL_VAL(x)		(0x44D - (x))</div><div class='add'>+#define GSWIP_PCE_TBL_ADDR		0x44E</div><div class='add'>+#define GSWIP_PCE_TBL_CTRL		0x44F</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_BAS		BIT(15)</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_TYPE	BIT(13)</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_VLD		BIT(12)</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_KEYFORM	BIT(11)</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_GMAP_MASK	GENMASK(10, 7)</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_OPMOD_MASK	GENMASK(6, 5)</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_OPMOD_ADRD	0x00</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_OPMOD_ADWR	0x20</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_OPMOD_KSRD	0x40</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_OPMOD_KSWR	0x60</div><div class='add'>+#define  GSWIP_PCE_TBL_CTRL_ADDR_MASK	GENMASK(4, 0)</div><div class='add'>+#define GSWIP_PCE_PMAP1			0x453	/* Monitoring port map */</div><div class='add'>+#define GSWIP_PCE_PMAP2			0x454	/* Default Multicast port map */</div><div class='add'>+#define GSWIP_PCE_PMAP3			0x455	/* Default Unknown Unicast port map */</div><div class='add'>+#define GSWIP_PCE_GCTRL_0		0x456</div><div class='add'>+#define  GSWIP_PCE_GCTRL_0_MTFL		BIT(0)  /* MAC Table Flushing */</div><div class='add'>+#define  GSWIP_PCE_GCTRL_0_MC_VALID	BIT(3)</div><div class='add'>+#define  GSWIP_PCE_GCTRL_0_VLAN		BIT(14) /* VLAN aware Switching */</div><div class='add'>+#define GSWIP_PCE_GCTRL_1		0x457</div><div class='add'>+#define  GSWIP_PCE_GCTRL_1_MAC_GLOCK	BIT(2)	/* MAC Address table lock */</div><div class='add'>+#define  GSWIP_PCE_GCTRL_1_MAC_GLOCK_MOD	BIT(3) /* Mac address table lock forwarding mode */</div><div class='add'>+#define GSWIP_PCE_PCTRL_0p(p)		(0x480 + ((p) * 0xA))</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_TVM		BIT(5)	/* Transparent VLAN mode */</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_VREP		BIT(6)	/* VLAN Replace Mode */</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_INGRESS	BIT(11)	/* Accept special tag in ingress */</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_PSTATE_LISTEN	0x0</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_PSTATE_RX		0x1</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_PSTATE_TX		0x2</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_PSTATE_LEARNING	0x3</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_PSTATE_FORWARDING	0x7</div><div class='add'>+#define  GSWIP_PCE_PCTRL_0_PSTATE_MASK	GENMASK(2, 0)</div><div class='add'>+/* Ethernet Switch PCE Port Control Register 3 */</div><div class='add'>+#define GSWIP_PCE_PCTRL_3p(p)		(0x483 + ((p) * 0xA))</div><div class='add'>+#define  GSWIP_PCE_PCTRL_3_LNDIS	BIT(15)  /* Learning Disable */</div><div class='add'>+#define GSWIP_PCE_VCTRL(p)		(0x485 + ((p) * 0xA))</div><div class='add'>+#define  GSWIP_PCE_VCTRL_UVR		BIT(0)	/* Unknown VLAN Rule */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VINR		GENMASK(2, 1) /* VLAN Ingress Tag Rule */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VINR_ALL	0 /* Admit tagged and untagged packets */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VINR_TAGGED	1 /* Admit only tagged packets */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VINR_UNTAGGED	2 /* Admit only untagged packets */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VIMR		BIT(3)	/* VLAN Ingress Member violation rule */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VEMR		BIT(4)	/* VLAN Egress Member violation rule */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VSR		BIT(5)	/* VLAN Security */</div><div class='add'>+#define  GSWIP_PCE_VCTRL_VID0		BIT(6)	/* Priority Tagged Rule */</div><div class='add'>+#define GSWIP_PCE_DEFPVID(p)		(0x486 + ((p) * 0xA))</div><div class='add'>+</div><div class='add'>+#define GSWIP_MAC_FLEN			0x8C5</div><div class='add'>+#define GSWIP_MAC_CTRL_0p(p)		(0x903 + ((p) * 0xC))</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_PADEN		BIT(8)</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCS_EN	BIT(7)</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCON_MASK	0x0070</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCON_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCON_RX	0x0010</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCON_TX	0x0020</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCON_RXTX	0x0030</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FCON_NONE	0x0040</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FDUP_MASK	0x000C</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FDUP_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FDUP_EN	0x0004</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_FDUP_DIS	0x000C</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_GMII_MASK	0x0003</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_GMII_AUTO	0x0000</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_GMII_MII	0x0001</div><div class='add'>+#define  GSWIP_MAC_CTRL_0_GMII_RGMII	0x0002</div><div class='add'>+#define GSWIP_MAC_CTRL_2p(p)		(0x905 + ((p) * 0xC))</div><div class='add'>+#define GSWIP_MAC_CTRL_2_LCHKL		BIT(2) /* Frame Length Check Long Enable */</div><div class='add'>+#define GSWIP_MAC_CTRL_2_MLEN		BIT(3) /* Maximum Untagged Frame Lnegth */</div><div class='add'>+#define GSWIP_MAC_CTRL_4p(p)		(0x907 + ((p) * 0xC))</div><div class='add'>+#define  GSWIP_MAC_CTRL_4_LPIEN		BIT(7) /* LPI Mode Enable */</div><div class='add'>+#define  GSWIP_MAC_CTRL_4_GWAIT_MASK	GENMASK(14, 8) /* LPI Wait Time 1G */</div><div class='add'>+#define  GSWIP_MAC_CTRL_4_GWAIT(t)	u16_encode_bits((t), GSWIP_MAC_CTRL_4_GWAIT_MASK)</div><div class='add'>+#define  GSWIP_MAC_CTRL_4_WAIT_MASK	GENMASK(6, 0) /* LPI Wait Time 100M */</div><div class='add'>+#define  GSWIP_MAC_CTRL_4_WAIT(t)	u16_encode_bits((t), GSWIP_MAC_CTRL_4_WAIT_MASK)</div><div class='add'>+</div><div class='add'>+/* Ethernet Switch Fetch DMA Port Control Register */</div><div class='add'>+#define GSWIP_FDMA_PCTRLp(p)		(0xA80 + ((p) * 0x6))</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_EN		BIT(0)	/* FDMA Port Enable */</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_STEN		BIT(1)	/* Special Tag Insertion Enable */</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_VLANMOD_MASK	GENMASK(4, 3)	/* VLAN Modification Control */</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_VLANMOD_SHIFT	3	/* VLAN Modification Control */</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_VLANMOD_DIS	(0x0 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_VLANMOD_PRIO	(0x1 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_VLANMOD_ID	(0x2 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='add'>+#define  GSWIP_FDMA_PCTRL_VLANMOD_BOTH	(0x3 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='add'>+</div><div class='add'>+/* Ethernet Switch Store DMA Port Control Register */</div><div class='add'>+#define GSWIP_SDMA_PCTRLp(p)		(0xBC0 + ((p) * 0x6))</div><div class='add'>+#define  GSWIP_SDMA_PCTRL_EN		BIT(0)	/* SDMA Port Enable */</div><div class='add'>+#define  GSWIP_SDMA_PCTRL_FCEN		BIT(1)	/* Flow Control Enable */</div><div class='add'>+#define  GSWIP_SDMA_PCTRL_PAUFWD	BIT(3)	/* Pause Frame Forwarding */</div><div class='add'>+</div><div class='add'>+#define GSWIP_TABLE_ACTIVE_VLAN		0x01</div><div class='add'>+#define GSWIP_TABLE_VLAN_MAPPING	0x02</div><div class='add'>+#define GSWIP_TABLE_MAC_BRIDGE		0x0b</div><div class='add'>+#define  GSWIP_TABLE_MAC_BRIDGE_KEY3_FID	GENMASK(5, 0)	/* Filtering identifier */</div><div class='add'>+#define  GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT	GENMASK(7, 4)	/* Port on learned entries */</div><div class='add'>+#define  GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC	BIT(0)		/* Static, non-aging entry */</div><div class='add'>+#define  GSWIP_TABLE_MAC_BRIDGE_VAL1_VALID	BIT(1)		/* Valid bit */</div><div class='add'>+</div><div class='add'>+#define XRX200_GPHY_FW_ALIGN	(16 * 1024)</div><div class='add'>+</div><div class='add'>+/* Maximum packet size supported by the switch. In theory this should be 10240,</div><div class='add'>+ * but long packets currently cause lock-ups with an MTU of over 2526. Medium</div><div class='add'>+ * packets are sometimes dropped (e.g. TCP over 2477, UDP over 2516-2519, ICMP</div><div class='add'>+ * over 2526), hence an MTU value of 2400 seems safe. This issue only affects</div><div class='add'>+ * packet reception. This is probably caused by the PPA engine, which is on the</div><div class='add'>+ * RX part of the device. Packet transmission works properly up to 10240.</div><div class='add'>+ */</div><div class='add'>+#define GSWIP_MAX_PACKET_LENGTH	2400</div><div class='add'>+</div><div class='add'>+#define GSWIP_VLAN_UNAWARE_PVID	0</div><div class='add'>+</div><div class='add'>+struct gswip_pce_microcode {</div><div class='add'>+	u16 val_3;</div><div class='add'>+	u16 val_2;</div><div class='add'>+	u16 val_1;</div><div class='add'>+	u16 val_0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gswip_hw_info {</div><div class='add'>+	int max_ports;</div><div class='add'>+	unsigned int allowed_cpu_ports;</div><div class='add'>+	unsigned int mii_ports;</div><div class='add'>+	int mii_port_reg_offset;</div><div class='add'>+	bool supports_2500m;</div><div class='add'>+	const struct gswip_pce_microcode (*pce_microcode)[];</div><div class='add'>+	size_t pce_microcode_size;</div><div class='add'>+	enum dsa_tag_protocol tag_protocol;</div><div class='add'>+	void (*phylink_get_caps)(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct phylink_config *config);</div><div class='add'>+	struct phylink_pcs *(*mac_select_pcs)(struct phylink_config *config,</div><div class='add'>+					      phy_interface_t interface);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gswip_gphy_fw {</div><div class='add'>+	struct clk *clk_gate;</div><div class='add'>+	struct reset_control *reset;</div><div class='add'>+	u32 fw_addr_offset;</div><div class='add'>+	char *fw_name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gswip_vlan {</div><div class='add'>+	struct net_device *bridge;</div><div class='add'>+	u16 vid;</div><div class='add'>+	u8 fid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gswip_priv {</div><div class='add'>+	struct regmap *gswip;</div><div class='add'>+	struct regmap *mdio;</div><div class='add'>+	struct regmap *mii;</div><div class='add'>+	const struct gswip_hw_info *hw_info;</div><div class='add'>+	const struct xway_gphy_match_data *gphy_fw_name_cfg;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *rcu_regmap;</div><div class='add'>+	struct gswip_vlan vlans[64];</div><div class='add'>+	int num_gphy_fw;</div><div class='add'>+	struct gswip_gphy_fw *gphy_fw;</div><div class='add'>+	struct mutex pce_table_lock;</div><div class='add'>+	u16 version;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void gswip_disable_switch(struct gswip_priv *priv);</div><div class='add'>+</div><div class='add'>+int gswip_probe_common(struct gswip_priv *priv, u32 version);</div><div class='add'>+</div><div class='add'>+#endif /* __LANTIQ_GSWIP_H */</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/lantiq_gswip_common.c b/drivers/net/dsa/lantiq/lantiq_gswip_common.c<br/>new file mode 100644<br/>index 000000000000..9da39edf8f57<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/lantiq_gswip_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/lantiq_gswip_common.c</a></div><div class='hunk'>@@ -0,0 +1,1739 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Lantiq / Intel / MaxLinear GSWIP common function library</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Daniel Golle &lt;daniel@makrotopia.org&gt;</div><div class='add'>+ * Copyright (C) 2023 - 2024 MaxLinear Inc.</div><div class='add'>+ * Copyright (C) 2022 Snap One, LLC.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2017 - 2019 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ * Copyright (C) 2012 John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Lantiq Deutschland</div><div class='add'>+ *</div><div class='add'>+ * The VLAN and bridge model the GSWIP hardware uses does not directly</div><div class='add'>+ * matches the model DSA uses.</div><div class='add'>+ *</div><div class='add'>+ * The hardware has 64 possible table entries for bridges with one VLAN</div><div class='add'>+ * ID, one flow id and a list of ports for each bridge. All entries which</div><div class='add'>+ * match the same flow ID are combined in the mac learning table, they</div><div class='add'>+ * act as one global bridge.</div><div class='add'>+ * The hardware does not support VLAN filter on the port, but on the</div><div class='add'>+ * bridge, this driver converts the DSA model to the hardware.</div><div class='add'>+ *</div><div class='add'>+ * The CPU gets all the exception frames which do not match any forwarding</div><div class='add'>+ * rule and the CPU port is also added to all bridges. This makes it possible</div><div class='add'>+ * to handle all the special cases easily in software.</div><div class='add'>+ * At the initialization the driver allocates one bridge table entry for</div><div class='add'>+ * each switch port which is used when the port is used without an</div><div class='add'>+ * explicit bridge. This prevents the frames from being forwarded</div><div class='add'>+ * between all LAN ports by default.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "lantiq_gswip.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+struct gswip_pce_table_entry {</div><div class='add'>+	u16 index;      // PCE_TBL_ADDR.ADDR = pData-&gt;table_index</div><div class='add'>+	u16 table;      // PCE_TBL_CTRL.ADDR = pData-&gt;table</div><div class='add'>+	u16 key[8];</div><div class='add'>+	u16 val[5];</div><div class='add'>+	u16 mask;</div><div class='add'>+	u8 gmap;</div><div class='add'>+	bool type;</div><div class='add'>+	bool valid;</div><div class='add'>+	bool key_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct gswip_rmon_cnt_desc {</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MIB_DESC(_size, _offset, _name) {.size = _size, .offset = _offset, .name = _name}</div><div class='add'>+</div><div class='add'>+static const struct gswip_rmon_cnt_desc gswip_rmon_cnt[] = {</div><div class='add'>+	/** Receive Packet Count (only packets that are accepted and not discarded). */</div><div class='add'>+	MIB_DESC(1, 0x1F, "RxGoodPkts"),</div><div class='add'>+	MIB_DESC(1, 0x23, "RxUnicastPkts"),</div><div class='add'>+	MIB_DESC(1, 0x22, "RxMulticastPkts"),</div><div class='add'>+	MIB_DESC(1, 0x21, "RxFCSErrorPkts"),</div><div class='add'>+	MIB_DESC(1, 0x1D, "RxUnderSizeGoodPkts"),</div><div class='add'>+	MIB_DESC(1, 0x1E, "RxUnderSizeErrorPkts"),</div><div class='add'>+	MIB_DESC(1, 0x1B, "RxOversizeGoodPkts"),</div><div class='add'>+	MIB_DESC(1, 0x1C, "RxOversizeErrorPkts"),</div><div class='add'>+	MIB_DESC(1, 0x20, "RxGoodPausePkts"),</div><div class='add'>+	MIB_DESC(1, 0x1A, "RxAlignErrorPkts"),</div><div class='add'>+	MIB_DESC(1, 0x12, "Rx64BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x13, "Rx127BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x14, "Rx255BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x15, "Rx511BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x16, "Rx1023BytePkts"),</div><div class='add'>+	/** Receive Size 1024-1522 (or more, if configured) Packet Count. */</div><div class='add'>+	MIB_DESC(1, 0x17, "RxMaxBytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x18, "RxDroppedPkts"),</div><div class='add'>+	MIB_DESC(1, 0x19, "RxFilteredPkts"),</div><div class='add'>+	MIB_DESC(2, 0x24, "RxGoodBytes"),</div><div class='add'>+	MIB_DESC(2, 0x26, "RxBadBytes"),</div><div class='add'>+	MIB_DESC(1, 0x11, "TxAcmDroppedPkts"),</div><div class='add'>+	MIB_DESC(1, 0x0C, "TxGoodPkts"),</div><div class='add'>+	MIB_DESC(1, 0x06, "TxUnicastPkts"),</div><div class='add'>+	MIB_DESC(1, 0x07, "TxMulticastPkts"),</div><div class='add'>+	MIB_DESC(1, 0x00, "Tx64BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x01, "Tx127BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x02, "Tx255BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x03, "Tx511BytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x04, "Tx1023BytePkts"),</div><div class='add'>+	/** Transmit Size 1024-1522 (or more, if configured) Packet Count. */</div><div class='add'>+	MIB_DESC(1, 0x05, "TxMaxBytePkts"),</div><div class='add'>+	MIB_DESC(1, 0x08, "TxSingleCollCount"),</div><div class='add'>+	MIB_DESC(1, 0x09, "TxMultCollCount"),</div><div class='add'>+	MIB_DESC(1, 0x0A, "TxLateCollCount"),</div><div class='add'>+	MIB_DESC(1, 0x0B, "TxExcessCollCount"),</div><div class='add'>+	MIB_DESC(1, 0x0D, "TxPauseCount"),</div><div class='add'>+	MIB_DESC(1, 0x10, "TxDroppedPkts"),</div><div class='add'>+	MIB_DESC(2, 0x0E, "TxGoodBytes"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset,</div><div class='add'>+				  u32 cleared)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(priv-&gt;gswip, offset, val,</div><div class='add'>+					!(val &amp; cleared), 20, 50000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 mask, u32 set,</div><div class='add'>+			       int port)</div><div class='add'>+{</div><div class='add'>+	int reg_port;</div><div class='add'>+</div><div class='add'>+	/* MII_CFG register only exists for MII ports */</div><div class='add'>+	if (!(priv-&gt;hw_info-&gt;mii_ports &amp; BIT(port)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reg_port = port + priv-&gt;hw_info-&gt;mii_port_reg_offset;</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;mii, GSWIP_MII_CFGp(reg_port), mask,</div><div class='add'>+			  set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_mdio_poll(struct gswip_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(priv-&gt;mdio, GSWIP_MDIO_CTRL, ctrl,</div><div class='add'>+					!(ctrl &amp; GSWIP_MDIO_CTRL_BUSY), 40, 4000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_mdio_wr(struct mii_bus *bus, int addr, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = bus-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gswip_mdio_poll(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;bus-&gt;dev, "waiting for MDIO bus busy timed out\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;mdio, GSWIP_MDIO_WRITE, val);</div><div class='add'>+	regmap_write(priv-&gt;mdio, GSWIP_MDIO_CTRL,</div><div class='add'>+		     GSWIP_MDIO_CTRL_BUSY | GSWIP_MDIO_CTRL_WR |</div><div class='add'>+		     ((addr &amp; GSWIP_MDIO_CTRL_PHYAD_MASK) &lt;&lt; GSWIP_MDIO_CTRL_PHYAD_SHIFT) |</div><div class='add'>+		     (reg &amp; GSWIP_MDIO_CTRL_REGAD_MASK));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = bus-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = gswip_mdio_poll(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;bus-&gt;dev, "waiting for MDIO bus busy timed out\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;mdio, GSWIP_MDIO_CTRL,</div><div class='add'>+		     GSWIP_MDIO_CTRL_BUSY | GSWIP_MDIO_CTRL_RD |</div><div class='add'>+		     ((addr &amp; GSWIP_MDIO_CTRL_PHYAD_MASK) &lt;&lt; GSWIP_MDIO_CTRL_PHYAD_SHIFT) |</div><div class='add'>+		     (reg &amp; GSWIP_MDIO_CTRL_REGAD_MASK));</div><div class='add'>+</div><div class='add'>+	err = gswip_mdio_poll(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;bus-&gt;dev, "waiting for MDIO bus busy timed out\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;mdio, GSWIP_MDIO_READ, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_mdio(struct gswip_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device_node *mdio_np, *switch_np = priv-&gt;dev-&gt;of_node;</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mdio_np = of_get_compatible_child(switch_np, "lantiq,xrx200-mdio");</div><div class='add'>+	if (!mdio_np)</div><div class='add'>+		mdio_np = of_get_child_by_name(switch_np, "mdio");</div><div class='add'>+</div><div class='add'>+	if (!of_device_is_available(mdio_np))</div><div class='add'>+		goto out_put_node;</div><div class='add'>+</div><div class='add'>+	bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;priv = priv;</div><div class='add'>+	bus-&gt;read = gswip_mdio_rd;</div><div class='add'>+	bus-&gt;write = gswip_mdio_wr;</div><div class='add'>+	bus-&gt;name = "lantiq,xrx200-mdio";</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s-mii", dev_name(priv-&gt;dev));</div><div class='add'>+	bus-&gt;parent = priv-&gt;dev;</div><div class='add'>+</div><div class='add'>+	err = devm_of_mdiobus_register(dev, bus, mdio_np);</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='add'>+	of_node_put(mdio_np);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_pce_table_entry_read(struct gswip_priv *priv,</div><div class='add'>+				      struct gswip_pce_table_entry *tbl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	u32 crtl;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	u16 addr_mode = tbl-&gt;key_mode ? GSWIP_PCE_TBL_CTRL_OPMOD_KSRD :</div><div class='add'>+					GSWIP_PCE_TBL_CTRL_OPMOD_ADRD;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;pce_table_lock);</div><div class='add'>+</div><div class='add'>+	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_ADDR, tbl-&gt;index);</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_OPMOD_MASK |</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_BAS,</div><div class='add'>+			  tbl-&gt;table | addr_mode | GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+</div><div class='add'>+	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;key); i++) {</div><div class='add'>+		err = regmap_read(priv-&gt;gswip, GSWIP_PCE_TBL_KEY(i), &amp;tmp);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		tbl-&gt;key[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;val); i++) {</div><div class='add'>+		err = regmap_read(priv-&gt;gswip, GSWIP_PCE_TBL_VAL(i), &amp;tmp);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		tbl-&gt;val[i] = tmp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = regmap_read(priv-&gt;gswip, GSWIP_PCE_TBL_MASK, &amp;tmp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	tbl-&gt;mask = tmp;</div><div class='add'>+	err = regmap_read(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL, &amp;crtl);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	tbl-&gt;type = !!(crtl &amp; GSWIP_PCE_TBL_CTRL_TYPE);</div><div class='add'>+	tbl-&gt;valid = !!(crtl &amp; GSWIP_PCE_TBL_CTRL_VLD);</div><div class='add'>+	tbl-&gt;gmap = (crtl &amp; GSWIP_PCE_TBL_CTRL_GMAP_MASK) &gt;&gt; 7;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;pce_table_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_pce_table_entry_write(struct gswip_priv *priv,</div><div class='add'>+				       struct gswip_pce_table_entry *tbl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+	u32 crtl;</div><div class='add'>+	u16 addr_mode = tbl-&gt;key_mode ? GSWIP_PCE_TBL_CTRL_OPMOD_KSWR :</div><div class='add'>+					GSWIP_PCE_TBL_CTRL_OPMOD_ADWR;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;pce_table_lock);</div><div class='add'>+</div><div class='add'>+	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+	if (err) {</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;pce_table_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_ADDR, tbl-&gt;index);</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_OPMOD_MASK,</div><div class='add'>+			  tbl-&gt;table | addr_mode);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;key); i++)</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_KEY(i), tbl-&gt;key[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;val); i++)</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_VAL(i), tbl-&gt;val[i]);</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_OPMOD_MASK,</div><div class='add'>+			  tbl-&gt;table | addr_mode);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_MASK, tbl-&gt;mask);</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL, &amp;crtl);</div><div class='add'>+	crtl &amp;= ~(GSWIP_PCE_TBL_CTRL_TYPE | GSWIP_PCE_TBL_CTRL_VLD |</div><div class='add'>+		  GSWIP_PCE_TBL_CTRL_GMAP_MASK);</div><div class='add'>+	if (tbl-&gt;type)</div><div class='add'>+		crtl |= GSWIP_PCE_TBL_CTRL_TYPE;</div><div class='add'>+	if (tbl-&gt;valid)</div><div class='add'>+		crtl |= GSWIP_PCE_TBL_CTRL_VLD;</div><div class='add'>+	crtl |= (tbl-&gt;gmap &lt;&lt; 7) &amp; GSWIP_PCE_TBL_CTRL_GMAP_MASK;</div><div class='add'>+	crtl |= GSWIP_PCE_TBL_CTRL_BAS;</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL, crtl);</div><div class='add'>+</div><div class='add'>+	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;pce_table_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add the LAN port into a bridge with the CPU port by</div><div class='add'>+ * default. This prevents automatic forwarding of</div><div class='add'>+ * packages between the LAN ports when no explicit</div><div class='add'>+ * bridge is configured.</div><div class='add'>+ */</div><div class='add'>+static int gswip_add_single_port_br(struct gswip_priv *priv, int port, bool add)</div><div class='add'>+{</div><div class='add'>+	struct gswip_pce_table_entry vlan_active = {0,};</div><div class='add'>+	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	vlan_active.index = port + 1;</div><div class='add'>+	vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;</div><div class='add'>+	vlan_active.key[0] = GSWIP_VLAN_UNAWARE_PVID;</div><div class='add'>+	vlan_active.val[0] = port + 1 /* fid */;</div><div class='add'>+	vlan_active.valid = add;</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;vlan_active);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to write active VLAN: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!add)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlan_mapping.index = port + 1;</div><div class='add'>+	vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='add'>+	vlan_mapping.val[0] = GSWIP_VLAN_UNAWARE_PVID;</div><div class='add'>+	vlan_mapping.val[1] = BIT(port) | dsa_cpu_ports(priv-&gt;ds);</div><div class='add'>+	vlan_mapping.val[2] = 0;</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_set_learning(struct gswip_priv *priv, int port,</div><div class='add'>+				   bool enable)</div><div class='add'>+{</div><div class='add'>+	if (!GSWIP_VERSION_GE(priv, GSWIP_VERSION_2_2))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* learning disable bit */</div><div class='add'>+	return regmap_update_bits(priv-&gt;gswip, GSWIP_PCE_PCTRL_3p(port),</div><div class='add'>+				  GSWIP_PCE_PCTRL_3_LNDIS,</div><div class='add'>+				  enable ? 0 : GSWIP_PCE_PCTRL_3_LNDIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct switchdev_brport_flags flags,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	unsigned long supported = 0;</div><div class='add'>+</div><div class='add'>+	if (GSWIP_VERSION_GE(priv, GSWIP_VERSION_2_2))</div><div class='add'>+		supported |= BR_LEARNING;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; ~supported)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct switchdev_brport_flags flags,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING)</div><div class='add'>+		return gswip_port_set_learning(priv, port,</div><div class='add'>+					       !!(flags.val &amp; BR_LEARNING));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_setup(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port)) {</div><div class='add'>+		err = gswip_add_single_port_br(priv, port, true);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port)) {</div><div class='add'>+		u32 mdio_phy = 0;</div><div class='add'>+</div><div class='add'>+		if (phydev)</div><div class='add'>+			mdio_phy = phydev-&gt;mdio.addr &amp; GSWIP_MDIO_PHY_ADDR_MASK;</div><div class='add'>+</div><div class='add'>+		regmap_write_bits(priv-&gt;mdio, GSWIP_MDIO_PHYp(port),</div><div class='add'>+				  GSWIP_MDIO_PHY_ADDR_MASK,</div><div class='add'>+				  mdio_phy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RMON Counter Enable for port */</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_BM_PCFGp(port), GSWIP_BM_PCFG_CNTEN);</div><div class='add'>+</div><div class='add'>+	/* enable port fetch/store dma &amp; VLAN Modification */</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_FDMA_PCTRLp(port),</div><div class='add'>+			GSWIP_FDMA_PCTRL_EN | GSWIP_FDMA_PCTRL_VLANMOD_BOTH);</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_SDMA_PCTRLp(port),</div><div class='add'>+			GSWIP_SDMA_PCTRL_EN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	regmap_clear_bits(priv-&gt;gswip, GSWIP_FDMA_PCTRLp(port),</div><div class='add'>+			  GSWIP_FDMA_PCTRL_EN);</div><div class='add'>+	regmap_clear_bits(priv-&gt;gswip, GSWIP_SDMA_PCTRLp(port),</div><div class='add'>+			  GSWIP_SDMA_PCTRL_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_pce_load_microcode(struct gswip_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_OPMOD_MASK |</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_OPMOD_ADWR,</div><div class='add'>+			  GSWIP_PCE_TBL_CTRL_OPMOD_ADWR);</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_MASK, 0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;hw_info-&gt;pce_microcode_size; i++) {</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_ADDR, i);</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_VAL(0),</div><div class='add'>+			     (*priv-&gt;hw_info-&gt;pce_microcode)[i].val_0);</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_VAL(1),</div><div class='add'>+			     (*priv-&gt;hw_info-&gt;pce_microcode)[i].val_1);</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_VAL(2),</div><div class='add'>+			     (*priv-&gt;hw_info-&gt;pce_microcode)[i].val_2);</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_PCE_TBL_VAL(3),</div><div class='add'>+			     (*priv-&gt;hw_info-&gt;pce_microcode)[i].val_3);</div><div class='add'>+</div><div class='add'>+		/* start the table access: */</div><div class='add'>+		regmap_set_bits(priv-&gt;gswip, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+				GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+		err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='add'>+					     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* tell the switch that the microcode is loaded */</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_PCE_GCTRL_0,</div><div class='add'>+			GSWIP_PCE_GCTRL_0_MC_VALID);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_commit_pvid(struct gswip_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(priv-&gt;ds, port);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	u32 vinr;</div><div class='add'>+	int idx;</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (br) {</div><div class='add'>+		u16 pvid = GSWIP_VLAN_UNAWARE_PVID;</div><div class='add'>+</div><div class='add'>+		if (br_vlan_enabled(br))</div><div class='add'>+			br_vlan_get_pvid(br, &amp;pvid);</div><div class='add'>+</div><div class='add'>+		/* VLAN-aware bridge ports with no PVID will use Active VLAN</div><div class='add'>+		 * index 0. The expectation is that this drops all untagged and</div><div class='add'>+		 * VID-0 tagged ingress traffic.</div><div class='add'>+		 */</div><div class='add'>+		idx = 0;</div><div class='add'>+		for (int i = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+		     i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='add'>+			if (priv-&gt;vlans[i].bridge == br &amp;&amp;</div><div class='add'>+			    priv-&gt;vlans[i].vid == pvid) {</div><div class='add'>+				idx = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* The Active VLAN table index as configured by</div><div class='add'>+		 * gswip_add_single_port_br()</div><div class='add'>+		 */</div><div class='add'>+		idx = port + 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vinr = idx ? GSWIP_PCE_VCTRL_VINR_ALL : GSWIP_PCE_VCTRL_VINR_TAGGED;</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_VCTRL(port),</div><div class='add'>+			  GSWIP_PCE_VCTRL_VINR,</div><div class='add'>+			  FIELD_PREP(GSWIP_PCE_VCTRL_VINR, vinr));</div><div class='add'>+</div><div class='add'>+	/* Note that in GSWIP 2.2 VLAN mode the VID needs to be programmed</div><div class='add'>+	 * directly instead of referencing the index in the Active VLAN Tablet.</div><div class='add'>+	 * However, without the VLANMD bit (9) in PCE_GCTRL_1 (0x457) even</div><div class='add'>+	 * GSWIP 2.2 and newer hardware maintain the GSWIP 2.1 behavior.</div><div class='add'>+	 */</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_DEFPVID(port), idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+				     bool vlan_filtering,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		/* Use tag based VLAN */</div><div class='add'>+		regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_VCTRL(port),</div><div class='add'>+				  GSWIP_PCE_VCTRL_VSR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_UVR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VIMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VEMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VID0,</div><div class='add'>+				  GSWIP_PCE_VCTRL_UVR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VIMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VEMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VID0);</div><div class='add'>+		regmap_clear_bits(priv-&gt;gswip, GSWIP_PCE_PCTRL_0p(port),</div><div class='add'>+				  GSWIP_PCE_PCTRL_0_TVM);</div><div class='add'>+	} else {</div><div class='add'>+		/* Use port based VLAN */</div><div class='add'>+		regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_VCTRL(port),</div><div class='add'>+				  GSWIP_PCE_VCTRL_UVR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VIMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VEMR |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VID0 |</div><div class='add'>+				  GSWIP_PCE_VCTRL_VSR,</div><div class='add'>+				  GSWIP_PCE_VCTRL_VSR);</div><div class='add'>+		regmap_set_bits(priv-&gt;gswip, GSWIP_PCE_PCTRL_0p(port),</div><div class='add'>+				GSWIP_PCE_PCTRL_0_TVM);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gswip_port_commit_pvid(priv, port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_mii_delay_setup(struct gswip_priv *priv, struct dsa_port *dp,</div><div class='add'>+				  phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	u32 tx_delay = GSWIP_MII_PCDU_TXDLY_DEFAULT;</div><div class='add'>+	u32 rx_delay = GSWIP_MII_PCDU_RXDLY_DEFAULT;</div><div class='add'>+	struct device_node *port_dn = dp-&gt;dn;</div><div class='add'>+	u16 mii_pcdu_reg;</div><div class='add'>+</div><div class='add'>+	/* As MII_PCDU registers only exist for MII ports, silently return</div><div class='add'>+	 * unless the port is an MII port</div><div class='add'>+	 */</div><div class='add'>+	if (!(priv-&gt;hw_info-&gt;mii_ports &amp; BIT(dp-&gt;index)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (dp-&gt;index + priv-&gt;hw_info-&gt;mii_port_reg_offset) {</div><div class='add'>+	case 0:</div><div class='add'>+		mii_pcdu_reg = GSWIP_MII_PCDU0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		mii_pcdu_reg = GSWIP_MII_PCDU1;</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		mii_pcdu_reg = GSWIP_MII_PCDU5;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* legacy code to set default delays according to the interface mode */</div><div class='add'>+	switch (interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+		tx_delay = 0;</div><div class='add'>+		rx_delay = 0;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+		rx_delay = 0;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		tx_delay = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* allow settings delays using device tree properties */</div><div class='add'>+	of_property_read_u32(port_dn, "rx-internal-delay-ps", &amp;rx_delay);</div><div class='add'>+	of_property_read_u32(port_dn, "tx-internal-delay-ps", &amp;tx_delay);</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;mii, mii_pcdu_reg,</div><div class='add'>+			  GSWIP_MII_PCDU_TXDLY_MASK |</div><div class='add'>+			  GSWIP_MII_PCDU_RXDLY_MASK,</div><div class='add'>+			  GSWIP_MII_PCDU_TXDLY(tx_delay) |</div><div class='add'>+			  GSWIP_MII_PCDU_RXDLY(rx_delay));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	unsigned int cpu_ports = dsa_cpu_ports(ds);</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_SWRES, GSWIP_SWRES_R0);</div><div class='add'>+	usleep_range(5000, 10000);</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_SWRES, 0);</div><div class='add'>+</div><div class='add'>+	/* disable port fetch/store dma on all ports */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;hw_info-&gt;max_ports; i++) {</div><div class='add'>+		gswip_port_disable(ds, i);</div><div class='add'>+		gswip_port_vlan_filtering(ds, i, false, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable Switch */</div><div class='add'>+	regmap_set_bits(priv-&gt;mdio, GSWIP_MDIO_GLOB, GSWIP_MDIO_GLOB_ENABLE);</div><div class='add'>+</div><div class='add'>+	err = gswip_pce_load_microcode(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "writing PCE microcode failed, %i\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Default unknown Broadcast/Multicast/Unicast port maps */</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_PMAP1, cpu_ports);</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_PMAP2, cpu_ports);</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_PCE_PMAP3, cpu_ports);</div><div class='add'>+</div><div class='add'>+	/* Deactivate MDIO PHY auto polling. Some PHYs as the AR8030 have an</div><div class='add'>+	 * interoperability problem with this auto polling mechanism because</div><div class='add'>+	 * their status registers think that the link is in a different state</div><div class='add'>+	 * than it actually is. For the AR8030 it has the BMSR_ESTATEN bit set</div><div class='add'>+	 * as well as ESTATUS_1000_TFULL and ESTATUS_1000_XFULL. This makes the</div><div class='add'>+	 * auto polling state machine consider the link being negotiated with</div><div class='add'>+	 * 1Gbit/s. Since the PHY itself is a Fast Ethernet RMII PHY this leads</div><div class='add'>+	 * to the switch port being completely dead (RX and TX are both not</div><div class='add'>+	 * working).</div><div class='add'>+	 * Also with various other PHY / port combinations (PHY11G GPHY, PHY22F</div><div class='add'>+	 * GPHY, external RGMII PEF7071/7072) any traffic would stop. Sometimes</div><div class='add'>+	 * it would work fine for a few minutes to hours and then stop, on</div><div class='add'>+	 * other device it would no traffic could be sent or received at all.</div><div class='add'>+	 * Testing shows that when PHY auto polling is disabled these problems</div><div class='add'>+	 * go away.</div><div class='add'>+	 */</div><div class='add'>+	regmap_write(priv-&gt;mdio, GSWIP_MDIO_MDC_CFG0, 0x0);</div><div class='add'>+</div><div class='add'>+	/* Configure the MDIO Clock 2.5 MHz */</div><div class='add'>+	regmap_write_bits(priv-&gt;mdio, GSWIP_MDIO_MDC_CFG1, 0xff, 0x09);</div><div class='add'>+</div><div class='add'>+	/* bring up the mdio bus */</div><div class='add'>+	err = gswip_mdio(priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "mdio bus setup failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable the xMII interface and clear it's isolation bit */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;hw_info-&gt;max_ports; i++)</div><div class='add'>+		gswip_mii_mask_cfg(priv,</div><div class='add'>+				   GSWIP_MII_CFG_EN | GSWIP_MII_CFG_ISOLATE,</div><div class='add'>+				   0, i);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		/* enable special tag insertion on cpu port */</div><div class='add'>+		regmap_set_bits(priv-&gt;gswip, GSWIP_FDMA_PCTRLp(cpu_dp-&gt;index),</div><div class='add'>+				GSWIP_FDMA_PCTRL_STEN);</div><div class='add'>+</div><div class='add'>+		/* accept special tag in ingress direction */</div><div class='add'>+		regmap_set_bits(priv-&gt;gswip,</div><div class='add'>+				GSWIP_PCE_PCTRL_0p(cpu_dp-&gt;index),</div><div class='add'>+				GSWIP_PCE_PCTRL_0_INGRESS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_BM_QUEUE_GCTRL,</div><div class='add'>+			GSWIP_BM_QUEUE_GCTRL_GL_MOD);</div><div class='add'>+</div><div class='add'>+	/* VLAN aware Switching */</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_PCE_GCTRL_0,</div><div class='add'>+			GSWIP_PCE_GCTRL_0_VLAN);</div><div class='add'>+</div><div class='add'>+	/* Flush MAC Table */</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_PCE_GCTRL_0,</div><div class='add'>+			GSWIP_PCE_GCTRL_0_MTFL);</div><div class='add'>+</div><div class='add'>+	err = gswip_switch_r_timeout(priv, GSWIP_PCE_GCTRL_0,</div><div class='add'>+				     GSWIP_PCE_GCTRL_0_MTFL);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "MAC flushing didn't finish\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol gswip_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						    int port,</div><div class='add'>+						    enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;hw_info-&gt;tag_protocol;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_vlan_active_create(struct gswip_priv *priv,</div><div class='add'>+				    struct net_device *bridge,</div><div class='add'>+				    int fid, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct gswip_pce_table_entry vlan_active = {0,};</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	int idx = -1;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Look for a free slot */</div><div class='add'>+	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='add'>+		if (!priv-&gt;vlans[i].bridge) {</div><div class='add'>+			idx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (idx == -1)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (fid == -1)</div><div class='add'>+		fid = idx;</div><div class='add'>+</div><div class='add'>+	vlan_active.index = idx;</div><div class='add'>+	vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;</div><div class='add'>+	vlan_active.key[0] = vid;</div><div class='add'>+	vlan_active.val[0] = fid;</div><div class='add'>+	vlan_active.valid = true;</div><div class='add'>+</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;vlan_active);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to write active VLAN: %d\n",	err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;vlans[idx].bridge = bridge;</div><div class='add'>+	priv-&gt;vlans[idx].vid = vid;</div><div class='add'>+	priv-&gt;vlans[idx].fid = fid;</div><div class='add'>+</div><div class='add'>+	return idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_vlan_active_remove(struct gswip_priv *priv, int idx)</div><div class='add'>+{</div><div class='add'>+	struct gswip_pce_table_entry vlan_active = {0,};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	vlan_active.index = idx;</div><div class='add'>+	vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;</div><div class='add'>+	vlan_active.valid = false;</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;vlan_active);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to delete active VLAN: %d\n", err);</div><div class='add'>+	priv-&gt;vlans[idx].bridge = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_vlan_add(struct gswip_priv *priv, struct net_device *bridge,</div><div class='add'>+			  int port, u16 vid, bool untagged, bool pvid,</div><div class='add'>+			  bool vlan_aware)</div><div class='add'>+{</div><div class='add'>+	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	unsigned int cpu_ports = dsa_cpu_ports(priv-&gt;ds);</div><div class='add'>+	bool active_vlan_created = false;</div><div class='add'>+	int fid = -1, idx = -1;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/* Check if there is already a page for this bridge */</div><div class='add'>+	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='add'>+		if (priv-&gt;vlans[i].bridge == bridge) {</div><div class='add'>+			if (vlan_aware) {</div><div class='add'>+				if (fid != -1 &amp;&amp; fid != priv-&gt;vlans[i].fid)</div><div class='add'>+					dev_err(priv-&gt;dev, "one bridge with multiple flow ids\n");</div><div class='add'>+				fid = priv-&gt;vlans[i].fid;</div><div class='add'>+			}</div><div class='add'>+			if (priv-&gt;vlans[i].vid == vid) {</div><div class='add'>+				idx = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If this bridge is not programmed yet, add a Active VLAN table</div><div class='add'>+	 * entry in a free slot and prepare the VLAN mapping table entry.</div><div class='add'>+	 */</div><div class='add'>+	if (idx == -1) {</div><div class='add'>+		idx = gswip_vlan_active_create(priv, bridge, fid, vid);</div><div class='add'>+		if (idx &lt; 0)</div><div class='add'>+			return idx;</div><div class='add'>+		active_vlan_created = true;</div><div class='add'>+</div><div class='add'>+		vlan_mapping.index = idx;</div><div class='add'>+		vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='add'>+	} else {</div><div class='add'>+		/* Read the existing VLAN mapping entry from the switch */</div><div class='add'>+		vlan_mapping.index = idx;</div><div class='add'>+		vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='add'>+		err = gswip_pce_table_entry_read(priv, &amp;vlan_mapping);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to read VLAN mapping: %d\n",</div><div class='add'>+				err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* VLAN ID byte, maps to the VLAN ID of vlan active table */</div><div class='add'>+	vlan_mapping.val[0] = vid;</div><div class='add'>+	/* Update the VLAN mapping entry and write it to the switch */</div><div class='add'>+	vlan_mapping.val[1] |= cpu_ports;</div><div class='add'>+	vlan_mapping.val[1] |= BIT(port);</div><div class='add'>+	if (vlan_aware)</div><div class='add'>+		vlan_mapping.val[2] |= cpu_ports;</div><div class='add'>+	if (untagged)</div><div class='add'>+		vlan_mapping.val[2] &amp;= ~BIT(port);</div><div class='add'>+	else</div><div class='add'>+		vlan_mapping.val[2] |= BIT(port);</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='add'>+		/* In case an Active VLAN was creaetd delete it again */</div><div class='add'>+		if (active_vlan_created)</div><div class='add'>+			gswip_vlan_active_remove(priv, idx);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gswip_port_commit_pvid(priv, port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_vlan_remove(struct gswip_priv *priv,</div><div class='add'>+			     struct net_device *bridge, int port,</div><div class='add'>+			     u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	int idx = -1;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Check if there is already a page for this bridge */</div><div class='add'>+	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='add'>+		if (priv-&gt;vlans[i].bridge == bridge &amp;&amp;</div><div class='add'>+		    priv-&gt;vlans[i].vid == vid) {</div><div class='add'>+			idx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (idx == -1) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Port %d cannot find VID %u of bridge %s\n",</div><div class='add'>+			port, vid, bridge ? bridge-&gt;name : "(null)");</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlan_mapping.index = idx;</div><div class='add'>+	vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='add'>+	err = gswip_pce_table_entry_read(priv, &amp;vlan_mapping);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to read VLAN mapping: %d\n",	err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlan_mapping.val[1] &amp;= ~BIT(port);</div><div class='add'>+	vlan_mapping.val[2] &amp;= ~BIT(port);</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case all ports are removed from the bridge, remove the VLAN */</div><div class='add'>+	if (!(vlan_mapping.val[1] &amp; ~dsa_cpu_ports(priv-&gt;ds))) {</div><div class='add'>+		err = gswip_vlan_active_remove(priv, idx);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to write active VLAN: %d\n",</div><div class='add'>+				err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gswip_port_commit_pvid(priv, port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct dsa_bridge bridge,</div><div class='add'>+				  bool *tx_fwd_offload,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br = bridge.dev;</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Set up the VLAN for VLAN-unaware bridging for this port, and remove</div><div class='add'>+	 * it from the "single-port bridge" through which it was operating as</div><div class='add'>+	 * standalone.</div><div class='add'>+	 */</div><div class='add'>+	err = gswip_vlan_add(priv, br, port, GSWIP_VLAN_UNAWARE_PVID,</div><div class='add'>+			     true, true, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return gswip_add_single_port_br(priv, port, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct net_device *br = bridge.dev;</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Add the port back to the "single-port bridge", and remove it from</div><div class='add'>+	 * the VLAN-unaware PVID created for this bridge.</div><div class='add'>+	 */</div><div class='add'>+	gswip_add_single_port_br(priv, port, true);</div><div class='add'>+	gswip_vlan_remove(priv, br, port, GSWIP_VLAN_UNAWARE_PVID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='add'>+				   const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	int pos = max_ports;</div><div class='add'>+	int i, idx = -1;</div><div class='add'>+</div><div class='add'>+	/* We only support VLAN filtering on bridges */</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port) &amp;&amp; !bridge)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Check if there is already a page for this VLAN */</div><div class='add'>+	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='add'>+		if (priv-&gt;vlans[i].bridge == bridge &amp;&amp;</div><div class='add'>+		    priv-&gt;vlans[i].vid == vlan-&gt;vid) {</div><div class='add'>+			idx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If this VLAN is not programmed yet, we have to reserve</div><div class='add'>+	 * one entry in the VLAN table. Make sure we start at the</div><div class='add'>+	 * next position round.</div><div class='add'>+	 */</div><div class='add'>+	if (idx == -1) {</div><div class='add'>+		/* Look for a free slot */</div><div class='add'>+		for (; pos &lt; ARRAY_SIZE(priv-&gt;vlans); pos++) {</div><div class='add'>+			if (!priv-&gt;vlans[pos].bridge) {</div><div class='add'>+				idx = pos;</div><div class='add'>+				pos++;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (idx == -1) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "No slot in VLAN table");</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			       const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (vlan-&gt;vid == GSWIP_VLAN_UNAWARE_PVID)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = gswip_port_vlan_prepare(ds, port, vlan, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* We have to receive all packets on the CPU port and should not</div><div class='add'>+	 * do any VLAN filtering here. This is also called with bridge</div><div class='add'>+	 * NULL and then we do not know for which bridge to configure</div><div class='add'>+	 * this.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return gswip_vlan_add(priv, bridge, port, vlan-&gt;vid, untagged, pvid,</div><div class='add'>+			      true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			       const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (vlan-&gt;vid == GSWIP_VLAN_UNAWARE_PVID)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* We have to receive all packets on the CPU port and should not</div><div class='add'>+	 * do any VLAN filtering here. This is also called with bridge</div><div class='add'>+	 * NULL and then we do not know for which bridge to configure</div><div class='add'>+	 * this.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return gswip_vlan_remove(priv, bridge, port, vlan-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2048; i++) {</div><div class='add'>+		mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;</div><div class='add'>+		mac_bridge.index = i;</div><div class='add'>+</div><div class='add'>+		err = gswip_pce_table_entry_read(priv, &amp;mac_bridge);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to read mac bridge: %d\n",</div><div class='add'>+				err);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!mac_bridge.valid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mac_bridge.val[1] &amp; GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (port != FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT,</div><div class='add'>+				      mac_bridge.val[0]))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mac_bridge.valid = false;</div><div class='add'>+		err = gswip_pce_table_entry_write(priv, &amp;mac_bridge);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to write mac bridge: %d\n",</div><div class='add'>+				err);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 stp_state;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		regmap_clear_bits(priv-&gt;gswip, GSWIP_SDMA_PCTRLp(port),</div><div class='add'>+				  GSWIP_SDMA_PCTRL_EN);</div><div class='add'>+		return;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		stp_state = GSWIP_PCE_PCTRL_0_PSTATE_LISTEN;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		stp_state = GSWIP_PCE_PCTRL_0_PSTATE_LEARNING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		stp_state = GSWIP_PCE_PCTRL_0_PSTATE_FORWARDING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(priv-&gt;dev, "invalid STP state: %d\n", state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_set_bits(priv-&gt;gswip, GSWIP_SDMA_PCTRLp(port),</div><div class='add'>+			GSWIP_SDMA_PCTRL_EN);</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_PCE_PCTRL_0p(port),</div><div class='add'>+			  GSWIP_PCE_PCTRL_0_PSTATE_MASK,</div><div class='add'>+			  stp_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_fdb(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct net_device *bridge, const unsigned char *addr,</div><div class='add'>+			  u16 vid, bool add)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='add'>+	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	int fid = -1;</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='add'>+		if (priv-&gt;vlans[i].bridge == bridge) {</div><div class='add'>+			fid = priv-&gt;vlans[i].fid;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fid == -1) {</div><div class='add'>+		dev_err(priv-&gt;dev, "no FID found for bridge %s\n",</div><div class='add'>+			bridge-&gt;name);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;</div><div class='add'>+	mac_bridge.key_mode = true;</div><div class='add'>+	mac_bridge.key[0] = addr[5] | (addr[4] &lt;&lt; 8);</div><div class='add'>+	mac_bridge.key[1] = addr[3] | (addr[2] &lt;&lt; 8);</div><div class='add'>+	mac_bridge.key[2] = addr[1] | (addr[0] &lt;&lt; 8);</div><div class='add'>+	mac_bridge.key[3] = FIELD_PREP(GSWIP_TABLE_MAC_BRIDGE_KEY3_FID, fid);</div><div class='add'>+	mac_bridge.val[0] = add ? BIT(port) : 0; /* port map */</div><div class='add'>+	if (GSWIP_VERSION_GE(priv, GSWIP_VERSION_2_2_ETC))</div><div class='add'>+		mac_bridge.val[1] = add ? (GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC |</div><div class='add'>+					   GSWIP_TABLE_MAC_BRIDGE_VAL1_VALID) : 0;</div><div class='add'>+	else</div><div class='add'>+		mac_bridge.val[1] = GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC;</div><div class='add'>+</div><div class='add'>+	mac_bridge.valid = add;</div><div class='add'>+</div><div class='add'>+	err = gswip_pce_table_entry_write(priv, &amp;mac_bridge);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to write mac bridge: %d\n", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			      const unsigned char *addr, u16 vid,</div><div class='add'>+			      struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	if (db.type != DSA_DB_BRIDGE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return gswip_port_fdb(ds, port, db.bridge.dev, addr, vid, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			      const unsigned char *addr, u16 vid,</div><div class='add'>+			      struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	if (db.type != DSA_DB_BRIDGE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return gswip_port_fdb(ds, port, db.bridge.dev, addr, vid, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			       dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+	int i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2048; i++) {</div><div class='add'>+		mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;</div><div class='add'>+		mac_bridge.index = i;</div><div class='add'>+</div><div class='add'>+		err = gswip_pce_table_entry_read(priv, &amp;mac_bridge);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev,</div><div class='add'>+				"failed to read mac bridge entry %d: %d\n",</div><div class='add'>+				i, err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!mac_bridge.valid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		addr[5] = mac_bridge.key[0] &amp; 0xff;</div><div class='add'>+		addr[4] = (mac_bridge.key[0] &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		addr[3] = mac_bridge.key[1] &amp; 0xff;</div><div class='add'>+		addr[2] = (mac_bridge.key[1] &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		addr[1] = mac_bridge.key[2] &amp; 0xff;</div><div class='add'>+		addr[0] = (mac_bridge.key[2] &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		if (mac_bridge.val[1] &amp; GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC) {</div><div class='add'>+			if (mac_bridge.val[0] &amp; BIT(port)) {</div><div class='add'>+				err = cb(addr, 0, true, data);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			if (port == FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT,</div><div class='add'>+					      mac_bridge.val[0])) {</div><div class='add'>+				err = cb(addr, 0, false, data);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	/* Includes 8 bytes for special header. */</div><div class='add'>+	return GSWIP_MAX_PACKET_LENGTH - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* CPU port always has maximum mtu of user ports, so use it to set</div><div class='add'>+	 * switch frame size, including 8 byte special header.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_cpu_port(ds, port)) {</div><div class='add'>+		new_mtu += 8;</div><div class='add'>+		regmap_write(priv-&gt;gswip, GSWIP_MAC_FLEN,</div><div class='add'>+			     VLAN_ETH_HLEN + new_mtu + ETH_FCS_LEN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable MLEN for ports with non-standard MTUs, including the special</div><div class='add'>+	 * header on the CPU port added above.</div><div class='add'>+	 */</div><div class='add'>+	if (new_mtu != ETH_DATA_LEN)</div><div class='add'>+		regmap_set_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_2p(port),</div><div class='add'>+				GSWIP_MAC_CTRL_2_MLEN);</div><div class='add'>+	else</div><div class='add'>+		regmap_clear_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_2p(port),</div><div class='add'>+				  GSWIP_MAC_CTRL_2_MLEN);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	priv-&gt;hw_info-&gt;phylink_get_caps(ds, port, config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_set_link(struct gswip_priv *priv, int port, bool link)</div><div class='add'>+{</div><div class='add'>+	u32 mdio_phy;</div><div class='add'>+</div><div class='add'>+	if (link)</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_LINK_UP;</div><div class='add'>+	else</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_LINK_DOWN;</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;mdio, GSWIP_MDIO_PHYp(port),</div><div class='add'>+			  GSWIP_MDIO_PHY_LINK_MASK, mdio_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed,</div><div class='add'>+				 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	u32 mdio_phy = 0, mii_cfg = 0, mac_ctrl_0 = 0;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_SPEED_M10;</div><div class='add'>+</div><div class='add'>+		if (interface == PHY_INTERFACE_MODE_RMII)</div><div class='add'>+			mii_cfg = GSWIP_MII_CFG_RATE_M50;</div><div class='add'>+		else</div><div class='add'>+			mii_cfg = GSWIP_MII_CFG_RATE_M2P5;</div><div class='add'>+</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_MII;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_SPEED_M100;</div><div class='add'>+</div><div class='add'>+		if (interface == PHY_INTERFACE_MODE_RMII)</div><div class='add'>+			mii_cfg = GSWIP_MII_CFG_RATE_M50;</div><div class='add'>+		else</div><div class='add'>+			mii_cfg = GSWIP_MII_CFG_RATE_M25;</div><div class='add'>+</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_MII;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_SPEED_G1;</div><div class='add'>+</div><div class='add'>+		mii_cfg = GSWIP_MII_CFG_RATE_M125;</div><div class='add'>+</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_RGMII;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;mdio, GSWIP_MDIO_PHYp(port),</div><div class='add'>+			  GSWIP_MDIO_PHY_SPEED_MASK, mdio_phy);</div><div class='add'>+	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_RATE_MASK, mii_cfg, port);</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_0p(port),</div><div class='add'>+			  GSWIP_MAC_CTRL_0_GMII_MASK, mac_ctrl_0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_set_duplex(struct gswip_priv *priv, int port, int duplex)</div><div class='add'>+{</div><div class='add'>+	u32 mac_ctrl_0, mdio_phy;</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL) {</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FDUP_EN;</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_FDUP_EN;</div><div class='add'>+	} else {</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FDUP_DIS;</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_FDUP_DIS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_0p(port),</div><div class='add'>+			  GSWIP_MAC_CTRL_0_FDUP_MASK, mac_ctrl_0);</div><div class='add'>+	regmap_write_bits(priv-&gt;mdio, GSWIP_MDIO_PHYp(port),</div><div class='add'>+			  GSWIP_MDIO_PHY_FDUP_MASK, mdio_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_port_set_pause(struct gswip_priv *priv, int port,</div><div class='add'>+				 bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	u32 mac_ctrl_0, mdio_phy;</div><div class='add'>+</div><div class='add'>+	if (tx_pause &amp;&amp; rx_pause) {</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_RXTX;</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_EN |</div><div class='add'>+			   GSWIP_MDIO_PHY_FCONRX_EN;</div><div class='add'>+	} else if (tx_pause) {</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_TX;</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_EN |</div><div class='add'>+			   GSWIP_MDIO_PHY_FCONRX_DIS;</div><div class='add'>+	} else if (rx_pause) {</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_RX;</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_DIS |</div><div class='add'>+			   GSWIP_MDIO_PHY_FCONRX_EN;</div><div class='add'>+	} else {</div><div class='add'>+		mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_NONE;</div><div class='add'>+		mdio_phy = GSWIP_MDIO_PHY_FCONTX_DIS |</div><div class='add'>+			   GSWIP_MDIO_PHY_FCONRX_DIS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_0p(port),</div><div class='add'>+			  GSWIP_MAC_CTRL_0_FCON_MASK, mac_ctrl_0);</div><div class='add'>+	regmap_write_bits(priv-&gt;mdio, GSWIP_MDIO_PHYp(port),</div><div class='add'>+			  GSWIP_MDIO_PHY_FCONTX_MASK | GSWIP_MDIO_PHY_FCONRX_MASK,</div><div class='add'>+			  mdio_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				     unsigned int mode,</div><div class='add'>+				     const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 miicfg = 0;</div><div class='add'>+</div><div class='add'>+	miicfg |= GSWIP_MII_CFG_LDCLKDIS;</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+	case PHY_INTERFACE_MODE_2500BASEX:</div><div class='add'>+		return;</div><div class='add'>+	case PHY_INTERFACE_MODE_MII:</div><div class='add'>+	case PHY_INTERFACE_MODE_INTERNAL:</div><div class='add'>+		miicfg |= GSWIP_MII_CFG_MODE_MIIM;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_REVMII:</div><div class='add'>+		miicfg |= GSWIP_MII_CFG_MODE_MIIP;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+		miicfg |= GSWIP_MII_CFG_MODE_RMIIM;</div><div class='add'>+		if (of_property_read_bool(dp-&gt;dn, "maxlinear,rmii-refclk-out"))</div><div class='add'>+			miicfg |= GSWIP_MII_CFG_RMII_CLK;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		miicfg |= GSWIP_MII_CFG_MODE_RGMII;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_GMII:</div><div class='add'>+		miicfg |= GSWIP_MII_CFG_MODE_GMII;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev,</div><div class='add'>+			"Unsupported interface: %d\n", state-&gt;interface);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gswip_mii_mask_cfg(priv,</div><div class='add'>+			   GSWIP_MII_CFG_MODE_MASK | GSWIP_MII_CFG_RMII_CLK |</div><div class='add'>+			   GSWIP_MII_CFG_RGMII_IBS | GSWIP_MII_CFG_LDCLKDIS,</div><div class='add'>+			   miicfg, port);</div><div class='add'>+</div><div class='add'>+	gswip_mii_delay_setup(priv, dp, state-&gt;interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, port);</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_cpu(dp))</div><div class='add'>+		gswip_port_set_link(priv, port, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+				      struct phy_device *phydev,</div><div class='add'>+				      unsigned int mode,</div><div class='add'>+				      phy_interface_t interface,</div><div class='add'>+				      int speed, int duplex,</div><div class='add'>+				      bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_cpu(dp) || interface != PHY_INTERFACE_MODE_INTERNAL) {</div><div class='add'>+		gswip_port_set_link(priv, port, true);</div><div class='add'>+		gswip_port_set_speed(priv, port, speed, interface);</div><div class='add'>+		gswip_port_set_duplex(priv, port, duplex);</div><div class='add'>+		gswip_port_set_pause(priv, port, tx_pause, rx_pause);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, GSWIP_MII_CFG_EN, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+			      uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gswip_rmon_cnt); i++)</div><div class='add'>+		ethtool_puts(&amp;data, gswip_rmon_cnt[i].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,</div><div class='add'>+				    u32 index)</div><div class='add'>+{</div><div class='add'>+	u32 result, val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;gswip, GSWIP_BM_RAM_ADDR, index);</div><div class='add'>+	regmap_write_bits(priv-&gt;gswip, GSWIP_BM_RAM_CTRL,</div><div class='add'>+			  GSWIP_BM_RAM_CTRL_ADDR_MASK | GSWIP_BM_RAM_CTRL_OPMOD |</div><div class='add'>+			  GSWIP_BM_RAM_CTRL_BAS,</div><div class='add'>+			  table | GSWIP_BM_RAM_CTRL_BAS);</div><div class='add'>+</div><div class='add'>+	err = gswip_switch_r_timeout(priv, GSWIP_BM_RAM_CTRL,</div><div class='add'>+				     GSWIP_BM_RAM_CTRL_BAS);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(priv-&gt;dev, "timeout while reading table: %u, index: %u\n",</div><div class='add'>+			table, index);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;gswip, GSWIP_BM_RAM_VAL(0), &amp;result);</div><div class='add'>+	regmap_read(priv-&gt;gswip, GSWIP_BM_RAM_VAL(1), &amp;val);</div><div class='add'>+	result |= val &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	const struct gswip_rmon_cnt_desc *rmon_cnt;</div><div class='add'>+	int i;</div><div class='add'>+	u64 high;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(gswip_rmon_cnt); i++) {</div><div class='add'>+		rmon_cnt = &amp;gswip_rmon_cnt[i];</div><div class='add'>+</div><div class='add'>+		data[i] = gswip_bcm_ram_entry_read(priv, port,</div><div class='add'>+						   rmon_cnt-&gt;offset);</div><div class='add'>+		if (rmon_cnt-&gt;size == 2) {</div><div class='add'>+			high = gswip_bcm_ram_entry_read(priv, port,</div><div class='add'>+							rmon_cnt-&gt;offset + 1);</div><div class='add'>+			data[i] |= high &lt;&lt; 32;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ARRAY_SIZE(gswip_rmon_cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_set_mac_eee(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	if (e-&gt;tx_lpi_timer &gt; 0x7f)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gswip_phylink_mac_disable_tx_lpi(struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	regmap_clear_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_4p(dp-&gt;index),</div><div class='add'>+			  GSWIP_MAC_CTRL_4_LPIEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gswip_phylink_mac_enable_tx_lpi(struct phylink_config *config,</div><div class='add'>+					   u32 timer, bool tx_clock_stop)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;gswip, GSWIP_MAC_CTRL_4p(dp-&gt;index),</div><div class='add'>+				  GSWIP_MAC_CTRL_4_LPIEN |</div><div class='add'>+				  GSWIP_MAC_CTRL_4_GWAIT_MASK |</div><div class='add'>+				  GSWIP_MAC_CTRL_4_WAIT_MASK,</div><div class='add'>+				  GSWIP_MAC_CTRL_4_LPIEN |</div><div class='add'>+				  GSWIP_MAC_CTRL_4_GWAIT(timer) |</div><div class='add'>+				  GSWIP_MAC_CTRL_4_WAIT(timer));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool gswip_support_eee(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (GSWIP_VERSION_GE(priv, GSWIP_VERSION_2_2))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *gswip_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+							phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;hw_info-&gt;mac_select_pcs)</div><div class='add'>+		return priv-&gt;hw_info-&gt;mac_select_pcs(config, interface);</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops gswip_phylink_mac_ops = {</div><div class='add'>+	.mac_config		= gswip_phylink_mac_config,</div><div class='add'>+	.mac_link_down		= gswip_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up		= gswip_phylink_mac_link_up,</div><div class='add'>+	.mac_disable_tx_lpi	= gswip_phylink_mac_disable_tx_lpi,</div><div class='add'>+	.mac_enable_tx_lpi	= gswip_phylink_mac_enable_tx_lpi,</div><div class='add'>+	.mac_select_pcs		= gswip_phylink_mac_select_pcs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops gswip_switch_ops = {</div><div class='add'>+	.get_tag_protocol	= gswip_get_tag_protocol,</div><div class='add'>+	.setup			= gswip_setup,</div><div class='add'>+	.port_setup		= gswip_port_setup,</div><div class='add'>+	.port_enable		= gswip_port_enable,</div><div class='add'>+	.port_disable		= gswip_port_disable,</div><div class='add'>+	.port_pre_bridge_flags	= gswip_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= gswip_port_bridge_flags,</div><div class='add'>+	.port_bridge_join	= gswip_port_bridge_join,</div><div class='add'>+	.port_bridge_leave	= gswip_port_bridge_leave,</div><div class='add'>+	.port_fast_age		= gswip_port_fast_age,</div><div class='add'>+	.port_vlan_filtering	= gswip_port_vlan_filtering,</div><div class='add'>+	.port_vlan_add		= gswip_port_vlan_add,</div><div class='add'>+	.port_vlan_del		= gswip_port_vlan_del,</div><div class='add'>+	.port_stp_state_set	= gswip_port_stp_state_set,</div><div class='add'>+	.port_fdb_add		= gswip_port_fdb_add,</div><div class='add'>+	.port_fdb_del		= gswip_port_fdb_del,</div><div class='add'>+	.port_fdb_dump		= gswip_port_fdb_dump,</div><div class='add'>+	.port_change_mtu	= gswip_port_change_mtu,</div><div class='add'>+	.port_max_mtu		= gswip_port_max_mtu,</div><div class='add'>+	.phylink_get_caps	= gswip_phylink_get_caps,</div><div class='add'>+	.get_strings		= gswip_get_strings,</div><div class='add'>+	.get_ethtool_stats	= gswip_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= gswip_get_sset_count,</div><div class='add'>+	.set_mac_eee		= gswip_set_mac_eee,</div><div class='add'>+	.support_eee		= gswip_support_eee,</div><div class='add'>+	.port_hsr_join		= dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave		= dsa_port_simple_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void gswip_disable_switch(struct gswip_priv *priv)</div><div class='add'>+{</div><div class='add'>+	regmap_clear_bits(priv-&gt;mdio, GSWIP_MDIO_GLOB, GSWIP_MDIO_GLOB_ENABLE);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gswip_disable_switch);</div><div class='add'>+</div><div class='add'>+static int gswip_validate_cpu_port(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int cpu_port = -1;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		if (cpu_port != -1)</div><div class='add'>+			return dev_err_probe(ds-&gt;dev, -EINVAL,</div><div class='add'>+					     "only a single CPU port is supported\n");</div><div class='add'>+</div><div class='add'>+		cpu_port = cpu_dp-&gt;index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpu_port == -1)</div><div class='add'>+		return dev_err_probe(ds-&gt;dev, -EINVAL, "no CPU port defined\n");</div><div class='add'>+</div><div class='add'>+	if (BIT(cpu_port) &amp; ~priv-&gt;hw_info-&gt;allowed_cpu_ports)</div><div class='add'>+		return dev_err_probe(ds-&gt;dev, -EINVAL,</div><div class='add'>+				     "unsupported CPU port defined\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int gswip_probe_common(struct gswip_priv *priv, u32 version)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;pce_table_lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;ds = devm_kzalloc(priv-&gt;dev, sizeof(*priv-&gt;ds), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ds-&gt;dev = priv-&gt;dev;</div><div class='add'>+	priv-&gt;ds-&gt;num_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='add'>+	priv-&gt;ds-&gt;ops = &amp;gswip_switch_ops;</div><div class='add'>+	priv-&gt;ds-&gt;phylink_mac_ops = &amp;gswip_phylink_mac_ops;</div><div class='add'>+	priv-&gt;ds-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	/* The hardware has the 'major/minor' version bytes in the wrong order</div><div class='add'>+	 * preventing numerical comparisons. Construct a 16-bit unsigned integer</div><div class='add'>+	 * having the REV field as most significant byte and the MOD field as</div><div class='add'>+	 * least significant byte. This is effectively swapping the two bytes of</div><div class='add'>+	 * the version variable, but other than using swab16 it doesn't affect</div><div class='add'>+	 * the source variable.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;version = GSWIP_VERSION_REV(version) &lt;&lt; 8 |</div><div class='add'>+			GSWIP_VERSION_MOD(version);</div><div class='add'>+</div><div class='add'>+	err = dsa_register_switch(priv-&gt;ds);</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(priv-&gt;dev, err, "dsa switch registration failed\n");</div><div class='add'>+</div><div class='add'>+	err = gswip_validate_cpu_port(priv-&gt;ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto disable_switch;</div><div class='add'>+</div><div class='add'>+	dev_info(priv-&gt;dev, "probed GSWIP version %lx mod %lx\n",</div><div class='add'>+		 GSWIP_VERSION_REV(version), GSWIP_VERSION_MOD(version));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+disable_switch:</div><div class='add'>+	gswip_disable_switch(priv);</div><div class='add'>+	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(gswip_probe_common);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Hauke Mehrtens &lt;hauke@hauke-m.de&gt;");</div><div class='add'>+MODULE_AUTHOR("Daniel Golle &lt;daniel@makrotopia.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Lantiq / Intel / MaxLinear GSWIP common functions");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/lantiq_pce.h b/drivers/net/dsa/lantiq/lantiq_pce.h<br/>index 180663138e75..659f9a0638d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq_pce.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq_pce.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/lantiq_pce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/lantiq_pce.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * PCE microcode extracted from UGW 7.1.1 switch api</div><div class='ctx'>  *</div><div class='hunk'>@@ -7,6 +7,8 @@</div><div class='ctx'>  * Copyright (C) 2017 - 2018 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include "lantiq_gswip.h"</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	OUT_MAC0 = 0,</div><div class='ctx'> 	OUT_MAC1,</div><div class='hunk'>@@ -74,13 +76,6 @@ enum {</div><div class='ctx'> 	FLAG_NO,	/*13*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct gswip_pce_microcode {</div><div class='del'>-	u16 val_3;</div><div class='del'>-	u16 val_2;</div><div class='del'>-	u16 val_1;</div><div class='del'>-	u16 val_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define MC_ENTRY(val, msk, ns, out, len, type, flags, ipv4_len) \</div><div class='ctx'> 	{ val, msk, ((ns) &lt;&lt; 10 | (out) &lt;&lt; 4 | (len) &gt;&gt; 1),\</div><div class='ctx'> 		((len) &amp; 1) &lt;&lt; 15 | (type) &lt;&lt; 13 | (flags) &lt;&lt; 9 | (ipv4_len) &lt;&lt; 8 }</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/mxl-gsw1xx.c b/drivers/net/dsa/lantiq/mxl-gsw1xx.c<br/>new file mode 100644<br/>index 000000000000..0816c61a47f1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/mxl-gsw1xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/mxl-gsw1xx.c</a></div><div class='hunk'>@@ -0,0 +1,733 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* DSA Driver for MaxLinear GSW1xx switch devices</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Daniel Golle &lt;daniel@makrotopia.org&gt;</div><div class='add'>+ * Copyright (C) 2023 - 2024 MaxLinear Inc.</div><div class='add'>+ * Copyright (C) 2022 Snap One, LLC.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2017 - 2019 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ * Copyright (C) 2012 John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Lantiq Deutschland</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "lantiq_gswip.h"</div><div class='add'>+#include "mxl-gsw1xx.h"</div><div class='add'>+#include "mxl-gsw1xx_pce.h"</div><div class='add'>+</div><div class='add'>+struct gsw1xx_priv {</div><div class='add'>+	struct mdio_device	*mdio_dev;</div><div class='add'>+	int			smdio_badr;</div><div class='add'>+	struct			regmap *sgmii;</div><div class='add'>+	struct			regmap *gpio;</div><div class='add'>+	struct			regmap *clk;</div><div class='add'>+	struct			regmap *shell;</div><div class='add'>+	struct			phylink_pcs pcs;</div><div class='add'>+	phy_interface_t		tbi_interface;</div><div class='add'>+	struct gswip_priv	gswip;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int gsw1xx_config_smdio_badr(struct gsw1xx_priv *priv,</div><div class='add'>+				    unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = priv-&gt;mdio_dev-&gt;bus;</div><div class='add'>+	int sw_addr = priv-&gt;mdio_dev-&gt;addr;</div><div class='add'>+	int smdio_badr = priv-&gt;smdio_badr;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (smdio_badr == GSW1XX_SMDIO_BADR_UNKNOWN ||</div><div class='add'>+	    reg - smdio_badr &gt;= GSW1XX_SMDIO_BADR ||</div><div class='add'>+	    smdio_badr &gt; reg) {</div><div class='add'>+		/* Configure the Switch Base Address */</div><div class='add'>+		smdio_badr = reg &amp; ~GENMASK(3, 0);</div><div class='add'>+		res = __mdiobus_write(bus, sw_addr, GSW1XX_SMDIO_BADR, smdio_badr);</div><div class='add'>+		if (res &lt; 0) {</div><div class='add'>+			dev_err(&amp;priv-&gt;mdio_dev-&gt;dev,</div><div class='add'>+				"%s: Error %d, configuring switch base\n",</div><div class='add'>+				__func__, res);</div><div class='add'>+			return res;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;smdio_badr = smdio_badr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return smdio_badr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_regmap_read(void *context, unsigned int reg,</div><div class='add'>+			      unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = context;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;mdio_dev-&gt;bus;</div><div class='add'>+	int sw_addr = priv-&gt;mdio_dev-&gt;addr;</div><div class='add'>+	int smdio_badr;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	smdio_badr = gsw1xx_config_smdio_badr(priv, reg);</div><div class='add'>+	if (smdio_badr &lt; 0)</div><div class='add'>+		return smdio_badr;</div><div class='add'>+</div><div class='add'>+	res = __mdiobus_read(bus, sw_addr, reg - smdio_badr);</div><div class='add'>+	if (res &lt; 0) {</div><div class='add'>+		dev_err(&amp;priv-&gt;mdio_dev-&gt;dev, "%s: Error %d reading 0x%x\n",</div><div class='add'>+			__func__, res, reg);</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_regmap_write(void *context, unsigned int reg,</div><div class='add'>+			       unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = context;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;mdio_dev-&gt;bus;</div><div class='add'>+	int sw_addr = priv-&gt;mdio_dev-&gt;addr;</div><div class='add'>+	int smdio_badr;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	smdio_badr = gsw1xx_config_smdio_badr(priv, reg);</div><div class='add'>+	if (smdio_badr &lt; 0)</div><div class='add'>+		return smdio_badr;</div><div class='add'>+</div><div class='add'>+	res = __mdiobus_write(bus, sw_addr, reg - smdio_badr, val);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		dev_err(&amp;priv-&gt;mdio_dev-&gt;dev,</div><div class='add'>+			"%s: Error %d, writing 0x%x:0x%x\n", __func__, res, reg,</div><div class='add'>+			val);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus gsw1xx_regmap_bus = {</div><div class='add'>+	.reg_write = gsw1xx_regmap_write,</div><div class='add'>+	.reg_read = gsw1xx_regmap_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gsw1xx_mdio_regmap_lock(void *mdio_lock)</div><div class='add'>+{</div><div class='add'>+	mutex_lock_nested(mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_mdio_regmap_unlock(void *mdio_lock)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(mdio_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int gsw1xx_pcs_inband_caps(struct phylink_pcs *pcs,</div><div class='add'>+					   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	return LINK_INBAND_DISABLE | LINK_INBAND_ENABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct gsw1xx_priv *pcs_to_gsw1xx(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct gsw1xx_priv, pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_pcs_enable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);</div><div class='add'>+</div><div class='add'>+	/* Deassert SGMII shell reset */</div><div class='add'>+	return regmap_clear_bits(priv-&gt;shell, GSW1XX_SHELL_RST_REQ,</div><div class='add'>+				 GSW1XX_RST_REQ_SGMII_SHELL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_pcs_disable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);</div><div class='add'>+</div><div class='add'>+	/* Assert SGMII shell reset */</div><div class='add'>+	regmap_set_bits(priv-&gt;shell, GSW1XX_SHELL_RST_REQ,</div><div class='add'>+			GSW1XX_RST_REQ_SGMII_SHELL);</div><div class='add'>+</div><div class='add'>+	priv-&gt;tbi_interface = PHY_INTERFACE_MODE_NA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+				 unsigned int neg_mode,</div><div class='add'>+				 struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;sgmii, GSW1XX_SGMII_TBI_TBISTAT, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	state-&gt;link = !!(val &amp; GSW1XX_SGMII_TBI_TBISTAT_LINK);</div><div class='add'>+	state-&gt;an_complete = !!(val &amp; GSW1XX_SGMII_TBI_TBISTAT_AN_COMPLETE);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;sgmii, GSW1XX_SGMII_TBI_LPSTAT, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	state-&gt;duplex = (val &amp; GSW1XX_SGMII_TBI_LPSTAT_DUPLEX) ?</div><div class='add'>+			 DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+	if (val &amp; GSW1XX_SGMII_TBI_LPSTAT_PAUSE_RX)</div><div class='add'>+		state-&gt;pause |= MLO_PAUSE_RX;</div><div class='add'>+</div><div class='add'>+	if (val &amp; GSW1XX_SGMII_TBI_LPSTAT_PAUSE_TX)</div><div class='add'>+		state-&gt;pause |= MLO_PAUSE_TX;</div><div class='add'>+</div><div class='add'>+	switch (FIELD_GET(GSW1XX_SGMII_TBI_LPSTAT_SPEED, val)) {</div><div class='add'>+	case GSW1XX_SGMII_TBI_LPSTAT_SPEED_10:</div><div class='add'>+		state-&gt;speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case GSW1XX_SGMII_TBI_LPSTAT_SPEED_100:</div><div class='add'>+		state-&gt;speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case GSW1XX_SGMII_TBI_LPSTAT_SPEED_1000:</div><div class='add'>+		state-&gt;speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case GSW1XX_SGMII_TBI_LPSTAT_SPEED_NOSGMII:</div><div class='add'>+		if (state-&gt;interface == PHY_INTERFACE_MODE_1000BASEX)</div><div class='add'>+			state-&gt;speed = SPEED_1000;</div><div class='add'>+		else if (state-&gt;interface == PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+			state-&gt;speed = SPEED_2500;</div><div class='add'>+		else</div><div class='add'>+			state-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_pcs_phy_xaui_write(struct gsw1xx_priv *priv, u16 addr,</div><div class='add'>+				     u16 data)</div><div class='add'>+{</div><div class='add'>+	int ret, val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_PHY_D, data);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_PHY_A, addr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_PHY_C,</div><div class='add'>+			   GSW1XX_SGMII_PHY_WRITE |</div><div class='add'>+			   GSW1XX_SGMII_PHY_RESET_N);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(priv-&gt;sgmii, GSW1XX_SGMII_PHY_C,</div><div class='add'>+					val, val &amp; GSW1XX_SGMII_PHY_STATUS,</div><div class='add'>+					1000, 100000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_pcs_reset(struct gsw1xx_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	/* Assert and deassert SGMII shell reset */</div><div class='add'>+	ret = regmap_set_bits(priv-&gt;shell, GSW1XX_SHELL_RST_REQ,</div><div class='add'>+			      GSW1XX_RST_REQ_SGMII_SHELL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_clear_bits(priv-&gt;shell, GSW1XX_SHELL_RST_REQ,</div><div class='add'>+				GSW1XX_RST_REQ_SGMII_SHELL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Hardware Bringup FSM Enable  */</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_PHY_HWBU_CTRL,</div><div class='add'>+			   GSW1XX_SGMII_PHY_HWBU_CTRL_EN_HWBU_FSM |</div><div class='add'>+			   GSW1XX_SGMII_PHY_HWBU_CTRL_HW_FSM_EN);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Configure SGMII PHY Receiver */</div><div class='add'>+	val = FIELD_PREP(GSW1XX_SGMII_PHY_RX0_CFG2_EQ,</div><div class='add'>+			 GSW1XX_SGMII_PHY_RX0_CFG2_EQ_DEF) |</div><div class='add'>+	      GSW1XX_SGMII_PHY_RX0_CFG2_LOS_EN |</div><div class='add'>+	      GSW1XX_SGMII_PHY_RX0_CFG2_TERM_EN |</div><div class='add'>+	      FIELD_PREP(GSW1XX_SGMII_PHY_RX0_CFG2_FILT_CNT,</div><div class='add'>+			 GSW1XX_SGMII_PHY_RX0_CFG2_FILT_CNT_DEF);</div><div class='add'>+</div><div class='add'>+	/* TODO: Take care of inverted RX pair once generic property is</div><div class='add'>+	 *       available</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_PHY_RX0_CFG2, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(GSW1XX_SGMII_PHY_TX0_CFG3_VBOOST_LEVEL,</div><div class='add'>+			 GSW1XX_SGMII_PHY_TX0_CFG3_VBOOST_LEVEL_DEF);</div><div class='add'>+</div><div class='add'>+	/* TODO: Take care of inverted TX pair once generic property is</div><div class='add'>+	 *       available</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_PHY_TX0_CFG3, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Reset and Release TBI */</div><div class='add'>+	val = GSW1XX_SGMII_TBI_TBICTL_INITTBI | GSW1XX_SGMII_TBI_TBICTL_ENTBI |</div><div class='add'>+	      GSW1XX_SGMII_TBI_TBICTL_CRSTRR | GSW1XX_SGMII_TBI_TBICTL_CRSOFF;</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_TBI_TBICTL, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	val &amp;= ~GSW1XX_SGMII_TBI_TBICTL_INITTBI;</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_TBI_TBICTL, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Release Tx Data Buffers */</div><div class='add'>+	ret = regmap_set_bits(priv-&gt;sgmii, GSW1XX_SGMII_PCS_TXB_CTL,</div><div class='add'>+			      GSW1XX_SGMII_PCS_TXB_CTL_INIT_TX_TXB);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_clear_bits(priv-&gt;sgmii, GSW1XX_SGMII_PCS_TXB_CTL,</div><div class='add'>+				GSW1XX_SGMII_PCS_TXB_CTL_INIT_TX_TXB);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Release Rx Data Buffers */</div><div class='add'>+	ret = regmap_set_bits(priv-&gt;sgmii, GSW1XX_SGMII_PCS_RXB_CTL,</div><div class='add'>+			      GSW1XX_SGMII_PCS_RXB_CTL_INIT_RX_RXB);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	return regmap_clear_bits(priv-&gt;sgmii, GSW1XX_SGMII_PCS_RXB_CTL,</div><div class='add'>+				 GSW1XX_SGMII_PCS_RXB_CTL_INIT_RX_RXB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+			     phy_interface_t interface,</div><div class='add'>+			     const unsigned long *advertising,</div><div class='add'>+			     bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);</div><div class='add'>+	u16 txaneg, anegctl, nco_ctrl;</div><div class='add'>+	bool reconf = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* do not unnecessarily disrupt link and skip resetting the hardware in</div><div class='add'>+	 * case the PCS has previously been successfully configured for this</div><div class='add'>+	 * interface mode</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;tbi_interface == interface)</div><div class='add'>+		reconf = true;</div><div class='add'>+</div><div class='add'>+	/* mark PCS configuration as incomplete */</div><div class='add'>+	priv-&gt;tbi_interface = PHY_INTERFACE_MODE_NA;</div><div class='add'>+</div><div class='add'>+	if (!reconf)</div><div class='add'>+		ret = gsw1xx_pcs_reset(priv);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* override bootstrap pin settings</div><div class='add'>+	 * OVRANEG sets ANEG Mode, Enable ANEG and restart ANEG to be</div><div class='add'>+	 * taken from bits ANMODE, ANEGEN, RANEG of the ANEGCTL register.</div><div class='add'>+	 * OVERABL sets ability bits in tx_config_reg to be taken from</div><div class='add'>+	 * the TXANEGH and TXANEGL registers.</div><div class='add'>+	 */</div><div class='add'>+	anegctl = GSW1XX_SGMII_TBI_ANEGCTL_OVRANEG |</div><div class='add'>+		  GSW1XX_SGMII_TBI_ANEGCTL_OVRABL;</div><div class='add'>+</div><div class='add'>+	switch (phylink_get_link_timer_ns(interface)) {</div><div class='add'>+	case 10000:</div><div class='add'>+		anegctl |= FIELD_PREP(GSW1XX_SGMII_TBI_ANEGCTL_LT,</div><div class='add'>+				      GSW1XX_SGMII_TBI_ANEGCTL_LT_10US);</div><div class='add'>+		break;</div><div class='add'>+	case 1600000:</div><div class='add'>+		anegctl |= FIELD_PREP(GSW1XX_SGMII_TBI_ANEGCTL_LT,</div><div class='add'>+				      GSW1XX_SGMII_TBI_ANEGCTL_LT_1_6MS);</div><div class='add'>+		break;</div><div class='add'>+	case 5000000:</div><div class='add'>+		anegctl |= FIELD_PREP(GSW1XX_SGMII_TBI_ANEGCTL_LT,</div><div class='add'>+				      GSW1XX_SGMII_TBI_ANEGCTL_LT_5MS);</div><div class='add'>+		break;</div><div class='add'>+	case 10000000:</div><div class='add'>+		anegctl |= FIELD_PREP(GSW1XX_SGMII_TBI_ANEGCTL_LT,</div><div class='add'>+				      GSW1XX_SGMII_TBI_ANEGCTL_LT_10MS);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (neg_mode &amp; PHYLINK_PCS_NEG_INBAND)</div><div class='add'>+		anegctl |= GSW1XX_SGMII_TBI_ANEGCTL_ANEGEN;</div><div class='add'>+</div><div class='add'>+	txaneg = phylink_mii_c22_pcs_encode_advertisement(interface, advertising);</div><div class='add'>+</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		/* lacking a defined reverse-SGMII interface mode this</div><div class='add'>+		 * driver only supports SGMII (MAC side) for now</div><div class='add'>+		 */</div><div class='add'>+		anegctl |= FIELD_PREP(GSW1XX_SGMII_TBI_ANEGCTL_ANMODE,</div><div class='add'>+				      GSW1XX_SGMII_TBI_ANEGCTL_ANMODE_SGMII_MAC);</div><div class='add'>+		txaneg |= ADVERTISE_LPACK;</div><div class='add'>+	} else if (interface == PHY_INTERFACE_MODE_1000BASEX ||</div><div class='add'>+		   interface == PHY_INTERFACE_MODE_2500BASEX) {</div><div class='add'>+		anegctl |= FIELD_PREP(GSW1XX_SGMII_TBI_ANEGCTL_ANMODE,</div><div class='add'>+				      GSW1XX_SGMII_TBI_ANEGCTL_ANMODE_1000BASEX);</div><div class='add'>+	} else {</div><div class='add'>+		dev_err(priv-&gt;gswip.dev, "%s: wrong interface mode %s\n",</div><div class='add'>+			__func__, phy_modes(interface));</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_TBI_TXANEGH,</div><div class='add'>+			   FIELD_GET(GENMASK(15, 8), txaneg));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_TBI_TXANEGL,</div><div class='add'>+			   FIELD_GET(GENMASK(7, 0), txaneg));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_TBI_ANEGCTL, anegctl);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!reconf) {</div><div class='add'>+		/* setup SerDes clock speed */</div><div class='add'>+		if (interface == PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+			nco_ctrl = GSW1XX_SGMII_2G5 | GSW1XX_SGMII_2G5_NCO2;</div><div class='add'>+		else</div><div class='add'>+			nco_ctrl = GSW1XX_SGMII_1G | GSW1XX_SGMII_1G_NCO1;</div><div class='add'>+</div><div class='add'>+		ret = regmap_update_bits(priv-&gt;clk, GSW1XX_CLK_NCO_CTRL,</div><div class='add'>+					 GSW1XX_SGMII_HSP_MASK |</div><div class='add'>+					 GSW1XX_SGMII_SEL,</div><div class='add'>+					 nco_ctrl);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = gsw1xx_pcs_phy_xaui_write(priv, 0x30, 0x80);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* PCS configuration has now been completed, store mode to prevent</div><div class='add'>+	 * disrupting the link in case of future calls of this function for the</div><div class='add'>+	 * same interface mode.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;tbi_interface = interface;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);</div><div class='add'>+</div><div class='add'>+	regmap_set_bits(priv-&gt;sgmii, GSW1XX_SGMII_TBI_ANEGCTL,</div><div class='add'>+			GSW1XX_SGMII_TBI_ANEGCTL_RANEG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_pcs_link_up(struct phylink_pcs *pcs,</div><div class='add'>+			       unsigned int neg_mode,</div><div class='add'>+			       phy_interface_t interface, int speed,</div><div class='add'>+			       int duplex)</div><div class='add'>+{</div><div class='add'>+	struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);</div><div class='add'>+	u16 lpstat;</div><div class='add'>+</div><div class='add'>+	/* When in-band AN is enabled hardware will set lpstat */</div><div class='add'>+	if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Force speed and duplex settings */</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		if (speed == SPEED_10)</div><div class='add'>+			lpstat = FIELD_PREP(GSW1XX_SGMII_TBI_LPSTAT_SPEED,</div><div class='add'>+					    GSW1XX_SGMII_TBI_LPSTAT_SPEED_10);</div><div class='add'>+		else if (speed == SPEED_100)</div><div class='add'>+			lpstat = FIELD_PREP(GSW1XX_SGMII_TBI_LPSTAT_SPEED,</div><div class='add'>+					    GSW1XX_SGMII_TBI_LPSTAT_SPEED_100);</div><div class='add'>+		else</div><div class='add'>+			lpstat = FIELD_PREP(GSW1XX_SGMII_TBI_LPSTAT_SPEED,</div><div class='add'>+					    GSW1XX_SGMII_TBI_LPSTAT_SPEED_1000);</div><div class='add'>+	} else {</div><div class='add'>+		lpstat = FIELD_PREP(GSW1XX_SGMII_TBI_LPSTAT_SPEED,</div><div class='add'>+				    GSW1XX_SGMII_TBI_LPSTAT_SPEED_NOSGMII);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		lpstat |= GSW1XX_SGMII_TBI_LPSTAT_DUPLEX;</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;sgmii, GSW1XX_SGMII_TBI_LPSTAT, lpstat);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops gsw1xx_pcs_ops = {</div><div class='add'>+	.pcs_inband_caps = gsw1xx_pcs_inband_caps,</div><div class='add'>+	.pcs_enable = gsw1xx_pcs_enable,</div><div class='add'>+	.pcs_disable = gsw1xx_pcs_disable,</div><div class='add'>+	.pcs_get_state = gsw1xx_pcs_get_state,</div><div class='add'>+	.pcs_config = gsw1xx_pcs_config,</div><div class='add'>+	.pcs_an_restart = gsw1xx_pcs_an_restart,</div><div class='add'>+	.pcs_link_up = gsw1xx_pcs_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gsw1xx_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+				   MAC_10 | MAC_100 | MAC_1000;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	case 4: /* port 4: SGMII */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		if (priv-&gt;hw_info-&gt;supports_2500m) {</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_2500BASEX,</div><div class='add'>+				  config-&gt;supported_interfaces);</div><div class='add'>+			config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+		}</div><div class='add'>+		return; /* no support for EEE on SGMII port */</div><div class='add'>+	case 5: /* port 5: RGMII or RMII */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;lpi_capabilities = MAC_100FD | MAC_1000FD;</div><div class='add'>+	config-&gt;lpi_timer_default = 20;</div><div class='add'>+	memcpy(config-&gt;lpi_interfaces, config-&gt;supported_interfaces,</div><div class='add'>+	       sizeof(config-&gt;lpi_interfaces));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *gsw1xx_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+							 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct gswip_priv *gswip_priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct gsw1xx_priv *gsw1xx_priv = container_of(gswip_priv,</div><div class='add'>+						       struct gsw1xx_priv,</div><div class='add'>+						       gswip);</div><div class='add'>+</div><div class='add'>+	switch (dp-&gt;index) {</div><div class='add'>+	case GSW1XX_SGMII_PORT:</div><div class='add'>+		return &amp;gsw1xx_priv-&gt;pcs;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regmap *gsw1xx_regmap_init(struct gsw1xx_priv *priv,</div><div class='add'>+					 const char *name,</div><div class='add'>+					 unsigned int reg_base,</div><div class='add'>+					 unsigned int max_register)</div><div class='add'>+{</div><div class='add'>+	const struct regmap_config config = {</div><div class='add'>+		.name = name,</div><div class='add'>+		.reg_bits = 16,</div><div class='add'>+		.val_bits = 16,</div><div class='add'>+		.reg_base = reg_base,</div><div class='add'>+		.max_register = max_register,</div><div class='add'>+		.lock = gsw1xx_mdio_regmap_lock,</div><div class='add'>+		.unlock = gsw1xx_mdio_regmap_unlock,</div><div class='add'>+		.lock_arg = &amp;priv-&gt;mdio_dev-&gt;bus-&gt;mdio_lock,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return devm_regmap_init(&amp;priv-&gt;mdio_dev-&gt;dev, &amp;gsw1xx_regmap_bus,</div><div class='add'>+				priv, &amp;config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int gsw1xx_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	struct gsw1xx_priv *priv;</div><div class='add'>+	u32 version;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio_dev = mdiodev;</div><div class='add'>+	priv-&gt;smdio_badr = GSW1XX_SMDIO_BADR_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	priv-&gt;gswip.dev = dev;</div><div class='add'>+	priv-&gt;gswip.hw_info = of_device_get_match_data(dev);</div><div class='add'>+	if (!priv-&gt;gswip.hw_info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;gswip.gswip = gsw1xx_regmap_init(priv, "switch",</div><div class='add'>+					       GSW1XX_SWITCH_BASE, 0xfff);</div><div class='add'>+	if (IS_ERR(priv-&gt;gswip.gswip))</div><div class='add'>+		return PTR_ERR(priv-&gt;gswip.gswip);</div><div class='add'>+</div><div class='add'>+	priv-&gt;gswip.mdio = gsw1xx_regmap_init(priv, "mdio", GSW1XX_MMDIO_BASE,</div><div class='add'>+					      0xff);</div><div class='add'>+	if (IS_ERR(priv-&gt;gswip.mdio))</div><div class='add'>+		return PTR_ERR(priv-&gt;gswip.mdio);</div><div class='add'>+</div><div class='add'>+	priv-&gt;gswip.mii = gsw1xx_regmap_init(priv, "mii", GSW1XX_RGMII_BASE,</div><div class='add'>+					     0xff);</div><div class='add'>+	if (IS_ERR(priv-&gt;gswip.mii))</div><div class='add'>+		return PTR_ERR(priv-&gt;gswip.mii);</div><div class='add'>+</div><div class='add'>+	priv-&gt;sgmii = gsw1xx_regmap_init(priv, "sgmii", GSW1XX_SGMII_BASE,</div><div class='add'>+					 0xfff);</div><div class='add'>+	if (IS_ERR(priv-&gt;sgmii))</div><div class='add'>+		return PTR_ERR(priv-&gt;sgmii);</div><div class='add'>+</div><div class='add'>+	priv-&gt;gpio = gsw1xx_regmap_init(priv, "gpio", GSW1XX_GPIO_BASE, 0xff);</div><div class='add'>+	if (IS_ERR(priv-&gt;gpio))</div><div class='add'>+		return PTR_ERR(priv-&gt;gpio);</div><div class='add'>+</div><div class='add'>+	priv-&gt;clk = gsw1xx_regmap_init(priv, "clk", GSW1XX_CLK_BASE, 0xff);</div><div class='add'>+	if (IS_ERR(priv-&gt;clk))</div><div class='add'>+		return PTR_ERR(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	priv-&gt;shell = gsw1xx_regmap_init(priv, "shell", GSW1XX_SHELL_BASE,</div><div class='add'>+					 0xff);</div><div class='add'>+	if (IS_ERR(priv-&gt;shell))</div><div class='add'>+		return PTR_ERR(priv-&gt;shell);</div><div class='add'>+</div><div class='add'>+	priv-&gt;pcs.ops = &amp;gsw1xx_pcs_ops;</div><div class='add'>+	priv-&gt;pcs.poll = true;</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+		  priv-&gt;pcs.supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+		  priv-&gt;pcs.supported_interfaces);</div><div class='add'>+	if (priv-&gt;gswip.hw_info-&gt;supports_2500m)</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_2500BASEX,</div><div class='add'>+			  priv-&gt;pcs.supported_interfaces);</div><div class='add'>+	priv-&gt;tbi_interface = PHY_INTERFACE_MODE_NA;</div><div class='add'>+</div><div class='add'>+	/* assert SGMII reset to power down SGMII unit */</div><div class='add'>+	ret = regmap_set_bits(priv-&gt;shell, GSW1XX_SHELL_RST_REQ,</div><div class='add'>+			      GSW1XX_RST_REQ_SGMII_SHELL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* configure GPIO pin-mux for MMDIO in case of external PHY connected to</div><div class='add'>+	 * SGMII or RGMII as slave interface</div><div class='add'>+	 */</div><div class='add'>+	regmap_set_bits(priv-&gt;gpio, GPIO_ALTSEL0, 3);</div><div class='add'>+	regmap_set_bits(priv-&gt;gpio, GPIO_ALTSEL1, 3);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;gswip.gswip, GSWIP_VERSION, &amp;version);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = gswip_probe_common(&amp;priv-&gt;gswip, version);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, &amp;priv-&gt;gswip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	gswip_disable_switch(priv);</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gsw1xx_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct gswip_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+	gswip_disable_switch(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct gswip_hw_info gsw12x_data = {</div><div class='add'>+	.max_ports		= GSW1XX_PORTS,</div><div class='add'>+	.allowed_cpu_ports	= BIT(GSW1XX_MII_PORT) | BIT(GSW1XX_SGMII_PORT),</div><div class='add'>+	.mii_ports		= BIT(GSW1XX_MII_PORT),</div><div class='add'>+	.mii_port_reg_offset	= -GSW1XX_MII_PORT,</div><div class='add'>+	.mac_select_pcs		= gsw1xx_phylink_mac_select_pcs,</div><div class='add'>+	.phylink_get_caps	= &amp;gsw1xx_phylink_get_caps,</div><div class='add'>+	.supports_2500m		= true,</div><div class='add'>+	.pce_microcode		= &amp;gsw1xx_pce_microcode,</div><div class='add'>+	.pce_microcode_size	= ARRAY_SIZE(gsw1xx_pce_microcode),</div><div class='add'>+	.tag_protocol		= DSA_TAG_PROTO_MXL_GSW1XX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gswip_hw_info gsw140_data = {</div><div class='add'>+	.max_ports		= GSW1XX_PORTS,</div><div class='add'>+	.allowed_cpu_ports	= BIT(GSW1XX_MII_PORT) | BIT(GSW1XX_SGMII_PORT),</div><div class='add'>+	.mii_ports		= BIT(GSW1XX_MII_PORT),</div><div class='add'>+	.mii_port_reg_offset	= -GSW1XX_MII_PORT,</div><div class='add'>+	.mac_select_pcs		= gsw1xx_phylink_mac_select_pcs,</div><div class='add'>+	.phylink_get_caps	= &amp;gsw1xx_phylink_get_caps,</div><div class='add'>+	.supports_2500m		= true,</div><div class='add'>+	.pce_microcode		= &amp;gsw1xx_pce_microcode,</div><div class='add'>+	.pce_microcode_size	= ARRAY_SIZE(gsw1xx_pce_microcode),</div><div class='add'>+	.tag_protocol		= DSA_TAG_PROTO_MXL_GSW1XX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct gswip_hw_info gsw141_data = {</div><div class='add'>+	.max_ports		= GSW1XX_PORTS,</div><div class='add'>+	.allowed_cpu_ports	= BIT(GSW1XX_MII_PORT) | BIT(GSW1XX_SGMII_PORT),</div><div class='add'>+	.mii_ports		= BIT(GSW1XX_MII_PORT),</div><div class='add'>+	.mii_port_reg_offset	= -GSW1XX_MII_PORT,</div><div class='add'>+	.mac_select_pcs		= gsw1xx_phylink_mac_select_pcs,</div><div class='add'>+	.phylink_get_caps	= gsw1xx_phylink_get_caps,</div><div class='add'>+	.pce_microcode		= &amp;gsw1xx_pce_microcode,</div><div class='add'>+	.pce_microcode_size	= ARRAY_SIZE(gsw1xx_pce_microcode),</div><div class='add'>+	.tag_protocol		= DSA_TAG_PROTO_MXL_GSW1XX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * GSW125 is the industrial temperature version of GSW120.</div><div class='add'>+ * GSW145 is the industrial temperature version of GSW140.</div><div class='add'>+ */</div><div class='add'>+static const struct of_device_id gsw1xx_of_match[] = {</div><div class='add'>+	{ .compatible = "maxlinear,gsw120", .data = &amp;gsw12x_data },</div><div class='add'>+	{ .compatible = "maxlinear,gsw125", .data = &amp;gsw12x_data },</div><div class='add'>+	{ .compatible = "maxlinear,gsw140", .data = &amp;gsw140_data },</div><div class='add'>+	{ .compatible = "maxlinear,gsw141", .data = &amp;gsw141_data },</div><div class='add'>+	{ .compatible = "maxlinear,gsw145", .data = &amp;gsw140_data },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(of, gsw1xx_of_match);</div><div class='add'>+</div><div class='add'>+static struct mdio_driver gsw1xx_driver = {</div><div class='add'>+	.probe		= gsw1xx_probe,</div><div class='add'>+	.remove		= gsw1xx_remove,</div><div class='add'>+	.shutdown	= gsw1xx_shutdown,</div><div class='add'>+	.mdiodrv.driver	= {</div><div class='add'>+		.name = "mxl-gsw1xx",</div><div class='add'>+		.of_match_table = gsw1xx_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(gsw1xx_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Daniel Golle &lt;daniel@makrotopia.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for MaxLinear GSW1xx ethernet switch");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/mxl-gsw1xx.h b/drivers/net/dsa/lantiq/mxl-gsw1xx.h<br/>new file mode 100644<br/>index 000000000000..38e03c048a26<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/mxl-gsw1xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/mxl-gsw1xx.h</a></div><div class='hunk'>@@ -0,0 +1,126 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Register definitions for MaxLinear GSW1xx series switches</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2025 Daniel Golle &lt;daniel@makrotopia.org&gt;</div><div class='add'>+ * Copyright (C) 2023 - 2024 MaxLinear Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef __MXL_GSW1XX_H</div><div class='add'>+#define __MXL_GSW1XX_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#define GSW1XX_PORTS				6</div><div class='add'>+/* Port used for RGMII or optional RMII */</div><div class='add'>+#define GSW1XX_MII_PORT				5</div><div class='add'>+/* Port used for SGMII */</div><div class='add'>+#define GSW1XX_SGMII_PORT			4</div><div class='add'>+</div><div class='add'>+#define GSW1XX_SYS_CLK_FREQ			340000000</div><div class='add'>+</div><div class='add'>+/* SMDIO switch register base address */</div><div class='add'>+#define GSW1XX_SMDIO_BADR			0x1f</div><div class='add'>+#define  GSW1XX_SMDIO_BADR_UNKNOWN		-1</div><div class='add'>+</div><div class='add'>+/* GSW1XX SGMII PCS */</div><div class='add'>+#define GSW1XX_SGMII_BASE			0xd000</div><div class='add'>+#define GSW1XX_SGMII_PHY_HWBU_CTRL		0x009</div><div class='add'>+#define  GSW1XX_SGMII_PHY_HWBU_CTRL_EN_HWBU_FSM	BIT(0)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_HWBU_CTRL_HW_FSM_EN	BIT(3)</div><div class='add'>+#define GSW1XX_SGMII_TBI_TXANEGH		0x300</div><div class='add'>+#define GSW1XX_SGMII_TBI_TXANEGL		0x301</div><div class='add'>+#define GSW1XX_SGMII_TBI_ANEGCTL		0x304</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_LT		GENMASK(1, 0)</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_LT_10US	0</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_LT_1_6MS	1</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_LT_5MS	2</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_LT_10MS	3</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_ANEGEN	BIT(2)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_RANEG		BIT(3)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_OVRABL	BIT(4)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_OVRANEG	BIT(5)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_ANMODE	GENMASK(7, 6)</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_ANMODE_1000BASEX	1</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_ANMODE_SGMII_PHY	2</div><div class='add'>+#define   GSW1XX_SGMII_TBI_ANEGCTL_ANMODE_SGMII_MAC	3</div><div class='add'>+#define  GSW1XX_SGMII_TBI_ANEGCTL_BCOMP		BIT(15)</div><div class='add'>+</div><div class='add'>+#define GSW1XX_SGMII_TBI_TBICTL			0x305</div><div class='add'>+#define  GSW1XX_SGMII_TBI_TBICTL_INITTBI	BIT(0)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_TBICTL_ENTBI		BIT(1)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_TBICTL_CRSTRR		BIT(4)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_TBICTL_CRSOFF		BIT(5)</div><div class='add'>+#define GSW1XX_SGMII_TBI_TBISTAT		0x309</div><div class='add'>+#define  GSW1XX_SGMII_TBI_TBISTAT_LINK		BIT(0)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_TBISTAT_AN_COMPLETE	BIT(1)</div><div class='add'>+#define GSW1XX_SGMII_TBI_LPSTAT			0x30a</div><div class='add'>+#define  GSW1XX_SGMII_TBI_LPSTAT_DUPLEX		BIT(0)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_LPSTAT_PAUSE_RX	BIT(1)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_LPSTAT_PAUSE_TX	BIT(2)</div><div class='add'>+#define  GSW1XX_SGMII_TBI_LPSTAT_SPEED		GENMASK(6, 5)</div><div class='add'>+#define   GSW1XX_SGMII_TBI_LPSTAT_SPEED_10	0</div><div class='add'>+#define   GSW1XX_SGMII_TBI_LPSTAT_SPEED_100	1</div><div class='add'>+#define   GSW1XX_SGMII_TBI_LPSTAT_SPEED_1000	2</div><div class='add'>+#define   GSW1XX_SGMII_TBI_LPSTAT_SPEED_NOSGMII	3</div><div class='add'>+#define GSW1XX_SGMII_PHY_D			0x100</div><div class='add'>+#define GSW1XX_SGMII_PHY_A			0x101</div><div class='add'>+#define GSW1XX_SGMII_PHY_C			0x102</div><div class='add'>+#define  GSW1XX_SGMII_PHY_STATUS		BIT(0)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_READ			BIT(4)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_WRITE			BIT(8)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_RESET_N		BIT(12)</div><div class='add'>+#define GSW1XX_SGMII_PCS_RXB_CTL		0x401</div><div class='add'>+#define  GSW1XX_SGMII_PCS_RXB_CTL_INIT_RX_RXB	BIT(1)</div><div class='add'>+#define GSW1XX_SGMII_PCS_TXB_CTL		0x404</div><div class='add'>+#define  GSW1XX_SGMII_PCS_TXB_CTL_INIT_TX_TXB	BIT(1)</div><div class='add'>+</div><div class='add'>+#define GSW1XX_SGMII_PHY_RX0_CFG2		0x004</div><div class='add'>+#define  GSW1XX_SGMII_PHY_RX0_CFG2_EQ		GENMASK(2, 0)</div><div class='add'>+#define   GSW1XX_SGMII_PHY_RX0_CFG2_EQ_DEF	2</div><div class='add'>+#define  GSW1XX_SGMII_PHY_RX0_CFG2_INVERT	BIT(3)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_RX0_CFG2_LOS_EN	BIT(4)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_RX0_CFG2_TERM_EN	BIT(5)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_RX0_CFG2_FILT_CNT	GENMASK(12, 6)</div><div class='add'>+#define   GSW1XX_SGMII_PHY_RX0_CFG2_FILT_CNT_DEF	20</div><div class='add'>+</div><div class='add'>+#define GSW1XX_SGMII_PHY_TX0_CFG3		0x007</div><div class='add'>+#define  GSW1XX_SGMII_PHY_TX0_CFG3_VBOOST_EN	BIT(12)</div><div class='add'>+#define  GSW1XX_SGMII_PHY_TX0_CFG3_VBOOST_LEVEL	GENMASK(11, 9)</div><div class='add'>+#define   GSW1XX_SGMII_PHY_TX0_CFG3_VBOOST_LEVEL_DEF	4</div><div class='add'>+#define  GSW1XX_SGMII_PHY_TX0_CFG3_INVERT	BIT(8)</div><div class='add'>+</div><div class='add'>+/* GSW1XX PDI Registers */</div><div class='add'>+#define GSW1XX_SWITCH_BASE			0xe000</div><div class='add'>+</div><div class='add'>+/* GSW1XX MII Registers */</div><div class='add'>+#define GSW1XX_RGMII_BASE			0xf100</div><div class='add'>+</div><div class='add'>+/* GSW1XX GPIO Registers */</div><div class='add'>+#define GSW1XX_GPIO_BASE			0xf300</div><div class='add'>+#define GPIO_ALTSEL0				0x83</div><div class='add'>+#define GPIO_ALTSEL0_EXTPHY_MUX_VAL		0x03c3</div><div class='add'>+#define GPIO_ALTSEL1				0x84</div><div class='add'>+#define GPIO_ALTSEL1_EXTPHY_MUX_VAL		0x003f</div><div class='add'>+</div><div class='add'>+/* MDIO bus controller */</div><div class='add'>+#define GSW1XX_MMDIO_BASE			0xf400</div><div class='add'>+</div><div class='add'>+/* generic IC registers */</div><div class='add'>+#define GSW1XX_SHELL_BASE			0xfa00</div><div class='add'>+#define  GSW1XX_SHELL_RST_REQ			0x01</div><div class='add'>+#define   GSW1XX_RST_REQ_SGMII_SHELL		BIT(5)</div><div class='add'>+/* RGMII PAD Slew Control Register */</div><div class='add'>+#define  GSW1XX_SHELL_RGMII_SLEW_CFG		0x78</div><div class='add'>+#define   RGMII_SLEW_CFG_RX_2_5_V		BIT(4)</div><div class='add'>+#define   RGMII_SLEW_CFG_TX_2_5_V		BIT(5)</div><div class='add'>+</div><div class='add'>+/* SGMII clock related settings */</div><div class='add'>+#define GSW1XX_CLK_BASE				0xf900</div><div class='add'>+#define  GSW1XX_CLK_NCO_CTRL			0x68</div><div class='add'>+#define   GSW1XX_SGMII_HSP_MASK			GENMASK(3, 2)</div><div class='add'>+#define   GSW1XX_SGMII_SEL			BIT(1)</div><div class='add'>+#define   GSW1XX_SGMII_1G			0x0</div><div class='add'>+#define   GSW1XX_SGMII_2G5			0xc</div><div class='add'>+#define   GSW1XX_SGMII_1G_NCO1			0x0</div><div class='add'>+#define   GSW1XX_SGMII_2G5_NCO2			0x2</div><div class='add'>+</div><div class='add'>+#endif /* __MXL_GSW1XX_H */</div><div class='head'>diff --git a/drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h b/drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h<br/>new file mode 100644<br/>index 000000000000..eefcd411a340<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/lantiq/mxl-gsw1xx_pce.h</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * PCE microcode code update for driver for MaxLinear GSW1xx switch chips</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2023 - 2024 MaxLinear Inc.</div><div class='add'>+ * Copyright (C) 2022 Snap One, LLC.  All rights reserved.</div><div class='add'>+ * Copyright (C) 2017 - 2019 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ * Copyright (C) 2012 John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Lantiq Deutschland</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "lantiq_gswip.h"</div><div class='add'>+</div><div class='add'>+#define INSTR 0</div><div class='add'>+#define IPV6 1</div><div class='add'>+#define LENACCU 2</div><div class='add'>+</div><div class='add'>+/* GSWIP_2.X */</div><div class='add'>+enum {</div><div class='add'>+	OUT_MAC0 = 0,</div><div class='add'>+	OUT_MAC1,</div><div class='add'>+	OUT_MAC2,</div><div class='add'>+	OUT_MAC3,</div><div class='add'>+	OUT_MAC4,</div><div class='add'>+	OUT_MAC5,</div><div class='add'>+	OUT_ETHTYP,</div><div class='add'>+	OUT_VTAG0,</div><div class='add'>+	OUT_VTAG1,</div><div class='add'>+	OUT_ITAG0,</div><div class='add'>+	OUT_ITAG1,	/* 10 */</div><div class='add'>+	OUT_ITAG2,</div><div class='add'>+	OUT_ITAG3,</div><div class='add'>+	OUT_IP0,</div><div class='add'>+	OUT_IP1,</div><div class='add'>+	OUT_IP2,</div><div class='add'>+	OUT_IP3,</div><div class='add'>+	OUT_SIP0,</div><div class='add'>+	OUT_SIP1,</div><div class='add'>+	OUT_SIP2,</div><div class='add'>+	OUT_SIP3,	/* 20 */</div><div class='add'>+	OUT_SIP4,</div><div class='add'>+	OUT_SIP5,</div><div class='add'>+	OUT_SIP6,</div><div class='add'>+	OUT_SIP7,</div><div class='add'>+	OUT_DIP0,</div><div class='add'>+	OUT_DIP1,</div><div class='add'>+	OUT_DIP2,</div><div class='add'>+	OUT_DIP3,</div><div class='add'>+	OUT_DIP4,</div><div class='add'>+	OUT_DIP5,	/* 30 */</div><div class='add'>+	OUT_DIP6,</div><div class='add'>+	OUT_DIP7,</div><div class='add'>+	OUT_SESID,</div><div class='add'>+	OUT_PROT,</div><div class='add'>+	OUT_APP0,</div><div class='add'>+	OUT_APP1,</div><div class='add'>+	OUT_IGMP0,</div><div class='add'>+	OUT_IGMP1,</div><div class='add'>+	OUT_STAG0 = 61,</div><div class='add'>+	OUT_STAG1 = 62,</div><div class='add'>+	OUT_NONE = 63,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* parser's microcode flag type */</div><div class='add'>+enum {</div><div class='add'>+	FLAG_ITAG = 0,</div><div class='add'>+	FLAG_VLAN,</div><div class='add'>+	FLAG_SNAP,</div><div class='add'>+	FLAG_PPPOE,</div><div class='add'>+	FLAG_IPV6,</div><div class='add'>+	FLAG_IPV6FL,</div><div class='add'>+	FLAG_IPV4,</div><div class='add'>+	FLAG_IGMP,</div><div class='add'>+	FLAG_TU,</div><div class='add'>+	FLAG_HOP,</div><div class='add'>+	FLAG_NN1,	/* 10 */</div><div class='add'>+	FLAG_NN2,</div><div class='add'>+	FLAG_END,</div><div class='add'>+	FLAG_NO,	/* 13 */</div><div class='add'>+	FLAG_SVLAN,	/* 14 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PCE_MC_M(val, msk, ns, out, len, type, flags, ipv4_len) \</div><div class='add'>+	{ (val), (msk), ((ns) &lt;&lt; 10 | (out) &lt;&lt; 4 | (len) &gt;&gt; 1),\</div><div class='add'>+	 ((len) &amp; 1) &lt;&lt; 15 | (type) &lt;&lt; 13 | (flags) &lt;&lt; 9 | (ipv4_len) &lt;&lt; 8 }</div><div class='add'>+</div><div class='add'>+/* V22_2X (IPv6 issue fixed) */</div><div class='add'>+static const struct gswip_pce_microcode gsw1xx_pce_microcode[] = {</div><div class='add'>+	/*       value   mask    ns  fields      L  type     flags       ipv4_len */</div><div class='add'>+	PCE_MC_M(0x88c3, 0xFFFF, 1,  OUT_ITAG0,  4, INSTR,   FLAG_ITAG,  0),</div><div class='add'>+	PCE_MC_M(0x8100, 0xFFFF, 4,  OUT_STAG0,  2, INSTR,   FLAG_SVLAN, 0),</div><div class='add'>+	PCE_MC_M(0x88A8, 0xFFFF, 4,  OUT_STAG0,  2, INSTR,   FLAG_SVLAN, 0),</div><div class='add'>+	PCE_MC_M(0x9100, 0xFFFF, 4,  OUT_STAG0,  2, INSTR,   FLAG_SVLAN, 0),</div><div class='add'>+	PCE_MC_M(0x8100, 0xFFFF, 5,  OUT_VTAG0,  2, INSTR,   FLAG_VLAN,  0),</div><div class='add'>+	PCE_MC_M(0x88A8, 0xFFFF, 6,  OUT_VTAG0,  2, INSTR,   FLAG_VLAN,  0),</div><div class='add'>+	PCE_MC_M(0x9100, 0xFFFF, 4,  OUT_VTAG0,  2, INSTR,   FLAG_VLAN,  0),</div><div class='add'>+	PCE_MC_M(0x8864, 0xFFFF, 20, OUT_ETHTYP, 1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0800, 0xFFFF, 24, OUT_ETHTYP, 1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x86DD, 0xFFFF, 25, OUT_ETHTYP, 1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x8863, 0xFFFF, 19, OUT_ETHTYP, 1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0xF800, 13, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 44, OUT_ETHTYP, 1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0600, 0x0600, 44, OUT_ETHTYP, 1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 15, OUT_NONE,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0xAAAA, 0xFFFF, 17, OUT_NONE,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0300, 0xFF00, 45, OUT_NONE,   0, INSTR,   FLAG_SNAP,  0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_DIP7,   3, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 21, OUT_DIP7,   3, INSTR,   FLAG_PPPOE, 0),</div><div class='add'>+	PCE_MC_M(0x0021, 0xFFFF, 24, OUT_NONE,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0057, 0xFFFF, 25, OUT_NONE,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 44, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x4000, 0xF000, 27, OUT_IP0,    4, INSTR,   FLAG_IPV4,  1),</div><div class='add'>+	PCE_MC_M(0x6000, 0xF000, 30, OUT_IP0,    3, INSTR,   FLAG_IPV6,  0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 28, OUT_IP3,    2, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 29, OUT_SIP0,   4, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 44, OUT_NONE,   0, LENACCU, FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x1100, 0xFF00, 43, OUT_PROT,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0600, 0xFF00, 43, OUT_PROT,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0xFF00, 36, OUT_IP3,   17, INSTR,   FLAG_HOP,   0),</div><div class='add'>+	PCE_MC_M(0x2B00, 0xFF00, 36, OUT_IP3,   17, INSTR,   FLAG_NN1,   0),</div><div class='add'>+	PCE_MC_M(0x3C00, 0xFF00, 36, OUT_IP3,   17, INSTR,   FLAG_NN2,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 43, OUT_PROT,   1, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x00F0, 38, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 44, OUT_NONE,   0, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0xFF00, 36, OUT_NONE,   0, IPV6,    FLAG_HOP,   0),</div><div class='add'>+	PCE_MC_M(0x2B00, 0xFF00, 36, OUT_NONE,   0, IPV6,    FLAG_NN1,   0),</div><div class='add'>+	PCE_MC_M(0x3C00, 0xFF00, 36, OUT_NONE,   0, IPV6,    FLAG_NN2,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x00FC, 44, OUT_PROT,   0, IPV6,    FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 44, OUT_NONE,   0, IPV6,    FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 44, OUT_SIP0,  16, INSTR,   FLAG_NO,    0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_APP0,   4, INSTR,   FLAG_IGMP,  0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+	PCE_MC_M(0x0000, 0x0000, 45, OUT_NONE,   0, INSTR,   FLAG_END,   0),</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c<br/>deleted file mode 100644<br/>index 4e64835deac2..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/lantiq_gswip.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/lantiq_gswip.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1968 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Lantiq / Intel GSWIP switch driver for VRX200 SoCs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2010 Lantiq Deutschland</div><div class='del'>- * Copyright (C) 2012 John Crispin &lt;john@phrozen.org&gt;</div><div class='del'>- * Copyright (C) 2017 - 2019 Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='del'>- *</div><div class='del'>- * The VLAN and bridge model the GSWIP hardware uses does not directly</div><div class='del'>- * matches the model DSA uses.</div><div class='del'>- *</div><div class='del'>- * The hardware has 64 possible table entries for bridges with one VLAN</div><div class='del'>- * ID, one flow id and a list of ports for each bridge. All entries which</div><div class='del'>- * match the same flow ID are combined in the mac learning table, they</div><div class='del'>- * act as one global bridge.</div><div class='del'>- * The hardware does not support VLAN filter on the port, but on the</div><div class='del'>- * bridge, this driver converts the DSA model to the hardware.</div><div class='del'>- *</div><div class='del'>- * The CPU gets all the exception frames which do not match any forwarding</div><div class='del'>- * rule and the CPU port is also added to all bridges. This makes it possible</div><div class='del'>- * to handle all the special cases easily in software.</div><div class='del'>- * At the initialization the driver allocates one bridge table entry for</div><div class='del'>- * each switch port which is used when the port is used without an</div><div class='del'>- * explicit bridge. This prevents the frames from being forwarded</div><div class='del'>- * between all LAN ports by default.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/firmware.h&gt;</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-#include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;linux/iopoll.h&gt;</div><div class='del'>-#include &lt;linux/mfd/syscon.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/phylink.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='del'>-#include &lt;linux/reset.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-#include &lt;dt-bindings/mips/lantiq_rcu_gphy.h&gt;</div><div class='del'>-</div><div class='del'>-#include "lantiq_pce.h"</div><div class='del'>-</div><div class='del'>-/* GSWIP MDIO Registers */</div><div class='del'>-#define GSWIP_MDIO_GLOB			0x00</div><div class='del'>-#define  GSWIP_MDIO_GLOB_ENABLE		BIT(15)</div><div class='del'>-#define GSWIP_MDIO_CTRL			0x08</div><div class='del'>-#define  GSWIP_MDIO_CTRL_BUSY		BIT(12)</div><div class='del'>-#define  GSWIP_MDIO_CTRL_RD		BIT(11)</div><div class='del'>-#define  GSWIP_MDIO_CTRL_WR		BIT(10)</div><div class='del'>-#define  GSWIP_MDIO_CTRL_PHYAD_MASK	0x1f</div><div class='del'>-#define  GSWIP_MDIO_CTRL_PHYAD_SHIFT	5</div><div class='del'>-#define  GSWIP_MDIO_CTRL_REGAD_MASK	0x1f</div><div class='del'>-#define GSWIP_MDIO_READ			0x09</div><div class='del'>-#define GSWIP_MDIO_WRITE		0x0A</div><div class='del'>-#define GSWIP_MDIO_MDC_CFG0		0x0B</div><div class='del'>-#define GSWIP_MDIO_MDC_CFG1		0x0C</div><div class='del'>-#define GSWIP_MDIO_PHYp(p)		(0x15 - (p))</div><div class='del'>-#define  GSWIP_MDIO_PHY_LINK_MASK	0x6000</div><div class='del'>-#define  GSWIP_MDIO_PHY_LINK_AUTO	0x0000</div><div class='del'>-#define  GSWIP_MDIO_PHY_LINK_DOWN	0x4000</div><div class='del'>-#define  GSWIP_MDIO_PHY_LINK_UP		0x2000</div><div class='del'>-#define  GSWIP_MDIO_PHY_SPEED_MASK	0x1800</div><div class='del'>-#define  GSWIP_MDIO_PHY_SPEED_AUTO	0x1800</div><div class='del'>-#define  GSWIP_MDIO_PHY_SPEED_M10	0x0000</div><div class='del'>-#define  GSWIP_MDIO_PHY_SPEED_M100	0x0800</div><div class='del'>-#define  GSWIP_MDIO_PHY_SPEED_G1	0x1000</div><div class='del'>-#define  GSWIP_MDIO_PHY_FDUP_MASK	0x0600</div><div class='del'>-#define  GSWIP_MDIO_PHY_FDUP_AUTO	0x0000</div><div class='del'>-#define  GSWIP_MDIO_PHY_FDUP_EN		0x0200</div><div class='del'>-#define  GSWIP_MDIO_PHY_FDUP_DIS	0x0600</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONTX_MASK	0x0180</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONTX_AUTO	0x0000</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONTX_EN	0x0100</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONTX_DIS	0x0180</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONRX_MASK	0x0060</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONRX_AUTO	0x0000</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONRX_EN	0x0020</div><div class='del'>-#define  GSWIP_MDIO_PHY_FCONRX_DIS	0x0060</div><div class='del'>-#define  GSWIP_MDIO_PHY_ADDR_MASK	0x001f</div><div class='del'>-#define  GSWIP_MDIO_PHY_MASK		(GSWIP_MDIO_PHY_ADDR_MASK | \</div><div class='del'>-					 GSWIP_MDIO_PHY_FCONRX_MASK | \</div><div class='del'>-					 GSWIP_MDIO_PHY_FCONTX_MASK | \</div><div class='del'>-					 GSWIP_MDIO_PHY_LINK_MASK | \</div><div class='del'>-					 GSWIP_MDIO_PHY_SPEED_MASK | \</div><div class='del'>-					 GSWIP_MDIO_PHY_FDUP_MASK)</div><div class='del'>-</div><div class='del'>-/* GSWIP MII Registers */</div><div class='del'>-#define GSWIP_MII_CFG0			0x00</div><div class='del'>-#define GSWIP_MII_CFG1			0x02</div><div class='del'>-#define GSWIP_MII_CFG5			0x04</div><div class='del'>-#define  GSWIP_MII_CFG_EN		BIT(14)</div><div class='del'>-#define  GSWIP_MII_CFG_LDCLKDIS		BIT(12)</div><div class='del'>-#define  GSWIP_MII_CFG_MODE_MIIP	0x0</div><div class='del'>-#define  GSWIP_MII_CFG_MODE_MIIM	0x1</div><div class='del'>-#define  GSWIP_MII_CFG_MODE_RMIIP	0x2</div><div class='del'>-#define  GSWIP_MII_CFG_MODE_RMIIM	0x3</div><div class='del'>-#define  GSWIP_MII_CFG_MODE_RGMII	0x4</div><div class='del'>-#define  GSWIP_MII_CFG_MODE_MASK	0xf</div><div class='del'>-#define  GSWIP_MII_CFG_RATE_M2P5	0x00</div><div class='del'>-#define  GSWIP_MII_CFG_RATE_M25	0x10</div><div class='del'>-#define  GSWIP_MII_CFG_RATE_M125	0x20</div><div class='del'>-#define  GSWIP_MII_CFG_RATE_M50	0x30</div><div class='del'>-#define  GSWIP_MII_CFG_RATE_AUTO	0x40</div><div class='del'>-#define  GSWIP_MII_CFG_RATE_MASK	0x70</div><div class='del'>-#define GSWIP_MII_PCDU0			0x01</div><div class='del'>-#define GSWIP_MII_PCDU1			0x03</div><div class='del'>-#define GSWIP_MII_PCDU5			0x05</div><div class='del'>-#define  GSWIP_MII_PCDU_TXDLY_MASK	GENMASK(2, 0)</div><div class='del'>-#define  GSWIP_MII_PCDU_RXDLY_MASK	GENMASK(9, 7)</div><div class='del'>-</div><div class='del'>-/* GSWIP Core Registers */</div><div class='del'>-#define GSWIP_SWRES			0x000</div><div class='del'>-#define  GSWIP_SWRES_R1			BIT(1)	/* GSWIP Software reset */</div><div class='del'>-#define  GSWIP_SWRES_R0			BIT(0)	/* GSWIP Hardware reset */</div><div class='del'>-#define GSWIP_VERSION			0x013</div><div class='del'>-#define  GSWIP_VERSION_REV_SHIFT	0</div><div class='del'>-#define  GSWIP_VERSION_REV_MASK		GENMASK(7, 0)</div><div class='del'>-#define  GSWIP_VERSION_MOD_SHIFT	8</div><div class='del'>-#define  GSWIP_VERSION_MOD_MASK		GENMASK(15, 8)</div><div class='del'>-#define   GSWIP_VERSION_2_0		0x100</div><div class='del'>-#define   GSWIP_VERSION_2_1		0x021</div><div class='del'>-#define   GSWIP_VERSION_2_2		0x122</div><div class='del'>-#define   GSWIP_VERSION_2_2_ETC		0x022</div><div class='del'>-</div><div class='del'>-#define GSWIP_BM_RAM_VAL(x)		(0x043 - (x))</div><div class='del'>-#define GSWIP_BM_RAM_ADDR		0x044</div><div class='del'>-#define GSWIP_BM_RAM_CTRL		0x045</div><div class='del'>-#define  GSWIP_BM_RAM_CTRL_BAS		BIT(15)</div><div class='del'>-#define  GSWIP_BM_RAM_CTRL_OPMOD	BIT(5)</div><div class='del'>-#define  GSWIP_BM_RAM_CTRL_ADDR_MASK	GENMASK(4, 0)</div><div class='del'>-#define GSWIP_BM_QUEUE_GCTRL		0x04A</div><div class='del'>-#define  GSWIP_BM_QUEUE_GCTRL_GL_MOD	BIT(10)</div><div class='del'>-/* buffer management Port Configuration Register */</div><div class='del'>-#define GSWIP_BM_PCFGp(p)		(0x080 + ((p) * 2))</div><div class='del'>-#define  GSWIP_BM_PCFG_CNTEN		BIT(0)	/* RMON Counter Enable */</div><div class='del'>-#define  GSWIP_BM_PCFG_IGCNT		BIT(1)	/* Ingres Special Tag RMON count */</div><div class='del'>-/* buffer management Port Control Register */</div><div class='del'>-#define GSWIP_BM_RMON_CTRLp(p)		(0x81 + ((p) * 2))</div><div class='del'>-#define  GSWIP_BM_CTRL_RMON_RAM1_RES	BIT(0)	/* Software Reset for RMON RAM 1 */</div><div class='del'>-#define  GSWIP_BM_CTRL_RMON_RAM2_RES	BIT(1)	/* Software Reset for RMON RAM 2 */</div><div class='del'>-</div><div class='del'>-/* PCE */</div><div class='del'>-#define GSWIP_PCE_TBL_KEY(x)		(0x447 - (x))</div><div class='del'>-#define GSWIP_PCE_TBL_MASK		0x448</div><div class='del'>-#define GSWIP_PCE_TBL_VAL(x)		(0x44D - (x))</div><div class='del'>-#define GSWIP_PCE_TBL_ADDR		0x44E</div><div class='del'>-#define GSWIP_PCE_TBL_CTRL		0x44F</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_BAS		BIT(15)</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_TYPE	BIT(13)</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_VLD		BIT(12)</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_KEYFORM	BIT(11)</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_GMAP_MASK	GENMASK(10, 7)</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_OPMOD_MASK	GENMASK(6, 5)</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_OPMOD_ADRD	0x00</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_OPMOD_ADWR	0x20</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_OPMOD_KSRD	0x40</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_OPMOD_KSWR	0x60</div><div class='del'>-#define  GSWIP_PCE_TBL_CTRL_ADDR_MASK	GENMASK(4, 0)</div><div class='del'>-#define GSWIP_PCE_PMAP1			0x453	/* Monitoring port map */</div><div class='del'>-#define GSWIP_PCE_PMAP2			0x454	/* Default Multicast port map */</div><div class='del'>-#define GSWIP_PCE_PMAP3			0x455	/* Default Unknown Unicast port map */</div><div class='del'>-#define GSWIP_PCE_GCTRL_0		0x456</div><div class='del'>-#define  GSWIP_PCE_GCTRL_0_MTFL		BIT(0)  /* MAC Table Flushing */</div><div class='del'>-#define  GSWIP_PCE_GCTRL_0_MC_VALID	BIT(3)</div><div class='del'>-#define  GSWIP_PCE_GCTRL_0_VLAN		BIT(14) /* VLAN aware Switching */</div><div class='del'>-#define GSWIP_PCE_GCTRL_1		0x457</div><div class='del'>-#define  GSWIP_PCE_GCTRL_1_MAC_GLOCK	BIT(2)	/* MAC Address table lock */</div><div class='del'>-#define  GSWIP_PCE_GCTRL_1_MAC_GLOCK_MOD	BIT(3) /* Mac address table lock forwarding mode */</div><div class='del'>-#define GSWIP_PCE_PCTRL_0p(p)		(0x480 + ((p) * 0xA))</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_TVM		BIT(5)	/* Transparent VLAN mode */</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_VREP		BIT(6)	/* VLAN Replace Mode */</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_INGRESS	BIT(11)	/* Accept special tag in ingress */</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_PSTATE_LISTEN	0x0</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_PSTATE_RX		0x1</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_PSTATE_TX		0x2</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_PSTATE_LEARNING	0x3</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_PSTATE_FORWARDING	0x7</div><div class='del'>-#define  GSWIP_PCE_PCTRL_0_PSTATE_MASK	GENMASK(2, 0)</div><div class='del'>-#define GSWIP_PCE_VCTRL(p)		(0x485 + ((p) * 0xA))</div><div class='del'>-#define  GSWIP_PCE_VCTRL_UVR		BIT(0)	/* Unknown VLAN Rule */</div><div class='del'>-#define  GSWIP_PCE_VCTRL_VIMR		BIT(3)	/* VLAN Ingress Member violation rule */</div><div class='del'>-#define  GSWIP_PCE_VCTRL_VEMR		BIT(4)	/* VLAN Egress Member violation rule */</div><div class='del'>-#define  GSWIP_PCE_VCTRL_VSR		BIT(5)	/* VLAN Security */</div><div class='del'>-#define  GSWIP_PCE_VCTRL_VID0		BIT(6)	/* Priority Tagged Rule */</div><div class='del'>-#define GSWIP_PCE_DEFPVID(p)		(0x486 + ((p) * 0xA))</div><div class='del'>-</div><div class='del'>-#define GSWIP_MAC_FLEN			0x8C5</div><div class='del'>-#define GSWIP_MAC_CTRL_2p(p)		(0x905 + ((p) * 0xC))</div><div class='del'>-#define GSWIP_MAC_CTRL_2_MLEN		BIT(3) /* Maximum Untagged Frame Lnegth */</div><div class='del'>-</div><div class='del'>-/* Ethernet Switch Fetch DMA Port Control Register */</div><div class='del'>-#define GSWIP_FDMA_PCTRLp(p)		(0xA80 + ((p) * 0x6))</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_EN		BIT(0)	/* FDMA Port Enable */</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_STEN		BIT(1)	/* Special Tag Insertion Enable */</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_VLANMOD_MASK	GENMASK(4, 3)	/* VLAN Modification Control */</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_VLANMOD_SHIFT	3	/* VLAN Modification Control */</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_VLANMOD_DIS	(0x0 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_VLANMOD_PRIO	(0x1 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_VLANMOD_ID	(0x2 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='del'>-#define  GSWIP_FDMA_PCTRL_VLANMOD_BOTH	(0x3 &lt;&lt; GSWIP_FDMA_PCTRL_VLANMOD_SHIFT)</div><div class='del'>-</div><div class='del'>-/* Ethernet Switch Store DMA Port Control Register */</div><div class='del'>-#define GSWIP_SDMA_PCTRLp(p)		(0xBC0 + ((p) * 0x6))</div><div class='del'>-#define  GSWIP_SDMA_PCTRL_EN		BIT(0)	/* SDMA Port Enable */</div><div class='del'>-#define  GSWIP_SDMA_PCTRL_FCEN		BIT(1)	/* Flow Control Enable */</div><div class='del'>-#define  GSWIP_SDMA_PCTRL_PAUFWD	BIT(1)	/* Pause Frame Forwarding */</div><div class='del'>-</div><div class='del'>-#define GSWIP_TABLE_ACTIVE_VLAN		0x01</div><div class='del'>-#define GSWIP_TABLE_VLAN_MAPPING	0x02</div><div class='del'>-#define GSWIP_TABLE_MAC_BRIDGE		0x0b</div><div class='del'>-#define  GSWIP_TABLE_MAC_BRIDGE_STATIC	0x01	/* Static not, aging entry */</div><div class='del'>-</div><div class='del'>-#define XRX200_GPHY_FW_ALIGN	(16 * 1024)</div><div class='del'>-</div><div class='del'>-struct gswip_hw_info {</div><div class='del'>-	int max_ports;</div><div class='del'>-	int cpu_port;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct xway_gphy_match_data {</div><div class='del'>-	char *fe_firmware_name;</div><div class='del'>-	char *ge_firmware_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gswip_gphy_fw {</div><div class='del'>-	struct clk *clk_gate;</div><div class='del'>-	struct reset_control *reset;</div><div class='del'>-	u32 fw_addr_offset;</div><div class='del'>-	char *fw_name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gswip_vlan {</div><div class='del'>-	struct net_device *bridge;</div><div class='del'>-	u16 vid;</div><div class='del'>-	u8 fid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gswip_priv {</div><div class='del'>-	__iomem void *gswip;</div><div class='del'>-	__iomem void *mdio;</div><div class='del'>-	__iomem void *mii;</div><div class='del'>-	const struct gswip_hw_info *hw_info;</div><div class='del'>-	const struct xway_gphy_match_data *gphy_fw_name_cfg;</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct regmap *rcu_regmap;</div><div class='del'>-	struct gswip_vlan vlans[64];</div><div class='del'>-	int num_gphy_fw;</div><div class='del'>-	struct gswip_gphy_fw *gphy_fw;</div><div class='del'>-	u32 port_vlan_filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gswip_pce_table_entry {</div><div class='del'>-	u16 index;      // PCE_TBL_ADDR.ADDR = pData-&gt;table_index</div><div class='del'>-	u16 table;      // PCE_TBL_CTRL.ADDR = pData-&gt;table</div><div class='del'>-	u16 key[8];</div><div class='del'>-	u16 val[5];</div><div class='del'>-	u16 mask;</div><div class='del'>-	u8 gmap;</div><div class='del'>-	bool type;</div><div class='del'>-	bool valid;</div><div class='del'>-	bool key_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct gswip_rmon_cnt_desc {</div><div class='del'>-	unsigned int size;</div><div class='del'>-	unsigned int offset;</div><div class='del'>-	const char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MIB_DESC(_size, _offset, _name) {.size = _size, .offset = _offset, .name = _name}</div><div class='del'>-</div><div class='del'>-static const struct gswip_rmon_cnt_desc gswip_rmon_cnt[] = {</div><div class='del'>-	/** Receive Packet Count (only packets that are accepted and not discarded). */</div><div class='del'>-	MIB_DESC(1, 0x1F, "RxGoodPkts"),</div><div class='del'>-	MIB_DESC(1, 0x23, "RxUnicastPkts"),</div><div class='del'>-	MIB_DESC(1, 0x22, "RxMulticastPkts"),</div><div class='del'>-	MIB_DESC(1, 0x21, "RxFCSErrorPkts"),</div><div class='del'>-	MIB_DESC(1, 0x1D, "RxUnderSizeGoodPkts"),</div><div class='del'>-	MIB_DESC(1, 0x1E, "RxUnderSizeErrorPkts"),</div><div class='del'>-	MIB_DESC(1, 0x1B, "RxOversizeGoodPkts"),</div><div class='del'>-	MIB_DESC(1, 0x1C, "RxOversizeErrorPkts"),</div><div class='del'>-	MIB_DESC(1, 0x20, "RxGoodPausePkts"),</div><div class='del'>-	MIB_DESC(1, 0x1A, "RxAlignErrorPkts"),</div><div class='del'>-	MIB_DESC(1, 0x12, "Rx64BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x13, "Rx127BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x14, "Rx255BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x15, "Rx511BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x16, "Rx1023BytePkts"),</div><div class='del'>-	/** Receive Size 1024-1522 (or more, if configured) Packet Count. */</div><div class='del'>-	MIB_DESC(1, 0x17, "RxMaxBytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x18, "RxDroppedPkts"),</div><div class='del'>-	MIB_DESC(1, 0x19, "RxFilteredPkts"),</div><div class='del'>-	MIB_DESC(2, 0x24, "RxGoodBytes"),</div><div class='del'>-	MIB_DESC(2, 0x26, "RxBadBytes"),</div><div class='del'>-	MIB_DESC(1, 0x11, "TxAcmDroppedPkts"),</div><div class='del'>-	MIB_DESC(1, 0x0C, "TxGoodPkts"),</div><div class='del'>-	MIB_DESC(1, 0x06, "TxUnicastPkts"),</div><div class='del'>-	MIB_DESC(1, 0x07, "TxMulticastPkts"),</div><div class='del'>-	MIB_DESC(1, 0x00, "Tx64BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x01, "Tx127BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x02, "Tx255BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x03, "Tx511BytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x04, "Tx1023BytePkts"),</div><div class='del'>-	/** Transmit Size 1024-1522 (or more, if configured) Packet Count. */</div><div class='del'>-	MIB_DESC(1, 0x05, "TxMaxBytePkts"),</div><div class='del'>-	MIB_DESC(1, 0x08, "TxSingleCollCount"),</div><div class='del'>-	MIB_DESC(1, 0x09, "TxMultCollCount"),</div><div class='del'>-	MIB_DESC(1, 0x0A, "TxLateCollCount"),</div><div class='del'>-	MIB_DESC(1, 0x0B, "TxExcessCollCount"),</div><div class='del'>-	MIB_DESC(1, 0x0D, "TxPauseCount"),</div><div class='del'>-	MIB_DESC(1, 0x10, "TxDroppedPkts"),</div><div class='del'>-	MIB_DESC(2, 0x0E, "TxGoodBytes"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 gswip_switch_r(struct gswip_priv *priv, u32 offset)</div><div class='del'>-{</div><div class='del'>-	return __raw_readl(priv-&gt;gswip + (offset * 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_switch_w(struct gswip_priv *priv, u32 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(val, priv-&gt;gswip + (offset * 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_switch_mask(struct gswip_priv *priv, u32 clear, u32 set,</div><div class='del'>-			      u32 offset)</div><div class='del'>-{</div><div class='del'>-	u32 val = gswip_switch_r(priv, offset);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~(clear);</div><div class='del'>-	val |= set;</div><div class='del'>-	gswip_switch_w(priv, val, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset,</div><div class='del'>-				  u32 cleared)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	return readx_poll_timeout(__raw_readl, priv-&gt;gswip + (offset * 4), val,</div><div class='del'>-				  (val &amp; cleared) == 0, 20, 50000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 gswip_mdio_r(struct gswip_priv *priv, u32 offset)</div><div class='del'>-{</div><div class='del'>-	return __raw_readl(priv-&gt;mdio + (offset * 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_mdio_w(struct gswip_priv *priv, u32 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(val, priv-&gt;mdio + (offset * 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_mdio_mask(struct gswip_priv *priv, u32 clear, u32 set,</div><div class='del'>-			    u32 offset)</div><div class='del'>-{</div><div class='del'>-	u32 val = gswip_mdio_r(priv, offset);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~(clear);</div><div class='del'>-	val |= set;</div><div class='del'>-	gswip_mdio_w(priv, val, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 gswip_mii_r(struct gswip_priv *priv, u32 offset)</div><div class='del'>-{</div><div class='del'>-	return __raw_readl(priv-&gt;mii + (offset * 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_mii_w(struct gswip_priv *priv, u32 val, u32 offset)</div><div class='del'>-{</div><div class='del'>-	__raw_writel(val, priv-&gt;mii + (offset * 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_mii_mask(struct gswip_priv *priv, u32 clear, u32 set,</div><div class='del'>-			   u32 offset)</div><div class='del'>-{</div><div class='del'>-	u32 val = gswip_mii_r(priv, offset);</div><div class='del'>-</div><div class='del'>-	val &amp;= ~(clear);</div><div class='del'>-	val |= set;</div><div class='del'>-	gswip_mii_w(priv, val, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 clear, u32 set,</div><div class='del'>-			       int port)</div><div class='del'>-{</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 0:</div><div class='del'>-		gswip_mii_mask(priv, clear, set, GSWIP_MII_CFG0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		gswip_mii_mask(priv, clear, set, GSWIP_MII_CFG1);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		gswip_mii_mask(priv, clear, set, GSWIP_MII_CFG5);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,</div><div class='del'>-				int port)</div><div class='del'>-{</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 0:</div><div class='del'>-		gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU1);</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU5);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_mdio_poll(struct gswip_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int cnt = 100;</div><div class='del'>-</div><div class='del'>-	while (likely(cnt--)) {</div><div class='del'>-		u32 ctrl = gswip_mdio_r(priv, GSWIP_MDIO_CTRL);</div><div class='del'>-</div><div class='del'>-		if ((ctrl &amp; GSWIP_MDIO_CTRL_BUSY) == 0)</div><div class='del'>-			return 0;</div><div class='del'>-		usleep_range(20, 40);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_mdio_wr(struct mii_bus *bus, int addr, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = bus-&gt;priv;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = gswip_mdio_poll(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;bus-&gt;dev, "waiting for MDIO bus busy timed out\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gswip_mdio_w(priv, val, GSWIP_MDIO_WRITE);</div><div class='del'>-	gswip_mdio_w(priv, GSWIP_MDIO_CTRL_BUSY | GSWIP_MDIO_CTRL_WR |</div><div class='del'>-		((addr &amp; GSWIP_MDIO_CTRL_PHYAD_MASK) &lt;&lt; GSWIP_MDIO_CTRL_PHYAD_SHIFT) |</div><div class='del'>-		(reg &amp; GSWIP_MDIO_CTRL_REGAD_MASK),</div><div class='del'>-		GSWIP_MDIO_CTRL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = bus-&gt;priv;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = gswip_mdio_poll(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;bus-&gt;dev, "waiting for MDIO bus busy timed out\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gswip_mdio_w(priv, GSWIP_MDIO_CTRL_BUSY | GSWIP_MDIO_CTRL_RD |</div><div class='del'>-		((addr &amp; GSWIP_MDIO_CTRL_PHYAD_MASK) &lt;&lt; GSWIP_MDIO_CTRL_PHYAD_SHIFT) |</div><div class='del'>-		(reg &amp; GSWIP_MDIO_CTRL_REGAD_MASK),</div><div class='del'>-		GSWIP_MDIO_CTRL);</div><div class='del'>-</div><div class='del'>-	err = gswip_mdio_poll(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;bus-&gt;dev, "waiting for MDIO bus busy timed out\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return gswip_mdio_r(priv, GSWIP_MDIO_READ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_mdio(struct gswip_priv *priv, struct device_node *mdio_np)</div><div class='del'>-{</div><div class='del'>-	struct dsa_switch *ds = priv-&gt;ds;</div><div class='del'>-</div><div class='del'>-	ds-&gt;slave_mii_bus = devm_mdiobus_alloc(priv-&gt;dev);</div><div class='del'>-	if (!ds-&gt;slave_mii_bus)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;priv = priv;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;read = gswip_mdio_rd;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;write = gswip_mdio_wr;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;name = "lantiq,xrx200-mdio";</div><div class='del'>-	snprintf(ds-&gt;slave_mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-mii",</div><div class='del'>-		 dev_name(priv-&gt;dev));</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;parent = priv-&gt;dev;</div><div class='del'>-	ds-&gt;slave_mii_bus-&gt;phy_mask = ~ds-&gt;phys_mii_mask;</div><div class='del'>-</div><div class='del'>-	return of_mdiobus_register(ds-&gt;slave_mii_bus, mdio_np);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_pce_table_entry_read(struct gswip_priv *priv,</div><div class='del'>-				      struct gswip_pce_table_entry *tbl)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-	u16 crtl;</div><div class='del'>-	u16 addr_mode = tbl-&gt;key_mode ? GSWIP_PCE_TBL_CTRL_OPMOD_KSRD :</div><div class='del'>-					GSWIP_PCE_TBL_CTRL_OPMOD_ADRD;</div><div class='del'>-</div><div class='del'>-	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='del'>-				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	gswip_switch_w(priv, tbl-&gt;index, GSWIP_PCE_TBL_ADDR);</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='del'>-				GSWIP_PCE_TBL_CTRL_OPMOD_MASK,</div><div class='del'>-			  tbl-&gt;table | addr_mode | GSWIP_PCE_TBL_CTRL_BAS,</div><div class='del'>-			  GSWIP_PCE_TBL_CTRL);</div><div class='del'>-</div><div class='del'>-	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='del'>-				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;key); i++)</div><div class='del'>-		tbl-&gt;key[i] = gswip_switch_r(priv, GSWIP_PCE_TBL_KEY(i));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;val); i++)</div><div class='del'>-		tbl-&gt;val[i] = gswip_switch_r(priv, GSWIP_PCE_TBL_VAL(i));</div><div class='del'>-</div><div class='del'>-	tbl-&gt;mask = gswip_switch_r(priv, GSWIP_PCE_TBL_MASK);</div><div class='del'>-</div><div class='del'>-	crtl = gswip_switch_r(priv, GSWIP_PCE_TBL_CTRL);</div><div class='del'>-</div><div class='del'>-	tbl-&gt;type = !!(crtl &amp; GSWIP_PCE_TBL_CTRL_TYPE);</div><div class='del'>-	tbl-&gt;valid = !!(crtl &amp; GSWIP_PCE_TBL_CTRL_VLD);</div><div class='del'>-	tbl-&gt;gmap = (crtl &amp; GSWIP_PCE_TBL_CTRL_GMAP_MASK) &gt;&gt; 7;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_pce_table_entry_write(struct gswip_priv *priv,</div><div class='del'>-				       struct gswip_pce_table_entry *tbl)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-	u16 crtl;</div><div class='del'>-	u16 addr_mode = tbl-&gt;key_mode ? GSWIP_PCE_TBL_CTRL_OPMOD_KSWR :</div><div class='del'>-					GSWIP_PCE_TBL_CTRL_OPMOD_ADWR;</div><div class='del'>-</div><div class='del'>-	err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='del'>-				     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	gswip_switch_w(priv, tbl-&gt;index, GSWIP_PCE_TBL_ADDR);</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='del'>-				GSWIP_PCE_TBL_CTRL_OPMOD_MASK,</div><div class='del'>-			  tbl-&gt;table | addr_mode,</div><div class='del'>-			  GSWIP_PCE_TBL_CTRL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;key); i++)</div><div class='del'>-		gswip_switch_w(priv, tbl-&gt;key[i], GSWIP_PCE_TBL_KEY(i));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(tbl-&gt;val); i++)</div><div class='del'>-		gswip_switch_w(priv, tbl-&gt;val[i], GSWIP_PCE_TBL_VAL(i));</div><div class='del'>-</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='del'>-				GSWIP_PCE_TBL_CTRL_OPMOD_MASK,</div><div class='del'>-			  tbl-&gt;table | addr_mode,</div><div class='del'>-			  GSWIP_PCE_TBL_CTRL);</div><div class='del'>-</div><div class='del'>-	gswip_switch_w(priv, tbl-&gt;mask, GSWIP_PCE_TBL_MASK);</div><div class='del'>-</div><div class='del'>-	crtl = gswip_switch_r(priv, GSWIP_PCE_TBL_CTRL);</div><div class='del'>-	crtl &amp;= ~(GSWIP_PCE_TBL_CTRL_TYPE | GSWIP_PCE_TBL_CTRL_VLD |</div><div class='del'>-		  GSWIP_PCE_TBL_CTRL_GMAP_MASK);</div><div class='del'>-	if (tbl-&gt;type)</div><div class='del'>-		crtl |= GSWIP_PCE_TBL_CTRL_TYPE;</div><div class='del'>-	if (tbl-&gt;valid)</div><div class='del'>-		crtl |= GSWIP_PCE_TBL_CTRL_VLD;</div><div class='del'>-	crtl |= (tbl-&gt;gmap &lt;&lt; 7) &amp; GSWIP_PCE_TBL_CTRL_GMAP_MASK;</div><div class='del'>-	crtl |= GSWIP_PCE_TBL_CTRL_BAS;</div><div class='del'>-	gswip_switch_w(priv, crtl, GSWIP_PCE_TBL_CTRL);</div><div class='del'>-</div><div class='del'>-	return gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='del'>-				      GSWIP_PCE_TBL_CTRL_BAS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add the LAN port into a bridge with the CPU port by</div><div class='del'>- * default. This prevents automatic forwarding of</div><div class='del'>- * packages between the LAN ports when no explicit</div><div class='del'>- * bridge is configured.</div><div class='del'>- */</div><div class='del'>-static int gswip_add_single_port_br(struct gswip_priv *priv, int port, bool add)</div><div class='del'>-{</div><div class='del'>-	struct gswip_pce_table_entry vlan_active = {0,};</div><div class='del'>-	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='del'>-	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='del'>-	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (port &gt;= max_ports) {</div><div class='del'>-		dev_err(priv-&gt;dev, "single port for %i supported\n", port);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vlan_active.index = port + 1;</div><div class='del'>-	vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;</div><div class='del'>-	vlan_active.key[0] = 0; /* vid */</div><div class='del'>-	vlan_active.val[0] = port + 1 /* fid */;</div><div class='del'>-	vlan_active.valid = add;</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_active);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write active VLAN: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!add)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	vlan_mapping.index = port + 1;</div><div class='del'>-	vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='del'>-	vlan_mapping.val[0] = 0 /* vid */;</div><div class='del'>-	vlan_mapping.val[1] = BIT(port) | BIT(cpu_port);</div><div class='del'>-	vlan_mapping.val[2] = 0;</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_enable(struct dsa_switch *ds, int port,</div><div class='del'>-			     struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!dsa_is_cpu_port(ds, port)) {</div><div class='del'>-		err = gswip_add_single_port_br(priv, port, true);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* RMON Counter Enable for port */</div><div class='del'>-	gswip_switch_w(priv, GSWIP_BM_PCFG_CNTEN, GSWIP_BM_PCFGp(port));</div><div class='del'>-</div><div class='del'>-	/* enable port fetch/store dma &amp; VLAN Modification */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_EN |</div><div class='del'>-				   GSWIP_FDMA_PCTRL_VLANMOD_BOTH,</div><div class='del'>-			 GSWIP_FDMA_PCTRLp(port));</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,</div><div class='del'>-			  GSWIP_SDMA_PCTRLp(port));</div><div class='del'>-</div><div class='del'>-	if (!dsa_is_cpu_port(ds, port)) {</div><div class='del'>-		u32 macconf = GSWIP_MDIO_PHY_LINK_AUTO |</div><div class='del'>-			      GSWIP_MDIO_PHY_SPEED_AUTO |</div><div class='del'>-			      GSWIP_MDIO_PHY_FDUP_AUTO |</div><div class='del'>-			      GSWIP_MDIO_PHY_FCONTX_AUTO |</div><div class='del'>-			      GSWIP_MDIO_PHY_FCONRX_AUTO |</div><div class='del'>-			      (phydev-&gt;mdio.addr &amp; GSWIP_MDIO_PHY_ADDR_MASK);</div><div class='del'>-</div><div class='del'>-		gswip_mdio_w(priv, macconf, GSWIP_MDIO_PHYp(port));</div><div class='del'>-		/* Activate MDIO auto polling */</div><div class='del'>-		gswip_mdio_mask(priv, 0, BIT(port), GSWIP_MDIO_MDC_CFG0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_port_disable(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!dsa_is_cpu_port(ds, port)) {</div><div class='del'>-		gswip_mdio_mask(priv, GSWIP_MDIO_PHY_LINK_DOWN,</div><div class='del'>-				GSWIP_MDIO_PHY_LINK_MASK,</div><div class='del'>-				GSWIP_MDIO_PHYp(port));</div><div class='del'>-		/* Deactivate MDIO auto polling */</div><div class='del'>-		gswip_mdio_mask(priv, BIT(port), 0, GSWIP_MDIO_MDC_CFG0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_FDMA_PCTRL_EN, 0,</div><div class='del'>-			  GSWIP_FDMA_PCTRLp(port));</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,</div><div class='del'>-			  GSWIP_SDMA_PCTRLp(port));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_pce_load_microcode(struct gswip_priv *priv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |</div><div class='del'>-				GSWIP_PCE_TBL_CTRL_OPMOD_MASK,</div><div class='del'>-			  GSWIP_PCE_TBL_CTRL_OPMOD_ADWR, GSWIP_PCE_TBL_CTRL);</div><div class='del'>-	gswip_switch_w(priv, 0, GSWIP_PCE_TBL_MASK);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(gswip_pce_microcode); i++) {</div><div class='del'>-		gswip_switch_w(priv, i, GSWIP_PCE_TBL_ADDR);</div><div class='del'>-		gswip_switch_w(priv, gswip_pce_microcode[i].val_0,</div><div class='del'>-			       GSWIP_PCE_TBL_VAL(0));</div><div class='del'>-		gswip_switch_w(priv, gswip_pce_microcode[i].val_1,</div><div class='del'>-			       GSWIP_PCE_TBL_VAL(1));</div><div class='del'>-		gswip_switch_w(priv, gswip_pce_microcode[i].val_2,</div><div class='del'>-			       GSWIP_PCE_TBL_VAL(2));</div><div class='del'>-		gswip_switch_w(priv, gswip_pce_microcode[i].val_3,</div><div class='del'>-			       GSWIP_PCE_TBL_VAL(3));</div><div class='del'>-</div><div class='del'>-		/* start the table access: */</div><div class='del'>-		gswip_switch_mask(priv, 0, GSWIP_PCE_TBL_CTRL_BAS,</div><div class='del'>-				  GSWIP_PCE_TBL_CTRL);</div><div class='del'>-		err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,</div><div class='del'>-					     GSWIP_PCE_TBL_CTRL_BAS);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* tell the switch that the microcode is loaded */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_MC_VALID,</div><div class='del'>-			  GSWIP_PCE_GCTRL_0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='del'>-				     bool vlan_filtering)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='del'>-</div><div class='del'>-	/* Do not allow changing the VLAN filtering options while in bridge */</div><div class='del'>-	if (!!(priv-&gt;port_vlan_filter &amp; BIT(port)) != vlan_filtering &amp;&amp; bridge)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (vlan_filtering) {</div><div class='del'>-		/* Use port based VLAN tag */</div><div class='del'>-		gswip_switch_mask(priv,</div><div class='del'>-				  GSWIP_PCE_VCTRL_VSR,</div><div class='del'>-				  GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |</div><div class='del'>-				  GSWIP_PCE_VCTRL_VEMR,</div><div class='del'>-				  GSWIP_PCE_VCTRL(port));</div><div class='del'>-		gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_TVM, 0,</div><div class='del'>-				  GSWIP_PCE_PCTRL_0p(port));</div><div class='del'>-	} else {</div><div class='del'>-		/* Use port based VLAN tag */</div><div class='del'>-		gswip_switch_mask(priv,</div><div class='del'>-				  GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |</div><div class='del'>-				  GSWIP_PCE_VCTRL_VEMR,</div><div class='del'>-				  GSWIP_PCE_VCTRL_VSR,</div><div class='del'>-				  GSWIP_PCE_VCTRL(port));</div><div class='del'>-		gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_TVM,</div><div class='del'>-				  GSWIP_PCE_PCTRL_0p(port));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_setup(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	gswip_switch_w(priv, GSWIP_SWRES_R0, GSWIP_SWRES);</div><div class='del'>-	usleep_range(5000, 10000);</div><div class='del'>-	gswip_switch_w(priv, 0, GSWIP_SWRES);</div><div class='del'>-</div><div class='del'>-	/* disable port fetch/store dma on all ports */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_info-&gt;max_ports; i++) {</div><div class='del'>-		gswip_port_disable(ds, i);</div><div class='del'>-		gswip_port_vlan_filtering(ds, i, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* enable Switch */</div><div class='del'>-	gswip_mdio_mask(priv, 0, GSWIP_MDIO_GLOB_ENABLE, GSWIP_MDIO_GLOB);</div><div class='del'>-</div><div class='del'>-	err = gswip_pce_load_microcode(priv);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "writing PCE microcode failed, %i", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Default unknown Broadcast/Multicast/Unicast port maps */</div><div class='del'>-	gswip_switch_w(priv, BIT(cpu_port), GSWIP_PCE_PMAP1);</div><div class='del'>-	gswip_switch_w(priv, BIT(cpu_port), GSWIP_PCE_PMAP2);</div><div class='del'>-	gswip_switch_w(priv, BIT(cpu_port), GSWIP_PCE_PMAP3);</div><div class='del'>-</div><div class='del'>-	/* disable PHY auto polling */</div><div class='del'>-	gswip_mdio_w(priv, 0x0, GSWIP_MDIO_MDC_CFG0);</div><div class='del'>-	/* Configure the MDIO Clock 2.5 MHz */</div><div class='del'>-	gswip_mdio_mask(priv, 0xff, 0x09, GSWIP_MDIO_MDC_CFG1);</div><div class='del'>-</div><div class='del'>-	/* Disable the xMII link */</div><div class='del'>-	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, 0);</div><div class='del'>-	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, 1);</div><div class='del'>-	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, 5);</div><div class='del'>-</div><div class='del'>-	/* enable special tag insertion on cpu port */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,</div><div class='del'>-			  GSWIP_FDMA_PCTRLp(cpu_port));</div><div class='del'>-</div><div class='del'>-	/* accept special tag in ingress direction */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_INGRESS,</div><div class='del'>-			  GSWIP_PCE_PCTRL_0p(cpu_port));</div><div class='del'>-</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_MAC_CTRL_2_MLEN,</div><div class='del'>-			  GSWIP_MAC_CTRL_2p(cpu_port));</div><div class='del'>-	gswip_switch_w(priv, VLAN_ETH_FRAME_LEN + 8, GSWIP_MAC_FLEN);</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_BM_QUEUE_GCTRL_GL_MOD,</div><div class='del'>-			  GSWIP_BM_QUEUE_GCTRL);</div><div class='del'>-</div><div class='del'>-	/* VLAN aware Switching */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_VLAN, GSWIP_PCE_GCTRL_0);</div><div class='del'>-</div><div class='del'>-	/* Flush MAC Table */</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_MTFL, GSWIP_PCE_GCTRL_0);</div><div class='del'>-</div><div class='del'>-	err = gswip_switch_r_timeout(priv, GSWIP_PCE_GCTRL_0,</div><div class='del'>-				     GSWIP_PCE_GCTRL_0_MTFL);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "MAC flushing didn't finish\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gswip_port_enable(ds, cpu_port, NULL);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum dsa_tag_protocol gswip_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-						    int port)</div><div class='del'>-{</div><div class='del'>-	return DSA_TAG_PROTO_GSWIP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_vlan_active_create(struct gswip_priv *priv,</div><div class='del'>-				    struct net_device *bridge,</div><div class='del'>-				    int fid, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct gswip_pce_table_entry vlan_active = {0,};</div><div class='del'>-	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='del'>-	int idx = -1;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Look for a free slot */</div><div class='del'>-	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='del'>-		if (!priv-&gt;vlans[i].bridge) {</div><div class='del'>-			idx = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idx == -1)</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-</div><div class='del'>-	if (fid == -1)</div><div class='del'>-		fid = idx;</div><div class='del'>-</div><div class='del'>-	vlan_active.index = idx;</div><div class='del'>-	vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;</div><div class='del'>-	vlan_active.key[0] = vid;</div><div class='del'>-	vlan_active.val[0] = fid;</div><div class='del'>-	vlan_active.valid = true;</div><div class='del'>-</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_active);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write active VLAN: %d\n",	err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;vlans[idx].bridge = bridge;</div><div class='del'>-	priv-&gt;vlans[idx].vid = vid;</div><div class='del'>-	priv-&gt;vlans[idx].fid = fid;</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_vlan_active_remove(struct gswip_priv *priv, int idx)</div><div class='del'>-{</div><div class='del'>-	struct gswip_pce_table_entry vlan_active = {0,};</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	vlan_active.index = idx;</div><div class='del'>-	vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;</div><div class='del'>-	vlan_active.valid = false;</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_active);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to delete active VLAN: %d\n", err);</div><div class='del'>-	priv-&gt;vlans[idx].bridge = NULL;</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_vlan_add_unaware(struct gswip_priv *priv,</div><div class='del'>-				  struct net_device *bridge, int port)</div><div class='del'>-{</div><div class='del'>-	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='del'>-	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='del'>-	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='del'>-	bool active_vlan_created = false;</div><div class='del'>-	int idx = -1;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Check if there is already a page for this bridge */</div><div class='del'>-	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='del'>-		if (priv-&gt;vlans[i].bridge == bridge) {</div><div class='del'>-			idx = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If this bridge is not programmed yet, add a Active VLAN table</div><div class='del'>-	 * entry in a free slot and prepare the VLAN mapping table entry.</div><div class='del'>-	 */</div><div class='del'>-	if (idx == -1) {</div><div class='del'>-		idx = gswip_vlan_active_create(priv, bridge, -1, 0);</div><div class='del'>-		if (idx &lt; 0)</div><div class='del'>-			return idx;</div><div class='del'>-		active_vlan_created = true;</div><div class='del'>-</div><div class='del'>-		vlan_mapping.index = idx;</div><div class='del'>-		vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='del'>-		/* VLAN ID byte, maps to the VLAN ID of vlan active table */</div><div class='del'>-		vlan_mapping.val[0] = 0;</div><div class='del'>-	} else {</div><div class='del'>-		/* Read the existing VLAN mapping entry from the switch */</div><div class='del'>-		vlan_mapping.index = idx;</div><div class='del'>-		vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='del'>-		err = gswip_pce_table_entry_read(priv, &amp;vlan_mapping);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(priv-&gt;dev, "failed to read VLAN mapping: %d\n",</div><div class='del'>-				err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the VLAN mapping entry and write it to the switch */</div><div class='del'>-	vlan_mapping.val[1] |= BIT(cpu_port);</div><div class='del'>-	vlan_mapping.val[1] |= BIT(port);</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='del'>-		/* In case an Active VLAN was creaetd delete it again */</div><div class='del'>-		if (active_vlan_created)</div><div class='del'>-			gswip_vlan_active_remove(priv, idx);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gswip_switch_w(priv, 0, GSWIP_PCE_DEFPVID(port));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_vlan_add_aware(struct gswip_priv *priv,</div><div class='del'>-				struct net_device *bridge, int port,</div><div class='del'>-				u16 vid, bool untagged,</div><div class='del'>-				bool pvid)</div><div class='del'>-{</div><div class='del'>-	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='del'>-	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='del'>-	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='del'>-	bool active_vlan_created = false;</div><div class='del'>-	int idx = -1;</div><div class='del'>-	int fid = -1;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Check if there is already a page for this bridge */</div><div class='del'>-	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='del'>-		if (priv-&gt;vlans[i].bridge == bridge) {</div><div class='del'>-			if (fid != -1 &amp;&amp; fid != priv-&gt;vlans[i].fid)</div><div class='del'>-				dev_err(priv-&gt;dev, "one bridge with multiple flow ids\n");</div><div class='del'>-			fid = priv-&gt;vlans[i].fid;</div><div class='del'>-			if (priv-&gt;vlans[i].vid == vid) {</div><div class='del'>-				idx = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If this bridge is not programmed yet, add a Active VLAN table</div><div class='del'>-	 * entry in a free slot and prepare the VLAN mapping table entry.</div><div class='del'>-	 */</div><div class='del'>-	if (idx == -1) {</div><div class='del'>-		idx = gswip_vlan_active_create(priv, bridge, fid, vid);</div><div class='del'>-		if (idx &lt; 0)</div><div class='del'>-			return idx;</div><div class='del'>-		active_vlan_created = true;</div><div class='del'>-</div><div class='del'>-		vlan_mapping.index = idx;</div><div class='del'>-		vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='del'>-		/* VLAN ID byte, maps to the VLAN ID of vlan active table */</div><div class='del'>-		vlan_mapping.val[0] = vid;</div><div class='del'>-	} else {</div><div class='del'>-		/* Read the existing VLAN mapping entry from the switch */</div><div class='del'>-		vlan_mapping.index = idx;</div><div class='del'>-		vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='del'>-		err = gswip_pce_table_entry_read(priv, &amp;vlan_mapping);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(priv-&gt;dev, "failed to read VLAN mapping: %d\n",</div><div class='del'>-				err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vlan_mapping.val[0] = vid;</div><div class='del'>-	/* Update the VLAN mapping entry and write it to the switch */</div><div class='del'>-	vlan_mapping.val[1] |= BIT(cpu_port);</div><div class='del'>-	vlan_mapping.val[2] |= BIT(cpu_port);</div><div class='del'>-	vlan_mapping.val[1] |= BIT(port);</div><div class='del'>-	if (untagged)</div><div class='del'>-		vlan_mapping.val[2] &amp;= ~BIT(port);</div><div class='del'>-	else</div><div class='del'>-		vlan_mapping.val[2] |= BIT(port);</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='del'>-		/* In case an Active VLAN was creaetd delete it again */</div><div class='del'>-		if (active_vlan_created)</div><div class='del'>-			gswip_vlan_active_remove(priv, idx);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pvid)</div><div class='del'>-		gswip_switch_w(priv, idx, GSWIP_PCE_DEFPVID(port));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_vlan_remove(struct gswip_priv *priv,</div><div class='del'>-			     struct net_device *bridge, int port,</div><div class='del'>-			     u16 vid, bool pvid, bool vlan_aware)</div><div class='del'>-{</div><div class='del'>-	struct gswip_pce_table_entry vlan_mapping = {0,};</div><div class='del'>-	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='del'>-	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='del'>-	int idx = -1;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Check if there is already a page for this bridge */</div><div class='del'>-	for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='del'>-		if (priv-&gt;vlans[i].bridge == bridge &amp;&amp;</div><div class='del'>-		    (!vlan_aware || priv-&gt;vlans[i].vid == vid)) {</div><div class='del'>-			idx = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idx == -1) {</div><div class='del'>-		dev_err(priv-&gt;dev, "bridge to leave does not exists\n");</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vlan_mapping.index = idx;</div><div class='del'>-	vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;</div><div class='del'>-	err = gswip_pce_table_entry_read(priv, &amp;vlan_mapping);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to read VLAN mapping: %d\n",	err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vlan_mapping.val[1] &amp;= ~BIT(port);</div><div class='del'>-	vlan_mapping.val[2] &amp;= ~BIT(port);</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;vlan_mapping);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write VLAN mapping: %d\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* In case all ports are removed from the bridge, remove the VLAN */</div><div class='del'>-	if ((vlan_mapping.val[1] &amp; ~BIT(cpu_port)) == 0) {</div><div class='del'>-		err = gswip_vlan_active_remove(priv, idx);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(priv-&gt;dev, "failed to write active VLAN: %d\n",</div><div class='del'>-				err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* GSWIP 2.2 (GRX300) and later program here the VID directly. */</div><div class='del'>-	if (pvid)</div><div class='del'>-		gswip_switch_w(priv, 0, GSWIP_PCE_DEFPVID(port));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-				  struct net_device *bridge)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* When the bridge uses VLAN filtering we have to configure VLAN</div><div class='del'>-	 * specific bridges. No bridge is configured here.</div><div class='del'>-	 */</div><div class='del'>-	if (!br_vlan_enabled(bridge)) {</div><div class='del'>-		err = gswip_vlan_add_unaware(priv, bridge, port);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-		priv-&gt;port_vlan_filter &amp;= ~BIT(port);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;port_vlan_filter |= BIT(port);</div><div class='del'>-	}</div><div class='del'>-	return gswip_add_single_port_br(priv, port, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-				    struct net_device *bridge)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gswip_add_single_port_br(priv, port, true);</div><div class='del'>-</div><div class='del'>-	/* When the bridge uses VLAN filtering we have to configure VLAN</div><div class='del'>-	 * specific bridges. No bridge is configured here.</div><div class='del'>-	 */</div><div class='del'>-	if (!br_vlan_enabled(bridge))</div><div class='del'>-		gswip_vlan_remove(priv, bridge, port, 0, true, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-				   const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='del'>-	unsigned int max_ports = priv-&gt;hw_info-&gt;max_ports;</div><div class='del'>-	u16 vid;</div><div class='del'>-	int i;</div><div class='del'>-	int pos = max_ports;</div><div class='del'>-</div><div class='del'>-	/* We only support VLAN filtering on bridges */</div><div class='del'>-	if (!dsa_is_cpu_port(ds, port) &amp;&amp; !bridge)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		int idx = -1;</div><div class='del'>-</div><div class='del'>-		/* Check if there is already a page for this VLAN */</div><div class='del'>-		for (i = max_ports; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='del'>-			if (priv-&gt;vlans[i].bridge == bridge &amp;&amp;</div><div class='del'>-			    priv-&gt;vlans[i].vid == vid) {</div><div class='del'>-				idx = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If this VLAN is not programmed yet, we have to reserve</div><div class='del'>-		 * one entry in the VLAN table. Make sure we start at the</div><div class='del'>-		 * next position round.</div><div class='del'>-		 */</div><div class='del'>-		if (idx == -1) {</div><div class='del'>-			/* Look for a free slot */</div><div class='del'>-			for (; pos &lt; ARRAY_SIZE(priv-&gt;vlans); pos++) {</div><div class='del'>-				if (!priv-&gt;vlans[pos].bridge) {</div><div class='del'>-					idx = pos;</div><div class='del'>-					pos++;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (idx == -1)</div><div class='del'>-				return -ENOSPC;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-				const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='del'>-	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='del'>-	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='del'>-	u16 vid;</div><div class='del'>-</div><div class='del'>-	/* We have to receive all packets on the CPU port and should not</div><div class='del'>-	 * do any VLAN filtering here. This is also called with bridge</div><div class='del'>-	 * NULL and then we do not know for which bridge to configure</div><div class='del'>-	 * this.</div><div class='del'>-	 */</div><div class='del'>-	if (dsa_is_cpu_port(ds, port))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid)</div><div class='del'>-		gswip_vlan_add_aware(priv, bridge, port, vid, untagged, pvid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='del'>-			       const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='del'>-	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='del'>-	u16 vid;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* We have to receive all packets on the CPU port and should not</div><div class='del'>-	 * do any VLAN filtering here. This is also called with bridge</div><div class='del'>-	 * NULL and then we do not know for which bridge to configure</div><div class='del'>-	 * this.</div><div class='del'>-	 */</div><div class='del'>-	if (dsa_is_cpu_port(ds, port))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		err = gswip_vlan_remove(priv, bridge, port, vid, pvid, true);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_port_fast_age(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2048; i++) {</div><div class='del'>-		mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;</div><div class='del'>-		mac_bridge.index = i;</div><div class='del'>-</div><div class='del'>-		err = gswip_pce_table_entry_read(priv, &amp;mac_bridge);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(priv-&gt;dev, "failed to read mac bridge: %d\n",</div><div class='del'>-				err);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!mac_bridge.valid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (mac_bridge.val[1] &amp; GSWIP_TABLE_MAC_BRIDGE_STATIC)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (((mac_bridge.val[0] &amp; GENMASK(7, 4)) &gt;&gt; 4) != port)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		mac_bridge.valid = false;</div><div class='del'>-		err = gswip_pce_table_entry_write(priv, &amp;mac_bridge);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(priv-&gt;dev, "failed to write mac bridge: %d\n",</div><div class='del'>-				err);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	u32 stp_state;</div><div class='del'>-</div><div class='del'>-	switch (state) {</div><div class='del'>-	case BR_STATE_DISABLED:</div><div class='del'>-		gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,</div><div class='del'>-				  GSWIP_SDMA_PCTRLp(port));</div><div class='del'>-		return;</div><div class='del'>-	case BR_STATE_BLOCKING:</div><div class='del'>-	case BR_STATE_LISTENING:</div><div class='del'>-		stp_state = GSWIP_PCE_PCTRL_0_PSTATE_LISTEN;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_LEARNING:</div><div class='del'>-		stp_state = GSWIP_PCE_PCTRL_0_PSTATE_LEARNING;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_FORWARDING:</div><div class='del'>-		stp_state = GSWIP_PCE_PCTRL_0_PSTATE_FORWARDING;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(priv-&gt;dev, "invalid STP state: %d\n", state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,</div><div class='del'>-			  GSWIP_SDMA_PCTRLp(port));</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_PSTATE_MASK, stp_state,</div><div class='del'>-			  GSWIP_PCE_PCTRL_0p(port));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_fdb(struct dsa_switch *ds, int port,</div><div class='del'>-			  const unsigned char *addr, u16 vid, bool add)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct net_device *bridge = dsa_to_port(ds, port)-&gt;bridge_dev;</div><div class='del'>-	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='del'>-	unsigned int cpu_port = priv-&gt;hw_info-&gt;cpu_port;</div><div class='del'>-	int fid = -1;</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!bridge)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = cpu_port; i &lt; ARRAY_SIZE(priv-&gt;vlans); i++) {</div><div class='del'>-		if (priv-&gt;vlans[i].bridge == bridge) {</div><div class='del'>-			fid = priv-&gt;vlans[i].fid;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fid == -1) {</div><div class='del'>-		dev_err(priv-&gt;dev, "Port not part of a bridge\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;</div><div class='del'>-	mac_bridge.key_mode = true;</div><div class='del'>-	mac_bridge.key[0] = addr[5] | (addr[4] &lt;&lt; 8);</div><div class='del'>-	mac_bridge.key[1] = addr[3] | (addr[2] &lt;&lt; 8);</div><div class='del'>-	mac_bridge.key[2] = addr[1] | (addr[0] &lt;&lt; 8);</div><div class='del'>-	mac_bridge.key[3] = fid;</div><div class='del'>-	mac_bridge.val[0] = add ? BIT(port) : 0; /* port map */</div><div class='del'>-	mac_bridge.val[1] = GSWIP_TABLE_MAC_BRIDGE_STATIC;</div><div class='del'>-	mac_bridge.valid = add;</div><div class='del'>-</div><div class='del'>-	err = gswip_pce_table_entry_write(priv, &amp;mac_bridge);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(priv-&gt;dev, "failed to write mac bridge: %d\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-			      const unsigned char *addr, u16 vid)</div><div class='del'>-{</div><div class='del'>-	return gswip_port_fdb(ds, port, addr, vid, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-			      const unsigned char *addr, u16 vid)</div><div class='del'>-{</div><div class='del'>-	return gswip_port_fdb(ds, port, addr, vid, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='del'>-			       dsa_fdb_dump_cb_t *cb, void *data)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	struct gswip_pce_table_entry mac_bridge = {0,};</div><div class='del'>-	unsigned char addr[6];</div><div class='del'>-	int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2048; i++) {</div><div class='del'>-		mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;</div><div class='del'>-		mac_bridge.index = i;</div><div class='del'>-</div><div class='del'>-		err = gswip_pce_table_entry_read(priv, &amp;mac_bridge);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(priv-&gt;dev, "failed to write mac bridge: %d\n",</div><div class='del'>-				err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!mac_bridge.valid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		addr[5] = mac_bridge.key[0] &amp; 0xff;</div><div class='del'>-		addr[4] = (mac_bridge.key[0] &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		addr[3] = mac_bridge.key[1] &amp; 0xff;</div><div class='del'>-		addr[2] = (mac_bridge.key[1] &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		addr[1] = mac_bridge.key[2] &amp; 0xff;</div><div class='del'>-		addr[0] = (mac_bridge.key[2] &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-		if (mac_bridge.val[1] &amp; GSWIP_TABLE_MAC_BRIDGE_STATIC) {</div><div class='del'>-			if (mac_bridge.val[0] &amp; BIT(port))</div><div class='del'>-				cb(addr, 0, true, data);</div><div class='del'>-		} else {</div><div class='del'>-			if (((mac_bridge.val[0] &amp; GENMASK(7, 4)) &gt;&gt; 4) == port)</div><div class='del'>-				cb(addr, 0, false, data);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_phylink_validate(struct dsa_switch *ds, int port,</div><div class='del'>-				   unsigned long *supported,</div><div class='del'>-				   struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='del'>-</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 0:</div><div class='del'>-	case 1:</div><div class='del'>-		if (!phy_interface_mode_is_rgmii(state-&gt;interface) &amp;&amp;</div><div class='del'>-		    state-&gt;interface != PHY_INTERFACE_MODE_MII &amp;&amp;</div><div class='del'>-		    state-&gt;interface != PHY_INTERFACE_MODE_REVMII &amp;&amp;</div><div class='del'>-		    state-&gt;interface != PHY_INTERFACE_MODE_RMII)</div><div class='del'>-			goto unsupported;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-	case 3:</div><div class='del'>-	case 4:</div><div class='del'>-		if (state-&gt;interface != PHY_INTERFACE_MODE_INTERNAL)</div><div class='del'>-			goto unsupported;</div><div class='del'>-		break;</div><div class='del'>-	case 5:</div><div class='del'>-		if (!phy_interface_mode_is_rgmii(state-&gt;interface) &amp;&amp;</div><div class='del'>-		    state-&gt;interface != PHY_INTERFACE_MODE_INTERNAL)</div><div class='del'>-			goto unsupported;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-		dev_err(ds-&gt;dev, "Unsupported port: %i\n", port);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Allow all the expected bits */</div><div class='del'>-	phylink_set(mask, Autoneg);</div><div class='del'>-	phylink_set_port_modes(mask);</div><div class='del'>-	phylink_set(mask, Pause);</div><div class='del'>-	phylink_set(mask, Asym_Pause);</div><div class='del'>-</div><div class='del'>-	/* With the exclusion of MII and Reverse MII, we support Gigabit,</div><div class='del'>-	 * including Half duplex</div><div class='del'>-	 */</div><div class='del'>-	if (state-&gt;interface != PHY_INTERFACE_MODE_MII &amp;&amp;</div><div class='del'>-	    state-&gt;interface != PHY_INTERFACE_MODE_REVMII) {</div><div class='del'>-		phylink_set(mask, 1000baseT_Full);</div><div class='del'>-		phylink_set(mask, 1000baseT_Half);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	phylink_set(mask, 10baseT_Half);</div><div class='del'>-	phylink_set(mask, 10baseT_Full);</div><div class='del'>-	phylink_set(mask, 100baseT_Half);</div><div class='del'>-	phylink_set(mask, 100baseT_Full);</div><div class='del'>-</div><div class='del'>-	bitmap_and(supported, supported, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	bitmap_and(state-&gt;advertising, state-&gt;advertising, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-unsupported:</div><div class='del'>-	bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	dev_err(ds-&gt;dev, "Unsupported interface: %d\n", state-&gt;interface);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_phylink_mac_config(struct dsa_switch *ds, int port,</div><div class='del'>-				     unsigned int mode,</div><div class='del'>-				     const struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	u32 miicfg = 0;</div><div class='del'>-</div><div class='del'>-	miicfg |= GSWIP_MII_CFG_LDCLKDIS;</div><div class='del'>-</div><div class='del'>-	switch (state-&gt;interface) {</div><div class='del'>-	case PHY_INTERFACE_MODE_MII:</div><div class='del'>-	case PHY_INTERFACE_MODE_INTERNAL:</div><div class='del'>-		miicfg |= GSWIP_MII_CFG_MODE_MIIM;</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_REVMII:</div><div class='del'>-		miicfg |= GSWIP_MII_CFG_MODE_MIIP;</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_RMII:</div><div class='del'>-		miicfg |= GSWIP_MII_CFG_MODE_RMIIM;</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII:</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='del'>-		miicfg |= GSWIP_MII_CFG_MODE_RGMII;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(ds-&gt;dev,</div><div class='del'>-			"Unsupported interface: %d\n", state-&gt;interface);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_MODE_MASK, miicfg, port);</div><div class='del'>-</div><div class='del'>-	switch (state-&gt;interface) {</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='del'>-		gswip_mii_mask_pcdu(priv, GSWIP_MII_PCDU_TXDLY_MASK |</div><div class='del'>-					  GSWIP_MII_PCDU_RXDLY_MASK, 0, port);</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='del'>-		gswip_mii_mask_pcdu(priv, GSWIP_MII_PCDU_RXDLY_MASK, 0, port);</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='del'>-		gswip_mii_mask_pcdu(priv, GSWIP_MII_PCDU_TXDLY_MASK, 0, port);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_phylink_mac_link_down(struct dsa_switch *ds, int port,</div><div class='del'>-					unsigned int mode,</div><div class='del'>-					phy_interface_t interface)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port,</div><div class='del'>-				      unsigned int mode,</div><div class='del'>-				      phy_interface_t interface,</div><div class='del'>-				      struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Enable the xMII interface only for the external PHY */</div><div class='del'>-	if (interface != PHY_INTERFACE_MODE_INTERNAL)</div><div class='del'>-		gswip_mii_mask_cfg(priv, 0, GSWIP_MII_CFG_EN, port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='del'>-			      uint8_t *data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (stringset != ETH_SS_STATS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(gswip_rmon_cnt); i++)</div><div class='del'>-		strncpy(data + i * ETH_GSTRING_LEN, gswip_rmon_cnt[i].name,</div><div class='del'>-			ETH_GSTRING_LEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,</div><div class='del'>-				    u32 index)</div><div class='del'>-{</div><div class='del'>-	u32 result;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	gswip_switch_w(priv, index, GSWIP_BM_RAM_ADDR);</div><div class='del'>-	gswip_switch_mask(priv, GSWIP_BM_RAM_CTRL_ADDR_MASK |</div><div class='del'>-				GSWIP_BM_RAM_CTRL_OPMOD,</div><div class='del'>-			      table | GSWIP_BM_RAM_CTRL_BAS,</div><div class='del'>-			      GSWIP_BM_RAM_CTRL);</div><div class='del'>-</div><div class='del'>-	err = gswip_switch_r_timeout(priv, GSWIP_BM_RAM_CTRL,</div><div class='del'>-				     GSWIP_BM_RAM_CTRL_BAS);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "timeout while reading table: %u, index: %u",</div><div class='del'>-			table, index);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gswip_switch_r(priv, GSWIP_BM_RAM_VAL(0));</div><div class='del'>-	result |= gswip_switch_r(priv, GSWIP_BM_RAM_VAL(1)) &lt;&lt; 16;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='del'>-				    uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = ds-&gt;priv;</div><div class='del'>-	const struct gswip_rmon_cnt_desc *rmon_cnt;</div><div class='del'>-	int i;</div><div class='del'>-	u64 high;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(gswip_rmon_cnt); i++) {</div><div class='del'>-		rmon_cnt = &amp;gswip_rmon_cnt[i];</div><div class='del'>-</div><div class='del'>-		data[i] = gswip_bcm_ram_entry_read(priv, port,</div><div class='del'>-						   rmon_cnt-&gt;offset);</div><div class='del'>-		if (rmon_cnt-&gt;size == 2) {</div><div class='del'>-			high = gswip_bcm_ram_entry_read(priv, port,</div><div class='del'>-							rmon_cnt-&gt;offset + 1);</div><div class='del'>-			data[i] |= high &lt;&lt; 32;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='del'>-{</div><div class='del'>-	if (sset != ETH_SS_STATS)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return ARRAY_SIZE(gswip_rmon_cnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct dsa_switch_ops gswip_switch_ops = {</div><div class='del'>-	.get_tag_protocol	= gswip_get_tag_protocol,</div><div class='del'>-	.setup			= gswip_setup,</div><div class='del'>-	.port_enable		= gswip_port_enable,</div><div class='del'>-	.port_disable		= gswip_port_disable,</div><div class='del'>-	.port_bridge_join	= gswip_port_bridge_join,</div><div class='del'>-	.port_bridge_leave	= gswip_port_bridge_leave,</div><div class='del'>-	.port_fast_age		= gswip_port_fast_age,</div><div class='del'>-	.port_vlan_filtering	= gswip_port_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= gswip_port_vlan_prepare,</div><div class='del'>-	.port_vlan_add		= gswip_port_vlan_add,</div><div class='del'>-	.port_vlan_del		= gswip_port_vlan_del,</div><div class='del'>-	.port_stp_state_set	= gswip_port_stp_state_set,</div><div class='del'>-	.port_fdb_add		= gswip_port_fdb_add,</div><div class='del'>-	.port_fdb_del		= gswip_port_fdb_del,</div><div class='del'>-	.port_fdb_dump		= gswip_port_fdb_dump,</div><div class='del'>-	.phylink_validate	= gswip_phylink_validate,</div><div class='del'>-	.phylink_mac_config	= gswip_phylink_mac_config,</div><div class='del'>-	.phylink_mac_link_down	= gswip_phylink_mac_link_down,</div><div class='del'>-	.phylink_mac_link_up	= gswip_phylink_mac_link_up,</div><div class='del'>-	.get_strings		= gswip_get_strings,</div><div class='del'>-	.get_ethtool_stats	= gswip_get_ethtool_stats,</div><div class='del'>-	.get_sset_count		= gswip_get_sset_count,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct xway_gphy_match_data xrx200a1x_gphy_data = {</div><div class='del'>-	.fe_firmware_name = "lantiq/xrx200_phy22f_a14.bin",</div><div class='del'>-	.ge_firmware_name = "lantiq/xrx200_phy11g_a14.bin",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct xway_gphy_match_data xrx200a2x_gphy_data = {</div><div class='del'>-	.fe_firmware_name = "lantiq/xrx200_phy22f_a22.bin",</div><div class='del'>-	.ge_firmware_name = "lantiq/xrx200_phy11g_a22.bin",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct xway_gphy_match_data xrx300_gphy_data = {</div><div class='del'>-	.fe_firmware_name = "lantiq/xrx300_phy22f_a21.bin",</div><div class='del'>-	.ge_firmware_name = "lantiq/xrx300_phy11g_a21.bin",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct of_device_id xway_gphy_match[] = {</div><div class='del'>-	{ .compatible = "lantiq,xrx200-gphy-fw", .data = NULL },</div><div class='del'>-	{ .compatible = "lantiq,xrx200a1x-gphy-fw", .data = &amp;xrx200a1x_gphy_data },</div><div class='del'>-	{ .compatible = "lantiq,xrx200a2x-gphy-fw", .data = &amp;xrx200a2x_gphy_data },</div><div class='del'>-	{ .compatible = "lantiq,xrx300-gphy-fw", .data = &amp;xrx300_gphy_data },</div><div class='del'>-	{ .compatible = "lantiq,xrx330-gphy-fw", .data = &amp;xrx300_gphy_data },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gphy_fw)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	void *fw_addr;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-	dma_addr_t dev_addr;</div><div class='del'>-	size_t size;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = clk_prepare_enable(gphy_fw-&gt;clk_gate);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	reset_control_assert(gphy_fw-&gt;reset);</div><div class='del'>-</div><div class='del'>-	ret = request_firmware(&amp;fw, gphy_fw-&gt;fw_name, dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "failed to load firmware: %s, error: %i\n",</div><div class='del'>-			gphy_fw-&gt;fw_name, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* GPHY cores need the firmware code in a persistent and contiguous</div><div class='del'>-	 * memory area with a 16 kB boundary aligned start address.</div><div class='del'>-	 */</div><div class='del'>-	size = fw-&gt;size + XRX200_GPHY_FW_ALIGN;</div><div class='del'>-</div><div class='del'>-	fw_addr = dmam_alloc_coherent(dev, size, &amp;dma_addr, GFP_KERNEL);</div><div class='del'>-	if (fw_addr) {</div><div class='del'>-		fw_addr = PTR_ALIGN(fw_addr, XRX200_GPHY_FW_ALIGN);</div><div class='del'>-		dev_addr = ALIGN(dma_addr, XRX200_GPHY_FW_ALIGN);</div><div class='del'>-		memcpy(fw_addr, fw-&gt;data, fw-&gt;size);</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(dev, "failed to alloc firmware memory\n");</div><div class='del'>-		release_firmware(fw);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(priv-&gt;rcu_regmap, gphy_fw-&gt;fw_addr_offset, dev_addr);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	reset_control_deassert(gphy_fw-&gt;reset);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_gphy_fw_probe(struct gswip_priv *priv,</div><div class='del'>-			       struct gswip_gphy_fw *gphy_fw,</div><div class='del'>-			       struct device_node *gphy_fw_np, int i)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	u32 gphy_mode;</div><div class='del'>-	int ret;</div><div class='del'>-	char gphyname[10];</div><div class='del'>-</div><div class='del'>-	snprintf(gphyname, sizeof(gphyname), "gphy%d", i);</div><div class='del'>-</div><div class='del'>-	gphy_fw-&gt;clk_gate = devm_clk_get(dev, gphyname);</div><div class='del'>-	if (IS_ERR(gphy_fw-&gt;clk_gate)) {</div><div class='del'>-		dev_err(dev, "Failed to lookup gate clock\n");</div><div class='del'>-		return PTR_ERR(gphy_fw-&gt;clk_gate);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = of_property_read_u32(gphy_fw_np, "reg", &amp;gphy_fw-&gt;fw_addr_offset);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = of_property_read_u32(gphy_fw_np, "lantiq,gphy-mode", &amp;gphy_mode);</div><div class='del'>-	/* Default to GE mode */</div><div class='del'>-	if (ret)</div><div class='del'>-		gphy_mode = GPHY_MODE_GE;</div><div class='del'>-</div><div class='del'>-	switch (gphy_mode) {</div><div class='del'>-	case GPHY_MODE_FE:</div><div class='del'>-		gphy_fw-&gt;fw_name = priv-&gt;gphy_fw_name_cfg-&gt;fe_firmware_name;</div><div class='del'>-		break;</div><div class='del'>-	case GPHY_MODE_GE:</div><div class='del'>-		gphy_fw-&gt;fw_name = priv-&gt;gphy_fw_name_cfg-&gt;ge_firmware_name;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(dev, "Unknown GPHY mode %d\n", gphy_mode);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gphy_fw-&gt;reset = of_reset_control_array_get_exclusive(gphy_fw_np);</div><div class='del'>-	if (IS_ERR(gphy_fw-&gt;reset)) {</div><div class='del'>-		if (PTR_ERR(gphy_fw-&gt;reset) != -EPROBE_DEFER)</div><div class='del'>-			dev_err(dev, "Failed to lookup gphy reset\n");</div><div class='del'>-		return PTR_ERR(gphy_fw-&gt;reset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return gswip_gphy_fw_load(priv, gphy_fw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void gswip_gphy_fw_remove(struct gswip_priv *priv,</div><div class='del'>-				 struct gswip_gphy_fw *gphy_fw)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* check if the device was fully probed */</div><div class='del'>-	if (!gphy_fw-&gt;fw_name)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(priv-&gt;rcu_regmap, gphy_fw-&gt;fw_addr_offset, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(priv-&gt;dev, "can not reset GPHY FW pointer");</div><div class='del'>-</div><div class='del'>-	clk_disable_unprepare(gphy_fw-&gt;clk_gate);</div><div class='del'>-</div><div class='del'>-	reset_control_put(gphy_fw-&gt;reset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_gphy_fw_list(struct gswip_priv *priv,</div><div class='del'>-			      struct device_node *gphy_fw_list_np, u32 version)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = priv-&gt;dev;</div><div class='del'>-	struct device_node *gphy_fw_np;</div><div class='del'>-	const struct of_device_id *match;</div><div class='del'>-	int err;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	/* The VRX200 rev 1.1 uses the GSWIP 2.0 and needs the older</div><div class='del'>-	 * GPHY firmware. The VRX200 rev 1.2 uses the GSWIP 2.1 and also</div><div class='del'>-	 * needs a different GPHY firmware.</div><div class='del'>-	 */</div><div class='del'>-	if (of_device_is_compatible(gphy_fw_list_np, "lantiq,xrx200-gphy-fw")) {</div><div class='del'>-		switch (version) {</div><div class='del'>-		case GSWIP_VERSION_2_0:</div><div class='del'>-			priv-&gt;gphy_fw_name_cfg = &amp;xrx200a1x_gphy_data;</div><div class='del'>-			break;</div><div class='del'>-		case GSWIP_VERSION_2_1:</div><div class='del'>-			priv-&gt;gphy_fw_name_cfg = &amp;xrx200a2x_gphy_data;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dev_err(dev, "unknown GSWIP version: 0x%x", version);</div><div class='del'>-			return -ENOENT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	match = of_match_node(xway_gphy_match, gphy_fw_list_np);</div><div class='del'>-	if (match &amp;&amp; match-&gt;data)</div><div class='del'>-		priv-&gt;gphy_fw_name_cfg = match-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;gphy_fw_name_cfg) {</div><div class='del'>-		dev_err(dev, "GPHY compatible type not supported");</div><div class='del'>-		return -ENOENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;num_gphy_fw = of_get_available_child_count(gphy_fw_list_np);</div><div class='del'>-	if (!priv-&gt;num_gphy_fw)</div><div class='del'>-		return -ENOENT;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rcu_regmap = syscon_regmap_lookup_by_phandle(gphy_fw_list_np,</div><div class='del'>-							   "lantiq,rcu");</div><div class='del'>-	if (IS_ERR(priv-&gt;rcu_regmap))</div><div class='del'>-		return PTR_ERR(priv-&gt;rcu_regmap);</div><div class='del'>-</div><div class='del'>-	priv-&gt;gphy_fw = devm_kmalloc_array(dev, priv-&gt;num_gphy_fw,</div><div class='del'>-					   sizeof(*priv-&gt;gphy_fw),</div><div class='del'>-					   GFP_KERNEL | __GFP_ZERO);</div><div class='del'>-	if (!priv-&gt;gphy_fw)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for_each_available_child_of_node(gphy_fw_list_np, gphy_fw_np) {</div><div class='del'>-		err = gswip_gphy_fw_probe(priv, &amp;priv-&gt;gphy_fw[i],</div><div class='del'>-					  gphy_fw_np, i);</div><div class='del'>-		if (err)</div><div class='del'>-			goto remove_gphy;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-remove_gphy:</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_gphy_fw; i++)</div><div class='del'>-		gswip_gphy_fw_remove(priv, &amp;priv-&gt;gphy_fw[i]);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv;</div><div class='del'>-	struct resource *gswip_res, *mdio_res, *mii_res;</div><div class='del'>-	struct device_node *mdio_np, *gphy_fw_np;</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	int err;</div><div class='del'>-	int i;</div><div class='del'>-	u32 version;</div><div class='del'>-</div><div class='del'>-	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	gswip_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	priv-&gt;gswip = devm_ioremap_resource(dev, gswip_res);</div><div class='del'>-	if (IS_ERR(priv-&gt;gswip))</div><div class='del'>-		return PTR_ERR(priv-&gt;gswip);</div><div class='del'>-</div><div class='del'>-	mdio_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	priv-&gt;mdio = devm_ioremap_resource(dev, mdio_res);</div><div class='del'>-	if (IS_ERR(priv-&gt;mdio))</div><div class='del'>-		return PTR_ERR(priv-&gt;mdio);</div><div class='del'>-</div><div class='del'>-	mii_res = platform_get_resource(pdev, IORESOURCE_MEM, 2);</div><div class='del'>-	priv-&gt;mii = devm_ioremap_resource(dev, mii_res);</div><div class='del'>-	if (IS_ERR(priv-&gt;mii))</div><div class='del'>-		return PTR_ERR(priv-&gt;mii);</div><div class='del'>-</div><div class='del'>-	priv-&gt;hw_info = of_device_get_match_data(dev);</div><div class='del'>-	if (!priv-&gt;hw_info)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ds = dsa_switch_alloc(dev, priv-&gt;hw_info-&gt;max_ports);</div><div class='del'>-	if (!priv-&gt;ds)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ds-&gt;priv = priv;</div><div class='del'>-	priv-&gt;ds-&gt;ops = &amp;gswip_switch_ops;</div><div class='del'>-	priv-&gt;dev = dev;</div><div class='del'>-	version = gswip_switch_r(priv, GSWIP_VERSION);</div><div class='del'>-</div><div class='del'>-	/* bring up the mdio bus */</div><div class='del'>-	gphy_fw_np = of_get_compatible_child(dev-&gt;of_node, "lantiq,gphy-fw");</div><div class='del'>-	if (gphy_fw_np) {</div><div class='del'>-		err = gswip_gphy_fw_list(priv, gphy_fw_np, version);</div><div class='del'>-		of_node_put(gphy_fw_np);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "gphy fw probe failed\n");</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* bring up the mdio bus */</div><div class='del'>-	mdio_np = of_get_compatible_child(dev-&gt;of_node, "lantiq,xrx200-mdio");</div><div class='del'>-	if (mdio_np) {</div><div class='del'>-		err = gswip_mdio(priv, mdio_np);</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "mdio probe failed\n");</div><div class='del'>-			goto put_mdio_node;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = dsa_register_switch(priv-&gt;ds);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dsa switch register failed: %i\n", err);</div><div class='del'>-		goto mdio_bus;</div><div class='del'>-	}</div><div class='del'>-	if (!dsa_is_cpu_port(priv-&gt;ds, priv-&gt;hw_info-&gt;cpu_port)) {</div><div class='del'>-		dev_err(dev, "wrong CPU port defined, HW only supports port: %i",</div><div class='del'>-			priv-&gt;hw_info-&gt;cpu_port);</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto disable_switch;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, priv);</div><div class='del'>-</div><div class='del'>-	dev_info(dev, "probed GSWIP version %lx mod %lx\n",</div><div class='del'>-		 (version &amp; GSWIP_VERSION_REV_MASK) &gt;&gt; GSWIP_VERSION_REV_SHIFT,</div><div class='del'>-		 (version &amp; GSWIP_VERSION_MOD_MASK) &gt;&gt; GSWIP_VERSION_MOD_SHIFT);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-disable_switch:</div><div class='del'>-	gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);</div><div class='del'>-	dsa_unregister_switch(priv-&gt;ds);</div><div class='del'>-mdio_bus:</div><div class='del'>-	if (mdio_np)</div><div class='del'>-		mdiobus_unregister(priv-&gt;ds-&gt;slave_mii_bus);</div><div class='del'>-put_mdio_node:</div><div class='del'>-	of_node_put(mdio_np);</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_gphy_fw; i++)</div><div class='del'>-		gswip_gphy_fw_remove(priv, &amp;priv-&gt;gphy_fw[i]);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int gswip_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct gswip_priv *priv = platform_get_drvdata(pdev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* disable the switch */</div><div class='del'>-	gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);</div><div class='del'>-</div><div class='del'>-	dsa_unregister_switch(priv-&gt;ds);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ds-&gt;slave_mii_bus) {</div><div class='del'>-		mdiobus_unregister(priv-&gt;ds-&gt;slave_mii_bus);</div><div class='del'>-		of_node_put(priv-&gt;ds-&gt;slave_mii_bus-&gt;dev.of_node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_gphy_fw; i++)</div><div class='del'>-		gswip_gphy_fw_remove(priv, &amp;priv-&gt;gphy_fw[i]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct gswip_hw_info gswip_xrx200 = {</div><div class='del'>-	.max_ports = 7,</div><div class='del'>-	.cpu_port = 6,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct of_device_id gswip_of_match[] = {</div><div class='del'>-	{ .compatible = "lantiq,xrx200-gswip", .data = &amp;gswip_xrx200 },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, gswip_of_match);</div><div class='del'>-</div><div class='del'>-static struct platform_driver gswip_driver = {</div><div class='del'>-	.probe = gswip_probe,</div><div class='del'>-	.remove = gswip_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "gswip",</div><div class='del'>-		.of_match_table = gswip_of_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver(gswip_driver);</div><div class='del'>-</div><div class='del'>-MODULE_FIRMWARE("lantiq/xrx300_phy11g_a21.bin");</div><div class='del'>-MODULE_FIRMWARE("lantiq/xrx300_phy22f_a21.bin");</div><div class='del'>-MODULE_FIRMWARE("lantiq/xrx200_phy11g_a14.bin");</div><div class='del'>-MODULE_FIRMWARE("lantiq/xrx200_phy11g_a22.bin");</div><div class='del'>-MODULE_FIRMWARE("lantiq/xrx200_phy22f_a14.bin");</div><div class='del'>-MODULE_FIRMWARE("lantiq/xrx200_phy22f_a22.bin");</div><div class='del'>-MODULE_AUTHOR("Hauke Mehrtens &lt;hauke@hauke-m.de&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Lantiq / Intel GSWIP driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/Kconfig b/drivers/net/dsa/microchip/Kconfig<br/>index 2c3a6751bdaf..c71d3fd5dfeb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/Kconfig</a></div><div class='hunk'>@@ -1,17 +1,47 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config NET_DSA_MICROCHIP_KSZ_COMMON</div><div class='del'>-	tristate</div><div class='del'>-</div><div class='del'>-menuconfig NET_DSA_MICROCHIP_KSZ9477</div><div class='del'>-	tristate "Microchip KSZ9477 series switch support"</div><div class='add'>+menuconfig NET_DSA_MICROCHIP_KSZ_COMMON</div><div class='add'>+	tristate "Microchip KSZ8XXX/KSZ9XXX/LAN937X series switch support"</div><div class='ctx'> 	depends on NET_DSA</div><div class='del'>-	select NET_DSA_TAG_KSZ9477</div><div class='del'>-	select NET_DSA_MICROCHIP_KSZ_COMMON</div><div class='add'>+	select NET_DSA_TAG_KSZ</div><div class='add'>+	select NET_DSA_TAG_NONE</div><div class='add'>+	select NET_IEEE8021Q_HELPERS</div><div class='add'>+	select DCB</div><div class='add'>+	select PCS_XPCS</div><div class='add'>+	help</div><div class='add'>+	  This driver adds support for Microchip KSZ8, KSZ9 and</div><div class='add'>+	  LAN937X series switch chips, being KSZ8863/8873,</div><div class='add'>+	  KSZ8895/8864, KSZ8794/8795/8765,</div><div class='add'>+	  KSZ9477/9897/9896/9567/8567, KSZ9893/9563/8563 and</div><div class='add'>+	  LAN9370/9371/9372/9373/9374.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MICROCHIP_KSZ9477_I2C</div><div class='add'>+	tristate "KSZ series I2C connected switch driver"</div><div class='add'>+	depends on NET_DSA_MICROCHIP_KSZ_COMMON &amp;&amp; I2C</div><div class='add'>+	select REGMAP_I2C</div><div class='ctx'> 	help</div><div class='del'>-	  This driver adds support for Microchip KSZ9477 switch chips.</div><div class='add'>+	  Select to enable support for registering switches configured through I2C.</div><div class='ctx'> </div><div class='del'>-config NET_DSA_MICROCHIP_KSZ9477_SPI</div><div class='del'>-	tristate "KSZ9477 series SPI connected switch driver"</div><div class='del'>-	depends on NET_DSA_MICROCHIP_KSZ9477 &amp;&amp; SPI</div><div class='add'>+config NET_DSA_MICROCHIP_KSZ_SPI</div><div class='add'>+	tristate "KSZ series SPI connected switch driver"</div><div class='add'>+	depends on NET_DSA_MICROCHIP_KSZ_COMMON &amp;&amp; SPI</div><div class='add'>+	select REGMAP_SPI</div><div class='ctx'> 	help</div><div class='ctx'> 	  Select to enable support for registering switches configured through SPI.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MICROCHIP_KSZ_PTP</div><div class='add'>+	bool "Support for the PTP clock on the KSZ9563/LAN937x Ethernet Switch"</div><div class='add'>+	depends on NET_DSA_MICROCHIP_KSZ_COMMON &amp;&amp; PTP_1588_CLOCK</div><div class='add'>+	depends on NET_DSA_MICROCHIP_KSZ_COMMON=m || PTP_1588_CLOCK=y</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for timestamping &amp; PTP clock manipulation in</div><div class='add'>+	  KSZ8563/KSZ9563/LAN937x series of switches. KSZ9563/KSZ8563 supports</div><div class='add'>+	  only one step timestamping. LAN937x switch supports both one step and</div><div class='add'>+	  two step timestamping.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MICROCHIP_KSZ8863_SMI</div><div class='add'>+	tristate "KSZ series SMI connected switch driver"</div><div class='add'>+	depends on NET_DSA_MICROCHIP_KSZ_COMMON</div><div class='add'>+	select MDIO_BITBANG</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for registering switches configured through</div><div class='add'>+	  Microchip SMI. It supports the KSZ8863 and KSZ8873 switch.</div><div class='head'>diff --git a/drivers/net/dsa/microchip/Makefile b/drivers/net/dsa/microchip/Makefile<br/>index 68451b02f775..9347cfb3d0b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/Makefile</a></div><div class='hunk'>@@ -1,4 +1,14 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON)	+= ksz_common.o</div><div class='del'>-obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ9477)		+= ksz9477.o</div><div class='del'>-obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI)	+= ksz9477_spi.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON)	+= ksz_switch.o</div><div class='add'>+ksz_switch-objs := ksz_common.o ksz_dcb.o</div><div class='add'>+ksz_switch-objs += ksz9477.o ksz9477_acl.o ksz9477_tc_flower.o</div><div class='add'>+ksz_switch-objs += ksz8.o</div><div class='add'>+ksz_switch-objs += lan937x_main.o</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_NET_DSA_MICROCHIP_KSZ_PTP</div><div class='add'>+ksz_switch-objs += ksz_ptp.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C)	+= ksz9477_i2c.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ_SPI)		+= ksz_spi.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI)	+= ksz8863_smi.o</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c<br/>new file mode 100644<br/>index 000000000000..c354abdafc1b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz8.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz8.c</a></div><div class='hunk'>@@ -0,0 +1,2115 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Microchip KSZ8XXX series switch driver</div><div class='add'>+ *</div><div class='add'>+ * It supports the following switches:</div><div class='add'>+ * - KSZ8463</div><div class='add'>+ * - KSZ8863, KSZ8873 aka KSZ88X3</div><div class='add'>+ * - KSZ8895, KSZ8864 aka KSZ8895 family</div><div class='add'>+ * - KSZ8794, KSZ8795, KSZ8765 aka KSZ87XX</div><div class='add'>+ * Note that it does NOT support:</div><div class='add'>+ * - KSZ8563, KSZ8567 - see KSZ9477 driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Microchip Technology Inc.</div><div class='add'>+ *	Tristram Ha &lt;Tristram.Ha@microchip.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/export.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/microchip-ksz.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/micrel_phy.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+#include "ksz8_reg.h"</div><div class='add'>+#include "ksz8.h"</div><div class='add'>+</div><div class='add'>+static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)</div><div class='add'>+{</div><div class='add'>+	ksz_rmw8(dev, addr, bits, set ? bits : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits,</div><div class='add'>+			 bool set)</div><div class='add'>+{</div><div class='add'>+	ksz_rmw8(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), bits,</div><div class='add'>+		 set ? bits : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_ind_write8 - EEE/ACL/PME indirect register write</div><div class='add'>+ * @dev: The device structure.</div><div class='add'>+ * @table: Function &amp; table select, register 110.</div><div class='add'>+ * @addr: Indirect access control, register 111.</div><div class='add'>+ * @data: The data to be written.</div><div class='add'>+ *</div><div class='add'>+ * This function performs an indirect register write for EEE, ACL or</div><div class='add'>+ * PME switch functionalities. Both 8-bit registers 110 and 111 are</div><div class='add'>+ * written at once with ksz_write16, using the serial multiple write</div><div class='add'>+ * functionality.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or an error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz8_ind_write8(struct ksz_device *dev, u8 table, u16 addr, u8 data)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	ctrl_addr = IND_ACC_TABLE(table) | addr;</div><div class='add'>+	ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = ksz_write8(dev, regs[REG_IND_BYTE], data);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_ind_read8 - EEE/ACL/PME indirect register read</div><div class='add'>+ * @dev: The device structure.</div><div class='add'>+ * @table: Function &amp; table select, register 110.</div><div class='add'>+ * @addr: Indirect access control, register 111.</div><div class='add'>+ * @val: The value read.</div><div class='add'>+ *</div><div class='add'>+ * This function performs an indirect register read for EEE, ACL or</div><div class='add'>+ * PME switch functionalities. Both 8-bit registers 110 and 111 are</div><div class='add'>+ * written at once with ksz_write16, using the serial multiple write</div><div class='add'>+ * functionality.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or an error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz8_ind_read8(struct ksz_device *dev, u8 table, u16 addr, u8 *val)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	ctrl_addr = IND_ACC_TABLE(table | TABLE_READ) | addr;</div><div class='add'>+	ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = ksz_read8(dev, regs[REG_IND_BYTE], val);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_pme_write8(struct ksz_device *dev, u32 reg, u8 value)</div><div class='add'>+{</div><div class='add'>+	return ksz8_ind_write8(dev, (u8)(reg &gt;&gt; 8), (u8)(reg), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_pme_pread8(struct ksz_device *dev, int port, int offset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u8 table = (u8)(offset &gt;&gt; 8 | (port + 1));</div><div class='add'>+</div><div class='add'>+	return ksz8_ind_read8(dev, table, (u8)(offset), data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_pme_pwrite8(struct ksz_device *dev, int port, int offset, u8 data)</div><div class='add'>+{</div><div class='add'>+	u8 table = (u8)(offset &gt;&gt; 8 | (port + 1));</div><div class='add'>+</div><div class='add'>+	return ksz8_ind_write8(dev, table, (u8)(offset), data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_reset_switch(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	if (ksz_is_ksz88x3(dev)) {</div><div class='add'>+		/* reset switch */</div><div class='add'>+		ksz_cfg(dev, KSZ8863_REG_SW_RESET,</div><div class='add'>+			KSZ8863_GLOBAL_SOFTWARE_RESET | KSZ8863_PCS_RESET, true);</div><div class='add'>+		ksz_cfg(dev, KSZ8863_REG_SW_RESET,</div><div class='add'>+			KSZ8863_GLOBAL_SOFTWARE_RESET | KSZ8863_PCS_RESET, false);</div><div class='add'>+	} else if (ksz_is_ksz8463(dev)) {</div><div class='add'>+		ksz_cfg(dev, KSZ8463_REG_SW_RESET,</div><div class='add'>+			KSZ8463_GLOBAL_SOFTWARE_RESET, true);</div><div class='add'>+		ksz_cfg(dev, KSZ8463_REG_SW_RESET,</div><div class='add'>+			KSZ8463_GLOBAL_SOFTWARE_RESET, false);</div><div class='add'>+	} else {</div><div class='add'>+		/* reset switch */</div><div class='add'>+		ksz_write8(dev, REG_POWER_MANAGEMENT_1,</div><div class='add'>+			   SW_SOFTWARE_POWER_DOWN &lt;&lt; SW_POWER_MANAGEMENT_MODE_S);</div><div class='add'>+		ksz_write8(dev, REG_POWER_MANAGEMENT_1, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8863_change_mtu(struct ksz_device *dev, int frame_size)</div><div class='add'>+{</div><div class='add'>+	u8 ctrl2 = 0;</div><div class='add'>+</div><div class='add'>+	if (frame_size &lt;= KSZ8_LEGAL_PACKET_SIZE)</div><div class='add'>+		ctrl2 |= KSZ8863_LEGAL_PACKET_ENABLE;</div><div class='add'>+	else if (frame_size &gt; KSZ8863_NORMAL_PACKET_SIZE)</div><div class='add'>+		ctrl2 |= KSZ8863_HUGE_PACKET_ENABLE;</div><div class='add'>+</div><div class='add'>+	return ksz_rmw8(dev, REG_SW_CTRL_2, KSZ8863_LEGAL_PACKET_ENABLE |</div><div class='add'>+			KSZ8863_HUGE_PACKET_ENABLE, ctrl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8795_change_mtu(struct ksz_device *dev, int frame_size)</div><div class='add'>+{</div><div class='add'>+	u8 ctrl1 = 0, ctrl2 = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (frame_size &gt; KSZ8_LEGAL_PACKET_SIZE)</div><div class='add'>+		ctrl2 |= SW_LEGAL_PACKET_DISABLE;</div><div class='add'>+	if (frame_size &gt; KSZ8863_NORMAL_PACKET_SIZE)</div><div class='add'>+		ctrl1 |= SW_HUGE_PACKET;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw8(dev, REG_SW_CTRL_1, SW_HUGE_PACKET, ctrl1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_rmw8(dev, REG_SW_CTRL_2, SW_LEGAL_PACKET_DISABLE, ctrl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu)</div><div class='add'>+{</div><div class='add'>+	u16 frame_size;</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_cpu_port(dev-&gt;ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	frame_size = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ8795_CHIP_ID:</div><div class='add'>+	case KSZ8794_CHIP_ID:</div><div class='add'>+	case KSZ8765_CHIP_ID:</div><div class='add'>+		return ksz8795_change_mtu(dev, frame_size);</div><div class='add'>+	case KSZ8463_CHIP_ID:</div><div class='add'>+	case KSZ88X3_CHIP_ID:</div><div class='add'>+	case KSZ8864_CHIP_ID:</div><div class='add'>+	case KSZ8895_CHIP_ID:</div><div class='add'>+		return ksz8863_change_mtu(dev, frame_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_port_queue_split(struct ksz_device *dev, int port, int queues)</div><div class='add'>+{</div><div class='add'>+	u8 mask_4q, mask_2q;</div><div class='add'>+	u8 reg_4q, reg_2q;</div><div class='add'>+	u8 data_4q = 0;</div><div class='add'>+	u8 data_2q = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz88x3(dev)) {</div><div class='add'>+		mask_4q = KSZ8873_PORT_4QUEUE_SPLIT_EN;</div><div class='add'>+		mask_2q = KSZ8873_PORT_2QUEUE_SPLIT_EN;</div><div class='add'>+		reg_4q = REG_PORT_CTRL_0;</div><div class='add'>+		reg_2q = REG_PORT_CTRL_2;</div><div class='add'>+</div><div class='add'>+		/* KSZ8795 family switches have Weighted Fair Queueing (WFQ)</div><div class='add'>+		 * enabled by default. Enable it for KSZ8873 family switches</div><div class='add'>+		 * too. Default value for KSZ8873 family is strict priority,</div><div class='add'>+		 * which should be enabled by using TC_SETUP_QDISC_ETS, not</div><div class='add'>+		 * by default.</div><div class='add'>+		 */</div><div class='add'>+		ret = ksz_rmw8(dev, REG_SW_CTRL_3, WEIGHTED_FAIR_QUEUE_ENABLE,</div><div class='add'>+			       WEIGHTED_FAIR_QUEUE_ENABLE);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (ksz_is_ksz8463(dev)) {</div><div class='add'>+		mask_4q = KSZ8873_PORT_4QUEUE_SPLIT_EN;</div><div class='add'>+		mask_2q = KSZ8873_PORT_2QUEUE_SPLIT_EN;</div><div class='add'>+		reg_4q = P1CR1;</div><div class='add'>+		reg_2q = P1CR1 + 1;</div><div class='add'>+	} else {</div><div class='add'>+		mask_4q = KSZ8795_PORT_4QUEUE_SPLIT_EN;</div><div class='add'>+		mask_2q = KSZ8795_PORT_2QUEUE_SPLIT_EN;</div><div class='add'>+		reg_4q = REG_PORT_CTRL_13;</div><div class='add'>+		reg_2q = REG_PORT_CTRL_0;</div><div class='add'>+</div><div class='add'>+		/* TODO: this is legacy from initial KSZ8795 driver, should be</div><div class='add'>+		 * moved to appropriate place in the future.</div><div class='add'>+		 */</div><div class='add'>+		ret = ksz_rmw8(dev, REG_SW_CTRL_19,</div><div class='add'>+			       SW_OUT_RATE_LIMIT_QUEUE_BASED,</div><div class='add'>+			       SW_OUT_RATE_LIMIT_QUEUE_BASED);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (queues == 4)</div><div class='add'>+		data_4q = mask_4q;</div><div class='add'>+	else if (queues == 2)</div><div class='add'>+		data_2q = mask_2q;</div><div class='add'>+</div><div class='add'>+	ret = ksz_prmw8(dev, port, reg_4q, mask_4q, data_4q);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_prmw8(dev, port, reg_2q, mask_2q, data_2q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_all_queues_split(struct ksz_device *dev, int queues)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		int ret = ksz8_port_queue_split(dev, dp-&gt;index, queues);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt)</div><div class='add'>+{</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	u32 data;</div><div class='add'>+	u8 check;</div><div class='add'>+	int loop;</div><div class='add'>+</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ctrl_addr = addr + dev-&gt;info-&gt;reg_mib_cnt * port;</div><div class='add'>+	ctrl_addr |= IND_ACC_TABLE(TABLE_MIB | TABLE_READ);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+</div><div class='add'>+	/* It is almost guaranteed to always read the valid bit because of</div><div class='add'>+	 * slow SPI speed.</div><div class='add'>+	 */</div><div class='add'>+	for (loop = 2; loop &gt; 0; loop--) {</div><div class='add'>+		ksz_read8(dev, regs[REG_IND_MIB_CHECK], &amp;check);</div><div class='add'>+</div><div class='add'>+		if (check &amp; masks[MIB_COUNTER_VALID]) {</div><div class='add'>+			ksz_read32(dev, regs[REG_IND_DATA_LO], &amp;data);</div><div class='add'>+			if (check &amp; masks[MIB_COUNTER_OVERFLOW])</div><div class='add'>+				*cnt += MIB_COUNTER_VALUE + 1;</div><div class='add'>+			*cnt += data &amp; MIB_COUNTER_VALUE;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8795_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+			      u64 *dropped, u64 *cnt)</div><div class='add'>+{</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	u32 data;</div><div class='add'>+	u8 check;</div><div class='add'>+	int loop;</div><div class='add'>+</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	addr -= dev-&gt;info-&gt;reg_mib_cnt;</div><div class='add'>+	ctrl_addr = (KSZ8795_MIB_TOTAL_RX_1 - KSZ8795_MIB_TOTAL_RX_0) * port;</div><div class='add'>+	ctrl_addr += addr + KSZ8795_MIB_TOTAL_RX_0;</div><div class='add'>+	ctrl_addr |= IND_ACC_TABLE(TABLE_MIB | TABLE_READ);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+</div><div class='add'>+	/* It is almost guaranteed to always read the valid bit because of</div><div class='add'>+	 * slow SPI speed.</div><div class='add'>+	 */</div><div class='add'>+	for (loop = 2; loop &gt; 0; loop--) {</div><div class='add'>+		ksz_read8(dev, regs[REG_IND_MIB_CHECK], &amp;check);</div><div class='add'>+</div><div class='add'>+		if (check &amp; masks[MIB_COUNTER_VALID]) {</div><div class='add'>+			ksz_read32(dev, regs[REG_IND_DATA_LO], &amp;data);</div><div class='add'>+			if (addr &lt; 2) {</div><div class='add'>+				u64 total;</div><div class='add'>+</div><div class='add'>+				total = check &amp; MIB_TOTAL_BYTES_H;</div><div class='add'>+				total &lt;&lt;= 32;</div><div class='add'>+				*cnt += total;</div><div class='add'>+				*cnt += data;</div><div class='add'>+				if (check &amp; masks[MIB_COUNTER_OVERFLOW]) {</div><div class='add'>+					total = MIB_TOTAL_BYTES_H + 1;</div><div class='add'>+					total &lt;&lt;= 32;</div><div class='add'>+					*cnt += total;</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				if (check &amp; masks[MIB_COUNTER_OVERFLOW])</div><div class='add'>+					*cnt += MIB_PACKET_DROPPED + 1;</div><div class='add'>+				*cnt += data &amp; MIB_PACKET_DROPPED;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8863_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+			      u64 *dropped, u64 *cnt)</div><div class='add'>+{</div><div class='add'>+	u32 *last = (u32 *)dropped;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	u32 data;</div><div class='add'>+	u32 cur;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	addr -= dev-&gt;info-&gt;reg_mib_cnt;</div><div class='add'>+	ctrl_addr = addr ? KSZ8863_MIB_PACKET_DROPPED_TX_0 :</div><div class='add'>+			   KSZ8863_MIB_PACKET_DROPPED_RX_0;</div><div class='add'>+	if (ksz_is_8895_family(dev) &amp;&amp;</div><div class='add'>+	    ctrl_addr == KSZ8863_MIB_PACKET_DROPPED_RX_0)</div><div class='add'>+		ctrl_addr = KSZ8895_MIB_PACKET_DROPPED_RX_0;</div><div class='add'>+	ctrl_addr += port;</div><div class='add'>+	ctrl_addr |= IND_ACC_TABLE(TABLE_MIB | TABLE_READ);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+	ksz_read32(dev, regs[REG_IND_DATA_LO], &amp;data);</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	data &amp;= MIB_PACKET_DROPPED;</div><div class='add'>+	cur = last[addr];</div><div class='add'>+	if (data != cur) {</div><div class='add'>+		last[addr] = data;</div><div class='add'>+		if (data &lt; cur)</div><div class='add'>+			data += MIB_PACKET_DROPPED + 1;</div><div class='add'>+		data -= cur;</div><div class='add'>+		*cnt += data;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+		    u64 *dropped, u64 *cnt)</div><div class='add'>+{</div><div class='add'>+	if (is_ksz88xx(dev))</div><div class='add'>+		ksz8863_r_mib_pkt(dev, port, addr, dropped, cnt);</div><div class='add'>+	else</div><div class='add'>+		ksz8795_r_mib_pkt(dev, port, addr, dropped, cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_freeze_mib(struct ksz_device *dev, int port, bool freeze)</div><div class='add'>+{</div><div class='add'>+	if (is_ksz88xx(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* enable the port for flush/freeze function */</div><div class='add'>+	if (freeze)</div><div class='add'>+		ksz_cfg(dev, REG_SW_CTRL_6, BIT(port), true);</div><div class='add'>+	ksz_cfg(dev, REG_SW_CTRL_6, SW_MIB_COUNTER_FREEZE, freeze);</div><div class='add'>+</div><div class='add'>+	/* disable the port after freeze is done */</div><div class='add'>+	if (!freeze)</div><div class='add'>+		ksz_cfg(dev, REG_SW_CTRL_6, BIT(port), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_port_init_cnt(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_port_mib *mib = &amp;dev-&gt;ports[port].mib;</div><div class='add'>+	u64 *dropped;</div><div class='add'>+</div><div class='add'>+	/* For KSZ8795 family. */</div><div class='add'>+	if (ksz_is_ksz87xx(dev)) {</div><div class='add'>+		/* flush all enabled port MIB counters */</div><div class='add'>+		ksz_cfg(dev, REG_SW_CTRL_6, BIT(port), true);</div><div class='add'>+		ksz_cfg(dev, REG_SW_CTRL_6, SW_MIB_COUNTER_FLUSH, true);</div><div class='add'>+		ksz_cfg(dev, REG_SW_CTRL_6, BIT(port), false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mib-&gt;cnt_ptr = 0;</div><div class='add'>+</div><div class='add'>+	/* Some ports may not have MIB counters before SWITCH_COUNTER_NUM. */</div><div class='add'>+	while (mib-&gt;cnt_ptr &lt; dev-&gt;info-&gt;reg_mib_cnt) {</div><div class='add'>+		dev-&gt;dev_ops-&gt;r_mib_cnt(dev, port, mib-&gt;cnt_ptr,</div><div class='add'>+					&amp;mib-&gt;counters[mib-&gt;cnt_ptr]);</div><div class='add'>+		++mib-&gt;cnt_ptr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* last one in storage */</div><div class='add'>+	dropped = &amp;mib-&gt;counters[dev-&gt;info-&gt;mib_cnt];</div><div class='add'>+</div><div class='add'>+	/* Some ports may not have MIB counters after SWITCH_COUNTER_NUM. */</div><div class='add'>+	while (mib-&gt;cnt_ptr &lt; dev-&gt;info-&gt;mib_cnt) {</div><div class='add'>+		dev-&gt;dev_ops-&gt;r_mib_pkt(dev, port, mib-&gt;cnt_ptr,</div><div class='add'>+					dropped, &amp;mib-&gt;counters[mib-&gt;cnt_ptr]);</div><div class='add'>+		++mib-&gt;cnt_ptr;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_r_table(struct ksz_device *dev, int table, u16 addr, u64 *data)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ctrl_addr = IND_ACC_TABLE(table | TABLE_READ) | addr;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock_alu;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read64(dev, regs[REG_IND_DATA_HI], data);</div><div class='add'>+unlock_alu:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_w_table(struct ksz_device *dev, int table, u16 addr, u64 data)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ctrl_addr = IND_ACC_TABLE(table) | addr;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	ret = ksz_write64(dev, regs[REG_IND_DATA_HI], data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock_alu;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+unlock_alu:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_valid_dyn_entry(struct ksz_device *dev, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int timeout = 100;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = ksz_read8(dev, regs[REG_IND_DATA_CHECK], data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		timeout--;</div><div class='add'>+	} while ((*data &amp; masks[DYNAMIC_MAC_TABLE_NOT_READY]) &amp;&amp; timeout);</div><div class='add'>+</div><div class='add'>+	/* Entry is not ready for accessing. */</div><div class='add'>+	if (*data &amp; masks[DYNAMIC_MAC_TABLE_NOT_READY])</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	/* Entry is ready for accessing. */</div><div class='add'>+	return ksz_read8(dev, regs[REG_IND_DATA_8], data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr,</div><div class='add'>+				u8 *fid, u8 *src_port, u16 *entries)</div><div class='add'>+{</div><div class='add'>+	u32 data_hi, data_lo;</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 ctrl_addr;</div><div class='add'>+	u64 buf = 0;</div><div class='add'>+	u8 data;</div><div class='add'>+	int cnt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ctrl_addr = IND_ACC_TABLE(TABLE_DYNAMIC_MAC | TABLE_READ) | addr;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock_alu;</div><div class='add'>+</div><div class='add'>+	ret = ksz8_valid_dyn_entry(dev, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock_alu;</div><div class='add'>+</div><div class='add'>+	if (data &amp; masks[DYNAMIC_MAC_TABLE_MAC_EMPTY]) {</div><div class='add'>+		*entries = 0;</div><div class='add'>+		goto unlock_alu;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_read64(dev, regs[REG_IND_DATA_HI], &amp;buf);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock_alu;</div><div class='add'>+</div><div class='add'>+	data_hi = (u32)(buf &gt;&gt; 32);</div><div class='add'>+	data_lo = (u32)buf;</div><div class='add'>+</div><div class='add'>+	/* Check out how many valid entry in the table. */</div><div class='add'>+	cnt = data &amp; masks[DYNAMIC_MAC_TABLE_ENTRIES_H];</div><div class='add'>+	cnt &lt;&lt;= shifts[DYNAMIC_MAC_ENTRIES_H];</div><div class='add'>+	cnt |= (data_hi &amp; masks[DYNAMIC_MAC_TABLE_ENTRIES]) &gt;&gt;</div><div class='add'>+		shifts[DYNAMIC_MAC_ENTRIES];</div><div class='add'>+	*entries = cnt + 1;</div><div class='add'>+</div><div class='add'>+	*fid = (data_hi &amp; masks[DYNAMIC_MAC_TABLE_FID]) &gt;&gt;</div><div class='add'>+		shifts[DYNAMIC_MAC_FID];</div><div class='add'>+	*src_port = (data_hi &amp; masks[DYNAMIC_MAC_TABLE_SRC_PORT]) &gt;&gt;</div><div class='add'>+		shifts[DYNAMIC_MAC_SRC_PORT];</div><div class='add'>+</div><div class='add'>+	mac_addr[5] = (u8)data_lo;</div><div class='add'>+	mac_addr[4] = (u8)(data_lo &gt;&gt; 8);</div><div class='add'>+	mac_addr[3] = (u8)(data_lo &gt;&gt; 16);</div><div class='add'>+	mac_addr[2] = (u8)(data_lo &gt;&gt; 24);</div><div class='add'>+</div><div class='add'>+	mac_addr[1] = (u8)data_hi;</div><div class='add'>+	mac_addr[0] = (u8)(data_hi &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+unlock_alu:</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr,</div><div class='add'>+				struct alu_struct *alu, bool *valid)</div><div class='add'>+{</div><div class='add'>+	u32 data_hi, data_lo;</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	u64 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='add'>+	ret = ksz8_r_table(dev, TABLE_STATIC_MAC, addr, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data_hi = data &gt;&gt; 32;</div><div class='add'>+	data_lo = (u32)data;</div><div class='add'>+</div><div class='add'>+	if (!(data_hi &amp; (masks[STATIC_MAC_TABLE_VALID] |</div><div class='add'>+			 masks[STATIC_MAC_TABLE_OVERRIDE]))) {</div><div class='add'>+		*valid = false;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	alu-&gt;mac[5] = (u8)data_lo;</div><div class='add'>+	alu-&gt;mac[4] = (u8)(data_lo &gt;&gt; 8);</div><div class='add'>+	alu-&gt;mac[3] = (u8)(data_lo &gt;&gt; 16);</div><div class='add'>+	alu-&gt;mac[2] = (u8)(data_lo &gt;&gt; 24);</div><div class='add'>+	alu-&gt;mac[1] = (u8)data_hi;</div><div class='add'>+	alu-&gt;mac[0] = (u8)(data_hi &gt;&gt; 8);</div><div class='add'>+	alu-&gt;port_forward =</div><div class='add'>+		(data_hi &amp; masks[STATIC_MAC_TABLE_FWD_PORTS]) &gt;&gt;</div><div class='add'>+			shifts[STATIC_MAC_FWD_PORTS];</div><div class='add'>+	alu-&gt;is_override = (data_hi &amp; masks[STATIC_MAC_TABLE_OVERRIDE]) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* KSZ8795/KSZ8895 family switches have STATIC_MAC_TABLE_USE_FID and</div><div class='add'>+	 * STATIC_MAC_TABLE_FID definitions off by 1 when doing read on the</div><div class='add'>+	 * static MAC table compared to doing write.</div><div class='add'>+	 */</div><div class='add'>+	if (ksz_is_ksz87xx(dev) || ksz_is_8895_family(dev))</div><div class='add'>+		data_hi &gt;&gt;= 1;</div><div class='add'>+	alu-&gt;is_static = true;</div><div class='add'>+	alu-&gt;is_use_fid = (data_hi &amp; masks[STATIC_MAC_TABLE_USE_FID]) ? 1 : 0;</div><div class='add'>+	alu-&gt;fid = (data_hi &amp; masks[STATIC_MAC_TABLE_FID]) &gt;&gt;</div><div class='add'>+		shifts[STATIC_MAC_FID];</div><div class='add'>+</div><div class='add'>+	*valid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_w_sta_mac_table(struct ksz_device *dev, u16 addr,</div><div class='add'>+				struct alu_struct *alu)</div><div class='add'>+{</div><div class='add'>+	u32 data_hi, data_lo;</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	u64 data;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='add'>+	data_lo = ((u32)alu-&gt;mac[2] &lt;&lt; 24) |</div><div class='add'>+		((u32)alu-&gt;mac[3] &lt;&lt; 16) |</div><div class='add'>+		((u32)alu-&gt;mac[4] &lt;&lt; 8) | alu-&gt;mac[5];</div><div class='add'>+	data_hi = ((u32)alu-&gt;mac[0] &lt;&lt; 8) | alu-&gt;mac[1];</div><div class='add'>+	data_hi |= (u32)alu-&gt;port_forward &lt;&lt; shifts[STATIC_MAC_FWD_PORTS];</div><div class='add'>+</div><div class='add'>+	if (alu-&gt;is_override)</div><div class='add'>+		data_hi |= masks[STATIC_MAC_TABLE_OVERRIDE];</div><div class='add'>+	if (alu-&gt;is_use_fid) {</div><div class='add'>+		data_hi |= masks[STATIC_MAC_TABLE_USE_FID];</div><div class='add'>+		data_hi |= (u32)alu-&gt;fid &lt;&lt; shifts[STATIC_MAC_FID];</div><div class='add'>+	}</div><div class='add'>+	if (alu-&gt;is_static)</div><div class='add'>+		data_hi |= masks[STATIC_MAC_TABLE_VALID];</div><div class='add'>+	else</div><div class='add'>+		data_hi &amp;= ~masks[STATIC_MAC_TABLE_OVERRIDE];</div><div class='add'>+</div><div class='add'>+	data = (u64)data_hi &lt;&lt; 32 | data_lo;</div><div class='add'>+</div><div class='add'>+	return ksz8_w_table(dev, TABLE_STATIC_MAC, addr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8_from_vlan(struct ksz_device *dev, u32 vlan, u8 *fid,</div><div class='add'>+			   u8 *member, u8 *valid)</div><div class='add'>+{</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='add'>+	*fid = vlan &amp; masks[VLAN_TABLE_FID];</div><div class='add'>+	*member = (vlan &amp; masks[VLAN_TABLE_MEMBERSHIP]) &gt;&gt;</div><div class='add'>+			shifts[VLAN_TABLE_MEMBERSHIP_S];</div><div class='add'>+	*valid = !!(vlan &amp; masks[VLAN_TABLE_VALID]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8_to_vlan(struct ksz_device *dev, u8 fid, u8 member, u8 valid,</div><div class='add'>+			 u16 *vlan)</div><div class='add'>+{</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='add'>+	*vlan = fid;</div><div class='add'>+	*vlan |= (u16)member &lt;&lt; shifts[VLAN_TABLE_MEMBERSHIP_S];</div><div class='add'>+	if (valid)</div><div class='add'>+		*vlan |= masks[VLAN_TABLE_VALID];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8_r_vlan_entries(struct ksz_device *dev, u16 addr)</div><div class='add'>+{</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	u64 data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+</div><div class='add'>+	ksz8_r_table(dev, TABLE_VLAN, addr, &amp;data);</div><div class='add'>+	addr *= 4;</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		dev-&gt;vlan_cache[addr + i].table[0] = (u16)data;</div><div class='add'>+		data &gt;&gt;= shifts[VLAN_TABLE];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8_r_vlan_table(struct ksz_device *dev, u16 vid, u16 *vlan)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	u16 *data;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u64 buf;</div><div class='add'>+</div><div class='add'>+	data = (u16 *)&amp;buf;</div><div class='add'>+	addr = vid / 4;</div><div class='add'>+	index = vid &amp; 3;</div><div class='add'>+	ksz8_r_table(dev, TABLE_VLAN, addr, &amp;buf);</div><div class='add'>+	*vlan = data[index];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8_w_vlan_table(struct ksz_device *dev, u16 vid, u16 vlan)</div><div class='add'>+{</div><div class='add'>+	int index;</div><div class='add'>+	u16 *data;</div><div class='add'>+	u16 addr;</div><div class='add'>+	u64 buf;</div><div class='add'>+</div><div class='add'>+	data = (u16 *)&amp;buf;</div><div class='add'>+	addr = vid / 4;</div><div class='add'>+	index = vid &amp; 3;</div><div class='add'>+	ksz8_r_table(dev, TABLE_VLAN, addr, &amp;buf);</div><div class='add'>+	data[index] = vlan;</div><div class='add'>+	dev-&gt;vlan_cache[vid].table[0] = vlan;</div><div class='add'>+	ksz8_w_table(dev, TABLE_VLAN, addr, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz879x_get_loopback - KSZ879x specific function to get loopback</div><div class='add'>+ *                        configuration status for a specific port</div><div class='add'>+ * @dev: Pointer to the device structure</div><div class='add'>+ * @port: Port number to query</div><div class='add'>+ * @val: Pointer to store the result</div><div class='add'>+ *</div><div class='add'>+ * This function reads the SMI registers to determine whether loopback mode</div><div class='add'>+ * is enabled for a specific port.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz879x_get_loopback(struct ksz_device *dev, u16 port,</div><div class='add'>+				u16 *val)</div><div class='add'>+{</div><div class='add'>+	u8 stat3;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, REG_PORT_STATUS_3, &amp;stat3);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (stat3 &amp; PORT_PHY_LOOPBACK)</div><div class='add'>+		*val |= BMCR_LOOPBACK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz879x_set_loopback - KSZ879x specific function  to set loopback mode for</div><div class='add'>+ *			  a specific port</div><div class='add'>+ * @dev: Pointer to the device structure.</div><div class='add'>+ * @port: Port number to modify.</div><div class='add'>+ * @val: Value indicating whether to enable or disable loopback mode.</div><div class='add'>+ *</div><div class='add'>+ * This function translates loopback bit of the BMCR register into the</div><div class='add'>+ * corresponding hardware register bit value and writes it to the SMI interface.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz879x_set_loopback(struct ksz_device *dev, u16 port, u16 val)</div><div class='add'>+{</div><div class='add'>+	u8 stat3 = 0;</div><div class='add'>+</div><div class='add'>+	if (val &amp; BMCR_LOOPBACK)</div><div class='add'>+		stat3 |= PORT_PHY_LOOPBACK;</div><div class='add'>+</div><div class='add'>+	return ksz_prmw8(dev, port, REG_PORT_STATUS_3, PORT_PHY_LOOPBACK,</div><div class='add'>+			 stat3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_r_phy_ctrl - Translates and reads from the SMI interface to a MIIM PHY</div><div class='add'>+ *		     Control register (Reg. 31).</div><div class='add'>+ * @dev: The KSZ device instance.</div><div class='add'>+ * @port: The port number to be read.</div><div class='add'>+ * @val: The value read from the SMI interface.</div><div class='add'>+ *</div><div class='add'>+ * This function reads the SMI interface and translates the hardware register</div><div class='add'>+ * bit values into their corresponding control settings for a MIIM PHY Control</div><div class='add'>+ * register.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz8_r_phy_ctrl(struct ksz_device *dev, int port, u16 *val)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 reg_val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*val = 0;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, regs[P_LINK_STATUS], &amp;reg_val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (reg_val &amp; PORT_MDIX_STATUS)</div><div class='add'>+		*val |= KSZ886X_CTRL_MDIX_STAT;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, REG_PORT_LINK_MD_CTRL, &amp;reg_val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (reg_val &amp; PORT_FORCE_LINK)</div><div class='add'>+		*val |= KSZ886X_CTRL_FORCE_LINK;</div><div class='add'>+</div><div class='add'>+	if (reg_val &amp; PORT_POWER_SAVING)</div><div class='add'>+		*val |= KSZ886X_CTRL_PWRSAVE;</div><div class='add'>+</div><div class='add'>+	if (reg_val &amp; PORT_PHY_REMOTE_LOOPBACK)</div><div class='add'>+		*val |= KSZ886X_CTRL_REMOTE_LOOPBACK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_r_phy_bmcr - Translates and reads from the SMI interface to a MIIM PHY</div><div class='add'>+ *		     Basic mode control register (Reg. 0).</div><div class='add'>+ * @dev: The KSZ device instance.</div><div class='add'>+ * @port: The port number to be read.</div><div class='add'>+ * @val: The value read from the SMI interface.</div><div class='add'>+ *</div><div class='add'>+ * This function reads the SMI interface and translates the hardware register</div><div class='add'>+ * bit values into their corresponding control settings for a MIIM PHY Basic</div><div class='add'>+ * mode control register.</div><div class='add'>+ *</div><div class='add'>+ * MIIM Bit Mapping Comparison between KSZ8794 and KSZ8873</div><div class='add'>+ * -------------------------------------------------------------------</div><div class='add'>+ * MIIM Bit                    | KSZ8794 Reg/Bit             | KSZ8873 Reg/Bit</div><div class='add'>+ * ----------------------------+-----------------------------+----------------</div><div class='add'>+ * Bit 15 - Soft Reset         | 0xF/4                       | Not supported</div><div class='add'>+ * Bit 14 - Loopback           | 0xD/0 (MAC), 0xF/7 (PHY)    ~ 0xD/0 (PHY)</div><div class='add'>+ * Bit 13 - Force 100          | 0xC/6                       = 0xC/6</div><div class='add'>+ * Bit 12 - AN Enable          | 0xC/7 (reverse logic)       ~ 0xC/7</div><div class='add'>+ * Bit 11 - Power Down         | 0xD/3                       = 0xD/3</div><div class='add'>+ * Bit 10 - PHY Isolate        | 0xF/5                       | Not supported</div><div class='add'>+ * Bit 9 - Restart AN          | 0xD/5                       = 0xD/5</div><div class='add'>+ * Bit 8 - Force Full-Duplex   | 0xC/5                       = 0xC/5</div><div class='add'>+ * Bit 7 - Collision Test/Res. | Not supported               | Not supported</div><div class='add'>+ * Bit 6 - Reserved            | Not supported               | Not supported</div><div class='add'>+ * Bit 5 - Hp_mdix             | 0x9/7                       ~ 0xF/7</div><div class='add'>+ * Bit 4 - Force MDI           | 0xD/1                       = 0xD/1</div><div class='add'>+ * Bit 3 - Disable MDIX        | 0xD/2                       = 0xD/2</div><div class='add'>+ * Bit 2 - Disable Far-End F.  | ????                        | 0xD/4</div><div class='add'>+ * Bit 1 - Disable Transmit    | 0xD/6                       = 0xD/6</div><div class='add'>+ * Bit 0 - Disable LED         | 0xD/7                       = 0xD/7</div><div class='add'>+ * -------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz8_r_phy_bmcr(struct ksz_device *dev, u16 port, u16 *val)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 restart, speed, ctrl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*val = 0;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, regs[P_NEG_RESTART_CTRL], &amp;restart);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, regs[P_SPEED_STATUS], &amp;speed);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, regs[P_FORCE_CTRL], &amp;ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; PORT_FORCE_100_MBIT)</div><div class='add'>+		*val |= BMCR_SPEED100;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz88x3(dev)) {</div><div class='add'>+		if (restart &amp; KSZ8873_PORT_PHY_LOOPBACK)</div><div class='add'>+			*val |= BMCR_LOOPBACK;</div><div class='add'>+</div><div class='add'>+		if ((ctrl &amp; PORT_AUTO_NEG_ENABLE))</div><div class='add'>+			*val |= BMCR_ANENABLE;</div><div class='add'>+	} else {</div><div class='add'>+		ret = ksz879x_get_loopback(dev, port, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (!(ctrl &amp; PORT_AUTO_NEG_DISABLE))</div><div class='add'>+			*val |= BMCR_ANENABLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (restart &amp; PORT_POWER_DOWN)</div><div class='add'>+		*val |= BMCR_PDOWN;</div><div class='add'>+</div><div class='add'>+	if (restart &amp; PORT_AUTO_NEG_RESTART)</div><div class='add'>+		*val |= BMCR_ANRESTART;</div><div class='add'>+</div><div class='add'>+	if (ctrl &amp; PORT_FORCE_FULL_DUPLEX)</div><div class='add'>+		*val |= BMCR_FULLDPLX;</div><div class='add'>+</div><div class='add'>+	if (speed &amp; PORT_HP_MDIX)</div><div class='add'>+		*val |= KSZ886X_BMCR_HP_MDIX;</div><div class='add'>+</div><div class='add'>+	if (restart &amp; PORT_FORCE_MDIX)</div><div class='add'>+		*val |= KSZ886X_BMCR_FORCE_MDI;</div><div class='add'>+</div><div class='add'>+	if (restart &amp; PORT_AUTO_MDIX_DISABLE)</div><div class='add'>+		*val |= KSZ886X_BMCR_DISABLE_AUTO_MDIX;</div><div class='add'>+</div><div class='add'>+	if (restart &amp; PORT_TX_DISABLE)</div><div class='add'>+		*val |= KSZ886X_BMCR_DISABLE_TRANSMIT;</div><div class='add'>+</div><div class='add'>+	if (restart &amp; PORT_LED_OFF)</div><div class='add'>+		*val |= KSZ886X_BMCR_DISABLE_LED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val)</div><div class='add'>+{</div><div class='add'>+	u8 ctrl, link, val1, val2;</div><div class='add'>+	int processed = true;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u16 data = 0;</div><div class='add'>+	u16 p = phy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case MII_BMCR:</div><div class='add'>+		ret = ksz8_r_phy_bmcr(dev, p, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case MII_BMSR:</div><div class='add'>+		ret = ksz_pread8(dev, p, regs[P_LINK_STATUS], &amp;link);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = BMSR_100FULL |</div><div class='add'>+		       BMSR_100HALF |</div><div class='add'>+		       BMSR_10FULL |</div><div class='add'>+		       BMSR_10HALF |</div><div class='add'>+		       BMSR_ANEGCAPABLE;</div><div class='add'>+		if (link &amp; PORT_AUTO_NEG_COMPLETE)</div><div class='add'>+			data |= BMSR_ANEGCOMPLETE;</div><div class='add'>+		if (link &amp; PORT_STAT_LINK_GOOD)</div><div class='add'>+			data |= BMSR_LSTATUS;</div><div class='add'>+		break;</div><div class='add'>+	case MII_PHYSID1:</div><div class='add'>+		data = KSZ8795_ID_HI;</div><div class='add'>+		break;</div><div class='add'>+	case MII_PHYSID2:</div><div class='add'>+		if (ksz_is_ksz88x3(dev))</div><div class='add'>+			data = KSZ8863_ID_LO;</div><div class='add'>+		else</div><div class='add'>+			data = KSZ8795_ID_LO;</div><div class='add'>+		break;</div><div class='add'>+	case MII_ADVERTISE:</div><div class='add'>+		ret = ksz_pread8(dev, p, regs[P_LOCAL_CTRL], &amp;ctrl);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = ADVERTISE_CSMA;</div><div class='add'>+		if (ctrl &amp; PORT_AUTO_NEG_SYM_PAUSE)</div><div class='add'>+			data |= ADVERTISE_PAUSE_CAP;</div><div class='add'>+		if (ctrl &amp; PORT_AUTO_NEG_100BTX_FD)</div><div class='add'>+			data |= ADVERTISE_100FULL;</div><div class='add'>+		if (ctrl &amp; PORT_AUTO_NEG_100BTX)</div><div class='add'>+			data |= ADVERTISE_100HALF;</div><div class='add'>+		if (ctrl &amp; PORT_AUTO_NEG_10BT_FD)</div><div class='add'>+			data |= ADVERTISE_10FULL;</div><div class='add'>+		if (ctrl &amp; PORT_AUTO_NEG_10BT)</div><div class='add'>+			data |= ADVERTISE_10HALF;</div><div class='add'>+		break;</div><div class='add'>+	case MII_LPA:</div><div class='add'>+		ret = ksz_pread8(dev, p, regs[P_REMOTE_STATUS], &amp;link);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = LPA_SLCT;</div><div class='add'>+		if (link &amp; PORT_REMOTE_SYM_PAUSE)</div><div class='add'>+			data |= LPA_PAUSE_CAP;</div><div class='add'>+		if (link &amp; PORT_REMOTE_100BTX_FD)</div><div class='add'>+			data |= LPA_100FULL;</div><div class='add'>+		if (link &amp; PORT_REMOTE_100BTX)</div><div class='add'>+			data |= LPA_100HALF;</div><div class='add'>+		if (link &amp; PORT_REMOTE_10BT_FD)</div><div class='add'>+			data |= LPA_10FULL;</div><div class='add'>+		if (link &amp; PORT_REMOTE_10BT)</div><div class='add'>+			data |= LPA_10HALF;</div><div class='add'>+		if (data &amp; ~LPA_SLCT)</div><div class='add'>+			data |= LPA_LPACK;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_REG_LINK_MD:</div><div class='add'>+		ret = ksz_pread8(dev, p, REG_PORT_LINK_MD_CTRL, &amp;val1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = ksz_pread8(dev, p, REG_PORT_LINK_MD_RESULT, &amp;val2);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (val1 &amp; PORT_START_CABLE_DIAG)</div><div class='add'>+			data |= PHY_START_CABLE_DIAG;</div><div class='add'>+</div><div class='add'>+		if (val1 &amp; PORT_CABLE_10M_SHORT)</div><div class='add'>+			data |= PHY_CABLE_10M_SHORT;</div><div class='add'>+</div><div class='add'>+		data |= FIELD_PREP(PHY_CABLE_DIAG_RESULT_M,</div><div class='add'>+				FIELD_GET(PORT_CABLE_DIAG_RESULT_M, val1));</div><div class='add'>+</div><div class='add'>+		data |= FIELD_PREP(PHY_CABLE_FAULT_COUNTER_M,</div><div class='add'>+				(FIELD_GET(PORT_CABLE_FAULT_COUNTER_H, val1) &lt;&lt; 8) |</div><div class='add'>+				FIELD_GET(PORT_CABLE_FAULT_COUNTER_L, val2));</div><div class='add'>+		break;</div><div class='add'>+	case PHY_REG_PHY_CTRL:</div><div class='add'>+		ret = ksz8_r_phy_ctrl(dev, p, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		processed = false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (processed)</div><div class='add'>+		*val = data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_w_phy_ctrl - Translates and writes to the SMI interface from a MIIM PHY</div><div class='add'>+ *		     Control register (Reg. 31).</div><div class='add'>+ * @dev: The KSZ device instance.</div><div class='add'>+ * @port: The port number to be configured.</div><div class='add'>+ * @val: The register value to be written.</div><div class='add'>+ *</div><div class='add'>+ * This function translates control settings from a MIIM PHY Control register</div><div class='add'>+ * into their corresponding hardware register bit values for the SMI</div><div class='add'>+ * interface.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz8_w_phy_ctrl(struct ksz_device *dev, int port, u16 val)</div><div class='add'>+{</div><div class='add'>+	u8 reg_val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_CTRL_FORCE_LINK)</div><div class='add'>+		reg_val |= PORT_FORCE_LINK;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_CTRL_PWRSAVE)</div><div class='add'>+		reg_val |= PORT_POWER_SAVING;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_CTRL_REMOTE_LOOPBACK)</div><div class='add'>+		reg_val |= PORT_PHY_REMOTE_LOOPBACK;</div><div class='add'>+</div><div class='add'>+	ret = ksz_prmw8(dev, port, REG_PORT_LINK_MD_CTRL, PORT_FORCE_LINK |</div><div class='add'>+			PORT_POWER_SAVING | PORT_PHY_REMOTE_LOOPBACK, reg_val);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_w_phy_bmcr - Translates and writes to the SMI interface from a MIIM PHY</div><div class='add'>+ *		     Basic mode control register (Reg. 0).</div><div class='add'>+ * @dev: The KSZ device instance.</div><div class='add'>+ * @port: The port number to be configured.</div><div class='add'>+ * @val: The register value to be written.</div><div class='add'>+ *</div><div class='add'>+ * This function translates control settings from a MIIM PHY Basic mode control</div><div class='add'>+ * register into their corresponding hardware register bit values for the SMI</div><div class='add'>+ * interface.</div><div class='add'>+ *</div><div class='add'>+ * MIIM Bit Mapping Comparison between KSZ8794 and KSZ8873</div><div class='add'>+ * -------------------------------------------------------------------</div><div class='add'>+ * MIIM Bit                    | KSZ8794 Reg/Bit             | KSZ8873 Reg/Bit</div><div class='add'>+ * ----------------------------+-----------------------------+----------------</div><div class='add'>+ * Bit 15 - Soft Reset         | 0xF/4                       | Not supported</div><div class='add'>+ * Bit 14 - Loopback           | 0xD/0 (MAC), 0xF/7 (PHY)    ~ 0xD/0 (PHY)</div><div class='add'>+ * Bit 13 - Force 100          | 0xC/6                       = 0xC/6</div><div class='add'>+ * Bit 12 - AN Enable          | 0xC/7 (reverse logic)       ~ 0xC/7</div><div class='add'>+ * Bit 11 - Power Down         | 0xD/3                       = 0xD/3</div><div class='add'>+ * Bit 10 - PHY Isolate        | 0xF/5                       | Not supported</div><div class='add'>+ * Bit 9 - Restart AN          | 0xD/5                       = 0xD/5</div><div class='add'>+ * Bit 8 - Force Full-Duplex   | 0xC/5                       = 0xC/5</div><div class='add'>+ * Bit 7 - Collision Test/Res. | Not supported               | Not supported</div><div class='add'>+ * Bit 6 - Reserved            | Not supported               | Not supported</div><div class='add'>+ * Bit 5 - Hp_mdix             | 0x9/7                       ~ 0xF/7</div><div class='add'>+ * Bit 4 - Force MDI           | 0xD/1                       = 0xD/1</div><div class='add'>+ * Bit 3 - Disable MDIX        | 0xD/2                       = 0xD/2</div><div class='add'>+ * Bit 2 - Disable Far-End F.  | ????                        | 0xD/4</div><div class='add'>+ * Bit 1 - Disable Transmit    | 0xD/6                       = 0xD/6</div><div class='add'>+ * Bit 0 - Disable LED         | 0xD/7                       = 0xD/7</div><div class='add'>+ * -------------------------------------------------------------------</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz8_w_phy_bmcr(struct ksz_device *dev, u16 port, u16 val)</div><div class='add'>+{</div><div class='add'>+	u8 restart, speed, ctrl, restart_mask;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Do not support PHY reset function. */</div><div class='add'>+	if (val &amp; BMCR_RESET)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	speed = 0;</div><div class='add'>+	if (val &amp; KSZ886X_BMCR_HP_MDIX)</div><div class='add'>+		speed |= PORT_HP_MDIX;</div><div class='add'>+</div><div class='add'>+	ret = ksz_prmw8(dev, port, regs[P_SPEED_STATUS], PORT_HP_MDIX, speed);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctrl = 0;</div><div class='add'>+	if (ksz_is_ksz88x3(dev)) {</div><div class='add'>+		if ((val &amp; BMCR_ANENABLE))</div><div class='add'>+			ctrl |= PORT_AUTO_NEG_ENABLE;</div><div class='add'>+	} else {</div><div class='add'>+		if (!(val &amp; BMCR_ANENABLE))</div><div class='add'>+			ctrl |= PORT_AUTO_NEG_DISABLE;</div><div class='add'>+</div><div class='add'>+		/* Fiber port does not support auto-negotiation. */</div><div class='add'>+		if (dev-&gt;ports[port].fiber)</div><div class='add'>+			ctrl |= PORT_AUTO_NEG_DISABLE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val &amp; BMCR_SPEED100)</div><div class='add'>+		ctrl |= PORT_FORCE_100_MBIT;</div><div class='add'>+</div><div class='add'>+	if (val &amp; BMCR_FULLDPLX)</div><div class='add'>+		ctrl |= PORT_FORCE_FULL_DUPLEX;</div><div class='add'>+</div><div class='add'>+	ret = ksz_prmw8(dev, port, regs[P_FORCE_CTRL], PORT_FORCE_100_MBIT |</div><div class='add'>+		 /* PORT_AUTO_NEG_ENABLE and PORT_AUTO_NEG_DISABLE are the same</div><div class='add'>+		  * bits</div><div class='add'>+		  */</div><div class='add'>+		 PORT_FORCE_FULL_DUPLEX | PORT_AUTO_NEG_ENABLE, ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	restart = 0;</div><div class='add'>+	restart_mask = PORT_LED_OFF | PORT_TX_DISABLE | PORT_AUTO_NEG_RESTART |</div><div class='add'>+		PORT_POWER_DOWN | PORT_AUTO_MDIX_DISABLE | PORT_FORCE_MDIX;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_BMCR_DISABLE_LED)</div><div class='add'>+		restart |= PORT_LED_OFF;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_BMCR_DISABLE_TRANSMIT)</div><div class='add'>+		restart |= PORT_TX_DISABLE;</div><div class='add'>+</div><div class='add'>+	if (val &amp; BMCR_ANRESTART)</div><div class='add'>+		restart |= PORT_AUTO_NEG_RESTART;</div><div class='add'>+</div><div class='add'>+	if (val &amp; BMCR_PDOWN)</div><div class='add'>+		restart |= PORT_POWER_DOWN;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_BMCR_DISABLE_AUTO_MDIX)</div><div class='add'>+		restart |= PORT_AUTO_MDIX_DISABLE;</div><div class='add'>+</div><div class='add'>+	if (val &amp; KSZ886X_BMCR_FORCE_MDI)</div><div class='add'>+		restart |= PORT_FORCE_MDIX;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz88x3(dev)) {</div><div class='add'>+		restart_mask |= KSZ8873_PORT_PHY_LOOPBACK;</div><div class='add'>+</div><div class='add'>+		if (val &amp; BMCR_LOOPBACK)</div><div class='add'>+			restart |= KSZ8873_PORT_PHY_LOOPBACK;</div><div class='add'>+	} else {</div><div class='add'>+		ret = ksz879x_set_loopback(dev, port, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_prmw8(dev, port, regs[P_NEG_RESTART_CTRL], restart_mask,</div><div class='add'>+			 restart);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u8 ctrl, data;</div><div class='add'>+	u16 p = phy;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case MII_BMCR:</div><div class='add'>+		ret = ksz8_w_phy_bmcr(dev, p, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	case MII_ADVERTISE:</div><div class='add'>+		ret = ksz_pread8(dev, p, regs[P_LOCAL_CTRL], &amp;ctrl);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		data = ctrl;</div><div class='add'>+		data &amp;= ~(PORT_AUTO_NEG_SYM_PAUSE |</div><div class='add'>+			  PORT_AUTO_NEG_100BTX_FD |</div><div class='add'>+			  PORT_AUTO_NEG_100BTX |</div><div class='add'>+			  PORT_AUTO_NEG_10BT_FD |</div><div class='add'>+			  PORT_AUTO_NEG_10BT);</div><div class='add'>+		if (val &amp; ADVERTISE_PAUSE_CAP)</div><div class='add'>+			data |= PORT_AUTO_NEG_SYM_PAUSE;</div><div class='add'>+		if (val &amp; ADVERTISE_100FULL)</div><div class='add'>+			data |= PORT_AUTO_NEG_100BTX_FD;</div><div class='add'>+		if (val &amp; ADVERTISE_100HALF)</div><div class='add'>+			data |= PORT_AUTO_NEG_100BTX;</div><div class='add'>+		if (val &amp; ADVERTISE_10FULL)</div><div class='add'>+			data |= PORT_AUTO_NEG_10BT_FD;</div><div class='add'>+		if (val &amp; ADVERTISE_10HALF)</div><div class='add'>+			data |= PORT_AUTO_NEG_10BT;</div><div class='add'>+</div><div class='add'>+		if (data != ctrl) {</div><div class='add'>+			ret = ksz_pwrite8(dev, p, regs[P_LOCAL_CTRL], data);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case PHY_REG_LINK_MD:</div><div class='add'>+		if (val &amp; PHY_START_CABLE_DIAG)</div><div class='add'>+			ksz_port_cfg(dev, p, REG_PORT_LINK_MD_CTRL, PORT_START_CABLE_DIAG, true);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PHY_REG_PHY_CTRL:</div><div class='add'>+		ret = ksz8_w_phy_ctrl(dev, p, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member)</div><div class='add'>+{</div><div class='add'>+	int offset = P_MIRROR_CTRL;</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz8463(dev))</div><div class='add'>+		offset = P1CR2;</div><div class='add'>+	ksz_pread8(dev, port, offset, &amp;data);</div><div class='add'>+	data &amp;= ~dev-&gt;port_mask;</div><div class='add'>+	data |= (member &amp; dev-&gt;port_mask);</div><div class='add'>+	ksz_pwrite8(dev, port, offset, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	u8 learn[DSA_MAX_PORTS];</div><div class='add'>+	int first, index, cnt;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	int reg = S_FLUSH_TABLE_CTRL;</div><div class='add'>+	int mask = SW_FLUSH_DYN_MAC_TABLE;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	if ((uint)port &lt; dev-&gt;info-&gt;port_cnt) {</div><div class='add'>+		first = port;</div><div class='add'>+		cnt = port + 1;</div><div class='add'>+	} else {</div><div class='add'>+		/* Flush all ports. */</div><div class='add'>+		first = 0;</div><div class='add'>+		cnt = dev-&gt;info-&gt;port_cnt;</div><div class='add'>+	}</div><div class='add'>+	for (index = first; index &lt; cnt; index++) {</div><div class='add'>+		ksz_pread8(dev, index, regs[P_STP_CTRL], &amp;learn[index]);</div><div class='add'>+		if (!(learn[index] &amp; PORT_LEARN_DISABLE))</div><div class='add'>+			ksz_pwrite8(dev, index, regs[P_STP_CTRL],</div><div class='add'>+				    learn[index] | PORT_LEARN_DISABLE);</div><div class='add'>+	}</div><div class='add'>+	if (ksz_is_ksz8463(dev)) {</div><div class='add'>+		reg = KSZ8463_FLUSH_TABLE_CTRL;</div><div class='add'>+		mask = KSZ8463_FLUSH_DYN_MAC_TABLE;</div><div class='add'>+	}</div><div class='add'>+	ksz_cfg(dev, reg, mask, true);</div><div class='add'>+	for (index = first; index &lt; cnt; index++) {</div><div class='add'>+		if (!(learn[index] &amp; PORT_LEARN_DISABLE))</div><div class='add'>+			ksz_pwrite8(dev, index, regs[P_STP_CTRL], learn[index]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_fdb_dump(struct ksz_device *dev, int port,</div><div class='add'>+		  dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	u8 src_port, fid;</div><div class='add'>+	u16 entries = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; KSZ8_DYN_MAC_ENTRIES; i++) {</div><div class='add'>+		ret = ksz8_r_dyn_mac_table(dev, i, mac, &amp;fid, &amp;src_port,</div><div class='add'>+					   &amp;entries);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= entries)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (port == src_port) {</div><div class='add'>+			ret = cb(mac, fid, false, data);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_add_sta_mac(struct ksz_device *dev, int port,</div><div class='add'>+			    const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct alu_struct alu;</div><div class='add'>+	int index, ret;</div><div class='add'>+	int empty = 0;</div><div class='add'>+</div><div class='add'>+	alu.port_forward = 0;</div><div class='add'>+	for (index = 0; index &lt; dev-&gt;info-&gt;num_statics; index++) {</div><div class='add'>+		bool valid;</div><div class='add'>+</div><div class='add'>+		ret = ksz8_r_sta_mac_table(dev, index, &amp;alu, &amp;valid);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (!valid) {</div><div class='add'>+			/* Remember the first empty entry. */</div><div class='add'>+			if (!empty)</div><div class='add'>+				empty = index + 1;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!memcmp(alu.mac, addr, ETH_ALEN) &amp;&amp; alu.fid == vid)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no available entry */</div><div class='add'>+	if (index == dev-&gt;info-&gt;num_statics &amp;&amp; !empty)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* add entry */</div><div class='add'>+	if (index == dev-&gt;info-&gt;num_statics) {</div><div class='add'>+		index = empty - 1;</div><div class='add'>+		memset(&amp;alu, 0, sizeof(alu));</div><div class='add'>+		memcpy(alu.mac, addr, ETH_ALEN);</div><div class='add'>+		alu.is_static = true;</div><div class='add'>+	}</div><div class='add'>+	alu.port_forward |= BIT(port);</div><div class='add'>+	if (vid) {</div><div class='add'>+		alu.is_use_fid = true;</div><div class='add'>+</div><div class='add'>+		/* Need a way to map VID to FID. */</div><div class='add'>+		alu.fid = vid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz8_w_sta_mac_table(dev, index, &amp;alu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_del_sta_mac(struct ksz_device *dev, int port,</div><div class='add'>+			    const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct alu_struct alu;</div><div class='add'>+	int index, ret;</div><div class='add'>+</div><div class='add'>+	for (index = 0; index &lt; dev-&gt;info-&gt;num_statics; index++) {</div><div class='add'>+		bool valid;</div><div class='add'>+</div><div class='add'>+		ret = ksz8_r_sta_mac_table(dev, index, &amp;alu, &amp;valid);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (!valid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!memcmp(alu.mac, addr, ETH_ALEN) &amp;&amp; alu.fid == vid)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no available entry */</div><div class='add'>+	if (index == dev-&gt;info-&gt;num_statics)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* clear port */</div><div class='add'>+	alu.port_forward &amp;= ~BIT(port);</div><div class='add'>+	if (!alu.port_forward)</div><div class='add'>+		alu.is_static = false;</div><div class='add'>+</div><div class='add'>+	return ksz8_w_sta_mac_table(dev, index, &amp;alu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_mdb_add(struct ksz_device *dev, int port,</div><div class='add'>+		 const struct switchdev_obj_port_mdb *mdb, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	return ksz8_add_sta_mac(dev, port, mdb-&gt;addr, mdb-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_mdb_del(struct ksz_device *dev, int port,</div><div class='add'>+		 const struct switchdev_obj_port_mdb *mdb, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	return ksz8_del_sta_mac(dev, port, mdb-&gt;addr, mdb-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_fdb_add(struct ksz_device *dev, int port, const unsigned char *addr,</div><div class='add'>+		 u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	return ksz8_add_sta_mac(dev, port, addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_fdb_del(struct ksz_device *dev, int port, const unsigned char *addr,</div><div class='add'>+		 u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	return ksz8_del_sta_mac(dev, port, addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_port_vlan_filtering(struct ksz_device *dev, int port, bool flag,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Discard packets with VID not enabled on the switch */</div><div class='add'>+	ksz_cfg(dev, S_MIRROR_CTRL, SW_VLAN_ENABLE, flag);</div><div class='add'>+</div><div class='add'>+	/* Discard packets with VID not enabled on the ingress port */</div><div class='add'>+	for (port = 0; port &lt; dev-&gt;phy_port_cnt; ++port)</div><div class='add'>+		ksz_port_cfg(dev, port, REG_PORT_CTRL_2, PORT_INGRESS_FILTER,</div><div class='add'>+			     flag);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8_port_enable_pvid(struct ksz_device *dev, int port, bool state)</div><div class='add'>+{</div><div class='add'>+	if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) {</div><div class='add'>+		int reg = REG_SW_INSERT_SRC_PVID;</div><div class='add'>+</div><div class='add'>+		if (ksz_is_ksz8463(dev))</div><div class='add'>+			reg = KSZ8463_REG_SW_CTRL_9;</div><div class='add'>+		ksz_cfg(dev, reg, 0x03 &lt;&lt; (4 - 2 * port), state);</div><div class='add'>+	} else {</div><div class='add'>+		ksz_pwrite8(dev, port, REG_PORT_CTRL_12, state ? 0x0f : 0x00);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_port_vlan_add(struct ksz_device *dev, int port,</div><div class='add'>+		       const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+	u16 data, new_pvid = 0;</div><div class='add'>+	u8 fid, member, valid;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* If a VLAN is added with untagged flag different from the</div><div class='add'>+	 * port's Remove Tag flag, we need to change the latter.</div><div class='add'>+	 * Ignore VID 0, which is always untagged.</div><div class='add'>+	 * Ignore CPU port, which will always be tagged.</div><div class='add'>+	 */</div><div class='add'>+	if (untagged != p-&gt;remove_tag &amp;&amp; vlan-&gt;vid != 0 &amp;&amp;</div><div class='add'>+	    port != dev-&gt;cpu_port) {</div><div class='add'>+		unsigned int vid;</div><div class='add'>+</div><div class='add'>+		/* Reject attempts to add a VLAN that requires the</div><div class='add'>+		 * Remove Tag flag to be changed, unless there are no</div><div class='add'>+		 * other VLANs currently configured.</div><div class='add'>+		 */</div><div class='add'>+		for (vid = 1; vid &lt; dev-&gt;info-&gt;num_vlans; ++vid) {</div><div class='add'>+			/* Skip the VID we are going to add or reconfigure */</div><div class='add'>+			if (vid == vlan-&gt;vid)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ksz8_from_vlan(dev, dev-&gt;vlan_cache[vid].table[0],</div><div class='add'>+				       &amp;fid, &amp;member, &amp;valid);</div><div class='add'>+			if (valid &amp;&amp; (member &amp; BIT(port)))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ksz_port_cfg(dev, port, P_TAG_CTRL, PORT_REMOVE_TAG, untagged);</div><div class='add'>+		p-&gt;remove_tag = untagged;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz8_r_vlan_table(dev, vlan-&gt;vid, &amp;data);</div><div class='add'>+	ksz8_from_vlan(dev, data, &amp;fid, &amp;member, &amp;valid);</div><div class='add'>+</div><div class='add'>+	/* First time to setup the VLAN entry. */</div><div class='add'>+	if (!valid) {</div><div class='add'>+		/* Need to find a way to map VID to FID. */</div><div class='add'>+		fid = 1;</div><div class='add'>+		valid = 1;</div><div class='add'>+	}</div><div class='add'>+	member |= BIT(port);</div><div class='add'>+</div><div class='add'>+	ksz8_to_vlan(dev, fid, member, valid, &amp;data);</div><div class='add'>+	ksz8_w_vlan_table(dev, vlan-&gt;vid, data);</div><div class='add'>+</div><div class='add'>+	/* change PVID */</div><div class='add'>+	if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='add'>+		new_pvid = vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+	if (new_pvid) {</div><div class='add'>+		u16 vid;</div><div class='add'>+</div><div class='add'>+		ksz_pread16(dev, port, REG_PORT_CTRL_VID, &amp;vid);</div><div class='add'>+		vid &amp;= ~VLAN_VID_MASK;</div><div class='add'>+		vid |= new_pvid;</div><div class='add'>+		ksz_pwrite16(dev, port, REG_PORT_CTRL_VID, vid);</div><div class='add'>+</div><div class='add'>+		ksz8_port_enable_pvid(dev, port, true);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_port_vlan_del(struct ksz_device *dev, int port,</div><div class='add'>+		       const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	u16 data, pvid;</div><div class='add'>+	u8 fid, member, valid;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev))</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	ksz_pread16(dev, port, REG_PORT_CTRL_VID, &amp;pvid);</div><div class='add'>+	pvid = pvid &amp; 0xFFF;</div><div class='add'>+</div><div class='add'>+	ksz8_r_vlan_table(dev, vlan-&gt;vid, &amp;data);</div><div class='add'>+	ksz8_from_vlan(dev, data, &amp;fid, &amp;member, &amp;valid);</div><div class='add'>+</div><div class='add'>+	member &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	/* Invalidate the entry if no more member. */</div><div class='add'>+	if (!member) {</div><div class='add'>+		fid = 0;</div><div class='add'>+		valid = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz8_to_vlan(dev, fid, member, valid, &amp;data);</div><div class='add'>+	ksz8_w_vlan_table(dev, vlan-&gt;vid, data);</div><div class='add'>+</div><div class='add'>+	if (pvid == vlan-&gt;vid)</div><div class='add'>+		ksz8_port_enable_pvid(dev, port, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_port_mirror_add(struct ksz_device *dev, int port,</div><div class='add'>+			 struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			 bool ingress, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int offset = P_MIRROR_CTRL;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz8463(dev))</div><div class='add'>+		offset = P1CR2;</div><div class='add'>+	if (ingress) {</div><div class='add'>+		ksz_port_cfg(dev, port, offset, PORT_MIRROR_RX, true);</div><div class='add'>+		dev-&gt;mirror_rx |= BIT(port);</div><div class='add'>+	} else {</div><div class='add'>+		ksz_port_cfg(dev, port, offset, PORT_MIRROR_TX, true);</div><div class='add'>+		dev-&gt;mirror_tx |= BIT(port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz_port_cfg(dev, port, offset, PORT_MIRROR_SNIFFER, false);</div><div class='add'>+</div><div class='add'>+	/* configure mirror port */</div><div class='add'>+	if (dev-&gt;mirror_rx || dev-&gt;mirror_tx)</div><div class='add'>+		ksz_port_cfg(dev, mirror-&gt;to_local_port, offset,</div><div class='add'>+			     PORT_MIRROR_SNIFFER, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_port_mirror_del(struct ksz_device *dev, int port,</div><div class='add'>+			  struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	int offset = P_MIRROR_CTRL;</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz8463(dev))</div><div class='add'>+		offset = P1CR2;</div><div class='add'>+	if (mirror-&gt;ingress) {</div><div class='add'>+		ksz_port_cfg(dev, port, offset, PORT_MIRROR_RX, false);</div><div class='add'>+		dev-&gt;mirror_rx &amp;= ~BIT(port);</div><div class='add'>+	} else {</div><div class='add'>+		ksz_port_cfg(dev, port, offset, PORT_MIRROR_TX, false);</div><div class='add'>+		dev-&gt;mirror_tx &amp;= ~BIT(port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, offset, &amp;data);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;mirror_rx &amp;&amp; !dev-&gt;mirror_tx)</div><div class='add'>+		ksz_port_cfg(dev, mirror-&gt;to_local_port, offset,</div><div class='add'>+			     PORT_MIRROR_SNIFFER, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8795_cpu_interface_select(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	if (!ksz_is_ksz87xx(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!p-&gt;interface &amp;&amp; dev-&gt;compat_interface) {</div><div class='add'>+		dev_warn(dev-&gt;dev,</div><div class='add'>+			 "Using legacy switch \"phy-mode\" property, because it is missing on port %d node. "</div><div class='add'>+			 "Please update your device tree.\n",</div><div class='add'>+			 port);</div><div class='add'>+		p-&gt;interface = dev-&gt;compat_interface;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	int offset;</div><div class='add'>+	u8 member;</div><div class='add'>+</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='add'>+	/* enable broadcast storm limit */</div><div class='add'>+	offset = P_BCAST_STORM_CTRL;</div><div class='add'>+	if (ksz_is_ksz8463(dev))</div><div class='add'>+		offset = P1CR1;</div><div class='add'>+	ksz_port_cfg(dev, port, offset, PORT_BROADCAST_STORM, true);</div><div class='add'>+</div><div class='add'>+	ksz8_port_queue_split(dev, port, dev-&gt;info-&gt;num_tx_queues);</div><div class='add'>+</div><div class='add'>+	/* replace priority */</div><div class='add'>+	offset = P_802_1P_CTRL;</div><div class='add'>+	if (ksz_is_ksz8463(dev))</div><div class='add'>+		offset = P1CR2;</div><div class='add'>+	ksz_port_cfg(dev, port, offset,</div><div class='add'>+		     masks[PORT_802_1P_REMAPPING], false);</div><div class='add'>+</div><div class='add'>+	if (cpu_port)</div><div class='add'>+		member = dsa_user_ports(ds);</div><div class='add'>+	else</div><div class='add'>+		member = BIT(dsa_upstream_port(ds, port));</div><div class='add'>+</div><div class='add'>+	ksz8_cfg_port_member(dev, port, member);</div><div class='add'>+</div><div class='add'>+	/* Disable all WoL options by default. Otherwise</div><div class='add'>+	 * ksz_switch_macaddr_get/put logic will not work properly.</div><div class='add'>+	 * CPU port 4 has no WoL functionality.</div><div class='add'>+	 */</div><div class='add'>+	if (ksz_is_ksz87xx(dev) &amp;&amp; !cpu_port)</div><div class='add'>+		ksz8_pme_pwrite8(dev, port, regs[REG_PORT_PME_CTRL], 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz88x3_config_rmii_clk(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dsa_to_port(dev-&gt;ds, dev-&gt;cpu_port);</div><div class='add'>+	bool rmii_clk_internal;</div><div class='add'>+</div><div class='add'>+	if (!ksz_is_ksz88x3(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rmii_clk_internal = of_property_read_bool(cpu_dp-&gt;dn,</div><div class='add'>+						  "microchip,rmii-clk-internal");</div><div class='add'>+</div><div class='add'>+	ksz_cfg(dev, KSZ88X3_REG_FVID_AND_HOST_MODE,</div><div class='add'>+		KSZ88X3_PORT3_RMII_CLK_INTERNAL, rmii_clk_internal);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_config_cpu_port(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *p;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u8 remote;</div><div class='add'>+	u8 fiber_ports = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ksz_cfg(dev, regs[S_TAIL_TAG_CTRL], masks[SW_TAIL_TAG_ENABLE], true);</div><div class='add'>+</div><div class='add'>+	ksz8_port_setup(dev, dev-&gt;cpu_port, true);</div><div class='add'>+</div><div class='add'>+	ksz8795_cpu_interface_select(dev, dev-&gt;cpu_port);</div><div class='add'>+	ksz88x3_config_rmii_clk(dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;phy_port_cnt; i++) {</div><div class='add'>+		ksz_port_stp_state_set(ds, i, BR_STATE_DISABLED);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;phy_port_cnt; i++) {</div><div class='add'>+		p = &amp;dev-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		/* For KSZ8795 family. */</div><div class='add'>+		if (ksz_is_ksz87xx(dev)) {</div><div class='add'>+			ksz_pread8(dev, i, regs[P_REMOTE_STATUS], &amp;remote);</div><div class='add'>+			if (remote &amp; KSZ8_PORT_FIBER_MODE)</div><div class='add'>+				p-&gt;fiber = 1;</div><div class='add'>+		}</div><div class='add'>+		if (p-&gt;fiber)</div><div class='add'>+			ksz_port_cfg(dev, i, regs[P_STP_CTRL],</div><div class='add'>+				     PORT_FORCE_FLOW_CTRL, true);</div><div class='add'>+		else</div><div class='add'>+			ksz_port_cfg(dev, i, regs[P_STP_CTRL],</div><div class='add'>+				     PORT_FORCE_FLOW_CTRL, false);</div><div class='add'>+		if (p-&gt;fiber)</div><div class='add'>+			fiber_ports |= (1 &lt;&lt; i);</div><div class='add'>+	}</div><div class='add'>+	if (ksz_is_ksz8463(dev)) {</div><div class='add'>+		/* Setup fiber ports. */</div><div class='add'>+		if (fiber_ports) {</div><div class='add'>+			fiber_ports &amp;= 3;</div><div class='add'>+			regmap_update_bits(ksz_regmap_16(dev),</div><div class='add'>+					   KSZ8463_REG_CFG_CTRL,</div><div class='add'>+					   fiber_ports &lt;&lt; PORT_COPPER_MODE_S,</div><div class='add'>+					   0);</div><div class='add'>+			regmap_update_bits(ksz_regmap_16(dev),</div><div class='add'>+					   KSZ8463_REG_DSP_CTRL_6,</div><div class='add'>+					   COPPER_RECEIVE_ADJUSTMENT, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Turn off PTP function as the switch's proprietary way of</div><div class='add'>+		 * handling timestamp is not supported in current Linux PTP</div><div class='add'>+		 * stack implementation.</div><div class='add'>+		 */</div><div class='add'>+		regmap_update_bits(ksz_regmap_16(dev),</div><div class='add'>+				   KSZ8463_PTP_MSG_CONF1,</div><div class='add'>+				   PTP_ENABLE, 0);</div><div class='add'>+		regmap_update_bits(ksz_regmap_16(dev),</div><div class='add'>+				   KSZ8463_PTP_CLK_CTRL,</div><div class='add'>+				   PTP_CLK_ENABLE, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_phy_port_link_up - Configures ports with integrated PHYs</div><div class='add'>+ * @dev: The KSZ device instance.</div><div class='add'>+ * @port: The port number to configure.</div><div class='add'>+ * @duplex: The desired duplex mode.</div><div class='add'>+ * @tx_pause: If true, enables transmit pause.</div><div class='add'>+ * @rx_pause: If true, enables receive pause.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * The function configures flow control settings for a given port based on the</div><div class='add'>+ * desired settings and current duplex mode.</div><div class='add'>+ *</div><div class='add'>+ * According to the KSZ8873 datasheet, the PORT_FORCE_FLOW_CTRL bit in the</div><div class='add'>+ * Port Control 2 register (0x1A for Port 1, 0x22 for Port 2, 0x32 for Port 3)</div><div class='add'>+ * determines how flow control is handled on the port:</div><div class='add'>+ *    "1 = will always enable full-duplex flow control on the port, regardless</div><div class='add'>+ *         of AN result.</div><div class='add'>+ *     0 = full-duplex flow control is enabled based on AN result."</div><div class='add'>+ *</div><div class='add'>+ * This means that the flow control behavior depends on the state of this bit:</div><div class='add'>+ * - If PORT_FORCE_FLOW_CTRL is set to 1, the switch will ignore AN results and</div><div class='add'>+ *   force flow control on the port.</div><div class='add'>+ * - If PORT_FORCE_FLOW_CTRL is set to 0, the switch will enable or disable</div><div class='add'>+ *   flow control based on the AN results.</div><div class='add'>+ *</div><div class='add'>+ * However, there is a potential limitation in this configuration. It is</div><div class='add'>+ * currently not possible to force disable flow control on a port if we still</div><div class='add'>+ * advertise pause support. While such a configuration is not currently</div><div class='add'>+ * supported by Linux, and may not make practical sense, it's important to be</div><div class='add'>+ * aware of this limitation when working with the KSZ8873 and similar devices.</div><div class='add'>+ */</div><div class='add'>+static void ksz8_phy_port_link_up(struct ksz_device *dev, int port, int duplex,</div><div class='add'>+				  bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 sctrl = 0;</div><div class='add'>+</div><div class='add'>+	/* The KSZ8795 switch differs from the KSZ8873 by supporting</div><div class='add'>+	 * asymmetric pause control. However, since a single bit is used to</div><div class='add'>+	 * control both RX and TX pause, we can't enforce asymmetric pause</div><div class='add'>+	 * control - both TX and RX pause will be either enabled or disabled</div><div class='add'>+	 * together.</div><div class='add'>+	 *</div><div class='add'>+	 * If auto-negotiation is enabled, we usually allow the flow control to</div><div class='add'>+	 * be determined by the auto-negotiation process based on the</div><div class='add'>+	 * capabilities of both link partners. However, for KSZ8873, the</div><div class='add'>+	 * PORT_FORCE_FLOW_CTRL bit may be set by the hardware bootstrap,</div><div class='add'>+	 * ignoring the auto-negotiation result. Thus, even in auto-negotiation</div><div class='add'>+	 * mode, we need to ensure that the PORT_FORCE_FLOW_CTRL bit is</div><div class='add'>+	 * properly cleared.</div><div class='add'>+	 *</div><div class='add'>+	 * In the absence of pause auto-negotiation, we will enforce symmetric</div><div class='add'>+	 * pause control for both variants of switches - KSZ8873 and KSZ8795.</div><div class='add'>+	 *</div><div class='add'>+	 * Autoneg Pause Autoneg      rx,tx	PORT_FORCE_FLOW_CTRL</div><div class='add'>+	 * 1		1		x	0</div><div class='add'>+	 * 0		1		x	0 (flow control probably disabled)</div><div class='add'>+	 * x		0		1	1 (flow control force enabled)</div><div class='add'>+	 * 1		0		0	0 (flow control still depends on</div><div class='add'>+	 *					   aneg result due to hardware)</div><div class='add'>+	 * 0		0		0	0 (flow control probably disabled)</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;ports[port].manual_flow &amp;&amp; tx_pause)</div><div class='add'>+		sctrl |= PORT_FORCE_FLOW_CTRL;</div><div class='add'>+</div><div class='add'>+	ksz_prmw8(dev, port, regs[P_STP_CTRL], PORT_FORCE_FLOW_CTRL, sctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz8_cpu_port_link_up - Configures the CPU port of the switch.</div><div class='add'>+ * @dev: The KSZ device instance.</div><div class='add'>+ * @speed: The desired link speed.</div><div class='add'>+ * @duplex: The desired duplex mode.</div><div class='add'>+ * @tx_pause: If true, enables transmit pause.</div><div class='add'>+ * @rx_pause: If true, enables receive pause.</div><div class='add'>+ *</div><div class='add'>+ * Description:</div><div class='add'>+ * The function configures flow control and speed settings for the CPU</div><div class='add'>+ * port of the switch based on the desired settings, current duplex mode, and</div><div class='add'>+ * speed.</div><div class='add'>+ */</div><div class='add'>+static void ksz8_cpu_port_link_up(struct ksz_device *dev, int speed, int duplex,</div><div class='add'>+				  bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 ctrl = 0;</div><div class='add'>+</div><div class='add'>+	/* SW_FLOW_CTRL, SW_HALF_DUPLEX, and SW_10_MBIT bits are bootstrappable</div><div class='add'>+	 * at least on KSZ8873. They can have different values depending on your</div><div class='add'>+	 * board setup.</div><div class='add'>+	 */</div><div class='add'>+	if (tx_pause || rx_pause)</div><div class='add'>+		ctrl |= SW_FLOW_CTRL;</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_HALF)</div><div class='add'>+		ctrl |= SW_HALF_DUPLEX;</div><div class='add'>+</div><div class='add'>+	/* This hardware only supports SPEED_10 and SPEED_100. For SPEED_10</div><div class='add'>+	 * we need to set the SW_10_MBIT bit. Otherwise, we can leave it 0.</div><div class='add'>+	 */</div><div class='add'>+	if (speed == SPEED_10)</div><div class='add'>+		ctrl |= SW_10_MBIT;</div><div class='add'>+</div><div class='add'>+	ksz_rmw8(dev, regs[S_BROADCAST_CTRL], SW_HALF_DUPLEX | SW_FLOW_CTRL |</div><div class='add'>+		 SW_10_MBIT, ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+			      struct phy_device *phydev, unsigned int mode,</div><div class='add'>+			      phy_interface_t interface, int speed, int duplex,</div><div class='add'>+			      bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ksz_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	/* If the port is the CPU port, apply special handling. Only the CPU</div><div class='add'>+	 * port is configured via global registers.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;cpu_port == port)</div><div class='add'>+		ksz8_cpu_port_link_up(dev, speed, duplex, tx_pause, rx_pause);</div><div class='add'>+	else if (dev-&gt;info-&gt;internal_phy[port])</div><div class='add'>+		ksz8_phy_port_link_up(dev, port, duplex, tx_pause, rx_pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8_handle_global_errata(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* KSZ87xx Errata DS80000687C.</div><div class='add'>+	 * Module 2: Link drops with some EEE link partners.</div><div class='add'>+	 *   An issue with the EEE next page exchange between the</div><div class='add'>+	 *   KSZ879x/KSZ877x/KSZ876x and some EEE link partners may result in</div><div class='add'>+	 *   the link dropping.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;info-&gt;ksz87xx_eee_link_erratum)</div><div class='add'>+		ret = ksz8_ind_write8(dev, TABLE_EEE, REG_IND_EEE_GLOB2_HI, 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_enable_stp_addr(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct alu_struct alu;</div><div class='add'>+</div><div class='add'>+	/* Setup STP address for STP operation. */</div><div class='add'>+	memset(&amp;alu, 0, sizeof(alu));</div><div class='add'>+	ether_addr_copy(alu.mac, eth_stp_addr);</div><div class='add'>+	alu.is_static = true;</div><div class='add'>+	alu.is_override = true;</div><div class='add'>+	alu.port_forward = dev-&gt;info-&gt;cpu_ports;</div><div class='add'>+</div><div class='add'>+	return ksz8_w_sta_mac_table(dev, 0, &amp;alu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='add'>+</div><div class='add'>+	/* We rely on software untagging on the CPU port, so that we</div><div class='add'>+	 * can support both tagged and untagged VLANs</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;untag_bridge_pvid = true;</div><div class='add'>+</div><div class='add'>+	/* VLAN filtering is partly controlled by the global VLAN</div><div class='add'>+	 * Enable flag</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;vlan_filtering_is_global = true;</div><div class='add'>+</div><div class='add'>+	/* Enable automatic fast aging when link changed detected. */</div><div class='add'>+	ksz_cfg(dev, S_LINK_AGING_CTRL, SW_LINK_AUTO_AGING, true);</div><div class='add'>+</div><div class='add'>+	/* Enable aggressive back off algorithm in half duplex mode. */</div><div class='add'>+	ret = ksz_rmw8(dev, REG_SW_CTRL_1, SW_AGGR_BACKOFF, SW_AGGR_BACKOFF);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure unicast VLAN boundary is set as default and</div><div class='add'>+	 * enable no excessive collision drop.</div><div class='add'>+	 */</div><div class='add'>+	ret = ksz_rmw8(dev, REG_SW_CTRL_2,</div><div class='add'>+		       UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP,</div><div class='add'>+		       UNICAST_VLAN_BOUNDARY | NO_EXC_COLLISION_DROP);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ksz_cfg(dev, S_REPLACE_VID_CTRL, SW_REPLACE_VID, false);</div><div class='add'>+</div><div class='add'>+	ksz_cfg(dev, S_MIRROR_CTRL, SW_MIRROR_RX_TX, false);</div><div class='add'>+</div><div class='add'>+	if (!ksz_is_ksz88x3(dev) &amp;&amp; !ksz_is_ksz8463(dev))</div><div class='add'>+		ksz_cfg(dev, REG_SW_CTRL_19, SW_INS_TAG_ENABLE, true);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (dev-&gt;info-&gt;num_vlans / 4); i++)</div><div class='add'>+		ksz8_r_vlan_entries(dev, i);</div><div class='add'>+</div><div class='add'>+	/* Make sure PME (WoL) is not enabled. If requested, it will</div><div class='add'>+	 * be enabled by ksz_wol_pre_shutdown(). Otherwise, some PMICs</div><div class='add'>+	 * do not like PME events changes before shutdown. PME only</div><div class='add'>+	 * available on KSZ87xx family.</div><div class='add'>+	 */</div><div class='add'>+	if (ksz_is_ksz87xx(dev)) {</div><div class='add'>+		ret = ksz8_pme_write8(dev, regs[REG_SW_PME_CTRL], 0);</div><div class='add'>+		if (!ret)</div><div class='add'>+			ret = ksz_rmw8(dev, REG_INT_ENABLE, INT_PME, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		return ksz8_handle_global_errata(ds);</div><div class='add'>+	else</div><div class='add'>+		return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_get_caps(struct ksz_device *dev, int port,</div><div class='add'>+		   struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;mac_capabilities = MAC_10 | MAC_100;</div><div class='add'>+</div><div class='add'>+	/* Silicon Errata Sheet (DS80000830A):</div><div class='add'>+	 * "Port 1 does not respond to received flow control PAUSE frames"</div><div class='add'>+	 * So, disable Pause support on "Port 1" (port == 0) for all ksz88x3</div><div class='add'>+	 * switches.</div><div class='add'>+	 */</div><div class='add'>+	if (!ksz_is_ksz88x3(dev) || port)</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_SYM_PAUSE;</div><div class='add'>+</div><div class='add'>+	/* Asym pause is not supported on KSZ8863 and KSZ8873 */</div><div class='add'>+	if (!ksz_is_ksz88x3(dev))</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_ASYM_PAUSE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ksz8_get_port_addr(int port, int offset)</div><div class='add'>+{</div><div class='add'>+	return PORT_CTRL_ADDR(port, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 ksz8463_get_port_addr(int port, int offset)</div><div class='add'>+{</div><div class='add'>+	return offset + 0x18 * port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 ksz8463_get_phy_addr(u16 phy, u16 reg, u16 offset)</div><div class='add'>+{</div><div class='add'>+	return offset + reg * 2 + phy * (P2MBCR - P1MBCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8463_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val)</div><div class='add'>+{</div><div class='add'>+	u16 sw_reg = 0;</div><div class='add'>+	u16 data = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (phy &gt; 1)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case MII_PHYSID1:</div><div class='add'>+		sw_reg = ksz8463_get_phy_addr(phy, 0, PHY1IHR);</div><div class='add'>+		break;</div><div class='add'>+	case MII_PHYSID2:</div><div class='add'>+		sw_reg = ksz8463_get_phy_addr(phy, 0, PHY1ILR);</div><div class='add'>+		break;</div><div class='add'>+	case MII_BMCR:</div><div class='add'>+	case MII_BMSR:</div><div class='add'>+	case MII_ADVERTISE:</div><div class='add'>+	case MII_LPA:</div><div class='add'>+		sw_reg = ksz8463_get_phy_addr(phy, reg, P1MBCR);</div><div class='add'>+		break;</div><div class='add'>+	case MII_TPISTATUS:</div><div class='add'>+		/* This register holds the PHY interrupt status for simulated</div><div class='add'>+		 * Micrel KSZ PHY.</div><div class='add'>+		 */</div><div class='add'>+		data = 0x0505;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (sw_reg) {</div><div class='add'>+		ret = ksz_read16(dev, sw_reg, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	*val = data;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8463_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	u16 sw_reg = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (phy &gt; 1)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* No write to fiber port. */</div><div class='add'>+	if (dev-&gt;ports[phy].fiber)</div><div class='add'>+		return 0;</div><div class='add'>+	switch (reg) {</div><div class='add'>+	case MII_BMCR:</div><div class='add'>+	case MII_ADVERTISE:</div><div class='add'>+		sw_reg = ksz8463_get_phy_addr(phy, reg, P1MBCR);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (sw_reg) {</div><div class='add'>+		ret = ksz_write16(dev, sw_reg, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz8_switch_init(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;cpu_port = fls(dev-&gt;info-&gt;cpu_ports) - 1;</div><div class='add'>+	dev-&gt;phy_port_cnt = dev-&gt;info-&gt;port_cnt - 1;</div><div class='add'>+	dev-&gt;port_mask = (BIT(dev-&gt;phy_port_cnt) - 1) | dev-&gt;info-&gt;cpu_ports;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz8_switch_exit(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	ksz8_reset_switch(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Tristram Ha &lt;Tristram.Ha@microchip.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Microchip KSZ8795 Series Switch DSA Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz8.h b/drivers/net/dsa/microchip/ksz8.h<br/>new file mode 100644<br/>index 000000000000..0f2cd1474b44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz8.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz8.h</a></div><div class='hunk'>@@ -0,0 +1,70 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Microchip KSZ8XXX series register access</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2020 Pengutronix, Michael Grzeschik &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __KSZ8XXX_H</div><div class='add'>+#define __KSZ8XXX_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+int ksz8_setup(struct dsa_switch *ds);</div><div class='add'>+u32 ksz8_get_port_addr(int port, int offset);</div><div class='add'>+void ksz8_cfg_port_member(struct ksz_device *dev, int port, u8 member);</div><div class='add'>+void ksz8_flush_dyn_mac_table(struct ksz_device *dev, int port);</div><div class='add'>+void ksz8_port_setup(struct ksz_device *dev, int port, bool cpu_port);</div><div class='add'>+int ksz8_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);</div><div class='add'>+int ksz8_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val);</div><div class='add'>+void ksz8_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt);</div><div class='add'>+void ksz8_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+		    u64 *dropped, u64 *cnt);</div><div class='add'>+void ksz8_freeze_mib(struct ksz_device *dev, int port, bool freeze);</div><div class='add'>+void ksz8_port_init_cnt(struct ksz_device *dev, int port);</div><div class='add'>+int ksz8_fdb_dump(struct ksz_device *dev, int port,</div><div class='add'>+		  dsa_fdb_dump_cb_t *cb, void *data);</div><div class='add'>+int ksz8_fdb_add(struct ksz_device *dev, int port, const unsigned char *addr,</div><div class='add'>+		 u16 vid, struct dsa_db db);</div><div class='add'>+int ksz8_fdb_del(struct ksz_device *dev, int port, const unsigned char *addr,</div><div class='add'>+		 u16 vid, struct dsa_db db);</div><div class='add'>+int ksz8_mdb_add(struct ksz_device *dev, int port,</div><div class='add'>+		 const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);</div><div class='add'>+int ksz8_mdb_del(struct ksz_device *dev, int port,</div><div class='add'>+		 const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);</div><div class='add'>+int ksz8_port_vlan_filtering(struct ksz_device *dev, int port, bool flag,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='add'>+int ksz8_port_vlan_add(struct ksz_device *dev, int port,</div><div class='add'>+		       const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+int ksz8_port_vlan_del(struct ksz_device *dev, int port,</div><div class='add'>+		       const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+int ksz8_port_mirror_add(struct ksz_device *dev, int port,</div><div class='add'>+			 struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			 bool ingress, struct netlink_ext_ack *extack);</div><div class='add'>+void ksz8_port_mirror_del(struct ksz_device *dev, int port,</div><div class='add'>+			  struct dsa_mall_mirror_tc_entry *mirror);</div><div class='add'>+void ksz8_get_caps(struct ksz_device *dev, int port,</div><div class='add'>+		   struct phylink_config *config);</div><div class='add'>+void ksz8_config_cpu_port(struct dsa_switch *ds);</div><div class='add'>+int ksz8_enable_stp_addr(struct ksz_device *dev);</div><div class='add'>+int ksz8_reset_switch(struct ksz_device *dev);</div><div class='add'>+int ksz8_switch_init(struct ksz_device *dev);</div><div class='add'>+void ksz8_switch_exit(struct ksz_device *dev);</div><div class='add'>+int ksz8_change_mtu(struct ksz_device *dev, int port, int mtu);</div><div class='add'>+int ksz8_pme_write8(struct ksz_device *dev, u32 reg, u8 value);</div><div class='add'>+int ksz8_pme_pread8(struct ksz_device *dev, int port, int offset, u8 *data);</div><div class='add'>+int ksz8_pme_pwrite8(struct ksz_device *dev, int port, int offset, u8 data);</div><div class='add'>+void ksz8_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+			      struct phy_device *phydev, unsigned int mode,</div><div class='add'>+			      phy_interface_t interface, int speed, int duplex,</div><div class='add'>+			      bool tx_pause, bool rx_pause);</div><div class='add'>+int ksz8_all_queues_split(struct ksz_device *dev, int queues);</div><div class='add'>+</div><div class='add'>+u32 ksz8463_get_port_addr(int port, int offset);</div><div class='add'>+int ksz8463_r_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);</div><div class='add'>+int ksz8463_w_phy(struct ksz_device *dev, u16 phy, u16 reg, u16 val);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c<br/>new file mode 100644<br/>index 000000000000..a8bfcd917bf7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz8863_smi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz8863_smi.c</a></div><div class='hunk'>@@ -0,0 +1,226 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Microchip KSZ8863 series register access through SMI</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Pengutronix, Michael Grzeschik &lt;kernel@pengutronix.de&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz8.h"</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+/* Serial Management Interface (SMI) uses the following frame format:</div><div class='add'>+ *</div><div class='add'>+ *       preamble|start|Read/Write|  PHY   |  REG  |TA|   Data bits      | Idle</div><div class='add'>+ *               |frame| OP code  |address |address|  |                  |</div><div class='add'>+ * read | 32x1´s | 01  |    00    | 1xRRR  | RRRRR |Z0| 00000000DDDDDDDD |  Z</div><div class='add'>+ * write| 32x1´s | 01  |    00    | 0xRRR  | RRRRR |10| xxxxxxxxDDDDDDDD |  Z</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define SMI_KSZ88XX_READ_PHY	BIT(4)</div><div class='add'>+</div><div class='add'>+static int ksz8863_mdio_read(void *ctx, const void *reg_buf, size_t reg_len,</div><div class='add'>+			     void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ctx;</div><div class='add'>+	struct mdio_device *mdev;</div><div class='add'>+	u8 reg = *(u8 *)reg_buf;</div><div class='add'>+	u8 *val = val_buf;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	mdev = dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;mdev-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+	for (i = 0; i &lt; val_len; i++) {</div><div class='add'>+		int tmp = reg + i;</div><div class='add'>+</div><div class='add'>+		ret = __mdiobus_read(mdev-&gt;bus, ((tmp &amp; 0xE0) &gt;&gt; 5) |</div><div class='add'>+				     SMI_KSZ88XX_READ_PHY, tmp);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		val[i] = ret;</div><div class='add'>+	}</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;mdev-&gt;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8863_mdio_write(void *ctx, const void *data, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ctx;</div><div class='add'>+	struct mdio_device *mdev;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+	u32 reg;</div><div class='add'>+	u8 *val;</div><div class='add'>+</div><div class='add'>+	mdev = dev-&gt;priv;</div><div class='add'>+</div><div class='add'>+	val = (u8 *)(data + 4);</div><div class='add'>+	reg = *(u32 *)data;</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;mdev-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+	for (i = 0; i &lt; (count - 4); i++) {</div><div class='add'>+		int tmp = reg + i;</div><div class='add'>+</div><div class='add'>+		ret = __mdiobus_write(mdev-&gt;bus, ((tmp &amp; 0xE0) &gt;&gt; 5),</div><div class='add'>+				      tmp, val[i]);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	mutex_unlock(&amp;mdev-&gt;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus regmap_smi[] = {</div><div class='add'>+	{</div><div class='add'>+		.read = ksz8863_mdio_read,</div><div class='add'>+		.write = ksz8863_mdio_write,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.read = ksz8863_mdio_read,</div><div class='add'>+		.write = ksz8863_mdio_write,</div><div class='add'>+		.val_format_endian_default = REGMAP_ENDIAN_BIG,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.read = ksz8863_mdio_read,</div><div class='add'>+		.write = ksz8863_mdio_write,</div><div class='add'>+		.val_format_endian_default = REGMAP_ENDIAN_BIG,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config ksz8863_regmap_config[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "#8",</div><div class='add'>+		.reg_bits = 8,</div><div class='add'>+		.pad_bits = 24,</div><div class='add'>+		.val_bits = 8,</div><div class='add'>+		.cache_type = REGCACHE_NONE,</div><div class='add'>+		.lock = ksz_regmap_lock,</div><div class='add'>+		.unlock = ksz_regmap_unlock,</div><div class='add'>+		.max_register = U8_MAX,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "#16",</div><div class='add'>+		.reg_bits = 8,</div><div class='add'>+		.pad_bits = 24,</div><div class='add'>+		.val_bits = 16,</div><div class='add'>+		.cache_type = REGCACHE_NONE,</div><div class='add'>+		.lock = ksz_regmap_lock,</div><div class='add'>+		.unlock = ksz_regmap_unlock,</div><div class='add'>+		.max_register = U8_MAX,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "#32",</div><div class='add'>+		.reg_bits = 8,</div><div class='add'>+		.pad_bits = 24,</div><div class='add'>+		.val_bits = 32,</div><div class='add'>+		.cache_type = REGCACHE_NONE,</div><div class='add'>+		.lock = ksz_regmap_lock,</div><div class='add'>+		.unlock = ksz_regmap_unlock,</div><div class='add'>+		.max_register = U8_MAX,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ksz8863_smi_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct device *ddev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	const struct ksz_chip_data *chip;</div><div class='add'>+	struct regmap_config rc;</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev = ksz_switch_alloc(&amp;mdiodev-&gt;dev, mdiodev);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chip = device_get_match_data(ddev);</div><div class='add'>+	if (!chip)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; __KSZ_NUM_REGMAPS; i++) {</div><div class='add'>+		rc = ksz8863_regmap_config[i];</div><div class='add'>+		rc.lock_arg = &amp;dev-&gt;regmap_mutex;</div><div class='add'>+		rc.wr_table = chip-&gt;wr_table;</div><div class='add'>+		rc.rd_table = chip-&gt;rd_table;</div><div class='add'>+		dev-&gt;regmap[i] = devm_regmap_init(&amp;mdiodev-&gt;dev,</div><div class='add'>+						  &amp;regmap_smi[i], dev,</div><div class='add'>+						  &amp;rc);</div><div class='add'>+		if (IS_ERR(dev-&gt;regmap[i])) {</div><div class='add'>+			return dev_err_probe(&amp;mdiodev-&gt;dev,</div><div class='add'>+					     PTR_ERR(dev-&gt;regmap[i]),</div><div class='add'>+					     "Failed to initialize regmap%i\n",</div><div class='add'>+					     ksz8863_regmap_config[i].val_bits);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mdiodev-&gt;dev.platform_data)</div><div class='add'>+		dev-&gt;pdata = mdiodev-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	ret = ksz_switch_register(dev);</div><div class='add'>+</div><div class='add'>+	/* Main DSA driver may not be started yet. */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8863_smi_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		ksz_switch_remove(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz8863_smi_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		dsa_switch_shutdown(dev-&gt;ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ksz8863_dt_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8863",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ88X3]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8873",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ88X3]</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ksz8863_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct mdio_driver ksz8863_driver = {</div><div class='add'>+	.probe	= ksz8863_smi_probe,</div><div class='add'>+	.remove	= ksz8863_smi_remove,</div><div class='add'>+	.shutdown = ksz8863_smi_shutdown,</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name	= "ksz8863-switch",</div><div class='add'>+		.of_match_table = ksz8863_dt_ids,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(ksz8863_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Michael Grzeschik &lt;m.grzeschik@pengutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Microchip KSZ8863 SMI Switch driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz8_reg.h b/drivers/net/dsa/microchip/ksz8_reg.h<br/>new file mode 100644<br/>index 000000000000..332408567b47<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz8_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz8_reg.h</a></div><div class='hunk'>@@ -0,0 +1,850 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Microchip KSZ8XXX series register definitions</div><div class='add'>+ *</div><div class='add'>+ * The base for these definitions is KSZ8795 but unless indicated</div><div class='add'>+ * differently by their prefix, they apply to all KSZ8 series</div><div class='add'>+ * devices. Registers and masks that do change are defined in</div><div class='add'>+ * dedicated structures in ksz_common.c.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Microchip Technology Inc.</div><div class='add'>+ *	Tristram Ha &lt;Tristram.Ha@microchip.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __KSZ8_REG_H</div><div class='add'>+#define __KSZ8_REG_H</div><div class='add'>+</div><div class='add'>+#define KS_PORT_M			0x1F</div><div class='add'>+</div><div class='add'>+#define KS_PRIO_M			0x3</div><div class='add'>+#define KS_PRIO_S			2</div><div class='add'>+</div><div class='add'>+#define SW_REVISION_M			0x0E</div><div class='add'>+#define SW_REVISION_S			1</div><div class='add'>+</div><div class='add'>+#define KSZ8863_REG_SW_RESET		0x43</div><div class='add'>+</div><div class='add'>+#define KSZ8863_GLOBAL_SOFTWARE_RESET	BIT(4)</div><div class='add'>+#define KSZ8863_PCS_RESET		BIT(0)</div><div class='add'>+</div><div class='add'>+#define KSZ88X3_REG_FVID_AND_HOST_MODE  0xC6</div><div class='add'>+#define KSZ88X3_PORT3_RMII_CLK_INTERNAL BIT(3)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_0			0x02</div><div class='add'>+</div><div class='add'>+#define SW_NEW_BACKOFF			BIT(7)</div><div class='add'>+#define SW_GLOBAL_RESET			BIT(6)</div><div class='add'>+#define SW_FLUSH_DYN_MAC_TABLE		BIT(5)</div><div class='add'>+#define SW_FLUSH_STA_MAC_TABLE		BIT(4)</div><div class='add'>+#define SW_LINK_AUTO_AGING		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_1			0x03</div><div class='add'>+</div><div class='add'>+#define SW_HUGE_PACKET			BIT(6)</div><div class='add'>+#define SW_TX_FLOW_CTRL_DISABLE		BIT(5)</div><div class='add'>+#define SW_RX_FLOW_CTRL_DISABLE		BIT(4)</div><div class='add'>+#define SW_CHECK_LENGTH			BIT(3)</div><div class='add'>+#define SW_AGING_ENABLE			BIT(2)</div><div class='add'>+#define SW_FAST_AGING			BIT(1)</div><div class='add'>+#define SW_AGGR_BACKOFF			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_2			0x04</div><div class='add'>+</div><div class='add'>+#define UNICAST_VLAN_BOUNDARY		BIT(7)</div><div class='add'>+#define SW_BACK_PRESSURE		BIT(5)</div><div class='add'>+#define FAIR_FLOW_CTRL			BIT(4)</div><div class='add'>+#define NO_EXC_COLLISION_DROP		BIT(3)</div><div class='add'>+#define SW_LEGAL_PACKET_DISABLE		BIT(1)</div><div class='add'>+</div><div class='add'>+#define KSZ8863_HUGE_PACKET_ENABLE	BIT(2)</div><div class='add'>+#define KSZ8863_LEGAL_PACKET_ENABLE	BIT(1)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_3			0x05</div><div class='add'>+ #define WEIGHTED_FAIR_QUEUE_ENABLE	BIT(3)</div><div class='add'>+</div><div class='add'>+#define SW_VLAN_ENABLE			BIT(7)</div><div class='add'>+#define SW_IGMP_SNOOP			BIT(6)</div><div class='add'>+#define SW_MIRROR_RX_TX			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_4			0x06</div><div class='add'>+</div><div class='add'>+#define SW_HALF_DUPLEX_FLOW_CTRL	BIT(7)</div><div class='add'>+#define SW_HALF_DUPLEX			BIT(6)</div><div class='add'>+#define SW_FLOW_CTRL			BIT(5)</div><div class='add'>+#define SW_10_MBIT			BIT(4)</div><div class='add'>+#define SW_REPLACE_VID			BIT(3)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_5			0x07</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_6			0x08</div><div class='add'>+</div><div class='add'>+#define SW_MIB_COUNTER_FLUSH		BIT(7)</div><div class='add'>+#define SW_MIB_COUNTER_FREEZE		BIT(6)</div><div class='add'>+#define SW_MIB_COUNTER_CTRL_ENABLE	KS_PORT_M</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_9			0x0B</div><div class='add'>+</div><div class='add'>+#define SPI_CLK_125_MHZ			0x80</div><div class='add'>+#define SPI_CLK_62_5_MHZ		0x40</div><div class='add'>+#define SPI_CLK_31_25_MHZ		0x00</div><div class='add'>+</div><div class='add'>+#define SW_LED_MODE_M			0x3</div><div class='add'>+#define SW_LED_MODE_S			4</div><div class='add'>+#define SW_LED_LINK_ACT_SPEED		0</div><div class='add'>+#define SW_LED_LINK_ACT			1</div><div class='add'>+#define SW_LED_LINK_ACT_DUPLEX		2</div><div class='add'>+#define SW_LED_LINK_DUPLEX		3</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_10			0x0C</div><div class='add'>+</div><div class='add'>+#define SW_PASS_PAUSE			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_11			0x0D</div><div class='add'>+</div><div class='add'>+#define REG_POWER_MANAGEMENT_1		0x0E</div><div class='add'>+</div><div class='add'>+#define SW_PLL_POWER_DOWN		BIT(5)</div><div class='add'>+#define SW_POWER_MANAGEMENT_MODE_M	0x3</div><div class='add'>+#define SW_POWER_MANAGEMENT_MODE_S	3</div><div class='add'>+#define SW_POWER_NORMAL			0</div><div class='add'>+#define SW_ENERGY_DETECTION		1</div><div class='add'>+#define SW_SOFTWARE_POWER_DOWN		2</div><div class='add'>+</div><div class='add'>+#define REG_POWER_MANAGEMENT_2		0x0F</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_0		0x10</div><div class='add'>+#define REG_PORT_2_CTRL_0		0x20</div><div class='add'>+#define REG_PORT_3_CTRL_0		0x30</div><div class='add'>+#define REG_PORT_4_CTRL_0		0x40</div><div class='add'>+#define REG_PORT_5_CTRL_0		0x50</div><div class='add'>+</div><div class='add'>+#define PORT_BROADCAST_STORM		BIT(7)</div><div class='add'>+#define PORT_DIFFSERV_ENABLE		BIT(6)</div><div class='add'>+#define PORT_802_1P_ENABLE		BIT(5)</div><div class='add'>+#define PORT_BASED_PRIO_S		3</div><div class='add'>+#define PORT_BASED_PRIO_M		KS_PRIO_M</div><div class='add'>+#define PORT_BASED_PRIO_0		0</div><div class='add'>+#define PORT_BASED_PRIO_1		1</div><div class='add'>+#define PORT_BASED_PRIO_2		2</div><div class='add'>+#define PORT_BASED_PRIO_3		3</div><div class='add'>+#define PORT_INSERT_TAG			BIT(2)</div><div class='add'>+#define PORT_REMOVE_TAG			BIT(1)</div><div class='add'>+#define KSZ8795_PORT_2QUEUE_SPLIT_EN	BIT(0)</div><div class='add'>+#define KSZ8873_PORT_4QUEUE_SPLIT_EN	BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_1		0x11</div><div class='add'>+#define REG_PORT_2_CTRL_1		0x21</div><div class='add'>+#define REG_PORT_3_CTRL_1		0x31</div><div class='add'>+#define REG_PORT_4_CTRL_1		0x41</div><div class='add'>+#define REG_PORT_5_CTRL_1		0x51</div><div class='add'>+</div><div class='add'>+#define PORT_MIRROR_SNIFFER		BIT(7)</div><div class='add'>+#define PORT_MIRROR_RX			BIT(6)</div><div class='add'>+#define PORT_MIRROR_TX			BIT(5)</div><div class='add'>+#define PORT_VLAN_MEMBERSHIP		KS_PORT_M</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_2		0x12</div><div class='add'>+#define REG_PORT_2_CTRL_2		0x22</div><div class='add'>+#define REG_PORT_3_CTRL_2		0x32</div><div class='add'>+#define REG_PORT_4_CTRL_2		0x42</div><div class='add'>+#define REG_PORT_5_CTRL_2		0x52</div><div class='add'>+</div><div class='add'>+#define KSZ8873_PORT_2QUEUE_SPLIT_EN	BIT(7)</div><div class='add'>+#define PORT_INGRESS_FILTER		BIT(6)</div><div class='add'>+#define PORT_DISCARD_NON_VID		BIT(5)</div><div class='add'>+#define PORT_FORCE_FLOW_CTRL		BIT(4)</div><div class='add'>+#define PORT_BACK_PRESSURE		BIT(3)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_3		0x13</div><div class='add'>+#define REG_PORT_2_CTRL_3		0x23</div><div class='add'>+#define REG_PORT_3_CTRL_3		0x33</div><div class='add'>+#define REG_PORT_4_CTRL_3		0x43</div><div class='add'>+#define REG_PORT_5_CTRL_3		0x53</div><div class='add'>+#define REG_PORT_1_CTRL_4		0x14</div><div class='add'>+#define REG_PORT_2_CTRL_4		0x24</div><div class='add'>+#define REG_PORT_3_CTRL_4		0x34</div><div class='add'>+#define REG_PORT_4_CTRL_4		0x44</div><div class='add'>+#define REG_PORT_5_CTRL_4		0x54</div><div class='add'>+</div><div class='add'>+#define PORT_DEFAULT_VID		0x0001</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_5		0x15</div><div class='add'>+#define REG_PORT_2_CTRL_5		0x25</div><div class='add'>+#define REG_PORT_3_CTRL_5		0x35</div><div class='add'>+#define REG_PORT_4_CTRL_5		0x45</div><div class='add'>+#define REG_PORT_5_CTRL_5		0x55</div><div class='add'>+</div><div class='add'>+#define PORT_ACL_ENABLE			BIT(2)</div><div class='add'>+#define PORT_AUTHEN_MODE		0x3</div><div class='add'>+#define PORT_AUTHEN_PASS		0</div><div class='add'>+#define PORT_AUTHEN_BLOCK		1</div><div class='add'>+#define PORT_AUTHEN_TRAP		2</div><div class='add'>+</div><div class='add'>+#define REG_PORT_5_CTRL_6		0x56</div><div class='add'>+</div><div class='add'>+#define PORT_MII_INTERNAL_CLOCK		BIT(7)</div><div class='add'>+#define PORT_GMII_MAC_MODE		BIT(2)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_7		0x17</div><div class='add'>+#define REG_PORT_2_CTRL_7		0x27</div><div class='add'>+#define REG_PORT_3_CTRL_7		0x37</div><div class='add'>+#define REG_PORT_4_CTRL_7		0x47</div><div class='add'>+</div><div class='add'>+#define PORT_AUTO_NEG_ASYM_PAUSE	BIT(5)</div><div class='add'>+#define PORT_AUTO_NEG_SYM_PAUSE		BIT(4)</div><div class='add'>+#define PORT_AUTO_NEG_100BTX_FD		BIT(3)</div><div class='add'>+#define PORT_AUTO_NEG_100BTX		BIT(2)</div><div class='add'>+#define PORT_AUTO_NEG_10BT_FD		BIT(1)</div><div class='add'>+#define PORT_AUTO_NEG_10BT		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_STATUS_0		0x18</div><div class='add'>+#define REG_PORT_2_STATUS_0		0x28</div><div class='add'>+#define REG_PORT_3_STATUS_0		0x38</div><div class='add'>+#define REG_PORT_4_STATUS_0		0x48</div><div class='add'>+</div><div class='add'>+/* For KSZ8765. */</div><div class='add'>+#define PORT_REMOTE_ASYM_PAUSE		BIT(5)</div><div class='add'>+#define PORT_REMOTE_SYM_PAUSE		BIT(4)</div><div class='add'>+#define PORT_REMOTE_100BTX_FD		BIT(3)</div><div class='add'>+#define PORT_REMOTE_100BTX		BIT(2)</div><div class='add'>+#define PORT_REMOTE_10BT_FD		BIT(1)</div><div class='add'>+#define PORT_REMOTE_10BT		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_STATUS_1		0x19</div><div class='add'>+#define REG_PORT_2_STATUS_1		0x29</div><div class='add'>+#define REG_PORT_3_STATUS_1		0x39</div><div class='add'>+#define REG_PORT_4_STATUS_1		0x49</div><div class='add'>+</div><div class='add'>+#define PORT_HP_MDIX			BIT(7)</div><div class='add'>+#define PORT_REVERSED_POLARITY		BIT(5)</div><div class='add'>+#define PORT_TX_FLOW_CTRL		BIT(4)</div><div class='add'>+#define PORT_RX_FLOW_CTRL		BIT(3)</div><div class='add'>+#define PORT_STAT_SPEED_100MBIT		BIT(2)</div><div class='add'>+#define PORT_STAT_FULL_DUPLEX		BIT(1)</div><div class='add'>+</div><div class='add'>+#define PORT_REMOTE_FAULT		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_LINK_MD_CTRL		0x1A</div><div class='add'>+#define REG_PORT_2_LINK_MD_CTRL		0x2A</div><div class='add'>+#define REG_PORT_3_LINK_MD_CTRL		0x3A</div><div class='add'>+#define REG_PORT_4_LINK_MD_CTRL		0x4A</div><div class='add'>+</div><div class='add'>+#define PORT_CABLE_10M_SHORT		BIT(7)</div><div class='add'>+#define PORT_CABLE_DIAG_RESULT_M	GENMASK(6, 5)</div><div class='add'>+#define PORT_CABLE_DIAG_RESULT_S	5</div><div class='add'>+#define PORT_CABLE_STAT_NORMAL		0</div><div class='add'>+#define PORT_CABLE_STAT_OPEN		1</div><div class='add'>+#define PORT_CABLE_STAT_SHORT		2</div><div class='add'>+#define PORT_CABLE_STAT_FAILED		3</div><div class='add'>+#define PORT_START_CABLE_DIAG		BIT(4)</div><div class='add'>+#define PORT_FORCE_LINK			BIT(3)</div><div class='add'>+#define PORT_POWER_SAVING		BIT(2)</div><div class='add'>+#define PORT_PHY_REMOTE_LOOPBACK	BIT(1)</div><div class='add'>+#define PORT_CABLE_FAULT_COUNTER_H	0x01</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_LINK_MD_RESULT	0x1B</div><div class='add'>+#define REG_PORT_2_LINK_MD_RESULT	0x2B</div><div class='add'>+#define REG_PORT_3_LINK_MD_RESULT	0x3B</div><div class='add'>+#define REG_PORT_4_LINK_MD_RESULT	0x4B</div><div class='add'>+</div><div class='add'>+#define PORT_CABLE_FAULT_COUNTER_L	0xFF</div><div class='add'>+#define PORT_CABLE_FAULT_COUNTER	0x1FF</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_9		0x1C</div><div class='add'>+#define REG_PORT_2_CTRL_9		0x2C</div><div class='add'>+#define REG_PORT_3_CTRL_9		0x3C</div><div class='add'>+#define REG_PORT_4_CTRL_9		0x4C</div><div class='add'>+</div><div class='add'>+#define PORT_AUTO_NEG_ENABLE		BIT(7)</div><div class='add'>+#define PORT_AUTO_NEG_DISABLE		BIT(7)</div><div class='add'>+#define PORT_FORCE_100_MBIT		BIT(6)</div><div class='add'>+#define PORT_FORCE_FULL_DUPLEX		BIT(5)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_10		0x1D</div><div class='add'>+#define REG_PORT_2_CTRL_10		0x2D</div><div class='add'>+#define REG_PORT_3_CTRL_10		0x3D</div><div class='add'>+#define REG_PORT_4_CTRL_10		0x4D</div><div class='add'>+</div><div class='add'>+#define PORT_LED_OFF			BIT(7)</div><div class='add'>+#define PORT_TX_DISABLE			BIT(6)</div><div class='add'>+#define PORT_AUTO_NEG_RESTART		BIT(5)</div><div class='add'>+#define PORT_POWER_DOWN			BIT(3)</div><div class='add'>+#define PORT_AUTO_MDIX_DISABLE		BIT(2)</div><div class='add'>+#define PORT_FORCE_MDIX			BIT(1)</div><div class='add'>+#define PORT_MAC_LOOPBACK		BIT(0)</div><div class='add'>+#define KSZ8873_PORT_PHY_LOOPBACK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_STATUS_2		0x1E</div><div class='add'>+#define REG_PORT_2_STATUS_2		0x2E</div><div class='add'>+#define REG_PORT_3_STATUS_2		0x3E</div><div class='add'>+#define REG_PORT_4_STATUS_2		0x4E</div><div class='add'>+</div><div class='add'>+#define PORT_MDIX_STATUS		BIT(7)</div><div class='add'>+#define PORT_AUTO_NEG_COMPLETE		BIT(6)</div><div class='add'>+#define PORT_STAT_LINK_GOOD		BIT(5)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_STATUS_3		0x1F</div><div class='add'>+#define REG_PORT_2_STATUS_3		0x2F</div><div class='add'>+#define REG_PORT_3_STATUS_3		0x3F</div><div class='add'>+#define REG_PORT_4_STATUS_3		0x4F</div><div class='add'>+</div><div class='add'>+#define PORT_PHY_LOOPBACK		BIT(7)</div><div class='add'>+#define PORT_PHY_ISOLATE		BIT(5)</div><div class='add'>+#define PORT_PHY_SOFT_RESET		BIT(4)</div><div class='add'>+#define PORT_PHY_FORCE_LINK		BIT(3)</div><div class='add'>+#define PORT_PHY_MODE_M			0x7</div><div class='add'>+#define PHY_MODE_IN_AUTO_NEG		1</div><div class='add'>+#define PHY_MODE_10BT_HALF		2</div><div class='add'>+#define PHY_MODE_100BT_HALF		3</div><div class='add'>+#define PHY_MODE_10BT_FULL		5</div><div class='add'>+#define PHY_MODE_100BT_FULL		6</div><div class='add'>+#define PHY_MODE_ISOLDATE		7</div><div class='add'>+</div><div class='add'>+#define REG_PORT_CTRL_0			0x00</div><div class='add'>+#define REG_PORT_CTRL_1			0x01</div><div class='add'>+#define REG_PORT_CTRL_2			0x02</div><div class='add'>+#define REG_PORT_CTRL_VID		0x03</div><div class='add'>+</div><div class='add'>+#define REG_PORT_CTRL_5			0x05</div><div class='add'>+</div><div class='add'>+#define REG_PORT_STATUS_1		0x09</div><div class='add'>+#define REG_PORT_LINK_MD_CTRL		0x0A</div><div class='add'>+#define REG_PORT_LINK_MD_RESULT		0x0B</div><div class='add'>+#define REG_PORT_CTRL_9			0x0C</div><div class='add'>+#define REG_PORT_CTRL_10		0x0D</div><div class='add'>+#define REG_PORT_STATUS_3		0x0F</div><div class='add'>+</div><div class='add'>+#define REG_PORT_CTRL_12		0xA0</div><div class='add'>+#define REG_PORT_CTRL_13		0xA1</div><div class='add'>+#define REG_PORT_RATE_CTRL_3		0xA2</div><div class='add'>+#define REG_PORT_RATE_CTRL_2		0xA3</div><div class='add'>+#define REG_PORT_RATE_CTRL_1		0xA4</div><div class='add'>+#define REG_PORT_RATE_CTRL_0		0xA5</div><div class='add'>+#define REG_PORT_RATE_LIMIT		0xA6</div><div class='add'>+#define REG_PORT_IN_RATE_0		0xA7</div><div class='add'>+#define REG_PORT_IN_RATE_1		0xA8</div><div class='add'>+#define REG_PORT_IN_RATE_2		0xA9</div><div class='add'>+#define REG_PORT_IN_RATE_3		0xAA</div><div class='add'>+#define REG_PORT_OUT_RATE_0		0xAB</div><div class='add'>+#define REG_PORT_OUT_RATE_1		0xAC</div><div class='add'>+#define REG_PORT_OUT_RATE_2		0xAD</div><div class='add'>+#define REG_PORT_OUT_RATE_3		0xAE</div><div class='add'>+</div><div class='add'>+#define PORT_CTRL_ADDR(port, addr)		\</div><div class='add'>+	((addr) + REG_PORT_1_CTRL_0 + (port) *	\</div><div class='add'>+		(REG_PORT_2_CTRL_0 - REG_PORT_1_CTRL_0))</div><div class='add'>+</div><div class='add'>+#define TABLE_EXT_SELECT_S		5</div><div class='add'>+#define TABLE_EEE_V			1</div><div class='add'>+#define TABLE_ACL_V			2</div><div class='add'>+#define TABLE_PME_V			4</div><div class='add'>+#define TABLE_LINK_MD_V			5</div><div class='add'>+#define TABLE_EEE			(TABLE_EEE_V &lt;&lt; TABLE_EXT_SELECT_S)</div><div class='add'>+#define TABLE_ACL			(TABLE_ACL_V &lt;&lt; TABLE_EXT_SELECT_S)</div><div class='add'>+#define TABLE_PME			(TABLE_PME_V &lt;&lt; TABLE_EXT_SELECT_S)</div><div class='add'>+#define TABLE_LINK_MD			(TABLE_LINK_MD &lt;&lt; TABLE_EXT_SELECT_S)</div><div class='add'>+#define TABLE_READ			BIT(4)</div><div class='add'>+#define TABLE_SELECT_S			2</div><div class='add'>+#define TABLE_STATIC_MAC_V		0</div><div class='add'>+#define TABLE_VLAN_V			1</div><div class='add'>+#define TABLE_DYNAMIC_MAC_V		2</div><div class='add'>+#define TABLE_MIB_V			3</div><div class='add'>+#define TABLE_STATIC_MAC		(TABLE_STATIC_MAC_V &lt;&lt; TABLE_SELECT_S)</div><div class='add'>+#define TABLE_VLAN			(TABLE_VLAN_V &lt;&lt; TABLE_SELECT_S)</div><div class='add'>+#define TABLE_DYNAMIC_MAC		(TABLE_DYNAMIC_MAC_V &lt;&lt; TABLE_SELECT_S)</div><div class='add'>+#define TABLE_MIB			(TABLE_MIB_V &lt;&lt; TABLE_SELECT_S)</div><div class='add'>+</div><div class='add'>+#define REG_IND_CTRL_1			0x6F</div><div class='add'>+</div><div class='add'>+#define TABLE_ENTRY_MASK		0x03FF</div><div class='add'>+#define TABLE_EXT_ENTRY_MASK		0x0FFF</div><div class='add'>+</div><div class='add'>+#define REG_IND_DATA_5			0x73</div><div class='add'>+#define REG_IND_DATA_2			0x76</div><div class='add'>+#define REG_IND_DATA_1			0x77</div><div class='add'>+#define REG_IND_DATA_0			0x78</div><div class='add'>+</div><div class='add'>+#define REG_INT_STATUS			0x7C</div><div class='add'>+#define REG_INT_ENABLE			0x7D</div><div class='add'>+</div><div class='add'>+#define INT_PME				BIT(4)</div><div class='add'>+</div><div class='add'>+#define REG_ACL_INT_STATUS		0x7E</div><div class='add'>+#define REG_ACL_INT_ENABLE		0x7F</div><div class='add'>+</div><div class='add'>+#define INT_PORT_5			BIT(4)</div><div class='add'>+#define INT_PORT_4			BIT(3)</div><div class='add'>+#define INT_PORT_3			BIT(2)</div><div class='add'>+#define INT_PORT_2			BIT(1)</div><div class='add'>+#define INT_PORT_1			BIT(0)</div><div class='add'>+</div><div class='add'>+#define INT_PORT_ALL			\</div><div class='add'>+	(INT_PORT_5 | INT_PORT_4 | INT_PORT_3 | INT_PORT_2 | INT_PORT_1)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_12			0x80</div><div class='add'>+#define REG_SW_CTRL_13			0x81</div><div class='add'>+</div><div class='add'>+#define SWITCH_802_1P_MASK		3</div><div class='add'>+#define SWITCH_802_1P_BASE		3</div><div class='add'>+#define SWITCH_802_1P_SHIFT		2</div><div class='add'>+</div><div class='add'>+#define SW_802_1P_MAP_M			KS_PRIO_M</div><div class='add'>+#define SW_802_1P_MAP_S			KS_PRIO_S</div><div class='add'>+</div><div class='add'>+#define REG_SWITCH_CTRL_14		0x82</div><div class='add'>+</div><div class='add'>+#define SW_PRIO_MAPPING_M		KS_PRIO_M</div><div class='add'>+#define SW_PRIO_MAPPING_S		6</div><div class='add'>+#define SW_PRIO_MAP_3_HI		0</div><div class='add'>+#define SW_PRIO_MAP_2_HI		2</div><div class='add'>+#define SW_PRIO_MAP_0_LO		3</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_15			0x83</div><div class='add'>+#define REG_SW_CTRL_16			0x84</div><div class='add'>+#define REG_SW_CTRL_17			0x85</div><div class='add'>+#define REG_SW_CTRL_18			0x86</div><div class='add'>+</div><div class='add'>+#define SW_SELF_ADDR_FILTER_ENABLE	BIT(6)</div><div class='add'>+</div><div class='add'>+#define REG_SW_UNK_UCAST_CTRL		0x83</div><div class='add'>+#define REG_SW_UNK_MCAST_CTRL		0x84</div><div class='add'>+#define REG_SW_UNK_VID_CTRL		0x85</div><div class='add'>+#define REG_SW_UNK_IP_MCAST_CTRL	0x86</div><div class='add'>+</div><div class='add'>+#define SW_UNK_FWD_ENABLE		BIT(5)</div><div class='add'>+#define SW_UNK_FWD_MAP			KS_PORT_M</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_19			0x87</div><div class='add'>+</div><div class='add'>+#define SW_IN_RATE_LIMIT_PERIOD_M	0x3</div><div class='add'>+#define SW_IN_RATE_LIMIT_PERIOD_S	4</div><div class='add'>+#define SW_IN_RATE_LIMIT_16_MS		0</div><div class='add'>+#define SW_IN_RATE_LIMIT_64_MS		1</div><div class='add'>+#define SW_IN_RATE_LIMIT_256_MS		2</div><div class='add'>+#define SW_OUT_RATE_LIMIT_QUEUE_BASED	BIT(3)</div><div class='add'>+#define SW_INS_TAG_ENABLE		BIT(2)</div><div class='add'>+</div><div class='add'>+#define REG_TOS_PRIO_CTRL_0		0x90</div><div class='add'>+#define REG_TOS_PRIO_CTRL_1		0x91</div><div class='add'>+#define REG_TOS_PRIO_CTRL_2		0x92</div><div class='add'>+#define REG_TOS_PRIO_CTRL_3		0x93</div><div class='add'>+#define REG_TOS_PRIO_CTRL_4		0x94</div><div class='add'>+#define REG_TOS_PRIO_CTRL_5		0x95</div><div class='add'>+#define REG_TOS_PRIO_CTRL_6		0x96</div><div class='add'>+#define REG_TOS_PRIO_CTRL_7		0x97</div><div class='add'>+#define REG_TOS_PRIO_CTRL_8		0x98</div><div class='add'>+#define REG_TOS_PRIO_CTRL_9		0x99</div><div class='add'>+#define REG_TOS_PRIO_CTRL_10		0x9A</div><div class='add'>+#define REG_TOS_PRIO_CTRL_11		0x9B</div><div class='add'>+#define REG_TOS_PRIO_CTRL_12		0x9C</div><div class='add'>+#define REG_TOS_PRIO_CTRL_13		0x9D</div><div class='add'>+#define REG_TOS_PRIO_CTRL_14		0x9E</div><div class='add'>+#define REG_TOS_PRIO_CTRL_15		0x9F</div><div class='add'>+</div><div class='add'>+#define TOS_PRIO_M			KS_PRIO_M</div><div class='add'>+#define TOS_PRIO_S			KS_PRIO_S</div><div class='add'>+</div><div class='add'>+#define REG_SW_CTRL_21			0xA4</div><div class='add'>+</div><div class='add'>+#define SW_IPV6_MLD_OPTION		BIT(3)</div><div class='add'>+#define SW_IPV6_MLD_SNOOP		BIT(2)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_12		0xB0</div><div class='add'>+#define REG_PORT_2_CTRL_12		0xC0</div><div class='add'>+#define REG_PORT_3_CTRL_12		0xD0</div><div class='add'>+#define REG_PORT_4_CTRL_12		0xE0</div><div class='add'>+#define REG_PORT_5_CTRL_12		0xF0</div><div class='add'>+</div><div class='add'>+#define PORT_PASS_ALL			BIT(6)</div><div class='add'>+#define PORT_INS_TAG_FOR_PORT_5_S	3</div><div class='add'>+#define PORT_INS_TAG_FOR_PORT_5		BIT(3)</div><div class='add'>+#define PORT_INS_TAG_FOR_PORT_4		BIT(2)</div><div class='add'>+#define PORT_INS_TAG_FOR_PORT_3		BIT(1)</div><div class='add'>+#define PORT_INS_TAG_FOR_PORT_2		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_13		0xB1</div><div class='add'>+#define REG_PORT_2_CTRL_13		0xC1</div><div class='add'>+#define REG_PORT_3_CTRL_13		0xD1</div><div class='add'>+#define REG_PORT_4_CTRL_13		0xE1</div><div class='add'>+#define REG_PORT_5_CTRL_13		0xF1</div><div class='add'>+</div><div class='add'>+#define KSZ8795_PORT_4QUEUE_SPLIT_EN	BIT(1)</div><div class='add'>+#define PORT_DROP_TAG			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_CTRL_14		0xB2</div><div class='add'>+#define REG_PORT_2_CTRL_14		0xC2</div><div class='add'>+#define REG_PORT_3_CTRL_14		0xD2</div><div class='add'>+#define REG_PORT_4_CTRL_14		0xE2</div><div class='add'>+#define REG_PORT_5_CTRL_14		0xF2</div><div class='add'>+#define REG_PORT_1_CTRL_15		0xB3</div><div class='add'>+#define REG_PORT_2_CTRL_15		0xC3</div><div class='add'>+#define REG_PORT_3_CTRL_15		0xD3</div><div class='add'>+#define REG_PORT_4_CTRL_15		0xE3</div><div class='add'>+#define REG_PORT_5_CTRL_15		0xF3</div><div class='add'>+#define REG_PORT_1_CTRL_16		0xB4</div><div class='add'>+#define REG_PORT_2_CTRL_16		0xC4</div><div class='add'>+#define REG_PORT_3_CTRL_16		0xD4</div><div class='add'>+#define REG_PORT_4_CTRL_16		0xE4</div><div class='add'>+#define REG_PORT_5_CTRL_16		0xF4</div><div class='add'>+#define REG_PORT_1_CTRL_17		0xB5</div><div class='add'>+#define REG_PORT_2_CTRL_17		0xC5</div><div class='add'>+#define REG_PORT_3_CTRL_17		0xD5</div><div class='add'>+#define REG_PORT_4_CTRL_17		0xE5</div><div class='add'>+#define REG_PORT_5_CTRL_17		0xF5</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_RATE_CTRL_3		0xB2</div><div class='add'>+#define REG_PORT_1_RATE_CTRL_2		0xB3</div><div class='add'>+#define REG_PORT_1_RATE_CTRL_1		0xB4</div><div class='add'>+#define REG_PORT_1_RATE_CTRL_0		0xB5</div><div class='add'>+#define REG_PORT_2_RATE_CTRL_3		0xC2</div><div class='add'>+#define REG_PORT_2_RATE_CTRL_2		0xC3</div><div class='add'>+#define REG_PORT_2_RATE_CTRL_1		0xC4</div><div class='add'>+#define REG_PORT_2_RATE_CTRL_0		0xC5</div><div class='add'>+#define REG_PORT_3_RATE_CTRL_3		0xD2</div><div class='add'>+#define REG_PORT_3_RATE_CTRL_2		0xD3</div><div class='add'>+#define REG_PORT_3_RATE_CTRL_1		0xD4</div><div class='add'>+#define REG_PORT_3_RATE_CTRL_0		0xD5</div><div class='add'>+#define REG_PORT_4_RATE_CTRL_3		0xE2</div><div class='add'>+#define REG_PORT_4_RATE_CTRL_2		0xE3</div><div class='add'>+#define REG_PORT_4_RATE_CTRL_1		0xE4</div><div class='add'>+#define REG_PORT_4_RATE_CTRL_0		0xE5</div><div class='add'>+#define REG_PORT_5_RATE_CTRL_3		0xF2</div><div class='add'>+#define REG_PORT_5_RATE_CTRL_2		0xF3</div><div class='add'>+#define REG_PORT_5_RATE_CTRL_1		0xF4</div><div class='add'>+#define REG_PORT_5_RATE_CTRL_0		0xF5</div><div class='add'>+</div><div class='add'>+#define RATE_CTRL_ENABLE		BIT(7)</div><div class='add'>+#define RATE_RATIO_M			(BIT(7) - 1)</div><div class='add'>+</div><div class='add'>+#define PORT_OUT_RATE_ENABLE		BIT(7)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_RATE_LIMIT		0xB6</div><div class='add'>+#define REG_PORT_2_RATE_LIMIT		0xC6</div><div class='add'>+#define REG_PORT_3_RATE_LIMIT		0xD6</div><div class='add'>+#define REG_PORT_4_RATE_LIMIT		0xE6</div><div class='add'>+#define REG_PORT_5_RATE_LIMIT		0xF6</div><div class='add'>+</div><div class='add'>+#define PORT_IN_PORT_BASED_S		6</div><div class='add'>+#define PORT_RATE_PACKET_BASED_S	5</div><div class='add'>+#define PORT_IN_FLOW_CTRL_S		4</div><div class='add'>+#define PORT_IN_LIMIT_MODE_M		0x3</div><div class='add'>+#define PORT_IN_LIMIT_MODE_S		2</div><div class='add'>+#define PORT_COUNT_IFG_S		1</div><div class='add'>+#define PORT_COUNT_PREAMBLE_S		0</div><div class='add'>+#define PORT_IN_PORT_BASED		BIT(PORT_IN_PORT_BASED_S)</div><div class='add'>+#define PORT_RATE_PACKET_BASED		BIT(PORT_RATE_PACKET_BASED_S)</div><div class='add'>+#define PORT_IN_FLOW_CTRL		BIT(PORT_IN_FLOW_CTRL_S)</div><div class='add'>+#define PORT_IN_ALL			0</div><div class='add'>+#define PORT_IN_UNICAST			1</div><div class='add'>+#define PORT_IN_MULTICAST		2</div><div class='add'>+#define PORT_IN_BROADCAST		3</div><div class='add'>+#define PORT_COUNT_IFG			BIT(PORT_COUNT_IFG_S)</div><div class='add'>+#define PORT_COUNT_PREAMBLE		BIT(PORT_COUNT_PREAMBLE_S)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_IN_RATE_0		0xB7</div><div class='add'>+#define REG_PORT_2_IN_RATE_0		0xC7</div><div class='add'>+#define REG_PORT_3_IN_RATE_0		0xD7</div><div class='add'>+#define REG_PORT_4_IN_RATE_0		0xE7</div><div class='add'>+#define REG_PORT_5_IN_RATE_0		0xF7</div><div class='add'>+#define REG_PORT_1_IN_RATE_1		0xB8</div><div class='add'>+#define REG_PORT_2_IN_RATE_1		0xC8</div><div class='add'>+#define REG_PORT_3_IN_RATE_1		0xD8</div><div class='add'>+#define REG_PORT_4_IN_RATE_1		0xE8</div><div class='add'>+#define REG_PORT_5_IN_RATE_1		0xF8</div><div class='add'>+#define REG_PORT_1_IN_RATE_2		0xB9</div><div class='add'>+#define REG_PORT_2_IN_RATE_2		0xC9</div><div class='add'>+#define REG_PORT_3_IN_RATE_2		0xD9</div><div class='add'>+#define REG_PORT_4_IN_RATE_2		0xE9</div><div class='add'>+#define REG_PORT_5_IN_RATE_2		0xF9</div><div class='add'>+#define REG_PORT_1_IN_RATE_3		0xBA</div><div class='add'>+#define REG_PORT_2_IN_RATE_3		0xCA</div><div class='add'>+#define REG_PORT_3_IN_RATE_3		0xDA</div><div class='add'>+#define REG_PORT_4_IN_RATE_3		0xEA</div><div class='add'>+#define REG_PORT_5_IN_RATE_3		0xFA</div><div class='add'>+</div><div class='add'>+#define PORT_IN_RATE_ENABLE		BIT(7)</div><div class='add'>+#define PORT_RATE_LIMIT_M		(BIT(7) - 1)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_1_OUT_RATE_0		0xBB</div><div class='add'>+#define REG_PORT_2_OUT_RATE_0		0xCB</div><div class='add'>+#define REG_PORT_3_OUT_RATE_0		0xDB</div><div class='add'>+#define REG_PORT_4_OUT_RATE_0		0xEB</div><div class='add'>+#define REG_PORT_5_OUT_RATE_0		0xFB</div><div class='add'>+#define REG_PORT_1_OUT_RATE_1		0xBC</div><div class='add'>+#define REG_PORT_2_OUT_RATE_1		0xCC</div><div class='add'>+#define REG_PORT_3_OUT_RATE_1		0xDC</div><div class='add'>+#define REG_PORT_4_OUT_RATE_1		0xEC</div><div class='add'>+#define REG_PORT_5_OUT_RATE_1		0xFC</div><div class='add'>+#define REG_PORT_1_OUT_RATE_2		0xBD</div><div class='add'>+#define REG_PORT_2_OUT_RATE_2		0xCD</div><div class='add'>+#define REG_PORT_3_OUT_RATE_2		0xDD</div><div class='add'>+#define REG_PORT_4_OUT_RATE_2		0xED</div><div class='add'>+#define REG_PORT_5_OUT_RATE_2		0xFD</div><div class='add'>+#define REG_PORT_1_OUT_RATE_3		0xBE</div><div class='add'>+#define REG_PORT_2_OUT_RATE_3		0xCE</div><div class='add'>+#define REG_PORT_3_OUT_RATE_3		0xDE</div><div class='add'>+#define REG_PORT_4_OUT_RATE_3		0xEE</div><div class='add'>+#define REG_PORT_5_OUT_RATE_3		0xFE</div><div class='add'>+</div><div class='add'>+/* 88x3 specific */</div><div class='add'>+</div><div class='add'>+#define REG_SW_INSERT_SRC_PVID		0xC2</div><div class='add'>+</div><div class='add'>+/* PME */</div><div class='add'>+</div><div class='add'>+#define SW_PME_OUTPUT_ENABLE		BIT(1)</div><div class='add'>+#define SW_PME_ACTIVE_HIGH		BIT(0)</div><div class='add'>+</div><div class='add'>+#define PORT_MAGIC_PACKET_DETECT	BIT(2)</div><div class='add'>+#define PORT_LINK_UP_DETECT		BIT(1)</div><div class='add'>+#define PORT_ENERGY_DETECT		BIT(0)</div><div class='add'>+</div><div class='add'>+/* ACL */</div><div class='add'>+</div><div class='add'>+#define ACL_FIRST_RULE_M		0xF</div><div class='add'>+</div><div class='add'>+#define ACL_MODE_M			0x3</div><div class='add'>+#define ACL_MODE_S			4</div><div class='add'>+#define ACL_MODE_DISABLE		0</div><div class='add'>+#define ACL_MODE_LAYER_2		1</div><div class='add'>+#define ACL_MODE_LAYER_3		2</div><div class='add'>+#define ACL_MODE_LAYER_4		3</div><div class='add'>+#define ACL_ENABLE_M			0x3</div><div class='add'>+#define ACL_ENABLE_S			2</div><div class='add'>+#define ACL_ENABLE_2_COUNT		0</div><div class='add'>+#define ACL_ENABLE_2_TYPE		1</div><div class='add'>+#define ACL_ENABLE_2_MAC		2</div><div class='add'>+#define ACL_ENABLE_2_BOTH		3</div><div class='add'>+#define ACL_ENABLE_3_IP			1</div><div class='add'>+#define ACL_ENABLE_3_SRC_DST_COMP	2</div><div class='add'>+#define ACL_ENABLE_4_PROTOCOL		0</div><div class='add'>+#define ACL_ENABLE_4_TCP_PORT_COMP	1</div><div class='add'>+#define ACL_ENABLE_4_UDP_PORT_COMP	2</div><div class='add'>+#define ACL_ENABLE_4_TCP_SEQN_COMP	3</div><div class='add'>+#define ACL_SRC				BIT(1)</div><div class='add'>+#define ACL_EQUAL			BIT(0)</div><div class='add'>+</div><div class='add'>+#define ACL_MAX_PORT			0xFFFF</div><div class='add'>+</div><div class='add'>+#define ACL_MIN_PORT			0xFFFF</div><div class='add'>+#define ACL_IP_ADDR			0xFFFFFFFF</div><div class='add'>+#define ACL_TCP_SEQNUM			0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+#define ACL_RESERVED			0xF8</div><div class='add'>+#define ACL_PORT_MODE_M			0x3</div><div class='add'>+#define ACL_PORT_MODE_S			1</div><div class='add'>+#define ACL_PORT_MODE_DISABLE		0</div><div class='add'>+#define ACL_PORT_MODE_EITHER		1</div><div class='add'>+#define ACL_PORT_MODE_IN_RANGE		2</div><div class='add'>+#define ACL_PORT_MODE_OUT_OF_RANGE	3</div><div class='add'>+</div><div class='add'>+#define ACL_TCP_FLAG_ENABLE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define ACL_TCP_FLAG_M			0xFF</div><div class='add'>+</div><div class='add'>+#define ACL_TCP_FLAG			0xFF</div><div class='add'>+#define ACL_ETH_TYPE			0xFFFF</div><div class='add'>+#define ACL_IP_M			0xFFFFFFFF</div><div class='add'>+</div><div class='add'>+#define ACL_PRIO_MODE_M			0x3</div><div class='add'>+#define ACL_PRIO_MODE_S			6</div><div class='add'>+#define ACL_PRIO_MODE_DISABLE		0</div><div class='add'>+#define ACL_PRIO_MODE_HIGHER		1</div><div class='add'>+#define ACL_PRIO_MODE_LOWER		2</div><div class='add'>+#define ACL_PRIO_MODE_REPLACE		3</div><div class='add'>+#define ACL_PRIO_M			0x7</div><div class='add'>+#define ACL_PRIO_S			3</div><div class='add'>+#define ACL_VLAN_PRIO_REPLACE		BIT(2)</div><div class='add'>+#define ACL_VLAN_PRIO_M			0x7</div><div class='add'>+#define ACL_VLAN_PRIO_HI_M		0x3</div><div class='add'>+</div><div class='add'>+#define ACL_VLAN_PRIO_LO_M		0x8</div><div class='add'>+#define ACL_VLAN_PRIO_S			7</div><div class='add'>+#define ACL_MAP_MODE_M			0x3</div><div class='add'>+#define ACL_MAP_MODE_S			5</div><div class='add'>+#define ACL_MAP_MODE_DISABLE		0</div><div class='add'>+#define ACL_MAP_MODE_OR			1</div><div class='add'>+#define ACL_MAP_MODE_AND		2</div><div class='add'>+#define ACL_MAP_MODE_REPLACE		3</div><div class='add'>+#define ACL_MAP_PORT_M			0x1F</div><div class='add'>+</div><div class='add'>+#define ACL_CNT_M			(BIT(11) - 1)</div><div class='add'>+#define ACL_CNT_S			5</div><div class='add'>+#define ACL_MSEC_UNIT			BIT(4)</div><div class='add'>+#define ACL_INTR_MODE			BIT(3)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_ACL_BYTE_EN_MSB	0x10</div><div class='add'>+</div><div class='add'>+#define ACL_BYTE_EN_MSB_M		0x3F</div><div class='add'>+</div><div class='add'>+#define REG_PORT_ACL_BYTE_EN_LSB	0x11</div><div class='add'>+</div><div class='add'>+#define ACL_ACTION_START		0xA</div><div class='add'>+#define ACL_ACTION_LEN			2</div><div class='add'>+#define ACL_INTR_CNT_START		0xB</div><div class='add'>+#define ACL_RULESET_START		0xC</div><div class='add'>+#define ACL_RULESET_LEN			2</div><div class='add'>+#define ACL_TABLE_LEN			14</div><div class='add'>+</div><div class='add'>+#define ACL_ACTION_ENABLE		0x000C</div><div class='add'>+#define ACL_MATCH_ENABLE		0x1FF0</div><div class='add'>+#define ACL_RULESET_ENABLE		0x2003</div><div class='add'>+#define ACL_BYTE_ENABLE			((ACL_BYTE_EN_MSB_M &lt;&lt; 8) | 0xFF)</div><div class='add'>+#define ACL_MODE_ENABLE			(0x10 &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_ACL_CTRL_0		0x12</div><div class='add'>+</div><div class='add'>+#define PORT_ACL_WRITE_DONE		BIT(6)</div><div class='add'>+#define PORT_ACL_READ_DONE		BIT(5)</div><div class='add'>+#define PORT_ACL_WRITE			BIT(4)</div><div class='add'>+#define PORT_ACL_INDEX_M		0xF</div><div class='add'>+</div><div class='add'>+#define REG_PORT_ACL_CTRL_1		0x13</div><div class='add'>+</div><div class='add'>+#define PORT_ACL_FORCE_DLR_MISS		BIT(0)</div><div class='add'>+</div><div class='add'>+#define KSZ8795_ID_HI			0x0022</div><div class='add'>+#define KSZ8795_ID_LO			0x1550</div><div class='add'>+#define KSZ8863_ID_LO			0x1430</div><div class='add'>+</div><div class='add'>+#define PHY_REG_LINK_MD			0x1D</div><div class='add'>+</div><div class='add'>+#define PHY_START_CABLE_DIAG		BIT(15)</div><div class='add'>+#define PHY_CABLE_DIAG_RESULT_M		GENMASK(14, 13)</div><div class='add'>+#define PHY_CABLE_DIAG_RESULT		0x6000</div><div class='add'>+#define PHY_CABLE_STAT_NORMAL		0x0000</div><div class='add'>+#define PHY_CABLE_STAT_OPEN		0x2000</div><div class='add'>+#define PHY_CABLE_STAT_SHORT		0x4000</div><div class='add'>+#define PHY_CABLE_STAT_FAILED		0x6000</div><div class='add'>+#define PHY_CABLE_10M_SHORT		BIT(12)</div><div class='add'>+#define PHY_CABLE_FAULT_COUNTER_M	GENMASK(8, 0)</div><div class='add'>+</div><div class='add'>+#define PHY_REG_PHY_CTRL		0x1F</div><div class='add'>+</div><div class='add'>+#define PHY_MODE_M			0x7</div><div class='add'>+#define PHY_MODE_S			8</div><div class='add'>+#define PHY_STAT_REVERSED_POLARITY	BIT(5)</div><div class='add'>+#define PHY_STAT_MDIX			BIT(4)</div><div class='add'>+#define PHY_FORCE_LINK			BIT(3)</div><div class='add'>+#define PHY_POWER_SAVING_ENABLE		BIT(2)</div><div class='add'>+#define PHY_REMOTE_LOOPBACK		BIT(1)</div><div class='add'>+</div><div class='add'>+/* KSZ8463 specific registers. */</div><div class='add'>+#define P1MBCR				0x4C</div><div class='add'>+#define P1MBSR				0x4E</div><div class='add'>+#define PHY1ILR				0x50</div><div class='add'>+#define PHY1IHR				0x52</div><div class='add'>+#define P1ANAR				0x54</div><div class='add'>+#define P1ANLPR				0x56</div><div class='add'>+#define P2MBCR				0x58</div><div class='add'>+#define P2MBSR				0x5A</div><div class='add'>+#define PHY2ILR				0x5C</div><div class='add'>+#define PHY2IHR				0x5E</div><div class='add'>+#define P2ANAR				0x60</div><div class='add'>+#define P2ANLPR				0x62</div><div class='add'>+</div><div class='add'>+#define P1CR1				0x6C</div><div class='add'>+#define P1CR2				0x6E</div><div class='add'>+#define P1CR3				0x72</div><div class='add'>+#define P1CR4				0x7E</div><div class='add'>+#define P1SR				0x80</div><div class='add'>+</div><div class='add'>+#define KSZ8463_FLUSH_TABLE_CTRL	0xAD</div><div class='add'>+</div><div class='add'>+#define KSZ8463_FLUSH_DYN_MAC_TABLE	BIT(2)</div><div class='add'>+#define KSZ8463_FLUSH_STA_MAC_TABLE	BIT(1)</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REG_SW_CTRL_9		0xAE</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REG_CFG_CTRL		0xD8</div><div class='add'>+</div><div class='add'>+#define PORT_2_COPPER_MODE		BIT(7)</div><div class='add'>+#define PORT_1_COPPER_MODE		BIT(6)</div><div class='add'>+#define PORT_COPPER_MODE_S		6</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REG_SW_RESET		0x126</div><div class='add'>+</div><div class='add'>+#define KSZ8463_GLOBAL_SOFTWARE_RESET	BIT(0)</div><div class='add'>+</div><div class='add'>+#define KSZ8463_PTP_CLK_CTRL		0x600</div><div class='add'>+</div><div class='add'>+#define PTP_CLK_ENABLE			BIT(1)</div><div class='add'>+</div><div class='add'>+#define KSZ8463_PTP_MSG_CONF1		0x620</div><div class='add'>+</div><div class='add'>+#define PTP_ENABLE			BIT(6)</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REG_DSP_CTRL_6		0x734</div><div class='add'>+</div><div class='add'>+#define COPPER_RECEIVE_ADJUSTMENT	BIT(13)</div><div class='add'>+</div><div class='add'>+/* Chip resource */</div><div class='add'>+</div><div class='add'>+#define PRIO_QUEUES			4</div><div class='add'>+</div><div class='add'>+#define KS_PRIO_IN_REG			4</div><div class='add'>+</div><div class='add'>+#define MIB_COUNTER_NUM		0x20</div><div class='add'>+</div><div class='add'>+/* Common names used by other drivers */</div><div class='add'>+</div><div class='add'>+#define P_BCAST_STORM_CTRL		REG_PORT_CTRL_0</div><div class='add'>+#define P_PRIO_CTRL			REG_PORT_CTRL_0</div><div class='add'>+#define P_TAG_CTRL			REG_PORT_CTRL_0</div><div class='add'>+#define P_MIRROR_CTRL			REG_PORT_CTRL_1</div><div class='add'>+#define P_802_1P_CTRL			REG_PORT_CTRL_2</div><div class='add'>+#define P_PASS_ALL_CTRL			REG_PORT_CTRL_12</div><div class='add'>+#define P_INS_SRC_PVID_CTRL		REG_PORT_CTRL_12</div><div class='add'>+#define P_DROP_TAG_CTRL			REG_PORT_CTRL_13</div><div class='add'>+#define P_RATE_LIMIT_CTRL		REG_PORT_RATE_LIMIT</div><div class='add'>+</div><div class='add'>+#define S_UNKNOWN_DA_CTRL		REG_SWITCH_CTRL_12</div><div class='add'>+#define S_FORWARD_INVALID_VID_CTRL	REG_FORWARD_INVALID_VID</div><div class='add'>+</div><div class='add'>+#define S_FLUSH_TABLE_CTRL		REG_SW_CTRL_0</div><div class='add'>+#define S_LINK_AGING_CTRL		REG_SW_CTRL_0</div><div class='add'>+#define S_HUGE_PACKET_CTRL		REG_SW_CTRL_1</div><div class='add'>+#define S_MIRROR_CTRL			REG_SW_CTRL_3</div><div class='add'>+#define S_REPLACE_VID_CTRL		REG_SW_CTRL_4</div><div class='add'>+#define S_PASS_PAUSE_CTRL		REG_SW_CTRL_10</div><div class='add'>+#define S_802_1P_PRIO_CTRL		REG_SW_CTRL_12</div><div class='add'>+#define S_TOS_PRIO_CTRL			REG_TOS_PRIO_CTRL_0</div><div class='add'>+#define S_IPV6_MLD_CTRL			REG_SW_CTRL_21</div><div class='add'>+</div><div class='add'>+#define IND_ACC_TABLE(table)		((table) &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+/* */</div><div class='add'>+#define REG_IND_EEE_GLOB2_LO		0x34</div><div class='add'>+#define REG_IND_EEE_GLOB2_HI		0x35</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * MIB_COUNTER_VALUE			00-00000000-3FFFFFFF</div><div class='add'>+ * MIB_TOTAL_BYTES			00-0000000F-FFFFFFFF</div><div class='add'>+ * MIB_PACKET_DROPPED			00-00000000-0000FFFF</div><div class='add'>+ * MIB_COUNTER_VALID			00-00000020-00000000</div><div class='add'>+ * MIB_COUNTER_OVERFLOW			00-00000040-00000000</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define MIB_COUNTER_VALUE		0x3FFFFFFF</div><div class='add'>+</div><div class='add'>+#define KSZ8795_MIB_TOTAL_RX_0		0x100</div><div class='add'>+#define KSZ8795_MIB_TOTAL_TX_0		0x101</div><div class='add'>+#define KSZ8795_MIB_TOTAL_RX_1		0x104</div><div class='add'>+#define KSZ8795_MIB_TOTAL_TX_1		0x105</div><div class='add'>+</div><div class='add'>+#define KSZ8863_MIB_PACKET_DROPPED_TX_0 0x100</div><div class='add'>+#define KSZ8863_MIB_PACKET_DROPPED_RX_0 0x103</div><div class='add'>+</div><div class='add'>+#define KSZ8895_MIB_PACKET_DROPPED_RX_0 0x105</div><div class='add'>+</div><div class='add'>+#define MIB_PACKET_DROPPED		0x0000FFFF</div><div class='add'>+</div><div class='add'>+#define MIB_TOTAL_BYTES_H		0x0000000F</div><div class='add'>+</div><div class='add'>+#define TAIL_TAG_OVERRIDE		BIT(6)</div><div class='add'>+#define TAIL_TAG_LOOKUP			BIT(7)</div><div class='add'>+</div><div class='add'>+#define FID_ENTRIES			128</div><div class='add'>+#define KSZ8_DYN_MAC_ENTRIES		1024</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c<br/>index c026d15721f6..5facffbb9c9a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz9477.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Microchip KSZ9477 switch driver main logic</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2017-2019 Microchip Technology Inc.</div><div class='add'>+ * Copyright (C) 2017-2025 Microchip Technology Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -11,105 +11,57 @@</div><div class='ctx'> #include &lt;linux/platform_data/microchip-ksz.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "ksz_priv.h"</div><div class='ctx'> #include "ksz9477_reg.h"</div><div class='ctx'> #include "ksz_common.h"</div><div class='add'>+#include "ksz9477.h"</div><div class='ctx'> </div><div class='del'>-/* Used with variable features to indicate capabilities. */</div><div class='del'>-#define GBIT_SUPPORT			BIT(0)</div><div class='del'>-#define NEW_XMII			BIT(1)</div><div class='del'>-#define IS_9893				BIT(2)</div><div class='add'>+static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)</div><div class='add'>+{</div><div class='add'>+	regmap_update_bits(ksz_regmap_8(dev), addr, bits, set ? bits : 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static const struct {</div><div class='del'>-	int index;</div><div class='del'>-	char string[ETH_GSTRING_LEN];</div><div class='del'>-} ksz9477_mib_names[TOTAL_SWITCH_COUNTER_NUM] = {</div><div class='del'>-	{ 0x00, "rx_hi" },</div><div class='del'>-	{ 0x01, "rx_undersize" },</div><div class='del'>-	{ 0x02, "rx_fragments" },</div><div class='del'>-	{ 0x03, "rx_oversize" },</div><div class='del'>-	{ 0x04, "rx_jabbers" },</div><div class='del'>-	{ 0x05, "rx_symbol_err" },</div><div class='del'>-	{ 0x06, "rx_crc_err" },</div><div class='del'>-	{ 0x07, "rx_align_err" },</div><div class='del'>-	{ 0x08, "rx_mac_ctrl" },</div><div class='del'>-	{ 0x09, "rx_pause" },</div><div class='del'>-	{ 0x0A, "rx_bcast" },</div><div class='del'>-	{ 0x0B, "rx_mcast" },</div><div class='del'>-	{ 0x0C, "rx_ucast" },</div><div class='del'>-	{ 0x0D, "rx_64_or_less" },</div><div class='del'>-	{ 0x0E, "rx_65_127" },</div><div class='del'>-	{ 0x0F, "rx_128_255" },</div><div class='del'>-	{ 0x10, "rx_256_511" },</div><div class='del'>-	{ 0x11, "rx_512_1023" },</div><div class='del'>-	{ 0x12, "rx_1024_1522" },</div><div class='del'>-	{ 0x13, "rx_1523_2000" },</div><div class='del'>-	{ 0x14, "rx_2001" },</div><div class='del'>-	{ 0x15, "tx_hi" },</div><div class='del'>-	{ 0x16, "tx_late_col" },</div><div class='del'>-	{ 0x17, "tx_pause" },</div><div class='del'>-	{ 0x18, "tx_bcast" },</div><div class='del'>-	{ 0x19, "tx_mcast" },</div><div class='del'>-	{ 0x1A, "tx_ucast" },</div><div class='del'>-	{ 0x1B, "tx_deferred" },</div><div class='del'>-	{ 0x1C, "tx_total_col" },</div><div class='del'>-	{ 0x1D, "tx_exc_col" },</div><div class='del'>-	{ 0x1E, "tx_single_col" },</div><div class='del'>-	{ 0x1F, "tx_mult_col" },</div><div class='del'>-	{ 0x80, "rx_total" },</div><div class='del'>-	{ 0x81, "tx_total" },</div><div class='del'>-	{ 0x82, "rx_discards" },</div><div class='del'>-	{ 0x83, "tx_discards" },</div><div class='del'>-};</div><div class='add'>+static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits,</div><div class='add'>+			 bool set)</div><div class='add'>+{</div><div class='add'>+	regmap_update_bits(ksz_regmap_8(dev), PORT_CTRL_ADDR(port, offset),</div><div class='add'>+			   bits, set ? bits : 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void ksz9477_cfg32(struct ksz_device *dev, u32 addr, u32 bits, bool set)</div><div class='ctx'> {</div><div class='del'>-	u32 data;</div><div class='del'>-</div><div class='del'>-	ksz_read32(dev, addr, &amp;data);</div><div class='del'>-	if (set)</div><div class='del'>-		data |= bits;</div><div class='del'>-	else</div><div class='del'>-		data &amp;= ~bits;</div><div class='del'>-	ksz_write32(dev, addr, data);</div><div class='add'>+	regmap_update_bits(ksz_regmap_32(dev), addr, bits, set ? bits : 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ksz9477_port_cfg32(struct ksz_device *dev, int port, int offset,</div><div class='ctx'> 			       u32 bits, bool set)</div><div class='ctx'> {</div><div class='del'>-	u32 addr;</div><div class='del'>-	u32 data;</div><div class='add'>+	regmap_update_bits(ksz_regmap_32(dev), PORT_CTRL_ADDR(port, offset),</div><div class='add'>+			   bits, set ? bits : 0);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	addr = PORT_CTRL_ADDR(port, offset);</div><div class='del'>-	ksz_read32(dev, addr, &amp;data);</div><div class='add'>+int ksz9477_change_mtu(struct ksz_device *dev, int port, int mtu)</div><div class='add'>+{</div><div class='add'>+	u16 frame_size;</div><div class='ctx'> </div><div class='del'>-	if (set)</div><div class='del'>-		data |= bits;</div><div class='del'>-	else</div><div class='del'>-		data &amp;= ~bits;</div><div class='add'>+	if (!dsa_is_cpu_port(dev-&gt;ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	frame_size = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> </div><div class='del'>-	ksz_write32(dev, addr, data);</div><div class='add'>+	return regmap_update_bits(ksz_regmap_16(dev), REG_SW_MTU__2,</div><div class='add'>+				  REG_SW_MTU_MASK, frame_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_wait_vlan_ctrl_ready(struct ksz_device *dev, u32 waiton,</div><div class='del'>-					int timeout)</div><div class='add'>+static int ksz9477_wait_vlan_ctrl_ready(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u8 data;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ksz_read8(dev, REG_SW_VLAN_CTRL, &amp;data);</div><div class='del'>-		if (!(data &amp; waiton))</div><div class='del'>-			break;</div><div class='del'>-		usleep_range(1, 10);</div><div class='del'>-	} while (timeout-- &gt; 0);</div><div class='add'>+	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	if (timeout &lt;= 0)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return regmap_read_poll_timeout(ksz_regmap_8(dev), REG_SW_VLAN_CTRL,</div><div class='add'>+					val, !(val &amp; VLAN_START), 10, 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ksz9477_get_vlan_table(struct ksz_device *dev, u16 vid,</div><div class='hunk'>@@ -123,8 +75,8 @@ static int ksz9477_get_vlan_table(struct ksz_device *dev, u16 vid,</div><div class='ctx'> 	ksz_write8(dev, REG_SW_VLAN_CTRL, VLAN_READ | VLAN_START);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be cleared */</div><div class='del'>-	ret = ksz9477_wait_vlan_ctrl_ready(dev, VLAN_START, 1000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	ret = ksz9477_wait_vlan_ctrl_ready(dev);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to read vlan table\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -156,8 +108,8 @@ static int ksz9477_set_vlan_table(struct ksz_device *dev, u16 vid,</div><div class='ctx'> 	ksz_write8(dev, REG_SW_VLAN_CTRL, VLAN_START | VLAN_WRITE);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be cleared */</div><div class='del'>-	ret = ksz9477_wait_vlan_ctrl_ready(dev, VLAN_START, 1000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	ret = ksz9477_wait_vlan_ctrl_ready(dev);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to write vlan table\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -191,85 +143,249 @@ static void ksz9477_write_table(struct ksz_device *dev, u32 *table)</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_VAL_D, table[3]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_wait_alu_ready(struct ksz_device *dev, u32 waiton,</div><div class='del'>-				  int timeout)</div><div class='add'>+static int ksz9477_wait_alu_ready(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 data;</div><div class='add'>+	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		ksz_read32(dev, REG_SW_ALU_CTRL__4, &amp;data);</div><div class='del'>-		if (!(data &amp; waiton))</div><div class='del'>-			break;</div><div class='del'>-		usleep_range(1, 10);</div><div class='del'>-	} while (timeout-- &gt; 0);</div><div class='add'>+	return regmap_read_poll_timeout(ksz_regmap_32(dev), REG_SW_ALU_CTRL__4,</div><div class='add'>+					val, !(val &amp; ALU_START), 10, 1000);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (timeout &lt;= 0)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='add'>+static int ksz9477_wait_alu_sta_ready(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return regmap_read_poll_timeout(ksz_regmap_32(dev),</div><div class='add'>+					REG_SW_ALU_STAT_CTRL__4,</div><div class='add'>+					val, !(val &amp; ALU_STAT_START),</div><div class='add'>+					10, 1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_wait_alu_sta_ready(struct ksz_device *dev, u32 waiton,</div><div class='del'>-				      int timeout)</div><div class='add'>+static void port_sgmii_s(struct ksz_device *dev, uint port, u16 devid, u16 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		ksz_read32(dev, REG_SW_ALU_STAT_CTRL__4, &amp;data);</div><div class='del'>-		if (!(data &amp; waiton))</div><div class='del'>-			break;</div><div class='del'>-		usleep_range(1, 10);</div><div class='del'>-	} while (timeout-- &gt; 0);</div><div class='add'>+	data = (devid &amp; MII_MMD_CTRL_DEVAD_MASK) &lt;&lt; 16;</div><div class='add'>+	data |= reg;</div><div class='add'>+	ksz_pwrite32(dev, port, REG_PORT_SGMII_ADDR__4, data);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (timeout &lt;= 0)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='add'>+static void port_sgmii_r(struct ksz_device *dev, uint port, u16 devid, u16 reg,</div><div class='add'>+			 u16 *buf)</div><div class='add'>+{</div><div class='add'>+	port_sgmii_s(dev, port, devid, reg);</div><div class='add'>+	ksz_pread16(dev, port, REG_PORT_SGMII_DATA__4 + 2, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void port_sgmii_w(struct ksz_device *dev, uint port, u16 devid, u16 reg,</div><div class='add'>+			 u16 buf)</div><div class='add'>+{</div><div class='add'>+	port_sgmii_s(dev, port, devid, reg);</div><div class='add'>+	ksz_pwrite32(dev, port, REG_PORT_SGMII_DATA__4, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz9477_pcs_read(struct mii_bus *bus, int phy, int mmd, int reg)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = bus-&gt;priv;</div><div class='add'>+	int port = ksz_get_sgmii_port(dev);</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	port_sgmii_r(dev, port, mmd, reg, &amp;val);</div><div class='add'>+</div><div class='add'>+	/* Simulate a value to activate special code in the XPCS driver if</div><div class='add'>+	 * supported.</div><div class='add'>+	 */</div><div class='add'>+	if (mmd == MDIO_MMD_PMAPMD) {</div><div class='add'>+		if (reg == MDIO_DEVID1)</div><div class='add'>+			val = 0x9477;</div><div class='add'>+		else if (reg == MDIO_DEVID2)</div><div class='add'>+			val = 0x22 &lt;&lt; 10;</div><div class='add'>+	} else if (mmd == MDIO_MMD_VEND2) {</div><div class='add'>+		struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+		/* Need to update MII_BMCR register with the exact speed and</div><div class='add'>+		 * duplex mode when running in SGMII mode and this register is</div><div class='add'>+		 * used to detect connected speed in that mode.</div><div class='add'>+		 */</div><div class='add'>+		if (reg == MMD_SR_MII_AUTO_NEG_STATUS) {</div><div class='add'>+			int duplex, speed;</div><div class='add'>+</div><div class='add'>+			if (val &amp; SR_MII_STAT_LINK_UP) {</div><div class='add'>+				speed = (val &gt;&gt; SR_MII_STAT_S) &amp; SR_MII_STAT_M;</div><div class='add'>+				if (speed == SR_MII_STAT_1000_MBPS)</div><div class='add'>+					speed = SPEED_1000;</div><div class='add'>+				else if (speed == SR_MII_STAT_100_MBPS)</div><div class='add'>+					speed = SPEED_100;</div><div class='add'>+				else</div><div class='add'>+					speed = SPEED_10;</div><div class='add'>+</div><div class='add'>+				if (val &amp; SR_MII_STAT_FULL_DUPLEX)</div><div class='add'>+					duplex = DUPLEX_FULL;</div><div class='add'>+				else</div><div class='add'>+					duplex = DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+				if (!p-&gt;phydev.link ||</div><div class='add'>+				    p-&gt;phydev.speed != speed ||</div><div class='add'>+				    p-&gt;phydev.duplex != duplex) {</div><div class='add'>+					u16 ctrl;</div><div class='add'>+</div><div class='add'>+					p-&gt;phydev.link = 1;</div><div class='add'>+					p-&gt;phydev.speed = speed;</div><div class='add'>+					p-&gt;phydev.duplex = duplex;</div><div class='add'>+					port_sgmii_r(dev, port, mmd, MII_BMCR,</div><div class='add'>+						     &amp;ctrl);</div><div class='add'>+					ctrl &amp;= BMCR_ANENABLE;</div><div class='add'>+					ctrl |= mii_bmcr_encode_fixed(speed,</div><div class='add'>+								      duplex);</div><div class='add'>+					port_sgmii_w(dev, port, mmd, MII_BMCR,</div><div class='add'>+						     ctrl);</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				p-&gt;phydev.link = 0;</div><div class='add'>+			}</div><div class='add'>+		} else if (reg == MII_BMSR) {</div><div class='add'>+			p-&gt;phydev.link = !!(val &amp; BMSR_LSTATUS);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz9477_pcs_write(struct mii_bus *bus, int phy, int mmd, int reg,</div><div class='add'>+			     u16 val)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = bus-&gt;priv;</div><div class='add'>+	int port = ksz_get_sgmii_port(dev);</div><div class='add'>+</div><div class='add'>+	if (mmd == MDIO_MMD_VEND2) {</div><div class='add'>+		struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+		if (reg == MMD_SR_MII_AUTO_NEG_CTRL) {</div><div class='add'>+			u16 sgmii_mode = SR_MII_PCS_SGMII &lt;&lt; SR_MII_PCS_MODE_S;</div><div class='add'>+</div><div class='add'>+			/* Need these bits for 1000BASE-X mode to work with</div><div class='add'>+			 * AN on.</div><div class='add'>+			 */</div><div class='add'>+			if (!(val &amp; sgmii_mode))</div><div class='add'>+				val |= SR_MII_SGMII_LINK_UP |</div><div class='add'>+				       SR_MII_TX_CFG_PHY_MASTER;</div><div class='add'>+</div><div class='add'>+			/* SGMII interrupt in the port cannot be masked, so</div><div class='add'>+			 * make sure interrupt is not enabled as it is not</div><div class='add'>+			 * handled.</div><div class='add'>+			 */</div><div class='add'>+			val &amp;= ~SR_MII_AUTO_NEG_COMPLETE_INTR;</div><div class='add'>+		} else if (reg == MII_BMCR) {</div><div class='add'>+			/* The MII_ADVERTISE register needs to write once</div><div class='add'>+			 * before doing auto-negotiation for the correct</div><div class='add'>+			 * config_word to be sent out after reset.</div><div class='add'>+			 */</div><div class='add'>+			if ((val &amp; BMCR_ANENABLE) &amp;&amp; !p-&gt;sgmii_adv_write) {</div><div class='add'>+				u16 adv;</div><div class='add'>+</div><div class='add'>+				/* The SGMII port cannot disable flow control</div><div class='add'>+				 * so it is better to just advertise symmetric</div><div class='add'>+				 * pause.</div><div class='add'>+				 */</div><div class='add'>+				port_sgmii_r(dev, port, mmd, MII_ADVERTISE,</div><div class='add'>+					     &amp;adv);</div><div class='add'>+				adv |= ADVERTISE_1000XPAUSE;</div><div class='add'>+				adv &amp;= ~ADVERTISE_1000XPSE_ASYM;</div><div class='add'>+				port_sgmii_w(dev, port, mmd, MII_ADVERTISE,</div><div class='add'>+					     adv);</div><div class='add'>+				p-&gt;sgmii_adv_write = 1;</div><div class='add'>+			} else if (val &amp; BMCR_RESET) {</div><div class='add'>+				p-&gt;sgmii_adv_write = 0;</div><div class='add'>+			}</div><div class='add'>+		} else if (reg == MII_ADVERTISE) {</div><div class='add'>+			/* XPCS driver writes to this register so there is no</div><div class='add'>+			 * need to update it for the errata.</div><div class='add'>+			 */</div><div class='add'>+			p-&gt;sgmii_adv_write = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	port_sgmii_w(dev, port, mmd, reg, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz9477_pcs_create(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	/* This chip has a SGMII port. */</div><div class='add'>+	if (ksz_has_sgmii_port(dev)) {</div><div class='add'>+		int port = ksz_get_sgmii_port(dev);</div><div class='add'>+		struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+		struct phylink_pcs *pcs;</div><div class='add'>+		struct mii_bus *bus;</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		bus = devm_mdiobus_alloc(dev-&gt;dev);</div><div class='add'>+		if (!bus)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		bus-&gt;name = "ksz_pcs_mdio_bus";</div><div class='add'>+		snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s-pcs",</div><div class='add'>+			 dev_name(dev-&gt;dev));</div><div class='add'>+		bus-&gt;read_c45 = &amp;ksz9477_pcs_read;</div><div class='add'>+		bus-&gt;write_c45 = &amp;ksz9477_pcs_write;</div><div class='add'>+		bus-&gt;parent = dev-&gt;dev;</div><div class='add'>+		bus-&gt;phy_mask = ~0;</div><div class='add'>+		bus-&gt;priv = dev;</div><div class='add'>+</div><div class='add'>+		ret = devm_mdiobus_register(dev-&gt;dev, bus);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		pcs = xpcs_create_pcs_mdiodev(bus, 0);</div><div class='add'>+		if (IS_ERR(pcs))</div><div class='add'>+			return PTR_ERR(pcs);</div><div class='add'>+		p-&gt;pcs = pcs;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_reset_switch(struct ksz_device *dev)</div><div class='add'>+int ksz9477_reset_switch(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u8 data8;</div><div class='del'>-	u16 data16;</div><div class='ctx'> 	u32 data32;</div><div class='ctx'> </div><div class='ctx'> 	/* reset switch */</div><div class='ctx'> 	ksz_cfg(dev, REG_SW_OPERATION, SW_RESET, true);</div><div class='ctx'> </div><div class='ctx'> 	/* turn off SPI DO Edge select */</div><div class='del'>-	ksz_read8(dev, REG_SW_GLOBAL_SERIAL_CTRL_0, &amp;data8);</div><div class='del'>-	data8 &amp;= ~SPI_AUTO_EDGE_DETECTION;</div><div class='del'>-	ksz_write8(dev, REG_SW_GLOBAL_SERIAL_CTRL_0, data8);</div><div class='add'>+	regmap_update_bits(ksz_regmap_8(dev), REG_SW_GLOBAL_SERIAL_CTRL_0,</div><div class='add'>+			   SPI_AUTO_EDGE_DETECTION, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* default configuration */</div><div class='del'>-	ksz_read8(dev, REG_SW_LUE_CTRL_1, &amp;data8);</div><div class='del'>-	data8 = SW_AGING_ENABLE | SW_LINK_AUTO_AGING |</div><div class='del'>-	      SW_SRC_ADDR_FILTER | SW_FLUSH_STP_TABLE | SW_FLUSH_MSTP_TABLE;</div><div class='del'>-	ksz_write8(dev, REG_SW_LUE_CTRL_1, data8);</div><div class='add'>+	ksz_write8(dev, REG_SW_LUE_CTRL_1,</div><div class='add'>+		   SW_AGING_ENABLE | SW_LINK_AUTO_AGING | SW_SRC_ADDR_FILTER);</div><div class='ctx'> </div><div class='ctx'> 	/* disable interrupts */</div><div class='ctx'> 	ksz_write32(dev, REG_SW_INT_MASK__4, SWITCH_INT_MASK);</div><div class='ctx'> 	ksz_write32(dev, REG_SW_PORT_INT_MASK__4, 0x7F);</div><div class='ctx'> 	ksz_read32(dev, REG_SW_PORT_INT_STATUS__4, &amp;data32);</div><div class='ctx'> </div><div class='del'>-	/* set broadcast storm protection 10% rate */</div><div class='del'>-	ksz_read16(dev, REG_SW_MAC_CTRL_2, &amp;data16);</div><div class='del'>-	data16 &amp;= ~BROADCAST_STORM_RATE;</div><div class='del'>-	data16 |= (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;</div><div class='del'>-	ksz_write16(dev, REG_SW_MAC_CTRL_2, data16);</div><div class='add'>+	/* KSZ9893 compatible chips do not support refclk configuration */</div><div class='add'>+	if (dev-&gt;chip_id == KSZ9893_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ8563_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9563_CHIP_ID)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	data8 = SW_ENABLE_REFCLKO;</div><div class='add'>+	if (dev-&gt;synclko_disable)</div><div class='add'>+		data8 = 0;</div><div class='add'>+	else if (dev-&gt;synclko_125)</div><div class='add'>+		data8 = SW_ENABLE_REFCLKO | SW_REFCLKO_IS_125MHZ;</div><div class='add'>+	ksz_write8(dev, REG_SW_GLOBAL_OUTPUT_CTRL__1, data8);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,</div><div class='del'>-			      u64 *cnt)</div><div class='add'>+void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_poll_ctx ctx = {</div><div class='del'>-		.dev = dev,</div><div class='del'>-		.port = port,</div><div class='del'>-		.offset = REG_PORT_MIB_CTRL_STAT__4,</div><div class='del'>-	};</div><div class='ctx'> 	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+	unsigned int val;</div><div class='ctx'> 	u32 data;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -279,11 +395,11 @@ static void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,</div><div class='ctx'> 	data |= (addr &lt;&lt; MIB_COUNTER_INDEX_S);</div><div class='ctx'> 	ksz_pwrite32(dev, port, REG_PORT_MIB_CTRL_STAT__4, data);</div><div class='ctx'> </div><div class='del'>-	ret = readx_poll_timeout(ksz_pread32_poll, &amp;ctx, data,</div><div class='del'>-				 !(data &amp; MIB_COUNTER_READ), 10, 1000);</div><div class='del'>-</div><div class='add'>+	ret = regmap_read_poll_timeout(ksz_regmap_32(dev),</div><div class='add'>+			PORT_CTRL_ADDR(port, REG_PORT_MIB_CTRL_STAT__4),</div><div class='add'>+			val, !(val &amp; MIB_COUNTER_READ), 10, 1000);</div><div class='ctx'> 	/* failed to read MIB. get out of loop */</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to get MIB\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -293,14 +409,14 @@ static void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr,</div><div class='ctx'> 	*cnt += data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='del'>-			      u64 *dropped, u64 *cnt)</div><div class='add'>+void ksz9477_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+		       u64 *dropped, u64 *cnt)</div><div class='ctx'> {</div><div class='del'>-	addr = ksz9477_mib_names[addr].index;</div><div class='add'>+	addr = dev-&gt;info-&gt;mib_names[addr].index;</div><div class='ctx'> 	ksz9477_r_mib_cnt(dev, port, addr, cnt);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_freeze_mib(struct ksz_device *dev, int port, bool freeze)</div><div class='add'>+void ksz9477_freeze_mib(struct ksz_device *dev, int port, bool freeze)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val = freeze ? MIB_COUNTER_FLUSH_FREEZE : 0;</div><div class='ctx'> 	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='hunk'>@@ -314,7 +430,74 @@ static void ksz9477_freeze_mib(struct ksz_device *dev, int port, bool freeze)</div><div class='ctx'> 	mutex_unlock(&amp;p-&gt;mib.cnt_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_port_init_cnt(struct ksz_device *dev, int port)</div><div class='add'>+static int ksz9477_half_duplex_monitor(struct ksz_device *dev, int port,</div><div class='add'>+				       u64 tx_late_col)</div><div class='add'>+{</div><div class='add'>+	u8 lue_ctrl;</div><div class='add'>+	u32 pmavbc;</div><div class='add'>+	u16 pqm;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Errata DS80000754 recommends monitoring potential faults in</div><div class='add'>+	 * half-duplex mode. The switch might not be able to communicate anymore</div><div class='add'>+	 * in these states. If you see this message, please read the</div><div class='add'>+	 * errata-sheet for more information:</div><div class='add'>+	 * https://ww1.microchip.com/downloads/aemDocuments/documents/UNG/ProductDocuments/Errata/KSZ9477S-Errata-DS80000754.pdf</div><div class='add'>+	 * To workaround this issue, half-duplex mode should be avoided.</div><div class='add'>+	 * A software reset could be implemented to recover from this state.</div><div class='add'>+	 */</div><div class='add'>+	dev_warn_once(dev-&gt;dev,</div><div class='add'>+		      "Half-duplex detected on port %d, transmission halt may occur\n",</div><div class='add'>+		      port);</div><div class='add'>+	if (tx_late_col != 0) {</div><div class='add'>+		/* Transmission halt with late collisions */</div><div class='add'>+		dev_crit_once(dev-&gt;dev,</div><div class='add'>+			      "TX late collisions detected, transmission may be halted on port %d\n",</div><div class='add'>+			      port);</div><div class='add'>+	}</div><div class='add'>+	ret = ksz_read8(dev, REG_SW_LUE_CTRL_0, &amp;lue_ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (lue_ctrl &amp; SW_VLAN_ENABLE) {</div><div class='add'>+		ret = ksz_pread16(dev, port, REG_PORT_QM_TX_CNT_0__4, &amp;pqm);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = ksz_read32(dev, REG_PMAVBC, &amp;pmavbc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if ((FIELD_GET(PMAVBC_MASK, pmavbc) &lt;= PMAVBC_MIN) ||</div><div class='add'>+		    (FIELD_GET(PORT_QM_TX_CNT_M, pqm) &gt;= PORT_QM_TX_CNT_MAX)) {</div><div class='add'>+			/* Transmission halt with Half-Duplex and VLAN */</div><div class='add'>+			dev_crit_once(dev-&gt;dev,</div><div class='add'>+				      "resources out of limits, transmission may be halted\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz9477_errata_monitor(struct ksz_device *dev, int port,</div><div class='add'>+			   u64 tx_late_col)</div><div class='add'>+{</div><div class='add'>+	u8 status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, REG_PORT_STATUS_0, &amp;status);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!(FIELD_GET(PORT_INTF_SPEED_MASK, status)</div><div class='add'>+	      == PORT_INTF_SPEED_NONE) &amp;&amp;</div><div class='add'>+	    !(status &amp; PORT_INTF_FULL_DUPLEX)) {</div><div class='add'>+		ret = ksz9477_half_duplex_monitor(dev, port, tx_late_col);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz9477_port_init_cnt(struct ksz_device *dev, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_port_mib *mib = &amp;dev-&gt;ports[port].mib;</div><div class='ctx'> </div><div class='hunk'>@@ -325,26 +508,22 @@ static void ksz9477_port_init_cnt(struct ksz_device *dev, int port)</div><div class='ctx'> 	ksz_write8(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FLUSH);</div><div class='ctx'> 	ksz_pwrite32(dev, port, REG_PORT_MIB_CTRL_STAT__4, 0);</div><div class='ctx'> 	mutex_unlock(&amp;mib-&gt;cnt_mutex);</div><div class='del'>-</div><div class='del'>-	mib-&gt;cnt_ptr = 0;</div><div class='del'>-	memset(mib-&gt;counters, 0, dev-&gt;mib_cnt * sizeof(u64));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dsa_tag_protocol ksz9477_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-						      int port)</div><div class='add'>+static void ksz9477_r_phy_quirks(struct ksz_device *dev, u16 addr, u16 reg,</div><div class='add'>+				 u16 *data)</div><div class='ctx'> {</div><div class='del'>-	enum dsa_tag_protocol proto = DSA_TAG_PROTO_KSZ9477;</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;features &amp; IS_9893)</div><div class='del'>-		proto = DSA_TAG_PROTO_KSZ9893;</div><div class='del'>-	return proto;</div><div class='add'>+	/* KSZ8563R do not have extended registers but BMSR_ESTATEN and</div><div class='add'>+	 * BMSR_ERCAP bits are set.</div><div class='add'>+	 */</div><div class='add'>+	if (dev-&gt;chip_id == KSZ8563_CHIP_ID &amp;&amp; reg == MII_BMSR)</div><div class='add'>+		*data &amp;= ~(BMSR_ESTATEN | BMSR_ERCAP);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)</div><div class='add'>+int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u16 val = 0xffff;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* No real PHY after this. Simulate the PHY.</div><div class='ctx'> 	 * A fixed PHY can be setup in the device tree, but this function is</div><div class='hunk'>@@ -352,7 +531,7 @@ static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)</div><div class='ctx'> 	 * For RGMII PHY there is no way to access it so the fixed PHY should</div><div class='ctx'> 	 * be used.  For SGMII PHY the supporting code will be added later.</div><div class='ctx'> 	 */</div><div class='del'>-	if (addr &gt;= dev-&gt;phy_port_cnt) {</div><div class='add'>+	if (!dev-&gt;info-&gt;internal_phy[addr]) {</div><div class='ctx'> 		struct ksz_port *p = &amp;dev-&gt;ports[addr];</div><div class='ctx'> </div><div class='ctx'> 		switch (reg) {</div><div class='hunk'>@@ -385,162 +564,74 @@ static int ksz9477_phy_read16(struct dsa_switch *ds, int addr, int reg)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		ksz_pread16(dev, addr, 0x100 + (reg &lt;&lt; 1), &amp;val);</div><div class='add'>+		ret = ksz_pread16(dev, addr, 0x100 + (reg &lt;&lt; 1), &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ksz9477_r_phy_quirks(dev, addr, reg, &amp;val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return val;</div><div class='add'>+	*data = val;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_phy_write16(struct dsa_switch *ds, int addr, int reg,</div><div class='del'>-			       u16 val)</div><div class='add'>+int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	u32 mask, val32;</div><div class='ctx'> </div><div class='ctx'> 	/* No real PHY after this. */</div><div class='del'>-	if (addr &gt;= dev-&gt;phy_port_cnt)</div><div class='add'>+	if (!dev-&gt;info-&gt;internal_phy[addr])</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	/* No gigabit support.  Do not write to this register. */</div><div class='del'>-	if (!(dev-&gt;features &amp; GBIT_SUPPORT) &amp;&amp; reg == MII_CTRL1000)</div><div class='del'>-		return 0;</div><div class='del'>-	ksz_pwrite16(dev, addr, 0x100 + (reg &lt;&lt; 1), val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	if (reg &lt; 0x10)</div><div class='add'>+		return ksz_pwrite16(dev, addr, 0x100 + (reg &lt;&lt; 1), val);</div><div class='ctx'> </div><div class='del'>-static void ksz9477_get_strings(struct dsa_switch *ds, int port,</div><div class='del'>-				u32 stringset, uint8_t *buf)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (stringset != ETH_SS_STATS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; TOTAL_SWITCH_COUNTER_NUM; i++) {</div><div class='del'>-		memcpy(buf + i * ETH_GSTRING_LEN, ksz9477_mib_names[i].string,</div><div class='del'>-		       ETH_GSTRING_LEN);</div><div class='add'>+	/* Errata: When using SPI, I2C, or in-band register access,</div><div class='add'>+	 * writes to certain PHY registers should be performed as</div><div class='add'>+	 * 32-bit writes instead of 16-bit writes.</div><div class='add'>+	 */</div><div class='add'>+	val32 = val;</div><div class='add'>+	mask = 0xffff;</div><div class='add'>+	if ((reg &amp; 1) == 0) {</div><div class='add'>+		val32 &lt;&lt;= 16;</div><div class='add'>+		mask &lt;&lt;= 16;</div><div class='ctx'> 	}</div><div class='add'>+	reg &amp;= ~1;</div><div class='add'>+	return ksz_prmw32(dev, addr, 0x100 + (reg &lt;&lt; 1), mask, val32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_cfg_port_member(struct ksz_device *dev, int port,</div><div class='del'>-				    u8 member)</div><div class='add'>+void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member)</div><div class='ctx'> {</div><div class='ctx'> 	ksz_pwrite32(dev, port, REG_PORT_VLAN_MEMBERSHIP__4, member);</div><div class='del'>-	dev-&gt;ports[port].member = member;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='del'>-				       u8 state)</div><div class='add'>+void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='ctx'> 	u8 data;</div><div class='del'>-	int member = -1;</div><div class='del'>-	int forward = dev-&gt;member;</div><div class='del'>-</div><div class='del'>-	ksz_pread8(dev, port, P_STP_CTRL, &amp;data);</div><div class='del'>-	data &amp;= ~(PORT_TX_ENABLE | PORT_RX_ENABLE | PORT_LEARN_DISABLE);</div><div class='del'>-</div><div class='del'>-	switch (state) {</div><div class='del'>-	case BR_STATE_DISABLED:</div><div class='del'>-		data |= PORT_LEARN_DISABLE;</div><div class='del'>-		if (port != dev-&gt;cpu_port)</div><div class='del'>-			member = 0;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_LISTENING:</div><div class='del'>-		data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE);</div><div class='del'>-		if (port != dev-&gt;cpu_port &amp;&amp;</div><div class='del'>-		    p-&gt;stp_state == BR_STATE_DISABLED)</div><div class='del'>-			member = dev-&gt;host_mask | p-&gt;vid_member;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_LEARNING:</div><div class='del'>-		data |= PORT_RX_ENABLE;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_FORWARDING:</div><div class='del'>-		data |= (PORT_TX_ENABLE | PORT_RX_ENABLE);</div><div class='del'>-</div><div class='del'>-		/* This function is also used internally. */</div><div class='del'>-		if (port == dev-&gt;cpu_port)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		member = dev-&gt;host_mask | p-&gt;vid_member;</div><div class='del'>-		mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-</div><div class='del'>-		/* Port is a member of a bridge. */</div><div class='del'>-		if (dev-&gt;br_member &amp; (1 &lt;&lt; port)) {</div><div class='del'>-			dev-&gt;member |= (1 &lt;&lt; port);</div><div class='del'>-			member = dev-&gt;member;</div><div class='del'>-		}</div><div class='del'>-		mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_BLOCKING:</div><div class='del'>-		data |= PORT_LEARN_DISABLE;</div><div class='del'>-		if (port != dev-&gt;cpu_port &amp;&amp;</div><div class='del'>-		    p-&gt;stp_state == BR_STATE_DISABLED)</div><div class='del'>-			member = dev-&gt;host_mask | p-&gt;vid_member;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(ds-&gt;dev, "invalid STP state: %d\n", state);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	ksz_pwrite8(dev, port, P_STP_CTRL, data);</div><div class='del'>-	p-&gt;stp_state = state;</div><div class='del'>-	mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	if (data &amp; PORT_RX_ENABLE)</div><div class='del'>-		dev-&gt;rx_ports |= (1 &lt;&lt; port);</div><div class='del'>-	else</div><div class='del'>-		dev-&gt;rx_ports &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	if (data &amp; PORT_TX_ENABLE)</div><div class='del'>-		dev-&gt;tx_ports |= (1 &lt;&lt; port);</div><div class='del'>-	else</div><div class='del'>-		dev-&gt;tx_ports &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-</div><div class='del'>-	/* Port membership may share register with STP state. */</div><div class='del'>-	if (member &gt;= 0 &amp;&amp; member != p-&gt;member)</div><div class='del'>-		ksz9477_cfg_port_member(dev, port, (u8)member);</div><div class='del'>-</div><div class='del'>-	/* Check if forwarding needs to be updated. */</div><div class='del'>-	if (state != BR_STATE_FORWARDING) {</div><div class='del'>-		if (dev-&gt;br_member &amp; (1 &lt;&lt; port))</div><div class='del'>-			dev-&gt;member &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* When topology has changed the function ksz_update_port_member</div><div class='del'>-	 * should be called to modify port forwarding behavior.</div><div class='del'>-	 */</div><div class='del'>-	if (forward != dev-&gt;member)</div><div class='del'>-		ksz_update_port_member(dev, port);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port)</div><div class='del'>-{</div><div class='del'>-	u8 data;</div><div class='add'>+	regmap_update_bits(ksz_regmap_8(dev), REG_SW_LUE_CTRL_2,</div><div class='add'>+			   SW_FLUSH_OPTION_M &lt;&lt; SW_FLUSH_OPTION_S,</div><div class='add'>+			   SW_FLUSH_OPTION_DYN_MAC &lt;&lt; SW_FLUSH_OPTION_S);</div><div class='ctx'> </div><div class='del'>-	ksz_read8(dev, REG_SW_LUE_CTRL_2, &amp;data);</div><div class='del'>-	data &amp;= ~(SW_FLUSH_OPTION_M &lt;&lt; SW_FLUSH_OPTION_S);</div><div class='del'>-	data |= (SW_FLUSH_OPTION_DYN_MAC &lt;&lt; SW_FLUSH_OPTION_S);</div><div class='del'>-	ksz_write8(dev, REG_SW_LUE_CTRL_2, data);</div><div class='del'>-	if (port &lt; dev-&gt;mib_port_cnt) {</div><div class='add'>+	if (port &lt; dev-&gt;info-&gt;port_cnt) {</div><div class='ctx'> 		/* flush individual port */</div><div class='del'>-		ksz_pread8(dev, port, P_STP_CTRL, &amp;data);</div><div class='add'>+		ksz_pread8(dev, port, regs[P_STP_CTRL], &amp;data);</div><div class='ctx'> 		if (!(data &amp; PORT_LEARN_DISABLE))</div><div class='del'>-			ksz_pwrite8(dev, port, P_STP_CTRL,</div><div class='add'>+			ksz_pwrite8(dev, port, regs[P_STP_CTRL],</div><div class='ctx'> 				    data | PORT_LEARN_DISABLE);</div><div class='ctx'> 		ksz_cfg(dev, S_FLUSH_TABLE_CTRL, SW_FLUSH_DYN_MAC_TABLE, true);</div><div class='del'>-		ksz_pwrite8(dev, port, P_STP_CTRL, data);</div><div class='add'>+		ksz_pwrite8(dev, port, regs[P_STP_CTRL], data);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* flush all */</div><div class='ctx'> 		ksz_cfg(dev, S_FLUSH_TABLE_CTRL, SW_FLUSH_STP_TABLE, true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='del'>-				       bool flag)</div><div class='add'>+int ksz9477_port_vlan_filtering(struct ksz_device *dev, int port,</div><div class='add'>+				bool flag, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-</div><div class='ctx'> 	if (flag) {</div><div class='ctx'> 		ksz_port_cfg(dev, port, REG_PORT_LUE_CTRL,</div><div class='ctx'> 			     PORT_VLAN_LOOKUP_VID_0, true);</div><div class='hunk'>@@ -554,70 +645,68 @@ static int ksz9477_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-				  const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+int ksz9477_port_vlan_add(struct ksz_device *dev, int port,</div><div class='add'>+			  const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u32 vlan_table[3];</div><div class='del'>-	u16 vid;</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; vid++) {</div><div class='del'>-		if (ksz9477_get_vlan_table(dev, vid, vlan_table)) {</div><div class='del'>-			dev_dbg(dev-&gt;dev, "Failed to get vlan table\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vlan_table[0] = VLAN_VALID | (vid &amp; VLAN_FID_M);</div><div class='del'>-		if (untagged)</div><div class='del'>-			vlan_table[1] |= BIT(port);</div><div class='del'>-		else</div><div class='del'>-			vlan_table[1] &amp;= ~BIT(port);</div><div class='del'>-		vlan_table[1] &amp;= ~(BIT(dev-&gt;cpu_port));</div><div class='add'>+	err = ksz9477_get_vlan_table(dev, vlan-&gt;vid, vlan_table);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to get vlan table");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		vlan_table[2] |= BIT(port) | BIT(dev-&gt;cpu_port);</div><div class='add'>+	vlan_table[0] = VLAN_VALID | (vlan-&gt;vid &amp; VLAN_FID_M);</div><div class='add'>+	if (untagged)</div><div class='add'>+		vlan_table[1] |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		vlan_table[1] &amp;= ~BIT(port);</div><div class='add'>+	vlan_table[1] &amp;= ~(BIT(dev-&gt;cpu_port));</div><div class='ctx'> </div><div class='del'>-		if (ksz9477_set_vlan_table(dev, vid, vlan_table)) {</div><div class='del'>-			dev_dbg(dev-&gt;dev, "Failed to set vlan table\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='add'>+	vlan_table[2] |= BIT(port) | BIT(dev-&gt;cpu_port);</div><div class='ctx'> </div><div class='del'>-		/* change PVID */</div><div class='del'>-		if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='del'>-			ksz_pwrite16(dev, port, REG_PORT_DEFAULT_VID, vid);</div><div class='add'>+	err = ksz9477_set_vlan_table(dev, vlan-&gt;vid, vlan_table);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to set vlan table");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* change PVID */</div><div class='add'>+	if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='add'>+		ksz_pwrite16(dev, port, REG_PORT_DEFAULT_VID, vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='del'>-				 const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+int ksz9477_port_vlan_del(struct ksz_device *dev, int port,</div><div class='add'>+			  const struct switchdev_obj_port_vlan *vlan)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	u32 vlan_table[3];</div><div class='del'>-	u16 vid;</div><div class='ctx'> 	u16 pvid;</div><div class='ctx'> </div><div class='ctx'> 	ksz_pread16(dev, port, REG_PORT_DEFAULT_VID, &amp;pvid);</div><div class='ctx'> 	pvid = pvid &amp; 0xFFF;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; vid++) {</div><div class='del'>-		if (ksz9477_get_vlan_table(dev, vid, vlan_table)) {</div><div class='del'>-			dev_dbg(dev-&gt;dev, "Failed to get vlan table\n");</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='add'>+	if (ksz9477_get_vlan_table(dev, vlan-&gt;vid, vlan_table)) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "Failed to get vlan table\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		vlan_table[2] &amp;= ~BIT(port);</div><div class='add'>+	vlan_table[2] &amp;= ~BIT(port);</div><div class='ctx'> </div><div class='del'>-		if (pvid == vid)</div><div class='del'>-			pvid = 1;</div><div class='add'>+	if (pvid == vlan-&gt;vid)</div><div class='add'>+		pvid = 1;</div><div class='ctx'> </div><div class='del'>-		if (untagged)</div><div class='del'>-			vlan_table[1] &amp;= ~BIT(port);</div><div class='add'>+	if (untagged)</div><div class='add'>+		vlan_table[1] &amp;= ~BIT(port);</div><div class='ctx'> </div><div class='del'>-		if (ksz9477_set_vlan_table(dev, vid, vlan_table)) {</div><div class='del'>-			dev_dbg(dev-&gt;dev, "Failed to set vlan table\n");</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='add'>+	if (ksz9477_set_vlan_table(dev, vlan-&gt;vid, vlan_table)) {</div><div class='add'>+		dev_dbg(dev-&gt;dev, "Failed to set vlan table\n");</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ksz_pwrite16(dev, port, REG_PORT_DEFAULT_VID, pvid);</div><div class='hunk'>@@ -625,10 +714,9 @@ static int ksz9477_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-				const unsigned char *addr, u16 vid)</div><div class='add'>+int ksz9477_fdb_add(struct ksz_device *dev, int port,</div><div class='add'>+		    const unsigned char *addr, u16 vid, struct dsa_db db)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u32 alu_table[4];</div><div class='ctx'> 	u32 data;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -648,8 +736,8 @@ static int ksz9477_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_CTRL__4, ALU_READ | ALU_START);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be finished */</div><div class='del'>-	ret = ksz9477_wait_alu_ready(dev, ALU_START, 1000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	ret = ksz9477_wait_alu_ready(dev);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to read ALU\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -672,8 +760,8 @@ static int ksz9477_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_CTRL__4, ALU_WRITE | ALU_START);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be finished */</div><div class='del'>-	ret = ksz9477_wait_alu_ready(dev, ALU_START, 1000);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = ksz9477_wait_alu_ready(dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to write ALU\n");</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -682,10 +770,9 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-				const unsigned char *addr, u16 vid)</div><div class='add'>+int ksz9477_fdb_del(struct ksz_device *dev, int port,</div><div class='add'>+		    const unsigned char *addr, u16 vid, struct dsa_db db)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u32 alu_table[4];</div><div class='ctx'> 	u32 data;</div><div class='ctx'> 	int ret = 0;</div><div class='hunk'>@@ -705,8 +792,8 @@ static int ksz9477_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_CTRL__4, ALU_READ | ALU_START);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be finished */</div><div class='del'>-	ret = ksz9477_wait_alu_ready(dev, ALU_START, 1000);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='add'>+	ret = ksz9477_wait_alu_ready(dev);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to read ALU\n");</div><div class='ctx'> 		goto exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -718,10 +805,10 @@ static int ksz9477_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 		ksz_read32(dev, REG_SW_ALU_VAL_D, &amp;alu_table[3]);</div><div class='ctx'> </div><div class='ctx'> 		/* clear forwarding port */</div><div class='del'>-		alu_table[2] &amp;= ~BIT(port);</div><div class='add'>+		alu_table[1] &amp;= ~BIT(port);</div><div class='ctx'> </div><div class='ctx'> 		/* if there is no port to forward, clear table */</div><div class='del'>-		if ((alu_table[2] &amp; ALU_V_PORT_MAP) == 0) {</div><div class='add'>+		if ((alu_table[1] &amp; ALU_V_PORT_MAP) == 0) {</div><div class='ctx'> 			alu_table[0] = 0;</div><div class='ctx'> 			alu_table[1] = 0;</div><div class='ctx'> 			alu_table[2] = 0;</div><div class='hunk'>@@ -739,8 +826,8 @@ static int ksz9477_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_CTRL__4, ALU_WRITE | ALU_START);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be finished */</div><div class='del'>-	ret = ksz9477_wait_alu_ready(dev, ALU_START, 1000);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = ksz9477_wait_alu_ready(dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to write ALU\n");</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -772,10 +859,9 @@ static void ksz9477_convert_alu(struct alu_struct *alu, u32 *alu_table)</div><div class='ctx'> 	alu-&gt;mac[5] = alu_table[3] &amp; 0xFF;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='del'>-				 dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+int ksz9477_fdb_dump(struct ksz_device *dev, int port,</div><div class='add'>+		     dsa_fdb_dump_cb_t *cb, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 ksz_data;</div><div class='ctx'> 	u32 alu_table[4];</div><div class='hunk'>@@ -802,6 +888,9 @@ static int ksz9477_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (!(ksz_data &amp; ALU_VALID))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		/* read ALU table */</div><div class='ctx'> 		ksz9477_read_table(dev, alu_table);</div><div class='ctx'> </div><div class='hunk'>@@ -824,14 +913,19 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-				 const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+int ksz9477_mdb_add(struct ksz_device *dev, int port,</div><div class='add'>+		    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u32 static_table[4];</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='ctx'> 	u32 data;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	u32 mac_hi, mac_lo;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='ctx'> </div><div class='ctx'> 	mac_hi = ((mdb-&gt;addr[0] &lt;&lt; 8) | mdb-&gt;addr[1]);</div><div class='ctx'> 	mac_lo = ((mdb-&gt;addr[2] &lt;&lt; 24) | (mdb-&gt;addr[3] &lt;&lt; 16));</div><div class='hunk'>@@ -839,14 +933,15 @@ static void ksz9477_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='ctx'> </div><div class='del'>-	for (index = 0; index &lt; dev-&gt;num_statics; index++) {</div><div class='add'>+	for (index = 0; index &lt; dev-&gt;info-&gt;num_statics; index++) {</div><div class='ctx'> 		/* find empty slot first */</div><div class='del'>-		data = (index &lt;&lt; ALU_STAT_INDEX_S) |</div><div class='del'>-			ALU_STAT_READ | ALU_STAT_START;</div><div class='add'>+		data = (index &lt;&lt; shifts[ALU_STAT_INDEX]) |</div><div class='add'>+			masks[ALU_STAT_READ] | ALU_STAT_START;</div><div class='ctx'> 		ksz_write32(dev, REG_SW_ALU_STAT_CTRL__4, data);</div><div class='ctx'> </div><div class='ctx'> 		/* wait to be finished */</div><div class='del'>-		if (ksz9477_wait_alu_sta_ready(dev, ALU_STAT_START, 1000) &lt; 0) {</div><div class='add'>+		err = ksz9477_wait_alu_sta_ready(dev);</div><div class='add'>+		if (err) {</div><div class='ctx'> 			dev_dbg(dev-&gt;dev, "Failed to read ALU STATIC\n");</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -869,8 +964,10 @@ static void ksz9477_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* no available entry */</div><div class='del'>-	if (index == dev-&gt;num_statics)</div><div class='add'>+	if (index == dev-&gt;info-&gt;num_statics) {</div><div class='add'>+		err = -ENOSPC;</div><div class='ctx'> 		goto exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* add entry */</div><div class='ctx'> 	static_table[0] = ALU_V_STATIC_VALID;</div><div class='hunk'>@@ -883,42 +980,47 @@ static void ksz9477_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> </div><div class='ctx'> 	ksz9477_write_table(dev, static_table);</div><div class='ctx'> </div><div class='del'>-	data = (index &lt;&lt; ALU_STAT_INDEX_S) | ALU_STAT_START;</div><div class='add'>+	data = (index &lt;&lt; shifts[ALU_STAT_INDEX]) | ALU_STAT_START;</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_STAT_CTRL__4, data);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be finished */</div><div class='del'>-	if (ksz9477_wait_alu_sta_ready(dev, ALU_STAT_START, 1000) &lt; 0)</div><div class='add'>+	if (ksz9477_wait_alu_sta_ready(dev))</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to read ALU STATIC\n");</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='ctx'> 	mutex_unlock(&amp;dev-&gt;alu_mutex);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-				const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+int ksz9477_mdb_del(struct ksz_device *dev, int port,</div><div class='add'>+		    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u32 static_table[4];</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u32 *masks;</div><div class='ctx'> 	u32 data;</div><div class='ctx'> 	int index;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 mac_hi, mac_lo;</div><div class='ctx'> </div><div class='add'>+	shifts = dev-&gt;info-&gt;shifts;</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='ctx'> 	mac_hi = ((mdb-&gt;addr[0] &lt;&lt; 8) | mdb-&gt;addr[1]);</div><div class='ctx'> 	mac_lo = ((mdb-&gt;addr[2] &lt;&lt; 24) | (mdb-&gt;addr[3] &lt;&lt; 16));</div><div class='ctx'> 	mac_lo |= ((mdb-&gt;addr[4] &lt;&lt; 8) | mdb-&gt;addr[5]);</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;dev-&gt;alu_mutex);</div><div class='ctx'> </div><div class='del'>-	for (index = 0; index &lt; dev-&gt;num_statics; index++) {</div><div class='add'>+	for (index = 0; index &lt; dev-&gt;info-&gt;num_statics; index++) {</div><div class='ctx'> 		/* find empty slot first */</div><div class='del'>-		data = (index &lt;&lt; ALU_STAT_INDEX_S) |</div><div class='del'>-			ALU_STAT_READ | ALU_STAT_START;</div><div class='add'>+		data = (index &lt;&lt; shifts[ALU_STAT_INDEX]) |</div><div class='add'>+			masks[ALU_STAT_READ] | ALU_STAT_START;</div><div class='ctx'> 		ksz_write32(dev, REG_SW_ALU_STAT_CTRL__4, data);</div><div class='ctx'> </div><div class='ctx'> 		/* wait to be finished */</div><div class='del'>-		ret = ksz9477_wait_alu_sta_ready(dev, ALU_STAT_START, 1000);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='add'>+		ret = ksz9477_wait_alu_sta_ready(dev);</div><div class='add'>+		if (ret) {</div><div class='ctx'> 			dev_dbg(dev-&gt;dev, "Failed to read ALU STATIC\n");</div><div class='ctx'> 			goto exit;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -939,7 +1041,7 @@ static int ksz9477_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* no available entry */</div><div class='del'>-	if (index == dev-&gt;num_statics)</div><div class='add'>+	if (index == dev-&gt;info-&gt;num_statics)</div><div class='ctx'> 		goto exit;</div><div class='ctx'> </div><div class='ctx'> 	/* clear port */</div><div class='hunk'>@@ -955,12 +1057,12 @@ static int ksz9477_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> </div><div class='ctx'> 	ksz9477_write_table(dev, static_table);</div><div class='ctx'> </div><div class='del'>-	data = (index &lt;&lt; ALU_STAT_INDEX_S) | ALU_STAT_START;</div><div class='add'>+	data = (index &lt;&lt; shifts[ALU_STAT_INDEX]) | ALU_STAT_START;</div><div class='ctx'> 	ksz_write32(dev, REG_SW_ALU_STAT_CTRL__4, data);</div><div class='ctx'> </div><div class='ctx'> 	/* wait to be finished */</div><div class='del'>-	ret = ksz9477_wait_alu_sta_ready(dev, ALU_STAT_START, 1000);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	ret = ksz9477_wait_alu_sta_ready(dev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		dev_dbg(dev-&gt;dev, "Failed to read ALU STATIC\n");</div><div class='ctx'> </div><div class='ctx'> exit:</div><div class='hunk'>@@ -969,19 +1071,36 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='del'>-				   struct dsa_mall_mirror_tc_entry *mirror,</div><div class='del'>-				   bool ingress)</div><div class='add'>+int ksz9477_port_mirror_add(struct ksz_device *dev, int port,</div><div class='add'>+			    struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			    bool ingress, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	u8 data;</div><div class='add'>+	int p;</div><div class='add'>+</div><div class='add'>+	/* Limit to one sniffer port</div><div class='add'>+	 * Check if any of the port is already set for sniffing</div><div class='add'>+	 * If yes, instruct the user to remove the previous entry &amp; exit</div><div class='add'>+	 */</div><div class='add'>+	for (p = 0; p &lt; dev-&gt;info-&gt;port_cnt; p++) {</div><div class='add'>+		/* Skip the current sniffing port */</div><div class='add'>+		if (p == mirror-&gt;to_local_port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ksz_pread8(dev, p, P_MIRROR_CTRL, &amp;data);</div><div class='add'>+</div><div class='add'>+		if (data &amp; PORT_MIRROR_SNIFFER) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Sniffer port is already configured, delete existing rules &amp; retry");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ingress)</div><div class='ctx'> 		ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_RX, true);</div><div class='ctx'> 	else</div><div class='ctx'> 		ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_TX, true);</div><div class='ctx'> </div><div class='del'>-	ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_SNIFFER, false);</div><div class='del'>-</div><div class='ctx'> 	/* configure mirror port */</div><div class='ctx'> 	ksz_port_cfg(dev, mirror-&gt;to_local_port, P_MIRROR_CTRL,</div><div class='ctx'> 		     PORT_MIRROR_SNIFFER, true);</div><div class='hunk'>@@ -991,192 +1110,148 @@ static int ksz9477_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='del'>-				    struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+void ksz9477_port_mirror_del(struct ksz_device *dev, int port,</div><div class='add'>+			     struct dsa_mall_mirror_tc_entry *mirror)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	bool in_use = false;</div><div class='ctx'> 	u8 data;</div><div class='add'>+	int p;</div><div class='ctx'> </div><div class='ctx'> 	if (mirror-&gt;ingress)</div><div class='ctx'> 		ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_RX, false);</div><div class='ctx'> 	else</div><div class='ctx'> 		ksz_port_cfg(dev, port, P_MIRROR_CTRL, PORT_MIRROR_TX, false);</div><div class='ctx'> </div><div class='del'>-	ksz_pread8(dev, port, P_MIRROR_CTRL, &amp;data);</div><div class='ctx'> </div><div class='del'>-	if (!(data &amp; (PORT_MIRROR_RX | PORT_MIRROR_TX)))</div><div class='add'>+	/* Check if any of the port is still referring to sniffer port */</div><div class='add'>+	for (p = 0; p &lt; dev-&gt;info-&gt;port_cnt; p++) {</div><div class='add'>+		ksz_pread8(dev, p, P_MIRROR_CTRL, &amp;data);</div><div class='add'>+</div><div class='add'>+		if ((data &amp; (PORT_MIRROR_RX | PORT_MIRROR_TX))) {</div><div class='add'>+			in_use = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* delete sniffing if there are no other mirroring rules */</div><div class='add'>+	if (!in_use)</div><div class='ctx'> 		ksz_port_cfg(dev, mirror-&gt;to_local_port, P_MIRROR_CTRL,</div><div class='ctx'> 			     PORT_MIRROR_SNIFFER, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_phy_setup(struct ksz_device *dev, int port,</div><div class='del'>-			      struct phy_device *phy)</div><div class='add'>+static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port)</div><div class='ctx'> {</div><div class='del'>-	/* Only apply to port with PHY. */</div><div class='del'>-	if (port &gt;= dev-&gt;phy_port_cnt)</div><div class='del'>-		return;</div><div class='add'>+	phy_interface_t interface;</div><div class='add'>+	bool gbit;</div><div class='ctx'> </div><div class='del'>-	/* The MAC actually cannot run in 1000 half-duplex mode. */</div><div class='del'>-	phy_remove_link_mode(phy,</div><div class='del'>-			     ETHTOOL_LINK_MODE_1000baseT_Half_BIT);</div><div class='add'>+	if (dev-&gt;info-&gt;internal_phy[port])</div><div class='add'>+		return PHY_INTERFACE_MODE_NA;</div><div class='ctx'> </div><div class='del'>-	/* PHY does not support gigabit. */</div><div class='del'>-	if (!(dev-&gt;features &amp; GBIT_SUPPORT))</div><div class='del'>-		phy_remove_link_mode(phy,</div><div class='del'>-				     ETHTOOL_LINK_MODE_1000baseT_Full_BIT);</div><div class='del'>-}</div><div class='add'>+	gbit = ksz_get_gbit(dev, port);</div><div class='ctx'> </div><div class='del'>-static bool ksz9477_get_gbit(struct ksz_device *dev, u8 data)</div><div class='del'>-{</div><div class='del'>-	bool gbit;</div><div class='add'>+	interface = ksz_get_xmii(dev, port, gbit);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;features &amp; NEW_XMII)</div><div class='del'>-		gbit = !(data &amp; PORT_MII_NOT_1GBIT);</div><div class='del'>-	else</div><div class='del'>-		gbit = !!(data &amp; PORT_MII_1000MBIT_S1);</div><div class='del'>-	return gbit;</div><div class='add'>+	return interface;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_set_gbit(struct ksz_device *dev, bool gbit, u8 *data)</div><div class='add'>+void ksz9477_get_caps(struct ksz_device *dev, int port,</div><div class='add'>+		      struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	if (dev-&gt;features &amp; NEW_XMII) {</div><div class='del'>-		if (gbit)</div><div class='del'>-			*data &amp;= ~PORT_MII_NOT_1GBIT;</div><div class='del'>-		else</div><div class='del'>-			*data |= PORT_MII_NOT_1GBIT;</div><div class='del'>-	} else {</div><div class='del'>-		if (gbit)</div><div class='del'>-			*data |= PORT_MII_1000MBIT_S1;</div><div class='del'>-		else</div><div class='del'>-			*data &amp;= ~PORT_MII_1000MBIT_S1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	config-&gt;mac_capabilities = MAC_10 | MAC_100 | MAC_ASYM_PAUSE |</div><div class='add'>+				   MAC_SYM_PAUSE;</div><div class='ctx'> </div><div class='del'>-static int ksz9477_get_xmii(struct ksz_device *dev, u8 data)</div><div class='del'>-{</div><div class='del'>-	int mode;</div><div class='add'>+	if (dev-&gt;info-&gt;gbit_capable[port])</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_1000FD;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;features &amp; NEW_XMII) {</div><div class='del'>-		switch (data &amp; PORT_MII_SEL_M) {</div><div class='del'>-		case PORT_MII_SEL:</div><div class='del'>-			mode = 0;</div><div class='del'>-			break;</div><div class='del'>-		case PORT_RMII_SEL:</div><div class='del'>-			mode = 1;</div><div class='del'>-			break;</div><div class='del'>-		case PORT_GMII_SEL:</div><div class='del'>-			mode = 2;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			mode = 3;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (data &amp; PORT_MII_SEL_M) {</div><div class='del'>-		case PORT_MII_SEL_S1:</div><div class='del'>-			mode = 0;</div><div class='del'>-			break;</div><div class='del'>-		case PORT_RMII_SEL_S1:</div><div class='del'>-			mode = 1;</div><div class='del'>-			break;</div><div class='del'>-		case PORT_GMII_SEL_S1:</div><div class='del'>-			mode = 2;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			mode = 3;</div><div class='del'>-		}</div><div class='add'>+	if (ksz_is_sgmii_port(dev, port)) {</div><div class='add'>+		struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+		phy_interface_or(config-&gt;supported_interfaces,</div><div class='add'>+				 config-&gt;supported_interfaces,</div><div class='add'>+				 p-&gt;pcs-&gt;supported_interfaces);</div><div class='ctx'> 	}</div><div class='del'>-	return mode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_set_xmii(struct ksz_device *dev, int mode, u8 *data)</div><div class='add'>+int ksz9477_set_ageing_time(struct ksz_device *dev, unsigned int msecs)</div><div class='ctx'> {</div><div class='del'>-	u8 xmii;</div><div class='add'>+	u32 secs = msecs / 1000;</div><div class='add'>+	u8 data, mult, value;</div><div class='add'>+	u32 max_val;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;features &amp; NEW_XMII) {</div><div class='del'>-		switch (mode) {</div><div class='del'>-		case 0:</div><div class='del'>-			xmii = PORT_MII_SEL;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			xmii = PORT_RMII_SEL;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			xmii = PORT_GMII_SEL;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			xmii = PORT_RGMII_SEL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (mode) {</div><div class='del'>-		case 0:</div><div class='del'>-			xmii = PORT_MII_SEL_S1;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			xmii = PORT_RMII_SEL_S1;</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			xmii = PORT_GMII_SEL_S1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			xmii = PORT_RGMII_SEL_S1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+#define MAX_TIMER_VAL	((1 &lt;&lt; 8) - 1)</div><div class='add'>+</div><div class='add'>+	/* The aging timer comprises a 3-bit multiplier and an 8-bit second</div><div class='add'>+	 * value.  Either of them cannot be zero.  The maximum timer is then</div><div class='add'>+	 * 7 * 255 = 1785 seconds.</div><div class='add'>+	 */</div><div class='add'>+	if (!secs)</div><div class='add'>+		secs = 1;</div><div class='add'>+</div><div class='add'>+	/* Return error if too large. */</div><div class='add'>+	else if (secs &gt; 7 * MAX_TIMER_VAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read8(dev, REG_SW_LUE_CTRL_0, &amp;value);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check whether there is need to update the multiplier. */</div><div class='add'>+	mult = FIELD_GET(SW_AGE_CNT_M, value);</div><div class='add'>+	max_val = MAX_TIMER_VAL;</div><div class='add'>+	if (mult &gt; 0) {</div><div class='add'>+		/* Try to use the same multiplier already in the register as</div><div class='add'>+		 * the hardware default uses multiplier 4 and 75 seconds for</div><div class='add'>+		 * 300 seconds.</div><div class='add'>+		 */</div><div class='add'>+		max_val = DIV_ROUND_UP(secs, mult);</div><div class='add'>+		if (max_val &gt; MAX_TIMER_VAL || max_val * mult != secs)</div><div class='add'>+			max_val = MAX_TIMER_VAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = DIV_ROUND_UP(secs, max_val);</div><div class='add'>+	if (mult != data) {</div><div class='add'>+		value &amp;= ~SW_AGE_CNT_M;</div><div class='add'>+		value |= FIELD_PREP(SW_AGE_CNT_M, data);</div><div class='add'>+		ret = ksz_write8(dev, REG_SW_LUE_CTRL_0, value);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='ctx'> 	}</div><div class='del'>-	*data &amp;= ~PORT_MII_SEL_M;</div><div class='del'>-	*data |= xmii;</div><div class='add'>+</div><div class='add'>+	value = DIV_ROUND_UP(secs, data);</div><div class='add'>+	return ksz_write8(dev, REG_SW_LUE_CTRL_3, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static phy_interface_t ksz9477_get_interface(struct ksz_device *dev, int port)</div><div class='add'>+void ksz9477_port_queue_split(struct ksz_device *dev, int port)</div><div class='ctx'> {</div><div class='del'>-	phy_interface_t interface;</div><div class='del'>-	bool gbit;</div><div class='del'>-	int mode;</div><div class='del'>-	u8 data8;</div><div class='add'>+	u8 data;</div><div class='ctx'> </div><div class='del'>-	if (port &lt; dev-&gt;phy_port_cnt)</div><div class='del'>-		return PHY_INTERFACE_MODE_NA;</div><div class='del'>-	ksz_pread8(dev, port, REG_PORT_XMII_CTRL_1, &amp;data8);</div><div class='del'>-	gbit = ksz9477_get_gbit(dev, data8);</div><div class='del'>-	mode = ksz9477_get_xmii(dev, data8);</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case 2:</div><div class='del'>-		interface = PHY_INTERFACE_MODE_GMII;</div><div class='del'>-		if (gbit)</div><div class='del'>-			break;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case 0:</div><div class='del'>-		interface = PHY_INTERFACE_MODE_MII;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		interface = PHY_INTERFACE_MODE_RMII;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		interface = PHY_INTERFACE_MODE_RGMII;</div><div class='del'>-		if (data8 &amp; PORT_RGMII_ID_EG_ENABLE)</div><div class='del'>-			interface = PHY_INTERFACE_MODE_RGMII_TXID;</div><div class='del'>-		if (data8 &amp; PORT_RGMII_ID_IG_ENABLE) {</div><div class='del'>-			interface = PHY_INTERFACE_MODE_RGMII_RXID;</div><div class='del'>-			if (data8 &amp; PORT_RGMII_ID_EG_ENABLE)</div><div class='del'>-				interface = PHY_INTERFACE_MODE_RGMII_ID;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return interface;</div><div class='add'>+	if (dev-&gt;info-&gt;num_tx_queues == 8)</div><div class='add'>+		data = PORT_EIGHT_QUEUE;</div><div class='add'>+	else if (dev-&gt;info-&gt;num_tx_queues == 4)</div><div class='add'>+		data = PORT_FOUR_QUEUE;</div><div class='add'>+	else if (dev-&gt;info-&gt;num_tx_queues == 2)</div><div class='add'>+		data = PORT_TWO_QUEUE;</div><div class='add'>+	else</div><div class='add'>+		data = PORT_SINGLE_QUEUE;</div><div class='add'>+</div><div class='add'>+	ksz_prmw8(dev, port, REG_PORT_CTRL_0, PORT_QUEUE_SPLIT_MASK, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)</div><div class='add'>+void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)</div><div class='ctx'> {</div><div class='del'>-	u8 data8;</div><div class='del'>-	u8 member;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='ctx'> 	u16 data16;</div><div class='del'>-	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+	u8 member;</div><div class='ctx'> </div><div class='ctx'> 	/* enable tag tail for host port */</div><div class='ctx'> 	if (cpu_port)</div><div class='ctx'> 		ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_TAIL_TAG_ENABLE,</div><div class='ctx'> 			     true);</div><div class='ctx'> </div><div class='add'>+	ksz9477_port_queue_split(dev, port);</div><div class='add'>+</div><div class='ctx'> 	ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_MAC_LOOPBACK, false);</div><div class='ctx'> </div><div class='ctx'> 	/* set back pressure */</div><div class='hunk'>@@ -1185,163 +1260,211 @@ static void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port)</div><div class='ctx'> 	/* enable broadcast storm limit */</div><div class='ctx'> 	ksz_port_cfg(dev, port, P_BCAST_STORM_CTRL, PORT_BROADCAST_STORM, true);</div><div class='ctx'> </div><div class='del'>-	/* disable DiffServ priority */</div><div class='del'>-	ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_DIFFSERV_PRIO_ENABLE, false);</div><div class='del'>-</div><div class='ctx'> 	/* replace priority */</div><div class='ctx'> 	ksz_port_cfg(dev, port, REG_PORT_MRI_MAC_CTRL, PORT_USER_PRIO_CEILING,</div><div class='ctx'> 		     false);</div><div class='ctx'> 	ksz9477_port_cfg32(dev, port, REG_PORT_MTI_QUEUE_CTRL_0__4,</div><div class='ctx'> 			   MTI_PVID_REPLACE, false);</div><div class='ctx'> </div><div class='del'>-	/* enable 802.1p priority */</div><div class='del'>-	ksz_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_PRIO_ENABLE, true);</div><div class='del'>-</div><div class='del'>-	if (port &lt; dev-&gt;phy_port_cnt) {</div><div class='del'>-		/* do not force flow control */</div><div class='del'>-		ksz_port_cfg(dev, port, REG_PORT_CTRL_0,</div><div class='del'>-			     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,</div><div class='del'>-			     false);</div><div class='add'>+	/* force flow control for non-PHY ports only */</div><div class='add'>+	ksz_port_cfg(dev, port, REG_PORT_CTRL_0,</div><div class='add'>+		     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,</div><div class='add'>+		     !dev-&gt;info-&gt;internal_phy[port]);</div><div class='ctx'> </div><div class='del'>-	} else {</div><div class='del'>-		/* force flow control */</div><div class='del'>-		ksz_port_cfg(dev, port, REG_PORT_CTRL_0,</div><div class='del'>-			     PORT_FORCE_TX_FLOW_CTRL | PORT_FORCE_RX_FLOW_CTRL,</div><div class='del'>-			     true);</div><div class='del'>-</div><div class='del'>-		/* configure MAC to 1G &amp; RGMII mode */</div><div class='del'>-		ksz_pread8(dev, port, REG_PORT_XMII_CTRL_1, &amp;data8);</div><div class='del'>-		switch (dev-&gt;interface) {</div><div class='del'>-		case PHY_INTERFACE_MODE_MII:</div><div class='del'>-			ksz9477_set_xmii(dev, 0, &amp;data8);</div><div class='del'>-			ksz9477_set_gbit(dev, false, &amp;data8);</div><div class='del'>-			p-&gt;phydev.speed = SPEED_100;</div><div class='del'>-			break;</div><div class='del'>-		case PHY_INTERFACE_MODE_RMII:</div><div class='del'>-			ksz9477_set_xmii(dev, 1, &amp;data8);</div><div class='del'>-			ksz9477_set_gbit(dev, false, &amp;data8);</div><div class='del'>-			p-&gt;phydev.speed = SPEED_100;</div><div class='del'>-			break;</div><div class='del'>-		case PHY_INTERFACE_MODE_GMII:</div><div class='del'>-			ksz9477_set_xmii(dev, 2, &amp;data8);</div><div class='del'>-			ksz9477_set_gbit(dev, true, &amp;data8);</div><div class='del'>-			p-&gt;phydev.speed = SPEED_1000;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ksz9477_set_xmii(dev, 3, &amp;data8);</div><div class='del'>-			ksz9477_set_gbit(dev, true, &amp;data8);</div><div class='del'>-			data8 &amp;= ~PORT_RGMII_ID_IG_ENABLE;</div><div class='del'>-			data8 &amp;= ~PORT_RGMII_ID_EG_ENABLE;</div><div class='del'>-			if (dev-&gt;interface == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='del'>-			    dev-&gt;interface == PHY_INTERFACE_MODE_RGMII_RXID)</div><div class='del'>-				data8 |= PORT_RGMII_ID_IG_ENABLE;</div><div class='del'>-			if (dev-&gt;interface == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='del'>-			    dev-&gt;interface == PHY_INTERFACE_MODE_RGMII_TXID)</div><div class='del'>-				data8 |= PORT_RGMII_ID_EG_ENABLE;</div><div class='del'>-			p-&gt;phydev.speed = SPEED_1000;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		ksz_pwrite8(dev, port, REG_PORT_XMII_CTRL_1, data8);</div><div class='del'>-		p-&gt;phydev.duplex = 1;</div><div class='del'>-	}</div><div class='del'>-	mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	if (cpu_port) {</div><div class='del'>-		member = dev-&gt;port_mask;</div><div class='del'>-		dev-&gt;on_ports = dev-&gt;host_mask;</div><div class='del'>-		dev-&gt;live_ports = dev-&gt;host_mask;</div><div class='del'>-	} else {</div><div class='del'>-		member = dev-&gt;host_mask | p-&gt;vid_member;</div><div class='del'>-		dev-&gt;on_ports |= (1 &lt;&lt; port);</div><div class='add'>+	if (cpu_port)</div><div class='add'>+		member = dsa_user_ports(ds);</div><div class='add'>+	else</div><div class='add'>+		member = BIT(dsa_upstream_port(ds, port));</div><div class='ctx'> </div><div class='del'>-		/* Link was detected before port is enabled. */</div><div class='del'>-		if (p-&gt;phydev.link)</div><div class='del'>-			dev-&gt;live_ports |= (1 &lt;&lt; port);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='ctx'> 	ksz9477_cfg_port_member(dev, port, member);</div><div class='ctx'> </div><div class='ctx'> 	/* clear pending interrupts */</div><div class='del'>-	if (port &lt; dev-&gt;phy_port_cnt)</div><div class='add'>+	if (dev-&gt;info-&gt;internal_phy[port])</div><div class='ctx'> 		ksz_pread16(dev, port, REG_PORT_PHY_INT_ENABLE, &amp;data16);</div><div class='add'>+</div><div class='add'>+	ksz9477_port_acl_init(dev, port);</div><div class='add'>+</div><div class='add'>+	/* clear pending wake flags */</div><div class='add'>+	ksz_handle_wake_reason(dev, port);</div><div class='add'>+</div><div class='add'>+	/* Disable all WoL options by default. Otherwise</div><div class='add'>+	 * ksz_switch_macaddr_get/put logic will not work properly.</div><div class='add'>+	 */</div><div class='add'>+	ksz_pwrite8(dev, port, regs[REG_PORT_PME_CTRL], 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_config_cpu_port(struct dsa_switch *ds)</div><div class='add'>+void ksz9477_config_cpu_port(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	struct ksz_port *p;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	ds-&gt;num_ports = dev-&gt;port_cnt;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;port_cnt; i++) {</div><div class='del'>-		if (dsa_is_cpu_port(ds, i) &amp;&amp; (dev-&gt;cpu_ports &amp; (1 &lt;&lt; i))) {</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++) {</div><div class='add'>+		if (dsa_is_cpu_port(ds, i) &amp;&amp;</div><div class='add'>+		    (dev-&gt;info-&gt;cpu_ports &amp; (1 &lt;&lt; i))) {</div><div class='ctx'> 			phy_interface_t interface;</div><div class='add'>+			const char *prev_msg;</div><div class='add'>+			const char *prev_mode;</div><div class='ctx'> </div><div class='ctx'> 			dev-&gt;cpu_port = i;</div><div class='del'>-			dev-&gt;host_mask = (1 &lt;&lt; dev-&gt;cpu_port);</div><div class='del'>-			dev-&gt;port_mask |= dev-&gt;host_mask;</div><div class='add'>+			p = &amp;dev-&gt;ports[i];</div><div class='ctx'> </div><div class='ctx'> 			/* Read from XMII register to determine host port</div><div class='ctx'> 			 * interface.  If set specifically in device tree</div><div class='ctx'> 			 * note the difference to help debugging.</div><div class='ctx'> 			 */</div><div class='ctx'> 			interface = ksz9477_get_interface(dev, i);</div><div class='del'>-			if (!dev-&gt;interface)</div><div class='del'>-				dev-&gt;interface = interface;</div><div class='del'>-			if (interface &amp;&amp; interface != dev-&gt;interface)</div><div class='del'>-				dev_info(dev-&gt;dev,</div><div class='del'>-					 "use %s instead of %s\n",</div><div class='del'>-					  phy_modes(dev-&gt;interface),</div><div class='del'>-					  phy_modes(interface));</div><div class='add'>+			if (!p-&gt;interface) {</div><div class='add'>+				if (dev-&gt;compat_interface) {</div><div class='add'>+					dev_warn(dev-&gt;dev,</div><div class='add'>+						 "Using legacy switch \"phy-mode\" property, because it is missing on port %d node. "</div><div class='add'>+						 "Please update your device tree.\n",</div><div class='add'>+						 i);</div><div class='add'>+					p-&gt;interface = dev-&gt;compat_interface;</div><div class='add'>+				} else {</div><div class='add'>+					p-&gt;interface = interface;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (interface &amp;&amp; interface != p-&gt;interface) {</div><div class='add'>+				prev_msg = " instead of ";</div><div class='add'>+				prev_mode = phy_modes(interface);</div><div class='add'>+			} else {</div><div class='add'>+				prev_msg = "";</div><div class='add'>+				prev_mode = "";</div><div class='add'>+			}</div><div class='add'>+			dev_info(dev-&gt;dev,</div><div class='add'>+				 "Port%d: using phy mode %s%s%s\n",</div><div class='add'>+				 i,</div><div class='add'>+				 phy_modes(p-&gt;interface),</div><div class='add'>+				 prev_msg,</div><div class='add'>+				 prev_mode);</div><div class='ctx'> </div><div class='ctx'> 			/* enable cpu port */</div><div class='ctx'> 			ksz9477_port_setup(dev, i, true);</div><div class='del'>-			p = &amp;dev-&gt;ports[dev-&gt;cpu_port];</div><div class='del'>-			p-&gt;vid_member = dev-&gt;port_mask;</div><div class='del'>-			p-&gt;on = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;member = dev-&gt;host_mask;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;mib_port_cnt; i++) {</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++) {</div><div class='ctx'> 		if (i == dev-&gt;cpu_port)</div><div class='ctx'> 			continue;</div><div class='del'>-		p = &amp;dev-&gt;ports[i];</div><div class='add'>+		ksz_port_stp_state_set(ds, i, BR_STATE_DISABLED);</div><div class='ctx'> </div><div class='del'>-		/* Initialize to non-zero so that ksz_cfg_port_member() will</div><div class='del'>-		 * be called.</div><div class='del'>-		 */</div><div class='del'>-		p-&gt;vid_member = (1 &lt;&lt; i);</div><div class='del'>-		p-&gt;member = dev-&gt;port_mask;</div><div class='del'>-		ksz9477_port_stp_state_set(ds, i, BR_STATE_DISABLED);</div><div class='del'>-		p-&gt;on = 1;</div><div class='del'>-		if (i &lt; dev-&gt;phy_port_cnt)</div><div class='del'>-			p-&gt;phy = 1;</div><div class='del'>-		if (dev-&gt;chip_id == 0x00947700 &amp;&amp; i == 6) {</div><div class='del'>-			p-&gt;sgmii = 1;</div><div class='del'>-</div><div class='del'>-			/* SGMII PHY detection code is not implemented yet. */</div><div class='del'>-			p-&gt;phy = 0;</div><div class='add'>+		/* Power down the internal PHY if port is unused. */</div><div class='add'>+		if (dsa_is_unused_port(ds, i) &amp;&amp; dev-&gt;info-&gt;internal_phy[i])</div><div class='add'>+			ksz_pwrite16(dev, i, 0x100, BMCR_PDOWN);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define RESV_MCAST_CNT	8</div><div class='add'>+</div><div class='add'>+static u8 reserved_mcast_map[RESV_MCAST_CNT] = { 0, 1, 3, 16, 32, 33, 2, 17 };</div><div class='add'>+</div><div class='add'>+int ksz9477_enable_stp_addr(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 i, ports, update;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	bool override;</div><div class='add'>+	u32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	masks = dev-&gt;info-&gt;masks;</div><div class='add'>+</div><div class='add'>+	/* Enable Reserved multicast table */</div><div class='add'>+	ksz_cfg(dev, REG_SW_LUE_CTRL_0, SW_RESV_MCAST_ENABLE, true);</div><div class='add'>+</div><div class='add'>+	/* The reserved multicast address table has 8 entries.  Each entry has</div><div class='add'>+	 * a default value of which port to forward.  It is assumed the host</div><div class='add'>+	 * port is the last port in most of the switches, but that is not the</div><div class='add'>+	 * case for KSZ9477 or maybe KSZ9897.  For LAN937X family the default</div><div class='add'>+	 * port is port 5, the first RGMII port.  It is okay for LAN9370, a</div><div class='add'>+	 * 5-port switch, but may not be correct for the other 8-port</div><div class='add'>+	 * versions.  It is necessary to update the whole table to forward to</div><div class='add'>+	 * the right ports.</div><div class='add'>+	 * Furthermore PTP messages can use a reserved multicast address and</div><div class='add'>+	 * the host will not receive them if this table is not correct.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; RESV_MCAST_CNT; i++) {</div><div class='add'>+		data = reserved_mcast_map[i] &lt;&lt;</div><div class='add'>+			dev-&gt;info-&gt;shifts[ALU_STAT_INDEX];</div><div class='add'>+		data |= ALU_STAT_START |</div><div class='add'>+			masks[ALU_STAT_DIRECT] |</div><div class='add'>+			masks[ALU_RESV_MCAST_ADDR] |</div><div class='add'>+			masks[ALU_STAT_READ];</div><div class='add'>+		ret = ksz_write32(dev, REG_SW_ALU_STAT_CTRL__4, data);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* wait to be finished */</div><div class='add'>+		ret = ksz9477_wait_alu_sta_ready(dev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = ksz_read32(dev, REG_SW_ALU_VAL_B, &amp;data);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		override = false;</div><div class='add'>+		ports = data &amp; dev-&gt;port_mask;</div><div class='add'>+		switch (i) {</div><div class='add'>+		case 0:</div><div class='add'>+		case 6:</div><div class='add'>+			/* Change the host port. */</div><div class='add'>+			update = BIT(dev-&gt;cpu_port);</div><div class='add'>+			override = true;</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			/* Change the host port. */</div><div class='add'>+			update = BIT(dev-&gt;cpu_port);</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+		case 5:</div><div class='add'>+		case 7:</div><div class='add'>+			/* Skip the host port. */</div><div class='add'>+			update = dev-&gt;port_mask &amp; ~BIT(dev-&gt;cpu_port);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			update = ports;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (update != ports || override) {</div><div class='add'>+			data &amp;= ~dev-&gt;port_mask;</div><div class='add'>+			data |= update;</div><div class='add'>+			/* Set Override bit to receive frame even when port is</div><div class='add'>+			 * closed.</div><div class='add'>+			 */</div><div class='add'>+			if (override)</div><div class='add'>+				data |= ALU_V_OVERRIDE;</div><div class='add'>+			ret = ksz_write32(dev, REG_SW_ALU_VAL_B, data);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			data = reserved_mcast_map[i] &lt;&lt;</div><div class='add'>+			       dev-&gt;info-&gt;shifts[ALU_STAT_INDEX];</div><div class='add'>+			data |= ALU_STAT_START |</div><div class='add'>+				masks[ALU_STAT_DIRECT] |</div><div class='add'>+				masks[ALU_RESV_MCAST_ADDR] |</div><div class='add'>+				masks[ALU_STAT_WRITE];</div><div class='add'>+			ret = ksz_write32(dev, REG_SW_ALU_STAT_CTRL__4, data);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			/* wait to be finished */</div><div class='add'>+			ret = ksz9477_wait_alu_sta_ready(dev);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_setup(struct dsa_switch *ds)</div><div class='add'>+int ksz9477_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;vlan_cache = devm_kcalloc(dev-&gt;dev, sizeof(struct vlan_table),</div><div class='del'>-				       dev-&gt;num_vlans, GFP_KERNEL);</div><div class='del'>-	if (!dev-&gt;vlan_cache)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ret = ksz9477_reset_switch(dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(ds-&gt;dev, "failed to reset switch\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Required for port partitioning. */</div><div class='ctx'> 	ksz9477_cfg32(dev, REG_SW_QM_CTRL__4, UNICAST_VLAN_BOUNDARY,</div><div class='hunk'>@@ -1350,12 +1473,18 @@ static int ksz9477_setup(struct dsa_switch *ds)</div><div class='ctx'> 	/* Do not work correctly with tail tagging. */</div><div class='ctx'> 	ksz_cfg(dev, REG_SW_MAC_CTRL_0, SW_CHECK_LENGTH, false);</div><div class='ctx'> </div><div class='del'>-	/* accept packet up to 2000bytes */</div><div class='del'>-	ksz_cfg(dev, REG_SW_MAC_CTRL_1, SW_LEGAL_PACKET_DISABLE, true);</div><div class='add'>+	/* Enable REG_SW_MTU__2 reg by setting SW_JUMBO_PACKET */</div><div class='add'>+	ksz_cfg(dev, REG_SW_MAC_CTRL_1, SW_JUMBO_PACKET, true);</div><div class='ctx'> </div><div class='del'>-	ksz9477_config_cpu_port(ds);</div><div class='add'>+	/* Use collision based back pressure mode. */</div><div class='add'>+	ksz_cfg(dev, REG_SW_MAC_CTRL_1, SW_BACK_PRESSURE,</div><div class='add'>+		SW_BACK_PRESSURE_COLLISION);</div><div class='ctx'> </div><div class='del'>-	ksz_cfg(dev, REG_SW_MAC_CTRL_1, MULTICAST_STORM_DISABLE, true);</div><div class='add'>+	/* Now we can configure default MTU value */</div><div class='add'>+	ret = regmap_update_bits(ksz_regmap_16(dev), REG_SW_MTU__2, REG_SW_MTU_MASK,</div><div class='add'>+				 VLAN_ETH_FRAME_LEN + ETH_FCS_LEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* queue based egress rate limit */</div><div class='ctx'> 	ksz_cfg(dev, REG_SW_MAC_CTRL_5, SW_OUT_RATE_LIMIT_QUEUE_BASED, true);</div><div class='hunk'>@@ -1363,225 +1492,127 @@ static int ksz9477_setup(struct dsa_switch *ds)</div><div class='ctx'> 	/* enable global MIB counter freeze function */</div><div class='ctx'> 	ksz_cfg(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FREEZE, true);</div><div class='ctx'> </div><div class='del'>-	/* start switch */</div><div class='del'>-	ksz_cfg(dev, REG_SW_OPERATION, SW_START, true);</div><div class='del'>-</div><div class='del'>-	ksz_init_mib_timer(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	/* Make sure PME (WoL) is not enabled. If requested, it will</div><div class='add'>+	 * be enabled by ksz_wol_pre_shutdown(). Otherwise, some PMICs</div><div class='add'>+	 * do not like PME events changes before shutdown.</div><div class='add'>+	 */</div><div class='add'>+	return ksz_write8(dev, regs[REG_SW_PME_CTRL], 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct dsa_switch_ops ksz9477_switch_ops = {</div><div class='del'>-	.get_tag_protocol	= ksz9477_get_tag_protocol,</div><div class='del'>-	.setup			= ksz9477_setup,</div><div class='del'>-	.phy_read		= ksz9477_phy_read16,</div><div class='del'>-	.phy_write		= ksz9477_phy_write16,</div><div class='del'>-	.adjust_link		= ksz_adjust_link,</div><div class='del'>-	.port_enable		= ksz_enable_port,</div><div class='del'>-	.port_disable		= ksz_disable_port,</div><div class='del'>-	.get_strings		= ksz9477_get_strings,</div><div class='del'>-	.get_ethtool_stats	= ksz_get_ethtool_stats,</div><div class='del'>-	.get_sset_count		= ksz_sset_count,</div><div class='del'>-	.port_bridge_join	= ksz_port_bridge_join,</div><div class='del'>-	.port_bridge_leave	= ksz_port_bridge_leave,</div><div class='del'>-	.port_stp_state_set	= ksz9477_port_stp_state_set,</div><div class='del'>-	.port_fast_age		= ksz_port_fast_age,</div><div class='del'>-	.port_vlan_filtering	= ksz9477_port_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= ksz_port_vlan_prepare,</div><div class='del'>-	.port_vlan_add		= ksz9477_port_vlan_add,</div><div class='del'>-	.port_vlan_del		= ksz9477_port_vlan_del,</div><div class='del'>-	.port_fdb_dump		= ksz9477_port_fdb_dump,</div><div class='del'>-	.port_fdb_add		= ksz9477_port_fdb_add,</div><div class='del'>-	.port_fdb_del		= ksz9477_port_fdb_del,</div><div class='del'>-	.port_mdb_prepare       = ksz_port_mdb_prepare,</div><div class='del'>-	.port_mdb_add           = ksz9477_port_mdb_add,</div><div class='del'>-	.port_mdb_del           = ksz9477_port_mdb_del,</div><div class='del'>-	.port_mirror_add	= ksz9477_port_mirror_add,</div><div class='del'>-	.port_mirror_del	= ksz9477_port_mirror_del,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static u32 ksz9477_get_port_addr(int port, int offset)</div><div class='add'>+u32 ksz9477_get_port_addr(int port, int offset)</div><div class='ctx'> {</div><div class='ctx'> 	return PORT_CTRL_ADDR(port, offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ksz9477_switch_detect(struct ksz_device *dev)</div><div class='add'>+int ksz9477_tc_cbs_set_cinc(struct ksz_device *dev, int port, u32 val)</div><div class='ctx'> {</div><div class='del'>-	u8 data8;</div><div class='del'>-	u8 id_hi;</div><div class='del'>-	u8 id_lo;</div><div class='del'>-	u32 id32;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* turn off SPI DO Edge select */</div><div class='del'>-	ret = ksz_read8(dev, REG_SW_GLOBAL_SERIAL_CTRL_0, &amp;data8);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	data8 &amp;= ~SPI_AUTO_EDGE_DETECTION;</div><div class='del'>-	ret = ksz_write8(dev, REG_SW_GLOBAL_SERIAL_CTRL_0, data8);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	val = val &gt;&gt; 8;</div><div class='ctx'> </div><div class='del'>-	/* read chip id */</div><div class='del'>-	ret = ksz_read32(dev, REG_CHIP_ID0__1, &amp;id32);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = ksz_read8(dev, REG_GLOBAL_OPTIONS, &amp;data8);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+	return ksz_pwrite16(dev, port, REG_PORT_MTI_CREDIT_INCREMENT, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Number of ports can be reduced depending on chip. */</div><div class='del'>-	dev-&gt;mib_port_cnt = TOTAL_PORT_NUM;</div><div class='del'>-	dev-&gt;phy_port_cnt = 5;</div><div class='add'>+/* The KSZ9477 provides following HW features to accelerate</div><div class='add'>+ * HSR frames handling:</div><div class='add'>+ *</div><div class='add'>+ * 1. TX PACKET DUPLICATION FROM HOST TO SWITCH</div><div class='add'>+ * 2. RX PACKET DUPLICATION DISCARDING</div><div class='add'>+ * 3. PREVENTING PACKET LOOP IN THE RING BY SELF-ADDRESS FILTERING</div><div class='add'>+ *</div><div class='add'>+ * Only one from point 1. has the NETIF_F* flag available.</div><div class='add'>+ *</div><div class='add'>+ * Ones from point 2 and 3 are "best effort" - i.e. those will</div><div class='add'>+ * work correctly most of the time, but it may happen that some</div><div class='add'>+ * frames will not be caught - to be more specific; there is a race</div><div class='add'>+ * condition in hardware such that, when duplicate packets are received</div><div class='add'>+ * on member ports very close in time to each other, the hardware fails</div><div class='add'>+ * to detect that they are duplicates.</div><div class='add'>+ *</div><div class='add'>+ * Hence, the SW needs to handle those special cases. However, the speed</div><div class='add'>+ * up gain is considerable when above features are used.</div><div class='add'>+ *</div><div class='add'>+ * Moreover, the NETIF_F_HW_HSR_FWD feature is also enabled, as HSR frames</div><div class='add'>+ * can be forwarded in the switch fabric between HSR ports.</div><div class='add'>+ */</div><div class='add'>+#define KSZ9477_SUPPORTED_HSR_FEATURES (NETIF_F_HW_HSR_DUP | NETIF_F_HW_HSR_FWD)</div><div class='ctx'> </div><div class='del'>-	/* Default capability is gigabit capable. */</div><div class='del'>-	dev-&gt;features = GBIT_SUPPORT;</div><div class='add'>+void ksz9477_hsr_join(struct dsa_switch *ds, int port, struct net_device *hsr)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct net_device *user;</div><div class='add'>+	struct dsa_port *hsr_dp;</div><div class='add'>+	u8 data, hsr_ports = 0;</div><div class='ctx'> </div><div class='del'>-	id_hi = (u8)(id32 &gt;&gt; 16);</div><div class='del'>-	id_lo = (u8)(id32 &gt;&gt; 8);</div><div class='del'>-	if ((id_lo &amp; 0xf) == 3) {</div><div class='del'>-		/* Chip is from KSZ9893 design. */</div><div class='del'>-		dev-&gt;features |= IS_9893;</div><div class='add'>+	/* Program which port(s) shall support HSR */</div><div class='add'>+	ksz_rmw32(dev, REG_HSR_PORT_MAP__4, BIT(port), BIT(port));</div><div class='ctx'> </div><div class='del'>-		/* Chip does not support gigabit. */</div><div class='del'>-		if (data8 &amp; SW_QW_ABLE)</div><div class='del'>-			dev-&gt;features &amp;= ~GBIT_SUPPORT;</div><div class='del'>-		dev-&gt;mib_port_cnt = 3;</div><div class='del'>-		dev-&gt;phy_port_cnt = 2;</div><div class='del'>-	} else {</div><div class='del'>-		/* Chip uses new XMII register definitions. */</div><div class='del'>-		dev-&gt;features |= NEW_XMII;</div><div class='add'>+	/* Forward frames between HSR ports (i.e. bridge together HSR ports) */</div><div class='add'>+	if (dev-&gt;hsr_ports) {</div><div class='add'>+		dsa_hsr_foreach_port(hsr_dp, ds, hsr)</div><div class='add'>+			hsr_ports |= BIT(hsr_dp-&gt;index);</div><div class='ctx'> </div><div class='del'>-		/* Chip does not support gigabit. */</div><div class='del'>-		if (!(data8 &amp; SW_GIGABIT_ABLE))</div><div class='del'>-			dev-&gt;features &amp;= ~GBIT_SUPPORT;</div><div class='add'>+		hsr_ports |= BIT(dsa_upstream_port(ds, port));</div><div class='add'>+		dsa_hsr_foreach_port(hsr_dp, ds, hsr)</div><div class='add'>+			ksz9477_cfg_port_member(dev, hsr_dp-&gt;index, hsr_ports);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Change chip id to known ones so it can be matched against them. */</div><div class='del'>-	id32 = (id_hi &lt;&lt; 16) | (id_lo &lt;&lt; 8);</div><div class='add'>+	if (!dev-&gt;hsr_ports) {</div><div class='add'>+		/* Enable discarding of received HSR frames */</div><div class='add'>+		ksz_read8(dev, REG_HSR_ALU_CTRL_0__1, &amp;data);</div><div class='add'>+		data |= HSR_DUPLICATE_DISCARD;</div><div class='add'>+		data &amp;= ~HSR_NODE_UNICAST;</div><div class='add'>+		ksz_write8(dev, REG_HSR_ALU_CTRL_0__1, data);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;chip_id = id32;</div><div class='add'>+	/* Enable per port self-address filtering.</div><div class='add'>+	 * The global self-address filtering has already been enabled in the</div><div class='add'>+	 * ksz9477_reset_switch() function.</div><div class='add'>+	 */</div><div class='add'>+	ksz_port_cfg(dev, port, REG_PORT_LUE_CTRL, PORT_SRC_ADDR_FILTER, true);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Setup HW supported features for lan HSR ports */</div><div class='add'>+	user = dsa_to_port(ds, port)-&gt;user;</div><div class='add'>+	user-&gt;features |= KSZ9477_SUPPORTED_HSR_FEATURES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ksz_chip_data {</div><div class='del'>-	u32 chip_id;</div><div class='del'>-	const char *dev_name;</div><div class='del'>-	int num_vlans;</div><div class='del'>-	int num_alus;</div><div class='del'>-	int num_statics;</div><div class='del'>-	int cpu_ports;</div><div class='del'>-	int port_cnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct ksz_chip_data ksz9477_switch_chips[] = {</div><div class='del'>-	{</div><div class='del'>-		.chip_id = 0x00947700,</div><div class='del'>-		.dev_name = "KSZ9477",</div><div class='del'>-		.num_vlans = 4096,</div><div class='del'>-		.num_alus = 4096,</div><div class='del'>-		.num_statics = 16,</div><div class='del'>-		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='del'>-		.port_cnt = 7,		/* total physical port count */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.chip_id = 0x00989700,</div><div class='del'>-		.dev_name = "KSZ9897",</div><div class='del'>-		.num_vlans = 4096,</div><div class='del'>-		.num_alus = 4096,</div><div class='del'>-		.num_statics = 16,</div><div class='del'>-		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='del'>-		.port_cnt = 7,		/* total physical port count */</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.chip_id = 0x00989300,</div><div class='del'>-		.dev_name = "KSZ9893",</div><div class='del'>-		.num_vlans = 4096,</div><div class='del'>-		.num_alus = 4096,</div><div class='del'>-		.num_statics = 16,</div><div class='del'>-		.cpu_ports = 0x07,	/* can be configured as cpu port */</div><div class='del'>-		.port_cnt = 3,		/* total port count */</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ksz9477_switch_init(struct ksz_device *dev)</div><div class='add'>+void ksz9477_hsr_leave(struct dsa_switch *ds, int port, struct net_device *hsr)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;ds-&gt;ops = &amp;ksz9477_switch_ops;</div><div class='add'>+	/* Clear port HSR support */</div><div class='add'>+	ksz_rmw32(dev, REG_HSR_PORT_MAP__4, BIT(port), 0);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ksz9477_switch_chips); i++) {</div><div class='del'>-		const struct ksz_chip_data *chip = &amp;ksz9477_switch_chips[i];</div><div class='add'>+	/* Disable forwarding frames between HSR ports */</div><div class='add'>+	ksz9477_cfg_port_member(dev, port, BIT(dsa_upstream_port(ds, port)));</div><div class='ctx'> </div><div class='del'>-		if (dev-&gt;chip_id == chip-&gt;chip_id) {</div><div class='del'>-			dev-&gt;name = chip-&gt;dev_name;</div><div class='del'>-			dev-&gt;num_vlans = chip-&gt;num_vlans;</div><div class='del'>-			dev-&gt;num_alus = chip-&gt;num_alus;</div><div class='del'>-			dev-&gt;num_statics = chip-&gt;num_statics;</div><div class='del'>-			dev-&gt;port_cnt = chip-&gt;port_cnt;</div><div class='del'>-			dev-&gt;cpu_ports = chip-&gt;cpu_ports;</div><div class='add'>+	/* Disable per port self-address filtering */</div><div class='add'>+	ksz_port_cfg(dev, port, REG_PORT_LUE_CTRL, PORT_SRC_ADDR_FILTER, false);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+int ksz9477_switch_init(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 data8;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* no switch found */</div><div class='del'>-	if (!dev-&gt;port_cnt)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	dev-&gt;port_mask = (1 &lt;&lt; dev-&gt;port_cnt) - 1;</div><div class='del'>-</div><div class='del'>-	dev-&gt;reg_mib_cnt = SWITCH_COUNTER_NUM;</div><div class='del'>-	dev-&gt;mib_cnt = TOTAL_SWITCH_COUNTER_NUM;</div><div class='del'>-</div><div class='del'>-	i = dev-&gt;mib_port_cnt;</div><div class='del'>-	dev-&gt;ports = devm_kzalloc(dev-&gt;dev, sizeof(struct ksz_port) * i,</div><div class='del'>-				  GFP_KERNEL);</div><div class='del'>-	if (!dev-&gt;ports)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	for (i = 0; i &lt; dev-&gt;mib_port_cnt; i++) {</div><div class='del'>-		mutex_init(&amp;dev-&gt;ports[i].mib.cnt_mutex);</div><div class='del'>-		dev-&gt;ports[i].mib.counters =</div><div class='del'>-			devm_kzalloc(dev-&gt;dev,</div><div class='del'>-				     sizeof(u64) *</div><div class='del'>-				     (TOTAL_SWITCH_COUNTER_NUM + 1),</div><div class='del'>-				     GFP_KERNEL);</div><div class='del'>-		if (!dev-&gt;ports[i].mib.counters)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='add'>+	dev-&gt;port_mask = (1 &lt;&lt; dev-&gt;info-&gt;port_cnt) - 1;</div><div class='add'>+</div><div class='add'>+	/* turn off SPI DO Edge select */</div><div class='add'>+	ret = ksz_read8(dev, REG_SW_GLOBAL_SERIAL_CTRL_0, &amp;data8);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data8 &amp;= ~SPI_AUTO_EDGE_DETECTION;</div><div class='add'>+	ret = ksz_write8(dev, REG_SW_GLOBAL_SERIAL_CTRL_0, data8);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz9477_switch_exit(struct ksz_device *dev)</div><div class='add'>+void ksz9477_switch_exit(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	ksz9477_reset_switch(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct ksz_dev_ops ksz9477_dev_ops = {</div><div class='del'>-	.get_port_addr = ksz9477_get_port_addr,</div><div class='del'>-	.cfg_port_member = ksz9477_cfg_port_member,</div><div class='del'>-	.flush_dyn_mac_table = ksz9477_flush_dyn_mac_table,</div><div class='del'>-	.phy_setup = ksz9477_phy_setup,</div><div class='del'>-	.port_setup = ksz9477_port_setup,</div><div class='del'>-	.r_mib_cnt = ksz9477_r_mib_cnt,</div><div class='del'>-	.r_mib_pkt = ksz9477_r_mib_pkt,</div><div class='del'>-	.freeze_mib = ksz9477_freeze_mib,</div><div class='del'>-	.port_init_cnt = ksz9477_port_init_cnt,</div><div class='del'>-	.shutdown = ksz9477_reset_switch,</div><div class='del'>-	.detect = ksz9477_switch_detect,</div><div class='del'>-	.init = ksz9477_switch_init,</div><div class='del'>-	.exit = ksz9477_switch_exit,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int ksz9477_switch_register(struct ksz_device *dev)</div><div class='del'>-{</div><div class='del'>-	return ksz_switch_register(dev, &amp;ksz9477_dev_ops);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(ksz9477_switch_register);</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Woojung Huh &lt;Woojung.Huh@microchip.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Microchip KSZ9477 Series Switch DSA Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477.h b/drivers/net/dsa/microchip/ksz9477.h<br/>new file mode 100644<br/>index 000000000000..0d1a6dfda23e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz9477.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Microchip KSZ9477 series Header file</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017-2025 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __KSZ9477_H</div><div class='add'>+#define __KSZ9477_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+int ksz9477_setup(struct dsa_switch *ds);</div><div class='add'>+u32 ksz9477_get_port_addr(int port, int offset);</div><div class='add'>+void ksz9477_cfg_port_member(struct ksz_device *dev, int port, u8 member);</div><div class='add'>+void ksz9477_flush_dyn_mac_table(struct ksz_device *dev, int port);</div><div class='add'>+void ksz9477_port_setup(struct ksz_device *dev, int port, bool cpu_port);</div><div class='add'>+int ksz9477_set_ageing_time(struct ksz_device *dev, unsigned int msecs);</div><div class='add'>+int ksz9477_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data);</div><div class='add'>+int ksz9477_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);</div><div class='add'>+void ksz9477_r_mib_cnt(struct ksz_device *dev, int port, u16 addr, u64 *cnt);</div><div class='add'>+void ksz9477_r_mib_pkt(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+		       u64 *dropped, u64 *cnt);</div><div class='add'>+void ksz9477_freeze_mib(struct ksz_device *dev, int port, bool freeze);</div><div class='add'>+void ksz9477_port_init_cnt(struct ksz_device *dev, int port);</div><div class='add'>+int ksz9477_port_vlan_filtering(struct ksz_device *dev, int port,</div><div class='add'>+				bool flag, struct netlink_ext_ack *extack);</div><div class='add'>+int ksz9477_port_vlan_add(struct ksz_device *dev, int port,</div><div class='add'>+			  const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			  struct netlink_ext_ack *extack);</div><div class='add'>+int ksz9477_port_vlan_del(struct ksz_device *dev, int port,</div><div class='add'>+			  const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+int ksz9477_port_mirror_add(struct ksz_device *dev, int port,</div><div class='add'>+			    struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			    bool ingress, struct netlink_ext_ack *extack);</div><div class='add'>+void ksz9477_port_mirror_del(struct ksz_device *dev, int port,</div><div class='add'>+			     struct dsa_mall_mirror_tc_entry *mirror);</div><div class='add'>+int ksz9477_errata_monitor(struct ksz_device *dev, int port,</div><div class='add'>+			   u64 tx_late_col);</div><div class='add'>+void ksz9477_get_caps(struct ksz_device *dev, int port,</div><div class='add'>+		      struct phylink_config *config);</div><div class='add'>+int ksz9477_fdb_dump(struct ksz_device *dev, int port,</div><div class='add'>+		     dsa_fdb_dump_cb_t *cb, void *data);</div><div class='add'>+int ksz9477_fdb_add(struct ksz_device *dev, int port,</div><div class='add'>+		    const unsigned char *addr, u16 vid, struct dsa_db db);</div><div class='add'>+int ksz9477_fdb_del(struct ksz_device *dev, int port,</div><div class='add'>+		    const unsigned char *addr, u16 vid, struct dsa_db db);</div><div class='add'>+int ksz9477_mdb_add(struct ksz_device *dev, int port,</div><div class='add'>+		    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);</div><div class='add'>+int ksz9477_mdb_del(struct ksz_device *dev, int port,</div><div class='add'>+		    const struct switchdev_obj_port_mdb *mdb, struct dsa_db db);</div><div class='add'>+int ksz9477_change_mtu(struct ksz_device *dev, int port, int mtu);</div><div class='add'>+void ksz9477_config_cpu_port(struct dsa_switch *ds);</div><div class='add'>+int ksz9477_tc_cbs_set_cinc(struct ksz_device *dev, int port, u32 val);</div><div class='add'>+int ksz9477_enable_stp_addr(struct ksz_device *dev);</div><div class='add'>+int ksz9477_reset_switch(struct ksz_device *dev);</div><div class='add'>+int ksz9477_switch_init(struct ksz_device *dev);</div><div class='add'>+void ksz9477_switch_exit(struct ksz_device *dev);</div><div class='add'>+void ksz9477_port_queue_split(struct ksz_device *dev, int port);</div><div class='add'>+void ksz9477_hsr_join(struct dsa_switch *ds, int port, struct net_device *hsr);</div><div class='add'>+void ksz9477_hsr_leave(struct dsa_switch *ds, int port, struct net_device *hsr);</div><div class='add'>+</div><div class='add'>+int ksz9477_port_acl_init(struct ksz_device *dev, int port);</div><div class='add'>+void ksz9477_port_acl_free(struct ksz_device *dev, int port);</div><div class='add'>+int ksz9477_cls_flower_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress);</div><div class='add'>+int ksz9477_cls_flower_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress);</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_ENTRY_SIZE		18</div><div class='add'>+#define KSZ9477_ACL_MAX_ENTRIES		16</div><div class='add'>+</div><div class='add'>+struct ksz9477_acl_entry {</div><div class='add'>+	u8 entry[KSZ9477_ACL_ENTRY_SIZE];</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	u32 prio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz9477_acl_entries {</div><div class='add'>+	struct ksz9477_acl_entry entries[KSZ9477_ACL_MAX_ENTRIES];</div><div class='add'>+	int entries_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz9477_acl_priv {</div><div class='add'>+	struct ksz9477_acl_entries acles;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ksz9477_acl_remove_entries(struct ksz_device *dev, int port,</div><div class='add'>+				struct ksz9477_acl_entries *acles,</div><div class='add'>+				unsigned long cookie);</div><div class='add'>+int ksz9477_acl_write_list(struct ksz_device *dev, int port);</div><div class='add'>+int ksz9477_sort_acl_entries(struct ksz_device *dev, int port);</div><div class='add'>+void ksz9477_acl_action_rule_cfg(u8 *entry, bool force_prio, u8 prio_val);</div><div class='add'>+void ksz9477_acl_processing_rule_set_action(u8 *entry, u8 action_idx);</div><div class='add'>+void ksz9477_acl_match_process_l2(struct ksz_device *dev, int port,</div><div class='add'>+				  u16 ethtype, u8 *src_mac, u8 *dst_mac,</div><div class='add'>+				  unsigned long cookie, u32 prio);</div><div class='add'>+</div><div class='add'>+int ksz9477_pcs_create(struct ksz_device *dev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477_acl.c b/drivers/net/dsa/microchip/ksz9477_acl.c<br/>new file mode 100644<br/>index 000000000000..7ba778df63ac<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477_acl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz9477_acl.c</a></div><div class='hunk'>@@ -0,0 +1,1436 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2023 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+/* Access Control List (ACL) structure:</div><div class='add'>+ *</div><div class='add'>+ * There are multiple groups of registers involved in ACL configuration:</div><div class='add'>+ *</div><div class='add'>+ * - Matching Rules: These registers define the criteria for matching incoming</div><div class='add'>+ *   packets based on their header information (Layer 2 MAC, Layer 3 IP, or</div><div class='add'>+ *   Layer 4 TCP/UDP). Different register settings are used depending on the</div><div class='add'>+ *   matching rule mode (MD) and the Enable (ENB) settings.</div><div class='add'>+ *</div><div class='add'>+ * - Action Rules: These registers define how the ACL should modify the packet's</div><div class='add'>+ *   priority, VLAN tag priority, and forwarding map once a matching rule has</div><div class='add'>+ *   been triggered. The settings vary depending on whether the matching rule is</div><div class='add'>+ *   in Count Mode (MD = 01 and ENB = 00) or not.</div><div class='add'>+ *</div><div class='add'>+ * - Processing Rules: These registers control the overall behavior of the ACL,</div><div class='add'>+ *   such as selecting which matching rule to apply first, enabling/disabling</div><div class='add'>+ *   specific rules, or specifying actions for matched packets.</div><div class='add'>+ *</div><div class='add'>+ * ACL Structure:</div><div class='add'>+ *                             +----------------------+</div><div class='add'>+ * +----------------------+    |    (optional)        |</div><div class='add'>+ * |    Matching Rules    |    |    Matching Rules    |</div><div class='add'>+ * |    (Layer 2, 3, 4)   |    |    (Layer 2, 3, 4)   |</div><div class='add'>+ * +----------------------+    +----------------------+</div><div class='add'>+ *             |                            |</div><div class='add'>+ *             \___________________________/</div><div class='add'>+ *                          v</div><div class='add'>+ *               +----------------------+</div><div class='add'>+ *               |   Processing Rules   |</div><div class='add'>+ *               | (action idx,         |</div><div class='add'>+ *               | matching rule set)   |</div><div class='add'>+ *               +----------------------+</div><div class='add'>+ *                          |</div><div class='add'>+ *                          v</div><div class='add'>+ *               +----------------------+</div><div class='add'>+ *               |    Action Rules      |</div><div class='add'>+ *               | (Modify Priority,    |</div><div class='add'>+ *               |  Forwarding Map,     |</div><div class='add'>+ *               |  VLAN tag, etc)      |</div><div class='add'>+ *               +----------------------+</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz9477.h"</div><div class='add'>+#include "ksz9477_reg.h"</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+#define KSZ9477_PORT_ACL_0		0x600</div><div class='add'>+</div><div class='add'>+enum ksz9477_acl_port_access {</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_0  = 0x00,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_1  = 0x01,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_2  = 0x02,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_3  = 0x03,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_4  = 0x04,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_5  = 0x05,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_6  = 0x06,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_7  = 0x07,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_8  = 0x08,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_9  = 0x09,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_A  = 0x0A,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_B  = 0x0B,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_C  = 0x0C,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_D  = 0x0D,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_E  = 0x0E,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_F  = 0x0F,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_10 = 0x10,</div><div class='add'>+	KSZ9477_ACL_PORT_ACCESS_11 = 0x11</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_MD_MASK			GENMASK(5, 4)</div><div class='add'>+#define KSZ9477_ACL_MD_DISABLE			0</div><div class='add'>+#define KSZ9477_ACL_MD_L2_MAC			1</div><div class='add'>+#define KSZ9477_ACL_MD_L3_IP			2</div><div class='add'>+#define KSZ9477_ACL_MD_L4_TCP_UDP		3</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_ENB_MASK			GENMASK(3, 2)</div><div class='add'>+#define KSZ9477_ACL_ENB_L2_COUNTER		0</div><div class='add'>+#define KSZ9477_ACL_ENB_L2_TYPE			1</div><div class='add'>+#define KSZ9477_ACL_ENB_L2_MAC			2</div><div class='add'>+#define KSZ9477_ACL_ENB_L2_MAC_TYPE		3</div><div class='add'>+</div><div class='add'>+/* only IPv4 src or dst can be used with mask */</div><div class='add'>+#define KSZ9477_ACL_ENB_L3_IPV4_ADDR_MASK	1</div><div class='add'>+/* only IPv4 src and dst can be used without mask */</div><div class='add'>+#define KSZ9477_ACL_ENB_L3_IPV4_ADDR_SRC_DST	2</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_ENB_L4_IP_PROTO	        0</div><div class='add'>+#define KSZ9477_ACL_ENB_L4_TCP_SRC_DST_PORT	1</div><div class='add'>+#define KSZ9477_ACL_ENB_L4_UDP_SRC_DST_PORT	2</div><div class='add'>+#define KSZ9477_ACL_ENB_L4_TCP_SEQ_NUMBER	3</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_SD_SRC			BIT(1)</div><div class='add'>+#define KSZ9477_ACL_SD_DST			0</div><div class='add'>+#define KSZ9477_ACL_EQ_EQUAL			BIT(0)</div><div class='add'>+#define KSZ9477_ACL_EQ_NOT_EQUAL		0</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_PM_M			GENMASK(7, 6)</div><div class='add'>+#define KSZ9477_ACL_PM_DISABLE			0</div><div class='add'>+#define KSZ9477_ACL_PM_HIGHER			1</div><div class='add'>+#define KSZ9477_ACL_PM_LOWER			2</div><div class='add'>+#define KSZ9477_ACL_PM_REPLACE			3</div><div class='add'>+#define KSZ9477_ACL_P_M				GENMASK(5, 3)</div><div class='add'>+</div><div class='add'>+#define KSZ9477_PORT_ACL_CTRL_0			0x0612</div><div class='add'>+</div><div class='add'>+#define KSZ9477_ACL_WRITE_DONE			BIT(6)</div><div class='add'>+#define KSZ9477_ACL_READ_DONE			BIT(5)</div><div class='add'>+#define KSZ9477_ACL_WRITE			BIT(4)</div><div class='add'>+#define KSZ9477_ACL_INDEX_M			GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_dump_acl_index - Print the ACL entry at the specified index</div><div class='add'>+ *</div><div class='add'>+ * @dev: Pointer to the ksz9477 device structure.</div><div class='add'>+ * @acle: Pointer to the ACL entry array.</div><div class='add'>+ * @index: The index of the ACL entry to print.</div><div class='add'>+ *</div><div class='add'>+ * This function prints the details of an ACL entry, located at a particular</div><div class='add'>+ * index within the ksz9477 device's ACL table. It omits printing entries that</div><div class='add'>+ * are empty.</div><div class='add'>+ *</div><div class='add'>+ * Return: 1 if the entry is non-empty and printed, 0 otherwise.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_dump_acl_index(struct ksz_device *dev,</div><div class='add'>+				  struct ksz9477_acl_entry *acle, int index)</div><div class='add'>+{</div><div class='add'>+	bool empty = true;</div><div class='add'>+	char buf[64];</div><div class='add'>+	u8 *entry;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	entry = &amp;acle[index].entry[0];</div><div class='add'>+	for (i = 0; i &lt;= KSZ9477_ACL_PORT_ACCESS_11; i++) {</div><div class='add'>+		if (entry[i])</div><div class='add'>+			empty = false;</div><div class='add'>+</div><div class='add'>+		sprintf(buf + (i * 3), "%02x ", entry[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* no need to print empty entries */</div><div class='add'>+	if (empty)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_err(dev-&gt;dev, " Entry %02d, prio: %02d : %s", index,</div><div class='add'>+		acle[index].prio, buf);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_dump_acl - Print ACL entries</div><div class='add'>+ *</div><div class='add'>+ * @dev: Pointer to the device structure.</div><div class='add'>+ * @acle: Pointer to the ACL entry array.</div><div class='add'>+ */</div><div class='add'>+static void ksz9477_dump_acl(struct ksz_device *dev,</div><div class='add'>+			     struct ksz9477_acl_entry *acle)</div><div class='add'>+{</div><div class='add'>+	int count = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; KSZ9477_ACL_MAX_ENTRIES; i++)</div><div class='add'>+		count += ksz9477_dump_acl_index(dev, acle, i);</div><div class='add'>+</div><div class='add'>+	if (count != KSZ9477_ACL_MAX_ENTRIES - 1)</div><div class='add'>+		dev_err(dev-&gt;dev, " Empty ACL entries were skipped\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_is_valid_matching_rule - Check if an ACL entry contains a valid</div><div class='add'>+ *					matching rule.</div><div class='add'>+ *</div><div class='add'>+ * @entry: Pointer to ACL entry buffer</div><div class='add'>+ *</div><div class='add'>+ * This function checks if the given ACL entry buffer contains a valid</div><div class='add'>+ * matching rule by inspecting the Mode (MD) and Enable (ENB) fields.</div><div class='add'>+ *</div><div class='add'>+ * Returns: True if it's a valid matching rule, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool ksz9477_acl_is_valid_matching_rule(u8 *entry)</div><div class='add'>+{</div><div class='add'>+	u8 val1, md, enb;</div><div class='add'>+</div><div class='add'>+	val1 = entry[KSZ9477_ACL_PORT_ACCESS_1];</div><div class='add'>+</div><div class='add'>+	md = FIELD_GET(KSZ9477_ACL_MD_MASK, val1);</div><div class='add'>+	if (md == KSZ9477_ACL_MD_DISABLE)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (md == KSZ9477_ACL_MD_L2_MAC) {</div><div class='add'>+		/* L2 counter is not support, so it is not valid rule for now */</div><div class='add'>+		enb = FIELD_GET(KSZ9477_ACL_ENB_MASK, val1);</div><div class='add'>+		if (enb == KSZ9477_ACL_ENB_L2_COUNTER)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_get_cont_entr - Get count of contiguous ACL entries and validate</div><div class='add'>+ *                             the matching rules.</div><div class='add'>+ * @dev: Pointer to the KSZ9477 device structure.</div><div class='add'>+ * @port: Port number.</div><div class='add'>+ * @index: Index of the starting ACL entry.</div><div class='add'>+ *</div><div class='add'>+ * Based on the KSZ9477 switch's Access Control List (ACL) system, the RuleSet</div><div class='add'>+ * in an ACL entry indicates which entries contain Matching rules linked to it.</div><div class='add'>+ * This RuleSet is represented by two registers: KSZ9477_ACL_PORT_ACCESS_E and</div><div class='add'>+ * KSZ9477_ACL_PORT_ACCESS_F. Each bit set in these registers corresponds to</div><div class='add'>+ * an entry containing a Matching rule for this RuleSet.</div><div class='add'>+ *</div><div class='add'>+ * For a single Matching rule linked, only one bit is set. However, when an</div><div class='add'>+ * entry links multiple Matching rules, forming what's termed a 'complex rule',</div><div class='add'>+ * multiple bits are set in these registers.</div><div class='add'>+ *</div><div class='add'>+ * This function checks that, for complex rules, the entries containing the</div><div class='add'>+ * linked Matching rules are contiguous in terms of their indices. It calculates</div><div class='add'>+ * and returns the number of these contiguous entries.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *    - 0 if the entry is empty and can be safely overwritten</div><div class='add'>+ *    - 1 if the entry represents a simple rule</div><div class='add'>+ *    - The number of contiguous entries if it is the root entry of a complex</div><div class='add'>+ *      rule</div><div class='add'>+ *    - -ENOTEMPTY if the entry is part of a complex rule but not the root</div><div class='add'>+ *      entry</div><div class='add'>+ *    - -EINVAL if the validation fails</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_get_cont_entr(struct ksz_device *dev, int port,</div><div class='add'>+				     int index)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	int start_idx, end_idx, contiguous_count;</div><div class='add'>+	unsigned long val;</div><div class='add'>+	u8 vale, valf;</div><div class='add'>+	u8 *entry;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	entry = &amp;acles-&gt;entries[index].entry[0];</div><div class='add'>+	vale = entry[KSZ9477_ACL_PORT_ACCESS_E];</div><div class='add'>+	valf = entry[KSZ9477_ACL_PORT_ACCESS_F];</div><div class='add'>+</div><div class='add'>+	val = (vale &lt;&lt; 8) | valf;</div><div class='add'>+</div><div class='add'>+	/* If no bits are set, return an appropriate value or error */</div><div class='add'>+	if (!val) {</div><div class='add'>+		if (ksz9477_acl_is_valid_matching_rule(entry)) {</div><div class='add'>+			/* Looks like we are about to corrupt some complex rule.</div><div class='add'>+			 * Do not print an error here, as this is a normal case</div><div class='add'>+			 * when we are trying to find a free or starting entry.</div><div class='add'>+			 */</div><div class='add'>+			dev_dbg(dev-&gt;dev, "ACL: entry %d starting with a valid matching rule, but no bits set in RuleSet\n",</div><div class='add'>+				index);</div><div class='add'>+			return -ENOTEMPTY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* This entry does not contain a valid matching rule */</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	start_idx = find_first_bit((unsigned long *)&amp;val, 16);</div><div class='add'>+	end_idx = find_last_bit((unsigned long *)&amp;val, 16);</div><div class='add'>+</div><div class='add'>+	/* Calculate the contiguous count */</div><div class='add'>+	contiguous_count = end_idx - start_idx + 1;</div><div class='add'>+</div><div class='add'>+	/* Check if the number of bits set in val matches our calculated count */</div><div class='add'>+	if (contiguous_count != hweight16(val)) {</div><div class='add'>+		/* Probably we have a fragmented complex rule, which is not</div><div class='add'>+		 * supported by this driver.</div><div class='add'>+		 */</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: number of bits set in RuleSet does not match calculated count\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* loop over the contiguous entries and check for valid matching rules */</div><div class='add'>+	for (i = start_idx; i &lt;= end_idx; i++) {</div><div class='add'>+		u8 *current_entry = &amp;acles-&gt;entries[i].entry[0];</div><div class='add'>+</div><div class='add'>+		if (!ksz9477_acl_is_valid_matching_rule(current_entry)) {</div><div class='add'>+			/* we have something linked without a valid matching</div><div class='add'>+			 * rule. ACL table?</div><div class='add'>+			 */</div><div class='add'>+			dev_err(dev-&gt;dev, "ACL: entry %d does not contain a valid matching rule\n",</div><div class='add'>+				i);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i &gt; start_idx) {</div><div class='add'>+			vale = current_entry[KSZ9477_ACL_PORT_ACCESS_E];</div><div class='add'>+			valf = current_entry[KSZ9477_ACL_PORT_ACCESS_F];</div><div class='add'>+			/* Following entry should have empty linkage list */</div><div class='add'>+			if (vale || valf) {</div><div class='add'>+				dev_err(dev-&gt;dev, "ACL: entry %d has non-empty RuleSet linkage\n",</div><div class='add'>+					i);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return contiguous_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_update_linkage - Update the RuleSet linkage for an ACL entry</div><div class='add'>+ *                              after a move operation.</div><div class='add'>+ *</div><div class='add'>+ * @dev: Pointer to the ksz_device.</div><div class='add'>+ * @entry:   Pointer to the ACL entry array.</div><div class='add'>+ * @old_idx: The original index of the ACL entry before moving.</div><div class='add'>+ * @new_idx: The new index of the ACL entry after moving.</div><div class='add'>+ *</div><div class='add'>+ * This function updates the RuleSet linkage bits for an ACL entry when</div><div class='add'>+ * it's moved from one position to another in the ACL table. The RuleSet</div><div class='add'>+ * linkage is represented by two 8-bit registers, which are combined</div><div class='add'>+ * into a 16-bit value for easier manipulation. The linkage bits are shifted</div><div class='add'>+ * based on the difference between the old and new index. If any bits are lost</div><div class='add'>+ * during the shift operation, an error is returned.</div><div class='add'>+ *</div><div class='add'>+ * Note: Fragmentation within a RuleSet is not supported. Hence, entries must</div><div class='add'>+ * be moved as complete blocks, maintaining the integrity of the RuleSet.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, or -EINVAL if any RuleSet linkage bits are lost</div><div class='add'>+ * during the move.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_update_linkage(struct ksz_device *dev, u8 *entry,</div><div class='add'>+				      u16 old_idx, u16 new_idx)</div><div class='add'>+{</div><div class='add'>+	unsigned int original_bit_count;</div><div class='add'>+	unsigned long rule_linkage;</div><div class='add'>+	u8 vale, valf, val0;</div><div class='add'>+	int shift;</div><div class='add'>+</div><div class='add'>+	val0 = entry[KSZ9477_ACL_PORT_ACCESS_0];</div><div class='add'>+	vale = entry[KSZ9477_ACL_PORT_ACCESS_E];</div><div class='add'>+	valf = entry[KSZ9477_ACL_PORT_ACCESS_F];</div><div class='add'>+</div><div class='add'>+	/* Combine the two u8 values into one u16 for easier manipulation */</div><div class='add'>+	rule_linkage = (vale &lt;&lt; 8) | valf;</div><div class='add'>+	original_bit_count = hweight16(rule_linkage);</div><div class='add'>+</div><div class='add'>+	/* Even if HW is able to handle fragmented RuleSet, we don't support it.</div><div class='add'>+	 * RuleSet is filled only for the first entry of the set.</div><div class='add'>+	 */</div><div class='add'>+	if (!rule_linkage)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (val0 != old_idx) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: entry %d has unexpected ActionRule linkage: %d\n",</div><div class='add'>+			old_idx, val0);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val0 = new_idx;</div><div class='add'>+</div><div class='add'>+	/* Calculate the number of positions to shift */</div><div class='add'>+	shift = new_idx - old_idx;</div><div class='add'>+</div><div class='add'>+	/* Shift the RuleSet */</div><div class='add'>+	if (shift &gt; 0)</div><div class='add'>+		rule_linkage &lt;&lt;= shift;</div><div class='add'>+	else</div><div class='add'>+		rule_linkage &gt;&gt;= -shift;</div><div class='add'>+</div><div class='add'>+	/* Check that no bits were lost in the process */</div><div class='add'>+	if (original_bit_count != hweight16(rule_linkage)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL RuleSet linkage bits lost during move\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry[KSZ9477_ACL_PORT_ACCESS_0] = val0;</div><div class='add'>+</div><div class='add'>+	/* Update the RuleSet bitfields in the entry */</div><div class='add'>+	entry[KSZ9477_ACL_PORT_ACCESS_E] = (rule_linkage &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	entry[KSZ9477_ACL_PORT_ACCESS_F] = rule_linkage &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_validate_and_get_src_count - Validate source and destination indices</div><div class='add'>+ *					and determine the source entry count.</div><div class='add'>+ * @dev: Pointer to the KSZ device structure.</div><div class='add'>+ * @port: Port number on the KSZ device where the ACL entries reside.</div><div class='add'>+ * @src_idx: Index of the starting ACL entry that needs to be validated.</div><div class='add'>+ * @dst_idx: Index of the destination where the source entries are intended to</div><div class='add'>+ *	     be moved.</div><div class='add'>+ * @src_count: Pointer to the variable that will hold the number of contiguous</div><div class='add'>+ *	     source entries if the validation passes.</div><div class='add'>+ * @dst_count: Pointer to the variable that will hold the number of contiguous</div><div class='add'>+ *	     destination entries if the validation passes.</div><div class='add'>+ *</div><div class='add'>+ * This function performs validation on the source and destination indices</div><div class='add'>+ * provided for ACL entries. It checks if the indices are within the valid</div><div class='add'>+ * range, and if the source entries are contiguous. Additionally, the function</div><div class='add'>+ * ensures that there's adequate space at the destination for the source entries</div><div class='add'>+ * and that the destination index isn't in the middle of a RuleSet. If all</div><div class='add'>+ * validations pass, the function returns the number of contiguous source and</div><div class='add'>+ * destination entries.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, otherwise returns a negative error code if any</div><div class='add'>+ * validation check fails.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_validate_and_get_src_count(struct ksz_device *dev, int port,</div><div class='add'>+					      int src_idx, int dst_idx,</div><div class='add'>+					      int *src_count, int *dst_count)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (src_idx &gt;= KSZ9477_ACL_MAX_ENTRIES ||</div><div class='add'>+	    dst_idx &gt;= KSZ9477_ACL_MAX_ENTRIES) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: invalid entry index\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate if the source entries are contiguous */</div><div class='add'>+	ret = ksz9477_acl_get_cont_entr(dev, port, src_idx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	*src_count = ret;</div><div class='add'>+</div><div class='add'>+	if (!*src_count) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: source entry is empty\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dst_idx + *src_count &gt;= KSZ9477_ACL_MAX_ENTRIES) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: Not enough space at the destination. Move operation will fail.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate if the destination entry is empty or not in the middle of</div><div class='add'>+	 * a RuleSet.</div><div class='add'>+	 */</div><div class='add'>+	ret = ksz9477_acl_get_cont_entr(dev, port, dst_idx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	*dst_count = ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_move_entries_downwards - Move a range of ACL entries downwards in</div><div class='add'>+ *				    the list.</div><div class='add'>+ * @dev: Pointer to the KSZ device structure.</div><div class='add'>+ * @acles: Pointer to the structure encapsulating all the ACL entries.</div><div class='add'>+ * @start_idx: Starting index of the entries to be relocated.</div><div class='add'>+ * @num_entries_to_move: Number of consecutive entries to be relocated.</div><div class='add'>+ * @end_idx: Destination index where the first entry should be situated post</div><div class='add'>+ *           relocation.</div><div class='add'>+ *</div><div class='add'>+ * This function is responsible for rearranging a specific block of ACL entries</div><div class='add'>+ * by shifting them downwards in the list based on the supplied source and</div><div class='add'>+ * destination indices. It ensures that the linkage between the ACL entries is</div><div class='add'>+ * maintained accurately after the relocation.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on successful relocation of entries, otherwise returns a negative</div><div class='add'>+ * error code.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_move_entries_downwards(struct ksz_device *dev,</div><div class='add'>+					  struct ksz9477_acl_entries *acles,</div><div class='add'>+					  u16 start_idx,</div><div class='add'>+					  u16 num_entries_to_move,</div><div class='add'>+					  u16 end_idx)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_entry *e;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = start_idx; i &lt; end_idx; i++) {</div><div class='add'>+		e = &amp;acles-&gt;entries[i];</div><div class='add'>+		*e = acles-&gt;entries[i + num_entries_to_move];</div><div class='add'>+</div><div class='add'>+		ret = ksz9477_acl_update_linkage(dev, &amp;e-&gt;entry[0],</div><div class='add'>+						 i + num_entries_to_move, i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_move_entries_upwards - Move a range of ACL entries upwards in the</div><div class='add'>+ *				  list.</div><div class='add'>+ * @dev: Pointer to the KSZ device structure.</div><div class='add'>+ * @acles: Pointer to the structure holding all the ACL entries.</div><div class='add'>+ * @start_idx: The starting index of the entries to be moved.</div><div class='add'>+ * @num_entries_to_move: Number of contiguous entries to be moved.</div><div class='add'>+ * @target_idx: The destination index where the first entry should be placed</div><div class='add'>+ *		after moving.</div><div class='add'>+ *</div><div class='add'>+ * This function rearranges a chunk of ACL entries by moving them upwards</div><div class='add'>+ * in the list based on the given source and destination indices. The reordering</div><div class='add'>+ * process preserves the linkage between entries by updating it accordingly.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the entries were successfully moved, otherwise a negative error</div><div class='add'>+ * code.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_move_entries_upwards(struct ksz_device *dev,</div><div class='add'>+					struct ksz9477_acl_entries *acles,</div><div class='add'>+					u16 start_idx, u16 num_entries_to_move,</div><div class='add'>+					u16 target_idx)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_entry *e;</div><div class='add'>+	int ret, i, b;</div><div class='add'>+</div><div class='add'>+	for (i = start_idx; i &gt; target_idx; i--) {</div><div class='add'>+		b = i + num_entries_to_move - 1;</div><div class='add'>+</div><div class='add'>+		e = &amp;acles-&gt;entries[b];</div><div class='add'>+		*e = acles-&gt;entries[i - 1];</div><div class='add'>+</div><div class='add'>+		ret = ksz9477_acl_update_linkage(dev, &amp;e-&gt;entry[0], i - 1, b);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_move_entries - Move a block of contiguous ACL entries from a</div><div class='add'>+ *			      source to a destination index.</div><div class='add'>+ * @dev: Pointer to the KSZ9477 device structure.</div><div class='add'>+ * @port: Port number.</div><div class='add'>+ * @src_idx: Index of the starting source ACL entry.</div><div class='add'>+ * @dst_idx: Index of the starting destination ACL entry.</div><div class='add'>+ *</div><div class='add'>+ * This function aims to move a block of contiguous ACL entries from the source</div><div class='add'>+ * index to the destination index while ensuring the integrity and validity of</div><div class='add'>+ * the ACL table.</div><div class='add'>+ *</div><div class='add'>+ * In case of any errors during the adjustments or copying, the function will</div><div class='add'>+ * restore the ACL entries to their original state from the backup.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the move operation is successful. Returns -EINVAL for validation</div><div class='add'>+ * errors or other error codes based on specific failure conditions.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_move_entries(struct ksz_device *dev, int port,</div><div class='add'>+				    u16 src_idx, u16 dst_idx)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_entry buffer[KSZ9477_ACL_MAX_ENTRIES];</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	int src_count, ret, dst_count;</div><div class='add'>+</div><div class='add'>+	/* Nothing to do */</div><div class='add'>+	if (src_idx == dst_idx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_validate_and_get_src_count(dev, port, src_idx, dst_idx,</div><div class='add'>+						 &amp;src_count, &amp;dst_count);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* In case dst_index is greater than src_index, we need to adjust the</div><div class='add'>+	 * destination index to account for the entries that will be moved</div><div class='add'>+	 * downwards and the size of the entry located at dst_idx.</div><div class='add'>+	 */</div><div class='add'>+	if (dst_idx &gt; src_idx)</div><div class='add'>+		dst_idx = dst_idx + dst_count - src_count;</div><div class='add'>+</div><div class='add'>+	/* Copy source block to buffer and update its linkage */</div><div class='add'>+	for (int i = 0; i &lt; src_count; i++) {</div><div class='add'>+		buffer[i] = acles-&gt;entries[src_idx + i];</div><div class='add'>+		ret = ksz9477_acl_update_linkage(dev, &amp;buffer[i].entry[0],</div><div class='add'>+						 src_idx + i, dst_idx + i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Adjust other entries and their linkage based on destination */</div><div class='add'>+	if (dst_idx &gt; src_idx) {</div><div class='add'>+		ret = ksz9477_move_entries_downwards(dev, acles, src_idx,</div><div class='add'>+						     src_count, dst_idx);</div><div class='add'>+	} else {</div><div class='add'>+		ret = ksz9477_move_entries_upwards(dev, acles, src_idx,</div><div class='add'>+						   src_count, dst_idx);</div><div class='add'>+	}</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Copy buffer to destination block */</div><div class='add'>+	for (int i = 0; i &lt; src_count; i++)</div><div class='add'>+		acles-&gt;entries[dst_idx + i] = buffer[i];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_get_next_block_start - Identify the starting index of the next ACL</div><div class='add'>+ *				  block.</div><div class='add'>+ * @dev: Pointer to the device structure.</div><div class='add'>+ * @port: The port number on which the ACL entries are being checked.</div><div class='add'>+ * @start: The starting index from which the search begins.</div><div class='add'>+ *</div><div class='add'>+ * This function looks for the next valid ACL block starting from the provided</div><div class='add'>+ * 'start' index and returns the beginning index of that block. If the block is</div><div class='add'>+ * invalid or if it reaches the end of the ACL entries without finding another</div><div class='add'>+ * block, it returns the maximum ACL entries count.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  - The starting index of the next valid ACL block.</div><div class='add'>+ *  - KSZ9477_ACL_MAX_ENTRIES if no other valid blocks are found after 'start'.</div><div class='add'>+ *  - A negative error code if an error occurs while checking.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_get_next_block_start(struct ksz_device *dev, int port,</div><div class='add'>+					int start)</div><div class='add'>+{</div><div class='add'>+	int block_size;</div><div class='add'>+</div><div class='add'>+	for (int i = start; i &lt; KSZ9477_ACL_MAX_ENTRIES;) {</div><div class='add'>+		block_size = ksz9477_acl_get_cont_entr(dev, port, i);</div><div class='add'>+		if (block_size &lt; 0 &amp;&amp; block_size != -ENOTEMPTY)</div><div class='add'>+			return block_size;</div><div class='add'>+</div><div class='add'>+		if (block_size &gt; 0)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+	return KSZ9477_ACL_MAX_ENTRIES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_swap_acl_blocks - Swap two ACL blocks</div><div class='add'>+ * @dev: Pointer to the device structure.</div><div class='add'>+ * @port: The port number on which the ACL blocks are to be swapped.</div><div class='add'>+ * @i: The starting index of the first ACL block.</div><div class='add'>+ * @j: The starting index of the second ACL block.</div><div class='add'>+ *</div><div class='add'>+ * This function is used to swap two ACL blocks present at given indices. The</div><div class='add'>+ * main purpose is to aid in the sorting and reordering of ACL blocks based on</div><div class='add'>+ * certain criteria, e.g., priority. It checks the validity of the block at</div><div class='add'>+ * index 'i', ensuring it's not an empty block, and then proceeds to swap it</div><div class='add'>+ * with the block at index 'j'.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  - 0 on successful swapping of blocks.</div><div class='add'>+ *  - -EINVAL if the block at index 'i' is empty.</div><div class='add'>+ *  - A negative error code if any other error occurs during the swap.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_swap_acl_blocks(struct ksz_device *dev, int port, int i,</div><div class='add'>+				   int j)</div><div class='add'>+{</div><div class='add'>+	int ret, current_block_size;</div><div class='add'>+</div><div class='add'>+	current_block_size = ksz9477_acl_get_cont_entr(dev, port, i);</div><div class='add'>+	if (current_block_size &lt; 0)</div><div class='add'>+		return current_block_size;</div><div class='add'>+</div><div class='add'>+	if (!current_block_size) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: swapping empty entry %d\n", i);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_acl_move_entries(dev, port, i, j);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_acl_move_entries(dev, port, j - current_block_size, i);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_sort_acl_entr_no_back - Sort ACL entries for a given port based on</div><div class='add'>+ *			           priority without backing up entries.</div><div class='add'>+ * @dev: Pointer to the device structure.</div><div class='add'>+ * @port: The port number whose ACL entries need to be sorted.</div><div class='add'>+ *</div><div class='add'>+ * This function sorts ACL entries of the specified port using a variant of the</div><div class='add'>+ * bubble sort algorithm. It operates on blocks of ACL entries rather than</div><div class='add'>+ * individual entries. Each block's starting point is identified and then</div><div class='add'>+ * compared with subsequent blocks based on their priority. If the current</div><div class='add'>+ * block has a lower priority than the subsequent block, the two blocks are</div><div class='add'>+ * swapped.</div><div class='add'>+ *</div><div class='add'>+ * This is done in order to maintain an organized order of ACL entries based on</div><div class='add'>+ * priority, ensuring efficient and predictable ACL rule application.</div><div class='add'>+ *</div><div class='add'>+ * Returns:</div><div class='add'>+ *  - 0 on successful sorting of entries.</div><div class='add'>+ *  - A negative error code if any issue arises during sorting, e.g.,</div><div class='add'>+ *    if the function is unable to get the next block start.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_sort_acl_entr_no_back(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	struct ksz9477_acl_entry *curr, *next;</div><div class='add'>+	int i, j, ret;</div><div class='add'>+</div><div class='add'>+	/* Bubble sort */</div><div class='add'>+	for (i = 0; i &lt; KSZ9477_ACL_MAX_ENTRIES;) {</div><div class='add'>+		curr = &amp;acles-&gt;entries[i];</div><div class='add'>+</div><div class='add'>+		j = ksz9477_get_next_block_start(dev, port, i + 1);</div><div class='add'>+		if (j &lt; 0)</div><div class='add'>+			return j;</div><div class='add'>+</div><div class='add'>+		while (j &lt; KSZ9477_ACL_MAX_ENTRIES) {</div><div class='add'>+			next = &amp;acles-&gt;entries[j];</div><div class='add'>+</div><div class='add'>+			if (curr-&gt;prio &gt; next-&gt;prio) {</div><div class='add'>+				ret = ksz9477_swap_acl_blocks(dev, port, i, j);</div><div class='add'>+				if (ret)</div><div class='add'>+					return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			j = ksz9477_get_next_block_start(dev, port, j + 1);</div><div class='add'>+			if (j &lt; 0)</div><div class='add'>+				return j;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		i = ksz9477_get_next_block_start(dev, port, i + 1);</div><div class='add'>+		if (i &lt; 0)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_sort_acl_entries - Sort the ACL entries for a given port.</div><div class='add'>+ * @dev: Pointer to the KSZ device.</div><div class='add'>+ * @port: Port number.</div><div class='add'>+ *</div><div class='add'>+ * This function sorts the Access Control List (ACL) entries for a specified</div><div class='add'>+ * port. Before sorting, a backup of the original entries is created. If the</div><div class='add'>+ * sorting process fails, the function will log error messages displaying both</div><div class='add'>+ * the original and attempted sorted entries, and then restore the original</div><div class='add'>+ * entries from the backup.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 if the sorting succeeds, otherwise a negative error code.</div><div class='add'>+ */</div><div class='add'>+int ksz9477_sort_acl_entries(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_entry backup[KSZ9477_ACL_MAX_ENTRIES];</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* create a backup of the ACL entries, if something goes wrong</div><div class='add'>+	 * we can restore the ACL entries.</div><div class='add'>+	 */</div><div class='add'>+	memcpy(backup, acles-&gt;entries, sizeof(backup));</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_sort_acl_entr_no_back(dev, port);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL: failed to sort entries for port %d\n",</div><div class='add'>+			port);</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL dump before sorting:\n");</div><div class='add'>+		ksz9477_dump_acl(dev, backup);</div><div class='add'>+		dev_err(dev-&gt;dev, "ACL dump after sorting:\n");</div><div class='add'>+		ksz9477_dump_acl(dev, acles-&gt;entries);</div><div class='add'>+		/* Restore the original entries */</div><div class='add'>+		memcpy(acles-&gt;entries, backup, sizeof(backup));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_wait_ready - Waits for the ACL operation to complete on a given</div><div class='add'>+ *			    port.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to wait for.</div><div class='add'>+ *</div><div class='add'>+ * This function checks if the ACL write or read operation is completed by</div><div class='add'>+ * polling the specified register.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if the operation is successful, or a negative error code if an</div><div class='add'>+ * error occurs.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_wait_ready(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	unsigned int wr_mask = KSZ9477_ACL_WRITE_DONE | KSZ9477_ACL_READ_DONE;</div><div class='add'>+	unsigned int val, reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	reg = dev-&gt;dev_ops-&gt;get_port_addr(port, KSZ9477_PORT_ACL_CTRL_0);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(dev-&gt;regmap[0], reg, val,</div><div class='add'>+				       (val &amp; wr_mask) == wr_mask, 1000, 10000);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to read/write ACL table\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_entry_write - Writes an ACL entry to a given port at the</div><div class='add'>+ *			     specified index.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to write the ACL entry to.</div><div class='add'>+ * @entry: A pointer to the ACL entry data.</div><div class='add'>+ * @idx: The index at which to write the ACL entry.</div><div class='add'>+ *</div><div class='add'>+ * This function writes the provided ACL entry to the specified port at the</div><div class='add'>+ * given index.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if the operation is successful, or a negative error code if an</div><div class='add'>+ * error occurs.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_entry_write(struct ksz_device *dev, int port, u8 *entry,</div><div class='add'>+				   int idx)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; KSZ9477_ACL_ENTRY_SIZE; i++) {</div><div class='add'>+		ret = ksz_pwrite8(dev, port, KSZ9477_PORT_ACL_0 + i, entry[i]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Failed to write ACL entry %d\n", i);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write everything down */</div><div class='add'>+	val = FIELD_PREP(KSZ9477_ACL_INDEX_M, idx) | KSZ9477_ACL_WRITE;</div><div class='add'>+	ret = ksz_pwrite8(dev, port, KSZ9477_PORT_ACL_CTRL_0, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* wait until everything is written  */</div><div class='add'>+	return ksz9477_acl_wait_ready(dev, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_port_enable - Enables ACL functionality on a given port.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number on which to enable ACL functionality.</div><div class='add'>+ *</div><div class='add'>+ * This function enables ACL functionality on the specified port by configuring</div><div class='add'>+ * the appropriate control registers. It returns 0 if the operation is</div><div class='add'>+ * successful, or a negative error code if an error occurs.</div><div class='add'>+ *</div><div class='add'>+ * 0xn801 - KSZ9477S 5.2.8.2 Port Priority Control Register</div><div class='add'>+ *        Bit 7 - Highest Priority</div><div class='add'>+ *        Bit 6 - OR'ed Priority</div><div class='add'>+ *        Bit 4 - MAC Address Priority Classification</div><div class='add'>+ *        Bit 3 - VLAN Priority Classification</div><div class='add'>+ *        Bit 2 - 802.1p Priority Classification</div><div class='add'>+ *        Bit 1 - Diffserv Priority Classification</div><div class='add'>+ *        Bit 0 - ACL Priority Classification</div><div class='add'>+ *</div><div class='add'>+ * Current driver implementation sets 802.1p priority classification by default.</div><div class='add'>+ * In this function we add ACL priority classification with OR'ed priority.</div><div class='add'>+ * According to testing, priority set by ACL will supersede the 802.1p priority.</div><div class='add'>+ *</div><div class='add'>+ * 0xn803 - KSZ9477S 5.2.8.4 Port Authentication Control Register</div><div class='add'>+ *        Bit 2 - Access Control List (ACL) Enable</div><div class='add'>+ *        Bits 1:0 - Authentication Mode</div><div class='add'>+ *                00 = Reserved</div><div class='add'>+ *                01 = Block Mode. Authentication is enabled. When ACL is</div><div class='add'>+ *                     enabled, all traffic that misses the ACL rules is</div><div class='add'>+ *                     blocked; otherwise ACL actions apply.</div><div class='add'>+ *                10 = Pass Mode. Authentication is disabled. When ACL is</div><div class='add'>+ *                     enabled, all traffic that misses the ACL rules is</div><div class='add'>+ *                     forwarded; otherwise ACL actions apply.</div><div class='add'>+ *                11 = Trap Mode. Authentication is enabled. All traffic is</div><div class='add'>+ *                     forwarded to the host port. When ACL is enabled, all</div><div class='add'>+ *                     traffic that misses the ACL rules is blocked; otherwise</div><div class='add'>+ *                     ACL actions apply.</div><div class='add'>+ *</div><div class='add'>+ * We are using Pass Mode int this function.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if the operation is successful, or a negative error code if an</div><div class='add'>+ * error occurs.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_port_enable(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_prmw8(dev, port, P_PRIO_CTRL, 0, PORT_ACL_PRIO_ENABLE |</div><div class='add'>+			PORT_OR_PRIO);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_pwrite8(dev, port, REG_PORT_MRI_AUTHEN_CTRL,</div><div class='add'>+			   PORT_ACL_ENABLE |</div><div class='add'>+			   FIELD_PREP(PORT_AUTHEN_MODE, PORT_AUTHEN_PASS));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_port_disable - Disables ACL functionality on a given port.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number on which to disable ACL functionality.</div><div class='add'>+ *</div><div class='add'>+ * This function disables ACL functionality on the specified port by writing a</div><div class='add'>+ * value of 0 to the REG_PORT_MRI_AUTHEN_CTRL control register and remove</div><div class='add'>+ * PORT_ACL_PRIO_ENABLE bit from P_PRIO_CTRL register.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if the operation is successful, or a negative error code if an</div><div class='add'>+ * error occurs.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_acl_port_disable(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_prmw8(dev, port, P_PRIO_CTRL, PORT_ACL_PRIO_ENABLE, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_pwrite8(dev, port, REG_PORT_MRI_AUTHEN_CTRL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_write_list - Write a list of ACL entries to a given port.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number on which to write ACL entries.</div><div class='add'>+ *</div><div class='add'>+ * This function enables ACL functionality on the specified port, writes a list</div><div class='add'>+ * of ACL entries to the port, and disables ACL functionality if there are no</div><div class='add'>+ * entries.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 if the operation is successful, or a negative error code if an</div><div class='add'>+ * error occurs.</div><div class='add'>+ */</div><div class='add'>+int ksz9477_acl_write_list(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* ACL should be enabled before writing entries */</div><div class='add'>+	ret = ksz9477_acl_port_enable(dev, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* write all entries */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(acles-&gt;entries); i++) {</div><div class='add'>+		u8 *entry = acles-&gt;entries[i].entry;</div><div class='add'>+</div><div class='add'>+		/* Check if entry was removed and should be zeroed.</div><div class='add'>+		 * If last fields of the entry are not zero, it means</div><div class='add'>+		 * it is removed locally but currently not synced with the HW.</div><div class='add'>+		 * So, we will write it down to the HW to remove it.</div><div class='add'>+		 */</div><div class='add'>+		if (i &gt;= acles-&gt;entries_count &amp;&amp;</div><div class='add'>+		    entry[KSZ9477_ACL_PORT_ACCESS_10] == 0 &amp;&amp;</div><div class='add'>+		    entry[KSZ9477_ACL_PORT_ACCESS_11] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ksz9477_acl_entry_write(dev, port, entry, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* now removed entry is clean on HW side, so it can</div><div class='add'>+		 * in the cache too</div><div class='add'>+		 */</div><div class='add'>+		if (i &gt;= acles-&gt;entries_count &amp;&amp;</div><div class='add'>+		    entry[KSZ9477_ACL_PORT_ACCESS_10] != 0 &amp;&amp;</div><div class='add'>+		    entry[KSZ9477_ACL_PORT_ACCESS_11] != 0) {</div><div class='add'>+			entry[KSZ9477_ACL_PORT_ACCESS_10] = 0;</div><div class='add'>+			entry[KSZ9477_ACL_PORT_ACCESS_11] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!acles-&gt;entries_count)</div><div class='add'>+		return ksz9477_acl_port_disable(dev, port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_remove_entries - Remove ACL entries with a given cookie from a</div><div class='add'>+ *                              specified ksz9477_acl_entries structure.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number on which to remove ACL entries.</div><div class='add'>+ * @acles: The ksz9477_acl_entries instance.</div><div class='add'>+ * @cookie: The cookie value to match for entry removal.</div><div class='add'>+ *</div><div class='add'>+ * This function iterates through the entries array, removing any entries with</div><div class='add'>+ * a matching cookie value. The remaining entries are then shifted down to fill</div><div class='add'>+ * the gap.</div><div class='add'>+ */</div><div class='add'>+void ksz9477_acl_remove_entries(struct ksz_device *dev, int port,</div><div class='add'>+				struct ksz9477_acl_entries *acles,</div><div class='add'>+				unsigned long cookie)</div><div class='add'>+{</div><div class='add'>+	int entries_count = acles-&gt;entries_count;</div><div class='add'>+	int ret, i, src_count;</div><div class='add'>+	int src_idx = -1;</div><div class='add'>+</div><div class='add'>+	if (!entries_count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Search for the first position with the cookie */</div><div class='add'>+	for (i = 0; i &lt; entries_count; i++) {</div><div class='add'>+		if (acles-&gt;entries[i].cookie == cookie) {</div><div class='add'>+			src_idx = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No entries with the matching cookie found */</div><div class='add'>+	if (src_idx == -1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Get the size of the cookie entry. We may have complex entries. */</div><div class='add'>+	src_count = ksz9477_acl_get_cont_entr(dev, port, src_idx);</div><div class='add'>+	if (src_count &lt;= 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Move all entries down to overwrite removed entry with the cookie */</div><div class='add'>+	ret = ksz9477_move_entries_downwards(dev, acles, src_idx,</div><div class='add'>+					     src_count,</div><div class='add'>+					     entries_count - src_count);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to move ACL entries down\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Overwrite new empty places at the end of the list with zeros to make</div><div class='add'>+	 * sure not unexpected things will happen or no unexplored quirks will</div><div class='add'>+	 * come out.</div><div class='add'>+	 */</div><div class='add'>+	for (i = entries_count - src_count; i &lt; entries_count; i++) {</div><div class='add'>+		struct ksz9477_acl_entry *entry = &amp;acles-&gt;entries[i];</div><div class='add'>+</div><div class='add'>+		memset(entry, 0, sizeof(*entry));</div><div class='add'>+</div><div class='add'>+		/* Set all access bits to be able to write zeroed entry to HW */</div><div class='add'>+		entry-&gt;entry[KSZ9477_ACL_PORT_ACCESS_10] = 0xff;</div><div class='add'>+		entry-&gt;entry[KSZ9477_ACL_PORT_ACCESS_11] = 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Adjust the total entries count */</div><div class='add'>+	acles-&gt;entries_count -= src_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_port_acl_init - Initialize the ACL for a specified port on a ksz</div><div class='add'>+ *			   device.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to initialize the ACL for.</div><div class='add'>+ *</div><div class='add'>+ * This function allocates memory for an acl structure, associates it with the</div><div class='add'>+ * specified port, and initializes the ACL entries to a default state. The</div><div class='add'>+ * entries are then written using the ksz9477_acl_write_list function, ensuring</div><div class='add'>+ * the ACL has a predictable initial hardware state.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success, or an error code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz9477_port_acl_init(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_entries *acles;</div><div class='add'>+	struct ksz9477_acl_priv *acl;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	acl = kzalloc(sizeof(*acl), GFP_KERNEL);</div><div class='add'>+	if (!acl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ports[port].acl_priv = acl;</div><div class='add'>+</div><div class='add'>+	acles = &amp;acl-&gt;acles;</div><div class='add'>+	/* write all entries */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(acles-&gt;entries); i++) {</div><div class='add'>+		u8 *entry = acles-&gt;entries[i].entry;</div><div class='add'>+</div><div class='add'>+		/* Set all access bits to be able to write zeroed</div><div class='add'>+		 * entry</div><div class='add'>+		 */</div><div class='add'>+		entry[KSZ9477_ACL_PORT_ACCESS_10] = 0xff;</div><div class='add'>+		entry[KSZ9477_ACL_PORT_ACCESS_11] = 0xff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_acl_write_list(dev, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_acl;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_acl:</div><div class='add'>+	kfree(dev-&gt;ports[port].acl_priv);</div><div class='add'>+	dev-&gt;ports[port].acl_priv = NULL;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_port_acl_free - Free the ACL resources for a specified port on a ksz</div><div class='add'>+ *			   device.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to initialize the ACL for.</div><div class='add'>+ *</div><div class='add'>+ * This disables the ACL for the specified port and frees the associated memory,</div><div class='add'>+ */</div><div class='add'>+void ksz9477_port_acl_free(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;ports[port].acl_priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ksz9477_acl_port_disable(dev, port);</div><div class='add'>+</div><div class='add'>+	kfree(dev-&gt;ports[port].acl_priv);</div><div class='add'>+	dev-&gt;ports[port].acl_priv = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_set_reg - Set entry[16] and entry[17] depending on the updated</div><div class='add'>+ *			   entry[]</div><div class='add'>+ * @entry: An array containing the entries</div><div class='add'>+ * @reg: The register of the entry that needs to be updated</div><div class='add'>+ * @value: The value to be assigned to the updated entry</div><div class='add'>+ *</div><div class='add'>+ * This function updates the entry[] array based on the provided register and</div><div class='add'>+ * value. It also sets entry[0x10] and entry[0x11] according to the ACL byte</div><div class='add'>+ * enable rules.</div><div class='add'>+ *</div><div class='add'>+ * 0x10 - Byte Enable [15:8]</div><div class='add'>+ *</div><div class='add'>+ * Each bit enables accessing one of the ACL bytes when a read or write is</div><div class='add'>+ * initiated by writing to the Port ACL Byte Enable LSB Register.</div><div class='add'>+ * Bit 0 applies to the Port ACL Access 7 Register</div><div class='add'>+ * Bit 1 applies to the Port ACL Access 6 Register, etc.</div><div class='add'>+ * Bit 7 applies to the Port ACL Access 0 Register</div><div class='add'>+ * 1 = Byte is selected for read/write</div><div class='add'>+ * 0 = Byte is not selected</div><div class='add'>+ *</div><div class='add'>+ * 0x11 - Byte Enable [7:0]</div><div class='add'>+ *</div><div class='add'>+ * Each bit enables accessing one of the ACL bytes when a read or write is</div><div class='add'>+ * initiated by writing to the Port ACL Byte Enable LSB Register.</div><div class='add'>+ * Bit 0 applies to the Port ACL Access F Register</div><div class='add'>+ * Bit 1 applies to the Port ACL Access E Register, etc.</div><div class='add'>+ * Bit 7 applies to the Port ACL Access 8 Register</div><div class='add'>+ * 1 = Byte is selected for read/write</div><div class='add'>+ * 0 = Byte is not selected</div><div class='add'>+ */</div><div class='add'>+static void ksz9477_acl_set_reg(u8 *entry, enum ksz9477_acl_port_access reg,</div><div class='add'>+				u8 value)</div><div class='add'>+{</div><div class='add'>+	if (reg &gt;= KSZ9477_ACL_PORT_ACCESS_0 &amp;&amp;</div><div class='add'>+	    reg &lt;= KSZ9477_ACL_PORT_ACCESS_7) {</div><div class='add'>+		entry[KSZ9477_ACL_PORT_ACCESS_10] |=</div><div class='add'>+				BIT(KSZ9477_ACL_PORT_ACCESS_7 - reg);</div><div class='add'>+	} else if (reg &gt;= KSZ9477_ACL_PORT_ACCESS_8 &amp;&amp;</div><div class='add'>+		   reg &lt;= KSZ9477_ACL_PORT_ACCESS_F) {</div><div class='add'>+		entry[KSZ9477_ACL_PORT_ACCESS_11] |=</div><div class='add'>+			BIT(KSZ9477_ACL_PORT_ACCESS_F - reg);</div><div class='add'>+	} else {</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry[reg] = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_matching_rule_cfg_l2 - Configure an ACL filtering entry to match</div><div class='add'>+ *				      L2 types of Ethernet frames</div><div class='add'>+ * @entry: Pointer to ACL entry buffer</div><div class='add'>+ * @ethertype: Ethertype value</div><div class='add'>+ * @eth_addr: Pointer to Ethernet address</div><div class='add'>+ * @is_src: If true, match the source MAC address; if false, match the</div><div class='add'>+ *	    destination MAC address</div><div class='add'>+ *</div><div class='add'>+ * This function configures an Access Control List (ACL) filtering</div><div class='add'>+ * entry to match Layer 2 types of Ethernet frames based on the provided</div><div class='add'>+ * ethertype and Ethernet address. Additionally, it can match either the source</div><div class='add'>+ * or destination MAC address depending on the value of the is_src parameter.</div><div class='add'>+ *</div><div class='add'>+ * Register Descriptions for MD = 01 and ENB != 00 (Layer 2 MAC header</div><div class='add'>+ * filtering)</div><div class='add'>+ *</div><div class='add'>+ * 0x01 - Mode and Enable</div><div class='add'>+ *        Bits 5:4 - MD (Mode)</div><div class='add'>+ *                01 = Layer 2 MAC header or counter filtering</div><div class='add'>+ *        Bits 3:2 - ENB (Enable)</div><div class='add'>+ *                01 = Comparison is performed only on the TYPE value</div><div class='add'>+ *                10 = Comparison is performed only on the MAC Address value</div><div class='add'>+ *                11 = Both the MAC Address and TYPE are tested</div><div class='add'>+ *        Bit  1   - S/D (Source / Destination)</div><div class='add'>+ *                0 = Destination address</div><div class='add'>+ *                1 = Source address</div><div class='add'>+ *        Bit  0   - EQ (Equal / Not Equal)</div><div class='add'>+ *                0 = Not Equal produces true result</div><div class='add'>+ *                1 = Equal produces true result</div><div class='add'>+ *</div><div class='add'>+ * 0x02-0x07 - MAC Address</div><div class='add'>+ *        0x02 - MAC Address [47:40]</div><div class='add'>+ *        0x03 - MAC Address [39:32]</div><div class='add'>+ *        0x04 - MAC Address [31:24]</div><div class='add'>+ *        0x05 - MAC Address [23:16]</div><div class='add'>+ *        0x06 - MAC Address [15:8]</div><div class='add'>+ *        0x07 - MAC Address [7:0]</div><div class='add'>+ *</div><div class='add'>+ * 0x08-0x09 - EtherType</div><div class='add'>+ *        0x08 - EtherType [15:8]</div><div class='add'>+ *        0x09 - EtherType [7:0]</div><div class='add'>+ */</div><div class='add'>+static void ksz9477_acl_matching_rule_cfg_l2(u8 *entry, u16 ethertype,</div><div class='add'>+					     u8 *eth_addr, bool is_src)</div><div class='add'>+{</div><div class='add'>+	u8 enb = 0;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	if (ethertype)</div><div class='add'>+		enb |= KSZ9477_ACL_ENB_L2_TYPE;</div><div class='add'>+	if (eth_addr)</div><div class='add'>+		enb |= KSZ9477_ACL_ENB_L2_MAC;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(KSZ9477_ACL_MD_MASK, KSZ9477_ACL_MD_L2_MAC) |</div><div class='add'>+	      FIELD_PREP(KSZ9477_ACL_ENB_MASK, enb) |</div><div class='add'>+	      FIELD_PREP(KSZ9477_ACL_SD_SRC, is_src) | KSZ9477_ACL_EQ_EQUAL;</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_1, val);</div><div class='add'>+</div><div class='add'>+	if (eth_addr) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='add'>+			ksz9477_acl_set_reg(entry,</div><div class='add'>+					    KSZ9477_ACL_PORT_ACCESS_2 + i,</div><div class='add'>+					    eth_addr[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_8, ethertype &gt;&gt; 8);</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_9, ethertype &amp; 0xff);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_action_rule_cfg - Set action for an ACL entry</div><div class='add'>+ * @entry: Pointer to the ACL entry</div><div class='add'>+ * @force_prio: If true, force the priority value</div><div class='add'>+ * @prio_val: Priority value</div><div class='add'>+ *</div><div class='add'>+ * This function sets the action for the specified ACL entry. It prepares</div><div class='add'>+ * the priority mode and traffic class values and updates the entry's</div><div class='add'>+ * action registers accordingly. Currently, there is no port or VLAN PCP</div><div class='add'>+ * remapping.</div><div class='add'>+ *</div><div class='add'>+ * ACL Action Rule Parameters for Non-Count Modes (MD ≠ 01 or ENB ≠ 00)</div><div class='add'>+ *</div><div class='add'>+ * 0x0A - PM, P, RPE, RP[2:1]</div><div class='add'>+ *        Bits 7:6 - PM[1:0] - Priority Mode</div><div class='add'>+ *		00 = ACL does not specify the packet priority. Priority is</div><div class='add'>+ *		     determined by standard QoS functions.</div><div class='add'>+ *		01 = Change packet priority to P[2:0] if it is greater than QoS</div><div class='add'>+ *		     result.</div><div class='add'>+ *		10 = Change packet priority to P[2:0] if it is smaller than the</div><div class='add'>+ *		     QoS result.</div><div class='add'>+ *		11 = Always change packet priority to P[2:0].</div><div class='add'>+ *        Bits 5:3 - P[2:0] - Priority value</div><div class='add'>+ *        Bit  2   - RPE - Remark Priority Enable</div><div class='add'>+ *        Bits 1:0 - RP[2:1] - Remarked Priority value (bits 2:1)</div><div class='add'>+ *		0 = Disable priority remarking</div><div class='add'>+ *		1 = Enable priority remarking. VLAN tag priority (PCP) bits are</div><div class='add'>+ *		    replaced by RP[2:0].</div><div class='add'>+ *</div><div class='add'>+ * 0x0B - RP[0], MM</div><div class='add'>+ *        Bit  7   - RP[0] - Remarked Priority value (bit 0)</div><div class='add'>+ *        Bits 6:5 - MM[1:0] - Map Mode</div><div class='add'>+ *		00 = No forwarding remapping</div><div class='add'>+ *		01 = The forwarding map in FORWARD is OR'ed with the forwarding</div><div class='add'>+ *		     map from the Address Lookup Table.</div><div class='add'>+ *		10 = The forwarding map in FORWARD is AND'ed with the forwarding</div><div class='add'>+ *		     map from the Address Lookup Table.</div><div class='add'>+ *		11 = The forwarding map in FORWARD replaces the forwarding map</div><div class='add'>+ *		     from the Address Lookup Table.</div><div class='add'>+ * 0x0D - FORWARD[n:0]</div><div class='add'>+ *       Bits 7:0 - FORWARD[n:0] - Forwarding map. Bit 0 = port 1,</div><div class='add'>+ *		    bit 1 = port 2, etc.</div><div class='add'>+ *		1 = enable forwarding to this port</div><div class='add'>+ *		0 = do not forward to this port</div><div class='add'>+ */</div><div class='add'>+void ksz9477_acl_action_rule_cfg(u8 *entry, bool force_prio, u8 prio_val)</div><div class='add'>+{</div><div class='add'>+	u8 prio_mode, val;</div><div class='add'>+</div><div class='add'>+	if (force_prio)</div><div class='add'>+		prio_mode = KSZ9477_ACL_PM_REPLACE;</div><div class='add'>+	else</div><div class='add'>+		prio_mode = KSZ9477_ACL_PM_DISABLE;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(KSZ9477_ACL_PM_M, prio_mode) |</div><div class='add'>+	      FIELD_PREP(KSZ9477_ACL_P_M, prio_val);</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_A, val);</div><div class='add'>+</div><div class='add'>+	/* no port or VLAN PCP remapping for now */</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_B, 0);</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_D, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_processing_rule_set_action - Set the action for the processing</div><div class='add'>+ *					    rule set.</div><div class='add'>+ * @entry: Pointer to the ACL entry</div><div class='add'>+ * @action_idx: Index of the action to be applied</div><div class='add'>+ *</div><div class='add'>+ * This function sets the action for the processing rule set by updating the</div><div class='add'>+ * appropriate register in the entry. There can be only one action per</div><div class='add'>+ * processing rule.</div><div class='add'>+ *</div><div class='add'>+ * Access Control List (ACL) Processing Rule Registers:</div><div class='add'>+ *</div><div class='add'>+ * 0x00 - First Rule Number (FRN)</div><div class='add'>+ *        Bits 3:0 - First Rule Number. Pointer to an Action rule entry.</div><div class='add'>+ */</div><div class='add'>+void ksz9477_acl_processing_rule_set_action(u8 *entry, u8 action_idx)</div><div class='add'>+{</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_0, action_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_processing_rule_add_match - Add a matching rule to the rule set</div><div class='add'>+ * @entry: Pointer to the ACL entry</div><div class='add'>+ * @match_idx: Index of the matching rule to be added</div><div class='add'>+ *</div><div class='add'>+ * This function adds a matching rule to the rule set by updating the</div><div class='add'>+ * appropriate bits in the entry's rule set registers.</div><div class='add'>+ *</div><div class='add'>+ * Access Control List (ACL) Processing Rule Registers:</div><div class='add'>+ *</div><div class='add'>+ * 0x0E - RuleSet [15:8]</div><div class='add'>+ *        Bits 7:0 - RuleSet [15:8] Specifies a set of one or more Matching rule</div><div class='add'>+ *        entries. RuleSet has one bit for each of the 16 Matching rule entries.</div><div class='add'>+ *        If multiple Matching rules are selected, then all conditions will be</div><div class='add'>+ *	  AND'ed to produce a final match result.</div><div class='add'>+ *		0 = Matching rule not selected</div><div class='add'>+ *		1 = Matching rule selected</div><div class='add'>+ *</div><div class='add'>+ * 0x0F - RuleSet [7:0]</div><div class='add'>+ *        Bits 7:0 - RuleSet [7:0]</div><div class='add'>+ */</div><div class='add'>+static void ksz9477_acl_processing_rule_add_match(u8 *entry, u8 match_idx)</div><div class='add'>+{</div><div class='add'>+	u8 vale = entry[KSZ9477_ACL_PORT_ACCESS_E];</div><div class='add'>+	u8 valf = entry[KSZ9477_ACL_PORT_ACCESS_F];</div><div class='add'>+</div><div class='add'>+	if (match_idx &lt; 8)</div><div class='add'>+		valf |= BIT(match_idx);</div><div class='add'>+	else</div><div class='add'>+		vale |= BIT(match_idx - 8);</div><div class='add'>+</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_E, vale);</div><div class='add'>+	ksz9477_acl_set_reg(entry, KSZ9477_ACL_PORT_ACCESS_F, valf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_get_init_entry - Get a new uninitialized entry for a specified</div><div class='add'>+ *				port on a ksz_device.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to get the uninitialized entry for.</div><div class='add'>+ * @cookie: The cookie to associate with the entry.</div><div class='add'>+ * @prio: The priority to associate with the entry.</div><div class='add'>+ *</div><div class='add'>+ * This function retrieves the next available ACL entry for the specified port,</div><div class='add'>+ * clears all access flags, and associates it with the current cookie.</div><div class='add'>+ *</div><div class='add'>+ * Returns: A pointer to the new uninitialized ACL entry.</div><div class='add'>+ */</div><div class='add'>+static struct ksz9477_acl_entry *</div><div class='add'>+ksz9477_acl_get_init_entry(struct ksz_device *dev, int port,</div><div class='add'>+			   unsigned long cookie, u32 prio)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	struct ksz9477_acl_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = &amp;acles-&gt;entries[acles-&gt;entries_count];</div><div class='add'>+	entry-&gt;cookie = cookie;</div><div class='add'>+	entry-&gt;prio = prio;</div><div class='add'>+</div><div class='add'>+	/* clear all access flags */</div><div class='add'>+	entry-&gt;entry[KSZ9477_ACL_PORT_ACCESS_10] = 0;</div><div class='add'>+	entry-&gt;entry[KSZ9477_ACL_PORT_ACCESS_11] = 0;</div><div class='add'>+</div><div class='add'>+	return entry;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_acl_match_process_l2 - Configure Layer 2 ACL matching rules and</div><div class='add'>+ *                                processing rules.</div><div class='add'>+ * @dev: Pointer to the ksz_device.</div><div class='add'>+ * @port: Port number.</div><div class='add'>+ * @ethtype: Ethernet type.</div><div class='add'>+ * @src_mac: Source MAC address.</div><div class='add'>+ * @dst_mac: Destination MAC address.</div><div class='add'>+ * @cookie: The cookie to associate with the entry.</div><div class='add'>+ * @prio: The priority of the entry.</div><div class='add'>+ *</div><div class='add'>+ * This function sets up matching and processing rules for Layer 2 ACLs.</div><div class='add'>+ * It takes into account that only one MAC per entry is supported.</div><div class='add'>+ */</div><div class='add'>+void ksz9477_acl_match_process_l2(struct ksz_device *dev, int port,</div><div class='add'>+				  u16 ethtype, u8 *src_mac, u8 *dst_mac,</div><div class='add'>+				  unsigned long cookie, u32 prio)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct ksz9477_acl_entries *acles = &amp;acl-&gt;acles;</div><div class='add'>+	struct ksz9477_acl_entry *entry;</div><div class='add'>+</div><div class='add'>+	entry = ksz9477_acl_get_init_entry(dev, port, cookie, prio);</div><div class='add'>+</div><div class='add'>+	/* ACL supports only one MAC per entry */</div><div class='add'>+	if (src_mac &amp;&amp; dst_mac) {</div><div class='add'>+		ksz9477_acl_matching_rule_cfg_l2(entry-&gt;entry, ethtype, src_mac,</div><div class='add'>+						 true);</div><div class='add'>+</div><div class='add'>+		/* Add both match entries to first processing rule */</div><div class='add'>+		ksz9477_acl_processing_rule_add_match(entry-&gt;entry,</div><div class='add'>+						      acles-&gt;entries_count);</div><div class='add'>+		acles-&gt;entries_count++;</div><div class='add'>+		ksz9477_acl_processing_rule_add_match(entry-&gt;entry,</div><div class='add'>+						      acles-&gt;entries_count);</div><div class='add'>+</div><div class='add'>+		entry = ksz9477_acl_get_init_entry(dev, port, cookie, prio);</div><div class='add'>+		ksz9477_acl_matching_rule_cfg_l2(entry-&gt;entry, 0, dst_mac,</div><div class='add'>+						 false);</div><div class='add'>+		acles-&gt;entries_count++;</div><div class='add'>+	} else {</div><div class='add'>+		u8 *mac = src_mac ? src_mac : dst_mac;</div><div class='add'>+		bool is_src = src_mac ? true : false;</div><div class='add'>+</div><div class='add'>+		ksz9477_acl_matching_rule_cfg_l2(entry-&gt;entry, ethtype, mac,</div><div class='add'>+						 is_src);</div><div class='add'>+		ksz9477_acl_processing_rule_add_match(entry-&gt;entry,</div><div class='add'>+						      acles-&gt;entries_count);</div><div class='add'>+		acles-&gt;entries_count++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477_i2c.c b/drivers/net/dsa/microchip/ksz9477_i2c.c<br/>new file mode 100644<br/>index 000000000000..a2beb27459f1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477_i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz9477_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,149 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Microchip KSZ9477 series register access through I2C</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018-2024 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+KSZ_REGMAP_TABLE(ksz9477, not_used, 16, 0, 0);</div><div class='add'>+</div><div class='add'>+static int ksz9477_i2c_probe(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	const struct ksz_chip_data *chip;</div><div class='add'>+	struct device *ddev = &amp;i2c-&gt;dev;</div><div class='add'>+	struct regmap_config rc;</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	dev = ksz_switch_alloc(&amp;i2c-&gt;dev, i2c);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chip = device_get_match_data(ddev);</div><div class='add'>+	if (!chip)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Save chip id to do special initialization when probing. */</div><div class='add'>+	dev-&gt;chip_id = chip-&gt;chip_id;</div><div class='add'>+	for (i = 0; i &lt; __KSZ_NUM_REGMAPS; i++) {</div><div class='add'>+		rc = ksz9477_regmap_config[i];</div><div class='add'>+		rc.lock_arg = &amp;dev-&gt;regmap_mutex;</div><div class='add'>+		dev-&gt;regmap[i] = devm_regmap_init_i2c(i2c, &amp;rc);</div><div class='add'>+		if (IS_ERR(dev-&gt;regmap[i])) {</div><div class='add'>+			return dev_err_probe(&amp;i2c-&gt;dev, PTR_ERR(dev-&gt;regmap[i]),</div><div class='add'>+					     "Failed to initialize regmap%i\n",</div><div class='add'>+					     ksz9477_regmap_config[i].val_bits);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i2c-&gt;dev.platform_data)</div><div class='add'>+		dev-&gt;pdata = i2c-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = i2c-&gt;irq;</div><div class='add'>+</div><div class='add'>+	ret = ksz_switch_register(dev);</div><div class='add'>+</div><div class='add'>+	/* Main DSA driver may not be started yet. */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(i2c, dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz9477_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		ksz_switch_remove(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz9477_i2c_shutdown(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ksz_switch_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(i2c, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id ksz9477_i2c_id[] = {</div><div class='add'>+	{ "ksz9477-switch" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, ksz9477_i2c_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ksz9477_dt_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9477",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9477]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9896",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9896]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9897",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9897]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9893",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9893]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9563",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9563]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8563",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8563]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8567",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8567]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9567",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9567]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9646",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9646]</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ksz9477_dt_ids);</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(ksz_i2c_pm_ops,</div><div class='add'>+				ksz_switch_suspend, ksz_switch_resume);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver ksz9477_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "ksz9477-switch",</div><div class='add'>+		.of_match_table = ksz9477_dt_ids,</div><div class='add'>+		.pm = &amp;ksz_i2c_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.probe = ksz9477_i2c_probe,</div><div class='add'>+	.remove	= ksz9477_i2c_remove,</div><div class='add'>+	.shutdown = ksz9477_i2c_shutdown,</div><div class='add'>+	.id_table = ksz9477_i2c_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_i2c_driver(ksz9477_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Tristram Ha &lt;Tristram.Ha@microchip.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Microchip KSZ9477 Series Switch I2C access Driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477_reg.h b/drivers/net/dsa/microchip/ksz9477_reg.h<br/>index 2938e892b631..61ea11e3338e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477_reg.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz9477_reg.h</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- *</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='ctx'>  * Microchip KSZ9477 register definitions</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2017-2018 Microchip Technology Inc.</div><div class='add'>+ * Copyright (C) 2017-2025 Microchip Technology Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __KSZ9477_REGS_H</div><div class='hunk'>@@ -25,7 +25,6 @@</div><div class='ctx'> </div><div class='ctx'> #define REG_CHIP_ID2__1			0x0002</div><div class='ctx'> </div><div class='del'>-#define CHIP_ID_63			0x63</div><div class='ctx'> #define CHIP_ID_66			0x66</div><div class='ctx'> #define CHIP_ID_67			0x67</div><div class='ctx'> #define CHIP_ID_77			0x77</div><div class='hunk'>@@ -39,11 +38,6 @@</div><div class='ctx'> #define SWITCH_REVISION_S		4</div><div class='ctx'> #define SWITCH_RESET			0x01</div><div class='ctx'> </div><div class='del'>-#define REG_SW_PME_CTRL			0x0006</div><div class='del'>-</div><div class='del'>-#define PME_ENABLE			BIT(1)</div><div class='del'>-#define PME_POLARITY			BIT(0)</div><div class='del'>-</div><div class='ctx'> #define REG_GLOBAL_OPTIONS		0x000F</div><div class='ctx'> </div><div class='ctx'> #define SW_GIGABIT_ABLE			BIT(6)</div><div class='hunk'>@@ -113,19 +107,6 @@</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_IBA_SYNC__1		0x010C</div><div class='ctx'> </div><div class='del'>-#define REG_SW_IO_STRENGTH__1		0x010D</div><div class='del'>-#define SW_DRIVE_STRENGTH_M		0x7</div><div class='del'>-#define SW_DRIVE_STRENGTH_2MA		0</div><div class='del'>-#define SW_DRIVE_STRENGTH_4MA		1</div><div class='del'>-#define SW_DRIVE_STRENGTH_8MA		2</div><div class='del'>-#define SW_DRIVE_STRENGTH_12MA		3</div><div class='del'>-#define SW_DRIVE_STRENGTH_16MA		4</div><div class='del'>-#define SW_DRIVE_STRENGTH_20MA		5</div><div class='del'>-#define SW_DRIVE_STRENGTH_24MA		6</div><div class='del'>-#define SW_DRIVE_STRENGTH_28MA		7</div><div class='del'>-#define SW_HI_SPEED_DRIVE_STRENGTH_S	4</div><div class='del'>-#define SW_LO_SPEED_DRIVE_STRENGTH_S	0</div><div class='del'>-</div><div class='ctx'> #define REG_SW_IBA_STATUS__4		0x0110</div><div class='ctx'> </div><div class='ctx'> #define SW_IBA_REQ			BIT(31)</div><div class='hunk'>@@ -166,16 +147,9 @@</div><div class='ctx'> </div><div class='ctx'> #define SW_DOUBLE_TAG			BIT(7)</div><div class='ctx'> #define SW_RESET			BIT(1)</div><div class='del'>-#define SW_START			BIT(0)</div><div class='del'>-</div><div class='del'>-#define REG_SW_MAC_ADDR_0		0x0302</div><div class='del'>-#define REG_SW_MAC_ADDR_1		0x0303</div><div class='del'>-#define REG_SW_MAC_ADDR_2		0x0304</div><div class='del'>-#define REG_SW_MAC_ADDR_3		0x0305</div><div class='del'>-#define REG_SW_MAC_ADDR_4		0x0306</div><div class='del'>-#define REG_SW_MAC_ADDR_5		0x0307</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_MTU__2			0x0308</div><div class='add'>+#define REG_SW_MTU_MASK			GENMASK(13, 0)</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_ISP_TPID__2		0x030A</div><div class='ctx'> </div><div class='hunk'>@@ -190,8 +164,7 @@</div><div class='ctx'> </div><div class='ctx'> #define SW_VLAN_ENABLE			BIT(7)</div><div class='ctx'> #define SW_DROP_INVALID_VID		BIT(6)</div><div class='del'>-#define SW_AGE_CNT_M			0x7</div><div class='del'>-#define SW_AGE_CNT_S			3</div><div class='add'>+#define SW_AGE_CNT_M			GENMASK(5, 3)</div><div class='ctx'> #define SW_RESV_MCAST_ENABLE		BIT(2)</div><div class='ctx'> #define SW_HASH_OPTION_M		0x03</div><div class='ctx'> #define SW_HASH_OPTION_CRC		1</div><div class='hunk'>@@ -226,6 +199,7 @@</div><div class='ctx'> #define SW_PRIO_LOWEST_DA_SA		3</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_LUE_CTRL_3		0x0313</div><div class='add'>+#define SW_AGE_PERIOD_7_0_M		GENMASK(7, 0)</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_LUE_INT_STATUS		0x0314</div><div class='ctx'> #define REG_SW_LUE_INT_ENABLE		0x0315</div><div class='hunk'>@@ -265,8 +239,8 @@</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_MAC_CTRL_1		0x0331</div><div class='ctx'> </div><div class='del'>-#define MULTICAST_STORM_DISABLE		BIT(6)</div><div class='ctx'> #define SW_BACK_PRESSURE		BIT(5)</div><div class='add'>+#define SW_BACK_PRESSURE_COLLISION	0</div><div class='ctx'> #define FAIR_FLOW_CTRL			BIT(4)</div><div class='ctx'> #define NO_EXC_COLLISION_DROP		BIT(3)</div><div class='ctx'> #define SW_JUMBO_PACKET			BIT(2)</div><div class='hunk'>@@ -276,13 +250,9 @@</div><div class='ctx'> #define REG_SW_MAC_CTRL_2		0x0332</div><div class='ctx'> </div><div class='ctx'> #define SW_REPLACE_VID			BIT(3)</div><div class='del'>-#define BROADCAST_STORM_RATE_HI		0x07</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_MAC_CTRL_3		0x0333</div><div class='ctx'> </div><div class='del'>-#define BROADCAST_STORM_RATE_LO		0xFF</div><div class='del'>-#define BROADCAST_STORM_RATE		0x07FF</div><div class='del'>-</div><div class='ctx'> #define REG_SW_MAC_CTRL_4		0x0334</div><div class='ctx'> </div><div class='ctx'> #define SW_PASS_PAUSE			BIT(3)</div><div class='hunk'>@@ -425,12 +395,8 @@</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_ALU_STAT_CTRL__4		0x041C</div><div class='ctx'> </div><div class='del'>-#define ALU_STAT_INDEX_M		(BIT(4) - 1)</div><div class='del'>-#define ALU_STAT_INDEX_S		16</div><div class='ctx'> #define ALU_RESV_MCAST_INDEX_M		(BIT(6) - 1)</div><div class='ctx'> #define ALU_STAT_START			BIT(7)</div><div class='del'>-#define ALU_RESV_MCAST_ADDR		BIT(1)</div><div class='del'>-#define ALU_STAT_READ			BIT(0)</div><div class='ctx'> </div><div class='ctx'> #define REG_SW_ALU_VAL_A		0x0420</div><div class='ctx'> </div><div class='hunk'>@@ -833,13 +799,6 @@</div><div class='ctx'> #define REG_PORT_AVB_SR_1_TYPE		0x0008</div><div class='ctx'> #define REG_PORT_AVB_SR_2_TYPE		0x000A</div><div class='ctx'> </div><div class='del'>-#define REG_PORT_PME_STATUS		0x0013</div><div class='del'>-#define REG_PORT_PME_CTRL		0x0017</div><div class='del'>-</div><div class='del'>-#define PME_WOL_MAGICPKT		BIT(2)</div><div class='del'>-#define PME_WOL_LINKUP			BIT(1)</div><div class='del'>-#define PME_WOL_ENERGY			BIT(0)</div><div class='del'>-</div><div class='ctx'> #define REG_PORT_INT_STATUS		0x001B</div><div class='ctx'> #define REG_PORT_INT_MASK		0x001F</div><div class='ctx'> </div><div class='hunk'>@@ -857,7 +816,11 @@</div><div class='ctx'> #define PORT_FORCE_TX_FLOW_CTRL		BIT(4)</div><div class='ctx'> #define PORT_FORCE_RX_FLOW_CTRL		BIT(3)</div><div class='ctx'> #define PORT_TAIL_TAG_ENABLE		BIT(2)</div><div class='del'>-#define PORT_QUEUE_SPLIT_ENABLE		0x3</div><div class='add'>+#define PORT_QUEUE_SPLIT_MASK		GENMASK(1, 0)</div><div class='add'>+#define PORT_EIGHT_QUEUE		0x3</div><div class='add'>+#define PORT_FOUR_QUEUE			0x2</div><div class='add'>+#define PORT_TWO_QUEUE			0x1</div><div class='add'>+#define PORT_SINGLE_QUEUE		0x0</div><div class='ctx'> </div><div class='ctx'> #define REG_PORT_CTRL_1			0x0021</div><div class='ctx'> </div><div class='hunk'>@@ -865,8 +828,8 @@</div><div class='ctx'> </div><div class='ctx'> #define REG_PORT_STATUS_0		0x0030</div><div class='ctx'> </div><div class='del'>-#define PORT_INTF_SPEED_M		0x3</div><div class='del'>-#define PORT_INTF_SPEED_S		3</div><div class='add'>+#define PORT_INTF_SPEED_MASK		GENMASK(4, 3)</div><div class='add'>+#define PORT_INTF_SPEED_NONE		GENMASK(1, 0)</div><div class='ctx'> #define PORT_INTF_FULL_DUPLEX		BIT(2)</div><div class='ctx'> #define PORT_TX_FLOW_CTRL		BIT(1)</div><div class='ctx'> #define PORT_RX_FLOW_CTRL		BIT(0)</div><div class='hunk'>@@ -1184,35 +1147,16 @@</div><div class='ctx'> #define PORT_LINK_STATUS_FAIL		BIT(0)</div><div class='ctx'> </div><div class='ctx'> /* 3 - xMII */</div><div class='del'>-#define REG_PORT_XMII_CTRL_0		0x0300</div><div class='del'>-</div><div class='ctx'> #define PORT_SGMII_SEL			BIT(7)</div><div class='del'>-#define PORT_MII_FULL_DUPLEX		BIT(6)</div><div class='del'>-#define PORT_MII_100MBIT		BIT(4)</div><div class='ctx'> #define PORT_GRXC_ENABLE		BIT(0)</div><div class='ctx'> </div><div class='del'>-#define REG_PORT_XMII_CTRL_1		0x0301</div><div class='del'>-</div><div class='ctx'> #define PORT_RMII_CLK_SEL		BIT(7)</div><div class='del'>-/* S1 */</div><div class='del'>-#define PORT_MII_1000MBIT_S1		BIT(6)</div><div class='del'>-/* S2 */</div><div class='del'>-#define PORT_MII_NOT_1GBIT		BIT(6)</div><div class='ctx'> #define PORT_MII_SEL_EDGE		BIT(5)</div><div class='del'>-#define PORT_RGMII_ID_IG_ENABLE		BIT(4)</div><div class='del'>-#define PORT_RGMII_ID_EG_ENABLE		BIT(3)</div><div class='del'>-#define PORT_MII_MAC_MODE		BIT(2)</div><div class='del'>-#define PORT_MII_SEL_M			0x3</div><div class='del'>-/* S1 */</div><div class='del'>-#define PORT_MII_SEL_S1			0x0</div><div class='del'>-#define PORT_RMII_SEL_S1		0x1</div><div class='del'>-#define PORT_GMII_SEL_S1		0x2</div><div class='del'>-#define PORT_RGMII_SEL_S1		0x3</div><div class='del'>-/* S2 */</div><div class='del'>-#define PORT_RGMII_SEL			0x0</div><div class='del'>-#define PORT_RMII_SEL			0x1</div><div class='del'>-#define PORT_GMII_SEL			0x2</div><div class='del'>-#define PORT_MII_SEL			0x3</div><div class='add'>+</div><div class='add'>+#define REG_PMAVBC			0x03AC</div><div class='add'>+</div><div class='add'>+#define PMAVBC_MASK			GENMASK(26, 16)</div><div class='add'>+#define PMAVBC_MIN			0x580</div><div class='ctx'> </div><div class='ctx'> /* 4 - MAC */</div><div class='ctx'> #define REG_PORT_MAC_CTRL_0		0x0400</div><div class='hunk'>@@ -1268,8 +1212,6 @@</div><div class='ctx'> /* 5 - MIB Counters */</div><div class='ctx'> #define REG_PORT_MIB_CTRL_STAT__4	0x0500</div><div class='ctx'> </div><div class='del'>-#define MIB_COUNTER_OVERFLOW		BIT(31)</div><div class='del'>-#define MIB_COUNTER_VALID		BIT(30)</div><div class='ctx'> #define MIB_COUNTER_READ		BIT(25)</div><div class='ctx'> #define MIB_COUNTER_FLUSH_FREEZE	BIT(24)</div><div class='ctx'> #define MIB_COUNTER_INDEX_M		(BIT(8) - 1)</div><div class='hunk'>@@ -1513,33 +1455,10 @@</div><div class='ctx'> </div><div class='ctx'> /* 9 - Shaping */</div><div class='ctx'> </div><div class='del'>-#define REG_PORT_MTI_QUEUE_INDEX__4	0x0900</div><div class='del'>-</div><div class='del'>-#define REG_PORT_MTI_QUEUE_CTRL_0__4	0x0904</div><div class='del'>-</div><div class='del'>-#define MTI_PVID_REPLACE		BIT(0)</div><div class='del'>-</div><div class='del'>-#define REG_PORT_MTI_QUEUE_CTRL_0	0x0914</div><div class='add'>+#define REG_PORT_MTI_QUEUE_CTRL_0__4   0x0904</div><div class='ctx'> </div><div class='del'>-#define MTI_SCHEDULE_MODE_M		0x3</div><div class='del'>-#define MTI_SCHEDULE_MODE_S		6</div><div class='del'>-#define MTI_SCHEDULE_STRICT_PRIO	0</div><div class='del'>-#define MTI_SCHEDULE_WRR		2</div><div class='del'>-#define MTI_SHAPING_M			0x3</div><div class='del'>-#define MTI_SHAPING_S			4</div><div class='del'>-#define MTI_SHAPING_OFF			0</div><div class='del'>-#define MTI_SHAPING_SRP			1</div><div class='del'>-#define MTI_SHAPING_TIME_AWARE		2</div><div class='add'>+#define MTI_PVID_REPLACE               BIT(0)</div><div class='ctx'> </div><div class='del'>-#define REG_PORT_MTI_QUEUE_CTRL_1	0x0915</div><div class='del'>-</div><div class='del'>-#define MTI_TX_RATIO_M			(BIT(7) - 1)</div><div class='del'>-</div><div class='del'>-#define REG_PORT_MTI_QUEUE_CTRL_2__2	0x0916</div><div class='del'>-#define REG_PORT_MTI_HI_WATER_MARK	0x0916</div><div class='del'>-#define REG_PORT_MTI_QUEUE_CTRL_3__2	0x0918</div><div class='del'>-#define REG_PORT_MTI_LO_WATER_MARK	0x0918</div><div class='del'>-#define REG_PORT_MTI_QUEUE_CTRL_4__2	0x091A</div><div class='ctx'> #define REG_PORT_MTI_CREDIT_INCREMENT	0x091A</div><div class='ctx'> </div><div class='ctx'> /* A - QM */</div><div class='hunk'>@@ -1566,6 +1485,7 @@</div><div class='ctx'> </div><div class='ctx'> #define PORT_QM_TX_CNT_USED_S		0</div><div class='ctx'> #define PORT_QM_TX_CNT_M		(BIT(11) - 1)</div><div class='add'>+#define PORT_QM_TX_CNT_MAX		0x200</div><div class='ctx'> </div><div class='ctx'> #define REG_PORT_QM_TX_CNT_1__4		0x0A14</div><div class='ctx'> </div><div class='hunk'>@@ -1585,10 +1505,6 @@</div><div class='ctx'> </div><div class='ctx'> #define REG_PORT_LUE_MSTP_STATE		0x0B04</div><div class='ctx'> </div><div class='del'>-#define PORT_TX_ENABLE			BIT(2)</div><div class='del'>-#define PORT_RX_ENABLE			BIT(1)</div><div class='del'>-#define PORT_LEARN_DISABLE		BIT(0)</div><div class='del'>-</div><div class='ctx'> /* C - PTP */</div><div class='ctx'> </div><div class='ctx'> #define REG_PTP_PORT_RX_DELAY__2	0x0C00</div><div class='hunk'>@@ -1632,11 +1548,7 @@</div><div class='ctx'> #define P_BCAST_STORM_CTRL		REG_PORT_MAC_CTRL_0</div><div class='ctx'> #define P_PRIO_CTRL			REG_PORT_MRI_PRIO_CTRL</div><div class='ctx'> #define P_MIRROR_CTRL			REG_PORT_MRI_MIRROR_CTRL</div><div class='del'>-#define P_STP_CTRL			REG_PORT_LUE_MSTP_STATE</div><div class='ctx'> #define P_PHY_CTRL			REG_PORT_PHY_CTRL</div><div class='del'>-#define P_NEG_RESTART_CTRL		REG_PORT_PHY_CTRL</div><div class='del'>-#define P_LINK_STATUS			REG_PORT_PHY_STATUS</div><div class='del'>-#define P_SPEED_STATUS			REG_PORT_PHY_PHY_CTRL</div><div class='ctx'> #define P_RATE_LIMIT_CTRL		REG_PORT_MAC_IN_RATE_LIMIT</div><div class='ctx'> </div><div class='ctx'> #define S_LINK_AGING_CTRL		REG_SW_LUE_CTRL_1</div><div class='hunk'>@@ -1656,10 +1568,4 @@</div><div class='ctx'> #define PTP_TRIG_UNIT_M			(BIT(MAX_TRIG_UNIT) - 1)</div><div class='ctx'> #define PTP_TS_UNIT_M			(BIT(MAX_TIMESTAMP_UNIT) - 1)</div><div class='ctx'> </div><div class='del'>-/* Driver set switch broadcast storm protection at 10% rate. */</div><div class='del'>-#define BROADCAST_STORM_PROT_RATE	10</div><div class='del'>-</div><div class='del'>-/* 148,800 frames * 67 ms / 100 */</div><div class='del'>-#define BROADCAST_STORM_VALUE		9969</div><div class='del'>-</div><div class='ctx'> #endif /* KSZ9477_REGS_H */</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477_spi.c b/drivers/net/dsa/microchip/ksz9477_spi.c<br/>deleted file mode 100644<br/>index 75178624d3f5..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477_spi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz9477_spi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Microchip KSZ9477 series register access through SPI</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017-2019 Microchip Technology Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/spi/spi.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ksz_priv.h"</div><div class='del'>-#include "ksz_spi.h"</div><div class='del'>-</div><div class='del'>-/* SPI frame opcodes */</div><div class='del'>-#define KS_SPIOP_RD			3</div><div class='del'>-#define KS_SPIOP_WR			2</div><div class='del'>-</div><div class='del'>-#define SPI_ADDR_SHIFT			24</div><div class='del'>-#define SPI_ADDR_MASK			(BIT(SPI_ADDR_SHIFT) - 1)</div><div class='del'>-#define SPI_TURNAROUND_SHIFT		5</div><div class='del'>-</div><div class='del'>-/* Enough to read all switch port registers. */</div><div class='del'>-#define SPI_TX_BUF_LEN			0x100</div><div class='del'>-</div><div class='del'>-static int ksz9477_spi_read_reg(struct spi_device *spi, u32 reg, u8 *val,</div><div class='del'>-				unsigned int len)</div><div class='del'>-{</div><div class='del'>-	u32 txbuf;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	txbuf = reg &amp; SPI_ADDR_MASK;</div><div class='del'>-	txbuf |= KS_SPIOP_RD &lt;&lt; SPI_ADDR_SHIFT;</div><div class='del'>-	txbuf &lt;&lt;= SPI_TURNAROUND_SHIFT;</div><div class='del'>-	txbuf = cpu_to_be32(txbuf);</div><div class='del'>-</div><div class='del'>-	ret = spi_write_then_read(spi, &amp;txbuf, 4, val, len);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz9477_spi_write_reg(struct spi_device *spi, u32 reg, u8 *val,</div><div class='del'>-				 unsigned int len)</div><div class='del'>-{</div><div class='del'>-	u32 *txbuf = (u32 *)val;</div><div class='del'>-</div><div class='del'>-	*txbuf = reg &amp; SPI_ADDR_MASK;</div><div class='del'>-	*txbuf |= (KS_SPIOP_WR &lt;&lt; SPI_ADDR_SHIFT);</div><div class='del'>-	*txbuf &lt;&lt;= SPI_TURNAROUND_SHIFT;</div><div class='del'>-	*txbuf = cpu_to_be32(*txbuf);</div><div class='del'>-</div><div class='del'>-	return spi_write(spi, txbuf, 4 + len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_read(struct ksz_device *dev, u32 reg, u8 *data,</div><div class='del'>-			unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct spi_device *spi = dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return ksz9477_spi_read_reg(spi, reg, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_write(struct ksz_device *dev, u32 reg, void *data,</div><div class='del'>-			 unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct spi_device *spi = dev-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (len &gt; SPI_TX_BUF_LEN)</div><div class='del'>-		len = SPI_TX_BUF_LEN;</div><div class='del'>-	memcpy(&amp;dev-&gt;txbuf[4], data, len);</div><div class='del'>-	return ksz9477_spi_write_reg(spi, reg, dev-&gt;txbuf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_read24(struct ksz_device *dev, u32 reg, u32 *val)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	*val = 0;</div><div class='del'>-	ret = ksz_spi_read(dev, reg, (u8 *)val, 3);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		*val = be32_to_cpu(*val);</div><div class='del'>-		/* convert to 24bit */</div><div class='del'>-		*val &gt;&gt;= 8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_write24(struct ksz_device *dev, u32 reg, u32 value)</div><div class='del'>-{</div><div class='del'>-	/* make it to big endian 24bit from MSB */</div><div class='del'>-	value &lt;&lt;= 8;</div><div class='del'>-	value = cpu_to_be32(value);</div><div class='del'>-	return ksz_spi_write(dev, reg, &amp;value, 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct ksz_io_ops ksz9477_spi_ops = {</div><div class='del'>-	.read8 = ksz_spi_read8,</div><div class='del'>-	.read16 = ksz_spi_read16,</div><div class='del'>-	.read24 = ksz_spi_read24,</div><div class='del'>-	.read32 = ksz_spi_read32,</div><div class='del'>-	.write8 = ksz_spi_write8,</div><div class='del'>-	.write16 = ksz_spi_write16,</div><div class='del'>-	.write24 = ksz_spi_write24,</div><div class='del'>-	.write32 = ksz_spi_write32,</div><div class='del'>-	.get = ksz_spi_get,</div><div class='del'>-	.set = ksz_spi_set,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int ksz9477_spi_probe(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct ksz_device *dev;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev = ksz_switch_alloc(&amp;spi-&gt;dev, &amp;ksz9477_spi_ops, spi);</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	if (spi-&gt;dev.platform_data)</div><div class='del'>-		dev-&gt;pdata = spi-&gt;dev.platform_data;</div><div class='del'>-</div><div class='del'>-	dev-&gt;txbuf = devm_kzalloc(dev-&gt;dev, 4 + SPI_TX_BUF_LEN, GFP_KERNEL);</div><div class='del'>-</div><div class='del'>-	ret = ksz9477_switch_register(dev);</div><div class='del'>-</div><div class='del'>-	/* Main DSA driver may not be started yet. */</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	spi_set_drvdata(spi, dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz9477_spi_remove(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct ksz_device *dev = spi_get_drvdata(spi);</div><div class='del'>-</div><div class='del'>-	if (dev)</div><div class='del'>-		ksz_switch_remove(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ksz9477_spi_shutdown(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct ksz_device *dev = spi_get_drvdata(spi);</div><div class='del'>-</div><div class='del'>-	if (dev &amp;&amp; dev-&gt;dev_ops-&gt;shutdown)</div><div class='del'>-		dev-&gt;dev_ops-&gt;shutdown(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id ksz9477_dt_ids[] = {</div><div class='del'>-	{ .compatible = "microchip,ksz9477" },</div><div class='del'>-	{ .compatible = "microchip,ksz9897" },</div><div class='del'>-	{ .compatible = "microchip,ksz9893" },</div><div class='del'>-	{ .compatible = "microchip,ksz9563" },</div><div class='del'>-	{},</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, ksz9477_dt_ids);</div><div class='del'>-</div><div class='del'>-static struct spi_driver ksz9477_spi_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name	= "ksz9477-switch",</div><div class='del'>-		.owner	= THIS_MODULE,</div><div class='del'>-		.of_match_table = of_match_ptr(ksz9477_dt_ids),</div><div class='del'>-	},</div><div class='del'>-	.probe	= ksz9477_spi_probe,</div><div class='del'>-	.remove	= ksz9477_spi_remove,</div><div class='del'>-	.shutdown = ksz9477_spi_shutdown,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_spi_driver(ksz9477_spi_driver);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Woojung Huh &lt;Woojung.Huh@microchip.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Microchip KSZ9477 Series Switch SPI access Driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz9477_tc_flower.c b/drivers/net/dsa/microchip/ksz9477_tc_flower.c<br/>new file mode 100644<br/>index 000000000000..ca7830ab168a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz9477_tc_flower.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz9477_tc_flower.c</a></div><div class='hunk'>@@ -0,0 +1,284 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2023 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz9477.h"</div><div class='add'>+#include "ksz9477_reg.h"</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+#define ETHER_TYPE_FULL_MASK		cpu_to_be16(~0)</div><div class='add'>+#define KSZ9477_MAX_TC			7</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_flower_parse_key_l2 - Parse Layer 2 key from flow rule and configure</div><div class='add'>+ *                               ACL entries accordingly.</div><div class='add'>+ * @dev: Pointer to the ksz_device.</div><div class='add'>+ * @port: Port number.</div><div class='add'>+ * @extack: Pointer to the netlink_ext_ack.</div><div class='add'>+ * @rule: Pointer to the flow_rule.</div><div class='add'>+ * @cookie: The cookie to associate with the entry.</div><div class='add'>+ * @prio: The priority of the entry.</div><div class='add'>+ *</div><div class='add'>+ * This function parses the Layer 2 key from the flow rule and configures</div><div class='add'>+ * the corresponding ACL entries. It checks for unsupported offloads and</div><div class='add'>+ * available entries before proceeding with the configuration.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_flower_parse_key_l2(struct ksz_device *dev, int port,</div><div class='add'>+				       struct netlink_ext_ack *extack,</div><div class='add'>+				       struct flow_rule *rule,</div><div class='add'>+				       unsigned long cookie, u32 prio)</div><div class='add'>+{</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	struct flow_match_eth_addrs ematch;</div><div class='add'>+	struct ksz9477_acl_entries *acles;</div><div class='add'>+	int required_entries;</div><div class='add'>+	u8 *src_mac = NULL;</div><div class='add'>+	u8 *dst_mac = NULL;</div><div class='add'>+	u16 ethtype = 0;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='add'>+		struct flow_match_basic match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_basic(rule, &amp;match);</div><div class='add'>+</div><div class='add'>+		if (match.key-&gt;n_proto) {</div><div class='add'>+			if (match.mask-&gt;n_proto != ETHER_TYPE_FULL_MASK) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "ethernet type mask must be a full mask");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ethtype = be16_to_cpu(match.key-&gt;n_proto);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='add'>+		flow_rule_match_eth_addrs(rule, &amp;ematch);</div><div class='add'>+</div><div class='add'>+		if (!is_zero_ether_addr(ematch.key-&gt;src)) {</div><div class='add'>+			if (!is_broadcast_ether_addr(ematch.mask-&gt;src))</div><div class='add'>+				goto not_full_mask_err;</div><div class='add'>+</div><div class='add'>+			src_mac = ematch.key-&gt;src;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!is_zero_ether_addr(ematch.key-&gt;dst)) {</div><div class='add'>+			if (!is_broadcast_ether_addr(ematch.mask-&gt;dst))</div><div class='add'>+				goto not_full_mask_err;</div><div class='add'>+</div><div class='add'>+			dst_mac = ematch.key-&gt;dst;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acles = &amp;acl-&gt;acles;</div><div class='add'>+	/* ACL supports only one MAC per entry */</div><div class='add'>+	required_entries = src_mac &amp;&amp; dst_mac ? 2 : 1;</div><div class='add'>+</div><div class='add'>+	/* Check if there are enough available entries */</div><div class='add'>+	if (acles-&gt;entries_count + required_entries &gt; KSZ9477_ACL_MAX_ENTRIES) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "ACL entry limit reached");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz9477_acl_match_process_l2(dev, port, ethtype, src_mac, dst_mac,</div><div class='add'>+				     cookie, prio);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+not_full_mask_err:</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "MAC address mask must be a full mask");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_flower_parse_key - Parse flow rule keys for a specified port on a</div><div class='add'>+ *			      ksz_device.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to parse the flow rule keys for.</div><div class='add'>+ * @extack: The netlink extended ACK for reporting errors.</div><div class='add'>+ * @rule: The flow_rule to parse.</div><div class='add'>+ * @cookie: The cookie to associate with the entry.</div><div class='add'>+ * @prio: The priority of the entry.</div><div class='add'>+ *</div><div class='add'>+ * This function checks if the used keys in the flow rule are supported by</div><div class='add'>+ * the device and parses the L2 keys if they match. If unsupported keys are</div><div class='add'>+ * used, an error message is set in the extended ACK.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_flower_parse_key(struct ksz_device *dev, int port,</div><div class='add'>+				    struct netlink_ext_ack *extack,</div><div class='add'>+				    struct flow_rule *rule,</div><div class='add'>+				    unsigned long cookie, u32 prio)</div><div class='add'>+{</div><div class='add'>+	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dissector-&gt;used_keys &amp;</div><div class='add'>+	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Unsupported keys used");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_has_control_flags(rule, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC) ||</div><div class='add'>+	    flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='add'>+		ret = ksz9477_flower_parse_key_l2(dev, port, extack, rule,</div><div class='add'>+						  cookie, prio);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_flower_parse_action - Parse flow rule actions for a specified port</div><div class='add'>+ *				 on a ksz_device.</div><div class='add'>+ * @dev: The ksz_device instance.</div><div class='add'>+ * @port: The port number to parse the flow rule actions for.</div><div class='add'>+ * @extack: The netlink extended ACK for reporting errors.</div><div class='add'>+ * @cls: The flow_cls_offload instance containing the flow rule.</div><div class='add'>+ * @entry_idx: The index of the ACL entry to store the action.</div><div class='add'>+ *</div><div class='add'>+ * This function checks if the actions in the flow rule are supported by</div><div class='add'>+ * the device. Currently, only actions that change priorities are supported.</div><div class='add'>+ * If unsupported actions are encountered, an error message is set in the</div><div class='add'>+ * extended ACK.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_flower_parse_action(struct ksz_device *dev, int port,</div><div class='add'>+				       struct netlink_ext_ack *extack,</div><div class='add'>+				       struct flow_cls_offload *cls,</div><div class='add'>+				       int entry_idx)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct ksz9477_acl_priv *acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+	const struct flow_action_entry *act;</div><div class='add'>+	struct ksz9477_acl_entry *entry;</div><div class='add'>+	bool prio_force = false;</div><div class='add'>+	u8 prio_val = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (TC_H_MIN(cls-&gt;classid)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "hw_tc is not supported. Use: action skbedit prio");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, act, &amp;rule-&gt;action) {</div><div class='add'>+		switch (act-&gt;id) {</div><div class='add'>+		case FLOW_ACTION_PRIORITY:</div><div class='add'>+			if (act-&gt;priority &gt; KSZ9477_MAX_TC) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "Priority value is too high");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			prio_force = true;</div><div class='add'>+			prio_val = act-&gt;priority;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "action not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* pick entry to store action */</div><div class='add'>+	entry = &amp;acl-&gt;acles.entries[entry_idx];</div><div class='add'>+</div><div class='add'>+	ksz9477_acl_action_rule_cfg(entry-&gt;entry, prio_force, prio_val);</div><div class='add'>+	ksz9477_acl_processing_rule_set_action(entry-&gt;entry, entry_idx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_cls_flower_add - Add a flow classification rule for a specified port</div><div class='add'>+ *			    on a ksz_device.</div><div class='add'>+ * @ds: The DSA switch instance.</div><div class='add'>+ * @port: The port number to add the flow classification rule to.</div><div class='add'>+ * @cls: The flow_cls_offload instance containing the flow rule.</div><div class='add'>+ * @ingress: A flag indicating if the rule is applied on the ingress path.</div><div class='add'>+ *</div><div class='add'>+ * This function adds a flow classification rule for a specified port on a</div><div class='add'>+ * ksz_device. It checks if the ACL offloading is supported and parses the flow</div><div class='add'>+ * keys and actions. If the ACL is not supported, it returns an error. If there</div><div class='add'>+ * are unprocessed entries, it parses the action for the rule.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz9477_cls_flower_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz9477_acl_priv *acl;</div><div class='add'>+	int action_entry_idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+</div><div class='add'>+	if (!acl) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "ACL offloading is not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* A complex rule set can take multiple entries. Use first entry</div><div class='add'>+	 * to store the action.</div><div class='add'>+	 */</div><div class='add'>+	action_entry_idx = acl-&gt;acles.entries_count;</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_flower_parse_key(dev, port, extack, rule, cls-&gt;cookie,</div><div class='add'>+				       cls-&gt;common.prio);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_flower_parse_action(dev, port, extack, cls,</div><div class='add'>+					  action_entry_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz9477_sort_acl_entries(dev, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz9477_acl_write_list(dev, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_cls_flower_del - Remove a flow classification rule for a specified</div><div class='add'>+ *			    port on a ksz_device.</div><div class='add'>+ * @ds: The DSA switch instance.</div><div class='add'>+ * @port: The port number to remove the flow classification rule from.</div><div class='add'>+ * @cls: The flow_cls_offload instance containing the flow rule.</div><div class='add'>+ * @ingress: A flag indicating if the rule is applied on the ingress path.</div><div class='add'>+ *</div><div class='add'>+ * This function removes a flow classification rule for a specified port on a</div><div class='add'>+ * ksz_device. It checks if the ACL is initialized, and if not, returns an</div><div class='add'>+ * error. If the ACL is initialized, it removes entries with the specified</div><div class='add'>+ * cookie and rewrites the ACL list.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 on success or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz9477_cls_flower_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	unsigned long cookie = cls-&gt;cookie;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz9477_acl_priv *acl;</div><div class='add'>+</div><div class='add'>+	acl = dev-&gt;ports[port].acl_priv;</div><div class='add'>+</div><div class='add'>+	if (!acl)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ksz9477_acl_remove_entries(dev, port, &amp;acl-&gt;acles, cookie);</div><div class='add'>+</div><div class='add'>+	return ksz9477_acl_write_list(dev, port);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c<br/>index 39dace8e3512..0c10351fe5eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_common.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_common.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_common.c</a></div><div class='hunk'>@@ -2,10 +2,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Microchip switch driver main logic</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2017-2019 Microchip Technology Inc.</div><div class='add'>+ * Copyright (C) 2017-2025 Microchip Technology Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/dsa/ksz_common.h&gt;</div><div class='ctx'> #include &lt;linux/export.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -14,41 +15,3103 @@</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/micrel_phy.h&gt;</div><div class='add'>+#include &lt;linux/pinctrl/consumer.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/ieee8021q.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;net/switchdev.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "ksz_priv.h"</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+#include "ksz_dcb.h"</div><div class='add'>+#include "ksz_ptp.h"</div><div class='add'>+#include "ksz8.h"</div><div class='add'>+#include "ksz9477.h"</div><div class='add'>+#include "lan937x.h"</div><div class='ctx'> </div><div class='del'>-void ksz_port_cleanup(struct ksz_device *dev, int port)</div><div class='add'>+#define MIB_COUNTER_NUM 0x20</div><div class='add'>+</div><div class='add'>+struct ksz_stats_raw {</div><div class='add'>+	u64 rx_hi;</div><div class='add'>+	u64 rx_undersize;</div><div class='add'>+	u64 rx_fragments;</div><div class='add'>+	u64 rx_oversize;</div><div class='add'>+	u64 rx_jabbers;</div><div class='add'>+	u64 rx_symbol_err;</div><div class='add'>+	u64 rx_crc_err;</div><div class='add'>+	u64 rx_align_err;</div><div class='add'>+	u64 rx_mac_ctrl;</div><div class='add'>+	u64 rx_pause;</div><div class='add'>+	u64 rx_bcast;</div><div class='add'>+	u64 rx_mcast;</div><div class='add'>+	u64 rx_ucast;</div><div class='add'>+	u64 rx_64_or_less;</div><div class='add'>+	u64 rx_65_127;</div><div class='add'>+	u64 rx_128_255;</div><div class='add'>+	u64 rx_256_511;</div><div class='add'>+	u64 rx_512_1023;</div><div class='add'>+	u64 rx_1024_1522;</div><div class='add'>+	u64 rx_1523_2000;</div><div class='add'>+	u64 rx_2001;</div><div class='add'>+	u64 tx_hi;</div><div class='add'>+	u64 tx_late_col;</div><div class='add'>+	u64 tx_pause;</div><div class='add'>+	u64 tx_bcast;</div><div class='add'>+	u64 tx_mcast;</div><div class='add'>+	u64 tx_ucast;</div><div class='add'>+	u64 tx_deferred;</div><div class='add'>+	u64 tx_total_col;</div><div class='add'>+	u64 tx_exc_col;</div><div class='add'>+	u64 tx_single_col;</div><div class='add'>+	u64 tx_mult_col;</div><div class='add'>+	u64 rx_total;</div><div class='add'>+	u64 tx_total;</div><div class='add'>+	u64 rx_discards;</div><div class='add'>+	u64 tx_discards;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz88xx_stats_raw {</div><div class='add'>+	u64 rx;</div><div class='add'>+	u64 rx_hi;</div><div class='add'>+	u64 rx_undersize;</div><div class='add'>+	u64 rx_fragments;</div><div class='add'>+	u64 rx_oversize;</div><div class='add'>+	u64 rx_jabbers;</div><div class='add'>+	u64 rx_symbol_err;</div><div class='add'>+	u64 rx_crc_err;</div><div class='add'>+	u64 rx_align_err;</div><div class='add'>+	u64 rx_mac_ctrl;</div><div class='add'>+	u64 rx_pause;</div><div class='add'>+	u64 rx_bcast;</div><div class='add'>+	u64 rx_mcast;</div><div class='add'>+	u64 rx_ucast;</div><div class='add'>+	u64 rx_64_or_less;</div><div class='add'>+	u64 rx_65_127;</div><div class='add'>+	u64 rx_128_255;</div><div class='add'>+	u64 rx_256_511;</div><div class='add'>+	u64 rx_512_1023;</div><div class='add'>+	u64 rx_1024_1522;</div><div class='add'>+	u64 tx;</div><div class='add'>+	u64 tx_hi;</div><div class='add'>+	u64 tx_late_col;</div><div class='add'>+	u64 tx_pause;</div><div class='add'>+	u64 tx_bcast;</div><div class='add'>+	u64 tx_mcast;</div><div class='add'>+	u64 tx_ucast;</div><div class='add'>+	u64 tx_deferred;</div><div class='add'>+	u64 tx_total_col;</div><div class='add'>+	u64 tx_exc_col;</div><div class='add'>+	u64 tx_single_col;</div><div class='add'>+	u64 tx_mult_col;</div><div class='add'>+	u64 rx_discards;</div><div class='add'>+	u64 tx_discards;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_mib_names ksz88xx_mib_names[] = {</div><div class='add'>+	{ 0x00, "rx" },</div><div class='add'>+	{ 0x01, "rx_hi" },</div><div class='add'>+	{ 0x02, "rx_undersize" },</div><div class='add'>+	{ 0x03, "rx_fragments" },</div><div class='add'>+	{ 0x04, "rx_oversize" },</div><div class='add'>+	{ 0x05, "rx_jabbers" },</div><div class='add'>+	{ 0x06, "rx_symbol_err" },</div><div class='add'>+	{ 0x07, "rx_crc_err" },</div><div class='add'>+	{ 0x08, "rx_align_err" },</div><div class='add'>+	{ 0x09, "rx_mac_ctrl" },</div><div class='add'>+	{ 0x0a, "rx_pause" },</div><div class='add'>+	{ 0x0b, "rx_bcast" },</div><div class='add'>+	{ 0x0c, "rx_mcast" },</div><div class='add'>+	{ 0x0d, "rx_ucast" },</div><div class='add'>+	{ 0x0e, "rx_64_or_less" },</div><div class='add'>+	{ 0x0f, "rx_65_127" },</div><div class='add'>+	{ 0x10, "rx_128_255" },</div><div class='add'>+	{ 0x11, "rx_256_511" },</div><div class='add'>+	{ 0x12, "rx_512_1023" },</div><div class='add'>+	{ 0x13, "rx_1024_1522" },</div><div class='add'>+	{ 0x14, "tx" },</div><div class='add'>+	{ 0x15, "tx_hi" },</div><div class='add'>+	{ 0x16, "tx_late_col" },</div><div class='add'>+	{ 0x17, "tx_pause" },</div><div class='add'>+	{ 0x18, "tx_bcast" },</div><div class='add'>+	{ 0x19, "tx_mcast" },</div><div class='add'>+	{ 0x1a, "tx_ucast" },</div><div class='add'>+	{ 0x1b, "tx_deferred" },</div><div class='add'>+	{ 0x1c, "tx_total_col" },</div><div class='add'>+	{ 0x1d, "tx_exc_col" },</div><div class='add'>+	{ 0x1e, "tx_single_col" },</div><div class='add'>+	{ 0x1f, "tx_mult_col" },</div><div class='add'>+	{ 0x100, "rx_discards" },</div><div class='add'>+	{ 0x101, "tx_discards" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_mib_names ksz9477_mib_names[] = {</div><div class='add'>+	{ 0x00, "rx_hi" },</div><div class='add'>+	{ 0x01, "rx_undersize" },</div><div class='add'>+	{ 0x02, "rx_fragments" },</div><div class='add'>+	{ 0x03, "rx_oversize" },</div><div class='add'>+	{ 0x04, "rx_jabbers" },</div><div class='add'>+	{ 0x05, "rx_symbol_err" },</div><div class='add'>+	{ 0x06, "rx_crc_err" },</div><div class='add'>+	{ 0x07, "rx_align_err" },</div><div class='add'>+	{ 0x08, "rx_mac_ctrl" },</div><div class='add'>+	{ 0x09, "rx_pause" },</div><div class='add'>+	{ 0x0A, "rx_bcast" },</div><div class='add'>+	{ 0x0B, "rx_mcast" },</div><div class='add'>+	{ 0x0C, "rx_ucast" },</div><div class='add'>+	{ 0x0D, "rx_64_or_less" },</div><div class='add'>+	{ 0x0E, "rx_65_127" },</div><div class='add'>+	{ 0x0F, "rx_128_255" },</div><div class='add'>+	{ 0x10, "rx_256_511" },</div><div class='add'>+	{ 0x11, "rx_512_1023" },</div><div class='add'>+	{ 0x12, "rx_1024_1522" },</div><div class='add'>+	{ 0x13, "rx_1523_2000" },</div><div class='add'>+	{ 0x14, "rx_2001" },</div><div class='add'>+	{ 0x15, "tx_hi" },</div><div class='add'>+	{ 0x16, "tx_late_col" },</div><div class='add'>+	{ 0x17, "tx_pause" },</div><div class='add'>+	{ 0x18, "tx_bcast" },</div><div class='add'>+	{ 0x19, "tx_mcast" },</div><div class='add'>+	{ 0x1A, "tx_ucast" },</div><div class='add'>+	{ 0x1B, "tx_deferred" },</div><div class='add'>+	{ 0x1C, "tx_total_col" },</div><div class='add'>+	{ 0x1D, "tx_exc_col" },</div><div class='add'>+	{ 0x1E, "tx_single_col" },</div><div class='add'>+	{ 0x1F, "tx_mult_col" },</div><div class='add'>+	{ 0x80, "rx_total" },</div><div class='add'>+	{ 0x81, "tx_total" },</div><div class='add'>+	{ 0x82, "rx_discards" },</div><div class='add'>+	{ 0x83, "tx_discards" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_driver_strength_prop {</div><div class='add'>+	const char *name;</div><div class='add'>+	int offset;</div><div class='add'>+	int value;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ksz_driver_strength_type {</div><div class='add'>+	KSZ_DRIVER_STRENGTH_HI,</div><div class='add'>+	KSZ_DRIVER_STRENGTH_LO,</div><div class='add'>+	KSZ_DRIVER_STRENGTH_IO,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct ksz_drive_strength - drive strength mapping</div><div class='add'>+ * @reg_val:	register value</div><div class='add'>+ * @microamp:	microamp value</div><div class='add'>+ */</div><div class='add'>+struct ksz_drive_strength {</div><div class='add'>+	u32 reg_val;</div><div class='add'>+	u32 microamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ksz9477_drive_strengths - Drive strength mapping for KSZ9477 variants</div><div class='add'>+ *</div><div class='add'>+ * This values are not documented in KSZ9477 variants but confirmed by</div><div class='add'>+ * Microchip that KSZ9477, KSZ9567, KSZ8567, KSZ9897, KSZ9896, KSZ9563, KSZ9893</div><div class='add'>+ * and KSZ8563 are using same register (drive strength) settings like KSZ8795.</div><div class='add'>+ *</div><div class='add'>+ * Documentation in KSZ8795CLX provides more information with some</div><div class='add'>+ * recommendations:</div><div class='add'>+ * - for high speed signals</div><div class='add'>+ *   1. 4 mA or 8 mA is often used for MII, RMII, and SPI interface with using</div><div class='add'>+ *      2.5V or 3.3V VDDIO.</div><div class='add'>+ *   2. 12 mA or 16 mA is often used for MII, RMII, and SPI interface with</div><div class='add'>+ *      using 1.8V VDDIO.</div><div class='add'>+ *   3. 20 mA or 24 mA is often used for GMII/RGMII interface with using 2.5V</div><div class='add'>+ *      or 3.3V VDDIO.</div><div class='add'>+ *   4. 28 mA is often used for GMII/RGMII interface with using 1.8V VDDIO.</div><div class='add'>+ *   5. In same interface, the heavy loading should use higher one of the</div><div class='add'>+ *      drive current strength.</div><div class='add'>+ * - for low speed signals</div><div class='add'>+ *   1. 3.3V VDDIO, use either 4 mA or 8 mA.</div><div class='add'>+ *   2. 2.5V VDDIO, use either 8 mA or 12 mA.</div><div class='add'>+ *   3. 1.8V VDDIO, use either 12 mA or 16 mA.</div><div class='add'>+ *   4. If it is heavy loading, can use higher drive current strength.</div><div class='add'>+ */</div><div class='add'>+static const struct ksz_drive_strength ksz9477_drive_strengths[] = {</div><div class='add'>+	{ SW_DRIVE_STRENGTH_2MA,  2000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_4MA,  4000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_8MA,  8000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_12MA, 12000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_16MA, 16000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_20MA, 20000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_24MA, 24000 },</div><div class='add'>+	{ SW_DRIVE_STRENGTH_28MA, 28000 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ksz88x3_drive_strengths - Drive strength mapping for KSZ8863, KSZ8873, ..</div><div class='add'>+ *			     variants.</div><div class='add'>+ * This values are documented in KSZ8873 and KSZ8863 datasheets.</div><div class='add'>+ */</div><div class='add'>+static const struct ksz_drive_strength ksz88x3_drive_strengths[] = {</div><div class='add'>+	{ 0,  8000 },</div><div class='add'>+	{ KSZ8873_DRIVE_STRENGTH_16MA, 16000 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ksz88x3_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				       unsigned int mode,</div><div class='add'>+				       const struct phylink_link_state *state);</div><div class='add'>+static void ksz_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				   unsigned int mode,</div><div class='add'>+				   const struct phylink_link_state *state);</div><div class='add'>+static void ksz_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+				      unsigned int mode,</div><div class='add'>+				      phy_interface_t interface);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_phylink_mac_disable_tx_lpi() - Callback to signal LPI support (Dummy)</div><div class='add'>+ * @config: phylink config structure</div><div class='add'>+ *</div><div class='add'>+ * This function is a dummy handler. See ksz_phylink_mac_enable_tx_lpi() for</div><div class='add'>+ * a detailed explanation of EEE/LPI handling in KSZ switches.</div><div class='add'>+ */</div><div class='add'>+static void ksz_phylink_mac_disable_tx_lpi(struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	/* Common code for port cleanup. */</div><div class='del'>-	mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	dev-&gt;on_ports &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	dev-&gt;live_ports &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_cleanup);</div><div class='ctx'> </div><div class='del'>-void ksz_update_port_member(struct ksz_device *dev, int port)</div><div class='add'>+/**</div><div class='add'>+ * ksz_phylink_mac_enable_tx_lpi() - Callback to signal LPI support (Dummy)</div><div class='add'>+ * @config: phylink config structure</div><div class='add'>+ * @timer: timer value before entering LPI (unused)</div><div class='add'>+ * @tx_clock_stop: whether to stop the TX clock in LPI mode (unused)</div><div class='add'>+ *</div><div class='add'>+ * This function signals to phylink that the driver architecture supports</div><div class='add'>+ * LPI management, enabling phylink to control EEE advertisement during</div><div class='add'>+ * negotiation according to IEEE Std 802.3 (Clause 78).</div><div class='add'>+ *</div><div class='add'>+ * Hardware Management of EEE/LPI State:</div><div class='add'>+ * For KSZ switch ports with integrated PHYs (e.g., KSZ9893R ports 1-2),</div><div class='add'>+ * observation and testing suggest that the actual EEE / Low Power Idle (LPI)</div><div class='add'>+ * state transitions are managed autonomously by the hardware based on</div><div class='add'>+ * the auto-negotiation results. (Note: While the datasheet describes EEE</div><div class='add'>+ * operation based on negotiation, it doesn't explicitly detail the internal</div><div class='add'>+ * MAC/PHY interaction, so autonomous hardware management of the MAC state</div><div class='add'>+ * for LPI is inferred from observed behavior).</div><div class='add'>+ * This hardware control, consistent with the switch's ability to operate</div><div class='add'>+ * autonomously via strapping, means MAC-level software intervention is not</div><div class='add'>+ * required or exposed for managing the LPI state once EEE is negotiated.</div><div class='add'>+ * (Ref: KSZ9893R Data Sheet DS00002420D, primarily Section 4.7.5 explaining</div><div class='add'>+ * EEE, also Sections 4.1.7 on Auto-Negotiation and 3.2.1 on Configuration</div><div class='add'>+ * Straps).</div><div class='add'>+ *</div><div class='add'>+ * Additionally, ports configured as MAC interfaces (e.g., KSZ9893R port 3)</div><div class='add'>+ * lack documented MAC-level LPI control.</div><div class='add'>+ *</div><div class='add'>+ * Therefore, this callback performs no action and serves primarily to inform</div><div class='add'>+ * phylink of LPI awareness and to document the inferred hardware behavior.</div><div class='add'>+ *</div><div class='add'>+ * Returns: 0 (Always success)</div><div class='add'>+ */</div><div class='add'>+static int ksz_phylink_mac_enable_tx_lpi(struct phylink_config *config,</div><div class='add'>+					 u32 timer, bool tx_clock_stop)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops ksz88x3_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= ksz88x3_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= ksz_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= ksz8_phylink_mac_link_up,</div><div class='add'>+	.mac_disable_tx_lpi = ksz_phylink_mac_disable_tx_lpi,</div><div class='add'>+	.mac_enable_tx_lpi = ksz_phylink_mac_enable_tx_lpi,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops ksz8_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= ksz_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= ksz_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= ksz8_phylink_mac_link_up,</div><div class='add'>+	.mac_disable_tx_lpi = ksz_phylink_mac_disable_tx_lpi,</div><div class='add'>+	.mac_enable_tx_lpi = ksz_phylink_mac_enable_tx_lpi,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_dev_ops ksz8463_dev_ops = {</div><div class='add'>+	.setup = ksz8_setup,</div><div class='add'>+	.get_port_addr = ksz8463_get_port_addr,</div><div class='add'>+	.cfg_port_member = ksz8_cfg_port_member,</div><div class='add'>+	.flush_dyn_mac_table = ksz8_flush_dyn_mac_table,</div><div class='add'>+	.port_setup = ksz8_port_setup,</div><div class='add'>+	.r_phy = ksz8463_r_phy,</div><div class='add'>+	.w_phy = ksz8463_w_phy,</div><div class='add'>+	.r_mib_cnt = ksz8_r_mib_cnt,</div><div class='add'>+	.r_mib_pkt = ksz8_r_mib_pkt,</div><div class='add'>+	.r_mib_stat64 = ksz88xx_r_mib_stats64,</div><div class='add'>+	.freeze_mib = ksz8_freeze_mib,</div><div class='add'>+	.port_init_cnt = ksz8_port_init_cnt,</div><div class='add'>+	.fdb_dump = ksz8_fdb_dump,</div><div class='add'>+	.fdb_add = ksz8_fdb_add,</div><div class='add'>+	.fdb_del = ksz8_fdb_del,</div><div class='add'>+	.mdb_add = ksz8_mdb_add,</div><div class='add'>+	.mdb_del = ksz8_mdb_del,</div><div class='add'>+	.vlan_filtering = ksz8_port_vlan_filtering,</div><div class='add'>+	.vlan_add = ksz8_port_vlan_add,</div><div class='add'>+	.vlan_del = ksz8_port_vlan_del,</div><div class='add'>+	.mirror_add = ksz8_port_mirror_add,</div><div class='add'>+	.mirror_del = ksz8_port_mirror_del,</div><div class='add'>+	.get_caps = ksz8_get_caps,</div><div class='add'>+	.config_cpu_port = ksz8_config_cpu_port,</div><div class='add'>+	.enable_stp_addr = ksz8_enable_stp_addr,</div><div class='add'>+	.reset = ksz8_reset_switch,</div><div class='add'>+	.init = ksz8_switch_init,</div><div class='add'>+	.exit = ksz8_switch_exit,</div><div class='add'>+	.change_mtu = ksz8_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_dev_ops ksz88xx_dev_ops = {</div><div class='add'>+	.setup = ksz8_setup,</div><div class='add'>+	.get_port_addr = ksz8_get_port_addr,</div><div class='add'>+	.cfg_port_member = ksz8_cfg_port_member,</div><div class='add'>+	.flush_dyn_mac_table = ksz8_flush_dyn_mac_table,</div><div class='add'>+	.port_setup = ksz8_port_setup,</div><div class='add'>+	.r_phy = ksz8_r_phy,</div><div class='add'>+	.w_phy = ksz8_w_phy,</div><div class='add'>+	.r_mib_cnt = ksz8_r_mib_cnt,</div><div class='add'>+	.r_mib_pkt = ksz8_r_mib_pkt,</div><div class='add'>+	.r_mib_stat64 = ksz88xx_r_mib_stats64,</div><div class='add'>+	.freeze_mib = ksz8_freeze_mib,</div><div class='add'>+	.port_init_cnt = ksz8_port_init_cnt,</div><div class='add'>+	.fdb_dump = ksz8_fdb_dump,</div><div class='add'>+	.fdb_add = ksz8_fdb_add,</div><div class='add'>+	.fdb_del = ksz8_fdb_del,</div><div class='add'>+	.mdb_add = ksz8_mdb_add,</div><div class='add'>+	.mdb_del = ksz8_mdb_del,</div><div class='add'>+	.vlan_filtering = ksz8_port_vlan_filtering,</div><div class='add'>+	.vlan_add = ksz8_port_vlan_add,</div><div class='add'>+	.vlan_del = ksz8_port_vlan_del,</div><div class='add'>+	.mirror_add = ksz8_port_mirror_add,</div><div class='add'>+	.mirror_del = ksz8_port_mirror_del,</div><div class='add'>+	.get_caps = ksz8_get_caps,</div><div class='add'>+	.config_cpu_port = ksz8_config_cpu_port,</div><div class='add'>+	.enable_stp_addr = ksz8_enable_stp_addr,</div><div class='add'>+	.reset = ksz8_reset_switch,</div><div class='add'>+	.init = ksz8_switch_init,</div><div class='add'>+	.exit = ksz8_switch_exit,</div><div class='add'>+	.change_mtu = ksz8_change_mtu,</div><div class='add'>+	.pme_write8 = ksz8_pme_write8,</div><div class='add'>+	.pme_pread8 = ksz8_pme_pread8,</div><div class='add'>+	.pme_pwrite8 = ksz8_pme_pwrite8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_dev_ops ksz87xx_dev_ops = {</div><div class='add'>+	.setup = ksz8_setup,</div><div class='add'>+	.get_port_addr = ksz8_get_port_addr,</div><div class='add'>+	.cfg_port_member = ksz8_cfg_port_member,</div><div class='add'>+	.flush_dyn_mac_table = ksz8_flush_dyn_mac_table,</div><div class='add'>+	.port_setup = ksz8_port_setup,</div><div class='add'>+	.r_phy = ksz8_r_phy,</div><div class='add'>+	.w_phy = ksz8_w_phy,</div><div class='add'>+	.r_mib_cnt = ksz8_r_mib_cnt,</div><div class='add'>+	.r_mib_pkt = ksz8_r_mib_pkt,</div><div class='add'>+	.r_mib_stat64 = ksz_r_mib_stats64,</div><div class='add'>+	.freeze_mib = ksz8_freeze_mib,</div><div class='add'>+	.port_init_cnt = ksz8_port_init_cnt,</div><div class='add'>+	.fdb_dump = ksz8_fdb_dump,</div><div class='add'>+	.fdb_add = ksz8_fdb_add,</div><div class='add'>+	.fdb_del = ksz8_fdb_del,</div><div class='add'>+	.mdb_add = ksz8_mdb_add,</div><div class='add'>+	.mdb_del = ksz8_mdb_del,</div><div class='add'>+	.vlan_filtering = ksz8_port_vlan_filtering,</div><div class='add'>+	.vlan_add = ksz8_port_vlan_add,</div><div class='add'>+	.vlan_del = ksz8_port_vlan_del,</div><div class='add'>+	.mirror_add = ksz8_port_mirror_add,</div><div class='add'>+	.mirror_del = ksz8_port_mirror_del,</div><div class='add'>+	.get_caps = ksz8_get_caps,</div><div class='add'>+	.config_cpu_port = ksz8_config_cpu_port,</div><div class='add'>+	.enable_stp_addr = ksz8_enable_stp_addr,</div><div class='add'>+	.reset = ksz8_reset_switch,</div><div class='add'>+	.init = ksz8_switch_init,</div><div class='add'>+	.exit = ksz8_switch_exit,</div><div class='add'>+	.change_mtu = ksz8_change_mtu,</div><div class='add'>+	.pme_write8 = ksz8_pme_write8,</div><div class='add'>+	.pme_pread8 = ksz8_pme_pread8,</div><div class='add'>+	.pme_pwrite8 = ksz8_pme_pwrite8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ksz9477_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+					struct phy_device *phydev,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					phy_interface_t interface,</div><div class='add'>+					int speed, int duplex, bool tx_pause,</div><div class='add'>+					bool rx_pause);</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+ksz_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+			   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ksz_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[dp-&gt;index];</div><div class='add'>+</div><div class='add'>+	if (ksz_is_sgmii_port(dev, dp-&gt;index) &amp;&amp;</div><div class='add'>+	    (interface == PHY_INTERFACE_MODE_SGMII ||</div><div class='add'>+	    interface == PHY_INTERFACE_MODE_1000BASEX))</div><div class='add'>+		return p-&gt;pcs;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops ksz9477_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= ksz_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= ksz_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= ksz9477_phylink_mac_link_up,</div><div class='add'>+	.mac_disable_tx_lpi = ksz_phylink_mac_disable_tx_lpi,</div><div class='add'>+	.mac_enable_tx_lpi = ksz_phylink_mac_enable_tx_lpi,</div><div class='add'>+	.mac_select_pcs	= ksz_phylink_mac_select_pcs,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_dev_ops ksz9477_dev_ops = {</div><div class='add'>+	.setup = ksz9477_setup,</div><div class='add'>+	.get_port_addr = ksz9477_get_port_addr,</div><div class='add'>+	.cfg_port_member = ksz9477_cfg_port_member,</div><div class='add'>+	.flush_dyn_mac_table = ksz9477_flush_dyn_mac_table,</div><div class='add'>+	.port_setup = ksz9477_port_setup,</div><div class='add'>+	.set_ageing_time = ksz9477_set_ageing_time,</div><div class='add'>+	.r_phy = ksz9477_r_phy,</div><div class='add'>+	.w_phy = ksz9477_w_phy,</div><div class='add'>+	.r_mib_cnt = ksz9477_r_mib_cnt,</div><div class='add'>+	.r_mib_pkt = ksz9477_r_mib_pkt,</div><div class='add'>+	.r_mib_stat64 = ksz_r_mib_stats64,</div><div class='add'>+	.freeze_mib = ksz9477_freeze_mib,</div><div class='add'>+	.port_init_cnt = ksz9477_port_init_cnt,</div><div class='add'>+	.vlan_filtering = ksz9477_port_vlan_filtering,</div><div class='add'>+	.vlan_add = ksz9477_port_vlan_add,</div><div class='add'>+	.vlan_del = ksz9477_port_vlan_del,</div><div class='add'>+	.mirror_add = ksz9477_port_mirror_add,</div><div class='add'>+	.mirror_del = ksz9477_port_mirror_del,</div><div class='add'>+	.get_caps = ksz9477_get_caps,</div><div class='add'>+	.fdb_dump = ksz9477_fdb_dump,</div><div class='add'>+	.fdb_add = ksz9477_fdb_add,</div><div class='add'>+	.fdb_del = ksz9477_fdb_del,</div><div class='add'>+	.mdb_add = ksz9477_mdb_add,</div><div class='add'>+	.mdb_del = ksz9477_mdb_del,</div><div class='add'>+	.change_mtu = ksz9477_change_mtu,</div><div class='add'>+	.pme_write8 = ksz_write8,</div><div class='add'>+	.pme_pread8 = ksz_pread8,</div><div class='add'>+	.pme_pwrite8 = ksz_pwrite8,</div><div class='add'>+	.config_cpu_port = ksz9477_config_cpu_port,</div><div class='add'>+	.tc_cbs_set_cinc = ksz9477_tc_cbs_set_cinc,</div><div class='add'>+	.enable_stp_addr = ksz9477_enable_stp_addr,</div><div class='add'>+	.reset = ksz9477_reset_switch,</div><div class='add'>+	.init = ksz9477_switch_init,</div><div class='add'>+	.exit = ksz9477_switch_exit,</div><div class='add'>+	.pcs_create = ksz9477_pcs_create,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops lan937x_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= ksz_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= ksz_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= ksz9477_phylink_mac_link_up,</div><div class='add'>+	.mac_disable_tx_lpi = ksz_phylink_mac_disable_tx_lpi,</div><div class='add'>+	.mac_enable_tx_lpi = ksz_phylink_mac_enable_tx_lpi,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_dev_ops lan937x_dev_ops = {</div><div class='add'>+	.setup = lan937x_setup,</div><div class='add'>+	.teardown = lan937x_teardown,</div><div class='add'>+	.get_port_addr = ksz9477_get_port_addr,</div><div class='add'>+	.cfg_port_member = ksz9477_cfg_port_member,</div><div class='add'>+	.flush_dyn_mac_table = ksz9477_flush_dyn_mac_table,</div><div class='add'>+	.port_setup = lan937x_port_setup,</div><div class='add'>+	.set_ageing_time = lan937x_set_ageing_time,</div><div class='add'>+	.mdio_bus_preinit = lan937x_mdio_bus_preinit,</div><div class='add'>+	.create_phy_addr_map = lan937x_create_phy_addr_map,</div><div class='add'>+	.r_phy = lan937x_r_phy,</div><div class='add'>+	.w_phy = lan937x_w_phy,</div><div class='add'>+	.r_mib_cnt = ksz9477_r_mib_cnt,</div><div class='add'>+	.r_mib_pkt = ksz9477_r_mib_pkt,</div><div class='add'>+	.r_mib_stat64 = ksz_r_mib_stats64,</div><div class='add'>+	.freeze_mib = ksz9477_freeze_mib,</div><div class='add'>+	.port_init_cnt = ksz9477_port_init_cnt,</div><div class='add'>+	.vlan_filtering = ksz9477_port_vlan_filtering,</div><div class='add'>+	.vlan_add = ksz9477_port_vlan_add,</div><div class='add'>+	.vlan_del = ksz9477_port_vlan_del,</div><div class='add'>+	.mirror_add = ksz9477_port_mirror_add,</div><div class='add'>+	.mirror_del = ksz9477_port_mirror_del,</div><div class='add'>+	.get_caps = lan937x_phylink_get_caps,</div><div class='add'>+	.setup_rgmii_delay = lan937x_setup_rgmii_delay,</div><div class='add'>+	.fdb_dump = ksz9477_fdb_dump,</div><div class='add'>+	.fdb_add = ksz9477_fdb_add,</div><div class='add'>+	.fdb_del = ksz9477_fdb_del,</div><div class='add'>+	.mdb_add = ksz9477_mdb_add,</div><div class='add'>+	.mdb_del = ksz9477_mdb_del,</div><div class='add'>+	.change_mtu = lan937x_change_mtu,</div><div class='add'>+	.config_cpu_port = lan937x_config_cpu_port,</div><div class='add'>+	.tc_cbs_set_cinc = lan937x_tc_cbs_set_cinc,</div><div class='add'>+	.enable_stp_addr = ksz9477_enable_stp_addr,</div><div class='add'>+	.reset = lan937x_reset_switch,</div><div class='add'>+	.init = lan937x_switch_init,</div><div class='add'>+	.exit = lan937x_switch_exit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ksz8463_regs[] = {</div><div class='add'>+	[REG_SW_MAC_ADDR]		= 0x10,</div><div class='add'>+	[REG_IND_CTRL_0]		= 0x30,</div><div class='add'>+	[REG_IND_DATA_8]		= 0x26,</div><div class='add'>+	[REG_IND_DATA_CHECK]		= 0x26,</div><div class='add'>+	[REG_IND_DATA_HI]		= 0x28,</div><div class='add'>+	[REG_IND_DATA_LO]		= 0x2C,</div><div class='add'>+	[REG_IND_MIB_CHECK]		= 0x2F,</div><div class='add'>+	[P_FORCE_CTRL]			= 0x0C,</div><div class='add'>+	[P_LINK_STATUS]			= 0x0E,</div><div class='add'>+	[P_LOCAL_CTRL]			= 0x0C,</div><div class='add'>+	[P_NEG_RESTART_CTRL]		= 0x0D,</div><div class='add'>+	[P_REMOTE_STATUS]		= 0x0E,</div><div class='add'>+	[P_SPEED_STATUS]		= 0x0F,</div><div class='add'>+	[S_TAIL_TAG_CTRL]		= 0xAD,</div><div class='add'>+	[P_STP_CTRL]			= 0x6F,</div><div class='add'>+	[S_START_CTRL]			= 0x01,</div><div class='add'>+	[S_BROADCAST_CTRL]		= 0x06,</div><div class='add'>+	[S_MULTICAST_CTRL]		= 0x04,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ksz8463_masks[] = {</div><div class='add'>+	[PORT_802_1P_REMAPPING]		= BIT(3),</div><div class='add'>+	[SW_TAIL_TAG_ENABLE]		= BIT(0),</div><div class='add'>+	[MIB_COUNTER_OVERFLOW]		= BIT(7),</div><div class='add'>+	[MIB_COUNTER_VALID]		= BIT(6),</div><div class='add'>+	[VLAN_TABLE_FID]		= GENMASK(15, 12),</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP]		= GENMASK(18, 16),</div><div class='add'>+	[VLAN_TABLE_VALID]		= BIT(19),</div><div class='add'>+	[STATIC_MAC_TABLE_VALID]	= BIT(19),</div><div class='add'>+	[STATIC_MAC_TABLE_USE_FID]	= BIT(21),</div><div class='add'>+	[STATIC_MAC_TABLE_FID]		= GENMASK(25, 22),</div><div class='add'>+	[STATIC_MAC_TABLE_OVERRIDE]	= BIT(20),</div><div class='add'>+	[STATIC_MAC_TABLE_FWD_PORTS]	= GENMASK(18, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES_H]	= GENMASK(1, 0),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_MAC_EMPTY]	= BIT(2),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_NOT_READY]	= BIT(7),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES]	= GENMASK(31, 24),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_FID]		= GENMASK(19, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_SRC_PORT]	= GENMASK(21, 20),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_TIMESTAMP]	= GENMASK(23, 22),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 ksz8463_shifts[] = {</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP_S]	= 16,</div><div class='add'>+	[STATIC_MAC_FWD_PORTS]		= 16,</div><div class='add'>+	[STATIC_MAC_FID]		= 22,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES_H]		= 8,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES]		= 24,</div><div class='add'>+	[DYNAMIC_MAC_FID]		= 16,</div><div class='add'>+	[DYNAMIC_MAC_TIMESTAMP]		= 22,</div><div class='add'>+	[DYNAMIC_MAC_SRC_PORT]		= 20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ksz8795_regs[] = {</div><div class='add'>+	[REG_SW_MAC_ADDR]		= 0x68,</div><div class='add'>+	[REG_IND_CTRL_0]		= 0x6E,</div><div class='add'>+	[REG_IND_DATA_8]		= 0x70,</div><div class='add'>+	[REG_IND_DATA_CHECK]		= 0x72,</div><div class='add'>+	[REG_IND_DATA_HI]		= 0x71,</div><div class='add'>+	[REG_IND_DATA_LO]		= 0x75,</div><div class='add'>+	[REG_IND_MIB_CHECK]		= 0x74,</div><div class='add'>+	[REG_IND_BYTE]			= 0xA0,</div><div class='add'>+	[P_FORCE_CTRL]			= 0x0C,</div><div class='add'>+	[P_LINK_STATUS]			= 0x0E,</div><div class='add'>+	[P_LOCAL_CTRL]			= 0x07,</div><div class='add'>+	[P_NEG_RESTART_CTRL]		= 0x0D,</div><div class='add'>+	[P_REMOTE_STATUS]		= 0x08,</div><div class='add'>+	[P_SPEED_STATUS]		= 0x09,</div><div class='add'>+	[S_TAIL_TAG_CTRL]		= 0x0C,</div><div class='add'>+	[P_STP_CTRL]			= 0x02,</div><div class='add'>+	[S_START_CTRL]			= 0x01,</div><div class='add'>+	[S_BROADCAST_CTRL]		= 0x06,</div><div class='add'>+	[S_MULTICAST_CTRL]		= 0x04,</div><div class='add'>+	[P_XMII_CTRL_0]			= 0x06,</div><div class='add'>+	[P_XMII_CTRL_1]			= 0x06,</div><div class='add'>+	[REG_SW_PME_CTRL]		= 0x8003,</div><div class='add'>+	[REG_PORT_PME_STATUS]		= 0x8003,</div><div class='add'>+	[REG_PORT_PME_CTRL]		= 0x8007,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ksz8795_masks[] = {</div><div class='add'>+	[PORT_802_1P_REMAPPING]		= BIT(7),</div><div class='add'>+	[SW_TAIL_TAG_ENABLE]		= BIT(1),</div><div class='add'>+	[MIB_COUNTER_OVERFLOW]		= BIT(6),</div><div class='add'>+	[MIB_COUNTER_VALID]		= BIT(5),</div><div class='add'>+	[VLAN_TABLE_FID]		= GENMASK(6, 0),</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP]		= GENMASK(11, 7),</div><div class='add'>+	[VLAN_TABLE_VALID]		= BIT(12),</div><div class='add'>+	[STATIC_MAC_TABLE_VALID]	= BIT(21),</div><div class='add'>+	[STATIC_MAC_TABLE_USE_FID]	= BIT(23),</div><div class='add'>+	[STATIC_MAC_TABLE_FID]		= GENMASK(30, 24),</div><div class='add'>+	[STATIC_MAC_TABLE_OVERRIDE]	= BIT(22),</div><div class='add'>+	[STATIC_MAC_TABLE_FWD_PORTS]	= GENMASK(20, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES_H]	= GENMASK(6, 0),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_MAC_EMPTY]	= BIT(7),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_NOT_READY]	= BIT(7),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES]	= GENMASK(31, 29),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_FID]		= GENMASK(22, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_SRC_PORT]	= GENMASK(26, 24),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_TIMESTAMP]	= GENMASK(28, 27),</div><div class='add'>+	[P_MII_TX_FLOW_CTRL]		= BIT(5),</div><div class='add'>+	[P_MII_RX_FLOW_CTRL]		= BIT(5),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz8795_xmii_ctrl0[] = {</div><div class='add'>+	[P_MII_100MBIT]			= 0,</div><div class='add'>+	[P_MII_10MBIT]			= 1,</div><div class='add'>+	[P_MII_FULL_DUPLEX]		= 0,</div><div class='add'>+	[P_MII_HALF_DUPLEX]		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz8795_xmii_ctrl1[] = {</div><div class='add'>+	[P_RGMII_SEL]			= 3,</div><div class='add'>+	[P_GMII_SEL]			= 2,</div><div class='add'>+	[P_RMII_SEL]			= 1,</div><div class='add'>+	[P_MII_SEL]			= 0,</div><div class='add'>+	[P_GMII_1GBIT]			= 1,</div><div class='add'>+	[P_GMII_NOT_1GBIT]		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz8795_shifts[] = {</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP_S]	= 7,</div><div class='add'>+	[VLAN_TABLE]			= 16,</div><div class='add'>+	[STATIC_MAC_FWD_PORTS]		= 16,</div><div class='add'>+	[STATIC_MAC_FID]		= 24,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES_H]		= 3,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES]		= 29,</div><div class='add'>+	[DYNAMIC_MAC_FID]		= 16,</div><div class='add'>+	[DYNAMIC_MAC_TIMESTAMP]		= 27,</div><div class='add'>+	[DYNAMIC_MAC_SRC_PORT]		= 24,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ksz8863_regs[] = {</div><div class='add'>+	[REG_SW_MAC_ADDR]		= 0x70,</div><div class='add'>+	[REG_IND_CTRL_0]		= 0x79,</div><div class='add'>+	[REG_IND_DATA_8]		= 0x7B,</div><div class='add'>+	[REG_IND_DATA_CHECK]		= 0x7B,</div><div class='add'>+	[REG_IND_DATA_HI]		= 0x7C,</div><div class='add'>+	[REG_IND_DATA_LO]		= 0x80,</div><div class='add'>+	[REG_IND_MIB_CHECK]		= 0x80,</div><div class='add'>+	[P_FORCE_CTRL]			= 0x0C,</div><div class='add'>+	[P_LINK_STATUS]			= 0x0E,</div><div class='add'>+	[P_LOCAL_CTRL]			= 0x0C,</div><div class='add'>+	[P_NEG_RESTART_CTRL]		= 0x0D,</div><div class='add'>+	[P_REMOTE_STATUS]		= 0x0E,</div><div class='add'>+	[P_SPEED_STATUS]		= 0x0F,</div><div class='add'>+	[S_TAIL_TAG_CTRL]		= 0x03,</div><div class='add'>+	[P_STP_CTRL]			= 0x02,</div><div class='add'>+	[S_START_CTRL]			= 0x01,</div><div class='add'>+	[S_BROADCAST_CTRL]		= 0x06,</div><div class='add'>+	[S_MULTICAST_CTRL]		= 0x04,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ksz8863_masks[] = {</div><div class='add'>+	[PORT_802_1P_REMAPPING]		= BIT(3),</div><div class='add'>+	[SW_TAIL_TAG_ENABLE]		= BIT(6),</div><div class='add'>+	[MIB_COUNTER_OVERFLOW]		= BIT(7),</div><div class='add'>+	[MIB_COUNTER_VALID]		= BIT(6),</div><div class='add'>+	[VLAN_TABLE_FID]		= GENMASK(15, 12),</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP]		= GENMASK(18, 16),</div><div class='add'>+	[VLAN_TABLE_VALID]		= BIT(19),</div><div class='add'>+	[STATIC_MAC_TABLE_VALID]	= BIT(19),</div><div class='add'>+	[STATIC_MAC_TABLE_USE_FID]	= BIT(21),</div><div class='add'>+	[STATIC_MAC_TABLE_FID]		= GENMASK(25, 22),</div><div class='add'>+	[STATIC_MAC_TABLE_OVERRIDE]	= BIT(20),</div><div class='add'>+	[STATIC_MAC_TABLE_FWD_PORTS]	= GENMASK(18, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES_H]	= GENMASK(1, 0),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_MAC_EMPTY]	= BIT(2),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_NOT_READY]	= BIT(7),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES]	= GENMASK(31, 24),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_FID]		= GENMASK(19, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_SRC_PORT]	= GENMASK(21, 20),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_TIMESTAMP]	= GENMASK(23, 22),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 ksz8863_shifts[] = {</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP_S]	= 16,</div><div class='add'>+	[STATIC_MAC_FWD_PORTS]		= 16,</div><div class='add'>+	[STATIC_MAC_FID]		= 22,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES_H]		= 8,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES]		= 24,</div><div class='add'>+	[DYNAMIC_MAC_FID]		= 16,</div><div class='add'>+	[DYNAMIC_MAC_TIMESTAMP]		= 22,</div><div class='add'>+	[DYNAMIC_MAC_SRC_PORT]		= 20,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ksz8895_regs[] = {</div><div class='add'>+	[REG_SW_MAC_ADDR]		= 0x68,</div><div class='add'>+	[REG_IND_CTRL_0]		= 0x6E,</div><div class='add'>+	[REG_IND_DATA_8]		= 0x70,</div><div class='add'>+	[REG_IND_DATA_CHECK]		= 0x72,</div><div class='add'>+	[REG_IND_DATA_HI]		= 0x71,</div><div class='add'>+	[REG_IND_DATA_LO]		= 0x75,</div><div class='add'>+	[REG_IND_MIB_CHECK]		= 0x75,</div><div class='add'>+	[P_FORCE_CTRL]			= 0x0C,</div><div class='add'>+	[P_LINK_STATUS]			= 0x0E,</div><div class='add'>+	[P_LOCAL_CTRL]			= 0x0C,</div><div class='add'>+	[P_NEG_RESTART_CTRL]		= 0x0D,</div><div class='add'>+	[P_REMOTE_STATUS]		= 0x0E,</div><div class='add'>+	[P_SPEED_STATUS]		= 0x09,</div><div class='add'>+	[S_TAIL_TAG_CTRL]		= 0x0C,</div><div class='add'>+	[P_STP_CTRL]			= 0x02,</div><div class='add'>+	[S_START_CTRL]			= 0x01,</div><div class='add'>+	[S_BROADCAST_CTRL]		= 0x06,</div><div class='add'>+	[S_MULTICAST_CTRL]		= 0x04,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ksz8895_masks[] = {</div><div class='add'>+	[PORT_802_1P_REMAPPING]		= BIT(7),</div><div class='add'>+	[SW_TAIL_TAG_ENABLE]		= BIT(1),</div><div class='add'>+	[MIB_COUNTER_OVERFLOW]		= BIT(7),</div><div class='add'>+	[MIB_COUNTER_VALID]		= BIT(6),</div><div class='add'>+	[VLAN_TABLE_FID]		= GENMASK(6, 0),</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP]		= GENMASK(11, 7),</div><div class='add'>+	[VLAN_TABLE_VALID]		= BIT(12),</div><div class='add'>+	[STATIC_MAC_TABLE_VALID]	= BIT(21),</div><div class='add'>+	[STATIC_MAC_TABLE_USE_FID]	= BIT(23),</div><div class='add'>+	[STATIC_MAC_TABLE_FID]		= GENMASK(30, 24),</div><div class='add'>+	[STATIC_MAC_TABLE_OVERRIDE]	= BIT(22),</div><div class='add'>+	[STATIC_MAC_TABLE_FWD_PORTS]	= GENMASK(20, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES_H]	= GENMASK(6, 0),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_MAC_EMPTY]	= BIT(7),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_NOT_READY]	= BIT(7),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_ENTRIES]	= GENMASK(31, 29),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_FID]		= GENMASK(22, 16),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_SRC_PORT]	= GENMASK(26, 24),</div><div class='add'>+	[DYNAMIC_MAC_TABLE_TIMESTAMP]	= GENMASK(28, 27),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz8895_shifts[] = {</div><div class='add'>+	[VLAN_TABLE_MEMBERSHIP_S]	= 7,</div><div class='add'>+	[VLAN_TABLE]			= 13,</div><div class='add'>+	[STATIC_MAC_FWD_PORTS]		= 16,</div><div class='add'>+	[STATIC_MAC_FID]		= 24,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES_H]		= 3,</div><div class='add'>+	[DYNAMIC_MAC_ENTRIES]		= 29,</div><div class='add'>+	[DYNAMIC_MAC_FID]		= 16,</div><div class='add'>+	[DYNAMIC_MAC_TIMESTAMP]		= 27,</div><div class='add'>+	[DYNAMIC_MAC_SRC_PORT]		= 24,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 ksz9477_regs[] = {</div><div class='add'>+	[REG_SW_MAC_ADDR]		= 0x0302,</div><div class='add'>+	[P_STP_CTRL]			= 0x0B04,</div><div class='add'>+	[S_START_CTRL]			= 0x0300,</div><div class='add'>+	[S_BROADCAST_CTRL]		= 0x0332,</div><div class='add'>+	[S_MULTICAST_CTRL]		= 0x0331,</div><div class='add'>+	[P_XMII_CTRL_0]			= 0x0300,</div><div class='add'>+	[P_XMII_CTRL_1]			= 0x0301,</div><div class='add'>+	[REG_SW_PME_CTRL]		= 0x0006,</div><div class='add'>+	[REG_PORT_PME_STATUS]		= 0x0013,</div><div class='add'>+	[REG_PORT_PME_CTRL]		= 0x0017,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ksz9477_masks[] = {</div><div class='add'>+	[ALU_STAT_WRITE]		= 0,</div><div class='add'>+	[ALU_STAT_READ]			= 1,</div><div class='add'>+	[ALU_STAT_DIRECT]		= 0,</div><div class='add'>+	[ALU_RESV_MCAST_ADDR]		= BIT(1),</div><div class='add'>+	[P_MII_TX_FLOW_CTRL]		= BIT(5),</div><div class='add'>+	[P_MII_RX_FLOW_CTRL]		= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz9477_shifts[] = {</div><div class='add'>+	[ALU_STAT_INDEX]		= 16,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz9477_xmii_ctrl0[] = {</div><div class='add'>+	[P_MII_100MBIT]			= 1,</div><div class='add'>+	[P_MII_10MBIT]			= 0,</div><div class='add'>+	[P_MII_FULL_DUPLEX]		= 1,</div><div class='add'>+	[P_MII_HALF_DUPLEX]		= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 ksz9477_xmii_ctrl1[] = {</div><div class='add'>+	[P_RGMII_SEL]			= 0,</div><div class='add'>+	[P_RMII_SEL]			= 1,</div><div class='add'>+	[P_GMII_SEL]			= 2,</div><div class='add'>+	[P_MII_SEL]			= 3,</div><div class='add'>+	[P_GMII_1GBIT]			= 0,</div><div class='add'>+	[P_GMII_NOT_1GBIT]		= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 lan937x_masks[] = {</div><div class='add'>+	[ALU_STAT_WRITE]		= 1,</div><div class='add'>+	[ALU_STAT_READ]			= 2,</div><div class='add'>+	[ALU_STAT_DIRECT]		= BIT(3),</div><div class='add'>+	[ALU_RESV_MCAST_ADDR]		= BIT(2),</div><div class='add'>+	[P_MII_TX_FLOW_CTRL]		= BIT(5),</div><div class='add'>+	[P_MII_RX_FLOW_CTRL]		= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 lan937x_shifts[] = {</div><div class='add'>+	[ALU_STAT_INDEX]		= 8,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range ksz8563_valid_regs[] = {</div><div class='add'>+	regmap_reg_range(0x0000, 0x0003),</div><div class='add'>+	regmap_reg_range(0x0006, 0x0006),</div><div class='add'>+	regmap_reg_range(0x000f, 0x001f),</div><div class='add'>+	regmap_reg_range(0x0100, 0x0100),</div><div class='add'>+	regmap_reg_range(0x0104, 0x0107),</div><div class='add'>+	regmap_reg_range(0x010d, 0x010d),</div><div class='add'>+	regmap_reg_range(0x0110, 0x0113),</div><div class='add'>+	regmap_reg_range(0x0120, 0x012b),</div><div class='add'>+	regmap_reg_range(0x0201, 0x0201),</div><div class='add'>+	regmap_reg_range(0x0210, 0x0213),</div><div class='add'>+	regmap_reg_range(0x0300, 0x0300),</div><div class='add'>+	regmap_reg_range(0x0302, 0x031b),</div><div class='add'>+	regmap_reg_range(0x0320, 0x032b),</div><div class='add'>+	regmap_reg_range(0x0330, 0x0336),</div><div class='add'>+	regmap_reg_range(0x0338, 0x033e),</div><div class='add'>+	regmap_reg_range(0x0340, 0x035f),</div><div class='add'>+	regmap_reg_range(0x0370, 0x0370),</div><div class='add'>+	regmap_reg_range(0x0378, 0x0378),</div><div class='add'>+	regmap_reg_range(0x037c, 0x037d),</div><div class='add'>+	regmap_reg_range(0x0390, 0x0393),</div><div class='add'>+	regmap_reg_range(0x0400, 0x040e),</div><div class='add'>+	regmap_reg_range(0x0410, 0x042f),</div><div class='add'>+	regmap_reg_range(0x0500, 0x0519),</div><div class='add'>+	regmap_reg_range(0x0520, 0x054b),</div><div class='add'>+	regmap_reg_range(0x0550, 0x05b3),</div><div class='add'>+</div><div class='add'>+	/* port 1 */</div><div class='add'>+	regmap_reg_range(0x1000, 0x1001),</div><div class='add'>+	regmap_reg_range(0x1004, 0x100b),</div><div class='add'>+	regmap_reg_range(0x1013, 0x1013),</div><div class='add'>+	regmap_reg_range(0x1017, 0x1017),</div><div class='add'>+	regmap_reg_range(0x101b, 0x101b),</div><div class='add'>+	regmap_reg_range(0x101f, 0x1021),</div><div class='add'>+	regmap_reg_range(0x1030, 0x1030),</div><div class='add'>+	regmap_reg_range(0x1100, 0x1111),</div><div class='add'>+	regmap_reg_range(0x111a, 0x111d),</div><div class='add'>+	regmap_reg_range(0x1122, 0x1127),</div><div class='add'>+	regmap_reg_range(0x112a, 0x112b),</div><div class='add'>+	regmap_reg_range(0x1136, 0x1139),</div><div class='add'>+	regmap_reg_range(0x113e, 0x113f),</div><div class='add'>+	regmap_reg_range(0x1400, 0x1401),</div><div class='add'>+	regmap_reg_range(0x1403, 0x1403),</div><div class='add'>+	regmap_reg_range(0x1410, 0x1417),</div><div class='add'>+	regmap_reg_range(0x1420, 0x1423),</div><div class='add'>+	regmap_reg_range(0x1500, 0x1507),</div><div class='add'>+	regmap_reg_range(0x1600, 0x1612),</div><div class='add'>+	regmap_reg_range(0x1800, 0x180f),</div><div class='add'>+	regmap_reg_range(0x1900, 0x1907),</div><div class='add'>+	regmap_reg_range(0x1914, 0x191b),</div><div class='add'>+	regmap_reg_range(0x1a00, 0x1a03),</div><div class='add'>+	regmap_reg_range(0x1a04, 0x1a08),</div><div class='add'>+	regmap_reg_range(0x1b00, 0x1b01),</div><div class='add'>+	regmap_reg_range(0x1b04, 0x1b04),</div><div class='add'>+	regmap_reg_range(0x1c00, 0x1c05),</div><div class='add'>+	regmap_reg_range(0x1c08, 0x1c1b),</div><div class='add'>+</div><div class='add'>+	/* port 2 */</div><div class='add'>+	regmap_reg_range(0x2000, 0x2001),</div><div class='add'>+	regmap_reg_range(0x2004, 0x200b),</div><div class='add'>+	regmap_reg_range(0x2013, 0x2013),</div><div class='add'>+	regmap_reg_range(0x2017, 0x2017),</div><div class='add'>+	regmap_reg_range(0x201b, 0x201b),</div><div class='add'>+	regmap_reg_range(0x201f, 0x2021),</div><div class='add'>+	regmap_reg_range(0x2030, 0x2030),</div><div class='add'>+	regmap_reg_range(0x2100, 0x2111),</div><div class='add'>+	regmap_reg_range(0x211a, 0x211d),</div><div class='add'>+	regmap_reg_range(0x2122, 0x2127),</div><div class='add'>+	regmap_reg_range(0x212a, 0x212b),</div><div class='add'>+	regmap_reg_range(0x2136, 0x2139),</div><div class='add'>+	regmap_reg_range(0x213e, 0x213f),</div><div class='add'>+	regmap_reg_range(0x2400, 0x2401),</div><div class='add'>+	regmap_reg_range(0x2403, 0x2403),</div><div class='add'>+	regmap_reg_range(0x2410, 0x2417),</div><div class='add'>+	regmap_reg_range(0x2420, 0x2423),</div><div class='add'>+	regmap_reg_range(0x2500, 0x2507),</div><div class='add'>+	regmap_reg_range(0x2600, 0x2612),</div><div class='add'>+	regmap_reg_range(0x2800, 0x280f),</div><div class='add'>+	regmap_reg_range(0x2900, 0x2907),</div><div class='add'>+	regmap_reg_range(0x2914, 0x291b),</div><div class='add'>+	regmap_reg_range(0x2a00, 0x2a03),</div><div class='add'>+	regmap_reg_range(0x2a04, 0x2a08),</div><div class='add'>+	regmap_reg_range(0x2b00, 0x2b01),</div><div class='add'>+	regmap_reg_range(0x2b04, 0x2b04),</div><div class='add'>+	regmap_reg_range(0x2c00, 0x2c05),</div><div class='add'>+	regmap_reg_range(0x2c08, 0x2c1b),</div><div class='add'>+</div><div class='add'>+	/* port 3 */</div><div class='add'>+	regmap_reg_range(0x3000, 0x3001),</div><div class='add'>+	regmap_reg_range(0x3004, 0x300b),</div><div class='add'>+	regmap_reg_range(0x3013, 0x3013),</div><div class='add'>+	regmap_reg_range(0x3017, 0x3017),</div><div class='add'>+	regmap_reg_range(0x301b, 0x301b),</div><div class='add'>+	regmap_reg_range(0x301f, 0x3021),</div><div class='add'>+	regmap_reg_range(0x3030, 0x3030),</div><div class='add'>+	regmap_reg_range(0x3300, 0x3301),</div><div class='add'>+	regmap_reg_range(0x3303, 0x3303),</div><div class='add'>+	regmap_reg_range(0x3400, 0x3401),</div><div class='add'>+	regmap_reg_range(0x3403, 0x3403),</div><div class='add'>+	regmap_reg_range(0x3410, 0x3417),</div><div class='add'>+	regmap_reg_range(0x3420, 0x3423),</div><div class='add'>+	regmap_reg_range(0x3500, 0x3507),</div><div class='add'>+	regmap_reg_range(0x3600, 0x3612),</div><div class='add'>+	regmap_reg_range(0x3800, 0x380f),</div><div class='add'>+	regmap_reg_range(0x3900, 0x3907),</div><div class='add'>+	regmap_reg_range(0x3914, 0x391b),</div><div class='add'>+	regmap_reg_range(0x3a00, 0x3a03),</div><div class='add'>+	regmap_reg_range(0x3a04, 0x3a08),</div><div class='add'>+	regmap_reg_range(0x3b00, 0x3b01),</div><div class='add'>+	regmap_reg_range(0x3b04, 0x3b04),</div><div class='add'>+	regmap_reg_range(0x3c00, 0x3c05),</div><div class='add'>+	regmap_reg_range(0x3c08, 0x3c1b),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table ksz8563_register_set = {</div><div class='add'>+	.yes_ranges = ksz8563_valid_regs,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(ksz8563_valid_regs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range ksz9477_valid_regs[] = {</div><div class='add'>+	regmap_reg_range(0x0000, 0x0003),</div><div class='add'>+	regmap_reg_range(0x0006, 0x0006),</div><div class='add'>+	regmap_reg_range(0x0010, 0x001f),</div><div class='add'>+	regmap_reg_range(0x0100, 0x0100),</div><div class='add'>+	regmap_reg_range(0x0103, 0x0107),</div><div class='add'>+	regmap_reg_range(0x010d, 0x010d),</div><div class='add'>+	regmap_reg_range(0x0110, 0x0113),</div><div class='add'>+	regmap_reg_range(0x0120, 0x012b),</div><div class='add'>+	regmap_reg_range(0x0201, 0x0201),</div><div class='add'>+	regmap_reg_range(0x0210, 0x0213),</div><div class='add'>+	regmap_reg_range(0x0300, 0x0300),</div><div class='add'>+	regmap_reg_range(0x0302, 0x031b),</div><div class='add'>+	regmap_reg_range(0x0320, 0x032b),</div><div class='add'>+	regmap_reg_range(0x0330, 0x0336),</div><div class='add'>+	regmap_reg_range(0x0338, 0x033b),</div><div class='add'>+	regmap_reg_range(0x033e, 0x033e),</div><div class='add'>+	regmap_reg_range(0x0340, 0x035f),</div><div class='add'>+	regmap_reg_range(0x0370, 0x0370),</div><div class='add'>+	regmap_reg_range(0x0378, 0x0378),</div><div class='add'>+	regmap_reg_range(0x037c, 0x037d),</div><div class='add'>+	regmap_reg_range(0x0390, 0x0393),</div><div class='add'>+	regmap_reg_range(0x0400, 0x040e),</div><div class='add'>+	regmap_reg_range(0x0410, 0x042f),</div><div class='add'>+	regmap_reg_range(0x0444, 0x044b),</div><div class='add'>+	regmap_reg_range(0x0450, 0x046f),</div><div class='add'>+	regmap_reg_range(0x0500, 0x0519),</div><div class='add'>+	regmap_reg_range(0x0520, 0x054b),</div><div class='add'>+	regmap_reg_range(0x0550, 0x05b3),</div><div class='add'>+	regmap_reg_range(0x0604, 0x060b),</div><div class='add'>+	regmap_reg_range(0x0610, 0x0612),</div><div class='add'>+	regmap_reg_range(0x0614, 0x062c),</div><div class='add'>+	regmap_reg_range(0x0640, 0x0645),</div><div class='add'>+	regmap_reg_range(0x0648, 0x064d),</div><div class='add'>+</div><div class='add'>+	/* port 1 */</div><div class='add'>+	regmap_reg_range(0x1000, 0x1001),</div><div class='add'>+	regmap_reg_range(0x1013, 0x1013),</div><div class='add'>+	regmap_reg_range(0x1017, 0x1017),</div><div class='add'>+	regmap_reg_range(0x101b, 0x101b),</div><div class='add'>+	regmap_reg_range(0x101f, 0x1020),</div><div class='add'>+	regmap_reg_range(0x1030, 0x1030),</div><div class='add'>+	regmap_reg_range(0x1100, 0x1115),</div><div class='add'>+	regmap_reg_range(0x111a, 0x111f),</div><div class='add'>+	regmap_reg_range(0x1120, 0x112b),</div><div class='add'>+	regmap_reg_range(0x1134, 0x113b),</div><div class='add'>+	regmap_reg_range(0x113c, 0x113f),</div><div class='add'>+	regmap_reg_range(0x1400, 0x1401),</div><div class='add'>+	regmap_reg_range(0x1403, 0x1403),</div><div class='add'>+	regmap_reg_range(0x1410, 0x1417),</div><div class='add'>+	regmap_reg_range(0x1420, 0x1423),</div><div class='add'>+	regmap_reg_range(0x1500, 0x1507),</div><div class='add'>+	regmap_reg_range(0x1600, 0x1613),</div><div class='add'>+	regmap_reg_range(0x1800, 0x180f),</div><div class='add'>+	regmap_reg_range(0x1820, 0x1827),</div><div class='add'>+	regmap_reg_range(0x1830, 0x1837),</div><div class='add'>+	regmap_reg_range(0x1840, 0x184b),</div><div class='add'>+	regmap_reg_range(0x1900, 0x1907),</div><div class='add'>+	regmap_reg_range(0x1914, 0x191b),</div><div class='add'>+	regmap_reg_range(0x1920, 0x1920),</div><div class='add'>+	regmap_reg_range(0x1923, 0x1927),</div><div class='add'>+	regmap_reg_range(0x1a00, 0x1a03),</div><div class='add'>+	regmap_reg_range(0x1a04, 0x1a07),</div><div class='add'>+	regmap_reg_range(0x1b00, 0x1b01),</div><div class='add'>+	regmap_reg_range(0x1b04, 0x1b04),</div><div class='add'>+	regmap_reg_range(0x1c00, 0x1c05),</div><div class='add'>+	regmap_reg_range(0x1c08, 0x1c1b),</div><div class='add'>+</div><div class='add'>+	/* port 2 */</div><div class='add'>+	regmap_reg_range(0x2000, 0x2001),</div><div class='add'>+	regmap_reg_range(0x2013, 0x2013),</div><div class='add'>+	regmap_reg_range(0x2017, 0x2017),</div><div class='add'>+	regmap_reg_range(0x201b, 0x201b),</div><div class='add'>+	regmap_reg_range(0x201f, 0x2020),</div><div class='add'>+	regmap_reg_range(0x2030, 0x2030),</div><div class='add'>+	regmap_reg_range(0x2100, 0x2115),</div><div class='add'>+	regmap_reg_range(0x211a, 0x211f),</div><div class='add'>+	regmap_reg_range(0x2120, 0x212b),</div><div class='add'>+	regmap_reg_range(0x2134, 0x213b),</div><div class='add'>+	regmap_reg_range(0x213c, 0x213f),</div><div class='add'>+	regmap_reg_range(0x2400, 0x2401),</div><div class='add'>+	regmap_reg_range(0x2403, 0x2403),</div><div class='add'>+	regmap_reg_range(0x2410, 0x2417),</div><div class='add'>+	regmap_reg_range(0x2420, 0x2423),</div><div class='add'>+	regmap_reg_range(0x2500, 0x2507),</div><div class='add'>+	regmap_reg_range(0x2600, 0x2613),</div><div class='add'>+	regmap_reg_range(0x2800, 0x280f),</div><div class='add'>+	regmap_reg_range(0x2820, 0x2827),</div><div class='add'>+	regmap_reg_range(0x2830, 0x2837),</div><div class='add'>+	regmap_reg_range(0x2840, 0x284b),</div><div class='add'>+	regmap_reg_range(0x2900, 0x2907),</div><div class='add'>+	regmap_reg_range(0x2914, 0x291b),</div><div class='add'>+	regmap_reg_range(0x2920, 0x2920),</div><div class='add'>+	regmap_reg_range(0x2923, 0x2927),</div><div class='add'>+	regmap_reg_range(0x2a00, 0x2a03),</div><div class='add'>+	regmap_reg_range(0x2a04, 0x2a07),</div><div class='add'>+	regmap_reg_range(0x2b00, 0x2b01),</div><div class='add'>+	regmap_reg_range(0x2b04, 0x2b04),</div><div class='add'>+	regmap_reg_range(0x2c00, 0x2c05),</div><div class='add'>+	regmap_reg_range(0x2c08, 0x2c1b),</div><div class='add'>+</div><div class='add'>+	/* port 3 */</div><div class='add'>+	regmap_reg_range(0x3000, 0x3001),</div><div class='add'>+	regmap_reg_range(0x3013, 0x3013),</div><div class='add'>+	regmap_reg_range(0x3017, 0x3017),</div><div class='add'>+	regmap_reg_range(0x301b, 0x301b),</div><div class='add'>+	regmap_reg_range(0x301f, 0x3020),</div><div class='add'>+	regmap_reg_range(0x3030, 0x3030),</div><div class='add'>+	regmap_reg_range(0x3100, 0x3115),</div><div class='add'>+	regmap_reg_range(0x311a, 0x311f),</div><div class='add'>+	regmap_reg_range(0x3120, 0x312b),</div><div class='add'>+	regmap_reg_range(0x3134, 0x313b),</div><div class='add'>+	regmap_reg_range(0x313c, 0x313f),</div><div class='add'>+	regmap_reg_range(0x3400, 0x3401),</div><div class='add'>+	regmap_reg_range(0x3403, 0x3403),</div><div class='add'>+	regmap_reg_range(0x3410, 0x3417),</div><div class='add'>+	regmap_reg_range(0x3420, 0x3423),</div><div class='add'>+	regmap_reg_range(0x3500, 0x3507),</div><div class='add'>+	regmap_reg_range(0x3600, 0x3613),</div><div class='add'>+	regmap_reg_range(0x3800, 0x380f),</div><div class='add'>+	regmap_reg_range(0x3820, 0x3827),</div><div class='add'>+	regmap_reg_range(0x3830, 0x3837),</div><div class='add'>+	regmap_reg_range(0x3840, 0x384b),</div><div class='add'>+	regmap_reg_range(0x3900, 0x3907),</div><div class='add'>+	regmap_reg_range(0x3914, 0x391b),</div><div class='add'>+	regmap_reg_range(0x3920, 0x3920),</div><div class='add'>+	regmap_reg_range(0x3923, 0x3927),</div><div class='add'>+	regmap_reg_range(0x3a00, 0x3a03),</div><div class='add'>+	regmap_reg_range(0x3a04, 0x3a07),</div><div class='add'>+	regmap_reg_range(0x3b00, 0x3b01),</div><div class='add'>+	regmap_reg_range(0x3b04, 0x3b04),</div><div class='add'>+	regmap_reg_range(0x3c00, 0x3c05),</div><div class='add'>+	regmap_reg_range(0x3c08, 0x3c1b),</div><div class='add'>+</div><div class='add'>+	/* port 4 */</div><div class='add'>+	regmap_reg_range(0x4000, 0x4001),</div><div class='add'>+	regmap_reg_range(0x4013, 0x4013),</div><div class='add'>+	regmap_reg_range(0x4017, 0x4017),</div><div class='add'>+	regmap_reg_range(0x401b, 0x401b),</div><div class='add'>+	regmap_reg_range(0x401f, 0x4020),</div><div class='add'>+	regmap_reg_range(0x4030, 0x4030),</div><div class='add'>+	regmap_reg_range(0x4100, 0x4115),</div><div class='add'>+	regmap_reg_range(0x411a, 0x411f),</div><div class='add'>+	regmap_reg_range(0x4120, 0x412b),</div><div class='add'>+	regmap_reg_range(0x4134, 0x413b),</div><div class='add'>+	regmap_reg_range(0x413c, 0x413f),</div><div class='add'>+	regmap_reg_range(0x4400, 0x4401),</div><div class='add'>+	regmap_reg_range(0x4403, 0x4403),</div><div class='add'>+	regmap_reg_range(0x4410, 0x4417),</div><div class='add'>+	regmap_reg_range(0x4420, 0x4423),</div><div class='add'>+	regmap_reg_range(0x4500, 0x4507),</div><div class='add'>+	regmap_reg_range(0x4600, 0x4613),</div><div class='add'>+	regmap_reg_range(0x4800, 0x480f),</div><div class='add'>+	regmap_reg_range(0x4820, 0x4827),</div><div class='add'>+	regmap_reg_range(0x4830, 0x4837),</div><div class='add'>+	regmap_reg_range(0x4840, 0x484b),</div><div class='add'>+	regmap_reg_range(0x4900, 0x4907),</div><div class='add'>+	regmap_reg_range(0x4914, 0x491b),</div><div class='add'>+	regmap_reg_range(0x4920, 0x4920),</div><div class='add'>+	regmap_reg_range(0x4923, 0x4927),</div><div class='add'>+	regmap_reg_range(0x4a00, 0x4a03),</div><div class='add'>+	regmap_reg_range(0x4a04, 0x4a07),</div><div class='add'>+	regmap_reg_range(0x4b00, 0x4b01),</div><div class='add'>+	regmap_reg_range(0x4b04, 0x4b04),</div><div class='add'>+	regmap_reg_range(0x4c00, 0x4c05),</div><div class='add'>+	regmap_reg_range(0x4c08, 0x4c1b),</div><div class='add'>+</div><div class='add'>+	/* port 5 */</div><div class='add'>+	regmap_reg_range(0x5000, 0x5001),</div><div class='add'>+	regmap_reg_range(0x5013, 0x5013),</div><div class='add'>+	regmap_reg_range(0x5017, 0x5017),</div><div class='add'>+	regmap_reg_range(0x501b, 0x501b),</div><div class='add'>+	regmap_reg_range(0x501f, 0x5020),</div><div class='add'>+	regmap_reg_range(0x5030, 0x5030),</div><div class='add'>+	regmap_reg_range(0x5100, 0x5115),</div><div class='add'>+	regmap_reg_range(0x511a, 0x511f),</div><div class='add'>+	regmap_reg_range(0x5120, 0x512b),</div><div class='add'>+	regmap_reg_range(0x5134, 0x513b),</div><div class='add'>+	regmap_reg_range(0x513c, 0x513f),</div><div class='add'>+	regmap_reg_range(0x5400, 0x5401),</div><div class='add'>+	regmap_reg_range(0x5403, 0x5403),</div><div class='add'>+	regmap_reg_range(0x5410, 0x5417),</div><div class='add'>+	regmap_reg_range(0x5420, 0x5423),</div><div class='add'>+	regmap_reg_range(0x5500, 0x5507),</div><div class='add'>+	regmap_reg_range(0x5600, 0x5613),</div><div class='add'>+	regmap_reg_range(0x5800, 0x580f),</div><div class='add'>+	regmap_reg_range(0x5820, 0x5827),</div><div class='add'>+	regmap_reg_range(0x5830, 0x5837),</div><div class='add'>+	regmap_reg_range(0x5840, 0x584b),</div><div class='add'>+	regmap_reg_range(0x5900, 0x5907),</div><div class='add'>+	regmap_reg_range(0x5914, 0x591b),</div><div class='add'>+	regmap_reg_range(0x5920, 0x5920),</div><div class='add'>+	regmap_reg_range(0x5923, 0x5927),</div><div class='add'>+	regmap_reg_range(0x5a00, 0x5a03),</div><div class='add'>+	regmap_reg_range(0x5a04, 0x5a07),</div><div class='add'>+	regmap_reg_range(0x5b00, 0x5b01),</div><div class='add'>+	regmap_reg_range(0x5b04, 0x5b04),</div><div class='add'>+	regmap_reg_range(0x5c00, 0x5c05),</div><div class='add'>+	regmap_reg_range(0x5c08, 0x5c1b),</div><div class='add'>+</div><div class='add'>+	/* port 6 */</div><div class='add'>+	regmap_reg_range(0x6000, 0x6001),</div><div class='add'>+	regmap_reg_range(0x6013, 0x6013),</div><div class='add'>+	regmap_reg_range(0x6017, 0x6017),</div><div class='add'>+	regmap_reg_range(0x601b, 0x601b),</div><div class='add'>+	regmap_reg_range(0x601f, 0x6020),</div><div class='add'>+	regmap_reg_range(0x6030, 0x6030),</div><div class='add'>+	regmap_reg_range(0x6300, 0x6301),</div><div class='add'>+	regmap_reg_range(0x6400, 0x6401),</div><div class='add'>+	regmap_reg_range(0x6403, 0x6403),</div><div class='add'>+	regmap_reg_range(0x6410, 0x6417),</div><div class='add'>+	regmap_reg_range(0x6420, 0x6423),</div><div class='add'>+	regmap_reg_range(0x6500, 0x6507),</div><div class='add'>+	regmap_reg_range(0x6600, 0x6613),</div><div class='add'>+	regmap_reg_range(0x6800, 0x680f),</div><div class='add'>+	regmap_reg_range(0x6820, 0x6827),</div><div class='add'>+	regmap_reg_range(0x6830, 0x6837),</div><div class='add'>+	regmap_reg_range(0x6840, 0x684b),</div><div class='add'>+	regmap_reg_range(0x6900, 0x6907),</div><div class='add'>+	regmap_reg_range(0x6914, 0x691b),</div><div class='add'>+	regmap_reg_range(0x6920, 0x6920),</div><div class='add'>+	regmap_reg_range(0x6923, 0x6927),</div><div class='add'>+	regmap_reg_range(0x6a00, 0x6a03),</div><div class='add'>+	regmap_reg_range(0x6a04, 0x6a07),</div><div class='add'>+	regmap_reg_range(0x6b00, 0x6b01),</div><div class='add'>+	regmap_reg_range(0x6b04, 0x6b04),</div><div class='add'>+	regmap_reg_range(0x6c00, 0x6c05),</div><div class='add'>+	regmap_reg_range(0x6c08, 0x6c1b),</div><div class='add'>+</div><div class='add'>+	/* port 7 */</div><div class='add'>+	regmap_reg_range(0x7000, 0x7001),</div><div class='add'>+	regmap_reg_range(0x7013, 0x7013),</div><div class='add'>+	regmap_reg_range(0x7017, 0x7017),</div><div class='add'>+	regmap_reg_range(0x701b, 0x701b),</div><div class='add'>+	regmap_reg_range(0x701f, 0x7020),</div><div class='add'>+	regmap_reg_range(0x7030, 0x7030),</div><div class='add'>+	regmap_reg_range(0x7200, 0x7207),</div><div class='add'>+	regmap_reg_range(0x7300, 0x7301),</div><div class='add'>+	regmap_reg_range(0x7400, 0x7401),</div><div class='add'>+	regmap_reg_range(0x7403, 0x7403),</div><div class='add'>+	regmap_reg_range(0x7410, 0x7417),</div><div class='add'>+	regmap_reg_range(0x7420, 0x7423),</div><div class='add'>+	regmap_reg_range(0x7500, 0x7507),</div><div class='add'>+	regmap_reg_range(0x7600, 0x7613),</div><div class='add'>+	regmap_reg_range(0x7800, 0x780f),</div><div class='add'>+	regmap_reg_range(0x7820, 0x7827),</div><div class='add'>+	regmap_reg_range(0x7830, 0x7837),</div><div class='add'>+	regmap_reg_range(0x7840, 0x784b),</div><div class='add'>+	regmap_reg_range(0x7900, 0x7907),</div><div class='add'>+	regmap_reg_range(0x7914, 0x791b),</div><div class='add'>+	regmap_reg_range(0x7920, 0x7920),</div><div class='add'>+	regmap_reg_range(0x7923, 0x7927),</div><div class='add'>+	regmap_reg_range(0x7a00, 0x7a03),</div><div class='add'>+	regmap_reg_range(0x7a04, 0x7a07),</div><div class='add'>+	regmap_reg_range(0x7b00, 0x7b01),</div><div class='add'>+	regmap_reg_range(0x7b04, 0x7b04),</div><div class='add'>+	regmap_reg_range(0x7c00, 0x7c05),</div><div class='add'>+	regmap_reg_range(0x7c08, 0x7c1b),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table ksz9477_register_set = {</div><div class='add'>+	.yes_ranges = ksz9477_valid_regs,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(ksz9477_valid_regs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range ksz9896_valid_regs[] = {</div><div class='add'>+	regmap_reg_range(0x0000, 0x0003),</div><div class='add'>+	regmap_reg_range(0x0006, 0x0006),</div><div class='add'>+	regmap_reg_range(0x0010, 0x001f),</div><div class='add'>+	regmap_reg_range(0x0100, 0x0100),</div><div class='add'>+	regmap_reg_range(0x0103, 0x0107),</div><div class='add'>+	regmap_reg_range(0x010d, 0x010d),</div><div class='add'>+	regmap_reg_range(0x0110, 0x0113),</div><div class='add'>+	regmap_reg_range(0x0120, 0x0127),</div><div class='add'>+	regmap_reg_range(0x0201, 0x0201),</div><div class='add'>+	regmap_reg_range(0x0210, 0x0213),</div><div class='add'>+	regmap_reg_range(0x0300, 0x0300),</div><div class='add'>+	regmap_reg_range(0x0302, 0x030b),</div><div class='add'>+	regmap_reg_range(0x0310, 0x031b),</div><div class='add'>+	regmap_reg_range(0x0320, 0x032b),</div><div class='add'>+	regmap_reg_range(0x0330, 0x0336),</div><div class='add'>+	regmap_reg_range(0x0338, 0x033b),</div><div class='add'>+	regmap_reg_range(0x033e, 0x033e),</div><div class='add'>+	regmap_reg_range(0x0340, 0x035f),</div><div class='add'>+	regmap_reg_range(0x0370, 0x0370),</div><div class='add'>+	regmap_reg_range(0x0378, 0x0378),</div><div class='add'>+	regmap_reg_range(0x037c, 0x037d),</div><div class='add'>+	regmap_reg_range(0x0390, 0x0393),</div><div class='add'>+	regmap_reg_range(0x0400, 0x040e),</div><div class='add'>+	regmap_reg_range(0x0410, 0x042f),</div><div class='add'>+</div><div class='add'>+	/* port 1 */</div><div class='add'>+	regmap_reg_range(0x1000, 0x1001),</div><div class='add'>+	regmap_reg_range(0x1013, 0x1013),</div><div class='add'>+	regmap_reg_range(0x1017, 0x1017),</div><div class='add'>+	regmap_reg_range(0x101b, 0x101b),</div><div class='add'>+	regmap_reg_range(0x101f, 0x1020),</div><div class='add'>+	regmap_reg_range(0x1030, 0x1030),</div><div class='add'>+	regmap_reg_range(0x1100, 0x1115),</div><div class='add'>+	regmap_reg_range(0x111a, 0x111f),</div><div class='add'>+	regmap_reg_range(0x1120, 0x112b),</div><div class='add'>+	regmap_reg_range(0x1134, 0x113b),</div><div class='add'>+	regmap_reg_range(0x113c, 0x113f),</div><div class='add'>+	regmap_reg_range(0x1400, 0x1401),</div><div class='add'>+	regmap_reg_range(0x1403, 0x1403),</div><div class='add'>+	regmap_reg_range(0x1410, 0x1417),</div><div class='add'>+	regmap_reg_range(0x1420, 0x1423),</div><div class='add'>+	regmap_reg_range(0x1500, 0x1507),</div><div class='add'>+	regmap_reg_range(0x1600, 0x1612),</div><div class='add'>+	regmap_reg_range(0x1800, 0x180f),</div><div class='add'>+	regmap_reg_range(0x1820, 0x1827),</div><div class='add'>+	regmap_reg_range(0x1830, 0x1837),</div><div class='add'>+	regmap_reg_range(0x1840, 0x184b),</div><div class='add'>+	regmap_reg_range(0x1900, 0x1907),</div><div class='add'>+	regmap_reg_range(0x1914, 0x1915),</div><div class='add'>+	regmap_reg_range(0x1a00, 0x1a03),</div><div class='add'>+	regmap_reg_range(0x1a04, 0x1a07),</div><div class='add'>+	regmap_reg_range(0x1b00, 0x1b01),</div><div class='add'>+	regmap_reg_range(0x1b04, 0x1b04),</div><div class='add'>+</div><div class='add'>+	/* port 2 */</div><div class='add'>+	regmap_reg_range(0x2000, 0x2001),</div><div class='add'>+	regmap_reg_range(0x2013, 0x2013),</div><div class='add'>+	regmap_reg_range(0x2017, 0x2017),</div><div class='add'>+	regmap_reg_range(0x201b, 0x201b),</div><div class='add'>+	regmap_reg_range(0x201f, 0x2020),</div><div class='add'>+	regmap_reg_range(0x2030, 0x2030),</div><div class='add'>+	regmap_reg_range(0x2100, 0x2115),</div><div class='add'>+	regmap_reg_range(0x211a, 0x211f),</div><div class='add'>+	regmap_reg_range(0x2120, 0x212b),</div><div class='add'>+	regmap_reg_range(0x2134, 0x213b),</div><div class='add'>+	regmap_reg_range(0x213c, 0x213f),</div><div class='add'>+	regmap_reg_range(0x2400, 0x2401),</div><div class='add'>+	regmap_reg_range(0x2403, 0x2403),</div><div class='add'>+	regmap_reg_range(0x2410, 0x2417),</div><div class='add'>+	regmap_reg_range(0x2420, 0x2423),</div><div class='add'>+	regmap_reg_range(0x2500, 0x2507),</div><div class='add'>+	regmap_reg_range(0x2600, 0x2612),</div><div class='add'>+	regmap_reg_range(0x2800, 0x280f),</div><div class='add'>+	regmap_reg_range(0x2820, 0x2827),</div><div class='add'>+	regmap_reg_range(0x2830, 0x2837),</div><div class='add'>+	regmap_reg_range(0x2840, 0x284b),</div><div class='add'>+	regmap_reg_range(0x2900, 0x2907),</div><div class='add'>+	regmap_reg_range(0x2914, 0x2915),</div><div class='add'>+	regmap_reg_range(0x2a00, 0x2a03),</div><div class='add'>+	regmap_reg_range(0x2a04, 0x2a07),</div><div class='add'>+	regmap_reg_range(0x2b00, 0x2b01),</div><div class='add'>+	regmap_reg_range(0x2b04, 0x2b04),</div><div class='add'>+</div><div class='add'>+	/* port 3 */</div><div class='add'>+	regmap_reg_range(0x3000, 0x3001),</div><div class='add'>+	regmap_reg_range(0x3013, 0x3013),</div><div class='add'>+	regmap_reg_range(0x3017, 0x3017),</div><div class='add'>+	regmap_reg_range(0x301b, 0x301b),</div><div class='add'>+	regmap_reg_range(0x301f, 0x3020),</div><div class='add'>+	regmap_reg_range(0x3030, 0x3030),</div><div class='add'>+	regmap_reg_range(0x3100, 0x3115),</div><div class='add'>+	regmap_reg_range(0x311a, 0x311f),</div><div class='add'>+	regmap_reg_range(0x3120, 0x312b),</div><div class='add'>+	regmap_reg_range(0x3134, 0x313b),</div><div class='add'>+	regmap_reg_range(0x313c, 0x313f),</div><div class='add'>+	regmap_reg_range(0x3400, 0x3401),</div><div class='add'>+	regmap_reg_range(0x3403, 0x3403),</div><div class='add'>+	regmap_reg_range(0x3410, 0x3417),</div><div class='add'>+	regmap_reg_range(0x3420, 0x3423),</div><div class='add'>+	regmap_reg_range(0x3500, 0x3507),</div><div class='add'>+	regmap_reg_range(0x3600, 0x3612),</div><div class='add'>+	regmap_reg_range(0x3800, 0x380f),</div><div class='add'>+	regmap_reg_range(0x3820, 0x3827),</div><div class='add'>+	regmap_reg_range(0x3830, 0x3837),</div><div class='add'>+	regmap_reg_range(0x3840, 0x384b),</div><div class='add'>+	regmap_reg_range(0x3900, 0x3907),</div><div class='add'>+	regmap_reg_range(0x3914, 0x3915),</div><div class='add'>+	regmap_reg_range(0x3a00, 0x3a03),</div><div class='add'>+	regmap_reg_range(0x3a04, 0x3a07),</div><div class='add'>+	regmap_reg_range(0x3b00, 0x3b01),</div><div class='add'>+	regmap_reg_range(0x3b04, 0x3b04),</div><div class='add'>+</div><div class='add'>+	/* port 4 */</div><div class='add'>+	regmap_reg_range(0x4000, 0x4001),</div><div class='add'>+	regmap_reg_range(0x4013, 0x4013),</div><div class='add'>+	regmap_reg_range(0x4017, 0x4017),</div><div class='add'>+	regmap_reg_range(0x401b, 0x401b),</div><div class='add'>+	regmap_reg_range(0x401f, 0x4020),</div><div class='add'>+	regmap_reg_range(0x4030, 0x4030),</div><div class='add'>+	regmap_reg_range(0x4100, 0x4115),</div><div class='add'>+	regmap_reg_range(0x411a, 0x411f),</div><div class='add'>+	regmap_reg_range(0x4120, 0x412b),</div><div class='add'>+	regmap_reg_range(0x4134, 0x413b),</div><div class='add'>+	regmap_reg_range(0x413c, 0x413f),</div><div class='add'>+	regmap_reg_range(0x4400, 0x4401),</div><div class='add'>+	regmap_reg_range(0x4403, 0x4403),</div><div class='add'>+	regmap_reg_range(0x4410, 0x4417),</div><div class='add'>+	regmap_reg_range(0x4420, 0x4423),</div><div class='add'>+	regmap_reg_range(0x4500, 0x4507),</div><div class='add'>+	regmap_reg_range(0x4600, 0x4612),</div><div class='add'>+	regmap_reg_range(0x4800, 0x480f),</div><div class='add'>+	regmap_reg_range(0x4820, 0x4827),</div><div class='add'>+	regmap_reg_range(0x4830, 0x4837),</div><div class='add'>+	regmap_reg_range(0x4840, 0x484b),</div><div class='add'>+	regmap_reg_range(0x4900, 0x4907),</div><div class='add'>+	regmap_reg_range(0x4914, 0x4915),</div><div class='add'>+	regmap_reg_range(0x4a00, 0x4a03),</div><div class='add'>+	regmap_reg_range(0x4a04, 0x4a07),</div><div class='add'>+	regmap_reg_range(0x4b00, 0x4b01),</div><div class='add'>+	regmap_reg_range(0x4b04, 0x4b04),</div><div class='add'>+</div><div class='add'>+	/* port 5 */</div><div class='add'>+	regmap_reg_range(0x5000, 0x5001),</div><div class='add'>+	regmap_reg_range(0x5013, 0x5013),</div><div class='add'>+	regmap_reg_range(0x5017, 0x5017),</div><div class='add'>+	regmap_reg_range(0x501b, 0x501b),</div><div class='add'>+	regmap_reg_range(0x501f, 0x5020),</div><div class='add'>+	regmap_reg_range(0x5030, 0x5030),</div><div class='add'>+	regmap_reg_range(0x5100, 0x5115),</div><div class='add'>+	regmap_reg_range(0x511a, 0x511f),</div><div class='add'>+	regmap_reg_range(0x5120, 0x512b),</div><div class='add'>+	regmap_reg_range(0x5134, 0x513b),</div><div class='add'>+	regmap_reg_range(0x513c, 0x513f),</div><div class='add'>+	regmap_reg_range(0x5400, 0x5401),</div><div class='add'>+	regmap_reg_range(0x5403, 0x5403),</div><div class='add'>+	regmap_reg_range(0x5410, 0x5417),</div><div class='add'>+	regmap_reg_range(0x5420, 0x5423),</div><div class='add'>+	regmap_reg_range(0x5500, 0x5507),</div><div class='add'>+	regmap_reg_range(0x5600, 0x5612),</div><div class='add'>+	regmap_reg_range(0x5800, 0x580f),</div><div class='add'>+	regmap_reg_range(0x5820, 0x5827),</div><div class='add'>+	regmap_reg_range(0x5830, 0x5837),</div><div class='add'>+	regmap_reg_range(0x5840, 0x584b),</div><div class='add'>+	regmap_reg_range(0x5900, 0x5907),</div><div class='add'>+	regmap_reg_range(0x5914, 0x5915),</div><div class='add'>+	regmap_reg_range(0x5a00, 0x5a03),</div><div class='add'>+	regmap_reg_range(0x5a04, 0x5a07),</div><div class='add'>+	regmap_reg_range(0x5b00, 0x5b01),</div><div class='add'>+	regmap_reg_range(0x5b04, 0x5b04),</div><div class='add'>+</div><div class='add'>+	/* port 6 */</div><div class='add'>+	regmap_reg_range(0x6000, 0x6001),</div><div class='add'>+	regmap_reg_range(0x6013, 0x6013),</div><div class='add'>+	regmap_reg_range(0x6017, 0x6017),</div><div class='add'>+	regmap_reg_range(0x601b, 0x601b),</div><div class='add'>+	regmap_reg_range(0x601f, 0x6020),</div><div class='add'>+	regmap_reg_range(0x6030, 0x6030),</div><div class='add'>+	regmap_reg_range(0x6100, 0x6115),</div><div class='add'>+	regmap_reg_range(0x611a, 0x611f),</div><div class='add'>+	regmap_reg_range(0x6120, 0x612b),</div><div class='add'>+	regmap_reg_range(0x6134, 0x613b),</div><div class='add'>+	regmap_reg_range(0x613c, 0x613f),</div><div class='add'>+	regmap_reg_range(0x6300, 0x6301),</div><div class='add'>+	regmap_reg_range(0x6400, 0x6401),</div><div class='add'>+	regmap_reg_range(0x6403, 0x6403),</div><div class='add'>+	regmap_reg_range(0x6410, 0x6417),</div><div class='add'>+	regmap_reg_range(0x6420, 0x6423),</div><div class='add'>+	regmap_reg_range(0x6500, 0x6507),</div><div class='add'>+	regmap_reg_range(0x6600, 0x6612),</div><div class='add'>+	regmap_reg_range(0x6800, 0x680f),</div><div class='add'>+	regmap_reg_range(0x6820, 0x6827),</div><div class='add'>+	regmap_reg_range(0x6830, 0x6837),</div><div class='add'>+	regmap_reg_range(0x6840, 0x684b),</div><div class='add'>+	regmap_reg_range(0x6900, 0x6907),</div><div class='add'>+	regmap_reg_range(0x6914, 0x6915),</div><div class='add'>+	regmap_reg_range(0x6a00, 0x6a03),</div><div class='add'>+	regmap_reg_range(0x6a04, 0x6a07),</div><div class='add'>+	regmap_reg_range(0x6b00, 0x6b01),</div><div class='add'>+	regmap_reg_range(0x6b04, 0x6b04),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table ksz9896_register_set = {</div><div class='add'>+	.yes_ranges = ksz9896_valid_regs,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(ksz9896_valid_regs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range ksz8873_valid_regs[] = {</div><div class='add'>+	regmap_reg_range(0x00, 0x01),</div><div class='add'>+	/* global control register */</div><div class='add'>+	regmap_reg_range(0x02, 0x0f),</div><div class='add'>+</div><div class='add'>+	/* port registers */</div><div class='add'>+	regmap_reg_range(0x10, 0x1d),</div><div class='add'>+	regmap_reg_range(0x1e, 0x1f),</div><div class='add'>+	regmap_reg_range(0x20, 0x2d),</div><div class='add'>+	regmap_reg_range(0x2e, 0x2f),</div><div class='add'>+	regmap_reg_range(0x30, 0x39),</div><div class='add'>+	regmap_reg_range(0x3f, 0x3f),</div><div class='add'>+</div><div class='add'>+	/* advanced control registers */</div><div class='add'>+	regmap_reg_range(0x43, 0x43),</div><div class='add'>+	regmap_reg_range(0x60, 0x6f),</div><div class='add'>+	regmap_reg_range(0x70, 0x75),</div><div class='add'>+	regmap_reg_range(0x76, 0x78),</div><div class='add'>+	regmap_reg_range(0x79, 0x7a),</div><div class='add'>+	regmap_reg_range(0x7b, 0x83),</div><div class='add'>+	regmap_reg_range(0x8e, 0x99),</div><div class='add'>+	regmap_reg_range(0x9a, 0xa5),</div><div class='add'>+	regmap_reg_range(0xa6, 0xa6),</div><div class='add'>+	regmap_reg_range(0xa7, 0xaa),</div><div class='add'>+	regmap_reg_range(0xab, 0xae),</div><div class='add'>+	regmap_reg_range(0xaf, 0xba),</div><div class='add'>+	regmap_reg_range(0xbb, 0xbc),</div><div class='add'>+	regmap_reg_range(0xbd, 0xbd),</div><div class='add'>+	regmap_reg_range(0xc0, 0xc0),</div><div class='add'>+	regmap_reg_range(0xc2, 0xc2),</div><div class='add'>+	regmap_reg_range(0xc3, 0xc3),</div><div class='add'>+	regmap_reg_range(0xc4, 0xc4),</div><div class='add'>+	regmap_reg_range(0xc6, 0xc6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table ksz8873_register_set = {</div><div class='add'>+	.yes_ranges = ksz8873_valid_regs,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(ksz8873_valid_regs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct ksz_chip_data ksz_switch_chips[] = {</div><div class='add'>+	[KSZ8463] = {</div><div class='add'>+		.chip_id = KSZ8463_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8463",</div><div class='add'>+		.num_vlans = 16,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 8,</div><div class='add'>+		.cpu_ports = 0x4,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 3,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz8463_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz88x3_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz88xx_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8463_regs,</div><div class='add'>+		.masks = ksz8463_masks,</div><div class='add'>+		.shifts = ksz8463_shifts,</div><div class='add'>+		.supports_mii = {false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, true},</div><div class='add'>+		.internal_phy = {true, true, false},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8563] = {</div><div class='add'>+		.chip_id = KSZ8563_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8563",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x07,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 3,		/* total port count */</div><div class='add'>+		.port_nirqs = 3,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz8795_xmii_ctrl1, /* Same as ksz8795 */</div><div class='add'>+		.supports_mii = {false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, true},</div><div class='add'>+		.internal_phy = {true, true, false},</div><div class='add'>+		.gbit_capable = {false, false, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+		.wr_table = &amp;ksz8563_register_set,</div><div class='add'>+		.rd_table = &amp;ksz8563_register_set,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8795] = {</div><div class='add'>+		.chip_id = KSZ8795_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8795",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 32,</div><div class='add'>+		.cpu_ports = 0x10,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total cpu and user ports */</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz87xx_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz8_phylink_mac_ops,</div><div class='add'>+		.ksz87xx_eee_link_erratum = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8795_regs,</div><div class='add'>+		.masks = ksz8795_masks,</div><div class='add'>+		.shifts = ksz8795_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz8795_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz8795_xmii_ctrl1,</div><div class='add'>+		.supports_mii = {false, false, false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false, true},</div><div class='add'>+		.internal_phy = {true, true, true, true, false},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8794] = {</div><div class='add'>+		/* WARNING</div><div class='add'>+		 * =======</div><div class='add'>+		 * KSZ8794 is similar to KSZ8795, except the port map</div><div class='add'>+		 * contains a gap between external and CPU ports, the</div><div class='add'>+		 * port map is NOT continuous. The per-port register</div><div class='add'>+		 * map is shifted accordingly too, i.e. registers at</div><div class='add'>+		 * offset 0x40 are NOT used on KSZ8794 and they ARE</div><div class='add'>+		 * used on KSZ8795 for external port 3.</div><div class='add'>+		 *           external  cpu</div><div class='add'>+		 * KSZ8794   0,1,2      4</div><div class='add'>+		 * KSZ8795   0,1,2,3    4</div><div class='add'>+		 * KSZ8765   0,1,2,3    4</div><div class='add'>+		 * port_cnt is configured as 5, even though it is 4</div><div class='add'>+		 */</div><div class='add'>+		.chip_id = KSZ8794_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8794",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 32,</div><div class='add'>+		.cpu_ports = 0x10,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total cpu and user ports */</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz87xx_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz8_phylink_mac_ops,</div><div class='add'>+		.ksz87xx_eee_link_erratum = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8795_regs,</div><div class='add'>+		.masks = ksz8795_masks,</div><div class='add'>+		.shifts = ksz8795_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz8795_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz8795_xmii_ctrl1,</div><div class='add'>+		.supports_mii = {false, false, false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false, true},</div><div class='add'>+		.internal_phy = {true, true, true, false, false},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8765] = {</div><div class='add'>+		.chip_id = KSZ8765_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8765",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 32,</div><div class='add'>+		.cpu_ports = 0x10,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total cpu and user ports */</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz87xx_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz8_phylink_mac_ops,</div><div class='add'>+		.ksz87xx_eee_link_erratum = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8795_regs,</div><div class='add'>+		.masks = ksz8795_masks,</div><div class='add'>+		.shifts = ksz8795_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz8795_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz8795_xmii_ctrl1,</div><div class='add'>+		.supports_mii = {false, false, false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false, true},</div><div class='add'>+		.internal_phy = {true, true, true, true, false},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ88X3] = {</div><div class='add'>+		.chip_id = KSZ88X3_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8863/KSZ8873",</div><div class='add'>+		.num_vlans = 16,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 8,</div><div class='add'>+		.cpu_ports = 0x4,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 3,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz88xx_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz88x3_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz88xx_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8863_regs,</div><div class='add'>+		.masks = ksz8863_masks,</div><div class='add'>+		.shifts = ksz8863_shifts,</div><div class='add'>+		.supports_mii = {false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, true},</div><div class='add'>+		.internal_phy = {true, true, false},</div><div class='add'>+		.wr_table = &amp;ksz8873_register_set,</div><div class='add'>+		.rd_table = &amp;ksz8873_register_set,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8864] = {</div><div class='add'>+		/* WARNING</div><div class='add'>+		 * =======</div><div class='add'>+		 * KSZ8864 is similar to KSZ8895, except the first port</div><div class='add'>+		 * does not exist.</div><div class='add'>+		 *           external  cpu</div><div class='add'>+		 * KSZ8864   1,2,3      4</div><div class='add'>+		 * KSZ8895   0,1,2,3    4</div><div class='add'>+		 * port_cnt is configured as 5, even though it is 4</div><div class='add'>+		 */</div><div class='add'>+		.chip_id = KSZ8864_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8864",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 32,</div><div class='add'>+		.cpu_ports = 0x10,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total cpu and user ports */</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz88xx_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz88x3_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz88xx_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8895_regs,</div><div class='add'>+		.masks = ksz8895_masks,</div><div class='add'>+		.shifts = ksz8895_shifts,</div><div class='add'>+		.supports_mii = {false, false, false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true},</div><div class='add'>+		.internal_phy = {false, true, true, true, false},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8895] = {</div><div class='add'>+		.chip_id = KSZ8895_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8895",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 0,</div><div class='add'>+		.num_statics = 32,</div><div class='add'>+		.cpu_ports = 0x10,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total cpu and user ports */</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 4,</div><div class='add'>+		.ops = &amp;ksz88xx_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz88x3_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz88xx_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz88xx_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz8895_regs,</div><div class='add'>+		.masks = ksz8895_masks,</div><div class='add'>+		.shifts = ksz8895_shifts,</div><div class='add'>+		.supports_mii = {false, false, false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true},</div><div class='add'>+		.internal_phy = {true, true, true, true, false},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ9477] = {</div><div class='add'>+		.chip_id = KSZ9477_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ9477",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 7,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 4,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.phy_errata_9477 = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   false, true, false},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   false, true, false},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   false, true, false},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   true, false, false},</div><div class='add'>+		.gbit_capable	= {true, true, true, true, true, true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+		.sgmii_port = 7,</div><div class='add'>+		.wr_table = &amp;ksz9477_register_set,</div><div class='add'>+		.rd_table = &amp;ksz9477_register_set,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ9896] = {</div><div class='add'>+		.chip_id = KSZ9896_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ9896",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x3F,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 6,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 2,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.phy_errata_9477 = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   false, true},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   false, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   false, true},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   true, false},</div><div class='add'>+		.gbit_capable	= {true, true, true, true, true, true},</div><div class='add'>+		.wr_table = &amp;ksz9896_register_set,</div><div class='add'>+		.rd_table = &amp;ksz9896_register_set,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ9897] = {</div><div class='add'>+		.chip_id = KSZ9897_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ9897",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 7,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 2,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.phy_errata_9477 = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   true, false, false},</div><div class='add'>+		.gbit_capable	= {true, true, true, true, true, true, true},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ9893] = {</div><div class='add'>+		.chip_id = KSZ9893_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ9893",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x07,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 3,		/* total port count */</div><div class='add'>+		.port_nirqs = 2,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz8795_xmii_ctrl1, /* Same as ksz8795 */</div><div class='add'>+		.supports_mii = {false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, true},</div><div class='add'>+		.internal_phy = {true, true, false},</div><div class='add'>+		.gbit_capable = {true, true, true},</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ9563] = {</div><div class='add'>+		.chip_id = KSZ9563_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ9563",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x07,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 3,		/* total port count */</div><div class='add'>+		.port_nirqs = 3,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz8795_xmii_ctrl1, /* Same as ksz8795 */</div><div class='add'>+		.supports_mii = {false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, true},</div><div class='add'>+		.internal_phy = {true, true, false},</div><div class='add'>+		.gbit_capable = {true, true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ8567] = {</div><div class='add'>+		.chip_id = KSZ8567_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ8567",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 7,		/* total port count */</div><div class='add'>+		.port_nirqs = 3,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.phy_errata_9477 = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   true, false, false},</div><div class='add'>+		.gbit_capable	= {false, false, false, false, false,</div><div class='add'>+				   true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[KSZ9567] = {</div><div class='add'>+		.chip_id = KSZ9567_CHIP_ID,</div><div class='add'>+		.dev_name = "KSZ9567",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 7,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 3,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   true, false, false},</div><div class='add'>+		.gbit_capable	= {true, true, true, true, true, true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[LAN9370] = {</div><div class='add'>+		.chip_id = LAN9370_CHIP_ID,</div><div class='add'>+		.dev_name = "LAN9370",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 1024,</div><div class='add'>+		.num_statics = 256,</div><div class='add'>+		.cpu_ports = 0x10,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 6,</div><div class='add'>+		.num_tx_queues = 8,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.phy_side_mdio_supported = true,</div><div class='add'>+		.ops = &amp;lan937x_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;lan937x_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = lan937x_masks,</div><div class='add'>+		.shifts = lan937x_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii = {false, false, false, false, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false, true},</div><div class='add'>+		.internal_phy = {true, true, true, true, false},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[LAN9371] = {</div><div class='add'>+		.chip_id = LAN9371_CHIP_ID,</div><div class='add'>+		.dev_name = "LAN9371",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 1024,</div><div class='add'>+		.num_statics = 256,</div><div class='add'>+		.cpu_ports = 0x30,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 6,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 6,</div><div class='add'>+		.num_tx_queues = 8,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.phy_side_mdio_supported = true,</div><div class='add'>+		.ops = &amp;lan937x_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;lan937x_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = lan937x_masks,</div><div class='add'>+		.shifts = lan937x_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii = {false, false, false, false, true, true},</div><div class='add'>+		.supports_rmii = {false, false, false, false, true, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false, true, true},</div><div class='add'>+		.internal_phy = {true, true, true, true, false, false},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[LAN9372] = {</div><div class='add'>+		.chip_id = LAN9372_CHIP_ID,</div><div class='add'>+		.dev_name = "LAN9372",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 1024,</div><div class='add'>+		.num_statics = 256,</div><div class='add'>+		.cpu_ports = 0x30,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 8,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 6,</div><div class='add'>+		.num_tx_queues = 8,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.phy_side_mdio_supported = true,</div><div class='add'>+		.ops = &amp;lan937x_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;lan937x_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = lan937x_masks,</div><div class='add'>+		.shifts = lan937x_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   false, false, true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[LAN9373] = {</div><div class='add'>+		.chip_id = LAN9373_CHIP_ID,</div><div class='add'>+		.dev_name = "LAN9373",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 1024,</div><div class='add'>+		.num_statics = 256,</div><div class='add'>+		.cpu_ports = 0x38,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 5,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 6,</div><div class='add'>+		.num_tx_queues = 8,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.phy_side_mdio_supported = true,</div><div class='add'>+		.ops = &amp;lan937x_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;lan937x_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = lan937x_masks,</div><div class='add'>+		.shifts = lan937x_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.internal_phy	= {true, true, true, false,</div><div class='add'>+				   false, false, true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[LAN9374] = {</div><div class='add'>+		.chip_id = LAN9374_CHIP_ID,</div><div class='add'>+		.dev_name = "LAN9374",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 1024,</div><div class='add'>+		.num_statics = 256,</div><div class='add'>+		.cpu_ports = 0x30,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 8,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 6,</div><div class='add'>+		.num_tx_queues = 8,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.tc_cbs_supported = true,</div><div class='add'>+		.phy_side_mdio_supported = true,</div><div class='add'>+		.ops = &amp;lan937x_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;lan937x_phylink_mac_ops,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = lan937x_masks,</div><div class='add'>+		.shifts = lan937x_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   true, true, false, false},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   false, false, true, true},</div><div class='add'>+		.ptp_capable = true,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[LAN9646] = {</div><div class='add'>+		.chip_id = LAN9646_CHIP_ID,</div><div class='add'>+		.dev_name = "LAN9646",</div><div class='add'>+		.num_vlans = 4096,</div><div class='add'>+		.num_alus = 4096,</div><div class='add'>+		.num_statics = 16,</div><div class='add'>+		.cpu_ports = 0x7F,	/* can be configured as cpu port */</div><div class='add'>+		.port_cnt = 7,		/* total physical port count */</div><div class='add'>+		.port_nirqs = 4,</div><div class='add'>+		.num_tx_queues = 4,</div><div class='add'>+		.num_ipms = 8,</div><div class='add'>+		.ops = &amp;ksz9477_dev_ops,</div><div class='add'>+		.phylink_mac_ops = &amp;ksz9477_phylink_mac_ops,</div><div class='add'>+		.phy_errata_9477 = true,</div><div class='add'>+		.mib_names = ksz9477_mib_names,</div><div class='add'>+		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),</div><div class='add'>+		.reg_mib_cnt = MIB_COUNTER_NUM,</div><div class='add'>+		.regs = ksz9477_regs,</div><div class='add'>+		.masks = ksz9477_masks,</div><div class='add'>+		.shifts = ksz9477_shifts,</div><div class='add'>+		.xmii_ctrl0 = ksz9477_xmii_ctrl0,</div><div class='add'>+		.xmii_ctrl1 = ksz9477_xmii_ctrl1,</div><div class='add'>+		.supports_mii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rmii	= {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.supports_rgmii = {false, false, false, false,</div><div class='add'>+				   false, true, true},</div><div class='add'>+		.internal_phy	= {true, true, true, true,</div><div class='add'>+				   true, false, false},</div><div class='add'>+		.gbit_capable	= {true, true, true, true, true, true, true},</div><div class='add'>+		.sgmii_port = 7,</div><div class='add'>+		.wr_table = &amp;ksz9477_register_set,</div><div class='add'>+		.rd_table = &amp;ksz9477_register_set,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(ksz_switch_chips);</div><div class='add'>+</div><div class='add'>+static const struct ksz_chip_data *ksz_lookup_info(unsigned int prod_num)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_port *p;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dev-&gt;port_cnt; i++) {</div><div class='del'>-		if (i == port || i == dev-&gt;cpu_port)</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ksz_switch_chips); i++) {</div><div class='add'>+		const struct ksz_chip_data *chip = &amp;ksz_switch_chips[i];</div><div class='add'>+</div><div class='add'>+		if (chip-&gt;chip_id == prod_num)</div><div class='add'>+			return chip;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_check_device_id(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ksz_chip_data *expected_chip_data;</div><div class='add'>+	u32 expected_chip_id;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;pdata) {</div><div class='add'>+		expected_chip_id = dev-&gt;pdata-&gt;chip_id;</div><div class='add'>+		expected_chip_data = ksz_lookup_info(expected_chip_id);</div><div class='add'>+		if (WARN_ON(!expected_chip_data))</div><div class='add'>+			return -ENODEV;</div><div class='add'>+	} else {</div><div class='add'>+		expected_chip_data = of_device_get_match_data(dev-&gt;dev);</div><div class='add'>+		expected_chip_id = expected_chip_data-&gt;chip_id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (expected_chip_id != dev-&gt;chip_id) {</div><div class='add'>+		dev_err(dev-&gt;dev,</div><div class='add'>+			"Device tree specifies chip %s but found %s, please fix it!\n",</div><div class='add'>+			expected_chip_data-&gt;dev_name, dev-&gt;info-&gt;dev_name);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;supports_mii[port])</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;supports_rmii[port])</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;supports_rgmii[port])</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;internal_phy[port]) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		/* Compatibility for phylib's default interface type when the</div><div class='add'>+		 * phy-mode property is absent</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;get_caps)</div><div class='add'>+		dev-&gt;dev_ops-&gt;get_caps(dev, port, config);</div><div class='add'>+</div><div class='add'>+	if (ds-&gt;ops-&gt;support_eee &amp;&amp; ds-&gt;ops-&gt;support_eee(ds, port)) {</div><div class='add'>+		memcpy(config-&gt;lpi_interfaces, config-&gt;supported_interfaces,</div><div class='add'>+		       sizeof(config-&gt;lpi_interfaces));</div><div class='add'>+</div><div class='add'>+		config-&gt;lpi_capabilities = MAC_100FD;</div><div class='add'>+		if (dev-&gt;info-&gt;gbit_capable[port])</div><div class='add'>+			config-&gt;lpi_capabilities |= MAC_1000FD;</div><div class='add'>+</div><div class='add'>+		/* EEE is fully operational */</div><div class='add'>+		config-&gt;eee_enabled_default = true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz_r_mib_stats64(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_pause_stats *pstats;</div><div class='add'>+	struct rtnl_link_stats64 *stats;</div><div class='add'>+	struct ksz_stats_raw *raw;</div><div class='add'>+	struct ksz_port_mib *mib;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mib = &amp;dev-&gt;ports[port].mib;</div><div class='add'>+	stats = &amp;mib-&gt;stats64;</div><div class='add'>+	pstats = &amp;mib-&gt;pause_stats;</div><div class='add'>+	raw = (struct ksz_stats_raw *)mib-&gt;counters;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets = raw-&gt;rx_bcast + raw-&gt;rx_mcast + raw-&gt;rx_ucast +</div><div class='add'>+		raw-&gt;rx_pause;</div><div class='add'>+	stats-&gt;tx_packets = raw-&gt;tx_bcast + raw-&gt;tx_mcast + raw-&gt;tx_ucast +</div><div class='add'>+		raw-&gt;tx_pause;</div><div class='add'>+</div><div class='add'>+	/* HW counters are counting bytes + FCS which is not acceptable</div><div class='add'>+	 * for rtnl_link_stats64 interface</div><div class='add'>+	 */</div><div class='add'>+	stats-&gt;rx_bytes = raw-&gt;rx_total - stats-&gt;rx_packets * ETH_FCS_LEN;</div><div class='add'>+	stats-&gt;tx_bytes = raw-&gt;tx_total - stats-&gt;tx_packets * ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_length_errors = raw-&gt;rx_undersize + raw-&gt;rx_fragments +</div><div class='add'>+		raw-&gt;rx_oversize;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_crc_errors = raw-&gt;rx_crc_err;</div><div class='add'>+	stats-&gt;rx_frame_errors = raw-&gt;rx_align_err;</div><div class='add'>+	stats-&gt;rx_dropped = raw-&gt;rx_discards;</div><div class='add'>+	stats-&gt;rx_errors = stats-&gt;rx_length_errors + stats-&gt;rx_crc_errors +</div><div class='add'>+		stats-&gt;rx_frame_errors  + stats-&gt;rx_dropped;</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_window_errors = raw-&gt;tx_late_col;</div><div class='add'>+	stats-&gt;tx_fifo_errors = raw-&gt;tx_discards;</div><div class='add'>+	stats-&gt;tx_aborted_errors = raw-&gt;tx_exc_col;</div><div class='add'>+	stats-&gt;tx_errors = stats-&gt;tx_window_errors + stats-&gt;tx_fifo_errors +</div><div class='add'>+		stats-&gt;tx_aborted_errors;</div><div class='add'>+</div><div class='add'>+	stats-&gt;multicast = raw-&gt;rx_mcast;</div><div class='add'>+	stats-&gt;collisions = raw-&gt;tx_total_col;</div><div class='add'>+</div><div class='add'>+	pstats-&gt;tx_pause_frames = raw-&gt;tx_pause;</div><div class='add'>+	pstats-&gt;rx_pause_frames = raw-&gt;rx_pause;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;phy_errata_9477 &amp;&amp; !ksz_is_sgmii_port(dev, port)) {</div><div class='add'>+		ret = ksz9477_errata_monitor(dev, port, raw-&gt;tx_late_col);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(dev-&gt;dev, "Failed to monitor transmission halt\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz88xx_r_mib_stats64(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_pause_stats *pstats;</div><div class='add'>+	struct rtnl_link_stats64 *stats;</div><div class='add'>+	struct ksz88xx_stats_raw *raw;</div><div class='add'>+	struct ksz_port_mib *mib;</div><div class='add'>+</div><div class='add'>+	mib = &amp;dev-&gt;ports[port].mib;</div><div class='add'>+	stats = &amp;mib-&gt;stats64;</div><div class='add'>+	pstats = &amp;mib-&gt;pause_stats;</div><div class='add'>+	raw = (struct ksz88xx_stats_raw *)mib-&gt;counters;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets = raw-&gt;rx_bcast + raw-&gt;rx_mcast + raw-&gt;rx_ucast +</div><div class='add'>+		raw-&gt;rx_pause;</div><div class='add'>+	stats-&gt;tx_packets = raw-&gt;tx_bcast + raw-&gt;tx_mcast + raw-&gt;tx_ucast +</div><div class='add'>+		raw-&gt;tx_pause;</div><div class='add'>+</div><div class='add'>+	/* HW counters are counting bytes + FCS which is not acceptable</div><div class='add'>+	 * for rtnl_link_stats64 interface</div><div class='add'>+	 */</div><div class='add'>+	stats-&gt;rx_bytes = raw-&gt;rx + raw-&gt;rx_hi - stats-&gt;rx_packets * ETH_FCS_LEN;</div><div class='add'>+	stats-&gt;tx_bytes = raw-&gt;tx + raw-&gt;tx_hi - stats-&gt;tx_packets * ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_length_errors = raw-&gt;rx_undersize + raw-&gt;rx_fragments +</div><div class='add'>+		raw-&gt;rx_oversize;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_crc_errors = raw-&gt;rx_crc_err;</div><div class='add'>+	stats-&gt;rx_frame_errors = raw-&gt;rx_align_err;</div><div class='add'>+	stats-&gt;rx_dropped = raw-&gt;rx_discards;</div><div class='add'>+	stats-&gt;rx_errors = stats-&gt;rx_length_errors + stats-&gt;rx_crc_errors +</div><div class='add'>+		stats-&gt;rx_frame_errors  + stats-&gt;rx_dropped;</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_window_errors = raw-&gt;tx_late_col;</div><div class='add'>+	stats-&gt;tx_fifo_errors = raw-&gt;tx_discards;</div><div class='add'>+	stats-&gt;tx_aborted_errors = raw-&gt;tx_exc_col;</div><div class='add'>+	stats-&gt;tx_errors = stats-&gt;tx_window_errors + stats-&gt;tx_fifo_errors +</div><div class='add'>+		stats-&gt;tx_aborted_errors;</div><div class='add'>+</div><div class='add'>+	stats-&gt;multicast = raw-&gt;rx_mcast;</div><div class='add'>+	stats-&gt;collisions = raw-&gt;tx_total_col;</div><div class='add'>+</div><div class='add'>+	pstats-&gt;tx_pause_frames = raw-&gt;tx_pause;</div><div class='add'>+	pstats-&gt;rx_pause_frames = raw-&gt;rx_pause;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port_mib *mib;</div><div class='add'>+</div><div class='add'>+	mib = &amp;dev-&gt;ports[port].mib;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+	memcpy(s, &amp;mib-&gt;stats64, sizeof(*s));</div><div class='add'>+	spin_unlock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_get_pause_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port_mib *mib;</div><div class='add'>+</div><div class='add'>+	mib = &amp;dev-&gt;ports[port].mib;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+	memcpy(pause_stats, &amp;mib-&gt;pause_stats, sizeof(*pause_stats));</div><div class='add'>+	spin_unlock(&amp;mib-&gt;stats64_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_get_strings(struct dsa_switch *ds, int port,</div><div class='add'>+			    u32 stringset, uint8_t *buf)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;mib_cnt; i++)</div><div class='add'>+		ethtool_puts(&amp;buf, dev-&gt;info-&gt;mib_names[i].string);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_update_port_member - Adjust port forwarding rules based on STP state and</div><div class='add'>+ *			    isolation settings.</div><div class='add'>+ * @dev: A pointer to the struct ksz_device representing the device.</div><div class='add'>+ * @port: The port number to adjust.</div><div class='add'>+ *</div><div class='add'>+ * This function dynamically adjusts the port membership configuration for a</div><div class='add'>+ * specified port and other device ports, based on Spanning Tree Protocol (STP)</div><div class='add'>+ * states and port isolation settings. Each port, including the CPU port, has a</div><div class='add'>+ * membership register, represented as a bitfield, where each bit corresponds</div><div class='add'>+ * to a port number. A set bit indicates permission to forward frames to that</div><div class='add'>+ * port. This function iterates over all ports, updating the membership register</div><div class='add'>+ * to reflect current forwarding permissions:</div><div class='add'>+ *</div><div class='add'>+ * 1. Forwards frames only to ports that are part of the same bridge group and</div><div class='add'>+ *    in the BR_STATE_FORWARDING state.</div><div class='add'>+ * 2. Takes into account the isolation status of ports; ports in the</div><div class='add'>+ *    BR_STATE_FORWARDING state with BR_ISOLATED configuration will not forward</div><div class='add'>+ *    frames to each other, even if they are in the same bridge group.</div><div class='add'>+ * 3. Ensures that the CPU port is included in the membership based on its</div><div class='add'>+ *    upstream port configuration, allowing for management and control traffic</div><div class='add'>+ *    to flow as required.</div><div class='add'>+ */</div><div class='add'>+static void ksz_update_port_member(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	u8 port_member = 0, cpu_port;</div><div class='add'>+	const struct dsa_port *dp;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_user_port(ds, port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dp = dsa_to_port(ds, port);</div><div class='add'>+	cpu_port = BIT(dsa_upstream_port(ds, port));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		const struct dsa_port *other_dp = dsa_to_port(ds, i);</div><div class='add'>+		struct ksz_port *other_p = &amp;dev-&gt;ports[i];</div><div class='add'>+		u8 val = 0;</div><div class='add'>+</div><div class='add'>+		if (!dsa_is_user_port(ds, i))</div><div class='ctx'> 			continue;</div><div class='del'>-		p = &amp;dev-&gt;ports[i];</div><div class='del'>-		if (!(dev-&gt;member &amp; (1 &lt;&lt; i)))</div><div class='add'>+		if (port == i)</div><div class='add'>+			continue;</div><div class='add'>+		if (!dsa_port_bridge_same(dp, other_dp))</div><div class='add'>+			continue;</div><div class='add'>+		if (other_p-&gt;stp_state != BR_STATE_FORWARDING)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		/* Port is a member of the bridge and is forwarding. */</div><div class='add'>+		/* At this point we know that "port" and "other" port [i] are in</div><div class='add'>+		 * the same bridge group and that "other" port [i] is in</div><div class='add'>+		 * forwarding stp state. If "port" is also in forwarding stp</div><div class='add'>+		 * state, we can allow forwarding from port [port] to port [i].</div><div class='add'>+		 * Except if both ports are isolated.</div><div class='add'>+		 */</div><div class='ctx'> 		if (p-&gt;stp_state == BR_STATE_FORWARDING &amp;&amp;</div><div class='del'>-		    p-&gt;member != dev-&gt;member)</div><div class='del'>-			dev-&gt;dev_ops-&gt;cfg_port_member(dev, i, dev-&gt;member);</div><div class='add'>+		    !(p-&gt;isolated &amp;&amp; other_p-&gt;isolated)) {</div><div class='add'>+			val |= BIT(port);</div><div class='add'>+			port_member |= BIT(i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Retain port [i]'s relationship to other ports than [port] */</div><div class='add'>+		for (j = 0; j &lt; ds-&gt;num_ports; j++) {</div><div class='add'>+			const struct dsa_port *third_dp;</div><div class='add'>+			struct ksz_port *third_p;</div><div class='add'>+</div><div class='add'>+			if (j == i)</div><div class='add'>+				continue;</div><div class='add'>+			if (j == port)</div><div class='add'>+				continue;</div><div class='add'>+			if (!dsa_is_user_port(ds, j))</div><div class='add'>+				continue;</div><div class='add'>+			third_p = &amp;dev-&gt;ports[j];</div><div class='add'>+			if (third_p-&gt;stp_state != BR_STATE_FORWARDING)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			third_dp = dsa_to_port(ds, j);</div><div class='add'>+</div><div class='add'>+			/* Now we updating relation of the "other" port [i] to</div><div class='add'>+			 * the "third" port [j]. We already know that "other"</div><div class='add'>+			 * port [i] is in forwarding stp state and that "third"</div><div class='add'>+			 * port [j] is in forwarding stp state too.</div><div class='add'>+			 * We need to check if "other" port [i] and "third" port</div><div class='add'>+			 * [j] are in the same bridge group and not isolated</div><div class='add'>+			 * before allowing forwarding from port [i] to port [j].</div><div class='add'>+			 */</div><div class='add'>+			if (dsa_port_bridge_same(other_dp, third_dp) &amp;&amp;</div><div class='add'>+			    !(other_p-&gt;isolated &amp;&amp; third_p-&gt;isolated))</div><div class='add'>+				val |= BIT(j);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;dev_ops-&gt;cfg_port_member(dev, i, val | cpu_port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* HSR ports are setup once so need to use the assigned membership</div><div class='add'>+	 * when the port is enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (!port_member &amp;&amp; p-&gt;stp_state == BR_STATE_FORWARDING &amp;&amp;</div><div class='add'>+	    (dev-&gt;hsr_ports &amp; BIT(port)))</div><div class='add'>+		port_member = dev-&gt;hsr_ports;</div><div class='add'>+	dev-&gt;dev_ops-&gt;cfg_port_member(dev, port, port_member | cpu_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_sw_mdio_read(struct mii_bus *bus, int addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = bus-&gt;priv;</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;r_phy(dev, addr, regnum, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_sw_mdio_write(struct mii_bus *bus, int addr, int regnum,</div><div class='add'>+			     u16 val)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;w_phy(dev, addr, regnum, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_parent_mdio_read - Read data from a PHY register on the parent MDIO bus.</div><div class='add'>+ * @bus: MDIO bus structure.</div><div class='add'>+ * @addr: PHY address on the parent MDIO bus.</div><div class='add'>+ * @regnum: Register number to read.</div><div class='add'>+ *</div><div class='add'>+ * This function provides a direct read operation on the parent MDIO bus for</div><div class='add'>+ * accessing PHY registers. By bypassing SPI or I2C, it uses the parent MDIO bus</div><div class='add'>+ * to retrieve data from the PHY registers at the specified address and register</div><div class='add'>+ * number.</div><div class='add'>+ *</div><div class='add'>+ * Return: Value of the PHY register, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_parent_mdio_read(struct mii_bus *bus, int addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return mdiobus_read_nested(dev-&gt;parent_mdio_bus, addr, regnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_parent_mdio_write - Write data to a PHY register on the parent MDIO bus.</div><div class='add'>+ * @bus: MDIO bus structure.</div><div class='add'>+ * @addr: PHY address on the parent MDIO bus.</div><div class='add'>+ * @regnum: Register number to write to.</div><div class='add'>+ * @val: Value to write to the PHY register.</div><div class='add'>+ *</div><div class='add'>+ * This function provides a direct write operation on the parent MDIO bus for</div><div class='add'>+ * accessing PHY registers. Bypassing SPI or I2C, it uses the parent MDIO bus</div><div class='add'>+ * to modify the PHY register values at the specified address.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_parent_mdio_write(struct mii_bus *bus, int addr, int regnum,</div><div class='add'>+				 u16 val)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return mdiobus_write_nested(dev-&gt;parent_mdio_bus, addr, regnum, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_phy_addr_to_port - Map a PHY address to the corresponding switch port.</div><div class='add'>+ * @dev: Pointer to device structure.</div><div class='add'>+ * @addr: PHY address to map to a port.</div><div class='add'>+ *</div><div class='add'>+ * This function finds the corresponding switch port for a given PHY address by</div><div class='add'>+ * iterating over all user ports on the device. It checks if a port's PHY</div><div class='add'>+ * address in `phy_addr_map` matches the specified address and if the port</div><div class='add'>+ * contains an internal PHY. If a match is found, the index of the port is</div><div class='add'>+ * returned.</div><div class='add'>+ *</div><div class='add'>+ * Return: Port index on success, or -EINVAL if no matching port is found.</div><div class='add'>+ */</div><div class='add'>+static int ksz_phy_addr_to_port(struct ksz_device *dev, int addr)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds) {</div><div class='add'>+		if (dev-&gt;info-&gt;internal_phy[dp-&gt;index] &amp;&amp;</div><div class='add'>+		    dev-&gt;phy_addr_map[dp-&gt;index] == addr)</div><div class='add'>+			return dp-&gt;index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_irq_phy_setup - Configure IRQs for PHYs in the KSZ device.</div><div class='add'>+ * @dev: Pointer to the KSZ device structure.</div><div class='add'>+ *</div><div class='add'>+ * Sets up IRQs for each active PHY connected to the KSZ switch by mapping the</div><div class='add'>+ * appropriate IRQs for each PHY and assigning them to the `user_mii_bus` in</div><div class='add'>+ * the DSA switch structure. Each IRQ is mapped based on the port's IRQ domain.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_irq_phy_setup(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	int phy, port;</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (phy = 0; phy &lt; PHY_MAX_ADDR; phy++) {</div><div class='add'>+		if (BIT(phy) &amp; ds-&gt;phys_mii_mask) {</div><div class='add'>+			port = ksz_phy_addr_to_port(dev, phy);</div><div class='add'>+			if (port &lt; 0) {</div><div class='add'>+				ret = port;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			irq = irq_find_mapping(dev-&gt;ports[port].pirq.domain,</div><div class='add'>+					       PORT_SRC_PHY_INT);</div><div class='add'>+			if (!irq) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+			ds-&gt;user_mii_bus-&gt;irq[phy] = irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	while (phy--)</div><div class='add'>+		if (BIT(phy) &amp; ds-&gt;phys_mii_mask)</div><div class='add'>+			irq_dispose_mapping(ds-&gt;user_mii_bus-&gt;irq[phy]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_irq_phy_free - Release IRQ mappings for PHYs in the KSZ device.</div><div class='add'>+ * @dev: Pointer to the KSZ device structure.</div><div class='add'>+ *</div><div class='add'>+ * Releases any IRQ mappings previously assigned to active PHYs in the KSZ</div><div class='add'>+ * switch by disposing of each mapped IRQ in the `user_mii_bus` structure.</div><div class='add'>+ */</div><div class='add'>+static void ksz_irq_phy_free(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	int phy;</div><div class='add'>+</div><div class='add'>+	for (phy = 0; phy &lt; PHY_MAX_ADDR; phy++)</div><div class='add'>+		if (BIT(phy) &amp; ds-&gt;phys_mii_mask)</div><div class='add'>+			irq_dispose_mapping(ds-&gt;user_mii_bus-&gt;irq[phy]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_parse_dt_phy_config - Parse and validate PHY configuration from DT</div><div class='add'>+ * @dev: pointer to the KSZ device structure</div><div class='add'>+ * @bus: pointer to the MII bus structure</div><div class='add'>+ * @mdio_np: pointer to the MDIO node in the device tree</div><div class='add'>+ *</div><div class='add'>+ * This function parses and validates PHY configurations for each user port</div><div class='add'>+ * defined in the device tree for a KSZ switch device. It verifies that the</div><div class='add'>+ * `phy-handle` properties are correctly set and that the internal PHYs match</div><div class='add'>+ * expected addresses and parent nodes. Sets up the PHY mask in the MII bus if</div><div class='add'>+ * all validations pass. Logs error messages for any mismatches or missing data.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_parse_dt_phy_config(struct ksz_device *dev, struct mii_bus *bus,</div><div class='add'>+				   struct device_node *mdio_np)</div><div class='add'>+{</div><div class='add'>+	struct device_node *phy_node, *phy_parent_node;</div><div class='add'>+	bool phys_are_valid = true;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u32 phy_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, dev-&gt;ds) {</div><div class='add'>+		if (!dev-&gt;info-&gt;internal_phy[dp-&gt;index])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		phy_node = of_parse_phandle(dp-&gt;dn, "phy-handle", 0);</div><div class='add'>+		if (!phy_node) {</div><div class='add'>+			dev_err(dev-&gt;dev, "failed to parse phy-handle for port %d.\n",</div><div class='add'>+				dp-&gt;index);</div><div class='add'>+			phys_are_valid = false;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phy_parent_node = of_get_parent(phy_node);</div><div class='add'>+		if (!phy_parent_node) {</div><div class='add'>+			dev_err(dev-&gt;dev, "failed to get PHY-parent node for port %d\n",</div><div class='add'>+				dp-&gt;index);</div><div class='add'>+			phys_are_valid = false;</div><div class='add'>+		} else if (phy_parent_node != mdio_np) {</div><div class='add'>+			dev_err(dev-&gt;dev, "PHY-parent node mismatch for port %d, expected %pOF, got %pOF\n",</div><div class='add'>+				dp-&gt;index, mdio_np, phy_parent_node);</div><div class='add'>+			phys_are_valid = false;</div><div class='add'>+		} else {</div><div class='add'>+			ret = of_property_read_u32(phy_node, "reg", &amp;phy_addr);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				dev_err(dev-&gt;dev, "failed to read PHY address for port %d. Error %d\n",</div><div class='add'>+					dp-&gt;index, ret);</div><div class='add'>+				phys_are_valid = false;</div><div class='add'>+			} else if (phy_addr != dev-&gt;phy_addr_map[dp-&gt;index]) {</div><div class='add'>+				dev_err(dev-&gt;dev, "PHY address mismatch for port %d, expected 0x%x, got 0x%x\n",</div><div class='add'>+					dp-&gt;index, dev-&gt;phy_addr_map[dp-&gt;index],</div><div class='add'>+					phy_addr);</div><div class='add'>+				phys_are_valid = false;</div><div class='add'>+			} else {</div><div class='add'>+				bus-&gt;phy_mask |= BIT(phy_addr);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		of_node_put(phy_node);</div><div class='add'>+		of_node_put(phy_parent_node);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phys_are_valid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_mdio_register - Register and configure the MDIO bus for the KSZ device.</div><div class='add'>+ * @dev: Pointer to the KSZ device structure.</div><div class='add'>+ *</div><div class='add'>+ * This function sets up and registers an MDIO bus for the KSZ switch device,</div><div class='add'>+ * allowing access to its internal PHYs. If the device supports side MDIO,</div><div class='add'>+ * the function will configure the external MDIO controller specified by the</div><div class='add'>+ * "mdio-parent-bus" device tree property to directly manage internal PHYs.</div><div class='add'>+ * Otherwise, SPI or I2C access is set up for PHY access.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_mdio_register(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *parent_bus_node;</div><div class='add'>+	struct mii_bus *parent_bus = NULL;</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	struct device_node *mdio_np;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	mdio_np = of_get_child_by_name(dev-&gt;dev-&gt;of_node, "mdio");</div><div class='add'>+	if (!mdio_np)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	parent_bus_node = of_parse_phandle(mdio_np, "mdio-parent-bus", 0);</div><div class='add'>+	if (parent_bus_node &amp;&amp; !dev-&gt;info-&gt;phy_side_mdio_supported) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Side MDIO bus is not supported for this HW, ignoring 'mdio-parent-bus' property.\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+		goto put_mdio_node;</div><div class='add'>+	} else if (parent_bus_node) {</div><div class='add'>+		parent_bus = of_mdio_find_bus(parent_bus_node);</div><div class='add'>+		if (!parent_bus) {</div><div class='add'>+			ret = -EPROBE_DEFER;</div><div class='add'>+</div><div class='add'>+			goto put_mdio_node;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;parent_mdio_bus = parent_bus;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus = devm_mdiobus_alloc(ds-&gt;dev);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto put_mdio_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;mdio_bus_preinit) {</div><div class='add'>+		ret = dev-&gt;dev_ops-&gt;mdio_bus_preinit(dev, !!parent_bus);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto put_mdio_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;create_phy_addr_map) {</div><div class='add'>+		ret = dev-&gt;dev_ops-&gt;create_phy_addr_map(dev, !!parent_bus);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto put_mdio_node;</div><div class='add'>+	} else {</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++)</div><div class='add'>+			dev-&gt;phy_addr_map[i] = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;priv = dev;</div><div class='add'>+	if (parent_bus) {</div><div class='add'>+		bus-&gt;read = ksz_parent_mdio_read;</div><div class='add'>+		bus-&gt;write = ksz_parent_mdio_write;</div><div class='add'>+		bus-&gt;name = "KSZ side MDIO";</div><div class='add'>+		snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "ksz-side-mdio-%d",</div><div class='add'>+			 ds-&gt;index);</div><div class='add'>+	} else {</div><div class='add'>+		bus-&gt;read = ksz_sw_mdio_read;</div><div class='add'>+		bus-&gt;write = ksz_sw_mdio_write;</div><div class='add'>+		bus-&gt;name = "ksz user smi";</div><div class='add'>+		if (ds-&gt;dst-&gt;index != 0) {</div><div class='add'>+			snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "SMI-%d-%d", ds-&gt;dst-&gt;index, ds-&gt;index);</div><div class='add'>+		} else {</div><div class='add'>+			snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "SMI-%d", ds-&gt;index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_parse_dt_phy_config(dev, bus, mdio_np);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto put_mdio_node;</div><div class='add'>+</div><div class='add'>+	ds-&gt;phys_mii_mask = bus-&gt;phy_mask;</div><div class='add'>+	bus-&gt;parent = ds-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ds-&gt;user_mii_bus = bus;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq &gt; 0) {</div><div class='add'>+		ret = ksz_irq_phy_setup(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto put_mdio_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_of_mdiobus_register(ds-&gt;dev, bus, mdio_np);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ds-&gt;dev, "unable to register MDIO bus %s\n",</div><div class='add'>+			bus-&gt;id);</div><div class='add'>+		if (dev-&gt;irq &gt; 0)</div><div class='add'>+			ksz_irq_phy_free(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+put_mdio_node:</div><div class='add'>+	of_node_put(mdio_np);</div><div class='add'>+	of_node_put(parent_bus_node);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_irq_mask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	kirq-&gt;masked |= BIT(d-&gt;hwirq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_irq_unmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	kirq-&gt;masked &amp;= ~BIT(d-&gt;hwirq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_irq_bus_lock(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq  = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;kirq-&gt;dev-&gt;lock_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_irq_bus_sync_unlock(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq  = irq_data_get_irq_chip_data(d);</div><div class='add'>+	struct ksz_device *dev = kirq-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write8(dev, kirq-&gt;reg_mask, kirq-&gt;masked);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to change IRQ mask\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_chip ksz_irq_chip = {</div><div class='add'>+	.name			= "ksz-irq",</div><div class='add'>+	.irq_mask		= ksz_irq_mask,</div><div class='add'>+	.irq_unmask		= ksz_irq_unmask,</div><div class='add'>+	.irq_bus_lock		= ksz_irq_bus_lock,</div><div class='add'>+	.irq_bus_sync_unlock	= ksz_irq_bus_sync_unlock,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ksz_irq_domain_map(struct irq_domain *d,</div><div class='add'>+			      unsigned int irq, irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	irq_set_chip_data(irq, d-&gt;host_data);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;ksz_irq_chip, handle_level_irq);</div><div class='add'>+	irq_set_noprobe(irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_domain_ops ksz_irq_domain_ops = {</div><div class='add'>+	.map	= ksz_irq_domain_map,</div><div class='add'>+	.xlate	= irq_domain_xlate_twocell,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ksz_irq_free(struct ksz_irq *kirq)</div><div class='add'>+{</div><div class='add'>+	int irq, virq;</div><div class='add'>+</div><div class='add'>+	free_irq(kirq-&gt;irq_num, kirq);</div><div class='add'>+</div><div class='add'>+	for (irq = 0; irq &lt; kirq-&gt;nirqs; irq++) {</div><div class='add'>+		virq = irq_find_mapping(kirq-&gt;domain, irq);</div><div class='add'>+		irq_dispose_mapping(virq);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	irq_domain_remove(kirq-&gt;domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ksz_irq_thread_fn(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq = dev_id;</div><div class='add'>+	unsigned int nhandled = 0;</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+	unsigned int sub_irq;</div><div class='add'>+	u8 data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 n;</div><div class='add'>+</div><div class='add'>+	dev = kirq-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Read interrupt status register */</div><div class='add'>+	ret = ksz_read8(dev, kirq-&gt;reg_status, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; kirq-&gt;nirqs; ++n) {</div><div class='add'>+		if (data &amp; BIT(n)) {</div><div class='add'>+			sub_irq = irq_find_mapping(kirq-&gt;domain, n);</div><div class='add'>+			handle_nested_irq(sub_irq);</div><div class='add'>+			++nhandled;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	return (nhandled &gt; 0 ? IRQ_HANDLED : IRQ_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_irq_common_setup(struct ksz_device *dev, struct ksz_irq *kirq)</div><div class='add'>+{</div><div class='add'>+	int ret, n;</div><div class='add'>+</div><div class='add'>+	kirq-&gt;dev = dev;</div><div class='add'>+	kirq-&gt;masked = ~0;</div><div class='add'>+</div><div class='add'>+	kirq-&gt;domain = irq_domain_create_simple(dev_fwnode(dev-&gt;dev), kirq-&gt;nirqs, 0,</div><div class='add'>+						&amp;ksz_irq_domain_ops, kirq);</div><div class='add'>+	if (!kirq-&gt;domain)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; kirq-&gt;nirqs; n++)</div><div class='add'>+		irq_create_mapping(kirq-&gt;domain, n);</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(kirq-&gt;irq_num, NULL, ksz_irq_thread_fn,</div><div class='add'>+				   IRQF_ONESHOT, kirq-&gt;name, kirq);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	ksz_irq_free(kirq);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_girq_setup(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *girq = &amp;dev-&gt;girq;</div><div class='add'>+</div><div class='add'>+	girq-&gt;nirqs = dev-&gt;info-&gt;port_cnt;</div><div class='add'>+	girq-&gt;reg_mask = REG_SW_PORT_INT_MASK__1;</div><div class='add'>+	girq-&gt;reg_status = REG_SW_PORT_INT_STATUS__1;</div><div class='add'>+	snprintf(girq-&gt;name, sizeof(girq-&gt;name), "global_port_irq");</div><div class='add'>+</div><div class='add'>+	girq-&gt;irq_num = dev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	return ksz_irq_common_setup(dev, girq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_pirq_setup(struct ksz_device *dev, u8 p)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *pirq = &amp;dev-&gt;ports[p].pirq;</div><div class='add'>+</div><div class='add'>+	pirq-&gt;nirqs = dev-&gt;info-&gt;port_nirqs;</div><div class='add'>+	pirq-&gt;reg_mask = dev-&gt;dev_ops-&gt;get_port_addr(p, REG_PORT_INT_MASK);</div><div class='add'>+	pirq-&gt;reg_status = dev-&gt;dev_ops-&gt;get_port_addr(p, REG_PORT_INT_STATUS);</div><div class='add'>+	snprintf(pirq-&gt;name, sizeof(pirq-&gt;name), "port_irq-%d", p);</div><div class='add'>+</div><div class='add'>+	pirq-&gt;irq_num = irq_find_mapping(dev-&gt;girq.domain, p);</div><div class='add'>+	if (!pirq-&gt;irq_num)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return ksz_irq_common_setup(dev, pirq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_parse_drive_strength(struct ksz_device *dev);</div><div class='add'>+</div><div class='add'>+static int ksz_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	u16 storm_mask, storm_rate;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	struct ksz_port *p;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	dev-&gt;vlan_cache = devm_kcalloc(dev-&gt;dev, sizeof(struct vlan_table),</div><div class='add'>+				       dev-&gt;info-&gt;num_vlans, GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;vlan_cache)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;reset(dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ds-&gt;dev, "failed to reset switch\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_parse_drive_strength(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ksz_has_sgmii_port(dev) &amp;&amp; dev-&gt;dev_ops-&gt;pcs_create) {</div><div class='add'>+		ret = dev-&gt;dev_ops-&gt;pcs_create(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set broadcast storm protection 10% rate */</div><div class='add'>+	storm_mask = BROADCAST_STORM_RATE;</div><div class='add'>+	storm_rate = (BROADCAST_STORM_VALUE * BROADCAST_STORM_PROT_RATE) / 100;</div><div class='add'>+	if (ksz_is_ksz8463(dev)) {</div><div class='add'>+		storm_mask = swab16(storm_mask);</div><div class='add'>+		storm_rate = swab16(storm_rate);</div><div class='add'>+	}</div><div class='add'>+	regmap_update_bits(ksz_regmap_16(dev), regs[S_BROADCAST_CTRL],</div><div class='add'>+			   storm_mask, storm_rate);</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev_ops-&gt;config_cpu_port(ds);</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev_ops-&gt;enable_stp_addr(dev);</div><div class='add'>+</div><div class='add'>+	ds-&gt;num_tx_queues = dev-&gt;info-&gt;num_tx_queues;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(ksz_regmap_8(dev), regs[S_MULTICAST_CTRL],</div><div class='add'>+			   MULTICAST_STORM_DISABLE, MULTICAST_STORM_DISABLE);</div><div class='add'>+</div><div class='add'>+	ksz_init_mib_timer(dev);</div><div class='add'>+</div><div class='add'>+	ds-&gt;configure_vlan_while_not_filtering = false;</div><div class='add'>+	ds-&gt;dscp_prio_mapping_is_global = true;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;setup) {</div><div class='add'>+		ret = dev-&gt;dev_ops-&gt;setup(ds);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start with learning disabled on standalone user ports, and enabled</div><div class='add'>+	 * on the CPU port. In lack of other finer mechanisms, learning on the</div><div class='add'>+	 * CPU port will avoid flooding bridge local addresses on the network</div><div class='add'>+	 * in some cases.</div><div class='add'>+	 */</div><div class='add'>+	p = &amp;dev-&gt;ports[dev-&gt;cpu_port];</div><div class='add'>+	p-&gt;learning = true;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq &gt; 0) {</div><div class='add'>+		ret = ksz_girq_setup(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dsa_switch_for_each_user_port(dp, dev-&gt;ds) {</div><div class='add'>+			ret = ksz_pirq_setup(dev, dp-&gt;index);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto port_release;</div><div class='add'>+</div><div class='add'>+			if (dev-&gt;info-&gt;ptp_capable) {</div><div class='add'>+				ret = ksz_ptp_irq_setup(ds, dp-&gt;index);</div><div class='add'>+				if (ret)</div><div class='add'>+					goto pirq_release;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;ptp_capable) {</div><div class='add'>+		ret = ksz_ptp_clock_register(ds);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Failed to register PTP clock: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto port_release;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_mdio_register(dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to register the mdio");</div><div class='add'>+		goto out_ptp_clock_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_dcb_init(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_ptp_clock_unregister;</div><div class='add'>+</div><div class='add'>+	/* start switch */</div><div class='add'>+	regmap_update_bits(ksz_regmap_8(dev), regs[S_START_CTRL],</div><div class='add'>+			   SW_START, SW_START);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_ptp_clock_unregister:</div><div class='add'>+	if (dev-&gt;info-&gt;ptp_capable)</div><div class='add'>+		ksz_ptp_clock_unregister(ds);</div><div class='add'>+port_release:</div><div class='add'>+	if (dev-&gt;irq &gt; 0) {</div><div class='add'>+		dsa_switch_for_each_user_port_continue_reverse(dp, dev-&gt;ds) {</div><div class='add'>+			if (dev-&gt;info-&gt;ptp_capable)</div><div class='add'>+				ksz_ptp_irq_free(ds, dp-&gt;index);</div><div class='add'>+pirq_release:</div><div class='add'>+			ksz_irq_free(&amp;dev-&gt;ports[dp-&gt;index].pirq);</div><div class='add'>+		}</div><div class='add'>+		ksz_irq_free(&amp;dev-&gt;girq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;ptp_capable)</div><div class='add'>+		ksz_ptp_clock_unregister(ds);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;irq &gt; 0) {</div><div class='add'>+		dsa_switch_for_each_user_port(dp, dev-&gt;ds) {</div><div class='add'>+			if (dev-&gt;info-&gt;ptp_capable)</div><div class='add'>+				ksz_ptp_irq_free(ds, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+			ksz_irq_free(&amp;dev-&gt;ports[dp-&gt;index].pirq);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ksz_irq_free(&amp;dev-&gt;girq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;teardown)</div><div class='add'>+		dev-&gt;dev_ops-&gt;teardown(ds);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_update_port_member);</div><div class='ctx'> </div><div class='ctx'> static void port_r_cnt(struct ksz_device *dev, int port)</div><div class='ctx'> {</div><div class='hunk'>@@ -56,17 +3119,17 @@ static void port_r_cnt(struct ksz_device *dev, int port)</div><div class='ctx'> 	u64 *dropped;</div><div class='ctx'> </div><div class='ctx'> 	/* Some ports may not have MIB counters before SWITCH_COUNTER_NUM. */</div><div class='del'>-	while (mib-&gt;cnt_ptr &lt; dev-&gt;reg_mib_cnt) {</div><div class='add'>+	while (mib-&gt;cnt_ptr &lt; dev-&gt;info-&gt;reg_mib_cnt) {</div><div class='ctx'> 		dev-&gt;dev_ops-&gt;r_mib_cnt(dev, port, mib-&gt;cnt_ptr,</div><div class='ctx'> 					&amp;mib-&gt;counters[mib-&gt;cnt_ptr]);</div><div class='ctx'> 		++mib-&gt;cnt_ptr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* last one in storage */</div><div class='del'>-	dropped = &amp;mib-&gt;counters[dev-&gt;mib_cnt];</div><div class='add'>+	dropped = &amp;mib-&gt;counters[dev-&gt;info-&gt;mib_cnt];</div><div class='ctx'> </div><div class='ctx'> 	/* Some ports may not have MIB counters after SWITCH_COUNTER_NUM. */</div><div class='del'>-	while (mib-&gt;cnt_ptr &lt; dev-&gt;mib_cnt) {</div><div class='add'>+	while (mib-&gt;cnt_ptr &lt; dev-&gt;info-&gt;mib_cnt) {</div><div class='ctx'> 		dev-&gt;dev_ops-&gt;r_mib_pkt(dev, port, mib-&gt;cnt_ptr,</div><div class='ctx'> 					dropped, &amp;mib-&gt;counters[mib-&gt;cnt_ptr]);</div><div class='ctx'> 		++mib-&gt;cnt_ptr;</div><div class='hunk'>@@ -77,12 +3140,15 @@ static void port_r_cnt(struct ksz_device *dev, int port)</div><div class='ctx'> static void ksz_mib_read_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = container_of(work, struct ksz_device,</div><div class='del'>-					      mib_read);</div><div class='add'>+					      mib_read.work);</div><div class='ctx'> 	struct ksz_port_mib *mib;</div><div class='ctx'> 	struct ksz_port *p;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dev-&gt;mib_port_cnt; i++) {</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++) {</div><div class='add'>+		if (dsa_is_unused_port(dev-&gt;ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		p = &amp;dev-&gt;ports[i];</div><div class='ctx'> 		mib = &amp;p-&gt;mib;</div><div class='ctx'> 		mutex_lock(&amp;mib-&gt;cnt_mutex);</div><div class='hunk'>@@ -93,96 +3159,106 @@ static void ksz_mib_read_work(struct work_struct *work)</div><div class='ctx'> 		if (!p-&gt;read) {</div><div class='ctx'> 			const struct dsa_port *dp = dsa_to_port(dev-&gt;ds, i);</div><div class='ctx'> </div><div class='del'>-			if (!netif_carrier_ok(dp-&gt;slave))</div><div class='del'>-				mib-&gt;cnt_ptr = dev-&gt;reg_mib_cnt;</div><div class='add'>+			if (!netif_carrier_ok(dp-&gt;user))</div><div class='add'>+				mib-&gt;cnt_ptr = dev-&gt;info-&gt;reg_mib_cnt;</div><div class='ctx'> 		}</div><div class='ctx'> 		port_r_cnt(dev, i);</div><div class='ctx'> 		p-&gt;read = false;</div><div class='add'>+</div><div class='add'>+		if (dev-&gt;dev_ops-&gt;r_mib_stat64)</div><div class='add'>+			dev-&gt;dev_ops-&gt;r_mib_stat64(dev, i);</div><div class='add'>+</div><div class='ctx'> 		mutex_unlock(&amp;mib-&gt;cnt_mutex);</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static void mib_monitor(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct ksz_device *dev = from_timer(dev, t, mib_read_timer);</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;dev-&gt;mib_read_timer, jiffies + dev-&gt;mib_read_interval);</div><div class='del'>-	schedule_work(&amp;dev-&gt;mib_read);</div><div class='add'>+	schedule_delayed_work(&amp;dev-&gt;mib_read, dev-&gt;mib_read_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ksz_init_mib_timer(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* Read MIB counters every 30 seconds to avoid overflow. */</div><div class='del'>-	dev-&gt;mib_read_interval = msecs_to_jiffies(30000);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;dev-&gt;mib_read, ksz_mib_read_work);</div><div class='ctx'> </div><div class='del'>-	INIT_WORK(&amp;dev-&gt;mib_read, ksz_mib_read_work);</div><div class='del'>-	timer_setup(&amp;dev-&gt;mib_read_timer, mib_monitor, 0);</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++) {</div><div class='add'>+		struct ksz_port_mib *mib = &amp;dev-&gt;ports[i].mib;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dev-&gt;mib_port_cnt; i++)</div><div class='ctx'> 		dev-&gt;dev_ops-&gt;port_init_cnt(dev, i);</div><div class='ctx'> </div><div class='del'>-	/* Start the timer 2 seconds later. */</div><div class='del'>-	dev-&gt;mib_read_timer.expires = jiffies + msecs_to_jiffies(2000);</div><div class='del'>-	add_timer(&amp;dev-&gt;mib_read_timer);</div><div class='add'>+		mib-&gt;cnt_ptr = 0;</div><div class='add'>+		memset(mib-&gt;counters, 0, dev-&gt;info-&gt;mib_cnt * sizeof(u64));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_init_mib_timer);</div><div class='ctx'> </div><div class='del'>-int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg)</div><div class='add'>+static int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> 	u16 val = 0xffff;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_ops-&gt;r_phy(dev, addr, reg, &amp;val);</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;r_phy(dev, addr, reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_phy_read16);</div><div class='ctx'> </div><div class='del'>-int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)</div><div class='add'>+static int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_ops-&gt;w_phy(dev, addr, reg, val);</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;w_phy(dev, addr, reg, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_phy_write16);</div><div class='ctx'> </div><div class='del'>-void ksz_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-		     struct phy_device *phydev)</div><div class='add'>+static u32 ksz_get_phy_flags(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='ctx'> </div><div class='del'>-	/* Read all MIB counters when the link is going down. */</div><div class='del'>-	if (!phydev-&gt;link) {</div><div class='del'>-		p-&gt;read = true;</div><div class='del'>-		schedule_work(&amp;dev-&gt;mib_read);</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ88X3_CHIP_ID:</div><div class='add'>+		/* Silicon Errata Sheet (DS80000830A):</div><div class='add'>+		 * Port 1 does not work with LinkMD Cable-Testing.</div><div class='add'>+		 * Port 1 does not respond to received PAUSE control frames.</div><div class='add'>+		 */</div><div class='add'>+		if (!port)</div><div class='add'>+			return MICREL_KSZ8_P1_ERRATA;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	if (!phydev-&gt;link)</div><div class='del'>-		dev-&gt;live_ports &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	else</div><div class='del'>-		/* Remember which port is connected and active. */</div><div class='del'>-		dev-&gt;live_ports |= (1 &lt;&lt; port) &amp; dev-&gt;on_ports;</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+				      unsigned int mode,</div><div class='add'>+				      phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ksz_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Read all MIB counters when the link is going down. */</div><div class='add'>+	dev-&gt;ports[dp-&gt;index].read = true;</div><div class='add'>+	/* timer started */</div><div class='add'>+	if (dev-&gt;mib_read_interval)</div><div class='add'>+		schedule_delayed_work(&amp;dev-&gt;mib_read, 0);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_adjust_link);</div><div class='ctx'> </div><div class='del'>-int ksz_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+static int ksz_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	if (sset != ETH_SS_STATS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	return dev-&gt;mib_cnt;</div><div class='add'>+	return dev-&gt;info-&gt;mib_cnt;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_sset_count);</div><div class='ctx'> </div><div class='del'>-void ksz_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *buf)</div><div class='add'>+static void ksz_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				  uint64_t *buf)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='hunk'>@@ -192,218 +3268,1772 @@ void ksz_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *buf)</div><div class='ctx'> 	mutex_lock(&amp;mib-&gt;cnt_mutex);</div><div class='ctx'> </div><div class='ctx'> 	/* Only read dropped counters if no link. */</div><div class='del'>-	if (!netif_carrier_ok(dp-&gt;slave))</div><div class='del'>-		mib-&gt;cnt_ptr = dev-&gt;reg_mib_cnt;</div><div class='add'>+	if (!netif_carrier_ok(dp-&gt;user))</div><div class='add'>+		mib-&gt;cnt_ptr = dev-&gt;info-&gt;reg_mib_cnt;</div><div class='ctx'> 	port_r_cnt(dev, port);</div><div class='del'>-	memcpy(buf, mib-&gt;counters, dev-&gt;mib_cnt * sizeof(u64));</div><div class='add'>+	memcpy(buf, mib-&gt;counters, dev-&gt;info-&gt;mib_cnt * sizeof(u64));</div><div class='ctx'> 	mutex_unlock(&amp;mib-&gt;cnt_mutex);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_get_ethtool_stats);</div><div class='ctx'> </div><div class='del'>-int ksz_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-			 struct net_device *br)</div><div class='add'>+static int ksz_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+				struct dsa_bridge bridge,</div><div class='add'>+				bool *tx_fwd_offload,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	dev-&gt;br_member |= (1 &lt;&lt; port);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-</div><div class='ctx'> 	/* port_stp_state_set() will be called after to put the port in</div><div class='ctx'> 	 * appropriate state so there is no need to do anything.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_bridge_join);</div><div class='ctx'> </div><div class='del'>-void ksz_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-			   struct net_device *br)</div><div class='add'>+static void ksz_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='del'>-	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	dev-&gt;br_member &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	dev-&gt;member &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;dev_mutex);</div><div class='del'>-</div><div class='ctx'> 	/* port_stp_state_set() will be called after to put the port in</div><div class='ctx'> 	 * forwarding state so there is no need to do anything.</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_bridge_leave);</div><div class='ctx'> </div><div class='del'>-void ksz_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+static void ksz_port_fast_age(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;dev_ops-&gt;flush_dyn_mac_table(dev, port);</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_fast_age);</div><div class='ctx'> </div><div class='del'>-int ksz_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			  const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+static int ksz_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;set_ageing_time)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;set_ageing_time(dev, msecs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			    const unsigned char *addr, u16 vid,</div><div class='add'>+			    struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;fdb_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;fdb_add(dev, port, addr, vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			    const unsigned char *addr,</div><div class='add'>+			    u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;fdb_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;fdb_del(dev, port, addr, vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			     dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;fdb_dump)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;fdb_dump(dev, port, cb, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			    const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			    struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;mdb_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;mdb_add(dev, port, mdb, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			    const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			    struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;mdb_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;mdb_del(dev, port, mdb, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz9477_set_default_prio_queue_mapping(struct ksz_device *dev,</div><div class='add'>+						  int port)</div><div class='add'>+{</div><div class='add'>+	u32 queue_map = 0;</div><div class='add'>+	int ipm;</div><div class='add'>+</div><div class='add'>+	for (ipm = 0; ipm &lt; dev-&gt;info-&gt;num_ipms; ipm++) {</div><div class='add'>+		int queue;</div><div class='add'>+</div><div class='add'>+		/* Traffic Type (TT) is corresponding to the Internal Priority</div><div class='add'>+		 * Map (IPM) in the switch. Traffic Class (TC) is</div><div class='add'>+		 * corresponding to the queue in the switch.</div><div class='add'>+		 */</div><div class='add'>+		queue = ieee8021q_tt_to_tc(ipm, dev-&gt;info-&gt;num_tx_queues);</div><div class='add'>+		if (queue &lt; 0)</div><div class='add'>+			return queue;</div><div class='add'>+</div><div class='add'>+		queue_map |= queue &lt;&lt; (ipm * KSZ9477_PORT_TC_MAP_S);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_setup(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='del'>-	/* nothing needed */</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_user_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* setup user port */</div><div class='add'>+	dev-&gt;dev_ops-&gt;port_setup(dev, port, false);</div><div class='add'>+</div><div class='add'>+	if (!is_ksz8(dev)) {</div><div class='add'>+		ret = ksz9477_set_default_prio_queue_mapping(dev, port);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* port_stp_state_set() will be called after to enable the port so</div><div class='add'>+	 * there is no need to do anything.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return ksz_dcb_init_port(dev, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *p;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	u8 data;</div><div class='add'>+</div><div class='add'>+	regs = dev-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, regs[P_STP_CTRL], &amp;data);</div><div class='add'>+	data &amp;= ~(PORT_TX_ENABLE | PORT_RX_ENABLE | PORT_LEARN_DISABLE);</div><div class='add'>+</div><div class='add'>+	p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		data |= PORT_LEARN_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		data |= (PORT_RX_ENABLE | PORT_LEARN_DISABLE);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		data |= PORT_RX_ENABLE;</div><div class='add'>+		if (!p-&gt;learning)</div><div class='add'>+			data |= PORT_LEARN_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		data |= (PORT_TX_ENABLE | PORT_RX_ENABLE);</div><div class='add'>+		if (!p-&gt;learning)</div><div class='add'>+			data |= PORT_LEARN_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		data |= PORT_LEARN_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ds-&gt;dev, "invalid STP state: %d\n", state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz_pwrite8(dev, port, regs[P_STP_CTRL], data);</div><div class='add'>+</div><div class='add'>+	p-&gt;stp_state = state;</div><div class='add'>+</div><div class='add'>+	ksz_update_port_member(dev, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_port_teardown(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ8563_CHIP_ID:</div><div class='add'>+	case KSZ8567_CHIP_ID:</div><div class='add'>+	case KSZ9477_CHIP_ID:</div><div class='add'>+	case KSZ9563_CHIP_ID:</div><div class='add'>+	case KSZ9567_CHIP_ID:</div><div class='add'>+	case KSZ9893_CHIP_ID:</div><div class='add'>+	case KSZ9896_CHIP_ID:</div><div class='add'>+	case KSZ9897_CHIP_ID:</div><div class='add'>+	case LAN9646_CHIP_ID:</div><div class='add'>+		if (dsa_is_user_port(ds, port))</div><div class='add'>+			ksz9477_port_acl_free(dev, port);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct switchdev_brport_flags flags,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_ISOLATED))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_vlan_prepare);</div><div class='ctx'> </div><div class='del'>-int ksz_port_fdb_dump(struct dsa_switch *ds, int port, dsa_fdb_dump_cb_t *cb,</div><div class='del'>-		      void *data)</div><div class='add'>+static int ksz_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct switchdev_brport_flags flags,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; (BR_LEARNING | BR_ISOLATED)) {</div><div class='add'>+		if (flags.mask &amp; BR_LEARNING)</div><div class='add'>+			p-&gt;learning = !!(flags.val &amp; BR_LEARNING);</div><div class='add'>+</div><div class='add'>+		if (flags.mask &amp; BR_ISOLATED)</div><div class='add'>+			p-&gt;isolated = !!(flags.val &amp; BR_ISOLATED);</div><div class='add'>+</div><div class='add'>+		/* Make the change take effect immediately */</div><div class='add'>+		ksz_port_stp_state_set(ds, port, p-&gt;stp_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						  int port,</div><div class='add'>+						  enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	enum dsa_tag_protocol proto = DSA_TAG_PROTO_NONE;</div><div class='add'>+</div><div class='add'>+	if (ksz_is_ksz87xx(dev) || ksz_is_8895_family(dev))</div><div class='add'>+		proto = DSA_TAG_PROTO_KSZ8795;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id == KSZ88X3_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ8463_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ8563_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9893_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9563_CHIP_ID)</div><div class='add'>+		proto = DSA_TAG_PROTO_KSZ9893;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id == KSZ8567_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9477_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9896_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9897_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ9567_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == LAN9646_CHIP_ID)</div><div class='add'>+		proto = DSA_TAG_PROTO_KSZ9477;</div><div class='add'>+</div><div class='add'>+	if (is_lan937x(dev))</div><div class='add'>+		proto = DSA_TAG_PROTO_LAN937X;</div><div class='add'>+</div><div class='add'>+	return proto;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_connect_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+				    enum dsa_tag_protocol proto)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_data *tagger_data;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case DSA_TAG_PROTO_KSZ8795:</div><div class='add'>+		return 0;</div><div class='add'>+	case DSA_TAG_PROTO_KSZ9893:</div><div class='add'>+	case DSA_TAG_PROTO_KSZ9477:</div><div class='add'>+	case DSA_TAG_PROTO_LAN937X:</div><div class='add'>+		tagger_data = ksz_tagger_data(ds);</div><div class='add'>+		tagger_data-&gt;xmit_work_fn = ksz_port_deferred_xmit;</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+				   bool flag, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;vlan_filtering)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;vlan_filtering(dev, port, flag, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			     const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;vlan_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;vlan_add(dev, port, vlan, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			     const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;vlan_del)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;vlan_del(dev, port, vlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			       bool ingress, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;mirror_add)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;mirror_add(dev, port, mirror, ingress, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+				struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;mirror_del)</div><div class='add'>+		dev-&gt;dev_ops-&gt;mirror_del(dev, port, mirror);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_change_mtu(struct dsa_switch *ds, int port, int mtu)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;dev_ops-&gt;change_mtu)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dev-&gt;dev_ops-&gt;change_mtu(dev, port, mtu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ8795_CHIP_ID:</div><div class='add'>+	case KSZ8794_CHIP_ID:</div><div class='add'>+	case KSZ8765_CHIP_ID:</div><div class='add'>+		return KSZ8795_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+	case KSZ8463_CHIP_ID:</div><div class='add'>+	case KSZ88X3_CHIP_ID:</div><div class='add'>+	case KSZ8864_CHIP_ID:</div><div class='add'>+	case KSZ8895_CHIP_ID:</div><div class='add'>+		return KSZ8863_HUGE_PACKET_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+	case KSZ8563_CHIP_ID:</div><div class='add'>+	case KSZ8567_CHIP_ID:</div><div class='add'>+	case KSZ9477_CHIP_ID:</div><div class='add'>+	case KSZ9563_CHIP_ID:</div><div class='add'>+	case KSZ9567_CHIP_ID:</div><div class='add'>+	case KSZ9893_CHIP_ID:</div><div class='add'>+	case KSZ9896_CHIP_ID:</div><div class='add'>+	case KSZ9897_CHIP_ID:</div><div class='add'>+	case LAN9370_CHIP_ID:</div><div class='add'>+	case LAN9371_CHIP_ID:</div><div class='add'>+	case LAN9372_CHIP_ID:</div><div class='add'>+	case LAN9373_CHIP_ID:</div><div class='add'>+	case LAN9374_CHIP_ID:</div><div class='add'>+	case LAN9646_CHIP_ID:</div><div class='add'>+		return KSZ9477_MAX_FRAME_SIZE - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_support_eee - Determine Energy Efficient Ethernet (EEE) support for a</div><div class='add'>+ *                   port</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number to check</div><div class='add'>+ *</div><div class='add'>+ * This function also documents devices where EEE was initially advertised but</div><div class='add'>+ * later withdrawn due to reliability issues, as described in official errata</div><div class='add'>+ * documents. These devices are explicitly listed to record known limitations,</div><div class='add'>+ * even if there is no technical necessity for runtime checks.</div><div class='add'>+ *</div><div class='add'>+ * Returns: true if the internal PHY on the given port supports fully</div><div class='add'>+ * operational EEE, false otherwise.</div><div class='add'>+ */</div><div class='add'>+static bool ksz_support_eee(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;info-&gt;internal_phy[port])</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ8563_CHIP_ID:</div><div class='add'>+	case KSZ9563_CHIP_ID:</div><div class='add'>+	case KSZ9893_CHIP_ID:</div><div class='add'>+		return true;</div><div class='add'>+	case KSZ8567_CHIP_ID:</div><div class='add'>+		/* KSZ8567R Errata DS80000752C Module 4 */</div><div class='add'>+	case KSZ8765_CHIP_ID:</div><div class='add'>+	case KSZ8794_CHIP_ID:</div><div class='add'>+	case KSZ8795_CHIP_ID:</div><div class='add'>+		/* KSZ879x/KSZ877x/KSZ876x Errata DS80000687C Module 2 */</div><div class='add'>+	case KSZ9477_CHIP_ID:</div><div class='add'>+		/* KSZ9477S Errata DS80000754A Module 4 */</div><div class='add'>+	case KSZ9567_CHIP_ID:</div><div class='add'>+		/* KSZ9567S Errata DS80000756A Module 4 */</div><div class='add'>+	case KSZ9896_CHIP_ID:</div><div class='add'>+		/* KSZ9896C Errata DS80000757A Module 3 */</div><div class='add'>+	case KSZ9897_CHIP_ID:</div><div class='add'>+	case LAN9646_CHIP_ID:</div><div class='add'>+		/* KSZ9897R Errata DS80000758C Module 4 */</div><div class='add'>+		/* Energy Efficient Ethernet (EEE) feature select must be</div><div class='add'>+		 * manually disabled</div><div class='add'>+		 *   The EEE feature is enabled by default, but it is not fully</div><div class='add'>+		 *   operational. It must be manually disabled through register</div><div class='add'>+		 *   controls. If not disabled, the PHY ports can auto-negotiate</div><div class='add'>+		 *   to enable EEE, and this feature can cause link drops when</div><div class='add'>+		 *   linked to another device supporting EEE.</div><div class='add'>+		 *</div><div class='add'>+		 * The same item appears in the errata for all switches above.</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_set_mac_eee(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct ethtool_keee *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	u16 i = 0;</div><div class='del'>-	u16 entries = 0;</div><div class='del'>-	u8 timestamp = 0;</div><div class='del'>-	u8 fid;</div><div class='del'>-	u8 member;</div><div class='del'>-	struct alu_struct alu;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		alu.is_static = false;</div><div class='del'>-		ret = dev-&gt;dev_ops-&gt;r_dyn_mac_table(dev, i, alu.mac, &amp;fid,</div><div class='del'>-						    &amp;member, &amp;timestamp,</div><div class='del'>-						    &amp;entries);</div><div class='del'>-		if (!ret &amp;&amp; (member &amp; BIT(port))) {</div><div class='del'>-			ret = cb(alu.mac, alu.fid, alu.is_static, data);</div><div class='add'>+	if (!e-&gt;tx_lpi_enabled) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Disabling EEE Tx LPI is not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (e-&gt;tx_lpi_timer) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Setting EEE Tx LPI timer is not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_set_xmii(struct ksz_device *dev, int port,</div><div class='add'>+			 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	const u8 *bitval = dev-&gt;info-&gt;xmii_ctrl1;</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 data8;</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, regs[P_XMII_CTRL_1], &amp;data8);</div><div class='add'>+</div><div class='add'>+	data8 &amp;= ~(P_MII_SEL_M | P_RGMII_ID_IG_ENABLE |</div><div class='add'>+		   P_RGMII_ID_EG_ENABLE);</div><div class='add'>+</div><div class='add'>+	switch (interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_MII:</div><div class='add'>+		data8 |= bitval[P_MII_SEL];</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+		data8 |= bitval[P_RMII_SEL];</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_GMII:</div><div class='add'>+		data8 |= bitval[P_GMII_SEL];</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+		data8 |= bitval[P_RGMII_SEL];</div><div class='add'>+		/* On KSZ9893, disable RGMII in-band status support */</div><div class='add'>+		if (dev-&gt;chip_id == KSZ9893_CHIP_ID ||</div><div class='add'>+		    dev-&gt;chip_id == KSZ8563_CHIP_ID ||</div><div class='add'>+		    dev-&gt;chip_id == KSZ9563_CHIP_ID ||</div><div class='add'>+		    is_lan937x(dev))</div><div class='add'>+			data8 &amp;= ~P_MII_MAC_MODE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev-&gt;dev, "Unsupported interface '%s' for port %d\n",</div><div class='add'>+			phy_modes(interface), port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;rgmii_tx_val)</div><div class='add'>+		data8 |= P_RGMII_ID_EG_ENABLE;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;rgmii_rx_val)</div><div class='add'>+		data8 |= P_RGMII_ID_IG_ENABLE;</div><div class='add'>+</div><div class='add'>+	/* Write the updated value */</div><div class='add'>+	ksz_pwrite8(dev, port, regs[P_XMII_CTRL_1], data8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+phy_interface_t ksz_get_xmii(struct ksz_device *dev, int port, bool gbit)</div><div class='add'>+{</div><div class='add'>+	const u8 *bitval = dev-&gt;info-&gt;xmii_ctrl1;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	phy_interface_t interface;</div><div class='add'>+	u8 data8;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, regs[P_XMII_CTRL_1], &amp;data8);</div><div class='add'>+</div><div class='add'>+	val = FIELD_GET(P_MII_SEL_M, data8);</div><div class='add'>+</div><div class='add'>+	if (val == bitval[P_MII_SEL]) {</div><div class='add'>+		if (gbit)</div><div class='add'>+			interface = PHY_INTERFACE_MODE_GMII;</div><div class='add'>+		else</div><div class='add'>+			interface = PHY_INTERFACE_MODE_MII;</div><div class='add'>+	} else if (val == bitval[P_RMII_SEL]) {</div><div class='add'>+		interface = PHY_INTERFACE_MODE_RMII;</div><div class='add'>+	} else {</div><div class='add'>+		interface = PHY_INTERFACE_MODE_RGMII;</div><div class='add'>+		if (data8 &amp; P_RGMII_ID_EG_ENABLE)</div><div class='add'>+			interface = PHY_INTERFACE_MODE_RGMII_TXID;</div><div class='add'>+		if (data8 &amp; P_RGMII_ID_IG_ENABLE) {</div><div class='add'>+			interface = PHY_INTERFACE_MODE_RGMII_RXID;</div><div class='add'>+			if (data8 &amp; P_RGMII_ID_EG_ENABLE)</div><div class='add'>+				interface = PHY_INTERFACE_MODE_RGMII_ID;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return interface;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz88x3_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				       unsigned int mode,</div><div class='add'>+				       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ksz_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ports[dp-&gt;index].manual_flow = !(state-&gt;pause &amp; MLO_PAUSE_AN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				   unsigned int mode,</div><div class='add'>+				   const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ksz_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	/* Internal PHYs */</div><div class='add'>+	if (dev-&gt;info-&gt;internal_phy[port])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* No need to configure XMII control register when using SGMII. */</div><div class='add'>+	if (ksz_is_sgmii_port(dev, port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (phylink_autoneg_inband(mode)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "In-band AN not supported!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ksz_set_xmii(dev, port, state-&gt;interface);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;setup_rgmii_delay)</div><div class='add'>+		dev-&gt;dev_ops-&gt;setup_rgmii_delay(dev, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ksz_get_gbit(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	const u8 *bitval = dev-&gt;info-&gt;xmii_ctrl1;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	bool gbit = false;</div><div class='add'>+	u8 data8;</div><div class='add'>+	bool val;</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, regs[P_XMII_CTRL_1], &amp;data8);</div><div class='add'>+</div><div class='add'>+	val = FIELD_GET(P_GMII_1GBIT_M, data8);</div><div class='add'>+</div><div class='add'>+	if (val == bitval[P_GMII_1GBIT])</div><div class='add'>+		gbit = true;</div><div class='add'>+</div><div class='add'>+	return gbit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_set_gbit(struct ksz_device *dev, int port, bool gbit)</div><div class='add'>+{</div><div class='add'>+	const u8 *bitval = dev-&gt;info-&gt;xmii_ctrl1;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 data8;</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, regs[P_XMII_CTRL_1], &amp;data8);</div><div class='add'>+</div><div class='add'>+	data8 &amp;= ~P_GMII_1GBIT_M;</div><div class='add'>+</div><div class='add'>+	if (gbit)</div><div class='add'>+		data8 |= FIELD_PREP(P_GMII_1GBIT_M, bitval[P_GMII_1GBIT]);</div><div class='add'>+	else</div><div class='add'>+		data8 |= FIELD_PREP(P_GMII_1GBIT_M, bitval[P_GMII_NOT_1GBIT]);</div><div class='add'>+</div><div class='add'>+	/* Write the updated value */</div><div class='add'>+	ksz_pwrite8(dev, port, regs[P_XMII_CTRL_1], data8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_set_100_10mbit(struct ksz_device *dev, int port, int speed)</div><div class='add'>+{</div><div class='add'>+	const u8 *bitval = dev-&gt;info-&gt;xmii_ctrl0;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 data8;</div><div class='add'>+</div><div class='add'>+	ksz_pread8(dev, port, regs[P_XMII_CTRL_0], &amp;data8);</div><div class='add'>+</div><div class='add'>+	data8 &amp;= ~P_MII_100MBIT_M;</div><div class='add'>+</div><div class='add'>+	if (speed == SPEED_100)</div><div class='add'>+		data8 |= FIELD_PREP(P_MII_100MBIT_M, bitval[P_MII_100MBIT]);</div><div class='add'>+	else</div><div class='add'>+		data8 |= FIELD_PREP(P_MII_100MBIT_M, bitval[P_MII_10MBIT]);</div><div class='add'>+</div><div class='add'>+	/* Write the updated value */</div><div class='add'>+	ksz_pwrite8(dev, port, regs[P_XMII_CTRL_0], data8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_port_set_xmii_speed(struct ksz_device *dev, int port, int speed)</div><div class='add'>+{</div><div class='add'>+	if (speed == SPEED_1000)</div><div class='add'>+		ksz_set_gbit(dev, port, true);</div><div class='add'>+	else</div><div class='add'>+		ksz_set_gbit(dev, port, false);</div><div class='add'>+</div><div class='add'>+	if (speed == SPEED_100 || speed == SPEED_10)</div><div class='add'>+		ksz_set_100_10mbit(dev, port, speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_duplex_flowctrl(struct ksz_device *dev, int port, int duplex,</div><div class='add'>+				bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	const u8 *bitval = dev-&gt;info-&gt;xmii_ctrl0;</div><div class='add'>+	const u32 *masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 mask;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	mask = P_MII_DUPLEX_M | masks[P_MII_TX_FLOW_CTRL] |</div><div class='add'>+	       masks[P_MII_RX_FLOW_CTRL];</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		val = FIELD_PREP(P_MII_DUPLEX_M, bitval[P_MII_FULL_DUPLEX]);</div><div class='add'>+	else</div><div class='add'>+		val = FIELD_PREP(P_MII_DUPLEX_M, bitval[P_MII_HALF_DUPLEX]);</div><div class='add'>+</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		val |= masks[P_MII_TX_FLOW_CTRL];</div><div class='add'>+</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		val |= masks[P_MII_RX_FLOW_CTRL];</div><div class='add'>+</div><div class='add'>+	ksz_prmw8(dev, port, regs[P_XMII_CTRL_0], mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz9477_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+					struct phy_device *phydev,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					phy_interface_t interface,</div><div class='add'>+					int speed, int duplex, bool tx_pause,</div><div class='add'>+					bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ksz_device *dev = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct ksz_port *p;</div><div class='add'>+</div><div class='add'>+	p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	/* Internal PHYs */</div><div class='add'>+	if (dev-&gt;info-&gt;internal_phy[port])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	p-&gt;phydev.speed = speed;</div><div class='add'>+</div><div class='add'>+	ksz_port_set_xmii_speed(dev, port, speed);</div><div class='add'>+</div><div class='add'>+	ksz_duplex_flowctrl(dev, port, duplex, tx_pause, rx_pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_switch_detect(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	u8 id1, id2, id4;</div><div class='add'>+	u16 id16;</div><div class='add'>+	u32 id32;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* read chip id */</div><div class='add'>+	ret = ksz_read16(dev, REG_CHIP_ID0, &amp;id16);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	id1 = FIELD_GET(SW_FAMILY_ID_M, id16);</div><div class='add'>+	id2 = FIELD_GET(SW_CHIP_ID_M, id16);</div><div class='add'>+</div><div class='add'>+	switch (id1) {</div><div class='add'>+	case KSZ84_FAMILY_ID:</div><div class='add'>+		dev-&gt;chip_id = KSZ8463_CHIP_ID;</div><div class='add'>+		break;</div><div class='add'>+	case KSZ87_FAMILY_ID:</div><div class='add'>+		if (id2 == KSZ87_CHIP_ID_95) {</div><div class='add'>+			u8 val;</div><div class='add'>+</div><div class='add'>+			dev-&gt;chip_id = KSZ8795_CHIP_ID;</div><div class='add'>+</div><div class='add'>+			ksz_read8(dev, KSZ8_PORT_STATUS_0, &amp;val);</div><div class='add'>+			if (val &amp; KSZ8_PORT_FIBER_MODE)</div><div class='add'>+				dev-&gt;chip_id = KSZ8765_CHIP_ID;</div><div class='add'>+		} else if (id2 == KSZ87_CHIP_ID_94) {</div><div class='add'>+			dev-&gt;chip_id = KSZ8794_CHIP_ID;</div><div class='add'>+		} else {</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case KSZ88_FAMILY_ID:</div><div class='add'>+		if (id2 == KSZ88_CHIP_ID_63)</div><div class='add'>+			dev-&gt;chip_id = KSZ88X3_CHIP_ID;</div><div class='add'>+		else</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		break;</div><div class='add'>+	case KSZ8895_FAMILY_ID:</div><div class='add'>+		if (id2 == KSZ8895_CHIP_ID_95 ||</div><div class='add'>+		    id2 == KSZ8895_CHIP_ID_95R)</div><div class='add'>+			dev-&gt;chip_id = KSZ8895_CHIP_ID;</div><div class='add'>+		else</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		ret = ksz_read8(dev, REG_KSZ8864_CHIP_ID, &amp;id4);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		if (id4 &amp; SW_KSZ8864)</div><div class='add'>+			dev-&gt;chip_id = KSZ8864_CHIP_ID;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = ksz_read32(dev, REG_CHIP_ID0, &amp;id32);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dev-&gt;chip_rev = FIELD_GET(SW_REV_ID_M, id32);</div><div class='add'>+		id32 &amp;= ~0xFF;</div><div class='add'>+</div><div class='add'>+		switch (id32) {</div><div class='add'>+		case KSZ9477_CHIP_ID:</div><div class='add'>+		case KSZ9896_CHIP_ID:</div><div class='add'>+		case KSZ9897_CHIP_ID:</div><div class='add'>+		case KSZ9567_CHIP_ID:</div><div class='add'>+		case KSZ8567_CHIP_ID:</div><div class='add'>+		case LAN9370_CHIP_ID:</div><div class='add'>+		case LAN9371_CHIP_ID:</div><div class='add'>+		case LAN9372_CHIP_ID:</div><div class='add'>+		case LAN9373_CHIP_ID:</div><div class='add'>+		case LAN9374_CHIP_ID:</div><div class='add'>+</div><div class='add'>+			/* LAN9646 does not have its own chip id. */</div><div class='add'>+			if (dev-&gt;chip_id != LAN9646_CHIP_ID)</div><div class='add'>+				dev-&gt;chip_id = id32;</div><div class='add'>+			break;</div><div class='add'>+		case KSZ9893_CHIP_ID:</div><div class='add'>+			ret = ksz_read8(dev, REG_CHIP_ID4,</div><div class='add'>+					&amp;id4);</div><div class='ctx'> 			if (ret)</div><div class='del'>-				break;</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			if (id4 == SKU_ID_KSZ8563)</div><div class='add'>+				dev-&gt;chip_id = KSZ8563_CHIP_ID;</div><div class='add'>+			else if (id4 == SKU_ID_KSZ9563)</div><div class='add'>+				dev-&gt;chip_id = KSZ9563_CHIP_ID;</div><div class='add'>+			else</div><div class='add'>+				dev-&gt;chip_id = KSZ9893_CHIP_ID;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(dev-&gt;dev,</div><div class='add'>+				"unsupported switch detected %x)\n", id32);</div><div class='add'>+			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-		i++;</div><div class='del'>-	} while (i &lt; entries);</div><div class='del'>-	if (i &gt;= entries)</div><div class='del'>-		ret = 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+static int ksz_cls_flower_add(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ8563_CHIP_ID:</div><div class='add'>+	case KSZ8567_CHIP_ID:</div><div class='add'>+	case KSZ9477_CHIP_ID:</div><div class='add'>+	case KSZ9563_CHIP_ID:</div><div class='add'>+	case KSZ9567_CHIP_ID:</div><div class='add'>+	case KSZ9893_CHIP_ID:</div><div class='add'>+	case KSZ9896_CHIP_ID:</div><div class='add'>+	case KSZ9897_CHIP_ID:</div><div class='add'>+	case LAN9646_CHIP_ID:</div><div class='add'>+		return ksz9477_cls_flower_add(ds, port, cls, ingress);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_cls_flower_del(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ8563_CHIP_ID:</div><div class='add'>+	case KSZ8567_CHIP_ID:</div><div class='add'>+	case KSZ9477_CHIP_ID:</div><div class='add'>+	case KSZ9563_CHIP_ID:</div><div class='add'>+	case KSZ9567_CHIP_ID:</div><div class='add'>+	case KSZ9893_CHIP_ID:</div><div class='add'>+	case KSZ9896_CHIP_ID:</div><div class='add'>+	case KSZ9897_CHIP_ID:</div><div class='add'>+	case LAN9646_CHIP_ID:</div><div class='add'>+		return ksz9477_cls_flower_del(ds, port, cls, ingress);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_fdb_dump);</div><div class='ctx'> </div><div class='del'>-int ksz_port_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			 const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+/* Bandwidth is calculated by idle slope/transmission speed. Then the Bandwidth</div><div class='add'>+ * is converted to Hex-decimal using the successive multiplication method. On</div><div class='add'>+ * every step, integer part is taken and decimal part is carry forwarded.</div><div class='add'>+ */</div><div class='add'>+static int cinc_cal(s32 idle_slope, s32 send_slope, u32 *bw)</div><div class='ctx'> {</div><div class='del'>-	/* nothing to do */</div><div class='add'>+	u32 cinc = 0;</div><div class='add'>+	u32 txrate;</div><div class='add'>+	u32 rate;</div><div class='add'>+	u8 temp;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	txrate = idle_slope - send_slope;</div><div class='add'>+</div><div class='add'>+	if (!txrate)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rate = idle_slope;</div><div class='add'>+</div><div class='add'>+	/* 24 bit register */</div><div class='add'>+	for (i = 0; i &lt; 6; i++) {</div><div class='add'>+		rate = rate * 16;</div><div class='add'>+</div><div class='add'>+		temp = rate / txrate;</div><div class='add'>+</div><div class='add'>+		rate %= txrate;</div><div class='add'>+</div><div class='add'>+		cinc = ((cinc &lt;&lt; 4) | temp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*bw = cinc;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_mdb_prepare);</div><div class='ctx'> </div><div class='del'>-void ksz_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-		      const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+static int ksz_setup_tc_mode(struct ksz_device *dev, int port, u8 scheduler,</div><div class='add'>+			     u8 shaper)</div><div class='add'>+{</div><div class='add'>+	return ksz_pwrite8(dev, port, REG_PORT_MTI_QUEUE_CTRL_0,</div><div class='add'>+			   FIELD_PREP(MTI_SCHEDULE_MODE_M, scheduler) |</div><div class='add'>+			   FIELD_PREP(MTI_SHAPING_M, shaper));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_setup_tc_cbs(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct tc_cbs_qopt_offload *qopt)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-	struct alu_struct alu;</div><div class='del'>-	int index;</div><div class='del'>-	int empty = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 bw;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;info-&gt;tc_cbs_supported)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (qopt-&gt;queue &gt; dev-&gt;info-&gt;num_tx_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Queue Selection */</div><div class='add'>+	ret = ksz_pwrite32(dev, port, REG_PORT_MTI_QUEUE_INDEX__4, qopt-&gt;queue);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!qopt-&gt;enable)</div><div class='add'>+		return ksz_setup_tc_mode(dev, port, MTI_SCHEDULE_WRR,</div><div class='add'>+					 MTI_SHAPING_OFF);</div><div class='add'>+</div><div class='add'>+	/* High Credit */</div><div class='add'>+	ret = ksz_pwrite16(dev, port, REG_PORT_MTI_HI_WATER_MARK,</div><div class='add'>+			   qopt-&gt;hicredit);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Low Credit */</div><div class='add'>+	ret = ksz_pwrite16(dev, port, REG_PORT_MTI_LO_WATER_MARK,</div><div class='add'>+			   qopt-&gt;locredit);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Credit Increment Register */</div><div class='add'>+	ret = cinc_cal(qopt-&gt;idleslope, qopt-&gt;sendslope, &amp;bw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;tc_cbs_set_cinc) {</div><div class='add'>+		ret = dev-&gt;dev_ops-&gt;tc_cbs_set_cinc(dev, port, bw);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_setup_tc_mode(dev, port, MTI_SCHEDULE_STRICT_PRIO,</div><div class='add'>+				 MTI_SHAPING_SRP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_disable_egress_rate_limit(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	int queue, ret;</div><div class='add'>+</div><div class='add'>+	/* Configuration will not take effect until the last Port Queue X</div><div class='add'>+	 * Egress Limit Control Register is written.</div><div class='add'>+	 */</div><div class='add'>+	for (queue = 0; queue &lt; dev-&gt;info-&gt;num_tx_queues; queue++) {</div><div class='add'>+		ret = ksz_pwrite8(dev, port, KSZ9477_REG_PORT_OUT_RATE_0 + queue,</div><div class='add'>+				  KSZ9477_OUT_RATE_NO_LIMIT);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ets_band_to_queue(struct tc_ets_qopt_offload_replace_params *p,</div><div class='add'>+				 int band)</div><div class='add'>+{</div><div class='add'>+	/* Compared to queues, bands prioritize packets differently. In strict</div><div class='add'>+	 * priority mode, the lowest priority is assigned to Queue 0 while the</div><div class='add'>+	 * highest priority is given to Band 0.</div><div class='add'>+	 */</div><div class='add'>+	return p-&gt;bands - 1 - band;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 ksz8463_tc_ctrl(int port, int queue)</div><div class='add'>+{</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	reg = 0xC8 + port * 4;</div><div class='add'>+	reg += ((3 - queue) / 2) * 2;</div><div class='add'>+	reg++;</div><div class='add'>+	reg -= (queue &amp; 1);</div><div class='add'>+	return reg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz88x3_tc_ets_add - Configure ETS (Enhanced Transmission Selection)</div><div class='add'>+ *                      for a port on KSZ88x3 switch</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @port: Port number to configure</div><div class='add'>+ * @p: Pointer to offload replace parameters describing ETS bands and mapping</div><div class='add'>+ *</div><div class='add'>+ * The KSZ88x3 supports two scheduling modes: Strict Priority and</div><div class='add'>+ * Weighted Fair Queuing (WFQ). Both modes have fixed behavior:</div><div class='add'>+ *   - No configurable queue-to-priority mapping</div><div class='add'>+ *   - No weight adjustment in WFQ mode</div><div class='add'>+ *</div><div class='add'>+ * This function configures the switch to use strict priority mode by</div><div class='add'>+ * clearing the WFQ enable bit for all queues associated with ETS bands.</div><div class='add'>+ * If strict priority is not explicitly requested, the switch will default</div><div class='add'>+ * to WFQ mode.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int ksz88x3_tc_ets_add(struct ksz_device *dev, int port,</div><div class='add'>+			      struct tc_ets_qopt_offload_replace_params *p)</div><div class='add'>+{</div><div class='add'>+	int ret, band;</div><div class='add'>+</div><div class='add'>+	/* Only strict priority mode is supported for now.</div><div class='add'>+	 * WFQ is implicitly enabled when strict mode is disabled.</div><div class='add'>+	 */</div><div class='add'>+	for (band = 0; band &lt; p-&gt;bands; band++) {</div><div class='add'>+		int queue = ksz_ets_band_to_queue(p, band);</div><div class='add'>+		u8 reg;</div><div class='add'>+</div><div class='add'>+		/* Calculate TXQ Split Control register address for this</div><div class='add'>+		 * port/queue</div><div class='add'>+		 */</div><div class='add'>+		reg = KSZ8873_TXQ_SPLIT_CTRL_REG(port, queue);</div><div class='add'>+		if (ksz_is_ksz8463(dev))</div><div class='add'>+			reg = ksz8463_tc_ctrl(port, queue);</div><div class='add'>+</div><div class='add'>+		/* Clear WFQ enable bit to select strict priority scheduling */</div><div class='add'>+		ret = ksz_rmw8(dev, reg, KSZ8873_TXQ_WFQ_ENABLE, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	alu.port_forward = 0;</div><div class='del'>-	for (index = 0; index &lt; dev-&gt;num_statics; index++) {</div><div class='del'>-		if (!dev-&gt;dev_ops-&gt;r_sta_mac_table(dev, index, &amp;alu)) {</div><div class='del'>-			/* Found one already in static MAC table. */</div><div class='del'>-			if (!memcmp(alu.mac, mdb-&gt;addr, ETH_ALEN) &amp;&amp;</div><div class='del'>-			    alu.fid == mdb-&gt;vid)</div><div class='del'>-				break;</div><div class='del'>-		/* Remember the first empty entry. */</div><div class='del'>-		} else if (!empty) {</div><div class='del'>-			empty = index + 1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz88x3_tc_ets_del - Reset ETS (Enhanced Transmission Selection) config</div><div class='add'>+ *                      for a port on KSZ88x3 switch</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @port: Port number to reset</div><div class='add'>+ *</div><div class='add'>+ * The KSZ88x3 supports only fixed scheduling modes: Strict Priority or</div><div class='add'>+ * Weighted Fair Queuing (WFQ), with no reconfiguration of weights or</div><div class='add'>+ * queue mapping. This function resets the port’s scheduling mode to</div><div class='add'>+ * the default, which is WFQ, by enabling the WFQ bit for all queues.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int ksz88x3_tc_ets_del(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	int ret, queue;</div><div class='add'>+</div><div class='add'>+	/* Iterate over all transmit queues for this port */</div><div class='add'>+	for (queue = 0; queue &lt; dev-&gt;info-&gt;num_tx_queues; queue++) {</div><div class='add'>+		u8 reg;</div><div class='add'>+</div><div class='add'>+		/* Calculate TXQ Split Control register address for this</div><div class='add'>+		 * port/queue</div><div class='add'>+		 */</div><div class='add'>+		reg = KSZ8873_TXQ_SPLIT_CTRL_REG(port, queue);</div><div class='add'>+		if (ksz_is_ksz8463(dev))</div><div class='add'>+			reg = ksz8463_tc_ctrl(port, queue);</div><div class='add'>+</div><div class='add'>+		/* Set WFQ enable bit to revert back to default scheduling</div><div class='add'>+		 * mode</div><div class='add'>+		 */</div><div class='add'>+		ret = ksz_rmw8(dev, reg, KSZ8873_TXQ_WFQ_ENABLE,</div><div class='add'>+			       KSZ8873_TXQ_WFQ_ENABLE);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_queue_set_strict(struct ksz_device *dev, int port, int queue)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pwrite32(dev, port, REG_PORT_MTI_QUEUE_INDEX__4, queue);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_setup_tc_mode(dev, port, MTI_SCHEDULE_STRICT_PRIO,</div><div class='add'>+				 MTI_SHAPING_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_queue_set_wrr(struct ksz_device *dev, int port, int queue,</div><div class='add'>+			     int weight)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_pwrite32(dev, port, REG_PORT_MTI_QUEUE_INDEX__4, queue);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_setup_tc_mode(dev, port, MTI_SCHEDULE_WRR,</div><div class='add'>+				MTI_SHAPING_OFF);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_pwrite8(dev, port, KSZ9477_PORT_MTI_QUEUE_CTRL_1, weight);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_tc_ets_add(struct ksz_device *dev, int port,</div><div class='add'>+			  struct tc_ets_qopt_offload_replace_params *p)</div><div class='add'>+{</div><div class='add'>+	int ret, band, tc_prio;</div><div class='add'>+	u32 queue_map = 0;</div><div class='add'>+</div><div class='add'>+	/* In order to ensure proper prioritization, it is necessary to set the</div><div class='add'>+	 * rate limit for the related queue to zero. Otherwise strict priority</div><div class='add'>+	 * or WRR mode will not work. This is a hardware limitation.</div><div class='add'>+	 */</div><div class='add'>+	ret = ksz_disable_egress_rate_limit(dev, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Configure queue scheduling mode for all bands. Currently only strict</div><div class='add'>+	 * prio mode is supported.</div><div class='add'>+	 */</div><div class='add'>+	for (band = 0; band &lt; p-&gt;bands; band++) {</div><div class='add'>+		int queue = ksz_ets_band_to_queue(p, band);</div><div class='add'>+</div><div class='add'>+		ret = ksz_queue_set_strict(dev, port, queue);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure the mapping between traffic classes and queues. Note:</div><div class='add'>+	 * priomap variable support 16 traffic classes, but the chip can handle</div><div class='add'>+	 * only 8 classes.</div><div class='add'>+	 */</div><div class='add'>+	for (tc_prio = 0; tc_prio &lt; ARRAY_SIZE(p-&gt;priomap); tc_prio++) {</div><div class='add'>+		int queue;</div><div class='add'>+</div><div class='add'>+		if (tc_prio &gt;= dev-&gt;info-&gt;num_ipms)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		queue = ksz_ets_band_to_queue(p, p-&gt;priomap[tc_prio]);</div><div class='add'>+		queue_map |= queue &lt;&lt; (tc_prio * KSZ9477_PORT_TC_MAP_S);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_pwrite32(dev, port, KSZ9477_PORT_MRI_TC_MAP__4, queue_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_tc_ets_del(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	int ret, queue;</div><div class='add'>+</div><div class='add'>+	/* To restore the default chip configuration, set all queues to use the</div><div class='add'>+	 * WRR scheduler with a weight of 1.</div><div class='add'>+	 */</div><div class='add'>+	for (queue = 0; queue &lt; dev-&gt;info-&gt;num_tx_queues; queue++) {</div><div class='add'>+		ret = ksz_queue_set_wrr(dev, port, queue,</div><div class='add'>+					KSZ9477_DEFAULT_WRR_WEIGHT);</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Revert the queue mapping for TC-priority to its default setting on</div><div class='add'>+	 * the chip.</div><div class='add'>+	 */</div><div class='add'>+	return ksz9477_set_default_prio_queue_mapping(dev, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_tc_ets_validate(struct ksz_device *dev, int port,</div><div class='add'>+			       struct tc_ets_qopt_offload_replace_params *p)</div><div class='add'>+{</div><div class='add'>+	int band;</div><div class='add'>+</div><div class='add'>+	/* Since it is not feasible to share one port among multiple qdisc,</div><div class='add'>+	 * the user must configure all available queues appropriately.</div><div class='add'>+	 */</div><div class='add'>+	if (p-&gt;bands != dev-&gt;info-&gt;num_tx_queues) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Not supported amount of bands. It should be %d\n",</div><div class='add'>+			dev-&gt;info-&gt;num_tx_queues);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (band = 0; band &lt; p-&gt;bands; ++band) {</div><div class='add'>+		/* The KSZ switches utilize a weighted round robin configuration</div><div class='add'>+		 * where a certain number of packets can be transmitted from a</div><div class='add'>+		 * queue before the next queue is serviced. For more information</div><div class='add'>+		 * on this, refer to section 5.2.8.4 of the KSZ8565R</div><div class='add'>+		 * documentation on the Port Transmit Queue Control 1 Register.</div><div class='add'>+		 * However, the current ETS Qdisc implementation (as of February</div><div class='add'>+		 * 2023) assigns a weight to each queue based on the number of</div><div class='add'>+		 * bytes or extrapolated bandwidth in percentages. Since this</div><div class='add'>+		 * differs from the KSZ switches' method and we don't want to</div><div class='add'>+		 * fake support by converting bytes to packets, it is better to</div><div class='add'>+		 * return an error instead.</div><div class='add'>+		 */</div><div class='add'>+		if (p-&gt;quanta[band]) {</div><div class='add'>+			dev_err(dev-&gt;dev, "Quanta/weights configuration is not supported.\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* no available entry */</div><div class='del'>-	if (index == dev-&gt;num_statics &amp;&amp; !empty)</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_tc_setup_qdisc_ets(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct tc_ets_qopt_offload *qopt)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (is_ksz8(dev) &amp;&amp; !(ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (qopt-&gt;parent != TC_H_ROOT) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Parent should be \"root\"\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (qopt-&gt;command) {</div><div class='add'>+	case TC_ETS_REPLACE:</div><div class='add'>+		ret = ksz_tc_ets_validate(dev, port, &amp;qopt-&gt;replace_params);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev))</div><div class='add'>+			return ksz88x3_tc_ets_add(dev, port,</div><div class='add'>+						  &amp;qopt-&gt;replace_params);</div><div class='add'>+		else</div><div class='add'>+			return ksz_tc_ets_add(dev, port, &amp;qopt-&gt;replace_params);</div><div class='add'>+	case TC_ETS_DESTROY:</div><div class='add'>+		if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev))</div><div class='add'>+			return ksz88x3_tc_ets_del(dev, port);</div><div class='add'>+		else</div><div class='add'>+			return ksz_tc_ets_del(dev, port);</div><div class='add'>+	case TC_ETS_STATS:</div><div class='add'>+	case TC_ETS_GRAFT:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_setup_tc(struct dsa_switch *ds, int port,</div><div class='add'>+			enum tc_setup_type type, void *type_data)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_CBS:</div><div class='add'>+		return ksz_setup_tc_cbs(ds, port, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_ETS:</div><div class='add'>+		return ksz_tc_setup_qdisc_ets(ds, port, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_handle_wake_reason - Handle wake reason on a specified port.</div><div class='add'>+ * @dev: The device structure.</div><div class='add'>+ * @port: The port number.</div><div class='add'>+ *</div><div class='add'>+ * This function reads the PME (Power Management Event) status register of a</div><div class='add'>+ * specified port to determine the wake reason. If there is no wake event, it</div><div class='add'>+ * returns early. Otherwise, it logs the wake reason which could be due to a</div><div class='add'>+ * "Magic Packet", "Link Up", or "Energy Detect" event. The PME status register</div><div class='add'>+ * is then cleared to acknowledge the handling of the wake event.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or an error code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz_handle_wake_reason(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	const struct ksz_dev_ops *ops = dev-&gt;dev_ops;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 pme_status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ops-&gt;pme_pread8(dev, port, regs[REG_PORT_PME_STATUS],</div><div class='add'>+			      &amp;pme_status);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!pme_status)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev-&gt;dev, "Wake event on port %d due to:%s%s%s\n", port,</div><div class='add'>+		pme_status &amp; PME_WOL_MAGICPKT ? " \"Magic Packet\"" : "",</div><div class='add'>+		pme_status &amp; PME_WOL_LINKUP ? " \"Link Up\"" : "",</div><div class='add'>+		pme_status &amp; PME_WOL_ENERGY ? " \"Energy detect\"" : "");</div><div class='add'>+</div><div class='add'>+	return ops-&gt;pme_pwrite8(dev, port, regs[REG_PORT_PME_STATUS],</div><div class='add'>+				pme_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_get_wol - Get Wake-on-LAN settings for a specified port.</div><div class='add'>+ * @ds: The dsa_switch structure.</div><div class='add'>+ * @port: The port number.</div><div class='add'>+ * @wol: Pointer to ethtool Wake-on-LAN settings structure.</div><div class='add'>+ *</div><div class='add'>+ * This function checks the device PME wakeup_source flag and chip_id.</div><div class='add'>+ * If enabled and supported, it sets the supported and active WoL</div><div class='add'>+ * flags.</div><div class='add'>+ */</div><div class='add'>+static void ksz_get_wol(struct dsa_switch *ds, int port,</div><div class='add'>+			struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 pme_ctrl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_ksz9477(dev) &amp;&amp; !ksz_is_ksz87xx(dev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	/* add entry */</div><div class='del'>-	if (index == dev-&gt;num_statics) {</div><div class='del'>-		index = empty - 1;</div><div class='del'>-		memset(&amp;alu, 0, sizeof(alu));</div><div class='del'>-		memcpy(alu.mac, mdb-&gt;addr, ETH_ALEN);</div><div class='del'>-		alu.is_static = true;</div><div class='add'>+	if (!dev-&gt;wakeup_source)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	wol-&gt;supported = WAKE_PHY;</div><div class='add'>+</div><div class='add'>+	/* Check if the current MAC address on this port can be set</div><div class='add'>+	 * as global for WAKE_MAGIC support. The result may vary</div><div class='add'>+	 * dynamically based on other ports configurations.</div><div class='add'>+	 */</div><div class='add'>+	if (ksz_is_port_mac_global_usable(dev-&gt;ds, port))</div><div class='add'>+		wol-&gt;supported |= WAKE_MAGIC;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;pme_pread8(dev, port, regs[REG_PORT_PME_CTRL],</div><div class='add'>+				       &amp;pme_ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pme_ctrl &amp; PME_WOL_MAGICPKT)</div><div class='add'>+		wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='add'>+	if (pme_ctrl &amp; (PME_WOL_LINKUP | PME_WOL_ENERGY))</div><div class='add'>+		wol-&gt;wolopts |= WAKE_PHY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_set_wol - Set Wake-on-LAN settings for a specified port.</div><div class='add'>+ * @ds: The dsa_switch structure.</div><div class='add'>+ * @port: The port number.</div><div class='add'>+ * @wol: Pointer to ethtool Wake-on-LAN settings structure.</div><div class='add'>+ *</div><div class='add'>+ * This function configures Wake-on-LAN (WoL) settings for a specified</div><div class='add'>+ * port. It validates the provided WoL options, checks if PME is</div><div class='add'>+ * enabled and supported, clears any previous wake reasons, and sets</div><div class='add'>+ * the Magic Packet flag in the port's PME control register if</div><div class='add'>+ * specified.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or other error codes on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_set_wol(struct dsa_switch *ds, int port,</div><div class='add'>+		       struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	u8 pme_ctrl = 0, pme_ctrl_old = 0;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	bool magic_switched_off;</div><div class='add'>+	bool magic_switched_on;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~(WAKE_PHY | WAKE_MAGIC))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!is_ksz9477(dev) &amp;&amp; !ksz_is_ksz87xx(dev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;wakeup_source)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = ksz_handle_wake_reason(dev, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='add'>+		pme_ctrl |= PME_WOL_MAGICPKT;</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_PHY)</div><div class='add'>+		pme_ctrl |= PME_WOL_LINKUP | PME_WOL_ENERGY;</div><div class='add'>+</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;pme_pread8(dev, port, regs[REG_PORT_PME_CTRL],</div><div class='add'>+				       &amp;pme_ctrl_old);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (pme_ctrl_old == pme_ctrl)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	magic_switched_off = (pme_ctrl_old &amp; PME_WOL_MAGICPKT) &amp;&amp;</div><div class='add'>+			    !(pme_ctrl &amp; PME_WOL_MAGICPKT);</div><div class='add'>+	magic_switched_on = !(pme_ctrl_old &amp; PME_WOL_MAGICPKT) &amp;&amp;</div><div class='add'>+			    (pme_ctrl &amp; PME_WOL_MAGICPKT);</div><div class='add'>+</div><div class='add'>+	/* To keep reference count of MAC address, we should do this</div><div class='add'>+	 * operation only on change of WOL settings.</div><div class='add'>+	 */</div><div class='add'>+	if (magic_switched_on) {</div><div class='add'>+		ret = ksz_switch_macaddr_get(dev-&gt;ds, port, NULL);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else if (magic_switched_off) {</div><div class='add'>+		ksz_switch_macaddr_put(dev-&gt;ds);</div><div class='ctx'> 	}</div><div class='del'>-	alu.port_forward |= BIT(port);</div><div class='del'>-	if (mdb-&gt;vid) {</div><div class='del'>-		alu.is_use_fid = true;</div><div class='ctx'> </div><div class='del'>-		/* Need a way to map VID to FID. */</div><div class='del'>-		alu.fid = mdb-&gt;vid;</div><div class='add'>+	ret = dev-&gt;dev_ops-&gt;pme_pwrite8(dev, port, regs[REG_PORT_PME_CTRL],</div><div class='add'>+					pme_ctrl);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (magic_switched_on)</div><div class='add'>+			ksz_switch_macaddr_put(dev-&gt;ds);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;dev_ops-&gt;w_sta_mac_table(dev, index, &amp;alu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_mdb_add);</div><div class='ctx'> </div><div class='del'>-int ksz_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+/**</div><div class='add'>+ * ksz_wol_pre_shutdown - Prepares the switch device for shutdown while</div><div class='add'>+ *                        considering Wake-on-LAN (WoL) settings.</div><div class='add'>+ * @dev: The switch device structure.</div><div class='add'>+ * @wol_enabled: Pointer to a boolean which will be set to true if WoL is</div><div class='add'>+ *               enabled on any port.</div><div class='add'>+ *</div><div class='add'>+ * This function prepares the switch device for a safe shutdown while taking</div><div class='add'>+ * into account the Wake-on-LAN (WoL) settings on the user ports. It updates</div><div class='add'>+ * the wol_enabled flag accordingly to reflect whether WoL is active on any</div><div class='add'>+ * port.</div><div class='add'>+ */</div><div class='add'>+static void ksz_wol_pre_shutdown(struct ksz_device *dev, bool *wol_enabled)</div><div class='ctx'> {</div><div class='add'>+	const struct ksz_dev_ops *ops = dev-&gt;dev_ops;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	u8 pme_pin_en = PME_ENABLE;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*wol_enabled = false;</div><div class='add'>+</div><div class='add'>+	if (!is_ksz9477(dev) &amp;&amp; !ksz_is_ksz87xx(dev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;wakeup_source)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, dev-&gt;ds) {</div><div class='add'>+		u8 pme_ctrl = 0;</div><div class='add'>+</div><div class='add'>+		ret = ops-&gt;pme_pread8(dev, dp-&gt;index,</div><div class='add'>+				      regs[REG_PORT_PME_CTRL], &amp;pme_ctrl);</div><div class='add'>+		if (!ret &amp;&amp; pme_ctrl)</div><div class='add'>+			*wol_enabled = true;</div><div class='add'>+</div><div class='add'>+		/* make sure there are no pending wake events which would</div><div class='add'>+		 * prevent the device from going to sleep/shutdown.</div><div class='add'>+		 */</div><div class='add'>+		ksz_handle_wake_reason(dev, dp-&gt;index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Now we are save to enable PME pin. */</div><div class='add'>+	if (*wol_enabled) {</div><div class='add'>+		if (dev-&gt;pme_active_high)</div><div class='add'>+			pme_pin_en |= PME_POLARITY;</div><div class='add'>+		ops-&gt;pme_write8(dev, regs[REG_SW_PME_CTRL], pme_pin_en);</div><div class='add'>+		if (ksz_is_ksz87xx(dev))</div><div class='add'>+			ksz_write8(dev, KSZ87XX_REG_INT_EN, KSZ87XX_INT_PME_MASK);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_port_set_mac_address(struct dsa_switch *ds, int port,</div><div class='add'>+				    const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct ethtool_wolinfo wol;</div><div class='add'>+</div><div class='add'>+	if (dp-&gt;hsr_dev) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"Cannot change MAC address on port %d with active HSR offload\n",</div><div class='add'>+			port);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Need to initialize variable as the code to fill in settings may</div><div class='add'>+	 * not be executed.</div><div class='add'>+	 */</div><div class='add'>+	wol.wolopts = 0;</div><div class='add'>+</div><div class='add'>+	ksz_get_wol(ds, dp-&gt;index, &amp;wol);</div><div class='add'>+	if (wol.wolopts &amp; WAKE_MAGIC) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"Cannot change MAC address on port %d with active Wake on Magic Packet\n",</div><div class='add'>+			port);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_is_port_mac_global_usable - Check if the MAC address on a given port</div><div class='add'>+ *                                 can be used as a global address.</div><div class='add'>+ * @ds: Pointer to the DSA switch structure.</div><div class='add'>+ * @port: The port number on which the MAC address is to be checked.</div><div class='add'>+ *</div><div class='add'>+ * This function examines the MAC address set on the specified port and</div><div class='add'>+ * determines if it can be used as a global address for the switch.</div><div class='add'>+ *</div><div class='add'>+ * Return: true if the port's MAC address can be used as a global address, false</div><div class='add'>+ * otherwise.</div><div class='add'>+ */</div><div class='add'>+bool ksz_is_port_mac_global_usable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct net_device *user = dsa_to_port(ds, port)-&gt;user;</div><div class='add'>+	const unsigned char *addr = user-&gt;dev_addr;</div><div class='add'>+	struct ksz_switch_macaddr *switch_macaddr;</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='del'>-	struct alu_struct alu;</div><div class='del'>-	int index;</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	for (index = 0; index &lt; dev-&gt;num_statics; index++) {</div><div class='del'>-		if (!dev-&gt;dev_ops-&gt;r_sta_mac_table(dev, index, &amp;alu)) {</div><div class='del'>-			/* Found one already in static MAC table. */</div><div class='del'>-			if (!memcmp(alu.mac, mdb-&gt;addr, ETH_ALEN) &amp;&amp;</div><div class='del'>-			    alu.fid == mdb-&gt;vid)</div><div class='del'>-				break;</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	switch_macaddr = dev-&gt;switch_macaddr;</div><div class='add'>+	if (switch_macaddr &amp;&amp; !ether_addr_equal(switch_macaddr-&gt;addr, addr))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_switch_macaddr_get - Program the switch's MAC address register.</div><div class='add'>+ * @ds: DSA switch instance.</div><div class='add'>+ * @port: Port number.</div><div class='add'>+ * @extack: Netlink extended acknowledgment.</div><div class='add'>+ *</div><div class='add'>+ * This function programs the switch's MAC address register with the MAC address</div><div class='add'>+ * of the requesting user port. This single address is used by the switch for</div><div class='add'>+ * multiple features like HSR self-address filtering and WoL. Other user ports</div><div class='add'>+ * can share ownership of this address as long as their MAC address is the same.</div><div class='add'>+ * The MAC addresses of user ports must not change while they have ownership of</div><div class='add'>+ * the switch MAC address.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or other error codes on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz_switch_macaddr_get(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct net_device *user = dsa_to_port(ds, port)-&gt;user;</div><div class='add'>+	const unsigned char *addr = user-&gt;dev_addr;</div><div class='add'>+	struct ksz_switch_macaddr *switch_macaddr;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	/* Make sure concurrent MAC address changes are blocked */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	switch_macaddr = dev-&gt;switch_macaddr;</div><div class='add'>+	if (switch_macaddr) {</div><div class='add'>+		if (!ether_addr_equal(switch_macaddr-&gt;addr, addr)) {</div><div class='add'>+			NL_SET_ERR_MSG_FMT_MOD(extack,</div><div class='add'>+					       "Switch already configured for MAC address %pM",</div><div class='add'>+					       switch_macaddr-&gt;addr);</div><div class='add'>+			return -EBUSY;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		refcount_inc(&amp;switch_macaddr-&gt;refcount);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* no available entry */</div><div class='del'>-	if (index == dev-&gt;num_statics)</div><div class='del'>-		goto exit;</div><div class='add'>+	switch_macaddr = kzalloc(sizeof(*switch_macaddr), GFP_KERNEL);</div><div class='add'>+	if (!switch_macaddr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(switch_macaddr-&gt;addr, addr);</div><div class='add'>+	refcount_set(&amp;switch_macaddr-&gt;refcount, 1);</div><div class='add'>+	dev-&gt;switch_macaddr = switch_macaddr;</div><div class='add'>+</div><div class='add'>+	/* Program the switch MAC address to hardware */</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='add'>+		if (ksz_is_ksz8463(dev)) {</div><div class='add'>+			u16 addr16 = ((u16)addr[i] &lt;&lt; 8) | addr[i + 1];</div><div class='ctx'> </div><div class='del'>-	/* clear port */</div><div class='del'>-	alu.port_forward &amp;= ~BIT(port);</div><div class='del'>-	if (!alu.port_forward)</div><div class='del'>-		alu.is_static = false;</div><div class='del'>-	dev-&gt;dev_ops-&gt;w_sta_mac_table(dev, index, &amp;alu);</div><div class='add'>+			ret = ksz_write16(dev, regs[REG_SW_MAC_ADDR] + i,</div><div class='add'>+					  addr16);</div><div class='add'>+			i++;</div><div class='add'>+		} else {</div><div class='add'>+			ret = ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i,</div><div class='add'>+					 addr[i]);</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto macaddr_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+macaddr_drop:</div><div class='add'>+	dev-&gt;switch_macaddr = NULL;</div><div class='add'>+	refcount_set(&amp;switch_macaddr-&gt;refcount, 0);</div><div class='add'>+	kfree(switch_macaddr);</div><div class='ctx'> </div><div class='del'>-exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_port_mdb_del);</div><div class='ctx'> </div><div class='del'>-int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy)</div><div class='add'>+void ksz_switch_macaddr_put(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='add'>+	struct ksz_switch_macaddr *switch_macaddr;</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* setup slave port */</div><div class='del'>-	dev-&gt;dev_ops-&gt;port_setup(dev, port, false);</div><div class='del'>-	dev-&gt;dev_ops-&gt;phy_setup(dev, port, phy);</div><div class='add'>+	/* Make sure concurrent MAC address changes are blocked */</div><div class='add'>+	ASSERT_RTNL();</div><div class='ctx'> </div><div class='del'>-	/* port_stp_state_set() will be called after to enable the port so</div><div class='del'>-	 * there is no need to do anything.</div><div class='add'>+	switch_macaddr = dev-&gt;switch_macaddr;</div><div class='add'>+	if (!refcount_dec_and_test(&amp;switch_macaddr-&gt;refcount))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='add'>+		ksz_write8(dev, regs[REG_SW_MAC_ADDR] + i, 0);</div><div class='add'>+</div><div class='add'>+	dev-&gt;switch_macaddr = NULL;</div><div class='add'>+	kfree(switch_macaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_hsr_join(struct dsa_switch *ds, int port, struct net_device *hsr,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	enum hsr_version ver;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = hsr_get_version(hsr, &amp;ver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id != KSZ9477_CHIP_ID) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Chip does not support HSR offload");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* KSZ9477 can support HW offloading of only 1 HSR device */</div><div class='add'>+	if (dev-&gt;hsr_dev &amp;&amp; hsr != dev-&gt;hsr_dev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Offload supported for a single HSR");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* KSZ9477 only supports HSR v0 and v1 */</div><div class='add'>+	if (!(ver == HSR_V0 || ver == HSR_V1)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Only HSR v0 and v1 supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* KSZ9477 can only perform HSR offloading for up to two ports */</div><div class='add'>+	if (hweight8(dev-&gt;hsr_ports) &gt;= 2) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cannot offload more than two ports - using software HSR");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Self MAC address filtering, to avoid frames traversing</div><div class='add'>+	 * the HSR ring more than once.</div><div class='ctx'> 	 */</div><div class='add'>+	ret = ksz_switch_macaddr_get(ds, port, extack);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ksz9477_hsr_join(ds, port, hsr);</div><div class='add'>+	dev-&gt;hsr_dev = hsr;</div><div class='add'>+	dev-&gt;hsr_ports |= BIT(port);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_enable_port);</div><div class='ctx'> </div><div class='del'>-void ksz_disable_port(struct dsa_switch *ds, int port)</div><div class='add'>+static int ksz_hsr_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct net_device *hsr)</div><div class='ctx'> {</div><div class='ctx'> 	struct ksz_device *dev = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;on_ports &amp;= ~(1 &lt;&lt; port);</div><div class='del'>-	dev-&gt;live_ports &amp;= ~(1 &lt;&lt; port);</div><div class='add'>+	WARN_ON(dev-&gt;chip_id != KSZ9477_CHIP_ID);</div><div class='ctx'> </div><div class='del'>-	/* port_stp_state_set() will be called after to disable the port so</div><div class='del'>-	 * there is no need to do anything.</div><div class='del'>-	 */</div><div class='add'>+	ksz9477_hsr_leave(ds, port, hsr);</div><div class='add'>+	dev-&gt;hsr_ports &amp;= ~BIT(port);</div><div class='add'>+	if (!dev-&gt;hsr_ports)</div><div class='add'>+		dev-&gt;hsr_dev = NULL;</div><div class='add'>+</div><div class='add'>+	ksz_switch_macaddr_put(ds);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-EXPORT_SYMBOL_GPL(ksz_disable_port);</div><div class='ctx'> </div><div class='del'>-struct ksz_device *ksz_switch_alloc(struct device *base,</div><div class='del'>-				    const struct ksz_io_ops *ops,</div><div class='del'>-				    void *priv)</div><div class='add'>+static int ksz_suspend(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;dev-&gt;mib_read);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_resume(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;mib_read_interval)</div><div class='add'>+		schedule_delayed_work(&amp;dev-&gt;mib_read, dev-&gt;mib_read_interval);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops ksz_switch_ops = {</div><div class='add'>+	.get_tag_protocol	= ksz_get_tag_protocol,</div><div class='add'>+	.connect_tag_protocol   = ksz_connect_tag_protocol,</div><div class='add'>+	.get_phy_flags		= ksz_get_phy_flags,</div><div class='add'>+	.setup			= ksz_setup,</div><div class='add'>+	.teardown		= ksz_teardown,</div><div class='add'>+	.phy_read		= ksz_phy_read16,</div><div class='add'>+	.phy_write		= ksz_phy_write16,</div><div class='add'>+	.phylink_get_caps	= ksz_phylink_get_caps,</div><div class='add'>+	.port_setup		= ksz_port_setup,</div><div class='add'>+	.set_ageing_time	= ksz_set_ageing_time,</div><div class='add'>+	.get_strings		= ksz_get_strings,</div><div class='add'>+	.get_ethtool_stats	= ksz_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= ksz_sset_count,</div><div class='add'>+	.port_bridge_join	= ksz_port_bridge_join,</div><div class='add'>+	.port_bridge_leave	= ksz_port_bridge_leave,</div><div class='add'>+	.port_hsr_join		= ksz_hsr_join,</div><div class='add'>+	.port_hsr_leave		= ksz_hsr_leave,</div><div class='add'>+	.port_set_mac_address	= ksz_port_set_mac_address,</div><div class='add'>+	.port_stp_state_set	= ksz_port_stp_state_set,</div><div class='add'>+	.port_teardown		= ksz_port_teardown,</div><div class='add'>+	.port_pre_bridge_flags	= ksz_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= ksz_port_bridge_flags,</div><div class='add'>+	.port_fast_age		= ksz_port_fast_age,</div><div class='add'>+	.port_vlan_filtering	= ksz_port_vlan_filtering,</div><div class='add'>+	.port_vlan_add		= ksz_port_vlan_add,</div><div class='add'>+	.port_vlan_del		= ksz_port_vlan_del,</div><div class='add'>+	.port_fdb_dump		= ksz_port_fdb_dump,</div><div class='add'>+	.port_fdb_add		= ksz_port_fdb_add,</div><div class='add'>+	.port_fdb_del		= ksz_port_fdb_del,</div><div class='add'>+	.port_mdb_add           = ksz_port_mdb_add,</div><div class='add'>+	.port_mdb_del           = ksz_port_mdb_del,</div><div class='add'>+	.port_mirror_add	= ksz_port_mirror_add,</div><div class='add'>+	.port_mirror_del	= ksz_port_mirror_del,</div><div class='add'>+	.get_stats64		= ksz_get_stats64,</div><div class='add'>+	.get_pause_stats	= ksz_get_pause_stats,</div><div class='add'>+	.port_change_mtu	= ksz_change_mtu,</div><div class='add'>+	.port_max_mtu		= ksz_max_mtu,</div><div class='add'>+	.get_wol		= ksz_get_wol,</div><div class='add'>+	.set_wol		= ksz_set_wol,</div><div class='add'>+	.suspend		= ksz_suspend,</div><div class='add'>+	.resume			= ksz_resume,</div><div class='add'>+	.get_ts_info		= ksz_get_ts_info,</div><div class='add'>+	.port_hwtstamp_get	= ksz_hwtstamp_get,</div><div class='add'>+	.port_hwtstamp_set	= ksz_hwtstamp_set,</div><div class='add'>+	.port_txtstamp		= ksz_port_txtstamp,</div><div class='add'>+	.port_rxtstamp		= ksz_port_rxtstamp,</div><div class='add'>+	.cls_flower_add		= ksz_cls_flower_add,</div><div class='add'>+	.cls_flower_del		= ksz_cls_flower_del,</div><div class='add'>+	.port_setup_tc		= ksz_setup_tc,</div><div class='add'>+	.support_eee		= ksz_support_eee,</div><div class='add'>+	.set_mac_eee		= ksz_set_mac_eee,</div><div class='add'>+	.port_get_default_prio	= ksz_port_get_default_prio,</div><div class='add'>+	.port_set_default_prio	= ksz_port_set_default_prio,</div><div class='add'>+	.port_get_dscp_prio	= ksz_port_get_dscp_prio,</div><div class='add'>+	.port_add_dscp_prio	= ksz_port_add_dscp_prio,</div><div class='add'>+	.port_del_dscp_prio	= ksz_port_del_dscp_prio,</div><div class='add'>+	.port_get_apptrust	= ksz_port_get_apptrust,</div><div class='add'>+	.port_set_apptrust	= ksz_port_set_apptrust,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_device *ksz_switch_alloc(struct device *base, void *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> 	struct ksz_device *swdev;</div><div class='ctx'> </div><div class='del'>-	ds = dsa_switch_alloc(base, DSA_MAX_PORTS);</div><div class='add'>+	ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL);</div><div class='ctx'> 	if (!ds)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='add'>+	ds-&gt;dev = base;</div><div class='add'>+	ds-&gt;num_ports = DSA_MAX_PORTS;</div><div class='add'>+	ds-&gt;ops = &amp;ksz_switch_ops;</div><div class='add'>+</div><div class='ctx'> 	swdev = devm_kzalloc(base, sizeof(*swdev), GFP_KERNEL);</div><div class='ctx'> 	if (!swdev)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -413,19 +5043,352 @@ struct ksz_device *ksz_switch_alloc(struct device *base,</div><div class='ctx'> </div><div class='ctx'> 	swdev-&gt;ds = ds;</div><div class='ctx'> 	swdev-&gt;priv = priv;</div><div class='del'>-	swdev-&gt;ops = ops;</div><div class='ctx'> </div><div class='ctx'> 	return swdev;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ksz_switch_alloc);</div><div class='ctx'> </div><div class='del'>-int ksz_switch_register(struct ksz_device *dev,</div><div class='del'>-			const struct ksz_dev_ops *ops)</div><div class='add'>+/**</div><div class='add'>+ * ksz_switch_shutdown - Shutdown routine for the switch device.</div><div class='add'>+ * @dev: The switch device structure.</div><div class='add'>+ *</div><div class='add'>+ * This function is responsible for initiating a shutdown sequence for the</div><div class='add'>+ * switch device. It invokes the reset operation defined in the device</div><div class='add'>+ * operations, if available, to reset the switch. Subsequently, it calls the</div><div class='add'>+ * DSA framework's shutdown function to ensure a proper shutdown of the DSA</div><div class='add'>+ * switch.</div><div class='add'>+ */</div><div class='add'>+void ksz_switch_shutdown(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	bool wol_enabled = false;</div><div class='add'>+</div><div class='add'>+	ksz_wol_pre_shutdown(dev, &amp;wol_enabled);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dev_ops-&gt;reset &amp;&amp; !wol_enabled)</div><div class='add'>+		dev-&gt;dev_ops-&gt;reset(dev);</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(dev-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ksz_switch_shutdown);</div><div class='add'>+</div><div class='add'>+static void ksz_parse_rgmii_delay(struct ksz_device *dev, int port_num,</div><div class='add'>+				  struct device_node *port_dn)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	phy_interface_t phy_mode = dev-&gt;ports[port_num].interface;</div><div class='add'>+	int rx_delay = -1, tx_delay = -1;</div><div class='add'>+</div><div class='add'>+	if (!phy_interface_mode_is_rgmii(phy_mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	of_property_read_u32(port_dn, "rx-internal-delay-ps", &amp;rx_delay);</div><div class='add'>+	of_property_read_u32(port_dn, "tx-internal-delay-ps", &amp;tx_delay);</div><div class='add'>+</div><div class='add'>+	if (rx_delay == -1 &amp;&amp; tx_delay == -1) {</div><div class='add'>+		dev_warn(dev-&gt;dev,</div><div class='add'>+			 "Port %d interpreting RGMII delay settings based on \"phy-mode\" property, "</div><div class='add'>+			 "please update device tree to specify \"rx-internal-delay-ps\" and "</div><div class='add'>+			 "\"tx-internal-delay-ps\"",</div><div class='add'>+			 port_num);</div><div class='add'>+</div><div class='add'>+		if (phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||</div><div class='add'>+		    phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='add'>+			rx_delay = 2000;</div><div class='add'>+</div><div class='add'>+		if (phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||</div><div class='add'>+		    phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='add'>+			tx_delay = 2000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_delay &lt; 0)</div><div class='add'>+		rx_delay = 0;</div><div class='add'>+	if (tx_delay &lt; 0)</div><div class='add'>+		tx_delay = 0;</div><div class='add'>+</div><div class='add'>+	dev-&gt;ports[port_num].rgmii_rx_val = rx_delay;</div><div class='add'>+	dev-&gt;ports[port_num].rgmii_tx_val = tx_delay;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_drive_strength_to_reg() - Convert drive strength value to corresponding</div><div class='add'>+ *				 register value.</div><div class='add'>+ * @array:	The array of drive strength values to search.</div><div class='add'>+ * @array_size:	The size of the array.</div><div class='add'>+ * @microamp:	The drive strength value in microamp to be converted.</div><div class='add'>+ *</div><div class='add'>+ * This function searches the array of drive strength values for the given</div><div class='add'>+ * microamp value and returns the corresponding register value for that drive.</div><div class='add'>+ *</div><div class='add'>+ * Returns: If found, the corresponding register value for that drive strength</div><div class='add'>+ * is returned. Otherwise, -EINVAL is returned indicating an invalid value.</div><div class='add'>+ */</div><div class='add'>+static int ksz_drive_strength_to_reg(const struct ksz_drive_strength *array,</div><div class='add'>+				     size_t array_size, int microamp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; array_size; i++) {</div><div class='add'>+		if (array[i].microamp == microamp)</div><div class='add'>+			return array[i].reg_val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_drive_strength_error() - Report invalid drive strength value</div><div class='add'>+ * @dev:	ksz device</div><div class='add'>+ * @array:	The array of drive strength values to search.</div><div class='add'>+ * @array_size:	The size of the array.</div><div class='add'>+ * @microamp:	Invalid drive strength value in microamp</div><div class='add'>+ *</div><div class='add'>+ * This function logs an error message when an unsupported drive strength value</div><div class='add'>+ * is detected. It lists out all the supported drive strength values for</div><div class='add'>+ * reference in the error message.</div><div class='add'>+ */</div><div class='add'>+static void ksz_drive_strength_error(struct ksz_device *dev,</div><div class='add'>+				     const struct ksz_drive_strength *array,</div><div class='add'>+				     size_t array_size, int microamp)</div><div class='add'>+{</div><div class='add'>+	char supported_values[100];</div><div class='add'>+	size_t remaining_size;</div><div class='add'>+	int added_len;</div><div class='add'>+	char *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	remaining_size = sizeof(supported_values);</div><div class='add'>+	ptr = supported_values;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; array_size; i++) {</div><div class='add'>+		added_len = snprintf(ptr, remaining_size,</div><div class='add'>+				     i == 0 ? "%d" : ", %d", array[i].microamp);</div><div class='add'>+</div><div class='add'>+		if (added_len &gt;= remaining_size)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ptr += added_len;</div><div class='add'>+		remaining_size -= added_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(dev-&gt;dev, "Invalid drive strength %d, supported values are %s\n",</div><div class='add'>+		microamp, supported_values);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz9477_drive_strength_write() - Set the drive strength for specific KSZ9477</div><div class='add'>+ *				    chip variants.</div><div class='add'>+ * @dev:       ksz device</div><div class='add'>+ * @props:     Array of drive strength properties to be applied</div><div class='add'>+ * @num_props: Number of properties in the array</div><div class='add'>+ *</div><div class='add'>+ * This function configures the drive strength for various KSZ9477 chip variants</div><div class='add'>+ * based on the provided properties. It handles chip-specific nuances and</div><div class='add'>+ * ensures only valid drive strengths are written to the respective chip.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on successful configuration, a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz9477_drive_strength_write(struct ksz_device *dev,</div><div class='add'>+					struct ksz_driver_strength_prop *props,</div><div class='add'>+					int num_props)</div><div class='add'>+{</div><div class='add'>+	size_t array_size = ARRAY_SIZE(ksz9477_drive_strengths);</div><div class='add'>+	int i, ret, reg;</div><div class='add'>+	u8 mask = 0;</div><div class='add'>+	u8 val = 0;</div><div class='add'>+</div><div class='add'>+	if (props[KSZ_DRIVER_STRENGTH_IO].value != -1)</div><div class='add'>+		dev_warn(dev-&gt;dev, "%s is not supported by this chip variant\n",</div><div class='add'>+			 props[KSZ_DRIVER_STRENGTH_IO].name);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;chip_id == KSZ8795_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ8794_CHIP_ID ||</div><div class='add'>+	    dev-&gt;chip_id == KSZ8765_CHIP_ID)</div><div class='add'>+		reg = KSZ8795_REG_SW_CTRL_20;</div><div class='add'>+	else</div><div class='add'>+		reg = KSZ9477_REG_SW_IO_STRENGTH;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_props; i++) {</div><div class='add'>+		if (props[i].value == -1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = ksz_drive_strength_to_reg(ksz9477_drive_strengths,</div><div class='add'>+						array_size, props[i].value);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			ksz_drive_strength_error(dev, ksz9477_drive_strengths,</div><div class='add'>+						 array_size, props[i].value);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mask |= SW_DRIVE_STRENGTH_M &lt;&lt; props[i].offset;</div><div class='add'>+		val |= ret &lt;&lt; props[i].offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_rmw8(dev, reg, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz88x3_drive_strength_write() - Set the drive strength configuration for</div><div class='add'>+ *				    KSZ8863 compatible chip variants.</div><div class='add'>+ * @dev:       ksz device</div><div class='add'>+ * @props:     Array of drive strength properties to be set</div><div class='add'>+ * @num_props: Number of properties in the array</div><div class='add'>+ *</div><div class='add'>+ * This function applies the specified drive strength settings to KSZ88X3 chip</div><div class='add'>+ * variants (KSZ8873, KSZ8863).</div><div class='add'>+ * It ensures the configurations align with what the chip variant supports and</div><div class='add'>+ * warns or errors out on unsupported settings.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code otherwise</div><div class='add'>+ */</div><div class='add'>+static int ksz88x3_drive_strength_write(struct ksz_device *dev,</div><div class='add'>+					struct ksz_driver_strength_prop *props,</div><div class='add'>+					int num_props)</div><div class='add'>+{</div><div class='add'>+	size_t array_size = ARRAY_SIZE(ksz88x3_drive_strengths);</div><div class='add'>+	int microamp;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_props; i++) {</div><div class='add'>+		if (props[i].value == -1 || i == KSZ_DRIVER_STRENGTH_IO)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev_warn(dev-&gt;dev, "%s is not supported by this chip variant\n",</div><div class='add'>+			 props[i].name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	microamp = props[KSZ_DRIVER_STRENGTH_IO].value;</div><div class='add'>+	ret = ksz_drive_strength_to_reg(ksz88x3_drive_strengths, array_size,</div><div class='add'>+					microamp);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ksz_drive_strength_error(dev, ksz88x3_drive_strengths,</div><div class='add'>+					 array_size, microamp);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_rmw8(dev, KSZ8873_REG_GLOBAL_CTRL_12,</div><div class='add'>+			KSZ8873_DRIVE_STRENGTH_16MA, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_parse_drive_strength() - Extract and apply drive strength configurations</div><div class='add'>+ *				from device tree properties.</div><div class='add'>+ * @dev:	ksz device</div><div class='add'>+ *</div><div class='add'>+ * This function reads the specified drive strength properties from the</div><div class='add'>+ * device tree, validates against the supported chip variants, and sets</div><div class='add'>+ * them accordingly. An error should be critical here, as the drive strength</div><div class='add'>+ * settings are crucial for EMI compliance.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code otherwise</div><div class='add'>+ */</div><div class='add'>+static int ksz_parse_drive_strength(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_driver_strength_prop of_props[] = {</div><div class='add'>+		[KSZ_DRIVER_STRENGTH_HI] = {</div><div class='add'>+			.name = "microchip,hi-drive-strength-microamp",</div><div class='add'>+			.offset = SW_HI_SPEED_DRIVE_STRENGTH_S,</div><div class='add'>+			.value = -1,</div><div class='add'>+		},</div><div class='add'>+		[KSZ_DRIVER_STRENGTH_LO] = {</div><div class='add'>+			.name = "microchip,lo-drive-strength-microamp",</div><div class='add'>+			.offset = SW_LO_SPEED_DRIVE_STRENGTH_S,</div><div class='add'>+			.value = -1,</div><div class='add'>+		},</div><div class='add'>+		[KSZ_DRIVER_STRENGTH_IO] = {</div><div class='add'>+			.name = "microchip,io-drive-strength-microamp",</div><div class='add'>+			.offset = 0, /* don't care */</div><div class='add'>+			.value = -1,</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	struct device_node *np = dev-&gt;dev-&gt;of_node;</div><div class='add'>+	bool have_any_prop = false;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(of_props); i++) {</div><div class='add'>+		ret = of_property_read_u32(np, of_props[i].name,</div><div class='add'>+					   &amp;of_props[i].value);</div><div class='add'>+		if (ret &amp;&amp; ret != -EINVAL)</div><div class='add'>+			dev_warn(dev-&gt;dev, "Failed to read %s\n",</div><div class='add'>+				 of_props[i].name);</div><div class='add'>+		if (ret)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;pdata)</div><div class='del'>-		dev-&gt;chip_id = dev-&gt;pdata-&gt;chip_id;</div><div class='add'>+		have_any_prop = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!have_any_prop)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;chip_id) {</div><div class='add'>+	case KSZ88X3_CHIP_ID:</div><div class='add'>+		return ksz88x3_drive_strength_write(dev, of_props,</div><div class='add'>+						    ARRAY_SIZE(of_props));</div><div class='add'>+	case KSZ8795_CHIP_ID:</div><div class='add'>+	case KSZ8794_CHIP_ID:</div><div class='add'>+	case KSZ8765_CHIP_ID:</div><div class='add'>+	case KSZ8563_CHIP_ID:</div><div class='add'>+	case KSZ8567_CHIP_ID:</div><div class='add'>+	case KSZ9477_CHIP_ID:</div><div class='add'>+	case KSZ9563_CHIP_ID:</div><div class='add'>+	case KSZ9567_CHIP_ID:</div><div class='add'>+	case KSZ9893_CHIP_ID:</div><div class='add'>+	case KSZ9896_CHIP_ID:</div><div class='add'>+	case KSZ9897_CHIP_ID:</div><div class='add'>+	case LAN9646_CHIP_ID:</div><div class='add'>+		return ksz9477_drive_strength_write(dev, of_props,</div><div class='add'>+						    ARRAY_SIZE(of_props));</div><div class='add'>+	default:</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(of_props); i++) {</div><div class='add'>+			if (of_props[i].value == -1)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			dev_warn(dev-&gt;dev, "%s is not supported by this chip variant\n",</div><div class='add'>+				 of_props[i].name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8463_configure_straps_spi(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pinctrl *pinctrl;</div><div class='add'>+	struct gpio_desc *rxd0;</div><div class='add'>+	struct gpio_desc *rxd1;</div><div class='add'>+</div><div class='add'>+	rxd0 = devm_gpiod_get_index_optional(dev-&gt;dev, "straps-rxd", 0, GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(rxd0))</div><div class='add'>+		return PTR_ERR(rxd0);</div><div class='add'>+</div><div class='add'>+	rxd1 = devm_gpiod_get_index_optional(dev-&gt;dev, "straps-rxd", 1, GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(rxd1))</div><div class='add'>+		return PTR_ERR(rxd1);</div><div class='add'>+</div><div class='add'>+	if (!rxd0 &amp;&amp; !rxd1)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((rxd0 &amp;&amp; !rxd1) || (rxd1 &amp;&amp; !rxd0))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pinctrl = devm_pinctrl_get_select(dev-&gt;dev, "reset");</div><div class='add'>+	if (IS_ERR(pinctrl))</div><div class='add'>+		return PTR_ERR(pinctrl);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8463_release_straps_spi(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return pinctrl_select_default_state(dev-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz_switch_register(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	const struct ksz_chip_data *info;</div><div class='add'>+	struct device_node *ports;</div><div class='add'>+	phy_interface_t interface;</div><div class='add'>+	unsigned int port_num;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;reset_gpio = devm_gpiod_get_optional(dev-&gt;dev, "reset",</div><div class='ctx'> 						  GPIOD_OUT_LOW);</div><div class='hunk'>@@ -433,33 +5396,123 @@ int ksz_switch_register(struct ksz_device *dev,</div><div class='ctx'> 		return PTR_ERR(dev-&gt;reset_gpio);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;reset_gpio) {</div><div class='del'>-		gpiod_set_value(dev-&gt;reset_gpio, 1);</div><div class='del'>-		mdelay(10);</div><div class='del'>-		gpiod_set_value(dev-&gt;reset_gpio, 0);</div><div class='add'>+		if (of_device_is_compatible(dev-&gt;dev-&gt;of_node, "microchip,ksz8463")) {</div><div class='add'>+			ret = ksz8463_configure_straps_spi(dev);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		gpiod_set_value_cansleep(dev-&gt;reset_gpio, 1);</div><div class='add'>+		usleep_range(10000, 12000);</div><div class='add'>+		gpiod_set_value_cansleep(dev-&gt;reset_gpio, 0);</div><div class='add'>+		msleep(100);</div><div class='add'>+</div><div class='add'>+		if (of_device_is_compatible(dev-&gt;dev-&gt;of_node, "microchip,ksz8463")) {</div><div class='add'>+			ret = ksz8463_release_straps_spi(dev);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;dev-&gt;dev_mutex);</div><div class='del'>-	mutex_init(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	mutex_init(&amp;dev-&gt;stats_mutex);</div><div class='add'>+	mutex_init(&amp;dev-&gt;regmap_mutex);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;alu_mutex);</div><div class='ctx'> 	mutex_init(&amp;dev-&gt;vlan_mutex);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_ops = ops;</div><div class='add'>+	ret = ksz_switch_detect(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;dev_ops-&gt;detect(dev))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	info = ksz_lookup_info(dev-&gt;chip_id);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* Update the compatible info with the probed one */</div><div class='add'>+	dev-&gt;info = info;</div><div class='add'>+</div><div class='add'>+	dev_info(dev-&gt;dev, "found switch: %s, rev %i\n",</div><div class='add'>+		 dev-&gt;info-&gt;dev_name, dev-&gt;chip_rev);</div><div class='add'>+</div><div class='add'>+	ret = ksz_check_device_id(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev_ops = dev-&gt;info-&gt;ops;</div><div class='ctx'> </div><div class='ctx'> 	ret = dev-&gt;dev_ops-&gt;init(dev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	dev-&gt;ports = devm_kzalloc(dev-&gt;dev,</div><div class='add'>+				  dev-&gt;info-&gt;port_cnt * sizeof(struct ksz_port),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!dev-&gt;ports)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++) {</div><div class='add'>+		spin_lock_init(&amp;dev-&gt;ports[i].mib.stats64_lock);</div><div class='add'>+		mutex_init(&amp;dev-&gt;ports[i].mib.cnt_mutex);</div><div class='add'>+		dev-&gt;ports[i].mib.counters =</div><div class='add'>+			devm_kzalloc(dev-&gt;dev,</div><div class='add'>+				     sizeof(u64) * (dev-&gt;info-&gt;mib_cnt + 1),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+		if (!dev-&gt;ports[i].mib.counters)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		dev-&gt;ports[i].ksz_dev = dev;</div><div class='add'>+		dev-&gt;ports[i].num = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set the real number of ports */</div><div class='add'>+	dev-&gt;ds-&gt;num_ports = dev-&gt;info-&gt;port_cnt;</div><div class='add'>+</div><div class='add'>+	/* set the phylink ops */</div><div class='add'>+	dev-&gt;ds-&gt;phylink_mac_ops = dev-&gt;info-&gt;phylink_mac_ops;</div><div class='add'>+</div><div class='ctx'> 	/* Host port interface will be self detected, or specifically set in</div><div class='ctx'> 	 * device tree.</div><div class='ctx'> 	 */</div><div class='add'>+	for (port_num = 0; port_num &lt; dev-&gt;info-&gt;port_cnt; ++port_num)</div><div class='add'>+		dev-&gt;ports[port_num].interface = PHY_INTERFACE_MODE_NA;</div><div class='ctx'> 	if (dev-&gt;dev-&gt;of_node) {</div><div class='del'>-		ret = of_get_phy_mode(dev-&gt;dev-&gt;of_node);</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			dev-&gt;interface = ret;</div><div class='add'>+		ret = of_get_phy_mode(dev-&gt;dev-&gt;of_node, &amp;interface);</div><div class='add'>+		if (ret == 0)</div><div class='add'>+			dev-&gt;compat_interface = interface;</div><div class='add'>+		ports = of_get_child_by_name(dev-&gt;dev-&gt;of_node, "ethernet-ports");</div><div class='add'>+		if (!ports)</div><div class='add'>+			ports = of_get_child_by_name(dev-&gt;dev-&gt;of_node, "ports");</div><div class='add'>+		if (ports) {</div><div class='add'>+			for_each_available_child_of_node_scoped(ports, port) {</div><div class='add'>+				if (of_property_read_u32(port, "reg",</div><div class='add'>+							 &amp;port_num))</div><div class='add'>+					continue;</div><div class='add'>+				if (!(dev-&gt;port_mask &amp; BIT(port_num))) {</div><div class='add'>+					of_node_put(ports);</div><div class='add'>+					return -EINVAL;</div><div class='add'>+				}</div><div class='add'>+				of_get_phy_mode(port,</div><div class='add'>+						&amp;dev-&gt;ports[port_num].interface);</div><div class='add'>+</div><div class='add'>+				ksz_parse_rgmii_delay(dev, port_num, port);</div><div class='add'>+				dev-&gt;ports[port_num].fiber =</div><div class='add'>+					of_property_read_bool(port,</div><div class='add'>+							      "micrel,fiber-mode");</div><div class='add'>+			}</div><div class='add'>+			of_node_put(ports);</div><div class='add'>+		}</div><div class='add'>+		dev-&gt;synclko_125 = of_property_read_bool(dev-&gt;dev-&gt;of_node,</div><div class='add'>+							 "microchip,synclko-125");</div><div class='add'>+		dev-&gt;synclko_disable = of_property_read_bool(dev-&gt;dev-&gt;of_node,</div><div class='add'>+							     "microchip,synclko-disable");</div><div class='add'>+		if (dev-&gt;synclko_125 &amp;&amp; dev-&gt;synclko_disable) {</div><div class='add'>+			dev_err(dev-&gt;dev, "inconsistent synclko settings\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev-&gt;wakeup_source = of_property_read_bool(dev-&gt;dev-&gt;of_node,</div><div class='add'>+							   "wakeup-source");</div><div class='add'>+		dev-&gt;pme_active_high = of_property_read_bool(dev-&gt;dev-&gt;of_node,</div><div class='add'>+							     "microchip,pme-active-high");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = dsa_register_switch(dev-&gt;ds);</div><div class='hunk'>@@ -468,27 +5521,51 @@ int ksz_switch_register(struct ksz_device *dev,</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Read MIB counters every 30 seconds to avoid overflow. */</div><div class='add'>+	dev-&gt;mib_read_interval = msecs_to_jiffies(5000);</div><div class='add'>+</div><div class='add'>+	/* Start the MIB timer. */</div><div class='add'>+	schedule_delayed_work(&amp;dev-&gt;mib_read, 0);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ksz_switch_register);</div><div class='ctx'> </div><div class='ctx'> void ksz_switch_remove(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	/* timer started */</div><div class='del'>-	if (dev-&gt;mib_read_timer.expires) {</div><div class='del'>-		del_timer_sync(&amp;dev-&gt;mib_read_timer);</div><div class='del'>-		flush_work(&amp;dev-&gt;mib_read);</div><div class='add'>+	if (dev-&gt;mib_read_interval) {</div><div class='add'>+		dev-&gt;mib_read_interval = 0;</div><div class='add'>+		cancel_delayed_work_sync(&amp;dev-&gt;mib_read);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;dev_ops-&gt;exit(dev);</div><div class='ctx'> 	dsa_unregister_switch(dev-&gt;ds);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;reset_gpio)</div><div class='del'>-		gpiod_set_value(dev-&gt;reset_gpio, 1);</div><div class='add'>+		gpiod_set_value_cansleep(dev-&gt;reset_gpio, 1);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ksz_switch_remove);</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+int ksz_switch_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return dsa_switch_suspend(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ksz_switch_suspend);</div><div class='add'>+</div><div class='add'>+int ksz_switch_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return dsa_switch_resume(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(ksz_switch_resume);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> MODULE_AUTHOR("Woojung Huh &lt;Woojung.Huh@microchip.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Microchip KSZ Series Switch DSA Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h<br/>index 21cd794e18f1..c65188cd3c0a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_common.h</a></div><div class='hunk'>@@ -1,84 +1,547 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- * Microchip switch driver common header</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Microchip switch driver common header</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2017-2019 Microchip Technology Inc.</div><div class='add'>+ * Copyright (C) 2017-2025 Microchip Technology Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __KSZ_COMMON_H</div><div class='ctx'> #define __KSZ_COMMON_H</div><div class='ctx'> </div><div class='del'>-void ksz_port_cleanup(struct ksz_device *dev, int port);</div><div class='del'>-void ksz_update_port_member(struct ksz_device *dev, int port);</div><div class='del'>-void ksz_init_mib_timer(struct ksz_device *dev);</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/pcs/pcs-xpcs.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/platform_data/microchip-ksz.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_ptp.h"</div><div class='add'>+</div><div class='add'>+#define KSZ_MAX_NUM_PORTS 8</div><div class='add'>+/* all KSZ switches count ports from 1 */</div><div class='add'>+#define KSZ_PORT_1 0</div><div class='add'>+#define KSZ_PORT_2 1</div><div class='add'>+#define KSZ_PORT_4 3</div><div class='add'>+</div><div class='add'>+struct ksz_device;</div><div class='add'>+struct ksz_port;</div><div class='add'>+struct phylink_mac_ops;</div><div class='add'>+</div><div class='add'>+enum ksz_regmap_width {</div><div class='add'>+	KSZ_REGMAP_8,</div><div class='add'>+	KSZ_REGMAP_16,</div><div class='add'>+	KSZ_REGMAP_32,</div><div class='add'>+	__KSZ_NUM_REGMAPS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vlan_table {</div><div class='add'>+	u32 table[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_port_mib {</div><div class='add'>+	struct mutex cnt_mutex;		/* structure access */</div><div class='add'>+	u8 cnt_ptr;</div><div class='add'>+	u64 *counters;</div><div class='add'>+	struct rtnl_link_stats64 stats64;</div><div class='add'>+	struct ethtool_pause_stats pause_stats;</div><div class='add'>+	struct spinlock stats64_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_mib_names {</div><div class='add'>+	int index;</div><div class='add'>+	char string[ETH_GSTRING_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_chip_data {</div><div class='add'>+	u32 chip_id;</div><div class='add'>+	const char *dev_name;</div><div class='add'>+	int num_vlans;</div><div class='add'>+	int num_alus;</div><div class='add'>+	int num_statics;</div><div class='add'>+	int cpu_ports;</div><div class='add'>+	int port_cnt;</div><div class='add'>+	u8 port_nirqs;</div><div class='add'>+	u8 num_tx_queues;</div><div class='add'>+	u8 num_ipms; /* number of Internal Priority Maps */</div><div class='add'>+	bool tc_cbs_supported;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @phy_side_mdio_supported: Indicates if the chip supports an additional</div><div class='add'>+	 * side MDIO channel for accessing integrated PHYs.</div><div class='add'>+	 */</div><div class='add'>+	bool phy_side_mdio_supported;</div><div class='add'>+	const struct ksz_dev_ops *ops;</div><div class='add'>+	const struct phylink_mac_ops *phylink_mac_ops;</div><div class='add'>+	bool phy_errata_9477;</div><div class='add'>+	bool ksz87xx_eee_link_erratum;</div><div class='add'>+	const struct ksz_mib_names *mib_names;</div><div class='add'>+	int mib_cnt;</div><div class='add'>+	u8 reg_mib_cnt;</div><div class='add'>+	const u16 *regs;</div><div class='add'>+	const u32 *masks;</div><div class='add'>+	const u8 *shifts;</div><div class='add'>+	const u8 *xmii_ctrl0;</div><div class='add'>+	const u8 *xmii_ctrl1;</div><div class='add'>+	int stp_ctrl_reg;</div><div class='add'>+	int broadcast_ctrl_reg;</div><div class='add'>+	int multicast_ctrl_reg;</div><div class='add'>+	int start_ctrl_reg;</div><div class='add'>+	bool supports_mii[KSZ_MAX_NUM_PORTS];</div><div class='add'>+	bool supports_rmii[KSZ_MAX_NUM_PORTS];</div><div class='add'>+	bool supports_rgmii[KSZ_MAX_NUM_PORTS];</div><div class='add'>+	bool internal_phy[KSZ_MAX_NUM_PORTS];</div><div class='add'>+	bool gbit_capable[KSZ_MAX_NUM_PORTS];</div><div class='add'>+	bool ptp_capable;</div><div class='add'>+	u8 sgmii_port;</div><div class='add'>+	const struct regmap_access_table *wr_table;</div><div class='add'>+	const struct regmap_access_table *rd_table;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_irq {</div><div class='add'>+	u16 masked;</div><div class='add'>+	u16 reg_mask;</div><div class='add'>+	u16 reg_status;</div><div class='add'>+	struct irq_domain *domain;</div><div class='add'>+	int nirqs;</div><div class='add'>+	int irq_num;</div><div class='add'>+	char name[16];</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_ptp_irq {</div><div class='add'>+	struct ksz_port *port;</div><div class='add'>+	u16 ts_reg;</div><div class='add'>+	bool ts_en;</div><div class='add'>+	char name[16];</div><div class='add'>+	int num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_switch_macaddr {</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+	refcount_t refcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_port {</div><div class='add'>+	bool remove_tag;		/* Remove Tag flag set, for ksz8795 only */</div><div class='add'>+	bool learning;</div><div class='add'>+	bool isolated;</div><div class='add'>+	int stp_state;</div><div class='add'>+	struct phy_device phydev;</div><div class='add'>+</div><div class='add'>+	u32 fiber:1;			/* port is fiber */</div><div class='add'>+	u32 force:1;</div><div class='add'>+	u32 read:1;			/* read MIB counters in background */</div><div class='add'>+	u32 freeze:1;			/* MIB counter freeze is enabled */</div><div class='add'>+	u32 sgmii_adv_write:1;</div><div class='add'>+</div><div class='add'>+	struct ksz_port_mib mib;</div><div class='add'>+	phy_interface_t interface;</div><div class='add'>+	u32 rgmii_tx_val;</div><div class='add'>+	u32 rgmii_rx_val;</div><div class='add'>+	struct ksz_device *ksz_dev;</div><div class='add'>+	void *acl_priv;</div><div class='add'>+	struct ksz_irq pirq;</div><div class='add'>+	u8 num;</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MICROCHIP_KSZ_PTP)</div><div class='add'>+	struct kernel_hwtstamp_config tstamp_config;</div><div class='add'>+	bool hwts_tx_en;</div><div class='add'>+	bool hwts_rx_en;</div><div class='add'>+	struct ksz_irq ptpirq;</div><div class='add'>+	struct ksz_ptp_irq ptpmsg_irq[3];</div><div class='add'>+	ktime_t tstamp_msg;</div><div class='add'>+	struct completion tstamp_msg_comp;</div><div class='add'>+#endif</div><div class='add'>+	bool manual_flow;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_device {</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct ksz_platform_data *pdata;</div><div class='add'>+	const struct ksz_chip_data *info;</div><div class='add'>+</div><div class='add'>+	struct mutex dev_mutex;		/* device access */</div><div class='add'>+	struct mutex regmap_mutex;	/* regmap access */</div><div class='add'>+	struct mutex alu_mutex;		/* ALU access */</div><div class='add'>+	struct mutex vlan_mutex;	/* vlan access */</div><div class='add'>+	const struct ksz_dev_ops *dev_ops;</div><div class='add'>+</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct regmap *regmap[__KSZ_NUM_REGMAPS];</div><div class='add'>+</div><div class='add'>+	void *priv;</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	struct gpio_desc *reset_gpio;	/* Optional reset GPIO */</div><div class='add'>+</div><div class='add'>+	/* chip specific data */</div><div class='add'>+	u32 chip_id;</div><div class='add'>+	u8 chip_rev;</div><div class='add'>+	int cpu_port;			/* port connected to CPU */</div><div class='add'>+	int phy_port_cnt;</div><div class='add'>+	phy_interface_t compat_interface;</div><div class='add'>+	bool synclko_125;</div><div class='add'>+	bool synclko_disable;</div><div class='add'>+	bool wakeup_source;</div><div class='add'>+	bool pme_active_high;</div><div class='add'>+</div><div class='add'>+	struct vlan_table *vlan_cache;</div><div class='add'>+</div><div class='add'>+	struct ksz_port *ports;</div><div class='add'>+	struct delayed_work mib_read;</div><div class='add'>+	unsigned long mib_read_interval;</div><div class='add'>+	u16 mirror_rx;</div><div class='add'>+	u16 mirror_tx;</div><div class='add'>+	u16 port_mask;</div><div class='add'>+	struct mutex lock_irq;		/* IRQ Access */</div><div class='add'>+	struct ksz_irq girq;</div><div class='add'>+	struct ksz_ptp_data ptp_data;</div><div class='add'>+</div><div class='add'>+	struct ksz_switch_macaddr *switch_macaddr;</div><div class='add'>+	struct net_device *hsr_dev;     /* HSR */</div><div class='add'>+	u8 hsr_ports;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @phy_addr_map: Array mapping switch ports to their corresponding PHY</div><div class='add'>+	 * addresses.</div><div class='add'>+	 */</div><div class='add'>+	u8 phy_addr_map[KSZ_MAX_NUM_PORTS];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @parent_mdio_bus: Pointer to the external MDIO bus controller.</div><div class='add'>+	 *</div><div class='add'>+	 * This points to an external MDIO bus controller that is used to access</div><div class='add'>+	 * the  PHYs integrated within the switch. Unlike an integrated MDIO</div><div class='add'>+	 * bus, this external controller provides a direct path for managing</div><div class='add'>+	 * the switch’s internal PHYs, bypassing the main SPI interface.</div><div class='add'>+	 */</div><div class='add'>+	struct mii_bus *parent_mdio_bus;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* List of supported models */</div><div class='add'>+enum ksz_model {</div><div class='add'>+	KSZ8463,</div><div class='add'>+	KSZ8563,</div><div class='add'>+	KSZ8567,</div><div class='add'>+	KSZ8795,</div><div class='add'>+	KSZ8794,</div><div class='add'>+	KSZ8765,</div><div class='add'>+	KSZ88X3,</div><div class='add'>+	KSZ8864,</div><div class='add'>+	KSZ8895,</div><div class='add'>+	KSZ9477,</div><div class='add'>+	KSZ9896,</div><div class='add'>+	KSZ9897,</div><div class='add'>+	KSZ9893,</div><div class='add'>+	KSZ9563,</div><div class='add'>+	KSZ9567,</div><div class='add'>+	LAN9370,</div><div class='add'>+	LAN9371,</div><div class='add'>+	LAN9372,</div><div class='add'>+	LAN9373,</div><div class='add'>+	LAN9374,</div><div class='add'>+	LAN9646,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* Common DSA access functions */</div><div class='del'>-</div><div class='del'>-int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg);</div><div class='del'>-int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val);</div><div class='del'>-void ksz_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-		     struct phy_device *phydev);</div><div class='del'>-int ksz_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='del'>-void ksz_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *buf);</div><div class='del'>-int ksz_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-			 struct net_device *br);</div><div class='del'>-void ksz_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-			   struct net_device *br);</div><div class='del'>-void ksz_port_fast_age(struct dsa_switch *ds, int port);</div><div class='del'>-int ksz_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			  const struct switchdev_obj_port_vlan *vlan);</div><div class='del'>-int ksz_port_fdb_dump(struct dsa_switch *ds, int port, dsa_fdb_dump_cb_t *cb,</div><div class='del'>-		      void *data);</div><div class='del'>-int ksz_port_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			 const struct switchdev_obj_port_mdb *mdb);</div><div class='del'>-void ksz_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-		      const struct switchdev_obj_port_mdb *mdb);</div><div class='del'>-int ksz_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_mdb *mdb);</div><div class='del'>-int ksz_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);</div><div class='del'>-void ksz_disable_port(struct dsa_switch *ds, int port);</div><div class='add'>+enum ksz_regs {</div><div class='add'>+	REG_SW_MAC_ADDR,</div><div class='add'>+	REG_IND_CTRL_0,</div><div class='add'>+	REG_IND_DATA_8,</div><div class='add'>+	REG_IND_DATA_CHECK,</div><div class='add'>+	REG_IND_DATA_HI,</div><div class='add'>+	REG_IND_DATA_LO,</div><div class='add'>+	REG_IND_MIB_CHECK,</div><div class='add'>+	REG_IND_BYTE,</div><div class='add'>+	P_FORCE_CTRL,</div><div class='add'>+	P_LINK_STATUS,</div><div class='add'>+	P_LOCAL_CTRL,</div><div class='add'>+	P_NEG_RESTART_CTRL,</div><div class='add'>+	P_REMOTE_STATUS,</div><div class='add'>+	P_SPEED_STATUS,</div><div class='add'>+	S_TAIL_TAG_CTRL,</div><div class='add'>+	P_STP_CTRL,</div><div class='add'>+	S_START_CTRL,</div><div class='add'>+	S_BROADCAST_CTRL,</div><div class='add'>+	S_MULTICAST_CTRL,</div><div class='add'>+	P_XMII_CTRL_0,</div><div class='add'>+	P_XMII_CTRL_1,</div><div class='add'>+	REG_SW_PME_CTRL,</div><div class='add'>+	REG_PORT_PME_STATUS,</div><div class='add'>+	REG_PORT_PME_CTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ksz_masks {</div><div class='add'>+	PORT_802_1P_REMAPPING,</div><div class='add'>+	SW_TAIL_TAG_ENABLE,</div><div class='add'>+	MIB_COUNTER_OVERFLOW,</div><div class='add'>+	MIB_COUNTER_VALID,</div><div class='add'>+	VLAN_TABLE_FID,</div><div class='add'>+	VLAN_TABLE_MEMBERSHIP,</div><div class='add'>+	VLAN_TABLE_VALID,</div><div class='add'>+	STATIC_MAC_TABLE_VALID,</div><div class='add'>+	STATIC_MAC_TABLE_USE_FID,</div><div class='add'>+	STATIC_MAC_TABLE_FID,</div><div class='add'>+	STATIC_MAC_TABLE_OVERRIDE,</div><div class='add'>+	STATIC_MAC_TABLE_FWD_PORTS,</div><div class='add'>+	DYNAMIC_MAC_TABLE_ENTRIES_H,</div><div class='add'>+	DYNAMIC_MAC_TABLE_MAC_EMPTY,</div><div class='add'>+	DYNAMIC_MAC_TABLE_NOT_READY,</div><div class='add'>+	DYNAMIC_MAC_TABLE_ENTRIES,</div><div class='add'>+	DYNAMIC_MAC_TABLE_FID,</div><div class='add'>+	DYNAMIC_MAC_TABLE_SRC_PORT,</div><div class='add'>+	DYNAMIC_MAC_TABLE_TIMESTAMP,</div><div class='add'>+	ALU_STAT_WRITE,</div><div class='add'>+	ALU_STAT_READ,</div><div class='add'>+	ALU_STAT_DIRECT,</div><div class='add'>+	ALU_RESV_MCAST_ADDR,</div><div class='add'>+	P_MII_TX_FLOW_CTRL,</div><div class='add'>+	P_MII_RX_FLOW_CTRL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ksz_shifts {</div><div class='add'>+	VLAN_TABLE_MEMBERSHIP_S,</div><div class='add'>+	VLAN_TABLE,</div><div class='add'>+	STATIC_MAC_FWD_PORTS,</div><div class='add'>+	STATIC_MAC_FID,</div><div class='add'>+	DYNAMIC_MAC_ENTRIES_H,</div><div class='add'>+	DYNAMIC_MAC_ENTRIES,</div><div class='add'>+	DYNAMIC_MAC_FID,</div><div class='add'>+	DYNAMIC_MAC_TIMESTAMP,</div><div class='add'>+	DYNAMIC_MAC_SRC_PORT,</div><div class='add'>+	ALU_STAT_INDEX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ksz_xmii_ctrl0 {</div><div class='add'>+	P_MII_100MBIT,</div><div class='add'>+	P_MII_10MBIT,</div><div class='add'>+	P_MII_FULL_DUPLEX,</div><div class='add'>+	P_MII_HALF_DUPLEX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ksz_xmii_ctrl1 {</div><div class='add'>+	P_RGMII_SEL,</div><div class='add'>+	P_RMII_SEL,</div><div class='add'>+	P_GMII_SEL,</div><div class='add'>+	P_MII_SEL,</div><div class='add'>+	P_GMII_1GBIT,</div><div class='add'>+	P_GMII_NOT_1GBIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct alu_struct {</div><div class='add'>+	/* entry 1 */</div><div class='add'>+	u8	is_static:1;</div><div class='add'>+	u8	is_src_filter:1;</div><div class='add'>+	u8	is_dst_filter:1;</div><div class='add'>+	u8	prio_age:3;</div><div class='add'>+	u32	_reserv_0_1:23;</div><div class='add'>+	u8	mstp:3;</div><div class='add'>+	/* entry 2 */</div><div class='add'>+	u8	is_override:1;</div><div class='add'>+	u8	is_use_fid:1;</div><div class='add'>+	u32	_reserv_1_1:23;</div><div class='add'>+	u8	port_forward:7;</div><div class='add'>+	/* entry 3 &amp; 4*/</div><div class='add'>+	u32	_reserv_2_1:9;</div><div class='add'>+	u8	fid:7;</div><div class='add'>+	u8	mac[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_dev_ops {</div><div class='add'>+	int (*setup)(struct dsa_switch *ds);</div><div class='add'>+	void (*teardown)(struct dsa_switch *ds);</div><div class='add'>+	u32 (*get_port_addr)(int port, int offset);</div><div class='add'>+	void (*cfg_port_member)(struct ksz_device *dev, int port, u8 member);</div><div class='add'>+	void (*flush_dyn_mac_table)(struct ksz_device *dev, int port);</div><div class='add'>+	void (*port_cleanup)(struct ksz_device *dev, int port);</div><div class='add'>+	void (*port_setup)(struct ksz_device *dev, int port, bool cpu_port);</div><div class='add'>+	int (*set_ageing_time)(struct ksz_device *dev, unsigned int msecs);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @mdio_bus_preinit: Function pointer to pre-initialize the MDIO bus</div><div class='add'>+	 *                    for accessing PHYs.</div><div class='add'>+	 * @dev: Pointer to device structure.</div><div class='add'>+	 * @side_mdio: Boolean indicating if the PHYs are accessed over a side</div><div class='add'>+	 *             MDIO bus.</div><div class='add'>+	 *</div><div class='add'>+	 * This function pointer is used to configure the MDIO bus for PHY</div><div class='add'>+	 * access before initiating regular PHY operations. It enables either</div><div class='add'>+	 * SPI/I2C or side MDIO access modes by unlocking necessary registers</div><div class='add'>+	 * and setting up access permissions for the selected mode.</div><div class='add'>+	 *</div><div class='add'>+	 * Return:</div><div class='add'>+	 *  - 0 on success.</div><div class='add'>+	 *  - Negative error code on failure.</div><div class='add'>+	 */</div><div class='add'>+	int (*mdio_bus_preinit)(struct ksz_device *dev, bool side_mdio);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * @create_phy_addr_map: Function pointer to create a port-to-PHY</div><div class='add'>+	 *                       address map.</div><div class='add'>+	 * @dev: Pointer to device structure.</div><div class='add'>+	 * @side_mdio: Boolean indicating if the PHYs are accessed over a side</div><div class='add'>+	 *             MDIO bus.</div><div class='add'>+	 *</div><div class='add'>+	 * This function pointer is responsible for mapping switch ports to PHY</div><div class='add'>+	 * addresses according to the configured access mode (SPI or side MDIO)</div><div class='add'>+	 * and the device’s strap configuration. The mapping setup may vary</div><div class='add'>+	 * depending on the chip variant and configuration. Ensures the correct</div><div class='add'>+	 * address mapping for PHY communication.</div><div class='add'>+	 *</div><div class='add'>+	 * Return:</div><div class='add'>+	 *  - 0 on success.</div><div class='add'>+	 *  - Negative error code on failure (e.g., invalid configuration).</div><div class='add'>+	 */</div><div class='add'>+	int (*create_phy_addr_map)(struct ksz_device *dev, bool side_mdio);</div><div class='add'>+	int (*r_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);</div><div class='add'>+	int (*w_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 val);</div><div class='add'>+	void (*r_mib_cnt)(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+			  u64 *cnt);</div><div class='add'>+	void (*r_mib_pkt)(struct ksz_device *dev, int port, u16 addr,</div><div class='add'>+			  u64 *dropped, u64 *cnt);</div><div class='add'>+	void (*r_mib_stat64)(struct ksz_device *dev, int port);</div><div class='add'>+	int  (*vlan_filtering)(struct ksz_device *dev, int port,</div><div class='add'>+			       bool flag, struct netlink_ext_ack *extack);</div><div class='add'>+	int  (*vlan_add)(struct ksz_device *dev, int port,</div><div class='add'>+			 const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+	int  (*vlan_del)(struct ksz_device *dev, int port,</div><div class='add'>+			 const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+	int (*mirror_add)(struct ksz_device *dev, int port,</div><div class='add'>+			  struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			  bool ingress, struct netlink_ext_ack *extack);</div><div class='add'>+	void (*mirror_del)(struct ksz_device *dev, int port,</div><div class='add'>+			   struct dsa_mall_mirror_tc_entry *mirror);</div><div class='add'>+	int (*fdb_add)(struct ksz_device *dev, int port,</div><div class='add'>+		       const unsigned char *addr, u16 vid, struct dsa_db db);</div><div class='add'>+	int (*fdb_del)(struct ksz_device *dev, int port,</div><div class='add'>+		       const unsigned char *addr, u16 vid, struct dsa_db db);</div><div class='add'>+	int (*fdb_dump)(struct ksz_device *dev, int port,</div><div class='add'>+			dsa_fdb_dump_cb_t *cb, void *data);</div><div class='add'>+	int (*mdb_add)(struct ksz_device *dev, int port,</div><div class='add'>+		       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		       struct dsa_db db);</div><div class='add'>+	int (*mdb_del)(struct ksz_device *dev, int port,</div><div class='add'>+		       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		       struct dsa_db db);</div><div class='add'>+	void (*get_caps)(struct ksz_device *dev, int port,</div><div class='add'>+			 struct phylink_config *config);</div><div class='add'>+	int (*change_mtu)(struct ksz_device *dev, int port, int mtu);</div><div class='add'>+	int (*pme_write8)(struct ksz_device *dev, u32 reg, u8 value);</div><div class='add'>+	int (*pme_pread8)(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			  u8 *data);</div><div class='add'>+	int (*pme_pwrite8)(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			   u8 data);</div><div class='add'>+	void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);</div><div class='add'>+	void (*port_init_cnt)(struct ksz_device *dev, int port);</div><div class='add'>+	void (*phylink_mac_link_up)(struct ksz_device *dev, int port,</div><div class='add'>+				    unsigned int mode,</div><div class='add'>+				    phy_interface_t interface,</div><div class='add'>+				    struct phy_device *phydev, int speed,</div><div class='add'>+				    int duplex, bool tx_pause, bool rx_pause);</div><div class='add'>+	void (*setup_rgmii_delay)(struct ksz_device *dev, int port);</div><div class='add'>+	int (*tc_cbs_set_cinc)(struct ksz_device *dev, int port, u32 val);</div><div class='add'>+	void (*config_cpu_port)(struct dsa_switch *ds);</div><div class='add'>+	int (*enable_stp_addr)(struct ksz_device *dev);</div><div class='add'>+	int (*reset)(struct ksz_device *dev);</div><div class='add'>+	int (*init)(struct ksz_device *dev);</div><div class='add'>+	void (*exit)(struct ksz_device *dev);</div><div class='add'>+</div><div class='add'>+	int (*pcs_create)(struct ksz_device *dev);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_device *ksz_switch_alloc(struct device *base, void *priv);</div><div class='add'>+int ksz_switch_register(struct ksz_device *dev);</div><div class='add'>+void ksz_switch_remove(struct ksz_device *dev);</div><div class='add'>+int ksz_switch_suspend(struct device *dev);</div><div class='add'>+int ksz_switch_resume(struct device *dev);</div><div class='add'>+</div><div class='add'>+void ksz_init_mib_timer(struct ksz_device *dev);</div><div class='add'>+bool ksz_is_port_mac_global_usable(struct dsa_switch *ds, int port);</div><div class='add'>+void ksz_r_mib_stats64(struct ksz_device *dev, int port);</div><div class='add'>+void ksz88xx_r_mib_stats64(struct ksz_device *dev, int port);</div><div class='add'>+void ksz_port_stp_state_set(struct dsa_switch *ds, int port, u8 state);</div><div class='add'>+bool ksz_get_gbit(struct ksz_device *dev, int port);</div><div class='add'>+phy_interface_t ksz_get_xmii(struct ksz_device *dev, int port, bool gbit);</div><div class='add'>+extern const struct ksz_chip_data ksz_switch_chips[];</div><div class='add'>+int ksz_switch_macaddr_get(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+void ksz_switch_macaddr_put(struct dsa_switch *ds);</div><div class='add'>+void ksz_switch_shutdown(struct ksz_device *dev);</div><div class='add'>+int ksz_handle_wake_reason(struct ksz_device *dev, int port);</div><div class='ctx'> </div><div class='ctx'> /* Common register access functions */</div><div class='add'>+static inline struct regmap *ksz_regmap_8(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;regmap[KSZ_REGMAP_8];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct regmap *ksz_regmap_16(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;regmap[KSZ_REGMAP_16];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct regmap *ksz_regmap_32(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;regmap[KSZ_REGMAP_32];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ksz_is_ksz8463(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == KSZ8463_CHIP_ID;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static inline int ksz_read8(struct ksz_device *dev, u32 reg, u8 *val)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int ret = regmap_read(ksz_regmap_8(dev), reg, &amp;value);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;read8(dev, reg, val);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't read 8bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='add'>+	*val = value;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int ksz_read16(struct ksz_device *dev, u32 reg, u16 *val)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int ret = regmap_read(ksz_regmap_16(dev), reg, &amp;value);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;read16(dev, reg, val);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't read 16bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='add'>+	*val = value;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksz_read24(struct ksz_device *dev, u32 reg, u32 *val)</div><div class='add'>+static inline int ksz_read32(struct ksz_device *dev, u32 reg, u32 *val)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int ret = regmap_read(ksz_regmap_32(dev), reg, &amp;value);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;read24(dev, reg, val);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't read 32bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='add'>+	*val = value;</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksz_read32(struct ksz_device *dev, u32 reg, u32 *val)</div><div class='add'>+static inline int ksz_read64(struct ksz_device *dev, u32 reg, u64 *val)</div><div class='ctx'> {</div><div class='add'>+	u32 value[2];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;read32(dev, reg, val);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_bulk_read(ksz_regmap_32(dev), reg, value, 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't read 64bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='add'>+	else</div><div class='add'>+		*val = (u64)value[0] &lt;&lt; 32 | value[1];</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -87,9 +550,10 @@ static inline int ksz_write8(struct ksz_device *dev, u32 reg, u8 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;write8(dev, reg, value);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_write(ksz_regmap_8(dev), reg, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't write 8bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -98,136 +562,416 @@ static inline int ksz_write16(struct ksz_device *dev, u32 reg, u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;write16(dev, reg, value);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_write(ksz_regmap_16(dev), reg, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't write 16bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksz_write24(struct ksz_device *dev, u32 reg, u32 value)</div><div class='add'>+static inline int ksz_write32(struct ksz_device *dev, u32 reg, u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;write24(dev, reg, value);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_write(ksz_regmap_32(dev), reg, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't write 32bit reg: 0x%x %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksz_write32(struct ksz_device *dev, u32 reg, u32 value)</div><div class='add'>+static inline int ksz_rmw16(struct ksz_device *dev, u32 reg, u16 mask,</div><div class='add'>+			    u16 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;write32(dev, reg, value);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_update_bits(ksz_regmap_16(dev), reg, mask, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't rmw 16bit reg 0x%x: %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksz_get(struct ksz_device *dev, u32 reg, void *data,</div><div class='del'>-			  size_t len)</div><div class='add'>+static inline int ksz_rmw32(struct ksz_device *dev, u32 reg, u32 mask,</div><div class='add'>+			    u32 value)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;get(dev, reg, data, len);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_update_bits(ksz_regmap_32(dev), reg, mask, value);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't rmw 32bit reg 0x%x: %pe\n", reg,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ksz_set(struct ksz_device *dev, u32 reg, void *data,</div><div class='del'>-			  size_t len)</div><div class='add'>+static inline int ksz_write64(struct ksz_device *dev, u32 reg, u64 value)</div><div class='add'>+{</div><div class='add'>+	u32 val[2];</div><div class='add'>+</div><div class='add'>+	/* Ick! ToDo: Add 64bit R/W to regmap on 32bit systems */</div><div class='add'>+	value = swab64(value);</div><div class='add'>+	val[0] = swab32(value &amp; 0xffffffffULL);</div><div class='add'>+	val[1] = swab32(value &gt;&gt; 32ULL);</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_write(ksz_regmap_32(dev), reg, val, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ksz_rmw8(struct ksz_device *dev, int offset, u8 mask, u8 val)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;dev-&gt;reg_mutex);</div><div class='del'>-	ret = dev-&gt;ops-&gt;set(dev, reg, data, len);</div><div class='del'>-	mutex_unlock(&amp;dev-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_update_bits(ksz_regmap_8(dev), offset, mask, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "can't rmw 8bit reg 0x%x: %pe\n", offset,</div><div class='add'>+			ERR_PTR(ret));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ksz_pread8(struct ksz_device *dev, int port, int offset,</div><div class='del'>-			      u8 *data)</div><div class='add'>+static inline int ksz_pread8(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			     u8 *data)</div><div class='ctx'> {</div><div class='del'>-	ksz_read8(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='add'>+	return ksz_read8(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ksz_pread16(struct ksz_device *dev, int port, int offset,</div><div class='del'>-			       u16 *data)</div><div class='add'>+static inline int ksz_pread16(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			      u16 *data)</div><div class='ctx'> {</div><div class='del'>-	ksz_read16(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='add'>+	return ksz_read16(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ksz_pread32(struct ksz_device *dev, int port, int offset,</div><div class='del'>-			       u32 *data)</div><div class='add'>+static inline int ksz_pread32(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			      u32 *data)</div><div class='ctx'> {</div><div class='del'>-	ksz_read32(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='add'>+	return ksz_read32(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ksz_pwrite8(struct ksz_device *dev, int port, int offset,</div><div class='del'>-			       u8 data)</div><div class='add'>+static inline int ksz_pwrite8(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			      u8 data)</div><div class='ctx'> {</div><div class='del'>-	ksz_write8(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='add'>+	return ksz_write8(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ksz_pwrite16(struct ksz_device *dev, int port, int offset,</div><div class='del'>-				u16 data)</div><div class='add'>+static inline int ksz_pwrite16(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			       u16 data)</div><div class='ctx'> {</div><div class='del'>-	ksz_write16(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='add'>+	return ksz_write16(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset),</div><div class='add'>+			   data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ksz_pwrite32(struct ksz_device *dev, int port, int offset,</div><div class='del'>-				u32 data)</div><div class='add'>+static inline int ksz_pwrite32(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			       u32 data)</div><div class='ctx'> {</div><div class='del'>-	ksz_write32(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset), data);</div><div class='add'>+	return ksz_write32(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset),</div><div class='add'>+			   data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)</div><div class='add'>+static inline int ksz_prmw8(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			    u8 mask, u8 val)</div><div class='ctx'> {</div><div class='del'>-	u8 data;</div><div class='add'>+	return ksz_rmw8(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset),</div><div class='add'>+			mask, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ksz_read8(dev, addr, &amp;data);</div><div class='del'>-	if (set)</div><div class='del'>-		data |= bits;</div><div class='del'>-	else</div><div class='del'>-		data &amp;= ~bits;</div><div class='del'>-	ksz_write8(dev, addr, data);</div><div class='add'>+static inline int ksz_prmw32(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			     u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	return ksz_rmw32(dev, dev-&gt;dev_ops-&gt;get_port_addr(port, offset),</div><div class='add'>+			 mask, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ksz_port_cfg(struct ksz_device *dev, int port, int offset, u8 bits,</div><div class='del'>-			 bool set)</div><div class='add'>+static inline void ksz_regmap_lock(void *__mtx)</div><div class='ctx'> {</div><div class='del'>-	u32 addr;</div><div class='del'>-	u8 data;</div><div class='add'>+	struct mutex *mtx = __mtx;</div><div class='add'>+	mutex_lock(mtx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	addr = dev-&gt;dev_ops-&gt;get_port_addr(port, offset);</div><div class='del'>-	ksz_read8(dev, addr, &amp;data);</div><div class='add'>+static inline void ksz_regmap_unlock(void *__mtx)</div><div class='add'>+{</div><div class='add'>+	struct mutex *mtx = __mtx;</div><div class='add'>+	mutex_unlock(mtx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (set)</div><div class='del'>-		data |= bits;</div><div class='del'>-	else</div><div class='del'>-		data &amp;= ~bits;</div><div class='add'>+static inline bool ksz_is_ksz87xx(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == KSZ8795_CHIP_ID ||</div><div class='add'>+	       dev-&gt;chip_id == KSZ8794_CHIP_ID ||</div><div class='add'>+	       dev-&gt;chip_id == KSZ8765_CHIP_ID;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ksz_write8(dev, addr, data);</div><div class='add'>+static inline bool ksz_is_ksz88x3(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == KSZ88X3_CHIP_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct ksz_poll_ctx {</div><div class='del'>-	struct ksz_device *dev;</div><div class='del'>-	int port;</div><div class='del'>-	int offset;</div><div class='del'>-};</div><div class='add'>+static inline bool ksz_is_8895_family(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == KSZ8895_CHIP_ID ||</div><div class='add'>+	       dev-&gt;chip_id == KSZ8864_CHIP_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_ksz8(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return ksz_is_ksz87xx(dev) || ksz_is_ksz88x3(dev) ||</div><div class='add'>+	       ksz_is_8895_family(dev) || ksz_is_ksz8463(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_ksz88xx(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return ksz_is_ksz88x3(dev) || ksz_is_8895_family(dev) ||</div><div class='add'>+	       ksz_is_ksz8463(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_ksz9477(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == KSZ9477_CHIP_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is_lan937x(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;chip_id == LAN9370_CHIP_ID ||</div><div class='add'>+		dev-&gt;chip_id == LAN9371_CHIP_ID ||</div><div class='add'>+		dev-&gt;chip_id == LAN9372_CHIP_ID ||</div><div class='add'>+		dev-&gt;chip_id == LAN9373_CHIP_ID ||</div><div class='add'>+		dev-&gt;chip_id == LAN9374_CHIP_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool is_lan937x_tx_phy(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	return (dev-&gt;chip_id == LAN9371_CHIP_ID ||</div><div class='add'>+		dev-&gt;chip_id == LAN9372_CHIP_ID) &amp;&amp; port == KSZ_PORT_4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ksz_get_sgmii_port(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;info-&gt;sgmii_port - 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static inline u32 ksz_pread32_poll(struct ksz_poll_ctx *ctx)</div><div class='add'>+static inline bool ksz_has_sgmii_port(struct ksz_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 data;</div><div class='add'>+	return dev-&gt;info-&gt;sgmii_port &gt; 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ksz_pread32(ctx-&gt;dev, ctx-&gt;port, ctx-&gt;offset, &amp;data);</div><div class='del'>-	return data;</div><div class='add'>+static inline bool ksz_is_sgmii_port(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;info-&gt;sgmii_port == port + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* STP State Defines */</div><div class='add'>+#define PORT_TX_ENABLE			BIT(2)</div><div class='add'>+#define PORT_RX_ENABLE			BIT(1)</div><div class='add'>+#define PORT_LEARN_DISABLE		BIT(0)</div><div class='add'>+</div><div class='add'>+/* Switch ID Defines */</div><div class='add'>+#define REG_CHIP_ID0			0x00</div><div class='add'>+</div><div class='add'>+#define SW_FAMILY_ID_M			GENMASK(15, 8)</div><div class='add'>+#define KSZ84_FAMILY_ID			0x84</div><div class='add'>+#define KSZ87_FAMILY_ID			0x87</div><div class='add'>+#define KSZ88_FAMILY_ID			0x88</div><div class='add'>+#define KSZ8895_FAMILY_ID		0x95</div><div class='add'>+</div><div class='add'>+#define KSZ8_PORT_STATUS_0		0x08</div><div class='add'>+#define KSZ8_PORT_FIBER_MODE		BIT(7)</div><div class='add'>+</div><div class='add'>+#define SW_CHIP_ID_M			GENMASK(7, 4)</div><div class='add'>+#define KSZ87_CHIP_ID_94		0x6</div><div class='add'>+#define KSZ87_CHIP_ID_95		0x9</div><div class='add'>+#define KSZ88_CHIP_ID_63		0x3</div><div class='add'>+#define KSZ8895_CHIP_ID_95		0x4</div><div class='add'>+#define KSZ8895_CHIP_ID_95R		0x6</div><div class='add'>+</div><div class='add'>+/* KSZ8895 specific register */</div><div class='add'>+#define REG_KSZ8864_CHIP_ID		0xFE</div><div class='add'>+#define SW_KSZ8864			BIT(7)</div><div class='add'>+</div><div class='add'>+#define SW_REV_ID_M			GENMASK(7, 4)</div><div class='add'>+</div><div class='add'>+/* KSZ9893, KSZ9563, KSZ8563 specific register  */</div><div class='add'>+#define REG_CHIP_ID4			0x0f</div><div class='add'>+#define SKU_ID_KSZ8563			0x3c</div><div class='add'>+#define SKU_ID_KSZ9563			0x1c</div><div class='add'>+</div><div class='add'>+/* Driver set switch broadcast storm protection at 10% rate. */</div><div class='add'>+#define BROADCAST_STORM_PROT_RATE	10</div><div class='add'>+</div><div class='add'>+/* 148,800 frames * 67 ms / 100 */</div><div class='add'>+#define BROADCAST_STORM_VALUE		9969</div><div class='add'>+</div><div class='add'>+#define BROADCAST_STORM_RATE_HI		0x07</div><div class='add'>+#define BROADCAST_STORM_RATE_LO		0xFF</div><div class='add'>+#define BROADCAST_STORM_RATE		0x07FF</div><div class='add'>+</div><div class='add'>+#define MULTICAST_STORM_DISABLE		BIT(6)</div><div class='add'>+</div><div class='add'>+#define SW_START			0x01</div><div class='add'>+</div><div class='add'>+/* xMII configuration */</div><div class='add'>+#define P_MII_DUPLEX_M			BIT(6)</div><div class='add'>+#define P_MII_100MBIT_M			BIT(4)</div><div class='add'>+</div><div class='add'>+#define P_GMII_1GBIT_M			BIT(6)</div><div class='add'>+#define P_RGMII_ID_IG_ENABLE		BIT(4)</div><div class='add'>+#define P_RGMII_ID_EG_ENABLE		BIT(3)</div><div class='add'>+#define P_MII_MAC_MODE			BIT(2)</div><div class='add'>+#define P_MII_SEL_M			0x3</div><div class='add'>+</div><div class='add'>+/* KSZ9477, KSZ87xx Wake-on-LAN (WoL) masks */</div><div class='add'>+#define PME_WOL_MAGICPKT		BIT(2)</div><div class='add'>+#define PME_WOL_LINKUP			BIT(1)</div><div class='add'>+#define PME_WOL_ENERGY			BIT(0)</div><div class='add'>+</div><div class='add'>+#define PME_ENABLE			BIT(1)</div><div class='add'>+#define PME_POLARITY			BIT(0)</div><div class='add'>+</div><div class='add'>+#define KSZ87XX_REG_INT_EN		0x7D</div><div class='add'>+#define KSZ87XX_INT_PME_MASK		BIT(4)</div><div class='add'>+</div><div class='add'>+/* Interrupt */</div><div class='add'>+#define REG_SW_PORT_INT_STATUS__1	0x001B</div><div class='add'>+#define REG_SW_PORT_INT_MASK__1		0x001F</div><div class='add'>+</div><div class='add'>+#define REG_PORT_INT_STATUS		0x001B</div><div class='add'>+#define REG_PORT_INT_MASK		0x001F</div><div class='add'>+</div><div class='add'>+#define PORT_SRC_PHY_INT		1</div><div class='add'>+#define PORT_SRC_PTP_INT		2</div><div class='add'>+</div><div class='add'>+#define KSZ8795_HUGE_PACKET_SIZE	2000</div><div class='add'>+#define KSZ8863_HUGE_PACKET_SIZE	1916</div><div class='add'>+#define KSZ8863_NORMAL_PACKET_SIZE	1536</div><div class='add'>+#define KSZ8_LEGAL_PACKET_SIZE		1518</div><div class='add'>+#define KSZ9477_MAX_FRAME_SIZE		9000</div><div class='add'>+</div><div class='add'>+#define KSZ8873_REG_GLOBAL_CTRL_12	0x0e</div><div class='add'>+/* Drive Strength of I/O Pad</div><div class='add'>+ * 0: 8mA, 1: 16mA</div><div class='add'>+ */</div><div class='add'>+#define KSZ8873_DRIVE_STRENGTH_16MA	BIT(6)</div><div class='add'>+</div><div class='add'>+#define KSZ8795_REG_SW_CTRL_20		0xa3</div><div class='add'>+#define KSZ9477_REG_SW_IO_STRENGTH	0x010d</div><div class='add'>+#define SW_DRIVE_STRENGTH_M		0x7</div><div class='add'>+#define SW_DRIVE_STRENGTH_2MA		0</div><div class='add'>+#define SW_DRIVE_STRENGTH_4MA		1</div><div class='add'>+#define SW_DRIVE_STRENGTH_8MA		2</div><div class='add'>+#define SW_DRIVE_STRENGTH_12MA		3</div><div class='add'>+#define SW_DRIVE_STRENGTH_16MA		4</div><div class='add'>+#define SW_DRIVE_STRENGTH_20MA		5</div><div class='add'>+#define SW_DRIVE_STRENGTH_24MA		6</div><div class='add'>+#define SW_DRIVE_STRENGTH_28MA		7</div><div class='add'>+#define SW_HI_SPEED_DRIVE_STRENGTH_S	4</div><div class='add'>+#define SW_LO_SPEED_DRIVE_STRENGTH_S	0</div><div class='add'>+</div><div class='add'>+/* TXQ Split Control Register for per-port, per-queue configuration.</div><div class='add'>+ * Register 0xAF is TXQ Split for Q3 on Port 1.</div><div class='add'>+ * Register offset formula: 0xAF + (port * 4) + (3 - queue)</div><div class='add'>+ *   where: port = 0..2, queue = 0..3</div><div class='add'>+ */</div><div class='add'>+#define KSZ8873_TXQ_SPLIT_CTRL_REG(port, queue) \</div><div class='add'>+	(0xAF + ((port) * 4) + (3 - (queue)))</div><div class='add'>+</div><div class='add'>+/* Bit 7 selects between:</div><div class='add'>+ *   0 = Strict priority mode (highest-priority queue first)</div><div class='add'>+ *   1 = Weighted Fair Queuing (WFQ) mode:</div><div class='add'>+ *       Queue weights: Q3:Q2:Q1:Q0 = 8:4:2:1</div><div class='add'>+ *       If any queues are empty, weight is redistributed.</div><div class='add'>+ *</div><div class='add'>+ * Note: This is referred to as "Weighted Fair Queuing" (WFQ) in KSZ8863/8873</div><div class='add'>+ * documentation, and as "Weighted Round Robin" (WRR) in KSZ9477 family docs.</div><div class='add'>+ */</div><div class='add'>+#define KSZ8873_TXQ_WFQ_ENABLE		BIT(7)</div><div class='add'>+</div><div class='add'>+#define KSZ9477_REG_PORT_OUT_RATE_0	0x0420</div><div class='add'>+#define KSZ9477_OUT_RATE_NO_LIMIT	0</div><div class='add'>+</div><div class='add'>+#define KSZ9477_PORT_MRI_TC_MAP__4	0x0808</div><div class='add'>+</div><div class='add'>+#define KSZ9477_PORT_TC_MAP_S		4</div><div class='add'>+</div><div class='add'>+/* CBS related registers */</div><div class='add'>+#define REG_PORT_MTI_QUEUE_INDEX__4	0x0900</div><div class='add'>+</div><div class='add'>+#define REG_PORT_MTI_QUEUE_CTRL_0	0x0914</div><div class='add'>+</div><div class='add'>+#define MTI_SCHEDULE_MODE_M		GENMASK(7, 6)</div><div class='add'>+#define MTI_SCHEDULE_STRICT_PRIO	0</div><div class='add'>+#define MTI_SCHEDULE_WRR		2</div><div class='add'>+#define MTI_SHAPING_M			GENMASK(5, 4)</div><div class='add'>+#define MTI_SHAPING_OFF			0</div><div class='add'>+#define MTI_SHAPING_SRP			1</div><div class='add'>+#define MTI_SHAPING_TIME_AWARE		2</div><div class='add'>+</div><div class='add'>+#define KSZ9477_PORT_MTI_QUEUE_CTRL_1	0x0915</div><div class='add'>+#define KSZ9477_DEFAULT_WRR_WEIGHT	1</div><div class='add'>+</div><div class='add'>+#define REG_PORT_MTI_HI_WATER_MARK	0x0916</div><div class='add'>+#define REG_PORT_MTI_LO_WATER_MARK	0x0918</div><div class='add'>+</div><div class='add'>+/* Regmap tables generation */</div><div class='add'>+#define KSZ_SPI_OP_RD		3</div><div class='add'>+#define KSZ_SPI_OP_WR		2</div><div class='add'>+</div><div class='add'>+#define swabnot_used(x)		0</div><div class='add'>+</div><div class='add'>+#define KSZ_SPI_OP_FLAG_MASK(opcode, swp, regbits, regpad)		\</div><div class='add'>+	swab##swp((opcode) &lt;&lt; ((regbits) + (regpad)))</div><div class='add'>+</div><div class='add'>+#define KSZ_REGMAP_ENTRY(width, swp, regbits, regpad, regalign)		\</div><div class='add'>+	{								\</div><div class='add'>+		.name = #width,						\</div><div class='add'>+		.val_bits = (width),					\</div><div class='add'>+		.reg_stride = 1,					\</div><div class='add'>+		.reg_bits = (regbits) + (regalign),			\</div><div class='add'>+		.pad_bits = (regpad),					\</div><div class='add'>+		.max_register = BIT(regbits) - 1,			\</div><div class='add'>+		.cache_type = REGCACHE_NONE,				\</div><div class='add'>+		.read_flag_mask =					\</div><div class='add'>+			KSZ_SPI_OP_FLAG_MASK(KSZ_SPI_OP_RD, swp,	\</div><div class='add'>+					     regbits, regpad),		\</div><div class='add'>+		.write_flag_mask =					\</div><div class='add'>+			KSZ_SPI_OP_FLAG_MASK(KSZ_SPI_OP_WR, swp,	\</div><div class='add'>+					     regbits, regpad),		\</div><div class='add'>+		.lock = ksz_regmap_lock,				\</div><div class='add'>+		.unlock = ksz_regmap_unlock,				\</div><div class='add'>+		.reg_format_endian = REGMAP_ENDIAN_BIG,			\</div><div class='add'>+		.val_format_endian = REGMAP_ENDIAN_BIG			\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define KSZ_REGMAP_TABLE(ksz, swp, regbits, regpad, regalign)		\</div><div class='add'>+	static const struct regmap_config ksz##_regmap_config[] = {	\</div><div class='add'>+		[KSZ_REGMAP_8] = KSZ_REGMAP_ENTRY(8, swp, (regbits), (regpad), (regalign)), \</div><div class='add'>+		[KSZ_REGMAP_16] = KSZ_REGMAP_ENTRY(16, swp, (regbits), (regpad), (regalign)), \</div><div class='add'>+		[KSZ_REGMAP_32] = KSZ_REGMAP_ENTRY(32, swp, (regbits), (regpad), (regalign)), \</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REGMAP_ENTRY(width, regbits, regpad, regalign)		\</div><div class='add'>+	{								\</div><div class='add'>+		.name = #width,						\</div><div class='add'>+		.val_bits = (width),					\</div><div class='add'>+		.reg_stride = (width / 8),				\</div><div class='add'>+		.reg_bits = (regbits) + (regalign),			\</div><div class='add'>+		.pad_bits = (regpad),					\</div><div class='add'>+		.read = ksz8463_spi_read,				\</div><div class='add'>+		.write = ksz8463_spi_write,				\</div><div class='add'>+		.max_register = BIT(regbits) - 1,			\</div><div class='add'>+		.cache_type = REGCACHE_NONE,				\</div><div class='add'>+		.zero_flag_mask = 1,					\</div><div class='add'>+		.use_single_read = 1,					\</div><div class='add'>+		.use_single_write = 1,					\</div><div class='add'>+		.lock = ksz_regmap_lock,				\</div><div class='add'>+		.unlock = ksz_regmap_unlock,				\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REGMAP_TABLE(ksz, regbits, regpad, regalign)		\</div><div class='add'>+	static const struct regmap_config ksz##_regmap_config[] = {	\</div><div class='add'>+		[KSZ_REGMAP_8] = KSZ8463_REGMAP_ENTRY(8, (regbits), (regpad), (regalign)), \</div><div class='add'>+		[KSZ_REGMAP_16] = KSZ8463_REGMAP_ENTRY(16, (regbits), (regpad), (regalign)), \</div><div class='add'>+		[KSZ_REGMAP_32] = KSZ8463_REGMAP_ENTRY(32, (regbits), (regpad), (regalign)), \</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_dcb.c b/drivers/net/dsa/microchip/ksz_dcb.c<br/>new file mode 100644<br/>index 000000000000..7131c5caac54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_dcb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_dcb.c</a></div><div class='hunk'>@@ -0,0 +1,612 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2024 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dsa/ksz_common.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/dscp.h&gt;</div><div class='add'>+#include &lt;net/ieee8021q.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+#include "ksz_dcb.h"</div><div class='add'>+#include "ksz8.h"</div><div class='add'>+</div><div class='add'>+/* Port X Control 0 register.</div><div class='add'>+ * The datasheet specifies: Port 1 - 0x10, Port 2 - 0x20, Port 3 - 0x30.</div><div class='add'>+ * However, the driver uses get_port_addr(), which maps Port 1 to offset 0.</div><div class='add'>+ * Therefore, we define the base offset as 0x00 here to align with that logic.</div><div class='add'>+ */</div><div class='add'>+#define KSZ8_REG_PORT_1_CTRL_0			0x00</div><div class='add'>+#define KSZ8463_REG_PORT_1_CTRL_0		0x6C</div><div class='add'>+#define KSZ8_PORT_DIFFSERV_ENABLE		BIT(6)</div><div class='add'>+#define KSZ8_PORT_802_1P_ENABLE			BIT(5)</div><div class='add'>+#define KSZ8_PORT_BASED_PRIO_M			GENMASK(4, 3)</div><div class='add'>+</div><div class='add'>+#define KSZ8463_REG_TOS_DSCP_CTRL		0x16</div><div class='add'>+#define KSZ88X3_REG_TOS_DSCP_CTRL		0x60</div><div class='add'>+#define KSZ8765_REG_TOS_DSCP_CTRL		0x90</div><div class='add'>+</div><div class='add'>+#define KSZ9477_REG_SW_MAC_TOS_CTRL		0x033e</div><div class='add'>+#define KSZ9477_SW_TOS_DSCP_REMAP		BIT(0)</div><div class='add'>+#define KSZ9477_SW_TOS_DSCP_DEFAULT_PRIO_M	GENMASK(5, 3)</div><div class='add'>+</div><div class='add'>+#define KSZ9477_REG_DIFFSERV_PRIO_MAP		0x0340</div><div class='add'>+</div><div class='add'>+#define KSZ9477_REG_PORT_MRI_PRIO_CTRL		0x0801</div><div class='add'>+#define KSZ9477_PORT_HIGHEST_PRIO		BIT(7)</div><div class='add'>+#define KSZ9477_PORT_OR_PRIO			BIT(6)</div><div class='add'>+#define KSZ9477_PORT_MAC_PRIO_ENABLE		BIT(4)</div><div class='add'>+#define KSZ9477_PORT_VLAN_PRIO_ENABLE		BIT(3)</div><div class='add'>+#define KSZ9477_PORT_802_1P_PRIO_ENABLE		BIT(2)</div><div class='add'>+#define KSZ9477_PORT_DIFFSERV_PRIO_ENABLE	BIT(1)</div><div class='add'>+#define KSZ9477_PORT_ACL_PRIO_ENABLE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define KSZ9477_REG_PORT_MRI_MAC_CTRL		0x0802</div><div class='add'>+#define KSZ9477_PORT_BASED_PRIO_M		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+struct ksz_apptrust_map {</div><div class='add'>+	u8 apptrust;</div><div class='add'>+	u8 bit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_apptrust_map ksz8_apptrust_map_to_bit[] = {</div><div class='add'>+	{ DCB_APP_SEL_PCP, KSZ8_PORT_802_1P_ENABLE },</div><div class='add'>+	{ IEEE_8021QAZ_APP_SEL_DSCP, KSZ8_PORT_DIFFSERV_ENABLE },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ksz_apptrust_map ksz9477_apptrust_map_to_bit[] = {</div><div class='add'>+	{ DCB_APP_SEL_PCP, KSZ9477_PORT_802_1P_PRIO_ENABLE },</div><div class='add'>+	{ IEEE_8021QAZ_APP_SEL_DSCP, KSZ9477_PORT_DIFFSERV_PRIO_ENABLE },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ksz_supported_apptrust[] - Supported apptrust selectors and Priority Order</div><div class='add'>+ *			      of Internal Priority Map (IPM) sources.</div><div class='add'>+ *</div><div class='add'>+ * This array defines the apptrust selectors supported by the hardware, where</div><div class='add'>+ * the index within the array indicates the priority of the selector - lower</div><div class='add'>+ * indices correspond to higher priority. This fixed priority scheme is due to</div><div class='add'>+ * the hardware's design, which does not support configurable priority among</div><div class='add'>+ * different priority sources.</div><div class='add'>+ *</div><div class='add'>+ * The priority sources, including Tail Tag, ACL, VLAN PCP and DSCP are ordered</div><div class='add'>+ * by the hardware's fixed logic, as detailed below. The order reflects a</div><div class='add'>+ * non-configurable precedence where certain types of priority information</div><div class='add'>+ * override others:</div><div class='add'>+ *</div><div class='add'>+ * 1. Tail Tag - Highest priority, overrides ACL, VLAN PCP, and DSCP priorities.</div><div class='add'>+ * 2. ACL - Overrides VLAN PCP and DSCP priorities.</div><div class='add'>+ * 3. VLAN PCP - Overrides DSCP priority.</div><div class='add'>+ * 4. DSCP - Lowest priority, does not override any other priority source.</div><div class='add'>+ *</div><div class='add'>+ * In this context, the array's lower index (higher priority) for</div><div class='add'>+ * 'DCB_APP_SEL_PCP' suggests its relative priority over</div><div class='add'>+ * 'IEEE_8021QAZ_APP_SEL_DSCP' within the system's fixed priority scheme.</div><div class='add'>+ *</div><div class='add'>+ * DCB_APP_SEL_PCP - Priority Code Point selector</div><div class='add'>+ * IEEE_8021QAZ_APP_SEL_DSCP - Differentiated Services Code Point selector</div><div class='add'>+ */</div><div class='add'>+static const u8 ksz_supported_apptrust[] = {</div><div class='add'>+	DCB_APP_SEL_PCP,</div><div class='add'>+	IEEE_8021QAZ_APP_SEL_DSCP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const ksz_supported_apptrust_variants[] = {</div><div class='add'>+	"empty", "dscp", "pcp", "dscp pcp"</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ksz_get_default_port_prio_reg(struct ksz_device *dev, int *reg,</div><div class='add'>+					  u8 *mask, int *shift)</div><div class='add'>+{</div><div class='add'>+	if (is_ksz8(dev)) {</div><div class='add'>+		*reg = KSZ8_REG_PORT_1_CTRL_0;</div><div class='add'>+		*mask = KSZ8_PORT_BASED_PRIO_M;</div><div class='add'>+		*shift = __bf_shf(KSZ8_PORT_BASED_PRIO_M);</div><div class='add'>+		if (ksz_is_ksz8463(dev))</div><div class='add'>+			*reg = KSZ8463_REG_PORT_1_CTRL_0;</div><div class='add'>+	} else {</div><div class='add'>+		*reg = KSZ9477_REG_PORT_MRI_MAC_CTRL;</div><div class='add'>+		*mask = KSZ9477_PORT_BASED_PRIO_M;</div><div class='add'>+		*shift = __bf_shf(KSZ9477_PORT_BASED_PRIO_M);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_get_dscp_prio_reg - Retrieves the DSCP-to-priority-mapping register</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @reg: Pointer to the register address to be set</div><div class='add'>+ * @per_reg: Pointer to the number of DSCP values per register</div><div class='add'>+ * @mask: Pointer to the mask to be set</div><div class='add'>+ *</div><div class='add'>+ * This function retrieves the DSCP to priority mapping register, the number of</div><div class='add'>+ * DSCP values per register, and the mask to be set.</div><div class='add'>+ */</div><div class='add'>+static void ksz_get_dscp_prio_reg(struct ksz_device *dev, int *reg,</div><div class='add'>+				  int *per_reg, u8 *mask)</div><div class='add'>+{</div><div class='add'>+	if (ksz_is_ksz87xx(dev) || ksz_is_8895_family(dev)) {</div><div class='add'>+		*reg = KSZ8765_REG_TOS_DSCP_CTRL;</div><div class='add'>+		*per_reg = 4;</div><div class='add'>+		*mask = GENMASK(1, 0);</div><div class='add'>+	} else if (ksz_is_ksz88x3(dev) || ksz_is_ksz8463(dev)) {</div><div class='add'>+		*reg = KSZ88X3_REG_TOS_DSCP_CTRL;</div><div class='add'>+		*per_reg = 4;</div><div class='add'>+		*mask = GENMASK(1, 0);</div><div class='add'>+		if (ksz_is_ksz8463(dev))</div><div class='add'>+			*reg = KSZ8463_REG_TOS_DSCP_CTRL;</div><div class='add'>+	} else {</div><div class='add'>+		*reg = KSZ9477_REG_DIFFSERV_PRIO_MAP;</div><div class='add'>+		*per_reg = 2;</div><div class='add'>+		*mask = GENMASK(2, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_get_apptrust_map_and_reg - Retrieves the apptrust map and register</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @map: Pointer to the apptrust map to be set</div><div class='add'>+ * @reg: Pointer to the register address to be set</div><div class='add'>+ * @mask: Pointer to the mask to be set</div><div class='add'>+ *</div><div class='add'>+ * This function retrieves the apptrust map and register address for the</div><div class='add'>+ * apptrust configuration.</div><div class='add'>+ */</div><div class='add'>+static void ksz_get_apptrust_map_and_reg(struct ksz_device *dev,</div><div class='add'>+					 const struct ksz_apptrust_map **map,</div><div class='add'>+					 int *reg, u8 *mask)</div><div class='add'>+{</div><div class='add'>+	if (is_ksz8(dev)) {</div><div class='add'>+		*map = ksz8_apptrust_map_to_bit;</div><div class='add'>+		*reg = KSZ8_REG_PORT_1_CTRL_0;</div><div class='add'>+		*mask = KSZ8_PORT_DIFFSERV_ENABLE | KSZ8_PORT_802_1P_ENABLE;</div><div class='add'>+		if (ksz_is_ksz8463(dev))</div><div class='add'>+			*reg = KSZ8463_REG_PORT_1_CTRL_0;</div><div class='add'>+	} else {</div><div class='add'>+		*map = ksz9477_apptrust_map_to_bit;</div><div class='add'>+		*reg = KSZ9477_REG_PORT_MRI_PRIO_CTRL;</div><div class='add'>+		*mask = KSZ9477_PORT_802_1P_PRIO_ENABLE |</div><div class='add'>+			KSZ9477_PORT_DIFFSERV_PRIO_ENABLE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_get_default_prio - Retrieves the default priority for a port on a</div><div class='add'>+ *			       KSZ switch</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number from which to get the default priority</div><div class='add'>+ *</div><div class='add'>+ * This function fetches the default priority for the specified port on a KSZ</div><div class='add'>+ * switch.</div><div class='add'>+ *</div><div class='add'>+ * Return: The default priority of the port on success, or a negative error</div><div class='add'>+ * code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz_port_get_default_prio(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ret, reg, shift;</div><div class='add'>+	u8 data, mask;</div><div class='add'>+</div><div class='add'>+	ksz_get_default_port_prio_reg(dev, &amp;reg, &amp;mask, &amp;shift);</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, reg, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return (data &amp; mask) &gt;&gt; shift;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_set_default_prio - Sets the default priority for a port on a KSZ</div><div class='add'>+ *			       switch</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number for which to set the default priority</div><div class='add'>+ * @prio: Priority value to set</div><div class='add'>+ *</div><div class='add'>+ * This function sets the default priority for the specified port on a KSZ</div><div class='add'>+ * switch.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz_port_set_default_prio(struct dsa_switch *ds, int port, u8 prio)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int reg, shift;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	if (prio &gt;= dev-&gt;info-&gt;num_ipms)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ksz_get_default_port_prio_reg(dev, &amp;reg, &amp;mask, &amp;shift);</div><div class='add'>+</div><div class='add'>+	return ksz_prmw8(dev, port, reg, mask, (prio &lt;&lt; shift) &amp; mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_get_dscp_prio - Retrieves the priority for a DSCP value on a KSZ</div><div class='add'>+ *			    switch</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number for which to get the priority</div><div class='add'>+ * @dscp: DSCP value for which to get the priority</div><div class='add'>+ *</div><div class='add'>+ * This function fetches the priority value from switch global DSCP-to-priorty</div><div class='add'>+ * mapping table for the specified DSCP value.</div><div class='add'>+ *</div><div class='add'>+ * Return: The priority value for the DSCP on success, or a negative error</div><div class='add'>+ * code on failure.</div><div class='add'>+ */</div><div class='add'>+int ksz_port_get_dscp_prio(struct dsa_switch *ds, int port, u8 dscp)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int reg, per_reg, ret, shift;</div><div class='add'>+	u8 data, mask;</div><div class='add'>+</div><div class='add'>+	ksz_get_dscp_prio_reg(dev, &amp;reg, &amp;per_reg, &amp;mask);</div><div class='add'>+</div><div class='add'>+	/* If DSCP remapping is disabled, DSCP bits 3-5 are used as Internal</div><div class='add'>+	 * Priority Map (IPM)</div><div class='add'>+	 */</div><div class='add'>+	if (!is_ksz8(dev)) {</div><div class='add'>+		ret = ksz_read8(dev, KSZ9477_REG_SW_MAC_TOS_CTRL, &amp;data);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* If DSCP remapping is disabled, DSCP bits 3-5 are used as</div><div class='add'>+		 * Internal Priority Map (IPM)</div><div class='add'>+		 */</div><div class='add'>+		if (!(data &amp; KSZ9477_SW_TOS_DSCP_REMAP))</div><div class='add'>+			return FIELD_GET(KSZ9477_SW_TOS_DSCP_DEFAULT_PRIO_M,</div><div class='add'>+					 dscp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case DSCP remapping is enabled, we need to write the DSCP to</div><div class='add'>+	 * priority mapping table.</div><div class='add'>+	 */</div><div class='add'>+	reg += dscp / per_reg;</div><div class='add'>+	ret = ksz_read8(dev, reg, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	shift = (dscp % per_reg) * (8 / per_reg);</div><div class='add'>+</div><div class='add'>+	return (data &gt;&gt; shift) &amp; mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_set_global_dscp_entry - Sets the global DSCP-to-priority mapping entry</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @dscp: DSCP value for which to set the priority</div><div class='add'>+ * @ipm: Priority value to set</div><div class='add'>+ *</div><div class='add'>+ * This function sets the global DSCP-to-priority mapping entry for the</div><div class='add'>+ * specified DSCP value.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure.</div><div class='add'>+ */</div><div class='add'>+static int ksz_set_global_dscp_entry(struct ksz_device *dev, u8 dscp, u8 ipm)</div><div class='add'>+{</div><div class='add'>+	int reg, per_reg, shift;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	ksz_get_dscp_prio_reg(dev, &amp;reg, &amp;per_reg, &amp;mask);</div><div class='add'>+</div><div class='add'>+	shift = (dscp % per_reg) * (8 / per_reg);</div><div class='add'>+</div><div class='add'>+	return ksz_rmw8(dev, reg + (dscp / per_reg), mask &lt;&lt; shift,</div><div class='add'>+			ipm &lt;&lt; shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_init_global_dscp_map - Initializes the global DSCP-to-priority mapping</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ *</div><div class='add'>+ * This function initializes the global DSCP-to-priority mapping table for the</div><div class='add'>+ * switch.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int ksz_init_global_dscp_map(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret, dscp;</div><div class='add'>+</div><div class='add'>+	/* On KSZ9xxx variants, DSCP remapping is disabled by default.</div><div class='add'>+	 * Enable to have, predictable and reproducible behavior across</div><div class='add'>+	 * different devices.</div><div class='add'>+	 */</div><div class='add'>+	if (!is_ksz8(dev)) {</div><div class='add'>+		ret = ksz_rmw8(dev, KSZ9477_REG_SW_MAC_TOS_CTRL,</div><div class='add'>+			       KSZ9477_SW_TOS_DSCP_REMAP,</div><div class='add'>+			       KSZ9477_SW_TOS_DSCP_REMAP);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (dscp = 0; dscp &lt; DSCP_MAX; dscp++) {</div><div class='add'>+		int ipm, tt;</div><div class='add'>+</div><div class='add'>+		/* Map DSCP to Traffic Type, which is corresponding to the</div><div class='add'>+		 * Internal Priority Map (IPM) in the switch.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_ksz8(dev)) {</div><div class='add'>+			ipm = ietf_dscp_to_ieee8021q_tt(dscp);</div><div class='add'>+		} else {</div><div class='add'>+			/* On KSZ8xxx variants we do not have IPM to queue</div><div class='add'>+			 * remapping table. We need to convert DSCP to Traffic</div><div class='add'>+			 * Type and then to queue.</div><div class='add'>+			 */</div><div class='add'>+			tt = ietf_dscp_to_ieee8021q_tt(dscp);</div><div class='add'>+			if (tt &lt; 0)</div><div class='add'>+				return tt;</div><div class='add'>+</div><div class='add'>+			ipm = ieee8021q_tt_to_tc(tt, dev-&gt;info-&gt;num_tx_queues);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ipm &lt; 0)</div><div class='add'>+			return ipm;</div><div class='add'>+</div><div class='add'>+		ret = ksz_set_global_dscp_entry(dev, dscp, ipm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_add_dscp_prio - Adds a DSCP-to-priority mapping entry for a port on</div><div class='add'>+ *			    a KSZ switch.</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number for which to add the DSCP-to-priority mapping entry</div><div class='add'>+ * @dscp: DSCP value for which to add the priority</div><div class='add'>+ * @prio: Priority value to set</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ksz_port_add_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (prio &gt;= dev-&gt;info-&gt;num_ipms)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	return ksz_set_global_dscp_entry(dev, dscp, prio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_del_dscp_prio - Deletes a DSCP-to-priority mapping entry for a port</div><div class='add'>+ *			    on a KSZ switch.</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number for which to delete the DSCP-to-priority mapping entry</div><div class='add'>+ * @dscp: DSCP value for which to delete the priority</div><div class='add'>+ * @prio: Priority value to delete</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ksz_port_del_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ipm;</div><div class='add'>+</div><div class='add'>+	if (ksz_port_get_dscp_prio(ds, port, dscp) != prio)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (is_ksz8(dev)) {</div><div class='add'>+		ipm = ieee8021q_tt_to_tc(IEEE8021Q_TT_BE,</div><div class='add'>+					 dev-&gt;info-&gt;num_tx_queues);</div><div class='add'>+		if (ipm &lt; 0)</div><div class='add'>+			return ipm;</div><div class='add'>+	} else {</div><div class='add'>+		ipm = IEEE8021Q_TT_BE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_set_global_dscp_entry(dev, dscp, ipm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_apptrust_error - Prints an error message for an invalid apptrust selector</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ *</div><div class='add'>+ * This function prints an error message when an invalid apptrust selector is</div><div class='add'>+ * provided.</div><div class='add'>+ */</div><div class='add'>+static void ksz_apptrust_error(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	char supported_apptrust_variants[64];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	supported_apptrust_variants[0] = '\0';</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ksz_supported_apptrust_variants); i++) {</div><div class='add'>+		if (i &gt; 0)</div><div class='add'>+			strlcat(supported_apptrust_variants, ", ",</div><div class='add'>+				sizeof(supported_apptrust_variants));</div><div class='add'>+		strlcat(supported_apptrust_variants,</div><div class='add'>+			ksz_supported_apptrust_variants[i],</div><div class='add'>+			sizeof(supported_apptrust_variants));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(dev-&gt;dev, "Invalid apptrust selector or priority order. Supported: %s\n",</div><div class='add'>+		supported_apptrust_variants);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_set_apptrust_validate - Validates the apptrust selectors</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @port: Port number for which to set the apptrust selectors</div><div class='add'>+ * @sel: Array of apptrust selectors to validate</div><div class='add'>+ * @nsel: Number of apptrust selectors in the array</div><div class='add'>+ *</div><div class='add'>+ * This function validates the apptrust selectors provided and ensures that</div><div class='add'>+ * they are in the correct order.</div><div class='add'>+ *</div><div class='add'>+ * This family of switches supports two apptrust selectors: DCB_APP_SEL_PCP and</div><div class='add'>+ * IEEE_8021QAZ_APP_SEL_DSCP. The priority order of the selectors is fixed and</div><div class='add'>+ * cannot be changed. The order is as follows:</div><div class='add'>+ * 1. DCB_APP_SEL_PCP - Priority Code Point selector (highest priority)</div><div class='add'>+ * 2. IEEE_8021QAZ_APP_SEL_DSCP - Differentiated Services Code Point selector</div><div class='add'>+ *   (lowest priority)</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+static int ksz_port_set_apptrust_validate(struct ksz_device *dev, int port,</div><div class='add'>+					  const u8 *sel, int nsel)</div><div class='add'>+{</div><div class='add'>+	int i, j, found;</div><div class='add'>+	int j_prev = 0;</div><div class='add'>+</div><div class='add'>+	/* Iterate through the requested selectors */</div><div class='add'>+	for (i = 0; i &lt; nsel; i++) {</div><div class='add'>+		found = 0;</div><div class='add'>+</div><div class='add'>+		/* Check if the current selector is supported by the hardware */</div><div class='add'>+		for (j = 0; j &lt; sizeof(ksz_supported_apptrust); j++) {</div><div class='add'>+			if (sel[i] != ksz_supported_apptrust[j])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			found = 1;</div><div class='add'>+</div><div class='add'>+			/* Ensure that no higher priority selector (lower index)</div><div class='add'>+			 * precedes a lower priority one</div><div class='add'>+			 */</div><div class='add'>+			if (i &gt; 0 &amp;&amp; j &lt;= j_prev)</div><div class='add'>+				goto err_sel_not_vaild;</div><div class='add'>+</div><div class='add'>+			j_prev = j;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!found)</div><div class='add'>+			goto err_sel_not_vaild;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_sel_not_vaild:</div><div class='add'>+	ksz_apptrust_error(dev);</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_set_apptrust - Sets the apptrust selectors for a port on a KSZ</div><div class='add'>+ *			   switch</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number for which to set the apptrust selectors</div><div class='add'>+ * @sel: Array of apptrust selectors to set</div><div class='add'>+ * @nsel: Number of apptrust selectors in the array</div><div class='add'>+ *</div><div class='add'>+ * This function sets the apptrust selectors for the specified port on a KSZ</div><div class='add'>+ * switch.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ksz_port_set_apptrust(struct dsa_switch *ds, int port,</div><div class='add'>+			  const u8 *sel, int nsel)</div><div class='add'>+{</div><div class='add'>+	const struct ksz_apptrust_map *map;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int reg, i, ret;</div><div class='add'>+	u8 data = 0;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	ret = ksz_port_set_apptrust_validate(dev, port, sel, nsel);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ksz_get_apptrust_map_and_reg(dev, &amp;map, &amp;reg, &amp;mask);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nsel; i++) {</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; ARRAY_SIZE(ksz_supported_apptrust); j++) {</div><div class='add'>+			if (sel[i] != ksz_supported_apptrust[j])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			data |= map[j].bit;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_prmw8(dev, port, reg, mask, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_port_get_apptrust - Retrieves the apptrust selectors for a port on a KSZ</div><div class='add'>+ *			   switch</div><div class='add'>+ * @ds: Pointer to the DSA switch structure</div><div class='add'>+ * @port: Port number for which to get the apptrust selectors</div><div class='add'>+ * @sel: Array to store the apptrust selectors</div><div class='add'>+ * @nsel: Number of apptrust selectors in the array</div><div class='add'>+ *</div><div class='add'>+ * This function fetches the apptrust selectors for the specified port on a KSZ</div><div class='add'>+ * switch.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ksz_port_get_apptrust(struct dsa_switch *ds, int port, u8 *sel, int *nsel)</div><div class='add'>+{</div><div class='add'>+	const struct ksz_apptrust_map *map;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int reg, i, ret;</div><div class='add'>+	u8 data;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	ksz_get_apptrust_map_and_reg(dev, &amp;map, &amp;reg, &amp;mask);</div><div class='add'>+</div><div class='add'>+	ret = ksz_pread8(dev, port, reg, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*nsel = 0;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ksz_supported_apptrust); i++) {</div><div class='add'>+		if (data &amp; map[i].bit)</div><div class='add'>+			sel[(*nsel)++] = ksz_supported_apptrust[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_dcb_init_port - Initializes the DCB configuration for a port on a KSZ</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ * @port: Port number for which to initialize the DCB configuration</div><div class='add'>+ *</div><div class='add'>+ * This function initializes the DCB configuration for the specified port on a</div><div class='add'>+ * KSZ switch. Particular DCB configuration is set for the port, including the</div><div class='add'>+ * default priority and apptrust selectors.</div><div class='add'>+ * The default priority is set to Best Effort, and the apptrust selectors are</div><div class='add'>+ * set to all supported selectors.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ksz_dcb_init_port(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	const u8 ksz_default_apptrust[] = { DCB_APP_SEL_PCP };</div><div class='add'>+	int ret, ipm;</div><div class='add'>+</div><div class='add'>+	if (is_ksz8(dev)) {</div><div class='add'>+		ipm = ieee8021q_tt_to_tc(IEEE8021Q_TT_BE,</div><div class='add'>+					 dev-&gt;info-&gt;num_tx_queues);</div><div class='add'>+		if (ipm &lt; 0)</div><div class='add'>+			return ipm;</div><div class='add'>+	} else {</div><div class='add'>+		ipm = IEEE8021Q_TT_BE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the default priority for the port to Best Effort */</div><div class='add'>+	ret = ksz_port_set_default_prio(dev-&gt;ds, port, ipm);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_port_set_apptrust(dev-&gt;ds, port, ksz_default_apptrust,</div><div class='add'>+				     ARRAY_SIZE(ksz_default_apptrust));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * ksz_dcb_init - Initializes the DCB configuration for a KSZ switch</div><div class='add'>+ * @dev: Pointer to the KSZ switch device structure</div><div class='add'>+ *</div><div class='add'>+ * This function initializes the DCB configuration for a KSZ switch. The global</div><div class='add'>+ * DSCP-to-priority mapping table is initialized.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or a negative error code on failure</div><div class='add'>+ */</div><div class='add'>+int ksz_dcb_init(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	return ksz_init_global_dscp_map(dev);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_dcb.h b/drivers/net/dsa/microchip/ksz_dcb.h<br/>new file mode 100644<br/>index 000000000000..e2065223ba90<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_dcb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_dcb.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2024 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt; */</div><div class='add'>+</div><div class='add'>+#ifndef __KSZ_DCB_H</div><div class='add'>+#define __KSZ_DCB_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+int ksz_port_get_default_prio(struct dsa_switch *ds, int port);</div><div class='add'>+int ksz_port_set_default_prio(struct dsa_switch *ds, int port, u8 prio);</div><div class='add'>+int ksz_port_get_dscp_prio(struct dsa_switch *ds, int port, u8 dscp);</div><div class='add'>+int ksz_port_add_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio);</div><div class='add'>+int ksz_port_del_dscp_prio(struct dsa_switch *ds, int port, u8 dscp, u8 prio);</div><div class='add'>+int ksz_port_set_apptrust(struct dsa_switch *ds, int port,</div><div class='add'>+			  const unsigned char *sel,</div><div class='add'>+			  int nsel);</div><div class='add'>+int ksz_port_get_apptrust(struct dsa_switch *ds, int port, u8 *sel, int *nsel);</div><div class='add'>+int ksz_dcb_init_port(struct ksz_device *dev, int port);</div><div class='add'>+int ksz_dcb_init(struct ksz_device *dev);</div><div class='add'>+</div><div class='add'>+#endif /* __KSZ_DCB_H */</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_priv.h b/drivers/net/dsa/microchip/ksz_priv.h<br/>deleted file mode 100644<br/>index b52e5ca17ab4..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_priv.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_priv.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,172 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- *</div><div class='del'>- * Microchip KSZ series switch common definitions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017-2019 Microchip Technology Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __KSZ_PRIV_H</div><div class='del'>-#define __KSZ_PRIV_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/mutex.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-</div><div class='del'>-struct ksz_io_ops;</div><div class='del'>-</div><div class='del'>-struct vlan_table {</div><div class='del'>-	u32 table[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ksz_port_mib {</div><div class='del'>-	struct mutex cnt_mutex;		/* structure access */</div><div class='del'>-	u8 cnt_ptr;</div><div class='del'>-	u64 *counters;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ksz_port {</div><div class='del'>-	u16 member;</div><div class='del'>-	u16 vid_member;</div><div class='del'>-	int stp_state;</div><div class='del'>-	struct phy_device phydev;</div><div class='del'>-</div><div class='del'>-	u32 on:1;			/* port is not disabled by hardware */</div><div class='del'>-	u32 phy:1;			/* port has a PHY */</div><div class='del'>-	u32 fiber:1;			/* port is fiber */</div><div class='del'>-	u32 sgmii:1;			/* port is SGMII */</div><div class='del'>-	u32 force:1;</div><div class='del'>-	u32 read:1;			/* read MIB counters in background */</div><div class='del'>-	u32 freeze:1;			/* MIB counter freeze is enabled */</div><div class='del'>-</div><div class='del'>-	struct ksz_port_mib mib;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ksz_device {</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct ksz_platform_data *pdata;</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	struct mutex dev_mutex;		/* device access */</div><div class='del'>-	struct mutex reg_mutex;		/* register access */</div><div class='del'>-	struct mutex stats_mutex;	/* status access */</div><div class='del'>-	struct mutex alu_mutex;		/* ALU access */</div><div class='del'>-	struct mutex vlan_mutex;	/* vlan access */</div><div class='del'>-	const struct ksz_io_ops *ops;</div><div class='del'>-	const struct ksz_dev_ops *dev_ops;</div><div class='del'>-</div><div class='del'>-	struct device *dev;</div><div class='del'>-</div><div class='del'>-	void *priv;</div><div class='del'>-</div><div class='del'>-	struct gpio_desc *reset_gpio;	/* Optional reset GPIO */</div><div class='del'>-</div><div class='del'>-	/* chip specific data */</div><div class='del'>-	u32 chip_id;</div><div class='del'>-	int num_vlans;</div><div class='del'>-	int num_alus;</div><div class='del'>-	int num_statics;</div><div class='del'>-	int cpu_port;			/* port connected to CPU */</div><div class='del'>-	int cpu_ports;			/* port bitmap can be cpu port */</div><div class='del'>-	int phy_port_cnt;</div><div class='del'>-	int port_cnt;</div><div class='del'>-	int reg_mib_cnt;</div><div class='del'>-	int mib_cnt;</div><div class='del'>-	int mib_port_cnt;</div><div class='del'>-	int last_port;			/* ports after that not used */</div><div class='del'>-	phy_interface_t interface;</div><div class='del'>-	u32 regs_size;</div><div class='del'>-</div><div class='del'>-	struct vlan_table *vlan_cache;</div><div class='del'>-</div><div class='del'>-	u8 *txbuf;</div><div class='del'>-</div><div class='del'>-	struct ksz_port *ports;</div><div class='del'>-	struct timer_list mib_read_timer;</div><div class='del'>-	struct work_struct mib_read;</div><div class='del'>-	unsigned long mib_read_interval;</div><div class='del'>-	u16 br_member;</div><div class='del'>-	u16 member;</div><div class='del'>-	u16 live_ports;</div><div class='del'>-	u16 on_ports;			/* ports enabled by DSA */</div><div class='del'>-	u16 rx_ports;</div><div class='del'>-	u16 tx_ports;</div><div class='del'>-	u16 mirror_rx;</div><div class='del'>-	u16 mirror_tx;</div><div class='del'>-	u32 features;			/* chip specific features */</div><div class='del'>-	u32 overrides;			/* chip functions set by user */</div><div class='del'>-	u16 host_mask;</div><div class='del'>-	u16 port_mask;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ksz_io_ops {</div><div class='del'>-	int (*read8)(struct ksz_device *dev, u32 reg, u8 *value);</div><div class='del'>-	int (*read16)(struct ksz_device *dev, u32 reg, u16 *value);</div><div class='del'>-	int (*read24)(struct ksz_device *dev, u32 reg, u32 *value);</div><div class='del'>-	int (*read32)(struct ksz_device *dev, u32 reg, u32 *value);</div><div class='del'>-	int (*write8)(struct ksz_device *dev, u32 reg, u8 value);</div><div class='del'>-	int (*write16)(struct ksz_device *dev, u32 reg, u16 value);</div><div class='del'>-	int (*write24)(struct ksz_device *dev, u32 reg, u32 value);</div><div class='del'>-	int (*write32)(struct ksz_device *dev, u32 reg, u32 value);</div><div class='del'>-	int (*get)(struct ksz_device *dev, u32 reg, void *data, size_t len);</div><div class='del'>-	int (*set)(struct ksz_device *dev, u32 reg, void *data, size_t len);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct alu_struct {</div><div class='del'>-	/* entry 1 */</div><div class='del'>-	u8	is_static:1;</div><div class='del'>-	u8	is_src_filter:1;</div><div class='del'>-	u8	is_dst_filter:1;</div><div class='del'>-	u8	prio_age:3;</div><div class='del'>-	u32	_reserv_0_1:23;</div><div class='del'>-	u8	mstp:3;</div><div class='del'>-	/* entry 2 */</div><div class='del'>-	u8	is_override:1;</div><div class='del'>-	u8	is_use_fid:1;</div><div class='del'>-	u32	_reserv_1_1:23;</div><div class='del'>-	u8	port_forward:7;</div><div class='del'>-	/* entry 3 &amp; 4*/</div><div class='del'>-	u32	_reserv_2_1:9;</div><div class='del'>-	u8	fid:7;</div><div class='del'>-	u8	mac[ETH_ALEN];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ksz_dev_ops {</div><div class='del'>-	u32 (*get_port_addr)(int port, int offset);</div><div class='del'>-	void (*cfg_port_member)(struct ksz_device *dev, int port, u8 member);</div><div class='del'>-	void (*flush_dyn_mac_table)(struct ksz_device *dev, int port);</div><div class='del'>-	void (*phy_setup)(struct ksz_device *dev, int port,</div><div class='del'>-			  struct phy_device *phy);</div><div class='del'>-	void (*port_cleanup)(struct ksz_device *dev, int port);</div><div class='del'>-	void (*port_setup)(struct ksz_device *dev, int port, bool cpu_port);</div><div class='del'>-	void (*r_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 *val);</div><div class='del'>-	void (*w_phy)(struct ksz_device *dev, u16 phy, u16 reg, u16 val);</div><div class='del'>-	int (*r_dyn_mac_table)(struct ksz_device *dev, u16 addr, u8 *mac_addr,</div><div class='del'>-			       u8 *fid, u8 *src_port, u8 *timestamp,</div><div class='del'>-			       u16 *entries);</div><div class='del'>-	int (*r_sta_mac_table)(struct ksz_device *dev, u16 addr,</div><div class='del'>-			       struct alu_struct *alu);</div><div class='del'>-	void (*w_sta_mac_table)(struct ksz_device *dev, u16 addr,</div><div class='del'>-				struct alu_struct *alu);</div><div class='del'>-	void (*r_mib_cnt)(struct ksz_device *dev, int port, u16 addr,</div><div class='del'>-			  u64 *cnt);</div><div class='del'>-	void (*r_mib_pkt)(struct ksz_device *dev, int port, u16 addr,</div><div class='del'>-			  u64 *dropped, u64 *cnt);</div><div class='del'>-	void (*freeze_mib)(struct ksz_device *dev, int port, bool freeze);</div><div class='del'>-	void (*port_init_cnt)(struct ksz_device *dev, int port);</div><div class='del'>-	int (*shutdown)(struct ksz_device *dev);</div><div class='del'>-	int (*detect)(struct ksz_device *dev);</div><div class='del'>-	int (*init)(struct ksz_device *dev);</div><div class='del'>-	void (*exit)(struct ksz_device *dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ksz_device *ksz_switch_alloc(struct device *base,</div><div class='del'>-				    const struct ksz_io_ops *ops, void *priv);</div><div class='del'>-int ksz_switch_register(struct ksz_device *dev,</div><div class='del'>-			const struct ksz_dev_ops *ops);</div><div class='del'>-void ksz_switch_remove(struct ksz_device *dev);</div><div class='del'>-</div><div class='del'>-int ksz9477_switch_register(struct ksz_device *dev);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c<br/>new file mode 100644<br/>index 000000000000..997e4a76d0a6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_ptp.c</a></div><div class='hunk'>@@ -0,0 +1,1188 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Microchip KSZ PTP Implementation</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2020 ARRI Lighting</div><div class='add'>+ * Copyright (C) 2022 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dsa/ksz_common.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+#include "ksz_ptp.h"</div><div class='add'>+#include "ksz_ptp_reg.h"</div><div class='add'>+</div><div class='add'>+#define ptp_caps_to_data(d) container_of((d), struct ksz_ptp_data, caps)</div><div class='add'>+#define ptp_data_to_ksz_dev(d) container_of((d), struct ksz_device, ptp_data)</div><div class='add'>+#define work_to_xmit_work(w) \</div><div class='add'>+		container_of((w), struct ksz_deferred_xmit_work, work)</div><div class='add'>+</div><div class='add'>+/* Sub-nanoseconds-adj,max * sub-nanoseconds / 40ns * 1ns</div><div class='add'>+ * = (2^30-1) * (2 ^ 32) / 40 ns * 1 ns = 6249999</div><div class='add'>+ */</div><div class='add'>+#define KSZ_MAX_DRIFT_CORR 6249999</div><div class='add'>+#define KSZ_MAX_PULSE_WIDTH 125000000LL</div><div class='add'>+</div><div class='add'>+#define KSZ_PTP_INC_NS 40ULL  /* HW clock is incremented every 40 ns (by 40) */</div><div class='add'>+#define KSZ_PTP_SUBNS_BITS 32</div><div class='add'>+</div><div class='add'>+#define KSZ_PTP_INT_START 13</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_tou_gpio(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!is_lan937x(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw32(dev, REG_PTP_CTRL_STAT__4, GPIO_OUT,</div><div class='add'>+			GPIO_OUT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw32(dev, REG_SW_GLOBAL_LED_OVR__4, LED_OVR_1 | LED_OVR_2,</div><div class='add'>+			LED_OVR_1 | LED_OVR_2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_rmw32(dev, REG_SW_GLOBAL_LED_SRC__4,</div><div class='add'>+			 LED_SRC_PTP_GPIO_1 | LED_SRC_PTP_GPIO_2,</div><div class='add'>+			 LED_SRC_PTP_GPIO_1 | LED_SRC_PTP_GPIO_2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_tou_reset(struct ksz_device *dev, u8 unit)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Reset trigger unit (clears TRIGGER_EN, but not GPIOSTATx) */</div><div class='add'>+	ret = ksz_rmw32(dev, REG_PTP_CTRL_STAT__4, TRIG_RESET, TRIG_RESET);</div><div class='add'>+</div><div class='add'>+	data = FIELD_PREP(TRIG_DONE_M, BIT(unit));</div><div class='add'>+	ret = ksz_write32(dev, REG_PTP_TRIG_STATUS__4, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data = FIELD_PREP(TRIG_INT_M, BIT(unit));</div><div class='add'>+	ret = ksz_write32(dev, REG_PTP_INT_STATUS__4, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Clear reset and set GPIO direction */</div><div class='add'>+	return ksz_rmw32(dev, REG_PTP_CTRL_STAT__4, (TRIG_RESET | TRIG_ENABLE),</div><div class='add'>+			 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_tou_pulse_verify(u64 pulse_ns)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	if (pulse_ns &amp; 0x3)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data = (pulse_ns / 8);</div><div class='add'>+	if (!FIELD_FIT(TRIG_PULSE_WIDTH_M, data))</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_tou_target_time_set(struct ksz_device *dev,</div><div class='add'>+				       struct timespec64 const *ts)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Hardware has only 32 bit */</div><div class='add'>+	if ((ts-&gt;tv_sec &amp; 0xffffffff) != ts-&gt;tv_sec)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_TRIG_TARGET_NANOSEC, ts-&gt;tv_nsec);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_TRIG_TARGET_SEC, ts-&gt;tv_sec);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_tou_start(struct ksz_device *dev, u8 unit)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw32(dev, REG_PTP_CTRL_STAT__4, TRIG_ENABLE, TRIG_ENABLE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check error flag:</div><div class='add'>+	 * - the ACTIVE flag is NOT cleared an error!</div><div class='add'>+	 */</div><div class='add'>+	ret = ksz_read32(dev, REG_PTP_TRIG_STATUS__4, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (FIELD_GET(TRIG_ERROR_M, data) &amp; (1 &lt;&lt; unit)) {</div><div class='add'>+		dev_err(dev-&gt;dev, "%s: Trigger unit%d error!\n", __func__,</div><div class='add'>+			unit);</div><div class='add'>+		ret = -EIO;</div><div class='add'>+		/* Unit will be reset on next access */</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_configure_perout(struct ksz_device *dev,</div><div class='add'>+				    u32 cycle_width_ns, u32 pulse_width_ns,</div><div class='add'>+				    struct timespec64 const *target_time,</div><div class='add'>+				    u8 index)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data = FIELD_PREP(TRIG_NOTIFY, 1) |</div><div class='add'>+		FIELD_PREP(TRIG_GPO_M, index) |</div><div class='add'>+		FIELD_PREP(TRIG_PATTERN_M, TRIG_POS_PERIOD);</div><div class='add'>+	ret = ksz_write32(dev, REG_TRIG_CTRL__4, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_TRIG_CYCLE_WIDTH, cycle_width_ns);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set cycle count 0 - Infinite */</div><div class='add'>+	ret = ksz_rmw32(dev, REG_TRIG_CYCLE_CNT, TRIG_CYCLE_CNT_M, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data = (pulse_width_ns / 8);</div><div class='add'>+	ret = ksz_write32(dev, REG_TRIG_PULSE_WIDTH__4, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_tou_target_time_set(dev, target_time);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_enable_perout(struct ksz_device *dev,</div><div class='add'>+				 struct ptp_perout_request const *request,</div><div class='add'>+				 int on)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+	u64 req_pulse_width_ns;</div><div class='add'>+	u64 cycle_width_ns;</div><div class='add'>+	u64 pulse_width_ns;</div><div class='add'>+	int pin = 0;</div><div class='add'>+	u32 data32;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (request-&gt;flags &amp; ~PTP_PEROUT_DUTY_CYCLE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (ptp_data-&gt;tou_mode != KSZ_PTP_TOU_PEROUT &amp;&amp;</div><div class='add'>+	    ptp_data-&gt;tou_mode != KSZ_PTP_TOU_IDLE)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	pin = ptp_find_pin(ptp_data-&gt;clock, PTP_PF_PEROUT, request-&gt;index);</div><div class='add'>+	if (pin &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data32 = FIELD_PREP(PTP_GPIO_INDEX, pin) |</div><div class='add'>+		 FIELD_PREP(PTP_TOU_INDEX, request-&gt;index);</div><div class='add'>+	ret = ksz_rmw32(dev, REG_PTP_UNIT_INDEX__4,</div><div class='add'>+			PTP_GPIO_INDEX | PTP_TOU_INDEX, data32);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_tou_reset(dev, request-&gt;index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!on) {</div><div class='add'>+		ptp_data-&gt;tou_mode = KSZ_PTP_TOU_IDLE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;perout_target_time_first.tv_sec  = request-&gt;start.sec;</div><div class='add'>+	ptp_data-&gt;perout_target_time_first.tv_nsec = request-&gt;start.nsec;</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;perout_period.tv_sec = request-&gt;period.sec;</div><div class='add'>+	ptp_data-&gt;perout_period.tv_nsec = request-&gt;period.nsec;</div><div class='add'>+</div><div class='add'>+	cycle_width_ns = timespec64_to_ns(&amp;ptp_data-&gt;perout_period);</div><div class='add'>+	if ((cycle_width_ns &amp; TRIG_CYCLE_WIDTH_M) != cycle_width_ns)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (request-&gt;flags &amp; PTP_PEROUT_DUTY_CYCLE) {</div><div class='add'>+		pulse_width_ns = request-&gt;on.sec * NSEC_PER_SEC +</div><div class='add'>+			request-&gt;on.nsec;</div><div class='add'>+	} else {</div><div class='add'>+		/* Use a duty cycle of 50%. Maximum pulse width supported by the</div><div class='add'>+		 * hardware is a little bit more than 125 ms.</div><div class='add'>+		 */</div><div class='add'>+		req_pulse_width_ns = (request-&gt;period.sec * NSEC_PER_SEC +</div><div class='add'>+				      request-&gt;period.nsec) / 2;</div><div class='add'>+		pulse_width_ns = min_t(u64, req_pulse_width_ns,</div><div class='add'>+				       KSZ_MAX_PULSE_WIDTH);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_tou_pulse_verify(pulse_width_ns);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_configure_perout(dev, cycle_width_ns, pulse_width_ns,</div><div class='add'>+				       &amp;ptp_data-&gt;perout_target_time_first,</div><div class='add'>+				       pin);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_tou_gpio(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_tou_start(dev, request-&gt;index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;tou_mode = KSZ_PTP_TOU_PEROUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_enable_mode(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_tagger_data *tagger_data = ksz_tagger_data(dev-&gt;ds);</div><div class='add'>+	struct ksz_ptp_data *ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+	struct ksz_port *prt;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	bool tag_en = false;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, dev-&gt;ds) {</div><div class='add'>+		prt = &amp;dev-&gt;ports[dp-&gt;index];</div><div class='add'>+		if (prt-&gt;hwts_tx_en || prt-&gt;hwts_rx_en) {</div><div class='add'>+			tag_en = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tag_en) {</div><div class='add'>+		ptp_schedule_worker(ptp_data-&gt;clock, 0);</div><div class='add'>+	} else {</div><div class='add'>+		ptp_cancel_worker_sync(ptp_data-&gt;clock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tagger_data-&gt;hwtstamp_set_state(dev-&gt;ds, tag_en);</div><div class='add'>+</div><div class='add'>+	return ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_ENABLE,</div><div class='add'>+			 tag_en ? PTP_ENABLE : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The function is return back the capability of timestamping feature when</div><div class='add'>+ * requested through ethtool -T &lt;interface&gt; utility</div><div class='add'>+ */</div><div class='add'>+int ksz_get_ts_info(struct dsa_switch *ds, int port, struct kernel_ethtool_ts_info *ts)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_ptp_data *ptp_data;</div><div class='add'>+</div><div class='add'>+	ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	if (!ptp_data-&gt;clock)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ts-&gt;so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+			      SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+			      SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+</div><div class='add'>+	ts-&gt;tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ONESTEP_P2P);</div><div class='add'>+</div><div class='add'>+	if (is_lan937x(dev))</div><div class='add'>+		ts-&gt;tx_types |= BIT(HWTSTAMP_TX_ON);</div><div class='add'>+</div><div class='add'>+	ts-&gt;rx_filters = BIT(HWTSTAMP_FILTER_NONE) |</div><div class='add'>+			 BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |</div><div class='add'>+			 BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |</div><div class='add'>+			 BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);</div><div class='add'>+</div><div class='add'>+	ts-&gt;phc_index = ptp_clock_index(ptp_data-&gt;clock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+		     struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *prt;</div><div class='add'>+</div><div class='add'>+	prt = &amp;dev-&gt;ports[port];</div><div class='add'>+	*config = prt-&gt;tstamp_config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_set_hwtstamp_config(struct ksz_device *dev,</div><div class='add'>+				   struct ksz_port *prt,</div><div class='add'>+				   struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (config-&gt;flags)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_SYNC_MSG].ts_en  = false;</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_XDREQ_MSG].ts_en = false;</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_PDRES_MSG].ts_en = false;</div><div class='add'>+		prt-&gt;hwts_tx_en = false;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_TX_ONESTEP_P2P:</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_SYNC_MSG].ts_en  = false;</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_XDREQ_MSG].ts_en = true;</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_PDRES_MSG].ts_en = false;</div><div class='add'>+		prt-&gt;hwts_tx_en = true;</div><div class='add'>+</div><div class='add'>+		ret = ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_1STEP, PTP_1STEP);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		if (!is_lan937x(dev))</div><div class='add'>+			return -ERANGE;</div><div class='add'>+</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_SYNC_MSG].ts_en  = true;</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_XDREQ_MSG].ts_en = true;</div><div class='add'>+		prt-&gt;ptpmsg_irq[KSZ_PDRES_MSG].ts_en = true;</div><div class='add'>+		prt-&gt;hwts_tx_en = true;</div><div class='add'>+</div><div class='add'>+		ret = ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_1STEP, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		prt-&gt;hwts_rx_en = false;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;</div><div class='add'>+		prt-&gt;hwts_rx_en = true;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;</div><div class='add'>+		prt-&gt;hwts_rx_en = true;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		prt-&gt;hwts_rx_en = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ksz_ptp_enable_mode(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+		     struct kernel_hwtstamp_config *config,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *prt;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	prt = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	ret = ksz_set_hwtstamp_config(dev, prt, config);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	prt-&gt;tstamp_config = *config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ktime_t ksz_tstamp_reconstruct(struct ksz_device *dev, ktime_t tstamp)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 ptp_clock_time;</div><div class='add'>+	struct ksz_ptp_data *ptp_data;</div><div class='add'>+	struct timespec64 diff;</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+</div><div class='add'>+	ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+	ts = ktime_to_timespec64(tstamp);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+	ptp_clock_time = ptp_data-&gt;clock_time;</div><div class='add'>+	spin_unlock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+</div><div class='add'>+	/* calculate full time from partial time stamp */</div><div class='add'>+	ts.tv_sec = (ptp_clock_time.tv_sec &amp; ~3) | ts.tv_sec;</div><div class='add'>+</div><div class='add'>+	/* find nearest possible point in time */</div><div class='add'>+	diff = timespec64_sub(ts, ptp_clock_time);</div><div class='add'>+	if (diff.tv_sec &gt; 2)</div><div class='add'>+		ts.tv_sec -= 4;</div><div class='add'>+	else if (diff.tv_sec &lt; -2)</div><div class='add'>+		ts.tv_sec += 4;</div><div class='add'>+</div><div class='add'>+	return timespec64_to_ktime(ts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool ksz_port_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb,</div><div class='add'>+		       unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb);</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ptp_header *ptp_hdr;</div><div class='add'>+	struct ksz_port *prt;</div><div class='add'>+	u8 ptp_msg_type;</div><div class='add'>+	ktime_t tstamp;</div><div class='add'>+	s64 correction;</div><div class='add'>+</div><div class='add'>+	prt = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	tstamp = KSZ_SKB_CB(skb)-&gt;tstamp;</div><div class='add'>+	memset(hwtstamps, 0, sizeof(*hwtstamps));</div><div class='add'>+	hwtstamps-&gt;hwtstamp = ksz_tstamp_reconstruct(dev, tstamp);</div><div class='add'>+</div><div class='add'>+	if (prt-&gt;tstamp_config.tx_type != HWTSTAMP_TX_ONESTEP_P2P)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ptp_hdr = ptp_parse_header(skb, type);</div><div class='add'>+	if (!ptp_hdr)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ptp_msg_type = ptp_get_msgtype(ptp_hdr, type);</div><div class='add'>+	if (ptp_msg_type != PTP_MSGTYPE_PDELAY_REQ)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Only subtract the partial time stamp from the correction field.  When</div><div class='add'>+	 * the hardware adds the egress time stamp to the correction field of</div><div class='add'>+	 * the PDelay_Resp message on tx, also only the partial time stamp will</div><div class='add'>+	 * be added.</div><div class='add'>+	 */</div><div class='add'>+	correction = (s64)get_unaligned_be64(&amp;ptp_hdr-&gt;correction);</div><div class='add'>+	correction -= ktime_to_ns(tstamp) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	ptp_header_update_correction(skb, type, ptp_hdr, correction);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz_port_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+	struct sk_buff *clone;</div><div class='add'>+	struct ksz_port *prt;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	u8 ptp_msg_type;</div><div class='add'>+</div><div class='add'>+	prt = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	if (!prt-&gt;hwts_tx_en)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	type = ptp_classify_raw(skb);</div><div class='add'>+	if (type == PTP_CLASS_NONE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hdr = ptp_parse_header(skb, type);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ptp_msg_type = ptp_get_msgtype(hdr, type);</div><div class='add'>+</div><div class='add'>+	switch (ptp_msg_type) {</div><div class='add'>+	case PTP_MSGTYPE_SYNC:</div><div class='add'>+		if (prt-&gt;tstamp_config.tx_type == HWTSTAMP_TX_ONESTEP_P2P)</div><div class='add'>+			return;</div><div class='add'>+		break;</div><div class='add'>+	case PTP_MSGTYPE_PDELAY_REQ:</div><div class='add'>+		break;</div><div class='add'>+	case PTP_MSGTYPE_PDELAY_RESP:</div><div class='add'>+		if (prt-&gt;tstamp_config.tx_type == HWTSTAMP_TX_ONESTEP_P2P) {</div><div class='add'>+			KSZ_SKB_CB(skb)-&gt;ptp_type = type;</div><div class='add'>+			KSZ_SKB_CB(skb)-&gt;update_correction = true;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clone = skb_clone_sk(skb);</div><div class='add'>+	if (!clone)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* caching the value to be used in tag_ksz.c */</div><div class='add'>+	KSZ_SKB_CB(skb)-&gt;clone = clone;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_ptp_txtstamp_skb(struct ksz_device *dev,</div><div class='add'>+				 struct ksz_port *prt, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps hwtstamps = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* timeout must include DSA conduit to transmit data, tstamp latency,</div><div class='add'>+	 * IRQ latency and time for reading the time stamp.</div><div class='add'>+	 */</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;prt-&gt;tstamp_msg_comp,</div><div class='add'>+					  msecs_to_jiffies(100));</div><div class='add'>+	if (!ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hwtstamps.hwtstamp = prt-&gt;tstamp_msg;</div><div class='add'>+	skb_complete_tx_timestamp(skb, &amp;hwtstamps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz_port_deferred_xmit(struct kthread_work *work)</div><div class='add'>+{</div><div class='add'>+	struct ksz_deferred_xmit_work *xmit_work = work_to_xmit_work(work);</div><div class='add'>+	struct sk_buff *clone, *skb = xmit_work-&gt;skb;</div><div class='add'>+	struct dsa_switch *ds = xmit_work-&gt;dp-&gt;ds;</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *prt;</div><div class='add'>+</div><div class='add'>+	prt = &amp;dev-&gt;ports[xmit_work-&gt;dp-&gt;index];</div><div class='add'>+</div><div class='add'>+	clone = KSZ_SKB_CB(skb)-&gt;clone;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(clone)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;prt-&gt;tstamp_msg_comp);</div><div class='add'>+</div><div class='add'>+	dsa_enqueue_skb(skb, skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ksz_ptp_txtstamp_skb(dev, prt, clone);</div><div class='add'>+</div><div class='add'>+	kfree(xmit_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int _ksz_ptp_gettime(struct ksz_device *dev, struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	u32 nanoseconds;</div><div class='add'>+	u32 seconds;</div><div class='add'>+	u8 phase;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Copy current PTP clock into shadow registers and read */</div><div class='add'>+	ret = ksz_rmw16(dev, REG_PTP_CLK_CTRL, PTP_READ_TIME, PTP_READ_TIME);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read8(dev, REG_PTP_RTC_SUB_NANOSEC__2, &amp;phase);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read32(dev, REG_PTP_RTC_NANOSEC, &amp;nanoseconds);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read32(dev, REG_PTP_RTC_SEC, &amp;seconds);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ts-&gt;tv_sec = seconds;</div><div class='add'>+	ts-&gt;tv_nsec = nanoseconds + phase * 8;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct ksz_device *dev = ptp_data_to_ksz_dev(ptp_data);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+	ret = _ksz_ptp_gettime(dev, ts);</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_restart_perout(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+	s64 now_ns, first_ns, period_ns, next_ns;</div><div class='add'>+	struct ptp_perout_request request;</div><div class='add'>+	struct timespec64 next;</div><div class='add'>+	struct timespec64 now;</div><div class='add'>+	unsigned int count;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_info(dev-&gt;dev, "Restarting periodic output signal\n");</div><div class='add'>+</div><div class='add'>+	ret = _ksz_ptp_gettime(dev, &amp;now);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	now_ns = timespec64_to_ns(&amp;now);</div><div class='add'>+	first_ns = timespec64_to_ns(&amp;ptp_data-&gt;perout_target_time_first);</div><div class='add'>+</div><div class='add'>+	/* Calculate next perout event based on start time and period */</div><div class='add'>+	period_ns = timespec64_to_ns(&amp;ptp_data-&gt;perout_period);</div><div class='add'>+</div><div class='add'>+	if (first_ns &lt; now_ns) {</div><div class='add'>+		count = div_u64(now_ns - first_ns, period_ns);</div><div class='add'>+		next_ns = first_ns + count * period_ns;</div><div class='add'>+	} else {</div><div class='add'>+		next_ns = first_ns;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure 100 ms guard time prior next event */</div><div class='add'>+	while (next_ns &lt; now_ns + 100000000)</div><div class='add'>+		next_ns += period_ns;</div><div class='add'>+</div><div class='add'>+	/* Restart periodic output signal */</div><div class='add'>+	next = ns_to_timespec64(next_ns);</div><div class='add'>+	request.start.sec  = next.tv_sec;</div><div class='add'>+	request.start.nsec = next.tv_nsec;</div><div class='add'>+	request.period.sec  = ptp_data-&gt;perout_period.tv_sec;</div><div class='add'>+	request.period.nsec = ptp_data-&gt;perout_period.tv_nsec;</div><div class='add'>+	request.index = 0;</div><div class='add'>+	request.flags = 0;</div><div class='add'>+</div><div class='add'>+	return ksz_ptp_enable_perout(dev, &amp;request, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_settime(struct ptp_clock_info *ptp,</div><div class='add'>+			   const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct ksz_device *dev = ptp_data_to_ksz_dev(ptp_data);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Write to shadow registers and Load PTP clock */</div><div class='add'>+	ret = ksz_write16(dev, REG_PTP_RTC_SUB_NANOSEC__2, PTP_RTC_0NS);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_PTP_RTC_NANOSEC, ts-&gt;tv_nsec);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_PTP_RTC_SEC, ts-&gt;tv_sec);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw16(dev, REG_PTP_CLK_CTRL, PTP_LOAD_TIME, PTP_LOAD_TIME);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	switch (ptp_data-&gt;tou_mode) {</div><div class='add'>+	case KSZ_PTP_TOU_IDLE:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KSZ_PTP_TOU_PEROUT:</div><div class='add'>+		ret = ksz_ptp_restart_perout(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+	ptp_data-&gt;clock_time = *ts;</div><div class='add'>+	spin_unlock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct ksz_device *dev = ptp_data_to_ksz_dev(ptp_data);</div><div class='add'>+	u64 base, adj;</div><div class='add'>+	bool negative;</div><div class='add'>+	u32 data32;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (scaled_ppm) {</div><div class='add'>+		base = KSZ_PTP_INC_NS &lt;&lt; KSZ_PTP_SUBNS_BITS;</div><div class='add'>+		negative = diff_by_scaled_ppm(base, scaled_ppm, &amp;adj);</div><div class='add'>+</div><div class='add'>+		data32 = (u32)adj;</div><div class='add'>+		data32 &amp;= PTP_SUBNANOSEC_M;</div><div class='add'>+		if (!negative)</div><div class='add'>+			data32 |= PTP_RATE_DIR;</div><div class='add'>+</div><div class='add'>+		ret = ksz_write32(dev, REG_PTP_SUBNANOSEC_RATE, data32);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		ret = ksz_rmw16(dev, REG_PTP_CLK_CTRL, PTP_CLK_ADJ_ENABLE,</div><div class='add'>+				PTP_CLK_ADJ_ENABLE);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='add'>+	} else {</div><div class='add'>+		ret = ksz_rmw16(dev, REG_PTP_CLK_CTRL, PTP_CLK_ADJ_ENABLE, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct ksz_device *dev = ptp_data_to_ksz_dev(ptp_data);</div><div class='add'>+	struct timespec64 delta64 = ns_to_timespec64(delta);</div><div class='add'>+	s32 sec, nsec;</div><div class='add'>+	u16 data16;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* do not use ns_to_timespec64(),</div><div class='add'>+	 * both sec and nsec are subtracted by hw</div><div class='add'>+	 */</div><div class='add'>+	sec = div_s64_rem(delta, NSEC_PER_SEC, &amp;nsec);</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_PTP_RTC_NANOSEC, abs(nsec));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_PTP_RTC_SEC, abs(sec));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read16(dev, REG_PTP_CLK_CTRL, &amp;data16);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	data16 |= PTP_STEP_ADJ;</div><div class='add'>+</div><div class='add'>+	/* PTP_STEP_DIR -- 0: subtract, 1: add */</div><div class='add'>+	if (delta &lt; 0)</div><div class='add'>+		data16 &amp;= ~PTP_STEP_DIR;</div><div class='add'>+	else</div><div class='add'>+		data16 |= PTP_STEP_DIR;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write16(dev, REG_PTP_CLK_CTRL, data16);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	switch (ptp_data-&gt;tou_mode) {</div><div class='add'>+	case KSZ_PTP_TOU_IDLE:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case KSZ_PTP_TOU_PEROUT:</div><div class='add'>+		ret = ksz_ptp_restart_perout(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+	ptp_data-&gt;clock_time = timespec64_add(ptp_data-&gt;clock_time, delta64);</div><div class='add'>+	spin_unlock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_enable(struct ptp_clock_info *ptp,</div><div class='add'>+			  struct ptp_clock_request *req, int on)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct ksz_device *dev = ptp_data_to_ksz_dev(ptp_data);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (req-&gt;type) {</div><div class='add'>+	case PTP_CLK_REQ_PEROUT:</div><div class='add'>+		mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+		ret = ksz_ptp_enable_perout(dev, &amp;req-&gt;perout, on);</div><div class='add'>+		mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin,</div><div class='add'>+			      enum ptp_pin_function func, unsigned int chan)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (func) {</div><div class='add'>+	case PTP_PF_NONE:</div><div class='add'>+	case PTP_PF_PEROUT:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*  Function is pointer to the do_aux_work in the ptp_clock capability */</div><div class='add'>+static long ksz_ptp_do_aux_work(struct ptp_clock_info *ptp)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct ksz_device *dev = ptp_data_to_ksz_dev(ptp_data);</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+	ret = _ksz_ptp_gettime(dev, &amp;ts);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+	ptp_data-&gt;clock_time = ts;</div><div class='add'>+	spin_unlock_bh(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return HZ;  /* reschedule in 1 second */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_start_clock(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_data *ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw16(dev, REG_PTP_CLK_CTRL, PTP_CLK_ENABLE, PTP_CLK_ENABLE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;clock_time.tv_sec = 0;</div><div class='add'>+	ptp_data-&gt;clock_time.tv_nsec = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz_ptp_clock_register(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_ptp_data *ptp_data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+	mutex_init(&amp;ptp_data-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;ptp_data-&gt;clock_lock);</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;caps.owner		= THIS_MODULE;</div><div class='add'>+	snprintf(ptp_data-&gt;caps.name, 16, "Microchip Clock");</div><div class='add'>+	ptp_data-&gt;caps.max_adj		= KSZ_MAX_DRIFT_CORR;</div><div class='add'>+	ptp_data-&gt;caps.gettime64	= ksz_ptp_gettime;</div><div class='add'>+	ptp_data-&gt;caps.settime64	= ksz_ptp_settime;</div><div class='add'>+	ptp_data-&gt;caps.adjfine		= ksz_ptp_adjfine;</div><div class='add'>+	ptp_data-&gt;caps.adjtime		= ksz_ptp_adjtime;</div><div class='add'>+	ptp_data-&gt;caps.do_aux_work	= ksz_ptp_do_aux_work;</div><div class='add'>+	ptp_data-&gt;caps.enable		= ksz_ptp_enable;</div><div class='add'>+	ptp_data-&gt;caps.verify		= ksz_ptp_verify_pin;</div><div class='add'>+	ptp_data-&gt;caps.n_pins		= KSZ_PTP_N_GPIO;</div><div class='add'>+	ptp_data-&gt;caps.n_per_out	= 3;</div><div class='add'>+</div><div class='add'>+	ret = ksz_ptp_start_clock(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; KSZ_PTP_N_GPIO; i++) {</div><div class='add'>+		struct ptp_pin_desc *ptp_pin = &amp;ptp_data-&gt;pin_config[i];</div><div class='add'>+</div><div class='add'>+		snprintf(ptp_pin-&gt;name,</div><div class='add'>+			 sizeof(ptp_pin-&gt;name), "ksz_ptp_pin_%02d", i);</div><div class='add'>+		ptp_pin-&gt;index = i;</div><div class='add'>+		ptp_pin-&gt;func = PTP_PF_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;caps.pin_config = ptp_data-&gt;pin_config;</div><div class='add'>+</div><div class='add'>+	/* Currently only P2P mode is supported. When 802_1AS bit is set, it</div><div class='add'>+	 * forwards all PTP packets to host port and none to other ports.</div><div class='add'>+	 */</div><div class='add'>+	ret = ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_TC_P2P | PTP_802_1AS,</div><div class='add'>+			PTP_TC_P2P | PTP_802_1AS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;clock = ptp_clock_register(&amp;ptp_data-&gt;caps, dev-&gt;dev);</div><div class='add'>+	if (IS_ERR_OR_NULL(ptp_data-&gt;clock))</div><div class='add'>+		return PTR_ERR(ptp_data-&gt;clock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz_ptp_clock_unregister(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_ptp_data *ptp_data;</div><div class='add'>+</div><div class='add'>+	ptp_data = &amp;dev-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	if (ptp_data-&gt;clock)</div><div class='add'>+		ptp_clock_unregister(ptp_data-&gt;clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ksz_ptp_msg_thread_fn(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_irq *ptpmsg_irq = dev_id;</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+	struct ksz_port *port;</div><div class='add'>+	u32 tstamp_raw;</div><div class='add'>+	ktime_t tstamp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	port = ptpmsg_irq-&gt;port;</div><div class='add'>+	dev = port-&gt;ksz_dev;</div><div class='add'>+</div><div class='add'>+	if (ptpmsg_irq-&gt;ts_en) {</div><div class='add'>+		ret = ksz_read32(dev, ptpmsg_irq-&gt;ts_reg, &amp;tstamp_raw);</div><div class='add'>+		if (ret)</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+		tstamp = ksz_decode_tstamp(tstamp_raw);</div><div class='add'>+</div><div class='add'>+		port-&gt;tstamp_msg = ksz_tstamp_reconstruct(dev, tstamp);</div><div class='add'>+</div><div class='add'>+		complete(&amp;port-&gt;tstamp_msg_comp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ksz_ptp_irq_thread_fn(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *ptpirq = dev_id;</div><div class='add'>+	unsigned int nhandled = 0;</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+	unsigned int sub_irq;</div><div class='add'>+	u16 data;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 n;</div><div class='add'>+</div><div class='add'>+	dev = ptpirq-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read16(dev, ptpirq-&gt;reg_status, &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Clear the interrupts W1C */</div><div class='add'>+	ret = ksz_write16(dev, ptpirq-&gt;reg_status, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; ptpirq-&gt;nirqs; ++n) {</div><div class='add'>+		if (data &amp; BIT(n + KSZ_PTP_INT_START)) {</div><div class='add'>+			sub_irq = irq_find_mapping(ptpirq-&gt;domain, n);</div><div class='add'>+			handle_nested_irq(sub_irq);</div><div class='add'>+			++nhandled;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return (nhandled &gt; 0 ? IRQ_HANDLED : IRQ_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_ptp_irq_mask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	kirq-&gt;masked &amp;= ~BIT(d-&gt;hwirq + KSZ_PTP_INT_START);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_ptp_irq_unmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	kirq-&gt;masked |= BIT(d-&gt;hwirq + KSZ_PTP_INT_START);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_ptp_irq_bus_lock(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq  = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;kirq-&gt;dev-&gt;lock_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_ptp_irq_bus_sync_unlock(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ksz_irq *kirq  = irq_data_get_irq_chip_data(d);</div><div class='add'>+	struct ksz_device *dev = kirq-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write16(dev, kirq-&gt;reg_mask, kirq-&gt;masked);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to change IRQ mask\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;lock_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_chip ksz_ptp_irq_chip = {</div><div class='add'>+	.name			= "ksz-irq",</div><div class='add'>+	.irq_mask		= ksz_ptp_irq_mask,</div><div class='add'>+	.irq_unmask		= ksz_ptp_irq_unmask,</div><div class='add'>+	.irq_bus_lock		= ksz_ptp_irq_bus_lock,</div><div class='add'>+	.irq_bus_sync_unlock	= ksz_ptp_irq_bus_sync_unlock,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_irq_domain_map(struct irq_domain *d,</div><div class='add'>+				  unsigned int irq, irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	irq_set_chip_data(irq, d-&gt;host_data);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;ksz_ptp_irq_chip, handle_level_irq);</div><div class='add'>+	irq_set_noprobe(irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_domain_ops ksz_ptp_irq_domain_ops = {</div><div class='add'>+	.map	= ksz_ptp_irq_domain_map,</div><div class='add'>+	.xlate	= irq_domain_xlate_twocell,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void ksz_ptp_msg_irq_free(struct ksz_port *port, u8 n)</div><div class='add'>+{</div><div class='add'>+	struct ksz_ptp_irq *ptpmsg_irq;</div><div class='add'>+</div><div class='add'>+	ptpmsg_irq = &amp;port-&gt;ptpmsg_irq[n];</div><div class='add'>+</div><div class='add'>+	free_irq(ptpmsg_irq-&gt;num, ptpmsg_irq);</div><div class='add'>+	irq_dispose_mapping(ptpmsg_irq-&gt;num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz_ptp_msg_irq_setup(struct ksz_port *port, u8 n)</div><div class='add'>+{</div><div class='add'>+	u16 ts_reg[] = {REG_PTP_PORT_PDRESP_TS, REG_PTP_PORT_XDELAY_TS,</div><div class='add'>+			REG_PTP_PORT_SYNC_TS};</div><div class='add'>+	static const char * const name[] = {"pdresp-msg", "xdreq-msg",</div><div class='add'>+					    "sync-msg"};</div><div class='add'>+	const struct ksz_dev_ops *ops = port-&gt;ksz_dev-&gt;dev_ops;</div><div class='add'>+	struct ksz_irq *ptpirq = &amp;port-&gt;ptpirq;</div><div class='add'>+	struct ksz_ptp_irq *ptpmsg_irq;</div><div class='add'>+</div><div class='add'>+	ptpmsg_irq = &amp;port-&gt;ptpmsg_irq[n];</div><div class='add'>+	ptpmsg_irq-&gt;num = irq_create_mapping(ptpirq-&gt;domain, n);</div><div class='add'>+	if (!ptpmsg_irq-&gt;num)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ptpmsg_irq-&gt;port = port;</div><div class='add'>+	ptpmsg_irq-&gt;ts_reg = ops-&gt;get_port_addr(port-&gt;num, ts_reg[n]);</div><div class='add'>+</div><div class='add'>+	strscpy(ptpmsg_irq-&gt;name, name[n]);</div><div class='add'>+</div><div class='add'>+	return request_threaded_irq(ptpmsg_irq-&gt;num, NULL,</div><div class='add'>+				    ksz_ptp_msg_thread_fn, IRQF_ONESHOT,</div><div class='add'>+				    ptpmsg_irq-&gt;name, ptpmsg_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ksz_ptp_irq_setup(struct dsa_switch *ds, u8 p)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	const struct ksz_dev_ops *ops = dev-&gt;dev_ops;</div><div class='add'>+	struct ksz_port *port = &amp;dev-&gt;ports[p];</div><div class='add'>+	struct ksz_irq *ptpirq = &amp;port-&gt;ptpirq;</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ptpirq-&gt;dev = dev;</div><div class='add'>+	ptpirq-&gt;masked = 0;</div><div class='add'>+	ptpirq-&gt;nirqs = 3;</div><div class='add'>+	ptpirq-&gt;reg_mask = ops-&gt;get_port_addr(p, REG_PTP_PORT_TX_INT_ENABLE__2);</div><div class='add'>+	ptpirq-&gt;reg_status = ops-&gt;get_port_addr(p,</div><div class='add'>+						REG_PTP_PORT_TX_INT_STATUS__2);</div><div class='add'>+	snprintf(ptpirq-&gt;name, sizeof(ptpirq-&gt;name), "ptp-irq-%d", p);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;port-&gt;tstamp_msg_comp);</div><div class='add'>+</div><div class='add'>+	ptpirq-&gt;domain = irq_domain_create_linear(dev_fwnode(dev-&gt;dev), ptpirq-&gt;nirqs,</div><div class='add'>+						  &amp;ksz_ptp_irq_domain_ops, ptpirq);</div><div class='add'>+	if (!ptpirq-&gt;domain)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ptpirq-&gt;irq_num = irq_find_mapping(port-&gt;pirq.domain, PORT_SRC_PTP_INT);</div><div class='add'>+	if (!ptpirq-&gt;irq_num) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(ptpirq-&gt;irq_num, NULL, ksz_ptp_irq_thread_fn,</div><div class='add'>+				   IRQF_ONESHOT, ptpirq-&gt;name, ptpirq);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (irq = 0; irq &lt; ptpirq-&gt;nirqs; irq++) {</div><div class='add'>+		ret = ksz_ptp_msg_irq_setup(port, irq);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_ptp_msg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_ptp_msg:</div><div class='add'>+	free_irq(ptpirq-&gt;irq_num, ptpirq);</div><div class='add'>+	while (irq--) {</div><div class='add'>+		free_irq(port-&gt;ptpmsg_irq[irq].num, &amp;port-&gt;ptpmsg_irq[irq]);</div><div class='add'>+		irq_dispose_mapping(port-&gt;ptpmsg_irq[irq].num);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	irq_domain_remove(ptpirq-&gt;domain);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ksz_ptp_irq_free(struct dsa_switch *ds, u8 p)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct ksz_port *port = &amp;dev-&gt;ports[p];</div><div class='add'>+	struct ksz_irq *ptpirq = &amp;port-&gt;ptpirq;</div><div class='add'>+	u8 n;</div><div class='add'>+</div><div class='add'>+	for (n = 0; n &lt; ptpirq-&gt;nirqs; n++)</div><div class='add'>+		ksz_ptp_msg_irq_free(port, n);</div><div class='add'>+</div><div class='add'>+	free_irq(ptpirq-&gt;irq_num, ptpirq);</div><div class='add'>+	irq_dispose_mapping(ptpirq-&gt;irq_num);</div><div class='add'>+</div><div class='add'>+	irq_domain_remove(ptpirq-&gt;domain);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Christian Eggers &lt;ceggers@arri.de&gt;");</div><div class='add'>+MODULE_AUTHOR("Arun Ramadoss &lt;arun.ramadoss@microchip.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("PTP support for KSZ switch");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_ptp.h b/drivers/net/dsa/microchip/ksz_ptp.h<br/>new file mode 100644<br/>index 000000000000..3086e519b1b6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_ptp.h</a></div><div class='hunk'>@@ -0,0 +1,89 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Microchip KSZ PTP Implementation</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2020 ARRI Lighting</div><div class='add'>+ * Copyright (C) 2022 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _NET_DSA_DRIVERS_KSZ_PTP_H</div><div class='add'>+#define _NET_DSA_DRIVERS_KSZ_PTP_H</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_MICROCHIP_KSZ_PTP)</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+#define KSZ_PTP_N_GPIO		2</div><div class='add'>+</div><div class='add'>+enum ksz_ptp_tou_mode {</div><div class='add'>+	KSZ_PTP_TOU_IDLE,</div><div class='add'>+	KSZ_PTP_TOU_PEROUT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ksz_ptp_data {</div><div class='add'>+	struct ptp_clock_info caps;</div><div class='add'>+	struct ptp_clock *clock;</div><div class='add'>+	struct ptp_pin_desc pin_config[KSZ_PTP_N_GPIO];</div><div class='add'>+	/* Serializes all operations on the PTP hardware clock */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	/* lock for accessing the clock_time */</div><div class='add'>+	spinlock_t clock_lock;</div><div class='add'>+	struct timespec64 clock_time;</div><div class='add'>+	enum ksz_ptp_tou_mode tou_mode;</div><div class='add'>+	struct timespec64 perout_target_time_first;  /* start of first pulse */</div><div class='add'>+	struct timespec64 perout_period;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ksz_ptp_clock_register(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+void ksz_ptp_clock_unregister(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+int ksz_get_ts_info(struct dsa_switch *ds, int port,</div><div class='add'>+		    struct kernel_ethtool_ts_info *ts);</div><div class='add'>+int ksz_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+		     struct kernel_hwtstamp_config *config);</div><div class='add'>+int ksz_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+		     struct kernel_hwtstamp_config *config,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+void ksz_port_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb);</div><div class='add'>+void ksz_port_deferred_xmit(struct kthread_work *work);</div><div class='add'>+bool ksz_port_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb,</div><div class='add'>+		       unsigned int type);</div><div class='add'>+int ksz_ptp_irq_setup(struct dsa_switch *ds, u8 p);</div><div class='add'>+void ksz_ptp_irq_free(struct dsa_switch *ds, u8 p);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+struct ksz_ptp_data {</div><div class='add'>+	/* Serializes all operations on the PTP hardware clock */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int ksz_ptp_clock_register(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ksz_ptp_clock_unregister(struct dsa_switch *ds) { }</div><div class='add'>+</div><div class='add'>+static inline int ksz_ptp_irq_setup(struct dsa_switch *ds, u8 p)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ksz_ptp_irq_free(struct dsa_switch *ds, u8 p) {}</div><div class='add'>+</div><div class='add'>+#define ksz_get_ts_info NULL</div><div class='add'>+</div><div class='add'>+#define ksz_hwtstamp_get NULL</div><div class='add'>+</div><div class='add'>+#define ksz_hwtstamp_set NULL</div><div class='add'>+</div><div class='add'>+#define ksz_port_rxtstamp NULL</div><div class='add'>+</div><div class='add'>+#define ksz_port_txtstamp NULL</div><div class='add'>+</div><div class='add'>+#define ksz_port_deferred_xmit NULL</div><div class='add'>+</div><div class='add'>+#endif	/* End of CONFIG_NET_DSA_MICROCHIP_KSZ_PTP */</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_ptp_reg.h b/drivers/net/dsa/microchip/ksz_ptp_reg.h<br/>new file mode 100644<br/>index 000000000000..d71e85510cda<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_ptp_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_ptp_reg.h</a></div><div class='hunk'>@@ -0,0 +1,142 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Microchip KSZ PTP register definitions</div><div class='add'>+ * Copyright (C) 2022 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __KSZ_PTP_REGS_H</div><div class='add'>+#define __KSZ_PTP_REGS_H</div><div class='add'>+</div><div class='add'>+#define REG_SW_GLOBAL_LED_OVR__4	0x0120</div><div class='add'>+#define LED_OVR_2			BIT(1)</div><div class='add'>+#define LED_OVR_1			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_GLOBAL_LED_SRC__4	0x0128</div><div class='add'>+#define LED_SRC_PTP_GPIO_1		BIT(3)</div><div class='add'>+#define LED_SRC_PTP_GPIO_2		BIT(2)</div><div class='add'>+</div><div class='add'>+/* 5 - PTP Clock */</div><div class='add'>+#define REG_PTP_CLK_CTRL		0x0500</div><div class='add'>+</div><div class='add'>+#define PTP_STEP_ADJ			BIT(6)</div><div class='add'>+#define PTP_STEP_DIR			BIT(5)</div><div class='add'>+#define PTP_READ_TIME			BIT(4)</div><div class='add'>+#define PTP_LOAD_TIME			BIT(3)</div><div class='add'>+#define PTP_CLK_ADJ_ENABLE		BIT(2)</div><div class='add'>+#define PTP_CLK_ENABLE			BIT(1)</div><div class='add'>+#define PTP_CLK_RESET			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PTP_RTC_SUB_NANOSEC__2	0x0502</div><div class='add'>+</div><div class='add'>+#define PTP_RTC_SUB_NANOSEC_M		0x0007</div><div class='add'>+#define PTP_RTC_0NS			0x00</div><div class='add'>+</div><div class='add'>+#define REG_PTP_RTC_NANOSEC		0x0504</div><div class='add'>+</div><div class='add'>+#define REG_PTP_RTC_SEC			0x0508</div><div class='add'>+</div><div class='add'>+#define REG_PTP_SUBNANOSEC_RATE		0x050C</div><div class='add'>+</div><div class='add'>+#define PTP_SUBNANOSEC_M		0x3FFFFFFF</div><div class='add'>+#define PTP_RATE_DIR			BIT(31)</div><div class='add'>+#define PTP_TMP_RATE_ENABLE		BIT(30)</div><div class='add'>+</div><div class='add'>+#define REG_PTP_SUBNANOSEC_RATE_L	0x050E</div><div class='add'>+</div><div class='add'>+#define REG_PTP_RATE_DURATION		0x0510</div><div class='add'>+#define REG_PTP_RATE_DURATION_H		0x0510</div><div class='add'>+#define REG_PTP_RATE_DURATION_L		0x0512</div><div class='add'>+</div><div class='add'>+#define REG_PTP_MSG_CONF1		0x0514</div><div class='add'>+</div><div class='add'>+#define PTP_802_1AS			BIT(7)</div><div class='add'>+#define PTP_ENABLE			BIT(6)</div><div class='add'>+#define PTP_ETH_ENABLE			BIT(5)</div><div class='add'>+#define PTP_IPV4_UDP_ENABLE		BIT(4)</div><div class='add'>+#define PTP_IPV6_UDP_ENABLE		BIT(3)</div><div class='add'>+#define PTP_TC_P2P			BIT(2)</div><div class='add'>+#define PTP_MASTER			BIT(1)</div><div class='add'>+#define PTP_1STEP			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PTP_UNIT_INDEX__4		0x0520</div><div class='add'>+</div><div class='add'>+#define PTP_GPIO_INDEX			GENMASK(19, 16)</div><div class='add'>+#define PTP_TSI_INDEX			BIT(8)</div><div class='add'>+#define PTP_TOU_INDEX			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PTP_TRIG_STATUS__4		0x0524</div><div class='add'>+</div><div class='add'>+#define TRIG_ERROR_M			GENMASK(18, 16)</div><div class='add'>+#define TRIG_DONE_M			GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PTP_INT_STATUS__4		0x0528</div><div class='add'>+</div><div class='add'>+#define TRIG_INT_M			GENMASK(18, 16)</div><div class='add'>+#define TS_INT_M			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PTP_CTRL_STAT__4		0x052C</div><div class='add'>+</div><div class='add'>+#define GPIO_IN			BIT(7)</div><div class='add'>+#define GPIO_OUT			BIT(6)</div><div class='add'>+#define TS_INT_ENABLE			BIT(5)</div><div class='add'>+#define TRIG_ACTIVE			BIT(4)</div><div class='add'>+#define TRIG_ENABLE			BIT(3)</div><div class='add'>+#define TRIG_RESET			BIT(2)</div><div class='add'>+#define TS_ENABLE			BIT(1)</div><div class='add'>+#define TS_RESET			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_TRIG_TARGET_NANOSEC	0x0530</div><div class='add'>+#define REG_TRIG_TARGET_SEC		0x0534</div><div class='add'>+</div><div class='add'>+#define REG_TRIG_CTRL__4		0x0538</div><div class='add'>+</div><div class='add'>+#define TRIG_CASCADE_ENABLE		BIT(31)</div><div class='add'>+#define TRIG_CASCADE_TAIL		BIT(30)</div><div class='add'>+#define TRIG_CASCADE_UPS_M		GENMASK(29, 26)</div><div class='add'>+#define TRIG_NOW			BIT(25)</div><div class='add'>+#define TRIG_NOTIFY			BIT(24)</div><div class='add'>+#define TRIG_EDGE			BIT(23)</div><div class='add'>+#define TRIG_PATTERN_M			GENMASK(22, 20)</div><div class='add'>+#define TRIG_NEG_EDGE			0</div><div class='add'>+#define TRIG_POS_EDGE			1</div><div class='add'>+#define TRIG_NEG_PULSE			2</div><div class='add'>+#define TRIG_POS_PULSE			3</div><div class='add'>+#define TRIG_NEG_PERIOD		4</div><div class='add'>+#define TRIG_POS_PERIOD		5</div><div class='add'>+#define TRIG_REG_OUTPUT		6</div><div class='add'>+#define TRIG_GPO_M			GENMASK(19, 16)</div><div class='add'>+#define TRIG_CASCADE_ITERATE_CNT_M	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_TRIG_CYCLE_WIDTH		0x053C</div><div class='add'>+#define TRIG_CYCLE_WIDTH_M		GENMASK(31, 0)</div><div class='add'>+</div><div class='add'>+#define REG_TRIG_CYCLE_CNT		0x0540</div><div class='add'>+</div><div class='add'>+#define TRIG_CYCLE_CNT_M		GENMASK(31, 16)</div><div class='add'>+#define TRIG_BIT_PATTERN_M		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_TRIG_ITERATE_TIME		0x0544</div><div class='add'>+</div><div class='add'>+#define REG_TRIG_PULSE_WIDTH__4	0x0548</div><div class='add'>+</div><div class='add'>+#define TRIG_PULSE_WIDTH_M		GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+/* Port PTP Register */</div><div class='add'>+#define REG_PTP_PORT_RX_DELAY__2	0x0C00</div><div class='add'>+#define REG_PTP_PORT_TX_DELAY__2	0x0C02</div><div class='add'>+#define REG_PTP_PORT_ASYM_DELAY__2	0x0C04</div><div class='add'>+</div><div class='add'>+#define REG_PTP_PORT_XDELAY_TS		0x0C08</div><div class='add'>+#define REG_PTP_PORT_SYNC_TS		0x0C0C</div><div class='add'>+#define REG_PTP_PORT_PDRESP_TS		0x0C10</div><div class='add'>+</div><div class='add'>+#define REG_PTP_PORT_TX_INT_STATUS__2	0x0C14</div><div class='add'>+#define REG_PTP_PORT_TX_INT_ENABLE__2	0x0C16</div><div class='add'>+</div><div class='add'>+#define PTP_PORT_SYNC_INT		BIT(15)</div><div class='add'>+#define PTP_PORT_XDELAY_REQ_INT		BIT(14)</div><div class='add'>+#define PTP_PORT_PDELAY_RESP_INT	BIT(13)</div><div class='add'>+#define KSZ_SYNC_MSG			2</div><div class='add'>+#define KSZ_XDREQ_MSG			1</div><div class='add'>+#define KSZ_PDRES_MSG			0</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_spi.c b/drivers/net/dsa/microchip/ksz_spi.c<br/>new file mode 100644<br/>index 000000000000..d8001734b057<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/ksz_spi.c</a></div><div class='hunk'>@@ -0,0 +1,366 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Microchip ksz series register access through SPI</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017-2024 Microchip Technology Inc.</div><div class='add'>+ *	Tristram Ha &lt;Tristram.Ha@microchip.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+</div><div class='add'>+#define KSZ8463_SPI_ADDR_SHIFT			13</div><div class='add'>+#define KSZ8463_SPI_ADDR_ALIGN			3</div><div class='add'>+#define KSZ8463_SPI_TURNAROUND_SHIFT		2</div><div class='add'>+</div><div class='add'>+#define KSZ8795_SPI_ADDR_SHIFT			12</div><div class='add'>+#define KSZ8795_SPI_ADDR_ALIGN			3</div><div class='add'>+#define KSZ8795_SPI_TURNAROUND_SHIFT		1</div><div class='add'>+</div><div class='add'>+#define KSZ8863_SPI_ADDR_SHIFT			8</div><div class='add'>+#define KSZ8863_SPI_ADDR_ALIGN			8</div><div class='add'>+#define KSZ8863_SPI_TURNAROUND_SHIFT		0</div><div class='add'>+</div><div class='add'>+#define KSZ9477_SPI_ADDR_SHIFT			24</div><div class='add'>+#define KSZ9477_SPI_ADDR_ALIGN			3</div><div class='add'>+#define KSZ9477_SPI_TURNAROUND_SHIFT		5</div><div class='add'>+</div><div class='add'>+KSZ_REGMAP_TABLE(ksz8795, 16, KSZ8795_SPI_ADDR_SHIFT,</div><div class='add'>+		 KSZ8795_SPI_TURNAROUND_SHIFT, KSZ8795_SPI_ADDR_ALIGN);</div><div class='add'>+</div><div class='add'>+KSZ_REGMAP_TABLE(ksz8863, 16, KSZ8863_SPI_ADDR_SHIFT,</div><div class='add'>+		 KSZ8863_SPI_TURNAROUND_SHIFT, KSZ8863_SPI_ADDR_ALIGN);</div><div class='add'>+</div><div class='add'>+KSZ_REGMAP_TABLE(ksz9477, 32, KSZ9477_SPI_ADDR_SHIFT,</div><div class='add'>+		 KSZ9477_SPI_TURNAROUND_SHIFT, KSZ9477_SPI_ADDR_ALIGN);</div><div class='add'>+</div><div class='add'>+static u16 ksz8463_reg(u16 reg, size_t size)</div><div class='add'>+{</div><div class='add'>+	switch (size) {</div><div class='add'>+	case 1:</div><div class='add'>+		reg = ((reg &gt;&gt; 2) &lt;&lt; 4) | (1 &lt;&lt; (reg &amp; 3));</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		reg = ((reg &gt;&gt; 2) &lt;&lt; 4) | (reg &amp; 2 ? 0x0c : 0x03);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		reg = ((reg &gt;&gt; 2) &lt;&lt; 4) | 0xf;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	reg &lt;&lt;= KSZ8463_SPI_TURNAROUND_SHIFT;</div><div class='add'>+	return reg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8463_spi_read(void *context,</div><div class='add'>+			    const void *reg, size_t reg_size,</div><div class='add'>+			    void *val, size_t val_size)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = context;</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	u8 bytes[2];</div><div class='add'>+	u16 cmd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (reg_size &gt; 2 || val_size &gt; 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	memcpy(&amp;cmd, reg, sizeof(u16));</div><div class='add'>+	cmd = ksz8463_reg(cmd, val_size);</div><div class='add'>+	/* SPI command uses big-endian format. */</div><div class='add'>+	put_unaligned_be16(cmd, bytes);</div><div class='add'>+	rc = spi_write_then_read(spi, bytes, reg_size, val, val_size);</div><div class='add'>+#if defined(__BIG_ENDIAN)</div><div class='add'>+	/* Register value uses little-endian format so need to convert when</div><div class='add'>+	 * running in big-endian system.</div><div class='add'>+	 */</div><div class='add'>+	if (!rc &amp;&amp; val_size &gt; 1) {</div><div class='add'>+		if (val_size == 2) {</div><div class='add'>+			u16 v = get_unaligned_le16(val);</div><div class='add'>+</div><div class='add'>+			memcpy(val, &amp;v, sizeof(v));</div><div class='add'>+		} else if (val_size == 4) {</div><div class='add'>+			u32 v = get_unaligned_le32(val);</div><div class='add'>+</div><div class='add'>+			memcpy(val, &amp;v, sizeof(v));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ksz8463_spi_write(void *context, const void *data, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = context;</div><div class='add'>+	struct spi_device *spi = to_spi_device(dev);</div><div class='add'>+	size_t val_size = count - 2;</div><div class='add'>+	u8 bytes[6];</div><div class='add'>+	u16 cmd;</div><div class='add'>+</div><div class='add'>+	if (count &lt;= 2 || count &gt; 6)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	memcpy(bytes, data, count);</div><div class='add'>+	memcpy(&amp;cmd, data, sizeof(u16));</div><div class='add'>+	cmd = ksz8463_reg(cmd, val_size);</div><div class='add'>+	cmd |= (1 &lt;&lt; (KSZ8463_SPI_ADDR_SHIFT + KSZ8463_SPI_TURNAROUND_SHIFT));</div><div class='add'>+	/* SPI command uses big-endian format. */</div><div class='add'>+	put_unaligned_be16(cmd, bytes);</div><div class='add'>+#if defined(__BIG_ENDIAN)</div><div class='add'>+	/* Register value uses little-endian format so need to convert when</div><div class='add'>+	 * running in big-endian system.</div><div class='add'>+	 */</div><div class='add'>+	if (val_size == 2) {</div><div class='add'>+		u8 *val = &amp;bytes[2];</div><div class='add'>+		u16 v;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;v, val, sizeof(v));</div><div class='add'>+		put_unaligned_le16(v, val);</div><div class='add'>+	} else if (val_size == 4) {</div><div class='add'>+		u8 *val = &amp;bytes[2];</div><div class='add'>+		u32 v;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;v, val, sizeof(v));</div><div class='add'>+		put_unaligned_le32(v, val);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return spi_write(spi, bytes, count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+KSZ8463_REGMAP_TABLE(ksz8463, KSZ8463_SPI_ADDR_SHIFT, 0,</div><div class='add'>+		     KSZ8463_SPI_ADDR_ALIGN);</div><div class='add'>+</div><div class='add'>+static int ksz_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const struct regmap_config *regmap_config;</div><div class='add'>+	const struct ksz_chip_data *chip;</div><div class='add'>+	struct device *ddev = &amp;spi-&gt;dev;</div><div class='add'>+	struct regmap_config rc;</div><div class='add'>+	struct ksz_device *dev;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	dev = ksz_switch_alloc(&amp;spi-&gt;dev, spi);</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	chip = device_get_match_data(ddev);</div><div class='add'>+	if (!chip)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Save chip id to do special initialization when probing. */</div><div class='add'>+	dev-&gt;chip_id = chip-&gt;chip_id;</div><div class='add'>+	if (chip-&gt;chip_id == KSZ88X3_CHIP_ID)</div><div class='add'>+		regmap_config = ksz8863_regmap_config;</div><div class='add'>+	else if (chip-&gt;chip_id == KSZ8463_CHIP_ID)</div><div class='add'>+		regmap_config = ksz8463_regmap_config;</div><div class='add'>+	else if (chip-&gt;chip_id == KSZ8795_CHIP_ID ||</div><div class='add'>+		 chip-&gt;chip_id == KSZ8794_CHIP_ID ||</div><div class='add'>+		 chip-&gt;chip_id == KSZ8765_CHIP_ID)</div><div class='add'>+		regmap_config = ksz8795_regmap_config;</div><div class='add'>+	else if (chip-&gt;chip_id == KSZ8895_CHIP_ID ||</div><div class='add'>+		 chip-&gt;chip_id == KSZ8864_CHIP_ID)</div><div class='add'>+		regmap_config = ksz8863_regmap_config;</div><div class='add'>+	else</div><div class='add'>+		regmap_config = ksz9477_regmap_config;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; __KSZ_NUM_REGMAPS; i++) {</div><div class='add'>+		rc = regmap_config[i];</div><div class='add'>+		rc.lock_arg = &amp;dev-&gt;regmap_mutex;</div><div class='add'>+		rc.wr_table = chip-&gt;wr_table;</div><div class='add'>+		rc.rd_table = chip-&gt;rd_table;</div><div class='add'>+		dev-&gt;regmap[i] = devm_regmap_init_spi(spi, &amp;rc);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(dev-&gt;regmap[i])) {</div><div class='add'>+			return dev_err_probe(&amp;spi-&gt;dev, PTR_ERR(dev-&gt;regmap[i]),</div><div class='add'>+					     "Failed to initialize regmap%i\n",</div><div class='add'>+					     regmap_config[i].val_bits);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (spi-&gt;dev.platform_data)</div><div class='add'>+		dev-&gt;pdata = spi-&gt;dev.platform_data;</div><div class='add'>+</div><div class='add'>+	/* setup spi */</div><div class='add'>+	spi-&gt;mode = SPI_MODE_3;</div><div class='add'>+	ret = spi_setup(spi);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev-&gt;irq = spi-&gt;irq;</div><div class='add'>+</div><div class='add'>+	ret = ksz_switch_register(dev);</div><div class='add'>+</div><div class='add'>+	/* Main DSA driver may not be started yet. */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	if (dev)</div><div class='add'>+		ksz_switch_remove(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ksz_spi_shutdown(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ksz_switch_shutdown(dev);</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ksz_dt_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8463",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8463]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8765",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8765]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8794",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8794]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8795",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8795]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8863",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ88X3]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8864",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8864]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8873",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ88X3]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8895",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8895]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9477",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9477]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9896",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9896]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9897",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9897]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9893",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9893]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9563",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9563]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8563",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8563]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz8567",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ8567]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,ksz9567",</div><div class='add'>+		.data = &amp;ksz_switch_chips[KSZ9567]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9370",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9370]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9371",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9371]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9372",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9372]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9373",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9373]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9374",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9374]</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "microchip,lan9646",</div><div class='add'>+		.data = &amp;ksz_switch_chips[LAN9646]</div><div class='add'>+	},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ksz_dt_ids);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id ksz_spi_ids[] = {</div><div class='add'>+	{ "ksz8463" },</div><div class='add'>+	{ "ksz8765" },</div><div class='add'>+	{ "ksz8794" },</div><div class='add'>+	{ "ksz8795" },</div><div class='add'>+	{ "ksz8863" },</div><div class='add'>+	{ "ksz8864" },</div><div class='add'>+	{ "ksz8873" },</div><div class='add'>+	{ "ksz8895" },</div><div class='add'>+	{ "ksz9477" },</div><div class='add'>+	{ "ksz9896" },</div><div class='add'>+	{ "ksz9897" },</div><div class='add'>+	{ "ksz9893" },</div><div class='add'>+	{ "ksz9563" },</div><div class='add'>+	{ "ksz8563" },</div><div class='add'>+	{ "ksz8567" },</div><div class='add'>+	{ "ksz9567" },</div><div class='add'>+	{ "lan9370" },</div><div class='add'>+	{ "lan9371" },</div><div class='add'>+	{ "lan9372" },</div><div class='add'>+	{ "lan9373" },</div><div class='add'>+	{ "lan9374" },</div><div class='add'>+	{ "lan9646" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, ksz_spi_ids);</div><div class='add'>+</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(ksz_spi_pm_ops,</div><div class='add'>+				ksz_switch_suspend, ksz_switch_resume);</div><div class='add'>+</div><div class='add'>+static struct spi_driver ksz_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "ksz-switch",</div><div class='add'>+		.of_match_table = ksz_dt_ids,</div><div class='add'>+		.pm = &amp;ksz_spi_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.id_table = ksz_spi_ids,</div><div class='add'>+	.probe	= ksz_spi_probe,</div><div class='add'>+	.remove	= ksz_spi_remove,</div><div class='add'>+	.shutdown = ksz_spi_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_spi_driver(ksz_spi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_ALIAS("spi:lan937x");</div><div class='add'>+MODULE_AUTHOR("Tristram Ha &lt;Tristram.Ha@microchip.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Microchip ksz Series Switch SPI Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/ksz_spi.h b/drivers/net/dsa/microchip/ksz_spi.h<br/>deleted file mode 100644<br/>index 427811bd60b3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/ksz_spi.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/microchip/ksz_spi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- * Microchip KSZ series SPI access common header</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017-2018 Microchip Technology Inc.</div><div class='del'>- *	Tristram Ha &lt;Tristram.Ha@microchip.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __KSZ_SPI_H</div><div class='del'>-#define __KSZ_SPI_H</div><div class='del'>-</div><div class='del'>-/* Chip dependent SPI access */</div><div class='del'>-static int ksz_spi_read(struct ksz_device *dev, u32 reg, u8 *data,</div><div class='del'>-			unsigned int len);</div><div class='del'>-static int ksz_spi_write(struct ksz_device *dev, u32 reg, void *data,</div><div class='del'>-			 unsigned int len);</div><div class='del'>-</div><div class='del'>-static int ksz_spi_read8(struct ksz_device *dev, u32 reg, u8 *val)</div><div class='del'>-{</div><div class='del'>-	return ksz_spi_read(dev, reg, val, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_read16(struct ksz_device *dev, u32 reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	int ret = ksz_spi_read(dev, reg, (u8 *)val, 2);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		*val = be16_to_cpu(*val);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_read32(struct ksz_device *dev, u32 reg, u32 *val)</div><div class='del'>-{</div><div class='del'>-	int ret = ksz_spi_read(dev, reg, (u8 *)val, 4);</div><div class='del'>-</div><div class='del'>-	if (!ret)</div><div class='del'>-		*val = be32_to_cpu(*val);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_write8(struct ksz_device *dev, u32 reg, u8 value)</div><div class='del'>-{</div><div class='del'>-	return ksz_spi_write(dev, reg, &amp;value, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_write16(struct ksz_device *dev, u32 reg, u16 value)</div><div class='del'>-{</div><div class='del'>-	value = cpu_to_be16(value);</div><div class='del'>-	return ksz_spi_write(dev, reg, &amp;value, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_write32(struct ksz_device *dev, u32 reg, u32 value)</div><div class='del'>-{</div><div class='del'>-	value = cpu_to_be32(value);</div><div class='del'>-	return ksz_spi_write(dev, reg, &amp;value, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_get(struct ksz_device *dev, u32 reg, void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	return ksz_spi_read(dev, reg, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ksz_spi_set(struct ksz_device *dev, u32 reg, void *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	return ksz_spi_write(dev, reg, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/lan937x.h b/drivers/net/dsa/microchip/lan937x.h<br/>new file mode 100644<br/>index 000000000000..df13ebbd356f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/lan937x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/lan937x.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Microchip lan937x dev ops headers</div><div class='add'>+ * Copyright (C) 2019-2022 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __LAN937X_CFG_H</div><div class='add'>+#define __LAN937X_CFG_H</div><div class='add'>+</div><div class='add'>+int lan937x_reset_switch(struct ksz_device *dev);</div><div class='add'>+int lan937x_setup(struct dsa_switch *ds);</div><div class='add'>+void lan937x_teardown(struct dsa_switch *ds);</div><div class='add'>+void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port);</div><div class='add'>+void lan937x_config_cpu_port(struct dsa_switch *ds);</div><div class='add'>+int lan937x_switch_init(struct ksz_device *dev);</div><div class='add'>+void lan937x_switch_exit(struct ksz_device *dev);</div><div class='add'>+int lan937x_mdio_bus_preinit(struct ksz_device *dev, bool side_mdio);</div><div class='add'>+int lan937x_create_phy_addr_map(struct ksz_device *dev, bool side_mdio);</div><div class='add'>+int lan937x_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data);</div><div class='add'>+int lan937x_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val);</div><div class='add'>+int lan937x_change_mtu(struct ksz_device *dev, int port, int new_mtu);</div><div class='add'>+void lan937x_phylink_get_caps(struct ksz_device *dev, int port,</div><div class='add'>+			      struct phylink_config *config);</div><div class='add'>+void lan937x_setup_rgmii_delay(struct ksz_device *dev, int port);</div><div class='add'>+int lan937x_set_ageing_time(struct ksz_device *dev, unsigned int msecs);</div><div class='add'>+int lan937x_tc_cbs_set_cinc(struct ksz_device *dev, int port, u32 val);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/microchip/lan937x_main.c b/drivers/net/dsa/microchip/lan937x_main.c<br/>new file mode 100644<br/>index 000000000000..5a1496fff445<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/lan937x_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/lan937x_main.c</a></div><div class='hunk'>@@ -0,0 +1,671 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Microchip LAN937X switch driver main logic</div><div class='add'>+ * Copyright (C) 2019-2024 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/math.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+</div><div class='add'>+#include "lan937x_reg.h"</div><div class='add'>+#include "ksz_common.h"</div><div class='add'>+#include "ksz9477.h"</div><div class='add'>+#include "lan937x.h"</div><div class='add'>+</div><div class='add'>+/* marker for ports without built-in PHY */</div><div class='add'>+#define LAN937X_NO_PHY U8_MAX</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * lan9370_phy_addr - Mapping of LAN9370 switch ports to PHY addresses.</div><div class='add'>+ *</div><div class='add'>+ * Each entry corresponds to a specific port on the LAN9370 switch,</div><div class='add'>+ * where ports 1-4 are connected to integrated 100BASE-T1 PHYs, and</div><div class='add'>+ * Port 5 is connected to an RGMII interface without a PHY. The values</div><div class='add'>+ * are based on the documentation (DS00003108E, section 3.3).</div><div class='add'>+ */</div><div class='add'>+static const u8 lan9370_phy_addr[] = {</div><div class='add'>+	[0] = 2, /* Port 1, T1 AFE0 */</div><div class='add'>+	[1] = 3, /* Port 2, T1 AFE1 */</div><div class='add'>+	[2] = 5, /* Port 3, T1 AFE3 */</div><div class='add'>+	[3] = 6, /* Port 4, T1 AFE4 */</div><div class='add'>+	[4] = LAN937X_NO_PHY, /* Port 5, RGMII 2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * lan9371_phy_addr - Mapping of LAN9371 switch ports to PHY addresses.</div><div class='add'>+ *</div><div class='add'>+ * The values are based on the documentation (DS00003109E, section 3.3).</div><div class='add'>+ */</div><div class='add'>+static const u8 lan9371_phy_addr[] = {</div><div class='add'>+	[0] = 2, /* Port 1, T1 AFE0 */</div><div class='add'>+	[1] = 3, /* Port 2, T1 AFE1 */</div><div class='add'>+	[2] = 5, /* Port 3, T1 AFE3 */</div><div class='add'>+	[3] = 8, /* Port 4, TX PHY */</div><div class='add'>+	[4] = LAN937X_NO_PHY, /* Port 5, RGMII 2 */</div><div class='add'>+	[5] = LAN937X_NO_PHY, /* Port 6, RGMII 1 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * lan9372_phy_addr - Mapping of LAN9372 switch ports to PHY addresses.</div><div class='add'>+ *</div><div class='add'>+ * The values are based on the documentation (DS00003110F, section 3.3).</div><div class='add'>+ */</div><div class='add'>+static const u8 lan9372_phy_addr[] = {</div><div class='add'>+	[0] = 2, /* Port 1, T1 AFE0 */</div><div class='add'>+	[1] = 3, /* Port 2, T1 AFE1 */</div><div class='add'>+	[2] = 5, /* Port 3, T1 AFE3 */</div><div class='add'>+	[3] = 8, /* Port 4, TX PHY */</div><div class='add'>+	[4] = LAN937X_NO_PHY, /* Port 5, RGMII 2 */</div><div class='add'>+	[5] = LAN937X_NO_PHY, /* Port 6, RGMII 1 */</div><div class='add'>+	[6] = 6, /* Port 7, T1 AFE4 */</div><div class='add'>+	[7] = 4, /* Port 8, T1 AFE2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * lan9373_phy_addr - Mapping of LAN9373 switch ports to PHY addresses.</div><div class='add'>+ *</div><div class='add'>+ * The values are based on the documentation (DS00003110F, section 3.3).</div><div class='add'>+ */</div><div class='add'>+static const u8 lan9373_phy_addr[] = {</div><div class='add'>+	[0] = 2, /* Port 1, T1 AFE0 */</div><div class='add'>+	[1] = 3, /* Port 2, T1 AFE1 */</div><div class='add'>+	[2] = 5, /* Port 3, T1 AFE3 */</div><div class='add'>+	[3] = LAN937X_NO_PHY, /* Port 4, SGMII */</div><div class='add'>+	[4] = LAN937X_NO_PHY, /* Port 5, RGMII 2 */</div><div class='add'>+	[5] = LAN937X_NO_PHY, /* Port 6, RGMII 1 */</div><div class='add'>+	[6] = 6, /* Port 7, T1 AFE4 */</div><div class='add'>+	[7] = 4, /* Port 8, T1 AFE2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * lan9374_phy_addr - Mapping of LAN9374 switch ports to PHY addresses.</div><div class='add'>+ *</div><div class='add'>+ * The values are based on the documentation (DS00003110F, section 3.3).</div><div class='add'>+ */</div><div class='add'>+static const u8 lan9374_phy_addr[] = {</div><div class='add'>+	[0] = 2, /* Port 1, T1 AFE0 */</div><div class='add'>+	[1] = 3, /* Port 2, T1 AFE1 */</div><div class='add'>+	[2] = 5, /* Port 3, T1 AFE3 */</div><div class='add'>+	[3] = 7, /* Port 4, T1 AFE5 */</div><div class='add'>+	[4] = LAN937X_NO_PHY, /* Port 5, RGMII 2 */</div><div class='add'>+	[5] = LAN937X_NO_PHY, /* Port 6, RGMII 1 */</div><div class='add'>+	[6] = 6, /* Port 7, T1 AFE4 */</div><div class='add'>+	[7] = 4, /* Port 8, T1 AFE2 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int lan937x_cfg(struct ksz_device *dev, u32 addr, u8 bits, bool set)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(ksz_regmap_8(dev), addr, bits, set ? bits : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lan937x_port_cfg(struct ksz_device *dev, int port, int offset,</div><div class='add'>+			    u8 bits, bool set)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(ksz_regmap_8(dev), PORT_CTRL_ADDR(port, offset),</div><div class='add'>+				  bits, set ? bits : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lan937x_create_phy_addr_map - Create port-to-PHY address map for MDIO bus.</div><div class='add'>+ * @dev: Pointer to device structure.</div><div class='add'>+ * @side_mdio: Boolean indicating if the PHYs are accessed over a side MDIO bus.</div><div class='add'>+ *</div><div class='add'>+ * This function sets up the PHY address mapping for the LAN937x switches,</div><div class='add'>+ * which support two access modes for internal PHYs:</div><div class='add'>+ * 1. **SPI Access**: A straightforward one-to-one port-to-PHY address</div><div class='add'>+ *    mapping is applied.</div><div class='add'>+ * 2. **MDIO Access**: The PHY address mapping varies based on chip variant</div><div class='add'>+ *    and strap configuration. An offset is calculated based on strap settings</div><div class='add'>+ *    to ensure correct PHY addresses are assigned. The offset calculation logic</div><div class='add'>+ *    is based on Microchip's Article Number 000015828, available at:</div><div class='add'>+ *    https://microchip.my.site.com/s/article/LAN9374-Virtual-PHY-PHY-Address-Mapping</div><div class='add'>+ *</div><div class='add'>+ * The function first checks if side MDIO access is disabled, in which case a</div><div class='add'>+ * simple direct mapping (port number = PHY address) is applied. If side MDIO</div><div class='add'>+ * access is enabled, it reads the strap configuration to determine the correct</div><div class='add'>+ * offset for PHY addresses.</div><div class='add'>+ *</div><div class='add'>+ * The appropriate mapping table is selected based on the chip ID, and the</div><div class='add'>+ * `phy_addr_map` is populated with the correct addresses for each port. Any</div><div class='add'>+ * port with no PHY is assigned a `LAN937X_NO_PHY` marker.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+int lan937x_create_phy_addr_map(struct ksz_device *dev, bool side_mdio)</div><div class='add'>+{</div><div class='add'>+	static const u8 *phy_addr_map;</div><div class='add'>+	u32 strap_val;</div><div class='add'>+	u8 offset = 0;</div><div class='add'>+	size_t size;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	if (!side_mdio) {</div><div class='add'>+		/* simple direct mapping */</div><div class='add'>+		for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++)</div><div class='add'>+			dev-&gt;phy_addr_map[i] = i;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ksz_read32(dev, REG_SW_CFG_STRAP_VAL, &amp;strap_val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!(strap_val &amp; SW_CASCADE_ID_CFG) &amp;&amp; !(strap_val &amp; SW_VPHY_ADD_CFG))</div><div class='add'>+		offset = 0;</div><div class='add'>+	else if (!(strap_val &amp; SW_CASCADE_ID_CFG) &amp;&amp; (strap_val &amp; SW_VPHY_ADD_CFG))</div><div class='add'>+		offset = 7;</div><div class='add'>+	else if ((strap_val &amp; SW_CASCADE_ID_CFG) &amp;&amp; !(strap_val &amp; SW_VPHY_ADD_CFG))</div><div class='add'>+		offset = 15;</div><div class='add'>+	else</div><div class='add'>+		offset = 22;</div><div class='add'>+</div><div class='add'>+	switch (dev-&gt;info-&gt;chip_id) {</div><div class='add'>+	case LAN9370_CHIP_ID:</div><div class='add'>+		phy_addr_map = lan9370_phy_addr;</div><div class='add'>+		size = ARRAY_SIZE(lan9370_phy_addr);</div><div class='add'>+		break;</div><div class='add'>+	case LAN9371_CHIP_ID:</div><div class='add'>+		phy_addr_map = lan9371_phy_addr;</div><div class='add'>+		size = ARRAY_SIZE(lan9371_phy_addr);</div><div class='add'>+		break;</div><div class='add'>+	case LAN9372_CHIP_ID:</div><div class='add'>+		phy_addr_map = lan9372_phy_addr;</div><div class='add'>+		size = ARRAY_SIZE(lan9372_phy_addr);</div><div class='add'>+		break;</div><div class='add'>+	case LAN9373_CHIP_ID:</div><div class='add'>+		phy_addr_map = lan9373_phy_addr;</div><div class='add'>+		size = ARRAY_SIZE(lan9373_phy_addr);</div><div class='add'>+		break;</div><div class='add'>+	case LAN9374_CHIP_ID:</div><div class='add'>+		phy_addr_map = lan9374_phy_addr;</div><div class='add'>+		size = ARRAY_SIZE(lan9374_phy_addr);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (size &lt; dev-&gt;info-&gt;port_cnt)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dev-&gt;info-&gt;port_cnt; i++) {</div><div class='add'>+		if (phy_addr_map[i] == LAN937X_NO_PHY)</div><div class='add'>+			dev-&gt;phy_addr_map[i] = phy_addr_map[i];</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;phy_addr_map[i] = phy_addr_map[i] + offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * lan937x_mdio_bus_preinit - Pre-initialize MDIO bus for accessing PHYs.</div><div class='add'>+ * @dev: Pointer to device structure.</div><div class='add'>+ * @side_mdio: Boolean indicating if the PHYs are accessed over a side MDIO bus.</div><div class='add'>+ *</div><div class='add'>+ * This function configures the LAN937x switch for PHY access either through</div><div class='add'>+ * SPI or the side MDIO bus, unlocking the necessary registers for each access</div><div class='add'>+ * mode.</div><div class='add'>+ *</div><div class='add'>+ * Operation Modes:</div><div class='add'>+ * 1. **SPI Access**: Enables SPI indirect access to address clock domain</div><div class='add'>+ *    crossing issues when SPI is used for PHY access.</div><div class='add'>+ * 2. **MDIO Access**: Grants access to internal PHYs over the side MDIO bus,</div><div class='add'>+ *    required when using the MDIO bus for PHY management.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, error code on failure.</div><div class='add'>+ */</div><div class='add'>+int lan937x_mdio_bus_preinit(struct ksz_device *dev, bool side_mdio)</div><div class='add'>+{</div><div class='add'>+	u16 data16;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Unlock access to the PHYs, needed for SPI and side MDIO access */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_GLOBAL_CTRL_0, SW_PHY_REG_BLOCK, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto print_error;</div><div class='add'>+</div><div class='add'>+	if (side_mdio)</div><div class='add'>+		/* Allow access to internal PHYs over MDIO bus */</div><div class='add'>+		data16 = VPHY_MDIO_INTERNAL_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		/* Enable SPI indirect access to address clock domain crossing</div><div class='add'>+		 * issue</div><div class='add'>+		 */</div><div class='add'>+		data16 = VPHY_SPI_INDIRECT_ENABLE;</div><div class='add'>+</div><div class='add'>+	ret = ksz_rmw16(dev, REG_VPHY_SPECIAL_CTRL__2,</div><div class='add'>+			VPHY_SPI_INDIRECT_ENABLE | VPHY_MDIO_INTERNAL_ENABLE,</div><div class='add'>+			data16);</div><div class='add'>+</div><div class='add'>+print_error:</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(dev-&gt;dev, "failed to preinit the MDIO bus\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lan937x_vphy_ind_addr_wr(struct ksz_device *dev, int addr, int reg)</div><div class='add'>+{</div><div class='add'>+	u16 addr_base = REG_PORT_T1_PHY_CTRL_BASE;</div><div class='add'>+	u16 temp;</div><div class='add'>+</div><div class='add'>+	if (is_lan937x_tx_phy(dev, addr))</div><div class='add'>+		addr_base = REG_PORT_TX_PHY_CTRL_BASE;</div><div class='add'>+</div><div class='add'>+	/* get register address based on the logical port */</div><div class='add'>+	temp = PORT_CTRL_ADDR(addr, (addr_base + (reg &lt;&lt; 2)));</div><div class='add'>+</div><div class='add'>+	return ksz_write16(dev, REG_VPHY_IND_ADDR__2, temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lan937x_internal_phy_write(struct ksz_device *dev, int addr, int reg,</div><div class='add'>+				      u16 val)</div><div class='add'>+{</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Check for internal phy port */</div><div class='add'>+	if (!dev-&gt;info-&gt;internal_phy[addr])</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = lan937x_vphy_ind_addr_wr(dev, addr, reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Write the data to be written to the VPHY reg */</div><div class='add'>+	ret = ksz_write16(dev, REG_VPHY_IND_DATA__2, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Write the Write En and Busy bit */</div><div class='add'>+	ret = ksz_write16(dev, REG_VPHY_IND_CTRL__2,</div><div class='add'>+			  (VPHY_IND_WRITE | VPHY_IND_BUSY));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(ksz_regmap_16(dev), REG_VPHY_IND_CTRL__2,</div><div class='add'>+				       value, !(value &amp; VPHY_IND_BUSY), 10,</div><div class='add'>+				       1000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to write phy register\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int lan937x_internal_phy_read(struct ksz_device *dev, int addr, int reg,</div><div class='add'>+				     u16 *val)</div><div class='add'>+{</div><div class='add'>+	unsigned int value;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Check for internal phy port, return 0xffff for non-existent phy */</div><div class='add'>+	if (!dev-&gt;info-&gt;internal_phy[addr])</div><div class='add'>+		return 0xffff;</div><div class='add'>+</div><div class='add'>+	ret = lan937x_vphy_ind_addr_wr(dev, addr, reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Write Read and Busy bit to start the transaction */</div><div class='add'>+	ret = ksz_write16(dev, REG_VPHY_IND_CTRL__2, VPHY_IND_BUSY);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(ksz_regmap_16(dev), REG_VPHY_IND_CTRL__2,</div><div class='add'>+				       value, !(value &amp; VPHY_IND_BUSY), 10,</div><div class='add'>+				       1000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev-&gt;dev, "Failed to read phy register\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read the VPHY register which has the PHY data */</div><div class='add'>+	return ksz_read16(dev, REG_VPHY_IND_DATA__2, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_r_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 *data)</div><div class='add'>+{</div><div class='add'>+	return lan937x_internal_phy_read(dev, addr, reg, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_w_phy(struct ksz_device *dev, u16 addr, u16 reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	return lan937x_internal_phy_write(dev, addr, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_reset_switch(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 data32;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* reset switch */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_SW_OPERATION, SW_RESET, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Enable Auto Aging */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_SW_LUE_CTRL_1, SW_LINK_AUTO_AGING, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* disable interrupts */</div><div class='add'>+	ret = ksz_write32(dev, REG_SW_INT_MASK__4, SWITCH_INT_MASK);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_SW_INT_STATUS__4, POR_READY_INT);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_write32(dev, REG_SW_PORT_INT_MASK__4, 0xFF);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ksz_read32(dev, REG_SW_PORT_INT_STATUS__4, &amp;data32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lan937x_port_setup(struct ksz_device *dev, int port, bool cpu_port)</div><div class='add'>+{</div><div class='add'>+	const u32 *masks = dev-&gt;info-&gt;masks;</div><div class='add'>+	const u16 *regs = dev-&gt;info-&gt;regs;</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	u8 member;</div><div class='add'>+</div><div class='add'>+	/* enable tag tail for host port */</div><div class='add'>+	if (cpu_port)</div><div class='add'>+		lan937x_port_cfg(dev, port, REG_PORT_CTRL_0,</div><div class='add'>+				 PORT_TAIL_TAG_ENABLE, true);</div><div class='add'>+</div><div class='add'>+	/* Enable the Port Queue split */</div><div class='add'>+	ksz9477_port_queue_split(dev, port);</div><div class='add'>+</div><div class='add'>+	/* set back pressure for half duplex */</div><div class='add'>+	lan937x_port_cfg(dev, port, REG_PORT_MAC_CTRL_1, PORT_BACK_PRESSURE,</div><div class='add'>+			 true);</div><div class='add'>+</div><div class='add'>+	/* enable 802.1p priority */</div><div class='add'>+	lan937x_port_cfg(dev, port, P_PRIO_CTRL, PORT_802_1P_PRIO_ENABLE, true);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;info-&gt;internal_phy[port])</div><div class='add'>+		lan937x_port_cfg(dev, port, regs[P_XMII_CTRL_0],</div><div class='add'>+				 masks[P_MII_TX_FLOW_CTRL] |</div><div class='add'>+				 masks[P_MII_RX_FLOW_CTRL],</div><div class='add'>+				 true);</div><div class='add'>+</div><div class='add'>+	if (cpu_port)</div><div class='add'>+		member = dsa_user_ports(ds);</div><div class='add'>+	else</div><div class='add'>+		member = BIT(dsa_upstream_port(ds, port));</div><div class='add'>+</div><div class='add'>+	dev-&gt;dev_ops-&gt;cfg_port_member(dev, port, member);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lan937x_config_cpu_port(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds) {</div><div class='add'>+		if (dev-&gt;info-&gt;cpu_ports &amp; (1 &lt;&lt; dp-&gt;index)) {</div><div class='add'>+			dev-&gt;cpu_port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+			/* enable cpu port */</div><div class='add'>+			lan937x_port_setup(dev, dp-&gt;index, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds) {</div><div class='add'>+		ksz_port_stp_state_set(ds, dp-&gt;index, BR_STATE_DISABLED);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_change_mtu(struct ksz_device *dev, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev-&gt;ds;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	new_mtu += VLAN_ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		new_mtu += LAN937X_TAG_LEN;</div><div class='add'>+</div><div class='add'>+	if (new_mtu &gt;= FR_MIN_SIZE)</div><div class='add'>+		ret = lan937x_port_cfg(dev, port, REG_PORT_MAC_CTRL_0,</div><div class='add'>+				       PORT_JUMBO_PACKET, true);</div><div class='add'>+	else</div><div class='add'>+		ret = lan937x_port_cfg(dev, port, REG_PORT_MAC_CTRL_0,</div><div class='add'>+				       PORT_JUMBO_PACKET, false);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "failed to enable jumbo\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write the frame size in PORT_MAX_FR_SIZE register */</div><div class='add'>+	ret = ksz_pwrite16(dev, port, PORT_MAX_FR_SIZE, new_mtu);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(ds-&gt;dev, "failed to update mtu for port %d\n", port);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_set_ageing_time(struct ksz_device *dev, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	u8 data, mult, value8;</div><div class='add'>+	bool in_msec = false;</div><div class='add'>+	u32 max_val, value;</div><div class='add'>+	u32 secs = msecs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+#define MAX_TIMER_VAL	((1 &lt;&lt; 20) - 1)</div><div class='add'>+</div><div class='add'>+	/* The aging timer comprises a 3-bit multiplier and a 20-bit second</div><div class='add'>+	 * value.  Either of them cannot be zero.  The maximum timer is then</div><div class='add'>+	 * 7 * 1048575 = 7340025 seconds.  As this value is too large for</div><div class='add'>+	 * practical use it can be interpreted as microseconds, making the</div><div class='add'>+	 * maximum timer 7340 seconds with finer control.  This allows for</div><div class='add'>+	 * maximum 122 minutes compared to 29 minutes in KSZ9477 switch.</div><div class='add'>+	 */</div><div class='add'>+	if (msecs % 1000)</div><div class='add'>+		in_msec = true;</div><div class='add'>+	else</div><div class='add'>+		secs /= 1000;</div><div class='add'>+	if (!secs)</div><div class='add'>+		secs = 1;</div><div class='add'>+</div><div class='add'>+	/* Return error if too large. */</div><div class='add'>+	else if (secs &gt; 7 * MAX_TIMER_VAL)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Configure how to interpret the number value. */</div><div class='add'>+	ret = ksz_rmw8(dev, REG_SW_LUE_CTRL_2, SW_AGE_CNT_IN_MICROSEC,</div><div class='add'>+		       in_msec ? SW_AGE_CNT_IN_MICROSEC : 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = ksz_read8(dev, REG_SW_LUE_CTRL_0, &amp;value8);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check whether there is need to update the multiplier. */</div><div class='add'>+	mult = FIELD_GET(SW_AGE_CNT_M, value8);</div><div class='add'>+	max_val = MAX_TIMER_VAL;</div><div class='add'>+	if (mult &gt; 0) {</div><div class='add'>+		/* Try to use the same multiplier already in the register as</div><div class='add'>+		 * the hardware default uses multiplier 4 and 75 seconds for</div><div class='add'>+		 * 300 seconds.</div><div class='add'>+		 */</div><div class='add'>+		max_val = DIV_ROUND_UP(secs, mult);</div><div class='add'>+		if (max_val &gt; MAX_TIMER_VAL || max_val * mult != secs)</div><div class='add'>+			max_val = MAX_TIMER_VAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	data = DIV_ROUND_UP(secs, max_val);</div><div class='add'>+	if (mult != data) {</div><div class='add'>+		value8 &amp;= ~SW_AGE_CNT_M;</div><div class='add'>+		value8 |= FIELD_PREP(SW_AGE_CNT_M, data);</div><div class='add'>+		ret = ksz_write8(dev, REG_SW_LUE_CTRL_0, value8);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	secs = DIV_ROUND_UP(secs, data);</div><div class='add'>+</div><div class='add'>+	value = FIELD_GET(SW_AGE_PERIOD_7_0_M, secs);</div><div class='add'>+</div><div class='add'>+	ret = ksz_write8(dev, REG_SW_AGE_PERIOD__1, value);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	value = FIELD_GET(SW_AGE_PERIOD_19_8_M, secs);</div><div class='add'>+</div><div class='add'>+	return ksz_write16(dev, REG_SW_AGE_PERIOD__2, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan937x_set_tune_adj(struct ksz_device *dev, int port,</div><div class='add'>+				 u16 reg, u8 val)</div><div class='add'>+{</div><div class='add'>+	u16 data16;</div><div class='add'>+</div><div class='add'>+	ksz_pread16(dev, port, reg, &amp;data16);</div><div class='add'>+</div><div class='add'>+	/* Update tune Adjust */</div><div class='add'>+	data16 &amp;= ~PORT_TUNE_ADJ;</div><div class='add'>+	data16 |= FIELD_PREP(PORT_TUNE_ADJ, val);</div><div class='add'>+	ksz_pwrite16(dev, port, reg, data16);</div><div class='add'>+</div><div class='add'>+	/* write DLL reset to take effect */</div><div class='add'>+	data16 |= PORT_DLL_RESET;</div><div class='add'>+	ksz_pwrite16(dev, port, reg, data16);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan937x_set_rgmii_tx_delay(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	/* Apply different codes based on the ports as per characterization</div><div class='add'>+	 * results</div><div class='add'>+	 */</div><div class='add'>+	val = (port == LAN937X_RGMII_1_PORT) ? RGMII_1_TX_DELAY_2NS :</div><div class='add'>+		RGMII_2_TX_DELAY_2NS;</div><div class='add'>+</div><div class='add'>+	lan937x_set_tune_adj(dev, port, REG_PORT_XMII_CTRL_5, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void lan937x_set_rgmii_rx_delay(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	val = (port == LAN937X_RGMII_1_PORT) ? RGMII_1_RX_DELAY_2NS :</div><div class='add'>+		RGMII_2_RX_DELAY_2NS;</div><div class='add'>+</div><div class='add'>+	lan937x_set_tune_adj(dev, port, REG_PORT_XMII_CTRL_4, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lan937x_phylink_get_caps(struct ksz_device *dev, int port,</div><div class='add'>+			      struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;mac_capabilities = MAC_100FD;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;info-&gt;supports_rgmii[port]) {</div><div class='add'>+		/* MII/RMII/RGMII ports */</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+					    MAC_100HD | MAC_10 | MAC_1000FD;</div><div class='add'>+	} else if (is_lan937x_tx_phy(dev, port)) {</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+					    MAC_100HD | MAC_10;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lan937x_setup_rgmii_delay(struct ksz_device *dev, int port)</div><div class='add'>+{</div><div class='add'>+	struct ksz_port *p = &amp;dev-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	if (p-&gt;rgmii_tx_val) {</div><div class='add'>+		lan937x_set_rgmii_tx_delay(dev, port);</div><div class='add'>+		dev_info(dev-&gt;dev, "Applied rgmii tx delay for the port %d\n",</div><div class='add'>+			 port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (p-&gt;rgmii_rx_val) {</div><div class='add'>+		lan937x_set_rgmii_rx_delay(dev, port);</div><div class='add'>+		dev_info(dev-&gt;dev, "Applied rgmii rx delay for the port %d\n",</div><div class='add'>+			 port);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_tc_cbs_set_cinc(struct ksz_device *dev, int port, u32 val)</div><div class='add'>+{</div><div class='add'>+	return ksz_pwrite32(dev, port, REG_PORT_MTI_CREDIT_INCREMENT, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_switch_init(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;port_mask = (1 &lt;&lt; dev-&gt;info-&gt;port_cnt) - 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int lan937x_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ksz_device *dev = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* The VLAN aware is a global setting. Mixed vlan</div><div class='add'>+	 * filterings are not supported.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;vlan_filtering_is_global = true;</div><div class='add'>+</div><div class='add'>+	/* Enable aggressive back off for half duplex &amp; UNH mode */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_SW_MAC_CTRL_0, (SW_PAUSE_UNH_MODE |</div><div class='add'>+						   SW_NEW_BACKOFF |</div><div class='add'>+						   SW_AGGR_BACKOFF), true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If NO_EXC_COLLISION_DROP bit is set, the switch will not drop</div><div class='add'>+	 * packets when 16 or more collisions occur</div><div class='add'>+	 */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_SW_MAC_CTRL_1, NO_EXC_COLLISION_DROP, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* enable global MIB counter freeze function */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_SW_MAC_CTRL_6, SW_MIB_COUNTER_FREEZE, true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* disable CLK125 &amp; CLK25, 1: disable, 0: enable */</div><div class='add'>+	ret = lan937x_cfg(dev, REG_SW_GLOBAL_OUTPUT_CTRL__1,</div><div class='add'>+			  (SW_CLK125_ENB | SW_CLK25_ENB), true);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Disable global VPHY support. Related to CPU interface only? */</div><div class='add'>+	return ksz_rmw32(dev, REG_SW_CFG_STRAP_OVR, SW_VPHY_DISABLE,</div><div class='add'>+			 SW_VPHY_DISABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lan937x_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void lan937x_switch_exit(struct ksz_device *dev)</div><div class='add'>+{</div><div class='add'>+	lan937x_reset_switch(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Arun Ramadoss &lt;arun.ramadoss@microchip.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Microchip LAN937x Series Switch DSA Driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/microchip/lan937x_reg.h b/drivers/net/dsa/microchip/lan937x_reg.h<br/>new file mode 100644<br/>index 000000000000..72042fd64e5b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/microchip/lan937x_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/microchip/lan937x_reg.h</a></div><div class='hunk'>@@ -0,0 +1,217 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Microchip LAN937X switch register definitions</div><div class='add'>+ * Copyright (C) 2019-2024 Microchip Technology Inc.</div><div class='add'>+ */</div><div class='add'>+#ifndef __LAN937X_REG_H</div><div class='add'>+#define __LAN937X_REG_H</div><div class='add'>+</div><div class='add'>+#define PORT_CTRL_ADDR(port, addr)	((addr) | (((port) + 1)  &lt;&lt; 12))</div><div class='add'>+</div><div class='add'>+/* 0 - Operation */</div><div class='add'>+#define REG_GLOBAL_CTRL_0		0x0007</div><div class='add'>+</div><div class='add'>+#define SW_PHY_REG_BLOCK		BIT(7)</div><div class='add'>+#define SW_FAST_MODE			BIT(3)</div><div class='add'>+#define SW_FAST_MODE_OVERRIDE		BIT(2)</div><div class='add'>+</div><div class='add'>+#define REG_SW_INT_STATUS__4		0x0010</div><div class='add'>+#define REG_SW_INT_MASK__4		0x0014</div><div class='add'>+</div><div class='add'>+#define LUE_INT				BIT(31)</div><div class='add'>+#define TRIG_TS_INT			BIT(30)</div><div class='add'>+#define APB_TIMEOUT_INT			BIT(29)</div><div class='add'>+#define OVER_TEMP_INT			BIT(28)</div><div class='add'>+#define HSR_INT				BIT(27)</div><div class='add'>+#define PIO_INT				BIT(26)</div><div class='add'>+#define POR_READY_INT			BIT(25)</div><div class='add'>+</div><div class='add'>+#define SWITCH_INT_MASK			\</div><div class='add'>+	(LUE_INT | TRIG_TS_INT | APB_TIMEOUT_INT | OVER_TEMP_INT | HSR_INT | \</div><div class='add'>+	 PIO_INT | POR_READY_INT)</div><div class='add'>+</div><div class='add'>+#define REG_SW_PORT_INT_STATUS__4	0x0018</div><div class='add'>+#define REG_SW_PORT_INT_MASK__4		0x001C</div><div class='add'>+</div><div class='add'>+/* 1 - Global */</div><div class='add'>+#define REG_SW_GLOBAL_OUTPUT_CTRL__1	0x0103</div><div class='add'>+#define SW_CLK125_ENB			BIT(1)</div><div class='add'>+#define SW_CLK25_ENB			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_CFG_STRAP_VAL		0x0200</div><div class='add'>+#define SW_CASCADE_ID_CFG		BIT(15)</div><div class='add'>+#define SW_VPHY_ADD_CFG			BIT(0)</div><div class='add'>+</div><div class='add'>+/* 2 - PHY Control */</div><div class='add'>+#define REG_SW_CFG_STRAP_OVR		0x0214</div><div class='add'>+#define SW_VPHY_DISABLE			BIT(31)</div><div class='add'>+</div><div class='add'>+/* 3 - Operation Control */</div><div class='add'>+#define REG_SW_OPERATION		0x0300</div><div class='add'>+</div><div class='add'>+#define SW_DOUBLE_TAG			BIT(7)</div><div class='add'>+#define SW_OVER_TEMP_ENABLE		BIT(2)</div><div class='add'>+#define SW_RESET			BIT(1)</div><div class='add'>+</div><div class='add'>+#define REG_SW_LUE_CTRL_0		0x0310</div><div class='add'>+</div><div class='add'>+#define SW_VLAN_ENABLE			BIT(7)</div><div class='add'>+#define SW_DROP_INVALID_VID		BIT(6)</div><div class='add'>+#define SW_AGE_CNT_M			GENMASK(5, 3)</div><div class='add'>+#define SW_RESV_MCAST_ENABLE		BIT(2)</div><div class='add'>+</div><div class='add'>+#define REG_SW_LUE_CTRL_1		0x0311</div><div class='add'>+</div><div class='add'>+#define UNICAST_LEARN_DISABLE		BIT(7)</div><div class='add'>+#define SW_FLUSH_STP_TABLE		BIT(5)</div><div class='add'>+#define SW_FLUSH_MSTP_TABLE		BIT(4)</div><div class='add'>+#define SW_SRC_ADDR_FILTER		BIT(3)</div><div class='add'>+#define SW_AGING_ENABLE			BIT(2)</div><div class='add'>+#define SW_FAST_AGING			BIT(1)</div><div class='add'>+#define SW_LINK_AUTO_AGING		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_LUE_CTRL_2		0x0312</div><div class='add'>+</div><div class='add'>+#define SW_AGE_CNT_IN_MICROSEC		BIT(7)</div><div class='add'>+</div><div class='add'>+#define REG_SW_AGE_PERIOD__1		0x0313</div><div class='add'>+#define SW_AGE_PERIOD_7_0_M		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_AGE_PERIOD__2		0x0320</div><div class='add'>+#define SW_AGE_PERIOD_19_8_M		GENMASK(19, 8)</div><div class='add'>+</div><div class='add'>+#define REG_SW_MAC_CTRL_0		0x0330</div><div class='add'>+#define SW_NEW_BACKOFF			BIT(7)</div><div class='add'>+#define SW_PAUSE_UNH_MODE		BIT(1)</div><div class='add'>+#define SW_AGGR_BACKOFF			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_MAC_CTRL_1		0x0331</div><div class='add'>+#define SW_SHORT_IFG			BIT(7)</div><div class='add'>+#define MULTICAST_STORM_DISABLE		BIT(6)</div><div class='add'>+#define SW_BACK_PRESSURE		BIT(5)</div><div class='add'>+#define FAIR_FLOW_CTRL			BIT(4)</div><div class='add'>+#define NO_EXC_COLLISION_DROP		BIT(3)</div><div class='add'>+#define SW_LEGAL_PACKET_DISABLE		BIT(1)</div><div class='add'>+#define SW_PASS_SHORT_FRAME		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_SW_MAC_CTRL_6		0x0336</div><div class='add'>+#define SW_MIB_COUNTER_FLUSH		BIT(7)</div><div class='add'>+#define SW_MIB_COUNTER_FREEZE		BIT(6)</div><div class='add'>+</div><div class='add'>+/* 4 - LUE */</div><div class='add'>+#define REG_SW_ALU_STAT_CTRL__4		0x041C</div><div class='add'>+</div><div class='add'>+#define REG_SW_ALU_VAL_B		0x0424</div><div class='add'>+#define ALU_V_OVERRIDE			BIT(31)</div><div class='add'>+#define ALU_V_USE_FID			BIT(30)</div><div class='add'>+#define ALU_V_PORT_MAP			0xFF</div><div class='add'>+</div><div class='add'>+/* 7 - VPhy */</div><div class='add'>+#define REG_VPHY_IND_ADDR__2		0x075C</div><div class='add'>+#define REG_VPHY_IND_DATA__2		0x0760</div><div class='add'>+</div><div class='add'>+#define REG_VPHY_IND_CTRL__2		0x0768</div><div class='add'>+</div><div class='add'>+#define VPHY_IND_WRITE			BIT(1)</div><div class='add'>+#define VPHY_IND_BUSY			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_VPHY_SPECIAL_CTRL__2	0x077C</div><div class='add'>+#define VPHY_SMI_INDIRECT_ENABLE	BIT(15)</div><div class='add'>+#define VPHY_SW_LOOPBACK		BIT(14)</div><div class='add'>+#define VPHY_MDIO_INTERNAL_ENABLE	BIT(13)</div><div class='add'>+#define VPHY_SPI_INDIRECT_ENABLE	BIT(12)</div><div class='add'>+#define VPHY_PORT_MODE_M		0x3</div><div class='add'>+#define VPHY_PORT_MODE_S		8</div><div class='add'>+#define VPHY_MODE_RGMII			0</div><div class='add'>+#define VPHY_MODE_MII_PHY		1</div><div class='add'>+#define VPHY_MODE_SGMII			2</div><div class='add'>+#define VPHY_MODE_RMII_PHY		3</div><div class='add'>+#define VPHY_SW_COLLISION_TEST		BIT(7)</div><div class='add'>+#define VPHY_SPEED_DUPLEX_STAT_M	0x7</div><div class='add'>+#define VPHY_SPEED_DUPLEX_STAT_S	2</div><div class='add'>+#define VPHY_SPEED_1000			BIT(4)</div><div class='add'>+#define VPHY_SPEED_100			BIT(3)</div><div class='add'>+#define VPHY_FULL_DUPLEX		BIT(2)</div><div class='add'>+</div><div class='add'>+/* Port Registers */</div><div class='add'>+</div><div class='add'>+/* 0 - Operation */</div><div class='add'>+#define REG_PORT_INT_STATUS		0x001B</div><div class='add'>+#define REG_PORT_INT_MASK		0x001F</div><div class='add'>+</div><div class='add'>+#define PORT_TAS_INT			BIT(5)</div><div class='add'>+#define PORT_QCI_INT			BIT(4)</div><div class='add'>+#define PORT_SGMII_INT			BIT(3)</div><div class='add'>+#define PORT_PTP_INT			BIT(2)</div><div class='add'>+#define PORT_PHY_INT			BIT(1)</div><div class='add'>+#define PORT_ACL_INT			BIT(0)</div><div class='add'>+</div><div class='add'>+#define PORT_SRC_PHY_INT		1</div><div class='add'>+</div><div class='add'>+#define REG_PORT_CTRL_0			0x0020</div><div class='add'>+</div><div class='add'>+#define PORT_MAC_LOOPBACK		BIT(7)</div><div class='add'>+#define PORT_MAC_REMOTE_LOOPBACK	BIT(6)</div><div class='add'>+#define PORT_K2L_INSERT_ENABLE		BIT(5)</div><div class='add'>+#define PORT_K2L_DEBUG_ENABLE		BIT(4)</div><div class='add'>+#define PORT_TAIL_TAG_ENABLE		BIT(2)</div><div class='add'>+#define PORT_QUEUE_SPLIT_ENABLE		0x3</div><div class='add'>+</div><div class='add'>+/* 1 - Phy */</div><div class='add'>+#define REG_PORT_T1_PHY_CTRL_BASE	0x0100</div><div class='add'>+#define REG_PORT_TX_PHY_CTRL_BASE	0x0280</div><div class='add'>+</div><div class='add'>+/* 3 - xMII */</div><div class='add'>+#define PORT_SGMII_SEL			BIT(7)</div><div class='add'>+#define PORT_GRXC_ENABLE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define PORT_MII_SEL_EDGE		BIT(5)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_XMII_CTRL_4		0x0304</div><div class='add'>+#define REG_PORT_XMII_CTRL_5		0x0306</div><div class='add'>+</div><div class='add'>+#define PORT_DLL_RESET			BIT(15)</div><div class='add'>+#define PORT_TUNE_ADJ			GENMASK(13, 7)</div><div class='add'>+</div><div class='add'>+/* 4 - MAC */</div><div class='add'>+#define REG_PORT_MAC_CTRL_0		0x0400</div><div class='add'>+#define PORT_CHECK_LENGTH		BIT(2)</div><div class='add'>+#define PORT_BROADCAST_STORM		BIT(1)</div><div class='add'>+#define PORT_JUMBO_PACKET		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PORT_MAC_CTRL_1		0x0401</div><div class='add'>+#define PORT_BACK_PRESSURE		BIT(3)</div><div class='add'>+#define PORT_PASS_ALL			BIT(0)</div><div class='add'>+</div><div class='add'>+#define PORT_MAX_FR_SIZE		0x404</div><div class='add'>+#define FR_MIN_SIZE		1522</div><div class='add'>+</div><div class='add'>+/* 8 - Classification and Policing */</div><div class='add'>+#define REG_PORT_MRI_PRIO_CTRL		0x0801</div><div class='add'>+#define PORT_HIGHEST_PRIO		BIT(7)</div><div class='add'>+#define PORT_OR_PRIO			BIT(6)</div><div class='add'>+#define PORT_MAC_PRIO_ENABLE		BIT(4)</div><div class='add'>+#define PORT_VLAN_PRIO_ENABLE		BIT(3)</div><div class='add'>+#define PORT_802_1P_PRIO_ENABLE		BIT(2)</div><div class='add'>+#define PORT_DIFFSERV_PRIO_ENABLE	BIT(1)</div><div class='add'>+#define PORT_ACL_PRIO_ENABLE		BIT(0)</div><div class='add'>+</div><div class='add'>+#define P_PRIO_CTRL			REG_PORT_MRI_PRIO_CTRL</div><div class='add'>+</div><div class='add'>+/* 9 - Shaping */</div><div class='add'>+#define REG_PORT_MTI_CREDIT_INCREMENT	0x091C</div><div class='add'>+</div><div class='add'>+/* The port number as per the datasheet */</div><div class='add'>+#define RGMII_2_PORT_NUM		5</div><div class='add'>+#define RGMII_1_PORT_NUM		6</div><div class='add'>+</div><div class='add'>+#define LAN937X_RGMII_2_PORT		(RGMII_2_PORT_NUM - 1)</div><div class='add'>+#define LAN937X_RGMII_1_PORT		(RGMII_1_PORT_NUM - 1)</div><div class='add'>+</div><div class='add'>+#define RGMII_1_TX_DELAY_2NS		2</div><div class='add'>+#define RGMII_2_TX_DELAY_2NS		0</div><div class='add'>+#define RGMII_1_RX_DELAY_2NS		0x1B</div><div class='add'>+#define RGMII_2_RX_DELAY_2NS		0x14</div><div class='add'>+</div><div class='add'>+#define LAN937X_TAG_LEN			2</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/mt7530-mdio.c b/drivers/net/dsa/mt7530-mdio.c<br/>new file mode 100644<br/>index 000000000000..0286a6cecb6f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mt7530-mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mt7530-mdio.c</a></div><div class='hunk'>@@ -0,0 +1,265 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pcs/pcs-mtk-lynxi.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7530.h"</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_regmap_write(void *context, unsigned int reg, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = context;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 page, r, lo, hi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	page = (reg &gt;&gt; 6) &amp; 0x3ff;</div><div class='add'>+	r  = (reg &gt;&gt; 2) &amp; 0xf;</div><div class='add'>+	lo = val &amp; 0xffff;</div><div class='add'>+	hi = val &gt;&gt; 16;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdiodev-&gt;addr, 0x1f, page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdiodev-&gt;addr, r, lo);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdiodev-&gt;addr, 0x10, hi);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_regmap_read(void *context, unsigned int reg, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = context;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 page, r, lo, hi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	page = (reg &gt;&gt; 6) &amp; 0x3ff;</div><div class='add'>+	r = (reg &gt;&gt; 2) &amp; 0xf;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdiodev-&gt;addr, 0x1f, page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	lo = bus-&gt;read(bus, priv-&gt;mdiodev-&gt;addr, r);</div><div class='add'>+	hi = bus-&gt;read(bus, priv-&gt;mdiodev-&gt;addr, 0x10);</div><div class='add'>+</div><div class='add'>+	*val = (hi &lt;&lt; 16) | (lo &amp; 0xffff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_mdio_regmap_lock(void *mdio_lock)</div><div class='add'>+{</div><div class='add'>+	mutex_lock_nested(mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_mdio_regmap_unlock(void *mdio_lock)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(mdio_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus mt7530_regmap_bus = {</div><div class='add'>+	.reg_write = mt7530_regmap_write,</div><div class='add'>+	.reg_read = mt7530_regmap_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7531_create_sgmii(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct regmap_config *mt7531_pcs_config[2] = {};</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	int i, ret = 0;</div><div class='add'>+</div><div class='add'>+	for (i = priv-&gt;p5_sgmii ? 0 : 1; i &lt; 2; i++) {</div><div class='add'>+		mt7531_pcs_config[i] = devm_kzalloc(priv-&gt;dev,</div><div class='add'>+						    sizeof(struct regmap_config),</div><div class='add'>+						    GFP_KERNEL);</div><div class='add'>+		if (!mt7531_pcs_config[i]) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mt7531_pcs_config[i]-&gt;name = i ? "port6" : "port5";</div><div class='add'>+		mt7531_pcs_config[i]-&gt;reg_bits = 16;</div><div class='add'>+		mt7531_pcs_config[i]-&gt;val_bits = 32;</div><div class='add'>+		mt7531_pcs_config[i]-&gt;reg_stride = 4;</div><div class='add'>+		mt7531_pcs_config[i]-&gt;reg_base = MT7531_SGMII_REG_BASE(5 + i);</div><div class='add'>+		mt7531_pcs_config[i]-&gt;max_register = 0x17c;</div><div class='add'>+		mt7531_pcs_config[i]-&gt;lock = mt7530_mdio_regmap_lock;</div><div class='add'>+		mt7531_pcs_config[i]-&gt;unlock = mt7530_mdio_regmap_unlock;</div><div class='add'>+		mt7531_pcs_config[i]-&gt;lock_arg = &amp;priv-&gt;bus-&gt;mdio_lock;</div><div class='add'>+</div><div class='add'>+		regmap = devm_regmap_init(priv-&gt;dev, &amp;mt7530_regmap_bus, priv,</div><div class='add'>+					  mt7531_pcs_config[i]);</div><div class='add'>+		if (IS_ERR(regmap)) {</div><div class='add'>+			ret = PTR_ERR(regmap);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		pcs = mtk_pcs_lynxi_create(priv-&gt;dev, regmap,</div><div class='add'>+					   MT7531_PHYA_CTRL_SIGNAL3, 0);</div><div class='add'>+		if (!pcs) {</div><div class='add'>+			ret = -ENXIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;ports[5 + i].sgmii_pcs = pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &amp;&amp; i)</div><div class='add'>+		mtk_pcs_lynxi_destroy(priv-&gt;ports[5].sgmii_pcs);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mt7530_of_match[] = {</div><div class='add'>+	{ .compatible = "mediatek,mt7621", .data = &amp;mt753x_table[ID_MT7621], },</div><div class='add'>+	{ .compatible = "mediatek,mt7530", .data = &amp;mt753x_table[ID_MT7530], },</div><div class='add'>+	{ .compatible = "mediatek,mt7531", .data = &amp;mt753x_table[ID_MT7531], },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, mt7530_of_match);</div><div class='add'>+</div><div class='add'>+static const struct regmap_config regmap_config = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = MT7530_CREV,</div><div class='add'>+	.disable_locking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv;</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dn = mdiodev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;bus = mdiodev-&gt;bus;</div><div class='add'>+	priv-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	priv-&gt;mdiodev = mdiodev;</div><div class='add'>+</div><div class='add'>+	ret = mt7530_probe_common(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Use medatek,mcm property to distinguish hardware type that would</div><div class='add'>+	 * cause a little bit differences on power-on sequence.</div><div class='add'>+	 * Not MCM that indicates switch works as the remote standalone</div><div class='add'>+	 * integrated circuit so the GPIO pin would be used to complete</div><div class='add'>+	 * the reset, otherwise memory-mapped register accessing used</div><div class='add'>+	 * through syscon provides in the case of MCM.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;mcm = of_property_read_bool(dn, "mediatek,mcm");</div><div class='add'>+	if (priv-&gt;mcm) {</div><div class='add'>+		dev_info(&amp;mdiodev-&gt;dev, "MT7530 adapts as multi-chip module\n");</div><div class='add'>+</div><div class='add'>+		priv-&gt;rstc = devm_reset_control_get(&amp;mdiodev-&gt;dev, "mcm");</div><div class='add'>+		if (IS_ERR(priv-&gt;rstc)) {</div><div class='add'>+			dev_err(&amp;mdiodev-&gt;dev, "Couldn't get our reset line\n");</div><div class='add'>+			return PTR_ERR(priv-&gt;rstc);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;reset = devm_gpiod_get_optional(&amp;mdiodev-&gt;dev, "reset",</div><div class='add'>+						      GPIOD_OUT_LOW);</div><div class='add'>+		if (IS_ERR(priv-&gt;reset)) {</div><div class='add'>+			dev_err(&amp;mdiodev-&gt;dev, "Couldn't get our reset line\n");</div><div class='add'>+			return PTR_ERR(priv-&gt;reset);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;id == ID_MT7530) {</div><div class='add'>+		priv-&gt;core_pwr = devm_regulator_get(&amp;mdiodev-&gt;dev, "core");</div><div class='add'>+		if (IS_ERR(priv-&gt;core_pwr))</div><div class='add'>+			return PTR_ERR(priv-&gt;core_pwr);</div><div class='add'>+</div><div class='add'>+		priv-&gt;io_pwr = devm_regulator_get(&amp;mdiodev-&gt;dev, "io");</div><div class='add'>+		if (IS_ERR(priv-&gt;io_pwr))</div><div class='add'>+			return PTR_ERR(priv-&gt;io_pwr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init(priv-&gt;dev, &amp;mt7530_regmap_bus, priv,</div><div class='add'>+					&amp;regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap))</div><div class='add'>+		return PTR_ERR(priv-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;id == ID_MT7531)</div><div class='add'>+		priv-&gt;create_sgmii = mt7531_create_sgmii;</div><div class='add'>+</div><div class='add'>+	return dsa_register_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+	int ret = 0, i;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = regulator_disable(priv-&gt;core_pwr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"Failed to disable core power: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	ret = regulator_disable(priv-&gt;io_pwr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to disable io pwr: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+</div><div class='add'>+	mt7530_remove_common(priv);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 2; ++i)</div><div class='add'>+		mtk_pcs_lynxi_destroy(priv-&gt;ports[5 + i].sgmii_pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mdio_driver mt7530_mdio_driver = {</div><div class='add'>+	.probe  = mt7530_probe,</div><div class='add'>+	.remove = mt7530_remove,</div><div class='add'>+	.shutdown = mt7530_shutdown,</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = "mt7530-mdio",</div><div class='add'>+		.of_match_table = mt7530_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(mt7530_mdio_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Mediatek MT7530 Switch (MDIO)");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/mt7530-mmio.c b/drivers/net/dsa/mt7530-mmio.c<br/>new file mode 100644<br/>index 000000000000..1dc8b93fb51a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mt7530-mmio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mt7530-mmio.c</a></div><div class='hunk'>@@ -0,0 +1,100 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "mt7530.h"</div><div class='add'>+</div><div class='add'>+static const struct of_device_id mt7988_of_match[] = {</div><div class='add'>+	{ .compatible = "airoha,an7583-switch", .data = &amp;mt753x_table[ID_AN7583], },</div><div class='add'>+	{ .compatible = "airoha,en7581-switch", .data = &amp;mt753x_table[ID_EN7581], },</div><div class='add'>+	{ .compatible = "mediatek,mt7988-switch", .data = &amp;mt753x_table[ID_MT7988], },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, mt7988_of_match);</div><div class='add'>+</div><div class='add'>+static const struct regmap_config sw_regmap_config = {</div><div class='add'>+	.name = "switch",</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = MT7530_CREV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7988_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv;</div><div class='add'>+	void __iomem *base_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;bus = NULL;</div><div class='add'>+	priv-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = mt7530_probe_common(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;rstc = devm_reset_control_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(priv-&gt;rstc)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Couldn't get our reset line\n");</div><div class='add'>+		return PTR_ERR(priv-&gt;rstc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	base_addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(base_addr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot request I/O memory space\n");</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init_mmio(&amp;pdev-&gt;dev, base_addr,</div><div class='add'>+					     &amp;sw_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap))</div><div class='add'>+		return PTR_ERR(priv-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	return dsa_register_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7988_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (priv)</div><div class='add'>+		mt7530_remove_common(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7988_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver mt7988_platform_driver = {</div><div class='add'>+	.probe  = mt7988_probe,</div><div class='add'>+	.remove = mt7988_remove,</div><div class='add'>+	.shutdown = mt7988_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "mt7530-mmio",</div><div class='add'>+		.of_match_table = mt7988_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(mt7988_platform_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Daniel Golle &lt;daniel@makrotopia.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Mediatek MT7530 Switch (MMIO)");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c<br/>index c7d352da5448..b9423389c2ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mt7530.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mt7530.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mt7530.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mt7530.c</a></div><div class='hunk'>@@ -10,202 +10,129 @@</div><div class='ctx'> #include &lt;linux/mfd/syscon.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='ctx'> #include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mt7530.h"</div><div class='ctx'> </div><div class='del'>-/* String, offset, and register size in bytes if different from 4 bytes */</div><div class='del'>-static const struct mt7530_mib_desc mt7530_mib[] = {</div><div class='del'>-	MIB_DESC(1, 0x00, "TxDrop"),</div><div class='del'>-	MIB_DESC(1, 0x04, "TxCrcErr"),</div><div class='del'>-	MIB_DESC(1, 0x08, "TxUnicast"),</div><div class='del'>-	MIB_DESC(1, 0x0c, "TxMulticast"),</div><div class='del'>-	MIB_DESC(1, 0x10, "TxBroadcast"),</div><div class='del'>-	MIB_DESC(1, 0x14, "TxCollision"),</div><div class='del'>-	MIB_DESC(1, 0x18, "TxSingleCollision"),</div><div class='del'>-	MIB_DESC(1, 0x1c, "TxMultipleCollision"),</div><div class='del'>-	MIB_DESC(1, 0x20, "TxDeferred"),</div><div class='del'>-	MIB_DESC(1, 0x24, "TxLateCollision"),</div><div class='del'>-	MIB_DESC(1, 0x28, "TxExcessiveCollistion"),</div><div class='del'>-	MIB_DESC(1, 0x2c, "TxPause"),</div><div class='del'>-	MIB_DESC(1, 0x30, "TxPktSz64"),</div><div class='del'>-	MIB_DESC(1, 0x34, "TxPktSz65To127"),</div><div class='del'>-	MIB_DESC(1, 0x38, "TxPktSz128To255"),</div><div class='del'>-	MIB_DESC(1, 0x3c, "TxPktSz256To511"),</div><div class='del'>-	MIB_DESC(1, 0x40, "TxPktSz512To1023"),</div><div class='del'>-	MIB_DESC(1, 0x44, "Tx1024ToMax"),</div><div class='del'>-	MIB_DESC(2, 0x48, "TxBytes"),</div><div class='del'>-	MIB_DESC(1, 0x60, "RxDrop"),</div><div class='del'>-	MIB_DESC(1, 0x64, "RxFiltering"),</div><div class='del'>-	MIB_DESC(1, 0x6c, "RxMulticast"),</div><div class='del'>-	MIB_DESC(1, 0x70, "RxBroadcast"),</div><div class='del'>-	MIB_DESC(1, 0x74, "RxAlignErr"),</div><div class='del'>-	MIB_DESC(1, 0x78, "RxCrcErr"),</div><div class='del'>-	MIB_DESC(1, 0x7c, "RxUnderSizeErr"),</div><div class='del'>-	MIB_DESC(1, 0x80, "RxFragErr"),</div><div class='del'>-	MIB_DESC(1, 0x84, "RxOverSzErr"),</div><div class='del'>-	MIB_DESC(1, 0x88, "RxJabberErr"),</div><div class='del'>-	MIB_DESC(1, 0x8c, "RxPause"),</div><div class='del'>-	MIB_DESC(1, 0x90, "RxPktSz64"),</div><div class='del'>-	MIB_DESC(1, 0x94, "RxPktSz65To127"),</div><div class='del'>-	MIB_DESC(1, 0x98, "RxPktSz128To255"),</div><div class='del'>-	MIB_DESC(1, 0x9c, "RxPktSz256To511"),</div><div class='del'>-	MIB_DESC(1, 0xa0, "RxPktSz512To1023"),</div><div class='del'>-	MIB_DESC(1, 0xa4, "RxPktSz1024ToMax"),</div><div class='del'>-	MIB_DESC(2, 0xa8, "RxBytes"),</div><div class='del'>-	MIB_DESC(1, 0xb0, "RxCtrlDrop"),</div><div class='del'>-	MIB_DESC(1, 0xb4, "RxIngressDrop"),</div><div class='del'>-	MIB_DESC(1, 0xb8, "RxArlDrop"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mt7623_trgmii_write(struct mt7530_priv *priv,  u32 reg, u32 val)</div><div class='add'>+static struct mt753x_pcs *pcs_to_mt753x_pcs(struct phylink_pcs *pcs)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret =  regmap_write(priv-&gt;ethernet, TRGMII_BASE(reg), val);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(priv-&gt;dev,</div><div class='del'>-			"failed to priv write register\n");</div><div class='del'>-	return ret;</div><div class='add'>+	return container_of(pcs, struct mt753x_pcs, pcs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32</div><div class='del'>-mt7623_trgmii_read(struct mt7530_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(priv-&gt;ethernet, TRGMII_BASE(reg), &amp;val);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(priv-&gt;dev,</div><div class='del'>-			"failed to priv read register\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='add'>+/* String, offset, and register size in bytes if different from 4 bytes */</div><div class='add'>+static const struct mt7530_mib_desc mt7530_mib[] = {</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_TX_DROP, "TxDrop"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_TX_CRC_ERR, "TxCrcErr"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_TX_COLLISION, "TxCollision"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_RX_DROP, "RxDrop"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_RX_FILTERING, "RxFiltering"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_RX_CRC_ERR, "RxCrcErr"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_RX_CTRL_DROP, "RxCtrlDrop"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_RX_INGRESS_DROP, "RxIngressDrop"),</div><div class='add'>+	MIB_DESC(1, MT7530_PORT_MIB_RX_ARL_DROP, "RxArlDrop"),</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7623_trgmii_rmw(struct mt7530_priv *priv, u32 reg,</div><div class='del'>-		  u32 mask, u32 set)</div><div class='add'>+mt7530_mutex_lock(struct mt7530_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = mt7623_trgmii_read(priv, reg);</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	val |= set;</div><div class='del'>-	mt7623_trgmii_write(priv, reg, val);</div><div class='add'>+	if (priv-&gt;bus)</div><div class='add'>+		mutex_lock_nested(&amp;priv-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7623_trgmii_set(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='add'>+mt7530_mutex_unlock(struct mt7530_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	mt7623_trgmii_rmw(priv, reg, 0, val);</div><div class='add'>+	if (priv-&gt;bus)</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;bus-&gt;mdio_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-mt7623_trgmii_clear(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	mt7623_trgmii_rmw(priv, reg, val, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-core_read_mmd_indirect(struct mt7530_priv *priv, int prtad, int devad)</div><div class='add'>+core_write(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-	int value, ret;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Write the desired MMD Devad */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_CTRL, devad);</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_CTRL, MDIO_MMD_VEND2);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Write the desired MMD register address */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_DATA, prtad);</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_DATA, reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Select the Function : DATA with no post increment */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR));</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_CTRL, MDIO_MMD_VEND2 | MII_MMD_CTRL_NOINCR);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	/* Read the content of the MMD's selected register */</div><div class='del'>-	value = bus-&gt;read(bus, 0, MII_MMD_DATA);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='add'>+	/* Write the data into MMD's selected register */</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_DATA, val);</div><div class='ctx'> err:</div><div class='del'>-	dev_err(&amp;bus-&gt;dev,  "failed to read mmd register\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(&amp;bus-&gt;dev, "failed to write mmd register\n");</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-core_write_mmd_indirect(struct mt7530_priv *priv, int prtad,</div><div class='del'>-			int devad, u32 data)</div><div class='add'>+static void</div><div class='add'>+core_rmw(struct mt7530_priv *priv, u32 reg, u32 mask, u32 set)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u32 val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='add'>+</div><div class='ctx'> 	/* Write the desired MMD Devad */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_CTRL, devad);</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_CTRL, MDIO_MMD_VEND2);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Write the desired MMD register address */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_DATA, prtad);</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_DATA, reg);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	/* Select the Function : DATA with no post increment */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR));</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_CTRL, MDIO_MMD_VEND2 | MII_MMD_CTRL_NOINCR);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='add'>+	/* Read the content of the MMD's selected register */</div><div class='add'>+	val = bus-&gt;read(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			MII_MMD_DATA);</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+	val |= set;</div><div class='ctx'> 	/* Write the data into MMD's selected register */</div><div class='del'>-	ret = bus-&gt;write(bus, 0, MII_MMD_DATA, data);</div><div class='add'>+	ret = bus-&gt;write(bus, MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+			 MII_MMD_DATA, val);</div><div class='ctx'> err:</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		dev_err(&amp;bus-&gt;dev,</div><div class='del'>-			"failed to write mmd register\n");</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-core_write(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-</div><div class='del'>-	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='del'>-</div><div class='del'>-	core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-core_rmw(struct mt7530_priv *priv, u32 reg, u32 mask, u32 set)</div><div class='del'>-{</div><div class='del'>-	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='del'>-</div><div class='del'>-	val = core_read_mmd_indirect(priv, reg, MDIO_MMD_VEND2);</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	val |= set;</div><div class='del'>-	core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val);</div><div class='add'>+		dev_err(&amp;bus-&gt;dev, "failed to write mmd register\n");</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -223,79 +150,60 @@ core_clear(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='ctx'> static int</div><div class='ctx'> mt7530_mii_write(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-	u16 page, r, lo, hi;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	page = (reg &gt;&gt; 6) &amp; 0x3ff;</div><div class='del'>-	r  = (reg &gt;&gt; 2) &amp; 0xf;</div><div class='del'>-	lo = val &amp; 0xffff;</div><div class='del'>-	hi = val &gt;&gt; 16;</div><div class='del'>-</div><div class='del'>-	/* MT7530 uses 31 as the pseudo port */</div><div class='del'>-	ret = bus-&gt;write(bus, 0x1f, 0x1f, page);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, reg, val);</div><div class='ctx'> </div><div class='del'>-	ret = bus-&gt;write(bus, 0x1f, r,  lo);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='del'>-	ret = bus-&gt;write(bus, 0x1f, 0x10, hi);</div><div class='del'>-err:</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(&amp;bus-&gt;dev,</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='ctx'> 			"failed to write mt7530 register\n");</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='ctx'> mt7530_mii_read(struct mt7530_priv *priv, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-	u16 page, r, lo, hi;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='del'>-	page = (reg &gt;&gt; 6) &amp; 0x3ff;</div><div class='del'>-	r = (reg &gt;&gt; 2) &amp; 0xf;</div><div class='del'>-</div><div class='del'>-	/* MT7530 uses 31 as the pseudo port */</div><div class='del'>-	ret = bus-&gt;write(bus, 0x1f, 0x1f, page);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(&amp;bus-&gt;dev,</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, reg, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='ctx'> 			"failed to read mt7530 register\n");</div><div class='del'>-		return ret;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lo = bus-&gt;read(bus, 0x1f, r);</div><div class='del'>-	hi = bus-&gt;read(bus, 0x1f, 0x10);</div><div class='del'>-</div><div class='del'>-	return (hi &lt;&lt; 16) | (lo &amp; 0xffff);</div><div class='add'>+	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7530_write(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-</div><div class='del'>-	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='ctx'> </div><div class='ctx'> 	mt7530_mii_write(priv, reg, val);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+_mt7530_unlocked_read(struct mt7530_dummy_poll *p)</div><div class='add'>+{</div><div class='add'>+	return mt7530_mii_read(p-&gt;priv, p-&gt;reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32</div><div class='ctx'> _mt7530_read(struct mt7530_dummy_poll *p)</div><div class='ctx'> {</div><div class='del'>-	struct mii_bus		*bus = p-&gt;priv-&gt;bus;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+	mt7530_mutex_lock(p-&gt;priv);</div><div class='ctx'> </div><div class='ctx'> 	val = mt7530_mii_read(p-&gt;priv, p-&gt;reg);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	mt7530_mutex_unlock(p-&gt;priv);</div><div class='ctx'> </div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='hunk'>@@ -313,23 +221,17 @@ static void</div><div class='ctx'> mt7530_rmw(struct mt7530_priv *priv, u32 reg,</div><div class='ctx'> 	   u32 mask, u32 set)</div><div class='ctx'> {</div><div class='del'>-	struct mii_bus *bus = priv-&gt;bus;</div><div class='del'>-	u32 val;</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='ctx'> </div><div class='del'>-	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, reg, mask, set);</div><div class='ctx'> </div><div class='del'>-	val = mt7530_mii_read(priv, reg);</div><div class='del'>-	val &amp;= ~mask;</div><div class='del'>-	val |= set;</div><div class='del'>-	mt7530_mii_write(priv, reg, val);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7530_set(struct mt7530_priv *priv, u32 reg, u32 val)</div><div class='ctx'> {</div><div class='del'>-	mt7530_rmw(priv, reg, 0, val);</div><div class='add'>+	mt7530_rmw(priv, reg, val, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -405,6 +307,8 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid,</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	reg[1] |= vid &amp; CVID_MASK;</div><div class='add'>+	reg[1] |= ATA2_IVL;</div><div class='add'>+	reg[1] |= ATA2_FID(FID_BRIDGED);</div><div class='ctx'> 	reg[2] |= (aging &amp; AGE_TIMER_MASK) &lt;&lt; AGE_TIMER;</div><div class='ctx'> 	reg[2] |= (port_mask &amp; PORT_MAP_MASK) &lt;&lt; PORT_MAP;</div><div class='ctx'> 	/* STATIC_ENT indicate that entry is static wouldn't</div><div class='hunk'>@@ -424,108 +328,186 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid,</div><div class='ctx'> 		mt7530_write(priv, MT7530_ATA1 + (i * 4), reg[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7530_pad_clk_setup(struct dsa_switch *ds, int mode)</div><div class='add'>+/* Set up switch core clock for MT7530 */</div><div class='add'>+static void mt7530_pll_setup(struct mt7530_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	u32 ncpo1, ssc_delta, trgint, i;</div><div class='add'>+	/* Disable core clock */</div><div class='add'>+	core_clear(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);</div><div class='ctx'> </div><div class='del'>-	switch (mode) {</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII:</div><div class='del'>-		trgint = 0;</div><div class='del'>-		ncpo1 = 0x0c80;</div><div class='del'>-		ssc_delta = 0x87;</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_TRGMII:</div><div class='del'>-		trgint = 1;</div><div class='del'>-		ncpo1 = 0x1400;</div><div class='del'>-		ssc_delta = 0x57;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(priv-&gt;dev, "xMII mode %d not supported\n", mode);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	/* Disable PLL */</div><div class='add'>+	core_write(priv, CORE_GSWPLL_GRP1, 0);</div><div class='ctx'> </div><div class='del'>-	mt7530_rmw(priv, MT7530_P6ECR, P6_INTF_MODE_MASK,</div><div class='del'>-		   P6_INTF_MODE(trgint));</div><div class='add'>+	/* Set core clock into 500Mhz */</div><div class='add'>+	core_write(priv, CORE_GSWPLL_GRP2,</div><div class='add'>+		   RG_GSWPLL_POSDIV_500M(1) |</div><div class='add'>+		   RG_GSWPLL_FBKDIV_500M(25));</div><div class='ctx'> </div><div class='del'>-	/* Lower Tx Driving for TRGMII path */</div><div class='del'>-	for (i = 0 ; i &lt; NUM_TRGMII_CTRL ; i++)</div><div class='del'>-		mt7530_write(priv, MT7530_TRGMII_TD_ODT(i),</div><div class='del'>-			     TD_DM_DRVP(8) | TD_DM_DRVN(8));</div><div class='add'>+	/* Enable PLL */</div><div class='add'>+	core_write(priv, CORE_GSWPLL_GRP1,</div><div class='add'>+		   RG_GSWPLL_EN_PRE |</div><div class='add'>+		   RG_GSWPLL_POSDIV_200M(2) |</div><div class='add'>+		   RG_GSWPLL_FBKDIV_200M(32));</div><div class='ctx'> </div><div class='del'>-	/* Setup core clock for MT7530 */</div><div class='del'>-	if (!trgint) {</div><div class='del'>-		/* Disable MT7530 core clock */</div><div class='del'>-		core_clear(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);</div><div class='add'>+	udelay(20);</div><div class='ctx'> </div><div class='del'>-		/* Disable PLL, since phy_device has not yet been created</div><div class='del'>-		 * provided for phy_[read,write]_mmd_indirect is called, we</div><div class='del'>-		 * provide our own core_write_mmd_indirect to complete this</div><div class='del'>-		 * function.</div><div class='del'>-		 */</div><div class='del'>-		core_write_mmd_indirect(priv,</div><div class='del'>-					CORE_GSWPLL_GRP1,</div><div class='del'>-					MDIO_MMD_VEND2,</div><div class='del'>-					0);</div><div class='add'>+	/* Enable core clock */</div><div class='add'>+	core_set(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If port 6 is available as a CPU port, always prefer that as the default,</div><div class='add'>+ * otherwise don't care.</div><div class='add'>+ */</div><div class='add'>+static struct dsa_port *</div><div class='add'>+mt753x_preferred_default_local_cpu_port(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = dsa_to_port(ds, 6);</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(cpu_dp))</div><div class='add'>+		return cpu_dp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Setup port 6 interface mode and TRGMII TX circuit */</div><div class='add'>+static void</div><div class='add'>+mt7530_setup_port6(struct dsa_switch *ds, phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 ncpo1, ssc_delta, xtal;</div><div class='add'>+</div><div class='add'>+	/* Disable the MT7530 TRGMII clocks */</div><div class='add'>+	core_clear(priv, CORE_TRGMII_GSW_CLK_CG, REG_TRGMIICK_EN);</div><div class='add'>+</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_RGMII) {</div><div class='add'>+		mt7530_rmw(priv, MT7530_P6ECR, P6_INTF_MODE_MASK,</div><div class='add'>+			   P6_INTF_MODE(0));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_rmw(priv, MT7530_P6ECR, P6_INTF_MODE_MASK, P6_INTF_MODE(1));</div><div class='ctx'> </div><div class='del'>-		/* Set core clock into 500Mhz */</div><div class='del'>-		core_write(priv, CORE_GSWPLL_GRP2,</div><div class='del'>-			   RG_GSWPLL_POSDIV_500M(1) |</div><div class='del'>-			   RG_GSWPLL_FBKDIV_500M(25));</div><div class='add'>+	xtal = mt7530_read(priv, MT753X_MTRAP) &amp; MT7530_XTAL_MASK;</div><div class='ctx'> </div><div class='del'>-		/* Enable PLL */</div><div class='del'>-		core_write(priv, CORE_GSWPLL_GRP1,</div><div class='del'>-			   RG_GSWPLL_EN_PRE |</div><div class='del'>-			   RG_GSWPLL_POSDIV_200M(2) |</div><div class='del'>-			   RG_GSWPLL_FBKDIV_200M(32));</div><div class='add'>+	if (xtal == MT7530_XTAL_25MHZ)</div><div class='add'>+		ssc_delta = 0x57;</div><div class='add'>+	else</div><div class='add'>+		ssc_delta = 0x87;</div><div class='ctx'> </div><div class='del'>-		/* Enable MT7530 core clock */</div><div class='del'>-		core_set(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);</div><div class='add'>+	if (priv-&gt;id == ID_MT7621) {</div><div class='add'>+		/* PLL frequency: 125MHz: 1.0GBit */</div><div class='add'>+		if (xtal == MT7530_XTAL_40MHZ)</div><div class='add'>+			ncpo1 = 0x0640;</div><div class='add'>+		if (xtal == MT7530_XTAL_25MHZ)</div><div class='add'>+			ncpo1 = 0x0a00;</div><div class='add'>+	} else { /* PLL frequency: 250MHz: 2.0Gbit */</div><div class='add'>+		if (xtal == MT7530_XTAL_40MHZ)</div><div class='add'>+			ncpo1 = 0x0c80;</div><div class='add'>+		if (xtal == MT7530_XTAL_25MHZ)</div><div class='add'>+			ncpo1 = 0x1400;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the MT7530 TRGMII Tx Clock */</div><div class='del'>-	core_set(priv, CORE_TRGMII_GSW_CLK_CG, REG_GSWCK_EN);</div><div class='ctx'> 	core_write(priv, CORE_PLL_GROUP5, RG_LCDDS_PCW_NCPO1(ncpo1));</div><div class='ctx'> 	core_write(priv, CORE_PLL_GROUP6, RG_LCDDS_PCW_NCPO0(0));</div><div class='ctx'> 	core_write(priv, CORE_PLL_GROUP10, RG_LCDDS_SSC_DELTA(ssc_delta));</div><div class='ctx'> 	core_write(priv, CORE_PLL_GROUP11, RG_LCDDS_SSC_DELTA1(ssc_delta));</div><div class='del'>-	core_write(priv, CORE_PLL_GROUP4,</div><div class='del'>-		   RG_SYSPLL_DDSFBK_EN | RG_SYSPLL_BIAS_EN |</div><div class='del'>-		   RG_SYSPLL_BIAS_LPF_EN);</div><div class='del'>-	core_write(priv, CORE_PLL_GROUP2,</div><div class='del'>-		   RG_SYSPLL_EN_NORMAL | RG_SYSPLL_VODEN |</div><div class='del'>-		   RG_SYSPLL_POSDIV(1));</div><div class='del'>-	core_write(priv, CORE_PLL_GROUP7,</div><div class='del'>-		   RG_LCDDS_PCW_NCPO_CHG | RG_LCCDS_C(3) |</div><div class='del'>-		   RG_LCDDS_PWDB | RG_LCDDS_ISO_EN);</div><div class='del'>-	core_set(priv, CORE_TRGMII_GSW_CLK_CG,</div><div class='del'>-		 REG_GSWCK_EN | REG_TRGMIICK_EN);</div><div class='del'>-</div><div class='del'>-	if (!trgint)</div><div class='del'>-		for (i = 0 ; i &lt; NUM_TRGMII_CTRL; i++)</div><div class='del'>-			mt7530_rmw(priv, MT7530_TRGMII_RD(i),</div><div class='del'>-				   RD_TAP_MASK, RD_TAP(16));</div><div class='del'>-	else</div><div class='del'>-		mt7623_trgmii_set(priv, GSW_INTF_MODE, INTF_MODE_TRGMII);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	core_write(priv, CORE_PLL_GROUP4, RG_SYSPLL_DDSFBK_EN |</div><div class='add'>+		   RG_SYSPLL_BIAS_EN | RG_SYSPLL_BIAS_LPF_EN);</div><div class='add'>+	core_write(priv, CORE_PLL_GROUP2, RG_SYSPLL_EN_NORMAL |</div><div class='add'>+		   RG_SYSPLL_VODEN | RG_SYSPLL_POSDIV(1));</div><div class='add'>+	core_write(priv, CORE_PLL_GROUP7, RG_LCDDS_PCW_NCPO_CHG |</div><div class='add'>+		   RG_LCCDS_C(3) | RG_LCDDS_PWDB | RG_LCDDS_ISO_EN);</div><div class='add'>+</div><div class='add'>+	/* Enable the MT7530 TRGMII clocks */</div><div class='add'>+	core_set(priv, CORE_TRGMII_GSW_CLK_CG, REG_TRGMIICK_EN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7623_pad_clk_setup(struct dsa_switch *ds)</div><div class='add'>+static void</div><div class='add'>+mt7531_pll_setup(struct mt7530_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0 ; i &lt; NUM_TRGMII_CTRL; i++)</div><div class='del'>-		mt7623_trgmii_write(priv, GSW_TRGMII_TD_ODT(i),</div><div class='del'>-				    TD_DM_DRVP(8) | TD_DM_DRVN(8));</div><div class='add'>+	enum mt7531_xtal_fsel xtal;</div><div class='add'>+	u32 top_sig;</div><div class='add'>+	u32 hwstrap;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='del'>-	mt7623_trgmii_set(priv, GSW_TRGMII_RCK_CTRL, RX_RST | RXC_DQSISEL);</div><div class='del'>-	mt7623_trgmii_clear(priv, GSW_TRGMII_RCK_CTRL, RX_RST);</div><div class='add'>+	val = mt7530_read(priv, MT7531_CREV);</div><div class='add'>+	top_sig = mt7530_read(priv, MT7531_TOP_SIG_SR);</div><div class='add'>+	hwstrap = mt7530_read(priv, MT753X_TRAP);</div><div class='add'>+	if ((val &amp; CHIP_REV_M) &gt; 0)</div><div class='add'>+		xtal = (top_sig &amp; PAD_MCM_SMI_EN) ? MT7531_XTAL_FSEL_40MHZ :</div><div class='add'>+						    MT7531_XTAL_FSEL_25MHZ;</div><div class='add'>+	else</div><div class='add'>+		xtal = (hwstrap &amp; MT7531_XTAL25) ? MT7531_XTAL_FSEL_25MHZ :</div><div class='add'>+						   MT7531_XTAL_FSEL_40MHZ;</div><div class='add'>+</div><div class='add'>+	/* Step 1 : Disable MT7531 COREPLL */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_EN);</div><div class='add'>+	val &amp;= ~EN_COREPLL;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_EN, val);</div><div class='add'>+</div><div class='add'>+	/* Step 2: switch to XTAL output */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_EN);</div><div class='add'>+	val |= SW_CLKSW;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_EN, val);</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+	val &amp;= ~RG_COREPLL_EN;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+</div><div class='add'>+	/* Step 3: disable PLLGP and enable program PLLGP */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_EN);</div><div class='add'>+	val |= SW_PLLGP;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_EN, val);</div><div class='add'>+</div><div class='add'>+	/* Step 4: program COREPLL output frequency to 500MHz */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+	val &amp;= ~RG_COREPLL_POSDIV_M;</div><div class='add'>+	val |= 2 &lt;&lt; RG_COREPLL_POSDIV_S;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+	usleep_range(25, 35);</div><div class='add'>+</div><div class='add'>+	switch (xtal) {</div><div class='add'>+	case MT7531_XTAL_FSEL_25MHZ:</div><div class='add'>+		val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+		val &amp;= ~RG_COREPLL_SDM_PCW_M;</div><div class='add'>+		val |= 0x140000 &lt;&lt; RG_COREPLL_SDM_PCW_S;</div><div class='add'>+		mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+		break;</div><div class='add'>+	case MT7531_XTAL_FSEL_40MHZ:</div><div class='add'>+		val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+		val &amp;= ~RG_COREPLL_SDM_PCW_M;</div><div class='add'>+		val |= 0x190000 &lt;&lt; RG_COREPLL_SDM_PCW_S;</div><div class='add'>+		mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Set feedback divide ratio update signal to high */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+	val |= RG_COREPLL_SDM_PCW_CHG;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+	/* Wait for at least 16 XTAL clocks */</div><div class='add'>+	usleep_range(10, 20);</div><div class='add'>+</div><div class='add'>+	/* Step 5: set feedback divide ratio update signal to low */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+	val &amp;= ~RG_COREPLL_SDM_PCW_CHG;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+</div><div class='add'>+	/* Enable 325M clock for SGMII */</div><div class='add'>+	mt7530_write(priv, MT7531_ANA_PLLGP_CR5, 0xad0000);</div><div class='add'>+</div><div class='add'>+	/* Enable 250SSC clock for RGMII */</div><div class='add'>+	mt7530_write(priv, MT7531_ANA_PLLGP_CR2, 0x4f40000);</div><div class='add'>+</div><div class='add'>+	/* Step 6: Enable MT7531 PLL */</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_CR0);</div><div class='add'>+	val |= RG_COREPLL_EN;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_CR0, val);</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT7531_PLLGP_EN);</div><div class='add'>+	val |= EN_COREPLL;</div><div class='add'>+	mt7530_write(priv, MT7531_PLLGP_EN, val);</div><div class='add'>+	usleep_range(25, 35);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -537,30 +519,229 @@ mt7530_mib_reset(struct dsa_switch *ds)</div><div class='ctx'> 	mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7530_port_set_status(struct mt7530_priv *priv, int port, int enable)</div><div class='add'>+static int mt7530_phy_read_c22(struct mt7530_priv *priv, int port, int regnum)</div><div class='ctx'> {</div><div class='del'>-	u32 mask = PMCR_TX_EN | PMCR_RX_EN;</div><div class='add'>+	return mdiobus_read_nested(priv-&gt;bus, port, regnum);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (enable)</div><div class='del'>-		mt7530_set(priv, MT7530_PMCR_P(port), mask);</div><div class='del'>-	else</div><div class='del'>-		mt7530_clear(priv, MT7530_PMCR_P(port), mask);</div><div class='add'>+static int mt7530_phy_write_c22(struct mt7530_priv *priv, int port, int regnum,</div><div class='add'>+				u16 val)</div><div class='add'>+{</div><div class='add'>+	return mdiobus_write_nested(priv-&gt;bus, port, regnum, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7530_phy_read(struct dsa_switch *ds, int port, int regnum)</div><div class='add'>+static int mt7530_phy_read_c45(struct mt7530_priv *priv, int port,</div><div class='add'>+			       int devad, int regnum)</div><div class='ctx'> {</div><div class='del'>-	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	return mdiobus_c45_read_nested(priv-&gt;bus, port, devad, regnum);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return mdiobus_read_nested(priv-&gt;bus, port, regnum);</div><div class='add'>+static int mt7530_phy_write_c45(struct mt7530_priv *priv, int port, int devad,</div><div class='add'>+				int regnum, u16 val)</div><div class='add'>+{</div><div class='add'>+	return mdiobus_c45_write_nested(priv-&gt;bus, port, devad, regnum, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mt7530_phy_write(struct dsa_switch *ds, int port, int regnum,</div><div class='del'>-			    u16 val)</div><div class='add'>+static int</div><div class='add'>+mt7531_ind_c45_phy_read(struct mt7530_priv *priv, int port, int devad,</div><div class='add'>+			int regnum)</div><div class='ctx'> {</div><div class='del'>-	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct mt7530_dummy_poll p;</div><div class='add'>+	u32 reg, val;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return mdiobus_write_nested(priv-&gt;bus, port, regnum, val);</div><div class='add'>+	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT7531_PHY_IAC);</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = MT7531_MDIO_CL45_ADDR | MT7531_MDIO_PHY_ADDR(port) |</div><div class='add'>+	      MT7531_MDIO_DEV_ADDR(devad) | regnum;</div><div class='add'>+	mt7530_mii_write(priv, MT7531_PHY_IAC, reg | MT7531_PHY_ACS_ST);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = MT7531_MDIO_CL45_READ | MT7531_MDIO_PHY_ADDR(port) |</div><div class='add'>+	      MT7531_MDIO_DEV_ADDR(devad);</div><div class='add'>+	mt7530_mii_write(priv, MT7531_PHY_IAC, reg | MT7531_PHY_ACS_ST);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = val &amp; MT7531_MDIO_RW_DATA_MASK;</div><div class='add'>+out:</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7531_ind_c45_phy_write(struct mt7530_priv *priv, int port, int devad,</div><div class='add'>+			 int regnum, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_dummy_poll p;</div><div class='add'>+	u32 val, reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT7531_PHY_IAC);</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = MT7531_MDIO_CL45_ADDR | MT7531_MDIO_PHY_ADDR(port) |</div><div class='add'>+	      MT7531_MDIO_DEV_ADDR(devad) | regnum;</div><div class='add'>+	mt7530_mii_write(priv, MT7531_PHY_IAC, reg | MT7531_PHY_ACS_ST);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = MT7531_MDIO_CL45_WRITE | MT7531_MDIO_PHY_ADDR(port) |</div><div class='add'>+	      MT7531_MDIO_DEV_ADDR(devad) | data;</div><div class='add'>+	mt7530_mii_write(priv, MT7531_PHY_IAC, reg | MT7531_PHY_ACS_ST);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7531_ind_c22_phy_read(struct mt7530_priv *priv, int port, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_dummy_poll p;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT7531_PHY_IAC);</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = MT7531_MDIO_CL22_READ | MT7531_MDIO_PHY_ADDR(port) |</div><div class='add'>+	      MT7531_MDIO_REG_ADDR(regnum);</div><div class='add'>+</div><div class='add'>+	mt7530_mii_write(priv, MT7531_PHY_IAC, val | MT7531_PHY_ACS_ST);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, val,</div><div class='add'>+				 !(val &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = val &amp; MT7531_MDIO_RW_DATA_MASK;</div><div class='add'>+out:</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7531_ind_c22_phy_write(struct mt7530_priv *priv, int port, int regnum,</div><div class='add'>+			 u16 data)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_dummy_poll p;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT7531_PHY_IAC);</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, reg,</div><div class='add'>+				 !(reg &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = MT7531_MDIO_CL22_WRITE | MT7531_MDIO_PHY_ADDR(port) |</div><div class='add'>+	      MT7531_MDIO_REG_ADDR(regnum) | data;</div><div class='add'>+</div><div class='add'>+	mt7530_mii_write(priv, MT7531_PHY_IAC, reg | MT7531_PHY_ACS_ST);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_unlocked_read, &amp;p, reg,</div><div class='add'>+				 !(reg &amp; MT7531_PHY_ACS_ST), 20, 100000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "poll timeout\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt753x_phy_read_c22(struct mii_bus *bus, int port, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;phy_read_c22(priv, port, regnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt753x_phy_read_c45(struct mii_bus *bus, int port, int devad, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;phy_read_c45(priv, port, devad, regnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt753x_phy_write_c22(struct mii_bus *bus, int port, int regnum, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;phy_write_c22(priv, port, regnum, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt753x_phy_write_c45(struct mii_bus *bus, int port, int devad, int regnum,</div><div class='add'>+		     u16 val)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;phy_write_c45(priv, port, devad, regnum, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -573,8 +754,22 @@ mt7530_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mt7530_mib); i++)</div><div class='del'>-		strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name,</div><div class='del'>-			ETH_GSTRING_LEN);</div><div class='add'>+		ethtool_puts(&amp;data, mt7530_mib[i].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_read_port_stats(struct mt7530_priv *priv, int port,</div><div class='add'>+		       u32 offset, u8 size, uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	u32 val, reg = MT7530_PORT_MIB_COUNTER(port) + offset;</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, reg);</div><div class='add'>+	*data = val;</div><div class='add'>+</div><div class='add'>+	if (size == 2) {</div><div class='add'>+		val = mt7530_read(priv, reg + 4);</div><div class='add'>+		*data |= (u64)val &lt;&lt; 32;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -583,18 +778,13 @@ mt7530_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='ctx'> 	const struct mt7530_mib_desc *mib;</div><div class='del'>-	u32 reg, i;</div><div class='del'>-	u64 hi;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mt7530_mib); i++) {</div><div class='ctx'> 		mib = &amp;mt7530_mib[i];</div><div class='del'>-		reg = MT7530_PORT_MIB_COUNTER(port) + mib-&gt;offset;</div><div class='ctx'> </div><div class='del'>-		data[i] = mt7530_read(priv, reg);</div><div class='del'>-		if (mib-&gt;size == 2) {</div><div class='del'>-			hi = mt7530_read(priv, reg + 4);</div><div class='del'>-			data[i] |= hi &lt;&lt; 32;</div><div class='del'>-		}</div><div class='add'>+		mt7530_read_port_stats(priv, port, mib-&gt;offset, mib-&gt;size,</div><div class='add'>+				       data + i);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -607,116 +797,553 @@ mt7530_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> 	return ARRAY_SIZE(mt7530_mib);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mt7530_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-			       struct phy_device *phydev)</div><div class='add'>+static void mt7530_get_eth_mac_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct ethtool_eth_mac_stats *mac_stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (phy_is_pseudo_fixed_link(phydev)) {</div><div class='del'>-		if (priv-&gt;id == ID_MT7530) {</div><div class='del'>-			dev_dbg(priv-&gt;dev, "phy-mode for master device = %x\n",</div><div class='del'>-				phydev-&gt;interface);</div><div class='add'>+	/* MIB counter doesn't provide a FramesTransmittedOK but instead</div><div class='add'>+	 * provide stats for Unicast, Broadcast and Multicast frames separately.</div><div class='add'>+	 * To simulate a global frame counter, read Unicast and addition Multicast</div><div class='add'>+	 * and Broadcast later</div><div class='add'>+	 */</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_UNICAST, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;FramesTransmittedOK);</div><div class='ctx'> </div><div class='del'>-			/* Setup TX circuit incluing relevant PAD and driving */</div><div class='del'>-			mt7530_pad_clk_setup(ds, phydev-&gt;interface);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_SINGLE_COLLISION, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;SingleCollisionFrames);</div><div class='ctx'> </div><div class='del'>-			/* Setup RX circuit, relevant PAD and driving on the</div><div class='del'>-			 * host which must be placed after the setup on the</div><div class='del'>-			 * device side is all finished.</div><div class='del'>-			 */</div><div class='del'>-			mt7623_pad_clk_setup(ds);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		u16 lcl_adv = 0, rmt_adv = 0;</div><div class='del'>-		u8 flowctrl;</div><div class='del'>-		u32 mcr = PMCR_USERP_LINK | PMCR_FORCE_MODE;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_MULTIPLE_COLLISION, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;MultipleCollisionFrames);</div><div class='ctx'> </div><div class='del'>-		switch (phydev-&gt;speed) {</div><div class='del'>-		case SPEED_1000:</div><div class='del'>-			mcr |= PMCR_FORCE_SPEED_1000;</div><div class='del'>-			break;</div><div class='del'>-		case SPEED_100:</div><div class='del'>-			mcr |= PMCR_FORCE_SPEED_100;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_UNICAST, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;FramesReceivedOK);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_BYTES, 2,</div><div class='add'>+			       &amp;mac_stats-&gt;OctetsTransmittedOK);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_ALIGN_ERR, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;AlignmentErrors);</div><div class='ctx'> </div><div class='del'>-		if (phydev-&gt;link)</div><div class='del'>-			mcr |= PMCR_FORCE_LNK;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_DEFERRED, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;FramesWithDeferredXmissions);</div><div class='ctx'> </div><div class='del'>-		if (phydev-&gt;duplex) {</div><div class='del'>-			mcr |= PMCR_FORCE_FDX;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_LATE_COLLISION, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;LateCollisions);</div><div class='ctx'> </div><div class='del'>-			if (phydev-&gt;pause)</div><div class='del'>-				rmt_adv = LPA_PAUSE_CAP;</div><div class='del'>-			if (phydev-&gt;asym_pause)</div><div class='del'>-				rmt_adv |= LPA_PAUSE_ASYM;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_EXCESSIVE_COLLISION, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;FramesAbortedDueToXSColls);</div><div class='ctx'> </div><div class='del'>-			lcl_adv = linkmode_adv_to_lcl_adv_t(</div><div class='del'>-				phydev-&gt;advertising);</div><div class='del'>-			flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_BYTES, 2,</div><div class='add'>+			       &amp;mac_stats-&gt;OctetsReceivedOK);</div><div class='ctx'> </div><div class='del'>-			if (flowctrl &amp; FLOW_CTRL_TX)</div><div class='del'>-				mcr |= PMCR_TX_FC_EN;</div><div class='del'>-			if (flowctrl &amp; FLOW_CTRL_RX)</div><div class='del'>-				mcr |= PMCR_RX_FC_EN;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_MULTICAST, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;MulticastFramesXmittedOK);</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK += mac_stats-&gt;MulticastFramesXmittedOK;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_BROADCAST, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;BroadcastFramesXmittedOK);</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK += mac_stats-&gt;BroadcastFramesXmittedOK;</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_MULTICAST, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;MulticastFramesReceivedOK);</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK += mac_stats-&gt;MulticastFramesReceivedOK;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_BROADCAST, 1,</div><div class='add'>+			       &amp;mac_stats-&gt;BroadcastFramesReceivedOK);</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK += mac_stats-&gt;BroadcastFramesReceivedOK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range mt7530_rmon_ranges[] = {</div><div class='add'>+	{ 0, 64 },</div><div class='add'>+	{ 65, 127 },</div><div class='add'>+	{ 128, 255 },</div><div class='add'>+	{ 256, 511 },</div><div class='add'>+	{ 512, 1023 },</div><div class='add'>+	{ 1024, MT7530_MAX_MTU },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mt7530_get_rmon_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				  const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_UNDER_SIZE_ERR, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;undersize_pkts);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_OVER_SZ_ERR, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;oversize_pkts);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_FRAG_ERR, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;fragments);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_JABBER_ERR, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;jabbers);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PKT_SZ_64, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist[0]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PKT_SZ_65_TO_127, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist[1]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PKT_SZ_128_TO_255, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist[2]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PKT_SZ_256_TO_511, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist[3]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PKT_SZ_512_TO_1023, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist[4]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PKT_SZ_1024_TO_MAX, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist[5]);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PKT_SZ_64, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist_tx[0]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PKT_SZ_65_TO_127, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist_tx[1]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PKT_SZ_128_TO_255, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist_tx[2]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PKT_SZ_256_TO_511, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist_tx[3]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PKT_SZ_512_TO_1023, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist_tx[4]);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PKT_SZ_1024_TO_MAX, 1,</div><div class='add'>+			       &amp;rmon_stats-&gt;hist_tx[5]);</div><div class='add'>+</div><div class='add'>+	*ranges = mt7530_rmon_ranges;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct rtnl_link_stats64 *storage)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	uint64_t data;</div><div class='add'>+</div><div class='add'>+	/* MIB counter doesn't provide a FramesTransmittedOK but instead</div><div class='add'>+	 * provide stats for Unicast, Broadcast and Multicast frames separately.</div><div class='add'>+	 * To simulate a global frame counter, read Unicast and addition Multicast</div><div class='add'>+	 * and Broadcast later</div><div class='add'>+	 */</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_UNICAST, 1,</div><div class='add'>+			       &amp;storage-&gt;rx_packets);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_MULTICAST, 1,</div><div class='add'>+			       &amp;storage-&gt;multicast);</div><div class='add'>+	storage-&gt;rx_packets += storage-&gt;multicast;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_BROADCAST, 1,</div><div class='add'>+			       &amp;data);</div><div class='add'>+	storage-&gt;rx_packets += data;</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_UNICAST, 1,</div><div class='add'>+			       &amp;storage-&gt;tx_packets);</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_MULTICAST, 1,</div><div class='add'>+			       &amp;data);</div><div class='add'>+	storage-&gt;tx_packets += data;</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_BROADCAST, 1,</div><div class='add'>+			       &amp;data);</div><div class='add'>+	storage-&gt;tx_packets += data;</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_BYTES, 2,</div><div class='add'>+			       &amp;storage-&gt;rx_bytes);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_BYTES, 2,</div><div class='add'>+			       &amp;storage-&gt;tx_bytes);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_DROP, 1,</div><div class='add'>+			       &amp;storage-&gt;rx_dropped);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_DROP, 1,</div><div class='add'>+			       &amp;storage-&gt;tx_dropped);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_CRC_ERR, 1,</div><div class='add'>+			       &amp;storage-&gt;rx_crc_errors);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_get_eth_ctrl_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				      struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_TX_PAUSE, 1,</div><div class='add'>+			       &amp;ctrl_stats-&gt;MACControlFramesTransmitted);</div><div class='add'>+</div><div class='add'>+	mt7530_read_port_stats(priv, port, MT7530_PORT_MIB_RX_PAUSE, 1,</div><div class='add'>+			       &amp;ctrl_stats-&gt;MACControlFramesReceived);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int secs = msecs / 1000;</div><div class='add'>+	unsigned int tmp_age_count;</div><div class='add'>+	unsigned int error = -1;</div><div class='add'>+	unsigned int age_count;</div><div class='add'>+	unsigned int age_unit;</div><div class='add'>+</div><div class='add'>+	/* Applied timer is (AGE_CNT + 1) * (AGE_UNIT + 1) seconds */</div><div class='add'>+	if (secs &lt; 1 || secs &gt; (AGE_CNT_MAX + 1) * (AGE_UNIT_MAX + 1))</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* iterate through all possible age_count to find the closest pair */</div><div class='add'>+	for (tmp_age_count = 0; tmp_age_count &lt;= AGE_CNT_MAX; ++tmp_age_count) {</div><div class='add'>+		unsigned int tmp_age_unit = secs / (tmp_age_count + 1) - 1;</div><div class='add'>+</div><div class='add'>+		if (tmp_age_unit &lt;= AGE_UNIT_MAX) {</div><div class='add'>+			unsigned int tmp_error = secs -</div><div class='add'>+				(tmp_age_count + 1) * (tmp_age_unit + 1);</div><div class='add'>+</div><div class='add'>+			/* found a closer pair */</div><div class='add'>+			if (error &gt; tmp_error) {</div><div class='add'>+				error = tmp_error;</div><div class='add'>+				age_count = tmp_age_count;</div><div class='add'>+				age_unit = tmp_age_unit;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* found the exact match, so break the loop */</div><div class='add'>+			if (!error)</div><div class='add'>+				break;</div><div class='ctx'> 		}</div><div class='del'>-		mt7530_write(priv, MT7530_PMCR_P(port), mcr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	mt7530_write(priv, MT7530_AAC, AGE_CNT(age_count) | AGE_UNIT(age_unit));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7530_cpu_port_enable(struct mt7530_priv *priv,</div><div class='del'>-		       int port)</div><div class='add'>+static const char *mt7530_p5_mode_str(unsigned int mode)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case MUX_PHY_P0:</div><div class='add'>+		return "MUX PHY P0";</div><div class='add'>+	case MUX_PHY_P4:</div><div class='add'>+		return "MUX PHY P4";</div><div class='add'>+	default:</div><div class='add'>+		return "GMAC5";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)</div><div class='ctx'> {</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	u8 tx_delay = 0;</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT753X_MTRAP);</div><div class='add'>+</div><div class='add'>+	val &amp;= ~MT7530_P5_PHY0_SEL &amp; ~MT7530_P5_MAC_SEL &amp; ~MT7530_P5_RGMII_MODE;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;p5_mode) {</div><div class='add'>+	/* MUX_PHY_P0: P0 -&gt; P5 -&gt; SoC MAC */</div><div class='add'>+	case MUX_PHY_P0:</div><div class='add'>+		val |= MT7530_P5_PHY0_SEL;</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	/* MUX_PHY_P4: P4 -&gt; P5 -&gt; SoC MAC */</div><div class='add'>+	case MUX_PHY_P4:</div><div class='add'>+		/* Setup the MAC by default for the cpu port */</div><div class='add'>+		mt7530_write(priv, MT753X_PMCR_P(5), 0x56300);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* GMAC5: P5 -&gt; SoC MAC or external PHY */</div><div class='add'>+	default:</div><div class='add'>+		val |= MT7530_P5_MAC_SEL;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup RGMII settings */</div><div class='add'>+	if (phy_interface_mode_is_rgmii(interface)) {</div><div class='add'>+		val |= MT7530_P5_RGMII_MODE;</div><div class='add'>+</div><div class='add'>+		/* P5 RGMII RX Clock Control: delay setting for 1000M */</div><div class='add'>+		mt7530_write(priv, MT7530_P5RGMIIRXCR, CSR_RGMII_EDGE_ALIGN);</div><div class='add'>+</div><div class='add'>+		/* Don't set delay in DSA mode */</div><div class='add'>+		if (!dsa_is_dsa_port(priv-&gt;ds, 5) &amp;&amp;</div><div class='add'>+		    (interface == PHY_INTERFACE_MODE_RGMII_TXID ||</div><div class='add'>+		     interface == PHY_INTERFACE_MODE_RGMII_ID))</div><div class='add'>+			tx_delay = 4; /* n * 0.5 ns */</div><div class='add'>+</div><div class='add'>+		/* P5 RGMII TX Clock Control: delay x */</div><div class='add'>+		mt7530_write(priv, MT7530_P5RGMIITXCR,</div><div class='add'>+			     CSR_RGMII_TXC_CFG(0x10 + tx_delay));</div><div class='add'>+</div><div class='add'>+		/* reduce P5 RGMII Tx driving, 8mA */</div><div class='add'>+		mt7530_write(priv, MT7530_IO_DRV_CR,</div><div class='add'>+			     P5_IO_CLK_DRV(1) | P5_IO_DATA_DRV(1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_write(priv, MT753X_MTRAP, val);</div><div class='add'>+</div><div class='add'>+	dev_dbg(ds-&gt;dev, "Setup P5, HWTRAP=0x%x, mode=%s, phy-mode=%s\n", val,</div><div class='add'>+		mt7530_p5_mode_str(priv-&gt;p5_mode), phy_modes(interface));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* In Clause 5 of IEEE Std 802-2014, two sublayers of the data link layer (DLL)</div><div class='add'>+ * of the Open Systems Interconnection basic reference model (OSI/RM) are</div><div class='add'>+ * described; the medium access control (MAC) and logical link control (LLC)</div><div class='add'>+ * sublayers. The MAC sublayer is the one facing the physical layer.</div><div class='add'>+ *</div><div class='add'>+ * In 8.2 of IEEE Std 802.1Q-2022, the Bridge architecture is described. A</div><div class='add'>+ * Bridge component comprises a MAC Relay Entity for interconnecting the Ports</div><div class='add'>+ * of the Bridge, at least two Ports, and higher layer entities with at least a</div><div class='add'>+ * Spanning Tree Protocol Entity included.</div><div class='add'>+ *</div><div class='add'>+ * Each Bridge Port also functions as an end station and shall provide the MAC</div><div class='add'>+ * Service to an LLC Entity. Each instance of the MAC Service is provided to a</div><div class='add'>+ * distinct LLC Entity that supports protocol identification, multiplexing, and</div><div class='add'>+ * demultiplexing, for protocol data unit (PDU) transmission and reception by</div><div class='add'>+ * one or more higher layer entities.</div><div class='add'>+ *</div><div class='add'>+ * It is described in 8.13.9 of IEEE Std 802.1Q-2022 that in a Bridge, the LLC</div><div class='add'>+ * Entity associated with each Bridge Port is modeled as being directly</div><div class='add'>+ * connected to the attached Local Area Network (LAN).</div><div class='add'>+ *</div><div class='add'>+ * On the switch with CPU port architecture, CPU port functions as Management</div><div class='add'>+ * Port, and the Management Port functionality is provided by software which</div><div class='add'>+ * functions as an end station. Software is connected to an IEEE 802 LAN that is</div><div class='add'>+ * wholly contained within the system that incorporates the Bridge. Software</div><div class='add'>+ * provides access to the LLC Entity associated with each Bridge Port by the</div><div class='add'>+ * value of the source port field on the special tag on the frame received by</div><div class='add'>+ * software.</div><div class='add'>+ *</div><div class='add'>+ * We call frames that carry control information to determine the active</div><div class='add'>+ * topology and current extent of each Virtual Local Area Network (VLAN), i.e.,</div><div class='add'>+ * spanning tree or Shortest Path Bridging (SPB) and Multiple VLAN Registration</div><div class='add'>+ * Protocol Data Units (MVRPDUs), and frames from other link constrained</div><div class='add'>+ * protocols, such as Extensible Authentication Protocol over LAN (EAPOL) and</div><div class='add'>+ * Link Layer Discovery Protocol (LLDP), link-local frames. They are not</div><div class='add'>+ * forwarded by a Bridge. Permanently configured entries in the filtering</div><div class='add'>+ * database (FDB) ensure that such frames are discarded by the Forwarding</div><div class='add'>+ * Process. In 8.6.3 of IEEE Std 802.1Q-2022, this is described in detail:</div><div class='add'>+ *</div><div class='add'>+ * Each of the reserved MAC addresses specified in Table 8-1</div><div class='add'>+ * (01-80-C2-00-00-[00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F]) shall be</div><div class='add'>+ * permanently configured in the FDB in C-VLAN components and ERs.</div><div class='add'>+ *</div><div class='add'>+ * Each of the reserved MAC addresses specified in Table 8-2</div><div class='add'>+ * (01-80-C2-00-00-[01,02,03,04,05,06,07,08,09,0A,0E]) shall be permanently</div><div class='add'>+ * configured in the FDB in S-VLAN components.</div><div class='add'>+ *</div><div class='add'>+ * Each of the reserved MAC addresses specified in Table 8-3</div><div class='add'>+ * (01-80-C2-00-00-[01,02,04,0E]) shall be permanently configured in the FDB in</div><div class='add'>+ * TPMR components.</div><div class='add'>+ *</div><div class='add'>+ * The FDB entries for reserved MAC addresses shall specify filtering for all</div><div class='add'>+ * Bridge Ports and all VIDs. Management shall not provide the capability to</div><div class='add'>+ * modify or remove entries for reserved MAC addresses.</div><div class='add'>+ *</div><div class='add'>+ * The addresses in Table 8-1, Table 8-2, and Table 8-3 determine the scope of</div><div class='add'>+ * propagation of PDUs within a Bridged Network, as follows:</div><div class='add'>+ *</div><div class='add'>+ *   The Nearest Bridge group address (01-80-C2-00-00-0E) is an address that no</div><div class='add'>+ *   conformant Two-Port MAC Relay (TPMR) component, Service VLAN (S-VLAN)</div><div class='add'>+ *   component, Customer VLAN (C-VLAN) component, or MAC Bridge can forward.</div><div class='add'>+ *   PDUs transmitted using this destination address, or any other addresses</div><div class='add'>+ *   that appear in Table 8-1, Table 8-2, and Table 8-3</div><div class='add'>+ *   (01-80-C2-00-00-[00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F]), can</div><div class='add'>+ *   therefore travel no further than those stations that can be reached via a</div><div class='add'>+ *   single individual LAN from the originating station.</div><div class='add'>+ *</div><div class='add'>+ *   The Nearest non-TPMR Bridge group address (01-80-C2-00-00-03), is an</div><div class='add'>+ *   address that no conformant S-VLAN component, C-VLAN component, or MAC</div><div class='add'>+ *   Bridge can forward; however, this address is relayed by a TPMR component.</div><div class='add'>+ *   PDUs using this destination address, or any of the other addresses that</div><div class='add'>+ *   appear in both Table 8-1 and Table 8-2 but not in Table 8-3</div><div class='add'>+ *   (01-80-C2-00-00-[00,03,05,06,07,08,09,0A,0B,0C,0D,0F]), will be relayed by</div><div class='add'>+ *   any TPMRs but will propagate no further than the nearest S-VLAN component,</div><div class='add'>+ *   C-VLAN component, or MAC Bridge.</div><div class='add'>+ *</div><div class='add'>+ *   The Nearest Customer Bridge group address (01-80-C2-00-00-00) is an address</div><div class='add'>+ *   that no conformant C-VLAN component, MAC Bridge can forward; however, it is</div><div class='add'>+ *   relayed by TPMR components and S-VLAN components. PDUs using this</div><div class='add'>+ *   destination address, or any of the other addresses that appear in Table 8-1</div><div class='add'>+ *   but not in either Table 8-2 or Table 8-3 (01-80-C2-00-00-[00,0B,0C,0D,0F]),</div><div class='add'>+ *   will be relayed by TPMR components and S-VLAN components but will propagate</div><div class='add'>+ *   no further than the nearest C-VLAN component or MAC Bridge.</div><div class='add'>+ *</div><div class='add'>+ * Because the LLC Entity associated with each Bridge Port is provided via CPU</div><div class='add'>+ * port, we must not filter these frames but forward them to CPU port.</div><div class='add'>+ *</div><div class='add'>+ * In a Bridge, the transmission Port is majorly decided by ingress and egress</div><div class='add'>+ * rules, FDB, and spanning tree Port State functions of the Forwarding Process.</div><div class='add'>+ * For link-local frames, only CPU port should be designated as destination port</div><div class='add'>+ * in the FDB, and the other functions of the Forwarding Process must not</div><div class='add'>+ * interfere with the decision of the transmission Port. We call this process</div><div class='add'>+ * trapping frames to CPU port.</div><div class='add'>+ *</div><div class='add'>+ * Therefore, on the switch with CPU port architecture, link-local frames must</div><div class='add'>+ * be trapped to CPU port, and certain link-local frames received by a Port of a</div><div class='add'>+ * Bridge comprising a TPMR component or an S-VLAN component must be excluded</div><div class='add'>+ * from it.</div><div class='add'>+ *</div><div class='add'>+ * A Bridge of the switch with CPU port architecture cannot comprise a Two-Port</div><div class='add'>+ * MAC Relay (TPMR) component as a TPMR component supports only a subset of the</div><div class='add'>+ * functionality of a MAC Bridge. A Bridge comprising two Ports (Management Port</div><div class='add'>+ * doesn't count) of this architecture will either function as a standard MAC</div><div class='add'>+ * Bridge or a standard VLAN Bridge.</div><div class='add'>+ *</div><div class='add'>+ * Therefore, a Bridge of this architecture can only comprise S-VLAN components,</div><div class='add'>+ * C-VLAN components, or MAC Bridge components. Since there's no TPMR component,</div><div class='add'>+ * we don't need to relay PDUs using the destination addresses specified on the</div><div class='add'>+ * Nearest non-TPMR section, and the proportion of the Nearest Customer Bridge</div><div class='add'>+ * section where they must be relayed by TPMR components.</div><div class='add'>+ *</div><div class='add'>+ * One option to trap link-local frames to CPU port is to add static FDB entries</div><div class='add'>+ * with CPU port designated as destination port. However, because that</div><div class='add'>+ * Independent VLAN Learning (IVL) is being used on every VID, each entry only</div><div class='add'>+ * applies to a single VLAN Identifier (VID). For a Bridge comprising a MAC</div><div class='add'>+ * Bridge component or a C-VLAN component, there would have to be 16 times 4096</div><div class='add'>+ * entries. This switch intellectual property can only hold a maximum of 2048</div><div class='add'>+ * entries. Using this option, there also isn't a mechanism to prevent</div><div class='add'>+ * link-local frames from being discarded when the spanning tree Port State of</div><div class='add'>+ * the reception Port is discarding.</div><div class='add'>+ *</div><div class='add'>+ * The remaining option is to utilise the BPC, RGAC1, RGAC2, RGAC3, and RGAC4</div><div class='add'>+ * registers. Whilst this applies to every VID, it doesn't contain all of the</div><div class='add'>+ * reserved MAC addresses without affecting the remaining Standard Group MAC</div><div class='add'>+ * Addresses. The REV_UN frame tag utilised using the RGAC4 register covers the</div><div class='add'>+ * remaining 01-80-C2-00-00-[04,05,06,07,08,09,0A,0B,0C,0D,0F] destination</div><div class='add'>+ * addresses. It also includes the 01-80-C2-00-00-22 to 01-80-C2-00-00-FF</div><div class='add'>+ * destination addresses which may be relayed by MAC Bridges or VLAN Bridges.</div><div class='add'>+ * The latter option provides better but not complete conformance.</div><div class='add'>+ *</div><div class='add'>+ * This switch intellectual property also does not provide a mechanism to trap</div><div class='add'>+ * link-local frames with specific destination addresses to CPU port by Bridge,</div><div class='add'>+ * to conform to the filtering rules for the distinct Bridge components.</div><div class='add'>+ *</div><div class='add'>+ * Therefore, regardless of the type of the Bridge component, link-local frames</div><div class='add'>+ * with these destination addresses will be trapped to CPU port:</div><div class='add'>+ *</div><div class='add'>+ * 01-80-C2-00-00-[00,01,02,03,0E]</div><div class='add'>+ *</div><div class='add'>+ * In a Bridge comprising a MAC Bridge component or a C-VLAN component:</div><div class='add'>+ *</div><div class='add'>+ *   Link-local frames with these destination addresses won't be trapped to CPU</div><div class='add'>+ *   port which won't conform to IEEE Std 802.1Q-2022:</div><div class='add'>+ *</div><div class='add'>+ *   01-80-C2-00-00-[04,05,06,07,08,09,0A,0B,0C,0D,0F]</div><div class='add'>+ *</div><div class='add'>+ * In a Bridge comprising an S-VLAN component:</div><div class='add'>+ *</div><div class='add'>+ *   Link-local frames with these destination addresses will be trapped to CPU</div><div class='add'>+ *   port which won't conform to IEEE Std 802.1Q-2022:</div><div class='add'>+ *</div><div class='add'>+ *   01-80-C2-00-00-00</div><div class='add'>+ *</div><div class='add'>+ *   Link-local frames with these destination addresses won't be trapped to CPU</div><div class='add'>+ *   port which won't conform to IEEE Std 802.1Q-2022:</div><div class='add'>+ *</div><div class='add'>+ *   01-80-C2-00-00-[04,05,06,07,08,09,0A]</div><div class='add'>+ *</div><div class='add'>+ * To trap link-local frames to CPU port as conformant as this switch</div><div class='add'>+ * intellectual property can allow, link-local frames are made to be regarded as</div><div class='add'>+ * Bridge Protocol Data Units (BPDUs). This is because this switch intellectual</div><div class='add'>+ * property only lets the frames regarded as BPDUs bypass the spanning tree Port</div><div class='add'>+ * State function of the Forwarding Process.</div><div class='add'>+ *</div><div class='add'>+ * The only remaining interference is the ingress rules. When the reception Port</div><div class='add'>+ * has no PVID assigned on software, VLAN-untagged frames won't be allowed in.</div><div class='add'>+ * There doesn't seem to be a mechanism on the switch intellectual property to</div><div class='add'>+ * have link-local frames bypass this function of the Forwarding Process.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+mt753x_trap_frames(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Trap 802.1X PAE frames and BPDUs to the CPU port(s) and egress them</div><div class='add'>+	 * VLAN-untagged.</div><div class='add'>+	 */</div><div class='add'>+	mt7530_rmw(priv, MT753X_BPC,</div><div class='add'>+		   PAE_BPDU_FR | PAE_EG_TAG_MASK | PAE_PORT_FW_MASK |</div><div class='add'>+			   BPDU_EG_TAG_MASK | BPDU_PORT_FW_MASK,</div><div class='add'>+		   PAE_BPDU_FR | PAE_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |</div><div class='add'>+			   PAE_PORT_FW(TO_CPU_FW_CPU_ONLY) |</div><div class='add'>+			   BPDU_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |</div><div class='add'>+			   TO_CPU_FW_CPU_ONLY);</div><div class='add'>+</div><div class='add'>+	/* Trap frames with :01 and :02 MAC DAs to the CPU port(s) and egress</div><div class='add'>+	 * them VLAN-untagged.</div><div class='add'>+	 */</div><div class='add'>+	mt7530_rmw(priv, MT753X_RGAC1,</div><div class='add'>+		   R02_BPDU_FR | R02_EG_TAG_MASK | R02_PORT_FW_MASK |</div><div class='add'>+			   R01_BPDU_FR | R01_EG_TAG_MASK | R01_PORT_FW_MASK,</div><div class='add'>+		   R02_BPDU_FR | R02_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |</div><div class='add'>+			   R02_PORT_FW(TO_CPU_FW_CPU_ONLY) | R01_BPDU_FR |</div><div class='add'>+			   R01_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |</div><div class='add'>+			   TO_CPU_FW_CPU_ONLY);</div><div class='add'>+</div><div class='add'>+	/* Trap frames with :03 and :0E MAC DAs to the CPU port(s) and egress</div><div class='add'>+	 * them VLAN-untagged.</div><div class='add'>+	 */</div><div class='add'>+	mt7530_rmw(priv, MT753X_RGAC2,</div><div class='add'>+		   R0E_BPDU_FR | R0E_EG_TAG_MASK | R0E_PORT_FW_MASK |</div><div class='add'>+			   R03_BPDU_FR | R03_EG_TAG_MASK | R03_PORT_FW_MASK,</div><div class='add'>+		   R0E_BPDU_FR | R0E_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |</div><div class='add'>+			   R0E_PORT_FW(TO_CPU_FW_CPU_ONLY) | R03_BPDU_FR |</div><div class='add'>+			   R03_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |</div><div class='add'>+			   TO_CPU_FW_CPU_ONLY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt753x_cpu_port_enable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='ctx'> 	/* Enable Mediatek header mode on the cpu port */</div><div class='ctx'> 	mt7530_write(priv, MT7530_PVC_P(port),</div><div class='ctx'> 		     PORT_SPEC_TAG);</div><div class='ctx'> </div><div class='del'>-	/* Setup the MAC by default for the cpu port */</div><div class='del'>-	mt7530_write(priv, MT7530_PMCR_P(port), PMCR_CPUP_LINK);</div><div class='add'>+	/* Enable flooding on the CPU port */</div><div class='add'>+	mt7530_set(priv, MT753X_MFC, BC_FFP(BIT(port)) | UNM_FFP(BIT(port)) |</div><div class='add'>+		   UNU_FFP(BIT(port)));</div><div class='ctx'> </div><div class='del'>-	/* Disable auto learning on the cpu port */</div><div class='del'>-	mt7530_set(priv, MT7530_PSC_P(port), SA_DIS);</div><div class='del'>-</div><div class='del'>-	/* Unknown unicast frame fordwarding to the cpu port */</div><div class='del'>-	mt7530_set(priv, MT7530_MFC, UNU_FFP(BIT(port)));</div><div class='del'>-</div><div class='del'>-	/* Set CPU port number */</div><div class='del'>-	if (priv-&gt;id == ID_MT7621)</div><div class='del'>-		mt7530_rmw(priv, MT7530_MFC, CPU_MASK, CPU_EN | CPU_PORT(port));</div><div class='add'>+	/* Add the CPU port to the CPU port bitmap for MT7531 and the switch on</div><div class='add'>+	 * the MT7988 SoC. Trapped frames will be forwarded to the CPU port that</div><div class='add'>+	 * is affine to the inbound user port.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;id == ID_MT7531 || priv-&gt;id == ID_MT7988 ||</div><div class='add'>+	    priv-&gt;id == ID_EN7581 || priv-&gt;id == ID_AN7583)</div><div class='add'>+		mt7530_set(priv, MT7531_CFC, MT7531_CPU_PMAP(BIT(port)));</div><div class='ctx'> </div><div class='ctx'> 	/* CPU port gets connected to all user ports of</div><div class='del'>-	 * the switch</div><div class='add'>+	 * the switch.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mt7530_write(priv, MT7530_PCR_P(port),</div><div class='ctx'> 		     PCR_MATRIX(dsa_user_ports(priv-&gt;ds)));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Set to fallback mode for independent VLAN learning */</div><div class='add'>+	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='add'>+		   MT7530_PORT_FALLBACK_MODE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7530_port_enable(struct dsa_switch *ds, int port,</div><div class='ctx'> 		   struct phy_device *phy)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='del'>-	/* Setup the MAC for the user port */</div><div class='del'>-	mt7530_write(priv, MT7530_PMCR_P(port), PMCR_USERP_LINK);</div><div class='del'>-</div><div class='ctx'> 	/* Allow the user port gets connected to the cpu port and also</div><div class='ctx'> 	 * restore the port matrix if the port is the member of a certain</div><div class='ctx'> 	 * bridge.</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;ports[port].pm |= PCR_MATRIX(BIT(MT7530_CPU_PORT));</div><div class='add'>+	if (dsa_port_is_user(dp)) {</div><div class='add'>+		struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+</div><div class='add'>+		priv-&gt;ports[port].pm |= PCR_MATRIX(BIT(cpu_dp-&gt;index));</div><div class='add'>+	}</div><div class='ctx'> 	priv-&gt;ports[port].enable = true;</div><div class='ctx'> 	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,</div><div class='ctx'> 		   priv-&gt;ports[port].pm);</div><div class='del'>-	mt7530_port_set_status(priv, port, 1);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;id != ID_MT7530 &amp;&amp; priv-&gt;id != ID_MT7621)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (port == 5)</div><div class='add'>+		mt7530_clear(priv, MT753X_MTRAP, MT7530_P5_DIS);</div><div class='add'>+	else if (port == 6)</div><div class='add'>+		mt7530_clear(priv, MT753X_MTRAP, MT7530_P6_DIS);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -733,9 +1360,63 @@ mt7530_port_disable(struct dsa_switch *ds, int port)</div><div class='ctx'> 	priv-&gt;ports[port].enable = false;</div><div class='ctx'> 	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,</div><div class='ctx'> 		   PCR_MATRIX_CLR);</div><div class='del'>-	mt7530_port_set_status(priv, port, 0);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;id != ID_MT7530 &amp;&amp; priv-&gt;id != ID_MT7621)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Do not set MT7530_P5_DIS when port 5 is being used for PHY muxing. */</div><div class='add'>+	if (port == 5 &amp;&amp; priv-&gt;p5_mode == GMAC5)</div><div class='add'>+		mt7530_set(priv, MT753X_MTRAP, MT7530_P5_DIS);</div><div class='add'>+	else if (port == 6)</div><div class='add'>+		mt7530_set(priv, MT753X_MTRAP, MT7530_P6_DIS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	int length;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* When a new MTU is set, DSA always set the CPU port's MTU to the</div><div class='add'>+	 * largest MTU of the user ports. Because the switch only has a global</div><div class='add'>+	 * RX length register, only allowing CPU port here is enough.</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_lock(priv);</div><div class='add'>+</div><div class='add'>+	val = mt7530_mii_read(priv, MT7530_GMACCR);</div><div class='add'>+	val &amp;= ~MAX_RX_PKT_LEN_MASK;</div><div class='add'>+</div><div class='add'>+	/* RX length also includes Ethernet header, MTK tag, and FCS length */</div><div class='add'>+	length = new_mtu + ETH_HLEN + MTK_HDR_LEN + ETH_FCS_LEN;</div><div class='add'>+	if (length &lt;= 1522) {</div><div class='add'>+		val |= MAX_RX_PKT_LEN_1522;</div><div class='add'>+	} else if (length &lt;= 1536) {</div><div class='add'>+		val |= MAX_RX_PKT_LEN_1536;</div><div class='add'>+	} else if (length &lt;= 1552) {</div><div class='add'>+		val |= MAX_RX_PKT_LEN_1552;</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= ~MAX_RX_JUMBO_MASK;</div><div class='add'>+		val |= MAX_RX_JUMBO(DIV_ROUND_UP(length, 1024));</div><div class='add'>+		val |= MAX_RX_PKT_LEN_JUMBO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_mii_write(priv, MT7530_GMACCR, val);</div><div class='add'>+</div><div class='add'>+	mt7530_mutex_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return MT7530_MAX_MTU;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -763,41 +1444,122 @@ mt7530_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK, stp_state);</div><div class='add'>+	mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK(FID_BRIDGED),</div><div class='add'>+		   FID_PST(FID_BRIDGED, stp_state));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_update_port_member(struct mt7530_priv *priv, int port,</div><div class='add'>+				      const struct net_device *bridge_dev,</div><div class='add'>+				      bool join) __must_hold(&amp;priv-&gt;reg_mutex)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(priv-&gt;ds, port), *other_dp;</div><div class='add'>+	struct mt7530_port *p = &amp;priv-&gt;ports[port], *other_p;</div><div class='add'>+	struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+	u32 port_bitmap = BIT(cpu_dp-&gt;index);</div><div class='add'>+	int other_port;</div><div class='add'>+	bool isolated;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(other_dp, priv-&gt;ds) {</div><div class='add'>+		other_port = other_dp-&gt;index;</div><div class='add'>+		other_p = &amp;priv-&gt;ports[other_port];</div><div class='add'>+</div><div class='add'>+		if (dp == other_dp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Add/remove this port to/from the port matrix of the other</div><div class='add'>+		 * ports in the same bridge. If the port is disabled, port</div><div class='add'>+		 * matrix is kept and not being setup until the port becomes</div><div class='add'>+		 * enabled.</div><div class='add'>+		 */</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(other_dp, bridge_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		isolated = p-&gt;isolated &amp;&amp; other_p-&gt;isolated;</div><div class='add'>+</div><div class='add'>+		if (join &amp;&amp; !isolated) {</div><div class='add'>+			other_p-&gt;pm |= PCR_MATRIX(BIT(port));</div><div class='add'>+			port_bitmap |= BIT(other_port);</div><div class='add'>+		} else {</div><div class='add'>+			other_p-&gt;pm &amp;= ~PCR_MATRIX(BIT(port));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (other_p-&gt;enable)</div><div class='add'>+			mt7530_rmw(priv, MT7530_PCR_P(other_port),</div><div class='add'>+				   PCR_MATRIX_MASK, other_p-&gt;pm);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add/remove the all other ports to this port matrix. For !join</div><div class='add'>+	 * (leaving the bridge), only the CPU port will remain in the port matrix</div><div class='add'>+	 * of this port.</div><div class='add'>+	 */</div><div class='add'>+	p-&gt;pm = PCR_MATRIX(port_bitmap);</div><div class='add'>+	if (priv-&gt;ports[port].enable)</div><div class='add'>+		mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK, p-&gt;pm);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7530_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-			struct net_device *bridge)</div><div class='add'>+mt7530_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct switchdev_brport_flags flags,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |</div><div class='add'>+			   BR_BCAST_FLOOD | BR_ISOLATED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct switchdev_brport_flags flags,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	u32 port_bitmap = BIT(MT7530_CPU_PORT);</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING)</div><div class='add'>+		mt7530_rmw(priv, MT7530_PSC_P(port), SA_DIS,</div><div class='add'>+			   flags.val &amp; BR_LEARNING ? 0 : SA_DIS);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7530_NUM_PORTS; i++) {</div><div class='del'>-		/* Add this port to the port matrix of the other ports in the</div><div class='del'>-		 * same bridge. If the port is disabled, port matrix is kept</div><div class='del'>-		 * and not being setup until the port becomes enabled.</div><div class='del'>-		 */</div><div class='del'>-		if (dsa_is_user_port(ds, i) &amp;&amp; i != port) {</div><div class='del'>-			if (dsa_to_port(ds, i)-&gt;bridge_dev != bridge)</div><div class='del'>-				continue;</div><div class='del'>-			if (priv-&gt;ports[i].enable)</div><div class='del'>-				mt7530_set(priv, MT7530_PCR_P(i),</div><div class='del'>-					   PCR_MATRIX(BIT(port)));</div><div class='del'>-			priv-&gt;ports[i].pm |= PCR_MATRIX(BIT(port));</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD)</div><div class='add'>+		mt7530_rmw(priv, MT753X_MFC, UNU_FFP(BIT(port)),</div><div class='add'>+			   flags.val &amp; BR_FLOOD ? UNU_FFP(BIT(port)) : 0);</div><div class='ctx'> </div><div class='del'>-			port_bitmap |= BIT(i);</div><div class='del'>-		}</div><div class='add'>+	if (flags.mask &amp; BR_MCAST_FLOOD)</div><div class='add'>+		mt7530_rmw(priv, MT753X_MFC, UNM_FFP(BIT(port)),</div><div class='add'>+			   flags.val &amp; BR_MCAST_FLOOD ? UNM_FFP(BIT(port)) : 0);</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_BCAST_FLOOD)</div><div class='add'>+		mt7530_rmw(priv, MT753X_MFC, BC_FFP(BIT(port)),</div><div class='add'>+			   flags.val &amp; BR_BCAST_FLOOD ? BC_FFP(BIT(port)) : 0);</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_ISOLATED) {</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		struct net_device *bridge_dev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+</div><div class='add'>+		priv-&gt;ports[port].isolated = !!(flags.val &amp; BR_ISOLATED);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+		mt7530_update_port_member(priv, port, bridge_dev, true);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Add the all other ports to this port matrix. */</div><div class='del'>-	if (priv-&gt;ports[port].enable)</div><div class='del'>-		mt7530_rmw(priv, MT7530_PCR_P(port),</div><div class='del'>-			   PCR_MATRIX_MASK, PCR_MATRIX(port_bitmap));</div><div class='del'>-	priv-&gt;ports[port].pm |= PCR_MATRIX(port_bitmap);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			struct dsa_bridge bridge, bool *tx_fwd_offload,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	mt7530_update_port_member(priv, port, bridge.dev, true);</div><div class='add'>+</div><div class='add'>+	/* Set to fallback mode for independent VLAN learning */</div><div class='add'>+	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='add'>+		   MT7530_PORT_FALLBACK_MODE);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='hunk'>@@ -811,18 +1573,26 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)</div><div class='ctx'> 	bool all_user_ports_removed = true;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* When a port is removed from the bridge, the port would be set up</div><div class='del'>-	 * back to the default as is at initial boot which is a VLAN-unaware</div><div class='del'>-	 * port.</div><div class='add'>+	/* This is called after .port_bridge_leave when leaving a VLAN-aware</div><div class='add'>+	 * bridge. Don't set standalone ports to fallback mode.</div><div class='ctx'> 	 */</div><div class='del'>-	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='del'>-		   MT7530_PORT_MATRIX_MODE);</div><div class='del'>-	mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,</div><div class='del'>-		   VLAN_ATTR(MT7530_VLAN_TRANSPARENT));</div><div class='add'>+	if (dsa_port_bridge_dev_get(dsa_to_port(ds, port)))</div><div class='add'>+		mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='add'>+			   MT7530_PORT_FALLBACK_MODE);</div><div class='add'>+</div><div class='add'>+	mt7530_rmw(priv, MT7530_PVC_P(port),</div><div class='add'>+		   VLAN_ATTR_MASK | PVC_EG_TAG_MASK | ACC_FRM_MASK,</div><div class='add'>+		   VLAN_ATTR(MT7530_VLAN_TRANSPARENT) |</div><div class='add'>+		   PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT) |</div><div class='add'>+		   MT7530_VLAN_ACC_ALL);</div><div class='add'>+</div><div class='add'>+	/* Set PVID to 0 */</div><div class='add'>+	mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK,</div><div class='add'>+		   G0_PORT_VID_DEF);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7530_NUM_PORTS; i++) {</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++) {</div><div class='ctx'> 		if (dsa_is_user_port(ds, i) &amp;&amp;</div><div class='del'>-		    dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[i])) {</div><div class='add'>+		    dsa_port_is_vlan_filtering(dsa_to_port(ds, i))) {</div><div class='ctx'> 			all_user_ports_removed = false;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -832,10 +1602,13 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)</div><div class='ctx'> 	 * the CPU port get out of VLAN filtering mode.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (all_user_ports_removed) {</div><div class='del'>-		mt7530_write(priv, MT7530_PCR_P(MT7530_CPU_PORT),</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+</div><div class='add'>+		mt7530_write(priv, MT7530_PCR_P(cpu_dp-&gt;index),</div><div class='ctx'> 			     PCR_MATRIX(dsa_user_ports(priv-&gt;ds)));</div><div class='del'>-		mt7530_write(priv, MT7530_PVC_P(MT7530_CPU_PORT),</div><div class='del'>-			     PORT_SPEC_TAG);</div><div class='add'>+		mt7530_write(priv, MT7530_PVC_P(cpu_dp-&gt;index), PORT_SPEC_TAG</div><div class='add'>+			     | PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -844,68 +1617,65 @@ mt7530_port_set_vlan_aware(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	/* The real fabric path would be decided on the membership in the</div><div class='del'>-	 * entry of VLAN table. PCR_MATRIX set up here with ALL_MEMBERS</div><div class='del'>-	 * means potential VLAN can be consisting of certain subset of all</div><div class='del'>-	 * ports.</div><div class='del'>-	 */</div><div class='del'>-	mt7530_rmw(priv, MT7530_PCR_P(port),</div><div class='del'>-		   PCR_MATRIX_MASK, PCR_MATRIX(MT7530_ALL_MEMBERS));</div><div class='del'>-</div><div class='ctx'> 	/* Trapped into security mode allows packet forwarding through VLAN</div><div class='ctx'> 	 * table lookup.</div><div class='ctx'> 	 */</div><div class='del'>-	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='del'>-		   MT7530_PORT_SECURITY_MODE);</div><div class='add'>+	if (dsa_is_user_port(ds, port)) {</div><div class='add'>+		mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='add'>+			   MT7530_PORT_SECURITY_MODE);</div><div class='add'>+		mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK,</div><div class='add'>+			   G0_PORT_VID(priv-&gt;ports[port].pvid));</div><div class='ctx'> </div><div class='del'>-	/* Set the port as a user port which is to be able to recognize VID</div><div class='del'>-	 * from incoming packets before fetching entry within the VLAN table.</div><div class='del'>-	 */</div><div class='del'>-	mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,</div><div class='del'>-		   VLAN_ATTR(MT7530_VLAN_USER));</div><div class='add'>+		/* Only accept tagged frames if PVID is not set */</div><div class='add'>+		if (!priv-&gt;ports[port].pvid)</div><div class='add'>+			mt7530_rmw(priv, MT7530_PVC_P(port), ACC_FRM_MASK,</div><div class='add'>+				   MT7530_VLAN_ACC_TAGGED);</div><div class='add'>+</div><div class='add'>+		/* Set the port as a user port which is to be able to recognize</div><div class='add'>+		 * VID from incoming packets before fetching entry within the</div><div class='add'>+		 * VLAN table.</div><div class='add'>+		 */</div><div class='add'>+		mt7530_rmw(priv, MT7530_PVC_P(port),</div><div class='add'>+			   VLAN_ATTR_MASK | PVC_EG_TAG_MASK,</div><div class='add'>+			   VLAN_ATTR(MT7530_VLAN_USER) |</div><div class='add'>+			   PVC_EG_TAG(MT7530_VLAN_EG_DISABLED));</div><div class='add'>+	} else {</div><div class='add'>+		/* Also set CPU ports to the "user" VLAN port attribute, to</div><div class='add'>+		 * allow VLAN classification, but keep the EG_TAG attribute as</div><div class='add'>+		 * "consistent" (i.o.w. don't change its value) for packets</div><div class='add'>+		 * received by the switch from the CPU, so that tagged packets</div><div class='add'>+		 * are forwarded to user ports as tagged, and untagged as</div><div class='add'>+		 * untagged.</div><div class='add'>+		 */</div><div class='add'>+		mt7530_rmw(priv, MT7530_PVC_P(port), VLAN_ATTR_MASK,</div><div class='add'>+			   VLAN_ATTR(MT7530_VLAN_USER));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> mt7530_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-			 struct net_device *bridge)</div><div class='add'>+			 struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7530_NUM_PORTS; i++) {</div><div class='del'>-		/* Remove this port from the port matrix of the other ports</div><div class='del'>-		 * in the same bridge. If the port is disabled, port matrix</div><div class='del'>-		 * is kept and not being setup until the port becomes enabled.</div><div class='del'>-		 * And the other port's port matrix cannot be broken when the</div><div class='del'>-		 * other port is still a VLAN-aware port.</div><div class='del'>-		 */</div><div class='del'>-		if (dsa_is_user_port(ds, i) &amp;&amp; i != port &amp;&amp;</div><div class='del'>-		   !dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[i])) {</div><div class='del'>-			if (dsa_to_port(ds, i)-&gt;bridge_dev != bridge)</div><div class='del'>-				continue;</div><div class='del'>-			if (priv-&gt;ports[i].enable)</div><div class='del'>-				mt7530_clear(priv, MT7530_PCR_P(i),</div><div class='del'>-					     PCR_MATRIX(BIT(port)));</div><div class='del'>-			priv-&gt;ports[i].pm &amp;= ~PCR_MATRIX(BIT(port));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	mt7530_update_port_member(priv, port, bridge.dev, false);</div><div class='ctx'> </div><div class='del'>-	/* Set the cpu port to be the only one in the port matrix of</div><div class='del'>-	 * this port.</div><div class='add'>+	/* When a port is removed from the bridge, the port would be set up</div><div class='add'>+	 * back to the default as is at initial boot which is a VLAN-unaware</div><div class='add'>+	 * port.</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;ports[port].enable)</div><div class='del'>-		mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,</div><div class='del'>-			   PCR_MATRIX(BIT(MT7530_CPU_PORT)));</div><div class='del'>-	priv-&gt;ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT));</div><div class='add'>+	mt7530_rmw(priv, MT7530_PCR_P(port), PCR_PORT_VLAN_MASK,</div><div class='add'>+		   MT7530_PORT_MATRIX_MODE);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7530_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-		    const unsigned char *addr, u16 vid)</div><div class='add'>+		    const unsigned char *addr, u16 vid,</div><div class='add'>+		    struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -921,7 +1691,8 @@ mt7530_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7530_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-		    const unsigned char *addr, u16 vid)</div><div class='add'>+		    const unsigned char *addr, u16 vid,</div><div class='add'>+		    struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -971,6 +1742,61 @@ err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='add'>+mt7530_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		    const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		    struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	const u8 *addr = mdb-&gt;addr;</div><div class='add'>+	u16 vid = mdb-&gt;vid;</div><div class='add'>+	u8 port_mask = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	mt7530_fdb_write(priv, vid, 0, addr, 0, STATIC_EMP);</div><div class='add'>+	if (!mt7530_fdb_cmd(priv, MT7530_FDB_READ, NULL))</div><div class='add'>+		port_mask = (mt7530_read(priv, MT7530_ATRD) &gt;&gt; PORT_MAP)</div><div class='add'>+			    &amp; PORT_MAP_MASK;</div><div class='add'>+</div><div class='add'>+	port_mask |= BIT(port);</div><div class='add'>+	mt7530_fdb_write(priv, vid, port_mask, addr, -1, STATIC_ENT);</div><div class='add'>+	ret = mt7530_fdb_cmd(priv, MT7530_FDB_WRITE, NULL);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		    const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		    struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	const u8 *addr = mdb-&gt;addr;</div><div class='add'>+	u16 vid = mdb-&gt;vid;</div><div class='add'>+	u8 port_mask = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	mt7530_fdb_write(priv, vid, 0, addr, 0, STATIC_EMP);</div><div class='add'>+	if (!mt7530_fdb_cmd(priv, MT7530_FDB_READ, NULL))</div><div class='add'>+		port_mask = (mt7530_read(priv, MT7530_ATRD) &gt;&gt; PORT_MAP)</div><div class='add'>+			    &amp; PORT_MAP_MASK;</div><div class='add'>+</div><div class='add'>+	port_mask &amp;= ~BIT(port);</div><div class='add'>+	mt7530_fdb_write(priv, vid, port_mask, addr, -1,</div><div class='add'>+			 port_mask ? STATIC_ENT : STATIC_EMP);</div><div class='add'>+	ret = mt7530_fdb_cmd(priv, MT7530_FDB_WRITE, NULL);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_dummy_poll p;</div><div class='hunk'>@@ -998,9 +1824,12 @@ mt7530_vlan_cmd(struct mt7530_priv *priv, enum mt7530_vlan_cmd cmd, u16 vid)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-mt7530_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='del'>-			   bool vlan_filtering)</div><div class='add'>+mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct dsa_port *cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+</div><div class='ctx'> 	if (vlan_filtering) {</div><div class='ctx'> 		/* The port is being kept as VLAN-unaware port when bridge is</div><div class='ctx'> 		 * set up with vlan_filtering not being set, Otherwise, the</div><div class='hunk'>@@ -1008,7 +1837,7 @@ mt7530_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 * for becoming a VLAN-aware port.</div><div class='ctx'> 		 */</div><div class='ctx'> 		mt7530_port_set_vlan_aware(ds, port);</div><div class='del'>-		mt7530_port_set_vlan_aware(ds, MT7530_CPU_PORT);</div><div class='add'>+		mt7530_port_set_vlan_aware(ds, cpu_dp-&gt;index);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		mt7530_port_set_vlan_unaware(ds, port);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1016,49 +1845,39 @@ mt7530_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7530_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			 const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	/* nothing needed */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> mt7530_hw_vlan_add(struct mt7530_priv *priv,</div><div class='ctx'> 		   struct mt7530_hw_vlan_entry *entry)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(priv-&gt;ds, entry-&gt;port);</div><div class='ctx'> 	u8 new_members;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	new_members = entry-&gt;old_members | BIT(entry-&gt;port) |</div><div class='del'>-		      BIT(MT7530_CPU_PORT);</div><div class='add'>+	new_members = entry-&gt;old_members | BIT(entry-&gt;port);</div><div class='ctx'> </div><div class='ctx'> 	/* Validate the entry with independent learning, create egress tag per</div><div class='ctx'> 	 * VLAN and joining the port as one of the port members.</div><div class='ctx'> 	 */</div><div class='del'>-	val = IVL_MAC | VTAG_EN | PORT_MEM(new_members) | VLAN_VALID;</div><div class='add'>+	val = IVL_MAC | VTAG_EN | PORT_MEM(new_members) | FID(FID_BRIDGED) |</div><div class='add'>+	      VLAN_VALID;</div><div class='ctx'> 	mt7530_write(priv, MT7530_VAWD1, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Decide whether adding tag or not for those outgoing packets from the</div><div class='ctx'> 	 * port inside the VLAN.</div><div class='del'>-	 */</div><div class='del'>-	val = entry-&gt;untagged ? MT7530_VLAN_EGRESS_UNTAG :</div><div class='del'>-				MT7530_VLAN_EGRESS_TAG;</div><div class='del'>-	mt7530_rmw(priv, MT7530_VAWD2,</div><div class='del'>-		   ETAG_CTRL_P_MASK(entry-&gt;port),</div><div class='del'>-		   ETAG_CTRL_P(entry-&gt;port, val));</div><div class='del'>-</div><div class='del'>-	/* CPU port is always taken as a tagged port for serving more than one</div><div class='add'>+	 * CPU port is always taken as a tagged port for serving more than one</div><div class='ctx'> 	 * VLANs across and also being applied with egress type stack mode for</div><div class='ctx'> 	 * that VLAN tags would be appended after hardware special tag used as</div><div class='ctx'> 	 * DSA tag.</div><div class='ctx'> 	 */</div><div class='add'>+	if (dsa_port_is_cpu(dp))</div><div class='add'>+		val = MT7530_VLAN_EGRESS_STACK;</div><div class='add'>+	else if (entry-&gt;untagged)</div><div class='add'>+		val = MT7530_VLAN_EGRESS_UNTAG;</div><div class='add'>+	else</div><div class='add'>+		val = MT7530_VLAN_EGRESS_TAG;</div><div class='ctx'> 	mt7530_rmw(priv, MT7530_VAWD2,</div><div class='del'>-		   ETAG_CTRL_P_MASK(MT7530_CPU_PORT),</div><div class='del'>-		   ETAG_CTRL_P(MT7530_CPU_PORT,</div><div class='del'>-			       MT7530_VLAN_EGRESS_STACK));</div><div class='add'>+		   ETAG_CTRL_P_MASK(entry-&gt;port),</div><div class='add'>+		   ETAG_CTRL_P(entry-&gt;port, val));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -1077,11 +1896,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *priv,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If certain member apart from CPU port is still alive in the VLAN,</div><div class='del'>-	 * the entry would be kept valid. Otherwise, the entry is got to be</div><div class='del'>-	 * disabled.</div><div class='del'>-	 */</div><div class='del'>-	if (new_members &amp;&amp; new_members != BIT(MT7530_CPU_PORT)) {</div><div class='add'>+	if (new_members) {</div><div class='ctx'> 		val = IVL_MAC | VTAG_EN | PORT_MEM(new_members) |</div><div class='ctx'> 		      VLAN_VALID;</div><div class='ctx'> 		mt7530_write(priv, MT7530_VAWD1, val);</div><div class='hunk'>@@ -1112,37 +1927,64 @@ mt7530_hw_vlan_update(struct mt7530_priv *priv, u16 vid,</div><div class='ctx'> 	mt7530_vlan_cmd(priv, MT7530_VTCR_WR_VID, vid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='add'>+static int</div><div class='add'>+mt7530_setup_vlan0(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Validate the entry with independent learning, keep the original</div><div class='add'>+	 * ingress tag attribute.</div><div class='add'>+	 */</div><div class='add'>+	val = IVL_MAC | EG_CON | PORT_MEM(MT7530_ALL_MEMBERS) | FID(FID_BRIDGED) |</div><div class='add'>+	      VLAN_VALID;</div><div class='add'>+	mt7530_write(priv, MT7530_VAWD1, val);</div><div class='add'>+</div><div class='add'>+	return mt7530_vlan_cmd(priv, MT7530_VTCR_WR_VID, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='ctx'> mt7530_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+		     const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='ctx'> 	struct mt7530_hw_vlan_entry new_entry;</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	u16 vid;</div><div class='del'>-</div><div class='del'>-	/* The port is kept as VLAN-unaware if bridge with vlan_filtering not</div><div class='del'>-	 * being set.</div><div class='del'>-	 */</div><div class='del'>-	if (!dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[port]))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		mt7530_hw_vlan_entry_init(&amp;new_entry, port, untagged);</div><div class='del'>-		mt7530_hw_vlan_update(priv, vid, &amp;new_entry,</div><div class='del'>-				      mt7530_hw_vlan_add);</div><div class='del'>-	}</div><div class='add'>+	mt7530_hw_vlan_entry_init(&amp;new_entry, port, untagged);</div><div class='add'>+	mt7530_hw_vlan_update(priv, vlan-&gt;vid, &amp;new_entry, mt7530_hw_vlan_add);</div><div class='ctx'> </div><div class='ctx'> 	if (pvid) {</div><div class='add'>+		priv-&gt;ports[port].pvid = vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+		/* Accept all frames if PVID is set */</div><div class='add'>+		mt7530_rmw(priv, MT7530_PVC_P(port), ACC_FRM_MASK,</div><div class='add'>+			   MT7530_VLAN_ACC_ALL);</div><div class='add'>+</div><div class='add'>+		/* Only configure PVID if VLAN filtering is enabled */</div><div class='add'>+		if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))</div><div class='add'>+			mt7530_rmw(priv, MT7530_PPBV1_P(port),</div><div class='add'>+				   G0_PORT_VID_MASK,</div><div class='add'>+				   G0_PORT_VID(vlan-&gt;vid));</div><div class='add'>+	} else if (vlan-&gt;vid &amp;&amp; priv-&gt;ports[port].pvid == vlan-&gt;vid) {</div><div class='add'>+		/* This VLAN is overwritten without PVID, so unset it */</div><div class='add'>+		priv-&gt;ports[port].pvid = G0_PORT_VID_DEF;</div><div class='add'>+</div><div class='add'>+		/* Only accept tagged frames if the port is VLAN-aware */</div><div class='add'>+		if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))</div><div class='add'>+			mt7530_rmw(priv, MT7530_PVC_P(port), ACC_FRM_MASK,</div><div class='add'>+				   MT7530_VLAN_ACC_TAGGED);</div><div class='add'>+</div><div class='ctx'> 		mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK,</div><div class='del'>-			   G0_PORT_VID(vlan-&gt;vid_end));</div><div class='del'>-		priv-&gt;ports[port].pvid = vlan-&gt;vid_end;</div><div class='add'>+			   G0_PORT_VID_DEF);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1151,71 +1993,393 @@ mt7530_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_hw_vlan_entry target_entry;</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	u16 vid, pvid;</div><div class='del'>-</div><div class='del'>-	/* The port is kept as VLAN-unaware if bridge with vlan_filtering not</div><div class='del'>-	 * being set.</div><div class='del'>-	 */</div><div class='del'>-	if (!dsa_port_is_vlan_filtering(&amp;ds-&gt;ports[port]))</div><div class='del'>-		return 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='del'>-	pvid = priv-&gt;ports[port].pvid;</div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		mt7530_hw_vlan_entry_init(&amp;target_entry, port, 0);</div><div class='del'>-		mt7530_hw_vlan_update(priv, vid, &amp;target_entry,</div><div class='del'>-				      mt7530_hw_vlan_del);</div><div class='add'>+	mt7530_hw_vlan_entry_init(&amp;target_entry, port, 0);</div><div class='add'>+	mt7530_hw_vlan_update(priv, vlan-&gt;vid, &amp;target_entry,</div><div class='add'>+			      mt7530_hw_vlan_del);</div><div class='ctx'> </div><div class='del'>-		/* PVID is being restored to the default whenever the PVID port</div><div class='del'>-		 * is being removed from the VLAN.</div><div class='del'>-		 */</div><div class='del'>-		if (pvid == vid)</div><div class='del'>-			pvid = G0_PORT_VID_DEF;</div><div class='add'>+	/* PVID is being restored to the default whenever the PVID port</div><div class='add'>+	 * is being removed from the VLAN.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;ports[port].pvid == vlan-&gt;vid) {</div><div class='add'>+		priv-&gt;ports[port].pvid = G0_PORT_VID_DEF;</div><div class='add'>+</div><div class='add'>+		/* Only accept tagged frames if the port is VLAN-aware */</div><div class='add'>+		if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))</div><div class='add'>+			mt7530_rmw(priv, MT7530_PVC_P(port), ACC_FRM_MASK,</div><div class='add'>+				   MT7530_VLAN_ACC_TAGGED);</div><div class='add'>+</div><div class='add'>+		mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK,</div><div class='add'>+			   G0_PORT_VID_DEF);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK, pvid);</div><div class='del'>-	priv-&gt;ports[port].pvid = pvid;</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum dsa_tag_protocol</div><div class='del'>-mtk_get_tag_protocol(struct dsa_switch *ds, int port)</div><div class='add'>+static int mt753x_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+				  bool ingress, struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	int monitor_port;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='del'>-	if (port != MT7530_CPU_PORT) {</div><div class='del'>-		dev_warn(priv-&gt;dev,</div><div class='del'>-			 "port not matched with tagging CPU port\n");</div><div class='del'>-		return DSA_TAG_PROTO_NONE;</div><div class='add'>+	/* Check for existent entry */</div><div class='add'>+	if ((ingress ? priv-&gt;mirror_rx : priv-&gt;mirror_tx) &amp; BIT(port))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT753X_MIRROR_REG(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+	/* MT7530 only supports one monitor port */</div><div class='add'>+	monitor_port = MT753X_MIRROR_PORT_GET(priv-&gt;id, val);</div><div class='add'>+	if (val &amp; MT753X_MIRROR_EN(priv-&gt;id) &amp;&amp;</div><div class='add'>+	    monitor_port != mirror-&gt;to_local_port)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	val |= MT753X_MIRROR_EN(priv-&gt;id);</div><div class='add'>+	val &amp;= ~MT753X_MIRROR_PORT_MASK(priv-&gt;id);</div><div class='add'>+	val |= MT753X_MIRROR_PORT_SET(priv-&gt;id, mirror-&gt;to_local_port);</div><div class='add'>+	mt7530_write(priv, MT753X_MIRROR_REG(priv-&gt;id), val);</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT7530_PCR_P(port));</div><div class='add'>+	if (ingress) {</div><div class='add'>+		val |= PORT_RX_MIR;</div><div class='add'>+		priv-&gt;mirror_rx |= BIT(port);</div><div class='ctx'> 	} else {</div><div class='del'>-		return DSA_TAG_PROTO_MTK;</div><div class='add'>+		val |= PORT_TX_MIR;</div><div class='add'>+		priv-&gt;mirror_tx |= BIT(port);</div><div class='add'>+	}</div><div class='add'>+	mt7530_write(priv, MT7530_PCR_P(port), val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt753x_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT7530_PCR_P(port));</div><div class='add'>+	if (mirror-&gt;ingress) {</div><div class='add'>+		val &amp;= ~PORT_RX_MIR;</div><div class='add'>+		priv-&gt;mirror_rx &amp;= ~BIT(port);</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= ~PORT_TX_MIR;</div><div class='add'>+		priv-&gt;mirror_tx &amp;= ~BIT(port);</div><div class='add'>+	}</div><div class='add'>+	mt7530_write(priv, MT7530_PCR_P(port), val);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;mirror_rx &amp;&amp; !priv-&gt;mirror_tx) {</div><div class='add'>+		val = mt7530_read(priv, MT753X_MIRROR_REG(priv-&gt;id));</div><div class='add'>+		val &amp;= ~MT753X_MIRROR_EN(priv-&gt;id);</div><div class='add'>+		mt7530_write(priv, MT753X_MIRROR_REG(priv-&gt;id), val);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol</div><div class='add'>+mtk_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+		     enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_MTK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+static inline u32</div><div class='add'>+mt7530_gpio_to_bit(unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	/* Map GPIO offset to register bit</div><div class='add'>+	 * [ 2: 0]  port 0 LED 0..2 as GPIO 0..2</div><div class='add'>+	 * [ 6: 4]  port 1 LED 0..2 as GPIO 3..5</div><div class='add'>+	 * [10: 8]  port 2 LED 0..2 as GPIO 6..8</div><div class='add'>+	 * [14:12]  port 3 LED 0..2 as GPIO 9..11</div><div class='add'>+	 * [18:16]  port 4 LED 0..2 as GPIO 12..14</div><div class='add'>+	 */</div><div class='add'>+	return BIT(offset + offset / 3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_gpio_get(struct gpio_chip *gc, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = gpiochip_get_data(gc);</div><div class='add'>+	u32 bit = mt7530_gpio_to_bit(offset);</div><div class='add'>+</div><div class='add'>+	return !!(mt7530_read(priv, MT7530_LED_GPIO_DATA) &amp; bit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = gpiochip_get_data(gc);</div><div class='add'>+	u32 bit = mt7530_gpio_to_bit(offset);</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		mt7530_set(priv, MT7530_LED_GPIO_DATA, bit);</div><div class='add'>+	else</div><div class='add'>+		mt7530_clear(priv, MT7530_LED_GPIO_DATA, bit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = gpiochip_get_data(gc);</div><div class='add'>+	u32 bit = mt7530_gpio_to_bit(offset);</div><div class='add'>+</div><div class='add'>+	return (mt7530_read(priv, MT7530_LED_GPIO_DIR) &amp; bit) ?</div><div class='add'>+		GPIO_LINE_DIRECTION_OUT : GPIO_LINE_DIRECTION_IN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_gpio_direction_input(struct gpio_chip *gc, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = gpiochip_get_data(gc);</div><div class='add'>+	u32 bit = mt7530_gpio_to_bit(offset);</div><div class='add'>+</div><div class='add'>+	mt7530_clear(priv, MT7530_LED_GPIO_OE, bit);</div><div class='add'>+	mt7530_clear(priv, MT7530_LED_GPIO_DIR, bit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_gpio_direction_output(struct gpio_chip *gc, unsigned int offset, int value)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = gpiochip_get_data(gc);</div><div class='add'>+	u32 bit = mt7530_gpio_to_bit(offset);</div><div class='add'>+</div><div class='add'>+	mt7530_set(priv, MT7530_LED_GPIO_DIR, bit);</div><div class='add'>+</div><div class='add'>+	if (value)</div><div class='add'>+		mt7530_set(priv, MT7530_LED_GPIO_DATA, bit);</div><div class='add'>+	else</div><div class='add'>+		mt7530_clear(priv, MT7530_LED_GPIO_DATA, bit);</div><div class='add'>+</div><div class='add'>+	mt7530_set(priv, MT7530_LED_GPIO_OE, bit);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_setup_gpio(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	struct gpio_chip *gc;</div><div class='add'>+</div><div class='add'>+	gc = devm_kzalloc(dev, sizeof(*gc), GFP_KERNEL);</div><div class='add'>+	if (!gc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mt7530_write(priv, MT7530_LED_GPIO_OE, 0);</div><div class='add'>+	mt7530_write(priv, MT7530_LED_GPIO_DIR, 0);</div><div class='add'>+	mt7530_write(priv, MT7530_LED_IO_MODE, 0);</div><div class='add'>+</div><div class='add'>+	gc-&gt;label = "mt7530";</div><div class='add'>+	gc-&gt;parent = dev;</div><div class='add'>+	gc-&gt;owner = THIS_MODULE;</div><div class='add'>+	gc-&gt;get_direction = mt7530_gpio_get_direction;</div><div class='add'>+	gc-&gt;direction_input = mt7530_gpio_direction_input;</div><div class='add'>+	gc-&gt;direction_output = mt7530_gpio_direction_output;</div><div class='add'>+	gc-&gt;get = mt7530_gpio_get;</div><div class='add'>+	gc-&gt;set = mt7530_gpio_set;</div><div class='add'>+	gc-&gt;base = -1;</div><div class='add'>+	gc-&gt;ngpio = 15;</div><div class='add'>+	gc-&gt;can_sleep = true;</div><div class='add'>+</div><div class='add'>+	return devm_gpiochip_add_data(dev, gc, priv);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_GPIOLIB */</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_setup_mdio_irq(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int p;</div><div class='add'>+</div><div class='add'>+	for (p = 0; p &lt; MT7530_NUM_PHYS; p++) {</div><div class='add'>+		if (BIT(p) &amp; ds-&gt;phys_mii_mask) {</div><div class='add'>+			unsigned int irq;</div><div class='add'>+</div><div class='add'>+			irq = irq_create_mapping(priv-&gt;irq_domain, p);</div><div class='add'>+			ds-&gt;user_mii_bus-&gt;irq[p] = irq;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_irq mt7530_irqs[] = {</div><div class='add'>+	REGMAP_IRQ_REG_LINE(0, 32),  /* PHY0_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(1, 32),  /* PHY1_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(2, 32),  /* PHY2_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(3, 32),  /* PHY3_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(4, 32),  /* PHY4_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(5, 32),  /* PHY5_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(6, 32),  /* PHY6_LC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(16, 32), /* MAC_PC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(17, 32), /* BMU */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(18, 32), /* MIB */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(22, 32), /* ARL_COL_FULL_COL */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(23, 32), /* ARL_COL_FULL */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(24, 32), /* ARL_TBL_ERR */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(25, 32), /* ARL_PKT_QERR */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(26, 32), /* ARL_EQ_ERR */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(27, 32), /* ARL_PKT_BC */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(28, 32), /* ARL_SEC_IG1X */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(29, 32), /* ARL_SEC_VLAN */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(30, 32), /* ARL_SEC_TAG */</div><div class='add'>+	REGMAP_IRQ_REG_LINE(31, 32), /* ACL */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_irq_chip mt7530_regmap_irq_chip = {</div><div class='add'>+	.name = KBUILD_MODNAME,</div><div class='add'>+	.status_base = MT7530_SYS_INT_STS,</div><div class='add'>+	.unmask_base = MT7530_SYS_INT_EN,</div><div class='add'>+	.ack_base = MT7530_SYS_INT_STS,</div><div class='add'>+	.init_ack_masked = true,</div><div class='add'>+	.irqs = mt7530_irqs,</div><div class='add'>+	.num_irqs = ARRAY_SIZE(mt7530_irqs),</div><div class='add'>+	.num_regs = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_setup_irq(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct regmap_irq_chip_data *irq_data;</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	int irq, ret;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_bool(np, "interrupt-controller")) {</div><div class='add'>+		dev_info(dev, "no interrupt support\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = of_irq_get(np, 0);</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		dev_err(dev, "failed to get parent IRQ: %d\n", irq);</div><div class='add'>+		return irq ? : -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This register must be set for MT7530 to properly fire interrupts */</div><div class='add'>+	if (priv-&gt;id == ID_MT7530 || priv-&gt;id == ID_MT7621)</div><div class='add'>+		mt7530_set(priv, MT7530_TOP_SIG_CTRL, TOP_SIG_CTRL_NORMAL);</div><div class='add'>+</div><div class='add'>+	ret = devm_regmap_add_irq_chip_fwnode(dev, dev_fwnode(dev),</div><div class='add'>+					      priv-&gt;regmap, irq,</div><div class='add'>+					      IRQF_ONESHOT,</div><div class='add'>+					      0, &amp;mt7530_regmap_irq_chip,</div><div class='add'>+					      &amp;irq_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq_domain = regmap_irq_get_domain(irq_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_free_mdio_irq(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int p;</div><div class='add'>+</div><div class='add'>+	for (p = 0; p &lt; MT7530_NUM_PHYS; p++) {</div><div class='add'>+		if (BIT(p) &amp; priv-&gt;ds-&gt;phys_mii_mask) {</div><div class='add'>+			unsigned int irq;</div><div class='add'>+</div><div class='add'>+			irq = irq_find_mapping(priv-&gt;irq_domain, p);</div><div class='add'>+			irq_dispose_mapping(irq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7530_setup_mdio(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device_node *mnp, *np = priv-&gt;dev-&gt;of_node;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	static int idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mnp = of_get_child_by_name(np, "mdio");</div><div class='add'>+</div><div class='add'>+	if (mnp &amp;&amp; !of_device_is_available(mnp))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (!mnp)</div><div class='add'>+		ds-&gt;user_mii_bus = bus;</div><div class='add'>+</div><div class='add'>+	bus-&gt;priv = priv;</div><div class='add'>+	bus-&gt;name = KBUILD_MODNAME "-mii";</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, KBUILD_MODNAME "-%d", idx++);</div><div class='add'>+	bus-&gt;read = mt753x_phy_read_c22;</div><div class='add'>+	bus-&gt;write = mt753x_phy_write_c22;</div><div class='add'>+	bus-&gt;read_c45 = mt753x_phy_read_c45;</div><div class='add'>+	bus-&gt;write_c45 = mt753x_phy_write_c45;</div><div class='add'>+	bus-&gt;parent = dev;</div><div class='add'>+	bus-&gt;phy_mask = ~ds-&gt;phys_mii_mask;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;irq_domain &amp;&amp; !mnp)</div><div class='add'>+		mt7530_setup_mdio_irq(priv);</div><div class='add'>+</div><div class='add'>+	ret = devm_of_mdiobus_register(dev, bus, mnp);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to register MDIO bus: %d\n", ret);</div><div class='add'>+		if (priv-&gt;irq_domain &amp;&amp; !mnp)</div><div class='add'>+			mt7530_free_mdio_irq(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	of_node_put(mnp);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> mt7530_setup(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='del'>-	int ret, i;</div><div class='del'>-	u32 id, val;</div><div class='del'>-	struct device_node *dn;</div><div class='add'>+	struct device_node *dn = NULL;</div><div class='add'>+	struct device_node *phy_node;</div><div class='add'>+	struct device_node *mac_np;</div><div class='ctx'> 	struct mt7530_dummy_poll p;</div><div class='add'>+	phy_interface_t interface;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	u32 id, val;</div><div class='add'>+	int ret, i;</div><div class='ctx'> </div><div class='del'>-	/* The parent node of master netdev which holds the common system</div><div class='add'>+	/* The parent node of conduit netdev which holds the common system</div><div class='ctx'> 	 * controller also is the container for two GMACs nodes representing</div><div class='ctx'> 	 * as two netdev instances.</div><div class='ctx'> 	 */</div><div class='del'>-	dn = ds-&gt;ports[MT7530_CPU_PORT].master-&gt;dev.of_node-&gt;parent;</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		dn = cpu_dp-&gt;conduit-&gt;dev.of_node-&gt;parent;</div><div class='add'>+		/* It doesn't matter which CPU port is found first,</div><div class='add'>+		 * their conduits should share the same parent OF node</div><div class='add'>+		 */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;id == ID_MT7530) {</div><div class='del'>-		priv-&gt;ethernet = syscon_node_to_regmap(dn);</div><div class='del'>-		if (IS_ERR(priv-&gt;ethernet))</div><div class='del'>-			return PTR_ERR(priv-&gt;ethernet);</div><div class='add'>+	if (!dn) {</div><div class='add'>+		dev_err(ds-&gt;dev, "parent OF node of DSA conduit not found");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	ds-&gt;assisted_learning_on_cpu_port = true;</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;id == ID_MT7530) {</div><div class='ctx'> 		regulator_set_voltage(priv-&gt;core_pwr, 1000000, 1000000);</div><div class='ctx'> 		ret = regulator_enable(priv-&gt;core_pwr);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='hunk'>@@ -1238,16 +2402,16 @@ mt7530_setup(struct dsa_switch *ds)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;mcm) {</div><div class='ctx'> 		reset_control_assert(priv-&gt;rstc);</div><div class='del'>-		usleep_range(1000, 1100);</div><div class='add'>+		usleep_range(5000, 5100);</div><div class='ctx'> 		reset_control_deassert(priv-&gt;rstc);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		gpiod_set_value_cansleep(priv-&gt;reset, 0);</div><div class='del'>-		usleep_range(1000, 1100);</div><div class='add'>+		usleep_range(5000, 5100);</div><div class='ctx'> 		gpiod_set_value_cansleep(priv-&gt;reset, 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Waiting for MT7530 got to stable */</div><div class='del'>-	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT7530_HWTRAP);</div><div class='add'>+	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT753X_TRAP);</div><div class='ctx'> 	ret = readx_poll_timeout(_mt7530_read, &amp;p, val, val != 0,</div><div class='ctx'> 				 20, 1000000);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -1262,33 +2426,131 @@ mt7530_setup(struct dsa_switch *ds)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((val &amp; MT7530_XTAL_MASK) == MT7530_XTAL_20MHZ) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"MT7530 with a 20MHz XTAL is not supported!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Reset the switch through internal reset */</div><div class='ctx'> 	mt7530_write(priv, MT7530_SYS_CTRL,</div><div class='ctx'> 		     SYS_CTRL_PHY_RST | SYS_CTRL_SW_RST |</div><div class='ctx'> 		     SYS_CTRL_REG_RST);</div><div class='ctx'> </div><div class='del'>-	/* Enable Port 6 only; P5 as GMAC5 which currently is not supported */</div><div class='del'>-	val = mt7530_read(priv, MT7530_MHWTRAP);</div><div class='del'>-	val &amp;= ~MHWTRAP_P6_DIS &amp; ~MHWTRAP_PHY_ACCESS;</div><div class='del'>-	val |= MHWTRAP_MANUAL;</div><div class='del'>-	mt7530_write(priv, MT7530_MHWTRAP, val);</div><div class='add'>+	/* Lower Tx driving for TRGMII path */</div><div class='add'>+	for (i = 0; i &lt; NUM_TRGMII_CTRL; i++)</div><div class='add'>+		mt7530_write(priv, MT7530_TRGMII_TD_ODT(i),</div><div class='add'>+			     TD_DM_DRVP(8) | TD_DM_DRVN(8));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; NUM_TRGMII_CTRL; i++)</div><div class='add'>+		mt7530_rmw(priv, MT7530_TRGMII_RD(i),</div><div class='add'>+			   RD_TAP_MASK, RD_TAP(16));</div><div class='add'>+</div><div class='add'>+	/* Allow modifying the trap and directly access PHY registers via the</div><div class='add'>+	 * MDIO bus the switch is on.</div><div class='add'>+	 */</div><div class='add'>+	mt7530_rmw(priv, MT753X_MTRAP, MT7530_CHG_TRAP |</div><div class='add'>+		   MT7530_PHY_INDIRECT_ACCESS, MT7530_CHG_TRAP);</div><div class='add'>+</div><div class='add'>+	if ((val &amp; MT7530_XTAL_MASK) == MT7530_XTAL_40MHZ)</div><div class='add'>+		mt7530_pll_setup(priv);</div><div class='add'>+</div><div class='add'>+	mt753x_trap_frames(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable and reset MIB counters */</div><div class='ctx'> 	mt7530_mib_reset(ds);</div><div class='ctx'> </div><div class='del'>-	mt7530_clear(priv, MT7530_MFC, UNU_FFP_MASK);</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++) {</div><div class='add'>+		/* Clear link settings and enable force mode to force link down</div><div class='add'>+		 * on all ports until they're enabled later.</div><div class='add'>+		 */</div><div class='add'>+		mt7530_rmw(priv, MT753X_PMCR_P(i),</div><div class='add'>+			   PMCR_LINK_SETTINGS_MASK |</div><div class='add'>+			   MT753X_FORCE_MODE(priv-&gt;id),</div><div class='add'>+			   MT753X_FORCE_MODE(priv-&gt;id));</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; MT7530_NUM_PORTS; i++) {</div><div class='ctx'> 		/* Disable forwarding by default on all ports */</div><div class='ctx'> 		mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,</div><div class='ctx'> 			   PCR_MATRIX_CLR);</div><div class='ctx'> </div><div class='del'>-		if (dsa_is_cpu_port(ds, i))</div><div class='del'>-			mt7530_cpu_port_enable(priv, i);</div><div class='del'>-		else</div><div class='add'>+		/* Disable learning by default on all ports */</div><div class='add'>+		mt7530_set(priv, MT7530_PSC_P(i), SA_DIS);</div><div class='add'>+</div><div class='add'>+		if (dsa_is_cpu_port(ds, i)) {</div><div class='add'>+			mt753x_cpu_port_enable(ds, i);</div><div class='add'>+		} else {</div><div class='ctx'> 			mt7530_port_disable(ds, i);</div><div class='add'>+</div><div class='add'>+			/* Set default PVID to 0 on all user ports */</div><div class='add'>+			mt7530_rmw(priv, MT7530_PPBV1_P(i), G0_PORT_VID_MASK,</div><div class='add'>+				   G0_PORT_VID_DEF);</div><div class='add'>+		}</div><div class='add'>+		/* Enable consistent egress tag */</div><div class='add'>+		mt7530_rmw(priv, MT7530_PVC_P(i), PVC_EG_TAG_MASK,</div><div class='add'>+			   PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allow mirroring frames received on the local port (monitor port). */</div><div class='add'>+	mt7530_set(priv, MT753X_AGC, LOCAL_EN);</div><div class='add'>+</div><div class='add'>+	/* Setup VLAN ID 0 for VLAN-unaware bridges */</div><div class='add'>+	ret = mt7530_setup_vlan0(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check for PHY muxing on port 5 */</div><div class='add'>+	if (dsa_is_unused_port(ds, 5)) {</div><div class='add'>+		/* Scan the ethernet nodes. Look for GMAC1, lookup the used PHY.</div><div class='add'>+		 * Set priv-&gt;p5_mode to the appropriate value if PHY muxing is</div><div class='add'>+		 * detected.</div><div class='add'>+		 */</div><div class='add'>+		for_each_child_of_node(dn, mac_np) {</div><div class='add'>+			if (!of_device_is_compatible(mac_np,</div><div class='add'>+						     "mediatek,eth-mac"))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			ret = of_property_read_u32(mac_np, "reg", &amp;id);</div><div class='add'>+			if (ret &lt; 0 || id != 1)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			phy_node = of_parse_phandle(mac_np, "phy-handle", 0);</div><div class='add'>+			if (!phy_node)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (phy_node-&gt;parent == priv-&gt;dev-&gt;of_node-&gt;parent ||</div><div class='add'>+			    phy_node-&gt;parent-&gt;parent == priv-&gt;dev-&gt;of_node) {</div><div class='add'>+				ret = of_get_phy_mode(mac_np, &amp;interface);</div><div class='add'>+				if (ret &amp;&amp; ret != -ENODEV) {</div><div class='add'>+					of_node_put(mac_np);</div><div class='add'>+					of_node_put(phy_node);</div><div class='add'>+					return ret;</div><div class='add'>+				}</div><div class='add'>+				id = of_mdio_parse_addr(ds-&gt;dev, phy_node);</div><div class='add'>+				if (id == 0)</div><div class='add'>+					priv-&gt;p5_mode = MUX_PHY_P0;</div><div class='add'>+				if (id == 4)</div><div class='add'>+					priv-&gt;p5_mode = MUX_PHY_P4;</div><div class='add'>+			}</div><div class='add'>+			of_node_put(mac_np);</div><div class='add'>+			of_node_put(phy_node);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;p5_mode == MUX_PHY_P0 ||</div><div class='add'>+		    priv-&gt;p5_mode == MUX_PHY_P4) {</div><div class='add'>+			mt7530_clear(priv, MT753X_MTRAP, MT7530_P5_DIS);</div><div class='add'>+			mt7530_setup_port5(ds, interface);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_GPIOLIB</div><div class='add'>+	if (of_property_read_bool(priv-&gt;dev-&gt;of_node, "gpio-controller")) {</div><div class='add'>+		ret = mt7530_setup_gpio(priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+#endif /* CONFIG_GPIOLIB */</div><div class='add'>+</div><div class='ctx'> 	/* Flush the FDB table */</div><div class='ctx'> 	ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='hunk'>@@ -1297,136 +2559,859 @@ mt7530_setup(struct dsa_switch *ds)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int</div><div class='add'>+mt7531_setup_common(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ds-&gt;assisted_learning_on_cpu_port = true;</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='add'>+</div><div class='add'>+	mt753x_trap_frames(priv);</div><div class='add'>+</div><div class='add'>+	/* Enable and reset MIB counters */</div><div class='add'>+	mt7530_mib_reset(ds);</div><div class='add'>+</div><div class='add'>+	/* Disable flooding on all ports */</div><div class='add'>+	mt7530_clear(priv, MT753X_MFC, BC_FFP_MASK | UNM_FFP_MASK |</div><div class='add'>+		     UNU_FFP_MASK);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++) {</div><div class='add'>+		/* Clear link settings and enable force mode to force link down</div><div class='add'>+		 * on all ports until they're enabled later.</div><div class='add'>+		 */</div><div class='add'>+		mt7530_rmw(priv, MT753X_PMCR_P(i),</div><div class='add'>+			   PMCR_LINK_SETTINGS_MASK |</div><div class='add'>+			   MT753X_FORCE_MODE(priv-&gt;id),</div><div class='add'>+			   MT753X_FORCE_MODE(priv-&gt;id));</div><div class='add'>+</div><div class='add'>+		/* Disable forwarding by default on all ports */</div><div class='add'>+		mt7530_rmw(priv, MT7530_PCR_P(i), PCR_MATRIX_MASK,</div><div class='add'>+			   PCR_MATRIX_CLR);</div><div class='add'>+</div><div class='add'>+		/* Disable learning by default on all ports */</div><div class='add'>+		mt7530_set(priv, MT7530_PSC_P(i), SA_DIS);</div><div class='add'>+</div><div class='add'>+		mt7530_set(priv, MT7531_DBG_CNT(i), MT7531_DIS_CLR);</div><div class='add'>+</div><div class='add'>+		if (dsa_is_cpu_port(ds, i)) {</div><div class='add'>+			mt753x_cpu_port_enable(ds, i);</div><div class='add'>+		} else {</div><div class='add'>+			mt7530_port_disable(ds, i);</div><div class='add'>+</div><div class='add'>+			/* Set default PVID to 0 on all user ports */</div><div class='add'>+			mt7530_rmw(priv, MT7530_PPBV1_P(i), G0_PORT_VID_MASK,</div><div class='add'>+				   G0_PORT_VID_DEF);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable consistent egress tag */</div><div class='add'>+		mt7530_rmw(priv, MT7530_PVC_P(i), PVC_EG_TAG_MASK,</div><div class='add'>+			   PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Allow mirroring frames received on the local port (monitor port). */</div><div class='add'>+	mt7530_set(priv, MT753X_AGC, LOCAL_EN);</div><div class='add'>+</div><div class='add'>+	/* Enable Special Tag for rx frames */</div><div class='add'>+	if (priv-&gt;id == ID_EN7581 || priv-&gt;id == ID_AN7583)</div><div class='add'>+		mt7530_write(priv, MT753X_CPORT_SPTAG_CFG,</div><div class='add'>+			     CPORT_SW2FE_STAG_EN | CPORT_FE2SW_STAG_EN);</div><div class='add'>+</div><div class='add'>+	/* Flush the FDB table */</div><div class='add'>+	ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Setup VLAN ID 0 for VLAN-unaware bridges */</div><div class='add'>+	return mt7530_setup_vlan0(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt7531_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct mt7530_dummy_poll p;</div><div class='add'>+	u32 val, id;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* Reset whole chip through gpio pin or memory-mapped registers for</div><div class='add'>+	 * different type of hardware</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;mcm) {</div><div class='add'>+		reset_control_assert(priv-&gt;rstc);</div><div class='add'>+		usleep_range(5000, 5100);</div><div class='add'>+		reset_control_deassert(priv-&gt;rstc);</div><div class='add'>+	} else {</div><div class='add'>+		gpiod_set_value_cansleep(priv-&gt;reset, 0);</div><div class='add'>+		usleep_range(5000, 5100);</div><div class='add'>+		gpiod_set_value_cansleep(priv-&gt;reset, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Waiting for MT7530 got to stable */</div><div class='add'>+	INIT_MT7530_DUMMY_POLL(&amp;p, priv, MT753X_TRAP);</div><div class='add'>+	ret = readx_poll_timeout(_mt7530_read, &amp;p, val, val != 0,</div><div class='add'>+				 20, 1000000);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "reset timeout\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = mt7530_read(priv, MT7531_CREV);</div><div class='add'>+	id &gt;&gt;= CHIP_NAME_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (id != MT7531_ID) {</div><div class='add'>+		dev_err(priv-&gt;dev, "chip %x can't be supported\n", id);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MT7531AE has got two SGMII units. One for port 5, one for port 6.</div><div class='add'>+	 * MT7531BE has got only one SGMII unit which is for port 6.</div><div class='add'>+	 */</div><div class='add'>+	val = mt7530_read(priv, MT7531_TOP_SIG_SR);</div><div class='add'>+	priv-&gt;p5_sgmii = !!(val &amp; PAD_DUAL_SGMII_EN);</div><div class='add'>+</div><div class='add'>+	/* Force link down on all ports before internal reset */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++)</div><div class='add'>+		mt7530_write(priv, MT753X_PMCR_P(i), MT7531_FORCE_MODE_LNK);</div><div class='add'>+</div><div class='add'>+	/* Reset the switch through internal reset */</div><div class='add'>+	mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_SW_RST | SYS_CTRL_REG_RST);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;p5_sgmii) {</div><div class='add'>+		mt7531_pll_setup(priv);</div><div class='add'>+	} else {</div><div class='add'>+		/* Unlike MT7531BE, the GPIO 6-12 pins are not used for RGMII on</div><div class='add'>+		 * MT7531AE. Set the GPIO 11-12 pins to function as MDC and MDIO</div><div class='add'>+		 * to expose the MDIO bus of the switch.</div><div class='add'>+		 */</div><div class='add'>+		mt7530_rmw(priv, MT7531_GPIO_MODE1, MT7531_GPIO11_RG_RXD2_MASK,</div><div class='add'>+			   MT7531_EXT_P_MDC_11);</div><div class='add'>+		mt7530_rmw(priv, MT7531_GPIO_MODE1, MT7531_GPIO12_RG_RXD3_MASK,</div><div class='add'>+			   MT7531_EXT_P_MDIO_12);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_rmw(priv, MT7531_GPIO_MODE0, MT7531_GPIO0_MASK,</div><div class='add'>+		   MT7531_GPIO0_INTERRUPT);</div><div class='add'>+</div><div class='add'>+	/* Enable Energy-Efficient Ethernet (EEE) and PHY core PLL, since</div><div class='add'>+	 * phy_device has not yet been created provided for</div><div class='add'>+	 * phy_[read,write]_mmd_indirect is called, we provide our own</div><div class='add'>+	 * mt7531_ind_mmd_phy_[read,write] to complete this function.</div><div class='add'>+	 */</div><div class='add'>+	val = mt7531_ind_c45_phy_read(priv,</div><div class='add'>+				      MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+				      MDIO_MMD_VEND2, CORE_PLL_GROUP4);</div><div class='add'>+	val |= MT7531_RG_SYSPLL_DMY2 | MT7531_PHY_PLL_BYPASS_MODE;</div><div class='add'>+	val &amp;= ~MT7531_PHY_PLL_OFF;</div><div class='add'>+	mt7531_ind_c45_phy_write(priv,</div><div class='add'>+				 MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr),</div><div class='add'>+				 MDIO_MMD_VEND2, CORE_PLL_GROUP4, val);</div><div class='add'>+</div><div class='add'>+	/* Disable EEE advertisement on the switch PHYs. */</div><div class='add'>+	for (i = MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr);</div><div class='add'>+	     i &lt; MT753X_CTRL_PHY_ADDR(priv-&gt;mdiodev-&gt;addr) + MT7530_NUM_PHYS;</div><div class='add'>+	     i++) {</div><div class='add'>+		mt7531_ind_c45_phy_write(priv, i, MDIO_MMD_AN, MDIO_AN_EEE_ADV,</div><div class='add'>+					 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mt7531_setup_common(ds);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_mac_port_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;mac_capabilities |= MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	/* Ports which are connected to switch PHYs. There is no MII pinout. */</div><div class='add'>+	case 0 ... 4:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Port 5 supports rgmii with delays, mii, and gmii. */</div><div class='add'>+	case 5:</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Port 6 supports rgmii and trgmii. */</div><div class='add'>+	case 6:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_TRGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7531_mac_port_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities |= MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	/* Ports which are connected to switch PHYs. There is no MII pinout. */</div><div class='add'>+	case 0 ... 4:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Port 5 supports rgmii with delays on MT7531BE, sgmii/802.3z on</div><div class='add'>+	 * MT7531AE.</div><div class='add'>+	 */</div><div class='add'>+	case 5:</div><div class='add'>+		if (!priv-&gt;p5_sgmii) {</div><div class='add'>+			phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='add'>+	/* Port 6 supports sgmii/802.3z. */</div><div class='add'>+	case 6:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_2500BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	/* Ports which are connected to switch PHYs. There is no MII pinout. */</div><div class='add'>+	case 0 ... 3:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Port 6 is connected to SoC's XGMII MAC. There is no MII pinout. */</div><div class='add'>+	case 6:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_10000FD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void en7581_mac_port_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	/* Ports which are connected to switch PHYs. There is no MII pinout. */</div><div class='add'>+	case 0 ... 4:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	/* Port 6 is connected to SoC's XGMII MAC. There is no MII pinout. */</div><div class='add'>+	case 6:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_10000FD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7530_mac_config(struct dsa_switch *ds, int port, unsigned int mode,</div><div class='add'>+		  phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (port == 5)</div><div class='add'>+		mt7530_setup_port5(priv-&gt;ds, interface);</div><div class='add'>+	else if (port == 6)</div><div class='add'>+		mt7530_setup_port6(priv-&gt;ds, interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7531_rgmii_setup(struct mt7530_priv *priv,</div><div class='add'>+			       phy_interface_t interface,</div><div class='add'>+			       struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = mt7530_read(priv, MT7531_CLKGEN_CTRL);</div><div class='add'>+	val |= GP_CLK_EN;</div><div class='add'>+	val &amp;= ~GP_MODE_MASK;</div><div class='add'>+	val |= GP_MODE(MT7531_GP_MODE_RGMII);</div><div class='add'>+	val &amp;= ~CLK_SKEW_IN_MASK;</div><div class='add'>+	val |= CLK_SKEW_IN(MT7531_CLK_SKEW_NO_CHG);</div><div class='add'>+	val &amp;= ~CLK_SKEW_OUT_MASK;</div><div class='add'>+	val |= CLK_SKEW_OUT(MT7531_CLK_SKEW_NO_CHG);</div><div class='add'>+	val |= TXCLK_NO_REVERSE | RXCLK_NO_DELAY;</div><div class='add'>+</div><div class='add'>+	/* Do not adjust rgmii delay when vendor phy driver presents. */</div><div class='add'>+	if (!phydev || phy_driver_is_genphy(phydev)) {</div><div class='add'>+		val &amp;= ~(TXCLK_NO_REVERSE | RXCLK_NO_DELAY);</div><div class='add'>+		switch (interface) {</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+			val |= TXCLK_NO_REVERSE;</div><div class='add'>+			val |= RXCLK_NO_DELAY;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+			val |= TXCLK_NO_REVERSE;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+			val |= RXCLK_NO_DELAY;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_write(priv, MT7531_CLKGEN_CTRL, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode,</div><div class='add'>+		  phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (phy_interface_mode_is_rgmii(interface)) {</div><div class='add'>+		dp = dsa_to_port(ds, port);</div><div class='add'>+		phydev = dp-&gt;user-&gt;phydev;</div><div class='add'>+		mt7531_rgmii_setup(priv, interface, phydev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+mt753x_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+			      phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mt7530_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_TRGMII:</div><div class='add'>+		return &amp;priv-&gt;pcs[dp-&gt;index].pcs;</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+	case PHY_INTERFACE_MODE_2500BASEX:</div><div class='add'>+		return priv-&gt;ports[dp-&gt;index].sgmii_pcs;</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt753x_phylink_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			  const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct mt7530_priv *priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if ((port == 5 || port == 6) &amp;&amp; priv-&gt;info-&gt;mac_port_config)</div><div class='add'>+		priv-&gt;info-&gt;mac_port_config(ds, port, mode, state-&gt;interface);</div><div class='add'>+</div><div class='add'>+	/* Are we connected to external phy */</div><div class='add'>+	if (port == 5 &amp;&amp; dsa_is_user_port(ds, 5))</div><div class='add'>+		mt7530_set(priv, MT753X_PMCR_P(port), PMCR_EXT_PHY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt753x_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					 unsigned int mode,</div><div class='add'>+					 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mt7530_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mt7530_clear(priv, MT753X_PMCR_P(dp-&gt;index), PMCR_LINK_SETTINGS_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt753x_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+				       struct phy_device *phydev,</div><div class='add'>+				       unsigned int mode,</div><div class='add'>+				       phy_interface_t interface,</div><div class='add'>+				       int speed, int duplex,</div><div class='add'>+				       bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mt7530_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	u32 mcr;</div><div class='add'>+</div><div class='add'>+	mcr = PMCR_MAC_RX_EN | PMCR_MAC_TX_EN | PMCR_FORCE_LNK;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+	case SPEED_2500:</div><div class='add'>+	case SPEED_10000:</div><div class='add'>+		mcr |= PMCR_FORCE_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		mcr |= PMCR_FORCE_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (duplex == DUPLEX_FULL) {</div><div class='add'>+		mcr |= PMCR_FORCE_FDX;</div><div class='add'>+		if (tx_pause)</div><div class='add'>+			mcr |= PMCR_FORCE_TX_FC_EN;</div><div class='add'>+		if (rx_pause)</div><div class='add'>+			mcr |= PMCR_FORCE_RX_FC_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_set(priv, MT753X_PMCR_P(dp-&gt;index), mcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt753x_phylink_mac_disable_tx_lpi(struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mt7530_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mt7530_clear(priv, MT753X_PMCR_P(dp-&gt;index),</div><div class='add'>+		     PMCR_FORCE_EEE1G | PMCR_FORCE_EEE100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt753x_phylink_mac_enable_tx_lpi(struct phylink_config *config,</div><div class='add'>+					    u32 timer, bool tx_clock_stop)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mt7530_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* If the timer is zero, then set LPI_MODE_EN, which allows the</div><div class='add'>+	 * system to enter LPI mode immediately rather than waiting for</div><div class='add'>+	 * the LPI threshold.</div><div class='add'>+	 */</div><div class='add'>+	if (!timer)</div><div class='add'>+		val = LPI_MODE_EN;</div><div class='add'>+	else if (FIELD_FIT(LPI_THRESH_MASK, timer))</div><div class='add'>+		val = FIELD_PREP(LPI_THRESH_MASK, timer);</div><div class='add'>+	else</div><div class='add'>+		val = LPI_THRESH_MASK;</div><div class='add'>+</div><div class='add'>+	mt7530_rmw(priv, MT753X_PMEEECR_P(dp-&gt;index),</div><div class='add'>+		   LPI_THRESH_MASK | LPI_MODE_EN, val);</div><div class='add'>+</div><div class='add'>+	mt7530_set(priv, MT753X_PMCR_P(dp-&gt;index),</div><div class='add'>+		   PMCR_FORCE_EEE1G | PMCR_FORCE_EEE100);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 eeecr;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE;</div><div class='add'>+</div><div class='add'>+	config-&gt;lpi_capabilities = MAC_100FD | MAC_1000FD | MAC_2500FD;</div><div class='add'>+</div><div class='add'>+	eeecr = mt7530_read(priv, MT753X_PMEEECR_P(port));</div><div class='add'>+	/* tx_lpi_timer should be in microseconds. The time units for</div><div class='add'>+	 * LPI threshold are unspecified.</div><div class='add'>+	 */</div><div class='add'>+	config-&gt;lpi_timer_default = FIELD_GET(LPI_THRESH_MASK, eeecr);</div><div class='add'>+</div><div class='add'>+	priv-&gt;info-&gt;mac_port_get_caps(ds, port, config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt753x_pcs_validate(struct phylink_pcs *pcs,</div><div class='add'>+			       unsigned long *supported,</div><div class='add'>+			       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	/* Autonegotiation is not supported in TRGMII nor 802.3z modes */</div><div class='add'>+	if (state-&gt;interface == PHY_INTERFACE_MODE_TRGMII ||</div><div class='add'>+	    phy_interface_mode_is_8023z(state-&gt;interface))</div><div class='add'>+		phylink_clear(supported, Autoneg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+				 struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = pcs_to_mt753x_pcs(pcs)-&gt;priv;</div><div class='add'>+	int port = pcs_to_mt753x_pcs(pcs)-&gt;port;</div><div class='add'>+	u32 pmsr;</div><div class='add'>+</div><div class='add'>+	pmsr = mt7530_read(priv, MT7530_PMSR_P(port));</div><div class='add'>+</div><div class='add'>+	state-&gt;link = (pmsr &amp; PMSR_LINK);</div><div class='add'>+	state-&gt;an_complete = state-&gt;link;</div><div class='add'>+	state-&gt;duplex = !!(pmsr &amp; PMSR_DPX);</div><div class='add'>+</div><div class='add'>+	switch (pmsr &amp; PMSR_SPEED_MASK) {</div><div class='add'>+	case PMSR_SPEED_10:</div><div class='add'>+		state-&gt;speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case PMSR_SPEED_100:</div><div class='add'>+		state-&gt;speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case PMSR_SPEED_1000:</div><div class='add'>+		state-&gt;speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		state-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;pause &amp;= ~(MLO_PAUSE_RX | MLO_PAUSE_TX);</div><div class='add'>+	if (pmsr &amp; PMSR_RX_FC)</div><div class='add'>+		state-&gt;pause |= MLO_PAUSE_RX;</div><div class='add'>+	if (pmsr &amp; PMSR_TX_FC)</div><div class='add'>+		state-&gt;pause |= MLO_PAUSE_TX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt753x_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+			     phy_interface_t interface,</div><div class='add'>+			     const unsigned long *advertising,</div><div class='add'>+			     bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mt7530_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops mt7530_pcs_ops = {</div><div class='add'>+	.pcs_validate = mt753x_pcs_validate,</div><div class='add'>+	.pcs_get_state = mt7530_pcs_get_state,</div><div class='add'>+	.pcs_config = mt753x_pcs_config,</div><div class='add'>+	.pcs_an_restart = mt7530_pcs_an_restart,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mt753x_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret = priv-&gt;info-&gt;sw_setup(ds);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7530_setup_irq(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = mt7530_setup_mdio(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Initialise the PCS devices */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++) {</div><div class='add'>+		priv-&gt;pcs[i].pcs.ops = priv-&gt;info-&gt;pcs_ops;</div><div class='add'>+		priv-&gt;pcs[i].priv = priv;</div><div class='add'>+		priv-&gt;pcs[i].port = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;create_sgmii)</div><div class='add'>+		ret = priv-&gt;create_sgmii(priv);</div><div class='add'>+</div><div class='add'>+	if (ret &amp;&amp; priv-&gt;irq_domain)</div><div class='add'>+		mt7530_free_mdio_irq(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	if (e-&gt;tx_lpi_timer &gt; 0xFFF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mt753x_conduit_state_change(struct dsa_switch *ds,</div><div class='add'>+			    const struct net_device *conduit,</div><div class='add'>+			    bool operational)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	int val = 0;</div><div class='add'>+	u8 mask;</div><div class='add'>+</div><div class='add'>+	/* Set the CPU port to trap frames to for MT7530. Trapped frames will be</div><div class='add'>+	 * forwarded to the numerically smallest CPU port whose conduit</div><div class='add'>+	 * interface is up.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;id != ID_MT7530 &amp;&amp; priv-&gt;id != ID_MT7621)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mask = BIT(cpu_dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	if (operational)</div><div class='add'>+		priv-&gt;active_cpu_ports |= mask;</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;active_cpu_ports &amp;= ~mask;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;active_cpu_ports) {</div><div class='add'>+		val = MT7530_CPU_EN |</div><div class='add'>+		      MT7530_CPU_PORT(__ffs(priv-&gt;active_cpu_ports));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mt7530_rmw(priv, MT753X_MFC, MT7530_CPU_EN | MT7530_CPU_PORT_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt753x_tc_setup_qdisc_tbf(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct tc_tbf_qopt_offload *qopt)</div><div class='add'>+{</div><div class='add'>+	struct tc_tbf_qopt_offload_replace_params *p = &amp;qopt-&gt;replace_params;</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 rate = 0;</div><div class='add'>+</div><div class='add'>+	switch (qopt-&gt;command) {</div><div class='add'>+	case TC_TBF_REPLACE:</div><div class='add'>+		rate = div_u64(p-&gt;rate.rate_bytes_ps, 1000) &lt;&lt; 3; /* kbps */</div><div class='add'>+		fallthrough;</div><div class='add'>+	case TC_TBF_DESTROY: {</div><div class='add'>+		u32 val, tick;</div><div class='add'>+</div><div class='add'>+		mt7530_rmw(priv, MT753X_GERLCR, EGR_BC_MASK,</div><div class='add'>+			   EGR_BC_CRC_IPG_PREAMBLE);</div><div class='add'>+</div><div class='add'>+		/* if rate is greater than 10Mbps tick is 1/32 ms,</div><div class='add'>+		 * 1ms otherwise</div><div class='add'>+		 */</div><div class='add'>+		tick = rate &gt; 10000 ? 2 : 7;</div><div class='add'>+		val = FIELD_PREP(ERLCR_CIR_MASK, (rate &gt;&gt; 5)) |</div><div class='add'>+		      FIELD_PREP(ERLCR_EN_MASK, !!rate) |</div><div class='add'>+		      FIELD_PREP(ERLCR_EXP_MASK, tick) |</div><div class='add'>+		      ERLCR_TBF_MODE_MASK |</div><div class='add'>+		      FIELD_PREP(ERLCR_MANT_MASK, 0xf);</div><div class='add'>+		mt7530_write(priv, MT753X_ERLCR_P(port), val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt753x_setup_tc(struct dsa_switch *ds, int port,</div><div class='add'>+			   enum tc_setup_type type, void *type_data)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_TBF:</div><div class='add'>+		return mt753x_tc_setup_qdisc_tbf(ds, port, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mt7988_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mt7530_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Reset the switch */</div><div class='add'>+	reset_control_assert(priv-&gt;rstc);</div><div class='add'>+	usleep_range(20, 50);</div><div class='add'>+	reset_control_deassert(priv-&gt;rstc);</div><div class='add'>+	usleep_range(20, 50);</div><div class='add'>+</div><div class='add'>+	/* AN7583 require additional tweak to CONN_CFG */</div><div class='add'>+	if (priv-&gt;id == ID_AN7583)</div><div class='add'>+		mt7530_rmw(priv, AN7583_GEPHY_CONN_CFG,</div><div class='add'>+			   AN7583_CSR_DPHY_CKIN_SEL |</div><div class='add'>+			   AN7583_CSR_PHY_CORE_REG_CLK_SEL |</div><div class='add'>+			   AN7583_CSR_ETHER_AFE_PWD,</div><div class='add'>+			   AN7583_CSR_DPHY_CKIN_SEL |</div><div class='add'>+			   AN7583_CSR_PHY_CORE_REG_CLK_SEL |</div><div class='add'>+			   FIELD_PREP(AN7583_CSR_ETHER_AFE_PWD, 0));</div><div class='add'>+</div><div class='add'>+	/* Reset the switch PHYs */</div><div class='add'>+	mt7530_write(priv, MT7530_SYS_CTRL, SYS_CTRL_PHY_RST);</div><div class='add'>+</div><div class='add'>+	return mt7531_setup_common(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops mt7530_switch_ops = {</div><div class='ctx'> 	.get_tag_protocol	= mtk_get_tag_protocol,</div><div class='del'>-	.setup			= mt7530_setup,</div><div class='add'>+	.setup			= mt753x_setup,</div><div class='add'>+	.preferred_default_local_cpu_port = mt753x_preferred_default_local_cpu_port,</div><div class='ctx'> 	.get_strings		= mt7530_get_strings,</div><div class='del'>-	.phy_read		= mt7530_phy_read,</div><div class='del'>-	.phy_write		= mt7530_phy_write,</div><div class='ctx'> 	.get_ethtool_stats	= mt7530_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count		= mt7530_get_sset_count,</div><div class='del'>-	.adjust_link		= mt7530_adjust_link,</div><div class='add'>+	.get_eth_mac_stats	= mt7530_get_eth_mac_stats,</div><div class='add'>+	.get_rmon_stats		= mt7530_get_rmon_stats,</div><div class='add'>+	.get_eth_ctrl_stats	= mt7530_get_eth_ctrl_stats,</div><div class='add'>+	.get_stats64		= mt7530_get_stats64,</div><div class='add'>+	.set_ageing_time	= mt7530_set_ageing_time,</div><div class='ctx'> 	.port_enable		= mt7530_port_enable,</div><div class='ctx'> 	.port_disable		= mt7530_port_disable,</div><div class='add'>+	.port_change_mtu	= mt7530_port_change_mtu,</div><div class='add'>+	.port_max_mtu		= mt7530_port_max_mtu,</div><div class='ctx'> 	.port_stp_state_set	= mt7530_stp_state_set,</div><div class='add'>+	.port_pre_bridge_flags	= mt7530_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= mt7530_port_bridge_flags,</div><div class='ctx'> 	.port_bridge_join	= mt7530_port_bridge_join,</div><div class='ctx'> 	.port_bridge_leave	= mt7530_port_bridge_leave,</div><div class='ctx'> 	.port_fdb_add		= mt7530_port_fdb_add,</div><div class='ctx'> 	.port_fdb_del		= mt7530_port_fdb_del,</div><div class='ctx'> 	.port_fdb_dump		= mt7530_port_fdb_dump,</div><div class='add'>+	.port_mdb_add		= mt7530_port_mdb_add,</div><div class='add'>+	.port_mdb_del		= mt7530_port_mdb_del,</div><div class='ctx'> 	.port_vlan_filtering	= mt7530_port_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= mt7530_port_vlan_prepare,</div><div class='ctx'> 	.port_vlan_add		= mt7530_port_vlan_add,</div><div class='ctx'> 	.port_vlan_del		= mt7530_port_vlan_del,</div><div class='add'>+	.port_mirror_add	= mt753x_port_mirror_add,</div><div class='add'>+	.port_mirror_del	= mt753x_port_mirror_del,</div><div class='add'>+	.phylink_get_caps	= mt753x_phylink_get_caps,</div><div class='add'>+	.support_eee		= dsa_supports_eee,</div><div class='add'>+	.set_mac_eee		= mt753x_set_mac_eee,</div><div class='add'>+	.conduit_state_change	= mt753x_conduit_state_change,</div><div class='add'>+	.port_setup_tc		= mt753x_setup_tc,</div><div class='add'>+	.port_hsr_join		= dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave		= dsa_port_simple_hsr_leave,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id mt7530_of_match[] = {</div><div class='del'>-	{ .compatible = "mediatek,mt7621", .data = (void *)ID_MT7621, },</div><div class='del'>-	{ .compatible = "mediatek,mt7530", .data = (void *)ID_MT7530, },</div><div class='del'>-	{ /* sentinel */ },</div><div class='add'>+static const struct phylink_mac_ops mt753x_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs	= mt753x_phylink_mac_select_pcs,</div><div class='add'>+	.mac_config	= mt753x_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= mt753x_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= mt753x_phylink_mac_link_up,</div><div class='add'>+	.mac_disable_tx_lpi = mt753x_phylink_mac_disable_tx_lpi,</div><div class='add'>+	.mac_enable_tx_lpi = mt753x_phylink_mac_enable_tx_lpi,</div><div class='ctx'> };</div><div class='del'>-MODULE_DEVICE_TABLE(of, mt7530_of_match);</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-mt7530_probe(struct mdio_device *mdiodev)</div><div class='del'>-{</div><div class='del'>-	struct mt7530_priv *priv;</div><div class='del'>-	struct device_node *dn;</div><div class='del'>-</div><div class='del'>-	dn = mdiodev-&gt;dev.of_node;</div><div class='add'>+const struct mt753x_info mt753x_table[] = {</div><div class='add'>+	[ID_MT7621] = {</div><div class='add'>+		.id = ID_MT7621,</div><div class='add'>+		.pcs_ops = &amp;mt7530_pcs_ops,</div><div class='add'>+		.sw_setup = mt7530_setup,</div><div class='add'>+		.phy_read_c22 = mt7530_phy_read_c22,</div><div class='add'>+		.phy_write_c22 = mt7530_phy_write_c22,</div><div class='add'>+		.phy_read_c45 = mt7530_phy_read_c45,</div><div class='add'>+		.phy_write_c45 = mt7530_phy_write_c45,</div><div class='add'>+		.mac_port_get_caps = mt7530_mac_port_get_caps,</div><div class='add'>+		.mac_port_config = mt7530_mac_config,</div><div class='add'>+	},</div><div class='add'>+	[ID_MT7530] = {</div><div class='add'>+		.id = ID_MT7530,</div><div class='add'>+		.pcs_ops = &amp;mt7530_pcs_ops,</div><div class='add'>+		.sw_setup = mt7530_setup,</div><div class='add'>+		.phy_read_c22 = mt7530_phy_read_c22,</div><div class='add'>+		.phy_write_c22 = mt7530_phy_write_c22,</div><div class='add'>+		.phy_read_c45 = mt7530_phy_read_c45,</div><div class='add'>+		.phy_write_c45 = mt7530_phy_write_c45,</div><div class='add'>+		.mac_port_get_caps = mt7530_mac_port_get_caps,</div><div class='add'>+		.mac_port_config = mt7530_mac_config,</div><div class='add'>+	},</div><div class='add'>+	[ID_MT7531] = {</div><div class='add'>+		.id = ID_MT7531,</div><div class='add'>+		.pcs_ops = &amp;mt7530_pcs_ops,</div><div class='add'>+		.sw_setup = mt7531_setup,</div><div class='add'>+		.phy_read_c22 = mt7531_ind_c22_phy_read,</div><div class='add'>+		.phy_write_c22 = mt7531_ind_c22_phy_write,</div><div class='add'>+		.phy_read_c45 = mt7531_ind_c45_phy_read,</div><div class='add'>+		.phy_write_c45 = mt7531_ind_c45_phy_write,</div><div class='add'>+		.mac_port_get_caps = mt7531_mac_port_get_caps,</div><div class='add'>+		.mac_port_config = mt7531_mac_config,</div><div class='add'>+	},</div><div class='add'>+	[ID_MT7988] = {</div><div class='add'>+		.id = ID_MT7988,</div><div class='add'>+		.pcs_ops = &amp;mt7530_pcs_ops,</div><div class='add'>+		.sw_setup = mt7988_setup,</div><div class='add'>+		.phy_read_c22 = mt7531_ind_c22_phy_read,</div><div class='add'>+		.phy_write_c22 = mt7531_ind_c22_phy_write,</div><div class='add'>+		.phy_read_c45 = mt7531_ind_c45_phy_read,</div><div class='add'>+		.phy_write_c45 = mt7531_ind_c45_phy_write,</div><div class='add'>+		.mac_port_get_caps = mt7988_mac_port_get_caps,</div><div class='add'>+	},</div><div class='add'>+	[ID_EN7581] = {</div><div class='add'>+		.id = ID_EN7581,</div><div class='add'>+		.pcs_ops = &amp;mt7530_pcs_ops,</div><div class='add'>+		.sw_setup = mt7988_setup,</div><div class='add'>+		.phy_read_c22 = mt7531_ind_c22_phy_read,</div><div class='add'>+		.phy_write_c22 = mt7531_ind_c22_phy_write,</div><div class='add'>+		.phy_read_c45 = mt7531_ind_c45_phy_read,</div><div class='add'>+		.phy_write_c45 = mt7531_ind_c45_phy_write,</div><div class='add'>+		.mac_port_get_caps = en7581_mac_port_get_caps,</div><div class='add'>+	},</div><div class='add'>+	[ID_AN7583] = {</div><div class='add'>+		.id = ID_AN7583,</div><div class='add'>+		.pcs_ops = &amp;mt7530_pcs_ops,</div><div class='add'>+		.sw_setup = mt7988_setup,</div><div class='add'>+		.phy_read_c22 = mt7531_ind_c22_phy_read,</div><div class='add'>+		.phy_write_c22 = mt7531_ind_c22_phy_write,</div><div class='add'>+		.phy_read_c45 = mt7531_ind_c45_phy_read,</div><div class='add'>+		.phy_write_c45 = mt7531_ind_c45_phy_write,</div><div class='add'>+		.mac_port_get_caps = en7581_mac_port_get_caps,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+EXPORT_SYMBOL_GPL(mt753x_table);</div><div class='ctx'> </div><div class='del'>-	priv = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+int</div><div class='add'>+mt7530_probe_common(struct mt7530_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ds = dsa_switch_alloc(&amp;mdiodev-&gt;dev, DSA_MAX_PORTS);</div><div class='add'>+	priv-&gt;ds = devm_kzalloc(dev, sizeof(*priv-&gt;ds), GFP_KERNEL);</div><div class='ctx'> 	if (!priv-&gt;ds)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Use medatek,mcm property to distinguish hardware type that would</div><div class='del'>-	 * casues a little bit differences on power-on sequence.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;mcm = of_property_read_bool(dn, "mediatek,mcm");</div><div class='del'>-	if (priv-&gt;mcm) {</div><div class='del'>-		dev_info(&amp;mdiodev-&gt;dev, "MT7530 adapts as multi-chip module\n");</div><div class='del'>-</div><div class='del'>-		priv-&gt;rstc = devm_reset_control_get(&amp;mdiodev-&gt;dev, "mcm");</div><div class='del'>-		if (IS_ERR(priv-&gt;rstc)) {</div><div class='del'>-			dev_err(&amp;mdiodev-&gt;dev, "Couldn't get our reset line\n");</div><div class='del'>-			return PTR_ERR(priv-&gt;rstc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;ds-&gt;dev = dev;</div><div class='add'>+	priv-&gt;ds-&gt;num_ports = MT7530_NUM_PORTS;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the hardware identifier from the devicetree node.</div><div class='ctx'> 	 * We will need it for some of the clock and regulator setup.</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;id = (unsigned int)(unsigned long)</div><div class='del'>-		of_device_get_match_data(&amp;mdiodev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;id == ID_MT7530) {</div><div class='del'>-		priv-&gt;core_pwr = devm_regulator_get(&amp;mdiodev-&gt;dev, "core");</div><div class='del'>-		if (IS_ERR(priv-&gt;core_pwr))</div><div class='del'>-			return PTR_ERR(priv-&gt;core_pwr);</div><div class='del'>-</div><div class='del'>-		priv-&gt;io_pwr = devm_regulator_get(&amp;mdiodev-&gt;dev, "io");</div><div class='del'>-		if (IS_ERR(priv-&gt;io_pwr))</div><div class='del'>-			return PTR_ERR(priv-&gt;io_pwr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Not MCM that indicates switch works as the remote standalone</div><div class='del'>-	 * integrated circuit so the GPIO pin would be used to complete</div><div class='del'>-	 * the reset, otherwise memory-mapped register accessing used</div><div class='del'>-	 * through syscon provides in the case of MCM.</div><div class='del'>-	 */</div><div class='del'>-	if (!priv-&gt;mcm) {</div><div class='del'>-		priv-&gt;reset = devm_gpiod_get_optional(&amp;mdiodev-&gt;dev, "reset",</div><div class='del'>-						      GPIOD_OUT_LOW);</div><div class='del'>-		if (IS_ERR(priv-&gt;reset)) {</div><div class='del'>-			dev_err(&amp;mdiodev-&gt;dev, "Couldn't get our reset line\n");</div><div class='del'>-			return PTR_ERR(priv-&gt;reset);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	priv-&gt;info = of_device_get_match_data(dev);</div><div class='add'>+	if (!priv-&gt;info)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;bus = mdiodev-&gt;bus;</div><div class='del'>-	priv-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	priv-&gt;id = priv-&gt;info-&gt;id;</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='ctx'> 	priv-&gt;ds-&gt;priv = priv;</div><div class='ctx'> 	priv-&gt;ds-&gt;ops = &amp;mt7530_switch_ops;</div><div class='add'>+	priv-&gt;ds-&gt;phylink_mac_ops = &amp;mt753x_phylink_mac_ops;</div><div class='ctx'> 	mutex_init(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	dev_set_drvdata(&amp;mdiodev-&gt;dev, priv);</div><div class='add'>+	dev_set_drvdata(dev, priv);</div><div class='ctx'> </div><div class='del'>-	return dsa_register_switch(priv-&gt;ds);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7530_probe_common);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-mt7530_remove(struct mdio_device *mdiodev)</div><div class='add'>+void</div><div class='add'>+mt7530_remove_common(struct mt7530_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct mt7530_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = regulator_disable(priv-&gt;core_pwr);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(priv-&gt;dev,</div><div class='del'>-			"Failed to disable core power: %d\n", ret);</div><div class='del'>-</div><div class='del'>-	ret = regulator_disable(priv-&gt;io_pwr);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err(priv-&gt;dev, "Failed to disable io pwr: %d\n",</div><div class='del'>-			ret);</div><div class='add'>+	if (priv-&gt;irq_domain)</div><div class='add'>+		mt7530_free_mdio_irq(priv);</div><div class='ctx'> </div><div class='ctx'> 	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+</div><div class='ctx'> 	mutex_destroy(&amp;priv-&gt;reg_mutex);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-static struct mdio_driver mt7530_mdio_driver = {</div><div class='del'>-	.probe  = mt7530_probe,</div><div class='del'>-	.remove = mt7530_remove,</div><div class='del'>-	.mdiodrv.driver = {</div><div class='del'>-		.name = "mt7530",</div><div class='del'>-		.of_match_table = mt7530_of_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-mdio_module_driver(mt7530_mdio_driver);</div><div class='add'>+EXPORT_SYMBOL_GPL(mt7530_remove_common);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sean Wang &lt;sean.wang@mediatek.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Driver for Mediatek MT7530 Switch");</div><div class='head'>diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h<br/>index 4331429969fa..3e0090bed298 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mt7530.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mt7530.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mt7530.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mt7530.h</a></div><div class='hunk'>@@ -7,13 +7,20 @@</div><div class='ctx'> #define __MT7530_H</div><div class='ctx'> </div><div class='ctx'> #define MT7530_NUM_PORTS		7</div><div class='del'>-#define MT7530_CPU_PORT			6</div><div class='add'>+#define MT7530_NUM_PHYS			5</div><div class='ctx'> #define MT7530_NUM_FDB_RECORDS		2048</div><div class='ctx'> #define MT7530_ALL_MEMBERS		0xff</div><div class='ctx'> </div><div class='del'>-enum {</div><div class='add'>+#define MTK_HDR_LEN	4</div><div class='add'>+#define MT7530_MAX_MTU	(15 * 1024 - ETH_HLEN - ETH_FCS_LEN - MTK_HDR_LEN)</div><div class='add'>+</div><div class='add'>+enum mt753x_id {</div><div class='ctx'> 	ID_MT7530 = 0,</div><div class='ctx'> 	ID_MT7621 = 1,</div><div class='add'>+	ID_MT7531 = 2,</div><div class='add'>+	ID_MT7988 = 3,</div><div class='add'>+	ID_EN7581 = 4,</div><div class='add'>+	ID_AN7583 = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define	NUM_TRGMII_CTRL			5</div><div class='hunk'>@@ -27,21 +34,119 @@ enum {</div><div class='ctx'> #define SYSC_REG_RSTCTRL		0x34</div><div class='ctx'> #define  RESET_MCM			BIT(2)</div><div class='ctx'> </div><div class='del'>-/* Registers to mac forward control for unknown frames */</div><div class='del'>-#define MT7530_MFC			0x10</div><div class='del'>-#define  BC_FFP(x)			(((x) &amp; 0xff) &lt;&lt; 24)</div><div class='del'>-#define  UNM_FFP(x)			(((x) &amp; 0xff) &lt;&lt; 16)</div><div class='del'>-#define  UNU_FFP(x)			(((x) &amp; 0xff) &lt;&lt; 8)</div><div class='del'>-#define  UNU_FFP_MASK			UNU_FFP(~0)</div><div class='del'>-#define  CPU_EN				BIT(7)</div><div class='del'>-#define  CPU_PORT(x)			((x) &lt;&lt; 4)</div><div class='del'>-#define  CPU_MASK			(0xf &lt;&lt; 4)</div><div class='add'>+/* Register for ARL global control */</div><div class='add'>+#define MT753X_AGC			0xc</div><div class='add'>+#define  LOCAL_EN			BIT(7)</div><div class='add'>+</div><div class='add'>+/* Register for MAC forward control */</div><div class='add'>+#define MT753X_MFC			0x10</div><div class='add'>+#define  BC_FFP_MASK			GENMASK(31, 24)</div><div class='add'>+#define  BC_FFP(x)			FIELD_PREP(BC_FFP_MASK, x)</div><div class='add'>+#define  UNM_FFP_MASK			GENMASK(23, 16)</div><div class='add'>+#define  UNM_FFP(x)			FIELD_PREP(UNM_FFP_MASK, x)</div><div class='add'>+#define  UNU_FFP_MASK			GENMASK(15, 8)</div><div class='add'>+#define  UNU_FFP(x)			FIELD_PREP(UNU_FFP_MASK, x)</div><div class='add'>+#define  MT7530_CPU_EN			BIT(7)</div><div class='add'>+#define  MT7530_CPU_PORT_MASK		GENMASK(6, 4)</div><div class='add'>+#define  MT7530_CPU_PORT(x)		FIELD_PREP(MT7530_CPU_PORT_MASK, x)</div><div class='add'>+#define  MT7530_MIRROR_EN		BIT(3)</div><div class='add'>+#define  MT7530_MIRROR_PORT_MASK	GENMASK(2, 0)</div><div class='add'>+#define  MT7530_MIRROR_PORT_GET(x)	FIELD_GET(MT7530_MIRROR_PORT_MASK, x)</div><div class='add'>+#define  MT7530_MIRROR_PORT_SET(x)	FIELD_PREP(MT7530_MIRROR_PORT_MASK, x)</div><div class='add'>+#define  MT7531_QRY_FFP_MASK		GENMASK(7, 0)</div><div class='add'>+#define  MT7531_QRY_FFP(x)		FIELD_PREP(MT7531_QRY_FFP_MASK, x)</div><div class='add'>+</div><div class='add'>+/* Register for CPU forward control */</div><div class='add'>+#define MT7531_CFC			0x4</div><div class='add'>+#define  MT7531_MIRROR_EN		BIT(19)</div><div class='add'>+#define  MT7531_MIRROR_PORT_MASK	GENMASK(18, 16)</div><div class='add'>+#define  MT7531_MIRROR_PORT_GET(x)	FIELD_GET(MT7531_MIRROR_PORT_MASK, x)</div><div class='add'>+#define  MT7531_MIRROR_PORT_SET(x)	FIELD_PREP(MT7531_MIRROR_PORT_MASK, x)</div><div class='add'>+#define  MT7531_CPU_PMAP_MASK		GENMASK(7, 0)</div><div class='add'>+#define  MT7531_CPU_PMAP(x)		FIELD_PREP(MT7531_CPU_PMAP_MASK, x)</div><div class='add'>+</div><div class='add'>+#define MT753X_MIRROR_REG(id)		((id == ID_MT7531 || \</div><div class='add'>+					  id == ID_MT7988 || \</div><div class='add'>+					  id == ID_EN7581 || \</div><div class='add'>+					  id == ID_AN7583) ? \</div><div class='add'>+					 MT7531_CFC : MT753X_MFC)</div><div class='add'>+</div><div class='add'>+#define MT753X_MIRROR_EN(id)		((id == ID_MT7531 || \</div><div class='add'>+					  id == ID_MT7988 || \</div><div class='add'>+					  id == ID_EN7581) ? \</div><div class='add'>+					 MT7531_MIRROR_EN : MT7530_MIRROR_EN)</div><div class='add'>+</div><div class='add'>+#define MT753X_MIRROR_PORT_MASK(id)	((id == ID_MT7531 || \</div><div class='add'>+					  id == ID_MT7988 || \</div><div class='add'>+					  id == ID_EN7581 || \</div><div class='add'>+					  id == ID_AN7583) ? \</div><div class='add'>+					 MT7531_MIRROR_PORT_MASK : \</div><div class='add'>+					 MT7530_MIRROR_PORT_MASK)</div><div class='add'>+</div><div class='add'>+#define MT753X_MIRROR_PORT_GET(id, val)	((id == ID_MT7531 || \</div><div class='add'>+					  id == ID_MT7988 || \</div><div class='add'>+					  id == ID_EN7581 || \</div><div class='add'>+					  id == ID_AN7583) ? \</div><div class='add'>+					 MT7531_MIRROR_PORT_GET(val) : \</div><div class='add'>+					 MT7530_MIRROR_PORT_GET(val))</div><div class='add'>+</div><div class='add'>+#define MT753X_MIRROR_PORT_SET(id, val)	((id == ID_MT7531 || \</div><div class='add'>+					  id == ID_MT7988 || \</div><div class='add'>+					  id == ID_EN7581 || \</div><div class='add'>+					  id == ID_AN7583) ? \</div><div class='add'>+					 MT7531_MIRROR_PORT_SET(val) : \</div><div class='add'>+					 MT7530_MIRROR_PORT_SET(val))</div><div class='add'>+</div><div class='add'>+/* Register for BPDU and PAE frame control */</div><div class='add'>+#define MT753X_BPC			0x24</div><div class='add'>+#define  PAE_BPDU_FR			BIT(25)</div><div class='add'>+#define  PAE_EG_TAG_MASK		GENMASK(24, 22)</div><div class='add'>+#define  PAE_EG_TAG(x)			FIELD_PREP(PAE_EG_TAG_MASK, x)</div><div class='add'>+#define  PAE_PORT_FW_MASK		GENMASK(18, 16)</div><div class='add'>+#define  PAE_PORT_FW(x)			FIELD_PREP(PAE_PORT_FW_MASK, x)</div><div class='add'>+#define  BPDU_EG_TAG_MASK		GENMASK(8, 6)</div><div class='add'>+#define  BPDU_EG_TAG(x)			FIELD_PREP(BPDU_EG_TAG_MASK, x)</div><div class='add'>+#define  BPDU_PORT_FW_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+/* Register for 01-80-C2-00-00-[01,02] MAC DA frame control */</div><div class='add'>+#define MT753X_RGAC1			0x28</div><div class='add'>+#define  R02_BPDU_FR			BIT(25)</div><div class='add'>+#define  R02_EG_TAG_MASK		GENMASK(24, 22)</div><div class='add'>+#define  R02_EG_TAG(x)			FIELD_PREP(R02_EG_TAG_MASK, x)</div><div class='add'>+#define  R02_PORT_FW_MASK		GENMASK(18, 16)</div><div class='add'>+#define  R02_PORT_FW(x)			FIELD_PREP(R02_PORT_FW_MASK, x)</div><div class='add'>+#define  R01_BPDU_FR			BIT(9)</div><div class='add'>+#define  R01_EG_TAG_MASK		GENMASK(8, 6)</div><div class='add'>+#define  R01_EG_TAG(x)			FIELD_PREP(R01_EG_TAG_MASK, x)</div><div class='add'>+#define  R01_PORT_FW_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+/* Register for 01-80-C2-00-00-[03,0E] MAC DA frame control */</div><div class='add'>+#define MT753X_RGAC2			0x2c</div><div class='add'>+#define  R0E_BPDU_FR			BIT(25)</div><div class='add'>+#define  R0E_EG_TAG_MASK		GENMASK(24, 22)</div><div class='add'>+#define  R0E_EG_TAG(x)			FIELD_PREP(R0E_EG_TAG_MASK, x)</div><div class='add'>+#define  R0E_PORT_FW_MASK		GENMASK(18, 16)</div><div class='add'>+#define  R0E_PORT_FW(x)			FIELD_PREP(R0E_PORT_FW_MASK, x)</div><div class='add'>+#define  R03_BPDU_FR			BIT(9)</div><div class='add'>+#define  R03_EG_TAG_MASK		GENMASK(8, 6)</div><div class='add'>+#define  R03_EG_TAG(x)			FIELD_PREP(R03_EG_TAG_MASK, x)</div><div class='add'>+#define  R03_PORT_FW_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+enum mt753x_to_cpu_fw {</div><div class='add'>+	TO_CPU_FW_SYSTEM_DEFAULT,</div><div class='add'>+	TO_CPU_FW_CPU_EXCLUDE = 4,</div><div class='add'>+	TO_CPU_FW_CPU_INCLUDE = 5,</div><div class='add'>+	TO_CPU_FW_CPU_ONLY = 6,</div><div class='add'>+	TO_CPU_FW_DROP = 7,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Registers for address table access */</div><div class='ctx'> #define MT7530_ATA1			0x74</div><div class='ctx'> #define  STATIC_EMP			0</div><div class='ctx'> #define  STATIC_ENT			3</div><div class='ctx'> #define MT7530_ATA2			0x78</div><div class='add'>+#define  ATA2_IVL			BIT(15)</div><div class='add'>+#define  ATA2_FID(x)			(((x) &amp; 0x7) &lt;&lt; 12)</div><div class='ctx'> </div><div class='ctx'> /* Register for address table write data */</div><div class='ctx'> #define MT7530_ATWD			0x7c</div><div class='hunk'>@@ -106,15 +211,24 @@ enum mt7530_vlan_cmd {</div><div class='ctx'> #define  PORT_STAG			BIT(31)</div><div class='ctx'> /* Independent VLAN Learning */</div><div class='ctx'> #define  IVL_MAC			BIT(30)</div><div class='add'>+/* Egress Tag Consistent */</div><div class='add'>+#define  EG_CON				BIT(29)</div><div class='ctx'> /* Per VLAN Egress Tag Control */</div><div class='ctx'> #define  VTAG_EN			BIT(28)</div><div class='ctx'> /* VLAN Member Control */</div><div class='ctx'> #define  PORT_MEM(x)			(((x) &amp; 0xff) &lt;&lt; 16)</div><div class='add'>+/* Filter ID */</div><div class='add'>+#define  FID(x)				(((x) &amp; 0x7) &lt;&lt; 1)</div><div class='ctx'> /* VLAN Entry Valid */</div><div class='ctx'> #define  VLAN_VALID			BIT(0)</div><div class='ctx'> #define  PORT_MEM_SHFT			16</div><div class='ctx'> #define  PORT_MEM_MASK			0xff</div><div class='ctx'> </div><div class='add'>+enum mt7530_fid {</div><div class='add'>+	FID_STANDALONE = 0,</div><div class='add'>+	FID_BRIDGED = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MT7530_VAWD2			0x98</div><div class='ctx'> /* Egress Tag Control */</div><div class='ctx'> #define  ETAG_CTRL_P(p, x)		(((x) &amp; 0x3) &lt;&lt; ((p) &lt;&lt; 1))</div><div class='hunk'>@@ -126,10 +240,35 @@ enum mt7530_vlan_egress_attr {</div><div class='ctx'> 	MT7530_VLAN_EGRESS_STACK = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Register for address age control */</div><div class='add'>+#define MT7530_AAC			0xa0</div><div class='add'>+/* Disable ageing */</div><div class='add'>+#define  AGE_DIS			BIT(20)</div><div class='add'>+/* Age count */</div><div class='add'>+#define  AGE_CNT_MASK			GENMASK(19, 12)</div><div class='add'>+#define  AGE_CNT_MAX			0xff</div><div class='add'>+#define  AGE_CNT(x)			(AGE_CNT_MASK &amp; ((x) &lt;&lt; 12))</div><div class='add'>+/* Age unit */</div><div class='add'>+#define  AGE_UNIT_MASK			GENMASK(11, 0)</div><div class='add'>+#define  AGE_UNIT_MAX			0xfff</div><div class='add'>+#define  AGE_UNIT(x)			(AGE_UNIT_MASK &amp; (x))</div><div class='add'>+</div><div class='add'>+#define MT753X_ERLCR_P(x)		(0x1040 + ((x) * 0x100))</div><div class='add'>+#define  ERLCR_CIR_MASK			GENMASK(31, 16)</div><div class='add'>+#define  ERLCR_EN_MASK			BIT(15)</div><div class='add'>+#define  ERLCR_EXP_MASK			GENMASK(11, 8)</div><div class='add'>+#define  ERLCR_TBF_MODE_MASK		BIT(7)</div><div class='add'>+#define  ERLCR_MANT_MASK		GENMASK(6, 0)</div><div class='add'>+</div><div class='add'>+#define MT753X_GERLCR			0x10e0</div><div class='add'>+#define  EGR_BC_MASK			GENMASK(7, 0)</div><div class='add'>+#define  EGR_BC_CRC			0x4	/* crc */</div><div class='add'>+#define  EGR_BC_CRC_IPG_PREAMBLE	0x18	/* crc + ipg + preamble */</div><div class='add'>+</div><div class='ctx'> /* Register for port STP state control */</div><div class='ctx'> #define MT7530_SSP_P(x)			(0x2000 + ((x) * 0x100))</div><div class='del'>-#define  FID_PST(x)			((x) &amp; 0x3)</div><div class='del'>-#define  FID_PST_MASK			FID_PST(0x3)</div><div class='add'>+#define  FID_PST(fid, state)		(((state) &amp; 0x3) &lt;&lt; ((fid) * 2))</div><div class='add'>+#define  FID_PST_MASK(fid)		FID_PST(fid, 0x3)</div><div class='ctx'> </div><div class='ctx'> enum mt7530_stp_state {</div><div class='ctx'> 	MT7530_STP_DISABLED = 0,</div><div class='hunk'>@@ -141,12 +280,20 @@ enum mt7530_stp_state {</div><div class='ctx'> </div><div class='ctx'> /* Register for port control */</div><div class='ctx'> #define MT7530_PCR_P(x)			(0x2004 + ((x) * 0x100))</div><div class='add'>+#define  PORT_TX_MIR			BIT(9)</div><div class='add'>+#define  PORT_RX_MIR			BIT(8)</div><div class='ctx'> #define  PORT_VLAN(x)			((x) &amp; 0x3)</div><div class='ctx'> </div><div class='ctx'> enum mt7530_port_mode {</div><div class='ctx'> 	/* Port Matrix Mode: Frames are forwarded by the PCR_MATRIX members. */</div><div class='ctx'> 	MT7530_PORT_MATRIX_MODE = PORT_VLAN(0),</div><div class='ctx'> </div><div class='add'>+	/* Fallback Mode: Forward received frames with ingress ports that do</div><div class='add'>+	 * not belong to the VLAN member. Frames whose VID is not listed on</div><div class='add'>+	 * the VLAN table are forwarded by the PCR_MATRIX members.</div><div class='add'>+	 */</div><div class='add'>+	MT7530_PORT_FALLBACK_MODE = PORT_VLAN(1),</div><div class='add'>+</div><div class='ctx'> 	/* Security Mode: Discard any frame due to ingress membership</div><div class='ctx'> 	 * violation or VID missed on the VLAN table.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -167,60 +314,162 @@ enum mt7530_port_mode {</div><div class='ctx'> /* Register for port vlan control */</div><div class='ctx'> #define MT7530_PVC_P(x)			(0x2010 + ((x) * 0x100))</div><div class='ctx'> #define  PORT_SPEC_TAG			BIT(5)</div><div class='add'>+#define  PVC_EG_TAG(x)			(((x) &amp; 0x7) &lt;&lt; 8)</div><div class='add'>+#define  PVC_EG_TAG_MASK		PVC_EG_TAG(7)</div><div class='ctx'> #define  VLAN_ATTR(x)			(((x) &amp; 0x3) &lt;&lt; 6)</div><div class='ctx'> #define  VLAN_ATTR_MASK			VLAN_ATTR(3)</div><div class='add'>+#define  ACC_FRM_MASK			GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+enum mt7530_vlan_port_eg_tag {</div><div class='add'>+	MT7530_VLAN_EG_DISABLED = 0,</div><div class='add'>+	MT7530_VLAN_EG_CONSISTENT = 1,</div><div class='add'>+	MT7530_VLAN_EG_UNTAGGED = 4,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> enum mt7530_vlan_port_attr {</div><div class='ctx'> 	MT7530_VLAN_USER = 0,</div><div class='ctx'> 	MT7530_VLAN_TRANSPARENT = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mt7530_vlan_port_acc_frm {</div><div class='add'>+	MT7530_VLAN_ACC_ALL = 0,</div><div class='add'>+	MT7530_VLAN_ACC_TAGGED = 1,</div><div class='add'>+	MT7530_VLAN_ACC_UNTAGGED = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define  STAG_VPID			(((x) &amp; 0xffff) &lt;&lt; 16)</div><div class='ctx'> </div><div class='ctx'> /* Register for port port-and-protocol based vlan 1 control */</div><div class='ctx'> #define MT7530_PPBV1_P(x)		(0x2014 + ((x) * 0x100))</div><div class='ctx'> #define  G0_PORT_VID(x)			(((x) &amp; 0xfff) &lt;&lt; 0)</div><div class='ctx'> #define  G0_PORT_VID_MASK		G0_PORT_VID(0xfff)</div><div class='del'>-#define  G0_PORT_VID_DEF		G0_PORT_VID(1)</div><div class='add'>+#define  G0_PORT_VID_DEF		G0_PORT_VID(0)</div><div class='ctx'> </div><div class='ctx'> /* Register for port MAC control register */</div><div class='del'>-#define MT7530_PMCR_P(x)		(0x3000 + ((x) * 0x100))</div><div class='del'>-#define  PMCR_IFG_XMIT(x)		(((x) &amp; 0x3) &lt;&lt; 18)</div><div class='add'>+#define MT753X_PMCR_P(x)		(0x3000 + ((x) * 0x100))</div><div class='add'>+#define  PMCR_IFG_XMIT_MASK		GENMASK(19, 18)</div><div class='add'>+#define  PMCR_IFG_XMIT(x)		FIELD_PREP(PMCR_IFG_XMIT_MASK, x)</div><div class='add'>+#define  PMCR_EXT_PHY			BIT(17)</div><div class='ctx'> #define  PMCR_MAC_MODE			BIT(16)</div><div class='del'>-#define  PMCR_FORCE_MODE		BIT(15)</div><div class='del'>-#define  PMCR_TX_EN			BIT(14)</div><div class='del'>-#define  PMCR_RX_EN			BIT(13)</div><div class='add'>+#define  MT7530_FORCE_MODE		BIT(15)</div><div class='add'>+#define  PMCR_MAC_TX_EN			BIT(14)</div><div class='add'>+#define  PMCR_MAC_RX_EN			BIT(13)</div><div class='ctx'> #define  PMCR_BACKOFF_EN		BIT(9)</div><div class='ctx'> #define  PMCR_BACKPR_EN			BIT(8)</div><div class='del'>-#define  PMCR_TX_FC_EN			BIT(5)</div><div class='del'>-#define  PMCR_RX_FC_EN			BIT(4)</div><div class='add'>+#define  PMCR_FORCE_EEE1G		BIT(7)</div><div class='add'>+#define  PMCR_FORCE_EEE100		BIT(6)</div><div class='add'>+#define  PMCR_FORCE_RX_FC_EN		BIT(5)</div><div class='add'>+#define  PMCR_FORCE_TX_FC_EN		BIT(4)</div><div class='ctx'> #define  PMCR_FORCE_SPEED_1000		BIT(3)</div><div class='ctx'> #define  PMCR_FORCE_SPEED_100		BIT(2)</div><div class='ctx'> #define  PMCR_FORCE_FDX			BIT(1)</div><div class='ctx'> #define  PMCR_FORCE_LNK			BIT(0)</div><div class='del'>-#define  PMCR_COMMON_LINK		(PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | \</div><div class='del'>-					 PMCR_BACKOFF_EN | PMCR_BACKPR_EN | \</div><div class='del'>-					 PMCR_TX_EN | PMCR_RX_EN | \</div><div class='del'>-					 PMCR_TX_FC_EN | PMCR_RX_FC_EN)</div><div class='del'>-#define  PMCR_CPUP_LINK			(PMCR_COMMON_LINK | PMCR_FORCE_MODE | \</div><div class='del'>-					 PMCR_FORCE_SPEED_1000 | \</div><div class='del'>-					 PMCR_FORCE_FDX | \</div><div class='del'>-					 PMCR_FORCE_LNK)</div><div class='del'>-#define  PMCR_USERP_LINK		PMCR_COMMON_LINK</div><div class='del'>-#define  PMCR_FIXED_LINK		(PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | \</div><div class='del'>-					 PMCR_FORCE_MODE | PMCR_TX_EN | \</div><div class='del'>-					 PMCR_RX_EN | PMCR_BACKPR_EN | \</div><div class='del'>-					 PMCR_BACKOFF_EN | \</div><div class='add'>+#define  MT7531_FORCE_MODE_LNK		BIT(31)</div><div class='add'>+#define  MT7531_FORCE_MODE_SPD		BIT(30)</div><div class='add'>+#define  MT7531_FORCE_MODE_DPX		BIT(29)</div><div class='add'>+#define  MT7531_FORCE_MODE_RX_FC	BIT(28)</div><div class='add'>+#define  MT7531_FORCE_MODE_TX_FC	BIT(27)</div><div class='add'>+#define  MT7531_FORCE_MODE_EEE100	BIT(26)</div><div class='add'>+#define  MT7531_FORCE_MODE_EEE1G	BIT(25)</div><div class='add'>+#define  MT7531_FORCE_MODE_MASK		(MT7531_FORCE_MODE_LNK | \</div><div class='add'>+					 MT7531_FORCE_MODE_SPD | \</div><div class='add'>+					 MT7531_FORCE_MODE_DPX | \</div><div class='add'>+					 MT7531_FORCE_MODE_RX_FC | \</div><div class='add'>+					 MT7531_FORCE_MODE_TX_FC | \</div><div class='add'>+					 MT7531_FORCE_MODE_EEE100 | \</div><div class='add'>+					 MT7531_FORCE_MODE_EEE1G)</div><div class='add'>+#define  MT753X_FORCE_MODE(id)		((id == ID_MT7531 || \</div><div class='add'>+					  id == ID_MT7988) ? \</div><div class='add'>+					 MT7531_FORCE_MODE_MASK : \</div><div class='add'>+					 MT7530_FORCE_MODE)</div><div class='add'>+#define  PMCR_LINK_SETTINGS_MASK	(PMCR_MAC_TX_EN | PMCR_MAC_RX_EN | \</div><div class='add'>+					 PMCR_FORCE_EEE1G | \</div><div class='add'>+					 PMCR_FORCE_EEE100 | \</div><div class='add'>+					 PMCR_FORCE_RX_FC_EN | \</div><div class='add'>+					 PMCR_FORCE_TX_FC_EN | \</div><div class='ctx'> 					 PMCR_FORCE_SPEED_1000 | \</div><div class='del'>-					 PMCR_FORCE_FDX | \</div><div class='del'>-					 PMCR_FORCE_LNK)</div><div class='del'>-#define PMCR_FIXED_LINK_FC		(PMCR_FIXED_LINK | \</div><div class='del'>-					 PMCR_TX_FC_EN | PMCR_RX_FC_EN)</div><div class='add'>+					 PMCR_FORCE_SPEED_100 | \</div><div class='add'>+					 PMCR_FORCE_FDX | PMCR_FORCE_LNK)</div><div class='add'>+</div><div class='add'>+#define MT753X_PMEEECR_P(x)		(0x3004 + (x) * 0x100)</div><div class='add'>+#define  WAKEUP_TIME_1000_MASK		GENMASK(31, 24)</div><div class='add'>+#define  WAKEUP_TIME_1000(x)		FIELD_PREP(WAKEUP_TIME_1000_MASK, x)</div><div class='add'>+#define  WAKEUP_TIME_100_MASK		GENMASK(23, 16)</div><div class='add'>+#define  WAKEUP_TIME_100(x)		FIELD_PREP(WAKEUP_TIME_100_MASK, x)</div><div class='add'>+#define  LPI_THRESH_MASK		GENMASK(15, 4)</div><div class='add'>+#define  LPI_THRESH_GET(x)		FIELD_GET(LPI_THRESH_MASK, x)</div><div class='add'>+#define  LPI_THRESH_SET(x)		FIELD_PREP(LPI_THRESH_MASK, x)</div><div class='add'>+#define  LPI_MODE_EN			BIT(0)</div><div class='ctx'> </div><div class='ctx'> #define MT7530_PMSR_P(x)		(0x3008 + (x) * 0x100)</div><div class='add'>+#define  PMSR_EEE1G			BIT(7)</div><div class='add'>+#define  PMSR_EEE100M			BIT(6)</div><div class='add'>+#define  PMSR_RX_FC			BIT(5)</div><div class='add'>+#define  PMSR_TX_FC			BIT(4)</div><div class='add'>+#define  PMSR_SPEED_1000		BIT(3)</div><div class='add'>+#define  PMSR_SPEED_100			BIT(2)</div><div class='add'>+#define  PMSR_SPEED_10			0x00</div><div class='add'>+#define  PMSR_SPEED_MASK		(PMSR_SPEED_100 | PMSR_SPEED_1000)</div><div class='add'>+#define  PMSR_DPX			BIT(1)</div><div class='add'>+#define  PMSR_LINK			BIT(0)</div><div class='add'>+</div><div class='add'>+/* Register for port debug count */</div><div class='add'>+#define MT7531_DBG_CNT(x)		(0x3018 + (x) * 0x100)</div><div class='add'>+#define  MT7531_DIS_CLR			BIT(31)</div><div class='add'>+</div><div class='add'>+#define MT7530_GMACCR			0x30e0</div><div class='add'>+#define  MAX_RX_JUMBO(x)		((x) &lt;&lt; 2)</div><div class='add'>+#define  MAX_RX_JUMBO_MASK		GENMASK(5, 2)</div><div class='add'>+#define  MAX_RX_PKT_LEN_MASK		GENMASK(1, 0)</div><div class='add'>+#define  MAX_RX_PKT_LEN_1522		0x0</div><div class='add'>+#define  MAX_RX_PKT_LEN_1536		0x1</div><div class='add'>+#define  MAX_RX_PKT_LEN_1552		0x2</div><div class='add'>+#define  MAX_RX_PKT_LEN_JUMBO		0x3</div><div class='ctx'> </div><div class='ctx'> /* Register for MIB */</div><div class='ctx'> #define MT7530_PORT_MIB_COUNTER(x)	(0x4000 + (x) * 0x100)</div><div class='add'>+/* Each define is an offset of MT7530_PORT_MIB_COUNTER */</div><div class='add'>+#define   MT7530_PORT_MIB_TX_DROP	0x00</div><div class='add'>+#define   MT7530_PORT_MIB_TX_CRC_ERR	0x04</div><div class='add'>+#define   MT7530_PORT_MIB_TX_UNICAST	0x08</div><div class='add'>+#define   MT7530_PORT_MIB_TX_MULTICAST	0x0c</div><div class='add'>+#define   MT7530_PORT_MIB_TX_BROADCAST	0x10</div><div class='add'>+#define   MT7530_PORT_MIB_TX_COLLISION	0x14</div><div class='add'>+#define   MT7530_PORT_MIB_TX_SINGLE_COLLISION 0x18</div><div class='add'>+#define   MT7530_PORT_MIB_TX_MULTIPLE_COLLISION 0x1c</div><div class='add'>+#define   MT7530_PORT_MIB_TX_DEFERRED	0x20</div><div class='add'>+#define   MT7530_PORT_MIB_TX_LATE_COLLISION 0x24</div><div class='add'>+#define   MT7530_PORT_MIB_TX_EXCESSIVE_COLLISION 0x28</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PAUSE	0x2c</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PKT_SZ_64	0x30</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PKT_SZ_65_TO_127 0x34</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PKT_SZ_128_TO_255 0x38</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PKT_SZ_256_TO_511 0x3c</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PKT_SZ_512_TO_1023 0x40</div><div class='add'>+#define   MT7530_PORT_MIB_TX_PKT_SZ_1024_TO_MAX 0x44</div><div class='add'>+#define   MT7530_PORT_MIB_TX_BYTES	0x48 /* 64 bytes */</div><div class='add'>+#define   MT7530_PORT_MIB_RX_DROP	0x60</div><div class='add'>+#define   MT7530_PORT_MIB_RX_FILTERING	0x64</div><div class='add'>+#define   MT7530_PORT_MIB_RX_UNICAST	0x68</div><div class='add'>+#define   MT7530_PORT_MIB_RX_MULTICAST	0x6c</div><div class='add'>+#define   MT7530_PORT_MIB_RX_BROADCAST	0x70</div><div class='add'>+#define   MT7530_PORT_MIB_RX_ALIGN_ERR	0x74</div><div class='add'>+#define   MT7530_PORT_MIB_RX_CRC_ERR	0x78</div><div class='add'>+#define   MT7530_PORT_MIB_RX_UNDER_SIZE_ERR 0x7c</div><div class='add'>+#define   MT7530_PORT_MIB_RX_FRAG_ERR	0x80</div><div class='add'>+#define   MT7530_PORT_MIB_RX_OVER_SZ_ERR 0x84</div><div class='add'>+#define   MT7530_PORT_MIB_RX_JABBER_ERR	0x88</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PAUSE	0x8c</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PKT_SZ_64	0x90</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PKT_SZ_65_TO_127 0x94</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PKT_SZ_128_TO_255 0x98</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PKT_SZ_256_TO_511 0x9c</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PKT_SZ_512_TO_1023 0xa0</div><div class='add'>+#define   MT7530_PORT_MIB_RX_PKT_SZ_1024_TO_MAX 0xa4</div><div class='add'>+#define   MT7530_PORT_MIB_RX_BYTES	0xa8 /* 64 bytes */</div><div class='add'>+#define   MT7530_PORT_MIB_RX_CTRL_DROP	0xb0</div><div class='add'>+#define   MT7530_PORT_MIB_RX_INGRESS_DROP 0xb4</div><div class='add'>+#define   MT7530_PORT_MIB_RX_ARL_DROP	0xb8</div><div class='ctx'> #define MT7530_MIB_CCR			0x4fe0</div><div class='ctx'> #define  CCR_MIB_ENABLE			BIT(31)</div><div class='ctx'> #define  CCR_RX_OCT_CNT_GOOD		BIT(7)</div><div class='hunk'>@@ -236,39 +485,148 @@ enum mt7530_vlan_port_attr {</div><div class='ctx'> 					 CCR_RX_OCT_CNT_BAD | \</div><div class='ctx'> 					 CCR_TX_OCT_CNT_GOOD | \</div><div class='ctx'> 					 CCR_TX_OCT_CNT_BAD)</div><div class='add'>+</div><div class='add'>+/* MT7531 SGMII register group */</div><div class='add'>+#define MT7531_SGMII_REG_BASE(p)	(0x5000 + ((p) - 5) * 0x1000)</div><div class='add'>+#define MT7531_PHYA_CTRL_SIGNAL3	0x128</div><div class='add'>+</div><div class='ctx'> /* Register for system reset */</div><div class='ctx'> #define MT7530_SYS_CTRL			0x7000</div><div class='ctx'> #define  SYS_CTRL_PHY_RST		BIT(2)</div><div class='ctx'> #define  SYS_CTRL_SW_RST		BIT(1)</div><div class='ctx'> #define  SYS_CTRL_REG_RST		BIT(0)</div><div class='ctx'> </div><div class='del'>-/* Register for hw trap status */</div><div class='del'>-#define MT7530_HWTRAP			0x7800</div><div class='add'>+/* Register for system interrupt */</div><div class='add'>+#define MT7530_SYS_INT_EN		0x7008</div><div class='add'>+</div><div class='add'>+/* Register for system interrupt status */</div><div class='add'>+#define MT7530_SYS_INT_STS		0x700c</div><div class='add'>+</div><div class='add'>+/* Register for PHY Indirect Access Control */</div><div class='add'>+#define MT7531_PHY_IAC			0x701C</div><div class='add'>+#define  MT7531_PHY_ACS_ST		BIT(31)</div><div class='add'>+#define  MT7531_MDIO_REG_ADDR_MASK	(0x1f &lt;&lt; 25)</div><div class='add'>+#define  MT7531_MDIO_PHY_ADDR_MASK	(0x1f &lt;&lt; 20)</div><div class='add'>+#define  MT7531_MDIO_CMD_MASK		(0x3 &lt;&lt; 18)</div><div class='add'>+#define  MT7531_MDIO_ST_MASK		(0x3 &lt;&lt; 16)</div><div class='add'>+#define  MT7531_MDIO_RW_DATA_MASK	(0xffff)</div><div class='add'>+#define  MT7531_MDIO_REG_ADDR(x)	(((x) &amp; 0x1f) &lt;&lt; 25)</div><div class='add'>+#define  MT7531_MDIO_DEV_ADDR(x)	(((x) &amp; 0x1f) &lt;&lt; 25)</div><div class='add'>+#define  MT7531_MDIO_PHY_ADDR(x)	(((x) &amp; 0x1f) &lt;&lt; 20)</div><div class='add'>+#define  MT7531_MDIO_CMD(x)		(((x) &amp; 0x3) &lt;&lt; 18)</div><div class='add'>+#define  MT7531_MDIO_ST(x)		(((x) &amp; 0x3) &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+enum mt7531_phy_iac_cmd {</div><div class='add'>+	MT7531_MDIO_ADDR = 0,</div><div class='add'>+	MT7531_MDIO_WRITE = 1,</div><div class='add'>+	MT7531_MDIO_READ = 2,</div><div class='add'>+	MT7531_MDIO_READ_CL45 = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* MDIO_ST: MDIO start field */</div><div class='add'>+enum mt7531_mdio_st {</div><div class='add'>+	MT7531_MDIO_ST_CL45 = 0,</div><div class='add'>+	MT7531_MDIO_ST_CL22 = 1,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-/* Register for hw trap modification */</div><div class='del'>-#define MT7530_MHWTRAP			0x7804</div><div class='del'>-#define  MHWTRAP_MANUAL			BIT(16)</div><div class='del'>-#define  MHWTRAP_P5_MAC_SEL		BIT(13)</div><div class='del'>-#define  MHWTRAP_P6_DIS			BIT(8)</div><div class='del'>-#define  MHWTRAP_P5_RGMII_MODE		BIT(7)</div><div class='del'>-#define  MHWTRAP_P5_DIS			BIT(6)</div><div class='del'>-#define  MHWTRAP_PHY_ACCESS		BIT(5)</div><div class='add'>+#define  MT7531_MDIO_CL22_READ		(MT7531_MDIO_ST(MT7531_MDIO_ST_CL22) | \</div><div class='add'>+					 MT7531_MDIO_CMD(MT7531_MDIO_READ))</div><div class='add'>+#define  MT7531_MDIO_CL22_WRITE		(MT7531_MDIO_ST(MT7531_MDIO_ST_CL22) | \</div><div class='add'>+					 MT7531_MDIO_CMD(MT7531_MDIO_WRITE))</div><div class='add'>+#define  MT7531_MDIO_CL45_ADDR		(MT7531_MDIO_ST(MT7531_MDIO_ST_CL45) | \</div><div class='add'>+					 MT7531_MDIO_CMD(MT7531_MDIO_ADDR))</div><div class='add'>+#define  MT7531_MDIO_CL45_READ		(MT7531_MDIO_ST(MT7531_MDIO_ST_CL45) | \</div><div class='add'>+					 MT7531_MDIO_CMD(MT7531_MDIO_READ))</div><div class='add'>+#define  MT7531_MDIO_CL45_WRITE		(MT7531_MDIO_ST(MT7531_MDIO_ST_CL45) | \</div><div class='add'>+					 MT7531_MDIO_CMD(MT7531_MDIO_WRITE))</div><div class='add'>+</div><div class='add'>+/* Register for RGMII clock phase */</div><div class='add'>+#define MT7531_CLKGEN_CTRL		0x7500</div><div class='add'>+#define  CLK_SKEW_OUT(x)		(((x) &amp; 0x3) &lt;&lt; 8)</div><div class='add'>+#define  CLK_SKEW_OUT_MASK		GENMASK(9, 8)</div><div class='add'>+#define  CLK_SKEW_IN(x)			(((x) &amp; 0x3) &lt;&lt; 6)</div><div class='add'>+#define  CLK_SKEW_IN_MASK		GENMASK(7, 6)</div><div class='add'>+#define  RXCLK_NO_DELAY			BIT(5)</div><div class='add'>+#define  TXCLK_NO_REVERSE		BIT(4)</div><div class='add'>+#define  GP_MODE(x)			(((x) &amp; 0x3) &lt;&lt; 1)</div><div class='add'>+#define  GP_MODE_MASK			GENMASK(2, 1)</div><div class='add'>+#define  GP_CLK_EN			BIT(0)</div><div class='add'>+</div><div class='add'>+enum mt7531_gp_mode {</div><div class='add'>+	MT7531_GP_MODE_RGMII = 0,</div><div class='add'>+	MT7531_GP_MODE_MII = 1,</div><div class='add'>+	MT7531_GP_MODE_REV_MII = 2</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mt7531_clk_skew {</div><div class='add'>+	MT7531_CLK_SKEW_NO_CHG = 0,</div><div class='add'>+	MT7531_CLK_SKEW_DLY_100PPS = 1,</div><div class='add'>+	MT7531_CLK_SKEW_DLY_200PPS = 2,</div><div class='add'>+	MT7531_CLK_SKEW_REVERSE = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Register for trap status */</div><div class='add'>+#define MT753X_TRAP			0x7800</div><div class='add'>+#define  MT7530_XTAL_MASK		(BIT(10) | BIT(9))</div><div class='add'>+#define  MT7530_XTAL_25MHZ		(BIT(10) | BIT(9))</div><div class='add'>+#define  MT7530_XTAL_40MHZ		BIT(10)</div><div class='add'>+#define  MT7530_XTAL_20MHZ		BIT(9)</div><div class='add'>+#define  MT7531_XTAL25			BIT(7)</div><div class='add'>+</div><div class='add'>+/* Register for trap modification */</div><div class='add'>+#define MT753X_MTRAP			0x7804</div><div class='add'>+#define  MT7530_P5_PHY0_SEL		BIT(20)</div><div class='add'>+#define  MT7530_CHG_TRAP		BIT(16)</div><div class='add'>+#define  MT7530_P5_MAC_SEL		BIT(13)</div><div class='add'>+#define  MT7530_P6_DIS			BIT(8)</div><div class='add'>+#define  MT7530_P5_RGMII_MODE		BIT(7)</div><div class='add'>+#define  MT7530_P5_DIS			BIT(6)</div><div class='add'>+#define  MT7530_PHY_INDIRECT_ACCESS	BIT(5)</div><div class='add'>+#define  MT7531_CHG_STRAP		BIT(8)</div><div class='add'>+#define  MT7531_PHY_EN			BIT(6)</div><div class='add'>+</div><div class='add'>+enum mt7531_xtal_fsel {</div><div class='add'>+	MT7531_XTAL_FSEL_25MHZ,</div><div class='add'>+	MT7531_XTAL_FSEL_40MHZ,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Register for TOP signal control */</div><div class='ctx'> #define MT7530_TOP_SIG_CTRL		0x7808</div><div class='ctx'> #define  TOP_SIG_CTRL_NORMAL		(BIT(17) | BIT(16))</div><div class='ctx'> </div><div class='add'>+#define MT7531_TOP_SIG_SR		0x780c</div><div class='add'>+#define  PAD_DUAL_SGMII_EN		BIT(1)</div><div class='add'>+#define  PAD_MCM_SMI_EN			BIT(0)</div><div class='add'>+</div><div class='ctx'> #define MT7530_IO_DRV_CR		0x7810</div><div class='ctx'> #define  P5_IO_CLK_DRV(x)		((x) &amp; 0x3)</div><div class='ctx'> #define  P5_IO_DATA_DRV(x)		(((x) &amp; 0x3) &lt;&lt; 4)</div><div class='ctx'> </div><div class='add'>+#define MT7531_CHIP_REV			0x781C</div><div class='add'>+</div><div class='add'>+#define MT7531_PLLGP_EN			0x7820</div><div class='add'>+#define  EN_COREPLL			BIT(2)</div><div class='add'>+#define  SW_CLKSW			BIT(1)</div><div class='add'>+#define  SW_PLLGP			BIT(0)</div><div class='add'>+</div><div class='ctx'> #define MT7530_P6ECR			0x7830</div><div class='ctx'> #define  P6_INTF_MODE_MASK		0x3</div><div class='ctx'> #define  P6_INTF_MODE(x)		((x) &amp; 0x3)</div><div class='ctx'> </div><div class='add'>+#define MT7531_PLLGP_CR0		0x78a8</div><div class='add'>+#define  RG_COREPLL_EN			BIT(22)</div><div class='add'>+#define  RG_COREPLL_POSDIV_S		23</div><div class='add'>+#define  RG_COREPLL_POSDIV_M		0x3800000</div><div class='add'>+#define  RG_COREPLL_SDM_PCW_S		1</div><div class='add'>+#define  RG_COREPLL_SDM_PCW_M		0x3ffffe</div><div class='add'>+#define  RG_COREPLL_SDM_PCW_CHG		BIT(0)</div><div class='add'>+</div><div class='add'>+/* Registers for RGMII and SGMII PLL clock */</div><div class='add'>+#define MT7531_ANA_PLLGP_CR2		0x78b0</div><div class='add'>+#define MT7531_ANA_PLLGP_CR5		0x78bc</div><div class='add'>+</div><div class='ctx'> /* Registers for TRGMII on the both side */</div><div class='ctx'> #define MT7530_TRGMII_RCK_CTRL		0x7a00</div><div class='del'>-#define GSW_TRGMII_RCK_CTRL		0x300</div><div class='ctx'> #define  RX_RST				BIT(31)</div><div class='ctx'> #define  RXC_DQSISEL			BIT(30)</div><div class='ctx'> #define  DQSI1_TAP_MASK			(0x7f &lt;&lt; 8)</div><div class='hunk'>@@ -277,31 +635,24 @@ enum mt7530_vlan_port_attr {</div><div class='ctx'> #define  DQSI0_TAP(x)			((x) &amp; 0x7f)</div><div class='ctx'> </div><div class='ctx'> #define MT7530_TRGMII_RCK_RTT		0x7a04</div><div class='del'>-#define GSW_TRGMII_RCK_RTT		0x304</div><div class='ctx'> #define  DQS1_GATE			BIT(31)</div><div class='ctx'> #define  DQS0_GATE			BIT(30)</div><div class='ctx'> </div><div class='ctx'> #define MT7530_TRGMII_RD(x)		(0x7a10 + (x) * 8)</div><div class='del'>-#define GSW_TRGMII_RD(x)		(0x310 + (x) * 8)</div><div class='ctx'> #define  BSLIP_EN			BIT(31)</div><div class='ctx'> #define  EDGE_CHK			BIT(30)</div><div class='ctx'> #define  RD_TAP_MASK			0x7f</div><div class='ctx'> #define  RD_TAP(x)			((x) &amp; 0x7f)</div><div class='ctx'> </div><div class='del'>-#define GSW_TRGMII_TXCTRL		0x340</div><div class='ctx'> #define MT7530_TRGMII_TXCTRL		0x7a40</div><div class='ctx'> #define  TRAIN_TXEN			BIT(31)</div><div class='ctx'> #define  TXC_INV			BIT(30)</div><div class='ctx'> #define  TX_RST				BIT(28)</div><div class='ctx'> </div><div class='ctx'> #define MT7530_TRGMII_TD_ODT(i)		(0x7a54 + 8 * (i))</div><div class='del'>-#define GSW_TRGMII_TD_ODT(i)		(0x354 + 8 * (i))</div><div class='ctx'> #define  TD_DM_DRVP(x)			((x) &amp; 0xf)</div><div class='ctx'> #define  TD_DM_DRVN(x)			(((x) &amp; 0xf) &lt;&lt; 4)</div><div class='ctx'> </div><div class='del'>-#define GSW_INTF_MODE			0x390</div><div class='del'>-#define  INTF_MODE_TRGMII		BIT(1)</div><div class='del'>-</div><div class='ctx'> #define MT7530_TRGMII_TCK_CTRL		0x7a78</div><div class='ctx'> #define  TCK_TAP(x)			(((x) &amp; 0xf) &lt;&lt; 8)</div><div class='ctx'> </div><div class='hunk'>@@ -312,10 +663,54 @@ enum mt7530_vlan_port_attr {</div><div class='ctx'> #define MT7530_P5RGMIITXCR		0x7b04</div><div class='ctx'> #define  CSR_RGMII_TXC_CFG(x)		((x) &amp; 0x1f)</div><div class='ctx'> </div><div class='add'>+/* Registers for GPIO mode */</div><div class='add'>+#define MT7531_GPIO_MODE0		0x7c0c</div><div class='add'>+#define  MT7531_GPIO0_MASK		GENMASK(3, 0)</div><div class='add'>+#define  MT7531_GPIO0_INTERRUPT		1</div><div class='add'>+</div><div class='add'>+#define MT7531_GPIO_MODE1		0x7c10</div><div class='add'>+#define  MT7531_GPIO11_RG_RXD2_MASK	GENMASK(15, 12)</div><div class='add'>+#define  MT7531_EXT_P_MDC_11		(2 &lt;&lt; 12)</div><div class='add'>+#define  MT7531_GPIO12_RG_RXD3_MASK	GENMASK(19, 16)</div><div class='add'>+#define  MT7531_EXT_P_MDIO_12		(2 &lt;&lt; 16)</div><div class='add'>+</div><div class='add'>+#define MT753X_CPORT_SPTAG_CFG		0x7c10</div><div class='add'>+#define  CPORT_SW2FE_STAG_EN		BIT(1)</div><div class='add'>+#define  CPORT_FE2SW_STAG_EN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define AN7583_GEPHY_CONN_CFG		0x7c14</div><div class='add'>+#define  AN7583_CSR_DPHY_CKIN_SEL	BIT(31)</div><div class='add'>+#define  AN7583_CSR_PHY_CORE_REG_CLK_SEL BIT(30)</div><div class='add'>+#define  AN7583_CSR_ETHER_AFE_PWD	GENMASK(28, 24)</div><div class='add'>+</div><div class='add'>+/* Registers for LED GPIO control (MT7530 only)</div><div class='add'>+ * All registers follow this pattern:</div><div class='add'>+ * [ 2: 0]  port 0</div><div class='add'>+ * [ 6: 4]  port 1</div><div class='add'>+ * [10: 8]  port 2</div><div class='add'>+ * [14:12]  port 3</div><div class='add'>+ * [18:16]  port 4</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* LED enable, 0: Disable, 1: Enable (Default) */</div><div class='add'>+#define MT7530_LED_EN			0x7d00</div><div class='add'>+/* LED mode, 0: GPIO mode, 1: PHY mode (Default) */</div><div class='add'>+#define MT7530_LED_IO_MODE		0x7d04</div><div class='add'>+/* GPIO direction, 0: Input, 1: Output */</div><div class='add'>+#define MT7530_LED_GPIO_DIR		0x7d10</div><div class='add'>+/* GPIO output enable, 0: Disable, 1: Enable */</div><div class='add'>+#define MT7530_LED_GPIO_OE		0x7d14</div><div class='add'>+/* GPIO value, 0: Low, 1: High */</div><div class='add'>+#define MT7530_LED_GPIO_DATA		0x7d18</div><div class='add'>+</div><div class='ctx'> #define MT7530_CREV			0x7ffc</div><div class='ctx'> #define  CHIP_NAME_SHIFT		16</div><div class='ctx'> #define  MT7530_ID			0x7530</div><div class='ctx'> </div><div class='add'>+#define MT7531_CREV			0x781C</div><div class='add'>+#define  CHIP_REV_M			0x0f</div><div class='add'>+#define  MT7531_ID			0x7531</div><div class='add'>+</div><div class='ctx'> /* Registers for core PLL access through mmd indirect */</div><div class='ctx'> #define CORE_PLL_GROUP2			0x401</div><div class='ctx'> #define  RG_SYSPLL_EN_NORMAL		BIT(15)</div><div class='hunk'>@@ -332,6 +727,11 @@ enum mt7530_vlan_port_attr {</div><div class='ctx'> #define  RG_SYSPLL_DDSFBK_EN		BIT(12)</div><div class='ctx'> #define  RG_SYSPLL_BIAS_EN		BIT(11)</div><div class='ctx'> #define  RG_SYSPLL_BIAS_LPF_EN		BIT(10)</div><div class='add'>+#define  MT7531_RG_SYSPLL_DMY2		BIT(6)</div><div class='add'>+#define  MT7531_PHY_PLL_OFF		BIT(5)</div><div class='add'>+#define  MT7531_PHY_PLL_BYPASS_MODE	BIT(4)</div><div class='add'>+</div><div class='add'>+#define MT753X_CTRL_PHY_ADDR(addr)	((addr + 1) &amp; 0x1f)</div><div class='ctx'> </div><div class='ctx'> #define CORE_PLL_GROUP5			0x404</div><div class='ctx'> #define  RG_LCDDS_PCW_NCPO1(x)		((x) &amp; 0xffff)</div><div class='hunk'>@@ -395,13 +795,62 @@ struct mt7530_fdb {</div><div class='ctx'>  * @pm:		The matrix used to show all connections with the port.</div><div class='ctx'>  * @pvid:	The VLAN specified is to be considered a PVID at ingress.  Any</div><div class='ctx'>  *		untagged frames will be assigned to the related VLAN.</div><div class='del'>- * @vlan_filtering: The flags indicating whether the port that can recognize</div><div class='del'>- *		    VLAN-tagged frames.</div><div class='add'>+ * @sgmii_pcs:	Pointer to PCS instance for SerDes ports</div><div class='ctx'>  */</div><div class='ctx'> struct mt7530_port {</div><div class='ctx'> 	bool enable;</div><div class='add'>+	bool isolated;</div><div class='ctx'> 	u32 pm;</div><div class='ctx'> 	u16 pvid;</div><div class='add'>+	struct phylink_pcs *sgmii_pcs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Port 5 mode definitions of the MT7530 switch */</div><div class='add'>+enum mt7530_p5_mode {</div><div class='add'>+	GMAC5,</div><div class='add'>+	MUX_PHY_P0,</div><div class='add'>+	MUX_PHY_P4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mt7530_priv;</div><div class='add'>+</div><div class='add'>+struct mt753x_pcs {</div><div class='add'>+	struct phylink_pcs pcs;</div><div class='add'>+	struct mt7530_priv *priv;</div><div class='add'>+	int port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* struct mt753x_info -	This is the main data structure for holding the specific</div><div class='add'>+ *			part for each supported device</div><div class='add'>+ * @id:			Holding the identifier to a switch model</div><div class='add'>+ * @pcs_ops:		Holding the pointer to the MAC PCS operations structure</div><div class='add'>+ * @sw_setup:		Holding the handler to a device initialization</div><div class='add'>+ * @phy_read_c22:	Holding the way reading PHY port using C22</div><div class='add'>+ * @phy_write_c22:	Holding the way writing PHY port using C22</div><div class='add'>+ * @phy_read_c45:	Holding the way reading PHY port using C45</div><div class='add'>+ * @phy_write_c45:	Holding the way writing PHY port using C45</div><div class='add'>+ * @mac_port_get_caps:	Holding the handler that provides MAC capabilities</div><div class='add'>+ * @mac_port_config:	Holding the way setting up the PHY attribute to a</div><div class='add'>+ *			certain MAC port</div><div class='add'>+ */</div><div class='add'>+struct mt753x_info {</div><div class='add'>+	enum mt753x_id id;</div><div class='add'>+</div><div class='add'>+	const struct phylink_pcs_ops *pcs_ops;</div><div class='add'>+</div><div class='add'>+	int (*sw_setup)(struct dsa_switch *ds);</div><div class='add'>+	int (*phy_read_c22)(struct mt7530_priv *priv, int port, int regnum);</div><div class='add'>+	int (*phy_write_c22)(struct mt7530_priv *priv, int port, int regnum,</div><div class='add'>+			     u16 val);</div><div class='add'>+	int (*phy_read_c45)(struct mt7530_priv *priv, int port, int devad,</div><div class='add'>+			    int regnum);</div><div class='add'>+	int (*phy_write_c45)(struct mt7530_priv *priv, int port, int devad,</div><div class='add'>+			     int regnum, u16 val);</div><div class='add'>+	void (*mac_port_get_caps)(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct phylink_config *config);</div><div class='add'>+	void (*mac_port_config)(struct dsa_switch *ds, int port,</div><div class='add'>+				unsigned int mode,</div><div class='add'>+				phy_interface_t interface);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* struct mt7530_priv -	This is the main data structure for holding the state</div><div class='hunk'>@@ -409,8 +858,8 @@ struct mt7530_port {</div><div class='ctx'>  * @dev:		The device pointer</div><div class='ctx'>  * @ds:			The pointer to the dsa core structure</div><div class='ctx'>  * @bus:		The bus used for the device and built-in PHY</div><div class='add'>+ * @regmap:		The regmap instance representing all switch registers</div><div class='ctx'>  * @rstc:		The pointer to reset control used by MCM</div><div class='del'>- * @ethernet:		The regmap used for access TRGMII-based registers</div><div class='ctx'>  * @core_pwr:		The power supplied into the core</div><div class='ctx'>  * @io_pwr:		The power supplied into the I/O</div><div class='ctx'>  * @reset:		The descriptor for GPIO line tied to its reset pin</div><div class='hunk'>@@ -419,22 +868,38 @@ struct mt7530_port {</div><div class='ctx'>  * @ports:		Holding the state among ports</div><div class='ctx'>  * @reg_mutex:		The lock for protecting among process accessing</div><div class='ctx'>  *			registers</div><div class='add'>+ * @p5_mode:		Holding the current mode of port 5 of the MT7530 switch</div><div class='add'>+ * @p5_sgmii:		Flag for distinguishing if port 5 of the MT7531 switch</div><div class='add'>+ *			has got SGMII</div><div class='add'>+ * @irq_domain:		IRQ domain of the switch irq_chip</div><div class='add'>+ * @create_sgmii:	Pointer to function creating SGMII PCS instance(s)</div><div class='add'>+ * @active_cpu_ports:	Holding the active CPU ports</div><div class='add'>+ * @mdiodev:		The pointer to the MDIO device structure</div><div class='ctx'>  */</div><div class='ctx'> struct mt7530_priv {</div><div class='ctx'> 	struct device		*dev;</div><div class='ctx'> 	struct dsa_switch	*ds;</div><div class='ctx'> 	struct mii_bus		*bus;</div><div class='add'>+	struct regmap		*regmap;</div><div class='ctx'> 	struct reset_control	*rstc;</div><div class='del'>-	struct regmap		*ethernet;</div><div class='ctx'> 	struct regulator	*core_pwr;</div><div class='ctx'> 	struct regulator	*io_pwr;</div><div class='ctx'> 	struct gpio_desc	*reset;</div><div class='add'>+	const struct mt753x_info *info;</div><div class='ctx'> 	unsigned int		id;</div><div class='ctx'> 	bool			mcm;</div><div class='del'>-</div><div class='add'>+	enum mt7530_p5_mode	p5_mode;</div><div class='add'>+	bool			p5_sgmii;</div><div class='add'>+	u8			mirror_rx;</div><div class='add'>+	u8			mirror_tx;</div><div class='ctx'> 	struct mt7530_port	ports[MT7530_NUM_PORTS];</div><div class='add'>+	struct mt753x_pcs	pcs[MT7530_NUM_PORTS];</div><div class='ctx'> 	/* protect among processes for registers access*/</div><div class='ctx'> 	struct mutex reg_mutex;</div><div class='add'>+	struct irq_domain *irq_domain;</div><div class='add'>+	int (*create_sgmii)(struct mt7530_priv *priv);</div><div class='add'>+	u8 active_cpu_ports;</div><div class='add'>+	struct mdio_device *mdiodev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mt7530_hw_vlan_entry {</div><div class='hunk'>@@ -471,4 +936,9 @@ static inline void INIT_MT7530_DUMMY_POLL(struct mt7530_dummy_poll *p,</div><div class='ctx'> 	p-&gt;reg = reg;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mt7530_probe_common(struct mt7530_priv *priv);</div><div class='add'>+void mt7530_remove_common(struct mt7530_priv *priv);</div><div class='add'>+</div><div class='add'>+extern const struct mt753x_info mt753x_table[];</div><div class='add'>+</div><div class='ctx'> #endif /* __MT7530_H */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c<br/>index 2a2489b5196d..9c8ac14cd4f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6060.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6060.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6060.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6060.c</a></div><div class='hunk'>@@ -43,7 +43,8 @@ static const char *mv88e6060_get_name(struct mii_bus *bus, int sw_addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum dsa_tag_protocol mv88e6060_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-							int port)</div><div class='add'>+							int port,</div><div class='add'>+							enum dsa_tag_protocol m)</div><div class='ctx'> {</div><div class='ctx'> 	return DSA_TAG_PROTO_TRAILER;</div><div class='ctx'> }</div><div class='hunk'>@@ -117,6 +118,9 @@ static int mv88e6060_setup_port(struct mv88e6060_priv *priv, int p)</div><div class='ctx'> 	int addr = REG_PORT(p);</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (dsa_is_unused_port(priv-&gt;ds, p))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Do not force flow control, disable Ingress and Egress</div><div class='ctx'> 	 * Header tagging, disable VLAN tunneling, and set the port</div><div class='ctx'> 	 * state to Forwarding.  Additionally, if this is the CPU</div><div class='hunk'>@@ -243,11 +247,58 @@ mv88e6060_phy_write(struct dsa_switch *ds, int port, int regnum, u16 val)</div><div class='ctx'> 	return reg_write(priv, addr, regnum, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mv88e6060_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long *interfaces = config-&gt;supported_interfaces;</div><div class='add'>+	struct mv88e6060_priv *priv = ds-&gt;priv;</div><div class='add'>+	int addr = REG_PORT(port);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reg_read(priv, addr, PORT_STATUS);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"port %d: unable to read status register: %pe\n",</div><div class='add'>+			port, ERR_PTR(ret));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the port is configured in SNI mode (acts as a 10Mbps PHY),</div><div class='add'>+	 * it should have phy-mode = "sni", but that doesn't yet exist, so</div><div class='add'>+	 * forcibly fail validation until the need arises to introduce it.</div><div class='add'>+	 */</div><div class='add'>+	if (!(ret &amp; PORT_STATUS_PORTMODE)) {</div><div class='add'>+		dev_warn(ds-&gt;dev, "port %d: SNI mode not supported\n", port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_100 | MAC_10 | MAC_SYM_PAUSE;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= 4) {</div><div class='add'>+		/* Ports 4 and 5 can support MII, REVMII and REVRMII modes */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVMII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVRMII, interfaces);</div><div class='add'>+	}</div><div class='add'>+	if (port &lt;= 4) {</div><div class='add'>+		/* Ports 0 to 3 have internal PHYs, and port 4 can optionally</div><div class='add'>+		 * use an internal PHY.</div><div class='add'>+		 */</div><div class='add'>+		/* Internal PHY */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL, interfaces);</div><div class='add'>+		/* Default phylib interface mode */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, interfaces);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops mv88e6060_switch_ops = {</div><div class='ctx'> 	.get_tag_protocol = mv88e6060_get_tag_protocol,</div><div class='ctx'> 	.setup		= mv88e6060_setup,</div><div class='ctx'> 	.phy_read	= mv88e6060_phy_read,</div><div class='ctx'> 	.phy_write	= mv88e6060_phy_write,</div><div class='add'>+	.phylink_get_caps = mv88e6060_phylink_get_caps,</div><div class='add'>+	.port_hsr_join	= dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave	= dsa_port_simple_hsr_leave,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mv88e6060_probe(struct mdio_device *mdiodev)</div><div class='hunk'>@@ -270,10 +321,12 @@ static int mv88e6060_probe(struct mdio_device *mdiodev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "switch %s detected\n", name);</div><div class='ctx'> </div><div class='del'>-	ds = dsa_switch_alloc(dev, MV88E6060_PORTS);</div><div class='add'>+	ds = devm_kzalloc(dev, sizeof(*ds), GFP_KERNEL);</div><div class='ctx'> 	if (!ds)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;num_ports = MV88E6060_PORTS;</div><div class='ctx'> 	ds-&gt;priv = priv;</div><div class='ctx'> 	ds-&gt;dev = dev;</div><div class='ctx'> 	ds-&gt;ops = &amp;mv88e6060_switch_ops;</div><div class='hunk'>@@ -287,9 +340,24 @@ static void mv88e6060_remove(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	if (!ds)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	dsa_unregister_switch(ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mv88e6060_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!ds)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id mv88e6060_of_match[] = {</div><div class='ctx'> 	{</div><div class='ctx'> 		.compatible = "marvell,mv88e6060",</div><div class='hunk'>@@ -300,6 +368,7 @@ static const struct of_device_id mv88e6060_of_match[] = {</div><div class='ctx'> static struct mdio_driver mv88e6060_driver = {</div><div class='ctx'> 	.probe	= mv88e6060_probe,</div><div class='ctx'> 	.remove = mv88e6060_remove,</div><div class='add'>+	.shutdown = mv88e6060_shutdown,</div><div class='ctx'> 	.mdiodrv.driver = {</div><div class='ctx'> 		.name = "mv88e6060",</div><div class='ctx'> 		.of_match_table = mv88e6060_of_match,</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/Kconfig b/drivers/net/dsa/mv88e6xxx/Kconfig<br/>index 6435020d690d..64ae3882d17c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/Kconfig</a></div><div class='hunk'>@@ -9,23 +9,21 @@ config NET_DSA_MV88E6XXX</div><div class='ctx'> 	  This driver adds support for most of the Marvell 88E6xxx models of</div><div class='ctx'> 	  Ethernet switch chips, except 88E6060.</div><div class='ctx'> </div><div class='del'>-config NET_DSA_MV88E6XXX_GLOBAL2</div><div class='del'>-	bool "Switch Global 2 Registers support"</div><div class='del'>-	default y</div><div class='del'>-	depends on NET_DSA_MV88E6XXX</div><div class='del'>-	help</div><div class='del'>-	  This registers set at internal SMI address 0x1C provides extended</div><div class='del'>-	  features like EEPROM interface, trunking, cross-chip setup, etc.</div><div class='del'>-</div><div class='del'>-	  It is required on most chips. If the chip you compile the support for</div><div class='del'>-	  doesn't have such registers set, say N here. In doubt, say Y.</div><div class='del'>-</div><div class='ctx'> config NET_DSA_MV88E6XXX_PTP</div><div class='ctx'> 	bool "PTP support for Marvell 88E6xxx"</div><div class='ctx'> 	default n</div><div class='del'>-	depends on NET_DSA_MV88E6XXX_GLOBAL2</div><div class='del'>-	imply NETWORK_PHY_TIMESTAMPING</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='add'>+	depends on (NET_DSA_MV88E6XXX = y &amp;&amp; PTP_1588_CLOCK = y) || \</div><div class='add'>+	           (NET_DSA_MV88E6XXX = m &amp;&amp; PTP_1588_CLOCK)</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y to enable PTP hardware timestamping on Marvell 88E6xxx switch</div><div class='ctx'> 	  chips that support it.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MV88E6XXX_LEDS</div><div class='add'>+	bool "LED support for Marvell 88E6xxx"</div><div class='add'>+	default y</div><div class='add'>+	depends on NET_DSA_MV88E6XXX</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=NET_DSA_MV88E6XXX</div><div class='add'>+	depends on LEDS_TRIGGERS</div><div class='add'>+	help</div><div class='add'>+	  This enabled support for controlling the LEDs attached to the</div><div class='add'>+	  Marvell 88E6xxx switch chips.</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/Makefile b/drivers/net/dsa/mv88e6xxx/Makefile<br/>index e85755dde90b..dd961081d631 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/Makefile</a></div><div class='hunk'>@@ -1,15 +1,26 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0</div><div class='ctx'> obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o</div><div class='ctx'> mv88e6xxx-objs := chip.o</div><div class='add'>+mv88e6xxx-objs += devlink.o</div><div class='ctx'> mv88e6xxx-objs += global1.o</div><div class='ctx'> mv88e6xxx-objs += global1_atu.o</div><div class='ctx'> mv88e6xxx-objs += global1_vtu.o</div><div class='del'>-mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2.o</div><div class='del'>-mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2_avb.o</div><div class='del'>-mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_GLOBAL2) += global2_scratch.o</div><div class='add'>+mv88e6xxx-objs += global2.o</div><div class='add'>+mv88e6xxx-objs += global2_avb.o</div><div class='add'>+mv88e6xxx-objs += global2_scratch.o</div><div class='ctx'> mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_PTP) += hwtstamp.o</div><div class='add'>+mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_LEDS) += leds.o</div><div class='add'>+mv88e6xxx-objs += pcs-6185.o</div><div class='add'>+mv88e6xxx-objs += pcs-6352.o</div><div class='add'>+mv88e6xxx-objs += pcs-639x.o</div><div class='ctx'> mv88e6xxx-objs += phy.o</div><div class='ctx'> mv88e6xxx-objs += port.o</div><div class='add'>+mv88e6xxx-objs += port_hidden.o</div><div class='ctx'> mv88e6xxx-$(CONFIG_NET_DSA_MV88E6XXX_PTP) += ptp.o</div><div class='ctx'> mv88e6xxx-objs += serdes.o</div><div class='ctx'> mv88e6xxx-objs += smi.o</div><div class='add'>+mv88e6xxx-objs += switchdev.o</div><div class='add'>+mv88e6xxx-objs += trace.o</div><div class='add'>+</div><div class='add'>+# for tracing framework to find trace.h</div><div class='add'>+CFLAGS_trace.o := -I$(src)</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c<br/>index 42da3f1bff5b..b4d48997bf46 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/chip.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/chip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/chip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/chip.c</a></div><div class='hunk'>@@ -10,7 +10,9 @@</div><div class='ctx'>  *	Vivien Didelot &lt;vivien.didelot@savoirfairelinux.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/dsa/mv88e6xxx.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='hunk'>@@ -21,17 +23,18 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/mdio.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/mv88e6xxx.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/phylink.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "chip.h"</div><div class='add'>+#include "devlink.h"</div><div class='ctx'> #include "global1.h"</div><div class='ctx'> #include "global2.h"</div><div class='ctx'> #include "hwtstamp.h"</div><div class='hunk'>@@ -81,12 +84,56 @@ int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_wait_mask(struct mv88e6xxx_chip *chip, int addr, int reg,</div><div class='add'>+			u16 mask, u16 val)</div><div class='add'>+{</div><div class='add'>+	const unsigned long timeout = jiffies + msecs_to_jiffies(50);</div><div class='add'>+	u16 data;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* There's no bus specific operation to wait for a mask. Even</div><div class='add'>+	 * if the initial poll takes longer than 50ms, always do at</div><div class='add'>+	 * least one more attempt.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; time_before(jiffies, timeout) || (i &lt; 2); i++) {</div><div class='add'>+		err = mv88e6xxx_read(chip, addr, reg, &amp;data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if ((data &amp; mask) == val)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		if (i &lt; 2)</div><div class='add'>+			cpu_relax();</div><div class='add'>+		else</div><div class='add'>+			usleep_range(1000, 2000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_read(chip, addr, reg, &amp;data);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if ((data &amp; mask) == val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_err(chip-&gt;dev, "Timeout while waiting for switch\n");</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_wait_bit(struct mv88e6xxx_chip *chip, int addr, int reg,</div><div class='add'>+		       int bit, int val)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_wait_mask(chip, addr, reg, BIT(bit),</div><div class='add'>+				   val ? BIT(bit) : 0x0000);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_mdio_bus *mdio_bus;</div><div class='ctx'> </div><div class='del'>-	mdio_bus = list_first_entry(&amp;chip-&gt;mdios, struct mv88e6xxx_mdio_bus,</div><div class='del'>-				    list);</div><div class='add'>+	mdio_bus = list_first_entry_or_null(&amp;chip-&gt;mdios,</div><div class='add'>+					    struct mv88e6xxx_mdio_bus, list);</div><div class='ctx'> 	if (!mdio_bus)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -118,9 +165,9 @@ static irqreturn_t mv88e6xxx_g1_irq_thread_work(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	u16 ctl1;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;reg);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -135,13 +182,13 @@ static irqreturn_t mv88e6xxx_g1_irq_thread_work(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &amp;ctl1);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unlock;</div><div class='ctx'> 		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;reg);</div><div class='ctx'> unlock:</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		ctl1 &amp;= GENMASK(chip-&gt;g1_irq.nirqs, 0);</div><div class='hunk'>@@ -162,7 +209,7 @@ static void mv88e6xxx_g1_irq_bus_lock(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_g1_irq_bus_sync_unlock(struct irq_data *d)</div><div class='hunk'>@@ -184,7 +231,7 @@ static void mv88e6xxx_g1_irq_bus_sync_unlock(struct irq_data *d)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct irq_chip mv88e6xxx_g1_irq_chip = {</div><div class='hunk'>@@ -239,9 +286,9 @@ static void mv88e6xxx_g1_irq_free(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	 */</div><div class='ctx'> 	free_irq(chip-&gt;irq, chip);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	mv88e6xxx_g1_irq_free_common(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_irq_setup_common(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -250,7 +297,7 @@ static int mv88e6xxx_g1_irq_setup_common(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	u16 reg, mask;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;g1_irq.nirqs = chip-&gt;info-&gt;g1_irqs;</div><div class='del'>-	chip-&gt;g1_irq.domain = irq_domain_add_simple(</div><div class='add'>+	chip-&gt;g1_irq.domain = irq_domain_create_simple(</div><div class='ctx'> 		NULL, chip-&gt;g1_irq.nirqs, 0,</div><div class='ctx'> 		&amp;mv88e6xxx_g1_irq_domain_ops, chip);</div><div class='ctx'> 	if (!chip-&gt;g1_irq.domain)</div><div class='hunk'>@@ -310,12 +357,15 @@ static int mv88e6xxx_g1_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	 */</div><div class='ctx'> 	irq_set_lockdep_class(chip-&gt;irq, &amp;lock_key, &amp;request_key);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	snprintf(chip-&gt;irq_name, sizeof(chip-&gt;irq_name),</div><div class='add'>+		 "mv88e6xxx-%s", dev_name(chip-&gt;dev));</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	err = request_threaded_irq(chip-&gt;irq, NULL,</div><div class='ctx'> 				   mv88e6xxx_g1_irq_thread_fn,</div><div class='ctx'> 				   IRQF_ONESHOT | IRQF_SHARED,</div><div class='del'>-				   dev_name(chip-&gt;dev), chip);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+				   chip-&gt;irq_name, chip);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		mv88e6xxx_g1_irq_free_common(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -344,7 +394,7 @@ static int mv88e6xxx_irq_poll_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	kthread_init_delayed_work(&amp;chip-&gt;irq_poll_work,</div><div class='ctx'> 				  mv88e6xxx_irq_poll);</div><div class='ctx'> </div><div class='del'>-	chip-&gt;kworker = kthread_create_worker(0, "%s", dev_name(chip-&gt;dev));</div><div class='add'>+	chip-&gt;kworker = kthread_run_worker(0, "%s", dev_name(chip-&gt;dev));</div><div class='ctx'> 	if (IS_ERR(chip-&gt;kworker))</div><div class='ctx'> 		return PTR_ERR(chip-&gt;kworker);</div><div class='ctx'> </div><div class='hunk'>@@ -359,408 +409,711 @@ static void mv88e6xxx_irq_poll_free(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	kthread_cancel_delayed_work_sync(&amp;chip-&gt;irq_poll_work);</div><div class='ctx'> 	kthread_destroy_worker(chip-&gt;kworker);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	mv88e6xxx_g1_irq_free_common(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask)</div><div class='add'>+static int mv88e6xxx_port_config_interface(struct mv88e6xxx_chip *chip,</div><div class='add'>+					   int port, phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		u16 val;</div><div class='del'>-		int err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_read(chip, addr, reg, &amp;val);</div><div class='del'>-		if (err)</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_rgmii_delay) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_rgmii_delay(chip, port,</div><div class='add'>+							    interface);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='ctx'> 			return err;</div><div class='del'>-</div><div class='del'>-		if (!(val &amp; mask))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		usleep_range(1000, 2000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_err(chip-&gt;dev, "Timeout while waiting for switch\n");</div><div class='del'>-	return -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Indirect write to single pointer-data register with an Update bit */</div><div class='del'>-int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg, u16 update)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* Wait until the previous operation is completed */</div><div class='del'>-	err = mv88e6xxx_wait(chip, addr, reg, BIT(15));</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Set the Update bit to trigger a write operation */</div><div class='del'>-	val = BIT(15) | update;</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_cmode) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_cmode(chip, port,</div><div class='add'>+						      interface);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_write(chip, addr, reg, val);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port, int link,</div><div class='del'>-			     int speed, int duplex, int pause,</div><div class='del'>-			     phy_interface_t mode)</div><div class='add'>+static int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int link, int speed, int duplex, int pause,</div><div class='add'>+				    phy_interface_t mode)</div><div class='ctx'> {</div><div class='del'>-	struct phylink_link_state state;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!chip-&gt;info-&gt;ops-&gt;port_set_link)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;info-&gt;ops-&gt;port_link_state)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	err = chip-&gt;info-&gt;ops-&gt;port_link_state(chip, port, &amp;state);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* Has anything actually changed? We don't expect the</div><div class='del'>-	 * interface mode to change without one of the other</div><div class='del'>-	 * parameters also changing</div><div class='del'>-	 */</div><div class='del'>-	if (state.link == link &amp;&amp;</div><div class='del'>-	    state.speed == speed &amp;&amp;</div><div class='del'>-	    state.duplex == duplex)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='ctx'> 	/* Port's MAC control must not be changed unless the link is down */</div><div class='del'>-	err = chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, 0);</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, LINK_FORCED_DOWN);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_speed) {</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_set_speed(chip, port, speed);</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_speed_duplex) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_speed_duplex(chip, port,</div><div class='add'>+							     speed, duplex);</div><div class='ctx'> 		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='ctx'> 			goto restore_link;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (speed == SPEED_MAX &amp;&amp; chip-&gt;info-&gt;ops-&gt;port_max_speed_mode)</div><div class='del'>-		mode = chip-&gt;info-&gt;ops-&gt;port_max_speed_mode(port);</div><div class='del'>-</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;port_set_pause) {</div><div class='ctx'> 		err = chip-&gt;info-&gt;ops-&gt;port_set_pause(chip, port, pause);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto restore_link;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_duplex) {</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_set_duplex(chip, port, duplex);</div><div class='del'>-		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-			goto restore_link;</div><div class='add'>+	err = mv88e6xxx_port_config_interface(chip, port, mode);</div><div class='add'>+restore_link:</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, link))</div><div class='add'>+		dev_err(chip-&gt;dev, "p%d: failed to restore MAC's link\n", port);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_phy_is_internal(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	return port &gt;= chip-&gt;info-&gt;internal_phys_offset &amp;&amp;</div><div class='add'>+		port &lt; chip-&gt;info-&gt;num_internal_phys +</div><div class='add'>+			chip-&gt;info-&gt;internal_phys_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_ppu_updates(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* The 88e6250 family does not have the PHY detect bit. Instead,</div><div class='add'>+	 * report whether the port is internal.</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;info-&gt;family == MV88E6XXX_FAMILY_6250)</div><div class='add'>+		return mv88e6xxx_phy_is_internal(chip, port);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;reg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev,</div><div class='add'>+			"p%d: %s: failed to read port status\n",</div><div class='add'>+			port, __func__);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_rgmii_delay) {</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_set_rgmii_delay(chip, port, mode);</div><div class='del'>-		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-			goto restore_link;</div><div class='add'>+	return !!(reg &amp; MV88E6XXX_PORT_STS_PHY_DETECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 mv88e6185_phy_interface_modes[] = {</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_GMII_FD]	 = PHY_INTERFACE_MODE_GMII,</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_MII_100_FD_PS] = PHY_INTERFACE_MODE_MII,</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_MII_100]	 = PHY_INTERFACE_MODE_MII,</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_MII_10]	 = PHY_INTERFACE_MODE_MII,</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_SERDES]	 = PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_1000BASE_X]	 = PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+	[MV88E6185_PORT_STS_CMODE_PHY]		 = PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mv88e6095_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100;</div><div class='add'>+</div><div class='add'>+	if (mv88e6xxx_phy_is_internal(chip, port)) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, config-&gt;supported_interfaces);</div><div class='add'>+	} else {</div><div class='add'>+		if (cmode &lt; ARRAY_SIZE(mv88e6185_phy_interface_modes) &amp;&amp;</div><div class='add'>+		    mv88e6185_phy_interface_modes[cmode])</div><div class='add'>+			__set_bit(mv88e6185_phy_interface_modes[cmode],</div><div class='add'>+				  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_1000FD;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_cmode) {</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_set_cmode(chip, port, mode);</div><div class='del'>-		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-			goto restore_link;</div><div class='add'>+static void mv88e6185_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+</div><div class='add'>+	if (cmode &lt; ARRAY_SIZE(mv88e6185_phy_interface_modes) &amp;&amp;</div><div class='add'>+	    mv88e6185_phy_interface_modes[cmode])</div><div class='add'>+		__set_bit(mv88e6185_phy_interface_modes[cmode],</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 mv88e6xxx_phy_interface_modes[] = {</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_MII_PHY]	= PHY_INTERFACE_MODE_REVMII,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_MII]		= PHY_INTERFACE_MODE_MII,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_GMII]		= PHY_INTERFACE_MODE_GMII,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_RMII_PHY]	= PHY_INTERFACE_MODE_REVRMII,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_RMII]		= PHY_INTERFACE_MODE_RMII,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_100BASEX]	= PHY_INTERFACE_MODE_100BASEX,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_1000BASEX]	= PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+	[MV88E6XXX_PORT_STS_CMODE_SGMII]	= PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+	/* higher interface modes are not needed here, since ports supporting</div><div class='add'>+	 * them are writable, and so the supported interfaces are filled in the</div><div class='add'>+	 * corresponding .phylink_set_interfaces() implementation below</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mv88e6xxx_translate_cmode(u8 cmode, unsigned long *supported)</div><div class='add'>+{</div><div class='add'>+	if (cmode &lt; ARRAY_SIZE(mv88e6xxx_phy_interface_modes) &amp;&amp;</div><div class='add'>+	    mv88e6xxx_phy_interface_modes[cmode])</div><div class='add'>+		__set_bit(mv88e6xxx_phy_interface_modes[cmode], supported);</div><div class='add'>+	else if (cmode == MV88E6XXX_PORT_STS_CMODE_RGMII)</div><div class='add'>+		phy_interface_set_rgmii(supported);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+mv88e6250_setup_supported_interfaces(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+	int err;</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;reg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "p%d: failed to read port status\n", port);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = 0;</div><div class='del'>-restore_link:</div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, link))</div><div class='del'>-		dev_err(chip-&gt;dev, "p%d: failed to restore MAC's link\n", port);</div><div class='add'>+	switch (reg &amp; MV88E6250_PORT_STS_PORTMODE_MASK) {</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_10_HALF_PHY:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_100_HALF_PHY:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_10_FULL_PHY:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_100_FULL_PHY:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVMII, supported);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_HALF:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_FULL:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, supported);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_DUAL_100_RMII_FULL_PHY:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_200_RMII_FULL_PHY:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_10_100_RMII_HALF_PHY:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_10_100_RMII_FULL_PHY:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVRMII, supported);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_DUAL_100_RMII_FULL:</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_10_100_RMII_FULL:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII, supported);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MV88E6250_PORT_STS_PORTMODE_MII_100_RGMII:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII, supported);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(chip-&gt;dev,</div><div class='add'>+			"p%d: invalid port mode in status register: %04x\n",</div><div class='add'>+			port, reg);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_phy_is_internal(struct dsa_switch *ds, int port)</div><div class='add'>+static void mv88e6250_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	if (!mv88e6xxx_phy_is_internal(chip, port))</div><div class='add'>+		mv88e6250_setup_supported_interfaces(chip, port, config);</div><div class='ctx'> </div><div class='del'>-	return port &lt; chip-&gt;info-&gt;num_internal_phys;</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* We expect the switch to perform auto negotiation if there is a real</div><div class='del'>- * phy. However, in the case of a fixed link phy, we force the port</div><div class='del'>- * settings from the fixed link settings.</div><div class='del'>- */</div><div class='del'>-static void mv88e6xxx_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-				  struct phy_device *phydev)</div><div class='add'>+static void mv88e6351_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+</div><div class='add'>+	/* Translate the default cmode */</div><div class='add'>+	mv88e6xxx_translate_cmode(chip-&gt;ports[port].cmode, supported);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e63xx_get_port_serdes_cmode(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	u16 reg, val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!phy_is_pseudo_fixed_link(phydev) &amp;&amp;</div><div class='del'>-	    mv88e6xxx_phy_is_internal(ds, port))</div><div class='del'>-		return;</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_port_setup_mac(chip, port, phydev-&gt;link, phydev-&gt;speed,</div><div class='del'>-				       phydev-&gt;duplex, phydev-&gt;pause,</div><div class='del'>-				       phydev-&gt;interface);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	/* If PHY_DETECT is zero, then we are not in auto-media mode */</div><div class='add'>+	if (!(reg &amp; MV88E6XXX_PORT_STS_PHY_DETECT))</div><div class='add'>+		return 0xf;</div><div class='ctx'> </div><div class='del'>-	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-		dev_err(ds-&gt;dev, "p%d: failed to configure MAC\n", port);</div><div class='add'>+	val = reg &amp; ~MV88E6XXX_PORT_STS_PHY_DETECT;</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_STS, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Restore PHY_DETECT value */</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_STS, reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return val &amp; MV88E6XXX_PORT_STS_CMODE_MASK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6065_phylink_validate(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				       unsigned long *mask,</div><div class='del'>-				       struct phylink_link_state *state)</div><div class='add'>+static void mv88e6352_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	if (!phy_interface_mode_is_8023z(state-&gt;interface)) {</div><div class='del'>-		/* 10M and 100M are only supported in non-802.3z mode */</div><div class='del'>-		phylink_set(mask, 10baseT_Half);</div><div class='del'>-		phylink_set(mask, 10baseT_Full);</div><div class='del'>-		phylink_set(mask, 100baseT_Half);</div><div class='del'>-		phylink_set(mask, 100baseT_Full);</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+	int err, cmode;</div><div class='add'>+</div><div class='add'>+	/* Translate the default cmode */</div><div class='add'>+	mv88e6xxx_translate_cmode(chip-&gt;ports[port].cmode, supported);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	/* Port 4 supports automedia if the serdes is associated with it. */</div><div class='add'>+	if (port == 4) {</div><div class='add'>+		err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			dev_err(chip-&gt;dev, "p%d: failed to read scratch\n",</div><div class='add'>+				port);</div><div class='add'>+		if (err &lt;= 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		cmode = mv88e63xx_get_port_serdes_cmode(chip, port);</div><div class='add'>+		if (cmode &lt; 0)</div><div class='add'>+			dev_err(chip-&gt;dev, "p%d: failed to read serdes cmode\n",</div><div class='add'>+				port);</div><div class='add'>+		else</div><div class='add'>+			mv88e6xxx_translate_cmode(cmode, supported);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6185_phylink_validate(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				       unsigned long *mask,</div><div class='del'>-				       struct phylink_link_state *state)</div><div class='add'>+static void mv88e632x_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	/* FIXME: if the port is in 1000Base-X mode, then it only supports</div><div class='del'>-	 * 1000M FD speeds.  In this case, CMODE will indicate 5.</div><div class='del'>-	 */</div><div class='del'>-	phylink_set(mask, 1000baseT_Full);</div><div class='del'>-	phylink_set(mask, 1000baseX_Full);</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+	int cmode;</div><div class='ctx'> </div><div class='del'>-	mv88e6065_phylink_validate(chip, port, mask, state);</div><div class='add'>+	/* Translate the default cmode */</div><div class='add'>+	mv88e6xxx_translate_cmode(chip-&gt;ports[port].cmode, supported);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	/* Port 0/1 are serdes only ports */</div><div class='add'>+	if (port == 0 || port == 1) {</div><div class='add'>+		cmode = mv88e63xx_get_port_serdes_cmode(chip, port);</div><div class='add'>+		if (cmode &lt; 0)</div><div class='add'>+			dev_err(chip-&gt;dev, "p%d: failed to read serdes cmode\n",</div><div class='add'>+				port);</div><div class='add'>+		else</div><div class='add'>+			mv88e6xxx_translate_cmode(cmode, supported);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6341_phylink_validate(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				       unsigned long *mask,</div><div class='del'>-				       struct phylink_link_state *state)</div><div class='add'>+static void mv88e6341_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	if (port &gt;= 5)</div><div class='del'>-		phylink_set(mask, 2500baseX_Full);</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+</div><div class='add'>+	/* Translate the default cmode */</div><div class='add'>+	mv88e6xxx_translate_cmode(chip-&gt;ports[port].cmode, supported);</div><div class='ctx'> </div><div class='ctx'> 	/* No ethtool bits for 200Mbps */</div><div class='del'>-	phylink_set(mask, 1000baseT_Full);</div><div class='del'>-	phylink_set(mask, 1000baseX_Full);</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	/* The C_Mode field is programmable on port 5 */</div><div class='add'>+	if (port == 5) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_2500BASEX, supported);</div><div class='ctx'> </div><div class='del'>-	mv88e6065_phylink_validate(chip, port, mask, state);</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6352_phylink_validate(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				       unsigned long *mask,</div><div class='del'>-				       struct phylink_link_state *state)</div><div class='add'>+static void mv88e6390_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='ctx'> {</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+</div><div class='add'>+	/* Translate the default cmode */</div><div class='add'>+	mv88e6xxx_translate_cmode(chip-&gt;ports[port].cmode, supported);</div><div class='add'>+</div><div class='ctx'> 	/* No ethtool bits for 200Mbps */</div><div class='del'>-	phylink_set(mask, 1000baseT_Full);</div><div class='del'>-	phylink_set(mask, 1000baseX_Full);</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='ctx'> </div><div class='del'>-	mv88e6065_phylink_validate(chip, port, mask, state);</div><div class='add'>+	/* The C_Mode field is programmable on ports 9 and 10 */</div><div class='add'>+	if (port == 9 || port == 10) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_2500BASEX, supported);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6390_phylink_validate(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				       unsigned long *mask,</div><div class='del'>-				       struct phylink_link_state *state)</div><div class='add'>+static void mv88e6390x_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	if (port &gt;= 9) {</div><div class='del'>-		phylink_set(mask, 2500baseX_Full);</div><div class='del'>-		phylink_set(mask, 2500baseT_Full);</div><div class='del'>-	}</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='ctx'> </div><div class='del'>-	/* No ethtool bits for 200Mbps */</div><div class='del'>-	phylink_set(mask, 1000baseT_Full);</div><div class='del'>-	phylink_set(mask, 1000baseX_Full);</div><div class='add'>+	mv88e6390_phylink_get_caps(chip, port, config);</div><div class='add'>+</div><div class='add'>+	/* For the 6x90X, ports 2-7 can be in automedia mode.</div><div class='add'>+	 * (Note that 6x90 doesn't support RXAUI nor XAUI).</div><div class='add'>+	 *</div><div class='add'>+	 * Port 2 can also support 1000BASE-X in automedia mode if port 9 is</div><div class='add'>+	 * configured for 1000BASE-X, SGMII or 2500BASE-X.</div><div class='add'>+	 * Port 3-4 can also support 1000BASE-X in automedia mode if port 9 is</div><div class='add'>+	 * configured for RXAUI, 1000BASE-X, SGMII or 2500BASE-X.</div><div class='add'>+	 *</div><div class='add'>+	 * Port 5 can also support 1000BASE-X in automedia mode if port 10 is</div><div class='add'>+	 * configured for 1000BASE-X, SGMII or 2500BASE-X.</div><div class='add'>+	 * Port 6-7 can also support 1000BASE-X in automedia mode if port 10 is</div><div class='add'>+	 * configured for RXAUI, 1000BASE-X, SGMII or 2500BASE-X.</div><div class='add'>+	 *</div><div class='add'>+	 * For now, be permissive (as the old code was) and allow 1000BASE-X</div><div class='add'>+	 * on ports 2..7.</div><div class='add'>+	 */</div><div class='add'>+	if (port &gt;= 2 &amp;&amp; port &lt;= 7)</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX, supported);</div><div class='ctx'> </div><div class='del'>-	mv88e6065_phylink_validate(chip, port, mask, state);</div><div class='add'>+	/* The C_Mode field can also be programmed for 10G speeds */</div><div class='add'>+	if (port == 9 || port == 10) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_XAUI, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RXAUI, supported);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_10000FD;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6390x_phylink_validate(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-					unsigned long *mask,</div><div class='del'>-					struct phylink_link_state *state)</div><div class='add'>+static void mv88e6393x_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	if (port &gt;= 9) {</div><div class='del'>-		phylink_set(mask, 10000baseT_Full);</div><div class='del'>-		phylink_set(mask, 10000baseKR_Full);</div><div class='add'>+	unsigned long *supported = config-&gt;supported_interfaces;</div><div class='add'>+	bool is_6191x =</div><div class='add'>+		chip-&gt;info-&gt;prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6191X;</div><div class='add'>+	bool is_6361 =</div><div class='add'>+		chip-&gt;info-&gt;prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_translate_cmode(chip-&gt;ports[port].cmode, supported);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |</div><div class='add'>+				   MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	/* The C_Mode field can be programmed for ports 0, 9 and 10 */</div><div class='add'>+	if (port == 0 || port == 9 || port == 10) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX, supported);</div><div class='add'>+</div><div class='add'>+		/* 6191X supports &gt;1G modes only on port 10 */</div><div class='add'>+		if (!is_6191x || port == 10) {</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_2500BASEX, supported);</div><div class='add'>+			config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+</div><div class='add'>+			/* 6361 only supports up to 2500BaseX */</div><div class='add'>+			if (!is_6361) {</div><div class='add'>+				__set_bit(PHY_INTERFACE_MODE_5GBASER, supported);</div><div class='add'>+				__set_bit(PHY_INTERFACE_MODE_10GBASER, supported);</div><div class='add'>+				__set_bit(PHY_INTERFACE_MODE_USXGMII, supported);</div><div class='add'>+				config-&gt;mac_capabilities |= MAC_5000FD |</div><div class='add'>+					MAC_10000FD;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mv88e6390_phylink_validate(chip, port, mask, state);</div><div class='add'>+	if (port == 0) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII_ID, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII_RXID, supported);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII_TXID, supported);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_validate(struct dsa_switch *ds, int port,</div><div class='del'>-			       unsigned long *supported,</div><div class='del'>-			       struct phylink_link_state *state)</div><div class='add'>+static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	/* Allow all the expected bits */</div><div class='del'>-	phylink_set(mask, Autoneg);</div><div class='del'>-	phylink_set(mask, Pause);</div><div class='del'>-	phylink_set_port_modes(mask);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	chip-&gt;info-&gt;ops-&gt;phylink_get_caps(chip, port, config);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;phylink_validate)</div><div class='del'>-		chip-&gt;info-&gt;ops-&gt;phylink_validate(chip, port, mask, state);</div><div class='add'>+	if (mv88e6xxx_phy_is_internal(chip, port)) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		/* Internal ports with no phy-mode need GMII for PHYLIB */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	bitmap_and(state-&gt;advertising, state-&gt;advertising, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+mv88e6xxx_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+			 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mv88e6xxx_chip *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct phylink_pcs *pcs = NULL;</div><div class='ctx'> </div><div class='del'>-	/* We can only operate at 2500BaseX or 1000BaseX.  If requested</div><div class='del'>-	 * to advertise both, only report advertising at 2500BaseX.</div><div class='del'>-	 */</div><div class='del'>-	phylink_helper_basex_speed(state);</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;pcs_ops)</div><div class='add'>+		pcs = chip-&gt;info-&gt;ops-&gt;pcs_ops-&gt;pcs_select(chip, dp-&gt;index,</div><div class='add'>+							   interface);</div><div class='add'>+</div><div class='add'>+	return pcs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_link_state(struct dsa_switch *ds, int port,</div><div class='del'>-				struct phylink_link_state *state)</div><div class='add'>+static int mv88e6xxx_mac_prepare(struct phylink_config *config,</div><div class='add'>+				 unsigned int mode, phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	int err;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mv88e6xxx_chip *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_link_state)</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_link_state(chip, port, state);</div><div class='del'>-	else</div><div class='del'>-		err = -EOPNOTSUPP;</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	/* In inband mode, the link may come up at any time while the link</div><div class='add'>+	 * is not forced down. Force the link down while we reconfigure the</div><div class='add'>+	 * interface mode.</div><div class='add'>+	 */</div><div class='add'>+	if (mode == MLO_AN_INBAND &amp;&amp;</div><div class='add'>+	    chip-&gt;ports[port].interface != interface &amp;&amp;</div><div class='add'>+	    chip-&gt;info-&gt;ops-&gt;port_set_link) {</div><div class='add'>+		mv88e6xxx_reg_lock(chip);</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port,</div><div class='add'>+						     LINK_FORCED_DOWN);</div><div class='add'>+		mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_mac_config(struct dsa_switch *ds, int port,</div><div class='add'>+static void mv88e6xxx_mac_config(struct phylink_config *config,</div><div class='ctx'> 				 unsigned int mode,</div><div class='ctx'> 				 const struct phylink_link_state *state)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	int speed, duplex, link, pause, err;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mv88e6xxx_chip *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if ((mode == MLO_AN_PHY) &amp;&amp; mv88e6xxx_phy_is_internal(ds, port))</div><div class='del'>-		return;</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='del'>-	if (mode == MLO_AN_FIXED) {</div><div class='del'>-		link = LINK_FORCED_UP;</div><div class='del'>-		speed = state-&gt;speed;</div><div class='del'>-		duplex = state-&gt;duplex;</div><div class='del'>-	} else if (!mv88e6xxx_phy_is_internal(ds, port)) {</div><div class='del'>-		link = state-&gt;link;</div><div class='del'>-		speed = state-&gt;speed;</div><div class='del'>-		duplex = state-&gt;duplex;</div><div class='del'>-	} else {</div><div class='del'>-		speed = SPEED_UNFORCED;</div><div class='del'>-		duplex = DUPLEX_UNFORCED;</div><div class='del'>-		link = LINK_UNFORCED;</div><div class='add'>+	if (mode != MLO_AN_PHY || !mv88e6xxx_phy_is_internal(chip, port)) {</div><div class='add'>+		err = mv88e6xxx_port_config_interface(chip, port,</div><div class='add'>+						      state-&gt;interface);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			goto err_unlock;</div><div class='ctx'> 	}</div><div class='del'>-	pause = !!phylink_test(state-&gt;advertising, Pause);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_port_setup_mac(chip, port, link, speed, duplex, pause,</div><div class='del'>-				       state-&gt;interface);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+err_unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='del'>-		dev_err(ds-&gt;dev, "p%d: failed to configure MAC\n", port);</div><div class='add'>+		dev_err(chip-&gt;dev, "p%d: failed to configure MAC/PCS\n", port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_mac_link_force(struct dsa_switch *ds, int port, int link)</div><div class='add'>+static int mv88e6xxx_mac_finish(struct phylink_config *config,</div><div class='add'>+				unsigned int mode, phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	int err;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mv88e6xxx_chip *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, link);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	/* Undo the forced down state above after completing configuration</div><div class='add'>+	 * irrespective of its state on entry, which allows the link to come</div><div class='add'>+	 * up in the in-band case where there is no separate SERDES. Also</div><div class='add'>+	 * ensure that the link can come up if the PPU is in use and we are</div><div class='add'>+	 * in PHY mode (we treat the PPU as an effective in-band mechanism.)</div><div class='add'>+	 */</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(chip-&gt;dev, "p%d: failed to force MAC link\n", port);</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_link &amp;&amp;</div><div class='add'>+	    ((mode == MLO_AN_INBAND &amp;&amp;</div><div class='add'>+	      chip-&gt;ports[port].interface != interface) ||</div><div class='add'>+	     (mode == MLO_AN_PHY &amp;&amp; mv88e6xxx_port_ppu_updates(chip, port))))</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_link(chip, port, LINK_UNFORCED);</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].interface = interface;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_mac_link_down(struct dsa_switch *ds, int port,</div><div class='add'>+static void mv88e6xxx_mac_link_down(struct phylink_config *config,</div><div class='ctx'> 				    unsigned int mode,</div><div class='ctx'> 				    phy_interface_t interface)</div><div class='ctx'> {</div><div class='del'>-	if (mode == MLO_AN_FIXED)</div><div class='del'>-		mv88e6xxx_mac_link_force(ds, port, LINK_FORCED_DOWN);</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mv88e6xxx_chip *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	const struct mv88e6xxx_ops *ops;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	ops = chip-&gt;info-&gt;ops;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	/* Force the link down if we know the port may not be automatically</div><div class='add'>+	 * updated by the switch or if we are using fixed-link mode.</div><div class='add'>+	 */</div><div class='add'>+	if ((!mv88e6xxx_port_ppu_updates(chip, port) ||</div><div class='add'>+	     mode == MLO_AN_FIXED) &amp;&amp; ops-&gt;port_sync_link)</div><div class='add'>+		err = ops-&gt;port_sync_link(chip, port, mode, false);</div><div class='add'>+</div><div class='add'>+	if (!err &amp;&amp; ops-&gt;port_set_speed_duplex)</div><div class='add'>+		err = ops-&gt;port_set_speed_duplex(chip, port, SPEED_UNFORCED,</div><div class='add'>+						 DUPLEX_UNFORCED);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(chip-&gt;dev,</div><div class='add'>+			"p%d: failed to force MAC link down\n", port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_mac_link_up(struct dsa_switch *ds, int port,</div><div class='add'>+static void mv88e6xxx_mac_link_up(struct phylink_config *config,</div><div class='add'>+				  struct phy_device *phydev,</div><div class='ctx'> 				  unsigned int mode, phy_interface_t interface,</div><div class='del'>-				  struct phy_device *phydev)</div><div class='add'>+				  int speed, int duplex,</div><div class='add'>+				  bool tx_pause, bool rx_pause)</div><div class='ctx'> {</div><div class='del'>-	if (mode == MLO_AN_FIXED)</div><div class='del'>-		mv88e6xxx_mac_link_force(ds, port, LINK_FORCED_UP);</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct mv88e6xxx_chip *chip = dp-&gt;ds-&gt;priv;</div><div class='add'>+	const struct mv88e6xxx_ops *ops;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	ops = chip-&gt;info-&gt;ops;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	/* Configure and force the link up if we know that the port may not</div><div class='add'>+	 * automatically updated by the switch or if we are using fixed-link</div><div class='add'>+	 * mode.</div><div class='add'>+	 */</div><div class='add'>+	if (!mv88e6xxx_port_ppu_updates(chip, port) ||</div><div class='add'>+	    mode == MLO_AN_FIXED) {</div><div class='add'>+		if (ops-&gt;port_set_speed_duplex) {</div><div class='add'>+			err = ops-&gt;port_set_speed_duplex(chip, port,</div><div class='add'>+							 speed, duplex);</div><div class='add'>+			if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+				goto error;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ops-&gt;port_sync_link)</div><div class='add'>+			err = ops-&gt;port_sync_link(chip, port, mode, true);</div><div class='add'>+	}</div><div class='add'>+error:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		dev_err(chip-&gt;dev,</div><div class='add'>+			"p%d: failed to configure MAC link up\n", port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_stats_snapshot(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!chip-&gt;info-&gt;ops-&gt;stats_snapshot)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return chip-&gt;info-&gt;ops-&gt;stats_snapshot(chip, port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {</div><div class='del'>-	{ "in_good_octets",		8, 0x00, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_bad_octets",		4, 0x02, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_unicast",			4, 0x04, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_broadcasts",		4, 0x06, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_multicasts",		4, 0x07, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_pause",			4, 0x16, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_undersize",		4, 0x18, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_fragments",		4, 0x19, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_oversize",		4, 0x1a, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_jabber",			4, 0x1b, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_rx_error",		4, 0x1c, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "in_fcs_error",		4, 0x1d, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "out_octets",			8, 0x0e, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "out_unicast",		4, 0x10, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "out_broadcasts",		4, 0x13, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "out_multicasts",		4, 0x12, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "out_pause",			4, 0x15, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "excessive",			4, 0x11, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "collisions",			4, 0x1e, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "deferred",			4, 0x05, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "single",			4, 0x14, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "multiple",			4, 0x17, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "out_fcs_error",		4, 0x03, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "late",			4, 0x1f, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "hist_64bytes",		4, 0x08, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "hist_65_127bytes",		4, 0x09, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "hist_128_255bytes",		4, 0x0a, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "hist_256_511bytes",		4, 0x0b, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "hist_512_1023bytes",		4, 0x0c, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "hist_1024_max_bytes",	4, 0x0d, STATS_TYPE_BANK0, },</div><div class='del'>-	{ "sw_in_discards",		4, 0x10, STATS_TYPE_PORT, },</div><div class='del'>-	{ "sw_in_filtered",		2, 0x12, STATS_TYPE_PORT, },</div><div class='del'>-	{ "sw_out_filtered",		2, 0x13, STATS_TYPE_PORT, },</div><div class='del'>-	{ "in_discards",		4, 0x00, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_filtered",		4, 0x01, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_accepted",		4, 0x02, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_bad_accepted",		4, 0x03, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_good_avb_class_a",	4, 0x04, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_good_avb_class_b",	4, 0x05, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_bad_avb_class_a",		4, 0x06, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_bad_avb_class_b",		4, 0x07, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "tcam_counter_0",		4, 0x08, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "tcam_counter_1",		4, 0x09, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "tcam_counter_2",		4, 0x0a, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "tcam_counter_3",		4, 0x0b, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_da_unknown",		4, 0x0e, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "in_management",		4, 0x0f, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_0",		4, 0x10, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_1",		4, 0x11, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_2",		4, 0x12, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_3",		4, 0x13, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_4",		4, 0x14, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_5",		4, 0x15, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_6",		4, 0x16, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_queue_7",		4, 0x17, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_cut_through",		4, 0x18, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_octets_a",		4, 0x1a, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_octets_b",		4, 0x1b, STATS_TYPE_BANK1, },</div><div class='del'>-	{ "out_management",		4, 0x1f, STATS_TYPE_BANK1, },</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;stats_snapshot(chip, port);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MV88E6XXX_HW_STAT_MAPPER(_fn)				    \</div><div class='add'>+	_fn(in_good_octets,		8, 0x00, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_bad_octets,		4, 0x02, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_unicast,			4, 0x04, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_broadcasts,		4, 0x06, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_multicasts,		4, 0x07, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_pause,			4, 0x16, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_undersize,		4, 0x18, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_fragments,		4, 0x19, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_oversize,		4, 0x1a, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_jabber,			4, 0x1b, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_rx_error,		4, 0x1c, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(in_fcs_error,		4, 0x1d, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(out_octets,			8, 0x0e, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(out_unicast,		4, 0x10, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(out_broadcasts,		4, 0x13, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(out_multicasts,		4, 0x12, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(out_pause,			4, 0x15, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(excessive,			4, 0x11, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(collisions,			4, 0x1e, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(deferred,			4, 0x05, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(single,			4, 0x14, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(multiple,			4, 0x17, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(out_fcs_error,		4, 0x03, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(late,			4, 0x1f, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(hist_64bytes,		4, 0x08, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(hist_65_127bytes,		4, 0x09, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(hist_128_255bytes,		4, 0x0a, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(hist_256_511bytes,		4, 0x0b, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(hist_512_1023bytes,		4, 0x0c, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(hist_1024_max_bytes,	4, 0x0d, STATS_TYPE_BANK0), \</div><div class='add'>+	_fn(sw_in_discards,		4, 0x10, STATS_TYPE_PORT), \</div><div class='add'>+	_fn(sw_in_filtered,		2, 0x12, STATS_TYPE_PORT), \</div><div class='add'>+	_fn(sw_out_filtered,		2, 0x13, STATS_TYPE_PORT), \</div><div class='add'>+	_fn(in_discards,		4, 0x00, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_filtered,		4, 0x01, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_accepted,		4, 0x02, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_bad_accepted,		4, 0x03, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_good_avb_class_a,	4, 0x04, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_good_avb_class_b,	4, 0x05, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_bad_avb_class_a,		4, 0x06, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_bad_avb_class_b,		4, 0x07, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(tcam_counter_0,		4, 0x08, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(tcam_counter_1,		4, 0x09, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(tcam_counter_2,		4, 0x0a, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(tcam_counter_3,		4, 0x0b, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_da_unknown,		4, 0x0e, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(in_management,		4, 0x0f, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_0,		4, 0x10, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_1,		4, 0x11, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_2,		4, 0x12, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_3,		4, 0x13, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_4,		4, 0x14, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_5,		4, 0x15, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_6,		4, 0x16, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_queue_7,		4, 0x17, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_cut_through,		4, 0x18, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_octets_a,		4, 0x1a, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_octets_b,		4, 0x1b, STATS_TYPE_BANK1), \</div><div class='add'>+	_fn(out_management,		4, 0x1f, STATS_TYPE_BANK1), \</div><div class='add'>+	/*  */</div><div class='add'>+</div><div class='add'>+#define MV88E6XXX_HW_STAT_ENTRY(_string, _size, _reg, _type) \</div><div class='add'>+	{ #_string, _size, _reg, _type }</div><div class='add'>+static const struct mv88e6xxx_hw_stat mv88e6xxx_hw_stats[] = {</div><div class='add'>+	MV88E6XXX_HW_STAT_MAPPER(MV88E6XXX_HW_STAT_ENTRY)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MV88E6XXX_HW_STAT_ENUM(_string, _size, _reg, _type) \</div><div class='add'>+	MV88E6XXX_HW_STAT_ID_ ## _string</div><div class='add'>+enum mv88e6xxx_hw_stat_id {</div><div class='add'>+	MV88E6XXX_HW_STAT_MAPPER(MV88E6XXX_HW_STAT_ENUM)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    struct mv88e6xxx_hw_stat *s,</div><div class='add'>+					    const struct mv88e6xxx_hw_stat *s,</div><div class='ctx'> 					    int port, u16 bank1_select,</div><div class='ctx'> 					    u16 histogram)</div><div class='ctx'> {</div><div class='hunk'>@@ -786,7 +1139,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		break;</div><div class='ctx'> 	case STATS_TYPE_BANK1:</div><div class='ctx'> 		reg = bank1_select;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case STATS_TYPE_BANK0:</div><div class='ctx'> 		reg |= s-&gt;reg | histogram;</div><div class='ctx'> 		mv88e6xxx_g1_stats_read(chip, reg, &amp;low);</div><div class='hunk'>@@ -800,36 +1153,37 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='del'>-				       uint8_t *data, int types)</div><div class='add'>+static void mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='add'>+					uint8_t **data, int types)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_hw_stat *stat;</div><div class='del'>-	int i, j;</div><div class='add'>+	const struct mv88e6xxx_hw_stat *stat;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0, j = 0; i &lt; ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {</div><div class='ctx'> 		stat = &amp;mv88e6xxx_hw_stats[i];</div><div class='del'>-		if (stat-&gt;type &amp; types) {</div><div class='del'>-			memcpy(data + j * ETH_GSTRING_LEN, stat-&gt;string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='add'>+		if (stat-&gt;type &amp; types)</div><div class='add'>+			ethtool_puts(data, stat-&gt;string);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return j;</div><div class='add'>+static void mv88e6095_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='add'>+					uint8_t **data)</div><div class='add'>+{</div><div class='add'>+	mv88e6xxx_stats_get_strings(chip, data,</div><div class='add'>+				    STATS_TYPE_BANK0 | STATS_TYPE_PORT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6095_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='del'>-				       uint8_t *data)</div><div class='add'>+static void mv88e6250_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='add'>+					uint8_t **data)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_stats_get_strings(chip, data,</div><div class='del'>-					   STATS_TYPE_BANK0 | STATS_TYPE_PORT);</div><div class='add'>+	mv88e6xxx_stats_get_strings(chip, data, STATS_TYPE_BANK0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6320_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='del'>-				       uint8_t *data)</div><div class='add'>+static void mv88e6320_stats_get_strings(struct mv88e6xxx_chip *chip,</div><div class='add'>+					uint8_t **data)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_stats_get_strings(chip, data,</div><div class='del'>-					   STATS_TYPE_BANK0 | STATS_TYPE_BANK1);</div><div class='add'>+	mv88e6xxx_stats_get_strings(chip, data,</div><div class='add'>+				    STATS_TYPE_BANK0 | STATS_TYPE_BANK1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const uint8_t *mv88e6xxx_atu_vtu_stats_strings[] = {</div><div class='hunk'>@@ -840,45 +1194,39 @@ static const uint8_t *mv88e6xxx_atu_vtu_stats_strings[] = {</div><div class='ctx'> 	"vtu_miss_violation",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data)</div><div class='add'>+static void mv88e6xxx_atu_vtu_get_strings(uint8_t **data)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings); i++)</div><div class='del'>-		strlcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-			mv88e6xxx_atu_vtu_stats_strings[i],</div><div class='del'>-			ETH_GSTRING_LEN);</div><div class='add'>+		ethtool_puts(data, mv88e6xxx_atu_vtu_stats_strings[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port,</div><div class='ctx'> 				  u32 stringset, uint8_t *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	int count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (stringset != ETH_SS_STATS)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;stats_get_strings)</div><div class='del'>-		count = chip-&gt;info-&gt;ops-&gt;stats_get_strings(chip, data);</div><div class='add'>+		chip-&gt;info-&gt;ops-&gt;stats_get_strings(chip, &amp;data);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;serdes_get_strings) {</div><div class='del'>-		data += count * ETH_GSTRING_LEN;</div><div class='del'>-		count = chip-&gt;info-&gt;ops-&gt;serdes_get_strings(chip, port, data);</div><div class='del'>-	}</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;serdes_get_strings)</div><div class='add'>+		chip-&gt;info-&gt;ops-&gt;serdes_get_strings(chip, port, &amp;data);</div><div class='ctx'> </div><div class='del'>-	data += count * ETH_GSTRING_LEN;</div><div class='del'>-	mv88e6xxx_atu_vtu_get_strings(data);</div><div class='add'>+	mv88e6xxx_atu_vtu_get_strings(&amp;data);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_stats_get_sset_count(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 					  int types)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_hw_stat *stat;</div><div class='add'>+	const struct mv88e6xxx_hw_stat *stat;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {</div><div class='hunk'>@@ -895,6 +1243,11 @@ static int mv88e6095_stats_get_sset_count(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 					      STATS_TYPE_PORT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mv88e6250_stats_get_sset_count(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_stats_get_sset_count(chip, STATS_TYPE_BANK0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv88e6320_stats_get_sset_count(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	return mv88e6xxx_stats_get_sset_count(chip, STATS_TYPE_BANK0 |</div><div class='hunk'>@@ -910,7 +1263,7 @@ static int mv88e6xxx_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> 	if (sset != ETH_SS_STATS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;stats_get_sset_count)</div><div class='ctx'> 		count = chip-&gt;info-&gt;ops-&gt;stats_get_sset_count(chip);</div><div class='ctx'> 	if (count &lt; 0)</div><div class='hunk'>@@ -927,57 +1280,78 @@ static int mv88e6xxx_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> 	count += ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_stats_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     uint64_t *data, int types,</div><div class='del'>-				     u16 bank1_select, u16 histogram)</div><div class='add'>+static size_t mv88e6095_stats_get_stat(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       const struct mv88e6xxx_hw_stat *stat,</div><div class='add'>+				       uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_hw_stat *stat;</div><div class='del'>-	int i, j;</div><div class='add'>+	*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port, 0,</div><div class='add'>+					    MV88E6XXX_G1_STATS_OP_HIST_RX);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0, j = 0; i &lt; ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {</div><div class='del'>-		stat = &amp;mv88e6xxx_hw_stats[i];</div><div class='del'>-		if (stat-&gt;type &amp; types) {</div><div class='del'>-			mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-			data[j] = _mv88e6xxx_get_ethtool_stat(chip, stat, port,</div><div class='del'>-							      bank1_select,</div><div class='del'>-							      histogram);</div><div class='del'>-			mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+static size_t mv88e6250_stats_get_stat(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       const struct mv88e6xxx_hw_stat *stat,</div><div class='add'>+				       uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port, 0,</div><div class='add'>+					    MV88E6XXX_G1_STATS_OP_HIST_RX);</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return j;</div><div class='add'>+static size_t mv88e6320_stats_get_stat(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       const struct mv88e6xxx_hw_stat *stat,</div><div class='add'>+				       uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port,</div><div class='add'>+					    MV88E6XXX_G1_STATS_OP_BANK_1_BIT_9,</div><div class='add'>+					    MV88E6XXX_G1_STATS_OP_HIST_RX);</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6095_stats_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     uint64_t *data)</div><div class='add'>+static size_t mv88e6390_stats_get_stat(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       const struct mv88e6xxx_hw_stat *stat,</div><div class='add'>+				       uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_stats_get_stats(chip, port, data,</div><div class='del'>-					 STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='del'>-					 0, MV88E6XXX_G1_STATS_OP_HIST_RX_TX);</div><div class='add'>+	*data = _mv88e6xxx_get_ethtool_stat(chip, stat, port,</div><div class='add'>+					    MV88E6XXX_G1_STATS_OP_BANK_1_BIT_10,</div><div class='add'>+					    0);</div><div class='add'>+	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6320_stats_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     uint64_t *data)</div><div class='add'>+static size_t mv88e6xxx_stats_get_stat(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       const struct mv88e6xxx_hw_stat *stat,</div><div class='add'>+				       uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_stats_get_stats(chip, port, data,</div><div class='del'>-					 STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='del'>-					 MV88E6XXX_G1_STATS_OP_BANK_1_BIT_9,</div><div class='del'>-					 MV88E6XXX_G1_STATS_OP_HIST_RX_TX);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!(stat-&gt;type &amp; chip-&gt;info-&gt;stats_type))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;stats_get_stat) {</div><div class='add'>+		mv88e6xxx_reg_lock(chip);</div><div class='add'>+		ret = chip-&gt;info-&gt;ops-&gt;stats_get_stat(chip, port, stat, data);</div><div class='add'>+		mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6390_stats_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     uint64_t *data)</div><div class='add'>+static size_t mv88e6xxx_stats_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_stats_get_stats(chip, port, data,</div><div class='del'>-					 STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='del'>-					 MV88E6XXX_G1_STATS_OP_BANK_1_BIT_10,</div><div class='del'>-					 0);</div><div class='add'>+	const struct mv88e6xxx_hw_stat *stat;</div><div class='add'>+	size_t i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {</div><div class='add'>+		stat = &amp;mv88e6xxx_hw_stats[i];</div><div class='add'>+		j += mv88e6xxx_stats_get_stat(chip, port, stat, &amp;data[j]);</div><div class='add'>+	}</div><div class='add'>+	return j;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_atu_vtu_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='hunk'>@@ -993,19 +1367,18 @@ static void mv88e6xxx_atu_vtu_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> static void mv88e6xxx_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	int count = 0;</div><div class='add'>+	size_t count;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;stats_get_stats)</div><div class='del'>-		count = chip-&gt;info-&gt;ops-&gt;stats_get_stats(chip, port, data);</div><div class='add'>+	count = mv88e6xxx_stats_get_stats(chip, port, data);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;serdes_get_stats) {</div><div class='ctx'> 		data += count;</div><div class='ctx'> 		count = chip-&gt;info-&gt;ops-&gt;serdes_get_stats(chip, port, data);</div><div class='ctx'> 	}</div><div class='ctx'> 	data += count;</div><div class='ctx'> 	mv88e6xxx_atu_vtu_get_stats(chip, port, data);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -1014,21 +1387,102 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	ret = mv88e6xxx_stats_snapshot(chip, port);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_get_stats(chip, port, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6xxx_get_eth_mac_stats(struct dsa_switch *ds, int port,</div><div class='add'>+					struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = mv88e6xxx_stats_snapshot(chip, port);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='add'>+#define MV88E6XXX_ETH_MAC_STAT_MAP(_id, _member)			\</div><div class='add'>+	mv88e6xxx_stats_get_stat(chip, port,				\</div><div class='add'>+				 &amp;mv88e6xxx_hw_stats[MV88E6XXX_HW_STAT_ID_ ## _id], \</div><div class='add'>+				 &amp;mac_stats-&gt;stats._member)</div><div class='add'>+</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(out_unicast, FramesTransmittedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(single, SingleCollisionFrames);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(multiple, MultipleCollisionFrames);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(in_unicast, FramesReceivedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(in_fcs_error, FrameCheckSequenceErrors);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(out_octets, OctetsTransmittedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(deferred, FramesWithDeferredXmissions);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(late, LateCollisions);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(in_good_octets, OctetsReceivedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(out_multicasts, MulticastFramesXmittedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(out_broadcasts, BroadcastFramesXmittedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(excessive, FramesWithExcessiveDeferral);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(in_multicasts, MulticastFramesReceivedOK);</div><div class='add'>+	MV88E6XXX_ETH_MAC_STAT_MAP(in_broadcasts, BroadcastFramesReceivedOK);</div><div class='add'>+</div><div class='add'>+#undef MV88E6XXX_ETH_MAC_STAT_MAP</div><div class='add'>+</div><div class='add'>+	mac_stats-&gt;stats.FramesTransmittedOK += mac_stats-&gt;stats.MulticastFramesXmittedOK;</div><div class='add'>+	mac_stats-&gt;stats.FramesTransmittedOK += mac_stats-&gt;stats.BroadcastFramesXmittedOK;</div><div class='add'>+	mac_stats-&gt;stats.FramesReceivedOK += mac_stats-&gt;stats.MulticastFramesReceivedOK;</div><div class='add'>+	mac_stats-&gt;stats.FramesReceivedOK += mac_stats-&gt;stats.BroadcastFramesReceivedOK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6xxx_get_rmon_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				     const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	static const struct ethtool_rmon_hist_range rmon_ranges[] = {</div><div class='add'>+		{   64,    64 },</div><div class='add'>+		{   65,   127 },</div><div class='add'>+		{  128,   255 },</div><div class='add'>+		{  256,   511 },</div><div class='add'>+		{  512,  1023 },</div><div class='add'>+		{ 1024, 65535 },</div><div class='add'>+		{}</div><div class='add'>+	};</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mv88e6xxx_stats_snapshot(chip, port);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mv88e6xxx_get_stats(chip, port, data);</div><div class='add'>+#define MV88E6XXX_RMON_STAT_MAP(_id, _member)				\</div><div class='add'>+	mv88e6xxx_stats_get_stat(chip, port,				\</div><div class='add'>+				 &amp;mv88e6xxx_hw_stats[MV88E6XXX_HW_STAT_ID_ ## _id], \</div><div class='add'>+				 &amp;rmon_stats-&gt;stats._member)</div><div class='add'>+</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(in_undersize, undersize_pkts);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(in_oversize, oversize_pkts);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(in_fragments, fragments);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(in_jabber, jabbers);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(hist_64bytes, hist[0]);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(hist_65_127bytes, hist[1]);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(hist_128_255bytes, hist[2]);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(hist_256_511bytes, hist[3]);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(hist_512_1023bytes, hist[4]);</div><div class='add'>+	MV88E6XXX_RMON_STAT_MAP(hist_1024_max_bytes, hist[5]);</div><div class='ctx'> </div><div class='add'>+#undef MV88E6XXX_RMON_STAT_MAP</div><div class='add'>+</div><div class='add'>+	*ranges = rmon_ranges;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='del'>-	return 32 * sizeof(u16);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	len = 32 * sizeof(u16);</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;serdes_get_regs_len)</div><div class='add'>+		len += chip-&gt;info-&gt;ops-&gt;serdes_get_regs_len(chip, port);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -1044,7 +1498,7 @@ static void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,</div><div class='ctx'> </div><div class='ctx'> 	memset(p, 0xff, 32 * sizeof(u16));</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 32; i++) {</div><div class='ctx'> </div><div class='hunk'>@@ -1053,52 +1507,81 @@ static void mv88e6xxx_get_regs(struct dsa_switch *ds, int port,</div><div class='ctx'> 			p[i] = reg;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-}</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;serdes_get_regs)</div><div class='add'>+		chip-&gt;info-&gt;ops-&gt;serdes_get_regs(chip, port, &amp;p[i]);</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_get_mac_eee(struct dsa_switch *ds, int port,</div><div class='del'>-				 struct ethtool_eee *e)</div><div class='del'>-{</div><div class='del'>-	/* Nothing to do on the port's MAC */</div><div class='del'>-	return 0;</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_set_mac_eee(struct dsa_switch *ds, int port,</div><div class='del'>-				 struct ethtool_eee *e)</div><div class='add'>+				 struct ethtool_keee *e)</div><div class='ctx'> {</div><div class='ctx'> 	/* Nothing to do on the port's MAC */</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Mask of the local ports allowed to receive frames from a given fabric port */</div><div class='ctx'> static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_switch *ds = NULL;</div><div class='del'>-	struct net_device *br;</div><div class='add'>+	struct dsa_switch *ds = chip-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	struct dsa_port *dp, *other_dp;</div><div class='add'>+	bool found = false;</div><div class='ctx'> 	u16 pvlan;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (dev &lt; DSA_MAX_SWITCHES)</div><div class='del'>-		ds = chip-&gt;ds-&gt;dst-&gt;ds[dev];</div><div class='add'>+	/* dev is a physical switch */</div><div class='add'>+	if (dev &lt;= dst-&gt;last_switch) {</div><div class='add'>+		list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+			if (dp-&gt;ds-&gt;index == dev &amp;&amp; dp-&gt;index == port) {</div><div class='add'>+				/* dp might be a DSA link or a user port, so it</div><div class='add'>+				 * might or might not have a bridge.</div><div class='add'>+				 * Use the "found" variable for both cases.</div><div class='add'>+				 */</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	/* dev is a virtual bridge */</div><div class='add'>+	} else {</div><div class='add'>+		list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+			unsigned int bridge_num = dsa_port_bridge_num_get(dp);</div><div class='ctx'> </div><div class='del'>-	/* Prevent frames from unknown switch or port */</div><div class='del'>-	if (!ds || port &gt;= ds-&gt;num_ports)</div><div class='add'>+			if (!bridge_num)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (bridge_num + dst-&gt;last_switch != dev)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prevent frames from unknown switch or virtual bridge */</div><div class='add'>+	if (!found)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Frames from DSA links and CPU ports can egress any local port */</div><div class='del'>-	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='add'>+	if (dp-&gt;type == DSA_PORT_TYPE_CPU || dp-&gt;type == DSA_PORT_TYPE_DSA)</div><div class='ctx'> 		return mv88e6xxx_port_mask(chip);</div><div class='ctx'> </div><div class='del'>-	br = ds-&gt;ports[port].bridge_dev;</div><div class='ctx'> 	pvlan = 0;</div><div class='ctx'> </div><div class='del'>-	/* Frames from user ports can egress any local DSA links and CPU ports,</div><div class='del'>-	 * as well as any local member of their bridge group.</div><div class='add'>+	/* Frames from standalone user ports can only egress on the</div><div class='add'>+	 * upstream port.</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_port_bridge_dev_get(dp))</div><div class='add'>+		return BIT(dsa_switch_upstream_port(ds));</div><div class='add'>+</div><div class='add'>+	/* Frames from bridged user ports can egress any local DSA</div><div class='add'>+	 * links and CPU ports, as well as any local member of their</div><div class='add'>+	 * bridge group.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); ++i)</div><div class='del'>-		if (dsa_is_cpu_port(chip-&gt;ds, i) ||</div><div class='del'>-		    dsa_is_dsa_port(chip-&gt;ds, i) ||</div><div class='del'>-		    (br &amp;&amp; dsa_to_port(chip-&gt;ds, i)-&gt;bridge_dev == br))</div><div class='del'>-			pvlan |= BIT(i);</div><div class='add'>+	dsa_switch_for_each_port(other_dp, ds)</div><div class='add'>+		if (other_dp-&gt;type == DSA_PORT_TYPE_CPU ||</div><div class='add'>+		    other_dp-&gt;type == DSA_PORT_TYPE_DSA ||</div><div class='add'>+		    dsa_port_bridge_same(dp, other_dp))</div><div class='add'>+			pvlan |= BIT(other_dp-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	return pvlan;</div><div class='ctx'> }</div><div class='hunk'>@@ -1119,9 +1602,9 @@ static void mv88e6xxx_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_port_set_state(chip, port, state);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		dev_err(ds-&gt;dev, "p%d: failed to update state\n", port);</div><div class='hunk'>@@ -1148,6 +1631,7 @@ static int mv88e6xxx_pri_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_devmap_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_switch *ds = chip-&gt;ds;</div><div class='ctx'> 	int target, port;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1156,10 +1640,9 @@ static int mv88e6xxx_devmap_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the routing port to the 32 possible target devices */</div><div class='ctx'> 	for (target = 0; target &lt; 32; target++) {</div><div class='del'>-		port = 0x1f;</div><div class='del'>-		if (target &lt; DSA_MAX_SWITCHES)</div><div class='del'>-			if (chip-&gt;ds-&gt;rtable[target] != DSA_RTABLE_NONE)</div><div class='del'>-				port = chip-&gt;ds-&gt;rtable[target];</div><div class='add'>+		port = dsa_routing_port(ds, target);</div><div class='add'>+		if (port == ds-&gt;num_ports)</div><div class='add'>+			port = 0x1f;</div><div class='ctx'> </div><div class='ctx'> 		err = mv88e6xxx_g2_device_mapping_write(chip, target, port);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -1221,9 +1704,16 @@ static int mv88e6xxx_atu_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_atu_set_learn2all(chip, true);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	/* The chips that have a "learn2all" bit in Global1, ATU</div><div class='add'>+	 * Control are precisely those whose port registers have a</div><div class='add'>+	 * Message Port bit in Port Control 1 and hence implement</div><div class='add'>+	 * -&gt;port_setup_message_port.</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_setup_message_port) {</div><div class='add'>+		err = mv88e6xxx_g1_atu_set_learn2all(chip, true);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g1_atu_set_age_time(chip, 300000);</div><div class='ctx'> }</div><div class='hunk'>@@ -1263,15 +1753,33 @@ static int mv88e6xxx_mac_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_pvt_map(struct mv88e6xxx_chip *chip, int dev, int port)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_switch_tree *dst = chip-&gt;ds-&gt;dst;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct dsa_port *dp;</div><div class='ctx'> 	u16 pvlan = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!mv88e6xxx_has_pvt(chip))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Skip the local source device, which uses in-chip port VLAN */</div><div class='del'>-	if (dev != chip-&gt;ds-&gt;index)</div><div class='add'>+	if (dev != chip-&gt;ds-&gt;index) {</div><div class='ctx'> 		pvlan = mv88e6xxx_port_vlan(chip, dev, port);</div><div class='ctx'> </div><div class='add'>+		ds = dsa_switch_find(dst-&gt;index, dev);</div><div class='add'>+		dp = ds ? dsa_to_port(ds, port) : NULL;</div><div class='add'>+		if (dp &amp;&amp; dp-&gt;lag) {</div><div class='add'>+			/* As the PVT is used to limit flooding of</div><div class='add'>+			 * FORWARD frames, which use the LAG ID as the</div><div class='add'>+			 * source port, we must translate dev/port to</div><div class='add'>+			 * the special "LAG device" in the PVT, using</div><div class='add'>+			 * the LAG ID (one-based) as the port number</div><div class='add'>+			 * (zero-based).</div><div class='add'>+			 */</div><div class='add'>+			dev = MV88E6XXX_G2_PVT_ADDR_DEV_TRUNK;</div><div class='add'>+			port = dsa_port_lag_id_get(dp) - 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mv88e6xxx_g2_pvt_write(chip, dev, port, pvlan);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1301,80 +1809,105 @@ static int mv88e6xxx_pvt_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mv88e6xxx_port_fast_age_fid(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       u16 fid)</div><div class='add'>+{</div><div class='add'>+	if (dsa_to_port(chip-&gt;ds, port)-&gt;lag)</div><div class='add'>+		/* Hardware is incapable of fast-aging a LAG through a</div><div class='add'>+		 * regular ATU move operation. Until we have something</div><div class='add'>+		 * more fancy in place this is a no-op.</div><div class='add'>+		 */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_atu_remove(chip, fid, port, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void mv88e6xxx_port_fast_age(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_g1_atu_remove(chip, 0, port, false);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_fast_age_fid(chip, port, 0);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		dev_err(ds-&gt;dev, "p%d: failed to flush ATU\n", port);</div><div class='add'>+		dev_err(chip-&gt;ds-&gt;dev, "p%d: failed to flush ATU: %d\n",</div><div class='add'>+			port, err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_vtu_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	if (!chip-&gt;info-&gt;max_vid)</div><div class='add'>+	if (!mv88e6xxx_max_vid(chip))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g1_vtu_flush(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='del'>-				 struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+static int mv88e6xxx_vtu_get(struct mv88e6xxx_chip *chip, u16 vid,</div><div class='add'>+			     struct mv88e6xxx_vtu_entry *entry)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	if (!chip-&gt;info-&gt;ops-&gt;vtu_getnext)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return chip-&gt;info-&gt;ops-&gt;vtu_getnext(chip, entry);</div><div class='del'>-}</div><div class='add'>+	memset(entry, 0, sizeof(*entry));</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='del'>-				   struct mv88e6xxx_vtu_entry *entry)</div><div class='del'>-{</div><div class='del'>-	if (!chip-&gt;info-&gt;ops-&gt;vtu_loadpurge)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	entry-&gt;vid = vid ? vid - 1 : mv88e6xxx_max_vid(chip);</div><div class='add'>+	entry-&gt;valid = false;</div><div class='ctx'> </div><div class='del'>-	return chip-&gt;info-&gt;ops-&gt;vtu_loadpurge(chip, entry);</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;vtu_getnext(chip, entry);</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;vid != vid)</div><div class='add'>+		entry-&gt;valid = false;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_atu_new(struct mv88e6xxx_chip *chip, u16 *fid)</div><div class='add'>+int mv88e6xxx_vtu_walk(struct mv88e6xxx_chip *chip,</div><div class='add'>+		       int (*cb)(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 const struct mv88e6xxx_vtu_entry *entry,</div><div class='add'>+				 void *priv),</div><div class='add'>+		       void *priv)</div><div class='ctx'> {</div><div class='del'>-	DECLARE_BITMAP(fid_bitmap, MV88E6XXX_N_FID);</div><div class='del'>-	struct mv88e6xxx_vtu_entry vlan = {</div><div class='del'>-		.vid = chip-&gt;info-&gt;max_vid,</div><div class='add'>+	struct mv88e6xxx_vtu_entry entry = {</div><div class='add'>+		.vid = mv88e6xxx_max_vid(chip),</div><div class='add'>+		.valid = false,</div><div class='ctx'> 	};</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	bitmap_zero(fid_bitmap, MV88E6XXX_N_FID);</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;vtu_getnext)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* Set every FID bit used by the (un)bridged ports */</div><div class='del'>-	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); ++i) {</div><div class='del'>-		err = mv88e6xxx_port_get_fid(chip, i, fid);</div><div class='add'>+	do {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;vtu_getnext(chip, &amp;entry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		set_bit(*fid, fid_bitmap);</div><div class='del'>-	}</div><div class='add'>+		if (!entry.valid)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-	/* Set every FID bit used by the VLAN entries */</div><div class='del'>-	do {</div><div class='del'>-		err = mv88e6xxx_vtu_getnext(chip, &amp;vlan);</div><div class='add'>+		err = cb(chip, &amp;entry, priv);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+	} while (entry.vid &lt; mv88e6xxx_max_vid(chip));</div><div class='ctx'> </div><div class='del'>-		if (!vlan.valid)</div><div class='del'>-			break;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;vtu_loadpurge)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-		set_bit(vlan.fid, fid_bitmap);</div><div class='del'>-	} while (vlan.vid &lt; chip-&gt;info-&gt;max_vid);</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;vtu_loadpurge(chip, entry);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* The reset value 0x000 is used to indicate that multiple address</div><div class='del'>-	 * databases are not needed. Return the next positive available.</div><div class='del'>-	 */</div><div class='del'>-	*fid = find_next_zero_bit(fid_bitmap, MV88E6XXX_N_FID, 1);</div><div class='add'>+static int mv88e6xxx_atu_new(struct mv88e6xxx_chip *chip, u16 *fid)</div><div class='add'>+{</div><div class='add'>+	*fid = find_first_zero_bit(chip-&gt;fid_bitmap, MV88E6XXX_N_FID);</div><div class='ctx'> 	if (unlikely(*fid &gt;= mv88e6xxx_num_databases(chip)))</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='hunk'>@@ -1382,119 +1915,286 @@ static int mv88e6xxx_atu_new(struct mv88e6xxx_chip *chip, u16 *fid)</div><div class='ctx'> 	return mv88e6xxx_g1_atu_flush(chip, *fid, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_vtu_get(struct mv88e6xxx_chip *chip, u16 vid,</div><div class='del'>-			     struct mv88e6xxx_vtu_entry *entry, bool new)</div><div class='add'>+static int mv88e6xxx_stu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   struct mv88e6xxx_stu_entry *entry)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;stu_loadpurge)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;stu_loadpurge(chip, entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_stu_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='add'>+	struct mv88e6xxx_stu_entry stu = {</div><div class='add'>+		.valid = true,</div><div class='add'>+		.sid = 0</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_has_stu(chip))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Make sure that SID 0 is always valid. This is used by VTU</div><div class='add'>+	 * entries that do not make use of the STU, e.g. when creating</div><div class='add'>+	 * a VLAN upper on a port that is also part of a VLAN</div><div class='add'>+	 * filtering bridge.</div><div class='add'>+	 */</div><div class='add'>+	return mv88e6xxx_stu_loadpurge(chip, &amp;stu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_sid_get(struct mv88e6xxx_chip *chip, u8 *sid)</div><div class='add'>+{</div><div class='add'>+	DECLARE_BITMAP(busy, MV88E6XXX_N_SID) = { 0 };</div><div class='add'>+	struct mv88e6xxx_mst *mst;</div><div class='add'>+</div><div class='add'>+	__set_bit(0, busy);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mst, &amp;chip-&gt;msts, node)</div><div class='add'>+		__set_bit(mst-&gt;stu.sid, busy);</div><div class='add'>+</div><div class='add'>+	*sid = find_first_zero_bit(busy, MV88E6XXX_N_SID);</div><div class='add'>+</div><div class='add'>+	return (*sid &gt;= mv88e6xxx_max_sid(chip)) ? -ENOSPC : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_mst_put(struct mv88e6xxx_chip *chip, u8 sid)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_mst *mst, *tmp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!vid)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	/* If the SID is zero, it is for a VLAN mapped to the default MSTI,</div><div class='add'>+	 * and mv88e6xxx_stu_setup() made sure it is always present, and thus,</div><div class='add'>+	 * should not be removed here.</div><div class='add'>+	 *</div><div class='add'>+	 * If the chip lacks STU support, numerically the "sid" variable will</div><div class='add'>+	 * happen to also be zero, but we don't want to rely on that fact, so</div><div class='add'>+	 * we explicitly test that first. In that case, there is also nothing</div><div class='add'>+	 * to do here.</div><div class='add'>+	 */</div><div class='add'>+	if (!mv88e6xxx_has_stu(chip) || !sid)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	entry-&gt;vid = vid - 1;</div><div class='del'>-	entry-&gt;valid = false;</div><div class='add'>+	list_for_each_entry_safe(mst, tmp, &amp;chip-&gt;msts, node) {</div><div class='add'>+		if (mst-&gt;stu.sid != sid)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_vtu_getnext(chip, entry);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		if (!refcount_dec_and_test(&amp;mst-&gt;refcnt))</div><div class='add'>+			return 0;</div><div class='ctx'> </div><div class='del'>-	if (entry-&gt;vid == vid &amp;&amp; entry-&gt;valid)</div><div class='add'>+		mst-&gt;stu.valid = false;</div><div class='add'>+		err = mv88e6xxx_stu_loadpurge(chip, &amp;mst-&gt;stu);</div><div class='add'>+		if (err) {</div><div class='add'>+			refcount_set(&amp;mst-&gt;refcnt, 1);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		list_del(&amp;mst-&gt;node);</div><div class='add'>+		kfree(mst);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (new) {</div><div class='del'>-		int i;</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Initialize a fresh VLAN entry */</div><div class='del'>-		memset(entry, 0, sizeof(*entry));</div><div class='del'>-		entry-&gt;valid = true;</div><div class='del'>-		entry-&gt;vid = vid;</div><div class='add'>+static int mv88e6xxx_mst_get(struct mv88e6xxx_chip *chip, struct net_device *br,</div><div class='add'>+			     u16 msti, u8 *sid)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_mst *mst;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='del'>-		/* Exclude all ports */</div><div class='del'>-		for (i = 0; i &lt; mv88e6xxx_num_ports(chip); ++i)</div><div class='del'>-			entry-&gt;member[i] =</div><div class='del'>-				MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER;</div><div class='add'>+	if (!mv88e6xxx_has_stu(chip)) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		return mv88e6xxx_atu_new(chip, &amp;entry-&gt;fid);</div><div class='add'>+	if (!msti) {</div><div class='add'>+		*sid = 0;</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* switchdev expects -EOPNOTSUPP to honor software VLANs */</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	list_for_each_entry(mst, &amp;chip-&gt;msts, node) {</div><div class='add'>+		if (mst-&gt;br == br &amp;&amp; mst-&gt;msti == msti) {</div><div class='add'>+			refcount_inc(&amp;mst-&gt;refcnt);</div><div class='add'>+			*sid = mst-&gt;stu.sid;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_sid_get(chip, sid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	mst = kzalloc(sizeof(*mst), GFP_KERNEL);</div><div class='add'>+	if (!mst) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;mst-&gt;node);</div><div class='add'>+	refcount_set(&amp;mst-&gt;refcnt, 1);</div><div class='add'>+	mst-&gt;br = br;</div><div class='add'>+	mst-&gt;msti = msti;</div><div class='add'>+	mst-&gt;stu.valid = true;</div><div class='add'>+	mst-&gt;stu.sid = *sid;</div><div class='add'>+</div><div class='add'>+	/* The bridge starts out all ports in the disabled state. But</div><div class='add'>+	 * a STU state of disabled means to go by the port-global</div><div class='add'>+	 * state. So we set all user port's initial state to blocking,</div><div class='add'>+	 * to match the bridge's behavior.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++)</div><div class='add'>+		mst-&gt;stu.state[i] = dsa_is_user_port(chip-&gt;ds, i) ?</div><div class='add'>+			MV88E6XXX_PORT_CTL0_STATE_BLOCKING :</div><div class='add'>+			MV88E6XXX_PORT_CTL0_STATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_stu_loadpurge(chip, &amp;mst-&gt;stu);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;mst-&gt;node, &amp;chip-&gt;msts);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(mst);</div><div class='add'>+err:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_mst_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+					const struct switchdev_mst_state *st)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_mst *mst;</div><div class='add'>+	u8 state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_has_stu(chip))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (st-&gt;state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		state = MV88E6XXX_PORT_CTL0_STATE_BLOCKING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		state = MV88E6XXX_PORT_CTL0_STATE_LEARNING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		state = MV88E6XXX_PORT_CTL0_STATE_FORWARDING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(mst, &amp;chip-&gt;msts, node) {</div><div class='add'>+		if (mst-&gt;br == dsa_port_bridge_dev_get(dp) &amp;&amp;</div><div class='add'>+		    mst-&gt;msti == st-&gt;msti) {</div><div class='add'>+			if (mst-&gt;stu.state[port] == state)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+			mst-&gt;stu.state[port] = state;</div><div class='add'>+			mv88e6xxx_reg_lock(chip);</div><div class='add'>+			err = mv88e6xxx_stu_loadpurge(chip, &amp;mst-&gt;stu);</div><div class='add'>+			mv88e6xxx_reg_unlock(chip);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port,</div><div class='del'>-					u16 vid_begin, u16 vid_end)</div><div class='add'>+					u16 vid)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port), *other_dp;</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	struct mv88e6xxx_vtu_entry vlan = {</div><div class='del'>-		.vid = vid_begin - 1,</div><div class='del'>-	};</div><div class='del'>-	int i, err;</div><div class='add'>+	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* DSA and CPU ports have to be members of multiple vlans */</div><div class='del'>-	if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))</div><div class='add'>+	if (dsa_port_is_dsa(dp) || dsa_port_is_cpu(dp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (!vid_begin)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		err = mv88e6xxx_vtu_getnext(chip, &amp;vlan);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='add'>+	if (!vlan.valid)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (!vlan.valid)</div><div class='del'>-			break;</div><div class='add'>+	dsa_switch_for_each_user_port(other_dp, ds) {</div><div class='add'>+		struct net_device *other_br;</div><div class='ctx'> </div><div class='del'>-		if (vlan.vid &gt; vid_end)</div><div class='del'>-			break;</div><div class='add'>+		if (vlan.member[other_dp-&gt;index] ==</div><div class='add'>+		    MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; mv88e6xxx_num_ports(chip); ++i) {</div><div class='del'>-			if (dsa_is_dsa_port(ds, i) || dsa_is_cpu_port(ds, i))</div><div class='del'>-				continue;</div><div class='add'>+		if (dsa_port_bridge_same(dp, other_dp))</div><div class='add'>+			break; /* same bridge, check next VLAN */</div><div class='ctx'> </div><div class='del'>-			if (!ds-&gt;ports[i].slave)</div><div class='del'>-				continue;</div><div class='add'>+		other_br = dsa_port_bridge_dev_get(other_dp);</div><div class='add'>+		if (!other_br)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			if (vlan.member[i] ==</div><div class='del'>-			    MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER)</div><div class='del'>-				continue;</div><div class='add'>+		dev_err(ds-&gt;dev, "p%d: hw VLAN %d already used by port %d in %s\n",</div><div class='add'>+			port, vlan.vid, other_dp-&gt;index, netdev_name(other_br));</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			if (dsa_to_port(ds, i)-&gt;bridge_dev ==</div><div class='del'>-			    ds-&gt;ports[port].bridge_dev)</div><div class='del'>-				break; /* same bridge, check next VLAN */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (!dsa_to_port(ds, i)-&gt;bridge_dev)</div><div class='del'>-				continue;</div><div class='add'>+static int mv88e6xxx_port_commit_pvid(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(chip-&gt;ds, port);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	struct mv88e6xxx_port *p = &amp;chip-&gt;ports[port];</div><div class='add'>+	u16 pvid = MV88E6XXX_VID_STANDALONE;</div><div class='add'>+	bool drop_untagged = false;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-			dev_err(ds-&gt;dev, "p%d: hw VLAN %d already used by port %d in %s\n",</div><div class='del'>-				port, vlan.vid, i,</div><div class='del'>-				netdev_name(dsa_to_port(ds, i)-&gt;bridge_dev));</div><div class='del'>-			err = -EOPNOTSUPP;</div><div class='del'>-			goto unlock;</div><div class='add'>+	if (br) {</div><div class='add'>+		if (br_vlan_enabled(br)) {</div><div class='add'>+			pvid = p-&gt;bridge_pvid.vid;</div><div class='add'>+			drop_untagged = !p-&gt;bridge_pvid.valid;</div><div class='add'>+		} else {</div><div class='add'>+			pvid = MV88E6XXX_VID_BRIDGED;</div><div class='ctx'> 		}</div><div class='del'>-	} while (vlan.vid &lt; vid_end);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	err = mv88e6xxx_port_set_pvid(chip, port, pvid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return mv88e6xxx_port_drop_untagged(chip, port, drop_untagged);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='del'>-					 bool vlan_filtering)</div><div class='add'>+					 bool vlan_filtering,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	u16 mode = vlan_filtering ? MV88E6XXX_PORT_CTL2_8021Q_MODE_SECURE :</div><div class='ctx'> 		MV88E6XXX_PORT_CTL2_8021Q_MODE_DISABLED;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;info-&gt;max_vid)</div><div class='add'>+	if (!mv88e6xxx_max_vid(chip))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='ctx'> 	err = mv88e6xxx_port_set_8021q_mode(chip, port, mode);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_commit_pvid(chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1506,72 +2206,320 @@ mv88e6xxx_port_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;info-&gt;max_vid)</div><div class='add'>+	if (!mv88e6xxx_max_vid(chip))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* If the requested port doesn't belong to the same bridge as the VLAN</div><div class='ctx'> 	 * members, do not support it (yet) and fallback to software VLAN.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mv88e6xxx_port_check_hw_vlan(ds, port, vlan-&gt;vid_begin,</div><div class='del'>-					   vlan-&gt;vid_end);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_check_hw_vlan(ds, port, vlan-&gt;vid);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='del'>-	/* We don't need any dynamic resource from the kernel (yet),</div><div class='del'>-	 * so skip the prepare phase.</div><div class='del'>-	 */</div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-					const unsigned char *addr, u16 vid,</div><div class='del'>-					u8 state)</div><div class='add'>+static int mv88e6xxx_port_db_get(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 const unsigned char *addr, u16 vid,</div><div class='add'>+				 u16 *fid, struct mv88e6xxx_atu_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Ports have two private address databases: one for when the port is</div><div class='add'>+	 * standalone and one for when the port is under a bridge and the</div><div class='add'>+	 * 802.1Q mode is disabled. When the port is standalone, DSA wants its</div><div class='add'>+	 * address database to remain 100% empty, so we never load an ATU entry</div><div class='add'>+	 * into a standalone port's database. Therefore, translate the null</div><div class='add'>+	 * VLAN ID into the port's database used for VLAN-unaware bridging.</div><div class='add'>+	 */</div><div class='add'>+	if (vid == 0) {</div><div class='add'>+		*fid = MV88E6XXX_FID_BRIDGED;</div><div class='add'>+	} else {</div><div class='add'>+		err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* switchdev expects -EOPNOTSUPP to honor software VLANs */</div><div class='add'>+		if (!vlan.valid)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		*fid = vlan.fid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry-&gt;state = 0;</div><div class='add'>+	ether_addr_copy(entry-&gt;mac, addr);</div><div class='add'>+	eth_addr_dec(entry-&gt;mac);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_atu_getnext(chip, *fid, entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool mv88e6xxx_port_db_find(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='ctx'> 	struct mv88e6xxx_atu_entry entry;</div><div class='add'>+	u16 fid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Null VLAN ID corresponds to the port private database */</div><div class='del'>-	if (vid == 0)</div><div class='del'>-		err = mv88e6xxx_port_get_fid(chip, port, &amp;vlan.fid);</div><div class='del'>-	else</div><div class='del'>-		err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan, false);</div><div class='add'>+	err = mv88e6xxx_port_db_get(chip, addr, vid, &amp;fid, &amp;entry);</div><div class='ctx'> 	if (err)</div><div class='del'>-		return err;</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return entry.state &amp;&amp; ether_addr_equal(entry.mac, addr);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	entry.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;</div><div class='del'>-	ether_addr_copy(entry.mac, addr);</div><div class='del'>-	eth_addr_dec(entry.mac);</div><div class='add'>+static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					const unsigned char *addr, u16 vid,</div><div class='add'>+					u8 state)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_atu_entry entry;</div><div class='add'>+	u16 fid;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_atu_getnext(chip, vlan.fid, &amp;entry);</div><div class='add'>+	err = mv88e6xxx_port_db_get(chip, addr, vid, &amp;fid, &amp;entry);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize a fresh ATU entry if it isn't found */</div><div class='del'>-	if (entry.state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED ||</div><div class='del'>-	    !ether_addr_equal(entry.mac, addr)) {</div><div class='add'>+	if (!entry.state || !ether_addr_equal(entry.mac, addr)) {</div><div class='ctx'> 		memset(&amp;entry, 0, sizeof(entry));</div><div class='ctx'> 		ether_addr_copy(entry.mac, addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Purge the ATU entry only if no port is using it anymore */</div><div class='del'>-	if (state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {</div><div class='add'>+	if (!state) {</div><div class='ctx'> 		entry.portvec &amp;= ~BIT(port);</div><div class='ctx'> 		if (!entry.portvec)</div><div class='del'>-			entry.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;</div><div class='add'>+			entry.state = 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		entry.portvec |= BIT(port);</div><div class='add'>+		if (state == MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC)</div><div class='add'>+			entry.portvec = BIT(port);</div><div class='add'>+		else</div><div class='add'>+			entry.portvec |= BIT(port);</div><div class='add'>+</div><div class='ctx'> 		entry.state = state;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g1_atu_loadpurge(chip, vlan.fid, &amp;entry);</div><div class='add'>+	return mv88e6xxx_g1_atu_loadpurge(chip, fid, &amp;entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_policy_apply(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				  const struct mv88e6xxx_policy *policy)</div><div class='add'>+{</div><div class='add'>+	enum mv88e6xxx_policy_mapping mapping = policy-&gt;mapping;</div><div class='add'>+	enum mv88e6xxx_policy_action action = policy-&gt;action;</div><div class='add'>+	const u8 *addr = policy-&gt;addr;</div><div class='add'>+	u16 vid = policy-&gt;vid;</div><div class='add'>+	u8 state;</div><div class='add'>+	int err;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;port_set_policy)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (mapping) {</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_DA:</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_SA:</div><div class='add'>+		if (action == MV88E6XXX_POLICY_ACTION_NORMAL)</div><div class='add'>+			state = 0; /* Dissociate the port and address */</div><div class='add'>+		else if (action == MV88E6XXX_POLICY_ACTION_DISCARD &amp;&amp;</div><div class='add'>+			 is_multicast_ether_addr(addr))</div><div class='add'>+			state = MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_POLICY;</div><div class='add'>+		else if (action == MV88E6XXX_POLICY_ACTION_DISCARD &amp;&amp;</div><div class='add'>+			 is_unicast_ether_addr(addr))</div><div class='add'>+			state = MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_POLICY;</div><div class='add'>+		else</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,</div><div class='add'>+						   state);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Skip the port's policy clearing if the mapping is still in use */</div><div class='add'>+	if (action == MV88E6XXX_POLICY_ACTION_NORMAL)</div><div class='add'>+		idr_for_each_entry(&amp;chip-&gt;policies, policy, id)</div><div class='add'>+			if (policy-&gt;port == port &amp;&amp;</div><div class='add'>+			    policy-&gt;mapping == mapping &amp;&amp;</div><div class='add'>+			    policy-&gt;action != action)</div><div class='add'>+				return 0;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;port_set_policy(chip, port, mapping, action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_policy_insert(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   struct ethtool_rx_flow_spec *fs)</div><div class='add'>+{</div><div class='add'>+	struct ethhdr *mac_entry = &amp;fs-&gt;h_u.ether_spec;</div><div class='add'>+	struct ethhdr *mac_mask = &amp;fs-&gt;m_u.ether_spec;</div><div class='add'>+	enum mv88e6xxx_policy_mapping mapping;</div><div class='add'>+	enum mv88e6xxx_policy_action action;</div><div class='add'>+	struct mv88e6xxx_policy *policy;</div><div class='add'>+	u16 vid = 0;</div><div class='add'>+	u8 *addr;</div><div class='add'>+	int err;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;location != RX_CLS_LOC_ANY)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;ring_cookie == RX_CLS_FLOW_DISC)</div><div class='add'>+		action = MV88E6XXX_POLICY_ACTION_DISCARD;</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (fs-&gt;flow_type &amp; ~FLOW_EXT) {</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+		if (!is_zero_ether_addr(mac_mask-&gt;h_dest) &amp;&amp;</div><div class='add'>+		    is_zero_ether_addr(mac_mask-&gt;h_source)) {</div><div class='add'>+			mapping = MV88E6XXX_POLICY_MAPPING_DA;</div><div class='add'>+			addr = mac_entry-&gt;h_dest;</div><div class='add'>+		} else if (is_zero_ether_addr(mac_mask-&gt;h_dest) &amp;&amp;</div><div class='add'>+		    !is_zero_ether_addr(mac_mask-&gt;h_source)) {</div><div class='add'>+			mapping = MV88E6XXX_POLICY_MAPPING_SA;</div><div class='add'>+			addr = mac_entry-&gt;h_source;</div><div class='add'>+		} else {</div><div class='add'>+			/* Cannot support DA and SA mapping in the same rule */</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((fs-&gt;flow_type &amp; FLOW_EXT) &amp;&amp; fs-&gt;m_ext.vlan_tci) {</div><div class='add'>+		if (fs-&gt;m_ext.vlan_tci != htons(0xffff))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		vid = be16_to_cpu(fs-&gt;h_ext.vlan_tci) &amp; VLAN_VID_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_for_each_entry(&amp;chip-&gt;policies, policy, id) {</div><div class='add'>+		if (policy-&gt;port == port &amp;&amp; policy-&gt;mapping == mapping &amp;&amp;</div><div class='add'>+		    policy-&gt;action == action &amp;&amp; policy-&gt;vid == vid &amp;&amp;</div><div class='add'>+		    ether_addr_equal(policy-&gt;addr, addr))</div><div class='add'>+			return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	policy = devm_kzalloc(chip-&gt;dev, sizeof(*policy), GFP_KERNEL);</div><div class='add'>+	if (!policy)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fs-&gt;location = 0;</div><div class='add'>+	err = idr_alloc_u32(&amp;chip-&gt;policies, policy, &amp;fs-&gt;location, 0xffffffff,</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (err) {</div><div class='add'>+		devm_kfree(chip-&gt;dev, policy);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;policy-&gt;fs, fs, sizeof(*fs));</div><div class='add'>+	ether_addr_copy(policy-&gt;addr, addr);</div><div class='add'>+	policy-&gt;mapping = mapping;</div><div class='add'>+	policy-&gt;action = action;</div><div class='add'>+	policy-&gt;port = port;</div><div class='add'>+	policy-&gt;vid = vid;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_policy_apply(chip, port, policy);</div><div class='add'>+	if (err) {</div><div class='add'>+		idr_remove(&amp;chip-&gt;policies, fs-&gt;location);</div><div class='add'>+		devm_kfree(chip-&gt;dev, policy);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_get_rxnfc(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct ethtool_rxnfc *rxnfc, u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;rxnfc-&gt;fs;</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_policy *policy;</div><div class='add'>+	int err;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	switch (rxnfc-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		rxnfc-&gt;data = 0;</div><div class='add'>+		rxnfc-&gt;data |= RX_CLS_LOC_SPECIAL;</div><div class='add'>+		rxnfc-&gt;rule_cnt = 0;</div><div class='add'>+		idr_for_each_entry(&amp;chip-&gt;policies, policy, id)</div><div class='add'>+			if (policy-&gt;port == port)</div><div class='add'>+				rxnfc-&gt;rule_cnt++;</div><div class='add'>+		err = 0;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		policy = idr_find(&amp;chip-&gt;policies, fs-&gt;location);</div><div class='add'>+		if (policy) {</div><div class='add'>+			memcpy(fs, &amp;policy-&gt;fs, sizeof(*fs));</div><div class='add'>+			err = 0;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		rxnfc-&gt;data = 0;</div><div class='add'>+		rxnfc-&gt;rule_cnt = 0;</div><div class='add'>+		idr_for_each_entry(&amp;chip-&gt;policies, policy, id)</div><div class='add'>+			if (policy-&gt;port == port)</div><div class='add'>+				rule_locs[rxnfc-&gt;rule_cnt++] = id;</div><div class='add'>+		err = 0;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_set_rxnfc(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct ethtool_rxnfc *rxnfc)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;rxnfc-&gt;fs;</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_policy *policy;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	switch (rxnfc-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		err = mv88e6xxx_policy_insert(chip, port, fs);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+		policy = idr_remove(&amp;chip-&gt;policies, fs-&gt;location);</div><div class='add'>+		if (policy) {</div><div class='add'>+			policy-&gt;action = MV88E6XXX_POLICY_ACTION_NORMAL;</div><div class='add'>+			err = mv88e6xxx_policy_apply(chip, port, policy);</div><div class='add'>+			devm_kfree(chip-&gt;dev, policy);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_add_broadcast(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 					u16 vid)</div><div class='ctx'> {</div><div class='del'>-	const char broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='ctx'> 	u8 state = MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC;</div><div class='add'>+	u8 broadcast[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(broadcast);</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_port_db_load_purge(chip, port, broadcast, vid, state);</div><div class='ctx'> }</div><div class='hunk'>@@ -1582,6 +2530,19 @@ static int mv88e6xxx_broadcast_setup(struct mv88e6xxx_chip *chip, u16 vid)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	for (port = 0; port &lt; mv88e6xxx_num_ports(chip); port++) {</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(chip-&gt;ds, port);</div><div class='add'>+		struct net_device *brport;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(chip-&gt;ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		brport = dsa_port_to_bridge_port(dp);</div><div class='add'>+		if (brport &amp;&amp; !br_port_flag_is_set(brport, BR_BCAST_FLOOD))</div><div class='add'>+			/* Skip bridged user ports where broadcast</div><div class='add'>+			 * flooding is disabled.</div><div class='add'>+			 */</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		err = mv88e6xxx_port_add_broadcast(chip, port, vid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -1590,36 +2551,125 @@ static int mv88e6xxx_broadcast_setup(struct mv88e6xxx_chip *chip, u16 vid)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _mv88e6xxx_port_vlan_add(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				    u16 vid, u8 member)</div><div class='add'>+struct mv88e6xxx_port_broadcast_sync_ctx {</div><div class='add'>+	int port;</div><div class='add'>+	bool flood;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_port_broadcast_sync_vlan(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   const struct mv88e6xxx_vtu_entry *vlan,</div><div class='add'>+				   void *_ctx)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	struct mv88e6xxx_port_broadcast_sync_ctx *ctx = _ctx;</div><div class='add'>+	u8 broadcast[ETH_ALEN];</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flood)</div><div class='add'>+		state = MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC;</div><div class='add'>+	else</div><div class='add'>+		state = MV88E6XXX_G1_ATU_DATA_STATE_MC_UNUSED;</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(broadcast);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_db_load_purge(chip, ctx-&gt;port, broadcast,</div><div class='add'>+					    vlan-&gt;vid, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_broadcast_sync(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					 bool flood)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port_broadcast_sync_ctx ctx = {</div><div class='add'>+		.port = port,</div><div class='add'>+		.flood = flood,</div><div class='add'>+	};</div><div class='add'>+	struct mv88e6xxx_vtu_entry vid0 = {</div><div class='add'>+		.vid = 0,</div><div class='add'>+	};</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan, true);</div><div class='add'>+	/* Update the port's private database... */</div><div class='add'>+	err = mv88e6xxx_port_broadcast_sync_vlan(chip, &amp;vid0, &amp;ctx);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	vlan.member[port] = member;</div><div class='add'>+	/* ...and the database for all VLANs. */</div><div class='add'>+	return mv88e6xxx_vtu_walk(chip, mv88e6xxx_port_broadcast_sync_vlan,</div><div class='add'>+				  &amp;ctx);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_vtu_loadpurge(chip, &amp;vlan);</div><div class='add'>+static int mv88e6xxx_port_vlan_join(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    u16 vid, u8 member, bool warn)</div><div class='add'>+{</div><div class='add'>+	const u8 non_member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER;</div><div class='add'>+	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_broadcast_setup(chip, vid);</div><div class='add'>+	if (!vlan.valid) {</div><div class='add'>+		memset(&amp;vlan, 0, sizeof(vlan));</div><div class='add'>+</div><div class='add'>+		if (vid == MV88E6XXX_VID_STANDALONE)</div><div class='add'>+			vlan.policy = true;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_atu_new(chip, &amp;vlan.fid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; mv88e6xxx_num_ports(chip); ++i)</div><div class='add'>+			if (i == port)</div><div class='add'>+				vlan.member[i] = member;</div><div class='add'>+			else</div><div class='add'>+				vlan.member[i] = non_member;</div><div class='add'>+</div><div class='add'>+		vlan.vid = vid;</div><div class='add'>+		vlan.valid = true;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_vtu_loadpurge(chip, &amp;vlan);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_broadcast_setup(chip, vlan.vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else if (vlan.member[port] != member) {</div><div class='add'>+		vlan.member[port] = member;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_vtu_loadpurge(chip, &amp;vlan);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else if (warn) {</div><div class='add'>+		dev_info(chip-&gt;dev, "p%d: already a member of VLAN %d\n",</div><div class='add'>+			 port, vid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Record FID used in SW FID map */</div><div class='add'>+	bitmap_set(chip-&gt;fid_bitmap, vlan.fid, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-				    const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+static int mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+				   const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='ctx'> 	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	struct mv88e6xxx_port *p = &amp;chip-&gt;ports[port];</div><div class='add'>+	bool warn;</div><div class='ctx'> 	u8 member;</div><div class='del'>-	u16 vid;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;info-&gt;max_vid)</div><div class='del'>-		return;</div><div class='add'>+	if (!vlan-&gt;vid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_vlan_prepare(ds, port, vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))</div><div class='ctx'> 		member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED;</div><div class='hunk'>@@ -1628,32 +2678,60 @@ static void mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 	else</div><div class='ctx'> 		member = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_TAGGED;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	/* net/dsa/user.c will call dsa_port_vlan_add() for the affected port</div><div class='add'>+	 * and then the CPU port. Do not warn for duplicates for the CPU port.</div><div class='add'>+	 */</div><div class='add'>+	warn = !dsa_is_cpu_port(ds, port) &amp;&amp; !dsa_is_dsa_port(ds, port);</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_vlan_join(chip, port, vlan-&gt;vid, member, warn);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ds-&gt;dev, "p%d: failed to add VLAN %d%c\n", port,</div><div class='add'>+			vlan-&gt;vid, untagged ? 'u' : 't');</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid)</div><div class='del'>-		if (_mv88e6xxx_port_vlan_add(chip, port, vid, member))</div><div class='del'>-			dev_err(ds-&gt;dev, "p%d: failed to add VLAN %d%c\n", port,</div><div class='del'>-				vid, untagged ? 'u' : 't');</div><div class='add'>+	if (pvid) {</div><div class='add'>+		p-&gt;bridge_pvid.vid = vlan-&gt;vid;</div><div class='add'>+		p-&gt;bridge_pvid.valid = true;</div><div class='ctx'> </div><div class='del'>-	if (pvid &amp;&amp; mv88e6xxx_port_set_pvid(chip, port, vlan-&gt;vid_end))</div><div class='del'>-		dev_err(ds-&gt;dev, "p%d: failed to set PVID %d\n", port,</div><div class='del'>-			vlan-&gt;vid_end);</div><div class='add'>+		err = mv88e6xxx_port_commit_pvid(chip, port);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	} else if (vlan-&gt;vid &amp;&amp; p-&gt;bridge_pvid.vid == vlan-&gt;vid) {</div><div class='add'>+		/* The old pvid was reinstalled as a non-pvid VLAN */</div><div class='add'>+		p-&gt;bridge_pvid.valid = false;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		err = mv88e6xxx_port_commit_pvid(chip, port);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int _mv88e6xxx_port_vlan_del(struct mv88e6xxx_chip *chip,</div><div class='del'>-				    int port, u16 vid)</div><div class='add'>+static int mv88e6xxx_port_vlan_leave(struct mv88e6xxx_chip *chip,</div><div class='add'>+				     int port, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_vtu_entry vlan;</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan, false);</div><div class='add'>+	if (!vid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* Tell switchdev if this VLAN is handled in software */</div><div class='del'>-	if (vlan.member[port] == MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER)</div><div class='add'>+	/* If the VLAN doesn't exist in hardware or the port isn't a member,</div><div class='add'>+	 * tell switchdev that this VLAN is likely handled in software.</div><div class='add'>+	 */</div><div class='add'>+	if (!vlan.valid ||</div><div class='add'>+	    vlan.member[port] == MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	vlan.member[port] = MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_NON_MEMBER;</div><div class='hunk'>@@ -1672,6 +2750,15 @@ static int _mv88e6xxx_port_vlan_del(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (!vlan.valid) {</div><div class='add'>+		err = mv88e6xxx_mst_put(chip, vlan.sid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		/* Record FID freed in SW FID map */</div><div class='add'>+		bitmap_clear(chip-&gt;fid_bitmap, vlan.fid, 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return mv88e6xxx_g1_atu_remove(chip, vlan.fid, port, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1679,60 +2766,142 @@ static int mv88e6xxx_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 				   const struct switchdev_obj_port_vlan *vlan)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	u16 pvid, vid;</div><div class='add'>+	struct mv88e6xxx_port *p = &amp;chip-&gt;ports[port];</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	u16 pvid;</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;info-&gt;max_vid)</div><div class='add'>+	if (!mv88e6xxx_max_vid(chip))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	/* The ATU removal procedure needs the FID to be mapped in the VTU,</div><div class='add'>+	 * but FDB deletion runs concurrently with VLAN deletion. Flush the DSA</div><div class='add'>+	 * switchdev workqueue to ensure that all FDB entries are deleted</div><div class='add'>+	 * before we remove the VLAN.</div><div class='add'>+	 */</div><div class='add'>+	dsa_flush_workqueue();</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_port_get_pvid(chip, port, &amp;pvid);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		err = _mv88e6xxx_port_vlan_del(chip, port, vid);</div><div class='add'>+	err = mv88e6xxx_port_vlan_leave(chip, port, vlan-&gt;vid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (vlan-&gt;vid == pvid) {</div><div class='add'>+		p-&gt;bridge_pvid.valid = false;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_port_commit_pvid(chip, port);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (vid == pvid) {</div><div class='del'>-			err = mv88e6xxx_port_set_pvid(chip, port, 0);</div><div class='del'>-			if (err)</div><div class='del'>-				goto unlock;</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_vlan_fast_age(struct dsa_switch *ds, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_vtu_get(chip, vid, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_fast_age_fid(chip, port, vlan.fid);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_vlan_msti_set(struct dsa_switch *ds,</div><div class='add'>+				   struct dsa_bridge bridge,</div><div class='add'>+				   const struct switchdev_vlan_msti *msti)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	u8 old_sid, new_sid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_has_stu(chip))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_vtu_get(chip, msti-&gt;vid, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (!vlan.valid) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_sid = vlan.sid;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_mst_get(chip, bridge.dev, msti-&gt;msti, &amp;new_sid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (new_sid != old_sid) {</div><div class='add'>+		vlan.sid = new_sid;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_vtu_loadpurge(chip, &amp;vlan);</div><div class='add'>+		if (err) {</div><div class='add'>+			mv88e6xxx_mst_put(chip, new_sid);</div><div class='add'>+			goto unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	err = mv88e6xxx_mst_put(chip, old_sid);</div><div class='ctx'> </div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-				  const unsigned char *addr, u16 vid)</div><div class='add'>+				  const unsigned char *addr, u16 vid,</div><div class='add'>+				  struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,</div><div class='ctx'> 					   MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_port_db_find(chip, addr, vid))</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-				  const unsigned char *addr, u16 vid)</div><div class='add'>+				  const unsigned char *addr, u16 vid,</div><div class='add'>+				  struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,</div><div class='del'>-					   MV88E6XXX_G1_ATU_DATA_STATE_UNUSED);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid, 0);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1745,17 +2914,15 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	bool is_static;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	addr.state = MV88E6XXX_G1_ATU_DATA_STATE_UNUSED;</div><div class='add'>+	addr.state = 0;</div><div class='ctx'> 	eth_broadcast_addr(addr.mac);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		err = mv88e6xxx_g1_atu_getnext(chip, fid, &amp;addr);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		if (addr.state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED)</div><div class='add'>+		if (!addr.state)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (addr.trunk || (addr.portvec &amp; BIT(port)) == 0)</div><div class='hunk'>@@ -1774,20 +2941,35 @@ static int mv88e6xxx_port_db_dump_fid(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct mv88e6xxx_port_db_dump_vlan_ctx {</div><div class='add'>+	int port;</div><div class='add'>+	dsa_fdb_dump_cb_t *cb;</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_db_dump_vlan(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       const struct mv88e6xxx_vtu_entry *entry,</div><div class='add'>+				       void *_data)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port_db_dump_vlan_ctx *ctx = _data;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_db_dump_fid(chip, entry-&gt;fid, entry-&gt;vid,</div><div class='add'>+					  ctx-&gt;port, ctx-&gt;cb, ctx-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				  dsa_fdb_dump_cb_t *cb, void *data)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_vtu_entry vlan = {</div><div class='del'>-		.vid = chip-&gt;info-&gt;max_vid,</div><div class='add'>+	struct mv88e6xxx_port_db_dump_vlan_ctx ctx = {</div><div class='add'>+		.port = port,</div><div class='add'>+		.cb = cb,</div><div class='add'>+		.data = data,</div><div class='ctx'> 	};</div><div class='ctx'> 	u16 fid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* Dump port's default Filtering Information Database (VLAN ID 0) */</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	err = mv88e6xxx_port_get_fid(chip, port, &amp;fid);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -1795,63 +2977,45 @@ static int mv88e6xxx_port_db_dump(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* Dump VLANs' Filtering Information Databases */</div><div class='del'>-	do {</div><div class='del'>-		mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		err = mv88e6xxx_vtu_getnext(chip, &amp;vlan);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (!vlan.valid)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		err = mv88e6xxx_port_db_dump_fid(chip, vlan.fid, vlan.vid, port,</div><div class='del'>-						 cb, data);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	} while (vlan.vid &lt; chip-&gt;info-&gt;max_vid);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return mv88e6xxx_vtu_walk(chip, mv88e6xxx_port_db_dump_vlan, &amp;ctx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 				   dsa_fdb_dump_cb_t *cb, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_db_dump(chip, port, cb, data);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_db_dump(chip, port, cb, data);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip,</div><div class='del'>-				struct net_device *br)</div><div class='add'>+				struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	int port;</div><div class='del'>-	int dev;</div><div class='add'>+	struct dsa_switch *ds = chip-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Remap the Port VLAN of each local bridge group member */</div><div class='del'>-	for (port = 0; port &lt; mv88e6xxx_num_ports(chip); ++port) {</div><div class='del'>-		if (chip-&gt;ds-&gt;ports[port].bridge_dev == br) {</div><div class='del'>-			err = mv88e6xxx_port_vlan_map(chip, port);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!mv88e6xxx_has_pvt(chip))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Remap the Port VLAN of each cross-chip bridge group member */</div><div class='del'>-	for (dev = 0; dev &lt; DSA_MAX_SWITCHES; ++dev) {</div><div class='del'>-		ds = chip-&gt;ds-&gt;dst-&gt;ds[dev];</div><div class='del'>-		if (!ds)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		for (port = 0; port &lt; ds-&gt;num_ports; ++port) {</div><div class='del'>-			if (ds-&gt;ports[port].bridge_dev == br) {</div><div class='del'>-				err = mv88e6xxx_pvt_map(chip, dev, port);</div><div class='add'>+	list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+		if (dsa_port_offloads_bridge(dp, &amp;bridge)) {</div><div class='add'>+			if (dp-&gt;ds == ds) {</div><div class='add'>+				/* This is a local bridge group member,</div><div class='add'>+				 * remap its Port VLAN Map.</div><div class='add'>+				 */</div><div class='add'>+				err = mv88e6xxx_port_vlan_map(chip, dp-&gt;index);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			} else {</div><div class='add'>+				/* This is an external bridge group member,</div><div class='add'>+				 * remap its cross-chip Port VLAN Table entry.</div><div class='add'>+				 */</div><div class='add'>+				err = mv88e6xxx_pvt_map(chip, dp-&gt;ds-&gt;index,</div><div class='add'>+							dp-&gt;index);</div><div class='ctx'> 				if (err)</div><div class='ctx'> 					return err;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1861,59 +3025,119 @@ static int mv88e6xxx_bridge_map(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Treat the software bridge as a virtual single-port switch behind the</div><div class='add'>+ * CPU and map in the PVT. First dst-&gt;last_switch elements are taken by</div><div class='add'>+ * physical switches, so start from beyond that range.</div><div class='add'>+ */</div><div class='add'>+static int mv88e6xxx_map_virtual_bridge_to_pvt(struct dsa_switch *ds,</div><div class='add'>+					       unsigned int bridge_num)</div><div class='add'>+{</div><div class='add'>+	u8 dev = bridge_num + ds-&gt;dst-&gt;last_switch;</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_pvt_map(chip, dev, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-				      struct net_device *br)</div><div class='add'>+				      struct dsa_bridge bridge,</div><div class='add'>+				      bool *tx_fwd_offload,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_bridge_map(chip, br);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_bridge_map(chip, bridge);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_set_map_da(chip, port, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_commit_pvid(chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (mv88e6xxx_has_pvt(chip)) {</div><div class='add'>+		err = mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge.num);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		*tx_fwd_offload = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-					struct net_device *br)</div><div class='add'>+					struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (mv88e6xxx_bridge_map(chip, br) ||</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	if (bridge.tx_fwd_offload &amp;&amp;</div><div class='add'>+	    mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge.num))</div><div class='add'>+		dev_err(ds-&gt;dev, "failed to remap cross-chip Port VLAN\n");</div><div class='add'>+</div><div class='add'>+	if (mv88e6xxx_bridge_map(chip, bridge) ||</div><div class='ctx'> 	    mv88e6xxx_port_vlan_map(chip, port))</div><div class='ctx'> 		dev_err(ds-&gt;dev, "failed to remap in-chip Port VLAN\n");</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_set_map_da(chip, port, false);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"port %d failed to restore map-DA: %pe\n",</div><div class='add'>+			port, ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_commit_pvid(chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"port %d failed to restore standalone pvid: %pe\n",</div><div class='add'>+			port, ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_crosschip_bridge_join(struct dsa_switch *ds, int dev,</div><div class='del'>-					   int port, struct net_device *br)</div><div class='add'>+static int mv88e6xxx_crosschip_bridge_join(struct dsa_switch *ds,</div><div class='add'>+					   int tree_index, int sw_index,</div><div class='add'>+					   int port, struct dsa_bridge bridge,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!mv88e6xxx_has_pvt(chip))</div><div class='add'>+	if (tree_index != ds-&gt;dst-&gt;index)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_pvt_map(chip, dev, port);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_pvt_map(chip, sw_index, port);</div><div class='add'>+	err = err ? : mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge.num);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_crosschip_bridge_leave(struct dsa_switch *ds, int dev,</div><div class='del'>-					     int port, struct net_device *br)</div><div class='add'>+static void mv88e6xxx_crosschip_bridge_leave(struct dsa_switch *ds,</div><div class='add'>+					     int tree_index, int sw_index,</div><div class='add'>+					     int port, struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!mv88e6xxx_has_pvt(chip))</div><div class='add'>+	if (tree_index != ds-&gt;dst-&gt;index)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (mv88e6xxx_pvt_map(chip, dev, port))</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	if (mv88e6xxx_pvt_map(chip, sw_index, port) ||</div><div class='add'>+	    mv88e6xxx_map_virtual_bridge_to_pvt(ds, bridge.num))</div><div class='ctx'> 		dev_err(ds-&gt;dev, "failed to remap cross-chip Port VLAN\n");</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_software_reset(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -1927,13 +3151,35 @@ static int mv88e6xxx_software_reset(struct mv88e6xxx_chip *chip)</div><div class='ctx'> static void mv88e6xxx_hardware_reset(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	struct gpio_desc *gpiod = chip-&gt;reset;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* If there is a GPIO connected to the reset pin, toggle it */</div><div class='ctx'> 	if (gpiod) {</div><div class='add'>+		/* If the switch has just been reset and not yet completed</div><div class='add'>+		 * loading EEPROM, the reset may interrupt the I2C transaction</div><div class='add'>+		 * mid-byte, causing the first EEPROM read after the reset</div><div class='add'>+		 * from the wrong location resulting in the switch booting</div><div class='add'>+		 * to wrong mode and inoperable.</div><div class='add'>+		 * For this reason, switch families with EEPROM support</div><div class='add'>+		 * generally wait for EEPROM loads to complete as their pre-</div><div class='add'>+		 * and post-reset handlers.</div><div class='add'>+		 */</div><div class='add'>+		if (chip-&gt;info-&gt;ops-&gt;hardware_reset_pre) {</div><div class='add'>+			err = chip-&gt;info-&gt;ops-&gt;hardware_reset_pre(chip);</div><div class='add'>+			if (err)</div><div class='add'>+				dev_err(chip-&gt;dev, "pre-reset error: %d\n", err);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		gpiod_set_value_cansleep(gpiod, 1);</div><div class='ctx'> 		usleep_range(10000, 20000);</div><div class='ctx'> 		gpiod_set_value_cansleep(gpiod, 0);</div><div class='ctx'> 		usleep_range(10000, 20000);</div><div class='add'>+</div><div class='add'>+		if (chip-&gt;info-&gt;ops-&gt;hardware_reset_post) {</div><div class='add'>+			err = chip-&gt;info-&gt;ops-&gt;hardware_reset_post(chip);</div><div class='add'>+			if (err)</div><div class='add'>+				dev_err(chip-&gt;dev, "post-reset error: %d\n", err);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2023,10 +3269,10 @@ static int mv88e6xxx_setup_port_mode(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 		return mv88e6xxx_set_port_mode_normal(chip, port);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup CPU port mode depending on its supported tag format */</div><div class='del'>-	if (chip-&gt;info-&gt;tag_protocol == DSA_TAG_PROTO_DSA)</div><div class='add'>+	if (chip-&gt;tag_protocol == DSA_TAG_PROTO_DSA)</div><div class='ctx'> 		return mv88e6xxx_set_port_mode_dsa(chip, port);</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;tag_protocol == DSA_TAG_PROTO_EDSA)</div><div class='add'>+	if (chip-&gt;tag_protocol == DSA_TAG_PROTO_EDSA)</div><div class='ctx'> 		return mv88e6xxx_set_port_mode_edsa(chip, port);</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -2041,23 +3287,39 @@ static int mv88e6xxx_setup_message_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_setup_egress_floods(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_switch *ds = chip-&gt;ds;</div><div class='del'>-	bool flood;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	/* Upstream ports flood frames with unknown unicast or multicast DA */</div><div class='del'>-	flood = dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port);</div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_egress_floods)</div><div class='del'>-		return chip-&gt;info-&gt;ops-&gt;port_set_egress_floods(chip, port,</div><div class='del'>-							       flood, flood);</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_ucast_flood) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_ucast_flood(chip, port, true);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_mcast_flood) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_mcast_flood(chip, port, true);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_serdes_power(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				  bool on)</div><div class='add'>+static int mv88e6xxx_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+				     enum mv88e6xxx_egress_direction direction,</div><div class='add'>+				     int port)</div><div class='ctx'> {</div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;serdes_power)</div><div class='del'>-		return chip-&gt;info-&gt;ops-&gt;serdes_power(chip, port, on);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;set_egress_port)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;set_egress_port(chip, direction, port);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (direction == MV88E6XXX_EGRESS_DIR_INGRESS)</div><div class='add'>+		chip-&gt;ingress_dest_port = port;</div><div class='add'>+	else</div><div class='add'>+		chip-&gt;egress_dest_port = port;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2084,12 +3346,17 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 				return err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (chip-&gt;info-&gt;ops-&gt;set_egress_port) {</div><div class='del'>-			err = chip-&gt;info-&gt;ops-&gt;set_egress_port(chip,</div><div class='del'>-							       upstream_port);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='add'>+		err = mv88e6xxx_set_egress_port(chip,</div><div class='add'>+						MV88E6XXX_EGRESS_DIR_INGRESS,</div><div class='add'>+						upstream_port);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_set_egress_port(chip,</div><div class='add'>+						MV88E6XXX_EGRESS_DIR_EGRESS,</div><div class='add'>+						upstream_port);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2097,27 +3364,49 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *phy_handle = NULL;</div><div class='add'>+	struct fwnode_handle *ports_fwnode;</div><div class='add'>+	struct fwnode_handle *port_fwnode;</div><div class='ctx'> 	struct dsa_switch *ds = chip-&gt;ds;</div><div class='add'>+	struct mv88e6xxx_port *p;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int tx_amp;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	p = &amp;chip-&gt;ports[port];</div><div class='add'>+	p-&gt;chip = chip;</div><div class='add'>+	p-&gt;port = port;</div><div class='add'>+</div><div class='add'>+	/* Look up corresponding fwnode if any */</div><div class='add'>+	ports_fwnode = device_get_named_child_node(chip-&gt;dev, "ethernet-ports");</div><div class='add'>+	if (!ports_fwnode)</div><div class='add'>+		ports_fwnode = device_get_named_child_node(chip-&gt;dev, "ports");</div><div class='add'>+	if (ports_fwnode) {</div><div class='add'>+		fwnode_for_each_child_node(ports_fwnode, port_fwnode) {</div><div class='add'>+			if (fwnode_property_read_u32(port_fwnode, "reg", &amp;val))</div><div class='add'>+				continue;</div><div class='add'>+			if (val == port) {</div><div class='add'>+				p-&gt;fwnode = port_fwnode;</div><div class='add'>+				p-&gt;fiber = fwnode_property_present(port_fwnode, "sfp");</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		fwnode_handle_put(ports_fwnode);</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(chip-&gt;dev, "no ethernet ports node defined for the device\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;ports[port].chip = chip;</div><div class='del'>-	chip-&gt;ports[port].port = port;</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_setup_leds) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_setup_leds(chip, port);</div><div class='add'>+		if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* MAC Forcing register: don't force link, speed, duplex or flow control</div><div class='del'>-	 * state to any particular values on physical ports, but force the CPU</div><div class='del'>-	 * port and all DSA ports to their maximum bandwidth and full duplex.</div><div class='del'>-	 */</div><div class='del'>-	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='del'>-		err = mv88e6xxx_port_setup_mac(chip, port, LINK_FORCED_UP,</div><div class='del'>-					       SPEED_MAX, DUPLEX_FULL,</div><div class='del'>-					       PAUSE_OFF,</div><div class='del'>-					       PHY_INTERFACE_MODE_NA);</div><div class='del'>-	else</div><div class='del'>-		err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED,</div><div class='del'>-					       SPEED_UNFORCED, DUPLEX_UNFORCED,</div><div class='del'>-					       PAUSE_ON,</div><div class='del'>-					       PHY_INTERFACE_MODE_NA);</div><div class='add'>+	err = mv88e6xxx_port_setup_mac(chip, port, LINK_UNFORCED,</div><div class='add'>+				       SPEED_UNFORCED, DUPLEX_UNFORCED,</div><div class='add'>+				       PAUSE_ON, PHY_INTERFACE_MODE_NA);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2135,9 +3424,14 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	 * If this is the upstream port for this switch, enable</div><div class='ctx'> 	 * forwarding of unknown unicasts and multicasts.</div><div class='ctx'> 	 */</div><div class='del'>-	reg = MV88E6XXX_PORT_CTL0_IGMP_MLD_SNOOP |</div><div class='del'>-		MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP |</div><div class='add'>+	reg = MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP |</div><div class='ctx'> 		MV88E6XXX_PORT_CTL0_STATE_FORWARDING;</div><div class='add'>+	/* Forward any IPv4 IGMP or IPv6 MLD frames received</div><div class='add'>+	 * by a USER port to the CPU port to allow snooping.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_user_port(ds, port))</div><div class='add'>+		reg |= MV88E6XXX_PORT_CTL0_IGMP_MLD_SNOOP;</div><div class='add'>+</div><div class='ctx'> 	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2150,50 +3444,96 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* Enable the SERDES interface for DSA and CPU ports. Normal</div><div class='del'>-	 * ports SERDES are enabled when the port is enabled, thus</div><div class='del'>-	 * saving a bit of power.</div><div class='add'>+	/* Port Control 2: don't force a good FCS, set the MTU size to</div><div class='add'>+	 * 10222 bytes, disable 802.1q tags checking, don't discard</div><div class='add'>+	 * tagged or untagged frames on this port, skip destination</div><div class='add'>+	 * address lookup on user ports, disable ARP mirroring and don't</div><div class='add'>+	 * send a copy of all transmitted/received frames on this port</div><div class='add'>+	 * to the CPU.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_port_set_map_da(chip, port, !dsa_is_user_port(ds, port));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_setup_upstream_port(chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* On chips that support it, set all downstream DSA ports'</div><div class='add'>+	 * VLAN policy to TRAP. In combination with loading</div><div class='add'>+	 * MV88E6XXX_VID_STANDALONE as a policy entry in the VTU, this</div><div class='add'>+	 * provides a better isolation barrier between standalone</div><div class='add'>+	 * ports, as the ATU is bypassed on any intermediate switches</div><div class='add'>+	 * between the incoming port and the CPU.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))) {</div><div class='del'>-		err = mv88e6xxx_serdes_power(chip, port, true);</div><div class='add'>+	if (dsa_is_downstream_port(ds, port) &amp;&amp;</div><div class='add'>+	    chip-&gt;info-&gt;ops-&gt;port_set_policy) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_policy(chip, port,</div><div class='add'>+						MV88E6XXX_POLICY_MAPPING_VTU,</div><div class='add'>+						MV88E6XXX_POLICY_ACTION_TRAP);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Port Control 2: don't force a good FCS, set the maximum frame size to</div><div class='del'>-	 * 10240 bytes, disable 802.1q tags checking, don't discard tagged or</div><div class='del'>-	 * untagged frames on this port, do a destination address lookup on all</div><div class='del'>-	 * received packets as usual, disable ARP mirroring and don't send a</div><div class='del'>-	 * copy of all transmitted/received frames on this port to the CPU.</div><div class='add'>+	/* User ports start out in standalone mode and 802.1Q is</div><div class='add'>+	 * therefore disabled. On DSA ports, all valid VIDs are always</div><div class='add'>+	 * loaded in the VTU - therefore, enable 802.1Q in order to take</div><div class='add'>+	 * advantage of VLAN policy on chips that supports it.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mv88e6xxx_port_set_map_da(chip, port);</div><div class='add'>+	err = mv88e6xxx_port_set_8021q_mode(chip, port,</div><div class='add'>+				dsa_is_user_port(ds, port) ?</div><div class='add'>+				MV88E6XXX_PORT_CTL2_8021Q_MODE_DISABLED :</div><div class='add'>+				MV88E6XXX_PORT_CTL2_8021Q_MODE_SECURE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_setup_upstream_port(chip, port);</div><div class='add'>+	/* Bind MV88E6XXX_VID_STANDALONE to MV88E6XXX_FID_STANDALONE by</div><div class='add'>+	 * virtue of the fact that mv88e6xxx_atu_new() will pick it as</div><div class='add'>+	 * the first free FID. This will be used as the private PVID for</div><div class='add'>+	 * unbridged ports. Shared (DSA and CPU) ports must also be</div><div class='add'>+	 * members of this VID, in order to trap all frames assigned to</div><div class='add'>+	 * it to the CPU.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_STANDALONE,</div><div class='add'>+				       MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED,</div><div class='add'>+				       false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_port_set_8021q_mode(chip, port,</div><div class='del'>-				MV88E6XXX_PORT_CTL2_8021Q_MODE_DISABLED);</div><div class='add'>+	/* Associate MV88E6XXX_VID_BRIDGED with MV88E6XXX_FID_BRIDGED in the</div><div class='add'>+	 * ATU by virtue of the fact that mv88e6xxx_atu_new() will pick it as</div><div class='add'>+	 * the first free FID after MV88E6XXX_FID_STANDALONE. This will be used</div><div class='add'>+	 * as the private PVID on ports under a VLAN-unaware bridge.</div><div class='add'>+	 * Shared (DSA and CPU) ports must also be members of it, to translate</div><div class='add'>+	 * the VID from the DSA tag into MV88E6XXX_FID_BRIDGED, instead of</div><div class='add'>+	 * relying on their port default FID.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_port_vlan_join(chip, port, MV88E6XXX_VID_BRIDGED,</div><div class='add'>+				       MV88E6XXX_G1_VTU_DATA_MEMBER_TAG_UNMODIFIED,</div><div class='add'>+				       false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size) {</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size(chip, port, 10240);</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size(chip, port, 10218);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Port Association Vector: when learning source addresses</div><div class='del'>-	 * of packets, add the address to the address database using</div><div class='del'>-	 * a port bitmap that has only the bit for this port set and</div><div class='del'>-	 * the other bits clear.</div><div class='add'>+	/* Port Association Vector: disable automatic address learning</div><div class='add'>+	 * on all user ports since they start out in standalone</div><div class='add'>+	 * mode. When joining a bridge, learning will be configured to</div><div class='add'>+	 * match the bridge port settings. Enable learning on all</div><div class='add'>+	 * DSA/CPU ports. NOTE: FROM_CPU frames always bypass the</div><div class='add'>+	 * learning process.</div><div class='add'>+	 *</div><div class='add'>+	 * Disable HoldAt1, IntOnAgeOut, LockedPort, IgnoreWrongData,</div><div class='add'>+	 * and RefreshLocked. I.e. setup standard automatic learning.</div><div class='ctx'> 	 */</div><div class='del'>-	reg = 1 &lt;&lt; port;</div><div class='del'>-	/* Disable learning for CPU port */</div><div class='del'>-	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+	if (dsa_is_user_port(ds, port))</div><div class='ctx'> 		reg = 0;</div><div class='add'>+	else</div><div class='add'>+		reg = 1 &lt;&lt; port;</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR,</div><div class='ctx'> 				   reg);</div><div class='hunk'>@@ -2236,15 +3576,34 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_setup_message_port(chip, port);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_setup_message_port) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_setup_message_port(chip, port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;serdes_set_tx_amplitude) {</div><div class='add'>+		dp = dsa_to_port(ds, port);</div><div class='add'>+		if (dp)</div><div class='add'>+			phy_handle = of_parse_phandle(dp-&gt;dn, "phy-handle", 0);</div><div class='add'>+</div><div class='add'>+		if (phy_handle &amp;&amp; !of_property_read_u32(phy_handle,</div><div class='add'>+							"tx-p2p-microvolt",</div><div class='add'>+							&amp;tx_amp))</div><div class='add'>+			err = chip-&gt;info-&gt;ops-&gt;serdes_set_tx_amplitude(chip,</div><div class='add'>+								port, tx_amp);</div><div class='add'>+		if (phy_handle) {</div><div class='add'>+			of_node_put(phy_handle);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Port based VLAN map: give each port the same default address</div><div class='ctx'> 	 * database, and allow bidirectional communication between the</div><div class='ctx'> 	 * CPU and DSA port(s), and the other ports.</div><div class='ctx'> 	 */</div><div class='del'>-	err = mv88e6xxx_port_set_fid(chip, port, 0);</div><div class='add'>+	err = mv88e6xxx_port_set_fid(chip, port, MV88E6XXX_FID_STANDALONE);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2258,40 +3617,45 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_DEFAULT_VLAN, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port,</div><div class='del'>-				 struct phy_device *phydev)</div><div class='add'>+static int mv88e6xxx_get_max_mtu(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_serdes_power(chip, port, true);</div><div class='del'>-</div><div class='del'>-	if (!err &amp;&amp; chip-&gt;info-&gt;ops-&gt;serdes_irq_setup)</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;serdes_irq_setup(chip, port);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size)</div><div class='add'>+		return 10240 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;</div><div class='add'>+	else if (chip-&gt;info-&gt;ops-&gt;set_max_frame_size)</div><div class='add'>+		return 1632 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;</div><div class='add'>+	return ETH_DATA_LEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	/* For families where we don't know how to alter the MTU,</div><div class='add'>+	 * just accept any value up to ETH_DATA_LEN</div><div class='add'>+	 */</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size &amp;&amp;</div><div class='add'>+	    !chip-&gt;info-&gt;ops-&gt;set_max_frame_size) {</div><div class='add'>+		if (new_mtu &gt; ETH_DATA_LEN)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (mv88e6xxx_port_set_state(chip, port, BR_STATE_DISABLED))</div><div class='del'>-		dev_err(chip-&gt;dev, "failed to disable port\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;serdes_irq_free)</div><div class='del'>-		chip-&gt;info-&gt;ops-&gt;serdes_irq_free(chip, port);</div><div class='add'>+	if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))</div><div class='add'>+		new_mtu += EDSA_HLEN;</div><div class='ctx'> </div><div class='del'>-	if (mv88e6xxx_serdes_power(chip, port, false))</div><div class='del'>-		dev_err(chip-&gt;dev, "failed to power off SERDES\n");</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size)</div><div class='add'>+		ret = chip-&gt;info-&gt;ops-&gt;port_set_jumbo_size(chip, port, new_mtu);</div><div class='add'>+	else if (chip-&gt;info-&gt;ops-&gt;set_max_frame_size &amp;&amp;</div><div class='add'>+		 dsa_is_cpu_port(ds, port))</div><div class='add'>+		ret = chip-&gt;info-&gt;ops-&gt;set_max_frame_size(chip, new_mtu);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_set_ageing_time(struct dsa_switch *ds,</div><div class='hunk'>@@ -2300,9 +3664,9 @@ static int mv88e6xxx_set_ageing_time(struct dsa_switch *ds,</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_g1_atu_set_age_time(chip, ageing_time);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2321,56 +3685,19 @@ static int mv88e6xxx_stats_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return mv88e6xxx_g1_stats_clear(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The mv88e6390 has some hidden registers used for debug and</div><div class='del'>- * development. The errata also makes use of them.</div><div class='del'>- */</div><div class='del'>-static int mv88e6390_hidden_write(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				  int reg, u16 val)</div><div class='add'>+static int mv88e6320_setup_errata(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	u16 ctrl;</div><div class='add'>+	u16 dummy;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_port_write(chip, PORT_RESERVED_1A_DATA_PORT,</div><div class='del'>-				   PORT_RESERVED_1A, val);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	ctrl = PORT_RESERVED_1A_BUSY | PORT_RESERVED_1A_WRITE |</div><div class='del'>-	       PORT_RESERVED_1A_BLOCK | port &lt;&lt; PORT_RESERVED_1A_PORT_SHIFT |</div><div class='del'>-	       reg;</div><div class='del'>-</div><div class='del'>-	return mv88e6xxx_port_write(chip, PORT_RESERVED_1A_CTRL_PORT,</div><div class='del'>-				    PORT_RESERVED_1A, ctrl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6390_hidden_wait(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return mv88e6xxx_wait(chip, PORT_RESERVED_1A_CTRL_PORT,</div><div class='del'>-			      PORT_RESERVED_1A, PORT_RESERVED_1A_BUSY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int mv88e6390_hidden_read(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				  int reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	u16 ctrl;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ctrl = PORT_RESERVED_1A_BUSY | PORT_RESERVED_1A_READ |</div><div class='del'>-	       PORT_RESERVED_1A_BLOCK | port &lt;&lt; PORT_RESERVED_1A_PORT_SHIFT |</div><div class='del'>-	       reg;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_port_write(chip, PORT_RESERVED_1A_CTRL_PORT,</div><div class='del'>-				   PORT_RESERVED_1A, ctrl);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6390_hidden_wait(chip);</div><div class='add'>+	/* Workaround for erratum</div><div class='add'>+	 *   3.3 RGMII timing may be out of spec when transmit delay is enabled</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_port_hidden_write(chip, 0, 0xf, 0x7, 0xe000);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return 	mv88e6xxx_port_read(chip, PORT_RESERVED_1A_DATA_PORT,</div><div class='del'>-				    PORT_RESERVED_1A, val);</div><div class='add'>+	return mv88e6xxx_port_hidden_read(chip, 0, 0xf, 0x7, &amp;dummy);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Check if the errata has already been applied. */</div><div class='hunk'>@@ -2381,7 +3708,7 @@ static bool mv88e6390_setup_errata_applied(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	u16 val;</div><div class='ctx'> </div><div class='ctx'> 	for (port = 0; port &lt; mv88e6xxx_num_ports(chip); port++) {</div><div class='del'>-		err = mv88e6390_hidden_read(chip, port, 0, &amp;val);</div><div class='add'>+		err = mv88e6xxx_port_hidden_read(chip, 0xf, port, 0, &amp;val);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(chip-&gt;dev,</div><div class='ctx'> 				"Error reading hidden register: %d\n", err);</div><div class='hunk'>@@ -2414,7 +3741,7 @@ static int mv88e6390_setup_errata(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (port = 0; port &lt; mv88e6xxx_num_ports(chip); port++) {</div><div class='del'>-		err = mv88e6390_hidden_write(chip, port, 0, 0x01c0);</div><div class='add'>+		err = mv88e6xxx_port_hidden_write(chip, 0xf, port, 0, 0x01c0);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2422,160 +3749,53 @@ static int mv88e6390_setup_errata(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return mv88e6xxx_software_reset(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_setup(struct dsa_switch *ds)</div><div class='add'>+/* prod_id for switch families which do not have a PHY model number */</div><div class='add'>+static const u16 family_prod_id_table[] = {</div><div class='add'>+	[MV88E6XXX_FAMILY_6341] = MV88E6XXX_PORT_SWITCH_ID_PROD_6341,</div><div class='add'>+	[MV88E6XXX_FAMILY_6390] = MV88E6XXX_PORT_SWITCH_ID_PROD_6390,</div><div class='add'>+	[MV88E6XXX_FAMILY_6393] = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_mdio_read(struct mii_bus *bus, int phy, int reg)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	u8 cmode;</div><div class='add'>+	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_chip *chip = mdio_bus-&gt;chip;</div><div class='add'>+	u16 prod_id;</div><div class='add'>+	u16 val;</div><div class='ctx'> 	int err;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	chip-&gt;ds = ds;</div><div class='del'>-	ds-&gt;slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;setup_errata) {</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;setup_errata(chip);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Cache the cmode of each port. */</div><div class='del'>-	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++) {</div><div class='del'>-		if (chip-&gt;info-&gt;ops-&gt;port_get_cmode) {</div><div class='del'>-			err = chip-&gt;info-&gt;ops-&gt;port_get_cmode(chip, i, &amp;cmode);</div><div class='del'>-			if (err)</div><div class='del'>-				goto unlock;</div><div class='del'>-</div><div class='del'>-			chip-&gt;ports[i].cmode = cmode;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Setup Switch Port Registers */</div><div class='del'>-	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++) {</div><div class='del'>-		if (dsa_is_unused_port(ds, i)) {</div><div class='del'>-			err = mv88e6xxx_port_set_state(chip, i,</div><div class='del'>-						       BR_STATE_DISABLED);</div><div class='del'>-			if (err)</div><div class='del'>-				goto unlock;</div><div class='del'>-</div><div class='del'>-			err = mv88e6xxx_serdes_power(chip, i, false);</div><div class='del'>-			if (err)</div><div class='del'>-				goto unlock;</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = mv88e6xxx_setup_port(chip, i);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_irl_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_mac_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_phy_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_vtu_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_pvt_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_atu_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_broadcast_setup(chip, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_pot_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_rmu_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_rsvd2cpu_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_trunk_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_devmap_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_pri_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	/* Setup PTP Hardware Clock and timestamping */</div><div class='del'>-	if (chip-&gt;info-&gt;ptp_support) {</div><div class='del'>-		err = mv88e6xxx_ptp_setup(chip);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;phy_read)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_hwtstamp_setup(chip);</div><div class='del'>-		if (err)</div><div class='del'>-			goto unlock;</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;phy_read(chip, bus, phy, reg, &amp;val);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	/* Some internal PHYs don't have a model number. */</div><div class='add'>+	if (reg == MII_PHYSID2 &amp;&amp; !(val &amp; 0x3f0) &amp;&amp;</div><div class='add'>+	    chip-&gt;info-&gt;family &lt; ARRAY_SIZE(family_prod_id_table)) {</div><div class='add'>+		prod_id = family_prod_id_table[chip-&gt;info-&gt;family];</div><div class='add'>+		if (prod_id)</div><div class='add'>+			val |= prod_id &gt;&gt; 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_stats_setup(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return err ? err : val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_mdio_read(struct mii_bus *bus, int phy, int reg)</div><div class='add'>+static int mv88e6xxx_mdio_read_c45(struct mii_bus *bus, int phy, int devad,</div><div class='add'>+				   int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = mdio_bus-&gt;chip;</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!chip-&gt;info-&gt;ops-&gt;phy_read)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = chip-&gt;info-&gt;ops-&gt;phy_read(chip, bus, phy, reg, &amp;val);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;phy_read_c45)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (reg == MII_PHYSID2) {</div><div class='del'>-		/* Some internal PHYs don't have a model number. */</div><div class='del'>-		if (chip-&gt;info-&gt;family != MV88E6XXX_FAMILY_6165)</div><div class='del'>-			/* Then there is the 6165 family. It gets is</div><div class='del'>-			 * PHYs correct. But it can also have two</div><div class='del'>-			 * SERDES interfaces in the PHY address</div><div class='del'>-			 * space. And these don't have a model</div><div class='del'>-			 * number. But they are not PHYs, so we don't</div><div class='del'>-			 * want to give them something a PHY driver</div><div class='del'>-			 * will recognise.</div><div class='del'>-			 *</div><div class='del'>-			 * Use the mv88e6390 family model number</div><div class='del'>-			 * instead, for anything which really could be</div><div class='del'>-			 * a PHY,</div><div class='del'>-			 */</div><div class='del'>-			if (!(val &amp; 0x3f0))</div><div class='del'>-				val |= MV88E6XXX_PORT_SWITCH_ID_PROD_6390 &gt;&gt; 4;</div><div class='del'>-	}</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;phy_read_c45(chip, bus, phy, devad, reg, &amp;val);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err ? err : val;</div><div class='ctx'> }</div><div class='hunk'>@@ -2589,9 +3809,26 @@ static int mv88e6xxx_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val)</div><div class='ctx'> 	if (!chip-&gt;info-&gt;ops-&gt;phy_write)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = chip-&gt;info-&gt;ops-&gt;phy_write(chip, bus, phy, reg, val);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_mdio_write_c45(struct mii_bus *bus, int phy, int devad,</div><div class='add'>+				    int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_chip *chip = mdio_bus-&gt;chip;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;phy_write_c45)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = chip-&gt;info-&gt;ops-&gt;phy_write_c45(chip, bus, phy, devad, reg, val);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2606,15 +3843,18 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (external) {</div><div class='del'>-		mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-		err = mv88e6xxx_g2_scratch_gpio_set_smi(chip, true);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		mv88e6xxx_reg_lock(chip);</div><div class='add'>+		if (chip-&gt;info-&gt;family == MV88E6XXX_FAMILY_6393)</div><div class='add'>+			err = mv88e6393x_g2_scratch_gpio_set_smi(chip, true);</div><div class='add'>+		else</div><div class='add'>+			err = mv88e6390_g2_scratch_gpio_set_smi(chip, true);</div><div class='add'>+		mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bus = devm_mdiobus_alloc_size(chip-&gt;dev, sizeof(*mdio_bus));</div><div class='add'>+	bus = mdiobus_alloc_size(sizeof(*mdio_bus));</div><div class='ctx'> 	if (!bus)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2634,19 +3874,24 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	bus-&gt;read = mv88e6xxx_mdio_read;</div><div class='ctx'> 	bus-&gt;write = mv88e6xxx_mdio_write;</div><div class='add'>+	bus-&gt;read_c45 = mv88e6xxx_mdio_read_c45;</div><div class='add'>+	bus-&gt;write_c45 = mv88e6xxx_mdio_write_c45;</div><div class='ctx'> 	bus-&gt;parent = chip-&gt;dev;</div><div class='add'>+	bus-&gt;phy_mask = ~GENMASK(chip-&gt;info-&gt;phy_base_addr +</div><div class='add'>+				 mv88e6xxx_num_ports(chip) - 1,</div><div class='add'>+				 chip-&gt;info-&gt;phy_base_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!external) {</div><div class='ctx'> 		err = mv88e6xxx_g2_irq_mdio_setup(chip, bus);</div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = of_mdiobus_register(bus, np);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(chip-&gt;dev, "Cannot register MDIO bus (%d)\n", err);</div><div class='ctx'> 		mv88e6xxx_g2_irq_mdio_free(chip, bus);</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (external)</div><div class='hunk'>@@ -2655,34 +3900,32 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		list_add(&amp;mdio_bus-&gt;list, &amp;chip-&gt;mdios);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id mv88e6xxx_mdio_external_match[] = {</div><div class='del'>-	{ .compatible = "marvell,mv88e6xxx-mdio-external",</div><div class='del'>-	  .data = (void *)true },</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='add'>+out:</div><div class='add'>+	mdiobus_free(bus);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip)</div><div class='ctx'> </div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_mdio_bus *mdio_bus;</div><div class='add'>+	struct mv88e6xxx_mdio_bus *mdio_bus, *p;</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> </div><div class='del'>-	list_for_each_entry(mdio_bus, &amp;chip-&gt;mdios, list) {</div><div class='add'>+	list_for_each_entry_safe(mdio_bus, p, &amp;chip-&gt;mdios, list) {</div><div class='ctx'> 		bus = mdio_bus-&gt;bus;</div><div class='ctx'> </div><div class='ctx'> 		if (!mdio_bus-&gt;external)</div><div class='ctx'> 			mv88e6xxx_g2_irq_mdio_free(chip, bus);</div><div class='ctx'> </div><div class='ctx'> 		mdiobus_unregister(bus);</div><div class='add'>+		mdiobus_free(bus);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,</div><div class='del'>-				    struct device_node *np)</div><div class='add'>+static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	const struct of_device_id *match;</div><div class='add'>+	struct device_node *np = chip-&gt;dev-&gt;of_node;</div><div class='ctx'> 	struct device_node *child;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2692,6 +3935,7 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	 */</div><div class='ctx'> 	child = of_get_child_by_name(np, "mdio");</div><div class='ctx'> 	err = mv88e6xxx_mdio_register(chip, child, false);</div><div class='add'>+	of_node_put(child);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -2700,11 +3944,12 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	 * bus.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for_each_available_child_of_node(np, child) {</div><div class='del'>-		match = of_match_node(mv88e6xxx_mdio_external_match, child);</div><div class='del'>-		if (match) {</div><div class='add'>+		if (of_device_is_compatible(</div><div class='add'>+			    child, "marvell,mv88e6xxx-mdio-external")) {</div><div class='ctx'> 			err = mv88e6xxx_mdio_register(chip, child, true);</div><div class='ctx'> 			if (err) {</div><div class='ctx'> 				mv88e6xxx_mdios_unregister(chip);</div><div class='add'>+				of_node_put(child);</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2713,6 +3958,214 @@ static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void mv88e6xxx_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_teardown_devlink_params(ds);</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+	mv88e6xxx_teardown_devlink_regions_global(ds);</div><div class='add'>+	mv88e6xxx_hwtstamp_free(chip);</div><div class='add'>+	mv88e6xxx_ptp_free(chip);</div><div class='add'>+	mv88e6xxx_mdios_unregister(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	u8 cmode;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_mdios_register(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	chip-&gt;ds = ds;</div><div class='add'>+	ds-&gt;user_mii_bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='add'>+</div><div class='add'>+	/* Since virtual bridges are mapped in the PVT, the number we support</div><div class='add'>+	 * depends on the physical switch topology. We need to let DSA figure</div><div class='add'>+	 * that out and therefore we cannot set this at dsa_register_switch()</div><div class='add'>+	 * time.</div><div class='add'>+	 */</div><div class='add'>+	if (mv88e6xxx_has_pvt(chip))</div><div class='add'>+		ds-&gt;max_num_bridges = MV88E6XXX_MAX_PVT_SWITCHES -</div><div class='add'>+				      ds-&gt;dst-&gt;last_switch - 1;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;setup_errata) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;setup_errata(chip);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Cache the cmode of each port. */</div><div class='add'>+	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++) {</div><div class='add'>+		if (chip-&gt;info-&gt;ops-&gt;port_get_cmode) {</div><div class='add'>+			err = chip-&gt;info-&gt;ops-&gt;port_get_cmode(chip, i, &amp;cmode);</div><div class='add'>+			if (err)</div><div class='add'>+				goto unlock;</div><div class='add'>+</div><div class='add'>+			chip-&gt;ports[i].cmode = cmode;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_vtu_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Must be called after mv88e6xxx_vtu_setup (which flushes the</div><div class='add'>+	 * VTU, thereby also flushing the STU).</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_stu_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Setup Switch Port Registers */</div><div class='add'>+	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Prevent the use of an invalid port. */</div><div class='add'>+		if (mv88e6xxx_is_invalid_port(chip, i)) {</div><div class='add'>+			dev_err(chip-&gt;dev, "port %d is invalid\n", i);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_setup_port(chip, i);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_irl_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_mac_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_phy_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_pvt_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_atu_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_broadcast_setup(chip, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_pot_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_rmu_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_rsvd2cpu_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_trunk_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_devmap_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_pri_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	/* Setup PTP Hardware Clock and timestamping */</div><div class='add'>+	if (chip-&gt;info-&gt;ptp_support) {</div><div class='add'>+		err = mv88e6xxx_ptp_setup(chip);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_hwtstamp_setup(chip);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_stats_setup(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_hwtstamp;</div><div class='add'>+</div><div class='add'>+	/* Have to be called without holding the register lock, since</div><div class='add'>+	 * they take the devlink lock, and we later take the locks in</div><div class='add'>+	 * the reverse order when getting/setting parameters or</div><div class='add'>+	 * resource occupancy.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_setup_devlink_resources(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_hwtstamp;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_setup_devlink_params(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_resources;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_setup_devlink_regions_global(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_params;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_params:</div><div class='add'>+	mv88e6xxx_teardown_devlink_params(ds);</div><div class='add'>+out_resources:</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+out_hwtstamp:</div><div class='add'>+	mv88e6xxx_hwtstamp_free(chip);</div><div class='add'>+	mv88e6xxx_ptp_free(chip);</div><div class='add'>+	mv88e6xxx_mdios_unregister(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;pcs_ops &amp;&amp;</div><div class='add'>+	    chip-&gt;info-&gt;ops-&gt;pcs_ops-&gt;pcs_init) {</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;pcs_ops-&gt;pcs_init(chip, port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_setup_devlink_regions_port(ds, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6xxx_port_teardown(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_teardown_devlink_regions_port(ds, port);</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;pcs_ops &amp;&amp;</div><div class='add'>+	    chip-&gt;info-&gt;ops-&gt;pcs_ops-&gt;pcs_teardown)</div><div class='add'>+		chip-&gt;info-&gt;ops-&gt;pcs_ops-&gt;pcs_teardown(chip, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv88e6xxx_get_eeprom_len(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='hunk'>@@ -2729,9 +4182,9 @@ static int mv88e6xxx_get_eeprom(struct dsa_switch *ds,</div><div class='ctx'> 	if (!chip-&gt;info-&gt;ops-&gt;get_eeprom)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = chip-&gt;info-&gt;ops-&gt;get_eeprom(chip, eeprom, data);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2753,9 +4206,9 @@ static int mv88e6xxx_set_eeprom(struct dsa_switch *ds,</div><div class='ctx'> 	if (eeprom-&gt;magic != 0xc3ec4951)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = chip-&gt;info-&gt;ops-&gt;set_eeprom(chip, eeprom, data);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2769,23 +4222,25 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {</div><div class='ctx'> 	.phy_read = mv88e6185_phy_ppu_read,</div><div class='ctx'> 	.phy_write = mv88e6185_phy_ppu_write,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='hunk'>@@ -2797,7 +4252,10 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {</div><div class='ctx'> 	.rmu_disable = mv88e6085_g1_rmu_disable,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.phylink_get_caps = mv88e6185_phylink_get_caps,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6095_ops = {</div><div class='hunk'>@@ -2808,25 +4266,28 @@ static const struct mv88e6xxx_ops mv88e6095_ops = {</div><div class='ctx'> 	.phy_read = mv88e6185_phy_ppu_read,</div><div class='ctx'> 	.phy_write = mv88e6185_phy_ppu_write,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6185_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6085_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6185_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6185_port_set_forward_unknown,</div><div class='add'>+	.port_set_mcast_flood = mv88e6185_port_set_default_forward,</div><div class='ctx'> 	.port_set_upstream_port = mv88e6095_port_set_upstream_port,</div><div class='del'>-	.port_link_state = mv88e6185_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6185_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.ppu_enable = mv88e6185_g1_ppu_enable,</div><div class='ctx'> 	.ppu_disable = mv88e6185_g1_ppu_disable,</div><div class='ctx'> 	.reset = mv88e6185_g1_reset,</div><div class='ctx'> 	.vtu_getnext = mv88e6185_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6095_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6185_pcs_ops,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6097_ops = {</div><div class='hunk'>@@ -2835,37 +4296,45 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6185_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='del'>-	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6095_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6085_g1_rmu_disable,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6095_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6185_pcs_ops,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6123_ops = {</div><div class='hunk'>@@ -2874,31 +4343,39 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6085_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.phylink_get_caps = mv88e6185_phylink_get_caps,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6131_ops = {</div><div class='hunk'>@@ -2909,24 +4386,25 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {</div><div class='ctx'> 	.phy_read = mv88e6185_phy_ppu_read,</div><div class='ctx'> 	.phy_write = mv88e6185_phy_ppu_write,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6185_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6185_port_set_forward_unknown,</div><div class='add'>+	.port_set_mcast_flood = mv88e6185_port_set_default_forward,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_upstream_port = mv88e6095_port_set_upstream_port,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_set_pause = mv88e6185_port_set_pause,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='hunk'>@@ -2937,7 +4415,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = {</div><div class='ctx'> 	.reset = mv88e6185_g1_reset,</div><div class='ctx'> 	.vtu_getnext = mv88e6185_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6185_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6141_ops = {</div><div class='hunk'>@@ -2948,40 +4426,59 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6341_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6341_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6341_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_set_cmode = mv88e6341_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='del'>-	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='add'>+	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu =  mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6341_serdes_power,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6341_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='del'>-	.phylink_validate = mv88e6341_phylink_validate,</div><div class='add'>+	.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='add'>+	.phylink_get_caps = mv88e6341_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6161_ops = {</div><div class='hunk'>@@ -2990,38 +4487,46 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='del'>-	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6165_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6165_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6185_phylink_get_caps,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6165_ops = {</div><div class='hunk'>@@ -3033,28 +4538,32 @@ static const struct mv88e6xxx_ops mv88e6165_ops = {</div><div class='ctx'> 	.phy_read = mv88e6165_phy_read,</div><div class='ctx'> 	.phy_write = mv88e6165_phy_write,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6165_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6165_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6185_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6171_ops = {</div><div class='hunk'>@@ -3063,37 +4572,44 @@ static const struct mv88e6xxx_ops mv88e6171_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.phylink_get_caps = mv88e6351_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6172_ops = {</div><div class='hunk'>@@ -3104,40 +4620,53 @@ static const struct mv88e6xxx_ops mv88e6172_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6352_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6352_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_leds = mv88e6xxx_port_setup_leds,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6352_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6352_serdes_power,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6352_serdes_get_regs,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='del'>-	.phylink_validate = mv88e6352_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6352_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6352_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6175_ops = {</div><div class='hunk'>@@ -3146,37 +4675,44 @@ static const struct mv88e6xxx_ops mv88e6175_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.phylink_get_caps = mv88e6351_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6176_ops = {</div><div class='hunk'>@@ -3187,42 +4723,55 @@ static const struct mv88e6xxx_ops mv88e6176_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6352_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6352_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_leds = mv88e6xxx_port_setup_leds,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6352_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6352_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6352_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6352_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6352_serdes_get_regs,</div><div class='add'>+	.serdes_set_tx_amplitude = mv88e6352_serdes_set_tx_amplitude,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='del'>-	.phylink_validate = mv88e6352_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6352_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6352_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6185_ops = {</div><div class='hunk'>@@ -3233,20 +4782,21 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {</div><div class='ctx'> 	.phy_read = mv88e6185_phy_ppu_read,</div><div class='ctx'> 	.phy_write = mv88e6185_phy_ppu_write,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6185_port_sync_link,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6085_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6185_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6185_port_set_forward_unknown,</div><div class='add'>+	.port_set_mcast_flood = mv88e6185_port_set_default_forward,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6095_port_egress_rate_limiting,</div><div class='ctx'> 	.port_set_upstream_port = mv88e6095_port_set_upstream_port,</div><div class='ctx'> 	.port_set_pause = mv88e6185_port_set_pause,</div><div class='del'>-	.port_link_state = mv88e6185_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6185_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6xxx_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='hunk'>@@ -3257,7 +4807,9 @@ static const struct mv88e6xxx_ops mv88e6185_ops = {</div><div class='ctx'> 	.reset = mv88e6185_g1_reset,</div><div class='ctx'> 	.vtu_getnext = mv88e6185_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6185_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6185_pcs_ops,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6190_ops = {</div><div class='hunk'>@@ -3267,42 +4819,57 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6390_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6390_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6390_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='add'>+	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='ctx'> 	.port_set_cmode = mv88e6390_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6390_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6390_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6390_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6390_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='del'>-	.phylink_validate = mv88e6390_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6390_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6190x_ops = {</div><div class='hunk'>@@ -3312,42 +4879,57 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6390x_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6390x_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6390x_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='add'>+	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='ctx'> 	.port_set_cmode = mv88e6390x_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6390x_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6390x_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6390x_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6390x_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='del'>-	.phylink_validate = mv88e6390x_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6390x_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6191_ops = {</div><div class='hunk'>@@ -3357,43 +4939,56 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6390_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6390_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6390_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='ctx'> 	.port_set_cmode = mv88e6390_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6390_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6390_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6390_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6390_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6390_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6390_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6390_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6240_ops = {</div><div class='hunk'>@@ -3404,44 +4999,102 @@ static const struct mv88e6xxx_ops mv88e6240_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6352_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6352_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_leds = mv88e6xxx_port_setup_leds,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6352_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6352_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6352_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6352_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6352_serdes_get_regs,</div><div class='add'>+	.serdes_set_tx_amplitude = mv88e6352_serdes_set_tx_amplitude,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6352_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6352_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6352_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6352_pcs_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mv88e6xxx_ops mv88e6250_ops = {</div><div class='add'>+	/* MV88E6XXX_FAMILY_6250 */</div><div class='add'>+	.ieee_pri_map = mv88e6250_g1_ieee_pri_map,</div><div class='add'>+	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='add'>+	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='add'>+	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='add'>+	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='add'>+	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='add'>+	.port_set_link = mv88e6xxx_port_set_link,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='add'>+	.port_set_speed_duplex = mv88e6250_port_set_speed_duplex,</div><div class='add'>+	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='add'>+	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='add'>+	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='add'>+	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='add'>+	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='add'>+	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='add'>+	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='add'>+	.stats_get_sset_count = mv88e6250_stats_get_sset_count,</div><div class='add'>+	.stats_get_strings = mv88e6250_stats_get_strings,</div><div class='add'>+	.stats_get_stat = mv88e6250_stats_get_stat,</div><div class='add'>+	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='add'>+	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='add'>+	.watchdog_ops = &amp;mv88e6250_watchdog_ops,</div><div class='add'>+	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='add'>+	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6250_g1_wait_eeprom_done_prereset,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g1_wait_eeprom_done,</div><div class='add'>+	.reset = mv88e6250_g1_reset,</div><div class='add'>+	.vtu_getnext = mv88e6185_g1_vtu_getnext,</div><div class='add'>+	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,</div><div class='add'>+	.avb_ops = &amp;mv88e6352_avb_ops,</div><div class='add'>+	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='add'>+	.phylink_get_caps = mv88e6250_phylink_get_caps,</div><div class='add'>+	.set_max_frame_size = mv88e6185_g1_set_max_frame_size,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6290_ops = {</div><div class='hunk'>@@ -3451,128 +5104,163 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6390_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6390_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6390_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='ctx'> 	.port_set_cmode = mv88e6390_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6390_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6390_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6390_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6390_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6390_avb_ops,</div><div class='del'>-	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6390_phylink_validate,</div><div class='add'>+	.ptp_ops = &amp;mv88e6390_ptp_ops,</div><div class='add'>+	.phylink_get_caps = mv88e6390_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6320_ops = {</div><div class='ctx'> 	/* MV88E6XXX_FAMILY_6320 */</div><div class='add'>+	.setup_errata = mv88e6320_setup_errata,</div><div class='ctx'> 	.ieee_pri_map = mv88e6085_g1_ieee_pri_map,</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6320_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6320_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='del'>-	.vtu_getnext = mv88e6185_g1_vtu_getnext,</div><div class='del'>-	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,</div><div class='add'>+	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='add'>+	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6352_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e632x_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6321_ops = {</div><div class='ctx'> 	/* MV88E6XXX_FAMILY_6320 */</div><div class='add'>+	.setup_errata = mv88e6320_setup_errata,</div><div class='ctx'> 	.ieee_pri_map = mv88e6085_g1_ieee_pri_map,</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6320_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6320_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='add'>+	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='del'>-	.vtu_getnext = mv88e6185_g1_vtu_getnext,</div><div class='del'>-	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,</div><div class='add'>+	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='add'>+	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6352_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e632x_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6341_ops = {</div><div class='hunk'>@@ -3583,42 +5271,61 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6341_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6341_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6341_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_set_cmode = mv88e6341_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='del'>-	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='add'>+	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu =  mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6341_serdes_power,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6341_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6390_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6341_phylink_validate,</div><div class='add'>+	.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='add'>+	.phylink_get_caps = mv88e6341_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6350_ops = {</div><div class='hunk'>@@ -3627,37 +5334,44 @@ static const struct mv88e6xxx_ops mv88e6350_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.phylink_get_caps = mv88e6351_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6351_ops = {</div><div class='hunk'>@@ -3666,39 +5380,46 @@ static const struct mv88e6xxx_ops mv88e6351_ops = {</div><div class='ctx'> 	.ip_pri_map = mv88e6085_g1_ip_pri_map,</div><div class='ctx'> 	.irl_init_all = mv88e6352_g2_irl_init_all,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6185_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6185_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6352_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6185_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6351_phylink_get_caps,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6352_ops = {</div><div class='hunk'>@@ -3709,47 +5430,60 @@ static const struct mv88e6xxx_ops mv88e6352_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom16,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom16,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6352_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6352_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6352_port_set_speed_duplex,</div><div class='ctx'> 	.port_tag_remap = mv88e6095_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6097_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_setup_leds = mv88e6xxx_port_setup_leds,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6320_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6095_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6095_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6095_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6095_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6095_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6095_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6097_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6352_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6352_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6352_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6352_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6352_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6352_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6352_g1_stu_loadpurge,</div><div class='add'>+	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6352_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='ctx'> 	.serdes_get_sset_count = mv88e6352_serdes_get_sset_count,</div><div class='ctx'> 	.serdes_get_strings = mv88e6352_serdes_get_strings,</div><div class='ctx'> 	.serdes_get_stats = mv88e6352_serdes_get_stats,</div><div class='del'>-	.phylink_validate = mv88e6352_phylink_validate,</div><div class='add'>+	.serdes_get_regs_len = mv88e6352_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6352_serdes_get_regs,</div><div class='add'>+	.serdes_set_tx_amplitude = mv88e6352_serdes_set_tx_amplitude,</div><div class='add'>+	.phylink_get_caps = mv88e6352_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6352_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6390_ops = {</div><div class='hunk'>@@ -3759,46 +5493,61 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6390_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6390_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6390_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='ctx'> 	.port_set_cmode = mv88e6390_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6390_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6390_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6390_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6390_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6390_avb_ops,</div><div class='del'>-	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6390_phylink_validate,</div><div class='add'>+	.ptp_ops = &amp;mv88e6390_ptp_ops,</div><div class='add'>+	.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='add'>+	.phylink_get_caps = mv88e6390_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_ops mv88e6390x_ops = {</div><div class='hunk'>@@ -3808,57 +5557,183 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {</div><div class='ctx'> 	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='ctx'> 	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='ctx'> 	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='del'>-	.phy_read = mv88e6xxx_g2_smi_phy_read,</div><div class='del'>-	.phy_write = mv88e6xxx_g2_smi_phy_write,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='ctx'> 	.port_set_link = mv88e6xxx_port_set_link,</div><div class='del'>-	.port_set_duplex = mv88e6xxx_port_set_duplex,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='ctx'> 	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='del'>-	.port_set_speed = mv88e6390x_port_set_speed,</div><div class='add'>+	.port_set_speed_duplex = mv88e6390x_port_set_speed_duplex,</div><div class='ctx'> 	.port_max_speed_mode = mv88e6390x_port_max_speed_mode,</div><div class='ctx'> 	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6352_port_set_policy,</div><div class='ctx'> 	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='del'>-	.port_set_egress_floods = mv88e6352_port_set_egress_floods,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='ctx'> 	.port_set_ether_type = mv88e6351_port_set_ether_type,</div><div class='ctx'> 	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='ctx'> 	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='ctx'> 	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='ctx'> 	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='ctx'> 	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='del'>-	.port_link_state = mv88e6352_port_link_state,</div><div class='ctx'> 	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='ctx'> 	.port_set_cmode = mv88e6390x_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='ctx'> 	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='ctx'> 	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='ctx'> 	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='ctx'> 	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='del'>-	.stats_get_stats = mv88e6390_stats_get_stats,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='ctx'> 	.set_cpu_port = mv88e6390_g1_set_cpu_port,</div><div class='ctx'> 	.set_egress_port = mv88e6390_g1_set_egress_port,</div><div class='ctx'> 	.watchdog_ops = &amp;mv88e6390_watchdog_ops,</div><div class='ctx'> 	.mgmt_rsvd2cpu = mv88e6390_g1_mgmt_rsvd2cpu,</div><div class='ctx'> 	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.reset = mv88e6352_g1_reset,</div><div class='add'>+	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='add'>+	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='add'>+	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6390x_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='add'>+	.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,</div><div class='add'>+	.serdes_get_strings = mv88e6390_serdes_get_strings,</div><div class='add'>+	.serdes_get_stats = mv88e6390_serdes_get_stats,</div><div class='add'>+	.serdes_get_regs_len = mv88e6390_serdes_get_regs_len,</div><div class='add'>+	.serdes_get_regs = mv88e6390_serdes_get_regs,</div><div class='add'>+	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='add'>+	.avb_ops = &amp;mv88e6390_avb_ops,</div><div class='add'>+	.ptp_ops = &amp;mv88e6390_ptp_ops,</div><div class='add'>+	.phylink_get_caps = mv88e6390x_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6390_pcs_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mv88e6xxx_ops mv88e6393x_ops = {</div><div class='add'>+	/* MV88E6XXX_FAMILY_6393 */</div><div class='add'>+	.irl_init_all = mv88e6390_g2_irl_init_all,</div><div class='add'>+	.get_eeprom = mv88e6xxx_g2_get_eeprom8,</div><div class='add'>+	.set_eeprom = mv88e6xxx_g2_set_eeprom8,</div><div class='add'>+	.set_switch_mac = mv88e6xxx_g2_set_switch_mac,</div><div class='add'>+	.phy_read = mv88e6xxx_g2_smi_phy_read_c22,</div><div class='add'>+	.phy_write = mv88e6xxx_g2_smi_phy_write_c22,</div><div class='add'>+	.phy_read_c45 = mv88e6xxx_g2_smi_phy_read_c45,</div><div class='add'>+	.phy_write_c45 = mv88e6xxx_g2_smi_phy_write_c45,</div><div class='add'>+	.port_set_link = mv88e6xxx_port_set_link,</div><div class='add'>+	.port_sync_link = mv88e6xxx_port_sync_link,</div><div class='add'>+	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,</div><div class='add'>+	.port_set_speed_duplex = mv88e6393x_port_set_speed_duplex,</div><div class='add'>+	.port_max_speed_mode = mv88e6393x_port_max_speed_mode,</div><div class='add'>+	.port_tag_remap = mv88e6390_port_tag_remap,</div><div class='add'>+	.port_set_policy = mv88e6393x_port_set_policy,</div><div class='add'>+	.port_set_frame_mode = mv88e6351_port_set_frame_mode,</div><div class='add'>+	.port_set_ucast_flood = mv88e6352_port_set_ucast_flood,</div><div class='add'>+	.port_set_mcast_flood = mv88e6352_port_set_mcast_flood,</div><div class='add'>+	.port_set_ether_type = mv88e6393x_port_set_ether_type,</div><div class='add'>+	.port_set_jumbo_size = mv88e6165_port_set_jumbo_size,</div><div class='add'>+	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,</div><div class='add'>+	.port_pause_limit = mv88e6390_port_pause_limit,</div><div class='add'>+	.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,</div><div class='add'>+	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,</div><div class='add'>+	.port_get_cmode = mv88e6352_port_get_cmode,</div><div class='add'>+	.port_set_cmode = mv88e6393x_port_set_cmode,</div><div class='add'>+	.port_setup_message_port = mv88e6xxx_setup_message_port,</div><div class='add'>+	.port_set_upstream_port = mv88e6393x_port_set_upstream_port,</div><div class='add'>+	.stats_snapshot = mv88e6390_g1_stats_snapshot,</div><div class='add'>+	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,</div><div class='add'>+	.stats_get_sset_count = mv88e6320_stats_get_sset_count,</div><div class='add'>+	.stats_get_strings = mv88e6320_stats_get_strings,</div><div class='add'>+	.stats_get_stat = mv88e6390_stats_get_stat,</div><div class='add'>+	/* .set_cpu_port is missing because this family does not support a global</div><div class='add'>+	 * CPU port, only per port CPU port which is set via</div><div class='add'>+	 * .port_set_upstream_port method.</div><div class='add'>+	 */</div><div class='add'>+	.set_egress_port = mv88e6393x_set_egress_port,</div><div class='add'>+	.watchdog_ops = &amp;mv88e6393x_watchdog_ops,</div><div class='add'>+	.mgmt_rsvd2cpu = mv88e6393x_port_mgmt_rsvd2cpu,</div><div class='add'>+	.pot_clear = mv88e6xxx_g2_pot_clear,</div><div class='add'>+	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,</div><div class='add'>+	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,</div><div class='ctx'> 	.reset = mv88e6352_g1_reset,</div><div class='ctx'> 	.rmu_disable = mv88e6390_g1_rmu_disable,</div><div class='add'>+	.atu_get_hash = mv88e6165_g1_atu_get_hash,</div><div class='add'>+	.atu_set_hash = mv88e6165_g1_atu_set_hash,</div><div class='ctx'> 	.vtu_getnext = mv88e6390_g1_vtu_getnext,</div><div class='ctx'> 	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,</div><div class='del'>-	.serdes_power = mv88e6390x_serdes_power,</div><div class='del'>-	.serdes_irq_setup = mv88e6390x_serdes_irq_setup,</div><div class='del'>-	.serdes_irq_free = mv88e6390x_serdes_irq_free,</div><div class='add'>+	.stu_getnext = mv88e6390_g1_stu_getnext,</div><div class='add'>+	.stu_loadpurge = mv88e6390_g1_stu_loadpurge,</div><div class='add'>+	.serdes_get_lane = mv88e6393x_serdes_get_lane,</div><div class='add'>+	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,</div><div class='add'>+	/* TODO: serdes stats */</div><div class='ctx'> 	.gpio_ops = &amp;mv88e6352_gpio_ops,</div><div class='ctx'> 	.avb_ops = &amp;mv88e6390_avb_ops,</div><div class='ctx'> 	.ptp_ops = &amp;mv88e6352_ptp_ops,</div><div class='del'>-	.phylink_validate = mv88e6390x_phylink_validate,</div><div class='add'>+	.phylink_get_caps = mv88e6393x_phylink_get_caps,</div><div class='add'>+	.pcs_ops = &amp;mv88e6393x_pcs_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='add'>+	[MV88E6020] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6020,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6250,</div><div class='add'>+		.name = "Marvell 88E6020",</div><div class='add'>+		.num_databases = 64,</div><div class='add'>+		/* Ports 2-4 are not routed to pins</div><div class='add'>+		 * =&gt; usable ports 0, 1, 5, 6</div><div class='add'>+		 */</div><div class='add'>+		.num_ports = 7,</div><div class='add'>+		.num_internal_phys = 2,</div><div class='add'>+		.invalid_port_mask = BIT(2) | BIT(3) | BIT(4),</div><div class='add'>+		.max_vid = 4095,</div><div class='add'>+		.port_base_addr = 0x8,</div><div class='add'>+		.phy_base_addr = 0x0,</div><div class='add'>+		.global1_addr = 0xf,</div><div class='add'>+		.global2_addr = 0x7,</div><div class='add'>+		.age_time_coeff = 15000,</div><div class='add'>+		.g1_irqs = 9,</div><div class='add'>+		.g2_irqs = 5,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0,</div><div class='add'>+		.atu_move_port_mask = 0xf,</div><div class='add'>+		.dual_chip = true,</div><div class='add'>+		.ops = &amp;mv88e6250_ops,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[MV88E6071] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6071,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6250,</div><div class='add'>+		.name = "Marvell 88E6071",</div><div class='add'>+		.num_databases = 64,</div><div class='add'>+		.num_ports = 7,</div><div class='add'>+		.num_internal_phys = 5,</div><div class='add'>+		.max_vid = 4095,</div><div class='add'>+		.port_base_addr = 0x08,</div><div class='add'>+		.phy_base_addr = 0x00,</div><div class='add'>+		.global1_addr = 0x0f,</div><div class='add'>+		.global2_addr = 0x07,</div><div class='add'>+		.age_time_coeff = 15000,</div><div class='add'>+		.g1_irqs = 9,</div><div class='add'>+		.g2_irqs = 5,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0,</div><div class='add'>+		.atu_move_port_mask = 0xf,</div><div class='add'>+		.dual_chip = true,</div><div class='add'>+		.ops = &amp;mv88e6250_ops,</div><div class='add'>+	},</div><div class='add'>+</div><div class='ctx'> 	[MV88E6085] = {</div><div class='ctx'> 		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6085,</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6097,</div><div class='ctx'> 		.name = "Marvell 88E6085",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 10,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -3866,10 +5741,10 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 8,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ops = &amp;mv88e6085_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -3878,6 +5753,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6095,</div><div class='ctx'> 		.name = "Marvell 88E6095/88E6095F",</div><div class='ctx'> 		.num_databases = 256,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 11,</div><div class='ctx'> 		.num_internal_phys = 0,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='hunk'>@@ -3887,9 +5763,9 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.global2_addr = 0x1c,</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 8,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ops = &amp;mv88e6095_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -3898,9 +5774,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6097,</div><div class='ctx'> 		.name = "Marvell 88E6097/88E6097F",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 11,</div><div class='ctx'> 		.num_internal_phys = 8,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -3908,10 +5786,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 8,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6097_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -3920,9 +5799,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6165,</div><div class='ctx'> 		.name = "Marvell 88E6123",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 1024,</div><div class='ctx'> 		.num_ports = 3,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -3930,10 +5811,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6123_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -3942,6 +5824,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6185,</div><div class='ctx'> 		.name = "Marvell 88E6131",</div><div class='ctx'> 		.num_databases = 256,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 8,</div><div class='ctx'> 		.num_internal_phys = 0,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='hunk'>@@ -3951,9 +5834,9 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.global2_addr = 0x1c,</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ops = &amp;mv88e6131_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -3961,22 +5844,25 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6141,</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6341,</div><div class='ctx'> 		.name = "Marvell 88E6141",</div><div class='del'>-		.num_databases = 4096,</div><div class='add'>+		.num_databases = 256,</div><div class='add'>+		.num_macs = 2048,</div><div class='ctx'> 		.num_ports = 6,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.num_gpio = 11,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x10,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='ctx'> 		.global2_addr = 0x1c,</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='del'>-		.atu_move_port_mask = 0x1f,</div><div class='add'>+		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6141_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -3985,9 +5871,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6165,</div><div class='ctx'> 		.name = "Marvell 88E6161",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 1024,</div><div class='ctx'> 		.num_ports = 6,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -3995,10 +5883,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6161_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4008,9 +5897,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6165,</div><div class='ctx'> 		.name = "Marvell 88E6165",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 6,</div><div class='ctx'> 		.num_internal_phys = 0,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4018,10 +5909,10 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6165_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4031,9 +5922,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6351,</div><div class='ctx'> 		.name = "Marvell 88E6171",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4041,10 +5934,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6171_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4053,10 +5947,12 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6352,</div><div class='ctx'> 		.name = "Marvell 88E6172",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.num_gpio = 15,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4064,10 +5960,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6172_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4076,9 +5973,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6351,</div><div class='ctx'> 		.name = "Marvell 88E6175",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4086,10 +5985,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6175_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4098,10 +5998,12 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6352,</div><div class='ctx'> 		.name = "Marvell 88E6176",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.num_gpio = 15,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4109,10 +6011,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6176_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4121,6 +6024,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6185,</div><div class='ctx'> 		.name = "Marvell 88E6185",</div><div class='ctx'> 		.num_databases = 256,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 10,</div><div class='ctx'> 		.num_internal_phys = 0,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='hunk'>@@ -4130,9 +6034,10 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.global2_addr = 0x1c,</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 8,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6185_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4141,18 +6046,20 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6390,</div><div class='ctx'> 		.name = "Marvell 88E6190",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 16384,</div><div class='ctx'> 		.num_ports = 11,	/* 10 + Z80 */</div><div class='ctx'> 		.num_internal_phys = 9,</div><div class='ctx'> 		.num_gpio = 16,</div><div class='ctx'> 		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x0,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='ctx'> 		.global2_addr = 0x1c,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='ctx'> 		.atu_move_port_mask = 0x1f,</div><div class='hunk'>@@ -4164,10 +6071,12 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6390,</div><div class='ctx'> 		.name = "Marvell 88E6190X",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 16384,</div><div class='ctx'> 		.num_ports = 11,	/* 10 + Z80 */</div><div class='ctx'> 		.num_internal_phys = 9,</div><div class='ctx'> 		.num_gpio = 16,</div><div class='ctx'> 		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x0,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4175,10 +6084,10 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0x1f,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ops = &amp;mv88e6190x_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4187,9 +6096,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6390,</div><div class='ctx'> 		.name = "Marvell 88E6191",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 16384,</div><div class='ctx'> 		.num_ports = 11,	/* 10 + Z80 */</div><div class='ctx'> 		.num_internal_phys = 9,</div><div class='ctx'> 		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x0,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4197,23 +6108,102 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0x1f,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6191_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='add'>+	[MV88E6191X] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6191X,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6393,</div><div class='add'>+		.name = "Marvell 88E6191X",</div><div class='add'>+		.num_databases = 4096,</div><div class='add'>+		.num_ports = 11,	/* 10 + Z80 */</div><div class='add'>+		.num_internal_phys = 8,</div><div class='add'>+		.internal_phys_offset = 1,</div><div class='add'>+		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='add'>+		.port_base_addr = 0x0,</div><div class='add'>+		.phy_base_addr = 0x0,</div><div class='add'>+		.global1_addr = 0x1b,</div><div class='add'>+		.global2_addr = 0x1c,</div><div class='add'>+		.age_time_coeff = 3750,</div><div class='add'>+		.g1_irqs = 10,</div><div class='add'>+		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='add'>+		.atu_move_port_mask = 0x1f,</div><div class='add'>+		.pvt = true,</div><div class='add'>+		.multi_chip = true,</div><div class='add'>+		.ptp_support = true,</div><div class='add'>+		.ops = &amp;mv88e6393x_ops,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[MV88E6193X] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6193X,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6393,</div><div class='add'>+		.name = "Marvell 88E6193X",</div><div class='add'>+		.num_databases = 4096,</div><div class='add'>+		.num_ports = 11,	/* 10 + Z80 */</div><div class='add'>+		.num_internal_phys = 8,</div><div class='add'>+		.internal_phys_offset = 1,</div><div class='add'>+		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='add'>+		.port_base_addr = 0x0,</div><div class='add'>+		.phy_base_addr = 0x0,</div><div class='add'>+		.global1_addr = 0x1b,</div><div class='add'>+		.global2_addr = 0x1c,</div><div class='add'>+		.age_time_coeff = 3750,</div><div class='add'>+		.g1_irqs = 10,</div><div class='add'>+		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='add'>+		.atu_move_port_mask = 0x1f,</div><div class='add'>+		.pvt = true,</div><div class='add'>+		.multi_chip = true,</div><div class='add'>+		.ptp_support = true,</div><div class='add'>+		.ops = &amp;mv88e6393x_ops,</div><div class='add'>+	},</div><div class='add'>+</div><div class='add'>+	[MV88E6220] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6220,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6250,</div><div class='add'>+		.name = "Marvell 88E6220",</div><div class='add'>+		.num_databases = 64,</div><div class='add'>+</div><div class='add'>+		/* Ports 2-4 are not routed to pins</div><div class='add'>+		 * =&gt; usable ports 0, 1, 5, 6</div><div class='add'>+		 */</div><div class='add'>+		.num_ports = 7,</div><div class='add'>+		.num_internal_phys = 2,</div><div class='add'>+		.invalid_port_mask = BIT(2) | BIT(3) | BIT(4),</div><div class='add'>+		.max_vid = 4095,</div><div class='add'>+		.port_base_addr = 0x08,</div><div class='add'>+		.phy_base_addr = 0x00,</div><div class='add'>+		.global1_addr = 0x0f,</div><div class='add'>+		.global2_addr = 0x07,</div><div class='add'>+		.age_time_coeff = 15000,</div><div class='add'>+		.g1_irqs = 9,</div><div class='add'>+		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0,</div><div class='add'>+		.atu_move_port_mask = 0xf,</div><div class='add'>+		.dual_chip = true,</div><div class='add'>+		.ptp_support = true,</div><div class='add'>+		.ops = &amp;mv88e6250_ops,</div><div class='add'>+	},</div><div class='add'>+</div><div class='ctx'> 	[MV88E6240] = {</div><div class='ctx'> 		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6240,</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6352,</div><div class='ctx'> 		.name = "Marvell 88E6240",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.num_gpio = 15,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4221,14 +6211,37 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6240_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='add'>+	[MV88E6250] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6250,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6250,</div><div class='add'>+		.name = "Marvell 88E6250",</div><div class='add'>+		.num_databases = 64,</div><div class='add'>+		.num_ports = 7,</div><div class='add'>+		.num_internal_phys = 5,</div><div class='add'>+		.max_vid = 4095,</div><div class='add'>+		.port_base_addr = 0x08,</div><div class='add'>+		.phy_base_addr = 0x00,</div><div class='add'>+		.global1_addr = 0x0f,</div><div class='add'>+		.global2_addr = 0x07,</div><div class='add'>+		.age_time_coeff = 15000,</div><div class='add'>+		.g1_irqs = 9,</div><div class='add'>+		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0,</div><div class='add'>+		.atu_move_port_mask = 0xf,</div><div class='add'>+		.dual_chip = true,</div><div class='add'>+		.ptp_support = true,</div><div class='add'>+		.ops = &amp;mv88e6250_ops,</div><div class='add'>+	},</div><div class='add'>+</div><div class='ctx'> 	[MV88E6290] = {</div><div class='ctx'> 		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6290,</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6390,</div><div class='hunk'>@@ -4238,6 +6251,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.num_internal_phys = 9,</div><div class='ctx'> 		.num_gpio = 16,</div><div class='ctx'> 		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x0,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4245,10 +6259,10 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0x1f,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6290_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4258,10 +6272,13 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6320,</div><div class='ctx'> 		.name = "Marvell 88E6320",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='del'>-		.num_internal_phys = 5,</div><div class='add'>+		.num_internal_phys = 2,</div><div class='add'>+		.internal_phys_offset = 3,</div><div class='ctx'> 		.num_gpio = 15,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4269,10 +6286,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 8,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6320_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4282,10 +6300,13 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6320,</div><div class='ctx'> 		.name = "Marvell 88E6321",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='del'>-		.num_internal_phys = 5,</div><div class='add'>+		.num_internal_phys = 2,</div><div class='add'>+		.internal_phys_offset = 3,</div><div class='ctx'> 		.num_gpio = 15,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4293,9 +6314,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 8,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='add'>+		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6321_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4304,22 +6327,25 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6341,</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6341,</div><div class='ctx'> 		.name = "Marvell 88E6341",</div><div class='del'>-		.num_databases = 4096,</div><div class='add'>+		.num_databases = 256,</div><div class='add'>+		.num_macs = 2048,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.num_ports = 6,</div><div class='ctx'> 		.num_gpio = 11,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x10,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='ctx'> 		.global2_addr = 0x1c,</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='del'>-		.atu_move_port_mask = 0x1f,</div><div class='add'>+		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6341_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4329,9 +6355,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6351,</div><div class='ctx'> 		.name = "Marvell 88E6350",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4339,10 +6367,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6350_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4351,9 +6380,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6351,</div><div class='ctx'> 		.name = "Marvell 88E6351",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4361,10 +6392,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ops = &amp;mv88e6351_ops,</div><div class='ctx'> 	},</div><div class='ctx'> </div><div class='hunk'>@@ -4373,10 +6405,12 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6352,</div><div class='ctx'> 		.name = "Marvell 88E6352",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 8192,</div><div class='ctx'> 		.num_ports = 7,</div><div class='ctx'> 		.num_internal_phys = 5,</div><div class='ctx'> 		.num_gpio = 15,</div><div class='ctx'> 		.max_vid = 4095,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x10,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4384,22 +6418,52 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 15000,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 10,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_PORT,</div><div class='ctx'> 		.atu_move_port_mask = 0xf,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_EDSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6352_ops,</div><div class='ctx'> 	},</div><div class='add'>+	[MV88E6361] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6361,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6393,</div><div class='add'>+		.name = "Marvell 88E6361",</div><div class='add'>+		.num_databases = 4096,</div><div class='add'>+		.num_macs = 16384,</div><div class='add'>+		.num_ports = 11,</div><div class='add'>+		/* Ports 1, 2 and 8 are not routed */</div><div class='add'>+		.invalid_port_mask = BIT(1) | BIT(2) | BIT(8),</div><div class='add'>+		.num_internal_phys = 5,</div><div class='add'>+		.internal_phys_offset = 3,</div><div class='add'>+		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='add'>+		.port_base_addr = 0x0,</div><div class='add'>+		.phy_base_addr = 0x0,</div><div class='add'>+		.global1_addr = 0x1b,</div><div class='add'>+		.global2_addr = 0x1c,</div><div class='add'>+		.age_time_coeff = 3750,</div><div class='add'>+		.g1_irqs = 10,</div><div class='add'>+		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='add'>+		.atu_move_port_mask = 0x1f,</div><div class='add'>+		.pvt = true,</div><div class='add'>+		.multi_chip = true,</div><div class='add'>+		.ptp_support = true,</div><div class='add'>+		.ops = &amp;mv88e6393x_ops,</div><div class='add'>+	},</div><div class='ctx'> 	[MV88E6390] = {</div><div class='ctx'> 		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6390,</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6390,</div><div class='ctx'> 		.name = "Marvell 88E6390",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 16384,</div><div class='ctx'> 		.num_ports = 11,	/* 10 + Z80 */</div><div class='ctx'> 		.num_internal_phys = 9,</div><div class='ctx'> 		.num_gpio = 16,</div><div class='ctx'> 		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x0,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4407,10 +6471,11 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0x1f,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_UNDOCUMENTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6390_ops,</div><div class='ctx'> 	},</div><div class='hunk'>@@ -4419,10 +6484,12 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.family = MV88E6XXX_FAMILY_6390,</div><div class='ctx'> 		.name = "Marvell 88E6390X",</div><div class='ctx'> 		.num_databases = 4096,</div><div class='add'>+		.num_macs = 16384,</div><div class='ctx'> 		.num_ports = 11,	/* 10 + Z80 */</div><div class='ctx'> 		.num_internal_phys = 9,</div><div class='ctx'> 		.num_gpio = 16,</div><div class='ctx'> 		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='ctx'> 		.port_base_addr = 0x0,</div><div class='ctx'> 		.phy_base_addr = 0x0,</div><div class='ctx'> 		.global1_addr = 0x1b,</div><div class='hunk'>@@ -4430,13 +6497,39 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {</div><div class='ctx'> 		.age_time_coeff = 3750,</div><div class='ctx'> 		.g1_irqs = 9,</div><div class='ctx'> 		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='ctx'> 		.atu_move_port_mask = 0x1f,</div><div class='ctx'> 		.pvt = true,</div><div class='ctx'> 		.multi_chip = true,</div><div class='del'>-		.tag_protocol = DSA_TAG_PROTO_DSA,</div><div class='add'>+		.edsa_support = MV88E6XXX_EDSA_UNDOCUMENTED,</div><div class='ctx'> 		.ptp_support = true,</div><div class='ctx'> 		.ops = &amp;mv88e6390x_ops,</div><div class='ctx'> 	},</div><div class='add'>+</div><div class='add'>+	[MV88E6393X] = {</div><div class='add'>+		.prod_num = MV88E6XXX_PORT_SWITCH_ID_PROD_6393X,</div><div class='add'>+		.family = MV88E6XXX_FAMILY_6393,</div><div class='add'>+		.name = "Marvell 88E6393X",</div><div class='add'>+		.num_databases = 4096,</div><div class='add'>+		.num_ports = 11,	/* 10 + Z80 */</div><div class='add'>+		.num_internal_phys = 8,</div><div class='add'>+		.internal_phys_offset = 1,</div><div class='add'>+		.max_vid = 8191,</div><div class='add'>+		.max_sid = 63,</div><div class='add'>+		.port_base_addr = 0x0,</div><div class='add'>+		.phy_base_addr = 0x0,</div><div class='add'>+		.global1_addr = 0x1b,</div><div class='add'>+		.global2_addr = 0x1c,</div><div class='add'>+		.age_time_coeff = 3750,</div><div class='add'>+		.g1_irqs = 10,</div><div class='add'>+		.g2_irqs = 14,</div><div class='add'>+		.stats_type = STATS_TYPE_BANK0 | STATS_TYPE_BANK1,</div><div class='add'>+		.atu_move_port_mask = 0x1f,</div><div class='add'>+		.pvt = true,</div><div class='add'>+		.multi_chip = true,</div><div class='add'>+		.ptp_support = true,</div><div class='add'>+		.ops = &amp;mv88e6393x_ops,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct mv88e6xxx_info *mv88e6xxx_lookup_info(unsigned int prod_num)</div><div class='hunk'>@@ -4457,9 +6550,9 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	u16 id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_port_read(chip, 0, MV88E6XXX_PORT_SWITCH_ID, &amp;id);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4473,16 +6566,38 @@ static int mv88e6xxx_detect(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	/* Update the compatible info with the probed one */</div><div class='ctx'> 	chip-&gt;info = info;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g2_require(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	dev_info(chip-&gt;dev, "switch 0x%x detected: %s, revision %u\n",</div><div class='ctx'> 		 chip-&gt;info-&gt;prod_num, chip-&gt;info-&gt;name, rev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mv88e6xxx_single_chip_detect(struct mv88e6xxx_chip *chip,</div><div class='add'>+					struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* dual_chip takes precedence over single/multi-chip modes */</div><div class='add'>+	if (chip-&gt;info-&gt;dual_chip)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the mdio addr is 16 indicating the first port address of a switch</div><div class='add'>+	 * (e.g. mv88e6*41) in single chip addressing mode the device may be</div><div class='add'>+	 * configured in single chip addressing mode. Setup the smi access as</div><div class='add'>+	 * single chip addressing mode and attempt to detect the model of the</div><div class='add'>+	 * switch, if this fails the device is not configured in single chip</div><div class='add'>+	 * addressing mode.</div><div class='add'>+	 */</div><div class='add'>+	if (mdiodev-&gt;addr != 16)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_smi_init(chip, mdiodev-&gt;bus, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_detect(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip;</div><div class='hunk'>@@ -4495,108 +6610,597 @@ static struct mv88e6xxx_chip *mv88e6xxx_alloc_chip(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;chip-&gt;reg_lock);</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;chip-&gt;mdios);</div><div class='add'>+	idr_init(&amp;chip-&gt;policies);</div><div class='add'>+	INIT_LIST_HEAD(&amp;chip-&gt;msts);</div><div class='ctx'> </div><div class='ctx'> 	return chip;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-							int port)</div><div class='add'>+							int port,</div><div class='add'>+							enum dsa_tag_protocol m)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	return chip-&gt;info-&gt;tag_protocol;</div><div class='add'>+	return chip-&gt;tag_protocol;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_port_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-				      const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+static int mv88e6xxx_change_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+					 enum dsa_tag_protocol proto)</div><div class='ctx'> {</div><div class='del'>-	/* We don't need any dynamic resource from the kernel (yet),</div><div class='del'>-	 * so skip the prepare phase.</div><div class='del'>-	 */</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	enum dsa_tag_protocol old_protocol;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case DSA_TAG_PROTO_EDSA:</div><div class='add'>+		switch (chip-&gt;info-&gt;edsa_support) {</div><div class='add'>+		case MV88E6XXX_EDSA_UNSUPPORTED:</div><div class='add'>+			return -EPROTONOSUPPORT;</div><div class='add'>+		case MV88E6XXX_EDSA_UNDOCUMENTED:</div><div class='add'>+			dev_warn(chip-&gt;dev, "Relying on undocumented EDSA tagging behavior\n");</div><div class='add'>+			fallthrough;</div><div class='add'>+		case MV88E6XXX_EDSA_SUPPORTED:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case DSA_TAG_PROTO_DSA:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_protocol = chip-&gt;tag_protocol;</div><div class='add'>+	chip-&gt;tag_protocol = proto;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		err = mv88e6xxx_setup_port_mode(chip, cpu_dp-&gt;index);</div><div class='add'>+		if (err) {</div><div class='add'>+			mv88e6xxx_reg_unlock(chip);</div><div class='add'>+			goto unwind;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+unwind:</div><div class='add'>+	chip-&gt;tag_protocol = old_protocol;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	dsa_switch_for_each_cpu_port_continue_reverse(cpu_dp, ds)</div><div class='add'>+		mv88e6xxx_setup_port_mode(chip, cpu_dp-&gt;index);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6xxx_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-				   const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+static int mv88e6xxx_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+				  const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				  struct dsa_db db)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (mv88e6xxx_port_db_load_purge(chip, port, mdb-&gt;addr, mdb-&gt;vid,</div><div class='del'>-					 MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC))</div><div class='del'>-		dev_err(ds-&gt;dev, "p%d: failed to load multicast MAC address\n",</div><div class='del'>-			port);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_db_load_purge(chip, port, mdb-&gt;addr, mdb-&gt;vid,</div><div class='add'>+					   MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_port_db_find(chip, mdb-&gt;addr, mdb-&gt;vid))</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-				  const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+				  const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+				  struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_db_load_purge(chip, port, mdb-&gt;addr, mdb-&gt;vid, 0);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+				     bool ingress,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	enum mv88e6xxx_egress_direction direction = ingress ?</div><div class='add'>+						MV88E6XXX_EGRESS_DIR_INGRESS :</div><div class='add'>+						MV88E6XXX_EGRESS_DIR_EGRESS;</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	bool other_mirrors = false;</div><div class='add'>+	int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_port_db_load_purge(chip, port, mdb-&gt;addr, mdb-&gt;vid,</div><div class='del'>-					   MV88E6XXX_G1_ATU_DATA_STATE_UNUSED);</div><div class='add'>+	if ((ingress ? chip-&gt;ingress_dest_port : chip-&gt;egress_dest_port) !=</div><div class='add'>+	    mirror-&gt;to_local_port) {</div><div class='add'>+		for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++)</div><div class='add'>+			other_mirrors |= ingress ?</div><div class='add'>+					 chip-&gt;ports[i].mirror_ingress :</div><div class='add'>+					 chip-&gt;ports[i].mirror_egress;</div><div class='add'>+</div><div class='add'>+		/* Can't change egress port when other mirror is active */</div><div class='add'>+		if (other_mirrors) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_set_egress_port(chip, direction,</div><div class='add'>+						mirror-&gt;to_local_port);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_set_mirror(chip, port, direction, true);</div><div class='add'>+out:</div><div class='ctx'> 	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,</div><div class='del'>-					 bool unicast, bool multicast)</div><div class='add'>+static void mv88e6xxx_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+				      struct dsa_mall_mirror_tc_entry *mirror)</div><div class='ctx'> {</div><div class='add'>+	enum mv88e6xxx_egress_direction direction = mirror-&gt;ingress ?</div><div class='add'>+						MV88E6XXX_EGRESS_DIR_INGRESS :</div><div class='add'>+						MV88E6XXX_EGRESS_DIR_EGRESS;</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='del'>-	int err = -EOPNOTSUPP;</div><div class='add'>+	bool other_mirrors = false;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	if (chip-&gt;info-&gt;ops-&gt;port_set_egress_floods)</div><div class='del'>-		err = chip-&gt;info-&gt;ops-&gt;port_set_egress_floods(chip, port,</div><div class='del'>-							      unicast,</div><div class='del'>-							      multicast);</div><div class='add'>+	if (mv88e6xxx_port_set_mirror(chip, port, direction, false))</div><div class='add'>+		dev_err(ds-&gt;dev, "p%d: failed to disable mirroring\n", port);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); i++)</div><div class='add'>+		other_mirrors |= mirror-&gt;ingress ?</div><div class='add'>+				 chip-&gt;ports[i].mirror_ingress :</div><div class='add'>+				 chip-&gt;ports[i].mirror_egress;</div><div class='add'>+</div><div class='add'>+	/* Reset egress port when no other mirror is active */</div><div class='add'>+	if (!other_mirrors) {</div><div class='add'>+		if (mv88e6xxx_set_egress_port(chip, direction,</div><div class='add'>+					      dsa_upstream_port(ds, port)))</div><div class='add'>+			dev_err(ds-&gt;dev, "failed to set egress port\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+					   struct switchdev_brport_flags flags,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	const struct mv88e6xxx_ops *ops;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |</div><div class='add'>+			   BR_BCAST_FLOOD | BR_PORT_LOCKED | BR_PORT_MAB))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ops = chip-&gt;info-&gt;ops;</div><div class='add'>+</div><div class='add'>+	if ((flags.mask &amp; BR_FLOOD) &amp;&amp; !ops-&gt;port_set_ucast_flood)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if ((flags.mask &amp; BR_MCAST_FLOOD) &amp;&amp; !ops-&gt;port_set_mcast_flood)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct switchdev_brport_flags flags,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		bool learning = !!(flags.val &amp; BR_LEARNING);</div><div class='add'>+		u16 pav = learning ? (1 &lt;&lt; port) : 0;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_port_set_assoc_vector(chip, port, pav);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD) {</div><div class='add'>+		bool unicast = !!(flags.val &amp; BR_FLOOD);</div><div class='add'>+</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_ucast_flood(chip, port,</div><div class='add'>+							    unicast);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_MCAST_FLOOD) {</div><div class='add'>+		bool multicast = !!(flags.val &amp; BR_MCAST_FLOOD);</div><div class='add'>+</div><div class='add'>+		err = chip-&gt;info-&gt;ops-&gt;port_set_mcast_flood(chip, port,</div><div class='add'>+							    multicast);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_BCAST_FLOOD) {</div><div class='add'>+		bool broadcast = !!(flags.val &amp; BR_BCAST_FLOOD);</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_port_broadcast_sync(chip, port, broadcast);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_PORT_MAB) {</div><div class='add'>+		bool mab = !!(flags.val &amp; BR_PORT_MAB);</div><div class='add'>+</div><div class='add'>+		mv88e6xxx_port_set_mab(chip, port, mab);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_PORT_LOCKED) {</div><div class='add'>+		bool locked = !!(flags.val &amp; BR_PORT_LOCKED);</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_port_set_lock(chip, port, locked);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool mv88e6xxx_lag_can_offload(struct dsa_switch *ds,</div><div class='add'>+				      struct dsa_lag lag,</div><div class='add'>+				      struct netdev_lag_upper_info *info,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int members = 0;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_has_lag(chip)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Chip does not support LAG offload");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!lag.id)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	dsa_lag_foreach_port(dp, ds-&gt;dst, &amp;lag)</div><div class='add'>+		/* Includes the port joining the LAG */</div><div class='add'>+		members++;</div><div class='add'>+</div><div class='add'>+	if (members &gt; 8) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cannot offload more than 8 LAG ports");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We could potentially relax this to include active</div><div class='add'>+	 * backup in the future.</div><div class='add'>+	 */</div><div class='add'>+	if (info-&gt;tx_type != NETDEV_LAG_TX_TYPE_HASH) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only offload LAG using hash TX type");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ideally we would also validate that the hash type matches</div><div class='add'>+	 * the hardware. Alas, this is always set to unknown on team</div><div class='add'>+	 * interfaces.</div><div class='add'>+	 */</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_lag_sync_map(struct dsa_switch *ds, struct dsa_lag lag)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u16 map = 0;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	/* DSA LAG IDs are one-based, hardware is zero-based */</div><div class='add'>+	id = lag.id - 1;</div><div class='add'>+</div><div class='add'>+	/* Build the map of all ports to distribute flows destined for</div><div class='add'>+	 * this LAG. This can be either a local user port, or a DSA</div><div class='add'>+	 * port if the LAG port is on a remote chip.</div><div class='add'>+	 */</div><div class='add'>+	dsa_lag_foreach_port(dp, ds-&gt;dst, &amp;lag)</div><div class='add'>+		map |= BIT(dsa_towards_port(ds, dp-&gt;ds-&gt;index, dp-&gt;index));</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_trunk_mapping_write(chip, id, map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u8 mv88e6xxx_lag_mask_table[8][8] = {</div><div class='add'>+	/* Row number corresponds to the number of active members in a</div><div class='add'>+	 * LAG. Each column states which of the eight hash buckets are</div><div class='add'>+	 * mapped to the column:th port in the LAG.</div><div class='add'>+	 *</div><div class='add'>+	 * Example: In a LAG with three active ports, the second port</div><div class='add'>+	 * ([2][1]) would be selected for traffic mapped to buckets</div><div class='add'>+	 * 3,4,5 (0x38).</div><div class='add'>+	 */</div><div class='add'>+	{ 0xff,    0,    0,    0,    0,    0,    0,    0 },</div><div class='add'>+	{ 0x0f, 0xf0,    0,    0,    0,    0,    0,    0 },</div><div class='add'>+	{ 0x07, 0x38, 0xc0,    0,    0,    0,    0,    0 },</div><div class='add'>+	{ 0x03, 0x0c, 0x30, 0xc0,    0,    0,    0,    0 },</div><div class='add'>+	{ 0x03, 0x0c, 0x30, 0x40, 0x80,    0,    0,    0 },</div><div class='add'>+	{ 0x03, 0x0c, 0x10, 0x20, 0x40, 0x80,    0,    0 },</div><div class='add'>+	{ 0x03, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,    0 },</div><div class='add'>+	{ 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void mv88e6xxx_lag_set_port_mask(u16 *mask, int port,</div><div class='add'>+					int num_tx, int nth)</div><div class='add'>+{</div><div class='add'>+	u8 active = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	num_tx = num_tx &lt;= 8 ? num_tx : 8;</div><div class='add'>+	if (nth &lt; num_tx)</div><div class='add'>+		active = mv88e6xxx_lag_mask_table[num_tx - 1][nth];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		if (BIT(i) &amp; active)</div><div class='add'>+			mask[i] |= BIT(port);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_lag_sync_masks(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	unsigned int id, num_tx;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	struct dsa_lag *lag;</div><div class='add'>+	int i, err, nth;</div><div class='add'>+	u16 mask[8];</div><div class='add'>+	u16 ivec;</div><div class='add'>+</div><div class='add'>+	/* Assume no port is a member of any LAG. */</div><div class='add'>+	ivec = BIT(mv88e6xxx_num_ports(chip)) - 1;</div><div class='add'>+</div><div class='add'>+	/* Disable all masks for ports that _are_ members of a LAG. */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (!dp-&gt;lag)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ivec &amp;= ~BIT(dp-&gt;index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		mask[i] = ivec;</div><div class='add'>+</div><div class='add'>+	/* Enable the correct subset of masks for all LAG ports that</div><div class='add'>+	 * are in the Tx set.</div><div class='add'>+	 */</div><div class='add'>+	dsa_lags_foreach_id(id, ds-&gt;dst) {</div><div class='add'>+		lag = dsa_lag_by_id(ds-&gt;dst, id);</div><div class='add'>+		if (!lag)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		num_tx = 0;</div><div class='add'>+		dsa_lag_foreach_port(dp, ds-&gt;dst, lag) {</div><div class='add'>+			if (dp-&gt;lag_tx_enabled)</div><div class='add'>+				num_tx++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!num_tx)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		nth = 0;</div><div class='add'>+		dsa_lag_foreach_port(dp, ds-&gt;dst, lag) {</div><div class='add'>+			if (!dp-&gt;lag_tx_enabled)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (dp-&gt;ds == ds)</div><div class='add'>+				mv88e6xxx_lag_set_port_mask(mask, dp-&gt;index,</div><div class='add'>+							    num_tx, nth);</div><div class='add'>+</div><div class='add'>+			nth++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		err = mv88e6xxx_g2_trunk_mask_write(chip, i, true, mask[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_lag_sync_masks_map(struct dsa_switch *ds,</div><div class='add'>+					struct dsa_lag lag)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_lag_sync_masks(ds);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		err = mv88e6xxx_lag_sync_map(ds, lag);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_lag_change(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_lag_sync_masks(ds);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_lag_join(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct dsa_lag lag,</div><div class='add'>+				   struct netdev_lag_upper_info *info,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err, id;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_lag_can_offload(ds, lag, info, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* DSA LAG IDs are one-based */</div><div class='add'>+	id = lag.id - 1;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_set_trunk(chip, port, true, id);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_lag_sync_masks_map(ds, lag);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_clear_trunk;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_clear_trunk:</div><div class='add'>+	mv88e6xxx_port_set_trunk(chip, port, false, 0);</div><div class='add'>+err_unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_lag_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct dsa_lag lag)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err_sync, err_trunk;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err_sync = mv88e6xxx_lag_sync_masks_map(ds, lag);</div><div class='add'>+	err_trunk = mv88e6xxx_port_set_trunk(chip, port, false, 0);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return err_sync ? : err_trunk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_crosschip_lag_change(struct dsa_switch *ds, int sw_index,</div><div class='add'>+					  int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_lag_sync_masks(ds);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_crosschip_lag_join(struct dsa_switch *ds, int sw_index,</div><div class='add'>+					int port, struct dsa_lag lag,</div><div class='add'>+					struct netdev_lag_upper_info *info,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!mv88e6xxx_lag_can_offload(ds, lag, info, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_lag_sync_masks_map(ds, lag);</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_pvt_map(chip, sw_index, port);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_crosschip_lag_leave(struct dsa_switch *ds, int sw_index,</div><div class='add'>+					 int port, struct dsa_lag lag)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err_sync, err_pvt;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err_sync = mv88e6xxx_lag_sync_masks_map(ds, lag);</div><div class='add'>+	err_pvt = mv88e6xxx_pvt_map(chip, sw_index, port);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	return err_sync ? : err_pvt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops mv88e6xxx_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs		= mv88e6xxx_mac_select_pcs,</div><div class='add'>+	.mac_prepare		= mv88e6xxx_mac_prepare,</div><div class='add'>+	.mac_config		= mv88e6xxx_mac_config,</div><div class='add'>+	.mac_finish		= mv88e6xxx_mac_finish,</div><div class='add'>+	.mac_link_down		= mv88e6xxx_mac_link_down,</div><div class='add'>+	.mac_link_up		= mv88e6xxx_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops mv88e6xxx_switch_ops = {</div><div class='ctx'> 	.get_tag_protocol	= mv88e6xxx_get_tag_protocol,</div><div class='add'>+	.change_tag_protocol	= mv88e6xxx_change_tag_protocol,</div><div class='ctx'> 	.setup			= mv88e6xxx_setup,</div><div class='del'>-	.adjust_link		= mv88e6xxx_adjust_link,</div><div class='del'>-	.phylink_validate	= mv88e6xxx_validate,</div><div class='del'>-	.phylink_mac_link_state	= mv88e6xxx_link_state,</div><div class='del'>-	.phylink_mac_config	= mv88e6xxx_mac_config,</div><div class='del'>-	.phylink_mac_link_down	= mv88e6xxx_mac_link_down,</div><div class='del'>-	.phylink_mac_link_up	= mv88e6xxx_mac_link_up,</div><div class='add'>+	.teardown		= mv88e6xxx_teardown,</div><div class='add'>+	.port_setup		= mv88e6xxx_port_setup,</div><div class='add'>+	.port_teardown		= mv88e6xxx_port_teardown,</div><div class='add'>+	.phylink_get_caps	= mv88e6xxx_get_caps,</div><div class='ctx'> 	.get_strings		= mv88e6xxx_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= mv88e6xxx_get_ethtool_stats,</div><div class='add'>+	.get_eth_mac_stats	= mv88e6xxx_get_eth_mac_stats,</div><div class='add'>+	.get_rmon_stats		= mv88e6xxx_get_rmon_stats,</div><div class='ctx'> 	.get_sset_count		= mv88e6xxx_get_sset_count,</div><div class='del'>-	.port_enable		= mv88e6xxx_port_enable,</div><div class='del'>-	.port_disable		= mv88e6xxx_port_disable,</div><div class='del'>-	.get_mac_eee		= mv88e6xxx_get_mac_eee,</div><div class='add'>+	.port_max_mtu		= mv88e6xxx_get_max_mtu,</div><div class='add'>+	.port_change_mtu	= mv88e6xxx_change_mtu,</div><div class='add'>+	.support_eee		= dsa_supports_eee,</div><div class='ctx'> 	.set_mac_eee		= mv88e6xxx_set_mac_eee,</div><div class='ctx'> 	.get_eeprom_len		= mv88e6xxx_get_eeprom_len,</div><div class='ctx'> 	.get_eeprom		= mv88e6xxx_get_eeprom,</div><div class='ctx'> 	.set_eeprom		= mv88e6xxx_set_eeprom,</div><div class='ctx'> 	.get_regs_len		= mv88e6xxx_get_regs_len,</div><div class='ctx'> 	.get_regs		= mv88e6xxx_get_regs,</div><div class='add'>+	.get_rxnfc		= mv88e6xxx_get_rxnfc,</div><div class='add'>+	.set_rxnfc		= mv88e6xxx_set_rxnfc,</div><div class='ctx'> 	.set_ageing_time	= mv88e6xxx_set_ageing_time,</div><div class='ctx'> 	.port_bridge_join	= mv88e6xxx_port_bridge_join,</div><div class='ctx'> 	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,</div><div class='del'>-	.port_egress_floods	= mv88e6xxx_port_egress_floods,</div><div class='add'>+	.port_pre_bridge_flags	= mv88e6xxx_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= mv88e6xxx_port_bridge_flags,</div><div class='ctx'> 	.port_stp_state_set	= mv88e6xxx_port_stp_state_set,</div><div class='add'>+	.port_mst_state_set	= mv88e6xxx_port_mst_state_set,</div><div class='ctx'> 	.port_fast_age		= mv88e6xxx_port_fast_age,</div><div class='add'>+	.port_vlan_fast_age	= mv88e6xxx_port_vlan_fast_age,</div><div class='ctx'> 	.port_vlan_filtering	= mv88e6xxx_port_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare	= mv88e6xxx_port_vlan_prepare,</div><div class='ctx'> 	.port_vlan_add		= mv88e6xxx_port_vlan_add,</div><div class='ctx'> 	.port_vlan_del		= mv88e6xxx_port_vlan_del,</div><div class='del'>-	.port_fdb_add           = mv88e6xxx_port_fdb_add,</div><div class='del'>-	.port_fdb_del           = mv88e6xxx_port_fdb_del,</div><div class='del'>-	.port_fdb_dump          = mv88e6xxx_port_fdb_dump,</div><div class='del'>-	.port_mdb_prepare       = mv88e6xxx_port_mdb_prepare,</div><div class='del'>-	.port_mdb_add           = mv88e6xxx_port_mdb_add,</div><div class='del'>-	.port_mdb_del           = mv88e6xxx_port_mdb_del,</div><div class='add'>+	.vlan_msti_set		= mv88e6xxx_vlan_msti_set,</div><div class='add'>+	.port_fdb_add		= mv88e6xxx_port_fdb_add,</div><div class='add'>+	.port_fdb_del		= mv88e6xxx_port_fdb_del,</div><div class='add'>+	.port_fdb_dump		= mv88e6xxx_port_fdb_dump,</div><div class='add'>+	.port_mdb_add		= mv88e6xxx_port_mdb_add,</div><div class='add'>+	.port_mdb_del		= mv88e6xxx_port_mdb_del,</div><div class='add'>+	.port_mirror_add	= mv88e6xxx_port_mirror_add,</div><div class='add'>+	.port_mirror_del	= mv88e6xxx_port_mirror_del,</div><div class='ctx'> 	.crosschip_bridge_join	= mv88e6xxx_crosschip_bridge_join,</div><div class='ctx'> 	.crosschip_bridge_leave	= mv88e6xxx_crosschip_bridge_leave,</div><div class='ctx'> 	.port_hwtstamp_set	= mv88e6xxx_port_hwtstamp_set,</div><div class='hunk'>@@ -4604,6 +7208,15 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {</div><div class='ctx'> 	.port_txtstamp		= mv88e6xxx_port_txtstamp,</div><div class='ctx'> 	.port_rxtstamp		= mv88e6xxx_port_rxtstamp,</div><div class='ctx'> 	.get_ts_info		= mv88e6xxx_get_ts_info,</div><div class='add'>+	.devlink_param_get	= mv88e6xxx_devlink_param_get,</div><div class='add'>+	.devlink_param_set	= mv88e6xxx_devlink_param_set,</div><div class='add'>+	.devlink_info_get	= mv88e6xxx_devlink_info_get,</div><div class='add'>+	.port_lag_change	= mv88e6xxx_port_lag_change,</div><div class='add'>+	.port_lag_join		= mv88e6xxx_port_lag_join,</div><div class='add'>+	.port_lag_leave		= mv88e6xxx_port_lag_leave,</div><div class='add'>+	.crosschip_lag_change	= mv88e6xxx_crosschip_lag_change,</div><div class='add'>+	.crosschip_lag_join	= mv88e6xxx_crosschip_lag_join,</div><div class='add'>+	.crosschip_lag_leave	= mv88e6xxx_crosschip_lag_leave,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -4611,16 +7224,25 @@ static int mv88e6xxx_register_switch(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	struct device *dev = chip-&gt;dev;</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> </div><div class='del'>-	ds = dsa_switch_alloc(dev, mv88e6xxx_num_ports(chip));</div><div class='add'>+	ds = devm_kzalloc(dev, sizeof(*ds), GFP_KERNEL);</div><div class='ctx'> 	if (!ds)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;num_ports = mv88e6xxx_num_ports(chip);</div><div class='ctx'> 	ds-&gt;priv = chip;</div><div class='ctx'> 	ds-&gt;dev = dev;</div><div class='ctx'> 	ds-&gt;ops = &amp;mv88e6xxx_switch_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;mv88e6xxx_phylink_mac_ops;</div><div class='ctx'> 	ds-&gt;ageing_time_min = chip-&gt;info-&gt;age_time_coeff;</div><div class='ctx'> 	ds-&gt;ageing_time_max = chip-&gt;info-&gt;age_time_coeff * U8_MAX;</div><div class='ctx'> </div><div class='add'>+	/* Some chips support up to 32, but that requires enabling the</div><div class='add'>+	 * 5-bit port mode, which we do not support. 640k^W16 ought to</div><div class='add'>+	 * be enough for anyone.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;num_lag_ids = mv88e6xxx_has_lag(chip) ? 16 : 0;</div><div class='add'>+</div><div class='ctx'> 	dev_set_drvdata(dev, ds);</div><div class='ctx'> </div><div class='ctx'> 	return dsa_register_switch(ds);</div><div class='hunk'>@@ -4702,19 +7324,32 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;info = compat_info;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_smi_init(chip, mdiodev-&gt;bus, mdiodev-&gt;addr);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);</div><div class='ctx'> 	if (IS_ERR(chip-&gt;reset)) {</div><div class='ctx'> 		err = PTR_ERR(chip-&gt;reset);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='add'>+	if (chip-&gt;reset)</div><div class='add'>+		usleep_range(10000, 20000);</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_detect(chip);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+	/* Detect if the device is configured in single chip addressing mode,</div><div class='add'>+	 * otherwise continue with address specific smi init/detection.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_single_chip_detect(chip, mdiodev);</div><div class='add'>+	if (err) {</div><div class='add'>+		err = mv88e6xxx_smi_init(chip, mdiodev-&gt;bus, mdiodev-&gt;addr);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_detect(chip);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;edsa_support == MV88E6XXX_EDSA_SUPPORTED)</div><div class='add'>+		chip-&gt;tag_protocol = DSA_TAG_PROTO_EDSA;</div><div class='add'>+	else</div><div class='add'>+		chip-&gt;tag_protocol = DSA_TAG_PROTO_DSA;</div><div class='ctx'> </div><div class='ctx'> 	mv88e6xxx_phy_init(chip);</div><div class='ctx'> </div><div class='hunk'>@@ -4726,17 +7361,17 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 			chip-&gt;eeprom_len = pdata-&gt;eeprom_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_switch_reset(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_phy;</div><div class='ctx'> </div><div class='ctx'> 	if (np) {</div><div class='ctx'> 		chip-&gt;irq = of_irq_get(np, 0);</div><div class='ctx'> 		if (chip-&gt;irq == -EPROBE_DEFER) {</div><div class='ctx'> 			err = chip-&gt;irq;</div><div class='del'>-			goto out;</div><div class='add'>+			goto out_phy;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4747,15 +7382,15 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	 * the PHYs will link their interrupts to these interrupt</div><div class='ctx'> 	 * controllers</div><div class='ctx'> 	 */</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (chip-&gt;irq &gt; 0)</div><div class='ctx'> 		err = mv88e6xxx_g1_irq_setup(chip);</div><div class='ctx'> 	else</div><div class='ctx'> 		err = mv88e6xxx_irq_poll_setup(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_phy;</div><div class='ctx'> </div><div class='ctx'> 	if (chip-&gt;info-&gt;g2_irqs &gt; 0) {</div><div class='ctx'> 		err = mv88e6xxx_g2_irq_setup(chip);</div><div class='hunk'>@@ -4771,18 +7406,12 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_g1_atu_prob_irq;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_mdios_register(chip, np);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out_g1_vtu_prob_irq;</div><div class='del'>-</div><div class='ctx'> 	err = mv88e6xxx_register_switch(chip);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out_mdio;</div><div class='add'>+		goto out_g1_vtu_prob_irq;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-out_mdio:</div><div class='del'>-	mv88e6xxx_mdios_unregister(chip);</div><div class='ctx'> out_g1_vtu_prob_irq:</div><div class='ctx'> 	mv88e6xxx_g1_vtu_prob_irq_free(chip);</div><div class='ctx'> out_g1_atu_prob_irq:</div><div class='hunk'>@@ -4795,6 +7424,8 @@ out_g1_irq:</div><div class='ctx'> 		mv88e6xxx_g1_irq_free(chip);</div><div class='ctx'> 	else</div><div class='ctx'> 		mv88e6xxx_irq_poll_free(chip);</div><div class='add'>+out_phy:</div><div class='add'>+	mv88e6xxx_phy_destroy(chip);</div><div class='ctx'> out:</div><div class='ctx'> 	if (pdata)</div><div class='ctx'> 		dev_put(pdata-&gt;netdev);</div><div class='hunk'>@@ -4805,16 +7436,14 @@ out:</div><div class='ctx'> static void mv88e6xxx_remove(struct mdio_device *mdiodev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='del'>-	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_chip *chip;</div><div class='ctx'> </div><div class='del'>-	if (chip-&gt;info-&gt;ptp_support) {</div><div class='del'>-		mv88e6xxx_hwtstamp_free(chip);</div><div class='del'>-		mv88e6xxx_ptp_free(chip);</div><div class='del'>-	}</div><div class='add'>+	if (!ds)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	chip = ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	mv88e6xxx_phy_destroy(chip);</div><div class='ctx'> 	mv88e6xxx_unregister_switch(chip);</div><div class='del'>-	mv88e6xxx_mdios_unregister(chip);</div><div class='ctx'> </div><div class='ctx'> 	mv88e6xxx_g1_vtu_prob_irq_free(chip);</div><div class='ctx'> 	mv88e6xxx_g1_atu_prob_irq_free(chip);</div><div class='hunk'>@@ -4826,6 +7455,20 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev)</div><div class='ctx'> 		mv88e6xxx_g1_irq_free(chip);</div><div class='ctx'> 	else</div><div class='ctx'> 		mv88e6xxx_irq_poll_free(chip);</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_phy_destroy(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6xxx_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!ds)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id mv88e6xxx_of_match[] = {</div><div class='hunk'>@@ -4837,6 +7480,10 @@ static const struct of_device_id mv88e6xxx_of_match[] = {</div><div class='ctx'> 		.compatible = "marvell,mv88e6190",</div><div class='ctx'> 		.data = &amp;mv88e6xxx_table[MV88E6190],</div><div class='ctx'> 	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "marvell,mv88e6250",</div><div class='add'>+		.data = &amp;mv88e6xxx_table[MV88E6250],</div><div class='add'>+	},</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -4845,6 +7492,7 @@ MODULE_DEVICE_TABLE(of, mv88e6xxx_of_match);</div><div class='ctx'> static struct mdio_driver mv88e6xxx_driver = {</div><div class='ctx'> 	.probe	= mv88e6xxx_probe,</div><div class='ctx'> 	.remove = mv88e6xxx_remove,</div><div class='add'>+	.shutdown = mv88e6xxx_shutdown,</div><div class='ctx'> 	.mdiodrv.driver = {</div><div class='ctx'> 		.name = "mv88e6085",</div><div class='ctx'> 		.of_match_table = mv88e6xxx_of_match,</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h<br/>index d3e10111a6fe..2f211e55cb47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/chip.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/chip.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/chip.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/chip.h</a></div><div class='hunk'>@@ -8,20 +8,30 @@</div><div class='ctx'> #ifndef _MV88E6XXX_CHIP_H</div><div class='ctx'> #define _MV88E6XXX_CHIP_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/idr.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/timecounter.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> </div><div class='add'>+#define EDSA_HLEN		8</div><div class='ctx'> #define MV88E6XXX_N_FID		4096</div><div class='add'>+#define MV88E6XXX_N_SID		64</div><div class='add'>+</div><div class='add'>+#define MV88E6XXX_FID_STANDALONE	0</div><div class='add'>+#define MV88E6XXX_FID_BRIDGED		1</div><div class='ctx'> </div><div class='ctx'> /* PVT limits for 4-bit port and 5-bit switch */</div><div class='ctx'> #define MV88E6XXX_MAX_PVT_SWITCHES	32</div><div class='ctx'> #define MV88E6XXX_MAX_PVT_PORTS		16</div><div class='add'>+#define MV88E6XXX_MAX_PVT_ENTRIES	\</div><div class='add'>+	(MV88E6XXX_MAX_PVT_SWITCHES * MV88E6XXX_MAX_PVT_PORTS)</div><div class='ctx'> </div><div class='ctx'> #define MV88E6XXX_MAX_GPIO	16</div><div class='ctx'> </div><div class='hunk'>@@ -32,6 +42,11 @@ enum mv88e6xxx_egress_mode {</div><div class='ctx'> 	MV88E6XXX_EGRESS_MODE_ETHERTYPE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum mv88e6xxx_egress_direction {</div><div class='add'>+        MV88E6XXX_EGRESS_DIR_INGRESS,</div><div class='add'>+        MV88E6XXX_EGRESS_DIR_EGRESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum mv88e6xxx_frame_mode {</div><div class='ctx'> 	MV88E6XXX_FRAME_MODE_NORMAL,</div><div class='ctx'> 	MV88E6XXX_FRAME_MODE_DSA,</div><div class='hunk'>@@ -41,6 +56,8 @@ enum mv88e6xxx_frame_mode {</div><div class='ctx'> </div><div class='ctx'> /* List of supported models */</div><div class='ctx'> enum mv88e6xxx_model {</div><div class='add'>+	MV88E6020,</div><div class='add'>+	MV88E6071,</div><div class='ctx'> 	MV88E6085,</div><div class='ctx'> 	MV88E6095,</div><div class='ctx'> 	MV88E6097,</div><div class='hunk'>@@ -57,7 +74,11 @@ enum mv88e6xxx_model {</div><div class='ctx'> 	MV88E6190,</div><div class='ctx'> 	MV88E6190X,</div><div class='ctx'> 	MV88E6191,</div><div class='add'>+	MV88E6191X,</div><div class='add'>+	MV88E6193X,</div><div class='add'>+	MV88E6220,</div><div class='ctx'> 	MV88E6240,</div><div class='add'>+	MV88E6250,</div><div class='ctx'> 	MV88E6290,</div><div class='ctx'> 	MV88E6320,</div><div class='ctx'> 	MV88E6321,</div><div class='hunk'>@@ -65,8 +86,10 @@ enum mv88e6xxx_model {</div><div class='ctx'> 	MV88E6350,</div><div class='ctx'> 	MV88E6351,</div><div class='ctx'> 	MV88E6352,</div><div class='add'>+	MV88E6361,</div><div class='ctx'> 	MV88E6390,</div><div class='ctx'> 	MV88E6390X,</div><div class='add'>+	MV88E6393X,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum mv88e6xxx_family {</div><div class='hunk'>@@ -76,11 +99,29 @@ enum mv88e6xxx_family {</div><div class='ctx'> 	MV88E6XXX_FAMILY_6097,	/* 6046 6085 6096 6097 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6165,	/* 6123 6161 6165 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6185,	/* 6108 6121 6122 6131 6152 6155 6182 6185 */</div><div class='add'>+	MV88E6XXX_FAMILY_6250,	/* 6220 6250 6020 6071 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6320,	/* 6320 6321 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6341,	/* 6141 6341 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6351,	/* 6171 6175 6350 6351 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6352,	/* 6172 6176 6240 6352 */</div><div class='ctx'> 	MV88E6XXX_FAMILY_6390,  /* 6190 6190X 6191 6290 6390 6390X */</div><div class='add'>+	MV88E6XXX_FAMILY_6393,	/* 6191X 6193X 6361 6393X */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum mv88e6xxx_edsa_support - Ethertype DSA tag support level</div><div class='add'>+ * @MV88E6XXX_EDSA_UNSUPPORTED:  Device has no support for EDSA tags</div><div class='add'>+ * @MV88E6XXX_EDSA_UNDOCUMENTED: Documentation indicates that</div><div class='add'>+ *                               egressing FORWARD frames with an EDSA</div><div class='add'>+ *                               tag is reserved for future use, but</div><div class='add'>+ *                               empirical data shows that this mode</div><div class='add'>+ *                               is supported.</div><div class='add'>+ * @MV88E6XXX_EDSA_SUPPORTED:    EDSA tags are fully supported.</div><div class='add'>+ */</div><div class='add'>+enum mv88e6xxx_edsa_support {</div><div class='add'>+	MV88E6XXX_EDSA_UNSUPPORTED = 0,</div><div class='add'>+	MV88E6XXX_EDSA_UNDOCUMENTED,</div><div class='add'>+	MV88E6XXX_EDSA_SUPPORTED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_ops;</div><div class='hunk'>@@ -90,10 +131,12 @@ struct mv88e6xxx_info {</div><div class='ctx'> 	u16 prod_num;</div><div class='ctx'> 	const char *name;</div><div class='ctx'> 	unsigned int num_databases;</div><div class='add'>+	unsigned int num_macs;</div><div class='ctx'> 	unsigned int num_ports;</div><div class='ctx'> 	unsigned int num_internal_phys;</div><div class='ctx'> 	unsigned int num_gpio;</div><div class='ctx'> 	unsigned int max_vid;</div><div class='add'>+	unsigned int max_sid;</div><div class='ctx'> 	unsigned int port_base_addr;</div><div class='ctx'> 	unsigned int phy_base_addr;</div><div class='ctx'> 	unsigned int global1_addr;</div><div class='hunk'>@@ -101,14 +144,26 @@ struct mv88e6xxx_info {</div><div class='ctx'> 	unsigned int age_time_coeff;</div><div class='ctx'> 	unsigned int g1_irqs;</div><div class='ctx'> 	unsigned int g2_irqs;</div><div class='add'>+	int stats_type;</div><div class='ctx'> 	bool pvt;</div><div class='ctx'> </div><div class='add'>+	/* Mark certain ports as invalid. This is required for example for the</div><div class='add'>+	 * MV88E6220 (which is in general a MV88E6250 with 7 ports) but the</div><div class='add'>+	 * ports 2-4 are not routet to pins.</div><div class='add'>+	 */</div><div class='add'>+	unsigned int invalid_port_mask;</div><div class='ctx'> 	/* Multi-chip Addressing Mode.</div><div class='ctx'> 	 * Some chips respond to only 2 registers of its own SMI device address</div><div class='ctx'> 	 * when it is non-zero, and use indirect access to internal registers.</div><div class='ctx'> 	 */</div><div class='ctx'> 	bool multi_chip;</div><div class='del'>-	enum dsa_tag_protocol tag_protocol;</div><div class='add'>+	/* Dual-chip Addressing Mode</div><div class='add'>+	 * Some chips respond to only half of the 32 SMI addresses,</div><div class='add'>+	 * allowing two to coexist on the same SMI interface.</div><div class='add'>+	 */</div><div class='add'>+	bool dual_chip;</div><div class='add'>+</div><div class='add'>+	enum mv88e6xxx_edsa_support edsa_support;</div><div class='ctx'> </div><div class='ctx'> 	/* Mask for FromPort and ToPort value of PortVec used in ATU Move</div><div class='ctx'> 	 * operation. 0 means that the ATU Move operation is not supported.</div><div class='hunk'>@@ -118,6 +173,11 @@ struct mv88e6xxx_info {</div><div class='ctx'> </div><div class='ctx'> 	/* Supports PTP */</div><div class='ctx'> 	bool ptp_support;</div><div class='add'>+</div><div class='add'>+	/* Internal PHY start index. 0 means that internal PHYs range starts at</div><div class='add'>+	 * port 0, 1 means internal PHYs range starts at port 1, etc</div><div class='add'>+	 */</div><div class='add'>+	unsigned int internal_phys_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_atu_entry {</div><div class='hunk'>@@ -132,7 +192,14 @@ struct mv88e6xxx_vtu_entry {</div><div class='ctx'> 	u16	fid;</div><div class='ctx'> 	u8	sid;</div><div class='ctx'> 	bool	valid;</div><div class='add'>+	bool	policy;</div><div class='ctx'> 	u8	member[DSA_MAX_PORTS];</div><div class='add'>+	u8	state[DSA_MAX_PORTS];	/* Older silicon has no STU */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_stu_entry {</div><div class='add'>+	u8	sid;</div><div class='add'>+	bool	valid;</div><div class='ctx'> 	u8	state[DSA_MAX_PORTS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -141,12 +208,14 @@ struct mv88e6xxx_irq_ops;</div><div class='ctx'> struct mv88e6xxx_gpio_ops;</div><div class='ctx'> struct mv88e6xxx_avb_ops;</div><div class='ctx'> struct mv88e6xxx_ptp_ops;</div><div class='add'>+struct mv88e6xxx_pcs_ops;</div><div class='add'>+struct mv88e6xxx_cc_coeffs;</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_irq {</div><div class='ctx'> 	u16 masked;</div><div class='ctx'> 	struct irq_chip chip;</div><div class='ctx'> 	struct irq_domain *domain;</div><div class='del'>-	unsigned int nirqs;</div><div class='add'>+	int nirqs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* state flags for mv88e6xxx_port_hwtstamp::state */</div><div class='hunk'>@@ -172,25 +241,110 @@ struct mv88e6xxx_port_hwtstamp {</div><div class='ctx'> 	u16 tx_seq_id;</div><div class='ctx'> </div><div class='ctx'> 	/* Current timestamp configuration */</div><div class='del'>-	struct hwtstamp_config tstamp_config;</div><div class='add'>+	struct kernel_hwtstamp_config tstamp_config;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mv88e6xxx_policy_mapping {</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_DA,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_SA,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_VTU,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_ETYPE,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_PPPOE,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_VBAS,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_OPT82,</div><div class='add'>+	MV88E6XXX_POLICY_MAPPING_UDP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mv88e6xxx_policy_action {</div><div class='add'>+	MV88E6XXX_POLICY_ACTION_NORMAL,</div><div class='add'>+	MV88E6XXX_POLICY_ACTION_MIRROR,</div><div class='add'>+	MV88E6XXX_POLICY_ACTION_TRAP,</div><div class='add'>+	MV88E6XXX_POLICY_ACTION_DISCARD,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_policy {</div><div class='add'>+	enum mv88e6xxx_policy_mapping mapping;</div><div class='add'>+	enum mv88e6xxx_policy_action action;</div><div class='add'>+	struct ethtool_rx_flow_spec fs;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int port;</div><div class='add'>+	u16 vid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_vlan {</div><div class='add'>+	u16	vid;</div><div class='add'>+	bool	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_port {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip;</div><div class='ctx'> 	int port;</div><div class='add'>+	struct fwnode_handle *fwnode;</div><div class='add'>+	struct mv88e6xxx_vlan bridge_pvid;</div><div class='ctx'> 	u64 serdes_stats[2];</div><div class='ctx'> 	u64 atu_member_violation;</div><div class='ctx'> 	u64 atu_miss_violation;</div><div class='ctx'> 	u64 atu_full_violation;</div><div class='ctx'> 	u64 vtu_member_violation;</div><div class='ctx'> 	u64 vtu_miss_violation;</div><div class='add'>+	phy_interface_t interface;</div><div class='ctx'> 	u8 cmode;</div><div class='del'>-	int serdes_irq;</div><div class='add'>+	bool mirror_ingress;</div><div class='add'>+	bool mirror_egress;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	void *pcs_private;</div><div class='add'>+</div><div class='add'>+	/* LED related information */</div><div class='add'>+	bool fiber;</div><div class='add'>+	struct led_classdev led0;</div><div class='add'>+	struct led_classdev led1;</div><div class='add'>+</div><div class='add'>+	/* MacAuth Bypass control flag */</div><div class='add'>+	bool mab;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum mv88e6xxx_region_id {</div><div class='add'>+	MV88E6XXX_REGION_GLOBAL1 = 0,</div><div class='add'>+	MV88E6XXX_REGION_GLOBAL2,</div><div class='add'>+	MV88E6XXX_REGION_ATU,</div><div class='add'>+	MV88E6XXX_REGION_VTU,</div><div class='add'>+	MV88E6XXX_REGION_STU,</div><div class='add'>+	MV88E6XXX_REGION_PVT,</div><div class='add'>+</div><div class='add'>+	_MV88E6XXX_REGION_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_region_priv {</div><div class='add'>+	enum mv88e6xxx_region_id id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_mst {</div><div class='add'>+	struct list_head node;</div><div class='add'>+</div><div class='add'>+	refcount_t refcnt;</div><div class='add'>+	struct net_device *br;</div><div class='add'>+	u16 msti;</div><div class='add'>+</div><div class='add'>+	struct mv88e6xxx_stu_entry stu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STATS_TYPE_PORT		BIT(0)</div><div class='add'>+#define STATS_TYPE_BANK0	BIT(1)</div><div class='add'>+#define STATS_TYPE_BANK1	BIT(2)</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_hw_stat {</div><div class='add'>+	char string[ETH_GSTRING_LEN];</div><div class='add'>+	size_t size;</div><div class='add'>+	int reg;</div><div class='add'>+	int type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_chip {</div><div class='ctx'> 	const struct mv88e6xxx_info *info;</div><div class='ctx'> </div><div class='add'>+	/* Currently configured tagging protocol */</div><div class='add'>+	enum dsa_tag_protocol tag_protocol;</div><div class='add'>+</div><div class='ctx'> 	/* The dsa_switch this private structure is related to */</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='ctx'> </div><div class='hunk'>@@ -233,17 +387,25 @@ struct mv88e6xxx_chip {</div><div class='ctx'> 	/* List of mdio busses */</div><div class='ctx'> 	struct list_head mdios;</div><div class='ctx'> </div><div class='add'>+	/* Policy Control List IDs and rules */</div><div class='add'>+	struct idr policies;</div><div class='add'>+</div><div class='ctx'> 	/* There can be two interrupt controllers, which are chained</div><div class='ctx'> 	 * off a GPIO as interrupt source</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mv88e6xxx_irq g1_irq;</div><div class='ctx'> 	struct mv88e6xxx_irq g2_irq;</div><div class='ctx'> 	int irq;</div><div class='add'>+	char irq_name[64];</div><div class='ctx'> 	int device_irq;</div><div class='add'>+	char device_irq_name[64];</div><div class='ctx'> 	int watchdog_irq;</div><div class='add'>+	char watchdog_irq_name[64];</div><div class='ctx'> </div><div class='ctx'> 	int atu_prob_irq;</div><div class='add'>+	char atu_prob_irq_name[64];</div><div class='ctx'> 	int vtu_prob_irq;</div><div class='add'>+	char vtu_prob_irq_name[64];</div><div class='ctx'> 	struct kthread_worker *kworker;</div><div class='ctx'> 	struct kthread_delayed_work irq_poll_work;</div><div class='ctx'> </div><div class='hunk'>@@ -256,25 +418,38 @@ struct mv88e6xxx_chip {</div><div class='ctx'> 	struct cyclecounter	tstamp_cc;</div><div class='ctx'> 	struct timecounter	tstamp_tc;</div><div class='ctx'> 	struct delayed_work	overflow_work;</div><div class='add'>+	const struct mv88e6xxx_cc_coeffs *cc_coeffs;</div><div class='ctx'> </div><div class='ctx'> 	struct ptp_clock	*ptp_clock;</div><div class='ctx'> 	struct ptp_clock_info	ptp_clock_info;</div><div class='ctx'> 	struct delayed_work	tai_event_work;</div><div class='ctx'> 	struct ptp_pin_desc	pin_config[MV88E6XXX_MAX_GPIO];</div><div class='del'>-	u16 trig_config;</div><div class='del'>-	u16 evcap_config;</div><div class='ctx'> 	u16 enable_count;</div><div class='ctx'> </div><div class='add'>+	/* Current ingress and egress monitor ports */</div><div class='add'>+	int egress_dest_port;</div><div class='add'>+	int ingress_dest_port;</div><div class='add'>+</div><div class='ctx'> 	/* Per-port timestamping resources. */</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp port_hwtstamp[DSA_MAX_PORTS];</div><div class='ctx'> </div><div class='ctx'> 	/* Array of port structures. */</div><div class='ctx'> 	struct mv88e6xxx_port ports[DSA_MAX_PORTS];</div><div class='add'>+</div><div class='add'>+	/* devlink regions */</div><div class='add'>+	struct devlink_region *regions[_MV88E6XXX_REGION_MAX];</div><div class='add'>+</div><div class='add'>+	/* Bridge MST to SID mappings */</div><div class='add'>+	struct list_head msts;</div><div class='add'>+</div><div class='add'>+	/* FID map */</div><div class='add'>+	DECLARE_BITMAP(fid_bitmap, MV88E6XXX_N_FID);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_bus_ops {</div><div class='ctx'> 	int (*read)(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val);</div><div class='ctx'> 	int (*write)(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val);</div><div class='add'>+	int (*init)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_mdio_bus {</div><div class='hunk'>@@ -310,6 +485,13 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 			 struct mii_bus *bus,</div><div class='ctx'> 			 int addr, int reg, u16 val);</div><div class='ctx'> </div><div class='add'>+	int (*phy_read_c45)(struct mv88e6xxx_chip *chip,</div><div class='add'>+			    struct mii_bus *bus,</div><div class='add'>+			    int addr, int devad, int reg, u16 *val);</div><div class='add'>+	int (*phy_write_c45)(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mii_bus *bus,</div><div class='add'>+			     int addr, int devad, int reg, u16 val);</div><div class='add'>+</div><div class='ctx'> 	/* Priority Override Table operations */</div><div class='ctx'> 	int (*pot_clear)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='hunk'>@@ -317,6 +499,12 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 	int (*ppu_enable)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> 	int (*ppu_disable)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='add'>+	/* Additional handlers to run before and after hard reset, to make sure</div><div class='add'>+	 * that the switch and EEPROM are in a good state.</div><div class='add'>+	 */</div><div class='add'>+	int (*hardware_reset_pre)(struct mv88e6xxx_chip *chip);</div><div class='add'>+	int (*hardware_reset_post)(struct mv88e6xxx_chip *chip);</div><div class='add'>+</div><div class='ctx'> 	/* Switch Software Reset */</div><div class='ctx'> 	int (*reset)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='hunk'>@@ -336,14 +524,9 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*port_set_link)(struct mv88e6xxx_chip *chip, int port, int link);</div><div class='ctx'> </div><div class='del'>-#define DUPLEX_UNFORCED		-2</div><div class='del'>-</div><div class='del'>-	/* Port's MAC duplex mode</div><div class='del'>-	 *</div><div class='del'>-	 * Use DUPLEX_HALF or DUPLEX_FULL to force half or full duplex,</div><div class='del'>-	 * or DUPLEX_UNFORCED for normal duplex detection.</div><div class='add'>+	/* Synchronise the port link state with that of the SERDES</div><div class='ctx'> 	 */</div><div class='del'>-	int (*port_set_duplex)(struct mv88e6xxx_chip *chip, int port, int dup);</div><div class='add'>+	int (*port_sync_link)(struct mv88e6xxx_chip *chip, int port, unsigned int mode, bool isup);</div><div class='ctx'> </div><div class='ctx'> #define PAUSE_ON		1</div><div class='ctx'> #define PAUSE_OFF		0</div><div class='hunk'>@@ -352,25 +535,36 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 	int (*port_set_pause)(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 			      int pause);</div><div class='ctx'> </div><div class='del'>-#define SPEED_MAX		INT_MAX</div><div class='ctx'> #define SPEED_UNFORCED		-2</div><div class='add'>+#define DUPLEX_UNFORCED		-2</div><div class='ctx'> </div><div class='del'>-	/* Port's MAC speed (in Mbps)</div><div class='add'>+	/* Port's MAC speed (in Mbps) and MAC duplex mode</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Depending on the chip, 10, 100, 200, 1000, 2500, 10000 are valid.</div><div class='del'>-	 * Use SPEED_UNFORCED for normal detection, SPEED_MAX for max value.</div><div class='add'>+	 * Use SPEED_UNFORCED for normal detection.</div><div class='add'>+	 *</div><div class='add'>+	 * Use DUPLEX_HALF or DUPLEX_FULL to force half or full duplex,</div><div class='add'>+	 * or DUPLEX_UNFORCED for normal duplex detection.</div><div class='ctx'> 	 */</div><div class='del'>-	int (*port_set_speed)(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='add'>+	int (*port_set_speed_duplex)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     int speed, int duplex);</div><div class='ctx'> </div><div class='ctx'> 	/* What interface mode should be used for maximum speed? */</div><div class='del'>-	phy_interface_t (*port_max_speed_mode)(int port);</div><div class='add'>+	phy_interface_t (*port_max_speed_mode)(struct mv88e6xxx_chip *chip,</div><div class='add'>+					       int port);</div><div class='ctx'> </div><div class='ctx'> 	int (*port_tag_remap)(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> </div><div class='add'>+	int (*port_set_policy)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			       enum mv88e6xxx_policy_mapping mapping,</div><div class='add'>+			       enum mv88e6xxx_policy_action action);</div><div class='add'>+</div><div class='ctx'> 	int (*port_set_frame_mode)(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				   enum mv88e6xxx_frame_mode mode);</div><div class='del'>-	int (*port_set_egress_floods)(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				      bool unicast, bool multicast);</div><div class='add'>+	int (*port_set_ucast_flood)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    bool unicast);</div><div class='add'>+	int (*port_set_mcast_flood)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    bool multicast);</div><div class='ctx'> 	int (*port_set_ether_type)(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				   u16 etype);</div><div class='ctx'> 	int (*port_set_jumbo_size)(struct mv88e6xxx_chip *chip, int port,</div><div class='hunk'>@@ -381,6 +575,7 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 				u8 out);</div><div class='ctx'> 	int (*port_disable_learn_limit)(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> 	int (*port_disable_pri_override)(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+	int (*port_setup_message_port)(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> </div><div class='ctx'> 	/* CMODE control what PHY mode the MAC will use, eg. SGMII, RGMII, etc.</div><div class='ctx'> 	 * Some chips allow this to be configured on specific ports.</div><div class='hunk'>@@ -389,14 +584,14 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 			      phy_interface_t mode);</div><div class='ctx'> 	int (*port_get_cmode)(struct mv88e6xxx_chip *chip, int port, u8 *cmode);</div><div class='ctx'> </div><div class='add'>+	/* LED control */</div><div class='add'>+	int (*port_setup_leds)(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+</div><div class='ctx'> 	/* Some devices have a per port register indicating what is</div><div class='ctx'> 	 * the upstream port this port should forward to.</div><div class='ctx'> 	 */</div><div class='ctx'> 	int (*port_set_upstream_port)(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				      int upstream_port);</div><div class='del'>-	/* Return the port link state, as required by phylink */</div><div class='del'>-	int (*port_link_state)(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			       struct phylink_link_state *state);</div><div class='ctx'> </div><div class='ctx'> 	/* Snapshot the statistics for a port. The statistics can then</div><div class='ctx'> 	 * be read back a leisure but still with a consistent view.</div><div class='hunk'>@@ -410,11 +605,14 @@ struct mv88e6xxx_ops {</div><div class='ctx'> </div><div class='ctx'> 	/* Return the number of strings describing statistics */</div><div class='ctx'> 	int (*stats_get_sset_count)(struct mv88e6xxx_chip *chip);</div><div class='del'>-	int (*stats_get_strings)(struct mv88e6xxx_chip *chip,  uint8_t *data);</div><div class='del'>-	int (*stats_get_stats)(struct mv88e6xxx_chip *chip,  int port,</div><div class='del'>-			       uint64_t *data);</div><div class='add'>+	void (*stats_get_strings)(struct mv88e6xxx_chip *chip, uint8_t **data);</div><div class='add'>+	size_t (*stats_get_stat)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 const struct mv88e6xxx_hw_stat *stat,</div><div class='add'>+				 uint64_t *data);</div><div class='ctx'> 	int (*set_cpu_port)(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-	int (*set_egress_port)(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+	int (*set_egress_port)(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       enum mv88e6xxx_egress_direction direction,</div><div class='add'>+			       int port);</div><div class='ctx'> </div><div class='ctx'> #define MV88E6XXX_CASCADE_PORT_NONE		0xe</div><div class='ctx'> #define MV88E6XXX_CASCADE_PORT_MULTIPLE		0xf</div><div class='hunk'>@@ -425,19 +623,32 @@ struct mv88e6xxx_ops {</div><div class='ctx'> </div><div class='ctx'> 	int (*mgmt_rsvd2cpu)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='del'>-	/* Power on/off a SERDES interface */</div><div class='del'>-	int (*serdes_power)(struct mv88e6xxx_chip *chip, int port, bool on);</div><div class='add'>+	/* SERDES lane mapping */</div><div class='add'>+	int (*serdes_get_lane)(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> </div><div class='ctx'> 	/* SERDES interrupt handling */</div><div class='del'>-	int (*serdes_irq_setup)(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-	void (*serdes_irq_free)(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+	unsigned int (*serdes_irq_mapping)(struct mv88e6xxx_chip *chip,</div><div class='add'>+					   int port);</div><div class='ctx'> </div><div class='ctx'> 	/* Statistics from the SERDES interface */</div><div class='ctx'> 	int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-	int (*serdes_get_strings)(struct mv88e6xxx_chip *chip,  int port,</div><div class='del'>-				  uint8_t *data);</div><div class='del'>-	int (*serdes_get_stats)(struct mv88e6xxx_chip *chip,  int port,</div><div class='del'>-				uint64_t *data);</div><div class='add'>+	int (*serdes_get_strings)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				  uint8_t **data);</div><div class='add'>+	size_t (*serdes_get_stats)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   uint64_t *data);</div><div class='add'>+</div><div class='add'>+	/* SERDES registers for ethtool */</div><div class='add'>+	int (*serdes_get_regs_len)(struct mv88e6xxx_chip *chip,  int port);</div><div class='add'>+	void (*serdes_get_regs)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				void *_p);</div><div class='add'>+</div><div class='add'>+	/* SERDES SGMII/Fiber Output Amplitude */</div><div class='add'>+	int (*serdes_set_tx_amplitude)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       int val);</div><div class='add'>+</div><div class='add'>+	/* Address Translation Unit operations */</div><div class='add'>+	int (*atu_get_hash)(struct mv88e6xxx_chip *chip, u8 *hash);</div><div class='add'>+	int (*atu_set_hash)(struct mv88e6xxx_chip *chip, u8 hash);</div><div class='ctx'> </div><div class='ctx'> 	/* VLAN Translation Unit operations */</div><div class='ctx'> 	int (*vtu_getnext)(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -445,6 +656,12 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 	int (*vtu_loadpurge)(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 			     struct mv88e6xxx_vtu_entry *entry);</div><div class='ctx'> </div><div class='add'>+	/* Spanning Tree Unit operations */</div><div class='add'>+	int (*stu_getnext)(struct mv88e6xxx_chip *chip,</div><div class='add'>+			   struct mv88e6xxx_stu_entry *entry);</div><div class='add'>+	int (*stu_loadpurge)(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry);</div><div class='add'>+</div><div class='ctx'> 	/* GPIO operations */</div><div class='ctx'> 	const struct mv88e6xxx_gpio_ops *gpio_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -458,9 +675,13 @@ struct mv88e6xxx_ops {</div><div class='ctx'> 	const struct mv88e6xxx_ptp_ops *ptp_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* Phylink */</div><div class='del'>-	void (*phylink_validate)(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				 unsigned long *mask,</div><div class='del'>-				 struct phylink_link_state *state);</div><div class='add'>+	void (*phylink_get_caps)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 struct phylink_config *config);</div><div class='add'>+</div><div class='add'>+	const struct mv88e6xxx_pcs_ops *pcs_ops;</div><div class='add'>+</div><div class='add'>+	/* Max Frame Size */</div><div class='add'>+	int (*set_max_frame_size)(struct mv88e6xxx_chip *chip, int mtu);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_irq_ops {</div><div class='hunk'>@@ -509,7 +730,7 @@ struct mv88e6xxx_avb_ops {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct mv88e6xxx_ptp_ops {</div><div class='del'>-	u64 (*clock_read)(const struct cyclecounter *cc);</div><div class='add'>+	u64 (*clock_read)(struct cyclecounter *cc);</div><div class='ctx'> 	int (*ptp_enable)(struct ptp_clock_info *ptp,</div><div class='ctx'> 			  struct ptp_clock_request *rq, int on);</div><div class='ctx'> 	int (*ptp_verify)(struct ptp_clock_info *ptp, unsigned int pin,</div><div class='hunk'>@@ -519,6 +740,7 @@ struct mv88e6xxx_ptp_ops {</div><div class='ctx'> 	int (*port_disable)(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> 	int (*global_enable)(struct mv88e6xxx_chip *chip);</div><div class='ctx'> 	int (*global_disable)(struct mv88e6xxx_chip *chip);</div><div class='add'>+	int (*set_ptp_cpu_port)(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> 	int n_ext_ts;</div><div class='ctx'> 	int arr0_sts_reg;</div><div class='ctx'> 	int arr1_sts_reg;</div><div class='hunk'>@@ -526,35 +748,59 @@ struct mv88e6xxx_ptp_ops {</div><div class='ctx'> 	u32 rx_filters;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define STATS_TYPE_PORT		BIT(0)</div><div class='del'>-#define STATS_TYPE_BANK0	BIT(1)</div><div class='del'>-#define STATS_TYPE_BANK1	BIT(2)</div><div class='add'>+struct mv88e6xxx_pcs_ops {</div><div class='add'>+	int (*pcs_init)(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+	void (*pcs_teardown)(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+	struct phylink_pcs *(*pcs_select)(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					  phy_interface_t mode);</div><div class='ctx'> </div><div class='del'>-struct mv88e6xxx_hw_stat {</div><div class='del'>-	char string[ETH_GSTRING_LEN];</div><div class='del'>-	size_t size;</div><div class='del'>-	int reg;</div><div class='del'>-	int type;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool mv88e6xxx_has_stu(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;info-&gt;max_sid &gt; 0 &amp;&amp;</div><div class='add'>+		chip-&gt;info-&gt;ops-&gt;stu_loadpurge &amp;&amp;</div><div class='add'>+		chip-&gt;info-&gt;ops-&gt;stu_getnext;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool mv88e6xxx_has_pvt(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	return chip-&gt;info-&gt;pvt;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool mv88e6xxx_has_lag(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return !!chip-&gt;info-&gt;global2_addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned int mv88e6xxx_num_databases(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	return chip-&gt;info-&gt;num_databases;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int mv88e6xxx_num_macs(struct  mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;info-&gt;num_macs;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline unsigned int mv88e6xxx_num_ports(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	return chip-&gt;info-&gt;num_ports;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline unsigned int mv88e6xxx_max_vid(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;info-&gt;max_vid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int mv88e6xxx_max_sid(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;info-&gt;max_sid;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u16 mv88e6xxx_port_mask(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return GENMASK(mv88e6xxx_num_ports(chip) - 1, 0);</div><div class='add'>+	return GENMASK((s32)mv88e6xxx_num_ports(chip) - 1, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int mv88e6xxx_num_gpio(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -562,14 +808,39 @@ static inline unsigned int mv88e6xxx_num_gpio(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return chip-&gt;info-&gt;num_gpio;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool mv88e6xxx_is_invalid_port(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	return (chip-&gt;info-&gt;invalid_port_mask &amp; BIT(port)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mv88e6xxx_port_set_mab(struct mv88e6xxx_chip *chip,</div><div class='add'>+					  int port, bool mab)</div><div class='add'>+{</div><div class='add'>+	chip-&gt;ports[port].mab = mab;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mv88e6xxx_read(struct mv88e6xxx_chip *chip, int addr, int reg, u16 *val);</div><div class='ctx'> int mv88e6xxx_write(struct mv88e6xxx_chip *chip, int addr, int reg, u16 val);</div><div class='del'>-int mv88e6xxx_update(struct mv88e6xxx_chip *chip, int addr, int reg,</div><div class='del'>-		     u16 update);</div><div class='del'>-int mv88e6xxx_wait(struct mv88e6xxx_chip *chip, int addr, int reg, u16 mask);</div><div class='del'>-int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port, int link,</div><div class='del'>-			     int speed, int duplex, int pause,</div><div class='del'>-			     phy_interface_t mode);</div><div class='add'>+int mv88e6xxx_wait_mask(struct mv88e6xxx_chip *chip, int addr, int reg,</div><div class='add'>+			u16 mask, u16 val);</div><div class='add'>+int mv88e6xxx_wait_bit(struct mv88e6xxx_chip *chip, int addr, int reg,</div><div class='add'>+		       int bit, int val);</div><div class='ctx'> struct mii_bus *mv88e6xxx_default_mdio_bus(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='add'>+static inline void mv88e6xxx_reg_lock(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void mv88e6xxx_reg_unlock(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_vtu_walk(struct mv88e6xxx_chip *chip,</div><div class='add'>+		       int (*cb)(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 const struct mv88e6xxx_vtu_entry *entry,</div><div class='add'>+				 void *priv),</div><div class='add'>+		       void *priv);</div><div class='add'>+</div><div class='ctx'> #endif /* _MV88E6XXX_CHIP_H */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/devlink.c b/drivers/net/dsa/mv88e6xxx/devlink.c<br/>new file mode 100644<br/>index 000000000000..da69e0b85879<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/devlink.c</a></div><div class='hunk'>@@ -0,0 +1,817 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "devlink.h"</div><div class='add'>+#include "global1.h"</div><div class='add'>+#include "global2.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_atu_get_hash(struct mv88e6xxx_chip *chip, u8 *hash)</div><div class='add'>+{</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;atu_get_hash)</div><div class='add'>+		return chip-&gt;info-&gt;ops-&gt;atu_get_hash(chip, hash);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash)</div><div class='add'>+{</div><div class='add'>+	if (chip-&gt;info-&gt;ops-&gt;atu_set_hash)</div><div class='add'>+		return chip-&gt;info-&gt;ops-&gt;atu_set_hash(chip, hash);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum mv88e6xxx_devlink_param_id {</div><div class='add'>+	MV88E6XXX_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,</div><div class='add'>+	MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_devlink_param_get(struct dsa_switch *ds, u32 id,</div><div class='add'>+				struct devlink_param_gset_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH:</div><div class='add'>+		err = mv88e6xxx_atu_get_hash(chip, &amp;ctx-&gt;val.vu8);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_devlink_param_set(struct dsa_switch *ds, u32 id,</div><div class='add'>+				struct devlink_param_gset_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	switch (id) {</div><div class='add'>+	case MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH:</div><div class='add'>+		err = mv88e6xxx_atu_set_hash(chip, ctx-&gt;val.vu8);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_param mv88e6xxx_devlink_params[] = {</div><div class='add'>+	DSA_DEVLINK_PARAM_DRIVER(MV88E6XXX_DEVLINK_PARAM_ID_ATU_HASH,</div><div class='add'>+				 "ATU_hash", DEVLINK_PARAM_TYPE_U8,</div><div class='add'>+				 BIT(DEVLINK_PARAM_CMODE_RUNTIME)),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_setup_devlink_params(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return dsa_devlink_params_register(ds, mv88e6xxx_devlink_params,</div><div class='add'>+					   ARRAY_SIZE(mv88e6xxx_devlink_params));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	dsa_devlink_params_unregister(ds, mv88e6xxx_devlink_params,</div><div class='add'>+				      ARRAY_SIZE(mv88e6xxx_devlink_params));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum mv88e6xxx_devlink_resource_id {</div><div class='add'>+	MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+	MV88E6XXX_RESOURCE_ID_ATU_BIN_0,</div><div class='add'>+	MV88E6XXX_RESOURCE_ID_ATU_BIN_1,</div><div class='add'>+	MV88E6XXX_RESOURCE_ID_ATU_BIN_2,</div><div class='add'>+	MV88E6XXX_RESOURCE_ID_ATU_BIN_3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 mv88e6xxx_devlink_atu_bin_get(struct mv88e6xxx_chip *chip,</div><div class='add'>+					 u16 bin)</div><div class='add'>+{</div><div class='add'>+	u16 occupancy = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_atu_stats_set(chip, MV88E6XXX_G2_ATU_STATS_MODE_ALL,</div><div class='add'>+					 bin);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to set ATU stats kind/bin\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_atu_get_next(chip, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to perform ATU get next\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_atu_stats_get(chip, &amp;occupancy);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to get ATU stats\n");</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	occupancy &amp;= MV88E6XXX_G2_ATU_STATS_MASK;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return occupancy;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mv88e6xxx_devlink_atu_bin_0_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = priv;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_devlink_atu_bin_get(chip,</div><div class='add'>+					     MV88E6XXX_G2_ATU_STATS_BIN_0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mv88e6xxx_devlink_atu_bin_1_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = priv;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_devlink_atu_bin_get(chip,</div><div class='add'>+					     MV88E6XXX_G2_ATU_STATS_BIN_1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mv88e6xxx_devlink_atu_bin_2_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = priv;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_devlink_atu_bin_get(chip,</div><div class='add'>+					     MV88E6XXX_G2_ATU_STATS_BIN_2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mv88e6xxx_devlink_atu_bin_3_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = priv;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_devlink_atu_bin_get(chip,</div><div class='add'>+					     MV88E6XXX_G2_ATU_STATS_BIN_3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mv88e6xxx_devlink_atu_get(void *priv)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_devlink_atu_bin_0_get(priv) +</div><div class='add'>+		mv88e6xxx_devlink_atu_bin_1_get(priv) +</div><div class='add'>+		mv88e6xxx_devlink_atu_bin_2_get(priv) +</div><div class='add'>+		mv88e6xxx_devlink_atu_bin_3_get(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct devlink_resource_size_params size_params;</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	devlink_resource_size_params_init(&amp;size_params,</div><div class='add'>+					  mv88e6xxx_num_macs(chip),</div><div class='add'>+					  mv88e6xxx_num_macs(chip),</div><div class='add'>+					  1, DEVLINK_RESOURCE_UNIT_ENTRY);</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "ATU",</div><div class='add'>+					    mv88e6xxx_num_macs(chip),</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+					    DEVLINK_RESOURCE_ID_PARENT_TOP,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	devlink_resource_size_params_init(&amp;size_params,</div><div class='add'>+					  mv88e6xxx_num_macs(chip) / 4,</div><div class='add'>+					  mv88e6xxx_num_macs(chip) / 4,</div><div class='add'>+					  1, DEVLINK_RESOURCE_UNIT_ENTRY);</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "ATU_bin_0",</div><div class='add'>+					    mv88e6xxx_num_macs(chip) / 4,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU_BIN_0,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "ATU_bin_1",</div><div class='add'>+					    mv88e6xxx_num_macs(chip) / 4,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU_BIN_1,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "ATU_bin_2",</div><div class='add'>+					    mv88e6xxx_num_macs(chip) / 4,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU_BIN_2,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = dsa_devlink_resource_register(ds, "ATU_bin_3",</div><div class='add'>+					    mv88e6xxx_num_macs(chip) / 4,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU_BIN_3,</div><div class='add'>+					    MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+					    &amp;size_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      MV88E6XXX_RESOURCE_ID_ATU,</div><div class='add'>+					      mv88e6xxx_devlink_atu_get,</div><div class='add'>+					      chip);</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      MV88E6XXX_RESOURCE_ID_ATU_BIN_0,</div><div class='add'>+					      mv88e6xxx_devlink_atu_bin_0_get,</div><div class='add'>+					      chip);</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      MV88E6XXX_RESOURCE_ID_ATU_BIN_1,</div><div class='add'>+					      mv88e6xxx_devlink_atu_bin_1_get,</div><div class='add'>+					      chip);</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      MV88E6XXX_RESOURCE_ID_ATU_BIN_2,</div><div class='add'>+					      mv88e6xxx_devlink_atu_bin_2_get,</div><div class='add'>+					      chip);</div><div class='add'>+</div><div class='add'>+	dsa_devlink_resource_occ_get_register(ds,</div><div class='add'>+					      MV88E6XXX_RESOURCE_ID_ATU_BIN_3,</div><div class='add'>+					      mv88e6xxx_devlink_atu_bin_3_get,</div><div class='add'>+					      chip);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	dsa_devlink_resources_unregister(ds);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_global_snapshot(struct devlink *dl,</div><div class='add'>+					    const struct devlink_region_ops *ops,</div><div class='add'>+					    struct netlink_ext_ack *extack,</div><div class='add'>+					    u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_region_priv *region_priv = ops-&gt;priv;</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	u16 *registers;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	registers = kmalloc_array(32, sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (!registers)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		switch (region_priv-&gt;id) {</div><div class='add'>+		case MV88E6XXX_REGION_GLOBAL1:</div><div class='add'>+			err = mv88e6xxx_g1_read(chip, i, &amp;registers[i]);</div><div class='add'>+			break;</div><div class='add'>+		case MV88E6XXX_REGION_GLOBAL2:</div><div class='add'>+			err = mv88e6xxx_g2_read(chip, i, &amp;registers[i]);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(registers);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*data = (u8 *)registers;</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The ATU entry varies between mv88e6xxx chipset generations. Define</div><div class='add'>+ * a generic format which covers all the current and hopefully future</div><div class='add'>+ * mv88e6xxx generations</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_devlink_atu_entry {</div><div class='add'>+	/* The FID is scattered over multiple registers. */</div><div class='add'>+	u16 fid;</div><div class='add'>+	u16 atu_op;</div><div class='add'>+	u16 atu_data;</div><div class='add'>+	u16 atu_01;</div><div class='add'>+	u16 atu_23;</div><div class='add'>+	u16 atu_45;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_atu_snapshot_fid(struct mv88e6xxx_chip *chip,</div><div class='add'>+					     int fid,</div><div class='add'>+					     struct mv88e6xxx_devlink_atu_entry *table,</div><div class='add'>+					     int *count)</div><div class='add'>+{</div><div class='add'>+	u16 atu_op, atu_data, atu_01, atu_23, atu_45;</div><div class='add'>+	struct mv88e6xxx_atu_entry addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	addr.state = 0;</div><div class='add'>+	eth_broadcast_addr(addr.mac);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = mv88e6xxx_g1_atu_getnext(chip, fid, &amp;addr);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (!addr.state)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_OP, &amp;atu_op);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_DATA, &amp;atu_data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_MAC01, &amp;atu_01);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_MAC23, &amp;atu_23);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_MAC45, &amp;atu_45);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		table[*count].fid = fid;</div><div class='add'>+		table[*count].atu_op = atu_op;</div><div class='add'>+		table[*count].atu_data = atu_data;</div><div class='add'>+		table[*count].atu_01 = atu_01;</div><div class='add'>+		table[*count].atu_23 = atu_23;</div><div class='add'>+		table[*count].atu_45 = atu_45;</div><div class='add'>+		(*count)++;</div><div class='add'>+	} while (!is_broadcast_ether_addr(addr.mac));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_atu_snapshot(struct devlink *dl,</div><div class='add'>+					 const struct devlink_region_ops *ops,</div><div class='add'>+					 struct netlink_ext_ack *extack,</div><div class='add'>+					 u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct mv88e6xxx_devlink_atu_entry *table;</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int fid = -1, err = 0, count = 0;</div><div class='add'>+</div><div class='add'>+	table = kcalloc(mv88e6xxx_num_databases(chip),</div><div class='add'>+			sizeof(struct mv88e6xxx_devlink_atu_entry),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		fid = find_next_bit(chip-&gt;fid_bitmap, MV88E6XXX_N_FID, fid + 1);</div><div class='add'>+		if (fid == MV88E6XXX_N_FID)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err =  mv88e6xxx_region_atu_snapshot_fid(chip, fid, table,</div><div class='add'>+							 &amp;count);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(table);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*data = (u8 *)table;</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mv88e6xxx_devlink_vtu_entry - Devlink VTU entry</div><div class='add'>+ * @fid:   Global1/2:   FID and VLAN policy.</div><div class='add'>+ * @sid:   Global1/3:   SID, unknown filters and learning.</div><div class='add'>+ * @op:    Global1/5:   FID (old chipsets).</div><div class='add'>+ * @vid:   Global1/6:   VID, valid, and page.</div><div class='add'>+ * @data:  Global1/7-9: Membership data and priority override.</div><div class='add'>+ * @resvd: Reserved. Also happens to align the size to 16B.</div><div class='add'>+ *</div><div class='add'>+ * The VTU entry format varies between chipset generations, the</div><div class='add'>+ * descriptions above represent the superset of all possible</div><div class='add'>+ * information, not all fields are valid on all devices. Since this is</div><div class='add'>+ * a low-level debug interface, copy all data verbatim and defer</div><div class='add'>+ * parsing to the consumer.</div><div class='add'>+ */</div><div class='add'>+struct mv88e6xxx_devlink_vtu_entry {</div><div class='add'>+	u16 fid;</div><div class='add'>+	u16 sid;</div><div class='add'>+	u16 op;</div><div class='add'>+	u16 vid;</div><div class='add'>+	u16 data[3];</div><div class='add'>+	u16 resvd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_vtu_snapshot(struct devlink *dl,</div><div class='add'>+					 const struct devlink_region_ops *ops,</div><div class='add'>+					 struct netlink_ext_ack *extack,</div><div class='add'>+					 u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_devlink_vtu_entry *table, *entry;</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_vtu_entry vlan;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	table = kcalloc(mv88e6xxx_max_vid(chip) + 1,</div><div class='add'>+			sizeof(struct mv88e6xxx_devlink_vtu_entry),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry = table;</div><div class='add'>+	vlan.vid = mv88e6xxx_max_vid(chip);</div><div class='add'>+	vlan.valid = false;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = mv88e6xxx_g1_vtu_getnext(chip, &amp;vlan);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!vlan.valid)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6352_G1_VTU_FID,</div><div class='add'>+						&amp;entry-&gt;fid);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6352_G1_VTU_SID,</div><div class='add'>+						&amp;entry-&gt;sid);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP,</div><div class='add'>+						&amp;entry-&gt;op);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_VID,</div><div class='add'>+						&amp;entry-&gt;vid);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA1,</div><div class='add'>+						&amp;entry-&gt;data[0]);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA2,</div><div class='add'>+						&amp;entry-&gt;data[1]);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA3,</div><div class='add'>+						&amp;entry-&gt;data[2]);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		entry++;</div><div class='add'>+	} while (vlan.vid &lt; mv88e6xxx_max_vid(chip));</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(table);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data = (u8 *)table;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct mv88e6xxx_devlink_stu_entry - Devlink STU entry</div><div class='add'>+ * @sid:   Global1/3:   SID, unknown filters and learning.</div><div class='add'>+ * @vid:   Global1/6:   Valid bit.</div><div class='add'>+ * @data:  Global1/7-9: Membership data and priority override.</div><div class='add'>+ * @resvd: Reserved. In case we forgot something.</div><div class='add'>+ *</div><div class='add'>+ * The STU entry format varies between chipset generations. Peridot</div><div class='add'>+ * and Amethyst packs the STU data into Global1/7-8. Older silicon</div><div class='add'>+ * spreads the information across all three VTU data registers -</div><div class='add'>+ * inheriting the layout of even older hardware that had no STU at</div><div class='add'>+ * all. Since this is a low-level debug interface, copy all data</div><div class='add'>+ * verbatim and defer parsing to the consumer.</div><div class='add'>+ */</div><div class='add'>+struct mv88e6xxx_devlink_stu_entry {</div><div class='add'>+	u16 sid;</div><div class='add'>+	u16 vid;</div><div class='add'>+	u16 data[3];</div><div class='add'>+	u16 resvd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_stu_snapshot(struct devlink *dl,</div><div class='add'>+					 const struct devlink_region_ops *ops,</div><div class='add'>+					 struct netlink_ext_ack *extack,</div><div class='add'>+					 u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_devlink_stu_entry *table, *entry;</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct mv88e6xxx_stu_entry stu;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	table = kcalloc(mv88e6xxx_max_sid(chip) + 1,</div><div class='add'>+			sizeof(struct mv88e6xxx_devlink_stu_entry),</div><div class='add'>+			GFP_KERNEL);</div><div class='add'>+	if (!table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	entry = table;</div><div class='add'>+	stu.sid = mv88e6xxx_max_sid(chip);</div><div class='add'>+	stu.valid = false;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = mv88e6xxx_g1_stu_getnext(chip, &amp;stu);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!stu.valid)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6352_G1_VTU_SID,</div><div class='add'>+						&amp;entry-&gt;sid);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_VID,</div><div class='add'>+						&amp;entry-&gt;vid);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA1,</div><div class='add'>+						&amp;entry-&gt;data[0]);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA2,</div><div class='add'>+						&amp;entry-&gt;data[1]);</div><div class='add'>+		err = err ? : mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_DATA3,</div><div class='add'>+						&amp;entry-&gt;data[2]);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		entry++;</div><div class='add'>+	} while (stu.sid &lt; mv88e6xxx_max_sid(chip));</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(table);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data = (u8 *)table;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_pvt_snapshot(struct devlink *dl,</div><div class='add'>+					 const struct devlink_region_ops *ops,</div><div class='add'>+					 struct netlink_ext_ack *extack,</div><div class='add'>+					 u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int dev, port, err;</div><div class='add'>+	u16 *pvt, *cur;</div><div class='add'>+</div><div class='add'>+	pvt = kcalloc(MV88E6XXX_MAX_PVT_ENTRIES, sizeof(*pvt), GFP_KERNEL);</div><div class='add'>+	if (!pvt)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+</div><div class='add'>+	cur = pvt;</div><div class='add'>+	for (dev = 0; dev &lt; MV88E6XXX_MAX_PVT_SWITCHES; dev++) {</div><div class='add'>+		for (port = 0; port &lt; MV88E6XXX_MAX_PVT_PORTS; port++) {</div><div class='add'>+			err = mv88e6xxx_g2_pvt_read(chip, dev, port, cur);</div><div class='add'>+			if (err)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			cur++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(pvt);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*data = (u8 *)pvt;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_region_port_snapshot(struct devlink_port *devlink_port,</div><div class='add'>+					  const struct devlink_port_region_ops *ops,</div><div class='add'>+					  struct netlink_ext_ack *extack,</div><div class='add'>+					  u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_port_to_ds(devlink_port);</div><div class='add'>+	int port = dsa_devlink_port_to_port(devlink_port);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	u16 *registers;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	registers = kmalloc_array(32, sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (!registers)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	for (i = 0; i &lt; 32; i++) {</div><div class='add'>+		err = mv88e6xxx_port_read(chip, port, i, &amp;registers[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(registers);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	*data = (u8 *)registers;</div><div class='add'>+out:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mv88e6xxx_region_priv mv88e6xxx_region_global1_priv = {</div><div class='add'>+	.id = MV88E6XXX_REGION_GLOBAL1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops mv88e6xxx_region_global1_ops = {</div><div class='add'>+	.name = "global1",</div><div class='add'>+	.snapshot = mv88e6xxx_region_global_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+	.priv = &amp;mv88e6xxx_region_global1_priv,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv88e6xxx_region_priv mv88e6xxx_region_global2_priv = {</div><div class='add'>+	.id = MV88E6XXX_REGION_GLOBAL2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops mv88e6xxx_region_global2_ops = {</div><div class='add'>+	.name = "global2",</div><div class='add'>+	.snapshot = mv88e6xxx_region_global_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+	.priv = &amp;mv88e6xxx_region_global2_priv,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops mv88e6xxx_region_atu_ops = {</div><div class='add'>+	.name = "atu",</div><div class='add'>+	.snapshot = mv88e6xxx_region_atu_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops mv88e6xxx_region_vtu_ops = {</div><div class='add'>+	.name = "vtu",</div><div class='add'>+	.snapshot = mv88e6xxx_region_vtu_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops mv88e6xxx_region_stu_ops = {</div><div class='add'>+	.name = "stu",</div><div class='add'>+	.snapshot = mv88e6xxx_region_stu_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_region_ops mv88e6xxx_region_pvt_ops = {</div><div class='add'>+	.name = "pvt",</div><div class='add'>+	.snapshot = mv88e6xxx_region_pvt_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_port_region_ops mv88e6xxx_region_port_ops = {</div><div class='add'>+	.name = "port",</div><div class='add'>+	.snapshot = mv88e6xxx_region_port_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_region {</div><div class='add'>+	const struct devlink_region_ops *ops;</div><div class='add'>+	u64 size;</div><div class='add'>+</div><div class='add'>+	bool (*cond)(struct mv88e6xxx_chip *chip);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct mv88e6xxx_region mv88e6xxx_regions[] = {</div><div class='add'>+	[MV88E6XXX_REGION_GLOBAL1] = {</div><div class='add'>+		.ops = &amp;mv88e6xxx_region_global1_ops,</div><div class='add'>+		.size = 32 * sizeof(u16)</div><div class='add'>+	},</div><div class='add'>+	[MV88E6XXX_REGION_GLOBAL2] = {</div><div class='add'>+		.ops = &amp;mv88e6xxx_region_global2_ops,</div><div class='add'>+		.size = 32 * sizeof(u16) },</div><div class='add'>+	[MV88E6XXX_REGION_ATU] = {</div><div class='add'>+		.ops = &amp;mv88e6xxx_region_atu_ops</div><div class='add'>+	  /* calculated at runtime */</div><div class='add'>+	},</div><div class='add'>+	[MV88E6XXX_REGION_VTU] = {</div><div class='add'>+		.ops = &amp;mv88e6xxx_region_vtu_ops</div><div class='add'>+	  /* calculated at runtime */</div><div class='add'>+	},</div><div class='add'>+	[MV88E6XXX_REGION_STU] = {</div><div class='add'>+		.ops = &amp;mv88e6xxx_region_stu_ops,</div><div class='add'>+		.cond = mv88e6xxx_has_stu,</div><div class='add'>+	  /* calculated at runtime */</div><div class='add'>+	},</div><div class='add'>+	[MV88E6XXX_REGION_PVT] = {</div><div class='add'>+		.ops = &amp;mv88e6xxx_region_pvt_ops,</div><div class='add'>+		.size = MV88E6XXX_MAX_PVT_ENTRIES * sizeof(u16),</div><div class='add'>+		.cond = mv88e6xxx_has_pvt,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void mv88e6xxx_teardown_devlink_regions_global(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6xxx_regions); i++)</div><div class='add'>+		if (chip-&gt;regions[i])</div><div class='add'>+			dsa_devlink_region_destroy(chip-&gt;regions[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void mv88e6xxx_teardown_devlink_regions_port(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dsa_devlink_region_destroy(chip-&gt;ports[port].region);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_setup_devlink_regions_port(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+</div><div class='add'>+	region = dsa_devlink_port_region_create(ds,</div><div class='add'>+						port,</div><div class='add'>+						&amp;mv88e6xxx_region_port_ops, 1,</div><div class='add'>+						32 * sizeof(u16));</div><div class='add'>+	if (IS_ERR(region))</div><div class='add'>+		return PTR_ERR(region);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].region = region;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_setup_devlink_regions_global(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	bool (*cond)(struct mv88e6xxx_chip *chip);</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+	const struct devlink_region_ops *ops;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	u64 size;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6xxx_regions); i++) {</div><div class='add'>+		ops = mv88e6xxx_regions[i].ops;</div><div class='add'>+		size = mv88e6xxx_regions[i].size;</div><div class='add'>+		cond = mv88e6xxx_regions[i].cond;</div><div class='add'>+</div><div class='add'>+		if (cond &amp;&amp; !cond(chip))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (i) {</div><div class='add'>+		case MV88E6XXX_REGION_ATU:</div><div class='add'>+			size = mv88e6xxx_num_databases(chip) *</div><div class='add'>+				sizeof(struct mv88e6xxx_devlink_atu_entry);</div><div class='add'>+			break;</div><div class='add'>+		case MV88E6XXX_REGION_VTU:</div><div class='add'>+			size = (mv88e6xxx_max_vid(chip) + 1) *</div><div class='add'>+				sizeof(struct mv88e6xxx_devlink_vtu_entry);</div><div class='add'>+			break;</div><div class='add'>+		case MV88E6XXX_REGION_STU:</div><div class='add'>+			size = (mv88e6xxx_max_sid(chip) + 1) *</div><div class='add'>+				sizeof(struct mv88e6xxx_devlink_stu_entry);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		region = dsa_devlink_region_create(ds, ops, 1, size);</div><div class='add'>+		if (IS_ERR(region))</div><div class='add'>+			goto out;</div><div class='add'>+		chip-&gt;regions[i] = region;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		dsa_devlink_region_destroy(chip-&gt;regions[j]);</div><div class='add'>+</div><div class='add'>+	return PTR_ERR(region);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_devlink_info_get(struct dsa_switch *ds,</div><div class='add'>+			       struct devlink_info_req *req,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return devlink_info_version_fixed_put(req,</div><div class='add'>+					      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,</div><div class='add'>+					      chip-&gt;info-&gt;name);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/devlink.h b/drivers/net/dsa/mv88e6xxx/devlink.h<br/>new file mode 100644<br/>index 000000000000..65ce6a6858b9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/devlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/devlink.h</a></div><div class='hunk'>@@ -0,0 +1,23 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+</div><div class='add'>+/* Marvell 88E6xxx Switch devlink support. */</div><div class='add'>+</div><div class='add'>+#ifndef _MV88E6XXX_DEVLINK_H</div><div class='add'>+#define _MV88E6XXX_DEVLINK_H</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_setup_devlink_params(struct dsa_switch *ds);</div><div class='add'>+void mv88e6xxx_teardown_devlink_params(struct dsa_switch *ds);</div><div class='add'>+int mv88e6xxx_setup_devlink_resources(struct dsa_switch *ds);</div><div class='add'>+int mv88e6xxx_devlink_param_get(struct dsa_switch *ds, u32 id,</div><div class='add'>+				struct devlink_param_gset_ctx *ctx);</div><div class='add'>+int mv88e6xxx_devlink_param_set(struct dsa_switch *ds, u32 id,</div><div class='add'>+				struct devlink_param_gset_ctx *ctx);</div><div class='add'>+int mv88e6xxx_setup_devlink_regions_global(struct dsa_switch *ds);</div><div class='add'>+void mv88e6xxx_teardown_devlink_regions_global(struct dsa_switch *ds);</div><div class='add'>+int mv88e6xxx_setup_devlink_regions_port(struct dsa_switch *ds, int port);</div><div class='add'>+void mv88e6xxx_teardown_devlink_regions_port(struct dsa_switch *ds, int port);</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_devlink_info_get(struct dsa_switch *ds,</div><div class='add'>+			       struct devlink_info_req *req,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='add'>+#endif /* _MV88E6XXX_DEVLINK_H */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global1.c b/drivers/net/dsa/mv88e6xxx/global1.c<br/>index 09b8a3d0dd37..9820cd596757 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global1.c</a></div><div class='hunk'>@@ -27,100 +27,141 @@ int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val)</div><div class='ctx'> 	return mv88e6xxx_write(chip, addr, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask)</div><div class='add'>+int mv88e6xxx_g1_wait_bit(struct mv88e6xxx_chip *chip, int reg, int</div><div class='add'>+			  bit, int val)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_wait(chip, chip-&gt;info-&gt;global1_addr, reg, mask);</div><div class='add'>+	return mv88e6xxx_wait_bit(chip, chip-&gt;info-&gt;global1_addr, reg,</div><div class='add'>+				  bit, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_g1_wait_mask(struct mv88e6xxx_chip *chip, int reg,</div><div class='add'>+			   u16 mask, u16 val)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_wait_mask(chip, chip-&gt;info-&gt;global1_addr, reg,</div><div class='add'>+				   mask, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x00: Switch Global Status Register */</div><div class='ctx'> </div><div class='ctx'> static int mv88e6185_g1_wait_ppu_disabled(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	u16 state;</div><div class='del'>-	int i, err;</div><div class='add'>+	return mv88e6xxx_g1_wait_mask(chip, MV88E6XXX_G1_STS,</div><div class='add'>+				      MV88E6185_G1_STS_PPU_STATE_MASK,</div><div class='add'>+				      MV88E6185_G1_STS_PPU_STATE_DISABLED);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='del'>-		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;state);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+static int mv88e6185_g1_wait_ppu_polling(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_g1_wait_mask(chip, MV88E6XXX_G1_STS,</div><div class='add'>+				      MV88E6185_G1_STS_PPU_STATE_MASK,</div><div class='add'>+				      MV88E6185_G1_STS_PPU_STATE_POLLING);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		/* Check the value of the PPUState bits 15:14 */</div><div class='del'>-		state &amp;= MV88E6185_G1_STS_PPU_STATE_MASK;</div><div class='del'>-		if (state != MV88E6185_G1_STS_PPU_STATE_POLLING)</div><div class='del'>-			return 0;</div><div class='add'>+static int mv88e6352_g1_wait_ppu_polling(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int bit = __bf_shf(MV88E6352_G1_STS_PPU_STATE);</div><div class='ctx'> </div><div class='del'>-		usleep_range(1000, 2000);</div><div class='del'>-	}</div><div class='add'>+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_STS, bit, 1);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return -ETIMEDOUT;</div><div class='add'>+static int mv88e6xxx_g1_wait_init_ready(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G1_STS_INIT_READY);</div><div class='add'>+</div><div class='add'>+	/* Wait up to 1 second for the switch to be ready. The InitReady bit 11</div><div class='add'>+	 * is set to a one when all units inside the device (ATU, VTU, etc.)</div><div class='add'>+	 * have finished their initialization and are ready to accept frames.</div><div class='add'>+	 */</div><div class='add'>+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_STS, bit, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6185_g1_wait_ppu_polling(struct mv88e6xxx_chip *chip)</div><div class='add'>+static int mv88e6250_g1_eeprom_reload(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	u16 state;</div><div class='del'>-	int i, err;</div><div class='add'>+	/* MV88E6185_G1_CTL1_RELOAD_EEPROM is also valid for 88E6250 */</div><div class='add'>+	int bit = __bf_shf(MV88E6185_G1_CTL1_RELOAD_EEPROM);</div><div class='add'>+	u16 val;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 16; ++i) {</div><div class='del'>-		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;state);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-		/* Check the value of the PPUState bits 15:14 */</div><div class='del'>-		state &amp;= MV88E6185_G1_STS_PPU_STATE_MASK;</div><div class='del'>-		if (state == MV88E6185_G1_STS_PPU_STATE_POLLING)</div><div class='del'>-			return 0;</div><div class='add'>+	val |= MV88E6185_G1_CTL1_RELOAD_EEPROM;</div><div class='ctx'> </div><div class='del'>-		usleep_range(1000, 2000);</div><div class='del'>-	}</div><div class='add'>+	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return -ETIMEDOUT;</div><div class='add'>+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_CTL1, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6352_g1_wait_ppu_polling(struct mv88e6xxx_chip *chip)</div><div class='add'>+/* Returns 0 when done, -EBUSY when waiting, other negative codes on error */</div><div class='add'>+static int mv88e6xxx_g1_is_eeprom_done(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	u16 state;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 16; ++i) {</div><div class='del'>-		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;state);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		/* Check the value of the PPUState (or InitState) bit 15 */</div><div class='del'>-		if (state &amp; MV88E6352_G1_STS_PPU_STATE)</div><div class='del'>-			return 0;</div><div class='add'>+	u16 val;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-		usleep_range(1000, 2000);</div><div class='add'>+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;val);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(chip-&gt;dev, "Error reading status");</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return -ETIMEDOUT;</div><div class='add'>+	/* If the switch is still resetting, it may not</div><div class='add'>+	 * respond on the bus, and so MDIO read returns</div><div class='add'>+	 * 0xffff. Differentiate between that, and waiting for</div><div class='add'>+	 * the EEPROM to be done by bit 0 being set.</div><div class='add'>+	 */</div><div class='add'>+	if (val == 0xffff || !(val &amp; BIT(MV88E6XXX_G1_STS_IRQ_EEPROM_DONE)))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g1_wait_init_ready(struct mv88e6xxx_chip *chip)</div><div class='add'>+/* As the EEInt (EEPROM done) flag clears on read if the status register, this</div><div class='add'>+ * function must be called directly after a hard reset or EEPROM ReLoad request,</div><div class='add'>+ * or the done condition may have been missed</div><div class='add'>+ */</div><div class='add'>+int mv88e6xxx_g1_wait_eeprom_done(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	const unsigned long timeout = jiffies + 1 * HZ;</div><div class='del'>-	u16 val;</div><div class='del'>-	int err;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Wait up to 1 second for the switch to be ready. The InitReady bit 11</div><div class='del'>-	 * is set to a one when all units inside the device (ATU, VTU, etc.)</div><div class='del'>-	 * have finished their initialization and are ready to accept frames.</div><div class='add'>+	/* Wait up to 1 second for the switch to finish reading the</div><div class='add'>+	 * EEPROM.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (time_before(jiffies, timeout)) {</div><div class='del'>-		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &amp;val);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='add'>+		ret = mv88e6xxx_g1_is_eeprom_done(chip);</div><div class='add'>+		if (ret != -EBUSY)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (val &amp; MV88E6XXX_G1_STS_INIT_READY)</div><div class='del'>-			break;</div><div class='add'>+	dev_err(chip-&gt;dev, "Timeout waiting for EEPROM done");</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		usleep_range(1000, 2000);</div><div class='del'>-	}</div><div class='add'>+int mv88e6250_g1_wait_eeprom_done_prereset(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (time_after(jiffies, timeout))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='add'>+	ret = mv88e6xxx_g1_is_eeprom_done(chip);</div><div class='add'>+	if (ret != -EBUSY)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Pre-reset, we don't know the state of the switch - when</div><div class='add'>+	 * mv88e6xxx_g1_is_eeprom_done() returns -EBUSY, that may be because</div><div class='add'>+	 * the switch is actually busy reading the EEPROM, or because</div><div class='add'>+	 * MV88E6XXX_G1_STS_IRQ_EEPROM_DONE has been cleared by an unrelated</div><div class='add'>+	 * status register read already.</div><div class='add'>+	 *</div><div class='add'>+	 * To account for the latter case, trigger another EEPROM reload for</div><div class='add'>+	 * another chance at seeing the done flag.</div><div class='add'>+	 */</div><div class='add'>+	ret = mv88e6250_g1_eeprom_reload(chip);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_wait_eeprom_done(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x01: Switch MAC Address Register Bytes 0 &amp; 1</div><div class='hunk'>@@ -178,7 +219,7 @@ int mv88e6185_g1_reset(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return mv88e6185_g1_wait_ppu_polling(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_g1_reset(struct mv88e6xxx_chip *chip)</div><div class='add'>+int mv88e6250_g1_reset(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -194,7 +235,14 @@ int mv88e6352_g1_reset(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_wait_init_ready(chip);</div><div class='add'>+	return mv88e6xxx_g1_wait_init_ready(chip);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6352_g1_reset(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6250_g1_reset(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -237,6 +285,25 @@ int mv88e6185_g1_ppu_disable(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return mv88e6185_g1_wait_ppu_disabled(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6185_g1_set_max_frame_size(struct mv88e6xxx_chip *chip, int mtu)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mtu += ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~MV88E6185_G1_CTL1_MAX_FRAME_1632;</div><div class='add'>+</div><div class='add'>+	if (mtu &gt; 1518)</div><div class='add'>+		val |= MV88E6185_G1_CTL1_MAX_FRAME_1632;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x10: IP-PRI Mapping Register 0</div><div class='ctx'>  * Offset 0x11: IP-PRI Mapping Register 1</div><div class='ctx'>  * Offset 0x12: IP-PRI Mapping Register 2</div><div class='hunk'>@@ -295,10 +362,18 @@ int mv88e6085_g1_ieee_pri_map(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_IEEE_PRI, 0xfa41);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6250_g1_ieee_pri_map(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	/* Reset the IEEE Tag priorities to defaults */</div><div class='add'>+	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_IEEE_PRI, 0xfa50);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x1a: Monitor Control */</div><div class='ctx'> /* Offset 0x1a: Monitor &amp; MGMT Control on some devices */</div><div class='ctx'> </div><div class='del'>-int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 enum mv88e6xxx_egress_direction direction,</div><div class='add'>+				 int port)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -307,11 +382,20 @@ int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	reg &amp;= ~(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK |</div><div class='del'>-		 MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);</div><div class='del'>-</div><div class='del'>-	reg |= port &lt;&lt; __bf_shf(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK) |</div><div class='del'>-		port &lt;&lt; __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_INGRESS:</div><div class='add'>+		reg &amp;= ~MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK;</div><div class='add'>+		reg |= port &lt;&lt;</div><div class='add'>+		       __bf_shf(MV88E6185_G1_MONITOR_CTL_INGRESS_DEST_MASK);</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_EGRESS:</div><div class='add'>+		reg &amp;= ~MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK;</div><div class='add'>+		reg |= port &lt;&lt;</div><div class='add'>+		       __bf_shf(MV88E6185_G1_MONITOR_CTL_EGRESS_DEST_MASK);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g1_write(chip, MV88E6185_G1_MONITOR_CTL, reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -345,28 +429,47 @@ static int mv88e6390_g1_monitor_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return mv88e6xxx_g1_write(chip, MV88E6390_G1_MONITOR_MGMT_CTL, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6390_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+int mv88e6390_g1_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 enum mv88e6xxx_egress_direction direction,</div><div class='add'>+				 int port)</div><div class='ctx'> {</div><div class='ctx'> 	u16 ptr;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_INGRESS_DEST;</div><div class='del'>-	err = mv88e6390_g1_monitor_write(chip, ptr, port);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST;</div><div class='del'>-	err = mv88e6390_g1_monitor_write(chip, ptr, port);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_INGRESS:</div><div class='add'>+		ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_INGRESS_DEST;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_EGRESS:</div><div class='add'>+		ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return mv88e6390_g1_monitor_write(chip, ptr, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='ctx'> 	u16 ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_CPU_DEST;</div><div class='ctx'> </div><div class='add'>+	/* Use the default high priority for management frames sent to</div><div class='add'>+	 * the CPU.</div><div class='add'>+	 */</div><div class='add'>+	port |= MV88E6390_G1_MONITOR_MGMT_CTL_PTR_CPU_DEST_MGMTPRI;</div><div class='add'>+</div><div class='add'>+	return mv88e6390_g1_monitor_write(chip, ptr, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6390_g1_set_ptp_cpu_port(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	u16 ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_PTP_CPU_DEST;</div><div class='add'>+</div><div class='add'>+	/* Use the default high priority for PTP frames sent to</div><div class='add'>+	 * the CPU.</div><div class='add'>+	 */</div><div class='add'>+	port |= MV88E6390_G1_MONITOR_MGMT_CTL_PTR_CPU_DEST_MGMTPRI;</div><div class='add'>+</div><div class='ctx'> 	return mv88e6390_g1_monitor_write(chip, ptr, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -375,26 +478,26 @@ int mv88e6390_g1_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	u16 ptr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* 01:c2:80:00:00:00:00-01:c2:80:00:00:00:07 are Management */</div><div class='del'>-	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000000XLO;</div><div class='add'>+	/* 01:80:c2:00:00:00-01:80:c2:00:00:07 are Management */</div><div class='add'>+	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200000XLO;</div><div class='ctx'> 	err = mv88e6390_g1_monitor_write(chip, ptr, 0xff);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* 01:c2:80:00:00:00:08-01:c2:80:00:00:00:0f are Management */</div><div class='del'>-	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000000XHI;</div><div class='add'>+	/* 01:80:c2:00:00:08-01:80:c2:00:00:0f are Management */</div><div class='add'>+	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200000XHI;</div><div class='ctx'> 	err = mv88e6390_g1_monitor_write(chip, ptr, 0xff);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* 01:c2:80:00:00:00:20-01:c2:80:00:00:00:27 are Management */</div><div class='del'>-	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000002XLO;</div><div class='add'>+	/* 01:80:c2:00:00:20-01:80:c2:00:00:27 are Management */</div><div class='add'>+	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200002XLO;</div><div class='ctx'> 	err = mv88e6390_g1_monitor_write(chip, ptr, 0xff);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	/* 01:c2:80:00:00:00:28-01:c2:80:00:00:00:2f are Management */</div><div class='del'>-	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000002XHI;</div><div class='add'>+	/* 01:80:c2:00:00:28-01:80:c2:00:00:2f are Management */</div><div class='add'>+	ptr = MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200002XHI;</div><div class='ctx'> 	err = mv88e6390_g1_monitor_write(chip, ptr, 0xff);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -448,8 +551,7 @@ int mv88e6390_g1_rmu_disable(struct mv88e6xxx_chip *chip)</div><div class='ctx'> int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	return mv88e6xxx_g1_ctl2_mask(chip, MV88E6390_G1_CTL2_HIST_MODE_MASK,</div><div class='del'>-				      MV88E6390_G1_CTL2_HIST_MODE_RX |</div><div class='del'>-				      MV88E6390_G1_CTL2_HIST_MODE_TX);</div><div class='add'>+				      MV88E6390_G1_CTL2_HIST_MODE_RX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g1_set_device_number(struct mv88e6xxx_chip *chip, int index)</div><div class='hunk'>@@ -461,10 +563,11 @@ int mv88e6xxx_g1_set_device_number(struct mv88e6xxx_chip *chip, int index)</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x1d: Statistics Operation 2 */</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g1_stats_wait(struct mv88e6xxx_chip *chip)</div><div class='add'>+static int mv88e6xxx_g1_stats_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g1_wait(chip, MV88E6XXX_G1_STATS_OP,</div><div class='del'>-				 MV88E6XXX_G1_STATS_OP_BUSY);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G1_STATS_OP_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_STATS_OP, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6095_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -476,7 +579,7 @@ int mv88e6095_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	val |= MV88E6XXX_G1_STATS_OP_HIST_RX_TX;</div><div class='add'>+	val |= MV88E6XXX_G1_STATS_OP_HIST_RX;</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_STATS_OP, val);</div><div class='ctx'> </div><div class='hunk'>@@ -491,7 +594,7 @@ int mv88e6xxx_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_STATS_OP,</div><div class='ctx'> 				 MV88E6XXX_G1_STATS_OP_BUSY |</div><div class='ctx'> 				 MV88E6XXX_G1_STATS_OP_CAPTURE_PORT |</div><div class='del'>-				 MV88E6XXX_G1_STATS_OP_HIST_RX_TX | port);</div><div class='add'>+				 MV88E6XXX_G1_STATS_OP_HIST_RX | port);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global1.h b/drivers/net/dsa/mv88e6xxx/global1.h<br/>index 7bd5ab733a3f..3dbb7a1b8fe1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global1.h</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #define MV88E6185_G1_STS_PPU_STATE_DISABLED		0x8000</div><div class='ctx'> #define MV88E6185_G1_STS_PPU_STATE_POLLING		0xc000</div><div class='ctx'> #define MV88E6XXX_G1_STS_INIT_READY			0x0800</div><div class='add'>+#define MV88E6393X_G1_STS_IRQ_DEVICE_2			9</div><div class='ctx'> #define MV88E6XXX_G1_STS_IRQ_AVB			8</div><div class='ctx'> #define MV88E6XXX_G1_STS_IRQ_DEVICE			7</div><div class='ctx'> #define MV88E6XXX_G1_STS_IRQ_STATS			6</div><div class='hunk'>@@ -45,6 +46,7 @@</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x02: VTU FID Register */</div><div class='ctx'> #define MV88E6352_G1_VTU_FID		0x02</div><div class='add'>+#define MV88E6352_G1_VTU_FID_VID_POLICY	0x1000</div><div class='ctx'> #define MV88E6352_G1_VTU_FID_MASK	0x0fff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x03: VTU SID Register */</div><div class='hunk'>@@ -59,6 +61,7 @@</div><div class='ctx'> #define MV88E6185_G1_CTL1_SCHED_PRIO		0x0800</div><div class='ctx'> #define MV88E6185_G1_CTL1_MAX_FRAME_1632	0x0400</div><div class='ctx'> #define MV88E6185_G1_CTL1_RELOAD_EEPROM		0x0200</div><div class='add'>+#define MV88E6393X_G1_CTL1_DEVICE2_EN		0x0200</div><div class='ctx'> #define MV88E6XXX_G1_CTL1_DEVICE_EN		0x0080</div><div class='ctx'> #define MV88E6XXX_G1_CTL1_STATS_DONE_EN		0x0040</div><div class='ctx'> #define MV88E6XXX_G1_CTL1_VTU_PROBLEM_EN	0x0020</div><div class='hunk'>@@ -109,6 +112,7 @@</div><div class='ctx'> /* Offset 0x0A: ATU Control Register */</div><div class='ctx'> #define MV88E6XXX_G1_ATU_CTL		0x0a</div><div class='ctx'> #define MV88E6XXX_G1_ATU_CTL_LEARN2ALL	0x0008</div><div class='add'>+#define MV88E6161_G1_ATU_CTL_HASH_MASK	0x0003</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0B: ATU Operation Register */</div><div class='ctx'> #define MV88E6XXX_G1_ATU_OP				0x0b</div><div class='hunk'>@@ -128,19 +132,36 @@</div><div class='ctx'> #define MV88E6XXX_G1_ATU_OP_FULL_VIOLATION		BIT(4)</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0C: ATU Data Register */</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA				0x0c</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_TRUNK			0x8000</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_TRUNK_ID_MASK		0x00f0</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_PORT_VECTOR_MASK		0x3ff0</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_MASK		0x000f</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_UNUSED		0x0000</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_UC_MGMT		0x000d</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC		0x000e</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_UC_PRIO_OVER	0x000f</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_MC_NONE_RATE	0x0005</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC		0x0007</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_MC_MGMT		0x000e</div><div class='del'>-#define MV88E6XXX_G1_ATU_DATA_STATE_MC_PRIO_OVER	0x000f</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA					0x0c</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_TRUNK				0x8000</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_TRUNK_ID_MASK			0x00f0</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_PORT_VECTOR_MASK			0x3ff0</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MASK			0x000f</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_UNUSED			0x0000</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_1_OLDEST		0x0001</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_2			0x0002</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_3			0x0003</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_4			0x0004</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_5			0x0005</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_6			0x0006</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_AGE_7_NEWEST		0x0007</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_POLICY		0x0008</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_POLICY_PO		0x0009</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_AVB_NRL		0x000a</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_AVB_NRL_PO	0x000b</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_DA_MGMT		0x000c</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_DA_MGMT_PO	0x000d</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC			0x000e</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC_PO		0x000f</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_UNUSED			0x0000</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_POLICY		0x0004</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_AVB_NRL		0x0005</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_DA_MGMT		0x0006</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC			0x0007</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_POLICY_PO		0x000c</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_AVB_NRL_PO	0x000d</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_DA_MGMT_PO	0x000e</div><div class='add'>+#define MV88E6XXX_G1_ATU_DATA_STATE_MC_STATIC_PO		0x000f</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0D: ATU MAC Address Register Bytes 0 &amp; 1</div><div class='ctx'>  * Offset 0x0E: ATU MAC Address Register Bytes 2 &amp; 3</div><div class='hunk'>@@ -186,13 +207,15 @@</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL				0x1a</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL_UPDATE			0x8000</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_MASK			0x3f00</div><div class='del'>-#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000000XLO	0x0000</div><div class='del'>-#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000000XHI	0x0100</div><div class='del'>-#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000002XLO	0x0200</div><div class='del'>-#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C280000002XHI	0x0300</div><div class='add'>+#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200000XLO	0x0000</div><div class='add'>+#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200000XHI	0x0100</div><div class='add'>+#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200002XLO	0x0200</div><div class='add'>+#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_0180C200002XHI	0x0300</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_INGRESS_DEST		0x2000</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_EGRESS_DEST		0x2100</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_CPU_DEST		0x3000</div><div class='add'>+#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_PTP_CPU_DEST		0x3200</div><div class='add'>+#define MV88E6390_G1_MONITOR_MGMT_CTL_PTR_CPU_DEST_MGMTPRI	0x00e0</div><div class='ctx'> #define MV88E6390_G1_MONITOR_MGMT_CTL_DATA_MASK			0x00ff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x1C: Global Control 2 */</div><div class='hunk'>@@ -249,17 +272,24 @@</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g1_read(struct mv88e6xxx_chip *chip, int reg, u16 *val);</div><div class='ctx'> int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val);</div><div class='del'>-int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask);</div><div class='add'>+int mv88e6xxx_g1_wait_bit(struct mv88e6xxx_chip *chip, int reg, int</div><div class='add'>+			  bit, int val);</div><div class='add'>+int mv88e6xxx_g1_wait_mask(struct mv88e6xxx_chip *chip, int reg,</div><div class='add'>+			   u16 mask, u16 val);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr);</div><div class='ctx'> </div><div class='ctx'> int mv88e6185_g1_reset(struct mv88e6xxx_chip *chip);</div><div class='ctx'> int mv88e6352_g1_reset(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6250_g1_reset(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6xxx_g1_wait_eeprom_done(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6250_g1_wait_eeprom_done_prereset(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> int mv88e6185_g1_ppu_enable(struct mv88e6xxx_chip *chip);</div><div class='ctx'> int mv88e6185_g1_ppu_disable(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g1_stats_wait(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6185_g1_set_max_frame_size(struct mv88e6xxx_chip *chip, int mtu);</div><div class='add'>+</div><div class='ctx'> int mv88e6xxx_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6320_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6390_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);</div><div class='hunk'>@@ -267,14 +297,21 @@ int mv88e6095_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);</div><div class='ctx'> int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);</div><div class='ctx'> void mv88e6xxx_g1_stats_read(struct mv88e6xxx_chip *chip, int stat, u32 *val);</div><div class='ctx'> int mv88e6xxx_g1_stats_clear(struct mv88e6xxx_chip *chip);</div><div class='del'>-int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-int mv88e6390_g1_set_egress_port(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6095_g1_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 enum mv88e6xxx_egress_direction direction,</div><div class='add'>+				 int port);</div><div class='add'>+int mv88e6390_g1_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+				 enum mv88e6xxx_egress_direction direction,</div><div class='add'>+				 int port);</div><div class='ctx'> int mv88e6095_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6390_g1_set_cpu_port(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6390_g1_set_ptp_cpu_port(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6390_g1_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> int mv88e6085_g1_ip_pri_map(struct mv88e6xxx_chip *chip);</div><div class='add'>+</div><div class='ctx'> int mv88e6085_g1_ieee_pri_map(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6250_g1_ieee_pri_map(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> int mv88e6185_g1_set_cascade_port(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> </div><div class='hunk'>@@ -296,7 +333,11 @@ int mv88e6xxx_g1_atu_remove(struct mv88e6xxx_chip *chip, u16 fid, int port,</div><div class='ctx'> 			    bool all);</div><div class='ctx'> int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip);</div><div class='ctx'> void mv88e6xxx_g1_atu_prob_irq_free(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6165_g1_atu_get_hash(struct mv88e6xxx_chip *chip, u8 *hash);</div><div class='add'>+int mv88e6165_g1_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash);</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_vtu_entry *entry);</div><div class='ctx'> int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 			     struct mv88e6xxx_vtu_entry *entry);</div><div class='ctx'> int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -310,7 +351,18 @@ int mv88e6390_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> int mv88e6390_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 			       struct mv88e6xxx_vtu_entry *entry);</div><div class='ctx'> int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6xxx_g1_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry);</div><div class='add'>+int mv88e6352_g1_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry);</div><div class='add'>+int mv88e6352_g1_stu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       struct mv88e6xxx_stu_entry *entry);</div><div class='add'>+int mv88e6390_g1_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry);</div><div class='add'>+int mv88e6390_g1_stu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       struct mv88e6xxx_stu_entry *entry);</div><div class='ctx'> int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip);</div><div class='ctx'> void mv88e6xxx_g1_vtu_prob_irq_free(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6xxx_g1_atu_get_next(struct mv88e6xxx_chip *chip, u16 fid);</div><div class='ctx'> </div><div class='ctx'> #endif /* _MV88E6XXX_GLOBAL1_H */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global1_atu.c b/drivers/net/dsa/mv88e6xxx/global1_atu.c<br/>index 4542dfa5fc69..c47f068f56b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1_atu.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1_atu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1_atu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global1_atu.c</a></div><div class='hunk'>@@ -5,11 +5,15 @@</div><div class='ctx'>  * Copyright (c) 2008 Marvell Semiconductor</div><div class='ctx'>  * Copyright (c) 2017 Savoir-faire Linux, Inc.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "chip.h"</div><div class='ctx'> #include "global1.h"</div><div class='add'>+#include "switchdev.h"</div><div class='add'>+#include "trace.h"</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x01: ATU FID Register */</div><div class='ctx'> </div><div class='hunk'>@@ -71,12 +75,58 @@ int mv88e6xxx_g1_atu_set_age_time(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6165_g1_atu_get_hash(struct mv88e6xxx_chip *chip, u8 *hash)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*hash = val &amp; MV88E6161_G1_ATU_CTL_HASH_MASK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6165_g1_atu_set_hash(struct mv88e6xxx_chip *chip, u8 hash)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	if (hash &amp; ~MV88E6161_G1_ATU_CTL_HASH_MASK)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~MV88E6161_G1_ATU_CTL_HASH_MASK;</div><div class='add'>+	val |= hash;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_ATU_CTL, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x0B: ATU Operation Register */</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_atu_op_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g1_wait(chip, MV88E6XXX_G1_ATU_OP,</div><div class='del'>-				 MV88E6XXX_G1_ATU_OP_BUSY);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G1_ATU_OP_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_ATU_OP, bit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_g1_read_atu_violation(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_ATU_OP,</div><div class='add'>+				 MV88E6XXX_G1_ATU_OP_BUSY |</div><div class='add'>+				 MV88E6XXX_G1_ATU_OP_GET_CLR_VIOLATION);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_atu_op_wait(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_atu_op(struct mv88e6xxx_chip *chip, u16 fid, u16 op)</div><div class='hunk'>@@ -90,7 +140,7 @@ static int mv88e6xxx_g1_atu_op(struct mv88e6xxx_chip *chip, u16 fid, u16 op)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	} else {</div><div class='del'>-		if (mv88e6xxx_num_databases(chip) &gt; 16) {</div><div class='add'>+		if (mv88e6xxx_num_databases(chip) &gt; 64) {</div><div class='ctx'> 			/* ATU DBNum[7:4] are located in ATU Control 15:12 */</div><div class='ctx'> 			err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL,</div><div class='ctx'> 						&amp;val);</div><div class='hunk'>@@ -102,6 +152,9 @@ static int mv88e6xxx_g1_atu_op(struct mv88e6xxx_chip *chip, u16 fid, u16 op)</div><div class='ctx'> 						 val);</div><div class='ctx'> 			if (err)</div><div class='ctx'> 				return err;</div><div class='add'>+		} else if (mv88e6xxx_num_databases(chip) &gt; 16) {</div><div class='add'>+			/* ATU DBNum[5:4] are located in ATU Operation 9:8 */</div><div class='add'>+			op |= (fid &amp; 0x30) &lt;&lt; 4;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* ATU DBNum[3:0] are located in ATU Operation 3:0 */</div><div class='hunk'>@@ -116,6 +169,46 @@ static int mv88e6xxx_g1_atu_op(struct mv88e6xxx_chip *chip, u16 fid, u16 op)</div><div class='ctx'> 	return mv88e6xxx_g1_atu_op_wait(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_g1_atu_get_next(struct mv88e6xxx_chip *chip, u16 fid)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_g1_atu_op(chip, fid, MV88E6XXX_G1_ATU_OP_GET_NEXT_DB);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_g1_atu_fid_read(struct mv88e6xxx_chip *chip, u16 *fid)</div><div class='add'>+{</div><div class='add'>+	u16 val = 0, upper = 0, op = 0;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (mv88e6xxx_num_databases(chip) &gt; 256) {</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6352_G1_ATU_FID, &amp;val);</div><div class='add'>+		val &amp;= 0xfff;</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	} else {</div><div class='add'>+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_OP, &amp;op);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		if (mv88e6xxx_num_databases(chip) &gt; 64) {</div><div class='add'>+			/* ATU DBNum[7:4] are located in ATU Control 15:12 */</div><div class='add'>+			err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_CTL,</div><div class='add'>+						&amp;upper);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+</div><div class='add'>+			upper = (upper &gt;&gt; 8) &amp; 0x00f0;</div><div class='add'>+		} else if (mv88e6xxx_num_databases(chip) &gt; 16) {</div><div class='add'>+			/* ATU DBNum[5:4] are located in ATU Operation 9:8 */</div><div class='add'>+			upper = (op &gt;&gt; 4) &amp; 0x30;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* ATU DBNum[3:0] are located in ATU Operation 3:0 */</div><div class='add'>+		val = (op &amp; 0xf) | upper;</div><div class='add'>+	}</div><div class='add'>+	*fid = val;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x0C: ATU Data Register */</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_atu_data_read(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -129,7 +222,7 @@ static int mv88e6xxx_g1_atu_data_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	entry-&gt;state = val &amp; 0xf;</div><div class='del'>-	if (entry-&gt;state != MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {</div><div class='add'>+	if (entry-&gt;state) {</div><div class='ctx'> 		entry-&gt;trunk = !!(val &amp; MV88E6XXX_G1_ATU_DATA_TRUNK);</div><div class='ctx'> 		entry-&gt;portvec = (val &gt;&gt; 4) &amp; mv88e6xxx_port_mask(chip);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -142,7 +235,7 @@ static int mv88e6xxx_g1_atu_data_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> {</div><div class='ctx'> 	u16 data = entry-&gt;state &amp; 0xf;</div><div class='ctx'> </div><div class='del'>-	if (entry-&gt;state != MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {</div><div class='add'>+	if (entry-&gt;state) {</div><div class='ctx'> 		if (entry-&gt;trunk)</div><div class='ctx'> 			data |= MV88E6XXX_G1_ATU_DATA_TRUNK;</div><div class='ctx'> </div><div class='hunk'>@@ -203,7 +296,7 @@ int mv88e6xxx_g1_atu_getnext(struct mv88e6xxx_chip *chip, u16 fid,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Write the MAC address to iterate from only once */</div><div class='del'>-	if (entry-&gt;state == MV88E6XXX_G1_ATU_DATA_STATE_UNUSED) {</div><div class='add'>+	if (!entry-&gt;state) {</div><div class='ctx'> 		err = mv88e6xxx_g1_atu_mac_write(chip, entry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -290,7 +383,7 @@ static int mv88e6xxx_g1_atu_move(struct mv88e6xxx_chip *chip, u16 fid,</div><div class='ctx'> 	mask = chip-&gt;info-&gt;atu_move_port_mask;</div><div class='ctx'> 	shift = bitmap_weight(&amp;mask, 16);</div><div class='ctx'> </div><div class='del'>-	entry.state = 0xf, /* Full EntryState means Move */</div><div class='add'>+	entry.state = 0xf; /* Full EntryState means Move */</div><div class='ctx'> 	entry.portvec = from_port &amp; mask;</div><div class='ctx'> 	entry.portvec |= (to_port &amp; mask) &lt;&lt; shift;</div><div class='ctx'> </div><div class='hunk'>@@ -310,64 +403,70 @@ static irqreturn_t mv88e6xxx_g1_atu_prob_irq_thread_fn(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = dev_id;</div><div class='ctx'> 	struct mv88e6xxx_atu_entry entry;</div><div class='del'>-	int spid;</div><div class='del'>-	int err;</div><div class='del'>-	u16 val;</div><div class='add'>+	int err, spid;</div><div class='add'>+	u16 val, fid;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_atu_op(chip, 0,</div><div class='del'>-				  MV88E6XXX_G1_ATU_OP_GET_CLR_VIOLATION);</div><div class='add'>+	err = mv88e6xxx_g1_read_atu_violation(chip);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_ATU_OP, &amp;val);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_atu_fid_read(chip, &amp;fid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_g1_atu_data_read(chip, &amp;entry);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_g1_atu_mac_read(chip, &amp;entry);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto out;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> </div><div class='del'>-	spid = entry.state;</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='del'>-	if (val &amp; MV88E6XXX_G1_ATU_OP_AGE_OUT_VIOLATION) {</div><div class='del'>-		dev_err_ratelimited(chip-&gt;dev,</div><div class='del'>-				    "ATU age out violation for %pM\n",</div><div class='del'>-				    entry.mac);</div><div class='del'>-	}</div><div class='add'>+	spid = entry.state;</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; MV88E6XXX_G1_ATU_OP_MEMBER_VIOLATION) {</div><div class='del'>-		dev_err_ratelimited(chip-&gt;dev,</div><div class='del'>-				    "ATU member violation for %pM portvec %x spid %d\n",</div><div class='del'>-				    entry.mac, entry.portvec, spid);</div><div class='add'>+		trace_mv88e6xxx_atu_member_violation(chip-&gt;dev, spid,</div><div class='add'>+						     entry.portvec, entry.mac,</div><div class='add'>+						     fid);</div><div class='ctx'> 		chip-&gt;ports[spid].atu_member_violation++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; MV88E6XXX_G1_ATU_OP_MISS_VIOLATION) {</div><div class='del'>-		dev_err_ratelimited(chip-&gt;dev,</div><div class='del'>-				    "ATU miss violation for %pM portvec %x spid %d\n",</div><div class='del'>-				    entry.mac, entry.portvec, spid);</div><div class='add'>+		trace_mv88e6xxx_atu_miss_violation(chip-&gt;dev, spid,</div><div class='add'>+						   entry.portvec, entry.mac,</div><div class='add'>+						   fid);</div><div class='ctx'> 		chip-&gt;ports[spid].atu_miss_violation++;</div><div class='add'>+</div><div class='add'>+		if (fid != MV88E6XXX_FID_STANDALONE &amp;&amp; chip-&gt;ports[spid].mab) {</div><div class='add'>+			err = mv88e6xxx_handle_miss_violation(chip, spid,</div><div class='add'>+							      &amp;entry, fid);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; MV88E6XXX_G1_ATU_OP_FULL_VIOLATION) {</div><div class='del'>-		dev_err_ratelimited(chip-&gt;dev,</div><div class='del'>-				    "ATU full violation for %pM portvec %x spid %d\n",</div><div class='del'>-				    entry.mac, entry.portvec, spid);</div><div class='del'>-		chip-&gt;ports[spid].atu_full_violation++;</div><div class='add'>+		trace_mv88e6xxx_atu_full_violation(chip-&gt;dev, spid,</div><div class='add'>+						   entry.portvec, entry.mac,</div><div class='add'>+						   fid);</div><div class='add'>+		if (spid &lt; ARRAY_SIZE(chip-&gt;ports))</div><div class='add'>+			chip-&gt;ports[spid].atu_full_violation++;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+out_unlock:</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='ctx'> 	dev_err(chip-&gt;dev, "ATU problem: error %d while handling interrupt\n",</div><div class='ctx'> 		err);</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='hunk'>@@ -382,9 +481,12 @@ int mv88e6xxx_g1_atu_prob_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (chip-&gt;atu_prob_irq &lt; 0)</div><div class='ctx'> 		return chip-&gt;atu_prob_irq;</div><div class='ctx'> </div><div class='add'>+	snprintf(chip-&gt;atu_prob_irq_name, sizeof(chip-&gt;atu_prob_irq_name),</div><div class='add'>+		 "mv88e6xxx-%s-g1-atu-prob", dev_name(chip-&gt;dev));</div><div class='add'>+</div><div class='ctx'> 	err = request_threaded_irq(chip-&gt;atu_prob_irq, NULL,</div><div class='ctx'> 				   mv88e6xxx_g1_atu_prob_irq_thread_fn,</div><div class='del'>-				   IRQF_ONESHOT, "mv88e6xxx-g1-atu-prob",</div><div class='add'>+				   IRQF_ONESHOT, chip-&gt;atu_prob_irq_name,</div><div class='ctx'> 				   chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		irq_dispose_mapping(chip-&gt;atu_prob_irq);</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global1_vtu.c b/drivers/net/dsa/mv88e6xxx/global1_vtu.c<br/>index 3e9be3f51196..b524f27a2f0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1_vtu.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global1_vtu.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global1_vtu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global1_vtu.c</a></div><div class='hunk'>@@ -7,11 +7,13 @@</div><div class='ctx'>  * Copyright (c) 2017 Savoir-faire Linux, Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/irqdomain.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "chip.h"</div><div class='ctx'> #include "global1.h"</div><div class='add'>+#include "trace.h"</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x02: VTU FID Register */</div><div class='ctx'> </div><div class='hunk'>@@ -26,7 +28,7 @@ static int mv88e6xxx_g1_vtu_fid_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	entry-&gt;fid = val &amp; MV88E6352_G1_VTU_FID_MASK;</div><div class='del'>-</div><div class='add'>+	entry-&gt;policy = !!(val &amp; MV88E6352_G1_VTU_FID_VID_POLICY);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -35,13 +37,15 @@ static int mv88e6xxx_g1_vtu_fid_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> {</div><div class='ctx'> 	u16 val = entry-&gt;fid &amp; MV88E6352_G1_VTU_FID_MASK;</div><div class='ctx'> </div><div class='add'>+	if (entry-&gt;policy)</div><div class='add'>+		val |= MV88E6352_G1_VTU_FID_VID_POLICY;</div><div class='add'>+</div><div class='ctx'> 	return mv88e6xxx_g1_write(chip, MV88E6352_G1_VTU_FID, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x03: VTU SID Register */</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-				     struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+static int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip, u8 *sid)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -50,15 +54,14 @@ static int mv88e6xxx_g1_vtu_sid_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	entry-&gt;sid = val &amp; MV88E6352_G1_VTU_SID_MASK;</div><div class='add'>+	*sid = val &amp; MV88E6352_G1_VTU_SID_MASK;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-				      struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+static int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip, u8 sid)</div><div class='ctx'> {</div><div class='del'>-	u16 val = entry-&gt;sid &amp; MV88E6352_G1_VTU_SID_MASK;</div><div class='add'>+	u16 val = sid &amp; MV88E6352_G1_VTU_SID_MASK;</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g1_write(chip, MV88E6352_G1_VTU_SID, val);</div><div class='ctx'> }</div><div class='hunk'>@@ -67,8 +70,9 @@ static int mv88e6xxx_g1_vtu_sid_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_vtu_op_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g1_wait(chip, MV88E6XXX_G1_VTU_OP,</div><div class='del'>-				 MV88E6XXX_G1_VTU_OP_BUSY);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G1_VTU_OP_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_wait_bit(chip, MV88E6XXX_G1_VTU_OP, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op)</div><div class='hunk'>@@ -86,7 +90,7 @@ static int mv88e6xxx_g1_vtu_op(struct mv88e6xxx_chip *chip, u16 op)</div><div class='ctx'> /* Offset 0x06: VTU VID Register */</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_vtu_vid_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-				     struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+				     bool *valid, u16 *vid)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -95,25 +99,28 @@ static int mv88e6xxx_g1_vtu_vid_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	entry-&gt;vid = val &amp; 0xfff;</div><div class='add'>+	if (vid) {</div><div class='add'>+		*vid = val &amp; 0xfff;</div><div class='ctx'> </div><div class='del'>-	if (val &amp; MV88E6390_G1_VTU_VID_PAGE)</div><div class='del'>-		entry-&gt;vid |= 0x1000;</div><div class='add'>+		if (val &amp; MV88E6390_G1_VTU_VID_PAGE)</div><div class='add'>+			*vid |= 0x1000;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	entry-&gt;valid = !!(val &amp; MV88E6XXX_G1_VTU_VID_VALID);</div><div class='add'>+	if (valid)</div><div class='add'>+		*valid = !!(val &amp; MV88E6XXX_G1_VTU_VID_VALID);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g1_vtu_vid_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-				      struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+				      bool valid, u16 vid)</div><div class='ctx'> {</div><div class='del'>-	u16 val = entry-&gt;vid &amp; 0xfff;</div><div class='add'>+	u16 val = vid &amp; 0xfff;</div><div class='ctx'> </div><div class='del'>-	if (entry-&gt;vid &amp; 0x1000)</div><div class='add'>+	if (vid &amp; 0x1000)</div><div class='ctx'> 		val |= MV88E6390_G1_VTU_VID_PAGE;</div><div class='ctx'> </div><div class='del'>-	if (entry-&gt;valid)</div><div class='add'>+	if (valid)</div><div class='ctx'> 		val |= MV88E6XXX_G1_VTU_VID_VALID;</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g1_write(chip, MV88E6XXX_G1_VTU_VID, val);</div><div class='hunk'>@@ -123,11 +130,9 @@ static int mv88e6xxx_g1_vtu_vid_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'>  * Offset 0x08: VTU/STU Data Register 2</div><div class='ctx'>  * Offset 0x09: VTU/STU Data Register 3</div><div class='ctx'>  */</div><div class='del'>-</div><div class='del'>-static int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-				      struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+static int mv88e6185_g1_vtu_stu_data_read(struct mv88e6xxx_chip *chip,</div><div class='add'>+					  u16 *regs)</div><div class='ctx'> {</div><div class='del'>-	u16 regs[3];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Read all 3 VTU/STU Data registers */</div><div class='hunk'>@@ -140,20 +145,37 @@ static int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Extract MemberTag and PortState data */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6185_g1_vtu_data_read(struct mv88e6xxx_chip *chip,</div><div class='add'>+				      u8 *member, u8 *state)</div><div class='add'>+{</div><div class='add'>+	u16 regs[3];</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	err = mv88e6185_g1_vtu_stu_data_read(chip, regs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Extract MemberTag data */</div><div class='ctx'> 	for (i = 0; i &lt; mv88e6xxx_num_ports(chip); ++i) {</div><div class='ctx'> 		unsigned int member_offset = (i % 4) * 4;</div><div class='ctx'> 		unsigned int state_offset = member_offset + 2;</div><div class='ctx'> </div><div class='del'>-		entry-&gt;member[i] = (regs[i / 4] &gt;&gt; member_offset) &amp; 0x3;</div><div class='del'>-		entry-&gt;state[i] = (regs[i / 4] &gt;&gt; state_offset) &amp; 0x3;</div><div class='add'>+		if (member)</div><div class='add'>+			member[i] = (regs[i / 4] &gt;&gt; member_offset) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+		if (state)</div><div class='add'>+			state[i] = (regs[i / 4] &gt;&gt; state_offset) &amp; 0x3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-				       struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+				       u8 *member, u8 *state)</div><div class='ctx'> {</div><div class='ctx'> 	u16 regs[3] = { 0 };</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -163,8 +185,11 @@ static int mv88e6185_g1_vtu_data_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		unsigned int member_offset = (i % 4) * 4;</div><div class='ctx'> 		unsigned int state_offset = member_offset + 2;</div><div class='ctx'> </div><div class='del'>-		regs[i / 4] |= (entry-&gt;member[i] &amp; 0x3) &lt;&lt; member_offset;</div><div class='del'>-		regs[i / 4] |= (entry-&gt;state[i] &amp; 0x3) &lt;&lt; state_offset;</div><div class='add'>+		if (member)</div><div class='add'>+			regs[i / 4] |= (member[i] &amp; 0x3) &lt;&lt; member_offset;</div><div class='add'>+</div><div class='add'>+		if (state)</div><div class='add'>+			regs[i / 4] |= (state[i] &amp; 0x3) &lt;&lt; state_offset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write all 3 VTU/STU Data registers */</div><div class='hunk'>@@ -232,50 +257,8 @@ static int mv88e6390_g1_vtu_data_write(struct mv88e6xxx_chip *chip, u8 *data)</div><div class='ctx'> </div><div class='ctx'> /* VLAN Translation Unit Operations */</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g1_vtu_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='del'>-					struct mv88e6xxx_vtu_entry *entry)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_g1_vtu_sid_write(chip, entry);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_STU_GET_NEXT);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_g1_vtu_sid_read(chip, entry);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return mv88e6xxx_g1_vtu_vid_read(chip, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6xxx_g1_vtu_stu_get(struct mv88e6xxx_chip *chip,</div><div class='del'>-				    struct mv88e6xxx_vtu_entry *vtu)</div><div class='del'>-{</div><div class='del'>-	struct mv88e6xxx_vtu_entry stu;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_g1_vtu_sid_read(chip, vtu);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	stu.sid = vtu-&gt;sid - 1;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_g1_vtu_stu_getnext(chip, &amp;stu);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (stu.sid != vtu-&gt;sid || !stu.valid)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='del'>-				    struct mv88e6xxx_vtu_entry *entry)</div><div class='add'>+int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_vtu_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -291,7 +274,7 @@ static int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	 * write the VID only once, when the entry is given as invalid.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!entry-&gt;valid) {</div><div class='del'>-		err = mv88e6xxx_g1_vtu_vid_write(chip, entry);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_vid_write(chip, false, entry-&gt;vid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -300,7 +283,7 @@ static int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g1_vtu_vid_read(chip, entry);</div><div class='add'>+	return mv88e6xxx_g1_vtu_vid_read(chip, &amp;entry-&gt;valid, &amp;entry-&gt;vid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -314,12 +297,12 @@ int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;valid) {</div><div class='del'>-		err = mv88e6185_g1_vtu_data_read(chip, entry);</div><div class='add'>+		err = mv88e6185_g1_vtu_data_read(chip, entry-&gt;member, entry-&gt;state);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		/* VTU DBNum[3:0] are located in VTU Operation 3:0</div><div class='del'>-		 * VTU DBNum[7:4] are located in VTU Operation 11:8</div><div class='add'>+		 * VTU DBNum[7:4] ([5:4] for 6250) are located in VTU Operation 11:8 (9:8)</div><div class='ctx'> 		 */</div><div class='ctx'> 		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP, &amp;val);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -327,6 +310,7 @@ int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 		entry-&gt;fid = val &amp; 0x000f;</div><div class='ctx'> 		entry-&gt;fid |= (val &amp; 0x0f00) &gt;&gt; 4;</div><div class='add'>+		entry-&gt;fid &amp;= mv88e6xxx_num_databases(chip) - 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -343,16 +327,15 @@ int mv88e6352_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;valid) {</div><div class='del'>-		/* Fetch (and mask) VLAN PortState data from the STU */</div><div class='del'>-		err = mv88e6xxx_g1_vtu_stu_get(chip, entry);</div><div class='add'>+		err = mv88e6185_g1_vtu_data_read(chip, entry-&gt;member, NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6185_g1_vtu_data_read(chip, entry);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_fid_read(chip, entry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_g1_vtu_fid_read(chip, entry);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_sid_read(chip, &amp;entry-&gt;sid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -375,16 +358,11 @@ int mv88e6390_g1_vtu_getnext(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		/* Fetch VLAN PortState data from the STU */</div><div class='del'>-		err = mv88e6xxx_g1_vtu_stu_get(chip, entry);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = mv88e6390_g1_vtu_data_read(chip, entry-&gt;state);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_fid_read(chip, entry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_g1_vtu_fid_read(chip, entry);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_sid_read(chip, &amp;entry-&gt;sid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -402,20 +380,24 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_vtu_vid_write(chip, entry);</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_write(chip, entry-&gt;valid, entry-&gt;vid);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;valid) {</div><div class='del'>-		err = mv88e6185_g1_vtu_data_write(chip, entry);</div><div class='add'>+		err = mv88e6185_g1_vtu_data_write(chip, entry-&gt;member, entry-&gt;state);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		/* VTU DBNum[3:0] are located in VTU Operation 3:0</div><div class='ctx'> 		 * VTU DBNum[7:4] are located in VTU Operation 11:8</div><div class='add'>+		 *</div><div class='add'>+		 * For the 6250/6220, the latter are really [5:4] and</div><div class='add'>+		 * 9:8, but in those cases bits 7:6 of entry-&gt;fid are</div><div class='add'>+		 * 0 since they have num_databases = 64.</div><div class='ctx'> 		 */</div><div class='ctx'> 		op |= entry-&gt;fid &amp; 0x000f;</div><div class='del'>-		op |= (entry-&gt;fid &amp; 0x00f0) &lt;&lt; 8;</div><div class='add'>+		op |= (entry-&gt;fid &amp; 0x00f0) &lt;&lt; 4;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g1_vtu_op(chip, op);</div><div class='hunk'>@@ -430,27 +412,21 @@ int mv88e6352_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_vtu_vid_write(chip, entry);</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_write(chip, entry-&gt;valid, entry-&gt;vid);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;valid) {</div><div class='del'>-		/* Write MemberTag and PortState data */</div><div class='del'>-		err = mv88e6185_g1_vtu_data_write(chip, entry);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		err = mv88e6xxx_g1_vtu_sid_write(chip, entry);</div><div class='add'>+		/* Write MemberTag data */</div><div class='add'>+		err = mv88e6185_g1_vtu_data_write(chip, entry-&gt;member, NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		/* Load STU entry */</div><div class='del'>-		err = mv88e6xxx_g1_vtu_op(chip,</div><div class='del'>-					  MV88E6XXX_G1_VTU_OP_STU_LOAD_PURGE);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_fid_write(chip, entry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_g1_vtu_fid_write(chip, entry);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_sid_write(chip, entry-&gt;sid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -468,41 +444,116 @@ int mv88e6390_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_vtu_vid_write(chip, entry);</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_write(chip, entry-&gt;valid, entry-&gt;vid);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (entry-&gt;valid) {</div><div class='del'>-		/* Write PortState data */</div><div class='del'>-		err = mv88e6390_g1_vtu_data_write(chip, entry-&gt;state);</div><div class='add'>+		/* Write MemberTag data */</div><div class='add'>+		err = mv88e6390_g1_vtu_data_write(chip, entry-&gt;member);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_g1_vtu_sid_write(chip, entry);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_fid_write(chip, entry);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		/* Load STU entry */</div><div class='del'>-		err = mv88e6xxx_g1_vtu_op(chip,</div><div class='del'>-					  MV88E6XXX_G1_VTU_OP_STU_LOAD_PURGE);</div><div class='add'>+		err = mv88e6xxx_g1_vtu_sid_write(chip, entry-&gt;sid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		/* Write MemberTag data */</div><div class='del'>-		err = mv88e6390_g1_vtu_data_write(chip, entry-&gt;member);</div><div class='add'>+	/* Load/Purge VTU entry */</div><div class='add'>+	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_VTU_LOAD_PURGE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* As part of the VTU flush, refresh FID map */</div><div class='add'>+	bitmap_zero(chip-&gt;fid_bitmap, MV88E6XXX_N_FID);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_op_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_FLUSH_ALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Spanning Tree Unit Operations */</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_g1_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_op_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* To get the next higher active SID, the STU GetNext operation can be</div><div class='add'>+	 * started again without setting the SID registers since it already</div><div class='add'>+	 * contains the last SID.</div><div class='add'>+	 *</div><div class='add'>+	 * To save a few hardware accesses and abstract this to the caller,</div><div class='add'>+	 * write the SID only once, when the entry is given as invalid.</div><div class='add'>+	 */</div><div class='add'>+	if (!entry-&gt;valid) {</div><div class='add'>+		err = mv88e6xxx_g1_vtu_sid_write(chip, entry-&gt;sid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		err = mv88e6xxx_g1_vtu_fid_write(chip, entry);</div><div class='add'>+	err = mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_STU_GET_NEXT);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_read(chip, &amp;entry-&gt;valid, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;valid) {</div><div class='add'>+		err = mv88e6xxx_g1_vtu_sid_read(chip, &amp;entry-&gt;sid);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Load/Purge VTU entry */</div><div class='del'>-	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_VTU_LOAD_PURGE);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip)</div><div class='add'>+int mv88e6352_g1_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_stu_getnext(chip, entry);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!entry-&gt;valid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mv88e6185_g1_vtu_data_read(chip, NULL, entry-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6390_g1_stu_getnext(struct mv88e6xxx_chip *chip,</div><div class='add'>+			     struct mv88e6xxx_stu_entry *entry)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_stu_getnext(chip, entry);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (!entry-&gt;valid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mv88e6390_g1_vtu_data_read(chip, entry-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6352_g1_stu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       struct mv88e6xxx_stu_entry *entry)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -510,18 +561,61 @@ int mv88e6xxx_g1_vtu_flush(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_FLUSH_ALL);</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_write(chip, entry-&gt;valid, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_sid_write(chip, entry-&gt;sid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;valid) {</div><div class='add'>+		err = mv88e6185_g1_vtu_data_write(chip, NULL, entry-&gt;state);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load/Purge STU entry */</div><div class='add'>+	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_STU_LOAD_PURGE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6390_g1_stu_loadpurge(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       struct mv88e6xxx_stu_entry *entry)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_op_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_write(chip, entry-&gt;valid, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g1_vtu_sid_write(chip, entry-&gt;sid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;valid) {</div><div class='add'>+		err = mv88e6390_g1_vtu_data_write(chip, entry-&gt;state);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Load/Purge STU entry */</div><div class='add'>+	return mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_STU_LOAD_PURGE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* VTU Violation Management */</div><div class='add'>+</div><div class='ctx'> static irqreturn_t mv88e6xxx_g1_vtu_prob_irq_thread_fn(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = dev_id;</div><div class='del'>-	struct mv88e6xxx_vtu_entry entry;</div><div class='add'>+	u16 val, vid;</div><div class='ctx'> 	int spid;</div><div class='ctx'> 	int err;</div><div class='del'>-	u16 val;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_g1_vtu_op(chip, MV88E6XXX_G1_VTU_OP_GET_CLR_VIOLATION);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -531,30 +625,28 @@ static irqreturn_t mv88e6xxx_g1_vtu_prob_irq_thread_fn(int irq, void *dev_id)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g1_vtu_vid_read(chip, &amp;entry);</div><div class='add'>+	err = mv88e6xxx_g1_vtu_vid_read(chip, NULL, &amp;vid);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	spid = val &amp; MV88E6XXX_G1_VTU_OP_SPID_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; MV88E6XXX_G1_VTU_OP_MEMBER_VIOLATION) {</div><div class='del'>-		dev_err_ratelimited(chip-&gt;dev, "VTU member violation for vid %d, source port %d\n",</div><div class='del'>-				    entry.vid, spid);</div><div class='add'>+		trace_mv88e6xxx_vtu_member_violation(chip-&gt;dev, spid, vid);</div><div class='ctx'> 		chip-&gt;ports[spid].vtu_member_violation++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; MV88E6XXX_G1_VTU_OP_MISS_VIOLATION) {</div><div class='del'>-		dev_dbg_ratelimited(chip-&gt;dev, "VTU miss violation for vid %d, source port %d\n",</div><div class='del'>-				    entry.vid, spid);</div><div class='add'>+		trace_mv88e6xxx_vtu_miss_violation(chip-&gt;dev, spid, vid);</div><div class='ctx'> 		chip-&gt;ports[spid].vtu_miss_violation++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	dev_err(chip-&gt;dev, "VTU problem: error %d while handling interrupt\n",</div><div class='ctx'> 		err);</div><div class='hunk'>@@ -571,9 +663,12 @@ int mv88e6xxx_g1_vtu_prob_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (chip-&gt;vtu_prob_irq &lt; 0)</div><div class='ctx'> 		return chip-&gt;vtu_prob_irq;</div><div class='ctx'> </div><div class='add'>+	snprintf(chip-&gt;vtu_prob_irq_name, sizeof(chip-&gt;vtu_prob_irq_name),</div><div class='add'>+		 "mv88e6xxx-%s-g1-vtu-prob", dev_name(chip-&gt;dev));</div><div class='add'>+</div><div class='ctx'> 	err = request_threaded_irq(chip-&gt;vtu_prob_irq, NULL,</div><div class='ctx'> 				   mv88e6xxx_g1_vtu_prob_irq_thread_fn,</div><div class='del'>-				   IRQF_ONESHOT, "mv88e6xxx-g1-vtu-prob",</div><div class='add'>+				   IRQF_ONESHOT, chip-&gt;vtu_prob_irq_name,</div><div class='ctx'> 				   chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		irq_dispose_mapping(chip-&gt;vtu_prob_irq);</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global2.c b/drivers/net/dsa/mv88e6xxx/global2.c<br/>index 1546171210a1..30a6ffa7817b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global2.c</a></div><div class='hunk'>@@ -26,14 +26,11 @@ int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val)</div><div class='ctx'> 	return mv88e6xxx_write(chip, chip-&gt;info-&gt;global2_addr, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update)</div><div class='add'>+int mv88e6xxx_g2_wait_bit(struct mv88e6xxx_chip *chip, int reg, int</div><div class='add'>+			  bit, int val)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_update(chip, chip-&gt;info-&gt;global2_addr, reg, update);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask)</div><div class='del'>-{</div><div class='del'>-	return mv88e6xxx_wait(chip, chip-&gt;info-&gt;global2_addr, reg, mask);</div><div class='add'>+	return mv88e6xxx_wait_bit(chip, chip-&gt;info-&gt;global2_addr, reg,</div><div class='add'>+				  bit, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x00: Interrupt Source Register */</div><div class='hunk'>@@ -123,31 +120,34 @@ int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip, int target,</div><div class='ctx'> 	 * but bit 4 is reserved on older chips, so it is safe to use.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_DEVICE_MAPPING, val);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_DEVICE_MAPPING,</div><div class='add'>+				  MV88E6XXX_G2_DEVICE_MAPPING_UPDATE | val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x07: Trunk Mask Table register */</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g2_trunk_mask_write(struct mv88e6xxx_chip *chip, int num,</div><div class='del'>-					 bool hash, u16 mask)</div><div class='add'>+int mv88e6xxx_g2_trunk_mask_write(struct mv88e6xxx_chip *chip, int num,</div><div class='add'>+				  bool hash, u16 mask)</div><div class='ctx'> {</div><div class='ctx'> 	u16 val = (num &lt;&lt; 12) | (mask &amp; mv88e6xxx_port_mask(chip));</div><div class='ctx'> </div><div class='ctx'> 	if (hash)</div><div class='ctx'> 		val |= MV88E6XXX_G2_TRUNK_MASK_HASH;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_TRUNK_MASK, val);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_TRUNK_MASK,</div><div class='add'>+				  MV88E6XXX_G2_TRUNK_MASK_UPDATE | val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x08: Trunk Mapping Table register */</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g2_trunk_mapping_write(struct mv88e6xxx_chip *chip, int id,</div><div class='del'>-					    u16 map)</div><div class='add'>+int mv88e6xxx_g2_trunk_mapping_write(struct mv88e6xxx_chip *chip, int id,</div><div class='add'>+				     u16 map)</div><div class='ctx'> {</div><div class='ctx'> 	const u16 port_mask = BIT(mv88e6xxx_num_ports(chip)) - 1;</div><div class='ctx'> 	u16 val = (id &lt;&lt; 11) | (map &amp; port_mask);</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_TRUNK_MAPPING, val);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_TRUNK_MAPPING,</div><div class='add'>+				  MV88E6XXX_G2_TRUNK_MAPPING_UPDATE | val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -178,8 +178,9 @@ int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_irl_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g2_wait(chip, MV88E6XXX_G2_IRL_CMD,</div><div class='del'>-				 MV88E6XXX_G2_IRL_CMD_BUSY);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G2_IRL_CMD_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_wait_bit(chip, MV88E6XXX_G2_IRL_CMD, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_irl_op(struct mv88e6xxx_chip *chip, u16 op, int port,</div><div class='hunk'>@@ -214,8 +215,9 @@ int mv88e6390_g2_irl_init_all(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_pvt_op_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g2_wait(chip, MV88E6XXX_G2_PVT_ADDR,</div><div class='del'>-				 MV88E6XXX_G2_PVT_ADDR_BUSY);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G2_PVT_ADDR_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_wait_bit(chip, MV88E6XXX_G2_PVT_ADDR, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_pvt_op(struct mv88e6xxx_chip *chip, int src_dev,</div><div class='hunk'>@@ -237,6 +239,23 @@ static int mv88e6xxx_g2_pvt_op(struct mv88e6xxx_chip *chip, int src_dev,</div><div class='ctx'> 	return mv88e6xxx_g2_pvt_op_wait(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_g2_pvt_read(struct mv88e6xxx_chip *chip, int src_dev,</div><div class='add'>+			  int src_port, u16 *data)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_pvt_op_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_pvt_op(chip, src_dev, src_port,</div><div class='add'>+				  MV88E6XXX_G2_PVT_ADDR_OP_READ);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_read(chip, MV88E6XXX_G2_PVT_DATA, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mv88e6xxx_g2_pvt_write(struct mv88e6xxx_chip *chip, int src_dev,</div><div class='ctx'> 			   int src_port, u16 data)</div><div class='ctx'> {</div><div class='hunk'>@@ -261,7 +280,8 @@ static int mv88e6xxx_g2_switch_mac_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> {</div><div class='ctx'> 	u16 val = (pointer &lt;&lt; 8) | data;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_SWITCH_MAC, val);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_SWITCH_MAC,</div><div class='add'>+				  MV88E6XXX_G2_SWITCH_MAC_UPDATE | val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g2_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr)</div><div class='hunk'>@@ -277,6 +297,19 @@ int mv88e6xxx_g2_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Offset 0x0E: ATU Statistics */</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_ATU_STATS,</div><div class='add'>+				  kind | bin);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip, u16 *stats)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_g2_read(chip, MV88E6XXX_G2_ATU_STATS, stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x0F: Priority Override Table */</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_pot_write(struct mv88e6xxx_chip *chip, int pointer,</div><div class='hunk'>@@ -284,7 +317,8 @@ static int mv88e6xxx_g2_pot_write(struct mv88e6xxx_chip *chip, int pointer,</div><div class='ctx'> {</div><div class='ctx'> 	u16 val = (pointer &lt;&lt; 8) | (data &amp; 0x7);</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_PRIO_OVERRIDE, val);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_PRIO_OVERRIDE,</div><div class='add'>+				  MV88E6XXX_G2_PRIO_OVERRIDE_UPDATE | val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -306,11 +340,18 @@ int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip)</div><div class='ctx'>  * Offset 0x15: EEPROM Addr (for 8-bit data access)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g2_eeprom_wait(struct mv88e6xxx_chip *chip)</div><div class='add'>+int mv88e6xxx_g2_eeprom_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g2_wait(chip, MV88E6XXX_G2_EEPROM_CMD,</div><div class='del'>-				 MV88E6XXX_G2_EEPROM_CMD_BUSY |</div><div class='del'>-				 MV88E6XXX_G2_EEPROM_CMD_RUNNING);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G2_EEPROM_CMD_BUSY);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_wait_bit(chip, MV88E6XXX_G2_EEPROM_CMD, bit, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bit = __bf_shf(MV88E6XXX_G2_EEPROM_CMD_RUNNING);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_wait_bit(chip, MV88E6XXX_G2_EEPROM_CMD, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_eeprom_cmd(struct mv88e6xxx_chip *chip, u16 cmd)</div><div class='hunk'>@@ -572,8 +613,9 @@ int mv88e6xxx_g2_set_eeprom16(struct mv88e6xxx_chip *chip,</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_smi_phy_wait(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g2_wait(chip, MV88E6XXX_G2_SMI_PHY_CMD,</div><div class='del'>-				 MV88E6XXX_G2_SMI_PHY_CMD_BUSY);</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_G2_SMI_PHY_CMD_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_wait_bit(chip, MV88E6XXX_G2_SMI_PHY_CMD, bit, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_g2_smi_phy_cmd(struct mv88e6xxx_chip *chip, u16 cmd)</div><div class='hunk'>@@ -697,20 +739,18 @@ static int mv88e6xxx_g2_smi_phy_read_data_c45(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return mv88e6xxx_g2_read(chip, MV88E6XXX_G2_SMI_PHY_DATA, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g2_smi_phy_read_c45(struct mv88e6xxx_chip *chip,</div><div class='del'>-					 bool external, int port, int reg,</div><div class='del'>-					 u16 *data)</div><div class='add'>+static int _mv88e6xxx_g2_smi_phy_read_c45(struct mv88e6xxx_chip *chip,</div><div class='add'>+					  bool external, int port, int devad,</div><div class='add'>+					  int reg, u16 *data)</div><div class='ctx'> {</div><div class='del'>-	int dev = (reg &gt;&gt; 16) &amp; 0x1f;</div><div class='del'>-	int addr = reg &amp; 0xffff;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g2_smi_phy_write_addr_c45(chip, external, port, dev,</div><div class='del'>-						  addr);</div><div class='add'>+	err = mv88e6xxx_g2_smi_phy_write_addr_c45(chip, external, port, devad,</div><div class='add'>+						  reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_smi_phy_read_data_c45(chip, external, port, dev,</div><div class='add'>+	return mv88e6xxx_g2_smi_phy_read_data_c45(chip, external, port, devad,</div><div class='ctx'> 						  data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -729,51 +769,65 @@ static int mv88e6xxx_g2_smi_phy_write_data_c45(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return mv88e6xxx_g2_smi_phy_access_c45(chip, external, op, port, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_g2_smi_phy_write_c45(struct mv88e6xxx_chip *chip,</div><div class='del'>-					  bool external, int port, int reg,</div><div class='del'>-					  u16 data)</div><div class='add'>+static int _mv88e6xxx_g2_smi_phy_write_c45(struct mv88e6xxx_chip *chip,</div><div class='add'>+					   bool external, int port, int devad,</div><div class='add'>+					   int reg, u16 data)</div><div class='ctx'> {</div><div class='del'>-	int dev = (reg &gt;&gt; 16) &amp; 0x1f;</div><div class='del'>-	int addr = reg &amp; 0xffff;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g2_smi_phy_write_addr_c45(chip, external, port, dev,</div><div class='del'>-						  addr);</div><div class='add'>+	err = mv88e6xxx_g2_smi_phy_write_addr_c45(chip, external, port, devad,</div><div class='add'>+						  reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_smi_phy_write_data_c45(chip, external, port, dev,</div><div class='add'>+	return mv88e6xxx_g2_smi_phy_write_data_c45(chip, external, port, devad,</div><div class='ctx'> 						   data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g2_smi_phy_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus,</div><div class='del'>-			      int addr, int reg, u16 *val)</div><div class='add'>+int mv88e6xxx_g2_smi_phy_read_c22(struct mv88e6xxx_chip *chip,</div><div class='add'>+				  struct mii_bus *bus,</div><div class='add'>+				  int addr, int reg, u16 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='ctx'> 	bool external = mdio_bus-&gt;external;</div><div class='ctx'> </div><div class='del'>-	if (reg &amp; MII_ADDR_C45)</div><div class='del'>-		return mv88e6xxx_g2_smi_phy_read_c45(chip, external, addr, reg,</div><div class='del'>-						     val);</div><div class='del'>-</div><div class='ctx'> 	return mv88e6xxx_g2_smi_phy_read_data_c22(chip, external, addr, reg,</div><div class='ctx'> 						  val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip, struct mii_bus *bus,</div><div class='del'>-			       int addr, int reg, u16 val)</div><div class='add'>+int mv88e6xxx_g2_smi_phy_read_c45(struct mv88e6xxx_chip *chip,</div><div class='add'>+				  struct mii_bus *bus, int addr, int devad,</div><div class='add'>+				  int reg, u16 *val)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='ctx'> 	bool external = mdio_bus-&gt;external;</div><div class='ctx'> </div><div class='del'>-	if (reg &amp; MII_ADDR_C45)</div><div class='del'>-		return mv88e6xxx_g2_smi_phy_write_c45(chip, external, addr, reg,</div><div class='del'>-						      val);</div><div class='add'>+	return _mv88e6xxx_g2_smi_phy_read_c45(chip, external, addr, devad, reg,</div><div class='add'>+					      val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_g2_smi_phy_write_c22(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   struct mii_bus *bus, int addr, int reg,</div><div class='add'>+				   u16 val)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='add'>+	bool external = mdio_bus-&gt;external;</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g2_smi_phy_write_data_c22(chip, external, addr, reg,</div><div class='ctx'> 						   val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_g2_smi_phy_write_c45(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   struct mii_bus *bus, int addr, int devad,</div><div class='add'>+				   int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_mdio_bus *mdio_bus = bus-&gt;priv;</div><div class='add'>+	bool external = mdio_bus-&gt;external;</div><div class='add'>+</div><div class='add'>+	return _mv88e6xxx_g2_smi_phy_write_c45(chip, external, addr, devad, reg,</div><div class='add'>+					       val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x1B: Watchdog Control */</div><div class='ctx'> static int mv88e6097_watchdog_action(struct mv88e6xxx_chip *chip, int irq)</div><div class='ctx'> {</div><div class='hunk'>@@ -812,31 +866,57 @@ const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = {</div><div class='ctx'> 	.irq_free = mv88e6097_watchdog_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void mv88e6250_watchdog_free(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_g2_read(chip, MV88E6250_G2_WDOG_CTL, &amp;reg);</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~(MV88E6250_G2_WDOG_CTL_EGRESS_ENABLE |</div><div class='add'>+		 MV88E6250_G2_WDOG_CTL_QC_ENABLE);</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_g2_write(chip, MV88E6250_G2_WDOG_CTL, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6250_watchdog_setup(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6250_G2_WDOG_CTL,</div><div class='add'>+				  MV88E6250_G2_WDOG_CTL_EGRESS_ENABLE |</div><div class='add'>+				  MV88E6250_G2_WDOG_CTL_QC_ENABLE |</div><div class='add'>+				  MV88E6250_G2_WDOG_CTL_SWRESET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mv88e6xxx_irq_ops mv88e6250_watchdog_ops = {</div><div class='add'>+	.irq_action = mv88e6097_watchdog_action,</div><div class='add'>+	.irq_setup = mv88e6250_watchdog_setup,</div><div class='add'>+	.irq_free = mv88e6250_watchdog_free,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int mv88e6390_watchdog_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6390_G2_WDOG_CTL,</div><div class='del'>-				   MV88E6390_G2_WDOG_CTL_PTR_INT_ENABLE |</div><div class='del'>-				   MV88E6390_G2_WDOG_CTL_CUT_THROUGH |</div><div class='del'>-				   MV88E6390_G2_WDOG_CTL_QUEUE_CONTROLLER |</div><div class='del'>-				   MV88E6390_G2_WDOG_CTL_EGRESS |</div><div class='del'>-				   MV88E6390_G2_WDOG_CTL_FORCE_IRQ);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6390_G2_WDOG_CTL,</div><div class='add'>+				  MV88E6390_G2_WDOG_CTL_UPDATE |</div><div class='add'>+				  MV88E6390_G2_WDOG_CTL_PTR_INT_ENABLE |</div><div class='add'>+				  MV88E6390_G2_WDOG_CTL_CUT_THROUGH |</div><div class='add'>+				  MV88E6390_G2_WDOG_CTL_QUEUE_CONTROLLER |</div><div class='add'>+				  MV88E6390_G2_WDOG_CTL_EGRESS |</div><div class='add'>+				  MV88E6390_G2_WDOG_CTL_FORCE_IRQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6390_watchdog_action(struct mv88e6xxx_chip *chip, int irq)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='ctx'> 	mv88e6xxx_g2_write(chip, MV88E6390_G2_WDOG_CTL,</div><div class='ctx'> 			   MV88E6390_G2_WDOG_CTL_PTR_EVENT);</div><div class='del'>-	err = mv88e6xxx_g2_read(chip, MV88E6390_G2_WDOG_CTL, &amp;reg);</div><div class='add'>+	mv88e6xxx_g2_read(chip, MV88E6390_G2_WDOG_CTL, &amp;reg);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(chip-&gt;dev, "Watchdog event: 0x%04x",</div><div class='ctx'> 		 reg &amp; MV88E6390_G2_WDOG_CTL_DATA_MASK);</div><div class='ctx'> </div><div class='ctx'> 	mv88e6xxx_g2_write(chip, MV88E6390_G2_WDOG_CTL,</div><div class='ctx'> 			   MV88E6390_G2_WDOG_CTL_PTR_HISTORY);</div><div class='del'>-	err = mv88e6xxx_g2_read(chip, MV88E6390_G2_WDOG_CTL, &amp;reg);</div><div class='add'>+	mv88e6xxx_g2_read(chip, MV88E6390_G2_WDOG_CTL, &amp;reg);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(chip-&gt;dev, "Watchdog history: 0x%04x",</div><div class='ctx'> 		 reg &amp; MV88E6390_G2_WDOG_CTL_DATA_MASK);</div><div class='hunk'>@@ -852,8 +932,9 @@ static int mv88e6390_watchdog_action(struct mv88e6xxx_chip *chip, int irq)</div><div class='ctx'> </div><div class='ctx'> static void mv88e6390_watchdog_free(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	mv88e6xxx_g2_update(chip, MV88E6390_G2_WDOG_CTL,</div><div class='del'>-			    MV88E6390_G2_WDOG_CTL_PTR_INT_ENABLE);</div><div class='add'>+	mv88e6xxx_g2_write(chip, MV88E6390_G2_WDOG_CTL,</div><div class='add'>+			   MV88E6390_G2_WDOG_CTL_UPDATE |</div><div class='add'>+			   MV88E6390_G2_WDOG_CTL_PTR_INT_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = {</div><div class='hunk'>@@ -862,25 +943,45 @@ const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = {</div><div class='ctx'> 	.irq_free = mv88e6390_watchdog_free,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int mv88e6393x_watchdog_action(struct mv88e6xxx_chip *chip, int irq)</div><div class='add'>+{</div><div class='add'>+	mv88e6390_watchdog_action(chip, irq);</div><div class='add'>+</div><div class='add'>+	/* Fix for clearing the force WD event bit.</div><div class='add'>+	 * Unreleased erratum on mv88e6393x.</div><div class='add'>+	 */</div><div class='add'>+	mv88e6xxx_g2_write(chip, MV88E6390_G2_WDOG_CTL,</div><div class='add'>+			   MV88E6390_G2_WDOG_CTL_UPDATE |</div><div class='add'>+			   MV88E6390_G2_WDOG_CTL_PTR_EVENT);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mv88e6xxx_irq_ops mv88e6393x_watchdog_ops = {</div><div class='add'>+	.irq_action = mv88e6393x_watchdog_action,</div><div class='add'>+	.irq_setup = mv88e6390_watchdog_setup,</div><div class='add'>+	.irq_free = mv88e6390_watchdog_free,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static irqreturn_t mv88e6xxx_g2_watchdog_thread_fn(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = dev_id;</div><div class='ctx'> 	irqreturn_t ret = IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;watchdog_ops-&gt;irq_action)</div><div class='ctx'> 		ret = chip-&gt;info-&gt;ops-&gt;watchdog_ops-&gt;irq_action(chip, irq);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_g2_watchdog_free(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;watchdog_ops-&gt;irq_free)</div><div class='ctx'> 		chip-&gt;info-&gt;ops-&gt;watchdog_ops-&gt;irq_free(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(chip-&gt;watchdog_irq, chip);</div><div class='ctx'> 	irq_dispose_mapping(chip-&gt;watchdog_irq);</div><div class='hunk'>@@ -895,17 +996,20 @@ static int mv88e6xxx_g2_watchdog_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	if (chip-&gt;watchdog_irq &lt; 0)</div><div class='ctx'> 		return chip-&gt;watchdog_irq;</div><div class='ctx'> </div><div class='add'>+	snprintf(chip-&gt;watchdog_irq_name, sizeof(chip-&gt;watchdog_irq_name),</div><div class='add'>+		 "mv88e6xxx-%s-watchdog", dev_name(chip-&gt;dev));</div><div class='add'>+</div><div class='ctx'> 	err = request_threaded_irq(chip-&gt;watchdog_irq, NULL,</div><div class='ctx'> 				   mv88e6xxx_g2_watchdog_thread_fn,</div><div class='ctx'> 				   IRQF_ONESHOT | IRQF_TRIGGER_FALLING,</div><div class='del'>-				   "mv88e6xxx-watchdog", chip);</div><div class='add'>+				   chip-&gt;watchdog_irq_name, chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (chip-&gt;info-&gt;ops-&gt;watchdog_ops-&gt;irq_setup)</div><div class='ctx'> 		err = chip-&gt;info-&gt;ops-&gt;watchdog_ops-&gt;irq_setup(chip);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -960,9 +1064,9 @@ static irqreturn_t mv88e6xxx_g2_irq_thread_fn(int irq, void *dev_id)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_g2_int_source(chip, &amp;reg);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -981,7 +1085,7 @@ static void mv88e6xxx_g2_irq_bus_lock(struct irq_data *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = irq_data_get_irq_chip_data(d);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_g2_irq_bus_sync_unlock(struct irq_data *d)</div><div class='hunk'>@@ -993,7 +1097,7 @@ static void mv88e6xxx_g2_irq_bus_sync_unlock(struct irq_data *d)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		dev_err(chip-&gt;dev, "failed to mask interrupts\n");</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct irq_chip mv88e6xxx_g2_irq_chip = {</div><div class='hunk'>@@ -1043,8 +1147,15 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	int err, irq, virq;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;g2_irq.domain = irq_domain_add_simple(</div><div class='del'>-		chip-&gt;dev-&gt;of_node, 16, 0, &amp;mv88e6xxx_g2_irq_domain_ops, chip);</div><div class='add'>+	chip-&gt;g2_irq.masked = ~0;</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_g2_int_mask(chip, ~chip-&gt;g2_irq.masked);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	chip-&gt;g2_irq.domain = irq_domain_create_simple(dev_fwnode(chip-&gt;dev), 16, 0,</div><div class='add'>+						       &amp;mv88e6xxx_g2_irq_domain_ops, chip);</div><div class='ctx'> 	if (!chip-&gt;g2_irq.domain)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1052,7 +1163,6 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 		irq_create_mapping(chip-&gt;g2_irq.domain, irq);</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;g2_irq.chip = mv88e6xxx_g2_irq_chip;</div><div class='del'>-	chip-&gt;g2_irq.masked = ~0;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;device_irq = irq_find_mapping(chip-&gt;g1_irq.domain,</div><div class='ctx'> 					    MV88E6XXX_G1_STS_IRQ_DEVICE);</div><div class='hunk'>@@ -1061,9 +1171,12 @@ int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	snprintf(chip-&gt;device_irq_name, sizeof(chip-&gt;device_irq_name),</div><div class='add'>+		 "mv88e6xxx-%s-g2", dev_name(chip-&gt;dev));</div><div class='add'>+</div><div class='ctx'> 	err = request_threaded_irq(chip-&gt;device_irq, NULL,</div><div class='ctx'> 				   mv88e6xxx_g2_irq_thread_fn,</div><div class='del'>-				   IRQF_ONESHOT, "mv88e6xxx-g2", chip);</div><div class='add'>+				   IRQF_ONESHOT, chip-&gt;device_irq_name, chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -1083,31 +1196,22 @@ out:</div><div class='ctx'> int mv88e6xxx_g2_irq_mdio_setup(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				struct mii_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	int phy, irq, err, err_phy;</div><div class='add'>+	int phy_start = chip-&gt;info-&gt;internal_phys_offset;</div><div class='add'>+	int phy_end = chip-&gt;info-&gt;internal_phys_offset +</div><div class='add'>+		      chip-&gt;info-&gt;num_internal_phys;</div><div class='add'>+	int phy, irq;</div><div class='ctx'> </div><div class='del'>-	for (phy = 0; phy &lt; chip-&gt;info-&gt;num_internal_phys; phy++) {</div><div class='add'>+	for (phy = phy_start; phy &lt; phy_end; phy++) {</div><div class='ctx'> 		irq = irq_find_mapping(chip-&gt;g2_irq.domain, phy);</div><div class='del'>-		if (irq &lt; 0) {</div><div class='del'>-			err = irq;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return irq;</div><div class='add'>+</div><div class='ctx'> 		bus-&gt;irq[chip-&gt;info-&gt;phy_base_addr + phy] = irq;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='del'>-out:</div><div class='del'>-	err_phy = phy;</div><div class='del'>-</div><div class='del'>-	for (phy = 0; phy &lt; err_phy; phy++)</div><div class='del'>-		irq_dispose_mapping(bus-&gt;irq[phy]);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void mv88e6xxx_g2_irq_mdio_free(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				struct mii_bus *bus)</div><div class='ctx'> {</div><div class='del'>-	int phy;</div><div class='del'>-</div><div class='del'>-	for (phy = 0; phy &lt; chip-&gt;info-&gt;num_internal_phys; phy++)</div><div class='del'>-		irq_dispose_mapping(bus-&gt;irq[phy]);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global2.h b/drivers/net/dsa/mv88e6xxx/global2.h<br/>index bfb2c6123f55..82f9b410de0b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global2.h</a></div><div class='hunk'>@@ -38,9 +38,15 @@</div><div class='ctx'> /* Offset 0x02: MGMT Enable Register 2x */</div><div class='ctx'> #define MV88E6XXX_G2_MGMT_EN_2X		0x02</div><div class='ctx'> </div><div class='add'>+/* Offset 0x02: MAC LINK change IRQ Register for MV88E6393X */</div><div class='add'>+#define MV88E6393X_G2_MACLINK_INT_SRC		0x02</div><div class='add'>+</div><div class='ctx'> /* Offset 0x03: MGMT Enable Register 0x */</div><div class='ctx'> #define MV88E6XXX_G2_MGMT_EN_0X		0x03</div><div class='ctx'> </div><div class='add'>+/* Offset 0x03: MAC LINK change IRQ Mask Register for MV88E6393X */</div><div class='add'>+#define MV88E6393X_G2_MACLINK_INT_MASK		0x03</div><div class='add'>+</div><div class='ctx'> /* Offset 0x04: Flow Control Delay Register */</div><div class='ctx'> #define MV88E6XXX_G2_FLOW_CTL	0x04</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +58,8 @@</div><div class='ctx'> #define MV88E6XXX_G2_SWITCH_MGMT_FORCE_FLOW_CTL_PRI	0x0080</div><div class='ctx'> #define MV88E6XXX_G2_SWITCH_MGMT_RSVD2CPU		0x0008</div><div class='ctx'> </div><div class='add'>+#define MV88E6393X_G2_EGRESS_MONITOR_DEST		0x05</div><div class='add'>+</div><div class='ctx'> /* Offset 0x06: Device Mapping Table Register */</div><div class='ctx'> #define MV88E6XXX_G2_DEVICE_MAPPING		0x06</div><div class='ctx'> #define MV88E6XXX_G2_DEVICE_MAPPING_UPDATE	0x8000</div><div class='hunk'>@@ -101,6 +109,7 @@</div><div class='ctx'> #define MV88E6XXX_G2_PVT_ADDR_OP_WRITE_PVLAN	0x3000</div><div class='ctx'> #define MV88E6XXX_G2_PVT_ADDR_OP_READ		0x4000</div><div class='ctx'> #define MV88E6XXX_G2_PVT_ADDR_PTR_MASK		0x01ff</div><div class='add'>+#define MV88E6XXX_G2_PVT_ADDR_DEV_TRUNK		0x1f</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0C: Cross-chip Port VLAN Data Register */</div><div class='ctx'> #define MV88E6XXX_G2_PVT_DATA		0x0c</div><div class='hunk'>@@ -113,7 +122,16 @@</div><div class='ctx'> #define MV88E6XXX_G2_SWITCH_MAC_DATA_MASK	0x00ff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0E: ATU Stats Register */</div><div class='del'>-#define MV88E6XXX_G2_ATU_STATS		0x0e</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS				0x0e</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_BIN_0			(0x0 &lt;&lt; 14)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_BIN_1			(0x1 &lt;&lt; 14)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_BIN_2			(0x2 &lt;&lt; 14)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_BIN_3			(0x3 &lt;&lt; 14)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_MODE_ALL			(0x0 &lt;&lt; 12)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_MODE_ALL_DYNAMIC		(0x1 &lt;&lt; 12)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_MODE_FID_ALL		(0x2 &lt;&lt; 12)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_MODE_FID_ALL_DYNAMIC	(0x3 &lt;&lt; 12)</div><div class='add'>+#define MV88E6XXX_G2_ATU_STATS_MASK			0x0fff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0F: Priority Override Table */</div><div class='ctx'> #define MV88E6XXX_G2_PRIO_OVERRIDE		0x0f</div><div class='hunk'>@@ -202,6 +220,18 @@</div><div class='ctx'> #define MV88E6XXX_G2_SCRATCH_MISC_DATA_MASK	0x00ff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x1B: Watch Dog Control Register */</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL			0x1b</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_QC_HISTORY	0x0100</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_QC_EVENT		0x0080</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_QC_ENABLE		0x0040</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_EGRESS_HISTORY	0x0020</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_EGRESS_EVENT	0x0010</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_EGRESS_ENABLE	0x0008</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_FORCE_IRQ		0x0004</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_HISTORY		0x0002</div><div class='add'>+#define MV88E6250_G2_WDOG_CTL_SWRESET		0x0001</div><div class='add'>+</div><div class='add'>+/* Offset 0x1B: Watch Dog Control Register */</div><div class='ctx'> #define MV88E6352_G2_WDOG_CTL			0x1b</div><div class='ctx'> #define MV88E6352_G2_WDOG_CTL_EGRESS_EVENT	0x0080</div><div class='ctx'> #define MV88E6352_G2_WDOG_CTL_RMU_TIMEOUT	0x0040</div><div class='hunk'>@@ -268,33 +298,34 @@</div><div class='ctx'> #define MV88E6352_G2_SCRATCH_CONFIG_DATA1	0x71</div><div class='ctx'> #define MV88E6352_G2_SCRATCH_CONFIG_DATA1_NO_CPU	BIT(2)</div><div class='ctx'> #define MV88E6352_G2_SCRATCH_CONFIG_DATA2	0x72</div><div class='del'>-#define MV88E6352_G2_SCRATCH_CONFIG_DATA2_P0_MODE_MASK	0x3</div><div class='add'>+#define MV88E6352_G2_SCRATCH_CONFIG_DATA2_P0_MODE_MASK	0xf</div><div class='add'>+#define MV88E6352_G2_SCRATCH_CONFIG_DATA3	0x73</div><div class='add'>+#define MV88E6352_G2_SCRATCH_CONFIG_DATA3_S_SEL		BIT(1)</div><div class='ctx'> </div><div class='ctx'> #define MV88E6352_G2_SCRATCH_GPIO_PCTL_GPIO	0</div><div class='ctx'> #define MV88E6352_G2_SCRATCH_GPIO_PCTL_TRIG	1</div><div class='ctx'> #define MV88E6352_G2_SCRATCH_GPIO_PCTL_EVREQ	2</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NET_DSA_MV88E6XXX_GLOBAL2</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_require(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val);</div><div class='ctx'> int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val);</div><div class='del'>-int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update);</div><div class='del'>-int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask);</div><div class='add'>+int mv88e6xxx_g2_wait_bit(struct mv88e6xxx_chip *chip, int reg,</div><div class='add'>+			  int bit, int val);</div><div class='ctx'> </div><div class='ctx'> int mv88e6352_g2_irl_init_all(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6390_g2_irl_init_all(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g2_smi_phy_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-			      struct mii_bus *bus,</div><div class='del'>-			      int addr, int reg, u16 *val);</div><div class='del'>-int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-			       struct mii_bus *bus,</div><div class='del'>-			       int addr, int reg, u16 val);</div><div class='add'>+int mv88e6xxx_g2_smi_phy_read_c22(struct mv88e6xxx_chip *chip,</div><div class='add'>+				  struct mii_bus *bus,</div><div class='add'>+				  int addr, int reg, u16 *val);</div><div class='add'>+int mv88e6xxx_g2_smi_phy_write_c22(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   struct mii_bus *bus,</div><div class='add'>+				   int addr, int reg, u16 val);</div><div class='add'>+int mv88e6xxx_g2_smi_phy_read_c45(struct mv88e6xxx_chip *chip,</div><div class='add'>+				  struct mii_bus *bus,</div><div class='add'>+				  int addr, int devad, int reg, u16 *val);</div><div class='add'>+int mv88e6xxx_g2_smi_phy_write_c45(struct mv88e6xxx_chip *chip,</div><div class='add'>+				   struct mii_bus *bus,</div><div class='add'>+				   int addr, int devad, int reg, u16 val);</div><div class='ctx'> int mv88e6xxx_g2_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g2_get_eeprom8(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -307,6 +338,8 @@ int mv88e6xxx_g2_get_eeprom16(struct mv88e6xxx_chip *chip,</div><div class='ctx'> int mv88e6xxx_g2_set_eeprom16(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 			      struct ethtool_eeprom *eeprom, u8 *data);</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_g2_pvt_read(struct mv88e6xxx_chip *chip, int src_dev,</div><div class='add'>+			  int src_port, u16 *data);</div><div class='ctx'> int mv88e6xxx_g2_pvt_write(struct mv88e6xxx_chip *chip, int src_dev,</div><div class='ctx'> 			   int src_port, u16 data);</div><div class='ctx'> int mv88e6xxx_g2_misc_4_bit_port(struct mv88e6xxx_chip *chip);</div><div class='hunk'>@@ -324,13 +357,20 @@ int mv88e6352_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_g2_trunk_mask_write(struct mv88e6xxx_chip *chip, int num,</div><div class='add'>+				  bool hash, u16 mask);</div><div class='add'>+int mv88e6xxx_g2_trunk_mapping_write(struct mv88e6xxx_chip *chip, int id,</div><div class='add'>+				     u16 map);</div><div class='ctx'> int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip, int target,</div><div class='ctx'> 				      int port);</div><div class='add'>+int mv88e6xxx_g2_eeprom_wait(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> extern const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops;</div><div class='add'>+extern const struct mv88e6xxx_irq_ops mv88e6250_watchdog_ops;</div><div class='ctx'> extern const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops;</div><div class='add'>+extern const struct mv88e6xxx_irq_ops mv88e6393x_watchdog_ops;</div><div class='ctx'> </div><div class='ctx'> extern const struct mv88e6xxx_avb_ops mv88e6165_avb_ops;</div><div class='ctx'> extern const struct mv88e6xxx_avb_ops mv88e6352_avb_ops;</div><div class='hunk'>@@ -338,173 +378,12 @@ extern const struct mv88e6xxx_avb_ops mv88e6390_avb_ops;</div><div class='ctx'> </div><div class='ctx'> extern const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops;</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='add'>+int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				      bool external);</div><div class='del'>-</div><div class='del'>-#else /* !CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_require(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	if (chip-&gt;info-&gt;global2_addr) {</div><div class='del'>-		dev_err(chip-&gt;dev, "this chip requires CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 enabled\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_read(struct mv88e6xxx_chip *chip, int reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_write(struct mv88e6xxx_chip *chip, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_update(struct mv88e6xxx_chip *chip, int reg, u16 update)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6352_g2_irl_init_all(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    int port)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6390_g2_irl_init_all(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    int port)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_smi_phy_read(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    struct mii_bus *bus,</div><div class='del'>-					    int addr, int reg, u16 *val)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_smi_phy_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-					     struct mii_bus *bus,</div><div class='del'>-					     int addr, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_set_switch_mac(struct mv88e6xxx_chip *chip,</div><div class='del'>-					      u8 *addr)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_get_eeprom8(struct mv88e6xxx_chip *chip,</div><div class='del'>-					   struct ethtool_eeprom *eeprom,</div><div class='del'>-					   u8 *data)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_set_eeprom8(struct mv88e6xxx_chip *chip,</div><div class='del'>-					   struct ethtool_eeprom *eeprom,</div><div class='del'>-					   u8 *data)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_get_eeprom16(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    struct ethtool_eeprom *eeprom,</div><div class='del'>-					    u8 *data)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_set_eeprom16(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    struct ethtool_eeprom *eeprom,</div><div class='del'>-					    u8 *data)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_pvt_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-					 int src_dev, int src_port, u16 data)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_misc_4_bit_port(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_irq_setup(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mv88e6xxx_g2_irq_free(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_irq_mdio_setup(struct mv88e6xxx_chip *chip,</div><div class='del'>-					      struct mii_bus *bus)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void mv88e6xxx_g2_irq_mdio_free(struct mv88e6xxx_chip *chip,</div><div class='del'>-					      struct mii_bus *bus)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6185_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6352_g2_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_pot_clear(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct mv88e6xxx_irq_ops mv88e6097_watchdog_ops = {};</div><div class='del'>-static const struct mv88e6xxx_irq_ops mv88e6390_watchdog_ops = {};</div><div class='del'>-</div><div class='del'>-static const struct mv88e6xxx_avb_ops mv88e6165_avb_ops = {};</div><div class='del'>-static const struct mv88e6xxx_avb_ops mv88e6352_avb_ops = {};</div><div class='del'>-static const struct mv88e6xxx_avb_ops mv88e6390_avb_ops = {};</div><div class='del'>-</div><div class='del'>-static const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops = {};</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='del'>-						    bool external)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_trunk_clear(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline int mv88e6xxx_g2_device_mapping_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-						    int target, int port)</div><div class='del'>-{</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* CONFIG_NET_DSA_MV88E6XXX_GLOBAL2 */</div><div class='add'>+int mv88e6393x_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       bool external);</div><div class='add'>+int mv88e6352_g2_scratch_port_has_serdes(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6xxx_g2_atu_stats_set(struct mv88e6xxx_chip *chip, u16 kind, u16 bin);</div><div class='add'>+int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip, u16 *stats);</div><div class='ctx'> </div><div class='ctx'> #endif /* _MV88E6XXX_GLOBAL2_H */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global2_avb.c b/drivers/net/dsa/mv88e6xxx/global2_avb.c<br/>index 116b8cf5a6e3..657783e043ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2_avb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2_avb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2_avb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global2_avb.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'>  *	Brandon Streiff &lt;brandon.streiff@ni.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "global2.h"</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x16: AVB Command Register</div><div class='hunk'>@@ -27,17 +29,33 @@</div><div class='ctx'> /* mv88e6xxx_g2_avb_read -- Read one or multiple 16-bit words.</div><div class='ctx'>  * The hardware supports snapshotting up to four contiguous registers.</div><div class='ctx'>  */</div><div class='add'>+static int mv88e6xxx_g2_avb_wait(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int bit = __bf_shf(MV88E6352_G2_AVB_CMD_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_wait_bit(chip, MV88E6352_G2_AVB_CMD, bit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv88e6xxx_g2_avb_read(struct mv88e6xxx_chip *chip, u16 readop,</div><div class='ctx'> 				 u16 *data, int len)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	err = mv88e6xxx_g2_avb_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	/* Hardware can only snapshot four words. */</div><div class='ctx'> 	if (len &gt; 4)</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_g2_update(chip, MV88E6352_G2_AVB_CMD, readop);</div><div class='add'>+	err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_CMD,</div><div class='add'>+				 MV88E6352_G2_AVB_CMD_BUSY | readop);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_avb_wait(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -57,11 +75,18 @@ static int mv88e6xxx_g2_avb_write(struct mv88e6xxx_chip *chip, u16 writeop,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	err = mv88e6xxx_g2_avb_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_DATA, data);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6352_G2_AVB_CMD, writeop);</div><div class='add'>+	err = mv88e6xxx_g2_write(chip, MV88E6352_G2_AVB_CMD,</div><div class='add'>+				 MV88E6352_G2_AVB_CMD_BUSY | writeop);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_avb_wait(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6352_g2_avb_port_ptp_read(struct mv88e6xxx_chip *chip,</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/global2_scratch.c b/drivers/net/dsa/mv88e6xxx/global2_scratch.c<br/>index baddecadd8be..53a6d3ed63b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2_scratch.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/global2_scratch.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/global2_scratch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/global2_scratch.c</a></div><div class='hunk'>@@ -37,13 +37,15 @@ static int mv88e6xxx_g2_scratch_write(struct mv88e6xxx_chip *chip, int reg,</div><div class='ctx'> {</div><div class='ctx'> 	u16 value = (reg &lt;&lt; 8) | data;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_g2_update(chip, MV88E6XXX_G2_SCRATCH_MISC_MISC, value);</div><div class='add'>+	return mv88e6xxx_g2_write(chip, MV88E6XXX_G2_SCRATCH_MISC_MISC,</div><div class='add'>+				  MV88E6XXX_G2_SCRATCH_MISC_UPDATE | value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mv88e6xxx_g2_scratch_gpio_get_bit - get a bit</div><div class='add'>+ * mv88e6xxx_g2_scratch_get_bit - get a bit</div><div class='ctx'>  * @chip: chip private data</div><div class='del'>- * @nr: bit index</div><div class='add'>+ * @base_reg: base of scratch bits</div><div class='add'>+ * @offset: index of bit within the register</div><div class='ctx'>  * @set: is bit set?</div><div class='ctx'>  */</div><div class='ctx'> static int mv88e6xxx_g2_scratch_get_bit(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -65,10 +67,11 @@ static int mv88e6xxx_g2_scratch_get_bit(struct mv88e6xxx_chip *chip,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mv88e6xxx_g2_scratch_gpio_set_bit - set (or clear) a bit</div><div class='add'>+ * mv88e6xxx_g2_scratch_set_bit - set (or clear) a bit</div><div class='ctx'>  * @chip: chip private data</div><div class='del'>- * @nr: bit index</div><div class='del'>- * @set: set if true, clear if false</div><div class='add'>+ * @base_reg: base of scratch bits</div><div class='add'>+ * @offset: index of bit within the register</div><div class='add'>+ * @set: should this bit be set?</div><div class='ctx'>  *</div><div class='ctx'>  * Helper function for dealing with the direction and data registers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -143,7 +146,7 @@ static int mv88e6352_g2_scratch_gpio_set_data(struct mv88e6xxx_chip *chip,</div><div class='ctx'>  * @chip: chip private data</div><div class='ctx'>  * @pin: gpio index</div><div class='ctx'>  *</div><div class='del'>- * Return: 0 for output, 1 for input (same as GPIOF_DIR_XXX).</div><div class='add'>+ * Return: 0 for output, 1 for input.</div><div class='ctx'>  */</div><div class='ctx'> static int mv88e6352_g2_scratch_gpio_get_dir(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 					     unsigned int pin)</div><div class='hunk'>@@ -164,6 +167,7 @@ static int mv88e6352_g2_scratch_gpio_get_dir(struct mv88e6xxx_chip *chip,</div><div class='ctx'>  * mv88e6352_g2_scratch_gpio_set_dir - set direction of gpio pin</div><div class='ctx'>  * @chip: chip private data</div><div class='ctx'>  * @pin: gpio index</div><div class='add'>+ * @input: should the gpio be an input, or an output?</div><div class='ctx'>  */</div><div class='ctx'> static int mv88e6352_g2_scratch_gpio_set_dir(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 					     unsigned int pin, bool input)</div><div class='hunk'>@@ -236,7 +240,7 @@ const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * mv88e6xxx_g2_gpio_set_smi - set gpio muxing for external smi</div><div class='add'>+ * mv88e6390_g2_scratch_gpio_set_smi - set gpio muxing for external smi</div><div class='ctx'>  * @chip: chip private data</div><div class='ctx'>  * @external: set mux for external smi, or free for gpio usage</div><div class='ctx'>  *</div><div class='hunk'>@@ -244,7 +248,7 @@ const struct mv88e6xxx_gpio_ops mv88e6352_gpio_ops = {</div><div class='ctx'>  * an external SMI interface, or they may be made free for other</div><div class='ctx'>  * GPIO uses.</div><div class='ctx'>  */</div><div class='del'>-int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='add'>+int mv88e6390_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				      bool external)</div><div class='ctx'> {</div><div class='ctx'> 	int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;</div><div class='hunk'>@@ -285,3 +289,62 @@ int mv88e6xxx_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mv88e6393x_g2_scratch_gpio_set_smi - set gpio muxing for external smi</div><div class='add'>+ * @chip: chip private data</div><div class='add'>+ * @external: set mux for external smi, or free for gpio usage</div><div class='add'>+ *</div><div class='add'>+ * MV88E6191X/6193X/6393X GPIO pins 9 and 10 can be configured as an</div><div class='add'>+ * external SMI interface or as regular GPIO-s.</div><div class='add'>+ *</div><div class='add'>+ * They however have a different register layout then the existing</div><div class='add'>+ * function.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+int mv88e6393x_g2_scratch_gpio_set_smi(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       bool external)</div><div class='add'>+{</div><div class='add'>+	int misc_cfg = MV88E6352_G2_SCRATCH_MISC_CFG;</div><div class='add'>+	int err;</div><div class='add'>+	u8 val;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_scratch_read(chip, misc_cfg, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (external)</div><div class='add'>+		val &amp;= ~MV88E6352_G2_SCRATCH_MISC_CFG_NORMALSMI;</div><div class='add'>+	else</div><div class='add'>+		val |= MV88E6352_G2_SCRATCH_MISC_CFG_NORMALSMI;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_g2_scratch_write(chip, misc_cfg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * mv88e6352_g2_scratch_port_has_serdes - indicate if a port can have a serdes</div><div class='add'>+ * @chip: chip private data</div><div class='add'>+ * @port: port number to check for serdes</div><div class='add'>+ *</div><div class='add'>+ * Indicates whether the port may have a serdes attached according to the</div><div class='add'>+ * pin strapping. Returns negative error number, 0 if the port is not</div><div class='add'>+ * configured to have a serdes, and 1 if the port is configured to have a</div><div class='add'>+ * serdes attached.</div><div class='add'>+ */</div><div class='add'>+int mv88e6352_g2_scratch_port_has_serdes(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	u8 config3, p;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_g2_scratch_read(chip, MV88E6352_G2_SCRATCH_CONFIG_DATA3,</div><div class='add'>+					&amp;config3);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (config3 &amp; MV88E6352_G2_SCRATCH_CONFIG_DATA3_S_SEL)</div><div class='add'>+		p = 5;</div><div class='add'>+	else</div><div class='add'>+		p = 4;</div><div class='add'>+</div><div class='add'>+	return port == p;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c<br/>index 7f95a636561d..6e6472a3b75a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/hwtstamp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/hwtstamp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/hwtstamp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/hwtstamp.c</a></div><div class='hunk'>@@ -64,7 +64,7 @@ static int mv88e6xxx_ptp_read(struct mv88e6xxx_chip *chip, int addr,</div><div class='ctx'> #define TX_TSTAMP_TIMEOUT	msecs_to_jiffies(40)</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port,</div><div class='del'>-			  struct ethtool_ts_info *info)</div><div class='add'>+			  struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mv88e6xxx_ptp_ops *ptp_ops;</div><div class='ctx'> 	struct mv88e6xxx_chip *chip;</div><div class='hunk'>@@ -89,7 +89,7 @@ int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-					 struct hwtstamp_config *config)</div><div class='add'>+					 struct kernel_hwtstamp_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	const struct mv88e6xxx_ptp_ops *ptp_ops = chip-&gt;info-&gt;ops-&gt;ptp_ops;</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp *ps = &amp;chip-&gt;port_hwtstamp[port];</div><div class='hunk'>@@ -100,10 +100,6 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_bit_unlock(MV88E6XXX_HWTSTAMP_ENABLED, &amp;ps-&gt;state);</div><div class='ctx'> </div><div class='del'>-	/* reserved for future extensions */</div><div class='del'>-	if (config-&gt;flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	switch (config-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 		tstamp_enable = false;</div><div class='hunk'>@@ -147,7 +143,7 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	if (tstamp_enable) {</div><div class='ctx'> 		chip-&gt;enable_count += 1;</div><div class='ctx'> 		if (chip-&gt;enable_count == 1 &amp;&amp; ptp_ops-&gt;global_enable)</div><div class='hunk'>@@ -161,7 +157,7 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		if (chip-&gt;enable_count == 0 &amp;&amp; ptp_ops-&gt;global_disable)</div><div class='ctx'> 			ptp_ops-&gt;global_disable(chip);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	/* Once hardware has been configured, enable timestamp checks</div><div class='ctx'> 	 * in the RX/TX paths.</div><div class='hunk'>@@ -173,87 +169,54 @@ static int mv88e6xxx_set_hwtstamp_config(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='del'>-				struct ifreq *ifr)</div><div class='add'>+				struct kernel_hwtstamp_config *config,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp *ps = &amp;chip-&gt;port_hwtstamp[port];</div><div class='del'>-	struct hwtstamp_config config;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!chip-&gt;info-&gt;ptp_support)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;config, ifr-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	err = mv88e6xxx_set_hwtstamp_config(chip, port, &amp;config);</div><div class='add'>+	err = mv88e6xxx_set_hwtstamp_config(chip, port, config);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* Save the chosen configuration to be returned later. */</div><div class='del'>-	memcpy(&amp;ps-&gt;tstamp_config, &amp;config, sizeof(config));</div><div class='add'>+	ps-&gt;tstamp_config = *config;</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, &amp;config, sizeof(config)) ?</div><div class='del'>-		-EFAULT : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='del'>-				struct ifreq *ifr)</div><div class='add'>+				struct kernel_hwtstamp_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp *ps = &amp;chip-&gt;port_hwtstamp[port];</div><div class='del'>-	struct hwtstamp_config *config = &amp;ps-&gt;tstamp_config;</div><div class='ctx'> </div><div class='ctx'> 	if (!chip-&gt;info-&gt;ptp_support)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, config, sizeof(*config)) ?</div><div class='del'>-		-EFAULT : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get the start of the PTP header in this skb */</div><div class='del'>-static u8 *parse_ptp_header(struct sk_buff *skb, unsigned int type)</div><div class='del'>-{</div><div class='del'>-	u8 *data = skb_mac_header(skb);</div><div class='del'>-	unsigned int offset = 0;</div><div class='del'>-</div><div class='del'>-	if (type &amp; PTP_CLASS_VLAN)</div><div class='del'>-		offset += VLAN_HLEN;</div><div class='add'>+	*config = ps-&gt;tstamp_config;</div><div class='ctx'> </div><div class='del'>-	switch (type &amp; PTP_CLASS_PMASK) {</div><div class='del'>-	case PTP_CLASS_IPV4:</div><div class='del'>-		offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;</div><div class='del'>-		break;</div><div class='del'>-	case PTP_CLASS_IPV6:</div><div class='del'>-		offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;</div><div class='del'>-		break;</div><div class='del'>-	case PTP_CLASS_L2:</div><div class='del'>-		offset += ETH_HLEN;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ensure that the entire header is present in this packet. */</div><div class='del'>-	if (skb-&gt;len + ETH_HLEN &lt; offset + 34)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return data + offset;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Returns a pointer to the PTP header if the caller should time stamp,</div><div class='ctx'>  * or NULL if the caller should not.</div><div class='ctx'>  */</div><div class='del'>-static u8 *mv88e6xxx_should_tstamp(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				   struct sk_buff *skb, unsigned int type)</div><div class='add'>+static struct ptp_header *mv88e6xxx_should_tstamp(struct mv88e6xxx_chip *chip,</div><div class='add'>+						  int port, struct sk_buff *skb,</div><div class='add'>+						  unsigned int type)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp *ps = &amp;chip-&gt;port_hwtstamp[port];</div><div class='del'>-	u8 *hdr;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='ctx'> </div><div class='ctx'> 	if (!chip-&gt;info-&gt;ptp_support)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	hdr = parse_ptp_header(skb, type);</div><div class='add'>+	hdr = ptp_parse_header(skb, type);</div><div class='ctx'> 	if (!hdr)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -275,12 +238,11 @@ static int mv88e6xxx_ts_valid(u16 status)</div><div class='ctx'> static int seq_match(struct sk_buff *skb, u16 ts_seqid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int type = SKB_PTP_TYPE(skb);</div><div class='del'>-	u8 *hdr = parse_ptp_header(skb, type);</div><div class='del'>-	__be16 *seqid;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='ctx'> </div><div class='del'>-	seqid = (__be16 *)(hdr + OFF_PTP_SEQUENCE_ID);</div><div class='add'>+	hdr = ptp_parse_header(skb, type);</div><div class='ctx'> </div><div class='del'>-	return ts_seqid == ntohs(*seqid);</div><div class='add'>+	return ts_seqid == ntohs(hdr-&gt;sequence_id);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -301,10 +263,10 @@ static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	skb_queue_splice_tail_init(rxq, &amp;received);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;rxq-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_port_ptp_read(chip, ps-&gt;port_id,</div><div class='ctx'> 				      reg, buf, ARRAY_SIZE(buf));</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		pr_err("failed to get the receive time stamp\n");</div><div class='ctx'> </div><div class='hunk'>@@ -314,9 +276,9 @@ static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	seq_id = buf[3];</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; MV88E6XXX_PTP_TS_VALID) {</div><div class='del'>-		mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 		err = mv88e6xxx_port_ptp_write(chip, ps-&gt;port_id, reg, 0);</div><div class='del'>-		mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			pr_err("failed to clear the receive status\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -327,15 +289,15 @@ static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		if (mv88e6xxx_ts_valid(status) &amp;&amp; seq_match(skb, seq_id)) {</div><div class='ctx'> 			ns = timehi &lt;&lt; 16 | timelo;</div><div class='ctx'> </div><div class='del'>-			mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+			mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 			ns = timecounter_cyc2time(&amp;chip-&gt;tstamp_tc, ns);</div><div class='del'>-			mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+			mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 			shwt = skb_hwtstamps(skb);</div><div class='ctx'> 			memset(shwt, 0, sizeof(*shwt));</div><div class='ctx'> 			shwt-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='ctx'> 			status &amp;= ~MV88E6XXX_PTP_TS_VALID;</div><div class='ctx'> 		}</div><div class='del'>-		netif_rx_ni(skb);</div><div class='add'>+		netif_rx(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -357,9 +319,9 @@ static void mv88e6xxx_rxtstamp_work(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				   &amp;ps-&gt;rx_queue2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int is_pdelay_resp(u8 *msgtype)</div><div class='add'>+static int is_pdelay_resp(const struct ptp_header *hdr)</div><div class='ctx'> {</div><div class='del'>-	return (*msgtype &amp; 0xf) == 3;</div><div class='add'>+	return (hdr-&gt;tsmt &amp; 0xf) == 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -367,7 +329,7 @@ bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp *ps;</div><div class='ctx'> 	struct mv88e6xxx_chip *chip;</div><div class='del'>-	u8 *hdr;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='ctx'> </div><div class='ctx'> 	chip = ds-&gt;priv;</div><div class='ctx'> 	ps = &amp;chip-&gt;port_hwtstamp[port];</div><div class='hunk'>@@ -405,12 +367,12 @@ static int mv88e6xxx_txtstamp_work(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	if (!ps-&gt;tx_skb)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	err = mv88e6xxx_port_ptp_read(chip, ps-&gt;port_id,</div><div class='ctx'> 				      ptp_ops-&gt;dep_sts_reg,</div><div class='ctx'> 				      departure_block,</div><div class='ctx'> 				      ARRAY_SIZE(departure_block));</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_and_clear_skb;</div><div class='hunk'>@@ -430,9 +392,9 @@ static int mv88e6xxx_txtstamp_work(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We have the timestamp; go ahead and clear valid now */</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	mv88e6xxx_port_ptp_write(chip, ps-&gt;port_id, ptp_ops-&gt;dep_sts_reg, 0);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	status = departure_block[0] &amp; MV88E6XXX_PTP_TS_STATUS_MASK;</div><div class='ctx'> 	if (status != MV88E6XXX_PTP_TS_STATUS_NORMAL) {</div><div class='hunk'>@@ -447,9 +409,9 @@ static int mv88e6xxx_txtstamp_work(struct mv88e6xxx_chip *chip,</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='ctx'> 	time_raw = ((u32)departure_block[2] &lt;&lt; 16) | departure_block[1];</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	ns = timecounter_cyc2time(&amp;chip-&gt;tstamp_tc, time_raw);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> 	shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev,</div><div class='hunk'>@@ -498,33 +460,38 @@ long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp)</div><div class='ctx'> 	return restart ? 1 : -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-bool mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='del'>-			     struct sk_buff *clone, unsigned int type)</div><div class='add'>+void mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ds-&gt;priv;</div><div class='ctx'> 	struct mv88e6xxx_port_hwtstamp *ps = &amp;chip-&gt;port_hwtstamp[port];</div><div class='del'>-	__be16 *seq_ptr;</div><div class='del'>-	u8 *hdr;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+	struct sk_buff *clone;</div><div class='add'>+	unsigned int type;</div><div class='ctx'> </div><div class='del'>-	if (!(skb_shinfo(clone)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP))</div><div class='del'>-		return false;</div><div class='add'>+	type = ptp_classify_raw(skb);</div><div class='add'>+	if (type == PTP_CLASS_NONE)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	hdr = mv88e6xxx_should_tstamp(chip, port, clone, type);</div><div class='add'>+	hdr = mv88e6xxx_should_tstamp(chip, port, skb, type);</div><div class='ctx'> 	if (!hdr)</div><div class='del'>-		return false;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	seq_ptr = (__be16 *)(hdr + OFF_PTP_SEQUENCE_ID);</div><div class='add'>+	clone = skb_clone_sk(skb);</div><div class='add'>+	if (!clone)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_set_bit_lock(MV88E6XXX_HWTSTAMP_TX_IN_PROGRESS,</div><div class='del'>-				  &amp;ps-&gt;state))</div><div class='del'>-		return false;</div><div class='add'>+				  &amp;ps-&gt;state)) {</div><div class='add'>+		kfree_skb(clone);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ps-&gt;tx_skb = clone;</div><div class='ctx'> 	ps-&gt;tx_tstamp_start = jiffies;</div><div class='del'>-	ps-&gt;tx_seq_id = be16_to_cpup(seq_ptr);</div><div class='add'>+	ps-&gt;tx_seq_id = be16_to_cpu(hdr-&gt;sequence_id);</div><div class='ctx'> </div><div class='ctx'> 	ptp_schedule_worker(chip-&gt;ptp_clock, 0);</div><div class='del'>-	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6165_global_disable(struct mv88e6xxx_chip *chip)</div><div class='hunk'>@@ -603,7 +570,7 @@ int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the ethertype of L2 PTP messages */</div><div class='del'>-	err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_GC_ETYPE, ETH_P_1588);</div><div class='add'>+	err = mv88e6xxx_ptp_write(chip, MV88E6XXX_PTP_ETHERTYPE, ETH_P_1588);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.h b/drivers/net/dsa/mv88e6xxx/hwtstamp.h<br/>index 9da9f197ba02..c359821d5a6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/hwtstamp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/hwtstamp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/hwtstamp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/hwtstamp.h</a></div><div class='hunk'>@@ -111,18 +111,20 @@</div><div class='ctx'> #ifdef CONFIG_NET_DSA_MV88E6XXX_PTP</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='del'>-				struct ifreq *ifr);</div><div class='add'>+				struct kernel_hwtstamp_config *cfg,</div><div class='add'>+				struct netlink_ext_ack *extack);</div><div class='ctx'> int mv88e6xxx_port_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='del'>-				struct ifreq *ifr);</div><div class='add'>+				struct kernel_hwtstamp_config *cfg);</div><div class='ctx'> </div><div class='ctx'> bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='ctx'> 			     struct sk_buff *clone, unsigned int type);</div><div class='del'>-bool mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='del'>-			     struct sk_buff *clone, unsigned int type);</div><div class='add'>+void mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct sk_buff *skb);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port,</div><div class='del'>-			  struct ethtool_ts_info *info);</div><div class='add'>+			  struct kernel_ethtool_ts_info *info);</div><div class='ctx'> </div><div class='add'>+long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp);</div><div class='ctx'> int mv88e6xxx_hwtstamp_setup(struct mv88e6xxx_chip *chip);</div><div class='ctx'> void mv88e6xxx_hwtstamp_free(struct mv88e6xxx_chip *chip);</div><div class='ctx'> int mv88e6352_hwtstamp_port_enable(struct mv88e6xxx_chip *chip, int port);</div><div class='hunk'>@@ -132,14 +134,17 @@ int mv88e6165_global_disable(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_NET_DSA_MV88E6XXX_PTP */</div><div class='ctx'> </div><div class='del'>-static inline int mv88e6xxx_port_hwtstamp_set(struct dsa_switch *ds,</div><div class='del'>-					      int port, struct ifreq *ifr)</div><div class='add'>+static inline int</div><div class='add'>+mv88e6xxx_port_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct kernel_hwtstamp_config *config,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int mv88e6xxx_port_hwtstamp_get(struct dsa_switch *ds,</div><div class='del'>-					      int port, struct ifreq *ifr)</div><div class='add'>+static inline int</div><div class='add'>+mv88e6xxx_port_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct kernel_hwtstamp_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='hunk'>@@ -151,15 +156,13 @@ static inline bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='del'>-					   struct sk_buff *clone,</div><div class='del'>-					   unsigned int type)</div><div class='add'>+static inline void mv88e6xxx_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int mv88e6xxx_get_ts_info(struct dsa_switch *ds, int port,</div><div class='del'>-					struct ethtool_ts_info *info)</div><div class='add'>+					struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c<br/>new file mode 100644<br/>index 000000000000..ab3bc645da56<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/leds.c</a></div><div class='hunk'>@@ -0,0 +1,848 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "global2.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+</div><div class='add'>+/* Offset 0x16: LED control */</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_led_write(struct mv88e6xxx_chip *chip, int port, u16 reg)</div><div class='add'>+{</div><div class='add'>+	reg |= MV88E6XXX_PORT_LED_CONTROL_UPDATE;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_LED_CONTROL, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_led_read(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   u16 ptr, u16 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_LED_CONTROL, ptr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_LED_CONTROL, val);</div><div class='add'>+	*val &amp;= 0x3ff;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led_brightness_set(struct mv88e6xxx_port *p, int led,</div><div class='add'>+					int brightness)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_led_read(p-&gt;chip, p-&gt;port,</div><div class='add'>+				      MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL,</div><div class='add'>+				      &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (led == 1)</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_LED_CONTROL_LED1_SEL_MASK;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_LED_CONTROL_LED0_SEL_MASK;</div><div class='add'>+</div><div class='add'>+	if (brightness) {</div><div class='add'>+		/* Selector 0x0f == Force LED ON */</div><div class='add'>+		if (led == 1)</div><div class='add'>+			reg |= MV88E6XXX_PORT_LED_CONTROL_LED1_SELF;</div><div class='add'>+		else</div><div class='add'>+			reg |= MV88E6XXX_PORT_LED_CONTROL_LED0_SELF;</div><div class='add'>+	} else {</div><div class='add'>+		/* Selector 0x0e == Force LED OFF */</div><div class='add'>+		if (led == 1)</div><div class='add'>+			reg |= MV88E6XXX_PORT_LED_CONTROL_LED1_SELE;</div><div class='add'>+		else</div><div class='add'>+			reg |= MV88E6XXX_PORT_LED_CONTROL_LED0_SELE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg |= MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_led_write(p-&gt;chip, p-&gt;port, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led0_brightness_set_blocking(struct led_classdev *ldev,</div><div class='add'>+						  enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led0);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_led_brightness_set(p, 0, brightness);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led1_brightness_set_blocking(struct led_classdev *ldev,</div><div class='add'>+						  enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led1);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_led_brightness_set(p, 1, brightness);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_led_hwconfig {</div><div class='add'>+	int led;</div><div class='add'>+	u8 portmask;</div><div class='add'>+	unsigned long rules;</div><div class='add'>+	bool fiber;</div><div class='add'>+	bool blink_activity;</div><div class='add'>+	u16 selector;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The following is a lookup table to check what rules we can support on a</div><div class='add'>+ * certain LED given restrictions such as that some rules only work with fiber</div><div class='add'>+ * (SFP) connections and some blink on activity by default.</div><div class='add'>+ */</div><div class='add'>+#define MV88E6XXX_PORTS_0_3 (BIT(0) | BIT(1) | BIT(2) | BIT(3))</div><div class='add'>+#define MV88E6XXX_PORTS_4_5 (BIT(4) | BIT(5))</div><div class='add'>+#define MV88E6XXX_PORT_4 BIT(4)</div><div class='add'>+#define MV88E6XXX_PORT_5 BIT(5)</div><div class='add'>+</div><div class='add'>+/* Entries are listed in selector order.</div><div class='add'>+ *</div><div class='add'>+ * These configurations vary across different switch families, list</div><div class='add'>+ * different tables per-family here.</div><div class='add'>+ */</div><div class='add'>+static const struct mv88e6xxx_led_hwconfig mv88e6352_led_hwconfigs[] = {</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_4,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100) | BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_100),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_4_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.fiber = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_4_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.fiber = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_100),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_4_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.fiber = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_4_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.fiber = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL2,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_4_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.fiber = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL3,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_4,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL4,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL5,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_FULL_DUPLEX),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_4,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_FULL_DUPLEX),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_FULL_DUPLEX),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL6,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL7,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10) | BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL7,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL8,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL8,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORT_5,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL8,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SEL9,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SEL9,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_10),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SELA,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SELA,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 0,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100) | BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED0_SELB,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.led = 1,</div><div class='add'>+		.portmask = MV88E6XXX_PORTS_0_3,</div><div class='add'>+		.rules = BIT(TRIGGER_NETDEV_LINK_100) | BIT(TRIGGER_NETDEV_LINK_1000),</div><div class='add'>+		.blink_activity = true,</div><div class='add'>+		.selector = MV88E6XXX_PORT_LED_CONTROL_LED1_SELB,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* mv88e6xxx_led_match_selector() - look up the appropriate LED mode selector</div><div class='add'>+ * @p: port state container</div><div class='add'>+ * @led: LED number, 0 or 1</div><div class='add'>+ * @blink_activity: blink the LED (usually blink on indicated activity)</div><div class='add'>+ * @fiber: the link is connected to fiber such as SFP</div><div class='add'>+ * @rules: LED status flags from the LED classdev core</div><div class='add'>+ * @selector: fill in the selector in this parameter with an OR operation</div><div class='add'>+ */</div><div class='add'>+static int mv88e6xxx_led_match_selector(struct mv88e6xxx_port *p, int led, bool blink_activity,</div><div class='add'>+					bool fiber, unsigned long rules, u16 *selector)</div><div class='add'>+{</div><div class='add'>+	const struct mv88e6xxx_led_hwconfig *conf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* No rules means we turn the LED off */</div><div class='add'>+	if (!rules) {</div><div class='add'>+		if (led == 1)</div><div class='add'>+			*selector |= MV88E6XXX_PORT_LED_CONTROL_LED1_SELE;</div><div class='add'>+		else</div><div class='add'>+			*selector |= MV88E6XXX_PORT_LED_CONTROL_LED0_SELE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: these rules are for MV88E6352, when adding other families,</div><div class='add'>+	 * think about making sure you select the table that match the</div><div class='add'>+	 * specific switch family.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6352_led_hwconfigs); i++) {</div><div class='add'>+		conf = &amp;mv88e6352_led_hwconfigs[i];</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;led != led)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(conf-&gt;portmask &amp; BIT(p-&gt;port)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;blink_activity != blink_activity)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;fiber != fiber)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;rules == rules) {</div><div class='add'>+			dev_dbg(p-&gt;chip-&gt;dev, "port%d LED %d set selector %04x for rules %08lx\n",</div><div class='add'>+				p-&gt;port, led, conf-&gt;selector, rules);</div><div class='add'>+			*selector |= conf-&gt;selector;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mv88e6xxx_led_match_selector() - find Linux netdev rules from a selector value</div><div class='add'>+ * @p: port state container</div><div class='add'>+ * @selector: the selector value from the LED actity register</div><div class='add'>+ * @led: LED number, 0 or 1</div><div class='add'>+ * @rules: Linux netdev activity rules found from selector</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led_match_rule(struct mv88e6xxx_port *p, u16 selector, int led, unsigned long *rules)</div><div class='add'>+{</div><div class='add'>+	const struct mv88e6xxx_led_hwconfig *conf;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Find the selector in the table, we just look for the right selector</div><div class='add'>+	 * and ignore if the activity has special properties such as blinking</div><div class='add'>+	 * or is fiber-only.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6352_led_hwconfigs); i++) {</div><div class='add'>+		conf = &amp;mv88e6352_led_hwconfigs[i];</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;led != led)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!(conf-&gt;portmask &amp; BIT(p-&gt;port)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (conf-&gt;selector == selector) {</div><div class='add'>+			dev_dbg(p-&gt;chip-&gt;dev, "port%d LED %d has selector %04x, rules %08lx\n",</div><div class='add'>+				p-&gt;port, led, selector, conf-&gt;rules);</div><div class='add'>+			*rules = conf-&gt;rules;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mv88e6xxx_led_get_selector() - get the appropriate LED mode selector</div><div class='add'>+ * @p: port state container</div><div class='add'>+ * @led: LED number, 0 or 1</div><div class='add'>+ * @fiber: the link is connected to fiber such as SFP</div><div class='add'>+ * @rules: LED status flags from the LED classdev core</div><div class='add'>+ * @selector: fill in the selector in this parameter with an OR operation</div><div class='add'>+ */</div><div class='add'>+static int mv88e6xxx_led_get_selector(struct mv88e6xxx_port *p, int led,</div><div class='add'>+				      bool fiber, unsigned long rules, u16 *selector)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* What happens here is that we first try to locate a trigger with solid</div><div class='add'>+	 * indicator (such as LED is on for a 1000 link) else we try a second</div><div class='add'>+	 * sweep to find something suitable with a trigger that will blink on</div><div class='add'>+	 * activity.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6xxx_led_match_selector(p, led, false, fiber, rules, selector);</div><div class='add'>+	if (err)</div><div class='add'>+		return mv88e6xxx_led_match_selector(p, led, true, fiber, rules, selector);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sets up the hardware blinking period */</div><div class='add'>+static int mv88e6xxx_led_set_blinking_period(struct mv88e6xxx_port *p, int led,</div><div class='add'>+					     unsigned long delay_on, unsigned long delay_off)</div><div class='add'>+{</div><div class='add'>+	unsigned long period;</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	period = delay_on + delay_off;</div><div class='add'>+</div><div class='add'>+	reg = 0;</div><div class='add'>+</div><div class='add'>+	switch (period) {</div><div class='add'>+	case 21:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_21MS;</div><div class='add'>+		break;</div><div class='add'>+	case 42:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_42MS;</div><div class='add'>+		break;</div><div class='add'>+	case 84:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_84MS;</div><div class='add'>+		break;</div><div class='add'>+	case 168:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_168MS;</div><div class='add'>+		break;</div><div class='add'>+	case 336:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_336MS;</div><div class='add'>+		break;</div><div class='add'>+	case 672:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_672MS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Fall back to software blinking */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This is essentially PWM duty cycle: how long time of the period</div><div class='add'>+	 * will the LED be on. Zero isn't great in most cases.</div><div class='add'>+	 */</div><div class='add'>+	switch (delay_on) {</div><div class='add'>+	case 0:</div><div class='add'>+		/* This is usually pretty useless and will make the LED look OFF */</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case 21:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_21MS;</div><div class='add'>+		break;</div><div class='add'>+	case 42:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_42MS;</div><div class='add'>+		break;</div><div class='add'>+	case 84:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_84MS;</div><div class='add'>+		break;</div><div class='add'>+	case 168:</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_168MS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Just use something non-zero */</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_21MS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up blink rate */</div><div class='add'>+	reg |= MV88E6XXX_PORT_LED_CONTROL_POINTER_STRETCH_BLINK;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_led_write(p-&gt;chip, p-&gt;port, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led_blink_set(struct mv88e6xxx_port *p, int led,</div><div class='add'>+				   unsigned long *delay_on, unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Choose a sensible default 336 ms (~3 Hz) */</div><div class='add'>+	if ((*delay_on == 0) &amp;&amp; (*delay_off == 0)) {</div><div class='add'>+		*delay_on = 168;</div><div class='add'>+		*delay_off = 168;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No off delay is just on */</div><div class='add'>+	if (*delay_off == 0)</div><div class='add'>+		return mv88e6xxx_led_brightness_set(p, led, 1);</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_led_set_blinking_period(p, led, *delay_on, *delay_off);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_led_read(p-&gt;chip, p-&gt;port,</div><div class='add'>+				      MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL,</div><div class='add'>+				      &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (led == 1)</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_LED_CONTROL_LED1_SEL_MASK;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_LED_CONTROL_LED0_SEL_MASK;</div><div class='add'>+</div><div class='add'>+	/* This will select the forced blinking status */</div><div class='add'>+	if (led == 1)</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_LED1_SELD;</div><div class='add'>+	else</div><div class='add'>+		reg |= MV88E6XXX_PORT_LED_CONTROL_LED0_SELD;</div><div class='add'>+</div><div class='add'>+	reg |= MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_led_write(p-&gt;chip, p-&gt;port, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led0_blink_set(struct led_classdev *ldev,</div><div class='add'>+				    unsigned long *delay_on,</div><div class='add'>+				    unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led0);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_led_blink_set(p, 0, delay_on, delay_off);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led1_blink_set(struct led_classdev *ldev,</div><div class='add'>+				    unsigned long *delay_on,</div><div class='add'>+				    unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led1);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_led_blink_set(p, 1, delay_on, delay_off);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led0_hw_control_is_supported(struct led_classdev *ldev, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led0);</div><div class='add'>+	u16 selector = 0;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_led_get_selector(p, 0, p-&gt;fiber, rules, &amp;selector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led1_hw_control_is_supported(struct led_classdev *ldev, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led1);</div><div class='add'>+	u16 selector = 0;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_led_get_selector(p, 1, p-&gt;fiber, rules, &amp;selector);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_led_hw_control_set(struct mv88e6xxx_port *p,</div><div class='add'>+					int led, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_led_read(p-&gt;chip, p-&gt;port,</div><div class='add'>+				      MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL,</div><div class='add'>+				      &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (led == 1)</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_LED_CONTROL_LED1_SEL_MASK;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_LED_CONTROL_LED0_SEL_MASK;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_led_get_selector(p, led, p-&gt;fiber, rules, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg |= MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL;</div><div class='add'>+</div><div class='add'>+	if (led == 0)</div><div class='add'>+		dev_dbg(p-&gt;chip-&gt;dev, "LED 0 hw control on port %d trigger selector 0x%02x\n",</div><div class='add'>+			p-&gt;port,</div><div class='add'>+			(unsigned int)(reg &amp; MV88E6XXX_PORT_LED_CONTROL_LED0_SEL_MASK));</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(p-&gt;chip-&gt;dev, "LED 1 hw control on port %d trigger selector 0x%02x\n",</div><div class='add'>+			p-&gt;port,</div><div class='add'>+			(unsigned int)(reg &amp; MV88E6XXX_PORT_LED_CONTROL_LED1_SEL_MASK) &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_led_write(p-&gt;chip, p-&gt;port, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led_hw_control_get(struct mv88e6xxx_port *p, int led, unsigned long *rules)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_port_led_read(p-&gt;chip, p-&gt;port,</div><div class='add'>+				      MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL, &amp;val);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Mask out the selector bits for this port */</div><div class='add'>+	if (led == 1) {</div><div class='add'>+		val &amp;= MV88E6XXX_PORT_LED_CONTROL_LED1_SEL_MASK;</div><div class='add'>+		/* It's forced blinking/OFF/ON */</div><div class='add'>+		if (val == MV88E6XXX_PORT_LED_CONTROL_LED1_SELD ||</div><div class='add'>+		    val == MV88E6XXX_PORT_LED_CONTROL_LED1_SELE ||</div><div class='add'>+		    val == MV88E6XXX_PORT_LED_CONTROL_LED1_SELF) {</div><div class='add'>+			*rules = 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= MV88E6XXX_PORT_LED_CONTROL_LED0_SEL_MASK;</div><div class='add'>+		/* It's forced blinking/OFF/ON */</div><div class='add'>+		if (val == MV88E6XXX_PORT_LED_CONTROL_LED0_SELD ||</div><div class='add'>+		    val == MV88E6XXX_PORT_LED_CONTROL_LED0_SELE ||</div><div class='add'>+		    val == MV88E6XXX_PORT_LED_CONTROL_LED0_SELF) {</div><div class='add'>+			*rules = 0;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_led_match_rule(p, val, led, rules);</div><div class='add'>+	if (!err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(p-&gt;chip-&gt;dev, "couldn't find matching selector for %04x\n", val);</div><div class='add'>+	*rules = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led0_hw_control_set(struct led_classdev *ldev, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led0);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_led_hw_control_set(p, 0, rules);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led1_hw_control_set(struct led_classdev *ldev, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led1);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(p-&gt;chip);</div><div class='add'>+	err = mv88e6xxx_led_hw_control_set(p, 1, rules);</div><div class='add'>+	mv88e6xxx_reg_unlock(p-&gt;chip);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led0_hw_control_get(struct led_classdev *ldev, unsigned long *rules)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led0);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_led_hw_control_get(p, 0, rules);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_led1_hw_control_get(struct led_classdev *ldev, unsigned long *rules)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led1);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_led_hw_control_get(p, 1, rules);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *mv88e6xxx_led_hw_control_get_device(struct mv88e6xxx_port *p)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dp = dsa_to_port(p-&gt;chip-&gt;ds, p-&gt;port);</div><div class='add'>+	if (!dp)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (dp-&gt;user)</div><div class='add'>+		return &amp;dp-&gt;user-&gt;dev;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *</div><div class='add'>+mv88e6xxx_led0_hw_control_get_device(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led0);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_led_hw_control_get_device(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *</div><div class='add'>+mv88e6xxx_led1_hw_control_get_device(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *p = container_of(ldev, struct mv88e6xxx_port, led1);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_led_hw_control_get_device(p);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *led = NULL, *leds = NULL;</div><div class='add'>+	struct led_init_data init_data = { };</div><div class='add'>+	enum led_default_state state;</div><div class='add'>+	struct mv88e6xxx_port *p;</div><div class='add'>+	struct led_classdev *l;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	u32 led_num;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* LEDs are on ports 1,2,3,4, 5 and 6 (index 0..5), no more */</div><div class='add'>+	if (port &gt; 5)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	p = &amp;chip-&gt;ports[port];</div><div class='add'>+	if (!p-&gt;fwnode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev = chip-&gt;dev;</div><div class='add'>+</div><div class='add'>+	leds = fwnode_get_named_child_node(p-&gt;fwnode, "leds");</div><div class='add'>+	if (!leds) {</div><div class='add'>+		dev_dbg(dev, "No Leds node specified in device tree for port %d!\n",</div><div class='add'>+			port);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_for_each_child_node(leds, led) {</div><div class='add'>+		/* Reg represent the led number of the port, max 2</div><div class='add'>+		 * LEDs can be connected to each port, in some designs</div><div class='add'>+		 * only one LED is connected.</div><div class='add'>+		 */</div><div class='add'>+		if (fwnode_property_read_u32(led, "reg", &amp;led_num))</div><div class='add'>+			continue;</div><div class='add'>+		if (led_num &gt; 1) {</div><div class='add'>+			dev_err(dev, "invalid LED specified port %d\n", port);</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto err_put_led;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (led_num == 0)</div><div class='add'>+			l = &amp;p-&gt;led0;</div><div class='add'>+		else</div><div class='add'>+			l = &amp;p-&gt;led1;</div><div class='add'>+</div><div class='add'>+		state = led_init_default_state_get(led);</div><div class='add'>+		switch (state) {</div><div class='add'>+		case LEDS_DEFSTATE_ON:</div><div class='add'>+			l-&gt;brightness = 1;</div><div class='add'>+			mv88e6xxx_led_brightness_set(p, led_num, 1);</div><div class='add'>+			break;</div><div class='add'>+		case LEDS_DEFSTATE_KEEP:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			l-&gt;brightness = 0;</div><div class='add'>+			mv88e6xxx_led_brightness_set(p, led_num, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		l-&gt;max_brightness = 1;</div><div class='add'>+		if (led_num == 0) {</div><div class='add'>+			l-&gt;brightness_set_blocking = mv88e6xxx_led0_brightness_set_blocking;</div><div class='add'>+			l-&gt;blink_set = mv88e6xxx_led0_blink_set;</div><div class='add'>+			l-&gt;hw_control_is_supported = mv88e6xxx_led0_hw_control_is_supported;</div><div class='add'>+			l-&gt;hw_control_set = mv88e6xxx_led0_hw_control_set;</div><div class='add'>+			l-&gt;hw_control_get = mv88e6xxx_led0_hw_control_get;</div><div class='add'>+			l-&gt;hw_control_get_device = mv88e6xxx_led0_hw_control_get_device;</div><div class='add'>+		} else {</div><div class='add'>+			l-&gt;brightness_set_blocking = mv88e6xxx_led1_brightness_set_blocking;</div><div class='add'>+			l-&gt;blink_set = mv88e6xxx_led1_blink_set;</div><div class='add'>+			l-&gt;hw_control_is_supported = mv88e6xxx_led1_hw_control_is_supported;</div><div class='add'>+			l-&gt;hw_control_set = mv88e6xxx_led1_hw_control_set;</div><div class='add'>+			l-&gt;hw_control_get = mv88e6xxx_led1_hw_control_get;</div><div class='add'>+			l-&gt;hw_control_get_device = mv88e6xxx_led1_hw_control_get_device;</div><div class='add'>+		}</div><div class='add'>+		l-&gt;hw_control_trigger = "netdev";</div><div class='add'>+</div><div class='add'>+		init_data.default_label = ":port";</div><div class='add'>+		init_data.fwnode = led;</div><div class='add'>+		init_data.devname_mandatory = true;</div><div class='add'>+		init_data.devicename = kasprintf(GFP_KERNEL, "%s:0%d:0%d", chip-&gt;info-&gt;name,</div><div class='add'>+						 port, led_num);</div><div class='add'>+		if (!init_data.devicename) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto err_put_led;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = devm_led_classdev_register_ext(dev, l, &amp;init_data);</div><div class='add'>+		kfree(init_data.devicename);</div><div class='add'>+</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Failed to init LED %d for port %d", led_num, port);</div><div class='add'>+			goto err_put_led;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_handle_put(leds);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_put_led:</div><div class='add'>+	fwnode_handle_put(led);</div><div class='add'>+	fwnode_handle_put(leds);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/pcs-6185.c b/drivers/net/dsa/mv88e6xxx/pcs-6185.c<br/>new file mode 100644<br/>index 000000000000..af7e06d265f7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/pcs-6185.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/pcs-6185.c</a></div><div class='hunk'>@@ -0,0 +1,191 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Marvell 88E6185 family SERDES PCS support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Marvell Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "global2.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "serdes.h"</div><div class='add'>+</div><div class='add'>+struct mv88e6185_pcs {</div><div class='add'>+	struct phylink_pcs phylink_pcs;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	char name[64];</div><div class='add'>+</div><div class='add'>+	struct mv88e6xxx_chip *chip;</div><div class='add'>+	int port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv88e6185_pcs *pcs_to_mv88e6185_pcs(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct mv88e6185_pcs, phylink_pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t mv88e6185_pcs_handle_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6185_pcs *mpcs = dev_id;</div><div class='add'>+	struct mv88e6xxx_chip *chip;</div><div class='add'>+	irqreturn_t ret = IRQ_NONE;</div><div class='add'>+	bool link_up;</div><div class='add'>+	u16 status;</div><div class='add'>+	int port;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	chip = mpcs-&gt;chip;</div><div class='add'>+	port = mpcs-&gt;port;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;status);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (!err) {</div><div class='add'>+		link_up = !!(status &amp; MV88E6XXX_PORT_STS_LINK);</div><div class='add'>+</div><div class='add'>+		phylink_pcs_change(&amp;mpcs-&gt;phylink_pcs, link_up);</div><div class='add'>+</div><div class='add'>+		ret = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6185_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+				    unsigned int neg_mode,</div><div class='add'>+				    struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6185_pcs *mpcs = pcs_to_mv88e6185_pcs(pcs);</div><div class='add'>+	struct mv88e6xxx_chip *chip = mpcs-&gt;chip;</div><div class='add'>+	int port = mpcs-&gt;port;</div><div class='add'>+	u16 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;status);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		status = 0;</div><div class='add'>+</div><div class='add'>+	state-&gt;link = !!(status &amp; MV88E6XXX_PORT_STS_LINK);</div><div class='add'>+	if (state-&gt;link) {</div><div class='add'>+		state-&gt;duplex = status &amp; MV88E6XXX_PORT_STS_DUPLEX ?</div><div class='add'>+			DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+		switch (status &amp; MV88E6XXX_PORT_STS_SPEED_MASK) {</div><div class='add'>+		case MV88E6XXX_PORT_STS_SPEED_1000:</div><div class='add'>+			state-&gt;speed = SPEED_1000;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MV88E6XXX_PORT_STS_SPEED_100:</div><div class='add'>+			state-&gt;speed = SPEED_100;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case MV88E6XXX_PORT_STS_SPEED_10:</div><div class='add'>+			state-&gt;speed = SPEED_10;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			state-&gt;link = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6185_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+				phy_interface_t interface,</div><div class='add'>+				const unsigned long *advertising,</div><div class='add'>+				bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6185_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops mv88e6185_phylink_pcs_ops = {</div><div class='add'>+	.pcs_get_state = mv88e6185_pcs_get_state,</div><div class='add'>+	.pcs_config = mv88e6185_pcs_config,</div><div class='add'>+	.pcs_an_restart = mv88e6185_pcs_an_restart,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6185_pcs_init(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6185_pcs *mpcs;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* There are no configurable serdes lanes on this switch chip, so</div><div class='add'>+	 * we use the static cmode configuration to determine whether we</div><div class='add'>+	 * have a PCS or not.</div><div class='add'>+	 */</div><div class='add'>+	if (chip-&gt;ports[port].cmode != MV88E6185_PORT_STS_CMODE_SERDES &amp;&amp;</div><div class='add'>+	    chip-&gt;ports[port].cmode != MV88E6185_PORT_STS_CMODE_1000BASE_X)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev = chip-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mpcs = kzalloc(sizeof(*mpcs), GFP_KERNEL);</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;chip = chip;</div><div class='add'>+	mpcs-&gt;port = port;</div><div class='add'>+	mpcs-&gt;phylink_pcs.ops = &amp;mv88e6185_phylink_pcs_ops;</div><div class='add'>+</div><div class='add'>+	irq = mv88e6xxx_serdes_irq_mapping(chip, port);</div><div class='add'>+	if (irq) {</div><div class='add'>+		snprintf(mpcs-&gt;name, sizeof(mpcs-&gt;name),</div><div class='add'>+			 "mv88e6xxx-%s-serdes-%d", dev_name(dev), port);</div><div class='add'>+</div><div class='add'>+		err = request_threaded_irq(irq, NULL, mv88e6185_pcs_handle_irq,</div><div class='add'>+					   IRQF_ONESHOT, mpcs-&gt;name, mpcs);</div><div class='add'>+		if (err) {</div><div class='add'>+			kfree(mpcs);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mpcs-&gt;irq = irq;</div><div class='add'>+	} else {</div><div class='add'>+		mpcs-&gt;phylink_pcs.poll = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = &amp;mpcs-&gt;phylink_pcs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6185_pcs_teardown(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6185_pcs *mpcs;</div><div class='add'>+</div><div class='add'>+	mpcs = chip-&gt;ports[port].pcs_private;</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mpcs-&gt;irq)</div><div class='add'>+		free_irq(mpcs-&gt;irq, mpcs);</div><div class='add'>+</div><div class='add'>+	kfree(mpcs);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *mv88e6185_pcs_select(struct mv88e6xxx_chip *chip,</div><div class='add'>+						int port,</div><div class='add'>+						phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;ports[port].pcs_private;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mv88e6xxx_pcs_ops mv88e6185_pcs_ops = {</div><div class='add'>+	.pcs_init = mv88e6185_pcs_init,</div><div class='add'>+	.pcs_teardown = mv88e6185_pcs_teardown,</div><div class='add'>+	.pcs_select = mv88e6185_pcs_select,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/pcs-6352.c b/drivers/net/dsa/mv88e6xxx/pcs-6352.c<br/>new file mode 100644<br/>index 000000000000..36993400837e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/pcs-6352.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/pcs-6352.c</a></div><div class='hunk'>@@ -0,0 +1,390 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Marvell 88E6352 family SERDES PCS support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Marvell Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "global2.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "serdes.h"</div><div class='add'>+</div><div class='add'>+/* Definitions from drivers/net/phy/marvell.c, which would be good to reuse. */</div><div class='add'>+#define MII_M1011_PHY_STATUS		17</div><div class='add'>+#define MII_M1011_IMASK			18</div><div class='add'>+#define MII_M1011_IMASK_LINK_CHANGE	BIT(10)</div><div class='add'>+#define MII_M1011_IEVENT		19</div><div class='add'>+#define MII_M1011_IEVENT_LINK_CHANGE	BIT(10)</div><div class='add'>+#define MII_MARVELL_PHY_PAGE		22</div><div class='add'>+#define MII_MARVELL_FIBER_PAGE		1</div><div class='add'>+</div><div class='add'>+struct marvell_c22_pcs {</div><div class='add'>+	struct mdio_device mdio;</div><div class='add'>+	struct phylink_pcs phylink_pcs;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	char name[64];</div><div class='add'>+	bool (*link_check)(struct marvell_c22_pcs *mpcs);</div><div class='add'>+	struct mv88e6xxx_port *port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct marvell_c22_pcs *pcs_to_marvell_c22_pcs(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct marvell_c22_pcs, phylink_pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_set_fiber_page(struct marvell_c22_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	u16 page;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mpcs-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	err = __mdiodev_read(&amp;mpcs-&gt;mdio, MII_MARVELL_PHY_PAGE);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"%s: can't read Serdes page register: %pe\n",</div><div class='add'>+			mpcs-&gt;name, ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page = err;</div><div class='add'>+</div><div class='add'>+	err = __mdiodev_write(&amp;mpcs-&gt;mdio, MII_MARVELL_PHY_PAGE,</div><div class='add'>+			      MII_MARVELL_FIBER_PAGE);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"%s: can't set Serdes page register: %pe\n",</div><div class='add'>+			mpcs-&gt;name, ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_restore_page(struct marvell_c22_pcs *mpcs,</div><div class='add'>+					int oldpage, int ret)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (oldpage &gt;= 0) {</div><div class='add'>+		err = __mdiodev_write(&amp;mpcs-&gt;mdio, MII_MARVELL_PHY_PAGE,</div><div class='add'>+				      oldpage);</div><div class='add'>+		if (err)</div><div class='add'>+			dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+				"%s: can't restore Serdes page register: %pe\n",</div><div class='add'>+				mpcs-&gt;name, ERR_PTR(err));</div><div class='add'>+		if (!err || ret &lt; 0)</div><div class='add'>+			err = ret;</div><div class='add'>+	} else {</div><div class='add'>+		err = oldpage;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;mpcs-&gt;mdio.bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t marvell_c22_pcs_handle_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = dev_id;</div><div class='add'>+	irqreturn_t status = IRQ_NONE;</div><div class='add'>+	int err, oldpage;</div><div class='add'>+</div><div class='add'>+	oldpage = marvell_c22_pcs_set_fiber_page(mpcs);</div><div class='add'>+	if (oldpage &lt; 0)</div><div class='add'>+		goto fail;</div><div class='add'>+</div><div class='add'>+	err = __mdiodev_read(&amp;mpcs-&gt;mdio, MII_M1011_IEVENT);</div><div class='add'>+	if (err &gt;= 0 &amp;&amp; err &amp; MII_M1011_IEVENT_LINK_CHANGE) {</div><div class='add'>+		phylink_pcs_change(&amp;mpcs-&gt;phylink_pcs, true);</div><div class='add'>+		status = IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+fail:</div><div class='add'>+	marvell_c22_pcs_restore_page(mpcs, oldpage, 0);</div><div class='add'>+</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_modify(struct marvell_c22_pcs *mpcs, u8 reg,</div><div class='add'>+				  u16 mask, u16 val)</div><div class='add'>+{</div><div class='add'>+	int oldpage, err = 0;</div><div class='add'>+</div><div class='add'>+	oldpage = marvell_c22_pcs_set_fiber_page(mpcs);</div><div class='add'>+	if (oldpage &gt;= 0)</div><div class='add'>+		err = __mdiodev_modify(&amp;mpcs-&gt;mdio, reg, mask, val);</div><div class='add'>+</div><div class='add'>+	return marvell_c22_pcs_restore_page(mpcs, oldpage, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_power(struct marvell_c22_pcs *mpcs,</div><div class='add'>+				 bool on)</div><div class='add'>+{</div><div class='add'>+	u16 val = on ? 0 : BMCR_PDOWN;</div><div class='add'>+</div><div class='add'>+	return marvell_c22_pcs_modify(mpcs, MII_BMCR, BMCR_PDOWN, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_control_irq(struct marvell_c22_pcs *mpcs,</div><div class='add'>+				       bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 val = enable ? MII_M1011_IMASK_LINK_CHANGE : 0;</div><div class='add'>+</div><div class='add'>+	return marvell_c22_pcs_modify(mpcs, MII_M1011_IMASK,</div><div class='add'>+				      MII_M1011_IMASK_LINK_CHANGE, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_enable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = marvell_c22_pcs_power(mpcs, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return marvell_c22_pcs_control_irq(mpcs, !!mpcs-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void marvell_c22_pcs_disable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	marvell_c22_pcs_control_irq(mpcs, false);</div><div class='add'>+	marvell_c22_pcs_power(mpcs, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void marvell_c22_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+				      unsigned int neg_mode,</div><div class='add'>+				      struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+	int oldpage, bmsr, lpa, status;</div><div class='add'>+</div><div class='add'>+	state-&gt;link = false;</div><div class='add'>+</div><div class='add'>+	if (mpcs-&gt;link_check &amp;&amp; !mpcs-&gt;link_check(mpcs))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	oldpage = marvell_c22_pcs_set_fiber_page(mpcs);</div><div class='add'>+	if (oldpage &gt;= 0) {</div><div class='add'>+		bmsr = __mdiodev_read(&amp;mpcs-&gt;mdio, MII_BMSR);</div><div class='add'>+		lpa = __mdiodev_read(&amp;mpcs-&gt;mdio, MII_LPA);</div><div class='add'>+		status = __mdiodev_read(&amp;mpcs-&gt;mdio, MII_M1011_PHY_STATUS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (marvell_c22_pcs_restore_page(mpcs, oldpage, 0) &gt;= 0 &amp;&amp;</div><div class='add'>+	    bmsr &gt;= 0 &amp;&amp; lpa &gt;= 0 &amp;&amp; status &gt;= 0)</div><div class='add'>+		mv88e6xxx_pcs_decode_state(mpcs-&gt;mdio.dev.parent, bmsr, lpa,</div><div class='add'>+					   status, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_config(struct phylink_pcs *pcs,</div><div class='add'>+				  unsigned int neg_mode,</div><div class='add'>+				  phy_interface_t interface,</div><div class='add'>+				  const unsigned long *advertising,</div><div class='add'>+				  bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+	int oldpage, adv, err, ret = 0;</div><div class='add'>+	u16 bmcr;</div><div class='add'>+</div><div class='add'>+	adv = phylink_mii_c22_pcs_encode_advertisement(interface, advertising);</div><div class='add'>+	if (adv &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bmcr = neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED ? BMCR_ANENABLE : 0;</div><div class='add'>+</div><div class='add'>+	oldpage = marvell_c22_pcs_set_fiber_page(mpcs);</div><div class='add'>+	if (oldpage &lt; 0)</div><div class='add'>+		goto restore;</div><div class='add'>+</div><div class='add'>+	err = __mdiodev_modify_changed(&amp;mpcs-&gt;mdio, MII_ADVERTISE, 0xffff, adv);</div><div class='add'>+	ret = err;</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto restore;</div><div class='add'>+</div><div class='add'>+	err = __mdiodev_modify_changed(&amp;mpcs-&gt;mdio, MII_BMCR, BMCR_ANENABLE,</div><div class='add'>+				       bmcr);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		ret = err;</div><div class='add'>+		goto restore;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the ANENABLE bit was changed, the PHY will restart negotiation,</div><div class='add'>+	 * so we don't need to flag a change to trigger its own restart.</div><div class='add'>+	 */</div><div class='add'>+	if (err)</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+restore:</div><div class='add'>+	return marvell_c22_pcs_restore_page(mpcs, oldpage, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void marvell_c22_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	marvell_c22_pcs_modify(mpcs, MII_BMCR, BMCR_ANRESTART, BMCR_ANRESTART);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void marvell_c22_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,</div><div class='add'>+				    phy_interface_t interface, int speed,</div><div class='add'>+				    int duplex)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+	u16 bmcr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (phylink_autoneg_inband(mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bmcr = mii_bmcr_encode_fixed(speed, duplex);</div><div class='add'>+</div><div class='add'>+	err = marvell_c22_pcs_modify(mpcs, MII_BMCR, BMCR_SPEED100 |</div><div class='add'>+				     BMCR_FULLDPLX | BMCR_SPEED1000, bmcr);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"%s: failed to configure mpcs: %pe\n", mpcs-&gt;name,</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops marvell_c22_pcs_ops = {</div><div class='add'>+	.pcs_enable = marvell_c22_pcs_enable,</div><div class='add'>+	.pcs_disable = marvell_c22_pcs_disable,</div><div class='add'>+	.pcs_get_state = marvell_c22_pcs_get_state,</div><div class='add'>+	.pcs_config = marvell_c22_pcs_config,</div><div class='add'>+	.pcs_an_restart = marvell_c22_pcs_an_restart,</div><div class='add'>+	.pcs_link_up = marvell_c22_pcs_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct marvell_c22_pcs *marvell_c22_pcs_alloc(struct device *dev,</div><div class='add'>+						     struct mii_bus *bus,</div><div class='add'>+						     unsigned int addr)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs;</div><div class='add'>+</div><div class='add'>+	mpcs = kzalloc(sizeof(*mpcs), GFP_KERNEL);</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;mdio.dev.parent = dev;</div><div class='add'>+	mpcs-&gt;mdio.bus = bus;</div><div class='add'>+	mpcs-&gt;mdio.addr = addr;</div><div class='add'>+	mpcs-&gt;phylink_pcs.ops = &amp;marvell_c22_pcs_ops;</div><div class='add'>+</div><div class='add'>+	return mpcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int marvell_c22_pcs_setup_irq(struct marvell_c22_pcs *mpcs,</div><div class='add'>+				     unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;phylink_pcs.poll = !irq;</div><div class='add'>+	mpcs-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	if (irq) {</div><div class='add'>+		err = request_threaded_irq(irq, NULL,</div><div class='add'>+					   marvell_c22_pcs_handle_irq,</div><div class='add'>+					   IRQF_ONESHOT, mpcs-&gt;name, mpcs);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mv88e6352 specifics */</div><div class='add'>+</div><div class='add'>+static bool mv88e6352_pcs_link_check(struct marvell_c22_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_port *port = mpcs-&gt;port;</div><div class='add'>+	struct mv88e6xxx_chip *chip = port-&gt;chip;</div><div class='add'>+	u8 cmode;</div><div class='add'>+</div><div class='add'>+	/* Port 4 can be in auto-media mode. Check that the port is</div><div class='add'>+	 * associated with the mpcs.</div><div class='add'>+	 */</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	chip-&gt;info-&gt;ops-&gt;port_get_cmode(chip, port-&gt;port, &amp;cmode);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+</div><div class='add'>+	return cmode == MV88E6XXX_PORT_STS_CMODE_100BASEX ||</div><div class='add'>+	       cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='add'>+	       cmode == MV88E6XXX_PORT_STS_CMODE_SGMII;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6352_pcs_init(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	irq = mv88e6xxx_serdes_irq_mapping(chip, port);</div><div class='add'>+	bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='add'>+	dev = chip-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mpcs = marvell_c22_pcs_alloc(dev, bus, MV88E6352_ADDR_SERDES);</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snprintf(mpcs-&gt;name, sizeof(mpcs-&gt;name),</div><div class='add'>+		 "mv88e6xxx-%s-serdes-%d", dev_name(dev), port);</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;link_check = mv88e6352_pcs_link_check;</div><div class='add'>+	mpcs-&gt;port = &amp;chip-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	err = marvell_c22_pcs_setup_irq(mpcs, irq);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(mpcs);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = &amp;mpcs-&gt;phylink_pcs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6352_pcs_teardown(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct marvell_c22_pcs *mpcs;</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='add'>+</div><div class='add'>+	pcs = chip-&gt;ports[port].pcs_private;</div><div class='add'>+	if (!pcs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mpcs = pcs_to_marvell_c22_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	if (mpcs-&gt;irq)</div><div class='add'>+		free_irq(mpcs-&gt;irq, mpcs);</div><div class='add'>+</div><div class='add'>+	kfree(mpcs);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *mv88e6352_pcs_select(struct mv88e6xxx_chip *chip,</div><div class='add'>+						int port,</div><div class='add'>+						phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	return chip-&gt;ports[port].pcs_private;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mv88e6xxx_pcs_ops mv88e6352_pcs_ops = {</div><div class='add'>+	.pcs_init = mv88e6352_pcs_init,</div><div class='add'>+	.pcs_teardown = mv88e6352_pcs_teardown,</div><div class='add'>+	.pcs_select = mv88e6352_pcs_select,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/pcs-639x.c b/drivers/net/dsa/mv88e6xxx/pcs-639x.c<br/>new file mode 100644<br/>index 000000000000..5db17c0b77f5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/pcs-639x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/pcs-639x.c</a></div><div class='hunk'>@@ -0,0 +1,970 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Marvell 88E6352 family SERDES PCS support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Marvell Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2017 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "global2.h"</div><div class='add'>+#include "phy.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+#include "serdes.h"</div><div class='add'>+</div><div class='add'>+struct mv88e639x_pcs {</div><div class='add'>+	struct mdio_device mdio;</div><div class='add'>+	struct phylink_pcs sgmii_pcs;</div><div class='add'>+	struct phylink_pcs xg_pcs;</div><div class='add'>+	bool erratum_3_14;</div><div class='add'>+	bool supports_5g;</div><div class='add'>+	phy_interface_t interface;</div><div class='add'>+	unsigned int irq;</div><div class='add'>+	char name[64];</div><div class='add'>+	irqreturn_t (*handle_irq)(struct mv88e639x_pcs *mpcs);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e639x_read(struct mv88e639x_pcs *mpcs, u16 regnum, u16 *val)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mdiodev_c45_read(&amp;mpcs-&gt;mdio, MDIO_MMD_PHYXS, regnum);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*val = err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_write(struct mv88e639x_pcs *mpcs, u16 regnum, u16 val)</div><div class='add'>+{</div><div class='add'>+	return mdiodev_c45_write(&amp;mpcs-&gt;mdio, MDIO_MMD_PHYXS, regnum, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_modify(struct mv88e639x_pcs *mpcs, u16 regnum, u16 mask,</div><div class='add'>+			    u16 val)</div><div class='add'>+{</div><div class='add'>+	return mdiodev_c45_modify(&amp;mpcs-&gt;mdio, MDIO_MMD_PHYXS, regnum, mask,</div><div class='add'>+				  val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_modify_changed(struct mv88e639x_pcs *mpcs, u16 regnum,</div><div class='add'>+				    u16 mask, u16 set)</div><div class='add'>+{</div><div class='add'>+	return mdiodev_c45_modify_changed(&amp;mpcs-&gt;mdio, MDIO_MMD_PHYXS, regnum,</div><div class='add'>+					  mask, set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mv88e639x_pcs *</div><div class='add'>+mv88e639x_pcs_alloc(struct device *dev, struct mii_bus *bus, unsigned int addr,</div><div class='add'>+		    int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs;</div><div class='add'>+</div><div class='add'>+	mpcs = kzalloc(sizeof(*mpcs), GFP_KERNEL);</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;mdio.dev.parent = dev;</div><div class='add'>+	mpcs-&gt;mdio.bus = bus;</div><div class='add'>+	mpcs-&gt;mdio.addr = addr;</div><div class='add'>+</div><div class='add'>+	snprintf(mpcs-&gt;name, sizeof(mpcs-&gt;name),</div><div class='add'>+		 "mv88e6xxx-%s-serdes-%d", dev_name(dev), port);</div><div class='add'>+</div><div class='add'>+	return mpcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t mv88e639x_pcs_handle_irq(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = dev_id;</div><div class='add'>+	irqreturn_t (*handler)(struct mv88e639x_pcs *);</div><div class='add'>+</div><div class='add'>+	handler = READ_ONCE(mpcs-&gt;handle_irq);</div><div class='add'>+	if (!handler)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	return handler(mpcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_pcs_setup_irq(struct mv88e639x_pcs *mpcs,</div><div class='add'>+				   struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	unsigned int irq;</div><div class='add'>+</div><div class='add'>+	irq = mv88e6xxx_serdes_irq_mapping(chip, port);</div><div class='add'>+	if (!irq) {</div><div class='add'>+		/* Use polling mode */</div><div class='add'>+		mpcs-&gt;sgmii_pcs.poll = true;</div><div class='add'>+		mpcs-&gt;xg_pcs.poll = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	return request_threaded_irq(irq, NULL, mv88e639x_pcs_handle_irq,</div><div class='add'>+				    IRQF_ONESHOT, mpcs-&gt;name, mpcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_pcs_teardown(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = chip-&gt;ports[port].pcs_private;</div><div class='add'>+</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (mpcs-&gt;irq)</div><div class='add'>+		free_irq(mpcs-&gt;irq, mpcs);</div><div class='add'>+</div><div class='add'>+	kfree(mpcs);</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct mv88e639x_pcs *sgmii_pcs_to_mv88e639x_pcs(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct mv88e639x_pcs, sgmii_pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t mv88e639x_sgmii_handle_irq(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	u16 int_status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_SGMII_INT_STATUS, &amp;int_status);</div><div class='add'>+	if (err)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (int_status &amp; (MV88E6390_SGMII_INT_LINK_DOWN |</div><div class='add'>+			  MV88E6390_SGMII_INT_LINK_UP)) {</div><div class='add'>+		phylink_pcs_change(&amp;mpcs-&gt;sgmii_pcs,</div><div class='add'>+				   int_status &amp; MV88E6390_SGMII_INT_LINK_UP);</div><div class='add'>+</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_sgmii_pcs_control_irq(struct mv88e639x_pcs *mpcs,</div><div class='add'>+					   bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 val = 0;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		val |= MV88E6390_SGMII_INT_LINK_DOWN |</div><div class='add'>+		       MV88E6390_SGMII_INT_LINK_UP;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6390_SGMII_INT_ENABLE,</div><div class='add'>+				MV88E6390_SGMII_INT_LINK_DOWN |</div><div class='add'>+				MV88E6390_SGMII_INT_LINK_UP, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_sgmii_pcs_control_pwr(struct mv88e639x_pcs *mpcs,</div><div class='add'>+					   bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 mask, val;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		mask = BMCR_RESET | BMCR_LOOPBACK | BMCR_PDOWN;</div><div class='add'>+		val = 0;</div><div class='add'>+	} else {</div><div class='add'>+		mask = val = BMCR_PDOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6390_SGMII_BMCR, mask, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_sgmii_pcs_enable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	/* power enable done in post_config */</div><div class='add'>+	mpcs-&gt;handle_irq = mv88e639x_sgmii_handle_irq;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_sgmii_pcs_control_irq(mpcs, !!mpcs-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_sgmii_pcs_disable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e639x_sgmii_pcs_control_irq(mpcs, false);</div><div class='add'>+	mv88e639x_sgmii_pcs_control_pwr(mpcs, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_sgmii_pcs_pre_config(struct phylink_pcs *pcs,</div><div class='add'>+					   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e639x_sgmii_pcs_control_pwr(mpcs, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6390_erratum_3_14(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	static const int lanes[] = { MV88E6390_PORT9_LANE0, MV88E6390_PORT9_LANE1,</div><div class='add'>+		MV88E6390_PORT9_LANE2, MV88E6390_PORT9_LANE3,</div><div class='add'>+		MV88E6390_PORT10_LANE0, MV88E6390_PORT10_LANE1,</div><div class='add'>+		MV88E6390_PORT10_LANE2, MV88E6390_PORT10_LANE3 };</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	/* 88e6190x and 88e6390x errata 3.14:</div><div class='add'>+	 * After chip reset, SERDES reconfiguration or SERDES core</div><div class='add'>+	 * Software Reset, the SERDES lanes may not be properly aligned</div><div class='add'>+	 * resulting in CRC errors</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(lanes); i++) {</div><div class='add'>+		err = mdiobus_c45_write(mpcs-&gt;mdio.bus, lanes[i],</div><div class='add'>+					MDIO_MMD_PHYXS,</div><div class='add'>+					0xf054, 0x400C);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = mdiobus_c45_write(mpcs-&gt;mdio.bus, lanes[i],</div><div class='add'>+					MDIO_MMD_PHYXS,</div><div class='add'>+					0xf054, 0x4000);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_sgmii_pcs_post_config(struct phylink_pcs *pcs,</div><div class='add'>+					   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mv88e639x_sgmii_pcs_control_pwr(mpcs, true);</div><div class='add'>+</div><div class='add'>+	if (mpcs-&gt;erratum_3_14) {</div><div class='add'>+		err = mv88e6390_erratum_3_14(mpcs);</div><div class='add'>+		if (err)</div><div class='add'>+			dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+				"failed to apply erratum 3.14: %pe\n",</div><div class='add'>+				ERR_PTR(err));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_sgmii_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+					  unsigned int neg_mode,</div><div class='add'>+					  struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	u16 bmsr, lpa, status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_SGMII_BMSR, &amp;bmsr);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"can't read Serdes PHY %s: %pe\n",</div><div class='add'>+			"BMSR", ERR_PTR(err));</div><div class='add'>+		state-&gt;link = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_SGMII_LPA, &amp;lpa);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"can't read Serdes PHY %s: %pe\n",</div><div class='add'>+			"LPA", ERR_PTR(err));</div><div class='add'>+		state-&gt;link = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_SGMII_PHY_STATUS, &amp;status);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"can't read Serdes PHY %s: %pe\n",</div><div class='add'>+			"status", ERR_PTR(err));</div><div class='add'>+		state-&gt;link = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mv88e6xxx_pcs_decode_state(mpcs-&gt;mdio.dev.parent, bmsr, lpa, status,</div><div class='add'>+				   state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_sgmii_pcs_config(struct phylink_pcs *pcs,</div><div class='add'>+				      unsigned int neg_mode,</div><div class='add'>+				      phy_interface_t interface,</div><div class='add'>+				      const unsigned long *advertising,</div><div class='add'>+				      bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	u16 val, bmcr;</div><div class='add'>+	bool changed;</div><div class='add'>+	int adv, err;</div><div class='add'>+</div><div class='add'>+	adv = phylink_mii_c22_pcs_encode_advertisement(interface, advertising);</div><div class='add'>+	if (adv &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;interface = interface;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_modify_changed(mpcs, MV88E6390_SGMII_ADVERTISE,</div><div class='add'>+				       0xffff, adv);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	changed = err &gt; 0;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_SGMII_BMCR, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED)</div><div class='add'>+		bmcr = val | BMCR_ANENABLE;</div><div class='add'>+	else</div><div class='add'>+		bmcr = val &amp; ~BMCR_ANENABLE;</div><div class='add'>+</div><div class='add'>+	/* setting ANENABLE triggers a restart of negotiation */</div><div class='add'>+	if (bmcr == val)</div><div class='add'>+		return changed;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_write(mpcs, MV88E6390_SGMII_BMCR, bmcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_sgmii_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e639x_modify(mpcs, MV88E6390_SGMII_BMCR,</div><div class='add'>+			 BMCR_ANRESTART, BMCR_ANRESTART);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_sgmii_pcs_link_up(struct phylink_pcs *pcs,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					phy_interface_t interface,</div><div class='add'>+					int speed, int duplex)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	u16 bmcr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (phylink_autoneg_inband(mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bmcr = mii_bmcr_encode_fixed(speed, duplex);</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_modify(mpcs, MV88E6390_SGMII_BMCR,</div><div class='add'>+			       BMCR_SPEED1000 | BMCR_SPEED100 | BMCR_FULLDPLX,</div><div class='add'>+			       bmcr);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"can't access Serdes PHY %s: %pe\n",</div><div class='add'>+			"BMCR", ERR_PTR(err));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops mv88e639x_sgmii_pcs_ops = {</div><div class='add'>+	.pcs_enable = mv88e639x_sgmii_pcs_enable,</div><div class='add'>+	.pcs_disable = mv88e639x_sgmii_pcs_disable,</div><div class='add'>+	.pcs_pre_config = mv88e639x_sgmii_pcs_pre_config,</div><div class='add'>+	.pcs_post_config = mv88e639x_sgmii_pcs_post_config,</div><div class='add'>+	.pcs_get_state = mv88e639x_sgmii_pcs_get_state,</div><div class='add'>+	.pcs_an_restart = mv88e639x_sgmii_pcs_an_restart,</div><div class='add'>+	.pcs_config = mv88e639x_sgmii_pcs_config,</div><div class='add'>+	.pcs_link_up = mv88e639x_sgmii_pcs_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mv88e639x_pcs *xg_pcs_to_mv88e639x_pcs(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct mv88e639x_pcs, xg_pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_xg_pcs_enable(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6390_10G_CTRL1,</div><div class='add'>+				MDIO_CTRL1_RESET | MDIO_PCS_CTRL1_LOOPBACK |</div><div class='add'>+				MDIO_CTRL1_LPOWER, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_xg_pcs_disable(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	mv88e639x_modify(mpcs, MV88E6390_10G_CTRL1, MDIO_CTRL1_LPOWER,</div><div class='add'>+			 MDIO_CTRL1_LPOWER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e639x_xg_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+				       unsigned int neg_mode,</div><div class='add'>+				       struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	u16 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	state-&gt;link = false;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_10G_STAT1, &amp;status);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"can't read Serdes PHY %s: %pe\n",</div><div class='add'>+			"STAT1", ERR_PTR(err));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;link = !!(status &amp; MDIO_STAT1_LSTATUS);</div><div class='add'>+	if (state-&gt;link) {</div><div class='add'>+		switch (state-&gt;interface) {</div><div class='add'>+		case PHY_INTERFACE_MODE_5GBASER:</div><div class='add'>+			state-&gt;speed = SPEED_5000;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case PHY_INTERFACE_MODE_10GBASER:</div><div class='add'>+		case PHY_INTERFACE_MODE_RXAUI:</div><div class='add'>+		case PHY_INTERFACE_MODE_XAUI:</div><div class='add'>+			state-&gt;speed = SPEED_10000;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			state-&gt;link = false;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		state-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e639x_xg_pcs_config(struct phylink_pcs *pcs,</div><div class='add'>+				   unsigned int neg_mode,</div><div class='add'>+				   phy_interface_t interface,</div><div class='add'>+				   const unsigned long *advertising,</div><div class='add'>+				   bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+mv88e639x_pcs_select(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+		     phy_interface_t mode)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs;</div><div class='add'>+</div><div class='add'>+	mpcs = chip-&gt;ports[port].pcs_private;</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+	case PHY_INTERFACE_MODE_2500BASEX:</div><div class='add'>+		return &amp;mpcs-&gt;sgmii_pcs;</div><div class='add'>+</div><div class='add'>+	case PHY_INTERFACE_MODE_5GBASER:</div><div class='add'>+		if (!mpcs-&gt;supports_5g)</div><div class='add'>+			return NULL;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case PHY_INTERFACE_MODE_10GBASER:</div><div class='add'>+	case PHY_INTERFACE_MODE_XAUI:</div><div class='add'>+	case PHY_INTERFACE_MODE_RXAUI:</div><div class='add'>+	case PHY_INTERFACE_MODE_USXGMII:</div><div class='add'>+		return &amp;mpcs-&gt;xg_pcs;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Marvell 88E6390 Specific support */</div><div class='add'>+</div><div class='add'>+static irqreturn_t mv88e6390_xg_handle_irq(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	u16 int_status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_10G_INT_STATUS, &amp;int_status);</div><div class='add'>+	if (err)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (int_status &amp; (MV88E6390_10G_INT_LINK_DOWN |</div><div class='add'>+			  MV88E6390_10G_INT_LINK_UP)) {</div><div class='add'>+		phylink_pcs_change(&amp;mpcs-&gt;xg_pcs,</div><div class='add'>+				   int_status &amp; MV88E6390_10G_INT_LINK_UP);</div><div class='add'>+</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6390_xg_control_irq(struct mv88e639x_pcs *mpcs, bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 val = 0;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		val = MV88E6390_10G_INT_LINK_DOWN | MV88E6390_10G_INT_LINK_UP;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6390_10G_INT_ENABLE,</div><div class='add'>+				MV88E6390_10G_INT_LINK_DOWN |</div><div class='add'>+				MV88E6390_10G_INT_LINK_UP, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6390_xg_pcs_enable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_xg_pcs_enable(mpcs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;handle_irq = mv88e6390_xg_handle_irq;</div><div class='add'>+</div><div class='add'>+	return mv88e6390_xg_control_irq(mpcs, !!mpcs-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6390_xg_pcs_disable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e6390_xg_control_irq(mpcs, false);</div><div class='add'>+	mv88e639x_xg_pcs_disable(mpcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops mv88e6390_xg_pcs_ops = {</div><div class='add'>+	.pcs_enable = mv88e6390_xg_pcs_enable,</div><div class='add'>+	.pcs_disable = mv88e6390_xg_pcs_disable,</div><div class='add'>+	.pcs_get_state = mv88e639x_xg_pcs_get_state,</div><div class='add'>+	.pcs_config = mv88e639x_xg_pcs_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6390_pcs_enable_checker(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6390_PG_CONTROL,</div><div class='add'>+				MV88E6390_PG_CONTROL_ENABLE_PC,</div><div class='add'>+				MV88E6390_PG_CONTROL_ENABLE_PC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6390_pcs_init(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int lane, err;</div><div class='add'>+</div><div class='add'>+	lane = mv88e6xxx_serdes_get_lane(chip, port);</div><div class='add'>+	if (lane &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='add'>+	dev = chip-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mpcs = mv88e639x_pcs_alloc(dev, bus, lane, port);</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;sgmii_pcs.ops = &amp;mv88e639x_sgmii_pcs_ops;</div><div class='add'>+	mpcs-&gt;xg_pcs.ops = &amp;mv88e6390_xg_pcs_ops;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6190X ||</div><div class='add'>+	    chip-&gt;info-&gt;prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6390X)</div><div class='add'>+		mpcs-&gt;erratum_3_14 = true;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_pcs_setup_irq(mpcs, chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	/* 6390 and 6390x has the checker, 6393x doesn't appear to? */</div><div class='add'>+	/* This is to enable gathering the statistics. Maybe this</div><div class='add'>+	 * should call out to a helper? Or we could do this at init time.</div><div class='add'>+	 */</div><div class='add'>+	err = mv88e6390_pcs_enable_checker(mpcs);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = mpcs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(mpcs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mv88e6xxx_pcs_ops mv88e6390_pcs_ops = {</div><div class='add'>+	.pcs_init = mv88e6390_pcs_init,</div><div class='add'>+	.pcs_teardown = mv88e639x_pcs_teardown,</div><div class='add'>+	.pcs_select = mv88e639x_pcs_select,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Marvell 88E6393X Specific support */</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_power_lane(struct mv88e639x_pcs *mpcs, bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 val = MV88E6393X_SERDES_CTRL1_TX_PDOWN |</div><div class='add'>+		  MV88E6393X_SERDES_CTRL1_RX_PDOWN;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6393X_SERDES_CTRL1, val,</div><div class='add'>+				enable ? 0 : val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mv88e6393x family errata 4.6:</div><div class='add'>+ * Cannot clear PwrDn bit on SERDES if device is configured CPU_MGD mode or</div><div class='add'>+ * P0_mode is configured for [x]MII.</div><div class='add'>+ * Workaround: Set SERDES register 4.F002 bit 5=0 and bit 15=1.</div><div class='add'>+ *</div><div class='add'>+ * It seems that after this workaround the SERDES is automatically powered up</div><div class='add'>+ * (the bit is cleared), so power it down.</div><div class='add'>+ */</div><div class='add'>+static int mv88e6393x_erratum_4_6(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_modify(mpcs, MV88E6393X_SERDES_POC,</div><div class='add'>+			       MV88E6393X_SERDES_POC_PDOWN |</div><div class='add'>+			       MV88E6393X_SERDES_POC_RESET,</div><div class='add'>+			       MV88E6393X_SERDES_POC_RESET);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_modify(mpcs, MV88E6390_SGMII_BMCR,</div><div class='add'>+			       BMCR_PDOWN, BMCR_PDOWN);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_sgmii_pcs_control_pwr(mpcs, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6393x_power_lane(mpcs, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mv88e6393x family errata 4.8:</div><div class='add'>+ * When a SERDES port is operating in 1000BASE-X or SGMII mode link may not</div><div class='add'>+ * come up after hardware reset or software reset of SERDES core. Workaround</div><div class='add'>+ * is to write SERDES register 4.F074.14=1 for only those modes and 0 in all</div><div class='add'>+ * other modes.</div><div class='add'>+ */</div><div class='add'>+static int mv88e6393x_erratum_4_8(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	u16 reg, poc;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6393X_SERDES_POC, &amp;poc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	poc &amp;= MV88E6393X_SERDES_POC_PCS_MASK;</div><div class='add'>+	if (poc == MV88E6393X_SERDES_POC_PCS_1000BASEX ||</div><div class='add'>+	    poc == MV88E6393X_SERDES_POC_PCS_SGMII_PHY ||</div><div class='add'>+	    poc == MV88E6393X_SERDES_POC_PCS_SGMII_MAC)</div><div class='add'>+		reg = MV88E6393X_ERRATA_4_8_BIT;</div><div class='add'>+	else</div><div class='add'>+		reg = 0;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6393X_ERRATA_4_8_REG,</div><div class='add'>+				MV88E6393X_ERRATA_4_8_BIT, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* mv88e6393x family errata 5.2:</div><div class='add'>+ * For optimal signal integrity the following sequence should be applied to</div><div class='add'>+ * SERDES operating in 10G mode. These registers only apply to 10G operation</div><div class='add'>+ * and have no effect on other speeds.</div><div class='add'>+ */</div><div class='add'>+static int mv88e6393x_erratum_5_2(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	static const struct {</div><div class='add'>+		u16 dev, reg, val, mask;</div><div class='add'>+	} fixes[] = {</div><div class='add'>+		{ MDIO_MMD_VEND1, 0x8093, 0xcb5a, 0xffff },</div><div class='add'>+		{ MDIO_MMD_VEND1, 0x8171, 0x7088, 0xffff },</div><div class='add'>+		{ MDIO_MMD_VEND1, 0x80c9, 0x311a, 0xffff },</div><div class='add'>+		{ MDIO_MMD_VEND1, 0x80a2, 0x8000, 0xff7f },</div><div class='add'>+		{ MDIO_MMD_VEND1, 0x80a9, 0x0000, 0xfff0 },</div><div class='add'>+		{ MDIO_MMD_VEND1, 0x80a3, 0x0000, 0xf8ff },</div><div class='add'>+		{ MDIO_MMD_PHYXS, MV88E6393X_SERDES_POC,</div><div class='add'>+		  MV88E6393X_SERDES_POC_RESET, MV88E6393X_SERDES_POC_RESET },</div><div class='add'>+	};</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(fixes); ++i) {</div><div class='add'>+		err = mdiodev_c45_modify(&amp;mpcs-&gt;mdio, fixes[i].dev,</div><div class='add'>+					 fixes[i].reg, fixes[i].mask,</div><div class='add'>+					 fixes[i].val);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Inband AN is broken on Amethyst in 2500base-x mode when set by standard</div><div class='add'>+ * mechanism (via cmode).</div><div class='add'>+ * We can get around this by configuring the PCS mode to 1000base-x and then</div><div class='add'>+ * writing value 0x58 to register 1e.8000. (This must be done while SerDes</div><div class='add'>+ * receiver and transmitter are disabled, which is, when this function is</div><div class='add'>+ * called.)</div><div class='add'>+ * It seem that when we do this configuration to 2500base-x mode (by changing</div><div class='add'>+ * PCS mode to 1000base-x and frequency to 3.125 GHz from 1.25 GHz) and then</div><div class='add'>+ * configure to sgmii or 1000base-x, the device thinks that it already has</div><div class='add'>+ * SerDes at 1.25 GHz and does not change the 1e.8000 register, leaving SerDes</div><div class='add'>+ * at 3.125 GHz.</div><div class='add'>+ * To avoid this, change PCS mode back to 2500base-x when disabling SerDes from</div><div class='add'>+ * 2500base-x mode.</div><div class='add'>+ */</div><div class='add'>+static int mv88e6393x_fix_2500basex_an(struct mv88e639x_pcs *mpcs, bool on)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		reg = MV88E6393X_SERDES_POC_PCS_1000BASEX |</div><div class='add'>+		      MV88E6393X_SERDES_POC_AN;</div><div class='add'>+	else</div><div class='add'>+		reg = MV88E6393X_SERDES_POC_PCS_2500BASEX;</div><div class='add'>+</div><div class='add'>+	reg |= MV88E6393X_SERDES_POC_RESET;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_modify(mpcs, MV88E6393X_SERDES_POC,</div><div class='add'>+			       MV88E6393X_SERDES_POC_PCS_MASK |</div><div class='add'>+			       MV88E6393X_SERDES_POC_AN |</div><div class='add'>+			       MV88E6393X_SERDES_POC_RESET, reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mdiodev_c45_write(&amp;mpcs-&gt;mdio, MDIO_MMD_VEND1, 0x8000, 0x58);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_sgmii_apply_2500basex_an(struct mv88e639x_pcs *mpcs,</div><div class='add'>+					       phy_interface_t interface,</div><div class='add'>+					       bool enable)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (interface != PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_fix_2500basex_an(mpcs, enable);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"failed to %s 2500basex fix: %pe\n",</div><div class='add'>+			str_enable_disable(enable), ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6393x_sgmii_pcs_disable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e639x_sgmii_pcs_disable(pcs);</div><div class='add'>+	mv88e6393x_power_lane(mpcs, false);</div><div class='add'>+	mv88e6393x_sgmii_apply_2500basex_an(mpcs, mpcs-&gt;interface, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6393x_sgmii_pcs_pre_config(struct phylink_pcs *pcs,</div><div class='add'>+					    phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e639x_sgmii_pcs_pre_config(pcs, interface);</div><div class='add'>+	mv88e6393x_power_lane(mpcs, false);</div><div class='add'>+	mv88e6393x_sgmii_apply_2500basex_an(mpcs, mpcs-&gt;interface, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_sgmii_pcs_post_config(struct phylink_pcs *pcs,</div><div class='add'>+					    phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = sgmii_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_erratum_4_8(mpcs);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_sgmii_apply_2500basex_an(mpcs, interface, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_power_lane(mpcs, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_sgmii_pcs_post_config(pcs, interface);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops mv88e6393x_sgmii_pcs_ops = {</div><div class='add'>+	.pcs_enable = mv88e639x_sgmii_pcs_enable,</div><div class='add'>+	.pcs_disable = mv88e6393x_sgmii_pcs_disable,</div><div class='add'>+	.pcs_pre_config = mv88e6393x_sgmii_pcs_pre_config,</div><div class='add'>+	.pcs_post_config = mv88e6393x_sgmii_pcs_post_config,</div><div class='add'>+	.pcs_get_state = mv88e639x_sgmii_pcs_get_state,</div><div class='add'>+	.pcs_an_restart = mv88e639x_sgmii_pcs_an_restart,</div><div class='add'>+	.pcs_config = mv88e639x_sgmii_pcs_config,</div><div class='add'>+	.pcs_link_up = mv88e639x_sgmii_pcs_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t mv88e6393x_xg_handle_irq(struct mv88e639x_pcs *mpcs)</div><div class='add'>+{</div><div class='add'>+	u16 int_status, stat1;</div><div class='add'>+	bool link_down;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6393X_10G_INT_STATUS, &amp;int_status);</div><div class='add'>+	if (err)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (int_status &amp; MV88E6393X_10G_INT_LINK_CHANGE) {</div><div class='add'>+		err = mv88e639x_read(mpcs, MV88E6390_10G_STAT1, &amp;stat1);</div><div class='add'>+		if (err)</div><div class='add'>+			return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+		link_down = !(stat1 &amp; MDIO_STAT1_LSTATUS);</div><div class='add'>+</div><div class='add'>+		phylink_pcs_change(&amp;mpcs-&gt;xg_pcs, !link_down);</div><div class='add'>+</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_xg_control_irq(struct mv88e639x_pcs *mpcs, bool enable)</div><div class='add'>+{</div><div class='add'>+	u16 val = 0;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		val = MV88E6393X_10G_INT_LINK_CHANGE;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_modify(mpcs, MV88E6393X_10G_INT_ENABLE,</div><div class='add'>+				MV88E6393X_10G_INT_LINK_CHANGE, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_xg_pcs_enable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;handle_irq = mv88e6393x_xg_handle_irq;</div><div class='add'>+</div><div class='add'>+	return mv88e6393x_xg_control_irq(mpcs, !!mpcs-&gt;irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6393x_xg_pcs_disable(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e6393x_xg_control_irq(mpcs, false);</div><div class='add'>+	mv88e639x_xg_pcs_disable(mpcs);</div><div class='add'>+	mv88e6393x_power_lane(mpcs, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The PCS has to be powered down while CMODE is changed */</div><div class='add'>+static void mv88e6393x_xg_pcs_pre_config(struct phylink_pcs *pcs,</div><div class='add'>+					 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+</div><div class='add'>+	mv88e639x_xg_pcs_disable(mpcs);</div><div class='add'>+	mv88e6393x_power_lane(mpcs, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_xg_pcs_post_config(struct phylink_pcs *pcs,</div><div class='add'>+					 phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_10GBASER ||</div><div class='add'>+	    interface == PHY_INTERFACE_MODE_USXGMII) {</div><div class='add'>+		err = mv88e6393x_erratum_5_2(mpcs);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_power_lane(mpcs, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e639x_xg_pcs_enable(mpcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mv88e6393x_xg_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+					unsigned int neg_mode,</div><div class='add'>+					struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs = xg_pcs_to_mv88e639x_pcs(pcs);</div><div class='add'>+	u16 status, lp_status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (state-&gt;interface != PHY_INTERFACE_MODE_USXGMII)</div><div class='add'>+		return mv88e639x_xg_pcs_get_state(pcs, neg_mode, state);</div><div class='add'>+</div><div class='add'>+	state-&gt;link = false;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_read(mpcs, MV88E6390_USXGMII_PHY_STATUS, &amp;status);</div><div class='add'>+	err = err ? : mv88e639x_read(mpcs, MV88E6390_USXGMII_LP_STATUS, &amp;lp_status);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(mpcs-&gt;mdio.dev.parent,</div><div class='add'>+			"can't read USXGMII status: %pe\n", ERR_PTR(err));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;link = !!(status &amp; MDIO_USXGMII_LINK);</div><div class='add'>+	state-&gt;an_complete = state-&gt;link;</div><div class='add'>+	phylink_decode_usxgmii_word(state, lp_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops mv88e6393x_xg_pcs_ops = {</div><div class='add'>+	.pcs_enable = mv88e6393x_xg_pcs_enable,</div><div class='add'>+	.pcs_disable = mv88e6393x_xg_pcs_disable,</div><div class='add'>+	.pcs_pre_config = mv88e6393x_xg_pcs_pre_config,</div><div class='add'>+	.pcs_post_config = mv88e6393x_xg_pcs_post_config,</div><div class='add'>+	.pcs_get_state = mv88e6393x_xg_pcs_get_state,</div><div class='add'>+	.pcs_config = mv88e639x_xg_pcs_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_pcs_init(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	struct mv88e639x_pcs *mpcs;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int lane, err;</div><div class='add'>+</div><div class='add'>+	lane = mv88e6xxx_serdes_get_lane(chip, port);</div><div class='add'>+	if (lane &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='add'>+	dev = chip-&gt;dev;</div><div class='add'>+</div><div class='add'>+	mpcs = mv88e639x_pcs_alloc(dev, bus, lane, port);</div><div class='add'>+	if (!mpcs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mpcs-&gt;sgmii_pcs.ops = &amp;mv88e6393x_sgmii_pcs_ops;</div><div class='add'>+	mpcs-&gt;xg_pcs.ops = &amp;mv88e6393x_xg_pcs_ops;</div><div class='add'>+	mpcs-&gt;supports_5g = true;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_erratum_4_6(mpcs);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	err = mv88e639x_pcs_setup_irq(mpcs, chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free;</div><div class='add'>+</div><div class='add'>+	chip-&gt;ports[port].pcs_private = mpcs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free:</div><div class='add'>+	kfree(mpcs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct mv88e6xxx_pcs_ops mv88e6393x_pcs_ops = {</div><div class='add'>+	.pcs_init = mv88e6393x_pcs_init,</div><div class='add'>+	.pcs_teardown = mv88e639x_pcs_teardown,</div><div class='add'>+	.pcs_select = mv88e639x_pcs_select,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/phy.c b/drivers/net/dsa/mv88e6xxx/phy.c<br/>index 2952db73f55c..4e7827ee684a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/phy.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/phy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/phy.c</a></div><div class='hunk'>@@ -55,6 +55,38 @@ int mv88e6xxx_phy_write(struct mv88e6xxx_chip *chip, int phy, int reg, u16 val)</div><div class='ctx'> 	return chip-&gt;info-&gt;ops-&gt;phy_write(chip, bus, addr, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_phy_read_c45(struct mv88e6xxx_chip *chip, int phy, int devad,</div><div class='add'>+			   int reg, u16 *val)</div><div class='add'>+{</div><div class='add'>+	int addr = phy; /* PHY devices addresses start at 0x0 */</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+</div><div class='add'>+	bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='add'>+	if (!bus)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;phy_read_c45)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;phy_read_c45(chip, bus, addr, devad, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_phy_write_c45(struct mv88e6xxx_chip *chip, int phy, int devad,</div><div class='add'>+			    int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	int addr = phy; /* PHY devices addresses start at 0x0 */</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+</div><div class='add'>+	bus = mv88e6xxx_default_mdio_bus(chip);</div><div class='add'>+	if (!bus)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;phy_write_c45)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;phy_write_c45(chip, bus, addr, devad, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int mv88e6xxx_phy_page_get(struct mv88e6xxx_chip *chip, int phy, u8 page)</div><div class='ctx'> {</div><div class='ctx'> 	return mv88e6xxx_phy_write(chip, phy, MV88E6XXX_PHY_PAGE, page);</div><div class='hunk'>@@ -137,7 +169,7 @@ static void mv88e6xxx_phy_ppu_reenable_work(struct work_struct *ugly)</div><div class='ctx'> </div><div class='ctx'> 	chip = container_of(ugly, struct mv88e6xxx_chip, ppu_work);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (mutex_trylock(&amp;chip-&gt;ppu_mutex)) {</div><div class='ctx'> 		if (mv88e6xxx_phy_ppu_enable(chip) == 0)</div><div class='hunk'>@@ -145,12 +177,12 @@ static void mv88e6xxx_phy_ppu_reenable_work(struct work_struct *ugly)</div><div class='ctx'> 		mutex_unlock(&amp;chip-&gt;ppu_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_phy_ppu_reenable_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_chip *chip = from_timer(chip, t, ppu_timer);</div><div class='add'>+	struct mv88e6xxx_chip *chip = timer_container_of(chip, t, ppu_timer);</div><div class='ctx'> </div><div class='ctx'> 	schedule_work(&amp;chip-&gt;ppu_work);</div><div class='ctx'> }</div><div class='hunk'>@@ -174,7 +206,7 @@ static int mv88e6xxx_phy_ppu_access_get(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 		}</div><div class='ctx'> 		chip-&gt;ppu_disabled = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		del_timer(&amp;chip-&gt;ppu_timer);</div><div class='add'>+		timer_delete(&amp;chip-&gt;ppu_timer);</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -197,7 +229,10 @@ static void mv88e6xxx_phy_ppu_state_init(struct mv88e6xxx_chip *chip)</div><div class='ctx'> </div><div class='ctx'> static void mv88e6xxx_phy_ppu_state_destroy(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;chip-&gt;ppu_timer);</div><div class='add'>+	mutex_lock(&amp;chip-&gt;ppu_mutex);</div><div class='add'>+	timer_delete_sync(&amp;chip-&gt;ppu_timer);</div><div class='add'>+	cancel_work_sync(&amp;chip-&gt;ppu_work);</div><div class='add'>+	mutex_unlock(&amp;chip-&gt;ppu_mutex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6185_phy_ppu_read(struct mv88e6xxx_chip *chip, struct mii_bus *bus,</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/phy.h b/drivers/net/dsa/mv88e6xxx/phy.h<br/>index 05ea0d546969..5f47722364cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/phy.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/phy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/phy.h</a></div><div class='hunk'>@@ -28,6 +28,10 @@ int mv88e6xxx_phy_read(struct mv88e6xxx_chip *chip, int phy,</div><div class='ctx'> 		       int reg, u16 *val);</div><div class='ctx'> int mv88e6xxx_phy_write(struct mv88e6xxx_chip *chip, int phy,</div><div class='ctx'> 			int reg, u16 val);</div><div class='add'>+int mv88e6xxx_phy_read_c45(struct mv88e6xxx_chip *chip, int phy, int devad,</div><div class='add'>+			   int reg, u16 *val);</div><div class='add'>+int mv88e6xxx_phy_write_c45(struct mv88e6xxx_chip *chip, int phy, int devad,</div><div class='add'>+			    int reg, u16 val);</div><div class='ctx'> int mv88e6xxx_phy_page_read(struct mv88e6xxx_chip *chip, int phy,</div><div class='ctx'> 			    u8 page, int reg, u16 *val);</div><div class='ctx'> int mv88e6xxx_phy_page_write(struct mv88e6xxx_chip *chip, int phy,</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c<br/>index 9a2b4b385a2c..66b1b7277281 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/port.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/port.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/port.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/port.c</a></div><div class='hunk'>@@ -12,8 +12,11 @@</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "chip.h"</div><div class='add'>+#include "global2.h"</div><div class='ctx'> #include "port.h"</div><div class='ctx'> #include "serdes.h"</div><div class='ctx'> </div><div class='hunk'>@@ -25,6 +28,14 @@ int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,</div><div class='ctx'> 	return mv88e6xxx_read(chip, addr, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,</div><div class='add'>+			    int bit, int val)</div><div class='add'>+{</div><div class='add'>+	int addr = chip-&gt;info-&gt;port_base_addr + port;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_wait_bit(chip, addr, reg, bit, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mv88e6xxx_port_write(struct mv88e6xxx_chip *chip, int port, int reg,</div><div class='ctx'> 			 u16 val)</div><div class='ctx'> {</div><div class='hunk'>@@ -124,6 +135,15 @@ int mv88e6390_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	return mv88e6xxx_port_set_rgmii_delay(chip, port, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6320_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   phy_interface_t mode)</div><div class='add'>+{</div><div class='add'>+	if (port != 2 &amp;&amp; port != 5 &amp;&amp; port != 6)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_set_rgmii_delay(chip, port, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mv88e6xxx_port_set_link(struct mv88e6xxx_chip *chip, int port, int link)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -157,51 +177,50 @@ int mv88e6xxx_port_set_link(struct mv88e6xxx_chip *chip, int port, int link)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(chip-&gt;dev, "p%d: %s link %s\n", port,</div><div class='ctx'> 		reg &amp; MV88E6XXX_PORT_MAC_CTL_FORCE_LINK ? "Force" : "Unforce",</div><div class='del'>-		reg &amp; MV88E6XXX_PORT_MAC_CTL_LINK_UP ? "up" : "down");</div><div class='add'>+		str_up_down(reg &amp; MV88E6XXX_PORT_MAC_CTL_LINK_UP));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup)</div><div class='add'>+int mv88e6xxx_port_sync_link(struct mv88e6xxx_chip *chip, int port, unsigned int mode, bool isup)</div><div class='ctx'> {</div><div class='del'>-	u16 reg;</div><div class='del'>-	int err;</div><div class='add'>+	const struct mv88e6xxx_ops *ops = chip-&gt;info-&gt;ops;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int link;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_MAC_CTL, &amp;reg);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	if (isup)</div><div class='add'>+		link = LINK_FORCED_UP;</div><div class='add'>+	else</div><div class='add'>+		link = LINK_FORCED_DOWN;</div><div class='ctx'> </div><div class='del'>-	reg &amp;= ~(MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX |</div><div class='del'>-		 MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL);</div><div class='add'>+	if (ops-&gt;port_set_link)</div><div class='add'>+		err = ops-&gt;port_set_link(chip, port, link);</div><div class='ctx'> </div><div class='del'>-	switch (dup) {</div><div class='del'>-	case DUPLEX_HALF:</div><div class='del'>-		reg |= MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX;</div><div class='del'>-		break;</div><div class='del'>-	case DUPLEX_FULL:</div><div class='del'>-		reg |= MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX |</div><div class='del'>-			MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL;</div><div class='del'>-		break;</div><div class='del'>-	case DUPLEX_UNFORCED:</div><div class='del'>-		/* normal duplex detection */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+int mv88e6185_port_sync_link(struct mv88e6xxx_chip *chip, int port, unsigned int mode, bool isup)</div><div class='add'>+{</div><div class='add'>+	const struct mv88e6xxx_ops *ops = chip-&gt;info-&gt;ops;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int link;</div><div class='add'>+</div><div class='add'>+	if (mode == MLO_AN_INBAND)</div><div class='add'>+		link = LINK_UNFORCED;</div><div class='add'>+	else if (isup)</div><div class='add'>+		link = LINK_FORCED_UP;</div><div class='add'>+	else</div><div class='add'>+		link = LINK_FORCED_DOWN;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(chip-&gt;dev, "p%d: %s %s duplex\n", port,</div><div class='del'>-		reg &amp; MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX ? "Force" : "Unforce",</div><div class='del'>-		reg &amp; MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL ? "full" : "half");</div><div class='add'>+	if (ops-&gt;port_set_link)</div><div class='add'>+		err = ops-&gt;port_set_link(chip, port, link);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				    int speed, bool alt_bit, bool force_bit)</div><div class='add'>+static int mv88e6xxx_port_set_speed_duplex(struct mv88e6xxx_chip *chip,</div><div class='add'>+					   int port, int speed, bool alt_bit,</div><div class='add'>+					   bool force_bit, int duplex)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg, ctrl;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -239,11 +258,29 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	switch (duplex) {</div><div class='add'>+	case DUPLEX_HALF:</div><div class='add'>+		ctrl |= MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX;</div><div class='add'>+		break;</div><div class='add'>+	case DUPLEX_FULL:</div><div class='add'>+		ctrl |= MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX |</div><div class='add'>+			MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL;</div><div class='add'>+		break;</div><div class='add'>+	case DUPLEX_UNFORCED:</div><div class='add'>+		/* normal duplex detection */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_MAC_CTL, &amp;reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	reg &amp;= ~MV88E6XXX_PORT_MAC_CTL_SPEED_MASK;</div><div class='add'>+	reg &amp;= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK |</div><div class='add'>+		 MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX |</div><div class='add'>+		 MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL);</div><div class='add'>+</div><div class='ctx'> 	if (alt_bit)</div><div class='ctx'> 		reg &amp;= ~MV88E6390_PORT_MAC_CTL_ALTSPEED;</div><div class='ctx'> 	if (force_bit) {</div><div class='hunk'>@@ -257,45 +294,43 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (speed)</div><div class='add'>+	if (speed != SPEED_UNFORCED)</div><div class='ctx'> 		dev_dbg(chip-&gt;dev, "p%d: Speed set to %d Mbps\n", port, speed);</div><div class='ctx'> 	else</div><div class='ctx'> 		dev_dbg(chip-&gt;dev, "p%d: Speed unforced\n", port);</div><div class='add'>+	dev_dbg(chip-&gt;dev, "p%d: %s %s duplex\n", port,</div><div class='add'>+		reg &amp; MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX ? "Force" : "Unforce",</div><div class='add'>+		reg &amp; MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL ? "full" : "half");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Support 10, 100, 200 Mbps (e.g. 88E6065 family) */</div><div class='del'>-int mv88e6065_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='add'>+/* Support 10, 100, 1000 Mbps (e.g. 88E6185 family) */</div><div class='add'>+int mv88e6185_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	if (speed == SPEED_MAX)</div><div class='del'>-		speed = 200;</div><div class='del'>-</div><div class='del'>-	if (speed &gt; 200)</div><div class='add'>+	if (speed == 200 || speed &gt; 1000)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* Setting 200 Mbps on port 0 to 3 selects 100 Mbps */</div><div class='del'>-	return mv88e6xxx_port_set_speed(chip, port, speed, false, false);</div><div class='add'>+	return mv88e6xxx_port_set_speed_duplex(chip, port, speed, false, false,</div><div class='add'>+					       duplex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Support 10, 100, 1000 Mbps (e.g. 88E6185 family) */</div><div class='del'>-int mv88e6185_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='add'>+/* Support 10, 100 Mbps (e.g. 88E6250 family) */</div><div class='add'>+int mv88e6250_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	if (speed == SPEED_MAX)</div><div class='del'>-		speed = 1000;</div><div class='del'>-</div><div class='del'>-	if (speed == 200 || speed &gt; 1000)</div><div class='add'>+	if (speed &gt; 100)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_set_speed(chip, port, speed, false, false);</div><div class='add'>+	return mv88e6xxx_port_set_speed_duplex(chip, port, speed, false, false,</div><div class='add'>+					       duplex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Support 10, 100, 200, 1000, 2500 Mbps (e.g. 88E6341) */</div><div class='del'>-int mv88e6341_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='add'>+int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	if (speed == SPEED_MAX)</div><div class='del'>-		speed = port &lt; 5 ? 1000 : 2500;</div><div class='del'>-</div><div class='ctx'> 	if (speed &gt; 2500)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -305,10 +340,12 @@ int mv88e6341_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='ctx'> 	if (speed == 2500 &amp;&amp; port &lt; 5)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_set_speed(chip, port, speed, !port, true);</div><div class='add'>+	return mv88e6xxx_port_set_speed_duplex(chip, port, speed, !port, true,</div><div class='add'>+					       duplex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-phy_interface_t mv88e6341_port_max_speed_mode(int port)</div><div class='add'>+phy_interface_t mv88e6341_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					      int port)</div><div class='ctx'> {</div><div class='ctx'> 	if (port == 5)</div><div class='ctx'> 		return PHY_INTERFACE_MODE_2500BASEX;</div><div class='hunk'>@@ -317,26 +354,23 @@ phy_interface_t mv88e6341_port_max_speed_mode(int port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Support 10, 100, 200, 1000 Mbps (e.g. 88E6352 family) */</div><div class='del'>-int mv88e6352_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='add'>+int mv88e6352_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	if (speed == SPEED_MAX)</div><div class='del'>-		speed = 1000;</div><div class='del'>-</div><div class='ctx'> 	if (speed &gt; 1000)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (speed == 200 &amp;&amp; port &lt; 5)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_set_speed(chip, port, speed, true, false);</div><div class='add'>+	return mv88e6xxx_port_set_speed_duplex(chip, port, speed, true, false,</div><div class='add'>+					       duplex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Support 10, 100, 200, 1000, 2500 Mbps (e.g. 88E6390) */</div><div class='del'>-int mv88e6390_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='add'>+int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	if (speed == SPEED_MAX)</div><div class='del'>-		speed = port &lt; 9 ? 1000 : 2500;</div><div class='del'>-</div><div class='ctx'> 	if (speed &gt; 2500)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='hunk'>@@ -346,10 +380,12 @@ int mv88e6390_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='ctx'> 	if (speed == 2500 &amp;&amp; port &lt; 9)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_set_speed(chip, port, speed, true, true);</div><div class='add'>+	return mv88e6xxx_port_set_speed_duplex(chip, port, speed, true, true,</div><div class='add'>+					       duplex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-phy_interface_t mv88e6390_port_max_speed_mode(int port)</div><div class='add'>+phy_interface_t mv88e6390_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					      int port)</div><div class='ctx'> {</div><div class='ctx'> 	if (port == 9 || port == 10)</div><div class='ctx'> 		return PHY_INTERFACE_MODE_2500BASEX;</div><div class='hunk'>@@ -358,21 +394,21 @@ phy_interface_t mv88e6390_port_max_speed_mode(int port)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Support 10, 100, 200, 1000, 2500, 10000 Mbps (e.g. 88E6190X) */</div><div class='del'>-int mv88e6390x_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)</div><div class='add'>+int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	if (speed == SPEED_MAX)</div><div class='del'>-		speed = port &lt; 9 ? 1000 : 10000;</div><div class='del'>-</div><div class='ctx'> 	if (speed == 200 &amp;&amp; port != 0)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (speed &gt;= 2500 &amp;&amp; port &lt; 9)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_set_speed(chip, port, speed, true, true);</div><div class='add'>+	return mv88e6xxx_port_set_speed_duplex(chip, port, speed, true, true,</div><div class='add'>+					       duplex);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-phy_interface_t mv88e6390x_port_max_speed_mode(int port)</div><div class='add'>+phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					       int port)</div><div class='ctx'> {</div><div class='ctx'> 	if (port == 9 || port == 10)</div><div class='ctx'> 		return PHY_INTERFACE_MODE_XAUI;</div><div class='hunk'>@@ -380,17 +416,119 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port)</div><div class='ctx'> 	return PHY_INTERFACE_MODE_NA;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			      phy_interface_t mode)</div><div class='add'>+/* Support 10, 100, 200, 1000, 2500, 5000, 10000 Mbps (e.g. 88E6393X)</div><div class='add'>+ * Function mv88e6xxx_port_set_speed_duplex() can't be used as the register</div><div class='add'>+ * values for speeds 2500 &amp; 5000 conflict.</div><div class='add'>+ */</div><div class='add'>+int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     int speed, int duplex)</div><div class='ctx'> {</div><div class='del'>-	int lane;</div><div class='del'>-	u16 cmode;</div><div class='del'>-	u16 reg;</div><div class='add'>+	u16 reg, ctrl;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (port != 9 &amp;&amp; port != 10)</div><div class='add'>+	if (chip-&gt;info-&gt;prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361 &amp;&amp;</div><div class='add'>+	    speed &gt; 2500)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (speed == 200 &amp;&amp; port != 0)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	if (speed &gt;= 2500 &amp;&amp; port &gt; 0 &amp;&amp; port &lt; 9)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case 10:</div><div class='add'>+		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case 100:</div><div class='add'>+		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case 200:</div><div class='add'>+		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_100 |</div><div class='add'>+			MV88E6390_PORT_MAC_CTL_ALTSPEED;</div><div class='add'>+		break;</div><div class='add'>+	case 1000:</div><div class='add'>+		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case 2500:</div><div class='add'>+		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_1000 |</div><div class='add'>+			MV88E6390_PORT_MAC_CTL_ALTSPEED;</div><div class='add'>+		break;</div><div class='add'>+	case 5000:</div><div class='add'>+		ctrl = MV88E6390_PORT_MAC_CTL_SPEED_10000 |</div><div class='add'>+			MV88E6390_PORT_MAC_CTL_ALTSPEED;</div><div class='add'>+		break;</div><div class='add'>+	case 10000:</div><div class='add'>+	case SPEED_UNFORCED:</div><div class='add'>+		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_UNFORCED;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (duplex) {</div><div class='add'>+	case DUPLEX_HALF:</div><div class='add'>+		ctrl |= MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX;</div><div class='add'>+		break;</div><div class='add'>+	case DUPLEX_FULL:</div><div class='add'>+		ctrl |= MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX |</div><div class='add'>+			MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL;</div><div class='add'>+		break;</div><div class='add'>+	case DUPLEX_UNFORCED:</div><div class='add'>+		/* normal duplex detection */</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_MAC_CTL, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~(MV88E6XXX_PORT_MAC_CTL_SPEED_MASK |</div><div class='add'>+		 MV88E6390_PORT_MAC_CTL_ALTSPEED |</div><div class='add'>+		 MV88E6390_PORT_MAC_CTL_FORCE_SPEED);</div><div class='add'>+</div><div class='add'>+	if (speed != SPEED_UNFORCED)</div><div class='add'>+		reg |= MV88E6390_PORT_MAC_CTL_FORCE_SPEED;</div><div class='add'>+</div><div class='add'>+	reg |= ctrl;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (speed != SPEED_UNFORCED)</div><div class='add'>+		dev_dbg(chip-&gt;dev, "p%d: Speed set to %d Mbps\n", port, speed);</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(chip-&gt;dev, "p%d: Speed unforced\n", port);</div><div class='add'>+	dev_dbg(chip-&gt;dev, "p%d: %s %s duplex\n", port,</div><div class='add'>+		reg &amp; MV88E6XXX_PORT_MAC_CTL_FORCE_DUPLEX ? "Force" : "Unforce",</div><div class='add'>+		reg &amp; MV88E6XXX_PORT_MAC_CTL_DUPLEX_FULL ? "full" : "half");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					       int port)</div><div class='add'>+{</div><div class='add'>+</div><div class='add'>+	if (port != 0 &amp;&amp; port != 9 &amp;&amp; port != 10)</div><div class='add'>+		return PHY_INTERFACE_MODE_NA;</div><div class='add'>+</div><div class='add'>+	if (chip-&gt;info-&gt;prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6361)</div><div class='add'>+		return PHY_INTERFACE_MODE_2500BASEX;</div><div class='add'>+</div><div class='add'>+	return PHY_INTERFACE_MODE_10GBASER;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    phy_interface_t mode, bool force)</div><div class='add'>+{</div><div class='add'>+	u16 cmode;</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	/* Default to a slow mode, so freeing up SERDES interfaces for</div><div class='ctx'> 	 * other ports which might use them for SFPs.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -398,8 +536,17 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		mode = PHY_INTERFACE_MODE_1000BASEX;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+		cmode = MV88E6XXX_PORT_STS_CMODE_RMII;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		cmode = MV88E6XXX_PORT_STS_CMODE_RGMII;</div><div class='add'>+		break;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='del'>-		cmode = MV88E6XXX_PORT_STS_CMODE_1000BASE_X;</div><div class='add'>+		cmode = MV88E6XXX_PORT_STS_CMODE_1000BASEX;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_SGMII:</div><div class='ctx'> 		cmode = MV88E6XXX_PORT_STS_CMODE_SGMII;</div><div class='hunk'>@@ -407,6 +554,9 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	case PHY_INTERFACE_MODE_2500BASEX:</div><div class='ctx'> 		cmode = MV88E6XXX_PORT_STS_CMODE_2500BASEX;</div><div class='ctx'> 		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_5GBASER:</div><div class='add'>+		cmode = MV88E6393X_PORT_STS_CMODE_5GBASER;</div><div class='add'>+		break;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_XGMII:</div><div class='ctx'> 	case PHY_INTERFACE_MODE_XAUI:</div><div class='ctx'> 		cmode = MV88E6XXX_PORT_STS_CMODE_XAUI;</div><div class='hunk'>@@ -414,30 +564,20 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	case PHY_INTERFACE_MODE_RXAUI:</div><div class='ctx'> 		cmode = MV88E6XXX_PORT_STS_CMODE_RXAUI;</div><div class='ctx'> 		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_10GBASER:</div><div class='add'>+		cmode = MV88E6393X_PORT_STS_CMODE_10GBASER;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_USXGMII:</div><div class='add'>+		cmode = MV88E6393X_PORT_STS_CMODE_USXGMII;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		cmode = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* cmode doesn't change, nothing to do for us */</div><div class='del'>-	if (cmode == chip-&gt;ports[port].cmode)</div><div class='add'>+	/* cmode doesn't change, nothing to do for us unless forced */</div><div class='add'>+	if (cmode == chip-&gt;ports[port].cmode &amp;&amp; !force)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='del'>-	if (lane &lt; 0 &amp;&amp; lane != -ENODEV)</div><div class='del'>-		return lane;</div><div class='del'>-</div><div class='del'>-	if (lane &gt;= 0) {</div><div class='del'>-		if (chip-&gt;ports[port].serdes_irq) {</div><div class='del'>-			err = mv88e6390_serdes_irq_disable(chip, port, lane);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = mv88e6390x_serdes_power(chip, port, false);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	chip-&gt;ports[port].cmode = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (cmode) {</div><div class='hunk'>@@ -453,28 +593,26 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		chip-&gt;ports[port].cmode = cmode;</div><div class='del'>-</div><div class='del'>-		lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='del'>-		if (lane &lt; 0)</div><div class='del'>-			return lane;</div><div class='del'>-</div><div class='del'>-		err = mv88e6390x_serdes_power(chip, port, true);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (chip-&gt;ports[port].serdes_irq) {</div><div class='del'>-			err = mv88e6390_serdes_irq_enable(chip, port, lane);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      phy_interface_t mode)</div><div class='add'>+{</div><div class='add'>+	if (port != 9 &amp;&amp; port != 10)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_set_cmode(chip, port, mode, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 			     phy_interface_t mode)</div><div class='ctx'> {</div><div class='add'>+	if (port != 9 &amp;&amp; port != 10)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case PHY_INTERFACE_MODE_NA:</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -486,24 +624,97 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return mv88e6390x_port_set_cmode(chip, port, mode);</div><div class='add'>+	return mv88e6xxx_port_set_cmode(chip, port, mode, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6185_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)</div><div class='add'>+int mv88e6393x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      phy_interface_t mode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_STS, &amp;reg);</div><div class='add'>+	if (port != 0 &amp;&amp; port != 9 &amp;&amp; port != 10)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (port == 9 || port == 10) {</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mv88e6393x errata 4.5: EEE should be disabled on SERDES ports */</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_MAC_CTL, &amp;reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	*cmode = reg &amp; MV88E6185_PORT_STS_CMODE_MASK;</div><div class='add'>+	reg &amp;= ~MV88E6XXX_PORT_MAC_CTL_EEE;</div><div class='add'>+	reg |= MV88E6XXX_PORT_MAC_CTL_FORCE_EEE;</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return mv88e6xxx_port_set_cmode(chip, port, mode, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)</div><div class='add'>+static int mv88e6341_port_set_cmode_writable(struct mv88e6xxx_chip *chip,</div><div class='add'>+					     int port)</div><div class='add'>+{</div><div class='add'>+	int err, addr;</div><div class='add'>+	u16 reg, bits;</div><div class='add'>+</div><div class='add'>+	if (port != 5)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	addr = chip-&gt;info-&gt;port_base_addr + port;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_hidden_read(chip, 0x7, addr, 0, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	bits = MV88E6341_PORT_RESERVED_1A_FORCE_CMODE |</div><div class='add'>+	       MV88E6341_PORT_RESERVED_1A_SGMII_AN;</div><div class='add'>+</div><div class='add'>+	if ((reg &amp; bits) == bits)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reg |= bits;</div><div class='add'>+	return mv88e6xxx_port_hidden_write(chip, 0x7, addr, 0, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			     phy_interface_t mode)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port != 5)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case PHY_INTERFACE_MODE_NA:</div><div class='add'>+		return 0;</div><div class='add'>+	case PHY_INTERFACE_MODE_XGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_XAUI:</div><div class='add'>+	case PHY_INTERFACE_MODE_RXAUI:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = mv88e6341_port_set_cmode_writable(chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_set_cmode(chip, port, mode, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6185_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -512,13 +723,12 @@ int mv88e6352_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	*cmode = reg &amp; MV88E6XXX_PORT_STS_CMODE_MASK;</div><div class='add'>+	*cmode = reg &amp; MV88E6185_PORT_STS_CMODE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_port_link_state(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			      struct phylink_link_state *state)</div><div class='add'>+int mv88e6352_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -527,70 +737,11 @@ int mv88e6352_port_link_state(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	switch (reg &amp; MV88E6XXX_PORT_STS_SPEED_MASK) {</div><div class='del'>-	case MV88E6XXX_PORT_STS_SPEED_10:</div><div class='del'>-		state-&gt;speed = SPEED_10;</div><div class='del'>-		break;</div><div class='del'>-	case MV88E6XXX_PORT_STS_SPEED_100:</div><div class='del'>-		state-&gt;speed = SPEED_100;</div><div class='del'>-		break;</div><div class='del'>-	case MV88E6XXX_PORT_STS_SPEED_1000:</div><div class='del'>-		state-&gt;speed = SPEED_1000;</div><div class='del'>-		break;</div><div class='del'>-	case MV88E6XXX_PORT_STS_SPEED_10000:</div><div class='del'>-		if ((reg &amp; MV88E6XXX_PORT_STS_CMODE_MASK) ==</div><div class='del'>-		    MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='del'>-			state-&gt;speed = SPEED_2500;</div><div class='del'>-		else</div><div class='del'>-			state-&gt;speed = SPEED_10000;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state-&gt;duplex = reg &amp; MV88E6XXX_PORT_STS_DUPLEX ?</div><div class='del'>-			DUPLEX_FULL : DUPLEX_HALF;</div><div class='del'>-	state-&gt;link = !!(reg &amp; MV88E6XXX_PORT_STS_LINK);</div><div class='del'>-	state-&gt;an_enabled = 1;</div><div class='del'>-	state-&gt;an_complete = state-&gt;link;</div><div class='add'>+	*cmode = reg &amp; MV88E6XXX_PORT_STS_CMODE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6185_port_link_state(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			      struct phylink_link_state *state)</div><div class='del'>-{</div><div class='del'>-	if (state-&gt;interface == PHY_INTERFACE_MODE_1000BASEX) {</div><div class='del'>-		u8 cmode = chip-&gt;ports[port].cmode;</div><div class='del'>-</div><div class='del'>-		/* When a port is in "Cross-chip serdes" mode, it uses</div><div class='del'>-		 * 1000Base-X full duplex mode, but there is no automatic</div><div class='del'>-		 * link detection. Use the sync OK status for link (as it</div><div class='del'>-		 * would do for 1000Base-X mode.)</div><div class='del'>-		 */</div><div class='del'>-		if (cmode == MV88E6185_PORT_STS_CMODE_SERDES) {</div><div class='del'>-			u16 mac;</div><div class='del'>-			int err;</div><div class='del'>-</div><div class='del'>-			err = mv88e6xxx_port_read(chip, port,</div><div class='del'>-						  MV88E6XXX_PORT_MAC_CTL, &amp;mac);</div><div class='del'>-			if (err)</div><div class='del'>-				return err;</div><div class='del'>-</div><div class='del'>-			state-&gt;link = !!(mac &amp; MV88E6185_PORT_MAC_CTL_SYNC_OK);</div><div class='del'>-			state-&gt;an_enabled = 1;</div><div class='del'>-			state-&gt;an_complete =</div><div class='del'>-				!!(mac &amp; MV88E6185_PORT_MAC_CTL_AN_DONE);</div><div class='del'>-			state-&gt;duplex =</div><div class='del'>-				state-&gt;link ? DUPLEX_FULL : DUPLEX_UNKNOWN;</div><div class='del'>-			state-&gt;speed =</div><div class='del'>-				state-&gt;link ? SPEED_1000 : SPEED_UNKNOWN;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mv88e6352_port_link_state(chip, port, state);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Offset 0x02: Jamming Control</div><div class='ctx'>  *</div><div class='ctx'>  * Do not limit the period of time that this port can be paused for by</div><div class='hunk'>@@ -760,8 +911,8 @@ int mv88e6351_port_set_frame_mode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6185_port_set_forward_unknown(struct mv88e6xxx_chip *chip,</div><div class='del'>-					      int port, bool unicast)</div><div class='add'>+int mv88e6185_port_set_forward_unknown(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       int port, bool unicast)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -778,8 +929,8 @@ static int mv88e6185_port_set_forward_unknown(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_port_set_egress_floods(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     bool unicast, bool multicast)</div><div class='add'>+int mv88e6352_port_set_ucast_flood(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   bool unicast)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -788,16 +939,28 @@ int mv88e6352_port_set_egress_floods(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	reg &amp;= ~MV88E6352_PORT_CTL0_EGRESS_FLOODS_MASK;</div><div class='add'>+	if (unicast)</div><div class='add'>+		reg |= MV88E6352_PORT_CTL0_EGRESS_FLOODS_UC;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~MV88E6352_PORT_CTL0_EGRESS_FLOODS_UC;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6352_port_set_mcast_flood(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   bool multicast)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u16 reg;</div><div class='ctx'> </div><div class='del'>-	if (unicast &amp;&amp; multicast)</div><div class='del'>-		reg |= MV88E6352_PORT_CTL0_EGRESS_FLOODS_ALL_UNKNOWN_DA;</div><div class='del'>-	else if (unicast)</div><div class='del'>-		reg |= MV88E6352_PORT_CTL0_EGRESS_FLOODS_NO_UNKNOWN_MC_DA;</div><div class='del'>-	else if (multicast)</div><div class='del'>-		reg |= MV88E6352_PORT_CTL0_EGRESS_FLOODS_NO_UNKNOWN_UC_DA;</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL0, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (multicast)</div><div class='add'>+		reg |= MV88E6352_PORT_CTL0_EGRESS_FLOODS_MC;</div><div class='ctx'> 	else</div><div class='del'>-		reg |= MV88E6352_PORT_CTL0_EGRESS_FLOODS_NO_UNKNOWN_DA;</div><div class='add'>+		reg &amp;= ~MV88E6352_PORT_CTL0_EGRESS_FLOODS_MC;</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -822,6 +985,27 @@ int mv88e6xxx_port_set_message_port(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL1, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_port_set_trunk(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			     bool trunk, u8 id)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL1, &amp;val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~MV88E6XXX_PORT_CTL1_TRUNK_ID_MASK;</div><div class='add'>+</div><div class='add'>+	if (trunk)</div><div class='add'>+		val |= MV88E6XXX_PORT_CTL1_TRUNK_PORT |</div><div class='add'>+			(id &lt;&lt; MV88E6XXX_PORT_CTL1_TRUNK_ID_SHIFT);</div><div class='add'>+	else</div><div class='add'>+		val &amp;= ~MV88E6XXX_PORT_CTL1_TRUNK_PORT;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL1, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x06: Port Based VLAN Map */</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_set_vlan_map(struct mv88e6xxx_chip *chip, int port, u16 map)</div><div class='hunk'>@@ -963,8 +1147,8 @@ static const char * const mv88e6xxx_port_8021q_mode_names[] = {</div><div class='ctx'> 	[MV88E6XXX_PORT_CTL2_8021Q_MODE_SECURE] = "Secure",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mv88e6185_port_set_default_forward(struct mv88e6xxx_chip *chip,</div><div class='del'>-					      int port, bool multicast)</div><div class='add'>+int mv88e6185_port_set_default_forward(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       int port, bool multicast)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 reg;</div><div class='hunk'>@@ -981,32 +1165,86 @@ static int mv88e6185_port_set_default_forward(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL2, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6185_port_set_egress_floods(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     bool unicast, bool multicast)</div><div class='add'>+int mv88e6095_port_set_upstream_port(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     int upstream_port)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='add'>+	u16 reg;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6185_port_set_forward_unknown(chip, port, unicast);</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL2, &amp;reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	return mv88e6185_port_set_default_forward(chip, port, multicast);</div><div class='add'>+	reg &amp;= ~MV88E6095_PORT_CTL2_CPU_PORT_MASK;</div><div class='add'>+	reg |= upstream_port;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL2, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6095_port_set_upstream_port(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     int upstream_port)</div><div class='add'>+int mv88e6xxx_port_set_mirror(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      enum mv88e6xxx_egress_direction direction,</div><div class='add'>+			      bool mirror)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	bool *mirror_port;</div><div class='ctx'> 	u16 reg;</div><div class='add'>+	u16 bit;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL2, &amp;reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	reg &amp;= ~MV88E6095_PORT_CTL2_CPU_PORT_MASK;</div><div class='del'>-	reg |= upstream_port;</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_INGRESS:</div><div class='add'>+		bit = MV88E6XXX_PORT_CTL2_INGRESS_MONITOR;</div><div class='add'>+		mirror_port = &amp;chip-&gt;ports[port].mirror_ingress;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_EGRESS:</div><div class='add'>+		bit = MV88E6XXX_PORT_CTL2_EGRESS_MONITOR;</div><div class='add'>+		mirror_port = &amp;chip-&gt;ports[port].mirror_egress;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL2, reg);</div><div class='add'>+	reg &amp;= ~bit;</div><div class='add'>+	if (mirror)</div><div class='add'>+		reg |= bit;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL2, reg);</div><div class='add'>+	if (!err)</div><div class='add'>+		*mirror_port = mirror;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_port_set_lock(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			    bool locked)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL0, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~MV88E6XXX_PORT_CTL0_SA_FILT_MASK;</div><div class='add'>+	if (locked)</div><div class='add'>+		reg |= MV88E6XXX_PORT_CTL0_SA_FILT_DROP_ON_LOCK;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~MV88E6XXX_PORT_ASSOC_VECTOR_LOCKED_PORT;</div><div class='add'>+	if (locked)</div><div class='add'>+		reg |= MV88E6XXX_PORT_ASSOC_VECTOR_LOCKED_PORT;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port,</div><div class='hunk'>@@ -1032,7 +1270,28 @@ int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_port_set_map_da(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+int mv88e6xxx_port_drop_untagged(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 bool drop_untagged)</div><div class='add'>+{</div><div class='add'>+	u16 old, new;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL2, &amp;old);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (drop_untagged)</div><div class='add'>+		new = old | MV88E6XXX_PORT_CTL2_DISCARD_UNTAGGED;</div><div class='add'>+	else</div><div class='add'>+		new = old &amp; ~MV88E6XXX_PORT_CTL2_DISCARD_UNTAGGED;</div><div class='add'>+</div><div class='add'>+	if (new == old)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL2, new);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_port_set_map_da(struct mv88e6xxx_chip *chip, int port, bool map)</div><div class='ctx'> {</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1041,7 +1300,10 @@ int mv88e6xxx_port_set_map_da(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	reg |= MV88E6XXX_PORT_CTL2_MAP_DA;</div><div class='add'>+	if (map)</div><div class='add'>+		reg |= MV88E6XXX_PORT_CTL2_MAP_DA;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~MV88E6XXX_PORT_CTL2_MAP_DA;</div><div class='ctx'> </div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL2, reg);</div><div class='ctx'> }</div><div class='hunk'>@@ -1052,6 +1314,8 @@ int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	u16 reg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	size += VLAN_ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='ctx'> 	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_CTL2, &amp;reg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1084,6 +1348,27 @@ int mv88e6097_port_egress_rate_limiting(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 				    0x0001);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Offset 0x0B: Port Association Vector */</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_port_set_assoc_vector(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    u16 pav)</div><div class='add'>+{</div><div class='add'>+	u16 reg, mask;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR,</div><div class='add'>+				  &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mask = mv88e6xxx_port_mask(chip);</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	reg |= pav &amp; mask;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_ASSOC_VECTOR,</div><div class='add'>+				    reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x0C: Port ATU Control */</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_disable_learn_limit(struct mv88e6xxx_chip *chip, int port)</div><div class='hunk'>@@ -1098,6 +1383,156 @@ int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> 	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_PRI_OVERRIDE, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Offset 0x0E: Policy &amp; MGMT Control Register for FAMILY 6191X 6193X 6393X */</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_port_policy_read(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				       u16 pointer, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6393X_PORT_POLICY_MGMT_CTL,</div><div class='add'>+				   pointer);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6393X_PORT_POLICY_MGMT_CTL,</div><div class='add'>+				  &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*data = reg;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_port_policy_write(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+					u16 pointer, u8 data)</div><div class='add'>+{</div><div class='add'>+	u16 reg;</div><div class='add'>+</div><div class='add'>+	reg = MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE | pointer | data;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6393X_PORT_POLICY_MGMT_CTL,</div><div class='add'>+				    reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_port_policy_write_all(struct mv88e6xxx_chip *chip,</div><div class='add'>+					    u16 pointer, u8 data)</div><div class='add'>+{</div><div class='add'>+	int err, port;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; mv88e6xxx_num_ports(chip); port++) {</div><div class='add'>+		if (dsa_is_unused_port(chip-&gt;ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = mv88e6393x_port_policy_write(chip, port, pointer, data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6393x_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       enum mv88e6xxx_egress_direction direction,</div><div class='add'>+			       int port)</div><div class='add'>+{</div><div class='add'>+	u16 ptr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (direction) {</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_INGRESS:</div><div class='add'>+		ptr = MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST;</div><div class='add'>+		err = mv88e6393x_port_policy_write_all(chip, ptr, port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_EGRESS_DIR_EGRESS:</div><div class='add'>+		ptr = MV88E6393X_G2_EGRESS_MONITOR_DEST;</div><div class='add'>+		err = mv88e6xxx_g2_write(chip, ptr, port);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6393x_port_set_upstream_port(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				      int upstream_port)</div><div class='add'>+{</div><div class='add'>+	u16 ptr = MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST;</div><div class='add'>+	u8 data = MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI |</div><div class='add'>+		  upstream_port;</div><div class='add'>+</div><div class='add'>+	return mv88e6393x_port_policy_write(chip, port, ptr, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6393x_port_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	u16 ptr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Consider the frames with reserved multicast destination</div><div class='add'>+	 * addresses matching 01:80:c2:00:00:00 and</div><div class='add'>+	 * 01:80:c2:00:00:02 as MGMT.</div><div class='add'>+	 */</div><div class='add'>+	ptr = MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO;</div><div class='add'>+	err = mv88e6393x_port_policy_write_all(chip, ptr, 0xff);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ptr = MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI;</div><div class='add'>+	err = mv88e6393x_port_policy_write_all(chip, ptr, 0xff);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ptr = MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO;</div><div class='add'>+	err = mv88e6393x_port_policy_write_all(chip, ptr, 0xff);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ptr = MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI;</div><div class='add'>+	err = mv88e6393x_port_policy_write_all(chip, ptr, 0xff);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Offset 0x10 &amp; 0x11: EPC */</div><div class='add'>+</div><div class='add'>+static int mv88e6393x_port_epc_wait_ready(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	int bit = __bf_shf(MV88E6393X_PORT_EPC_CMD_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_wait_bit(chip, port, MV88E6393X_PORT_EPC_CMD, bit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Port Ether type for 6393X family */</div><div class='add'>+</div><div class='add'>+int mv88e6393x_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   u16 etype)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_port_epc_wait_ready(chip, port);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, port, MV88E6393X_PORT_EPC_DATA, etype);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = MV88E6393X_PORT_EPC_CMD_BUSY |</div><div class='add'>+	      MV88E6393X_PORT_EPC_CMD_WRITE |</div><div class='add'>+	      MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6393X_PORT_EPC_CMD, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Offset 0x0f: Port Ether type */</div><div class='ctx'> </div><div class='ctx'> int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,</div><div class='hunk'>@@ -1169,3 +1604,125 @@ int mv88e6390_port_tag_remap(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/* Offset 0x0E: Policy Control Register */</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+mv88e6xxx_port_policy_mapping_get_pos(enum mv88e6xxx_policy_mapping mapping,</div><div class='add'>+				      enum mv88e6xxx_policy_action action,</div><div class='add'>+				      u16 *mask, u16 *val, int *shift)</div><div class='add'>+{</div><div class='add'>+	switch (mapping) {</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_DA:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_DA_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_DA_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_SA:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_SA_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_SA_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_VTU:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_VTU_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_VTU_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_ETYPE:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_ETYPE_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_ETYPE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_PPPOE:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_PPPOE_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_PPPOE_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_VBAS:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_VBAS_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_VBAS_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_OPT82:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_OPT82_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_OPT82_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_MAPPING_UDP:</div><div class='add'>+		*shift = __bf_shf(MV88E6XXX_PORT_POLICY_CTL_UDP_MASK);</div><div class='add'>+		*mask = MV88E6XXX_PORT_POLICY_CTL_UDP_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case MV88E6XXX_POLICY_ACTION_NORMAL:</div><div class='add'>+		*val = MV88E6XXX_PORT_POLICY_CTL_NORMAL;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_ACTION_MIRROR:</div><div class='add'>+		*val = MV88E6XXX_PORT_POLICY_CTL_MIRROR;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_ACTION_TRAP:</div><div class='add'>+		*val = MV88E6XXX_PORT_POLICY_CTL_TRAP;</div><div class='add'>+		break;</div><div class='add'>+	case MV88E6XXX_POLICY_ACTION_DISCARD:</div><div class='add'>+		*val = MV88E6XXX_PORT_POLICY_CTL_DISCARD;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      enum mv88e6xxx_policy_mapping mapping,</div><div class='add'>+			      enum mv88e6xxx_policy_action action)</div><div class='add'>+{</div><div class='add'>+	u16 reg, mask, val;</div><div class='add'>+	int shift;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_policy_mapping_get_pos(mapping, action, &amp;mask,</div><div class='add'>+						    &amp;val, &amp;shift);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_read(chip, port, MV88E6XXX_PORT_POLICY_CTL, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	reg |= (val &lt;&lt; shift) &amp; mask;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_POLICY_CTL, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6393x_port_set_policy(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			       enum mv88e6xxx_policy_mapping mapping,</div><div class='add'>+			       enum mv88e6xxx_policy_action action)</div><div class='add'>+{</div><div class='add'>+	u16 mask, val;</div><div class='add'>+	int shift;</div><div class='add'>+	int err;</div><div class='add'>+	u16 ptr;</div><div class='add'>+	u8 reg;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_policy_mapping_get_pos(mapping, action, &amp;mask,</div><div class='add'>+						    &amp;val, &amp;shift);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* The 16-bit Port Policy CTL register from older chips is on 6393x</div><div class='add'>+	 * changed to Port Policy MGMT CTL, which can access more data, but</div><div class='add'>+	 * indirectly. The original 16-bit value is divided into two 8-bit</div><div class='add'>+	 * registers.</div><div class='add'>+	 */</div><div class='add'>+	ptr = shift / 8;</div><div class='add'>+	shift %= 8;</div><div class='add'>+	mask &gt;&gt;= ptr * 8;</div><div class='add'>+	ptr &lt;&lt;= 8;</div><div class='add'>+</div><div class='add'>+	err = mv88e6393x_port_policy_read(chip, port, ptr, &amp;reg);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	reg |= (val &lt;&lt; shift) &amp; mask;</div><div class='add'>+</div><div class='add'>+	return mv88e6393x_port_policy_write(chip, port, ptr, reg);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h<br/>index f2fba3f73199..c1d2f99efb1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/port.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/port.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/port.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/port.h</a></div><div class='hunk'>@@ -19,6 +19,31 @@</div><div class='ctx'> #define MV88E6XXX_PORT_STS_MY_PAUSE		0x4000</div><div class='ctx'> #define MV88E6XXX_PORT_STS_HD_FLOW		0x2000</div><div class='ctx'> #define MV88E6XXX_PORT_STS_PHY_DETECT		0x1000</div><div class='add'>+#define MV88E6250_PORT_STS_LINK				0x1000</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MASK		0x0f00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_PHY_10_HALF		0x0800</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_PHY_100_HALF	0x0900</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_PHY_10_FULL		0x0a00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_PHY_100_FULL	0x0b00</div><div class='add'>+/* - Modes with PHY suffix use output instead of input clock</div><div class='add'>+ * - Modes without RMII or RGMII use MII</div><div class='add'>+ * - Modes without speed do not have a fixed speed specified in the manual</div><div class='add'>+ *   ("DC to x MHz" - variable clock support?)</div><div class='add'>+ */</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_DISABLED		0x0000</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_100_RGMII		0x0100</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_DUAL_100_RMII_FULL_PHY	0x0200</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_200_RMII_FULL_PHY	0x0400</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_DUAL_100_RMII_FULL	0x0600</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_10_100_RMII_FULL	0x0700</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_HALF			0x0800</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_10_100_RMII_HALF_PHY	0x0900</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_FULL			0x0a00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_10_100_RMII_FULL_PHY	0x0b00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_10_HALF_PHY		0x0c00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_100_HALF_PHY		0x0d00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_10_FULL_PHY		0x0e00</div><div class='add'>+#define MV88E6250_PORT_STS_PORTMODE_MII_100_FULL_PHY		0x0f00</div><div class='ctx'> #define MV88E6XXX_PORT_STS_LINK			0x0800</div><div class='ctx'> #define MV88E6XXX_PORT_STS_DUPLEX		0x0400</div><div class='ctx'> #define MV88E6XXX_PORT_STS_SPEED_MASK		0x0300</div><div class='hunk'>@@ -32,12 +57,21 @@</div><div class='ctx'> #define MV88E6XXX_PORT_STS_TX_PAUSED		0x0020</div><div class='ctx'> #define MV88E6XXX_PORT_STS_FLOW_CTL		0x0010</div><div class='ctx'> #define MV88E6XXX_PORT_STS_CMODE_MASK		0x000f</div><div class='del'>-#define MV88E6XXX_PORT_STS_CMODE_100BASE_X	0x0008</div><div class='del'>-#define MV88E6XXX_PORT_STS_CMODE_1000BASE_X	0x0009</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_MII_PHY	0x0001</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_MII		0x0002</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_GMII		0x0003</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_RMII_PHY	0x0004</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_RMII		0x0005</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_RGMII		0x0007</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_100BASEX	0x0008</div><div class='add'>+#define MV88E6XXX_PORT_STS_CMODE_1000BASEX	0x0009</div><div class='ctx'> #define MV88E6XXX_PORT_STS_CMODE_SGMII		0x000a</div><div class='ctx'> #define MV88E6XXX_PORT_STS_CMODE_2500BASEX	0x000b</div><div class='ctx'> #define MV88E6XXX_PORT_STS_CMODE_XAUI		0x000c</div><div class='ctx'> #define MV88E6XXX_PORT_STS_CMODE_RXAUI		0x000d</div><div class='add'>+#define MV88E6393X_PORT_STS_CMODE_5GBASER	0x000c</div><div class='add'>+#define MV88E6393X_PORT_STS_CMODE_10GBASER	0x000d</div><div class='add'>+#define MV88E6393X_PORT_STS_CMODE_USXGMII	0x000e</div><div class='ctx'> #define MV88E6185_PORT_STS_CDUPLEX		0x0008</div><div class='ctx'> #define MV88E6185_PORT_STS_CMODE_MASK		0x0007</div><div class='ctx'> #define MV88E6185_PORT_STS_CMODE_GMII_FD	0x0000</div><div class='hunk'>@@ -57,6 +91,8 @@</div><div class='ctx'> #define MV88E6390_PORT_MAC_CTL_FORCE_SPEED		0x2000</div><div class='ctx'> #define MV88E6390_PORT_MAC_CTL_ALTSPEED			0x1000</div><div class='ctx'> #define MV88E6352_PORT_MAC_CTL_200BASE			0x1000</div><div class='add'>+#define MV88E6XXX_PORT_MAC_CTL_EEE			0x0200</div><div class='add'>+#define MV88E6XXX_PORT_MAC_CTL_FORCE_EEE		0x0100</div><div class='ctx'> #define MV88E6185_PORT_MAC_CTL_AN_EN			0x0400</div><div class='ctx'> #define MV88E6185_PORT_MAC_CTL_AN_RESTART		0x0200</div><div class='ctx'> #define MV88E6185_PORT_MAC_CTL_AN_DONE			0x0100</div><div class='hunk'>@@ -90,6 +126,8 @@</div><div class='ctx'> /* Offset 0x03: Switch Identifier Register */</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID		0x03</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_MASK	0xfff0</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6020	0x0200</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6071	0x0710</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6085	0x04a0</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6095	0x0950</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6097	0x0990</div><div class='hunk'>@@ -106,8 +144,13 @@</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6176	0x1760</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6190	0x1900</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6191	0x1910</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6191X	0x1920</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6193X	0x1930</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6185	0x1a70</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6220	0x2200</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6240	0x2400</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6250	0x2500</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6361	0x2610</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6290	0x2900</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6321	0x3100</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6141	0x3400</div><div class='hunk'>@@ -116,12 +159,17 @@</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6350	0x3710</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6351	0x3750</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_PROD_6390	0x3900</div><div class='add'>+#define MV88E6XXX_PORT_SWITCH_ID_PROD_6393X	0x3930</div><div class='ctx'> #define MV88E6XXX_PORT_SWITCH_ID_REV_MASK	0x000f</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x04: Port Control Register */</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0					0x04</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_USE_CORE_TAG			0x8000</div><div class='del'>-#define MV88E6XXX_PORT_CTL0_DROP_ON_LOCK			0x4000</div><div class='add'>+#define MV88E6XXX_PORT_CTL0_SA_FILT_MASK			0xc000</div><div class='add'>+#define MV88E6XXX_PORT_CTL0_SA_FILT_DISABLED			0x0000</div><div class='add'>+#define MV88E6XXX_PORT_CTL0_SA_FILT_DROP_ON_LOCK		0x4000</div><div class='add'>+#define MV88E6XXX_PORT_CTL0_SA_FILT_DROP_ON_UNLOCK		0x8000</div><div class='add'>+#define MV88E6XXX_PORT_CTL0_SA_FILT_DROP_ON_CPU		0xc000</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_EGRESS_MODE_MASK			0x3000</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_EGRESS_MODE_UNMODIFIED		0x0000</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_EGRESS_MODE_UNTAGGED		0x1000</div><div class='hunk'>@@ -141,11 +189,8 @@</div><div class='ctx'> #define MV88E6185_PORT_CTL0_USE_IP				0x0020</div><div class='ctx'> #define MV88E6185_PORT_CTL0_USE_TAG				0x0010</div><div class='ctx'> #define MV88E6185_PORT_CTL0_FORWARD_UNKNOWN			0x0004</div><div class='del'>-#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_MASK			0x000c</div><div class='del'>-#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_NO_UNKNOWN_DA		0x0000</div><div class='del'>-#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_NO_UNKNOWN_MC_DA	0x0004</div><div class='del'>-#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_NO_UNKNOWN_UC_DA	0x0008</div><div class='del'>-#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_ALL_UNKNOWN_DA	0x000c</div><div class='add'>+#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_UC			0x0004</div><div class='add'>+#define MV88E6352_PORT_CTL0_EGRESS_FLOODS_MC			0x0008</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_STATE_MASK				0x0003</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_STATE_DISABLED			0x0000</div><div class='ctx'> #define MV88E6XXX_PORT_CTL0_STATE_BLOCKING			0x0001</div><div class='hunk'>@@ -155,6 +200,9 @@</div><div class='ctx'> /* Offset 0x05: Port Control 1 */</div><div class='ctx'> #define MV88E6XXX_PORT_CTL1			0x05</div><div class='ctx'> #define MV88E6XXX_PORT_CTL1_MESSAGE_PORT	0x8000</div><div class='add'>+#define MV88E6XXX_PORT_CTL1_TRUNK_PORT		0x4000</div><div class='add'>+#define MV88E6XXX_PORT_CTL1_TRUNK_ID_MASK	0x0f00</div><div class='add'>+#define MV88E6XXX_PORT_CTL1_TRUNK_ID_SHIFT	8</div><div class='ctx'> #define MV88E6XXX_PORT_CTL1_FID_11_4_MASK	0x00ff</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x06: Port Based VLAN Map */</div><div class='hunk'>@@ -209,7 +257,32 @@</div><div class='ctx'> #define MV88E6XXX_PORT_PRI_OVERRIDE	0x0d</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0E: Policy Control Register */</div><div class='del'>-#define MV88E6XXX_PORT_POLICY_CTL	0x0e</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL		0x0e</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_DA_MASK	0xc000</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_SA_MASK	0x3000</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_VTU_MASK	0x0c00</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_ETYPE_MASK	0x0300</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_PPPOE_MASK	0x00c0</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_VBAS_MASK	0x0030</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_OPT82_MASK	0x000c</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_UDP_MASK	0x0003</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_NORMAL	0x0000</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_MIRROR	0x0001</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_TRAP		0x0002</div><div class='add'>+#define MV88E6XXX_PORT_POLICY_CTL_DISCARD	0x0003</div><div class='add'>+</div><div class='add'>+/* Offset 0x0E: Policy &amp; MGMT Control Register (FAMILY_6393X) */</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL				0x0e</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_UPDATE			0x8000</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_MASK		0x3f00</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_DATA_MASK		0x00ff</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XLO	0x2000</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000000XHI	0x2100</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XLO	0x2400</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_01C280000002XHI	0x2500</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_INGRESS_DEST	0x3000</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_PTR_CPU_DEST		0x3800</div><div class='add'>+#define MV88E6393X_PORT_POLICY_MGMT_CTL_CPU_DEST_MGMTPRI	0x00e0</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0F: Port Special Ether Type */</div><div class='ctx'> #define MV88E6XXX_PORT_ETH_TYPE		0x0f</div><div class='hunk'>@@ -218,6 +291,15 @@</div><div class='ctx'> /* Offset 0x10: InDiscards Low Counter */</div><div class='ctx'> #define MV88E6XXX_PORT_IN_DISCARD_LO	0x10</div><div class='ctx'> </div><div class='add'>+/* Offset 0x10: Extended Port Control Command */</div><div class='add'>+#define MV88E6393X_PORT_EPC_CMD		0x10</div><div class='add'>+#define MV88E6393X_PORT_EPC_CMD_BUSY	0x8000</div><div class='add'>+#define MV88E6393X_PORT_EPC_CMD_WRITE	0x3000</div><div class='add'>+#define MV88E6393X_PORT_EPC_INDEX_PORT_ETYPE	0x02</div><div class='add'>+</div><div class='add'>+/* Offset 0x11: Extended Port Control Data */</div><div class='add'>+#define MV88E6393X_PORT_EPC_DATA	0x11</div><div class='add'>+</div><div class='ctx'> /* Offset 0x11: InDiscards High Counter */</div><div class='ctx'> #define MV88E6XXX_PORT_IN_DISCARD_HI	0x11</div><div class='ctx'> </div><div class='hunk'>@@ -227,6 +309,130 @@</div><div class='ctx'> /* Offset 0x13: OutFiltered Counter */</div><div class='ctx'> #define MV88E6XXX_PORT_OUT_FILTERED	0x13</div><div class='ctx'> </div><div class='add'>+/* Offset 0x16: LED Control */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL				0x16</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_UPDATE			BIT(15)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_POINTER_MASK			GENMASK(14, 12)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_POINTER_LED01_CTRL		(0x00 &lt;&lt; 12) /* Control for LED 0 and 1 */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_POINTER_STRETCH_BLINK	(0x06 &lt;&lt; 12) /* Stetch and Blink Rate */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_POINTER_CNTL_SPECIAL		(0x07 &lt;&lt; 12) /* Control for the Port's Special LED */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_DATA_MASK			GENMASK(10, 0)</div><div class='add'>+/* Selection masks valid for either port 1,2,3,4 or 5 */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL_MASK		GENMASK(3, 0)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL_MASK		GENMASK(7, 4)</div><div class='add'>+/* Selection control for LED 0 and 1, ports 5 and 6 only has LED 0</div><div class='add'>+ * Bits  Function</div><div class='add'>+ * 0..3  LED 0 control selector on ports 1-5</div><div class='add'>+ * 4..7  LED 1 control selector on ports 1-4 on port 5 this controls LED 0 of port 6</div><div class='add'>+ *</div><div class='add'>+ * Sel Port LED Function for the 6352 family:</div><div class='add'>+ * 0   1-4  0   Link/Act/Speed by Blink Rate (off=no link, on=link, blink=activity, blink speed=link speed)</div><div class='add'>+ *     1-4  1   Port 2's Special LED</div><div class='add'>+ *     5-6  0   Port 5 Link/Act (off=no link, on=link, blink=activity)</div><div class='add'>+ *     5-6  1   Port 6 Link/Act (off=no link, on=link 1000, blink=activity)</div><div class='add'>+ * 1   1-4  0   100/1000 Link/Act (off=no link, on=100 or 1000 link, blink=activity)</div><div class='add'>+ *     1-4  1   10/100 Link Act (off=no link, on=10 or 100 link, blink=activity)</div><div class='add'>+ *     5-6  0   Fiber 100 Link/Act (off=no link, on=link 100, blink=activity)</div><div class='add'>+ *     5-6  1   Fiber 1000 Link/Act (off=no link, on=link 1000, blink=activity)</div><div class='add'>+ * 2   1-4  0   1000 Link/Act (off=no link, on=link 1000, blink=activity)</div><div class='add'>+ *     1-4  1   10/100 Link/Act (off=no link, on=10 or 100 link, blink=activity)</div><div class='add'>+ *     5-6  0   Fiber 1000 Link/Act (off=no link, on=link 1000, blink=activity)</div><div class='add'>+ *     5-6  1   Fiber 100 Link/Act (off=no link, on=link 100, blink=activity)</div><div class='add'>+ * 3   1-4  0   Link/Act (off=no link, on=link, blink=activity)</div><div class='add'>+ *     1-4  1   1000 Link (off=no link, on=1000 link)</div><div class='add'>+ *     5-6  0   Port 0's Special LED</div><div class='add'>+ *     5-6  1   Fiber Link (off=no link, on=link)</div><div class='add'>+ * 4   1-4  0   Port 0's Special LED</div><div class='add'>+ *     1-4  1   Port 1's Special LED</div><div class='add'>+ *     5-6  0   Port 1's Special LED</div><div class='add'>+ *     5-6  1   Port 5 Link/Act (off=no link, on=link, blink=activity)</div><div class='add'>+ * 5   1-4  0   Reserved</div><div class='add'>+ *     1-4  1   Reserved</div><div class='add'>+ *     5-6  0   Port 2's Special LED</div><div class='add'>+ *     5-6  1   Port 6 Link (off=no link, on=link)</div><div class='add'>+ * 6   1-4  0   Duplex/Collision (off=half-duplex,on=full-duplex,blink=collision)</div><div class='add'>+ *     1-4  1   10/1000 Link/Act (off=no link, on=10 or 1000 link, blink=activity)</div><div class='add'>+ *     5-6  0   Port 5 Duplex/Collision (off=half-duplex, on=full-duplex, blink=col)</div><div class='add'>+ *     5-6  1   Port 6 Duplex/Collision (off=half-duplex, on=full-duplex, blink=col)</div><div class='add'>+ * 7   1-4  0   10/1000 Link/Act (off=no link, on=10 or 1000 link, blink=activity)</div><div class='add'>+ *     1-4  1   10/1000 Link (off=no link, on=10 or 1000 link)</div><div class='add'>+ *     5-6  0   Port 5 Link/Act/Speed by Blink rate (off=no link, on=link, blink=activity, blink speed=link speed)</div><div class='add'>+ *     5-6  1   Port 6 Link/Act/Speed by Blink rate (off=no link, on=link, blink=activity,  blink speed=link speed)</div><div class='add'>+ * 8   1-4  0   Link (off=no link, on=link)</div><div class='add'>+ *     1-4  1   Activity (off=no link, blink on=activity)</div><div class='add'>+ *     5-6  0   Port 6 Link/Act (off=no link, on=link, blink=activity)</div><div class='add'>+ *     5-6  1   Port 0's Special LED</div><div class='add'>+ * 9   1-4  0   10 Link (off=no link, on=10 link)</div><div class='add'>+ *     1-4  1   100 Link (off=no link, on=100 link)</div><div class='add'>+ *     5-6  0   Reserved</div><div class='add'>+ *     5-6  1   Port 1's Special LED</div><div class='add'>+ * a   1-4  0   10 Link/Act (off=no link, on=10 link, blink=activity)</div><div class='add'>+ *     1-4  1   100 Link/Act (off=no link, on=100 link, blink=activity)</div><div class='add'>+ *     5-6  0   Reserved</div><div class='add'>+ *     5-6  1   Port 2's Special LED</div><div class='add'>+ * b   1-4  0   100/1000 Link (off=no link, on=100 or 1000 link)</div><div class='add'>+ *     1-4  1   10/100 Link (off=no link, on=100 link, blink=activity)</div><div class='add'>+ *     5-6  0   Reserved</div><div class='add'>+ *     5-6  1   Reserved</div><div class='add'>+ * c     *  *   PTP Act (blink on=PTP activity)</div><div class='add'>+ * d     *  *   Force Blink</div><div class='add'>+ * e     *  *   Force Off</div><div class='add'>+ * f     *  *   Force On</div><div class='add'>+ */</div><div class='add'>+/* Select LED0 output */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL0			0x0</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL1			0x1</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL2			0x2</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL3			0x3</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL4			0x4</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL5			0x5</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL6			0x6</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL7			0x7</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL8			0x8</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SEL9			0x9</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SELA			0xa</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SELB			0xb</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SELC			0xc</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SELD			0xd</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SELE			0xe</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED0_SELF			0xf</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL0			(0x0 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL1			(0x1 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL2			(0x2 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL3			(0x3 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL4			(0x4 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL5			(0x5 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL6			(0x6 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL7			(0x7 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL8			(0x8 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SEL9			(0x9 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SELA			(0xa &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SELB			(0xb &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SELC			(0xc &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SELD			(0xd &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SELE			(0xe &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_LED1_SELF			(0xf &lt;&lt; 4)</div><div class='add'>+/* Stretch and Blink Rate Control (Index 0x06 of LED Control) */</div><div class='add'>+/* Pulse Stretch Selection for all LED's on this port */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_NONE	(0 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_21MS	(1 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_42MS	(2 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_84MS	(3 &lt;&lt; 4)</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_PULSE_STRETCH_168MS	(4 &lt;&lt; 4)</div><div class='add'>+/* Blink Rate Selection for all LEDs on this port */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_21MS		0</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_42MS		1</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_84MS		2</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_168MS	3</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_336MS	4</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x06_BLINK_RATE_672MS	5</div><div class='add'>+ /* Control for Special LED (Index 0x7 of LED Control on Port0) */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x07_P0_LAN_LINKACT_SHIFT	0 /* bits 6:0 LAN Link Activity LED */</div><div class='add'>+/* Control for Special LED (Index 0x7 of LED Control on Port 1) */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x07_P1_WAN_LINKACT_SHIFT	0 /* bits 6:0 WAN Link Activity LED */</div><div class='add'>+/* Control for Special LED (Index 0x7 of LED Control on Port 2) */</div><div class='add'>+#define MV88E6XXX_PORT_LED_CONTROL_0x07_P2_PTP_ACT		0 /* bits 6:0 PTP Activity */</div><div class='add'>+</div><div class='ctx'> /* Offset 0x18: IEEE Priority Mapping Table */</div><div class='ctx'> #define MV88E6390_PORT_IEEE_PRIO_MAP_TABLE			0x18</div><div class='ctx'> #define MV88E6390_PORT_IEEE_PRIO_MAP_TABLE_UPDATE		0x8000</div><div class='hunk'>@@ -248,22 +454,28 @@</div><div class='ctx'> #define MV88E6095_PORT_IEEE_PRIO_REMAP_4567	0x19</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x1a: Magic undocumented errata register */</div><div class='del'>-#define PORT_RESERVED_1A			0x1a</div><div class='del'>-#define PORT_RESERVED_1A_BUSY			BIT(15)</div><div class='del'>-#define PORT_RESERVED_1A_WRITE			BIT(14)</div><div class='del'>-#define PORT_RESERVED_1A_READ			0</div><div class='del'>-#define PORT_RESERVED_1A_PORT_SHIFT		5</div><div class='del'>-#define PORT_RESERVED_1A_BLOCK			(0xf &lt;&lt; 10)</div><div class='del'>-#define PORT_RESERVED_1A_CTRL_PORT		4</div><div class='del'>-#define PORT_RESERVED_1A_DATA_PORT		5</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A		0x1a</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_BUSY		0x8000</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_WRITE	0x4000</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_READ		0x0000</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_PORT_SHIFT	5</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_BLOCK_SHIFT	10</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT	0x04</div><div class='add'>+#define MV88E6XXX_PORT_RESERVED_1A_DATA_PORT	0x05</div><div class='add'>+#define MV88E6341_PORT_RESERVED_1A_FORCE_CMODE	0x8000</div><div class='add'>+#define MV88E6341_PORT_RESERVED_1A_SGMII_AN	0x2000</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,</div><div class='ctx'> 			u16 *val);</div><div class='ctx'> int mv88e6xxx_port_write(struct mv88e6xxx_chip *chip, int port, int reg,</div><div class='ctx'> 			 u16 val);</div><div class='add'>+int mv88e6xxx_port_wait_bit(struct mv88e6xxx_chip *chip, int port, int reg,</div><div class='add'>+			    int bit, int val);</div><div class='ctx'> </div><div class='ctx'> int mv88e6185_port_set_pause(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 			     int pause);</div><div class='add'>+int mv88e6320_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   phy_interface_t mode);</div><div class='ctx'> int mv88e6352_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				   phy_interface_t mode);</div><div class='ctx'> int mv88e6390_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,</div><div class='hunk'>@@ -271,18 +483,32 @@ int mv88e6390_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_set_link(struct mv88e6xxx_chip *chip, int port, int link);</div><div class='ctx'> </div><div class='del'>-int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup);</div><div class='del'>-</div><div class='del'>-int mv88e6065_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='del'>-int mv88e6185_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='del'>-int mv88e6341_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='del'>-int mv88e6352_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='del'>-int mv88e6390_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='del'>-int mv88e6390x_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);</div><div class='del'>-</div><div class='del'>-phy_interface_t mv88e6341_port_max_speed_mode(int port);</div><div class='del'>-phy_interface_t mv88e6390_port_max_speed_mode(int port);</div><div class='del'>-phy_interface_t mv88e6390x_port_max_speed_mode(int port);</div><div class='add'>+int mv88e6xxx_port_sync_link(struct mv88e6xxx_chip *chip, int port, unsigned int mode, bool isup);</div><div class='add'>+int mv88e6185_port_sync_link(struct mv88e6xxx_chip *chip, int port, unsigned int mode, bool isup);</div><div class='add'>+</div><div class='add'>+int mv88e6185_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex);</div><div class='add'>+int mv88e6250_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex);</div><div class='add'>+int mv88e6341_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex);</div><div class='add'>+int mv88e6352_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex);</div><div class='add'>+int mv88e6390_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    int speed, int duplex);</div><div class='add'>+int mv88e6390x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     int speed, int duplex);</div><div class='add'>+int mv88e6393x_port_set_speed_duplex(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				     int speed, int duplex);</div><div class='add'>+</div><div class='add'>+phy_interface_t mv88e6341_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					      int port);</div><div class='add'>+phy_interface_t mv88e6390_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					      int port);</div><div class='add'>+phy_interface_t mv88e6390x_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					       int port);</div><div class='add'>+phy_interface_t mv88e6393x_port_max_speed_mode(struct mv88e6xxx_chip *chip,</div><div class='add'>+					       int port);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_set_state(struct mv88e6xxx_chip *chip, int port, u8 state);</div><div class='ctx'> </div><div class='hunk'>@@ -294,6 +520,9 @@ int mv88e6xxx_port_set_fid(struct mv88e6xxx_chip *chip, int port, u16 fid);</div><div class='ctx'> int mv88e6xxx_port_get_pvid(struct mv88e6xxx_chip *chip, int port, u16 *pvid);</div><div class='ctx'> int mv88e6xxx_port_set_pvid(struct mv88e6xxx_chip *chip, int port, u16 pvid);</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_port_set_lock(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			    bool locked);</div><div class='add'>+</div><div class='ctx'> int mv88e6xxx_port_set_8021q_mode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				  u16 mode);</div><div class='ctx'> int mv88e6095_port_tag_remap(struct mv88e6xxx_chip *chip, int port);</div><div class='hunk'>@@ -304,37 +533,79 @@ int mv88e6085_port_set_frame_mode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				  enum mv88e6xxx_frame_mode mode);</div><div class='ctx'> int mv88e6351_port_set_frame_mode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				  enum mv88e6xxx_frame_mode mode);</div><div class='del'>-int mv88e6185_port_set_egress_floods(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     bool unicast, bool multicast);</div><div class='del'>-int mv88e6352_port_set_egress_floods(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				     bool unicast, bool multicast);</div><div class='add'>+int mv88e6185_port_set_forward_unknown(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       int port, bool unicast);</div><div class='add'>+int mv88e6185_port_set_default_forward(struct mv88e6xxx_chip *chip,</div><div class='add'>+				       int port, bool multicast);</div><div class='add'>+int mv88e6352_port_set_ucast_flood(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   bool unicast);</div><div class='add'>+int mv88e6352_port_set_mcast_flood(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   bool multicast);</div><div class='add'>+int mv88e6352_port_set_policy(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      enum mv88e6xxx_policy_mapping mapping,</div><div class='add'>+			      enum mv88e6xxx_policy_action action);</div><div class='add'>+int mv88e6393x_port_set_policy(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			       enum mv88e6xxx_policy_mapping mapping,</div><div class='add'>+			       enum mv88e6xxx_policy_action action);</div><div class='ctx'> int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				  u16 etype);</div><div class='add'>+int mv88e6393x_set_egress_port(struct mv88e6xxx_chip *chip,</div><div class='add'>+			       enum mv88e6xxx_egress_direction direction,</div><div class='add'>+			       int port);</div><div class='add'>+int mv88e6393x_port_set_upstream_port(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				      int upstream_port);</div><div class='add'>+int mv88e6393x_port_mgmt_rsvd2cpu(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6393x_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				   u16 etype);</div><div class='ctx'> int mv88e6xxx_port_set_message_port(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				    bool message_port);</div><div class='add'>+int mv88e6xxx_port_set_trunk(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			     bool trunk, u8 id);</div><div class='ctx'> int mv88e6165_port_set_jumbo_size(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				  size_t size);</div><div class='ctx'> int mv88e6095_port_egress_rate_limiting(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6097_port_egress_rate_limiting(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6xxx_port_set_assoc_vector(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    u16 pav);</div><div class='ctx'> int mv88e6097_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,</div><div class='ctx'> 			       u8 out);</div><div class='ctx'> int mv88e6390_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,</div><div class='ctx'> 			       u8 out);</div><div class='add'>+int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			     phy_interface_t mode);</div><div class='ctx'> int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 			     phy_interface_t mode);</div><div class='ctx'> int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 			      phy_interface_t mode);</div><div class='add'>+int mv88e6393x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      phy_interface_t mode);</div><div class='ctx'> int mv88e6185_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode);</div><div class='ctx'> int mv88e6352_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode);</div><div class='del'>-int mv88e6185_port_link_state(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			      struct phylink_link_state *state);</div><div class='del'>-int mv88e6352_port_link_state(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			      struct phylink_link_state *state);</div><div class='del'>-int mv88e6xxx_port_set_map_da(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+#ifdef CONFIG_NET_DSA_MV88E6XXX_LEDS</div><div class='add'>+int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+#else</div><div class='add'>+static inline int mv88e6xxx_port_setup_leds(struct mv88e6xxx_chip *chip,</div><div class='add'>+					    int port)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+int mv88e6xxx_port_drop_untagged(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 bool drop_untagged);</div><div class='add'>+int mv88e6xxx_port_set_map_da(struct mv88e6xxx_chip *chip, int port, bool map);</div><div class='ctx'> int mv88e6095_port_set_upstream_port(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 				     int upstream_port);</div><div class='add'>+int mv88e6xxx_port_set_mirror(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+			      enum mv88e6xxx_egress_direction direction,</div><div class='add'>+			      bool mirror);</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_port_disable_learn_limit(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6xxx_port_disable_pri_override(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> </div><div class='add'>+int mv88e6xxx_port_hidden_write(struct mv88e6xxx_chip *chip, int block,</div><div class='add'>+				int port, int reg, u16 val);</div><div class='add'>+int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chip);</div><div class='add'>+int mv88e6xxx_port_hidden_read(struct mv88e6xxx_chip *chip, int block, int port,</div><div class='add'>+			       int reg, u16 *val);</div><div class='add'>+</div><div class='ctx'> #endif /* _MV88E6XXX_PORT_H */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/port_hidden.c b/drivers/net/dsa/mv88e6xxx/port_hidden.c<br/>new file mode 100644<br/>index 000000000000..7a9f9ff6dedf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/port_hidden.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/port_hidden.c</a></div><div class='hunk'>@@ -0,0 +1,71 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Marvell 88E6xxx Switch Hidden Registers support</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2008 Marvell Semiconductor</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2019 Andrew Lunn &lt;andrew@lunn.ch&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "port.h"</div><div class='add'>+</div><div class='add'>+/* The mv88e6390 and mv88e6341 have some hidden registers used for debug and</div><div class='add'>+ * development. The errata also makes use of them.</div><div class='add'>+ */</div><div class='add'>+int mv88e6xxx_port_hidden_write(struct mv88e6xxx_chip *chip, int block,</div><div class='add'>+				int port, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	u16 ctrl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, MV88E6XXX_PORT_RESERVED_1A_DATA_PORT,</div><div class='add'>+				   MV88E6XXX_PORT_RESERVED_1A, val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ctrl = MV88E6XXX_PORT_RESERVED_1A_BUSY |</div><div class='add'>+	       MV88E6XXX_PORT_RESERVED_1A_WRITE |</div><div class='add'>+	       block &lt;&lt; MV88E6XXX_PORT_RESERVED_1A_BLOCK_SHIFT |</div><div class='add'>+	       port &lt;&lt; MV88E6XXX_PORT_RESERVED_1A_PORT_SHIFT |</div><div class='add'>+	       reg;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_write(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,</div><div class='add'>+				    MV88E6XXX_PORT_RESERVED_1A, ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	int bit = __bf_shf(MV88E6XXX_PORT_RESERVED_1A_BUSY);</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_wait_bit(chip,</div><div class='add'>+				       MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,</div><div class='add'>+				       MV88E6XXX_PORT_RESERVED_1A, bit, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_port_hidden_read(struct mv88e6xxx_chip *chip, int block, int port,</div><div class='add'>+			       int reg, u16 *val)</div><div class='add'>+{</div><div class='add'>+	u16 ctrl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ctrl = MV88E6XXX_PORT_RESERVED_1A_BUSY |</div><div class='add'>+	       MV88E6XXX_PORT_RESERVED_1A_READ |</div><div class='add'>+	       block &lt;&lt; MV88E6XXX_PORT_RESERVED_1A_BLOCK_SHIFT |</div><div class='add'>+	       port &lt;&lt; MV88E6XXX_PORT_RESERVED_1A_PORT_SHIFT |</div><div class='add'>+	       reg;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_write(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,</div><div class='add'>+				   MV88E6XXX_PORT_RESERVED_1A, ctrl);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_port_hidden_wait(chip);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return mv88e6xxx_port_read(chip, MV88E6XXX_PORT_RESERVED_1A_DATA_PORT,</div><div class='add'>+				   MV88E6XXX_PORT_RESERVED_1A, val);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/ptp.c b/drivers/net/dsa/mv88e6xxx/ptp.c<br/>index 7b40c5886b75..f7603573d3a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/ptp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/ptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/ptp.c</a></div><div class='hunk'>@@ -11,15 +11,64 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "chip.h"</div><div class='add'>+#include "global1.h"</div><div class='ctx'> #include "global2.h"</div><div class='ctx'> #include "hwtstamp.h"</div><div class='ctx'> #include "ptp.h"</div><div class='ctx'> </div><div class='del'>-/* Raw timestamps are in units of 8-ns clock periods. */</div><div class='del'>-#define CC_SHIFT	28</div><div class='del'>-#define CC_MULT		(8 &lt;&lt; CC_SHIFT)</div><div class='del'>-#define CC_MULT_NUM	(1 &lt;&lt; 9)</div><div class='del'>-#define CC_MULT_DEM	15625ULL</div><div class='add'>+#define MV88E6XXX_MAX_ADJ_PPB	1000000</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_cc_coeffs {</div><div class='add'>+	u32 cc_shift;</div><div class='add'>+	u32 cc_mult;</div><div class='add'>+	u32 cc_mult_num;</div><div class='add'>+	u32 cc_mult_dem;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Family MV88E6250:</div><div class='add'>+ * Raw timestamps are in units of 10-ns clock periods.</div><div class='add'>+ *</div><div class='add'>+ * clkadj = scaled_ppm * 10*2^28 / (10^6 * 2^16)</div><div class='add'>+ * simplifies to</div><div class='add'>+ * clkadj = scaled_ppm * 2^7 / 5^5</div><div class='add'>+ */</div><div class='add'>+#define MV88E6XXX_CC_10NS_SHIFT 28</div><div class='add'>+static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_10ns_coeffs = {</div><div class='add'>+	.cc_shift = MV88E6XXX_CC_10NS_SHIFT,</div><div class='add'>+	.cc_mult = 10 &lt;&lt; MV88E6XXX_CC_10NS_SHIFT,</div><div class='add'>+	.cc_mult_num = 1 &lt;&lt; 7,</div><div class='add'>+	.cc_mult_dem = 3125ULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Other families except MV88E6393X in internal clock mode:</div><div class='add'>+ * Raw timestamps are in units of 8-ns clock periods.</div><div class='add'>+ *</div><div class='add'>+ * clkadj = scaled_ppm * 8*2^28 / (10^6 * 2^16)</div><div class='add'>+ * simplifies to</div><div class='add'>+ * clkadj = scaled_ppm * 2^9 / 5^6</div><div class='add'>+ */</div><div class='add'>+#define MV88E6XXX_CC_8NS_SHIFT 28</div><div class='add'>+static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_8ns_coeffs = {</div><div class='add'>+	.cc_shift = MV88E6XXX_CC_8NS_SHIFT,</div><div class='add'>+	.cc_mult = 8 &lt;&lt; MV88E6XXX_CC_8NS_SHIFT,</div><div class='add'>+	.cc_mult_num = 1 &lt;&lt; 9,</div><div class='add'>+	.cc_mult_dem = 15625ULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Family MV88E6393X using internal clock:</div><div class='add'>+ * Raw timestamps are in units of 4-ns clock periods.</div><div class='add'>+ *</div><div class='add'>+ * clkadj = scaled_ppm * 4*2^28 / (10^6 * 2^16)</div><div class='add'>+ * simplifies to</div><div class='add'>+ * clkadj = scaled_ppm * 2^8 / 5^6</div><div class='add'>+ */</div><div class='add'>+#define MV88E6XXX_CC_4NS_SHIFT 28</div><div class='add'>+static const struct mv88e6xxx_cc_coeffs mv88e6xxx_cc_4ns_coeffs = {</div><div class='add'>+	.cc_shift = MV88E6XXX_CC_4NS_SHIFT,</div><div class='add'>+	.cc_mult = 4 &lt;&lt; MV88E6XXX_CC_4NS_SHIFT,</div><div class='add'>+	.cc_mult_num = 1 &lt;&lt; 8,</div><div class='add'>+	.cc_mult_dem = 15625ULL</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define TAI_EVENT_WORK_INTERVAL msecs_to_jiffies(100)</div><div class='ctx'> </div><div class='hunk'>@@ -62,13 +111,40 @@ static int mv88e6352_set_gpio_func(struct mv88e6xxx_chip *chip, int pin,</div><div class='ctx'> 	return chip-&gt;info-&gt;ops-&gt;gpio_ops-&gt;set_pctl(chip, pin, func);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 mv88e6352_ptp_clock_read(const struct cyclecounter *cc)</div><div class='add'>+static const struct mv88e6xxx_cc_coeffs *</div><div class='add'>+mv88e6xxx_cc_coeff_get(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	u16 period_ps;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_tai_read(chip, MV88E6XXX_TAI_CLOCK_PERIOD, &amp;period_ps, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to read cycle counter period: %d\n",</div><div class='add'>+			err);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (period_ps) {</div><div class='add'>+	case 4000:</div><div class='add'>+		return &amp;mv88e6xxx_cc_4ns_coeffs;</div><div class='add'>+	case 8000:</div><div class='add'>+		return &amp;mv88e6xxx_cc_8ns_coeffs;</div><div class='add'>+	case 10000:</div><div class='add'>+		return &amp;mv88e6xxx_cc_10ns_coeffs;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(chip-&gt;dev, "unexpected cycle counter period of %u ps\n",</div><div class='add'>+			period_ps);</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 mv88e6352_ptp_clock_read(struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = cc_to_chip(cc);</div><div class='ctx'> 	u16 phc_time[2];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_tai_read(chip, MV88E6XXX_TAI_TIME_LO, phc_time,</div><div class='add'>+	err = mv88e6xxx_tai_read(chip, MV88E6352_TAI_TIME_LO, phc_time,</div><div class='ctx'> 				 ARRAY_SIZE(phc_time));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -76,13 +152,13 @@ static u64 mv88e6352_ptp_clock_read(const struct cyclecounter *cc)</div><div class='ctx'> 		return ((u32)phc_time[1] &lt;&lt; 16) | phc_time[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 mv88e6165_ptp_clock_read(const struct cyclecounter *cc)</div><div class='add'>+static u64 mv88e6165_ptp_clock_read(struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = cc_to_chip(cc);</div><div class='ctx'> 	u16 phc_time[2];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_tai_read(chip, MV88E6XXX_PTP_GC_TIME_LO, phc_time,</div><div class='add'>+	err = mv88e6xxx_tai_read(chip, MV88E6165_PTP_GC_TIME_LO, phc_time,</div><div class='ctx'> 				 ARRAY_SIZE(phc_time));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -91,42 +167,26 @@ static u64 mv88e6165_ptp_clock_read(const struct cyclecounter *cc)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* mv88e6352_config_eventcap - configure TAI event capture</div><div class='del'>- * @event: PTP_CLOCK_PPS (internal) or PTP_CLOCK_EXTTS (external)</div><div class='ctx'>  * @rising: zero for falling-edge trigger, else rising-edge trigger</div><div class='ctx'>  *</div><div class='ctx'>  * This will also reset the capture sequence counter.</div><div class='ctx'>  */</div><div class='del'>-static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int event,</div><div class='del'>-				     int rising)</div><div class='add'>+static int mv88e6352_config_eventcap(struct mv88e6xxx_chip *chip, int rising)</div><div class='ctx'> {</div><div class='del'>-	u16 global_config;</div><div class='del'>-	u16 cap_config;</div><div class='add'>+	u16 evcap_config;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	chip-&gt;evcap_config = MV88E6XXX_TAI_CFG_CAP_OVERWRITE |</div><div class='del'>-			     MV88E6XXX_TAI_CFG_CAP_CTR_START;</div><div class='add'>+	evcap_config = MV88E6352_TAI_CFG_CAP_OVERWRITE |</div><div class='add'>+		       MV88E6352_TAI_CFG_CAP_CTR_START;</div><div class='ctx'> 	if (!rising)</div><div class='del'>-		chip-&gt;evcap_config |= MV88E6XXX_TAI_CFG_EVREQ_FALLING;</div><div class='add'>+		evcap_config |= MV88E6352_TAI_CFG_EVREQ_FALLING;</div><div class='ctx'> </div><div class='del'>-	global_config = (chip-&gt;evcap_config | chip-&gt;trig_config);</div><div class='del'>-	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_CFG, global_config);</div><div class='add'>+	err = mv88e6xxx_tai_write(chip, MV88E6352_TAI_CFG, evcap_config);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	if (event == PTP_CLOCK_PPS) {</div><div class='del'>-		cap_config = MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG;</div><div class='del'>-	} else if (event == PTP_CLOCK_EXTTS) {</div><div class='del'>-		/* if STATUS_CAP_TRIG is unset we capture PTP_EVREQ events */</div><div class='del'>-		cap_config = 0;</div><div class='del'>-	} else {</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Write the capture config; this also clears the capture counter */</div><div class='del'>-	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS,</div><div class='del'>-				  cap_config);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return mv88e6xxx_tai_write(chip, MV88E6352_TAI_EVENT_STATUS, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mv88e6352_tai_event_work(struct work_struct *ugly)</div><div class='hunk'>@@ -138,38 +198,42 @@ static void mv88e6352_tai_event_work(struct work_struct *ugly)</div><div class='ctx'> 	u32 raw_ts;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_tai_read(chip, MV88E6XXX_TAI_EVENT_STATUS,</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_tai_read(chip, MV88E6352_TAI_EVENT_STATUS,</div><div class='ctx'> 				 status, ARRAY_SIZE(status));</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(chip-&gt;dev, "failed to read TAI status register\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (status[0] &amp; MV88E6XXX_TAI_EVENT_STATUS_ERROR) {</div><div class='add'>+	if (status[0] &amp; MV88E6352_TAI_EVENT_STATUS_ERROR) {</div><div class='ctx'> 		dev_warn(chip-&gt;dev, "missed event capture\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	if (!(status[0] &amp; MV88E6XXX_TAI_EVENT_STATUS_VALID))</div><div class='add'>+	if (!(status[0] &amp; MV88E6352_TAI_EVENT_STATUS_VALID))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	raw_ts = ((u32)status[2] &lt;&lt; 16) | status[1];</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the valid bit so the next timestamp can come in */</div><div class='del'>-	status[0] &amp;= ~MV88E6XXX_TAI_EVENT_STATUS_VALID;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = mv88e6xxx_tai_write(chip, MV88E6XXX_TAI_EVENT_STATUS, status[0]);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	status[0] &amp;= ~MV88E6352_TAI_EVENT_STATUS_VALID;</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_tai_write(chip, MV88E6352_TAI_EVENT_STATUS, status[0]);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(chip-&gt;dev, "failed to write TAI status register\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* This is an external timestamp */</div><div class='ctx'> 	ev.type = PTP_CLOCK_EXTTS;</div><div class='ctx'> </div><div class='ctx'> 	/* We only have one timestamping channel. */</div><div class='ctx'> 	ev.index = 0;</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	ev.timestamp = timecounter_cyc2time(&amp;chip-&gt;tstamp_tc, raw_ts);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	ptp_clock_event(chip-&gt;ptp_clock, &amp;ev);</div><div class='ctx'> out:</div><div class='hunk'>@@ -187,17 +251,18 @@ static int mv88e6xxx_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='ctx'> 		neg_adj = 1;</div><div class='ctx'> 		scaled_ppm = -scaled_ppm;</div><div class='ctx'> 	}</div><div class='del'>-	mult = CC_MULT;</div><div class='del'>-	adj = CC_MULT_NUM;</div><div class='add'>+</div><div class='add'>+	mult = chip-&gt;cc_coeffs-&gt;cc_mult;</div><div class='add'>+	adj = chip-&gt;cc_coeffs-&gt;cc_mult_num;</div><div class='ctx'> 	adj *= scaled_ppm;</div><div class='del'>-	diff = div_u64(adj, CC_MULT_DEM);</div><div class='add'>+	diff = div_u64(adj, chip-&gt;cc_coeffs-&gt;cc_mult_dem);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	timecounter_read(&amp;chip-&gt;tstamp_tc);</div><div class='ctx'> 	chip-&gt;tstamp_cc.mult = neg_adj ? mult - diff : mult + diff;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -206,9 +271,9 @@ static int mv88e6xxx_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ptp_to_chip(ptp);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	timecounter_adjtime(&amp;chip-&gt;tstamp_tc, delta);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -219,9 +284,9 @@ static int mv88e6xxx_ptp_gettime(struct ptp_clock_info *ptp,</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = ptp_to_chip(ptp);</div><div class='ctx'> 	u64 ns;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	ns = timecounter_read(&amp;chip-&gt;tstamp_tc);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	*ts = ns_to_timespec64(ns);</div><div class='ctx'> </div><div class='hunk'>@@ -236,9 +301,9 @@ static int mv88e6xxx_ptp_settime(struct ptp_clock_info *ptp,</div><div class='ctx'> </div><div class='ctx'> 	ns = timespec64_to_ns(ts);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> 	timecounter_init(&amp;chip-&gt;tstamp_tc, &amp;chip-&gt;tstamp_cc, ns);</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -251,12 +316,18 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	int pin;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	/* Reject requests to enable time stamping on both edges. */</div><div class='add'>+	if ((rq-&gt;extts.flags &amp; PTP_STRICT_FLAGS) &amp;&amp;</div><div class='add'>+	    (rq-&gt;extts.flags &amp; PTP_ENABLE_FEATURE) &amp;&amp;</div><div class='add'>+	    (rq-&gt;extts.flags &amp; PTP_EXTTS_EDGES) == PTP_EXTTS_EDGES)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	pin = ptp_find_pin(chip-&gt;ptp_clock, PTP_PF_EXTTS, rq-&gt;extts.index);</div><div class='ctx'> </div><div class='ctx'> 	if (pin &lt; 0)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='ctx'> </div><div class='ctx'> 	if (on) {</div><div class='ctx'> 		func = MV88E6352_G2_SCRATCH_GPIO_PCTL_EVREQ;</div><div class='hunk'>@@ -268,7 +339,7 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		schedule_delayed_work(&amp;chip-&gt;tai_event_work,</div><div class='ctx'> 				      TAI_EVENT_WORK_INTERVAL);</div><div class='ctx'> </div><div class='del'>-		err = mv88e6352_config_eventcap(chip, PTP_CLOCK_EXTTS, rising);</div><div class='add'>+		err = mv88e6352_config_eventcap(chip, rising);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		func = MV88E6352_G2_SCRATCH_GPIO_PCTL_GPIO;</div><div class='ctx'> </div><div class='hunk'>@@ -278,7 +349,7 @@ static int mv88e6352_ptp_enable_extts(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -310,6 +381,22 @@ static int mv88e6352_ptp_verify(struct ptp_clock_info *ptp, unsigned int pin,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {</div><div class='add'>+	.clock_read = mv88e6165_ptp_clock_read,</div><div class='add'>+	.global_enable = mv88e6165_global_enable,</div><div class='add'>+	.global_disable = mv88e6165_global_disable,</div><div class='add'>+	.arr0_sts_reg = MV88E6165_PORT_PTP_ARR0_STS,</div><div class='add'>+	.arr1_sts_reg = MV88E6165_PORT_PTP_ARR1_STS,</div><div class='add'>+	.dep_sts_reg = MV88E6165_PORT_PTP_DEP_STS,</div><div class='add'>+	.rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_EVENT) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_SYNC) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {</div><div class='ctx'> 	.clock_read = mv88e6352_ptp_clock_read,</div><div class='ctx'> 	.ptp_enable = mv88e6352_ptp_enable,</div><div class='hunk'>@@ -333,14 +420,22 @@ const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {</div><div class='del'>-	.clock_read = mv88e6165_ptp_clock_read,</div><div class='del'>-	.global_enable = mv88e6165_global_enable,</div><div class='del'>-	.global_disable = mv88e6165_global_disable,</div><div class='del'>-	.arr0_sts_reg = MV88E6165_PORT_PTP_ARR0_STS,</div><div class='del'>-	.arr1_sts_reg = MV88E6165_PORT_PTP_ARR1_STS,</div><div class='del'>-	.dep_sts_reg = MV88E6165_PORT_PTP_DEP_STS,</div><div class='add'>+const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {</div><div class='add'>+	.clock_read = mv88e6352_ptp_clock_read,</div><div class='add'>+	.ptp_enable = mv88e6352_ptp_enable,</div><div class='add'>+	.ptp_verify = mv88e6352_ptp_verify,</div><div class='add'>+	.event_work = mv88e6352_tai_event_work,</div><div class='add'>+	.port_enable = mv88e6352_hwtstamp_port_enable,</div><div class='add'>+	.port_disable = mv88e6352_hwtstamp_port_disable,</div><div class='add'>+	.set_ptp_cpu_port = mv88e6390_g1_set_ptp_cpu_port,</div><div class='add'>+	.n_ext_ts = 1,</div><div class='add'>+	.arr0_sts_reg = MV88E6XXX_PORT_PTP_ARR0_STS,</div><div class='add'>+	.arr1_sts_reg = MV88E6XXX_PORT_PTP_ARR1_STS,</div><div class='add'>+	.dep_sts_reg = MV88E6XXX_PORT_PTP_DEP_STS,</div><div class='ctx'> 	.rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L4_SYNC) |</div><div class='add'>+		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) |</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_SYNC) |</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) |</div><div class='hunk'>@@ -349,7 +444,7 @@ const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_DELAY_REQ),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)</div><div class='add'>+static u64 mv88e6xxx_ptp_clock_read(struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_chip *chip = cc_to_chip(cc);</div><div class='ctx'> </div><div class='hunk'>@@ -359,10 +454,10 @@ static u64 mv88e6xxx_ptp_clock_read(const struct cyclecounter *cc)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* With a 125MHz input clock, the 32-bit timestamp counter overflows in ~34.3</div><div class='add'>+/* With a 250MHz input clock, the 32-bit timestamp counter overflows in ~17.2</div><div class='ctx'>  * seconds; this task forces periodic reads so that we don't miss any.</div><div class='ctx'>  */</div><div class='del'>-#define MV88E6XXX_TAI_OVERFLOW_PERIOD (HZ * 16)</div><div class='add'>+#define MV88E6XXX_TAI_OVERFLOW_PERIOD (HZ * 8)</div><div class='ctx'> static void mv88e6xxx_ptp_overflow_check(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct delayed_work *dw = to_delayed_work(work);</div><div class='hunk'>@@ -381,11 +476,15 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the cycle counter */</div><div class='add'>+	chip-&gt;cc_coeffs = mv88e6xxx_cc_coeff_get(chip);</div><div class='add'>+	if (IS_ERR(chip-&gt;cc_coeffs))</div><div class='add'>+		return PTR_ERR(chip-&gt;cc_coeffs);</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;chip-&gt;tstamp_cc, 0, sizeof(chip-&gt;tstamp_cc));</div><div class='ctx'> 	chip-&gt;tstamp_cc.read	= mv88e6xxx_ptp_clock_read;</div><div class='ctx'> 	chip-&gt;tstamp_cc.mask	= CYCLECOUNTER_MASK(32);</div><div class='del'>-	chip-&gt;tstamp_cc.mult	= CC_MULT;</div><div class='del'>-	chip-&gt;tstamp_cc.shift	= CC_SHIFT;</div><div class='add'>+	chip-&gt;tstamp_cc.mult	= chip-&gt;cc_coeffs-&gt;cc_mult;</div><div class='add'>+	chip-&gt;tstamp_cc.shift	= chip-&gt;cc_coeffs-&gt;cc_shift;</div><div class='ctx'> </div><div class='ctx'> 	timecounter_init(&amp;chip-&gt;tstamp_tc, &amp;chip-&gt;tstamp_cc,</div><div class='ctx'> 			 ktime_to_ns(ktime_get_real()));</div><div class='hunk'>@@ -397,7 +496,6 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	chip-&gt;ptp_clock_info.owner = THIS_MODULE;</div><div class='ctx'> 	snprintf(chip-&gt;ptp_clock_info.name, sizeof(chip-&gt;ptp_clock_info.name),</div><div class='ctx'> 		 "%s", dev_name(chip-&gt;dev));</div><div class='del'>-	chip-&gt;ptp_clock_info.max_adj	= 1000000;</div><div class='ctx'> </div><div class='ctx'> 	chip-&gt;ptp_clock_info.n_ext_ts	= ptp_ops-&gt;n_ext_ts;</div><div class='ctx'> 	chip-&gt;ptp_clock_info.n_per_out	= 0;</div><div class='hunk'>@@ -413,6 +511,7 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	}</div><div class='ctx'> 	chip-&gt;ptp_clock_info.pin_config = chip-&gt;pin_config;</div><div class='ctx'> </div><div class='add'>+	chip-&gt;ptp_clock_info.max_adj    = MV88E6XXX_MAX_ADJ_PPB;</div><div class='ctx'> 	chip-&gt;ptp_clock_info.adjfine	= mv88e6xxx_ptp_adjfine;</div><div class='ctx'> 	chip-&gt;ptp_clock_info.adjtime	= mv88e6xxx_ptp_adjtime;</div><div class='ctx'> 	chip-&gt;ptp_clock_info.gettime64	= mv88e6xxx_ptp_gettime;</div><div class='hunk'>@@ -421,6 +520,27 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	chip-&gt;ptp_clock_info.verify	= ptp_ops-&gt;ptp_verify;</div><div class='ctx'> 	chip-&gt;ptp_clock_info.do_aux_work = mv88e6xxx_hwtstamp_work;</div><div class='ctx'> </div><div class='add'>+	chip-&gt;ptp_clock_info.supported_extts_flags = PTP_RISING_EDGE |</div><div class='add'>+						     PTP_FALLING_EDGE |</div><div class='add'>+						     PTP_STRICT_FLAGS;</div><div class='add'>+</div><div class='add'>+	if (ptp_ops-&gt;set_ptp_cpu_port) {</div><div class='add'>+		struct dsa_port *dp;</div><div class='add'>+		int upstream = 0;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		dsa_switch_for_each_user_port(dp, chip-&gt;ds) {</div><div class='add'>+			upstream = dsa_upstream_port(chip-&gt;ds, dp-&gt;index);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = ptp_ops-&gt;set_ptp_cpu_port(chip, upstream);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(chip-&gt;dev, "Failed to set PTP CPU destination port!\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	chip-&gt;ptp_clock = ptp_clock_register(&amp;chip-&gt;ptp_clock_info, chip-&gt;dev);</div><div class='ctx'> 	if (IS_ERR(chip-&gt;ptp_clock))</div><div class='ctx'> 		return PTR_ERR(chip-&gt;ptp_clock);</div><div class='hunk'>@@ -431,6 +551,7 @@ int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* This must never be called holding the register lock */</div><div class='ctx'> void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	if (chip-&gt;ptp_clock) {</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/ptp.h b/drivers/net/dsa/mv88e6xxx/ptp.h<br/>index 0a1f8de8f062..95bdddb0bf39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/ptp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/ptp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/ptp.h</a></div><div class='hunk'>@@ -16,148 +16,68 @@</div><div class='ctx'> #include "chip.h"</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x00: TAI Global Config */</div><div class='del'>-#define MV88E6XXX_TAI_CFG			0x00</div><div class='del'>-#define MV88E6XXX_TAI_CFG_CAP_OVERWRITE		0x8000</div><div class='del'>-#define MV88E6XXX_TAI_CFG_CAP_CTR_START		0x4000</div><div class='del'>-#define MV88E6XXX_TAI_CFG_EVREQ_FALLING		0x2000</div><div class='del'>-#define MV88E6XXX_TAI_CFG_TRIG_ACTIVE_LO	0x1000</div><div class='del'>-#define MV88E6XXX_TAI_CFG_IRL_ENABLE		0x0400</div><div class='del'>-#define MV88E6XXX_TAI_CFG_TRIG_IRQ_EN		0x0200</div><div class='del'>-#define MV88E6XXX_TAI_CFG_EVREQ_IRQ_EN		0x0100</div><div class='del'>-#define MV88E6XXX_TAI_CFG_TRIG_LOCK		0x0080</div><div class='del'>-#define MV88E6XXX_TAI_CFG_BLOCK_UPDATE		0x0008</div><div class='del'>-#define MV88E6XXX_TAI_CFG_MULTI_PTP		0x0004</div><div class='del'>-#define MV88E6XXX_TAI_CFG_TRIG_MODE_ONESHOT	0x0002</div><div class='del'>-#define MV88E6XXX_TAI_CFG_TRIG_ENABLE		0x0001</div><div class='add'>+#define MV88E6352_TAI_CFG			0x00</div><div class='add'>+#define MV88E6352_TAI_CFG_CAP_OVERWRITE		0x8000</div><div class='add'>+#define MV88E6352_TAI_CFG_CAP_CTR_START		0x4000</div><div class='add'>+#define MV88E6352_TAI_CFG_EVREQ_FALLING		0x2000</div><div class='add'>+#define MV88E6352_TAI_CFG_TRIG_ACTIVE_LO	0x1000</div><div class='add'>+#define MV88E6352_TAI_CFG_IRL_ENABLE		0x0400</div><div class='add'>+#define MV88E6352_TAI_CFG_TRIG_IRQ_EN		0x0200</div><div class='add'>+#define MV88E6352_TAI_CFG_EVREQ_IRQ_EN		0x0100</div><div class='add'>+#define MV88E6352_TAI_CFG_TRIG_LOCK		0x0080</div><div class='add'>+#define MV88E6352_TAI_CFG_BLOCK_UPDATE		0x0008</div><div class='add'>+#define MV88E6352_TAI_CFG_MULTI_PTP		0x0004</div><div class='add'>+#define MV88E6352_TAI_CFG_TRIG_MODE_ONESHOT	0x0002</div><div class='add'>+#define MV88E6352_TAI_CFG_TRIG_ENABLE		0x0001</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x01: Timestamp Clock Period (ps) */</div><div class='ctx'> #define MV88E6XXX_TAI_CLOCK_PERIOD		0x01</div><div class='ctx'> </div><div class='del'>-/* Offset 0x02/0x03: Trigger Generation Amount */</div><div class='del'>-#define MV88E6XXX_TAI_TRIG_GEN_AMOUNT_LO	0x02</div><div class='del'>-#define MV88E6XXX_TAI_TRIG_GEN_AMOUNT_HI	0x03</div><div class='del'>-</div><div class='del'>-/* Offset 0x04: Clock Compensation */</div><div class='del'>-#define MV88E6XXX_TAI_TRIG_CLOCK_COMP		0x04</div><div class='del'>-</div><div class='del'>-/* Offset 0x05: Trigger Configuration */</div><div class='del'>-#define MV88E6XXX_TAI_TRIG_CFG			0x05</div><div class='del'>-</div><div class='del'>-/* Offset 0x06: Ingress Rate Limiter Clock Generation Amount */</div><div class='del'>-#define MV88E6XXX_TAI_IRL_AMOUNT		0x06</div><div class='del'>-</div><div class='del'>-/* Offset 0x07: Ingress Rate Limiter Compensation */</div><div class='del'>-#define MV88E6XXX_TAI_IRL_COMP			0x07</div><div class='del'>-</div><div class='del'>-/* Offset 0x08: Ingress Rate Limiter Compensation */</div><div class='del'>-#define MV88E6XXX_TAI_IRL_COMP_PS		0x08</div><div class='del'>-</div><div class='ctx'> /* Offset 0x09: Event Status */</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_STATUS		0x09</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_STATUS_CAP_TRIG	0x4000</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_STATUS_ERROR	0x0200</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_STATUS_VALID	0x0100</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_STATUS_CTR_MASK	0x00ff</div><div class='del'>-</div><div class='del'>-/* Offset 0x0A/0x0B: Event Time */</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_TIME_LO		0x0a</div><div class='del'>-#define MV88E6XXX_TAI_EVENT_TYPE_HI		0x0b</div><div class='add'>+#define MV88E6352_TAI_EVENT_STATUS		0x09</div><div class='add'>+#define MV88E6352_TAI_EVENT_STATUS_ERROR	0x0200</div><div class='add'>+#define MV88E6352_TAI_EVENT_STATUS_VALID	0x0100</div><div class='add'>+#define MV88E6352_TAI_EVENT_STATUS_CTR_MASK	0x00ff</div><div class='add'>+/* Offset 0x0A/0x0B: Event Time Lo/Hi. Always read with Event Status. */</div><div class='ctx'> </div><div class='ctx'> /* Offset 0x0E/0x0F: PTP Global Time */</div><div class='del'>-#define MV88E6XXX_TAI_TIME_LO			0x0e</div><div class='del'>-#define MV88E6XXX_TAI_TIME_HI			0x0f</div><div class='del'>-</div><div class='del'>-/* Offset 0x10/0x11: Trig Generation Time */</div><div class='del'>-#define MV88E6XXX_TAI_TRIG_TIME_LO		0x10</div><div class='del'>-#define MV88E6XXX_TAI_TRIG_TIME_HI		0x11</div><div class='del'>-</div><div class='del'>-/* Offset 0x12: Lock Status */</div><div class='del'>-#define MV88E6XXX_TAI_LOCK_STATUS		0x12</div><div class='del'>-</div><div class='del'>-/* Offset 0x00: Ether Type */</div><div class='del'>-#define MV88E6XXX_PTP_GC_ETYPE			0x00</div><div class='add'>+#define MV88E6352_TAI_TIME_LO			0x0e</div><div class='add'>+#define MV88E6352_TAI_TIME_HI			0x0f</div><div class='ctx'> </div><div class='ctx'> /* 6165 Global Control Registers */</div><div class='del'>-/* Offset 0x00: Ether Type */</div><div class='del'>-#define MV88E6XXX_PTP_GC_ETYPE			0x00</div><div class='del'>-</div><div class='del'>-/* Offset 0x01: Message ID */</div><div class='del'>-#define MV88E6XXX_PTP_GC_MESSAGE_ID		0x01</div><div class='del'>-</div><div class='del'>-/* Offset 0x02: Time Stamp Arrive Time */</div><div class='del'>-#define MV88E6XXX_PTP_GC_TS_ARR_PTR		0x02</div><div class='del'>-</div><div class='del'>-/* Offset 0x03: Port Arrival Interrupt Enable */</div><div class='del'>-#define MV88E6XXX_PTP_GC_PORT_ARR_INT_EN	0x03</div><div class='del'>-</div><div class='del'>-/* Offset 0x04: Port Departure Interrupt Enable */</div><div class='del'>-#define MV88E6XXX_PTP_GC_PORT_DEP_INT_EN	0x04</div><div class='del'>-</div><div class='del'>-/* Offset 0x05: Configuration */</div><div class='del'>-#define MV88E6XXX_PTP_GC_CONFIG			0x05</div><div class='del'>-#define MV88E6XXX_PTP_GC_CONFIG_DIS_OVERWRITE	BIT(1)</div><div class='del'>-#define MV88E6XXX_PTP_GC_CONFIG_DIS_TS		BIT(0)</div><div class='del'>-</div><div class='del'>-/* Offset 0x8: Interrupt Status */</div><div class='del'>-#define MV88E6XXX_PTP_GC_INT_STATUS		0x08</div><div class='del'>-</div><div class='ctx'> /* Offset 0x9/0xa: Global Time */</div><div class='del'>-#define MV88E6XXX_PTP_GC_TIME_LO		0x09</div><div class='del'>-#define MV88E6XXX_PTP_GC_TIME_HI		0x0A</div><div class='add'>+#define MV88E6165_PTP_GC_TIME_LO		0x09</div><div class='add'>+#define MV88E6165_PTP_GC_TIME_HI		0x0A</div><div class='ctx'> </div><div class='del'>-/* 6165 Per Port Registers */</div><div class='add'>+/* 6165 Per Port Registers. The arrival and departure registers are a</div><div class='add'>+ * common block consisting of status, two time registers and the sequence ID</div><div class='add'>+ */</div><div class='ctx'> /* Offset 0: Arrival Time 0 Status */</div><div class='ctx'> #define MV88E6165_PORT_PTP_ARR0_STS	0x00</div><div class='ctx'> </div><div class='del'>-/* Offset 0x01/0x02: PTP Arrival 0 Time */</div><div class='del'>-#define MV88E6165_PORT_PTP_ARR0_TIME_LO	0x01</div><div class='del'>-#define MV88E6165_PORT_PTP_ARR0_TIME_HI	0x02</div><div class='del'>-</div><div class='del'>-/* Offset 0x03: PTP Arrival 0 Sequence ID */</div><div class='del'>-#define MV88E6165_PORT_PTP_ARR0_SEQID	0x03</div><div class='del'>-</div><div class='ctx'> /* Offset 0x04: PTP Arrival 1 Status */</div><div class='ctx'> #define MV88E6165_PORT_PTP_ARR1_STS	0x04</div><div class='ctx'> </div><div class='del'>-/* Offset 0x05/0x6E: PTP Arrival 1 Time */</div><div class='del'>-#define MV88E6165_PORT_PTP_ARR1_TIME_LO	0x05</div><div class='del'>-#define MV88E6165_PORT_PTP_ARR1_TIME_HI	0x06</div><div class='del'>-</div><div class='del'>-/* Offset 0x07: PTP Arrival 1 Sequence ID */</div><div class='del'>-#define MV88E6165_PORT_PTP_ARR1_SEQID	0x07</div><div class='del'>-</div><div class='ctx'> /* Offset 0x08: PTP Departure Status */</div><div class='ctx'> #define MV88E6165_PORT_PTP_DEP_STS	0x08</div><div class='ctx'> </div><div class='del'>-/* Offset 0x09/0x0a: PTP Deperture Time */</div><div class='del'>-#define MV88E6165_PORT_PTP_DEP_TIME_LO	0x09</div><div class='del'>-#define MV88E6165_PORT_PTP_DEP_TIME_HI	0x0a</div><div class='del'>-</div><div class='del'>-/* Offset 0x0b: PTP Departure Sequence ID */</div><div class='del'>-#define MV88E6165_PORT_PTP_DEP_SEQID	0x0b</div><div class='del'>-</div><div class='ctx'> /* Offset 0x0d: Port Status */</div><div class='ctx'> #define MV88E6164_PORT_STATUS		0x0d</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_DSA_MV88E6XXX_PTP</div><div class='ctx'> </div><div class='del'>-long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp);</div><div class='ctx'> int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip);</div><div class='ctx'> void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip);</div><div class='ctx'> </div><div class='ctx'> #define ptp_to_chip(ptp) container_of(ptp, struct mv88e6xxx_chip,	\</div><div class='ctx'> 				      ptp_clock_info)</div><div class='ctx'> </div><div class='del'>-extern const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops;</div><div class='ctx'> extern const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops;</div><div class='add'>+extern const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops;</div><div class='add'>+extern const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops;</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_NET_DSA_MV88E6XXX_PTP */</div><div class='ctx'> </div><div class='del'>-static inline long mv88e6xxx_hwtstamp_work(struct ptp_clock_info *ptp)</div><div class='del'>-{</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline int mv88e6xxx_ptp_setup(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -167,8 +87,9 @@ static inline void mv88e6xxx_ptp_free(struct mv88e6xxx_chip *chip)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {};</div><div class='ctx'> static const struct mv88e6xxx_ptp_ops mv88e6165_ptp_ops = {};</div><div class='add'>+static const struct mv88e6xxx_ptp_ops mv88e6352_ptp_ops = {};</div><div class='add'>+static const struct mv88e6xxx_ptp_ops mv88e6390_ptp_ops = {};</div><div class='ctx'> </div><div class='ctx'> #endif /* CONFIG_NET_DSA_MV88E6XXX_PTP */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c<br/>index d986c5d55bf1..b3330211edbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/serdes.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/serdes.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/serdes.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/serdes.c</a></div><div class='hunk'>@@ -36,61 +36,77 @@ static int mv88e6352_serdes_write(struct mv88e6xxx_chip *chip, int reg,</div><div class='ctx'> static int mv88e6390_serdes_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				 int lane, int device, int reg, u16 *val)</div><div class='ctx'> {</div><div class='del'>-	int reg_c45 = MII_ADDR_C45 | device &lt;&lt; 16 | reg;</div><div class='del'>-</div><div class='del'>-	return mv88e6xxx_phy_read(chip, lane, reg_c45, val);</div><div class='add'>+	return mv88e6xxx_phy_read_c45(chip, lane, device, reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6390_serdes_write(struct mv88e6xxx_chip *chip,</div><div class='del'>-				  int lane, int device, int reg, u16 val)</div><div class='add'>+int mv88e6xxx_pcs_decode_state(struct device *dev, u16 bmsr, u16 lpa,</div><div class='add'>+			       u16 status, struct phylink_link_state *state)</div><div class='ctx'> {</div><div class='del'>-	int reg_c45 = MII_ADDR_C45 | device &lt;&lt; 16 | reg;</div><div class='del'>-</div><div class='del'>-	return mv88e6xxx_phy_write(chip, lane, reg_c45, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6352_serdes_power_set(struct mv88e6xxx_chip *chip, bool on)</div><div class='del'>-{</div><div class='del'>-	u16 val, new_val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6352_serdes_read(chip, MII_BMCR, &amp;val);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		new_val = val &amp; ~BMCR_PDOWN;</div><div class='del'>-	else</div><div class='del'>-		new_val = val | BMCR_PDOWN;</div><div class='del'>-</div><div class='del'>-	if (val != new_val)</div><div class='del'>-		err = mv88e6352_serdes_write(chip, MII_BMCR, new_val);</div><div class='add'>+	state-&gt;link = false;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool mv88e6352_port_has_serdes(struct mv88e6xxx_chip *chip, int port)</div><div class='del'>-{</div><div class='del'>-	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+	/* If the BMSR reports that the link had failed, report this to</div><div class='add'>+	 * phylink.</div><div class='add'>+	 */</div><div class='add'>+	if (!(bmsr &amp; BMSR_LSTATUS))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((cmode == MV88E6XXX_PORT_STS_CMODE_100BASE_X) ||</div><div class='del'>-	    (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X) ||</div><div class='del'>-	    (cmode == MV88E6XXX_PORT_STS_CMODE_SGMII))</div><div class='del'>-		return true;</div><div class='add'>+	state-&gt;link = !!(status &amp; MV88E6390_SGMII_PHY_STATUS_LINK);</div><div class='add'>+	state-&gt;an_complete = !!(bmsr &amp; BMSR_ANEGCOMPLETE);</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='add'>+	if (status &amp; MV88E6390_SGMII_PHY_STATUS_SPD_DPL_VALID) {</div><div class='add'>+		/* The Spped and Duplex Resolved register is 1 if AN is enabled</div><div class='add'>+		 * and complete, or if AN is disabled. So with disabled AN we</div><div class='add'>+		 * still get here on link up.</div><div class='add'>+		 */</div><div class='add'>+		state-&gt;duplex = status &amp;</div><div class='add'>+				MV88E6390_SGMII_PHY_STATUS_DUPLEX_FULL ?</div><div class='add'>+			                         DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+		if (status &amp; MV88E6390_SGMII_PHY_STATUS_TX_PAUSE)</div><div class='add'>+			state-&gt;pause |= MLO_PAUSE_TX;</div><div class='add'>+		if (status &amp; MV88E6390_SGMII_PHY_STATUS_RX_PAUSE)</div><div class='add'>+			state-&gt;pause |= MLO_PAUSE_RX;</div><div class='ctx'> </div><div class='del'>-	if (mv88e6352_port_has_serdes(chip, port)) {</div><div class='del'>-		err = mv88e6352_serdes_power_set(chip, on);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			return err;</div><div class='add'>+		switch (status &amp; MV88E6390_SGMII_PHY_STATUS_SPEED_MASK) {</div><div class='add'>+		case MV88E6390_SGMII_PHY_STATUS_SPEED_1000:</div><div class='add'>+			if (state-&gt;interface == PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+				state-&gt;speed = SPEED_2500;</div><div class='add'>+			else</div><div class='add'>+				state-&gt;speed = SPEED_1000;</div><div class='add'>+			break;</div><div class='add'>+		case MV88E6390_SGMII_PHY_STATUS_SPEED_100:</div><div class='add'>+			state-&gt;speed = SPEED_100;</div><div class='add'>+			break;</div><div class='add'>+		case MV88E6390_SGMII_PHY_STATUS_SPEED_10:</div><div class='add'>+			state-&gt;speed = SPEED_10;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(dev, "invalid PHY speed\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else if (state-&gt;link &amp;&amp;</div><div class='add'>+		   state-&gt;interface != PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		/* If Speed and Duplex Resolved register is 0 and link is up, it</div><div class='add'>+		 * means that AN was enabled, but link partner had it disabled</div><div class='add'>+		 * and the PHY invoked the Auto-Negotiation Bypass feature and</div><div class='add'>+		 * linked anyway.</div><div class='add'>+		 */</div><div class='add'>+		state-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+		if (state-&gt;interface == PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+			state-&gt;speed = SPEED_2500;</div><div class='add'>+		else</div><div class='add'>+			state-&gt;speed = SPEED_1000;</div><div class='add'>+	} else {</div><div class='add'>+		state-&gt;link = false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (state-&gt;interface == PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+		mii_lpa_mod_linkmode_x(state-&gt;lp_advertising, lpa,</div><div class='add'>+				       ETHTOOL_LINK_MODE_2500baseX_Full_BIT);</div><div class='add'>+	else if (state-&gt;interface == PHY_INTERFACE_MODE_1000BASEX)</div><div class='add'>+		mii_lpa_mod_linkmode_x(state-&gt;lp_advertising, lpa,</div><div class='add'>+				       ETHTOOL_LINK_MODE_1000baseX_Full_BIT);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -107,25 +123,28 @@ static struct mv88e6352_serdes_hw_stat mv88e6352_serdes_hw_stats[] = {</div><div class='ctx'> </div><div class='ctx'> int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	if (mv88e6352_port_has_serdes(chip, port))</div><div class='del'>-		return ARRAY_SIZE(mv88e6352_serdes_hw_stats);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return ARRAY_SIZE(mv88e6352_serdes_hw_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,</div><div class='del'>-				 int port, uint8_t *data)</div><div class='add'>+int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 uint8_t **data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6352_serdes_hw_stat *stat;</div><div class='del'>-	int i;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='del'>-	if (!mv88e6352_port_has_serdes(chip, port))</div><div class='del'>-		return 0;</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mv88e6352_serdes_hw_stats); i++) {</div><div class='ctx'> 		stat = &amp;mv88e6352_serdes_hw_stats[i];</div><div class='del'>-		memcpy(data + i * ETH_GSTRING_LEN, stat-&gt;string,</div><div class='del'>-		       ETH_GSTRING_LEN);</div><div class='add'>+		ethtool_puts(data, stat-&gt;string);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ARRAY_SIZE(mv88e6352_serdes_hw_stats);</div><div class='ctx'> }</div><div class='hunk'>@@ -157,15 +176,16 @@ static uint64_t mv88e6352_serdes_get_stat(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	return val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			       uint64_t *data)</div><div class='add'>+size_t mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				  uint64_t *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct mv88e6xxx_port *mv88e6xxx_port = &amp;chip-&gt;ports[port];</div><div class='ctx'> 	struct mv88e6352_serdes_hw_stat *stat;</div><div class='add'>+	int i, err;</div><div class='ctx'> 	u64 value;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (!mv88e6352_port_has_serdes(chip, port))</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	if (err &lt;= 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	BUILD_BUG_ON(ARRAY_SIZE(mv88e6352_serdes_hw_stats) &gt;</div><div class='hunk'>@@ -181,557 +201,346 @@ int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='ctx'> 	return ARRAY_SIZE(mv88e6352_serdes_hw_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6352_serdes_irq_link(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+unsigned int mv88e6352_serdes_irq_mapping(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_switch *ds = chip-&gt;ds;</div><div class='del'>-	u16 status;</div><div class='del'>-	bool up;</div><div class='del'>-</div><div class='del'>-	mv88e6352_serdes_read(chip, MII_BMSR, &amp;status);</div><div class='del'>-</div><div class='del'>-	/* Status must be read twice in order to give the current link</div><div class='del'>-	 * status. Otherwise the change in link status since the last</div><div class='del'>-	 * read of the register is returned.</div><div class='del'>-	 */</div><div class='del'>-	mv88e6352_serdes_read(chip, MII_BMSR, &amp;status);</div><div class='del'>-</div><div class='del'>-	up = status &amp; BMSR_LSTATUS;</div><div class='del'>-</div><div class='del'>-	dsa_port_phylink_mac_change(ds, port, up);</div><div class='add'>+	return irq_find_mapping(chip-&gt;g2_irq.domain, MV88E6352_SERDES_IRQ);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t mv88e6352_serdes_thread_fn(int irq, void *dev_id)</div><div class='add'>+int mv88e6352_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_port *port = dev_id;</div><div class='del'>-	struct mv88e6xxx_chip *chip = port-&gt;chip;</div><div class='del'>-	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-	u16 status;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	err = mv88e6352_serdes_read(chip, MV88E6352_SERDES_INT_STATUS, &amp;status);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (status &amp; MV88E6352_SERDES_INT_LINK_CHANGE) {</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-		mv88e6352_serdes_irq_link(chip, port-&gt;port);</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6352_serdes_irq_enable(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return mv88e6352_serdes_write(chip, MV88E6352_SERDES_INT_ENABLE,</div><div class='del'>-				      MV88E6352_SERDES_INT_LINK_CHANGE);</div><div class='del'>-}</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-static int mv88e6352_serdes_irq_disable(struct mv88e6xxx_chip *chip)</div><div class='del'>-{</div><div class='del'>-	return mv88e6352_serdes_write(chip, MV88E6352_SERDES_INT_ENABLE, 0);</div><div class='add'>+	return 32 * sizeof(u16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6352_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p)</div><div class='ctx'> {</div><div class='add'>+	u16 *p = _p;</div><div class='add'>+	u16 reg;</div><div class='ctx'> 	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!mv88e6352_port_has_serdes(chip, port))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	chip-&gt;ports[port].serdes_irq = irq_find_mapping(chip-&gt;g2_irq.domain,</div><div class='del'>-							MV88E6352_SERDES_IRQ);</div><div class='del'>-	if (chip-&gt;ports[port].serdes_irq &lt; 0) {</div><div class='del'>-		dev_err(chip-&gt;dev, "Unable to map SERDES irq: %d\n",</div><div class='del'>-			chip-&gt;ports[port].serdes_irq);</div><div class='del'>-		return chip-&gt;ports[port].serdes_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Requesting the IRQ will trigger irq callbacks. So we cannot</div><div class='del'>-	 * hold the reg_lock.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = request_threaded_irq(chip-&gt;ports[port].serdes_irq, NULL,</div><div class='del'>-				   mv88e6352_serdes_thread_fn,</div><div class='del'>-				   IRQF_ONESHOT, "mv88e6xxx-serdes",</div><div class='del'>-				   &amp;chip-&gt;ports[port]);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(chip-&gt;dev, "Unable to request SERDES interrupt: %d\n",</div><div class='del'>-			err);</div><div class='del'>-		return err;</div><div class='add'>+	for (i = 0 ; i &lt; 32; i++) {</div><div class='add'>+		err = mv88e6352_serdes_read(chip, i, &amp;reg);</div><div class='add'>+		if (!err)</div><div class='add'>+			p[i] = reg;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return mv88e6352_serdes_irq_enable(chip);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void mv88e6352_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	if (!mv88e6352_port_has_serdes(chip, port))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mv88e6352_serdes_irq_disable(chip);</div><div class='add'>+	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+	int lane = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	/* Freeing the IRQ will trigger irq callbacks. So we cannot</div><div class='del'>-	 * hold the reg_lock.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	free_irq(chip-&gt;ports[port].serdes_irq, &amp;chip-&gt;ports[port]);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 5:</div><div class='add'>+		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='add'>+		    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='add'>+		    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='add'>+			lane = MV88E6341_PORT5_LANE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	chip-&gt;ports[port].serdes_irq = 0;</div><div class='add'>+	return lane;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return the SERDES lane address a port is using. Only Ports 9 and 10</div><div class='del'>- * have SERDES lanes. Returns -ENODEV if a port does not have a lane.</div><div class='del'>- */</div><div class='del'>-static int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='ctx'> 	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+	int lane = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch (port) {</div><div class='ctx'> 	case 9:</div><div class='del'>-		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='del'>-			return MV88E6390_PORT9_LANE0;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			lane = MV88E6390_PORT9_LANE0;</div><div class='add'>+		break;</div><div class='ctx'> 	case 10:</div><div class='del'>-		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='del'>-			return MV88E6390_PORT10_LANE0;</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	default:</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			lane = MV88E6390_PORT10_LANE0;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return lane;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Return the SERDES lane address a port is using. Ports 9 and 10 can</div><div class='del'>- * use multiple lanes. If so, return the first lane the port uses.</div><div class='del'>- * Returns -ENODEV if a port does not have a lane.</div><div class='del'>- */</div><div class='ctx'> int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	u8 cmode_port9, cmode_port10, cmode_port;</div><div class='del'>-</div><div class='del'>-	cmode_port9 = chip-&gt;ports[9].cmode;</div><div class='del'>-	cmode_port10 = chip-&gt;ports[10].cmode;</div><div class='del'>-	cmode_port = chip-&gt;ports[port].cmode;</div><div class='add'>+	u8 cmode_port = chip-&gt;ports[port].cmode;</div><div class='add'>+	u8 cmode_port10 = chip-&gt;ports[10].cmode;</div><div class='add'>+	u8 cmode_port9 = chip-&gt;ports[9].cmode;</div><div class='add'>+	int lane = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	switch (port) {</div><div class='ctx'> 	case 2:</div><div class='del'>-		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='del'>-			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X)</div><div class='del'>-				return MV88E6390_PORT9_LANE1;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX)</div><div class='add'>+				lane = MV88E6390_PORT9_LANE1;</div><div class='add'>+		break;</div><div class='ctx'> 	case 3:</div><div class='del'>-		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_RXAUI)</div><div class='del'>-			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X)</div><div class='del'>-				return MV88E6390_PORT9_LANE2;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX)</div><div class='add'>+				lane = MV88E6390_PORT9_LANE2;</div><div class='add'>+		break;</div><div class='ctx'> 	case 4:</div><div class='del'>-		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_RXAUI)</div><div class='del'>-			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X)</div><div class='del'>-				return MV88E6390_PORT9_LANE3;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX)</div><div class='add'>+				lane = MV88E6390_PORT9_LANE3;</div><div class='add'>+		break;</div><div class='ctx'> 	case 5:</div><div class='del'>-		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='del'>-			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X)</div><div class='del'>-				return MV88E6390_PORT10_LANE1;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX)</div><div class='add'>+				lane = MV88E6390_PORT10_LANE1;</div><div class='add'>+		break;</div><div class='ctx'> 	case 6:</div><div class='del'>-		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_RXAUI)</div><div class='del'>-			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X)</div><div class='del'>-				return MV88E6390_PORT10_LANE2;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX)</div><div class='add'>+				lane = MV88E6390_PORT10_LANE2;</div><div class='add'>+		break;</div><div class='ctx'> 	case 7:</div><div class='del'>-		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_RXAUI)</div><div class='del'>-			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASE_X)</div><div class='del'>-				return MV88E6390_PORT10_LANE3;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			if (cmode_port == MV88E6XXX_PORT_STS_CMODE_1000BASEX)</div><div class='add'>+				lane = MV88E6390_PORT10_LANE3;</div><div class='add'>+		break;</div><div class='ctx'> 	case 9:</div><div class='del'>-		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port9 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_XAUI ||</div><div class='ctx'> 		    cmode_port9 == MV88E6XXX_PORT_STS_CMODE_RXAUI)</div><div class='del'>-			return MV88E6390_PORT9_LANE0;</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			lane = MV88E6390_PORT9_LANE0;</div><div class='add'>+		break;</div><div class='ctx'> 	case 10:</div><div class='del'>-		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='add'>+		if (cmode_port10 == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_XAUI ||</div><div class='ctx'> 		    cmode_port10 == MV88E6XXX_PORT_STS_CMODE_RXAUI)</div><div class='del'>-			return MV88E6390_PORT10_LANE0;</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	default:</div><div class='del'>-		return -ENODEV;</div><div class='add'>+			lane = MV88E6390_PORT10_LANE0;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set the power on/off for 10GBASE-R and 10GBASE-X4/X2 */</div><div class='del'>-static int mv88e6390_serdes_power_10g(struct mv88e6xxx_chip *chip, int lane,</div><div class='del'>-				      bool on)</div><div class='del'>-{</div><div class='del'>-	u16 val, new_val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-				    MV88E6390_PCS_CONTROL_1, &amp;val);</div><div class='del'>-</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	if (on)</div><div class='del'>-		new_val = val &amp; ~(MV88E6390_PCS_CONTROL_1_RESET |</div><div class='del'>-				  MV88E6390_PCS_CONTROL_1_LOOPBACK |</div><div class='del'>-				  MV88E6390_PCS_CONTROL_1_PDOWN);</div><div class='del'>-	else</div><div class='del'>-		new_val = val | MV88E6390_PCS_CONTROL_1_PDOWN;</div><div class='ctx'> </div><div class='del'>-	if (val != new_val)</div><div class='del'>-		err = mv88e6390_serdes_write(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-					     MV88E6390_PCS_CONTROL_1, new_val);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return lane;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set the power on/off for SGMII and 1000Base-X */</div><div class='del'>-static int mv88e6390_serdes_power_sgmii(struct mv88e6xxx_chip *chip, int lane,</div><div class='del'>-					bool on)</div><div class='add'>+/* Only Ports 0, 9 and 10 have SERDES lanes. Return the SERDES lane address</div><div class='add'>+ * a port is using else Returns -ENODEV.</div><div class='add'>+ */</div><div class='add'>+int mv88e6393x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	u16 val, new_val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-				    MV88E6390_SGMII_CONTROL, &amp;val);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='add'>+	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+	int lane = -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (on)</div><div class='del'>-		new_val = val &amp; ~(MV88E6390_SGMII_CONTROL_RESET |</div><div class='del'>-				  MV88E6390_SGMII_CONTROL_LOOPBACK |</div><div class='del'>-				  MV88E6390_SGMII_CONTROL_PDOWN);</div><div class='del'>-	else</div><div class='del'>-		new_val = val | MV88E6390_SGMII_CONTROL_PDOWN;</div><div class='add'>+	if (port != 0 &amp;&amp; port != 9 &amp;&amp; port != 10)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (val != new_val)</div><div class='del'>-		err = mv88e6390_serdes_write(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-					     MV88E6390_SGMII_CONTROL, new_val);</div><div class='add'>+	if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASEX ||</div><div class='add'>+	    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='add'>+	    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX ||</div><div class='add'>+	    cmode == MV88E6393X_PORT_STS_CMODE_5GBASER ||</div><div class='add'>+	    cmode == MV88E6393X_PORT_STS_CMODE_10GBASER ||</div><div class='add'>+	    cmode == MV88E6393X_PORT_STS_CMODE_USXGMII)</div><div class='add'>+		lane = port;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return lane;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6390_serdes_power_lane(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				       int lane, bool on)</div><div class='del'>-{</div><div class='del'>-	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='del'>-</div><div class='del'>-	switch (cmode) {</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_SGMII:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:</div><div class='del'>-		return mv88e6390_serdes_power_sgmii(chip, lane, on);</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_XAUI:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_RXAUI:</div><div class='del'>-		return mv88e6390_serdes_power_10g(chip, lane, on);</div><div class='del'>-	}</div><div class='add'>+struct mv88e6390_serdes_hw_stat {</div><div class='add'>+	char string[ETH_GSTRING_LEN];</div><div class='add'>+	int reg;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+static struct mv88e6390_serdes_hw_stat mv88e6390_serdes_hw_stats[] = {</div><div class='add'>+	{ "serdes_rx_pkts", 0xf021 },</div><div class='add'>+	{ "serdes_rx_bytes", 0xf024 },</div><div class='add'>+	{ "serdes_rx_pkts_error", 0xf027 },</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)</div><div class='add'>+int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	int lane;</div><div class='del'>-</div><div class='del'>-	lane = mv88e6390_serdes_get_lane(chip, port);</div><div class='del'>-	if (lane == -ENODEV)</div><div class='add'>+	if (mv88e6xxx_serdes_get_lane(chip, port) &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (lane &lt; 0)</div><div class='del'>-		return lane;</div><div class='del'>-</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 9 ... 10:</div><div class='del'>-		return mv88e6390_serdes_power_lane(chip, port, lane, on);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ARRAY_SIZE(mv88e6390_serdes_hw_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6390x_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)</div><div class='add'>+int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 uint8_t **data)</div><div class='ctx'> {</div><div class='del'>-	int lane;</div><div class='add'>+	struct mv88e6390_serdes_hw_stat *stat;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='del'>-	if (lane == -ENODEV)</div><div class='add'>+	if (mv88e6xxx_serdes_get_lane(chip, port) &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (lane &lt; 0)</div><div class='del'>-		return lane;</div><div class='del'>-</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 2 ... 4:</div><div class='del'>-	case 5 ... 7:</div><div class='del'>-	case 9 ... 10:</div><div class='del'>-		return mv88e6390_serdes_power_lane(chip, port, lane, on);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) {</div><div class='add'>+		stat = &amp;mv88e6390_serdes_hw_stats[i];</div><div class='add'>+		ethtool_puts(data, stat-&gt;string);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ARRAY_SIZE(mv88e6390_serdes_hw_stats);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mv88e6390_serdes_irq_link_sgmii(struct mv88e6xxx_chip *chip,</div><div class='del'>-					    int port, int lane)</div><div class='add'>+static uint64_t mv88e6390_serdes_get_stat(struct mv88e6xxx_chip *chip, int lane,</div><div class='add'>+					  struct mv88e6390_serdes_hw_stat *stat)</div><div class='ctx'> {</div><div class='del'>-	struct dsa_switch *ds = chip-&gt;ds;</div><div class='del'>-	int duplex = DUPLEX_UNKNOWN;</div><div class='del'>-	int speed = SPEED_UNKNOWN;</div><div class='del'>-	int link, err;</div><div class='del'>-	u16 status;</div><div class='del'>-</div><div class='del'>-	err = mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-				    MV88E6390_SGMII_PHY_STATUS, &amp;status);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(chip-&gt;dev, "can't read SGMII PHY status: %d\n", err);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	link = status &amp; MV88E6390_SGMII_PHY_STATUS_LINK ?</div><div class='del'>-	       LINK_FORCED_UP : LINK_FORCED_DOWN;</div><div class='del'>-</div><div class='del'>-	if (status &amp; MV88E6390_SGMII_PHY_STATUS_SPD_DPL_VALID) {</div><div class='del'>-		duplex = status &amp; MV88E6390_SGMII_PHY_STATUS_DUPLEX_FULL ?</div><div class='del'>-			 DUPLEX_FULL : DUPLEX_HALF;</div><div class='add'>+	u16 reg[3];</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='del'>-		switch (status &amp; MV88E6390_SGMII_PHY_STATUS_SPEED_MASK) {</div><div class='del'>-		case MV88E6390_SGMII_PHY_STATUS_SPEED_1000:</div><div class='del'>-			speed = SPEED_1000;</div><div class='del'>-			break;</div><div class='del'>-		case MV88E6390_SGMII_PHY_STATUS_SPEED_100:</div><div class='del'>-			speed = SPEED_100;</div><div class='del'>-			break;</div><div class='del'>-		case MV88E6390_SGMII_PHY_STATUS_SPEED_10:</div><div class='del'>-			speed = SPEED_10;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			dev_err(chip-&gt;dev, "invalid PHY speed\n");</div><div class='del'>-			return;</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		err = mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS,</div><div class='add'>+					    stat-&gt;reg + i, &amp;reg[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(chip-&gt;dev, "failed to read statistic\n");</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_port_setup_mac(chip, port, link, speed, duplex,</div><div class='del'>-				       PAUSE_OFF, PHY_INTERFACE_MODE_NA);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(chip-&gt;dev, "can't propagate PHY settings to MAC: %d\n",</div><div class='del'>-			err);</div><div class='del'>-	else</div><div class='del'>-		dsa_port_phylink_mac_change(ds, port, link == LINK_FORCED_UP);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6390_serdes_irq_enable_sgmii(struct mv88e6xxx_chip *chip,</div><div class='del'>-					     int lane)</div><div class='del'>-{</div><div class='del'>-	return mv88e6390_serdes_write(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-				      MV88E6390_SGMII_INT_ENABLE,</div><div class='del'>-				      MV88E6390_SGMII_INT_LINK_DOWN |</div><div class='del'>-				      MV88E6390_SGMII_INT_LINK_UP);</div><div class='add'>+	return reg[0] | ((u64)reg[1] &lt;&lt; 16) | ((u64)reg[2] &lt;&lt; 32);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mv88e6390_serdes_irq_disable_sgmii(struct mv88e6xxx_chip *chip,</div><div class='del'>-					      int lane)</div><div class='add'>+size_t mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				  uint64_t *data)</div><div class='ctx'> {</div><div class='del'>-	return mv88e6390_serdes_write(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-				      MV88E6390_SGMII_INT_ENABLE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int mv88e6390_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				int lane)</div><div class='del'>-{</div><div class='del'>-	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	switch (cmode) {</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_SGMII:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:</div><div class='del'>-		err = mv88e6390_serdes_irq_enable_sgmii(chip, lane);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	struct mv88e6390_serdes_hw_stat *stat;</div><div class='add'>+	int lane;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-int mv88e6390_serdes_irq_disable(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				 int lane)</div><div class='del'>-{</div><div class='del'>-	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='del'>-	int err = 0;</div><div class='add'>+	lane = mv88e6xxx_serdes_get_lane(chip, port);</div><div class='add'>+	if (lane &lt; 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	switch (cmode) {</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_SGMII:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:</div><div class='del'>-		err = mv88e6390_serdes_irq_disable_sgmii(chip, lane);</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) {</div><div class='add'>+		stat = &amp;mv88e6390_serdes_hw_stats[i];</div><div class='add'>+		data[i] = mv88e6390_serdes_get_stat(chip, lane, stat);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip,</div><div class='del'>-					     int lane, u16 *status)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS,</div><div class='del'>-				    MV88E6390_SGMII_INT_STATUS, status);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	return ARRAY_SIZE(mv88e6390_serdes_hw_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	return irq_find_mapping(chip-&gt;g2_irq.domain, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u16 mv88e6390_serdes_regs[] = {</div><div class='add'>+	/* SERDES common registers */</div><div class='add'>+	0xf00a, 0xf00b, 0xf00c,</div><div class='add'>+	0xf010, 0xf011, 0xf012, 0xf013,</div><div class='add'>+	0xf016, 0xf017, 0xf018,</div><div class='add'>+	0xf01b, 0xf01c, 0xf01d, 0xf01e, 0xf01f,</div><div class='add'>+	0xf020, 0xf021, 0xf022, 0xf023, 0xf024, 0xf025, 0xf026, 0xf027,</div><div class='add'>+	0xf028, 0xf029,</div><div class='add'>+	0xf030, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, 0xf037,</div><div class='add'>+	0xf038, 0xf039,</div><div class='add'>+	/* SGMII */</div><div class='add'>+	0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007,</div><div class='add'>+	0x2008,</div><div class='add'>+	0x200f,</div><div class='add'>+	0xa000, 0xa001, 0xa002, 0xa003,</div><div class='add'>+	/* 10Gbase-X */</div><div class='add'>+	0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006, 0x1007,</div><div class='add'>+	0x1008,</div><div class='add'>+	0x100e, 0x100f,</div><div class='add'>+	0x1018, 0x1019,</div><div class='add'>+	0x9000, 0x9001, 0x9002, 0x9003, 0x9004,</div><div class='add'>+	0x9006,</div><div class='add'>+	0x9010, 0x9011, 0x9012, 0x9013, 0x9014, 0x9015, 0x9016,</div><div class='add'>+	/* 10Gbase-R */</div><div class='add'>+	0x1020, 0x1021, 0x1022, 0x1023, 0x1024, 0x1025, 0x1026, 0x1027,</div><div class='add'>+	0x1028, 0x1029, 0x102a, 0x102b,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)</div><div class='add'>+int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port)</div><div class='ctx'> {</div><div class='del'>-	struct mv88e6xxx_port *port = dev_id;</div><div class='del'>-	struct mv88e6xxx_chip *chip = port-&gt;chip;</div><div class='del'>-	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-	u8 cmode = port-&gt;cmode;</div><div class='del'>-	u16 status;</div><div class='del'>-	int lane;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	lane = mv88e6390x_serdes_get_lane(chip, port-&gt;port);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	switch (cmode) {</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_SGMII:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:</div><div class='del'>-	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:</div><div class='del'>-		err = mv88e6390_serdes_irq_status_sgmii(chip, lane, &amp;status);</div><div class='del'>-		if (err)</div><div class='del'>-			goto out;</div><div class='del'>-		if (status &amp; (MV88E6390_SGMII_INT_LINK_DOWN |</div><div class='del'>-			      MV88E6390_SGMII_INT_LINK_UP)) {</div><div class='del'>-			ret = IRQ_HANDLED;</div><div class='del'>-			mv88e6390_serdes_irq_link_sgmii(chip, port-&gt;port, lane);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-out:</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='add'>+	if (mv88e6xxx_serdes_get_lane(chip, port) &lt; 0)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return ARRAY_SIZE(mv88e6390_serdes_regs) * sizeof(u16);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6390x_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p)</div><div class='ctx'> {</div><div class='add'>+	u16 *p = _p;</div><div class='ctx'> 	int lane;</div><div class='add'>+	u16 reg;</div><div class='ctx'> 	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='del'>-</div><div class='del'>-	if (lane == -ENODEV)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='add'>+	lane = mv88e6xxx_serdes_get_lane(chip, port);</div><div class='ctx'> 	if (lane &lt; 0)</div><div class='del'>-		return lane;</div><div class='del'>-</div><div class='del'>-	chip-&gt;ports[port].serdes_irq = irq_find_mapping(chip-&gt;g2_irq.domain,</div><div class='del'>-							port);</div><div class='del'>-	if (chip-&gt;ports[port].serdes_irq &lt; 0) {</div><div class='del'>-		dev_err(chip-&gt;dev, "Unable to map SERDES irq: %d\n",</div><div class='del'>-			chip-&gt;ports[port].serdes_irq);</div><div class='del'>-		return chip-&gt;ports[port].serdes_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Requesting the IRQ will trigger irq callbacks. So we cannot</div><div class='del'>-	 * hold the reg_lock.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	err = request_threaded_irq(chip-&gt;ports[port].serdes_irq, NULL,</div><div class='del'>-				   mv88e6390_serdes_thread_fn,</div><div class='del'>-				   IRQF_ONESHOT, "mv88e6xxx-serdes",</div><div class='del'>-				   &amp;chip-&gt;ports[port]);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(chip-&gt;dev, "Unable to request SERDES interrupt: %d\n",</div><div class='del'>-			err);</div><div class='del'>-		return err;</div><div class='add'>+	for (i = 0 ; i &lt; ARRAY_SIZE(mv88e6390_serdes_regs); i++) {</div><div class='add'>+		err = mv88e6390_serdes_read(chip, lane, MDIO_MMD_PHYXS,</div><div class='add'>+					    mv88e6390_serdes_regs[i], &amp;reg);</div><div class='add'>+		if (!err)</div><div class='add'>+			p[i] = reg;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return mv88e6390_serdes_irq_enable(chip, port, lane);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)</div><div class='del'>-{</div><div class='del'>-	if (port &lt; 9)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return mv88e6390x_serdes_irq_setup(chip, port);</div><div class='del'>-}</div><div class='add'>+static const int mv88e6352_serdes_p2p_to_reg[] = {</div><div class='add'>+	/* Index of value in microvolts corresponds to the register value */</div><div class='add'>+	14000, 112000, 210000, 308000, 406000, 504000, 602000, 700000,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+int mv88e6352_serdes_set_tx_amplitude(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				      int val)</div><div class='ctx'> {</div><div class='del'>-	int lane = mv88e6390x_serdes_get_lane(chip, port);</div><div class='del'>-</div><div class='del'>-	if (lane == -ENODEV)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (lane &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mv88e6390_serdes_irq_disable(chip, port, lane);</div><div class='del'>-</div><div class='del'>-	/* Freeing the IRQ will trigger irq callbacks. So we cannot</div><div class='del'>-	 * hold the reg_lock.</div><div class='del'>-	 */</div><div class='del'>-	mutex_unlock(&amp;chip-&gt;reg_lock);</div><div class='del'>-	free_irq(chip-&gt;ports[port].serdes_irq, &amp;chip-&gt;ports[port]);</div><div class='del'>-	mutex_lock(&amp;chip-&gt;reg_lock);</div><div class='del'>-</div><div class='del'>-	chip-&gt;ports[port].serdes_irq = 0;</div><div class='del'>-}</div><div class='add'>+	bool found = false;</div><div class='add'>+	u16 ctrl, reg;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)</div><div class='del'>-{</div><div class='del'>-	if (port &lt; 9)</div><div class='del'>-		return;</div><div class='add'>+	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);</div><div class='add'>+	if (err &lt;= 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	mv88e6390x_serdes_irq_free(chip, port);</div><div class='del'>-}</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(mv88e6352_serdes_p2p_to_reg); ++i) {</div><div class='add'>+		if (mv88e6352_serdes_p2p_to_reg[i] == val) {</div><div class='add'>+			reg = i;</div><div class='add'>+			found = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-int mv88e6341_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)</div><div class='del'>-{</div><div class='del'>-	u8 cmode = chip-&gt;ports[port].cmode;</div><div class='add'>+	if (!found)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (port != 5)</div><div class='del'>-		return 0;</div><div class='add'>+	err = mv88e6352_serdes_read(chip, MV88E6352_SERDES_SPEC_CTRL2, &amp;ctrl);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='del'>-	if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X ||</div><div class='del'>-	    cmode == MV88E6XXX_PORT_STS_CMODE_SGMII ||</div><div class='del'>-	    cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX)</div><div class='del'>-		return mv88e6390_serdes_power_sgmii(chip, MV88E6341_ADDR_SERDES,</div><div class='del'>-						    on);</div><div class='add'>+	ctrl &amp;= ~MV88E6352_SERDES_OUT_AMP_MASK;</div><div class='add'>+	ctrl |= reg;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return mv88e6352_serdes_write(chip, MV88E6352_SERDES_SPEC_CTRL2, ctrl);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6xxx/serdes.h<br/>index ff5b94439335..ad887d8601bc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/serdes.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/serdes.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/serdes.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/serdes.h</a></div><div class='hunk'>@@ -12,6 +12,8 @@</div><div class='ctx'> </div><div class='ctx'> #include "chip.h"</div><div class='ctx'> </div><div class='add'>+struct phylink_link_state;</div><div class='add'>+</div><div class='ctx'> #define MV88E6352_ADDR_SERDES		0x0f</div><div class='ctx'> #define MV88E6352_SERDES_PAGE_FIBER	0x01</div><div class='ctx'> #define MV88E6352_SERDES_IRQ		0x0b</div><div class='hunk'>@@ -27,8 +29,10 @@</div><div class='ctx'> #define MV88E6352_SERDES_INT_FIBRE_ENERGY	BIT(4)</div><div class='ctx'> #define MV88E6352_SERDES_INT_STATUS	0x13</div><div class='ctx'> </div><div class='add'>+#define MV88E6352_SERDES_SPEC_CTRL2	0x1a</div><div class='add'>+#define MV88E6352_SERDES_OUT_AMP_MASK		0x0007</div><div class='ctx'> </div><div class='del'>-#define MV88E6341_ADDR_SERDES		0x15</div><div class='add'>+#define MV88E6341_PORT5_LANE		0x15</div><div class='ctx'> </div><div class='ctx'> #define MV88E6390_PORT9_LANE0		0x09</div><div class='ctx'> #define MV88E6390_PORT9_LANE1		0x12</div><div class='hunk'>@@ -40,21 +44,25 @@</div><div class='ctx'> #define MV88E6390_PORT10_LANE3		0x17</div><div class='ctx'> </div><div class='ctx'> /* 10GBASE-R and 10GBASE-X4/X2 */</div><div class='del'>-#define MV88E6390_PCS_CONTROL_1		0x1000</div><div class='del'>-#define MV88E6390_PCS_CONTROL_1_RESET		BIT(15)</div><div class='del'>-#define MV88E6390_PCS_CONTROL_1_LOOPBACK	BIT(14)</div><div class='del'>-#define MV88E6390_PCS_CONTROL_1_SPEED		BIT(13)</div><div class='del'>-#define MV88E6390_PCS_CONTROL_1_PDOWN		BIT(11)</div><div class='add'>+#define MV88E6390_10G_CTRL1		(0x1000 + MDIO_CTRL1)</div><div class='add'>+#define MV88E6390_10G_STAT1		(0x1000 + MDIO_STAT1)</div><div class='add'>+#define MV88E6390_10G_INT_ENABLE	0x9001</div><div class='add'>+#define MV88E6390_10G_INT_LINK_DOWN	BIT(3)</div><div class='add'>+#define MV88E6390_10G_INT_LINK_UP	BIT(2)</div><div class='add'>+#define MV88E6390_10G_INT_STATUS	0x9003</div><div class='add'>+#define MV88E6393X_10G_INT_ENABLE	0x9000</div><div class='add'>+#define MV88E6393X_10G_INT_LINK_CHANGE	BIT(2)</div><div class='add'>+#define MV88E6393X_10G_INT_STATUS	0x9001</div><div class='add'>+</div><div class='add'>+/* USXGMII */</div><div class='add'>+#define MV88E6390_USXGMII_LP_STATUS       0xf0a2</div><div class='add'>+#define MV88E6390_USXGMII_PHY_STATUS      0xf0a6</div><div class='ctx'> </div><div class='ctx'> /* 1000BASE-X and SGMII */</div><div class='del'>-#define MV88E6390_SGMII_CONTROL		0x2000</div><div class='del'>-#define MV88E6390_SGMII_CONTROL_RESET		BIT(15)</div><div class='del'>-#define MV88E6390_SGMII_CONTROL_LOOPBACK	BIT(14)</div><div class='del'>-#define MV88E6390_SGMII_CONTROL_PDOWN		BIT(11)</div><div class='del'>-#define MV88E6390_SGMII_STATUS		0x2001</div><div class='del'>-#define MV88E6390_SGMII_STATUS_AN_DONE		BIT(5)</div><div class='del'>-#define MV88E6390_SGMII_STATUS_REMOTE_FAULT	BIT(4)</div><div class='del'>-#define MV88E6390_SGMII_STATUS_LINK		BIT(2)</div><div class='add'>+#define MV88E6390_SGMII_BMCR		(0x2000 + MII_BMCR)</div><div class='add'>+#define MV88E6390_SGMII_BMSR		(0x2000 + MII_BMSR)</div><div class='add'>+#define MV88E6390_SGMII_ADVERTISE	(0x2000 + MII_ADVERTISE)</div><div class='add'>+#define MV88E6390_SGMII_LPA		(0x2000 + MII_LPA)</div><div class='ctx'> #define MV88E6390_SGMII_INT_ENABLE	0xa001</div><div class='ctx'> #define MV88E6390_SGMII_INT_SPEED_CHANGE	BIT(14)</div><div class='ctx'> #define MV88E6390_SGMII_INT_DUPLEX_CHANGE	BIT(13)</div><div class='hunk'>@@ -73,27 +81,90 @@</div><div class='ctx'> #define MV88E6390_SGMII_PHY_STATUS_DUPLEX_FULL	BIT(13)</div><div class='ctx'> #define MV88E6390_SGMII_PHY_STATUS_SPD_DPL_VALID BIT(11)</div><div class='ctx'> #define MV88E6390_SGMII_PHY_STATUS_LINK		BIT(10)</div><div class='add'>+#define MV88E6390_SGMII_PHY_STATUS_TX_PAUSE	BIT(3)</div><div class='add'>+#define MV88E6390_SGMII_PHY_STATUS_RX_PAUSE	BIT(2)</div><div class='add'>+</div><div class='add'>+/* Packet generator pad packet checker */</div><div class='add'>+#define MV88E6390_PG_CONTROL		0xf010</div><div class='add'>+#define MV88E6390_PG_CONTROL_ENABLE_PC		BIT(0)</div><div class='add'>+</div><div class='add'>+#define MV88E6393X_PORT0_LANE			0x00</div><div class='add'>+#define MV88E6393X_PORT9_LANE			0x09</div><div class='add'>+#define MV88E6393X_PORT10_LANE			0x0a</div><div class='add'>+</div><div class='add'>+/* Port Operational Configuration */</div><div class='add'>+#define MV88E6393X_SERDES_POC			0xf002</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_1000BASEX	0x0000</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_2500BASEX	0x0001</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_SGMII_PHY	0x0002</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_SGMII_MAC	0x0003</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_5GBASER	0x0004</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_10GBASER	0x0005</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_USXGMII_PHY	0x0006</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_USXGMII_MAC	0x0007</div><div class='add'>+#define MV88E6393X_SERDES_POC_PCS_MASK		0x0007</div><div class='add'>+#define MV88E6393X_SERDES_POC_RESET		BIT(15)</div><div class='add'>+#define MV88E6393X_SERDES_POC_PDOWN		BIT(5)</div><div class='add'>+#define MV88E6393X_SERDES_POC_AN		BIT(3)</div><div class='add'>+#define MV88E6393X_SERDES_CTRL1			0xf003</div><div class='add'>+#define MV88E6393X_SERDES_CTRL1_TX_PDOWN	BIT(9)</div><div class='add'>+#define MV88E6393X_SERDES_CTRL1_RX_PDOWN	BIT(8)</div><div class='add'>+</div><div class='add'>+#define MV88E6393X_ERRATA_4_8_REG		0xF074</div><div class='add'>+#define MV88E6393X_ERRATA_4_8_BIT		BIT(14)</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_pcs_decode_state(struct device *dev, u16 bmsr, u16 lpa,</div><div class='add'>+			       u16 status, struct phylink_link_state *state);</div><div class='ctx'> </div><div class='add'>+int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);</div><div class='ctx'> int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-int mv88e6341_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);</div><div class='del'>-int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);</div><div class='del'>-int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);</div><div class='del'>-int mv88e6390x_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);</div><div class='del'>-int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-int mv88e6390x_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6393x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+unsigned int mv88e6352_serdes_irq_mapping(struct mv88e6xxx_chip *chip,</div><div class='add'>+					  int port);</div><div class='add'>+unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip,</div><div class='add'>+					  int port);</div><div class='ctx'> int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,</div><div class='del'>-				 int port, uint8_t *data);</div><div class='del'>-int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-			       uint64_t *data);</div><div class='del'>-int mv88e6390_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				int lane);</div><div class='del'>-int mv88e6390_serdes_irq_disable(struct mv88e6xxx_chip *chip, int port,</div><div class='del'>-				 int lane);</div><div class='del'>-int mv88e6352_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);</div><div class='del'>-void mv88e6352_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 uint8_t **data);</div><div class='add'>+size_t mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				  uint64_t *data);</div><div class='add'>+int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				 uint8_t **data);</div><div class='add'>+size_t mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				  uint64_t *data);</div><div class='add'>+</div><div class='add'>+int mv88e6352_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+void mv88e6352_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p);</div><div class='add'>+int mv88e6390_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port);</div><div class='add'>+void mv88e6390_serdes_get_regs(struct mv88e6xxx_chip *chip, int port, void *_p);</div><div class='add'>+</div><div class='add'>+int mv88e6352_serdes_set_tx_amplitude(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				      int val);</div><div class='add'>+</div><div class='add'>+/* Return the (first) SERDES lane address a port is using, -errno otherwise. */</div><div class='add'>+static inline int mv88e6xxx_serdes_get_lane(struct mv88e6xxx_chip *chip,</div><div class='add'>+					    int port)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;serdes_get_lane)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;serdes_get_lane(chip, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int</div><div class='add'>+mv88e6xxx_serdes_irq_mapping(struct mv88e6xxx_chip *chip, int port)</div><div class='add'>+{</div><div class='add'>+	if (!chip-&gt;info-&gt;ops-&gt;serdes_irq_mapping)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return chip-&gt;info-&gt;ops-&gt;serdes_irq_mapping(chip, port);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+extern const struct mv88e6xxx_pcs_ops mv88e6185_pcs_ops;</div><div class='add'>+extern const struct mv88e6xxx_pcs_ops mv88e6352_pcs_ops;</div><div class='add'>+extern const struct mv88e6xxx_pcs_ops mv88e6390_pcs_ops;</div><div class='add'>+extern const struct mv88e6xxx_pcs_ops mv88e6393x_pcs_ops;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/smi.c b/drivers/net/dsa/mv88e6xxx/smi.c<br/>index 92e9324f1fb9..a990271b7482 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/smi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/mv88e6xxx/smi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/smi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/smi.c</a></div><div class='hunk'>@@ -20,6 +20,10 @@</div><div class='ctx'>  * When ADDR is non-zero, the chip uses Multi-chip Addressing Mode, allowing</div><div class='ctx'>  * multiple devices to share the SMI interface. In this mode it responds to only</div><div class='ctx'>  * 2 registers, used to indirectly access the internal SMI devices.</div><div class='add'>+ *</div><div class='add'>+ * Some chips use a different scheme: Only the ADDR4 pin is used for</div><div class='add'>+ * configuration, and the device responds to 16 of the 32 SMI</div><div class='add'>+ * addresses, allowing two to coexist on the same SMI interface.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static int mv88e6xxx_smi_direct_read(struct mv88e6xxx_chip *chip,</div><div class='hunk'>@@ -51,17 +55,26 @@ static int mv88e6xxx_smi_direct_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> static int mv88e6xxx_smi_direct_wait(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 				     int dev, int reg, int bit, int val)</div><div class='ctx'> {</div><div class='add'>+	const unsigned long timeout = jiffies + msecs_to_jiffies(50);</div><div class='ctx'> 	u16 data;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 16; i++) {</div><div class='add'>+	/* Even if the initial poll takes longer than 50ms, always do</div><div class='add'>+	 * at least one more attempt.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; time_before(jiffies, timeout) || (i &lt; 2); i++) {</div><div class='ctx'> 		err = mv88e6xxx_smi_direct_read(chip, dev, reg, &amp;data);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='del'>-		if (!!(data &gt;&gt; bit) == !!val)</div><div class='add'>+		if (!!(data &amp; BIT(bit)) == !!val)</div><div class='ctx'> 			return 0;</div><div class='add'>+</div><div class='add'>+		if (i &lt; 2)</div><div class='add'>+			cpu_relax();</div><div class='add'>+		else</div><div class='add'>+			usleep_range(1000, 2000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='hunk'>@@ -72,6 +85,23 @@ static const struct mv88e6xxx_bus_ops mv88e6xxx_smi_direct_ops = {</div><div class='ctx'> 	.write = mv88e6xxx_smi_direct_write,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int mv88e6xxx_smi_dual_direct_read(struct mv88e6xxx_chip *chip,</div><div class='add'>+					  int dev, int reg, u16 *data)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_smi_direct_read(chip, chip-&gt;sw_addr + dev, reg, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_smi_dual_direct_write(struct mv88e6xxx_chip *chip,</div><div class='add'>+					   int dev, int reg, u16 data)</div><div class='add'>+{</div><div class='add'>+	return mv88e6xxx_smi_direct_write(chip, chip-&gt;sw_addr + dev, reg, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct mv88e6xxx_bus_ops mv88e6xxx_smi_dual_direct_ops = {</div><div class='add'>+	.read = mv88e6xxx_smi_dual_direct_read,</div><div class='add'>+	.write = mv88e6xxx_smi_dual_direct_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Offset 0x00: SMI Command Register</div><div class='ctx'>  * Offset 0x01: SMI Data Register</div><div class='ctx'>  */</div><div class='hunk'>@@ -81,11 +111,6 @@ static int mv88e6xxx_smi_indirect_read(struct mv88e6xxx_chip *chip,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_smi_direct_wait(chip, chip-&gt;sw_addr,</div><div class='del'>-					MV88E6XXX_SMI_CMD, 15, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	err = mv88e6xxx_smi_direct_write(chip, chip-&gt;sw_addr,</div><div class='ctx'> 					 MV88E6XXX_SMI_CMD,</div><div class='ctx'> 					 MV88E6XXX_SMI_CMD_BUSY |</div><div class='hunk'>@@ -109,11 +134,6 @@ static int mv88e6xxx_smi_indirect_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = mv88e6xxx_smi_direct_wait(chip, chip-&gt;sw_addr,</div><div class='del'>-					MV88E6XXX_SMI_CMD, 15, 0);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	err = mv88e6xxx_smi_direct_write(chip, chip-&gt;sw_addr,</div><div class='ctx'> 					 MV88E6XXX_SMI_DATA, data);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -132,15 +152,28 @@ static int mv88e6xxx_smi_indirect_write(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 					 MV88E6XXX_SMI_CMD, 15, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int mv88e6xxx_smi_indirect_init(struct mv88e6xxx_chip *chip)</div><div class='add'>+{</div><div class='add'>+	/* Ensure that the chip starts out in the ready state. As both</div><div class='add'>+	 * reads and writes always ensure this on return, they can</div><div class='add'>+	 * safely depend on the chip not being busy on entry.</div><div class='add'>+	 */</div><div class='add'>+	return mv88e6xxx_smi_direct_wait(chip, chip-&gt;sw_addr,</div><div class='add'>+					 MV88E6XXX_SMI_CMD, 15, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct mv88e6xxx_bus_ops mv88e6xxx_smi_indirect_ops = {</div><div class='ctx'> 	.read = mv88e6xxx_smi_indirect_read,</div><div class='ctx'> 	.write = mv88e6xxx_smi_indirect_write,</div><div class='add'>+	.init = mv88e6xxx_smi_indirect_init,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 		       struct mii_bus *bus, int sw_addr)</div><div class='ctx'> {</div><div class='del'>-	if (sw_addr == 0)</div><div class='add'>+	if (chip-&gt;info-&gt;dual_chip)</div><div class='add'>+		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_dual_direct_ops;</div><div class='add'>+	else if (sw_addr == 0)</div><div class='ctx'> 		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_direct_ops;</div><div class='ctx'> 	else if (chip-&gt;info-&gt;multi_chip)</div><div class='ctx'> 		chip-&gt;smi_ops = &amp;mv88e6xxx_smi_indirect_ops;</div><div class='hunk'>@@ -150,5 +183,8 @@ int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip,</div><div class='ctx'> 	chip-&gt;bus = bus;</div><div class='ctx'> 	chip-&gt;sw_addr = sw_addr;</div><div class='ctx'> </div><div class='add'>+	if (chip-&gt;smi_ops-&gt;init)</div><div class='add'>+		return chip-&gt;smi_ops-&gt;init(chip);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/switchdev.c b/drivers/net/dsa/mv88e6xxx/switchdev.c<br/>new file mode 100644<br/>index 000000000000..4c346a884fb2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/switchdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/switchdev.c</a></div><div class='hunk'>@@ -0,0 +1,83 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * switchdev.c</div><div class='add'>+ *</div><div class='add'>+ *	Authors:</div><div class='add'>+ *	Hans J. Schultz		&lt;netdev@kapio-technology.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include "chip.h"</div><div class='add'>+#include "global1.h"</div><div class='add'>+#include "switchdev.h"</div><div class='add'>+</div><div class='add'>+struct mv88e6xxx_fid_search_ctx {</div><div class='add'>+	u16 fid_search;</div><div class='add'>+	u16 vid_found;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __mv88e6xxx_find_vid(struct mv88e6xxx_chip *chip,</div><div class='add'>+				const struct mv88e6xxx_vtu_entry *entry,</div><div class='add'>+				void *priv)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_fid_search_ctx *ctx = priv;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;fid_search == entry-&gt;fid) {</div><div class='add'>+		ctx-&gt;vid_found = entry-&gt;vid;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int mv88e6xxx_find_vid(struct mv88e6xxx_chip *chip, u16 fid, u16 *vid)</div><div class='add'>+{</div><div class='add'>+	struct mv88e6xxx_fid_search_ctx ctx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ctx.fid_search = fid;</div><div class='add'>+	mv88e6xxx_reg_lock(chip);</div><div class='add'>+	err = mv88e6xxx_vtu_walk(chip, __mv88e6xxx_find_vid, &amp;ctx);</div><div class='add'>+	mv88e6xxx_reg_unlock(chip);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+	if (err == 1)</div><div class='add'>+		*vid = ctx.vid_found;</div><div class='add'>+	else</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_handle_miss_violation(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    struct mv88e6xxx_atu_entry *entry, u16 fid)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_fdb_info info = {</div><div class='add'>+		.addr = entry-&gt;mac,</div><div class='add'>+		.locked = true,</div><div class='add'>+	};</div><div class='add'>+	struct net_device *brport;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = mv88e6xxx_find_vid(chip, fid, &amp;vid);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	info.vid = vid;</div><div class='add'>+	dp = dsa_to_port(chip-&gt;ds, port);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	brport = dsa_port_to_bridge_port(dp);</div><div class='add'>+	if (!brport) {</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	err = call_switchdev_notifiers(SWITCHDEV_FDB_ADD_TO_BRIDGE,</div><div class='add'>+				       brport, &amp;info.info, NULL);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/switchdev.h b/drivers/net/dsa/mv88e6xxx/switchdev.h<br/>new file mode 100644<br/>index 000000000000..62214f9d62b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/switchdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/switchdev.h</a></div><div class='hunk'>@@ -0,0 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+ *</div><div class='add'>+ * switchdev.h</div><div class='add'>+ *</div><div class='add'>+ *	Authors:</div><div class='add'>+ *	Hans J. Schultz		&lt;netdev@kapio-technology.com&gt;</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MV88E6XXX_SWITCHDEV_H_</div><div class='add'>+#define _MV88E6XXX_SWITCHDEV_H_</div><div class='add'>+</div><div class='add'>+#include "chip.h"</div><div class='add'>+</div><div class='add'>+int mv88e6xxx_handle_miss_violation(struct mv88e6xxx_chip *chip, int port,</div><div class='add'>+				    struct mv88e6xxx_atu_entry *entry,</div><div class='add'>+				    u16 fid);</div><div class='add'>+</div><div class='add'>+#endif /* _MV88E6XXX_SWITCHDEV_H_ */</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/trace.c b/drivers/net/dsa/mv88e6xxx/trace.c<br/>new file mode 100644<br/>index 000000000000..7833cb50ca5d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/trace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/trace.c</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/* Copyright 2022 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define CREATE_TRACE_POINTS</div><div class='add'>+#include "trace.h"</div><div class='head'>diff --git a/drivers/net/dsa/mv88e6xxx/trace.h b/drivers/net/dsa/mv88e6xxx/trace.h<br/>new file mode 100644<br/>index 000000000000..5bd015b2b97a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/mv88e6xxx/trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/mv88e6xxx/trace.h</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* Copyright 2022 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#undef TRACE_SYSTEM</div><div class='add'>+#define TRACE_SYSTEM	mv88e6xxx</div><div class='add'>+</div><div class='add'>+#if !defined(_MV88E6XXX_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)</div><div class='add'>+#define _MV88E6XXX_TRACE_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/tracepoint.h&gt;</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(mv88e6xxx_atu_violation,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct device *dev, int spid, u16 portvec,</div><div class='add'>+		 const unsigned char *addr, u16 fid),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dev, spid, portvec, addr, fid),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(name, dev_name(dev))</div><div class='add'>+		__field(int, spid)</div><div class='add'>+		__field(u16, portvec)</div><div class='add'>+		__array(unsigned char, addr, ETH_ALEN)</div><div class='add'>+		__field(u16, fid)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(name);</div><div class='add'>+		__entry-&gt;spid = spid;</div><div class='add'>+		__entry-&gt;portvec = portvec;</div><div class='add'>+		memcpy(__entry-&gt;addr, addr, ETH_ALEN);</div><div class='add'>+		__entry-&gt;fid = fid;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("dev %s spid %d portvec 0x%x addr %pM fid %u",</div><div class='add'>+		  __get_str(name), __entry-&gt;spid, __entry-&gt;portvec,</div><div class='add'>+		  __entry-&gt;addr, __entry-&gt;fid)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(mv88e6xxx_atu_violation, mv88e6xxx_atu_member_violation,</div><div class='add'>+	     TP_PROTO(const struct device *dev, int spid, u16 portvec,</div><div class='add'>+		      const unsigned char *addr, u16 fid),</div><div class='add'>+	     TP_ARGS(dev, spid, portvec, addr, fid));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(mv88e6xxx_atu_violation, mv88e6xxx_atu_miss_violation,</div><div class='add'>+	     TP_PROTO(const struct device *dev, int spid, u16 portvec,</div><div class='add'>+		      const unsigned char *addr, u16 fid),</div><div class='add'>+	     TP_ARGS(dev, spid, portvec, addr, fid));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(mv88e6xxx_atu_violation, mv88e6xxx_atu_full_violation,</div><div class='add'>+	     TP_PROTO(const struct device *dev, int spid, u16 portvec,</div><div class='add'>+		      const unsigned char *addr, u16 fid),</div><div class='add'>+	     TP_ARGS(dev, spid, portvec, addr, fid));</div><div class='add'>+</div><div class='add'>+DECLARE_EVENT_CLASS(mv88e6xxx_vtu_violation,</div><div class='add'>+</div><div class='add'>+	TP_PROTO(const struct device *dev, int spid, u16 vid),</div><div class='add'>+</div><div class='add'>+	TP_ARGS(dev, spid, vid),</div><div class='add'>+</div><div class='add'>+	TP_STRUCT__entry(</div><div class='add'>+		__string(name, dev_name(dev))</div><div class='add'>+		__field(int, spid)</div><div class='add'>+		__field(u16, vid)</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_fast_assign(</div><div class='add'>+		__assign_str(name);</div><div class='add'>+		__entry-&gt;spid = spid;</div><div class='add'>+		__entry-&gt;vid = vid;</div><div class='add'>+	),</div><div class='add'>+</div><div class='add'>+	TP_printk("dev %s spid %d vid %u",</div><div class='add'>+		  __get_str(name), __entry-&gt;spid, __entry-&gt;vid)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(mv88e6xxx_vtu_violation, mv88e6xxx_vtu_member_violation,</div><div class='add'>+	     TP_PROTO(const struct device *dev, int spid, u16 vid),</div><div class='add'>+	     TP_ARGS(dev, spid, vid));</div><div class='add'>+</div><div class='add'>+DEFINE_EVENT(mv88e6xxx_vtu_violation, mv88e6xxx_vtu_miss_violation,</div><div class='add'>+	     TP_PROTO(const struct device *dev, int spid, u16 vid),</div><div class='add'>+	     TP_ARGS(dev, spid, vid));</div><div class='add'>+</div><div class='add'>+#endif /* _MV88E6XXX_TRACE_H */</div><div class='add'>+</div><div class='add'>+/* We don't want to use include/trace/events */</div><div class='add'>+#undef TRACE_INCLUDE_PATH</div><div class='add'>+#define TRACE_INCLUDE_PATH .</div><div class='add'>+#undef TRACE_INCLUDE_FILE</div><div class='add'>+#define TRACE_INCLUDE_FILE	trace</div><div class='add'>+/* This part must be outside protection */</div><div class='add'>+#include &lt;trace/define_trace.h&gt;</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig<br/>new file mode 100644<br/>index 000000000000..081e7a88ea02<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,64 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config NET_DSA_MSCC_FELIX_DSA_LIB</div><div class='add'>+	tristate</div><div class='add'>+	help</div><div class='add'>+	  This is an umbrella module for all network switches that are</div><div class='add'>+	  register-compatible with Ocelot and that perform I/O to their host</div><div class='add'>+	  CPU through an NPI (Node Processor Interface) Ethernet port.</div><div class='add'>+	  Its name comes from the first hardware chip to make use of it</div><div class='add'>+	  (VSC9959), code named Felix.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MSCC_OCELOT_EXT</div><div class='add'>+	tristate "Ocelot External Ethernet switch support"</div><div class='add'>+	depends on NET_DSA &amp;&amp; SPI</div><div class='add'>+	depends on NET_VENDOR_MICROSEMI</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select MDIO_MSCC_MIIM</div><div class='add'>+	select MFD_OCELOT</div><div class='add'>+	select MSCC_OCELOT_SWITCH_LIB</div><div class='add'>+	select NET_DSA_MSCC_FELIX_DSA_LIB</div><div class='add'>+	select NET_DSA_TAG_OCELOT_8021Q</div><div class='add'>+	select NET_DSA_TAG_OCELOT</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the VSC7511, VSC7512, VSC7513 and VSC7514 chips</div><div class='add'>+	  when controlled through SPI.</div><div class='add'>+</div><div class='add'>+	  The Ocelot switch family is a set of multi-port networking chips. All</div><div class='add'>+	  of these chips have the ability to be controlled externally through</div><div class='add'>+	  SPI or PCIe interfaces.</div><div class='add'>+</div><div class='add'>+	  Say "Y" here to enable external control to these chips.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MSCC_FELIX</div><div class='add'>+	tristate "Ocelot / Felix Ethernet switch support"</div><div class='add'>+	depends on NET_DSA &amp;&amp; PCI</div><div class='add'>+	depends on NET_VENDOR_MICROSEMI</div><div class='add'>+	depends on NET_VENDOR_FREESCALE</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	depends on NET_SCH_TAPRIO || NET_SCH_TAPRIO=n</div><div class='add'>+	select MSCC_OCELOT_SWITCH_LIB</div><div class='add'>+	select NET_DSA_MSCC_FELIX_DSA_LIB</div><div class='add'>+	select NET_DSA_TAG_OCELOT_8021Q</div><div class='add'>+	select NET_DSA_TAG_OCELOT</div><div class='add'>+	select FSL_ENETC_MDIO</div><div class='add'>+	select PCS_LYNX</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the VSC9959 (Felix) switch, which is embedded as</div><div class='add'>+	  a PCIe function of the NXP LS1028A ENETC RCiEP.</div><div class='add'>+</div><div class='add'>+config NET_DSA_MSCC_SEVILLE</div><div class='add'>+	tristate "Ocelot / Seville Ethernet switch support"</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+	depends on NET_VENDOR_MICROSEMI</div><div class='add'>+	depends on HAS_IOMEM</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select MDIO_MSCC_MIIM</div><div class='add'>+	select MSCC_OCELOT_SWITCH_LIB</div><div class='add'>+	select NET_DSA_MSCC_FELIX_DSA_LIB</div><div class='add'>+	select NET_DSA_TAG_OCELOT_8021Q</div><div class='add'>+	select NET_DSA_TAG_OCELOT</div><div class='add'>+	select PCS_LYNX</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the VSC9953 (Seville) switch, which is embedded</div><div class='add'>+	  as a platform device on the NXP T1040 SoC.</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/Makefile b/drivers/net/dsa/ocelot/Makefile<br/>new file mode 100644<br/>index 000000000000..ead868a293e3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-$(CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB) += mscc_felix_dsa_lib.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MSCC_FELIX) += mscc_felix.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MSCC_OCELOT_EXT) += mscc_ocelot_ext.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_MSCC_SEVILLE) += mscc_seville.o</div><div class='add'>+</div><div class='add'>+mscc_felix_dsa_lib-objs := felix.o</div><div class='add'>+mscc_felix-objs := felix_vsc9959.o</div><div class='add'>+mscc_ocelot_ext-objs := ocelot_ext.o</div><div class='add'>+mscc_seville-objs := seville_vsc9953.o</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c<br/>new file mode 100644<br/>index 000000000000..9e5ede932b42<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/felix.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/felix.c</a></div><div class='hunk'>@@ -0,0 +1,2463 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2019-2021 NXP</div><div class='add'>+ *</div><div class='add'>+ * This is an umbrella module for all network switches that are</div><div class='add'>+ * register-compatible with Ocelot and that perform I/O to their host CPU</div><div class='add'>+ * through an NPI (Node Processor Interface) Ethernet port.</div><div class='add'>+ */</div><div class='add'>+#include &lt;uapi/linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_vcap.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_qsys.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_sys.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_dev.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_ana.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_ptp.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+#include &lt;linux/dsa/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include "felix.h"</div><div class='add'>+</div><div class='add'>+/* Translate the DSA database API into the ocelot switch library API,</div><div class='add'>+ * which uses VID 0 for all ports that aren't part of a bridge,</div><div class='add'>+ * and expects the bridge_dev to be NULL in that case.</div><div class='add'>+ */</div><div class='add'>+static struct net_device *felix_classify_db(struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	switch (db.type) {</div><div class='add'>+	case DSA_DB_PORT:</div><div class='add'>+	case DSA_DB_LAG:</div><div class='add'>+		return NULL;</div><div class='add'>+	case DSA_DB_BRIDGE:</div><div class='add'>+		return db.bridge.dev;</div><div class='add'>+	default:</div><div class='add'>+		return ERR_PTR(-EOPNOTSUPP);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_cpu_port_for_conduit(struct dsa_switch *ds,</div><div class='add'>+				      struct net_device *conduit)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int lag;</div><div class='add'>+</div><div class='add'>+	if (netif_is_lag_master(conduit)) {</div><div class='add'>+		mutex_lock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+		lag = ocelot_bond_get_id(ocelot, conduit);</div><div class='add'>+		mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+		return lag;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpu_dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	return cpu_dp-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * felix_update_tag_8021q_rx_rule - Update VCAP ES0 tag_8021q rule after</div><div class='add'>+ *				    vlan_filtering change</div><div class='add'>+ * @outer_tagging_rule: Pointer to VCAP filter on which the update is performed</div><div class='add'>+ * @vlan_filtering: Current bridge VLAN filtering setting</div><div class='add'>+ *</div><div class='add'>+ * Source port identification for tag_8021q is done using VCAP ES0 rules on the</div><div class='add'>+ * CPU port(s). The ES0 tag B (inner tag from the packet) can be configured as</div><div class='add'>+ * either:</div><div class='add'>+ * - push_inner_tag=0: the inner tag is never pushed into the frame</div><div class='add'>+ *		       (and we lose info about the classified VLAN). This is</div><div class='add'>+ *		       good when the classified VLAN is a discardable quantity</div><div class='add'>+ *		       for the software RX path: it is either set to</div><div class='add'>+ *		       OCELOT_STANDALONE_PVID, or to</div><div class='add'>+ *		       ocelot_vlan_unaware_pvid(bridge).</div><div class='add'>+ * - push_inner_tag=1: the inner tag is always pushed. This is good when the</div><div class='add'>+ *		       classified VLAN is not a discardable quantity (the port</div><div class='add'>+ *		       is under a VLAN-aware bridge, and software needs to</div><div class='add'>+ *		       continue processing the packet in the same VLAN as the</div><div class='add'>+ *		       hardware).</div><div class='add'>+ * The point is that what is good for a VLAN-unaware port is not good for a</div><div class='add'>+ * VLAN-aware port, and vice versa. Thus, the RX tagging rules must be kept in</div><div class='add'>+ * sync with the VLAN filtering state of the port.</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+felix_update_tag_8021q_rx_rule(struct ocelot_vcap_filter *outer_tagging_rule,</div><div class='add'>+			       bool vlan_filtering)</div><div class='add'>+{</div><div class='add'>+	if (vlan_filtering)</div><div class='add'>+		outer_tagging_rule-&gt;action.push_inner_tag = OCELOT_ES0_TAG;</div><div class='add'>+	else</div><div class='add'>+		outer_tagging_rule-&gt;action.push_inner_tag = OCELOT_NO_ES0_TAG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set up VCAP ES0 rules for pushing a tag_8021q VLAN towards the CPU such that</div><div class='add'>+ * the tagger can perform RX source port identification.</div><div class='add'>+ */</div><div class='add'>+static int felix_tag_8021q_vlan_add_rx(struct dsa_switch *ds, int port,</div><div class='add'>+				       int upstream, u16 vid,</div><div class='add'>+				       bool vlan_filtering)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_vcap_filter *outer_tagging_rule;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	int key_length, err;</div><div class='add'>+</div><div class='add'>+	key_length = ocelot-&gt;vcap[VCAP_ES0].keys[VCAP_ES0_IGR_PORT].length;</div><div class='add'>+</div><div class='add'>+	outer_tagging_rule = kzalloc(sizeof(struct ocelot_vcap_filter),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+	if (!outer_tagging_rule)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cookie = OCELOT_VCAP_ES0_TAG_8021Q_RXVLAN(ocelot, port, upstream);</div><div class='add'>+</div><div class='add'>+	outer_tagging_rule-&gt;key_type = OCELOT_VCAP_KEY_ANY;</div><div class='add'>+	outer_tagging_rule-&gt;prio = 1;</div><div class='add'>+	outer_tagging_rule-&gt;id.cookie = cookie;</div><div class='add'>+	outer_tagging_rule-&gt;id.tc_offload = false;</div><div class='add'>+	outer_tagging_rule-&gt;block_id = VCAP_ES0;</div><div class='add'>+	outer_tagging_rule-&gt;type = OCELOT_VCAP_FILTER_OFFLOAD;</div><div class='add'>+	outer_tagging_rule-&gt;lookup = 0;</div><div class='add'>+	outer_tagging_rule-&gt;ingress_port.value = port;</div><div class='add'>+	outer_tagging_rule-&gt;ingress_port.mask = GENMASK(key_length - 1, 0);</div><div class='add'>+	outer_tagging_rule-&gt;egress_port.value = upstream;</div><div class='add'>+	outer_tagging_rule-&gt;egress_port.mask = GENMASK(key_length - 1, 0);</div><div class='add'>+	outer_tagging_rule-&gt;action.push_outer_tag = OCELOT_ES0_TAG;</div><div class='add'>+	outer_tagging_rule-&gt;action.tag_a_tpid_sel = OCELOT_TAG_TPID_SEL_8021AD;</div><div class='add'>+	outer_tagging_rule-&gt;action.tag_a_vid_sel = 1;</div><div class='add'>+	outer_tagging_rule-&gt;action.vid_a_val = vid;</div><div class='add'>+	felix_update_tag_8021q_rx_rule(outer_tagging_rule, vlan_filtering);</div><div class='add'>+	outer_tagging_rule-&gt;action.tag_b_tpid_sel = OCELOT_TAG_TPID_SEL_8021Q;</div><div class='add'>+	/* Leave TAG_B_VID_SEL at 0 (Classified VID + VID_B_VAL). Since we also</div><div class='add'>+	 * leave VID_B_VAL at 0, this makes ES0 tag B (the inner tag) equal to</div><div class='add'>+	 * the classified VID, which we need to see in the DSA tagger's receive</div><div class='add'>+	 * path. Note: the inner tag is only visible in the packet when pushed</div><div class='add'>+	 * (push_inner_tag == OCELOT_ES0_TAG).</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	err = ocelot_vcap_filter_add(ocelot, outer_tagging_rule, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		kfree(outer_tagging_rule);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_8021q_vlan_del_rx(struct dsa_switch *ds, int port,</div><div class='add'>+				       int upstream, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_vcap_filter *outer_tagging_rule;</div><div class='add'>+	struct ocelot_vcap_block *block_vcap_es0;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+</div><div class='add'>+	block_vcap_es0 = &amp;ocelot-&gt;block[VCAP_ES0];</div><div class='add'>+	cookie = OCELOT_VCAP_ES0_TAG_8021Q_RXVLAN(ocelot, port, upstream);</div><div class='add'>+</div><div class='add'>+	outer_tagging_rule = ocelot_vcap_block_find_filter_by_id(block_vcap_es0,</div><div class='add'>+								 cookie, false);</div><div class='add'>+	if (!outer_tagging_rule)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return ocelot_vcap_filter_del(ocelot, outer_tagging_rule);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Set up VCAP IS1 rules for stripping the tag_8021q VLAN on TX and VCAP IS2</div><div class='add'>+ * rules for steering those tagged packets towards the correct destination port</div><div class='add'>+ */</div><div class='add'>+static int felix_tag_8021q_vlan_add_tx(struct dsa_switch *ds, int port,</div><div class='add'>+				       u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_vcap_filter *untagging_rule, *redirect_rule;</div><div class='add'>+	unsigned long cpu_ports = dsa_cpu_ports(ds);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	untagging_rule = kzalloc(sizeof(struct ocelot_vcap_filter), GFP_KERNEL);</div><div class='add'>+	if (!untagging_rule)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	redirect_rule = kzalloc(sizeof(struct ocelot_vcap_filter), GFP_KERNEL);</div><div class='add'>+	if (!redirect_rule) {</div><div class='add'>+		kfree(untagging_rule);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cookie = OCELOT_VCAP_IS1_TAG_8021Q_TXVLAN(ocelot, port);</div><div class='add'>+</div><div class='add'>+	untagging_rule-&gt;key_type = OCELOT_VCAP_KEY_ANY;</div><div class='add'>+	untagging_rule-&gt;ingress_port_mask = cpu_ports;</div><div class='add'>+	untagging_rule-&gt;vlan.vid.value = vid;</div><div class='add'>+	untagging_rule-&gt;vlan.vid.mask = VLAN_VID_MASK;</div><div class='add'>+	untagging_rule-&gt;prio = 1;</div><div class='add'>+	untagging_rule-&gt;id.cookie = cookie;</div><div class='add'>+	untagging_rule-&gt;id.tc_offload = false;</div><div class='add'>+	untagging_rule-&gt;block_id = VCAP_IS1;</div><div class='add'>+	untagging_rule-&gt;type = OCELOT_VCAP_FILTER_OFFLOAD;</div><div class='add'>+	untagging_rule-&gt;lookup = 0;</div><div class='add'>+	untagging_rule-&gt;action.vlan_pop_cnt_ena = true;</div><div class='add'>+	untagging_rule-&gt;action.vlan_pop_cnt = 1;</div><div class='add'>+	untagging_rule-&gt;action.pag_override_mask = 0xff;</div><div class='add'>+	untagging_rule-&gt;action.pag_val = port;</div><div class='add'>+</div><div class='add'>+	err = ocelot_vcap_filter_add(ocelot, untagging_rule, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(untagging_rule);</div><div class='add'>+		kfree(redirect_rule);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cookie = OCELOT_VCAP_IS2_TAG_8021Q_TXVLAN(ocelot, port);</div><div class='add'>+</div><div class='add'>+	redirect_rule-&gt;key_type = OCELOT_VCAP_KEY_ANY;</div><div class='add'>+	redirect_rule-&gt;ingress_port_mask = cpu_ports;</div><div class='add'>+	redirect_rule-&gt;pag = port;</div><div class='add'>+	redirect_rule-&gt;prio = 1;</div><div class='add'>+	redirect_rule-&gt;id.cookie = cookie;</div><div class='add'>+	redirect_rule-&gt;id.tc_offload = false;</div><div class='add'>+	redirect_rule-&gt;block_id = VCAP_IS2;</div><div class='add'>+	redirect_rule-&gt;type = OCELOT_VCAP_FILTER_OFFLOAD;</div><div class='add'>+	redirect_rule-&gt;lookup = 0;</div><div class='add'>+	redirect_rule-&gt;action.mask_mode = OCELOT_MASK_MODE_REDIRECT;</div><div class='add'>+	redirect_rule-&gt;action.port_mask = BIT(port);</div><div class='add'>+</div><div class='add'>+	err = ocelot_vcap_filter_add(ocelot, redirect_rule, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		ocelot_vcap_filter_del(ocelot, untagging_rule);</div><div class='add'>+		kfree(redirect_rule);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_8021q_vlan_del_tx(struct dsa_switch *ds, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_vcap_filter *untagging_rule, *redirect_rule;</div><div class='add'>+	struct ocelot_vcap_block *block_vcap_is1;</div><div class='add'>+	struct ocelot_vcap_block *block_vcap_is2;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	block_vcap_is1 = &amp;ocelot-&gt;block[VCAP_IS1];</div><div class='add'>+	block_vcap_is2 = &amp;ocelot-&gt;block[VCAP_IS2];</div><div class='add'>+</div><div class='add'>+	cookie = OCELOT_VCAP_IS1_TAG_8021Q_TXVLAN(ocelot, port);</div><div class='add'>+	untagging_rule = ocelot_vcap_block_find_filter_by_id(block_vcap_is1,</div><div class='add'>+							     cookie, false);</div><div class='add'>+	if (!untagging_rule)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = ocelot_vcap_filter_del(ocelot, untagging_rule);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cookie = OCELOT_VCAP_IS2_TAG_8021Q_TXVLAN(ocelot, port);</div><div class='add'>+	redirect_rule = ocelot_vcap_block_find_filter_by_id(block_vcap_is2,</div><div class='add'>+							    cookie, false);</div><div class='add'>+	if (!redirect_rule)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	return ocelot_vcap_filter_del(ocelot, redirect_rule);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_8021q_vlan_add(struct dsa_switch *ds, int port, u16 vid,</div><div class='add'>+				    u16 flags)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* tag_8021q.c assumes we are implementing this via port VLAN</div><div class='add'>+	 * membership, which we aren't. So we don't need to add any VCAP filter</div><div class='add'>+	 * for the CPU port.</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		err = felix_tag_8021q_vlan_add_rx(ds, port, cpu_dp-&gt;index, vid,</div><div class='add'>+						  dsa_port_is_vlan_filtering(dp));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = felix_tag_8021q_vlan_add_tx(ds, port, vid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto add_tx_failed;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+add_tx_failed:</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds)</div><div class='add'>+		felix_tag_8021q_vlan_del_rx(ds, port, cpu_dp-&gt;index, vid);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_8021q_vlan_del(struct dsa_switch *ds, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		err = felix_tag_8021q_vlan_del_rx(ds, port, cpu_dp-&gt;index, vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = felix_tag_8021q_vlan_del_tx(ds, port, vid);</div><div class='add'>+	if (err)</div><div class='add'>+		goto del_tx_failed;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+del_tx_failed:</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds)</div><div class='add'>+		felix_tag_8021q_vlan_add_rx(ds, port, cpu_dp-&gt;index, vid,</div><div class='add'>+					    dsa_port_is_vlan_filtering(dp));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_update_tag_8021q_rx_rules(struct dsa_switch *ds, int port,</div><div class='add'>+					   bool vlan_filtering)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_vcap_filter *outer_tagging_rule;</div><div class='add'>+	struct ocelot_vcap_block *block_vcap_es0;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	block_vcap_es0 = &amp;ocelot-&gt;block[VCAP_ES0];</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		cookie = OCELOT_VCAP_ES0_TAG_8021Q_RXVLAN(ocelot, port,</div><div class='add'>+							  cpu_dp-&gt;index);</div><div class='add'>+</div><div class='add'>+		outer_tagging_rule = ocelot_vcap_block_find_filter_by_id(block_vcap_es0,</div><div class='add'>+									 cookie, false);</div><div class='add'>+</div><div class='add'>+		felix_update_tag_8021q_rx_rule(outer_tagging_rule, vlan_filtering);</div><div class='add'>+</div><div class='add'>+		err = ocelot_vcap_filter_replace(ocelot, outer_tagging_rule);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_trap_get_cpu_port(struct dsa_switch *ds,</div><div class='add'>+				   const struct ocelot_vcap_filter *trap)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int first_port;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!trap-&gt;ingress_port_mask))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	first_port = __ffs(trap-&gt;ingress_port_mask);</div><div class='add'>+	dp = dsa_to_port(ds, first_port);</div><div class='add'>+</div><div class='add'>+	return dp-&gt;cpu_dp-&gt;index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* On switches with no extraction IRQ wired, trapped packets need to be</div><div class='add'>+ * replicated over Ethernet as well, otherwise we'd get no notification of</div><div class='add'>+ * their arrival when using the ocelot-8021q tagging protocol.</div><div class='add'>+ */</div><div class='add'>+static int felix_update_trapping_destinations(struct dsa_switch *ds,</div><div class='add'>+					      bool using_tag_8021q)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct ocelot_vcap_block *block_vcap_is2;</div><div class='add'>+	struct ocelot_vcap_filter *trap;</div><div class='add'>+	enum ocelot_mask_mode mask_mode;</div><div class='add'>+	unsigned long port_mask;</div><div class='add'>+	bool cpu_copy_ena;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!felix-&gt;info-&gt;quirk_no_xtr_irq)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* We are sure that "cpu" was found, otherwise</div><div class='add'>+	 * dsa_tree_setup_default_cpu() would have failed earlier.</div><div class='add'>+	 */</div><div class='add'>+	block_vcap_is2 = &amp;ocelot-&gt;block[VCAP_IS2];</div><div class='add'>+</div><div class='add'>+	/* Make sure all traps are set up for that destination */</div><div class='add'>+	list_for_each_entry(trap, &amp;block_vcap_is2-&gt;rules, list) {</div><div class='add'>+		if (!trap-&gt;is_trap)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Figure out the current trapping destination */</div><div class='add'>+		if (using_tag_8021q) {</div><div class='add'>+			/* Redirect to the tag_8021q CPU port. If timestamps</div><div class='add'>+			 * are necessary, also copy trapped packets to the CPU</div><div class='add'>+			 * port module.</div><div class='add'>+			 */</div><div class='add'>+			mask_mode = OCELOT_MASK_MODE_REDIRECT;</div><div class='add'>+			port_mask = BIT(felix_trap_get_cpu_port(ds, trap));</div><div class='add'>+			cpu_copy_ena = !!trap-&gt;take_ts;</div><div class='add'>+		} else {</div><div class='add'>+			/* Trap packets only to the CPU port module, which is</div><div class='add'>+			 * redirected to the NPI port (the DSA CPU port)</div><div class='add'>+			 */</div><div class='add'>+			mask_mode = OCELOT_MASK_MODE_PERMIT_DENY;</div><div class='add'>+			port_mask = 0;</div><div class='add'>+			cpu_copy_ena = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (trap-&gt;action.mask_mode == mask_mode &amp;&amp;</div><div class='add'>+		    trap-&gt;action.port_mask == port_mask &amp;&amp;</div><div class='add'>+		    trap-&gt;action.cpu_copy_ena == cpu_copy_ena)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		trap-&gt;action.mask_mode = mask_mode;</div><div class='add'>+		trap-&gt;action.port_mask = port_mask;</div><div class='add'>+		trap-&gt;action.cpu_copy_ena = cpu_copy_ena;</div><div class='add'>+</div><div class='add'>+		err = ocelot_vcap_filter_replace(ocelot, trap);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The CPU port module is connected to the Node Processor Interface (NPI). This</div><div class='add'>+ * is the mode through which frames can be injected from and extracted to an</div><div class='add'>+ * external CPU, over Ethernet. In NXP SoCs, the "external CPU" is the ARM CPU</div><div class='add'>+ * running Linux, and this forms a DSA setup together with the enetc or fman</div><div class='add'>+ * DSA conduit.</div><div class='add'>+ */</div><div class='add'>+static void felix_npi_port_init(struct ocelot *ocelot, int port)</div><div class='add'>+{</div><div class='add'>+	ocelot-&gt;npi = port;</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot, QSYS_EXT_CPU_CFG_EXT_CPUQ_MSK_M |</div><div class='add'>+		     QSYS_EXT_CPU_CFG_EXT_CPU_PORT(port),</div><div class='add'>+		     QSYS_EXT_CPU_CFG);</div><div class='add'>+</div><div class='add'>+	/* NPI port Injection/Extraction configuration */</div><div class='add'>+	ocelot_fields_write(ocelot, port, SYS_PORT_MODE_INCL_XTR_HDR,</div><div class='add'>+			    ocelot-&gt;npi_xtr_prefix);</div><div class='add'>+	ocelot_fields_write(ocelot, port, SYS_PORT_MODE_INCL_INJ_HDR,</div><div class='add'>+			    ocelot-&gt;npi_inj_prefix);</div><div class='add'>+</div><div class='add'>+	/* Disable transmission of pause frames */</div><div class='add'>+	ocelot_fields_write(ocelot, port, SYS_PAUSE_CFG_PAUSE_ENA, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_npi_port_deinit(struct ocelot *ocelot, int port)</div><div class='add'>+{</div><div class='add'>+	/* Restore hardware defaults */</div><div class='add'>+	int unused_port = ocelot-&gt;num_phys_ports + 2;</div><div class='add'>+</div><div class='add'>+	ocelot-&gt;npi = -1;</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot, QSYS_EXT_CPU_CFG_EXT_CPU_PORT(unused_port),</div><div class='add'>+		     QSYS_EXT_CPU_CFG);</div><div class='add'>+</div><div class='add'>+	ocelot_fields_write(ocelot, port, SYS_PORT_MODE_INCL_XTR_HDR,</div><div class='add'>+			    OCELOT_TAG_PREFIX_DISABLED);</div><div class='add'>+	ocelot_fields_write(ocelot, port, SYS_PORT_MODE_INCL_INJ_HDR,</div><div class='add'>+			    OCELOT_TAG_PREFIX_DISABLED);</div><div class='add'>+</div><div class='add'>+	/* Enable transmission of pause frames */</div><div class='add'>+	ocelot_fields_write(ocelot, port, SYS_PAUSE_CFG_PAUSE_ENA, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_npi_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp, *first_cpu_dp = NULL;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds) {</div><div class='add'>+		if (first_cpu_dp &amp;&amp; dp-&gt;cpu_dp != first_cpu_dp) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Multiple NPI ports not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		first_cpu_dp = dp-&gt;cpu_dp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!first_cpu_dp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	felix_npi_port_init(ocelot, first_cpu_dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_tag_npi_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	felix_npi_port_deinit(ocelot, ocelot-&gt;npi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long felix_tag_npi_get_host_fwd_mask(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return BIT(ocelot-&gt;num_phys_ports);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_npi_change_conduit(struct dsa_switch *ds, int port,</div><div class='add'>+					struct net_device *conduit,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port), *other_dp;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (netif_is_lag_master(conduit)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "LAG DSA conduit only supported using ocelot-8021q");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Changing the NPI port breaks user ports still assigned to the old</div><div class='add'>+	 * one, so only allow it while they're down, and don't allow them to</div><div class='add'>+	 * come back up until they're all changed to the new one.</div><div class='add'>+	 */</div><div class='add'>+	dsa_switch_for_each_user_port(other_dp, ds) {</div><div class='add'>+		struct net_device *user = other_dp-&gt;user;</div><div class='add'>+</div><div class='add'>+		if (other_dp != dp &amp;&amp; (user-&gt;flags &amp; IFF_UP) &amp;&amp;</div><div class='add'>+		    dsa_port_to_conduit(other_dp) != conduit) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Cannot change while old conduit still has users");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	felix_npi_port_deinit(ocelot, ocelot-&gt;npi);</div><div class='add'>+	felix_npi_port_init(ocelot, felix_cpu_port_for_conduit(ds, conduit));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Alternatively to using the NPI functionality, that same hardware MAC</div><div class='add'>+ * connected internally to the enetc or fman DSA conduit can be configured to</div><div class='add'>+ * use the software-defined tag_8021q frame format. As far as the hardware is</div><div class='add'>+ * concerned, it thinks it is a "dumb switch" - the queues of the CPU port</div><div class='add'>+ * module are now disconnected from it, but can still be accessed through</div><div class='add'>+ * register-based MMIO.</div><div class='add'>+ */</div><div class='add'>+static const struct felix_tag_proto_ops felix_tag_npi_proto_ops = {</div><div class='add'>+	.setup			= felix_tag_npi_setup,</div><div class='add'>+	.teardown		= felix_tag_npi_teardown,</div><div class='add'>+	.get_host_fwd_mask	= felix_tag_npi_get_host_fwd_mask,</div><div class='add'>+	.change_conduit		= felix_tag_npi_change_conduit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int felix_tag_8021q_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dsa_tag_8021q_register(ds, htons(ETH_P_8021AD));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds)</div><div class='add'>+		ocelot_port_setup_dsa_8021q_cpu(ocelot, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds)</div><div class='add'>+		ocelot_port_assign_dsa_8021q_cpu(ocelot, dp-&gt;index,</div><div class='add'>+						 dp-&gt;cpu_dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_available_port(dp, ds)</div><div class='add'>+		/* This overwrites ocelot_init():</div><div class='add'>+		 * Do not forward BPDU frames to the CPU port module,</div><div class='add'>+		 * for 2 reasons:</div><div class='add'>+		 * - When these packets are injected from the tag_8021q</div><div class='add'>+		 *   CPU port, we want them to go out, not loop back</div><div class='add'>+		 *   into the system.</div><div class='add'>+		 * - STP traffic ingressing on a user port should go to</div><div class='add'>+		 *   the tag_8021q CPU port, not to the hardware CPU</div><div class='add'>+		 *   port module.</div><div class='add'>+		 */</div><div class='add'>+		ocelot_write_gix(ocelot,</div><div class='add'>+				 ANA_PORT_CPU_FWD_BPDU_CFG_BPDU_REDIR_ENA(0),</div><div class='add'>+				 ANA_PORT_CPU_FWD_BPDU_CFG, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	/* The ownership of the CPU port module's queues might have just been</div><div class='add'>+	 * transferred to the tag_8021q tagger from the NPI-based tagger.</div><div class='add'>+	 * So there might still be all sorts of crap in the queues. On the</div><div class='add'>+	 * other hand, the MMIO-based matching of PTP frames is very brittle,</div><div class='add'>+	 * so we need to be careful that there are no extra frames to be</div><div class='add'>+	 * dequeued over MMIO, since we would never know to discard them.</div><div class='add'>+	 */</div><div class='add'>+	ocelot_lock_xtr_grp_bh(ocelot, 0);</div><div class='add'>+	ocelot_drain_cpu_queue(ocelot, 0);</div><div class='add'>+	ocelot_unlock_xtr_grp_bh(ocelot, 0);</div><div class='add'>+</div><div class='add'>+	/* Problem: when using push_inner_tag=1 for ES0 tag B, we lose info</div><div class='add'>+	 * about whether the received packets were VLAN-tagged on the wire,</div><div class='add'>+	 * since they are always tagged on egress towards the CPU port.</div><div class='add'>+	 *</div><div class='add'>+	 * Since using push_inner_tag=1 is unavoidable for VLAN-aware bridges,</div><div class='add'>+	 * we must work around the fallout by untagging in software to make</div><div class='add'>+	 * untagged reception work more or less as expected.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;untag_vlan_aware_bridge_pvid = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_tag_8021q_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_available_port(dp, ds)</div><div class='add'>+		/* Restore the logic from ocelot_init:</div><div class='add'>+		 * do not forward BPDU frames to the front ports.</div><div class='add'>+		 */</div><div class='add'>+		ocelot_write_gix(ocelot,</div><div class='add'>+				 ANA_PORT_CPU_FWD_BPDU_CFG_BPDU_REDIR_ENA(0xffff),</div><div class='add'>+				 ANA_PORT_CPU_FWD_BPDU_CFG,</div><div class='add'>+				 dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds)</div><div class='add'>+		ocelot_port_unassign_dsa_8021q_cpu(ocelot, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds)</div><div class='add'>+		ocelot_port_teardown_dsa_8021q_cpu(ocelot, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	dsa_tag_8021q_unregister(ds);</div><div class='add'>+</div><div class='add'>+	ds-&gt;untag_vlan_aware_bridge_pvid = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long felix_tag_8021q_get_host_fwd_mask(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return dsa_cpu_ports(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_tag_8021q_change_conduit(struct dsa_switch *ds, int port,</div><div class='add'>+					  struct net_device *conduit,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int cpu = felix_cpu_port_for_conduit(ds, conduit);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_unassign_dsa_8021q_cpu(ocelot, port);</div><div class='add'>+	ocelot_port_assign_dsa_8021q_cpu(ocelot, port, cpu);</div><div class='add'>+</div><div class='add'>+	return felix_update_trapping_destinations(ds, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct felix_tag_proto_ops felix_tag_8021q_proto_ops = {</div><div class='add'>+	.setup			= felix_tag_8021q_setup,</div><div class='add'>+	.teardown		= felix_tag_8021q_teardown,</div><div class='add'>+	.get_host_fwd_mask	= felix_tag_8021q_get_host_fwd_mask,</div><div class='add'>+	.change_conduit		= felix_tag_8021q_change_conduit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void felix_set_host_flood(struct dsa_switch *ds, unsigned long mask,</div><div class='add'>+				 bool uc, bool mc, bool bc)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	unsigned long val;</div><div class='add'>+</div><div class='add'>+	val = uc ? mask : 0;</div><div class='add'>+	ocelot_rmw_rix(ocelot, val, mask, ANA_PGID_PGID, PGID_UC);</div><div class='add'>+</div><div class='add'>+	val = mc ? mask : 0;</div><div class='add'>+	ocelot_rmw_rix(ocelot, val, mask, ANA_PGID_PGID, PGID_MC);</div><div class='add'>+	ocelot_rmw_rix(ocelot, val, mask, ANA_PGID_PGID, PGID_MCIPV4);</div><div class='add'>+	ocelot_rmw_rix(ocelot, val, mask, ANA_PGID_PGID, PGID_MCIPV6);</div><div class='add'>+</div><div class='add'>+	val = bc ? mask : 0;</div><div class='add'>+	ocelot_rmw_rix(ocelot, val, mask, ANA_PGID_PGID, PGID_BC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+felix_migrate_host_flood(struct dsa_switch *ds,</div><div class='add'>+			 const struct felix_tag_proto_ops *proto_ops,</div><div class='add'>+			 const struct felix_tag_proto_ops *old_proto_ops)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	unsigned long mask;</div><div class='add'>+</div><div class='add'>+	if (old_proto_ops) {</div><div class='add'>+		mask = old_proto_ops-&gt;get_host_fwd_mask(ds);</div><div class='add'>+		felix_set_host_flood(ds, mask, false, false, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask = proto_ops-&gt;get_host_fwd_mask(ds);</div><div class='add'>+	felix_set_host_flood(ds, mask, !!felix-&gt;host_flood_uc_mask,</div><div class='add'>+			     !!felix-&gt;host_flood_mc_mask, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_migrate_mdbs(struct dsa_switch *ds,</div><div class='add'>+			      const struct felix_tag_proto_ops *proto_ops,</div><div class='add'>+			      const struct felix_tag_proto_ops *old_proto_ops)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	unsigned long from, to;</div><div class='add'>+</div><div class='add'>+	if (!old_proto_ops)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	from = old_proto_ops-&gt;get_host_fwd_mask(ds);</div><div class='add'>+	to = proto_ops-&gt;get_host_fwd_mask(ds);</div><div class='add'>+</div><div class='add'>+	return ocelot_migrate_mdbs(ocelot, from, to);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Configure the shared hardware resources for a transition between</div><div class='add'>+ * @old_proto_ops and @proto_ops.</div><div class='add'>+ * Manual migration is needed because as far as DSA is concerned, no change of</div><div class='add'>+ * the CPU port is taking place here, just of the tagging protocol.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+felix_tag_proto_setup_shared(struct dsa_switch *ds,</div><div class='add'>+			     const struct felix_tag_proto_ops *proto_ops,</div><div class='add'>+			     const struct felix_tag_proto_ops *old_proto_ops)</div><div class='add'>+{</div><div class='add'>+	bool using_tag_8021q = (proto_ops == &amp;felix_tag_8021q_proto_ops);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = felix_migrate_mdbs(ds, proto_ops, old_proto_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	felix_update_trapping_destinations(ds, using_tag_8021q);</div><div class='add'>+</div><div class='add'>+	felix_migrate_host_flood(ds, proto_ops, old_proto_ops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This always leaves the switch in a consistent state, because although the</div><div class='add'>+ * tag_8021q setup can fail, the NPI setup can't. So either the change is made,</div><div class='add'>+ * or the restoration is guaranteed to work.</div><div class='add'>+ */</div><div class='add'>+static int felix_change_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+				     enum dsa_tag_protocol proto)</div><div class='add'>+{</div><div class='add'>+	const struct felix_tag_proto_ops *old_proto_ops, *proto_ops;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case DSA_TAG_PROTO_SEVILLE:</div><div class='add'>+	case DSA_TAG_PROTO_OCELOT:</div><div class='add'>+		proto_ops = &amp;felix_tag_npi_proto_ops;</div><div class='add'>+		break;</div><div class='add'>+	case DSA_TAG_PROTO_OCELOT_8021Q:</div><div class='add'>+		proto_ops = &amp;felix_tag_8021q_proto_ops;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	old_proto_ops = felix-&gt;tag_proto_ops;</div><div class='add'>+</div><div class='add'>+	if (proto_ops == old_proto_ops)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = proto_ops-&gt;setup(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		goto setup_failed;</div><div class='add'>+</div><div class='add'>+	err = felix_tag_proto_setup_shared(ds, proto_ops, old_proto_ops);</div><div class='add'>+	if (err)</div><div class='add'>+		goto setup_shared_failed;</div><div class='add'>+</div><div class='add'>+	if (old_proto_ops)</div><div class='add'>+		old_proto_ops-&gt;teardown(ds);</div><div class='add'>+</div><div class='add'>+	felix-&gt;tag_proto_ops = proto_ops;</div><div class='add'>+	felix-&gt;tag_proto = proto;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+setup_shared_failed:</div><div class='add'>+	proto_ops-&gt;teardown(ds);</div><div class='add'>+setup_failed:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol felix_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						    int port,</div><div class='add'>+						    enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	return felix-&gt;tag_proto;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_port_set_host_flood(struct dsa_switch *ds, int port,</div><div class='add'>+				      bool uc, bool mc)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	unsigned long mask;</div><div class='add'>+</div><div class='add'>+	if (uc)</div><div class='add'>+		felix-&gt;host_flood_uc_mask |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		felix-&gt;host_flood_uc_mask &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	if (mc)</div><div class='add'>+		felix-&gt;host_flood_mc_mask |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		felix-&gt;host_flood_mc_mask &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	mask = felix-&gt;tag_proto_ops-&gt;get_host_fwd_mask(ds);</div><div class='add'>+	felix_set_host_flood(ds, mask, !!felix-&gt;host_flood_uc_mask,</div><div class='add'>+			     !!felix-&gt;host_flood_mc_mask, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_change_conduit(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct net_device *conduit,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	return felix-&gt;tag_proto_ops-&gt;change_conduit(ds, port, conduit, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_set_ageing_time(struct dsa_switch *ds,</div><div class='add'>+				 unsigned int ageing_time)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_set_ageing_time(ocelot, ageing_time);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ocelot_mact_flush(ocelot, port);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(ds-&gt;dev, "Flushing MAC table on port %d returned %pe\n",</div><div class='add'>+			port, ERR_PTR(err));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			  dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_fdb_dump(ocelot, port, cb, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			 const unsigned char *addr, u16 vid,</div><div class='add'>+			 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = felix_classify_db(db);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bridge_dev))</div><div class='add'>+		return PTR_ERR(bridge_dev);</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(dp) &amp;&amp; !bridge_dev &amp;&amp;</div><div class='add'>+	    dsa_fdb_present_in_other_db(ds, port, addr, vid, db))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(dp))</div><div class='add'>+		port = PGID_CPU;</div><div class='add'>+</div><div class='add'>+	return ocelot_fdb_add(ocelot, port, addr, vid, bridge_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			 const unsigned char *addr, u16 vid,</div><div class='add'>+			 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = felix_classify_db(db);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bridge_dev))</div><div class='add'>+		return PTR_ERR(bridge_dev);</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(dp) &amp;&amp; !bridge_dev &amp;&amp;</div><div class='add'>+	    dsa_fdb_present_in_other_db(ds, port, addr, vid, db))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(dp))</div><div class='add'>+		port = PGID_CPU;</div><div class='add'>+</div><div class='add'>+	return ocelot_fdb_del(ocelot, port, addr, vid, bridge_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_lag_fdb_add(struct dsa_switch *ds, struct dsa_lag lag,</div><div class='add'>+			     const unsigned char *addr, u16 vid,</div><div class='add'>+			     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = felix_classify_db(db);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bridge_dev))</div><div class='add'>+		return PTR_ERR(bridge_dev);</div><div class='add'>+</div><div class='add'>+	return ocelot_lag_fdb_add(ocelot, lag.dev, addr, vid, bridge_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_lag_fdb_del(struct dsa_switch *ds, struct dsa_lag lag,</div><div class='add'>+			     const unsigned char *addr, u16 vid,</div><div class='add'>+			     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = felix_classify_db(db);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bridge_dev))</div><div class='add'>+		return PTR_ERR(bridge_dev);</div><div class='add'>+</div><div class='add'>+	return ocelot_lag_fdb_del(ocelot, lag.dev, addr, vid, bridge_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			 const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = felix_classify_db(db);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bridge_dev))</div><div class='add'>+		return PTR_ERR(bridge_dev);</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port) &amp;&amp; !bridge_dev &amp;&amp;</div><div class='add'>+	    dsa_mdb_present_in_other_db(ds, port, mdb, db))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (port == ocelot-&gt;npi)</div><div class='add'>+		port = ocelot-&gt;num_phys_ports;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_mdb_add(ocelot, port, mdb, bridge_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			 const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			 struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *bridge_dev = felix_classify_db(db);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(bridge_dev))</div><div class='add'>+		return PTR_ERR(bridge_dev);</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port) &amp;&amp; !bridge_dev &amp;&amp;</div><div class='add'>+	    dsa_mdb_present_in_other_db(ds, port, mdb, db))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (port == ocelot-&gt;npi)</div><div class='add'>+		port = ocelot-&gt;num_phys_ports;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_mdb_del(ocelot, port, mdb, bridge_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_bridge_stp_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+				       u8 state)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_bridge_stp_state_set(ocelot, port, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct switchdev_brport_flags val,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_pre_bridge_flags(ocelot, port, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct switchdev_brport_flags val,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (port == ocelot-&gt;npi)</div><div class='add'>+		port = ocelot-&gt;num_phys_ports;</div><div class='add'>+</div><div class='add'>+	ocelot_port_bridge_flags(ocelot, port, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct dsa_bridge bridge, bool *tx_fwd_offload,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_bridge_join(ocelot, port, bridge.dev, bridge.num,</div><div class='add'>+				       extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_bridge_leave(ocelot, port, bridge.dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_lag_join(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct dsa_lag lag,</div><div class='add'>+			  struct netdev_lag_upper_info *info,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ocelot_port_lag_join(ocelot, port, lag.dev, info, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Update the logical LAG port that serves as tag_8021q CPU port */</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return felix_port_change_conduit(ds, port, lag.dev, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_lag_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_lag lag)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_lag_leave(ocelot, port, lag.dev);</div><div class='add'>+</div><div class='add'>+	/* Update the logical LAG port that serves as tag_8021q CPU port */</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return felix_port_change_conduit(ds, port, lag.dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_lag_change(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_lag_change(ocelot, port, dp-&gt;lag_tx_enabled);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='add'>+			      const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	u16 flags = vlan-&gt;flags;</div><div class='add'>+</div><div class='add'>+	/* Ocelot switches copy frames as-is to the CPU, so the flags:</div><div class='add'>+	 * egress-untagged or not, pvid or not, make no difference. This</div><div class='add'>+	 * behavior is already better than what DSA just tries to approximate</div><div class='add'>+	 * when it installs the VLAN with the same flags on the CPU port.</div><div class='add'>+	 * Just accept any configuration, and don't let ocelot deny installing</div><div class='add'>+	 * multiple native VLANs on the NPI port, because the switch doesn't</div><div class='add'>+	 * look at the port tag settings towards the NPI interface anyway.</div><div class='add'>+	 */</div><div class='add'>+	if (port == ocelot-&gt;npi)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ocelot_vlan_prepare(ocelot, port, vlan-&gt;vid,</div><div class='add'>+				   flags &amp; BRIDGE_VLAN_INFO_PVID,</div><div class='add'>+				   flags &amp; BRIDGE_VLAN_INFO_UNTAGGED,</div><div class='add'>+				   extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_vlan_filtering(struct dsa_switch *ds, int port, bool enabled,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	bool using_tag_8021q;</div><div class='add'>+	struct felix *felix;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ocelot_port_vlan_filtering(ocelot, port, enabled, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	felix = ocelot_to_felix(ocelot);</div><div class='add'>+	using_tag_8021q = felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q;</div><div class='add'>+	if (using_tag_8021q) {</div><div class='add'>+		err = felix_update_tag_8021q_rx_rules(ds, port, enabled);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			  const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	u16 flags = vlan-&gt;flags;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = felix_vlan_prepare(ds, port, vlan, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return ocelot_vlan_add(ocelot, port, vlan-&gt;vid,</div><div class='add'>+			       flags &amp; BRIDGE_VLAN_INFO_PVID,</div><div class='add'>+			       flags &amp; BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			  const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_vlan_del(ocelot, port, vlan-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+				   MAC_10 | MAC_100 | MAC_1000FD |</div><div class='add'>+				   MAC_2500FD;</div><div class='add'>+</div><div class='add'>+	__set_bit(ocelot-&gt;ports[port]-&gt;phy_mode,</div><div class='add'>+		  config-&gt;supported_interfaces);</div><div class='add'>+	if (ocelot-&gt;ports[port]-&gt;phy_mode == PHY_INTERFACE_MODE_USXGMII)</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_10G_QXGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				     unsigned int mode,</div><div class='add'>+				     const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ocelot *ocelot = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct felix *felix;</div><div class='add'>+</div><div class='add'>+	felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;info-&gt;phylink_mac_config)</div><div class='add'>+		felix-&gt;info-&gt;phylink_mac_config(ocelot, port, mode, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+felix_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+			     phy_interface_t iface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ocelot *ocelot = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct phylink_pcs *pcs = NULL;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct felix *felix;</div><div class='add'>+</div><div class='add'>+	felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;pcs &amp;&amp; felix-&gt;pcs[port])</div><div class='add'>+		pcs = felix-&gt;pcs[port];</div><div class='add'>+</div><div class='add'>+	return pcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					unsigned int link_an_mode,</div><div class='add'>+					phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ocelot *ocelot = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct felix *felix;</div><div class='add'>+</div><div class='add'>+	felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	ocelot_phylink_mac_link_down(ocelot, port, link_an_mode, interface,</div><div class='add'>+				     felix-&gt;info-&gt;quirks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+				      struct phy_device *phydev,</div><div class='add'>+				      unsigned int link_an_mode,</div><div class='add'>+				      phy_interface_t interface,</div><div class='add'>+				      int speed, int duplex,</div><div class='add'>+				      bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ocelot *ocelot = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	struct felix *felix;</div><div class='add'>+</div><div class='add'>+	felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	ocelot_phylink_mac_link_up(ocelot, port, phydev, link_an_mode,</div><div class='add'>+				   interface, speed, duplex, tx_pause, rx_pause,</div><div class='add'>+				   felix-&gt;info-&gt;quirks);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;info-&gt;port_sched_speed_set)</div><div class='add'>+		felix-&gt;info-&gt;port_sched_speed_set(ocelot, port, speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct phy_device *phydev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ocelot-&gt;npi &gt;= 0) {</div><div class='add'>+		struct net_device *conduit = dsa_port_to_conduit(dp);</div><div class='add'>+</div><div class='add'>+		if (felix_cpu_port_for_conduit(ds, conduit) != ocelot-&gt;npi) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Multiple conduits are not allowed\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;hsr_dev || felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_port_simple_hsr_join(ds, port, dp-&gt;hsr_dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_user(dp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;hsr_dev || felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_port_simple_hsr_leave(ds, port, dp-&gt;hsr_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_port_qos_map_init(struct ocelot *ocelot, int port)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ocelot_rmw_gix(ocelot,</div><div class='add'>+		       ANA_PORT_QOS_CFG_QOS_PCP_ENA,</div><div class='add'>+		       ANA_PORT_QOS_CFG_QOS_PCP_ENA,</div><div class='add'>+		       ANA_PORT_QOS_CFG,</div><div class='add'>+		       port);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; OCELOT_NUM_TC * 2; i++) {</div><div class='add'>+		ocelot_rmw_ix(ocelot,</div><div class='add'>+			      (ANA_PORT_PCP_DEI_MAP_DP_PCP_DEI_VAL &amp; i) |</div><div class='add'>+			      ANA_PORT_PCP_DEI_MAP_QOS_PCP_DEI_VAL(i),</div><div class='add'>+			      ANA_PORT_PCP_DEI_MAP_DP_PCP_DEI_VAL |</div><div class='add'>+			      ANA_PORT_PCP_DEI_MAP_QOS_PCP_DEI_VAL_M,</div><div class='add'>+			      ANA_PORT_PCP_DEI_MAP,</div><div class='add'>+			      port, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_stats64(ocelot, port, stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_pause_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_pause_stats(ocelot, port, pause_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_rmon_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				 const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_rmon_stats(ocelot, port, rmon_stats, ranges);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_eth_ctrl_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_eth_ctrl_stats(ocelot, port, ctrl_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_eth_mac_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_eth_mac_stats(ocelot, port, mac_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_eth_phy_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_eth_phy_stats(ocelot, port, phy_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_ts_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct ethtool_ts_stats *ts_stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_ts_stats(ocelot, port, ts_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_strings(struct dsa_switch *ds, int port,</div><div class='add'>+			      u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_get_strings(ocelot, port, stringset, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_get_ethtool_stats(ocelot, port, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_get_sset_count(ocelot, port, sset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_get_ts_info(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_get_ts_info(ocelot, port, info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u32 felix_phy_match_table[PHY_INTERFACE_MODE_MAX] = {</div><div class='add'>+	[PHY_INTERFACE_MODE_INTERNAL] = OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	[PHY_INTERFACE_MODE_SGMII] = OCELOT_PORT_MODE_SGMII,</div><div class='add'>+	[PHY_INTERFACE_MODE_QSGMII] = OCELOT_PORT_MODE_QSGMII,</div><div class='add'>+	[PHY_INTERFACE_MODE_USXGMII] = OCELOT_PORT_MODE_USXGMII,</div><div class='add'>+	[PHY_INTERFACE_MODE_10G_QXGMII] = OCELOT_PORT_MODE_10G_QXGMII,</div><div class='add'>+	[PHY_INTERFACE_MODE_1000BASEX] = OCELOT_PORT_MODE_1000BASEX,</div><div class='add'>+	[PHY_INTERFACE_MODE_2500BASEX] = OCELOT_PORT_MODE_2500BASEX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int felix_validate_phy_mode(struct felix *felix, int port,</div><div class='add'>+				   phy_interface_t phy_mode)</div><div class='add'>+{</div><div class='add'>+	u32 modes = felix-&gt;info-&gt;port_modes[port];</div><div class='add'>+</div><div class='add'>+	if (felix_phy_match_table[phy_mode] &amp; modes)</div><div class='add'>+		return 0;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_parse_ports_node(struct felix *felix,</div><div class='add'>+				  struct device_node *ports_node,</div><div class='add'>+				  phy_interface_t *port_phy_modes)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = felix-&gt;ocelot.dev;</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node_scoped(ports_node, child) {</div><div class='add'>+		phy_interface_t phy_mode;</div><div class='add'>+		u32 port;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		/* Get switch port number from DT */</div><div class='add'>+		if (of_property_read_u32(child, "reg", &amp;port) &lt; 0) {</div><div class='add'>+			dev_err(dev, "Port number not defined in device tree "</div><div class='add'>+				"(property \"reg\")\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Get PHY mode from DT */</div><div class='add'>+		err = of_get_phy_mode(child, &amp;phy_mode);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "Failed to read phy-mode or "</div><div class='add'>+				"phy-interface-type property for port %d\n",</div><div class='add'>+				port);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = felix_validate_phy_mode(felix, port, phy_mode);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_info(dev, "Unsupported PHY mode %s on port %d\n",</div><div class='add'>+				 phy_modes(phy_mode), port);</div><div class='add'>+</div><div class='add'>+			/* Leave port_phy_modes[port] = 0, which is also</div><div class='add'>+			 * PHY_INTERFACE_MODE_NA. This will perform a</div><div class='add'>+			 * best-effort to bring up as many ports as possible.</div><div class='add'>+			 */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port_phy_modes[port] = phy_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_parse_dt(struct felix *felix, phy_interface_t *port_phy_modes)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = felix-&gt;ocelot.dev;</div><div class='add'>+	struct device_node *switch_node;</div><div class='add'>+	struct device_node *ports_node;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch_node = dev-&gt;of_node;</div><div class='add'>+</div><div class='add'>+	ports_node = of_get_child_by_name(switch_node, "ports");</div><div class='add'>+	if (!ports_node)</div><div class='add'>+		ports_node = of_get_child_by_name(switch_node, "ethernet-ports");</div><div class='add'>+	if (!ports_node) {</div><div class='add'>+		dev_err(dev, "Incorrect bindings: absent \"ports\" or \"ethernet-ports\" node\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = felix_parse_ports_node(felix, ports_node, port_phy_modes);</div><div class='add'>+	of_node_put(ports_node);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regmap *felix_request_regmap_by_name(struct felix *felix,</div><div class='add'>+						   const char *resource_name)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = &amp;felix-&gt;ocelot;</div><div class='add'>+	struct resource res;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* In an MFD configuration, regmaps are registered directly to the</div><div class='add'>+	 * parent device before the child devices are probed, so there is no</div><div class='add'>+	 * need to initialize a new one.</div><div class='add'>+	 */</div><div class='add'>+	if (!felix-&gt;info-&gt;resources)</div><div class='add'>+		return dev_get_regmap(ocelot-&gt;dev-&gt;parent, resource_name);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; felix-&gt;info-&gt;num_resources; i++) {</div><div class='add'>+		if (strcmp(resource_name, felix-&gt;info-&gt;resources[i].name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;res, &amp;felix-&gt;info-&gt;resources[i], sizeof(res));</div><div class='add'>+		res.start += felix-&gt;switch_base;</div><div class='add'>+		res.end += felix-&gt;switch_base;</div><div class='add'>+</div><div class='add'>+		return ocelot_regmap_init(ocelot, &amp;res);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENOENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regmap *felix_request_regmap(struct felix *felix,</div><div class='add'>+					   enum ocelot_target target)</div><div class='add'>+{</div><div class='add'>+	const char *resource_name = felix-&gt;info-&gt;resource_names[target];</div><div class='add'>+</div><div class='add'>+	/* If the driver didn't provide a resource name for the target,</div><div class='add'>+	 * the resource is optional.</div><div class='add'>+	 */</div><div class='add'>+	if (!resource_name)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return felix_request_regmap_by_name(felix, resource_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regmap *felix_request_port_regmap(struct felix *felix, int port)</div><div class='add'>+{</div><div class='add'>+	char resource_name[32];</div><div class='add'>+</div><div class='add'>+	sprintf(resource_name, "port%d", port);</div><div class='add'>+</div><div class='add'>+	return felix_request_regmap_by_name(felix, resource_name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_init_structs(struct felix *felix, int num_phys_ports)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = &amp;felix-&gt;ocelot;</div><div class='add'>+	phy_interface_t *port_phy_modes;</div><div class='add'>+	struct regmap *target;</div><div class='add'>+	int port, i, err;</div><div class='add'>+</div><div class='add'>+	ocelot-&gt;num_phys_ports = num_phys_ports;</div><div class='add'>+	ocelot-&gt;ports = devm_kcalloc(ocelot-&gt;dev, num_phys_ports,</div><div class='add'>+				     sizeof(struct ocelot_port *), GFP_KERNEL);</div><div class='add'>+	if (!ocelot-&gt;ports)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ocelot-&gt;map		= felix-&gt;info-&gt;map;</div><div class='add'>+	ocelot-&gt;num_mact_rows	= felix-&gt;info-&gt;num_mact_rows;</div><div class='add'>+	ocelot-&gt;vcap		= felix-&gt;info-&gt;vcap;</div><div class='add'>+	ocelot-&gt;vcap_pol.base	= felix-&gt;info-&gt;vcap_pol_base;</div><div class='add'>+	ocelot-&gt;vcap_pol.max	= felix-&gt;info-&gt;vcap_pol_max;</div><div class='add'>+	ocelot-&gt;vcap_pol.base2	= felix-&gt;info-&gt;vcap_pol_base2;</div><div class='add'>+	ocelot-&gt;vcap_pol.max2	= felix-&gt;info-&gt;vcap_pol_max2;</div><div class='add'>+	ocelot-&gt;ops		= felix-&gt;info-&gt;ops;</div><div class='add'>+	ocelot-&gt;npi_inj_prefix	= OCELOT_TAG_PREFIX_SHORT;</div><div class='add'>+	ocelot-&gt;npi_xtr_prefix	= OCELOT_TAG_PREFIX_SHORT;</div><div class='add'>+	ocelot-&gt;devlink		= felix-&gt;ds-&gt;devlink;</div><div class='add'>+</div><div class='add'>+	port_phy_modes = kcalloc(num_phys_ports, sizeof(phy_interface_t),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!port_phy_modes)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = felix_parse_dt(felix, port_phy_modes);</div><div class='add'>+	if (err) {</div><div class='add'>+		kfree(port_phy_modes);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TARGET_MAX; i++) {</div><div class='add'>+		target = felix_request_regmap(felix, i);</div><div class='add'>+		if (IS_ERR(target)) {</div><div class='add'>+			dev_err(ocelot-&gt;dev,</div><div class='add'>+				"Failed to map device memory space: %pe\n",</div><div class='add'>+				target);</div><div class='add'>+			kfree(port_phy_modes);</div><div class='add'>+			return PTR_ERR(target);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ocelot-&gt;targets[i] = target;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ocelot_regfields_init(ocelot, felix-&gt;info-&gt;regfields);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ocelot-&gt;dev, "failed to init reg fields map\n");</div><div class='add'>+		kfree(port_phy_modes);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; num_phys_ports; port++) {</div><div class='add'>+		struct ocelot_port *ocelot_port;</div><div class='add'>+</div><div class='add'>+		ocelot_port = devm_kzalloc(ocelot-&gt;dev,</div><div class='add'>+					   sizeof(struct ocelot_port),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!ocelot_port) {</div><div class='add'>+			dev_err(ocelot-&gt;dev,</div><div class='add'>+				"failed to allocate port memory\n");</div><div class='add'>+			kfree(port_phy_modes);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		target = felix_request_port_regmap(felix, port);</div><div class='add'>+		if (IS_ERR(target)) {</div><div class='add'>+			dev_err(ocelot-&gt;dev,</div><div class='add'>+				"Failed to map memory space for port %d: %pe\n",</div><div class='add'>+				port, target);</div><div class='add'>+			kfree(port_phy_modes);</div><div class='add'>+			return PTR_ERR(target);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ocelot_port-&gt;phy_mode = port_phy_modes[port];</div><div class='add'>+		ocelot_port-&gt;ocelot = ocelot;</div><div class='add'>+		ocelot_port-&gt;target = target;</div><div class='add'>+		ocelot_port-&gt;index = port;</div><div class='add'>+		ocelot-&gt;ports[port] = ocelot_port;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(port_phy_modes);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;info-&gt;mdio_bus_alloc) {</div><div class='add'>+		err = felix-&gt;info-&gt;mdio_bus_alloc(ocelot);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocelot_port_purge_txtstamp_skb(struct ocelot *ocelot, int port,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+	struct sk_buff *clone = OCELOT_SKB_CB(skb)-&gt;clone;</div><div class='add'>+	struct sk_buff *skb_match = NULL, *skb_tmp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!clone)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ocelot_port-&gt;tx_skbs.lock, flags);</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(&amp;ocelot_port-&gt;tx_skbs, skb, skb_tmp) {</div><div class='add'>+		if (skb != clone)</div><div class='add'>+			continue;</div><div class='add'>+		__skb_unlink(skb, &amp;ocelot_port-&gt;tx_skbs);</div><div class='add'>+		skb_match = skb;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;ocelot_port-&gt;tx_skbs.lock, flags);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(!skb_match,</div><div class='add'>+		  "Could not find skb clone in TX timestamping list\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define work_to_xmit_work(w) \</div><div class='add'>+		container_of((w), struct felix_deferred_xmit_work, work)</div><div class='add'>+</div><div class='add'>+static void felix_port_deferred_xmit(struct kthread_work *work)</div><div class='add'>+{</div><div class='add'>+	struct felix_deferred_xmit_work *xmit_work = work_to_xmit_work(work);</div><div class='add'>+	struct dsa_switch *ds = xmit_work-&gt;dp-&gt;ds;</div><div class='add'>+	struct sk_buff *skb = xmit_work-&gt;skb;</div><div class='add'>+	u32 rew_op = ocelot_ptp_rew_op(skb);</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	int port = xmit_work-&gt;dp-&gt;index;</div><div class='add'>+	int retries = 10;</div><div class='add'>+</div><div class='add'>+	ocelot_lock_inj_grp(ocelot, 0);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (ocelot_can_inject(ocelot, 0))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (--retries);</div><div class='add'>+</div><div class='add'>+	if (!retries) {</div><div class='add'>+		ocelot_unlock_inj_grp(ocelot, 0);</div><div class='add'>+		dev_err(ocelot-&gt;dev, "port %d failed to inject skb\n",</div><div class='add'>+			port);</div><div class='add'>+		ocelot_port_purge_txtstamp_skb(ocelot, port, skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ocelot_port_inject_frame(ocelot, port, 0, rew_op, skb);</div><div class='add'>+</div><div class='add'>+	ocelot_unlock_inj_grp(ocelot, 0);</div><div class='add'>+</div><div class='add'>+	consume_skb(skb);</div><div class='add'>+	kfree(xmit_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_connect_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+				      enum dsa_tag_protocol proto)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_8021q_tagger_data *tagger_data;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case DSA_TAG_PROTO_OCELOT_8021Q:</div><div class='add'>+		tagger_data = ocelot_8021q_tagger_data(ds);</div><div class='add'>+		tagger_data-&gt;xmit_work_fn = felix_port_deferred_xmit;</div><div class='add'>+		return 0;</div><div class='add'>+	case DSA_TAG_PROTO_OCELOT:</div><div class='add'>+	case DSA_TAG_PROTO_SEVILLE:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = felix_init_structs(felix, ds-&gt;num_ports);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (ocelot-&gt;targets[HSIO])</div><div class='add'>+		ocelot_pll5_init(ocelot);</div><div class='add'>+</div><div class='add'>+	err = ocelot_init(ocelot);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_mdiobus_free;</div><div class='add'>+</div><div class='add'>+	if (ocelot-&gt;ptp) {</div><div class='add'>+		err = ocelot_init_timestamp(ocelot, felix-&gt;info-&gt;ptp_caps);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ocelot-&gt;dev,</div><div class='add'>+				"Timestamp initialization failed\n");</div><div class='add'>+			ocelot-&gt;ptp = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_available_port(dp, ds) {</div><div class='add'>+		ocelot_init_port(ocelot, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+		if (felix-&gt;info-&gt;configure_serdes)</div><div class='add'>+			felix-&gt;info-&gt;configure_serdes(ocelot, dp-&gt;index,</div><div class='add'>+						      dp-&gt;dn);</div><div class='add'>+</div><div class='add'>+		/* Set the default QoS Classification based on PCP and DEI</div><div class='add'>+		 * bits of vlan tag.</div><div class='add'>+		 */</div><div class='add'>+		felix_port_qos_map_init(ocelot, dp-&gt;index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;info-&gt;request_irq) {</div><div class='add'>+		err = felix-&gt;info-&gt;request_irq(ocelot);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(ocelot-&gt;dev, "Failed to request IRQ: %pe\n",</div><div class='add'>+				ERR_PTR(err));</div><div class='add'>+			goto out_deinit_ports;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ocelot_devlink_sb_register(ocelot);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_deinit_ports;</div><div class='add'>+</div><div class='add'>+	/* The initial tag protocol is NPI which won't fail during initial</div><div class='add'>+	 * setup, there's no real point in checking for errors.</div><div class='add'>+	 */</div><div class='add'>+	felix_change_tag_protocol(ds, felix-&gt;tag_proto);</div><div class='add'>+</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='add'>+	ds-&gt;assisted_learning_on_cpu_port = true;</div><div class='add'>+	ds-&gt;fdb_isolation = true;</div><div class='add'>+	ds-&gt;max_num_bridges = ds-&gt;num_ports;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_deinit_ports:</div><div class='add'>+	dsa_switch_for_each_available_port(dp, ds)</div><div class='add'>+		ocelot_deinit_port(ocelot, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	ocelot_deinit_timestamp(ocelot);</div><div class='add'>+	ocelot_deinit(ocelot);</div><div class='add'>+</div><div class='add'>+out_mdiobus_free:</div><div class='add'>+	if (felix-&gt;info-&gt;mdio_bus_free)</div><div class='add'>+		felix-&gt;info-&gt;mdio_bus_free(ocelot);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	if (felix-&gt;tag_proto_ops)</div><div class='add'>+		felix-&gt;tag_proto_ops-&gt;teardown(ds);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_available_port(dp, ds)</div><div class='add'>+		ocelot_deinit_port(ocelot, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	ocelot_devlink_sb_unregister(ocelot);</div><div class='add'>+	ocelot_deinit_timestamp(ocelot);</div><div class='add'>+	ocelot_deinit(ocelot);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;info-&gt;mdio_bus_free)</div><div class='add'>+		felix-&gt;info-&gt;mdio_bus_free(ocelot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_hwstamp_get(ocelot, port, config);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct kernel_hwtstamp_config *config,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	bool using_tag_8021q;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ocelot_hwstamp_set(ocelot, port, config, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	using_tag_8021q = felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q;</div><div class='add'>+</div><div class='add'>+	return felix_update_trapping_destinations(ds, using_tag_8021q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool felix_check_xtr_pkt(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	int err = 0, grp = 0;</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;tag_proto != DSA_TAG_PROTO_OCELOT_8021Q)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!felix-&gt;info-&gt;quirk_no_xtr_irq)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	ocelot_lock_xtr_grp(ocelot, grp);</div><div class='add'>+</div><div class='add'>+	while (ocelot_read(ocelot, QS_XTR_DATA_PRESENT) &amp; BIT(grp)) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		unsigned int type;</div><div class='add'>+</div><div class='add'>+		err = ocelot_xtr_poll_frame(ocelot, grp, &amp;skb);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		/* We trap to the CPU port module all PTP frames, but</div><div class='add'>+		 * felix_rxtstamp() only gets called for event frames.</div><div class='add'>+		 * So we need to avoid sending duplicate general</div><div class='add'>+		 * message frames by running a second BPF classifier</div><div class='add'>+		 * here and dropping those.</div><div class='add'>+		 */</div><div class='add'>+		__skb_push(skb, ETH_HLEN);</div><div class='add'>+</div><div class='add'>+		type = ptp_classify_raw(skb);</div><div class='add'>+</div><div class='add'>+		__skb_pull(skb, ETH_HLEN);</div><div class='add'>+</div><div class='add'>+		if (type == PTP_CLASS_NONE) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err_ratelimited(ocelot-&gt;dev,</div><div class='add'>+				    "Error during packet extraction: %pe\n",</div><div class='add'>+				    ERR_PTR(err));</div><div class='add'>+		ocelot_drain_cpu_queue(ocelot, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ocelot_unlock_xtr_grp(ocelot, grp);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool felix_rxtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct sk_buff *skb, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	u32 tstamp_lo = OCELOT_SKB_CB(skb)-&gt;tstamp_lo;</div><div class='add'>+	struct skb_shared_hwtstamps *shhwtstamps;</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+	u32 tstamp_hi;</div><div class='add'>+	u64 tstamp;</div><div class='add'>+</div><div class='add'>+	switch (type &amp; PTP_CLASS_PMASK) {</div><div class='add'>+	case PTP_CLASS_L2:</div><div class='add'>+		if (!(ocelot-&gt;ports[port]-&gt;trap_proto &amp; OCELOT_PROTO_PTP_L2))</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	case PTP_CLASS_IPV4:</div><div class='add'>+	case PTP_CLASS_IPV6:</div><div class='add'>+		if (!(ocelot-&gt;ports[port]-&gt;trap_proto &amp; OCELOT_PROTO_PTP_L4))</div><div class='add'>+			return false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the "no XTR IRQ" workaround is in use, tell DSA to defer this skb</div><div class='add'>+	 * for RX timestamping. Then free it, and poll for its copy through</div><div class='add'>+	 * MMIO in the CPU port module, and inject that into the stack from</div><div class='add'>+	 * ocelot_xtr_poll().</div><div class='add'>+	 */</div><div class='add'>+	if (felix_check_xtr_pkt(ocelot)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ocelot_ptp_gettime64(&amp;ocelot-&gt;ptp_info, &amp;ts);</div><div class='add'>+	tstamp = ktime_set(ts.tv_sec, ts.tv_nsec);</div><div class='add'>+</div><div class='add'>+	tstamp_hi = tstamp &gt;&gt; 32;</div><div class='add'>+	if ((tstamp &amp; 0xffffffff) &lt; tstamp_lo)</div><div class='add'>+		tstamp_hi--;</div><div class='add'>+</div><div class='add'>+	tstamp = ((u64)tstamp_hi &lt;&lt; 32) | tstamp_lo;</div><div class='add'>+</div><div class='add'>+	shhwtstamps = skb_hwtstamps(skb);</div><div class='add'>+	memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));</div><div class='add'>+	shhwtstamps-&gt;hwtstamp = tstamp;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct sk_buff *clone = NULL;</div><div class='add'>+</div><div class='add'>+	if (!ocelot-&gt;ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ocelot_port_txtstamp_request(ocelot, port, skb, &amp;clone)) {</div><div class='add'>+		dev_err_ratelimited(ds-&gt;dev,</div><div class='add'>+				    "port %d delivering skb without TX timestamp\n",</div><div class='add'>+				    port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clone)</div><div class='add'>+		OCELOT_SKB_CB(skb)-&gt;clone = clone;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	ocelot_port_set_maxlen(ocelot, port, new_mtu);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	if (ocelot_port-&gt;taprio &amp;&amp; ocelot-&gt;ops-&gt;tas_guard_bands_update)</div><div class='add'>+		ocelot-&gt;ops-&gt;tas_guard_bands_update(ocelot, port);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_get_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_get_max_mtu(ocelot, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_cls_flower_add(struct dsa_switch *ds, int port,</div><div class='add'>+				struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	bool using_tag_8021q;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = ocelot_cls_flower_replace(ocelot, port, cls, ingress);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	using_tag_8021q = felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q;</div><div class='add'>+</div><div class='add'>+	return felix_update_trapping_destinations(ds, using_tag_8021q);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_cls_flower_del(struct dsa_switch *ds, int port,</div><div class='add'>+				struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_cls_flower_destroy(ocelot, port, cls, ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_cls_flower_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_cls_flower_stats(ocelot, port, cls, ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_policer_add(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct dsa_mall_policer_tc_entry *policer)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct ocelot_policer pol = {</div><div class='add'>+		.rate = div_u64(policer-&gt;rate_bytes_per_sec, 1000) * 8,</div><div class='add'>+		.burst = policer-&gt;burst,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return ocelot_port_policer_add(ocelot, port, &amp;pol);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_port_policer_del(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_policer_del(ocelot, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+				 bool ingress, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_mirror_add(ocelot, port, mirror-&gt;to_local_port,</div><div class='add'>+				      ingress, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_mirror_del(ocelot, port, mirror-&gt;ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_setup_tc(struct dsa_switch *ds, int port,</div><div class='add'>+			       enum tc_setup_type type,</div><div class='add'>+			       void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;info-&gt;port_setup_tc)</div><div class='add'>+		return felix-&gt;info-&gt;port_setup_tc(ds, port, type, type_data);</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_pool_get(struct dsa_switch *ds, unsigned int sb_index,</div><div class='add'>+			     u16 pool_index,</div><div class='add'>+			     struct devlink_sb_pool_info *pool_info)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_pool_get(ocelot, sb_index, pool_index, pool_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_pool_set(struct dsa_switch *ds, unsigned int sb_index,</div><div class='add'>+			     u16 pool_index, u32 size,</div><div class='add'>+			     enum devlink_sb_threshold_type threshold_type,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_pool_set(ocelot, sb_index, pool_index, size,</div><div class='add'>+				  threshold_type, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_port_pool_get(struct dsa_switch *ds, int port,</div><div class='add'>+				  unsigned int sb_index, u16 pool_index,</div><div class='add'>+				  u32 *p_threshold)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_port_pool_get(ocelot, port, sb_index, pool_index,</div><div class='add'>+				       p_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_port_pool_set(struct dsa_switch *ds, int port,</div><div class='add'>+				  unsigned int sb_index, u16 pool_index,</div><div class='add'>+				  u32 threshold, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_port_pool_set(ocelot, port, sb_index, pool_index,</div><div class='add'>+				       threshold, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_tc_pool_bind_get(struct dsa_switch *ds, int port,</div><div class='add'>+				     unsigned int sb_index, u16 tc_index,</div><div class='add'>+				     enum devlink_sb_pool_type pool_type,</div><div class='add'>+				     u16 *p_pool_index, u32 *p_threshold)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_tc_pool_bind_get(ocelot, port, sb_index, tc_index,</div><div class='add'>+					  pool_type, p_pool_index,</div><div class='add'>+					  p_threshold);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_tc_pool_bind_set(struct dsa_switch *ds, int port,</div><div class='add'>+				     unsigned int sb_index, u16 tc_index,</div><div class='add'>+				     enum devlink_sb_pool_type pool_type,</div><div class='add'>+				     u16 pool_index, u32 threshold,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_tc_pool_bind_set(ocelot, port, sb_index, tc_index,</div><div class='add'>+					  pool_type, pool_index, threshold,</div><div class='add'>+					  extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_occ_snapshot(struct dsa_switch *ds,</div><div class='add'>+				 unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_occ_snapshot(ocelot, sb_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_occ_max_clear(struct dsa_switch *ds,</div><div class='add'>+				  unsigned int sb_index)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_occ_max_clear(ocelot, sb_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_occ_port_pool_get(struct dsa_switch *ds, int port,</div><div class='add'>+				      unsigned int sb_index, u16 pool_index,</div><div class='add'>+				      u32 *p_cur, u32 *p_max)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_occ_port_pool_get(ocelot, port, sb_index, pool_index,</div><div class='add'>+					   p_cur, p_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_sb_occ_tc_port_bind_get(struct dsa_switch *ds, int port,</div><div class='add'>+					 unsigned int sb_index, u16 tc_index,</div><div class='add'>+					 enum devlink_sb_pool_type pool_type,</div><div class='add'>+					 u32 *p_cur, u32 *p_max)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_sb_occ_tc_port_bind_get(ocelot, port, sb_index, tc_index,</div><div class='add'>+					      pool_type, p_cur, p_max);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_mrp_add(struct dsa_switch *ds, int port,</div><div class='add'>+			 const struct switchdev_obj_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_mrp_add(ocelot, port, mrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_mrp_del(struct dsa_switch *ds, int port,</div><div class='add'>+			 const struct switchdev_obj_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_mrp_add(ocelot, port, mrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+felix_mrp_add_ring_role(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_ring_role_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_mrp_add_ring_role(ocelot, port, mrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+felix_mrp_del_ring_role(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_ring_role_mrp *mrp)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_mrp_del_ring_role(ocelot, port, mrp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_get_default_prio(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_get_default_prio(ocelot, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_set_default_prio(struct dsa_switch *ds, int port,</div><div class='add'>+				       u8 prio)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_set_default_prio(ocelot, port, prio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_get_dscp_prio(struct dsa_switch *ds, int port, u8 dscp)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_get_dscp_prio(ocelot, port, dscp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_add_dscp_prio(struct dsa_switch *ds, int port, u8 dscp,</div><div class='add'>+				    u8 prio)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_add_dscp_prio(ocelot, port, dscp, prio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_del_dscp_prio(struct dsa_switch *ds, int port, u8 dscp,</div><div class='add'>+				    u8 prio)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_del_dscp_prio(ocelot, port, dscp, prio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_get_mm(struct dsa_switch *ds, int port,</div><div class='add'>+			struct ethtool_mm_state *state)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_get_mm(ocelot, port, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_set_mm(struct dsa_switch *ds, int port,</div><div class='add'>+			struct ethtool_mm_cfg *cfg,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return ocelot_port_set_mm(ocelot, port, cfg, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_get_mm_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct ethtool_mm_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ocelot_port_get_mm_stats(ocelot, port, stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Depending on port type, we may be able to support the offload later (with</div><div class='add'>+ * the "ocelot"/"seville" tagging protocols), or never.</div><div class='add'>+ * If we return 0, the dp-&gt;hsr_dev reference is kept for later; if we return</div><div class='add'>+ * -EOPNOTSUPP, it is cleared (which helps to not bother</div><div class='add'>+ * dsa_port_simple_hsr_leave() with an offload that didn't pass validation).</div><div class='add'>+ */</div><div class='add'>+static int felix_port_hsr_join(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct net_device *hsr,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = dsa_port_simple_hsr_validate(ds, port, hsr, extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offloading not supported with \"ocelot-8021q\"");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(dsa_to_port(ds, port)-&gt;user-&gt;flags &amp; IFF_UP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_port_simple_hsr_join(ds, port, hsr, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int felix_port_hsr_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				struct net_device *hsr)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+</div><div class='add'>+	if (felix-&gt;tag_proto == DSA_TAG_PROTO_OCELOT_8021Q)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(dsa_to_port(ds, port)-&gt;user-&gt;flags &amp; IFF_UP))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dsa_port_simple_hsr_leave(ds, port, hsr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops felix_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs		= felix_phylink_mac_select_pcs,</div><div class='add'>+	.mac_config		= felix_phylink_mac_config,</div><div class='add'>+	.mac_link_down		= felix_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up		= felix_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops felix_switch_ops = {</div><div class='add'>+	.get_tag_protocol		= felix_get_tag_protocol,</div><div class='add'>+	.change_tag_protocol		= felix_change_tag_protocol,</div><div class='add'>+	.connect_tag_protocol		= felix_connect_tag_protocol,</div><div class='add'>+	.setup				= felix_setup,</div><div class='add'>+	.teardown			= felix_teardown,</div><div class='add'>+	.set_ageing_time		= felix_set_ageing_time,</div><div class='add'>+	.get_mm				= felix_get_mm,</div><div class='add'>+	.set_mm				= felix_set_mm,</div><div class='add'>+	.get_mm_stats			= felix_get_mm_stats,</div><div class='add'>+	.get_stats64			= felix_get_stats64,</div><div class='add'>+	.get_pause_stats		= felix_get_pause_stats,</div><div class='add'>+	.get_rmon_stats			= felix_get_rmon_stats,</div><div class='add'>+	.get_ts_stats			= felix_get_ts_stats,</div><div class='add'>+	.get_eth_ctrl_stats		= felix_get_eth_ctrl_stats,</div><div class='add'>+	.get_eth_mac_stats		= felix_get_eth_mac_stats,</div><div class='add'>+	.get_eth_phy_stats		= felix_get_eth_phy_stats,</div><div class='add'>+	.get_strings			= felix_get_strings,</div><div class='add'>+	.get_ethtool_stats		= felix_get_ethtool_stats,</div><div class='add'>+	.get_sset_count			= felix_get_sset_count,</div><div class='add'>+	.get_ts_info			= felix_get_ts_info,</div><div class='add'>+	.phylink_get_caps		= felix_phylink_get_caps,</div><div class='add'>+	.port_enable			= felix_port_enable,</div><div class='add'>+	.port_disable			= felix_port_disable,</div><div class='add'>+	.port_fast_age			= felix_port_fast_age,</div><div class='add'>+	.port_fdb_dump			= felix_fdb_dump,</div><div class='add'>+	.port_fdb_add			= felix_fdb_add,</div><div class='add'>+	.port_fdb_del			= felix_fdb_del,</div><div class='add'>+	.lag_fdb_add			= felix_lag_fdb_add,</div><div class='add'>+	.lag_fdb_del			= felix_lag_fdb_del,</div><div class='add'>+	.port_mdb_add			= felix_mdb_add,</div><div class='add'>+	.port_mdb_del			= felix_mdb_del,</div><div class='add'>+	.port_pre_bridge_flags		= felix_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags		= felix_bridge_flags,</div><div class='add'>+	.port_bridge_join		= felix_bridge_join,</div><div class='add'>+	.port_bridge_leave		= felix_bridge_leave,</div><div class='add'>+	.port_lag_join			= felix_lag_join,</div><div class='add'>+	.port_lag_leave			= felix_lag_leave,</div><div class='add'>+	.port_lag_change		= felix_lag_change,</div><div class='add'>+	.port_stp_state_set		= felix_bridge_stp_state_set,</div><div class='add'>+	.port_vlan_filtering		= felix_vlan_filtering,</div><div class='add'>+	.port_vlan_add			= felix_vlan_add,</div><div class='add'>+	.port_vlan_del			= felix_vlan_del,</div><div class='add'>+	.port_hwtstamp_get		= felix_hwtstamp_get,</div><div class='add'>+	.port_hwtstamp_set		= felix_hwtstamp_set,</div><div class='add'>+	.port_rxtstamp			= felix_rxtstamp,</div><div class='add'>+	.port_txtstamp			= felix_txtstamp,</div><div class='add'>+	.port_change_mtu		= felix_change_mtu,</div><div class='add'>+	.port_max_mtu			= felix_get_max_mtu,</div><div class='add'>+	.port_policer_add		= felix_port_policer_add,</div><div class='add'>+	.port_policer_del		= felix_port_policer_del,</div><div class='add'>+	.port_mirror_add		= felix_port_mirror_add,</div><div class='add'>+	.port_mirror_del		= felix_port_mirror_del,</div><div class='add'>+	.cls_flower_add			= felix_cls_flower_add,</div><div class='add'>+	.cls_flower_del			= felix_cls_flower_del,</div><div class='add'>+	.cls_flower_stats		= felix_cls_flower_stats,</div><div class='add'>+	.port_setup_tc			= felix_port_setup_tc,</div><div class='add'>+	.devlink_sb_pool_get		= felix_sb_pool_get,</div><div class='add'>+	.devlink_sb_pool_set		= felix_sb_pool_set,</div><div class='add'>+	.devlink_sb_port_pool_get	= felix_sb_port_pool_get,</div><div class='add'>+	.devlink_sb_port_pool_set	= felix_sb_port_pool_set,</div><div class='add'>+	.devlink_sb_tc_pool_bind_get	= felix_sb_tc_pool_bind_get,</div><div class='add'>+	.devlink_sb_tc_pool_bind_set	= felix_sb_tc_pool_bind_set,</div><div class='add'>+	.devlink_sb_occ_snapshot	= felix_sb_occ_snapshot,</div><div class='add'>+	.devlink_sb_occ_max_clear	= felix_sb_occ_max_clear,</div><div class='add'>+	.devlink_sb_occ_port_pool_get	= felix_sb_occ_port_pool_get,</div><div class='add'>+	.devlink_sb_occ_tc_port_bind_get= felix_sb_occ_tc_port_bind_get,</div><div class='add'>+	.port_mrp_add			= felix_mrp_add,</div><div class='add'>+	.port_mrp_del			= felix_mrp_del,</div><div class='add'>+	.port_mrp_add_ring_role		= felix_mrp_add_ring_role,</div><div class='add'>+	.port_mrp_del_ring_role		= felix_mrp_del_ring_role,</div><div class='add'>+	.tag_8021q_vlan_add		= felix_tag_8021q_vlan_add,</div><div class='add'>+	.tag_8021q_vlan_del		= felix_tag_8021q_vlan_del,</div><div class='add'>+	.port_get_default_prio		= felix_port_get_default_prio,</div><div class='add'>+	.port_set_default_prio		= felix_port_set_default_prio,</div><div class='add'>+	.port_get_dscp_prio		= felix_port_get_dscp_prio,</div><div class='add'>+	.port_add_dscp_prio		= felix_port_add_dscp_prio,</div><div class='add'>+	.port_del_dscp_prio		= felix_port_del_dscp_prio,</div><div class='add'>+	.port_set_host_flood		= felix_port_set_host_flood,</div><div class='add'>+	.port_change_conduit		= felix_port_change_conduit,</div><div class='add'>+	.port_hsr_join			= felix_port_hsr_join,</div><div class='add'>+	.port_hsr_leave			= felix_port_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int felix_register_switch(struct device *dev, resource_size_t switch_base,</div><div class='add'>+			  int num_flooding_pgids, bool ptp,</div><div class='add'>+			  bool mm_supported,</div><div class='add'>+			  enum dsa_tag_protocol init_tag_proto,</div><div class='add'>+			  const struct felix_info *info)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct ocelot *ocelot;</div><div class='add'>+	struct felix *felix;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	felix = devm_kzalloc(dev, sizeof(*felix), GFP_KERNEL);</div><div class='add'>+	if (!felix)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ds = devm_kzalloc(dev, sizeof(*ds), GFP_KERNEL);</div><div class='add'>+	if (!ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, felix);</div><div class='add'>+</div><div class='add'>+	ocelot = &amp;felix-&gt;ocelot;</div><div class='add'>+	ocelot-&gt;dev = dev;</div><div class='add'>+	ocelot-&gt;num_flooding_pgids = num_flooding_pgids;</div><div class='add'>+	ocelot-&gt;ptp = ptp;</div><div class='add'>+	ocelot-&gt;mm_supported = mm_supported;</div><div class='add'>+</div><div class='add'>+	felix-&gt;info = info;</div><div class='add'>+	felix-&gt;switch_base = switch_base;</div><div class='add'>+	felix-&gt;ds = ds;</div><div class='add'>+	felix-&gt;tag_proto = init_tag_proto;</div><div class='add'>+</div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;num_ports = info-&gt;num_ports;</div><div class='add'>+	ds-&gt;num_tx_queues = OCELOT_NUM_TC;</div><div class='add'>+	ds-&gt;ops = &amp;felix_switch_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;felix_phylink_mac_ops;</div><div class='add'>+	ds-&gt;priv = ocelot;</div><div class='add'>+</div><div class='add'>+	err = dsa_register_switch(ds);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err_probe(dev, err, "Failed to register DSA switch\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(felix_register_switch);</div><div class='add'>+</div><div class='add'>+struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct dsa_switch *ds = felix-&gt;ds;</div><div class='add'>+</div><div class='add'>+	if (!dsa_is_user_port(ds, port))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return dsa_to_port(ds, port)-&gt;user;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(felix_port_to_netdev);</div><div class='add'>+</div><div class='add'>+int felix_netdev_to_port(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dp = dsa_port_from_netdev(dev);</div><div class='add'>+	if (IS_ERR(dp))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return dp-&gt;index;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(felix_netdev_to_port);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Felix DSA library");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h<br/>new file mode 100644<br/>index 000000000000..a657b190c5d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/felix.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/felix.h</a></div><div class='hunk'>@@ -0,0 +1,109 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright 2019 NXP</div><div class='add'>+ */</div><div class='add'>+#ifndef _MSCC_FELIX_H</div><div class='add'>+#define _MSCC_FELIX_H</div><div class='add'>+</div><div class='add'>+#define ocelot_to_felix(o)		container_of((o), struct felix, ocelot)</div><div class='add'>+#define FELIX_MAC_QUIRKS		OCELOT_QUIRK_PCS_PERFORMS_RATE_ADAPTATION</div><div class='add'>+</div><div class='add'>+#define OCELOT_PORT_MODE_NONE		0</div><div class='add'>+#define OCELOT_PORT_MODE_INTERNAL	BIT(0)</div><div class='add'>+#define OCELOT_PORT_MODE_SGMII		BIT(1)</div><div class='add'>+#define OCELOT_PORT_MODE_QSGMII		BIT(2)</div><div class='add'>+#define OCELOT_PORT_MODE_2500BASEX	BIT(3)</div><div class='add'>+#define OCELOT_PORT_MODE_USXGMII	BIT(4) /* compatibility */</div><div class='add'>+#define OCELOT_PORT_MODE_1000BASEX	BIT(5)</div><div class='add'>+#define OCELOT_PORT_MODE_10G_QXGMII	BIT(6)</div><div class='add'>+</div><div class='add'>+struct device_node;</div><div class='add'>+</div><div class='add'>+/* Platform-specific information */</div><div class='add'>+struct felix_info {</div><div class='add'>+	/* Hardcoded resources provided by the hardware instantiation. */</div><div class='add'>+	const struct resource		*resources;</div><div class='add'>+	size_t				num_resources;</div><div class='add'>+	/* Names of the mandatory resources that will be requested during</div><div class='add'>+	 * probe. Must have TARGET_MAX elements, since it is indexed by target.</div><div class='add'>+	 */</div><div class='add'>+	const char *const		*resource_names;</div><div class='add'>+	const struct reg_field		*regfields;</div><div class='add'>+	const u32 *const		*map;</div><div class='add'>+	const struct ocelot_ops		*ops;</div><div class='add'>+	const u32			*port_modes;</div><div class='add'>+	int				num_mact_rows;</div><div class='add'>+	int				num_ports;</div><div class='add'>+	struct vcap_props		*vcap;</div><div class='add'>+	u16				vcap_pol_base;</div><div class='add'>+	u16				vcap_pol_max;</div><div class='add'>+	u16				vcap_pol_base2;</div><div class='add'>+	u16				vcap_pol_max2;</div><div class='add'>+	const struct ptp_clock_info	*ptp_caps;</div><div class='add'>+	unsigned long			quirks;</div><div class='add'>+</div><div class='add'>+	/* Some Ocelot switches are integrated into the SoC without the</div><div class='add'>+	 * extraction IRQ line connected to the ARM GIC. By enabling this</div><div class='add'>+	 * workaround, the few packets that are delivered to the CPU port</div><div class='add'>+	 * module (currently only PTP) are copied not only to the hardware CPU</div><div class='add'>+	 * port module, but also to the 802.1Q Ethernet CPU port, and polling</div><div class='add'>+	 * the extraction registers is triggered once the DSA tagger sees a PTP</div><div class='add'>+	 * frame. The Ethernet frame is only used as a notification: it is</div><div class='add'>+	 * dropped, and the original frame is extracted over MMIO and annotated</div><div class='add'>+	 * with the RX timestamp.</div><div class='add'>+	 */</div><div class='add'>+	bool				quirk_no_xtr_irq;</div><div class='add'>+</div><div class='add'>+	int	(*mdio_bus_alloc)(struct ocelot *ocelot);</div><div class='add'>+	void	(*mdio_bus_free)(struct ocelot *ocelot);</div><div class='add'>+	int	(*port_setup_tc)(struct dsa_switch *ds, int port,</div><div class='add'>+				 enum tc_setup_type type, void *type_data);</div><div class='add'>+	void	(*port_sched_speed_set)(struct ocelot *ocelot, int port,</div><div class='add'>+					u32 speed);</div><div class='add'>+	void	(*phylink_mac_config)(struct ocelot *ocelot, int port,</div><div class='add'>+				      unsigned int mode,</div><div class='add'>+				      const struct phylink_link_state *state);</div><div class='add'>+	int	(*configure_serdes)(struct ocelot *ocelot, int port,</div><div class='add'>+				    struct device_node *portnp);</div><div class='add'>+	int	(*request_irq)(struct ocelot *ocelot);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Methods for initializing the hardware resources specific to a tagging</div><div class='add'>+ * protocol (like the NPI port, for "ocelot" or "seville", or the VCAP TCAMs,</div><div class='add'>+ * for "ocelot-8021q").</div><div class='add'>+ * It is important that the resources configured here do not have side effects</div><div class='add'>+ * for the other tagging protocols. If that is the case, their configuration</div><div class='add'>+ * needs to go to felix_tag_proto_setup_shared().</div><div class='add'>+ */</div><div class='add'>+struct felix_tag_proto_ops {</div><div class='add'>+	int (*setup)(struct dsa_switch *ds);</div><div class='add'>+	void (*teardown)(struct dsa_switch *ds);</div><div class='add'>+	unsigned long (*get_host_fwd_mask)(struct dsa_switch *ds);</div><div class='add'>+	int (*change_conduit)(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct net_device *conduit,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DSA glue / front-end for struct ocelot */</div><div class='add'>+struct felix {</div><div class='add'>+	struct dsa_switch		*ds;</div><div class='add'>+	const struct felix_info		*info;</div><div class='add'>+	struct ocelot			ocelot;</div><div class='add'>+	struct mii_bus			*imdio;</div><div class='add'>+	struct phylink_pcs		**pcs;</div><div class='add'>+	resource_size_t			switch_base;</div><div class='add'>+	enum dsa_tag_protocol		tag_proto;</div><div class='add'>+	const struct felix_tag_proto_ops *tag_proto_ops;</div><div class='add'>+	struct kthread_worker		*xmit_worker;</div><div class='add'>+	unsigned long			host_flood_uc_mask;</div><div class='add'>+	unsigned long			host_flood_mc_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int felix_register_switch(struct device *dev, resource_size_t switch_base,</div><div class='add'>+			  int num_flooding_pgids, bool ptp,</div><div class='add'>+			  bool mm_supported,</div><div class='add'>+			  enum dsa_tag_protocol init_tag_proto,</div><div class='add'>+			  const struct felix_info *info);</div><div class='add'>+struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port);</div><div class='add'>+int felix_netdev_to_port(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c<br/>new file mode 100644<br/>index 000000000000..8cf4c8986587<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/felix_vsc9959.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/felix_vsc9959.c</a></div><div class='hunk'>@@ -0,0 +1,2757 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/* Copyright 2017 Microsemi Corporation</div><div class='add'>+ * Copyright 2018-2019 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/fsl/enetc_mdio.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_qsys.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_vcap.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_ana.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_dev.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_ptp.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_sys.h&gt;</div><div class='add'>+#include &lt;net/tc_act/tc_gate.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/dsa/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/pcs-lynx.h&gt;</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include "felix.h"</div><div class='add'>+</div><div class='add'>+#define VSC9959_NUM_PORTS		6</div><div class='add'>+</div><div class='add'>+#define VSC9959_TAS_GCL_ENTRY_MAX	63</div><div class='add'>+#define VSC9959_TAS_MIN_GATE_LEN_NS	35</div><div class='add'>+#define VSC9959_VCAP_POLICER_BASE	63</div><div class='add'>+#define VSC9959_VCAP_POLICER_MAX	383</div><div class='add'>+#define VSC9959_SWITCH_PCI_BAR		4</div><div class='add'>+#define VSC9959_IMDIO_PCI_BAR		0</div><div class='add'>+</div><div class='add'>+#define VSC9959_PORT_MODE_SERDES	(OCELOT_PORT_MODE_SGMII | \</div><div class='add'>+					 OCELOT_PORT_MODE_QSGMII | \</div><div class='add'>+					 OCELOT_PORT_MODE_1000BASEX | \</div><div class='add'>+					 OCELOT_PORT_MODE_2500BASEX | \</div><div class='add'>+					 OCELOT_PORT_MODE_USXGMII | \</div><div class='add'>+					 OCELOT_PORT_MODE_10G_QXGMII)</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_port_modes[VSC9959_NUM_PORTS] = {</div><div class='add'>+	VSC9959_PORT_MODE_SERDES,</div><div class='add'>+	VSC9959_PORT_MODE_SERDES,</div><div class='add'>+	VSC9959_PORT_MODE_SERDES,</div><div class='add'>+	VSC9959_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_ana_regmap[] = {</div><div class='add'>+	REG(ANA_ADVLEARN,			0x0089a0),</div><div class='add'>+	REG(ANA_VLANMASK,			0x0089a4),</div><div class='add'>+	REG_RESERVED(ANA_PORT_B_DOMAIN),</div><div class='add'>+	REG(ANA_ANAGEFIL,			0x0089ac),</div><div class='add'>+	REG(ANA_ANEVENTS,			0x0089b0),</div><div class='add'>+	REG(ANA_STORMLIMIT_BURST,		0x0089b4),</div><div class='add'>+	REG(ANA_STORMLIMIT_CFG,			0x0089b8),</div><div class='add'>+	REG(ANA_ISOLATED_PORTS,			0x0089c8),</div><div class='add'>+	REG(ANA_COMMUNITY_PORTS,		0x0089cc),</div><div class='add'>+	REG(ANA_AUTOAGE,			0x0089d0),</div><div class='add'>+	REG(ANA_MACTOPTIONS,			0x0089d4),</div><div class='add'>+	REG(ANA_LEARNDISC,			0x0089d8),</div><div class='add'>+	REG(ANA_AGENCTRL,			0x0089dc),</div><div class='add'>+	REG(ANA_MIRRORPORTS,			0x0089e0),</div><div class='add'>+	REG(ANA_EMIRRORPORTS,			0x0089e4),</div><div class='add'>+	REG(ANA_FLOODING,			0x0089e8),</div><div class='add'>+	REG(ANA_FLOODING_IPMC,			0x008a08),</div><div class='add'>+	REG(ANA_SFLOW_CFG,			0x008a0c),</div><div class='add'>+	REG(ANA_PORT_MODE,			0x008a28),</div><div class='add'>+	REG(ANA_CUT_THRU_CFG,			0x008a48),</div><div class='add'>+	REG(ANA_PGID_PGID,			0x008400),</div><div class='add'>+	REG(ANA_TABLES_ANMOVED,			0x007f1c),</div><div class='add'>+	REG(ANA_TABLES_MACHDATA,		0x007f20),</div><div class='add'>+	REG(ANA_TABLES_MACLDATA,		0x007f24),</div><div class='add'>+	REG(ANA_TABLES_STREAMDATA,		0x007f28),</div><div class='add'>+	REG(ANA_TABLES_MACACCESS,		0x007f2c),</div><div class='add'>+	REG(ANA_TABLES_MACTINDX,		0x007f30),</div><div class='add'>+	REG(ANA_TABLES_VLANACCESS,		0x007f34),</div><div class='add'>+	REG(ANA_TABLES_VLANTIDX,		0x007f38),</div><div class='add'>+	REG(ANA_TABLES_ISDXACCESS,		0x007f3c),</div><div class='add'>+	REG(ANA_TABLES_ISDXTIDX,		0x007f40),</div><div class='add'>+	REG(ANA_TABLES_ENTRYLIM,		0x007f00),</div><div class='add'>+	REG(ANA_TABLES_PTP_ID_HIGH,		0x007f44),</div><div class='add'>+	REG(ANA_TABLES_PTP_ID_LOW,		0x007f48),</div><div class='add'>+	REG(ANA_TABLES_STREAMACCESS,		0x007f4c),</div><div class='add'>+	REG(ANA_TABLES_STREAMTIDX,		0x007f50),</div><div class='add'>+	REG(ANA_TABLES_SEQ_HISTORY,		0x007f54),</div><div class='add'>+	REG(ANA_TABLES_SEQ_MASK,		0x007f58),</div><div class='add'>+	REG(ANA_TABLES_SFID_MASK,		0x007f5c),</div><div class='add'>+	REG(ANA_TABLES_SFIDACCESS,		0x007f60),</div><div class='add'>+	REG(ANA_TABLES_SFIDTIDX,		0x007f64),</div><div class='add'>+	REG(ANA_MSTI_STATE,			0x008600),</div><div class='add'>+	REG(ANA_OAM_UPM_LM_CNT,			0x008000),</div><div class='add'>+	REG(ANA_SG_ACCESS_CTRL,			0x008a64),</div><div class='add'>+	REG(ANA_SG_CONFIG_REG_1,		0x007fb0),</div><div class='add'>+	REG(ANA_SG_CONFIG_REG_2,		0x007fb4),</div><div class='add'>+	REG(ANA_SG_CONFIG_REG_3,		0x007fb8),</div><div class='add'>+	REG(ANA_SG_CONFIG_REG_4,		0x007fbc),</div><div class='add'>+	REG(ANA_SG_CONFIG_REG_5,		0x007fc0),</div><div class='add'>+	REG(ANA_SG_GCL_GS_CONFIG,		0x007f80),</div><div class='add'>+	REG(ANA_SG_GCL_TI_CONFIG,		0x007f90),</div><div class='add'>+	REG(ANA_SG_STATUS_REG_1,		0x008980),</div><div class='add'>+	REG(ANA_SG_STATUS_REG_2,		0x008984),</div><div class='add'>+	REG(ANA_SG_STATUS_REG_3,		0x008988),</div><div class='add'>+	REG(ANA_PORT_VLAN_CFG,			0x007800),</div><div class='add'>+	REG(ANA_PORT_DROP_CFG,			0x007804),</div><div class='add'>+	REG(ANA_PORT_QOS_CFG,			0x007808),</div><div class='add'>+	REG(ANA_PORT_VCAP_CFG,			0x00780c),</div><div class='add'>+	REG(ANA_PORT_VCAP_S1_KEY_CFG,		0x007810),</div><div class='add'>+	REG(ANA_PORT_VCAP_S2_CFG,		0x00781c),</div><div class='add'>+	REG(ANA_PORT_PCP_DEI_MAP,		0x007820),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_CFG,		0x007860),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_BPDU_CFG,		0x007864),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_GARP_CFG,		0x007868),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_CCM_CFG,		0x00786c),</div><div class='add'>+	REG(ANA_PORT_PORT_CFG,			0x007870),</div><div class='add'>+	REG(ANA_PORT_POL_CFG,			0x007874),</div><div class='add'>+	REG(ANA_PORT_PTP_CFG,			0x007878),</div><div class='add'>+	REG(ANA_PORT_PTP_DLY1_CFG,		0x00787c),</div><div class='add'>+	REG(ANA_PORT_PTP_DLY2_CFG,		0x007880),</div><div class='add'>+	REG(ANA_PORT_SFID_CFG,			0x007884),</div><div class='add'>+	REG(ANA_PFC_PFC_CFG,			0x008800),</div><div class='add'>+	REG_RESERVED(ANA_PFC_PFC_TIMER),</div><div class='add'>+	REG_RESERVED(ANA_IPT_OAM_MEP_CFG),</div><div class='add'>+	REG_RESERVED(ANA_IPT_IPT),</div><div class='add'>+	REG_RESERVED(ANA_PPT_PPT),</div><div class='add'>+	REG_RESERVED(ANA_FID_MAP_FID_MAP),</div><div class='add'>+	REG(ANA_AGGR_CFG,			0x008a68),</div><div class='add'>+	REG(ANA_CPUQ_CFG,			0x008a6c),</div><div class='add'>+	REG_RESERVED(ANA_CPUQ_CFG2),</div><div class='add'>+	REG(ANA_CPUQ_8021_CFG,			0x008a74),</div><div class='add'>+	REG(ANA_DSCP_CFG,			0x008ab4),</div><div class='add'>+	REG(ANA_DSCP_REWR_CFG,			0x008bb4),</div><div class='add'>+	REG(ANA_VCAP_RNG_TYPE_CFG,		0x008bf4),</div><div class='add'>+	REG(ANA_VCAP_RNG_VAL_CFG,		0x008c14),</div><div class='add'>+	REG_RESERVED(ANA_VRAP_CFG),</div><div class='add'>+	REG_RESERVED(ANA_VRAP_HDR_DATA),</div><div class='add'>+	REG_RESERVED(ANA_VRAP_HDR_MASK),</div><div class='add'>+	REG(ANA_DISCARD_CFG,			0x008c40),</div><div class='add'>+	REG(ANA_FID_CFG,			0x008c44),</div><div class='add'>+	REG(ANA_POL_PIR_CFG,			0x004000),</div><div class='add'>+	REG(ANA_POL_CIR_CFG,			0x004004),</div><div class='add'>+	REG(ANA_POL_MODE_CFG,			0x004008),</div><div class='add'>+	REG(ANA_POL_PIR_STATE,			0x00400c),</div><div class='add'>+	REG(ANA_POL_CIR_STATE,			0x004010),</div><div class='add'>+	REG_RESERVED(ANA_POL_STATE),</div><div class='add'>+	REG(ANA_POL_FLOWC,			0x008c48),</div><div class='add'>+	REG(ANA_POL_HYST,			0x008cb4),</div><div class='add'>+	REG_RESERVED(ANA_POL_MISC_CFG),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_qs_regmap[] = {</div><div class='add'>+	REG(QS_XTR_GRP_CFG,			0x000000),</div><div class='add'>+	REG(QS_XTR_RD,				0x000008),</div><div class='add'>+	REG(QS_XTR_FRM_PRUNING,			0x000010),</div><div class='add'>+	REG(QS_XTR_FLUSH,			0x000018),</div><div class='add'>+	REG(QS_XTR_DATA_PRESENT,		0x00001c),</div><div class='add'>+	REG(QS_XTR_CFG,				0x000020),</div><div class='add'>+	REG(QS_INJ_GRP_CFG,			0x000024),</div><div class='add'>+	REG(QS_INJ_WR,				0x00002c),</div><div class='add'>+	REG(QS_INJ_CTRL,			0x000034),</div><div class='add'>+	REG(QS_INJ_STATUS,			0x00003c),</div><div class='add'>+	REG(QS_INJ_ERR,				0x000040),</div><div class='add'>+	REG_RESERVED(QS_INH_DBG),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_vcap_regmap[] = {</div><div class='add'>+	/* VCAP_CORE_CFG */</div><div class='add'>+	REG(VCAP_CORE_UPDATE_CTRL,		0x000000),</div><div class='add'>+	REG(VCAP_CORE_MV_CFG,			0x000004),</div><div class='add'>+	/* VCAP_CORE_CACHE */</div><div class='add'>+	REG(VCAP_CACHE_ENTRY_DAT,		0x000008),</div><div class='add'>+	REG(VCAP_CACHE_MASK_DAT,		0x000108),</div><div class='add'>+	REG(VCAP_CACHE_ACTION_DAT,		0x000208),</div><div class='add'>+	REG(VCAP_CACHE_CNT_DAT,			0x000308),</div><div class='add'>+	REG(VCAP_CACHE_TG_DAT,			0x000388),</div><div class='add'>+	/* VCAP_CONST */</div><div class='add'>+	REG(VCAP_CONST_VCAP_VER,		0x000398),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_WIDTH,		0x00039c),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_CNT,		0x0003a0),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_SWCNT,		0x0003a4),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_TG_WIDTH,		0x0003a8),</div><div class='add'>+	REG(VCAP_CONST_ACTION_DEF_CNT,		0x0003ac),</div><div class='add'>+	REG(VCAP_CONST_ACTION_WIDTH,		0x0003b0),</div><div class='add'>+	REG(VCAP_CONST_CNT_WIDTH,		0x0003b4),</div><div class='add'>+	REG(VCAP_CONST_CORE_CNT,		0x0003b8),</div><div class='add'>+	REG(VCAP_CONST_IF_CNT,			0x0003bc),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_qsys_regmap[] = {</div><div class='add'>+	REG(QSYS_PORT_MODE,			0x00f460),</div><div class='add'>+	REG(QSYS_SWITCH_PORT_MODE,		0x00f480),</div><div class='add'>+	REG(QSYS_STAT_CNT_CFG,			0x00f49c),</div><div class='add'>+	REG(QSYS_EEE_CFG,			0x00f4a0),</div><div class='add'>+	REG(QSYS_EEE_THRES,			0x00f4b8),</div><div class='add'>+	REG(QSYS_IGR_NO_SHARING,		0x00f4bc),</div><div class='add'>+	REG(QSYS_EGR_NO_SHARING,		0x00f4c0),</div><div class='add'>+	REG(QSYS_SW_STATUS,			0x00f4c4),</div><div class='add'>+	REG(QSYS_EXT_CPU_CFG,			0x00f4e0),</div><div class='add'>+	REG_RESERVED(QSYS_PAD_CFG),</div><div class='add'>+	REG(QSYS_CPU_GROUP_MAP,			0x00f4e8),</div><div class='add'>+	REG_RESERVED(QSYS_QMAP),</div><div class='add'>+	REG_RESERVED(QSYS_ISDX_SGRP),</div><div class='add'>+	REG_RESERVED(QSYS_TIMED_FRAME_ENTRY),</div><div class='add'>+	REG(QSYS_TFRM_MISC,			0x00f50c),</div><div class='add'>+	REG(QSYS_TFRM_PORT_DLY,			0x00f510),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_1,		0x00f514),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_2,		0x00f518),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_3,		0x00f51c),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_4,		0x00f520),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_5,		0x00f524),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_6,		0x00f528),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_7,		0x00f52c),</div><div class='add'>+	REG(QSYS_TFRM_TIMER_CFG_8,		0x00f530),</div><div class='add'>+	REG(QSYS_RED_PROFILE,			0x00f534),</div><div class='add'>+	REG(QSYS_RES_QOS_MODE,			0x00f574),</div><div class='add'>+	REG(QSYS_RES_CFG,			0x00c000),</div><div class='add'>+	REG(QSYS_RES_STAT,			0x00c004),</div><div class='add'>+	REG(QSYS_EGR_DROP_MODE,			0x00f578),</div><div class='add'>+	REG(QSYS_EQ_CTRL,			0x00f57c),</div><div class='add'>+	REG_RESERVED(QSYS_EVENTS_CORE),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_0,			0x00f584),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_1,			0x00f5a0),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_2,			0x00f5bc),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_3,			0x00f5d8),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_4,			0x00f5f4),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_5,			0x00f610),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_6,			0x00f62c),</div><div class='add'>+	REG(QSYS_QMAXSDU_CFG_7,			0x00f648),</div><div class='add'>+	REG(QSYS_PREEMPTION_CFG,		0x00f664),</div><div class='add'>+	REG(QSYS_CIR_CFG,			0x000000),</div><div class='add'>+	REG(QSYS_EIR_CFG,			0x000004),</div><div class='add'>+	REG(QSYS_SE_CFG,			0x000008),</div><div class='add'>+	REG(QSYS_SE_DWRR_CFG,			0x00000c),</div><div class='add'>+	REG_RESERVED(QSYS_SE_CONNECT),</div><div class='add'>+	REG(QSYS_SE_DLB_SENSE,			0x000040),</div><div class='add'>+	REG(QSYS_CIR_STATE,			0x000044),</div><div class='add'>+	REG(QSYS_EIR_STATE,			0x000048),</div><div class='add'>+	REG_RESERVED(QSYS_SE_STATE),</div><div class='add'>+	REG(QSYS_HSCH_MISC_CFG,			0x00f67c),</div><div class='add'>+	REG(QSYS_TAG_CONFIG,			0x00f680),</div><div class='add'>+	REG(QSYS_TAS_PARAM_CFG_CTRL,		0x00f698),</div><div class='add'>+	REG(QSYS_PORT_MAX_SDU,			0x00f69c),</div><div class='add'>+	REG(QSYS_PARAM_CFG_REG_1,		0x00f440),</div><div class='add'>+	REG(QSYS_PARAM_CFG_REG_2,		0x00f444),</div><div class='add'>+	REG(QSYS_PARAM_CFG_REG_3,		0x00f448),</div><div class='add'>+	REG(QSYS_PARAM_CFG_REG_4,		0x00f44c),</div><div class='add'>+	REG(QSYS_PARAM_CFG_REG_5,		0x00f450),</div><div class='add'>+	REG(QSYS_GCL_CFG_REG_1,			0x00f454),</div><div class='add'>+	REG(QSYS_GCL_CFG_REG_2,			0x00f458),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_1,		0x00f400),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_2,		0x00f404),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_3,		0x00f408),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_4,		0x00f40c),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_5,		0x00f410),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_6,		0x00f414),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_7,		0x00f418),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_8,		0x00f41c),</div><div class='add'>+	REG(QSYS_PARAM_STATUS_REG_9,		0x00f420),</div><div class='add'>+	REG(QSYS_GCL_STATUS_REG_1,		0x00f424),</div><div class='add'>+	REG(QSYS_GCL_STATUS_REG_2,		0x00f428),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_rew_regmap[] = {</div><div class='add'>+	REG(REW_PORT_VLAN_CFG,			0x000000),</div><div class='add'>+	REG(REW_TAG_CFG,			0x000004),</div><div class='add'>+	REG(REW_PORT_CFG,			0x000008),</div><div class='add'>+	REG(REW_DSCP_CFG,			0x00000c),</div><div class='add'>+	REG(REW_PCP_DEI_QOS_MAP_CFG,		0x000010),</div><div class='add'>+	REG(REW_PTP_CFG,			0x000050),</div><div class='add'>+	REG(REW_PTP_DLY1_CFG,			0x000054),</div><div class='add'>+	REG(REW_RED_TAG_CFG,			0x000058),</div><div class='add'>+	REG(REW_DSCP_REMAP_DP1_CFG,		0x000410),</div><div class='add'>+	REG(REW_DSCP_REMAP_CFG,			0x000510),</div><div class='add'>+	REG_RESERVED(REW_STAT_CFG),</div><div class='add'>+	REG_RESERVED(REW_REW_STICKY),</div><div class='add'>+	REG_RESERVED(REW_PPT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_sys_regmap[] = {</div><div class='add'>+	REG(SYS_COUNT_RX_OCTETS,		0x000000),</div><div class='add'>+	REG(SYS_COUNT_RX_UNICAST,		0x000004),</div><div class='add'>+	REG(SYS_COUNT_RX_MULTICAST,		0x000008),</div><div class='add'>+	REG(SYS_COUNT_RX_BROADCAST,		0x00000c),</div><div class='add'>+	REG(SYS_COUNT_RX_SHORTS,		0x000010),</div><div class='add'>+	REG(SYS_COUNT_RX_FRAGMENTS,		0x000014),</div><div class='add'>+	REG(SYS_COUNT_RX_JABBERS,		0x000018),</div><div class='add'>+	REG(SYS_COUNT_RX_CRC_ALIGN_ERRS,	0x00001c),</div><div class='add'>+	REG(SYS_COUNT_RX_SYM_ERRS,		0x000020),</div><div class='add'>+	REG(SYS_COUNT_RX_64,			0x000024),</div><div class='add'>+	REG(SYS_COUNT_RX_65_127,		0x000028),</div><div class='add'>+	REG(SYS_COUNT_RX_128_255,		0x00002c),</div><div class='add'>+	REG(SYS_COUNT_RX_256_511,		0x000030),</div><div class='add'>+	REG(SYS_COUNT_RX_512_1023,		0x000034),</div><div class='add'>+	REG(SYS_COUNT_RX_1024_1526,		0x000038),</div><div class='add'>+	REG(SYS_COUNT_RX_1527_MAX,		0x00003c),</div><div class='add'>+	REG(SYS_COUNT_RX_PAUSE,			0x000040),</div><div class='add'>+	REG(SYS_COUNT_RX_CONTROL,		0x000044),</div><div class='add'>+	REG(SYS_COUNT_RX_LONGS,			0x000048),</div><div class='add'>+	REG(SYS_COUNT_RX_CLASSIFIED_DROPS,	0x00004c),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_0,		0x000050),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_1,		0x000054),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_2,		0x000058),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_3,		0x00005c),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_4,		0x000060),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_5,		0x000064),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_6,		0x000068),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_7,		0x00006c),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_0,		0x000070),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_1,		0x000074),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_2,		0x000078),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_3,		0x00007c),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_4,		0x000080),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_5,		0x000084),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_6,		0x000088),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_7,		0x00008c),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_0,		0x000090),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_1,		0x000094),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_2,		0x000098),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_3,		0x00009c),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_4,		0x0000a0),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_5,		0x0000a4),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_6,		0x0000a8),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_7,		0x0000ac),</div><div class='add'>+	REG(SYS_COUNT_RX_ASSEMBLY_ERRS,		0x0000b0),</div><div class='add'>+	REG(SYS_COUNT_RX_SMD_ERRS,		0x0000b4),</div><div class='add'>+	REG(SYS_COUNT_RX_ASSEMBLY_OK,		0x0000b8),</div><div class='add'>+	REG(SYS_COUNT_RX_MERGE_FRAGMENTS,	0x0000bc),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_OCTETS,		0x0000c0),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_UNICAST,		0x0000c4),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_MULTICAST,	0x0000c8),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_BROADCAST,	0x0000cc),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_SHORTS,		0x0000d0),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_FRAGMENTS,	0x0000d4),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_JABBERS,		0x0000d8),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_CRC_ALIGN_ERRS,	0x0000dc),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_SYM_ERRS,		0x0000e0),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_64,		0x0000e4),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_65_127,		0x0000e8),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_128_255,		0x0000ec),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_256_511,		0x0000f0),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_512_1023,		0x0000f4),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_1024_1526,	0x0000f8),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_1527_MAX,		0x0000fc),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_PAUSE,		0x000100),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_CONTROL,		0x000104),</div><div class='add'>+	REG(SYS_COUNT_RX_PMAC_LONGS,		0x000108),</div><div class='add'>+	REG(SYS_COUNT_TX_OCTETS,		0x000200),</div><div class='add'>+	REG(SYS_COUNT_TX_UNICAST,		0x000204),</div><div class='add'>+	REG(SYS_COUNT_TX_MULTICAST,		0x000208),</div><div class='add'>+	REG(SYS_COUNT_TX_BROADCAST,		0x00020c),</div><div class='add'>+	REG(SYS_COUNT_TX_COLLISION,		0x000210),</div><div class='add'>+	REG(SYS_COUNT_TX_DROPS,			0x000214),</div><div class='add'>+	REG(SYS_COUNT_TX_PAUSE,			0x000218),</div><div class='add'>+	REG(SYS_COUNT_TX_64,			0x00021c),</div><div class='add'>+	REG(SYS_COUNT_TX_65_127,		0x000220),</div><div class='add'>+	REG(SYS_COUNT_TX_128_255,		0x000224),</div><div class='add'>+	REG(SYS_COUNT_TX_256_511,		0x000228),</div><div class='add'>+	REG(SYS_COUNT_TX_512_1023,		0x00022c),</div><div class='add'>+	REG(SYS_COUNT_TX_1024_1526,		0x000230),</div><div class='add'>+	REG(SYS_COUNT_TX_1527_MAX,		0x000234),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_0,		0x000238),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_1,		0x00023c),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_2,		0x000240),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_3,		0x000244),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_4,		0x000248),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_5,		0x00024c),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_6,		0x000250),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_7,		0x000254),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_0,		0x000258),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_1,		0x00025c),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_2,		0x000260),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_3,		0x000264),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_4,		0x000268),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_5,		0x00026c),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_6,		0x000270),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_7,		0x000274),</div><div class='add'>+	REG(SYS_COUNT_TX_AGED,			0x000278),</div><div class='add'>+	REG(SYS_COUNT_TX_MM_HOLD,		0x00027c),</div><div class='add'>+	REG(SYS_COUNT_TX_MERGE_FRAGMENTS,	0x000280),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_OCTETS,		0x000284),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_UNICAST,		0x000288),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_MULTICAST,	0x00028c),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_BROADCAST,	0x000290),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_PAUSE,		0x000294),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_64,		0x000298),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_65_127,		0x00029c),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_128_255,		0x0002a0),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_256_511,		0x0002a4),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_512_1023,		0x0002a8),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_1024_1526,	0x0002ac),</div><div class='add'>+	REG(SYS_COUNT_TX_PMAC_1527_MAX,		0x0002b0),</div><div class='add'>+	REG(SYS_COUNT_DROP_LOCAL,		0x000400),</div><div class='add'>+	REG(SYS_COUNT_DROP_TAIL,		0x000404),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_0,	0x000408),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_1,	0x00040c),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_2,	0x000410),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_3,	0x000414),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_4,	0x000418),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_5,	0x00041c),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_6,	0x000420),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_7,	0x000424),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_0,	0x000428),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_1,	0x00042c),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_2,	0x000430),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_3,	0x000434),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_4,	0x000438),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_5,	0x00043c),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_6,	0x000440),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_7,	0x000444),</div><div class='add'>+	REG(SYS_COUNT_SF_MATCHING_FRAMES,	0x000800),</div><div class='add'>+	REG(SYS_COUNT_SF_NOT_PASSING_FRAMES,	0x000804),</div><div class='add'>+	REG(SYS_COUNT_SF_NOT_PASSING_SDU,	0x000808),</div><div class='add'>+	REG(SYS_COUNT_SF_RED_FRAMES,		0x00080c),</div><div class='add'>+	REG(SYS_RESET_CFG,			0x000e00),</div><div class='add'>+	REG(SYS_SR_ETYPE_CFG,			0x000e04),</div><div class='add'>+	REG(SYS_VLAN_ETYPE_CFG,			0x000e08),</div><div class='add'>+	REG(SYS_PORT_MODE,			0x000e0c),</div><div class='add'>+	REG(SYS_FRONT_PORT_MODE,		0x000e2c),</div><div class='add'>+	REG(SYS_FRM_AGING,			0x000e44),</div><div class='add'>+	REG(SYS_STAT_CFG,			0x000e48),</div><div class='add'>+	REG(SYS_SW_STATUS,			0x000e4c),</div><div class='add'>+	REG_RESERVED(SYS_MISC_CFG),</div><div class='add'>+	REG(SYS_REW_MAC_HIGH_CFG,		0x000e6c),</div><div class='add'>+	REG(SYS_REW_MAC_LOW_CFG,		0x000e84),</div><div class='add'>+	REG(SYS_TIMESTAMP_OFFSET,		0x000e9c),</div><div class='add'>+	REG(SYS_PAUSE_CFG,			0x000ea0),</div><div class='add'>+	REG(SYS_PAUSE_TOT_CFG,			0x000ebc),</div><div class='add'>+	REG(SYS_ATOP,				0x000ec0),</div><div class='add'>+	REG(SYS_ATOP_TOT_CFG,			0x000edc),</div><div class='add'>+	REG(SYS_MAC_FC_CFG,			0x000ee0),</div><div class='add'>+	REG(SYS_MMGT,				0x000ef8),</div><div class='add'>+	REG_RESERVED(SYS_MMGT_FAST),</div><div class='add'>+	REG_RESERVED(SYS_EVENTS_DIF),</div><div class='add'>+	REG_RESERVED(SYS_EVENTS_CORE),</div><div class='add'>+	REG(SYS_PTP_STATUS,			0x000f14),</div><div class='add'>+	REG(SYS_PTP_TXSTAMP,			0x000f18),</div><div class='add'>+	REG(SYS_PTP_NXT,			0x000f1c),</div><div class='add'>+	REG(SYS_PTP_CFG,			0x000f20),</div><div class='add'>+	REG(SYS_RAM_INIT,			0x000f24),</div><div class='add'>+	REG_RESERVED(SYS_CM_ADDR),</div><div class='add'>+	REG_RESERVED(SYS_CM_DATA_WR),</div><div class='add'>+	REG_RESERVED(SYS_CM_DATA_RD),</div><div class='add'>+	REG_RESERVED(SYS_CM_OP),</div><div class='add'>+	REG_RESERVED(SYS_CM_DATA),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_ptp_regmap[] = {</div><div class='add'>+	REG(PTP_PIN_CFG,			0x000000),</div><div class='add'>+	REG(PTP_PIN_TOD_SEC_MSB,		0x000004),</div><div class='add'>+	REG(PTP_PIN_TOD_SEC_LSB,		0x000008),</div><div class='add'>+	REG(PTP_PIN_TOD_NSEC,			0x00000c),</div><div class='add'>+	REG(PTP_PIN_WF_HIGH_PERIOD,		0x000014),</div><div class='add'>+	REG(PTP_PIN_WF_LOW_PERIOD,		0x000018),</div><div class='add'>+	REG(PTP_CFG_MISC,			0x0000a0),</div><div class='add'>+	REG(PTP_CLK_CFG_ADJ_CFG,		0x0000a4),</div><div class='add'>+	REG(PTP_CLK_CFG_ADJ_FREQ,		0x0000a8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_gcb_regmap[] = {</div><div class='add'>+	REG(GCB_SOFT_RST,			0x000004),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9959_dev_gmii_regmap[] = {</div><div class='add'>+	REG(DEV_CLOCK_CFG,			0x0),</div><div class='add'>+	REG(DEV_PORT_MISC,			0x4),</div><div class='add'>+	REG(DEV_EVENTS,				0x8),</div><div class='add'>+	REG(DEV_EEE_CFG,			0xc),</div><div class='add'>+	REG(DEV_RX_PATH_DELAY,			0x10),</div><div class='add'>+	REG(DEV_TX_PATH_DELAY,			0x14),</div><div class='add'>+	REG(DEV_PTP_PREDICT_CFG,		0x18),</div><div class='add'>+	REG(DEV_MAC_ENA_CFG,			0x1c),</div><div class='add'>+	REG(DEV_MAC_MODE_CFG,			0x20),</div><div class='add'>+	REG(DEV_MAC_MAXLEN_CFG,			0x24),</div><div class='add'>+	REG(DEV_MAC_TAGS_CFG,			0x28),</div><div class='add'>+	REG(DEV_MAC_ADV_CHK_CFG,		0x2c),</div><div class='add'>+	REG(DEV_MAC_IFG_CFG,			0x30),</div><div class='add'>+	REG(DEV_MAC_HDX_CFG,			0x34),</div><div class='add'>+	REG(DEV_MAC_DBG_CFG,			0x38),</div><div class='add'>+	REG(DEV_MAC_FC_MAC_LOW_CFG,		0x3c),</div><div class='add'>+	REG(DEV_MAC_FC_MAC_HIGH_CFG,		0x40),</div><div class='add'>+	REG(DEV_MAC_STICKY,			0x44),</div><div class='add'>+	REG(DEV_MM_ENABLE_CONFIG,		0x48),</div><div class='add'>+	REG(DEV_MM_VERIF_CONFIG,		0x4C),</div><div class='add'>+	REG(DEV_MM_STATUS,			0x50),</div><div class='add'>+	REG_RESERVED(PCS1G_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_MODE_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_SD_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_NP_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_LB_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_DBG_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_CDET_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_NP_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_LINK_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_LINK_DOWN_CNT),</div><div class='add'>+	REG_RESERVED(PCS1G_STICKY),</div><div class='add'>+	REG_RESERVED(PCS1G_DEBUG_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_LPI_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_LPI_WAKE_ERROR_CNT),</div><div class='add'>+	REG_RESERVED(PCS1G_LPI_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_TSTPAT_MODE_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_TSTPAT_STATUS),</div><div class='add'>+	REG_RESERVED(DEV_PCS_FX100_CFG),</div><div class='add'>+	REG_RESERVED(DEV_PCS_FX100_STATUS),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 *vsc9959_regmap[TARGET_MAX] = {</div><div class='add'>+	[ANA]	= vsc9959_ana_regmap,</div><div class='add'>+	[QS]	= vsc9959_qs_regmap,</div><div class='add'>+	[QSYS]	= vsc9959_qsys_regmap,</div><div class='add'>+	[REW]	= vsc9959_rew_regmap,</div><div class='add'>+	[SYS]	= vsc9959_sys_regmap,</div><div class='add'>+	[S0]	= vsc9959_vcap_regmap,</div><div class='add'>+	[S1]	= vsc9959_vcap_regmap,</div><div class='add'>+	[S2]	= vsc9959_vcap_regmap,</div><div class='add'>+	[PTP]	= vsc9959_ptp_regmap,</div><div class='add'>+	[GCB]	= vsc9959_gcb_regmap,</div><div class='add'>+	[DEV_GMII] = vsc9959_dev_gmii_regmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Addresses are relative to the PCI device's base address */</div><div class='add'>+static const struct resource vsc9959_resources[] = {</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0010000, 0x0010000, "sys"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0030000, 0x0010000, "rew"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0040000, 0x0000400, "s0"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0050000, 0x0000400, "s1"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0060000, 0x0000400, "s2"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0070000, 0x0000200, "devcpu_gcb"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0080000, 0x0000100, "qs"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0090000, 0x00000cc, "ptp"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0100000, 0x0010000, "port0"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0110000, 0x0010000, "port1"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0120000, 0x0010000, "port2"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0130000, 0x0010000, "port3"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0140000, 0x0010000, "port4"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0150000, 0x0010000, "port5"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0200000, 0x0020000, "qsys"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0280000, 0x0010000, "ana"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vsc9959_resource_names[TARGET_MAX] = {</div><div class='add'>+	[SYS] = "sys",</div><div class='add'>+	[REW] = "rew",</div><div class='add'>+	[S0] = "s0",</div><div class='add'>+	[S1] = "s1",</div><div class='add'>+	[S2] = "s2",</div><div class='add'>+	[GCB] = "devcpu_gcb",</div><div class='add'>+	[QS] = "qs",</div><div class='add'>+	[PTP] = "ptp",</div><div class='add'>+	[QSYS] = "qsys",</div><div class='add'>+	[ANA] = "ana",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Port MAC 0 Internal MDIO bus through which the SerDes acting as an</div><div class='add'>+ * SGMII/QSGMII MAC PCS can be found.</div><div class='add'>+ */</div><div class='add'>+static const struct resource vsc9959_imdio_res =</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x8030, 0x10, "imdio");</div><div class='add'>+</div><div class='add'>+static const struct reg_field vsc9959_regfields[REGFIELD_MAX] = {</div><div class='add'>+	[ANA_ADVLEARN_VLAN_CHK] = REG_FIELD(ANA_ADVLEARN, 6, 6),</div><div class='add'>+	[ANA_ADVLEARN_LEARN_MIRROR] = REG_FIELD(ANA_ADVLEARN, 0, 5),</div><div class='add'>+	[ANA_ANEVENTS_FLOOD_DISCARD] = REG_FIELD(ANA_ANEVENTS, 30, 30),</div><div class='add'>+	[ANA_ANEVENTS_AUTOAGE] = REG_FIELD(ANA_ANEVENTS, 26, 26),</div><div class='add'>+	[ANA_ANEVENTS_STORM_DROP] = REG_FIELD(ANA_ANEVENTS, 24, 24),</div><div class='add'>+	[ANA_ANEVENTS_LEARN_DROP] = REG_FIELD(ANA_ANEVENTS, 23, 23),</div><div class='add'>+	[ANA_ANEVENTS_AGED_ENTRY] = REG_FIELD(ANA_ANEVENTS, 22, 22),</div><div class='add'>+	[ANA_ANEVENTS_CPU_LEARN_FAILED] = REG_FIELD(ANA_ANEVENTS, 21, 21),</div><div class='add'>+	[ANA_ANEVENTS_AUTO_LEARN_FAILED] = REG_FIELD(ANA_ANEVENTS, 20, 20),</div><div class='add'>+	[ANA_ANEVENTS_LEARN_REMOVE] = REG_FIELD(ANA_ANEVENTS, 19, 19),</div><div class='add'>+	[ANA_ANEVENTS_AUTO_LEARNED] = REG_FIELD(ANA_ANEVENTS, 18, 18),</div><div class='add'>+	[ANA_ANEVENTS_AUTO_MOVED] = REG_FIELD(ANA_ANEVENTS, 17, 17),</div><div class='add'>+	[ANA_ANEVENTS_CLASSIFIED_DROP] = REG_FIELD(ANA_ANEVENTS, 15, 15),</div><div class='add'>+	[ANA_ANEVENTS_CLASSIFIED_COPY] = REG_FIELD(ANA_ANEVENTS, 14, 14),</div><div class='add'>+	[ANA_ANEVENTS_VLAN_DISCARD] = REG_FIELD(ANA_ANEVENTS, 13, 13),</div><div class='add'>+	[ANA_ANEVENTS_FWD_DISCARD] = REG_FIELD(ANA_ANEVENTS, 12, 12),</div><div class='add'>+	[ANA_ANEVENTS_MULTICAST_FLOOD] = REG_FIELD(ANA_ANEVENTS, 11, 11),</div><div class='add'>+	[ANA_ANEVENTS_UNICAST_FLOOD] = REG_FIELD(ANA_ANEVENTS, 10, 10),</div><div class='add'>+	[ANA_ANEVENTS_DEST_KNOWN] = REG_FIELD(ANA_ANEVENTS, 9, 9),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET3_MATCH] = REG_FIELD(ANA_ANEVENTS, 8, 8),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET2_MATCH] = REG_FIELD(ANA_ANEVENTS, 7, 7),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET1_MATCH] = REG_FIELD(ANA_ANEVENTS, 6, 6),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET0_MATCH] = REG_FIELD(ANA_ANEVENTS, 5, 5),</div><div class='add'>+	[ANA_ANEVENTS_CPU_OPERATION] = REG_FIELD(ANA_ANEVENTS, 4, 4),</div><div class='add'>+	[ANA_ANEVENTS_DMAC_LOOKUP] = REG_FIELD(ANA_ANEVENTS, 3, 3),</div><div class='add'>+	[ANA_ANEVENTS_SMAC_LOOKUP] = REG_FIELD(ANA_ANEVENTS, 2, 2),</div><div class='add'>+	[ANA_ANEVENTS_SEQ_GEN_ERR_0] = REG_FIELD(ANA_ANEVENTS, 1, 1),</div><div class='add'>+	[ANA_ANEVENTS_SEQ_GEN_ERR_1] = REG_FIELD(ANA_ANEVENTS, 0, 0),</div><div class='add'>+	[ANA_TABLES_MACACCESS_B_DOM] = REG_FIELD(ANA_TABLES_MACACCESS, 16, 16),</div><div class='add'>+	[ANA_TABLES_MACTINDX_BUCKET] = REG_FIELD(ANA_TABLES_MACTINDX, 11, 12),</div><div class='add'>+	[ANA_TABLES_MACTINDX_M_INDEX] = REG_FIELD(ANA_TABLES_MACTINDX, 0, 10),</div><div class='add'>+	[SYS_RESET_CFG_CORE_ENA] = REG_FIELD(SYS_RESET_CFG, 0, 0),</div><div class='add'>+	[GCB_SOFT_RST_SWC_RST] = REG_FIELD(GCB_SOFT_RST, 0, 0),</div><div class='add'>+	/* Replicated per number of ports (7), register size 4 per port */</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_PORT_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 14, 14, 7, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 11, 13, 7, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_YEL_RSRVD] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 10, 10, 7, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 9, 9, 7, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_TX_PFC_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 1, 8, 7, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_TX_PFC_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 0, 0, 7, 4),</div><div class='add'>+	[SYS_PORT_MODE_DATA_WO_TS] = REG_FIELD_ID(SYS_PORT_MODE, 5, 6, 7, 4),</div><div class='add'>+	[SYS_PORT_MODE_INCL_INJ_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 3, 4, 7, 4),</div><div class='add'>+	[SYS_PORT_MODE_INCL_XTR_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 1, 2, 7, 4),</div><div class='add'>+	[SYS_PORT_MODE_INCL_HDR_ERR] = REG_FIELD_ID(SYS_PORT_MODE, 0, 0, 7, 4),</div><div class='add'>+	[SYS_PAUSE_CFG_PAUSE_START] = REG_FIELD_ID(SYS_PAUSE_CFG, 10, 18, 7, 4),</div><div class='add'>+	[SYS_PAUSE_CFG_PAUSE_STOP] = REG_FIELD_ID(SYS_PAUSE_CFG, 1, 9, 7, 4),</div><div class='add'>+	[SYS_PAUSE_CFG_PAUSE_ENA] = REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 7, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9959_vcap_es0_keys[] = {</div><div class='add'>+	[VCAP_ES0_EGR_PORT]			= {  0,  3},</div><div class='add'>+	[VCAP_ES0_IGR_PORT]			= {  3,  3},</div><div class='add'>+	[VCAP_ES0_RSV]				= {  6,  2},</div><div class='add'>+	[VCAP_ES0_L2_MC]			= {  8,  1},</div><div class='add'>+	[VCAP_ES0_L2_BC]			= {  9,  1},</div><div class='add'>+	[VCAP_ES0_VID]				= { 10, 12},</div><div class='add'>+	[VCAP_ES0_DP]				= { 22,  1},</div><div class='add'>+	[VCAP_ES0_PCP]				= { 23,  3},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9959_vcap_es0_actions[] = {</div><div class='add'>+	[VCAP_ES0_ACT_PUSH_OUTER_TAG]		= {  0,  2},</div><div class='add'>+	[VCAP_ES0_ACT_PUSH_INNER_TAG]		= {  2,  1},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_TPID_SEL]		= {  3,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_VID_SEL]		= {  5,  1},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_PCP_SEL]		= {  6,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_DEI_SEL]		= {  8,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_TPID_SEL]		= { 10,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_VID_SEL]		= { 12,  1},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_PCP_SEL]		= { 13,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_DEI_SEL]		= { 15,  2},</div><div class='add'>+	[VCAP_ES0_ACT_VID_A_VAL]		= { 17, 12},</div><div class='add'>+	[VCAP_ES0_ACT_PCP_A_VAL]		= { 29,  3},</div><div class='add'>+	[VCAP_ES0_ACT_DEI_A_VAL]		= { 32,  1},</div><div class='add'>+	[VCAP_ES0_ACT_VID_B_VAL]		= { 33, 12},</div><div class='add'>+	[VCAP_ES0_ACT_PCP_B_VAL]		= { 45,  3},</div><div class='add'>+	[VCAP_ES0_ACT_DEI_B_VAL]		= { 48,  1},</div><div class='add'>+	[VCAP_ES0_ACT_RSV]			= { 49, 23},</div><div class='add'>+	[VCAP_ES0_ACT_HIT_STICKY]		= { 72,  1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9959_vcap_is1_keys[] = {</div><div class='add'>+	[VCAP_IS1_HK_TYPE]			= {  0,   1},</div><div class='add'>+	[VCAP_IS1_HK_LOOKUP]			= {  1,   2},</div><div class='add'>+	[VCAP_IS1_HK_IGR_PORT_MASK]		= {  3,   7},</div><div class='add'>+	[VCAP_IS1_HK_RSV]			= { 10,   9},</div><div class='add'>+	[VCAP_IS1_HK_OAM_Y1731]			= { 19,   1},</div><div class='add'>+	[VCAP_IS1_HK_L2_MC]			= { 20,   1},</div><div class='add'>+	[VCAP_IS1_HK_L2_BC]			= { 21,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP_MC]			= { 22,   1},</div><div class='add'>+	[VCAP_IS1_HK_VLAN_TAGGED]		= { 23,   1},</div><div class='add'>+	[VCAP_IS1_HK_VLAN_DBL_TAGGED]		= { 24,   1},</div><div class='add'>+	[VCAP_IS1_HK_TPID]			= { 25,   1},</div><div class='add'>+	[VCAP_IS1_HK_VID]			= { 26,  12},</div><div class='add'>+	[VCAP_IS1_HK_DEI]			= { 38,   1},</div><div class='add'>+	[VCAP_IS1_HK_PCP]			= { 39,   3},</div><div class='add'>+	/* Specific Fields for IS1 Half Key S1_NORMAL */</div><div class='add'>+	[VCAP_IS1_HK_L2_SMAC]			= { 42,  48},</div><div class='add'>+	[VCAP_IS1_HK_ETYPE_LEN]			= { 90,   1},</div><div class='add'>+	[VCAP_IS1_HK_ETYPE]			= { 91,  16},</div><div class='add'>+	[VCAP_IS1_HK_IP_SNAP]			= {107,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4]			= {108,   1},</div><div class='add'>+	/* Layer-3 Information */</div><div class='add'>+	[VCAP_IS1_HK_L3_FRAGMENT]		= {109,   1},</div><div class='add'>+	[VCAP_IS1_HK_L3_FRAG_OFS_GT0]		= {110,   1},</div><div class='add'>+	[VCAP_IS1_HK_L3_OPTIONS]		= {111,   1},</div><div class='add'>+	[VCAP_IS1_HK_L3_DSCP]			= {112,   6},</div><div class='add'>+	[VCAP_IS1_HK_L3_IP4_SIP]		= {118,  32},</div><div class='add'>+	/* Layer-4 Information */</div><div class='add'>+	[VCAP_IS1_HK_TCP_UDP]			= {150,   1},</div><div class='add'>+	[VCAP_IS1_HK_TCP]			= {151,   1},</div><div class='add'>+	[VCAP_IS1_HK_L4_SPORT]			= {152,  16},</div><div class='add'>+	[VCAP_IS1_HK_L4_RNG]			= {168,   8},</div><div class='add'>+	/* Specific Fields for IS1 Half Key S1_5TUPLE_IP4 */</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_TPID]            = { 42,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_VID]		= { 43,  12},</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_DEI]		= { 55,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_PCP]		= { 56,   3},</div><div class='add'>+	[VCAP_IS1_HK_IP4_IP4]			= { 59,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_FRAGMENT]		= { 60,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_FRAG_OFS_GT0]	= { 61,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_OPTIONS]		= { 62,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_DSCP]		= { 63,   6},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_IP4_DIP]		= { 69,  32},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_IP4_SIP]		= {101,  32},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_PROTO]		= {133,   8},</div><div class='add'>+	[VCAP_IS1_HK_IP4_TCP_UDP]		= {141,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_TCP]			= {142,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L4_RNG]		= {143,   8},</div><div class='add'>+	[VCAP_IS1_HK_IP4_IP_PAYLOAD_S1_5TUPLE]	= {151,  32},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9959_vcap_is1_actions[] = {</div><div class='add'>+	[VCAP_IS1_ACT_DSCP_ENA]			= {  0,  1},</div><div class='add'>+	[VCAP_IS1_ACT_DSCP_VAL]			= {  1,  6},</div><div class='add'>+	[VCAP_IS1_ACT_QOS_ENA]			= {  7,  1},</div><div class='add'>+	[VCAP_IS1_ACT_QOS_VAL]			= {  8,  3},</div><div class='add'>+	[VCAP_IS1_ACT_DP_ENA]			= { 11,  1},</div><div class='add'>+	[VCAP_IS1_ACT_DP_VAL]			= { 12,  1},</div><div class='add'>+	[VCAP_IS1_ACT_PAG_OVERRIDE_MASK]	= { 13,  8},</div><div class='add'>+	[VCAP_IS1_ACT_PAG_VAL]			= { 21,  8},</div><div class='add'>+	[VCAP_IS1_ACT_RSV]			= { 29,  9},</div><div class='add'>+	/* The fields below are incorrectly shifted by 2 in the manual */</div><div class='add'>+	[VCAP_IS1_ACT_VID_REPLACE_ENA]		= { 38,  1},</div><div class='add'>+	[VCAP_IS1_ACT_VID_ADD_VAL]		= { 39, 12},</div><div class='add'>+	[VCAP_IS1_ACT_FID_SEL]			= { 51,  2},</div><div class='add'>+	[VCAP_IS1_ACT_FID_VAL]			= { 53, 13},</div><div class='add'>+	[VCAP_IS1_ACT_PCP_DEI_ENA]		= { 66,  1},</div><div class='add'>+	[VCAP_IS1_ACT_PCP_VAL]			= { 67,  3},</div><div class='add'>+	[VCAP_IS1_ACT_DEI_VAL]			= { 70,  1},</div><div class='add'>+	[VCAP_IS1_ACT_VLAN_POP_CNT_ENA]		= { 71,  1},</div><div class='add'>+	[VCAP_IS1_ACT_VLAN_POP_CNT]		= { 72,  2},</div><div class='add'>+	[VCAP_IS1_ACT_CUSTOM_ACE_TYPE_ENA]	= { 74,  4},</div><div class='add'>+	[VCAP_IS1_ACT_HIT_STICKY]		= { 78,  1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcap_field vsc9959_vcap_is2_keys[] = {</div><div class='add'>+	/* Common: 41 bits */</div><div class='add'>+	[VCAP_IS2_TYPE]				= {  0,   4},</div><div class='add'>+	[VCAP_IS2_HK_FIRST]			= {  4,   1},</div><div class='add'>+	[VCAP_IS2_HK_PAG]			= {  5,   8},</div><div class='add'>+	[VCAP_IS2_HK_IGR_PORT_MASK]		= { 13,   7},</div><div class='add'>+	[VCAP_IS2_HK_RSV2]			= { 20,   1},</div><div class='add'>+	[VCAP_IS2_HK_HOST_MATCH]		= { 21,   1},</div><div class='add'>+	[VCAP_IS2_HK_L2_MC]			= { 22,   1},</div><div class='add'>+	[VCAP_IS2_HK_L2_BC]			= { 23,   1},</div><div class='add'>+	[VCAP_IS2_HK_VLAN_TAGGED]		= { 24,   1},</div><div class='add'>+	[VCAP_IS2_HK_VID]			= { 25,  12},</div><div class='add'>+	[VCAP_IS2_HK_DEI]			= { 37,   1},</div><div class='add'>+	[VCAP_IS2_HK_PCP]			= { 38,   3},</div><div class='add'>+	/* MAC_ETYPE / MAC_LLC / MAC_SNAP / OAM common */</div><div class='add'>+	[VCAP_IS2_HK_L2_DMAC]			= { 41,  48},</div><div class='add'>+	[VCAP_IS2_HK_L2_SMAC]			= { 89,  48},</div><div class='add'>+	/* MAC_ETYPE (TYPE=000) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_ETYPE]		= {137,  16},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_L2_PAYLOAD0]	= {153,  16},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_L2_PAYLOAD1]	= {169,   8},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_L2_PAYLOAD2]	= {177,   3},</div><div class='add'>+	/* MAC_LLC (TYPE=001) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_LLC_L2_LLC]		= {137,  40},</div><div class='add'>+	/* MAC_SNAP (TYPE=010) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_SNAP_L2_SNAP]		= {137,  40},</div><div class='add'>+	/* MAC_ARP (TYPE=011) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_SMAC]		= { 41,  48},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_ADDR_SPACE_OK]	= { 89,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_PROTO_SPACE_OK]	= { 90,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_LEN_OK]		= { 91,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_TARGET_MATCH]	= { 92,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_SENDER_MATCH]	= { 93,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_OPCODE_UNKNOWN]	= { 94,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_OPCODE]		= { 95,   2},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_L3_IP4_DIP]	= { 97,  32},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_L3_IP4_SIP]	= {129,  32},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_DIP_EQ_SIP]	= {161,   1},</div><div class='add'>+	/* IP4_TCP_UDP / IP4_OTHER common */</div><div class='add'>+	[VCAP_IS2_HK_IP4]			= { 41,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_FRAGMENT]		= { 42,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_FRAG_OFS_GT0]		= { 43,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_OPTIONS]		= { 44,   1},</div><div class='add'>+	[VCAP_IS2_HK_IP4_L3_TTL_GT0]		= { 45,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_TOS]			= { 46,   8},</div><div class='add'>+	[VCAP_IS2_HK_L3_IP4_DIP]		= { 54,  32},</div><div class='add'>+	[VCAP_IS2_HK_L3_IP4_SIP]		= { 86,  32},</div><div class='add'>+	[VCAP_IS2_HK_DIP_EQ_SIP]		= {118,   1},</div><div class='add'>+	/* IP4_TCP_UDP (TYPE=100) */</div><div class='add'>+	[VCAP_IS2_HK_TCP]			= {119,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_DPORT]			= {120,  16},</div><div class='add'>+	[VCAP_IS2_HK_L4_SPORT]			= {136,  16},</div><div class='add'>+	[VCAP_IS2_HK_L4_RNG]			= {152,   8},</div><div class='add'>+	[VCAP_IS2_HK_L4_SPORT_EQ_DPORT]		= {160,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_SEQUENCE_EQ0]		= {161,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_FIN]			= {162,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_SYN]			= {163,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_RST]			= {164,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_PSH]			= {165,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_ACK]			= {166,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_URG]			= {167,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_1588_DOM]		= {168,   8},</div><div class='add'>+	[VCAP_IS2_HK_L4_1588_VER]		= {176,   4},</div><div class='add'>+	/* IP4_OTHER (TYPE=101) */</div><div class='add'>+	[VCAP_IS2_HK_IP4_L3_PROTO]		= {119,   8},</div><div class='add'>+	[VCAP_IS2_HK_L3_PAYLOAD]		= {127,  56},</div><div class='add'>+	/* IP6_STD (TYPE=110) */</div><div class='add'>+	[VCAP_IS2_HK_IP6_L3_TTL_GT0]		= { 41,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_IP6_SIP]		= { 42, 128},</div><div class='add'>+	[VCAP_IS2_HK_IP6_L3_PROTO]		= {170,   8},</div><div class='add'>+	/* OAM (TYPE=111) */</div><div class='add'>+	[VCAP_IS2_HK_OAM_MEL_FLAGS]		= {137,   7},</div><div class='add'>+	[VCAP_IS2_HK_OAM_VER]			= {144,   5},</div><div class='add'>+	[VCAP_IS2_HK_OAM_OPCODE]		= {149,   8},</div><div class='add'>+	[VCAP_IS2_HK_OAM_FLAGS]			= {157,   8},</div><div class='add'>+	[VCAP_IS2_HK_OAM_MEPID]			= {165,  16},</div><div class='add'>+	[VCAP_IS2_HK_OAM_CCM_CNTS_EQ0]		= {181,   1},</div><div class='add'>+	[VCAP_IS2_HK_OAM_IS_Y1731]		= {182,   1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcap_field vsc9959_vcap_is2_actions[] = {</div><div class='add'>+	[VCAP_IS2_ACT_HIT_ME_ONCE]		= {  0,  1},</div><div class='add'>+	[VCAP_IS2_ACT_CPU_COPY_ENA]		= {  1,  1},</div><div class='add'>+	[VCAP_IS2_ACT_CPU_QU_NUM]		= {  2,  3},</div><div class='add'>+	[VCAP_IS2_ACT_MASK_MODE]		= {  5,  2},</div><div class='add'>+	[VCAP_IS2_ACT_MIRROR_ENA]		= {  7,  1},</div><div class='add'>+	[VCAP_IS2_ACT_LRN_DIS]			= {  8,  1},</div><div class='add'>+	[VCAP_IS2_ACT_POLICE_ENA]		= {  9,  1},</div><div class='add'>+	[VCAP_IS2_ACT_POLICE_IDX]		= { 10,  9},</div><div class='add'>+	[VCAP_IS2_ACT_POLICE_VCAP_ONLY]		= { 19,  1},</div><div class='add'>+	[VCAP_IS2_ACT_PORT_MASK]		= { 20,  6},</div><div class='add'>+	[VCAP_IS2_ACT_REW_OP]			= { 26,  9},</div><div class='add'>+	[VCAP_IS2_ACT_SMAC_REPLACE_ENA]		= { 35,  1},</div><div class='add'>+	[VCAP_IS2_ACT_RSV]			= { 36,  2},</div><div class='add'>+	[VCAP_IS2_ACT_ACL_ID]			= { 38,  6},</div><div class='add'>+	[VCAP_IS2_ACT_HIT_CNT]			= { 44, 32},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcap_props vsc9959_vcap_props[] = {</div><div class='add'>+	[VCAP_ES0] = {</div><div class='add'>+		.action_type_width = 0,</div><div class='add'>+		.action_table = {</div><div class='add'>+			[ES0_ACTION_TYPE_NORMAL] = {</div><div class='add'>+				.width = 72, /* HIT_STICKY not included */</div><div class='add'>+				.count = 1,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.target = S0,</div><div class='add'>+		.keys = vsc9959_vcap_es0_keys,</div><div class='add'>+		.actions = vsc9959_vcap_es0_actions,</div><div class='add'>+	},</div><div class='add'>+	[VCAP_IS1] = {</div><div class='add'>+		.action_type_width = 0,</div><div class='add'>+		.action_table = {</div><div class='add'>+			[IS1_ACTION_TYPE_NORMAL] = {</div><div class='add'>+				.width = 78, /* HIT_STICKY not included */</div><div class='add'>+				.count = 4,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.target = S1,</div><div class='add'>+		.keys = vsc9959_vcap_is1_keys,</div><div class='add'>+		.actions = vsc9959_vcap_is1_actions,</div><div class='add'>+	},</div><div class='add'>+	[VCAP_IS2] = {</div><div class='add'>+		.action_type_width = 1,</div><div class='add'>+		.action_table = {</div><div class='add'>+			[IS2_ACTION_TYPE_NORMAL] = {</div><div class='add'>+				.width = 44,</div><div class='add'>+				.count = 2</div><div class='add'>+			},</div><div class='add'>+			[IS2_ACTION_TYPE_SMAC_SIP] = {</div><div class='add'>+				.width = 6,</div><div class='add'>+				.count = 4</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.target = S2,</div><div class='add'>+		.keys = vsc9959_vcap_is2_keys,</div><div class='add'>+		.actions = vsc9959_vcap_is2_actions,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ptp_clock_info vsc9959_ptp_caps = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "felix ptp",</div><div class='add'>+	.max_adj	= 0x7fffffff,</div><div class='add'>+	.n_alarm	= 0,</div><div class='add'>+	.n_ext_ts	= 0,</div><div class='add'>+	.n_per_out	= OCELOT_PTP_PINS_NUM,</div><div class='add'>+	.n_pins		= OCELOT_PTP_PINS_NUM,</div><div class='add'>+	.pps		= 0,</div><div class='add'>+	.gettime64	= ocelot_ptp_gettime64,</div><div class='add'>+	.settime64	= ocelot_ptp_settime64,</div><div class='add'>+	.adjtime	= ocelot_ptp_adjtime,</div><div class='add'>+	.adjfine	= ocelot_ptp_adjfine,</div><div class='add'>+	.verify		= ocelot_ptp_verify,</div><div class='add'>+	.enable		= ocelot_ptp_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VSC9959_INIT_TIMEOUT			50000</div><div class='add'>+#define VSC9959_GCB_RST_SLEEP			100</div><div class='add'>+#define VSC9959_SYS_RAMINIT_SLEEP		80</div><div class='add'>+</div><div class='add'>+static int vsc9959_gcb_soft_rst_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	ocelot_field_read(ocelot, GCB_SOFT_RST_SWC_RST, &amp;val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_sys_ram_init_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	return ocelot_read(ocelot, SYS_RAM_INIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* CORE_ENA is in SYS:SYSTEM:RESET_CFG</div><div class='add'>+ * RAM_INIT is in SYS:RAM_CTRL:RAM_INIT</div><div class='add'>+ */</div><div class='add'>+static int vsc9959_reset(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	int val, err;</div><div class='add'>+</div><div class='add'>+	/* soft-reset the switch core */</div><div class='add'>+	ocelot_field_write(ocelot, GCB_SOFT_RST_SWC_RST, 1);</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(vsc9959_gcb_soft_rst_status, ocelot, val, !val,</div><div class='add'>+				 VSC9959_GCB_RST_SLEEP, VSC9959_INIT_TIMEOUT);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ocelot-&gt;dev, "timeout: switch core reset\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize switch mem ~40us */</div><div class='add'>+	ocelot_write(ocelot, SYS_RAM_INIT_RAM_INIT, SYS_RAM_INIT);</div><div class='add'>+	err = readx_poll_timeout(vsc9959_sys_ram_init_status, ocelot, val, !val,</div><div class='add'>+				 VSC9959_SYS_RAMINIT_SLEEP,</div><div class='add'>+				 VSC9959_INIT_TIMEOUT);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ocelot-&gt;dev, "timeout: switch sram init\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable switch core */</div><div class='add'>+	ocelot_field_write(ocelot, SYS_RESET_CFG_CORE_ENA, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Watermark encode</div><div class='add'>+ * Bit 8:   Unit; 0:1, 1:16</div><div class='add'>+ * Bit 7-0: Value to be multiplied with unit</div><div class='add'>+ */</div><div class='add'>+static u16 vsc9959_wm_enc(u16 value)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(value &gt;= 16 * BIT(8));</div><div class='add'>+</div><div class='add'>+	if (value &gt;= BIT(8))</div><div class='add'>+		return BIT(8) | (value / 16);</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 vsc9959_wm_dec(u16 wm)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(wm &amp; ~GENMASK(8, 0));</div><div class='add'>+</div><div class='add'>+	if (wm &amp; BIT(8))</div><div class='add'>+		return (wm &amp; GENMASK(7, 0)) * 16;</div><div class='add'>+</div><div class='add'>+	return wm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_wm_stat(u32 val, u32 *inuse, u32 *maxuse)</div><div class='add'>+{</div><div class='add'>+	*inuse = (val &amp; GENMASK(23, 12)) &gt;&gt; 12;</div><div class='add'>+	*maxuse = val &amp; GENMASK(11, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(ocelot-&gt;dev);</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct enetc_mdio_priv *mdio_priv;</div><div class='add'>+	struct device *dev = ocelot-&gt;dev;</div><div class='add'>+	resource_size_t imdio_base;</div><div class='add'>+	void __iomem *imdio_regs;</div><div class='add'>+	struct resource res;</div><div class='add'>+	struct enetc_hw *hw;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int port;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	felix-&gt;pcs = devm_kcalloc(dev, felix-&gt;info-&gt;num_ports,</div><div class='add'>+				  sizeof(struct phylink_pcs *),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!felix-&gt;pcs) {</div><div class='add'>+		dev_err(dev, "failed to allocate array for PCS PHYs\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	imdio_base = pci_resource_start(pdev, VSC9959_IMDIO_PCI_BAR);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;res, &amp;vsc9959_imdio_res, sizeof(res));</div><div class='add'>+	res.start += imdio_base;</div><div class='add'>+	res.end += imdio_base;</div><div class='add'>+</div><div class='add'>+	imdio_regs = devm_ioremap_resource(dev, &amp;res);</div><div class='add'>+	if (IS_ERR(imdio_regs))</div><div class='add'>+		return PTR_ERR(imdio_regs);</div><div class='add'>+</div><div class='add'>+	hw = enetc_hw_alloc(dev, imdio_regs);</div><div class='add'>+	if (IS_ERR(hw)) {</div><div class='add'>+		dev_err(dev, "failed to allocate ENETC HW structure\n");</div><div class='add'>+		return PTR_ERR(hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus = mdiobus_alloc_size(sizeof(*mdio_priv));</div><div class='add'>+	if (!bus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bus-&gt;name = "VSC9959 internal MDIO bus";</div><div class='add'>+	bus-&gt;read = enetc_mdio_read_c22;</div><div class='add'>+	bus-&gt;write = enetc_mdio_write_c22;</div><div class='add'>+	bus-&gt;read_c45 = enetc_mdio_read_c45;</div><div class='add'>+	bus-&gt;write_c45 = enetc_mdio_write_c45;</div><div class='add'>+	bus-&gt;parent = dev;</div><div class='add'>+	mdio_priv = bus-&gt;priv;</div><div class='add'>+	mdio_priv-&gt;hw = hw;</div><div class='add'>+	/* This gets added to imdio_regs, which already maps addresses</div><div class='add'>+	 * starting with the proper offset.</div><div class='add'>+	 */</div><div class='add'>+	mdio_priv-&gt;mdio_base = 0;</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s-imdio", dev_name(dev));</div><div class='add'>+</div><div class='add'>+	/* Needed in order to initialize the bus mutex lock */</div><div class='add'>+	rc = mdiobus_register(bus);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to register MDIO bus\n");</div><div class='add'>+		mdiobus_free(bus);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	felix-&gt;imdio = bus;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; felix-&gt;info-&gt;num_ports; port++) {</div><div class='add'>+		struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+		struct phylink_pcs *phylink_pcs;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(felix-&gt;ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ocelot_port-&gt;phy_mode == PHY_INTERFACE_MODE_INTERNAL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		phylink_pcs = lynx_pcs_create_mdiodev(felix-&gt;imdio, port);</div><div class='add'>+		if (IS_ERR(phylink_pcs))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		felix-&gt;pcs[port] = phylink_pcs;</div><div class='add'>+</div><div class='add'>+		dev_info(dev, "Found PCS at internal MDIO address %d\n", port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_mdio_bus_free(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ocelot-&gt;num_phys_ports; port++) {</div><div class='add'>+		struct phylink_pcs *phylink_pcs = felix-&gt;pcs[port];</div><div class='add'>+</div><div class='add'>+		if (phylink_pcs)</div><div class='add'>+			lynx_pcs_destroy(phylink_pcs);</div><div class='add'>+	}</div><div class='add'>+	mdiobus_unregister(felix-&gt;imdio);</div><div class='add'>+	mdiobus_free(felix-&gt;imdio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The switch considers any frame (regardless of size) as eligible</div><div class='add'>+ * for transmission if the traffic class gate is open for at least</div><div class='add'>+ * VSC9959_TAS_MIN_GATE_LEN_NS.</div><div class='add'>+ *</div><div class='add'>+ * Overruns are prevented by cropping an interval at the end of the gate time</div><div class='add'>+ * slot for which egress scheduling is blocked, but we need to still keep</div><div class='add'>+ * VSC9959_TAS_MIN_GATE_LEN_NS available for one packet to be transmitted,</div><div class='add'>+ * otherwise the port tc will hang.</div><div class='add'>+ *</div><div class='add'>+ * This function returns the size of a gate interval that remains available for</div><div class='add'>+ * setting the guard band, after reserving the space for one egress frame.</div><div class='add'>+ */</div><div class='add'>+static u64 vsc9959_tas_remaining_gate_len_ps(u64 gate_len_ns)</div><div class='add'>+{</div><div class='add'>+	/* Gate always open */</div><div class='add'>+	if (gate_len_ns == U64_MAX)</div><div class='add'>+		return U64_MAX;</div><div class='add'>+</div><div class='add'>+	if (gate_len_ns &lt; VSC9959_TAS_MIN_GATE_LEN_NS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return (gate_len_ns - VSC9959_TAS_MIN_GATE_LEN_NS) * PSEC_PER_NSEC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Extract shortest continuous gate open intervals in ns for each traffic class</div><div class='add'>+ * of a cyclic tc-taprio schedule. If a gate is always open, the duration is</div><div class='add'>+ * considered U64_MAX. If the gate is always closed, it is considered 0.</div><div class='add'>+ */</div><div class='add'>+static void vsc9959_tas_min_gate_lengths(struct tc_taprio_qopt_offload *taprio,</div><div class='add'>+					 u64 min_gate_len[OCELOT_NUM_TC])</div><div class='add'>+{</div><div class='add'>+	struct tc_taprio_sched_entry *entry;</div><div class='add'>+	u64 gate_len[OCELOT_NUM_TC];</div><div class='add'>+	u8 gates_ever_opened = 0;</div><div class='add'>+	int tc, i, n;</div><div class='add'>+</div><div class='add'>+	/* Initialize arrays */</div><div class='add'>+	for (tc = 0; tc &lt; OCELOT_NUM_TC; tc++) {</div><div class='add'>+		min_gate_len[tc] = U64_MAX;</div><div class='add'>+		gate_len[tc] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we don't have taprio, consider all gates as permanently open */</div><div class='add'>+	if (!taprio)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	n = taprio-&gt;num_entries;</div><div class='add'>+</div><div class='add'>+	/* Walk through the gate list twice to determine the length</div><div class='add'>+	 * of consecutively open gates for a traffic class, including</div><div class='add'>+	 * open gates that wrap around. We are just interested in the</div><div class='add'>+	 * minimum window size, and this doesn't change what the</div><div class='add'>+	 * minimum is (if the gate never closes, min_gate_len will</div><div class='add'>+	 * remain U64_MAX).</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 2 * n; i++) {</div><div class='add'>+		entry = &amp;taprio-&gt;entries[i % n];</div><div class='add'>+</div><div class='add'>+		for (tc = 0; tc &lt; OCELOT_NUM_TC; tc++) {</div><div class='add'>+			if (entry-&gt;gate_mask &amp; BIT(tc)) {</div><div class='add'>+				gate_len[tc] += entry-&gt;interval;</div><div class='add'>+				gates_ever_opened |= BIT(tc);</div><div class='add'>+			} else {</div><div class='add'>+				/* Gate closes now, record a potential new</div><div class='add'>+				 * minimum and reinitialize length</div><div class='add'>+				 */</div><div class='add'>+				if (min_gate_len[tc] &gt; gate_len[tc] &amp;&amp;</div><div class='add'>+				    gate_len[tc])</div><div class='add'>+					min_gate_len[tc] = gate_len[tc];</div><div class='add'>+				gate_len[tc] = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* min_gate_len[tc] actually tracks minimum *open* gate time, so for</div><div class='add'>+	 * permanently closed gates, min_gate_len[tc] will still be U64_MAX.</div><div class='add'>+	 * Therefore they are currently indistinguishable from permanently</div><div class='add'>+	 * open gates. Overwrite the gate len with 0 when we know they're</div><div class='add'>+	 * actually permanently closed, i.e. after the loop above.</div><div class='add'>+	 */</div><div class='add'>+	for (tc = 0; tc &lt; OCELOT_NUM_TC; tc++)</div><div class='add'>+		if (!(gates_ever_opened &amp; BIT(tc)))</div><div class='add'>+			min_gate_len[tc] = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ocelot_write_rix is a macro that concatenates QSYS_MAXSDU_CFG_* with _RSZ,</div><div class='add'>+ * so we need to spell out the register access to each traffic class in helper</div><div class='add'>+ * functions, to simplify callers</div><div class='add'>+ */</div><div class='add'>+static void vsc9959_port_qmaxsdu_set(struct ocelot *ocelot, int port, int tc,</div><div class='add'>+				     u32 max_sdu)</div><div class='add'>+{</div><div class='add'>+	switch (tc) {</div><div class='add'>+	case 0:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_0,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_1,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_2,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 3:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_3,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_4,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 5:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_5,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 6:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_6,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	case 7:</div><div class='add'>+		ocelot_write_rix(ocelot, max_sdu, QSYS_QMAXSDU_CFG_7,</div><div class='add'>+				 port);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 vsc9959_port_qmaxsdu_get(struct ocelot *ocelot, int port, int tc)</div><div class='add'>+{</div><div class='add'>+	switch (tc) {</div><div class='add'>+	case 0: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_0, port);</div><div class='add'>+	case 1: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_1, port);</div><div class='add'>+	case 2: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_2, port);</div><div class='add'>+	case 3: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_3, port);</div><div class='add'>+	case 4: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_4, port);</div><div class='add'>+	case 5: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_5, port);</div><div class='add'>+	case 6: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_6, port);</div><div class='add'>+	case 7: return ocelot_read_rix(ocelot, QSYS_QMAXSDU_CFG_7, port);</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 vsc9959_tas_tc_max_sdu(struct tc_taprio_qopt_offload *taprio, int tc)</div><div class='add'>+{</div><div class='add'>+	if (!taprio || !taprio-&gt;max_sdu[tc])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return taprio-&gt;max_sdu[tc] + ETH_HLEN + 2 * VLAN_HLEN + ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Update QSYS_PORT_MAX_SDU to make sure the static guard bands added by the</div><div class='add'>+ * switch (see the ALWAYS_GUARD_BAND_SCH_Q comment) are correct at all MTU</div><div class='add'>+ * values (the default value is 1518). Also, for traffic class windows smaller</div><div class='add'>+ * than one MTU sized frame, update QSYS_QMAXSDU_CFG to enable oversized frame</div><div class='add'>+ * dropping, such that these won't hang the port, as they will never be sent.</div><div class='add'>+ */</div><div class='add'>+static void vsc9959_tas_guard_bands_update(struct ocelot *ocelot, int port)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+	struct ocelot_mm_state *mm = &amp;ocelot-&gt;mm[port];</div><div class='add'>+	struct tc_taprio_qopt_offload *taprio;</div><div class='add'>+	u64 min_gate_len[OCELOT_NUM_TC];</div><div class='add'>+	u32 val, maxlen, add_frag_size;</div><div class='add'>+	u64 needed_min_frag_time_ps;</div><div class='add'>+	int speed, picos_per_byte;</div><div class='add'>+	u64 needed_bit_time_ps;</div><div class='add'>+	u8 tas_speed;</div><div class='add'>+	int tc;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	taprio = ocelot_port-&gt;taprio;</div><div class='add'>+</div><div class='add'>+	val = ocelot_read_rix(ocelot, QSYS_TAG_CONFIG, port);</div><div class='add'>+	tas_speed = QSYS_TAG_CONFIG_LINK_SPEED_X(val);</div><div class='add'>+</div><div class='add'>+	switch (tas_speed) {</div><div class='add'>+	case OCELOT_SPEED_10:</div><div class='add'>+		speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case OCELOT_SPEED_100:</div><div class='add'>+		speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case OCELOT_SPEED_1000:</div><div class='add'>+		speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case OCELOT_SPEED_2500:</div><div class='add'>+		speed = SPEED_2500;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	picos_per_byte = (USEC_PER_SEC * 8) / speed;</div><div class='add'>+</div><div class='add'>+	val = ocelot_port_readl(ocelot_port, DEV_MAC_MAXLEN_CFG);</div><div class='add'>+	/* MAXLEN_CFG accounts automatically for VLAN. We need to include it</div><div class='add'>+	 * manually in the bit time calculation, plus the preamble and SFD.</div><div class='add'>+	 */</div><div class='add'>+	maxlen = val + 2 * VLAN_HLEN;</div><div class='add'>+	/* Consider the standard Ethernet overhead of 8 octets preamble+SFD,</div><div class='add'>+	 * 4 octets FCS, 12 octets IFG.</div><div class='add'>+	 */</div><div class='add'>+	needed_bit_time_ps = (u64)(maxlen + 24) * picos_per_byte;</div><div class='add'>+</div><div class='add'>+	/* Preemptible TCs don't need to pass a full MTU, the port will</div><div class='add'>+	 * automatically emit a HOLD request when a preemptible TC gate closes</div><div class='add'>+	 */</div><div class='add'>+	val = ocelot_read_rix(ocelot, QSYS_PREEMPTION_CFG, port);</div><div class='add'>+	add_frag_size = QSYS_PREEMPTION_CFG_MM_ADD_FRAG_SIZE_X(val);</div><div class='add'>+	needed_min_frag_time_ps = picos_per_byte *</div><div class='add'>+		(u64)(24 + 2 * ethtool_mm_frag_size_add_to_min(add_frag_size));</div><div class='add'>+</div><div class='add'>+	dev_dbg(ocelot-&gt;dev,</div><div class='add'>+		"port %d: max frame size %d needs %llu ps, %llu ps for mPackets at speed %d\n",</div><div class='add'>+		port, maxlen, needed_bit_time_ps, needed_min_frag_time_ps,</div><div class='add'>+		speed);</div><div class='add'>+</div><div class='add'>+	vsc9959_tas_min_gate_lengths(taprio, min_gate_len);</div><div class='add'>+</div><div class='add'>+	for (tc = 0; tc &lt; OCELOT_NUM_TC; tc++) {</div><div class='add'>+		u32 requested_max_sdu = vsc9959_tas_tc_max_sdu(taprio, tc);</div><div class='add'>+		u64 remaining_gate_len_ps;</div><div class='add'>+		u32 max_sdu;</div><div class='add'>+</div><div class='add'>+		remaining_gate_len_ps =</div><div class='add'>+			vsc9959_tas_remaining_gate_len_ps(min_gate_len[tc]);</div><div class='add'>+</div><div class='add'>+		if ((mm-&gt;active_preemptible_tcs &amp; BIT(tc)) ?</div><div class='add'>+		    remaining_gate_len_ps &gt; needed_min_frag_time_ps :</div><div class='add'>+		    remaining_gate_len_ps &gt; needed_bit_time_ps) {</div><div class='add'>+			/* Setting QMAXSDU_CFG to 0 disables oversized frame</div><div class='add'>+			 * dropping.</div><div class='add'>+			 */</div><div class='add'>+			max_sdu = requested_max_sdu;</div><div class='add'>+			dev_dbg(ocelot-&gt;dev,</div><div class='add'>+				"port %d tc %d min gate len %llu"</div><div class='add'>+				", sending all frames\n",</div><div class='add'>+				port, tc, min_gate_len[tc]);</div><div class='add'>+		} else {</div><div class='add'>+			/* If traffic class doesn't support a full MTU sized</div><div class='add'>+			 * frame, make sure to enable oversize frame dropping</div><div class='add'>+			 * for frames larger than the smallest that would fit.</div><div class='add'>+			 *</div><div class='add'>+			 * However, the exact same register, QSYS_QMAXSDU_CFG_*,</div><div class='add'>+			 * controls not only oversized frame dropping, but also</div><div class='add'>+			 * per-tc static guard band lengths, so it reduces the</div><div class='add'>+			 * useful gate interval length. Therefore, be careful</div><div class='add'>+			 * to calculate a guard band (and therefore max_sdu)</div><div class='add'>+			 * that still leaves VSC9959_TAS_MIN_GATE_LEN_NS</div><div class='add'>+			 * available in the time slot.</div><div class='add'>+			 */</div><div class='add'>+			max_sdu = div_u64(remaining_gate_len_ps, picos_per_byte);</div><div class='add'>+			/* A TC gate may be completely closed, which is a</div><div class='add'>+			 * special case where all packets are oversized.</div><div class='add'>+			 * Any limit smaller than 64 octets accomplishes this</div><div class='add'>+			 */</div><div class='add'>+			if (!max_sdu)</div><div class='add'>+				max_sdu = 1;</div><div class='add'>+			/* Take L1 overhead into account, but just don't allow</div><div class='add'>+			 * max_sdu to go negative or to 0. Here we use 20</div><div class='add'>+			 * because QSYS_MAXSDU_CFG_* already counts the 4 FCS</div><div class='add'>+			 * octets as part of packet size.</div><div class='add'>+			 */</div><div class='add'>+			if (max_sdu &gt; 20)</div><div class='add'>+				max_sdu -= 20;</div><div class='add'>+</div><div class='add'>+			if (requested_max_sdu &amp;&amp; requested_max_sdu &lt; max_sdu)</div><div class='add'>+				max_sdu = requested_max_sdu;</div><div class='add'>+</div><div class='add'>+			dev_info(ocelot-&gt;dev,</div><div class='add'>+				 "port %d tc %d min gate length %llu"</div><div class='add'>+				 " ns not enough for max frame size %d at %d"</div><div class='add'>+				 " Mbps, dropping frames over %d"</div><div class='add'>+				 " octets including FCS\n",</div><div class='add'>+				 port, tc, min_gate_len[tc], maxlen, speed,</div><div class='add'>+				 max_sdu);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vsc9959_port_qmaxsdu_set(ocelot, port, tc, max_sdu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ocelot_write_rix(ocelot, maxlen, QSYS_PORT_MAX_SDU, port);</div><div class='add'>+</div><div class='add'>+	ocelot-&gt;ops-&gt;cut_through_fwd(ocelot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_sched_speed_set(struct ocelot *ocelot, int port,</div><div class='add'>+				    u32 speed)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+	u8 tas_speed;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		tas_speed = OCELOT_SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		tas_speed = OCELOT_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		tas_speed = OCELOT_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_2500:</div><div class='add'>+		tas_speed = OCELOT_SPEED_2500;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		tas_speed = OCELOT_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	ocelot_rmw_rix(ocelot,</div><div class='add'>+		       QSYS_TAG_CONFIG_LINK_SPEED(tas_speed),</div><div class='add'>+		       QSYS_TAG_CONFIG_LINK_SPEED_M,</div><div class='add'>+		       QSYS_TAG_CONFIG, port);</div><div class='add'>+</div><div class='add'>+	if (ocelot_port-&gt;taprio)</div><div class='add'>+		vsc9959_tas_guard_bands_update(ocelot, port);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_new_base_time(struct ocelot *ocelot, ktime_t base_time,</div><div class='add'>+				  u64 cycle_time,</div><div class='add'>+				  struct timespec64 *new_base_ts)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+	ktime_t new_base_time;</div><div class='add'>+	ktime_t current_time;</div><div class='add'>+</div><div class='add'>+	ocelot_ptp_gettime64(&amp;ocelot-&gt;ptp_info, &amp;ts);</div><div class='add'>+	current_time = timespec64_to_ktime(ts);</div><div class='add'>+	new_base_time = base_time;</div><div class='add'>+</div><div class='add'>+	if (base_time &lt; current_time) {</div><div class='add'>+		u64 nr_of_cycles = current_time - base_time;</div><div class='add'>+</div><div class='add'>+		do_div(nr_of_cycles, cycle_time);</div><div class='add'>+		new_base_time += cycle_time * (nr_of_cycles + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*new_base_ts = ktime_to_timespec64(new_base_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 vsc9959_tas_read_cfg_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	return ocelot_read(ocelot, QSYS_TAS_PARAM_CFG_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_tas_gcl_set(struct ocelot *ocelot, const u32 gcl_ix,</div><div class='add'>+				struct tc_taprio_sched_entry *entry)</div><div class='add'>+{</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     QSYS_GCL_CFG_REG_1_GCL_ENTRY_NUM(gcl_ix) |</div><div class='add'>+		     QSYS_GCL_CFG_REG_1_GATE_STATE(entry-&gt;gate_mask),</div><div class='add'>+		     QSYS_GCL_CFG_REG_1);</div><div class='add'>+	ocelot_write(ocelot, entry-&gt;interval, QSYS_GCL_CFG_REG_2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_qos_port_tas_set(struct ocelot *ocelot, int port,</div><div class='add'>+				    struct tc_taprio_qopt_offload *taprio)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+	struct timespec64 base_ts;</div><div class='add'>+	int ret, i;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	if (taprio-&gt;cmd == TAPRIO_CMD_DESTROY) {</div><div class='add'>+		ocelot_port_mqprio(ocelot, port, &amp;taprio-&gt;mqprio);</div><div class='add'>+		ocelot_rmw_rix(ocelot, 0, QSYS_TAG_CONFIG_ENABLE,</div><div class='add'>+			       QSYS_TAG_CONFIG, port);</div><div class='add'>+</div><div class='add'>+		taprio_offload_free(ocelot_port-&gt;taprio);</div><div class='add'>+		ocelot_port-&gt;taprio = NULL;</div><div class='add'>+</div><div class='add'>+		vsc9959_tas_guard_bands_update(ocelot, port);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (taprio-&gt;cmd != TAPRIO_CMD_REPLACE) {</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		goto err_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = ocelot_port_mqprio(ocelot, port, &amp;taprio-&gt;mqprio);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_unlock;</div><div class='add'>+</div><div class='add'>+	if (taprio-&gt;cycle_time &gt; NSEC_PER_SEC ||</div><div class='add'>+	    taprio-&gt;cycle_time_extension &gt;= NSEC_PER_SEC) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_reset_tc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (taprio-&gt;num_entries &gt; VSC9959_TAS_GCL_ENTRY_MAX) {</div><div class='add'>+		ret = -ERANGE;</div><div class='add'>+		goto err_reset_tc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable guard band. The switch will schedule frames without taking</div><div class='add'>+	 * their length into account. Thus we'll always need to enable the</div><div class='add'>+	 * guard band which reserves the time of a maximum sized frame at the</div><div class='add'>+	 * end of the time window.</div><div class='add'>+	 *</div><div class='add'>+	 * Although the ALWAYS_GUARD_BAND_SCH_Q bit is global for all ports, we</div><div class='add'>+	 * need to set PORT_NUM, because subsequent writes to PARAM_CFG_REG_n</div><div class='add'>+	 * operate on the port number.</div><div class='add'>+	 */</div><div class='add'>+	ocelot_rmw(ocelot, QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM(port) |</div><div class='add'>+		   QSYS_TAS_PARAM_CFG_CTRL_ALWAYS_GUARD_BAND_SCH_Q,</div><div class='add'>+		   QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM_M |</div><div class='add'>+		   QSYS_TAS_PARAM_CFG_CTRL_ALWAYS_GUARD_BAND_SCH_Q,</div><div class='add'>+		   QSYS_TAS_PARAM_CFG_CTRL);</div><div class='add'>+</div><div class='add'>+	/* Hardware errata -  Admin config could not be overwritten if</div><div class='add'>+	 * config is pending, need reset the TAS module</div><div class='add'>+	 */</div><div class='add'>+	val = ocelot_read_rix(ocelot, QSYS_TAG_CONFIG, port);</div><div class='add'>+	if (val &amp; QSYS_TAG_CONFIG_ENABLE) {</div><div class='add'>+		val = ocelot_read(ocelot, QSYS_PARAM_STATUS_REG_8);</div><div class='add'>+		if (val &amp; QSYS_PARAM_STATUS_REG_8_CONFIG_PENDING) {</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto err_reset_tc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ocelot_rmw_rix(ocelot,</div><div class='add'>+		       QSYS_TAG_CONFIG_ENABLE |</div><div class='add'>+		       QSYS_TAG_CONFIG_INIT_GATE_STATE(0xFF) |</div><div class='add'>+		       QSYS_TAG_CONFIG_SCH_TRAFFIC_QUEUES(0xFF),</div><div class='add'>+		       QSYS_TAG_CONFIG_ENABLE |</div><div class='add'>+		       QSYS_TAG_CONFIG_INIT_GATE_STATE_M |</div><div class='add'>+		       QSYS_TAG_CONFIG_SCH_TRAFFIC_QUEUES_M,</div><div class='add'>+		       QSYS_TAG_CONFIG, port);</div><div class='add'>+</div><div class='add'>+	vsc9959_new_base_time(ocelot, taprio-&gt;base_time,</div><div class='add'>+			      taprio-&gt;cycle_time, &amp;base_ts);</div><div class='add'>+	ocelot_write(ocelot, base_ts.tv_nsec, QSYS_PARAM_CFG_REG_1);</div><div class='add'>+	ocelot_write(ocelot, lower_32_bits(base_ts.tv_sec), QSYS_PARAM_CFG_REG_2);</div><div class='add'>+	val = upper_32_bits(base_ts.tv_sec);</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     QSYS_PARAM_CFG_REG_3_BASE_TIME_SEC_MSB(val) |</div><div class='add'>+		     QSYS_PARAM_CFG_REG_3_LIST_LENGTH(taprio-&gt;num_entries),</div><div class='add'>+		     QSYS_PARAM_CFG_REG_3);</div><div class='add'>+	ocelot_write(ocelot, taprio-&gt;cycle_time, QSYS_PARAM_CFG_REG_4);</div><div class='add'>+	ocelot_write(ocelot, taprio-&gt;cycle_time_extension, QSYS_PARAM_CFG_REG_5);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; taprio-&gt;num_entries; i++)</div><div class='add'>+		vsc9959_tas_gcl_set(ocelot, i, &amp;taprio-&gt;entries[i]);</div><div class='add'>+</div><div class='add'>+	ocelot_rmw(ocelot, QSYS_TAS_PARAM_CFG_CTRL_CONFIG_CHANGE,</div><div class='add'>+		   QSYS_TAS_PARAM_CFG_CTRL_CONFIG_CHANGE,</div><div class='add'>+		   QSYS_TAS_PARAM_CFG_CTRL);</div><div class='add'>+</div><div class='add'>+	ret = readx_poll_timeout(vsc9959_tas_read_cfg_status, ocelot, val,</div><div class='add'>+				 !(val &amp; QSYS_TAS_PARAM_CFG_CTRL_CONFIG_CHANGE),</div><div class='add'>+				 10, 100000);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_reset_tc;</div><div class='add'>+</div><div class='add'>+	ocelot_port-&gt;taprio = taprio_offload_get(taprio);</div><div class='add'>+	vsc9959_tas_guard_bands_update(ocelot, port);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_reset_tc:</div><div class='add'>+	taprio-&gt;mqprio.qopt.num_tc = 0;</div><div class='add'>+	ocelot_port_mqprio(ocelot, port, &amp;taprio-&gt;mqprio);</div><div class='add'>+err_unlock:</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_tas_clock_adjust(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct tc_taprio_qopt_offload *taprio;</div><div class='add'>+	struct ocelot_port *ocelot_port;</div><div class='add'>+	struct timespec64 base_ts;</div><div class='add'>+	int i, port;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ocelot-&gt;num_phys_ports; port++) {</div><div class='add'>+		ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+		taprio = ocelot_port-&gt;taprio;</div><div class='add'>+		if (!taprio)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ocelot_rmw(ocelot,</div><div class='add'>+			   QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM(port),</div><div class='add'>+			   QSYS_TAS_PARAM_CFG_CTRL_PORT_NUM_M,</div><div class='add'>+			   QSYS_TAS_PARAM_CFG_CTRL);</div><div class='add'>+</div><div class='add'>+		/* Disable time-aware shaper */</div><div class='add'>+		ocelot_rmw_rix(ocelot, 0, QSYS_TAG_CONFIG_ENABLE,</div><div class='add'>+			       QSYS_TAG_CONFIG, port);</div><div class='add'>+</div><div class='add'>+		vsc9959_new_base_time(ocelot, taprio-&gt;base_time,</div><div class='add'>+				      taprio-&gt;cycle_time, &amp;base_ts);</div><div class='add'>+</div><div class='add'>+		ocelot_write(ocelot, base_ts.tv_nsec, QSYS_PARAM_CFG_REG_1);</div><div class='add'>+		ocelot_write(ocelot, lower_32_bits(base_ts.tv_sec),</div><div class='add'>+			     QSYS_PARAM_CFG_REG_2);</div><div class='add'>+		val = upper_32_bits(base_ts.tv_sec);</div><div class='add'>+		ocelot_rmw(ocelot,</div><div class='add'>+			   QSYS_PARAM_CFG_REG_3_BASE_TIME_SEC_MSB(val),</div><div class='add'>+			   QSYS_PARAM_CFG_REG_3_BASE_TIME_SEC_MSB_M,</div><div class='add'>+			   QSYS_PARAM_CFG_REG_3);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; taprio-&gt;num_entries; i++)</div><div class='add'>+			vsc9959_tas_gcl_set(ocelot, i, &amp;taprio-&gt;entries[i]);</div><div class='add'>+</div><div class='add'>+		ocelot_rmw(ocelot, QSYS_TAS_PARAM_CFG_CTRL_CONFIG_CHANGE,</div><div class='add'>+			   QSYS_TAS_PARAM_CFG_CTRL_CONFIG_CHANGE,</div><div class='add'>+			   QSYS_TAS_PARAM_CFG_CTRL);</div><div class='add'>+</div><div class='add'>+		/* Re-enable time-aware shaper */</div><div class='add'>+		ocelot_rmw_rix(ocelot, QSYS_TAG_CONFIG_ENABLE,</div><div class='add'>+			       QSYS_TAG_CONFIG_ENABLE,</div><div class='add'>+			       QSYS_TAG_CONFIG, port);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_qos_port_cbs_set(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct tc_cbs_qopt_offload *cbs_qopt)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+	int port_ix = port * 8 + cbs_qopt-&gt;queue;</div><div class='add'>+	u32 rate, burst;</div><div class='add'>+</div><div class='add'>+	if (cbs_qopt-&gt;queue &gt;= ds-&gt;num_tx_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!cbs_qopt-&gt;enable) {</div><div class='add'>+		ocelot_write_gix(ocelot, QSYS_CIR_CFG_CIR_RATE(0) |</div><div class='add'>+				 QSYS_CIR_CFG_CIR_BURST(0),</div><div class='add'>+				 QSYS_CIR_CFG, port_ix);</div><div class='add'>+</div><div class='add'>+		ocelot_rmw_gix(ocelot, 0, QSYS_SE_CFG_SE_AVB_ENA,</div><div class='add'>+			       QSYS_SE_CFG, port_ix);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Rate unit is 100 kbps */</div><div class='add'>+	rate = DIV_ROUND_UP(cbs_qopt-&gt;idleslope, 100);</div><div class='add'>+	/* Avoid using zero rate */</div><div class='add'>+	rate = clamp_t(u32, rate, 1, GENMASK(14, 0));</div><div class='add'>+	/* Burst unit is 4kB */</div><div class='add'>+	burst = DIV_ROUND_UP(cbs_qopt-&gt;hicredit, 4096);</div><div class='add'>+	/* Avoid using zero burst size */</div><div class='add'>+	burst = clamp_t(u32, burst, 1, GENMASK(5, 0));</div><div class='add'>+	ocelot_write_gix(ocelot,</div><div class='add'>+			 QSYS_CIR_CFG_CIR_RATE(rate) |</div><div class='add'>+			 QSYS_CIR_CFG_CIR_BURST(burst),</div><div class='add'>+			 QSYS_CIR_CFG,</div><div class='add'>+			 port_ix);</div><div class='add'>+</div><div class='add'>+	ocelot_rmw_gix(ocelot,</div><div class='add'>+		       QSYS_SE_CFG_SE_FRM_MODE(0) |</div><div class='add'>+		       QSYS_SE_CFG_SE_AVB_ENA,</div><div class='add'>+		       QSYS_SE_CFG_SE_AVB_ENA |</div><div class='add'>+		       QSYS_SE_CFG_SE_FRM_MODE_M,</div><div class='add'>+		       QSYS_SE_CFG,</div><div class='add'>+		       port_ix);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_qos_query_caps(struct tc_query_caps_base *base)</div><div class='add'>+{</div><div class='add'>+	switch (base-&gt;type) {</div><div class='add'>+	case TC_SETUP_QDISC_MQPRIO: {</div><div class='add'>+		struct tc_mqprio_caps *caps = base-&gt;caps;</div><div class='add'>+</div><div class='add'>+		caps-&gt;validate_queue_counts = true;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO: {</div><div class='add'>+		struct tc_taprio_caps *caps = base-&gt;caps;</div><div class='add'>+</div><div class='add'>+		caps-&gt;supports_queue_max_sdu = true;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_qos_port_mqprio(struct ocelot *ocelot, int port,</div><div class='add'>+				   struct tc_mqprio_qopt_offload *mqprio)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+	ret = ocelot_port_mqprio(ocelot, port, mqprio);</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_port_setup_tc(struct dsa_switch *ds, int port,</div><div class='add'>+				 enum tc_setup_type type,</div><div class='add'>+				 void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_QUERY_CAPS:</div><div class='add'>+		return vsc9959_qos_query_caps(type_data);</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO:</div><div class='add'>+		return vsc9959_qos_port_tas_set(ocelot, port, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_MQPRIO:</div><div class='add'>+		return vsc9959_qos_port_mqprio(ocelot, port, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_CBS:</div><div class='add'>+		return vsc9959_qos_port_cbs_set(ds, port, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define VSC9959_PSFP_SFID_MAX			175</div><div class='add'>+#define VSC9959_PSFP_GATE_ID_MAX		183</div><div class='add'>+#define VSC9959_PSFP_POLICER_BASE		63</div><div class='add'>+#define VSC9959_PSFP_POLICER_MAX		383</div><div class='add'>+#define VSC9959_PSFP_GATE_LIST_NUM		4</div><div class='add'>+#define VSC9959_PSFP_GATE_CYCLETIME_MIN		5000</div><div class='add'>+</div><div class='add'>+struct felix_stream {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned long id;</div><div class='add'>+	bool dummy;</div><div class='add'>+	int ports;</div><div class='add'>+	int port;</div><div class='add'>+	u8 dmac[ETH_ALEN];</div><div class='add'>+	u16 vid;</div><div class='add'>+	s8 prio;</div><div class='add'>+	u8 sfid_valid;</div><div class='add'>+	u8 ssid_valid;</div><div class='add'>+	u32 sfid;</div><div class='add'>+	u32 ssid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct felix_stream_filter_counters {</div><div class='add'>+	u64 match;</div><div class='add'>+	u64 not_pass_gate;</div><div class='add'>+	u64 not_pass_sdu;</div><div class='add'>+	u64 red;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct felix_stream_filter {</div><div class='add'>+	struct felix_stream_filter_counters stats;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	refcount_t refcount;</div><div class='add'>+	u32 index;</div><div class='add'>+	u8 enable;</div><div class='add'>+	int portmask;</div><div class='add'>+	u8 sg_valid;</div><div class='add'>+	u32 sgid;</div><div class='add'>+	u8 fm_valid;</div><div class='add'>+	u32 fmid;</div><div class='add'>+	u8 prio_valid;</div><div class='add'>+	u8 prio;</div><div class='add'>+	u32 maxsdu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct felix_stream_gate {</div><div class='add'>+	u32 index;</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 ipv_valid;</div><div class='add'>+	u8 init_ipv;</div><div class='add'>+	u64 basetime;</div><div class='add'>+	u64 cycletime;</div><div class='add'>+	u64 cycletime_ext;</div><div class='add'>+	u32 num_entries;</div><div class='add'>+	struct action_gate_entry entries[] __counted_by(num_entries);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct felix_stream_gate_entry {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	refcount_t refcount;</div><div class='add'>+	u32 index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vsc9959_stream_identify(struct flow_cls_offload *f,</div><div class='add'>+				   struct felix_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(f);</div><div class='add'>+	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='add'>+</div><div class='add'>+	if (dissector-&gt;used_keys &amp;</div><div class='add'>+	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_has_control_flags(rule, f-&gt;common.extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='add'>+		struct flow_match_eth_addrs match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_eth_addrs(rule, &amp;match);</div><div class='add'>+		ether_addr_copy(stream-&gt;dmac, match.key-&gt;dst);</div><div class='add'>+		if (!is_zero_ether_addr(match.mask-&gt;src))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	} else {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {</div><div class='add'>+		struct flow_match_vlan match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_vlan(rule, &amp;match);</div><div class='add'>+		if (match.mask-&gt;vlan_priority)</div><div class='add'>+			stream-&gt;prio = match.key-&gt;vlan_priority;</div><div class='add'>+		else</div><div class='add'>+			stream-&gt;prio = -1;</div><div class='add'>+</div><div class='add'>+		if (!match.mask-&gt;vlan_id)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		stream-&gt;vid = match.key-&gt;vlan_id;</div><div class='add'>+	} else {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream-&gt;id = f-&gt;cookie;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_mact_stream_set(struct ocelot *ocelot,</div><div class='add'>+				   struct felix_stream *stream,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	enum macaccess_entry_type type;</div><div class='add'>+	int ret, sfid, ssid;</div><div class='add'>+	u32 vid, dst_idx;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(mac, stream-&gt;dmac);</div><div class='add'>+	vid = stream-&gt;vid;</div><div class='add'>+</div><div class='add'>+	/* Stream identification desn't support to add a stream with non</div><div class='add'>+	 * existent MAC (The MAC entry has not been learned in MAC table).</div><div class='add'>+	 */</div><div class='add'>+	ret = ocelot_mact_lookup(ocelot, &amp;dst_idx, mac, vid, &amp;type);</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (extack)</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Stream is not learned in MAC table");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((stream-&gt;sfid_valid || stream-&gt;ssid_valid) &amp;&amp;</div><div class='add'>+	    type == ENTRYTYPE_NORMAL)</div><div class='add'>+		type = ENTRYTYPE_LOCKED;</div><div class='add'>+</div><div class='add'>+	sfid = stream-&gt;sfid_valid ? stream-&gt;sfid : -1;</div><div class='add'>+	ssid = stream-&gt;ssid_valid ? stream-&gt;ssid : -1;</div><div class='add'>+</div><div class='add'>+	ret = ocelot_mact_learn_streamdata(ocelot, dst_idx, mac, vid, type,</div><div class='add'>+					   sfid, ssid);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct felix_stream *</div><div class='add'>+vsc9959_stream_table_lookup(struct list_head *stream_list,</div><div class='add'>+			    struct felix_stream *stream)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, stream_list, list)</div><div class='add'>+		if (ether_addr_equal(tmp-&gt;dmac, stream-&gt;dmac) &amp;&amp;</div><div class='add'>+		    tmp-&gt;vid == stream-&gt;vid)</div><div class='add'>+			return tmp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_stream_table_add(struct ocelot *ocelot,</div><div class='add'>+				    struct list_head *stream_list,</div><div class='add'>+				    struct felix_stream *stream,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream *stream_entry;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	stream_entry = kmemdup(stream, sizeof(*stream_entry), GFP_KERNEL);</div><div class='add'>+	if (!stream_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!stream-&gt;dummy) {</div><div class='add'>+		ret = vsc9959_mact_stream_set(ocelot, stream_entry, extack);</div><div class='add'>+		if (ret) {</div><div class='add'>+			kfree(stream_entry);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;stream_entry-&gt;list, stream_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct felix_stream *</div><div class='add'>+vsc9959_stream_table_get(struct list_head *stream_list, unsigned long id)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, stream_list, list)</div><div class='add'>+		if (tmp-&gt;id == id)</div><div class='add'>+			return tmp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_stream_table_del(struct ocelot *ocelot,</div><div class='add'>+				     struct felix_stream *stream)</div><div class='add'>+{</div><div class='add'>+	if (!stream-&gt;dummy)</div><div class='add'>+		vsc9959_mact_stream_set(ocelot, stream, NULL);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;stream-&gt;list);</div><div class='add'>+	kfree(stream);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 vsc9959_sfi_access_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	return ocelot_read(ocelot, ANA_TABLES_SFIDACCESS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sfi_set(struct ocelot *ocelot,</div><div class='add'>+				struct felix_stream_filter *sfi)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (sfi-&gt;index &gt; VSC9959_PSFP_SFID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!sfi-&gt;enable) {</div><div class='add'>+		ocelot_write(ocelot, ANA_TABLES_SFIDTIDX_SFID_INDEX(sfi-&gt;index),</div><div class='add'>+			     ANA_TABLES_SFIDTIDX);</div><div class='add'>+</div><div class='add'>+		val = ANA_TABLES_SFIDACCESS_SFID_TBL_CMD(SFIDACCESS_CMD_WRITE);</div><div class='add'>+		ocelot_write(ocelot, val, ANA_TABLES_SFIDACCESS);</div><div class='add'>+</div><div class='add'>+		return readx_poll_timeout(vsc9959_sfi_access_status, ocelot, val,</div><div class='add'>+					  (!ANA_TABLES_SFIDACCESS_SFID_TBL_CMD(val)),</div><div class='add'>+					  10, 100000);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sfi-&gt;sgid &gt; VSC9959_PSFP_GATE_ID_MAX ||</div><div class='add'>+	    sfi-&gt;fmid &gt; VSC9959_PSFP_POLICER_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     (sfi-&gt;sg_valid ? ANA_TABLES_SFIDTIDX_SGID_VALID : 0) |</div><div class='add'>+		     ANA_TABLES_SFIDTIDX_SGID(sfi-&gt;sgid) |</div><div class='add'>+		     (sfi-&gt;fm_valid ? ANA_TABLES_SFIDTIDX_POL_ENA : 0) |</div><div class='add'>+		     ANA_TABLES_SFIDTIDX_POL_IDX(sfi-&gt;fmid) |</div><div class='add'>+		     ANA_TABLES_SFIDTIDX_SFID_INDEX(sfi-&gt;index),</div><div class='add'>+		     ANA_TABLES_SFIDTIDX);</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     (sfi-&gt;prio_valid ? ANA_TABLES_SFIDACCESS_IGR_PRIO_MATCH_ENA : 0) |</div><div class='add'>+		     ANA_TABLES_SFIDACCESS_IGR_PRIO(sfi-&gt;prio) |</div><div class='add'>+		     ANA_TABLES_SFIDACCESS_MAX_SDU_LEN(sfi-&gt;maxsdu) |</div><div class='add'>+		     ANA_TABLES_SFIDACCESS_SFID_TBL_CMD(SFIDACCESS_CMD_WRITE),</div><div class='add'>+		     ANA_TABLES_SFIDACCESS);</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout(vsc9959_sfi_access_status, ocelot, val,</div><div class='add'>+				  (!ANA_TABLES_SFIDACCESS_SFID_TBL_CMD(val)),</div><div class='add'>+				  10, 100000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sfidmask_set(struct ocelot *ocelot, u32 sfid, int ports)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ocelot_rmw(ocelot,</div><div class='add'>+		   ANA_TABLES_SFIDTIDX_SFID_INDEX(sfid),</div><div class='add'>+		   ANA_TABLES_SFIDTIDX_SFID_INDEX_M,</div><div class='add'>+		   ANA_TABLES_SFIDTIDX);</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     ANA_TABLES_SFID_MASK_IGR_PORT_MASK(ports) |</div><div class='add'>+		     ANA_TABLES_SFID_MASK_IGR_SRCPORT_MATCH_ENA,</div><div class='add'>+		     ANA_TABLES_SFID_MASK);</div><div class='add'>+</div><div class='add'>+	ocelot_rmw(ocelot,</div><div class='add'>+		   ANA_TABLES_SFIDACCESS_SFID_TBL_CMD(SFIDACCESS_CMD_WRITE),</div><div class='add'>+		   ANA_TABLES_SFIDACCESS_SFID_TBL_CMD_M,</div><div class='add'>+		   ANA_TABLES_SFIDACCESS);</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout(vsc9959_sfi_access_status, ocelot, val,</div><div class='add'>+				  (!ANA_TABLES_SFIDACCESS_SFID_TBL_CMD(val)),</div><div class='add'>+				  10, 100000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sfi_list_add(struct ocelot *ocelot,</div><div class='add'>+				     struct felix_stream_filter *sfi,</div><div class='add'>+				     struct list_head *pos)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_filter *sfi_entry;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	sfi_entry = kmemdup(sfi, sizeof(*sfi_entry), GFP_KERNEL);</div><div class='add'>+	if (!sfi_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;sfi_entry-&gt;refcount, 1);</div><div class='add'>+</div><div class='add'>+	ret = vsc9959_psfp_sfi_set(ocelot, sfi_entry);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(sfi_entry);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsc9959_psfp_sfidmask_set(ocelot, sfi-&gt;index, sfi-&gt;portmask);</div><div class='add'>+</div><div class='add'>+	list_add(&amp;sfi_entry-&gt;list, pos);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sfi_table_add(struct ocelot *ocelot,</div><div class='add'>+				      struct felix_stream_filter *sfi)</div><div class='add'>+{</div><div class='add'>+	struct list_head *pos, *q, *last;</div><div class='add'>+	struct felix_stream_filter *tmp;</div><div class='add'>+	struct ocelot_psfp_list *psfp;</div><div class='add'>+	u32 insert = 0;</div><div class='add'>+</div><div class='add'>+	psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+	last = &amp;psfp-&gt;sfi_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(pos, q, &amp;psfp-&gt;sfi_list) {</div><div class='add'>+		tmp = list_entry(pos, struct felix_stream_filter, list);</div><div class='add'>+		if (sfi-&gt;sg_valid == tmp-&gt;sg_valid &amp;&amp;</div><div class='add'>+		    sfi-&gt;fm_valid == tmp-&gt;fm_valid &amp;&amp;</div><div class='add'>+		    sfi-&gt;portmask == tmp-&gt;portmask &amp;&amp;</div><div class='add'>+		    tmp-&gt;sgid == sfi-&gt;sgid &amp;&amp;</div><div class='add'>+		    tmp-&gt;fmid == sfi-&gt;fmid) {</div><div class='add'>+			sfi-&gt;index = tmp-&gt;index;</div><div class='add'>+			refcount_inc(&amp;tmp-&gt;refcount);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		/* Make sure that the index is increasing in order. */</div><div class='add'>+		if (tmp-&gt;index == insert) {</div><div class='add'>+			last = pos;</div><div class='add'>+			insert++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	sfi-&gt;index = insert;</div><div class='add'>+</div><div class='add'>+	return vsc9959_psfp_sfi_list_add(ocelot, sfi, last);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sfi_table_add2(struct ocelot *ocelot,</div><div class='add'>+				       struct felix_stream_filter *sfi,</div><div class='add'>+				       struct felix_stream_filter *sfi2)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_filter *tmp;</div><div class='add'>+	struct list_head *pos, *q, *last;</div><div class='add'>+	struct ocelot_psfp_list *psfp;</div><div class='add'>+	u32 insert = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+	last = &amp;psfp-&gt;sfi_list;</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(pos, q, &amp;psfp-&gt;sfi_list) {</div><div class='add'>+		tmp = list_entry(pos, struct felix_stream_filter, list);</div><div class='add'>+		/* Make sure that the index is increasing in order. */</div><div class='add'>+		if (tmp-&gt;index &gt;= insert + 2)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		insert = tmp-&gt;index + 1;</div><div class='add'>+		last = pos;</div><div class='add'>+	}</div><div class='add'>+	sfi-&gt;index = insert;</div><div class='add'>+</div><div class='add'>+	ret = vsc9959_psfp_sfi_list_add(ocelot, sfi, last);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	sfi2-&gt;index = insert + 1;</div><div class='add'>+</div><div class='add'>+	return vsc9959_psfp_sfi_list_add(ocelot, sfi2, last-&gt;next);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct felix_stream_filter *</div><div class='add'>+vsc9959_psfp_sfi_table_get(struct list_head *sfi_list, u32 index)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_filter *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, sfi_list, list)</div><div class='add'>+		if (tmp-&gt;index == index)</div><div class='add'>+			return tmp;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_psfp_sfi_table_del(struct ocelot *ocelot, u32 index)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_filter *tmp, *n;</div><div class='add'>+	struct ocelot_psfp_list *psfp;</div><div class='add'>+	u8 z;</div><div class='add'>+</div><div class='add'>+	psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(tmp, n, &amp;psfp-&gt;sfi_list, list)</div><div class='add'>+		if (tmp-&gt;index == index) {</div><div class='add'>+			z = refcount_dec_and_test(&amp;tmp-&gt;refcount);</div><div class='add'>+			if (z) {</div><div class='add'>+				tmp-&gt;enable = 0;</div><div class='add'>+				vsc9959_psfp_sfi_set(ocelot, tmp);</div><div class='add'>+				list_del(&amp;tmp-&gt;list);</div><div class='add'>+				kfree(tmp);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_psfp_parse_gate(const struct flow_action_entry *entry,</div><div class='add'>+				    struct felix_stream_gate *sgi)</div><div class='add'>+{</div><div class='add'>+	sgi-&gt;index = entry-&gt;hw_index;</div><div class='add'>+	sgi-&gt;ipv_valid = (entry-&gt;gate.prio &lt; 0) ? 0 : 1;</div><div class='add'>+	sgi-&gt;init_ipv = (sgi-&gt;ipv_valid) ? entry-&gt;gate.prio : 0;</div><div class='add'>+	sgi-&gt;basetime = entry-&gt;gate.basetime;</div><div class='add'>+	sgi-&gt;cycletime = entry-&gt;gate.cycletime;</div><div class='add'>+	sgi-&gt;num_entries = entry-&gt;gate.num_entries;</div><div class='add'>+	sgi-&gt;enable = 1;</div><div class='add'>+</div><div class='add'>+	memcpy(sgi-&gt;entries, entry-&gt;gate.entries,</div><div class='add'>+	       entry-&gt;gate.num_entries * sizeof(struct action_gate_entry));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 vsc9959_sgi_cfg_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	return ocelot_read(ocelot, ANA_SG_ACCESS_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sgi_set(struct ocelot *ocelot,</div><div class='add'>+				struct felix_stream_gate *sgi)</div><div class='add'>+{</div><div class='add'>+	struct action_gate_entry *e;</div><div class='add'>+	struct timespec64 base_ts;</div><div class='add'>+	u32 interval_sum = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (sgi-&gt;index &gt; VSC9959_PSFP_GATE_ID_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot, ANA_SG_ACCESS_CTRL_SGID(sgi-&gt;index),</div><div class='add'>+		     ANA_SG_ACCESS_CTRL);</div><div class='add'>+</div><div class='add'>+	if (!sgi-&gt;enable) {</div><div class='add'>+		ocelot_rmw(ocelot, ANA_SG_CONFIG_REG_3_INIT_GATE_STATE,</div><div class='add'>+			   ANA_SG_CONFIG_REG_3_INIT_GATE_STATE |</div><div class='add'>+			   ANA_SG_CONFIG_REG_3_GATE_ENABLE,</div><div class='add'>+			   ANA_SG_CONFIG_REG_3);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sgi-&gt;cycletime &lt; VSC9959_PSFP_GATE_CYCLETIME_MIN ||</div><div class='add'>+	    sgi-&gt;cycletime &gt; NSEC_PER_SEC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (sgi-&gt;num_entries &gt; VSC9959_PSFP_GATE_LIST_NUM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	vsc9959_new_base_time(ocelot, sgi-&gt;basetime, sgi-&gt;cycletime, &amp;base_ts);</div><div class='add'>+	ocelot_write(ocelot, base_ts.tv_nsec, ANA_SG_CONFIG_REG_1);</div><div class='add'>+	val = lower_32_bits(base_ts.tv_sec);</div><div class='add'>+	ocelot_write(ocelot, val, ANA_SG_CONFIG_REG_2);</div><div class='add'>+</div><div class='add'>+	val = upper_32_bits(base_ts.tv_sec);</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     (sgi-&gt;ipv_valid ? ANA_SG_CONFIG_REG_3_IPV_VALID : 0) |</div><div class='add'>+		     ANA_SG_CONFIG_REG_3_INIT_IPV(sgi-&gt;init_ipv) |</div><div class='add'>+		     ANA_SG_CONFIG_REG_3_GATE_ENABLE |</div><div class='add'>+		     ANA_SG_CONFIG_REG_3_LIST_LENGTH(sgi-&gt;num_entries) |</div><div class='add'>+		     ANA_SG_CONFIG_REG_3_INIT_GATE_STATE |</div><div class='add'>+		     ANA_SG_CONFIG_REG_3_BASE_TIME_SEC_MSB(val),</div><div class='add'>+		     ANA_SG_CONFIG_REG_3);</div><div class='add'>+</div><div class='add'>+	ocelot_write(ocelot, sgi-&gt;cycletime, ANA_SG_CONFIG_REG_4);</div><div class='add'>+</div><div class='add'>+	e = sgi-&gt;entries;</div><div class='add'>+	for (i = 0; i &lt; sgi-&gt;num_entries; i++) {</div><div class='add'>+		u32 ips = (e[i].ipv &lt; 0) ? 0 : (e[i].ipv + 8);</div><div class='add'>+</div><div class='add'>+		ocelot_write_rix(ocelot, ANA_SG_GCL_GS_CONFIG_IPS(ips) |</div><div class='add'>+				 (e[i].gate_state ?</div><div class='add'>+				  ANA_SG_GCL_GS_CONFIG_GATE_STATE : 0),</div><div class='add'>+				 ANA_SG_GCL_GS_CONFIG, i);</div><div class='add'>+</div><div class='add'>+		interval_sum += e[i].interval;</div><div class='add'>+		ocelot_write_rix(ocelot, interval_sum, ANA_SG_GCL_TI_CONFIG, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ocelot_rmw(ocelot, ANA_SG_ACCESS_CTRL_CONFIG_CHANGE,</div><div class='add'>+		   ANA_SG_ACCESS_CTRL_CONFIG_CHANGE,</div><div class='add'>+		   ANA_SG_ACCESS_CTRL);</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout(vsc9959_sgi_cfg_status, ocelot, val,</div><div class='add'>+				  (!(ANA_SG_ACCESS_CTRL_CONFIG_CHANGE &amp; val)),</div><div class='add'>+				  10, 100000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_sgi_table_add(struct ocelot *ocelot,</div><div class='add'>+				      struct felix_stream_gate *sgi)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_gate_entry *tmp;</div><div class='add'>+	struct ocelot_psfp_list *psfp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;psfp-&gt;sgi_list, list)</div><div class='add'>+		if (tmp-&gt;index == sgi-&gt;index) {</div><div class='add'>+			refcount_inc(&amp;tmp-&gt;refcount);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);</div><div class='add'>+	if (!tmp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = vsc9959_psfp_sgi_set(ocelot, sgi);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree(tmp);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp-&gt;index = sgi-&gt;index;</div><div class='add'>+	refcount_set(&amp;tmp-&gt;refcount, 1);</div><div class='add'>+	list_add_tail(&amp;tmp-&gt;list, &amp;psfp-&gt;sgi_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_psfp_sgi_table_del(struct ocelot *ocelot,</div><div class='add'>+				       u32 index)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_gate_entry *tmp, *n;</div><div class='add'>+	struct felix_stream_gate sgi = {0};</div><div class='add'>+	struct ocelot_psfp_list *psfp;</div><div class='add'>+	u8 z;</div><div class='add'>+</div><div class='add'>+	psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(tmp, n, &amp;psfp-&gt;sgi_list, list)</div><div class='add'>+		if (tmp-&gt;index == index) {</div><div class='add'>+			z = refcount_dec_and_test(&amp;tmp-&gt;refcount);</div><div class='add'>+			if (z) {</div><div class='add'>+				sgi.index = index;</div><div class='add'>+				sgi.enable = 0;</div><div class='add'>+				vsc9959_psfp_sgi_set(ocelot, &amp;sgi);</div><div class='add'>+				list_del(&amp;tmp-&gt;list);</div><div class='add'>+				kfree(tmp);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_filter_add(struct ocelot *ocelot, int port,</div><div class='add'>+				   struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = f-&gt;common.extack;</div><div class='add'>+	struct felix_stream_filter old_sfi, *sfi_entry;</div><div class='add'>+	struct felix_stream_filter sfi = {0};</div><div class='add'>+	const struct flow_action_entry *a;</div><div class='add'>+	struct felix_stream *stream_entry;</div><div class='add'>+	struct felix_stream stream = {0};</div><div class='add'>+	struct felix_stream_gate *sgi;</div><div class='add'>+	struct ocelot_psfp_list *psfp;</div><div class='add'>+	struct ocelot_policer pol;</div><div class='add'>+	int ret, i, size;</div><div class='add'>+	u64 rate, burst;</div><div class='add'>+	u32 index;</div><div class='add'>+</div><div class='add'>+	psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+</div><div class='add'>+	ret = vsc9959_stream_identify(f, &amp;stream);</div><div class='add'>+	if (ret) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Only can match on VID, PCP, and dest MAC");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;psfp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, a, &amp;f-&gt;rule-&gt;action) {</div><div class='add'>+		switch (a-&gt;id) {</div><div class='add'>+		case FLOW_ACTION_GATE:</div><div class='add'>+			size = struct_size(sgi, entries, a-&gt;gate.num_entries);</div><div class='add'>+			sgi = kzalloc(size, GFP_KERNEL);</div><div class='add'>+			if (!sgi) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+			vsc9959_psfp_parse_gate(a, sgi);</div><div class='add'>+			ret = vsc9959_psfp_sgi_table_add(ocelot, sgi);</div><div class='add'>+			if (ret) {</div><div class='add'>+				kfree(sgi);</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+			sfi.sg_valid = 1;</div><div class='add'>+			sfi.sgid = sgi-&gt;index;</div><div class='add'>+			kfree(sgi);</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_POLICE:</div><div class='add'>+			index = a-&gt;hw_index + VSC9959_PSFP_POLICER_BASE;</div><div class='add'>+			if (index &gt; VSC9959_PSFP_POLICER_MAX) {</div><div class='add'>+				ret = -EINVAL;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rate = a-&gt;police.rate_bytes_ps;</div><div class='add'>+			burst = rate * PSCHED_NS2TICKS(a-&gt;police.burst);</div><div class='add'>+			pol = (struct ocelot_policer) {</div><div class='add'>+				.burst = div_u64(burst, PSCHED_TICKS_PER_SEC),</div><div class='add'>+				.rate = div_u64(rate, 1000) * 8,</div><div class='add'>+			};</div><div class='add'>+			ret = ocelot_vcap_policer_add(ocelot, index, &amp;pol);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err;</div><div class='add'>+</div><div class='add'>+			sfi.fm_valid = 1;</div><div class='add'>+			sfi.fmid = index;</div><div class='add'>+			sfi.maxsdu = a-&gt;police.mtu;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream.ports = BIT(port);</div><div class='add'>+	stream.port = port;</div><div class='add'>+</div><div class='add'>+	sfi.portmask = stream.ports;</div><div class='add'>+	sfi.prio_valid = (stream.prio &lt; 0 ? 0 : 1);</div><div class='add'>+	sfi.prio = (sfi.prio_valid ? stream.prio : 0);</div><div class='add'>+	sfi.enable = 1;</div><div class='add'>+</div><div class='add'>+	/* Check if stream is set. */</div><div class='add'>+	stream_entry = vsc9959_stream_table_lookup(&amp;psfp-&gt;stream_list, &amp;stream);</div><div class='add'>+	if (stream_entry) {</div><div class='add'>+		if (stream_entry-&gt;ports &amp; BIT(port)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "The stream is added on this port");</div><div class='add'>+			ret = -EEXIST;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (stream_entry-&gt;ports != BIT(stream_entry-&gt;port)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "The stream is added on two ports");</div><div class='add'>+			ret = -EEXIST;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		stream_entry-&gt;ports |= BIT(port);</div><div class='add'>+		stream.ports = stream_entry-&gt;ports;</div><div class='add'>+</div><div class='add'>+		sfi_entry = vsc9959_psfp_sfi_table_get(&amp;psfp-&gt;sfi_list,</div><div class='add'>+						       stream_entry-&gt;sfid);</div><div class='add'>+		memcpy(&amp;old_sfi, sfi_entry, sizeof(old_sfi));</div><div class='add'>+</div><div class='add'>+		vsc9959_psfp_sfi_table_del(ocelot, stream_entry-&gt;sfid);</div><div class='add'>+</div><div class='add'>+		old_sfi.portmask = stream_entry-&gt;ports;</div><div class='add'>+		sfi.portmask = stream.ports;</div><div class='add'>+</div><div class='add'>+		if (stream_entry-&gt;port &gt; port) {</div><div class='add'>+			ret = vsc9959_psfp_sfi_table_add2(ocelot, &amp;sfi,</div><div class='add'>+							  &amp;old_sfi);</div><div class='add'>+			stream_entry-&gt;dummy = true;</div><div class='add'>+		} else {</div><div class='add'>+			ret = vsc9959_psfp_sfi_table_add2(ocelot, &amp;old_sfi,</div><div class='add'>+							  &amp;sfi);</div><div class='add'>+			stream.dummy = true;</div><div class='add'>+		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		stream_entry-&gt;sfid = old_sfi.index;</div><div class='add'>+	} else {</div><div class='add'>+		ret = vsc9959_psfp_sfi_table_add(ocelot, &amp;sfi);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stream.sfid = sfi.index;</div><div class='add'>+	stream.sfid_valid = 1;</div><div class='add'>+	ret = vsc9959_stream_table_add(ocelot, &amp;psfp-&gt;stream_list,</div><div class='add'>+				       &amp;stream, extack);</div><div class='add'>+	if (ret) {</div><div class='add'>+		vsc9959_psfp_sfi_table_del(ocelot, stream.sfid);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (sfi.sg_valid)</div><div class='add'>+		vsc9959_psfp_sgi_table_del(ocelot, sfi.sgid);</div><div class='add'>+</div><div class='add'>+	if (sfi.fm_valid)</div><div class='add'>+		ocelot_vcap_policer_del(ocelot, sfi.fmid);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_filter_del(struct ocelot *ocelot,</div><div class='add'>+				   struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream *stream, tmp, *stream_entry;</div><div class='add'>+	struct ocelot_psfp_list *psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+	static struct felix_stream_filter *sfi;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;psfp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	stream = vsc9959_stream_table_get(&amp;psfp-&gt;stream_list, f-&gt;cookie);</div><div class='add'>+	if (!stream) {</div><div class='add'>+		mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sfi = vsc9959_psfp_sfi_table_get(&amp;psfp-&gt;sfi_list, stream-&gt;sfid);</div><div class='add'>+	if (!sfi) {</div><div class='add'>+		mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sfi-&gt;sg_valid)</div><div class='add'>+		vsc9959_psfp_sgi_table_del(ocelot, sfi-&gt;sgid);</div><div class='add'>+</div><div class='add'>+	if (sfi-&gt;fm_valid)</div><div class='add'>+		ocelot_vcap_policer_del(ocelot, sfi-&gt;fmid);</div><div class='add'>+</div><div class='add'>+	vsc9959_psfp_sfi_table_del(ocelot, stream-&gt;sfid);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;tmp, stream, sizeof(tmp));</div><div class='add'>+</div><div class='add'>+	stream-&gt;sfid_valid = 0;</div><div class='add'>+	vsc9959_stream_table_del(ocelot, stream);</div><div class='add'>+</div><div class='add'>+	stream_entry = vsc9959_stream_table_lookup(&amp;psfp-&gt;stream_list, &amp;tmp);</div><div class='add'>+	if (stream_entry) {</div><div class='add'>+		stream_entry-&gt;ports = BIT(stream_entry-&gt;port);</div><div class='add'>+		if (stream_entry-&gt;dummy) {</div><div class='add'>+			stream_entry-&gt;dummy = false;</div><div class='add'>+			vsc9959_mact_stream_set(ocelot, stream_entry, NULL);</div><div class='add'>+		}</div><div class='add'>+		vsc9959_psfp_sfidmask_set(ocelot, stream_entry-&gt;sfid,</div><div class='add'>+					  stream_entry-&gt;ports);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_update_sfid_stats(struct ocelot *ocelot,</div><div class='add'>+				      struct felix_stream_filter *sfi)</div><div class='add'>+{</div><div class='add'>+	struct felix_stream_filter_counters *s = &amp;sfi-&gt;stats;</div><div class='add'>+	u32 match, not_pass_gate, not_pass_sdu, red;</div><div class='add'>+	u32 sfid = sfi-&gt;index;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ocelot-&gt;stat_view_lock);</div><div class='add'>+</div><div class='add'>+	ocelot_rmw(ocelot, SYS_STAT_CFG_STAT_VIEW(sfid),</div><div class='add'>+		   SYS_STAT_CFG_STAT_VIEW_M,</div><div class='add'>+		   SYS_STAT_CFG);</div><div class='add'>+</div><div class='add'>+	match = ocelot_read(ocelot, SYS_COUNT_SF_MATCHING_FRAMES);</div><div class='add'>+	not_pass_gate = ocelot_read(ocelot, SYS_COUNT_SF_NOT_PASSING_FRAMES);</div><div class='add'>+	not_pass_sdu = ocelot_read(ocelot, SYS_COUNT_SF_NOT_PASSING_SDU);</div><div class='add'>+	red = ocelot_read(ocelot, SYS_COUNT_SF_RED_FRAMES);</div><div class='add'>+</div><div class='add'>+	/* Clear the PSFP counter. */</div><div class='add'>+	ocelot_write(ocelot,</div><div class='add'>+		     SYS_STAT_CFG_STAT_VIEW(sfid) |</div><div class='add'>+		     SYS_STAT_CFG_STAT_CLEAR_SHOT(0x10),</div><div class='add'>+		     SYS_STAT_CFG);</div><div class='add'>+</div><div class='add'>+	s-&gt;match += match;</div><div class='add'>+	s-&gt;not_pass_gate += not_pass_gate;</div><div class='add'>+	s-&gt;not_pass_sdu += not_pass_sdu;</div><div class='add'>+	s-&gt;red += red;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold &amp;ocelot-&gt;stat_view_lock */</div><div class='add'>+static void vsc9959_update_stats(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_psfp_list *psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+	struct felix_stream_filter *sfi;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;psfp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(sfi, &amp;psfp-&gt;sfi_list, list)</div><div class='add'>+		vsc9959_update_sfid_stats(ocelot, sfi);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;psfp-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_psfp_stats_get(struct ocelot *ocelot,</div><div class='add'>+				  struct flow_cls_offload *f,</div><div class='add'>+				  struct flow_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_psfp_list *psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+	struct felix_stream_filter_counters *s;</div><div class='add'>+	static struct felix_stream_filter *sfi;</div><div class='add'>+	struct felix_stream *stream;</div><div class='add'>+</div><div class='add'>+	stream = vsc9959_stream_table_get(&amp;psfp-&gt;stream_list, f-&gt;cookie);</div><div class='add'>+	if (!stream)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	sfi = vsc9959_psfp_sfi_table_get(&amp;psfp-&gt;sfi_list, stream-&gt;sfid);</div><div class='add'>+	if (!sfi)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ocelot-&gt;stat_view_lock);</div><div class='add'>+</div><div class='add'>+	vsc9959_update_sfid_stats(ocelot, sfi);</div><div class='add'>+</div><div class='add'>+	s = &amp;sfi-&gt;stats;</div><div class='add'>+	stats-&gt;pkts = s-&gt;match;</div><div class='add'>+	stats-&gt;drops = s-&gt;not_pass_gate + s-&gt;not_pass_sdu + s-&gt;red;</div><div class='add'>+</div><div class='add'>+	memset(s, 0, sizeof(*s));</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ocelot-&gt;stat_view_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9959_psfp_init(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct ocelot_psfp_list *psfp = &amp;ocelot-&gt;psfp;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;psfp-&gt;stream_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;psfp-&gt;sfi_list);</div><div class='add'>+	INIT_LIST_HEAD(&amp;psfp-&gt;sgi_list);</div><div class='add'>+	mutex_init(&amp;psfp-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* When using cut-through forwarding and the egress port runs at a higher data</div><div class='add'>+ * rate than the ingress port, the packet currently under transmission would</div><div class='add'>+ * suffer an underrun since it would be transmitted faster than it is received.</div><div class='add'>+ * The Felix switch implementation of cut-through forwarding does not check in</div><div class='add'>+ * hardware whether this condition is satisfied or not, so we must restrict the</div><div class='add'>+ * list of ports that have cut-through forwarding enabled on egress to only be</div><div class='add'>+ * the ports operating at the lowest link speed within their respective</div><div class='add'>+ * forwarding domain.</div><div class='add'>+ */</div><div class='add'>+static void vsc9959_cut_through_fwd(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct dsa_switch *ds = felix-&gt;ds;</div><div class='add'>+	int tc, port, other_port;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ocelot-&gt;fwd_domain_lock);</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ocelot-&gt;num_phys_ports; port++) {</div><div class='add'>+		struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+		struct ocelot_mm_state *mm = &amp;ocelot-&gt;mm[port];</div><div class='add'>+		int min_speed = ocelot_port-&gt;speed;</div><div class='add'>+		unsigned long mask = 0;</div><div class='add'>+		u32 tmp, val = 0;</div><div class='add'>+</div><div class='add'>+		/* Disable cut-through on ports that are down */</div><div class='add'>+		if (ocelot_port-&gt;speed &lt;= 0)</div><div class='add'>+			goto set;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_cpu_port(ds, port)) {</div><div class='add'>+			/* Ocelot switches forward from the NPI port towards</div><div class='add'>+			 * any port, regardless of it being in the NPI port's</div><div class='add'>+			 * forwarding domain or not.</div><div class='add'>+			 */</div><div class='add'>+			mask = dsa_user_ports(ds);</div><div class='add'>+		} else {</div><div class='add'>+			mask = ocelot_get_bridge_fwd_mask(ocelot, port);</div><div class='add'>+			mask &amp;= ~BIT(port);</div><div class='add'>+			if (ocelot-&gt;npi &gt;= 0)</div><div class='add'>+				mask |= BIT(ocelot-&gt;npi);</div><div class='add'>+			else</div><div class='add'>+				mask |= ocelot_port_assigned_dsa_8021q_cpu_mask(ocelot,</div><div class='add'>+										port);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Calculate the minimum link speed, among the ports that are</div><div class='add'>+		 * up, of this source port's forwarding domain.</div><div class='add'>+		 */</div><div class='add'>+		for_each_set_bit(other_port, &amp;mask, ocelot-&gt;num_phys_ports) {</div><div class='add'>+			struct ocelot_port *other_ocelot_port;</div><div class='add'>+</div><div class='add'>+			other_ocelot_port = ocelot-&gt;ports[other_port];</div><div class='add'>+			if (other_ocelot_port-&gt;speed &lt;= 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (min_speed &gt; other_ocelot_port-&gt;speed)</div><div class='add'>+				min_speed = other_ocelot_port-&gt;speed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable cut-through forwarding for all traffic classes that</div><div class='add'>+		 * don't have oversized dropping enabled, since this check is</div><div class='add'>+		 * bypassed in cut-through mode. Also exclude preemptible</div><div class='add'>+		 * traffic classes, since these would hang the port for some</div><div class='add'>+		 * reason, if sent as cut-through.</div><div class='add'>+		 */</div><div class='add'>+		if (ocelot_port-&gt;speed == min_speed) {</div><div class='add'>+			val = GENMASK(7, 0) &amp; ~mm-&gt;active_preemptible_tcs;</div><div class='add'>+</div><div class='add'>+			for (tc = 0; tc &lt; OCELOT_NUM_TC; tc++)</div><div class='add'>+				if (vsc9959_port_qmaxsdu_get(ocelot, port, tc))</div><div class='add'>+					val &amp;= ~BIT(tc);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+set:</div><div class='add'>+		tmp = ocelot_read_rix(ocelot, ANA_CUT_THRU_CFG, port);</div><div class='add'>+		if (tmp == val)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dev_dbg(ocelot-&gt;dev,</div><div class='add'>+			"port %d fwd mask 0x%lx speed %d min_speed %d, %s cut-through forwarding on TC mask 0x%x\n",</div><div class='add'>+			port, mask, ocelot_port-&gt;speed, min_speed,</div><div class='add'>+			val ? "enabling" : "disabling", val);</div><div class='add'>+</div><div class='add'>+		ocelot_write_rix(ocelot, val, ANA_CUT_THRU_CFG, port);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The INTB interrupt is shared between for PTP TX timestamp availability</div><div class='add'>+ * notification and MAC Merge status change on each port.</div><div class='add'>+ */</div><div class='add'>+static irqreturn_t vsc9959_irq_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ocelot *ocelot = data;</div><div class='add'>+</div><div class='add'>+	ocelot_get_txtstamp(ocelot);</div><div class='add'>+	ocelot_mm_irq(ocelot);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9959_request_irq(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(ocelot-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return devm_request_threaded_irq(ocelot-&gt;dev, pdev-&gt;irq, NULL,</div><div class='add'>+					 &amp;vsc9959_irq_handler, IRQF_ONESHOT,</div><div class='add'>+					 "felix-intb", ocelot);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ocelot_ops vsc9959_ops = {</div><div class='add'>+	.reset			= vsc9959_reset,</div><div class='add'>+	.wm_enc			= vsc9959_wm_enc,</div><div class='add'>+	.wm_dec			= vsc9959_wm_dec,</div><div class='add'>+	.wm_stat		= vsc9959_wm_stat,</div><div class='add'>+	.port_to_netdev		= felix_port_to_netdev,</div><div class='add'>+	.netdev_to_port		= felix_netdev_to_port,</div><div class='add'>+	.psfp_init		= vsc9959_psfp_init,</div><div class='add'>+	.psfp_filter_add	= vsc9959_psfp_filter_add,</div><div class='add'>+	.psfp_filter_del	= vsc9959_psfp_filter_del,</div><div class='add'>+	.psfp_stats_get		= vsc9959_psfp_stats_get,</div><div class='add'>+	.cut_through_fwd	= vsc9959_cut_through_fwd,</div><div class='add'>+	.tas_clock_adjust	= vsc9959_tas_clock_adjust,</div><div class='add'>+	.update_stats		= vsc9959_update_stats,</div><div class='add'>+	.tas_guard_bands_update	= vsc9959_tas_guard_bands_update,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct felix_info felix_info_vsc9959 = {</div><div class='add'>+	.resources		= vsc9959_resources,</div><div class='add'>+	.num_resources		= ARRAY_SIZE(vsc9959_resources),</div><div class='add'>+	.resource_names		= vsc9959_resource_names,</div><div class='add'>+	.regfields		= vsc9959_regfields,</div><div class='add'>+	.map			= vsc9959_regmap,</div><div class='add'>+	.ops			= &amp;vsc9959_ops,</div><div class='add'>+	.vcap			= vsc9959_vcap_props,</div><div class='add'>+	.vcap_pol_base		= VSC9959_VCAP_POLICER_BASE,</div><div class='add'>+	.vcap_pol_max		= VSC9959_VCAP_POLICER_MAX,</div><div class='add'>+	.vcap_pol_base2		= 0,</div><div class='add'>+	.vcap_pol_max2		= 0,</div><div class='add'>+	.num_mact_rows		= 2048,</div><div class='add'>+	.num_ports		= VSC9959_NUM_PORTS,</div><div class='add'>+	.quirks			= FELIX_MAC_QUIRKS,</div><div class='add'>+	.quirk_no_xtr_irq	= true,</div><div class='add'>+	.ptp_caps		= &amp;vsc9959_ptp_caps,</div><div class='add'>+	.mdio_bus_alloc		= vsc9959_mdio_bus_alloc,</div><div class='add'>+	.mdio_bus_free		= vsc9959_mdio_bus_free,</div><div class='add'>+	.port_modes		= vsc9959_port_modes,</div><div class='add'>+	.port_setup_tc		= vsc9959_port_setup_tc,</div><div class='add'>+	.port_sched_speed_set	= vsc9959_sched_speed_set,</div><div class='add'>+	.request_irq		= vsc9959_request_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int felix_pci_probe(struct pci_dev *pdev,</div><div class='add'>+			   const struct pci_device_id *id)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	resource_size_t switch_base;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "device enable failed: %pe\n", ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	switch_base = pci_resource_start(pdev, VSC9959_SWITCH_PCI_BAR);</div><div class='add'>+</div><div class='add'>+	err = felix_register_switch(dev, switch_base, OCELOT_NUM_TC,</div><div class='add'>+				    true, true, DSA_TAG_PROTO_OCELOT,</div><div class='add'>+				    &amp;felix_info_vsc9959);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_disable;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_disable:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_pci_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!felix)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(felix-&gt;ds);</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void felix_pci_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!felix)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(felix-&gt;ds);</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_device_id felix_ids[] = {</div><div class='add'>+	{</div><div class='add'>+		/* NXP LS1028A */</div><div class='add'>+		PCI_DEVICE(PCI_VENDOR_ID_FREESCALE, 0xEEF0),</div><div class='add'>+	},</div><div class='add'>+	{ 0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, felix_ids);</div><div class='add'>+</div><div class='add'>+static struct pci_driver felix_vsc9959_pci_driver = {</div><div class='add'>+	.name		= "mscc_felix",</div><div class='add'>+	.id_table	= felix_ids,</div><div class='add'>+	.probe		= felix_pci_probe,</div><div class='add'>+	.remove		= felix_pci_remove,</div><div class='add'>+	.shutdown	= felix_pci_shutdown,</div><div class='add'>+};</div><div class='add'>+module_pci_driver(felix_vsc9959_pci_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Felix Switch driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/ocelot_ext.c b/drivers/net/dsa/ocelot/ocelot_ext.c<br/>new file mode 100644<br/>index 000000000000..d5c557a20292<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/ocelot_ext.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/ocelot_ext.c</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2021-2022 Innovative Advantage Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mfd/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot.h&gt;</div><div class='add'>+#include &lt;soc/mscc/vsc7514_regs.h&gt;</div><div class='add'>+#include "felix.h"</div><div class='add'>+</div><div class='add'>+#define VSC7514_NUM_PORTS		11</div><div class='add'>+</div><div class='add'>+#define OCELOT_PORT_MODE_SERDES		(OCELOT_PORT_MODE_SGMII | \</div><div class='add'>+					 OCELOT_PORT_MODE_QSGMII)</div><div class='add'>+</div><div class='add'>+static const u32 vsc7512_port_modes[VSC7514_NUM_PORTS] = {</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	OCELOT_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_SGMII,</div><div class='add'>+	OCELOT_PORT_MODE_SERDES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ocelot_ops ocelot_ext_ops = {</div><div class='add'>+	.reset		= ocelot_reset,</div><div class='add'>+	.wm_enc		= ocelot_wm_enc,</div><div class='add'>+	.wm_dec		= ocelot_wm_dec,</div><div class='add'>+	.wm_stat	= ocelot_wm_stat,</div><div class='add'>+	.port_to_netdev	= felix_port_to_netdev,</div><div class='add'>+	.netdev_to_port	= felix_netdev_to_port,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vsc7512_resource_names[TARGET_MAX] = {</div><div class='add'>+	[SYS] = "sys",</div><div class='add'>+	[REW] = "rew",</div><div class='add'>+	[S0] = "s0",</div><div class='add'>+	[S1] = "s1",</div><div class='add'>+	[S2] = "s2",</div><div class='add'>+	[QS] = "qs",</div><div class='add'>+	[QSYS] = "qsys",</div><div class='add'>+	[ANA] = "ana",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct felix_info vsc7512_info = {</div><div class='add'>+	.resource_names			= vsc7512_resource_names,</div><div class='add'>+	.regfields			= vsc7514_regfields,</div><div class='add'>+	.map				= vsc7514_regmap,</div><div class='add'>+	.ops				= &amp;ocelot_ext_ops,</div><div class='add'>+	.vcap				= vsc7514_vcap_props,</div><div class='add'>+	.num_mact_rows			= 1024,</div><div class='add'>+	.num_ports			= VSC7514_NUM_PORTS,</div><div class='add'>+	.port_modes			= vsc7512_port_modes,</div><div class='add'>+	.phylink_mac_config		= ocelot_phylink_mac_config,</div><div class='add'>+	.configure_serdes		= ocelot_port_configure_serdes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ocelot_ext_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return felix_register_switch(&amp;pdev-&gt;dev, 0, 1, false, false,</div><div class='add'>+				     DSA_TAG_PROTO_OCELOT, &amp;vsc7512_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocelot_ext_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!felix)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(felix-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ocelot_ext_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!felix)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(felix-&gt;ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ocelot_ext_switch_of_match[] = {</div><div class='add'>+	{ .compatible = "mscc,vsc7512-switch" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ocelot_ext_switch_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver ocelot_ext_switch_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "ocelot-ext-switch",</div><div class='add'>+		.of_match_table = ocelot_ext_switch_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = ocelot_ext_probe,</div><div class='add'>+	.remove = ocelot_ext_remove,</div><div class='add'>+	.shutdown = ocelot_ext_shutdown,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(ocelot_ext_switch_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("External Ocelot Switch driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("MFD_OCELOT");</div><div class='head'>diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c<br/>new file mode 100644<br/>index 000000000000..eb3944ba2a72<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/ocelot/seville_vsc9953.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/ocelot/seville_vsc9953.c</a></div><div class='hunk'>@@ -0,0 +1,1027 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0 OR MIT)</div><div class='add'>+/* Distributed Switch Architecture VSC9953 driver</div><div class='add'>+ * Copyright (C) 2020, Maxim Kochetkov &lt;fido_max@inbox.ru&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_vcap.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot_sys.h&gt;</div><div class='add'>+#include &lt;soc/mscc/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/mdio/mdio-mscc-miim.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/pcs-lynx.h&gt;</div><div class='add'>+#include &lt;linux/dsa/ocelot.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include "felix.h"</div><div class='add'>+</div><div class='add'>+#define VSC9953_NUM_PORTS			10</div><div class='add'>+</div><div class='add'>+#define VSC9953_VCAP_POLICER_BASE		11</div><div class='add'>+#define VSC9953_VCAP_POLICER_MAX		31</div><div class='add'>+#define VSC9953_VCAP_POLICER_BASE2		120</div><div class='add'>+#define VSC9953_VCAP_POLICER_MAX2		161</div><div class='add'>+</div><div class='add'>+#define VSC9953_PORT_MODE_SERDES		(OCELOT_PORT_MODE_1000BASEX | \</div><div class='add'>+						 OCELOT_PORT_MODE_SGMII | \</div><div class='add'>+						 OCELOT_PORT_MODE_QSGMII)</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_port_modes[VSC9953_NUM_PORTS] = {</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	VSC9953_PORT_MODE_SERDES,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+	OCELOT_PORT_MODE_INTERNAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_ana_regmap[] = {</div><div class='add'>+	REG(ANA_ADVLEARN,			0x00b500),</div><div class='add'>+	REG(ANA_VLANMASK,			0x00b504),</div><div class='add'>+	REG_RESERVED(ANA_PORT_B_DOMAIN),</div><div class='add'>+	REG(ANA_ANAGEFIL,			0x00b50c),</div><div class='add'>+	REG(ANA_ANEVENTS,			0x00b510),</div><div class='add'>+	REG(ANA_STORMLIMIT_BURST,		0x00b514),</div><div class='add'>+	REG(ANA_STORMLIMIT_CFG,			0x00b518),</div><div class='add'>+	REG(ANA_ISOLATED_PORTS,			0x00b528),</div><div class='add'>+	REG(ANA_COMMUNITY_PORTS,		0x00b52c),</div><div class='add'>+	REG(ANA_AUTOAGE,			0x00b530),</div><div class='add'>+	REG(ANA_MACTOPTIONS,			0x00b534),</div><div class='add'>+	REG(ANA_LEARNDISC,			0x00b538),</div><div class='add'>+	REG(ANA_AGENCTRL,			0x00b53c),</div><div class='add'>+	REG(ANA_MIRRORPORTS,			0x00b540),</div><div class='add'>+	REG(ANA_EMIRRORPORTS,			0x00b544),</div><div class='add'>+	REG(ANA_FLOODING,			0x00b548),</div><div class='add'>+	REG(ANA_FLOODING_IPMC,			0x00b54c),</div><div class='add'>+	REG(ANA_SFLOW_CFG,			0x00b550),</div><div class='add'>+	REG(ANA_PORT_MODE,			0x00b57c),</div><div class='add'>+	REG_RESERVED(ANA_CUT_THRU_CFG),</div><div class='add'>+	REG(ANA_PGID_PGID,			0x00b600),</div><div class='add'>+	REG(ANA_TABLES_ANMOVED,			0x00b4ac),</div><div class='add'>+	REG(ANA_TABLES_MACHDATA,		0x00b4b0),</div><div class='add'>+	REG(ANA_TABLES_MACLDATA,		0x00b4b4),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_STREAMDATA),</div><div class='add'>+	REG(ANA_TABLES_MACACCESS,		0x00b4b8),</div><div class='add'>+	REG(ANA_TABLES_MACTINDX,		0x00b4bc),</div><div class='add'>+	REG(ANA_TABLES_VLANACCESS,		0x00b4c0),</div><div class='add'>+	REG(ANA_TABLES_VLANTIDX,		0x00b4c4),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_ISDXACCESS),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_ISDXTIDX),</div><div class='add'>+	REG(ANA_TABLES_ENTRYLIM,		0x00b480),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_PTP_ID_HIGH),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_PTP_ID_LOW),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_STREAMACCESS),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_STREAMTIDX),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_SEQ_HISTORY),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_SEQ_MASK),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_SFID_MASK),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_SFIDACCESS),</div><div class='add'>+	REG_RESERVED(ANA_TABLES_SFIDTIDX),</div><div class='add'>+	REG_RESERVED(ANA_MSTI_STATE),</div><div class='add'>+	REG_RESERVED(ANA_OAM_UPM_LM_CNT),</div><div class='add'>+	REG_RESERVED(ANA_SG_ACCESS_CTRL),</div><div class='add'>+	REG_RESERVED(ANA_SG_CONFIG_REG_1),</div><div class='add'>+	REG_RESERVED(ANA_SG_CONFIG_REG_2),</div><div class='add'>+	REG_RESERVED(ANA_SG_CONFIG_REG_3),</div><div class='add'>+	REG_RESERVED(ANA_SG_CONFIG_REG_4),</div><div class='add'>+	REG_RESERVED(ANA_SG_CONFIG_REG_5),</div><div class='add'>+	REG_RESERVED(ANA_SG_GCL_GS_CONFIG),</div><div class='add'>+	REG_RESERVED(ANA_SG_GCL_TI_CONFIG),</div><div class='add'>+	REG_RESERVED(ANA_SG_STATUS_REG_1),</div><div class='add'>+	REG_RESERVED(ANA_SG_STATUS_REG_2),</div><div class='add'>+	REG_RESERVED(ANA_SG_STATUS_REG_3),</div><div class='add'>+	REG(ANA_PORT_VLAN_CFG,			0x000000),</div><div class='add'>+	REG(ANA_PORT_DROP_CFG,			0x000004),</div><div class='add'>+	REG(ANA_PORT_QOS_CFG,			0x000008),</div><div class='add'>+	REG(ANA_PORT_VCAP_CFG,			0x00000c),</div><div class='add'>+	REG(ANA_PORT_VCAP_S1_KEY_CFG,		0x000010),</div><div class='add'>+	REG(ANA_PORT_VCAP_S2_CFG,		0x00001c),</div><div class='add'>+	REG(ANA_PORT_PCP_DEI_MAP,		0x000020),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_CFG,		0x000060),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_BPDU_CFG,		0x000064),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_GARP_CFG,		0x000068),</div><div class='add'>+	REG(ANA_PORT_CPU_FWD_CCM_CFG,		0x00006c),</div><div class='add'>+	REG(ANA_PORT_PORT_CFG,			0x000070),</div><div class='add'>+	REG(ANA_PORT_POL_CFG,			0x000074),</div><div class='add'>+	REG_RESERVED(ANA_PORT_PTP_CFG),</div><div class='add'>+	REG_RESERVED(ANA_PORT_PTP_DLY1_CFG),</div><div class='add'>+	REG_RESERVED(ANA_PORT_PTP_DLY2_CFG),</div><div class='add'>+	REG_RESERVED(ANA_PORT_SFID_CFG),</div><div class='add'>+	REG(ANA_PFC_PFC_CFG,			0x00c000),</div><div class='add'>+	REG_RESERVED(ANA_PFC_PFC_TIMER),</div><div class='add'>+	REG_RESERVED(ANA_IPT_OAM_MEP_CFG),</div><div class='add'>+	REG_RESERVED(ANA_IPT_IPT),</div><div class='add'>+	REG_RESERVED(ANA_PPT_PPT),</div><div class='add'>+	REG_RESERVED(ANA_FID_MAP_FID_MAP),</div><div class='add'>+	REG(ANA_AGGR_CFG,			0x00c600),</div><div class='add'>+	REG(ANA_CPUQ_CFG,			0x00c604),</div><div class='add'>+	REG_RESERVED(ANA_CPUQ_CFG2),</div><div class='add'>+	REG(ANA_CPUQ_8021_CFG,			0x00c60c),</div><div class='add'>+	REG(ANA_DSCP_CFG,			0x00c64c),</div><div class='add'>+	REG(ANA_DSCP_REWR_CFG,			0x00c74c),</div><div class='add'>+	REG(ANA_VCAP_RNG_TYPE_CFG,		0x00c78c),</div><div class='add'>+	REG(ANA_VCAP_RNG_VAL_CFG,		0x00c7ac),</div><div class='add'>+	REG_RESERVED(ANA_VRAP_CFG),</div><div class='add'>+	REG_RESERVED(ANA_VRAP_HDR_DATA),</div><div class='add'>+	REG_RESERVED(ANA_VRAP_HDR_MASK),</div><div class='add'>+	REG(ANA_DISCARD_CFG,			0x00c7d8),</div><div class='add'>+	REG(ANA_FID_CFG,			0x00c7dc),</div><div class='add'>+	REG(ANA_POL_PIR_CFG,			0x00a000),</div><div class='add'>+	REG(ANA_POL_CIR_CFG,			0x00a004),</div><div class='add'>+	REG(ANA_POL_MODE_CFG,			0x00a008),</div><div class='add'>+	REG(ANA_POL_PIR_STATE,			0x00a00c),</div><div class='add'>+	REG(ANA_POL_CIR_STATE,			0x00a010),</div><div class='add'>+	REG_RESERVED(ANA_POL_STATE),</div><div class='add'>+	REG(ANA_POL_FLOWC,			0x00c280),</div><div class='add'>+	REG(ANA_POL_HYST,			0x00c2ec),</div><div class='add'>+	REG_RESERVED(ANA_POL_MISC_CFG),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_qs_regmap[] = {</div><div class='add'>+	REG(QS_XTR_GRP_CFG,			0x000000),</div><div class='add'>+	REG(QS_XTR_RD,				0x000008),</div><div class='add'>+	REG(QS_XTR_FRM_PRUNING,			0x000010),</div><div class='add'>+	REG(QS_XTR_FLUSH,			0x000018),</div><div class='add'>+	REG(QS_XTR_DATA_PRESENT,		0x00001c),</div><div class='add'>+	REG(QS_XTR_CFG,				0x000020),</div><div class='add'>+	REG(QS_INJ_GRP_CFG,			0x000024),</div><div class='add'>+	REG(QS_INJ_WR,				0x00002c),</div><div class='add'>+	REG(QS_INJ_CTRL,			0x000034),</div><div class='add'>+	REG(QS_INJ_STATUS,			0x00003c),</div><div class='add'>+	REG(QS_INJ_ERR,				0x000040),</div><div class='add'>+	REG_RESERVED(QS_INH_DBG),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_vcap_regmap[] = {</div><div class='add'>+	/* VCAP_CORE_CFG */</div><div class='add'>+	REG(VCAP_CORE_UPDATE_CTRL,		0x000000),</div><div class='add'>+	REG(VCAP_CORE_MV_CFG,			0x000004),</div><div class='add'>+	/* VCAP_CORE_CACHE */</div><div class='add'>+	REG(VCAP_CACHE_ENTRY_DAT,		0x000008),</div><div class='add'>+	REG(VCAP_CACHE_MASK_DAT,		0x000108),</div><div class='add'>+	REG(VCAP_CACHE_ACTION_DAT,		0x000208),</div><div class='add'>+	REG(VCAP_CACHE_CNT_DAT,			0x000308),</div><div class='add'>+	REG(VCAP_CACHE_TG_DAT,			0x000388),</div><div class='add'>+	/* VCAP_CONST */</div><div class='add'>+	REG(VCAP_CONST_VCAP_VER,		0x000398),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_WIDTH,		0x00039c),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_CNT,		0x0003a0),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_SWCNT,		0x0003a4),</div><div class='add'>+	REG(VCAP_CONST_ENTRY_TG_WIDTH,		0x0003a8),</div><div class='add'>+	REG(VCAP_CONST_ACTION_DEF_CNT,		0x0003ac),</div><div class='add'>+	REG(VCAP_CONST_ACTION_WIDTH,		0x0003b0),</div><div class='add'>+	REG(VCAP_CONST_CNT_WIDTH,		0x0003b4),</div><div class='add'>+	REG_RESERVED(VCAP_CONST_CORE_CNT),</div><div class='add'>+	REG_RESERVED(VCAP_CONST_IF_CNT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_qsys_regmap[] = {</div><div class='add'>+	REG(QSYS_PORT_MODE,			0x003600),</div><div class='add'>+	REG(QSYS_SWITCH_PORT_MODE,		0x003630),</div><div class='add'>+	REG(QSYS_STAT_CNT_CFG,			0x00365c),</div><div class='add'>+	REG(QSYS_EEE_CFG,			0x003660),</div><div class='add'>+	REG(QSYS_EEE_THRES,			0x003688),</div><div class='add'>+	REG(QSYS_IGR_NO_SHARING,		0x00368c),</div><div class='add'>+	REG(QSYS_EGR_NO_SHARING,		0x003690),</div><div class='add'>+	REG(QSYS_SW_STATUS,			0x003694),</div><div class='add'>+	REG(QSYS_EXT_CPU_CFG,			0x0036c0),</div><div class='add'>+	REG_RESERVED(QSYS_PAD_CFG),</div><div class='add'>+	REG(QSYS_CPU_GROUP_MAP,			0x0036c8),</div><div class='add'>+	REG_RESERVED(QSYS_QMAP),</div><div class='add'>+	REG_RESERVED(QSYS_ISDX_SGRP),</div><div class='add'>+	REG_RESERVED(QSYS_TIMED_FRAME_ENTRY),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_MISC),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_PORT_DLY),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_1),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_2),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_3),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_4),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_5),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_6),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_7),</div><div class='add'>+	REG_RESERVED(QSYS_TFRM_TIMER_CFG_8),</div><div class='add'>+	REG(QSYS_RED_PROFILE,			0x003724),</div><div class='add'>+	REG(QSYS_RES_QOS_MODE,			0x003764),</div><div class='add'>+	REG(QSYS_RES_CFG,			0x004000),</div><div class='add'>+	REG(QSYS_RES_STAT,			0x004004),</div><div class='add'>+	REG(QSYS_EGR_DROP_MODE,			0x003768),</div><div class='add'>+	REG(QSYS_EQ_CTRL,			0x00376c),</div><div class='add'>+	REG_RESERVED(QSYS_EVENTS_CORE),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_0),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_1),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_2),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_3),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_4),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_5),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_6),</div><div class='add'>+	REG_RESERVED(QSYS_QMAXSDU_CFG_7),</div><div class='add'>+	REG_RESERVED(QSYS_PREEMPTION_CFG),</div><div class='add'>+	REG(QSYS_CIR_CFG,			0x000000),</div><div class='add'>+	REG_RESERVED(QSYS_EIR_CFG),</div><div class='add'>+	REG(QSYS_SE_CFG,			0x000008),</div><div class='add'>+	REG(QSYS_SE_DWRR_CFG,			0x00000c),</div><div class='add'>+	REG_RESERVED(QSYS_SE_CONNECT),</div><div class='add'>+	REG_RESERVED(QSYS_SE_DLB_SENSE),</div><div class='add'>+	REG(QSYS_CIR_STATE,			0x000044),</div><div class='add'>+	REG_RESERVED(QSYS_EIR_STATE),</div><div class='add'>+	REG_RESERVED(QSYS_SE_STATE),</div><div class='add'>+	REG(QSYS_HSCH_MISC_CFG,			0x003774),</div><div class='add'>+	REG_RESERVED(QSYS_TAG_CONFIG),</div><div class='add'>+	REG_RESERVED(QSYS_TAS_PARAM_CFG_CTRL),</div><div class='add'>+	REG_RESERVED(QSYS_PORT_MAX_SDU),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_CFG_REG_1),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_CFG_REG_2),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_CFG_REG_3),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_CFG_REG_4),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_CFG_REG_5),</div><div class='add'>+	REG_RESERVED(QSYS_GCL_CFG_REG_1),</div><div class='add'>+	REG_RESERVED(QSYS_GCL_CFG_REG_2),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_1),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_2),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_3),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_4),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_5),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_6),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_7),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_8),</div><div class='add'>+	REG_RESERVED(QSYS_PARAM_STATUS_REG_9),</div><div class='add'>+	REG_RESERVED(QSYS_GCL_STATUS_REG_1),</div><div class='add'>+	REG_RESERVED(QSYS_GCL_STATUS_REG_2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_rew_regmap[] = {</div><div class='add'>+	REG(REW_PORT_VLAN_CFG,			0x000000),</div><div class='add'>+	REG(REW_TAG_CFG,			0x000004),</div><div class='add'>+	REG(REW_PORT_CFG,			0x000008),</div><div class='add'>+	REG(REW_DSCP_CFG,			0x00000c),</div><div class='add'>+	REG(REW_PCP_DEI_QOS_MAP_CFG,		0x000010),</div><div class='add'>+	REG_RESERVED(REW_PTP_CFG),</div><div class='add'>+	REG_RESERVED(REW_PTP_DLY1_CFG),</div><div class='add'>+	REG_RESERVED(REW_RED_TAG_CFG),</div><div class='add'>+	REG(REW_DSCP_REMAP_DP1_CFG,		0x000610),</div><div class='add'>+	REG(REW_DSCP_REMAP_CFG,			0x000710),</div><div class='add'>+	REG_RESERVED(REW_STAT_CFG),</div><div class='add'>+	REG_RESERVED(REW_REW_STICKY),</div><div class='add'>+	REG_RESERVED(REW_PPT),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_sys_regmap[] = {</div><div class='add'>+	REG(SYS_COUNT_RX_OCTETS,		0x000000),</div><div class='add'>+	REG(SYS_COUNT_RX_UNICAST,		0x000004),</div><div class='add'>+	REG(SYS_COUNT_RX_MULTICAST,		0x000008),</div><div class='add'>+	REG(SYS_COUNT_RX_BROADCAST,		0x00000c),</div><div class='add'>+	REG(SYS_COUNT_RX_SHORTS,		0x000010),</div><div class='add'>+	REG(SYS_COUNT_RX_FRAGMENTS,		0x000014),</div><div class='add'>+	REG(SYS_COUNT_RX_JABBERS,		0x000018),</div><div class='add'>+	REG(SYS_COUNT_RX_CRC_ALIGN_ERRS,	0x00001c),</div><div class='add'>+	REG(SYS_COUNT_RX_SYM_ERRS,		0x000020),</div><div class='add'>+	REG(SYS_COUNT_RX_64,			0x000024),</div><div class='add'>+	REG(SYS_COUNT_RX_65_127,		0x000028),</div><div class='add'>+	REG(SYS_COUNT_RX_128_255,		0x00002c),</div><div class='add'>+	REG(SYS_COUNT_RX_256_511,		0x000030),</div><div class='add'>+	REG(SYS_COUNT_RX_512_1023,		0x000034),</div><div class='add'>+	REG(SYS_COUNT_RX_1024_1526,		0x000038),</div><div class='add'>+	REG(SYS_COUNT_RX_1527_MAX,		0x00003c),</div><div class='add'>+	REG(SYS_COUNT_RX_PAUSE,			0x000040),</div><div class='add'>+	REG(SYS_COUNT_RX_CONTROL,		0x000044),</div><div class='add'>+	REG(SYS_COUNT_RX_LONGS,			0x000048),</div><div class='add'>+	REG(SYS_COUNT_RX_CLASSIFIED_DROPS,	0x00004c),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_0,		0x000050),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_1,		0x000054),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_2,		0x000058),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_3,		0x00005c),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_4,		0x000060),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_5,		0x000064),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_6,		0x000068),</div><div class='add'>+	REG(SYS_COUNT_RX_RED_PRIO_7,		0x00006c),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_0,		0x000070),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_1,		0x000074),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_2,		0x000078),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_3,		0x00007c),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_4,		0x000080),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_5,		0x000084),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_6,		0x000088),</div><div class='add'>+	REG(SYS_COUNT_RX_YELLOW_PRIO_7,		0x00008c),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_0,		0x000090),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_1,		0x000094),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_2,		0x000098),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_3,		0x00009c),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_4,		0x0000a0),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_5,		0x0000a4),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_6,		0x0000a8),</div><div class='add'>+	REG(SYS_COUNT_RX_GREEN_PRIO_7,		0x0000ac),</div><div class='add'>+	REG(SYS_COUNT_TX_OCTETS,		0x000100),</div><div class='add'>+	REG(SYS_COUNT_TX_UNICAST,		0x000104),</div><div class='add'>+	REG(SYS_COUNT_TX_MULTICAST,		0x000108),</div><div class='add'>+	REG(SYS_COUNT_TX_BROADCAST,		0x00010c),</div><div class='add'>+	REG(SYS_COUNT_TX_COLLISION,		0x000110),</div><div class='add'>+	REG(SYS_COUNT_TX_DROPS,			0x000114),</div><div class='add'>+	REG(SYS_COUNT_TX_PAUSE,			0x000118),</div><div class='add'>+	REG(SYS_COUNT_TX_64,			0x00011c),</div><div class='add'>+	REG(SYS_COUNT_TX_65_127,		0x000120),</div><div class='add'>+	REG(SYS_COUNT_TX_128_255,		0x000124),</div><div class='add'>+	REG(SYS_COUNT_TX_256_511,		0x000128),</div><div class='add'>+	REG(SYS_COUNT_TX_512_1023,		0x00012c),</div><div class='add'>+	REG(SYS_COUNT_TX_1024_1526,		0x000130),</div><div class='add'>+	REG(SYS_COUNT_TX_1527_MAX,		0x000134),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_0,		0x000138),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_1,		0x00013c),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_2,		0x000140),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_3,		0x000144),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_4,		0x000148),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_5,		0x00014c),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_6,		0x000150),</div><div class='add'>+	REG(SYS_COUNT_TX_YELLOW_PRIO_7,		0x000154),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_0,		0x000158),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_1,		0x00015c),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_2,		0x000160),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_3,		0x000164),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_4,		0x000168),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_5,		0x00016c),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_6,		0x000170),</div><div class='add'>+	REG(SYS_COUNT_TX_GREEN_PRIO_7,		0x000174),</div><div class='add'>+	REG(SYS_COUNT_TX_AGED,			0x000178),</div><div class='add'>+	REG(SYS_COUNT_DROP_LOCAL,		0x000200),</div><div class='add'>+	REG(SYS_COUNT_DROP_TAIL,		0x000204),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_0,	0x000208),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_1,	0x00020c),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_2,	0x000210),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_3,	0x000214),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_4,	0x000218),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_5,	0x00021c),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_6,	0x000220),</div><div class='add'>+	REG(SYS_COUNT_DROP_YELLOW_PRIO_7,	0x000224),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_0,	0x000228),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_1,	0x00022c),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_2,	0x000230),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_3,	0x000234),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_4,	0x000238),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_5,	0x00023c),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_6,	0x000240),</div><div class='add'>+	REG(SYS_COUNT_DROP_GREEN_PRIO_7,	0x000244),</div><div class='add'>+	REG(SYS_RESET_CFG,			0x000318),</div><div class='add'>+	REG_RESERVED(SYS_SR_ETYPE_CFG),</div><div class='add'>+	REG(SYS_VLAN_ETYPE_CFG,			0x000320),</div><div class='add'>+	REG(SYS_PORT_MODE,			0x000324),</div><div class='add'>+	REG(SYS_FRONT_PORT_MODE,		0x000354),</div><div class='add'>+	REG(SYS_FRM_AGING,			0x00037c),</div><div class='add'>+	REG(SYS_STAT_CFG,			0x000380),</div><div class='add'>+	REG_RESERVED(SYS_SW_STATUS),</div><div class='add'>+	REG_RESERVED(SYS_MISC_CFG),</div><div class='add'>+	REG_RESERVED(SYS_REW_MAC_HIGH_CFG),</div><div class='add'>+	REG_RESERVED(SYS_REW_MAC_LOW_CFG),</div><div class='add'>+	REG_RESERVED(SYS_TIMESTAMP_OFFSET),</div><div class='add'>+	REG(SYS_PAUSE_CFG,			0x00044c),</div><div class='add'>+	REG(SYS_PAUSE_TOT_CFG,			0x000478),</div><div class='add'>+	REG(SYS_ATOP,				0x00047c),</div><div class='add'>+	REG(SYS_ATOP_TOT_CFG,			0x0004a8),</div><div class='add'>+	REG(SYS_MAC_FC_CFG,			0x0004ac),</div><div class='add'>+	REG(SYS_MMGT,				0x0004d4),</div><div class='add'>+	REG_RESERVED(SYS_MMGT_FAST),</div><div class='add'>+	REG_RESERVED(SYS_EVENTS_DIF),</div><div class='add'>+	REG_RESERVED(SYS_EVENTS_CORE),</div><div class='add'>+	REG_RESERVED(SYS_PTP_STATUS),</div><div class='add'>+	REG_RESERVED(SYS_PTP_TXSTAMP),</div><div class='add'>+	REG_RESERVED(SYS_PTP_NXT),</div><div class='add'>+	REG_RESERVED(SYS_PTP_CFG),</div><div class='add'>+	REG_RESERVED(SYS_RAM_INIT),</div><div class='add'>+	REG_RESERVED(SYS_CM_ADDR),</div><div class='add'>+	REG_RESERVED(SYS_CM_DATA_WR),</div><div class='add'>+	REG_RESERVED(SYS_CM_DATA_RD),</div><div class='add'>+	REG_RESERVED(SYS_CM_OP),</div><div class='add'>+	REG_RESERVED(SYS_CM_DATA),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_gcb_regmap[] = {</div><div class='add'>+	REG(GCB_SOFT_RST,			0x000008),</div><div class='add'>+	REG(GCB_MIIM_MII_STATUS,		0x0000ac),</div><div class='add'>+	REG(GCB_MIIM_MII_CMD,			0x0000b4),</div><div class='add'>+	REG(GCB_MIIM_MII_DATA,			0x0000b8),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 vsc9953_dev_gmii_regmap[] = {</div><div class='add'>+	REG(DEV_CLOCK_CFG,			0x0),</div><div class='add'>+	REG(DEV_PORT_MISC,			0x4),</div><div class='add'>+	REG_RESERVED(DEV_EVENTS),</div><div class='add'>+	REG(DEV_EEE_CFG,			0xc),</div><div class='add'>+	REG_RESERVED(DEV_RX_PATH_DELAY),</div><div class='add'>+	REG_RESERVED(DEV_TX_PATH_DELAY),</div><div class='add'>+	REG_RESERVED(DEV_PTP_PREDICT_CFG),</div><div class='add'>+	REG(DEV_MAC_ENA_CFG,			0x10),</div><div class='add'>+	REG(DEV_MAC_MODE_CFG,			0x14),</div><div class='add'>+	REG(DEV_MAC_MAXLEN_CFG,			0x18),</div><div class='add'>+	REG(DEV_MAC_TAGS_CFG,			0x1c),</div><div class='add'>+	REG(DEV_MAC_ADV_CHK_CFG,		0x20),</div><div class='add'>+	REG(DEV_MAC_IFG_CFG,			0x24),</div><div class='add'>+	REG(DEV_MAC_HDX_CFG,			0x28),</div><div class='add'>+	REG_RESERVED(DEV_MAC_DBG_CFG),</div><div class='add'>+	REG(DEV_MAC_FC_MAC_LOW_CFG,		0x30),</div><div class='add'>+	REG(DEV_MAC_FC_MAC_HIGH_CFG,		0x34),</div><div class='add'>+	REG(DEV_MAC_STICKY,			0x38),</div><div class='add'>+	REG_RESERVED(PCS1G_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_MODE_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_SD_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_NP_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_LB_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_DBG_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_CDET_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_ANEG_NP_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_LINK_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_LINK_DOWN_CNT),</div><div class='add'>+	REG_RESERVED(PCS1G_STICKY),</div><div class='add'>+	REG_RESERVED(PCS1G_DEBUG_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_LPI_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_LPI_WAKE_ERROR_CNT),</div><div class='add'>+	REG_RESERVED(PCS1G_LPI_STATUS),</div><div class='add'>+	REG_RESERVED(PCS1G_TSTPAT_MODE_CFG),</div><div class='add'>+	REG_RESERVED(PCS1G_TSTPAT_STATUS),</div><div class='add'>+	REG_RESERVED(DEV_PCS_FX100_CFG),</div><div class='add'>+	REG_RESERVED(DEV_PCS_FX100_STATUS),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 *vsc9953_regmap[TARGET_MAX] = {</div><div class='add'>+	[ANA]		= vsc9953_ana_regmap,</div><div class='add'>+	[QS]		= vsc9953_qs_regmap,</div><div class='add'>+	[QSYS]		= vsc9953_qsys_regmap,</div><div class='add'>+	[REW]		= vsc9953_rew_regmap,</div><div class='add'>+	[SYS]		= vsc9953_sys_regmap,</div><div class='add'>+	[S0]		= vsc9953_vcap_regmap,</div><div class='add'>+	[S1]		= vsc9953_vcap_regmap,</div><div class='add'>+	[S2]		= vsc9953_vcap_regmap,</div><div class='add'>+	[GCB]		= vsc9953_gcb_regmap,</div><div class='add'>+	[DEV_GMII]	= vsc9953_dev_gmii_regmap,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Addresses are relative to the device's base address */</div><div class='add'>+static const struct resource vsc9953_resources[] = {</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0010000, 0x0010000, "sys"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0030000, 0x0010000, "rew"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0040000, 0x0000400, "s0"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0050000, 0x0000400, "s1"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0060000, 0x0000400, "s2"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0070000, 0x0000200, "devcpu_gcb"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0080000, 0x0000100, "qs"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0090000, 0x00000cc, "ptp"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0100000, 0x0010000, "port0"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0110000, 0x0010000, "port1"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0120000, 0x0010000, "port2"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0130000, 0x0010000, "port3"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0140000, 0x0010000, "port4"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0150000, 0x0010000, "port5"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0160000, 0x0010000, "port6"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0170000, 0x0010000, "port7"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0180000, 0x0010000, "port8"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0190000, 0x0010000, "port9"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0200000, 0x0020000, "qsys"),</div><div class='add'>+	DEFINE_RES_MEM_NAMED(0x0280000, 0x0010000, "ana"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const vsc9953_resource_names[TARGET_MAX] = {</div><div class='add'>+	[SYS] = "sys",</div><div class='add'>+	[REW] = "rew",</div><div class='add'>+	[S0] = "s0",</div><div class='add'>+	[S1] = "s1",</div><div class='add'>+	[S2] = "s2",</div><div class='add'>+	[GCB] = "devcpu_gcb",</div><div class='add'>+	[QS] = "qs",</div><div class='add'>+	[PTP] = "ptp",</div><div class='add'>+	[QSYS] = "qsys",</div><div class='add'>+	[ANA] = "ana",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct reg_field vsc9953_regfields[REGFIELD_MAX] = {</div><div class='add'>+	[ANA_ADVLEARN_VLAN_CHK] = REG_FIELD(ANA_ADVLEARN, 10, 10),</div><div class='add'>+	[ANA_ADVLEARN_LEARN_MIRROR] = REG_FIELD(ANA_ADVLEARN, 0, 9),</div><div class='add'>+	[ANA_ANEVENTS_AUTOAGE] = REG_FIELD(ANA_ANEVENTS, 24, 24),</div><div class='add'>+	[ANA_ANEVENTS_STORM_DROP] = REG_FIELD(ANA_ANEVENTS, 22, 22),</div><div class='add'>+	[ANA_ANEVENTS_LEARN_DROP] = REG_FIELD(ANA_ANEVENTS, 21, 21),</div><div class='add'>+	[ANA_ANEVENTS_AGED_ENTRY] = REG_FIELD(ANA_ANEVENTS, 20, 20),</div><div class='add'>+	[ANA_ANEVENTS_CPU_LEARN_FAILED] = REG_FIELD(ANA_ANEVENTS, 19, 19),</div><div class='add'>+	[ANA_ANEVENTS_AUTO_LEARN_FAILED] = REG_FIELD(ANA_ANEVENTS, 18, 18),</div><div class='add'>+	[ANA_ANEVENTS_LEARN_REMOVE] = REG_FIELD(ANA_ANEVENTS, 17, 17),</div><div class='add'>+	[ANA_ANEVENTS_AUTO_LEARNED] = REG_FIELD(ANA_ANEVENTS, 16, 16),</div><div class='add'>+	[ANA_ANEVENTS_AUTO_MOVED] = REG_FIELD(ANA_ANEVENTS, 15, 15),</div><div class='add'>+	[ANA_ANEVENTS_CLASSIFIED_DROP] = REG_FIELD(ANA_ANEVENTS, 13, 13),</div><div class='add'>+	[ANA_ANEVENTS_CLASSIFIED_COPY] = REG_FIELD(ANA_ANEVENTS, 12, 12),</div><div class='add'>+	[ANA_ANEVENTS_VLAN_DISCARD] = REG_FIELD(ANA_ANEVENTS, 11, 11),</div><div class='add'>+	[ANA_ANEVENTS_FWD_DISCARD] = REG_FIELD(ANA_ANEVENTS, 10, 10),</div><div class='add'>+	[ANA_ANEVENTS_MULTICAST_FLOOD] = REG_FIELD(ANA_ANEVENTS, 9, 9),</div><div class='add'>+	[ANA_ANEVENTS_UNICAST_FLOOD] = REG_FIELD(ANA_ANEVENTS, 8, 8),</div><div class='add'>+	[ANA_ANEVENTS_DEST_KNOWN] = REG_FIELD(ANA_ANEVENTS, 7, 7),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET3_MATCH] = REG_FIELD(ANA_ANEVENTS, 6, 6),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET2_MATCH] = REG_FIELD(ANA_ANEVENTS, 5, 5),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET1_MATCH] = REG_FIELD(ANA_ANEVENTS, 4, 4),</div><div class='add'>+	[ANA_ANEVENTS_BUCKET0_MATCH] = REG_FIELD(ANA_ANEVENTS, 3, 3),</div><div class='add'>+	[ANA_ANEVENTS_CPU_OPERATION] = REG_FIELD(ANA_ANEVENTS, 2, 2),</div><div class='add'>+	[ANA_ANEVENTS_DMAC_LOOKUP] = REG_FIELD(ANA_ANEVENTS, 1, 1),</div><div class='add'>+	[ANA_ANEVENTS_SMAC_LOOKUP] = REG_FIELD(ANA_ANEVENTS, 0, 0),</div><div class='add'>+	[ANA_TABLES_MACACCESS_B_DOM] = REG_FIELD(ANA_TABLES_MACACCESS, 16, 16),</div><div class='add'>+	[ANA_TABLES_MACTINDX_BUCKET] = REG_FIELD(ANA_TABLES_MACTINDX, 11, 12),</div><div class='add'>+	[ANA_TABLES_MACTINDX_M_INDEX] = REG_FIELD(ANA_TABLES_MACTINDX, 0, 10),</div><div class='add'>+	[SYS_RESET_CFG_CORE_ENA] = REG_FIELD(SYS_RESET_CFG, 7, 7),</div><div class='add'>+	[SYS_RESET_CFG_MEM_ENA] = REG_FIELD(SYS_RESET_CFG, 6, 6),</div><div class='add'>+	[SYS_RESET_CFG_MEM_INIT] = REG_FIELD(SYS_RESET_CFG, 5, 5),</div><div class='add'>+	[GCB_SOFT_RST_SWC_RST] = REG_FIELD(GCB_SOFT_RST, 0, 0),</div><div class='add'>+	[GCB_MIIM_MII_STATUS_PENDING] = REG_FIELD(GCB_MIIM_MII_STATUS, 2, 2),</div><div class='add'>+	[GCB_MIIM_MII_STATUS_BUSY] = REG_FIELD(GCB_MIIM_MII_STATUS, 3, 3),</div><div class='add'>+	/* Replicated per number of ports (11), register size 4 per port */</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_PORT_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 13, 13, 11, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_YEL_RSRVD] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 10, 10, 11, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 9, 9, 11, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_TX_PFC_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 1, 8, 11, 4),</div><div class='add'>+	[QSYS_SWITCH_PORT_MODE_TX_PFC_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 0, 0, 11, 4),</div><div class='add'>+	[SYS_PORT_MODE_INCL_INJ_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 4, 5, 11, 4),</div><div class='add'>+	[SYS_PORT_MODE_INCL_XTR_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 2, 3, 11, 4),</div><div class='add'>+	[SYS_PORT_MODE_INCL_HDR_ERR] = REG_FIELD_ID(SYS_PORT_MODE, 0, 0, 11, 4),</div><div class='add'>+	[SYS_PAUSE_CFG_PAUSE_START] = REG_FIELD_ID(SYS_PAUSE_CFG, 11, 20, 11, 4),</div><div class='add'>+	[SYS_PAUSE_CFG_PAUSE_STOP] = REG_FIELD_ID(SYS_PAUSE_CFG, 1, 10, 11, 4),</div><div class='add'>+	[SYS_PAUSE_CFG_PAUSE_ENA] = REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 11, 4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9953_vcap_es0_keys[] = {</div><div class='add'>+	[VCAP_ES0_EGR_PORT]			= {  0,  4},</div><div class='add'>+	[VCAP_ES0_IGR_PORT]			= {  4,  4},</div><div class='add'>+	[VCAP_ES0_RSV]				= {  8,  2},</div><div class='add'>+	[VCAP_ES0_L2_MC]			= { 10,  1},</div><div class='add'>+	[VCAP_ES0_L2_BC]			= { 11,  1},</div><div class='add'>+	[VCAP_ES0_VID]				= { 12, 12},</div><div class='add'>+	[VCAP_ES0_DP]				= { 24,  1},</div><div class='add'>+	[VCAP_ES0_PCP]				= { 25,  3},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9953_vcap_es0_actions[] = {</div><div class='add'>+	[VCAP_ES0_ACT_PUSH_OUTER_TAG]		= {  0,  2},</div><div class='add'>+	[VCAP_ES0_ACT_PUSH_INNER_TAG]		= {  2,  1},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_TPID_SEL]		= {  3,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_VID_SEL]		= {  5,  1},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_PCP_SEL]		= {  6,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_A_DEI_SEL]		= {  8,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_TPID_SEL]		= { 10,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_VID_SEL]		= { 12,  1},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_PCP_SEL]		= { 13,  2},</div><div class='add'>+	[VCAP_ES0_ACT_TAG_B_DEI_SEL]		= { 15,  2},</div><div class='add'>+	[VCAP_ES0_ACT_VID_A_VAL]		= { 17, 12},</div><div class='add'>+	[VCAP_ES0_ACT_PCP_A_VAL]		= { 29,  3},</div><div class='add'>+	[VCAP_ES0_ACT_DEI_A_VAL]		= { 32,  1},</div><div class='add'>+	[VCAP_ES0_ACT_VID_B_VAL]		= { 33, 12},</div><div class='add'>+	[VCAP_ES0_ACT_PCP_B_VAL]		= { 45,  3},</div><div class='add'>+	[VCAP_ES0_ACT_DEI_B_VAL]		= { 48,  1},</div><div class='add'>+	[VCAP_ES0_ACT_RSV]			= { 49, 24},</div><div class='add'>+	[VCAP_ES0_ACT_HIT_STICKY]		= { 73,  1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9953_vcap_is1_keys[] = {</div><div class='add'>+	[VCAP_IS1_HK_TYPE]			= {  0,   1},</div><div class='add'>+	[VCAP_IS1_HK_LOOKUP]			= {  1,   2},</div><div class='add'>+	[VCAP_IS1_HK_IGR_PORT_MASK]		= {  3,  11},</div><div class='add'>+	[VCAP_IS1_HK_RSV]			= { 14,  10},</div><div class='add'>+	/* VCAP_IS1_HK_OAM_Y1731 not supported */</div><div class='add'>+	[VCAP_IS1_HK_L2_MC]			= { 24,   1},</div><div class='add'>+	[VCAP_IS1_HK_L2_BC]			= { 25,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP_MC]			= { 26,   1},</div><div class='add'>+	[VCAP_IS1_HK_VLAN_TAGGED]		= { 27,   1},</div><div class='add'>+	[VCAP_IS1_HK_VLAN_DBL_TAGGED]		= { 28,   1},</div><div class='add'>+	[VCAP_IS1_HK_TPID]			= { 29,   1},</div><div class='add'>+	[VCAP_IS1_HK_VID]			= { 30,  12},</div><div class='add'>+	[VCAP_IS1_HK_DEI]			= { 42,   1},</div><div class='add'>+	[VCAP_IS1_HK_PCP]			= { 43,   3},</div><div class='add'>+	/* Specific Fields for IS1 Half Key S1_NORMAL */</div><div class='add'>+	[VCAP_IS1_HK_L2_SMAC]			= { 46,  48},</div><div class='add'>+	[VCAP_IS1_HK_ETYPE_LEN]			= { 94,   1},</div><div class='add'>+	[VCAP_IS1_HK_ETYPE]			= { 95,  16},</div><div class='add'>+	[VCAP_IS1_HK_IP_SNAP]			= {111,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4]			= {112,   1},</div><div class='add'>+	/* Layer-3 Information */</div><div class='add'>+	[VCAP_IS1_HK_L3_FRAGMENT]		= {113,   1},</div><div class='add'>+	[VCAP_IS1_HK_L3_FRAG_OFS_GT0]		= {114,   1},</div><div class='add'>+	[VCAP_IS1_HK_L3_OPTIONS]		= {115,   1},</div><div class='add'>+	[VCAP_IS1_HK_L3_DSCP]			= {116,   6},</div><div class='add'>+	[VCAP_IS1_HK_L3_IP4_SIP]		= {122,  32},</div><div class='add'>+	/* Layer-4 Information */</div><div class='add'>+	[VCAP_IS1_HK_TCP_UDP]			= {154,   1},</div><div class='add'>+	[VCAP_IS1_HK_TCP]			= {155,   1},</div><div class='add'>+	[VCAP_IS1_HK_L4_SPORT]			= {156,  16},</div><div class='add'>+	[VCAP_IS1_HK_L4_RNG]			= {172,   8},</div><div class='add'>+	/* Specific Fields for IS1 Half Key S1_5TUPLE_IP4 */</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_TPID]            = { 46,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_VID]		= { 47,  12},</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_DEI]		= { 59,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_INNER_PCP]		= { 60,   3},</div><div class='add'>+	[VCAP_IS1_HK_IP4_IP4]			= { 63,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_FRAGMENT]		= { 64,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_FRAG_OFS_GT0]	= { 65,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_OPTIONS]		= { 66,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_DSCP]		= { 67,   6},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_IP4_DIP]		= { 73,  32},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_IP4_SIP]		= {105,  32},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L3_PROTO]		= {137,   8},</div><div class='add'>+	[VCAP_IS1_HK_IP4_TCP_UDP]		= {145,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_TCP]			= {146,   1},</div><div class='add'>+	[VCAP_IS1_HK_IP4_L4_RNG]		= {147,   8},</div><div class='add'>+	[VCAP_IS1_HK_IP4_IP_PAYLOAD_S1_5TUPLE]	= {155,  32},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vcap_field vsc9953_vcap_is1_actions[] = {</div><div class='add'>+	[VCAP_IS1_ACT_DSCP_ENA]			= {  0,  1},</div><div class='add'>+	[VCAP_IS1_ACT_DSCP_VAL]			= {  1,  6},</div><div class='add'>+	[VCAP_IS1_ACT_QOS_ENA]			= {  7,  1},</div><div class='add'>+	[VCAP_IS1_ACT_QOS_VAL]			= {  8,  3},</div><div class='add'>+	[VCAP_IS1_ACT_DP_ENA]			= { 11,  1},</div><div class='add'>+	[VCAP_IS1_ACT_DP_VAL]			= { 12,  1},</div><div class='add'>+	[VCAP_IS1_ACT_PAG_OVERRIDE_MASK]	= { 13,  8},</div><div class='add'>+	[VCAP_IS1_ACT_PAG_VAL]			= { 21,  8},</div><div class='add'>+	[VCAP_IS1_ACT_RSV]			= { 29, 11},</div><div class='add'>+	[VCAP_IS1_ACT_VID_REPLACE_ENA]		= { 40,  1},</div><div class='add'>+	[VCAP_IS1_ACT_VID_ADD_VAL]		= { 41, 12},</div><div class='add'>+	[VCAP_IS1_ACT_FID_SEL]			= { 53,  2},</div><div class='add'>+	[VCAP_IS1_ACT_FID_VAL]			= { 55, 13},</div><div class='add'>+	[VCAP_IS1_ACT_PCP_DEI_ENA]		= { 68,  1},</div><div class='add'>+	[VCAP_IS1_ACT_PCP_VAL]			= { 69,  3},</div><div class='add'>+	[VCAP_IS1_ACT_DEI_VAL]			= { 72,  1},</div><div class='add'>+	[VCAP_IS1_ACT_VLAN_POP_CNT_ENA]		= { 73,  1},</div><div class='add'>+	[VCAP_IS1_ACT_VLAN_POP_CNT]		= { 74,  2},</div><div class='add'>+	[VCAP_IS1_ACT_CUSTOM_ACE_TYPE_ENA]	= { 76,  4},</div><div class='add'>+	[VCAP_IS1_ACT_HIT_STICKY]		= { 80,  1},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcap_field vsc9953_vcap_is2_keys[] = {</div><div class='add'>+	/* Common: 41 bits */</div><div class='add'>+	[VCAP_IS2_TYPE]				= {  0,   4},</div><div class='add'>+	[VCAP_IS2_HK_FIRST]			= {  4,   1},</div><div class='add'>+	[VCAP_IS2_HK_PAG]			= {  5,   8},</div><div class='add'>+	[VCAP_IS2_HK_IGR_PORT_MASK]		= { 13,  11},</div><div class='add'>+	[VCAP_IS2_HK_RSV2]			= { 24,   1},</div><div class='add'>+	[VCAP_IS2_HK_HOST_MATCH]		= { 25,   1},</div><div class='add'>+	[VCAP_IS2_HK_L2_MC]			= { 26,   1},</div><div class='add'>+	[VCAP_IS2_HK_L2_BC]			= { 27,   1},</div><div class='add'>+	[VCAP_IS2_HK_VLAN_TAGGED]		= { 28,   1},</div><div class='add'>+	[VCAP_IS2_HK_VID]			= { 29,  12},</div><div class='add'>+	[VCAP_IS2_HK_DEI]			= { 41,   1},</div><div class='add'>+	[VCAP_IS2_HK_PCP]			= { 42,   3},</div><div class='add'>+	/* MAC_ETYPE / MAC_LLC / MAC_SNAP / OAM common */</div><div class='add'>+	[VCAP_IS2_HK_L2_DMAC]			= { 45,  48},</div><div class='add'>+	[VCAP_IS2_HK_L2_SMAC]			= { 93,  48},</div><div class='add'>+	/* MAC_ETYPE (TYPE=000) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_ETYPE]		= {141,  16},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_L2_PAYLOAD0]	= {157,  16},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_L2_PAYLOAD1]	= {173,   8},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ETYPE_L2_PAYLOAD2]	= {181,   3},</div><div class='add'>+	/* MAC_LLC (TYPE=001) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_LLC_L2_LLC]		= {141,  40},</div><div class='add'>+	/* MAC_SNAP (TYPE=010) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_SNAP_L2_SNAP]		= {141,  40},</div><div class='add'>+	/* MAC_ARP (TYPE=011) */</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_SMAC]		= { 45,  48},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_ADDR_SPACE_OK]	= { 93,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_PROTO_SPACE_OK]	= { 94,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_LEN_OK]		= { 95,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_TARGET_MATCH]	= { 96,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_SENDER_MATCH]	= { 97,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_OPCODE_UNKNOWN]	= { 98,   1},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_OPCODE]		= { 99,   2},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_L3_IP4_DIP]	= {101,  32},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_L3_IP4_SIP]	= {133,  32},</div><div class='add'>+	[VCAP_IS2_HK_MAC_ARP_DIP_EQ_SIP]	= {165,   1},</div><div class='add'>+	/* IP4_TCP_UDP / IP4_OTHER common */</div><div class='add'>+	[VCAP_IS2_HK_IP4]			= { 45,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_FRAGMENT]		= { 46,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_FRAG_OFS_GT0]		= { 47,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_OPTIONS]		= { 48,   1},</div><div class='add'>+	[VCAP_IS2_HK_IP4_L3_TTL_GT0]		= { 49,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_TOS]			= { 50,   8},</div><div class='add'>+	[VCAP_IS2_HK_L3_IP4_DIP]		= { 58,  32},</div><div class='add'>+	[VCAP_IS2_HK_L3_IP4_SIP]		= { 90,  32},</div><div class='add'>+	[VCAP_IS2_HK_DIP_EQ_SIP]		= {122,   1},</div><div class='add'>+	/* IP4_TCP_UDP (TYPE=100) */</div><div class='add'>+	[VCAP_IS2_HK_TCP]			= {123,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_DPORT]			= {124,  16},</div><div class='add'>+	[VCAP_IS2_HK_L4_SPORT]			= {140,  16},</div><div class='add'>+	[VCAP_IS2_HK_L4_RNG]			= {156,   8},</div><div class='add'>+	[VCAP_IS2_HK_L4_SPORT_EQ_DPORT]		= {164,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_SEQUENCE_EQ0]		= {165,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_FIN]			= {166,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_SYN]			= {167,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_RST]			= {168,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_PSH]			= {169,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_ACK]			= {170,   1},</div><div class='add'>+	[VCAP_IS2_HK_L4_URG]			= {171,   1},</div><div class='add'>+	/* IP4_OTHER (TYPE=101) */</div><div class='add'>+	[VCAP_IS2_HK_IP4_L3_PROTO]		= {123,   8},</div><div class='add'>+	[VCAP_IS2_HK_L3_PAYLOAD]		= {131,  56},</div><div class='add'>+	/* IP6_STD (TYPE=110) */</div><div class='add'>+	[VCAP_IS2_HK_IP6_L3_TTL_GT0]		= { 45,   1},</div><div class='add'>+	[VCAP_IS2_HK_L3_IP6_SIP]		= { 46, 128},</div><div class='add'>+	[VCAP_IS2_HK_IP6_L3_PROTO]		= {174,   8},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcap_field vsc9953_vcap_is2_actions[] = {</div><div class='add'>+	[VCAP_IS2_ACT_HIT_ME_ONCE]		= {  0,  1},</div><div class='add'>+	[VCAP_IS2_ACT_CPU_COPY_ENA]		= {  1,  1},</div><div class='add'>+	[VCAP_IS2_ACT_CPU_QU_NUM]		= {  2,  3},</div><div class='add'>+	[VCAP_IS2_ACT_MASK_MODE]		= {  5,  2},</div><div class='add'>+	[VCAP_IS2_ACT_MIRROR_ENA]		= {  7,  1},</div><div class='add'>+	[VCAP_IS2_ACT_LRN_DIS]			= {  8,  1},</div><div class='add'>+	[VCAP_IS2_ACT_POLICE_ENA]		= {  9,  1},</div><div class='add'>+	[VCAP_IS2_ACT_POLICE_IDX]		= { 10,  8},</div><div class='add'>+	[VCAP_IS2_ACT_POLICE_VCAP_ONLY]		= { 21,  1},</div><div class='add'>+	[VCAP_IS2_ACT_PORT_MASK]		= { 22, 10},</div><div class='add'>+	[VCAP_IS2_ACT_ACL_ID]			= { 44,  6},</div><div class='add'>+	[VCAP_IS2_ACT_HIT_CNT]			= { 50, 32},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct vcap_props vsc9953_vcap_props[] = {</div><div class='add'>+	[VCAP_ES0] = {</div><div class='add'>+		.action_type_width = 0,</div><div class='add'>+		.action_table = {</div><div class='add'>+			[ES0_ACTION_TYPE_NORMAL] = {</div><div class='add'>+				.width = 73, /* HIT_STICKY not included */</div><div class='add'>+				.count = 1,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.target = S0,</div><div class='add'>+		.keys = vsc9953_vcap_es0_keys,</div><div class='add'>+		.actions = vsc9953_vcap_es0_actions,</div><div class='add'>+	},</div><div class='add'>+	[VCAP_IS1] = {</div><div class='add'>+		.action_type_width = 0,</div><div class='add'>+		.action_table = {</div><div class='add'>+			[IS1_ACTION_TYPE_NORMAL] = {</div><div class='add'>+				.width = 80, /* HIT_STICKY not included */</div><div class='add'>+				.count = 4,</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.target = S1,</div><div class='add'>+		.keys = vsc9953_vcap_is1_keys,</div><div class='add'>+		.actions = vsc9953_vcap_is1_actions,</div><div class='add'>+	},</div><div class='add'>+	[VCAP_IS2] = {</div><div class='add'>+		.action_type_width = 1,</div><div class='add'>+		.action_table = {</div><div class='add'>+			[IS2_ACTION_TYPE_NORMAL] = {</div><div class='add'>+				.width = 50, /* HIT_CNT not included */</div><div class='add'>+				.count = 2</div><div class='add'>+			},</div><div class='add'>+			[IS2_ACTION_TYPE_SMAC_SIP] = {</div><div class='add'>+				.width = 6,</div><div class='add'>+				.count = 4</div><div class='add'>+			},</div><div class='add'>+		},</div><div class='add'>+		.target = S2,</div><div class='add'>+		.keys = vsc9953_vcap_is2_keys,</div><div class='add'>+		.actions = vsc9953_vcap_is2_actions,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define VSC9953_INIT_TIMEOUT			50000</div><div class='add'>+#define VSC9953_GCB_RST_SLEEP			100</div><div class='add'>+#define VSC9953_SYS_RAMINIT_SLEEP		80</div><div class='add'>+</div><div class='add'>+static int vsc9953_gcb_soft_rst_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	ocelot_field_read(ocelot, GCB_SOFT_RST_SWC_RST, &amp;val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc9953_sys_ram_init_status(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	int val;</div><div class='add'>+</div><div class='add'>+	ocelot_field_read(ocelot, SYS_RESET_CFG_MEM_INIT, &amp;val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/* CORE_ENA is in SYS:SYSTEM:RESET_CFG</div><div class='add'>+ * MEM_INIT is in SYS:SYSTEM:RESET_CFG</div><div class='add'>+ * MEM_ENA is in SYS:SYSTEM:RESET_CFG</div><div class='add'>+ */</div><div class='add'>+static int vsc9953_reset(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	int val, err;</div><div class='add'>+</div><div class='add'>+	/* soft-reset the switch core */</div><div class='add'>+	ocelot_field_write(ocelot, GCB_SOFT_RST_SWC_RST, 1);</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(vsc9953_gcb_soft_rst_status, ocelot, val, !val,</div><div class='add'>+				 VSC9953_GCB_RST_SLEEP, VSC9953_INIT_TIMEOUT);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ocelot-&gt;dev, "timeout: switch core reset\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* initialize switch mem ~40us */</div><div class='add'>+	ocelot_field_write(ocelot, SYS_RESET_CFG_MEM_ENA, 1);</div><div class='add'>+	ocelot_field_write(ocelot, SYS_RESET_CFG_MEM_INIT, 1);</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(vsc9953_sys_ram_init_status, ocelot, val, !val,</div><div class='add'>+				 VSC9953_SYS_RAMINIT_SLEEP,</div><div class='add'>+				 VSC9953_INIT_TIMEOUT);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ocelot-&gt;dev, "timeout: switch sram init\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* enable switch core */</div><div class='add'>+	ocelot_field_write(ocelot, SYS_RESET_CFG_CORE_ENA, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Watermark encode</div><div class='add'>+ * Bit 9:   Unit; 0:1, 1:16</div><div class='add'>+ * Bit 8-0: Value to be multiplied with unit</div><div class='add'>+ */</div><div class='add'>+static u16 vsc9953_wm_enc(u16 value)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(value &gt;= 16 * BIT(9));</div><div class='add'>+</div><div class='add'>+	if (value &gt;= BIT(9))</div><div class='add'>+		return BIT(9) | (value / 16);</div><div class='add'>+</div><div class='add'>+	return value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 vsc9953_wm_dec(u16 wm)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(wm &amp; ~GENMASK(9, 0));</div><div class='add'>+</div><div class='add'>+	if (wm &amp; BIT(9))</div><div class='add'>+		return (wm &amp; GENMASK(8, 0)) * 16;</div><div class='add'>+</div><div class='add'>+	return wm;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9953_wm_stat(u32 val, u32 *inuse, u32 *maxuse)</div><div class='add'>+{</div><div class='add'>+	*inuse = (val &amp; GENMASK(25, 13)) &gt;&gt; 13;</div><div class='add'>+	*maxuse = val &amp; GENMASK(12, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ocelot_ops vsc9953_ops = {</div><div class='add'>+	.reset			= vsc9953_reset,</div><div class='add'>+	.wm_enc			= vsc9953_wm_enc,</div><div class='add'>+	.wm_dec			= vsc9953_wm_dec,</div><div class='add'>+	.wm_stat		= vsc9953_wm_stat,</div><div class='add'>+	.port_to_netdev		= felix_port_to_netdev,</div><div class='add'>+	.netdev_to_port		= felix_netdev_to_port,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	struct device *dev = ocelot-&gt;dev;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int port;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	felix-&gt;pcs = devm_kcalloc(dev, felix-&gt;info-&gt;num_ports,</div><div class='add'>+				  sizeof(struct phylink_pcs *),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!felix-&gt;pcs) {</div><div class='add'>+		dev_err(dev, "failed to allocate array for PCS PHYs\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = mscc_miim_setup(dev, &amp;bus, "VSC9953 internal MDIO bus",</div><div class='add'>+			     ocelot-&gt;targets[GCB],</div><div class='add'>+			     ocelot-&gt;map[GCB][GCB_MIIM_MII_STATUS &amp; REG_MASK],</div><div class='add'>+			     true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(dev, "failed to setup MDIO bus\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Needed in order to initialize the bus mutex lock */</div><div class='add'>+	rc = devm_of_mdiobus_register(dev, bus, NULL);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(dev, "failed to register MDIO bus\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	felix-&gt;imdio = bus;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; felix-&gt;info-&gt;num_ports; port++) {</div><div class='add'>+		struct ocelot_port *ocelot_port = ocelot-&gt;ports[port];</div><div class='add'>+		struct phylink_pcs *phylink_pcs;</div><div class='add'>+		int addr = port + 4;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(felix-&gt;ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ocelot_port-&gt;phy_mode == PHY_INTERFACE_MODE_INTERNAL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		phylink_pcs = lynx_pcs_create_mdiodev(felix-&gt;imdio, addr);</div><div class='add'>+		if (IS_ERR(phylink_pcs))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		felix-&gt;pcs[port] = phylink_pcs;</div><div class='add'>+</div><div class='add'>+		dev_info(dev, "Found PCS at internal MDIO address %d\n", addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc9953_mdio_bus_free(struct ocelot *ocelot)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = ocelot_to_felix(ocelot);</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ocelot-&gt;num_phys_ports; port++) {</div><div class='add'>+		struct phylink_pcs *phylink_pcs = felix-&gt;pcs[port];</div><div class='add'>+</div><div class='add'>+		if (phylink_pcs)</div><div class='add'>+			lynx_pcs_destroy(phylink_pcs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mdiobus_unregister and mdiobus_free handled by devres */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct felix_info seville_info_vsc9953 = {</div><div class='add'>+	.resources		= vsc9953_resources,</div><div class='add'>+	.num_resources		= ARRAY_SIZE(vsc9953_resources),</div><div class='add'>+	.resource_names		= vsc9953_resource_names,</div><div class='add'>+	.regfields		= vsc9953_regfields,</div><div class='add'>+	.map			= vsc9953_regmap,</div><div class='add'>+	.ops			= &amp;vsc9953_ops,</div><div class='add'>+	.vcap			= vsc9953_vcap_props,</div><div class='add'>+	.vcap_pol_base		= VSC9953_VCAP_POLICER_BASE,</div><div class='add'>+	.vcap_pol_max		= VSC9953_VCAP_POLICER_MAX,</div><div class='add'>+	.vcap_pol_base2		= VSC9953_VCAP_POLICER_BASE2,</div><div class='add'>+	.vcap_pol_max2		= VSC9953_VCAP_POLICER_MAX2,</div><div class='add'>+	.quirks			= FELIX_MAC_QUIRKS,</div><div class='add'>+	.num_mact_rows		= 2048,</div><div class='add'>+	.num_ports		= VSC9953_NUM_PORTS,</div><div class='add'>+	.mdio_bus_alloc		= vsc9953_mdio_bus_alloc,</div><div class='add'>+	.mdio_bus_free		= vsc9953_mdio_bus_free,</div><div class='add'>+	.port_modes		= vsc9953_port_modes,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int seville_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct resource *res;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res) {</div><div class='add'>+		dev_err(dev, "Invalid resource\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return felix_register_switch(dev, res-&gt;start, 1, false, false,</div><div class='add'>+				     DSA_TAG_PROTO_SEVILLE,</div><div class='add'>+				     &amp;seville_info_vsc9953);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void seville_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!felix)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(felix-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void seville_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct felix *felix = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!felix)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(felix-&gt;ds);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id seville_of_match[] = {</div><div class='add'>+	{ .compatible = "mscc,vsc9953-switch" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, seville_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver seville_vsc9953_driver = {</div><div class='add'>+	.probe		= seville_probe,</div><div class='add'>+	.remove		= seville_remove,</div><div class='add'>+	.shutdown	= seville_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name		= "mscc_seville",</div><div class='add'>+		.of_match_table	= seville_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(seville_vsc9953_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Seville Switch driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/qca/Kconfig b/drivers/net/dsa/qca/Kconfig<br/>new file mode 100644<br/>index 000000000000..de9da469908b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config NET_DSA_AR9331</div><div class='add'>+	tristate "Qualcomm Atheros AR9331 Ethernet switch support"</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+	select NET_DSA_TAG_AR9331</div><div class='add'>+	select REGMAP</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Qualcomm Atheros AR9331 built-in Ethernet</div><div class='add'>+	  switch.</div><div class='add'>+</div><div class='add'>+config NET_DSA_QCA8K</div><div class='add'>+	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"</div><div class='add'>+	select NET_DSA_TAG_QCA</div><div class='add'>+	select REGMAP</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the Qualcomm Atheros QCA8K Ethernet</div><div class='add'>+	  switch chips.</div><div class='add'>+</div><div class='add'>+config NET_DSA_QCA8K_LEDS_SUPPORT</div><div class='add'>+	bool "Qualcomm Atheros QCA8K Ethernet switch family LEDs support"</div><div class='add'>+	depends on NET_DSA_QCA8K</div><div class='add'>+	depends on LEDS_CLASS=y || LEDS_CLASS=NET_DSA_QCA8K</div><div class='add'>+	depends on LEDS_TRIGGERS</div><div class='add'>+	help</div><div class='add'>+	  This enabled support for LEDs present on the Qualcomm Atheros</div><div class='add'>+	  QCA8K Ethernet switch chips.</div><div class='head'>diff --git a/drivers/net/dsa/qca/Makefile b/drivers/net/dsa/qca/Makefile<br/>new file mode 100644<br/>index 000000000000..ce66b1984e5f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/Makefile</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-$(CONFIG_NET_DSA_AR9331)	+= ar9331.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o</div><div class='add'>+qca8k-y 			+= qca8k-common.o qca8k-8xxx.o</div><div class='add'>+ifdef CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT</div><div class='add'>+qca8k-y				+= qca8k-leds.o</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/dsa/qca/ar9331.c b/drivers/net/dsa/qca/ar9331.c<br/>new file mode 100644<br/>index 000000000000..0526aa96146e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/ar9331.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/ar9331.c</a></div><div class='hunk'>@@ -0,0 +1,1142 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright (c) 2019 Pengutronix, Oleksij Rempel &lt;kernel@pengutronix.de&gt;</div><div class='add'>+/*</div><div class='add'>+ *                   +----------------------+</div><div class='add'>+ * GMAC1----RGMII----|--MAC0                |</div><div class='add'>+ *      \---MDIO1----|--REGs                |----MDIO3----\</div><div class='add'>+ *                   |                      |             |  +------+</div><div class='add'>+ *                   |                      |             +--|      |</div><div class='add'>+ *                   |                 MAC1-|----RMII--M-----| PHY0 |-o P0</div><div class='add'>+ *                   |                      |          |  |  +------+</div><div class='add'>+ *                   |                      |          |  +--|      |</div><div class='add'>+ *                   |                 MAC2-|----RMII--------| PHY1 |-o P1</div><div class='add'>+ *                   |                      |          |  |  +------+</div><div class='add'>+ *                   |                      |          |  +--|      |</div><div class='add'>+ *                   |                 MAC3-|----RMII--------| PHY2 |-o P2</div><div class='add'>+ *                   |                      |          |  |  +------+</div><div class='add'>+ *                   |                      |          |  +--|      |</div><div class='add'>+ *                   |                 MAC4-|----RMII--------| PHY3 |-o P3</div><div class='add'>+ *                   |                      |          |  |  +------+</div><div class='add'>+ *                   |                      |          |  +--|      |</div><div class='add'>+ *                   |                 MAC5-|--+-RMII--M-----|-PHY4-|-o P4</div><div class='add'>+ *                   |                      |  |       |     +------+</div><div class='add'>+ *                   +----------------------+  |       \--CFG_SW_PHY_SWAP</div><div class='add'>+ * GMAC0---------------RMII--------------------/        \-CFG_SW_PHY_ADDR_SWAP</div><div class='add'>+ *      \---MDIO0--NC</div><div class='add'>+ *</div><div class='add'>+ * GMAC0 and MAC5 are connected together and use same PHY. Depending on</div><div class='add'>+ * configuration it can be PHY4 (default) or PHY0. Only GMAC0 or MAC5 can be</div><div class='add'>+ * used at same time. If GMAC0 is used (default) then MAC5 should be disabled.</div><div class='add'>+ *</div><div class='add'>+ * CFG_SW_PHY_SWAP - swap connections of PHY0 and PHY4. If this bit is not set</div><div class='add'>+ * PHY4 is connected to GMAC0/MAC5 bundle and PHY0 is connected to MAC1. If this</div><div class='add'>+ * bit is set, PHY4 is connected to MAC1 and PHY0 is connected to GMAC0/MAC5</div><div class='add'>+ * bundle.</div><div class='add'>+ *</div><div class='add'>+ * CFG_SW_PHY_ADDR_SWAP - swap addresses of PHY0 and PHY4</div><div class='add'>+ *</div><div class='add'>+ * CFG_SW_PHY_SWAP and CFG_SW_PHY_ADDR_SWAP are part of SoC specific register</div><div class='add'>+ * set and not related to switch internal registers.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_NAME				"ar9331_switch"</div><div class='add'>+#define AR9331_SW_PORTS				6</div><div class='add'>+</div><div class='add'>+/* dummy reg to change page */</div><div class='add'>+#define AR9331_SW_REG_PAGE			0x40000</div><div class='add'>+</div><div class='add'>+/* Global Interrupt */</div><div class='add'>+#define AR9331_SW_REG_GINT			0x10</div><div class='add'>+#define AR9331_SW_REG_GINT_MASK			0x14</div><div class='add'>+#define AR9331_SW_GINT_PHY_INT			BIT(2)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_REG_FLOOD_MASK		0x2c</div><div class='add'>+#define AR9331_SW_FLOOD_MASK_BROAD_TO_CPU	BIT(26)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_REG_GLOBAL_CTRL		0x30</div><div class='add'>+#define AR9331_SW_GLOBAL_CTRL_MFS_M		GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_REG_MDIO_CTRL			0x98</div><div class='add'>+#define AR9331_SW_MDIO_CTRL_BUSY		BIT(31)</div><div class='add'>+#define AR9331_SW_MDIO_CTRL_MASTER_EN		BIT(30)</div><div class='add'>+#define AR9331_SW_MDIO_CTRL_CMD_READ		BIT(27)</div><div class='add'>+#define AR9331_SW_MDIO_CTRL_PHY_ADDR_M		GENMASK(25, 21)</div><div class='add'>+#define AR9331_SW_MDIO_CTRL_REG_ADDR_M		GENMASK(20, 16)</div><div class='add'>+#define AR9331_SW_MDIO_CTRL_DATA_M		GENMASK(16, 0)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_REG_PORT_STATUS(_port)	(0x100 + (_port) * 0x100)</div><div class='add'>+</div><div class='add'>+/* FLOW_LINK_EN - enable mac flow control config auto-neg with phy.</div><div class='add'>+ * If not set, mac can be config by software.</div><div class='add'>+ */</div><div class='add'>+#define AR9331_SW_PORT_STATUS_FLOW_LINK_EN	BIT(12)</div><div class='add'>+</div><div class='add'>+/* LINK_EN - If set, MAC is configured from PHY link status.</div><div class='add'>+ * If not set, MAC should be configured by software.</div><div class='add'>+ */</div><div class='add'>+#define AR9331_SW_PORT_STATUS_LINK_EN		BIT(9)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_DUPLEX_MODE	BIT(6)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_RX_FLOW_EN	BIT(5)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_TX_FLOW_EN	BIT(4)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_RXMAC		BIT(3)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_TXMAC		BIT(2)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_SPEED_M		GENMASK(1, 0)</div><div class='add'>+#define AR9331_SW_PORT_STATUS_SPEED_1000	2</div><div class='add'>+#define AR9331_SW_PORT_STATUS_SPEED_100		1</div><div class='add'>+#define AR9331_SW_PORT_STATUS_SPEED_10		0</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_PORT_STATUS_MAC_MASK \</div><div class='add'>+	(AR9331_SW_PORT_STATUS_TXMAC | AR9331_SW_PORT_STATUS_RXMAC)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_PORT_STATUS_LINK_MASK \</div><div class='add'>+	(AR9331_SW_PORT_STATUS_DUPLEX_MODE | \</div><div class='add'>+	 AR9331_SW_PORT_STATUS_RX_FLOW_EN | AR9331_SW_PORT_STATUS_TX_FLOW_EN | \</div><div class='add'>+	 AR9331_SW_PORT_STATUS_SPEED_M)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_REG_PORT_CTRL(_port)			(0x104 + (_port) * 0x100)</div><div class='add'>+#define AR9331_SW_PORT_CTRL_HEAD_EN			BIT(11)</div><div class='add'>+#define AR9331_SW_PORT_CTRL_PORT_STATE			GENMASK(2, 0)</div><div class='add'>+#define AR9331_SW_PORT_CTRL_PORT_STATE_DISABLED		0</div><div class='add'>+#define AR9331_SW_PORT_CTRL_PORT_STATE_BLOCKING		1</div><div class='add'>+#define AR9331_SW_PORT_CTRL_PORT_STATE_LISTENING	2</div><div class='add'>+#define AR9331_SW_PORT_CTRL_PORT_STATE_LEARNING		3</div><div class='add'>+#define AR9331_SW_PORT_CTRL_PORT_STATE_FORWARD		4</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_REG_PORT_VLAN(_port)			(0x108 + (_port) * 0x100)</div><div class='add'>+#define AR9331_SW_PORT_VLAN_8021Q_MODE			GENMASK(31, 30)</div><div class='add'>+#define AR9331_SW_8021Q_MODE_SECURE			3</div><div class='add'>+#define AR9331_SW_8021Q_MODE_CHECK			2</div><div class='add'>+#define AR9331_SW_8021Q_MODE_FALLBACK			1</div><div class='add'>+#define AR9331_SW_8021Q_MODE_NONE			0</div><div class='add'>+#define AR9331_SW_PORT_VLAN_PORT_VID_MEMBER		GENMASK(25, 16)</div><div class='add'>+</div><div class='add'>+/* MIB registers */</div><div class='add'>+#define AR9331_MIB_COUNTER(x)			(0x20000 + ((x) * 0x100))</div><div class='add'>+</div><div class='add'>+/* Phy bypass mode</div><div class='add'>+ * ------------------------------------------------------------------------</div><div class='add'>+ * Bit:   | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |10 |11 |12 |13 |14 |15 |</div><div class='add'>+ *</div><div class='add'>+ * real   | start |   OP  | PhyAddr           |  Reg Addr         |  TA   |</div><div class='add'>+ * atheros| start |   OP  | 2'b00 |PhyAdd[2:0]|  Reg Addr[4:0]    |  TA   |</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * Bit:   |16 |17 |18 |19 |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |30 |31 |</div><div class='add'>+ * real   |  Data                                                         |</div><div class='add'>+ * atheros|  Data                                                         |</div><div class='add'>+ *</div><div class='add'>+ * ------------------------------------------------------------------------</div><div class='add'>+ * Page address mode</div><div class='add'>+ * ------------------------------------------------------------------------</div><div class='add'>+ * Bit:   | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |10 |11 |12 |13 |14 |15 |</div><div class='add'>+ * real   | start |   OP  | PhyAddr           |  Reg Addr         |  TA   |</div><div class='add'>+ * atheros| start |   OP  | 2'b11 |                          8'b0 |  TA   |</div><div class='add'>+ *</div><div class='add'>+ * Bit:   |16 |17 |18 |19 |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |30 |31 |</div><div class='add'>+ * real   |  Data                                                         |</div><div class='add'>+ * atheros|                       | Page [9:0]                            |</div><div class='add'>+ */</div><div class='add'>+/* In case of Page Address mode, Bit[18:9] of 32 bit register address should be</div><div class='add'>+ * written to bits[9:0] of mdio data register.</div><div class='add'>+ */</div><div class='add'>+#define AR9331_SW_ADDR_PAGE			GENMASK(18, 9)</div><div class='add'>+</div><div class='add'>+/* ------------------------------------------------------------------------</div><div class='add'>+ * Normal register access mode</div><div class='add'>+ * ------------------------------------------------------------------------</div><div class='add'>+ * Bit:   | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |10 |11 |12 |13 |14 |15 |</div><div class='add'>+ * real   | start |   OP  | PhyAddr           |  Reg Addr         |  TA   |</div><div class='add'>+ * atheros| start |   OP  | 2'b10 |  low_addr[7:0]                |  TA   |</div><div class='add'>+ *</div><div class='add'>+ * Bit:   |16 |17 |18 |19 |20 |21 |22 |23 |24 |25 |26 |27 |28 |29 |30 |31 |</div><div class='add'>+ * real   |  Data                                                         |</div><div class='add'>+ * atheros|  Data                                                         |</div><div class='add'>+ * ------------------------------------------------------------------------</div><div class='add'>+ */</div><div class='add'>+#define AR9331_SW_LOW_ADDR_PHY			GENMASK(8, 6)</div><div class='add'>+#define AR9331_SW_LOW_ADDR_REG			GENMASK(5, 1)</div><div class='add'>+</div><div class='add'>+#define AR9331_SW_MDIO_PHY_MODE_M		GENMASK(4, 3)</div><div class='add'>+#define AR9331_SW_MDIO_PHY_MODE_PAGE		3</div><div class='add'>+#define AR9331_SW_MDIO_PHY_MODE_REG		2</div><div class='add'>+#define AR9331_SW_MDIO_PHY_MODE_BYPASS		0</div><div class='add'>+#define AR9331_SW_MDIO_PHY_ADDR_M		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+/* Empirical determined values */</div><div class='add'>+#define AR9331_SW_MDIO_POLL_SLEEP_US		1</div><div class='add'>+#define AR9331_SW_MDIO_POLL_TIMEOUT_US		20</div><div class='add'>+</div><div class='add'>+/* The interval should be small enough to avoid overflow of 32bit MIBs */</div><div class='add'>+/*</div><div class='add'>+ * FIXME: until we can read MIBs from stats64 call directly (i.e. sleep</div><div class='add'>+ * there), we have to poll stats more frequently then it is actually needed.</div><div class='add'>+ * For overflow protection, normally, 100 sec interval should have been OK.</div><div class='add'>+ */</div><div class='add'>+#define STATS_INTERVAL_JIFFIES			(3 * HZ)</div><div class='add'>+</div><div class='add'>+struct ar9331_sw_stats_raw {</div><div class='add'>+	u32 rxbroad;			/* 0x00 */</div><div class='add'>+	u32 rxpause;			/* 0x04 */</div><div class='add'>+	u32 rxmulti;			/* 0x08 */</div><div class='add'>+	u32 rxfcserr;			/* 0x0c */</div><div class='add'>+	u32 rxalignerr;			/* 0x10 */</div><div class='add'>+	u32 rxrunt;			/* 0x14 */</div><div class='add'>+	u32 rxfragment;			/* 0x18 */</div><div class='add'>+	u32 rx64byte;			/* 0x1c */</div><div class='add'>+	u32 rx128byte;			/* 0x20 */</div><div class='add'>+	u32 rx256byte;			/* 0x24 */</div><div class='add'>+	u32 rx512byte;			/* 0x28 */</div><div class='add'>+	u32 rx1024byte;			/* 0x2c */</div><div class='add'>+	u32 rx1518byte;			/* 0x30 */</div><div class='add'>+	u32 rxmaxbyte;			/* 0x34 */</div><div class='add'>+	u32 rxtoolong;			/* 0x38 */</div><div class='add'>+	u32 rxgoodbyte;			/* 0x3c */</div><div class='add'>+	u32 rxgoodbyte_hi;</div><div class='add'>+	u32 rxbadbyte;			/* 0x44 */</div><div class='add'>+	u32 rxbadbyte_hi;</div><div class='add'>+	u32 rxoverflow;			/* 0x4c */</div><div class='add'>+	u32 filtered;			/* 0x50 */</div><div class='add'>+	u32 txbroad;			/* 0x54 */</div><div class='add'>+	u32 txpause;			/* 0x58 */</div><div class='add'>+	u32 txmulti;			/* 0x5c */</div><div class='add'>+	u32 txunderrun;			/* 0x60 */</div><div class='add'>+	u32 tx64byte;			/* 0x64 */</div><div class='add'>+	u32 tx128byte;			/* 0x68 */</div><div class='add'>+	u32 tx256byte;			/* 0x6c */</div><div class='add'>+	u32 tx512byte;			/* 0x70 */</div><div class='add'>+	u32 tx1024byte;			/* 0x74 */</div><div class='add'>+	u32 tx1518byte;			/* 0x78 */</div><div class='add'>+	u32 txmaxbyte;			/* 0x7c */</div><div class='add'>+	u32 txoversize;			/* 0x80 */</div><div class='add'>+	u32 txbyte;			/* 0x84 */</div><div class='add'>+	u32 txbyte_hi;</div><div class='add'>+	u32 txcollision;		/* 0x8c */</div><div class='add'>+	u32 txabortcol;			/* 0x90 */</div><div class='add'>+	u32 txmulticol;			/* 0x94 */</div><div class='add'>+	u32 txsinglecol;		/* 0x98 */</div><div class='add'>+	u32 txexcdefer;			/* 0x9c */</div><div class='add'>+	u32 txdefer;			/* 0xa0 */</div><div class='add'>+	u32 txlatecol;			/* 0xa4 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ar9331_sw_port {</div><div class='add'>+	int idx;</div><div class='add'>+	struct delayed_work mib_read;</div><div class='add'>+	struct rtnl_link_stats64 stats;</div><div class='add'>+	struct ethtool_pause_stats pause_stats;</div><div class='add'>+	struct spinlock stats_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ar9331_sw_priv {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct dsa_switch ds;</div><div class='add'>+	struct dsa_switch_ops ops;</div><div class='add'>+	struct irq_domain *irqdomain;</div><div class='add'>+	u32 irq_mask;</div><div class='add'>+	struct mutex lock_irq;</div><div class='add'>+	struct mii_bus *mbus; /* mdio master */</div><div class='add'>+	struct mii_bus *sbus; /* mdio slave */</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct reset_control *sw_reset;</div><div class='add'>+	struct ar9331_sw_port port[AR9331_SW_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ar9331_sw_priv *ar9331_sw_port_to_priv(struct ar9331_sw_port *port)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_port *p = port - port-&gt;idx;</div><div class='add'>+</div><div class='add'>+	return (struct ar9331_sw_priv *)((void *)p -</div><div class='add'>+					 offsetof(struct ar9331_sw_priv, port));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Warning: switch reset will reset last AR9331_SW_MDIO_PHY_MODE_PAGE request</div><div class='add'>+ * If some kind of optimization is used, the request should be repeated.</div><div class='add'>+ */</div><div class='add'>+static int ar9331_sw_reset(struct ar9331_sw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reset_control_assert(priv-&gt;sw_reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* AR9331 doc do not provide any information about proper reset</div><div class='add'>+	 * sequence. The AR8136 (the closes switch to the AR9331) doc says:</div><div class='add'>+	 * reset duration should be greater than 10ms. So, let's use this value</div><div class='add'>+	 * for now.</div><div class='add'>+	 */</div><div class='add'>+	usleep_range(10000, 15000);</div><div class='add'>+	ret = reset_control_deassert(priv-&gt;sw_reset);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+	/* There is no information on how long should we wait after reset.</div><div class='add'>+	 * AR8136 has an EEPROM and there is an Interrupt for EEPROM load</div><div class='add'>+	 * status. AR9331 has no EEPROM support.</div><div class='add'>+	 * For now, do not wait. In case AR8136 will be needed, the after</div><div class='add'>+	 * reset delay can be added as well.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_mbus_write(struct mii_bus *mbus, int port, int regnum,</div><div class='add'>+				u16 data)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = mbus-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, AR9331_SW_REG_MDIO_CTRL,</div><div class='add'>+			   AR9331_SW_MDIO_CTRL_BUSY |</div><div class='add'>+			   AR9331_SW_MDIO_CTRL_MASTER_EN |</div><div class='add'>+			   FIELD_PREP(AR9331_SW_MDIO_CTRL_PHY_ADDR_M, port) |</div><div class='add'>+			   FIELD_PREP(AR9331_SW_MDIO_CTRL_REG_ADDR_M, regnum) |</div><div class='add'>+			   FIELD_PREP(AR9331_SW_MDIO_CTRL_DATA_M, data));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(regmap, AR9331_SW_REG_MDIO_CTRL, val,</div><div class='add'>+				       !(val &amp; AR9331_SW_MDIO_CTRL_BUSY),</div><div class='add'>+				       AR9331_SW_MDIO_POLL_SLEEP_US,</div><div class='add'>+				       AR9331_SW_MDIO_POLL_TIMEOUT_US);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	dev_err_ratelimited(priv-&gt;dev, "PHY write error: %i\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_mbus_read(struct mii_bus *mbus, int port, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = mbus-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, AR9331_SW_REG_MDIO_CTRL,</div><div class='add'>+			   AR9331_SW_MDIO_CTRL_BUSY |</div><div class='add'>+			   AR9331_SW_MDIO_CTRL_MASTER_EN |</div><div class='add'>+			   AR9331_SW_MDIO_CTRL_CMD_READ |</div><div class='add'>+			   FIELD_PREP(AR9331_SW_MDIO_CTRL_PHY_ADDR_M, port) |</div><div class='add'>+			   FIELD_PREP(AR9331_SW_MDIO_CTRL_REG_ADDR_M, regnum));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(regmap, AR9331_SW_REG_MDIO_CTRL, val,</div><div class='add'>+				       !(val &amp; AR9331_SW_MDIO_CTRL_BUSY),</div><div class='add'>+				       AR9331_SW_MDIO_POLL_SLEEP_US,</div><div class='add'>+				       AR9331_SW_MDIO_POLL_TIMEOUT_US);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, AR9331_SW_REG_MDIO_CTRL, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(AR9331_SW_MDIO_CTRL_DATA_M, val);</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	dev_err_ratelimited(priv-&gt;dev, "PHY read error: %i\n", ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_mbus_init(struct ar9331_sw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	struct mii_bus *mbus;</div><div class='add'>+	struct device_node *np, *mnp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	np = dev-&gt;of_node;</div><div class='add'>+</div><div class='add'>+	mbus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!mbus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mbus-&gt;name = np-&gt;full_name;</div><div class='add'>+	snprintf(mbus-&gt;id, MII_BUS_ID_SIZE, "%pOF", np);</div><div class='add'>+</div><div class='add'>+	mbus-&gt;read = ar9331_sw_mbus_read;</div><div class='add'>+	mbus-&gt;write = ar9331_sw_mbus_write;</div><div class='add'>+	mbus-&gt;priv = priv;</div><div class='add'>+	mbus-&gt;parent = dev;</div><div class='add'>+</div><div class='add'>+	mnp = of_get_child_by_name(np, "mdio");</div><div class='add'>+	if (!mnp)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = devm_of_mdiobus_register(dev, mbus, mnp);</div><div class='add'>+	of_node_put(mnp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mbus = mbus;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_setup_port(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	u32 port_mask, port_ctrl, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Generate default port settings */</div><div class='add'>+	port_ctrl = FIELD_PREP(AR9331_SW_PORT_CTRL_PORT_STATE,</div><div class='add'>+			       AR9331_SW_PORT_CTRL_PORT_STATE_FORWARD);</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port)) {</div><div class='add'>+		/* CPU port should be allowed to communicate with all user</div><div class='add'>+		 * ports.</div><div class='add'>+		 */</div><div class='add'>+		port_mask = dsa_user_ports(ds);</div><div class='add'>+		/* Enable Atheros header on CPU port. This will allow us</div><div class='add'>+		 * communicate with each port separately</div><div class='add'>+		 */</div><div class='add'>+		port_ctrl |= AR9331_SW_PORT_CTRL_HEAD_EN;</div><div class='add'>+	} else if (dsa_is_user_port(ds, port)) {</div><div class='add'>+		/* User ports should communicate only with the CPU port.</div><div class='add'>+		 */</div><div class='add'>+		port_mask = BIT(dsa_upstream_port(ds, port));</div><div class='add'>+	} else {</div><div class='add'>+		/* Other ports do not need to communicate at all */</div><div class='add'>+		port_mask = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(AR9331_SW_PORT_VLAN_8021Q_MODE,</div><div class='add'>+			 AR9331_SW_8021Q_MODE_NONE) |</div><div class='add'>+		FIELD_PREP(AR9331_SW_PORT_VLAN_PORT_VID_MEMBER, port_mask);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, AR9331_SW_REG_PORT_VLAN(port), val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, AR9331_SW_REG_PORT_CTRL(port), port_ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	dev_err(priv-&gt;dev, "%s: error: %i\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = ar9331_sw_reset(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Reset will set proper defaults. CPU - Port0 will be enabled and</div><div class='add'>+	 * configured. All other ports (ports 1 - 5) are disabled</div><div class='add'>+	 */</div><div class='add'>+	ret = ar9331_sw_mbus_init(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Do not drop broadcast frames */</div><div class='add'>+	ret = regmap_write_bits(regmap, AR9331_SW_REG_FLOOD_MASK,</div><div class='add'>+				AR9331_SW_FLOOD_MASK_BROAD_TO_CPU,</div><div class='add'>+				AR9331_SW_FLOOD_MASK_BROAD_TO_CPU);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	/* Set max frame size to the maximum supported value */</div><div class='add'>+	ret = regmap_write_bits(regmap, AR9331_SW_REG_GLOBAL_CTRL,</div><div class='add'>+				AR9331_SW_GLOBAL_CTRL_MFS_M,</div><div class='add'>+				AR9331_SW_GLOBAL_CTRL_MFS_M);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		ret = ar9331_sw_setup_port(ds, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds-&gt;configure_vlan_while_not_filtering = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, AR9331_SW_REG_PORT_STATUS(port), 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol ar9331_sw_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+							int port,</div><div class='add'>+							enum dsa_tag_protocol m)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_AR9331;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_1000;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+					 unsigned int mode,</div><div class='add'>+					 const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ar9331_sw_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, AR9331_SW_REG_PORT_STATUS(dp-&gt;index),</div><div class='add'>+				 AR9331_SW_PORT_STATUS_LINK_EN |</div><div class='add'>+				 AR9331_SW_PORT_STATUS_FLOW_LINK_EN, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					    unsigned int mode,</div><div class='add'>+					    phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ar9331_sw_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, AR9331_SW_REG_PORT_STATUS(port),</div><div class='add'>+				 AR9331_SW_PORT_STATUS_MAC_MASK, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;port[port].mib_read);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+					  struct phy_device *phydev,</div><div class='add'>+					  unsigned int mode,</div><div class='add'>+					  phy_interface_t interface,</div><div class='add'>+					  int speed, int duplex,</div><div class='add'>+					  bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct ar9331_sw_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;port[port].mib_read, 0);</div><div class='add'>+</div><div class='add'>+	val = AR9331_SW_PORT_STATUS_MAC_MASK;</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		val |= AR9331_SW_PORT_STATUS_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		val |= AR9331_SW_PORT_STATUS_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		val |= AR9331_SW_PORT_STATUS_SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (duplex)</div><div class='add'>+		val |= AR9331_SW_PORT_STATUS_DUPLEX_MODE;</div><div class='add'>+</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		val |= AR9331_SW_PORT_STATUS_TX_FLOW_EN;</div><div class='add'>+</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		val |= AR9331_SW_PORT_STATUS_RX_FLOW_EN;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, AR9331_SW_REG_PORT_STATUS(port),</div><div class='add'>+				 AR9331_SW_PORT_STATUS_MAC_MASK |</div><div class='add'>+				 AR9331_SW_PORT_STATUS_LINK_MASK,</div><div class='add'>+				 val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_read_stats(struct ar9331_sw_port *port)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ar9331_sw_port_to_priv(port);</div><div class='add'>+	struct ethtool_pause_stats *pstats = &amp;port-&gt;pause_stats;</div><div class='add'>+	struct rtnl_link_stats64 *stats = &amp;port-&gt;stats;</div><div class='add'>+	struct ar9331_sw_stats_raw raw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Do the slowest part first, to avoid needless locking for long time */</div><div class='add'>+	ret = regmap_bulk_read(priv-&gt;regmap, AR9331_MIB_COUNTER(port-&gt;idx),</div><div class='add'>+			       &amp;raw, sizeof(raw) / sizeof(u32));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_ratelimited(priv-&gt;dev, "%s: %i\n", __func__, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* All MIB counters are cleared automatically on read */</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;port-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_bytes += raw.rxgoodbyte;</div><div class='add'>+	stats-&gt;tx_bytes += raw.txbyte;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets += raw.rx64byte + raw.rx128byte + raw.rx256byte +</div><div class='add'>+		raw.rx512byte + raw.rx1024byte + raw.rx1518byte + raw.rxmaxbyte;</div><div class='add'>+	stats-&gt;tx_packets += raw.tx64byte + raw.tx128byte + raw.tx256byte +</div><div class='add'>+		raw.tx512byte + raw.tx1024byte + raw.tx1518byte + raw.txmaxbyte;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_length_errors += raw.rxrunt + raw.rxfragment + raw.rxtoolong;</div><div class='add'>+	stats-&gt;rx_crc_errors += raw.rxfcserr;</div><div class='add'>+	stats-&gt;rx_frame_errors += raw.rxalignerr;</div><div class='add'>+	stats-&gt;rx_missed_errors += raw.rxoverflow;</div><div class='add'>+	stats-&gt;rx_dropped += raw.filtered;</div><div class='add'>+	stats-&gt;rx_errors += raw.rxfcserr + raw.rxalignerr + raw.rxrunt +</div><div class='add'>+		raw.rxfragment + raw.rxoverflow + raw.rxtoolong;</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_window_errors += raw.txlatecol;</div><div class='add'>+	stats-&gt;tx_fifo_errors += raw.txunderrun;</div><div class='add'>+	stats-&gt;tx_aborted_errors += raw.txabortcol;</div><div class='add'>+	stats-&gt;tx_errors += raw.txoversize + raw.txabortcol + raw.txunderrun +</div><div class='add'>+		raw.txlatecol;</div><div class='add'>+</div><div class='add'>+	stats-&gt;multicast += raw.rxmulti;</div><div class='add'>+	stats-&gt;collisions += raw.txcollision;</div><div class='add'>+</div><div class='add'>+	pstats-&gt;tx_pause_frames += raw.txpause;</div><div class='add'>+	pstats-&gt;rx_pause_frames += raw.rxpause;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;port-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_do_stats_poll(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_port *port = container_of(work, struct ar9331_sw_port,</div><div class='add'>+						   mib_read.work);</div><div class='add'>+</div><div class='add'>+	ar9331_read_stats(port);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;port-&gt;mib_read, STATS_INTERVAL_JIFFIES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct ar9331_sw_port *p = &amp;priv-&gt;port[port];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;p-&gt;stats_lock);</div><div class='add'>+	memcpy(s, &amp;p-&gt;stats, sizeof(*s));</div><div class='add'>+	spin_unlock(&amp;p-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_get_pause_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct ar9331_sw_port *p = &amp;priv-&gt;port[port];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;p-&gt;stats_lock);</div><div class='add'>+	memcpy(pause_stats, &amp;p-&gt;pause_stats, sizeof(*pause_stats));</div><div class='add'>+	spin_unlock(&amp;p-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops ar9331_phylink_mac_ops = {</div><div class='add'>+	.mac_config	= ar9331_sw_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= ar9331_sw_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= ar9331_sw_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops ar9331_sw_ops = {</div><div class='add'>+	.get_tag_protocol	= ar9331_sw_get_tag_protocol,</div><div class='add'>+	.setup			= ar9331_sw_setup,</div><div class='add'>+	.port_disable		= ar9331_sw_port_disable,</div><div class='add'>+	.phylink_get_caps	= ar9331_sw_phylink_get_caps,</div><div class='add'>+	.get_stats64		= ar9331_get_stats64,</div><div class='add'>+	.get_pause_stats	= ar9331_get_pause_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static irqreturn_t ar9331_sw_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = data;</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	u32 stat;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(regmap, AR9331_SW_REG_GINT, &amp;stat);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "can't read interrupt status\n");</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!stat)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (stat &amp; AR9331_SW_GINT_PHY_INT) {</div><div class='add'>+		int child_irq;</div><div class='add'>+</div><div class='add'>+		child_irq = irq_find_mapping(priv-&gt;irqdomain, 0);</div><div class='add'>+		handle_nested_irq(child_irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(regmap, AR9331_SW_REG_GINT, stat);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "can't write interrupt status\n");</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_mask_irq(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq_mask = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_unmask_irq(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq_mask = AR9331_SW_GINT_PHY_INT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_irq_bus_lock(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_irq_bus_sync_unlock(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);</div><div class='add'>+	struct regmap *regmap = priv-&gt;regmap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(regmap, AR9331_SW_REG_GINT_MASK,</div><div class='add'>+				 AR9331_SW_GINT_PHY_INT, priv-&gt;irq_mask);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to change IRQ mask\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock_irq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip ar9331_sw_irq_chip = {</div><div class='add'>+	.name = AR9331_SW_NAME,</div><div class='add'>+	.irq_mask = ar9331_sw_mask_irq,</div><div class='add'>+	.irq_unmask = ar9331_sw_unmask_irq,</div><div class='add'>+	.irq_bus_lock = ar9331_sw_irq_bus_lock,</div><div class='add'>+	.irq_bus_sync_unlock = ar9331_sw_irq_bus_sync_unlock,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_irq_map(struct irq_domain *domain, unsigned int irq,</div><div class='add'>+			     irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	irq_set_chip_data(irq, domain-&gt;host_data);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;ar9331_sw_irq_chip, handle_simple_irq);</div><div class='add'>+	irq_set_nested_thread(irq, 1);</div><div class='add'>+	irq_set_noprobe(irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_irq_unmap(struct irq_domain *d, unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	irq_set_nested_thread(irq, 0);</div><div class='add'>+	irq_set_chip_and_handler(irq, NULL, NULL);</div><div class='add'>+	irq_set_chip_data(irq, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_domain_ops ar9331_sw_irqdomain_ops = {</div><div class='add'>+	.map = ar9331_sw_irq_map,</div><div class='add'>+	.unmap = ar9331_sw_irq_unmap,</div><div class='add'>+	.xlate = irq_domain_xlate_onecell,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_irq_init(struct ar9331_sw_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = priv-&gt;dev-&gt;of_node;</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	int ret, irq;</div><div class='add'>+</div><div class='add'>+	irq = of_irq_get(np, 0);</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		dev_err(dev, "failed to get parent IRQ\n");</div><div class='add'>+		return irq ? irq : -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;lock_irq);</div><div class='add'>+	ret = devm_request_threaded_irq(dev, irq, NULL, ar9331_sw_irq,</div><div class='add'>+					IRQF_ONESHOT, AR9331_SW_NAME, priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "unable to request irq: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;irqdomain = irq_domain_create_linear(dev_fwnode(dev), 1, &amp;ar9331_sw_irqdomain_ops,</div><div class='add'>+						   priv);</div><div class='add'>+	if (!priv-&gt;irqdomain) {</div><div class='add'>+		dev_err(dev, "failed to create IRQ domain\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_set_parent(irq_create_mapping(priv-&gt;irqdomain, 0), irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ar9331_mdio_write(struct mii_bus *sbus, u8 mode, u16 reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	u8 r, p;</div><div class='add'>+</div><div class='add'>+	p = FIELD_PREP(AR9331_SW_MDIO_PHY_MODE_M, mode) |</div><div class='add'>+		FIELD_GET(AR9331_SW_LOW_ADDR_PHY, reg);</div><div class='add'>+	r = FIELD_GET(AR9331_SW_LOW_ADDR_REG, reg);</div><div class='add'>+</div><div class='add'>+	return __mdiobus_write(sbus, p, r, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __ar9331_mdio_read(struct mii_bus *sbus, u16 reg)</div><div class='add'>+{</div><div class='add'>+	u8 r, p;</div><div class='add'>+</div><div class='add'>+	p = FIELD_PREP(AR9331_SW_MDIO_PHY_MODE_M, AR9331_SW_MDIO_PHY_MODE_REG) |</div><div class='add'>+		FIELD_GET(AR9331_SW_LOW_ADDR_PHY, reg);</div><div class='add'>+	r = FIELD_GET(AR9331_SW_LOW_ADDR_REG, reg);</div><div class='add'>+</div><div class='add'>+	return __mdiobus_read(sbus, p, r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_mdio_read(void *ctx, const void *reg_buf, size_t reg_len,</div><div class='add'>+			    void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = ctx;</div><div class='add'>+	struct mii_bus *sbus = priv-&gt;sbus;</div><div class='add'>+	u32 reg = *(u32 *)reg_buf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (reg == AR9331_SW_REG_PAGE) {</div><div class='add'>+		/* We cannot read the page selector register from hardware and</div><div class='add'>+		 * we cache its value in regmap. Return all bits set here,</div><div class='add'>+		 * that regmap will always write the page on first use.</div><div class='add'>+		 */</div><div class='add'>+		*(u32 *)val_buf = GENMASK(9, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;sbus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	ret = __ar9331_mdio_read(sbus, reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	*(u32 *)val_buf = ret;</div><div class='add'>+	ret = __ar9331_mdio_read(sbus, reg + 2);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	*(u32 *)val_buf |= ret &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;sbus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+error:</div><div class='add'>+	mutex_unlock(&amp;sbus-&gt;mdio_lock);</div><div class='add'>+	dev_err_ratelimited(&amp;sbus-&gt;dev, "Bus error. Failed to read register.\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_mdio_write(void *ctx, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = (struct ar9331_sw_priv *)ctx;</div><div class='add'>+	struct mii_bus *sbus = priv-&gt;sbus;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;sbus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+	if (reg == AR9331_SW_REG_PAGE) {</div><div class='add'>+		ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_PAGE,</div><div class='add'>+					  0, val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;sbus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In case of this switch we work with 32bit registers on top of 16bit</div><div class='add'>+	 * bus. Some registers (for example access to forwarding database) have</div><div class='add'>+	 * trigger bit on the first 16bit half of request, the result and</div><div class='add'>+	 * configuration of request in the second half.</div><div class='add'>+	 * To make it work properly, we should do the second part of transfer</div><div class='add'>+	 * before the first one is done.</div><div class='add'>+	 */</div><div class='add'>+	ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_REG, reg + 2,</div><div class='add'>+				  val &gt;&gt; 16);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = __ar9331_mdio_write(sbus, AR9331_SW_MDIO_PHY_MODE_REG, reg, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;sbus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	mutex_unlock(&amp;sbus-&gt;mdio_lock);</div><div class='add'>+	dev_err_ratelimited(&amp;sbus-&gt;dev, "Bus error. Failed to write register.\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_bus_write(void *context, const void *data, size_t count)</div><div class='add'>+{</div><div class='add'>+	u32 reg = *(u32 *)data;</div><div class='add'>+	u32 val = *((u32 *)data + 1);</div><div class='add'>+</div><div class='add'>+	return ar9331_mdio_write(context, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_range ar9331_valid_regs[] = {</div><div class='add'>+	regmap_reg_range(0x0, 0x0),</div><div class='add'>+	regmap_reg_range(0x10, 0x14),</div><div class='add'>+	regmap_reg_range(0x20, 0x24),</div><div class='add'>+	regmap_reg_range(0x2c, 0x30),</div><div class='add'>+	regmap_reg_range(0x40, 0x44),</div><div class='add'>+	regmap_reg_range(0x50, 0x78),</div><div class='add'>+	regmap_reg_range(0x80, 0x98),</div><div class='add'>+</div><div class='add'>+	regmap_reg_range(0x100, 0x120),</div><div class='add'>+	regmap_reg_range(0x200, 0x220),</div><div class='add'>+	regmap_reg_range(0x300, 0x320),</div><div class='add'>+	regmap_reg_range(0x400, 0x420),</div><div class='add'>+	regmap_reg_range(0x500, 0x520),</div><div class='add'>+	regmap_reg_range(0x600, 0x620),</div><div class='add'>+</div><div class='add'>+	regmap_reg_range(0x20000, 0x200a4),</div><div class='add'>+	regmap_reg_range(0x20100, 0x201a4),</div><div class='add'>+	regmap_reg_range(0x20200, 0x202a4),</div><div class='add'>+	regmap_reg_range(0x20300, 0x203a4),</div><div class='add'>+	regmap_reg_range(0x20400, 0x204a4),</div><div class='add'>+	regmap_reg_range(0x20500, 0x205a4),</div><div class='add'>+</div><div class='add'>+	/* dummy page selector reg */</div><div class='add'>+	regmap_reg_range(AR9331_SW_REG_PAGE, AR9331_SW_REG_PAGE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range ar9331_nonvolatile_regs[] = {</div><div class='add'>+	regmap_reg_range(AR9331_SW_REG_PAGE, AR9331_SW_REG_PAGE),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_range_cfg ar9331_regmap_range[] = {</div><div class='add'>+	{</div><div class='add'>+		.selector_reg = AR9331_SW_REG_PAGE,</div><div class='add'>+		.selector_mask = GENMASK(9, 0),</div><div class='add'>+		.selector_shift = 0,</div><div class='add'>+</div><div class='add'>+		.window_start = 0,</div><div class='add'>+		.window_len = 512,</div><div class='add'>+</div><div class='add'>+		.range_min = 0,</div><div class='add'>+		.range_max = AR9331_SW_REG_PAGE - 4,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table ar9331_register_set = {</div><div class='add'>+	.yes_ranges = ar9331_valid_regs,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(ar9331_valid_regs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_access_table ar9331_volatile_set = {</div><div class='add'>+	.no_ranges = ar9331_nonvolatile_regs,</div><div class='add'>+	.n_no_ranges = ARRAY_SIZE(ar9331_nonvolatile_regs),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_config ar9331_mdio_regmap_config = {</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = AR9331_SW_REG_PAGE,</div><div class='add'>+	.use_single_read = true,</div><div class='add'>+	.use_single_write = true,</div><div class='add'>+</div><div class='add'>+	.ranges = ar9331_regmap_range,</div><div class='add'>+	.num_ranges = ARRAY_SIZE(ar9331_regmap_range),</div><div class='add'>+</div><div class='add'>+	.volatile_table = &amp;ar9331_volatile_set,</div><div class='add'>+	.wr_table = &amp;ar9331_register_set,</div><div class='add'>+	.rd_table = &amp;ar9331_register_set,</div><div class='add'>+</div><div class='add'>+	.cache_type = REGCACHE_MAPLE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct regmap_bus ar9331_sw_bus = {</div><div class='add'>+	.reg_format_endian_default = REGMAP_ENDIAN_NATIVE,</div><div class='add'>+	.val_format_endian_default = REGMAP_ENDIAN_NATIVE,</div><div class='add'>+	.read = ar9331_mdio_read,</div><div class='add'>+	.write = ar9331_sw_bus_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ar9331_sw_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init(&amp;mdiodev-&gt;dev, &amp;ar9331_sw_bus, priv,</div><div class='add'>+					&amp;ar9331_mdio_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;regmap);</div><div class='add'>+		dev_err(&amp;mdiodev-&gt;dev, "regmap init failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;sw_reset = devm_reset_control_get(&amp;mdiodev-&gt;dev, "switch");</div><div class='add'>+	if (IS_ERR(priv-&gt;sw_reset)) {</div><div class='add'>+		dev_err(&amp;mdiodev-&gt;dev, "missing switch reset\n");</div><div class='add'>+		return PTR_ERR(priv-&gt;sw_reset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;sbus = mdiodev-&gt;bus;</div><div class='add'>+	priv-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = ar9331_sw_irq_init(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ds = &amp;priv-&gt;ds;</div><div class='add'>+	ds-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	ds-&gt;num_ports = AR9331_SW_PORTS;</div><div class='add'>+	ds-&gt;priv = priv;</div><div class='add'>+	priv-&gt;ops = ar9331_sw_ops;</div><div class='add'>+	ds-&gt;ops = &amp;priv-&gt;ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;ar9331_phylink_mac_ops;</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, priv);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;port); i++) {</div><div class='add'>+		struct ar9331_sw_port *port = &amp;priv-&gt;port[i];</div><div class='add'>+</div><div class='add'>+		port-&gt;idx = i;</div><div class='add'>+		spin_lock_init(&amp;port-&gt;stats_lock);</div><div class='add'>+		INIT_DELAYED_WORK(&amp;port-&gt;mib_read, ar9331_do_stats_poll);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = dsa_register_switch(ds);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_remove_irq;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_remove_irq:</div><div class='add'>+	irq_domain_remove(priv-&gt;irqdomain);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(priv-&gt;port); i++) {</div><div class='add'>+		struct ar9331_sw_port *port = &amp;priv-&gt;port[i];</div><div class='add'>+</div><div class='add'>+		cancel_delayed_work_sync(&amp;port-&gt;mib_read);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_domain_remove(priv-&gt;irqdomain);</div><div class='add'>+	dsa_unregister_switch(&amp;priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	reset_control_assert(priv-&gt;sw_reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ar9331_sw_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct ar9331_sw_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(&amp;priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ar9331_sw_of_match[] = {</div><div class='add'>+	{ .compatible = "qca,ar9331-switch" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdio_driver ar9331_sw_mdio_driver = {</div><div class='add'>+	.probe = ar9331_sw_probe,</div><div class='add'>+	.remove = ar9331_sw_remove,</div><div class='add'>+	.shutdown = ar9331_sw_shutdown,</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = AR9331_SW_NAME,</div><div class='add'>+		.of_match_table = ar9331_sw_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(ar9331_sw_mdio_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Oleksij Rempel &lt;kernel@pengutronix.de&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Atheros AR9331 switch");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c<br/>new file mode 100644<br/>index 000000000000..a36b8b07030e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/qca8k-8xxx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/qca8k-8xxx.c</a></div><div class='hunk'>@@ -0,0 +1,2227 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2009 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ * Copyright (C) 2011-2012 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ * Copyright (c) 2015, 2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/dsa/tag_qca.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qca8k.h"</div><div class='add'>+#include "qca8k_leds.h"</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)</div><div class='add'>+{</div><div class='add'>+	regaddr &gt;&gt;= 1;</div><div class='add'>+	*r1 = regaddr &amp; 0x1e;</div><div class='add'>+</div><div class='add'>+	regaddr &gt;&gt;= 5;</div><div class='add'>+	*r2 = regaddr &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	regaddr &gt;&gt;= 3;</div><div class='add'>+	*page = regaddr &amp; 0x3ff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mii_write_lo(struct mii_bus *bus, int phy_id, u32 regnum, u32 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 lo;</div><div class='add'>+</div><div class='add'>+	lo = val &amp; 0xffff;</div><div class='add'>+	ret = bus-&gt;write(bus, phy_id, regnum, lo);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='add'>+				    "failed to write qca8k 32bit lo register\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mii_write_hi(struct mii_bus *bus, int phy_id, u32 regnum, u32 val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u16 hi;</div><div class='add'>+</div><div class='add'>+	hi = (u16)(val &gt;&gt; 16);</div><div class='add'>+	ret = bus-&gt;write(bus, phy_id, regnum, hi);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='add'>+				    "failed to write qca8k 32bit hi register\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mii_read_lo(struct mii_bus *bus, int phy_id, u32 regnum, u32 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;read(bus, phy_id, regnum);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	*val = ret &amp; 0xffff;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='add'>+			    "failed to read qca8k 32bit lo register\n");</div><div class='add'>+	*val = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mii_read_hi(struct mii_bus *bus, int phy_id, u32 regnum, u32 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;read(bus, phy_id, regnum);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	*val = ret &lt;&lt; 16;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='add'>+			    "failed to read qca8k 32bit hi register\n");</div><div class='add'>+	*val = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mii_read32(struct mii_bus *bus, int phy_id, u32 regnum, u32 *val)</div><div class='add'>+{</div><div class='add'>+	u32 hi, lo;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	*val = 0;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mii_read_lo(bus, phy_id, regnum, &amp;lo);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mii_read_hi(bus, phy_id, regnum + 1, &amp;hi);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	*val = lo | hi;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_mii_write32(struct mii_bus *bus, int phy_id, u32 regnum, u32 val)</div><div class='add'>+{</div><div class='add'>+	if (qca8k_mii_write_lo(bus, phy_id, regnum, val) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	qca8k_mii_write_hi(bus, phy_id, regnum + 1, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_set_page(struct qca8k_priv *priv, u16 page)</div><div class='add'>+{</div><div class='add'>+	u16 *cached_page = &amp;priv-&gt;mdio_cache.page;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (page == *cached_page)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, 0x18, 0, page);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='add'>+				    "failed to set qca8k page\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*cached_page = page;</div><div class='add'>+	usleep_range(1000, 2000);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_rw_reg_ack_handler(struct dsa_switch *ds, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_mgmt_eth_data *mgmt_eth_data;</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct qca_mgmt_ethhdr *mgmt_ethhdr;</div><div class='add'>+	u32 command;</div><div class='add'>+	u8 len, cmd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb_mac_header(skb);</div><div class='add'>+	mgmt_eth_data = &amp;priv-&gt;mgmt_eth_data;</div><div class='add'>+</div><div class='add'>+	command = get_unaligned_le32(&amp;mgmt_ethhdr-&gt;command);</div><div class='add'>+	cmd = FIELD_GET(QCA_HDR_MGMT_CMD, command);</div><div class='add'>+</div><div class='add'>+	len = FIELD_GET(QCA_HDR_MGMT_LENGTH, command);</div><div class='add'>+	/* Special case for len of 15 as this is the max value for len and needs to</div><div class='add'>+	 * be increased before converting it from word to dword.</div><div class='add'>+	 */</div><div class='add'>+	if (len == 15)</div><div class='add'>+		len++;</div><div class='add'>+</div><div class='add'>+	/* We can ignore odd value, we always round up them in the alloc function. */</div><div class='add'>+	len *= sizeof(u16);</div><div class='add'>+</div><div class='add'>+	/* Make sure the seq match the requested packet */</div><div class='add'>+	if (get_unaligned_le32(&amp;mgmt_ethhdr-&gt;seq) == mgmt_eth_data-&gt;seq)</div><div class='add'>+		mgmt_eth_data-&gt;ack = true;</div><div class='add'>+</div><div class='add'>+	if (cmd == MDIO_READ) {</div><div class='add'>+		u32 *val = mgmt_eth_data-&gt;data;</div><div class='add'>+</div><div class='add'>+		*val = get_unaligned_le32(&amp;mgmt_ethhdr-&gt;mdio_data);</div><div class='add'>+</div><div class='add'>+		/* Get the rest of the 12 byte of data.</div><div class='add'>+		 * The read/write function will extract the requested data.</div><div class='add'>+		 */</div><div class='add'>+		if (len &gt; QCA_HDR_MGMT_DATA1_LEN) {</div><div class='add'>+			__le32 *data2 = (__le32 *)skb-&gt;data;</div><div class='add'>+			int data_len = min_t(int, QCA_HDR_MGMT_DATA2_LEN,</div><div class='add'>+					     len - QCA_HDR_MGMT_DATA1_LEN);</div><div class='add'>+</div><div class='add'>+			val++;</div><div class='add'>+</div><div class='add'>+			for (i = sizeof(u32); i &lt;= data_len; i += sizeof(u32)) {</div><div class='add'>+				*val = get_unaligned_le32(data2);</div><div class='add'>+				val++;</div><div class='add'>+				data2++;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	complete(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *val,</div><div class='add'>+					       int priority, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct qca_mgmt_ethhdr *mgmt_ethhdr;</div><div class='add'>+	unsigned int real_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	__le32 *data2;</div><div class='add'>+	u32 command;</div><div class='add'>+	u16 hdr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	skb = dev_alloc_skb(QCA_HDR_MGMT_PKT_LEN);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Hdr mgmt length value is in step of word size.</div><div class='add'>+	 * As an example to process 4 byte of data the correct length to set is 2.</div><div class='add'>+	 * To process 8 byte 4, 12 byte 6, 16 byte 8...</div><div class='add'>+	 *</div><div class='add'>+	 * Odd values will always return the next size on the ack packet.</div><div class='add'>+	 * (length of 3 (6 byte) will always return 8 bytes of data)</div><div class='add'>+	 *</div><div class='add'>+	 * This means that a value of 15 (0xf) actually means reading/writing 32 bytes</div><div class='add'>+	 * of data.</div><div class='add'>+	 *</div><div class='add'>+	 * To correctly calculate the length we devide the requested len by word and</div><div class='add'>+	 * round up.</div><div class='add'>+	 * On the ack function we can skip the odd check as we already handle the</div><div class='add'>+	 * case here.</div><div class='add'>+	 */</div><div class='add'>+	real_len = DIV_ROUND_UP(len, sizeof(u16));</div><div class='add'>+</div><div class='add'>+	/* We check if the result len is odd and we round up another time to</div><div class='add'>+	 * the next size. (length of 3 will be increased to 4 as switch will always</div><div class='add'>+	 * return 8 bytes)</div><div class='add'>+	 */</div><div class='add'>+	if (real_len % sizeof(u16) != 0)</div><div class='add'>+		real_len++;</div><div class='add'>+</div><div class='add'>+	/* Max reg value is 0xf(15) but switch will always return the next size (32 byte) */</div><div class='add'>+	if (real_len == 16)</div><div class='add'>+		real_len--;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_set_network_header(skb, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	mgmt_ethhdr = skb_push(skb, QCA_HDR_MGMT_HEADER_LEN + QCA_HDR_LEN);</div><div class='add'>+</div><div class='add'>+	hdr = FIELD_PREP(QCA_HDR_XMIT_VERSION, QCA_HDR_VERSION);</div><div class='add'>+	hdr |= FIELD_PREP(QCA_HDR_XMIT_PRIORITY, priority);</div><div class='add'>+	hdr |= QCA_HDR_XMIT_FROM_CPU;</div><div class='add'>+	hdr |= FIELD_PREP(QCA_HDR_XMIT_DP_BIT, BIT(0));</div><div class='add'>+	hdr |= FIELD_PREP(QCA_HDR_XMIT_CONTROL, QCA_HDR_XMIT_TYPE_RW_REG);</div><div class='add'>+</div><div class='add'>+	command = FIELD_PREP(QCA_HDR_MGMT_ADDR, reg);</div><div class='add'>+	command |= FIELD_PREP(QCA_HDR_MGMT_LENGTH, real_len);</div><div class='add'>+	command |= FIELD_PREP(QCA_HDR_MGMT_CMD, cmd);</div><div class='add'>+	command |= FIELD_PREP(QCA_HDR_MGMT_CHECK_CODE,</div><div class='add'>+					   QCA_HDR_MGMT_CHECK_CODE_VAL);</div><div class='add'>+</div><div class='add'>+	put_unaligned_le32(command, &amp;mgmt_ethhdr-&gt;command);</div><div class='add'>+</div><div class='add'>+	if (cmd == MDIO_WRITE)</div><div class='add'>+		put_unaligned_le32(*val, &amp;mgmt_ethhdr-&gt;mdio_data);</div><div class='add'>+</div><div class='add'>+	mgmt_ethhdr-&gt;hdr = htons(hdr);</div><div class='add'>+</div><div class='add'>+	data2 = skb_put_zero(skb, QCA_HDR_MGMT_DATA2_LEN + QCA_HDR_MGMT_PADDING_LEN);</div><div class='add'>+	if (cmd == MDIO_WRITE &amp;&amp; len &gt; QCA_HDR_MGMT_DATA1_LEN) {</div><div class='add'>+		int data_len = min_t(int, QCA_HDR_MGMT_DATA2_LEN,</div><div class='add'>+				     len - QCA_HDR_MGMT_DATA1_LEN);</div><div class='add'>+</div><div class='add'>+		val++;</div><div class='add'>+</div><div class='add'>+		for (i = sizeof(u32); i &lt;= data_len; i += sizeof(u32)) {</div><div class='add'>+			put_unaligned_le32(*val, data2);</div><div class='add'>+			data2++;</div><div class='add'>+			val++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_mdio_header_fill_seq_num(struct sk_buff *skb, u32 seq_num)</div><div class='add'>+{</div><div class='add'>+	struct qca_mgmt_ethhdr *mgmt_ethhdr;</div><div class='add'>+	u32 seq;</div><div class='add'>+</div><div class='add'>+	seq = FIELD_PREP(QCA_HDR_MGMT_SEQ_NUM, seq_num);</div><div class='add'>+	mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb-&gt;data;</div><div class='add'>+	put_unaligned_le32(seq, &amp;mgmt_ethhdr-&gt;seq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_mgmt_eth_data *mgmt_eth_data = &amp;priv-&gt;mgmt_eth_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool ack;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = qca8k_alloc_mdio_header(MDIO_READ, reg, NULL,</div><div class='add'>+				      QCA8K_ETHERNET_MDIO_PRIORITY, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Check if the mgmt_conduit if is operational */</div><div class='add'>+	if (!priv-&gt;mgmt_conduit) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		mutex_unlock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = priv-&gt;mgmt_conduit;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+	/* Increment seq_num and set it in the mdio pkt */</div><div class='add'>+	mgmt_eth_data-&gt;seq++;</div><div class='add'>+	qca8k_mdio_header_fill_seq_num(skb, mgmt_eth_data-&gt;seq);</div><div class='add'>+	mgmt_eth_data-&gt;ack = false;</div><div class='add'>+</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;mgmt_eth_data-&gt;rw_done,</div><div class='add'>+					  QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	*val = mgmt_eth_data-&gt;data[0];</div><div class='add'>+	if (len &gt; QCA_HDR_MGMT_DATA1_LEN)</div><div class='add'>+		memcpy(val + 1, mgmt_eth_data-&gt;data + 1, len - QCA_HDR_MGMT_DATA1_LEN);</div><div class='add'>+</div><div class='add'>+	ack = mgmt_eth_data-&gt;ack;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (!ack)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_write_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_mgmt_eth_data *mgmt_eth_data = &amp;priv-&gt;mgmt_eth_data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	bool ack;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = qca8k_alloc_mdio_header(MDIO_WRITE, reg, val,</div><div class='add'>+				      QCA8K_ETHERNET_MDIO_PRIORITY, len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Check if the mgmt_conduit if is operational */</div><div class='add'>+	if (!priv-&gt;mgmt_conduit) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		mutex_unlock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = priv-&gt;mgmt_conduit;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+	/* Increment seq_num and set it in the mdio pkt */</div><div class='add'>+	mgmt_eth_data-&gt;seq++;</div><div class='add'>+	qca8k_mdio_header_fill_seq_num(skb, mgmt_eth_data-&gt;seq);</div><div class='add'>+	mgmt_eth_data-&gt;ack = false;</div><div class='add'>+</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;mgmt_eth_data-&gt;rw_done,</div><div class='add'>+					  QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	ack = mgmt_eth_data-&gt;ack;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (!ack)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_regmap_update_bits_eth(struct qca8k_priv *priv, u32 reg, u32 mask, u32 write_val)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_read_eth(priv, reg, &amp;val, sizeof(val));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+	val |= write_val;</div><div class='add'>+</div><div class='add'>+	return qca8k_write_eth(priv, reg, &amp;val, sizeof(val));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_read_mii(struct qca8k_priv *priv, uint32_t reg, uint32_t *val)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 r1, r2, page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_set_page(priv, page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mii_read32(bus, 0x10 | r2, r1, val);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_write_mii(struct qca8k_priv *priv, uint32_t reg, uint32_t val)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 r1, r2, page;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_set_page(priv, page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	qca8k_mii_write32(bus, 0x10 | r2, r1, val);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_regmap_update_bits_mii(struct qca8k_priv *priv, uint32_t reg,</div><div class='add'>+			     uint32_t mask, uint32_t write_val)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 r1, r2, page;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_set_page(priv, page);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mii_read32(bus, 0x10 | r2, r1, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	val &amp;= ~mask;</div><div class='add'>+	val |= write_val;</div><div class='add'>+	qca8k_mii_write32(bus, 0x10 | r2, r1, val);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_bulk_read(void *ctx, const void *reg_buf, size_t reg_len,</div><div class='add'>+		void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	int i, count = val_len / sizeof(u32), ret;</div><div class='add'>+	struct qca8k_priv *priv = ctx;</div><div class='add'>+	u32 reg = *(u16 *)reg_buf;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mgmt_conduit &amp;&amp;</div><div class='add'>+	    !qca8k_read_eth(priv, reg, val_buf, val_len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* loop count times and increment reg of 4 */</div><div class='add'>+	for (i = 0; i &lt; count; i++, reg += sizeof(u32)) {</div><div class='add'>+		ret = qca8k_read_mii(priv, reg, val_buf + i);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_bulk_gather_write(void *ctx, const void *reg_buf, size_t reg_len,</div><div class='add'>+			const void *val_buf, size_t val_len)</div><div class='add'>+{</div><div class='add'>+	int i, count = val_len / sizeof(u32), ret;</div><div class='add'>+	struct qca8k_priv *priv = ctx;</div><div class='add'>+	u32 reg = *(u16 *)reg_buf;</div><div class='add'>+	u32 *val = (u32 *)val_buf;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mgmt_conduit &amp;&amp;</div><div class='add'>+	    !qca8k_write_eth(priv, reg, val, val_len))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* loop count times, increment reg of 4 and increment val ptr to</div><div class='add'>+	 * the next value</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; count; i++, reg += sizeof(u32), val++) {</div><div class='add'>+		ret = qca8k_write_mii(priv, reg, *val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_bulk_write(void *ctx, const void *data, size_t bytes)</div><div class='add'>+{</div><div class='add'>+	return qca8k_bulk_gather_write(ctx, data, sizeof(u16), data + sizeof(u16),</div><div class='add'>+				       bytes - sizeof(u16));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_regmap_update_bits(void *ctx, uint32_t reg, uint32_t mask, uint32_t write_val)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ctx;</div><div class='add'>+</div><div class='add'>+	if (!qca8k_regmap_update_bits_eth(priv, reg, mask, write_val))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return qca8k_regmap_update_bits_mii(priv, reg, mask, write_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_config qca8k_regmap_config = {</div><div class='add'>+	.reg_bits = 16,</div><div class='add'>+	.val_bits = 32,</div><div class='add'>+	.reg_stride = 4,</div><div class='add'>+	.max_register = 0x16ac, /* end MIB - Port6 range */</div><div class='add'>+	.read = qca8k_bulk_read,</div><div class='add'>+	.write = qca8k_bulk_write,</div><div class='add'>+	.reg_update_bits = qca8k_regmap_update_bits,</div><div class='add'>+	.rd_table = &amp;qca8k_readable_table,</div><div class='add'>+	.disable_locking = true, /* Locking is handled by qca8k read/write */</div><div class='add'>+	.cache_type = REGCACHE_NONE, /* Explicitly disable CACHE */</div><div class='add'>+	.max_raw_read = 32, /* mgmt eth can read up to 8 registers at time */</div><div class='add'>+	/* ATU regs suffer from a bug where some data are not correctly</div><div class='add'>+	 * written. Disable bulk write to correctly write ATU entry.</div><div class='add'>+	 */</div><div class='add'>+	.use_single_write = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_phy_eth_busy_wait(struct qca8k_mgmt_eth_data *mgmt_eth_data,</div><div class='add'>+			struct sk_buff *read_skb, u32 *val)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = skb_copy(read_skb, GFP_KERNEL);</div><div class='add'>+	bool ack;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+	/* Increment seq_num and set it in the copy pkt */</div><div class='add'>+	mgmt_eth_data-&gt;seq++;</div><div class='add'>+	qca8k_mdio_header_fill_seq_num(skb, mgmt_eth_data-&gt;seq);</div><div class='add'>+	mgmt_eth_data-&gt;ack = false;</div><div class='add'>+</div><div class='add'>+	dev_queue_xmit(skb);</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;mgmt_eth_data-&gt;rw_done,</div><div class='add'>+					  QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	ack = mgmt_eth_data-&gt;ack;</div><div class='add'>+</div><div class='add'>+	if (ret &lt;= 0)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (!ack)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*val = mgmt_eth_data-&gt;data[0];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_phy_eth_command(struct qca8k_priv *priv, bool read, int phy,</div><div class='add'>+		      int regnum, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *write_skb, *clear_skb, *read_skb;</div><div class='add'>+	struct qca8k_mgmt_eth_data *mgmt_eth_data;</div><div class='add'>+	u32 write_val, clear_val = 0, val;</div><div class='add'>+	struct net_device *mgmt_conduit;</div><div class='add'>+	int ret, ret1;</div><div class='add'>+	bool ack;</div><div class='add'>+</div><div class='add'>+	if (regnum &gt;= QCA8K_MDIO_MASTER_MAX_REG)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mgmt_eth_data = &amp;priv-&gt;mgmt_eth_data;</div><div class='add'>+</div><div class='add'>+	write_val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |</div><div class='add'>+		    QCA8K_MDIO_MASTER_PHY_ADDR(phy) |</div><div class='add'>+		    QCA8K_MDIO_MASTER_REG_ADDR(regnum);</div><div class='add'>+</div><div class='add'>+	if (read) {</div><div class='add'>+		write_val |= QCA8K_MDIO_MASTER_READ;</div><div class='add'>+	} else {</div><div class='add'>+		write_val |= QCA8K_MDIO_MASTER_WRITE;</div><div class='add'>+		write_val |= QCA8K_MDIO_MASTER_DATA(data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Prealloc all the needed skb before the lock */</div><div class='add'>+	write_skb = qca8k_alloc_mdio_header(MDIO_WRITE, QCA8K_MDIO_MASTER_CTRL, &amp;write_val,</div><div class='add'>+					    QCA8K_ETHERNET_PHY_PRIORITY, sizeof(write_val));</div><div class='add'>+	if (!write_skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	clear_skb = qca8k_alloc_mdio_header(MDIO_WRITE, QCA8K_MDIO_MASTER_CTRL, &amp;clear_val,</div><div class='add'>+					    QCA8K_ETHERNET_PHY_PRIORITY, sizeof(clear_val));</div><div class='add'>+	if (!clear_skb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_clear_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_skb = qca8k_alloc_mdio_header(MDIO_READ, QCA8K_MDIO_MASTER_CTRL, &amp;clear_val,</div><div class='add'>+					   QCA8K_ETHERNET_PHY_PRIORITY, sizeof(clear_val));</div><div class='add'>+	if (!read_skb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_read_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* It seems that accessing the switch's internal PHYs via management</div><div class='add'>+	 * packets still uses the MDIO bus within the switch internally, and</div><div class='add'>+	 * these accesses can conflict with external MDIO accesses to other</div><div class='add'>+	 * devices on the MDIO bus.</div><div class='add'>+	 * We therefore need to lock the MDIO bus onto which the switch is</div><div class='add'>+	 * connected.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock_nested(&amp;priv-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	/* Actually start the request:</div><div class='add'>+	 * 1. Send mdio master packet</div><div class='add'>+	 * 2. Busy Wait for mdio master command</div><div class='add'>+	 * 3. Get the data if we are reading</div><div class='add'>+	 * 4. Reset the mdio master (even with error)</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	/* Check if mgmt_conduit is operational */</div><div class='add'>+	mgmt_conduit = priv-&gt;mgmt_conduit;</div><div class='add'>+	if (!mgmt_conduit) {</div><div class='add'>+		mutex_unlock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;bus-&gt;mdio_lock);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_mgmt_conduit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	read_skb-&gt;dev = mgmt_conduit;</div><div class='add'>+	clear_skb-&gt;dev = mgmt_conduit;</div><div class='add'>+	write_skb-&gt;dev = mgmt_conduit;</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+	/* Increment seq_num and set it in the write pkt */</div><div class='add'>+	mgmt_eth_data-&gt;seq++;</div><div class='add'>+	qca8k_mdio_header_fill_seq_num(write_skb, mgmt_eth_data-&gt;seq);</div><div class='add'>+	mgmt_eth_data-&gt;ack = false;</div><div class='add'>+</div><div class='add'>+	dev_queue_xmit(write_skb);</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;mgmt_eth_data-&gt;rw_done,</div><div class='add'>+					  QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	ack = mgmt_eth_data-&gt;ack;</div><div class='add'>+</div><div class='add'>+	if (ret &lt;= 0) {</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+		kfree_skb(read_skb);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ack) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		kfree_skb(read_skb);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(qca8k_phy_eth_busy_wait, ret1,</div><div class='add'>+				!(val &amp; QCA8K_MDIO_MASTER_BUSY), 0,</div><div class='add'>+				QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,</div><div class='add'>+				mgmt_eth_data, read_skb, &amp;val);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret1 &lt; 0) {</div><div class='add'>+		ret = ret1;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (read) {</div><div class='add'>+		reinit_completion(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+		/* Increment seq_num and set it in the read pkt */</div><div class='add'>+		mgmt_eth_data-&gt;seq++;</div><div class='add'>+		qca8k_mdio_header_fill_seq_num(read_skb, mgmt_eth_data-&gt;seq);</div><div class='add'>+		mgmt_eth_data-&gt;ack = false;</div><div class='add'>+</div><div class='add'>+		dev_queue_xmit(read_skb);</div><div class='add'>+</div><div class='add'>+		ret = wait_for_completion_timeout(&amp;mgmt_eth_data-&gt;rw_done,</div><div class='add'>+						  QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+		ack = mgmt_eth_data-&gt;ack;</div><div class='add'>+</div><div class='add'>+		if (ret &lt;= 0) {</div><div class='add'>+			ret = -ETIMEDOUT;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ack) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = mgmt_eth_data-&gt;data[0] &amp; QCA8K_MDIO_MASTER_DATA_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		kfree_skb(read_skb);</div><div class='add'>+	}</div><div class='add'>+exit:</div><div class='add'>+	reinit_completion(&amp;mgmt_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+	/* Increment seq_num and set it in the clear pkt */</div><div class='add'>+	mgmt_eth_data-&gt;seq++;</div><div class='add'>+	qca8k_mdio_header_fill_seq_num(clear_skb, mgmt_eth_data-&gt;seq);</div><div class='add'>+	mgmt_eth_data-&gt;ack = false;</div><div class='add'>+</div><div class='add'>+	dev_queue_xmit(clear_skb);</div><div class='add'>+</div><div class='add'>+	wait_for_completion_timeout(&amp;mgmt_eth_data-&gt;rw_done,</div><div class='add'>+				    QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;mgmt_eth_data-&gt;mutex);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+	/* Error handling before lock */</div><div class='add'>+err_mgmt_conduit:</div><div class='add'>+	kfree_skb(read_skb);</div><div class='add'>+err_read_skb:</div><div class='add'>+	kfree_skb(clear_skb);</div><div class='add'>+err_clear_skb:</div><div class='add'>+	kfree_skb(write_skb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mdio_busy_wait(struct mii_bus *bus, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u16 r1, r2, page;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret, ret1;</div><div class='add'>+</div><div class='add'>+	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(qca8k_mii_read_hi, ret1, !(val &amp; mask), 0,</div><div class='add'>+				QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC, false,</div><div class='add'>+				bus, 0x10 | r2, r1 + 1, &amp;val);</div><div class='add'>+</div><div class='add'>+	/* Check if qca8k_read has failed for a different reason</div><div class='add'>+	 * before returnting -ETIMEDOUT</div><div class='add'>+	 */</div><div class='add'>+	if (ret &lt; 0 &amp;&amp; ret1 &lt; 0)</div><div class='add'>+		return ret1;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mdio_write(struct qca8k_priv *priv, int phy, int regnum, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 r1, r2, page;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (regnum &gt;= QCA8K_MDIO_MASTER_MAX_REG)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |</div><div class='add'>+	      QCA8K_MDIO_MASTER_WRITE | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |</div><div class='add'>+	      QCA8K_MDIO_MASTER_REG_ADDR(regnum) |</div><div class='add'>+	      QCA8K_MDIO_MASTER_DATA(data);</div><div class='add'>+</div><div class='add'>+	qca8k_split_addr(QCA8K_MDIO_MASTER_CTRL, &amp;r1, &amp;r2, &amp;page);</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_set_page(priv, page);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	qca8k_mii_write32(bus, 0x10 | r2, r1, val);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mdio_busy_wait(bus, QCA8K_MDIO_MASTER_CTRL,</div><div class='add'>+				   QCA8K_MDIO_MASTER_BUSY);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	/* even if the busy_wait timeouts try to clear the MASTER_EN */</div><div class='add'>+	qca8k_mii_write_hi(bus, 0x10 | r2, r1 + 1, 0);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mdio_read(struct qca8k_priv *priv, int phy, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	u16 r1, r2, page;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (regnum &gt;= QCA8K_MDIO_MASTER_MAX_REG)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |</div><div class='add'>+	      QCA8K_MDIO_MASTER_READ | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |</div><div class='add'>+	      QCA8K_MDIO_MASTER_REG_ADDR(regnum);</div><div class='add'>+</div><div class='add'>+	qca8k_split_addr(QCA8K_MDIO_MASTER_CTRL, &amp;r1, &amp;r2, &amp;page);</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_set_page(priv, page);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	qca8k_mii_write_hi(bus, 0x10 | r2, r1 + 1, val);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mdio_busy_wait(bus, QCA8K_MDIO_MASTER_CTRL,</div><div class='add'>+				   QCA8K_MDIO_MASTER_BUSY);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mii_read_lo(bus, 0x10 | r2, r1, &amp;val);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	/* even if the busy_wait timeouts try to clear the MASTER_EN */</div><div class='add'>+	qca8k_mii_write_hi(bus, 0x10 | r2, r1 + 1, 0);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		ret = val &amp; QCA8K_MDIO_MASTER_DATA_MASK;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_internal_mdio_write(struct mii_bus *slave_bus, int phy, int regnum, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = slave_bus-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Use mdio Ethernet when available, fallback to legacy one on error */</div><div class='add'>+	ret = qca8k_phy_eth_command(priv, false, phy, regnum, data);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return qca8k_mdio_write(priv, phy, regnum, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_internal_mdio_read(struct mii_bus *slave_bus, int phy, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = slave_bus-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Use mdio Ethernet when available, fallback to legacy one on error */</div><div class='add'>+	ret = qca8k_phy_eth_command(priv, true, phy, regnum, 0);</div><div class='add'>+	if (ret &gt;= 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_mdio_read(priv, phy, regnum);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0xffff;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_legacy_mdio_write(struct mii_bus *slave_bus, int port, int regnum, u16 data)</div><div class='add'>+{</div><div class='add'>+	port = qca8k_port_to_phy(port) % PHY_MAX_ADDR;</div><div class='add'>+</div><div class='add'>+	return qca8k_internal_mdio_write(slave_bus, port, regnum, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_legacy_mdio_read(struct mii_bus *slave_bus, int port, int regnum)</div><div class='add'>+{</div><div class='add'>+	port = qca8k_port_to_phy(port) % PHY_MAX_ADDR;</div><div class='add'>+</div><div class='add'>+	return qca8k_internal_mdio_read(slave_bus, port, regnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_mdio_register(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct device *dev = ds-&gt;dev;</div><div class='add'>+	struct device_node *mdio;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mdio = of_get_child_by_name(dev-&gt;of_node, "mdio");</div><div class='add'>+	if (mdio &amp;&amp; !of_device_is_available(mdio))</div><div class='add'>+		goto out_put_node;</div><div class='add'>+</div><div class='add'>+	bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;internal_mdio_bus = bus;</div><div class='add'>+	bus-&gt;priv = (void *)priv;</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "qca8k-%d.%d",</div><div class='add'>+		 ds-&gt;dst-&gt;index, ds-&gt;index);</div><div class='add'>+	bus-&gt;parent = dev;</div><div class='add'>+</div><div class='add'>+	if (mdio) {</div><div class='add'>+		/* Check if the device tree declares the port:phy mapping */</div><div class='add'>+		bus-&gt;name = "qca8k user mii";</div><div class='add'>+		bus-&gt;read = qca8k_internal_mdio_read;</div><div class='add'>+		bus-&gt;write = qca8k_internal_mdio_write;</div><div class='add'>+	} else {</div><div class='add'>+		/* If a mapping can't be found, the legacy mapping is used,</div><div class='add'>+		 * using qca8k_port_to_phy()</div><div class='add'>+		 */</div><div class='add'>+		ds-&gt;user_mii_bus = bus;</div><div class='add'>+		bus-&gt;phy_mask = ~ds-&gt;phys_mii_mask;</div><div class='add'>+		bus-&gt;name = "qca8k-legacy user mii";</div><div class='add'>+		bus-&gt;read = qca8k_legacy_mdio_read;</div><div class='add'>+		bus-&gt;write = qca8k_legacy_mdio_write;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_of_mdiobus_register(dev, bus, mdio);</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='add'>+	of_node_put(mdio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_setup_mdio_bus(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 internal_mdio_mask = 0, external_mdio_mask = 0, reg;</div><div class='add'>+	struct device_node *ports, *port;</div><div class='add'>+	phy_interface_t mode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ports = of_get_child_by_name(priv-&gt;dev-&gt;of_node, "ports");</div><div class='add'>+	if (!ports)</div><div class='add'>+		ports = of_get_child_by_name(priv-&gt;dev-&gt;of_node, "ethernet-ports");</div><div class='add'>+</div><div class='add'>+	if (!ports)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node(ports, port) {</div><div class='add'>+		ret = of_property_read_u32(port, "reg", &amp;reg);</div><div class='add'>+		if (ret) {</div><div class='add'>+			of_node_put(port);</div><div class='add'>+			of_node_put(ports);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!dsa_is_user_port(priv-&gt;ds, reg))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		of_get_phy_mode(port, &amp;mode);</div><div class='add'>+</div><div class='add'>+		if (of_property_present(port, "phy-handle") &amp;&amp;</div><div class='add'>+		    mode != PHY_INTERFACE_MODE_INTERNAL)</div><div class='add'>+			external_mdio_mask |= BIT(reg);</div><div class='add'>+		else</div><div class='add'>+			internal_mdio_mask |= BIT(reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_node_put(ports);</div><div class='add'>+	if (!external_mdio_mask &amp;&amp; !internal_mdio_mask) {</div><div class='add'>+		dev_err(priv-&gt;dev, "no PHYs are defined.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The QCA8K_MDIO_MASTER_EN Bit, which grants access to PHYs through</div><div class='add'>+	 * the MDIO_MASTER register also _disconnects_ the external MDC</div><div class='add'>+	 * passthrough to the internal PHYs. It's not possible to use both</div><div class='add'>+	 * configurations at the same time!</div><div class='add'>+	 *</div><div class='add'>+	 * Because this came up during the review process:</div><div class='add'>+	 * If the external mdio-bus driver is capable magically disabling</div><div class='add'>+	 * the QCA8K_MDIO_MASTER_EN and mutex/spin-locking out the qca8k's</div><div class='add'>+	 * accessors for the time being, it would be possible to pull this</div><div class='add'>+	 * off.</div><div class='add'>+	 */</div><div class='add'>+	if (!!external_mdio_mask &amp;&amp; !!internal_mdio_mask) {</div><div class='add'>+		dev_err(priv-&gt;dev, "either internal or external mdio bus configuration is supported.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (external_mdio_mask) {</div><div class='add'>+		/* Make sure to disable the internal mdio bus in cases</div><div class='add'>+		 * a dt-overlay and driver reload changed the configuration</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		return regmap_clear_bits(priv-&gt;regmap, QCA8K_MDIO_MASTER_CTRL,</div><div class='add'>+					 QCA8K_MDIO_MASTER_EN);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return qca8k_mdio_register(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_setup_mac_pwr_sel(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 mask = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* SoC specific settings for ipq8064.</div><div class='add'>+	 * If more device require this consider adding</div><div class='add'>+	 * a dedicated binding.</div><div class='add'>+	 */</div><div class='add'>+	if (of_machine_is_compatible("qcom,ipq8064"))</div><div class='add'>+		mask |= QCA8K_MAC_PWR_RGMII0_1_8V;</div><div class='add'>+</div><div class='add'>+	/* SoC specific settings for ipq8065 */</div><div class='add'>+	if (of_machine_is_compatible("qcom,ipq8065"))</div><div class='add'>+		mask |= QCA8K_MAC_PWR_RGMII1_1_8V;</div><div class='add'>+</div><div class='add'>+	if (mask) {</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_REG_MAC_PWR_SEL,</div><div class='add'>+				QCA8K_MAC_PWR_RGMII0_1_8V |</div><div class='add'>+				QCA8K_MAC_PWR_RGMII1_1_8V,</div><div class='add'>+				mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_find_cpu_port(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Find the connected cpu port. Valid port are 0 or 6 */</div><div class='add'>+	if (dsa_is_cpu_port(ds, 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "port 0 is not the CPU port. Checking port 6");</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, 6))</div><div class='add'>+		return 6;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_setup_of_pws_reg(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	const struct qca8k_match_data *data = priv-&gt;info;</div><div class='add'>+	struct device_node *node = priv-&gt;dev-&gt;of_node;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* QCA8327 require to set to the correct mode.</div><div class='add'>+	 * His bigger brother QCA8328 have the 172 pin layout.</div><div class='add'>+	 * Should be applied by default but we set this just to make sure.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;switch_id == QCA8K_ID_QCA8327) {</div><div class='add'>+		/* Set the correct package of 148 pin for QCA8327 */</div><div class='add'>+		if (data-&gt;reduced_package)</div><div class='add'>+			val |= QCA8327_PWS_PACKAGE148_EN;</div><div class='add'>+</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_REG_PWS, QCA8327_PWS_PACKAGE148_EN,</div><div class='add'>+				val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(node, "qca,ignore-power-on-sel"))</div><div class='add'>+		val |= QCA8K_PWS_POWER_ON_SEL;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_bool(node, "qca,led-open-drain")) {</div><div class='add'>+		if (!(val &amp; QCA8K_PWS_POWER_ON_SEL)) {</div><div class='add'>+			dev_err(priv-&gt;dev, "qca,led-open-drain require qca,ignore-power-on-sel to be set.");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		val |= QCA8K_PWS_LED_OPEN_EN_CSR;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return qca8k_rmw(priv, QCA8K_REG_PWS,</div><div class='add'>+			QCA8K_PWS_LED_OPEN_EN_CSR | QCA8K_PWS_POWER_ON_SEL,</div><div class='add'>+			val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_parse_port_config(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int port, cpu_port_index = -1, ret;</div><div class='add'>+	struct device_node *port_dn;</div><div class='add'>+	phy_interface_t mode;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u32 delay;</div><div class='add'>+</div><div class='add'>+	/* We have 2 CPU port. Check them */</div><div class='add'>+	for (port = 0; port &lt; QCA8K_NUM_PORTS; port++) {</div><div class='add'>+		/* Skip every other port */</div><div class='add'>+		if (port != 0 &amp;&amp; port != 6)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dp = dsa_to_port(priv-&gt;ds, port);</div><div class='add'>+		port_dn = dp-&gt;dn;</div><div class='add'>+		cpu_port_index++;</div><div class='add'>+</div><div class='add'>+		if (!of_device_is_available(port_dn))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = of_get_phy_mode(port_dn, &amp;mode);</div><div class='add'>+		if (ret)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (mode) {</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+		case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+			delay = 0;</div><div class='add'>+</div><div class='add'>+			if (!of_property_read_u32(port_dn, "tx-internal-delay-ps", &amp;delay))</div><div class='add'>+				/* Switch regs accept value in ns, convert ps to ns */</div><div class='add'>+				delay = delay / 1000;</div><div class='add'>+			else if (mode == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='add'>+				 mode == PHY_INTERFACE_MODE_RGMII_TXID)</div><div class='add'>+				delay = 1;</div><div class='add'>+</div><div class='add'>+			if (!FIELD_FIT(QCA8K_PORT_PAD_RGMII_TX_DELAY_MASK, delay)) {</div><div class='add'>+				dev_err(priv-&gt;dev, "rgmii tx delay is limited to a max value of 3ns, setting to the max value");</div><div class='add'>+				delay = 3;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			priv-&gt;ports_config.rgmii_tx_delay[cpu_port_index] = delay;</div><div class='add'>+</div><div class='add'>+			delay = 0;</div><div class='add'>+</div><div class='add'>+			if (!of_property_read_u32(port_dn, "rx-internal-delay-ps", &amp;delay))</div><div class='add'>+				/* Switch regs accept value in ns, convert ps to ns */</div><div class='add'>+				delay = delay / 1000;</div><div class='add'>+			else if (mode == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='add'>+				 mode == PHY_INTERFACE_MODE_RGMII_RXID)</div><div class='add'>+				delay = 2;</div><div class='add'>+</div><div class='add'>+			if (!FIELD_FIT(QCA8K_PORT_PAD_RGMII_RX_DELAY_MASK, delay)) {</div><div class='add'>+				dev_err(priv-&gt;dev, "rgmii rx delay is limited to a max value of 3ns, setting to the max value");</div><div class='add'>+				delay = 3;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			priv-&gt;ports_config.rgmii_rx_delay[cpu_port_index] = delay;</div><div class='add'>+</div><div class='add'>+			/* Skip sgmii parsing for rgmii* mode */</div><div class='add'>+			if (mode == PHY_INTERFACE_MODE_RGMII ||</div><div class='add'>+			    mode == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='add'>+			    mode == PHY_INTERFACE_MODE_RGMII_TXID ||</div><div class='add'>+			    mode == PHY_INTERFACE_MODE_RGMII_RXID)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (of_property_read_bool(port_dn, "qca,sgmii-txclk-falling-edge"))</div><div class='add'>+				priv-&gt;ports_config.sgmii_tx_clk_falling_edge = true;</div><div class='add'>+</div><div class='add'>+			if (of_property_read_bool(port_dn, "qca,sgmii-rxclk-falling-edge"))</div><div class='add'>+				priv-&gt;ports_config.sgmii_rx_clk_falling_edge = true;</div><div class='add'>+</div><div class='add'>+			if (of_property_read_bool(port_dn, "qca,sgmii-enable-pll")) {</div><div class='add'>+				priv-&gt;ports_config.sgmii_enable_pll = true;</div><div class='add'>+</div><div class='add'>+				if (priv-&gt;switch_id == QCA8K_ID_QCA8327) {</div><div class='add'>+					dev_err(priv-&gt;dev, "SGMII PLL should NOT be enabled for qca8327. Aborting enabling");</div><div class='add'>+					priv-&gt;ports_config.sgmii_enable_pll = false;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				if (priv-&gt;switch_revision &lt; 2)</div><div class='add'>+					dev_warn(priv-&gt;dev, "SGMII PLL should NOT be enabled for qca8337 with revision 2 or more.");</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_mac_config_setup_internal_delay(struct qca8k_priv *priv, int cpu_port_index,</div><div class='add'>+				      u32 reg)</div><div class='add'>+{</div><div class='add'>+	u32 delay, val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Delay can be declared in 3 different way.</div><div class='add'>+	 * Mode to rgmii and internal-delay standard binding defined</div><div class='add'>+	 * rgmii-id or rgmii-tx/rx phy mode set.</div><div class='add'>+	 * The parse logic set a delay different than 0 only when one</div><div class='add'>+	 * of the 3 different way is used. In all other case delay is</div><div class='add'>+	 * not enabled. With ID or TX/RXID delay is enabled and set</div><div class='add'>+	 * to the default and recommended value.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;ports_config.rgmii_tx_delay[cpu_port_index]) {</div><div class='add'>+		delay = priv-&gt;ports_config.rgmii_tx_delay[cpu_port_index];</div><div class='add'>+</div><div class='add'>+		val |= QCA8K_PORT_PAD_RGMII_TX_DELAY(delay) |</div><div class='add'>+			QCA8K_PORT_PAD_RGMII_TX_DELAY_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ports_config.rgmii_rx_delay[cpu_port_index]) {</div><div class='add'>+		delay = priv-&gt;ports_config.rgmii_rx_delay[cpu_port_index];</div><div class='add'>+</div><div class='add'>+		val |= QCA8K_PORT_PAD_RGMII_RX_DELAY(delay) |</div><div class='add'>+			QCA8K_PORT_PAD_RGMII_RX_DELAY_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set RGMII delay based on the selected values */</div><div class='add'>+	ret = qca8k_rmw(priv, reg,</div><div class='add'>+			QCA8K_PORT_PAD_RGMII_TX_DELAY_MASK |</div><div class='add'>+			QCA8K_PORT_PAD_RGMII_RX_DELAY_MASK |</div><div class='add'>+			QCA8K_PORT_PAD_RGMII_TX_DELAY_EN |</div><div class='add'>+			QCA8K_PORT_PAD_RGMII_RX_DELAY_EN,</div><div class='add'>+			val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to set internal delay for CPU port%d",</div><div class='add'>+			cpu_port_index == QCA8K_CPU_PORT0 ? 0 : 6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+qca8k_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+			     phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct qca8k_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct phylink_pcs *pcs = NULL;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	switch (interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+		switch (port) {</div><div class='add'>+		case 0:</div><div class='add'>+			pcs = &amp;priv-&gt;pcs_port_0.pcs;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case 6:</div><div class='add'>+			pcs = &amp;priv-&gt;pcs_port_6.pcs;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return pcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_phylink_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			 const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct dsa_switch *ds = dp-&gt;ds;</div><div class='add'>+	struct qca8k_priv *priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int cpu_port_index;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0: /* 1st CPU port */</div><div class='add'>+		if (state-&gt;interface != PHY_INTERFACE_MODE_RGMII &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_RGMII_ID &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_RGMII_TXID &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_RGMII_RXID &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_SGMII)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		reg = QCA8K_REG_PORT0_PAD_CTRL;</div><div class='add'>+		cpu_port_index = QCA8K_CPU_PORT0;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+		/* Internal PHY, nothing to do */</div><div class='add'>+		return;</div><div class='add'>+	case 6: /* 2nd CPU port / external PHY */</div><div class='add'>+		if (state-&gt;interface != PHY_INTERFACE_MODE_RGMII &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_RGMII_ID &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_RGMII_TXID &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_RGMII_RXID &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_SGMII &amp;&amp;</div><div class='add'>+		    state-&gt;interface != PHY_INTERFACE_MODE_1000BASEX)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		reg = QCA8K_REG_PORT6_PAD_CTRL;</div><div class='add'>+		cpu_port_index = QCA8K_CPU_PORT6;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ds-&gt;dev, "%s: unsupported port: %i\n", __func__, port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port != 6 &amp;&amp; phylink_autoneg_inband(mode)) {</div><div class='add'>+		dev_err(ds-&gt;dev, "%s: in-band negotiation unsupported\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (state-&gt;interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+		qca8k_write(priv, reg, QCA8K_PORT_PAD_RGMII_EN);</div><div class='add'>+</div><div class='add'>+		/* Configure rgmii delay */</div><div class='add'>+		qca8k_mac_config_setup_internal_delay(priv, cpu_port_index, reg);</div><div class='add'>+</div><div class='add'>+		/* QCA8337 requires to set rgmii rx delay for all ports.</div><div class='add'>+		 * This is enabled through PORT5_PAD_CTRL for all ports,</div><div class='add'>+		 * rather than individual port registers.</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;switch_id == QCA8K_ID_QCA8337)</div><div class='add'>+			qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL,</div><div class='add'>+				    QCA8K_PORT_PAD_RGMII_RX_DELAY_EN);</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+		/* Enable SGMII on the port */</div><div class='add'>+		qca8k_write(priv, reg, QCA8K_PORT_PAD_SGMII_EN);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ds-&gt;dev, "xMII mode %s not supported for port %d\n",</div><div class='add'>+			phy_modes(state-&gt;interface), port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0: /* 1st CPU port */</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+	case 5:</div><div class='add'>+		/* Internal PHY */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6: /* 2nd CPU port / external PHY */</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_phylink_mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			    phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct qca8k_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	qca8k_port_set_status(priv, dp-&gt;index, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+			  struct phy_device *phydev, unsigned int mode,</div><div class='add'>+			  phy_interface_t interface, int speed, int duplex,</div><div class='add'>+			  bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct qca8k_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (phylink_autoneg_inband(mode)) {</div><div class='add'>+		reg = QCA8K_PORT_STATUS_LINK_AUTO;</div><div class='add'>+	} else {</div><div class='add'>+		switch (speed) {</div><div class='add'>+		case SPEED_10:</div><div class='add'>+			reg = QCA8K_PORT_STATUS_SPEED_10;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_100:</div><div class='add'>+			reg = QCA8K_PORT_STATUS_SPEED_100;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_1000:</div><div class='add'>+			reg = QCA8K_PORT_STATUS_SPEED_1000;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			reg = QCA8K_PORT_STATUS_LINK_AUTO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (duplex == DUPLEX_FULL)</div><div class='add'>+			reg |= QCA8K_PORT_STATUS_DUPLEX;</div><div class='add'>+</div><div class='add'>+		if (rx_pause || dsa_port_is_cpu(dp))</div><div class='add'>+			reg |= QCA8K_PORT_STATUS_RXFLOW;</div><div class='add'>+</div><div class='add'>+		if (tx_pause || dsa_port_is_cpu(dp))</div><div class='add'>+			reg |= QCA8K_PORT_STATUS_TXFLOW;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg |= QCA8K_PORT_STATUS_TXMAC | QCA8K_PORT_STATUS_RXMAC;</div><div class='add'>+</div><div class='add'>+	qca8k_write(priv, QCA8K_REG_PORT_STATUS(port), reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct qca8k_pcs *pcs_to_qca8k_pcs(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	return container_of(pcs, struct qca8k_pcs, pcs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+				struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = pcs_to_qca8k_pcs(pcs)-&gt;priv;</div><div class='add'>+	int port = pcs_to_qca8k_pcs(pcs)-&gt;port;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_read(priv, QCA8K_REG_PORT_STATUS(port), &amp;reg);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		state-&gt;link = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	state-&gt;link = !!(reg &amp; QCA8K_PORT_STATUS_LINK_UP);</div><div class='add'>+	state-&gt;an_complete = state-&gt;link;</div><div class='add'>+	state-&gt;duplex = (reg &amp; QCA8K_PORT_STATUS_DUPLEX) ? DUPLEX_FULL :</div><div class='add'>+							   DUPLEX_HALF;</div><div class='add'>+</div><div class='add'>+	switch (reg &amp; QCA8K_PORT_STATUS_SPEED) {</div><div class='add'>+	case QCA8K_PORT_STATUS_SPEED_10:</div><div class='add'>+		state-&gt;speed = SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case QCA8K_PORT_STATUS_SPEED_100:</div><div class='add'>+		state-&gt;speed = SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case QCA8K_PORT_STATUS_SPEED_1000:</div><div class='add'>+		state-&gt;speed = SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		state-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reg &amp; QCA8K_PORT_STATUS_RXFLOW)</div><div class='add'>+		state-&gt;pause |= MLO_PAUSE_RX;</div><div class='add'>+	if (reg &amp; QCA8K_PORT_STATUS_TXFLOW)</div><div class='add'>+		state-&gt;pause |= MLO_PAUSE_TX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+			    phy_interface_t interface,</div><div class='add'>+			    const unsigned long *advertising,</div><div class='add'>+			    bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = pcs_to_qca8k_pcs(pcs)-&gt;priv;</div><div class='add'>+	int cpu_port_index, ret, port;</div><div class='add'>+	u32 reg, val;</div><div class='add'>+</div><div class='add'>+	port = pcs_to_qca8k_pcs(pcs)-&gt;port;</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg = QCA8K_REG_PORT0_PAD_CTRL;</div><div class='add'>+		cpu_port_index = QCA8K_CPU_PORT0;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 6:</div><div class='add'>+		reg = QCA8K_REG_PORT6_PAD_CTRL;</div><div class='add'>+		cpu_port_index = QCA8K_CPU_PORT6;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable/disable SerDes auto-negotiation as necessary */</div><div class='add'>+	val = neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED ?</div><div class='add'>+		0 : QCA8K_PWS_SERDES_AEN_DIS;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_rmw(priv, QCA8K_REG_PWS, QCA8K_PWS_SERDES_AEN_DIS, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Configure the SGMII parameters */</div><div class='add'>+	ret = qca8k_read(priv, QCA8K_REG_SGMII_CTRL, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val |= QCA8K_SGMII_EN_SD;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ports_config.sgmii_enable_pll)</div><div class='add'>+		val |= QCA8K_SGMII_EN_PLL | QCA8K_SGMII_EN_RX |</div><div class='add'>+		       QCA8K_SGMII_EN_TX;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(priv-&gt;ds, port)) {</div><div class='add'>+		/* CPU port, we're talking to the CPU MAC, be a PHY */</div><div class='add'>+		val &amp;= ~QCA8K_SGMII_MODE_CTRL_MASK;</div><div class='add'>+		val |= QCA8K_SGMII_MODE_CTRL_PHY;</div><div class='add'>+	} else if (interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		val &amp;= ~QCA8K_SGMII_MODE_CTRL_MASK;</div><div class='add'>+		val |= QCA8K_SGMII_MODE_CTRL_MAC;</div><div class='add'>+	} else if (interface == PHY_INTERFACE_MODE_1000BASEX) {</div><div class='add'>+		val &amp;= ~QCA8K_SGMII_MODE_CTRL_MASK;</div><div class='add'>+		val |= QCA8K_SGMII_MODE_CTRL_BASEX;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qca8k_write(priv, QCA8K_REG_SGMII_CTRL, val);</div><div class='add'>+</div><div class='add'>+	/* From original code is reported port instability as SGMII also</div><div class='add'>+	 * require delay set. Apply advised values here or take them from DT.</div><div class='add'>+	 */</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_SGMII)</div><div class='add'>+		qca8k_mac_config_setup_internal_delay(priv, cpu_port_index, reg);</div><div class='add'>+	/* For qca8327/qca8328/qca8334/qca8338 sgmii is unique and</div><div class='add'>+	 * falling edge is set writing in the PORT0 PAD reg</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;switch_id == QCA8K_ID_QCA8327 ||</div><div class='add'>+	    priv-&gt;switch_id == QCA8K_ID_QCA8337)</div><div class='add'>+		reg = QCA8K_REG_PORT0_PAD_CTRL;</div><div class='add'>+</div><div class='add'>+	val = 0;</div><div class='add'>+</div><div class='add'>+	/* SGMII Clock phase configuration */</div><div class='add'>+	if (priv-&gt;ports_config.sgmii_rx_clk_falling_edge)</div><div class='add'>+		val |= QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;ports_config.sgmii_tx_clk_falling_edge)</div><div class='add'>+		val |= QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE;</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		ret = qca8k_rmw(priv, reg,</div><div class='add'>+				QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE |</div><div class='add'>+				QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE,</div><div class='add'>+				val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops qca8k_pcs_ops = {</div><div class='add'>+	.pcs_get_state = qca8k_pcs_get_state,</div><div class='add'>+	.pcs_config = qca8k_pcs_config,</div><div class='add'>+	.pcs_an_restart = qca8k_pcs_an_restart,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void qca8k_setup_pcs(struct qca8k_priv *priv, struct qca8k_pcs *qpcs,</div><div class='add'>+			    int port)</div><div class='add'>+{</div><div class='add'>+	qpcs-&gt;pcs.ops = &amp;qca8k_pcs_ops;</div><div class='add'>+</div><div class='add'>+	/* We don't have interrupts for link changes, so we need to poll */</div><div class='add'>+	qpcs-&gt;pcs.poll = true;</div><div class='add'>+	qpcs-&gt;priv = priv;</div><div class='add'>+	qpcs-&gt;port = port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_mib_eth_data *mib_eth_data;</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	const struct qca8k_mib_desc *mib;</div><div class='add'>+	struct mib_ethhdr *mib_ethhdr;</div><div class='add'>+	__le32 *data2;</div><div class='add'>+	u8 port;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mib_ethhdr = (struct mib_ethhdr *)skb_mac_header(skb);</div><div class='add'>+	mib_eth_data = &amp;priv-&gt;mib_eth_data;</div><div class='add'>+</div><div class='add'>+	/* The switch autocast every port. Ignore other packet and</div><div class='add'>+	 * parse only the requested one.</div><div class='add'>+	 */</div><div class='add'>+	port = FIELD_GET(QCA_HDR_RECV_SOURCE_PORT, ntohs(mib_ethhdr-&gt;hdr));</div><div class='add'>+	if (port != mib_eth_data-&gt;req_port)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	data2 = (__le32 *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;mib_count; i++) {</div><div class='add'>+		mib = &amp;ar8327_mib[i];</div><div class='add'>+</div><div class='add'>+		/* First 3 mib are present in the skb head */</div><div class='add'>+		if (i &lt; 3) {</div><div class='add'>+			mib_eth_data-&gt;data[i] = get_unaligned_le32(mib_ethhdr-&gt;data + i);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Some mib are 64 bit wide */</div><div class='add'>+		if (mib-&gt;size == 2)</div><div class='add'>+			mib_eth_data-&gt;data[i] = get_unaligned_le64((__le64 *)data2);</div><div class='add'>+		else</div><div class='add'>+			mib_eth_data-&gt;data[i] = get_unaligned_le32(data2);</div><div class='add'>+</div><div class='add'>+		data2 += mib-&gt;size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	/* Complete on receiving all the mib packet */</div><div class='add'>+	if (refcount_dec_and_test(&amp;mib_eth_data-&gt;port_parsed))</div><div class='add'>+		complete(&amp;mib_eth_data-&gt;rw_done);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_get_ethtool_stats_eth(struct dsa_switch *ds, int port, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct qca8k_mib_eth_data *mib_eth_data;</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mib_eth_data = &amp;priv-&gt;mib_eth_data;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mib_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	reinit_completion(&amp;mib_eth_data-&gt;rw_done);</div><div class='add'>+</div><div class='add'>+	mib_eth_data-&gt;req_port = dp-&gt;index;</div><div class='add'>+	mib_eth_data-&gt;data = data;</div><div class='add'>+	refcount_set(&amp;mib_eth_data-&gt;port_parsed, QCA8K_NUM_PORTS);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	/* Send mib autocast request */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap, QCA8K_REG_MIB,</div><div class='add'>+				 QCA8K_MIB_FUNC | QCA8K_MIB_BUSY,</div><div class='add'>+				 FIELD_PREP(QCA8K_MIB_FUNC, QCA8K_MIB_CAST) |</div><div class='add'>+				 QCA8K_MIB_BUSY);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;mib_eth_data-&gt;rw_done, QCA8K_ETHERNET_TIMEOUT);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;mib_eth_data-&gt;mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 qca8k_get_phy_flags(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Communicate to the phy internal driver the switch revision.</div><div class='add'>+	 * Based on the switch revision different values needs to be</div><div class='add'>+	 * set to the dbg and mmd reg on the phy.</div><div class='add'>+	 * The first 2 bit are used to communicate the switch revision</div><div class='add'>+	 * to the phy driver.</div><div class='add'>+	 */</div><div class='add'>+	if (port &gt; 0 &amp;&amp; port &lt; 6)</div><div class='add'>+		return priv-&gt;switch_revision;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol</div><div class='add'>+qca8k_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+		       enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_QCA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_conduit_change(struct dsa_switch *ds, const struct net_device *conduit,</div><div class='add'>+		     bool operational)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = conduit-&gt;dsa_ptr;</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Ethernet MIB/MDIO is only supported for CPU port 0 */</div><div class='add'>+	if (dp-&gt;index != 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mgmt_eth_data.mutex);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mib_eth_data.mutex);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mgmt_conduit = operational ? (struct net_device *)conduit : NULL;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mib_eth_data.mutex);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mgmt_eth_data.mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_connect_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+				      enum dsa_tag_protocol proto)</div><div class='add'>+{</div><div class='add'>+	struct qca_tagger_data *tagger_data;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case DSA_TAG_PROTO_QCA:</div><div class='add'>+		tagger_data = ds-&gt;tagger_data;</div><div class='add'>+</div><div class='add'>+		tagger_data-&gt;rw_reg_ack_handler = qca8k_rw_reg_ack_handler;</div><div class='add'>+		tagger_data-&gt;mib_autocast_handler = qca8k_mib_autocast_handler;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_setup_hol_fixup(struct qca8k_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	switch (port) {</div><div class='add'>+	/* The 2 CPU port and port 5 requires some different</div><div class='add'>+	 * priority than any other ports.</div><div class='add'>+	 */</div><div class='add'>+	case 0:</div><div class='add'>+	case 5:</div><div class='add'>+	case 6:</div><div class='add'>+		mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x4) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x4) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI4(0x6) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI5(0x8) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PORT(0x1e);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mask = QCA8K_PORT_HOL_CTRL0_EG_PRI0(0x3) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI1(0x4) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI2(0x6) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PRI3(0x8) |</div><div class='add'>+			QCA8K_PORT_HOL_CTRL0_EG_PORT(0x19);</div><div class='add'>+	}</div><div class='add'>+	regmap_write(priv-&gt;regmap, QCA8K_REG_PORT_HOL_CTRL0(port), mask);</div><div class='add'>+</div><div class='add'>+	mask = QCA8K_PORT_HOL_CTRL1_ING(0x6) |</div><div class='add'>+	       QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |</div><div class='add'>+	       QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |</div><div class='add'>+	       QCA8K_PORT_HOL_CTRL1_WRED_EN;</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, QCA8K_REG_PORT_HOL_CTRL1(port),</div><div class='add'>+			   QCA8K_PORT_HOL_CTRL1_ING_BUF_MASK |</div><div class='add'>+			   QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN |</div><div class='add'>+			   QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN |</div><div class='add'>+			   QCA8K_PORT_HOL_CTRL1_WRED_EN,</div><div class='add'>+			   mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int cpu_port, ret;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	cpu_port = qca8k_find_cpu_port(ds);</div><div class='add'>+	if (cpu_port &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "No cpu port configured in both cpu port0 and port6");</div><div class='add'>+		return cpu_port;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse CPU port config to be later used in phy_link mac_config */</div><div class='add'>+	ret = qca8k_parse_port_config(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_setup_mdio_bus(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_setup_of_pws_reg(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_setup_mac_pwr_sel(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_setup_led_ctrl(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	qca8k_setup_pcs(priv, &amp;priv-&gt;pcs_port_0, 0);</div><div class='add'>+	qca8k_setup_pcs(priv, &amp;priv-&gt;pcs_port_6, 6);</div><div class='add'>+</div><div class='add'>+	/* Make sure MAC06 is disabled */</div><div class='add'>+	ret = regmap_clear_bits(priv-&gt;regmap, QCA8K_REG_PORT0_PAD_CTRL,</div><div class='add'>+				QCA8K_PORT0_PAD_MAC06_EXCHANGE_EN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed disabling MAC06 exchange");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable CPU Port */</div><div class='add'>+	ret = regmap_set_bits(priv-&gt;regmap, QCA8K_REG_GLOBAL_FW_CTRL0,</div><div class='add'>+			      QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed enabling CPU port");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable MIB counters */</div><div class='add'>+	ret = qca8k_mib_init(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_warn(priv-&gt;dev, "mib init failed");</div><div class='add'>+</div><div class='add'>+	/* Initial setup of all ports */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		/* Disable forwarding by default on all ports */</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(dp-&gt;index),</div><div class='add'>+				QCA8K_PORT_LOOKUP_MEMBER, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable MAC by default on all user ports */</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds)</div><div class='add'>+		qca8k_port_set_status(priv, dp-&gt;index, 0);</div><div class='add'>+</div><div class='add'>+	/* Enable QCA header mode on all cpu ports */</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds) {</div><div class='add'>+		ret = qca8k_write(priv, QCA8K_REG_PORT_HDR_CTRL(dp-&gt;index),</div><div class='add'>+				  FIELD_PREP(QCA8K_PORT_HDR_CTRL_TX_MASK, QCA8K_PORT_HDR_CTRL_ALL) |</div><div class='add'>+				  FIELD_PREP(QCA8K_PORT_HDR_CTRL_RX_MASK, QCA8K_PORT_HDR_CTRL_ALL));</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "failed enabling QCA header mode on port %d", dp-&gt;index);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Forward all unknown frames to CPU port for Linux processing</div><div class='add'>+	 * Notice that in multi-cpu config only one port should be set</div><div class='add'>+	 * for igmp, unknown, multicast and broadcast packet</div><div class='add'>+	 */</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_REG_GLOBAL_FW_CTRL1,</div><div class='add'>+			  FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_MASK, BIT(cpu_port)) |</div><div class='add'>+			  FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_BC_DP_MASK, BIT(cpu_port)) |</div><div class='add'>+			  FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_MC_DP_MASK, BIT(cpu_port)) |</div><div class='add'>+			  FIELD_PREP(QCA8K_GLOBAL_FW_CTRL1_UC_DP_MASK, BIT(cpu_port)));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* CPU port gets connected to all user ports of the switch */</div><div class='add'>+	ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(cpu_port),</div><div class='add'>+			QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Setup connection between CPU port &amp; user ports</div><div class='add'>+	 * Individual user ports get connected to CPU port only</div><div class='add'>+	 */</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds) {</div><div class='add'>+		u8 port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+				QCA8K_PORT_LOOKUP_MEMBER,</div><div class='add'>+				BIT(cpu_port));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = regmap_clear_bits(priv-&gt;regmap, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+					QCA8K_PORT_LOOKUP_LEARN);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		/* For port based vlans to work we need to set the</div><div class='add'>+		 * default egress vid</div><div class='add'>+		 */</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_EGRESS_VLAN(port),</div><div class='add'>+				QCA8K_EGREES_VLAN_PORT_MASK(port),</div><div class='add'>+				QCA8K_EGREES_VLAN_PORT(port, QCA8K_PORT_VID_DEF));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(port),</div><div class='add'>+				  QCA8K_PORT_VLAN_CVID(QCA8K_PORT_VID_DEF) |</div><div class='add'>+				  QCA8K_PORT_VLAN_SVID(QCA8K_PORT_VID_DEF));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The port 5 of the qca8337 have some problem in flood condition. The</div><div class='add'>+	 * original legacy driver had some specific buffer and priority settings</div><div class='add'>+	 * for the different port suggested by the QCA switch team. Add this</div><div class='add'>+	 * missing settings to improve switch stability under load condition.</div><div class='add'>+	 * This problem is limited to qca8337 and other qca8k switch are not affected.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;switch_id == QCA8K_ID_QCA8337)</div><div class='add'>+		dsa_switch_for_each_available_port(dp, ds)</div><div class='add'>+			qca8k_setup_hol_fixup(priv, dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	/* Special GLOBAL_FC_THRESH value are needed for ar8327 switch */</div><div class='add'>+	if (priv-&gt;switch_id == QCA8K_ID_QCA8327) {</div><div class='add'>+		mask = QCA8K_GLOBAL_FC_GOL_XON_THRES(288) |</div><div class='add'>+		       QCA8K_GLOBAL_FC_GOL_XOFF_THRES(496);</div><div class='add'>+		qca8k_rmw(priv, QCA8K_REG_GLOBAL_FC_THRESH,</div><div class='add'>+			  QCA8K_GLOBAL_FC_GOL_XON_THRES_MASK |</div><div class='add'>+			  QCA8K_GLOBAL_FC_GOL_XOFF_THRES_MASK,</div><div class='add'>+			  mask);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup our port MTUs to match power on defaults */</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, ETH_FRAME_LEN + ETH_FCS_LEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_warn(priv-&gt;dev, "failed setting MTU settings");</div><div class='add'>+</div><div class='add'>+	/* Flush the FDB table */</div><div class='add'>+	qca8k_fdb_flush(priv);</div><div class='add'>+</div><div class='add'>+	/* Set min a max ageing value supported */</div><div class='add'>+	ds-&gt;ageing_time_min = 7000;</div><div class='add'>+	ds-&gt;ageing_time_max = 458745000;</div><div class='add'>+</div><div class='add'>+	/* Set max number of LAGs supported */</div><div class='add'>+	ds-&gt;num_lag_ids = QCA8K_NUM_LAGS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops qca8k_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs	= qca8k_phylink_mac_select_pcs,</div><div class='add'>+	.mac_config	= qca8k_phylink_mac_config,</div><div class='add'>+	.mac_link_down	= qca8k_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= qca8k_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops qca8k_switch_ops = {</div><div class='add'>+	.get_tag_protocol	= qca8k_get_tag_protocol,</div><div class='add'>+	.setup			= qca8k_setup,</div><div class='add'>+	.get_strings		= qca8k_get_strings,</div><div class='add'>+	.get_ethtool_stats	= qca8k_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= qca8k_get_sset_count,</div><div class='add'>+	.set_ageing_time	= qca8k_set_ageing_time,</div><div class='add'>+	.support_eee		= dsa_supports_eee,</div><div class='add'>+	.set_mac_eee		= qca8k_set_mac_eee,</div><div class='add'>+	.port_enable		= qca8k_port_enable,</div><div class='add'>+	.port_disable		= qca8k_port_disable,</div><div class='add'>+	.port_change_mtu	= qca8k_port_change_mtu,</div><div class='add'>+	.port_max_mtu		= qca8k_port_max_mtu,</div><div class='add'>+	.port_stp_state_set	= qca8k_port_stp_state_set,</div><div class='add'>+	.port_pre_bridge_flags	= qca8k_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= qca8k_port_bridge_flags,</div><div class='add'>+	.port_bridge_join	= qca8k_port_bridge_join,</div><div class='add'>+	.port_bridge_leave	= qca8k_port_bridge_leave,</div><div class='add'>+	.port_fast_age		= qca8k_port_fast_age,</div><div class='add'>+	.port_fdb_add		= qca8k_port_fdb_add,</div><div class='add'>+	.port_fdb_del		= qca8k_port_fdb_del,</div><div class='add'>+	.port_fdb_dump		= qca8k_port_fdb_dump,</div><div class='add'>+	.port_mdb_add		= qca8k_port_mdb_add,</div><div class='add'>+	.port_mdb_del		= qca8k_port_mdb_del,</div><div class='add'>+	.port_mirror_add	= qca8k_port_mirror_add,</div><div class='add'>+	.port_mirror_del	= qca8k_port_mirror_del,</div><div class='add'>+	.port_vlan_filtering	= qca8k_port_vlan_filtering,</div><div class='add'>+	.port_vlan_add		= qca8k_port_vlan_add,</div><div class='add'>+	.port_vlan_del		= qca8k_port_vlan_del,</div><div class='add'>+	.phylink_get_caps	= qca8k_phylink_get_caps,</div><div class='add'>+	.get_phy_flags		= qca8k_get_phy_flags,</div><div class='add'>+	.port_lag_join		= qca8k_port_lag_join,</div><div class='add'>+	.port_lag_leave		= qca8k_port_lag_leave,</div><div class='add'>+	.conduit_state_change	= qca8k_conduit_change,</div><div class='add'>+	.connect_tag_protocol	= qca8k_connect_tag_protocol,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_sw_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* allocate the private data struct so that we can probe the switches</div><div class='add'>+	 * ID register</div><div class='add'>+	 */</div><div class='add'>+	priv = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;bus = mdiodev-&gt;bus;</div><div class='add'>+	priv-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	priv-&gt;info = of_device_get_match_data(priv-&gt;dev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;reset_gpio = devm_gpiod_get_optional(priv-&gt;dev, "reset",</div><div class='add'>+						   GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset_gpio))</div><div class='add'>+		return PTR_ERR(priv-&gt;reset_gpio);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;reset_gpio) {</div><div class='add'>+		/* The active low duration must be greater than 10 ms</div><div class='add'>+		 * and checkpatch.pl wants 20 ms.</div><div class='add'>+		 */</div><div class='add'>+		msleep(20);</div><div class='add'>+		gpiod_set_value_cansleep(priv-&gt;reset_gpio, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start by setting up the register mapping */</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init(&amp;mdiodev-&gt;dev, NULL, priv,</div><div class='add'>+					&amp;qca8k_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap)) {</div><div class='add'>+		dev_err(priv-&gt;dev, "regmap initialization failed");</div><div class='add'>+		return PTR_ERR(priv-&gt;regmap);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio_cache.page = 0xffff;</div><div class='add'>+</div><div class='add'>+	/* Check the detected switch id */</div><div class='add'>+	ret = qca8k_read_switch_id(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ds = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*priv-&gt;ds), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;mgmt_eth_data.mutex);</div><div class='add'>+	init_completion(&amp;priv-&gt;mgmt_eth_data.rw_done);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;mib_eth_data.mutex);</div><div class='add'>+	init_completion(&amp;priv-&gt;mib_eth_data.rw_done);</div><div class='add'>+</div><div class='add'>+	priv-&gt;ds-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	priv-&gt;ds-&gt;num_ports = QCA8K_NUM_PORTS;</div><div class='add'>+	priv-&gt;ds-&gt;priv = priv;</div><div class='add'>+	priv-&gt;ds-&gt;ops = &amp;qca8k_switch_ops;</div><div class='add'>+	priv-&gt;ds-&gt;phylink_mac_ops = &amp;qca8k_phylink_mac_ops;</div><div class='add'>+	mutex_init(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, priv);</div><div class='add'>+</div><div class='add'>+	return dsa_register_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+qca8k_sw_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; QCA8K_NUM_PORTS; i++)</div><div class='add'>+		qca8k_port_set_status(priv, i, 0);</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_sw_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_PM_SLEEP</div><div class='add'>+static void</div><div class='add'>+qca8k_set_pm(struct qca8k_priv *priv, int enable)</div><div class='add'>+{</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; QCA8K_NUM_PORTS; port++) {</div><div class='add'>+		/* Do not enable on resume if the port was</div><div class='add'>+		 * disabled before.</div><div class='add'>+		 */</div><div class='add'>+		if (!(priv-&gt;port_enabled_map &amp; BIT(port)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		qca8k_port_set_status(priv, port, enable);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	qca8k_set_pm(priv, 0);</div><div class='add'>+</div><div class='add'>+	return dsa_switch_suspend(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	qca8k_set_pm(priv, 1);</div><div class='add'>+</div><div class='add'>+	return dsa_switch_resume(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_PM_SLEEP */</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,</div><div class='add'>+			 qca8k_suspend, qca8k_resume);</div><div class='add'>+</div><div class='add'>+static const struct qca8k_info_ops qca8xxx_ops = {</div><div class='add'>+	.autocast_mib = qca8k_get_ethtool_stats_eth,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qca8k_match_data qca8327 = {</div><div class='add'>+	.id = QCA8K_ID_QCA8327,</div><div class='add'>+	.reduced_package = true,</div><div class='add'>+	.mib_count = QCA8K_QCA832X_MIB_COUNT,</div><div class='add'>+	.ops = &amp;qca8xxx_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qca8k_match_data qca8328 = {</div><div class='add'>+	.id = QCA8K_ID_QCA8327,</div><div class='add'>+	.mib_count = QCA8K_QCA832X_MIB_COUNT,</div><div class='add'>+	.ops = &amp;qca8xxx_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct qca8k_match_data qca833x = {</div><div class='add'>+	.id = QCA8K_ID_QCA8337,</div><div class='add'>+	.mib_count = QCA8K_QCA833X_MIB_COUNT,</div><div class='add'>+	.ops = &amp;qca8xxx_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id qca8k_of_match[] = {</div><div class='add'>+	{ .compatible = "qca,qca8327", .data = &amp;qca8327 },</div><div class='add'>+	{ .compatible = "qca,qca8328", .data = &amp;qca8328 },</div><div class='add'>+	{ .compatible = "qca,qca8334", .data = &amp;qca833x },</div><div class='add'>+	{ .compatible = "qca,qca8337", .data = &amp;qca833x },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdio_driver qca8kmdio_driver = {</div><div class='add'>+	.probe  = qca8k_sw_probe,</div><div class='add'>+	.remove = qca8k_sw_remove,</div><div class='add'>+	.shutdown = qca8k_sw_shutdown,</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = "qca8k",</div><div class='add'>+		.of_match_table = qca8k_of_match,</div><div class='add'>+		.pm = &amp;qca8k_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(qca8kmdio_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Mathieu Olivari, John Crispin &lt;john@phrozen.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for QCA8K ethernet switch family");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_ALIAS("platform:qca8k");</div><div class='head'>diff --git a/drivers/net/dsa/qca/qca8k-common.c b/drivers/net/dsa/qca/qca8k-common.c<br/>new file mode 100644<br/>index 000000000000..13005f10edb7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/qca8k-common.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/qca8k-common.c</a></div><div class='hunk'>@@ -0,0 +1,1257 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2009 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ * Copyright (C) 2011-2012 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ * Copyright (c) 2015, 2019, The Linux Foundation. All rights reserved.</div><div class='add'>+ * Copyright (c) 2016 John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qca8k.h"</div><div class='add'>+</div><div class='add'>+#define MIB_DESC(_s, _o, _n)	\</div><div class='add'>+	{			\</div><div class='add'>+		.size = (_s),	\</div><div class='add'>+		.offset = (_o),	\</div><div class='add'>+		.name = (_n),	\</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+const struct qca8k_mib_desc ar8327_mib[] = {</div><div class='add'>+	MIB_DESC(1, 0x00, "RxBroad"),</div><div class='add'>+	MIB_DESC(1, 0x04, "RxPause"),</div><div class='add'>+	MIB_DESC(1, 0x08, "RxMulti"),</div><div class='add'>+	MIB_DESC(1, 0x0c, "RxFcsErr"),</div><div class='add'>+	MIB_DESC(1, 0x10, "RxAlignErr"),</div><div class='add'>+	MIB_DESC(1, 0x14, "RxRunt"),</div><div class='add'>+	MIB_DESC(1, 0x18, "RxFragment"),</div><div class='add'>+	MIB_DESC(1, 0x1c, "Rx64Byte"),</div><div class='add'>+	MIB_DESC(1, 0x20, "Rx128Byte"),</div><div class='add'>+	MIB_DESC(1, 0x24, "Rx256Byte"),</div><div class='add'>+	MIB_DESC(1, 0x28, "Rx512Byte"),</div><div class='add'>+	MIB_DESC(1, 0x2c, "Rx1024Byte"),</div><div class='add'>+	MIB_DESC(1, 0x30, "Rx1518Byte"),</div><div class='add'>+	MIB_DESC(1, 0x34, "RxMaxByte"),</div><div class='add'>+	MIB_DESC(1, 0x38, "RxTooLong"),</div><div class='add'>+	MIB_DESC(2, 0x3c, "RxGoodByte"),</div><div class='add'>+	MIB_DESC(2, 0x44, "RxBadByte"),</div><div class='add'>+	MIB_DESC(1, 0x4c, "RxOverFlow"),</div><div class='add'>+	MIB_DESC(1, 0x50, "Filtered"),</div><div class='add'>+	MIB_DESC(1, 0x54, "TxBroad"),</div><div class='add'>+	MIB_DESC(1, 0x58, "TxPause"),</div><div class='add'>+	MIB_DESC(1, 0x5c, "TxMulti"),</div><div class='add'>+	MIB_DESC(1, 0x60, "TxUnderRun"),</div><div class='add'>+	MIB_DESC(1, 0x64, "Tx64Byte"),</div><div class='add'>+	MIB_DESC(1, 0x68, "Tx128Byte"),</div><div class='add'>+	MIB_DESC(1, 0x6c, "Tx256Byte"),</div><div class='add'>+	MIB_DESC(1, 0x70, "Tx512Byte"),</div><div class='add'>+	MIB_DESC(1, 0x74, "Tx1024Byte"),</div><div class='add'>+	MIB_DESC(1, 0x78, "Tx1518Byte"),</div><div class='add'>+	MIB_DESC(1, 0x7c, "TxMaxByte"),</div><div class='add'>+	MIB_DESC(1, 0x80, "TxOverSize"),</div><div class='add'>+	MIB_DESC(2, 0x84, "TxByte"),</div><div class='add'>+	MIB_DESC(1, 0x8c, "TxCollision"),</div><div class='add'>+	MIB_DESC(1, 0x90, "TxAbortCol"),</div><div class='add'>+	MIB_DESC(1, 0x94, "TxMultiCol"),</div><div class='add'>+	MIB_DESC(1, 0x98, "TxSingleCol"),</div><div class='add'>+	MIB_DESC(1, 0x9c, "TxExcDefer"),</div><div class='add'>+	MIB_DESC(1, 0xa0, "TxDefer"),</div><div class='add'>+	MIB_DESC(1, 0xa4, "TxLateCol"),</div><div class='add'>+	MIB_DESC(1, 0xa8, "RXUnicast"),</div><div class='add'>+	MIB_DESC(1, 0xac, "TXUnicast"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int qca8k_read(struct qca8k_priv *priv, u32 reg, u32 *val)</div><div class='add'>+{</div><div class='add'>+	return regmap_read(priv-&gt;regmap, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_write(struct qca8k_priv *priv, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	return regmap_write(priv-&gt;regmap, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 write_val)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, reg, mask, write_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_range qca8k_readable_ranges[] = {</div><div class='add'>+	regmap_reg_range(0x0000, 0x00e4), /* Global control */</div><div class='add'>+	regmap_reg_range(0x0100, 0x0168), /* EEE control */</div><div class='add'>+	regmap_reg_range(0x0200, 0x0270), /* Parser control */</div><div class='add'>+	regmap_reg_range(0x0400, 0x0454), /* ACL */</div><div class='add'>+	regmap_reg_range(0x0600, 0x0718), /* Lookup */</div><div class='add'>+	regmap_reg_range(0x0800, 0x0b70), /* QM */</div><div class='add'>+	regmap_reg_range(0x0c00, 0x0c80), /* PKT */</div><div class='add'>+	regmap_reg_range(0x0e00, 0x0e98), /* L3 */</div><div class='add'>+	regmap_reg_range(0x1000, 0x10ac), /* MIB - Port0 */</div><div class='add'>+	regmap_reg_range(0x1100, 0x11ac), /* MIB - Port1 */</div><div class='add'>+	regmap_reg_range(0x1200, 0x12ac), /* MIB - Port2 */</div><div class='add'>+	regmap_reg_range(0x1300, 0x13ac), /* MIB - Port3 */</div><div class='add'>+	regmap_reg_range(0x1400, 0x14ac), /* MIB - Port4 */</div><div class='add'>+	regmap_reg_range(0x1500, 0x15ac), /* MIB - Port5 */</div><div class='add'>+	regmap_reg_range(0x1600, 0x16ac), /* MIB - Port6 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct regmap_access_table qca8k_readable_table = {</div><div class='add'>+	.yes_ranges = qca8k_readable_ranges,</div><div class='add'>+	.n_yes_ranges = ARRAY_SIZE(qca8k_readable_ranges),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(priv-&gt;regmap, reg, val, !(val &amp; mask), 0,</div><div class='add'>+				       QCA8K_BUSY_WAIT_TIMEOUT * USEC_PER_MSEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_read(struct qca8k_priv *priv, struct qca8k_fdb *fdb)</div><div class='add'>+{</div><div class='add'>+	u32 reg[QCA8K_ATU_TABLE_SIZE];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* load the ARL table into an array */</div><div class='add'>+	ret = regmap_bulk_read(priv-&gt;regmap, QCA8K_REG_ATU_DATA0, reg,</div><div class='add'>+			       QCA8K_ATU_TABLE_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* vid - 83:72 */</div><div class='add'>+	fdb-&gt;vid = FIELD_GET(QCA8K_ATU_VID_MASK, reg[2]);</div><div class='add'>+	/* aging - 67:64 */</div><div class='add'>+	fdb-&gt;aging = FIELD_GET(QCA8K_ATU_STATUS_MASK, reg[2]);</div><div class='add'>+	/* portmask - 54:48 */</div><div class='add'>+	fdb-&gt;port_mask = FIELD_GET(QCA8K_ATU_PORT_MASK, reg[1]);</div><div class='add'>+	/* mac - 47:0 */</div><div class='add'>+	fdb-&gt;mac[0] = FIELD_GET(QCA8K_ATU_ADDR0_MASK, reg[1]);</div><div class='add'>+	fdb-&gt;mac[1] = FIELD_GET(QCA8K_ATU_ADDR1_MASK, reg[1]);</div><div class='add'>+	fdb-&gt;mac[2] = FIELD_GET(QCA8K_ATU_ADDR2_MASK, reg[0]);</div><div class='add'>+	fdb-&gt;mac[3] = FIELD_GET(QCA8K_ATU_ADDR3_MASK, reg[0]);</div><div class='add'>+	fdb-&gt;mac[4] = FIELD_GET(QCA8K_ATU_ADDR4_MASK, reg[0]);</div><div class='add'>+	fdb-&gt;mac[5] = FIELD_GET(QCA8K_ATU_ADDR5_MASK, reg[0]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void qca8k_fdb_write(struct qca8k_priv *priv, u16 vid, u8 port_mask,</div><div class='add'>+			    const u8 *mac, u8 aging)</div><div class='add'>+{</div><div class='add'>+	u32 reg[QCA8K_ATU_TABLE_SIZE] = { 0 };</div><div class='add'>+</div><div class='add'>+	/* vid - 83:72 */</div><div class='add'>+	reg[2] = FIELD_PREP(QCA8K_ATU_VID_MASK, vid);</div><div class='add'>+	/* aging - 67:64 */</div><div class='add'>+	reg[2] |= FIELD_PREP(QCA8K_ATU_STATUS_MASK, aging);</div><div class='add'>+	/* portmask - 54:48 */</div><div class='add'>+	reg[1] = FIELD_PREP(QCA8K_ATU_PORT_MASK, port_mask);</div><div class='add'>+	/* mac - 47:0 */</div><div class='add'>+	reg[1] |= FIELD_PREP(QCA8K_ATU_ADDR0_MASK, mac[0]);</div><div class='add'>+	reg[1] |= FIELD_PREP(QCA8K_ATU_ADDR1_MASK, mac[1]);</div><div class='add'>+	reg[0] |= FIELD_PREP(QCA8K_ATU_ADDR2_MASK, mac[2]);</div><div class='add'>+	reg[0] |= FIELD_PREP(QCA8K_ATU_ADDR3_MASK, mac[3]);</div><div class='add'>+	reg[0] |= FIELD_PREP(QCA8K_ATU_ADDR4_MASK, mac[4]);</div><div class='add'>+	reg[0] |= FIELD_PREP(QCA8K_ATU_ADDR5_MASK, mac[5]);</div><div class='add'>+</div><div class='add'>+	/* load the array into the ARL table */</div><div class='add'>+	regmap_bulk_write(priv-&gt;regmap, QCA8K_REG_ATU_DATA0, reg,</div><div class='add'>+			  QCA8K_ATU_TABLE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_access(struct qca8k_priv *priv, enum qca8k_fdb_cmd cmd,</div><div class='add'>+			    int port)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Set the command and FDB index */</div><div class='add'>+	reg = QCA8K_ATU_FUNC_BUSY;</div><div class='add'>+	reg |= cmd;</div><div class='add'>+	if (port &gt;= 0) {</div><div class='add'>+		reg |= QCA8K_ATU_FUNC_PORT_EN;</div><div class='add'>+		reg |= FIELD_PREP(QCA8K_ATU_FUNC_PORT_MASK, port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Write the function register triggering the table access */</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_REG_ATU_FUNC, reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* wait for completion */</div><div class='add'>+	ret = qca8k_busy_wait(priv, QCA8K_REG_ATU_FUNC, QCA8K_ATU_FUNC_BUSY);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check for table full violation when adding an entry */</div><div class='add'>+	if (cmd == QCA8K_FDB_LOAD) {</div><div class='add'>+		ret = qca8k_read(priv, QCA8K_REG_ATU_FUNC, &amp;reg);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (reg &amp; QCA8K_ATU_FUNC_FULL)</div><div class='add'>+			return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_next(struct qca8k_priv *priv, struct qca8k_fdb *fdb,</div><div class='add'>+			  int port)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qca8k_fdb_write(priv, fdb-&gt;vid, fdb-&gt;port_mask, fdb-&gt;mac, fdb-&gt;aging);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_NEXT, port);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return qca8k_fdb_read(priv, fdb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_add(struct qca8k_priv *priv, const u8 *mac,</div><div class='add'>+			 u16 port_mask, u16 vid, u8 aging)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	qca8k_fdb_write(priv, vid, port_mask, mac, aging);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_LOAD, -1);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_del(struct qca8k_priv *priv, const u8 *mac,</div><div class='add'>+			 u16 port_mask, u16 vid)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	qca8k_fdb_write(priv, vid, port_mask, mac, 0);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_PURGE, -1);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_fdb_flush(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	qca8k_fdb_access(priv, QCA8K_FDB_FLUSH, -1);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_search_and_insert(struct qca8k_priv *priv, u8 port_mask,</div><div class='add'>+				       const u8 *mac, u16 vid, u8 aging)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_fdb fdb = { 0 };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	qca8k_fdb_write(priv, vid, 0, mac, 0);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_SEARCH, -1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_fdb_read(priv, &amp;fdb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Rule exist. Delete first */</div><div class='add'>+	if (fdb.aging) {</div><div class='add'>+		ret = qca8k_fdb_access(priv, QCA8K_FDB_PURGE, -1);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto exit;</div><div class='add'>+	} else {</div><div class='add'>+		fdb.aging = aging;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add port to fdb portmask */</div><div class='add'>+	fdb.port_mask |= port_mask;</div><div class='add'>+</div><div class='add'>+	qca8k_fdb_write(priv, vid, fdb.port_mask, mac, fdb.aging);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_LOAD, -1);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_fdb_search_and_del(struct qca8k_priv *priv, u8 port_mask,</div><div class='add'>+				    const u8 *mac, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_fdb fdb = { 0 };</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	qca8k_fdb_write(priv, vid, 0, mac, 0);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_SEARCH, -1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_fdb_read(priv, &amp;fdb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Rule doesn't exist. Why delete? */</div><div class='add'>+	if (!fdb.aging) {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_PURGE, -1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Only port in the rule is this port. Don't re insert */</div><div class='add'>+	if (fdb.port_mask == port_mask)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	/* Remove port from port mask */</div><div class='add'>+	fdb.port_mask &amp;= ~port_mask;</div><div class='add'>+</div><div class='add'>+	qca8k_fdb_write(priv, vid, fdb.port_mask, mac, fdb.aging);</div><div class='add'>+	ret = qca8k_fdb_access(priv, QCA8K_FDB_LOAD, -1);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_vlan_access(struct qca8k_priv *priv,</div><div class='add'>+			     enum qca8k_vlan_cmd cmd, u16 vid)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Set the command and VLAN index */</div><div class='add'>+	reg = QCA8K_VTU_FUNC1_BUSY;</div><div class='add'>+	reg |= cmd;</div><div class='add'>+	reg |= FIELD_PREP(QCA8K_VTU_FUNC1_VID_MASK, vid);</div><div class='add'>+</div><div class='add'>+	/* Write the function register triggering the table access */</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_REG_VTU_FUNC1, reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* wait for completion */</div><div class='add'>+	ret = qca8k_busy_wait(priv, QCA8K_REG_VTU_FUNC1, QCA8K_VTU_FUNC1_BUSY);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Check for table full violation when adding an entry */</div><div class='add'>+	if (cmd == QCA8K_VLAN_LOAD) {</div><div class='add'>+		ret = qca8k_read(priv, QCA8K_REG_VTU_FUNC1, &amp;reg);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (reg &amp; QCA8K_VTU_FUNC1_FULL)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_vlan_add(struct qca8k_priv *priv, u8 port, u16 vid,</div><div class='add'>+			  bool untagged)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We do the right thing with VLAN 0 and treat it as untagged while</div><div class='add'>+	 * preserving the tag on egress.</div><div class='add'>+	 */</div><div class='add'>+	if (vid == 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	ret = qca8k_vlan_access(priv, QCA8K_VLAN_READ, vid);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_read(priv, QCA8K_REG_VTU_FUNC0, &amp;reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	reg |= QCA8K_VTU_FUNC0_VALID | QCA8K_VTU_FUNC0_IVL_EN;</div><div class='add'>+	reg &amp;= ~QCA8K_VTU_FUNC0_EG_MODE_PORT_MASK(port);</div><div class='add'>+	if (untagged)</div><div class='add'>+		reg |= QCA8K_VTU_FUNC0_EG_MODE_PORT_UNTAG(port);</div><div class='add'>+	else</div><div class='add'>+		reg |= QCA8K_VTU_FUNC0_EG_MODE_PORT_TAG(port);</div><div class='add'>+</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_REG_VTU_FUNC0, reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = qca8k_vlan_access(priv, QCA8K_VLAN_LOAD, vid);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_vlan_del(struct qca8k_priv *priv, u8 port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	u32 reg, mask;</div><div class='add'>+	int ret, i;</div><div class='add'>+	bool del;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	ret = qca8k_vlan_access(priv, QCA8K_VLAN_READ, vid);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_read(priv, QCA8K_REG_VTU_FUNC0, &amp;reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	reg &amp;= ~QCA8K_VTU_FUNC0_EG_MODE_PORT_MASK(port);</div><div class='add'>+	reg |= QCA8K_VTU_FUNC0_EG_MODE_PORT_NOT(port);</div><div class='add'>+</div><div class='add'>+	/* Check if we're the last member to be removed */</div><div class='add'>+	del = true;</div><div class='add'>+	for (i = 0; i &lt; QCA8K_NUM_PORTS; i++) {</div><div class='add'>+		mask = QCA8K_VTU_FUNC0_EG_MODE_PORT_NOT(i);</div><div class='add'>+</div><div class='add'>+		if ((reg &amp; mask) != mask) {</div><div class='add'>+			del = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (del) {</div><div class='add'>+		ret = qca8k_vlan_access(priv, QCA8K_VLAN_PURGE, vid);</div><div class='add'>+	} else {</div><div class='add'>+		ret = qca8k_write(priv, QCA8K_REG_VTU_FUNC0, reg);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+		ret = qca8k_vlan_access(priv, QCA8K_VLAN_LOAD, vid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_mib_init(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap, QCA8K_REG_MIB,</div><div class='add'>+				 QCA8K_MIB_FUNC | QCA8K_MIB_BUSY,</div><div class='add'>+				 FIELD_PREP(QCA8K_MIB_FUNC, QCA8K_MIB_FLUSH) |</div><div class='add'>+				 QCA8K_MIB_BUSY);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_busy_wait(priv, QCA8K_REG_MIB, QCA8K_MIB_BUSY);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = regmap_set_bits(priv-&gt;regmap, QCA8K_REG_MIB, QCA8K_MIB_CPU_KEEP);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_REG_MODULE_EN, QCA8K_MODULE_EN_MIB);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)</div><div class='add'>+{</div><div class='add'>+	u32 mask = QCA8K_PORT_STATUS_TXMAC | QCA8K_PORT_STATUS_RXMAC;</div><div class='add'>+</div><div class='add'>+	/* Port 0 and 6 have no internal PHY */</div><div class='add'>+	if (port &gt; 0 &amp;&amp; port &lt; 6)</div><div class='add'>+		mask |= QCA8K_PORT_STATUS_LINK_AUTO;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		regmap_set_bits(priv-&gt;regmap, QCA8K_REG_PORT_STATUS(port), mask);</div><div class='add'>+	else</div><div class='add'>+		regmap_clear_bits(priv-&gt;regmap, QCA8K_REG_PORT_STATUS(port), mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+		       uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;mib_count; i++)</div><div class='add'>+		ethtool_puts(&amp;data, ar8327_mib[i].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			     uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	const struct qca8k_mib_desc *mib;</div><div class='add'>+	u32 reg, i, val;</div><div class='add'>+	u32 hi = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mgmt_conduit &amp;&amp; priv-&gt;info-&gt;ops-&gt;autocast_mib &amp;&amp;</div><div class='add'>+	    priv-&gt;info-&gt;ops-&gt;autocast_mib(ds, port, data) &gt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;mib_count; i++) {</div><div class='add'>+		mib = &amp;ar8327_mib[i];</div><div class='add'>+		reg = QCA8K_PORT_MIB_COUNTER(port) + mib-&gt;offset;</div><div class='add'>+</div><div class='add'>+		ret = qca8k_read(priv, reg, &amp;val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (mib-&gt;size == 2) {</div><div class='add'>+			ret = qca8k_read(priv, reg + 4, &amp;hi);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		data[i] = val;</div><div class='add'>+		if (mib-&gt;size == 2)</div><div class='add'>+			data[i] |= (u64)hi &lt;&lt; 32;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;mib_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_set_mac_eee(struct dsa_switch *ds, int port,</div><div class='add'>+		      struct ethtool_keee *eee)</div><div class='add'>+{</div><div class='add'>+	u32 lpi_en = QCA8K_REG_EEE_CTRL_LPI_EN(port);</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	ret = qca8k_read(priv, QCA8K_REG_EEE_CTRL, &amp;reg);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	if (eee-&gt;eee_enabled)</div><div class='add'>+		reg |= lpi_en;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~lpi_en;</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_REG_EEE_CTRL, reg);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_port_configure_learning(struct dsa_switch *ds, int port,</div><div class='add'>+					 bool learning)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (learning)</div><div class='add'>+		return regmap_set_bits(priv-&gt;regmap,</div><div class='add'>+				       QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+				       QCA8K_PORT_LOOKUP_LEARN);</div><div class='add'>+	else</div><div class='add'>+		return regmap_clear_bits(priv-&gt;regmap,</div><div class='add'>+					 QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+					 QCA8K_PORT_LOOKUP_LEARN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	bool learning = false;</div><div class='add'>+	u32 stp_state;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		stp_state = QCA8K_PORT_LOOKUP_STATE_DISABLED;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		stp_state = QCA8K_PORT_LOOKUP_STATE_BLOCKING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		stp_state = QCA8K_PORT_LOOKUP_STATE_LISTENING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		stp_state = QCA8K_PORT_LOOKUP_STATE_LEARNING;</div><div class='add'>+		learning = dp-&gt;learning;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		learning = dp-&gt;learning;</div><div class='add'>+		fallthrough;</div><div class='add'>+	default:</div><div class='add'>+		stp_state = QCA8K_PORT_LOOKUP_STATE_FORWARD;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+		  QCA8K_PORT_LOOKUP_STATE_MASK, stp_state);</div><div class='add'>+</div><div class='add'>+	qca8k_port_configure_learning(ds, port, learning);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_update_port_member(struct qca8k_priv *priv, int port,</div><div class='add'>+				    const struct net_device *bridge_dev,</div><div class='add'>+				    bool join)</div><div class='add'>+{</div><div class='add'>+	bool isolated = !!(priv-&gt;port_isolated_map &amp; BIT(port)), other_isolated;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(priv-&gt;ds, port), *other_dp;</div><div class='add'>+	u32 port_mask = BIT(dp-&gt;cpu_dp-&gt;index);</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; QCA8K_NUM_PORTS; i++) {</div><div class='add'>+		if (i == port)</div><div class='add'>+			continue;</div><div class='add'>+		if (dsa_is_cpu_port(priv-&gt;ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		other_dp = dsa_to_port(priv-&gt;ds, i);</div><div class='add'>+		if (!dsa_port_offloads_bridge_dev(other_dp, bridge_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		other_isolated = !!(priv-&gt;port_isolated_map &amp; BIT(i));</div><div class='add'>+</div><div class='add'>+		/* Add/remove this port to/from the portvlan mask of the other</div><div class='add'>+		 * ports in the bridge</div><div class='add'>+		 */</div><div class='add'>+		if (join &amp;&amp; !(isolated &amp;&amp; other_isolated)) {</div><div class='add'>+			port_mask |= BIT(i);</div><div class='add'>+			ret = regmap_set_bits(priv-&gt;regmap,</div><div class='add'>+					      QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='add'>+					      BIT(port));</div><div class='add'>+		} else {</div><div class='add'>+			ret = regmap_clear_bits(priv-&gt;regmap,</div><div class='add'>+						QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='add'>+						BIT(port));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add/remove all other ports to/from this port's portvlan mask */</div><div class='add'>+	ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+			QCA8K_PORT_LOOKUP_MEMBER, port_mask);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				struct switchdev_brport_flags flags,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_ISOLATED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct switchdev_brport_flags flags,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		ret = qca8k_port_configure_learning(ds, port,</div><div class='add'>+						    flags.val &amp; BR_LEARNING);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_ISOLATED) {</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		struct net_device *bridge_dev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+</div><div class='add'>+		if (flags.val &amp; BR_ISOLATED)</div><div class='add'>+			priv-&gt;port_isolated_map |= BIT(port);</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;port_isolated_map &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+		ret = qca8k_update_port_member(priv, port, bridge_dev, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_bridge bridge,</div><div class='add'>+			   bool *tx_fwd_offload,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return qca8k_update_port_member(priv, port, bridge.dev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = qca8k_update_port_member(priv, port, bridge.dev, false);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"Failed to update switch config for bridge leave: %d\n",</div><div class='add'>+			err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	qca8k_fdb_access(priv, QCA8K_FDB_FLUSH_PORT, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int secs = msecs / 1000;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* AGE_TIME reg is set in 7s step */</div><div class='add'>+	val = secs / 7;</div><div class='add'>+</div><div class='add'>+	/* Handle case with 0 as val to NOT disable</div><div class='add'>+	 * learning</div><div class='add'>+	 */</div><div class='add'>+	if (!val)</div><div class='add'>+		val = 1;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, QCA8K_REG_ATU_CTRL,</div><div class='add'>+				  QCA8K_ATU_AGE_TIME_MASK,</div><div class='add'>+				  QCA8K_ATU_AGE_TIME(val));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+		      struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	qca8k_port_set_status(priv, port, 1);</div><div class='add'>+	priv-&gt;port_enabled_map |= BIT(port);</div><div class='add'>+</div><div class='add'>+	if (dsa_is_user_port(ds, port))</div><div class='add'>+		phy_support_asym_pause(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	qca8k_port_set_status(priv, port, 0);</div><div class='add'>+	priv-&gt;port_enabled_map &amp;= ~BIT(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* We have only have a general MTU setting.</div><div class='add'>+	 * DSA always set the CPU port's MTU to the largest MTU of the user</div><div class='add'>+	 * ports.</div><div class='add'>+	 * Setting MTU just for the CPU port is sufficient to correctly set a</div><div class='add'>+	 * value for every port.</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* To change the MAX_FRAME_SIZE the cpu ports must be off or</div><div class='add'>+	 * the switch panics.</div><div class='add'>+	 * Turn off both cpu ports before applying the new value to prevent</div><div class='add'>+	 * this.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;port_enabled_map &amp; BIT(0))</div><div class='add'>+		qca8k_port_set_status(priv, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;port_enabled_map &amp; BIT(6))</div><div class='add'>+		qca8k_port_set_status(priv, 6, 0);</div><div class='add'>+</div><div class='add'>+	/* Include L2 header / FCS length */</div><div class='add'>+	ret = qca8k_write(priv, QCA8K_MAX_FRAME_SIZE, new_mtu +</div><div class='add'>+			  ETH_HLEN + ETH_FCS_LEN);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;port_enabled_map &amp; BIT(0))</div><div class='add'>+		qca8k_port_set_status(priv, 0, 1);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;port_enabled_map &amp; BIT(6))</div><div class='add'>+		qca8k_port_set_status(priv, 6, 1);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return QCA8K_MAX_MTU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_fdb_insert(struct qca8k_priv *priv, const u8 *addr,</div><div class='add'>+			  u16 port_mask, u16 vid)</div><div class='add'>+{</div><div class='add'>+	/* Set the vid to the port vlan id if no vid is set */</div><div class='add'>+	if (!vid)</div><div class='add'>+		vid = QCA8K_PORT_VID_DEF;</div><div class='add'>+</div><div class='add'>+	return qca8k_fdb_add(priv, addr, port_mask, vid,</div><div class='add'>+			     QCA8K_ATU_STATUS_STATIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		       const unsigned char *addr, u16 vid,</div><div class='add'>+		       struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	u16 port_mask = BIT(port);</div><div class='add'>+</div><div class='add'>+	return qca8k_port_fdb_insert(priv, addr, port_mask, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		       const unsigned char *addr, u16 vid,</div><div class='add'>+		       struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	u16 port_mask = BIT(port);</div><div class='add'>+</div><div class='add'>+	if (!vid)</div><div class='add'>+		vid = QCA8K_PORT_VID_DEF;</div><div class='add'>+</div><div class='add'>+	return qca8k_fdb_del(priv, addr, port_mask, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct qca8k_fdb _fdb = { 0 };</div><div class='add'>+	int cnt = QCA8K_NUM_FDB_RECORDS;</div><div class='add'>+	bool is_static;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+	while (cnt-- &amp;&amp; !qca8k_fdb_next(priv, &amp;_fdb, port)) {</div><div class='add'>+		if (!_fdb.aging)</div><div class='add'>+			break;</div><div class='add'>+		is_static = (_fdb.aging == QCA8K_ATU_STATUS_STATIC);</div><div class='add'>+		ret = cb(_fdb.mac, _fdb.vid, is_static, data);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		       struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	const u8 *addr = mdb-&gt;addr;</div><div class='add'>+	u16 vid = mdb-&gt;vid;</div><div class='add'>+</div><div class='add'>+	if (!vid)</div><div class='add'>+		vid = QCA8K_PORT_VID_DEF;</div><div class='add'>+</div><div class='add'>+	return qca8k_fdb_search_and_insert(priv, BIT(port), addr, vid,</div><div class='add'>+					   QCA8K_ATU_STATUS_STATIC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		       struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	const u8 *addr = mdb-&gt;addr;</div><div class='add'>+	u16 vid = mdb-&gt;vid;</div><div class='add'>+</div><div class='add'>+	if (!vid)</div><div class='add'>+		vid = QCA8K_PORT_VID_DEF;</div><div class='add'>+</div><div class='add'>+	return qca8k_fdb_search_and_del(priv, BIT(port), addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			  bool ingress, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int monitor_port, ret;</div><div class='add'>+	u32 reg, val;</div><div class='add'>+</div><div class='add'>+	/* Check for existent entry */</div><div class='add'>+	if ((ingress ? priv-&gt;mirror_rx : priv-&gt;mirror_tx) &amp; BIT(port))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, QCA8K_REG_GLOBAL_FW_CTRL0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* QCA83xx can have only one port set to mirror mode.</div><div class='add'>+	 * Check that the correct port is requested and return error otherwise.</div><div class='add'>+	 * When no mirror port is set, the values is set to 0xF</div><div class='add'>+	 */</div><div class='add'>+	monitor_port = FIELD_GET(QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, val);</div><div class='add'>+	if (monitor_port != 0xF &amp;&amp; monitor_port != mirror-&gt;to_local_port)</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	/* Set the monitor port */</div><div class='add'>+	val = FIELD_PREP(QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM,</div><div class='add'>+			 mirror-&gt;to_local_port);</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap, QCA8K_REG_GLOBAL_FW_CTRL0,</div><div class='add'>+				 QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ingress) {</div><div class='add'>+		reg = QCA8K_PORT_LOOKUP_CTRL(port);</div><div class='add'>+		val = QCA8K_PORT_LOOKUP_ING_MIRROR_EN;</div><div class='add'>+	} else {</div><div class='add'>+		reg = QCA8K_REG_PORT_HOL_CTRL1(port);</div><div class='add'>+		val = QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap, reg, val, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Track mirror port for tx and rx to decide when the</div><div class='add'>+	 * mirror port has to be disabled.</div><div class='add'>+	 */</div><div class='add'>+	if (ingress)</div><div class='add'>+		priv-&gt;mirror_rx |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mirror_tx |= BIT(port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void qca8k_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 reg, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mirror-&gt;ingress) {</div><div class='add'>+		reg = QCA8K_PORT_LOOKUP_CTRL(port);</div><div class='add'>+		val = QCA8K_PORT_LOOKUP_ING_MIRROR_EN;</div><div class='add'>+	} else {</div><div class='add'>+		reg = QCA8K_REG_PORT_HOL_CTRL1(port);</div><div class='add'>+		val = QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_clear_bits(priv-&gt;regmap, reg, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	if (mirror-&gt;ingress)</div><div class='add'>+		priv-&gt;mirror_rx &amp;= ~BIT(port);</div><div class='add'>+	else</div><div class='add'>+		priv-&gt;mirror_tx &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	/* No port set to send packet to mirror port. Disable mirror port */</div><div class='add'>+	if (!priv-&gt;mirror_rx &amp;&amp; !priv-&gt;mirror_tx) {</div><div class='add'>+		val = FIELD_PREP(QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, 0xF);</div><div class='add'>+		ret = regmap_update_bits(priv-&gt;regmap, QCA8K_REG_GLOBAL_FW_CTRL0,</div><div class='add'>+					 QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM, val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+err:</div><div class='add'>+	dev_err(priv-&gt;dev, "Failed to del mirror port from %d", port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+			      bool vlan_filtering,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+				QCA8K_PORT_LOOKUP_VLAN_MODE_MASK,</div><div class='add'>+				QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE);</div><div class='add'>+	} else {</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='add'>+				QCA8K_PORT_LOOKUP_VLAN_MODE_MASK,</div><div class='add'>+				QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_vlan_add(priv, port, vlan-&gt;vid, untagged);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to add VLAN to port %d (%d)", port, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pvid) {</div><div class='add'>+		ret = qca8k_rmw(priv, QCA8K_EGRESS_VLAN(port),</div><div class='add'>+				QCA8K_EGREES_VLAN_PORT_MASK(port),</div><div class='add'>+				QCA8K_EGREES_VLAN_PORT(port, vlan-&gt;vid));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(port),</div><div class='add'>+				  QCA8K_PORT_VLAN_CVID(vlan-&gt;vid) |</div><div class='add'>+				  QCA8K_PORT_VLAN_SVID(vlan-&gt;vid));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_vlan_del(priv, port, vlan-&gt;vid);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "Failed to delete VLAN from port %d (%d)", port, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool qca8k_lag_can_offload(struct dsa_switch *ds,</div><div class='add'>+				  struct dsa_lag lag,</div><div class='add'>+				  struct netdev_lag_upper_info *info,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int members = 0;</div><div class='add'>+</div><div class='add'>+	if (!lag.id)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	dsa_lag_foreach_port(dp, ds-&gt;dst, &amp;lag)</div><div class='add'>+		/* Includes the port joining the LAG */</div><div class='add'>+		members++;</div><div class='add'>+</div><div class='add'>+	if (members &gt; QCA8K_NUM_PORTS_FOR_LAG) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cannot offload more than 4 LAG ports");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;tx_type != NETDEV_LAG_TX_TYPE_HASH) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only offload LAG using hash TX type");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (info-&gt;hash_type != NETDEV_LAG_HASH_L2 &amp;&amp;</div><div class='add'>+	    info-&gt;hash_type != NETDEV_LAG_HASH_L23) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only offload L2 or L2+L3 TX hash");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_lag_setup_hash(struct dsa_switch *ds,</div><div class='add'>+				struct dsa_lag lag,</div><div class='add'>+				struct netdev_lag_upper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device *lag_dev = lag.dev;</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	bool unique_lag = true;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u32 hash = 0;</div><div class='add'>+</div><div class='add'>+	switch (info-&gt;hash_type) {</div><div class='add'>+	case NETDEV_LAG_HASH_L23:</div><div class='add'>+		hash |= QCA8K_TRUNK_HASH_SIP_EN;</div><div class='add'>+		hash |= QCA8K_TRUNK_HASH_DIP_EN;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case NETDEV_LAG_HASH_L2:</div><div class='add'>+		hash |= QCA8K_TRUNK_HASH_SA_EN;</div><div class='add'>+		hash |= QCA8K_TRUNK_HASH_DA_EN;</div><div class='add'>+		break;</div><div class='add'>+	default: /* We should NEVER reach this */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if we are the unique configured LAG */</div><div class='add'>+	dsa_lags_foreach_id(i, ds-&gt;dst)</div><div class='add'>+		if (i != lag.id &amp;&amp; dsa_lag_by_id(ds-&gt;dst, i)) {</div><div class='add'>+			unique_lag = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	/* Hash Mode is global. Make sure the same Hash Mode</div><div class='add'>+	 * is set to all the 4 possible lag.</div><div class='add'>+	 * If we are the unique LAG we can set whatever hash</div><div class='add'>+	 * mode we want.</div><div class='add'>+	 * To change hash mode it's needed to remove all LAG</div><div class='add'>+	 * and change the mode with the latest.</div><div class='add'>+	 */</div><div class='add'>+	if (unique_lag) {</div><div class='add'>+		priv-&gt;lag_hash_mode = hash;</div><div class='add'>+	} else if (priv-&gt;lag_hash_mode != hash) {</div><div class='add'>+		netdev_err(lag_dev, "Error: Mismatched Hash Mode across different lag is not supported\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, QCA8K_TRUNK_HASH_EN_CTRL,</div><div class='add'>+				  QCA8K_TRUNK_HASH_MASK, hash);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int qca8k_lag_refresh_portmap(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct dsa_lag lag, bool delete)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret, id, i;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* DSA LAG IDs are one-based, hardware is zero-based */</div><div class='add'>+	id = lag.id - 1;</div><div class='add'>+</div><div class='add'>+	/* Read current port member */</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, QCA8K_REG_GOL_TRUNK_CTRL0, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Shift val to the correct trunk */</div><div class='add'>+	val &gt;&gt;= QCA8K_REG_GOL_TRUNK_SHIFT(id);</div><div class='add'>+	val &amp;= QCA8K_REG_GOL_TRUNK_MEMBER_MASK;</div><div class='add'>+	if (delete)</div><div class='add'>+		val &amp;= ~BIT(port);</div><div class='add'>+	else</div><div class='add'>+		val |= BIT(port);</div><div class='add'>+</div><div class='add'>+	/* Update port member. With empty portmap disable trunk */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;regmap, QCA8K_REG_GOL_TRUNK_CTRL0,</div><div class='add'>+				 QCA8K_REG_GOL_TRUNK_MEMBER(id) |</div><div class='add'>+				 QCA8K_REG_GOL_TRUNK_EN(id),</div><div class='add'>+				 !val &lt;&lt; QCA8K_REG_GOL_TRUNK_SHIFT(id) |</div><div class='add'>+				 val &lt;&lt; QCA8K_REG_GOL_TRUNK_SHIFT(id));</div><div class='add'>+</div><div class='add'>+	/* Search empty member if adding or port on deleting */</div><div class='add'>+	for (i = 0; i &lt; QCA8K_NUM_PORTS_FOR_LAG; i++) {</div><div class='add'>+		ret = regmap_read(priv-&gt;regmap, QCA8K_REG_GOL_TRUNK_CTRL(id), &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val &gt;&gt;= QCA8K_REG_GOL_TRUNK_ID_MEM_ID_SHIFT(id, i);</div><div class='add'>+		val &amp;= QCA8K_REG_GOL_TRUNK_ID_MEM_ID_MASK;</div><div class='add'>+</div><div class='add'>+		if (delete) {</div><div class='add'>+			/* If port flagged to be disabled assume this member is</div><div class='add'>+			 * empty</div><div class='add'>+			 */</div><div class='add'>+			if (val != QCA8K_REG_GOL_TRUNK_ID_MEM_ID_EN_MASK)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			val &amp;= QCA8K_REG_GOL_TRUNK_ID_MEM_ID_PORT_MASK;</div><div class='add'>+			if (val != port)</div><div class='add'>+				continue;</div><div class='add'>+		} else {</div><div class='add'>+			/* If port flagged to be enabled assume this member is</div><div class='add'>+			 * already set</div><div class='add'>+			 */</div><div class='add'>+			if (val == QCA8K_REG_GOL_TRUNK_ID_MEM_ID_EN_MASK)</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* We have found the member to add/remove */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set port in the correct port mask or disable port if in delete mode */</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, QCA8K_REG_GOL_TRUNK_CTRL(id),</div><div class='add'>+				  QCA8K_REG_GOL_TRUNK_ID_MEM_ID_EN(id, i) |</div><div class='add'>+				  QCA8K_REG_GOL_TRUNK_ID_MEM_ID_PORT(id, i),</div><div class='add'>+				  !delete &lt;&lt; QCA8K_REG_GOL_TRUNK_ID_MEM_ID_SHIFT(id, i) |</div><div class='add'>+				  port &lt;&lt; QCA8K_REG_GOL_TRUNK_ID_MEM_ID_SHIFT(id, i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_lag_join(struct dsa_switch *ds, int port, struct dsa_lag lag,</div><div class='add'>+			struct netdev_lag_upper_info *info,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!qca8k_lag_can_offload(ds, lag, info, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_lag_setup_hash(ds, lag, info);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return qca8k_lag_refresh_portmap(ds, port, lag, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_port_lag_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct dsa_lag lag)</div><div class='add'>+{</div><div class='add'>+	return qca8k_lag_refresh_portmap(ds, port, lag, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int qca8k_read_switch_id(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u8 id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;info)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_read(priv, QCA8K_REG_MASK_CTRL, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	id = QCA8K_MASK_CTRL_DEVICE_ID(val);</div><div class='add'>+	if (id != priv-&gt;info-&gt;id) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"Switch id detected %x but expected %x",</div><div class='add'>+			id, priv-&gt;info-&gt;id);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;switch_id = id;</div><div class='add'>+</div><div class='add'>+	/* Save revision to communicate to the internal PHY driver */</div><div class='add'>+	priv-&gt;switch_revision = QCA8K_MASK_CTRL_REV_ID(val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/qca/qca8k-leds.c b/drivers/net/dsa/qca/qca8k-leds.c<br/>new file mode 100644<br/>index 000000000000..43ac68052baf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/qca8k-leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/qca8k-leds.c</a></div><div class='hunk'>@@ -0,0 +1,487 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "qca8k.h"</div><div class='add'>+#include "qca8k_leds.h"</div><div class='add'>+</div><div class='add'>+static u32 qca8k_phy_to_port(int phy)</div><div class='add'>+{</div><div class='add'>+	/* Internal PHY 0 has port at index 1.</div><div class='add'>+	 * Internal PHY 1 has port at index 2.</div><div class='add'>+	 * Internal PHY 2 has port at index 3.</div><div class='add'>+	 * Internal PHY 3 has port at index 4.</div><div class='add'>+	 * Internal PHY 4 has port at index 5.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return phy + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_get_enable_led_reg(int port_num, int led_num, struct qca8k_led_pattern_en *reg_info)</div><div class='add'>+{</div><div class='add'>+	switch (port_num) {</div><div class='add'>+	case 0:</div><div class='add'>+		reg_info-&gt;reg = QCA8K_LED_CTRL_REG(led_num);</div><div class='add'>+		reg_info-&gt;shift = QCA8K_LED_PHY0123_CONTROL_RULE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+		/* Port 123 are controlled on a different reg */</div><div class='add'>+		reg_info-&gt;reg = QCA8K_LED_CTRL3_REG;</div><div class='add'>+		reg_info-&gt;shift = QCA8K_LED_PHY123_PATTERN_EN_SHIFT(port_num, led_num);</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		reg_info-&gt;reg = QCA8K_LED_CTRL_REG(led_num);</div><div class='add'>+		reg_info-&gt;shift = QCA8K_LED_PHY4_CONTROL_RULE_SHIFT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_get_control_led_reg(int port_num, int led_num, struct qca8k_led_pattern_en *reg_info)</div><div class='add'>+{</div><div class='add'>+	reg_info-&gt;reg = QCA8K_LED_CTRL_REG(led_num);</div><div class='add'>+</div><div class='add'>+	/* 6 total control rule:</div><div class='add'>+	 * 3 control rules for phy0-3 that applies to all their leds</div><div class='add'>+	 * 3 control rules for phy4</div><div class='add'>+	 */</div><div class='add'>+	if (port_num == 4)</div><div class='add'>+		reg_info-&gt;shift = QCA8K_LED_PHY4_CONTROL_RULE_SHIFT;</div><div class='add'>+	else</div><div class='add'>+		reg_info-&gt;shift = QCA8K_LED_PHY0123_CONTROL_RULE_SHIFT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_parse_netdev(unsigned long rules, u32 *offload_trigger)</div><div class='add'>+{</div><div class='add'>+	/* Parsing specific to netdev trigger */</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_TX, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_TX_BLINK_MASK;</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_RX, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_RX_BLINK_MASK;</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_LINK_10, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_LINK_10M_EN_MASK;</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_LINK_100, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_LINK_100M_EN_MASK;</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_LINK_1000, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_LINK_1000M_EN_MASK;</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_HALF_DUPLEX_MASK;</div><div class='add'>+	if (test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &amp;rules))</div><div class='add'>+		*offload_trigger |= QCA8K_LED_FULL_DUPLEX_MASK;</div><div class='add'>+</div><div class='add'>+	if (rules &amp;&amp; !*offload_trigger)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Enable some default rule by default to the requested mode:</div><div class='add'>+	 * - Blink at 4Hz by default</div><div class='add'>+	 */</div><div class='add'>+	*offload_trigger |= QCA8K_LED_BLINK_4HZ;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_led_brightness_set(struct qca8k_led *led,</div><div class='add'>+			 enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	u32 mask, val;</div><div class='add'>+</div><div class='add'>+	qca8k_get_enable_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	val = QCA8K_LED_ALWAYS_OFF;</div><div class='add'>+	if (brightness)</div><div class='add'>+		val = QCA8K_LED_ALWAYS_ON;</div><div class='add'>+</div><div class='add'>+	/* HW regs to control brightness is special and port 1-2-3</div><div class='add'>+	 * are placed in a different reg.</div><div class='add'>+	 *</div><div class='add'>+	 * To control port 0 brightness:</div><div class='add'>+	 * - the 2 bit (15, 14) of:</div><div class='add'>+	 *   - QCA8K_LED_CTRL0_REG for led1</div><div class='add'>+	 *   - QCA8K_LED_CTRL1_REG for led2</div><div class='add'>+	 *   - QCA8K_LED_CTRL2_REG for led3</div><div class='add'>+	 *</div><div class='add'>+	 * To control port 4:</div><div class='add'>+	 * - the 2 bit (31, 30) of:</div><div class='add'>+	 *   - QCA8K_LED_CTRL0_REG for led1</div><div class='add'>+	 *   - QCA8K_LED_CTRL1_REG for led2</div><div class='add'>+	 *   - QCA8K_LED_CTRL2_REG for led3</div><div class='add'>+	 *</div><div class='add'>+	 * To control port 1:</div><div class='add'>+	 *   - the 2 bit at (9, 8) of QCA8K_LED_CTRL3_REG are used for led1</div><div class='add'>+	 *   - the 2 bit at (11, 10) of QCA8K_LED_CTRL3_REG are used for led2</div><div class='add'>+	 *   - the 2 bit at (13, 12) of QCA8K_LED_CTRL3_REG are used for led3</div><div class='add'>+	 *</div><div class='add'>+	 * To control port 2:</div><div class='add'>+	 *   - the 2 bit at (15, 14) of QCA8K_LED_CTRL3_REG are used for led1</div><div class='add'>+	 *   - the 2 bit at (17, 16) of QCA8K_LED_CTRL3_REG are used for led2</div><div class='add'>+	 *   - the 2 bit at (19, 18) of QCA8K_LED_CTRL3_REG are used for led3</div><div class='add'>+	 *</div><div class='add'>+	 * To control port 3:</div><div class='add'>+	 *   - the 2 bit at (21, 20) of QCA8K_LED_CTRL3_REG are used for led1</div><div class='add'>+	 *   - the 2 bit at (23, 22) of QCA8K_LED_CTRL3_REG are used for led2</div><div class='add'>+	 *   - the 2 bit at (25, 24) of QCA8K_LED_CTRL3_REG are used for led3</div><div class='add'>+	 *</div><div class='add'>+	 * To abstract this and have less code, we use the port and led numm</div><div class='add'>+	 * to calculate the shift and the correct reg due to this problem of</div><div class='add'>+	 * not having a 1:1 map of LED with the regs.</div><div class='add'>+	 */</div><div class='add'>+	if (led-&gt;port_num == 0 || led-&gt;port_num == 4) {</div><div class='add'>+		mask = QCA8K_LED_PATTERN_EN_MASK;</div><div class='add'>+		val &lt;&lt;= QCA8K_LED_PATTERN_EN_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		mask = QCA8K_LED_PHY123_PATTERN_EN_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, reg_info.reg,</div><div class='add'>+				  mask &lt;&lt; reg_info.shift,</div><div class='add'>+				  val &lt;&lt; reg_info.shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_cled_brightness_set_blocking(struct led_classdev *ldev,</div><div class='add'>+				   enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+</div><div class='add'>+	return qca8k_led_brightness_set(led, brightness);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum led_brightness</div><div class='add'>+qca8k_led_brightness_get(struct qca8k_led *led)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	qca8k_get_enable_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, reg_info.reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	val &gt;&gt;= reg_info.shift;</div><div class='add'>+</div><div class='add'>+	if (led-&gt;port_num == 0 || led-&gt;port_num == 4) {</div><div class='add'>+		val &amp;= QCA8K_LED_PATTERN_EN_MASK;</div><div class='add'>+		val &gt;&gt;= QCA8K_LED_PATTERN_EN_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= QCA8K_LED_PHY123_PATTERN_EN_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assume brightness ON only when the LED is set to always ON */</div><div class='add'>+	return val == QCA8K_LED_ALWAYS_ON;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_cled_blink_set(struct led_classdev *ldev,</div><div class='add'>+		     unsigned long *delay_on,</div><div class='add'>+		     unsigned long *delay_off)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+	u32 mask, val = QCA8K_LED_ALWAYS_BLINK_4HZ;</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (*delay_on == 0 &amp;&amp; *delay_off == 0) {</div><div class='add'>+		*delay_on = 125;</div><div class='add'>+		*delay_off = 125;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (*delay_on != 125 || *delay_off != 125) {</div><div class='add'>+		/* The hardware only supports blinking at 4Hz. Fall back</div><div class='add'>+		 * to software implementation in other cases.</div><div class='add'>+		 */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qca8k_get_enable_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	if (led-&gt;port_num == 0 || led-&gt;port_num == 4) {</div><div class='add'>+		mask = QCA8K_LED_PATTERN_EN_MASK;</div><div class='add'>+		val &lt;&lt;= QCA8K_LED_PATTERN_EN_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		mask = QCA8K_LED_PHY123_PATTERN_EN_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, reg_info.reg, mask &lt;&lt; reg_info.shift,</div><div class='add'>+			   val &lt;&lt; reg_info.shift);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_cled_trigger_offload(struct led_classdev *ldev, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	u32 mask, val = QCA8K_LED_ALWAYS_OFF;</div><div class='add'>+</div><div class='add'>+	qca8k_get_enable_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		val = QCA8K_LED_RULE_CONTROLLED;</div><div class='add'>+</div><div class='add'>+	if (led-&gt;port_num == 0 || led-&gt;port_num == 4) {</div><div class='add'>+		mask = QCA8K_LED_PATTERN_EN_MASK;</div><div class='add'>+		val &lt;&lt;= QCA8K_LED_PATTERN_EN_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		mask = QCA8K_LED_PHY123_PATTERN_EN_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, reg_info.reg, mask &lt;&lt; reg_info.shift,</div><div class='add'>+				  val &lt;&lt; reg_info.shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool</div><div class='add'>+qca8k_cled_hw_control_status(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	qca8k_get_enable_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	regmap_read(priv-&gt;regmap, reg_info.reg, &amp;val);</div><div class='add'>+</div><div class='add'>+	val &gt;&gt;= reg_info.shift;</div><div class='add'>+</div><div class='add'>+	if (led-&gt;port_num == 0 || led-&gt;port_num == 4) {</div><div class='add'>+		val &amp;= QCA8K_LED_PATTERN_EN_MASK;</div><div class='add'>+		val &gt;&gt;= QCA8K_LED_PATTERN_EN_SHIFT;</div><div class='add'>+	} else {</div><div class='add'>+		val &amp;= QCA8K_LED_PHY123_PATTERN_EN_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val == QCA8K_LED_RULE_CONTROLLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_cled_hw_control_is_supported(struct led_classdev *ldev, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	u32 offload_trigger = 0;</div><div class='add'>+</div><div class='add'>+	return qca8k_parse_netdev(rules, &amp;offload_trigger);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_cled_hw_control_set(struct led_classdev *ldev, unsigned long rules)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	u32 offload_trigger = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_parse_netdev(rules, &amp;offload_trigger);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = qca8k_cled_trigger_offload(ldev, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	qca8k_get_control_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;regmap, reg_info.reg,</div><div class='add'>+				  QCA8K_LED_RULE_MASK &lt;&lt; reg_info.shift,</div><div class='add'>+				  offload_trigger &lt;&lt; reg_info.shift);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_cled_hw_control_get(struct led_classdev *ldev, unsigned long *rules)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+	struct qca8k_led_pattern_en reg_info;</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* With hw control not active return err */</div><div class='add'>+	if (!qca8k_cled_hw_control_status(ldev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	qca8k_get_control_led_reg(led-&gt;port_num, led-&gt;led_num, &amp;reg_info);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, reg_info.reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val &gt;&gt;= reg_info.shift;</div><div class='add'>+	val &amp;= QCA8K_LED_RULE_MASK;</div><div class='add'>+</div><div class='add'>+	/* Parsing specific to netdev trigger */</div><div class='add'>+	if (val &amp; QCA8K_LED_TX_BLINK_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_TX, rules);</div><div class='add'>+	if (val &amp; QCA8K_LED_RX_BLINK_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_RX, rules);</div><div class='add'>+	if (val &amp; QCA8K_LED_LINK_10M_EN_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_LINK_10, rules);</div><div class='add'>+	if (val &amp; QCA8K_LED_LINK_100M_EN_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_LINK_100, rules);</div><div class='add'>+	if (val &amp; QCA8K_LED_LINK_1000M_EN_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_LINK_1000, rules);</div><div class='add'>+	if (val &amp; QCA8K_LED_HALF_DUPLEX_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_HALF_DUPLEX, rules);</div><div class='add'>+	if (val &amp; QCA8K_LED_FULL_DUPLEX_MASK)</div><div class='add'>+		set_bit(TRIGGER_NETDEV_FULL_DUPLEX, rules);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *qca8k_cled_hw_control_get_device(struct led_classdev *ldev)</div><div class='add'>+{</div><div class='add'>+	struct qca8k_led *led = container_of(ldev, struct qca8k_led, cdev);</div><div class='add'>+	struct qca8k_priv *priv = led-&gt;priv;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	dp = dsa_to_port(priv-&gt;ds, qca8k_phy_to_port(led-&gt;port_num));</div><div class='add'>+	if (!dp)</div><div class='add'>+		return NULL;</div><div class='add'>+	if (dp-&gt;user)</div><div class='add'>+		return &amp;dp-&gt;user-&gt;dev;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+qca8k_parse_port_leds(struct qca8k_priv *priv, struct fwnode_handle *port, int port_num)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *led = NULL, *leds = NULL;</div><div class='add'>+	struct led_init_data init_data = { };</div><div class='add'>+	enum led_default_state state;</div><div class='add'>+	struct qca8k_led *port_led;</div><div class='add'>+	int led_num, led_index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	leds = fwnode_get_named_child_node(port, "leds");</div><div class='add'>+	if (!leds) {</div><div class='add'>+		dev_dbg(priv-&gt;dev, "No Leds node specified in device tree for port %d!\n",</div><div class='add'>+			port_num);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_for_each_child_node(leds, led) {</div><div class='add'>+		/* Reg represent the led number of the port.</div><div class='add'>+		 * Each port can have at most 3 leds attached</div><div class='add'>+		 * Commonly:</div><div class='add'>+		 * 1. is gigabit led</div><div class='add'>+		 * 2. is mbit led</div><div class='add'>+		 * 3. additional status led</div><div class='add'>+		 */</div><div class='add'>+		if (fwnode_property_read_u32(led, "reg", &amp;led_num))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (led_num &gt;= QCA8K_LED_PORT_COUNT) {</div><div class='add'>+			dev_warn(priv-&gt;dev, "Invalid LED reg %d defined for port %d",</div><div class='add'>+				 led_num, port_num);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		led_index = QCA8K_LED_PORT_INDEX(port_num, led_num);</div><div class='add'>+</div><div class='add'>+		port_led = &amp;priv-&gt;ports_led[led_index];</div><div class='add'>+		port_led-&gt;port_num = port_num;</div><div class='add'>+		port_led-&gt;led_num = led_num;</div><div class='add'>+		port_led-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+		state = led_init_default_state_get(led);</div><div class='add'>+		switch (state) {</div><div class='add'>+		case LEDS_DEFSTATE_ON:</div><div class='add'>+			port_led-&gt;cdev.brightness = 1;</div><div class='add'>+			qca8k_led_brightness_set(port_led, 1);</div><div class='add'>+			break;</div><div class='add'>+		case LEDS_DEFSTATE_KEEP:</div><div class='add'>+			port_led-&gt;cdev.brightness =</div><div class='add'>+					qca8k_led_brightness_get(port_led);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			port_led-&gt;cdev.brightness = 0;</div><div class='add'>+			qca8k_led_brightness_set(port_led, 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port_led-&gt;cdev.max_brightness = 1;</div><div class='add'>+		port_led-&gt;cdev.brightness_set_blocking = qca8k_cled_brightness_set_blocking;</div><div class='add'>+		port_led-&gt;cdev.blink_set = qca8k_cled_blink_set;</div><div class='add'>+		port_led-&gt;cdev.hw_control_is_supported = qca8k_cled_hw_control_is_supported;</div><div class='add'>+		port_led-&gt;cdev.hw_control_set = qca8k_cled_hw_control_set;</div><div class='add'>+		port_led-&gt;cdev.hw_control_get = qca8k_cled_hw_control_get;</div><div class='add'>+		port_led-&gt;cdev.hw_control_get_device = qca8k_cled_hw_control_get_device;</div><div class='add'>+		port_led-&gt;cdev.hw_control_trigger = "netdev";</div><div class='add'>+		init_data.default_label = ":port";</div><div class='add'>+		init_data.fwnode = led;</div><div class='add'>+		init_data.devname_mandatory = true;</div><div class='add'>+		init_data.devicename = kasprintf(GFP_KERNEL, "%s:0%d",</div><div class='add'>+						 priv-&gt;internal_mdio_bus-&gt;id,</div><div class='add'>+						 port_num);</div><div class='add'>+		if (!init_data.devicename) {</div><div class='add'>+			fwnode_handle_put(led);</div><div class='add'>+			fwnode_handle_put(leds);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = devm_led_classdev_register_ext(priv-&gt;dev, &amp;port_led-&gt;cdev, &amp;init_data);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_warn(priv-&gt;dev, "Failed to init LED %d for port %d", led_num, port_num);</div><div class='add'>+</div><div class='add'>+		kfree(init_data.devicename);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_handle_put(leds);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+qca8k_setup_led_ctrl(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *ports, *port;</div><div class='add'>+	int port_num;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ports = device_get_named_child_node(priv-&gt;dev, "ports");</div><div class='add'>+	if (!ports) {</div><div class='add'>+		dev_info(priv-&gt;dev, "No ports node specified in device tree!");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_for_each_child_node(ports, port) {</div><div class='add'>+		if (fwnode_property_read_u32(port, "reg", &amp;port_num))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Skip checking for CPU port 0 and CPU port 6 as not supported */</div><div class='add'>+		if (port_num == 0 || port_num == 6)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Each port can have at most 3 different leds attached.</div><div class='add'>+		 * Switch port starts from 0 to 6, but port 0 and 6 are CPU</div><div class='add'>+		 * port. The port index needs to be decreased by one to identify</div><div class='add'>+		 * the correct port for LED setup.</div><div class='add'>+		 */</div><div class='add'>+		ret = qca8k_parse_port_leds(priv, port, qca8k_port_to_phy(port_num));</div><div class='add'>+		if (ret) {</div><div class='add'>+			fwnode_handle_put(port);</div><div class='add'>+			fwnode_handle_put(ports);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_handle_put(ports);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/qca/qca8k.h b/drivers/net/dsa/qca/qca8k.h<br/>new file mode 100644<br/>index 000000000000..d046679265fa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/qca8k.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/qca8k.h</a></div><div class='hunk'>@@ -0,0 +1,595 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2009 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ * Copyright (C) 2011-2012 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __QCA8K_H</div><div class='add'>+#define __QCA8K_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/leds.h&gt;</div><div class='add'>+#include &lt;linux/dsa/tag_qca.h&gt;</div><div class='add'>+</div><div class='add'>+#define QCA8K_ETHERNET_MDIO_PRIORITY			7</div><div class='add'>+#define QCA8K_ETHERNET_PHY_PRIORITY			6</div><div class='add'>+#define QCA8K_ETHERNET_TIMEOUT				msecs_to_jiffies(5)</div><div class='add'>+</div><div class='add'>+#define QCA8K_NUM_PORTS					7</div><div class='add'>+#define QCA8K_NUM_CPU_PORTS				2</div><div class='add'>+#define QCA8K_MAX_MTU					9000</div><div class='add'>+#define QCA8K_NUM_LAGS					4</div><div class='add'>+#define QCA8K_NUM_PORTS_FOR_LAG				4</div><div class='add'>+</div><div class='add'>+#define PHY_ID_QCA8327					0x004dd034</div><div class='add'>+#define QCA8K_ID_QCA8327				0x12</div><div class='add'>+#define PHY_ID_QCA8337					0x004dd036</div><div class='add'>+#define QCA8K_ID_QCA8337				0x13</div><div class='add'>+</div><div class='add'>+#define QCA8K_QCA832X_MIB_COUNT				39</div><div class='add'>+#define QCA8K_QCA833X_MIB_COUNT				41</div><div class='add'>+</div><div class='add'>+#define QCA8K_BUSY_WAIT_TIMEOUT				2000</div><div class='add'>+</div><div class='add'>+#define QCA8K_NUM_FDB_RECORDS				2048</div><div class='add'>+</div><div class='add'>+#define QCA8K_PORT_VID_DEF				1</div><div class='add'>+</div><div class='add'>+/* Global control registers */</div><div class='add'>+#define QCA8K_REG_MASK_CTRL				0x000</div><div class='add'>+#define   QCA8K_MASK_CTRL_REV_ID_MASK			GENMASK(7, 0)</div><div class='add'>+#define   QCA8K_MASK_CTRL_REV_ID(x)			FIELD_GET(QCA8K_MASK_CTRL_REV_ID_MASK, x)</div><div class='add'>+#define   QCA8K_MASK_CTRL_DEVICE_ID_MASK		GENMASK(15, 8)</div><div class='add'>+#define   QCA8K_MASK_CTRL_DEVICE_ID(x)			FIELD_GET(QCA8K_MASK_CTRL_DEVICE_ID_MASK, x)</div><div class='add'>+#define QCA8K_REG_PORT0_PAD_CTRL			0x004</div><div class='add'>+#define   QCA8K_PORT0_PAD_MAC06_EXCHANGE_EN		BIT(31)</div><div class='add'>+#define   QCA8K_PORT0_PAD_SGMII_RXCLK_FALLING_EDGE	BIT(19)</div><div class='add'>+#define   QCA8K_PORT0_PAD_SGMII_TXCLK_FALLING_EDGE	BIT(18)</div><div class='add'>+#define QCA8K_REG_PORT5_PAD_CTRL			0x008</div><div class='add'>+#define QCA8K_REG_PORT6_PAD_CTRL			0x00c</div><div class='add'>+#define   QCA8K_PORT_PAD_RGMII_EN			BIT(26)</div><div class='add'>+#define   QCA8K_PORT_PAD_RGMII_TX_DELAY_MASK		GENMASK(23, 22)</div><div class='add'>+#define   QCA8K_PORT_PAD_RGMII_TX_DELAY(x)		FIELD_PREP(QCA8K_PORT_PAD_RGMII_TX_DELAY_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_PAD_RGMII_RX_DELAY_MASK		GENMASK(21, 20)</div><div class='add'>+#define   QCA8K_PORT_PAD_RGMII_RX_DELAY(x)		FIELD_PREP(QCA8K_PORT_PAD_RGMII_RX_DELAY_MASK, x)</div><div class='add'>+#define	  QCA8K_PORT_PAD_RGMII_TX_DELAY_EN		BIT(25)</div><div class='add'>+#define   QCA8K_PORT_PAD_RGMII_RX_DELAY_EN		BIT(24)</div><div class='add'>+#define   QCA8K_PORT_PAD_SGMII_EN			BIT(7)</div><div class='add'>+#define QCA8K_REG_PWS					0x010</div><div class='add'>+#define   QCA8K_PWS_POWER_ON_SEL			BIT(31)</div><div class='add'>+/* This reg is only valid for QCA832x and toggle the package</div><div class='add'>+ * type from 176 pin (by default) to 148 pin used on QCA8327</div><div class='add'>+ */</div><div class='add'>+#define   QCA8327_PWS_PACKAGE148_EN			BIT(30)</div><div class='add'>+#define   QCA8K_PWS_LED_OPEN_EN_CSR			BIT(24)</div><div class='add'>+#define   QCA8K_PWS_SERDES_AEN_DIS			BIT(7)</div><div class='add'>+#define QCA8K_REG_MODULE_EN				0x030</div><div class='add'>+#define   QCA8K_MODULE_EN_MIB				BIT(0)</div><div class='add'>+#define QCA8K_REG_MIB					0x034</div><div class='add'>+#define   QCA8K_MIB_FUNC				GENMASK(26, 24)</div><div class='add'>+#define   QCA8K_MIB_CPU_KEEP				BIT(20)</div><div class='add'>+#define   QCA8K_MIB_BUSY				BIT(17)</div><div class='add'>+#define QCA8K_MDIO_MASTER_CTRL				0x3c</div><div class='add'>+#define   QCA8K_MDIO_MASTER_BUSY			BIT(31)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_EN				BIT(30)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_READ			BIT(27)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_WRITE			0</div><div class='add'>+#define   QCA8K_MDIO_MASTER_SUP_PRE			BIT(26)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_PHY_ADDR_MASK		GENMASK(25, 21)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_PHY_ADDR(x)			FIELD_PREP(QCA8K_MDIO_MASTER_PHY_ADDR_MASK, x)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_REG_ADDR_MASK		GENMASK(20, 16)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_REG_ADDR(x)			FIELD_PREP(QCA8K_MDIO_MASTER_REG_ADDR_MASK, x)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_DATA_MASK			GENMASK(15, 0)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_DATA(x)			FIELD_PREP(QCA8K_MDIO_MASTER_DATA_MASK, x)</div><div class='add'>+#define   QCA8K_MDIO_MASTER_MAX_PORTS			5</div><div class='add'>+#define   QCA8K_MDIO_MASTER_MAX_REG			32</div><div class='add'>+</div><div class='add'>+/* LED control register */</div><div class='add'>+#define QCA8K_LED_PORT_COUNT				3</div><div class='add'>+#define QCA8K_LED_COUNT					((QCA8K_NUM_PORTS - QCA8K_NUM_CPU_PORTS) * QCA8K_LED_PORT_COUNT)</div><div class='add'>+#define QCA8K_LED_RULE_COUNT				6</div><div class='add'>+#define QCA8K_LED_RULE_MAX				11</div><div class='add'>+#define QCA8K_LED_PORT_INDEX(_phy, _led)		(((_phy) * QCA8K_LED_PORT_COUNT) + (_led))</div><div class='add'>+</div><div class='add'>+#define QCA8K_LED_PHY123_PATTERN_EN_SHIFT(_phy, _led)	((((_phy) - 1) * 6) + 8 + (2 * (_led)))</div><div class='add'>+#define QCA8K_LED_PHY123_PATTERN_EN_MASK		GENMASK(1, 0)</div><div class='add'>+</div><div class='add'>+#define QCA8K_LED_PHY0123_CONTROL_RULE_SHIFT		0</div><div class='add'>+#define QCA8K_LED_PHY4_CONTROL_RULE_SHIFT		16</div><div class='add'>+</div><div class='add'>+#define QCA8K_LED_CTRL_REG(_i)				(0x050 + (_i) * 4)</div><div class='add'>+#define QCA8K_LED_CTRL0_REG				0x50</div><div class='add'>+#define QCA8K_LED_CTRL1_REG				0x54</div><div class='add'>+#define QCA8K_LED_CTRL2_REG				0x58</div><div class='add'>+#define QCA8K_LED_CTRL3_REG				0x5C</div><div class='add'>+#define   QCA8K_LED_CTRL_SHIFT(_i)			(((_i) % 2) * 16)</div><div class='add'>+#define   QCA8K_LED_CTRL_MASK				GENMASK(15, 0)</div><div class='add'>+#define QCA8K_LED_RULE_MASK				GENMASK(13, 0)</div><div class='add'>+#define QCA8K_LED_BLINK_FREQ_MASK			GENMASK(1, 0)</div><div class='add'>+#define QCA8K_LED_BLINK_FREQ_SHITF			0</div><div class='add'>+#define   QCA8K_LED_BLINK_2HZ				0</div><div class='add'>+#define   QCA8K_LED_BLINK_4HZ				1</div><div class='add'>+#define   QCA8K_LED_BLINK_8HZ				2</div><div class='add'>+#define   QCA8K_LED_BLINK_AUTO				3</div><div class='add'>+#define QCA8K_LED_LINKUP_OVER_MASK			BIT(2)</div><div class='add'>+#define QCA8K_LED_TX_BLINK_MASK				BIT(4)</div><div class='add'>+#define QCA8K_LED_RX_BLINK_MASK				BIT(5)</div><div class='add'>+#define QCA8K_LED_COL_BLINK_MASK			BIT(7)</div><div class='add'>+#define QCA8K_LED_LINK_10M_EN_MASK			BIT(8)</div><div class='add'>+#define QCA8K_LED_LINK_100M_EN_MASK			BIT(9)</div><div class='add'>+#define QCA8K_LED_LINK_1000M_EN_MASK			BIT(10)</div><div class='add'>+#define QCA8K_LED_POWER_ON_LIGHT_MASK			BIT(11)</div><div class='add'>+#define QCA8K_LED_HALF_DUPLEX_MASK			BIT(12)</div><div class='add'>+#define QCA8K_LED_FULL_DUPLEX_MASK			BIT(13)</div><div class='add'>+#define QCA8K_LED_PATTERN_EN_MASK			GENMASK(15, 14)</div><div class='add'>+#define QCA8K_LED_PATTERN_EN_SHIFT			14</div><div class='add'>+#define   QCA8K_LED_ALWAYS_OFF				0</div><div class='add'>+#define   QCA8K_LED_ALWAYS_BLINK_4HZ			1</div><div class='add'>+#define   QCA8K_LED_ALWAYS_ON				2</div><div class='add'>+#define   QCA8K_LED_RULE_CONTROLLED			3</div><div class='add'>+</div><div class='add'>+#define QCA8K_GOL_MAC_ADDR0				0x60</div><div class='add'>+#define QCA8K_GOL_MAC_ADDR1				0x64</div><div class='add'>+#define QCA8K_MAX_FRAME_SIZE				0x78</div><div class='add'>+#define QCA8K_REG_PORT_STATUS(_i)			(0x07c + (_i) * 4)</div><div class='add'>+#define   QCA8K_PORT_STATUS_SPEED			GENMASK(1, 0)</div><div class='add'>+#define   QCA8K_PORT_STATUS_SPEED_10			0</div><div class='add'>+#define   QCA8K_PORT_STATUS_SPEED_100			0x1</div><div class='add'>+#define   QCA8K_PORT_STATUS_SPEED_1000			0x2</div><div class='add'>+#define   QCA8K_PORT_STATUS_TXMAC			BIT(2)</div><div class='add'>+#define   QCA8K_PORT_STATUS_RXMAC			BIT(3)</div><div class='add'>+#define   QCA8K_PORT_STATUS_TXFLOW			BIT(4)</div><div class='add'>+#define   QCA8K_PORT_STATUS_RXFLOW			BIT(5)</div><div class='add'>+#define   QCA8K_PORT_STATUS_DUPLEX			BIT(6)</div><div class='add'>+#define   QCA8K_PORT_STATUS_LINK_UP			BIT(8)</div><div class='add'>+#define   QCA8K_PORT_STATUS_LINK_AUTO			BIT(9)</div><div class='add'>+#define   QCA8K_PORT_STATUS_LINK_PAUSE			BIT(10)</div><div class='add'>+#define   QCA8K_PORT_STATUS_FLOW_AUTO			BIT(12)</div><div class='add'>+#define QCA8K_REG_PORT_HDR_CTRL(_i)			(0x9c + (_i * 4))</div><div class='add'>+#define   QCA8K_PORT_HDR_CTRL_RX_MASK			GENMASK(3, 2)</div><div class='add'>+#define   QCA8K_PORT_HDR_CTRL_TX_MASK			GENMASK(1, 0)</div><div class='add'>+#define   QCA8K_PORT_HDR_CTRL_ALL			2</div><div class='add'>+#define   QCA8K_PORT_HDR_CTRL_MGMT			1</div><div class='add'>+#define   QCA8K_PORT_HDR_CTRL_NONE			0</div><div class='add'>+#define QCA8K_REG_SGMII_CTRL				0x0e0</div><div class='add'>+#define   QCA8K_SGMII_EN_PLL				BIT(1)</div><div class='add'>+#define   QCA8K_SGMII_EN_RX				BIT(2)</div><div class='add'>+#define   QCA8K_SGMII_EN_TX				BIT(3)</div><div class='add'>+#define   QCA8K_SGMII_EN_SD				BIT(4)</div><div class='add'>+#define   QCA8K_SGMII_CLK125M_DELAY			BIT(7)</div><div class='add'>+#define   QCA8K_SGMII_MODE_CTRL_MASK			GENMASK(23, 22)</div><div class='add'>+#define   QCA8K_SGMII_MODE_CTRL(x)			FIELD_PREP(QCA8K_SGMII_MODE_CTRL_MASK, x)</div><div class='add'>+#define   QCA8K_SGMII_MODE_CTRL_BASEX			QCA8K_SGMII_MODE_CTRL(0x0)</div><div class='add'>+#define   QCA8K_SGMII_MODE_CTRL_PHY			QCA8K_SGMII_MODE_CTRL(0x1)</div><div class='add'>+#define   QCA8K_SGMII_MODE_CTRL_MAC			QCA8K_SGMII_MODE_CTRL(0x2)</div><div class='add'>+</div><div class='add'>+/* MAC_PWR_SEL registers */</div><div class='add'>+#define QCA8K_REG_MAC_PWR_SEL				0x0e4</div><div class='add'>+#define   QCA8K_MAC_PWR_RGMII1_1_8V			BIT(18)</div><div class='add'>+#define   QCA8K_MAC_PWR_RGMII0_1_8V			BIT(19)</div><div class='add'>+</div><div class='add'>+/* EEE control registers */</div><div class='add'>+#define QCA8K_REG_EEE_CTRL				0x100</div><div class='add'>+#define  QCA8K_REG_EEE_CTRL_LPI_EN(_i)			((_i + 1) * 2)</div><div class='add'>+</div><div class='add'>+/* TRUNK_HASH_EN registers */</div><div class='add'>+#define QCA8K_TRUNK_HASH_EN_CTRL			0x270</div><div class='add'>+#define   QCA8K_TRUNK_HASH_SIP_EN			BIT(3)</div><div class='add'>+#define   QCA8K_TRUNK_HASH_DIP_EN			BIT(2)</div><div class='add'>+#define   QCA8K_TRUNK_HASH_SA_EN			BIT(1)</div><div class='add'>+#define   QCA8K_TRUNK_HASH_DA_EN			BIT(0)</div><div class='add'>+#define   QCA8K_TRUNK_HASH_MASK				GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+/* ACL registers */</div><div class='add'>+#define QCA8K_REG_PORT_VLAN_CTRL0(_i)			(0x420 + (_i * 8))</div><div class='add'>+#define   QCA8K_PORT_VLAN_CVID_MASK			GENMASK(27, 16)</div><div class='add'>+#define   QCA8K_PORT_VLAN_CVID(x)			FIELD_PREP(QCA8K_PORT_VLAN_CVID_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_VLAN_SVID_MASK			GENMASK(11, 0)</div><div class='add'>+#define   QCA8K_PORT_VLAN_SVID(x)			FIELD_PREP(QCA8K_PORT_VLAN_SVID_MASK, x)</div><div class='add'>+#define QCA8K_REG_PORT_VLAN_CTRL1(_i)			(0x424 + (_i * 8))</div><div class='add'>+#define QCA8K_REG_IPV4_PRI_BASE_ADDR			0x470</div><div class='add'>+#define QCA8K_REG_IPV4_PRI_ADDR_MASK			0x474</div><div class='add'>+</div><div class='add'>+/* Lookup registers */</div><div class='add'>+#define QCA8K_ATU_TABLE_SIZE				3 /* 12 bytes wide table / sizeof(u32) */</div><div class='add'>+</div><div class='add'>+#define QCA8K_REG_ATU_DATA0				0x600</div><div class='add'>+#define   QCA8K_ATU_ADDR2_MASK				GENMASK(31, 24)</div><div class='add'>+#define   QCA8K_ATU_ADDR3_MASK				GENMASK(23, 16)</div><div class='add'>+#define   QCA8K_ATU_ADDR4_MASK				GENMASK(15, 8)</div><div class='add'>+#define   QCA8K_ATU_ADDR5_MASK				GENMASK(7, 0)</div><div class='add'>+#define QCA8K_REG_ATU_DATA1				0x604</div><div class='add'>+#define   QCA8K_ATU_PORT_MASK				GENMASK(22, 16)</div><div class='add'>+#define   QCA8K_ATU_ADDR0_MASK				GENMASK(15, 8)</div><div class='add'>+#define   QCA8K_ATU_ADDR1_MASK				GENMASK(7, 0)</div><div class='add'>+#define QCA8K_REG_ATU_DATA2				0x608</div><div class='add'>+#define   QCA8K_ATU_VID_MASK				GENMASK(19, 8)</div><div class='add'>+#define   QCA8K_ATU_STATUS_MASK				GENMASK(3, 0)</div><div class='add'>+#define   QCA8K_ATU_STATUS_STATIC			0xf</div><div class='add'>+#define QCA8K_REG_ATU_FUNC				0x60c</div><div class='add'>+#define   QCA8K_ATU_FUNC_BUSY				BIT(31)</div><div class='add'>+#define   QCA8K_ATU_FUNC_PORT_EN			BIT(14)</div><div class='add'>+#define   QCA8K_ATU_FUNC_MULTI_EN			BIT(13)</div><div class='add'>+#define   QCA8K_ATU_FUNC_FULL				BIT(12)</div><div class='add'>+#define   QCA8K_ATU_FUNC_PORT_MASK			GENMASK(11, 8)</div><div class='add'>+#define QCA8K_REG_VTU_FUNC0				0x610</div><div class='add'>+#define   QCA8K_VTU_FUNC0_VALID				BIT(20)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_IVL_EN			BIT(19)</div><div class='add'>+/*        QCA8K_VTU_FUNC0_EG_MODE_MASK			GENMASK(17, 4)</div><div class='add'>+ *          It does contain VLAN_MODE for each port [5:4] for port0,</div><div class='add'>+ *          [7:6] for port1 ... [17:16] for port6. Use virtual port</div><div class='add'>+ *          define to handle this.</div><div class='add'>+ */</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_PORT_SHIFT(_i)	(4 + (_i) * 2)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_MASK			GENMASK(1, 0)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_PORT_MASK(_i)		(GENMASK(1, 0) &lt;&lt; QCA8K_VTU_FUNC0_EG_MODE_PORT_SHIFT(_i))</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_UNMOD			FIELD_PREP(QCA8K_VTU_FUNC0_EG_MODE_MASK, 0x0)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_PORT_UNMOD(_i)	(QCA8K_VTU_FUNC0_EG_MODE_UNMOD &lt;&lt; QCA8K_VTU_FUNC0_EG_MODE_PORT_SHIFT(_i))</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_UNTAG			FIELD_PREP(QCA8K_VTU_FUNC0_EG_MODE_MASK, 0x1)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_PORT_UNTAG(_i)	(QCA8K_VTU_FUNC0_EG_MODE_UNTAG &lt;&lt; QCA8K_VTU_FUNC0_EG_MODE_PORT_SHIFT(_i))</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_TAG			FIELD_PREP(QCA8K_VTU_FUNC0_EG_MODE_MASK, 0x2)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_PORT_TAG(_i)		(QCA8K_VTU_FUNC0_EG_MODE_TAG &lt;&lt; QCA8K_VTU_FUNC0_EG_MODE_PORT_SHIFT(_i))</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_NOT			FIELD_PREP(QCA8K_VTU_FUNC0_EG_MODE_MASK, 0x3)</div><div class='add'>+#define   QCA8K_VTU_FUNC0_EG_MODE_PORT_NOT(_i)		(QCA8K_VTU_FUNC0_EG_MODE_NOT &lt;&lt; QCA8K_VTU_FUNC0_EG_MODE_PORT_SHIFT(_i))</div><div class='add'>+#define QCA8K_REG_VTU_FUNC1				0x614</div><div class='add'>+#define   QCA8K_VTU_FUNC1_BUSY				BIT(31)</div><div class='add'>+#define   QCA8K_VTU_FUNC1_VID_MASK			GENMASK(27, 16)</div><div class='add'>+#define   QCA8K_VTU_FUNC1_FULL				BIT(4)</div><div class='add'>+#define QCA8K_REG_ATU_CTRL				0x618</div><div class='add'>+#define   QCA8K_ATU_AGE_TIME_MASK			GENMASK(15, 0)</div><div class='add'>+#define   QCA8K_ATU_AGE_TIME(x)				FIELD_PREP(QCA8K_ATU_AGE_TIME_MASK, (x))</div><div class='add'>+#define QCA8K_REG_GLOBAL_FW_CTRL0			0x620</div><div class='add'>+#define   QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN		BIT(10)</div><div class='add'>+#define   QCA8K_GLOBAL_FW_CTRL0_MIRROR_PORT_NUM		GENMASK(7, 4)</div><div class='add'>+#define QCA8K_REG_GLOBAL_FW_CTRL1			0x624</div><div class='add'>+#define   QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_MASK		GENMASK(30, 24)</div><div class='add'>+#define   QCA8K_GLOBAL_FW_CTRL1_BC_DP_MASK		GENMASK(22, 16)</div><div class='add'>+#define   QCA8K_GLOBAL_FW_CTRL1_MC_DP_MASK		GENMASK(14, 8)</div><div class='add'>+#define   QCA8K_GLOBAL_FW_CTRL1_UC_DP_MASK		GENMASK(6, 0)</div><div class='add'>+#define QCA8K_PORT_LOOKUP_CTRL(_i)			(0x660 + (_i) * 0xc)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_MEMBER			GENMASK(6, 0)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_VLAN_MODE_MASK		GENMASK(9, 8)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_VLAN_MODE(x)		FIELD_PREP(QCA8K_PORT_LOOKUP_VLAN_MODE_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_VLAN_MODE_NONE		QCA8K_PORT_LOOKUP_VLAN_MODE(0x0)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_VLAN_MODE_FALLBACK		QCA8K_PORT_LOOKUP_VLAN_MODE(0x1)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_VLAN_MODE_CHECK		QCA8K_PORT_LOOKUP_VLAN_MODE(0x2)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE		QCA8K_PORT_LOOKUP_VLAN_MODE(0x3)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE_MASK			GENMASK(18, 16)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE(x)			FIELD_PREP(QCA8K_PORT_LOOKUP_STATE_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE_DISABLED		QCA8K_PORT_LOOKUP_STATE(0x0)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE_BLOCKING		QCA8K_PORT_LOOKUP_STATE(0x1)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE_LISTENING		QCA8K_PORT_LOOKUP_STATE(0x2)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE_LEARNING		QCA8K_PORT_LOOKUP_STATE(0x3)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_STATE_FORWARD		QCA8K_PORT_LOOKUP_STATE(0x4)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_LEARN			BIT(20)</div><div class='add'>+#define   QCA8K_PORT_LOOKUP_ING_MIRROR_EN		BIT(25)</div><div class='add'>+</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_CTRL0			0x700</div><div class='add'>+/* 4 max trunk first</div><div class='add'>+ * first 6 bit for member bitmap</div><div class='add'>+ * 7th bit is to enable trunk port</div><div class='add'>+ */</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_SHIFT(_i)			((_i) * 8)</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_EN_MASK			BIT(7)</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_EN(_i)			(QCA8K_REG_GOL_TRUNK_EN_MASK &lt;&lt; QCA8K_REG_GOL_TRUNK_SHIFT(_i))</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_MEMBER_MASK			GENMASK(6, 0)</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_MEMBER(_i)			(QCA8K_REG_GOL_TRUNK_MEMBER_MASK &lt;&lt; QCA8K_REG_GOL_TRUNK_SHIFT(_i))</div><div class='add'>+/* 0x704 for TRUNK 0-1 --- 0x708 for TRUNK 2-3 */</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_CTRL(_i)			(0x704 + (((_i) / 2) * 4))</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_MEM_ID_MASK		GENMASK(3, 0)</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_MEM_ID_EN_MASK		BIT(3)</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_MEM_ID_PORT_MASK		GENMASK(2, 0)</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_SHIFT(_i)		(((_i) / 2) * 16)</div><div class='add'>+#define QCA8K_REG_GOL_MEM_ID_SHIFT(_i)			((_i) * 4)</div><div class='add'>+/* Complex shift: FIRST shift for port THEN shift for trunk */</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_MEM_ID_SHIFT(_i, _j)	(QCA8K_REG_GOL_MEM_ID_SHIFT(_j) + QCA8K_REG_GOL_TRUNK_ID_SHIFT(_i))</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_MEM_ID_EN(_i, _j)	(QCA8K_REG_GOL_TRUNK_ID_MEM_ID_EN_MASK &lt;&lt; QCA8K_REG_GOL_TRUNK_ID_MEM_ID_SHIFT(_i, _j))</div><div class='add'>+#define QCA8K_REG_GOL_TRUNK_ID_MEM_ID_PORT(_i, _j)	(QCA8K_REG_GOL_TRUNK_ID_MEM_ID_PORT_MASK &lt;&lt; QCA8K_REG_GOL_TRUNK_ID_MEM_ID_SHIFT(_i, _j))</div><div class='add'>+</div><div class='add'>+#define QCA8K_REG_GLOBAL_FC_THRESH			0x800</div><div class='add'>+#define   QCA8K_GLOBAL_FC_GOL_XON_THRES_MASK		GENMASK(24, 16)</div><div class='add'>+#define   QCA8K_GLOBAL_FC_GOL_XON_THRES(x)		FIELD_PREP(QCA8K_GLOBAL_FC_GOL_XON_THRES_MASK, x)</div><div class='add'>+#define   QCA8K_GLOBAL_FC_GOL_XOFF_THRES_MASK		GENMASK(8, 0)</div><div class='add'>+#define   QCA8K_GLOBAL_FC_GOL_XOFF_THRES(x)		FIELD_PREP(QCA8K_GLOBAL_FC_GOL_XOFF_THRES_MASK, x)</div><div class='add'>+</div><div class='add'>+#define QCA8K_REG_PORT_HOL_CTRL0(_i)			(0x970 + (_i) * 0x8)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI0_BUF_MASK		GENMASK(3, 0)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI0(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PRI0_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI1_BUF_MASK		GENMASK(7, 4)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI1(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PRI1_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI2_BUF_MASK		GENMASK(11, 8)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI2(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PRI2_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI3_BUF_MASK		GENMASK(15, 12)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI3(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PRI3_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI4_BUF_MASK		GENMASK(19, 16)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI4(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PRI4_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI5_BUF_MASK		GENMASK(23, 20)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PRI5(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PRI5_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PORT_BUF_MASK		GENMASK(29, 24)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL0_EG_PORT(x)		FIELD_PREP(QCA8K_PORT_HOL_CTRL0_EG_PORT_BUF_MASK, x)</div><div class='add'>+</div><div class='add'>+#define QCA8K_REG_PORT_HOL_CTRL1(_i)			(0x974 + (_i) * 0x8)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL1_ING_BUF_MASK		GENMASK(3, 0)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL1_ING(x)			FIELD_PREP(QCA8K_PORT_HOL_CTRL1_ING_BUF_MASK, x)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL1_EG_PRI_BUF_EN		BIT(6)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL1_EG_PORT_BUF_EN		BIT(7)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL1_WRED_EN			BIT(8)</div><div class='add'>+#define   QCA8K_PORT_HOL_CTRL1_EG_MIRROR_EN		BIT(16)</div><div class='add'>+</div><div class='add'>+/* Pkt edit registers */</div><div class='add'>+#define QCA8K_EGREES_VLAN_PORT_SHIFT(_i)		(16 * ((_i) % 2))</div><div class='add'>+#define QCA8K_EGREES_VLAN_PORT_MASK(_i)			(GENMASK(11, 0) &lt;&lt; QCA8K_EGREES_VLAN_PORT_SHIFT(_i))</div><div class='add'>+#define QCA8K_EGREES_VLAN_PORT(_i, x)			((x) &lt;&lt; QCA8K_EGREES_VLAN_PORT_SHIFT(_i))</div><div class='add'>+#define QCA8K_EGRESS_VLAN(x)				(0x0c70 + (4 * (x / 2)))</div><div class='add'>+</div><div class='add'>+/* L3 registers */</div><div class='add'>+#define QCA8K_HROUTER_CONTROL				0xe00</div><div class='add'>+#define   QCA8K_HROUTER_CONTROL_GLB_LOCKTIME_M		GENMASK(17, 16)</div><div class='add'>+#define   QCA8K_HROUTER_CONTROL_GLB_LOCKTIME_S		16</div><div class='add'>+#define   QCA8K_HROUTER_CONTROL_ARP_AGE_MODE		1</div><div class='add'>+#define QCA8K_HROUTER_PBASED_CONTROL1			0xe08</div><div class='add'>+#define QCA8K_HROUTER_PBASED_CONTROL2			0xe0c</div><div class='add'>+#define QCA8K_HNAT_CONTROL				0xe38</div><div class='add'>+</div><div class='add'>+/* MIB registers */</div><div class='add'>+#define QCA8K_PORT_MIB_COUNTER(_i)			(0x1000 + (_i) * 0x100)</div><div class='add'>+</div><div class='add'>+/* QCA specific MII registers */</div><div class='add'>+#define MII_ATH_MMD_ADDR				0x0d</div><div class='add'>+#define MII_ATH_MMD_DATA				0x0e</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	QCA8K_PORT_SPEED_10M = 0,</div><div class='add'>+	QCA8K_PORT_SPEED_100M = 1,</div><div class='add'>+	QCA8K_PORT_SPEED_1000M = 2,</div><div class='add'>+	QCA8K_PORT_SPEED_ERR = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qca8k_fdb_cmd {</div><div class='add'>+	QCA8K_FDB_FLUSH	= 1,</div><div class='add'>+	QCA8K_FDB_LOAD = 2,</div><div class='add'>+	QCA8K_FDB_PURGE = 3,</div><div class='add'>+	QCA8K_FDB_FLUSH_PORT = 5,</div><div class='add'>+	QCA8K_FDB_NEXT = 6,</div><div class='add'>+	QCA8K_FDB_SEARCH = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qca8k_vlan_cmd {</div><div class='add'>+	QCA8K_VLAN_FLUSH = 1,</div><div class='add'>+	QCA8K_VLAN_LOAD = 2,</div><div class='add'>+	QCA8K_VLAN_PURGE = 3,</div><div class='add'>+	QCA8K_VLAN_REMOVE_PORT = 4,</div><div class='add'>+	QCA8K_VLAN_NEXT = 5,</div><div class='add'>+	QCA8K_VLAN_READ = 6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum qca8k_mid_cmd {</div><div class='add'>+	QCA8K_MIB_FLUSH = 1,</div><div class='add'>+	QCA8K_MIB_FLUSH_PORT = 2,</div><div class='add'>+	QCA8K_MIB_CAST = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_priv;</div><div class='add'>+</div><div class='add'>+struct qca8k_info_ops {</div><div class='add'>+	int (*autocast_mib)(struct dsa_switch *ds, int port, u64 *data);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_match_data {</div><div class='add'>+	u8 id;</div><div class='add'>+	bool reduced_package;</div><div class='add'>+	u8 mib_count;</div><div class='add'>+	const struct qca8k_info_ops *ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	QCA8K_CPU_PORT0,</div><div class='add'>+	QCA8K_CPU_PORT6,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_mgmt_eth_data {</div><div class='add'>+	struct completion rw_done;</div><div class='add'>+	struct mutex mutex; /* Enforce one mdio read/write at time */</div><div class='add'>+	bool ack;</div><div class='add'>+	u32 seq;</div><div class='add'>+	u32 data[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_mib_eth_data {</div><div class='add'>+	struct completion rw_done;</div><div class='add'>+	struct mutex mutex; /* Process one command at time */</div><div class='add'>+	refcount_t port_parsed; /* Counter to track parsed port */</div><div class='add'>+	u8 req_port;</div><div class='add'>+	u64 *data; /* pointer to ethtool data */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_ports_config {</div><div class='add'>+	bool sgmii_rx_clk_falling_edge;</div><div class='add'>+	bool sgmii_tx_clk_falling_edge;</div><div class='add'>+	bool sgmii_enable_pll;</div><div class='add'>+	u8 rgmii_rx_delay[QCA8K_NUM_CPU_PORTS]; /* 0: CPU port0, 1: CPU port6 */</div><div class='add'>+	u8 rgmii_tx_delay[QCA8K_NUM_CPU_PORTS]; /* 0: CPU port0, 1: CPU port6 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_mdio_cache {</div><div class='add'>+/* The 32bit switch registers are accessed indirectly. To achieve this we need</div><div class='add'>+ * to set the page of the register. Track the last page that was set to reduce</div><div class='add'>+ * mdio writes</div><div class='add'>+ */</div><div class='add'>+	u16 page;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_pcs {</div><div class='add'>+	struct phylink_pcs pcs;</div><div class='add'>+	struct qca8k_priv *priv;</div><div class='add'>+	int port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_led_pattern_en {</div><div class='add'>+	u32 reg;</div><div class='add'>+	u8 shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_led {</div><div class='add'>+	u8 port_num;</div><div class='add'>+	u8 led_num;</div><div class='add'>+	u16 old_rule;</div><div class='add'>+	struct qca8k_priv *priv;</div><div class='add'>+	struct led_classdev cdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_priv {</div><div class='add'>+	u8 switch_id;</div><div class='add'>+	u8 switch_revision;</div><div class='add'>+	u8 mirror_rx;</div><div class='add'>+	u8 mirror_tx;</div><div class='add'>+	u8 lag_hash_mode;</div><div class='add'>+	/* Each bit correspond to a port. This switch can support a max of 7 port.</div><div class='add'>+	 * Bit 1: port enabled. Bit 0: port disabled.</div><div class='add'>+	 */</div><div class='add'>+	u8 port_enabled_map;</div><div class='add'>+	u8 port_isolated_map;</div><div class='add'>+	struct qca8k_ports_config ports_config;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	struct mii_bus *internal_mdio_bus;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct mutex reg_mutex;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	struct net_device *mgmt_conduit; /* Track if mdio/mib Ethernet is available */</div><div class='add'>+	struct qca8k_mgmt_eth_data mgmt_eth_data;</div><div class='add'>+	struct qca8k_mib_eth_data mib_eth_data;</div><div class='add'>+	struct qca8k_mdio_cache mdio_cache;</div><div class='add'>+	struct qca8k_pcs pcs_port_0;</div><div class='add'>+	struct qca8k_pcs pcs_port_6;</div><div class='add'>+	const struct qca8k_match_data *info;</div><div class='add'>+	struct qca8k_led ports_led[QCA8K_LED_COUNT];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_mib_desc {</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct qca8k_fdb {</div><div class='add'>+	u16 vid;</div><div class='add'>+	u8 port_mask;</div><div class='add'>+	u8 aging;</div><div class='add'>+	u8 mac[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline u32 qca8k_port_to_phy(int port)</div><div class='add'>+{</div><div class='add'>+	/* From Andrew Lunn:</div><div class='add'>+	 * Port 0 has no internal phy.</div><div class='add'>+	 * Port 1 has an internal PHY at MDIO address 0.</div><div class='add'>+	 * Port 2 has an internal PHY at MDIO address 1.</div><div class='add'>+	 * ...</div><div class='add'>+	 * Port 5 has an internal PHY at MDIO address 4.</div><div class='add'>+	 * Port 6 has no internal PHY.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return port - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common setup function */</div><div class='add'>+extern const struct qca8k_mib_desc ar8327_mib[];</div><div class='add'>+extern const struct regmap_access_table qca8k_readable_table;</div><div class='add'>+int qca8k_mib_init(struct qca8k_priv *priv);</div><div class='add'>+void qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable);</div><div class='add'>+int qca8k_read_switch_id(struct qca8k_priv *priv);</div><div class='add'>+</div><div class='add'>+/* Common read/write/rmw function */</div><div class='add'>+int qca8k_read(struct qca8k_priv *priv, u32 reg, u32 *val);</div><div class='add'>+int qca8k_write(struct qca8k_priv *priv, u32 reg, u32 val);</div><div class='add'>+int qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 write_val);</div><div class='add'>+</div><div class='add'>+/* Common ops function */</div><div class='add'>+void qca8k_fdb_flush(struct qca8k_priv *priv);</div><div class='add'>+</div><div class='add'>+/* Common ethtool stats function */</div><div class='add'>+void qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data);</div><div class='add'>+void qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			     uint64_t *data);</div><div class='add'>+int qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='add'>+</div><div class='add'>+/* Common eee function */</div><div class='add'>+int qca8k_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *eee);</div><div class='add'>+</div><div class='add'>+/* Common bridge function */</div><div class='add'>+void qca8k_port_stp_state_set(struct dsa_switch *ds, int port, u8 state);</div><div class='add'>+int qca8k_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				struct switchdev_brport_flags flags,</div><div class='add'>+				struct netlink_ext_ack *extack);</div><div class='add'>+int qca8k_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct switchdev_brport_flags flags,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+int qca8k_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_bridge bridge,</div><div class='add'>+			   bool *tx_fwd_offload,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+void qca8k_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct dsa_bridge bridge);</div><div class='add'>+</div><div class='add'>+/* Common port enable/disable function */</div><div class='add'>+int qca8k_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+		      struct phy_device *phy);</div><div class='add'>+void qca8k_port_disable(struct dsa_switch *ds, int port);</div><div class='add'>+</div><div class='add'>+/* Common MTU function */</div><div class='add'>+int qca8k_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu);</div><div class='add'>+int qca8k_port_max_mtu(struct dsa_switch *ds, int port);</div><div class='add'>+</div><div class='add'>+/* Common fast age function */</div><div class='add'>+void qca8k_port_fast_age(struct dsa_switch *ds, int port);</div><div class='add'>+int qca8k_set_ageing_time(struct dsa_switch *ds, unsigned int msecs);</div><div class='add'>+</div><div class='add'>+/* Common FDB function */</div><div class='add'>+int qca8k_port_fdb_insert(struct qca8k_priv *priv, const u8 *addr,</div><div class='add'>+			  u16 port_mask, u16 vid);</div><div class='add'>+int qca8k_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		       const unsigned char *addr, u16 vid,</div><div class='add'>+		       struct dsa_db db);</div><div class='add'>+int qca8k_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		       const unsigned char *addr, u16 vid,</div><div class='add'>+		       struct dsa_db db);</div><div class='add'>+int qca8k_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			dsa_fdb_dump_cb_t *cb, void *data);</div><div class='add'>+</div><div class='add'>+/* Common MDB function */</div><div class='add'>+int qca8k_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		       struct dsa_db db);</div><div class='add'>+int qca8k_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		       const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+		       struct dsa_db db);</div><div class='add'>+</div><div class='add'>+/* Common port mirror function */</div><div class='add'>+int qca8k_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			  bool ingress, struct netlink_ext_ack *extack);</div><div class='add'>+void qca8k_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_mall_mirror_tc_entry *mirror);</div><div class='add'>+</div><div class='add'>+/* Common port VLAN function */</div><div class='add'>+int qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+int qca8k_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			struct netlink_ext_ack *extack);</div><div class='add'>+int qca8k_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+</div><div class='add'>+/* Common port LAG function */</div><div class='add'>+int qca8k_port_lag_join(struct dsa_switch *ds, int port, struct dsa_lag lag,</div><div class='add'>+			struct netdev_lag_upper_info *info,</div><div class='add'>+			struct netlink_ext_ack *extack);</div><div class='add'>+int qca8k_port_lag_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct dsa_lag lag);</div><div class='add'>+</div><div class='add'>+#endif /* __QCA8K_H */</div><div class='head'>diff --git a/drivers/net/dsa/qca/qca8k_leds.h b/drivers/net/dsa/qca/qca8k_leds.h<br/>new file mode 100644<br/>index 000000000000..ab367f05b173<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca/qca8k_leds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/qca/qca8k_leds.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+</div><div class='add'>+#ifndef __QCA8K_LEDS_H</div><div class='add'>+#define __QCA8K_LEDS_H</div><div class='add'>+</div><div class='add'>+/* Leds Support function */</div><div class='add'>+#ifdef CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT</div><div class='add'>+int qca8k_setup_led_ctrl(struct qca8k_priv *priv);</div><div class='add'>+#else</div><div class='add'>+static inline int qca8k_setup_led_ctrl(struct qca8k_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* __QCA8K_LEDS_H */</div><div class='head'>diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c<br/>deleted file mode 100644<br/>index c4fa400efdcc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca8k.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca8k.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1138 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='del'>- * Copyright (C) 2011-2012 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- * Copyright (c) 2015, The Linux Foundation. All rights reserved.</div><div class='del'>- * Copyright (c) 2016 John Crispin &lt;john@phrozen.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-#include &lt;linux/mdio.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-</div><div class='del'>-#include "qca8k.h"</div><div class='del'>-</div><div class='del'>-#define MIB_DESC(_s, _o, _n)	\</div><div class='del'>-	{			\</div><div class='del'>-		.size = (_s),	\</div><div class='del'>-		.offset = (_o),	\</div><div class='del'>-		.name = (_n),	\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static const struct qca8k_mib_desc ar8327_mib[] = {</div><div class='del'>-	MIB_DESC(1, 0x00, "RxBroad"),</div><div class='del'>-	MIB_DESC(1, 0x04, "RxPause"),</div><div class='del'>-	MIB_DESC(1, 0x08, "RxMulti"),</div><div class='del'>-	MIB_DESC(1, 0x0c, "RxFcsErr"),</div><div class='del'>-	MIB_DESC(1, 0x10, "RxAlignErr"),</div><div class='del'>-	MIB_DESC(1, 0x14, "RxRunt"),</div><div class='del'>-	MIB_DESC(1, 0x18, "RxFragment"),</div><div class='del'>-	MIB_DESC(1, 0x1c, "Rx64Byte"),</div><div class='del'>-	MIB_DESC(1, 0x20, "Rx128Byte"),</div><div class='del'>-	MIB_DESC(1, 0x24, "Rx256Byte"),</div><div class='del'>-	MIB_DESC(1, 0x28, "Rx512Byte"),</div><div class='del'>-	MIB_DESC(1, 0x2c, "Rx1024Byte"),</div><div class='del'>-	MIB_DESC(1, 0x30, "Rx1518Byte"),</div><div class='del'>-	MIB_DESC(1, 0x34, "RxMaxByte"),</div><div class='del'>-	MIB_DESC(1, 0x38, "RxTooLong"),</div><div class='del'>-	MIB_DESC(2, 0x3c, "RxGoodByte"),</div><div class='del'>-	MIB_DESC(2, 0x44, "RxBadByte"),</div><div class='del'>-	MIB_DESC(1, 0x4c, "RxOverFlow"),</div><div class='del'>-	MIB_DESC(1, 0x50, "Filtered"),</div><div class='del'>-	MIB_DESC(1, 0x54, "TxBroad"),</div><div class='del'>-	MIB_DESC(1, 0x58, "TxPause"),</div><div class='del'>-	MIB_DESC(1, 0x5c, "TxMulti"),</div><div class='del'>-	MIB_DESC(1, 0x60, "TxUnderRun"),</div><div class='del'>-	MIB_DESC(1, 0x64, "Tx64Byte"),</div><div class='del'>-	MIB_DESC(1, 0x68, "Tx128Byte"),</div><div class='del'>-	MIB_DESC(1, 0x6c, "Tx256Byte"),</div><div class='del'>-	MIB_DESC(1, 0x70, "Tx512Byte"),</div><div class='del'>-	MIB_DESC(1, 0x74, "Tx1024Byte"),</div><div class='del'>-	MIB_DESC(1, 0x78, "Tx1518Byte"),</div><div class='del'>-	MIB_DESC(1, 0x7c, "TxMaxByte"),</div><div class='del'>-	MIB_DESC(1, 0x80, "TxOverSize"),</div><div class='del'>-	MIB_DESC(2, 0x84, "TxByte"),</div><div class='del'>-	MIB_DESC(1, 0x8c, "TxCollision"),</div><div class='del'>-	MIB_DESC(1, 0x90, "TxAbortCol"),</div><div class='del'>-	MIB_DESC(1, 0x94, "TxMultiCol"),</div><div class='del'>-	MIB_DESC(1, 0x98, "TxSingleCol"),</div><div class='del'>-	MIB_DESC(1, 0x9c, "TxExcDefer"),</div><div class='del'>-	MIB_DESC(1, 0xa0, "TxDefer"),</div><div class='del'>-	MIB_DESC(1, 0xa4, "TxLateCol"),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The 32bit switch registers are accessed indirectly. To achieve this we need</div><div class='del'>- * to set the page of the register. Track the last page that was set to reduce</div><div class='del'>- * mdio writes</div><div class='del'>- */</div><div class='del'>-static u16 qca8k_current_page = 0xffff;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_split_addr(u32 regaddr, u16 *r1, u16 *r2, u16 *page)</div><div class='del'>-{</div><div class='del'>-	regaddr &gt;&gt;= 1;</div><div class='del'>-	*r1 = regaddr &amp; 0x1e;</div><div class='del'>-</div><div class='del'>-	regaddr &gt;&gt;= 5;</div><div class='del'>-	*r2 = regaddr &amp; 0x7;</div><div class='del'>-</div><div class='del'>-	regaddr &gt;&gt;= 3;</div><div class='del'>-	*page = regaddr &amp; 0x3ff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-qca8k_mii_read32(struct mii_bus *bus, int phy_id, u32 regnum)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = bus-&gt;read(bus, phy_id, regnum);</div><div class='del'>-	if (ret &gt;= 0) {</div><div class='del'>-		val = ret;</div><div class='del'>-		ret = bus-&gt;read(bus, phy_id, regnum + 1);</div><div class='del'>-		val |= ret &lt;&lt; 16;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='del'>-				    "failed to read qca8k 32bit register\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_mii_write32(struct mii_bus *bus, int phy_id, u32 regnum, u32 val)</div><div class='del'>-{</div><div class='del'>-	u16 lo, hi;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	lo = val &amp; 0xffff;</div><div class='del'>-	hi = (u16)(val &gt;&gt; 16);</div><div class='del'>-</div><div class='del'>-	ret = bus-&gt;write(bus, phy_id, regnum, lo);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		ret = bus-&gt;write(bus, phy_id, regnum + 1, hi);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='del'>-				    "failed to write qca8k 32bit register\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_set_page(struct mii_bus *bus, u16 page)</div><div class='del'>-{</div><div class='del'>-	if (page == qca8k_current_page)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (bus-&gt;write(bus, 0x18, 0, page) &lt; 0)</div><div class='del'>-		dev_err_ratelimited(&amp;bus-&gt;dev,</div><div class='del'>-				    "failed to set qca8k page\n");</div><div class='del'>-	qca8k_current_page = page;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-qca8k_read(struct qca8k_priv *priv, u32 reg)</div><div class='del'>-{</div><div class='del'>-	u16 r1, r2, page;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='del'>-</div><div class='del'>-	mutex_lock_nested(&amp;priv-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='del'>-</div><div class='del'>-	qca8k_set_page(priv-&gt;bus, page);</div><div class='del'>-	val = qca8k_mii_read32(priv-&gt;bus, 0x10 | r2, r1);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;bus-&gt;mdio_lock);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_write(struct qca8k_priv *priv, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	u16 r1, r2, page;</div><div class='del'>-</div><div class='del'>-	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='del'>-</div><div class='del'>-	mutex_lock_nested(&amp;priv-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='del'>-</div><div class='del'>-	qca8k_set_page(priv-&gt;bus, page);</div><div class='del'>-	qca8k_mii_write32(priv-&gt;bus, 0x10 | r2, r1, val);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;bus-&gt;mdio_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-qca8k_rmw(struct qca8k_priv *priv, u32 reg, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	u16 r1, r2, page;</div><div class='del'>-	u32 ret;</div><div class='del'>-</div><div class='del'>-	qca8k_split_addr(reg, &amp;r1, &amp;r2, &amp;page);</div><div class='del'>-</div><div class='del'>-	mutex_lock_nested(&amp;priv-&gt;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='del'>-</div><div class='del'>-	qca8k_set_page(priv-&gt;bus, page);</div><div class='del'>-	ret = qca8k_mii_read32(priv-&gt;bus, 0x10 | r2, r1);</div><div class='del'>-	ret &amp;= ~mask;</div><div class='del'>-	ret |= val;</div><div class='del'>-	qca8k_mii_write32(priv-&gt;bus, 0x10 | r2, r1, ret);</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;bus-&gt;mdio_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_reg_set(struct qca8k_priv *priv, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	qca8k_rmw(priv, reg, 0, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_reg_clear(struct qca8k_priv *priv, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	qca8k_rmw(priv, reg, val, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_regmap_read(void *ctx, uint32_t reg, uint32_t *val)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ctx;</div><div class='del'>-</div><div class='del'>-	*val = qca8k_read(priv, reg);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_regmap_write(void *ctx, uint32_t reg, uint32_t val)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ctx;</div><div class='del'>-</div><div class='del'>-	qca8k_write(priv, reg, val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct regmap_range qca8k_readable_ranges[] = {</div><div class='del'>-	regmap_reg_range(0x0000, 0x00e4), /* Global control */</div><div class='del'>-	regmap_reg_range(0x0100, 0x0168), /* EEE control */</div><div class='del'>-	regmap_reg_range(0x0200, 0x0270), /* Parser control */</div><div class='del'>-	regmap_reg_range(0x0400, 0x0454), /* ACL */</div><div class='del'>-	regmap_reg_range(0x0600, 0x0718), /* Lookup */</div><div class='del'>-	regmap_reg_range(0x0800, 0x0b70), /* QM */</div><div class='del'>-	regmap_reg_range(0x0c00, 0x0c80), /* PKT */</div><div class='del'>-	regmap_reg_range(0x0e00, 0x0e98), /* L3 */</div><div class='del'>-	regmap_reg_range(0x1000, 0x10ac), /* MIB - Port0 */</div><div class='del'>-	regmap_reg_range(0x1100, 0x11ac), /* MIB - Port1 */</div><div class='del'>-	regmap_reg_range(0x1200, 0x12ac), /* MIB - Port2 */</div><div class='del'>-	regmap_reg_range(0x1300, 0x13ac), /* MIB - Port3 */</div><div class='del'>-	regmap_reg_range(0x1400, 0x14ac), /* MIB - Port4 */</div><div class='del'>-	regmap_reg_range(0x1500, 0x15ac), /* MIB - Port5 */</div><div class='del'>-	regmap_reg_range(0x1600, 0x16ac), /* MIB - Port6 */</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct regmap_access_table qca8k_readable_table = {</div><div class='del'>-	.yes_ranges = qca8k_readable_ranges,</div><div class='del'>-	.n_yes_ranges = ARRAY_SIZE(qca8k_readable_ranges),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct regmap_config qca8k_regmap_config = {</div><div class='del'>-	.reg_bits = 16,</div><div class='del'>-	.val_bits = 32,</div><div class='del'>-	.reg_stride = 4,</div><div class='del'>-	.max_register = 0x16ac, /* end MIB - Port6 range */</div><div class='del'>-	.reg_read = qca8k_regmap_read,</div><div class='del'>-	.reg_write = qca8k_regmap_write,</div><div class='del'>-	.rd_table = &amp;qca8k_readable_table,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_busy_wait(struct qca8k_priv *priv, u32 reg, u32 mask)</div><div class='del'>-{</div><div class='del'>-	unsigned long timeout;</div><div class='del'>-</div><div class='del'>-	timeout = jiffies + msecs_to_jiffies(20);</div><div class='del'>-</div><div class='del'>-	/* loop until the busy flag has cleared */</div><div class='del'>-	do {</div><div class='del'>-		u32 val = qca8k_read(priv, reg);</div><div class='del'>-		int busy = val &amp; mask;</div><div class='del'>-</div><div class='del'>-		if (!busy)</div><div class='del'>-			break;</div><div class='del'>-		cond_resched();</div><div class='del'>-	} while (!time_after_eq(jiffies, timeout));</div><div class='del'>-</div><div class='del'>-	return time_after_eq(jiffies, timeout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_fdb_read(struct qca8k_priv *priv, struct qca8k_fdb *fdb)</div><div class='del'>-{</div><div class='del'>-	u32 reg[4];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* load the ARL table into an array */</div><div class='del'>-	for (i = 0; i &lt; 4; i++)</div><div class='del'>-		reg[i] = qca8k_read(priv, QCA8K_REG_ATU_DATA0 + (i * 4));</div><div class='del'>-</div><div class='del'>-	/* vid - 83:72 */</div><div class='del'>-	fdb-&gt;vid = (reg[2] &gt;&gt; QCA8K_ATU_VID_S) &amp; QCA8K_ATU_VID_M;</div><div class='del'>-	/* aging - 67:64 */</div><div class='del'>-	fdb-&gt;aging = reg[2] &amp; QCA8K_ATU_STATUS_M;</div><div class='del'>-	/* portmask - 54:48 */</div><div class='del'>-	fdb-&gt;port_mask = (reg[1] &gt;&gt; QCA8K_ATU_PORT_S) &amp; QCA8K_ATU_PORT_M;</div><div class='del'>-	/* mac - 47:0 */</div><div class='del'>-	fdb-&gt;mac[0] = (reg[1] &gt;&gt; QCA8K_ATU_ADDR0_S) &amp; 0xff;</div><div class='del'>-	fdb-&gt;mac[1] = reg[1] &amp; 0xff;</div><div class='del'>-	fdb-&gt;mac[2] = (reg[0] &gt;&gt; QCA8K_ATU_ADDR2_S) &amp; 0xff;</div><div class='del'>-	fdb-&gt;mac[3] = (reg[0] &gt;&gt; QCA8K_ATU_ADDR3_S) &amp; 0xff;</div><div class='del'>-	fdb-&gt;mac[4] = (reg[0] &gt;&gt; QCA8K_ATU_ADDR4_S) &amp; 0xff;</div><div class='del'>-	fdb-&gt;mac[5] = reg[0] &amp; 0xff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_fdb_write(struct qca8k_priv *priv, u16 vid, u8 port_mask, const u8 *mac,</div><div class='del'>-		u8 aging)</div><div class='del'>-{</div><div class='del'>-	u32 reg[3] = { 0 };</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* vid - 83:72 */</div><div class='del'>-	reg[2] = (vid &amp; QCA8K_ATU_VID_M) &lt;&lt; QCA8K_ATU_VID_S;</div><div class='del'>-	/* aging - 67:64 */</div><div class='del'>-	reg[2] |= aging &amp; QCA8K_ATU_STATUS_M;</div><div class='del'>-	/* portmask - 54:48 */</div><div class='del'>-	reg[1] = (port_mask &amp; QCA8K_ATU_PORT_M) &lt;&lt; QCA8K_ATU_PORT_S;</div><div class='del'>-	/* mac - 47:0 */</div><div class='del'>-	reg[1] |= mac[0] &lt;&lt; QCA8K_ATU_ADDR0_S;</div><div class='del'>-	reg[1] |= mac[1];</div><div class='del'>-	reg[0] |= mac[2] &lt;&lt; QCA8K_ATU_ADDR2_S;</div><div class='del'>-	reg[0] |= mac[3] &lt;&lt; QCA8K_ATU_ADDR3_S;</div><div class='del'>-	reg[0] |= mac[4] &lt;&lt; QCA8K_ATU_ADDR4_S;</div><div class='del'>-	reg[0] |= mac[5];</div><div class='del'>-</div><div class='del'>-	/* load the array into the ARL table */</div><div class='del'>-	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		qca8k_write(priv, QCA8K_REG_ATU_DATA0 + (i * 4), reg[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_fdb_access(struct qca8k_priv *priv, enum qca8k_fdb_cmd cmd, int port)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	/* Set the command and FDB index */</div><div class='del'>-	reg = QCA8K_ATU_FUNC_BUSY;</div><div class='del'>-	reg |= cmd;</div><div class='del'>-	if (port &gt;= 0) {</div><div class='del'>-		reg |= QCA8K_ATU_FUNC_PORT_EN;</div><div class='del'>-		reg |= (port &amp; QCA8K_ATU_FUNC_PORT_M) &lt;&lt; QCA8K_ATU_FUNC_PORT_S;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Write the function register triggering the table access */</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_ATU_FUNC, reg);</div><div class='del'>-</div><div class='del'>-	/* wait for completion */</div><div class='del'>-	if (qca8k_busy_wait(priv, QCA8K_REG_ATU_FUNC, QCA8K_ATU_FUNC_BUSY))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Check for table full violation when adding an entry */</div><div class='del'>-	if (cmd == QCA8K_FDB_LOAD) {</div><div class='del'>-		reg = qca8k_read(priv, QCA8K_REG_ATU_FUNC);</div><div class='del'>-		if (reg &amp; QCA8K_ATU_FUNC_FULL)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_fdb_next(struct qca8k_priv *priv, struct qca8k_fdb *fdb, int port)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	qca8k_fdb_write(priv, fdb-&gt;vid, fdb-&gt;port_mask, fdb-&gt;mac, fdb-&gt;aging);</div><div class='del'>-	ret = qca8k_fdb_access(priv, QCA8K_FDB_NEXT, port);</div><div class='del'>-	if (ret &gt;= 0)</div><div class='del'>-		qca8k_fdb_read(priv, fdb);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_fdb_add(struct qca8k_priv *priv, const u8 *mac, u16 port_mask,</div><div class='del'>-	      u16 vid, u8 aging)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	qca8k_fdb_write(priv, vid, port_mask, mac, aging);</div><div class='del'>-	ret = qca8k_fdb_access(priv, QCA8K_FDB_LOAD, -1);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_fdb_del(struct qca8k_priv *priv, const u8 *mac, u16 port_mask, u16 vid)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	qca8k_fdb_write(priv, vid, port_mask, mac, 0);</div><div class='del'>-	ret = qca8k_fdb_access(priv, QCA8K_FDB_PURGE, -1);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_fdb_flush(struct qca8k_priv *priv)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	qca8k_fdb_access(priv, QCA8K_FDB_FLUSH, -1);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_mib_init(struct qca8k_priv *priv)</div><div class='del'>-{</div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_FLUSH | QCA8K_MIB_BUSY);</div><div class='del'>-	qca8k_busy_wait(priv, QCA8K_REG_MIB, QCA8K_MIB_BUSY);</div><div class='del'>-	qca8k_reg_set(priv, QCA8K_REG_MIB, QCA8K_MIB_CPU_KEEP);</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_MODULE_EN, QCA8K_MODULE_EN_MIB);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode)</div><div class='del'>-{</div><div class='del'>-	u32 reg, val;</div><div class='del'>-</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 0:</div><div class='del'>-		reg = QCA8K_REG_PORT0_PAD_CTRL;</div><div class='del'>-		break;</div><div class='del'>-	case 6:</div><div class='del'>-		reg = QCA8K_REG_PORT6_PAD_CTRL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("Can't set PAD_CTRL on port %d\n", port);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Configure a port to be directly connected to an external</div><div class='del'>-	 * PHY or MAC.</div><div class='del'>-	 */</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII:</div><div class='del'>-		/* RGMII mode means no delay so don't enable the delay */</div><div class='del'>-		val = QCA8K_PORT_PAD_RGMII_EN;</div><div class='del'>-		qca8k_write(priv, reg, val);</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='del'>-		/* RGMII_ID needs internal delay. This is enabled through</div><div class='del'>-		 * PORT5_PAD_CTRL for all ports, rather than individual port</div><div class='del'>-		 * registers</div><div class='del'>-		 */</div><div class='del'>-		qca8k_write(priv, reg,</div><div class='del'>-			    QCA8K_PORT_PAD_RGMII_EN |</div><div class='del'>-			    QCA8K_PORT_PAD_RGMII_TX_DELAY(QCA8K_MAX_DELAY) |</div><div class='del'>-			    QCA8K_PORT_PAD_RGMII_RX_DELAY(QCA8K_MAX_DELAY));</div><div class='del'>-		qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL,</div><div class='del'>-			    QCA8K_PORT_PAD_RGMII_RX_DELAY_EN);</div><div class='del'>-		break;</div><div class='del'>-	case PHY_INTERFACE_MODE_SGMII:</div><div class='del'>-		qca8k_write(priv, reg, QCA8K_PORT_PAD_SGMII_EN);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("xMII mode %d not supported\n", mode);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable)</div><div class='del'>-{</div><div class='del'>-	u32 mask = QCA8K_PORT_STATUS_TXMAC | QCA8K_PORT_STATUS_RXMAC;</div><div class='del'>-</div><div class='del'>-	/* Port 0 and 6 have no internal PHY */</div><div class='del'>-	if (port &gt; 0 &amp;&amp; port &lt; 6)</div><div class='del'>-		mask |= QCA8K_PORT_STATUS_LINK_AUTO;</div><div class='del'>-</div><div class='del'>-	if (enable)</div><div class='del'>-		qca8k_reg_set(priv, QCA8K_REG_PORT_STATUS(port), mask);</div><div class='del'>-	else</div><div class='del'>-		qca8k_reg_clear(priv, QCA8K_REG_PORT_STATUS(port), mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32</div><div class='del'>-qca8k_port_to_phy(int port)</div><div class='del'>-{</div><div class='del'>-	/* From Andrew Lunn:</div><div class='del'>-	 * Port 0 has no internal phy.</div><div class='del'>-	 * Port 1 has an internal PHY at MDIO address 0.</div><div class='del'>-	 * Port 2 has an internal PHY at MDIO address 1.</div><div class='del'>-	 * ...</div><div class='del'>-	 * Port 5 has an internal PHY at MDIO address 4.</div><div class='del'>-	 * Port 6 has no internal PHY.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	return port - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_mdio_write(struct qca8k_priv *priv, int port, u32 regnum, u16 data)</div><div class='del'>-{</div><div class='del'>-	u32 phy, val;</div><div class='del'>-</div><div class='del'>-	if (regnum &gt;= QCA8K_MDIO_MASTER_MAX_REG)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* callee is responsible for not passing bad ports,</div><div class='del'>-	 * but we still would like to make spills impossible.</div><div class='del'>-	 */</div><div class='del'>-	phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;</div><div class='del'>-	val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |</div><div class='del'>-	      QCA8K_MDIO_MASTER_WRITE | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |</div><div class='del'>-	      QCA8K_MDIO_MASTER_REG_ADDR(regnum) |</div><div class='del'>-	      QCA8K_MDIO_MASTER_DATA(data);</div><div class='del'>-</div><div class='del'>-	qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val);</div><div class='del'>-</div><div class='del'>-	return qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,</div><div class='del'>-		QCA8K_MDIO_MASTER_BUSY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_mdio_read(struct qca8k_priv *priv, int port, u32 regnum)</div><div class='del'>-{</div><div class='del'>-	u32 phy, val;</div><div class='del'>-</div><div class='del'>-	if (regnum &gt;= QCA8K_MDIO_MASTER_MAX_REG)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* callee is responsible for not passing bad ports,</div><div class='del'>-	 * but we still would like to make spills impossible.</div><div class='del'>-	 */</div><div class='del'>-	phy = qca8k_port_to_phy(port) % PHY_MAX_ADDR;</div><div class='del'>-	val = QCA8K_MDIO_MASTER_BUSY | QCA8K_MDIO_MASTER_EN |</div><div class='del'>-	      QCA8K_MDIO_MASTER_READ | QCA8K_MDIO_MASTER_PHY_ADDR(phy) |</div><div class='del'>-	      QCA8K_MDIO_MASTER_REG_ADDR(regnum);</div><div class='del'>-</div><div class='del'>-	qca8k_write(priv, QCA8K_MDIO_MASTER_CTRL, val);</div><div class='del'>-</div><div class='del'>-	if (qca8k_busy_wait(priv, QCA8K_MDIO_MASTER_CTRL,</div><div class='del'>-			    QCA8K_MDIO_MASTER_BUSY))</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	val = (qca8k_read(priv, QCA8K_MDIO_MASTER_CTRL) &amp;</div><div class='del'>-		QCA8K_MDIO_MASTER_DATA_MASK);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_phy_write(struct dsa_switch *ds, int port, int regnum, u16 data)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return qca8k_mdio_write(priv, port, regnum, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_phy_read(struct dsa_switch *ds, int port, int regnum)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = qca8k_mdio_read(priv, port, regnum);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return 0xffff;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_setup_mdio_bus(struct qca8k_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 internal_mdio_mask = 0, external_mdio_mask = 0, reg;</div><div class='del'>-	struct device_node *ports, *port;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	ports = of_get_child_by_name(priv-&gt;dev-&gt;of_node, "ports");</div><div class='del'>-	if (!ports)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for_each_available_child_of_node(ports, port) {</div><div class='del'>-		err = of_property_read_u32(port, "reg", &amp;reg);</div><div class='del'>-		if (err)</div><div class='del'>-			return err;</div><div class='del'>-</div><div class='del'>-		if (!dsa_is_user_port(priv-&gt;ds, reg))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (of_property_read_bool(port, "phy-handle"))</div><div class='del'>-			external_mdio_mask |= BIT(reg);</div><div class='del'>-		else</div><div class='del'>-			internal_mdio_mask |= BIT(reg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!external_mdio_mask &amp;&amp; !internal_mdio_mask) {</div><div class='del'>-		dev_err(priv-&gt;dev, "no PHYs are defined.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The QCA8K_MDIO_MASTER_EN Bit, which grants access to PHYs through</div><div class='del'>-	 * the MDIO_MASTER register also _disconnects_ the external MDC</div><div class='del'>-	 * passthrough to the internal PHYs. It's not possible to use both</div><div class='del'>-	 * configurations at the same time!</div><div class='del'>-	 *</div><div class='del'>-	 * Because this came up during the review process:</div><div class='del'>-	 * If the external mdio-bus driver is capable magically disabling</div><div class='del'>-	 * the QCA8K_MDIO_MASTER_EN and mutex/spin-locking out the qca8k's</div><div class='del'>-	 * accessors for the time being, it would be possible to pull this</div><div class='del'>-	 * off.</div><div class='del'>-	 */</div><div class='del'>-	if (!!external_mdio_mask &amp;&amp; !!internal_mdio_mask) {</div><div class='del'>-		dev_err(priv-&gt;dev, "either internal or external mdio bus configuration is supported.\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (external_mdio_mask) {</div><div class='del'>-		/* Make sure to disable the internal mdio bus in cases</div><div class='del'>-		 * a dt-overlay and driver reload changed the configuration</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		qca8k_reg_clear(priv, QCA8K_MDIO_MASTER_CTRL,</div><div class='del'>-				QCA8K_MDIO_MASTER_EN);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;ops.phy_read = qca8k_phy_read;</div><div class='del'>-	priv-&gt;ops.phy_write = qca8k_phy_write;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_setup(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	int ret, i, phy_mode = -1;</div><div class='del'>-	u32 mask;</div><div class='del'>-</div><div class='del'>-	/* Make sure that port 0 is the cpu port */</div><div class='del'>-	if (!dsa_is_cpu_port(ds, 0)) {</div><div class='del'>-		pr_err("port 0 is not the CPU port\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mutex_init(&amp;priv-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	/* Start by setting up the register mapping */</div><div class='del'>-	priv-&gt;regmap = devm_regmap_init(ds-&gt;dev, NULL, priv,</div><div class='del'>-					&amp;qca8k_regmap_config);</div><div class='del'>-	if (IS_ERR(priv-&gt;regmap))</div><div class='del'>-		pr_warn("regmap initialization failed");</div><div class='del'>-</div><div class='del'>-	ret = qca8k_setup_mdio_bus(priv);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Initialize CPU port pad mode (xMII type, delays...) */</div><div class='del'>-	phy_mode = of_get_phy_mode(ds-&gt;ports[QCA8K_CPU_PORT].dn);</div><div class='del'>-	if (phy_mode &lt; 0) {</div><div class='del'>-		pr_err("Can't find phy-mode for master device\n");</div><div class='del'>-		return phy_mode;</div><div class='del'>-	}</div><div class='del'>-	ret = qca8k_set_pad_ctrl(priv, QCA8K_CPU_PORT, phy_mode);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Enable CPU Port, force it to maximum bandwidth and full-duplex */</div><div class='del'>-	mask = QCA8K_PORT_STATUS_SPEED_1000 | QCA8K_PORT_STATUS_TXFLOW |</div><div class='del'>-	       QCA8K_PORT_STATUS_RXFLOW | QCA8K_PORT_STATUS_DUPLEX;</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_PORT_STATUS(QCA8K_CPU_PORT), mask);</div><div class='del'>-	qca8k_reg_set(priv, QCA8K_REG_GLOBAL_FW_CTRL0,</div><div class='del'>-		      QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN);</div><div class='del'>-	qca8k_port_set_status(priv, QCA8K_CPU_PORT, 1);</div><div class='del'>-	priv-&gt;port_sts[QCA8K_CPU_PORT].enabled = 1;</div><div class='del'>-</div><div class='del'>-	/* Enable MIB counters */</div><div class='del'>-	qca8k_mib_init(priv);</div><div class='del'>-</div><div class='del'>-	/* Enable QCA header mode on the cpu port */</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_PORT_HDR_CTRL(QCA8K_CPU_PORT),</div><div class='del'>-		    QCA8K_PORT_HDR_CTRL_ALL &lt;&lt; QCA8K_PORT_HDR_CTRL_TX_S |</div><div class='del'>-		    QCA8K_PORT_HDR_CTRL_ALL &lt;&lt; QCA8K_PORT_HDR_CTRL_RX_S);</div><div class='del'>-</div><div class='del'>-	/* Disable forwarding by default on all ports */</div><div class='del'>-	for (i = 0; i &lt; QCA8K_NUM_PORTS; i++)</div><div class='del'>-		qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='del'>-			  QCA8K_PORT_LOOKUP_MEMBER, 0);</div><div class='del'>-</div><div class='del'>-	/* Disable MAC by default on all user ports */</div><div class='del'>-	for (i = 1; i &lt; QCA8K_NUM_PORTS; i++)</div><div class='del'>-		if (dsa_is_user_port(ds, i))</div><div class='del'>-			qca8k_port_set_status(priv, i, 0);</div><div class='del'>-</div><div class='del'>-	/* Forward all unknown frames to CPU port for Linux processing */</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_GLOBAL_FW_CTRL1,</div><div class='del'>-		    BIT(0) &lt;&lt; QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_S |</div><div class='del'>-		    BIT(0) &lt;&lt; QCA8K_GLOBAL_FW_CTRL1_BC_DP_S |</div><div class='del'>-		    BIT(0) &lt;&lt; QCA8K_GLOBAL_FW_CTRL1_MC_DP_S |</div><div class='del'>-		    BIT(0) &lt;&lt; QCA8K_GLOBAL_FW_CTRL1_UC_DP_S);</div><div class='del'>-</div><div class='del'>-	/* Setup connection between CPU port &amp; user ports */</div><div class='del'>-	for (i = 0; i &lt; DSA_MAX_PORTS; i++) {</div><div class='del'>-		/* CPU port gets connected to all user ports of the switch */</div><div class='del'>-		if (dsa_is_cpu_port(ds, i)) {</div><div class='del'>-			qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),</div><div class='del'>-				  QCA8K_PORT_LOOKUP_MEMBER, dsa_user_ports(ds));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Invividual user ports get connected to CPU port only */</div><div class='del'>-		if (dsa_is_user_port(ds, i)) {</div><div class='del'>-			int shift = 16 * (i % 2);</div><div class='del'>-</div><div class='del'>-			qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='del'>-				  QCA8K_PORT_LOOKUP_MEMBER,</div><div class='del'>-				  BIT(QCA8K_CPU_PORT));</div><div class='del'>-</div><div class='del'>-			/* Enable ARP Auto-learning by default */</div><div class='del'>-			qca8k_reg_set(priv, QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='del'>-				      QCA8K_PORT_LOOKUP_LEARN);</div><div class='del'>-</div><div class='del'>-			/* For port based vlans to work we need to set the</div><div class='del'>-			 * default egress vid</div><div class='del'>-			 */</div><div class='del'>-			qca8k_rmw(priv, QCA8K_EGRESS_VLAN(i),</div><div class='del'>-				  0xffff &lt;&lt; shift, 1 &lt;&lt; shift);</div><div class='del'>-			qca8k_write(priv, QCA8K_REG_PORT_VLAN_CTRL0(i),</div><div class='del'>-				    QCA8K_PORT_VLAN_CVID(1) |</div><div class='del'>-				    QCA8K_PORT_VLAN_SVID(1));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Flush the FDB table */</div><div class='del'>-	qca8k_fdb_flush(priv);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phy)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = ds-&gt;priv;</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	/* Force fixed-link setting for CPU port, skip others. */</div><div class='del'>-	if (!phy_is_pseudo_fixed_link(phy))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set port speed */</div><div class='del'>-	switch (phy-&gt;speed) {</div><div class='del'>-	case 10:</div><div class='del'>-		reg = QCA8K_PORT_STATUS_SPEED_10;</div><div class='del'>-		break;</div><div class='del'>-	case 100:</div><div class='del'>-		reg = QCA8K_PORT_STATUS_SPEED_100;</div><div class='del'>-		break;</div><div class='del'>-	case 1000:</div><div class='del'>-		reg = QCA8K_PORT_STATUS_SPEED_1000;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_dbg(priv-&gt;dev, "port%d link speed %dMbps not supported.\n",</div><div class='del'>-			port, phy-&gt;speed);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set duplex mode */</div><div class='del'>-	if (phy-&gt;duplex == DUPLEX_FULL)</div><div class='del'>-		reg |= QCA8K_PORT_STATUS_DUPLEX;</div><div class='del'>-</div><div class='del'>-	/* Force flow control */</div><div class='del'>-	if (dsa_is_cpu_port(ds, port))</div><div class='del'>-		reg |= QCA8K_PORT_STATUS_RXFLOW | QCA8K_PORT_STATUS_TXFLOW;</div><div class='del'>-</div><div class='del'>-	/* Force link down before changing MAC options */</div><div class='del'>-	qca8k_port_set_status(priv, port, 0);</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_PORT_STATUS(port), reg);</div><div class='del'>-	qca8k_port_set_status(priv, port, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (stringset != ETH_SS_STATS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ar8327_mib); i++)</div><div class='del'>-		strncpy(data + i * ETH_GSTRING_LEN, ar8327_mib[i].name,</div><div class='del'>-			ETH_GSTRING_LEN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='del'>-			uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	const struct qca8k_mib_desc *mib;</div><div class='del'>-	u32 reg, i;</div><div class='del'>-	u64 hi;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(ar8327_mib); i++) {</div><div class='del'>-		mib = &amp;ar8327_mib[i];</div><div class='del'>-		reg = QCA8K_PORT_MIB_COUNTER(port) + mib-&gt;offset;</div><div class='del'>-</div><div class='del'>-		data[i] = qca8k_read(priv, reg);</div><div class='del'>-		if (mib-&gt;size == 2) {</div><div class='del'>-			hi = qca8k_read(priv, reg + 4);</div><div class='del'>-			data[i] |= hi &lt;&lt; 32;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='del'>-{</div><div class='del'>-	if (sset != ETH_SS_STATS)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return ARRAY_SIZE(ar8327_mib);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *eee)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	u32 lpi_en = QCA8K_REG_EEE_CTRL_LPI_EN(port);</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	reg = qca8k_read(priv, QCA8K_REG_EEE_CTRL);</div><div class='del'>-	if (eee-&gt;eee_enabled)</div><div class='del'>-		reg |= lpi_en;</div><div class='del'>-	else</div><div class='del'>-		reg &amp;= ~lpi_en;</div><div class='del'>-	qca8k_write(priv, QCA8K_REG_EEE_CTRL, reg);</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_eee *e)</div><div class='del'>-{</div><div class='del'>-	/* Nothing to do on the port's MAC */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	u32 stp_state;</div><div class='del'>-</div><div class='del'>-	switch (state) {</div><div class='del'>-	case BR_STATE_DISABLED:</div><div class='del'>-		stp_state = QCA8K_PORT_LOOKUP_STATE_DISABLED;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_BLOCKING:</div><div class='del'>-		stp_state = QCA8K_PORT_LOOKUP_STATE_BLOCKING;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_LISTENING:</div><div class='del'>-		stp_state = QCA8K_PORT_LOOKUP_STATE_LISTENING;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_LEARNING:</div><div class='del'>-		stp_state = QCA8K_PORT_LOOKUP_STATE_LEARNING;</div><div class='del'>-		break;</div><div class='del'>-	case BR_STATE_FORWARDING:</div><div class='del'>-	default:</div><div class='del'>-		stp_state = QCA8K_PORT_LOOKUP_STATE_FORWARD;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='del'>-		  QCA8K_PORT_LOOKUP_STATE_MASK, stp_state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	int port_mask = BIT(QCA8K_CPU_PORT);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; QCA8K_NUM_PORTS; i++) {</div><div class='del'>-		if (dsa_to_port(ds, i)-&gt;bridge_dev != br)</div><div class='del'>-			continue;</div><div class='del'>-		/* Add this port to the portvlan mask of the other ports</div><div class='del'>-		 * in the bridge</div><div class='del'>-		 */</div><div class='del'>-		qca8k_reg_set(priv,</div><div class='del'>-			      QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='del'>-			      BIT(port));</div><div class='del'>-		if (i != port)</div><div class='del'>-			port_mask |= BIT(i);</div><div class='del'>-	}</div><div class='del'>-	/* Add all other ports to this ports portvlan mask */</div><div class='del'>-	qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='del'>-		  QCA8K_PORT_LOOKUP_MEMBER, port_mask);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_port_bridge_leave(struct dsa_switch *ds, int port, struct net_device *br)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 1; i &lt; QCA8K_NUM_PORTS; i++) {</div><div class='del'>-		if (dsa_to_port(ds, i)-&gt;bridge_dev != br)</div><div class='del'>-			continue;</div><div class='del'>-		/* Remove this port to the portvlan mask of the other ports</div><div class='del'>-		 * in the bridge</div><div class='del'>-		 */</div><div class='del'>-		qca8k_reg_clear(priv,</div><div class='del'>-				QCA8K_PORT_LOOKUP_CTRL(i),</div><div class='del'>-				BIT(port));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the cpu port to be the only one in the portvlan mask of</div><div class='del'>-	 * this port</div><div class='del'>-	 */</div><div class='del'>-	qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),</div><div class='del'>-		  QCA8K_PORT_LOOKUP_MEMBER, BIT(QCA8K_CPU_PORT));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_port_enable(struct dsa_switch *ds, int port,</div><div class='del'>-		  struct phy_device *phy)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	qca8k_port_set_status(priv, port, 1);</div><div class='del'>-	priv-&gt;port_sts[port].enabled = 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_port_disable(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	qca8k_port_set_status(priv, port, 0);</div><div class='del'>-	priv-&gt;port_sts[port].enabled = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_port_fdb_insert(struct qca8k_priv *priv, const u8 *addr,</div><div class='del'>-		      u16 port_mask, u16 vid)</div><div class='del'>-{</div><div class='del'>-	/* Set the vid to the port vlan id if no vid is set */</div><div class='del'>-	if (!vid)</div><div class='del'>-		vid = 1;</div><div class='del'>-</div><div class='del'>-	return qca8k_fdb_add(priv, addr, port_mask, vid,</div><div class='del'>-			     QCA8K_ATU_STATUS_STATIC);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-		   const unsigned char *addr, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	u16 port_mask = BIT(port);</div><div class='del'>-</div><div class='del'>-	return qca8k_port_fdb_insert(priv, addr, port_mask, vid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-		   const unsigned char *addr, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	u16 port_mask = BIT(port);</div><div class='del'>-</div><div class='del'>-	if (!vid)</div><div class='del'>-		vid = 1;</div><div class='del'>-</div><div class='del'>-	return qca8k_fdb_del(priv, addr, port_mask, vid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='del'>-		    dsa_fdb_dump_cb_t *cb, void *data)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = (struct qca8k_priv *)ds-&gt;priv;</div><div class='del'>-	struct qca8k_fdb _fdb = { 0 };</div><div class='del'>-	int cnt = QCA8K_NUM_FDB_RECORDS;</div><div class='del'>-	bool is_static;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	while (cnt-- &amp;&amp; !qca8k_fdb_next(priv, &amp;_fdb, port)) {</div><div class='del'>-		if (!_fdb.aging)</div><div class='del'>-			break;</div><div class='del'>-		is_static = (_fdb.aging == QCA8K_ATU_STATUS_STATIC);</div><div class='del'>-		ret = cb(_fdb.mac, _fdb.vid, is_static, data);</div><div class='del'>-		if (ret)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;priv-&gt;reg_mutex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum dsa_tag_protocol</div><div class='del'>-qca8k_get_tag_protocol(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	return DSA_TAG_PROTO_QCA;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct dsa_switch_ops qca8k_switch_ops = {</div><div class='del'>-	.get_tag_protocol	= qca8k_get_tag_protocol,</div><div class='del'>-	.setup			= qca8k_setup,</div><div class='del'>-	.adjust_link            = qca8k_adjust_link,</div><div class='del'>-	.get_strings		= qca8k_get_strings,</div><div class='del'>-	.get_ethtool_stats	= qca8k_get_ethtool_stats,</div><div class='del'>-	.get_sset_count		= qca8k_get_sset_count,</div><div class='del'>-	.get_mac_eee		= qca8k_get_mac_eee,</div><div class='del'>-	.set_mac_eee		= qca8k_set_mac_eee,</div><div class='del'>-	.port_enable		= qca8k_port_enable,</div><div class='del'>-	.port_disable		= qca8k_port_disable,</div><div class='del'>-	.port_stp_state_set	= qca8k_port_stp_state_set,</div><div class='del'>-	.port_bridge_join	= qca8k_port_bridge_join,</div><div class='del'>-	.port_bridge_leave	= qca8k_port_bridge_leave,</div><div class='del'>-	.port_fdb_add		= qca8k_port_fdb_add,</div><div class='del'>-	.port_fdb_del		= qca8k_port_fdb_del,</div><div class='del'>-	.port_fdb_dump		= qca8k_port_fdb_dump,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qca8k_sw_probe(struct mdio_device *mdiodev)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv;</div><div class='del'>-	u32 id;</div><div class='del'>-</div><div class='del'>-	/* allocate the private data struct so that we can probe the switches</div><div class='del'>-	 * ID register</div><div class='del'>-	 */</div><div class='del'>-	priv = devm_kzalloc(&amp;mdiodev-&gt;dev, sizeof(*priv), GFP_KERNEL);</div><div class='del'>-	if (!priv)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	priv-&gt;bus = mdiodev-&gt;bus;</div><div class='del'>-	priv-&gt;dev = &amp;mdiodev-&gt;dev;</div><div class='del'>-</div><div class='del'>-	/* read the switches ID register */</div><div class='del'>-	id = qca8k_read(priv, QCA8K_REG_MASK_CTRL);</div><div class='del'>-	id &gt;&gt;= QCA8K_MASK_CTRL_ID_S;</div><div class='del'>-	id &amp;= QCA8K_MASK_CTRL_ID_M;</div><div class='del'>-	if (id != QCA8K_ID_QCA8337)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ds = dsa_switch_alloc(&amp;mdiodev-&gt;dev, DSA_MAX_PORTS);</div><div class='del'>-	if (!priv-&gt;ds)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ds-&gt;priv = priv;</div><div class='del'>-	priv-&gt;ops = qca8k_switch_ops;</div><div class='del'>-	priv-&gt;ds-&gt;ops = &amp;priv-&gt;ops;</div><div class='del'>-	mutex_init(&amp;priv-&gt;reg_mutex);</div><div class='del'>-	dev_set_drvdata(&amp;mdiodev-&gt;dev, priv);</div><div class='del'>-</div><div class='del'>-	return dsa_register_switch(priv-&gt;ds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-qca8k_sw_remove(struct mdio_device *mdiodev)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; QCA8K_NUM_PORTS; i++)</div><div class='del'>-		qca8k_port_set_status(priv, i, 0);</div><div class='del'>-</div><div class='del'>-	dsa_unregister_switch(priv-&gt;ds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='del'>-static void</div><div class='del'>-qca8k_set_pm(struct qca8k_priv *priv, int enable)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; QCA8K_NUM_PORTS; i++) {</div><div class='del'>-		if (!priv-&gt;port_sts[i].enabled)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		qca8k_port_set_status(priv, i, enable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qca8k_suspend(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	qca8k_set_pm(priv, 0);</div><div class='del'>-</div><div class='del'>-	return dsa_switch_suspend(priv-&gt;ds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int qca8k_resume(struct device *dev)</div><div class='del'>-{</div><div class='del'>-	struct qca8k_priv *priv = dev_get_drvdata(dev);</div><div class='del'>-</div><div class='del'>-	qca8k_set_pm(priv, 1);</div><div class='del'>-</div><div class='del'>-	return dsa_switch_resume(priv-&gt;ds);</div><div class='del'>-}</div><div class='del'>-#endif /* CONFIG_PM_SLEEP */</div><div class='del'>-</div><div class='del'>-static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,</div><div class='del'>-			 qca8k_suspend, qca8k_resume);</div><div class='del'>-</div><div class='del'>-static const struct of_device_id qca8k_of_match[] = {</div><div class='del'>-	{ .compatible = "qca,qca8334" },</div><div class='del'>-	{ .compatible = "qca,qca8337" },</div><div class='del'>-	{ /* sentinel */ },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct mdio_driver qca8kmdio_driver = {</div><div class='del'>-	.probe  = qca8k_sw_probe,</div><div class='del'>-	.remove = qca8k_sw_remove,</div><div class='del'>-	.mdiodrv.driver = {</div><div class='del'>-		.name = "qca8k",</div><div class='del'>-		.of_match_table = qca8k_of_match,</div><div class='del'>-		.pm = &amp;qca8k_pm_ops,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-mdio_module_driver(qca8kmdio_driver);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Mathieu Olivari, John Crispin &lt;john@phrozen.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Driver for QCA8K ethernet switch family");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_ALIAS("platform:qca8k");</div><div class='head'>diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h<br/>deleted file mode 100644<br/>index 91557433ce2f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/qca8k.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/qca8k.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,192 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2009 Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='del'>- * Copyright (C) 2011-2012 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- * Copyright (c) 2015, The Linux Foundation. All rights reserved.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __QCA8K_H</div><div class='del'>-#define __QCA8K_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='del'>-</div><div class='del'>-#define QCA8K_NUM_PORTS					7</div><div class='del'>-</div><div class='del'>-#define PHY_ID_QCA8337					0x004dd036</div><div class='del'>-#define QCA8K_ID_QCA8337				0x13</div><div class='del'>-</div><div class='del'>-#define QCA8K_NUM_FDB_RECORDS				2048</div><div class='del'>-</div><div class='del'>-#define QCA8K_CPU_PORT					0</div><div class='del'>-</div><div class='del'>-/* Global control registers */</div><div class='del'>-#define QCA8K_REG_MASK_CTRL				0x000</div><div class='del'>-#define   QCA8K_MASK_CTRL_ID_M				0xff</div><div class='del'>-#define   QCA8K_MASK_CTRL_ID_S				8</div><div class='del'>-#define QCA8K_REG_PORT0_PAD_CTRL			0x004</div><div class='del'>-#define QCA8K_REG_PORT5_PAD_CTRL			0x008</div><div class='del'>-#define QCA8K_REG_PORT6_PAD_CTRL			0x00c</div><div class='del'>-#define   QCA8K_PORT_PAD_RGMII_EN			BIT(26)</div><div class='del'>-#define   QCA8K_PORT_PAD_RGMII_TX_DELAY(x)		\</div><div class='del'>-						((0x8 + (x &amp; 0x3)) &lt;&lt; 22)</div><div class='del'>-#define   QCA8K_PORT_PAD_RGMII_RX_DELAY(x)		\</div><div class='del'>-						((0x10 + (x &amp; 0x3)) &lt;&lt; 20)</div><div class='del'>-#define   QCA8K_MAX_DELAY				3</div><div class='del'>-#define   QCA8K_PORT_PAD_RGMII_RX_DELAY_EN		BIT(24)</div><div class='del'>-#define   QCA8K_PORT_PAD_SGMII_EN			BIT(7)</div><div class='del'>-#define QCA8K_REG_MODULE_EN				0x030</div><div class='del'>-#define   QCA8K_MODULE_EN_MIB				BIT(0)</div><div class='del'>-#define QCA8K_REG_MIB					0x034</div><div class='del'>-#define   QCA8K_MIB_FLUSH				BIT(24)</div><div class='del'>-#define   QCA8K_MIB_CPU_KEEP				BIT(20)</div><div class='del'>-#define   QCA8K_MIB_BUSY				BIT(17)</div><div class='del'>-#define QCA8K_MDIO_MASTER_CTRL				0x3c</div><div class='del'>-#define   QCA8K_MDIO_MASTER_BUSY			BIT(31)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_EN				BIT(30)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_READ			BIT(27)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_WRITE			0</div><div class='del'>-#define   QCA8K_MDIO_MASTER_SUP_PRE			BIT(26)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_PHY_ADDR(x)			((x) &lt;&lt; 21)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_REG_ADDR(x)			((x) &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_DATA(x)			(x)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_DATA_MASK			GENMASK(15, 0)</div><div class='del'>-#define   QCA8K_MDIO_MASTER_MAX_PORTS			5</div><div class='del'>-#define   QCA8K_MDIO_MASTER_MAX_REG			32</div><div class='del'>-#define QCA8K_GOL_MAC_ADDR0				0x60</div><div class='del'>-#define QCA8K_GOL_MAC_ADDR1				0x64</div><div class='del'>-#define QCA8K_REG_PORT_STATUS(_i)			(0x07c + (_i) * 4)</div><div class='del'>-#define   QCA8K_PORT_STATUS_SPEED			GENMASK(1, 0)</div><div class='del'>-#define   QCA8K_PORT_STATUS_SPEED_10			0</div><div class='del'>-#define   QCA8K_PORT_STATUS_SPEED_100			0x1</div><div class='del'>-#define   QCA8K_PORT_STATUS_SPEED_1000			0x2</div><div class='del'>-#define   QCA8K_PORT_STATUS_TXMAC			BIT(2)</div><div class='del'>-#define   QCA8K_PORT_STATUS_RXMAC			BIT(3)</div><div class='del'>-#define   QCA8K_PORT_STATUS_TXFLOW			BIT(4)</div><div class='del'>-#define   QCA8K_PORT_STATUS_RXFLOW			BIT(5)</div><div class='del'>-#define   QCA8K_PORT_STATUS_DUPLEX			BIT(6)</div><div class='del'>-#define   QCA8K_PORT_STATUS_LINK_UP			BIT(8)</div><div class='del'>-#define   QCA8K_PORT_STATUS_LINK_AUTO			BIT(9)</div><div class='del'>-#define   QCA8K_PORT_STATUS_LINK_PAUSE			BIT(10)</div><div class='del'>-#define QCA8K_REG_PORT_HDR_CTRL(_i)			(0x9c + (_i * 4))</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_RX_MASK			GENMASK(3, 2)</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_RX_S			2</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_TX_MASK			GENMASK(1, 0)</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_TX_S			0</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_ALL			2</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_MGMT			1</div><div class='del'>-#define   QCA8K_PORT_HDR_CTRL_NONE			0</div><div class='del'>-</div><div class='del'>-/* EEE control registers */</div><div class='del'>-#define QCA8K_REG_EEE_CTRL				0x100</div><div class='del'>-#define  QCA8K_REG_EEE_CTRL_LPI_EN(_i)			((_i + 1) * 2)</div><div class='del'>-</div><div class='del'>-/* ACL registers */</div><div class='del'>-#define QCA8K_REG_PORT_VLAN_CTRL0(_i)			(0x420 + (_i * 8))</div><div class='del'>-#define   QCA8K_PORT_VLAN_CVID(x)			(x &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_PORT_VLAN_SVID(x)			x</div><div class='del'>-#define QCA8K_REG_PORT_VLAN_CTRL1(_i)			(0x424 + (_i * 8))</div><div class='del'>-#define QCA8K_REG_IPV4_PRI_BASE_ADDR			0x470</div><div class='del'>-#define QCA8K_REG_IPV4_PRI_ADDR_MASK			0x474</div><div class='del'>-</div><div class='del'>-/* Lookup registers */</div><div class='del'>-#define QCA8K_REG_ATU_DATA0				0x600</div><div class='del'>-#define   QCA8K_ATU_ADDR2_S				24</div><div class='del'>-#define   QCA8K_ATU_ADDR3_S				16</div><div class='del'>-#define   QCA8K_ATU_ADDR4_S				8</div><div class='del'>-#define QCA8K_REG_ATU_DATA1				0x604</div><div class='del'>-#define   QCA8K_ATU_PORT_M				0x7f</div><div class='del'>-#define   QCA8K_ATU_PORT_S				16</div><div class='del'>-#define   QCA8K_ATU_ADDR0_S				8</div><div class='del'>-#define QCA8K_REG_ATU_DATA2				0x608</div><div class='del'>-#define   QCA8K_ATU_VID_M				0xfff</div><div class='del'>-#define   QCA8K_ATU_VID_S				8</div><div class='del'>-#define   QCA8K_ATU_STATUS_M				0xf</div><div class='del'>-#define   QCA8K_ATU_STATUS_STATIC			0xf</div><div class='del'>-#define QCA8K_REG_ATU_FUNC				0x60c</div><div class='del'>-#define   QCA8K_ATU_FUNC_BUSY				BIT(31)</div><div class='del'>-#define   QCA8K_ATU_FUNC_PORT_EN			BIT(14)</div><div class='del'>-#define   QCA8K_ATU_FUNC_MULTI_EN			BIT(13)</div><div class='del'>-#define   QCA8K_ATU_FUNC_FULL				BIT(12)</div><div class='del'>-#define   QCA8K_ATU_FUNC_PORT_M				0xf</div><div class='del'>-#define   QCA8K_ATU_FUNC_PORT_S				8</div><div class='del'>-#define QCA8K_REG_GLOBAL_FW_CTRL0			0x620</div><div class='del'>-#define   QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN		BIT(10)</div><div class='del'>-#define QCA8K_REG_GLOBAL_FW_CTRL1			0x624</div><div class='del'>-#define   QCA8K_GLOBAL_FW_CTRL1_IGMP_DP_S		24</div><div class='del'>-#define   QCA8K_GLOBAL_FW_CTRL1_BC_DP_S			16</div><div class='del'>-#define   QCA8K_GLOBAL_FW_CTRL1_MC_DP_S			8</div><div class='del'>-#define   QCA8K_GLOBAL_FW_CTRL1_UC_DP_S			0</div><div class='del'>-#define QCA8K_PORT_LOOKUP_CTRL(_i)			(0x660 + (_i) * 0xc)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_MEMBER			GENMASK(6, 0)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE_MASK			GENMASK(18, 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE_DISABLED		(0 &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE_BLOCKING		(1 &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE_LISTENING		(2 &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE_LEARNING		(3 &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE_FORWARD		(4 &lt;&lt; 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_STATE			GENMASK(18, 16)</div><div class='del'>-#define   QCA8K_PORT_LOOKUP_LEARN			BIT(20)</div><div class='del'>-</div><div class='del'>-/* Pkt edit registers */</div><div class='del'>-#define QCA8K_EGRESS_VLAN(x)				(0x0c70 + (4 * (x / 2)))</div><div class='del'>-</div><div class='del'>-/* L3 registers */</div><div class='del'>-#define QCA8K_HROUTER_CONTROL				0xe00</div><div class='del'>-#define   QCA8K_HROUTER_CONTROL_GLB_LOCKTIME_M		GENMASK(17, 16)</div><div class='del'>-#define   QCA8K_HROUTER_CONTROL_GLB_LOCKTIME_S		16</div><div class='del'>-#define   QCA8K_HROUTER_CONTROL_ARP_AGE_MODE		1</div><div class='del'>-#define QCA8K_HROUTER_PBASED_CONTROL1			0xe08</div><div class='del'>-#define QCA8K_HROUTER_PBASED_CONTROL2			0xe0c</div><div class='del'>-#define QCA8K_HNAT_CONTROL				0xe38</div><div class='del'>-</div><div class='del'>-/* MIB registers */</div><div class='del'>-#define QCA8K_PORT_MIB_COUNTER(_i)			(0x1000 + (_i) * 0x100)</div><div class='del'>-</div><div class='del'>-/* QCA specific MII registers */</div><div class='del'>-#define MII_ATH_MMD_ADDR				0x0d</div><div class='del'>-#define MII_ATH_MMD_DATA				0x0e</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	QCA8K_PORT_SPEED_10M = 0,</div><div class='del'>-	QCA8K_PORT_SPEED_100M = 1,</div><div class='del'>-	QCA8K_PORT_SPEED_1000M = 2,</div><div class='del'>-	QCA8K_PORT_SPEED_ERR = 3,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum qca8k_fdb_cmd {</div><div class='del'>-	QCA8K_FDB_FLUSH	= 1,</div><div class='del'>-	QCA8K_FDB_LOAD = 2,</div><div class='del'>-	QCA8K_FDB_PURGE = 3,</div><div class='del'>-	QCA8K_FDB_NEXT = 6,</div><div class='del'>-	QCA8K_FDB_SEARCH = 7,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ar8xxx_port_status {</div><div class='del'>-	int enabled;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct qca8k_priv {</div><div class='del'>-	struct regmap *regmap;</div><div class='del'>-	struct mii_bus *bus;</div><div class='del'>-	struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS];</div><div class='del'>-	struct dsa_switch *ds;</div><div class='del'>-	struct mutex reg_mutex;</div><div class='del'>-	struct device *dev;</div><div class='del'>-	struct dsa_switch_ops ops;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct qca8k_mib_desc {</div><div class='del'>-	unsigned int size;</div><div class='del'>-	unsigned int offset;</div><div class='del'>-	const char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct qca8k_fdb {</div><div class='del'>-	u16 vid;</div><div class='del'>-	u8 port_mask;</div><div class='del'>-	u8 aging;</div><div class='del'>-	u8 mac[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* __QCA8K_H */</div><div class='head'>diff --git a/drivers/net/dsa/realtek-smi.c b/drivers/net/dsa/realtek-smi.c<br/>deleted file mode 100644<br/>index ad41ec63cc9f..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek-smi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek-smi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,497 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0+</div><div class='del'>-/* Realtek Simple Management Interface (SMI) driver</div><div class='del'>- * It can be discussed how "simple" this interface is.</div><div class='del'>- *</div><div class='del'>- * The SMI protocol piggy-backs the MDIO MDC and MDIO signals levels</div><div class='del'>- * but the protocol is not MDIO at all. Instead it is a Realtek</div><div class='del'>- * pecularity that need to bit-bang the lines in a special way to</div><div class='del'>- * communicate with the switch.</div><div class='del'>- *</div><div class='del'>- * ASICs we intend to support with this driver:</div><div class='del'>- *</div><div class='del'>- * RTL8366   - The original version, apparently</div><div class='del'>- * RTL8369   - Similar enough to have the same datsheet as RTL8366</div><div class='del'>- * RTL8366RB - Probably reads out "RTL8366 revision B", has a quite</div><div class='del'>- *             different register layout from the other two</div><div class='del'>- * RTL8366S  - Is this "RTL8366 super"?</div><div class='del'>- * RTL8367   - Has an OpenWRT driver as well</div><div class='del'>- * RTL8368S  - Seems to be an alternative name for RTL8366RB</div><div class='del'>- * RTL8370   - Also uses SMI</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='del'>- * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='del'>- * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='del'>- * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='del'>- * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-</div><div class='del'>-#include "realtek-smi.h"</div><div class='del'>-</div><div class='del'>-#define REALTEK_SMI_ACK_RETRY_COUNT		5</div><div class='del'>-#define REALTEK_SMI_HW_STOP_DELAY		25	/* msecs */</div><div class='del'>-#define REALTEK_SMI_HW_START_DELAY		100	/* msecs */</div><div class='del'>-</div><div class='del'>-static inline void realtek_smi_clk_delay(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	ndelay(smi-&gt;clk_delay);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void realtek_smi_start(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	/* Set GPIO pins to output mode, with initial state:</div><div class='del'>-	 * SCK = 0, SDA = 1</div><div class='del'>-	 */</div><div class='del'>-	gpiod_direction_output(smi-&gt;mdc, 0);</div><div class='del'>-	gpiod_direction_output(smi-&gt;mdio, 1);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-</div><div class='del'>-	/* CLK 1: 0 -&gt; 1, 1 -&gt; 0 */</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 0);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-</div><div class='del'>-	/* CLK 2: */</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdio, 0);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 0);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdio, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void realtek_smi_stop(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdio, 0);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdio, 1);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 0);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-</div><div class='del'>-	/* Add a click */</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 0);</div><div class='del'>-	realtek_smi_clk_delay(smi);</div><div class='del'>-	gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-</div><div class='del'>-	/* Set GPIO pins to input mode */</div><div class='del'>-	gpiod_direction_input(smi-&gt;mdio);</div><div class='del'>-	gpiod_direction_input(smi-&gt;mdc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void realtek_smi_write_bits(struct realtek_smi *smi, u32 data, u32 len)</div><div class='del'>-{</div><div class='del'>-	for (; len &gt; 0; len--) {</div><div class='del'>-		realtek_smi_clk_delay(smi);</div><div class='del'>-</div><div class='del'>-		/* Prepare data */</div><div class='del'>-		gpiod_set_value(smi-&gt;mdio, !!(data &amp; (1 &lt;&lt; (len - 1))));</div><div class='del'>-		realtek_smi_clk_delay(smi);</div><div class='del'>-</div><div class='del'>-		/* Clocking */</div><div class='del'>-		gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-		realtek_smi_clk_delay(smi);</div><div class='del'>-		gpiod_set_value(smi-&gt;mdc, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void realtek_smi_read_bits(struct realtek_smi *smi, u32 len, u32 *data)</div><div class='del'>-{</div><div class='del'>-	gpiod_direction_input(smi-&gt;mdio);</div><div class='del'>-</div><div class='del'>-	for (*data = 0; len &gt; 0; len--) {</div><div class='del'>-		u32 u;</div><div class='del'>-</div><div class='del'>-		realtek_smi_clk_delay(smi);</div><div class='del'>-</div><div class='del'>-		/* Clocking */</div><div class='del'>-		gpiod_set_value(smi-&gt;mdc, 1);</div><div class='del'>-		realtek_smi_clk_delay(smi);</div><div class='del'>-		u = !!gpiod_get_value(smi-&gt;mdio);</div><div class='del'>-		gpiod_set_value(smi-&gt;mdc, 0);</div><div class='del'>-</div><div class='del'>-		*data |= (u &lt;&lt; (len - 1));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gpiod_direction_output(smi-&gt;mdio, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_wait_for_ack(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	int retry_cnt;</div><div class='del'>-</div><div class='del'>-	retry_cnt = 0;</div><div class='del'>-	do {</div><div class='del'>-		u32 ack;</div><div class='del'>-</div><div class='del'>-		realtek_smi_read_bits(smi, 1, &amp;ack);</div><div class='del'>-		if (ack == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (++retry_cnt &gt; REALTEK_SMI_ACK_RETRY_COUNT) {</div><div class='del'>-			dev_err(smi-&gt;dev, "ACK timeout\n");</div><div class='del'>-			return -ETIMEDOUT;</div><div class='del'>-		}</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_write_byte(struct realtek_smi *smi, u8 data)</div><div class='del'>-{</div><div class='del'>-	realtek_smi_write_bits(smi, data, 8);</div><div class='del'>-	return realtek_smi_wait_for_ack(smi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_write_byte_noack(struct realtek_smi *smi, u8 data)</div><div class='del'>-{</div><div class='del'>-	realtek_smi_write_bits(smi, data, 8);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_read_byte0(struct realtek_smi *smi, u8 *data)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* Read data */</div><div class='del'>-	realtek_smi_read_bits(smi, 8, &amp;t);</div><div class='del'>-	*data = (t &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* Send an ACK */</div><div class='del'>-	realtek_smi_write_bits(smi, 0x00, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_read_byte1(struct realtek_smi *smi, u8 *data)</div><div class='del'>-{</div><div class='del'>-	u32 t;</div><div class='del'>-</div><div class='del'>-	/* Read data */</div><div class='del'>-	realtek_smi_read_bits(smi, 8, &amp;t);</div><div class='del'>-	*data = (t &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* Send an ACK */</div><div class='del'>-	realtek_smi_write_bits(smi, 0x01, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_read_reg(struct realtek_smi *smi, u32 addr, u32 *data)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u8 lo = 0;</div><div class='del'>-	u8 hi = 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;smi-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	realtek_smi_start(smi);</div><div class='del'>-</div><div class='del'>-	/* Send READ command */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, smi-&gt;cmd_read);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Set ADDR[7:0] */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, addr &amp; 0xff);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Set ADDR[15:8] */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, addr &gt;&gt; 8);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Read DATA[7:0] */</div><div class='del'>-	realtek_smi_read_byte0(smi, &amp;lo);</div><div class='del'>-	/* Read DATA[15:8] */</div><div class='del'>-	realtek_smi_read_byte1(smi, &amp;hi);</div><div class='del'>-</div><div class='del'>-	*data = ((u32)lo) | (((u32)hi) &lt;&lt; 8);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	realtek_smi_stop(smi);</div><div class='del'>-	spin_unlock_irqrestore(&amp;smi-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_write_reg(struct realtek_smi *smi,</div><div class='del'>-				 u32 addr, u32 data, bool ack)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;smi-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	realtek_smi_start(smi);</div><div class='del'>-</div><div class='del'>-	/* Send WRITE command */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, smi-&gt;cmd_write);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Set ADDR[7:0] */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, addr &amp; 0xff);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Set ADDR[15:8] */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, addr &gt;&gt; 8);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Write DATA[7:0] */</div><div class='del'>-	ret = realtek_smi_write_byte(smi, data &amp; 0xff);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Write DATA[15:8] */</div><div class='del'>-	if (ack)</div><div class='del'>-		ret = realtek_smi_write_byte(smi, data &gt;&gt; 8);</div><div class='del'>-	else</div><div class='del'>-		ret = realtek_smi_write_byte_noack(smi, data &gt;&gt; 8);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	realtek_smi_stop(smi);</div><div class='del'>-	spin_unlock_irqrestore(&amp;smi-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* There is one single case when we need to use this accessor and that</div><div class='del'>- * is when issueing soft reset. Since the device reset as soon as we write</div><div class='del'>- * that bit, no ACK will come back for natural reasons.</div><div class='del'>- */</div><div class='del'>-int realtek_smi_write_reg_noack(struct realtek_smi *smi, u32 addr,</div><div class='del'>-				u32 data)</div><div class='del'>-{</div><div class='del'>-	return realtek_smi_write_reg(smi, addr, data, false);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(realtek_smi_write_reg_noack);</div><div class='del'>-</div><div class='del'>-/* Regmap accessors */</div><div class='del'>-</div><div class='del'>-static int realtek_smi_write(void *ctx, u32 reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ctx;</div><div class='del'>-</div><div class='del'>-	return realtek_smi_write_reg(smi, reg, val, true);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_read(void *ctx, u32 reg, u32 *val)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ctx;</div><div class='del'>-</div><div class='del'>-	return realtek_smi_read_reg(smi, reg, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct regmap_config realtek_smi_mdio_regmap_config = {</div><div class='del'>-	.reg_bits = 10, /* A4..A0 R4..R0 */</div><div class='del'>-	.val_bits = 16,</div><div class='del'>-	.reg_stride = 1,</div><div class='del'>-	/* PHY regs are at 0x8000 */</div><div class='del'>-	.max_register = 0xffff,</div><div class='del'>-	.reg_format_endian = REGMAP_ENDIAN_BIG,</div><div class='del'>-	.reg_read = realtek_smi_read,</div><div class='del'>-	.reg_write = realtek_smi_write,</div><div class='del'>-	.cache_type = REGCACHE_NONE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int realtek_smi_mdio_read(struct mii_bus *bus, int addr, int regnum)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = bus-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return smi-&gt;ops-&gt;phy_read(smi, addr, regnum);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_mdio_write(struct mii_bus *bus, int addr, int regnum,</div><div class='del'>-				  u16 val)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = bus-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return smi-&gt;ops-&gt;phy_write(smi, addr, regnum, val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int realtek_smi_setup_mdio(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	struct device_node *mdio_np;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	mdio_np = of_get_compatible_child(smi-&gt;dev-&gt;of_node, "realtek,smi-mdio");</div><div class='del'>-	if (!mdio_np) {</div><div class='del'>-		dev_err(smi-&gt;dev, "no MDIO bus node\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	smi-&gt;slave_mii_bus = devm_mdiobus_alloc(smi-&gt;dev);</div><div class='del'>-	if (!smi-&gt;slave_mii_bus) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_put_node;</div><div class='del'>-	}</div><div class='del'>-	smi-&gt;slave_mii_bus-&gt;priv = smi;</div><div class='del'>-	smi-&gt;slave_mii_bus-&gt;name = "SMI slave MII";</div><div class='del'>-	smi-&gt;slave_mii_bus-&gt;read = realtek_smi_mdio_read;</div><div class='del'>-	smi-&gt;slave_mii_bus-&gt;write = realtek_smi_mdio_write;</div><div class='del'>-	snprintf(smi-&gt;slave_mii_bus-&gt;id, MII_BUS_ID_SIZE, "SMI-%d",</div><div class='del'>-		 smi-&gt;ds-&gt;index);</div><div class='del'>-	smi-&gt;slave_mii_bus-&gt;dev.of_node = mdio_np;</div><div class='del'>-	smi-&gt;slave_mii_bus-&gt;parent = smi-&gt;dev;</div><div class='del'>-	smi-&gt;ds-&gt;slave_mii_bus = smi-&gt;slave_mii_bus;</div><div class='del'>-</div><div class='del'>-	ret = of_mdiobus_register(smi-&gt;slave_mii_bus, mdio_np);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "unable to register MDIO bus %s\n",</div><div class='del'>-			smi-&gt;slave_mii_bus-&gt;id);</div><div class='del'>-		goto err_put_node;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_put_node:</div><div class='del'>-	of_node_put(mdio_np);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	const struct realtek_smi_variant *var;</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct realtek_smi *smi;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	var = of_device_get_match_data(dev);</div><div class='del'>-	np = dev-&gt;of_node;</div><div class='del'>-</div><div class='del'>-	smi = devm_kzalloc(dev, sizeof(*smi), GFP_KERNEL);</div><div class='del'>-	if (!smi)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	smi-&gt;map = devm_regmap_init(dev, NULL, smi,</div><div class='del'>-				    &amp;realtek_smi_mdio_regmap_config);</div><div class='del'>-	if (IS_ERR(smi-&gt;map)) {</div><div class='del'>-		ret = PTR_ERR(smi-&gt;map);</div><div class='del'>-		dev_err(dev, "regmap init failed: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Link forward and backward */</div><div class='del'>-	smi-&gt;dev = dev;</div><div class='del'>-	smi-&gt;clk_delay = var-&gt;clk_delay;</div><div class='del'>-	smi-&gt;cmd_read = var-&gt;cmd_read;</div><div class='del'>-	smi-&gt;cmd_write = var-&gt;cmd_write;</div><div class='del'>-	smi-&gt;ops = var-&gt;ops;</div><div class='del'>-</div><div class='del'>-	dev_set_drvdata(dev, smi);</div><div class='del'>-	spin_lock_init(&amp;smi-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* TODO: if power is software controlled, set up any regulators here */</div><div class='del'>-</div><div class='del'>-	/* Assert then deassert RESET */</div><div class='del'>-	smi-&gt;reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);</div><div class='del'>-	if (IS_ERR(smi-&gt;reset)) {</div><div class='del'>-		dev_err(dev, "failed to get RESET GPIO\n");</div><div class='del'>-		return PTR_ERR(smi-&gt;reset);</div><div class='del'>-	}</div><div class='del'>-	msleep(REALTEK_SMI_HW_STOP_DELAY);</div><div class='del'>-	gpiod_set_value(smi-&gt;reset, 0);</div><div class='del'>-	msleep(REALTEK_SMI_HW_START_DELAY);</div><div class='del'>-	dev_info(dev, "deasserted RESET\n");</div><div class='del'>-</div><div class='del'>-	/* Fetch MDIO pins */</div><div class='del'>-	smi-&gt;mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW);</div><div class='del'>-	if (IS_ERR(smi-&gt;mdc))</div><div class='del'>-		return PTR_ERR(smi-&gt;mdc);</div><div class='del'>-	smi-&gt;mdio = devm_gpiod_get_optional(dev, "mdio", GPIOD_OUT_LOW);</div><div class='del'>-	if (IS_ERR(smi-&gt;mdio))</div><div class='del'>-		return PTR_ERR(smi-&gt;mdio);</div><div class='del'>-</div><div class='del'>-	smi-&gt;leds_disabled = of_property_read_bool(np, "realtek,disable-leds");</div><div class='del'>-</div><div class='del'>-	ret = smi-&gt;ops-&gt;detect(smi);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "unable to detect switch\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	smi-&gt;ds = dsa_switch_alloc(dev, smi-&gt;num_ports);</div><div class='del'>-	if (!smi-&gt;ds)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	smi-&gt;ds-&gt;priv = smi;</div><div class='del'>-</div><div class='del'>-	smi-&gt;ds-&gt;ops = var-&gt;ds_ops;</div><div class='del'>-	ret = dsa_register_switch(smi-&gt;ds);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "unable to register switch ret = %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int realtek_smi_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	dsa_unregister_switch(smi-&gt;ds);</div><div class='del'>-	if (smi-&gt;slave_mii_bus)</div><div class='del'>-		of_node_put(smi-&gt;slave_mii_bus-&gt;dev.of_node);</div><div class='del'>-	gpiod_set_value(smi-&gt;reset, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id realtek_smi_of_match[] = {</div><div class='del'>-	{</div><div class='del'>-		.compatible = "realtek,rtl8366rb",</div><div class='del'>-		.data = &amp;rtl8366rb_variant,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		/* FIXME: add support for RTL8366S and more */</div><div class='del'>-		.compatible = "realtek,rtl8366s",</div><div class='del'>-		.data = NULL,</div><div class='del'>-	},</div><div class='del'>-	{ /* sentinel */ },</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, realtek_smi_of_match);</div><div class='del'>-</div><div class='del'>-static struct platform_driver realtek_smi_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "realtek-smi",</div><div class='del'>-		.of_match_table = of_match_ptr(realtek_smi_of_match),</div><div class='del'>-	},</div><div class='del'>-	.probe  = realtek_smi_probe,</div><div class='del'>-	.remove = realtek_smi_remove,</div><div class='del'>-};</div><div class='del'>-module_platform_driver(realtek_smi_driver);</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/realtek-smi.h b/drivers/net/dsa/realtek-smi.h<br/>deleted file mode 100644<br/>index 9a63b51e1d82..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek-smi.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/realtek-smi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,144 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='del'>-/* Realtek SMI interface driver defines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='del'>- * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _REALTEK_SMI_H</div><div class='del'>-#define _REALTEK_SMI_H</div><div class='del'>-</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-</div><div class='del'>-struct realtek_smi_ops;</div><div class='del'>-struct dentry;</div><div class='del'>-struct inode;</div><div class='del'>-struct file;</div><div class='del'>-</div><div class='del'>-struct rtl8366_mib_counter {</div><div class='del'>-	unsigned int	base;</div><div class='del'>-	unsigned int	offset;</div><div class='del'>-	unsigned int	length;</div><div class='del'>-	const char	*name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rtl8366_vlan_mc {</div><div class='del'>-	u16	vid;</div><div class='del'>-	u16	untag;</div><div class='del'>-	u16	member;</div><div class='del'>-	u8	fid;</div><div class='del'>-	u8	priority;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rtl8366_vlan_4k {</div><div class='del'>-	u16	vid;</div><div class='del'>-	u16	untag;</div><div class='del'>-	u16	member;</div><div class='del'>-	u8	fid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct realtek_smi {</div><div class='del'>-	struct device		*dev;</div><div class='del'>-	struct gpio_desc	*reset;</div><div class='del'>-	struct gpio_desc	*mdc;</div><div class='del'>-	struct gpio_desc	*mdio;</div><div class='del'>-	struct regmap		*map;</div><div class='del'>-	struct mii_bus		*slave_mii_bus;</div><div class='del'>-</div><div class='del'>-	unsigned int		clk_delay;</div><div class='del'>-	u8			cmd_read;</div><div class='del'>-	u8			cmd_write;</div><div class='del'>-	spinlock_t		lock; /* Locks around command writes */</div><div class='del'>-	struct dsa_switch	*ds;</div><div class='del'>-	struct irq_domain	*irqdomain;</div><div class='del'>-	bool			leds_disabled;</div><div class='del'>-</div><div class='del'>-	unsigned int		cpu_port;</div><div class='del'>-	unsigned int		num_ports;</div><div class='del'>-	unsigned int		num_vlan_mc;</div><div class='del'>-	unsigned int		num_mib_counters;</div><div class='del'>-	struct rtl8366_mib_counter *mib_counters;</div><div class='del'>-</div><div class='del'>-	const struct realtek_smi_ops *ops;</div><div class='del'>-</div><div class='del'>-	int			vlan_enabled;</div><div class='del'>-	int			vlan4k_enabled;</div><div class='del'>-</div><div class='del'>-	char			buf[4096];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct realtek_smi_ops - vtable for the per-SMI-chiptype operations</div><div class='del'>- * @detect: detects the chiptype</div><div class='del'>- */</div><div class='del'>-struct realtek_smi_ops {</div><div class='del'>-	int	(*detect)(struct realtek_smi *smi);</div><div class='del'>-	int	(*reset_chip)(struct realtek_smi *smi);</div><div class='del'>-	int	(*setup)(struct realtek_smi *smi);</div><div class='del'>-	void	(*cleanup)(struct realtek_smi *smi);</div><div class='del'>-	int	(*get_mib_counter)(struct realtek_smi *smi,</div><div class='del'>-				   int port,</div><div class='del'>-				   struct rtl8366_mib_counter *mib,</div><div class='del'>-				   u64 *mibvalue);</div><div class='del'>-	int	(*get_vlan_mc)(struct realtek_smi *smi, u32 index,</div><div class='del'>-			       struct rtl8366_vlan_mc *vlanmc);</div><div class='del'>-	int	(*set_vlan_mc)(struct realtek_smi *smi, u32 index,</div><div class='del'>-			       const struct rtl8366_vlan_mc *vlanmc);</div><div class='del'>-	int	(*get_vlan_4k)(struct realtek_smi *smi, u32 vid,</div><div class='del'>-			       struct rtl8366_vlan_4k *vlan4k);</div><div class='del'>-	int	(*set_vlan_4k)(struct realtek_smi *smi,</div><div class='del'>-			       const struct rtl8366_vlan_4k *vlan4k);</div><div class='del'>-	int	(*get_mc_index)(struct realtek_smi *smi, int port, int *val);</div><div class='del'>-	int	(*set_mc_index)(struct realtek_smi *smi, int port, int index);</div><div class='del'>-	bool	(*is_vlan_valid)(struct realtek_smi *smi, unsigned int vlan);</div><div class='del'>-	int	(*enable_vlan)(struct realtek_smi *smi, bool enable);</div><div class='del'>-	int	(*enable_vlan4k)(struct realtek_smi *smi, bool enable);</div><div class='del'>-	int	(*enable_port)(struct realtek_smi *smi, int port, bool enable);</div><div class='del'>-	int	(*phy_read)(struct realtek_smi *smi, int phy, int regnum);</div><div class='del'>-	int	(*phy_write)(struct realtek_smi *smi, int phy, int regnum,</div><div class='del'>-			     u16 val);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct realtek_smi_variant {</div><div class='del'>-	const struct dsa_switch_ops *ds_ops;</div><div class='del'>-	const struct realtek_smi_ops *ops;</div><div class='del'>-	unsigned int clk_delay;</div><div class='del'>-	u8 cmd_read;</div><div class='del'>-	u8 cmd_write;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* SMI core calls */</div><div class='del'>-int realtek_smi_write_reg_noack(struct realtek_smi *smi, u32 addr,</div><div class='del'>-				u32 data);</div><div class='del'>-int realtek_smi_setup_mdio(struct realtek_smi *smi);</div><div class='del'>-</div><div class='del'>-/* RTL8366 library helpers */</div><div class='del'>-int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used);</div><div class='del'>-int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,</div><div class='del'>-		     u32 untag, u32 fid);</div><div class='del'>-int rtl8366_get_pvid(struct realtek_smi *smi, int port, int *val);</div><div class='del'>-int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,</div><div class='del'>-		     unsigned int vid);</div><div class='del'>-int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable);</div><div class='del'>-int rtl8366_enable_vlan(struct realtek_smi *smi, bool enable);</div><div class='del'>-int rtl8366_reset_vlan(struct realtek_smi *smi);</div><div class='del'>-int rtl8366_init_vlan(struct realtek_smi *smi);</div><div class='del'>-int rtl8366_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='del'>-			   bool vlan_filtering);</div><div class='del'>-int rtl8366_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			 const struct switchdev_obj_port_vlan *vlan);</div><div class='del'>-void rtl8366_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-		      const struct switchdev_obj_port_vlan *vlan);</div><div class='del'>-int rtl8366_vlan_del(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_vlan *vlan);</div><div class='del'>-void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='del'>-			 uint8_t *data);</div><div class='del'>-int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='del'>-void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);</div><div class='del'>-</div><div class='del'>-extern const struct realtek_smi_variant rtl8366rb_variant;</div><div class='del'>-</div><div class='del'>-#endif /*  _REALTEK_SMI_H */</div><div class='head'>diff --git a/drivers/net/dsa/realtek/Kconfig b/drivers/net/dsa/realtek/Kconfig<br/>new file mode 100644<br/>index 000000000000..d6eb6713e5f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,52 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+menuconfig NET_DSA_REALTEK</div><div class='add'>+	tristate "Realtek Ethernet switch family support"</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+	select FIXED_PHY</div><div class='add'>+	select IRQ_DOMAIN</div><div class='add'>+	select REALTEK_PHY</div><div class='add'>+	select REGMAP</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for Realtek Ethernet switch chips.</div><div class='add'>+</div><div class='add'>+	  Note that at least one interface driver must be enabled for the</div><div class='add'>+	  subdrivers to be loaded. Moreover, an interface driver cannot achieve</div><div class='add'>+	  anything without at least one subdriver enabled.</div><div class='add'>+</div><div class='add'>+if NET_DSA_REALTEK</div><div class='add'>+</div><div class='add'>+config NET_DSA_REALTEK_MDIO</div><div class='add'>+	bool "Realtek MDIO interface support"</div><div class='add'>+	depends on OF</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for registering switches configured</div><div class='add'>+	  through MDIO.</div><div class='add'>+</div><div class='add'>+config NET_DSA_REALTEK_SMI</div><div class='add'>+	bool "Realtek SMI interface support"</div><div class='add'>+	depends on OF</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for registering switches connected</div><div class='add'>+	  through SMI.</div><div class='add'>+</div><div class='add'>+config NET_DSA_REALTEK_RTL8365MB</div><div class='add'>+	tristate "Realtek RTL8365MB switch driver"</div><div class='add'>+	depends on NET_DSA_REALTEK_SMI || NET_DSA_REALTEK_MDIO</div><div class='add'>+	select NET_DSA_TAG_RTL8_4</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for Realtek RTL8365MB-VC and RTL8367S.</div><div class='add'>+</div><div class='add'>+config NET_DSA_REALTEK_RTL8366RB</div><div class='add'>+	tristate "Realtek RTL8366RB switch driver"</div><div class='add'>+	depends on NET_DSA_REALTEK_SMI || NET_DSA_REALTEK_MDIO</div><div class='add'>+	select NET_DSA_TAG_RTL4_A</div><div class='add'>+	help</div><div class='add'>+	  Select to enable support for Realtek RTL8366RB.</div><div class='add'>+</div><div class='add'>+config NET_DSA_REALTEK_RTL8366RB_LEDS</div><div class='add'>+	bool</div><div class='add'>+	depends on (LEDS_CLASS=y || LEDS_CLASS=NET_DSA_REALTEK_RTL8366RB)</div><div class='add'>+	depends on NET_DSA_REALTEK_RTL8366RB</div><div class='add'>+	default NET_DSA_REALTEK_RTL8366RB</div><div class='add'>+</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/dsa/realtek/Makefile b/drivers/net/dsa/realtek/Makefile<br/>new file mode 100644<br/>index 000000000000..17367bcba496<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/Makefile</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+obj-$(CONFIG_NET_DSA_REALTEK)		+= realtek_dsa.o</div><div class='add'>+realtek_dsa-objs			:= rtl83xx.o</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_NET_DSA_REALTEK_MDIO</div><div class='add'>+realtek_dsa-objs += realtek-mdio.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_NET_DSA_REALTEK_SMI</div><div class='add'>+realtek_dsa-objs += realtek-smi.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NET_DSA_REALTEK_RTL8366RB) += rtl8366.o</div><div class='add'>+rtl8366-objs 				:= rtl8366-core.o rtl8366rb.o</div><div class='add'>+ifdef CONFIG_NET_DSA_REALTEK_RTL8366RB_LEDS</div><div class='add'>+rtl8366-objs 				+= rtl8366rb-leds.o</div><div class='add'>+endif</div><div class='add'>+obj-$(CONFIG_NET_DSA_REALTEK_RTL8365MB) += rtl8365mb.o</div><div class='head'>diff --git a/drivers/net/dsa/realtek/realtek-mdio.c b/drivers/net/dsa/realtek/realtek-mdio.c<br/>new file mode 100644<br/>index 000000000000..a5e7dff96e91<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/realtek-mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/realtek-mdio.c</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/* Realtek MDIO interface driver</div><div class='add'>+ *</div><div class='add'>+ * ASICs we intend to support with this driver:</div><div class='add'>+ *</div><div class='add'>+ * RTL8366   - The original version, apparently</div><div class='add'>+ * RTL8369   - Similar enough to have the same datsheet as RTL8366</div><div class='add'>+ * RTL8366RB - Probably reads out "RTL8366 revision B", has a quite</div><div class='add'>+ *             different register layout from the other two</div><div class='add'>+ * RTL8366S  - Is this "RTL8366 super"?</div><div class='add'>+ * RTL8367   - Has an OpenWRT driver as well</div><div class='add'>+ * RTL8368S  - Seems to be an alternative name for RTL8366RB</div><div class='add'>+ * RTL8370   - Also uses SMI</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='add'>+ * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='add'>+ * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/overflow.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+#include "realtek-mdio.h"</div><div class='add'>+#include "rtl83xx.h"</div><div class='add'>+</div><div class='add'>+/* Read/write via mdiobus */</div><div class='add'>+#define REALTEK_MDIO_CTRL0_REG		31</div><div class='add'>+#define REALTEK_MDIO_START_REG		29</div><div class='add'>+#define REALTEK_MDIO_CTRL1_REG		21</div><div class='add'>+#define REALTEK_MDIO_ADDRESS_REG	23</div><div class='add'>+#define REALTEK_MDIO_DATA_WRITE_REG	24</div><div class='add'>+#define REALTEK_MDIO_DATA_READ_REG	25</div><div class='add'>+</div><div class='add'>+#define REALTEK_MDIO_START_OP		0xFFFF</div><div class='add'>+#define REALTEK_MDIO_ADDR_OP		0x000E</div><div class='add'>+#define REALTEK_MDIO_READ_OP		0x0001</div><div class='add'>+#define REALTEK_MDIO_WRITE_OP		0x0003</div><div class='add'>+</div><div class='add'>+static int realtek_mdio_write(void *ctx, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ctx;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_CTRL0_REG, REALTEK_MDIO_ADDR_OP);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_ADDRESS_REG, reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_DATA_WRITE_REG, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_CTRL1_REG, REALTEK_MDIO_WRITE_OP);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_mdio_read(void *ctx, u32 reg, u32 *val)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ctx;</div><div class='add'>+	struct mii_bus *bus = priv-&gt;bus;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_CTRL0_REG, REALTEK_MDIO_ADDR_OP);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_ADDRESS_REG, reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;write(bus, priv-&gt;mdio_addr, REALTEK_MDIO_CTRL1_REG, REALTEK_MDIO_READ_OP);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = bus-&gt;read(bus, priv-&gt;mdio_addr, REALTEK_MDIO_DATA_READ_REG);</div><div class='add'>+	if (ret &gt;= 0) {</div><div class='add'>+		*val = ret;</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct realtek_interface_info realtek_mdio_info = {</div><div class='add'>+	.reg_read = realtek_mdio_read,</div><div class='add'>+	.reg_write = realtek_mdio_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * realtek_mdio_probe() - Probe a platform device for an MDIO-connected switch</div><div class='add'>+ * @mdiodev: mdio_device to probe on.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used as the .probe in an mdio_driver. After</div><div class='add'>+ * calling the common probe function for both interfaces, it initializes the</div><div class='add'>+ * values specific for MDIO-connected devices. Finally, it calls a common</div><div class='add'>+ * function to register the DSA switch.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep. Takes and releases priv-&gt;map_lock.</div><div class='add'>+ * Return: Returns 0 on success, a negative error on failure.</div><div class='add'>+ */</div><div class='add'>+int realtek_mdio_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	struct realtek_priv *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = rtl83xx_probe(dev, &amp;realtek_mdio_info);</div><div class='add'>+	if (IS_ERR(priv))</div><div class='add'>+		return PTR_ERR(priv);</div><div class='add'>+</div><div class='add'>+	priv-&gt;bus = mdiodev-&gt;bus;</div><div class='add'>+	priv-&gt;mdio_addr = mdiodev-&gt;addr;</div><div class='add'>+	priv-&gt;write_reg_noack = realtek_mdio_write;</div><div class='add'>+</div><div class='add'>+	ret = rtl83xx_register_switch(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtl83xx_remove(priv);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(realtek_mdio_probe, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * realtek_mdio_remove() - Remove the driver of an MDIO-connected switch</div><div class='add'>+ * @mdiodev: mdio_device to be removed.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used as the .remove in an mdio_driver. First</div><div class='add'>+ * it unregisters the DSA switch and then it calls the common remove function.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Nothing.</div><div class='add'>+ */</div><div class='add'>+void realtek_mdio_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtl83xx_unregister_switch(priv);</div><div class='add'>+</div><div class='add'>+	rtl83xx_remove(priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(realtek_mdio_remove, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * realtek_mdio_shutdown() - Shutdown the driver of a MDIO-connected switch</div><div class='add'>+ * @mdiodev: mdio_device shutting down.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used as the .shutdown in a platform_driver. It calls</div><div class='add'>+ * the common shutdown function.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Nothing.</div><div class='add'>+ */</div><div class='add'>+void realtek_mdio_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtl83xx_shutdown(priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(realtek_mdio_shutdown, "REALTEK_DSA");</div><div class='head'>diff --git a/drivers/net/dsa/realtek/realtek-mdio.h b/drivers/net/dsa/realtek/realtek-mdio.h<br/>new file mode 100644<br/>index 000000000000..ee70f6a5b8ff<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/realtek-mdio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/realtek-mdio.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+</div><div class='add'>+#ifndef _REALTEK_MDIO_H</div><div class='add'>+#define _REALTEK_MDIO_H</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_MDIO)</div><div class='add'>+</div><div class='add'>+static inline int realtek_mdio_driver_register(struct mdio_driver *drv)</div><div class='add'>+{</div><div class='add'>+	return mdio_driver_register(drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_mdio_driver_unregister(struct mdio_driver *drv)</div><div class='add'>+{</div><div class='add'>+	mdio_driver_unregister(drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int realtek_mdio_probe(struct mdio_device *mdiodev);</div><div class='add'>+void realtek_mdio_remove(struct mdio_device *mdiodev);</div><div class='add'>+void realtek_mdio_shutdown(struct mdio_device *mdiodev);</div><div class='add'>+</div><div class='add'>+#else /* IS_ENABLED(CONFIG_NET_DSA_REALTEK_MDIO) */</div><div class='add'>+</div><div class='add'>+static inline int realtek_mdio_driver_register(struct mdio_driver *drv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_mdio_driver_unregister(struct mdio_driver *drv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int realtek_mdio_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_mdio_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_mdio_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NET_DSA_REALTEK_MDIO) */</div><div class='add'>+</div><div class='add'>+#endif /* _REALTEK_MDIO_H */</div><div class='head'>diff --git a/drivers/net/dsa/realtek/realtek-smi.c b/drivers/net/dsa/realtek/realtek-smi.c<br/>new file mode 100644<br/>index 000000000000..972e22218418<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/realtek-smi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/realtek-smi.c</a></div><div class='hunk'>@@ -0,0 +1,408 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+/* Realtek Simple Management Interface (SMI) driver</div><div class='add'>+ * It can be discussed how "simple" this interface is.</div><div class='add'>+ *</div><div class='add'>+ * The SMI protocol piggy-backs the MDIO MDC and MDIO signals levels</div><div class='add'>+ * but the protocol is not MDIO at all. Instead it is a Realtek</div><div class='add'>+ * pecularity that need to bit-bang the lines in a special way to</div><div class='add'>+ * communicate with the switch.</div><div class='add'>+ *</div><div class='add'>+ * ASICs we intend to support with this driver:</div><div class='add'>+ *</div><div class='add'>+ * RTL8366   - The original version, apparently</div><div class='add'>+ * RTL8369   - Similar enough to have the same datsheet as RTL8366</div><div class='add'>+ * RTL8366RB - Probably reads out "RTL8366 revision B", has a quite</div><div class='add'>+ *             different register layout from the other two</div><div class='add'>+ * RTL8366S  - Is this "RTL8366 super"?</div><div class='add'>+ * RTL8367   - Has an OpenWRT driver as well</div><div class='add'>+ * RTL8368S  - Seems to be an alternative name for RTL8366RB</div><div class='add'>+ * RTL8370   - Also uses SMI</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='add'>+ * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='add'>+ * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+#include "realtek-smi.h"</div><div class='add'>+#include "rtl83xx.h"</div><div class='add'>+</div><div class='add'>+#define REALTEK_SMI_ACK_RETRY_COUNT		5</div><div class='add'>+</div><div class='add'>+static inline void realtek_smi_clk_delay(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	ndelay(priv-&gt;variant-&gt;clk_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void realtek_smi_start(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Set GPIO pins to output mode, with initial state:</div><div class='add'>+	 * SCK = 0, SDA = 1</div><div class='add'>+	 */</div><div class='add'>+	gpiod_direction_output(priv-&gt;mdc, 0);</div><div class='add'>+	gpiod_direction_output(priv-&gt;mdio, 1);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+</div><div class='add'>+	/* CLK 1: 0 -&gt; 1, 1 -&gt; 0 */</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 0);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+</div><div class='add'>+	/* CLK 2: */</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdio, 0);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 0);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdio, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void realtek_smi_stop(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdio, 0);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdio, 1);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 0);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+</div><div class='add'>+	/* Add a click */</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 0);</div><div class='add'>+	realtek_smi_clk_delay(priv);</div><div class='add'>+	gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+</div><div class='add'>+	/* Set GPIO pins to input mode */</div><div class='add'>+	gpiod_direction_input(priv-&gt;mdio);</div><div class='add'>+	gpiod_direction_input(priv-&gt;mdc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void realtek_smi_write_bits(struct realtek_priv *priv, u32 data, u32 len)</div><div class='add'>+{</div><div class='add'>+	for (; len &gt; 0; len--) {</div><div class='add'>+		realtek_smi_clk_delay(priv);</div><div class='add'>+</div><div class='add'>+		/* Prepare data */</div><div class='add'>+		gpiod_set_value(priv-&gt;mdio, !!(data &amp; (1 &lt;&lt; (len - 1))));</div><div class='add'>+		realtek_smi_clk_delay(priv);</div><div class='add'>+</div><div class='add'>+		/* Clocking */</div><div class='add'>+		gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+		realtek_smi_clk_delay(priv);</div><div class='add'>+		gpiod_set_value(priv-&gt;mdc, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void realtek_smi_read_bits(struct realtek_priv *priv, u32 len, u32 *data)</div><div class='add'>+{</div><div class='add'>+	gpiod_direction_input(priv-&gt;mdio);</div><div class='add'>+</div><div class='add'>+	for (*data = 0; len &gt; 0; len--) {</div><div class='add'>+		u32 u;</div><div class='add'>+</div><div class='add'>+		realtek_smi_clk_delay(priv);</div><div class='add'>+</div><div class='add'>+		/* Clocking */</div><div class='add'>+		gpiod_set_value(priv-&gt;mdc, 1);</div><div class='add'>+		realtek_smi_clk_delay(priv);</div><div class='add'>+		u = !!gpiod_get_value(priv-&gt;mdio);</div><div class='add'>+		gpiod_set_value(priv-&gt;mdc, 0);</div><div class='add'>+</div><div class='add'>+		*data |= (u &lt;&lt; (len - 1));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gpiod_direction_output(priv-&gt;mdio, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_wait_for_ack(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int retry_cnt;</div><div class='add'>+</div><div class='add'>+	retry_cnt = 0;</div><div class='add'>+	do {</div><div class='add'>+		u32 ack;</div><div class='add'>+</div><div class='add'>+		realtek_smi_read_bits(priv, 1, &amp;ack);</div><div class='add'>+		if (ack == 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (++retry_cnt &gt; REALTEK_SMI_ACK_RETRY_COUNT) {</div><div class='add'>+			dev_err(priv-&gt;dev, "ACK timeout\n");</div><div class='add'>+			return -ETIMEDOUT;</div><div class='add'>+		}</div><div class='add'>+	} while (1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_write_byte(struct realtek_priv *priv, u8 data)</div><div class='add'>+{</div><div class='add'>+	realtek_smi_write_bits(priv, data, 8);</div><div class='add'>+	return realtek_smi_wait_for_ack(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_write_byte_noack(struct realtek_priv *priv, u8 data)</div><div class='add'>+{</div><div class='add'>+	realtek_smi_write_bits(priv, data, 8);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_read_byte0(struct realtek_priv *priv, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u32 t;</div><div class='add'>+</div><div class='add'>+	/* Read data */</div><div class='add'>+	realtek_smi_read_bits(priv, 8, &amp;t);</div><div class='add'>+	*data = (t &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	/* Send an ACK */</div><div class='add'>+	realtek_smi_write_bits(priv, 0x00, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_read_byte1(struct realtek_priv *priv, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u32 t;</div><div class='add'>+</div><div class='add'>+	/* Read data */</div><div class='add'>+	realtek_smi_read_bits(priv, 8, &amp;t);</div><div class='add'>+	*data = (t &amp; 0xff);</div><div class='add'>+</div><div class='add'>+	/* Send an ACK */</div><div class='add'>+	realtek_smi_write_bits(priv, 0x01, 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_read_reg(struct realtek_priv *priv, u32 addr, u32 *data)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u8 lo = 0;</div><div class='add'>+	u8 hi = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	realtek_smi_start(priv);</div><div class='add'>+</div><div class='add'>+	/* Send READ command */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, priv-&gt;variant-&gt;cmd_read);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Set ADDR[7:0] */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, addr &amp; 0xff);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Set ADDR[15:8] */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, addr &gt;&gt; 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Read DATA[7:0] */</div><div class='add'>+	realtek_smi_read_byte0(priv, &amp;lo);</div><div class='add'>+	/* Read DATA[15:8] */</div><div class='add'>+	realtek_smi_read_byte1(priv, &amp;hi);</div><div class='add'>+</div><div class='add'>+	*data = ((u32)lo) | (((u32)hi) &lt;&lt; 8);</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	realtek_smi_stop(priv);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_write_reg(struct realtek_priv *priv,</div><div class='add'>+				 u32 addr, u32 data, bool ack)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	realtek_smi_start(priv);</div><div class='add'>+</div><div class='add'>+	/* Send WRITE command */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, priv-&gt;variant-&gt;cmd_write);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Set ADDR[7:0] */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, addr &amp; 0xff);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Set ADDR[15:8] */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, addr &gt;&gt; 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Write DATA[7:0] */</div><div class='add'>+	ret = realtek_smi_write_byte(priv, data &amp; 0xff);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Write DATA[15:8] */</div><div class='add'>+	if (ack)</div><div class='add'>+		ret = realtek_smi_write_byte(priv, data &gt;&gt; 8);</div><div class='add'>+	else</div><div class='add'>+		ret = realtek_smi_write_byte_noack(priv, data &gt;&gt; 8);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+</div><div class='add'>+ out:</div><div class='add'>+	realtek_smi_stop(priv);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There is one single case when we need to use this accessor and that</div><div class='add'>+ * is when issueing soft reset. Since the device reset as soon as we write</div><div class='add'>+ * that bit, no ACK will come back for natural reasons.</div><div class='add'>+ */</div><div class='add'>+static int realtek_smi_write_reg_noack(void *ctx, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	return realtek_smi_write_reg(ctx, reg, val, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Regmap accessors */</div><div class='add'>+</div><div class='add'>+static int realtek_smi_write(void *ctx, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ctx;</div><div class='add'>+</div><div class='add'>+	return realtek_smi_write_reg(priv, reg, val, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int realtek_smi_read(void *ctx, u32 reg, u32 *val)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ctx;</div><div class='add'>+</div><div class='add'>+	return realtek_smi_read_reg(priv, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct realtek_interface_info realtek_smi_info = {</div><div class='add'>+	.reg_read = realtek_smi_read,</div><div class='add'>+	.reg_write = realtek_smi_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * realtek_smi_probe() - Probe a platform device for an SMI-connected switch</div><div class='add'>+ * @pdev: platform_device to probe on.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used as the .probe in a platform_driver. After</div><div class='add'>+ * calling the common probe function for both interfaces, it initializes the</div><div class='add'>+ * values specific for SMI-connected devices. Finally, it calls a common</div><div class='add'>+ * function to register the DSA switch.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep. Takes and releases priv-&gt;map_lock.</div><div class='add'>+ * Return: Returns 0 on success, a negative error on failure.</div><div class='add'>+ */</div><div class='add'>+int realtek_smi_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct realtek_priv *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = rtl83xx_probe(dev, &amp;realtek_smi_info);</div><div class='add'>+	if (IS_ERR(priv))</div><div class='add'>+		return PTR_ERR(priv);</div><div class='add'>+</div><div class='add'>+	/* Fetch MDIO pins */</div><div class='add'>+	priv-&gt;mdc = devm_gpiod_get_optional(dev, "mdc", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(priv-&gt;mdc)) {</div><div class='add'>+		rtl83xx_remove(priv);</div><div class='add'>+		return PTR_ERR(priv-&gt;mdc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio = devm_gpiod_get_optional(dev, "mdio", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(priv-&gt;mdio)) {</div><div class='add'>+		rtl83xx_remove(priv);</div><div class='add'>+		return PTR_ERR(priv-&gt;mdio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;write_reg_noack = realtek_smi_write_reg_noack;</div><div class='add'>+</div><div class='add'>+	ret = rtl83xx_register_switch(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		rtl83xx_remove(priv);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(realtek_smi_probe, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * realtek_smi_remove() - Remove the driver of a SMI-connected switch</div><div class='add'>+ * @pdev: platform_device to be removed.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used as the .remove in a platform_driver. First</div><div class='add'>+ * it unregisters the DSA switch and then it calls the common remove function.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Nothing.</div><div class='add'>+ */</div><div class='add'>+void realtek_smi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtl83xx_unregister_switch(priv);</div><div class='add'>+</div><div class='add'>+	rtl83xx_remove(priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(realtek_smi_remove, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * realtek_smi_shutdown() - Shutdown the driver of a SMI-connected switch</div><div class='add'>+ * @pdev: platform_device shutting down.</div><div class='add'>+ *</div><div class='add'>+ * This function should be used as the .shutdown in a platform_driver. It calls</div><div class='add'>+ * the common shutdown function.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Nothing.</div><div class='add'>+ */</div><div class='add'>+void realtek_smi_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rtl83xx_shutdown(priv);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(realtek_smi_shutdown, "REALTEK_DSA");</div><div class='head'>diff --git a/drivers/net/dsa/realtek/realtek-smi.h b/drivers/net/dsa/realtek/realtek-smi.h<br/>new file mode 100644<br/>index 000000000000..ea49a2edd3c8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/realtek-smi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/realtek-smi.h</a></div><div class='hunk'>@@ -0,0 +1,48 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+</div><div class='add'>+#ifndef _REALTEK_SMI_H</div><div class='add'>+#define _REALTEK_SMI_H</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_SMI)</div><div class='add'>+</div><div class='add'>+static inline int realtek_smi_driver_register(struct platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	return platform_driver_register(drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_smi_driver_unregister(struct platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	platform_driver_unregister(drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int realtek_smi_probe(struct platform_device *pdev);</div><div class='add'>+void realtek_smi_remove(struct platform_device *pdev);</div><div class='add'>+void realtek_smi_shutdown(struct platform_device *pdev);</div><div class='add'>+</div><div class='add'>+#else /* IS_ENABLED(CONFIG_NET_DSA_REALTEK_SMI) */</div><div class='add'>+</div><div class='add'>+static inline int realtek_smi_driver_register(struct platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_smi_driver_unregister(struct platform_driver *drv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int realtek_smi_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_smi_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void realtek_smi_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NET_DSA_REALTEK_SMI) */</div><div class='add'>+</div><div class='add'>+#endif  /* _REALTEK_SMI_H */</div><div class='head'>diff --git a/drivers/net/dsa/realtek/realtek.h b/drivers/net/dsa/realtek/realtek.h<br/>new file mode 100644<br/>index 000000000000..c03485a80d93<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/realtek.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/realtek.h</a></div><div class='hunk'>@@ -0,0 +1,147 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+/* Realtek SMI interface driver defines</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _REALTEK_H</div><div class='add'>+#define _REALTEK_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+</div><div class='add'>+#define REALTEK_HW_STOP_DELAY		25	/* msecs */</div><div class='add'>+#define REALTEK_HW_START_DELAY		100	/* msecs */</div><div class='add'>+</div><div class='add'>+struct phylink_mac_ops;</div><div class='add'>+struct realtek_ops;</div><div class='add'>+</div><div class='add'>+struct rtl8366_mib_counter {</div><div class='add'>+	unsigned int	base;</div><div class='add'>+	unsigned int	offset;</div><div class='add'>+	unsigned int	length;</div><div class='add'>+	const char	*name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct rtl8366_vlan_mc - Virtual LAN member configuration</div><div class='add'>+ */</div><div class='add'>+struct rtl8366_vlan_mc {</div><div class='add'>+	u16	vid;</div><div class='add'>+	u16	untag;</div><div class='add'>+	u16	member;</div><div class='add'>+	u8	fid;</div><div class='add'>+	u8	priority;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtl8366_vlan_4k {</div><div class='add'>+	u16	vid;</div><div class='add'>+	u16	untag;</div><div class='add'>+	u16	member;</div><div class='add'>+	u8	fid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct realtek_priv {</div><div class='add'>+	struct device		*dev;</div><div class='add'>+	struct reset_control    *reset_ctl;</div><div class='add'>+	struct gpio_desc	*reset;</div><div class='add'>+	struct gpio_desc	*mdc;</div><div class='add'>+	struct gpio_desc	*mdio;</div><div class='add'>+	struct regmap		*map;</div><div class='add'>+	struct regmap		*map_nolock;</div><div class='add'>+	struct mutex		map_lock;</div><div class='add'>+	struct mii_bus		*user_mii_bus;</div><div class='add'>+	struct mii_bus		*bus;</div><div class='add'>+	int			mdio_addr;</div><div class='add'>+</div><div class='add'>+	const struct realtek_variant *variant;</div><div class='add'>+</div><div class='add'>+	spinlock_t		lock; /* Locks around command writes */</div><div class='add'>+	struct dsa_switch	ds;</div><div class='add'>+	struct irq_domain	*irqdomain;</div><div class='add'>+	bool			leds_disabled;</div><div class='add'>+</div><div class='add'>+	unsigned int		cpu_port;</div><div class='add'>+	unsigned int		num_ports;</div><div class='add'>+	unsigned int		num_vlan_mc;</div><div class='add'>+	unsigned int		num_mib_counters;</div><div class='add'>+	struct rtl8366_mib_counter *mib_counters;</div><div class='add'>+</div><div class='add'>+	const struct realtek_ops *ops;</div><div class='add'>+	int			(*write_reg_noack)(void *ctx, u32 addr, u32 data);</div><div class='add'>+</div><div class='add'>+	int			vlan_enabled;</div><div class='add'>+	int			vlan4k_enabled;</div><div class='add'>+</div><div class='add'>+	char			buf[4096];</div><div class='add'>+	void			*chip_data; /* Per-chip extra variant data */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct realtek_ops - vtable for the per-SMI-chiptype operations</div><div class='add'>+ * @detect: detects the chiptype</div><div class='add'>+ */</div><div class='add'>+struct realtek_ops {</div><div class='add'>+	int	(*detect)(struct realtek_priv *priv);</div><div class='add'>+	int	(*reset_chip)(struct realtek_priv *priv);</div><div class='add'>+	int	(*setup)(struct realtek_priv *priv);</div><div class='add'>+	int	(*get_mib_counter)(struct realtek_priv *priv,</div><div class='add'>+				   int port,</div><div class='add'>+				   struct rtl8366_mib_counter *mib,</div><div class='add'>+				   u64 *mibvalue);</div><div class='add'>+	int	(*get_vlan_mc)(struct realtek_priv *priv, u32 index,</div><div class='add'>+			       struct rtl8366_vlan_mc *vlanmc);</div><div class='add'>+	int	(*set_vlan_mc)(struct realtek_priv *priv, u32 index,</div><div class='add'>+			       const struct rtl8366_vlan_mc *vlanmc);</div><div class='add'>+	int	(*get_vlan_4k)(struct realtek_priv *priv, u32 vid,</div><div class='add'>+			       struct rtl8366_vlan_4k *vlan4k);</div><div class='add'>+	int	(*set_vlan_4k)(struct realtek_priv *priv,</div><div class='add'>+			       const struct rtl8366_vlan_4k *vlan4k);</div><div class='add'>+	int	(*get_mc_index)(struct realtek_priv *priv, int port, int *val);</div><div class='add'>+	int	(*set_mc_index)(struct realtek_priv *priv, int port, int index);</div><div class='add'>+	bool	(*is_vlan_valid)(struct realtek_priv *priv, unsigned int vlan);</div><div class='add'>+	int	(*enable_vlan)(struct realtek_priv *priv, bool enable);</div><div class='add'>+	int	(*enable_vlan4k)(struct realtek_priv *priv, bool enable);</div><div class='add'>+	int	(*enable_port)(struct realtek_priv *priv, int port, bool enable);</div><div class='add'>+	int	(*phy_read)(struct realtek_priv *priv, int phy, int regnum);</div><div class='add'>+	int	(*phy_write)(struct realtek_priv *priv, int phy, int regnum,</div><div class='add'>+			     u16 val);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct realtek_variant {</div><div class='add'>+	const struct dsa_switch_ops *ds_ops;</div><div class='add'>+	const struct realtek_ops *ops;</div><div class='add'>+	const struct phylink_mac_ops *phylink_mac_ops;</div><div class='add'>+	unsigned int clk_delay;</div><div class='add'>+	u8 cmd_read;</div><div class='add'>+	u8 cmd_write;</div><div class='add'>+	size_t chip_data_sz;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RTL8366 library helpers */</div><div class='add'>+int rtl8366_mc_is_used(struct realtek_priv *priv, int mc_index, int *used);</div><div class='add'>+int rtl8366_set_vlan(struct realtek_priv *priv, int vid, u32 member,</div><div class='add'>+		     u32 untag, u32 fid);</div><div class='add'>+int rtl8366_set_pvid(struct realtek_priv *priv, unsigned int port,</div><div class='add'>+		     unsigned int vid);</div><div class='add'>+int rtl8366_enable_vlan4k(struct realtek_priv *priv, bool enable);</div><div class='add'>+int rtl8366_enable_vlan(struct realtek_priv *priv, bool enable);</div><div class='add'>+int rtl8366_reset_vlan(struct realtek_priv *priv);</div><div class='add'>+int rtl8366_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+		     const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+int rtl8366_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+		     const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+			 uint8_t *data);</div><div class='add'>+int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset);</div><div class='add'>+void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);</div><div class='add'>+</div><div class='add'>+extern const struct realtek_variant rtl8366rb_variant;</div><div class='add'>+extern const struct realtek_variant rtl8365mb_variant;</div><div class='add'>+</div><div class='add'>+#endif /*  _REALTEK_H */</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c<br/>new file mode 100644<br/>index 000000000000..c575e164368c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl8365mb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl8365mb.c</a></div><div class='hunk'>@@ -0,0 +1,2211 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Realtek SMI subdriver for the Realtek RTL8365MB-VC ethernet switch.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2021 Alvin Šipraga &lt;alsi@bang-olufsen.dk&gt;</div><div class='add'>+ * Copyright (C) 2021 Michael Rasmussen &lt;mir@bang-olufsen.dk&gt;</div><div class='add'>+ *</div><div class='add'>+ * The RTL8365MB-VC is a 4+1 port 10/100/1000M switch controller. It includes 4</div><div class='add'>+ * integrated PHYs for the user facing ports, and an extension interface which</div><div class='add'>+ * can be connected to the CPU - or another PHY - via either MII, RMII, or</div><div class='add'>+ * RGMII. The switch is configured via the Realtek Simple Management Interface</div><div class='add'>+ * (SMI), which uses the MDIO/MDC lines.</div><div class='add'>+ *</div><div class='add'>+ * Below is a simplified block diagram of the chip and its relevant interfaces.</div><div class='add'>+ *</div><div class='add'>+ *                          .-----------------------------------.</div><div class='add'>+ *                          |                                   |</div><div class='add'>+ *         UTP &lt;---------------&gt; Giga PHY &lt;-&gt; PCS &lt;-&gt; P0 GMAC   |</div><div class='add'>+ *         UTP &lt;---------------&gt; Giga PHY &lt;-&gt; PCS &lt;-&gt; P1 GMAC   |</div><div class='add'>+ *         UTP &lt;---------------&gt; Giga PHY &lt;-&gt; PCS &lt;-&gt; P2 GMAC   |</div><div class='add'>+ *         UTP &lt;---------------&gt; Giga PHY &lt;-&gt; PCS &lt;-&gt; P3 GMAC   |</div><div class='add'>+ *                          |                                   |</div><div class='add'>+ *     CPU/PHY &lt;-MII/RMII/RGMII---&gt;  Extension  &lt;---&gt; Extension |</div><div class='add'>+ *                          |       interface 1        GMAC 1   |</div><div class='add'>+ *                          |                                   |</div><div class='add'>+ *     SMI driver/ &lt;-MDC/SCL---&gt; Management    ~~~~~~~~~~~~~~   |</div><div class='add'>+ *        EEPROM   &lt;-MDIO/SDA--&gt; interface     ~REALTEK ~~~~~   |</div><div class='add'>+ *                          |                  ~RTL8365MB ~~~   |</div><div class='add'>+ *                          |                  ~GXXXC TAIWAN~   |</div><div class='add'>+ *        GPIO &lt;--------------&gt; Reset          ~~~~~~~~~~~~~~   |</div><div class='add'>+ *                          |                                   |</div><div class='add'>+ *      Interrupt  &lt;----------&gt; Link UP/DOWN events             |</div><div class='add'>+ *      controller          |                                   |</div><div class='add'>+ *                          '-----------------------------------'</div><div class='add'>+ *</div><div class='add'>+ * The driver uses DSA to integrate the 4 user and 1 extension ports into the</div><div class='add'>+ * kernel. Netdevices are created for the user ports, as are PHY devices for</div><div class='add'>+ * their integrated PHYs. The device tree firmware should also specify the link</div><div class='add'>+ * partner of the extension port - either via a fixed-link or other phy-handle.</div><div class='add'>+ * See the device tree bindings for more detailed information. Note that the</div><div class='add'>+ * driver has only been tested with a fixed-link, but in principle it should not</div><div class='add'>+ * matter.</div><div class='add'>+ *</div><div class='add'>+ * NOTE: Currently, only the RGMII interface is implemented in this driver.</div><div class='add'>+ *</div><div class='add'>+ * The interrupt line is asserted on link UP/DOWN events. The driver creates a</div><div class='add'>+ * custom irqchip to handle this interrupt and demultiplex the events by reading</div><div class='add'>+ * the status registers via SMI. Interrupts are then propagated to the relevant</div><div class='add'>+ * PHY device.</div><div class='add'>+ *</div><div class='add'>+ * The EEPROM contains initial register values which the chip will read over I2C</div><div class='add'>+ * upon hardware reset. It is also possible to omit the EEPROM. In both cases,</div><div class='add'>+ * the driver will manually reprogram some registers using jam tables to reach</div><div class='add'>+ * an initial state defined by the vendor driver.</div><div class='add'>+ *</div><div class='add'>+ * This Linux driver is written based on an OS-agnostic vendor driver from</div><div class='add'>+ * Realtek. The reference GPL-licensed sources can be found in the OpenWrt</div><div class='add'>+ * source tree under the name rtl8367c. The vendor driver claims to support a</div><div class='add'>+ * number of similar switch controllers from Realtek, but the only hardware we</div><div class='add'>+ * have is the RTL8365MB-VC. Moreover, there does not seem to be any chip under</div><div class='add'>+ * the name RTL8367C. Although one wishes that the 'C' stood for some kind of</div><div class='add'>+ * common hardware revision, there exist examples of chips with the suffix -VC</div><div class='add'>+ * which are explicitly not supported by the rtl8367c driver and which instead</div><div class='add'>+ * require the rtl8367d vendor driver. With all this uncertainty, the driver has</div><div class='add'>+ * been modestly named rtl8365mb. Future implementors may wish to rename things</div><div class='add'>+ * accordingly.</div><div class='add'>+ *</div><div class='add'>+ * In the same family of chips, some carry up to 8 user ports and up to 2</div><div class='add'>+ * extension ports. Where possible this driver tries to make things generic, but</div><div class='add'>+ * more work must be done to support these configurations. According to</div><div class='add'>+ * documentation from Realtek, the family should include the following chips:</div><div class='add'>+ *</div><div class='add'>+ *  - RTL8363NB</div><div class='add'>+ *  - RTL8363NB-VB</div><div class='add'>+ *  - RTL8363SC</div><div class='add'>+ *  - RTL8363SC-VB</div><div class='add'>+ *  - RTL8364NB</div><div class='add'>+ *  - RTL8364NB-VB</div><div class='add'>+ *  - RTL8365MB-VC</div><div class='add'>+ *  - RTL8366SC</div><div class='add'>+ *  - RTL8367RB-VB</div><div class='add'>+ *  - RTL8367SB</div><div class='add'>+ *  - RTL8367S</div><div class='add'>+ *  - RTL8370MB</div><div class='add'>+ *  - RTL8310SR</div><div class='add'>+ *</div><div class='add'>+ * Some of the register logic for these additional chips has been skipped over</div><div class='add'>+ * while implementing this driver. It is therefore not possible to assume that</div><div class='add'>+ * things will work out-of-the-box for other chips, and a careful review of the</div><div class='add'>+ * vendor driver may be needed to expand support. The RTL8365MB-VC seems to be</div><div class='add'>+ * one of the simpler chips.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+#include "realtek-smi.h"</div><div class='add'>+#include "realtek-mdio.h"</div><div class='add'>+#include "rtl83xx.h"</div><div class='add'>+</div><div class='add'>+/* Family-specific data and limits */</div><div class='add'>+#define RTL8365MB_PHYADDRMAX		7</div><div class='add'>+#define RTL8365MB_NUM_PHYREGS		32</div><div class='add'>+#define RTL8365MB_PHYREGMAX		(RTL8365MB_NUM_PHYREGS - 1)</div><div class='add'>+#define RTL8365MB_MAX_NUM_PORTS		11</div><div class='add'>+#define RTL8365MB_MAX_NUM_EXTINTS	3</div><div class='add'>+#define RTL8365MB_LEARN_LIMIT_MAX	2112</div><div class='add'>+</div><div class='add'>+/* Chip identification registers */</div><div class='add'>+#define RTL8365MB_CHIP_ID_REG		0x1300</div><div class='add'>+</div><div class='add'>+#define RTL8365MB_CHIP_VER_REG		0x1301</div><div class='add'>+</div><div class='add'>+#define RTL8365MB_MAGIC_REG		0x13C2</div><div class='add'>+#define   RTL8365MB_MAGIC_VALUE		0x0249</div><div class='add'>+</div><div class='add'>+/* Chip reset register */</div><div class='add'>+#define RTL8365MB_CHIP_RESET_REG	0x1322</div><div class='add'>+#define RTL8365MB_CHIP_RESET_SW_MASK	0x0002</div><div class='add'>+#define RTL8365MB_CHIP_RESET_HW_MASK	0x0001</div><div class='add'>+</div><div class='add'>+/* Interrupt polarity register */</div><div class='add'>+#define RTL8365MB_INTR_POLARITY_REG	0x1100</div><div class='add'>+#define   RTL8365MB_INTR_POLARITY_MASK	0x0001</div><div class='add'>+#define   RTL8365MB_INTR_POLARITY_HIGH	0</div><div class='add'>+#define   RTL8365MB_INTR_POLARITY_LOW	1</div><div class='add'>+</div><div class='add'>+/* Interrupt control/status register - enable/check specific interrupt types */</div><div class='add'>+#define RTL8365MB_INTR_CTRL_REG			0x1101</div><div class='add'>+#define RTL8365MB_INTR_STATUS_REG		0x1102</div><div class='add'>+#define   RTL8365MB_INTR_SLIENT_START_2_MASK	0x1000</div><div class='add'>+#define   RTL8365MB_INTR_SLIENT_START_MASK	0x0800</div><div class='add'>+#define   RTL8365MB_INTR_ACL_ACTION_MASK	0x0200</div><div class='add'>+#define   RTL8365MB_INTR_CABLE_DIAG_FIN_MASK	0x0100</div><div class='add'>+#define   RTL8365MB_INTR_INTERRUPT_8051_MASK	0x0080</div><div class='add'>+#define   RTL8365MB_INTR_LOOP_DETECTION_MASK	0x0040</div><div class='add'>+#define   RTL8365MB_INTR_GREEN_TIMER_MASK	0x0020</div><div class='add'>+#define   RTL8365MB_INTR_SPECIAL_CONGEST_MASK	0x0010</div><div class='add'>+#define   RTL8365MB_INTR_SPEED_CHANGE_MASK	0x0008</div><div class='add'>+#define   RTL8365MB_INTR_LEARN_OVER_MASK	0x0004</div><div class='add'>+#define   RTL8365MB_INTR_METER_EXCEEDED_MASK	0x0002</div><div class='add'>+#define   RTL8365MB_INTR_LINK_CHANGE_MASK	0x0001</div><div class='add'>+#define   RTL8365MB_INTR_ALL_MASK                      \</div><div class='add'>+		(RTL8365MB_INTR_SLIENT_START_2_MASK |  \</div><div class='add'>+		 RTL8365MB_INTR_SLIENT_START_MASK |    \</div><div class='add'>+		 RTL8365MB_INTR_ACL_ACTION_MASK |      \</div><div class='add'>+		 RTL8365MB_INTR_CABLE_DIAG_FIN_MASK |  \</div><div class='add'>+		 RTL8365MB_INTR_INTERRUPT_8051_MASK |  \</div><div class='add'>+		 RTL8365MB_INTR_LOOP_DETECTION_MASK |  \</div><div class='add'>+		 RTL8365MB_INTR_GREEN_TIMER_MASK |     \</div><div class='add'>+		 RTL8365MB_INTR_SPECIAL_CONGEST_MASK | \</div><div class='add'>+		 RTL8365MB_INTR_SPEED_CHANGE_MASK |    \</div><div class='add'>+		 RTL8365MB_INTR_LEARN_OVER_MASK |      \</div><div class='add'>+		 RTL8365MB_INTR_METER_EXCEEDED_MASK |  \</div><div class='add'>+		 RTL8365MB_INTR_LINK_CHANGE_MASK)</div><div class='add'>+</div><div class='add'>+/* Per-port interrupt type status registers */</div><div class='add'>+#define RTL8365MB_PORT_LINKDOWN_IND_REG		0x1106</div><div class='add'>+#define   RTL8365MB_PORT_LINKDOWN_IND_MASK	0x07FF</div><div class='add'>+</div><div class='add'>+#define RTL8365MB_PORT_LINKUP_IND_REG		0x1107</div><div class='add'>+#define   RTL8365MB_PORT_LINKUP_IND_MASK	0x07FF</div><div class='add'>+</div><div class='add'>+/* PHY indirect access registers */</div><div class='add'>+#define RTL8365MB_INDIRECT_ACCESS_CTRL_REG			0x1F00</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_CTRL_RW_MASK		0x0002</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_CTRL_RW_READ		0</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_CTRL_RW_WRITE		1</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_CTRL_CMD_MASK		0x0001</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_CTRL_CMD_VALUE		1</div><div class='add'>+#define RTL8365MB_INDIRECT_ACCESS_STATUS_REG			0x1F01</div><div class='add'>+#define RTL8365MB_INDIRECT_ACCESS_ADDRESS_REG			0x1F02</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_ADDRESS_OCPADR_5_1_MASK	GENMASK(4, 0)</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_ADDRESS_PHYNUM_MASK		GENMASK(7, 5)</div><div class='add'>+#define   RTL8365MB_INDIRECT_ACCESS_ADDRESS_OCPADR_9_6_MASK	GENMASK(11, 8)</div><div class='add'>+#define   RTL8365MB_PHY_BASE					0x2000</div><div class='add'>+#define RTL8365MB_INDIRECT_ACCESS_WRITE_DATA_REG		0x1F03</div><div class='add'>+#define RTL8365MB_INDIRECT_ACCESS_READ_DATA_REG			0x1F04</div><div class='add'>+</div><div class='add'>+/* PHY OCP address prefix register */</div><div class='add'>+#define RTL8365MB_GPHY_OCP_MSB_0_REG			0x1D15</div><div class='add'>+#define   RTL8365MB_GPHY_OCP_MSB_0_CFG_CPU_OCPADR_MASK	0x0FC0</div><div class='add'>+#define RTL8365MB_PHY_OCP_ADDR_PREFIX_MASK		0xFC00</div><div class='add'>+</div><div class='add'>+/* The PHY OCP addresses of PHY registers 0~31 start here */</div><div class='add'>+#define RTL8365MB_PHY_OCP_ADDR_PHYREG_BASE		0xA400</div><div class='add'>+</div><div class='add'>+/* External interface port mode values - used in DIGITAL_INTERFACE_SELECT */</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_DISABLE		0</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_RGMII		1</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_MII_MAC		2</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_MII_PHY		3</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_TMII_MAC	4</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_TMII_PHY	5</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_GMII		6</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_RMII_MAC	7</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_RMII_PHY	8</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_SGMII		9</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_HSGMII		10</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_1000X_100FX	11</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_1000X		12</div><div class='add'>+#define RTL8365MB_EXT_PORT_MODE_100FX		13</div><div class='add'>+</div><div class='add'>+/* External interface mode configuration registers 0~1 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_SELECT_REG0		0x1305 /* EXT0,EXT1 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_SELECT_REG1		0x13C3 /* EXT2 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_SELECT_REG(_extint) \</div><div class='add'>+		((_extint) &lt;= 1 ? RTL8365MB_DIGITAL_INTERFACE_SELECT_REG0 : \</div><div class='add'>+		 (_extint) == 2 ? RTL8365MB_DIGITAL_INTERFACE_SELECT_REG1 : \</div><div class='add'>+		 0x0)</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_SELECT_MODE_MASK(_extint) \</div><div class='add'>+		(0xF &lt;&lt; (((_extint) % 2)))</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_SELECT_MODE_OFFSET(_extint) \</div><div class='add'>+		(((_extint) % 2) * 4)</div><div class='add'>+</div><div class='add'>+/* External interface RGMII TX/RX delay configuration registers 0~2 */</div><div class='add'>+#define RTL8365MB_EXT_RGMXF_REG0		0x1306 /* EXT0 */</div><div class='add'>+#define RTL8365MB_EXT_RGMXF_REG1		0x1307 /* EXT1 */</div><div class='add'>+#define RTL8365MB_EXT_RGMXF_REG2		0x13C5 /* EXT2 */</div><div class='add'>+#define RTL8365MB_EXT_RGMXF_REG(_extint) \</div><div class='add'>+		((_extint) == 0 ? RTL8365MB_EXT_RGMXF_REG0 : \</div><div class='add'>+		 (_extint) == 1 ? RTL8365MB_EXT_RGMXF_REG1 : \</div><div class='add'>+		 (_extint) == 2 ? RTL8365MB_EXT_RGMXF_REG2 : \</div><div class='add'>+		 0x0)</div><div class='add'>+#define   RTL8365MB_EXT_RGMXF_RXDELAY_MASK	0x0007</div><div class='add'>+#define   RTL8365MB_EXT_RGMXF_TXDELAY_MASK	0x0008</div><div class='add'>+</div><div class='add'>+/* External interface port speed values - used in DIGITAL_INTERFACE_FORCE */</div><div class='add'>+#define RTL8365MB_PORT_SPEED_10M	0</div><div class='add'>+#define RTL8365MB_PORT_SPEED_100M	1</div><div class='add'>+#define RTL8365MB_PORT_SPEED_1000M	2</div><div class='add'>+</div><div class='add'>+/* External interface force configuration registers 0~2 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_FORCE_REG0		0x1310 /* EXT0 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_FORCE_REG1		0x1311 /* EXT1 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_FORCE_REG2		0x13C4 /* EXT2 */</div><div class='add'>+#define RTL8365MB_DIGITAL_INTERFACE_FORCE_REG(_extint) \</div><div class='add'>+		((_extint) == 0 ? RTL8365MB_DIGITAL_INTERFACE_FORCE_REG0 : \</div><div class='add'>+		 (_extint) == 1 ? RTL8365MB_DIGITAL_INTERFACE_FORCE_REG1 : \</div><div class='add'>+		 (_extint) == 2 ? RTL8365MB_DIGITAL_INTERFACE_FORCE_REG2 : \</div><div class='add'>+		 0x0)</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_EN_MASK		0x1000</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_NWAY_MASK		0x0080</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_TXPAUSE_MASK	0x0040</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_RXPAUSE_MASK	0x0020</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_LINK_MASK		0x0010</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_DUPLEX_MASK		0x0004</div><div class='add'>+#define   RTL8365MB_DIGITAL_INTERFACE_FORCE_SPEED_MASK		0x0003</div><div class='add'>+</div><div class='add'>+/* CPU port mask register - controls which ports are treated as CPU ports */</div><div class='add'>+#define RTL8365MB_CPU_PORT_MASK_REG	0x1219</div><div class='add'>+#define   RTL8365MB_CPU_PORT_MASK_MASK	0x07FF</div><div class='add'>+</div><div class='add'>+/* CPU control register */</div><div class='add'>+#define RTL8365MB_CPU_CTRL_REG			0x121A</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_TRAP_PORT_EXT_MASK	0x0400</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_TAG_FORMAT_MASK	0x0200</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_RXBYTECOUNT_MASK	0x0080</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_TAG_POSITION_MASK	0x0040</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_TRAP_PORT_MASK	0x0038</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_INSERTMODE_MASK	0x0006</div><div class='add'>+#define   RTL8365MB_CPU_CTRL_EN_MASK		0x0001</div><div class='add'>+</div><div class='add'>+/* Maximum packet length register */</div><div class='add'>+#define RTL8365MB_CFG0_MAX_LEN_REG	0x088C</div><div class='add'>+#define   RTL8365MB_CFG0_MAX_LEN_MASK	0x3FFF</div><div class='add'>+#define RTL8365MB_CFG0_MAX_LEN_MAX	0x3FFF</div><div class='add'>+</div><div class='add'>+/* Port learning limit registers */</div><div class='add'>+#define RTL8365MB_LUT_PORT_LEARN_LIMIT_BASE		0x0A20</div><div class='add'>+#define RTL8365MB_LUT_PORT_LEARN_LIMIT_REG(_physport) \</div><div class='add'>+		(RTL8365MB_LUT_PORT_LEARN_LIMIT_BASE + (_physport))</div><div class='add'>+</div><div class='add'>+/* Port isolation (forwarding mask) registers */</div><div class='add'>+#define RTL8365MB_PORT_ISOLATION_REG_BASE		0x08A2</div><div class='add'>+#define RTL8365MB_PORT_ISOLATION_REG(_physport) \</div><div class='add'>+		(RTL8365MB_PORT_ISOLATION_REG_BASE + (_physport))</div><div class='add'>+#define   RTL8365MB_PORT_ISOLATION_MASK			0x07FF</div><div class='add'>+</div><div class='add'>+/* MSTP port state registers - indexed by tree instance */</div><div class='add'>+#define RTL8365MB_MSTI_CTRL_BASE			0x0A00</div><div class='add'>+#define RTL8365MB_MSTI_CTRL_REG(_msti, _physport) \</div><div class='add'>+		(RTL8365MB_MSTI_CTRL_BASE + ((_msti) &lt;&lt; 1) + ((_physport) &gt;&gt; 3))</div><div class='add'>+#define   RTL8365MB_MSTI_CTRL_PORT_STATE_OFFSET(_physport) ((_physport) &lt;&lt; 1)</div><div class='add'>+#define   RTL8365MB_MSTI_CTRL_PORT_STATE_MASK(_physport) \</div><div class='add'>+		(0x3 &lt;&lt; RTL8365MB_MSTI_CTRL_PORT_STATE_OFFSET((_physport)))</div><div class='add'>+</div><div class='add'>+/* MIB counter value registers */</div><div class='add'>+#define RTL8365MB_MIB_COUNTER_BASE	0x1000</div><div class='add'>+#define RTL8365MB_MIB_COUNTER_REG(_x)	(RTL8365MB_MIB_COUNTER_BASE + (_x))</div><div class='add'>+</div><div class='add'>+/* MIB counter address register */</div><div class='add'>+#define RTL8365MB_MIB_ADDRESS_REG		0x1004</div><div class='add'>+#define   RTL8365MB_MIB_ADDRESS_PORT_OFFSET	0x007C</div><div class='add'>+#define   RTL8365MB_MIB_ADDRESS(_p, _x) \</div><div class='add'>+		(((RTL8365MB_MIB_ADDRESS_PORT_OFFSET) * (_p) + (_x)) &gt;&gt; 2)</div><div class='add'>+</div><div class='add'>+#define RTL8365MB_MIB_CTRL0_REG			0x1005</div><div class='add'>+#define   RTL8365MB_MIB_CTRL0_RESET_MASK	0x0002</div><div class='add'>+#define   RTL8365MB_MIB_CTRL0_BUSY_MASK		0x0001</div><div class='add'>+</div><div class='add'>+/* The DSA callback .get_stats64 runs in atomic context, so we are not allowed</div><div class='add'>+ * to block. On the other hand, accessing MIB counters absolutely requires us to</div><div class='add'>+ * block. The solution is thus to schedule work which polls the MIB counters</div><div class='add'>+ * asynchronously and updates some private data, which the callback can then</div><div class='add'>+ * fetch atomically. Three seconds should be a good enough polling interval.</div><div class='add'>+ */</div><div class='add'>+#define RTL8365MB_STATS_INTERVAL_JIFFIES	(3 * HZ)</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_mib_counter_index {</div><div class='add'>+	RTL8365MB_MIB_ifInOctets,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsFCSErrors,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsSymbolErrors,</div><div class='add'>+	RTL8365MB_MIB_dot3InPauseFrames,</div><div class='add'>+	RTL8365MB_MIB_dot3ControlInUnknownOpcodes,</div><div class='add'>+	RTL8365MB_MIB_etherStatsFragments,</div><div class='add'>+	RTL8365MB_MIB_etherStatsJabbers,</div><div class='add'>+	RTL8365MB_MIB_ifInUcastPkts,</div><div class='add'>+	RTL8365MB_MIB_etherStatsDropEvents,</div><div class='add'>+	RTL8365MB_MIB_ifInMulticastPkts,</div><div class='add'>+	RTL8365MB_MIB_ifInBroadcastPkts,</div><div class='add'>+	RTL8365MB_MIB_inMldChecksumError,</div><div class='add'>+	RTL8365MB_MIB_inIgmpChecksumError,</div><div class='add'>+	RTL8365MB_MIB_inMldSpecificQuery,</div><div class='add'>+	RTL8365MB_MIB_inMldGeneralQuery,</div><div class='add'>+	RTL8365MB_MIB_inIgmpSpecificQuery,</div><div class='add'>+	RTL8365MB_MIB_inIgmpGeneralQuery,</div><div class='add'>+	RTL8365MB_MIB_inMldLeaves,</div><div class='add'>+	RTL8365MB_MIB_inIgmpLeaves,</div><div class='add'>+	RTL8365MB_MIB_etherStatsOctets,</div><div class='add'>+	RTL8365MB_MIB_etherStatsUnderSizePkts,</div><div class='add'>+	RTL8365MB_MIB_etherOversizeStats,</div><div class='add'>+	RTL8365MB_MIB_etherStatsPkts64Octets,</div><div class='add'>+	RTL8365MB_MIB_etherStatsPkts65to127Octets,</div><div class='add'>+	RTL8365MB_MIB_etherStatsPkts128to255Octets,</div><div class='add'>+	RTL8365MB_MIB_etherStatsPkts256to511Octets,</div><div class='add'>+	RTL8365MB_MIB_etherStatsPkts512to1023Octets,</div><div class='add'>+	RTL8365MB_MIB_etherStatsPkts1024to1518Octets,</div><div class='add'>+	RTL8365MB_MIB_ifOutOctets,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsSingleCollisionFrames,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsMultipleCollisionFrames,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsDeferredTransmissions,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsLateCollisions,</div><div class='add'>+	RTL8365MB_MIB_etherStatsCollisions,</div><div class='add'>+	RTL8365MB_MIB_dot3StatsExcessiveCollisions,</div><div class='add'>+	RTL8365MB_MIB_dot3OutPauseFrames,</div><div class='add'>+	RTL8365MB_MIB_ifOutDiscards,</div><div class='add'>+	RTL8365MB_MIB_dot1dTpPortInDiscards,</div><div class='add'>+	RTL8365MB_MIB_ifOutUcastPkts,</div><div class='add'>+	RTL8365MB_MIB_ifOutMulticastPkts,</div><div class='add'>+	RTL8365MB_MIB_ifOutBroadcastPkts,</div><div class='add'>+	RTL8365MB_MIB_outOampduPkts,</div><div class='add'>+	RTL8365MB_MIB_inOampduPkts,</div><div class='add'>+	RTL8365MB_MIB_inIgmpJoinsSuccess,</div><div class='add'>+	RTL8365MB_MIB_inIgmpJoinsFail,</div><div class='add'>+	RTL8365MB_MIB_inMldJoinsSuccess,</div><div class='add'>+	RTL8365MB_MIB_inMldJoinsFail,</div><div class='add'>+	RTL8365MB_MIB_inReportSuppressionDrop,</div><div class='add'>+	RTL8365MB_MIB_inLeaveSuppressionDrop,</div><div class='add'>+	RTL8365MB_MIB_outIgmpReports,</div><div class='add'>+	RTL8365MB_MIB_outIgmpLeaves,</div><div class='add'>+	RTL8365MB_MIB_outIgmpGeneralQuery,</div><div class='add'>+	RTL8365MB_MIB_outIgmpSpecificQuery,</div><div class='add'>+	RTL8365MB_MIB_outMldReports,</div><div class='add'>+	RTL8365MB_MIB_outMldLeaves,</div><div class='add'>+	RTL8365MB_MIB_outMldGeneralQuery,</div><div class='add'>+	RTL8365MB_MIB_outMldSpecificQuery,</div><div class='add'>+	RTL8365MB_MIB_inKnownMulticastPkts,</div><div class='add'>+	RTL8365MB_MIB_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct rtl8365mb_mib_counter {</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 length;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define RTL8365MB_MAKE_MIB_COUNTER(_offset, _length, _name) \</div><div class='add'>+		[RTL8365MB_MIB_ ## _name] = { _offset, _length, #_name }</div><div class='add'>+</div><div class='add'>+static struct rtl8365mb_mib_counter rtl8365mb_mib_counters[] = {</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(0, 4, ifInOctets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(4, 2, dot3StatsFCSErrors),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(6, 2, dot3StatsSymbolErrors),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(8, 2, dot3InPauseFrames),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(10, 2, dot3ControlInUnknownOpcodes),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(12, 2, etherStatsFragments),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(14, 2, etherStatsJabbers),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(16, 2, ifInUcastPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(18, 2, etherStatsDropEvents),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(20, 2, ifInMulticastPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(22, 2, ifInBroadcastPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(24, 2, inMldChecksumError),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(26, 2, inIgmpChecksumError),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(28, 2, inMldSpecificQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(30, 2, inMldGeneralQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(32, 2, inIgmpSpecificQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(34, 2, inIgmpGeneralQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(36, 2, inMldLeaves),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(38, 2, inIgmpLeaves),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(40, 4, etherStatsOctets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(44, 2, etherStatsUnderSizePkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(46, 2, etherOversizeStats),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(48, 2, etherStatsPkts64Octets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(50, 2, etherStatsPkts65to127Octets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(52, 2, etherStatsPkts128to255Octets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(54, 2, etherStatsPkts256to511Octets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(56, 2, etherStatsPkts512to1023Octets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(58, 2, etherStatsPkts1024to1518Octets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(60, 4, ifOutOctets),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(64, 2, dot3StatsSingleCollisionFrames),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(66, 2, dot3StatsMultipleCollisionFrames),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(68, 2, dot3StatsDeferredTransmissions),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(70, 2, dot3StatsLateCollisions),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(72, 2, etherStatsCollisions),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(74, 2, dot3StatsExcessiveCollisions),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(76, 2, dot3OutPauseFrames),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(78, 2, ifOutDiscards),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(80, 2, dot1dTpPortInDiscards),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(82, 2, ifOutUcastPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(84, 2, ifOutMulticastPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(86, 2, ifOutBroadcastPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(88, 2, outOampduPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(90, 2, inOampduPkts),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(92, 4, inIgmpJoinsSuccess),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(96, 2, inIgmpJoinsFail),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(98, 2, inMldJoinsSuccess),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(100, 2, inMldJoinsFail),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(102, 2, inReportSuppressionDrop),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(104, 2, inLeaveSuppressionDrop),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(106, 2, outIgmpReports),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(108, 2, outIgmpLeaves),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(110, 2, outIgmpGeneralQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(112, 2, outIgmpSpecificQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(114, 2, outMldReports),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(116, 2, outMldLeaves),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(118, 2, outMldGeneralQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(120, 2, outMldSpecificQuery),</div><div class='add'>+	RTL8365MB_MAKE_MIB_COUNTER(122, 2, inKnownMulticastPkts),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static_assert(ARRAY_SIZE(rtl8365mb_mib_counters) == RTL8365MB_MIB_END);</div><div class='add'>+</div><div class='add'>+struct rtl8365mb_jam_tbl_entry {</div><div class='add'>+	u16 reg;</div><div class='add'>+	u16 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Lifted from the vendor driver sources */</div><div class='add'>+static const struct rtl8365mb_jam_tbl_entry rtl8365mb_init_jam_8365mb_vc[] = {</div><div class='add'>+	{ 0x13EB, 0x15BB }, { 0x1303, 0x06D6 }, { 0x1304, 0x0700 },</div><div class='add'>+	{ 0x13E2, 0x003F }, { 0x13F9, 0x0090 }, { 0x121E, 0x03CA },</div><div class='add'>+	{ 0x1233, 0x0352 }, { 0x1237, 0x00A0 }, { 0x123A, 0x0030 },</div><div class='add'>+	{ 0x1239, 0x0084 }, { 0x0301, 0x1000 }, { 0x1349, 0x001F },</div><div class='add'>+	{ 0x18E0, 0x4004 }, { 0x122B, 0x241C }, { 0x1305, 0xC000 },</div><div class='add'>+	{ 0x13F0, 0x0000 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rtl8365mb_jam_tbl_entry rtl8365mb_init_jam_common[] = {</div><div class='add'>+	{ 0x1200, 0x7FCB }, { 0x0884, 0x0003 }, { 0x06EB, 0x0001 },</div><div class='add'>+	{ 0x03Fa, 0x0007 }, { 0x08C8, 0x00C0 }, { 0x0A30, 0x020E },</div><div class='add'>+	{ 0x0800, 0x0000 }, { 0x0802, 0x0000 }, { 0x09DA, 0x0013 },</div><div class='add'>+	{ 0x1D32, 0x0002 },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_phy_interface_mode {</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_INVAL = 0,</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_INTERNAL = BIT(0),</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_MII = BIT(1),</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_TMII = BIT(2),</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_RMII = BIT(3),</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_RGMII = BIT(4),</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_SGMII = BIT(5),</div><div class='add'>+	RTL8365MB_PHY_INTERFACE_MODE_HSGMII = BIT(6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rtl8365mb_extint - external interface info</div><div class='add'>+ * @port: the port with an external interface</div><div class='add'>+ * @id: the external interface ID, which is either 0, 1, or 2</div><div class='add'>+ * @supported_interfaces: a bitmask of supported PHY interface modes</div><div class='add'>+ *</div><div class='add'>+ * Represents a mapping: port -&gt; { id, supported_interfaces }. To be embedded</div><div class='add'>+ * in &amp;struct rtl8365mb_chip_info for every port with an external interface.</div><div class='add'>+ */</div><div class='add'>+struct rtl8365mb_extint {</div><div class='add'>+	int port;</div><div class='add'>+	int id;</div><div class='add'>+	unsigned int supported_interfaces;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rtl8365mb_chip_info - static chip-specific info</div><div class='add'>+ * @name: human-readable chip name</div><div class='add'>+ * @chip_id: chip identifier</div><div class='add'>+ * @chip_ver: chip silicon revision</div><div class='add'>+ * @extints: available external interfaces</div><div class='add'>+ * @jam_table: chip-specific initialization jam table</div><div class='add'>+ * @jam_size: size of the chip's jam table</div><div class='add'>+ *</div><div class='add'>+ * These data are specific to a given chip in the family of switches supported</div><div class='add'>+ * by this driver. When adding support for another chip in the family, a new</div><div class='add'>+ * chip info should be added to the rtl8365mb_chip_infos array.</div><div class='add'>+ */</div><div class='add'>+struct rtl8365mb_chip_info {</div><div class='add'>+	const char *name;</div><div class='add'>+	u32 chip_id;</div><div class='add'>+	u32 chip_ver;</div><div class='add'>+	const struct rtl8365mb_extint extints[RTL8365MB_MAX_NUM_EXTINTS];</div><div class='add'>+	const struct rtl8365mb_jam_tbl_entry *jam_table;</div><div class='add'>+	size_t jam_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Chip info for each supported switch in the family */</div><div class='add'>+#define PHY_INTF(_mode) (RTL8365MB_PHY_INTERFACE_MODE_ ## _mode)</div><div class='add'>+static const struct rtl8365mb_chip_info rtl8365mb_chip_infos[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "RTL8365MB-VC",</div><div class='add'>+		.chip_id = 0x6367,</div><div class='add'>+		.chip_ver = 0x0040,</div><div class='add'>+		.extints = {</div><div class='add'>+			{ 6, 1, PHY_INTF(MII) | PHY_INTF(TMII) |</div><div class='add'>+				PHY_INTF(RMII) | PHY_INTF(RGMII) },</div><div class='add'>+		},</div><div class='add'>+		.jam_table = rtl8365mb_init_jam_8365mb_vc,</div><div class='add'>+		.jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "RTL8367S",</div><div class='add'>+		.chip_id = 0x6367,</div><div class='add'>+		.chip_ver = 0x00A0,</div><div class='add'>+		.extints = {</div><div class='add'>+			{ 6, 1, PHY_INTF(SGMII) | PHY_INTF(HSGMII) },</div><div class='add'>+			{ 7, 2, PHY_INTF(MII) | PHY_INTF(TMII) |</div><div class='add'>+				PHY_INTF(RMII) | PHY_INTF(RGMII) },</div><div class='add'>+		},</div><div class='add'>+		.jam_table = rtl8365mb_init_jam_8365mb_vc,</div><div class='add'>+		.jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc),</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.name = "RTL8367RB-VB",</div><div class='add'>+		.chip_id = 0x6367,</div><div class='add'>+		.chip_ver = 0x0020,</div><div class='add'>+		.extints = {</div><div class='add'>+			{ 6, 1, PHY_INTF(MII) | PHY_INTF(TMII) |</div><div class='add'>+				PHY_INTF(RMII) | PHY_INTF(RGMII) },</div><div class='add'>+			{ 7, 2, PHY_INTF(MII) | PHY_INTF(TMII) |</div><div class='add'>+				PHY_INTF(RMII) | PHY_INTF(RGMII) },</div><div class='add'>+		},</div><div class='add'>+		.jam_table = rtl8365mb_init_jam_8365mb_vc,</div><div class='add'>+		.jam_size = ARRAY_SIZE(rtl8365mb_init_jam_8365mb_vc),</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_stp_state {</div><div class='add'>+	RTL8365MB_STP_STATE_DISABLED = 0,</div><div class='add'>+	RTL8365MB_STP_STATE_BLOCKING = 1,</div><div class='add'>+	RTL8365MB_STP_STATE_LEARNING = 2,</div><div class='add'>+	RTL8365MB_STP_STATE_FORWARDING = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_cpu_insert {</div><div class='add'>+	RTL8365MB_CPU_INSERT_TO_ALL = 0,</div><div class='add'>+	RTL8365MB_CPU_INSERT_TO_TRAPPING = 1,</div><div class='add'>+	RTL8365MB_CPU_INSERT_TO_NONE = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_cpu_position {</div><div class='add'>+	RTL8365MB_CPU_POS_AFTER_SA = 0,</div><div class='add'>+	RTL8365MB_CPU_POS_BEFORE_CRC = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_cpu_format {</div><div class='add'>+	RTL8365MB_CPU_FORMAT_8BYTES = 0,</div><div class='add'>+	RTL8365MB_CPU_FORMAT_4BYTES = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum rtl8365mb_cpu_rxlen {</div><div class='add'>+	RTL8365MB_CPU_RXLEN_72BYTES = 0,</div><div class='add'>+	RTL8365MB_CPU_RXLEN_64BYTES = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rtl8365mb_cpu - CPU port configuration</div><div class='add'>+ * @enable: enable/disable hardware insertion of CPU tag in switch-&gt;CPU frames</div><div class='add'>+ * @mask: port mask of ports that parse should parse CPU tags</div><div class='add'>+ * @trap_port: forward trapped frames to this port</div><div class='add'>+ * @insert: CPU tag insertion mode in switch-&gt;CPU frames</div><div class='add'>+ * @position: position of CPU tag in frame</div><div class='add'>+ * @rx_length: minimum CPU RX length</div><div class='add'>+ * @format: CPU tag format</div><div class='add'>+ *</div><div class='add'>+ * Represents the CPU tagging and CPU port configuration of the switch. These</div><div class='add'>+ * settings are configurable at runtime.</div><div class='add'>+ */</div><div class='add'>+struct rtl8365mb_cpu {</div><div class='add'>+	bool enable;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 trap_port;</div><div class='add'>+	enum rtl8365mb_cpu_insert insert;</div><div class='add'>+	enum rtl8365mb_cpu_position position;</div><div class='add'>+	enum rtl8365mb_cpu_rxlen rx_length;</div><div class='add'>+	enum rtl8365mb_cpu_format format;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rtl8365mb_port - private per-port data</div><div class='add'>+ * @priv: pointer to parent realtek_priv data</div><div class='add'>+ * @index: DSA port index, same as dsa_port::index</div><div class='add'>+ * @stats: link statistics populated by rtl8365mb_stats_poll, ready for atomic</div><div class='add'>+ *         access via rtl8365mb_get_stats64</div><div class='add'>+ * @stats_lock: protect the stats structure during read/update</div><div class='add'>+ * @mib_work: delayed work for polling MIB counters</div><div class='add'>+ */</div><div class='add'>+struct rtl8365mb_port {</div><div class='add'>+	struct realtek_priv *priv;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	struct rtnl_link_stats64 stats;</div><div class='add'>+	spinlock_t stats_lock;</div><div class='add'>+	struct delayed_work mib_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rtl8365mb - driver private data</div><div class='add'>+ * @priv: pointer to parent realtek_priv data</div><div class='add'>+ * @irq: registered IRQ or zero</div><div class='add'>+ * @chip_info: chip-specific info about the attached switch</div><div class='add'>+ * @cpu: CPU tagging and CPU port configuration for this chip</div><div class='add'>+ * @mib_lock: prevent concurrent reads of MIB counters</div><div class='add'>+ * @ports: per-port data</div><div class='add'>+ *</div><div class='add'>+ * Private data for this driver.</div><div class='add'>+ */</div><div class='add'>+struct rtl8365mb {</div><div class='add'>+	struct realtek_priv *priv;</div><div class='add'>+	int irq;</div><div class='add'>+	const struct rtl8365mb_chip_info *chip_info;</div><div class='add'>+	struct rtl8365mb_cpu cpu;</div><div class='add'>+	struct mutex mib_lock;</div><div class='add'>+	struct rtl8365mb_port ports[RTL8365MB_MAX_NUM_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_phy_poll_busy(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	return regmap_read_poll_timeout(priv-&gt;map_nolock,</div><div class='add'>+					RTL8365MB_INDIRECT_ACCESS_STATUS_REG,</div><div class='add'>+					val, !val, 10, 100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_phy_ocp_prepare(struct realtek_priv *priv, int phy,</div><div class='add'>+				     u32 ocp_addr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Set OCP prefix */</div><div class='add'>+	val = FIELD_GET(RTL8365MB_PHY_OCP_ADDR_PREFIX_MASK, ocp_addr);</div><div class='add'>+	ret = regmap_update_bits(</div><div class='add'>+		priv-&gt;map_nolock, RTL8365MB_GPHY_OCP_MSB_0_REG,</div><div class='add'>+		RTL8365MB_GPHY_OCP_MSB_0_CFG_CPU_OCPADR_MASK,</div><div class='add'>+		FIELD_PREP(RTL8365MB_GPHY_OCP_MSB_0_CFG_CPU_OCPADR_MASK, val));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set PHY register address */</div><div class='add'>+	val = RTL8365MB_PHY_BASE;</div><div class='add'>+	val |= FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_ADDRESS_PHYNUM_MASK, phy);</div><div class='add'>+	val |= FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_ADDRESS_OCPADR_5_1_MASK,</div><div class='add'>+			  ocp_addr &gt;&gt; 1);</div><div class='add'>+	val |= FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_ADDRESS_OCPADR_9_6_MASK,</div><div class='add'>+			  ocp_addr &gt;&gt; 6);</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock,</div><div class='add'>+			   RTL8365MB_INDIRECT_ACCESS_ADDRESS_REG, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_phy_ocp_read(struct realtek_priv *priv, int phy,</div><div class='add'>+				  u32 ocp_addr, u16 *data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rtl83xx_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_poll_busy(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_ocp_prepare(priv, phy, ocp_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Execute read operation */</div><div class='add'>+	val = FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_CTRL_CMD_MASK,</div><div class='add'>+			 RTL8365MB_INDIRECT_ACCESS_CTRL_CMD_VALUE) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_CTRL_RW_MASK,</div><div class='add'>+			 RTL8365MB_INDIRECT_ACCESS_CTRL_RW_READ);</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock, RTL8365MB_INDIRECT_ACCESS_CTRL_REG,</div><div class='add'>+			   val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_poll_busy(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Get PHY register data */</div><div class='add'>+	ret = regmap_read(priv-&gt;map_nolock,</div><div class='add'>+			  RTL8365MB_INDIRECT_ACCESS_READ_DATA_REG, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	*data = val &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rtl83xx_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_phy_ocp_write(struct realtek_priv *priv, int phy,</div><div class='add'>+				   u32 ocp_addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rtl83xx_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_poll_busy(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_ocp_prepare(priv, phy, ocp_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Set PHY register data */</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock,</div><div class='add'>+			   RTL8365MB_INDIRECT_ACCESS_WRITE_DATA_REG, data);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Execute write operation */</div><div class='add'>+	val = FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_CTRL_CMD_MASK,</div><div class='add'>+			 RTL8365MB_INDIRECT_ACCESS_CTRL_CMD_VALUE) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_INDIRECT_ACCESS_CTRL_RW_MASK,</div><div class='add'>+			 RTL8365MB_INDIRECT_ACCESS_CTRL_RW_WRITE);</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock, RTL8365MB_INDIRECT_ACCESS_CTRL_REG,</div><div class='add'>+			   val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_poll_busy(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rtl83xx_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_phy_read(struct realtek_priv *priv, int phy, int regnum)</div><div class='add'>+{</div><div class='add'>+	u32 ocp_addr;</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (phy &gt; RTL8365MB_PHYADDRMAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (regnum &gt; RTL8365MB_PHYREGMAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ocp_addr = RTL8365MB_PHY_OCP_ADDR_PHYREG_BASE + regnum * 2;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_ocp_read(priv, phy, ocp_addr, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"failed to read PHY%d reg %02x @ %04x, ret %d\n", phy,</div><div class='add'>+			regnum, ocp_addr, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "read PHY%d register 0x%02x @ %04x, val &lt;- %04x\n",</div><div class='add'>+		phy, regnum, ocp_addr, val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_phy_write(struct realtek_priv *priv, int phy, int regnum,</div><div class='add'>+			       u16 val)</div><div class='add'>+{</div><div class='add'>+	u32 ocp_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (phy &gt; RTL8365MB_PHYADDRMAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (regnum &gt; RTL8365MB_PHYREGMAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ocp_addr = RTL8365MB_PHY_OCP_ADDR_PHYREG_BASE + regnum * 2;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_phy_ocp_write(priv, phy, ocp_addr, val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"failed to write PHY%d reg %02x @ %04x, ret %d\n", phy,</div><div class='add'>+			regnum, ocp_addr, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "write PHY%d register 0x%02x @ %04x, val -&gt; %04x\n",</div><div class='add'>+		phy, regnum, ocp_addr, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct rtl8365mb_extint *</div><div class='add'>+rtl8365mb_get_port_extint(struct realtek_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RTL8365MB_MAX_NUM_EXTINTS; i++) {</div><div class='add'>+		const struct rtl8365mb_extint *extint =</div><div class='add'>+			&amp;mb-&gt;chip_info-&gt;extints[i];</div><div class='add'>+</div><div class='add'>+		if (!extint-&gt;supported_interfaces)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (extint-&gt;port == port)</div><div class='add'>+			return extint;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol</div><div class='add'>+rtl8365mb_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+			   enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_cpu *cpu;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	cpu = &amp;mb-&gt;cpu;</div><div class='add'>+</div><div class='add'>+	if (cpu-&gt;position == RTL8365MB_CPU_POS_BEFORE_CRC)</div><div class='add'>+		return DSA_TAG_PROTO_RTL8_4T;</div><div class='add'>+</div><div class='add'>+	return DSA_TAG_PROTO_RTL8_4;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_ext_config_rgmii(struct realtek_priv *priv, int port,</div><div class='add'>+				      phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	const struct rtl8365mb_extint *extint =</div><div class='add'>+		rtl8365mb_get_port_extint(priv, port);</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	struct device_node *dn;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int tx_delay = 0;</div><div class='add'>+	int rx_delay = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!extint)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	dp = dsa_to_port(ds, port);</div><div class='add'>+	dn = dp-&gt;dn;</div><div class='add'>+</div><div class='add'>+	/* Set the RGMII TX/RX delay</div><div class='add'>+	 *</div><div class='add'>+	 * The Realtek vendor driver indicates the following possible</div><div class='add'>+	 * configuration settings:</div><div class='add'>+	 *</div><div class='add'>+	 *   TX delay:</div><div class='add'>+	 *     0 = no delay, 1 = 2 ns delay</div><div class='add'>+	 *   RX delay:</div><div class='add'>+	 *     0 = no delay, 7 = maximum delay</div><div class='add'>+	 *     Each step is approximately 0.3 ns, so the maximum delay is about</div><div class='add'>+	 *     2.1 ns.</div><div class='add'>+	 *</div><div class='add'>+	 * The vendor driver also states that this must be configured *before*</div><div class='add'>+	 * forcing the external interface into a particular mode, which is done</div><div class='add'>+	 * in the rtl8365mb_phylink_mac_link_{up,down} functions.</div><div class='add'>+	 *</div><div class='add'>+	 * Only configure an RGMII TX (resp. RX) delay if the</div><div class='add'>+	 * tx-internal-delay-ps (resp. rx-internal-delay-ps) OF property is</div><div class='add'>+	 * specified. We ignore the detail of the RGMII interface mode</div><div class='add'>+	 * (RGMII_{RXID, TXID, etc.}), as this is considered to be a PHY-only</div><div class='add'>+	 * property.</div><div class='add'>+	 */</div><div class='add'>+	if (!of_property_read_u32(dn, "tx-internal-delay-ps", &amp;val)) {</div><div class='add'>+		val = val / 1000; /* convert to ns */</div><div class='add'>+</div><div class='add'>+		if (val == 0 || val == 2)</div><div class='add'>+			tx_delay = val / 2;</div><div class='add'>+		else</div><div class='add'>+			dev_warn(priv-&gt;dev,</div><div class='add'>+				 "RGMII TX delay must be 0 or 2 ns\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(dn, "rx-internal-delay-ps", &amp;val)) {</div><div class='add'>+		val = DIV_ROUND_CLOSEST(val, 300); /* convert to 0.3 ns step */</div><div class='add'>+</div><div class='add'>+		if (val &lt;= 7)</div><div class='add'>+			rx_delay = val;</div><div class='add'>+		else</div><div class='add'>+			dev_warn(priv-&gt;dev,</div><div class='add'>+				 "RGMII RX delay must be 0 to 2.1 ns\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(</div><div class='add'>+		priv-&gt;map, RTL8365MB_EXT_RGMXF_REG(extint-&gt;id),</div><div class='add'>+		RTL8365MB_EXT_RGMXF_TXDELAY_MASK |</div><div class='add'>+			RTL8365MB_EXT_RGMXF_RXDELAY_MASK,</div><div class='add'>+		FIELD_PREP(RTL8365MB_EXT_RGMXF_TXDELAY_MASK, tx_delay) |</div><div class='add'>+			FIELD_PREP(RTL8365MB_EXT_RGMXF_RXDELAY_MASK, rx_delay));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(</div><div class='add'>+		priv-&gt;map, RTL8365MB_DIGITAL_INTERFACE_SELECT_REG(extint-&gt;id),</div><div class='add'>+		RTL8365MB_DIGITAL_INTERFACE_SELECT_MODE_MASK(extint-&gt;id),</div><div class='add'>+		RTL8365MB_EXT_PORT_MODE_RGMII</div><div class='add'>+			&lt;&lt; RTL8365MB_DIGITAL_INTERFACE_SELECT_MODE_OFFSET(</div><div class='add'>+				   extint-&gt;id));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_ext_config_forcemode(struct realtek_priv *priv, int port,</div><div class='add'>+					  bool link, int speed, int duplex,</div><div class='add'>+					  bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	const struct rtl8365mb_extint *extint =</div><div class='add'>+		rtl8365mb_get_port_extint(priv, port);</div><div class='add'>+	u32 r_tx_pause;</div><div class='add'>+	u32 r_rx_pause;</div><div class='add'>+	u32 r_duplex;</div><div class='add'>+	u32 r_speed;</div><div class='add'>+	u32 r_link;</div><div class='add'>+	int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!extint)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (link) {</div><div class='add'>+		/* Force the link up with the desired configuration */</div><div class='add'>+		r_link = 1;</div><div class='add'>+		r_rx_pause = rx_pause ? 1 : 0;</div><div class='add'>+		r_tx_pause = tx_pause ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		if (speed == SPEED_1000) {</div><div class='add'>+			r_speed = RTL8365MB_PORT_SPEED_1000M;</div><div class='add'>+		} else if (speed == SPEED_100) {</div><div class='add'>+			r_speed = RTL8365MB_PORT_SPEED_100M;</div><div class='add'>+		} else if (speed == SPEED_10) {</div><div class='add'>+			r_speed = RTL8365MB_PORT_SPEED_10M;</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(priv-&gt;dev, "unsupported port speed %s\n",</div><div class='add'>+				phy_speed_to_str(speed));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (duplex == DUPLEX_FULL) {</div><div class='add'>+			r_duplex = 1;</div><div class='add'>+		} else if (duplex == DUPLEX_HALF) {</div><div class='add'>+			r_duplex = 0;</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(priv-&gt;dev, "unsupported duplex %s\n",</div><div class='add'>+				phy_duplex_to_str(duplex));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Force the link down and reset any programmed configuration */</div><div class='add'>+		r_link = 0;</div><div class='add'>+		r_tx_pause = 0;</div><div class='add'>+		r_rx_pause = 0;</div><div class='add'>+		r_speed = 0;</div><div class='add'>+		r_duplex = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(RTL8365MB_DIGITAL_INTERFACE_FORCE_EN_MASK, 1) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_DIGITAL_INTERFACE_FORCE_TXPAUSE_MASK,</div><div class='add'>+			 r_tx_pause) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_DIGITAL_INTERFACE_FORCE_RXPAUSE_MASK,</div><div class='add'>+			 r_rx_pause) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_DIGITAL_INTERFACE_FORCE_LINK_MASK, r_link) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_DIGITAL_INTERFACE_FORCE_DUPLEX_MASK,</div><div class='add'>+			 r_duplex) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_DIGITAL_INTERFACE_FORCE_SPEED_MASK, r_speed);</div><div class='add'>+	ret = regmap_write(priv-&gt;map,</div><div class='add'>+			   RTL8365MB_DIGITAL_INTERFACE_FORCE_REG(extint-&gt;id),</div><div class='add'>+			   val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	const struct rtl8365mb_extint *extint =</div><div class='add'>+		rtl8365mb_get_port_extint(ds-&gt;priv, port);</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE |</div><div class='add'>+				   MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	if (!extint) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		/* GMII is the default interface mode for phylib, so</div><div class='add'>+		 * we have to support it for ports with integrated PHY.</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Populate according to the modes supported by _this driver_,</div><div class='add'>+	 * not necessarily the modes supported by the hardware, some of</div><div class='add'>+	 * which remain unimplemented.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (extint-&gt;supported_interfaces &amp; RTL8365MB_PHY_INTERFACE_MODE_RGMII)</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+					 unsigned int mode,</div><div class='add'>+					 const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct realtek_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	u8 port = dp-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mode != MLO_AN_PHY &amp;&amp; mode != MLO_AN_FIXED) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"port %d supports only conventional PHY or fixed-link\n",</div><div class='add'>+			port);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_interface_mode_is_rgmii(state-&gt;interface)) {</div><div class='add'>+		ret = rtl8365mb_ext_config_rgmii(priv, port, state-&gt;interface);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(priv-&gt;dev,</div><div class='add'>+				"failed to configure RGMII mode on port %d: %d\n",</div><div class='add'>+				port, ret);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TODO: Implement MII and RMII modes, which the RTL8365MB-VC also</div><div class='add'>+	 * supports</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					    unsigned int mode,</div><div class='add'>+					    phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct realtek_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_port *p;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+	u8 port = dp-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	p = &amp;mb-&gt;ports[port];</div><div class='add'>+	cancel_delayed_work_sync(&amp;p-&gt;mib_work);</div><div class='add'>+</div><div class='add'>+	if (phy_interface_mode_is_rgmii(interface)) {</div><div class='add'>+		ret = rtl8365mb_ext_config_forcemode(priv, port, false, 0, 0,</div><div class='add'>+						     false, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(priv-&gt;dev,</div><div class='add'>+				"failed to reset forced mode on port %d: %d\n",</div><div class='add'>+				port, ret);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+					  struct phy_device *phydev,</div><div class='add'>+					  unsigned int mode,</div><div class='add'>+					  phy_interface_t interface,</div><div class='add'>+					  int speed, int duplex, bool tx_pause,</div><div class='add'>+					  bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct realtek_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_port *p;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+	u8 port = dp-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	p = &amp;mb-&gt;ports[port];</div><div class='add'>+	schedule_delayed_work(&amp;p-&gt;mib_work, 0);</div><div class='add'>+</div><div class='add'>+	if (phy_interface_mode_is_rgmii(interface)) {</div><div class='add'>+		ret = rtl8365mb_ext_config_forcemode(priv, port, true, speed,</div><div class='add'>+						     duplex, tx_pause,</div><div class='add'>+						     rx_pause);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(priv-&gt;dev,</div><div class='add'>+				"failed to force mode on port %d: %d\n", port,</div><div class='add'>+				ret);</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_port_change_mtu(struct dsa_switch *ds, int port,</div><div class='add'>+				     int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int frame_size;</div><div class='add'>+</div><div class='add'>+	/* When a new MTU is set, DSA always sets the CPU port's MTU to the</div><div class='add'>+	 * largest MTU of the user ports. Because the switch only has a global</div><div class='add'>+	 * RX length register, only allowing CPU port here is enough.</div><div class='add'>+	 */</div><div class='add'>+	if (!dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	frame_size = new_mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "changing mtu to %d (frame size: %d)\n",</div><div class='add'>+		new_mtu, frame_size);</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map, RTL8365MB_CFG0_MAX_LEN_REG,</div><div class='add'>+				  RTL8365MB_CFG0_MAX_LEN_MASK,</div><div class='add'>+				  FIELD_PREP(RTL8365MB_CFG0_MAX_LEN_MASK,</div><div class='add'>+					     frame_size));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return RTL8365MB_CFG0_MAX_LEN_MAX - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+					 u8 state)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	enum rtl8365mb_stp_state val;</div><div class='add'>+	int msti = 0;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		val = RTL8365MB_STP_STATE_DISABLED;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		val = RTL8365MB_STP_STATE_BLOCKING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		val = RTL8365MB_STP_STATE_LEARNING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		val = RTL8365MB_STP_STATE_FORWARDING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(priv-&gt;dev, "invalid STP state: %u\n", state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;map, RTL8365MB_MSTI_CTRL_REG(msti, port),</div><div class='add'>+			   RTL8365MB_MSTI_CTRL_PORT_STATE_MASK(port),</div><div class='add'>+			   val &lt;&lt; RTL8365MB_MSTI_CTRL_PORT_STATE_OFFSET(port));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_port_set_learning(struct realtek_priv *priv, int port,</div><div class='add'>+				       bool enable)</div><div class='add'>+{</div><div class='add'>+	/* Enable/disable learning by limiting the number of L2 addresses the</div><div class='add'>+	 * port can learn. Realtek documentation states that a limit of zero</div><div class='add'>+	 * disables learning. When enabling learning, set it to the chip's</div><div class='add'>+	 * maximum.</div><div class='add'>+	 */</div><div class='add'>+	return regmap_write(priv-&gt;map, RTL8365MB_LUT_PORT_LEARN_LIMIT_REG(port),</div><div class='add'>+			    enable ? RTL8365MB_LEARN_LIMIT_MAX : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_port_set_isolation(struct realtek_priv *priv, int port,</div><div class='add'>+					u32 mask)</div><div class='add'>+{</div><div class='add'>+	return regmap_write(priv-&gt;map, RTL8365MB_PORT_ISOLATION_REG(port), mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_mib_counter_read(struct realtek_priv *priv, int port,</div><div class='add'>+				      u32 offset, u32 length, u64 *mibvalue)</div><div class='add'>+{</div><div class='add'>+	u64 tmpvalue = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* The MIB address is an SRAM address. We request a particular address</div><div class='add'>+	 * and then poll the control register before reading the value from some</div><div class='add'>+	 * counter registers.</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8365MB_MIB_ADDRESS_REG,</div><div class='add'>+			   RTL8365MB_MIB_ADDRESS(port, offset));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Poll for completion */</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;map, RTL8365MB_MIB_CTRL0_REG, val,</div><div class='add'>+				       !(val &amp; RTL8365MB_MIB_CTRL0_BUSY_MASK),</div><div class='add'>+				       10, 100);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Presumably this indicates a MIB counter read failure */</div><div class='add'>+	if (val &amp; RTL8365MB_MIB_CTRL0_RESET_MASK)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* There are four MIB counter registers each holding a 16 bit word of a</div><div class='add'>+	 * MIB counter. Depending on the offset, we should read from the upper</div><div class='add'>+	 * two or lower two registers. In case the MIB counter is 4 words, we</div><div class='add'>+	 * read from all four registers.</div><div class='add'>+	 */</div><div class='add'>+	if (length == 4)</div><div class='add'>+		offset = 3;</div><div class='add'>+	else</div><div class='add'>+		offset = (offset + 1) % 4;</div><div class='add'>+</div><div class='add'>+	/* Read the MIB counter 16 bits at a time */</div><div class='add'>+	for (i = 0; i &lt; length; i++) {</div><div class='add'>+		ret = regmap_read(priv-&gt;map,</div><div class='add'>+				  RTL8365MB_MIB_COUNTER_REG(offset - i), &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		tmpvalue = ((tmpvalue) &lt;&lt; 16) | (val &amp; 0xFFFF);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Only commit the result if no error occurred */</div><div class='add'>+	*mibvalue = tmpvalue;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mb-&gt;mib_lock);</div><div class='add'>+	for (i = 0; i &lt; RTL8365MB_MIB_END; i++) {</div><div class='add'>+		struct rtl8365mb_mib_counter *mib = &amp;rtl8365mb_mib_counters[i];</div><div class='add'>+</div><div class='add'>+		ret = rtl8365mb_mib_counter_read(priv, port, mib-&gt;offset,</div><div class='add'>+						 mib-&gt;length, &amp;data[i]);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev,</div><div class='add'>+				"failed to read port %d counters: %d\n", port,</div><div class='add'>+				ret);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;mb-&gt;mib_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_get_strings(struct dsa_switch *ds, int port, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RTL8365MB_MIB_END; i++) {</div><div class='add'>+		struct rtl8365mb_mib_counter *mib = &amp;rtl8365mb_mib_counters[i];</div><div class='add'>+		ethtool_puts(&amp;data, mib-&gt;name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return RTL8365MB_MIB_END;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_get_phy_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_mib_counter *mib;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	mib = &amp;rtl8365mb_mib_counters[RTL8365MB_MIB_dot3StatsSymbolErrors];</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mb-&gt;mib_lock);</div><div class='add'>+	rtl8365mb_mib_counter_read(priv, port, mib-&gt;offset, mib-&gt;length,</div><div class='add'>+				   &amp;phy_stats-&gt;SymbolErrorDuringCarrier);</div><div class='add'>+	mutex_unlock(&amp;mb-&gt;mib_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_get_mac_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	u64 cnt[RTL8365MB_MIB_END] = {</div><div class='add'>+		[RTL8365MB_MIB_ifOutOctets] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutUcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutMulticastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutBroadcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3OutPauseFrames] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutDiscards] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInOctets] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInUcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInMulticastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInBroadcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3InPauseFrames] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsSingleCollisionFrames] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsMultipleCollisionFrames] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsFCSErrors] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsDeferredTransmissions] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsLateCollisions] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsExcessiveCollisions] = 1,</div><div class='add'>+</div><div class='add'>+	};</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mb-&gt;mib_lock);</div><div class='add'>+	for (i = 0; i &lt; RTL8365MB_MIB_END; i++) {</div><div class='add'>+		struct rtl8365mb_mib_counter *mib = &amp;rtl8365mb_mib_counters[i];</div><div class='add'>+</div><div class='add'>+		/* Only fetch required MIB counters (marked = 1 above) */</div><div class='add'>+		if (!cnt[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = rtl8365mb_mib_counter_read(priv, port, mib-&gt;offset,</div><div class='add'>+						 mib-&gt;length, &amp;cnt[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;mb-&gt;mib_lock);</div><div class='add'>+</div><div class='add'>+	/* The RTL8365MB-VC exposes MIB objects, which we have to translate into</div><div class='add'>+	 * IEEE 802.3 Managed Objects. This is not always completely faithful,</div><div class='add'>+	 * but we try out best. See RFC 3635 for a detailed treatment of the</div><div class='add'>+	 * subject.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK = cnt[RTL8365MB_MIB_ifOutUcastPkts] +</div><div class='add'>+					 cnt[RTL8365MB_MIB_ifOutMulticastPkts] +</div><div class='add'>+					 cnt[RTL8365MB_MIB_ifOutBroadcastPkts] +</div><div class='add'>+					 cnt[RTL8365MB_MIB_dot3OutPauseFrames] -</div><div class='add'>+					 cnt[RTL8365MB_MIB_ifOutDiscards];</div><div class='add'>+	mac_stats-&gt;SingleCollisionFrames =</div><div class='add'>+		cnt[RTL8365MB_MIB_dot3StatsSingleCollisionFrames];</div><div class='add'>+	mac_stats-&gt;MultipleCollisionFrames =</div><div class='add'>+		cnt[RTL8365MB_MIB_dot3StatsMultipleCollisionFrames];</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK = cnt[RTL8365MB_MIB_ifInUcastPkts] +</div><div class='add'>+				      cnt[RTL8365MB_MIB_ifInMulticastPkts] +</div><div class='add'>+				      cnt[RTL8365MB_MIB_ifInBroadcastPkts] +</div><div class='add'>+				      cnt[RTL8365MB_MIB_dot3InPauseFrames];</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors =</div><div class='add'>+		cnt[RTL8365MB_MIB_dot3StatsFCSErrors];</div><div class='add'>+	mac_stats-&gt;OctetsTransmittedOK = cnt[RTL8365MB_MIB_ifOutOctets] -</div><div class='add'>+					 18 * mac_stats-&gt;FramesTransmittedOK;</div><div class='add'>+	mac_stats-&gt;FramesWithDeferredXmissions =</div><div class='add'>+		cnt[RTL8365MB_MIB_dot3StatsDeferredTransmissions];</div><div class='add'>+	mac_stats-&gt;LateCollisions = cnt[RTL8365MB_MIB_dot3StatsLateCollisions];</div><div class='add'>+	mac_stats-&gt;FramesAbortedDueToXSColls =</div><div class='add'>+		cnt[RTL8365MB_MIB_dot3StatsExcessiveCollisions];</div><div class='add'>+	mac_stats-&gt;OctetsReceivedOK = cnt[RTL8365MB_MIB_ifInOctets] -</div><div class='add'>+				      18 * mac_stats-&gt;FramesReceivedOK;</div><div class='add'>+	mac_stats-&gt;MulticastFramesXmittedOK =</div><div class='add'>+		cnt[RTL8365MB_MIB_ifOutMulticastPkts];</div><div class='add'>+	mac_stats-&gt;BroadcastFramesXmittedOK =</div><div class='add'>+		cnt[RTL8365MB_MIB_ifOutBroadcastPkts];</div><div class='add'>+	mac_stats-&gt;MulticastFramesReceivedOK =</div><div class='add'>+		cnt[RTL8365MB_MIB_ifInMulticastPkts];</div><div class='add'>+	mac_stats-&gt;BroadcastFramesReceivedOK =</div><div class='add'>+		cnt[RTL8365MB_MIB_ifInBroadcastPkts];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_get_ctrl_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_mib_counter *mib;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	mib = &amp;rtl8365mb_mib_counters[RTL8365MB_MIB_dot3ControlInUnknownOpcodes];</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mb-&gt;mib_lock);</div><div class='add'>+	rtl8365mb_mib_counter_read(priv, port, mib-&gt;offset, mib-&gt;length,</div><div class='add'>+				   &amp;ctrl_stats-&gt;UnsupportedOpcodesReceived);</div><div class='add'>+	mutex_unlock(&amp;mb-&gt;mib_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_stats_update(struct realtek_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	u64 cnt[RTL8365MB_MIB_END] = {</div><div class='add'>+		[RTL8365MB_MIB_ifOutOctets] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutUcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutMulticastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutBroadcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifOutDiscards] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInOctets] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInUcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInMulticastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_ifInBroadcastPkts] = 1,</div><div class='add'>+		[RTL8365MB_MIB_etherStatsDropEvents] = 1,</div><div class='add'>+		[RTL8365MB_MIB_etherStatsCollisions] = 1,</div><div class='add'>+		[RTL8365MB_MIB_etherStatsFragments] = 1,</div><div class='add'>+		[RTL8365MB_MIB_etherStatsJabbers] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsFCSErrors] = 1,</div><div class='add'>+		[RTL8365MB_MIB_dot3StatsLateCollisions] = 1,</div><div class='add'>+	};</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	struct rtnl_link_stats64 *stats;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	stats = &amp;mb-&gt;ports[port].stats;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;mb-&gt;mib_lock);</div><div class='add'>+	for (i = 0; i &lt; RTL8365MB_MIB_END; i++) {</div><div class='add'>+		struct rtl8365mb_mib_counter *c = &amp;rtl8365mb_mib_counters[i];</div><div class='add'>+</div><div class='add'>+		/* Only fetch required MIB counters (marked = 1 above) */</div><div class='add'>+		if (!cnt[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = rtl8365mb_mib_counter_read(priv, port, c-&gt;offset,</div><div class='add'>+						 c-&gt;length, &amp;cnt[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;mb-&gt;mib_lock);</div><div class='add'>+</div><div class='add'>+	/* Don't update statistics if there was an error reading the counters */</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;mb-&gt;ports[port].stats_lock);</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets = cnt[RTL8365MB_MIB_ifInUcastPkts] +</div><div class='add'>+			    cnt[RTL8365MB_MIB_ifInMulticastPkts] +</div><div class='add'>+			    cnt[RTL8365MB_MIB_ifInBroadcastPkts] -</div><div class='add'>+			    cnt[RTL8365MB_MIB_ifOutDiscards];</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_packets = cnt[RTL8365MB_MIB_ifOutUcastPkts] +</div><div class='add'>+			    cnt[RTL8365MB_MIB_ifOutMulticastPkts] +</div><div class='add'>+			    cnt[RTL8365MB_MIB_ifOutBroadcastPkts];</div><div class='add'>+</div><div class='add'>+	/* if{In,Out}Octets includes FCS - remove it */</div><div class='add'>+	stats-&gt;rx_bytes = cnt[RTL8365MB_MIB_ifInOctets] - 4 * stats-&gt;rx_packets;</div><div class='add'>+	stats-&gt;tx_bytes =</div><div class='add'>+		cnt[RTL8365MB_MIB_ifOutOctets] - 4 * stats-&gt;tx_packets;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_dropped = cnt[RTL8365MB_MIB_etherStatsDropEvents];</div><div class='add'>+	stats-&gt;tx_dropped = cnt[RTL8365MB_MIB_ifOutDiscards];</div><div class='add'>+</div><div class='add'>+	stats-&gt;multicast = cnt[RTL8365MB_MIB_ifInMulticastPkts];</div><div class='add'>+	stats-&gt;collisions = cnt[RTL8365MB_MIB_etherStatsCollisions];</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_length_errors = cnt[RTL8365MB_MIB_etherStatsFragments] +</div><div class='add'>+				  cnt[RTL8365MB_MIB_etherStatsJabbers];</div><div class='add'>+	stats-&gt;rx_crc_errors = cnt[RTL8365MB_MIB_dot3StatsFCSErrors];</div><div class='add'>+	stats-&gt;rx_errors = stats-&gt;rx_length_errors + stats-&gt;rx_crc_errors;</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_aborted_errors = cnt[RTL8365MB_MIB_ifOutDiscards];</div><div class='add'>+	stats-&gt;tx_window_errors = cnt[RTL8365MB_MIB_dot3StatsLateCollisions];</div><div class='add'>+	stats-&gt;tx_errors = stats-&gt;tx_aborted_errors + stats-&gt;tx_window_errors;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;mb-&gt;ports[port].stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_stats_poll(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb_port *p = container_of(to_delayed_work(work),</div><div class='add'>+						struct rtl8365mb_port,</div><div class='add'>+						mib_work);</div><div class='add'>+	struct realtek_priv *priv = p-&gt;priv;</div><div class='add'>+</div><div class='add'>+	rtl8365mb_stats_update(priv, p-&gt;index);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;p-&gt;mib_work, RTL8365MB_STATS_INTERVAL_JIFFIES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_port *p;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	p = &amp;mb-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;p-&gt;stats_lock);</div><div class='add'>+	memcpy(s, &amp;p-&gt;stats, sizeof(*s));</div><div class='add'>+	spin_unlock(&amp;p-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_stats_setup(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Per-chip global mutex to protect MIB counter access, since doing</div><div class='add'>+	 * so requires accessing a series of registers in a particular order.</div><div class='add'>+	 */</div><div class='add'>+	mutex_init(&amp;mb-&gt;mib_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+		struct rtl8365mb_port *p = &amp;mb-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Per-port spinlock to protect the stats64 data */</div><div class='add'>+		spin_lock_init(&amp;p-&gt;stats_lock);</div><div class='add'>+</div><div class='add'>+		/* This work polls the MIB counters and keeps the stats64 data</div><div class='add'>+		 * up-to-date.</div><div class='add'>+		 */</div><div class='add'>+		INIT_DELAYED_WORK(&amp;p-&gt;mib_work, rtl8365mb_stats_poll);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_stats_teardown(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+		struct rtl8365mb_port *p = &amp;mb-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cancel_delayed_work_sync(&amp;p-&gt;mib_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_get_and_clear_status_reg(struct realtek_priv *priv, u32 reg,</div><div class='add'>+					      u32 *val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map, reg, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_write(priv-&gt;map, reg, *val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rtl8365mb_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = data;</div><div class='add'>+	unsigned long line_changes = 0;</div><div class='add'>+	u32 stat;</div><div class='add'>+	int line;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_get_and_clear_status_reg(priv, RTL8365MB_INTR_STATUS_REG,</div><div class='add'>+						 &amp;stat);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_error;</div><div class='add'>+</div><div class='add'>+	if (stat &amp; RTL8365MB_INTR_LINK_CHANGE_MASK) {</div><div class='add'>+		u32 linkdown_ind;</div><div class='add'>+		u32 linkup_ind;</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		ret = rtl8365mb_get_and_clear_status_reg(</div><div class='add'>+			priv, RTL8365MB_PORT_LINKUP_IND_REG, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_error;</div><div class='add'>+</div><div class='add'>+		linkup_ind = FIELD_GET(RTL8365MB_PORT_LINKUP_IND_MASK, val);</div><div class='add'>+</div><div class='add'>+		ret = rtl8365mb_get_and_clear_status_reg(</div><div class='add'>+			priv, RTL8365MB_PORT_LINKDOWN_IND_REG, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_error;</div><div class='add'>+</div><div class='add'>+		linkdown_ind = FIELD_GET(RTL8365MB_PORT_LINKDOWN_IND_MASK, val);</div><div class='add'>+</div><div class='add'>+		line_changes = linkup_ind | linkdown_ind;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!line_changes)</div><div class='add'>+		goto out_none;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(line, &amp;line_changes, priv-&gt;num_ports) {</div><div class='add'>+		int child_irq = irq_find_mapping(priv-&gt;irqdomain, line);</div><div class='add'>+</div><div class='add'>+		handle_nested_irq(child_irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='add'>+	dev_err(priv-&gt;dev, "failed to read interrupt status: %d\n", ret);</div><div class='add'>+</div><div class='add'>+out_none:</div><div class='add'>+	return IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip rtl8365mb_irq_chip = {</div><div class='add'>+	.name = "rtl8365mb",</div><div class='add'>+	/* The hardware doesn't support masking IRQs on a per-port basis */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_irq_map(struct irq_domain *domain, unsigned int irq,</div><div class='add'>+			     irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	irq_set_chip_data(irq, domain-&gt;host_data);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;rtl8365mb_irq_chip, handle_simple_irq);</div><div class='add'>+	irq_set_nested_thread(irq, 1);</div><div class='add'>+	irq_set_noprobe(irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_irq_unmap(struct irq_domain *d, unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	irq_set_nested_thread(irq, 0);</div><div class='add'>+	irq_set_chip_and_handler(irq, NULL, NULL);</div><div class='add'>+	irq_set_chip_data(irq, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_domain_ops rtl8365mb_irqdomain_ops = {</div><div class='add'>+	.map = rtl8365mb_irq_map,</div><div class='add'>+	.unmap = rtl8365mb_irq_unmap,</div><div class='add'>+	.xlate = irq_domain_xlate_onecell,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_set_irq_enable(struct realtek_priv *priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(priv-&gt;map, RTL8365MB_INTR_CTRL_REG,</div><div class='add'>+				  RTL8365MB_INTR_LINK_CHANGE_MASK,</div><div class='add'>+				  FIELD_PREP(RTL8365MB_INTR_LINK_CHANGE_MASK,</div><div class='add'>+					     enable ? 1 : 0));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_irq_enable(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return rtl8365mb_set_irq_enable(priv, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_irq_disable(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return rtl8365mb_set_irq_enable(priv, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_irq_setup(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	struct device_node *intc;</div><div class='add'>+	u32 irq_trig;</div><div class='add'>+	int virq;</div><div class='add'>+	int irq;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	intc = of_get_child_by_name(priv-&gt;dev-&gt;of_node, "interrupt-controller");</div><div class='add'>+	if (!intc) {</div><div class='add'>+		dev_err(priv-&gt;dev, "missing child interrupt-controller node\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* rtl8365mb IRQs cascade off this one */</div><div class='add'>+	irq = of_irq_get(intc, 0);</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		if (irq != -EPROBE_DEFER)</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to get parent irq: %d\n",</div><div class='add'>+				irq);</div><div class='add'>+		ret = irq ? irq : -EINVAL;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;irqdomain = irq_domain_create_linear(of_fwnode_handle(intc), priv-&gt;num_ports,</div><div class='add'>+						   &amp;rtl8365mb_irqdomain_ops, priv);</div><div class='add'>+	if (!priv-&gt;irqdomain) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to add irq domain\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+		virq = irq_create_mapping(priv-&gt;irqdomain, i);</div><div class='add'>+		if (!virq) {</div><div class='add'>+			dev_err(priv-&gt;dev,</div><div class='add'>+				"failed to create irq domain mapping\n");</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto out_remove_irqdomain;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq_set_parent(virq, irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure chip interrupt signal polarity */</div><div class='add'>+	irq_trig = irq_get_trigger_type(irq);</div><div class='add'>+	switch (irq_trig) {</div><div class='add'>+	case IRQF_TRIGGER_RISING:</div><div class='add'>+	case IRQF_TRIGGER_HIGH:</div><div class='add'>+		val = RTL8365MB_INTR_POLARITY_HIGH;</div><div class='add'>+		break;</div><div class='add'>+	case IRQF_TRIGGER_FALLING:</div><div class='add'>+	case IRQF_TRIGGER_LOW:</div><div class='add'>+		val = RTL8365MB_INTR_POLARITY_LOW;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(priv-&gt;dev, "unsupported irq trigger type %u\n",</div><div class='add'>+			irq_trig);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_remove_irqdomain;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8365MB_INTR_POLARITY_REG,</div><div class='add'>+				 RTL8365MB_INTR_POLARITY_MASK,</div><div class='add'>+				 FIELD_PREP(RTL8365MB_INTR_POLARITY_MASK, val));</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_remove_irqdomain;</div><div class='add'>+</div><div class='add'>+	/* Disable the interrupt in case the chip has it enabled on reset */</div><div class='add'>+	ret = rtl8365mb_irq_disable(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_remove_irqdomain;</div><div class='add'>+</div><div class='add'>+	/* Clear the interrupt status register */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8365MB_INTR_STATUS_REG,</div><div class='add'>+			   RTL8365MB_INTR_ALL_MASK);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_remove_irqdomain;</div><div class='add'>+</div><div class='add'>+	ret = request_threaded_irq(irq, NULL, rtl8365mb_irq, IRQF_ONESHOT,</div><div class='add'>+				   "rtl8365mb", priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to request irq: %d\n", ret);</div><div class='add'>+		goto out_remove_irqdomain;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Store the irq so that we know to free it during teardown */</div><div class='add'>+	mb-&gt;irq = irq;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_irq_enable(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_irq;</div><div class='add'>+</div><div class='add'>+	of_node_put(intc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_irq:</div><div class='add'>+	free_irq(mb-&gt;irq, priv);</div><div class='add'>+	mb-&gt;irq = 0;</div><div class='add'>+</div><div class='add'>+out_remove_irqdomain:</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+		virq = irq_find_mapping(priv-&gt;irqdomain, i);</div><div class='add'>+		irq_dispose_mapping(virq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq_domain_remove(priv-&gt;irqdomain);</div><div class='add'>+	priv-&gt;irqdomain = NULL;</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='add'>+	of_node_put(intc);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_irq_teardown(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	int virq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (mb-&gt;irq) {</div><div class='add'>+		free_irq(mb-&gt;irq, priv);</div><div class='add'>+		mb-&gt;irq = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;irqdomain) {</div><div class='add'>+		for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+			virq = irq_find_mapping(priv-&gt;irqdomain, i);</div><div class='add'>+			irq_dispose_mapping(virq);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq_domain_remove(priv-&gt;irqdomain);</div><div class='add'>+		priv-&gt;irqdomain = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_cpu_config(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	struct rtl8365mb_cpu *cpu = &amp;mb-&gt;cpu;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8365MB_CPU_PORT_MASK_REG,</div><div class='add'>+				 RTL8365MB_CPU_PORT_MASK_MASK,</div><div class='add'>+				 FIELD_PREP(RTL8365MB_CPU_PORT_MASK_MASK,</div><div class='add'>+					    cpu-&gt;mask));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(RTL8365MB_CPU_CTRL_EN_MASK, cpu-&gt;enable ? 1 : 0) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_CPU_CTRL_INSERTMODE_MASK, cpu-&gt;insert) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_CPU_CTRL_TAG_POSITION_MASK, cpu-&gt;position) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_CPU_CTRL_RXBYTECOUNT_MASK, cpu-&gt;rx_length) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_CPU_CTRL_TAG_FORMAT_MASK, cpu-&gt;format) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_CPU_CTRL_TRAP_PORT_MASK, cpu-&gt;trap_port &amp; 0x7) |</div><div class='add'>+	      FIELD_PREP(RTL8365MB_CPU_CTRL_TRAP_PORT_EXT_MASK,</div><div class='add'>+			 cpu-&gt;trap_port &gt;&gt; 3 &amp; 0x1);</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8365MB_CPU_CTRL_REG, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_change_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+					 enum dsa_tag_protocol proto)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_cpu *cpu;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	cpu = &amp;mb-&gt;cpu;</div><div class='add'>+</div><div class='add'>+	switch (proto) {</div><div class='add'>+	case DSA_TAG_PROTO_RTL8_4:</div><div class='add'>+		cpu-&gt;format = RTL8365MB_CPU_FORMAT_8BYTES;</div><div class='add'>+		cpu-&gt;position = RTL8365MB_CPU_POS_AFTER_SA;</div><div class='add'>+		break;</div><div class='add'>+	case DSA_TAG_PROTO_RTL8_4T:</div><div class='add'>+		cpu-&gt;format = RTL8365MB_CPU_FORMAT_8BYTES;</div><div class='add'>+		cpu-&gt;position = RTL8365MB_CPU_POS_BEFORE_CRC;</div><div class='add'>+		break;</div><div class='add'>+	/* The switch also supports a 4-byte format, similar to rtl4a but with</div><div class='add'>+	 * the same 0x04 8-bit version and probably 8-bit port source/dest.</div><div class='add'>+	 * There is no public doc about it. Not supported yet and it will probably</div><div class='add'>+	 * never be.</div><div class='add'>+	 */</div><div class='add'>+	default:</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rtl8365mb_cpu_config(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_switch_init(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	const struct rtl8365mb_chip_info *ci;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ci = mb-&gt;chip_info;</div><div class='add'>+</div><div class='add'>+	/* Do any chip-specific init jam before getting to the common stuff */</div><div class='add'>+	if (ci-&gt;jam_table) {</div><div class='add'>+		for (i = 0; i &lt; ci-&gt;jam_size; i++) {</div><div class='add'>+			ret = regmap_write(priv-&gt;map, ci-&gt;jam_table[i].reg,</div><div class='add'>+					   ci-&gt;jam_table[i].val);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Common init jam */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rtl8365mb_init_jam_common); i++) {</div><div class='add'>+		ret = regmap_write(priv-&gt;map, rtl8365mb_init_jam_common[i].reg,</div><div class='add'>+				   rtl8365mb_init_jam_common[i].val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_reset_chip(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	priv-&gt;write_reg_noack(priv, RTL8365MB_CHIP_RESET_REG,</div><div class='add'>+			      FIELD_PREP(RTL8365MB_CHIP_RESET_HW_MASK, 1));</div><div class='add'>+</div><div class='add'>+	/* Realtek documentation says the chip needs 1 second to reset. Sleep</div><div class='add'>+	 * for 100 ms before accessing any registers to prevent ACK timeouts.</div><div class='add'>+	 */</div><div class='add'>+	msleep(100);</div><div class='add'>+	return regmap_read_poll_timeout(priv-&gt;map, RTL8365MB_CHIP_RESET_REG, val,</div><div class='add'>+					!(val &amp; RTL8365MB_CHIP_RESET_HW_MASK),</div><div class='add'>+					20000, 1e6);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8365mb_cpu *cpu;</div><div class='add'>+	struct dsa_port *cpu_dp;</div><div class='add'>+	struct rtl8365mb *mb;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mb = priv-&gt;chip_data;</div><div class='add'>+	cpu = &amp;mb-&gt;cpu;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_reset_chip(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to reset chip: %d\n", ret);</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure switch to vendor-defined initial state */</div><div class='add'>+	ret = rtl8365mb_switch_init(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to initialize switch: %d\n", ret);</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set up cascading IRQs */</div><div class='add'>+	ret = rtl8365mb_irq_setup(priv);</div><div class='add'>+	if (ret == -EPROBE_DEFER)</div><div class='add'>+		return ret;</div><div class='add'>+	else if (ret)</div><div class='add'>+		dev_info(priv-&gt;dev, "no interrupt support\n");</div><div class='add'>+</div><div class='add'>+	/* Configure CPU tagging */</div><div class='add'>+	dsa_switch_for_each_cpu_port(cpu_dp, ds) {</div><div class='add'>+		cpu-&gt;mask |= BIT(cpu_dp-&gt;index);</div><div class='add'>+</div><div class='add'>+		if (cpu-&gt;trap_port == RTL8365MB_MAX_NUM_PORTS)</div><div class='add'>+			cpu-&gt;trap_port = cpu_dp-&gt;index;</div><div class='add'>+	}</div><div class='add'>+	cpu-&gt;enable = cpu-&gt;mask &gt; 0;</div><div class='add'>+	ret = rtl8365mb_cpu_config(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_teardown_irq;</div><div class='add'>+</div><div class='add'>+	/* Configure ports */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+		struct rtl8365mb_port *p = &amp;mb-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Forward only to the CPU */</div><div class='add'>+		ret = rtl8365mb_port_set_isolation(priv, i, cpu-&gt;mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_teardown_irq;</div><div class='add'>+</div><div class='add'>+		/* Disable learning */</div><div class='add'>+		ret = rtl8365mb_port_set_learning(priv, i, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_teardown_irq;</div><div class='add'>+</div><div class='add'>+		/* Set the initial STP state of all ports to DISABLED, otherwise</div><div class='add'>+		 * ports will still forward frames to the CPU despite being</div><div class='add'>+		 * administratively down by default.</div><div class='add'>+		 */</div><div class='add'>+		rtl8365mb_port_stp_state_set(ds, i, BR_STATE_DISABLED);</div><div class='add'>+</div><div class='add'>+		/* Set up per-port private data */</div><div class='add'>+		p-&gt;priv = priv;</div><div class='add'>+		p-&gt;index = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_port_change_mtu(ds, cpu-&gt;trap_port, ETH_DATA_LEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_teardown_irq;</div><div class='add'>+</div><div class='add'>+	ret = rtl83xx_setup_user_mdio(ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "could not set up MDIO bus\n");</div><div class='add'>+		goto out_teardown_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Start statistics counter polling */</div><div class='add'>+	rtl8365mb_stats_setup(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_teardown_irq:</div><div class='add'>+	rtl8365mb_irq_teardown(priv);</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8365mb_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	rtl8365mb_stats_teardown(priv);</div><div class='add'>+	rtl8365mb_irq_teardown(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_get_chip_id_and_ver(struct regmap *map, u32 *id, u32 *ver)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* For some reason we have to write a magic value to an arbitrary</div><div class='add'>+	 * register whenever accessing the chip ID/version registers.</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_write(map, RTL8365MB_MAGIC_REG, RTL8365MB_MAGIC_VALUE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(map, RTL8365MB_CHIP_ID_REG, id);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(map, RTL8365MB_CHIP_VER_REG, ver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Reset magic register */</div><div class='add'>+	ret = regmap_write(map, RTL8365MB_MAGIC_REG, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_detect(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8365mb *mb = priv-&gt;chip_data;</div><div class='add'>+	u32 chip_id;</div><div class='add'>+	u32 chip_ver;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = rtl8365mb_get_chip_id_and_ver(priv-&gt;map, &amp;chip_id, &amp;chip_ver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to read chip id and version: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rtl8365mb_chip_infos); i++) {</div><div class='add'>+		const struct rtl8365mb_chip_info *ci = &amp;rtl8365mb_chip_infos[i];</div><div class='add'>+</div><div class='add'>+		if (ci-&gt;chip_id == chip_id &amp;&amp; ci-&gt;chip_ver == chip_ver) {</div><div class='add'>+			mb-&gt;chip_info = ci;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mb-&gt;chip_info) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"unrecognized switch (id=0x%04x, ver=0x%04x)", chip_id,</div><div class='add'>+			chip_ver);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(priv-&gt;dev, "found an %s switch\n", mb-&gt;chip_info-&gt;name);</div><div class='add'>+</div><div class='add'>+	priv-&gt;num_ports = RTL8365MB_MAX_NUM_PORTS;</div><div class='add'>+	mb-&gt;priv = priv;</div><div class='add'>+	mb-&gt;cpu.trap_port = RTL8365MB_MAX_NUM_PORTS;</div><div class='add'>+	mb-&gt;cpu.insert = RTL8365MB_CPU_INSERT_TO_ALL;</div><div class='add'>+	mb-&gt;cpu.position = RTL8365MB_CPU_POS_AFTER_SA;</div><div class='add'>+	mb-&gt;cpu.rx_length = RTL8365MB_CPU_RXLEN_64BYTES;</div><div class='add'>+	mb-&gt;cpu.format = RTL8365MB_CPU_FORMAT_8BYTES;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops rtl8365mb_phylink_mac_ops = {</div><div class='add'>+	.mac_config = rtl8365mb_phylink_mac_config,</div><div class='add'>+	.mac_link_down = rtl8365mb_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up = rtl8365mb_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops rtl8365mb_switch_ops = {</div><div class='add'>+	.get_tag_protocol = rtl8365mb_get_tag_protocol,</div><div class='add'>+	.change_tag_protocol = rtl8365mb_change_tag_protocol,</div><div class='add'>+	.setup = rtl8365mb_setup,</div><div class='add'>+	.teardown = rtl8365mb_teardown,</div><div class='add'>+	.phylink_get_caps = rtl8365mb_phylink_get_caps,</div><div class='add'>+	.port_stp_state_set = rtl8365mb_port_stp_state_set,</div><div class='add'>+	.get_strings = rtl8365mb_get_strings,</div><div class='add'>+	.get_ethtool_stats = rtl8365mb_get_ethtool_stats,</div><div class='add'>+	.get_sset_count = rtl8365mb_get_sset_count,</div><div class='add'>+	.get_eth_phy_stats = rtl8365mb_get_phy_stats,</div><div class='add'>+	.get_eth_mac_stats = rtl8365mb_get_mac_stats,</div><div class='add'>+	.get_eth_ctrl_stats = rtl8365mb_get_ctrl_stats,</div><div class='add'>+	.get_stats64 = rtl8365mb_get_stats64,</div><div class='add'>+	.port_change_mtu = rtl8365mb_port_change_mtu,</div><div class='add'>+	.port_max_mtu = rtl8365mb_port_max_mtu,</div><div class='add'>+	.port_hsr_join = dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave = dsa_port_simple_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct realtek_ops rtl8365mb_ops = {</div><div class='add'>+	.detect = rtl8365mb_detect,</div><div class='add'>+	.phy_read = rtl8365mb_phy_read,</div><div class='add'>+	.phy_write = rtl8365mb_phy_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct realtek_variant rtl8365mb_variant = {</div><div class='add'>+	.ds_ops = &amp;rtl8365mb_switch_ops,</div><div class='add'>+	.ops = &amp;rtl8365mb_ops,</div><div class='add'>+	.phylink_mac_ops = &amp;rtl8365mb_phylink_mac_ops,</div><div class='add'>+	.clk_delay = 10,</div><div class='add'>+	.cmd_read = 0xb9,</div><div class='add'>+	.cmd_write = 0xb8,</div><div class='add'>+	.chip_data_sz = sizeof(struct rtl8365mb),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id rtl8365mb_of_match[] = {</div><div class='add'>+	{ .compatible = "realtek,rtl8365mb", .data = &amp;rtl8365mb_variant, },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, rtl8365mb_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver rtl8365mb_smi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "rtl8365mb-smi",</div><div class='add'>+		.of_match_table = rtl8365mb_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe  = realtek_smi_probe,</div><div class='add'>+	.remove = realtek_smi_remove,</div><div class='add'>+	.shutdown = realtek_smi_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdio_driver rtl8365mb_mdio_driver = {</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = "rtl8365mb-mdio",</div><div class='add'>+		.of_match_table = rtl8365mb_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe  = realtek_mdio_probe,</div><div class='add'>+	.remove = realtek_mdio_remove,</div><div class='add'>+	.shutdown = realtek_mdio_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8365mb_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = realtek_mdio_driver_register(&amp;rtl8365mb_mdio_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = realtek_smi_driver_register(&amp;rtl8365mb_smi_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		realtek_mdio_driver_unregister(&amp;rtl8365mb_mdio_driver);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+module_init(rtl8365mb_init);</div><div class='add'>+</div><div class='add'>+static void __exit rtl8365mb_exit(void)</div><div class='add'>+{</div><div class='add'>+	realtek_smi_driver_unregister(&amp;rtl8365mb_smi_driver);</div><div class='add'>+	realtek_mdio_driver_unregister(&amp;rtl8365mb_mdio_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(rtl8365mb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Alvin Šipraga &lt;alsi@bang-olufsen.dk&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for RTL8365MB-VC ethernet switch");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("REALTEK_DSA");</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl8366-core.c b/drivers/net/dsa/realtek/rtl8366-core.c<br/>new file mode 100644<br/>index 000000000000..047feeed96a2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl8366-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl8366-core.c</a></div><div class='hunk'>@@ -0,0 +1,444 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Realtek SMI library helpers for the RTL8366x variants</div><div class='add'>+ * RTL8366RB and RTL8366S</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='add'>+ * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+int rtl8366_mc_is_used(struct realtek_priv *priv, int mc_index, int *used)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*used = 0;</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='add'>+		int index = 0;</div><div class='add'>+</div><div class='add'>+		ret = priv-&gt;ops-&gt;get_mc_index(priv, i, &amp;index);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (mc_index == index) {</div><div class='add'>+			*used = 1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_mc_is_used, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl8366_obtain_mc() - retrieve or allocate a VLAN member configuration</div><div class='add'>+ * @priv: the Realtek SMI device instance</div><div class='add'>+ * @vid: the VLAN ID to look up or allocate</div><div class='add'>+ * @vlanmc: the pointer will be assigned to a pointer to a valid member config</div><div class='add'>+ * if successful</div><div class='add'>+ * @return: index of a new member config or negative error number</div><div class='add'>+ */</div><div class='add'>+static int rtl8366_obtain_mc(struct realtek_priv *priv, int vid,</div><div class='add'>+			     struct rtl8366_vlan_mc *vlanmc)</div><div class='add'>+{</div><div class='add'>+	struct rtl8366_vlan_4k vlan4k;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Try to find an existing member config entry for this VID */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_vlan_mc; i++) {</div><div class='add'>+		ret = priv-&gt;ops-&gt;get_vlan_mc(priv, i, vlanmc);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "error searching for VLAN MC %d for VID %d\n",</div><div class='add'>+				i, vid);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (vid == vlanmc-&gt;vid)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have no MC entry for this VID, try to find an empty one */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_vlan_mc; i++) {</div><div class='add'>+		ret = priv-&gt;ops-&gt;get_vlan_mc(priv, i, vlanmc);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "error searching for VLAN MC %d for VID %d\n",</div><div class='add'>+				i, vid);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (vlanmc-&gt;vid == 0 &amp;&amp; vlanmc-&gt;member == 0) {</div><div class='add'>+			/* Update the entry from the 4K table */</div><div class='add'>+			ret = priv-&gt;ops-&gt;get_vlan_4k(priv, vid, &amp;vlan4k);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(priv-&gt;dev, "error looking for 4K VLAN MC %d for VID %d\n",</div><div class='add'>+					i, vid);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			vlanmc-&gt;vid = vid;</div><div class='add'>+			vlanmc-&gt;member = vlan4k.member;</div><div class='add'>+			vlanmc-&gt;untag = vlan4k.untag;</div><div class='add'>+			vlanmc-&gt;fid = vlan4k.fid;</div><div class='add'>+			ret = priv-&gt;ops-&gt;set_vlan_mc(priv, i, vlanmc);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(priv-&gt;dev, "unable to set/update VLAN MC %d for VID %d\n",</div><div class='add'>+					i, vid);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			dev_dbg(priv-&gt;dev, "created new MC at index %d for VID %d\n",</div><div class='add'>+				i, vid);</div><div class='add'>+			return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MC table is full, try to find an unused entry and replace it */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_vlan_mc; i++) {</div><div class='add'>+		int used;</div><div class='add'>+</div><div class='add'>+		ret = rtl8366_mc_is_used(priv, i, &amp;used);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (!used) {</div><div class='add'>+			/* Update the entry from the 4K table */</div><div class='add'>+			ret = priv-&gt;ops-&gt;get_vlan_4k(priv, vid, &amp;vlan4k);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			vlanmc-&gt;vid = vid;</div><div class='add'>+			vlanmc-&gt;member = vlan4k.member;</div><div class='add'>+			vlanmc-&gt;untag = vlan4k.untag;</div><div class='add'>+			vlanmc-&gt;fid = vlan4k.fid;</div><div class='add'>+			ret = priv-&gt;ops-&gt;set_vlan_mc(priv, i, vlanmc);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(priv-&gt;dev, "unable to set/update VLAN MC %d for VID %d\n",</div><div class='add'>+					i, vid);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+			dev_dbg(priv-&gt;dev, "recycled MC at index %i for VID %d\n",</div><div class='add'>+				i, vid);</div><div class='add'>+			return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(priv-&gt;dev, "all VLAN member configurations are in use\n");</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtl8366_set_vlan(struct realtek_priv *priv, int vid, u32 member,</div><div class='add'>+		     u32 untag, u32 fid)</div><div class='add'>+{</div><div class='add'>+	struct rtl8366_vlan_mc vlanmc;</div><div class='add'>+	struct rtl8366_vlan_4k vlan4k;</div><div class='add'>+	int mc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;ops-&gt;is_vlan_valid(priv, vid))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev,</div><div class='add'>+		"setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",</div><div class='add'>+		vid, member, untag);</div><div class='add'>+</div><div class='add'>+	/* Update the 4K table */</div><div class='add'>+	ret = priv-&gt;ops-&gt;get_vlan_4k(priv, vid, &amp;vlan4k);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	vlan4k.member |= member;</div><div class='add'>+	vlan4k.untag |= untag;</div><div class='add'>+	vlan4k.fid = fid;</div><div class='add'>+	ret = priv-&gt;ops-&gt;set_vlan_4k(priv, &amp;vlan4k);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev,</div><div class='add'>+		"resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n",</div><div class='add'>+		vid, vlan4k.member, vlan4k.untag);</div><div class='add'>+</div><div class='add'>+	/* Find or allocate a member config for this VID */</div><div class='add'>+	ret = rtl8366_obtain_mc(priv, vid, &amp;vlanmc);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	mc = ret;</div><div class='add'>+</div><div class='add'>+	/* Update the MC entry */</div><div class='add'>+	vlanmc.member |= member;</div><div class='add'>+	vlanmc.untag |= untag;</div><div class='add'>+	vlanmc.fid = fid;</div><div class='add'>+</div><div class='add'>+	/* Commit updates to the MC entry */</div><div class='add'>+	ret = priv-&gt;ops-&gt;set_vlan_mc(priv, mc, &amp;vlanmc);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to commit changes to VLAN MC index %d for VID %d\n",</div><div class='add'>+			mc, vid);</div><div class='add'>+	else</div><div class='add'>+		dev_dbg(priv-&gt;dev,</div><div class='add'>+			"resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n",</div><div class='add'>+			vid, vlanmc.member, vlanmc.untag);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_set_vlan, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_set_pvid(struct realtek_priv *priv, unsigned int port,</div><div class='add'>+		     unsigned int vid)</div><div class='add'>+{</div><div class='add'>+	struct rtl8366_vlan_mc vlanmc;</div><div class='add'>+	int mc;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;ops-&gt;is_vlan_valid(priv, vid))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Find or allocate a member config for this VID */</div><div class='add'>+	ret = rtl8366_obtain_mc(priv, vid, &amp;vlanmc);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+	mc = ret;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;ops-&gt;set_mc_index(priv, port, mc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "set PVID: failed to set MC index %d for port %d\n",</div><div class='add'>+			mc, port);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "set PVID: the PVID for port %d set to %d using existing MC index %d\n",</div><div class='add'>+		port, vid, mc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_set_pvid, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_enable_vlan4k(struct realtek_priv *priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* To enable 4k VLAN, ordinary VLAN must be enabled first,</div><div class='add'>+	 * but if we disable 4k VLAN it is fine to leave ordinary</div><div class='add'>+	 * VLAN enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (enable) {</div><div class='add'>+		/* Make sure VLAN is ON */</div><div class='add'>+		ret = priv-&gt;ops-&gt;enable_vlan(priv, true);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		priv-&gt;vlan_enabled = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;ops-&gt;enable_vlan4k(priv, enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;vlan4k_enabled = enable;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_enable_vlan4k, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_enable_vlan(struct realtek_priv *priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;ops-&gt;enable_vlan(priv, enable);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;vlan_enabled = enable;</div><div class='add'>+</div><div class='add'>+	/* If we turn VLAN off, make sure that we turn off</div><div class='add'>+	 * 4k VLAN as well, if that happened to be on.</div><div class='add'>+	 */</div><div class='add'>+	if (!enable) {</div><div class='add'>+		priv-&gt;vlan4k_enabled = false;</div><div class='add'>+		ret = priv-&gt;ops-&gt;enable_vlan4k(priv, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_enable_vlan, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_reset_vlan(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct rtl8366_vlan_mc vlanmc;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rtl8366_enable_vlan(priv, false);</div><div class='add'>+	rtl8366_enable_vlan4k(priv, false);</div><div class='add'>+</div><div class='add'>+	/* Clear the 16 VLAN member configurations */</div><div class='add'>+	vlanmc.vid = 0;</div><div class='add'>+	vlanmc.priority = 0;</div><div class='add'>+	vlanmc.member = 0;</div><div class='add'>+	vlanmc.untag = 0;</div><div class='add'>+	vlanmc.fid = 0;</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_vlan_mc; i++) {</div><div class='add'>+		ret = priv-&gt;ops-&gt;set_vlan_mc(priv, i, &amp;vlanmc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_reset_vlan, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+		     const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool untagged = !!(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+	bool pvid = !!(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID);</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 member = 0;</div><div class='add'>+	u32 untag = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;ops-&gt;is_vlan_valid(priv, vlan-&gt;vid)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "VLAN ID not valid");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable VLAN in the hardware</div><div class='add'>+	 * FIXME: what's with this 4k business?</div><div class='add'>+	 * Just rtl8366_enable_vlan() seems inconclusive.</div><div class='add'>+	 */</div><div class='add'>+	ret = rtl8366_enable_vlan4k(priv, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to enable VLAN 4K");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "add VLAN %d on port %d, %s, %s\n",</div><div class='add'>+		vlan-&gt;vid, port, untagged ? "untagged" : "tagged",</div><div class='add'>+		pvid ? "PVID" : "no PVID");</div><div class='add'>+</div><div class='add'>+	member |= BIT(port);</div><div class='add'>+</div><div class='add'>+	if (untagged)</div><div class='add'>+		untag |= BIT(port);</div><div class='add'>+</div><div class='add'>+	ret = rtl8366_set_vlan(priv, vlan-&gt;vid, member, untag, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to set up VLAN %04x", vlan-&gt;vid);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!pvid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = rtl8366_set_pvid(priv, port, vlan-&gt;vid);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to set PVID on port %d to VLAN %04x",</div><div class='add'>+			port, vlan-&gt;vid);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_vlan_add, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+		     const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "del VLAN %d on port %d\n", vlan-&gt;vid, port);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_vlan_mc; i++) {</div><div class='add'>+		struct rtl8366_vlan_mc vlanmc;</div><div class='add'>+</div><div class='add'>+		ret = priv-&gt;ops-&gt;get_vlan_mc(priv, i, &amp;vlanmc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (vlan-&gt;vid == vlanmc.vid) {</div><div class='add'>+			/* Remove this port from the VLAN */</div><div class='add'>+			vlanmc.member &amp;= ~BIT(port);</div><div class='add'>+			vlanmc.untag &amp;= ~BIT(port);</div><div class='add'>+			/*</div><div class='add'>+			 * If no ports are members of this VLAN</div><div class='add'>+			 * anymore then clear the whole member</div><div class='add'>+			 * config so it can be reused.</div><div class='add'>+			 */</div><div class='add'>+			if (!vlanmc.member) {</div><div class='add'>+				vlanmc.vid = 0;</div><div class='add'>+				vlanmc.priority = 0;</div><div class='add'>+				vlanmc.fid = 0;</div><div class='add'>+			}</div><div class='add'>+			ret = priv-&gt;ops-&gt;set_vlan_mc(priv, i, &amp;vlanmc);</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(priv-&gt;dev,</div><div class='add'>+					"failed to remove VLAN %04x\n",</div><div class='add'>+					vlan-&gt;vid);</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_vlan_del, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+			 uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= priv-&gt;num_ports)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_mib_counters; i++)</div><div class='add'>+		ethtool_puts(&amp;data, priv-&gt;mib_counters[i].name);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_get_strings, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* We only support SS_STATS */</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+	if (port &gt;= priv-&gt;num_ports)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;num_mib_counters;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_get_sset_count, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= priv-&gt;num_ports)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_mib_counters; i++) {</div><div class='add'>+		struct rtl8366_mib_counter *mib;</div><div class='add'>+		u64 mibvalue = 0;</div><div class='add'>+</div><div class='add'>+		mib = &amp;priv-&gt;mib_counters[i];</div><div class='add'>+		ret = priv-&gt;ops-&gt;get_mib_counter(priv, port, mib, &amp;mibvalue);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(priv-&gt;dev, "error reading MIB counter %s\n",</div><div class='add'>+				mib-&gt;name);</div><div class='add'>+		}</div><div class='add'>+		data[i] = mibvalue;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl8366_get_ethtool_stats, "REALTEK_DSA");</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl8366rb-leds.c b/drivers/net/dsa/realtek/rtl8366rb-leds.c<br/>new file mode 100644<br/>index 000000000000..99c890681ae6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl8366rb-leds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl8366rb-leds.c</a></div><div class='hunk'>@@ -0,0 +1,177 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include "rtl83xx.h"</div><div class='add'>+#include "rtl8366rb.h"</div><div class='add'>+</div><div class='add'>+static inline u32 rtl8366rb_led_group_port_mask(u8 led_group, u8 port)</div><div class='add'>+{</div><div class='add'>+	switch (led_group) {</div><div class='add'>+	case 0:</div><div class='add'>+		return FIELD_PREP(RTL8366RB_LED_0_X_CTRL_MASK, BIT(port));</div><div class='add'>+	case 1:</div><div class='add'>+		return FIELD_PREP(RTL8366RB_LED_0_X_CTRL_MASK, BIT(port));</div><div class='add'>+	case 2:</div><div class='add'>+		return FIELD_PREP(RTL8366RB_LED_0_X_CTRL_MASK, BIT(port));</div><div class='add'>+	case 3:</div><div class='add'>+		return FIELD_PREP(RTL8366RB_LED_0_X_CTRL_MASK, BIT(port));</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rb8366rb_get_port_led(struct rtl8366rb_led *led)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = led-&gt;priv;</div><div class='add'>+	u8 led_group = led-&gt;led_group;</div><div class='add'>+	u8 port_num = led-&gt;port_num;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_LED_X_X_CTRL_REG(led_group),</div><div class='add'>+			  &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "error reading LED on port %d group %d\n",</div><div class='add'>+			led_group, port_num);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return !!(val &amp; rtl8366rb_led_group_port_mask(led_group, port_num));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rb8366rb_set_port_led(struct rtl8366rb_led *led, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = led-&gt;priv;</div><div class='add'>+	u8 led_group = led-&gt;led_group;</div><div class='add'>+	u8 port_num = led-&gt;port_num;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map,</div><div class='add'>+				 RTL8366RB_LED_X_X_CTRL_REG(led_group),</div><div class='add'>+				 rtl8366rb_led_group_port_mask(led_group,</div><div class='add'>+							       port_num),</div><div class='add'>+				 enable ? 0xffff : 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "error updating LED on port %d group %d\n",</div><div class='add'>+			led_group, port_num);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Change the LED group to manual controlled LEDs if required */</div><div class='add'>+	ret = rb8366rb_set_ledgroup_mode(priv, led_group,</div><div class='add'>+					 RTL8366RB_LEDGROUP_FORCE);</div><div class='add'>+</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "error updating LED GROUP group %d\n",</div><div class='add'>+			led_group);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtl8366rb_cled_brightness_set_blocking(struct led_classdev *ldev,</div><div class='add'>+				       enum led_brightness brightness)</div><div class='add'>+{</div><div class='add'>+	struct rtl8366rb_led *led = container_of(ldev, struct rtl8366rb_led,</div><div class='add'>+						 cdev);</div><div class='add'>+</div><div class='add'>+	return rb8366rb_set_port_led(led, brightness == LED_ON);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_setup_led(struct realtek_priv *priv, struct dsa_port *dp,</div><div class='add'>+			       struct fwnode_handle *led_fwnode)</div><div class='add'>+{</div><div class='add'>+	struct rtl8366rb *rb = priv-&gt;chip_data;</div><div class='add'>+	struct led_init_data init_data = { };</div><div class='add'>+	enum led_default_state state;</div><div class='add'>+	struct rtl8366rb_led *led;</div><div class='add'>+	u32 led_group;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = fwnode_property_read_u32(led_fwnode, "reg", &amp;led_group);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (led_group &gt;= RTL8366RB_NUM_LEDGROUPS) {</div><div class='add'>+		dev_warn(priv-&gt;dev, "Invalid LED reg %d defined for port %d",</div><div class='add'>+			 led_group, dp-&gt;index);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led = &amp;rb-&gt;leds[dp-&gt;index][led_group];</div><div class='add'>+	led-&gt;port_num = dp-&gt;index;</div><div class='add'>+	led-&gt;led_group = led_group;</div><div class='add'>+	led-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	state = led_init_default_state_get(led_fwnode);</div><div class='add'>+	switch (state) {</div><div class='add'>+	case LEDS_DEFSTATE_ON:</div><div class='add'>+		led-&gt;cdev.brightness = 1;</div><div class='add'>+		rb8366rb_set_port_led(led, 1);</div><div class='add'>+		break;</div><div class='add'>+	case LEDS_DEFSTATE_KEEP:</div><div class='add'>+		led-&gt;cdev.brightness =</div><div class='add'>+			rb8366rb_get_port_led(led);</div><div class='add'>+		break;</div><div class='add'>+	case LEDS_DEFSTATE_OFF:</div><div class='add'>+	default:</div><div class='add'>+		led-&gt;cdev.brightness = 0;</div><div class='add'>+		rb8366rb_set_port_led(led, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	led-&gt;cdev.max_brightness = 1;</div><div class='add'>+	led-&gt;cdev.brightness_set_blocking =</div><div class='add'>+		rtl8366rb_cled_brightness_set_blocking;</div><div class='add'>+	init_data.fwnode = led_fwnode;</div><div class='add'>+	init_data.devname_mandatory = true;</div><div class='add'>+</div><div class='add'>+	init_data.devicename = kasprintf(GFP_KERNEL, "Realtek-%d:0%d:%d",</div><div class='add'>+					 dp-&gt;ds-&gt;index, dp-&gt;index, led_group);</div><div class='add'>+	if (!init_data.devicename)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = devm_led_classdev_register_ext(priv-&gt;dev, &amp;led-&gt;cdev, &amp;init_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_warn(priv-&gt;dev, "Failed to init LED %d for port %d",</div><div class='add'>+			 led_group, dp-&gt;index);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int rtl8366rb_setup_leds(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	struct device_node *leds_np;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		if (!dp-&gt;dn)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		leds_np = of_get_child_by_name(dp-&gt;dn, "leds");</div><div class='add'>+		if (!leds_np) {</div><div class='add'>+			dev_dbg(priv-&gt;dev, "No leds defined for port %d",</div><div class='add'>+				dp-&gt;index);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for_each_child_of_node_scoped(leds_np, led_np) {</div><div class='add'>+			ret = rtl8366rb_setup_led(priv, dp,</div><div class='add'>+						  of_fwnode_handle(led_np));</div><div class='add'>+			if (ret)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		of_node_put(leds_np);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c<br/>new file mode 100644<br/>index 000000000000..d96ae72b0a5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl8366rb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl8366rb.c</a></div><div class='hunk'>@@ -0,0 +1,1902 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Realtek SMI subdriver for the Realtek RTL8366RB ethernet switch</div><div class='add'>+ *</div><div class='add'>+ * This is a sparsely documented chip, the only viable documentation seems</div><div class='add'>+ * to be a patched up code drop from the vendor that appear in various</div><div class='add'>+ * GPL source trees.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='add'>+ * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='add'>+ * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/irqdomain.h&gt;</div><div class='add'>+#include &lt;linux/irqchip/chained_irq.h&gt;</div><div class='add'>+#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/string_choices.h&gt;</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+#include "realtek-smi.h"</div><div class='add'>+#include "realtek-mdio.h"</div><div class='add'>+#include "rtl83xx.h"</div><div class='add'>+#include "rtl8366rb.h"</div><div class='add'>+</div><div class='add'>+/* Switch Global Configuration register */</div><div class='add'>+#define RTL8366RB_SGCR				0x0000</div><div class='add'>+#define RTL8366RB_SGCR_EN_BC_STORM_CTRL		BIT(0)</div><div class='add'>+#define RTL8366RB_SGCR_MAX_LENGTH(a)		((a) &lt;&lt; 4)</div><div class='add'>+#define RTL8366RB_SGCR_MAX_LENGTH_MASK		RTL8366RB_SGCR_MAX_LENGTH(0x3)</div><div class='add'>+#define RTL8366RB_SGCR_MAX_LENGTH_1522		RTL8366RB_SGCR_MAX_LENGTH(0x0)</div><div class='add'>+#define RTL8366RB_SGCR_MAX_LENGTH_1536		RTL8366RB_SGCR_MAX_LENGTH(0x1)</div><div class='add'>+#define RTL8366RB_SGCR_MAX_LENGTH_1552		RTL8366RB_SGCR_MAX_LENGTH(0x2)</div><div class='add'>+#define RTL8366RB_SGCR_MAX_LENGTH_16000		RTL8366RB_SGCR_MAX_LENGTH(0x3)</div><div class='add'>+#define RTL8366RB_SGCR_EN_VLAN			BIT(13)</div><div class='add'>+#define RTL8366RB_SGCR_EN_VLAN_4KTB		BIT(14)</div><div class='add'>+</div><div class='add'>+/* Port Enable Control register */</div><div class='add'>+#define RTL8366RB_PECR				0x0001</div><div class='add'>+</div><div class='add'>+/* Switch per-port learning disablement register */</div><div class='add'>+#define RTL8366RB_PORT_LEARNDIS_CTRL		0x0002</div><div class='add'>+</div><div class='add'>+/* Security control, actually aging register */</div><div class='add'>+#define RTL8366RB_SECURITY_CTRL			0x0003</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_SSCR2				0x0004</div><div class='add'>+#define RTL8366RB_SSCR2_DROP_UNKNOWN_DA		BIT(0)</div><div class='add'>+</div><div class='add'>+/* Port Mode Control registers */</div><div class='add'>+#define RTL8366RB_PMC0				0x0005</div><div class='add'>+#define RTL8366RB_PMC0_SPI			BIT(0)</div><div class='add'>+#define RTL8366RB_PMC0_EN_AUTOLOAD		BIT(1)</div><div class='add'>+#define RTL8366RB_PMC0_PROBE			BIT(2)</div><div class='add'>+#define RTL8366RB_PMC0_DIS_BISR			BIT(3)</div><div class='add'>+#define RTL8366RB_PMC0_ADCTEST			BIT(4)</div><div class='add'>+#define RTL8366RB_PMC0_SRAM_DIAG		BIT(5)</div><div class='add'>+#define RTL8366RB_PMC0_EN_SCAN			BIT(6)</div><div class='add'>+#define RTL8366RB_PMC0_P4_IOMODE_SHIFT		7</div><div class='add'>+#define RTL8366RB_PMC0_P4_IOMODE_MASK		GENMASK(9, 7)</div><div class='add'>+#define RTL8366RB_PMC0_P5_IOMODE_SHIFT		10</div><div class='add'>+#define RTL8366RB_PMC0_P5_IOMODE_MASK		GENMASK(12, 10)</div><div class='add'>+#define RTL8366RB_PMC0_SDSMODE_SHIFT		13</div><div class='add'>+#define RTL8366RB_PMC0_SDSMODE_MASK		GENMASK(15, 13)</div><div class='add'>+#define RTL8366RB_PMC1				0x0006</div><div class='add'>+</div><div class='add'>+/* Port Mirror Control Register */</div><div class='add'>+#define RTL8366RB_PMCR				0x0007</div><div class='add'>+#define RTL8366RB_PMCR_SOURCE_PORT(a)		(a)</div><div class='add'>+#define RTL8366RB_PMCR_SOURCE_PORT_MASK		0x000f</div><div class='add'>+#define RTL8366RB_PMCR_MONITOR_PORT(a)		((a) &lt;&lt; 4)</div><div class='add'>+#define RTL8366RB_PMCR_MONITOR_PORT_MASK	0x00f0</div><div class='add'>+#define RTL8366RB_PMCR_MIRROR_RX		BIT(8)</div><div class='add'>+#define RTL8366RB_PMCR_MIRROR_TX		BIT(9)</div><div class='add'>+#define RTL8366RB_PMCR_MIRROR_SPC		BIT(10)</div><div class='add'>+#define RTL8366RB_PMCR_MIRROR_ISO		BIT(11)</div><div class='add'>+</div><div class='add'>+/* bits 0..7 = port 0, bits 8..15 = port 1 */</div><div class='add'>+#define RTL8366RB_PAACR0		0x0010</div><div class='add'>+/* bits 0..7 = port 2, bits 8..15 = port 3 */</div><div class='add'>+#define RTL8366RB_PAACR1		0x0011</div><div class='add'>+/* bits 0..7 = port 4, bits 8..15 = port 5 */</div><div class='add'>+#define RTL8366RB_PAACR2		0x0012</div><div class='add'>+#define RTL8366RB_PAACR_SPEED_10M	0</div><div class='add'>+#define RTL8366RB_PAACR_SPEED_100M	1</div><div class='add'>+#define RTL8366RB_PAACR_SPEED_1000M	2</div><div class='add'>+#define RTL8366RB_PAACR_FULL_DUPLEX	BIT(2)</div><div class='add'>+#define RTL8366RB_PAACR_LINK_UP		BIT(4)</div><div class='add'>+#define RTL8366RB_PAACR_TX_PAUSE	BIT(5)</div><div class='add'>+#define RTL8366RB_PAACR_RX_PAUSE	BIT(6)</div><div class='add'>+#define RTL8366RB_PAACR_AN		BIT(7)</div><div class='add'>+</div><div class='add'>+/* bits 0..7 = port 0, bits 8..15 = port 1 */</div><div class='add'>+#define RTL8366RB_PSTAT0		0x0014</div><div class='add'>+/* bits 0..7 = port 2, bits 8..15 = port 3 */</div><div class='add'>+#define RTL8366RB_PSTAT1		0x0015</div><div class='add'>+/* bits 0..7 = port 4, bits 8..15 = port 5 */</div><div class='add'>+#define RTL8366RB_PSTAT2		0x0016</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_POWER_SAVING_REG	0x0021</div><div class='add'>+</div><div class='add'>+/* Spanning tree status (STP) control, two bits per port per FID */</div><div class='add'>+#define RTL8366RB_STP_STATE_BASE	0x0050 /* 0x0050..0x0057 */</div><div class='add'>+#define RTL8366RB_STP_STATE_DISABLED	0x0</div><div class='add'>+#define RTL8366RB_STP_STATE_BLOCKING	0x1</div><div class='add'>+#define RTL8366RB_STP_STATE_LEARNING	0x2</div><div class='add'>+#define RTL8366RB_STP_STATE_FORWARDING	0x3</div><div class='add'>+#define RTL8366RB_STP_MASK		GENMASK(1, 0)</div><div class='add'>+#define RTL8366RB_STP_STATE(port, state) \</div><div class='add'>+	((state) &lt;&lt; ((port) * 2))</div><div class='add'>+#define RTL8366RB_STP_STATE_MASK(port) \</div><div class='add'>+	RTL8366RB_STP_STATE((port), RTL8366RB_STP_MASK)</div><div class='add'>+</div><div class='add'>+/* CPU port control reg */</div><div class='add'>+#define RTL8366RB_CPU_CTRL_REG		0x0061</div><div class='add'>+#define RTL8366RB_CPU_PORTS_MSK		0x00FF</div><div class='add'>+/* Disables inserting custom tag length/type 0x8899 */</div><div class='add'>+#define RTL8366RB_CPU_NO_TAG		BIT(15)</div><div class='add'>+#define RTL8366RB_CPU_TAG_SIZE		4</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_SMAR0			0x0070 /* bits 0..15 */</div><div class='add'>+#define RTL8366RB_SMAR1			0x0071 /* bits 16..31 */</div><div class='add'>+#define RTL8366RB_SMAR2			0x0072 /* bits 32..47 */</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_RESET_CTRL_REG		0x0100</div><div class='add'>+#define RTL8366RB_CHIP_CTRL_RESET_HW		BIT(0)</div><div class='add'>+#define RTL8366RB_CHIP_CTRL_RESET_SW		BIT(1)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_CHIP_ID_REG			0x0509</div><div class='add'>+#define RTL8366RB_CHIP_ID_8366			0x5937</div><div class='add'>+#define RTL8366RB_CHIP_VERSION_CTRL_REG		0x050A</div><div class='add'>+#define RTL8366RB_CHIP_VERSION_MASK		0xf</div><div class='add'>+</div><div class='add'>+/* PHY registers control */</div><div class='add'>+#define RTL8366RB_PHY_ACCESS_CTRL_REG		0x8000</div><div class='add'>+#define RTL8366RB_PHY_CTRL_READ			BIT(0)</div><div class='add'>+#define RTL8366RB_PHY_CTRL_WRITE		0</div><div class='add'>+#define RTL8366RB_PHY_ACCESS_BUSY_REG		0x8001</div><div class='add'>+#define RTL8366RB_PHY_INT_BUSY			BIT(0)</div><div class='add'>+#define RTL8366RB_PHY_EXT_BUSY			BIT(4)</div><div class='add'>+#define RTL8366RB_PHY_ACCESS_DATA_REG		0x8002</div><div class='add'>+#define RTL8366RB_PHY_EXT_CTRL_REG		0x8010</div><div class='add'>+#define RTL8366RB_PHY_EXT_WRDATA_REG		0x8011</div><div class='add'>+#define RTL8366RB_PHY_EXT_RDDATA_REG		0x8012</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PHY_REG_MASK			0x1f</div><div class='add'>+#define RTL8366RB_PHY_PAGE_OFFSET		5</div><div class='add'>+#define RTL8366RB_PHY_PAGE_MASK			(0xf &lt;&lt; 5)</div><div class='add'>+#define RTL8366RB_PHY_NO_OFFSET			9</div><div class='add'>+#define RTL8366RB_PHY_NO_MASK			(0x1f &lt;&lt; 9)</div><div class='add'>+</div><div class='add'>+/* VLAN Ingress Control Register 1, one bit per port.</div><div class='add'>+ * bit 0 .. 5 will make the switch drop ingress frames without</div><div class='add'>+ * VID such as untagged or priority-tagged frames for respective</div><div class='add'>+ * port.</div><div class='add'>+ * bit 6 .. 11 will make the switch drop ingress frames carrying</div><div class='add'>+ * a C-tag with VID != 0 for respective port.</div><div class='add'>+ */</div><div class='add'>+#define RTL8366RB_VLAN_INGRESS_CTRL1_REG	0x037E</div><div class='add'>+#define RTL8366RB_VLAN_INGRESS_CTRL1_DROP(port)	(BIT((port)) | BIT((port) + 6))</div><div class='add'>+</div><div class='add'>+/* VLAN Ingress Control Register 2, one bit per port.</div><div class='add'>+ * bit0 .. bit5 will make the switch drop all ingress frames with</div><div class='add'>+ * a VLAN classification that does not include the port is in its</div><div class='add'>+ * member set.</div><div class='add'>+ */</div><div class='add'>+#define RTL8366RB_VLAN_INGRESS_CTRL2_REG	0x037f</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_MIB_COUNT			33</div><div class='add'>+#define RTL8366RB_GLOBAL_MIB_COUNT		1</div><div class='add'>+#define RTL8366RB_MIB_COUNTER_PORT_OFFSET	0x0050</div><div class='add'>+#define RTL8366RB_MIB_COUNTER_BASE		0x1000</div><div class='add'>+#define RTL8366RB_MIB_CTRL_REG			0x13F0</div><div class='add'>+#define RTL8366RB_MIB_CTRL_USER_MASK		0x0FFC</div><div class='add'>+#define RTL8366RB_MIB_CTRL_BUSY_MASK		BIT(0)</div><div class='add'>+#define RTL8366RB_MIB_CTRL_RESET_MASK		BIT(1)</div><div class='add'>+#define RTL8366RB_MIB_CTRL_PORT_RESET(_p)	BIT(2 + (_p))</div><div class='add'>+#define RTL8366RB_MIB_CTRL_GLOBAL_RESET		BIT(11)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_VLAN_CTRL_BASE		0x0063</div><div class='add'>+#define RTL8366RB_PORT_VLAN_CTRL_REG(_p)  \</div><div class='add'>+		(RTL8366RB_PORT_VLAN_CTRL_BASE + (_p) / 4)</div><div class='add'>+#define RTL8366RB_PORT_VLAN_CTRL_MASK		0xf</div><div class='add'>+#define RTL8366RB_PORT_VLAN_CTRL_SHIFT(_p)	(4 * ((_p) % 4))</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_VLAN_TABLE_READ_BASE		0x018C</div><div class='add'>+#define RTL8366RB_VLAN_TABLE_WRITE_BASE		0x0185</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_TABLE_ACCESS_CTRL_REG		0x0180</div><div class='add'>+#define RTL8366RB_TABLE_VLAN_READ_CTRL		0x0E01</div><div class='add'>+#define RTL8366RB_TABLE_VLAN_WRITE_CTRL		0x0F01</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_VLAN_MC_BASE(_x)		(0x0020 + (_x) * 3)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_LINK_STATUS_BASE		0x0014</div><div class='add'>+#define RTL8366RB_PORT_STATUS_SPEED_MASK	0x0003</div><div class='add'>+#define RTL8366RB_PORT_STATUS_DUPLEX_MASK	0x0004</div><div class='add'>+#define RTL8366RB_PORT_STATUS_LINK_MASK		0x0010</div><div class='add'>+#define RTL8366RB_PORT_STATUS_TXPAUSE_MASK	0x0020</div><div class='add'>+#define RTL8366RB_PORT_STATUS_RXPAUSE_MASK	0x0040</div><div class='add'>+#define RTL8366RB_PORT_STATUS_AN_MASK		0x0080</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_NUM_VLANS		16</div><div class='add'>+#define RTL8366RB_NUM_VIDS		4096</div><div class='add'>+#define RTL8366RB_PRIORITYMAX		7</div><div class='add'>+#define RTL8366RB_NUM_FIDS		8</div><div class='add'>+#define RTL8366RB_FIDMAX		7</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_1		BIT(0) /* In userspace port 0 */</div><div class='add'>+#define RTL8366RB_PORT_2		BIT(1) /* In userspace port 1 */</div><div class='add'>+#define RTL8366RB_PORT_3		BIT(2) /* In userspace port 2 */</div><div class='add'>+#define RTL8366RB_PORT_4		BIT(3) /* In userspace port 3 */</div><div class='add'>+#define RTL8366RB_PORT_5		BIT(4) /* In userspace port 4 */</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_CPU		BIT(5) /* CPU port */</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_ALL		(RTL8366RB_PORT_1 |	\</div><div class='add'>+					 RTL8366RB_PORT_2 |	\</div><div class='add'>+					 RTL8366RB_PORT_3 |	\</div><div class='add'>+					 RTL8366RB_PORT_4 |	\</div><div class='add'>+					 RTL8366RB_PORT_5 |	\</div><div class='add'>+					 RTL8366RB_PORT_CPU)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_ALL_BUT_CPU	(RTL8366RB_PORT_1 |	\</div><div class='add'>+					 RTL8366RB_PORT_2 |	\</div><div class='add'>+					 RTL8366RB_PORT_3 |	\</div><div class='add'>+					 RTL8366RB_PORT_4 |	\</div><div class='add'>+					 RTL8366RB_PORT_5)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_ALL_EXTERNAL	(RTL8366RB_PORT_1 |	\</div><div class='add'>+					 RTL8366RB_PORT_2 |	\</div><div class='add'>+					 RTL8366RB_PORT_3 |	\</div><div class='add'>+					 RTL8366RB_PORT_4)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_ALL_INTERNAL	 RTL8366RB_PORT_CPU</div><div class='add'>+</div><div class='add'>+/* First configuration word per member config, VID and prio */</div><div class='add'>+#define RTL8366RB_VLAN_VID_MASK		0xfff</div><div class='add'>+#define RTL8366RB_VLAN_PRIORITY_SHIFT	12</div><div class='add'>+#define RTL8366RB_VLAN_PRIORITY_MASK	0x7</div><div class='add'>+/* Second configuration word per member config, member and untagged */</div><div class='add'>+#define RTL8366RB_VLAN_UNTAG_SHIFT	8</div><div class='add'>+#define RTL8366RB_VLAN_UNTAG_MASK	0xff</div><div class='add'>+#define RTL8366RB_VLAN_MEMBER_MASK	0xff</div><div class='add'>+/* Third config word per member config, STAG currently unused */</div><div class='add'>+#define RTL8366RB_VLAN_STAG_MBR_MASK	0xff</div><div class='add'>+#define RTL8366RB_VLAN_STAG_MBR_SHIFT	8</div><div class='add'>+#define RTL8366RB_VLAN_STAG_IDX_MASK	0x7</div><div class='add'>+#define RTL8366RB_VLAN_STAG_IDX_SHIFT	5</div><div class='add'>+#define RTL8366RB_VLAN_FID_MASK		0x7</div><div class='add'>+</div><div class='add'>+/* Port ingress bandwidth control */</div><div class='add'>+#define RTL8366RB_IB_BASE		0x0200</div><div class='add'>+#define RTL8366RB_IB_REG(pnum)		(RTL8366RB_IB_BASE + (pnum))</div><div class='add'>+#define RTL8366RB_IB_BDTH_MASK		0x3fff</div><div class='add'>+#define RTL8366RB_IB_PREIFG		BIT(14)</div><div class='add'>+</div><div class='add'>+/* Port egress bandwidth control */</div><div class='add'>+#define RTL8366RB_EB_BASE		0x02d1</div><div class='add'>+#define RTL8366RB_EB_REG(pnum)		(RTL8366RB_EB_BASE + (pnum))</div><div class='add'>+#define RTL8366RB_EB_BDTH_MASK		0x3fff</div><div class='add'>+#define RTL8366RB_EB_PREIFG_REG		0x02f8</div><div class='add'>+#define RTL8366RB_EB_PREIFG		BIT(9)</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_BDTH_SW_MAX		1048512 /* 1048576? */</div><div class='add'>+#define RTL8366RB_BDTH_UNIT		64</div><div class='add'>+#define RTL8366RB_BDTH_REG_DEFAULT	16383</div><div class='add'>+</div><div class='add'>+/* QOS */</div><div class='add'>+#define RTL8366RB_QOS			BIT(15)</div><div class='add'>+/* Include/Exclude Preamble and IFG (20 bytes). 0:Exclude, 1:Include. */</div><div class='add'>+#define RTL8366RB_QOS_DEFAULT_PREIFG	1</div><div class='add'>+</div><div class='add'>+/* Interrupt handling */</div><div class='add'>+#define RTL8366RB_INTERRUPT_CONTROL_REG	0x0440</div><div class='add'>+#define RTL8366RB_INTERRUPT_POLARITY	BIT(0)</div><div class='add'>+#define RTL8366RB_P4_RGMII_LED		BIT(2)</div><div class='add'>+#define RTL8366RB_INTERRUPT_MASK_REG	0x0441</div><div class='add'>+#define RTL8366RB_INTERRUPT_LINK_CHGALL	GENMASK(11, 0)</div><div class='add'>+#define RTL8366RB_INTERRUPT_ACLEXCEED	BIT(8)</div><div class='add'>+#define RTL8366RB_INTERRUPT_STORMEXCEED	BIT(9)</div><div class='add'>+#define RTL8366RB_INTERRUPT_P4_FIBER	BIT(12)</div><div class='add'>+#define RTL8366RB_INTERRUPT_P4_UTP	BIT(13)</div><div class='add'>+#define RTL8366RB_INTERRUPT_VALID	(RTL8366RB_INTERRUPT_LINK_CHGALL | \</div><div class='add'>+					 RTL8366RB_INTERRUPT_ACLEXCEED | \</div><div class='add'>+					 RTL8366RB_INTERRUPT_STORMEXCEED | \</div><div class='add'>+					 RTL8366RB_INTERRUPT_P4_FIBER | \</div><div class='add'>+					 RTL8366RB_INTERRUPT_P4_UTP)</div><div class='add'>+#define RTL8366RB_INTERRUPT_STATUS_REG	0x0442</div><div class='add'>+#define RTL8366RB_NUM_INTERRUPT		14 /* 0..13 */</div><div class='add'>+</div><div class='add'>+/* Port isolation registers */</div><div class='add'>+#define RTL8366RB_PORT_ISO_BASE		0x0F08</div><div class='add'>+#define RTL8366RB_PORT_ISO(pnum)	(RTL8366RB_PORT_ISO_BASE + (pnum))</div><div class='add'>+#define RTL8366RB_PORT_ISO_EN		BIT(0)</div><div class='add'>+#define RTL8366RB_PORT_ISO_PORTS_MASK	GENMASK(7, 1)</div><div class='add'>+#define RTL8366RB_PORT_ISO_PORTS(pmask)	((pmask) &lt;&lt; 1)</div><div class='add'>+</div><div class='add'>+/* bits 0..5 enable force when cleared */</div><div class='add'>+#define RTL8366RB_MAC_FORCE_CTRL_REG	0x0F11</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_OAM_PARSER_REG	0x0F14</div><div class='add'>+#define RTL8366RB_OAM_MULTIPLEXER_REG	0x0F15</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_GREEN_FEATURE_REG	0x0F51</div><div class='add'>+#define RTL8366RB_GREEN_FEATURE_MSK	0x0007</div><div class='add'>+#define RTL8366RB_GREEN_FEATURE_TX	BIT(0)</div><div class='add'>+#define RTL8366RB_GREEN_FEATURE_RX	BIT(2)</div><div class='add'>+</div><div class='add'>+static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {</div><div class='add'>+	{ 0,  0, 4, "IfInOctets"				},</div><div class='add'>+	{ 0,  4, 4, "EtherStatsOctets"				},</div><div class='add'>+	{ 0,  8, 2, "EtherStatsUnderSizePkts"			},</div><div class='add'>+	{ 0, 10, 2, "EtherFragments"				},</div><div class='add'>+	{ 0, 12, 2, "EtherStatsPkts64Octets"			},</div><div class='add'>+	{ 0, 14, 2, "EtherStatsPkts65to127Octets"		},</div><div class='add'>+	{ 0, 16, 2, "EtherStatsPkts128to255Octets"		},</div><div class='add'>+	{ 0, 18, 2, "EtherStatsPkts256to511Octets"		},</div><div class='add'>+	{ 0, 20, 2, "EtherStatsPkts512to1023Octets"		},</div><div class='add'>+	{ 0, 22, 2, "EtherStatsPkts1024to1518Octets"		},</div><div class='add'>+	{ 0, 24, 2, "EtherOversizeStats"			},</div><div class='add'>+	{ 0, 26, 2, "EtherStatsJabbers"				},</div><div class='add'>+	{ 0, 28, 2, "IfInUcastPkts"				},</div><div class='add'>+	{ 0, 30, 2, "EtherStatsMulticastPkts"			},</div><div class='add'>+	{ 0, 32, 2, "EtherStatsBroadcastPkts"			},</div><div class='add'>+	{ 0, 34, 2, "EtherStatsDropEvents"			},</div><div class='add'>+	{ 0, 36, 2, "Dot3StatsFCSErrors"			},</div><div class='add'>+	{ 0, 38, 2, "Dot3StatsSymbolErrors"			},</div><div class='add'>+	{ 0, 40, 2, "Dot3InPauseFrames"				},</div><div class='add'>+	{ 0, 42, 2, "Dot3ControlInUnknownOpcodes"		},</div><div class='add'>+	{ 0, 44, 4, "IfOutOctets"				},</div><div class='add'>+	{ 0, 48, 2, "Dot3StatsSingleCollisionFrames"		},</div><div class='add'>+	{ 0, 50, 2, "Dot3StatMultipleCollisionFrames"		},</div><div class='add'>+	{ 0, 52, 2, "Dot3sDeferredTransmissions"		},</div><div class='add'>+	{ 0, 54, 2, "Dot3StatsLateCollisions"			},</div><div class='add'>+	{ 0, 56, 2, "EtherStatsCollisions"			},</div><div class='add'>+	{ 0, 58, 2, "Dot3StatsExcessiveCollisions"		},</div><div class='add'>+	{ 0, 60, 2, "Dot3OutPauseFrames"			},</div><div class='add'>+	{ 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"	},</div><div class='add'>+	{ 0, 64, 2, "Dot1dTpPortInDiscards"			},</div><div class='add'>+	{ 0, 66, 2, "IfOutUcastPkts"				},</div><div class='add'>+	{ 0, 68, 2, "IfOutMulticastPkts"			},</div><div class='add'>+	{ 0, 70, 2, "IfOutBroadcastPkts"			},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_get_mib_counter(struct realtek_priv *priv,</div><div class='add'>+				     int port,</div><div class='add'>+				     struct rtl8366_mib_counter *mib,</div><div class='add'>+				     u64 *mibvalue)</div><div class='add'>+{</div><div class='add'>+	u32 addr, val;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	addr = RTL8366RB_MIB_COUNTER_BASE +</div><div class='add'>+		RTL8366RB_MIB_COUNTER_PORT_OFFSET * (port) +</div><div class='add'>+		mib-&gt;offset;</div><div class='add'>+</div><div class='add'>+	/* Writing access counter address first</div><div class='add'>+	 * then ASIC will prepare 64bits counter wait for being retrived</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, addr, 0); /* Write whatever */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Read MIB control register */</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_MIB_CTRL_REG, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	if (val &amp; RTL8366RB_MIB_CTRL_BUSY_MASK)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (val &amp; RTL8366RB_MIB_CTRL_RESET_MASK)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* Read each individual MIB 16 bits at the time */</div><div class='add'>+	*mibvalue = 0;</div><div class='add'>+	for (i = mib-&gt;length; i &gt; 0; i--) {</div><div class='add'>+		ret = regmap_read(priv-&gt;map, addr + (i - 1), &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		*mibvalue = (*mibvalue &lt;&lt; 16) | (val &amp; 0xFFFF);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 rtl8366rb_get_irqmask(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	int line = irqd_to_hwirq(d);</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* For line interrupts we combine link down in bits</div><div class='add'>+	 * 6..11 with link up in bits 0..5 into one interrupt.</div><div class='add'>+	 */</div><div class='add'>+	if (line &lt; 12)</div><div class='add'>+		val = BIT(line) | BIT(line + 6);</div><div class='add'>+	else</div><div class='add'>+		val = BIT(line);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8366rb_mask_irq(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = irq_data_get_irq_chip_data(d);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_INTERRUPT_MASK_REG,</div><div class='add'>+				 rtl8366rb_get_irqmask(d), 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "could not mask IRQ\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8366rb_unmask_irq(struct irq_data *d)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = irq_data_get_irq_chip_data(d);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_INTERRUPT_MASK_REG,</div><div class='add'>+				 rtl8366rb_get_irqmask(d),</div><div class='add'>+				 rtl8366rb_get_irqmask(d));</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(priv-&gt;dev, "could not unmask IRQ\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t rtl8366rb_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = data;</div><div class='add'>+	u32 stat;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* This clears the IRQ status register */</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_INTERRUPT_STATUS_REG,</div><div class='add'>+			  &amp;stat);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "can't read interrupt status\n");</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+	stat &amp;= RTL8366RB_INTERRUPT_VALID;</div><div class='add'>+	if (!stat)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	while (stat) {</div><div class='add'>+		int line = __ffs(stat);</div><div class='add'>+		int child_irq;</div><div class='add'>+</div><div class='add'>+		stat &amp;= ~BIT(line);</div><div class='add'>+		/* For line interrupts we combine link down in bits</div><div class='add'>+		 * 6..11 with link up in bits 0..5 into one interrupt.</div><div class='add'>+		 */</div><div class='add'>+		if (line &lt; 12 &amp;&amp; line &gt; 5)</div><div class='add'>+			line -= 5;</div><div class='add'>+		child_irq = irq_find_mapping(priv-&gt;irqdomain, line);</div><div class='add'>+		handle_nested_irq(child_irq);</div><div class='add'>+	}</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct irq_chip rtl8366rb_irq_chip = {</div><div class='add'>+	.name = "RTL8366RB",</div><div class='add'>+	.irq_mask = rtl8366rb_mask_irq,</div><div class='add'>+	.irq_unmask = rtl8366rb_unmask_irq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_irq_map(struct irq_domain *domain, unsigned int irq,</div><div class='add'>+			     irq_hw_number_t hwirq)</div><div class='add'>+{</div><div class='add'>+	irq_set_chip_data(irq, domain-&gt;host_data);</div><div class='add'>+	irq_set_chip_and_handler(irq, &amp;rtl8366rb_irq_chip, handle_simple_irq);</div><div class='add'>+	irq_set_nested_thread(irq, 1);</div><div class='add'>+	irq_set_noprobe(irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8366rb_irq_unmap(struct irq_domain *d, unsigned int irq)</div><div class='add'>+{</div><div class='add'>+	irq_set_nested_thread(irq, 0);</div><div class='add'>+	irq_set_chip_and_handler(irq, NULL, NULL);</div><div class='add'>+	irq_set_chip_data(irq, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct irq_domain_ops rtl8366rb_irqdomain_ops = {</div><div class='add'>+	.map = rtl8366rb_irq_map,</div><div class='add'>+	.unmap = rtl8366rb_irq_unmap,</div><div class='add'>+	.xlate  = irq_domain_xlate_onecell,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_setup_cascaded_irq(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device_node *intc;</div><div class='add'>+	unsigned long irq_trig;</div><div class='add'>+	int irq;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	intc = of_get_child_by_name(priv-&gt;dev-&gt;of_node, "interrupt-controller");</div><div class='add'>+	if (!intc) {</div><div class='add'>+		dev_err(priv-&gt;dev, "missing child interrupt-controller node\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	/* RB8366RB IRQs cascade off this one */</div><div class='add'>+	irq = of_irq_get(intc, 0);</div><div class='add'>+	if (irq &lt;= 0) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to get parent IRQ\n");</div><div class='add'>+		ret = irq ? irq : -EINVAL;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* This clears the IRQ status register */</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_INTERRUPT_STATUS_REG,</div><div class='add'>+			  &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "can't read interrupt status\n");</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fetch IRQ edge information from the descriptor */</div><div class='add'>+	irq_trig = irq_get_trigger_type(irq);</div><div class='add'>+	switch (irq_trig) {</div><div class='add'>+	case IRQF_TRIGGER_RISING:</div><div class='add'>+	case IRQF_TRIGGER_HIGH:</div><div class='add'>+		dev_info(priv-&gt;dev, "active high/rising IRQ\n");</div><div class='add'>+		val = 0;</div><div class='add'>+		break;</div><div class='add'>+	case IRQF_TRIGGER_FALLING:</div><div class='add'>+	case IRQF_TRIGGER_LOW:</div><div class='add'>+		dev_info(priv-&gt;dev, "active low/falling IRQ\n");</div><div class='add'>+		val = RTL8366RB_INTERRUPT_POLARITY;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_INTERRUPT_CONTROL_REG,</div><div class='add'>+				 RTL8366RB_INTERRUPT_POLARITY,</div><div class='add'>+				 val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "could not configure IRQ polarity\n");</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = devm_request_threaded_irq(priv-&gt;dev, irq, NULL,</div><div class='add'>+					rtl8366rb_irq, IRQF_ONESHOT,</div><div class='add'>+					"RTL8366RB", priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "unable to request irq: %d\n", ret);</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+	priv-&gt;irqdomain = irq_domain_create_linear(of_fwnode_handle(intc), RTL8366RB_NUM_INTERRUPT,</div><div class='add'>+						   &amp;rtl8366rb_irqdomain_ops, priv);</div><div class='add'>+	if (!priv-&gt;irqdomain) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to create IRQ domain\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out_put_node;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_ports; i++)</div><div class='add'>+		irq_set_parent(irq_create_mapping(priv-&gt;irqdomain, i), irq);</div><div class='add'>+</div><div class='add'>+out_put_node:</div><div class='add'>+	of_node_put(intc);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_set_addr(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	eth_random_addr(addr);</div><div class='add'>+</div><div class='add'>+	dev_info(priv-&gt;dev, "set MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='add'>+		 addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);</div><div class='add'>+	val = addr[0] &lt;&lt; 8 | addr[1];</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_SMAR0, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	val = addr[2] &lt;&lt; 8 | addr[3];</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_SMAR1, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	val = addr[4] &lt;&lt; 8 | addr[5];</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_SMAR2, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Found in a vendor driver */</div><div class='add'>+</div><div class='add'>+/* Struct for handling the jam tables' entries */</div><div class='add'>+struct rtl8366rb_jam_tbl_entry {</div><div class='add'>+	u16 reg;</div><div class='add'>+	u16 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* For the "version 0" early silicon, appear in most source releases */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_init_jam_ver_0[] = {</div><div class='add'>+	{0x000B, 0x0001}, {0x03A6, 0x0100}, {0x03A7, 0x0001}, {0x02D1, 0x3FFF},</div><div class='add'>+	{0x02D2, 0x3FFF}, {0x02D3, 0x3FFF}, {0x02D4, 0x3FFF}, {0x02D5, 0x3FFF},</div><div class='add'>+	{0x02D6, 0x3FFF}, {0x02D7, 0x3FFF}, {0x02D8, 0x3FFF}, {0x022B, 0x0688},</div><div class='add'>+	{0x022C, 0x0FAC}, {0x03D0, 0x4688}, {0x03D1, 0x01F5}, {0x0000, 0x0830},</div><div class='add'>+	{0x02F9, 0x0200}, {0x02F7, 0x7FFF}, {0x02F8, 0x03FF}, {0x0080, 0x03E8},</div><div class='add'>+	{0x0081, 0x00CE}, {0x0082, 0x00DA}, {0x0083, 0x0230}, {0xBE0F, 0x2000},</div><div class='add'>+	{0x0231, 0x422A}, {0x0232, 0x422A}, {0x0233, 0x422A}, {0x0234, 0x422A},</div><div class='add'>+	{0x0235, 0x422A}, {0x0236, 0x422A}, {0x0237, 0x422A}, {0x0238, 0x422A},</div><div class='add'>+	{0x0239, 0x422A}, {0x023A, 0x422A}, {0x023B, 0x422A}, {0x023C, 0x422A},</div><div class='add'>+	{0x023D, 0x422A}, {0x023E, 0x422A}, {0x023F, 0x422A}, {0x0240, 0x422A},</div><div class='add'>+	{0x0241, 0x422A}, {0x0242, 0x422A}, {0x0243, 0x422A}, {0x0244, 0x422A},</div><div class='add'>+	{0x0245, 0x422A}, {0x0246, 0x422A}, {0x0247, 0x422A}, {0x0248, 0x422A},</div><div class='add'>+	{0x0249, 0x0146}, {0x024A, 0x0146}, {0x024B, 0x0146}, {0xBE03, 0xC961},</div><div class='add'>+	{0x024D, 0x0146}, {0x024E, 0x0146}, {0x024F, 0x0146}, {0x0250, 0x0146},</div><div class='add'>+	{0xBE64, 0x0226}, {0x0252, 0x0146}, {0x0253, 0x0146}, {0x024C, 0x0146},</div><div class='add'>+	{0x0251, 0x0146}, {0x0254, 0x0146}, {0xBE62, 0x3FD0}, {0x0084, 0x0320},</div><div class='add'>+	{0x0255, 0x0146}, {0x0256, 0x0146}, {0x0257, 0x0146}, {0x0258, 0x0146},</div><div class='add'>+	{0x0259, 0x0146}, {0x025A, 0x0146}, {0x025B, 0x0146}, {0x025C, 0x0146},</div><div class='add'>+	{0x025D, 0x0146}, {0x025E, 0x0146}, {0x025F, 0x0146}, {0x0260, 0x0146},</div><div class='add'>+	{0x0261, 0xA23F}, {0x0262, 0x0294}, {0x0263, 0xA23F}, {0x0264, 0x0294},</div><div class='add'>+	{0x0265, 0xA23F}, {0x0266, 0x0294}, {0x0267, 0xA23F}, {0x0268, 0x0294},</div><div class='add'>+	{0x0269, 0xA23F}, {0x026A, 0x0294}, {0x026B, 0xA23F}, {0x026C, 0x0294},</div><div class='add'>+	{0x026D, 0xA23F}, {0x026E, 0x0294}, {0x026F, 0xA23F}, {0x0270, 0x0294},</div><div class='add'>+	{0x02F5, 0x0048}, {0xBE09, 0x0E00}, {0xBE1E, 0x0FA0}, {0xBE14, 0x8448},</div><div class='add'>+	{0xBE15, 0x1007}, {0xBE4A, 0xA284}, {0xC454, 0x3F0B}, {0xC474, 0x3F0B},</div><div class='add'>+	{0xBE48, 0x3672}, {0xBE4B, 0x17A7}, {0xBE4C, 0x0B15}, {0xBE52, 0x0EDD},</div><div class='add'>+	{0xBE49, 0x8C00}, {0xBE5B, 0x785C}, {0xBE5C, 0x785C}, {0xBE5D, 0x785C},</div><div class='add'>+	{0xBE61, 0x368A}, {0xBE63, 0x9B84}, {0xC456, 0xCC13}, {0xC476, 0xCC13},</div><div class='add'>+	{0xBE65, 0x307D}, {0xBE6D, 0x0005}, {0xBE6E, 0xE120}, {0xBE2E, 0x7BAF},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This v1 init sequence is from Belkin F5D8235 U-Boot release */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_init_jam_ver_1[] = {</div><div class='add'>+	{0x0000, 0x0830}, {0x0001, 0x8000}, {0x0400, 0x8130}, {0xBE78, 0x3C3C},</div><div class='add'>+	{0x0431, 0x5432}, {0xBE37, 0x0CE4}, {0x02FA, 0xFFDF}, {0x02FB, 0xFFE0},</div><div class='add'>+	{0xC44C, 0x1585}, {0xC44C, 0x1185}, {0xC44C, 0x1585}, {0xC46C, 0x1585},</div><div class='add'>+	{0xC46C, 0x1185}, {0xC46C, 0x1585}, {0xC451, 0x2135}, {0xC471, 0x2135},</div><div class='add'>+	{0xBE10, 0x8140}, {0xBE15, 0x0007}, {0xBE6E, 0xE120}, {0xBE69, 0xD20F},</div><div class='add'>+	{0xBE6B, 0x0320}, {0xBE24, 0xB000}, {0xBE23, 0xFF51}, {0xBE22, 0xDF20},</div><div class='add'>+	{0xBE21, 0x0140}, {0xBE20, 0x00BB}, {0xBE24, 0xB800}, {0xBE24, 0x0000},</div><div class='add'>+	{0xBE24, 0x7000}, {0xBE23, 0xFF51}, {0xBE22, 0xDF60}, {0xBE21, 0x0140},</div><div class='add'>+	{0xBE20, 0x0077}, {0xBE24, 0x7800}, {0xBE24, 0x0000}, {0xBE2E, 0x7B7A},</div><div class='add'>+	{0xBE36, 0x0CE4}, {0x02F5, 0x0048}, {0xBE77, 0x2940}, {0x000A, 0x83E0},</div><div class='add'>+	{0xBE79, 0x3C3C}, {0xBE00, 0x1340},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This v2 init sequence is from Belkin F5D8235 U-Boot release */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_init_jam_ver_2[] = {</div><div class='add'>+	{0x0450, 0x0000}, {0x0400, 0x8130}, {0x000A, 0x83ED}, {0x0431, 0x5432},</div><div class='add'>+	{0xC44F, 0x6250}, {0xC46F, 0x6250}, {0xC456, 0x0C14}, {0xC476, 0x0C14},</div><div class='add'>+	{0xC44C, 0x1C85}, {0xC44C, 0x1885}, {0xC44C, 0x1C85}, {0xC46C, 0x1C85},</div><div class='add'>+	{0xC46C, 0x1885}, {0xC46C, 0x1C85}, {0xC44C, 0x0885}, {0xC44C, 0x0881},</div><div class='add'>+	{0xC44C, 0x0885}, {0xC46C, 0x0885}, {0xC46C, 0x0881}, {0xC46C, 0x0885},</div><div class='add'>+	{0xBE2E, 0x7BA7}, {0xBE36, 0x1000}, {0xBE37, 0x1000}, {0x8000, 0x0001},</div><div class='add'>+	{0xBE69, 0xD50F}, {0x8000, 0x0000}, {0xBE69, 0xD50F}, {0xBE6E, 0x0320},</div><div class='add'>+	{0xBE77, 0x2940}, {0xBE78, 0x3C3C}, {0xBE79, 0x3C3C}, {0xBE6E, 0xE120},</div><div class='add'>+	{0x8000, 0x0001}, {0xBE15, 0x1007}, {0x8000, 0x0000}, {0xBE15, 0x1007},</div><div class='add'>+	{0xBE14, 0x0448}, {0xBE1E, 0x00A0}, {0xBE10, 0x8160}, {0xBE10, 0x8140},</div><div class='add'>+	{0xBE00, 0x1340}, {0x0F51, 0x0010},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Appears in a DDWRT code dump */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_init_jam_ver_3[] = {</div><div class='add'>+	{0x0000, 0x0830}, {0x0400, 0x8130}, {0x000A, 0x83ED}, {0x0431, 0x5432},</div><div class='add'>+	{0x0F51, 0x0017}, {0x02F5, 0x0048}, {0x02FA, 0xFFDF}, {0x02FB, 0xFFE0},</div><div class='add'>+	{0xC456, 0x0C14}, {0xC476, 0x0C14}, {0xC454, 0x3F8B}, {0xC474, 0x3F8B},</div><div class='add'>+	{0xC450, 0x2071}, {0xC470, 0x2071}, {0xC451, 0x226B}, {0xC471, 0x226B},</div><div class='add'>+	{0xC452, 0xA293}, {0xC472, 0xA293}, {0xC44C, 0x1585}, {0xC44C, 0x1185},</div><div class='add'>+	{0xC44C, 0x1585}, {0xC46C, 0x1585}, {0xC46C, 0x1185}, {0xC46C, 0x1585},</div><div class='add'>+	{0xC44C, 0x0185}, {0xC44C, 0x0181}, {0xC44C, 0x0185}, {0xC46C, 0x0185},</div><div class='add'>+	{0xC46C, 0x0181}, {0xC46C, 0x0185}, {0xBE24, 0xB000}, {0xBE23, 0xFF51},</div><div class='add'>+	{0xBE22, 0xDF20}, {0xBE21, 0x0140}, {0xBE20, 0x00BB}, {0xBE24, 0xB800},</div><div class='add'>+	{0xBE24, 0x0000}, {0xBE24, 0x7000}, {0xBE23, 0xFF51}, {0xBE22, 0xDF60},</div><div class='add'>+	{0xBE21, 0x0140}, {0xBE20, 0x0077}, {0xBE24, 0x7800}, {0xBE24, 0x0000},</div><div class='add'>+	{0xBE2E, 0x7BA7}, {0xBE36, 0x1000}, {0xBE37, 0x1000}, {0x8000, 0x0001},</div><div class='add'>+	{0xBE69, 0xD50F}, {0x8000, 0x0000}, {0xBE69, 0xD50F}, {0xBE6B, 0x0320},</div><div class='add'>+	{0xBE77, 0x2800}, {0xBE78, 0x3C3C}, {0xBE79, 0x3C3C}, {0xBE6E, 0xE120},</div><div class='add'>+	{0x8000, 0x0001}, {0xBE10, 0x8140}, {0x8000, 0x0000}, {0xBE10, 0x8140},</div><div class='add'>+	{0xBE15, 0x1007}, {0xBE14, 0x0448}, {0xBE1E, 0x00A0}, {0xBE10, 0x8160},</div><div class='add'>+	{0xBE10, 0x8140}, {0xBE00, 0x1340}, {0x0450, 0x0000}, {0x0401, 0x0000},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Belkin F5D8235 v1, "belkin,f5d8235-v1" */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_init_jam_f5d8235[] = {</div><div class='add'>+	{0x0242, 0x02BF}, {0x0245, 0x02BF}, {0x0248, 0x02BF}, {0x024B, 0x02BF},</div><div class='add'>+	{0x024E, 0x02BF}, {0x0251, 0x02BF}, {0x0254, 0x0A3F}, {0x0256, 0x0A3F},</div><div class='add'>+	{0x0258, 0x0A3F}, {0x025A, 0x0A3F}, {0x025C, 0x0A3F}, {0x025E, 0x0A3F},</div><div class='add'>+	{0x0263, 0x007C}, {0x0100, 0x0004}, {0xBE5B, 0x3500}, {0x800E, 0x200F},</div><div class='add'>+	{0xBE1D, 0x0F00}, {0x8001, 0x5011}, {0x800A, 0xA2F4}, {0x800B, 0x17A3},</div><div class='add'>+	{0xBE4B, 0x17A3}, {0xBE41, 0x5011}, {0xBE17, 0x2100}, {0x8000, 0x8304},</div><div class='add'>+	{0xBE40, 0x8304}, {0xBE4A, 0xA2F4}, {0x800C, 0xA8D5}, {0x8014, 0x5500},</div><div class='add'>+	{0x8015, 0x0004}, {0xBE4C, 0xA8D5}, {0xBE59, 0x0008}, {0xBE09, 0x0E00},</div><div class='add'>+	{0xBE36, 0x1036}, {0xBE37, 0x1036}, {0x800D, 0x00FF}, {0xBE4D, 0x00FF},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DGN3500, "netgear,dgn3500", "netgear,dgn3500b" */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_init_jam_dgn3500[] = {</div><div class='add'>+	{0x0000, 0x0830}, {0x0400, 0x8130}, {0x000A, 0x83ED}, {0x0F51, 0x0017},</div><div class='add'>+	{0x02F5, 0x0048}, {0x02FA, 0xFFDF}, {0x02FB, 0xFFE0}, {0x0450, 0x0000},</div><div class='add'>+	{0x0401, 0x0000}, {0x0431, 0x0960},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This jam table activates "green ethernet", which means low power mode</div><div class='add'>+ * and is claimed to detect the cable length and not use more power than</div><div class='add'>+ * necessary, and the ports should enter power saving mode 10 seconds after</div><div class='add'>+ * a cable is disconnected. Seems to always be the same.</div><div class='add'>+ */</div><div class='add'>+static const struct rtl8366rb_jam_tbl_entry rtl8366rb_green_jam[] = {</div><div class='add'>+	{0xBE78, 0x323C}, {0xBE77, 0x5000}, {0xBE2E, 0x7BA7},</div><div class='add'>+	{0xBE59, 0x3459}, {0xBE5A, 0x745A}, {0xBE5B, 0x785C},</div><div class='add'>+	{0xBE5C, 0x785C}, {0xBE6E, 0xE120}, {0xBE79, 0x323C},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Function that jams the tables in the proper registers */</div><div class='add'>+static int rtl8366rb_jam_table(const struct rtl8366rb_jam_tbl_entry *jam_table,</div><div class='add'>+			       int jam_size, struct realtek_priv *priv,</div><div class='add'>+			       bool write_dbg)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; jam_size; i++) {</div><div class='add'>+		if ((jam_table[i].reg &amp; 0xBE00) == 0xBE00) {</div><div class='add'>+			ret = regmap_read(priv-&gt;map,</div><div class='add'>+					  RTL8366RB_PHY_ACCESS_BUSY_REG,</div><div class='add'>+					  &amp;val);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			if (!(val &amp; RTL8366RB_PHY_INT_BUSY)) {</div><div class='add'>+				ret = regmap_write(priv-&gt;map,</div><div class='add'>+						   RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='add'>+						   RTL8366RB_PHY_CTRL_WRITE);</div><div class='add'>+				if (ret)</div><div class='add'>+					return ret;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (write_dbg)</div><div class='add'>+			dev_dbg(priv-&gt;dev, "jam %04x into register %04x\n",</div><div class='add'>+				jam_table[i].val,</div><div class='add'>+				jam_table[i].reg);</div><div class='add'>+		ret = regmap_write(priv-&gt;map,</div><div class='add'>+				   jam_table[i].reg,</div><div class='add'>+				   jam_table[i].val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This code is used also with LEDs disabled */</div><div class='add'>+int rb8366rb_set_ledgroup_mode(struct realtek_priv *priv,</div><div class='add'>+			       u8 led_group,</div><div class='add'>+			       enum rtl8366_ledgroup_mode mode)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = mode &lt;&lt; RTL8366RB_LED_CTRL_OFFSET(led_group);</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map,</div><div class='add'>+				 RTL8366RB_LED_CTRL_REG,</div><div class='add'>+				 RTL8366RB_LED_CTRL_MASK(led_group),</div><div class='add'>+				 val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This code is used also with LEDs disabled */</div><div class='add'>+static int rtl8366rb_setup_all_leds_off(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;map,</div><div class='add'>+			   RTL8366RB_INTERRUPT_CONTROL_REG,</div><div class='add'>+			   RTL8366RB_P4_RGMII_LED,</div><div class='add'>+			   0);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_NUM_LEDGROUPS; i++) {</div><div class='add'>+		ret = rb8366rb_set_ledgroup_mode(priv, i,</div><div class='add'>+						 RTL8366RB_LEDGROUP_OFF);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	const struct rtl8366rb_jam_tbl_entry *jam_table;</div><div class='add'>+	struct rtl8366rb *rb;</div><div class='add'>+	u32 chip_ver = 0;</div><div class='add'>+	u32 chip_id = 0;</div><div class='add'>+	int jam_size;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rb = priv-&gt;chip_data;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_CHIP_ID_REG, &amp;chip_id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "unable to read chip id\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (chip_id) {</div><div class='add'>+	case RTL8366RB_CHIP_ID_8366:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(priv-&gt;dev, "unknown chip id (%04x)\n", chip_id);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_CHIP_VERSION_CTRL_REG,</div><div class='add'>+			  &amp;chip_ver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "unable to read chip version\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(priv-&gt;dev, "RTL%04x ver %u chip found\n",</div><div class='add'>+		 chip_id, chip_ver &amp; RTL8366RB_CHIP_VERSION_MASK);</div><div class='add'>+</div><div class='add'>+	/* Do the init dance using the right jam table */</div><div class='add'>+	switch (chip_ver) {</div><div class='add'>+	case 0:</div><div class='add'>+		jam_table = rtl8366rb_init_jam_ver_0;</div><div class='add'>+		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_0);</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		jam_table = rtl8366rb_init_jam_ver_1;</div><div class='add'>+		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_1);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		jam_table = rtl8366rb_init_jam_ver_2;</div><div class='add'>+		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_2);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		jam_table = rtl8366rb_init_jam_ver_3;</div><div class='add'>+		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_3);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Special jam tables for special routers</div><div class='add'>+	 * TODO: are these necessary? Maintainers, please test</div><div class='add'>+	 * without them, using just the off-the-shelf tables.</div><div class='add'>+	 */</div><div class='add'>+	if (of_machine_is_compatible("belkin,f5d8235-v1")) {</div><div class='add'>+		jam_table = rtl8366rb_init_jam_f5d8235;</div><div class='add'>+		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_f5d8235);</div><div class='add'>+	}</div><div class='add'>+	if (of_machine_is_compatible("netgear,dgn3500") ||</div><div class='add'>+	    of_machine_is_compatible("netgear,dgn3500b")) {</div><div class='add'>+		jam_table = rtl8366rb_init_jam_dgn3500;</div><div class='add'>+		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_dgn3500);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtl8366rb_jam_table(jam_table, jam_size, priv, true);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Isolate all user ports so they can only send packets to itself and the CPU port */</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_PORT_NUM_CPU; i++) {</div><div class='add'>+		ret = regmap_write(priv-&gt;map, RTL8366RB_PORT_ISO(i),</div><div class='add'>+				   RTL8366RB_PORT_ISO_PORTS(BIT(RTL8366RB_PORT_NUM_CPU)) |</div><div class='add'>+				   RTL8366RB_PORT_ISO_EN);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+	/* CPU port can send packets to all ports */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_PORT_ISO(RTL8366RB_PORT_NUM_CPU),</div><div class='add'>+			   RTL8366RB_PORT_ISO_PORTS(dsa_user_ports(ds)) |</div><div class='add'>+			   RTL8366RB_PORT_ISO_EN);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set up the "green ethernet" feature */</div><div class='add'>+	ret = rtl8366rb_jam_table(rtl8366rb_green_jam,</div><div class='add'>+				  ARRAY_SIZE(rtl8366rb_green_jam), priv, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;map,</div><div class='add'>+			   RTL8366RB_GREEN_FEATURE_REG,</div><div class='add'>+			   (chip_ver == 1) ? 0x0007 : 0x0003);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Vendor driver sets 0x240 in registers 0xc and 0xd (undocumented) */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, 0x0c, 0x240);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(priv-&gt;map, 0x0d, 0x240);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set some random MAC address */</div><div class='add'>+	ret = rtl8366rb_set_addr(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Enable CPU port with custom DSA tag 8899.</div><div class='add'>+	 *</div><div class='add'>+	 * If you set RTL8366RB_CPU_NO_TAG (bit 15) in this register</div><div class='add'>+	 * the custom tag is turned off.</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_CPU_CTRL_REG,</div><div class='add'>+				 0xFFFF,</div><div class='add'>+				 BIT(priv-&gt;cpu_port));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Make sure we default-enable the fixed CPU port */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PECR,</div><div class='add'>+				 BIT(priv-&gt;cpu_port),</div><div class='add'>+				 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set default maximum packet length to 1536 bytes */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_SGCR,</div><div class='add'>+				 RTL8366RB_SGCR_MAX_LENGTH_MASK,</div><div class='add'>+				 RTL8366RB_SGCR_MAX_LENGTH_1536);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_NUM_PORTS; i++) {</div><div class='add'>+		if (i == priv-&gt;cpu_port)</div><div class='add'>+			/* CPU port need to also accept the tag */</div><div class='add'>+			rb-&gt;max_mtu[i] = ETH_DATA_LEN + RTL8366RB_CPU_TAG_SIZE;</div><div class='add'>+		else</div><div class='add'>+			rb-&gt;max_mtu[i] = ETH_DATA_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable learning for all ports */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_PORT_LEARNDIS_CTRL,</div><div class='add'>+			   RTL8366RB_PORT_ALL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Enable auto ageing for all ports */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_SECURITY_CTRL, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Port 4 setup: this enables Port 4, usually the WAN port,</div><div class='add'>+	 * common PHY IO mode is apparently mode 0, and this is not what</div><div class='add'>+	 * the port is initialized to. There is no explanation of the</div><div class='add'>+	 * IO modes in the Realtek source code, if your WAN port is</div><div class='add'>+	 * connected to something exotic such as fiber, then this might</div><div class='add'>+	 * be worth experimenting with.</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PMC0,</div><div class='add'>+				 RTL8366RB_PMC0_P4_IOMODE_MASK,</div><div class='add'>+				 0 &lt;&lt; RTL8366RB_PMC0_P4_IOMODE_SHIFT);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Accept all packets by default, we enable filtering on-demand */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_VLAN_INGRESS_CTRL1_REG,</div><div class='add'>+			   0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_VLAN_INGRESS_CTRL2_REG,</div><div class='add'>+			   0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Don't drop packets whose DA has not been learned */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_SSCR2,</div><div class='add'>+				 RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set blinking, used by all LED groups using HW triggers.</div><div class='add'>+	 * TODO: make this configurable</div><div class='add'>+	 */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_LED_BLINKRATE_REG,</div><div class='add'>+				 RTL8366RB_LED_BLINKRATE_MASK,</div><div class='add'>+				 RTL8366RB_LED_BLINKRATE_56MS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Set up LED activity:</div><div class='add'>+	 * Each port has 4 LEDs on fixed groups. Each group shares the same</div><div class='add'>+	 * hardware trigger across all ports. LEDs can only be indiviually</div><div class='add'>+	 * controlled setting the LED group to fixed mode and using the driver</div><div class='add'>+	 * to toggle them LEDs on/off.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;leds_disabled) {</div><div class='add'>+		ret = rtl8366rb_setup_all_leds_off(priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	} else {</div><div class='add'>+		ret = rtl8366rb_setup_leds(priv);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtl8366_reset_vlan(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = rtl8366rb_setup_cascaded_irq(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_info(priv-&gt;dev, "no interrupt support\n");</div><div class='add'>+</div><div class='add'>+	ret = rtl83xx_setup_user_mdio(ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "could not set up MDIO bus\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol rtl8366_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						      int port,</div><div class='add'>+						      enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	/* This switch uses the 4 byte protocol A Realtek DSA tag */</div><div class='add'>+	return DSA_TAG_PROTO_RTL4_A;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void rtl8366rb_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long *interfaces = config-&gt;supported_interfaces;</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (port == priv-&gt;cpu_port) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, interfaces);</div><div class='add'>+		/* REVMII only supports 100M FD */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVMII, interfaces);</div><div class='add'>+		/* RGMII only supports 1G FD */</div><div class='add'>+		phy_interface_set_rgmii(interfaces);</div><div class='add'>+</div><div class='add'>+		config-&gt;mac_capabilities = MAC_1000 | MAC_100 |</div><div class='add'>+					   MAC_SYM_PAUSE;</div><div class='add'>+	} else {</div><div class='add'>+		/* RSGMII port, but we don't have that, and we don't</div><div class='add'>+		 * specify in DT, so phylib uses the default of GMII</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, interfaces);</div><div class='add'>+		config-&gt;mac_capabilities = MAC_1000 | MAC_100 | MAC_10 |</div><div class='add'>+					   MAC_SYM_PAUSE | MAC_ASYM_PAUSE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+		     const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_mac_link_up(struct phylink_config *config, struct phy_device *phydev,</div><div class='add'>+		      unsigned int mode, phy_interface_t interface,</div><div class='add'>+		      int speed, int duplex, bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct realtek_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Allow forcing the mode on the fixed CPU port, no autonegotiation.</div><div class='add'>+	 * We assume autonegotiation works on the PHY-facing ports.</div><div class='add'>+	 */</div><div class='add'>+	if (port != priv-&gt;cpu_port)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "MAC link up on CPU port (%d)\n", port);</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_MAC_FORCE_CTRL_REG,</div><div class='add'>+				 BIT(port), BIT(port));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to force CPU port\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Conjure port config */</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		val = RTL8366RB_PAACR_SPEED_10M;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		val = RTL8366RB_PAACR_SPEED_100M;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		val = RTL8366RB_PAACR_SPEED_1000M;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		val = RTL8366RB_PAACR_SPEED_1000M;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		val |= RTL8366RB_PAACR_FULL_DUPLEX;</div><div class='add'>+</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		val |=  RTL8366RB_PAACR_TX_PAUSE;</div><div class='add'>+</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		val |= RTL8366RB_PAACR_RX_PAUSE;</div><div class='add'>+</div><div class='add'>+	val |= RTL8366RB_PAACR_LINK_UP;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PAACR2,</div><div class='add'>+				 0xFF00U,</div><div class='add'>+				 val &lt;&lt; 8);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to set PAACR on CPU port\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "set PAACR to %04x\n", val);</div><div class='add'>+</div><div class='add'>+	/* Enable the CPU port */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='add'>+				 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to enable the CPU port\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct realtek_priv *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (port != priv-&gt;cpu_port)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "MAC link down on CPU port (%d)\n", port);</div><div class='add'>+</div><div class='add'>+	/* Disable the CPU port */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='add'>+				 BIT(port));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "failed to disable the CPU port\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtl8366rb_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+		      struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "enable port %d\n", port);</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='add'>+				 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "disable port %d\n", port);</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='add'>+				 BIT(port));</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtl8366rb_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_bridge bridge,</div><div class='add'>+			   bool *tx_fwd_offload,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int port_bitmap = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* Loop over all other ports than the current one */</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_PORT_NUM_CPU; i++) {</div><div class='add'>+		/* Current port handled last */</div><div class='add'>+		if (i == port)</div><div class='add'>+			continue;</div><div class='add'>+		/* Not on this bridge */</div><div class='add'>+		if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='add'>+			continue;</div><div class='add'>+		/* Join this port to each other port on the bridge */</div><div class='add'>+		ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PORT_ISO(i),</div><div class='add'>+					 RTL8366RB_PORT_ISO_PORTS(BIT(port)),</div><div class='add'>+					 RTL8366RB_PORT_ISO_PORTS(BIT(port)));</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to join port %d\n", port);</div><div class='add'>+</div><div class='add'>+		port_bitmap |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the bits for the ports we can access */</div><div class='add'>+	return regmap_update_bits(priv-&gt;map, RTL8366RB_PORT_ISO(port),</div><div class='add'>+				  RTL8366RB_PORT_ISO_PORTS(port_bitmap),</div><div class='add'>+				  RTL8366RB_PORT_ISO_PORTS(port_bitmap));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int port_bitmap = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* Loop over all other ports than this one */</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_PORT_NUM_CPU; i++) {</div><div class='add'>+		/* Current port handled last */</div><div class='add'>+		if (i == port)</div><div class='add'>+			continue;</div><div class='add'>+		/* Not on this bridge */</div><div class='add'>+		if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='add'>+			continue;</div><div class='add'>+		/* Remove this port from any other port on the bridge */</div><div class='add'>+		ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PORT_ISO(i),</div><div class='add'>+					 RTL8366RB_PORT_ISO_PORTS(BIT(port)), 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			dev_err(priv-&gt;dev, "failed to leave port %d\n", port);</div><div class='add'>+</div><div class='add'>+		port_bitmap |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear the bits for the ports we can not access, leave ourselves */</div><div class='add'>+	regmap_update_bits(priv-&gt;map, RTL8366RB_PORT_ISO(port),</div><div class='add'>+			   RTL8366RB_PORT_ISO_PORTS(port_bitmap), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl8366rb_drop_untagged() - make the switch drop untagged and C-tagged frames</div><div class='add'>+ * @priv: SMI state container</div><div class='add'>+ * @port: the port to drop untagged and C-tagged frames on</div><div class='add'>+ * @drop: whether to drop or pass untagged and C-tagged frames</div><div class='add'>+ *</div><div class='add'>+ * Return: zero for success, a negative number on error.</div><div class='add'>+ */</div><div class='add'>+static int rtl8366rb_drop_untagged(struct realtek_priv *priv, int port, bool drop)</div><div class='add'>+{</div><div class='add'>+	return regmap_update_bits(priv-&gt;map, RTL8366RB_VLAN_INGRESS_CTRL1_REG,</div><div class='add'>+				  RTL8366RB_VLAN_INGRESS_CTRL1_DROP(port),</div><div class='add'>+				  drop ? RTL8366RB_VLAN_INGRESS_CTRL1_DROP(port) : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+				    bool vlan_filtering,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8366rb *rb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rb = priv-&gt;chip_data;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "port %d: %s VLAN filtering\n", port,</div><div class='add'>+		str_enable_disable(vlan_filtering));</div><div class='add'>+</div><div class='add'>+	/* If the port is not in the member set, the frame will be dropped */</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_VLAN_INGRESS_CTRL2_REG,</div><div class='add'>+				 BIT(port), vlan_filtering ? BIT(port) : 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If VLAN filtering is enabled and PVID is also enabled, we must</div><div class='add'>+	 * not drop any untagged or C-tagged frames. If we turn off VLAN</div><div class='add'>+	 * filtering on a port, we need to accept any frames.</div><div class='add'>+	 */</div><div class='add'>+	if (vlan_filtering)</div><div class='add'>+		ret = rtl8366rb_drop_untagged(priv, port, !rb-&gt;pvid_enabled[port]);</div><div class='add'>+	else</div><div class='add'>+		ret = rtl8366rb_drop_untagged(priv, port, false);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtl8366rb_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				struct switchdev_brport_flags flags,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	/* We support enabling/disabling learning */</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+rtl8366rb_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct switchdev_brport_flags flags,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PORT_LEARNDIS_CTRL,</div><div class='add'>+					 BIT(port),</div><div class='add'>+					 (flags.val &amp; BR_LEARNING) ? 0 : BIT(port));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		val = RTL8366RB_STP_STATE_DISABLED;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		val = RTL8366RB_STP_STATE_BLOCKING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		val = RTL8366RB_STP_STATE_LEARNING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		val = RTL8366RB_STP_STATE_FORWARDING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(priv-&gt;dev, "unknown bridge state requested\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set the same status for the port on all the FIDs */</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_NUM_FIDS; i++) {</div><div class='add'>+		regmap_update_bits(priv-&gt;map, RTL8366RB_STP_STATE_BASE + i,</div><div class='add'>+				   RTL8366RB_STP_STATE_MASK(port),</div><div class='add'>+				   RTL8366RB_STP_STATE(port, val));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+rtl8366rb_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* This will age out any learned L2 entries */</div><div class='add'>+	regmap_update_bits(priv-&gt;map, RTL8366RB_SECURITY_CTRL,</div><div class='add'>+			   BIT(port), BIT(port));</div><div class='add'>+	/* Restore the normal state of things */</div><div class='add'>+	regmap_update_bits(priv-&gt;map, RTL8366RB_SECURITY_CTRL,</div><div class='add'>+			   BIT(port), 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct rtl8366rb *rb;</div><div class='add'>+	unsigned int max_mtu;</div><div class='add'>+	u32 len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Cache the per-port MTU setting */</div><div class='add'>+	rb = priv-&gt;chip_data;</div><div class='add'>+	rb-&gt;max_mtu[port] = new_mtu;</div><div class='add'>+</div><div class='add'>+	/* Roof out the MTU for the entire switch to the greatest</div><div class='add'>+	 * common denominator: the biggest set for any one port will</div><div class='add'>+	 * be the biggest MTU for the switch.</div><div class='add'>+	 */</div><div class='add'>+	max_mtu = ETH_DATA_LEN;</div><div class='add'>+	for (i = 0; i &lt; RTL8366RB_NUM_PORTS; i++) {</div><div class='add'>+		if (rb-&gt;max_mtu[i] &gt; max_mtu)</div><div class='add'>+			max_mtu = rb-&gt;max_mtu[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Translate to layer 2 size.</div><div class='add'>+	 * Add ethernet and (possible) VLAN headers, and checksum to the size.</div><div class='add'>+	 * For ETH_DATA_LEN (1500 bytes) this will add up to 1522 bytes.</div><div class='add'>+	 */</div><div class='add'>+	max_mtu += VLAN_ETH_HLEN;</div><div class='add'>+	max_mtu += ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	if (max_mtu &lt;= 1522)</div><div class='add'>+		len = RTL8366RB_SGCR_MAX_LENGTH_1522;</div><div class='add'>+	else if (max_mtu &gt; 1522 &amp;&amp; max_mtu &lt;= 1536)</div><div class='add'>+		/* This will be the most common default if using VLAN and</div><div class='add'>+		 * CPU tagging on a port as both VLAN and CPU tag will</div><div class='add'>+		 * result in 1518 + 4 + 4 = 1526 bytes.</div><div class='add'>+		 */</div><div class='add'>+		len = RTL8366RB_SGCR_MAX_LENGTH_1536;</div><div class='add'>+	else if (max_mtu &gt; 1536 &amp;&amp; max_mtu &lt;= 1552)</div><div class='add'>+		len = RTL8366RB_SGCR_MAX_LENGTH_1552;</div><div class='add'>+	else</div><div class='add'>+		len = RTL8366RB_SGCR_MAX_LENGTH_16000;</div><div class='add'>+</div><div class='add'>+	return regmap_update_bits(priv-&gt;map, RTL8366RB_SGCR,</div><div class='add'>+				  RTL8366RB_SGCR_MAX_LENGTH_MASK,</div><div class='add'>+				  len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	/* The max MTU is 16000 bytes, so we subtract the ethernet</div><div class='add'>+	 * headers with VLAN and checksum and arrive at</div><div class='add'>+	 * 16000 - 18 - 4 = 15978. This does not include the CPU tag</div><div class='add'>+	 * since that is added to the requested MTU by the DSA framework.</div><div class='add'>+	 */</div><div class='add'>+	return 16000 - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_get_vlan_4k(struct realtek_priv *priv, u32 vid,</div><div class='add'>+				 struct rtl8366_vlan_4k *vlan4k)</div><div class='add'>+{</div><div class='add'>+	u32 data[3];</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));</div><div class='add'>+</div><div class='add'>+	if (vid &gt;= RTL8366RB_NUM_VIDS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* write VID */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_VLAN_TABLE_WRITE_BASE,</div><div class='add'>+			   vid &amp; RTL8366RB_VLAN_VID_MASK);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* write table access control word */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_TABLE_ACCESS_CTRL_REG,</div><div class='add'>+			   RTL8366RB_TABLE_VLAN_READ_CTRL);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = regmap_read(priv-&gt;map,</div><div class='add'>+				  RTL8366RB_VLAN_TABLE_READ_BASE + i,</div><div class='add'>+				  &amp;data[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlan4k-&gt;vid = vid;</div><div class='add'>+	vlan4k-&gt;untag = (data[1] &gt;&gt; RTL8366RB_VLAN_UNTAG_SHIFT) &amp;</div><div class='add'>+			RTL8366RB_VLAN_UNTAG_MASK;</div><div class='add'>+	vlan4k-&gt;member = data[1] &amp; RTL8366RB_VLAN_MEMBER_MASK;</div><div class='add'>+	vlan4k-&gt;fid = data[2] &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_set_vlan_4k(struct realtek_priv *priv,</div><div class='add'>+				 const struct rtl8366_vlan_4k *vlan4k)</div><div class='add'>+{</div><div class='add'>+	u32 data[3];</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (vlan4k-&gt;vid &gt;= RTL8366RB_NUM_VIDS ||</div><div class='add'>+	    vlan4k-&gt;member &gt; RTL8366RB_VLAN_MEMBER_MASK ||</div><div class='add'>+	    vlan4k-&gt;untag &gt; RTL8366RB_VLAN_UNTAG_MASK ||</div><div class='add'>+	    vlan4k-&gt;fid &gt; RTL8366RB_FIDMAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data[0] = vlan4k-&gt;vid &amp; RTL8366RB_VLAN_VID_MASK;</div><div class='add'>+	data[1] = (vlan4k-&gt;member &amp; RTL8366RB_VLAN_MEMBER_MASK) |</div><div class='add'>+		  ((vlan4k-&gt;untag &amp; RTL8366RB_VLAN_UNTAG_MASK) &lt;&lt;</div><div class='add'>+			RTL8366RB_VLAN_UNTAG_SHIFT);</div><div class='add'>+	data[2] = vlan4k-&gt;fid &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = regmap_write(priv-&gt;map,</div><div class='add'>+				   RTL8366RB_VLAN_TABLE_WRITE_BASE + i,</div><div class='add'>+				   data[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* write table access control word */</div><div class='add'>+	ret = regmap_write(priv-&gt;map, RTL8366RB_TABLE_ACCESS_CTRL_REG,</div><div class='add'>+			   RTL8366RB_TABLE_VLAN_WRITE_CTRL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_get_vlan_mc(struct realtek_priv *priv, u32 index,</div><div class='add'>+				 struct rtl8366_vlan_mc *vlanmc)</div><div class='add'>+{</div><div class='add'>+	u32 data[3];</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));</div><div class='add'>+</div><div class='add'>+	if (index &gt;= RTL8366RB_NUM_VLANS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = regmap_read(priv-&gt;map,</div><div class='add'>+				  RTL8366RB_VLAN_MC_BASE(index) + i,</div><div class='add'>+				  &amp;data[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vlanmc-&gt;vid = data[0] &amp; RTL8366RB_VLAN_VID_MASK;</div><div class='add'>+	vlanmc-&gt;priority = (data[0] &gt;&gt; RTL8366RB_VLAN_PRIORITY_SHIFT) &amp;</div><div class='add'>+		RTL8366RB_VLAN_PRIORITY_MASK;</div><div class='add'>+	vlanmc-&gt;untag = (data[1] &gt;&gt; RTL8366RB_VLAN_UNTAG_SHIFT) &amp;</div><div class='add'>+		RTL8366RB_VLAN_UNTAG_MASK;</div><div class='add'>+	vlanmc-&gt;member = data[1] &amp; RTL8366RB_VLAN_MEMBER_MASK;</div><div class='add'>+	vlanmc-&gt;fid = data[2] &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_set_vlan_mc(struct realtek_priv *priv, u32 index,</div><div class='add'>+				 const struct rtl8366_vlan_mc *vlanmc)</div><div class='add'>+{</div><div class='add'>+	u32 data[3];</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= RTL8366RB_NUM_VLANS ||</div><div class='add'>+	    vlanmc-&gt;vid &gt;= RTL8366RB_NUM_VIDS ||</div><div class='add'>+	    vlanmc-&gt;priority &gt; RTL8366RB_PRIORITYMAX ||</div><div class='add'>+	    vlanmc-&gt;member &gt; RTL8366RB_VLAN_MEMBER_MASK ||</div><div class='add'>+	    vlanmc-&gt;untag &gt; RTL8366RB_VLAN_UNTAG_MASK ||</div><div class='add'>+	    vlanmc-&gt;fid &gt; RTL8366RB_FIDMAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	data[0] = (vlanmc-&gt;vid &amp; RTL8366RB_VLAN_VID_MASK) |</div><div class='add'>+		  ((vlanmc-&gt;priority &amp; RTL8366RB_VLAN_PRIORITY_MASK) &lt;&lt;</div><div class='add'>+			RTL8366RB_VLAN_PRIORITY_SHIFT);</div><div class='add'>+	data[1] = (vlanmc-&gt;member &amp; RTL8366RB_VLAN_MEMBER_MASK) |</div><div class='add'>+		  ((vlanmc-&gt;untag &amp; RTL8366RB_VLAN_UNTAG_MASK) &lt;&lt;</div><div class='add'>+			RTL8366RB_VLAN_UNTAG_SHIFT);</div><div class='add'>+	data[2] = vlanmc-&gt;fid &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		ret = regmap_write(priv-&gt;map,</div><div class='add'>+				   RTL8366RB_VLAN_MC_BASE(index) + i,</div><div class='add'>+				   data[i]);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_get_mc_index(struct realtek_priv *priv, int port, int *val)</div><div class='add'>+{</div><div class='add'>+	u32 data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= priv-&gt;num_ports)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map, RTL8366RB_PORT_VLAN_CTRL_REG(port),</div><div class='add'>+			  &amp;data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*val = (data &gt;&gt; RTL8366RB_PORT_VLAN_CTRL_SHIFT(port)) &amp;</div><div class='add'>+		RTL8366RB_PORT_VLAN_CTRL_MASK;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_set_mc_index(struct realtek_priv *priv, int port, int index)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	struct rtl8366rb *rb;</div><div class='add'>+	bool pvid_enabled;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rb = priv-&gt;chip_data;</div><div class='add'>+	pvid_enabled = !!index;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= priv-&gt;num_ports || index &gt;= RTL8366RB_NUM_VLANS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(priv-&gt;map, RTL8366RB_PORT_VLAN_CTRL_REG(port),</div><div class='add'>+				 RTL8366RB_PORT_VLAN_CTRL_MASK &lt;&lt;</div><div class='add'>+					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port),</div><div class='add'>+				 (index &amp; RTL8366RB_PORT_VLAN_CTRL_MASK) &lt;&lt;</div><div class='add'>+					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rb-&gt;pvid_enabled[port] = pvid_enabled;</div><div class='add'>+</div><div class='add'>+	/* If VLAN filtering is enabled and PVID is also enabled, we must</div><div class='add'>+	 * not drop any untagged or C-tagged frames. Make sure to update the</div><div class='add'>+	 * filtering setting.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_port_is_vlan_filtering(dsa_to_port(ds, port)))</div><div class='add'>+		ret = rtl8366rb_drop_untagged(priv, port, !pvid_enabled);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool rtl8366rb_is_vlan_valid(struct realtek_priv *priv, unsigned int vlan)</div><div class='add'>+{</div><div class='add'>+	unsigned int max = RTL8366RB_NUM_VLANS - 1;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;vlan4k_enabled)</div><div class='add'>+		max = RTL8366RB_NUM_VIDS - 1;</div><div class='add'>+</div><div class='add'>+	if (vlan &gt; max)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_enable_vlan(struct realtek_priv *priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(priv-&gt;dev, "%s VLAN\n", str_enable_disable(enable));</div><div class='add'>+	return regmap_update_bits(priv-&gt;map,</div><div class='add'>+				  RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,</div><div class='add'>+				  enable ? RTL8366RB_SGCR_EN_VLAN : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_enable_vlan4k(struct realtek_priv *priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	dev_dbg(priv-&gt;dev, "%s VLAN 4k\n", str_enable_disable(enable));</div><div class='add'>+	return regmap_update_bits(priv-&gt;map, RTL8366RB_SGCR,</div><div class='add'>+				  RTL8366RB_SGCR_EN_VLAN_4KTB,</div><div class='add'>+				  enable ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_phy_read(struct realtek_priv *priv, int phy, int regnum)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (phy &gt; RTL8366RB_PHY_NO_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rtl83xx_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock, RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='add'>+			   RTL8366RB_PHY_CTRL_READ);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	reg = 0x8000 | (1 &lt;&lt; (phy + RTL8366RB_PHY_NO_OFFSET)) | regnum;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock, reg, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev,</div><div class='add'>+			"failed to write PHY%d reg %04x @ %04x, ret %d\n",</div><div class='add'>+			phy, regnum, reg, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;map_nolock, RTL8366RB_PHY_ACCESS_DATA_REG,</div><div class='add'>+			  &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = val;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "read PHY%d register 0x%04x @ %08x, val &lt;- %04x\n",</div><div class='add'>+		phy, regnum, reg, val);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rtl83xx_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_phy_write(struct realtek_priv *priv, int phy, int regnum,</div><div class='add'>+			       u16 val)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (phy &gt; RTL8366RB_PHY_NO_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rtl83xx_lock(priv);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock, RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='add'>+			   RTL8366RB_PHY_CTRL_WRITE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	reg = 0x8000 | (1 &lt;&lt; (phy + RTL8366RB_PHY_NO_OFFSET)) | regnum;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;dev, "write PHY%d register 0x%04x @ %04x, val -&gt; %04x\n",</div><div class='add'>+		phy, regnum, reg, val);</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;map_nolock, reg, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	rtl83xx_unlock(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_reset_chip(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int timeout = 10;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;write_reg_noack(priv, RTL8366RB_RESET_CTRL_REG,</div><div class='add'>+			      RTL8366RB_CHIP_CTRL_RESET_HW);</div><div class='add'>+	do {</div><div class='add'>+		usleep_range(20000, 25000);</div><div class='add'>+		ret = regmap_read(priv-&gt;map, RTL8366RB_RESET_CTRL_REG, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (!(val &amp; RTL8366RB_CHIP_CTRL_RESET_HW))</div><div class='add'>+			break;</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+	if (!timeout) {</div><div class='add'>+		dev_err(priv-&gt;dev, "timeout waiting for the switch to reset\n");</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_detect(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Detect device */</div><div class='add'>+	ret = regmap_read(priv-&gt;map, 0x5c, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "can't get chip ID (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (val) {</div><div class='add'>+	case 0x6027:</div><div class='add'>+		dev_info(dev, "found an RTL8366S switch\n");</div><div class='add'>+		dev_err(dev, "this switch is not yet supported, submit patches!\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	case 0x5937:</div><div class='add'>+		dev_info(dev, "found an RTL8366RB switch\n");</div><div class='add'>+		priv-&gt;cpu_port = RTL8366RB_PORT_NUM_CPU;</div><div class='add'>+		priv-&gt;num_ports = RTL8366RB_NUM_PORTS;</div><div class='add'>+		priv-&gt;num_vlan_mc = RTL8366RB_NUM_VLANS;</div><div class='add'>+		priv-&gt;mib_counters = rtl8366rb_mib_counters;</div><div class='add'>+		priv-&gt;num_mib_counters = ARRAY_SIZE(rtl8366rb_mib_counters);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_info(dev, "found an Unknown Realtek switch (id=0x%04x)\n",</div><div class='add'>+			 val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = rtl8366rb_reset_chip(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops rtl8366rb_phylink_mac_ops = {</div><div class='add'>+	.mac_config = rtl8366rb_mac_config,</div><div class='add'>+	.mac_link_down = rtl8366rb_mac_link_down,</div><div class='add'>+	.mac_link_up = rtl8366rb_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops rtl8366rb_switch_ops = {</div><div class='add'>+	.get_tag_protocol = rtl8366_get_tag_protocol,</div><div class='add'>+	.setup = rtl8366rb_setup,</div><div class='add'>+	.phylink_get_caps = rtl8366rb_phylink_get_caps,</div><div class='add'>+	.get_strings = rtl8366_get_strings,</div><div class='add'>+	.get_ethtool_stats = rtl8366_get_ethtool_stats,</div><div class='add'>+	.get_sset_count = rtl8366_get_sset_count,</div><div class='add'>+	.port_bridge_join = rtl8366rb_port_bridge_join,</div><div class='add'>+	.port_bridge_leave = rtl8366rb_port_bridge_leave,</div><div class='add'>+	.port_vlan_filtering = rtl8366rb_vlan_filtering,</div><div class='add'>+	.port_vlan_add = rtl8366_vlan_add,</div><div class='add'>+	.port_vlan_del = rtl8366_vlan_del,</div><div class='add'>+	.port_enable = rtl8366rb_port_enable,</div><div class='add'>+	.port_disable = rtl8366rb_port_disable,</div><div class='add'>+	.port_pre_bridge_flags = rtl8366rb_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags = rtl8366rb_port_bridge_flags,</div><div class='add'>+	.port_stp_state_set = rtl8366rb_port_stp_state_set,</div><div class='add'>+	.port_fast_age = rtl8366rb_port_fast_age,</div><div class='add'>+	.port_change_mtu = rtl8366rb_change_mtu,</div><div class='add'>+	.port_max_mtu = rtl8366rb_max_mtu,</div><div class='add'>+	.port_hsr_join = dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave = dsa_port_simple_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct realtek_ops rtl8366rb_ops = {</div><div class='add'>+	.detect		= rtl8366rb_detect,</div><div class='add'>+	.get_vlan_mc	= rtl8366rb_get_vlan_mc,</div><div class='add'>+	.set_vlan_mc	= rtl8366rb_set_vlan_mc,</div><div class='add'>+	.get_vlan_4k	= rtl8366rb_get_vlan_4k,</div><div class='add'>+	.set_vlan_4k	= rtl8366rb_set_vlan_4k,</div><div class='add'>+	.get_mc_index	= rtl8366rb_get_mc_index,</div><div class='add'>+	.set_mc_index	= rtl8366rb_set_mc_index,</div><div class='add'>+	.get_mib_counter = rtl8366rb_get_mib_counter,</div><div class='add'>+	.is_vlan_valid	= rtl8366rb_is_vlan_valid,</div><div class='add'>+	.enable_vlan	= rtl8366rb_enable_vlan,</div><div class='add'>+	.enable_vlan4k	= rtl8366rb_enable_vlan4k,</div><div class='add'>+	.phy_read	= rtl8366rb_phy_read,</div><div class='add'>+	.phy_write	= rtl8366rb_phy_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct realtek_variant rtl8366rb_variant = {</div><div class='add'>+	.ds_ops = &amp;rtl8366rb_switch_ops,</div><div class='add'>+	.ops = &amp;rtl8366rb_ops,</div><div class='add'>+	.phylink_mac_ops = &amp;rtl8366rb_phylink_mac_ops,</div><div class='add'>+	.clk_delay = 10,</div><div class='add'>+	.cmd_read = 0xa9,</div><div class='add'>+	.cmd_write = 0xa8,</div><div class='add'>+	.chip_data_sz = sizeof(struct rtl8366rb),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id rtl8366rb_of_match[] = {</div><div class='add'>+	{ .compatible = "realtek,rtl8366rb", .data = &amp;rtl8366rb_variant, },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, rtl8366rb_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver rtl8366rb_smi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "rtl8366rb-smi",</div><div class='add'>+		.of_match_table = rtl8366rb_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe  = realtek_smi_probe,</div><div class='add'>+	.remove = realtek_smi_remove,</div><div class='add'>+	.shutdown = realtek_smi_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct mdio_driver rtl8366rb_mdio_driver = {</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = "rtl8366rb-mdio",</div><div class='add'>+		.of_match_table = rtl8366rb_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe  = realtek_mdio_probe,</div><div class='add'>+	.remove = realtek_mdio_remove,</div><div class='add'>+	.shutdown = realtek_mdio_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int rtl8366rb_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = realtek_mdio_driver_register(&amp;rtl8366rb_mdio_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = realtek_smi_driver_register(&amp;rtl8366rb_smi_driver);</div><div class='add'>+	if (ret) {</div><div class='add'>+		realtek_mdio_driver_unregister(&amp;rtl8366rb_mdio_driver);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+module_init(rtl8366rb_init);</div><div class='add'>+</div><div class='add'>+static void __exit rtl8366rb_exit(void)</div><div class='add'>+{</div><div class='add'>+	realtek_smi_driver_unregister(&amp;rtl8366rb_smi_driver);</div><div class='add'>+	realtek_mdio_driver_unregister(&amp;rtl8366rb_mdio_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(rtl8366rb_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Linus Walleij &lt;linus.walleij@linaro.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for RTL8366RB ethernet switch");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_IMPORT_NS("REALTEK_DSA");</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl8366rb.h b/drivers/net/dsa/realtek/rtl8366rb.h<br/>new file mode 100644<br/>index 000000000000..685ff3275faa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl8366rb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl8366rb.h</a></div><div class='hunk'>@@ -0,0 +1,107 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+</div><div class='add'>+#ifndef _RTL8366RB_H</div><div class='add'>+#define _RTL8366RB_H</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+</div><div class='add'>+#define RTL8366RB_PORT_NUM_CPU		5</div><div class='add'>+#define RTL8366RB_NUM_PORTS		6</div><div class='add'>+#define RTL8366RB_PHY_NO_MAX		4</div><div class='add'>+#define RTL8366RB_NUM_LEDGROUPS		4</div><div class='add'>+#define RTL8366RB_PHY_ADDR_MAX		31</div><div class='add'>+</div><div class='add'>+/* LED control registers */</div><div class='add'>+/* The LED blink rate is global; it is used by all triggers in all groups. */</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_REG		0x0430</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_MASK		0x0007</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_28MS		0x0000</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_56MS		0x0001</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_84MS		0x0002</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_111MS		0x0003</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_222MS		0x0004</div><div class='add'>+#define RTL8366RB_LED_BLINKRATE_446MS		0x0005</div><div class='add'>+</div><div class='add'>+/* LED trigger event for each group */</div><div class='add'>+#define RTL8366RB_LED_CTRL_REG			0x0431</div><div class='add'>+#define RTL8366RB_LED_CTRL_OFFSET(led_group)	\</div><div class='add'>+	(4 * (led_group))</div><div class='add'>+#define RTL8366RB_LED_CTRL_MASK(led_group)	\</div><div class='add'>+	(0xf &lt;&lt; RTL8366RB_LED_CTRL_OFFSET(led_group))</div><div class='add'>+</div><div class='add'>+/* The RTL8366RB_LED_X_X registers are used to manually set the LED state only</div><div class='add'>+ * when the corresponding LED group in RTL8366RB_LED_CTRL_REG is</div><div class='add'>+ * RTL8366RB_LEDGROUP_FORCE. Otherwise, it is ignored.</div><div class='add'>+ */</div><div class='add'>+#define RTL8366RB_LED_0_1_CTRL_REG		0x0432</div><div class='add'>+#define RTL8366RB_LED_2_3_CTRL_REG		0x0433</div><div class='add'>+#define RTL8366RB_LED_X_X_CTRL_REG(led_group)	\</div><div class='add'>+	((led_group) &lt;= 1 ? \</div><div class='add'>+		RTL8366RB_LED_0_1_CTRL_REG : \</div><div class='add'>+		RTL8366RB_LED_2_3_CTRL_REG)</div><div class='add'>+#define RTL8366RB_LED_0_X_CTRL_MASK		GENMASK(5, 0)</div><div class='add'>+#define RTL8366RB_LED_X_1_CTRL_MASK		GENMASK(11, 6)</div><div class='add'>+#define RTL8366RB_LED_2_X_CTRL_MASK		GENMASK(5, 0)</div><div class='add'>+#define RTL8366RB_LED_X_3_CTRL_MASK		GENMASK(11, 6)</div><div class='add'>+</div><div class='add'>+enum rtl8366_ledgroup_mode {</div><div class='add'>+	RTL8366RB_LEDGROUP_OFF			= 0x0,</div><div class='add'>+	RTL8366RB_LEDGROUP_DUP_COL		= 0x1,</div><div class='add'>+	RTL8366RB_LEDGROUP_LINK_ACT		= 0x2,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD1000		= 0x3,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD100		= 0x4,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD10		= 0x5,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD1000_ACT		= 0x6,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD100_ACT		= 0x7,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD10_ACT		= 0x8,</div><div class='add'>+	RTL8366RB_LEDGROUP_SPD100_10_ACT	= 0x9,</div><div class='add'>+	RTL8366RB_LEDGROUP_FIBER		= 0xa,</div><div class='add'>+	RTL8366RB_LEDGROUP_AN_FAULT		= 0xb,</div><div class='add'>+	RTL8366RB_LEDGROUP_LINK_RX		= 0xc,</div><div class='add'>+	RTL8366RB_LEDGROUP_LINK_TX		= 0xd,</div><div class='add'>+	RTL8366RB_LEDGROUP_MASTER		= 0xe,</div><div class='add'>+	RTL8366RB_LEDGROUP_FORCE		= 0xf,</div><div class='add'>+</div><div class='add'>+	__RTL8366RB_LEDGROUP_MODE_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8366RB_LEDS)</div><div class='add'>+</div><div class='add'>+struct rtl8366rb_led {</div><div class='add'>+	u8 port_num;</div><div class='add'>+	u8 led_group;</div><div class='add'>+	struct realtek_priv *priv;</div><div class='add'>+	struct led_classdev cdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int rtl8366rb_setup_leds(struct realtek_priv *priv);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int rtl8366rb_setup_leds(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_LEDS_CLASS) */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rtl8366rb - RTL8366RB-specific data</div><div class='add'>+ * @max_mtu: per-port max MTU setting</div><div class='add'>+ * @pvid_enabled: if PVID is set for respective port</div><div class='add'>+ * @leds: per-port and per-ledgroup led info</div><div class='add'>+ */</div><div class='add'>+struct rtl8366rb {</div><div class='add'>+	unsigned int max_mtu[RTL8366RB_NUM_PORTS];</div><div class='add'>+	bool pvid_enabled[RTL8366RB_NUM_PORTS];</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8366RB_LEDS)</div><div class='add'>+	struct rtl8366rb_led leds[RTL8366RB_NUM_PORTS][RTL8366RB_NUM_LEDGROUPS];</div><div class='add'>+#endif</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* This code is used also with LEDs disabled */</div><div class='add'>+int rb8366rb_set_ledgroup_mode(struct realtek_priv *priv,</div><div class='add'>+			       u8 led_group,</div><div class='add'>+			       enum rtl8366_ledgroup_mode mode);</div><div class='add'>+</div><div class='add'>+#endif /* _RTL8366RB_H */</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl83xx.c b/drivers/net/dsa/realtek/rtl83xx.c<br/>new file mode 100644<br/>index 000000000000..2b9bd4462714<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl83xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl83xx.c</a></div><div class='hunk'>@@ -0,0 +1,331 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0+</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "realtek.h"</div><div class='add'>+#include "rtl83xx.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_lock() - Locks the mutex used by regmaps</div><div class='add'>+ * @ctx: realtek_priv pointer</div><div class='add'>+ *</div><div class='add'>+ * This function is passed to regmap to be used as the lock function.</div><div class='add'>+ * It is also used externally to block regmap before executing multiple</div><div class='add'>+ * operations that must happen in sequence (which will use</div><div class='add'>+ * realtek_priv.map_nolock instead).</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep. Holds priv-&gt;map_lock lock.</div><div class='add'>+ * Return: nothing</div><div class='add'>+ */</div><div class='add'>+void rtl83xx_lock(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ctx;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;map_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_lock, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_unlock() - Unlocks the mutex used by regmaps</div><div class='add'>+ * @ctx: realtek_priv pointer</div><div class='add'>+ *</div><div class='add'>+ * This function unlocks the lock acquired by rtl83xx_lock.</div><div class='add'>+ *</div><div class='add'>+ * Context: Releases priv-&gt;map_lock lock.</div><div class='add'>+ * Return: nothing</div><div class='add'>+ */</div><div class='add'>+void rtl83xx_unlock(void *ctx)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ctx;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;map_lock);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_unlock, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+static int rtl83xx_user_mdio_read(struct mii_bus *bus, int addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;ops-&gt;phy_read(priv, addr, regnum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int rtl83xx_user_mdio_write(struct mii_bus *bus, int addr, int regnum,</div><div class='add'>+				   u16 val)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;ops-&gt;phy_write(priv, addr, regnum, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_setup_user_mdio() - register the user mii bus driver</div><div class='add'>+ * @ds: DSA switch associated with this user_mii_bus</div><div class='add'>+ *</div><div class='add'>+ * Registers the MDIO bus for built-in Ethernet PHYs, and associates it with</div><div class='add'>+ * the mandatory 'mdio' child OF node of the switch.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: 0 on success, negative value for failure.</div><div class='add'>+ */</div><div class='add'>+int rtl83xx_setup_user_mdio(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct realtek_priv *priv = ds-&gt;priv;</div><div class='add'>+	struct device_node *mdio_np;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	mdio_np = of_get_child_by_name(priv-&gt;dev-&gt;of_node, "mdio");</div><div class='add'>+	if (!mdio_np) {</div><div class='add'>+		dev_err(priv-&gt;dev, "no MDIO bus node\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus = devm_mdiobus_alloc(priv-&gt;dev);</div><div class='add'>+	if (!bus) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;priv = priv;</div><div class='add'>+	bus-&gt;name = "Realtek user MII";</div><div class='add'>+	bus-&gt;read = rtl83xx_user_mdio_read;</div><div class='add'>+	bus-&gt;write = rtl83xx_user_mdio_write;</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s:user_mii", dev_name(priv-&gt;dev));</div><div class='add'>+	bus-&gt;parent = priv-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ret = devm_of_mdiobus_register(priv-&gt;dev, bus, mdio_np);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "unable to register MDIO bus %s\n",</div><div class='add'>+			bus-&gt;id);</div><div class='add'>+		goto err_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;user_mii_bus = bus;</div><div class='add'>+</div><div class='add'>+err_put_node:</div><div class='add'>+	of_node_put(mdio_np);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_setup_user_mdio, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_probe() - probe a Realtek switch</div><div class='add'>+ * @dev: the device being probed</div><div class='add'>+ * @interface_info: specific management interface info.</div><div class='add'>+ *</div><div class='add'>+ * This function initializes realtek_priv and reads data from the device tree</div><div class='add'>+ * node. The switch is hard resetted if a method is provided.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Pointer to the realtek_priv or ERR_PTR() in case of failure.</div><div class='add'>+ *</div><div class='add'>+ * The realtek_priv pointer does not need to be freed as it is controlled by</div><div class='add'>+ * devres.</div><div class='add'>+ */</div><div class='add'>+struct realtek_priv *</div><div class='add'>+rtl83xx_probe(struct device *dev,</div><div class='add'>+	      const struct realtek_interface_info *interface_info)</div><div class='add'>+{</div><div class='add'>+	const struct realtek_variant *var;</div><div class='add'>+	struct realtek_priv *priv;</div><div class='add'>+	struct regmap_config rc = {</div><div class='add'>+		.reg_bits = 10, /* A4..A0 R4..R0 */</div><div class='add'>+		.val_bits = 16,</div><div class='add'>+		.reg_stride = 1,</div><div class='add'>+		.max_register = 0xffff,</div><div class='add'>+		.reg_format_endian = REGMAP_ENDIAN_BIG,</div><div class='add'>+		.reg_read = interface_info-&gt;reg_read,</div><div class='add'>+		.reg_write = interface_info-&gt;reg_write,</div><div class='add'>+		.cache_type = REGCACHE_NONE,</div><div class='add'>+		.lock = rtl83xx_lock,</div><div class='add'>+		.unlock = rtl83xx_unlock,</div><div class='add'>+	};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	var = of_device_get_match_data(dev);</div><div class='add'>+	if (!var)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, size_add(sizeof(*priv), var-&gt;chip_data_sz),</div><div class='add'>+			    GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;map_lock);</div><div class='add'>+</div><div class='add'>+	rc.lock_arg = priv;</div><div class='add'>+	priv-&gt;map = devm_regmap_init(dev, NULL, priv, &amp;rc);</div><div class='add'>+	if (IS_ERR(priv-&gt;map)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;map);</div><div class='add'>+		dev_err(dev, "regmap init failed: %d\n", ret);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc.disable_locking = true;</div><div class='add'>+	priv-&gt;map_nolock = devm_regmap_init(dev, NULL, priv, &amp;rc);</div><div class='add'>+	if (IS_ERR(priv-&gt;map_nolock)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;map_nolock);</div><div class='add'>+		dev_err(dev, "regmap init failed: %d\n", ret);</div><div class='add'>+		return ERR_PTR(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Link forward and backward */</div><div class='add'>+	priv-&gt;dev = dev;</div><div class='add'>+	priv-&gt;variant = var;</div><div class='add'>+	priv-&gt;ops = var-&gt;ops;</div><div class='add'>+	priv-&gt;chip_data = (void *)priv + sizeof(*priv);</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;leds_disabled = of_property_read_bool(dev-&gt;of_node,</div><div class='add'>+						    "realtek,disable-leds");</div><div class='add'>+</div><div class='add'>+	/* TODO: if power is software controlled, set up any regulators here */</div><div class='add'>+	priv-&gt;reset_ctl = devm_reset_control_get_optional(dev, NULL);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset_ctl))</div><div class='add'>+		return dev_err_cast_probe(dev, priv-&gt;reset_ctl,</div><div class='add'>+					  "failed to get reset control\n");</div><div class='add'>+</div><div class='add'>+	priv-&gt;reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset)) {</div><div class='add'>+		dev_err(dev, "failed to get RESET GPIO\n");</div><div class='add'>+		return ERR_CAST(priv-&gt;reset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, priv);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;reset_ctl || priv-&gt;reset) {</div><div class='add'>+		rtl83xx_reset_assert(priv);</div><div class='add'>+		dev_dbg(dev, "asserted RESET\n");</div><div class='add'>+		msleep(REALTEK_HW_STOP_DELAY);</div><div class='add'>+		rtl83xx_reset_deassert(priv);</div><div class='add'>+		msleep(REALTEK_HW_START_DELAY);</div><div class='add'>+		dev_dbg(dev, "deasserted RESET\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_probe, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_register_switch() - detects and register a switch</div><div class='add'>+ * @priv: realtek_priv pointer</div><div class='add'>+ *</div><div class='add'>+ * This function first checks the switch chip ID and register a DSA</div><div class='add'>+ * switch.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep. Takes and releases priv-&gt;map_lock.</div><div class='add'>+ * Return: 0 on success, negative value for failure.</div><div class='add'>+ */</div><div class='add'>+int rtl83xx_register_switch(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = priv-&gt;ops-&gt;detect(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(priv-&gt;dev, ret, "unable to detect switch\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds-&gt;priv = priv;</div><div class='add'>+	ds-&gt;dev = priv-&gt;dev;</div><div class='add'>+	ds-&gt;ops = priv-&gt;variant-&gt;ds_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = priv-&gt;variant-&gt;phylink_mac_ops;</div><div class='add'>+	ds-&gt;num_ports = priv-&gt;num_ports;</div><div class='add'>+</div><div class='add'>+	ret = dsa_register_switch(ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_probe(priv-&gt;dev, ret, "unable to register switch\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_register_switch, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_unregister_switch() - unregister a switch</div><div class='add'>+ * @priv: realtek_priv pointer</div><div class='add'>+ *</div><div class='add'>+ * This function unregister a DSA switch.</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Nothing.</div><div class='add'>+ */</div><div class='add'>+void rtl83xx_unregister_switch(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_unregister_switch, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_shutdown() - shutdown a switch</div><div class='add'>+ * @priv: realtek_priv pointer</div><div class='add'>+ *</div><div class='add'>+ * This function shuts down the DSA switch and cleans the platform driver data,</div><div class='add'>+ * to prevent realtek_{smi,mdio}_remove() from running afterwards, which is</div><div class='add'>+ * possible if the parent bus implements its own .shutdown() as .remove().</div><div class='add'>+ *</div><div class='add'>+ * Context: Can sleep.</div><div class='add'>+ * Return: Nothing.</div><div class='add'>+ */</div><div class='add'>+void rtl83xx_shutdown(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(ds);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(priv-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_shutdown, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * rtl83xx_remove() - Cleanup a realtek switch driver</div><div class='add'>+ * @priv: realtek_priv pointer</div><div class='add'>+ *</div><div class='add'>+ * Placehold for common cleanup procedures.</div><div class='add'>+ *</div><div class='add'>+ * Context: Any</div><div class='add'>+ * Return: nothing</div><div class='add'>+ */</div><div class='add'>+void rtl83xx_remove(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_NS_GPL(rtl83xx_remove, "REALTEK_DSA");</div><div class='add'>+</div><div class='add'>+void rtl83xx_reset_assert(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reset_control_assert(priv-&gt;reset_ctl);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_warn(priv-&gt;dev,</div><div class='add'>+			 "Failed to assert the switch reset control: %pe\n",</div><div class='add'>+			 ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+	gpiod_set_value(priv-&gt;reset, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void rtl83xx_reset_deassert(struct realtek_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = reset_control_deassert(priv-&gt;reset_ctl);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_warn(priv-&gt;dev,</div><div class='add'>+			 "Failed to deassert the switch reset control: %pe\n",</div><div class='add'>+			 ERR_PTR(ret));</div><div class='add'>+</div><div class='add'>+	gpiod_set_value(priv-&gt;reset, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Luiz Angelo Daros de Luca &lt;luizluca@gmail.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Linus Walleij &lt;linus.walleij@linaro.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Realtek DSA switches common module");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/realtek/rtl83xx.h b/drivers/net/dsa/realtek/rtl83xx.h<br/>new file mode 100644<br/>index 000000000000..c8a0ff8fd75e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/realtek/rtl83xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/realtek/rtl83xx.h</a></div><div class='hunk'>@@ -0,0 +1,24 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0+ */</div><div class='add'>+</div><div class='add'>+#ifndef _RTL83XX_H</div><div class='add'>+#define _RTL83XX_H</div><div class='add'>+</div><div class='add'>+struct realtek_interface_info {</div><div class='add'>+	int (*reg_read)(void *ctx, u32 reg, u32 *val);</div><div class='add'>+	int (*reg_write)(void *ctx, u32 reg, u32 val);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void rtl83xx_lock(void *ctx);</div><div class='add'>+void rtl83xx_unlock(void *ctx);</div><div class='add'>+int rtl83xx_setup_user_mdio(struct dsa_switch *ds);</div><div class='add'>+struct realtek_priv *</div><div class='add'>+rtl83xx_probe(struct device *dev,</div><div class='add'>+	      const struct realtek_interface_info *interface_info);</div><div class='add'>+int rtl83xx_register_switch(struct realtek_priv *priv);</div><div class='add'>+void rtl83xx_unregister_switch(struct realtek_priv *priv);</div><div class='add'>+void rtl83xx_shutdown(struct realtek_priv *priv);</div><div class='add'>+void rtl83xx_remove(struct realtek_priv *priv);</div><div class='add'>+void rtl83xx_reset_assert(struct realtek_priv *priv);</div><div class='add'>+void rtl83xx_reset_deassert(struct realtek_priv *priv);</div><div class='add'>+</div><div class='add'>+#endif /* _RTL83XX_H */</div><div class='head'>diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c<br/>deleted file mode 100644<br/>index 6dedd43442cc..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/rtl8366.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/rtl8366.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,515 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Realtek SMI library helpers for the RTL8366x variants</div><div class='del'>- * RTL8366RB and RTL8366S</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='del'>- * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='del'>- * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='del'>- * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-</div><div class='del'>-#include "realtek-smi.h"</div><div class='del'>-</div><div class='del'>-int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	*used = 0;</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_ports; i++) {</div><div class='del'>-		int index = 0;</div><div class='del'>-</div><div class='del'>-		ret = smi-&gt;ops-&gt;get_mc_index(smi, i, &amp;index);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (mc_index == index) {</div><div class='del'>-			*used = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_mc_is_used);</div><div class='del'>-</div><div class='del'>-int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member,</div><div class='del'>-		     u32 untag, u32 fid)</div><div class='del'>-{</div><div class='del'>-	struct rtl8366_vlan_4k vlan4k;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Update the 4K table */</div><div class='del'>-	ret = smi-&gt;ops-&gt;get_vlan_4k(smi, vid, &amp;vlan4k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	vlan4k.member = member;</div><div class='del'>-	vlan4k.untag = untag;</div><div class='del'>-	vlan4k.fid = fid;</div><div class='del'>-	ret = smi-&gt;ops-&gt;set_vlan_4k(smi, &amp;vlan4k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Try to find an existing MC entry for this VID */</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_vlan_mc; i++) {</div><div class='del'>-		struct rtl8366_vlan_mc vlanmc;</div><div class='del'>-</div><div class='del'>-		ret = smi-&gt;ops-&gt;get_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (vid == vlanmc.vid) {</div><div class='del'>-			/* update the MC entry */</div><div class='del'>-			vlanmc.member = member;</div><div class='del'>-			vlanmc.untag = untag;</div><div class='del'>-			vlanmc.fid = fid;</div><div class='del'>-</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_set_vlan);</div><div class='del'>-</div><div class='del'>-int rtl8366_get_pvid(struct realtek_smi *smi, int port, int *val)</div><div class='del'>-{</div><div class='del'>-	struct rtl8366_vlan_mc vlanmc;</div><div class='del'>-	int ret;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	ret = smi-&gt;ops-&gt;get_mc_index(smi, port, &amp;index);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = smi-&gt;ops-&gt;get_vlan_mc(smi, index, &amp;vlanmc);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*val = vlanmc.vid;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_get_pvid);</div><div class='del'>-</div><div class='del'>-int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port,</div><div class='del'>-		     unsigned int vid)</div><div class='del'>-{</div><div class='del'>-	struct rtl8366_vlan_mc vlanmc;</div><div class='del'>-	struct rtl8366_vlan_4k vlan4k;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Try to find an existing MC entry for this VID */</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_vlan_mc; i++) {</div><div class='del'>-		ret = smi-&gt;ops-&gt;get_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (vid == vlanmc.vid) {</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_mc_index(smi, port, i);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We have no MC entry for this VID, try to find an empty one */</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_vlan_mc; i++) {</div><div class='del'>-		ret = smi-&gt;ops-&gt;get_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (vlanmc.vid == 0 &amp;&amp; vlanmc.member == 0) {</div><div class='del'>-			/* Update the entry from the 4K table */</div><div class='del'>-			ret = smi-&gt;ops-&gt;get_vlan_4k(smi, vid, &amp;vlan4k);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			vlanmc.vid = vid;</div><div class='del'>-			vlanmc.member = vlan4k.member;</div><div class='del'>-			vlanmc.untag = vlan4k.untag;</div><div class='del'>-			vlanmc.fid = vlan4k.fid;</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_mc_index(smi, port, i);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* MC table is full, try to find an unused entry and replace it */</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_vlan_mc; i++) {</div><div class='del'>-		int used;</div><div class='del'>-</div><div class='del'>-		ret = rtl8366_mc_is_used(smi, i, &amp;used);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (!used) {</div><div class='del'>-			/* Update the entry from the 4K table */</div><div class='del'>-			ret = smi-&gt;ops-&gt;get_vlan_4k(smi, vid, &amp;vlan4k);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			vlanmc.vid = vid;</div><div class='del'>-			vlanmc.member = vlan4k.member;</div><div class='del'>-			vlanmc.untag = vlan4k.untag;</div><div class='del'>-			vlanmc.fid = vlan4k.fid;</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			ret = smi-&gt;ops-&gt;set_mc_index(smi, port, i);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_err(smi-&gt;dev,</div><div class='del'>-		"all VLAN member configurations are in use\n");</div><div class='del'>-</div><div class='del'>-	return -ENOSPC;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_set_pvid);</div><div class='del'>-</div><div class='del'>-int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* To enable 4k VLAN, ordinary VLAN must be enabled first,</div><div class='del'>-	 * but if we disable 4k VLAN it is fine to leave ordinary</div><div class='del'>-	 * VLAN enabled.</div><div class='del'>-	 */</div><div class='del'>-	if (enable) {</div><div class='del'>-		/* Make sure VLAN is ON */</div><div class='del'>-		ret = smi-&gt;ops-&gt;enable_vlan(smi, true);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		smi-&gt;vlan_enabled = true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = smi-&gt;ops-&gt;enable_vlan4k(smi, enable);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	smi-&gt;vlan4k_enabled = enable;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_enable_vlan4k);</div><div class='del'>-</div><div class='del'>-int rtl8366_enable_vlan(struct realtek_smi *smi, bool enable)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = smi-&gt;ops-&gt;enable_vlan(smi, enable);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	smi-&gt;vlan_enabled = enable;</div><div class='del'>-</div><div class='del'>-	/* If we turn VLAN off, make sure that we turn off</div><div class='del'>-	 * 4k VLAN as well, if that happened to be on.</div><div class='del'>-	 */</div><div class='del'>-	if (!enable) {</div><div class='del'>-		smi-&gt;vlan4k_enabled = false;</div><div class='del'>-		ret = smi-&gt;ops-&gt;enable_vlan4k(smi, false);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);</div><div class='del'>-</div><div class='del'>-int rtl8366_reset_vlan(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	struct rtl8366_vlan_mc vlanmc;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	rtl8366_enable_vlan(smi, false);</div><div class='del'>-	rtl8366_enable_vlan4k(smi, false);</div><div class='del'>-</div><div class='del'>-	/* Clear the 16 VLAN member configurations */</div><div class='del'>-	vlanmc.vid = 0;</div><div class='del'>-	vlanmc.priority = 0;</div><div class='del'>-	vlanmc.member = 0;</div><div class='del'>-	vlanmc.untag = 0;</div><div class='del'>-	vlanmc.fid = 0;</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_vlan_mc; i++) {</div><div class='del'>-		ret = smi-&gt;ops-&gt;set_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);</div><div class='del'>-</div><div class='del'>-int rtl8366_init_vlan(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	int port;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = rtl8366_reset_vlan(smi);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Loop over the available ports, for each port, associate</div><div class='del'>-	 * it with the VLAN (port+1)</div><div class='del'>-	 */</div><div class='del'>-	for (port = 0; port &lt; smi-&gt;num_ports; port++) {</div><div class='del'>-		u32 mask;</div><div class='del'>-</div><div class='del'>-		if (port == smi-&gt;cpu_port)</div><div class='del'>-			/* For the CPU port, make all ports members of this</div><div class='del'>-			 * VLAN.</div><div class='del'>-			 */</div><div class='del'>-			mask = GENMASK(smi-&gt;num_ports - 1, 0);</div><div class='del'>-		else</div><div class='del'>-			/* For all other ports, enable itself plus the</div><div class='del'>-			 * CPU port.</div><div class='del'>-			 */</div><div class='del'>-			mask = BIT(port) | BIT(smi-&gt;cpu_port);</div><div class='del'>-</div><div class='del'>-		/* For each port, set the port as member of VLAN (port+1)</div><div class='del'>-		 * and untagged, except for the CPU port: the CPU port (5) is</div><div class='del'>-		 * member of VLAN 6 and so are ALL the other ports as well.</div><div class='del'>-		 * Use filter 0 (no filter).</div><div class='del'>-		 */</div><div class='del'>-		dev_info(smi-&gt;dev, "VLAN%d port mask for port %d, %08x\n",</div><div class='del'>-			 (port + 1), port, mask);</div><div class='del'>-		ret = rtl8366_set_vlan(smi, (port + 1), mask, mask, 0);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		dev_info(smi-&gt;dev, "VLAN%d port %d, PVID set to %d\n",</div><div class='del'>-			 (port + 1), port, (port + 1));</div><div class='del'>-		ret = rtl8366_set_pvid(smi, port, (port + 1));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rtl8366_enable_vlan(smi, true);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_init_vlan);</div><div class='del'>-</div><div class='del'>-int rtl8366_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	struct rtl8366_vlan_4k vlan4k;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!smi-&gt;ops-&gt;is_vlan_valid(smi, port))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "%s filtering on port %d\n",</div><div class='del'>-		 vlan_filtering ? "enable" : "disable",</div><div class='del'>-		 port);</div><div class='del'>-</div><div class='del'>-	/* TODO:</div><div class='del'>-	 * The hardware support filter ID (FID) 0..7, I have no clue how to</div><div class='del'>-	 * support this in the driver when the callback only says on/off.</div><div class='del'>-	 */</div><div class='del'>-	ret = smi-&gt;ops-&gt;get_vlan_4k(smi, port, &amp;vlan4k);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Just set the filter to FID 1 for now then */</div><div class='del'>-	ret = rtl8366_set_vlan(smi, port,</div><div class='del'>-			       vlan4k.member,</div><div class='del'>-			       vlan4k.untag,</div><div class='del'>-			       1);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_vlan_filtering);</div><div class='del'>-</div><div class='del'>-int rtl8366_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			 const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!smi-&gt;ops-&gt;is_vlan_valid(smi, port))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "prepare VLANs %04x..%04x\n",</div><div class='del'>-		 vlan-&gt;vid_begin, vlan-&gt;vid_end);</div><div class='del'>-</div><div class='del'>-	/* Enable VLAN in the hardware</div><div class='del'>-	 * FIXME: what's with this 4k business?</div><div class='del'>-	 * Just rtl8366_enable_vlan() seems inconclusive.</div><div class='del'>-	 */</div><div class='del'>-	ret = rtl8366_enable_vlan4k(smi, true);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_vlan_prepare);</div><div class='del'>-</div><div class='del'>-void rtl8366_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-		      const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	bool untagged = !!(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='del'>-	bool pvid = !!(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID);</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	u32 member = 0;</div><div class='del'>-	u32 untag = 0;</div><div class='del'>-	u16 vid;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!smi-&gt;ops-&gt;is_vlan_valid(smi, port))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "add VLAN on port %d, %s, %s\n",</div><div class='del'>-		 port,</div><div class='del'>-		 untagged ? "untagged" : "tagged",</div><div class='del'>-		 pvid ? " PVID" : "no PVID");</div><div class='del'>-</div><div class='del'>-	if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))</div><div class='del'>-		dev_err(smi-&gt;dev, "port is DSA or CPU port\n");</div><div class='del'>-</div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		int pvid_val = 0;</div><div class='del'>-</div><div class='del'>-		dev_info(smi-&gt;dev, "add VLAN %04x\n", vid);</div><div class='del'>-		member |= BIT(port);</div><div class='del'>-</div><div class='del'>-		if (untagged)</div><div class='del'>-			untag |= BIT(port);</div><div class='del'>-</div><div class='del'>-		/* To ensure that we have a valid MC entry for this VLAN,</div><div class='del'>-		 * initialize the port VLAN ID here.</div><div class='del'>-		 */</div><div class='del'>-		ret = rtl8366_get_pvid(smi, port, &amp;pvid_val);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(smi-&gt;dev, "could not lookup PVID for port %d\n",</div><div class='del'>-				port);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (pvid_val == 0) {</div><div class='del'>-			ret = rtl8366_set_pvid(smi, port, vid);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rtl8366_set_vlan(smi, port, member, untag, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(smi-&gt;dev,</div><div class='del'>-			"failed to set up VLAN %04x",</div><div class='del'>-			vid);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_vlan_add);</div><div class='del'>-</div><div class='del'>-int rtl8366_vlan_del(struct dsa_switch *ds, int port,</div><div class='del'>-		     const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	u16 vid;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "del VLAN on port %d\n", port);</div><div class='del'>-</div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; ++vid) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		dev_info(smi-&gt;dev, "del VLAN %04x\n", vid);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; smi-&gt;num_vlan_mc; i++) {</div><div class='del'>-			struct rtl8366_vlan_mc vlanmc;</div><div class='del'>-</div><div class='del'>-			ret = smi-&gt;ops-&gt;get_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-</div><div class='del'>-			if (vid == vlanmc.vid) {</div><div class='del'>-				/* clear VLAN member configurations */</div><div class='del'>-				vlanmc.vid = 0;</div><div class='del'>-				vlanmc.priority = 0;</div><div class='del'>-				vlanmc.member = 0;</div><div class='del'>-				vlanmc.untag = 0;</div><div class='del'>-				vlanmc.fid = 0;</div><div class='del'>-</div><div class='del'>-				ret = smi-&gt;ops-&gt;set_vlan_mc(smi, i, &amp;vlanmc);</div><div class='del'>-				if (ret) {</div><div class='del'>-					dev_err(smi-&gt;dev,</div><div class='del'>-						"failed to remove VLAN %04x\n",</div><div class='del'>-						vid);</div><div class='del'>-					return ret;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_vlan_del);</div><div class='del'>-</div><div class='del'>-void rtl8366_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='del'>-			 uint8_t *data)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	struct rtl8366_mib_counter *mib;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (port &gt;= smi-&gt;num_ports)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_mib_counters; i++) {</div><div class='del'>-		mib = &amp;smi-&gt;mib_counters[i];</div><div class='del'>-		strncpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-			mib-&gt;name, ETH_GSTRING_LEN);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_get_strings);</div><div class='del'>-</div><div class='del'>-int rtl8366_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* We only support SS_STATS */</div><div class='del'>-	if (sset != ETH_SS_STATS)</div><div class='del'>-		return 0;</div><div class='del'>-	if (port &gt;= smi-&gt;num_ports)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return smi-&gt;num_mib_counters;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_get_sset_count);</div><div class='del'>-</div><div class='del'>-void rtl8366_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (port &gt;= smi-&gt;num_ports)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_mib_counters; i++) {</div><div class='del'>-		struct rtl8366_mib_counter *mib;</div><div class='del'>-		u64 mibvalue = 0;</div><div class='del'>-</div><div class='del'>-		mib = &amp;smi-&gt;mib_counters[i];</div><div class='del'>-		ret = smi-&gt;ops-&gt;get_mib_counter(smi, port, mib, &amp;mibvalue);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(smi-&gt;dev, "error reading MIB counter %s\n",</div><div class='del'>-				mib-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		data[i] = mibvalue;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366_get_ethtool_stats);</div><div class='head'>diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c<br/>deleted file mode 100644<br/>index 40b3974970c6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/rtl8366rb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/rtl8366rb.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1453 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* Realtek SMI subdriver for the Realtek RTL8366RB ethernet switch</div><div class='del'>- *</div><div class='del'>- * This is a sparsely documented chip, the only viable documentation seems</div><div class='del'>- * to be a patched up code drop from the vendor that appear in various</div><div class='del'>- * GPL source trees.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2017 Linus Walleij &lt;linus.walleij@linaro.org&gt;</div><div class='del'>- * Copyright (C) 2009-2010 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- * Copyright (C) 2010 Antti Seppälä &lt;a.seppala@gmail.com&gt;</div><div class='del'>- * Copyright (C) 2010 Roman Yeryomin &lt;roman@advem.lv&gt;</div><div class='del'>- * Copyright (C) 2011 Colin Leitner &lt;colin.leitner@googlemail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/irqdomain.h&gt;</div><div class='del'>-#include &lt;linux/irqchip/chained_irq.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='del'>-#include &lt;linux/regmap.h&gt;</div><div class='del'>-</div><div class='del'>-#include "realtek-smi.h"</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_NUM_CPU		5</div><div class='del'>-#define RTL8366RB_NUM_PORTS		6</div><div class='del'>-#define RTL8366RB_PHY_NO_MAX		4</div><div class='del'>-#define RTL8366RB_PHY_ADDR_MAX		31</div><div class='del'>-</div><div class='del'>-/* Switch Global Configuration register */</div><div class='del'>-#define RTL8366RB_SGCR				0x0000</div><div class='del'>-#define RTL8366RB_SGCR_EN_BC_STORM_CTRL		BIT(0)</div><div class='del'>-#define RTL8366RB_SGCR_MAX_LENGTH(a)		((a) &lt;&lt; 4)</div><div class='del'>-#define RTL8366RB_SGCR_MAX_LENGTH_MASK		RTL8366RB_SGCR_MAX_LENGTH(0x3)</div><div class='del'>-#define RTL8366RB_SGCR_MAX_LENGTH_1522		RTL8366RB_SGCR_MAX_LENGTH(0x0)</div><div class='del'>-#define RTL8366RB_SGCR_MAX_LENGTH_1536		RTL8366RB_SGCR_MAX_LENGTH(0x1)</div><div class='del'>-#define RTL8366RB_SGCR_MAX_LENGTH_1552		RTL8366RB_SGCR_MAX_LENGTH(0x2)</div><div class='del'>-#define RTL8366RB_SGCR_MAX_LENGTH_9216		RTL8366RB_SGCR_MAX_LENGTH(0x3)</div><div class='del'>-#define RTL8366RB_SGCR_EN_VLAN			BIT(13)</div><div class='del'>-#define RTL8366RB_SGCR_EN_VLAN_4KTB		BIT(14)</div><div class='del'>-</div><div class='del'>-/* Port Enable Control register */</div><div class='del'>-#define RTL8366RB_PECR				0x0001</div><div class='del'>-</div><div class='del'>-/* Switch Security Control registers */</div><div class='del'>-#define RTL8366RB_SSCR0				0x0002</div><div class='del'>-#define RTL8366RB_SSCR1				0x0003</div><div class='del'>-#define RTL8366RB_SSCR2				0x0004</div><div class='del'>-#define RTL8366RB_SSCR2_DROP_UNKNOWN_DA		BIT(0)</div><div class='del'>-</div><div class='del'>-/* Port Mode Control registers */</div><div class='del'>-#define RTL8366RB_PMC0				0x0005</div><div class='del'>-#define RTL8366RB_PMC0_SPI			BIT(0)</div><div class='del'>-#define RTL8366RB_PMC0_EN_AUTOLOAD		BIT(1)</div><div class='del'>-#define RTL8366RB_PMC0_PROBE			BIT(2)</div><div class='del'>-#define RTL8366RB_PMC0_DIS_BISR			BIT(3)</div><div class='del'>-#define RTL8366RB_PMC0_ADCTEST			BIT(4)</div><div class='del'>-#define RTL8366RB_PMC0_SRAM_DIAG		BIT(5)</div><div class='del'>-#define RTL8366RB_PMC0_EN_SCAN			BIT(6)</div><div class='del'>-#define RTL8366RB_PMC0_P4_IOMODE_SHIFT		7</div><div class='del'>-#define RTL8366RB_PMC0_P4_IOMODE_MASK		GENMASK(9, 7)</div><div class='del'>-#define RTL8366RB_PMC0_P5_IOMODE_SHIFT		10</div><div class='del'>-#define RTL8366RB_PMC0_P5_IOMODE_MASK		GENMASK(12, 10)</div><div class='del'>-#define RTL8366RB_PMC0_SDSMODE_SHIFT		13</div><div class='del'>-#define RTL8366RB_PMC0_SDSMODE_MASK		GENMASK(15, 13)</div><div class='del'>-#define RTL8366RB_PMC1				0x0006</div><div class='del'>-</div><div class='del'>-/* Port Mirror Control Register */</div><div class='del'>-#define RTL8366RB_PMCR				0x0007</div><div class='del'>-#define RTL8366RB_PMCR_SOURCE_PORT(a)		(a)</div><div class='del'>-#define RTL8366RB_PMCR_SOURCE_PORT_MASK		0x000f</div><div class='del'>-#define RTL8366RB_PMCR_MONITOR_PORT(a)		((a) &lt;&lt; 4)</div><div class='del'>-#define RTL8366RB_PMCR_MONITOR_PORT_MASK	0x00f0</div><div class='del'>-#define RTL8366RB_PMCR_MIRROR_RX		BIT(8)</div><div class='del'>-#define RTL8366RB_PMCR_MIRROR_TX		BIT(9)</div><div class='del'>-#define RTL8366RB_PMCR_MIRROR_SPC		BIT(10)</div><div class='del'>-#define RTL8366RB_PMCR_MIRROR_ISO		BIT(11)</div><div class='del'>-</div><div class='del'>-/* bits 0..7 = port 0, bits 8..15 = port 1 */</div><div class='del'>-#define RTL8366RB_PAACR0		0x0010</div><div class='del'>-/* bits 0..7 = port 2, bits 8..15 = port 3 */</div><div class='del'>-#define RTL8366RB_PAACR1		0x0011</div><div class='del'>-/* bits 0..7 = port 4, bits 8..15 = port 5 */</div><div class='del'>-#define RTL8366RB_PAACR2		0x0012</div><div class='del'>-#define RTL8366RB_PAACR_SPEED_10M	0</div><div class='del'>-#define RTL8366RB_PAACR_SPEED_100M	1</div><div class='del'>-#define RTL8366RB_PAACR_SPEED_1000M	2</div><div class='del'>-#define RTL8366RB_PAACR_FULL_DUPLEX	BIT(2)</div><div class='del'>-#define RTL8366RB_PAACR_LINK_UP		BIT(4)</div><div class='del'>-#define RTL8366RB_PAACR_TX_PAUSE	BIT(5)</div><div class='del'>-#define RTL8366RB_PAACR_RX_PAUSE	BIT(6)</div><div class='del'>-#define RTL8366RB_PAACR_AN		BIT(7)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PAACR_CPU_PORT	(RTL8366RB_PAACR_SPEED_1000M | \</div><div class='del'>-					 RTL8366RB_PAACR_FULL_DUPLEX | \</div><div class='del'>-					 RTL8366RB_PAACR_LINK_UP | \</div><div class='del'>-					 RTL8366RB_PAACR_TX_PAUSE | \</div><div class='del'>-					 RTL8366RB_PAACR_RX_PAUSE)</div><div class='del'>-</div><div class='del'>-/* bits 0..7 = port 0, bits 8..15 = port 1 */</div><div class='del'>-#define RTL8366RB_PSTAT0		0x0014</div><div class='del'>-/* bits 0..7 = port 2, bits 8..15 = port 3 */</div><div class='del'>-#define RTL8366RB_PSTAT1		0x0015</div><div class='del'>-/* bits 0..7 = port 4, bits 8..15 = port 5 */</div><div class='del'>-#define RTL8366RB_PSTAT2		0x0016</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_POWER_SAVING_REG	0x0021</div><div class='del'>-</div><div class='del'>-/* CPU port control reg */</div><div class='del'>-#define RTL8368RB_CPU_CTRL_REG		0x0061</div><div class='del'>-#define RTL8368RB_CPU_PORTS_MSK		0x00FF</div><div class='del'>-/* Enables inserting custom tag length/type 0x8899 */</div><div class='del'>-#define RTL8368RB_CPU_INSTAG		BIT(15)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_SMAR0			0x0070 /* bits 0..15 */</div><div class='del'>-#define RTL8366RB_SMAR1			0x0071 /* bits 16..31 */</div><div class='del'>-#define RTL8366RB_SMAR2			0x0072 /* bits 32..47 */</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_RESET_CTRL_REG		0x0100</div><div class='del'>-#define RTL8366RB_CHIP_CTRL_RESET_HW		BIT(0)</div><div class='del'>-#define RTL8366RB_CHIP_CTRL_RESET_SW		BIT(1)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_CHIP_ID_REG			0x0509</div><div class='del'>-#define RTL8366RB_CHIP_ID_8366			0x5937</div><div class='del'>-#define RTL8366RB_CHIP_VERSION_CTRL_REG		0x050A</div><div class='del'>-#define RTL8366RB_CHIP_VERSION_MASK		0xf</div><div class='del'>-</div><div class='del'>-/* PHY registers control */</div><div class='del'>-#define RTL8366RB_PHY_ACCESS_CTRL_REG		0x8000</div><div class='del'>-#define RTL8366RB_PHY_CTRL_READ			BIT(0)</div><div class='del'>-#define RTL8366RB_PHY_CTRL_WRITE		0</div><div class='del'>-#define RTL8366RB_PHY_ACCESS_BUSY_REG		0x8001</div><div class='del'>-#define RTL8366RB_PHY_INT_BUSY			BIT(0)</div><div class='del'>-#define RTL8366RB_PHY_EXT_BUSY			BIT(4)</div><div class='del'>-#define RTL8366RB_PHY_ACCESS_DATA_REG		0x8002</div><div class='del'>-#define RTL8366RB_PHY_EXT_CTRL_REG		0x8010</div><div class='del'>-#define RTL8366RB_PHY_EXT_WRDATA_REG		0x8011</div><div class='del'>-#define RTL8366RB_PHY_EXT_RDDATA_REG		0x8012</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PHY_REG_MASK			0x1f</div><div class='del'>-#define RTL8366RB_PHY_PAGE_OFFSET		5</div><div class='del'>-#define RTL8366RB_PHY_PAGE_MASK			(0xf &lt;&lt; 5)</div><div class='del'>-#define RTL8366RB_PHY_NO_OFFSET			9</div><div class='del'>-#define RTL8366RB_PHY_NO_MASK			(0x1f &lt;&lt; 9)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_VLAN_INGRESS_CTRL2_REG	0x037f</div><div class='del'>-</div><div class='del'>-/* LED control registers */</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_REG		0x0430</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_MASK		0x0007</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_28MS		0x0000</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_56MS		0x0001</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_84MS		0x0002</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_111MS		0x0003</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_222MS		0x0004</div><div class='del'>-#define RTL8366RB_LED_BLINKRATE_446MS		0x0005</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_LED_CTRL_REG			0x0431</div><div class='del'>-#define RTL8366RB_LED_OFF			0x0</div><div class='del'>-#define RTL8366RB_LED_DUP_COL			0x1</div><div class='del'>-#define RTL8366RB_LED_LINK_ACT			0x2</div><div class='del'>-#define RTL8366RB_LED_SPD1000			0x3</div><div class='del'>-#define RTL8366RB_LED_SPD100			0x4</div><div class='del'>-#define RTL8366RB_LED_SPD10			0x5</div><div class='del'>-#define RTL8366RB_LED_SPD1000_ACT		0x6</div><div class='del'>-#define RTL8366RB_LED_SPD100_ACT		0x7</div><div class='del'>-#define RTL8366RB_LED_SPD10_ACT			0x8</div><div class='del'>-#define RTL8366RB_LED_SPD100_10_ACT		0x9</div><div class='del'>-#define RTL8366RB_LED_FIBER			0xa</div><div class='del'>-#define RTL8366RB_LED_AN_FAULT			0xb</div><div class='del'>-#define RTL8366RB_LED_LINK_RX			0xc</div><div class='del'>-#define RTL8366RB_LED_LINK_TX			0xd</div><div class='del'>-#define RTL8366RB_LED_MASTER			0xe</div><div class='del'>-#define RTL8366RB_LED_FORCE			0xf</div><div class='del'>-#define RTL8366RB_LED_0_1_CTRL_REG		0x0432</div><div class='del'>-#define RTL8366RB_LED_1_OFFSET			6</div><div class='del'>-#define RTL8366RB_LED_2_3_CTRL_REG		0x0433</div><div class='del'>-#define RTL8366RB_LED_3_OFFSET			6</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_MIB_COUNT			33</div><div class='del'>-#define RTL8366RB_GLOBAL_MIB_COUNT		1</div><div class='del'>-#define RTL8366RB_MIB_COUNTER_PORT_OFFSET	0x0050</div><div class='del'>-#define RTL8366RB_MIB_COUNTER_BASE		0x1000</div><div class='del'>-#define RTL8366RB_MIB_CTRL_REG			0x13F0</div><div class='del'>-#define RTL8366RB_MIB_CTRL_USER_MASK		0x0FFC</div><div class='del'>-#define RTL8366RB_MIB_CTRL_BUSY_MASK		BIT(0)</div><div class='del'>-#define RTL8366RB_MIB_CTRL_RESET_MASK		BIT(1)</div><div class='del'>-#define RTL8366RB_MIB_CTRL_PORT_RESET(_p)	BIT(2 + (_p))</div><div class='del'>-#define RTL8366RB_MIB_CTRL_GLOBAL_RESET		BIT(11)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_VLAN_CTRL_BASE		0x0063</div><div class='del'>-#define RTL8366RB_PORT_VLAN_CTRL_REG(_p)  \</div><div class='del'>-		(RTL8366RB_PORT_VLAN_CTRL_BASE + (_p) / 4)</div><div class='del'>-#define RTL8366RB_PORT_VLAN_CTRL_MASK		0xf</div><div class='del'>-#define RTL8366RB_PORT_VLAN_CTRL_SHIFT(_p)	(4 * ((_p) % 4))</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_VLAN_TABLE_READ_BASE		0x018C</div><div class='del'>-#define RTL8366RB_VLAN_TABLE_WRITE_BASE		0x0185</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_TABLE_ACCESS_CTRL_REG		0x0180</div><div class='del'>-#define RTL8366RB_TABLE_VLAN_READ_CTRL		0x0E01</div><div class='del'>-#define RTL8366RB_TABLE_VLAN_WRITE_CTRL		0x0F01</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_VLAN_MC_BASE(_x)		(0x0020 + (_x) * 3)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_LINK_STATUS_BASE		0x0014</div><div class='del'>-#define RTL8366RB_PORT_STATUS_SPEED_MASK	0x0003</div><div class='del'>-#define RTL8366RB_PORT_STATUS_DUPLEX_MASK	0x0004</div><div class='del'>-#define RTL8366RB_PORT_STATUS_LINK_MASK		0x0010</div><div class='del'>-#define RTL8366RB_PORT_STATUS_TXPAUSE_MASK	0x0020</div><div class='del'>-#define RTL8366RB_PORT_STATUS_RXPAUSE_MASK	0x0040</div><div class='del'>-#define RTL8366RB_PORT_STATUS_AN_MASK		0x0080</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_NUM_VLANS		16</div><div class='del'>-#define RTL8366RB_NUM_LEDGROUPS		4</div><div class='del'>-#define RTL8366RB_NUM_VIDS		4096</div><div class='del'>-#define RTL8366RB_PRIORITYMAX		7</div><div class='del'>-#define RTL8366RB_FIDMAX		7</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_1		BIT(0) /* In userspace port 0 */</div><div class='del'>-#define RTL8366RB_PORT_2		BIT(1) /* In userspace port 1 */</div><div class='del'>-#define RTL8366RB_PORT_3		BIT(2) /* In userspace port 2 */</div><div class='del'>-#define RTL8366RB_PORT_4		BIT(3) /* In userspace port 3 */</div><div class='del'>-#define RTL8366RB_PORT_5		BIT(4) /* In userspace port 4 */</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_CPU		BIT(5) /* CPU port */</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_ALL		(RTL8366RB_PORT_1 |	\</div><div class='del'>-					 RTL8366RB_PORT_2 |	\</div><div class='del'>-					 RTL8366RB_PORT_3 |	\</div><div class='del'>-					 RTL8366RB_PORT_4 |	\</div><div class='del'>-					 RTL8366RB_PORT_5 |	\</div><div class='del'>-					 RTL8366RB_PORT_CPU)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_ALL_BUT_CPU	(RTL8366RB_PORT_1 |	\</div><div class='del'>-					 RTL8366RB_PORT_2 |	\</div><div class='del'>-					 RTL8366RB_PORT_3 |	\</div><div class='del'>-					 RTL8366RB_PORT_4 |	\</div><div class='del'>-					 RTL8366RB_PORT_5)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_ALL_EXTERNAL	(RTL8366RB_PORT_1 |	\</div><div class='del'>-					 RTL8366RB_PORT_2 |	\</div><div class='del'>-					 RTL8366RB_PORT_3 |	\</div><div class='del'>-					 RTL8366RB_PORT_4)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_PORT_ALL_INTERNAL	 RTL8366RB_PORT_CPU</div><div class='del'>-</div><div class='del'>-/* First configuration word per member config, VID and prio */</div><div class='del'>-#define RTL8366RB_VLAN_VID_MASK		0xfff</div><div class='del'>-#define RTL8366RB_VLAN_PRIORITY_SHIFT	12</div><div class='del'>-#define RTL8366RB_VLAN_PRIORITY_MASK	0x7</div><div class='del'>-/* Second configuration word per member config, member and untagged */</div><div class='del'>-#define RTL8366RB_VLAN_UNTAG_SHIFT	8</div><div class='del'>-#define RTL8366RB_VLAN_UNTAG_MASK	0xff</div><div class='del'>-#define RTL8366RB_VLAN_MEMBER_MASK	0xff</div><div class='del'>-/* Third config word per member config, STAG currently unused */</div><div class='del'>-#define RTL8366RB_VLAN_STAG_MBR_MASK	0xff</div><div class='del'>-#define RTL8366RB_VLAN_STAG_MBR_SHIFT	8</div><div class='del'>-#define RTL8366RB_VLAN_STAG_IDX_MASK	0x7</div><div class='del'>-#define RTL8366RB_VLAN_STAG_IDX_SHIFT	5</div><div class='del'>-#define RTL8366RB_VLAN_FID_MASK		0x7</div><div class='del'>-</div><div class='del'>-/* Port ingress bandwidth control */</div><div class='del'>-#define RTL8366RB_IB_BASE		0x0200</div><div class='del'>-#define RTL8366RB_IB_REG(pnum)		(RTL8366RB_IB_BASE + (pnum))</div><div class='del'>-#define RTL8366RB_IB_BDTH_MASK		0x3fff</div><div class='del'>-#define RTL8366RB_IB_PREIFG		BIT(14)</div><div class='del'>-</div><div class='del'>-/* Port egress bandwidth control */</div><div class='del'>-#define RTL8366RB_EB_BASE		0x02d1</div><div class='del'>-#define RTL8366RB_EB_REG(pnum)		(RTL8366RB_EB_BASE + (pnum))</div><div class='del'>-#define RTL8366RB_EB_BDTH_MASK		0x3fff</div><div class='del'>-#define RTL8366RB_EB_PREIFG_REG		0x02f8</div><div class='del'>-#define RTL8366RB_EB_PREIFG		BIT(9)</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_BDTH_SW_MAX		1048512 /* 1048576? */</div><div class='del'>-#define RTL8366RB_BDTH_UNIT		64</div><div class='del'>-#define RTL8366RB_BDTH_REG_DEFAULT	16383</div><div class='del'>-</div><div class='del'>-/* QOS */</div><div class='del'>-#define RTL8366RB_QOS			BIT(15)</div><div class='del'>-/* Include/Exclude Preamble and IFG (20 bytes). 0:Exclude, 1:Include. */</div><div class='del'>-#define RTL8366RB_QOS_DEFAULT_PREIFG	1</div><div class='del'>-</div><div class='del'>-/* Interrupt handling */</div><div class='del'>-#define RTL8366RB_INTERRUPT_CONTROL_REG	0x0440</div><div class='del'>-#define RTL8366RB_INTERRUPT_POLARITY	BIT(0)</div><div class='del'>-#define RTL8366RB_P4_RGMII_LED		BIT(2)</div><div class='del'>-#define RTL8366RB_INTERRUPT_MASK_REG	0x0441</div><div class='del'>-#define RTL8366RB_INTERRUPT_LINK_CHGALL	GENMASK(11, 0)</div><div class='del'>-#define RTL8366RB_INTERRUPT_ACLEXCEED	BIT(8)</div><div class='del'>-#define RTL8366RB_INTERRUPT_STORMEXCEED	BIT(9)</div><div class='del'>-#define RTL8366RB_INTERRUPT_P4_FIBER	BIT(12)</div><div class='del'>-#define RTL8366RB_INTERRUPT_P4_UTP	BIT(13)</div><div class='del'>-#define RTL8366RB_INTERRUPT_VALID	(RTL8366RB_INTERRUPT_LINK_CHGALL | \</div><div class='del'>-					 RTL8366RB_INTERRUPT_ACLEXCEED | \</div><div class='del'>-					 RTL8366RB_INTERRUPT_STORMEXCEED | \</div><div class='del'>-					 RTL8366RB_INTERRUPT_P4_FIBER | \</div><div class='del'>-					 RTL8366RB_INTERRUPT_P4_UTP)</div><div class='del'>-#define RTL8366RB_INTERRUPT_STATUS_REG	0x0442</div><div class='del'>-#define RTL8366RB_NUM_INTERRUPT		14 /* 0..13 */</div><div class='del'>-</div><div class='del'>-/* bits 0..5 enable force when cleared */</div><div class='del'>-#define RTL8366RB_MAC_FORCE_CTRL_REG	0x0F11</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_OAM_PARSER_REG	0x0F14</div><div class='del'>-#define RTL8366RB_OAM_MULTIPLEXER_REG	0x0F15</div><div class='del'>-</div><div class='del'>-#define RTL8366RB_GREEN_FEATURE_REG	0x0F51</div><div class='del'>-#define RTL8366RB_GREEN_FEATURE_MSK	0x0007</div><div class='del'>-#define RTL8366RB_GREEN_FEATURE_TX	BIT(0)</div><div class='del'>-#define RTL8366RB_GREEN_FEATURE_RX	BIT(2)</div><div class='del'>-</div><div class='del'>-static struct rtl8366_mib_counter rtl8366rb_mib_counters[] = {</div><div class='del'>-	{ 0,  0, 4, "IfInOctets"				},</div><div class='del'>-	{ 0,  4, 4, "EtherStatsOctets"				},</div><div class='del'>-	{ 0,  8, 2, "EtherStatsUnderSizePkts"			},</div><div class='del'>-	{ 0, 10, 2, "EtherFragments"				},</div><div class='del'>-	{ 0, 12, 2, "EtherStatsPkts64Octets"			},</div><div class='del'>-	{ 0, 14, 2, "EtherStatsPkts65to127Octets"		},</div><div class='del'>-	{ 0, 16, 2, "EtherStatsPkts128to255Octets"		},</div><div class='del'>-	{ 0, 18, 2, "EtherStatsPkts256to511Octets"		},</div><div class='del'>-	{ 0, 20, 2, "EtherStatsPkts512to1023Octets"		},</div><div class='del'>-	{ 0, 22, 2, "EtherStatsPkts1024to1518Octets"		},</div><div class='del'>-	{ 0, 24, 2, "EtherOversizeStats"			},</div><div class='del'>-	{ 0, 26, 2, "EtherStatsJabbers"				},</div><div class='del'>-	{ 0, 28, 2, "IfInUcastPkts"				},</div><div class='del'>-	{ 0, 30, 2, "EtherStatsMulticastPkts"			},</div><div class='del'>-	{ 0, 32, 2, "EtherStatsBroadcastPkts"			},</div><div class='del'>-	{ 0, 34, 2, "EtherStatsDropEvents"			},</div><div class='del'>-	{ 0, 36, 2, "Dot3StatsFCSErrors"			},</div><div class='del'>-	{ 0, 38, 2, "Dot3StatsSymbolErrors"			},</div><div class='del'>-	{ 0, 40, 2, "Dot3InPauseFrames"				},</div><div class='del'>-	{ 0, 42, 2, "Dot3ControlInUnknownOpcodes"		},</div><div class='del'>-	{ 0, 44, 4, "IfOutOctets"				},</div><div class='del'>-	{ 0, 48, 2, "Dot3StatsSingleCollisionFrames"		},</div><div class='del'>-	{ 0, 50, 2, "Dot3StatMultipleCollisionFrames"		},</div><div class='del'>-	{ 0, 52, 2, "Dot3sDeferredTransmissions"		},</div><div class='del'>-	{ 0, 54, 2, "Dot3StatsLateCollisions"			},</div><div class='del'>-	{ 0, 56, 2, "EtherStatsCollisions"			},</div><div class='del'>-	{ 0, 58, 2, "Dot3StatsExcessiveCollisions"		},</div><div class='del'>-	{ 0, 60, 2, "Dot3OutPauseFrames"			},</div><div class='del'>-	{ 0, 62, 2, "Dot1dBasePortDelayExceededDiscards"	},</div><div class='del'>-	{ 0, 64, 2, "Dot1dTpPortInDiscards"			},</div><div class='del'>-	{ 0, 66, 2, "IfOutUcastPkts"				},</div><div class='del'>-	{ 0, 68, 2, "IfOutMulticastPkts"			},</div><div class='del'>-	{ 0, 70, 2, "IfOutBroadcastPkts"			},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_get_mib_counter(struct realtek_smi *smi,</div><div class='del'>-				     int port,</div><div class='del'>-				     struct rtl8366_mib_counter *mib,</div><div class='del'>-				     u64 *mibvalue)</div><div class='del'>-{</div><div class='del'>-	u32 addr, val;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	addr = RTL8366RB_MIB_COUNTER_BASE +</div><div class='del'>-		RTL8366RB_MIB_COUNTER_PORT_OFFSET * (port) +</div><div class='del'>-		mib-&gt;offset;</div><div class='del'>-</div><div class='del'>-	/* Writing access counter address first</div><div class='del'>-	 * then ASIC will prepare 64bits counter wait for being retrived</div><div class='del'>-	 */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, addr, 0); /* Write whatever */</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Read MIB control register */</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_MIB_CTRL_REG, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	if (val &amp; RTL8366RB_MIB_CTRL_BUSY_MASK)</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (val &amp; RTL8366RB_MIB_CTRL_RESET_MASK)</div><div class='del'>-		return -EIO;</div><div class='del'>-</div><div class='del'>-	/* Read each individual MIB 16 bits at the time */</div><div class='del'>-	*mibvalue = 0;</div><div class='del'>-	for (i = mib-&gt;length; i &gt; 0; i--) {</div><div class='del'>-		ret = regmap_read(smi-&gt;map, addr + (i - 1), &amp;val);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		*mibvalue = (*mibvalue &lt;&lt; 16) | (val &amp; 0xFFFF);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 rtl8366rb_get_irqmask(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	int line = irqd_to_hwirq(d);</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* For line interrupts we combine link down in bits</div><div class='del'>-	 * 6..11 with link up in bits 0..5 into one interrupt.</div><div class='del'>-	 */</div><div class='del'>-	if (line &lt; 12)</div><div class='del'>-		val = BIT(line) | BIT(line + 6);</div><div class='del'>-	else</div><div class='del'>-		val = BIT(line);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl8366rb_mask_irq(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = irq_data_get_irq_chip_data(d);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_INTERRUPT_MASK_REG,</div><div class='del'>-				 rtl8366rb_get_irqmask(d), 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(smi-&gt;dev, "could not mask IRQ\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl8366rb_unmask_irq(struct irq_data *d)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = irq_data_get_irq_chip_data(d);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_INTERRUPT_MASK_REG,</div><div class='del'>-				 rtl8366rb_get_irqmask(d),</div><div class='del'>-				 rtl8366rb_get_irqmask(d));</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(smi-&gt;dev, "could not unmask IRQ\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t rtl8366rb_irq(int irq, void *data)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = data;</div><div class='del'>-	u32 stat;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* This clears the IRQ status register */</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_INTERRUPT_STATUS_REG,</div><div class='del'>-			  &amp;stat);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "can't read interrupt status\n");</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-	stat &amp;= RTL8366RB_INTERRUPT_VALID;</div><div class='del'>-	if (!stat)</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	while (stat) {</div><div class='del'>-		int line = __ffs(stat);</div><div class='del'>-		int child_irq;</div><div class='del'>-</div><div class='del'>-		stat &amp;= ~BIT(line);</div><div class='del'>-		/* For line interrupts we combine link down in bits</div><div class='del'>-		 * 6..11 with link up in bits 0..5 into one interrupt.</div><div class='del'>-		 */</div><div class='del'>-		if (line &lt; 12 &amp;&amp; line &gt; 5)</div><div class='del'>-			line -= 5;</div><div class='del'>-		child_irq = irq_find_mapping(smi-&gt;irqdomain, line);</div><div class='del'>-		handle_nested_irq(child_irq);</div><div class='del'>-	}</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct irq_chip rtl8366rb_irq_chip = {</div><div class='del'>-	.name = "RTL8366RB",</div><div class='del'>-	.irq_mask = rtl8366rb_mask_irq,</div><div class='del'>-	.irq_unmask = rtl8366rb_unmask_irq,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_irq_map(struct irq_domain *domain, unsigned int irq,</div><div class='del'>-			     irq_hw_number_t hwirq)</div><div class='del'>-{</div><div class='del'>-	irq_set_chip_data(irq, domain-&gt;host_data);</div><div class='del'>-	irq_set_chip_and_handler(irq, &amp;rtl8366rb_irq_chip, handle_simple_irq);</div><div class='del'>-	irq_set_nested_thread(irq, 1);</div><div class='del'>-	irq_set_noprobe(irq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl8366rb_irq_unmap(struct irq_domain *d, unsigned int irq)</div><div class='del'>-{</div><div class='del'>-	irq_set_nested_thread(irq, 0);</div><div class='del'>-	irq_set_chip_and_handler(irq, NULL, NULL);</div><div class='del'>-	irq_set_chip_data(irq, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct irq_domain_ops rtl8366rb_irqdomain_ops = {</div><div class='del'>-	.map = rtl8366rb_irq_map,</div><div class='del'>-	.unmap = rtl8366rb_irq_unmap,</div><div class='del'>-	.xlate  = irq_domain_xlate_onecell,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_setup_cascaded_irq(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	struct device_node *intc;</div><div class='del'>-	unsigned long irq_trig;</div><div class='del'>-	int irq;</div><div class='del'>-	int ret;</div><div class='del'>-	u32 val;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	intc = of_get_child_by_name(smi-&gt;dev-&gt;of_node, "interrupt-controller");</div><div class='del'>-	if (!intc) {</div><div class='del'>-		dev_err(smi-&gt;dev, "missing child interrupt-controller node\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	/* RB8366RB IRQs cascade off this one */</div><div class='del'>-	irq = of_irq_get(intc, 0);</div><div class='del'>-	if (irq &lt;= 0) {</div><div class='del'>-		dev_err(smi-&gt;dev, "failed to get parent IRQ\n");</div><div class='del'>-		return irq ? irq : -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This clears the IRQ status register */</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_INTERRUPT_STATUS_REG,</div><div class='del'>-			  &amp;val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "can't read interrupt status\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fetch IRQ edge information from the descriptor */</div><div class='del'>-	irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));</div><div class='del'>-	switch (irq_trig) {</div><div class='del'>-	case IRQF_TRIGGER_RISING:</div><div class='del'>-	case IRQF_TRIGGER_HIGH:</div><div class='del'>-		dev_info(smi-&gt;dev, "active high/rising IRQ\n");</div><div class='del'>-		val = 0;</div><div class='del'>-		break;</div><div class='del'>-	case IRQF_TRIGGER_FALLING:</div><div class='del'>-	case IRQF_TRIGGER_LOW:</div><div class='del'>-		dev_info(smi-&gt;dev, "active low/falling IRQ\n");</div><div class='del'>-		val = RTL8366RB_INTERRUPT_POLARITY;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_INTERRUPT_CONTROL_REG,</div><div class='del'>-				 RTL8366RB_INTERRUPT_POLARITY,</div><div class='del'>-				 val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "could not configure IRQ polarity\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = devm_request_threaded_irq(smi-&gt;dev, irq, NULL,</div><div class='del'>-					rtl8366rb_irq, IRQF_ONESHOT,</div><div class='del'>-					"RTL8366RB", smi);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "unable to request irq: %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	smi-&gt;irqdomain = irq_domain_add_linear(intc,</div><div class='del'>-					       RTL8366RB_NUM_INTERRUPT,</div><div class='del'>-					       &amp;rtl8366rb_irqdomain_ops,</div><div class='del'>-					       smi);</div><div class='del'>-	if (!smi-&gt;irqdomain) {</div><div class='del'>-		dev_err(smi-&gt;dev, "failed to create IRQ domain\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; smi-&gt;num_ports; i++)</div><div class='del'>-		irq_set_parent(irq_create_mapping(smi-&gt;irqdomain, i), irq);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_set_addr(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	u8 addr[ETH_ALEN];</div><div class='del'>-	u16 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	eth_random_addr(addr);</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "set MAC: %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='del'>-		 addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);</div><div class='del'>-	val = addr[0] &lt;&lt; 8 | addr[1];</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_SMAR0, val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	val = addr[2] &lt;&lt; 8 | addr[3];</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_SMAR1, val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	val = addr[4] &lt;&lt; 8 | addr[5];</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_SMAR2, val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Found in a vendor driver */</div><div class='del'>-</div><div class='del'>-/* For the "version 0" early silicon, appear in most source releases */</div><div class='del'>-static const u16 rtl8366rb_init_jam_ver_0[] = {</div><div class='del'>-	0x000B, 0x0001, 0x03A6, 0x0100, 0x03A7, 0x0001, 0x02D1, 0x3FFF,</div><div class='del'>-	0x02D2, 0x3FFF, 0x02D3, 0x3FFF, 0x02D4, 0x3FFF, 0x02D5, 0x3FFF,</div><div class='del'>-	0x02D6, 0x3FFF, 0x02D7, 0x3FFF, 0x02D8, 0x3FFF, 0x022B, 0x0688,</div><div class='del'>-	0x022C, 0x0FAC, 0x03D0, 0x4688, 0x03D1, 0x01F5, 0x0000, 0x0830,</div><div class='del'>-	0x02F9, 0x0200, 0x02F7, 0x7FFF, 0x02F8, 0x03FF, 0x0080, 0x03E8,</div><div class='del'>-	0x0081, 0x00CE, 0x0082, 0x00DA, 0x0083, 0x0230, 0xBE0F, 0x2000,</div><div class='del'>-	0x0231, 0x422A, 0x0232, 0x422A, 0x0233, 0x422A, 0x0234, 0x422A,</div><div class='del'>-	0x0235, 0x422A, 0x0236, 0x422A, 0x0237, 0x422A, 0x0238, 0x422A,</div><div class='del'>-	0x0239, 0x422A, 0x023A, 0x422A, 0x023B, 0x422A, 0x023C, 0x422A,</div><div class='del'>-	0x023D, 0x422A, 0x023E, 0x422A, 0x023F, 0x422A, 0x0240, 0x422A,</div><div class='del'>-	0x0241, 0x422A, 0x0242, 0x422A, 0x0243, 0x422A, 0x0244, 0x422A,</div><div class='del'>-	0x0245, 0x422A, 0x0246, 0x422A, 0x0247, 0x422A, 0x0248, 0x422A,</div><div class='del'>-	0x0249, 0x0146, 0x024A, 0x0146, 0x024B, 0x0146, 0xBE03, 0xC961,</div><div class='del'>-	0x024D, 0x0146, 0x024E, 0x0146, 0x024F, 0x0146, 0x0250, 0x0146,</div><div class='del'>-	0xBE64, 0x0226, 0x0252, 0x0146, 0x0253, 0x0146, 0x024C, 0x0146,</div><div class='del'>-	0x0251, 0x0146, 0x0254, 0x0146, 0xBE62, 0x3FD0, 0x0084, 0x0320,</div><div class='del'>-	0x0255, 0x0146, 0x0256, 0x0146, 0x0257, 0x0146, 0x0258, 0x0146,</div><div class='del'>-	0x0259, 0x0146, 0x025A, 0x0146, 0x025B, 0x0146, 0x025C, 0x0146,</div><div class='del'>-	0x025D, 0x0146, 0x025E, 0x0146, 0x025F, 0x0146, 0x0260, 0x0146,</div><div class='del'>-	0x0261, 0xA23F, 0x0262, 0x0294, 0x0263, 0xA23F, 0x0264, 0x0294,</div><div class='del'>-	0x0265, 0xA23F, 0x0266, 0x0294, 0x0267, 0xA23F, 0x0268, 0x0294,</div><div class='del'>-	0x0269, 0xA23F, 0x026A, 0x0294, 0x026B, 0xA23F, 0x026C, 0x0294,</div><div class='del'>-	0x026D, 0xA23F, 0x026E, 0x0294, 0x026F, 0xA23F, 0x0270, 0x0294,</div><div class='del'>-	0x02F5, 0x0048, 0xBE09, 0x0E00, 0xBE1E, 0x0FA0, 0xBE14, 0x8448,</div><div class='del'>-	0xBE15, 0x1007, 0xBE4A, 0xA284, 0xC454, 0x3F0B, 0xC474, 0x3F0B,</div><div class='del'>-	0xBE48, 0x3672, 0xBE4B, 0x17A7, 0xBE4C, 0x0B15, 0xBE52, 0x0EDD,</div><div class='del'>-	0xBE49, 0x8C00, 0xBE5B, 0x785C, 0xBE5C, 0x785C, 0xBE5D, 0x785C,</div><div class='del'>-	0xBE61, 0x368A, 0xBE63, 0x9B84, 0xC456, 0xCC13, 0xC476, 0xCC13,</div><div class='del'>-	0xBE65, 0x307D, 0xBE6D, 0x0005, 0xBE6E, 0xE120, 0xBE2E, 0x7BAF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This v1 init sequence is from Belkin F5D8235 U-Boot release */</div><div class='del'>-static const u16 rtl8366rb_init_jam_ver_1[] = {</div><div class='del'>-	0x0000, 0x0830, 0x0001, 0x8000, 0x0400, 0x8130, 0xBE78, 0x3C3C,</div><div class='del'>-	0x0431, 0x5432, 0xBE37, 0x0CE4, 0x02FA, 0xFFDF, 0x02FB, 0xFFE0,</div><div class='del'>-	0xC44C, 0x1585, 0xC44C, 0x1185, 0xC44C, 0x1585, 0xC46C, 0x1585,</div><div class='del'>-	0xC46C, 0x1185, 0xC46C, 0x1585, 0xC451, 0x2135, 0xC471, 0x2135,</div><div class='del'>-	0xBE10, 0x8140, 0xBE15, 0x0007, 0xBE6E, 0xE120, 0xBE69, 0xD20F,</div><div class='del'>-	0xBE6B, 0x0320, 0xBE24, 0xB000, 0xBE23, 0xFF51, 0xBE22, 0xDF20,</div><div class='del'>-	0xBE21, 0x0140, 0xBE20, 0x00BB, 0xBE24, 0xB800, 0xBE24, 0x0000,</div><div class='del'>-	0xBE24, 0x7000, 0xBE23, 0xFF51, 0xBE22, 0xDF60, 0xBE21, 0x0140,</div><div class='del'>-	0xBE20, 0x0077, 0xBE24, 0x7800, 0xBE24, 0x0000, 0xBE2E, 0x7B7A,</div><div class='del'>-	0xBE36, 0x0CE4, 0x02F5, 0x0048, 0xBE77, 0x2940, 0x000A, 0x83E0,</div><div class='del'>-	0xBE79, 0x3C3C, 0xBE00, 0x1340,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This v2 init sequence is from Belkin F5D8235 U-Boot release */</div><div class='del'>-static const u16 rtl8366rb_init_jam_ver_2[] = {</div><div class='del'>-	0x0450, 0x0000, 0x0400, 0x8130, 0x000A, 0x83ED, 0x0431, 0x5432,</div><div class='del'>-	0xC44F, 0x6250, 0xC46F, 0x6250, 0xC456, 0x0C14, 0xC476, 0x0C14,</div><div class='del'>-	0xC44C, 0x1C85, 0xC44C, 0x1885, 0xC44C, 0x1C85, 0xC46C, 0x1C85,</div><div class='del'>-	0xC46C, 0x1885, 0xC46C, 0x1C85, 0xC44C, 0x0885, 0xC44C, 0x0881,</div><div class='del'>-	0xC44C, 0x0885, 0xC46C, 0x0885, 0xC46C, 0x0881, 0xC46C, 0x0885,</div><div class='del'>-	0xBE2E, 0x7BA7, 0xBE36, 0x1000, 0xBE37, 0x1000, 0x8000, 0x0001,</div><div class='del'>-	0xBE69, 0xD50F, 0x8000, 0x0000, 0xBE69, 0xD50F, 0xBE6E, 0x0320,</div><div class='del'>-	0xBE77, 0x2940, 0xBE78, 0x3C3C, 0xBE79, 0x3C3C, 0xBE6E, 0xE120,</div><div class='del'>-	0x8000, 0x0001, 0xBE15, 0x1007, 0x8000, 0x0000, 0xBE15, 0x1007,</div><div class='del'>-	0xBE14, 0x0448, 0xBE1E, 0x00A0, 0xBE10, 0x8160, 0xBE10, 0x8140,</div><div class='del'>-	0xBE00, 0x1340, 0x0F51, 0x0010,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Appears in a DDWRT code dump */</div><div class='del'>-static const u16 rtl8366rb_init_jam_ver_3[] = {</div><div class='del'>-	0x0000, 0x0830, 0x0400, 0x8130, 0x000A, 0x83ED, 0x0431, 0x5432,</div><div class='del'>-	0x0F51, 0x0017, 0x02F5, 0x0048, 0x02FA, 0xFFDF, 0x02FB, 0xFFE0,</div><div class='del'>-	0xC456, 0x0C14, 0xC476, 0x0C14, 0xC454, 0x3F8B, 0xC474, 0x3F8B,</div><div class='del'>-	0xC450, 0x2071, 0xC470, 0x2071, 0xC451, 0x226B, 0xC471, 0x226B,</div><div class='del'>-	0xC452, 0xA293, 0xC472, 0xA293, 0xC44C, 0x1585, 0xC44C, 0x1185,</div><div class='del'>-	0xC44C, 0x1585, 0xC46C, 0x1585, 0xC46C, 0x1185, 0xC46C, 0x1585,</div><div class='del'>-	0xC44C, 0x0185, 0xC44C, 0x0181, 0xC44C, 0x0185, 0xC46C, 0x0185,</div><div class='del'>-	0xC46C, 0x0181, 0xC46C, 0x0185, 0xBE24, 0xB000, 0xBE23, 0xFF51,</div><div class='del'>-	0xBE22, 0xDF20, 0xBE21, 0x0140, 0xBE20, 0x00BB, 0xBE24, 0xB800,</div><div class='del'>-	0xBE24, 0x0000, 0xBE24, 0x7000, 0xBE23, 0xFF51, 0xBE22, 0xDF60,</div><div class='del'>-	0xBE21, 0x0140, 0xBE20, 0x0077, 0xBE24, 0x7800, 0xBE24, 0x0000,</div><div class='del'>-	0xBE2E, 0x7BA7, 0xBE36, 0x1000, 0xBE37, 0x1000, 0x8000, 0x0001,</div><div class='del'>-	0xBE69, 0xD50F, 0x8000, 0x0000, 0xBE69, 0xD50F, 0xBE6B, 0x0320,</div><div class='del'>-	0xBE77, 0x2800, 0xBE78, 0x3C3C, 0xBE79, 0x3C3C, 0xBE6E, 0xE120,</div><div class='del'>-	0x8000, 0x0001, 0xBE10, 0x8140, 0x8000, 0x0000, 0xBE10, 0x8140,</div><div class='del'>-	0xBE15, 0x1007, 0xBE14, 0x0448, 0xBE1E, 0x00A0, 0xBE10, 0x8160,</div><div class='del'>-	0xBE10, 0x8140, 0xBE00, 0x1340, 0x0450, 0x0000, 0x0401, 0x0000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Belkin F5D8235 v1, "belkin,f5d8235-v1" */</div><div class='del'>-static const u16 rtl8366rb_init_jam_f5d8235[] = {</div><div class='del'>-	0x0242, 0x02BF, 0x0245, 0x02BF, 0x0248, 0x02BF, 0x024B, 0x02BF,</div><div class='del'>-	0x024E, 0x02BF, 0x0251, 0x02BF, 0x0254, 0x0A3F, 0x0256, 0x0A3F,</div><div class='del'>-	0x0258, 0x0A3F, 0x025A, 0x0A3F, 0x025C, 0x0A3F, 0x025E, 0x0A3F,</div><div class='del'>-	0x0263, 0x007C, 0x0100, 0x0004, 0xBE5B, 0x3500, 0x800E, 0x200F,</div><div class='del'>-	0xBE1D, 0x0F00, 0x8001, 0x5011, 0x800A, 0xA2F4, 0x800B, 0x17A3,</div><div class='del'>-	0xBE4B, 0x17A3, 0xBE41, 0x5011, 0xBE17, 0x2100, 0x8000, 0x8304,</div><div class='del'>-	0xBE40, 0x8304, 0xBE4A, 0xA2F4, 0x800C, 0xA8D5, 0x8014, 0x5500,</div><div class='del'>-	0x8015, 0x0004, 0xBE4C, 0xA8D5, 0xBE59, 0x0008, 0xBE09, 0x0E00,</div><div class='del'>-	0xBE36, 0x1036, 0xBE37, 0x1036, 0x800D, 0x00FF, 0xBE4D, 0x00FF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DGN3500, "netgear,dgn3500", "netgear,dgn3500b" */</div><div class='del'>-static const u16 rtl8366rb_init_jam_dgn3500[] = {</div><div class='del'>-	0x0000, 0x0830, 0x0400, 0x8130, 0x000A, 0x83ED, 0x0F51, 0x0017,</div><div class='del'>-	0x02F5, 0x0048, 0x02FA, 0xFFDF, 0x02FB, 0xFFE0, 0x0450, 0x0000,</div><div class='del'>-	0x0401, 0x0000, 0x0431, 0x0960,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This jam table activates "green ethernet", which means low power mode</div><div class='del'>- * and is claimed to detect the cable length and not use more power than</div><div class='del'>- * necessary, and the ports should enter power saving mode 10 seconds after</div><div class='del'>- * a cable is disconnected. Seems to always be the same.</div><div class='del'>- */</div><div class='del'>-static const u16 rtl8366rb_green_jam[][2] = {</div><div class='del'>-	{0xBE78, 0x323C}, {0xBE77, 0x5000}, {0xBE2E, 0x7BA7},</div><div class='del'>-	{0xBE59, 0x3459}, {0xBE5A, 0x745A}, {0xBE5B, 0x785C},</div><div class='del'>-	{0xBE5C, 0x785C}, {0xBE6E, 0xE120}, {0xBE79, 0x323C},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_setup(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	const u16 *jam_table;</div><div class='del'>-	u32 chip_ver = 0;</div><div class='del'>-	u32 chip_id = 0;</div><div class='del'>-	int jam_size;</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_CHIP_ID_REG, &amp;chip_id);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "unable to read chip id\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (chip_id) {</div><div class='del'>-	case RTL8366RB_CHIP_ID_8366:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(smi-&gt;dev, "unknown chip id (%04x)\n", chip_id);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_CHIP_VERSION_CTRL_REG,</div><div class='del'>-			  &amp;chip_ver);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev, "unable to read chip version\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "RTL%04x ver %u chip found\n",</div><div class='del'>-		 chip_id, chip_ver &amp; RTL8366RB_CHIP_VERSION_MASK);</div><div class='del'>-</div><div class='del'>-	/* Do the init dance using the right jam table */</div><div class='del'>-	switch (chip_ver) {</div><div class='del'>-	case 0:</div><div class='del'>-		jam_table = rtl8366rb_init_jam_ver_0;</div><div class='del'>-		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_0);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		jam_table = rtl8366rb_init_jam_ver_1;</div><div class='del'>-		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_1);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		jam_table = rtl8366rb_init_jam_ver_2;</div><div class='del'>-		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_2);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		jam_table = rtl8366rb_init_jam_ver_3;</div><div class='del'>-		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_ver_3);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Special jam tables for special routers</div><div class='del'>-	 * TODO: are these necessary? Maintainers, please test</div><div class='del'>-	 * without them, using just the off-the-shelf tables.</div><div class='del'>-	 */</div><div class='del'>-	if (of_machine_is_compatible("belkin,f5d8235-v1")) {</div><div class='del'>-		jam_table = rtl8366rb_init_jam_f5d8235;</div><div class='del'>-		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_f5d8235);</div><div class='del'>-	}</div><div class='del'>-	if (of_machine_is_compatible("netgear,dgn3500") ||</div><div class='del'>-	    of_machine_is_compatible("netgear,dgn3500b")) {</div><div class='del'>-		jam_table = rtl8366rb_init_jam_dgn3500;</div><div class='del'>-		jam_size = ARRAY_SIZE(rtl8366rb_init_jam_dgn3500);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	while (i &lt; jam_size) {</div><div class='del'>-		if ((jam_table[i] &amp; 0xBE00) == 0xBE00) {</div><div class='del'>-			ret = regmap_read(smi-&gt;map,</div><div class='del'>-					  RTL8366RB_PHY_ACCESS_BUSY_REG,</div><div class='del'>-					  &amp;val);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			if (!(val &amp; RTL8366RB_PHY_INT_BUSY)) {</div><div class='del'>-				ret = regmap_write(smi-&gt;map,</div><div class='del'>-						RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='del'>-						RTL8366RB_PHY_CTRL_WRITE);</div><div class='del'>-				if (ret)</div><div class='del'>-					return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		dev_dbg(smi-&gt;dev, "jam %04x into register %04x\n",</div><div class='del'>-			jam_table[i + 1],</div><div class='del'>-			jam_table[i]);</div><div class='del'>-		ret = regmap_write(smi-&gt;map,</div><div class='del'>-				   jam_table[i],</div><div class='del'>-				   jam_table[i + 1]);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		i += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set up the "green ethernet" feature */</div><div class='del'>-	i = 0;</div><div class='del'>-	while (i &lt; ARRAY_SIZE(rtl8366rb_green_jam)) {</div><div class='del'>-		ret = regmap_read(smi-&gt;map, RTL8366RB_PHY_ACCESS_BUSY_REG,</div><div class='del'>-				  &amp;val);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-		if (!(val &amp; RTL8366RB_PHY_INT_BUSY)) {</div><div class='del'>-			ret = regmap_write(smi-&gt;map,</div><div class='del'>-					   RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='del'>-					   RTL8366RB_PHY_CTRL_WRITE);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			ret = regmap_write(smi-&gt;map,</div><div class='del'>-					   rtl8366rb_green_jam[i][0],</div><div class='del'>-					   rtl8366rb_green_jam[i][1]);</div><div class='del'>-			if (ret)</div><div class='del'>-				return ret;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ret = regmap_write(smi-&gt;map,</div><div class='del'>-			   RTL8366RB_GREEN_FEATURE_REG,</div><div class='del'>-			   (chip_ver == 1) ? 0x0007 : 0x0003);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Vendor driver sets 0x240 in registers 0xc and 0xd (undocumented) */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, 0x0c, 0x240);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	ret = regmap_write(smi-&gt;map, 0x0d, 0x240);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Set some random MAC address */</div><div class='del'>-	ret = rtl8366rb_set_addr(smi);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Enable CPU port and enable inserting CPU tag</div><div class='del'>-	 *</div><div class='del'>-	 * Disabling RTL8368RB_CPU_INSTAG here will change the behaviour</div><div class='del'>-	 * of the switch totally and it will start talking Realtek RRCP</div><div class='del'>-	 * internally. It is probably possible to experiment with this,</div><div class='del'>-	 * but then the kernel needs to understand and handle RRCP first.</div><div class='del'>-	 */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8368RB_CPU_CTRL_REG,</div><div class='del'>-				 0xFFFF,</div><div class='del'>-				 RTL8368RB_CPU_INSTAG | BIT(smi-&gt;cpu_port));</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Make sure we default-enable the fixed CPU port */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_PECR,</div><div class='del'>-				 BIT(smi-&gt;cpu_port),</div><div class='del'>-				 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Set maximum packet length to 1536 bytes */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_SGCR,</div><div class='del'>-				 RTL8366RB_SGCR_MAX_LENGTH_MASK,</div><div class='del'>-				 RTL8366RB_SGCR_MAX_LENGTH_1536);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Enable learning for all ports */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_SSCR0, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Enable auto ageing for all ports */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_SSCR1, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Port 4 setup: this enables Port 4, usually the WAN port,</div><div class='del'>-	 * common PHY IO mode is apparently mode 0, and this is not what</div><div class='del'>-	 * the port is initialized to. There is no explanation of the</div><div class='del'>-	 * IO modes in the Realtek source code, if your WAN port is</div><div class='del'>-	 * connected to something exotic such as fiber, then this might</div><div class='del'>-	 * be worth experimenting with.</div><div class='del'>-	 */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_PMC0,</div><div class='del'>-				 RTL8366RB_PMC0_P4_IOMODE_MASK,</div><div class='del'>-				 0 &lt;&lt; RTL8366RB_PMC0_P4_IOMODE_SHIFT);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Discard VLAN tagged packets if the port is not a member of</div><div class='del'>-	 * the VLAN with which the packets is associated.</div><div class='del'>-	 */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_VLAN_INGRESS_CTRL2_REG,</div><div class='del'>-			   RTL8366RB_PORT_ALL);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Don't drop packets whose DA has not been learned */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_SSCR2,</div><div class='del'>-				 RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Set blinking, TODO: make this configurable */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_LED_BLINKRATE_REG,</div><div class='del'>-				 RTL8366RB_LED_BLINKRATE_MASK,</div><div class='del'>-				 RTL8366RB_LED_BLINKRATE_56MS);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Set up LED activity:</div><div class='del'>-	 * Each port has 4 LEDs, we configure all ports to the same</div><div class='del'>-	 * behaviour (no individual config) but we can set up each</div><div class='del'>-	 * LED separately.</div><div class='del'>-	 */</div><div class='del'>-	if (smi-&gt;leds_disabled) {</div><div class='del'>-		/* Turn everything off */</div><div class='del'>-		regmap_update_bits(smi-&gt;map,</div><div class='del'>-				   RTL8366RB_LED_0_1_CTRL_REG,</div><div class='del'>-				   0x0FFF, 0);</div><div class='del'>-		regmap_update_bits(smi-&gt;map,</div><div class='del'>-				   RTL8366RB_LED_2_3_CTRL_REG,</div><div class='del'>-				   0x0FFF, 0);</div><div class='del'>-		regmap_update_bits(smi-&gt;map,</div><div class='del'>-				   RTL8366RB_INTERRUPT_CONTROL_REG,</div><div class='del'>-				   RTL8366RB_P4_RGMII_LED,</div><div class='del'>-				   0);</div><div class='del'>-		val = RTL8366RB_LED_OFF;</div><div class='del'>-	} else {</div><div class='del'>-		/* TODO: make this configurable per LED */</div><div class='del'>-		val = RTL8366RB_LED_FORCE;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; 4; i++) {</div><div class='del'>-		ret = regmap_update_bits(smi-&gt;map,</div><div class='del'>-					 RTL8366RB_LED_CTRL_REG,</div><div class='del'>-					 0xf &lt;&lt; (i * 4),</div><div class='del'>-					 val &lt;&lt; (i * 4));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rtl8366_init_vlan(smi);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ret = rtl8366rb_setup_cascaded_irq(smi);</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_info(smi-&gt;dev, "no interrupt support\n");</div><div class='del'>-</div><div class='del'>-	ret = realtek_smi_setup_mdio(smi);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_info(smi-&gt;dev, "could not set up MDIO bus\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum dsa_tag_protocol rtl8366_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-						      int port)</div><div class='del'>-{</div><div class='del'>-	/* For now, the RTL switches are handled without any custom tags.</div><div class='del'>-	 *</div><div class='del'>-	 * It is possible to turn on "custom tags" by removing the</div><div class='del'>-	 * RTL8368RB_CPU_INSTAG flag when enabling the port but what it</div><div class='del'>-	 * does is unfamiliar to DSA: ethernet frames of type 8899, the Realtek</div><div class='del'>-	 * Remote Control Protocol (RRCP) start to appear on the CPU port of</div><div class='del'>-	 * the device. So this is not the ordinary few extra bytes in the</div><div class='del'>-	 * frame. Instead it appears that the switch starts to talk Realtek</div><div class='del'>-	 * RRCP internally which means a pretty complex RRCP implementation</div><div class='del'>-	 * decoding and responding the RRCP protocol is needed to exploit this.</div><div class='del'>-	 *</div><div class='del'>-	 * The OpenRRCP project (dormant since 2009) have reverse-egineered</div><div class='del'>-	 * parts of the protocol.</div><div class='del'>-	 */</div><div class='del'>-	return DSA_TAG_PROTO_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rtl8366rb_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-				  struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (port != smi-&gt;cpu_port)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dev_info(smi-&gt;dev, "adjust link on CPU port (%d)\n", port);</div><div class='del'>-</div><div class='del'>-	/* Force the fixed CPU port into 1Gbit mode, no autonegotiation */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_MAC_FORCE_CTRL_REG,</div><div class='del'>-				 BIT(port), BIT(port));</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_PAACR2,</div><div class='del'>-				 0xFF00U,</div><div class='del'>-				 RTL8366RB_PAACR_CPU_PORT &lt;&lt; 8);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Enable the CPU port */</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='del'>-				 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rb8366rb_set_port_led(struct realtek_smi *smi,</div><div class='del'>-				  int port, bool enable)</div><div class='del'>-{</div><div class='del'>-	u16 val = enable ? 0x3f : 0;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (smi-&gt;leds_disabled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (port) {</div><div class='del'>-	case 0:</div><div class='del'>-		ret = regmap_update_bits(smi-&gt;map,</div><div class='del'>-					 RTL8366RB_LED_0_1_CTRL_REG,</div><div class='del'>-					 0x3F, val);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		ret = regmap_update_bits(smi-&gt;map,</div><div class='del'>-					 RTL8366RB_LED_0_1_CTRL_REG,</div><div class='del'>-					 0x3F &lt;&lt; RTL8366RB_LED_1_OFFSET,</div><div class='del'>-					 val &lt;&lt; RTL8366RB_LED_1_OFFSET);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		ret = regmap_update_bits(smi-&gt;map,</div><div class='del'>-					 RTL8366RB_LED_2_3_CTRL_REG,</div><div class='del'>-					 0x3F, val);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		ret = regmap_update_bits(smi-&gt;map,</div><div class='del'>-					 RTL8366RB_LED_2_3_CTRL_REG,</div><div class='del'>-					 0x3F &lt;&lt; RTL8366RB_LED_3_OFFSET,</div><div class='del'>-					 val &lt;&lt; RTL8366RB_LED_3_OFFSET);</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		ret = regmap_update_bits(smi-&gt;map,</div><div class='del'>-					 RTL8366RB_INTERRUPT_CONTROL_REG,</div><div class='del'>-					 RTL8366RB_P4_RGMII_LED,</div><div class='del'>-					 enable ? RTL8366RB_P4_RGMII_LED : 0);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(smi-&gt;dev, "no LED for port %d\n", port);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (ret)</div><div class='del'>-		dev_err(smi-&gt;dev, "error updating LED on port %d\n", port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-rtl8366rb_port_enable(struct dsa_switch *ds, int port,</div><div class='del'>-		      struct phy_device *phy)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(smi-&gt;dev, "enable port %d\n", port);</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='del'>-				 0);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	rb8366rb_set_port_led(smi, port, true);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rtl8366rb_port_disable(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	struct realtek_smi *smi = ds-&gt;priv;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(smi-&gt;dev, "disable port %d\n", port);</div><div class='del'>-	ret = regmap_update_bits(smi-&gt;map, RTL8366RB_PECR, BIT(port),</div><div class='del'>-				 BIT(port));</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rb8366rb_set_port_led(smi, port, false);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_get_vlan_4k(struct realtek_smi *smi, u32 vid,</div><div class='del'>-				 struct rtl8366_vlan_4k *vlan4k)</div><div class='del'>-{</div><div class='del'>-	u32 data[3];</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(vlan4k, '\0', sizeof(struct rtl8366_vlan_4k));</div><div class='del'>-</div><div class='del'>-	if (vid &gt;= RTL8366RB_NUM_VIDS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* write VID */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_VLAN_TABLE_WRITE_BASE,</div><div class='del'>-			   vid &amp; RTL8366RB_VLAN_VID_MASK);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* write table access control word */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_TABLE_ACCESS_CTRL_REG,</div><div class='del'>-			   RTL8366RB_TABLE_VLAN_READ_CTRL);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		ret = regmap_read(smi-&gt;map,</div><div class='del'>-				  RTL8366RB_VLAN_TABLE_READ_BASE + i,</div><div class='del'>-				  &amp;data[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vlan4k-&gt;vid = vid;</div><div class='del'>-	vlan4k-&gt;untag = (data[1] &gt;&gt; RTL8366RB_VLAN_UNTAG_SHIFT) &amp;</div><div class='del'>-			RTL8366RB_VLAN_UNTAG_MASK;</div><div class='del'>-	vlan4k-&gt;member = data[1] &amp; RTL8366RB_VLAN_MEMBER_MASK;</div><div class='del'>-	vlan4k-&gt;fid = data[2] &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_set_vlan_4k(struct realtek_smi *smi,</div><div class='del'>-				 const struct rtl8366_vlan_4k *vlan4k)</div><div class='del'>-{</div><div class='del'>-	u32 data[3];</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (vlan4k-&gt;vid &gt;= RTL8366RB_NUM_VIDS ||</div><div class='del'>-	    vlan4k-&gt;member &gt; RTL8366RB_VLAN_MEMBER_MASK ||</div><div class='del'>-	    vlan4k-&gt;untag &gt; RTL8366RB_VLAN_UNTAG_MASK ||</div><div class='del'>-	    vlan4k-&gt;fid &gt; RTL8366RB_FIDMAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	data[0] = vlan4k-&gt;vid &amp; RTL8366RB_VLAN_VID_MASK;</div><div class='del'>-	data[1] = (vlan4k-&gt;member &amp; RTL8366RB_VLAN_MEMBER_MASK) |</div><div class='del'>-		  ((vlan4k-&gt;untag &amp; RTL8366RB_VLAN_UNTAG_MASK) &lt;&lt;</div><div class='del'>-			RTL8366RB_VLAN_UNTAG_SHIFT);</div><div class='del'>-	data[2] = vlan4k-&gt;fid &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		ret = regmap_write(smi-&gt;map,</div><div class='del'>-				   RTL8366RB_VLAN_TABLE_WRITE_BASE + i,</div><div class='del'>-				   data[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write table access control word */</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_TABLE_ACCESS_CTRL_REG,</div><div class='del'>-			   RTL8366RB_TABLE_VLAN_WRITE_CTRL);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_get_vlan_mc(struct realtek_smi *smi, u32 index,</div><div class='del'>-				 struct rtl8366_vlan_mc *vlanmc)</div><div class='del'>-{</div><div class='del'>-	u32 data[3];</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(vlanmc, '\0', sizeof(struct rtl8366_vlan_mc));</div><div class='del'>-</div><div class='del'>-	if (index &gt;= RTL8366RB_NUM_VLANS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		ret = regmap_read(smi-&gt;map,</div><div class='del'>-				  RTL8366RB_VLAN_MC_BASE(index) + i,</div><div class='del'>-				  &amp;data[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vlanmc-&gt;vid = data[0] &amp; RTL8366RB_VLAN_VID_MASK;</div><div class='del'>-	vlanmc-&gt;priority = (data[0] &gt;&gt; RTL8366RB_VLAN_PRIORITY_SHIFT) &amp;</div><div class='del'>-		RTL8366RB_VLAN_PRIORITY_MASK;</div><div class='del'>-	vlanmc-&gt;untag = (data[1] &gt;&gt; RTL8366RB_VLAN_UNTAG_SHIFT) &amp;</div><div class='del'>-		RTL8366RB_VLAN_UNTAG_MASK;</div><div class='del'>-	vlanmc-&gt;member = data[1] &amp; RTL8366RB_VLAN_MEMBER_MASK;</div><div class='del'>-	vlanmc-&gt;fid = data[2] &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_set_vlan_mc(struct realtek_smi *smi, u32 index,</div><div class='del'>-				 const struct rtl8366_vlan_mc *vlanmc)</div><div class='del'>-{</div><div class='del'>-	u32 data[3];</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (index &gt;= RTL8366RB_NUM_VLANS ||</div><div class='del'>-	    vlanmc-&gt;vid &gt;= RTL8366RB_NUM_VIDS ||</div><div class='del'>-	    vlanmc-&gt;priority &gt; RTL8366RB_PRIORITYMAX ||</div><div class='del'>-	    vlanmc-&gt;member &gt; RTL8366RB_VLAN_MEMBER_MASK ||</div><div class='del'>-	    vlanmc-&gt;untag &gt; RTL8366RB_VLAN_UNTAG_MASK ||</div><div class='del'>-	    vlanmc-&gt;fid &gt; RTL8366RB_FIDMAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	data[0] = (vlanmc-&gt;vid &amp; RTL8366RB_VLAN_VID_MASK) |</div><div class='del'>-		  ((vlanmc-&gt;priority &amp; RTL8366RB_VLAN_PRIORITY_MASK) &lt;&lt;</div><div class='del'>-			RTL8366RB_VLAN_PRIORITY_SHIFT);</div><div class='del'>-	data[1] = (vlanmc-&gt;member &amp; RTL8366RB_VLAN_MEMBER_MASK) |</div><div class='del'>-		  ((vlanmc-&gt;untag &amp; RTL8366RB_VLAN_UNTAG_MASK) &lt;&lt;</div><div class='del'>-			RTL8366RB_VLAN_UNTAG_SHIFT);</div><div class='del'>-	data[2] = vlanmc-&gt;fid &amp; RTL8366RB_VLAN_FID_MASK;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		ret = regmap_write(smi-&gt;map,</div><div class='del'>-				   RTL8366RB_VLAN_MC_BASE(index) + i,</div><div class='del'>-				   data[i]);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_get_mc_index(struct realtek_smi *smi, int port, int *val)</div><div class='del'>-{</div><div class='del'>-	u32 data;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (port &gt;= smi-&gt;num_ports)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_PORT_VLAN_CTRL_REG(port),</div><div class='del'>-			  &amp;data);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*val = (data &gt;&gt; RTL8366RB_PORT_VLAN_CTRL_SHIFT(port)) &amp;</div><div class='del'>-		RTL8366RB_PORT_VLAN_CTRL_MASK;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_set_mc_index(struct realtek_smi *smi, int port, int index)</div><div class='del'>-{</div><div class='del'>-	if (port &gt;= smi-&gt;num_ports || index &gt;= RTL8366RB_NUM_VLANS)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return regmap_update_bits(smi-&gt;map, RTL8366RB_PORT_VLAN_CTRL_REG(port),</div><div class='del'>-				RTL8366RB_PORT_VLAN_CTRL_MASK &lt;&lt;</div><div class='del'>-					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port),</div><div class='del'>-				(index &amp; RTL8366RB_PORT_VLAN_CTRL_MASK) &lt;&lt;</div><div class='del'>-					RTL8366RB_PORT_VLAN_CTRL_SHIFT(port));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool rtl8366rb_is_vlan_valid(struct realtek_smi *smi, unsigned int vlan)</div><div class='del'>-{</div><div class='del'>-	unsigned int max = RTL8366RB_NUM_VLANS;</div><div class='del'>-</div><div class='del'>-	if (smi-&gt;vlan4k_enabled)</div><div class='del'>-		max = RTL8366RB_NUM_VIDS - 1;</div><div class='del'>-</div><div class='del'>-	if (vlan == 0 || vlan &gt;= max)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_enable_vlan(struct realtek_smi *smi, bool enable)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(smi-&gt;dev, "%s VLAN\n", enable ? "enable" : "disable");</div><div class='del'>-	return regmap_update_bits(smi-&gt;map,</div><div class='del'>-				  RTL8366RB_SGCR, RTL8366RB_SGCR_EN_VLAN,</div><div class='del'>-				  enable ? RTL8366RB_SGCR_EN_VLAN : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_enable_vlan4k(struct realtek_smi *smi, bool enable)</div><div class='del'>-{</div><div class='del'>-	dev_dbg(smi-&gt;dev, "%s VLAN 4k\n", enable ? "enable" : "disable");</div><div class='del'>-	return regmap_update_bits(smi-&gt;map, RTL8366RB_SGCR,</div><div class='del'>-				  RTL8366RB_SGCR_EN_VLAN_4KTB,</div><div class='del'>-				  enable ? RTL8366RB_SGCR_EN_VLAN_4KTB : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_phy_read(struct realtek_smi *smi, int phy, int regnum)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-	u32 reg;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (phy &gt; RTL8366RB_PHY_NO_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='del'>-			   RTL8366RB_PHY_CTRL_READ);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	reg = 0x8000 | (1 &lt;&lt; (phy + RTL8366RB_PHY_NO_OFFSET)) | regnum;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(smi-&gt;map, reg, 0);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(smi-&gt;dev,</div><div class='del'>-			"failed to write PHY%d reg %04x @ %04x, ret %d\n",</div><div class='del'>-			phy, regnum, reg, ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = regmap_read(smi-&gt;map, RTL8366RB_PHY_ACCESS_DATA_REG, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(smi-&gt;dev, "read PHY%d register 0x%04x @ %08x, val &lt;- %04x\n",</div><div class='del'>-		phy, regnum, reg, val);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_phy_write(struct realtek_smi *smi, int phy, int regnum,</div><div class='del'>-			       u16 val)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (phy &gt; RTL8366RB_PHY_NO_MAX)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(smi-&gt;map, RTL8366RB_PHY_ACCESS_CTRL_REG,</div><div class='del'>-			   RTL8366RB_PHY_CTRL_WRITE);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	reg = 0x8000 | (1 &lt;&lt; (phy + RTL8366RB_PHY_NO_OFFSET)) | regnum;</div><div class='del'>-</div><div class='del'>-	dev_dbg(smi-&gt;dev, "write PHY%d register 0x%04x @ %04x, val -&gt; %04x\n",</div><div class='del'>-		phy, regnum, reg, val);</div><div class='del'>-</div><div class='del'>-	ret = regmap_write(smi-&gt;map, reg, val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_reset_chip(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	int timeout = 10;</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	realtek_smi_write_reg_noack(smi, RTL8366RB_RESET_CTRL_REG,</div><div class='del'>-				    RTL8366RB_CHIP_CTRL_RESET_HW);</div><div class='del'>-	do {</div><div class='del'>-		usleep_range(20000, 25000);</div><div class='del'>-		ret = regmap_read(smi-&gt;map, RTL8366RB_RESET_CTRL_REG, &amp;val);</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-</div><div class='del'>-		if (!(val &amp; RTL8366RB_CHIP_CTRL_RESET_HW))</div><div class='del'>-			break;</div><div class='del'>-	} while (--timeout);</div><div class='del'>-</div><div class='del'>-	if (!timeout) {</div><div class='del'>-		dev_err(smi-&gt;dev, "timeout waiting for the switch to reset\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int rtl8366rb_detect(struct realtek_smi *smi)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = smi-&gt;dev;</div><div class='del'>-	int ret;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* Detect device */</div><div class='del'>-	ret = regmap_read(smi-&gt;map, 0x5c, &amp;val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "can't get chip ID (%d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (val) {</div><div class='del'>-	case 0x6027:</div><div class='del'>-		dev_info(dev, "found an RTL8366S switch\n");</div><div class='del'>-		dev_err(dev, "this switch is not yet supported, submit patches!\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	case 0x5937:</div><div class='del'>-		dev_info(dev, "found an RTL8366RB switch\n");</div><div class='del'>-		smi-&gt;cpu_port = RTL8366RB_PORT_NUM_CPU;</div><div class='del'>-		smi-&gt;num_ports = RTL8366RB_NUM_PORTS;</div><div class='del'>-		smi-&gt;num_vlan_mc = RTL8366RB_NUM_VLANS;</div><div class='del'>-		smi-&gt;mib_counters = rtl8366rb_mib_counters;</div><div class='del'>-		smi-&gt;num_mib_counters = ARRAY_SIZE(rtl8366rb_mib_counters);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_info(dev, "found an Unknown Realtek switch (id=0x%04x)\n",</div><div class='del'>-			 val);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = rtl8366rb_reset_chip(smi);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct dsa_switch_ops rtl8366rb_switch_ops = {</div><div class='del'>-	.get_tag_protocol = rtl8366_get_tag_protocol,</div><div class='del'>-	.setup = rtl8366rb_setup,</div><div class='del'>-	.adjust_link = rtl8366rb_adjust_link,</div><div class='del'>-	.get_strings = rtl8366_get_strings,</div><div class='del'>-	.get_ethtool_stats = rtl8366_get_ethtool_stats,</div><div class='del'>-	.get_sset_count = rtl8366_get_sset_count,</div><div class='del'>-	.port_vlan_filtering = rtl8366_vlan_filtering,</div><div class='del'>-	.port_vlan_prepare = rtl8366_vlan_prepare,</div><div class='del'>-	.port_vlan_add = rtl8366_vlan_add,</div><div class='del'>-	.port_vlan_del = rtl8366_vlan_del,</div><div class='del'>-	.port_enable = rtl8366rb_port_enable,</div><div class='del'>-	.port_disable = rtl8366rb_port_disable,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct realtek_smi_ops rtl8366rb_smi_ops = {</div><div class='del'>-	.detect		= rtl8366rb_detect,</div><div class='del'>-	.get_vlan_mc	= rtl8366rb_get_vlan_mc,</div><div class='del'>-	.set_vlan_mc	= rtl8366rb_set_vlan_mc,</div><div class='del'>-	.get_vlan_4k	= rtl8366rb_get_vlan_4k,</div><div class='del'>-	.set_vlan_4k	= rtl8366rb_set_vlan_4k,</div><div class='del'>-	.get_mc_index	= rtl8366rb_get_mc_index,</div><div class='del'>-	.set_mc_index	= rtl8366rb_set_mc_index,</div><div class='del'>-	.get_mib_counter = rtl8366rb_get_mib_counter,</div><div class='del'>-	.is_vlan_valid	= rtl8366rb_is_vlan_valid,</div><div class='del'>-	.enable_vlan	= rtl8366rb_enable_vlan,</div><div class='del'>-	.enable_vlan4k	= rtl8366rb_enable_vlan4k,</div><div class='del'>-	.phy_read	= rtl8366rb_phy_read,</div><div class='del'>-	.phy_write	= rtl8366rb_phy_write,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const struct realtek_smi_variant rtl8366rb_variant = {</div><div class='del'>-	.ds_ops = &amp;rtl8366rb_switch_ops,</div><div class='del'>-	.ops = &amp;rtl8366rb_smi_ops,</div><div class='del'>-	.clk_delay = 10,</div><div class='del'>-	.cmd_read = 0xa9,</div><div class='del'>-	.cmd_write = 0xa8,</div><div class='del'>-};</div><div class='del'>-EXPORT_SYMBOL_GPL(rtl8366rb_variant);</div><div class='head'>diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c<br/>new file mode 100644<br/>index 000000000000..4d857e3be10b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/rzn1_a5psw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/rzn1_a5psw.c</a></div><div class='hunk'>@@ -0,0 +1,1319 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 Schneider-Electric</div><div class='add'>+ *</div><div class='add'>+ * Clément Léger &lt;clement.leger@bootlin.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "rzn1_a5psw.h"</div><div class='add'>+</div><div class='add'>+struct a5psw_stats {</div><div class='add'>+	u16 offset;</div><div class='add'>+	const char name[ETH_GSTRING_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STAT_DESC(_offset) {	\</div><div class='add'>+	.offset = A5PSW_##_offset,	\</div><div class='add'>+	.name = __stringify(_offset),	\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct a5psw_stats a5psw_stats[] = {</div><div class='add'>+	STAT_DESC(aFramesTransmittedOK),</div><div class='add'>+	STAT_DESC(aFramesReceivedOK),</div><div class='add'>+	STAT_DESC(aFrameCheckSequenceErrors),</div><div class='add'>+	STAT_DESC(aAlignmentErrors),</div><div class='add'>+	STAT_DESC(aOctetsTransmittedOK),</div><div class='add'>+	STAT_DESC(aOctetsReceivedOK),</div><div class='add'>+	STAT_DESC(aTxPAUSEMACCtrlFrames),</div><div class='add'>+	STAT_DESC(aRxPAUSEMACCtrlFrames),</div><div class='add'>+	STAT_DESC(ifInErrors),</div><div class='add'>+	STAT_DESC(ifOutErrors),</div><div class='add'>+	STAT_DESC(ifInUcastPkts),</div><div class='add'>+	STAT_DESC(ifInMulticastPkts),</div><div class='add'>+	STAT_DESC(ifInBroadcastPkts),</div><div class='add'>+	STAT_DESC(ifOutDiscards),</div><div class='add'>+	STAT_DESC(ifOutUcastPkts),</div><div class='add'>+	STAT_DESC(ifOutMulticastPkts),</div><div class='add'>+	STAT_DESC(ifOutBroadcastPkts),</div><div class='add'>+	STAT_DESC(etherStatsDropEvents),</div><div class='add'>+	STAT_DESC(etherStatsOctets),</div><div class='add'>+	STAT_DESC(etherStatsPkts),</div><div class='add'>+	STAT_DESC(etherStatsUndersizePkts),</div><div class='add'>+	STAT_DESC(etherStatsOversizePkts),</div><div class='add'>+	STAT_DESC(etherStatsPkts64Octets),</div><div class='add'>+	STAT_DESC(etherStatsPkts65to127Octets),</div><div class='add'>+	STAT_DESC(etherStatsPkts128to255Octets),</div><div class='add'>+	STAT_DESC(etherStatsPkts256to511Octets),</div><div class='add'>+	STAT_DESC(etherStatsPkts1024to1518Octets),</div><div class='add'>+	STAT_DESC(etherStatsPkts1519toXOctets),</div><div class='add'>+	STAT_DESC(etherStatsJabbers),</div><div class='add'>+	STAT_DESC(etherStatsFragments),</div><div class='add'>+	STAT_DESC(VLANReceived),</div><div class='add'>+	STAT_DESC(VLANTransmitted),</div><div class='add'>+	STAT_DESC(aDeferred),</div><div class='add'>+	STAT_DESC(aMultipleCollisions),</div><div class='add'>+	STAT_DESC(aSingleCollisions),</div><div class='add'>+	STAT_DESC(aLateCollisions),</div><div class='add'>+	STAT_DESC(aExcessiveCollisions),</div><div class='add'>+	STAT_DESC(aCarrierSenseErrors),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void a5psw_reg_writel(struct a5psw *a5psw, int offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, a5psw-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 a5psw_reg_readl(struct a5psw *a5psw, int offset)</div><div class='add'>+{</div><div class='add'>+	return readl(a5psw-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_reg_rmw(struct a5psw *a5psw, int offset, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;a5psw-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	reg = a5psw_reg_readl(a5psw, offset);</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	reg |= val;</div><div class='add'>+	a5psw_reg_writel(a5psw, offset, reg);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;a5psw-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol a5psw_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						    int port,</div><div class='add'>+						    enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_RZN1_A5PSW;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_pattern_set(struct a5psw *a5psw, int port, int pattern,</div><div class='add'>+				   bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 rx_match = 0;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		rx_match |= A5PSW_RXMATCH_CONFIG_PATTERN(pattern);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_RXMATCH_CONFIG(port),</div><div class='add'>+		      A5PSW_RXMATCH_CONFIG_PATTERN(pattern), rx_match);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_mgmtfwd_set(struct a5psw *a5psw, int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	/* Enable "management forward" pattern matching, this will forward</div><div class='add'>+	 * packets from this port only towards the management port and thus</div><div class='add'>+	 * isolate the port.</div><div class='add'>+	 */</div><div class='add'>+	a5psw_port_pattern_set(a5psw, port, A5PSW_PATTERN_MGMTFWD, enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_tx_enable(struct a5psw *a5psw, int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 mask = A5PSW_PORT_ENA_TX(port);</div><div class='add'>+	u32 reg = enable ? mask : 0;</div><div class='add'>+</div><div class='add'>+	/* Even though the port TX is disabled through TXENA bit in the</div><div class='add'>+	 * PORT_ENA register, it can still send BPDUs. This depends on the tag</div><div class='add'>+	 * configuration added when sending packets from the CPU port to the</div><div class='add'>+	 * switch port. Indeed, when using forced forwarding without filtering,</div><div class='add'>+	 * even disabled ports will be able to send packets that are tagged.</div><div class='add'>+	 * This allows to implement STP support when ports are in a state where</div><div class='add'>+	 * forwarding traffic should be stopped but BPDUs should still be sent.</div><div class='add'>+	 */</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_PORT_ENA, mask, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_enable_set(struct a5psw *a5psw, int port, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 port_ena = 0;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		port_ena |= A5PSW_PORT_ENA_TX_RX(port);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_PORT_ENA, A5PSW_PORT_ENA_TX_RX(port),</div><div class='add'>+		      port_ena);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_lk_execute_ctrl(struct a5psw *a5psw, u32 *ctrl)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_ADDR_CTRL, *ctrl);</div><div class='add'>+</div><div class='add'>+	ret = readl_poll_timeout(a5psw-&gt;base + A5PSW_LK_ADDR_CTRL, *ctrl,</div><div class='add'>+				 !(*ctrl &amp; A5PSW_LK_ADDR_CTRL_BUSY),</div><div class='add'>+				 A5PSW_LK_BUSY_USEC_POLL, A5PSW_CTRL_TIMEOUT);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(a5psw-&gt;dev, "LK_CTRL timeout waiting for BUSY bit\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_fdb_flush(struct a5psw *a5psw, int port)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl = A5PSW_LK_ADDR_CTRL_DELETE_PORT | BIT(port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+	a5psw_lk_execute_ctrl(a5psw, &amp;ctrl);</div><div class='add'>+	mutex_unlock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_authorize_set(struct a5psw *a5psw, int port,</div><div class='add'>+				     bool authorize)</div><div class='add'>+{</div><div class='add'>+	u32 reg = a5psw_reg_readl(a5psw, A5PSW_AUTH_PORT(port));</div><div class='add'>+</div><div class='add'>+	if (authorize)</div><div class='add'>+		reg |= A5PSW_AUTH_PORT_AUTHORIZED;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~A5PSW_AUTH_PORT_AUTHORIZED;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_AUTH_PORT(port), reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	a5psw_port_authorize_set(a5psw, port, false);</div><div class='add'>+	a5psw_port_enable_set(a5psw, port, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	a5psw_port_authorize_set(a5psw, port, true);</div><div class='add'>+	a5psw_port_enable_set(a5psw, port, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	new_mtu += ETH_HLEN + A5PSW_EXTRA_MTU_LEN + ETH_FCS_LEN;</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_FRM_LENGTH(port), new_mtu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return A5PSW_MAX_MTU;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				   struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long *intf = config-&gt;supported_interfaces;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port)) {</div><div class='add'>+		/* GMII is used internally and GMAC2 is connected to the switch</div><div class='add'>+		 * using 1000Mbps Full-Duplex mode only (cf ethernet manual)</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, intf);</div><div class='add'>+	} else {</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_100 | MAC_10;</div><div class='add'>+		phy_interface_set_rgmii(intf);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII, intf);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, intf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+a5psw_phylink_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+			     phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct a5psw *a5psw = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_cpu(dp))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return a5psw-&gt;pcs[dp-&gt;index];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_phylink_mac_config(struct phylink_config *config,</div><div class='add'>+				     unsigned int mode,</div><div class='add'>+				     const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_phylink_mac_link_down(struct phylink_config *config,</div><div class='add'>+					unsigned int mode,</div><div class='add'>+					phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct a5psw *a5psw = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 cmd_cfg;</div><div class='add'>+</div><div class='add'>+	cmd_cfg = a5psw_reg_readl(a5psw, A5PSW_CMD_CFG(port));</div><div class='add'>+	cmd_cfg &amp;= ~(A5PSW_CMD_CFG_RX_ENA | A5PSW_CMD_CFG_TX_ENA);</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_CMD_CFG(port), cmd_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+				      struct phy_device *phydev,</div><div class='add'>+				      unsigned int mode,</div><div class='add'>+				      phy_interface_t interface,</div><div class='add'>+				      int speed, int duplex, bool tx_pause,</div><div class='add'>+				      bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	u32 cmd_cfg = A5PSW_CMD_CFG_RX_ENA | A5PSW_CMD_CFG_TX_ENA |</div><div class='add'>+		      A5PSW_CMD_CFG_TX_CRC_APPEND;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct a5psw *a5psw = dp-&gt;ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (speed == SPEED_1000)</div><div class='add'>+		cmd_cfg |= A5PSW_CMD_CFG_ETH_SPEED;</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_HALF)</div><div class='add'>+		cmd_cfg |= A5PSW_CMD_CFG_HD_ENA;</div><div class='add'>+</div><div class='add'>+	cmd_cfg |= A5PSW_CMD_CFG_CNTL_FRM_ENA;</div><div class='add'>+</div><div class='add'>+	if (!rx_pause)</div><div class='add'>+		cmd_cfg &amp;= ~A5PSW_CMD_CFG_PAUSE_IGNORE;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_CMD_CFG(dp-&gt;index), cmd_cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	u64 max, tmp;</div><div class='add'>+	u32 agetime;</div><div class='add'>+</div><div class='add'>+	rate = clk_get_rate(a5psw-&gt;clk);</div><div class='add'>+	max = div64_ul(((u64)A5PSW_LK_AGETIME_MASK * A5PSW_TABLE_ENTRIES * 1024),</div><div class='add'>+		       rate) * 1000;</div><div class='add'>+	if (msecs &gt; max)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tmp = div_u64(rate, MSEC_PER_SEC);</div><div class='add'>+	agetime = div_u64(msecs * tmp, 1024 * A5PSW_TABLE_ENTRIES);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_AGETIME, agetime);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_learning_set(struct a5psw *a5psw, int port, bool learn)</div><div class='add'>+{</div><div class='add'>+	u32 mask = A5PSW_INPUT_LEARN_DIS(port);</div><div class='add'>+	u32 reg = !learn ? mask : 0;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_INPUT_LEARN, mask, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_rx_block_set(struct a5psw *a5psw, int port, bool block)</div><div class='add'>+{</div><div class='add'>+	u32 mask = A5PSW_INPUT_LEARN_BLOCK(port);</div><div class='add'>+	u32 reg = block ? mask : 0;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_INPUT_LEARN, mask, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_flooding_set_resolution(struct a5psw *a5psw, int port,</div><div class='add'>+					  bool set)</div><div class='add'>+{</div><div class='add'>+	static const u8 offsets[] = {</div><div class='add'>+		A5PSW_UCAST_DEF_MASK, A5PSW_BCAST_DEF_MASK, A5PSW_MCAST_DEF_MASK</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(offsets); i++)</div><div class='add'>+		a5psw_reg_rmw(a5psw, offsets[i], BIT(port),</div><div class='add'>+			      set ? BIT(port) : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_set_standalone(struct a5psw *a5psw, int port,</div><div class='add'>+				      bool standalone)</div><div class='add'>+{</div><div class='add'>+	a5psw_port_learning_set(a5psw, port, !standalone);</div><div class='add'>+	a5psw_flooding_set_resolution(a5psw, port, !standalone);</div><div class='add'>+	a5psw_port_mgmtfwd_set(a5psw, port, standalone);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct dsa_bridge bridge,</div><div class='add'>+				  bool *tx_fwd_offload,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* We only support 1 bridge device */</div><div class='add'>+	if (a5psw-&gt;br_dev &amp;&amp; bridge.dev != a5psw-&gt;br_dev) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Forwarding offload supported for a single bridge");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;br_dev = bridge.dev;</div><div class='add'>+	a5psw_port_set_standalone(a5psw, port, false);</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;bridged_ports |= BIT(port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;bridged_ports &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	a5psw_port_set_standalone(a5psw, port, true);</div><div class='add'>+</div><div class='add'>+	/* No more ports bridged */</div><div class='add'>+	if (a5psw-&gt;bridged_ports == BIT(A5PSW_CPU_PORT))</div><div class='add'>+		a5psw-&gt;br_dev = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				       struct switchdev_brport_flags flags,</div><div class='add'>+				       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |</div><div class='add'>+			   BR_BCAST_FLOOD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+a5psw_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			struct switchdev_brport_flags flags,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* If a port is set as standalone, we do not want to be able to</div><div class='add'>+	 * configure flooding nor learning which would result in joining the</div><div class='add'>+	 * unique bridge. This can happen when a port leaves the bridge, in</div><div class='add'>+	 * which case the DSA core will try to "clear" all flags for the</div><div class='add'>+	 * standalone port (ie enable flooding, disable learning). In that case</div><div class='add'>+	 * do not fail but do not apply the flags.</div><div class='add'>+	 */</div><div class='add'>+	if (!(a5psw-&gt;bridged_ports &amp; BIT(port)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		val = flags.val &amp; BR_LEARNING ? 0 : A5PSW_INPUT_LEARN_DIS(port);</div><div class='add'>+		a5psw_reg_rmw(a5psw, A5PSW_INPUT_LEARN,</div><div class='add'>+			      A5PSW_INPUT_LEARN_DIS(port), val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD) {</div><div class='add'>+		val = flags.val &amp; BR_FLOOD ? BIT(port) : 0;</div><div class='add'>+		a5psw_reg_rmw(a5psw, A5PSW_UCAST_DEF_MASK, BIT(port), val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_MCAST_FLOOD) {</div><div class='add'>+		val = flags.val &amp; BR_MCAST_FLOOD ? BIT(port) : 0;</div><div class='add'>+		a5psw_reg_rmw(a5psw, A5PSW_MCAST_DEF_MASK, BIT(port), val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_BCAST_FLOOD) {</div><div class='add'>+		val = flags.val &amp; BR_BCAST_FLOOD ? BIT(port) : 0;</div><div class='add'>+		a5psw_reg_rmw(a5psw, A5PSW_BCAST_DEF_MASK, BIT(port), val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	bool learning_enabled, rx_enabled, tx_enabled;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		rx_enabled = false;</div><div class='add'>+		tx_enabled = false;</div><div class='add'>+		learning_enabled = false;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		rx_enabled = false;</div><div class='add'>+		tx_enabled = false;</div><div class='add'>+		learning_enabled = dp-&gt;learning;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		rx_enabled = true;</div><div class='add'>+		tx_enabled = true;</div><div class='add'>+		learning_enabled = dp-&gt;learning;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ds-&gt;dev, "invalid STP state: %d\n", state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a5psw_port_learning_set(a5psw, port, learning_enabled);</div><div class='add'>+	a5psw_port_rx_block_set(a5psw, port, !rx_enabled);</div><div class='add'>+	a5psw_port_tx_enable(a5psw, port, tx_enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	a5psw_port_fdb_flush(a5psw, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_lk_execute_lookup(struct a5psw *a5psw, union lk_data *lk_data,</div><div class='add'>+				   u16 *entry)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_LO, lk_data-&gt;lo);</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_HI, lk_data-&gt;hi);</div><div class='add'>+</div><div class='add'>+	ctrl = A5PSW_LK_ADDR_CTRL_LOOKUP;</div><div class='add'>+	ret = a5psw_lk_execute_ctrl(a5psw, &amp;ctrl);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*entry = ctrl &amp; A5PSW_LK_ADDR_CTRL_ADDRESS;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			      const unsigned char *addr, u16 vid,</div><div class='add'>+			      struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	union lk_data lk_data = {0};</div><div class='add'>+	bool inc_learncount = false;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u16 entry;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(lk_data.entry.mac, addr);</div><div class='add'>+	lk_data.entry.port_mask = BIT(port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+</div><div class='add'>+	/* Set the value to be written in the lookup table */</div><div class='add'>+	ret = a5psw_lk_execute_lookup(a5psw, &amp;lk_data, &amp;entry);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto lk_unlock;</div><div class='add'>+</div><div class='add'>+	lk_data.hi = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_HI);</div><div class='add'>+	if (!lk_data.entry.valid) {</div><div class='add'>+		inc_learncount = true;</div><div class='add'>+		/* port_mask set to 0x1f when entry is not valid, clear it */</div><div class='add'>+		lk_data.entry.port_mask = 0;</div><div class='add'>+		lk_data.entry.prio = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	lk_data.entry.port_mask |= BIT(port);</div><div class='add'>+	lk_data.entry.is_static = 1;</div><div class='add'>+	lk_data.entry.valid = 1;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_HI, lk_data.hi);</div><div class='add'>+</div><div class='add'>+	reg = A5PSW_LK_ADDR_CTRL_WRITE | entry;</div><div class='add'>+	ret = a5psw_lk_execute_ctrl(a5psw, &amp;reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto lk_unlock;</div><div class='add'>+</div><div class='add'>+	if (inc_learncount) {</div><div class='add'>+		reg = A5PSW_LK_LEARNCOUNT_MODE_INC;</div><div class='add'>+		a5psw_reg_writel(a5psw, A5PSW_LK_LEARNCOUNT, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+lk_unlock:</div><div class='add'>+	mutex_unlock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			      const unsigned char *addr, u16 vid,</div><div class='add'>+			      struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	union lk_data lk_data = {0};</div><div class='add'>+	bool clear = false;</div><div class='add'>+	u16 entry;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(lk_data.entry.mac, addr);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+</div><div class='add'>+	ret = a5psw_lk_execute_lookup(a5psw, &amp;lk_data, &amp;entry);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto lk_unlock;</div><div class='add'>+</div><div class='add'>+	lk_data.hi = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_HI);</div><div class='add'>+</div><div class='add'>+	/* Our hardware does not associate any VID to the FDB entries so this</div><div class='add'>+	 * means that if two entries were added for the same mac but for</div><div class='add'>+	 * different VID, then, on the deletion of the first one, we would also</div><div class='add'>+	 * delete the second one. Since there is unfortunately nothing we can do</div><div class='add'>+	 * about that, do not return an error...</div><div class='add'>+	 */</div><div class='add'>+	if (!lk_data.entry.valid)</div><div class='add'>+		goto lk_unlock;</div><div class='add'>+</div><div class='add'>+	lk_data.entry.port_mask &amp;= ~BIT(port);</div><div class='add'>+	/* If there is no more port in the mask, clear the entry */</div><div class='add'>+	if (lk_data.entry.port_mask == 0)</div><div class='add'>+		clear = true;</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_DATA_HI, lk_data.hi);</div><div class='add'>+</div><div class='add'>+	reg = entry;</div><div class='add'>+	if (clear)</div><div class='add'>+		reg |= A5PSW_LK_ADDR_CTRL_CLEAR;</div><div class='add'>+	else</div><div class='add'>+		reg |= A5PSW_LK_ADDR_CTRL_WRITE;</div><div class='add'>+</div><div class='add'>+	ret = a5psw_lk_execute_ctrl(a5psw, &amp;reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto lk_unlock;</div><div class='add'>+</div><div class='add'>+	/* Decrement LEARNCOUNT */</div><div class='add'>+	if (clear) {</div><div class='add'>+		reg = A5PSW_LK_LEARNCOUNT_MODE_DEC;</div><div class='add'>+		a5psw_reg_writel(a5psw, A5PSW_LK_LEARNCOUNT, reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+lk_unlock:</div><div class='add'>+	mutex_unlock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			       dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	union lk_data lk_data;</div><div class='add'>+	int i = 0, ret = 0;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; A5PSW_TABLE_ENTRIES; i++) {</div><div class='add'>+		reg = A5PSW_LK_ADDR_CTRL_READ | A5PSW_LK_ADDR_CTRL_WAIT | i;</div><div class='add'>+</div><div class='add'>+		ret = a5psw_lk_execute_ctrl(a5psw, &amp;reg);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		lk_data.hi = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_HI);</div><div class='add'>+		/* If entry is not valid or does not contain the port, skip */</div><div class='add'>+		if (!lk_data.entry.valid ||</div><div class='add'>+		    !(lk_data.entry.port_mask &amp; BIT(port)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		lk_data.lo = a5psw_reg_readl(a5psw, A5PSW_LK_DATA_LO);</div><div class='add'>+</div><div class='add'>+		ret = cb(lk_data.entry.mac, 0, lk_data.entry.is_static, data);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+				     bool vlan_filtering,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 mask = BIT(port + A5PSW_VLAN_VERI_SHIFT) |</div><div class='add'>+		   BIT(port + A5PSW_VLAN_DISC_SHIFT);</div><div class='add'>+	u32 val = vlan_filtering ? mask : 0;</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Disable/enable vlan tagging */</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_VLAN_IN_MODE_ENA, BIT(port),</div><div class='add'>+		      vlan_filtering ? BIT(port) : 0);</div><div class='add'>+</div><div class='add'>+	/* Disable/enable vlan input filtering */</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_VLAN_VERIFY, mask, val);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_find_vlan_entry(struct a5psw *a5psw, u16 vid)</div><div class='add'>+{</div><div class='add'>+	u32 vlan_res;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Find vlan for this port */</div><div class='add'>+	for (i = 0; i &lt; A5PSW_VLAN_COUNT; i++) {</div><div class='add'>+		vlan_res = a5psw_reg_readl(a5psw, A5PSW_VLAN_RES(i));</div><div class='add'>+		if (FIELD_GET(A5PSW_VLAN_RES_VLANID, vlan_res) == vid)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_new_vlan_res_entry(struct a5psw *a5psw, u16 newvid)</div><div class='add'>+{</div><div class='add'>+	u32 vlan_res;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Find a free VLAN entry */</div><div class='add'>+	for (i = 0; i &lt; A5PSW_VLAN_COUNT; i++) {</div><div class='add'>+		vlan_res = a5psw_reg_readl(a5psw, A5PSW_VLAN_RES(i));</div><div class='add'>+		if (!(FIELD_GET(A5PSW_VLAN_RES_PORTMASK, vlan_res))) {</div><div class='add'>+			vlan_res = FIELD_PREP(A5PSW_VLAN_RES_VLANID, newvid);</div><div class='add'>+			a5psw_reg_writel(a5psw, A5PSW_VLAN_RES(i), vlan_res);</div><div class='add'>+			return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_vlan_tagged_cfg(struct a5psw *a5psw,</div><div class='add'>+				       unsigned int vlan_res_id, int port,</div><div class='add'>+				       bool set)</div><div class='add'>+{</div><div class='add'>+	u32 mask = A5PSW_VLAN_RES_WR_PORTMASK | A5PSW_VLAN_RES_RD_TAGMASK |</div><div class='add'>+		   BIT(port);</div><div class='add'>+	u32 vlan_res_off = A5PSW_VLAN_RES(vlan_res_id);</div><div class='add'>+	u32 val = A5PSW_VLAN_RES_WR_TAGMASK, reg;</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		val |= BIT(port);</div><div class='add'>+</div><div class='add'>+	/* Toggle tag mask read */</div><div class='add'>+	a5psw_reg_writel(a5psw, vlan_res_off, A5PSW_VLAN_RES_RD_TAGMASK);</div><div class='add'>+	reg = a5psw_reg_readl(a5psw, vlan_res_off);</div><div class='add'>+	a5psw_reg_writel(a5psw, vlan_res_off, A5PSW_VLAN_RES_RD_TAGMASK);</div><div class='add'>+</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	reg |= val;</div><div class='add'>+	a5psw_reg_writel(a5psw, vlan_res_off, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_port_vlan_cfg(struct a5psw *a5psw, unsigned int vlan_res_id,</div><div class='add'>+				int port, bool set)</div><div class='add'>+{</div><div class='add'>+	u32 mask = A5PSW_VLAN_RES_WR_TAGMASK | BIT(port);</div><div class='add'>+	u32 reg = A5PSW_VLAN_RES_WR_PORTMASK;</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		reg |= BIT(port);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_VLAN_RES(vlan_res_id), mask, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			       const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool tagged = !(vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	u16 vid = vlan-&gt;vid;</div><div class='add'>+	int vlan_res_id;</div><div class='add'>+</div><div class='add'>+	vlan_res_id = a5psw_find_vlan_entry(a5psw, vid);</div><div class='add'>+	if (vlan_res_id &lt; 0) {</div><div class='add'>+		vlan_res_id = a5psw_new_vlan_res_entry(a5psw, vid);</div><div class='add'>+		if (vlan_res_id &lt; 0)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a5psw_port_vlan_cfg(a5psw, vlan_res_id, port, true);</div><div class='add'>+	if (tagged)</div><div class='add'>+		a5psw_port_vlan_tagged_cfg(a5psw, vlan_res_id, port, true);</div><div class='add'>+</div><div class='add'>+	/* Configure port to tag with corresponding VID, but do not enable it</div><div class='add'>+	 * yet: wait for vlan filtering to be enabled to enable vlan port</div><div class='add'>+	 * tagging</div><div class='add'>+	 */</div><div class='add'>+	if (pvid)</div><div class='add'>+		a5psw_reg_writel(a5psw, A5PSW_SYSTEM_TAGINFO(port), vid);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			       const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	u16 vid = vlan-&gt;vid;</div><div class='add'>+	int vlan_res_id;</div><div class='add'>+</div><div class='add'>+	vlan_res_id = a5psw_find_vlan_entry(a5psw, vid);</div><div class='add'>+	if (vlan_res_id &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	a5psw_port_vlan_cfg(a5psw, vlan_res_id, port, false);</div><div class='add'>+	a5psw_port_vlan_tagged_cfg(a5psw, vlan_res_id, port, false);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 a5psw_read_stat(struct a5psw *a5psw, u32 offset, int port)</div><div class='add'>+{</div><div class='add'>+	u32 reg_lo, reg_hi;</div><div class='add'>+</div><div class='add'>+	reg_lo = a5psw_reg_readl(a5psw, offset + A5PSW_PORT_OFFSET(port));</div><div class='add'>+	/* A5PSW_STATS_HIWORD is latched on stat read */</div><div class='add'>+	reg_hi = a5psw_reg_readl(a5psw, A5PSW_STATS_HIWORD);</div><div class='add'>+</div><div class='add'>+	return ((u64)reg_hi &lt;&lt; 32) | reg_lo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+			      uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int u;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (u = 0; u &lt; ARRAY_SIZE(a5psw_stats); u++)</div><div class='add'>+		ethtool_puts(&amp;data, a5psw_stats[u].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	unsigned int u;</div><div class='add'>+</div><div class='add'>+	for (u = 0; u &lt; ARRAY_SIZE(a5psw_stats); u++)</div><div class='add'>+		data[u] = a5psw_read_stat(a5psw, a5psw_stats[u].offset, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ARRAY_SIZE(a5psw_stats);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_get_eth_mac_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+#define RD(name) a5psw_read_stat(a5psw, A5PSW_##name, port)</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK = RD(aFramesTransmittedOK);</div><div class='add'>+	mac_stats-&gt;SingleCollisionFrames = RD(aSingleCollisions);</div><div class='add'>+	mac_stats-&gt;MultipleCollisionFrames = RD(aMultipleCollisions);</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK = RD(aFramesReceivedOK);</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors = RD(aFrameCheckSequenceErrors);</div><div class='add'>+	mac_stats-&gt;AlignmentErrors = RD(aAlignmentErrors);</div><div class='add'>+	mac_stats-&gt;OctetsTransmittedOK = RD(aOctetsTransmittedOK);</div><div class='add'>+	mac_stats-&gt;FramesWithDeferredXmissions = RD(aDeferred);</div><div class='add'>+	mac_stats-&gt;LateCollisions = RD(aLateCollisions);</div><div class='add'>+	mac_stats-&gt;FramesAbortedDueToXSColls = RD(aExcessiveCollisions);</div><div class='add'>+	mac_stats-&gt;FramesLostDueToIntMACXmitError = RD(ifOutErrors);</div><div class='add'>+	mac_stats-&gt;CarrierSenseErrors = RD(aCarrierSenseErrors);</div><div class='add'>+	mac_stats-&gt;OctetsReceivedOK = RD(aOctetsReceivedOK);</div><div class='add'>+	mac_stats-&gt;FramesLostDueToIntMACRcvError = RD(ifInErrors);</div><div class='add'>+	mac_stats-&gt;MulticastFramesXmittedOK = RD(ifOutMulticastPkts);</div><div class='add'>+	mac_stats-&gt;BroadcastFramesXmittedOK = RD(ifOutBroadcastPkts);</div><div class='add'>+	mac_stats-&gt;FramesWithExcessiveDeferral = RD(aDeferred);</div><div class='add'>+	mac_stats-&gt;MulticastFramesReceivedOK = RD(ifInMulticastPkts);</div><div class='add'>+	mac_stats-&gt;BroadcastFramesReceivedOK = RD(ifInBroadcastPkts);</div><div class='add'>+#undef RD</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range a5psw_rmon_ranges[] = {</div><div class='add'>+	{ 0, 64 },</div><div class='add'>+	{ 65, 127 },</div><div class='add'>+	{ 128, 255 },</div><div class='add'>+	{ 256, 511 },</div><div class='add'>+	{ 512, 1023 },</div><div class='add'>+	{ 1024, 1518 },</div><div class='add'>+	{ 1519, A5PSW_MAX_MTU },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void a5psw_get_rmon_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				 const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+#define RD(name) a5psw_read_stat(a5psw, A5PSW_##name, port)</div><div class='add'>+	rmon_stats-&gt;undersize_pkts = RD(etherStatsUndersizePkts);</div><div class='add'>+	rmon_stats-&gt;oversize_pkts = RD(etherStatsOversizePkts);</div><div class='add'>+	rmon_stats-&gt;fragments = RD(etherStatsFragments);</div><div class='add'>+	rmon_stats-&gt;jabbers = RD(etherStatsJabbers);</div><div class='add'>+	rmon_stats-&gt;hist[0] = RD(etherStatsPkts64Octets);</div><div class='add'>+	rmon_stats-&gt;hist[1] = RD(etherStatsPkts65to127Octets);</div><div class='add'>+	rmon_stats-&gt;hist[2] = RD(etherStatsPkts128to255Octets);</div><div class='add'>+	rmon_stats-&gt;hist[3] = RD(etherStatsPkts256to511Octets);</div><div class='add'>+	rmon_stats-&gt;hist[4] = RD(etherStatsPkts512to1023Octets);</div><div class='add'>+	rmon_stats-&gt;hist[5] = RD(etherStatsPkts1024to1518Octets);</div><div class='add'>+	rmon_stats-&gt;hist[6] = RD(etherStatsPkts1519toXOctets);</div><div class='add'>+#undef RD</div><div class='add'>+</div><div class='add'>+	*ranges = a5psw_rmon_ranges;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_get_eth_ctrl_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	u64 stat;</div><div class='add'>+</div><div class='add'>+	stat = a5psw_read_stat(a5psw, A5PSW_aTxPAUSEMACCtrlFrames, port);</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesTransmitted = stat;</div><div class='add'>+	stat = a5psw_read_stat(a5psw, A5PSW_aRxPAUSEMACCtrlFrames, port);</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesReceived = stat;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_vlan_setup(struct a5psw *a5psw, int port)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* Enable TAG always mode for the port, this is actually controlled</div><div class='add'>+	 * by VLAN_IN_MODE_ENA field which will be used for PVID insertion</div><div class='add'>+	 */</div><div class='add'>+	reg = A5PSW_VLAN_IN_MODE_TAG_ALWAYS;</div><div class='add'>+	reg &lt;&lt;= A5PSW_VLAN_IN_MODE_PORT_SHIFT(port);</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_VLAN_IN_MODE, A5PSW_VLAN_IN_MODE_PORT(port),</div><div class='add'>+		      reg);</div><div class='add'>+</div><div class='add'>+	/* Set transparent mode for output frame manipulation, this will depend</div><div class='add'>+	 * on the VLAN_RES configuration mode</div><div class='add'>+	 */</div><div class='add'>+	reg = A5PSW_VLAN_OUT_MODE_TRANSPARENT;</div><div class='add'>+	reg &lt;&lt;= A5PSW_VLAN_OUT_MODE_PORT_SHIFT(port);</div><div class='add'>+	a5psw_reg_rmw(a5psw, A5PSW_VLAN_OUT_MODE,</div><div class='add'>+		      A5PSW_VLAN_OUT_MODE_PORT(port), reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = ds-&gt;priv;</div><div class='add'>+	int port, vlan, ret;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* Validate that there is only 1 CPU port with index A5PSW_CPU_PORT */</div><div class='add'>+	dsa_switch_for_each_cpu_port(dp, ds) {</div><div class='add'>+		if (dp-&gt;index != A5PSW_CPU_PORT) {</div><div class='add'>+			dev_err(a5psw-&gt;dev, "Invalid CPU port\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure management port */</div><div class='add'>+	reg = A5PSW_CPU_PORT | A5PSW_MGMT_CFG_ENABLE;</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_MGMT_CFG, reg);</div><div class='add'>+</div><div class='add'>+	/* Set pattern 0 to forward all frame to mgmt port */</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_PATTERN_CTRL(A5PSW_PATTERN_MGMTFWD),</div><div class='add'>+			 A5PSW_PATTERN_CTRL_MGMTFWD);</div><div class='add'>+</div><div class='add'>+	/* Enable port tagging */</div><div class='add'>+	reg = FIELD_PREP(A5PSW_MGMT_TAG_CFG_TAGFIELD, ETH_P_DSA_A5PSW);</div><div class='add'>+	reg |= A5PSW_MGMT_TAG_CFG_ENABLE | A5PSW_MGMT_TAG_CFG_ALL_FRAMES;</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_MGMT_TAG_CFG, reg);</div><div class='add'>+</div><div class='add'>+	/* Enable normal switch operation */</div><div class='add'>+	reg = A5PSW_LK_ADDR_CTRL_BLOCKING | A5PSW_LK_ADDR_CTRL_LEARNING |</div><div class='add'>+	      A5PSW_LK_ADDR_CTRL_AGEING | A5PSW_LK_ADDR_CTRL_ALLOW_MIGR |</div><div class='add'>+	      A5PSW_LK_ADDR_CTRL_CLEAR_TABLE;</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_CTRL, reg);</div><div class='add'>+</div><div class='add'>+	ret = readl_poll_timeout(a5psw-&gt;base + A5PSW_LK_CTRL, reg,</div><div class='add'>+				 !(reg &amp; A5PSW_LK_ADDR_CTRL_CLEAR_TABLE),</div><div class='add'>+				 A5PSW_LK_BUSY_USEC_POLL, A5PSW_CTRL_TIMEOUT);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(a5psw-&gt;dev, "Failed to clear lookup table\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset learn count to 0 */</div><div class='add'>+	reg = A5PSW_LK_LEARNCOUNT_MODE_SET;</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_LK_LEARNCOUNT, reg);</div><div class='add'>+</div><div class='add'>+	/* Clear VLAN resource table */</div><div class='add'>+	reg = A5PSW_VLAN_RES_WR_PORTMASK | A5PSW_VLAN_RES_WR_TAGMASK;</div><div class='add'>+	for (vlan = 0; vlan &lt; A5PSW_VLAN_COUNT; vlan++)</div><div class='add'>+		a5psw_reg_writel(a5psw, A5PSW_VLAN_RES(vlan), reg);</div><div class='add'>+</div><div class='add'>+	/* Reset all ports */</div><div class='add'>+	dsa_switch_for_each_port(dp, ds) {</div><div class='add'>+		port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+		/* Reset the port */</div><div class='add'>+		a5psw_reg_writel(a5psw, A5PSW_CMD_CFG(port),</div><div class='add'>+				 A5PSW_CMD_CFG_SW_RESET);</div><div class='add'>+</div><div class='add'>+		/* Enable only CPU port */</div><div class='add'>+		a5psw_port_enable_set(a5psw, port, dsa_port_is_cpu(dp));</div><div class='add'>+</div><div class='add'>+		if (dsa_port_is_unused(dp))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Enable egress flooding and learning for CPU port */</div><div class='add'>+		if (dsa_port_is_cpu(dp)) {</div><div class='add'>+			a5psw_flooding_set_resolution(a5psw, port, true);</div><div class='add'>+			a5psw_port_learning_set(a5psw, port, true);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable standalone mode for user ports */</div><div class='add'>+		if (dsa_port_is_user(dp))</div><div class='add'>+			a5psw_port_set_standalone(a5psw, port, true);</div><div class='add'>+</div><div class='add'>+		a5psw_vlan_setup(a5psw, port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops a5psw_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs = a5psw_phylink_mac_select_pcs,</div><div class='add'>+	.mac_config = a5psw_phylink_mac_config,</div><div class='add'>+	.mac_link_down = a5psw_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up = a5psw_phylink_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops a5psw_switch_ops = {</div><div class='add'>+	.get_tag_protocol = a5psw_get_tag_protocol,</div><div class='add'>+	.setup = a5psw_setup,</div><div class='add'>+	.port_disable = a5psw_port_disable,</div><div class='add'>+	.port_enable = a5psw_port_enable,</div><div class='add'>+	.phylink_get_caps = a5psw_phylink_get_caps,</div><div class='add'>+	.port_change_mtu = a5psw_port_change_mtu,</div><div class='add'>+	.port_max_mtu = a5psw_port_max_mtu,</div><div class='add'>+	.get_sset_count = a5psw_get_sset_count,</div><div class='add'>+	.get_strings = a5psw_get_strings,</div><div class='add'>+	.get_ethtool_stats = a5psw_get_ethtool_stats,</div><div class='add'>+	.get_eth_mac_stats = a5psw_get_eth_mac_stats,</div><div class='add'>+	.get_eth_ctrl_stats = a5psw_get_eth_ctrl_stats,</div><div class='add'>+	.get_rmon_stats = a5psw_get_rmon_stats,</div><div class='add'>+	.set_ageing_time = a5psw_set_ageing_time,</div><div class='add'>+	.port_bridge_join = a5psw_port_bridge_join,</div><div class='add'>+	.port_bridge_leave = a5psw_port_bridge_leave,</div><div class='add'>+	.port_pre_bridge_flags = a5psw_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags = a5psw_port_bridge_flags,</div><div class='add'>+	.port_stp_state_set = a5psw_port_stp_state_set,</div><div class='add'>+	.port_fast_age = a5psw_port_fast_age,</div><div class='add'>+	.port_vlan_filtering = a5psw_port_vlan_filtering,</div><div class='add'>+	.port_vlan_add = a5psw_port_vlan_add,</div><div class='add'>+	.port_vlan_del = a5psw_port_vlan_del,</div><div class='add'>+	.port_fdb_add = a5psw_port_fdb_add,</div><div class='add'>+	.port_fdb_del = a5psw_port_fdb_del,</div><div class='add'>+	.port_fdb_dump = a5psw_port_fdb_dump,</div><div class='add'>+	.port_hsr_join = dsa_port_simple_hsr_join,</div><div class='add'>+	.port_hsr_leave = dsa_port_simple_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int a5psw_mdio_wait_busy(struct a5psw *a5psw)</div><div class='add'>+{</div><div class='add'>+	u32 status;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = readl_poll_timeout(a5psw-&gt;base + A5PSW_MDIO_CFG_STATUS, status,</div><div class='add'>+				 !(status &amp; A5PSW_MDIO_CFG_STATUS_BUSY), 10,</div><div class='add'>+				 1000 * USEC_PER_MSEC);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(a5psw-&gt;dev, "MDIO command timeout\n");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = bus-&gt;priv;</div><div class='add'>+	u32 cmd, status;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd = A5PSW_MDIO_COMMAND_READ;</div><div class='add'>+	cmd |= FIELD_PREP(A5PSW_MDIO_COMMAND_REG_ADDR, phy_reg);</div><div class='add'>+	cmd |= FIELD_PREP(A5PSW_MDIO_COMMAND_PHY_ADDR, phy_id);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_MDIO_COMMAND, cmd);</div><div class='add'>+</div><div class='add'>+	ret = a5psw_mdio_wait_busy(a5psw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = a5psw_reg_readl(a5psw, A5PSW_MDIO_DATA) &amp; A5PSW_MDIO_DATA_MASK;</div><div class='add'>+</div><div class='add'>+	status = a5psw_reg_readl(a5psw, A5PSW_MDIO_CFG_STATUS);</div><div class='add'>+	if (status &amp; A5PSW_MDIO_CFG_STATUS_READERR)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_mdio_write(struct mii_bus *bus, int phy_id, int phy_reg,</div><div class='add'>+			    u16 phy_data)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = bus-&gt;priv;</div><div class='add'>+	u32 cmd;</div><div class='add'>+</div><div class='add'>+	cmd = FIELD_PREP(A5PSW_MDIO_COMMAND_REG_ADDR, phy_reg);</div><div class='add'>+	cmd |= FIELD_PREP(A5PSW_MDIO_COMMAND_PHY_ADDR, phy_id);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_MDIO_COMMAND, cmd);</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_MDIO_DATA, phy_data);</div><div class='add'>+</div><div class='add'>+	return a5psw_mdio_wait_busy(a5psw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_mdio_config(struct a5psw *a5psw, u32 mdio_freq)</div><div class='add'>+{</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	unsigned long div;</div><div class='add'>+	u32 cfgstatus;</div><div class='add'>+</div><div class='add'>+	rate = clk_get_rate(a5psw-&gt;hclk);</div><div class='add'>+	div = ((rate / mdio_freq) / 2);</div><div class='add'>+	if (div &gt; FIELD_MAX(A5PSW_MDIO_CFG_STATUS_CLKDIV) ||</div><div class='add'>+	    div &lt; A5PSW_MDIO_CLK_DIV_MIN) {</div><div class='add'>+		dev_err(a5psw-&gt;dev, "MDIO clock div %ld out of range\n", div);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfgstatus = FIELD_PREP(A5PSW_MDIO_CFG_STATUS_CLKDIV, div);</div><div class='add'>+</div><div class='add'>+	a5psw_reg_writel(a5psw, A5PSW_MDIO_CFG_STATUS, cfgstatus);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_probe_mdio(struct a5psw *a5psw, struct device_node *node)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = a5psw-&gt;dev;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	u32 mdio_freq;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(node, "clock-frequency", &amp;mdio_freq))</div><div class='add'>+		mdio_freq = A5PSW_MDIO_DEF_FREQ;</div><div class='add'>+</div><div class='add'>+	ret = a5psw_mdio_config(a5psw, mdio_freq);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!bus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bus-&gt;name = "a5psw_mdio";</div><div class='add'>+	bus-&gt;read = a5psw_mdio_read;</div><div class='add'>+	bus-&gt;write = a5psw_mdio_write;</div><div class='add'>+	bus-&gt;priv = a5psw;</div><div class='add'>+	bus-&gt;parent = dev;</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s", dev_name(dev));</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;mii_bus = bus;</div><div class='add'>+</div><div class='add'>+	return devm_of_mdiobus_register(dev, bus, node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_pcs_free(struct a5psw *a5psw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(a5psw-&gt;pcs); i++) {</div><div class='add'>+		if (a5psw-&gt;pcs[i])</div><div class='add'>+			miic_destroy(a5psw-&gt;pcs[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_pcs_get(struct a5psw *a5psw)</div><div class='add'>+{</div><div class='add'>+	struct device_node *ports, *port, *pcs_node;</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	ports = of_get_child_by_name(a5psw-&gt;dev-&gt;of_node, "ethernet-ports");</div><div class='add'>+	if (!ports)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for_each_available_child_of_node(ports, port) {</div><div class='add'>+		pcs_node = of_parse_phandle(port, "pcs-handle", 0);</div><div class='add'>+		if (!pcs_node)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (of_property_read_u32(port, "reg", &amp;reg)) {</div><div class='add'>+			ret = -EINVAL;</div><div class='add'>+			goto free_pcs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (reg &gt;= ARRAY_SIZE(a5psw-&gt;pcs)) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			goto free_pcs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pcs = miic_create(a5psw-&gt;dev, pcs_node);</div><div class='add'>+		if (IS_ERR(pcs)) {</div><div class='add'>+			dev_err(a5psw-&gt;dev, "Failed to create PCS for port %d\n",</div><div class='add'>+				reg);</div><div class='add'>+			ret = PTR_ERR(pcs);</div><div class='add'>+			goto free_pcs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		a5psw-&gt;pcs[reg] = pcs;</div><div class='add'>+		of_node_put(pcs_node);</div><div class='add'>+	}</div><div class='add'>+	of_node_put(ports);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_pcs:</div><div class='add'>+	of_node_put(pcs_node);</div><div class='add'>+	of_node_put(port);</div><div class='add'>+	of_node_put(ports);</div><div class='add'>+	a5psw_pcs_free(a5psw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int a5psw_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct device_node *mdio;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct a5psw *a5psw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	a5psw = devm_kzalloc(dev, sizeof(*a5psw), GFP_KERNEL);</div><div class='add'>+	if (!a5psw)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;dev = dev;</div><div class='add'>+	mutex_init(&amp;a5psw-&gt;lk_lock);</div><div class='add'>+	spin_lock_init(&amp;a5psw-&gt;reg_lock);</div><div class='add'>+	a5psw-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(a5psw-&gt;base))</div><div class='add'>+		return PTR_ERR(a5psw-&gt;base);</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;bridged_ports = BIT(A5PSW_CPU_PORT);</div><div class='add'>+</div><div class='add'>+	ret = a5psw_pcs_get(a5psw);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;hclk = devm_clk_get_enabled(dev, "hclk");</div><div class='add'>+	if (IS_ERR(a5psw-&gt;hclk)) {</div><div class='add'>+		dev_err(dev, "failed get hclk clock\n");</div><div class='add'>+		ret = PTR_ERR(a5psw-&gt;hclk);</div><div class='add'>+		goto free_pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	a5psw-&gt;clk = devm_clk_get_enabled(dev, "clk");</div><div class='add'>+	if (IS_ERR(a5psw-&gt;clk)) {</div><div class='add'>+		dev_err(dev, "failed get clk_switch clock\n");</div><div class='add'>+		ret = PTR_ERR(a5psw-&gt;clk);</div><div class='add'>+		goto free_pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdio = of_get_available_child_by_name(dev-&gt;of_node, "mdio");</div><div class='add'>+	if (mdio) {</div><div class='add'>+		ret = a5psw_probe_mdio(a5psw, mdio);</div><div class='add'>+		of_node_put(mdio);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Failed to register MDIO: %d\n", ret);</div><div class='add'>+			goto free_pcs;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds = &amp;a5psw-&gt;ds;</div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;num_ports = A5PSW_PORTS_NUM;</div><div class='add'>+	ds-&gt;ops = &amp;a5psw_switch_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;a5psw_phylink_mac_ops;</div><div class='add'>+	ds-&gt;priv = a5psw;</div><div class='add'>+</div><div class='add'>+	ret = dsa_register_switch(ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "Failed to register DSA switch: %d\n", ret);</div><div class='add'>+		goto free_pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_pcs:</div><div class='add'>+	a5psw_pcs_free(a5psw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!a5psw)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(&amp;a5psw-&gt;ds);</div><div class='add'>+	a5psw_pcs_free(a5psw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a5psw_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct a5psw *a5psw = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!a5psw)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(&amp;a5psw-&gt;ds);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id a5psw_of_mtable[] = {</div><div class='add'>+	{ .compatible = "renesas,rzn1-a5psw", },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, a5psw_of_mtable);</div><div class='add'>+</div><div class='add'>+static struct platform_driver a5psw_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	 = "rzn1_a5psw",</div><div class='add'>+		.of_match_table = a5psw_of_mtable,</div><div class='add'>+	},</div><div class='add'>+	.probe = a5psw_probe,</div><div class='add'>+	.remove = a5psw_remove,</div><div class='add'>+	.shutdown = a5psw_shutdown,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(a5psw_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Renesas RZ/N1 Advanced 5-port Switch driver");</div><div class='add'>+MODULE_AUTHOR("Clément Léger &lt;clement.leger@bootlin.com&gt;");</div><div class='head'>diff --git a/drivers/net/dsa/rzn1_a5psw.h b/drivers/net/dsa/rzn1_a5psw.h<br/>new file mode 100644<br/>index 000000000000..d54acedac194<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/rzn1_a5psw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/rzn1_a5psw.h</a></div><div class='hunk'>@@ -0,0 +1,262 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2022 Schneider Electric</div><div class='add'>+ *</div><div class='add'>+ * Clément Léger &lt;clement.leger@bootlin.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pcs-rzn1-miic.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#define A5PSW_REVISION			0x0</div><div class='add'>+#define A5PSW_PORT_OFFSET(port)		(0x400 * (port))</div><div class='add'>+</div><div class='add'>+#define A5PSW_PORT_ENA			0x8</div><div class='add'>+#define A5PSW_PORT_ENA_TX(port)		BIT(port)</div><div class='add'>+#define A5PSW_PORT_ENA_RX_SHIFT		16</div><div class='add'>+#define A5PSW_PORT_ENA_TX_RX(port)	(BIT((port) + A5PSW_PORT_ENA_RX_SHIFT) | \</div><div class='add'>+					 BIT(port))</div><div class='add'>+#define A5PSW_UCAST_DEF_MASK		0xC</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLAN_VERIFY		0x10</div><div class='add'>+#define A5PSW_VLAN_VERI_SHIFT		0</div><div class='add'>+#define A5PSW_VLAN_DISC_SHIFT		16</div><div class='add'>+</div><div class='add'>+#define A5PSW_BCAST_DEF_MASK		0x14</div><div class='add'>+#define A5PSW_MCAST_DEF_MASK		0x18</div><div class='add'>+</div><div class='add'>+#define A5PSW_INPUT_LEARN		0x1C</div><div class='add'>+#define A5PSW_INPUT_LEARN_DIS(p)	BIT((p) + 16)</div><div class='add'>+#define A5PSW_INPUT_LEARN_BLOCK(p)	BIT(p)</div><div class='add'>+</div><div class='add'>+#define A5PSW_MGMT_CFG			0x20</div><div class='add'>+#define A5PSW_MGMT_CFG_ENABLE		BIT(6)</div><div class='add'>+</div><div class='add'>+#define A5PSW_MODE_CFG			0x24</div><div class='add'>+#define A5PSW_MODE_STATS_RESET		BIT(31)</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLAN_IN_MODE		0x28</div><div class='add'>+#define A5PSW_VLAN_IN_MODE_PORT_SHIFT(port)	((port) * 2)</div><div class='add'>+#define A5PSW_VLAN_IN_MODE_PORT(port)		(GENMASK(1, 0) &lt;&lt; \</div><div class='add'>+					A5PSW_VLAN_IN_MODE_PORT_SHIFT(port))</div><div class='add'>+#define A5PSW_VLAN_IN_MODE_SINGLE_PASSTHROUGH	0x0</div><div class='add'>+#define A5PSW_VLAN_IN_MODE_SINGLE_REPLACE	0x1</div><div class='add'>+#define A5PSW_VLAN_IN_MODE_TAG_ALWAYS		0x2</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE		0x2C</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE_PORT_SHIFT(port)	((port) * 2)</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE_PORT(port)	(GENMASK(1, 0) &lt;&lt; \</div><div class='add'>+					A5PSW_VLAN_OUT_MODE_PORT_SHIFT(port))</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE_DIS		0x0</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE_STRIP	0x1</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE_TAG_THROUGH	0x2</div><div class='add'>+#define A5PSW_VLAN_OUT_MODE_TRANSPARENT	0x3</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLAN_IN_MODE_ENA		0x30</div><div class='add'>+#define A5PSW_VLAN_TAG_ID		0x34</div><div class='add'>+</div><div class='add'>+#define A5PSW_SYSTEM_TAGINFO(port)	(0x200 + 4 * (port))</div><div class='add'>+</div><div class='add'>+#define A5PSW_AUTH_PORT(port)		(0x240 + 4 * (port))</div><div class='add'>+#define A5PSW_AUTH_PORT_AUTHORIZED	BIT(0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLAN_RES(entry)		(0x280 + 4 * (entry))</div><div class='add'>+#define A5PSW_VLAN_RES_WR_PORTMASK	BIT(30)</div><div class='add'>+#define A5PSW_VLAN_RES_WR_TAGMASK	BIT(29)</div><div class='add'>+#define A5PSW_VLAN_RES_RD_TAGMASK	BIT(28)</div><div class='add'>+#define A5PSW_VLAN_RES_VLANID		GENMASK(16, 5)</div><div class='add'>+#define A5PSW_VLAN_RES_PORTMASK		GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_RXMATCH_CONFIG(port)	(0x3e80 + 4 * (port))</div><div class='add'>+#define A5PSW_RXMATCH_CONFIG_PATTERN(p)	BIT(p)</div><div class='add'>+</div><div class='add'>+#define A5PSW_PATTERN_CTRL(p)		(0x3eb0 + 4  * (p))</div><div class='add'>+#define A5PSW_PATTERN_CTRL_MGMTFWD	BIT(1)</div><div class='add'>+</div><div class='add'>+#define A5PSW_LK_CTRL		0x400</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_BLOCKING	BIT(0)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_LEARNING	BIT(1)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_AGEING	BIT(2)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_ALLOW_MIGR	BIT(3)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_CLEAR_TABLE	BIT(6)</div><div class='add'>+</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL		0x408</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_BUSY		BIT(31)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_DELETE_PORT	BIT(30)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_CLEAR	BIT(29)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_LOOKUP	BIT(28)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_WAIT		BIT(27)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_READ		BIT(26)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_WRITE	BIT(25)</div><div class='add'>+#define A5PSW_LK_ADDR_CTRL_ADDRESS	GENMASK(12, 0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_LK_DATA_LO		0x40C</div><div class='add'>+#define A5PSW_LK_DATA_HI		0x410</div><div class='add'>+#define A5PSW_LK_DATA_HI_VALID		BIT(16)</div><div class='add'>+#define A5PSW_LK_DATA_HI_PORT		BIT(16)</div><div class='add'>+</div><div class='add'>+#define A5PSW_LK_LEARNCOUNT		0x418</div><div class='add'>+#define A5PSW_LK_LEARNCOUNT_COUNT	GENMASK(13, 0)</div><div class='add'>+#define A5PSW_LK_LEARNCOUNT_MODE	GENMASK(31, 30)</div><div class='add'>+#define A5PSW_LK_LEARNCOUNT_MODE_SET	0x0</div><div class='add'>+#define A5PSW_LK_LEARNCOUNT_MODE_INC	0x1</div><div class='add'>+#define A5PSW_LK_LEARNCOUNT_MODE_DEC	0x2</div><div class='add'>+</div><div class='add'>+#define A5PSW_MGMT_TAG_CFG		0x480</div><div class='add'>+#define A5PSW_MGMT_TAG_CFG_TAGFIELD	GENMASK(31, 16)</div><div class='add'>+#define A5PSW_MGMT_TAG_CFG_ALL_FRAMES	BIT(1)</div><div class='add'>+#define A5PSW_MGMT_TAG_CFG_ENABLE	BIT(0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_LK_AGETIME		0x41C</div><div class='add'>+#define A5PSW_LK_AGETIME_MASK		GENMASK(23, 0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_MDIO_CFG_STATUS		0x700</div><div class='add'>+#define A5PSW_MDIO_CFG_STATUS_CLKDIV	GENMASK(15, 7)</div><div class='add'>+#define A5PSW_MDIO_CFG_STATUS_READERR	BIT(1)</div><div class='add'>+#define A5PSW_MDIO_CFG_STATUS_BUSY	BIT(0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_MDIO_COMMAND		0x704</div><div class='add'>+/* Register is named TRAININIT in datasheet and should be set when reading */</div><div class='add'>+#define A5PSW_MDIO_COMMAND_READ		BIT(15)</div><div class='add'>+#define A5PSW_MDIO_COMMAND_PHY_ADDR	GENMASK(9, 5)</div><div class='add'>+#define A5PSW_MDIO_COMMAND_REG_ADDR	GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_MDIO_DATA			0x708</div><div class='add'>+#define A5PSW_MDIO_DATA_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_CMD_CFG(port)		(0x808 + A5PSW_PORT_OFFSET(port))</div><div class='add'>+#define A5PSW_CMD_CFG_CNTL_FRM_ENA	BIT(23)</div><div class='add'>+#define A5PSW_CMD_CFG_SW_RESET		BIT(13)</div><div class='add'>+#define A5PSW_CMD_CFG_TX_CRC_APPEND	BIT(11)</div><div class='add'>+#define A5PSW_CMD_CFG_HD_ENA		BIT(10)</div><div class='add'>+#define A5PSW_CMD_CFG_PAUSE_IGNORE	BIT(8)</div><div class='add'>+#define A5PSW_CMD_CFG_CRC_FWD		BIT(6)</div><div class='add'>+#define A5PSW_CMD_CFG_ETH_SPEED		BIT(3)</div><div class='add'>+#define A5PSW_CMD_CFG_RX_ENA		BIT(1)</div><div class='add'>+#define A5PSW_CMD_CFG_TX_ENA		BIT(0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_FRM_LENGTH(port)		(0x814 + A5PSW_PORT_OFFSET(port))</div><div class='add'>+#define A5PSW_FRM_LENGTH_MASK		GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define A5PSW_STATUS(port)		(0x840 + A5PSW_PORT_OFFSET(port))</div><div class='add'>+</div><div class='add'>+#define A5PSW_STATS_HIWORD		0x900</div><div class='add'>+</div><div class='add'>+/* Stats */</div><div class='add'>+#define A5PSW_aFramesTransmittedOK		0x868</div><div class='add'>+#define A5PSW_aFramesReceivedOK			0x86C</div><div class='add'>+#define A5PSW_aFrameCheckSequenceErrors		0x870</div><div class='add'>+#define A5PSW_aAlignmentErrors			0x874</div><div class='add'>+#define A5PSW_aOctetsTransmittedOK		0x878</div><div class='add'>+#define A5PSW_aOctetsReceivedOK			0x87C</div><div class='add'>+#define A5PSW_aTxPAUSEMACCtrlFrames		0x880</div><div class='add'>+#define A5PSW_aRxPAUSEMACCtrlFrames		0x884</div><div class='add'>+/* If */</div><div class='add'>+#define A5PSW_ifInErrors			0x888</div><div class='add'>+#define A5PSW_ifOutErrors			0x88C</div><div class='add'>+#define A5PSW_ifInUcastPkts			0x890</div><div class='add'>+#define A5PSW_ifInMulticastPkts			0x894</div><div class='add'>+#define A5PSW_ifInBroadcastPkts			0x898</div><div class='add'>+#define A5PSW_ifOutDiscards			0x89C</div><div class='add'>+#define A5PSW_ifOutUcastPkts			0x8A0</div><div class='add'>+#define A5PSW_ifOutMulticastPkts		0x8A4</div><div class='add'>+#define A5PSW_ifOutBroadcastPkts		0x8A8</div><div class='add'>+/* Ether */</div><div class='add'>+#define A5PSW_etherStatsDropEvents		0x8AC</div><div class='add'>+#define A5PSW_etherStatsOctets			0x8B0</div><div class='add'>+#define A5PSW_etherStatsPkts			0x8B4</div><div class='add'>+#define A5PSW_etherStatsUndersizePkts		0x8B8</div><div class='add'>+#define A5PSW_etherStatsOversizePkts		0x8BC</div><div class='add'>+#define A5PSW_etherStatsPkts64Octets		0x8C0</div><div class='add'>+#define A5PSW_etherStatsPkts65to127Octets	0x8C4</div><div class='add'>+#define A5PSW_etherStatsPkts128to255Octets	0x8C8</div><div class='add'>+#define A5PSW_etherStatsPkts256to511Octets	0x8CC</div><div class='add'>+#define A5PSW_etherStatsPkts512to1023Octets	0x8D0</div><div class='add'>+#define A5PSW_etherStatsPkts1024to1518Octets	0x8D4</div><div class='add'>+#define A5PSW_etherStatsPkts1519toXOctets	0x8D8</div><div class='add'>+#define A5PSW_etherStatsJabbers			0x8DC</div><div class='add'>+#define A5PSW_etherStatsFragments		0x8E0</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLANReceived			0x8E8</div><div class='add'>+#define A5PSW_VLANTransmitted			0x8EC</div><div class='add'>+</div><div class='add'>+#define A5PSW_aDeferred				0x910</div><div class='add'>+#define A5PSW_aMultipleCollisions		0x914</div><div class='add'>+#define A5PSW_aSingleCollisions			0x918</div><div class='add'>+#define A5PSW_aLateCollisions			0x91C</div><div class='add'>+#define A5PSW_aExcessiveCollisions		0x920</div><div class='add'>+#define A5PSW_aCarrierSenseErrors		0x924</div><div class='add'>+</div><div class='add'>+#define A5PSW_VLAN_TAG(prio, id)	(((prio) &lt;&lt; 12) | (id))</div><div class='add'>+#define A5PSW_PORTS_NUM			5</div><div class='add'>+#define A5PSW_CPU_PORT			(A5PSW_PORTS_NUM - 1)</div><div class='add'>+#define A5PSW_MDIO_DEF_FREQ		2500000</div><div class='add'>+#define A5PSW_MDIO_TIMEOUT		100</div><div class='add'>+#define A5PSW_JUMBO_LEN			(10 * SZ_1K)</div><div class='add'>+#define A5PSW_MDIO_CLK_DIV_MIN		5</div><div class='add'>+#define A5PSW_TAG_LEN			8</div><div class='add'>+#define A5PSW_VLAN_COUNT		32</div><div class='add'>+</div><div class='add'>+/* Ensure enough space for 2 VLAN tags */</div><div class='add'>+#define A5PSW_EXTRA_MTU_LEN		(A5PSW_TAG_LEN + 8)</div><div class='add'>+#define A5PSW_MAX_MTU			(A5PSW_JUMBO_LEN - A5PSW_EXTRA_MTU_LEN)</div><div class='add'>+</div><div class='add'>+#define A5PSW_PATTERN_MGMTFWD		0</div><div class='add'>+</div><div class='add'>+#define A5PSW_LK_BUSY_USEC_POLL		10</div><div class='add'>+#define A5PSW_CTRL_TIMEOUT		1000</div><div class='add'>+#define A5PSW_TABLE_ENTRIES		8192</div><div class='add'>+</div><div class='add'>+struct fdb_entry {</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	u16 valid:1;</div><div class='add'>+	u16 is_static:1;</div><div class='add'>+	u16 prio:3;</div><div class='add'>+	u16 port_mask:5;</div><div class='add'>+	u16 reserved:6;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+union lk_data {</div><div class='add'>+	struct {</div><div class='add'>+		u32 lo;</div><div class='add'>+		u32 hi;</div><div class='add'>+	};</div><div class='add'>+	struct fdb_entry entry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct a5psw - switch struct</div><div class='add'>+ * @base: Base address of the switch</div><div class='add'>+ * @hclk: hclk_switch clock</div><div class='add'>+ * @clk: clk_switch clock</div><div class='add'>+ * @dev: Device associated to the switch</div><div class='add'>+ * @mii_bus: MDIO bus struct</div><div class='add'>+ * @mdio_freq: MDIO bus frequency requested</div><div class='add'>+ * @pcs: Array of PCS connected to the switch ports (not for the CPU)</div><div class='add'>+ * @ds: DSA switch struct</div><div class='add'>+ * @stats_lock: lock to access statistics (shared HI counter)</div><div class='add'>+ * @lk_lock: Lock for the lookup table</div><div class='add'>+ * @reg_lock: Lock for register read-modify-write operation</div><div class='add'>+ * @bridged_ports: Mask of ports that are bridged and should be flooded</div><div class='add'>+ * @br_dev: Bridge net device</div><div class='add'>+ */</div><div class='add'>+struct a5psw {</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	struct clk *hclk;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct mii_bus	*mii_bus;</div><div class='add'>+	struct phylink_pcs *pcs[A5PSW_PORTS_NUM - 1];</div><div class='add'>+	struct dsa_switch ds;</div><div class='add'>+	struct mutex lk_lock;</div><div class='add'>+	spinlock_t reg_lock;</div><div class='add'>+	u32 bridged_ports;</div><div class='add'>+	struct net_device *br_dev;</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/Kconfig b/drivers/net/dsa/sja1105/Kconfig<br/>index 1144fc5f61a8..1291bba3f3b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/Kconfig</a></div><div class='hunk'>@@ -2,17 +2,50 @@</div><div class='ctx'> config NET_DSA_SJA1105</div><div class='ctx'> tristate "NXP SJA1105 Ethernet switch family support"</div><div class='ctx'> 	depends on NET_DSA &amp;&amp; SPI</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='ctx'> 	select NET_DSA_TAG_SJA1105</div><div class='add'>+	select PCS_XPCS</div><div class='ctx'> 	select PACKING</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	help</div><div class='del'>-	  This is the driver for the NXP SJA1105 automotive Ethernet switch</div><div class='del'>-	  family. These are 5-port devices and are managed over an SPI</div><div class='add'>+	  This is the driver for the NXP SJA1105 (5-port) and SJA1110 (10-port)</div><div class='add'>+	  automotive Ethernet switch family. These are managed over an SPI</div><div class='ctx'> 	  interface. Probing is handled based on OF bindings and so is the</div><div class='del'>-	  linkage to phylib. The driver supports the following revisions:</div><div class='add'>+	  linkage to PHYLINK. The driver supports the following revisions:</div><div class='ctx'> 	    - SJA1105E (Gen. 1, No TT-Ethernet)</div><div class='ctx'> 	    - SJA1105T (Gen. 1, TT-Ethernet)</div><div class='ctx'> 	    - SJA1105P (Gen. 2, No SGMII, No TT-Ethernet)</div><div class='ctx'> 	    - SJA1105Q (Gen. 2, No SGMII, TT-Ethernet)</div><div class='ctx'> 	    - SJA1105R (Gen. 2, SGMII, No TT-Ethernet)</div><div class='ctx'> 	    - SJA1105S (Gen. 2, SGMII, TT-Ethernet)</div><div class='add'>+	    - SJA1110A (Gen. 3, SGMII, TT-Ethernet, 100base-TX PHY, 10 ports)</div><div class='add'>+	    - SJA1110B (Gen. 3, SGMII, TT-Ethernet, 100base-TX PHY, 9 ports)</div><div class='add'>+	    - SJA1110C (Gen. 3, SGMII, TT-Ethernet, 100base-TX PHY, 7 ports)</div><div class='add'>+	    - SJA1110D (Gen. 3, SGMII, TT-Ethernet, no 100base-TX PHY, 7 ports)</div><div class='add'>+</div><div class='add'>+config NET_DSA_SJA1105_PTP</div><div class='add'>+	bool "Support for the PTP clock on the NXP SJA1105 Ethernet switch"</div><div class='add'>+	depends on NET_DSA_SJA1105</div><div class='add'>+	depends on PTP_1588_CLOCK</div><div class='add'>+	help</div><div class='add'>+	  This enables support for timestamping and PTP clock manipulations in</div><div class='add'>+	  the SJA1105 DSA driver.</div><div class='add'>+</div><div class='add'>+config NET_DSA_SJA1105_TAS</div><div class='add'>+	bool "Support for the Time-Aware Scheduler on NXP SJA1105"</div><div class='add'>+	depends on NET_DSA_SJA1105 &amp;&amp; NET_SCH_TAPRIO</div><div class='add'>+	depends on NET_SCH_TAPRIO=y || NET_DSA_SJA1105=m</div><div class='add'>+	depends on NET_DSA_SJA1105_PTP</div><div class='add'>+	help</div><div class='add'>+	  This enables support for the TTEthernet-based egress scheduling</div><div class='add'>+	  engine in the SJA1105 DSA driver, which is controlled using a</div><div class='add'>+	  hardware offload of the tc-tqprio qdisc.</div><div class='add'>+</div><div class='add'>+config NET_DSA_SJA1105_VL</div><div class='add'>+	bool "Support for Virtual Links on NXP SJA1105"</div><div class='add'>+	depends on NET_DSA_SJA1105_TAS</div><div class='add'>+	help</div><div class='add'>+	  This enables support for flow classification using capable devices</div><div class='add'>+	  (SJA1105T, SJA1105Q, SJA1105S). The following actions are supported:</div><div class='add'>+	  - redirect, trap, drop</div><div class='add'>+	  - time-based ingress policing, via the tc-gate action</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/Makefile b/drivers/net/dsa/sja1105/Makefile<br/>index 941848de8b46..40d69e6c0bae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/Makefile</a></div><div class='hunk'>@@ -4,7 +4,22 @@ obj-$(CONFIG_NET_DSA_SJA1105) += sja1105.o</div><div class='ctx'> sja1105-objs := \</div><div class='ctx'>     sja1105_spi.o \</div><div class='ctx'>     sja1105_main.o \</div><div class='add'>+    sja1105_mdio.o \</div><div class='add'>+    sja1105_flower.o \</div><div class='ctx'>     sja1105_ethtool.o \</div><div class='add'>+    sja1105_devlink.o \</div><div class='ctx'>     sja1105_clocking.o \</div><div class='ctx'>     sja1105_static_config.o \</div><div class='ctx'>     sja1105_dynamic_config.o \</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_NET_DSA_SJA1105_PTP</div><div class='add'>+sja1105-objs += sja1105_ptp.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_NET_DSA_SJA1105_TAS</div><div class='add'>+sja1105-objs += sja1105_tas.o</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+ifdef CONFIG_NET_DSA_SJA1105_VL</div><div class='add'>+sja1105-objs += sja1105_vl.o</div><div class='add'>+endif</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h<br/>index b043bfc408f2..dceb96ae9c83 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105.h</a></div><div class='hunk'>@@ -1,22 +1,61 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- * Copyright (c) 2018, Sensor-Technik Wiedemann GmbH</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2018, Sensor-Technik Wiedemann GmbH</div><div class='ctx'>  * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _SJA1105_H</div><div class='ctx'> #define _SJA1105_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='ctx'> #include &lt;linux/dsa/sja1105.h&gt;</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include "sja1105_static_config.h"</div><div class='ctx'> </div><div class='del'>-#define SJA1105_NUM_PORTS		5</div><div class='del'>-#define SJA1105_NUM_TC			8</div><div class='ctx'> #define SJA1105ET_FDB_BIN_SIZE		4</div><div class='ctx'> /* The hardware value is in multiples of 10 ms.</div><div class='ctx'>  * The passed parameter is in multiples of 1 ms.</div><div class='ctx'>  */</div><div class='ctx'> #define SJA1105_AGEING_TIME_MS(ms)	((ms) / 10)</div><div class='add'>+#define SJA1105_NUM_L2_POLICERS		SJA1110_MAX_L2_POLICING_COUNT</div><div class='add'>+</div><div class='add'>+/* Calculated assuming 1Gbps, where the clock has 125 MHz (8 ns period)</div><div class='add'>+ * To avoid floating point operations, we'll multiply the degrees by 10</div><div class='add'>+ * to get a "phase" and get 1 decimal point precision.</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_RGMII_DELAY_PS_TO_PHASE(ps) \</div><div class='add'>+	(((ps) * 360) / 800)</div><div class='add'>+#define SJA1105_RGMII_DELAY_PHASE_TO_PS(phase) \</div><div class='add'>+	((800 * (phase)) / 360)</div><div class='add'>+#define SJA1105_RGMII_DELAY_PHASE_TO_HW(phase) \</div><div class='add'>+	(((phase) - 738) / 9)</div><div class='add'>+#define SJA1105_RGMII_DELAY_PS_TO_HW(ps) \</div><div class='add'>+	SJA1105_RGMII_DELAY_PHASE_TO_HW(SJA1105_RGMII_DELAY_PS_TO_PHASE(ps))</div><div class='add'>+</div><div class='add'>+/* Valid range in degrees is a value between 73.8 and 101.7</div><div class='add'>+ * in 0.9 degree increments</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_RGMII_DELAY_MIN_PS \</div><div class='add'>+	SJA1105_RGMII_DELAY_PHASE_TO_PS(738)</div><div class='add'>+#define SJA1105_RGMII_DELAY_MAX_PS \</div><div class='add'>+	SJA1105_RGMII_DELAY_PHASE_TO_PS(1017)</div><div class='add'>+</div><div class='add'>+typedef enum {</div><div class='add'>+	SPI_READ = 0,</div><div class='add'>+	SPI_WRITE = 1,</div><div class='add'>+} sja1105_spi_rw_mode_t;</div><div class='add'>+</div><div class='add'>+#include "sja1105_tas.h"</div><div class='add'>+#include "sja1105_ptp.h"</div><div class='add'>+</div><div class='add'>+enum sja1105_stats_area {</div><div class='add'>+	MAC,</div><div class='add'>+	HL1,</div><div class='add'>+	HL2,</div><div class='add'>+	ETHER,</div><div class='add'>+	__MAX_SJA1105_STATS_AREA,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> /* Keeps the different addresses between E/T and P/Q/R/S */</div><div class='ctx'> struct sja1105_regs {</div><div class='hunk'>@@ -25,22 +64,52 @@ struct sja1105_regs {</div><div class='ctx'> 	u64 status;</div><div class='ctx'> 	u64 port_control;</div><div class='ctx'> 	u64 rgu;</div><div class='add'>+	u64 vl_status;</div><div class='ctx'> 	u64 config;</div><div class='ctx'> 	u64 rmii_pll1;</div><div class='del'>-	u64 pad_mii_tx[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 cgu_idiv[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 rgmii_pad_mii_tx[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mii_tx_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mii_rx_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mii_ext_tx_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mii_ext_rx_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 rgmii_tx_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 rmii_ref_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 rmii_ext_tx_clk[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mac[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mac_hl1[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 mac_hl2[SJA1105_NUM_PORTS];</div><div class='del'>-	u64 qlevel[SJA1105_NUM_PORTS];</div><div class='add'>+	u64 ptppinst;</div><div class='add'>+	u64 ptppindur;</div><div class='add'>+	u64 ptp_control;</div><div class='add'>+	u64 ptpclkval;</div><div class='add'>+	u64 ptpclkrate;</div><div class='add'>+	u64 ptpclkcorp;</div><div class='add'>+	u64 ptpsyncts;</div><div class='add'>+	u64 ptpschtm;</div><div class='add'>+	u64 ptpegr_ts[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 pad_mii_tx[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 pad_mii_rx[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 pad_mii_id[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 cgu_idiv[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 mii_tx_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 mii_rx_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 mii_ext_tx_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 mii_ext_rx_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 rgmii_tx_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 rmii_ref_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 rmii_ext_tx_clk[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 stats[__MAX_SJA1105_STATS_AREA][SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 mdio_100base_tx;</div><div class='add'>+	u64 mdio_100base_t1;</div><div class='add'>+	u64 pcs_base[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_mdio_private {</div><div class='add'>+	struct sja1105_private *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SJA1105_SPEED_AUTO,</div><div class='add'>+	SJA1105_SPEED_10MBPS,</div><div class='add'>+	SJA1105_SPEED_100MBPS,</div><div class='add'>+	SJA1105_SPEED_1000MBPS,</div><div class='add'>+	SJA1105_SPEED_2500MBPS,</div><div class='add'>+	SJA1105_SPEED_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_internal_phy_t {</div><div class='add'>+	SJA1105_NO_PHY		= 0,</div><div class='add'>+	SJA1105_PHY_BASE_TX,</div><div class='add'>+	SJA1105_PHY_BASE_T1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_info {</div><div class='hunk'>@@ -50,27 +119,168 @@ struct sja1105_info {</div><div class='ctx'> 	 * switch core and device_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	u64 part_no;</div><div class='add'>+	/* E/T and P/Q/R/S have partial timestamps of different sizes.</div><div class='add'>+	 * They must be reconstructed on both families anyway to get the full</div><div class='add'>+	 * 64-bit values back.</div><div class='add'>+	 */</div><div class='add'>+	int ptp_ts_bits;</div><div class='add'>+	/* Also SPI commands are of different sizes to retrieve</div><div class='add'>+	 * the egress timestamps.</div><div class='add'>+	 */</div><div class='add'>+	int ptpegr_ts_bytes;</div><div class='add'>+	int num_cbs_shapers;</div><div class='add'>+	int max_frame_mem;</div><div class='add'>+	int num_ports;</div><div class='add'>+	bool multiple_cascade_ports;</div><div class='add'>+	/* Every {port, TXQ} has its own CBS shaper */</div><div class='add'>+	bool fixed_cbs_mapping;</div><div class='add'>+	enum dsa_tag_protocol tag_proto;</div><div class='ctx'> 	const struct sja1105_dynamic_table_ops *dyn_ops;</div><div class='ctx'> 	const struct sja1105_table_ops *static_ops;</div><div class='ctx'> 	const struct sja1105_regs *regs;</div><div class='del'>-	int (*reset_cmd)(const void *ctx, const void *data);</div><div class='add'>+	bool can_limit_mcast_flood;</div><div class='add'>+	int (*reset_cmd)(struct dsa_switch *ds);</div><div class='ctx'> 	int (*setup_rgmii_delay)(const void *ctx, int port);</div><div class='add'>+	/* Prototypes from include/net/dsa.h */</div><div class='add'>+	int (*fdb_add_cmd)(struct dsa_switch *ds, int port,</div><div class='add'>+			   const unsigned char *addr, u16 vid);</div><div class='add'>+	int (*fdb_del_cmd)(struct dsa_switch *ds, int port,</div><div class='add'>+			   const unsigned char *addr, u16 vid);</div><div class='add'>+	void (*ptp_cmd_packing)(u8 *buf, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+				enum packing_op op);</div><div class='add'>+	bool (*rxtstamp)(struct dsa_switch *ds, int port, struct sk_buff *skb);</div><div class='add'>+	void (*txtstamp)(struct dsa_switch *ds, int port, struct sk_buff *skb);</div><div class='add'>+	int (*clocking_setup)(struct sja1105_private *priv);</div><div class='add'>+	int (*pcs_mdio_read_c45)(struct mii_bus *bus, int phy, int mmd,</div><div class='add'>+				 int reg);</div><div class='add'>+	int (*pcs_mdio_write_c45)(struct mii_bus *bus, int phy, int mmd,</div><div class='add'>+				  int reg, u16 val);</div><div class='add'>+	int (*disable_microcontroller)(struct sja1105_private *priv);</div><div class='ctx'> 	const char *name;</div><div class='add'>+	bool supports_mii[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	bool supports_rmii[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	bool supports_rgmii[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	bool supports_sgmii[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	bool supports_2500basex[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	enum sja1105_internal_phy_t internal_phy[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	const u64 port_speed[SJA1105_SPEED_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_key_type {</div><div class='add'>+	SJA1105_KEY_BCAST,</div><div class='add'>+	SJA1105_KEY_TC,</div><div class='add'>+	SJA1105_KEY_VLAN_UNAWARE_VL,</div><div class='add'>+	SJA1105_KEY_VLAN_AWARE_VL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_key {</div><div class='add'>+	enum sja1105_key_type type;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		/* SJA1105_KEY_TC */</div><div class='add'>+		struct {</div><div class='add'>+			int pcp;</div><div class='add'>+		} tc;</div><div class='add'>+</div><div class='add'>+		/* SJA1105_KEY_VLAN_UNAWARE_VL */</div><div class='add'>+		/* SJA1105_KEY_VLAN_AWARE_VL */</div><div class='add'>+		struct {</div><div class='add'>+			u64 dmac;</div><div class='add'>+			u16 vid;</div><div class='add'>+			u16 pcp;</div><div class='add'>+		} vl;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_rule_type {</div><div class='add'>+	SJA1105_RULE_BCAST_POLICER,</div><div class='add'>+	SJA1105_RULE_TC_POLICER,</div><div class='add'>+	SJA1105_RULE_VL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_vl_type {</div><div class='add'>+	SJA1105_VL_NONCRITICAL,</div><div class='add'>+	SJA1105_VL_RATE_CONSTRAINED,</div><div class='add'>+	SJA1105_VL_TIME_TRIGGERED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_rule {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+	unsigned long port_mask;</div><div class='add'>+	struct sja1105_key key;</div><div class='add'>+	enum sja1105_rule_type type;</div><div class='add'>+</div><div class='add'>+	/* Action */</div><div class='add'>+	union {</div><div class='add'>+		/* SJA1105_RULE_BCAST_POLICER */</div><div class='add'>+		struct {</div><div class='add'>+			int sharindx;</div><div class='add'>+		} bcast_pol;</div><div class='add'>+</div><div class='add'>+		/* SJA1105_RULE_TC_POLICER */</div><div class='add'>+		struct {</div><div class='add'>+			int sharindx;</div><div class='add'>+		} tc_pol;</div><div class='add'>+</div><div class='add'>+		/* SJA1105_RULE_VL */</div><div class='add'>+		struct {</div><div class='add'>+			enum sja1105_vl_type type;</div><div class='add'>+			unsigned long destports;</div><div class='add'>+			int sharindx;</div><div class='add'>+			int maxlen;</div><div class='add'>+			int ipv;</div><div class='add'>+			u64 base_time;</div><div class='add'>+			u64 cycle_time;</div><div class='add'>+			int num_entries;</div><div class='add'>+			struct action_gate_entry *entries;</div><div class='add'>+			struct flow_stats stats;</div><div class='add'>+		} vl;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_flow_block {</div><div class='add'>+	struct list_head rules;</div><div class='add'>+	bool l2_policer_used[SJA1105_NUM_L2_POLICERS];</div><div class='add'>+	int num_virtual_links;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_private {</div><div class='ctx'> 	struct sja1105_static_config static_config;</div><div class='del'>-	bool rgmii_rx_delay[SJA1105_NUM_PORTS];</div><div class='del'>-	bool rgmii_tx_delay[SJA1105_NUM_PORTS];</div><div class='add'>+	int rgmii_rx_delay_ps[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	int rgmii_tx_delay_ps[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	phy_interface_t phy_mode[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	bool fixed_link[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	unsigned long ucast_egress_floods;</div><div class='add'>+	unsigned long bcast_egress_floods;</div><div class='add'>+	unsigned long hwts_tx_en;</div><div class='add'>+	unsigned long hwts_rx_en;</div><div class='ctx'> 	const struct sja1105_info *info;</div><div class='del'>-	struct gpio_desc *reset_gpio;</div><div class='add'>+	size_t max_xfer_len;</div><div class='ctx'> 	struct spi_device *spidev;</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='del'>-	struct sja1105_port ports[SJA1105_NUM_PORTS];</div><div class='add'>+	u16 bridge_pvid[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u16 tag_8021q_pvid[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	struct sja1105_flow_block flow_block;</div><div class='ctx'> 	/* Serializes transmission of management frames so that</div><div class='ctx'> 	 * the switch doesn't confuse them with one another.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mutex mgmt_lock;</div><div class='add'>+	/* Serializes accesses to the FDB */</div><div class='add'>+	struct mutex fdb_lock;</div><div class='add'>+	/* PTP two-step TX timestamp ID, and its serialization lock */</div><div class='add'>+	spinlock_t ts_id_lock;</div><div class='add'>+	u8 ts_id;</div><div class='add'>+	/* Serializes access to the dynamic config interface */</div><div class='add'>+	struct mutex dynamic_config_lock;</div><div class='add'>+	struct devlink_region **regions;</div><div class='add'>+	struct sja1105_cbs_entry *cbs;</div><div class='add'>+	struct mii_bus *mdio_base_t1;</div><div class='add'>+	struct mii_bus *mdio_base_tx;</div><div class='add'>+	struct mii_bus *mdio_pcs;</div><div class='add'>+	struct phylink_pcs *pcs[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	struct sja1105_ptp_data ptp_data;</div><div class='add'>+	struct sja1105_tas_data tas_data;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #include "sja1105_dynamic_config.h"</div><div class='hunk'>@@ -81,29 +291,64 @@ struct sja1105_spi_message {</div><div class='ctx'> 	u64 address;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef enum {</div><div class='del'>-	SPI_READ = 0,</div><div class='del'>-	SPI_WRITE = 1,</div><div class='del'>-} sja1105_spi_rw_mode_t;</div><div class='add'>+/* From sja1105_main.c */</div><div class='add'>+enum sja1105_reset_reason {</div><div class='add'>+	SJA1105_VLAN_FILTERING = 0,</div><div class='add'>+	SJA1105_AGEING_TIME,</div><div class='add'>+	SJA1105_SCHEDULING,</div><div class='add'>+	SJA1105_BEST_EFFORT_POLICING,</div><div class='add'>+	SJA1105_VIRTUAL_LINKS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sja1105_static_config_reload(struct sja1105_private *priv,</div><div class='add'>+				 enum sja1105_reset_reason reason);</div><div class='add'>+int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+void sja1105_frame_memory_partitioning(struct sja1105_private *priv);</div><div class='add'>+</div><div class='add'>+/* From sja1105_mdio.c */</div><div class='add'>+int sja1105_mdiobus_register(struct dsa_switch *ds);</div><div class='add'>+void sja1105_mdiobus_unregister(struct dsa_switch *ds);</div><div class='add'>+int sja1105_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int reg);</div><div class='add'>+int sja1105_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd, int reg,</div><div class='add'>+			       u16 val);</div><div class='add'>+int sja1110_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int reg);</div><div class='add'>+int sja1110_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd, int reg,</div><div class='add'>+			       u16 val);</div><div class='add'>+</div><div class='add'>+/* From sja1105_devlink.c */</div><div class='add'>+int sja1105_devlink_setup(struct dsa_switch *ds);</div><div class='add'>+void sja1105_devlink_teardown(struct dsa_switch *ds);</div><div class='add'>+int sja1105_devlink_info_get(struct dsa_switch *ds,</div><div class='add'>+			     struct devlink_info_req *req,</div><div class='add'>+			     struct netlink_ext_ack *extack);</div><div class='ctx'> </div><div class='ctx'> /* From sja1105_spi.c */</div><div class='del'>-int sja1105_spi_send_packed_buf(const struct sja1105_private *priv,</div><div class='del'>-				sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='del'>-				void *packed_buf, size_t size_bytes);</div><div class='del'>-int sja1105_spi_send_int(const struct sja1105_private *priv,</div><div class='del'>-			 sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='del'>-			 u64 *value, u64 size_bytes);</div><div class='del'>-int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,</div><div class='del'>-				     sja1105_spi_rw_mode_t rw, u64 base_addr,</div><div class='del'>-				     void *packed_buf, u64 buf_len);</div><div class='add'>+int sja1105_xfer_buf(const struct sja1105_private *priv,</div><div class='add'>+		     sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='add'>+		     u8 *buf, size_t len);</div><div class='add'>+int sja1105_xfer_u32(const struct sja1105_private *priv,</div><div class='add'>+		     sja1105_spi_rw_mode_t rw, u64 reg_addr, u32 *value,</div><div class='add'>+		     struct ptp_system_timestamp *ptp_sts);</div><div class='add'>+int sja1105_xfer_u64(const struct sja1105_private *priv,</div><div class='add'>+		     sja1105_spi_rw_mode_t rw, u64 reg_addr, u64 *value,</div><div class='add'>+		     struct ptp_system_timestamp *ptp_sts);</div><div class='add'>+int static_config_buf_prepare_for_upload(struct sja1105_private *priv,</div><div class='add'>+					 void *config_buf, int buf_len);</div><div class='ctx'> int sja1105_static_config_upload(struct sja1105_private *priv);</div><div class='add'>+int sja1105_inhibit_tx(const struct sja1105_private *priv,</div><div class='add'>+		       unsigned long port_bitmap, bool tx_inhibited);</div><div class='ctx'> </div><div class='del'>-extern struct sja1105_info sja1105e_info;</div><div class='del'>-extern struct sja1105_info sja1105t_info;</div><div class='del'>-extern struct sja1105_info sja1105p_info;</div><div class='del'>-extern struct sja1105_info sja1105q_info;</div><div class='del'>-extern struct sja1105_info sja1105r_info;</div><div class='del'>-extern struct sja1105_info sja1105s_info;</div><div class='add'>+extern const struct sja1105_info sja1105e_info;</div><div class='add'>+extern const struct sja1105_info sja1105t_info;</div><div class='add'>+extern const struct sja1105_info sja1105p_info;</div><div class='add'>+extern const struct sja1105_info sja1105q_info;</div><div class='add'>+extern const struct sja1105_info sja1105r_info;</div><div class='add'>+extern const struct sja1105_info sja1105s_info;</div><div class='add'>+extern const struct sja1105_info sja1110a_info;</div><div class='add'>+extern const struct sja1105_info sja1110b_info;</div><div class='add'>+extern const struct sja1105_info sja1110c_info;</div><div class='add'>+extern const struct sja1105_info sja1110d_info;</div><div class='ctx'> </div><div class='ctx'> /* From sja1105_clocking.c */</div><div class='ctx'> </div><div class='hunk'>@@ -116,17 +361,14 @@ typedef enum {</div><div class='ctx'> 	XMII_MODE_MII		= 0,</div><div class='ctx'> 	XMII_MODE_RMII		= 1,</div><div class='ctx'> 	XMII_MODE_RGMII		= 2,</div><div class='add'>+	XMII_MODE_SGMII		= 3,</div><div class='ctx'> } sja1105_phy_interface_t;</div><div class='ctx'> </div><div class='del'>-typedef enum {</div><div class='del'>-	SJA1105_SPEED_10MBPS	= 3,</div><div class='del'>-	SJA1105_SPEED_100MBPS	= 2,</div><div class='del'>-	SJA1105_SPEED_1000MBPS	= 1,</div><div class='del'>-	SJA1105_SPEED_AUTO	= 0,</div><div class='del'>-} sja1105_speed_t;</div><div class='del'>-</div><div class='add'>+int sja1105pqrs_setup_rgmii_delay(const void *ctx, int port);</div><div class='add'>+int sja1110_setup_rgmii_delay(const void *ctx, int port);</div><div class='ctx'> int sja1105_clocking_setup_port(struct sja1105_private *priv, int port);</div><div class='ctx'> int sja1105_clocking_setup(struct sja1105_private *priv);</div><div class='add'>+int sja1110_disable_microcontroller(struct sja1105_private *priv);</div><div class='ctx'> </div><div class='ctx'> /* From sja1105_ethtool.c */</div><div class='ctx'> void sja1105_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data);</div><div class='hunk'>@@ -142,18 +384,43 @@ int sja1105_dynamic_config_write(struct sja1105_private *priv,</div><div class='ctx'> 				 enum sja1105_blk_idx blk_idx,</div><div class='ctx'> 				 int index, void *entry, bool keep);</div><div class='ctx'> </div><div class='del'>-u8 sja1105_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid);</div><div class='del'>-</div><div class='del'>-/* Common implementations for the static and dynamic configs */</div><div class='del'>-size_t sja1105_l2_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					   enum packing_op op);</div><div class='del'>-size_t sja1105pqrs_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					   enum packing_op op);</div><div class='del'>-size_t sja1105et_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					 enum packing_op op);</div><div class='del'>-size_t sja1105_vlan_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					 enum packing_op op);</div><div class='del'>-size_t sja1105pqrs_mac_config_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					    enum packing_op op);</div><div class='add'>+enum sja1105_iotag {</div><div class='add'>+	SJA1105_C_TAG = 0, /* Inner VLAN header */</div><div class='add'>+	SJA1105_S_TAG = 1, /* Outer VLAN header */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1110_vlan_type {</div><div class='add'>+	SJA1110_VLAN_INVALID = 0,</div><div class='add'>+	SJA1110_VLAN_C_TAG = 1, /* Single inner VLAN tag */</div><div class='add'>+	SJA1110_VLAN_S_TAG = 2, /* Single outer VLAN tag */</div><div class='add'>+	SJA1110_VLAN_D_TAG = 3, /* Double tagged, use outer tag for lookup */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1110_shaper_type {</div><div class='add'>+	SJA1110_LEAKY_BUCKET_SHAPER = 0,</div><div class='add'>+	SJA1110_CBS_SHAPER = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u8 sja1105et_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid);</div><div class='add'>+int sja1105et_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		      const unsigned char *addr, u16 vid);</div><div class='add'>+int sja1105et_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		      const unsigned char *addr, u16 vid);</div><div class='add'>+int sja1105pqrs_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			const unsigned char *addr, u16 vid);</div><div class='add'>+int sja1105pqrs_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			const unsigned char *addr, u16 vid);</div><div class='add'>+</div><div class='add'>+/* From sja1105_flower.c */</div><div class='add'>+int sja1105_cls_flower_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress);</div><div class='add'>+int sja1105_cls_flower_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress);</div><div class='add'>+int sja1105_cls_flower_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct flow_cls_offload *cls, bool ingress);</div><div class='add'>+void sja1105_flower_setup(struct dsa_switch *ds);</div><div class='add'>+void sja1105_flower_teardown(struct dsa_switch *ds);</div><div class='add'>+struct sja1105_rule *sja1105_rule_find(struct sja1105_private *priv,</div><div class='add'>+				       unsigned long cookie);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_clocking.c b/drivers/net/dsa/sja1105/sja1105_clocking.c<br/>index 94bfe0ee50a8..08a3e7b96254 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_clocking.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_clocking.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_clocking.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_clocking.c</a></div><div class='hunk'>@@ -1,24 +1,41 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause</div><div class='del'>-/* Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+/* Copyright 2016-2018 NXP</div><div class='ctx'>  * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/packing.h&gt;</div><div class='ctx'> #include "sja1105.h"</div><div class='ctx'> </div><div class='ctx'> #define SJA1105_SIZE_CGU_CMD	4</div><div class='add'>+#define SJA1110_BASE_MCSS_CLK	SJA1110_CGU_ADDR(0x70)</div><div class='add'>+#define SJA1110_BASE_TIMER_CLK	SJA1110_CGU_ADDR(0x74)</div><div class='ctx'> </div><div class='del'>-struct sja1105_cfg_pad_mii_tx {</div><div class='add'>+/* Common structure for CFG_PAD_MIIx_RX and CFG_PAD_MIIx_TX */</div><div class='add'>+struct sja1105_cfg_pad_mii {</div><div class='ctx'> 	u64 d32_os;</div><div class='add'>+	u64 d32_ih;</div><div class='ctx'> 	u64 d32_ipud;</div><div class='add'>+	u64 d10_ih;</div><div class='ctx'> 	u64 d10_os;</div><div class='ctx'> 	u64 d10_ipud;</div><div class='ctx'> 	u64 ctrl_os;</div><div class='add'>+	u64 ctrl_ih;</div><div class='ctx'> 	u64 ctrl_ipud;</div><div class='ctx'> 	u64 clk_os;</div><div class='ctx'> 	u64 clk_ih;</div><div class='ctx'> 	u64 clk_ipud;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sja1105_cfg_pad_mii_id {</div><div class='add'>+	u64 rxc_stable_ovr;</div><div class='add'>+	u64 rxc_delay;</div><div class='add'>+	u64 rxc_bypass;</div><div class='add'>+	u64 rxc_pd;</div><div class='add'>+	u64 txc_stable_ovr;</div><div class='add'>+	u64 txc_delay;</div><div class='add'>+	u64 txc_bypass;</div><div class='add'>+	u64 txc_pd;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* UM10944 Table 82.</div><div class='ctx'>  * IDIV_0_C to IDIV_4_C control registers</div><div class='ctx'>  * (addr. 10000Bh to 10000Fh)</div><div class='hunk'>@@ -46,6 +63,12 @@ struct sja1105_cgu_pll_ctrl {</div><div class='ctx'> 	u64 pd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sja1110_cgu_outclk {</div><div class='add'>+	u64 clksrc;</div><div class='add'>+	u64 autoblock;</div><div class='add'>+	u64 pd;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	CLKSRC_MII0_TX_CLK	= 0x00,</div><div class='ctx'> 	CLKSRC_MII0_RX_CLK	= 0x01,</div><div class='hunk'>@@ -95,6 +118,9 @@ static int sja1105_cgu_idiv_config(struct sja1105_private *priv, int port,</div><div class='ctx'> 	struct sja1105_cgu_idiv idiv;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;cgu_idiv[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (enabled &amp;&amp; factor != 1 &amp;&amp; factor != 10) {</div><div class='ctx'> 		dev_err(dev, "idiv factor must be 1 or 10\n");</div><div class='ctx'> 		return -ERANGE;</div><div class='hunk'>@@ -107,9 +133,8 @@ static int sja1105_cgu_idiv_config(struct sja1105_private *priv, int port,</div><div class='ctx'> 	idiv.pd        = enabled ? 0 : 1; /* Power down? */</div><div class='ctx'> 	sja1105_cgu_idiv_packing(packed_buf, &amp;idiv, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;cgu_idiv[port], packed_buf,</div><div class='del'>-					   SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;cgu_idiv[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -128,14 +153,14 @@ static int sja1105_cgu_mii_tx_clk_config(struct sja1105_private *priv,</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl mii_tx_clk;</div><div class='del'>-	const int mac_clk_sources[] = {</div><div class='add'>+	static const int mac_clk_sources[] = {</div><div class='ctx'> 		CLKSRC_MII0_TX_CLK,</div><div class='ctx'> 		CLKSRC_MII1_TX_CLK,</div><div class='ctx'> 		CLKSRC_MII2_TX_CLK,</div><div class='ctx'> 		CLKSRC_MII3_TX_CLK,</div><div class='ctx'> 		CLKSRC_MII4_TX_CLK,</div><div class='ctx'> 	};</div><div class='del'>-	const int phy_clk_sources[] = {</div><div class='add'>+	static const int phy_clk_sources[] = {</div><div class='ctx'> 		CLKSRC_IDIV0,</div><div class='ctx'> 		CLKSRC_IDIV1,</div><div class='ctx'> 		CLKSRC_IDIV2,</div><div class='hunk'>@@ -145,6 +170,9 @@ static int sja1105_cgu_mii_tx_clk_config(struct sja1105_private *priv,</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='ctx'> 	int clksrc;</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;mii_tx_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	if (role == XMII_MAC)</div><div class='ctx'> 		clksrc = mac_clk_sources[port];</div><div class='ctx'> 	else</div><div class='hunk'>@@ -156,9 +184,8 @@ static int sja1105_cgu_mii_tx_clk_config(struct sja1105_private *priv,</div><div class='ctx'> 	mii_tx_clk.pd        = 0;  /* Power Down off =&gt; enabled */</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_tx_clk, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;mii_tx_clk[port], packed_buf,</div><div class='del'>-					   SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;mii_tx_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -167,7 +194,7 @@ sja1105_cgu_mii_rx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl mii_rx_clk;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='del'>-	const int clk_sources[] = {</div><div class='add'>+	static const int clk_sources[] = {</div><div class='ctx'> 		CLKSRC_MII0_RX_CLK,</div><div class='ctx'> 		CLKSRC_MII1_RX_CLK,</div><div class='ctx'> 		CLKSRC_MII2_RX_CLK,</div><div class='hunk'>@@ -175,15 +202,17 @@ sja1105_cgu_mii_rx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 		CLKSRC_MII4_RX_CLK,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;mii_rx_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Payload for packed_buf */</div><div class='ctx'> 	mii_rx_clk.clksrc    = clk_sources[port];</div><div class='ctx'> 	mii_rx_clk.autoblock = 1;  /* Autoblock clk while changing clksrc */</div><div class='ctx'> 	mii_rx_clk.pd        = 0;  /* Power Down off =&gt; enabled */</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_rx_clk, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;mii_rx_clk[port], packed_buf,</div><div class='del'>-					   SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;mii_rx_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -192,7 +221,7 @@ sja1105_cgu_mii_ext_tx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl mii_ext_tx_clk;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='del'>-	const int clk_sources[] = {</div><div class='add'>+	static const int clk_sources[] = {</div><div class='ctx'> 		CLKSRC_IDIV0,</div><div class='ctx'> 		CLKSRC_IDIV1,</div><div class='ctx'> 		CLKSRC_IDIV2,</div><div class='hunk'>@@ -200,15 +229,17 @@ sja1105_cgu_mii_ext_tx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 		CLKSRC_IDIV4,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;mii_ext_tx_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Payload for packed_buf */</div><div class='ctx'> 	mii_ext_tx_clk.clksrc    = clk_sources[port];</div><div class='ctx'> 	mii_ext_tx_clk.autoblock = 1; /* Autoblock clk while changing clksrc */</div><div class='ctx'> 	mii_ext_tx_clk.pd        = 0; /* Power Down off =&gt; enabled */</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_ext_tx_clk, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;mii_ext_tx_clk[port],</div><div class='del'>-					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;mii_ext_tx_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -217,7 +248,7 @@ sja1105_cgu_mii_ext_rx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl mii_ext_rx_clk;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='del'>-	const int clk_sources[] = {</div><div class='add'>+	static const int clk_sources[] = {</div><div class='ctx'> 		CLKSRC_IDIV0,</div><div class='ctx'> 		CLKSRC_IDIV1,</div><div class='ctx'> 		CLKSRC_IDIV2,</div><div class='hunk'>@@ -225,15 +256,17 @@ sja1105_cgu_mii_ext_rx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 		CLKSRC_IDIV4,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;mii_ext_rx_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Payload for packed_buf */</div><div class='ctx'> 	mii_ext_rx_clk.clksrc    = clk_sources[port];</div><div class='ctx'> 	mii_ext_rx_clk.autoblock = 1; /* Autoblock clk while changing clksrc */</div><div class='ctx'> 	mii_ext_rx_clk.pd        = 0; /* Power Down off =&gt; enabled */</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;mii_ext_rx_clk, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;mii_ext_rx_clk[port],</div><div class='del'>-					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;mii_ext_rx_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_mii_clocking_setup(struct sja1105_private *priv, int port,</div><div class='hunk'>@@ -303,18 +336,26 @@ sja1105_cgu_pll_control_packing(void *buf, struct sja1105_cgu_pll_ctrl *cmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_cgu_rgmii_tx_clk_config(struct sja1105_private *priv,</div><div class='del'>-					   int port, sja1105_speed_t speed)</div><div class='add'>+					   int port, u64 speed)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl txc;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='ctx'> 	int clksrc;</div><div class='ctx'> </div><div class='del'>-	if (speed == SJA1105_SPEED_1000MBPS) {</div><div class='add'>+	if (regs-&gt;rgmii_tx_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (speed == priv-&gt;info-&gt;port_speed[SJA1105_SPEED_1000MBPS]) {</div><div class='ctx'> 		clksrc = CLKSRC_PLL0;</div><div class='ctx'> 	} else {</div><div class='del'>-		int clk_sources[] = {CLKSRC_IDIV0, CLKSRC_IDIV1, CLKSRC_IDIV2,</div><div class='del'>-				     CLKSRC_IDIV3, CLKSRC_IDIV4};</div><div class='add'>+		static const int clk_sources[] = {</div><div class='add'>+			CLKSRC_IDIV0,</div><div class='add'>+			CLKSRC_IDIV1,</div><div class='add'>+			CLKSRC_IDIV2,</div><div class='add'>+			CLKSRC_IDIV3,</div><div class='add'>+			CLKSRC_IDIV4,</div><div class='add'>+		};</div><div class='ctx'> 		clksrc = clk_sources[port];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -326,23 +367,25 @@ static int sja1105_cgu_rgmii_tx_clk_config(struct sja1105_private *priv,</div><div class='ctx'> 	txc.pd = 0;</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;txc, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;rgmii_tx_clk[port],</div><div class='del'>-					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;rgmii_tx_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* AGU */</div><div class='ctx'> static void</div><div class='del'>-sja1105_cfg_pad_mii_tx_packing(void *buf, struct sja1105_cfg_pad_mii_tx *cmd,</div><div class='del'>-			       enum packing_op op)</div><div class='add'>+sja1105_cfg_pad_mii_packing(void *buf, struct sja1105_cfg_pad_mii *cmd,</div><div class='add'>+			    enum packing_op op)</div><div class='ctx'> {</div><div class='ctx'> 	const int size = 4;</div><div class='ctx'> </div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;d32_os,   28, 27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;d32_ih,   26, 26, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;d32_ipud, 25, 24, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;d10_os,   20, 19, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;d10_ih,   18, 18, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;d10_ipud, 17, 16, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;ctrl_os,  12, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ctrl_ih,  10, 10, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;ctrl_ipud, 9,  8, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;clk_os,    4,  3, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;cmd-&gt;clk_ih,    2,  2, size, op);</div><div class='hunk'>@@ -353,9 +396,12 @@ static int sja1105_rgmii_cfg_pad_tx_config(struct sja1105_private *priv,</div><div class='ctx'> 					   int port)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	struct sja1105_cfg_pad_mii_tx pad_mii_tx;</div><div class='add'>+	struct sja1105_cfg_pad_mii pad_mii_tx = {0};</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;pad_mii_tx[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Payload */</div><div class='ctx'> 	pad_mii_tx.d32_os    = 3; /* TXD[3:2] output stage: */</div><div class='ctx'> 				  /*          high noise/high speed */</div><div class='hunk'>@@ -370,46 +416,203 @@ static int sja1105_rgmii_cfg_pad_tx_config(struct sja1105_private *priv,</div><div class='ctx'> 	pad_mii_tx.clk_os    = 3; /* TX_CLK output stage */</div><div class='ctx'> 	pad_mii_tx.clk_ih    = 0; /* TX_CLK input hysteresis (default) */</div><div class='ctx'> 	pad_mii_tx.clk_ipud  = 2; /* TX_CLK input stage (default) */</div><div class='del'>-	sja1105_cfg_pad_mii_tx_packing(packed_buf, &amp;pad_mii_tx, PACK);</div><div class='add'>+	sja1105_cfg_pad_mii_packing(packed_buf, &amp;pad_mii_tx, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;rgmii_pad_mii_tx[port],</div><div class='del'>-					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;pad_mii_tx[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_rgmii_clocking_setup(struct sja1105_private *priv, int port)</div><div class='add'>+static int sja1105_cfg_pad_rx_config(struct sja1105_private *priv, int port)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct sja1105_cfg_pad_mii pad_mii_rx = {0};</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;pad_mii_rx[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Payload */</div><div class='add'>+	pad_mii_rx.d32_ih    = 0; /* RXD[3:2] input stage hysteresis: */</div><div class='add'>+				  /*          non-Schmitt (default) */</div><div class='add'>+	pad_mii_rx.d32_ipud  = 2; /* RXD[3:2] input weak pull-up/down */</div><div class='add'>+				  /*          plain input (default) */</div><div class='add'>+	pad_mii_rx.d10_ih    = 0; /* RXD[1:0] input stage hysteresis: */</div><div class='add'>+				  /*          non-Schmitt (default) */</div><div class='add'>+	pad_mii_rx.d10_ipud  = 2; /* RXD[1:0] input weak pull-up/down */</div><div class='add'>+				  /*          plain input (default) */</div><div class='add'>+	pad_mii_rx.ctrl_ih   = 0; /* RX_DV/CRS_DV/RX_CTL and RX_ER */</div><div class='add'>+				  /* input stage hysteresis: */</div><div class='add'>+				  /* non-Schmitt (default) */</div><div class='add'>+	pad_mii_rx.ctrl_ipud = 3; /* RX_DV/CRS_DV/RX_CTL and RX_ER */</div><div class='add'>+				  /* input stage weak pull-up/down: */</div><div class='add'>+				  /* pull-down */</div><div class='add'>+	pad_mii_rx.clk_os    = 2; /* RX_CLK/RXC output stage: */</div><div class='add'>+				  /* medium noise/fast speed (default) */</div><div class='add'>+	pad_mii_rx.clk_ih    = 0; /* RX_CLK/RXC input hysteresis: */</div><div class='add'>+				  /* non-Schmitt (default) */</div><div class='add'>+	pad_mii_rx.clk_ipud  = 2; /* RX_CLK/RXC input pull-up/down: */</div><div class='add'>+				  /* plain input (default) */</div><div class='add'>+	sja1105_cfg_pad_mii_packing(packed_buf, &amp;pad_mii_rx, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;pad_mii_rx[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_cfg_pad_mii_id_packing(void *buf, struct sja1105_cfg_pad_mii_id *cmd,</div><div class='add'>+			       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_CGU_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_stable_ovr, 15, 15, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_delay,      14, 10, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_bypass,      9,  9, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_pd,          8,  8, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_stable_ovr,  7,  7, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_delay,       6,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_bypass,      1,  1, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_pd,          0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_cfg_pad_mii_id_packing(void *buf, struct sja1105_cfg_pad_mii_id *cmd,</div><div class='add'>+			       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_CGU_CMD;</div><div class='add'>+	u64 range = 4;</div><div class='add'>+</div><div class='add'>+	/* Fields RXC_RANGE and TXC_RANGE select the input frequency range:</div><div class='add'>+	 * 0 = 2.5MHz</div><div class='add'>+	 * 1 = 25MHz</div><div class='add'>+	 * 2 = 50MHz</div><div class='add'>+	 * 3 = 125MHz</div><div class='add'>+	 * 4 = Automatically determined by port speed.</div><div class='add'>+	 * There's no point in defining a structure different than the one for</div><div class='add'>+	 * SJA1105, so just hardcode the frequency range to automatic, just as</div><div class='add'>+	 * before.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_stable_ovr, 26, 26, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_delay,      25, 21, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;range,               20, 18, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_bypass,     17, 17, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rxc_pd,         16, 16, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_stable_ovr, 10, 10, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_delay,       9,  5, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;range,                4,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_bypass,      1,  1, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;txc_pd,          0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The RGMII delay setup procedure is 2-step and gets called upon each</div><div class='add'>+ * .phylink_mac_config. Both are strategic.</div><div class='add'>+ * The reason is that the RX Tunable Delay Line of the SJA1105 MAC has issues</div><div class='add'>+ * with recovering from a frequency change of the link partner's RGMII clock.</div><div class='add'>+ * The easiest way to recover from this is to temporarily power down the TDL,</div><div class='add'>+ * as it will re-lock at the new frequency afterwards.</div><div class='add'>+ */</div><div class='add'>+int sja1105pqrs_setup_rgmii_delay(const void *ctx, int port)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_private *priv = ctx;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct sja1105_cfg_pad_mii_id pad_mii_id = {0};</div><div class='add'>+	int rx_delay = priv-&gt;rgmii_rx_delay_ps[port];</div><div class='add'>+	int tx_delay = priv-&gt;rgmii_tx_delay_ps[port];</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (rx_delay)</div><div class='add'>+		pad_mii_id.rxc_delay = SJA1105_RGMII_DELAY_PS_TO_HW(rx_delay);</div><div class='add'>+	if (tx_delay)</div><div class='add'>+		pad_mii_id.txc_delay = SJA1105_RGMII_DELAY_PS_TO_HW(tx_delay);</div><div class='add'>+</div><div class='add'>+	/* Stage 1: Turn the RGMII delay lines off. */</div><div class='add'>+	pad_mii_id.rxc_bypass = 1;</div><div class='add'>+	pad_mii_id.rxc_pd = 1;</div><div class='add'>+	pad_mii_id.txc_bypass = 1;</div><div class='add'>+	pad_mii_id.txc_pd = 1;</div><div class='add'>+	sja1105_cfg_pad_mii_id_packing(packed_buf, &amp;pad_mii_id, PACK);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;pad_mii_id[port],</div><div class='add'>+			      packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Stage 2: Turn the RGMII delay lines on. */</div><div class='add'>+	if (rx_delay) {</div><div class='add'>+		pad_mii_id.rxc_bypass = 0;</div><div class='add'>+		pad_mii_id.rxc_pd = 0;</div><div class='add'>+	}</div><div class='add'>+	if (tx_delay) {</div><div class='add'>+		pad_mii_id.txc_bypass = 0;</div><div class='add'>+		pad_mii_id.txc_pd = 0;</div><div class='add'>+	}</div><div class='add'>+	sja1105_cfg_pad_mii_id_packing(packed_buf, &amp;pad_mii_id, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;pad_mii_id[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1110_setup_rgmii_delay(const void *ctx, int port)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_private *priv = ctx;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct sja1105_cfg_pad_mii_id pad_mii_id = {0};</div><div class='add'>+	int rx_delay = priv-&gt;rgmii_rx_delay_ps[port];</div><div class='add'>+	int tx_delay = priv-&gt;rgmii_tx_delay_ps[port];</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+</div><div class='add'>+	pad_mii_id.rxc_pd = 1;</div><div class='add'>+	pad_mii_id.txc_pd = 1;</div><div class='add'>+</div><div class='add'>+	if (rx_delay) {</div><div class='add'>+		pad_mii_id.rxc_delay = SJA1105_RGMII_DELAY_PS_TO_HW(rx_delay);</div><div class='add'>+		/* The "BYPASS" bit in SJA1110 is actually a "don't bypass" */</div><div class='add'>+		pad_mii_id.rxc_bypass = 1;</div><div class='add'>+		pad_mii_id.rxc_pd = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tx_delay) {</div><div class='add'>+		pad_mii_id.txc_delay = SJA1105_RGMII_DELAY_PS_TO_HW(tx_delay);</div><div class='add'>+		pad_mii_id.txc_bypass = 1;</div><div class='add'>+		pad_mii_id.txc_pd = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sja1110_cfg_pad_mii_id_packing(packed_buf, &amp;pad_mii_id, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;pad_mii_id[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_rgmii_clocking_setup(struct sja1105_private *priv, int port,</div><div class='add'>+					sja1105_mii_role_t role)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='ctx'> 	struct sja1105_mac_config_entry *mac;</div><div class='del'>-	sja1105_speed_t speed;</div><div class='add'>+	u64 speed;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='ctx'> 	speed = mac[port].speed;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(dev, "Configuring port %d RGMII at speed %dMbps\n",</div><div class='add'>+	dev_dbg(dev, "Configuring port %d RGMII at speed %lldMbps\n",</div><div class='ctx'> 		port, speed);</div><div class='ctx'> </div><div class='del'>-	switch (speed) {</div><div class='del'>-	case SJA1105_SPEED_1000MBPS:</div><div class='add'>+	if (speed == priv-&gt;info-&gt;port_speed[SJA1105_SPEED_1000MBPS]) {</div><div class='ctx'> 		/* 1000Mbps, IDIV disabled (125 MHz) */</div><div class='ctx'> 		rc = sja1105_cgu_idiv_config(priv, port, false, 1);</div><div class='del'>-		break;</div><div class='del'>-	case SJA1105_SPEED_100MBPS:</div><div class='add'>+	} else if (speed == priv-&gt;info-&gt;port_speed[SJA1105_SPEED_100MBPS]) {</div><div class='ctx'> 		/* 100Mbps, IDIV enabled, divide by 1 (25 MHz) */</div><div class='ctx'> 		rc = sja1105_cgu_idiv_config(priv, port, true, 1);</div><div class='del'>-		break;</div><div class='del'>-	case SJA1105_SPEED_10MBPS:</div><div class='add'>+	} else if (speed == priv-&gt;info-&gt;port_speed[SJA1105_SPEED_10MBPS]) {</div><div class='ctx'> 		/* 10Mbps, IDIV enabled, divide by 10 (2.5 MHz) */</div><div class='ctx'> 		rc = sja1105_cgu_idiv_config(priv, port, true, 10);</div><div class='del'>-		break;</div><div class='del'>-	case SJA1105_SPEED_AUTO:</div><div class='add'>+	} else if (speed == priv-&gt;info-&gt;port_speed[SJA1105_SPEED_AUTO]) {</div><div class='ctx'> 		/* Skip CGU configuration if there is no speed available</div><div class='ctx'> 		 * (e.g. link is not established yet)</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev_dbg(dev, "Speed not available, skipping CGU config\n");</div><div class='ctx'> 		return 0;</div><div class='del'>-	default:</div><div class='add'>+	} else {</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -427,6 +630,7 @@ static int sja1105_rgmii_clocking_setup(struct sja1105_private *priv, int port)</div><div class='ctx'> 		dev_err(dev, "Failed to configure Tx pad registers\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (!priv-&gt;info-&gt;setup_rgmii_delay)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +643,7 @@ static int sja1105_cgu_rmii_ref_clk_config(struct sja1105_private *priv,</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl ref_clk;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='del'>-	const int clk_sources[] = {</div><div class='add'>+	static const int clk_sources[] = {</div><div class='ctx'> 		CLKSRC_MII0_TX_CLK,</div><div class='ctx'> 		CLKSRC_MII1_TX_CLK,</div><div class='ctx'> 		CLKSRC_MII2_TX_CLK,</div><div class='hunk'>@@ -447,15 +651,17 @@ static int sja1105_cgu_rmii_ref_clk_config(struct sja1105_private *priv,</div><div class='ctx'> 		CLKSRC_MII4_TX_CLK,</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;rmii_ref_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Payload for packed_buf */</div><div class='ctx'> 	ref_clk.clksrc    = clk_sources[port];</div><div class='ctx'> 	ref_clk.autoblock = 1;      /* Autoblock clk while changing clksrc */</div><div class='ctx'> 	ref_clk.pd        = 0;      /* Power Down off =&gt; enabled */</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;ref_clk, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;rmii_ref_clk[port],</div><div class='del'>-					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;rmii_ref_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -465,15 +671,17 @@ sja1105_cgu_rmii_ext_tx_clk_config(struct sja1105_private *priv, int port)</div><div class='ctx'> 	struct sja1105_cgu_mii_ctrl ext_tx_clk;</div><div class='ctx'> 	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;rmii_ext_tx_clk[port] == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Payload for packed_buf */</div><div class='ctx'> 	ext_tx_clk.clksrc    = CLKSRC_PLL1;</div><div class='ctx'> 	ext_tx_clk.autoblock = 1;   /* Autoblock clk while changing clksrc */</div><div class='ctx'> 	ext_tx_clk.pd        = 0;   /* Power Down off =&gt; enabled */</div><div class='ctx'> 	sja1105_cgu_mii_control_packing(packed_buf, &amp;ext_tx_clk, PACK);</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE,</div><div class='del'>-					   regs-&gt;rmii_ext_tx_clk[port],</div><div class='del'>-					   packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;rmii_ext_tx_clk[port],</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)</div><div class='hunk'>@@ -484,6 +692,9 @@ static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)</div><div class='ctx'> 	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (regs-&gt;rmii_pll1 == SJA1105_RSV_ADDR)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* PLL1 must be enabled and output 50 Mhz.</div><div class='ctx'> 	 * This is done by writing first 0x0A010941 to</div><div class='ctx'> 	 * the PLL_1_C register and then deasserting</div><div class='hunk'>@@ -501,8 +712,8 @@ static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)</div><div class='ctx'> 	pll.pd        = 0x1;</div><div class='ctx'> </div><div class='ctx'> 	sja1105_cgu_pll_control_packing(packed_buf, &amp;pll, PACK);</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rmii_pll1,</div><div class='del'>-					 packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;rmii_pll1, packed_buf,</div><div class='add'>+			      SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "failed to configure PLL1 for 50MHz\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -512,8 +723,8 @@ static int sja1105_cgu_rmii_pll_config(struct sja1105_private *priv)</div><div class='ctx'> 	pll.pd = 0x0;</div><div class='ctx'> </div><div class='ctx'> 	sja1105_cgu_pll_control_packing(packed_buf, &amp;pll, PACK);</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rmii_pll1,</div><div class='del'>-					 packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;rmii_pll1, packed_buf,</div><div class='add'>+			      SJA1105_SIZE_CGU_CMD);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "failed to enable PLL1\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -575,27 +786,75 @@ int sja1105_clocking_setup_port(struct sja1105_private *priv, int port)</div><div class='ctx'> 		rc = sja1105_rmii_clocking_setup(priv, port, role);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XMII_MODE_RGMII:</div><div class='del'>-		rc = sja1105_rgmii_clocking_setup(priv, port);</div><div class='add'>+		rc = sja1105_rgmii_clocking_setup(priv, port, role);</div><div class='add'>+		break;</div><div class='add'>+	case XMII_MODE_SGMII:</div><div class='add'>+		/* Nothing to do in the CGU for SGMII */</div><div class='add'>+		rc = 0;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(dev, "Invalid interface mode specified: %d\n",</div><div class='ctx'> 			phy_mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (rc)</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		dev_err(dev, "Clocking setup for port %d failed: %d\n",</div><div class='ctx'> 			port, rc);</div><div class='del'>-	return rc;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Internally pull down the RX_DV/CRS_DV/RX_CTL and RX_ER inputs */</div><div class='add'>+	return sja1105_cfg_pad_rx_config(priv, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sja1105_clocking_setup(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='ctx'> 	int port, rc;</div><div class='ctx'> </div><div class='del'>-	for (port = 0; port &lt; SJA1105_NUM_PORTS; port++) {</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='ctx'> 		rc = sja1105_clocking_setup_port(priv, port);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_cgu_outclk_packing(void *buf, struct sja1110_cgu_outclk *outclk,</div><div class='add'>+			   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const int size = 4;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;outclk-&gt;clksrc,    27, 24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;outclk-&gt;autoblock, 11, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;outclk-&gt;pd,         0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1110_disable_microcontroller(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	u8 packed_buf[SJA1105_SIZE_CGU_CMD] = {0};</div><div class='add'>+	struct sja1110_cgu_outclk outclk_6_c = {</div><div class='add'>+		.clksrc = 0x3,</div><div class='add'>+		.pd = true,</div><div class='add'>+	};</div><div class='add'>+	struct sja1110_cgu_outclk outclk_7_c = {</div><div class='add'>+		.clksrc = 0x5,</div><div class='add'>+		.pd = true,</div><div class='add'>+	};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Power down the BASE_TIMER_CLK to disable the watchdog timer */</div><div class='add'>+	sja1110_cgu_outclk_packing(packed_buf, &amp;outclk_7_c, PACK);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_WRITE, SJA1110_BASE_TIMER_CLK,</div><div class='add'>+			      packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Power down the BASE_MCSS_CLOCK to gate the microcontroller off */</div><div class='add'>+	sja1110_cgu_outclk_packing(packed_buf, &amp;outclk_6_c, PACK);</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_buf(priv, SPI_WRITE, SJA1110_BASE_MCSS_CLK,</div><div class='add'>+				packed_buf, SJA1105_SIZE_CGU_CMD);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_devlink.c b/drivers/net/dsa/sja1105/sja1105_devlink.c<br/>new file mode 100644<br/>index 000000000000..30b1f1ba762f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_devlink.c</a></div><div class='hunk'>@@ -0,0 +1,139 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ * Copyright 2020 NXP</div><div class='add'>+ */</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+/* Since devlink regions have a fixed size and the static config has a variable</div><div class='add'>+ * size, we need to calculate the maximum possible static config size by</div><div class='add'>+ * creating a dummy config with all table entries populated to the max, and get</div><div class='add'>+ * its packed length. This is done dynamically as opposed to simply hardcoding</div><div class='add'>+ * a number, since currently not all static config tables are implemented, so</div><div class='add'>+ * we are avoiding a possible code desynchronization.</div><div class='add'>+ */</div><div class='add'>+static size_t sja1105_static_config_get_max_size(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_static_config config;</div><div class='add'>+	enum sja1105_blk_idx blk_idx;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_static_config_init(&amp;config,</div><div class='add'>+					priv-&gt;info-&gt;static_ops,</div><div class='add'>+					priv-&gt;info-&gt;device_id);</div><div class='add'>+	if (rc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (blk_idx = 0; blk_idx &lt; BLK_IDX_MAX; blk_idx++) {</div><div class='add'>+		struct sja1105_table *table = &amp;config.tables[blk_idx];</div><div class='add'>+</div><div class='add'>+		table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_get_length(&amp;config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sja1105_region_static_config_snapshot(struct devlink *dl,</div><div class='add'>+				      const struct devlink_region_ops *ops,</div><div class='add'>+				      struct netlink_ext_ack *extack,</div><div class='add'>+				      u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = dsa_devlink_to_ds(dl);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	size_t max_len, len;</div><div class='add'>+</div><div class='add'>+	len = sja1105_static_config_get_length(&amp;priv-&gt;static_config);</div><div class='add'>+	max_len = sja1105_static_config_get_max_size(priv);</div><div class='add'>+</div><div class='add'>+	*data = kcalloc(max_len, sizeof(u8), GFP_KERNEL);</div><div class='add'>+	if (!*data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return static_config_buf_prepare_for_upload(priv, *data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct devlink_region_ops sja1105_region_static_config_ops = {</div><div class='add'>+	.name = "static-config",</div><div class='add'>+	.snapshot = sja1105_region_static_config_snapshot,</div><div class='add'>+	.destructor = kfree,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_region_id {</div><div class='add'>+	SJA1105_REGION_STATIC_CONFIG = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_region {</div><div class='add'>+	const struct devlink_region_ops *ops;</div><div class='add'>+	size_t (*get_size)(struct sja1105_private *priv);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct sja1105_region sja1105_regions[] = {</div><div class='add'>+	[SJA1105_REGION_STATIC_CONFIG] = {</div><div class='add'>+		.ops = &amp;sja1105_region_static_config_ops,</div><div class='add'>+		.get_size = sja1105_static_config_get_max_size,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int sja1105_setup_devlink_regions(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	int i, num_regions = ARRAY_SIZE(sja1105_regions);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	const struct devlink_region_ops *ops;</div><div class='add'>+	struct devlink_region *region;</div><div class='add'>+	u64 size;</div><div class='add'>+</div><div class='add'>+	priv-&gt;regions = kcalloc(num_regions, sizeof(struct devlink_region *),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;regions)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_regions; i++) {</div><div class='add'>+		size = sja1105_regions[i].get_size(priv);</div><div class='add'>+		ops = sja1105_regions[i].ops;</div><div class='add'>+</div><div class='add'>+		region = dsa_devlink_region_create(ds, ops, 1, size);</div><div class='add'>+		if (IS_ERR(region)) {</div><div class='add'>+			while (--i &gt;= 0)</div><div class='add'>+				dsa_devlink_region_destroy(priv-&gt;regions[i]);</div><div class='add'>+</div><div class='add'>+			kfree(priv-&gt;regions);</div><div class='add'>+			return PTR_ERR(region);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv-&gt;regions[i] = region;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_teardown_devlink_regions(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	int i, num_regions = ARRAY_SIZE(sja1105_regions);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_regions; i++)</div><div class='add'>+		dsa_devlink_region_destroy(priv-&gt;regions[i]);</div><div class='add'>+</div><div class='add'>+	kfree(priv-&gt;regions);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_devlink_info_get(struct dsa_switch *ds,</div><div class='add'>+			     struct devlink_info_req *req,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return devlink_info_version_fixed_put(req,</div><div class='add'>+					      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,</div><div class='add'>+					      priv-&gt;info-&gt;name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_devlink_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return sja1105_setup_devlink_regions(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_devlink_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	sja1105_teardown_devlink_regions(ds);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_dynamic_config.c b/drivers/net/dsa/sja1105/sja1105_dynamic_config.c<br/>index e73ab28bf632..984c0e604e8d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_dynamic_config.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_dynamic_config.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_dynamic_config.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_dynamic_config.c</a></div><div class='hunk'>@@ -3,8 +3,112 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "sja1105.h"</div><div class='ctx'> </div><div class='add'>+/* In the dynamic configuration interface, the switch exposes a register-like</div><div class='add'>+ * view of some of the static configuration tables.</div><div class='add'>+ * Many times the field organization of the dynamic tables is abbreviated (not</div><div class='add'>+ * all fields are dynamically reconfigurable) and different from the static</div><div class='add'>+ * ones, but the key reason for having it is that we can spare a switch reset</div><div class='add'>+ * for settings that can be changed dynamically.</div><div class='add'>+ *</div><div class='add'>+ * This file creates a per-switch-family abstraction called</div><div class='add'>+ * struct sja1105_dynamic_table_ops and two operations that work with it:</div><div class='add'>+ * - sja1105_dynamic_config_write</div><div class='add'>+ * - sja1105_dynamic_config_read</div><div class='add'>+ *</div><div class='add'>+ * Compared to the struct sja1105_table_ops from sja1105_static_config.c,</div><div class='add'>+ * the dynamic accessors work with a compound buffer:</div><div class='add'>+ *</div><div class='add'>+ * packed_buf</div><div class='add'>+ *</div><div class='add'>+ * |</div><div class='add'>+ * V</div><div class='add'>+ * +-----------------------------------------+------------------+</div><div class='add'>+ * |              ENTRY BUFFER               |  COMMAND BUFFER  |</div><div class='add'>+ * +-----------------------------------------+------------------+</div><div class='add'>+ *</div><div class='add'>+ * &lt;----------------------- packed_size ------------------------&gt;</div><div class='add'>+ *</div><div class='add'>+ * The ENTRY BUFFER may or may not have the same layout, or size, as its static</div><div class='add'>+ * configuration table entry counterpart. When it does, the same packing</div><div class='add'>+ * function is reused (bar exceptional cases - see</div><div class='add'>+ * sja1105pqrs_dyn_l2_lookup_entry_packing).</div><div class='add'>+ *</div><div class='add'>+ * The reason for the COMMAND BUFFER being at the end is to be able to send</div><div class='add'>+ * a dynamic write command through a single SPI burst. By the time the switch</div><div class='add'>+ * reacts to the command, the ENTRY BUFFER is already populated with the data</div><div class='add'>+ * sent by the core.</div><div class='add'>+ *</div><div class='add'>+ * The COMMAND BUFFER is always SJA1105_SIZE_DYN_CMD bytes (one 32-bit word) in</div><div class='add'>+ * size.</div><div class='add'>+ *</div><div class='add'>+ * Sometimes the ENTRY BUFFER does not really exist (when the number of fields</div><div class='add'>+ * that can be reconfigured is small), then the switch repurposes some of the</div><div class='add'>+ * unused 32 bits of the COMMAND BUFFER to hold ENTRY data.</div><div class='add'>+ *</div><div class='add'>+ * The key members of struct sja1105_dynamic_table_ops are:</div><div class='add'>+ * - .entry_packing: A function that deals with packing an ENTRY structure</div><div class='add'>+ *		     into an SPI buffer, or retrieving an ENTRY structure</div><div class='add'>+ *		     from one.</div><div class='add'>+ *		     The @packed_buf pointer it's given does always point to</div><div class='add'>+ *		     the ENTRY portion of the buffer.</div><div class='add'>+ * - .cmd_packing: A function that deals with packing/unpacking the COMMAND</div><div class='add'>+ *		   structure to/from the SPI buffer.</div><div class='add'>+ *		   It is given the same @packed_buf pointer as .entry_packing,</div><div class='add'>+ *		   so most of the time, the @packed_buf points *behind* the</div><div class='add'>+ *		   COMMAND offset inside the buffer.</div><div class='add'>+ *		   To access the COMMAND portion of the buffer, the function</div><div class='add'>+ *		   knows its correct offset.</div><div class='add'>+ *		   Giving both functions the same pointer is handy because in</div><div class='add'>+ *		   extreme cases (see sja1105pqrs_dyn_l2_lookup_entry_packing)</div><div class='add'>+ *		   the .entry_packing is able to jump to the COMMAND portion,</div><div class='add'>+ *		   or vice-versa (sja1105pqrs_l2_lookup_cmd_packing).</div><div class='add'>+ * - .access: A bitmap of:</div><div class='add'>+ *	OP_READ: Set if the hardware manual marks the ENTRY portion of the</div><div class='add'>+ *		 dynamic configuration table buffer as R (readable) after</div><div class='add'>+ *		 an SPI read command (the switch will populate the buffer).</div><div class='add'>+ *	OP_WRITE: Set if the manual marks the ENTRY portion of the dynamic</div><div class='add'>+ *		  table buffer as W (writable) after an SPI write command</div><div class='add'>+ *		  (the switch will read the fields provided in the buffer).</div><div class='add'>+ *	OP_DEL: Set if the manual says the VALIDENT bit is supported in the</div><div class='add'>+ *		COMMAND portion of this dynamic config buffer (i.e. the</div><div class='add'>+ *		specified entry can be invalidated through a SPI write</div><div class='add'>+ *		command).</div><div class='add'>+ *	OP_SEARCH: Set if the manual says that the index of an entry can</div><div class='add'>+ *		   be retrieved in the COMMAND portion of the buffer based</div><div class='add'>+ *		   on its ENTRY portion, as a result of a SPI write command.</div><div class='add'>+ *		   Only the TCAM-based FDB table on SJA1105 P/Q/R/S supports</div><div class='add'>+ *		   this.</div><div class='add'>+ *	OP_VALID_ANYWAY: Reading some tables through the dynamic config</div><div class='add'>+ *			 interface is possible even if the VALIDENT bit is not</div><div class='add'>+ *			 set in the writeback. So don't error out in that case.</div><div class='add'>+ * - .max_entry_count: The number of entries, counting from zero, that can be</div><div class='add'>+ *		       reconfigured through the dynamic interface. If a static</div><div class='add'>+ *		       table can be reconfigured at all dynamically, this</div><div class='add'>+ *		       number always matches the maximum number of supported</div><div class='add'>+ *		       static entries.</div><div class='add'>+ * - .packed_size: The length in bytes of the compound ENTRY + COMMAND BUFFER.</div><div class='add'>+ *		   Note that sometimes the compound buffer may contain holes in</div><div class='add'>+ *		   it (see sja1105_vlan_lookup_cmd_packing). The @packed_buf is</div><div class='add'>+ *		   contiguous however, so @packed_size includes any unused</div><div class='add'>+ *		   bytes.</div><div class='add'>+ * - .addr: The base SPI address at which the buffer must be written to the</div><div class='add'>+ *	    switch's memory. When looking at the hardware manual, this must</div><div class='add'>+ *	    always match the lowest documented address for the ENTRY, and not</div><div class='add'>+ *	    that of the COMMAND, since the other 32-bit words will follow along</div><div class='add'>+ *	    at the correct addresses.</div><div class='add'>+ */</div><div class='add'>+</div><div class='ctx'> #define SJA1105_SIZE_DYN_CMD					4</div><div class='ctx'> </div><div class='add'>+#define SJA1105ET_SIZE_VL_LOOKUP_DYN_CMD			\</div><div class='add'>+	SJA1105_SIZE_DYN_CMD</div><div class='add'>+</div><div class='add'>+#define SJA1105PQRS_SIZE_VL_LOOKUP_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_VL_LOOKUP_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1110_SIZE_VL_POLICING_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_VL_POLICING_ENTRY)</div><div class='add'>+</div><div class='ctx'> #define SJA1105ET_SIZE_MAC_CONFIG_DYN_ENTRY			\</div><div class='ctx'> 	SJA1105_SIZE_DYN_CMD</div><div class='ctx'> </div><div class='hunk'>@@ -14,9 +118,15 @@</div><div class='ctx'> #define SJA1105PQRS_SIZE_L2_LOOKUP_DYN_CMD			\</div><div class='ctx'> 	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY)</div><div class='ctx'> </div><div class='add'>+#define SJA1110_SIZE_L2_LOOKUP_DYN_CMD				\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1110_SIZE_L2_LOOKUP_ENTRY)</div><div class='add'>+</div><div class='ctx'> #define SJA1105_SIZE_VLAN_LOOKUP_DYN_CMD			\</div><div class='ctx'> 	(SJA1105_SIZE_DYN_CMD + 4 + SJA1105_SIZE_VLAN_LOOKUP_ENTRY)</div><div class='ctx'> </div><div class='add'>+#define SJA1110_SIZE_VLAN_LOOKUP_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1110_SIZE_VLAN_LOOKUP_ENTRY)</div><div class='add'>+</div><div class='ctx'> #define SJA1105_SIZE_L2_FORWARDING_DYN_CMD			\</div><div class='ctx'> 	(SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_L2_FORWARDING_ENTRY)</div><div class='ctx'> </div><div class='hunk'>@@ -29,23 +139,181 @@</div><div class='ctx'> #define SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD			\</div><div class='ctx'> 	SJA1105_SIZE_DYN_CMD</div><div class='ctx'> </div><div class='add'>+#define SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_DYN_CMD		\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1110_SIZE_L2_LOOKUP_PARAMS_DYN_CMD		\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1110_SIZE_L2_LOOKUP_PARAMS_ENTRY)</div><div class='add'>+</div><div class='ctx'> #define SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD			\</div><div class='ctx'> 	SJA1105_SIZE_DYN_CMD</div><div class='ctx'> </div><div class='add'>+#define SJA1105PQRS_SIZE_GENERAL_PARAMS_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1110_SIZE_GENERAL_PARAMS_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1110_SIZE_GENERAL_PARAMS_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105PQRS_SIZE_AVB_PARAMS_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_RETAGGING_DYN_CMD				\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_RETAGGING_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105ET_SIZE_CBS_DYN_CMD				\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105ET_SIZE_CBS_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1105PQRS_SIZE_CBS_DYN_CMD				\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105PQRS_SIZE_CBS_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1110_SIZE_XMII_PARAMS_DYN_CMD			\</div><div class='add'>+	SJA1110_SIZE_XMII_PARAMS_ENTRY</div><div class='add'>+</div><div class='add'>+#define SJA1110_SIZE_L2_POLICING_DYN_CMD			\</div><div class='add'>+	(SJA1105_SIZE_DYN_CMD + SJA1105_SIZE_L2_POLICING_ENTRY)</div><div class='add'>+</div><div class='add'>+#define SJA1110_SIZE_L2_FORWARDING_PARAMS_DYN_CMD		\</div><div class='add'>+	SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY</div><div class='add'>+</div><div class='ctx'> #define SJA1105_MAX_DYN_CMD_SIZE				\</div><div class='del'>-	SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD</div><div class='add'>+	SJA1110_SIZE_GENERAL_PARAMS_DYN_CMD</div><div class='add'>+</div><div class='add'>+struct sja1105_dyn_cmd {</div><div class='add'>+	bool search;</div><div class='add'>+	u64 valid;</div><div class='add'>+	u64 rdwrset;</div><div class='add'>+	u64 errors;</div><div class='add'>+	u64 valident;</div><div class='add'>+	u64 index;</div><div class='add'>+};</div><div class='ctx'> </div><div class='add'>+enum sja1105_hostcmd {</div><div class='add'>+	SJA1105_HOSTCMD_SEARCH = 1,</div><div class='add'>+	SJA1105_HOSTCMD_READ = 2,</div><div class='add'>+	SJA1105_HOSTCMD_WRITE = 3,</div><div class='add'>+	SJA1105_HOSTCMD_INVALIDATE = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Command and entry overlap */</div><div class='ctx'> static void</div><div class='del'>-sja1105pqrs_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+sja1105et_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;errors,  30, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;rdwrset, 29, 29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index,    9,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Command and entry are separate */</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 				  enum packing_op op)</div><div class='ctx'> {</div><div class='add'>+	u8 *p = buf + SJA1105_SIZE_VL_LOOKUP_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,    9,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_vl_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+			      enum packing_op op)</div><div class='add'>+{</div><div class='ctx'> 	u8 *p = buf + SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='ctx'> 	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='ctx'> </div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,   11,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105et_vl_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_lookup_entry *entry = entry_ptr;</div><div class='add'>+	const int size = SJA1105ET_SIZE_VL_LOOKUP_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirr,  21, 17, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ingrmirr, 16, 16, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_vl_policing_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105_SIZE_VL_LOOKUP_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,   11,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_common_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+					 enum packing_op op, int entry_size)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+	u8 *p = buf + entry_size;</div><div class='add'>+	u64 hostcmd;</div><div class='add'>+</div><div class='ctx'> 	sja1105_packing(p, &amp;cmd-&gt;valid,    31, 31, size, op);</div><div class='ctx'> 	sja1105_packing(p, &amp;cmd-&gt;rdwrset,  30, 30, size, op);</div><div class='ctx'> 	sja1105_packing(p, &amp;cmd-&gt;errors,   29, 29, size, op);</div><div class='ctx'> 	sja1105_packing(p, &amp;cmd-&gt;valident, 27, 27, size, op);</div><div class='add'>+</div><div class='add'>+	/* VALIDENT is supposed to indicate "keep or not", but in SJA1105 E/T,</div><div class='add'>+	 * using it to delete a management route was unsupported. UM10944</div><div class='add'>+	 * said about it:</div><div class='add'>+	 *</div><div class='add'>+	 *   In case of a write access with the MGMTROUTE flag set,</div><div class='add'>+	 *   the flag will be ignored. It will always be found cleared</div><div class='add'>+	 *   for read accesses with the MGMTROUTE flag set.</div><div class='add'>+	 *</div><div class='add'>+	 * SJA1105 P/Q/R/S keeps the same behavior w.r.t. VALIDENT, but there</div><div class='add'>+	 * is now another flag called HOSTCMD which does more stuff (quoting</div><div class='add'>+	 * from UM11040):</div><div class='add'>+	 *</div><div class='add'>+	 *   A write request is accepted only when HOSTCMD is set to write host</div><div class='add'>+	 *   or invalid. A read request is accepted only when HOSTCMD is set to</div><div class='add'>+	 *   search host or read host.</div><div class='add'>+	 *</div><div class='add'>+	 * So it is possible to translate a RDWRSET/VALIDENT combination into</div><div class='add'>+	 * HOSTCMD so that we keep the dynamic command API in place, and</div><div class='add'>+	 * at the same time achieve compatibility with the management route</div><div class='add'>+	 * command structure.</div><div class='add'>+	 */</div><div class='add'>+	if (cmd-&gt;rdwrset == SPI_READ) {</div><div class='add'>+		if (cmd-&gt;search)</div><div class='add'>+			hostcmd = SJA1105_HOSTCMD_SEARCH;</div><div class='add'>+		else</div><div class='add'>+			hostcmd = SJA1105_HOSTCMD_READ;</div><div class='add'>+	} else {</div><div class='add'>+		/* SPI_WRITE */</div><div class='add'>+		if (cmd-&gt;valident)</div><div class='add'>+			hostcmd = SJA1105_HOSTCMD_WRITE;</div><div class='add'>+		else</div><div class='add'>+			hostcmd = SJA1105_HOSTCMD_INVALIDATE;</div><div class='add'>+	}</div><div class='add'>+	sja1105_packing(p, &amp;hostcmd, 25, 23, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	int entry_size = SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105pqrs_common_l2_lookup_cmd_packing(buf, cmd, op, entry_size);</div><div class='add'>+</div><div class='ctx'> 	/* Hack - The hardware takes the 'index' field within</div><div class='ctx'> 	 * struct sja1105_l2_lookup_entry as the index on which this command</div><div class='ctx'> 	 * will operate. However it will ignore everything else, so 'index'</div><div class='hunk'>@@ -54,9 +322,88 @@ sja1105pqrs_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 	 * such that our API doesn't need to ask for a full-blown entry</div><div class='ctx'> 	 * structure when e.g. a delete is requested.</div><div class='ctx'> 	 */</div><div class='del'>-	sja1105_packing(buf, &amp;cmd-&gt;index, 29, 20,</div><div class='del'>-			SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY, op);</div><div class='del'>-	/* TODO hostcmd */</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index, 15, 6, entry_size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+			      enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	int entry_size = SJA1110_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105pqrs_common_l2_lookup_cmd_packing(buf, cmd, op, entry_size);</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index, 10, 1, entry_size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The switch is so retarded that it makes our command/entry abstraction</div><div class='add'>+ * crumble apart.</div><div class='add'>+ *</div><div class='add'>+ * On P/Q/R/S, the switch tries to say whether a FDB entry</div><div class='add'>+ * is statically programmed or dynamically learned via a flag called LOCKEDS.</div><div class='add'>+ * The hardware manual says about this fiels:</div><div class='add'>+ *</div><div class='add'>+ *   On write will specify the format of ENTRY.</div><div class='add'>+ *   On read the flag will be found cleared at times the VALID flag is found</div><div class='add'>+ *   set.  The flag will also be found cleared in response to a read having the</div><div class='add'>+ *   MGMTROUTE flag set.  In response to a read with the MGMTROUTE flag</div><div class='add'>+ *   cleared, the flag be set if the most recent access operated on an entry</div><div class='add'>+ *   that was either loaded by configuration or through dynamic reconfiguration</div><div class='add'>+ *   (as opposed to automatically learned entries).</div><div class='add'>+ *</div><div class='add'>+ * The trouble with this flag is that it's part of the *command* to access the</div><div class='add'>+ * dynamic interface, and not part of the *entry* retrieved from it.</div><div class='add'>+ * Otherwise said, for a sja1105_dynamic_config_read, LOCKEDS is supposed to be</div><div class='add'>+ * an output from the switch into the command buffer, and for a</div><div class='add'>+ * sja1105_dynamic_config_write, the switch treats LOCKEDS as an input</div><div class='add'>+ * (hence we can write either static, or automatically learned entries, from</div><div class='add'>+ * the core).</div><div class='add'>+ * But the manual contradicts itself in the last phrase where it says that on</div><div class='add'>+ * read, LOCKEDS will be set to 1 for all FDB entries written through the</div><div class='add'>+ * dynamic interface (therefore, the value of LOCKEDS from the</div><div class='add'>+ * sja1105_dynamic_config_write is not really used for anything, it'll store a</div><div class='add'>+ * 1 anyway).</div><div class='add'>+ * This means you can't really write a FDB entry with LOCKEDS=0 (automatically</div><div class='add'>+ * learned) into the switch, which kind of makes sense.</div><div class='add'>+ * As for reading through the dynamic interface, it doesn't make too much sense</div><div class='add'>+ * to put LOCKEDS into the command, since the switch will inevitably have to</div><div class='add'>+ * ignore it (otherwise a command would be like "read the FDB entry 123, but</div><div class='add'>+ * only if it's dynamically learned" &lt;- well how am I supposed to know?) and</div><div class='add'>+ * just use it as an output buffer for its findings. But guess what... that's</div><div class='add'>+ * what the entry buffer is for!</div><div class='add'>+ * Unfortunately, what really breaks this abstraction is the fact that it</div><div class='add'>+ * wasn't designed having the fact in mind that the switch can output</div><div class='add'>+ * entry-related data as writeback through the command buffer.</div><div class='add'>+ * However, whether a FDB entry is statically or dynamically learned *is* part</div><div class='add'>+ * of the entry and not the command data, no matter what the switch thinks.</div><div class='add'>+ * In order to do that, we'll need to wrap around the</div><div class='add'>+ * sja1105pqrs_l2_lookup_entry_packing from sja1105_static_config.c, and take</div><div class='add'>+ * a peek outside of the caller-supplied @buf (the entry buffer), to reach the</div><div class='add'>+ * command buffer.</div><div class='add'>+ */</div><div class='add'>+static size_t</div><div class='add'>+sja1105pqrs_dyn_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='add'>+	u8 *cmd = buf + SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(cmd, &amp;entry-&gt;lockeds, 28, 28, size, op);</div><div class='add'>+</div><div class='add'>+	return sja1105pqrs_l2_lookup_entry_packing(buf, entry_ptr, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1110_dyn_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='add'>+	u8 *cmd = buf + SJA1110_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(cmd, &amp;entry-&gt;lockeds, 28, 28, size, op);</div><div class='add'>+</div><div class='add'>+	return sja1110_l2_lookup_entry_packing(buf, entry_ptr, op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -75,6 +422,18 @@ sja1105et_l2_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 			SJA1105ET_SIZE_L2_LOOKUP_ENTRY, op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t sja1105et_dyn_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='add'>+	u8 *cmd = buf + SJA1105ET_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(cmd, &amp;entry-&gt;lockeds, 28, 28, size, op);</div><div class='add'>+</div><div class='add'>+	return sja1105et_l2_lookup_entry_packing(buf, entry_ptr, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> sja1105et_mgmt_route_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 				 enum packing_op op)</div><div class='hunk'>@@ -107,6 +466,36 @@ static size_t sja1105et_mgmt_route_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_mgmt_route_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	u64 mgmtroute = 1;</div><div class='add'>+</div><div class='add'>+	sja1105pqrs_l2_lookup_cmd_packing(buf, cmd, op);</div><div class='add'>+	if (op == PACK)</div><div class='add'>+		sja1105_pack(p, &amp;mgmtroute, 26, 26, SJA1105_SIZE_DYN_CMD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105pqrs_mgmt_route_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	struct sja1105_mgmt_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	/* In P/Q/R/S, enfport got renamed to mgmtvalid, but its purpose</div><div class='add'>+	 * is the same (driver uses it to confirm that frame was sent).</div><div class='add'>+	 * So just keep the name from E/T.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tsreg,     71, 71, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;takets,    70, 70, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;macaddr,   69, 22, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports, 21, 17, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;enfport,   16, 16, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* In E/T, entry is at addresses 0x27-0x28. There is a 4 byte gap at 0x29,</div><div class='ctx'>  * and command is at 0x2a. Similarly in P/Q/R/S there is a 1 register gap</div><div class='ctx'>  * between entry (0x2d, 0x2e) and command (0x30).</div><div class='hunk'>@@ -128,6 +517,39 @@ sja1105_vlan_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 			SJA1105_SIZE_VLAN_LOOKUP_ENTRY, op);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* In SJA1110 there is no gap between the command and the data, yay... */</div><div class='add'>+static void</div><div class='add'>+sja1110_vlan_lookup_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1110_SIZE_VLAN_LOOKUP_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+	u64 type_entry = 0;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	/* Hack: treat 'vlanid' field of struct sja1105_vlan_lookup_entry as</div><div class='add'>+	 * cmd-&gt;index.</div><div class='add'>+	 */</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;index, 38, 27,</div><div class='add'>+			SJA1110_SIZE_VLAN_LOOKUP_ENTRY, op);</div><div class='add'>+</div><div class='add'>+	/* But the VALIDENT bit has disappeared, now we are supposed to</div><div class='add'>+	 * invalidate an entry through the TYPE_ENTRY field of the entry..</div><div class='add'>+	 * This is a hack to transform the non-zero quality of the TYPE_ENTRY</div><div class='add'>+	 * field into a VALIDENT bit.</div><div class='add'>+	 */</div><div class='add'>+	if (op == PACK &amp;&amp; !cmd-&gt;valident) {</div><div class='add'>+		sja1105_packing(buf, &amp;type_entry, 40, 39,</div><div class='add'>+				SJA1110_SIZE_VLAN_LOOKUP_ENTRY, PACK);</div><div class='add'>+	} else if (op == UNPACK) {</div><div class='add'>+		sja1105_packing(buf, &amp;type_entry, 40, 39,</div><div class='add'>+				SJA1110_SIZE_VLAN_LOOKUP_ENTRY, UNPACK);</div><div class='add'>+		cmd-&gt;valident = !!type_entry;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> sja1105_l2_forwarding_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 				  enum packing_op op)</div><div class='hunk'>@@ -142,6 +564,19 @@ sja1105_l2_forwarding_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+sja1110_l2_forwarding_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105_SIZE_L2_FORWARDING_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,    4,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> sja1105et_mac_config_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 				 enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -196,6 +631,19 @@ sja1105pqrs_mac_config_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+sja1110_mac_config_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+			       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,    3,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> sja1105et_l2_lookup_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 				       enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -216,6 +664,30 @@ sja1105et_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='add'>+sja1105pqrs_l2_lookup_params_cmd_packing(void *buf,</div><div class='add'>+					 struct sja1105_dyn_cmd *cmd,</div><div class='add'>+					 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_l2_lookup_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				     enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1110_SIZE_L2_LOOKUP_PARAMS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='ctx'> sja1105et_general_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='ctx'> 				     enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -237,14 +709,187 @@ sja1105et_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_general_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 28, 28, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_general_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1110_SIZE_GENERAL_PARAMS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105pqrs_avb_params_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 29, 29, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1105_retagging_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+			      enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105_SIZE_RETAGGING_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,    31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,   30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valident, 29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset,  28, 28, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,     5,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_retagging_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+			      enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105_SIZE_RETAGGING_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,    31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset,  30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,   29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valident, 28, 28, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,     4,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105et_cbs_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				      enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105ET_SIZE_CBS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid, 31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index, 19, 16, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105et_cbs_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105ET_SIZE_CBS_ENTRY;</div><div class='add'>+	struct sja1105_cbs_entry *entry = entry_ptr;</div><div class='add'>+	u8 *cmd = buf + size;</div><div class='add'>+	u32 *p = buf;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(cmd, &amp;entry-&gt;port, 5, 3, SJA1105_SIZE_DYN_CMD, op);</div><div class='add'>+	sja1105_packing(cmd, &amp;entry-&gt;prio, 2, 0, SJA1105_SIZE_DYN_CMD, op);</div><div class='add'>+	sja1105_packing(p + 3, &amp;entry-&gt;credit_lo,  31, 0, size, op);</div><div class='add'>+	sja1105_packing(p + 2, &amp;entry-&gt;credit_hi,  31, 0, size, op);</div><div class='add'>+	sja1105_packing(p + 1, &amp;entry-&gt;send_slope, 31, 0, size, op);</div><div class='add'>+	sja1105_packing(p + 0, &amp;entry-&gt;idle_slope, 31, 0, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105pqrs_cbs_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+					enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_CBS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,    3,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1110_cbs_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105PQRS_SIZE_CBS_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,    7,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105pqrs_cbs_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105PQRS_SIZE_CBS_ENTRY;</div><div class='add'>+	struct sja1105_cbs_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;port,      159, 157, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;prio,      156, 154, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;credit_lo, 153, 122, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;credit_hi, 121,  90, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_slope, 89,  58, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;idle_slope, 57,  26, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1110_cbs_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105PQRS_SIZE_CBS_ENTRY;</div><div class='add'>+	struct sja1105_cbs_entry *entry = entry_ptr;</div><div class='add'>+	u64 entry_type = SJA1110_CBS_SHAPER;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry_type,       159, 159, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;credit_lo, 151, 120, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;credit_hi, 119,  88, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_slope, 87,  56, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;idle_slope, 55,  24, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1110_dummy_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				      enum packing_op op)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+sja1110_l2_policing_cmd_packing(void *buf, struct sja1105_dyn_cmd *cmd,</div><div class='add'>+				enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	u8 *p = buf + SJA1105_SIZE_L2_POLICING_ENTRY;</div><div class='add'>+	const int size = SJA1105_SIZE_DYN_CMD;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;valid,   31, 31, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;rdwrset, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;errors,  29, 29, size, op);</div><div class='add'>+	sja1105_packing(p, &amp;cmd-&gt;index,    6,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define OP_READ		BIT(0)</div><div class='ctx'> #define OP_WRITE	BIT(1)</div><div class='ctx'> #define OP_DEL		BIT(2)</div><div class='add'>+#define OP_SEARCH	BIT(3)</div><div class='add'>+#define OP_VALID_ANYWAY	BIT(4)</div><div class='ctx'> </div><div class='ctx'> /* SJA1105E/T: First generation */</div><div class='del'>-struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1105et_vl_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_vl_lookup_cmd_packing,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_VL_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x35,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='del'>-		.entry_packing = sja1105et_l2_lookup_entry_packing,</div><div class='add'>+		.entry_packing = sja1105et_dyn_l2_lookup_entry_packing,</div><div class='ctx'> 		.cmd_packing = sja1105et_l2_lookup_cmd_packing,</div><div class='ctx'> 		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,</div><div class='hunk'>@@ -254,12 +899,11 @@ struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='ctx'> 	[BLK_IDX_MGMT_ROUTE] = {</div><div class='ctx'> 		.entry_packing = sja1105et_mgmt_route_entry_packing,</div><div class='ctx'> 		.cmd_packing = sja1105et_mgmt_route_cmd_packing,</div><div class='del'>-		.access = (OP_READ | OP_WRITE),</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='ctx'> 		.max_entry_count = SJA1105_NUM_PORTS,</div><div class='ctx'> 		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='ctx'> 		.addr = 0x20,</div><div class='ctx'> 	},</div><div class='del'>-	[BLK_IDX_L2_POLICING] = {0},</div><div class='ctx'> 	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='ctx'> 		.entry_packing = sja1105_vlan_lookup_entry_packing,</div><div class='ctx'> 		.cmd_packing = sja1105_vlan_lookup_cmd_packing,</div><div class='hunk'>@@ -292,7 +936,6 @@ struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='ctx'> 		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,</div><div class='ctx'> 		.addr = 0x38,</div><div class='ctx'> 	},</div><div class='del'>-	[BLK_IDX_L2_FORWARDING_PARAMS] = {0},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.entry_packing = sja1105et_general_params_entry_packing,</div><div class='ctx'> 		.cmd_packing = sja1105et_general_params_cmd_packing,</div><div class='hunk'>@@ -301,20 +944,50 @@ struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='ctx'> 		.packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD,</div><div class='ctx'> 		.addr = 0x34,</div><div class='ctx'> 	},</div><div class='del'>-	[BLK_IDX_XMII_PARAMS] = {0},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.entry_packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105_retagging_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+		.access = (OP_WRITE | OP_DEL),</div><div class='add'>+		.packed_size = SJA1105_SIZE_RETAGGING_DYN_CMD,</div><div class='add'>+		.addr = 0x31,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_CBS] = {</div><div class='add'>+		.entry_packing = sja1105et_cbs_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105et_cbs_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105ET_MAX_CBS_COUNT,</div><div class='add'>+		.access = OP_WRITE,</div><div class='add'>+		.packed_size = SJA1105ET_SIZE_CBS_DYN_CMD,</div><div class='add'>+		.addr = 0x2c,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* SJA1105P/Q/R/S: Second generation: TODO */</div><div class='del'>-struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+/* SJA1105P/Q/R/S: Second generation */</div><div class='add'>+const struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1105_vl_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_vl_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE),</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_VL_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x47,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='del'>-		.entry_packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='add'>+		.entry_packing = sja1105pqrs_dyn_l2_lookup_entry_packing,</div><div class='ctx'> 		.cmd_packing = sja1105pqrs_l2_lookup_cmd_packing,</div><div class='del'>-		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL | OP_SEARCH),</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,</div><div class='del'>-		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = 0x24,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MGMT_ROUTE] = {</div><div class='add'>+		.entry_packing = sja1105pqrs_mgmt_route_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_mgmt_route_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL | OP_SEARCH | OP_VALID_ANYWAY),</div><div class='add'>+		.max_entry_count = SJA1105_NUM_PORTS,</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='ctx'> 		.addr = 0x24,</div><div class='ctx'> 	},</div><div class='del'>-	[BLK_IDX_L2_POLICING] = {0},</div><div class='ctx'> 	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='ctx'> 		.entry_packing = sja1105_vlan_lookup_entry_packing,</div><div class='ctx'> 		.cmd_packing = sja1105_vlan_lookup_cmd_packing,</div><div class='hunk'>@@ -340,25 +1013,245 @@ struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='ctx'> 		.addr = 0x4B,</div><div class='ctx'> 	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='del'>-		.entry_packing = sja1105et_l2_lookup_params_entry_packing,</div><div class='del'>-		.cmd_packing = sja1105et_l2_lookup_params_cmd_packing,</div><div class='add'>+		.entry_packing = sja1105pqrs_l2_lookup_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_l2_lookup_params_cmd_packing,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT,</div><div class='ctx'> 		.access = (OP_READ | OP_WRITE),</div><div class='del'>-		.packed_size = SJA1105ET_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,</div><div class='del'>-		.addr = 0x38,</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x54,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_avb_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE),</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_AVB_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x8003,</div><div class='ctx'> 	},</div><div class='del'>-	[BLK_IDX_L2_FORWARDING_PARAMS] = {0},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='del'>-		.entry_packing = sja1105et_general_params_entry_packing,</div><div class='del'>-		.cmd_packing = sja1105et_general_params_cmd_packing,</div><div class='add'>+		.entry_packing = sja1105pqrs_general_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_general_params_cmd_packing,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE),</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = 0x3B,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.entry_packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105_retagging_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='add'>+		.packed_size = SJA1105_SIZE_RETAGGING_DYN_CMD,</div><div class='add'>+		.addr = 0x38,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_CBS] = {</div><div class='add'>+		.entry_packing = sja1105pqrs_cbs_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_cbs_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105PQRS_MAX_CBS_COUNT,</div><div class='ctx'> 		.access = OP_WRITE,</div><div class='del'>-		.packed_size = SJA1105ET_SIZE_GENERAL_PARAMS_DYN_CMD,</div><div class='del'>-		.addr = 0x34,</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_CBS_DYN_CMD,</div><div class='add'>+		.addr = 0x32,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* SJA1110: Third generation */</div><div class='add'>+const struct sja1105_dynamic_table_ops sja1110_dyn_ops[BLK_IDX_MAX_DYN] = {</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1110_vl_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_vl_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.max_entry_count = SJA1110_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_VL_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x124),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_POLICING] = {</div><div class='add'>+		.entry_packing = sja1110_vl_policing_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_vl_policing_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.max_entry_count = SJA1110_MAX_VL_POLICING_COUNT,</div><div class='add'>+		.packed_size = SJA1110_SIZE_VL_POLICING_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x310),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1110_dyn_l2_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_l2_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL | OP_SEARCH),</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1110_SIZE_L2_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x8c),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.entry_packing = sja1110_vlan_lookup_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_vlan_lookup_cmd_packing,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VLAN_LOOKUP_COUNT,</div><div class='add'>+		.packed_size = SJA1110_SIZE_VLAN_LOOKUP_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0xb4),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING] = {</div><div class='add'>+		.entry_packing = sja1110_l2_forwarding_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_l2_forwarding_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1105_SIZE_L2_FORWARDING_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0xa8),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.entry_packing = sja1110_mac_config_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_mac_config_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_MAC_CONFIG_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x134),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1110_l2_lookup_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_l2_lookup_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1110_SIZE_L2_LOOKUP_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x158),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1105pqrs_avb_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_AVB_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x2000C),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1110_general_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_general_params_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1110_SIZE_GENERAL_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0xe8),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.entry_packing = sja1110_retagging_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_retagging_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_DEL),</div><div class='add'>+		.packed_size = SJA1105_SIZE_RETAGGING_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0xdc),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_CBS] = {</div><div class='add'>+		.entry_packing = sja1110_cbs_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_cbs_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_CBS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1105PQRS_SIZE_CBS_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0xc4),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_XMII_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1110_xmii_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_dummy_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1110_SIZE_XMII_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x3c),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_POLICING] = {</div><div class='add'>+		.entry_packing = sja1110_l2_policing_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_l2_policing_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_L2_POLICING_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_WRITE | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1110_SIZE_L2_POLICING_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x2fc),</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING_PARAMS] = {</div><div class='add'>+		.entry_packing = sja1110_l2_forwarding_params_entry_packing,</div><div class='add'>+		.cmd_packing = sja1110_dummy_cmd_packing,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='add'>+		.access = (OP_READ | OP_VALID_ANYWAY),</div><div class='add'>+		.packed_size = SJA1110_SIZE_L2_FORWARDING_PARAMS_DYN_CMD,</div><div class='add'>+		.addr = SJA1110_SPI_ADDR(0x20000),</div><div class='ctx'> 	},</div><div class='del'>-	[BLK_IDX_XMII_PARAMS] = {0},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SJA1105_DYNAMIC_CONFIG_SLEEP_US		10</div><div class='add'>+#define SJA1105_DYNAMIC_CONFIG_TIMEOUT_US	100000</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sja1105_dynamic_config_poll_valid(struct sja1105_private *priv,</div><div class='add'>+				  const struct sja1105_dynamic_table_ops *ops,</div><div class='add'>+				  void *entry, bool check_valident,</div><div class='add'>+				  bool check_errors)</div><div class='add'>+{</div><div class='add'>+	u8 packed_buf[SJA1105_MAX_DYN_CMD_SIZE] = {};</div><div class='add'>+	struct sja1105_dyn_cmd cmd = {};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Read back the whole entry + command structure. */</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_READ, ops-&gt;addr, packed_buf,</div><div class='add'>+			      ops-&gt;packed_size);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Unpack the command structure, and return it to the caller in case it</div><div class='add'>+	 * needs to perform further checks on it (VALIDENT).</div><div class='add'>+	 */</div><div class='add'>+	ops-&gt;cmd_packing(packed_buf, &amp;cmd, UNPACK);</div><div class='add'>+</div><div class='add'>+	/* Hardware hasn't cleared VALID =&gt; still working on it */</div><div class='add'>+	if (cmd.valid)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	if (check_valident &amp;&amp; !cmd.valident &amp;&amp; !(ops-&gt;access &amp; OP_VALID_ANYWAY))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (check_errors &amp;&amp; cmd.errors)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Don't dereference possibly NULL pointer - maybe caller</div><div class='add'>+	 * only wanted to see whether the entry existed or not.</div><div class='add'>+	 */</div><div class='add'>+	if (entry)</div><div class='add'>+		ops-&gt;entry_packing(packed_buf, entry, UNPACK);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Poll the dynamic config entry's control area until the hardware has</div><div class='add'>+ * cleared the VALID bit, which means we have confirmation that it has</div><div class='add'>+ * finished processing the command.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+sja1105_dynamic_config_wait_complete(struct sja1105_private *priv,</div><div class='add'>+				     const struct sja1105_dynamic_table_ops *ops,</div><div class='add'>+				     void *entry, bool check_valident,</div><div class='add'>+				     bool check_errors)</div><div class='add'>+{</div><div class='add'>+	int err, rc;</div><div class='add'>+</div><div class='add'>+	err = read_poll_timeout(sja1105_dynamic_config_poll_valid,</div><div class='add'>+				rc, rc != -EAGAIN,</div><div class='add'>+				SJA1105_DYNAMIC_CONFIG_SLEEP_US,</div><div class='add'>+				SJA1105_DYNAMIC_CONFIG_TIMEOUT_US,</div><div class='add'>+				false, priv, ops, entry, check_valident,</div><div class='add'>+				check_errors);</div><div class='add'>+	return err &lt; 0 ? err : rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Provides read access to the settings through the dynamic interface</div><div class='add'>+ * of the switch.</div><div class='add'>+ * @blk_idx	is used as key to select from the sja1105_dynamic_table_ops.</div><div class='add'>+ *		The selection is limited by the hardware in respect to which</div><div class='add'>+ *		configuration blocks can be read through the dynamic interface.</div><div class='add'>+ * @index	is used to retrieve a particular table entry. If negative,</div><div class='add'>+ *		(and if the @blk_idx supports the searching operation) a search</div><div class='add'>+ *		is performed by the @entry parameter.</div><div class='add'>+ * @entry	Type-casted to an unpacked structure that holds a table entry</div><div class='add'>+ *		of the type specified in @blk_idx.</div><div class='add'>+ *		Usually an output argument. If @index is negative, then this</div><div class='add'>+ *		argument is used as input/output: it should be pre-populated</div><div class='add'>+ *		with the element to search for. Entries which support the</div><div class='add'>+ *		search operation will have an "index" field (not the @index</div><div class='add'>+ *		argument to this function) and that is where the found index</div><div class='add'>+ *		will be returned (or left unmodified - thus negative - if not</div><div class='add'>+ *		found).</div><div class='add'>+ */</div><div class='ctx'> int sja1105_dynamic_config_read(struct sja1105_private *priv,</div><div class='ctx'> 				enum sja1105_blk_idx blk_idx,</div><div class='ctx'> 				int index, void *entry)</div><div class='hunk'>@@ -367,7 +1260,6 @@ int sja1105_dynamic_config_read(struct sja1105_private *priv,</div><div class='ctx'> 	struct sja1105_dyn_cmd cmd = {0};</div><div class='ctx'> 	/* SPI payload buffer */</div><div class='ctx'> 	u8 packed_buf[SJA1105_MAX_DYN_CMD_SIZE] = {0};</div><div class='del'>-	int retries = 3;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (blk_idx &gt;= BLK_IDX_MAX_DYN)</div><div class='hunk'>@@ -375,8 +1267,10 @@ int sja1105_dynamic_config_read(struct sja1105_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	ops = &amp;priv-&gt;info-&gt;dyn_ops[blk_idx];</div><div class='ctx'> </div><div class='del'>-	if (index &gt;= ops-&gt;max_entry_count)</div><div class='add'>+	if (index &gt;= 0 &amp;&amp; index &gt;= ops-&gt;max_entry_count)</div><div class='ctx'> 		return -ERANGE;</div><div class='add'>+	if (index &lt; 0 &amp;&amp; !(ops-&gt;access &amp; OP_SEARCH))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	if (!(ops-&gt;access &amp; OP_READ))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (ops-&gt;packed_size &gt; SJA1105_MAX_DYN_CMD_SIZE)</div><div class='hunk'>@@ -388,47 +1282,32 @@ int sja1105_dynamic_config_read(struct sja1105_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	cmd.valid = true; /* Trigger action on table entry */</div><div class='ctx'> 	cmd.rdwrset = SPI_READ; /* Action is read */</div><div class='del'>-	cmd.index = index;</div><div class='add'>+	if (index &lt; 0) {</div><div class='add'>+		/* Avoid copying a signed negative number to an u64 */</div><div class='add'>+		cmd.index = 0;</div><div class='add'>+		cmd.search = true;</div><div class='add'>+	} else {</div><div class='add'>+		cmd.index = index;</div><div class='add'>+		cmd.search = false;</div><div class='add'>+	}</div><div class='add'>+	cmd.valident = true;</div><div class='ctx'> 	ops-&gt;cmd_packing(packed_buf, &amp;cmd, PACK);</div><div class='ctx'> </div><div class='add'>+	if (cmd.search)</div><div class='add'>+		ops-&gt;entry_packing(packed_buf, entry, PACK);</div><div class='add'>+</div><div class='ctx'> 	/* Send SPI write operation: read config table entry */</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, ops-&gt;addr,</div><div class='del'>-					 packed_buf, ops-&gt;packed_size);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;dynamic_config_lock);</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_WRITE, ops-&gt;addr, packed_buf,</div><div class='add'>+			      ops-&gt;packed_size);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	/* Loop until we have confirmation that hardware has finished</div><div class='del'>-	 * processing the command and has cleared the VALID field</div><div class='del'>-	 */</div><div class='del'>-	do {</div><div class='del'>-		memset(packed_buf, 0, ops-&gt;packed_size);</div><div class='del'>-</div><div class='del'>-		/* Retrieve the read operation's result */</div><div class='del'>-		rc = sja1105_spi_send_packed_buf(priv, SPI_READ, ops-&gt;addr,</div><div class='del'>-						 packed_buf, ops-&gt;packed_size);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			return rc;</div><div class='del'>-</div><div class='del'>-		cmd = (struct sja1105_dyn_cmd) {0};</div><div class='del'>-		ops-&gt;cmd_packing(packed_buf, &amp;cmd, UNPACK);</div><div class='del'>-		/* UM10944: [valident] will always be found cleared</div><div class='del'>-		 * during a read access with MGMTROUTE set.</div><div class='del'>-		 * So don't error out in that case.</div><div class='del'>-		 */</div><div class='del'>-		if (!cmd.valident &amp;&amp; blk_idx != BLK_IDX_MGMT_ROUTE)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		cpu_relax();</div><div class='del'>-	} while (cmd.valid &amp;&amp; --retries);</div><div class='add'>+	rc = sja1105_dynamic_config_wait_complete(priv, ops, entry, true, false);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;dynamic_config_lock);</div><div class='ctx'> </div><div class='del'>-	if (cmd.valid)</div><div class='del'>-		return -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	/* Don't dereference possibly NULL pointer - maybe caller</div><div class='del'>-	 * only wanted to see whether the entry existed or not.</div><div class='del'>-	 */</div><div class='del'>-	if (entry)</div><div class='del'>-		ops-&gt;entry_packing(packed_buf, entry, UNPACK);</div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sja1105_dynamic_config_write(struct sja1105_private *priv,</div><div class='hunk'>@@ -448,6 +1327,8 @@ int sja1105_dynamic_config_write(struct sja1105_private *priv,</div><div class='ctx'> </div><div class='ctx'> 	if (index &gt;= ops-&gt;max_entry_count)</div><div class='ctx'> 		return -ERANGE;</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> 	if (!(ops-&gt;access &amp; OP_WRITE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if (!keep &amp;&amp; !(ops-&gt;access &amp; OP_DEL))</div><div class='hunk'>@@ -475,17 +1356,17 @@ int sja1105_dynamic_config_write(struct sja1105_private *priv,</div><div class='ctx'> 		ops-&gt;entry_packing(packed_buf, entry, PACK);</div><div class='ctx'> </div><div class='ctx'> 	/* Send SPI write operation: read config table entry */</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_WRITE, ops-&gt;addr,</div><div class='del'>-					 packed_buf, ops-&gt;packed_size);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;dynamic_config_lock);</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_WRITE, ops-&gt;addr, packed_buf,</div><div class='add'>+			      ops-&gt;packed_size);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	cmd = (struct sja1105_dyn_cmd) {0};</div><div class='del'>-	ops-&gt;cmd_packing(packed_buf, &amp;cmd, UNPACK);</div><div class='del'>-	if (cmd.errors)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	rc = sja1105_dynamic_config_wait_complete(priv, ops, NULL, false, true);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;dynamic_config_lock);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 sja1105_crc8_add(u8 crc, u8 byte, u8 poly)</div><div class='hunk'>@@ -510,18 +1391,18 @@ static u8 sja1105_crc8_add(u8 crc, u8 byte, u8 poly)</div><div class='ctx'>  * is also received as argument in the Koopman notation that the switch</div><div class='ctx'>  * hardware stores it in.</div><div class='ctx'>  */</div><div class='del'>-u8 sja1105_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid)</div><div class='add'>+u8 sja1105et_fdb_hash(struct sja1105_private *priv, const u8 *addr, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_l2_lookup_params_entry *l2_lookup_params =</div><div class='ctx'> 		priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP_PARAMS].entries;</div><div class='del'>-	u64 poly_koopman = l2_lookup_params-&gt;poly;</div><div class='add'>+	u64 input, poly_koopman = l2_lookup_params-&gt;poly;</div><div class='ctx'> 	/* Convert polynomial from Koopman to 'normal' notation */</div><div class='ctx'> 	u8 poly = (u8)(1 + (poly_koopman &lt;&lt; 1));</div><div class='del'>-	u64 vlanid = l2_lookup_params-&gt;shared_learn ? 0 : vid;</div><div class='del'>-	u64 input = (vlanid &lt;&lt; 48) | ether_addr_to_u64(addr);</div><div class='ctx'> 	u8 crc = 0; /* seed */</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	input = ((u64)vid &lt;&lt; 48) | ether_addr_to_u64(addr);</div><div class='add'>+</div><div class='ctx'> 	/* Mask the eight bytes starting from MSB one at a time */</div><div class='ctx'> 	for (i = 56; i &gt;= 0; i -= 8) {</div><div class='ctx'> 		u8 byte = (input &amp; (0xffull &lt;&lt; i)) &gt;&gt; i;</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_dynamic_config.h b/drivers/net/dsa/sja1105/sja1105_dynamic_config.h<br/>index 77be59546a55..a1472f80a059 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_dynamic_config.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_dynamic_config.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_dynamic_config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_dynamic_config.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0</div><div class='del'>- * Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _SJA1105_DYNAMIC_CONFIG_H</div><div class='ctx'> #define _SJA1105_DYNAMIC_CONFIG_H</div><div class='hunk'>@@ -7,13 +7,10 @@</div><div class='ctx'> #include "sja1105.h"</div><div class='ctx'> #include &lt;linux/packing.h&gt;</div><div class='ctx'> </div><div class='del'>-struct sja1105_dyn_cmd {</div><div class='del'>-	u64 valid;</div><div class='del'>-	u64 rdwrset;</div><div class='del'>-	u64 errors;</div><div class='del'>-	u64 valident;</div><div class='del'>-	u64 index;</div><div class='del'>-};</div><div class='add'>+/* Special index that can be used for sja1105_dynamic_config_read */</div><div class='add'>+#define SJA1105_SEARCH		-1</div><div class='add'>+</div><div class='add'>+struct sja1105_dyn_cmd;</div><div class='ctx'> </div><div class='ctx'> struct sja1105_dynamic_table_ops {</div><div class='ctx'> 	/* This returns size_t just to keep same prototype as the</div><div class='hunk'>@@ -37,7 +34,8 @@ struct sja1105_mgmt_entry {</div><div class='ctx'> 	u64 index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='del'>-extern struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='add'>+extern const struct sja1105_dynamic_table_ops sja1105et_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='add'>+extern const struct sja1105_dynamic_table_ops sja1105pqrs_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='add'>+extern const struct sja1105_dynamic_table_ops sja1110_dyn_ops[BLK_IDX_MAX_DYN];</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c<br/>index ab581a28cd41..84d7d3f66bd0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_ethtool.c</a></div><div class='hunk'>@@ -3,417 +3,631 @@</div><div class='ctx'>  */</div><div class='ctx'> #include "sja1105.h"</div><div class='ctx'> </div><div class='del'>-#define SJA1105_SIZE_MAC_AREA		(0x02 * 4)</div><div class='del'>-#define SJA1105_SIZE_HL1_AREA		(0x10 * 4)</div><div class='del'>-#define SJA1105_SIZE_HL2_AREA		(0x4 * 4)</div><div class='del'>-#define SJA1105_SIZE_QLEVEL_AREA	(0x8 * 4) /* 0x4 to 0xB */</div><div class='del'>-</div><div class='del'>-struct sja1105_port_status_mac {</div><div class='del'>-	u64 n_runt;</div><div class='del'>-	u64 n_soferr;</div><div class='del'>-	u64 n_alignerr;</div><div class='del'>-	u64 n_miierr;</div><div class='del'>-	u64 typeerr;</div><div class='del'>-	u64 sizeerr;</div><div class='del'>-	u64 tctimeout;</div><div class='del'>-	u64 priorerr;</div><div class='del'>-	u64 nomaster;</div><div class='del'>-	u64 memov;</div><div class='del'>-	u64 memerr;</div><div class='del'>-	u64 invtyp;</div><div class='del'>-	u64 intcyov;</div><div class='del'>-	u64 domerr;</div><div class='del'>-	u64 pcfbagdrop;</div><div class='del'>-	u64 spcprior;</div><div class='del'>-	u64 ageprior;</div><div class='del'>-	u64 portdrop;</div><div class='del'>-	u64 lendrop;</div><div class='del'>-	u64 bagdrop;</div><div class='del'>-	u64 policeerr;</div><div class='del'>-	u64 drpnona664err;</div><div class='del'>-	u64 spcerr;</div><div class='del'>-	u64 agedrp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct sja1105_port_status_hl1 {</div><div class='del'>-	u64 n_n664err;</div><div class='del'>-	u64 n_vlanerr;</div><div class='del'>-	u64 n_unreleased;</div><div class='del'>-	u64 n_sizeerr;</div><div class='del'>-	u64 n_crcerr;</div><div class='del'>-	u64 n_vlnotfound;</div><div class='del'>-	u64 n_ctpolerr;</div><div class='del'>-	u64 n_polerr;</div><div class='del'>-	u64 n_rxfrmsh;</div><div class='del'>-	u64 n_rxfrm;</div><div class='del'>-	u64 n_rxbytesh;</div><div class='del'>-	u64 n_rxbyte;</div><div class='del'>-	u64 n_txfrmsh;</div><div class='del'>-	u64 n_txfrm;</div><div class='del'>-	u64 n_txbytesh;</div><div class='del'>-	u64 n_txbyte;</div><div class='add'>+enum sja1105_counter_index {</div><div class='add'>+	__SJA1105_COUNTER_UNUSED,</div><div class='add'>+	/* MAC */</div><div class='add'>+	N_RUNT,</div><div class='add'>+	N_SOFERR,</div><div class='add'>+	N_ALIGNERR,</div><div class='add'>+	N_MIIERR,</div><div class='add'>+	TYPEERR,</div><div class='add'>+	SIZEERR,</div><div class='add'>+	TCTIMEOUT,</div><div class='add'>+	PRIORERR,</div><div class='add'>+	NOMASTER,</div><div class='add'>+	MEMOV,</div><div class='add'>+	MEMERR,</div><div class='add'>+	INVTYP,</div><div class='add'>+	INTCYOV,</div><div class='add'>+	DOMERR,</div><div class='add'>+	PCFBAGDROP,</div><div class='add'>+	SPCPRIOR,</div><div class='add'>+	AGEPRIOR,</div><div class='add'>+	PORTDROP,</div><div class='add'>+	LENDROP,</div><div class='add'>+	BAGDROP,</div><div class='add'>+	POLICEERR,</div><div class='add'>+	DRPNONA664ERR,</div><div class='add'>+	SPCERR,</div><div class='add'>+	AGEDRP,</div><div class='add'>+	/* HL1 */</div><div class='add'>+	N_N664ERR,</div><div class='add'>+	N_VLANERR,</div><div class='add'>+	N_UNRELEASED,</div><div class='add'>+	N_SIZEERR,</div><div class='add'>+	N_CRCERR,</div><div class='add'>+	N_VLNOTFOUND,</div><div class='add'>+	N_CTPOLERR,</div><div class='add'>+	N_POLERR,</div><div class='add'>+	N_RXFRM,</div><div class='add'>+	N_RXBYTE,</div><div class='add'>+	N_TXFRM,</div><div class='add'>+	N_TXBYTE,</div><div class='add'>+	/* HL2 */</div><div class='add'>+	N_QFULL,</div><div class='add'>+	N_PART_DROP,</div><div class='add'>+	N_EGR_DISABLED,</div><div class='add'>+	N_NOT_REACH,</div><div class='add'>+	__MAX_SJA1105ET_PORT_COUNTER,</div><div class='add'>+	/* P/Q/R/S only */</div><div class='add'>+	/* ETHER */</div><div class='add'>+	N_DROPS_NOLEARN = __MAX_SJA1105ET_PORT_COUNTER,</div><div class='add'>+	N_DROPS_NOROUTE,</div><div class='add'>+	N_DROPS_ILL_DTAG,</div><div class='add'>+	N_DROPS_DTAG,</div><div class='add'>+	N_DROPS_SOTAG,</div><div class='add'>+	N_DROPS_SITAG,</div><div class='add'>+	N_DROPS_UTAG,</div><div class='add'>+	N_TX_BYTES_1024_2047,</div><div class='add'>+	N_TX_BYTES_512_1023,</div><div class='add'>+	N_TX_BYTES_256_511,</div><div class='add'>+	N_TX_BYTES_128_255,</div><div class='add'>+	N_TX_BYTES_65_127,</div><div class='add'>+	N_TX_BYTES_64,</div><div class='add'>+	N_TX_MCAST,</div><div class='add'>+	N_TX_BCAST,</div><div class='add'>+	N_RX_BYTES_1024_2047,</div><div class='add'>+	N_RX_BYTES_512_1023,</div><div class='add'>+	N_RX_BYTES_256_511,</div><div class='add'>+	N_RX_BYTES_128_255,</div><div class='add'>+	N_RX_BYTES_65_127,</div><div class='add'>+	N_RX_BYTES_64,</div><div class='add'>+	N_RX_MCAST,</div><div class='add'>+	N_RX_BCAST,</div><div class='add'>+	__MAX_SJA1105PQRS_PORT_COUNTER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sja1105_port_status_hl2 {</div><div class='del'>-	u64 n_qfull;</div><div class='del'>-	u64 n_part_drop;</div><div class='del'>-	u64 n_egr_disabled;</div><div class='del'>-	u64 n_not_reach;</div><div class='del'>-	u64 qlevel_hwm[8]; /* Only for P/Q/R/S */</div><div class='del'>-	u64 qlevel[8];     /* Only for P/Q/R/S */</div><div class='add'>+struct sja1105_port_counter {</div><div class='add'>+	enum sja1105_stats_area area;</div><div class='add'>+	const char name[ETH_GSTRING_LEN];</div><div class='add'>+	int offset;</div><div class='add'>+	int start;</div><div class='add'>+	int end;</div><div class='add'>+	bool is_64bit;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sja1105_port_status {</div><div class='del'>-	struct sja1105_port_status_mac mac;</div><div class='del'>-	struct sja1105_port_status_hl1 hl1;</div><div class='del'>-	struct sja1105_port_status_hl2 hl2;</div><div class='add'>+static const struct sja1105_port_counter sja1105_port_counters[] = {</div><div class='add'>+	/* MAC-Level Diagnostic Counters */</div><div class='add'>+	[N_RUNT] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "n_runt",</div><div class='add'>+		.offset = 0,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 24,</div><div class='add'>+	},</div><div class='add'>+	[N_SOFERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "n_soferr",</div><div class='add'>+		.offset = 0x0,</div><div class='add'>+		.start = 23,</div><div class='add'>+		.end = 16,</div><div class='add'>+	},</div><div class='add'>+	[N_ALIGNERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "n_alignerr",</div><div class='add'>+		.offset = 0x0,</div><div class='add'>+		.start = 15,</div><div class='add'>+		.end = 8,</div><div class='add'>+	},</div><div class='add'>+	[N_MIIERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "n_miierr",</div><div class='add'>+		.offset = 0x0,</div><div class='add'>+		.start = 7,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	/* MAC-Level Diagnostic Flags */</div><div class='add'>+	[TYPEERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "typeerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 27,</div><div class='add'>+		.end = 27,</div><div class='add'>+	},</div><div class='add'>+	[SIZEERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "sizeerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 26,</div><div class='add'>+		.end = 26,</div><div class='add'>+	},</div><div class='add'>+	[TCTIMEOUT] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "tctimeout",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 25,</div><div class='add'>+		.end = 25,</div><div class='add'>+	},</div><div class='add'>+	[PRIORERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "priorerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 24,</div><div class='add'>+		.end = 24,</div><div class='add'>+	},</div><div class='add'>+	[NOMASTER] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "nomaster",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 23,</div><div class='add'>+		.end = 23,</div><div class='add'>+	},</div><div class='add'>+	[MEMOV] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "memov",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 22,</div><div class='add'>+		.end = 22,</div><div class='add'>+	},</div><div class='add'>+	[MEMERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "memerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 21,</div><div class='add'>+		.end = 21,</div><div class='add'>+	},</div><div class='add'>+	[INVTYP] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "invtyp",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 19,</div><div class='add'>+		.end = 19,</div><div class='add'>+	},</div><div class='add'>+	[INTCYOV] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "intcyov",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 18,</div><div class='add'>+		.end = 18,</div><div class='add'>+	},</div><div class='add'>+	[DOMERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "domerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 17,</div><div class='add'>+		.end = 17,</div><div class='add'>+	},</div><div class='add'>+	[PCFBAGDROP] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "pcfbagdrop",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 16,</div><div class='add'>+		.end = 16,</div><div class='add'>+	},</div><div class='add'>+	[SPCPRIOR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "spcprior",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 15,</div><div class='add'>+		.end = 12,</div><div class='add'>+	},</div><div class='add'>+	[AGEPRIOR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "ageprior",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 11,</div><div class='add'>+		.end = 8,</div><div class='add'>+	},</div><div class='add'>+	[PORTDROP] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "portdrop",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 6,</div><div class='add'>+		.end = 6,</div><div class='add'>+	},</div><div class='add'>+	[LENDROP] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "lendrop",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 5,</div><div class='add'>+		.end = 5,</div><div class='add'>+	},</div><div class='add'>+	[BAGDROP] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "bagdrop",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 4,</div><div class='add'>+		.end = 4,</div><div class='add'>+	},</div><div class='add'>+	[POLICEERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "policeerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 3,</div><div class='add'>+		.end = 3,</div><div class='add'>+	},</div><div class='add'>+	[DRPNONA664ERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "drpnona664err",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 2,</div><div class='add'>+		.end = 2,</div><div class='add'>+	},</div><div class='add'>+	[SPCERR] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "spcerr",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 1,</div><div class='add'>+		.end = 1,</div><div class='add'>+	},</div><div class='add'>+	[AGEDRP] = {</div><div class='add'>+		.area = MAC,</div><div class='add'>+		.name = "agedrp",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 0,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	/* High-Level Diagnostic Counters */</div><div class='add'>+	[N_N664ERR] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_n664err",</div><div class='add'>+		.offset = 0xF,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_VLANERR] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_vlanerr",</div><div class='add'>+		.offset = 0xE,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_UNRELEASED] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_unreleased",</div><div class='add'>+		.offset = 0xD,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_SIZEERR] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_sizeerr",</div><div class='add'>+		.offset = 0xC,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_CRCERR] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_crcerr",</div><div class='add'>+		.offset = 0xB,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_VLNOTFOUND] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_vlnotfound",</div><div class='add'>+		.offset = 0xA,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_CTPOLERR] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_ctpolerr",</div><div class='add'>+		.offset = 0x9,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_POLERR] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_polerr",</div><div class='add'>+		.offset = 0x8,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RXFRM] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_rxfrm",</div><div class='add'>+		.offset = 0x6,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.is_64bit = true,</div><div class='add'>+	},</div><div class='add'>+	[N_RXBYTE] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_rxbyte",</div><div class='add'>+		.offset = 0x4,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.is_64bit = true,</div><div class='add'>+	},</div><div class='add'>+	[N_TXFRM] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_txfrm",</div><div class='add'>+		.offset = 0x2,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.is_64bit = true,</div><div class='add'>+	},</div><div class='add'>+	[N_TXBYTE] = {</div><div class='add'>+		.area = HL1,</div><div class='add'>+		.name = "n_txbyte",</div><div class='add'>+		.offset = 0x0,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+		.is_64bit = true,</div><div class='add'>+	},</div><div class='add'>+	[N_QFULL] = {</div><div class='add'>+		.area = HL2,</div><div class='add'>+		.name = "n_qfull",</div><div class='add'>+		.offset = 0x3,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_PART_DROP] = {</div><div class='add'>+		.area = HL2,</div><div class='add'>+		.name = "n_part_drop",</div><div class='add'>+		.offset = 0x2,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_EGR_DISABLED] = {</div><div class='add'>+		.area = HL2,</div><div class='add'>+		.name = "n_egr_disabled",</div><div class='add'>+		.offset = 0x1,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_NOT_REACH] = {</div><div class='add'>+		.area = HL2,</div><div class='add'>+		.name = "n_not_reach",</div><div class='add'>+		.offset = 0x0,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	/* Ether Stats */</div><div class='add'>+	[N_DROPS_NOLEARN] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_nolearn",</div><div class='add'>+		.offset = 0x16,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_DROPS_NOROUTE] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_noroute",</div><div class='add'>+		.offset = 0x15,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_DROPS_ILL_DTAG] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_ill_dtag",</div><div class='add'>+		.offset = 0x14,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_DROPS_DTAG] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_dtag",</div><div class='add'>+		.offset = 0x13,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_DROPS_SOTAG] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_sotag",</div><div class='add'>+		.offset = 0x12,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_DROPS_SITAG] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_sitag",</div><div class='add'>+		.offset = 0x11,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_DROPS_UTAG] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_drops_utag",</div><div class='add'>+		.offset = 0x10,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BYTES_1024_2047] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bytes_1024_2047",</div><div class='add'>+		.offset = 0x0F,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BYTES_512_1023] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bytes_512_1023",</div><div class='add'>+		.offset = 0x0E,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BYTES_256_511] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bytes_256_511",</div><div class='add'>+		.offset = 0x0D,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BYTES_128_255] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bytes_128_255",</div><div class='add'>+		.offset = 0x0C,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BYTES_65_127] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bytes_65_127",</div><div class='add'>+		.offset = 0x0B,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BYTES_64] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bytes_64",</div><div class='add'>+		.offset = 0x0A,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_MCAST] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_mcast",</div><div class='add'>+		.offset = 0x09,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_TX_BCAST] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_tx_bcast",</div><div class='add'>+		.offset = 0x08,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BYTES_1024_2047] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bytes_1024_2047",</div><div class='add'>+		.offset = 0x07,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BYTES_512_1023] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bytes_512_1023",</div><div class='add'>+		.offset = 0x06,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BYTES_256_511] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bytes_256_511",</div><div class='add'>+		.offset = 0x05,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BYTES_128_255] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bytes_128_255",</div><div class='add'>+		.offset = 0x04,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BYTES_65_127] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bytes_65_127",</div><div class='add'>+		.offset = 0x03,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BYTES_64] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bytes_64",</div><div class='add'>+		.offset = 0x02,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_MCAST] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_mcast",</div><div class='add'>+		.offset = 0x01,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='add'>+	[N_RX_BCAST] = {</div><div class='add'>+		.area = ETHER,</div><div class='add'>+		.name = "n_rx_bcast",</div><div class='add'>+		.offset = 0x00,</div><div class='add'>+		.start = 31,</div><div class='add'>+		.end = 0,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-sja1105_port_status_mac_unpack(void *buf,</div><div class='del'>-			       struct sja1105_port_status_mac *status)</div><div class='add'>+static int sja1105_port_counter_read(struct sja1105_private *priv, int port,</div><div class='add'>+				     enum sja1105_counter_index idx, u64 *ctr)</div><div class='ctx'> {</div><div class='del'>-	/* Make pointer arithmetic work on 4 bytes */</div><div class='del'>-	u32 *p = buf;</div><div class='del'>-</div><div class='del'>-	sja1105_unpack(p + 0x0, &amp;status-&gt;n_runt,       31, 24, 4);</div><div class='del'>-	sja1105_unpack(p + 0x0, &amp;status-&gt;n_soferr,     23, 16, 4);</div><div class='del'>-	sja1105_unpack(p + 0x0, &amp;status-&gt;n_alignerr,   15,  8, 4);</div><div class='del'>-	sja1105_unpack(p + 0x0, &amp;status-&gt;n_miierr,      7,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;typeerr,      27, 27, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;sizeerr,      26, 26, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;tctimeout,    25, 25, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;priorerr,     24, 24, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;nomaster,     23, 23, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;memov,        22, 22, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;memerr,       21, 21, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;invtyp,       19, 19, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;intcyov,      18, 18, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;domerr,       17, 17, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;pcfbagdrop,   16, 16, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;spcprior,     15, 12, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;ageprior,     11,  8, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;portdrop,      6,  6, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;lendrop,       5,  5, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;bagdrop,       4,  4, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;policeerr,     3,  3, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;drpnona664err, 2,  2, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;spcerr,        1,  1, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;agedrp,        0,  0, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sja1105_port_status_hl1_unpack(void *buf,</div><div class='del'>-			       struct sja1105_port_status_hl1 *status)</div><div class='del'>-{</div><div class='del'>-	/* Make pointer arithmetic work on 4 bytes */</div><div class='del'>-	u32 *p = buf;</div><div class='del'>-</div><div class='del'>-	sja1105_unpack(p + 0xF, &amp;status-&gt;n_n664err,    31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0xE, &amp;status-&gt;n_vlanerr,    31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0xD, &amp;status-&gt;n_unreleased, 31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0xC, &amp;status-&gt;n_sizeerr,    31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0xB, &amp;status-&gt;n_crcerr,     31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0xA, &amp;status-&gt;n_vlnotfound, 31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x9, &amp;status-&gt;n_ctpolerr,   31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x8, &amp;status-&gt;n_polerr,     31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x7, &amp;status-&gt;n_rxfrmsh,    31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x6, &amp;status-&gt;n_rxfrm,      31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x5, &amp;status-&gt;n_rxbytesh,   31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x4, &amp;status-&gt;n_rxbyte,     31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x3, &amp;status-&gt;n_txfrmsh,    31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x2, &amp;status-&gt;n_txfrm,      31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;n_txbytesh,   31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x0, &amp;status-&gt;n_txbyte,     31,  0, 4);</div><div class='del'>-	status-&gt;n_rxfrm  += status-&gt;n_rxfrmsh  &lt;&lt; 32;</div><div class='del'>-	status-&gt;n_rxbyte += status-&gt;n_rxbytesh &lt;&lt; 32;</div><div class='del'>-	status-&gt;n_txfrm  += status-&gt;n_txfrmsh  &lt;&lt; 32;</div><div class='del'>-	status-&gt;n_txbyte += status-&gt;n_txbytesh &lt;&lt; 32;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sja1105_port_status_hl2_unpack(void *buf,</div><div class='del'>-			       struct sja1105_port_status_hl2 *status)</div><div class='del'>-{</div><div class='del'>-	/* Make pointer arithmetic work on 4 bytes */</div><div class='del'>-	u32 *p = buf;</div><div class='del'>-</div><div class='del'>-	sja1105_unpack(p + 0x3, &amp;status-&gt;n_qfull,        31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x2, &amp;status-&gt;n_part_drop,    31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x1, &amp;status-&gt;n_egr_disabled, 31,  0, 4);</div><div class='del'>-	sja1105_unpack(p + 0x0, &amp;status-&gt;n_not_reach,    31,  0, 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sja1105pqrs_port_status_qlevel_unpack(void *buf,</div><div class='del'>-				      struct sja1105_port_status_hl2 *status)</div><div class='del'>-{</div><div class='del'>-	/* Make pointer arithmetic work on 4 bytes */</div><div class='del'>-	u32 *p = buf;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		sja1105_unpack(p + i, &amp;status-&gt;qlevel_hwm[i], 24, 16, 4);</div><div class='del'>-		sja1105_unpack(p + i, &amp;status-&gt;qlevel[i],      8,  0, 4);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sja1105_port_status_get_mac(struct sja1105_private *priv,</div><div class='del'>-				       struct sja1105_port_status_mac *status,</div><div class='del'>-				       int port)</div><div class='del'>-{</div><div class='del'>-	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	u8 packed_buf[SJA1105_SIZE_MAC_AREA] = {0};</div><div class='add'>+	const struct sja1105_port_counter *c = &amp;sja1105_port_counters[idx];</div><div class='add'>+	size_t size = c-&gt;is_64bit ? 8 : 4;</div><div class='add'>+	u8 buf[8] = {0};</div><div class='add'>+	u64 regs;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	/* MAC area */</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;mac[port],</div><div class='del'>-					 packed_buf, SJA1105_SIZE_MAC_AREA);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	sja1105_port_status_mac_unpack(packed_buf, status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sja1105_port_status_get_hl1(struct sja1105_private *priv,</div><div class='del'>-				       struct sja1105_port_status_hl1 *status,</div><div class='del'>-				       int port)</div><div class='del'>-{</div><div class='del'>-	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	u8 packed_buf[SJA1105_SIZE_HL1_AREA] = {0};</div><div class='del'>-	int rc;</div><div class='add'>+	regs = priv-&gt;info-&gt;regs-&gt;stats[c-&gt;area][port];</div><div class='ctx'> </div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;mac_hl1[port],</div><div class='del'>-					 packed_buf, SJA1105_SIZE_HL1_AREA);</div><div class='del'>-	if (rc &lt; 0)</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_READ, regs + c-&gt;offset, buf, size);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	sja1105_port_status_hl1_unpack(packed_buf, status);</div><div class='add'>+	sja1105_unpack(buf, ctr, c-&gt;start, c-&gt;end, size);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_port_status_get_hl2(struct sja1105_private *priv,</div><div class='del'>-				       struct sja1105_port_status_hl2 *status,</div><div class='del'>-				       int port)</div><div class='add'>+void sja1105_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data)</div><div class='ctx'> {</div><div class='del'>-	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	u8 packed_buf[SJA1105_SIZE_QLEVEL_AREA] = {0};</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;mac_hl2[port],</div><div class='del'>-					 packed_buf, SJA1105_SIZE_HL2_AREA);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	sja1105_port_status_hl2_unpack(packed_buf, status);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	enum sja1105_counter_index max_ctr, i;</div><div class='add'>+	int rc, k = 0;</div><div class='ctx'> </div><div class='del'>-	/* Code below is strictly P/Q/R/S specific. */</div><div class='ctx'> 	if (priv-&gt;info-&gt;device_id == SJA1105E_DEVICE_ID ||</div><div class='ctx'> 	    priv-&gt;info-&gt;device_id == SJA1105T_DEVICE_ID)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;qlevel[port],</div><div class='del'>-					 packed_buf, SJA1105_SIZE_QLEVEL_AREA);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	sja1105pqrs_port_status_qlevel_unpack(packed_buf, status);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sja1105_port_status_get(struct sja1105_private *priv,</div><div class='del'>-				   struct sja1105_port_status *status,</div><div class='del'>-				   int port)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = sja1105_port_status_get_mac(priv, &amp;status-&gt;mac, port);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-	rc = sja1105_port_status_get_hl1(priv, &amp;status-&gt;hl1, port);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-	rc = sja1105_port_status_get_hl2(priv, &amp;status-&gt;hl2, port);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+		max_ctr = __MAX_SJA1105ET_PORT_COUNTER;</div><div class='add'>+	else</div><div class='add'>+		max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_ctr; i++) {</div><div class='add'>+		if (!strlen(sja1105_port_counters[i].name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_port_counter_read(priv, port, i, &amp;data[k++]);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Failed to read port %d counters: %d\n",</div><div class='add'>+				port, rc);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char sja1105_port_stats[][ETH_GSTRING_LEN] = {</div><div class='del'>-	/* MAC-Level Diagnostic Counters */</div><div class='del'>-	"n_runt",</div><div class='del'>-	"n_soferr",</div><div class='del'>-	"n_alignerr",</div><div class='del'>-	"n_miierr",</div><div class='del'>-	/* MAC-Level Diagnostic Flags */</div><div class='del'>-	"typeerr",</div><div class='del'>-	"sizeerr",</div><div class='del'>-	"tctimeout",</div><div class='del'>-	"priorerr",</div><div class='del'>-	"nomaster",</div><div class='del'>-	"memov",</div><div class='del'>-	"memerr",</div><div class='del'>-	"invtyp",</div><div class='del'>-	"intcyov",</div><div class='del'>-	"domerr",</div><div class='del'>-	"pcfbagdrop",</div><div class='del'>-	"spcprior",</div><div class='del'>-	"ageprior",</div><div class='del'>-	"portdrop",</div><div class='del'>-	"lendrop",</div><div class='del'>-	"bagdrop",</div><div class='del'>-	"policeerr",</div><div class='del'>-	"drpnona664err",</div><div class='del'>-	"spcerr",</div><div class='del'>-	"agedrp",</div><div class='del'>-	/* High-Level Diagnostic Counters */</div><div class='del'>-	"n_n664err",</div><div class='del'>-	"n_vlanerr",</div><div class='del'>-	"n_unreleased",</div><div class='del'>-	"n_sizeerr",</div><div class='del'>-	"n_crcerr",</div><div class='del'>-	"n_vlnotfound",</div><div class='del'>-	"n_ctpolerr",</div><div class='del'>-	"n_polerr",</div><div class='del'>-	"n_rxfrm",</div><div class='del'>-	"n_rxbyte",</div><div class='del'>-	"n_txfrm",</div><div class='del'>-	"n_txbyte",</div><div class='del'>-	"n_qfull",</div><div class='del'>-	"n_part_drop",</div><div class='del'>-	"n_egr_disabled",</div><div class='del'>-	"n_not_reach",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char sja1105pqrs_extra_port_stats[][ETH_GSTRING_LEN] = {</div><div class='del'>-	/* Queue Levels */</div><div class='del'>-	"qlevel_hwm_0",</div><div class='del'>-	"qlevel_hwm_1",</div><div class='del'>-	"qlevel_hwm_2",</div><div class='del'>-	"qlevel_hwm_3",</div><div class='del'>-	"qlevel_hwm_4",</div><div class='del'>-	"qlevel_hwm_5",</div><div class='del'>-	"qlevel_hwm_6",</div><div class='del'>-	"qlevel_hwm_7",</div><div class='del'>-	"qlevel_0",</div><div class='del'>-	"qlevel_1",</div><div class='del'>-	"qlevel_2",</div><div class='del'>-	"qlevel_3",</div><div class='del'>-	"qlevel_4",</div><div class='del'>-	"qlevel_5",</div><div class='del'>-	"qlevel_6",</div><div class='del'>-	"qlevel_7",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void sja1105_get_ethtool_stats(struct dsa_switch *ds, int port, u64 *data)</div><div class='add'>+void sja1105_get_strings(struct dsa_switch *ds, int port,</div><div class='add'>+			 u32 stringset, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	struct sja1105_port_status status;</div><div class='del'>-	int rc, i, k = 0;</div><div class='add'>+	enum sja1105_counter_index max_ctr, i;</div><div class='ctx'> </div><div class='del'>-	memset(&amp;status, 0, sizeof(status));</div><div class='del'>-</div><div class='del'>-	rc = sja1105_port_status_get(priv, &amp;status, port);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(ds-&gt;dev, "Failed to read port %d counters: %d\n",</div><div class='del'>-			port, rc);</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='del'>-	memset(data, 0, ARRAY_SIZE(sja1105_port_stats) * sizeof(u64));</div><div class='del'>-	data[k++] = status.mac.n_runt;</div><div class='del'>-	data[k++] = status.mac.n_soferr;</div><div class='del'>-	data[k++] = status.mac.n_alignerr;</div><div class='del'>-	data[k++] = status.mac.n_miierr;</div><div class='del'>-	data[k++] = status.mac.typeerr;</div><div class='del'>-	data[k++] = status.mac.sizeerr;</div><div class='del'>-	data[k++] = status.mac.tctimeout;</div><div class='del'>-	data[k++] = status.mac.priorerr;</div><div class='del'>-	data[k++] = status.mac.nomaster;</div><div class='del'>-	data[k++] = status.mac.memov;</div><div class='del'>-	data[k++] = status.mac.memerr;</div><div class='del'>-	data[k++] = status.mac.invtyp;</div><div class='del'>-	data[k++] = status.mac.intcyov;</div><div class='del'>-	data[k++] = status.mac.domerr;</div><div class='del'>-	data[k++] = status.mac.pcfbagdrop;</div><div class='del'>-	data[k++] = status.mac.spcprior;</div><div class='del'>-	data[k++] = status.mac.ageprior;</div><div class='del'>-	data[k++] = status.mac.portdrop;</div><div class='del'>-	data[k++] = status.mac.lendrop;</div><div class='del'>-	data[k++] = status.mac.bagdrop;</div><div class='del'>-	data[k++] = status.mac.policeerr;</div><div class='del'>-	data[k++] = status.mac.drpnona664err;</div><div class='del'>-	data[k++] = status.mac.spcerr;</div><div class='del'>-	data[k++] = status.mac.agedrp;</div><div class='del'>-	data[k++] = status.hl1.n_n664err;</div><div class='del'>-	data[k++] = status.hl1.n_vlanerr;</div><div class='del'>-	data[k++] = status.hl1.n_unreleased;</div><div class='del'>-	data[k++] = status.hl1.n_sizeerr;</div><div class='del'>-	data[k++] = status.hl1.n_crcerr;</div><div class='del'>-	data[k++] = status.hl1.n_vlnotfound;</div><div class='del'>-	data[k++] = status.hl1.n_ctpolerr;</div><div class='del'>-	data[k++] = status.hl1.n_polerr;</div><div class='del'>-	data[k++] = status.hl1.n_rxfrm;</div><div class='del'>-	data[k++] = status.hl1.n_rxbyte;</div><div class='del'>-	data[k++] = status.hl1.n_txfrm;</div><div class='del'>-	data[k++] = status.hl1.n_txbyte;</div><div class='del'>-	data[k++] = status.hl2.n_qfull;</div><div class='del'>-	data[k++] = status.hl2.n_part_drop;</div><div class='del'>-	data[k++] = status.hl2.n_egr_disabled;</div><div class='del'>-	data[k++] = status.hl2.n_not_reach;</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;info-&gt;device_id == SJA1105E_DEVICE_ID ||</div><div class='ctx'> 	    priv-&gt;info-&gt;device_id == SJA1105T_DEVICE_ID)</div><div class='del'>-		return;</div><div class='add'>+		max_ctr = __MAX_SJA1105ET_PORT_COUNTER;</div><div class='add'>+	else</div><div class='add'>+		max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER;</div><div class='ctx'> </div><div class='del'>-	memset(data + k, 0, ARRAY_SIZE(sja1105pqrs_extra_port_stats) *</div><div class='del'>-			sizeof(u64));</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		data[k++] = status.hl2.qlevel_hwm[i];</div><div class='del'>-		data[k++] = status.hl2.qlevel[i];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void sja1105_get_strings(struct dsa_switch *ds, int port,</div><div class='del'>-			 u32 stringset, u8 *data)</div><div class='del'>-{</div><div class='del'>-	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	u8 *p = data;</div><div class='del'>-	int i;</div><div class='add'>+	for (i = 0; i &lt; max_ctr; i++) {</div><div class='add'>+		if (!strlen(sja1105_port_counters[i].name))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	switch (stringset) {</div><div class='del'>-	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(sja1105_port_stats); i++) {</div><div class='del'>-			strlcpy(p, sja1105_port_stats[i], ETH_GSTRING_LEN);</div><div class='del'>-			p += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		if (priv-&gt;info-&gt;device_id == SJA1105E_DEVICE_ID ||</div><div class='del'>-		    priv-&gt;info-&gt;device_id == SJA1105T_DEVICE_ID)</div><div class='del'>-			return;</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(sja1105pqrs_extra_port_stats); i++) {</div><div class='del'>-			strlcpy(p, sja1105pqrs_extra_port_stats[i],</div><div class='del'>-				ETH_GSTRING_LEN);</div><div class='del'>-			p += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='add'>+		ethtool_puts(&amp;data, sja1105_port_counters[i].name);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='ctx'> {</div><div class='del'>-	int count = ARRAY_SIZE(sja1105_port_stats);</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	enum sja1105_counter_index max_ctr, i;</div><div class='add'>+	int sset_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (sset != ETH_SS_STATS)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;info-&gt;device_id == SJA1105PR_DEVICE_ID ||</div><div class='del'>-	    priv-&gt;info-&gt;device_id == SJA1105QS_DEVICE_ID)</div><div class='del'>-		count += ARRAY_SIZE(sja1105pqrs_extra_port_stats);</div><div class='add'>+	if (priv-&gt;info-&gt;device_id == SJA1105E_DEVICE_ID ||</div><div class='add'>+	    priv-&gt;info-&gt;device_id == SJA1105T_DEVICE_ID)</div><div class='add'>+		max_ctr = __MAX_SJA1105ET_PORT_COUNTER;</div><div class='add'>+	else</div><div class='add'>+		max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_ctr; i++) {</div><div class='add'>+		if (!strlen(sja1105_port_counters[i].name))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		sset_count++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	return sset_count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c<br/>new file mode 100644<br/>index 000000000000..05d8ed3121e7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_flower.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_flower.c</a></div><div class='hunk'>@@ -0,0 +1,545 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2020 NXP</div><div class='add'>+ */</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+#include "sja1105_vl.h"</div><div class='add'>+</div><div class='add'>+struct sja1105_rule *sja1105_rule_find(struct sja1105_private *priv,</div><div class='add'>+				       unsigned long cookie)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_rule *rule;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;flow_block.rules, list)</div><div class='add'>+		if (rule-&gt;cookie == cookie)</div><div class='add'>+			return rule;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_find_free_l2_policer(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_NUM_L2_POLICERS; i++)</div><div class='add'>+		if (!priv-&gt;flow_block.l2_policer_used[i])</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_setup_bcast_policer(struct sja1105_private *priv,</div><div class='add'>+				       struct netlink_ext_ack *extack,</div><div class='add'>+				       unsigned long cookie, int port,</div><div class='add'>+				       u64 rate_bytes_per_sec,</div><div class='add'>+				       u32 burst)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	bool new_rule = false;</div><div class='add'>+	unsigned long p;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!rule) {</div><div class='add'>+		rule = kzalloc(sizeof(*rule), GFP_KERNEL);</div><div class='add'>+		if (!rule)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		rule-&gt;cookie = cookie;</div><div class='add'>+		rule-&gt;type = SJA1105_RULE_BCAST_POLICER;</div><div class='add'>+		rule-&gt;bcast_pol.sharindx = sja1105_find_free_l2_policer(priv);</div><div class='add'>+		rule-&gt;key.type = SJA1105_KEY_BCAST;</div><div class='add'>+		new_rule = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;bcast_pol.sharindx == -1) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "No more L2 policers free");</div><div class='add'>+		rc = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	policing = priv-&gt;static_config.tables[BLK_IDX_L2_POLICING].entries;</div><div class='add'>+</div><div class='add'>+	if (policing[(ds-&gt;num_ports * SJA1105_NUM_TC) + port].sharindx != port) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Port already has a broadcast policer");</div><div class='add'>+		rc = -EEXIST;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule-&gt;port_mask |= BIT(port);</div><div class='add'>+</div><div class='add'>+	/* Make the broadcast policers of all ports attached to this block</div><div class='add'>+	 * point to the newly allocated policer</div><div class='add'>+	 */</div><div class='add'>+	for_each_set_bit(p, &amp;rule-&gt;port_mask, SJA1105_MAX_NUM_PORTS) {</div><div class='add'>+		int bcast = (ds-&gt;num_ports * SJA1105_NUM_TC) + p;</div><div class='add'>+</div><div class='add'>+		policing[bcast].sharindx = rule-&gt;bcast_pol.sharindx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	policing[rule-&gt;bcast_pol.sharindx].rate = div_u64(rate_bytes_per_sec *</div><div class='add'>+							  512, 1000000);</div><div class='add'>+	policing[rule-&gt;bcast_pol.sharindx].smax = burst;</div><div class='add'>+</div><div class='add'>+	/* TODO: support per-flow MTU */</div><div class='add'>+	policing[rule-&gt;bcast_pol.sharindx].maxlen = VLAN_ETH_FRAME_LEN +</div><div class='add'>+						    ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (rc == 0 &amp;&amp; new_rule) {</div><div class='add'>+		priv-&gt;flow_block.l2_policer_used[rule-&gt;bcast_pol.sharindx] = true;</div><div class='add'>+		list_add(&amp;rule-&gt;list, &amp;priv-&gt;flow_block.rules);</div><div class='add'>+	} else if (new_rule) {</div><div class='add'>+		kfree(rule);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_setup_tc_policer(struct sja1105_private *priv,</div><div class='add'>+				    struct netlink_ext_ack *extack,</div><div class='add'>+				    unsigned long cookie, int port, int tc,</div><div class='add'>+				    u64 rate_bytes_per_sec,</div><div class='add'>+				    u32 burst)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	bool new_rule = false;</div><div class='add'>+	unsigned long p;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!rule) {</div><div class='add'>+		rule = kzalloc(sizeof(*rule), GFP_KERNEL);</div><div class='add'>+		if (!rule)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		rule-&gt;cookie = cookie;</div><div class='add'>+		rule-&gt;type = SJA1105_RULE_TC_POLICER;</div><div class='add'>+		rule-&gt;tc_pol.sharindx = sja1105_find_free_l2_policer(priv);</div><div class='add'>+		rule-&gt;key.type = SJA1105_KEY_TC;</div><div class='add'>+		rule-&gt;key.tc.pcp = tc;</div><div class='add'>+		new_rule = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;tc_pol.sharindx == -1) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "No more L2 policers free");</div><div class='add'>+		rc = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	policing = priv-&gt;static_config.tables[BLK_IDX_L2_POLICING].entries;</div><div class='add'>+</div><div class='add'>+	if (policing[(port * SJA1105_NUM_TC) + tc].sharindx != port) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Port-TC pair already has an L2 policer");</div><div class='add'>+		rc = -EEXIST;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule-&gt;port_mask |= BIT(port);</div><div class='add'>+</div><div class='add'>+	/* Make the policers for traffic class @tc of all ports attached to</div><div class='add'>+	 * this block point to the newly allocated policer</div><div class='add'>+	 */</div><div class='add'>+	for_each_set_bit(p, &amp;rule-&gt;port_mask, SJA1105_MAX_NUM_PORTS) {</div><div class='add'>+		int index = (p * SJA1105_NUM_TC) + tc;</div><div class='add'>+</div><div class='add'>+		policing[index].sharindx = rule-&gt;tc_pol.sharindx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	policing[rule-&gt;tc_pol.sharindx].rate = div_u64(rate_bytes_per_sec *</div><div class='add'>+						       512, 1000000);</div><div class='add'>+	policing[rule-&gt;tc_pol.sharindx].smax = burst;</div><div class='add'>+</div><div class='add'>+	/* TODO: support per-flow MTU */</div><div class='add'>+	policing[rule-&gt;tc_pol.sharindx].maxlen = VLAN_ETH_FRAME_LEN +</div><div class='add'>+						 ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (rc == 0 &amp;&amp; new_rule) {</div><div class='add'>+		priv-&gt;flow_block.l2_policer_used[rule-&gt;tc_pol.sharindx] = true;</div><div class='add'>+		list_add(&amp;rule-&gt;list, &amp;priv-&gt;flow_block.rules);</div><div class='add'>+	} else if (new_rule) {</div><div class='add'>+		kfree(rule);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_flower_policer(struct sja1105_private *priv, int port,</div><div class='add'>+				  struct netlink_ext_ack *extack,</div><div class='add'>+				  unsigned long cookie,</div><div class='add'>+				  struct sja1105_key *key,</div><div class='add'>+				  u64 rate_bytes_per_sec,</div><div class='add'>+				  u32 burst)</div><div class='add'>+{</div><div class='add'>+	switch (key-&gt;type) {</div><div class='add'>+	case SJA1105_KEY_BCAST:</div><div class='add'>+		return sja1105_setup_bcast_policer(priv, extack, cookie, port,</div><div class='add'>+						   rate_bytes_per_sec, burst);</div><div class='add'>+	case SJA1105_KEY_TC:</div><div class='add'>+		return sja1105_setup_tc_policer(priv, extack, cookie, port,</div><div class='add'>+						key-&gt;tc.pcp, rate_bytes_per_sec,</div><div class='add'>+						burst);</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unknown keys for policing");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_flower_parse_key(struct sja1105_private *priv,</div><div class='add'>+				    struct netlink_ext_ack *extack,</div><div class='add'>+				    struct flow_cls_offload *cls,</div><div class='add'>+				    struct sja1105_key *key)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='add'>+	bool is_bcast_dmac = false;</div><div class='add'>+	u64 dmac = U64_MAX;</div><div class='add'>+	u16 vid = U16_MAX;</div><div class='add'>+	u16 pcp = U16_MAX;</div><div class='add'>+</div><div class='add'>+	if (dissector-&gt;used_keys &amp;</div><div class='add'>+	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Unsupported keys used");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_has_control_flags(rule, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='add'>+		struct flow_match_basic match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_basic(rule, &amp;match);</div><div class='add'>+		if (match.key-&gt;n_proto) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Matching on protocol not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='add'>+		u8 bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='add'>+		u8 null[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='add'>+		struct flow_match_eth_addrs match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_eth_addrs(rule, &amp;match);</div><div class='add'>+</div><div class='add'>+		if (!ether_addr_equal_masked(match.key-&gt;src, null,</div><div class='add'>+					     match.mask-&gt;src)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Matching on source MAC not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!ether_addr_equal(match.mask-&gt;dst, bcast)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Masked matching on MAC not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dmac = ether_addr_to_u64(match.key-&gt;dst);</div><div class='add'>+		is_bcast_dmac = ether_addr_equal(match.key-&gt;dst, bcast);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {</div><div class='add'>+		struct flow_match_vlan match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_vlan(rule, &amp;match);</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;vlan_id &amp;&amp;</div><div class='add'>+		    match.mask-&gt;vlan_id != VLAN_VID_MASK) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Masked matching on VID is not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;vlan_priority &amp;&amp;</div><div class='add'>+		    match.mask-&gt;vlan_priority != 0x7) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Masked matching on PCP is not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;vlan_id)</div><div class='add'>+			vid = match.key-&gt;vlan_id;</div><div class='add'>+		if (match.mask-&gt;vlan_priority)</div><div class='add'>+			pcp = match.key-&gt;vlan_priority;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_bcast_dmac &amp;&amp; vid == U16_MAX &amp;&amp; pcp == U16_MAX) {</div><div class='add'>+		key-&gt;type = SJA1105_KEY_BCAST;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (dmac == U64_MAX &amp;&amp; vid == U16_MAX &amp;&amp; pcp != U16_MAX) {</div><div class='add'>+		key-&gt;type = SJA1105_KEY_TC;</div><div class='add'>+		key-&gt;tc.pcp = pcp;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (dmac != U64_MAX &amp;&amp; vid != U16_MAX &amp;&amp; pcp != U16_MAX) {</div><div class='add'>+		key-&gt;type = SJA1105_KEY_VLAN_AWARE_VL;</div><div class='add'>+		key-&gt;vl.dmac = dmac;</div><div class='add'>+		key-&gt;vl.vid = vid;</div><div class='add'>+		key-&gt;vl.pcp = pcp;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (dmac != U64_MAX) {</div><div class='add'>+		key-&gt;type = SJA1105_KEY_VLAN_UNAWARE_VL;</div><div class='add'>+		key-&gt;vl.dmac = dmac;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Not matching on any known key");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_policer_validate(const struct flow_action *action,</div><div class='add'>+				    const struct flow_action_entry *act,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (act-&gt;police.exceed.act_id != FLOW_ACTION_DROP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when exceed action is not drop");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.notexceed.act_id != FLOW_ACTION_PIPE &amp;&amp;</div><div class='add'>+	    act-&gt;police.notexceed.act_id != FLOW_ACTION_ACCEPT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when conform action is not pipe or ok");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.notexceed.act_id == FLOW_ACTION_ACCEPT &amp;&amp;</div><div class='add'>+	    !flow_action_is_last_entry(action, act)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when conform action is ok, but action is not last");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.peakrate_bytes_ps ||</div><div class='add'>+	    act-&gt;police.avrate || act-&gt;police.overhead) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when peakrate/avrate/overhead is configured");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.rate_pkt_ps) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "QoS offload not support packets per second");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_cls_flower_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	const struct flow_action_entry *act;</div><div class='add'>+	unsigned long cookie = cls-&gt;cookie;</div><div class='add'>+	bool routing_rule = false;</div><div class='add'>+	struct sja1105_key key;</div><div class='add'>+	bool gate_rule = false;</div><div class='add'>+	bool vl_rule = false;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_flower_parse_key(priv, extack, cls, &amp;key);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, act, &amp;rule-&gt;action) {</div><div class='add'>+		switch (act-&gt;id) {</div><div class='add'>+		case FLOW_ACTION_POLICE:</div><div class='add'>+			rc = sja1105_policer_validate(&amp;rule-&gt;action, act, extack);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+</div><div class='add'>+			rc = sja1105_flower_policer(priv, port, extack, cookie,</div><div class='add'>+						    &amp;key,</div><div class='add'>+						    act-&gt;police.rate_bytes_ps,</div><div class='add'>+						    act-&gt;police.burst);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_TRAP: {</div><div class='add'>+			int cpu = dsa_upstream_port(ds, port);</div><div class='add'>+</div><div class='add'>+			routing_rule = true;</div><div class='add'>+			vl_rule = true;</div><div class='add'>+</div><div class='add'>+			rc = sja1105_vl_redirect(priv, port, extack, cookie,</div><div class='add'>+						 &amp;key, BIT(cpu), true);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case FLOW_ACTION_REDIRECT: {</div><div class='add'>+			struct dsa_port *to_dp;</div><div class='add'>+</div><div class='add'>+			to_dp = dsa_port_from_netdev(act-&gt;dev);</div><div class='add'>+			if (IS_ERR(to_dp)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Destination not a switch port");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			routing_rule = true;</div><div class='add'>+			vl_rule = true;</div><div class='add'>+</div><div class='add'>+			rc = sja1105_vl_redirect(priv, port, extack, cookie,</div><div class='add'>+						 &amp;key, BIT(to_dp-&gt;index), true);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case FLOW_ACTION_DROP:</div><div class='add'>+			vl_rule = true;</div><div class='add'>+</div><div class='add'>+			rc = sja1105_vl_redirect(priv, port, extack, cookie,</div><div class='add'>+						 &amp;key, 0, false);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_GATE:</div><div class='add'>+			gate_rule = true;</div><div class='add'>+			vl_rule = true;</div><div class='add'>+</div><div class='add'>+			rc = sja1105_vl_gate(priv, port, extack, cookie,</div><div class='add'>+					     &amp;key, act-&gt;hw_index,</div><div class='add'>+					     act-&gt;gate.prio,</div><div class='add'>+					     act-&gt;gate.basetime,</div><div class='add'>+					     act-&gt;gate.cycletime,</div><div class='add'>+					     act-&gt;gate.cycletimeext,</div><div class='add'>+					     act-&gt;gate.num_entries,</div><div class='add'>+					     act-&gt;gate.entries);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Action not supported");</div><div class='add'>+			rc = -EOPNOTSUPP;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vl_rule &amp;&amp; !rc) {</div><div class='add'>+		/* Delay scheduling configuration until DESTPORTS has been</div><div class='add'>+		 * populated by all other actions.</div><div class='add'>+		 */</div><div class='add'>+		if (gate_rule) {</div><div class='add'>+			if (!routing_rule) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Can only offload gate action together with redirect or trap");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='add'>+			rc = sja1105_init_scheduling(priv);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = sja1105_static_config_reload(priv, SJA1105_VIRTUAL_LINKS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_cls_flower_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_rule *rule = sja1105_rule_find(priv, cls-&gt;cookie);</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	int old_sharindx;</div><div class='add'>+</div><div class='add'>+	if (!rule)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;type == SJA1105_RULE_VL)</div><div class='add'>+		return sja1105_vl_delete(priv, port, rule, cls-&gt;common.extack);</div><div class='add'>+</div><div class='add'>+	policing = priv-&gt;static_config.tables[BLK_IDX_L2_POLICING].entries;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;type == SJA1105_RULE_BCAST_POLICER) {</div><div class='add'>+		int bcast = (ds-&gt;num_ports * SJA1105_NUM_TC) + port;</div><div class='add'>+</div><div class='add'>+		old_sharindx = policing[bcast].sharindx;</div><div class='add'>+		policing[bcast].sharindx = port;</div><div class='add'>+	} else if (rule-&gt;type == SJA1105_RULE_TC_POLICER) {</div><div class='add'>+		int index = (port * SJA1105_NUM_TC) + rule-&gt;key.tc.pcp;</div><div class='add'>+</div><div class='add'>+		old_sharindx = policing[index].sharindx;</div><div class='add'>+		policing[index].sharindx = port;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule-&gt;port_mask &amp;= ~BIT(port);</div><div class='add'>+	if (!rule-&gt;port_mask) {</div><div class='add'>+		priv-&gt;flow_block.l2_policer_used[old_sharindx] = false;</div><div class='add'>+		list_del(&amp;rule-&gt;list);</div><div class='add'>+		kfree(rule);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_cls_flower_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct flow_cls_offload *cls, bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_rule *rule = sja1105_rule_find(priv, cls-&gt;cookie);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!rule)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;type != SJA1105_RULE_VL)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_vl_stats(priv, port, rule, &amp;cls-&gt;stats,</div><div class='add'>+			      cls-&gt;common.extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_flower_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;flow_block.rules);</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++)</div><div class='add'>+		priv-&gt;flow_block.l2_policer_used[port] = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_flower_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_rule *rule;</div><div class='add'>+	struct list_head *pos, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(pos, n, &amp;priv-&gt;flow_block.rules) {</div><div class='add'>+		rule = list_entry(pos, struct sja1105_rule, list);</div><div class='add'>+		list_del(&amp;rule-&gt;list);</div><div class='add'>+		kfree(rule);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c<br/>index 0663b78a2f6c..aa2145cf29a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_main.c</a></div><div class='hunk'>@@ -15,47 +15,146 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/netdev_features.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;linux/if_ether.h&gt;</div><div class='ctx'> #include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+#include &lt;linux/units.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "sja1105.h"</div><div class='add'>+#include "sja1105_tas.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_UNKNOWN_MULTICAST	0x010000000000ull</div><div class='ctx'> </div><div class='del'>-static void sja1105_hw_reset(struct gpio_desc *gpio, unsigned int pulse_len,</div><div class='del'>-			     unsigned int startup_delay)</div><div class='add'>+/* Configure the optional reset pin and bring up switch */</div><div class='add'>+static int sja1105_hw_reset(struct device *dev, unsigned int pulse_len,</div><div class='add'>+			    unsigned int startup_delay)</div><div class='ctx'> {</div><div class='add'>+	struct gpio_desc *gpio;</div><div class='add'>+</div><div class='add'>+	gpio = gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);</div><div class='add'>+	if (IS_ERR(gpio))</div><div class='add'>+		return PTR_ERR(gpio);</div><div class='add'>+</div><div class='add'>+	if (!gpio)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	gpiod_set_value_cansleep(gpio, 1);</div><div class='ctx'> 	/* Wait for minimum reset pulse length */</div><div class='ctx'> 	msleep(pulse_len);</div><div class='ctx'> 	gpiod_set_value_cansleep(gpio, 0);</div><div class='ctx'> 	/* Wait until chip is ready after reset */</div><div class='ctx'> 	msleep(startup_delay);</div><div class='add'>+</div><div class='add'>+	gpiod_put(gpio);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> sja1105_port_allow_traffic(struct sja1105_l2_forwarding_entry *l2_fwd,</div><div class='ctx'> 			   int from, int to, bool allow)</div><div class='ctx'> {</div><div class='del'>-	if (allow) {</div><div class='del'>-		l2_fwd[from].bc_domain  |= BIT(to);</div><div class='add'>+	if (allow)</div><div class='ctx'> 		l2_fwd[from].reach_port |= BIT(to);</div><div class='del'>-		l2_fwd[from].fl_domain  |= BIT(to);</div><div class='del'>-	} else {</div><div class='del'>-		l2_fwd[from].bc_domain  &amp;= ~BIT(to);</div><div class='add'>+	else</div><div class='ctx'> 		l2_fwd[from].reach_port &amp;= ~BIT(to);</div><div class='del'>-		l2_fwd[from].fl_domain  &amp;= ~BIT(to);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Structure used to temporarily transport device tree</div><div class='del'>- * settings into sja1105_setup</div><div class='del'>- */</div><div class='del'>-struct sja1105_dt_port {</div><div class='del'>-	phy_interface_t phy_mode;</div><div class='del'>-	sja1105_mii_role_t role;</div><div class='del'>-};</div><div class='add'>+static bool sja1105_can_forward(struct sja1105_l2_forwarding_entry *l2_fwd,</div><div class='add'>+				int from, int to)</div><div class='add'>+{</div><div class='add'>+	return !!(l2_fwd[from].reach_port &amp; BIT(to));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_is_vlan_configured(struct sja1105_private *priv, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vlan_lookup_entry *vlan;</div><div class='add'>+	int count, i;</div><div class='add'>+</div><div class='add'>+	vlan = priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP].entries;</div><div class='add'>+	count = priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP].entry_count;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		if (vlan[i].vlanid == vid)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	/* Return an invalid entry index if not found */</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_drop_untagged(struct dsa_switch *ds, int port, bool drop)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+</div><div class='add'>+	if (mac[port].drpuntag == drop)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mac[port].drpuntag = drop;</div><div class='add'>+</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, port,</div><div class='add'>+					    &amp;mac[port], true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_pvid_apply(struct sja1105_private *priv, int port, u16 pvid)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+</div><div class='add'>+	if (mac[port].vlanid == pvid)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mac[port].vlanid = pvid;</div><div class='add'>+</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, port,</div><div class='add'>+					    &amp;mac[port], true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_commit_pvid(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_vlan_lookup_entry *vlan;</div><div class='add'>+	bool drop_untagged = false;</div><div class='add'>+	int match, rc;</div><div class='add'>+	u16 pvid;</div><div class='add'>+</div><div class='add'>+	if (br &amp;&amp; br_vlan_enabled(br))</div><div class='add'>+		pvid = priv-&gt;bridge_pvid[port];</div><div class='add'>+	else</div><div class='add'>+		pvid = priv-&gt;tag_8021q_pvid[port];</div><div class='add'>+</div><div class='add'>+	rc = sja1105_pvid_apply(priv, port, pvid);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Only force dropping of untagged packets when the port is under a</div><div class='add'>+	 * VLAN-aware bridge. When the tag_8021q pvid is used, we are</div><div class='add'>+	 * deliberately removing the RX VLAN from the port's VMEMB_PORT list,</div><div class='add'>+	 * to prevent DSA tag spoofing from the link partner. Untagged packets</div><div class='add'>+	 * are the only ones that should be received with tag_8021q, so</div><div class='add'>+	 * definitely don't drop them.</div><div class='add'>+	 */</div><div class='add'>+	if (pvid == priv-&gt;bridge_pvid[port]) {</div><div class='add'>+		vlan = priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP].entries;</div><div class='add'>+</div><div class='add'>+		match = sja1105_is_vlan_configured(priv, pvid);</div><div class='add'>+</div><div class='add'>+		if (match &lt; 0 || !(vlan[match].vmemb_port &amp; BIT(port)))</div><div class='add'>+			drop_untagged = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='add'>+		drop_untagged = true;</div><div class='add'>+</div><div class='add'>+	return sja1105_drop_untagged(ds, port, drop_untagged);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int sja1105_init_mac_settings(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='hunk'>@@ -70,10 +169,9 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)</div><div class='ctx'> 		/* Keep standard IFG of 12 bytes on egress. */</div><div class='ctx'> 		.ifg = 0,</div><div class='ctx'> 		/* Always put the MAC speed in automatic mode, where it can be</div><div class='del'>-		 * retrieved from the PHY object through phylib and</div><div class='del'>-		 * sja1105_adjust_port_config.</div><div class='add'>+		 * adjusted at runtime by PHYLINK.</div><div class='ctx'> 		 */</div><div class='del'>-		.speed = SJA1105_SPEED_AUTO,</div><div class='add'>+		.speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_AUTO],</div><div class='ctx'> 		/* No static correction for 1-step 1588 events */</div><div class='ctx'> 		.tp_delin = 0,</div><div class='ctx'> 		.tp_delout = 0,</div><div class='hunk'>@@ -81,7 +179,7 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)</div><div class='ctx'> 		.maxage = 0xFF,</div><div class='ctx'> 		/* Internal VLAN (pvid) to apply to untagged ingress */</div><div class='ctx'> 		.vlanprio = 0,</div><div class='del'>-		.vlanid = 0,</div><div class='add'>+		.vlanid = 1,</div><div class='ctx'> 		.ing_mirr = false,</div><div class='ctx'> 		.egr_mirr = false,</div><div class='ctx'> 		/* Don't drop traffic with other EtherType than ETH_P_IP */</div><div class='hunk'>@@ -100,8 +198,9 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)</div><div class='ctx'> 		.ingress = false,</div><div class='ctx'> 	};</div><div class='ctx'> 	struct sja1105_mac_config_entry *mac;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='del'>-	int i;</div><div class='add'>+	struct dsa_port *dp;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG];</div><div class='ctx'> </div><div class='hunk'>@@ -111,36 +210,46 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_NUM_PORTS,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Override table based on phylib DT bindings */</div><div class='del'>-	table-&gt;entry_count = SJA1105_NUM_PORTS;</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='ctx'> </div><div class='ctx'> 	mac = table-&gt;entries;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		mac[i] = default_mac;</div><div class='del'>-		if (i == dsa_upstream_port(priv-&gt;ds, i)) {</div><div class='del'>-			/* STP doesn't get called for CPU port, so we need to</div><div class='del'>-			 * set the I/O parameters statically.</div><div class='del'>-			 */</div><div class='del'>-			mac[i].dyn_learn = true;</div><div class='del'>-			mac[i].ingress = true;</div><div class='del'>-			mac[i].egress = true;</div><div class='del'>-		}</div><div class='add'>+	list_for_each_entry(dp, &amp;ds-&gt;dst-&gt;ports, list) {</div><div class='add'>+		if (dp-&gt;ds != ds)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mac[dp-&gt;index] = default_mac;</div><div class='add'>+</div><div class='add'>+		/* Let sja1105_bridge_stp_state_set() keep address learning</div><div class='add'>+		 * enabled for the DSA ports. CPU ports use software-assisted</div><div class='add'>+		 * learning to ensure that only FDB entries belonging to the</div><div class='add'>+		 * bridge are learned, and that they are learned towards all</div><div class='add'>+		 * CPU ports in a cross-chip topology if multiple CPU ports</div><div class='add'>+		 * exist.</div><div class='add'>+		 */</div><div class='add'>+		if (dsa_port_is_dsa(dp))</div><div class='add'>+			dp-&gt;learning = true;</div><div class='add'>+</div><div class='add'>+		/* Disallow untagged packets from being received on the</div><div class='add'>+		 * CPU and DSA ports.</div><div class='add'>+		 */</div><div class='add'>+		if (dsa_port_is_cpu(dp) || dsa_port_is_dsa(dp))</div><div class='add'>+			mac[dp-&gt;index].drpuntag = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_init_mii_settings(struct sja1105_private *priv,</div><div class='del'>-				     struct sja1105_dt_port *ports)</div><div class='add'>+static int sja1105_init_mii_settings(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='ctx'> 	struct sja1105_xmii_params_entry *mii;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -152,69 +261,139 @@ static int sja1105_init_mii_settings(struct sja1105_private *priv,</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Override table based on phylib DT bindings */</div><div class='del'>-	table-&gt;entry_count = SJA1105_MAX_XMII_PARAMS_COUNT;</div><div class='add'>+	/* Override table based on PHYLINK DT bindings */</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='ctx'> </div><div class='ctx'> 	mii = table-&gt;entries;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		switch (ports[i].phy_mode) {</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		sja1105_mii_role_t role = XMII_MAC;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(priv-&gt;ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (priv-&gt;phy_mode[i]) {</div><div class='add'>+		case PHY_INTERFACE_MODE_INTERNAL:</div><div class='add'>+			if (priv-&gt;info-&gt;internal_phy[i] == SJA1105_NO_PHY)</div><div class='add'>+				goto unsupported;</div><div class='add'>+</div><div class='add'>+			mii-&gt;xmii_mode[i] = XMII_MODE_MII;</div><div class='add'>+			if (priv-&gt;info-&gt;internal_phy[i] == SJA1105_PHY_BASE_TX)</div><div class='add'>+				mii-&gt;special[i] = true;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_REVMII:</div><div class='add'>+			role = XMII_PHY;</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case PHY_INTERFACE_MODE_MII:</div><div class='add'>+			if (!priv-&gt;info-&gt;supports_mii[i])</div><div class='add'>+				goto unsupported;</div><div class='add'>+</div><div class='ctx'> 			mii-&gt;xmii_mode[i] = XMII_MODE_MII;</div><div class='ctx'> 			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_REVRMII:</div><div class='add'>+			role = XMII_PHY;</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+			if (!priv-&gt;info-&gt;supports_rmii[i])</div><div class='add'>+				goto unsupported;</div><div class='add'>+</div><div class='ctx'> 			mii-&gt;xmii_mode[i] = XMII_MODE_RMII;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PHY_INTERFACE_MODE_RGMII:</div><div class='ctx'> 		case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='ctx'> 		case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='ctx'> 		case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+			if (!priv-&gt;info-&gt;supports_rgmii[i])</div><div class='add'>+				goto unsupported;</div><div class='add'>+</div><div class='ctx'> 			mii-&gt;xmii_mode[i] = XMII_MODE_RGMII;</div><div class='ctx'> 			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+			if (!priv-&gt;info-&gt;supports_sgmii[i])</div><div class='add'>+				goto unsupported;</div><div class='add'>+</div><div class='add'>+			mii-&gt;xmii_mode[i] = XMII_MODE_SGMII;</div><div class='add'>+			mii-&gt;special[i] = true;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_2500BASEX:</div><div class='add'>+			if (!priv-&gt;info-&gt;supports_2500basex[i])</div><div class='add'>+				goto unsupported;</div><div class='add'>+</div><div class='add'>+			mii-&gt;xmii_mode[i] = XMII_MODE_SGMII;</div><div class='add'>+			mii-&gt;special[i] = true;</div><div class='add'>+			break;</div><div class='add'>+unsupported:</div><div class='ctx'> 		default:</div><div class='del'>-			dev_err(dev, "Unsupported PHY mode %s!\n",</div><div class='del'>-				phy_modes(ports[i].phy_mode));</div><div class='add'>+			dev_err(dev, "Unsupported PHY mode %s on port %d!\n",</div><div class='add'>+				phy_modes(priv-&gt;phy_mode[i]), i);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mii-&gt;phy_mac[i] = ports[i].role;</div><div class='add'>+		mii-&gt;phy_mac[i] = role;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_init_static_fdb(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='add'>+	struct sja1105_l2_lookup_entry *l2_lookup;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='add'>+	int port;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP];</div><div class='ctx'> </div><div class='del'>-	/* We only populate the FDB table through dynamic</div><div class='del'>-	 * L2 Address Lookup entries</div><div class='add'>+	/* We only populate the FDB table through dynamic L2 Address Lookup</div><div class='add'>+	 * entries, except for a special entry at the end which is a catch-all</div><div class='add'>+	 * for unknown multicast and will be used to control flooding domain.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (table-&gt;entry_count) {</div><div class='ctx'> 		kfree(table-&gt;entries);</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;info-&gt;can_limit_mcast_flood)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	table-&gt;entries = kcalloc(1, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	table-&gt;entry_count = 1;</div><div class='add'>+	l2_lookup = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* All L2 multicast addresses have an odd first octet */</div><div class='add'>+	l2_lookup[0].macaddr = SJA1105_UNKNOWN_MULTICAST;</div><div class='add'>+	l2_lookup[0].mask_macaddr = SJA1105_UNKNOWN_MULTICAST;</div><div class='add'>+	l2_lookup[0].lockeds = true;</div><div class='add'>+	l2_lookup[0].index = SJA1105_MAX_L2_LOOKUP_COUNT - 1;</div><div class='add'>+</div><div class='add'>+	/* Flood multicast to every port by default */</div><div class='add'>+	for (port = 0; port &lt; priv-&gt;ds-&gt;num_ports; port++)</div><div class='add'>+		if (!dsa_is_unused_port(priv-&gt;ds, port))</div><div class='add'>+			l2_lookup[0].destports |= BIT(port);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_table *table;</div><div class='ctx'> 	struct sja1105_l2_lookup_params_entry default_l2_lookup_params = {</div><div class='ctx'> 		/* Learned FDB entries are forgotten after 300 seconds */</div><div class='ctx'> 		.maxage = SJA1105_AGEING_TIME_MS(300000),</div><div class='ctx'> 		/* All entries within a FDB bin are available for learning */</div><div class='ctx'> 		.dyn_tbsz = SJA1105ET_FDB_BIN_SIZE,</div><div class='add'>+		/* And the P/Q/R/S equivalent setting: */</div><div class='add'>+		.start_dynspc = 0,</div><div class='ctx'> 		/* 2^8 + 2^5 + 2^3 + 2^2 + 2^1 + 1 in Koopman notation */</div><div class='ctx'> 		.poly = 0x97,</div><div class='del'>-		/* This selects between Independent VLAN Learning (IVL) and</div><div class='del'>-		 * Shared VLAN Learning (SVL)</div><div class='del'>-		 */</div><div class='add'>+		/* Always use Independent VLAN Learning (IVL) */</div><div class='ctx'> 		.shared_learn = false,</div><div class='ctx'> 		/* Don't discard management traffic based on ENFPORT -</div><div class='ctx'> 		 * we don't perform SMAC port enforcement anyway, so</div><div class='hunk'>@@ -225,7 +404,31 @@ static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)</div><div class='ctx'> 		 * Maybe correlate with no_linklocal_learn from bridge driver?</div><div class='ctx'> 		 */</div><div class='ctx'> 		.no_mgmt_learn = true,</div><div class='add'>+		/* P/Q/R/S only */</div><div class='add'>+		.use_static = true,</div><div class='add'>+		/* Dynamically learned FDB entries can overwrite other (older)</div><div class='add'>+		 * dynamic FDB entries</div><div class='add'>+		 */</div><div class='add'>+		.owr_dyn = true,</div><div class='add'>+		.drpnolearn = true,</div><div class='ctx'> 	};</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int port, num_used_ports = 0;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	u64 max_fdb_entries;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++)</div><div class='add'>+		if (!dsa_is_unused_port(ds, port))</div><div class='add'>+			num_used_ports++;</div><div class='add'>+</div><div class='add'>+	max_fdb_entries = SJA1105_MAX_L2_LOOKUP_COUNT / num_used_ports;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		default_l2_lookup_params.maxaddrp[port] = max_fdb_entries;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP_PARAMS];</div><div class='ctx'> </div><div class='hunk'>@@ -234,12 +437,12 @@ static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	table-&gt;entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT;</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='ctx'> </div><div class='ctx'> 	/* This table only has a single entry */</div><div class='ctx'> 	((struct sja1105_l2_lookup_params_entry *)table-&gt;entries)[0] =</div><div class='hunk'>@@ -248,49 +451,54 @@ static int sja1105_init_l2_lookup_params(struct sja1105_private *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Set up a default VLAN for untagged traffic injected from the CPU</div><div class='add'>+ * using management routes (e.g. STP, PTP) as opposed to tag_8021q.</div><div class='add'>+ * All DT-defined ports are members of this VLAN, and there are no</div><div class='add'>+ * restrictions on forwarding (since the CPU selects the destination).</div><div class='add'>+ * Frames from this VLAN will always be transmitted as untagged, and</div><div class='add'>+ * neither the bridge nor the 8021q module cannot create this VLAN ID.</div><div class='add'>+ */</div><div class='ctx'> static int sja1105_init_static_vlan(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='ctx'> 	struct sja1105_vlan_lookup_entry pvid = {</div><div class='add'>+		.type_entry = SJA1110_VLAN_D_TAG,</div><div class='ctx'> 		.ving_mirr = 0,</div><div class='ctx'> 		.vegr_mirr = 0,</div><div class='ctx'> 		.vmemb_port = 0,</div><div class='ctx'> 		.vlan_bc = 0,</div><div class='ctx'> 		.tag_port = 0,</div><div class='del'>-		.vlanid = 0,</div><div class='add'>+		.vlanid = SJA1105_DEFAULT_VLAN,</div><div class='ctx'> 	};</div><div class='del'>-	int i;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int port;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP];</div><div class='ctx'> </div><div class='del'>-	/* The static VLAN table will only contain the initial pvid of 0.</div><div class='del'>-	 * All other VLANs are to be configured through dynamic entries,</div><div class='del'>-	 * and kept in the static configuration table as backing memory.</div><div class='del'>-	 * The pvid of 0 is sufficient to pass traffic while the ports are</div><div class='del'>-	 * standalone and when vlan_filtering is disabled. When filtering</div><div class='del'>-	 * gets enabled, the switchdev core sets up the VLAN ID 1 and sets</div><div class='del'>-	 * it as the new pvid. Actually 'pvid 1' still comes up in 'bridge</div><div class='del'>-	 * vlan' even when vlan_filtering is off, but it has no effect.</div><div class='del'>-	 */</div><div class='ctx'> 	if (table-&gt;entry_count) {</div><div class='ctx'> 		kfree(table-&gt;entries);</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(1, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+	table-&gt;entries = kzalloc(table-&gt;ops-&gt;unpacked_entry_size,</div><div class='ctx'> 				 GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	table-&gt;entry_count = 1;</div><div class='ctx'> </div><div class='del'>-	/* VLAN ID 0: all DT-defined ports are members; no restrictions on</div><div class='del'>-	 * forwarding; always transmit priority-tagged frames as untagged.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		pvid.vmemb_port |= BIT(i);</div><div class='del'>-		pvid.vlan_bc |= BIT(i);</div><div class='del'>-		pvid.tag_port &amp;= ~BIT(i);</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pvid.vmemb_port |= BIT(port);</div><div class='add'>+		pvid.vlan_bc |= BIT(port);</div><div class='add'>+		pvid.tag_port &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+		if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)) {</div><div class='add'>+			priv-&gt;tag_8021q_pvid[port] = SJA1105_DEFAULT_VLAN;</div><div class='add'>+			priv-&gt;bridge_pvid[port] = SJA1105_DEFAULT_VLAN;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	((struct sja1105_vlan_lookup_entry *)table-&gt;entries)[0] = pvid;</div><div class='hunk'>@@ -300,8 +508,12 @@ static int sja1105_init_static_vlan(struct sja1105_private *priv)</div><div class='ctx'> static int sja1105_init_l2_forwarding(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_l2_forwarding_entry *l2fwd;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct dsa_switch_tree *dst;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='del'>-	int i, j;</div><div class='add'>+	struct dsa_link *dl;</div><div class='add'>+	int port, tc;</div><div class='add'>+	int from, to;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_FORWARDING];</div><div class='ctx'> </div><div class='hunk'>@@ -310,46 +522,165 @@ static int sja1105_init_l2_forwarding(struct sja1105_private *priv)</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	table-&gt;entry_count = SJA1105_MAX_L2_FORWARDING_COUNT;</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='ctx'> </div><div class='ctx'> 	l2fwd = table-&gt;entries;</div><div class='ctx'> </div><div class='del'>-	/* First 5 entries define the forwarding rules */</div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		unsigned int upstream = dsa_upstream_port(priv-&gt;ds, i);</div><div class='add'>+	/* First 5 entries in the L2 Forwarding Table define the forwarding</div><div class='add'>+	 * rules and the VLAN PCP to ingress queue mapping.</div><div class='add'>+	 * Set up the ingress queue mapping first.</div><div class='add'>+	 */</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (tc = 0; tc &lt; SJA1105_NUM_TC; tc++)</div><div class='add'>+			l2fwd[port].vlan_pmap[tc] = tc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Then manage the forwarding domain for user ports. These can forward</div><div class='add'>+	 * only to the always-on domain (CPU port and DSA links)</div><div class='add'>+	 */</div><div class='add'>+	for (from = 0; from &lt; ds-&gt;num_ports; from++) {</div><div class='add'>+		if (!dsa_is_user_port(ds, from))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (to = 0; to &lt; ds-&gt;num_ports; to++) {</div><div class='add'>+			if (!dsa_is_cpu_port(ds, to) &amp;&amp;</div><div class='add'>+			    !dsa_is_dsa_port(ds, to))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			l2fwd[from].bc_domain |= BIT(to);</div><div class='add'>+			l2fwd[from].fl_domain |= BIT(to);</div><div class='add'>+</div><div class='add'>+			sja1105_port_allow_traffic(l2fwd, from, to, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Then manage the forwarding domain for DSA links and CPU ports (the</div><div class='add'>+	 * always-on domain). These can send packets to any enabled port except</div><div class='add'>+	 * themselves.</div><div class='add'>+	 */</div><div class='add'>+	for (from = 0; from &lt; ds-&gt;num_ports; from++) {</div><div class='add'>+		if (!dsa_is_cpu_port(ds, from) &amp;&amp; !dsa_is_dsa_port(ds, from))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (to = 0; to &lt; ds-&gt;num_ports; to++) {</div><div class='add'>+			if (dsa_is_unused_port(ds, to))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (from == to)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			l2fwd[from].bc_domain |= BIT(to);</div><div class='add'>+			l2fwd[from].fl_domain |= BIT(to);</div><div class='add'>+</div><div class='add'>+			sja1105_port_allow_traffic(l2fwd, from, to, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* In odd topologies ("H" connections where there is a DSA link to</div><div class='add'>+	 * another switch which also has its own CPU port), TX packets can loop</div><div class='add'>+	 * back into the system (they are flooded from CPU port 1 to the DSA</div><div class='add'>+	 * link, and from there to CPU port 2). Prevent this from happening by</div><div class='add'>+	 * cutting RX from DSA links towards our CPU port, if the remote switch</div><div class='add'>+	 * has its own CPU port and therefore doesn't need ours for network</div><div class='add'>+	 * stack termination.</div><div class='add'>+	 */</div><div class='add'>+	dst = ds-&gt;dst;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(dl, &amp;dst-&gt;rtable, list) {</div><div class='add'>+		if (dl-&gt;dp-&gt;ds != ds || dl-&gt;link_dp-&gt;cpu_dp == dl-&gt;dp-&gt;cpu_dp)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; SJA1105_NUM_TC; j++)</div><div class='del'>-			l2fwd[i].vlan_pmap[j] = j;</div><div class='add'>+		from = dl-&gt;dp-&gt;index;</div><div class='add'>+		to = dsa_upstream_port(ds, from);</div><div class='add'>+</div><div class='add'>+		dev_warn(ds-&gt;dev,</div><div class='add'>+			 "H topology detected, cutting RX from DSA link %d to CPU port %d to prevent TX packet loops\n",</div><div class='add'>+			 from, to);</div><div class='add'>+</div><div class='add'>+		sja1105_port_allow_traffic(l2fwd, from, to, false);</div><div class='add'>+</div><div class='add'>+		l2fwd[from].bc_domain &amp;= ~BIT(to);</div><div class='add'>+		l2fwd[from].fl_domain &amp;= ~BIT(to);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (i == upstream)</div><div class='add'>+	/* Finally, manage the egress flooding domain. All ports start up with</div><div class='add'>+	 * flooding enabled, including the CPU port and DSA links.</div><div class='add'>+	 */</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		sja1105_port_allow_traffic(l2fwd, i, upstream, true);</div><div class='del'>-		sja1105_port_allow_traffic(l2fwd, upstream, i, true);</div><div class='add'>+		priv-&gt;ucast_egress_floods |= BIT(port);</div><div class='add'>+		priv-&gt;bcast_egress_floods |= BIT(port);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Next 8 entries define VLAN PCP mapping from ingress to egress.</div><div class='ctx'> 	 * Create a one-to-one mapping.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_TC; i++)</div><div class='del'>-		for (j = 0; j &lt; SJA1105_NUM_PORTS; j++)</div><div class='del'>-			l2fwd[SJA1105_NUM_PORTS + i].vlan_pmap[j] = i;</div><div class='add'>+	for (tc = 0; tc &lt; SJA1105_NUM_TC; tc++) {</div><div class='add'>+		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+			if (dsa_is_unused_port(ds, port))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			l2fwd[ds-&gt;num_ports + tc].vlan_pmap[port] = tc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		l2fwd[ds-&gt;num_ports + tc].type_egrpcp2outputq = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1110_init_pcp_remapping(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1110_pcp_remapping_entry *pcp_remap;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int port, tc;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_PCP_REMAPPING];</div><div class='add'>+</div><div class='add'>+	/* Nothing to do for SJA1105 */</div><div class='add'>+	if (!table-&gt;ops-&gt;max_entry_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='add'>+				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='add'>+</div><div class='add'>+	pcp_remap = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Repeat the configuration done for vlan_pmap */</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (tc = 0; tc &lt; SJA1105_NUM_TC; tc++)</div><div class='add'>+			pcp_remap[port].egrpcp[tc] = tc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_init_l2_forwarding_params(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_l2_forwarding_params_entry default_l2fwd_params = {</div><div class='del'>-		/* Disallow dynamic reconfiguration of vlan_pmap */</div><div class='del'>-		.max_dynp = 0,</div><div class='del'>-		/* Use a single memory partition for all ingress queues */</div><div class='del'>-		.part_spc = { SJA1105_MAX_FRAME_MEMORY, 0, 0, 0, 0, 0, 0, 0 },</div><div class='del'>-	};</div><div class='add'>+	struct sja1105_l2_forwarding_params_entry *l2fwd_params;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_FORWARDING_PARAMS];</div><div class='hunk'>@@ -359,16 +690,166 @@ static int sja1105_init_l2_forwarding_params(struct sja1105_private *priv)</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	table-&gt;entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT;</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='ctx'> </div><div class='ctx'> 	/* This table only has a single entry */</div><div class='del'>-	((struct sja1105_l2_forwarding_params_entry *)table-&gt;entries)[0] =</div><div class='del'>-				default_l2fwd_params;</div><div class='add'>+	l2fwd_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Disallow dynamic reconfiguration of vlan_pmap */</div><div class='add'>+	l2fwd_params-&gt;max_dynp = 0;</div><div class='add'>+	/* Use a single memory partition for all ingress queues */</div><div class='add'>+	l2fwd_params-&gt;part_spc[0] = priv-&gt;info-&gt;max_frame_mem;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_frame_memory_partitioning(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_forwarding_params_entry *l2_fwd_params;</div><div class='add'>+	struct sja1105_vl_forwarding_params_entry *vl_fwd_params;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_FORWARDING_PARAMS];</div><div class='add'>+	l2_fwd_params = table-&gt;entries;</div><div class='add'>+	l2_fwd_params-&gt;part_spc[0] = SJA1105_MAX_FRAME_MEMORY;</div><div class='add'>+</div><div class='add'>+	/* If we have any critical-traffic virtual links, we need to reserve</div><div class='add'>+	 * some frame buffer memory for them. At the moment, hardcode the value</div><div class='add'>+	 * at 100 blocks of 128 bytes of memory each. This leaves 829 blocks</div><div class='add'>+	 * remaining for best-effort traffic. TODO: figure out a more flexible</div><div class='add'>+	 * way to perform the frame buffer partitioning.</div><div class='add'>+	 */</div><div class='add'>+	if (!priv-&gt;static_config.tables[BLK_IDX_VL_FORWARDING].entry_count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_FORWARDING_PARAMS];</div><div class='add'>+	vl_fwd_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	l2_fwd_params-&gt;part_spc[0] -= SJA1105_VL_FRAME_MEMORY;</div><div class='add'>+	vl_fwd_params-&gt;partspc[0] = SJA1105_VL_FRAME_MEMORY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* SJA1110 TDMACONFIGIDX values:</div><div class='add'>+ *</div><div class='add'>+ *      | 100 Mbps ports |  1Gbps ports  | 2.5Gbps ports | Disabled ports</div><div class='add'>+ * -----+----------------+---------------+---------------+---------------</div><div class='add'>+ *   0  |   0, [5:10]    |     [1:2]     |     [3:4]     |     retag</div><div class='add'>+ *   1  |0, [5:10], retag|     [1:2]     |     [3:4]     |       -</div><div class='add'>+ *   2  |   0, [5:10]    |  [1:3], retag |       4       |       -</div><div class='add'>+ *   3  |   0, [5:10]    |[1:2], 4, retag|       3       |       -</div><div class='add'>+ *   4  |  0, 2, [5:10]  |    1, retag   |     [3:4]     |       -</div><div class='add'>+ *   5  |  0, 1, [5:10]  |    2, retag   |     [3:4]     |       -</div><div class='add'>+ *  14  |   0, [5:10]    | [1:4], retag  |       -       |       -</div><div class='add'>+ *  15  |     [5:10]     | [0:4], retag  |       -       |       -</div><div class='add'>+ */</div><div class='add'>+static void sja1110_select_tdmaconfigidx(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_general_params_entry *general_params;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	bool port_1_is_base_tx;</div><div class='add'>+	bool port_3_is_2500;</div><div class='add'>+	bool port_4_is_2500;</div><div class='add'>+	u64 tdmaconfigidx;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;info-&gt;device_id != SJA1110_DEVICE_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_GENERAL_PARAMS];</div><div class='add'>+	general_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* All the settings below are "as opposed to SGMII", which is the</div><div class='add'>+	 * other pinmuxing option.</div><div class='add'>+	 */</div><div class='add'>+	port_1_is_base_tx = priv-&gt;phy_mode[1] == PHY_INTERFACE_MODE_INTERNAL;</div><div class='add'>+	port_3_is_2500 = priv-&gt;phy_mode[3] == PHY_INTERFACE_MODE_2500BASEX;</div><div class='add'>+	port_4_is_2500 = priv-&gt;phy_mode[4] == PHY_INTERFACE_MODE_2500BASEX;</div><div class='add'>+</div><div class='add'>+	if (port_1_is_base_tx)</div><div class='add'>+		/* Retagging port will operate at 1 Gbps */</div><div class='add'>+		tdmaconfigidx = 5;</div><div class='add'>+	else if (port_3_is_2500 &amp;&amp; port_4_is_2500)</div><div class='add'>+		/* Retagging port will operate at 100 Mbps */</div><div class='add'>+		tdmaconfigidx = 1;</div><div class='add'>+	else if (port_3_is_2500)</div><div class='add'>+		/* Retagging port will operate at 1 Gbps */</div><div class='add'>+		tdmaconfigidx = 3;</div><div class='add'>+	else if (port_4_is_2500)</div><div class='add'>+		/* Retagging port will operate at 1 Gbps */</div><div class='add'>+		tdmaconfigidx = 2;</div><div class='add'>+	else</div><div class='add'>+		/* Retagging port will operate at 1 Gbps */</div><div class='add'>+		tdmaconfigidx = 14;</div><div class='add'>+</div><div class='add'>+	general_params-&gt;tdmaconfigidx = tdmaconfigidx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_init_topology(struct sja1105_private *priv,</div><div class='add'>+				 struct sja1105_general_params_entry *general_params)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	/* The host port is the destination for traffic matching mac_fltres1</div><div class='add'>+	 * and mac_fltres0 on all ports except itself. Default to an invalid</div><div class='add'>+	 * value.</div><div class='add'>+	 */</div><div class='add'>+	general_params-&gt;host_port = ds-&gt;num_ports;</div><div class='add'>+</div><div class='add'>+	/* Link-local traffic received on casc_port will be forwarded</div><div class='add'>+	 * to host_port without embedding the source port and device ID</div><div class='add'>+	 * info in the destination MAC address, and no RX timestamps will be</div><div class='add'>+	 * taken either (presumably because it is a cascaded port and a</div><div class='add'>+	 * downstream SJA switch already did that).</div><div class='add'>+	 * To disable the feature, we need to do different things depending on</div><div class='add'>+	 * switch generation. On SJA1105 we need to set an invalid port, while</div><div class='add'>+	 * on SJA1110 which support multiple cascaded ports, this field is a</div><div class='add'>+	 * bitmask so it must be left zero.</div><div class='add'>+	 */</div><div class='add'>+	if (!priv-&gt;info-&gt;multiple_cascade_ports)</div><div class='add'>+		general_params-&gt;casc_port = ds-&gt;num_ports;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		bool is_upstream = dsa_is_upstream_port(ds, port);</div><div class='add'>+		bool is_dsa_link = dsa_is_dsa_port(ds, port);</div><div class='add'>+</div><div class='add'>+		/* Upstream ports can be dedicated CPU ports or</div><div class='add'>+		 * upstream-facing DSA links</div><div class='add'>+		 */</div><div class='add'>+		if (is_upstream) {</div><div class='add'>+			if (general_params-&gt;host_port == ds-&gt;num_ports) {</div><div class='add'>+				general_params-&gt;host_port = port;</div><div class='add'>+			} else {</div><div class='add'>+				dev_err(ds-&gt;dev,</div><div class='add'>+					"Port %llu is already a host port, configuring %d as one too is not supported\n",</div><div class='add'>+					general_params-&gt;host_port, port);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Cascade ports are downstream-facing DSA links */</div><div class='add'>+		if (is_dsa_link &amp;&amp; !is_upstream) {</div><div class='add'>+			if (priv-&gt;info-&gt;multiple_cascade_ports) {</div><div class='add'>+				general_params-&gt;casc_port |= BIT(port);</div><div class='add'>+			} else if (general_params-&gt;casc_port == ds-&gt;num_ports) {</div><div class='add'>+				general_params-&gt;casc_port = port;</div><div class='add'>+			} else {</div><div class='add'>+				dev_err(ds-&gt;dev,</div><div class='add'>+					"Port %llu is already a cascade port, configuring %d as one too is not supported\n",</div><div class='add'>+					general_params-&gt;casc_port, port);</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (general_params-&gt;host_port == ds-&gt;num_ports) {</div><div class='add'>+		dev_err(ds-&gt;dev, "No host port configured\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -376,37 +857,25 @@ static int sja1105_init_l2_forwarding_params(struct sja1105_private *priv)</div><div class='ctx'> static int sja1105_init_general_params(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_general_params_entry default_general_params = {</div><div class='del'>-		/* Disallow dynamic changing of the mirror port */</div><div class='del'>-		.mirr_ptacu = 0,</div><div class='add'>+		/* Allow dynamic changing of the mirror port */</div><div class='add'>+		.mirr_ptacu = true,</div><div class='ctx'> 		.switchid = priv-&gt;ds-&gt;index,</div><div class='del'>-		/* Priority queue for link-local frames trapped to CPU */</div><div class='del'>-		.hostprio = 0,</div><div class='add'>+		/* Priority queue for link-local management frames</div><div class='add'>+		 * (both ingress to and egress from CPU - PTP, STP etc)</div><div class='add'>+		 */</div><div class='add'>+		.hostprio = 7,</div><div class='ctx'> 		.mac_fltres1 = SJA1105_LINKLOCAL_FILTER_A,</div><div class='ctx'> 		.mac_flt1    = SJA1105_LINKLOCAL_FILTER_A_MASK,</div><div class='ctx'> 		.incl_srcpt1 = true,</div><div class='del'>-		.send_meta1  = false,</div><div class='add'>+		.send_meta1  = true,</div><div class='ctx'> 		.mac_fltres0 = SJA1105_LINKLOCAL_FILTER_B,</div><div class='ctx'> 		.mac_flt0    = SJA1105_LINKLOCAL_FILTER_B_MASK,</div><div class='ctx'> 		.incl_srcpt0 = true,</div><div class='del'>-		.send_meta0  = false,</div><div class='del'>-		/* The destination for traffic matching mac_fltres1 and</div><div class='del'>-		 * mac_fltres0 on all ports except host_port. Such traffic</div><div class='del'>-		 * receieved on host_port itself would be dropped, except</div><div class='del'>-		 * by installing a temporary 'management route'</div><div class='del'>-		 */</div><div class='del'>-		.host_port = dsa_upstream_port(priv-&gt;ds, 0),</div><div class='del'>-		/* Same as host port */</div><div class='del'>-		.mirr_port = dsa_upstream_port(priv-&gt;ds, 0),</div><div class='del'>-		/* Link-local traffic received on casc_port will be forwarded</div><div class='del'>-		 * to host_port without embedding the source port and device ID</div><div class='del'>-		 * info in the destination MAC address (presumably because it</div><div class='del'>-		 * is a cascaded port and a downstream SJA switch already did</div><div class='del'>-		 * that). Default to an invalid port (to disable the feature)</div><div class='del'>-		 * and overwrite this if we find any DSA (cascaded) ports.</div><div class='del'>-		 */</div><div class='del'>-		.casc_port = SJA1105_NUM_PORTS,</div><div class='add'>+		.send_meta0  = true,</div><div class='add'>+		/* Default to an invalid value */</div><div class='add'>+		.mirr_port = priv-&gt;ds-&gt;num_ports,</div><div class='ctx'> 		/* No TTEthernet */</div><div class='del'>-		.vllupformat = 0,</div><div class='add'>+		.vllupformat = SJA1105_VL_FORMAT_PSFP,</div><div class='ctx'> 		.vlmarker = 0,</div><div class='ctx'> 		.vlmask = 0,</div><div class='ctx'> 		/* Only update correctionField for 1-step PTP (L2 transport) */</div><div class='hunk'>@@ -416,16 +885,18 @@ static int sja1105_init_general_params(struct sja1105_private *priv)</div><div class='ctx'> 		 */</div><div class='ctx'> 		.tpid = ETH_P_SJA1105,</div><div class='ctx'> 		.tpid2 = ETH_P_SJA1105,</div><div class='add'>+		/* Enable the TTEthernet engine on SJA1110 */</div><div class='add'>+		.tte_en = true,</div><div class='add'>+		/* Set up the EtherType for control packets on SJA1110 */</div><div class='add'>+		.header_type = ETH_P_SJA1110,</div><div class='ctx'> 	};</div><div class='add'>+	struct sja1105_general_params_entry *general_params;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='del'>-	int i, k = 0;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		if (dsa_is_dsa_port(priv-&gt;ds, i))</div><div class='del'>-			default_general_params.casc_port = i;</div><div class='del'>-		else if (dsa_is_user_port(priv-&gt;ds, i))</div><div class='del'>-			priv-&gt;ports[i].mgmt_slot = k++;</div><div class='del'>-	}</div><div class='add'>+	rc = sja1105_init_topology(priv, &amp;default_general_params);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_GENERAL_PARAMS];</div><div class='ctx'> </div><div class='hunk'>@@ -434,38 +905,111 @@ static int sja1105_init_general_params(struct sja1105_private *priv)</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	table-&gt;entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT;</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='add'>+</div><div class='add'>+	general_params = table-&gt;entries;</div><div class='ctx'> </div><div class='ctx'> 	/* This table only has a single entry */</div><div class='del'>-	((struct sja1105_general_params_entry *)table-&gt;entries)[0] =</div><div class='del'>-				default_general_params;</div><div class='add'>+	general_params[0] = default_general_params;</div><div class='add'>+</div><div class='add'>+	sja1110_select_tdmaconfigidx(priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define SJA1105_RATE_MBPS(speed) (((speed) * 64000) / 1000)</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-sja1105_setup_policer(struct sja1105_l2_policing_entry *policing,</div><div class='del'>-		      int index)</div><div class='add'>+static int sja1105_init_avb_params(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='del'>-	policing[index].sharindx = index;</div><div class='del'>-	policing[index].smax = 65535; /* Burst size in bytes */</div><div class='del'>-	policing[index].rate = SJA1105_RATE_MBPS(1000);</div><div class='del'>-	policing[index].maxlen = ETH_FRAME_LEN + VLAN_HLEN + ETH_FCS_LEN;</div><div class='del'>-	policing[index].partition = 0;</div><div class='add'>+	struct sja1105_avb_params_entry *avb;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_AVB_PARAMS];</div><div class='add'>+</div><div class='add'>+	/* Discard previous AVB Parameters Table */</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='add'>+				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='add'>+</div><div class='add'>+	avb = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Configure the MAC addresses for meta frames */</div><div class='add'>+	avb-&gt;destmeta = SJA1105_META_DMAC;</div><div class='add'>+	avb-&gt;srcmeta  = SJA1105_META_SMAC;</div><div class='add'>+	/* On P/Q/R/S, configure the direction of the PTP_CLK pin as input by</div><div class='add'>+	 * default. This is because there might be boards with a hardware</div><div class='add'>+	 * layout where enabling the pin as output might cause an electrical</div><div class='add'>+	 * clash. On E/T the pin is always an output, which the board designers</div><div class='add'>+	 * probably already knew, so even if there are going to be electrical</div><div class='add'>+	 * issues, there's nothing we can do.</div><div class='add'>+	 */</div><div class='add'>+	avb-&gt;cas_master = false;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* The L2 policing table is 2-stage. The table is looked up for each frame</div><div class='add'>+ * according to the ingress port, whether it was broadcast or not, and the</div><div class='add'>+ * classified traffic class (given by VLAN PCP). This portion of the lookup is</div><div class='add'>+ * fixed, and gives access to the SHARINDX, an indirection register pointing</div><div class='add'>+ * within the policing table itself, which is used to resolve the policer that</div><div class='add'>+ * will be used for this frame.</div><div class='add'>+ *</div><div class='add'>+ *  Stage 1                              Stage 2</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 0 TC 0 |SHARINDX|              | Policer 0: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 0 TC 1 |SHARINDX|              | Policer 1: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ *    ...                               | Policer 2: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 0 TC 7 |SHARINDX|              | Policer 3: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 1 TC 0 |SHARINDX|              | Policer 4: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ *    ...                               | Policer 5: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 1 TC 7 |SHARINDX|              | Policer 6: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ *    ...                               | Policer 7: Rate, Burst, MTU     |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 4 TC 7 |SHARINDX|                 ...</div><div class='add'>+ * +------------+--------+</div><div class='add'>+ * |Port 0 BCAST|SHARINDX|                 ...</div><div class='add'>+ * +------------+--------+</div><div class='add'>+ * |Port 1 BCAST|SHARINDX|                 ...</div><div class='add'>+ * +------------+--------+</div><div class='add'>+ *    ...                                  ...</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ * |Port 4 BCAST|SHARINDX|              | Policer 44: Rate, Burst, MTU    |</div><div class='add'>+ * +------------+--------+              +---------------------------------+</div><div class='add'>+ *</div><div class='add'>+ * In this driver, we shall use policers 0-4 as statically alocated port</div><div class='add'>+ * (matchall) policers. So we need to make the SHARINDX for all lookups</div><div class='add'>+ * corresponding to this ingress port (8 VLAN PCP lookups and 1 broadcast</div><div class='add'>+ * lookup) equal.</div><div class='add'>+ * The remaining policers (40) shall be dynamically allocated for flower</div><div class='add'>+ * policers, where the key is either vlan_prio or dst_mac ff:ff:ff:ff:ff:ff.</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_RATE_MBPS(speed) (((speed) * 64000) / 1000)</div><div class='add'>+</div><div class='ctx'> static int sja1105_init_l2_policing(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='del'>-	int i, j, k;</div><div class='add'>+	int port, tc;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_POLICING];</div><div class='ctx'> </div><div class='hunk'>@@ -475,32 +1019,46 @@ static int sja1105_init_l2_policing(struct sja1105_private *priv)</div><div class='ctx'> 		table-&gt;entry_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	table-&gt;entries = kcalloc(SJA1105_MAX_L2_POLICING_COUNT,</div><div class='add'>+	table-&gt;entries = kcalloc(table-&gt;ops-&gt;max_entry_count,</div><div class='ctx'> 				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='ctx'> 	if (!table-&gt;entries)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	table-&gt;entry_count = SJA1105_MAX_L2_POLICING_COUNT;</div><div class='add'>+	table-&gt;entry_count = table-&gt;ops-&gt;max_entry_count;</div><div class='ctx'> </div><div class='ctx'> 	policing = table-&gt;entries;</div><div class='ctx'> </div><div class='del'>-	/* k sweeps through all unicast policers (0-39).</div><div class='del'>-	 * bcast sweeps through policers 40-44.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0, k = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		int bcast = (SJA1105_NUM_PORTS * SJA1105_NUM_TC) + i;</div><div class='add'>+	/* Setup shared indices for the matchall policers */</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		int mcast = (ds-&gt;num_ports * (SJA1105_NUM_TC + 1)) + port;</div><div class='add'>+		int bcast = (ds-&gt;num_ports * SJA1105_NUM_TC) + port;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; SJA1105_NUM_TC; j++, k++)</div><div class='del'>-			sja1105_setup_policer(policing, k);</div><div class='add'>+		for (tc = 0; tc &lt; SJA1105_NUM_TC; tc++)</div><div class='add'>+			policing[port * SJA1105_NUM_TC + tc].sharindx = port;</div><div class='ctx'> </div><div class='del'>-		/* Set up this port's policer for broadcast traffic */</div><div class='del'>-		sja1105_setup_policer(policing, bcast);</div><div class='add'>+		policing[bcast].sharindx = port;</div><div class='add'>+		/* Only SJA1110 has multicast policers */</div><div class='add'>+		if (mcast &lt; table-&gt;ops-&gt;max_entry_count)</div><div class='add'>+			policing[mcast].sharindx = port;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Setup the matchall policer parameters */</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		int mtu = VLAN_ETH_FRAME_LEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='add'>+			mtu += VLAN_HLEN;</div><div class='add'>+</div><div class='add'>+		policing[port].smax = 65535; /* Burst size in bytes */</div><div class='add'>+		policing[port].rate = SJA1105_RATE_MBPS(1000);</div><div class='add'>+		policing[port].maxlen = mtu;</div><div class='add'>+		policing[port].partition = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_static_config_load(struct sja1105_private *priv,</div><div class='del'>-				      struct sja1105_dt_port *ports)</div><div class='add'>+static int sja1105_static_config_load(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -515,7 +1073,7 @@ static int sja1105_static_config_load(struct sja1105_private *priv,</div><div class='ctx'> 	rc = sja1105_init_mac_settings(priv);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='del'>-	rc = sja1105_init_mii_settings(priv, ports);</div><div class='add'>+	rc = sja1105_init_mii_settings(priv);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	rc = sja1105_init_static_fdb(priv);</div><div class='hunk'>@@ -539,46 +1097,102 @@ static int sja1105_static_config_load(struct sja1105_private *priv,</div><div class='ctx'> 	rc = sja1105_init_general_params(priv);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='add'>+	rc = sja1105_init_avb_params(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = sja1110_init_pcp_remapping(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Send initial configuration to hardware via SPI */</div><div class='ctx'> 	return sja1105_static_config_upload(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_parse_rgmii_delays(struct sja1105_private *priv,</div><div class='del'>-				      const struct sja1105_dt_port *ports)</div><div class='add'>+/* This is the "new way" for a MAC driver to configure its RGMII delay lines,</div><div class='add'>+ * based on the explicit "rx-internal-delay-ps" and "tx-internal-delay-ps"</div><div class='add'>+ * properties. It has the advantage of working with fixed links and with PHYs</div><div class='add'>+ * that apply RGMII delays too, and the MAC driver needs not perform any</div><div class='add'>+ * special checks.</div><div class='add'>+ *</div><div class='add'>+ * Previously we were acting upon the "phy-mode" property when we were</div><div class='add'>+ * operating in fixed-link, basically acting as a PHY, but with a reversed</div><div class='add'>+ * interpretation: PHY_INTERFACE_MODE_RGMII_TXID means that the MAC should</div><div class='add'>+ * behave as if it is connected to a PHY which has applied RGMII delays in the</div><div class='add'>+ * TX direction. So if anything, RX delays should have been added by the MAC,</div><div class='add'>+ * but we were adding TX delays.</div><div class='add'>+ *</div><div class='add'>+ * If the "{rx,tx}-internal-delay-ps" properties are not specified, we fall</div><div class='add'>+ * back to the legacy behavior and apply delays on fixed-link ports based on</div><div class='add'>+ * the reverse interpretation of the phy-mode. This is a deviation from the</div><div class='add'>+ * expected default behavior which is to simply apply no delays. To achieve</div><div class='add'>+ * that behavior with the new bindings, it is mandatory to specify</div><div class='add'>+ * "{rx,tx}-internal-delay-ps" with a value of 0.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_parse_rgmii_delays(struct sja1105_private *priv, int port,</div><div class='add'>+				      struct device_node *port_dn)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	phy_interface_t phy_mode = priv-&gt;phy_mode[port];</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	int rx_delay = -1, tx_delay = -1;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		if (ports-&gt;role == XMII_MAC)</div><div class='del'>-			continue;</div><div class='add'>+	if (!phy_interface_mode_is_rgmii(phy_mode))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		if (ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||</div><div class='del'>-		    ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='del'>-			priv-&gt;rgmii_rx_delay[i] = true;</div><div class='add'>+	of_property_read_u32(port_dn, "rx-internal-delay-ps", &amp;rx_delay);</div><div class='add'>+	of_property_read_u32(port_dn, "tx-internal-delay-ps", &amp;tx_delay);</div><div class='ctx'> </div><div class='del'>-		if (ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||</div><div class='del'>-		    ports-&gt;phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='del'>-			priv-&gt;rgmii_tx_delay[i] = true;</div><div class='add'>+	if (rx_delay == -1 &amp;&amp; tx_delay == -1 &amp;&amp; priv-&gt;fixed_link[port]) {</div><div class='add'>+		dev_warn(dev,</div><div class='add'>+			 "Port %d interpreting RGMII delay settings based on \"phy-mode\" property, "</div><div class='add'>+			 "please update device tree to specify \"rx-internal-delay-ps\" and "</div><div class='add'>+			 "\"tx-internal-delay-ps\"",</div><div class='add'>+			 port);</div><div class='ctx'> </div><div class='del'>-		if ((priv-&gt;rgmii_rx_delay[i] || priv-&gt;rgmii_tx_delay[i]) &amp;&amp;</div><div class='del'>-		     !priv-&gt;info-&gt;setup_rgmii_delay)</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		if (phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||</div><div class='add'>+		    phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='add'>+			rx_delay = 2000;</div><div class='add'>+</div><div class='add'>+		if (phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||</div><div class='add'>+		    phy_mode == PHY_INTERFACE_MODE_RGMII_ID)</div><div class='add'>+			tx_delay = 2000;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_delay &lt; 0)</div><div class='add'>+		rx_delay = 0;</div><div class='add'>+	if (tx_delay &lt; 0)</div><div class='add'>+		tx_delay = 0;</div><div class='add'>+</div><div class='add'>+	if ((rx_delay || tx_delay) &amp;&amp; !priv-&gt;info-&gt;setup_rgmii_delay) {</div><div class='add'>+		dev_err(dev, "Chip cannot apply RGMII delays\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((rx_delay &amp;&amp; rx_delay &lt; SJA1105_RGMII_DELAY_MIN_PS) ||</div><div class='add'>+	    (tx_delay &amp;&amp; tx_delay &lt; SJA1105_RGMII_DELAY_MIN_PS) ||</div><div class='add'>+	    (rx_delay &gt; SJA1105_RGMII_DELAY_MAX_PS) ||</div><div class='add'>+	    (tx_delay &gt; SJA1105_RGMII_DELAY_MAX_PS)) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"port %d RGMII delay values out of range, must be between %d and %d ps\n",</div><div class='add'>+			port, SJA1105_RGMII_DELAY_MIN_PS, SJA1105_RGMII_DELAY_MAX_PS);</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rgmii_rx_delay_ps[port] = rx_delay;</div><div class='add'>+	priv-&gt;rgmii_tx_delay_ps[port] = tx_delay;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_parse_ports_node(struct sja1105_private *priv,</div><div class='del'>-				    struct sja1105_dt_port *ports,</div><div class='ctx'> 				    struct device_node *ports_node)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='del'>-	struct device_node *child;</div><div class='ctx'> </div><div class='del'>-	for_each_child_of_node(ports_node, child) {</div><div class='add'>+	for_each_available_child_of_node_scoped(ports_node, child) {</div><div class='ctx'> 		struct device_node *phy_node;</div><div class='del'>-		int phy_mode;</div><div class='add'>+		phy_interface_t phy_mode;</div><div class='ctx'> 		u32 index;</div><div class='add'>+		int err;</div><div class='ctx'> </div><div class='ctx'> 		/* Get switch port number from DT */</div><div class='ctx'> 		if (of_property_read_u32(child, "reg", &amp;index) &lt; 0) {</div><div class='hunk'>@@ -588,14 +1202,13 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Get PHY mode from DT */</div><div class='del'>-		phy_mode = of_get_phy_mode(child);</div><div class='del'>-		if (phy_mode &lt; 0) {</div><div class='add'>+		err = of_get_phy_mode(child, &amp;phy_mode);</div><div class='add'>+		if (err) {</div><div class='ctx'> 			dev_err(dev, "Failed to read phy-mode or "</div><div class='ctx'> 				"phy-interface-type property for port %d\n",</div><div class='ctx'> 				index);</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='del'>-		ports[index].phy_mode = phy_mode;</div><div class='ctx'> </div><div class='ctx'> 		phy_node = of_parse_phandle(child, "phy-handle", 0);</div><div class='ctx'> 		if (!phy_node) {</div><div class='hunk'>@@ -607,25 +1220,22 @@ static int sja1105_parse_ports_node(struct sja1105_private *priv,</div><div class='ctx'> 			/* phy-handle is missing, but fixed-link isn't.</div><div class='ctx'> 			 * So it's a fixed link. Default to PHY role.</div><div class='ctx'> 			 */</div><div class='del'>-			ports[index].role = XMII_PHY;</div><div class='add'>+			priv-&gt;fixed_link[index] = true;</div><div class='ctx'> 		} else {</div><div class='del'>-			/* phy-handle present =&gt; put port in MAC role */</div><div class='del'>-			ports[index].role = XMII_MAC;</div><div class='ctx'> 			of_node_put(phy_node);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* The MAC/PHY role can be overridden with explicit bindings */</div><div class='del'>-		if (of_property_read_bool(child, "sja1105,role-mac"))</div><div class='del'>-			ports[index].role = XMII_MAC;</div><div class='del'>-		else if (of_property_read_bool(child, "sja1105,role-phy"))</div><div class='del'>-			ports[index].role = XMII_PHY;</div><div class='add'>+		priv-&gt;phy_mode[index] = phy_mode;</div><div class='add'>+</div><div class='add'>+		err = sja1105_parse_rgmii_delays(priv, index, child);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_parse_dt(struct sja1105_private *priv,</div><div class='del'>-			    struct sja1105_dt_port *ports)</div><div class='add'>+static int sja1105_parse_dt(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='ctx'> 	struct device_node *switch_node = dev-&gt;of_node;</div><div class='hunk'>@@ -633,72 +1243,79 @@ static int sja1105_parse_dt(struct sja1105_private *priv,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	ports_node = of_get_child_by_name(switch_node, "ports");</div><div class='add'>+	if (!ports_node)</div><div class='add'>+		ports_node = of_get_child_by_name(switch_node, "ethernet-ports");</div><div class='ctx'> 	if (!ports_node) {</div><div class='ctx'> 		dev_err(dev, "Incorrect bindings: absent \"ports\" node\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = sja1105_parse_ports_node(priv, ports, ports_node);</div><div class='add'>+	rc = sja1105_parse_ports_node(priv, ports_node);</div><div class='ctx'> 	of_node_put(ports_node);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Convert back and forth MAC speed from Mbps to SJA1105 encoding */</div><div class='del'>-static int sja1105_speed[] = {</div><div class='del'>-	[SJA1105_SPEED_AUTO]     = 0,</div><div class='del'>-	[SJA1105_SPEED_10MBPS]   = 10,</div><div class='del'>-	[SJA1105_SPEED_100MBPS]  = 100,</div><div class='del'>-	[SJA1105_SPEED_1000MBPS] = 1000,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static sja1105_speed_t sja1105_get_speed_cfg(unsigned int speed_mbps)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = SJA1105_SPEED_AUTO; i &lt;= SJA1105_SPEED_1000MBPS; i++)</div><div class='del'>-		if (sja1105_speed[i] == speed_mbps)</div><div class='del'>-			return i;</div><div class='del'>-	return -EINVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set link speed and enable/disable traffic I/O in the MAC configuration</div><div class='del'>- * for a specific port.</div><div class='del'>- *</div><div class='del'>- * @speed_mbps: If 0, leave the speed unchanged, else adapt MAC to PHY speed.</div><div class='del'>- * @enabled: Manage Rx and Tx settings for this port. If false, overrides the</div><div class='del'>- *	     settings from the STP state, but not persistently (does not</div><div class='del'>- *	     overwrite the static MAC info for this port).</div><div class='del'>- */</div><div class='del'>-static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,</div><div class='del'>-				      int speed_mbps, bool enabled)</div><div class='add'>+static int sja1105_set_port_speed(struct sja1105_private *priv, int port,</div><div class='add'>+				  int speed_mbps)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_mac_config_entry dyn_mac;</div><div class='del'>-	struct sja1105_xmii_params_entry *mii;</div><div class='ctx'> 	struct sja1105_mac_config_entry *mac;</div><div class='del'>-	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='del'>-	sja1105_phy_interface_t phy_mode;</div><div class='del'>-	sja1105_speed_t speed;</div><div class='del'>-	int rc;</div><div class='add'>+	u64 speed;</div><div class='ctx'> </div><div class='del'>-	mii = priv-&gt;static_config.tables[BLK_IDX_XMII_PARAMS].entries;</div><div class='add'>+	/* On P/Q/R/S, one can read from the device via the MAC reconfiguration</div><div class='add'>+	 * tables. On E/T, MAC reconfig tables are not readable, only writable.</div><div class='add'>+	 * We have to *know* what the MAC looks like.  For the sake of keeping</div><div class='add'>+	 * the code common, we'll use the static configuration tables as a</div><div class='add'>+	 * reasonable approximation for both E/T and P/Q/R/S.</div><div class='add'>+	 */</div><div class='ctx'> 	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='ctx'> </div><div class='del'>-	speed = sja1105_get_speed_cfg(speed_mbps);</div><div class='del'>-	if (speed_mbps &amp;&amp; speed &lt; 0) {</div><div class='del'>-		dev_err(dev, "Invalid speed %iMbps\n", speed_mbps);</div><div class='add'>+	switch (speed_mbps) {</div><div class='add'>+	case SPEED_UNKNOWN:</div><div class='add'>+		/* PHYLINK called sja1105_mac_config() to inform us about</div><div class='add'>+		 * the state-&gt;interface, but AN has not completed and the</div><div class='add'>+		 * speed is not yet valid. UM10944.pdf says that setting</div><div class='add'>+		 * SJA1105_SPEED_AUTO at runtime disables the port, so that is</div><div class='add'>+		 * ok for power consumption in case AN will never complete -</div><div class='add'>+		 * otherwise PHYLINK should come back with a new update.</div><div class='add'>+		 */</div><div class='add'>+		speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_AUTO];</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_10MBPS];</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_100MBPS];</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_1000MBPS];</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_2500:</div><div class='add'>+		speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_2500MBPS];</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(priv-&gt;ds-&gt;dev, "Invalid speed %iMbps\n", speed_mbps);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If requested, overwrite SJA1105_SPEED_AUTO from the static MAC</div><div class='del'>-	 * configuration table, since this will be used for the clocking setup,</div><div class='del'>-	 * and we no longer need to store it in the static config (already told</div><div class='del'>-	 * hardware we want auto during upload phase).</div><div class='add'>+	/* Overwrite SJA1105_SPEED_AUTO from the static MAC configuration</div><div class='add'>+	 * table, since this will be used for the clocking setup, and we no</div><div class='add'>+	 * longer need to store it in the static config (already told hardware</div><div class='add'>+	 * we want auto during upload phase).</div><div class='ctx'> 	 */</div><div class='del'>-	if (speed_mbps)</div><div class='del'>-		mac[port].speed = speed;</div><div class='del'>-	else</div><div class='del'>-		mac[port].speed = SJA1105_SPEED_AUTO;</div><div class='add'>+	mac[port].speed = speed;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write the MAC Configuration Table entry and, if necessary, the CGU settings,</div><div class='add'>+ * after a link speedchange for this port.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_set_port_config(struct sja1105_private *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* On P/Q/R/S, one can read from the device via the MAC reconfiguration</div><div class='ctx'> 	 * tables. On E/T, MAC reconfig tables are not readable, only writable.</div><div class='hunk'>@@ -706,13 +1323,11 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,</div><div class='ctx'> 	 * the code common, we'll use the static configuration tables as a</div><div class='ctx'> 	 * reasonable approximation for both E/T and P/Q/R/S.</div><div class='ctx'> 	 */</div><div class='del'>-	dyn_mac = mac[port];</div><div class='del'>-	dyn_mac.ingress = enabled &amp;&amp; mac[port].ingress;</div><div class='del'>-	dyn_mac.egress  = enabled &amp;&amp; mac[port].egress;</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='ctx'> </div><div class='ctx'> 	/* Write to the dynamic reconfiguration tables */</div><div class='del'>-	rc = sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG,</div><div class='del'>-					  port, &amp;dyn_mac, true);</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, port,</div><div class='add'>+					  &amp;mac[port], true);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "Failed to write MAC config: %d\n", rc);</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -724,54 +1339,165 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,</div><div class='ctx'> 	 * the clock setup does interrupt the clock signal for a certain time</div><div class='ctx'> 	 * which causes trouble for all PHYs relying on this signal.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!enabled)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	phy_mode = mii-&gt;xmii_mode[port];</div><div class='del'>-	if (phy_mode != XMII_MODE_RGMII)</div><div class='add'>+	if (!phy_interface_mode_is_rgmii(priv-&gt;phy_mode[port]))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	return sja1105_clocking_setup_port(priv, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sja1105_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-				struct phy_device *phydev)</div><div class='add'>+static struct phylink_pcs *</div><div class='add'>+sja1105_mac_select_pcs(struct phylink_config *config, phy_interface_t iface)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct sja1105_private *priv = dp-&gt;ds-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	if (!phydev-&gt;link)</div><div class='del'>-		sja1105_adjust_port_config(priv, port, 0, false);</div><div class='del'>-	else</div><div class='del'>-		sja1105_adjust_port_config(priv, port, phydev-&gt;speed, true);</div><div class='add'>+	return priv-&gt;pcs[dp-&gt;index];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sja1105_phylink_validate(struct dsa_switch *ds, int port,</div><div class='del'>-				     unsigned long *supported,</div><div class='del'>-				     struct phylink_link_state *state)</div><div class='add'>+static void sja1105_mac_config(struct phylink_config *config,</div><div class='add'>+			       unsigned int mode,</div><div class='add'>+			       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_mac_link_down(struct phylink_config *config,</div><div class='add'>+				  unsigned int mode,</div><div class='add'>+				  phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+</div><div class='add'>+	sja1105_inhibit_tx(dp-&gt;ds-&gt;priv, BIT(dp-&gt;index), true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_mac_link_up(struct phylink_config *config,</div><div class='add'>+				struct phy_device *phydev,</div><div class='add'>+				unsigned int mode,</div><div class='add'>+				phy_interface_t interface,</div><div class='add'>+				int speed, int duplex,</div><div class='add'>+				bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct sja1105_private *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	if (!sja1105_set_port_speed(priv, port, speed))</div><div class='add'>+		sja1105_set_port_config(priv, port);</div><div class='add'>+</div><div class='add'>+	sja1105_inhibit_tx(priv, BIT(port), false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='ctx'> {</div><div class='del'>-	/* Construct a new mask which exhaustively contains all link features</div><div class='del'>-	 * supported by the MAC, and then apply that (logical AND) to what will</div><div class='del'>-	 * be sent to the PHY for "marketing".</div><div class='del'>-	 */</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	struct sja1105_xmii_params_entry *mii;</div><div class='add'>+	phy_interface_t phy_mode;</div><div class='ctx'> </div><div class='del'>-	mii = priv-&gt;static_config.tables[BLK_IDX_XMII_PARAMS].entries;</div><div class='add'>+	phy_mode = priv-&gt;phy_mode[port];</div><div class='add'>+	if (phy_mode == PHY_INTERFACE_MODE_SGMII ||</div><div class='add'>+	    phy_mode == PHY_INTERFACE_MODE_2500BASEX) {</div><div class='add'>+		/* Changing the PHY mode on SERDES ports is possible and makes</div><div class='add'>+		 * sense, because that is done through the XPCS. We allow</div><div class='add'>+		 * changes between SGMII and 2500base-X.</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;info-&gt;supports_sgmii[port])</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+				  config-&gt;supported_interfaces);</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;info-&gt;supports_2500basex[port])</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_2500BASEX,</div><div class='add'>+				  config-&gt;supported_interfaces);</div><div class='add'>+	} else {</div><div class='add'>+		/* The SJA1105 MAC programming model is through the static</div><div class='add'>+		 * config (the xMII Mode table cannot be dynamically</div><div class='add'>+		 * reconfigured), and we have to program that early.</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(phy_mode, config-&gt;supported_interfaces);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* The MAC does not support pause frames, and also doesn't</div><div class='ctx'> 	 * support half-duplex traffic modes.</div><div class='ctx'> 	 */</div><div class='del'>-	phylink_set(mask, Autoneg);</div><div class='del'>-	phylink_set(mask, MII);</div><div class='del'>-	phylink_set(mask, 10baseT_Full);</div><div class='del'>-	phylink_set(mask, 100baseT_Full);</div><div class='del'>-	if (mii-&gt;xmii_mode[port] == XMII_MODE_RGMII)</div><div class='del'>-		phylink_set(mask, 1000baseT_Full);</div><div class='add'>+	config-&gt;mac_capabilities = MAC_10FD | MAC_100FD;</div><div class='add'>+</div><div class='add'>+	mii = priv-&gt;static_config.tables[BLK_IDX_XMII_PARAMS].entries;</div><div class='add'>+	if (mii-&gt;xmii_mode[port] == XMII_MODE_RGMII ||</div><div class='add'>+	    mii-&gt;xmii_mode[port] == XMII_MODE_SGMII)</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;info-&gt;supports_2500basex[port])</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+sja1105_find_static_fdb_entry(struct sja1105_private *priv, int port,</div><div class='add'>+			      const struct sja1105_l2_lookup_entry *requested)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry *l2_lookup;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP];</div><div class='add'>+	l2_lookup = table-&gt;entries;</div><div class='ctx'> </div><div class='del'>-	bitmap_and(supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='del'>-	bitmap_and(state-&gt;advertising, state-&gt;advertising, mask,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	for (i = 0; i &lt; table-&gt;entry_count; i++)</div><div class='add'>+		if (l2_lookup[i].macaddr == requested-&gt;macaddr &amp;&amp;</div><div class='add'>+		    l2_lookup[i].vlanid == requested-&gt;vlanid &amp;&amp;</div><div class='add'>+		    l2_lookup[i].destports &amp; BIT(port))</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We want FDB entries added statically through the bridge command to persist</div><div class='add'>+ * across switch resets, which are a common thing during normal SJA1105</div><div class='add'>+ * operation. So we have to back them up in the static configuration tables</div><div class='add'>+ * and hence apply them on next static config upload... yay!</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+sja1105_static_fdb_change(struct sja1105_private *priv, int port,</div><div class='add'>+			  const struct sja1105_l2_lookup_entry *requested,</div><div class='add'>+			  bool keep)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry *l2_lookup;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int rc, match;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP];</div><div class='add'>+</div><div class='add'>+	match = sja1105_find_static_fdb_entry(priv, port, requested);</div><div class='add'>+	if (match &lt; 0) {</div><div class='add'>+		/* Can't delete a missing entry. */</div><div class='add'>+		if (!keep)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* No match =&gt; new entry */</div><div class='add'>+		rc = sja1105_table_resize(table, table-&gt;entry_count + 1);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		match = table-&gt;entry_count - 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Assign pointer after the resize (it may be new memory) */</div><div class='add'>+	l2_lookup = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* We have a match.</div><div class='add'>+	 * If the job was to add this FDB entry, it's already done (mostly</div><div class='add'>+	 * anyway, since the port forwarding mask may have changed, case in</div><div class='add'>+	 * which we update it).</div><div class='add'>+	 * Otherwise we have to delete it.</div><div class='add'>+	 */</div><div class='add'>+	if (keep) {</div><div class='add'>+		l2_lookup[match] = *requested;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* To remove, the strategy is to overwrite the element with</div><div class='add'>+	 * the last one, and then reduce the array size by 1</div><div class='add'>+	 */</div><div class='add'>+	l2_lookup[match] = l2_lookup[table-&gt;entry_count - 1];</div><div class='add'>+	return sja1105_table_resize(table, table-&gt;entry_count - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* First-generation switches have a 4-way set associative TCAM that</div><div class='hunk'>@@ -780,15 +1506,15 @@ static void sja1105_phylink_validate(struct dsa_switch *ds, int port,</div><div class='ctx'>  * For the placement of a newly learnt FDB entry, the switch selects the bin</div><div class='ctx'>  * based on a hash function, and the way within that bin incrementally.</div><div class='ctx'>  */</div><div class='del'>-static inline int sja1105et_fdb_index(int bin, int way)</div><div class='add'>+static int sja1105et_fdb_index(int bin, int way)</div><div class='ctx'> {</div><div class='ctx'> 	return bin * SJA1105ET_FDB_BIN_SIZE + way;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_is_fdb_entry_in_bin(struct sja1105_private *priv, int bin,</div><div class='del'>-				       const u8 *addr, u16 vid,</div><div class='del'>-				       struct sja1105_l2_lookup_entry *match,</div><div class='del'>-				       int *last_unused)</div><div class='add'>+static int sja1105et_is_fdb_entry_in_bin(struct sja1105_private *priv, int bin,</div><div class='add'>+					 const u8 *addr, u16 vid,</div><div class='add'>+					 struct sja1105_l2_lookup_entry *match,</div><div class='add'>+					 int *last_unused)</div><div class='ctx'> {</div><div class='ctx'> 	int way;</div><div class='ctx'> </div><div class='hunk'>@@ -817,25 +1543,26 @@ static int sja1105_is_fdb_entry_in_bin(struct sja1105_private *priv, int bin,</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_fdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-			   const unsigned char *addr, u16 vid)</div><div class='add'>+int sja1105et_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+		      const unsigned char *addr, u16 vid)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_l2_lookup_entry l2_lookup = {0};</div><div class='add'>+	struct sja1105_l2_lookup_entry l2_lookup = {0}, tmp;</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	struct device *dev = ds-&gt;dev;</div><div class='ctx'> 	int last_unused = -1;</div><div class='del'>-	int bin, way;</div><div class='add'>+	int start, end, i;</div><div class='add'>+	int bin, way, rc;</div><div class='ctx'> </div><div class='del'>-	bin = sja1105_fdb_hash(priv, addr, vid);</div><div class='add'>+	bin = sja1105et_fdb_hash(priv, addr, vid);</div><div class='ctx'> </div><div class='del'>-	way = sja1105_is_fdb_entry_in_bin(priv, bin, addr, vid,</div><div class='del'>-					  &amp;l2_lookup, &amp;last_unused);</div><div class='add'>+	way = sja1105et_is_fdb_entry_in_bin(priv, bin, addr, vid,</div><div class='add'>+					    &amp;l2_lookup, &amp;last_unused);</div><div class='ctx'> 	if (way &gt;= 0) {</div><div class='ctx'> 		/* We have an FDB entry. Is our port in the destination</div><div class='ctx'> 		 * mask? If yes, we need to do nothing. If not, we need</div><div class='ctx'> 		 * to rewrite the entry by adding this port to it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (l2_lookup.destports &amp; BIT(port))</div><div class='add'>+		if ((l2_lookup.destports &amp; BIT(port)) &amp;&amp; l2_lookup.lockeds)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		l2_lookup.destports |= BIT(port);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -866,24 +1593,52 @@ static int sja1105_fdb_add(struct dsa_switch *ds, int port,</div><div class='ctx'> 						     index, NULL, false);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	l2_lookup.lockeds = true;</div><div class='ctx'> 	l2_lookup.index = sja1105et_fdb_index(bin, way);</div><div class='ctx'> </div><div class='del'>-	return sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='del'>-					    l2_lookup.index, &amp;l2_lookup,</div><div class='del'>-					    true);</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					  l2_lookup.index, &amp;l2_lookup,</div><div class='add'>+					  true);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Invalidate a dynamically learned entry if that exists */</div><div class='add'>+	start = sja1105et_fdb_index(bin, 0);</div><div class='add'>+	end = sja1105et_fdb_index(bin, way);</div><div class='add'>+</div><div class='add'>+	for (i = start; i &lt; end; i++) {</div><div class='add'>+		rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						 i, &amp;tmp);</div><div class='add'>+		if (rc == -ENOENT)</div><div class='add'>+			continue;</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		if (tmp.macaddr != ether_addr_to_u64(addr) || tmp.vlanid != vid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						  i, NULL, false);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sja1105_static_fdb_change(priv, port, &amp;l2_lookup, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_fdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-			   const unsigned char *addr, u16 vid)</div><div class='add'>+int sja1105et_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+		      const unsigned char *addr, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_l2_lookup_entry l2_lookup = {0};</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	int index, bin, way;</div><div class='add'>+	int index, bin, way, rc;</div><div class='ctx'> 	bool keep;</div><div class='ctx'> </div><div class='del'>-	bin = sja1105_fdb_hash(priv, addr, vid);</div><div class='del'>-	way = sja1105_is_fdb_entry_in_bin(priv, bin, addr, vid,</div><div class='del'>-					  &amp;l2_lookup, NULL);</div><div class='add'>+	bin = sja1105et_fdb_hash(priv, addr, vid);</div><div class='add'>+	way = sja1105et_is_fdb_entry_in_bin(priv, bin, addr, vid,</div><div class='add'>+					    &amp;l2_lookup, NULL);</div><div class='ctx'> 	if (way &lt; 0)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	index = sja1105et_fdb_index(bin, way);</div><div class='hunk'>@@ -893,15 +1648,210 @@ static int sja1105_fdb_del(struct dsa_switch *ds, int port,</div><div class='ctx'> 	 * need to completely evict the FDB entry.</div><div class='ctx'> 	 * Otherwise we just write it back.</div><div class='ctx'> 	 */</div><div class='del'>-	if (l2_lookup.destports &amp; BIT(port))</div><div class='del'>-		l2_lookup.destports &amp;= ~BIT(port);</div><div class='add'>+	l2_lookup.destports &amp;= ~BIT(port);</div><div class='add'>+</div><div class='ctx'> 	if (l2_lookup.destports)</div><div class='ctx'> 		keep = true;</div><div class='ctx'> 	else</div><div class='ctx'> 		keep = false;</div><div class='ctx'> </div><div class='del'>-	return sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='del'>-					    index, &amp;l2_lookup, keep);</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					  index, &amp;l2_lookup, keep);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_fdb_change(priv, port, &amp;l2_lookup, keep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105pqrs_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry l2_lookup = {0}, tmp;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	/* Search for an existing entry in the FDB table */</div><div class='add'>+	l2_lookup.macaddr = ether_addr_to_u64(addr);</div><div class='add'>+	l2_lookup.vlanid = vid;</div><div class='add'>+	l2_lookup.mask_macaddr = GENMASK_ULL(ETH_ALEN * 8 - 1, 0);</div><div class='add'>+	l2_lookup.mask_vlanid = VLAN_VID_MASK;</div><div class='add'>+	l2_lookup.destports = BIT(port);</div><div class='add'>+</div><div class='add'>+	tmp = l2_lookup;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					 SJA1105_SEARCH, &amp;tmp);</div><div class='add'>+	if (rc == 0 &amp;&amp; tmp.index != SJA1105_MAX_L2_LOOKUP_COUNT - 1) {</div><div class='add'>+		/* Found a static entry and this port is already in the entry's</div><div class='add'>+		 * port mask =&gt; job done</div><div class='add'>+		 */</div><div class='add'>+		if ((tmp.destports &amp; BIT(port)) &amp;&amp; tmp.lockeds)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		l2_lookup = tmp;</div><div class='add'>+</div><div class='add'>+		/* l2_lookup.index is populated by the switch in case it</div><div class='add'>+		 * found something.</div><div class='add'>+		 */</div><div class='add'>+		l2_lookup.destports |= BIT(port);</div><div class='add'>+		goto skip_finding_an_index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Not found, so try to find an unused spot in the FDB.</div><div class='add'>+	 * This is slightly inefficient because the strategy is knock-knock at</div><div class='add'>+	 * every possible position from 0 to 1023.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; SJA1105_MAX_L2_LOOKUP_COUNT; i++) {</div><div class='add'>+		rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						 i, NULL);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (i == SJA1105_MAX_L2_LOOKUP_COUNT) {</div><div class='add'>+		dev_err(ds-&gt;dev, "FDB is full, cannot add entry.\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	l2_lookup.index = i;</div><div class='add'>+</div><div class='add'>+skip_finding_an_index:</div><div class='add'>+	l2_lookup.lockeds = true;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					  l2_lookup.index, &amp;l2_lookup,</div><div class='add'>+					  true);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* The switch learns dynamic entries and looks up the FDB left to</div><div class='add'>+	 * right. It is possible that our addition was concurrent with the</div><div class='add'>+	 * dynamic learning of the same address, so now that the static entry</div><div class='add'>+	 * has been installed, we are certain that address learning for this</div><div class='add'>+	 * particular address has been turned off, so the dynamic entry either</div><div class='add'>+	 * is in the FDB at an index smaller than the static one, or isn't (it</div><div class='add'>+	 * can also be at a larger index, but in that case it is inactive</div><div class='add'>+	 * because the static FDB entry will match first, and the dynamic one</div><div class='add'>+	 * will eventually age out). Search for a dynamically learned address</div><div class='add'>+	 * prior to our static one and invalidate it.</div><div class='add'>+	 */</div><div class='add'>+	tmp = l2_lookup;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					 SJA1105_SEARCH, &amp;tmp);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"port %d failed to read back entry for %pM vid %d: %pe\n",</div><div class='add'>+			port, addr, vid, ERR_PTR(rc));</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tmp.index &lt; l2_lookup.index) {</div><div class='add'>+		rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						  tmp.index, NULL, false);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sja1105_static_fdb_change(priv, port, &amp;l2_lookup, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105pqrs_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry l2_lookup = {0};</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	bool keep;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	l2_lookup.macaddr = ether_addr_to_u64(addr);</div><div class='add'>+	l2_lookup.vlanid = vid;</div><div class='add'>+	l2_lookup.mask_macaddr = GENMASK_ULL(ETH_ALEN * 8 - 1, 0);</div><div class='add'>+	l2_lookup.mask_vlanid = VLAN_VID_MASK;</div><div class='add'>+	l2_lookup.destports = BIT(port);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					 SJA1105_SEARCH, &amp;l2_lookup);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	l2_lookup.destports &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	/* Decide whether we remove just this port from the FDB entry,</div><div class='add'>+	 * or if we remove it completely.</div><div class='add'>+	 */</div><div class='add'>+	if (l2_lookup.destports)</div><div class='add'>+		keep = true;</div><div class='add'>+	else</div><div class='add'>+		keep = false;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					  l2_lookup.index, &amp;l2_lookup, keep);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_fdb_change(priv, port, &amp;l2_lookup, keep);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   const unsigned char *addr, u16 vid,</div><div class='add'>+			   struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!vid) {</div><div class='add'>+		switch (db.type) {</div><div class='add'>+		case DSA_DB_PORT:</div><div class='add'>+			vid = dsa_tag_8021q_standalone_vid(db.dp);</div><div class='add'>+			break;</div><div class='add'>+		case DSA_DB_BRIDGE:</div><div class='add'>+			vid = dsa_tag_8021q_bridge_vid(db.bridge.num);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+	rc = priv-&gt;info-&gt;fdb_add_cmd(ds, port, addr, vid);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __sja1105_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			     const unsigned char *addr, u16 vid,</div><div class='add'>+			     struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!vid) {</div><div class='add'>+		switch (db.type) {</div><div class='add'>+		case DSA_DB_PORT:</div><div class='add'>+			vid = dsa_tag_8021q_standalone_vid(db.dp);</div><div class='add'>+			break;</div><div class='add'>+		case DSA_DB_BRIDGE:</div><div class='add'>+			vid = dsa_tag_8021q_bridge_vid(db.bridge.num);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;fdb_del_cmd(ds, port, addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   const unsigned char *addr, u16 vid,</div><div class='add'>+			   struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+	rc = __sja1105_fdb_del(ds, port, addr, vid, db);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_fdb_dump(struct dsa_switch *ds, int port,</div><div class='hunk'>@@ -919,7 +1869,7 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 		rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='ctx'> 						 i, &amp;l2_lookup);</div><div class='ctx'> 		/* No fdb entry at i, not an issue */</div><div class='del'>-		if (rc == -EINVAL)</div><div class='add'>+		if (rc == -ENOENT)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			dev_err(dev, "Failed to dump FDB: %d\n", rc);</div><div class='hunk'>@@ -934,33 +1884,137 @@ static int sja1105_fdb_dump(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!(l2_lookup.destports &amp; BIT(port)))</div><div class='ctx'> 			continue;</div><div class='add'>+</div><div class='ctx'> 		u64_to_ether_addr(l2_lookup.macaddr, macaddr);</div><div class='del'>-		cb(macaddr, l2_lookup.vlanid, false, data);</div><div class='add'>+</div><div class='add'>+		/* Hardware FDB is shared for fdb and mdb, "bridge fdb show"</div><div class='add'>+		 * only wants to see unicast</div><div class='add'>+		 */</div><div class='add'>+		if (is_multicast_ether_addr(macaddr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* We need to hide the dsa_8021q VLANs from the user. */</div><div class='add'>+		if (vid_is_dsa_8021q(l2_lookup.vlanid))</div><div class='add'>+			l2_lookup.vlanid = 0;</div><div class='add'>+		rc = cb(macaddr, l2_lookup.vlanid, l2_lookup.lockeds, data);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* This callback needs to be present */</div><div class='del'>-static int sja1105_mdb_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-			       const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+static void sja1105_fast_age(struct dsa_switch *ds, int port)</div><div class='ctx'> {</div><div class='del'>-	return 0;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct dsa_db db = {</div><div class='add'>+		.type = DSA_DB_BRIDGE,</div><div class='add'>+		.bridge = {</div><div class='add'>+			.dev = dsa_port_bridge_dev_get(dp),</div><div class='add'>+			.num = dsa_port_bridge_num_get(dp),</div><div class='add'>+		},</div><div class='add'>+	};</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; SJA1105_MAX_L2_LOOKUP_COUNT; i++) {</div><div class='add'>+		struct sja1105_l2_lookup_entry l2_lookup = {0};</div><div class='add'>+		u8 macaddr[ETH_ALEN];</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_dynamic_config_read(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+						 i, &amp;l2_lookup);</div><div class='add'>+		/* No fdb entry at i, not an issue */</div><div class='add'>+		if (rc == -ENOENT)</div><div class='add'>+			continue;</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Failed to read FDB: %pe\n",</div><div class='add'>+				ERR_PTR(rc));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(l2_lookup.destports &amp; BIT(port)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Don't delete static FDB entries */</div><div class='add'>+		if (l2_lookup.lockeds)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		u64_to_ether_addr(l2_lookup.macaddr, macaddr);</div><div class='add'>+</div><div class='add'>+		rc = __sja1105_fdb_del(ds, port, macaddr, l2_lookup.vlanid, db);</div><div class='add'>+		if (rc) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Failed to delete FDB entry %pM vid %lld: %pe\n",</div><div class='add'>+				macaddr, l2_lookup.vlanid, ERR_PTR(rc));</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;fdb_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sja1105_mdb_add(struct dsa_switch *ds, int port,</div><div class='del'>-			    const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+static int sja1105_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			   struct dsa_db db)</div><div class='ctx'> {</div><div class='del'>-	sja1105_fdb_add(ds, port, mdb-&gt;addr, mdb-&gt;vid);</div><div class='add'>+	return sja1105_fdb_add(ds, port, mdb-&gt;addr, mdb-&gt;vid, db);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_mdb_del(struct dsa_switch *ds, int port,</div><div class='del'>-			   const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+			   const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			   struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	return sja1105_fdb_del(ds, port, mdb-&gt;addr, mdb-&gt;vid, db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Common function for unicast and broadcast flood configuration.</div><div class='add'>+ * Flooding is configured between each {ingress, egress} port pair, and since</div><div class='add'>+ * the bridge's semantics are those of "egress flooding", it means we must</div><div class='add'>+ * enable flooding towards this port from all ingress ports that are in the</div><div class='add'>+ * same forwarding domain.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_manage_flood_domains(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='del'>-	return sja1105_fdb_del(ds, port, mdb-&gt;addr, mdb-&gt;vid);</div><div class='add'>+	struct sja1105_l2_forwarding_entry *l2_fwd;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int from, to, rc;</div><div class='add'>+</div><div class='add'>+	l2_fwd = priv-&gt;static_config.tables[BLK_IDX_L2_FORWARDING].entries;</div><div class='add'>+</div><div class='add'>+	for (from = 0; from &lt; ds-&gt;num_ports; from++) {</div><div class='add'>+		u64 fl_domain = 0, bc_domain = 0;</div><div class='add'>+</div><div class='add'>+		for (to = 0; to &lt; priv-&gt;ds-&gt;num_ports; to++) {</div><div class='add'>+			if (!sja1105_can_forward(l2_fwd, from, to))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;ucast_egress_floods &amp; BIT(to))</div><div class='add'>+				fl_domain |= BIT(to);</div><div class='add'>+			if (priv-&gt;bcast_egress_floods &amp; BIT(to))</div><div class='add'>+				bc_domain |= BIT(to);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Nothing changed, nothing to do */</div><div class='add'>+		if (l2_fwd[from].fl_domain == fl_domain &amp;&amp;</div><div class='add'>+		    l2_fwd[from].bc_domain == bc_domain)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		l2_fwd[from].fl_domain = fl_domain;</div><div class='add'>+		l2_fwd[from].bc_domain = bc_domain;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_FORWARDING,</div><div class='add'>+						  from, &amp;l2_fwd[from], true);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_bridge_member(struct dsa_switch *ds, int port,</div><div class='del'>-				 struct net_device *br, bool member)</div><div class='add'>+				 struct dsa_bridge bridge, bool member)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_l2_forwarding_entry *l2_fwd;</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='hunk'>@@ -968,7 +2022,7 @@ static int sja1105_bridge_member(struct dsa_switch *ds, int port,</div><div class='ctx'> </div><div class='ctx'> 	l2_fwd = priv-&gt;static_config.tables[BLK_IDX_L2_FORWARDING].entries;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='ctx'> 		/* Add this port to the forwarding matrix of the</div><div class='ctx'> 		 * other ports in the same bridge, and viceversa.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -985,7 +2039,7 @@ static int sja1105_bridge_member(struct dsa_switch *ds, int port,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (i == port)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (dsa_to_port(ds, i)-&gt;bridge_dev != br)</div><div class='add'>+		if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='ctx'> 			continue;</div><div class='ctx'> 		sja1105_port_allow_traffic(l2_fwd, i, port, member);</div><div class='ctx'> 		sja1105_port_allow_traffic(l2_fwd, port, i, member);</div><div class='hunk'>@@ -996,13 +2050,22 @@ static int sja1105_bridge_member(struct dsa_switch *ds, int port,</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return sja1105_dynamic_config_write(priv, BLK_IDX_L2_FORWARDING,</div><div class='del'>-					    port, &amp;l2_fwd[port], true);</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_FORWARDING,</div><div class='add'>+					  port, &amp;l2_fwd[port], true);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_commit_pvid(ds, port);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return sja1105_manage_flood_domains(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sja1105_bridge_stp_state_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 					 u8 state)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	struct sja1105_mac_config_entry *mac;</div><div class='ctx'> </div><div class='hunk'>@@ -1011,6 +2074,7 @@ static void sja1105_bridge_stp_state_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 	switch (state) {</div><div class='ctx'> 	case BR_STATE_DISABLED:</div><div class='ctx'> 	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='ctx'> 		/* From UM10944 description of DRPDTAG (why put this there?):</div><div class='ctx'> 		 * "Management traffic flows to the port regardless of the state</div><div class='ctx'> 		 * of the INGRESS flag". So BPDUs are still be allowed to pass.</div><div class='hunk'>@@ -1020,20 +2084,15 @@ static void sja1105_bridge_stp_state_set(struct dsa_switch *ds, int port,</div><div class='ctx'> 		mac[port].egress    = false;</div><div class='ctx'> 		mac[port].dyn_learn = false;</div><div class='ctx'> 		break;</div><div class='del'>-	case BR_STATE_LISTENING:</div><div class='del'>-		mac[port].ingress   = true;</div><div class='del'>-		mac[port].egress    = false;</div><div class='del'>-		mac[port].dyn_learn = false;</div><div class='del'>-		break;</div><div class='ctx'> 	case BR_STATE_LEARNING:</div><div class='ctx'> 		mac[port].ingress   = true;</div><div class='ctx'> 		mac[port].egress    = false;</div><div class='del'>-		mac[port].dyn_learn = true;</div><div class='add'>+		mac[port].dyn_learn = dp-&gt;learning;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BR_STATE_FORWARDING:</div><div class='ctx'> 		mac[port].ingress   = true;</div><div class='ctx'> 		mac[port].egress    = true;</div><div class='del'>-		mac[port].dyn_learn = true;</div><div class='add'>+		mac[port].dyn_learn = dp-&gt;learning;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(ds-&gt;dev, "invalid STP state: %d\n", state);</div><div class='hunk'>@@ -1045,193 +2104,443 @@ static void sja1105_bridge_stp_state_set(struct dsa_switch *ds, int port,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_bridge_join(struct dsa_switch *ds, int port,</div><div class='del'>-			       struct net_device *br)</div><div class='add'>+			       struct dsa_bridge bridge,</div><div class='add'>+			       bool *tx_fwd_offload,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	return sja1105_bridge_member(ds, port, br, true);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_bridge_member(ds, port, bridge, true);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = dsa_tag_8021q_bridge_join(ds, port, bridge, tx_fwd_offload,</div><div class='add'>+				       extack);</div><div class='add'>+	if (rc) {</div><div class='add'>+		sja1105_bridge_member(ds, port, bridge, false);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void sja1105_bridge_leave(struct dsa_switch *ds, int port,</div><div class='del'>-				 struct net_device *br)</div><div class='add'>+				 struct dsa_bridge bridge)</div><div class='ctx'> {</div><div class='del'>-	sja1105_bridge_member(ds, port, br, false);</div><div class='add'>+	dsa_tag_8021q_bridge_leave(ds, port, bridge);</div><div class='add'>+	sja1105_bridge_member(ds, port, bridge, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u8 sja1105_stp_state_get(struct sja1105_private *priv, int port)</div><div class='add'>+/* Port 0 (the uC port) does not have CBS shapers */</div><div class='add'>+#define SJA1110_FIXED_CBS(port, prio) ((((port) - 1) * SJA1105_NUM_TC) + (prio))</div><div class='add'>+</div><div class='add'>+static int sja1105_find_cbs_shaper(struct sja1105_private *priv,</div><div class='add'>+				   int port, int prio)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_mac_config_entry *mac;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+	if (priv-&gt;info-&gt;fixed_cbs_mapping) {</div><div class='add'>+		i = SJA1110_FIXED_CBS(port, prio);</div><div class='add'>+		if (i &gt;= 0 &amp;&amp; i &lt; priv-&gt;info-&gt;num_cbs_shapers)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;num_cbs_shapers; i++)</div><div class='add'>+		if (priv-&gt;cbs[i].port == port &amp;&amp; priv-&gt;cbs[i].prio == prio)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_find_unused_cbs_shaper(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;info-&gt;fixed_cbs_mapping)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;num_cbs_shapers; i++)</div><div class='add'>+		if (!priv-&gt;cbs[i].idle_slope &amp;&amp; !priv-&gt;cbs[i].send_slope)</div><div class='add'>+			return i;</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_delete_cbs_shaper(struct sja1105_private *priv, int port,</div><div class='add'>+				     int prio)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;num_cbs_shapers; i++) {</div><div class='add'>+		struct sja1105_cbs_entry *cbs = &amp;priv-&gt;cbs[i];</div><div class='add'>+</div><div class='add'>+		if (cbs-&gt;port == port &amp;&amp; cbs-&gt;prio == prio) {</div><div class='add'>+			memset(cbs, 0, sizeof(*cbs));</div><div class='add'>+			return sja1105_dynamic_config_write(priv, BLK_IDX_CBS,</div><div class='add'>+							    i, cbs, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_setup_tc_cbs(struct dsa_switch *ds, int port,</div><div class='add'>+				struct tc_cbs_qopt_offload *offload)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_cbs_entry *cbs;</div><div class='add'>+	s64 port_transmit_rate_kbps;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (!offload-&gt;enable)</div><div class='add'>+		return sja1105_delete_cbs_shaper(priv, port, offload-&gt;queue);</div><div class='add'>+</div><div class='add'>+	/* The user may be replacing an existing shaper */</div><div class='add'>+	index = sja1105_find_cbs_shaper(priv, port, offload-&gt;queue);</div><div class='add'>+	if (index &lt; 0) {</div><div class='add'>+		/* That isn't the case - see if we can allocate a new one */</div><div class='add'>+		index = sja1105_find_unused_cbs_shaper(priv);</div><div class='add'>+		if (index &lt; 0)</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cbs = &amp;priv-&gt;cbs[index];</div><div class='add'>+	cbs-&gt;port = port;</div><div class='add'>+	cbs-&gt;prio = offload-&gt;queue;</div><div class='add'>+	/* locredit and sendslope are negative by definition. In hardware,</div><div class='add'>+	 * positive values must be provided, and the negative sign is implicit.</div><div class='add'>+	 */</div><div class='add'>+	cbs-&gt;credit_hi = offload-&gt;hicredit;</div><div class='add'>+	cbs-&gt;credit_lo = abs(offload-&gt;locredit);</div><div class='add'>+	/* User space is in kbits/sec, while the hardware in bytes/sec times</div><div class='add'>+	 * link speed. Since the given offload-&gt;sendslope is good only for the</div><div class='add'>+	 * current link speed anyway, and user space is likely to reprogram it</div><div class='add'>+	 * when that changes, don't even bother to track the port's link speed,</div><div class='add'>+	 * but deduce the port transmit rate from idleslope - sendslope.</div><div class='add'>+	 */</div><div class='add'>+	port_transmit_rate_kbps = offload-&gt;idleslope - offload-&gt;sendslope;</div><div class='add'>+	cbs-&gt;idle_slope = div_s64(offload-&gt;idleslope * BYTES_PER_KBIT,</div><div class='add'>+				  port_transmit_rate_kbps);</div><div class='add'>+	cbs-&gt;send_slope = div_s64(abs(offload-&gt;sendslope * BYTES_PER_KBIT),</div><div class='add'>+				  port_transmit_rate_kbps);</div><div class='add'>+	/* Convert the negative values from 64-bit 2's complement</div><div class='add'>+	 * to 32-bit 2's complement (for the case of 0x80000000 whose</div><div class='add'>+	 * negative is still negative).</div><div class='add'>+	 */</div><div class='add'>+	cbs-&gt;credit_lo &amp;= GENMASK_ULL(31, 0);</div><div class='add'>+	cbs-&gt;send_slope &amp;= GENMASK_ULL(31, 0);</div><div class='ctx'> </div><div class='del'>-	if (!mac[port].ingress &amp;&amp; !mac[port].egress &amp;&amp; !mac[port].dyn_learn)</div><div class='del'>-		return BR_STATE_BLOCKING;</div><div class='del'>-	if (mac[port].ingress &amp;&amp; !mac[port].egress &amp;&amp; !mac[port].dyn_learn)</div><div class='del'>-		return BR_STATE_LISTENING;</div><div class='del'>-	if (mac[port].ingress &amp;&amp; !mac[port].egress &amp;&amp; mac[port].dyn_learn)</div><div class='del'>-		return BR_STATE_LEARNING;</div><div class='del'>-	if (mac[port].ingress &amp;&amp; mac[port].egress &amp;&amp; mac[port].dyn_learn)</div><div class='del'>-		return BR_STATE_FORWARDING;</div><div class='del'>-	/* This is really an error condition if the MAC was in none of the STP</div><div class='del'>-	 * states above. But treating the port as disabled does nothing, which</div><div class='del'>-	 * is adequate, and it also resets the MAC to a known state later on.</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_CBS, index, cbs,</div><div class='add'>+					    true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_reload_cbs(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	int rc = 0, i;</div><div class='add'>+</div><div class='add'>+	/* The credit based shapers are only allocated if</div><div class='add'>+	 * CONFIG_NET_SCH_CBS is enabled.</div><div class='ctx'> 	 */</div><div class='del'>-	return BR_STATE_DISABLED;</div><div class='add'>+	if (!priv-&gt;cbs)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;info-&gt;num_cbs_shapers; i++) {</div><div class='add'>+		struct sja1105_cbs_entry *cbs = &amp;priv-&gt;cbs[i];</div><div class='add'>+</div><div class='add'>+		if (!cbs-&gt;idle_slope &amp;&amp; !cbs-&gt;send_slope)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_dynamic_config_write(priv, BLK_IDX_CBS, i, cbs,</div><div class='add'>+						  true);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const char * const sja1105_reset_reasons[] = {</div><div class='add'>+	[SJA1105_VLAN_FILTERING] = "VLAN filtering",</div><div class='add'>+	[SJA1105_AGEING_TIME] = "Ageing time",</div><div class='add'>+	[SJA1105_SCHEDULING] = "Time-aware scheduling",</div><div class='add'>+	[SJA1105_BEST_EFFORT_POLICING] = "Best-effort policing",</div><div class='add'>+	[SJA1105_VIRTUAL_LINKS] = "Virtual links",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* For situations where we need to change a setting at runtime that is only</div><div class='ctx'>  * available through the static configuration, resetting the switch in order</div><div class='ctx'>  * to upload the new static config is unavoidable. Back up the settings we</div><div class='ctx'>  * modify at runtime (currently only MAC) and restore them after uploading,</div><div class='ctx'>  * such that this operation is relatively seamless.</div><div class='ctx'>  */</div><div class='del'>-static int sja1105_static_config_reload(struct sja1105_private *priv)</div><div class='add'>+int sja1105_static_config_reload(struct sja1105_private *priv,</div><div class='add'>+				 enum sja1105_reset_reason reason)</div><div class='ctx'> {</div><div class='add'>+	struct ptp_system_timestamp ptp_sts_before;</div><div class='add'>+	struct ptp_system_timestamp ptp_sts_after;</div><div class='add'>+	u16 bmcr[SJA1105_MAX_NUM_PORTS] = {0};</div><div class='add'>+	u64 mac_speed[SJA1105_MAX_NUM_PORTS];</div><div class='ctx'> 	struct sja1105_mac_config_entry *mac;</div><div class='del'>-	int speed_mbps[SJA1105_NUM_PORTS];</div><div class='del'>-	u8 stp_state[SJA1105_NUM_PORTS];</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	s64 t1, t2, t3, t4;</div><div class='add'>+	s64 t12, t34;</div><div class='ctx'> 	int rc, i;</div><div class='add'>+	s64 now;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mgmt_lock);</div><div class='ctx'> </div><div class='ctx'> 	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='ctx'> </div><div class='del'>-	/* Back up settings changed by sja1105_adjust_port_config and</div><div class='del'>-	 * sja1105_bridge_stp_state_set and restore their defaults.</div><div class='add'>+	/* Back up the dynamic link speed changed by sja1105_set_port_speed()</div><div class='add'>+	 * in order to temporarily restore it to SJA1105_SPEED_AUTO - which the</div><div class='add'>+	 * switch wants to see in the static config in order to allow us to</div><div class='add'>+	 * change it through the dynamic interface later.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		speed_mbps[i] = sja1105_speed[mac[i].speed];</div><div class='del'>-		mac[i].speed = SJA1105_SPEED_AUTO;</div><div class='del'>-		if (i == dsa_upstream_port(priv-&gt;ds, i)) {</div><div class='del'>-			mac[i].ingress = true;</div><div class='del'>-			mac[i].egress = true;</div><div class='del'>-			mac[i].dyn_learn = true;</div><div class='del'>-		} else {</div><div class='del'>-			stp_state[i] = sja1105_stp_state_get(priv, i);</div><div class='del'>-			mac[i].ingress = false;</div><div class='del'>-			mac[i].egress = false;</div><div class='del'>-			mac[i].dyn_learn = false;</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		mac_speed[i] = mac[i].speed;</div><div class='add'>+		mac[i].speed = priv-&gt;info-&gt;port_speed[SJA1105_SPEED_AUTO];</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;pcs[i])</div><div class='add'>+			bmcr[i] = mdiobus_c45_read(priv-&gt;mdio_pcs, i,</div><div class='add'>+						   MDIO_MMD_VEND2, MDIO_CTRL1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No PTP operations can run right now */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;ptp_data.lock);</div><div class='add'>+</div><div class='add'>+	rc = __sja1105_ptp_gettimex(ds, &amp;now, &amp;ptp_sts_before);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;ptp_data.lock);</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset switch and send updated static configuration */</div><div class='ctx'> 	rc = sja1105_static_config_upload(priv);</div><div class='del'>-	if (rc &lt; 0)</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;ptp_data.lock);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = __sja1105_ptp_settime(ds, 0, &amp;ptp_sts_after);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;ptp_data.lock);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	t1 = timespec64_to_ns(&amp;ptp_sts_before.pre_ts);</div><div class='add'>+	t2 = timespec64_to_ns(&amp;ptp_sts_before.post_ts);</div><div class='add'>+	t3 = timespec64_to_ns(&amp;ptp_sts_after.pre_ts);</div><div class='add'>+	t4 = timespec64_to_ns(&amp;ptp_sts_after.post_ts);</div><div class='add'>+	/* Mid point, corresponds to pre-reset PTPCLKVAL */</div><div class='add'>+	t12 = t1 + (t2 - t1) / 2;</div><div class='add'>+	/* Mid point, corresponds to post-reset PTPCLKVAL, aka 0 */</div><div class='add'>+	t34 = t3 + (t4 - t3) / 2;</div><div class='add'>+	/* Advance PTPCLKVAL by the time it took since its readout */</div><div class='add'>+	now += (t34 - t12);</div><div class='add'>+</div><div class='add'>+	__sja1105_ptp_adjtime(ds, now);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;ptp_data.lock);</div><div class='add'>+</div><div class='add'>+	dev_info(priv-&gt;ds-&gt;dev,</div><div class='add'>+		 "Reset switch and programmed static config. Reason: %s\n",</div><div class='add'>+		 sja1105_reset_reasons[reason]);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the CGU (PLLs) for MII and RMII PHYs.</div><div class='ctx'> 	 * For these interfaces there is no dynamic configuration</div><div class='ctx'> 	 * needed, since PLLs have same settings at all speeds.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = sja1105_clocking_setup(priv);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+	if (priv-&gt;info-&gt;clocking_setup) {</div><div class='add'>+		rc = priv-&gt;info-&gt;clocking_setup(priv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		bool enabled = (speed_mbps[i] != 0);</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		struct phylink_pcs *pcs = priv-&gt;pcs[i];</div><div class='add'>+		unsigned int neg_mode;</div><div class='ctx'> </div><div class='del'>-		if (i != dsa_upstream_port(priv-&gt;ds, i))</div><div class='del'>-			sja1105_bridge_stp_state_set(priv-&gt;ds, i, stp_state[i]);</div><div class='add'>+		mac[i].speed = mac_speed[i];</div><div class='add'>+		rc = sja1105_set_port_config(priv, i);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (!pcs)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-		rc = sja1105_adjust_port_config(priv, i, speed_mbps[i],</div><div class='del'>-						enabled);</div><div class='add'>+		if (bmcr[i] &amp; BMCR_ANENABLE)</div><div class='add'>+			neg_mode = PHYLINK_PCS_NEG_INBAND_ENABLED;</div><div class='add'>+		else</div><div class='add'>+			neg_mode = PHYLINK_PCS_NEG_OUTBAND;</div><div class='add'>+</div><div class='add'>+		rc = pcs-&gt;ops-&gt;pcs_config(pcs, neg_mode, priv-&gt;phy_mode[i],</div><div class='add'>+					  NULL, true);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='add'>+</div><div class='add'>+		if (neg_mode == PHYLINK_PCS_NEG_OUTBAND) {</div><div class='add'>+			int speed = SPEED_UNKNOWN;</div><div class='add'>+</div><div class='add'>+			if (priv-&gt;phy_mode[i] == PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+				speed = SPEED_2500;</div><div class='add'>+			else if (bmcr[i] &amp; BMCR_SPEED1000)</div><div class='add'>+				speed = SPEED_1000;</div><div class='add'>+			else if (bmcr[i] &amp; BMCR_SPEED100)</div><div class='add'>+				speed = SPEED_100;</div><div class='add'>+			else</div><div class='add'>+				speed = SPEED_10;</div><div class='add'>+</div><div class='add'>+			pcs-&gt;ops-&gt;pcs_link_up(pcs, neg_mode, priv-&gt;phy_mode[i],</div><div class='add'>+					      speed, DUPLEX_FULL);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_reload_cbs(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out;</div><div class='ctx'> out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mgmt_lock);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static enum dsa_tag_protocol</div><div class='add'>+sja1105_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+			 enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;tag_proto;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* The TPID setting belongs to the General Parameters table,</div><div class='ctx'>  * which can only be partially reconfigured at runtime (and not the TPID).</div><div class='ctx'>  * So a switch reset is required.</div><div class='ctx'>  */</div><div class='del'>-static int sja1105_change_tpid(struct sja1105_private *priv,</div><div class='del'>-			       u16 tpid, u16 tpid2)</div><div class='add'>+int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_general_params_entry *general_params;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='add'>+	struct sja1105_rule *rule;</div><div class='add'>+	u16 tpid, tpid2;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;flow_block.rules, list) {</div><div class='add'>+		if (rule-&gt;type == SJA1105_RULE_VL) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Cannot change VLAN filtering with active VL rules");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enabled) {</div><div class='add'>+		/* Enable VLAN filtering. */</div><div class='add'>+		tpid  = ETH_P_8021Q;</div><div class='add'>+		tpid2 = ETH_P_8021AD;</div><div class='add'>+	} else {</div><div class='add'>+		/* Disable VLAN filtering. */</div><div class='add'>+		tpid  = ETH_P_SJA1105;</div><div class='add'>+		tpid2 = ETH_P_SJA1105;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_GENERAL_PARAMS];</div><div class='ctx'> 	general_params = table-&gt;entries;</div><div class='add'>+	/* EtherType used to identify inner tagged (C-tag) VLAN traffic */</div><div class='ctx'> 	general_params-&gt;tpid = tpid;</div><div class='add'>+	/* EtherType used to identify outer tagged (S-tag) VLAN traffic */</div><div class='ctx'> 	general_params-&gt;tpid2 = tpid2;</div><div class='del'>-	return sja1105_static_config_reload(priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int sja1105_pvid_apply(struct sja1105_private *priv, int port, u16 pvid)</div><div class='del'>-{</div><div class='del'>-	struct sja1105_mac_config_entry *mac;</div><div class='del'>-</div><div class='del'>-	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='del'>-</div><div class='del'>-	mac[port].vlanid = pvid;</div><div class='del'>-</div><div class='del'>-	return sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, port,</div><div class='del'>-					   &amp;mac[port], true);</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int sja1105_is_vlan_configured(struct sja1105_private *priv, u16 vid)</div><div class='del'>-{</div><div class='del'>-	struct sja1105_vlan_lookup_entry *vlan;</div><div class='del'>-	int count, i;</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	vlan = priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP].entries;</div><div class='del'>-	count = priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP].entry_count;</div><div class='add'>+		rc = sja1105_commit_pvid(ds, port);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		if (vlan[i].vlanid == vid)</div><div class='del'>-			return i;</div><div class='add'>+	rc = sja1105_static_config_reload(priv, SJA1105_VLAN_FILTERING);</div><div class='add'>+	if (rc)</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to change VLAN Ethertype");</div><div class='ctx'> </div><div class='del'>-	/* Return an invalid entry index if not found */</div><div class='del'>-	return -1;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_vlan_apply(struct sja1105_private *priv, int port, u16 vid,</div><div class='del'>-			      bool enabled, bool untagged)</div><div class='add'>+static int sja1105_vlan_add(struct sja1105_private *priv, int port, u16 vid,</div><div class='add'>+			    u16 flags, bool allowed_ingress)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_vlan_lookup_entry *vlan;</div><div class='ctx'> 	struct sja1105_table *table;</div><div class='del'>-	bool keep = true;</div><div class='ctx'> 	int match, rc;</div><div class='ctx'> </div><div class='ctx'> 	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP];</div><div class='ctx'> </div><div class='ctx'> 	match = sja1105_is_vlan_configured(priv, vid);</div><div class='ctx'> 	if (match &lt; 0) {</div><div class='del'>-		/* Can't delete a missing entry. */</div><div class='del'>-		if (!enabled)</div><div class='del'>-			return 0;</div><div class='ctx'> 		rc = sja1105_table_resize(table, table-&gt;entry_count + 1);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		match = table-&gt;entry_count - 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Assign pointer after the resize (it's new memory) */</div><div class='ctx'> 	vlan = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	vlan[match].type_entry = SJA1110_VLAN_D_TAG;</div><div class='ctx'> 	vlan[match].vlanid = vid;</div><div class='del'>-	if (enabled) {</div><div class='del'>-		vlan[match].vlan_bc |= BIT(port);</div><div class='add'>+	vlan[match].vlan_bc |= BIT(port);</div><div class='add'>+</div><div class='add'>+	if (allowed_ingress)</div><div class='ctx'> 		vlan[match].vmemb_port |= BIT(port);</div><div class='del'>-	} else {</div><div class='del'>-		vlan[match].vlan_bc &amp;= ~BIT(port);</div><div class='add'>+	else</div><div class='ctx'> 		vlan[match].vmemb_port &amp;= ~BIT(port);</div><div class='del'>-	}</div><div class='del'>-	/* Also unset tag_port if removing this VLAN was requested,</div><div class='del'>-	 * just so we don't have a confusing bitmap (no practical purpose).</div><div class='del'>-	 */</div><div class='del'>-	if (untagged || !enabled)</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BRIDGE_VLAN_INFO_UNTAGGED)</div><div class='ctx'> 		vlan[match].tag_port &amp;= ~BIT(port);</div><div class='ctx'> 	else</div><div class='ctx'> 		vlan[match].tag_port |= BIT(port);</div><div class='add'>+</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_VLAN_LOOKUP, vid,</div><div class='add'>+					    &amp;vlan[match], true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_vlan_del(struct sja1105_private *priv, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vlan_lookup_entry *vlan;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	bool keep = true;</div><div class='add'>+	int match, rc;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VLAN_LOOKUP];</div><div class='add'>+</div><div class='add'>+	match = sja1105_is_vlan_configured(priv, vid);</div><div class='add'>+	/* Can't delete a missing entry. */</div><div class='add'>+	if (match &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Assign pointer after the resize (it's new memory) */</div><div class='add'>+	vlan = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	vlan[match].vlanid = vid;</div><div class='add'>+	vlan[match].vlan_bc &amp;= ~BIT(port);</div><div class='add'>+	vlan[match].vmemb_port &amp;= ~BIT(port);</div><div class='add'>+	/* Also unset tag_port, just so we don't have a confusing bitmap</div><div class='add'>+	 * (no practical purpose).</div><div class='add'>+	 */</div><div class='add'>+	vlan[match].tag_port &amp;= ~BIT(port);</div><div class='add'>+</div><div class='ctx'> 	/* If there's no port left as member of this VLAN,</div><div class='ctx'> 	 * it's time for it to go.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!vlan[match].vmemb_port)</div><div class='ctx'> 		keep = false;</div><div class='ctx'> </div><div class='del'>-	dev_dbg(priv-&gt;ds-&gt;dev,</div><div class='del'>-		"%s: port %d, vid %llu, broadcast domain 0x%llx, "</div><div class='del'>-		"port members 0x%llx, tagged ports 0x%llx, keep %d\n",</div><div class='del'>-		__func__, port, vlan[match].vlanid, vlan[match].vlan_bc,</div><div class='del'>-		vlan[match].vmemb_port, vlan[match].tag_port, keep);</div><div class='del'>-</div><div class='ctx'> 	rc = sja1105_dynamic_config_write(priv, BLK_IDX_VLAN_LOOKUP, vid,</div><div class='ctx'> 					  &amp;vlan[match], keep);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='hunk'>@@ -1243,166 +2552,112 @@ static int sja1105_vlan_apply(struct sja1105_private *priv, int port, u16 vid,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_setup_8021q_tagging(struct dsa_switch *ds, bool enabled)</div><div class='add'>+static int sja1105_bridge_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+				   const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int rc, i;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u16 flags = vlan-&gt;flags;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		rc = dsa_port_setup_8021q_tagging(ds, i, enabled);</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			dev_err(ds-&gt;dev, "Failed to setup VLAN tagging for port %d: %d\n",</div><div class='del'>-				i, rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='add'>+	/* Be sure to deny alterations to the configuration done by tag_8021q.</div><div class='add'>+	 */</div><div class='add'>+	if (vid_is_dsa_8021q(vlan-&gt;vid)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Range 3072-4095 reserved for dsa_8021q operation");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='del'>-	dev_info(ds-&gt;dev, "%s switch tagging\n",</div><div class='del'>-		 enabled ? "Enabled" : "Disabled");</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static enum dsa_tag_protocol</div><div class='del'>-sja1105_get_tag_protocol(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	return DSA_TAG_PROTO_SJA1105;</div><div class='del'>-}</div><div class='add'>+	/* Always install bridge VLANs as egress-tagged on CPU and DSA ports */</div><div class='add'>+	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='add'>+		flags = 0;</div><div class='ctx'> </div><div class='del'>-/* This callback needs to be present */</div><div class='del'>-static int sja1105_vlan_prepare(struct dsa_switch *ds, int port,</div><div class='del'>-				const struct switchdev_obj_port_vlan *vlan)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='add'>+	rc = sja1105_vlan_add(priv, port, vlan-&gt;vid, flags, true);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='add'>+		priv-&gt;bridge_pvid[port] = vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+	return sja1105_commit_pvid(ds, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)</div><div class='add'>+static int sja1105_bridge_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+				   const struct switchdev_obj_port_vlan *vlan)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (enabled)</div><div class='del'>-		/* Enable VLAN filtering. */</div><div class='del'>-		rc = sja1105_change_tpid(priv, ETH_P_8021Q, ETH_P_8021AD);</div><div class='del'>-	else</div><div class='del'>-		/* Disable VLAN filtering. */</div><div class='del'>-		rc = sja1105_change_tpid(priv, ETH_P_SJA1105, ETH_P_SJA1105);</div><div class='add'>+	rc = sja1105_vlan_del(priv, port, vlan-&gt;vid);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		dev_err(ds-&gt;dev, "Failed to change VLAN Ethertype\n");</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	/* Switch port identification based on 802.1Q is only passable</div><div class='del'>-	 * if we are not under a vlan_filtering bridge. So make sure</div><div class='del'>-	 * the two configurations are mutually exclusive.</div><div class='add'>+	/* In case the pvid was deleted, make sure that untagged packets will</div><div class='add'>+	 * be dropped.</div><div class='ctx'> 	 */</div><div class='del'>-	return sja1105_setup_8021q_tagging(ds, !enabled);</div><div class='add'>+	return sja1105_commit_pvid(ds, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void sja1105_vlan_add(struct dsa_switch *ds, int port,</div><div class='del'>-			     const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+static int sja1105_dsa_8021q_vlan_add(struct dsa_switch *ds, int port, u16 vid,</div><div class='add'>+				      u16 flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	u16 vid;</div><div class='add'>+	bool allowed_ingress = true;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; vid++) {</div><div class='del'>-		rc = sja1105_vlan_apply(priv, port, vid, true, vlan-&gt;flags &amp;</div><div class='del'>-					BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			dev_err(ds-&gt;dev, "Failed to add VLAN %d to port %d: %d\n",</div><div class='del'>-				vid, port, rc);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID) {</div><div class='del'>-			rc = sja1105_pvid_apply(ds-&gt;priv, port, vid);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				dev_err(ds-&gt;dev, "Failed to set pvid %d on port %d: %d\n",</div><div class='del'>-					vid, port, rc);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	/* Prevent attackers from trying to inject a DSA tag from</div><div class='add'>+	 * the outside world.</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_user_port(ds, port))</div><div class='add'>+		allowed_ingress = false;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_vlan_add(priv, port, vid, flags, allowed_ingress);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BRIDGE_VLAN_INFO_PVID)</div><div class='add'>+		priv-&gt;tag_8021q_pvid[port] = vid;</div><div class='add'>+</div><div class='add'>+	return sja1105_commit_pvid(ds, port);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_vlan_del(struct dsa_switch *ds, int port,</div><div class='del'>-			    const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+static int sja1105_dsa_8021q_vlan_del(struct dsa_switch *ds, int port, u16 vid)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	u16 vid;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='del'>-	for (vid = vlan-&gt;vid_begin; vid &lt;= vlan-&gt;vid_end; vid++) {</div><div class='del'>-		rc = sja1105_vlan_apply(priv, port, vid, false, vlan-&gt;flags &amp;</div><div class='del'>-					BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='del'>-		if (rc &lt; 0) {</div><div class='del'>-			dev_err(ds-&gt;dev, "Failed to remove VLAN %d from port %d: %d\n",</div><div class='del'>-				vid, port, rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return sja1105_vlan_del(priv, port, vid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* The programming model for the SJA1105 switch is "all-at-once" via static</div><div class='del'>- * configuration tables. Some of these can be dynamically modified at runtime,</div><div class='del'>- * but not the xMII mode parameters table.</div><div class='del'>- * Furthermode, some PHYs may not have crystals for generating their clocks</div><div class='del'>- * (e.g. RMII). Instead, their 50MHz clock is supplied via the SJA1105 port's</div><div class='del'>- * ref_clk pin. So port clocking needs to be initialized early, before</div><div class='del'>- * connecting to PHYs is attempted, otherwise they won't respond through MDIO.</div><div class='del'>- * Setting correct PHY link speed does not matter now.</div><div class='del'>- * But dsa_slave_phy_setup is called later than sja1105_setup, so the PHY</div><div class='del'>- * bindings are not yet parsed by DSA core. We need to parse early so that we</div><div class='del'>- * can populate the xMII mode parameters table.</div><div class='del'>- */</div><div class='del'>-static int sja1105_setup(struct dsa_switch *ds)</div><div class='add'>+static int sja1105_prechangeupper(struct dsa_switch *ds, int port,</div><div class='add'>+				  struct netdev_notifier_changeupper_info *info)</div><div class='ctx'> {</div><div class='del'>-	struct sja1105_dt_port ports[SJA1105_NUM_PORTS];</div><div class='del'>-	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	rc = sja1105_parse_dt(priv, ports);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(ds-&gt;dev, "Failed to parse DT: %d\n", rc);</div><div class='del'>-		return rc;</div><div class='add'>+	struct netlink_ext_ack *extack = info-&gt;info.extack;</div><div class='add'>+	struct net_device *upper = info-&gt;upper_dev;</div><div class='add'>+	struct dsa_switch_tree *dst = ds-&gt;dst;</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+</div><div class='add'>+	if (is_vlan_dev(upper)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "8021q uppers are not supported");</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Error out early if internal delays are required through DT</div><div class='del'>-	 * and we can't apply them.</div><div class='del'>-	 */</div><div class='del'>-	rc = sja1105_parse_rgmii_delays(priv, ports);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(ds-&gt;dev, "RGMII delay not supported\n");</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+	if (netif_is_bridge_master(upper)) {</div><div class='add'>+		list_for_each_entry(dp, &amp;dst-&gt;ports, list) {</div><div class='add'>+			struct net_device *br = dsa_port_bridge_dev_get(dp);</div><div class='ctx'> </div><div class='del'>-	/* Create and send configuration down to device */</div><div class='del'>-	rc = sja1105_static_config_load(priv, ports);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(ds-&gt;dev, "Failed to load static config: %d\n", rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-	/* Configure the CGU (PHY link modes and speeds) */</div><div class='del'>-	rc = sja1105_clocking_setup(priv);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(ds-&gt;dev, "Failed to configure MII clocking: %d\n", rc);</div><div class='del'>-		return rc;</div><div class='add'>+			if (br &amp;&amp; br != upper &amp;&amp; br_vlan_enabled(br)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Only one VLAN-aware bridge is supported");</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	/* On SJA1105, VLAN filtering per se is always enabled in hardware.</div><div class='del'>-	 * The only thing we can do to disable it is lie about what the 802.1Q</div><div class='del'>-	 * EtherType is.</div><div class='del'>-	 * So it will still try to apply VLAN filtering, but all ingress</div><div class='del'>-	 * traffic (except frames received with EtherType of ETH_P_SJA1105)</div><div class='del'>-	 * will be internally tagged with a distorted VLAN header where the</div><div class='del'>-	 * TPID is ETH_P_SJA1105, and the VLAN ID is the port pvid.</div><div class='del'>-	 */</div><div class='del'>-	ds-&gt;vlan_filtering_is_global = true;</div><div class='ctx'> </div><div class='del'>-	/* The DSA/switchdev model brings up switch ports in standalone mode by</div><div class='del'>-	 * default, and that means vlan_filtering is 0 since they're not under</div><div class='del'>-	 * a bridge, so it's safe to set up switch tagging at this time.</div><div class='del'>-	 */</div><div class='del'>-	return sja1105_setup_8021q_tagging(ds, true);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,</div><div class='del'>-			     struct sk_buff *skb)</div><div class='add'>+			     struct sk_buff *skb, bool takets)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_mgmt_entry mgmt_route = {0};</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='hunk'>@@ -1415,6 +2670,8 @@ static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,</div><div class='ctx'> 	mgmt_route.macaddr = ether_addr_to_u64(hdr-&gt;h_dest);</div><div class='ctx'> 	mgmt_route.destports = BIT(port);</div><div class='ctx'> 	mgmt_route.enfport = 1;</div><div class='add'>+	mgmt_route.tsreg = 0;</div><div class='add'>+	mgmt_route.takets = takets;</div><div class='ctx'> </div><div class='ctx'> 	rc = sja1105_dynamic_config_write(priv, BLK_IDX_MGMT_ROUTE,</div><div class='ctx'> 					  slot, &amp;mgmt_route, true);</div><div class='hunk'>@@ -1424,7 +2681,7 @@ static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Transfer skb to the host port. */</div><div class='del'>-	dsa_enqueue_skb(skb, ds-&gt;ports[port].slave);</div><div class='add'>+	dsa_enqueue_skb(skb, dsa_to_port(ds, port)-&gt;user);</div><div class='ctx'> </div><div class='ctx'> 	/* Wait until the switch has processed the frame */</div><div class='ctx'> 	do {</div><div class='hunk'>@@ -1446,6 +2703,8 @@ static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,</div><div class='ctx'> 	if (!timeout) {</div><div class='ctx'> 		/* Clean up the management route so that a follow-up</div><div class='ctx'> 		 * frame may not match on it by mistake.</div><div class='add'>+		 * This is only hardware supported on P/Q/R/S - on E/T it is</div><div class='add'>+		 * a no-op and we are silently discarding the -EOPNOTSUPP.</div><div class='ctx'> 		 */</div><div class='ctx'> 		sja1105_dynamic_config_write(priv, BLK_IDX_MGMT_ROUTE,</div><div class='ctx'> 					     slot, &amp;mgmt_route, false);</div><div class='hunk'>@@ -1455,37 +2714,50 @@ static int sja1105_mgmt_xmit(struct dsa_switch *ds, int port, int slot,</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define work_to_xmit_work(w) \</div><div class='add'>+		container_of((w), struct sja1105_deferred_xmit_work, work)</div><div class='add'>+</div><div class='ctx'> /* Deferred work is unfortunately necessary because setting up the management</div><div class='ctx'>  * route cannot be done from atomit context (SPI transfer takes a sleepable</div><div class='ctx'>  * lock on the bus)</div><div class='ctx'>  */</div><div class='del'>-static netdev_tx_t sja1105_port_deferred_xmit(struct dsa_switch *ds, int port,</div><div class='del'>-					      struct sk_buff *skb)</div><div class='add'>+static void sja1105_port_deferred_xmit(struct kthread_work *work)</div><div class='ctx'> {</div><div class='add'>+	struct sja1105_deferred_xmit_work *xmit_work = work_to_xmit_work(work);</div><div class='add'>+	struct sk_buff *clone, *skb = xmit_work-&gt;skb;</div><div class='add'>+	struct dsa_switch *ds = xmit_work-&gt;dp-&gt;ds;</div><div class='ctx'> 	struct sja1105_private *priv = ds-&gt;priv;</div><div class='del'>-	struct sja1105_port *sp = &amp;priv-&gt;ports[port];</div><div class='del'>-	int slot = sp-&gt;mgmt_slot;</div><div class='del'>-</div><div class='del'>-	/* The tragic fact about the switch having 4x2 slots for installing</div><div class='del'>-	 * management routes is that all of them except one are actually</div><div class='del'>-	 * useless.</div><div class='del'>-	 * If 2 slots are simultaneously configured for two BPDUs sent to the</div><div class='del'>-	 * same (multicast) DMAC but on different egress ports, the switch</div><div class='del'>-	 * would confuse them and redirect first frame it receives on the CPU</div><div class='del'>-	 * port towards the port configured on the numerically first slot</div><div class='del'>-	 * (therefore wrong port), then second received frame on second slot</div><div class='del'>-	 * (also wrong port).</div><div class='del'>-	 * So for all practical purposes, there needs to be a lock that</div><div class='del'>-	 * prevents that from happening. The slot used here is utterly useless</div><div class='del'>-	 * (could have simply been 0 just as fine), but we are doing it</div><div class='del'>-	 * nonetheless, in case a smarter idea ever comes up in the future.</div><div class='del'>-	 */</div><div class='add'>+	int port = xmit_work-&gt;dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	clone = SJA1105_SKB_CB(skb)-&gt;clone;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;priv-&gt;mgmt_lock);</div><div class='ctx'> </div><div class='del'>-	sja1105_mgmt_xmit(ds, port, slot, skb);</div><div class='add'>+	sja1105_mgmt_xmit(ds, port, 0, skb, !!clone);</div><div class='add'>+</div><div class='add'>+	/* The clone, if there, was made by dsa_skb_tx_timestamp */</div><div class='add'>+	if (clone)</div><div class='add'>+		sja1105_ptp_txtstamp_skb(ds, port, clone);</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;priv-&gt;mgmt_lock);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	kfree(xmit_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_connect_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+					enum dsa_tag_protocol proto)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_tagger_data *tagger_data;</div><div class='add'>+</div><div class='add'>+	if (proto != priv-&gt;info-&gt;tag_proto)</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+</div><div class='add'>+	tagger_data = sja1105_tagger_data(ds);</div><div class='add'>+	tagger_data-&gt;xmit_work_fn = sja1105_port_deferred_xmit;</div><div class='add'>+	tagger_data-&gt;meta_tstamp_handler = sja1110_process_meta_tstamp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The MAXAGE setting belongs to the L2 Forwarding Parameters table,</div><div class='hunk'>@@ -1509,93 +2781,535 @@ static int sja1105_set_ageing_time(struct dsa_switch *ds,</div><div class='ctx'> </div><div class='ctx'> 	l2_lookup_params-&gt;maxage = maxage;</div><div class='ctx'> </div><div class='del'>-	return sja1105_static_config_reload(priv);</div><div class='add'>+	return sja1105_static_config_reload(priv, SJA1105_AGEING_TIME);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	new_mtu += VLAN_ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))</div><div class='add'>+		new_mtu += VLAN_HLEN;</div><div class='add'>+</div><div class='add'>+	policing = priv-&gt;static_config.tables[BLK_IDX_L2_POLICING].entries;</div><div class='add'>+</div><div class='add'>+	if (policing[port].maxlen == new_mtu)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	policing[port].maxlen = new_mtu;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_get_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return 2043 - VLAN_ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_setup_tc(struct dsa_switch *ds, int port,</div><div class='add'>+				 enum tc_setup_type type,</div><div class='add'>+				 void *type_data)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO:</div><div class='add'>+		return sja1105_setup_tc_taprio(ds, port, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_CBS:</div><div class='add'>+		return sja1105_setup_tc_cbs(ds, port, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* We have a single mirror (@to) port, but can configure ingress and egress</div><div class='add'>+ * mirroring on all other (@from) ports.</div><div class='add'>+ * We need to allow mirroring rules only as long as the @to port is always the</div><div class='add'>+ * same, and we need to unset the @to port from mirr_port only when there is no</div><div class='add'>+ * mirroring rule that references it.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_mirror_apply(struct sja1105_private *priv, int from, int to,</div><div class='add'>+				bool ingress, bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_general_params_entry *general_params;</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	bool already_enabled;</div><div class='add'>+	u64 new_mirr_port;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_GENERAL_PARAMS];</div><div class='add'>+	general_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+</div><div class='add'>+	already_enabled = (general_params-&gt;mirr_port != ds-&gt;num_ports);</div><div class='add'>+	if (already_enabled &amp;&amp; enabled &amp;&amp; general_params-&gt;mirr_port != to) {</div><div class='add'>+		dev_err(priv-&gt;ds-&gt;dev,</div><div class='add'>+			"Delete mirroring rules towards port %llu first\n",</div><div class='add'>+			general_params-&gt;mirr_port);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_mirr_port = to;</div><div class='add'>+	if (!enabled) {</div><div class='add'>+		bool keep = false;</div><div class='add'>+		int port;</div><div class='add'>+</div><div class='add'>+		/* Anybody still referencing mirr_port? */</div><div class='add'>+		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+			if (mac[port].ing_mirr || mac[port].egr_mirr) {</div><div class='add'>+				keep = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* Unset already_enabled for next time */</div><div class='add'>+		if (!keep)</div><div class='add'>+			new_mirr_port = ds-&gt;num_ports;</div><div class='add'>+	}</div><div class='add'>+	if (new_mirr_port != general_params-&gt;mirr_port) {</div><div class='add'>+		general_params-&gt;mirr_port = new_mirr_port;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_dynamic_config_write(priv, BLK_IDX_GENERAL_PARAMS,</div><div class='add'>+						  0, general_params, true);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ingress)</div><div class='add'>+		mac[from].ing_mirr = enabled;</div><div class='add'>+	else</div><div class='add'>+		mac[from].egr_mirr = enabled;</div><div class='add'>+</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, from,</div><div class='add'>+					    &amp;mac[from], true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			      bool ingress, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return sja1105_mirror_apply(ds-&gt;priv, port, mirror-&gt;to_local_port,</div><div class='add'>+				    ingress, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	sja1105_mirror_apply(ds-&gt;priv, port, mirror-&gt;to_local_port,</div><div class='add'>+			     mirror-&gt;ingress, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_policer_add(struct dsa_switch *ds, int port,</div><div class='add'>+				    struct dsa_mall_policer_tc_entry *policer)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	policing = priv-&gt;static_config.tables[BLK_IDX_L2_POLICING].entries;</div><div class='add'>+</div><div class='add'>+	/* In hardware, every 8 microseconds the credit level is incremented by</div><div class='add'>+	 * the value of RATE bytes divided by 64, up to a maximum of SMAX</div><div class='add'>+	 * bytes.</div><div class='add'>+	 */</div><div class='add'>+	policing[port].rate = div_u64(512 * policer-&gt;rate_bytes_per_sec,</div><div class='add'>+				      1000000);</div><div class='add'>+	policing[port].smax = policer-&gt;burst;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_port_policer_del(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_policing_entry *policing;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	policing = priv-&gt;static_config.tables[BLK_IDX_L2_POLICING].entries;</div><div class='add'>+</div><div class='add'>+	policing[port].rate = SJA1105_RATE_MBPS(1000);</div><div class='add'>+	policing[port].smax = 65535;</div><div class='add'>+</div><div class='add'>+	sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_set_learning(struct sja1105_private *priv, int port,</div><div class='add'>+				     bool enabled)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mac_config_entry *mac;</div><div class='add'>+</div><div class='add'>+	mac = priv-&gt;static_config.tables[BLK_IDX_MAC_CONFIG].entries;</div><div class='add'>+</div><div class='add'>+	mac[port].dyn_learn = enabled;</div><div class='add'>+</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_MAC_CONFIG, port,</div><div class='add'>+					    &amp;mac[port], true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int sja1105_port_ucast_bcast_flood(struct sja1105_private *priv, int to,</div><div class='add'>+					  struct switchdev_brport_flags flags)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD) {</div><div class='add'>+		if (flags.val &amp; BR_FLOOD)</div><div class='add'>+			priv-&gt;ucast_egress_floods |= BIT(to);</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;ucast_egress_floods &amp;= ~BIT(to);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_BCAST_FLOOD) {</div><div class='add'>+		if (flags.val &amp; BR_BCAST_FLOOD)</div><div class='add'>+			priv-&gt;bcast_egress_floods |= BIT(to);</div><div class='add'>+		else</div><div class='add'>+			priv-&gt;bcast_egress_floods &amp;= ~BIT(to);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sja1105_manage_flood_domains(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_mcast_flood(struct sja1105_private *priv, int to,</div><div class='add'>+				    struct switchdev_brport_flags flags,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_entry *l2_lookup;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int match, rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_L2_LOOKUP];</div><div class='add'>+	l2_lookup = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	for (match = 0; match &lt; table-&gt;entry_count; match++)</div><div class='add'>+		if (l2_lookup[match].macaddr == SJA1105_UNKNOWN_MULTICAST &amp;&amp;</div><div class='add'>+		    l2_lookup[match].mask_macaddr == SJA1105_UNKNOWN_MULTICAST)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	if (match == table-&gt;entry_count) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Could not find FDB entry for unknown multicast");</div><div class='add'>+		rc = -ENOSPC;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.val &amp; BR_MCAST_FLOOD)</div><div class='add'>+		l2_lookup[match].destports |= BIT(to);</div><div class='add'>+	else</div><div class='add'>+		l2_lookup[match].destports &amp;= ~BIT(to);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_dynamic_config_write(priv, BLK_IDX_L2_LOOKUP,</div><div class='add'>+					  l2_lookup[match].index,</div><div class='add'>+					  &amp;l2_lookup[match], true);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+					 struct switchdev_brport_flags flags,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_FLOOD | BR_MCAST_FLOOD |</div><div class='add'>+			   BR_BCAST_FLOOD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; (BR_FLOOD | BR_MCAST_FLOOD) &amp;&amp;</div><div class='add'>+	    !priv-&gt;info-&gt;can_limit_mcast_flood) {</div><div class='add'>+		bool multicast = !!(flags.val &amp; BR_MCAST_FLOOD);</div><div class='add'>+		bool unicast = !!(flags.val &amp; BR_FLOOD);</div><div class='add'>+</div><div class='add'>+		if (unicast != multicast) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "This chip cannot configure multicast flooding independently of unicast");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct switchdev_brport_flags flags,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		bool learn_ena = !!(flags.val &amp; BR_LEARNING);</div><div class='add'>+</div><div class='add'>+		rc = sja1105_port_set_learning(priv, port, learn_ena);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; (BR_FLOOD | BR_BCAST_FLOOD)) {</div><div class='add'>+		rc = sja1105_port_ucast_bcast_flood(priv, port, flags);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* For chips that can't offload BR_MCAST_FLOOD independently, there</div><div class='add'>+	 * is nothing to do here, we ensured the configuration is in sync by</div><div class='add'>+	 * offloading BR_FLOOD.</div><div class='add'>+	 */</div><div class='add'>+	if (flags.mask &amp; BR_MCAST_FLOOD &amp;&amp; priv-&gt;info-&gt;can_limit_mcast_flood) {</div><div class='add'>+		rc = sja1105_port_mcast_flood(priv, port, flags,</div><div class='add'>+					      extack);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The programming model for the SJA1105 switch is "all-at-once" via static</div><div class='add'>+ * configuration tables. Some of these can be dynamically modified at runtime,</div><div class='add'>+ * but not the xMII mode parameters table.</div><div class='add'>+ * Furthermode, some PHYs may not have crystals for generating their clocks</div><div class='add'>+ * (e.g. RMII). Instead, their 50MHz clock is supplied via the SJA1105 port's</div><div class='add'>+ * ref_clk pin. So port clocking needs to be initialized early, before</div><div class='add'>+ * connecting to PHYs is attempted, otherwise they won't respond through MDIO.</div><div class='add'>+ * Setting correct PHY link speed does not matter now.</div><div class='add'>+ * But dsa_user_phy_setup is called later than sja1105_setup, so the PHY</div><div class='add'>+ * bindings are not yet parsed by DSA core. We need to parse early so that we</div><div class='add'>+ * can populate the xMII mode parameters table.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;info-&gt;disable_microcontroller) {</div><div class='add'>+		rc = priv-&gt;info-&gt;disable_microcontroller(priv);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Failed to disable microcontroller: %pe\n",</div><div class='add'>+				ERR_PTR(rc));</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create and send configuration down to device */</div><div class='add'>+	rc = sja1105_static_config_load(priv);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to load static config: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure the CGU (PHY link modes and speeds) */</div><div class='add'>+	if (priv-&gt;info-&gt;clocking_setup) {</div><div class='add'>+		rc = priv-&gt;info-&gt;clocking_setup(priv);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"Failed to configure MII clocking: %pe\n",</div><div class='add'>+				ERR_PTR(rc));</div><div class='add'>+			goto out_static_config_free;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sja1105_tas_setup(ds);</div><div class='add'>+	sja1105_flower_setup(ds);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_clock_register(ds);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to register PTP clock: %d\n", rc);</div><div class='add'>+		goto out_flower_teardown;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_mdiobus_register(ds);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to register MDIO bus: %pe\n",</div><div class='add'>+			ERR_PTR(rc));</div><div class='add'>+		goto out_ptp_clock_unregister;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_devlink_setup(ds);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto out_mdiobus_unregister;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	rc = dsa_tag_8021q_register(ds, htons(ETH_P_8021Q));</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out_devlink_teardown;</div><div class='add'>+</div><div class='add'>+	/* On SJA1105, VLAN filtering per se is always enabled in hardware.</div><div class='add'>+	 * The only thing we can do to disable it is lie about what the 802.1Q</div><div class='add'>+	 * EtherType is.</div><div class='add'>+	 * So it will still try to apply VLAN filtering, but all ingress</div><div class='add'>+	 * traffic (except frames received with EtherType of ETH_P_SJA1105)</div><div class='add'>+	 * will be internally tagged with a distorted VLAN header where the</div><div class='add'>+	 * TPID is ETH_P_SJA1105, and the VLAN ID is the port pvid.</div><div class='add'>+	 */</div><div class='add'>+	ds-&gt;vlan_filtering_is_global = true;</div><div class='add'>+	ds-&gt;fdb_isolation = true;</div><div class='add'>+	ds-&gt;max_num_bridges = DSA_TAG_8021Q_MAX_NUM_BRIDGES;</div><div class='add'>+</div><div class='add'>+	/* Advertise the 8 egress queues */</div><div class='add'>+	ds-&gt;num_tx_queues = SJA1105_NUM_TC;</div><div class='add'>+</div><div class='add'>+	ds-&gt;mtu_enforcement_ingress = true;</div><div class='add'>+	ds-&gt;assisted_learning_on_cpu_port = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_devlink_teardown:</div><div class='add'>+	sja1105_devlink_teardown(ds);</div><div class='add'>+out_mdiobus_unregister:</div><div class='add'>+	sja1105_mdiobus_unregister(ds);</div><div class='add'>+out_ptp_clock_unregister:</div><div class='add'>+	sja1105_ptp_clock_unregister(ds);</div><div class='add'>+out_flower_teardown:</div><div class='add'>+	sja1105_flower_teardown(ds);</div><div class='add'>+	sja1105_tas_teardown(ds);</div><div class='add'>+out_static_config_free:</div><div class='add'>+	sja1105_static_config_free(&amp;priv-&gt;static_config);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	dsa_tag_8021q_unregister(ds);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	sja1105_devlink_teardown(ds);</div><div class='add'>+	sja1105_mdiobus_unregister(ds);</div><div class='add'>+	sja1105_ptp_clock_unregister(ds);</div><div class='add'>+	sja1105_flower_teardown(ds);</div><div class='add'>+	sja1105_tas_teardown(ds);</div><div class='add'>+	sja1105_static_config_free(&amp;priv-&gt;static_config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops sja1105_phylink_mac_ops = {</div><div class='add'>+	.mac_select_pcs	= sja1105_mac_select_pcs,</div><div class='add'>+	.mac_config	= sja1105_mac_config,</div><div class='add'>+	.mac_link_up	= sja1105_mac_link_up,</div><div class='add'>+	.mac_link_down	= sja1105_mac_link_down,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct dsa_switch_ops sja1105_switch_ops = {</div><div class='ctx'> 	.get_tag_protocol	= sja1105_get_tag_protocol,</div><div class='add'>+	.connect_tag_protocol	= sja1105_connect_tag_protocol,</div><div class='ctx'> 	.setup			= sja1105_setup,</div><div class='del'>-	.adjust_link		= sja1105_adjust_link,</div><div class='add'>+	.teardown		= sja1105_teardown,</div><div class='ctx'> 	.set_ageing_time	= sja1105_set_ageing_time,</div><div class='del'>-	.phylink_validate	= sja1105_phylink_validate,</div><div class='add'>+	.port_change_mtu	= sja1105_change_mtu,</div><div class='add'>+	.port_max_mtu		= sja1105_get_max_mtu,</div><div class='add'>+	.phylink_get_caps	= sja1105_phylink_get_caps,</div><div class='ctx'> 	.get_strings		= sja1105_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= sja1105_get_ethtool_stats,</div><div class='ctx'> 	.get_sset_count		= sja1105_get_sset_count,</div><div class='add'>+	.get_ts_info		= sja1105_get_ts_info,</div><div class='ctx'> 	.port_fdb_dump		= sja1105_fdb_dump,</div><div class='ctx'> 	.port_fdb_add		= sja1105_fdb_add,</div><div class='ctx'> 	.port_fdb_del		= sja1105_fdb_del,</div><div class='add'>+	.port_fast_age		= sja1105_fast_age,</div><div class='ctx'> 	.port_bridge_join	= sja1105_bridge_join,</div><div class='ctx'> 	.port_bridge_leave	= sja1105_bridge_leave,</div><div class='add'>+	.port_pre_bridge_flags	= sja1105_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= sja1105_port_bridge_flags,</div><div class='ctx'> 	.port_stp_state_set	= sja1105_bridge_stp_state_set,</div><div class='del'>-	.port_vlan_prepare	= sja1105_vlan_prepare,</div><div class='ctx'> 	.port_vlan_filtering	= sja1105_vlan_filtering,</div><div class='del'>-	.port_vlan_add		= sja1105_vlan_add,</div><div class='del'>-	.port_vlan_del		= sja1105_vlan_del,</div><div class='del'>-	.port_mdb_prepare	= sja1105_mdb_prepare,</div><div class='add'>+	.port_vlan_add		= sja1105_bridge_vlan_add,</div><div class='add'>+	.port_vlan_del		= sja1105_bridge_vlan_del,</div><div class='ctx'> 	.port_mdb_add		= sja1105_mdb_add,</div><div class='ctx'> 	.port_mdb_del		= sja1105_mdb_del,</div><div class='del'>-	.port_deferred_xmit	= sja1105_port_deferred_xmit,</div><div class='add'>+	.port_hwtstamp_get	= sja1105_hwtstamp_get,</div><div class='add'>+	.port_hwtstamp_set	= sja1105_hwtstamp_set,</div><div class='add'>+	.port_rxtstamp		= sja1105_port_rxtstamp,</div><div class='add'>+	.port_txtstamp		= sja1105_port_txtstamp,</div><div class='add'>+	.port_setup_tc		= sja1105_port_setup_tc,</div><div class='add'>+	.port_mirror_add	= sja1105_mirror_add,</div><div class='add'>+	.port_mirror_del	= sja1105_mirror_del,</div><div class='add'>+	.port_policer_add	= sja1105_port_policer_add,</div><div class='add'>+	.port_policer_del	= sja1105_port_policer_del,</div><div class='add'>+	.cls_flower_add		= sja1105_cls_flower_add,</div><div class='add'>+	.cls_flower_del		= sja1105_cls_flower_del,</div><div class='add'>+	.cls_flower_stats	= sja1105_cls_flower_stats,</div><div class='add'>+	.devlink_info_get	= sja1105_devlink_info_get,</div><div class='add'>+	.tag_8021q_vlan_add	= sja1105_dsa_8021q_vlan_add,</div><div class='add'>+	.tag_8021q_vlan_del	= sja1105_dsa_8021q_vlan_del,</div><div class='add'>+	.port_prechangeupper	= sja1105_prechangeupper,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id sja1105_dt_ids[];</div><div class='add'>+</div><div class='ctx'> static int sja1105_check_device_id(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	u8 prod_id[SJA1105_SIZE_DEVICE_ID] = {0};</div><div class='ctx'> 	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='del'>-	u64 device_id;</div><div class='add'>+	const struct of_device_id *match;</div><div class='add'>+	u32 device_id;</div><div class='ctx'> 	u64 part_no;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sja1105_spi_send_int(priv, SPI_READ, regs-&gt;device_id,</div><div class='del'>-				  &amp;device_id, SJA1105_SIZE_DEVICE_ID);</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, regs-&gt;device_id, &amp;device_id,</div><div class='add'>+			      NULL);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (device_id != priv-&gt;info-&gt;device_id) {</div><div class='del'>-		dev_err(dev, "Expected device ID 0x%llx but read 0x%llx\n",</div><div class='del'>-			priv-&gt;info-&gt;device_id, device_id);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_READ, regs-&gt;prod_id,</div><div class='del'>-					 prod_id, SJA1105_SIZE_DEVICE_ID);</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_READ, regs-&gt;prod_id, prod_id,</div><div class='add'>+			      SJA1105_SIZE_DEVICE_ID);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	sja1105_unpack(prod_id, &amp;part_no, 19, 4, SJA1105_SIZE_DEVICE_ID);</div><div class='ctx'> </div><div class='del'>-	if (part_no != priv-&gt;info-&gt;part_no) {</div><div class='del'>-		dev_err(dev, "Expected part number 0x%llx but read 0x%llx\n",</div><div class='del'>-			priv-&gt;info-&gt;part_no, part_no);</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	for (match = sja1105_dt_ids; match-&gt;compatible[0]; match++) {</div><div class='add'>+		const struct sja1105_info *info = match-&gt;data;</div><div class='add'>+</div><div class='add'>+		/* Is what's been probed in our match table at all? */</div><div class='add'>+		if (info-&gt;device_id != device_id || info-&gt;part_no != part_no)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* But is it what's in the device tree? */</div><div class='add'>+		if (priv-&gt;info-&gt;device_id != device_id ||</div><div class='add'>+		    priv-&gt;info-&gt;part_no != part_no) {</div><div class='add'>+			dev_warn(dev, "Device tree specifies chip %s but found %s, please fix it!\n",</div><div class='add'>+				 priv-&gt;info-&gt;name, info-&gt;name);</div><div class='add'>+			/* It isn't. No problem, pick that up. */</div><div class='add'>+			priv-&gt;info = info;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	dev_err(dev, "Unexpected {device ID, part number}: 0x%x 0x%llx\n",</div><div class='add'>+		device_id, part_no);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int sja1105_probe(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;spi-&gt;dev;</div><div class='ctx'> 	struct sja1105_private *priv;</div><div class='add'>+	size_t max_xfer, max_msg;</div><div class='ctx'> 	struct dsa_switch *ds;</div><div class='del'>-	int rc, i;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;of_node) {</div><div class='ctx'> 		dev_err(dev, "No DTS bindings for SJA1105 driver\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rc = sja1105_hw_reset(dev, 1, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	priv = devm_kzalloc(dev, sizeof(struct sja1105_private), GFP_KERNEL);</div><div class='ctx'> 	if (!priv)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	/* Configure the optional reset pin and bring up switch */</div><div class='del'>-	priv-&gt;reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH);</div><div class='del'>-	if (IS_ERR(priv-&gt;reset_gpio))</div><div class='del'>-		dev_dbg(dev, "reset-gpios not defined, ignoring\n");</div><div class='del'>-	else</div><div class='del'>-		sja1105_hw_reset(priv-&gt;reset_gpio, 1, 1);</div><div class='del'>-</div><div class='ctx'> 	/* Populate our driver private structure (priv) based on</div><div class='ctx'> 	 * the device tree node that was probed (spi)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1610,6 +3324,33 @@ static int sja1105_probe(struct spi_device *spi)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* In sja1105_xfer, we send spi_messages composed of two spi_transfers:</div><div class='add'>+	 * a small one for the message header and another one for the current</div><div class='add'>+	 * chunk of the packed buffer.</div><div class='add'>+	 * Check that the restrictions imposed by the SPI controller are</div><div class='add'>+	 * respected: the chunk buffer is smaller than the max transfer size,</div><div class='add'>+	 * and the total length of the chunk plus its message header is smaller</div><div class='add'>+	 * than the max message size.</div><div class='add'>+	 * We do that during probe time since the maximum transfer size is a</div><div class='add'>+	 * runtime invariant.</div><div class='add'>+	 */</div><div class='add'>+	max_xfer = spi_max_transfer_size(spi);</div><div class='add'>+	max_msg = spi_max_message_size(spi);</div><div class='add'>+</div><div class='add'>+	/* We need to send at least one 64-bit word of SPI payload per message</div><div class='add'>+	 * in order to be able to make useful progress.</div><div class='add'>+	 */</div><div class='add'>+	if (max_msg &lt; SJA1105_SIZE_SPI_MSG_HEADER + 8) {</div><div class='add'>+		dev_err(dev, "SPI master cannot send large enough buffers, aborting\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;max_xfer_len = SJA1105_SIZE_SPI_MSG_MAXLEN;</div><div class='add'>+	if (priv-&gt;max_xfer_len &gt; max_xfer)</div><div class='add'>+		priv-&gt;max_xfer_len = max_xfer;</div><div class='add'>+	if (priv-&gt;max_xfer_len &gt; max_msg - SJA1105_SIZE_SPI_MSG_HEADER)</div><div class='add'>+		priv-&gt;max_xfer_len = max_msg - SJA1105_SIZE_SPI_MSG_HEADER;</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;info = of_device_get_match_data(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Detect hardware device */</div><div class='hunk'>@@ -1621,33 +3362,60 @@ static int sja1105_probe(struct spi_device *spi)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "Probed switch chip: %s\n", priv-&gt;info-&gt;name);</div><div class='ctx'> </div><div class='del'>-	ds = dsa_switch_alloc(dev, SJA1105_NUM_PORTS);</div><div class='add'>+	ds = devm_kzalloc(dev, sizeof(*ds), GFP_KERNEL);</div><div class='ctx'> 	if (!ds)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;num_ports = priv-&gt;info-&gt;num_ports;</div><div class='ctx'> 	ds-&gt;ops = &amp;sja1105_switch_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;sja1105_phylink_mac_ops;</div><div class='ctx'> 	ds-&gt;priv = priv;</div><div class='ctx'> 	priv-&gt;ds = ds;</div><div class='ctx'> </div><div class='del'>-	/* Connections between dsa_port and sja1105_port */</div><div class='del'>-	for (i = 0; i &lt; SJA1105_NUM_PORTS; i++) {</div><div class='del'>-		struct sja1105_port *sp = &amp;priv-&gt;ports[i];</div><div class='add'>+	mutex_init(&amp;priv-&gt;ptp_data.lock);</div><div class='add'>+	mutex_init(&amp;priv-&gt;dynamic_config_lock);</div><div class='add'>+	mutex_init(&amp;priv-&gt;mgmt_lock);</div><div class='add'>+	mutex_init(&amp;priv-&gt;fdb_lock);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;ts_id_lock);</div><div class='ctx'> </div><div class='del'>-		ds-&gt;ports[i].priv = sp;</div><div class='del'>-		sp-&gt;dp = &amp;ds-&gt;ports[i];</div><div class='add'>+	rc = sja1105_parse_dt(priv);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to parse DT: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ENABLED(CONFIG_NET_SCH_CBS)) {</div><div class='add'>+		priv-&gt;cbs = devm_kcalloc(dev, priv-&gt;info-&gt;num_cbs_shapers,</div><div class='add'>+					 sizeof(struct sja1105_cbs_entry),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+		if (!priv-&gt;cbs)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_init(&amp;priv-&gt;mgmt_lock);</div><div class='ctx'> </div><div class='ctx'> 	return dsa_register_switch(priv-&gt;ds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_remove(struct spi_device *spi)</div><div class='add'>+static void sja1105_remove(struct spi_device *spi)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_private *priv = spi_get_drvdata(spi);</div><div class='ctx'> </div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	dsa_unregister_switch(priv-&gt;ds);</div><div class='del'>-	sja1105_static_config_free(&amp;priv-&gt;static_config);</div><div class='del'>-	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_shutdown(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id sja1105_dt_ids[] = {</div><div class='hunk'>@@ -1657,18 +3425,38 @@ static const struct of_device_id sja1105_dt_ids[] = {</div><div class='ctx'> 	{ .compatible = "nxp,sja1105q", .data = &amp;sja1105q_info },</div><div class='ctx'> 	{ .compatible = "nxp,sja1105r", .data = &amp;sja1105r_info },</div><div class='ctx'> 	{ .compatible = "nxp,sja1105s", .data = &amp;sja1105s_info },</div><div class='add'>+	{ .compatible = "nxp,sja1110a", .data = &amp;sja1110a_info },</div><div class='add'>+	{ .compatible = "nxp,sja1110b", .data = &amp;sja1110b_info },</div><div class='add'>+	{ .compatible = "nxp,sja1110c", .data = &amp;sja1110c_info },</div><div class='add'>+	{ .compatible = "nxp,sja1110d", .data = &amp;sja1110d_info },</div><div class='ctx'> 	{ /* sentinel */ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, sja1105_dt_ids);</div><div class='ctx'> </div><div class='add'>+static const struct spi_device_id sja1105_spi_ids[] = {</div><div class='add'>+	{ "sja1105e" },</div><div class='add'>+	{ "sja1105t" },</div><div class='add'>+	{ "sja1105p" },</div><div class='add'>+	{ "sja1105q" },</div><div class='add'>+	{ "sja1105r" },</div><div class='add'>+	{ "sja1105s" },</div><div class='add'>+	{ "sja1110a" },</div><div class='add'>+	{ "sja1110b" },</div><div class='add'>+	{ "sja1110c" },</div><div class='add'>+	{ "sja1110d" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, sja1105_spi_ids);</div><div class='add'>+</div><div class='ctx'> static struct spi_driver sja1105_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name  = "sja1105",</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='ctx'> 		.of_match_table = of_match_ptr(sja1105_dt_ids),</div><div class='ctx'> 	},</div><div class='add'>+	.id_table = sja1105_spi_ids,</div><div class='ctx'> 	.probe  = sja1105_probe,</div><div class='ctx'> 	.remove = sja1105_remove,</div><div class='add'>+	.shutdown = sja1105_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_spi_driver(sja1105_driver);</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_mdio.c b/drivers/net/dsa/sja1105/sja1105_mdio.c<br/>new file mode 100644<br/>index 000000000000..8d535c033cef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_mdio.c</a></div><div class='hunk'>@@ -0,0 +1,507 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2021 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/pcs/pcs-xpcs.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#define SJA1110_PCS_BANK_REG		SJA1110_SPI_ADDR(0x3fc)</div><div class='add'>+</div><div class='add'>+int sja1105_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int reg)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	addr = (mmd &lt;&lt; 16) | reg;</div><div class='add'>+</div><div class='add'>+	if (mmd != MDIO_MMD_VEND1 &amp;&amp; mmd != MDIO_MMD_VEND2)</div><div class='add'>+		return 0xffff;</div><div class='add'>+</div><div class='add'>+	if (mmd == MDIO_MMD_VEND2 &amp;&amp; (reg &amp; GENMASK(15, 0)) == MII_PHYSID1)</div><div class='add'>+		return NXP_SJA1105_XPCS_ID &gt;&gt; 16;</div><div class='add'>+	if (mmd == MDIO_MMD_VEND2 &amp;&amp; (reg &amp; GENMASK(15, 0)) == MII_PHYSID2)</div><div class='add'>+		return NXP_SJA1105_XPCS_ID &amp; GENMASK(15, 0);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, addr, &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return tmp &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd,</div><div class='add'>+			       int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	addr = (mmd &lt;&lt; 16) | reg;</div><div class='add'>+	tmp = val;</div><div class='add'>+</div><div class='add'>+	if (mmd != MDIO_MMD_VEND1 &amp;&amp; mmd != MDIO_MMD_VEND2)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, addr, &amp;tmp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1110_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int reg)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	int offset, bank;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;pcs_base[phy] == SJA1105_RSV_ADDR)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	addr = (mmd &lt;&lt; 16) | reg;</div><div class='add'>+</div><div class='add'>+	if (mmd == MDIO_MMD_VEND2 &amp;&amp; (reg &amp; GENMASK(15, 0)) == MII_PHYSID1)</div><div class='add'>+		return NXP_SJA1110_XPCS_ID &gt;&gt; 16;</div><div class='add'>+	if (mmd == MDIO_MMD_VEND2 &amp;&amp; (reg &amp; GENMASK(15, 0)) == MII_PHYSID2)</div><div class='add'>+		return NXP_SJA1110_XPCS_ID &amp; GENMASK(15, 0);</div><div class='add'>+</div><div class='add'>+	bank = addr &gt;&gt; 8;</div><div class='add'>+	offset = addr &amp; GENMASK(7, 0);</div><div class='add'>+</div><div class='add'>+	/* This addressing scheme reserves register 0xff for the bank address</div><div class='add'>+	 * register, so that can never be addressed.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(offset == 0xff))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	tmp = bank;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_WRITE,</div><div class='add'>+			      regs-&gt;pcs_base[phy] + SJA1110_PCS_BANK_REG,</div><div class='add'>+			      &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, regs-&gt;pcs_base[phy] + offset,</div><div class='add'>+			      &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return tmp &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1110_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd, int reg,</div><div class='add'>+			       u16 val)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	int offset, bank;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;pcs_base[phy] == SJA1105_RSV_ADDR)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	addr = (mmd &lt;&lt; 16) | reg;</div><div class='add'>+</div><div class='add'>+	bank = addr &gt;&gt; 8;</div><div class='add'>+	offset = addr &amp; GENMASK(7, 0);</div><div class='add'>+</div><div class='add'>+	/* This addressing scheme reserves register 0xff for the bank address</div><div class='add'>+	 * register, so that can never be addressed.</div><div class='add'>+	 */</div><div class='add'>+	if (WARN_ON(offset == 0xff))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	tmp = bank;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_WRITE,</div><div class='add'>+			      regs-&gt;pcs_base[phy] + SJA1110_PCS_BANK_REG,</div><div class='add'>+			      &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	tmp = val;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;pcs_base[phy] + offset,</div><div class='add'>+				&amp;tmp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum sja1105_mdio_opcode {</div><div class='add'>+	SJA1105_C45_ADDR = 0,</div><div class='add'>+	SJA1105_C22 = 1,</div><div class='add'>+	SJA1105_C45_DATA = 2,</div><div class='add'>+	SJA1105_C45_DATA_AUTOINC = 3,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u64 sja1105_base_t1_encode_addr(struct sja1105_private *priv,</div><div class='add'>+				       int phy, enum sja1105_mdio_opcode op,</div><div class='add'>+				       int xad)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	return regs-&gt;mdio_100base_t1 | (phy &lt;&lt; 7) | (op &lt;&lt; 5) | (xad &lt;&lt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_base_t1_mdio_read_c22(struct mii_bus *bus, int phy, int reg)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	addr = sja1105_base_t1_encode_addr(priv, phy, SJA1105_C22, reg &amp; 0x1f);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, addr, &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return tmp &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_base_t1_mdio_read_c45(struct mii_bus *bus, int phy,</div><div class='add'>+					 int mmd, int reg)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	addr = sja1105_base_t1_encode_addr(priv, phy, SJA1105_C45_ADDR, mmd);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_WRITE, addr, &amp;reg, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	addr = sja1105_base_t1_encode_addr(priv, phy, SJA1105_C45_DATA, mmd);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, addr, &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return tmp &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_base_t1_mdio_write_c22(struct mii_bus *bus, int phy, int reg,</div><div class='add'>+					  u16 val)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	addr = sja1105_base_t1_encode_addr(priv, phy, SJA1105_C22, reg &amp; 0x1f);</div><div class='add'>+</div><div class='add'>+	tmp = val &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, addr, &amp;tmp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_base_t1_mdio_write_c45(struct mii_bus *bus, int phy,</div><div class='add'>+					  int mmd, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	u64 addr;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	addr = sja1105_base_t1_encode_addr(priv, phy, SJA1105_C45_ADDR, mmd);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_WRITE, addr, &amp;reg, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	addr = sja1105_base_t1_encode_addr(priv, phy, SJA1105_C45_DATA, mmd);</div><div class='add'>+</div><div class='add'>+	tmp = val &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, addr, &amp;tmp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_base_tx_mdio_read(struct mii_bus *bus, int phy, int reg)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, regs-&gt;mdio_100base_tx + reg,</div><div class='add'>+			      &amp;tmp, NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return tmp &amp; 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_base_tx_mdio_write(struct mii_bus *bus, int phy, int reg,</div><div class='add'>+				      u16 val)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv = bus-&gt;priv;</div><div class='add'>+	struct sja1105_private *priv = mdio_priv-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u32 tmp = val;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;mdio_100base_tx + reg,</div><div class='add'>+				&amp;tmp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_mdiobus_base_tx_register(struct sja1105_private *priv,</div><div class='add'>+					    struct device_node *mdio_node)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	np = of_get_compatible_child(mdio_node, "nxp,sja1110-base-tx-mdio");</div><div class='add'>+	if (!np)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!of_device_is_available(np))</div><div class='add'>+		goto out_put_np;</div><div class='add'>+</div><div class='add'>+	bus = mdiobus_alloc_size(sizeof(*mdio_priv));</div><div class='add'>+	if (!bus) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_put_np;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;name = "SJA1110 100base-TX MDIO bus";</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s-base-tx",</div><div class='add'>+		 dev_name(priv-&gt;ds-&gt;dev));</div><div class='add'>+	bus-&gt;read = sja1105_base_tx_mdio_read;</div><div class='add'>+	bus-&gt;write = sja1105_base_tx_mdio_write;</div><div class='add'>+	bus-&gt;parent = priv-&gt;ds-&gt;dev;</div><div class='add'>+	mdio_priv = bus-&gt;priv;</div><div class='add'>+	mdio_priv-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	rc = of_mdiobus_register(bus, np);</div><div class='add'>+	if (rc) {</div><div class='add'>+		mdiobus_free(bus);</div><div class='add'>+		goto out_put_np;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio_base_tx = bus;</div><div class='add'>+</div><div class='add'>+out_put_np:</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_mdiobus_base_tx_unregister(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;mdio_base_tx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mdiobus_unregister(priv-&gt;mdio_base_tx);</div><div class='add'>+	mdiobus_free(priv-&gt;mdio_base_tx);</div><div class='add'>+	priv-&gt;mdio_base_tx = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_mdiobus_base_t1_register(struct sja1105_private *priv,</div><div class='add'>+					    struct device_node *mdio_node)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	np = of_get_compatible_child(mdio_node, "nxp,sja1110-base-t1-mdio");</div><div class='add'>+	if (!np)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!of_device_is_available(np))</div><div class='add'>+		goto out_put_np;</div><div class='add'>+</div><div class='add'>+	bus = mdiobus_alloc_size(sizeof(*mdio_priv));</div><div class='add'>+	if (!bus) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto out_put_np;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bus-&gt;name = "SJA1110 100base-T1 MDIO bus";</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s-base-t1",</div><div class='add'>+		 dev_name(priv-&gt;ds-&gt;dev));</div><div class='add'>+	bus-&gt;read = sja1105_base_t1_mdio_read_c22;</div><div class='add'>+	bus-&gt;write = sja1105_base_t1_mdio_write_c22;</div><div class='add'>+	bus-&gt;read_c45 = sja1105_base_t1_mdio_read_c45;</div><div class='add'>+	bus-&gt;write_c45 = sja1105_base_t1_mdio_write_c45;</div><div class='add'>+	bus-&gt;parent = priv-&gt;ds-&gt;dev;</div><div class='add'>+	mdio_priv = bus-&gt;priv;</div><div class='add'>+	mdio_priv-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	rc = of_mdiobus_register(bus, np);</div><div class='add'>+	if (rc) {</div><div class='add'>+		mdiobus_free(bus);</div><div class='add'>+		goto out_put_np;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio_base_t1 = bus;</div><div class='add'>+</div><div class='add'>+out_put_np:</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_mdiobus_base_t1_unregister(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	if (!priv-&gt;mdio_base_t1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mdiobus_unregister(priv-&gt;mdio_base_t1);</div><div class='add'>+	mdiobus_free(priv-&gt;mdio_base_t1);</div><div class='add'>+	priv-&gt;mdio_base_t1 = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_mdiobus_pcs_register(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_mdio_private *mdio_priv;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;info-&gt;pcs_mdio_read_c45 || !priv-&gt;info-&gt;pcs_mdio_write_c45)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bus = mdiobus_alloc_size(sizeof(*mdio_priv));</div><div class='add'>+	if (!bus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bus-&gt;name = "SJA1105 PCS MDIO bus";</div><div class='add'>+	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s-pcs",</div><div class='add'>+		 dev_name(ds-&gt;dev));</div><div class='add'>+	bus-&gt;read_c45 = priv-&gt;info-&gt;pcs_mdio_read_c45;</div><div class='add'>+	bus-&gt;write_c45 = priv-&gt;info-&gt;pcs_mdio_write_c45;</div><div class='add'>+	bus-&gt;parent = ds-&gt;dev;</div><div class='add'>+	/* There is no PHY on this MDIO bus =&gt; mask out all PHY addresses</div><div class='add'>+	 * from auto probing.</div><div class='add'>+	 */</div><div class='add'>+	bus-&gt;phy_mask = ~0;</div><div class='add'>+	mdio_priv = bus-&gt;priv;</div><div class='add'>+	mdio_priv-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	rc = mdiobus_register(bus);</div><div class='add'>+	if (rc) {</div><div class='add'>+		mdiobus_free(bus);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		struct phylink_pcs *pcs;</div><div class='add'>+</div><div class='add'>+		if (dsa_is_unused_port(ds, port))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;phy_mode[port] != PHY_INTERFACE_MODE_SGMII &amp;&amp;</div><div class='add'>+		    priv-&gt;phy_mode[port] != PHY_INTERFACE_MODE_2500BASEX)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pcs = xpcs_create_pcs_mdiodev(bus, port);</div><div class='add'>+		if (IS_ERR(pcs)) {</div><div class='add'>+			rc = PTR_ERR(pcs);</div><div class='add'>+			goto out_pcs_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv-&gt;pcs[port] = pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mdio_pcs = bus;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_pcs_free:</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (priv-&gt;pcs[port]) {</div><div class='add'>+			xpcs_destroy_pcs(priv-&gt;pcs[port]);</div><div class='add'>+			priv-&gt;pcs[port] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdiobus_unregister(bus);</div><div class='add'>+	mdiobus_free(bus);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_mdiobus_pcs_unregister(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;mdio_pcs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (priv-&gt;pcs[port]) {</div><div class='add'>+			xpcs_destroy_pcs(priv-&gt;pcs[port]);</div><div class='add'>+			priv-&gt;pcs[port] = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mdiobus_unregister(priv-&gt;mdio_pcs);</div><div class='add'>+	mdiobus_free(priv-&gt;mdio_pcs);</div><div class='add'>+	priv-&gt;mdio_pcs = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_mdiobus_register(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct device_node *switch_node = ds-&gt;dev-&gt;of_node;</div><div class='add'>+	struct device_node *mdio_node;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_mdiobus_pcs_register(priv);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	mdio_node = of_get_available_child_by_name(switch_node, "mdios");</div><div class='add'>+	if (!mdio_node)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;mdio_100base_tx != SJA1105_RSV_ADDR) {</div><div class='add'>+		rc = sja1105_mdiobus_base_tx_register(priv, mdio_node);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_put_mdio_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (regs-&gt;mdio_100base_t1 != SJA1105_RSV_ADDR) {</div><div class='add'>+		rc = sja1105_mdiobus_base_t1_register(priv, mdio_node);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_base_tx_mdiobus;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	of_node_put(mdio_node);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_base_tx_mdiobus:</div><div class='add'>+	sja1105_mdiobus_base_tx_unregister(priv);</div><div class='add'>+err_put_mdio_node:</div><div class='add'>+	of_node_put(mdio_node);</div><div class='add'>+	sja1105_mdiobus_pcs_unregister(priv);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_mdiobus_unregister(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	sja1105_mdiobus_base_t1_unregister(priv);</div><div class='add'>+	sja1105_mdiobus_base_tx_unregister(priv);</div><div class='add'>+	sja1105_mdiobus_pcs_unregister(priv);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c<br/>new file mode 100644<br/>index 000000000000..fefe46e2a5e6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_ptp.c</a></div><div class='hunk'>@@ -0,0 +1,970 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+/* The adjfine API clamps ppb between [-32,768,000, 32,768,000], and</div><div class='add'>+ * therefore scaled_ppm between [-2,147,483,648, 2,147,483,647].</div><div class='add'>+ * Set the maximum supported ppb to a round value smaller than the maximum.</div><div class='add'>+ *</div><div class='add'>+ * Percentually speaking, this is a +/- 0.032x adjustment of the</div><div class='add'>+ * free-running counter (0.968x to 1.032x).</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_MAX_ADJ_PPB		32000000</div><div class='add'>+#define SJA1105_SIZE_PTP_CMD		4</div><div class='add'>+</div><div class='add'>+/* PTPSYNCTS has no interrupt or update mechanism, because the intended</div><div class='add'>+ * hardware use case is for the timestamp to be collected synchronously,</div><div class='add'>+ * immediately after the CAS_MASTER SJA1105 switch has performed a CASSYNC</div><div class='add'>+ * one-shot toggle (no return to level) on the PTP_CLK pin. When used as a</div><div class='add'>+ * generic extts source, the PTPSYNCTS register needs polling and a comparison</div><div class='add'>+ * with the old value. The polling interval is configured as the Nyquist rate</div><div class='add'>+ * of a signal with 50% duty cycle and 1Hz frequency, which is sadly all that</div><div class='add'>+ * this hardware can do (but may be enough for some setups). Anything of higher</div><div class='add'>+ * frequency than 1 Hz will be lost, since there is no timestamp FIFO.</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_EXTTS_INTERVAL		(HZ / 6)</div><div class='add'>+</div><div class='add'>+/*            This range is actually +/- SJA1105_MAX_ADJ_PPB</div><div class='add'>+ *            divided by 1000 (ppb -&gt; ppm) and with a 16-bit</div><div class='add'>+ *            "fractional" part (actually fixed point).</div><div class='add'>+ *                                    |</div><div class='add'>+ *                                    v</div><div class='add'>+ * Convert scaled_ppm from the +/- ((10^6) &lt;&lt; 16) range</div><div class='add'>+ * into the +/- (1 &lt;&lt; 31) range.</div><div class='add'>+ *</div><div class='add'>+ * This forgoes a "ppb" numeric representation (up to NSEC_PER_SEC)</div><div class='add'>+ * and defines the scaling factor between scaled_ppm and the actual</div><div class='add'>+ * frequency adjustments of the PHC.</div><div class='add'>+ *</div><div class='add'>+ *   ptpclkrate = scaled_ppm * 2^31 / (10^6 * 2^16)</div><div class='add'>+ *   simplifies to</div><div class='add'>+ *   ptpclkrate = scaled_ppm * 2^9 / 5^6</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_CC_MULT_NUM		(1 &lt;&lt; 9)</div><div class='add'>+#define SJA1105_CC_MULT_DEM		15625</div><div class='add'>+#define SJA1105_CC_MULT			0x80000000</div><div class='add'>+</div><div class='add'>+enum sja1105_ptp_clk_mode {</div><div class='add'>+	PTP_ADD_MODE = 1,</div><div class='add'>+	PTP_SET_MODE = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define extts_to_data(t) \</div><div class='add'>+		container_of((t), struct sja1105_ptp_data, extts_timer)</div><div class='add'>+#define ptp_caps_to_data(d) \</div><div class='add'>+		container_of((d), struct sja1105_ptp_data, caps)</div><div class='add'>+#define ptp_data_to_sja1105(d) \</div><div class='add'>+		container_of((d), struct sja1105_private, ptp_data)</div><div class='add'>+</div><div class='add'>+int sja1105_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct kernel_hwtstamp_config *config,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	unsigned long hwts_tx_en, hwts_rx_en;</div><div class='add'>+</div><div class='add'>+	hwts_tx_en = priv-&gt;hwts_tx_en;</div><div class='add'>+	hwts_rx_en = priv-&gt;hwts_rx_en;</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+		hwts_tx_en &amp;= ~BIT(port);</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		hwts_tx_en |= BIT(port);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		hwts_rx_en &amp;= ~BIT(port);</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+		hwts_rx_en |= BIT(port);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;hwts_tx_en = hwts_tx_en;</div><div class='add'>+	priv-&gt;hwts_rx_en = hwts_rx_en;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	config-&gt;flags = 0;</div><div class='add'>+	if (priv-&gt;hwts_tx_en &amp; BIT(port))</div><div class='add'>+		config-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+	else</div><div class='add'>+		config-&gt;tx_type = HWTSTAMP_TX_OFF;</div><div class='add'>+	if (priv-&gt;hwts_rx_en &amp; BIT(port))</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;</div><div class='add'>+	else</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_get_ts_info(struct dsa_switch *ds, int port,</div><div class='add'>+			struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	/* Called during cleanup */</div><div class='add'>+	if (!ptp_data-&gt;clock)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+				SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+				SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+	info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) |</div><div class='add'>+			 (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='add'>+	info-&gt;rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='add'>+			   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_EVENT);</div><div class='add'>+	info-&gt;phc_index = ptp_clock_index(ptp_data-&gt;clock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105et_ptp_cmd_packing(u8 *buf, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+			       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_PTP_CMD;</div><div class='add'>+	/* No need to keep this as part of the structure */</div><div class='add'>+	u64 valid = 1;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;valid,           31, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ptpstrtsch, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ptpstopsch, 29, 29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;startptpcp, 28, 28, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;stopptpcp,  27, 27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;resptp,      2,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;corrclk4ts,  1,  1, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ptpclkadd,   0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105pqrs_ptp_cmd_packing(u8 *buf, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+				 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const int size = SJA1105_SIZE_PTP_CMD;</div><div class='add'>+	/* No need to keep this as part of the structure */</div><div class='add'>+	u64 valid = 1;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;valid,           31, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ptpstrtsch, 30, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ptpstopsch, 29, 29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;startptpcp, 28, 28, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;stopptpcp,  27, 27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;resptp,      3,  3, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;corrclk4ts,  2,  2, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;cmd-&gt;ptpclkadd,   0,  0, size, op);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_ptp_commit(struct dsa_switch *ds, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+		       sja1105_spi_rw_mode_t rw)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 buf[SJA1105_SIZE_PTP_CMD] = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (rw == SPI_WRITE)</div><div class='add'>+		priv-&gt;info-&gt;ptp_cmd_packing(buf, cmd, PACK);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_buf(priv, rw, regs-&gt;ptp_control, buf,</div><div class='add'>+			      SJA1105_SIZE_PTP_CMD);</div><div class='add'>+</div><div class='add'>+	if (rw == SPI_READ)</div><div class='add'>+		priv-&gt;info-&gt;ptp_cmd_packing(buf, cmd, UNPACK);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The switch returns partial timestamps (24 bits for SJA1105 E/T, which wrap</div><div class='add'>+ * around in 0.135 seconds, and 32 bits for P/Q/R/S, wrapping around in 34.35</div><div class='add'>+ * seconds).</div><div class='add'>+ *</div><div class='add'>+ * This receives the RX or TX MAC timestamps, provided by hardware as</div><div class='add'>+ * the lower bits of the cycle counter, sampled at the time the timestamp was</div><div class='add'>+ * collected.</div><div class='add'>+ *</div><div class='add'>+ * To reconstruct into a full 64-bit-wide timestamp, the cycle counter is</div><div class='add'>+ * read and the high-order bits are filled in.</div><div class='add'>+ *</div><div class='add'>+ * Must be called within one wraparound period of the partial timestamp since</div><div class='add'>+ * it was generated by the MAC.</div><div class='add'>+ */</div><div class='add'>+static u64 sja1105_tstamp_reconstruct(struct dsa_switch *ds, u64 now,</div><div class='add'>+				      u64 ts_partial)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u64 partial_tstamp_mask = CYCLECOUNTER_MASK(priv-&gt;info-&gt;ptp_ts_bits);</div><div class='add'>+	u64 ts_reconstructed;</div><div class='add'>+</div><div class='add'>+	ts_reconstructed = (now &amp; ~partial_tstamp_mask) | ts_partial;</div><div class='add'>+</div><div class='add'>+	/* Check lower bits of current cycle counter against the timestamp.</div><div class='add'>+	 * If the current cycle counter is lower than the partial timestamp,</div><div class='add'>+	 * then wraparound surely occurred and must be accounted for.</div><div class='add'>+	 */</div><div class='add'>+	if ((now &amp; partial_tstamp_mask) &lt;= ts_partial)</div><div class='add'>+		ts_reconstructed -= (partial_tstamp_mask + 1);</div><div class='add'>+</div><div class='add'>+	return ts_reconstructed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reads the SPI interface for an egress timestamp generated by the switch</div><div class='add'>+ * for frames sent using management routes.</div><div class='add'>+ *</div><div class='add'>+ * SJA1105 E/T layout of the 4-byte SPI payload:</div><div class='add'>+ *</div><div class='add'>+ * 31    23    15    7     0</div><div class='add'>+ * |     |     |     |     |</div><div class='add'>+ * +-----+-----+-----+     ^</div><div class='add'>+ *          ^              |</div><div class='add'>+ *          |              |</div><div class='add'>+ *  24-bit timestamp   Update bit</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ * SJA1105 P/Q/R/S layout of the 8-byte SPI payload:</div><div class='add'>+ *</div><div class='add'>+ * 31    23    15    7     0     63    55    47    39    32</div><div class='add'>+ * |     |     |     |     |     |     |     |     |     |</div><div class='add'>+ *                         ^     +-----+-----+-----+-----+</div><div class='add'>+ *                         |                 ^</div><div class='add'>+ *                         |                 |</div><div class='add'>+ *                    Update bit    32-bit timestamp</div><div class='add'>+ *</div><div class='add'>+ * Notice that the update bit is in the same place.</div><div class='add'>+ * To have common code for E/T and P/Q/R/S for reading the timestamp,</div><div class='add'>+ * we need to juggle with the offset and the bit indices.</div><div class='add'>+ */</div><div class='add'>+static int sja1105_ptpegr_ts_poll(struct dsa_switch *ds, int port, u64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	int tstamp_bit_start, tstamp_bit_end;</div><div class='add'>+	int timeout = 10;</div><div class='add'>+	u8 packed_buf[8];</div><div class='add'>+	u64 update;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		rc = sja1105_xfer_buf(priv, SPI_READ, regs-&gt;ptpegr_ts[port],</div><div class='add'>+				      packed_buf, priv-&gt;info-&gt;ptpegr_ts_bytes);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		sja1105_unpack(packed_buf, &amp;update, 0, 0,</div><div class='add'>+			       priv-&gt;info-&gt;ptpegr_ts_bytes);</div><div class='add'>+		if (update)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		usleep_range(10, 50);</div><div class='add'>+	} while (--timeout);</div><div class='add'>+</div><div class='add'>+	if (!timeout)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	/* Point the end bit to the second 32-bit word on P/Q/R/S,</div><div class='add'>+	 * no-op on E/T.</div><div class='add'>+	 */</div><div class='add'>+	tstamp_bit_end = (priv-&gt;info-&gt;ptpegr_ts_bytes - 4) * 8;</div><div class='add'>+	/* Shift the 24-bit timestamp on E/T to be collected from 31:8.</div><div class='add'>+	 * No-op on P/Q/R/S.</div><div class='add'>+	 */</div><div class='add'>+	tstamp_bit_end += 32 - priv-&gt;info-&gt;ptp_ts_bits;</div><div class='add'>+	tstamp_bit_start = tstamp_bit_end + priv-&gt;info-&gt;ptp_ts_bits - 1;</div><div class='add'>+</div><div class='add'>+	*ts = 0;</div><div class='add'>+</div><div class='add'>+	sja1105_unpack(packed_buf, ts, tstamp_bit_start, tstamp_bit_end,</div><div class='add'>+		       priv-&gt;info-&gt;ptpegr_ts_bytes);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold ptp_data-&gt;lock */</div><div class='add'>+static int sja1105_ptpclkval_read(struct sja1105_private *priv, u64 *ticks,</div><div class='add'>+				  struct ptp_system_timestamp *ptp_sts)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u64(priv, SPI_READ, regs-&gt;ptpclkval, ticks,</div><div class='add'>+				ptp_sts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold ptp_data-&gt;lock */</div><div class='add'>+static int sja1105_ptpclkval_write(struct sja1105_private *priv, u64 ticks,</div><div class='add'>+				   struct ptp_system_timestamp *ptp_sts)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u64(priv, SPI_WRITE, regs-&gt;ptpclkval, &amp;ticks,</div><div class='add'>+				ptp_sts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_extts_poll(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct ptp_clock_event event;</div><div class='add'>+	u64 ptpsyncts = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u64(priv, SPI_READ, regs-&gt;ptpsyncts, &amp;ptpsyncts,</div><div class='add'>+			      NULL);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		dev_err_ratelimited(priv-&gt;ds-&gt;dev,</div><div class='add'>+				    "Failed to read PTPSYNCTS: %d\n", rc);</div><div class='add'>+</div><div class='add'>+	if (ptpsyncts &amp;&amp; ptp_data-&gt;ptpsyncts != ptpsyncts) {</div><div class='add'>+		event.index = 0;</div><div class='add'>+		event.type = PTP_CLOCK_EXTTS;</div><div class='add'>+		event.timestamp = ns_to_ktime(sja1105_ticks_to_ns(ptpsyncts));</div><div class='add'>+		ptp_clock_event(ptp_data-&gt;clock, &amp;event);</div><div class='add'>+</div><div class='add'>+		ptp_data-&gt;ptpsyncts = ptpsyncts;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long sja1105_rxtstamp_work(struct ptp_clock_info *ptp)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while ((skb = skb_dequeue(&amp;ptp_data-&gt;skb_rxtstamp_queue)) != NULL) {</div><div class='add'>+		struct skb_shared_hwtstamps *shwt = skb_hwtstamps(skb);</div><div class='add'>+		u64 ticks, ts;</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_ptpclkval_read(priv, &amp;ticks, NULL);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(ds-&gt;dev, "Failed to read PTP clock: %d\n", rc);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*shwt = (struct skb_shared_hwtstamps) {0};</div><div class='add'>+</div><div class='add'>+		ts = SJA1105_SKB_CB(skb)-&gt;tstamp;</div><div class='add'>+		ts = sja1105_tstamp_reconstruct(ds, ticks, ts);</div><div class='add'>+</div><div class='add'>+		shwt-&gt;hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ptp_data-&gt;extts_enabled)</div><div class='add'>+		sja1105_extts_poll(priv);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Don't restart */</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool sja1105_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;hwts_rx_en &amp; BIT(port)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* We need to read the full PTP clock to reconstruct the Rx</div><div class='add'>+	 * timestamp. For that we need a sleepable context.</div><div class='add'>+	 */</div><div class='add'>+	skb_queue_tail(&amp;ptp_data-&gt;skb_rxtstamp_queue, skb);</div><div class='add'>+	ptp_schedule_worker(ptp_data-&gt;clock, 0);</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool sja1110_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps *shwt = skb_hwtstamps(skb);</div><div class='add'>+	u64 ts = SJA1105_SKB_CB(skb)-&gt;tstamp;</div><div class='add'>+</div><div class='add'>+	*shwt = (struct skb_shared_hwtstamps) {0};</div><div class='add'>+</div><div class='add'>+	shwt-&gt;hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));</div><div class='add'>+</div><div class='add'>+	/* Don't defer */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called from dsa_skb_defer_rx_timestamp */</div><div class='add'>+bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct sk_buff *skb, unsigned int type)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return priv-&gt;info-&gt;rxtstamp(ds, port, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1110_process_meta_tstamp(struct dsa_switch *ds, int port, u8 ts_id,</div><div class='add'>+				 enum sja1110_meta_tstamp dir, u64 tstamp)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	struct sk_buff *skb, *skb_tmp, *skb_match = NULL;</div><div class='add'>+	struct skb_shared_hwtstamps shwt = {0};</div><div class='add'>+</div><div class='add'>+	/* We don't care about RX timestamps on the CPU port */</div><div class='add'>+	if (dir == SJA1110_META_TSTAMP_RX)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;ptp_data-&gt;skb_txtstamp_queue.lock);</div><div class='add'>+</div><div class='add'>+	skb_queue_walk_safe(&amp;ptp_data-&gt;skb_txtstamp_queue, skb, skb_tmp) {</div><div class='add'>+		if (SJA1105_SKB_CB(skb)-&gt;ts_id != ts_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		__skb_unlink(skb, &amp;ptp_data-&gt;skb_txtstamp_queue);</div><div class='add'>+		skb_match = skb;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;ptp_data-&gt;skb_txtstamp_queue.lock);</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(!skb_match))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	shwt.hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(tstamp));</div><div class='add'>+	skb_complete_tx_timestamp(skb_match, &amp;shwt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* In addition to cloning the skb which is done by the common</div><div class='add'>+ * sja1105_port_txtstamp, we need to generate a timestamp ID and save the</div><div class='add'>+ * packet to the TX timestamping queue.</div><div class='add'>+ */</div><div class='add'>+void sja1110_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *clone = SJA1105_SKB_CB(skb)-&gt;clone;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	u8 ts_id;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;ts_id_lock);</div><div class='add'>+</div><div class='add'>+	ts_id = priv-&gt;ts_id;</div><div class='add'>+	/* Deal automatically with 8-bit wraparound */</div><div class='add'>+	priv-&gt;ts_id++;</div><div class='add'>+</div><div class='add'>+	SJA1105_SKB_CB(clone)-&gt;ts_id = ts_id;</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;priv-&gt;ts_id_lock);</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;ptp_data-&gt;skb_txtstamp_queue, clone);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called from dsa_skb_tx_timestamp. This callback is just to clone</div><div class='add'>+ * the skb and have it available in SJA1105_SKB_CB in the .port_deferred_xmit</div><div class='add'>+ * callback, where we will timestamp it synchronously.</div><div class='add'>+ */</div><div class='add'>+void sja1105_port_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sk_buff *clone;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;hwts_tx_en &amp; BIT(port)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clone = skb_clone_sk(skb);</div><div class='add'>+	if (!clone)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	SJA1105_SKB_CB(skb)-&gt;clone = clone;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;info-&gt;txtstamp)</div><div class='add'>+		priv-&gt;info-&gt;txtstamp(ds, port, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_reset(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	struct sja1105_ptp_cmd cmd = ptp_data-&gt;cmd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	cmd.resptp = 1;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ds-&gt;dev, "Resetting PTP clock\n");</div><div class='add'>+	rc = sja1105_ptp_commit(ds, &amp;cmd, SPI_WRITE);</div><div class='add'>+</div><div class='add'>+	sja1105_tas_clockstep(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold ptp_data-&gt;lock */</div><div class='add'>+int __sja1105_ptp_gettimex(struct dsa_switch *ds, u64 *ns,</div><div class='add'>+			   struct ptp_system_timestamp *ptp_sts)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u64 ticks;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptpclkval_read(priv, &amp;ticks, ptp_sts);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to read PTP clock: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ns = sja1105_ticks_to_ns(ticks);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_gettimex(struct ptp_clock_info *ptp,</div><div class='add'>+				struct timespec64 *ts,</div><div class='add'>+				struct ptp_system_timestamp *ptp_sts)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+	u64 now = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = __sja1105_ptp_gettimex(priv-&gt;ds, &amp;now, ptp_sts);</div><div class='add'>+	*ts = ns_to_timespec64(now);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller must hold ptp_data-&gt;lock */</div><div class='add'>+static int sja1105_ptp_mode_set(struct sja1105_private *priv,</div><div class='add'>+				enum sja1105_ptp_clk_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	if (ptp_data-&gt;cmd.ptpclkadd == mode)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;cmd.ptpclkadd = mode;</div><div class='add'>+</div><div class='add'>+	return sja1105_ptp_commit(priv-&gt;ds, &amp;ptp_data-&gt;cmd, SPI_WRITE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write to PTPCLKVAL while PTPCLKADD is 0 */</div><div class='add'>+int __sja1105_ptp_settime(struct dsa_switch *ds, u64 ns,</div><div class='add'>+			  struct ptp_system_timestamp *ptp_sts)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	u64 ticks = ns_to_sja1105_ticks(ns);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_mode_set(priv, PTP_SET_MODE);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;ds-&gt;dev, "Failed to put PTPCLK in set mode\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptpclkval_write(priv, ticks, ptp_sts);</div><div class='add'>+</div><div class='add'>+	sja1105_tas_clockstep(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_settime(struct ptp_clock_info *ptp,</div><div class='add'>+			       const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+	u64 ns = timespec64_to_ns(ts);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = __sja1105_ptp_settime(priv-&gt;ds, ns, NULL);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u32 clkrate32;</div><div class='add'>+	s64 clkrate;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	clkrate = (s64)scaled_ppm * SJA1105_CC_MULT_NUM;</div><div class='add'>+	clkrate = div_s64(clkrate, SJA1105_CC_MULT_DEM);</div><div class='add'>+</div><div class='add'>+	/* Take a +/- value and re-center it around 2^31. */</div><div class='add'>+	clkrate = SJA1105_CC_MULT + clkrate;</div><div class='add'>+	WARN_ON(abs(clkrate) &gt;= GENMASK_ULL(31, 0));</div><div class='add'>+	clkrate32 = clkrate;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;ptpclkrate, &amp;clkrate32,</div><div class='add'>+			      NULL);</div><div class='add'>+</div><div class='add'>+	sja1105_tas_adjfreq(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write to PTPCLKVAL while PTPCLKADD is 1 */</div><div class='add'>+int __sja1105_ptp_adjtime(struct dsa_switch *ds, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	s64 ticks = ns_to_sja1105_ticks(delta);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_mode_set(priv, PTP_ADD_MODE);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(priv-&gt;ds-&gt;dev, "Failed to put PTPCLK in add mode\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptpclkval_write(priv, ticks, NULL);</div><div class='add'>+</div><div class='add'>+	sja1105_tas_clockstep(priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = __sja1105_ptp_adjtime(priv-&gt;ds, delta);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_ptp_extts_setup_timer(struct sja1105_ptp_data *ptp_data)</div><div class='add'>+{</div><div class='add'>+	unsigned long expires = ((jiffies / SJA1105_EXTTS_INTERVAL) + 1) *</div><div class='add'>+				SJA1105_EXTTS_INTERVAL;</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;ptp_data-&gt;extts_timer, expires);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_ptp_extts_timer(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = extts_to_data(t);</div><div class='add'>+</div><div class='add'>+	ptp_schedule_worker(ptp_data-&gt;clock, 0);</div><div class='add'>+</div><div class='add'>+	sja1105_ptp_extts_setup_timer(ptp_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_change_ptp_clk_pin_func(struct sja1105_private *priv,</div><div class='add'>+					   enum ptp_pin_function func)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_avb_params_entry *avb;</div><div class='add'>+	enum ptp_pin_function old_func;</div><div class='add'>+</div><div class='add'>+	avb = priv-&gt;static_config.tables[BLK_IDX_AVB_PARAMS].entries;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;info-&gt;device_id == SJA1105E_DEVICE_ID ||</div><div class='add'>+	    priv-&gt;info-&gt;device_id == SJA1105T_DEVICE_ID ||</div><div class='add'>+	    avb-&gt;cas_master)</div><div class='add'>+		old_func = PTP_PF_PEROUT;</div><div class='add'>+	else</div><div class='add'>+		old_func = PTP_PF_EXTTS;</div><div class='add'>+</div><div class='add'>+	if (func == old_func)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	avb-&gt;cas_master = (func == PTP_PF_PEROUT);</div><div class='add'>+</div><div class='add'>+	return sja1105_dynamic_config_write(priv, BLK_IDX_AVB_PARAMS, 0, avb,</div><div class='add'>+					    true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The PTP_CLK pin may be configured to toggle with a 50% duty cycle and a</div><div class='add'>+ * frequency f:</div><div class='add'>+ *</div><div class='add'>+ *           NSEC_PER_SEC</div><div class='add'>+ * f = ----------------------</div><div class='add'>+ *     (PTPPINDUR * 8 ns) * 2</div><div class='add'>+ */</div><div class='add'>+static int sja1105_per_out_enable(struct sja1105_private *priv,</div><div class='add'>+				  struct ptp_perout_request *perout,</div><div class='add'>+				  bool on)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	struct sja1105_ptp_cmd cmd = ptp_data-&gt;cmd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* We only support one channel */</div><div class='add'>+	if (perout-&gt;index != 0)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_change_ptp_clk_pin_func(priv, PTP_PF_PEROUT);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (on) {</div><div class='add'>+		struct timespec64 pin_duration_ts = {</div><div class='add'>+			.tv_sec = perout-&gt;period.sec,</div><div class='add'>+			.tv_nsec = perout-&gt;period.nsec,</div><div class='add'>+		};</div><div class='add'>+		struct timespec64 pin_start_ts = {</div><div class='add'>+			.tv_sec = perout-&gt;start.sec,</div><div class='add'>+			.tv_nsec = perout-&gt;start.nsec,</div><div class='add'>+		};</div><div class='add'>+		u64 pin_duration = timespec64_to_ns(&amp;pin_duration_ts);</div><div class='add'>+		u64 pin_start = timespec64_to_ns(&amp;pin_start_ts);</div><div class='add'>+		u32 pin_duration32;</div><div class='add'>+		u64 now;</div><div class='add'>+</div><div class='add'>+		/* ptppindur: 32 bit register which holds the interval between</div><div class='add'>+		 * 2 edges on PTP_CLK. So check for truncation which happens</div><div class='add'>+		 * at periods larger than around 68.7 seconds.</div><div class='add'>+		 */</div><div class='add'>+		pin_duration = ns_to_sja1105_ticks(pin_duration / 2);</div><div class='add'>+		if (pin_duration &gt; U32_MAX) {</div><div class='add'>+			rc = -ERANGE;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		pin_duration32 = pin_duration;</div><div class='add'>+</div><div class='add'>+		/* ptppins: 64 bit register which needs to hold a PTP time</div><div class='add'>+		 * larger than the current time, otherwise the startptpcp</div><div class='add'>+		 * command won't do anything. So advance the current time</div><div class='add'>+		 * by a number of periods in a way that won't alter the</div><div class='add'>+		 * phase offset.</div><div class='add'>+		 */</div><div class='add'>+		rc = __sja1105_ptp_gettimex(priv-&gt;ds, &amp;now, NULL);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		pin_start = future_base_time(pin_start, pin_duration,</div><div class='add'>+					     now + 1ull * NSEC_PER_SEC);</div><div class='add'>+		pin_start = ns_to_sja1105_ticks(pin_start);</div><div class='add'>+</div><div class='add'>+		rc = sja1105_xfer_u64(priv, SPI_WRITE, regs-&gt;ptppinst,</div><div class='add'>+				      &amp;pin_start, NULL);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;ptppindur,</div><div class='add'>+				      &amp;pin_duration32, NULL);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		cmd.startptpcp = true;</div><div class='add'>+	else</div><div class='add'>+		cmd.stopptpcp = true;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_commit(priv-&gt;ds, &amp;cmd, SPI_WRITE);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_extts_enable(struct sja1105_private *priv,</div><div class='add'>+				struct ptp_extts_request *extts,</div><div class='add'>+				bool on)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* We only support one channel */</div><div class='add'>+	if (extts-&gt;index != 0)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* We can only enable time stamping on both edges, sadly. */</div><div class='add'>+	if ((extts-&gt;flags &amp; PTP_STRICT_FLAGS) &amp;&amp;</div><div class='add'>+	    (extts-&gt;flags &amp; PTP_ENABLE_FEATURE) &amp;&amp;</div><div class='add'>+	    (extts-&gt;flags &amp; PTP_EXTTS_EDGES) != PTP_EXTTS_EDGES)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_change_ptp_clk_pin_func(priv, PTP_PF_EXTTS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ptp_data.extts_enabled = on;</div><div class='add'>+</div><div class='add'>+	if (on)</div><div class='add'>+		sja1105_ptp_extts_setup_timer(&amp;priv-&gt;ptp_data);</div><div class='add'>+	else</div><div class='add'>+		timer_delete_sync(&amp;priv-&gt;ptp_data.extts_timer);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_enable(struct ptp_clock_info *ptp,</div><div class='add'>+			      struct ptp_clock_request *req, int on)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+	int rc = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (req-&gt;type == PTP_CLK_REQ_PEROUT)</div><div class='add'>+		rc = sja1105_per_out_enable(priv, &amp;req-&gt;perout, on);</div><div class='add'>+	else if (req-&gt;type == PTP_CLK_REQ_EXTTS)</div><div class='add'>+		rc = sja1105_extts_enable(priv, &amp;req-&gt;extts, on);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_ptp_verify_pin(struct ptp_clock_info *ptp, unsigned int pin,</div><div class='add'>+				  enum ptp_pin_function func, unsigned int chan)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = ptp_caps_to_data(ptp);</div><div class='add'>+	struct sja1105_private *priv = ptp_data_to_sja1105(ptp_data);</div><div class='add'>+</div><div class='add'>+	if (chan != 0 || pin != 0)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	switch (func) {</div><div class='add'>+	case PTP_PF_NONE:</div><div class='add'>+	case PTP_PF_PEROUT:</div><div class='add'>+		break;</div><div class='add'>+	case PTP_PF_EXTTS:</div><div class='add'>+		if (priv-&gt;info-&gt;device_id == SJA1105E_DEVICE_ID ||</div><div class='add'>+		    priv-&gt;info-&gt;device_id == SJA1105T_DEVICE_ID)</div><div class='add'>+			return -1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ptp_pin_desc sja1105_ptp_pin = {</div><div class='add'>+	.name = "ptp_clk",</div><div class='add'>+	.index = 0,</div><div class='add'>+	.func = PTP_PF_NONE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sja1105_ptp_clock_register(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;caps = (struct ptp_clock_info) {</div><div class='add'>+		.owner		= THIS_MODULE,</div><div class='add'>+		.name		= "SJA1105 PHC",</div><div class='add'>+		.adjfine	= sja1105_ptp_adjfine,</div><div class='add'>+		.adjtime	= sja1105_ptp_adjtime,</div><div class='add'>+		.gettimex64	= sja1105_ptp_gettimex,</div><div class='add'>+		.settime64	= sja1105_ptp_settime,</div><div class='add'>+		.enable		= sja1105_ptp_enable,</div><div class='add'>+		.verify		= sja1105_ptp_verify_pin,</div><div class='add'>+		.do_aux_work	= sja1105_rxtstamp_work,</div><div class='add'>+		.max_adj	= SJA1105_MAX_ADJ_PPB,</div><div class='add'>+		.pin_config	= &amp;sja1105_ptp_pin,</div><div class='add'>+		.n_pins		= 1,</div><div class='add'>+		.n_ext_ts	= 1,</div><div class='add'>+		.n_per_out	= 1,</div><div class='add'>+		.supported_extts_flags = PTP_RISING_EDGE |</div><div class='add'>+					 PTP_FALLING_EDGE |</div><div class='add'>+					 PTP_STRICT_FLAGS,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	/* Only used on SJA1105 */</div><div class='add'>+	skb_queue_head_init(&amp;ptp_data-&gt;skb_rxtstamp_queue);</div><div class='add'>+	/* Only used on SJA1110 */</div><div class='add'>+	skb_queue_head_init(&amp;ptp_data-&gt;skb_txtstamp_queue);</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;clock = ptp_clock_register(&amp;ptp_data-&gt;caps, ds-&gt;dev);</div><div class='add'>+	if (IS_ERR_OR_NULL(ptp_data-&gt;clock))</div><div class='add'>+		return PTR_ERR(ptp_data-&gt;clock);</div><div class='add'>+</div><div class='add'>+	ptp_data-&gt;cmd.corrclk4ts = true;</div><div class='add'>+	ptp_data-&gt;cmd.ptpclkadd = PTP_SET_MODE;</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;ptp_data-&gt;extts_timer, sja1105_ptp_extts_timer, 0);</div><div class='add'>+</div><div class='add'>+	return sja1105_ptp_reset(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_ptp_clock_unregister(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR_OR_NULL(ptp_data-&gt;clock))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	timer_delete_sync(&amp;ptp_data-&gt;extts_timer);</div><div class='add'>+	ptp_cancel_worker_sync(ptp_data-&gt;clock);</div><div class='add'>+	skb_queue_purge(&amp;ptp_data-&gt;skb_txtstamp_queue);</div><div class='add'>+	skb_queue_purge(&amp;ptp_data-&gt;skb_rxtstamp_queue);</div><div class='add'>+	ptp_clock_unregister(ptp_data-&gt;clock);</div><div class='add'>+	ptp_data-&gt;clock = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	struct skb_shared_hwtstamps shwt = {0};</div><div class='add'>+	u64 ticks, ts;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptpegr_ts_poll(ds, port, &amp;ts);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "timed out polling for tstamp\n");</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptpclkval_read(priv, &amp;ticks, NULL);</div><div class='add'>+	if (rc &lt; 0) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Failed to read PTP clock: %d\n", rc);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ts = sja1105_tstamp_reconstruct(ds, ticks, ts);</div><div class='add'>+</div><div class='add'>+	shwt.hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));</div><div class='add'>+	skb_complete_tx_timestamp(skb, &amp;shwt);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.h b/drivers/net/dsa/sja1105/sja1105_ptp.h<br/>new file mode 100644<br/>index 000000000000..325e3777ea07<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_ptp.h</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _SJA1105_PTP_H</div><div class='add'>+#define _SJA1105_PTP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_SJA1105_PTP)</div><div class='add'>+</div><div class='add'>+/* Timestamps are in units of 8 ns clock ticks (equivalent to</div><div class='add'>+ * a fixed 125 MHz clock).</div><div class='add'>+ */</div><div class='add'>+#define SJA1105_TICK_NS			8</div><div class='add'>+</div><div class='add'>+static inline s64 ns_to_sja1105_ticks(s64 ns)</div><div class='add'>+{</div><div class='add'>+	return ns / SJA1105_TICK_NS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline s64 sja1105_ticks_to_ns(s64 ticks)</div><div class='add'>+{</div><div class='add'>+	return ticks * SJA1105_TICK_NS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Calculate the first base_time in the future that satisfies this</div><div class='add'>+ * relationship:</div><div class='add'>+ *</div><div class='add'>+ * future_base_time = base_time + N x cycle_time &gt;= now, or</div><div class='add'>+ *</div><div class='add'>+ *      now - base_time</div><div class='add'>+ * N &gt;= ---------------</div><div class='add'>+ *         cycle_time</div><div class='add'>+ *</div><div class='add'>+ * Because N is an integer, the ceiling value of the above "a / b" ratio</div><div class='add'>+ * is in fact precisely the floor value of "(a + b - 1) / b", which is</div><div class='add'>+ * easier to calculate only having integer division tools.</div><div class='add'>+ */</div><div class='add'>+static inline s64 future_base_time(s64 base_time, s64 cycle_time, s64 now)</div><div class='add'>+{</div><div class='add'>+	s64 a, b, n;</div><div class='add'>+</div><div class='add'>+	if (base_time &gt;= now)</div><div class='add'>+		return base_time;</div><div class='add'>+</div><div class='add'>+	a = now - base_time;</div><div class='add'>+	b = cycle_time;</div><div class='add'>+	n = div_s64(a + b - 1, b);</div><div class='add'>+</div><div class='add'>+	return base_time + n * cycle_time;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is not a preprocessor macro because the "ns" argument may or may not be</div><div class='add'>+ * s64 at caller side. This ensures it is properly type-cast before div_s64.</div><div class='add'>+ */</div><div class='add'>+static inline s64 ns_to_sja1105_delta(s64 ns)</div><div class='add'>+{</div><div class='add'>+	return div_s64(ns, 200);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline s64 sja1105_delta_to_ns(s64 delta)</div><div class='add'>+{</div><div class='add'>+	return delta * 200;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct sja1105_ptp_cmd {</div><div class='add'>+	u64 startptpcp;		/* start toggling PTP_CLK pin */</div><div class='add'>+	u64 stopptpcp;		/* stop toggling PTP_CLK pin */</div><div class='add'>+	u64 ptpstrtsch;		/* start schedule */</div><div class='add'>+	u64 ptpstopsch;		/* stop schedule */</div><div class='add'>+	u64 resptp;		/* reset */</div><div class='add'>+	u64 corrclk4ts;		/* use the corrected clock for timestamps */</div><div class='add'>+	u64 ptpclkadd;		/* enum sja1105_ptp_clk_mode */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_ptp_data {</div><div class='add'>+	struct timer_list extts_timer;</div><div class='add'>+	/* Used only on SJA1105 to reconstruct partial timestamps */</div><div class='add'>+	struct sk_buff_head skb_rxtstamp_queue;</div><div class='add'>+	/* Used on SJA1110 where meta frames are generated only for</div><div class='add'>+	 * 2-step TX timestamps</div><div class='add'>+	 */</div><div class='add'>+	struct sk_buff_head skb_txtstamp_queue;</div><div class='add'>+	struct ptp_clock_info caps;</div><div class='add'>+	struct ptp_clock *clock;</div><div class='add'>+	struct sja1105_ptp_cmd cmd;</div><div class='add'>+	/* Serializes all operations on the PTP hardware clock */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	bool extts_enabled;</div><div class='add'>+	u64 ptpsyncts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sja1105_ptp_clock_register(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+void sja1105_ptp_clock_unregister(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+void sja1105et_ptp_cmd_packing(u8 *buf, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+			       enum packing_op op);</div><div class='add'>+</div><div class='add'>+void sja1105pqrs_ptp_cmd_packing(u8 *buf, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+				 enum packing_op op);</div><div class='add'>+</div><div class='add'>+int sja1105_get_ts_info(struct dsa_switch *ds, int port,</div><div class='add'>+			struct kernel_ethtool_ts_info *ts);</div><div class='add'>+</div><div class='add'>+void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int slot,</div><div class='add'>+			      struct sk_buff *clone);</div><div class='add'>+</div><div class='add'>+bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct sk_buff *skb, unsigned int type);</div><div class='add'>+</div><div class='add'>+void sja1105_port_txtstamp(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+int sja1105_hwtstamp_get(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct kernel_hwtstamp_config *config);</div><div class='add'>+</div><div class='add'>+int sja1105_hwtstamp_set(struct dsa_switch *ds, int port,</div><div class='add'>+			 struct kernel_hwtstamp_config *config,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int __sja1105_ptp_gettimex(struct dsa_switch *ds, u64 *ns,</div><div class='add'>+			   struct ptp_system_timestamp *sts);</div><div class='add'>+</div><div class='add'>+int __sja1105_ptp_settime(struct dsa_switch *ds, u64 ns,</div><div class='add'>+			  struct ptp_system_timestamp *ptp_sts);</div><div class='add'>+</div><div class='add'>+int __sja1105_ptp_adjtime(struct dsa_switch *ds, s64 delta);</div><div class='add'>+</div><div class='add'>+int sja1105_ptp_commit(struct dsa_switch *ds, struct sja1105_ptp_cmd *cmd,</div><div class='add'>+		       sja1105_spi_rw_mode_t rw);</div><div class='add'>+</div><div class='add'>+bool sja1105_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb);</div><div class='add'>+bool sja1110_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb);</div><div class='add'>+void sja1110_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+void sja1110_process_meta_tstamp(struct dsa_switch *ds, int port, u8 ts_id,</div><div class='add'>+				 enum sja1110_meta_tstamp dir, u64 tstamp);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+struct sja1105_ptp_cmd;</div><div class='add'>+</div><div class='add'>+/* Structures cannot be empty in C. Bah!</div><div class='add'>+ * Keep the mutex as the only element, which is a bit more difficult to</div><div class='add'>+ * refactor out of sja1105_main.c anyway.</div><div class='add'>+ */</div><div class='add'>+struct sja1105_ptp_data {</div><div class='add'>+	struct mutex lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int sja1105_ptp_clock_register(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sja1105_ptp_clock_unregister(struct dsa_switch *ds) { }</div><div class='add'>+</div><div class='add'>+static inline void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int slot,</div><div class='add'>+					    struct sk_buff *clone)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __sja1105_ptp_gettimex(struct dsa_switch *ds, u64 *ns,</div><div class='add'>+					 struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __sja1105_ptp_settime(struct dsa_switch *ds, u64 ns,</div><div class='add'>+					struct ptp_system_timestamp *ptp_sts)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int __sja1105_ptp_adjtime(struct dsa_switch *ds, s64 delta)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sja1105_ptp_commit(struct dsa_switch *ds,</div><div class='add'>+				     struct sja1105_ptp_cmd *cmd,</div><div class='add'>+				     sja1105_spi_rw_mode_t rw)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define sja1105et_ptp_cmd_packing NULL</div><div class='add'>+</div><div class='add'>+#define sja1105pqrs_ptp_cmd_packing NULL</div><div class='add'>+</div><div class='add'>+#define sja1105_get_ts_info NULL</div><div class='add'>+</div><div class='add'>+#define sja1105_port_rxtstamp NULL</div><div class='add'>+</div><div class='add'>+#define sja1105_port_txtstamp NULL</div><div class='add'>+</div><div class='add'>+#define sja1105_hwtstamp_get NULL</div><div class='add'>+</div><div class='add'>+#define sja1105_hwtstamp_set NULL</div><div class='add'>+</div><div class='add'>+#define sja1105_rxtstamp NULL</div><div class='add'>+#define sja1110_rxtstamp NULL</div><div class='add'>+#define sja1110_txtstamp NULL</div><div class='add'>+</div><div class='add'>+#define sja1110_process_meta_tstamp NULL</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NET_DSA_SJA1105_PTP) */</div><div class='add'>+</div><div class='add'>+#endif /* _SJA1105_PTP_H */</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c<br/>index 2eb70b8acfc3..834b5c1b4db0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_spi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_spi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_spi.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause</div><div class='del'>-/* Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+/* Copyright 2016-2018 NXP</div><div class='ctx'>  * Copyright (c) 2018, Sensor-Technik Wiedemann GmbH</div><div class='ctx'>  * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='ctx'>  */</div><div class='hunk'>@@ -7,42 +7,11 @@</div><div class='ctx'> #include &lt;linux/packing.h&gt;</div><div class='ctx'> #include "sja1105.h"</div><div class='ctx'> </div><div class='del'>-#define SJA1105_SIZE_PORT_CTRL		4</div><div class='del'>-#define SJA1105_SIZE_RESET_CMD		4</div><div class='del'>-#define SJA1105_SIZE_SPI_MSG_HEADER	4</div><div class='del'>-#define SJA1105_SIZE_SPI_MSG_MAXLEN	(64 * 4)</div><div class='del'>-#define SJA1105_SIZE_SPI_TRANSFER_MAX	\</div><div class='del'>-	(SJA1105_SIZE_SPI_MSG_HEADER + SJA1105_SIZE_SPI_MSG_MAXLEN)</div><div class='del'>-</div><div class='del'>-static int sja1105_spi_transfer(const struct sja1105_private *priv,</div><div class='del'>-				const void *tx, void *rx, int size)</div><div class='del'>-{</div><div class='del'>-	struct spi_device *spi = priv-&gt;spidev;</div><div class='del'>-	struct spi_transfer transfer = {</div><div class='del'>-		.tx_buf = tx,</div><div class='del'>-		.rx_buf = rx,</div><div class='del'>-		.len = size,</div><div class='del'>-	};</div><div class='del'>-	struct spi_message msg;</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (size &gt; SJA1105_SIZE_SPI_TRANSFER_MAX) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "SPI message (%d) longer than max of %d\n",</div><div class='del'>-			size, SJA1105_SIZE_SPI_TRANSFER_MAX);</div><div class='del'>-		return -EMSGSIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spi_message_init(&amp;msg);</div><div class='del'>-	spi_message_add_tail(&amp;transfer, &amp;msg);</div><div class='del'>-</div><div class='del'>-	rc = spi_sync(spi, &amp;msg);</div><div class='del'>-	if (rc &lt; 0) {</div><div class='del'>-		dev_err(&amp;spi-&gt;dev, "SPI transfer failed: %d\n", rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='add'>+struct sja1105_chunk {</div><div class='add'>+	u8	*buf;</div><div class='add'>+	size_t	len;</div><div class='add'>+	u64	reg_addr;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> sja1105_spi_message_pack(void *buf, const struct sja1105_spi_message *msg)</div><div class='hunk'>@@ -58,248 +27,205 @@ sja1105_spi_message_pack(void *buf, const struct sja1105_spi_message *msg)</div><div class='ctx'> </div><div class='ctx'> /* If @rw is:</div><div class='ctx'>  * - SPI_WRITE: creates and sends an SPI write message at absolute</div><div class='del'>- *		address reg_addr, taking size_bytes from *packed_buf</div><div class='add'>+ *		address reg_addr, taking @len bytes from *buf</div><div class='ctx'>  * - SPI_READ:  creates and sends an SPI read message from absolute</div><div class='del'>- *		address reg_addr, writing size_bytes into *packed_buf</div><div class='del'>- *</div><div class='del'>- * This function should only be called if it is priorly known that</div><div class='del'>- * @size_bytes is smaller than SIZE_SPI_MSG_MAXLEN. Larger packed buffers</div><div class='del'>- * are chunked in smaller pieces by sja1105_spi_send_long_packed_buf below.</div><div class='add'>+ *		address reg_addr, writing @len bytes into *buf</div><div class='ctx'>  */</div><div class='del'>-int sja1105_spi_send_packed_buf(const struct sja1105_private *priv,</div><div class='del'>-				sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='del'>-				void *packed_buf, size_t size_bytes)</div><div class='add'>+static int sja1105_xfer(const struct sja1105_private *priv,</div><div class='add'>+			sja1105_spi_rw_mode_t rw, u64 reg_addr, u8 *buf,</div><div class='add'>+			size_t len, struct ptp_system_timestamp *ptp_sts)</div><div class='ctx'> {</div><div class='del'>-	u8 tx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};</div><div class='del'>-	u8 rx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};</div><div class='del'>-	const int msg_len = size_bytes + SJA1105_SIZE_SPI_MSG_HEADER;</div><div class='del'>-	struct sja1105_spi_message msg = {0};</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (msg_len &gt; SJA1105_SIZE_SPI_TRANSFER_MAX)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='del'>-	msg.access = rw;</div><div class='del'>-	msg.address = reg_addr;</div><div class='del'>-	if (rw == SPI_READ)</div><div class='del'>-		msg.read_count = size_bytes / 4;</div><div class='del'>-</div><div class='del'>-	sja1105_spi_message_pack(tx_buf, &amp;msg);</div><div class='del'>-</div><div class='del'>-	if (rw == SPI_WRITE)</div><div class='del'>-		memcpy(tx_buf + SJA1105_SIZE_SPI_MSG_HEADER,</div><div class='del'>-		       packed_buf, size_bytes);</div><div class='del'>-</div><div class='del'>-	rc = sja1105_spi_transfer(priv, tx_buf, rx_buf, msg_len);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	if (rw == SPI_READ)</div><div class='del'>-		memcpy(packed_buf, rx_buf + SJA1105_SIZE_SPI_MSG_HEADER,</div><div class='del'>-		       size_bytes);</div><div class='add'>+	u8 hdr_buf[SJA1105_SIZE_SPI_MSG_HEADER] = {0};</div><div class='add'>+	struct spi_device *spi = priv-&gt;spidev;</div><div class='add'>+	struct spi_transfer xfers[2] = {0};</div><div class='add'>+	struct spi_transfer *chunk_xfer;</div><div class='add'>+	struct spi_transfer *hdr_xfer;</div><div class='add'>+	struct sja1105_chunk chunk;</div><div class='add'>+	int num_chunks;</div><div class='add'>+	int rc, i = 0;</div><div class='add'>+</div><div class='add'>+	num_chunks = DIV_ROUND_UP(len, priv-&gt;max_xfer_len);</div><div class='add'>+</div><div class='add'>+	chunk.reg_addr = reg_addr;</div><div class='add'>+	chunk.buf = buf;</div><div class='add'>+	chunk.len = min_t(size_t, len, priv-&gt;max_xfer_len);</div><div class='add'>+</div><div class='add'>+	hdr_xfer = &amp;xfers[0];</div><div class='add'>+	chunk_xfer = &amp;xfers[1];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_chunks; i++) {</div><div class='add'>+		struct spi_transfer *ptp_sts_xfer;</div><div class='add'>+		struct sja1105_spi_message msg;</div><div class='add'>+</div><div class='add'>+		/* Populate the transfer's header buffer */</div><div class='add'>+		msg.address = chunk.reg_addr;</div><div class='add'>+		msg.access = rw;</div><div class='add'>+		if (rw == SPI_READ)</div><div class='add'>+			msg.read_count = chunk.len / 4;</div><div class='add'>+		else</div><div class='add'>+			/* Ignored */</div><div class='add'>+			msg.read_count = 0;</div><div class='add'>+		sja1105_spi_message_pack(hdr_buf, &amp;msg);</div><div class='add'>+		hdr_xfer-&gt;tx_buf = hdr_buf;</div><div class='add'>+		hdr_xfer-&gt;len = SJA1105_SIZE_SPI_MSG_HEADER;</div><div class='add'>+</div><div class='add'>+		/* Populate the transfer's data buffer */</div><div class='add'>+		if (rw == SPI_READ)</div><div class='add'>+			chunk_xfer-&gt;rx_buf = chunk.buf;</div><div class='add'>+		else</div><div class='add'>+			chunk_xfer-&gt;tx_buf = chunk.buf;</div><div class='add'>+		chunk_xfer-&gt;len = chunk.len;</div><div class='add'>+</div><div class='add'>+		/* Request timestamping for the transfer. Instead of letting</div><div class='add'>+		 * callers specify which byte they want to timestamp, we can</div><div class='add'>+		 * make certain assumptions:</div><div class='add'>+		 * - A read operation will request a software timestamp when</div><div class='add'>+		 *   what's being read is the PTP time. That is snapshotted by</div><div class='add'>+		 *   the switch hardware at the end of the command portion</div><div class='add'>+		 *   (hdr_xfer).</div><div class='add'>+		 * - A write operation will request a software timestamp on</div><div class='add'>+		 *   actions that modify the PTP time. Taking clock stepping as</div><div class='add'>+		 *   an example, the switch writes the PTP time at the end of</div><div class='add'>+		 *   the data portion (chunk_xfer).</div><div class='add'>+		 */</div><div class='add'>+		if (rw == SPI_READ)</div><div class='add'>+			ptp_sts_xfer = hdr_xfer;</div><div class='add'>+		else</div><div class='add'>+			ptp_sts_xfer = chunk_xfer;</div><div class='add'>+		ptp_sts_xfer-&gt;ptp_sts_word_pre = ptp_sts_xfer-&gt;len - 1;</div><div class='add'>+		ptp_sts_xfer-&gt;ptp_sts_word_post = ptp_sts_xfer-&gt;len - 1;</div><div class='add'>+		ptp_sts_xfer-&gt;ptp_sts = ptp_sts;</div><div class='add'>+</div><div class='add'>+		/* Calculate next chunk */</div><div class='add'>+		chunk.buf += chunk.len;</div><div class='add'>+		chunk.reg_addr += chunk.len / 4;</div><div class='add'>+		chunk.len = min_t(size_t, (ptrdiff_t)(buf + len - chunk.buf),</div><div class='add'>+				  priv-&gt;max_xfer_len);</div><div class='add'>+</div><div class='add'>+		rc = spi_sync_transfer(spi, xfers, 2);</div><div class='add'>+		if (rc &lt; 0) {</div><div class='add'>+			dev_err(&amp;spi-&gt;dev, "SPI transfer failed: %d\n", rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int sja1105_xfer_buf(const struct sja1105_private *priv,</div><div class='add'>+		     sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='add'>+		     u8 *buf, size_t len)</div><div class='add'>+{</div><div class='add'>+	return sja1105_xfer(priv, rw, reg_addr, buf, len, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* If @rw is:</div><div class='ctx'>  * - SPI_WRITE: creates and sends an SPI write message at absolute</div><div class='del'>- *		address reg_addr, taking size_bytes from *packed_buf</div><div class='add'>+ *		address reg_addr</div><div class='ctx'>  * - SPI_READ:  creates and sends an SPI read message from absolute</div><div class='del'>- *		address reg_addr, writing size_bytes into *packed_buf</div><div class='add'>+ *		address reg_addr</div><div class='ctx'>  *</div><div class='ctx'>  * The u64 *value is unpacked, meaning that it's stored in the native</div><div class='ctx'>  * CPU endianness and directly usable by software running on the core.</div><div class='del'>- *</div><div class='del'>- * This is a wrapper around sja1105_spi_send_packed_buf().</div><div class='ctx'>  */</div><div class='del'>-int sja1105_spi_send_int(const struct sja1105_private *priv,</div><div class='del'>-			 sja1105_spi_rw_mode_t rw, u64 reg_addr,</div><div class='del'>-			 u64 *value, u64 size_bytes)</div><div class='add'>+int sja1105_xfer_u64(const struct sja1105_private *priv,</div><div class='add'>+		     sja1105_spi_rw_mode_t rw, u64 reg_addr, u64 *value,</div><div class='add'>+		     struct ptp_system_timestamp *ptp_sts)</div><div class='ctx'> {</div><div class='del'>-	u8 packed_buf[SJA1105_SIZE_SPI_MSG_MAXLEN];</div><div class='add'>+	u8 packed_buf[8];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (size_bytes &gt; SJA1105_SIZE_SPI_MSG_MAXLEN)</div><div class='del'>-		return -ERANGE;</div><div class='del'>-</div><div class='ctx'> 	if (rw == SPI_WRITE)</div><div class='del'>-		sja1105_pack(packed_buf, value, 8 * size_bytes - 1, 0,</div><div class='del'>-			     size_bytes);</div><div class='add'>+		sja1105_pack(packed_buf, value, 63, 0, 8);</div><div class='ctx'> </div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, rw, reg_addr, packed_buf,</div><div class='del'>-					 size_bytes);</div><div class='add'>+	rc = sja1105_xfer(priv, rw, reg_addr, packed_buf, 8, ptp_sts);</div><div class='ctx'> </div><div class='ctx'> 	if (rw == SPI_READ)</div><div class='del'>-		sja1105_unpack(packed_buf, value, 8 * size_bytes - 1, 0,</div><div class='del'>-			       size_bytes);</div><div class='add'>+		sja1105_unpack(packed_buf, value, 63, 0, 8);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Should be used if a @packed_buf larger than SJA1105_SIZE_SPI_MSG_MAXLEN</div><div class='del'>- * must be sent/received. Splitting the buffer into chunks and assembling</div><div class='del'>- * those into SPI messages is done automatically by this function.</div><div class='del'>- */</div><div class='del'>-int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,</div><div class='del'>-				     sja1105_spi_rw_mode_t rw, u64 base_addr,</div><div class='del'>-				     void *packed_buf, u64 buf_len)</div><div class='add'>+/* Same as above, but transfers only a 4 byte word */</div><div class='add'>+int sja1105_xfer_u32(const struct sja1105_private *priv,</div><div class='add'>+		     sja1105_spi_rw_mode_t rw, u64 reg_addr, u32 *value,</div><div class='add'>+		     struct ptp_system_timestamp *ptp_sts)</div><div class='ctx'> {</div><div class='del'>-	struct chunk {</div><div class='del'>-		void *buf_ptr;</div><div class='del'>-		int len;</div><div class='del'>-		u64 spi_address;</div><div class='del'>-	} chunk;</div><div class='del'>-	int distance_to_end;</div><div class='add'>+	u8 packed_buf[4];</div><div class='add'>+	u64 tmp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	/* Initialize chunk */</div><div class='del'>-	chunk.buf_ptr = packed_buf;</div><div class='del'>-	chunk.spi_address = base_addr;</div><div class='del'>-	chunk.len = min_t(int, buf_len, SJA1105_SIZE_SPI_MSG_MAXLEN);</div><div class='del'>-</div><div class='del'>-	while (chunk.len) {</div><div class='del'>-		rc = sja1105_spi_send_packed_buf(priv, rw, chunk.spi_address,</div><div class='del'>-						 chunk.buf_ptr, chunk.len);</div><div class='del'>-		if (rc &lt; 0)</div><div class='del'>-			return rc;</div><div class='del'>-</div><div class='del'>-		chunk.buf_ptr += chunk.len;</div><div class='del'>-		chunk.spi_address += chunk.len / 4;</div><div class='del'>-		distance_to_end = (uintptr_t)(packed_buf + buf_len -</div><div class='del'>-					      chunk.buf_ptr);</div><div class='del'>-		chunk.len = min(distance_to_end, SJA1105_SIZE_SPI_MSG_MAXLEN);</div><div class='add'>+	if (rw == SPI_WRITE) {</div><div class='add'>+		/* The packing API only supports u64 as CPU word size,</div><div class='add'>+		 * so we need to convert.</div><div class='add'>+		 */</div><div class='add'>+		tmp = *value;</div><div class='add'>+		sja1105_pack(packed_buf, &amp;tmp, 31, 0, 4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Back-ported structure from UM11040 Table 112.</div><div class='del'>- * Reset control register (addr. 100440h)</div><div class='del'>- * In the SJA1105 E/T, only warm_rst and cold_rst are</div><div class='del'>- * supported (exposed in UM10944 as rst_ctrl), but the bit</div><div class='del'>- * offsets of warm_rst and cold_rst are actually reversed.</div><div class='del'>- */</div><div class='del'>-struct sja1105_reset_cmd {</div><div class='del'>-	u64 switch_rst;</div><div class='del'>-	u64 cfg_rst;</div><div class='del'>-	u64 car_rst;</div><div class='del'>-	u64 otp_rst;</div><div class='del'>-	u64 warm_rst;</div><div class='del'>-	u64 cold_rst;</div><div class='del'>-	u64 por_rst;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sja1105et_reset_cmd_pack(void *buf, const struct sja1105_reset_cmd *reset)</div><div class='del'>-{</div><div class='del'>-	const int size = SJA1105_SIZE_RESET_CMD;</div><div class='add'>+	rc = sja1105_xfer(priv, rw, reg_addr, packed_buf, 4, ptp_sts);</div><div class='ctx'> </div><div class='del'>-	memset(buf, 0, size);</div><div class='add'>+	if (rw == SPI_READ) {</div><div class='add'>+		sja1105_unpack(packed_buf, &amp;tmp, 31, 0, 4);</div><div class='add'>+		*value = tmp;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;cold_rst, 3, 3, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;warm_rst, 2, 2, size);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-sja1105pqrs_reset_cmd_pack(void *buf, const struct sja1105_reset_cmd *reset)</div><div class='add'>+static int sja1105et_reset_cmd(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='del'>-	const int size = SJA1105_SIZE_RESET_CMD;</div><div class='del'>-</div><div class='del'>-	memset(buf, 0, size);</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u32 cold_reset = BIT(3);</div><div class='ctx'> </div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;switch_rst, 8, 8, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;cfg_rst,    7, 7, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;car_rst,    5, 5, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;otp_rst,    4, 4, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;warm_rst,   3, 3, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;cold_rst,   2, 2, size);</div><div class='del'>-	sja1105_pack(buf, &amp;reset-&gt;por_rst,    1, 1, size);</div><div class='add'>+	/* Cold reset */</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;rgu, &amp;cold_reset, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105et_reset_cmd(const void *ctx, const void *data)</div><div class='add'>+static int sja1105pqrs_reset_cmd(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='del'>-	const struct sja1105_private *priv = ctx;</div><div class='del'>-	const struct sja1105_reset_cmd *reset = data;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='del'>-	u8 packed_buf[SJA1105_SIZE_RESET_CMD];</div><div class='del'>-</div><div class='del'>-	if (reset-&gt;switch_rst ||</div><div class='del'>-	    reset-&gt;cfg_rst ||</div><div class='del'>-	    reset-&gt;car_rst ||</div><div class='del'>-	    reset-&gt;otp_rst ||</div><div class='del'>-	    reset-&gt;por_rst) {</div><div class='del'>-		dev_err(dev, "Only warm and cold reset is supported "</div><div class='del'>-			"for SJA1105 E/T!\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	u32 cold_reset = BIT(2);</div><div class='ctx'> </div><div class='del'>-	if (reset-&gt;warm_rst)</div><div class='del'>-		dev_dbg(dev, "Warm reset requested\n");</div><div class='del'>-	if (reset-&gt;cold_rst)</div><div class='del'>-		dev_dbg(dev, "Cold reset requested\n");</div><div class='del'>-</div><div class='del'>-	sja1105et_reset_cmd_pack(packed_buf, reset);</div><div class='del'>-</div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rgu,</div><div class='del'>-					   packed_buf, SJA1105_SIZE_RESET_CMD);</div><div class='add'>+	/* Cold reset */</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;rgu, &amp;cold_reset, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105pqrs_reset_cmd(const void *ctx, const void *data)</div><div class='add'>+static int sja1110_reset_cmd(struct dsa_switch *ds)</div><div class='ctx'> {</div><div class='del'>-	const struct sja1105_private *priv = ctx;</div><div class='del'>-	const struct sja1105_reset_cmd *reset = data;</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	struct device *dev = priv-&gt;ds-&gt;dev;</div><div class='del'>-	u8 packed_buf[SJA1105_SIZE_RESET_CMD];</div><div class='del'>-</div><div class='del'>-	if (reset-&gt;switch_rst)</div><div class='del'>-		dev_dbg(dev, "Main reset for all functional modules requested\n");</div><div class='del'>-	if (reset-&gt;cfg_rst)</div><div class='del'>-		dev_dbg(dev, "Chip configuration reset requested\n");</div><div class='del'>-	if (reset-&gt;car_rst)</div><div class='del'>-		dev_dbg(dev, "Clock and reset control logic reset requested\n");</div><div class='del'>-	if (reset-&gt;otp_rst)</div><div class='del'>-		dev_dbg(dev, "OTP read cycle for reading product "</div><div class='del'>-			"config settings requested\n");</div><div class='del'>-	if (reset-&gt;warm_rst)</div><div class='del'>-		dev_dbg(dev, "Warm reset requested\n");</div><div class='del'>-	if (reset-&gt;cold_rst)</div><div class='del'>-		dev_dbg(dev, "Cold reset requested\n");</div><div class='del'>-	if (reset-&gt;por_rst)</div><div class='del'>-		dev_dbg(dev, "Power-on reset requested\n");</div><div class='del'>-</div><div class='del'>-	sja1105pqrs_reset_cmd_pack(packed_buf, reset);</div><div class='del'>-</div><div class='del'>-	return sja1105_spi_send_packed_buf(priv, SPI_WRITE, regs-&gt;rgu,</div><div class='del'>-					   packed_buf, SJA1105_SIZE_RESET_CMD);</div><div class='del'>-}</div><div class='add'>+	u32 switch_reset = BIT(20);</div><div class='ctx'> </div><div class='del'>-static int sja1105_cold_reset(const struct sja1105_private *priv)</div><div class='del'>-{</div><div class='del'>-	struct sja1105_reset_cmd reset = {0};</div><div class='del'>-</div><div class='del'>-	reset.cold_rst = 1;</div><div class='del'>-	return priv-&gt;info-&gt;reset_cmd(priv, &amp;reset);</div><div class='add'>+	/* Only reset the switch core.</div><div class='add'>+	 * A full cold reset would re-enable the BASE_MCSS_CLOCK PLL which</div><div class='add'>+	 * would turn on the microcontroller, potentially letting it execute</div><div class='add'>+	 * code which could interfere with our configuration.</div><div class='add'>+	 */</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;rgu, &amp;switch_reset, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sja1105_inhibit_tx(const struct sja1105_private *priv,</div><div class='del'>-			      const unsigned long *port_bitmap)</div><div class='add'>+int sja1105_inhibit_tx(const struct sja1105_private *priv,</div><div class='add'>+		       unsigned long port_bitmap, bool tx_inhibited)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='del'>-	u64 inhibit_cmd;</div><div class='del'>-	int port, rc;</div><div class='add'>+	u32 inhibit_cmd;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sja1105_spi_send_int(priv, SPI_READ, regs-&gt;port_control,</div><div class='del'>-				  &amp;inhibit_cmd, SJA1105_SIZE_PORT_CTRL);</div><div class='add'>+	rc = sja1105_xfer_u32(priv, SPI_READ, regs-&gt;port_control,</div><div class='add'>+			      &amp;inhibit_cmd, NULL);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	for_each_set_bit(port, port_bitmap, SJA1105_NUM_PORTS)</div><div class='del'>-		inhibit_cmd |= BIT(port);</div><div class='add'>+	if (tx_inhibited)</div><div class='add'>+		inhibit_cmd |= port_bitmap;</div><div class='add'>+	else</div><div class='add'>+		inhibit_cmd &amp;= ~port_bitmap;</div><div class='ctx'> </div><div class='del'>-	return sja1105_spi_send_int(priv, SPI_WRITE, regs-&gt;port_control,</div><div class='del'>-				    &amp;inhibit_cmd, SJA1105_SIZE_PORT_CTRL);</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;port_control,</div><div class='add'>+				&amp;inhibit_cmd, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sja1105_status {</div><div class='hunk'>@@ -337,9 +263,7 @@ static int sja1105_status_get(struct sja1105_private *priv,</div><div class='ctx'> 	u8 packed_buf[4];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = sja1105_spi_send_packed_buf(priv, SPI_READ,</div><div class='del'>-					 regs-&gt;status,</div><div class='del'>-					 packed_buf, 4);</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_READ, regs-&gt;status, packed_buf, 4);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -352,9 +276,8 @@ static int sja1105_status_get(struct sja1105_private *priv,</div><div class='ctx'>  * for upload requires the recalculation of table CRCs and updating the</div><div class='ctx'>  * structures with these.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='del'>-static_config_buf_prepare_for_upload(struct sja1105_private *priv,</div><div class='del'>-				     void *config_buf, int buf_len)</div><div class='add'>+int static_config_buf_prepare_for_upload(struct sja1105_private *priv,</div><div class='add'>+					 void *config_buf, int buf_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sja1105_static_config *config = &amp;priv-&gt;static_config;</div><div class='ctx'> 	struct sja1105_table_header final_header;</div><div class='hunk'>@@ -362,7 +285,8 @@ static_config_buf_prepare_for_upload(struct sja1105_private *priv,</div><div class='ctx'> 	char *final_header_ptr;</div><div class='ctx'> 	int crc_len;</div><div class='ctx'> </div><div class='del'>-	valid = sja1105_static_config_check_valid(config);</div><div class='add'>+	valid = sja1105_static_config_check_valid(config,</div><div class='add'>+						  priv-&gt;info-&gt;max_frame_mem);</div><div class='ctx'> 	if (valid != SJA1105_CONFIG_OK) {</div><div class='ctx'> 		dev_err(&amp;priv-&gt;spidev-&gt;dev,</div><div class='ctx'> 			sja1105_static_config_error_msg[valid]);</div><div class='hunk'>@@ -390,10 +314,10 @@ static_config_buf_prepare_for_upload(struct sja1105_private *priv,</div><div class='ctx'> </div><div class='ctx'> int sja1105_static_config_upload(struct sja1105_private *priv)</div><div class='ctx'> {</div><div class='del'>-	unsigned long port_bitmap = GENMASK_ULL(SJA1105_NUM_PORTS - 1, 0);</div><div class='ctx'> 	struct sja1105_static_config *config = &amp;priv-&gt;static_config;</div><div class='ctx'> 	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='ctx'> 	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='ctx'> 	struct sja1105_status status;</div><div class='ctx'> 	int rc, retries = RETRIES;</div><div class='ctx'> 	u8 *config_buf;</div><div class='hunk'>@@ -407,16 +331,18 @@ int sja1105_static_config_upload(struct sja1105_private *priv)</div><div class='ctx'> 	rc = static_config_buf_prepare_for_upload(priv, config_buf, buf_len);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "Invalid config, cannot upload\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Prevent PHY jabbering during switch reset by inhibiting</div><div class='ctx'> 	 * Tx on all ports and waiting for current packet to drain.</div><div class='ctx'> 	 * Otherwise, the PHY will see an unterminated Ethernet packet.</div><div class='ctx'> 	 */</div><div class='del'>-	rc = sja1105_inhibit_tx(priv, &amp;port_bitmap);</div><div class='add'>+	rc = sja1105_inhibit_tx(priv, GENMASK_ULL(ds-&gt;num_ports - 1, 0), true);</div><div class='ctx'> 	if (rc &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "Failed to inhibit Tx on ports\n");</div><div class='del'>-		return -ENXIO;</div><div class='add'>+		rc = -ENXIO;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Wait for an eventual egress packet to finish transmission</div><div class='ctx'> 	 * (reach IFG). It is guaranteed that a second one will not</div><div class='hunk'>@@ -425,7 +351,7 @@ int sja1105_static_config_upload(struct sja1105_private *priv)</div><div class='ctx'> 	usleep_range(500, 1000);</div><div class='ctx'> 	do {</div><div class='ctx'> 		/* Put the SJA1105 in programming mode */</div><div class='del'>-		rc = sja1105_cold_reset(priv);</div><div class='add'>+		rc = priv-&gt;info-&gt;reset_cmd(priv-&gt;ds);</div><div class='ctx'> 		if (rc &lt; 0) {</div><div class='ctx'> 			dev_err(dev, "Failed to reset switch, retrying...\n");</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -433,9 +359,8 @@ int sja1105_static_config_upload(struct sja1105_private *priv)</div><div class='ctx'> 		/* Wait for the switch to come out of reset */</div><div class='ctx'> 		usleep_range(1000, 5000);</div><div class='ctx'> 		/* Upload the static config to the device */</div><div class='del'>-		rc = sja1105_spi_send_long_packed_buf(priv, SPI_WRITE,</div><div class='del'>-						      regs-&gt;config,</div><div class='del'>-						      config_buf, buf_len);</div><div class='add'>+		rc = sja1105_xfer_buf(priv, SPI_WRITE, regs-&gt;config,</div><div class='add'>+				      config_buf, buf_len);</div><div class='ctx'> 		if (rc &lt; 0) {</div><div class='ctx'> 			dev_err(dev, "Failed to upload config, retrying...\n");</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -478,27 +403,27 @@ int sja1105_static_config_upload(struct sja1105_private *priv)</div><div class='ctx'> 		dev_info(dev, "Succeeded after %d tried\n", RETRIES - retries);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(dev, "Reset switch and programmed static config\n");</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(config_buf);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sja1105_regs sja1105et_regs = {</div><div class='add'>+static const struct sja1105_regs sja1105et_regs = {</div><div class='ctx'> 	.device_id = 0x0,</div><div class='ctx'> 	.prod_id = 0x100BC3,</div><div class='ctx'> 	.status = 0x1,</div><div class='ctx'> 	.port_control = 0x11,</div><div class='add'>+	.vl_status = 0x10000,</div><div class='ctx'> 	.config = 0x020000,</div><div class='ctx'> 	.rgu = 0x100440,</div><div class='add'>+	/* UM10944.pdf, Table 86, ACU Register overview */</div><div class='ctx'> 	.pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='add'>+	.pad_mii_rx = {0x100801, 0x100803, 0x100805, 0x100807, 0x100809},</div><div class='ctx'> 	.rmii_pll1 = 0x10000A,</div><div class='ctx'> 	.cgu_idiv = {0x10000B, 0x10000C, 0x10000D, 0x10000E, 0x10000F},</div><div class='del'>-	/* UM10944.pdf, Table 86, ACU Register overview */</div><div class='del'>-	.rgmii_pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='del'>-	.mac = {0x200, 0x202, 0x204, 0x206, 0x208},</div><div class='del'>-	.mac_hl1 = {0x400, 0x410, 0x420, 0x430, 0x440},</div><div class='del'>-	.mac_hl2 = {0x600, 0x610, 0x620, 0x630, 0x640},</div><div class='add'>+	.stats[MAC] = {0x200, 0x202, 0x204, 0x206, 0x208},</div><div class='add'>+	.stats[HL1] = {0x400, 0x410, 0x420, 0x430, 0x440},</div><div class='add'>+	.stats[HL2] = {0x600, 0x610, 0x620, 0x630, 0x640},</div><div class='ctx'> 	/* UM10944.pdf, Table 78, CGU Register overview */</div><div class='ctx'> 	.mii_tx_clk = {0x100013, 0x10001A, 0x100021, 0x100028, 0x10002F},</div><div class='ctx'> 	.mii_rx_clk = {0x100014, 0x10001B, 0x100022, 0x100029, 0x100030},</div><div class='hunk'>@@ -507,23 +432,36 @@ static struct sja1105_regs sja1105et_regs = {</div><div class='ctx'> 	.rgmii_tx_clk = {0x100016, 0x10001D, 0x100024, 0x10002B, 0x100032},</div><div class='ctx'> 	.rmii_ref_clk = {0x100015, 0x10001C, 0x100023, 0x10002A, 0x100031},</div><div class='ctx'> 	.rmii_ext_tx_clk = {0x100018, 0x10001F, 0x100026, 0x10002D, 0x100034},</div><div class='add'>+	.ptpegr_ts = {0xC0, 0xC2, 0xC4, 0xC6, 0xC8},</div><div class='add'>+	.ptpschtm = 0x12, /* Spans 0x12 to 0x13 */</div><div class='add'>+	.ptppinst = 0x14,</div><div class='add'>+	.ptppindur = 0x16,</div><div class='add'>+	.ptp_control = 0x17,</div><div class='add'>+	.ptpclkval = 0x18, /* Spans 0x18 to 0x19 */</div><div class='add'>+	.ptpclkrate = 0x1A,</div><div class='add'>+	.ptpclkcorp = 0x1D,</div><div class='add'>+	.mdio_100base_tx = SJA1105_RSV_ADDR,</div><div class='add'>+	.mdio_100base_t1 = SJA1105_RSV_ADDR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct sja1105_regs sja1105pqrs_regs = {</div><div class='add'>+static const struct sja1105_regs sja1105pqrs_regs = {</div><div class='ctx'> 	.device_id = 0x0,</div><div class='ctx'> 	.prod_id = 0x100BC3,</div><div class='ctx'> 	.status = 0x1,</div><div class='ctx'> 	.port_control = 0x12,</div><div class='add'>+	.vl_status = 0x10000,</div><div class='ctx'> 	.config = 0x020000,</div><div class='ctx'> 	.rgu = 0x100440,</div><div class='add'>+	/* UM10944.pdf, Table 86, ACU Register overview */</div><div class='ctx'> 	.pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='add'>+	.pad_mii_rx = {0x100801, 0x100803, 0x100805, 0x100807, 0x100809},</div><div class='add'>+	.pad_mii_id = {0x100810, 0x100811, 0x100812, 0x100813, 0x100814},</div><div class='ctx'> 	.rmii_pll1 = 0x10000A,</div><div class='ctx'> 	.cgu_idiv = {0x10000B, 0x10000C, 0x10000D, 0x10000E, 0x10000F},</div><div class='del'>-	/* UM10944.pdf, Table 86, ACU Register overview */</div><div class='del'>-	.rgmii_pad_mii_tx = {0x100800, 0x100802, 0x100804, 0x100806, 0x100808},</div><div class='del'>-	.mac = {0x200, 0x202, 0x204, 0x206, 0x208},</div><div class='del'>-	.mac_hl1 = {0x400, 0x410, 0x420, 0x430, 0x440},</div><div class='del'>-	.mac_hl2 = {0x600, 0x610, 0x620, 0x630, 0x640},</div><div class='add'>+	.stats[MAC] = {0x200, 0x202, 0x204, 0x206, 0x208},</div><div class='add'>+	.stats[HL1] = {0x400, 0x410, 0x420, 0x430, 0x440},</div><div class='add'>+	.stats[HL2] = {0x600, 0x610, 0x620, 0x630, 0x640},</div><div class='add'>+	.stats[ETHER] = {0x1400, 0x1418, 0x1430, 0x1448, 0x1460},</div><div class='ctx'> 	/* UM11040.pdf, Table 114 */</div><div class='ctx'> 	.mii_tx_clk = {0x100013, 0x100019, 0x10001F, 0x100025, 0x10002B},</div><div class='ctx'> 	.mii_rx_clk = {0x100014, 0x10001A, 0x100020, 0x100026, 0x10002C},</div><div class='hunk'>@@ -532,60 +470,508 @@ static struct sja1105_regs sja1105pqrs_regs = {</div><div class='ctx'> 	.rgmii_tx_clk = {0x100016, 0x10001C, 0x100022, 0x100028, 0x10002E},</div><div class='ctx'> 	.rmii_ref_clk = {0x100015, 0x10001B, 0x100021, 0x100027, 0x10002D},</div><div class='ctx'> 	.rmii_ext_tx_clk = {0x100017, 0x10001D, 0x100023, 0x100029, 0x10002F},</div><div class='del'>-	.qlevel = {0x604, 0x614, 0x624, 0x634, 0x644},</div><div class='add'>+	.ptpegr_ts = {0xC0, 0xC4, 0xC8, 0xCC, 0xD0},</div><div class='add'>+	.ptpschtm = 0x13, /* Spans 0x13 to 0x14 */</div><div class='add'>+	.ptppinst = 0x15,</div><div class='add'>+	.ptppindur = 0x17,</div><div class='add'>+	.ptp_control = 0x18,</div><div class='add'>+	.ptpclkval = 0x19,</div><div class='add'>+	.ptpclkrate = 0x1B,</div><div class='add'>+	.ptpclkcorp = 0x1E,</div><div class='add'>+	.ptpsyncts = 0x1F,</div><div class='add'>+	.mdio_100base_tx = SJA1105_RSV_ADDR,</div><div class='add'>+	.mdio_100base_t1 = SJA1105_RSV_ADDR,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sja1105_info sja1105e_info = {</div><div class='add'>+static const struct sja1105_regs sja1110_regs = {</div><div class='add'>+	.device_id = SJA1110_SPI_ADDR(0x0),</div><div class='add'>+	.prod_id = SJA1110_ACU_ADDR(0xf00),</div><div class='add'>+	.status = SJA1110_SPI_ADDR(0x4),</div><div class='add'>+	.port_control = SJA1110_SPI_ADDR(0x50), /* actually INHIB_TX */</div><div class='add'>+	.vl_status = 0x10000,</div><div class='add'>+	.config = 0x020000,</div><div class='add'>+	.rgu = SJA1110_RGU_ADDR(0x100), /* Reset Control Register 0 */</div><div class='add'>+	/* Ports 2 and 3 are capable of xMII, but there isn't anything to</div><div class='add'>+	 * configure in the CGU/ACU for them.</div><div class='add'>+	 */</div><div class='add'>+	.pad_mii_tx = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR},</div><div class='add'>+	.pad_mii_rx = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR},</div><div class='add'>+	.pad_mii_id = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1110_ACU_ADDR(0x18), SJA1110_ACU_ADDR(0x28),</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR},</div><div class='add'>+	.rmii_pll1 = SJA1105_RSV_ADDR,</div><div class='add'>+	.cgu_idiv = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		     SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		     SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		     SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.stats[MAC] = {0x200, 0x202, 0x204, 0x206, 0x208, 0x20a,</div><div class='add'>+		       0x20c, 0x20e, 0x210, 0x212, 0x214},</div><div class='add'>+	.stats[HL1] = {0x400, 0x410, 0x420, 0x430, 0x440, 0x450,</div><div class='add'>+		       0x460, 0x470, 0x480, 0x490, 0x4a0},</div><div class='add'>+	.stats[HL2] = {0x600, 0x610, 0x620, 0x630, 0x640, 0x650,</div><div class='add'>+		       0x660, 0x670, 0x680, 0x690, 0x6a0},</div><div class='add'>+	.stats[ETHER] = {0x1400, 0x1418, 0x1430, 0x1448, 0x1460, 0x1478,</div><div class='add'>+			 0x1490, 0x14a8, 0x14c0, 0x14d8, 0x14f0},</div><div class='add'>+	.mii_tx_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.mii_rx_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		       SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.mii_ext_tx_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			   SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			   SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			   SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.mii_ext_rx_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			   SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			   SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			   SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.rgmii_tx_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			 SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			 SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			 SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.rmii_ref_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			 SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			 SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			 SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+	.rmii_ext_tx_clk = {SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			    SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			    SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			    SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			    SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+			    SJA1105_RSV_ADDR},</div><div class='add'>+	.ptpschtm = SJA1110_SPI_ADDR(0x54),</div><div class='add'>+	.ptppinst = SJA1110_SPI_ADDR(0x5c),</div><div class='add'>+	.ptppindur = SJA1110_SPI_ADDR(0x64),</div><div class='add'>+	.ptp_control = SJA1110_SPI_ADDR(0x68),</div><div class='add'>+	.ptpclkval = SJA1110_SPI_ADDR(0x6c),</div><div class='add'>+	.ptpclkrate = SJA1110_SPI_ADDR(0x74),</div><div class='add'>+	.ptpclkcorp = SJA1110_SPI_ADDR(0x80),</div><div class='add'>+	.ptpsyncts = SJA1110_SPI_ADDR(0x84),</div><div class='add'>+	.mdio_100base_tx = 0x1c2400,</div><div class='add'>+	.mdio_100base_t1 = 0x1c1000,</div><div class='add'>+	.pcs_base = {SJA1105_RSV_ADDR, 0x1c1400, 0x1c1800, 0x1c1c00, 0x1c2000,</div><div class='add'>+		     SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR,</div><div class='add'>+		     SJA1105_RSV_ADDR, SJA1105_RSV_ADDR, SJA1105_RSV_ADDR},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1105e_info = {</div><div class='ctx'> 	.device_id		= SJA1105E_DEVICE_ID,</div><div class='ctx'> 	.part_no		= SJA1105ET_PART_NO,</div><div class='ctx'> 	.static_ops		= sja1105e_table_ops,</div><div class='ctx'> 	.dyn_ops		= sja1105et_dyn_ops,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.can_limit_mcast_flood	= false,</div><div class='add'>+	.ptp_ts_bits		= 24,</div><div class='add'>+	.ptpegr_ts_bytes	= 4,</div><div class='add'>+	.max_frame_mem		= SJA1105_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1105_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1105ET_MAX_CBS_COUNT,</div><div class='ctx'> 	.reset_cmd		= sja1105et_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105et_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105et_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105et_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1105_rxtstamp,</div><div class='add'>+	.clocking_setup		= sja1105_clocking_setup,</div><div class='ctx'> 	.regs			= &amp;sja1105et_regs,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 1,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 0, /* Not supported */</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rgmii		= {true, true, true, true, true},</div><div class='ctx'> 	.name			= "SJA1105E",</div><div class='ctx'> };</div><div class='del'>-struct sja1105_info sja1105t_info = {</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1105t_info = {</div><div class='ctx'> 	.device_id		= SJA1105T_DEVICE_ID,</div><div class='ctx'> 	.part_no		= SJA1105ET_PART_NO,</div><div class='ctx'> 	.static_ops		= sja1105t_table_ops,</div><div class='ctx'> 	.dyn_ops		= sja1105et_dyn_ops,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.can_limit_mcast_flood	= false,</div><div class='add'>+	.ptp_ts_bits		= 24,</div><div class='add'>+	.ptpegr_ts_bytes	= 4,</div><div class='add'>+	.max_frame_mem		= SJA1105_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1105_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1105ET_MAX_CBS_COUNT,</div><div class='ctx'> 	.reset_cmd		= sja1105et_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105et_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105et_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105et_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1105_rxtstamp,</div><div class='add'>+	.clocking_setup		= sja1105_clocking_setup,</div><div class='ctx'> 	.regs			= &amp;sja1105et_regs,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 1,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 0, /* Not supported */</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rgmii		= {true, true, true, true, true},</div><div class='ctx'> 	.name			= "SJA1105T",</div><div class='ctx'> };</div><div class='del'>-struct sja1105_info sja1105p_info = {</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1105p_info = {</div><div class='ctx'> 	.device_id		= SJA1105PR_DEVICE_ID,</div><div class='ctx'> 	.part_no		= SJA1105P_PART_NO,</div><div class='ctx'> 	.static_ops		= sja1105p_table_ops,</div><div class='ctx'> 	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1105_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1105_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1105PQRS_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1105pqrs_setup_rgmii_delay,</div><div class='ctx'> 	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1105_rxtstamp,</div><div class='add'>+	.clocking_setup		= sja1105_clocking_setup,</div><div class='ctx'> 	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 1,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 0, /* Not supported */</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rgmii		= {true, true, true, true, true},</div><div class='ctx'> 	.name			= "SJA1105P",</div><div class='ctx'> };</div><div class='del'>-struct sja1105_info sja1105q_info = {</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1105q_info = {</div><div class='ctx'> 	.device_id		= SJA1105QS_DEVICE_ID,</div><div class='ctx'> 	.part_no		= SJA1105Q_PART_NO,</div><div class='ctx'> 	.static_ops		= sja1105q_table_ops,</div><div class='ctx'> 	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1105_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1105_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1105PQRS_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1105pqrs_setup_rgmii_delay,</div><div class='ctx'> 	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1105_rxtstamp,</div><div class='add'>+	.clocking_setup		= sja1105_clocking_setup,</div><div class='ctx'> 	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 1,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 0, /* Not supported */</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rgmii		= {true, true, true, true, true},</div><div class='ctx'> 	.name			= "SJA1105Q",</div><div class='ctx'> };</div><div class='del'>-struct sja1105_info sja1105r_info = {</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1105r_info = {</div><div class='ctx'> 	.device_id		= SJA1105PR_DEVICE_ID,</div><div class='ctx'> 	.part_no		= SJA1105R_PART_NO,</div><div class='ctx'> 	.static_ops		= sja1105r_table_ops,</div><div class='ctx'> 	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1105_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1105_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1105PQRS_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1105pqrs_setup_rgmii_delay,</div><div class='ctx'> 	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1105_rxtstamp,</div><div class='add'>+	.clocking_setup		= sja1105_clocking_setup,</div><div class='add'>+	.pcs_mdio_read_c45	= sja1105_pcs_mdio_read_c45,</div><div class='add'>+	.pcs_mdio_write_c45	= sja1105_pcs_mdio_write_c45,</div><div class='ctx'> 	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 1,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 0, /* Not supported */</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rgmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_sgmii		= {false, false, false, false, true},</div><div class='ctx'> 	.name			= "SJA1105R",</div><div class='ctx'> };</div><div class='del'>-struct sja1105_info sja1105s_info = {</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1105s_info = {</div><div class='ctx'> 	.device_id		= SJA1105QS_DEVICE_ID,</div><div class='ctx'> 	.part_no		= SJA1105S_PART_NO,</div><div class='ctx'> 	.static_ops		= sja1105s_table_ops,</div><div class='ctx'> 	.dyn_ops		= sja1105pqrs_dyn_ops,</div><div class='ctx'> 	.regs			= &amp;sja1105pqrs_regs,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1105,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1105_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1105_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1105PQRS_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1105pqrs_setup_rgmii_delay,</div><div class='ctx'> 	.reset_cmd		= sja1105pqrs_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1105_rxtstamp,</div><div class='add'>+	.clocking_setup		= sja1105_clocking_setup,</div><div class='add'>+	.pcs_mdio_read_c45	= sja1105_pcs_mdio_read_c45,</div><div class='add'>+	.pcs_mdio_write_c45	= sja1105_pcs_mdio_write_c45,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 1,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 0, /* Not supported */</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_rgmii		= {true, true, true, true, true},</div><div class='add'>+	.supports_sgmii		= {false, false, false, false, true},</div><div class='ctx'> 	.name			= "SJA1105S",</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1110a_info = {</div><div class='add'>+	.device_id		= SJA1110_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1110A_PART_NO,</div><div class='add'>+	.static_ops		= sja1110_table_ops,</div><div class='add'>+	.dyn_ops		= sja1110_dyn_ops,</div><div class='add'>+	.regs			= &amp;sja1110_regs,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1110,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.multiple_cascade_ports	= true,</div><div class='add'>+	.fixed_cbs_mapping	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1110_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1110_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1110_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1110_setup_rgmii_delay,</div><div class='add'>+	.reset_cmd		= sja1110_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1110_rxtstamp,</div><div class='add'>+	.txtstamp		= sja1110_txtstamp,</div><div class='add'>+	.disable_microcontroller = sja1110_disable_microcontroller,</div><div class='add'>+	.pcs_mdio_read_c45	= sja1110_pcs_mdio_read_c45,</div><div class='add'>+	.pcs_mdio_write_c45	= sja1110_pcs_mdio_write_c45,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 4,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 1,</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, false,</div><div class='add'>+				   true, true, true, true, true, true},</div><div class='add'>+	.supports_rmii		= {false, false, true, true, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_rgmii		= {false, false, true, true, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_sgmii		= {false, true, true, true, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_2500basex	= {false, false, false, true, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.internal_phy		= {SJA1105_NO_PHY, SJA1105_PHY_BASE_TX,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1},</div><div class='add'>+	.name			= "SJA1110A",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1110b_info = {</div><div class='add'>+	.device_id		= SJA1110_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1110B_PART_NO,</div><div class='add'>+	.static_ops		= sja1110_table_ops,</div><div class='add'>+	.dyn_ops		= sja1110_dyn_ops,</div><div class='add'>+	.regs			= &amp;sja1110_regs,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1110,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.multiple_cascade_ports	= true,</div><div class='add'>+	.fixed_cbs_mapping	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1110_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1110_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1110_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1110_setup_rgmii_delay,</div><div class='add'>+	.reset_cmd		= sja1110_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1110_rxtstamp,</div><div class='add'>+	.txtstamp		= sja1110_txtstamp,</div><div class='add'>+	.disable_microcontroller = sja1110_disable_microcontroller,</div><div class='add'>+	.pcs_mdio_read_c45	= sja1110_pcs_mdio_read_c45,</div><div class='add'>+	.pcs_mdio_write_c45	= sja1110_pcs_mdio_write_c45,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 4,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 1,</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, false,</div><div class='add'>+				   true, true, true, true, true, false},</div><div class='add'>+	.supports_rmii		= {false, false, true, true, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_rgmii		= {false, false, true, true, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_sgmii		= {false, false, false, true, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_2500basex	= {false, false, false, true, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.internal_phy		= {SJA1105_NO_PHY, SJA1105_PHY_BASE_TX,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_NO_PHY},</div><div class='add'>+	.name			= "SJA1110B",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1110c_info = {</div><div class='add'>+	.device_id		= SJA1110_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1110C_PART_NO,</div><div class='add'>+	.static_ops		= sja1110_table_ops,</div><div class='add'>+	.dyn_ops		= sja1110_dyn_ops,</div><div class='add'>+	.regs			= &amp;sja1110_regs,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1110,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.multiple_cascade_ports	= true,</div><div class='add'>+	.fixed_cbs_mapping	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1110_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1110_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1110_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1110_setup_rgmii_delay,</div><div class='add'>+	.reset_cmd		= sja1110_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1110_rxtstamp,</div><div class='add'>+	.txtstamp		= sja1110_txtstamp,</div><div class='add'>+	.disable_microcontroller = sja1110_disable_microcontroller,</div><div class='add'>+	.pcs_mdio_read_c45	= sja1110_pcs_mdio_read_c45,</div><div class='add'>+	.pcs_mdio_write_c45	= sja1110_pcs_mdio_write_c45,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 4,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 1,</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, true, true, true, false,</div><div class='add'>+				   true, true, true, false, false, false},</div><div class='add'>+	.supports_rmii		= {false, false, true, true, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_rgmii		= {false, false, true, true, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_sgmii		= {false, false, false, false, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_2500basex	= {false, false, false, false, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.internal_phy		= {SJA1105_NO_PHY, SJA1105_PHY_BASE_TX,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY},</div><div class='add'>+	.name			= "SJA1110C",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct sja1105_info sja1110d_info = {</div><div class='add'>+	.device_id		= SJA1110_DEVICE_ID,</div><div class='add'>+	.part_no		= SJA1110D_PART_NO,</div><div class='add'>+	.static_ops		= sja1110_table_ops,</div><div class='add'>+	.dyn_ops		= sja1110_dyn_ops,</div><div class='add'>+	.regs			= &amp;sja1110_regs,</div><div class='add'>+	.tag_proto		= DSA_TAG_PROTO_SJA1110,</div><div class='add'>+	.can_limit_mcast_flood	= true,</div><div class='add'>+	.multiple_cascade_ports	= true,</div><div class='add'>+	.fixed_cbs_mapping	= true,</div><div class='add'>+	.ptp_ts_bits		= 32,</div><div class='add'>+	.ptpegr_ts_bytes	= 8,</div><div class='add'>+	.max_frame_mem		= SJA1110_MAX_FRAME_MEMORY,</div><div class='add'>+	.num_ports		= SJA1110_NUM_PORTS,</div><div class='add'>+	.num_cbs_shapers	= SJA1110_MAX_CBS_COUNT,</div><div class='add'>+	.setup_rgmii_delay	= sja1110_setup_rgmii_delay,</div><div class='add'>+	.reset_cmd		= sja1110_reset_cmd,</div><div class='add'>+	.fdb_add_cmd		= sja1105pqrs_fdb_add,</div><div class='add'>+	.fdb_del_cmd		= sja1105pqrs_fdb_del,</div><div class='add'>+	.ptp_cmd_packing	= sja1105pqrs_ptp_cmd_packing,</div><div class='add'>+	.rxtstamp		= sja1110_rxtstamp,</div><div class='add'>+	.txtstamp		= sja1110_txtstamp,</div><div class='add'>+	.disable_microcontroller = sja1110_disable_microcontroller,</div><div class='add'>+	.pcs_mdio_read_c45	= sja1110_pcs_mdio_read_c45,</div><div class='add'>+	.pcs_mdio_write_c45	= sja1110_pcs_mdio_write_c45,</div><div class='add'>+	.port_speed		= {</div><div class='add'>+		[SJA1105_SPEED_AUTO] = 0,</div><div class='add'>+		[SJA1105_SPEED_10MBPS] = 4,</div><div class='add'>+		[SJA1105_SPEED_100MBPS] = 3,</div><div class='add'>+		[SJA1105_SPEED_1000MBPS] = 2,</div><div class='add'>+		[SJA1105_SPEED_2500MBPS] = 1,</div><div class='add'>+	},</div><div class='add'>+	.supports_mii		= {true, false, true, false, false,</div><div class='add'>+				   true, true, true, false, false, false},</div><div class='add'>+	.supports_rmii		= {false, false, true, false, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_rgmii		= {false, false, true, false, false,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_sgmii		= {false, true, true, true, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.supports_2500basex     = {false, false, false, true, true,</div><div class='add'>+				   false, false, false, false, false, false},</div><div class='add'>+	.internal_phy		= {SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_PHY_BASE_T1, SJA1105_PHY_BASE_T1,</div><div class='add'>+				   SJA1105_NO_PHY, SJA1105_NO_PHY,</div><div class='add'>+				   SJA1105_NO_PHY},</div><div class='add'>+	.name			= "SJA1110D",</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.c b/drivers/net/dsa/sja1105/sja1105_static_config.c<br/>index b3c992b0abb0..ffece8a400a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_static_config.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_static_config.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_static_config.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_static_config.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: BSD-3-Clause</div><div class='del'>-/* Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+/* Copyright 2016-2018 NXP</div><div class='ctx'>  * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #include "sja1105_static_config.h"</div><div class='hunk'>@@ -26,12 +26,8 @@ void sja1105_pack(void *buf, const u64 *val, int start, int end, size_t len)</div><div class='ctx'> 		pr_err("Start bit (%d) expected to be larger than end (%d)\n",</div><div class='ctx'> 		       start, end);</div><div class='ctx'> 	} else if (rc == -ERANGE) {</div><div class='del'>-		if ((start - end + 1) &gt; 64)</div><div class='del'>-			pr_err("Field %d-%d too large for 64 bits!\n",</div><div class='del'>-			       start, end);</div><div class='del'>-		else</div><div class='del'>-			pr_err("Cannot store %llx inside bits %d-%d (would truncate)\n",</div><div class='del'>-			       *val, start, end);</div><div class='add'>+		pr_err("Field %d-%d too large for 64 bits!\n",</div><div class='add'>+		       start, end);</div><div class='ctx'> 	}</div><div class='ctx'> 	dump_stack();</div><div class='ctx'> }</div><div class='hunk'>@@ -85,12 +81,35 @@ u32 sja1105_crc32(const void *buf, size_t len)</div><div class='ctx'> 	/* seed */</div><div class='ctx'> 	crc = ~0;</div><div class='ctx'> 	for (i = 0; i &lt; len; i += 4) {</div><div class='del'>-		sja1105_unpack((void *)buf + i, &amp;word, 31, 0, 4);</div><div class='add'>+		sja1105_unpack(buf + i, &amp;word, 31, 0, 4);</div><div class='ctx'> 		crc = crc32_le(crc, (u8 *)&amp;word, 4);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ~crc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t sja1105et_avb_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105ET_SIZE_AVB_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_avb_params_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destmeta, 95, 48, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;srcmeta,  47,  0, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1105pqrs_avb_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_avb_params_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;cas_master, 126, 126, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destmeta,   125,  78, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;srcmeta,     77,  30, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t sja1105et_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 						     enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -120,9 +139,11 @@ static size_t sja1105et_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t</div><div class='del'>-sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					 enum packing_op op)</div><div class='add'>+/* TPID and TPID2 are intentionally reversed so that semantic</div><div class='add'>+ * compatibility with E/T is kept.</div><div class='add'>+ */</div><div class='add'>+size_t sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						enum packing_op op)</div><div class='ctx'> {</div><div class='ctx'> 	const size_t size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY;</div><div class='ctx'> 	struct sja1105_general_params_entry *entry = entry_ptr;</div><div class='hunk'>@@ -144,9 +165,9 @@ sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;mirr_port,   141, 139, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;vlmarker,    138, 107, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;vlmask,      106,  75, size, op);</div><div class='del'>-	sja1105_packing(buf, &amp;entry-&gt;tpid,         74,  59, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid2,        74,  59, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;ignore2stf,   58,  58, size, op);</div><div class='del'>-	sja1105_packing(buf, &amp;entry-&gt;tpid2,        57,  42, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid,         57,  42, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;queue_ts,     41,  41, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;egrmirrvid,   40,  29, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;egrmirrpcp,   28,  26, size, op);</div><div class='hunk'>@@ -155,6 +176,43 @@ sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_general_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1110_SIZE_GENERAL_PARAMS_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vllupformat,  447, 447, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_ptacu,   446, 446, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;switchid,     445, 442, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;hostprio,     441, 439, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_fltres1,  438, 391, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_fltres0,  390, 343, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_flt1,     342, 295, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mac_flt0,     294, 247, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;incl_srcpt1,  246, 246, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;incl_srcpt0,  245, 245, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_meta1,   244, 244, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;send_meta0,   243, 243, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;casc_port,    242, 232, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;host_port,    231, 228, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mirr_port,    227, 224, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlmarker,     223, 192, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlmask,       191, 160, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid2,        159, 144, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ignore2stf,   143, 143, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tpid,         142, 127, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;queue_ts,     126, 126, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirrvid,   125, 114, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirrpcp,   113, 111, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egrmirrdei,   110, 110, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;replay_port,  109, 106, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tdmaconfigidx, 70,  67, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;header_type,   64,  49, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tte_en,        16,  16, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t</div><div class='ctx'> sja1105_l2_forwarding_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 					   enum packing_op op)</div><div class='hunk'>@@ -170,6 +228,20 @@ sja1105_l2_forwarding_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_l2_forwarding_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_forwarding_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;max_dynp, 95, 93, size, op);</div><div class='add'>+	for (i = 0, offset = 5; i &lt; 8; i++, offset += 11)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;part_spc[i],</div><div class='add'>+				offset + 10, offset + 0, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> size_t sja1105_l2_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 					   enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -186,6 +258,27 @@ size_t sja1105_l2_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_l2_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_forwarding_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_L2_FORWARDING_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;type_egrpcp2outputq) {</div><div class='add'>+		for (i = 0, offset = 31; i &lt; SJA1110_NUM_PORTS;</div><div class='add'>+		     i++, offset += 3) {</div><div class='add'>+			sja1105_packing(buf, &amp;entry-&gt;vlan_pmap[i],</div><div class='add'>+					offset + 2, offset + 0, size, op);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;bc_domain,  63, 53, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;reach_port, 52, 42, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;fl_domain,  41, 31, size, op);</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t</div><div class='ctx'> sja1105et_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 					 enum packing_op op)</div><div class='hunk'>@@ -202,17 +295,47 @@ sja1105et_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static size_t</div><div class='del'>-sja1105pqrs_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='del'>-					   enum packing_op op)</div><div class='add'>+size_t sja1105pqrs_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op)</div><div class='ctx'> {</div><div class='ctx'> 	const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY;</div><div class='ctx'> 	struct sja1105_l2_lookup_params_entry *entry = entry_ptr;</div><div class='add'>+	int offset, i;</div><div class='ctx'> </div><div class='add'>+	for (i = 0, offset = 58; i &lt; 5; i++, offset += 11)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;maxaddrp[i],</div><div class='add'>+				offset + 10, offset + 0, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;maxage,         57,  43, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;start_dynspc,   42,  33, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpnolearn,     32,  28, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;shared_learn,   27,  27, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;no_enf_hostprt, 26,  26, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;no_mgmt_learn,  25,  25, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;use_static,     24,  24, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;owr_dyn,        23,  23, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;learn_once,     22,  22, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1110_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					      enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_lookup_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1110_SIZE_L2_LOOKUP_PARAMS_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 70; i &lt; SJA1110_NUM_PORTS; i++, offset += 11)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;maxaddrp[i],</div><div class='add'>+				offset + 10, offset + 0, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxage,         69,  55, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;start_dynspc,   54,  45, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpnolearn,     44,  34, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;shared_learn,   33,  33, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;no_enf_hostprt, 32,  32, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;no_mgmt_learn,  31,  31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;use_static,     30,  30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;owr_dyn,        29,  29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;learn_once,     28,  28, size, op);</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -236,10 +359,20 @@ size_t sja1105pqrs_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	const size_t size = SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY;</div><div class='ctx'> 	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='ctx'> </div><div class='del'>-	/* These are static L2 lookup entries, so the structure</div><div class='del'>-	 * should match UM11040 Table 16/17 definitions when</div><div class='del'>-	 * LOCKEDS is 1.</div><div class='del'>-	 */</div><div class='add'>+	if (entry-&gt;lockeds) {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;tsreg,    159, 159, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;mirrvlan, 158, 147, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;takets,   146, 146, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;mirr,     145, 145, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;retag,    144, 144, size, op);</div><div class='add'>+	} else {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;touched,  159, 159, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;age,      158, 144, size, op);</div><div class='add'>+	}</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_iotag,   143, 143, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_vlanid,  142, 131, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_macaddr, 130,  83, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;iotag,         82,  82, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;vlanid,        81,  70, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;macaddr,       69,  22, size, op);</div><div class='ctx'> 	sja1105_packing(buf, &amp;entry-&gt;destports,     21,  17, size, op);</div><div class='hunk'>@@ -248,6 +381,36 @@ size_t sja1105pqrs_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1110_SIZE_L2_LOOKUP_ENTRY;</div><div class='add'>+	struct sja1105_l2_lookup_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;lockeds) {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;trap,     168, 168, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;mirrvlan, 167, 156, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;takets,   155, 155, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;mirr,     154, 154, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;retag,    153, 153, size, op);</div><div class='add'>+	} else {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;touched,  168, 168, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;age,      167, 153, size, op);</div><div class='add'>+	}</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_iotag,   152, 152, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_vlanid,  151, 140, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_macaddr, 139,  92, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;mask_srcport,  91,  88, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;iotag,         87,  87, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,        86,  75, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;macaddr,       74,  27, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;srcport,       26,  23, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports,     22,  12, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;enfport,       11,  11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;index,         10,   1, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t sja1105_l2_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 						enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -262,6 +425,20 @@ static size_t sja1105_l2_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_l2_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_l2_policing_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_L2_POLICING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;sharindx, 63, 57, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;smax,     56, 39, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;rate,     38, 21, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxlen,   20, 10, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;partition, 9,  7, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t sja1105et_mac_config_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 						 enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -330,6 +507,298 @@ size_t sja1105pqrs_mac_config_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_mac_config_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY;</div><div class='add'>+	struct sja1105_mac_config_entry *entry = entry_ptr;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 104; i &lt; 8; i++, offset += 19) {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;enabled[i],</div><div class='add'>+				offset +  0, offset +  0, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;base[i],</div><div class='add'>+				offset +  9, offset +  1, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;top[i],</div><div class='add'>+				offset + 18, offset + 10, size, op);</div><div class='add'>+	}</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;speed,      98, 96, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tp_delin,   95, 80, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tp_delout,  79, 64, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxage,     63, 56, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanprio,   55, 53, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,     52, 41, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ing_mirr,   40, 40, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egr_mirr,   39, 39, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpnona664, 38, 38, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpdtag,    37, 37, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;drpuntag,   34, 34, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;retag,      33, 33, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;dyn_learn,  32, 32, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egress,     31, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ingress,    30, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ifg,        10,  5, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1105_schedule_entry_points_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_schedule_entry_points_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;clksrc,    31, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;actsubsch, 29, 27, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1105_schedule_entry_points_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_schedule_entry_points_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;subschindx, 31, 29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;delta,      28, 11, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;address,    10, 1,  size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1110_schedule_entry_points_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_schedule_entry_points_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1110_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;subschindx, 63, 61, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;delta,      60, 43, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;address,    42, 31, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105_schedule_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_schedule_params_entry *entry = entry_ptr;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 16; i &lt; 8; i++, offset += 10)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;subscheind[i],</div><div class='add'>+				offset + 9, offset + 0, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1110_schedule_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						    enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_schedule_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 0; i &lt; 8; i++, offset += 12)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;subscheind[i],</div><div class='add'>+				offset + 11, offset + 0, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105_schedule_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					     enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1105_SIZE_SCHEDULE_ENTRY;</div><div class='add'>+	struct sja1105_schedule_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;winstindex,  63, 54, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;winend,      53, 53, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;winst,       52, 52, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports,   51, 47, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;setvalid,    46, 46, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;txen,        45, 45, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;resmedia_en, 44, 44, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;resmedia,    43, 36, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlindex,     35, 26, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;delta,       25, 8,  size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1110_schedule_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					     enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1110_SIZE_SCHEDULE_ENTRY;</div><div class='add'>+	struct sja1105_schedule_entry *entry = entry_ptr;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;winstindex,  95, 84, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;winend,      83, 83, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;winst,       82, 82, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports,   81, 71, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;setvalid,    70, 70, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;txen,        69, 69, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;resmedia_en, 68, 68, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;resmedia,    67, 60, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlindex,     59, 48, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;delta,       47, 30, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1105_vl_forwarding_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_forwarding_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 16; i &lt; 8; i++, offset += 10)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;partspc[i],</div><div class='add'>+				offset + 9, offset + 0, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;debugen, 15, 15, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t</div><div class='add'>+sja1110_vl_forwarding_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					   enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_forwarding_params_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 8; i &lt; 8; i++, offset += 11)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;partspc[i],</div><div class='add'>+				offset + 10, offset + 0, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;debugen, 7, 7, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105_vl_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_forwarding_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_FORWARDING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;type,      31, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;priority,  30, 28, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;partition, 27, 25, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports, 24, 20, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1110_vl_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_forwarding_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_FORWARDING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;type,      31, 31, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;priority,  30, 28, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;partition, 27, 25, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports, 24, 14, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1105_vl_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_lookup_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_LOOKUP_ENTRY;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;format == SJA1105_VL_FORMAT_PSFP) {</div><div class='add'>+		/* Interpreting vllupformat as 0 */</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;destports,</div><div class='add'>+				95, 91, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;iscritical,</div><div class='add'>+				90, 90, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;macaddr,</div><div class='add'>+				89, 42, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;vlanid,</div><div class='add'>+				41, 30, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;port,</div><div class='add'>+				29, 27, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;vlanprior,</div><div class='add'>+				26, 24, size, op);</div><div class='add'>+	} else {</div><div class='add'>+		/* Interpreting vllupformat as 1 */</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;egrmirr,</div><div class='add'>+				95, 91, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;ingrmirr,</div><div class='add'>+				90, 90, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;vlid,</div><div class='add'>+				57, 42, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;port,</div><div class='add'>+				29, 27, size, op);</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1110_vl_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_lookup_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_LOOKUP_ENTRY;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;format == SJA1105_VL_FORMAT_PSFP) {</div><div class='add'>+		/* Interpreting vllupformat as 0 */</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;destports,</div><div class='add'>+				94, 84, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;iscritical,</div><div class='add'>+				83, 83, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;macaddr,</div><div class='add'>+				82, 35, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;vlanid,</div><div class='add'>+				34, 23, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;port,</div><div class='add'>+				22, 19, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;vlanprior,</div><div class='add'>+				18, 16, size, op);</div><div class='add'>+	} else {</div><div class='add'>+		/* Interpreting vllupformat as 1 */</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;egrmirr,</div><div class='add'>+				94, 84, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;ingrmirr,</div><div class='add'>+				83, 83, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;vlid,</div><div class='add'>+				50, 35, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;port,</div><div class='add'>+				22, 19, size, op);</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1105_vl_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_policing_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_POLICING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;type,      63, 63, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxlen,    62, 52, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;sharindx,  51, 42, size, op);</div><div class='add'>+	if (entry-&gt;type == 0) {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;bag,    41, 28, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;jitter, 27, 18, size, op);</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1110_vl_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_policing_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_VL_POLICING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;type,      63, 63, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;maxlen,    62, 52, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;sharindx,  51, 40, size, op);</div><div class='add'>+	if (entry-&gt;type == 0) {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;bag,    41, 28, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;jitter, 27, 18, size, op);</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> size_t sja1105_vlan_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 					 enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -345,6 +814,22 @@ size_t sja1105_vlan_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_vlan_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vlan_lookup_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1110_SIZE_VLAN_LOOKUP_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ving_mirr,  95, 85, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vegr_mirr,  84, 74, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vmemb_port, 73, 63, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlan_bc,    62, 52, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;tag_port,   51, 41, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;type_entry, 40, 39, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlanid,     38, 27, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static size_t sja1105_xmii_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 						enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -361,6 +846,70 @@ static size_t sja1105_xmii_params_entry_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+size_t sja1110_xmii_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	const size_t size = SJA1110_SIZE_XMII_PARAMS_ENTRY;</div><div class='add'>+	struct sja1105_xmii_params_entry *entry = entry_ptr;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 20; i &lt; SJA1110_NUM_PORTS; i++, offset += 4) {</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;xmii_mode[i],</div><div class='add'>+				offset + 1, offset + 0, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;phy_mac[i],</div><div class='add'>+				offset + 2, offset + 2, size, op);</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;special[i],</div><div class='add'>+				offset + 3, offset + 3, size, op);</div><div class='add'>+	}</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1105_retagging_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_retagging_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_RETAGGING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egr_port,       63, 59, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ing_port,       58, 54, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlan_ing,       53, 42, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlan_egr,       41, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;do_not_learn,   29, 29, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;use_dest_ports, 28, 28, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports,      27, 23, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t sja1110_retagging_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_retagging_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1105_SIZE_RETAGGING_ENTRY;</div><div class='add'>+</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;egr_port,       63, 53, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;ing_port,       52, 42, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlan_ing,       41, 30, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;vlan_egr,       29, 18, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;do_not_learn,   17, 17, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;use_dest_ports, 16, 16, size, op);</div><div class='add'>+	sja1105_packing(buf, &amp;entry-&gt;destports,      15, 5, size, op);</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t sja1110_pcp_remapping_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op)</div><div class='add'>+{</div><div class='add'>+	struct sja1110_pcp_remapping_entry *entry = entry_ptr;</div><div class='add'>+	const size_t size = SJA1110_SIZE_PCP_REMAPPING_ENTRY;</div><div class='add'>+	int offset, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0, offset = 8; i &lt; SJA1105_NUM_TC; i++, offset += 3)</div><div class='add'>+		sja1105_packing(buf, &amp;entry-&gt;egrpcp[i],</div><div class='add'>+				offset + 2, offset + 0, size, op);</div><div class='add'>+</div><div class='add'>+	return size;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> size_t sja1105_table_header_packing(void *buf, void *entry_ptr,</div><div class='ctx'> 				    enum packing_op op)</div><div class='ctx'> {</div><div class='hunk'>@@ -406,19 +955,40 @@ static void sja1105_table_write_crc(u8 *table_start, u8 *crc_ptr)</div><div class='ctx'>  * before blindly indexing kernel memory with the blk_idx.</div><div class='ctx'>  */</div><div class='ctx'> static u64 blk_id_map[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_SCHEDULE] = BLKID_SCHEDULE,</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS] = BLKID_SCHEDULE_ENTRY_POINTS,</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = BLKID_VL_LOOKUP,</div><div class='add'>+	[BLK_IDX_VL_POLICING] = BLKID_VL_POLICING,</div><div class='add'>+	[BLK_IDX_VL_FORWARDING] = BLKID_VL_FORWARDING,</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = BLKID_L2_LOOKUP,</div><div class='ctx'> 	[BLK_IDX_L2_POLICING] = BLKID_L2_POLICING,</div><div class='ctx'> 	[BLK_IDX_VLAN_LOOKUP] = BLKID_VLAN_LOOKUP,</div><div class='ctx'> 	[BLK_IDX_L2_FORWARDING] = BLKID_L2_FORWARDING,</div><div class='ctx'> 	[BLK_IDX_MAC_CONFIG] = BLKID_MAC_CONFIG,</div><div class='add'>+	[BLK_IDX_SCHEDULE_PARAMS] = BLKID_SCHEDULE_PARAMS,</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = BLKID_SCHEDULE_ENTRY_POINTS_PARAMS,</div><div class='add'>+	[BLK_IDX_VL_FORWARDING_PARAMS] = BLKID_VL_FORWARDING_PARAMS,</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP_PARAMS] = BLKID_L2_LOOKUP_PARAMS,</div><div class='ctx'> 	[BLK_IDX_L2_FORWARDING_PARAMS] = BLKID_L2_FORWARDING_PARAMS,</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = BLKID_AVB_PARAMS,</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = BLKID_GENERAL_PARAMS,</div><div class='add'>+	[BLK_IDX_RETAGGING] = BLKID_RETAGGING,</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = BLKID_XMII_PARAMS,</div><div class='add'>+	[BLK_IDX_PCP_REMAPPING] = BLKID_PCP_REMAPPING,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const char *sja1105_static_config_error_msg[] = {</div><div class='ctx'> 	[SJA1105_CONFIG_OK] = "",</div><div class='add'>+	[SJA1105_TTETHERNET_NOT_SUPPORTED] =</div><div class='add'>+		"schedule-table present, but TTEthernet is "</div><div class='add'>+		"only supported on T and Q/S",</div><div class='add'>+	[SJA1105_INCORRECT_TTETHERNET_CONFIGURATION] =</div><div class='add'>+		"schedule-table present, but one of "</div><div class='add'>+		"schedule-entry-points-table, schedule-parameters-table or "</div><div class='add'>+		"schedule-entry-points-parameters table is empty",</div><div class='add'>+	[SJA1105_INCORRECT_VIRTUAL_LINK_CONFIGURATION] =</div><div class='add'>+		"vl-lookup-table present, but one of vl-policing-table, "</div><div class='add'>+		"vl-forwarding-table or vl-forwarding-parameters-table is empty",</div><div class='ctx'> 	[SJA1105_MISSING_L2_POLICING_TABLE] =</div><div class='ctx'> 		"l2-policing-table needs to have at least one entry",</div><div class='ctx'> 	[SJA1105_MISSING_L2_FORWARDING_TABLE] =</div><div class='hunk'>@@ -442,10 +1012,11 @@ const char *sja1105_static_config_error_msg[] = {</div><div class='ctx'> 		"vl-forwarding-parameters-table.partspc.",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-sja1105_config_valid_t</div><div class='del'>-static_config_check_memory_size(const struct sja1105_table *tables)</div><div class='add'>+static sja1105_config_valid_t</div><div class='add'>+static_config_check_memory_size(const struct sja1105_table *tables, int max_mem)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_l2_forwarding_params_entry *l2_fwd_params;</div><div class='add'>+	const struct sja1105_vl_forwarding_params_entry *vl_fwd_params;</div><div class='ctx'> 	int i, mem = 0;</div><div class='ctx'> </div><div class='ctx'> 	l2_fwd_params = tables[BLK_IDX_L2_FORWARDING_PARAMS].entries;</div><div class='hunk'>@@ -453,19 +1024,69 @@ static_config_check_memory_size(const struct sja1105_table *tables)</div><div class='ctx'> 	for (i = 0; i &lt; 8; i++)</div><div class='ctx'> 		mem += l2_fwd_params-&gt;part_spc[i];</div><div class='ctx'> </div><div class='del'>-	if (mem &gt; SJA1105_MAX_FRAME_MEMORY)</div><div class='add'>+	if (tables[BLK_IDX_VL_FORWARDING_PARAMS].entry_count) {</div><div class='add'>+		vl_fwd_params = tables[BLK_IDX_VL_FORWARDING_PARAMS].entries;</div><div class='add'>+		for (i = 0; i &lt; 8; i++)</div><div class='add'>+			mem += vl_fwd_params-&gt;partspc[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tables[BLK_IDX_RETAGGING].entry_count)</div><div class='add'>+		max_mem -= SJA1105_FRAME_MEMORY_RETAGGING_OVERHEAD;</div><div class='add'>+</div><div class='add'>+	if (mem &gt; max_mem)</div><div class='ctx'> 		return SJA1105_OVERCOMMITTED_FRAME_MEMORY;</div><div class='ctx'> </div><div class='ctx'> 	return SJA1105_CONFIG_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> sja1105_config_valid_t</div><div class='del'>-sja1105_static_config_check_valid(const struct sja1105_static_config *config)</div><div class='add'>+sja1105_static_config_check_valid(const struct sja1105_static_config *config,</div><div class='add'>+				  int max_mem)</div><div class='ctx'> {</div><div class='ctx'> 	const struct sja1105_table *tables = config-&gt;tables;</div><div class='ctx'> #define IS_FULL(blk_idx) \</div><div class='ctx'> 	(tables[blk_idx].entry_count == tables[blk_idx].ops-&gt;max_entry_count)</div><div class='ctx'> </div><div class='add'>+	if (tables[BLK_IDX_SCHEDULE].entry_count) {</div><div class='add'>+		if (!tables[BLK_IDX_SCHEDULE].ops-&gt;max_entry_count)</div><div class='add'>+			return SJA1105_TTETHERNET_NOT_SUPPORTED;</div><div class='add'>+</div><div class='add'>+		if (tables[BLK_IDX_SCHEDULE_ENTRY_POINTS].entry_count == 0)</div><div class='add'>+			return SJA1105_INCORRECT_TTETHERNET_CONFIGURATION;</div><div class='add'>+</div><div class='add'>+		if (!IS_FULL(BLK_IDX_SCHEDULE_PARAMS))</div><div class='add'>+			return SJA1105_INCORRECT_TTETHERNET_CONFIGURATION;</div><div class='add'>+</div><div class='add'>+		if (!IS_FULL(BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS))</div><div class='add'>+			return SJA1105_INCORRECT_TTETHERNET_CONFIGURATION;</div><div class='add'>+	}</div><div class='add'>+	if (tables[BLK_IDX_VL_LOOKUP].entry_count) {</div><div class='add'>+		struct sja1105_vl_lookup_entry *vl_lookup;</div><div class='add'>+		bool has_critical_links = false;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		vl_lookup = tables[BLK_IDX_VL_LOOKUP].entries;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tables[BLK_IDX_VL_LOOKUP].entry_count; i++) {</div><div class='add'>+			if (vl_lookup[i].iscritical) {</div><div class='add'>+				has_critical_links = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tables[BLK_IDX_VL_POLICING].entry_count == 0 &amp;&amp;</div><div class='add'>+		    has_critical_links)</div><div class='add'>+			return SJA1105_INCORRECT_VIRTUAL_LINK_CONFIGURATION;</div><div class='add'>+</div><div class='add'>+		if (tables[BLK_IDX_VL_FORWARDING].entry_count == 0 &amp;&amp;</div><div class='add'>+		    has_critical_links)</div><div class='add'>+			return SJA1105_INCORRECT_VIRTUAL_LINK_CONFIGURATION;</div><div class='add'>+</div><div class='add'>+		if (tables[BLK_IDX_VL_FORWARDING_PARAMS].entry_count == 0 &amp;&amp;</div><div class='add'>+		    has_critical_links)</div><div class='add'>+			return SJA1105_INCORRECT_VIRTUAL_LINK_CONFIGURATION;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (tables[BLK_IDX_L2_POLICING].entry_count == 0)</div><div class='ctx'> 		return SJA1105_MISSING_L2_POLICING_TABLE;</div><div class='ctx'> </div><div class='hunk'>@@ -487,7 +1108,7 @@ sja1105_static_config_check_valid(const struct sja1105_static_config *config)</div><div class='ctx'> 	if (!IS_FULL(BLK_IDX_XMII_PARAMS))</div><div class='ctx'> 		return SJA1105_MISSING_XMII_TABLE;</div><div class='ctx'> </div><div class='del'>-	return static_config_check_memory_size(tables);</div><div class='add'>+	return static_config_check_memory_size(tables, max_mem);</div><div class='ctx'> #undef IS_FULL</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -571,7 +1192,7 @@ sja1105_static_config_get_length(const struct sja1105_static_config *config)</div><div class='ctx'> /* Compatibility matrices */</div><div class='ctx'> </div><div class='ctx'> /* SJA1105E: First generation, no TTEthernet */</div><div class='del'>-struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+const struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='ctx'> 		.packing = sja1105et_l2_lookup_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='hunk'>@@ -614,12 +1235,24 @@ struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105et_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105et_general_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='ctx'> 		.packed_entry_size = SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105_xmii_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='hunk'>@@ -629,7 +1262,37 @@ struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SJA1105T: First generation, TTEthernet */</div><div class='del'>-struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+const struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_SCHEDULE] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vl_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_LOOKUP_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_POLICING] = {</div><div class='add'>+		.packing = sja1105_vl_policing_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_policing_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_POLICING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING] = {</div><div class='add'>+		.packing = sja1105_vl_forwarding_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='ctx'> 		.packing = sja1105et_l2_lookup_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='hunk'>@@ -660,6 +1323,24 @@ struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105ET_SIZE_MAC_CONFIG_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING_PARAMS] = {</div><div class='add'>+		.packing = sja1105_vl_forwarding_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105et_l2_lookup_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),</div><div class='hunk'>@@ -672,12 +1353,24 @@ struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105et_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105ET_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105et_general_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='ctx'> 		.packed_entry_size = SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105_xmii_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='hunk'>@@ -687,7 +1380,7 @@ struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SJA1105P: Second generation, no TTEthernet, no SGMII */</div><div class='del'>-struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+const struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='ctx'> 		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='hunk'>@@ -730,12 +1423,24 @@ struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='ctx'> 		.packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105_xmii_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='hunk'>@@ -745,7 +1450,37 @@ struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SJA1105Q: Second generation, TTEthernet, no SGMII */</div><div class='del'>-struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+const struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_SCHEDULE] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vl_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_LOOKUP_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_POLICING] = {</div><div class='add'>+		.packing = sja1105_vl_policing_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_policing_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_POLICING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING] = {</div><div class='add'>+		.packing = sja1105_vl_forwarding_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='ctx'> 		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='hunk'>@@ -776,6 +1511,24 @@ struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING_PARAMS] = {</div><div class='add'>+		.packing = sja1105_vl_forwarding_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105pqrs_l2_lookup_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),</div><div class='hunk'>@@ -788,12 +1541,24 @@ struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='ctx'> 		.packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105_xmii_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='hunk'>@@ -803,7 +1568,7 @@ struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SJA1105R: Second generation, no TTEthernet, SGMII */</div><div class='del'>-struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+const struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='ctx'> 		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='hunk'>@@ -846,12 +1611,24 @@ struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='ctx'> 		.packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105_xmii_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='hunk'>@@ -861,7 +1638,37 @@ struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* SJA1105S: Second generation, TTEthernet, SGMII */</div><div class='del'>-struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+const struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_SCHEDULE] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.packing = sja1105_vl_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_LOOKUP_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_POLICING] = {</div><div class='add'>+		.packing = sja1105_vl_policing_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_policing_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_POLICING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING] = {</div><div class='add'>+		.packing = sja1105_vl_forwarding_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP] = {</div><div class='ctx'> 		.packing = sja1105pqrs_l2_lookup_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='hunk'>@@ -892,6 +1699,24 @@ struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_MAC_CONFIG_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING_PARAMS] = {</div><div class='add'>+		.packing = sja1105_vl_forwarding_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105pqrs_l2_lookup_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),</div><div class='hunk'>@@ -904,12 +1729,24 @@ struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105pqrs_general_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='ctx'> 		.packed_entry_size = SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='ctx'> 		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='ctx'> 	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1105_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='ctx'> 	[BLK_IDX_XMII_PARAMS] = {</div><div class='ctx'> 		.packing = sja1105_xmii_params_entry_packing,</div><div class='ctx'> 		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='hunk'>@@ -918,6 +1755,130 @@ struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX] = {</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* SJA1110A: Third generation */</div><div class='add'>+const struct sja1105_table_ops sja1110_table_ops[BLK_IDX_MAX] = {</div><div class='add'>+	[BLK_IDX_SCHEDULE] = {</div><div class='add'>+		.packing = sja1110_schedule_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_SCHEDULE_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_SCHEDULE_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS] = {</div><div class='add'>+		.packing = sja1110_schedule_entry_points_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_LOOKUP] = {</div><div class='add'>+		.packing = sja1110_vl_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_LOOKUP_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_VL_LOOKUP_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_POLICING] = {</div><div class='add'>+		.packing = sja1110_vl_policing_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_policing_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_POLICING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_VL_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING] = {</div><div class='add'>+		.packing = sja1110_vl_forwarding_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_VL_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP] = {</div><div class='add'>+		.packing = sja1110_l2_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_L2_LOOKUP_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_POLICING] = {</div><div class='add'>+		.packing = sja1110_l2_policing_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_policing_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_L2_POLICING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_L2_POLICING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VLAN_LOOKUP] = {</div><div class='add'>+		.packing = sja1110_vlan_lookup_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vlan_lookup_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_VLAN_LOOKUP_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VLAN_LOOKUP_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING] = {</div><div class='add'>+		.packing = sja1110_l2_forwarding_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_forwarding_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_L2_FORWARDING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_MAC_CONFIG] = {</div><div class='add'>+		.packing = sja1110_mac_config_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_mac_config_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_MAC_CONFIG_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_PARAMS] = {</div><div class='add'>+		.packing = sja1110_schedule_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS] = {</div><div class='add'>+		.packing = sja1105_schedule_entry_points_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_schedule_entry_points_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_VL_FORWARDING_PARAMS] = {</div><div class='add'>+		.packing = sja1110_vl_forwarding_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_vl_forwarding_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_VL_FORWARDING_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_LOOKUP_PARAMS] = {</div><div class='add'>+		.packing = sja1110_l2_lookup_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_lookup_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_L2_LOOKUP_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_L2_FORWARDING_PARAMS] = {</div><div class='add'>+		.packing = sja1110_l2_forwarding_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_l2_forwarding_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_AVB_PARAMS] = {</div><div class='add'>+		.packing = sja1105pqrs_avb_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_avb_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_AVB_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_GENERAL_PARAMS] = {</div><div class='add'>+		.packing = sja1110_general_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_general_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_GENERAL_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_GENERAL_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_RETAGGING] = {</div><div class='add'>+		.packing = sja1110_retagging_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_retagging_entry),</div><div class='add'>+		.packed_entry_size = SJA1105_SIZE_RETAGGING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_RETAGGING_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_XMII_PARAMS] = {</div><div class='add'>+		.packing = sja1110_xmii_params_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1105_xmii_params_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_XMII_PARAMS_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1105_MAX_XMII_PARAMS_COUNT,</div><div class='add'>+	},</div><div class='add'>+	[BLK_IDX_PCP_REMAPPING] = {</div><div class='add'>+		.packing = sja1110_pcp_remapping_entry_packing,</div><div class='add'>+		.unpacked_entry_size = sizeof(struct sja1110_pcp_remapping_entry),</div><div class='add'>+		.packed_entry_size = SJA1110_SIZE_PCP_REMAPPING_ENTRY,</div><div class='add'>+		.max_entry_count = SJA1110_MAX_PCP_REMAPPING_COUNT,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> int sja1105_static_config_init(struct sja1105_static_config *config,</div><div class='ctx'> 			       const struct sja1105_table_ops *static_ops,</div><div class='ctx'> 			       u64 device_id)</div><div class='hunk'>@@ -956,8 +1917,10 @@ int sja1105_table_delete_entry(struct sja1105_table *table, int i)</div><div class='ctx'> 	if (i &gt; table-&gt;entry_count)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	memmove(entries + i * entry_size, entries + (i + 1) * entry_size,</div><div class='del'>-		(table-&gt;entry_count - i) * entry_size);</div><div class='add'>+	if (i + 1 &lt; table-&gt;entry_count) {</div><div class='add'>+		memmove(entries + i * entry_size, entries + (i + 1) * entry_size,</div><div class='add'>+			(table-&gt;entry_count - i - 1) * entry_size);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	table-&gt;entry_count--;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_static_config.h b/drivers/net/dsa/sja1105/sja1105_static_config.h<br/>index 069ca8fd059c..6a372d5f22ae 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_static_config.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/sja1105/sja1105_static_config.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_static_config.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_static_config.h</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-/* SPDX-License-Identifier: BSD-3-Clause</div><div class='del'>- * Copyright (c) 2016-2018, NXP Semiconductors</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause */</div><div class='add'>+/* Copyright 2016-2018 NXP</div><div class='ctx'>  * Copyright (c) 2018-2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _SJA1105_STATIC_CONFIG_H</div><div class='hunk'>@@ -9,45 +9,97 @@</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;asm/types.h&gt;</div><div class='ctx'> </div><div class='add'>+#define SJA1105_NUM_PORTS				5</div><div class='add'>+#define SJA1110_NUM_PORTS				11</div><div class='add'>+#define SJA1105_MAX_NUM_PORTS				SJA1110_NUM_PORTS</div><div class='add'>+#define SJA1105_NUM_TC					8</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_SPI_MSG_HEADER			4</div><div class='add'>+#define SJA1105_SIZE_SPI_MSG_MAXLEN			(64 * 4)</div><div class='ctx'> #define SJA1105_SIZE_DEVICE_ID				4</div><div class='ctx'> #define SJA1105_SIZE_TABLE_HEADER			12</div><div class='add'>+#define SJA1105_SIZE_SCHEDULE_ENTRY			8</div><div class='add'>+#define SJA1110_SIZE_SCHEDULE_ENTRY			12</div><div class='add'>+#define SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY	4</div><div class='add'>+#define SJA1110_SIZE_SCHEDULE_ENTRY_POINTS_ENTRY	8</div><div class='add'>+#define SJA1105_SIZE_VL_LOOKUP_ENTRY			12</div><div class='add'>+#define SJA1105_SIZE_VL_POLICING_ENTRY			8</div><div class='add'>+#define SJA1105_SIZE_VL_FORWARDING_ENTRY		4</div><div class='ctx'> #define SJA1105_SIZE_L2_POLICING_ENTRY			8</div><div class='ctx'> #define SJA1105_SIZE_VLAN_LOOKUP_ENTRY			8</div><div class='add'>+#define SJA1110_SIZE_VLAN_LOOKUP_ENTRY			12</div><div class='ctx'> #define SJA1105_SIZE_L2_FORWARDING_ENTRY		8</div><div class='ctx'> #define SJA1105_SIZE_L2_FORWARDING_PARAMS_ENTRY		12</div><div class='add'>+#define SJA1105_SIZE_RETAGGING_ENTRY			8</div><div class='ctx'> #define SJA1105_SIZE_XMII_PARAMS_ENTRY			4</div><div class='add'>+#define SJA1110_SIZE_XMII_PARAMS_ENTRY			8</div><div class='add'>+#define SJA1105_SIZE_SCHEDULE_PARAMS_ENTRY		12</div><div class='add'>+#define SJA1105_SIZE_SCHEDULE_ENTRY_POINTS_PARAMS_ENTRY	4</div><div class='add'>+#define SJA1105_SIZE_VL_FORWARDING_PARAMS_ENTRY         12</div><div class='ctx'> #define SJA1105ET_SIZE_L2_LOOKUP_ENTRY			12</div><div class='ctx'> #define SJA1105ET_SIZE_MAC_CONFIG_ENTRY			28</div><div class='ctx'> #define SJA1105ET_SIZE_L2_LOOKUP_PARAMS_ENTRY		4</div><div class='ctx'> #define SJA1105ET_SIZE_GENERAL_PARAMS_ENTRY		40</div><div class='add'>+#define SJA1105ET_SIZE_AVB_PARAMS_ENTRY			12</div><div class='add'>+#define SJA1105ET_SIZE_CBS_ENTRY			16</div><div class='ctx'> #define SJA1105PQRS_SIZE_L2_LOOKUP_ENTRY		20</div><div class='add'>+#define SJA1110_SIZE_L2_LOOKUP_ENTRY			24</div><div class='ctx'> #define SJA1105PQRS_SIZE_MAC_CONFIG_ENTRY		32</div><div class='ctx'> #define SJA1105PQRS_SIZE_L2_LOOKUP_PARAMS_ENTRY		16</div><div class='add'>+#define SJA1110_SIZE_L2_LOOKUP_PARAMS_ENTRY		28</div><div class='ctx'> #define SJA1105PQRS_SIZE_GENERAL_PARAMS_ENTRY		44</div><div class='add'>+#define SJA1110_SIZE_GENERAL_PARAMS_ENTRY		56</div><div class='add'>+#define SJA1105PQRS_SIZE_AVB_PARAMS_ENTRY		16</div><div class='add'>+#define SJA1105PQRS_SIZE_CBS_ENTRY			20</div><div class='add'>+#define SJA1110_SIZE_PCP_REMAPPING_ENTRY		4</div><div class='ctx'> </div><div class='ctx'> /* UM10944.pdf Page 11, Table 2. Configuration Blocks */</div><div class='ctx'> enum {</div><div class='add'>+	BLKID_SCHEDULE					= 0x00,</div><div class='add'>+	BLKID_SCHEDULE_ENTRY_POINTS			= 0x01,</div><div class='add'>+	BLKID_VL_LOOKUP					= 0x02,</div><div class='add'>+	BLKID_VL_POLICING				= 0x03,</div><div class='add'>+	BLKID_VL_FORWARDING				= 0x04,</div><div class='ctx'> 	BLKID_L2_LOOKUP					= 0x05,</div><div class='ctx'> 	BLKID_L2_POLICING				= 0x06,</div><div class='ctx'> 	BLKID_VLAN_LOOKUP				= 0x07,</div><div class='ctx'> 	BLKID_L2_FORWARDING				= 0x08,</div><div class='ctx'> 	BLKID_MAC_CONFIG				= 0x09,</div><div class='add'>+	BLKID_SCHEDULE_PARAMS				= 0x0A,</div><div class='add'>+	BLKID_SCHEDULE_ENTRY_POINTS_PARAMS		= 0x0B,</div><div class='add'>+	BLKID_VL_FORWARDING_PARAMS			= 0x0C,</div><div class='ctx'> 	BLKID_L2_LOOKUP_PARAMS				= 0x0D,</div><div class='ctx'> 	BLKID_L2_FORWARDING_PARAMS			= 0x0E,</div><div class='add'>+	BLKID_AVB_PARAMS				= 0x10,</div><div class='ctx'> 	BLKID_GENERAL_PARAMS				= 0x11,</div><div class='add'>+	BLKID_RETAGGING					= 0x12,</div><div class='add'>+	BLKID_CBS					= 0x13,</div><div class='add'>+	BLKID_PCP_REMAPPING				= 0x1C,</div><div class='ctx'> 	BLKID_XMII_PARAMS				= 0x4E,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum sja1105_blk_idx {</div><div class='del'>-	BLK_IDX_L2_LOOKUP = 0,</div><div class='add'>+	BLK_IDX_SCHEDULE = 0,</div><div class='add'>+	BLK_IDX_SCHEDULE_ENTRY_POINTS,</div><div class='add'>+	BLK_IDX_VL_LOOKUP,</div><div class='add'>+	BLK_IDX_VL_POLICING,</div><div class='add'>+	BLK_IDX_VL_FORWARDING,</div><div class='add'>+	BLK_IDX_L2_LOOKUP,</div><div class='ctx'> 	BLK_IDX_L2_POLICING,</div><div class='ctx'> 	BLK_IDX_VLAN_LOOKUP,</div><div class='ctx'> 	BLK_IDX_L2_FORWARDING,</div><div class='ctx'> 	BLK_IDX_MAC_CONFIG,</div><div class='add'>+	BLK_IDX_SCHEDULE_PARAMS,</div><div class='add'>+	BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS,</div><div class='add'>+	BLK_IDX_VL_FORWARDING_PARAMS,</div><div class='ctx'> 	BLK_IDX_L2_LOOKUP_PARAMS,</div><div class='ctx'> 	BLK_IDX_L2_FORWARDING_PARAMS,</div><div class='add'>+	BLK_IDX_AVB_PARAMS,</div><div class='ctx'> 	BLK_IDX_GENERAL_PARAMS,</div><div class='add'>+	BLK_IDX_RETAGGING,</div><div class='add'>+	BLK_IDX_CBS,</div><div class='ctx'> 	BLK_IDX_XMII_PARAMS,</div><div class='add'>+	BLK_IDX_PCP_REMAPPING,</div><div class='ctx'> 	BLK_IDX_MAX,</div><div class='ctx'> 	/* Fake block indices that are only valid for dynamic access */</div><div class='ctx'> 	BLK_IDX_MGMT_ROUTE,</div><div class='hunk'>@@ -55,28 +107,85 @@ enum sja1105_blk_idx {</div><div class='ctx'> 	BLK_IDX_INVAL = -1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define SJA1105_MAX_SCHEDULE_COUNT			1024</div><div class='add'>+#define SJA1110_MAX_SCHEDULE_COUNT			4096</div><div class='add'>+#define SJA1105_MAX_SCHEDULE_ENTRY_POINTS_COUNT		2048</div><div class='add'>+#define SJA1105_MAX_VL_LOOKUP_COUNT			1024</div><div class='add'>+#define SJA1110_MAX_VL_LOOKUP_COUNT			4096</div><div class='add'>+#define SJA1105_MAX_VL_POLICING_COUNT			1024</div><div class='add'>+#define SJA1110_MAX_VL_POLICING_COUNT			4096</div><div class='add'>+#define SJA1105_MAX_VL_FORWARDING_COUNT			1024</div><div class='add'>+#define SJA1110_MAX_VL_FORWARDING_COUNT			4096</div><div class='ctx'> #define SJA1105_MAX_L2_LOOKUP_COUNT			1024</div><div class='ctx'> #define SJA1105_MAX_L2_POLICING_COUNT			45</div><div class='add'>+#define SJA1110_MAX_L2_POLICING_COUNT			110</div><div class='ctx'> #define SJA1105_MAX_VLAN_LOOKUP_COUNT			4096</div><div class='ctx'> #define SJA1105_MAX_L2_FORWARDING_COUNT			13</div><div class='add'>+#define SJA1110_MAX_L2_FORWARDING_COUNT			19</div><div class='ctx'> #define SJA1105_MAX_MAC_CONFIG_COUNT			5</div><div class='add'>+#define SJA1110_MAX_MAC_CONFIG_COUNT			11</div><div class='add'>+#define SJA1105_MAX_SCHEDULE_PARAMS_COUNT		1</div><div class='add'>+#define SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT	1</div><div class='add'>+#define SJA1105_MAX_VL_FORWARDING_PARAMS_COUNT		1</div><div class='ctx'> #define SJA1105_MAX_L2_LOOKUP_PARAMS_COUNT		1</div><div class='ctx'> #define SJA1105_MAX_L2_FORWARDING_PARAMS_COUNT		1</div><div class='ctx'> #define SJA1105_MAX_GENERAL_PARAMS_COUNT		1</div><div class='add'>+#define SJA1105_MAX_RETAGGING_COUNT			32</div><div class='ctx'> #define SJA1105_MAX_XMII_PARAMS_COUNT			1</div><div class='add'>+#define SJA1105_MAX_AVB_PARAMS_COUNT			1</div><div class='add'>+#define SJA1105ET_MAX_CBS_COUNT				10</div><div class='add'>+#define SJA1105PQRS_MAX_CBS_COUNT			16</div><div class='add'>+#define SJA1110_MAX_CBS_COUNT				80</div><div class='add'>+#define SJA1110_MAX_PCP_REMAPPING_COUNT			11</div><div class='ctx'> </div><div class='ctx'> #define SJA1105_MAX_FRAME_MEMORY			929</div><div class='add'>+#define SJA1110_MAX_FRAME_MEMORY			1820</div><div class='add'>+#define SJA1105_FRAME_MEMORY_RETAGGING_OVERHEAD		19</div><div class='add'>+#define SJA1105_VL_FRAME_MEMORY				100</div><div class='ctx'> </div><div class='ctx'> #define SJA1105E_DEVICE_ID				0x9C00000Cull</div><div class='ctx'> #define SJA1105T_DEVICE_ID				0x9E00030Eull</div><div class='ctx'> #define SJA1105PR_DEVICE_ID				0xAF00030Eull</div><div class='ctx'> #define SJA1105QS_DEVICE_ID				0xAE00030Eull</div><div class='add'>+#define SJA1110_DEVICE_ID				0xB700030Full</div><div class='ctx'> </div><div class='ctx'> #define SJA1105ET_PART_NO				0x9A83</div><div class='ctx'> #define SJA1105P_PART_NO				0x9A84</div><div class='ctx'> #define SJA1105Q_PART_NO				0x9A85</div><div class='ctx'> #define SJA1105R_PART_NO				0x9A86</div><div class='ctx'> #define SJA1105S_PART_NO				0x9A87</div><div class='add'>+#define SJA1110A_PART_NO				0x1110</div><div class='add'>+#define SJA1110B_PART_NO				0x1111</div><div class='add'>+#define SJA1110C_PART_NO				0x1112</div><div class='add'>+#define SJA1110D_PART_NO				0x1113</div><div class='add'>+</div><div class='add'>+#define SJA1110_ACU			0x1c4400</div><div class='add'>+#define SJA1110_RGU			0x1c6000</div><div class='add'>+#define SJA1110_CGU			0x1c6400</div><div class='add'>+</div><div class='add'>+#define SJA1110_SPI_ADDR(x)		((x) / 4)</div><div class='add'>+#define SJA1110_ACU_ADDR(x)		(SJA1110_ACU + SJA1110_SPI_ADDR(x))</div><div class='add'>+#define SJA1110_CGU_ADDR(x)		(SJA1110_CGU + SJA1110_SPI_ADDR(x))</div><div class='add'>+#define SJA1110_RGU_ADDR(x)		(SJA1110_RGU + SJA1110_SPI_ADDR(x))</div><div class='add'>+</div><div class='add'>+#define SJA1105_RSV_ADDR		0xffffffffffffffffull</div><div class='add'>+</div><div class='add'>+struct sja1105_schedule_entry {</div><div class='add'>+	u64 winstindex;</div><div class='add'>+	u64 winend;</div><div class='add'>+	u64 winst;</div><div class='add'>+	u64 destports;</div><div class='add'>+	u64 setvalid;</div><div class='add'>+	u64 txen;</div><div class='add'>+	u64 resmedia_en;</div><div class='add'>+	u64 resmedia;</div><div class='add'>+	u64 vlindex;</div><div class='add'>+	u64 delta;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_schedule_params_entry {</div><div class='add'>+	u64 subscheind[8];</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct sja1105_general_params_entry {</div><div class='ctx'> 	u64 vllupformat;</div><div class='hunk'>@@ -105,6 +214,21 @@ struct sja1105_general_params_entry {</div><div class='ctx'> 	u64 egrmirrpcp;</div><div class='ctx'> 	u64 egrmirrdei;</div><div class='ctx'> 	u64 replay_port;</div><div class='add'>+	/* SJA1110 only */</div><div class='add'>+	u64 tte_en;</div><div class='add'>+	u64 tdmaconfigidx;</div><div class='add'>+	u64 header_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_schedule_entry_points_entry {</div><div class='add'>+	u64 subschindx;</div><div class='add'>+	u64 delta;</div><div class='add'>+	u64 address;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_schedule_entry_points_params_entry {</div><div class='add'>+	u64 clksrc;</div><div class='add'>+	u64 actsubsch;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_vlan_lookup_entry {</div><div class='hunk'>@@ -114,6 +238,7 @@ struct sja1105_vlan_lookup_entry {</div><div class='ctx'> 	u64 vlan_bc;</div><div class='ctx'> 	u64 tag_port;</div><div class='ctx'> 	u64 vlanid;</div><div class='add'>+	u64 type_entry; /* SJA1110 only */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_l2_lookup_entry {</div><div class='hunk'>@@ -122,9 +247,42 @@ struct sja1105_l2_lookup_entry {</div><div class='ctx'> 	u64 destports;</div><div class='ctx'> 	u64 enfport;</div><div class='ctx'> 	u64 index;</div><div class='add'>+	/* P/Q/R/S only */</div><div class='add'>+	u64 mask_iotag;</div><div class='add'>+	u64 mask_vlanid;</div><div class='add'>+	u64 mask_macaddr;</div><div class='add'>+	u64 mask_srcport;</div><div class='add'>+	u64 iotag;</div><div class='add'>+	u64 srcport;</div><div class='add'>+	u64 lockeds;</div><div class='add'>+	union {</div><div class='add'>+		/* LOCKEDS=1: Static FDB entries */</div><div class='add'>+		struct {</div><div class='add'>+			/* TSREG is deprecated in SJA1110, TRAP is supported only</div><div class='add'>+			 * in SJA1110.</div><div class='add'>+			 */</div><div class='add'>+			u64 trap;</div><div class='add'>+			u64 tsreg;</div><div class='add'>+			u64 mirrvlan;</div><div class='add'>+			u64 takets;</div><div class='add'>+			u64 mirr;</div><div class='add'>+			u64 retag;</div><div class='add'>+		};</div><div class='add'>+		/* LOCKEDS=0: Dynamically learned FDB entries */</div><div class='add'>+		struct {</div><div class='add'>+			u64 touched;</div><div class='add'>+			u64 age;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_l2_lookup_params_entry {</div><div class='add'>+	u64 maxaddrp[SJA1105_MAX_NUM_PORTS]; /* P/Q/R/S only */</div><div class='add'>+	u64 start_dynspc;    /* P/Q/R/S only */</div><div class='add'>+	u64 drpnolearn;      /* P/Q/R/S only */</div><div class='add'>+	u64 use_static;      /* P/Q/R/S only */</div><div class='add'>+	u64 owr_dyn;         /* P/Q/R/S only */</div><div class='add'>+	u64 learn_once;      /* P/Q/R/S only */</div><div class='ctx'> 	u64 maxage;          /* Shared */</div><div class='ctx'> 	u64 dyn_tbsz;        /* E/T only */</div><div class='ctx'> 	u64 poly;            /* E/T only */</div><div class='hunk'>@@ -137,7 +295,9 @@ struct sja1105_l2_forwarding_entry {</div><div class='ctx'> 	u64 bc_domain;</div><div class='ctx'> 	u64 reach_port;</div><div class='ctx'> 	u64 fl_domain;</div><div class='del'>-	u64 vlan_pmap[8];</div><div class='add'>+	/* This is actually max(SJA1105_NUM_TC, SJA1105_MAX_NUM_PORTS) */</div><div class='add'>+	u64 vlan_pmap[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	bool type_egrpcp2outputq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_l2_forwarding_params_entry {</div><div class='hunk'>@@ -153,6 +313,12 @@ struct sja1105_l2_policing_entry {</div><div class='ctx'> 	u64 partition;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sja1105_avb_params_entry {</div><div class='add'>+	u64 cas_master;</div><div class='add'>+	u64 destmeta;</div><div class='add'>+	u64 srcmeta;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sja1105_mac_config_entry {</div><div class='ctx'> 	u64 top[8];</div><div class='ctx'> 	u64 base[8];</div><div class='hunk'>@@ -175,9 +341,87 @@ struct sja1105_mac_config_entry {</div><div class='ctx'> 	u64 ingress;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct sja1105_retagging_entry {</div><div class='add'>+	u64 egr_port;</div><div class='add'>+	u64 ing_port;</div><div class='add'>+	u64 vlan_ing;</div><div class='add'>+	u64 vlan_egr;</div><div class='add'>+	u64 do_not_learn;</div><div class='add'>+	u64 use_dest_ports;</div><div class='add'>+	u64 destports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_cbs_entry {</div><div class='add'>+	u64 port; /* Not used for SJA1110 */</div><div class='add'>+	u64 prio; /* Not used for SJA1110 */</div><div class='add'>+	u64 credit_hi;</div><div class='add'>+	u64 credit_lo;</div><div class='add'>+	u64 send_slope;</div><div class='add'>+	u64 idle_slope;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sja1105_xmii_params_entry {</div><div class='del'>-	u64 phy_mac[5];</div><div class='del'>-	u64 xmii_mode[5];</div><div class='add'>+	u64 phy_mac[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	u64 xmii_mode[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	/* The SJA1110 insists being a snowflake, and requires SGMII,</div><div class='add'>+	 * 2500base-x and internal MII ports connected to the 100base-TX PHY to</div><div class='add'>+	 * set this bit. We set it unconditionally from the high-level logic,</div><div class='add'>+	 * and only sja1110_xmii_params_entry_packing writes it to the static</div><div class='add'>+	 * config. I have no better name for it than "special".</div><div class='add'>+	 */</div><div class='add'>+	u64 special[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1110_pcp_remapping_entry {</div><div class='add'>+	u64 egrpcp[SJA1105_NUM_TC];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	SJA1105_VL_FORMAT_PSFP		= 0,</div><div class='add'>+	SJA1105_VL_FORMAT_ARINC664	= 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_vl_lookup_entry {</div><div class='add'>+	u64 format;</div><div class='add'>+	u64 port;</div><div class='add'>+	union {</div><div class='add'>+		/* SJA1105_VL_FORMAT_PSFP */</div><div class='add'>+		struct {</div><div class='add'>+			u64 destports;</div><div class='add'>+			u64 iscritical;</div><div class='add'>+			u64 macaddr;</div><div class='add'>+			u64 vlanid;</div><div class='add'>+			u64 vlanprior;</div><div class='add'>+		};</div><div class='add'>+		/* SJA1105_VL_FORMAT_ARINC664 */</div><div class='add'>+		struct {</div><div class='add'>+			u64 egrmirr;</div><div class='add'>+			u64 ingrmirr;</div><div class='add'>+			u64 vlid;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	/* Not part of hardware structure */</div><div class='add'>+	unsigned long flow_cookie;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_vl_policing_entry {</div><div class='add'>+	u64 type;</div><div class='add'>+	u64 maxlen;</div><div class='add'>+	u64 sharindx;</div><div class='add'>+	u64 bag;</div><div class='add'>+	u64 jitter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_vl_forwarding_entry {</div><div class='add'>+	u64 type;</div><div class='add'>+	u64 priority;</div><div class='add'>+	u64 partition;</div><div class='add'>+	u64 destports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_vl_forwarding_params_entry {</div><div class='add'>+	u64 partspc[8];</div><div class='add'>+	u64 debugen;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sja1105_table_header {</div><div class='hunk'>@@ -204,12 +448,13 @@ struct sja1105_static_config {</div><div class='ctx'> 	struct sja1105_table tables[BLK_IDX_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX];</div><div class='del'>-extern struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX];</div><div class='del'>-extern struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX];</div><div class='del'>-extern struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX];</div><div class='del'>-extern struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX];</div><div class='del'>-extern struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1105e_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1105t_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1105p_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1105q_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1105r_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1105s_table_ops[BLK_IDX_MAX];</div><div class='add'>+extern const struct sja1105_table_ops sja1110_table_ops[BLK_IDX_MAX];</div><div class='ctx'> </div><div class='ctx'> size_t sja1105_table_header_packing(void *buf, void *hdr, enum packing_op op);</div><div class='ctx'> void</div><div class='hunk'>@@ -219,6 +464,9 @@ sja1105_static_config_get_length(const struct sja1105_static_config *config);</div><div class='ctx'> </div><div class='ctx'> typedef enum {</div><div class='ctx'> 	SJA1105_CONFIG_OK = 0,</div><div class='add'>+	SJA1105_TTETHERNET_NOT_SUPPORTED,</div><div class='add'>+	SJA1105_INCORRECT_TTETHERNET_CONFIGURATION,</div><div class='add'>+	SJA1105_INCORRECT_VIRTUAL_LINK_CONFIGURATION,</div><div class='ctx'> 	SJA1105_MISSING_L2_POLICING_TABLE,</div><div class='ctx'> 	SJA1105_MISSING_L2_FORWARDING_TABLE,</div><div class='ctx'> 	SJA1105_MISSING_L2_FORWARDING_PARAMS_TABLE,</div><div class='hunk'>@@ -232,7 +480,8 @@ typedef enum {</div><div class='ctx'> extern const char *sja1105_static_config_error_msg[];</div><div class='ctx'> </div><div class='ctx'> sja1105_config_valid_t</div><div class='del'>-sja1105_static_config_check_valid(const struct sja1105_static_config *config);</div><div class='add'>+sja1105_static_config_check_valid(const struct sja1105_static_config *config,</div><div class='add'>+				  int max_mem);</div><div class='ctx'> void</div><div class='ctx'> sja1105_static_config_pack(void *buf, struct sja1105_static_config *config);</div><div class='ctx'> int sja1105_static_config_init(struct sja1105_static_config *config,</div><div class='hunk'>@@ -250,4 +499,50 @@ void sja1105_unpack(const void *buf, u64 *val, int start, int end, size_t len);</div><div class='ctx'> void sja1105_packing(void *buf, u64 *val, int start, int end,</div><div class='ctx'> 		     size_t len, enum packing_op op);</div><div class='ctx'> </div><div class='add'>+/* Common implementations for the static and dynamic configs */</div><div class='add'>+size_t sja1105pqrs_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						enum packing_op op);</div><div class='add'>+size_t sja1110_general_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op);</div><div class='add'>+size_t sja1105pqrs_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op);</div><div class='add'>+size_t sja1110_l2_lookup_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					      enum packing_op op);</div><div class='add'>+size_t sja1105_l2_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					   enum packing_op op);</div><div class='add'>+size_t sja1110_l2_forwarding_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					   enum packing_op op);</div><div class='add'>+size_t sja1105pqrs_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					   enum packing_op op);</div><div class='add'>+size_t sja1105et_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op);</div><div class='add'>+size_t sja1110_l2_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op);</div><div class='add'>+size_t sja1105_vlan_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op);</div><div class='add'>+size_t sja1110_vlan_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op);</div><div class='add'>+size_t sja1105_retagging_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op);</div><div class='add'>+size_t sja1110_retagging_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op);</div><div class='add'>+size_t sja1105pqrs_mac_config_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op);</div><div class='add'>+size_t sja1110_mac_config_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					enum packing_op op);</div><div class='add'>+size_t sja1105pqrs_avb_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					    enum packing_op op);</div><div class='add'>+size_t sja1105_vl_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op);</div><div class='add'>+size_t sja1110_vl_lookup_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+				       enum packing_op op);</div><div class='add'>+size_t sja1110_vl_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op);</div><div class='add'>+size_t sja1110_xmii_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op);</div><div class='add'>+size_t sja1110_l2_policing_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+					 enum packing_op op);</div><div class='add'>+size_t sja1110_l2_forwarding_params_entry_packing(void *buf, void *entry_ptr,</div><div class='add'>+						  enum packing_op op);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_tas.c b/drivers/net/dsa/sja1105/sja1105_tas.c<br/>new file mode 100644<br/>index 000000000000..d5949d2c3e71<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_tas.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_tas.c</a></div><div class='hunk'>@@ -0,0 +1,898 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_TAS_CLKSRC_DISABLED	0</div><div class='add'>+#define SJA1105_TAS_CLKSRC_STANDALONE	1</div><div class='add'>+#define SJA1105_TAS_CLKSRC_AS6802	2</div><div class='add'>+#define SJA1105_TAS_CLKSRC_PTP		3</div><div class='add'>+#define SJA1105_GATE_MASK		GENMASK_ULL(SJA1105_NUM_TC - 1, 0)</div><div class='add'>+</div><div class='add'>+#define work_to_sja1105_tas(d) \</div><div class='add'>+	container_of((d), struct sja1105_tas_data, tas_work)</div><div class='add'>+#define tas_to_sja1105(d) \</div><div class='add'>+	container_of((d), struct sja1105_private, tas_data)</div><div class='add'>+</div><div class='add'>+static int sja1105_tas_set_runtime_params(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	struct sja1105_gating_config *gating_cfg = &amp;tas_data-&gt;gating_cfg;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	s64 earliest_base_time = S64_MAX;</div><div class='add'>+	s64 latest_base_time = 0;</div><div class='add'>+	s64 its_cycle_time = 0;</div><div class='add'>+	s64 max_cycle_time = 0;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;enabled = false;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		const struct tc_taprio_qopt_offload *offload;</div><div class='add'>+</div><div class='add'>+		offload = tas_data-&gt;offload[port];</div><div class='add'>+		if (!offload)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tas_data-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+		if (max_cycle_time &lt; offload-&gt;cycle_time)</div><div class='add'>+			max_cycle_time = offload-&gt;cycle_time;</div><div class='add'>+		if (latest_base_time &lt; offload-&gt;base_time)</div><div class='add'>+			latest_base_time = offload-&gt;base_time;</div><div class='add'>+		if (earliest_base_time &gt; offload-&gt;base_time) {</div><div class='add'>+			earliest_base_time = offload-&gt;base_time;</div><div class='add'>+			its_cycle_time = offload-&gt;cycle_time;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;gating_cfg-&gt;entries)) {</div><div class='add'>+		tas_data-&gt;enabled = true;</div><div class='add'>+</div><div class='add'>+		if (max_cycle_time &lt; gating_cfg-&gt;cycle_time)</div><div class='add'>+			max_cycle_time = gating_cfg-&gt;cycle_time;</div><div class='add'>+		if (latest_base_time &lt; gating_cfg-&gt;base_time)</div><div class='add'>+			latest_base_time = gating_cfg-&gt;base_time;</div><div class='add'>+		if (earliest_base_time &gt; gating_cfg-&gt;base_time) {</div><div class='add'>+			earliest_base_time = gating_cfg-&gt;base_time;</div><div class='add'>+			its_cycle_time = gating_cfg-&gt;cycle_time;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tas_data-&gt;enabled)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Roll the earliest base time over until it is in a comparable</div><div class='add'>+	 * time base with the latest, then compare their deltas.</div><div class='add'>+	 * We want to enforce that all ports' base times are within</div><div class='add'>+	 * SJA1105_TAS_MAX_DELTA 200ns cycles of one another.</div><div class='add'>+	 */</div><div class='add'>+	earliest_base_time = future_base_time(earliest_base_time,</div><div class='add'>+					      its_cycle_time,</div><div class='add'>+					      latest_base_time);</div><div class='add'>+	while (earliest_base_time &gt; latest_base_time)</div><div class='add'>+		earliest_base_time -= its_cycle_time;</div><div class='add'>+	if (latest_base_time - earliest_base_time &gt;</div><div class='add'>+	    sja1105_delta_to_ns(SJA1105_TAS_MAX_DELTA)) {</div><div class='add'>+		dev_err(ds-&gt;dev,</div><div class='add'>+			"Base times too far apart: min %llu max %llu\n",</div><div class='add'>+			earliest_base_time, latest_base_time);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;earliest_base_time = earliest_base_time;</div><div class='add'>+	tas_data-&gt;max_cycle_time = max_cycle_time;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ds-&gt;dev, "earliest base time %lld ns\n", earliest_base_time);</div><div class='add'>+	dev_dbg(ds-&gt;dev, "latest base time %lld ns\n", latest_base_time);</div><div class='add'>+	dev_dbg(ds-&gt;dev, "longest cycle time %lld ns\n", max_cycle_time);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Lo and behold: the egress scheduler from hell.</div><div class='add'>+ *</div><div class='add'>+ * At the hardware level, the Time-Aware Shaper holds a global linear arrray of</div><div class='add'>+ * all schedule entries for all ports. These are the Gate Control List (GCL)</div><div class='add'>+ * entries, let's call them "timeslots" for short. This linear array of</div><div class='add'>+ * timeslots is held in BLK_IDX_SCHEDULE.</div><div class='add'>+ *</div><div class='add'>+ * Then there are a maximum of 8 "execution threads" inside the switch, which</div><div class='add'>+ * iterate cyclically through the "schedule". Each "cycle" has an entry point</div><div class='add'>+ * and an exit point, both being timeslot indices in the schedule table. The</div><div class='add'>+ * hardware calls each cycle a "subschedule".</div><div class='add'>+ *</div><div class='add'>+ * Subschedule (cycle) i starts when</div><div class='add'>+ *   ptpclkval &gt;= ptpschtm + BLK_IDX_SCHEDULE_ENTRY_POINTS[i].delta.</div><div class='add'>+ *</div><div class='add'>+ * The hardware scheduler iterates BLK_IDX_SCHEDULE with a k ranging from</div><div class='add'>+ *   k = BLK_IDX_SCHEDULE_ENTRY_POINTS[i].address to</div><div class='add'>+ *   k = BLK_IDX_SCHEDULE_PARAMS.subscheind[i]</div><div class='add'>+ *</div><div class='add'>+ * For each schedule entry (timeslot) k, the engine executes the gate control</div><div class='add'>+ * list entry for the duration of BLK_IDX_SCHEDULE[k].delta.</div><div class='add'>+ *</div><div class='add'>+ *         +---------+</div><div class='add'>+ *         |         | BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS</div><div class='add'>+ *         +---------+</div><div class='add'>+ *              |</div><div class='add'>+ *              +-----------------+</div><div class='add'>+ *                                | .actsubsch</div><div class='add'>+ *  BLK_IDX_SCHEDULE_ENTRY_POINTS v</div><div class='add'>+ *                 +-------+-------+</div><div class='add'>+ *                 |cycle 0|cycle 1|</div><div class='add'>+ *                 +-------+-------+</div><div class='add'>+ *                   |  |      |  |</div><div class='add'>+ *  +----------------+  |      |  +-------------------------------------+</div><div class='add'>+ *  |   .subschindx     |      |             .subschindx                |</div><div class='add'>+ *  |                   |      +---------------+                        |</div><div class='add'>+ *  |          .address |        .address      |                        |</div><div class='add'>+ *  |                   |                      |                        |</div><div class='add'>+ *  |                   |                      |                        |</div><div class='add'>+ *  |  BLK_IDX_SCHEDULE v                      v                        |</div><div class='add'>+ *  |              +-------+-------+-------+-------+-------+------+     |</div><div class='add'>+ *  |              |entry 0|entry 1|entry 2|entry 3|entry 4|entry5|     |</div><div class='add'>+ *  |              +-------+-------+-------+-------+-------+------+     |</div><div class='add'>+ *  |                                  ^                    ^  ^  ^     |</div><div class='add'>+ *  |                                  |                    |  |  |     |</div><div class='add'>+ *  |        +-------------------------+                    |  |  |     |</div><div class='add'>+ *  |        |              +-------------------------------+  |  |     |</div><div class='add'>+ *  |        |              |              +-------------------+  |     |</div><div class='add'>+ *  |        |              |              |                      |     |</div><div class='add'>+ *  | +---------------------------------------------------------------+ |</div><div class='add'>+ *  | |subscheind[0]&lt;=subscheind[1]&lt;=subscheind[2]&lt;=...&lt;=subscheind[7]| |</div><div class='add'>+ *  | +---------------------------------------------------------------+ |</div><div class='add'>+ *  |        ^              ^                BLK_IDX_SCHEDULE_PARAMS    |</div><div class='add'>+ *  |        |              |                                           |</div><div class='add'>+ *  +--------+              +-------------------------------------------+</div><div class='add'>+ *</div><div class='add'>+ *  In the above picture there are two subschedules (cycles):</div><div class='add'>+ *</div><div class='add'>+ *  - cycle 0: iterates the schedule table from 0 to 2 (and back)</div><div class='add'>+ *  - cycle 1: iterates the schedule table from 3 to 5 (and back)</div><div class='add'>+ *</div><div class='add'>+ *  All other possible execution threads must be marked as unused by making</div><div class='add'>+ *  their "subschedule end index" (subscheind) equal to the last valid</div><div class='add'>+ *  subschedule's end index (in this case 5).</div><div class='add'>+ */</div><div class='add'>+int sja1105_init_scheduling(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_schedule_entry_points_entry *schedule_entry_points;</div><div class='add'>+	struct sja1105_schedule_entry_points_params_entry</div><div class='add'>+					*schedule_entry_points_params;</div><div class='add'>+	struct sja1105_schedule_params_entry *schedule_params;</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	struct sja1105_gating_config *gating_cfg = &amp;tas_data-&gt;gating_cfg;</div><div class='add'>+	struct sja1105_schedule_entry *schedule;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int schedule_start_idx;</div><div class='add'>+	s64 entry_point_delta;</div><div class='add'>+	int schedule_end_idx;</div><div class='add'>+	int num_entries = 0;</div><div class='add'>+	int num_cycles = 0;</div><div class='add'>+	int cycle = 0;</div><div class='add'>+	int i, k = 0;</div><div class='add'>+	int port, rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_tas_set_runtime_params(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Discard previous Schedule Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard previous Schedule Entry Points Parameters Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard previous Schedule Parameters Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE_PARAMS];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard previous Schedule Entry Points Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE_ENTRY_POINTS];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Figure out the dimensioning of the problem */</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		if (tas_data-&gt;offload[port]) {</div><div class='add'>+			num_entries += tas_data-&gt;offload[port]-&gt;num_entries;</div><div class='add'>+			num_cycles++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;gating_cfg-&gt;entries)) {</div><div class='add'>+		num_entries += gating_cfg-&gt;num_entries;</div><div class='add'>+		num_cycles++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Nothing to do */</div><div class='add'>+	if (!num_cycles)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Pre-allocate space in the static config tables */</div><div class='add'>+</div><div class='add'>+	/* Schedule Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE];</div><div class='add'>+	table-&gt;entries = kcalloc(num_entries, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = num_entries;</div><div class='add'>+	schedule = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Schedule Points Parameters Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE_ENTRY_POINTS_PARAMS];</div><div class='add'>+	table-&gt;entries = kcalloc(SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT,</div><div class='add'>+				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		/* Previously allocated memory will be freed automatically in</div><div class='add'>+		 * sja1105_static_config_free. This is true for all early</div><div class='add'>+		 * returns below.</div><div class='add'>+		 */</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = SJA1105_MAX_SCHEDULE_ENTRY_POINTS_PARAMS_COUNT;</div><div class='add'>+	schedule_entry_points_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Schedule Parameters Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE_PARAMS];</div><div class='add'>+	table-&gt;entries = kcalloc(SJA1105_MAX_SCHEDULE_PARAMS_COUNT,</div><div class='add'>+				 table-&gt;ops-&gt;unpacked_entry_size, GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = SJA1105_MAX_SCHEDULE_PARAMS_COUNT;</div><div class='add'>+	schedule_params = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Schedule Entry Points Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_SCHEDULE_ENTRY_POINTS];</div><div class='add'>+	table-&gt;entries = kcalloc(num_cycles, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = num_cycles;</div><div class='add'>+	schedule_entry_points = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* Finally start populating the static config tables */</div><div class='add'>+	schedule_entry_points_params-&gt;clksrc = SJA1105_TAS_CLKSRC_PTP;</div><div class='add'>+	schedule_entry_points_params-&gt;actsubsch = num_cycles - 1;</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		const struct tc_taprio_qopt_offload *offload;</div><div class='add'>+		/* Relative base time */</div><div class='add'>+		s64 rbt;</div><div class='add'>+</div><div class='add'>+		offload = tas_data-&gt;offload[port];</div><div class='add'>+		if (!offload)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		schedule_start_idx = k;</div><div class='add'>+		schedule_end_idx = k + offload-&gt;num_entries - 1;</div><div class='add'>+		/* This is the base time expressed as a number of TAS ticks</div><div class='add'>+		 * relative to PTPSCHTM, which we'll (perhaps improperly) call</div><div class='add'>+		 * the operational base time.</div><div class='add'>+		 */</div><div class='add'>+		rbt = future_base_time(offload-&gt;base_time,</div><div class='add'>+				       offload-&gt;cycle_time,</div><div class='add'>+				       tas_data-&gt;earliest_base_time);</div><div class='add'>+		rbt -= tas_data-&gt;earliest_base_time;</div><div class='add'>+		/* UM10944.pdf 4.2.2. Schedule Entry Points table says that</div><div class='add'>+		 * delta cannot be zero, which is shitty. Advance all relative</div><div class='add'>+		 * base times by 1 TAS delta, so that even the earliest base</div><div class='add'>+		 * time becomes 1 in relative terms. Then start the operational</div><div class='add'>+		 * base time (PTPSCHTM) one TAS delta earlier than planned.</div><div class='add'>+		 */</div><div class='add'>+		entry_point_delta = ns_to_sja1105_delta(rbt) + 1;</div><div class='add'>+</div><div class='add'>+		schedule_entry_points[cycle].subschindx = cycle;</div><div class='add'>+		schedule_entry_points[cycle].delta = entry_point_delta;</div><div class='add'>+		schedule_entry_points[cycle].address = schedule_start_idx;</div><div class='add'>+</div><div class='add'>+		/* The subschedule end indices need to be</div><div class='add'>+		 * monotonically increasing.</div><div class='add'>+		 */</div><div class='add'>+		for (i = cycle; i &lt; 8; i++)</div><div class='add'>+			schedule_params-&gt;subscheind[i] = schedule_end_idx;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; offload-&gt;num_entries; i++, k++) {</div><div class='add'>+			s64 delta_ns = offload-&gt;entries[i].interval;</div><div class='add'>+</div><div class='add'>+			schedule[k].delta = ns_to_sja1105_delta(delta_ns);</div><div class='add'>+			schedule[k].destports = BIT(port);</div><div class='add'>+			schedule[k].resmedia_en = true;</div><div class='add'>+			schedule[k].resmedia = SJA1105_GATE_MASK &amp;</div><div class='add'>+					~offload-&gt;entries[i].gate_mask;</div><div class='add'>+		}</div><div class='add'>+		cycle++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!list_empty(&amp;gating_cfg-&gt;entries)) {</div><div class='add'>+		struct sja1105_gate_entry *e;</div><div class='add'>+</div><div class='add'>+		/* Relative base time */</div><div class='add'>+		s64 rbt;</div><div class='add'>+</div><div class='add'>+		schedule_start_idx = k;</div><div class='add'>+		schedule_end_idx = k + gating_cfg-&gt;num_entries - 1;</div><div class='add'>+		rbt = future_base_time(gating_cfg-&gt;base_time,</div><div class='add'>+				       gating_cfg-&gt;cycle_time,</div><div class='add'>+				       tas_data-&gt;earliest_base_time);</div><div class='add'>+		rbt -= tas_data-&gt;earliest_base_time;</div><div class='add'>+		entry_point_delta = ns_to_sja1105_delta(rbt) + 1;</div><div class='add'>+</div><div class='add'>+		schedule_entry_points[cycle].subschindx = cycle;</div><div class='add'>+		schedule_entry_points[cycle].delta = entry_point_delta;</div><div class='add'>+		schedule_entry_points[cycle].address = schedule_start_idx;</div><div class='add'>+</div><div class='add'>+		for (i = cycle; i &lt; 8; i++)</div><div class='add'>+			schedule_params-&gt;subscheind[i] = schedule_end_idx;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(e, &amp;gating_cfg-&gt;entries, list) {</div><div class='add'>+			schedule[k].delta = ns_to_sja1105_delta(e-&gt;interval);</div><div class='add'>+			schedule[k].destports = e-&gt;rule-&gt;vl.destports;</div><div class='add'>+			schedule[k].setvalid = true;</div><div class='add'>+			schedule[k].txen = true;</div><div class='add'>+			schedule[k].vlindex = e-&gt;rule-&gt;vl.sharindx;</div><div class='add'>+			schedule[k].winstindex = e-&gt;rule-&gt;vl.sharindx;</div><div class='add'>+			if (e-&gt;gate_state) /* Gate open */</div><div class='add'>+				schedule[k].winst = true;</div><div class='add'>+			else /* Gate closed */</div><div class='add'>+				schedule[k].winend = true;</div><div class='add'>+			k++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Be there 2 port subschedules, each executing an arbitrary number of gate</div><div class='add'>+ * open/close events cyclically.</div><div class='add'>+ * None of those gate events must ever occur at the exact same time, otherwise</div><div class='add'>+ * the switch is known to act in exotically strange ways.</div><div class='add'>+ * However the hardware doesn't bother performing these integrity checks.</div><div class='add'>+ * So here we are with the task of validating whether the new @admin offload</div><div class='add'>+ * has any conflict with the already established TAS configuration in</div><div class='add'>+ * tas_data-&gt;offload.  We already know the other ports are in harmony with one</div><div class='add'>+ * another, otherwise we wouldn't have saved them.</div><div class='add'>+ * Each gate event executes periodically, with a period of @cycle_time and a</div><div class='add'>+ * phase given by its cycle's @base_time plus its offset within the cycle</div><div class='add'>+ * (which in turn is given by the length of the events prior to it).</div><div class='add'>+ * There are two aspects to possible collisions:</div><div class='add'>+ * - Collisions within one cycle's (actually the longest cycle's) time frame.</div><div class='add'>+ *   For that, we need to compare the cartesian product of each possible</div><div class='add'>+ *   occurrence of each event within one cycle time.</div><div class='add'>+ * - Collisions in the future. Events may not collide within one cycle time,</div><div class='add'>+ *   but if two port schedules don't have the same periodicity (aka the cycle</div><div class='add'>+ *   times aren't multiples of one another), they surely will some time in the</div><div class='add'>+ *   future (actually they will collide an infinite amount of times).</div><div class='add'>+ */</div><div class='add'>+static bool</div><div class='add'>+sja1105_tas_check_conflicts(struct sja1105_private *priv, int port,</div><div class='add'>+			    const struct tc_taprio_qopt_offload *admin)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	const struct tc_taprio_qopt_offload *offload;</div><div class='add'>+	s64 max_cycle_time, min_cycle_time;</div><div class='add'>+	s64 delta1, delta2;</div><div class='add'>+	s64 rbt1, rbt2;</div><div class='add'>+	s64 stop_time;</div><div class='add'>+	s64 t1, t2;</div><div class='add'>+	int i, j;</div><div class='add'>+	s32 rem;</div><div class='add'>+</div><div class='add'>+	offload = tas_data-&gt;offload[port];</div><div class='add'>+	if (!offload)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Check if the two cycle times are multiples of one another.</div><div class='add'>+	 * If they aren't, then they will surely collide.</div><div class='add'>+	 */</div><div class='add'>+	max_cycle_time = max(offload-&gt;cycle_time, admin-&gt;cycle_time);</div><div class='add'>+	min_cycle_time = min(offload-&gt;cycle_time, admin-&gt;cycle_time);</div><div class='add'>+	div_s64_rem(max_cycle_time, min_cycle_time, &amp;rem);</div><div class='add'>+	if (rem)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Calculate the "reduced" base time of each of the two cycles</div><div class='add'>+	 * (transposed back as close to 0 as possible) by dividing to</div><div class='add'>+	 * the cycle time.</div><div class='add'>+	 */</div><div class='add'>+	div_s64_rem(offload-&gt;base_time, offload-&gt;cycle_time, &amp;rem);</div><div class='add'>+	rbt1 = rem;</div><div class='add'>+</div><div class='add'>+	div_s64_rem(admin-&gt;base_time, admin-&gt;cycle_time, &amp;rem);</div><div class='add'>+	rbt2 = rem;</div><div class='add'>+</div><div class='add'>+	stop_time = max_cycle_time + max(rbt1, rbt2);</div><div class='add'>+</div><div class='add'>+	/* delta1 is the relative base time of each GCL entry within</div><div class='add'>+	 * the established ports' TAS config.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, delta1 = 0;</div><div class='add'>+	     i &lt; offload-&gt;num_entries;</div><div class='add'>+	     delta1 += offload-&gt;entries[i].interval, i++) {</div><div class='add'>+		/* delta2 is the relative base time of each GCL entry</div><div class='add'>+		 * within the newly added TAS config.</div><div class='add'>+		 */</div><div class='add'>+		for (j = 0, delta2 = 0;</div><div class='add'>+		     j &lt; admin-&gt;num_entries;</div><div class='add'>+		     delta2 += admin-&gt;entries[j].interval, j++) {</div><div class='add'>+			/* t1 follows all possible occurrences of the</div><div class='add'>+			 * established ports' GCL entry i within the</div><div class='add'>+			 * first cycle time.</div><div class='add'>+			 */</div><div class='add'>+			for (t1 = rbt1 + delta1;</div><div class='add'>+			     t1 &lt;= stop_time;</div><div class='add'>+			     t1 += offload-&gt;cycle_time) {</div><div class='add'>+				/* t2 follows all possible occurrences</div><div class='add'>+				 * of the newly added GCL entry j</div><div class='add'>+				 * within the first cycle time.</div><div class='add'>+				 */</div><div class='add'>+				for (t2 = rbt2 + delta2;</div><div class='add'>+				     t2 &lt;= stop_time;</div><div class='add'>+				     t2 += admin-&gt;cycle_time) {</div><div class='add'>+					if (t1 == t2) {</div><div class='add'>+						dev_warn(priv-&gt;ds-&gt;dev,</div><div class='add'>+							 "GCL entry %d collides with entry %d of port %d\n",</div><div class='add'>+							 j, i, port);</div><div class='add'>+						return true;</div><div class='add'>+					}</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check the tc-taprio configuration on @port for conflicts with the tc-gate</div><div class='add'>+ * global subschedule. If @port is -1, check it against all ports.</div><div class='add'>+ * To reuse the sja1105_tas_check_conflicts logic without refactoring it,</div><div class='add'>+ * convert the gating configuration to a dummy tc-taprio offload structure.</div><div class='add'>+ */</div><div class='add'>+bool sja1105_gating_check_conflicts(struct sja1105_private *priv, int port,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_gating_config *gating_cfg = &amp;priv-&gt;tas_data.gating_cfg;</div><div class='add'>+	size_t num_entries = gating_cfg-&gt;num_entries;</div><div class='add'>+	struct tc_taprio_qopt_offload *dummy;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct sja1105_gate_entry *e;</div><div class='add'>+	bool conflict;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;gating_cfg-&gt;entries))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	dummy = kzalloc(struct_size(dummy, entries, num_entries), GFP_KERNEL);</div><div class='add'>+	if (!dummy) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to allocate memory");</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dummy-&gt;num_entries = num_entries;</div><div class='add'>+	dummy-&gt;base_time = gating_cfg-&gt;base_time;</div><div class='add'>+	dummy-&gt;cycle_time = gating_cfg-&gt;cycle_time;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(e, &amp;gating_cfg-&gt;entries, list)</div><div class='add'>+		dummy-&gt;entries[i++].interval = e-&gt;interval;</div><div class='add'>+</div><div class='add'>+	if (port != -1) {</div><div class='add'>+		conflict = sja1105_tas_check_conflicts(priv, port, dummy);</div><div class='add'>+	} else {</div><div class='add'>+		for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+			conflict = sja1105_tas_check_conflicts(priv, port,</div><div class='add'>+							       dummy);</div><div class='add'>+			if (conflict)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(dummy);</div><div class='add'>+</div><div class='add'>+	return conflict;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_setup_tc_taprio(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct tc_taprio_qopt_offload *admin)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	int other_port, rc, i;</div><div class='add'>+</div><div class='add'>+	/* Can't change an already configured port (must delete qdisc first).</div><div class='add'>+	 * Can't delete the qdisc from an unconfigured port.</div><div class='add'>+	 */</div><div class='add'>+	if ((!!tas_data-&gt;offload[port] &amp;&amp; admin-&gt;cmd == TAPRIO_CMD_REPLACE) ||</div><div class='add'>+	    (!tas_data-&gt;offload[port] &amp;&amp; admin-&gt;cmd == TAPRIO_CMD_DESTROY))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (admin-&gt;cmd == TAPRIO_CMD_DESTROY) {</div><div class='add'>+		taprio_offload_free(tas_data-&gt;offload[port]);</div><div class='add'>+		tas_data-&gt;offload[port] = NULL;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_init_scheduling(priv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		return sja1105_static_config_reload(priv, SJA1105_SCHEDULING);</div><div class='add'>+	} else if (admin-&gt;cmd != TAPRIO_CMD_REPLACE) {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The cycle time extension is the amount of time the last cycle from</div><div class='add'>+	 * the old OPER needs to be extended in order to phase-align with the</div><div class='add'>+	 * base time of the ADMIN when that becomes the new OPER.</div><div class='add'>+	 * But of course our switch needs to be reset to switch-over between</div><div class='add'>+	 * the ADMIN and the OPER configs - so much for a seamless transition.</div><div class='add'>+	 * So don't add insult over injury and just say we don't support cycle</div><div class='add'>+	 * time extension.</div><div class='add'>+	 */</div><div class='add'>+	if (admin-&gt;cycle_time_extension)</div><div class='add'>+		return -ENOTSUPP;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; admin-&gt;num_entries; i++) {</div><div class='add'>+		s64 delta_ns = admin-&gt;entries[i].interval;</div><div class='add'>+		s64 delta_cycles = ns_to_sja1105_delta(delta_ns);</div><div class='add'>+		bool too_long, too_short;</div><div class='add'>+</div><div class='add'>+		too_long = (delta_cycles &gt;= SJA1105_TAS_MAX_DELTA);</div><div class='add'>+		too_short = (delta_cycles == 0);</div><div class='add'>+		if (too_long || too_short) {</div><div class='add'>+			dev_err(priv-&gt;ds-&gt;dev,</div><div class='add'>+				"Interval %llu too %s for GCL entry %d\n",</div><div class='add'>+				delta_ns, too_long ? "long" : "short", i);</div><div class='add'>+			return -ERANGE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (other_port = 0; other_port &lt; ds-&gt;num_ports; other_port++) {</div><div class='add'>+		if (other_port == port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (sja1105_tas_check_conflicts(priv, other_port, admin))</div><div class='add'>+			return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sja1105_gating_check_conflicts(priv, port, NULL)) {</div><div class='add'>+		dev_err(ds-&gt;dev, "Conflict with tc-gate schedule\n");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;offload[port] = taprio_offload_get(admin);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_init_scheduling(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_reload(priv, SJA1105_SCHEDULING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_tas_check_running(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct sja1105_ptp_cmd cmd = {0};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_commit(ds, &amp;cmd, SPI_READ);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (cmd.ptpstrtsch == 1)</div><div class='add'>+		/* Schedule successfully started */</div><div class='add'>+		tas_data-&gt;state = SJA1105_TAS_STATE_RUNNING;</div><div class='add'>+	else if (cmd.ptpstopsch == 1)</div><div class='add'>+		/* Schedule is stopped */</div><div class='add'>+		tas_data-&gt;state = SJA1105_TAS_STATE_DISABLED;</div><div class='add'>+	else</div><div class='add'>+		/* Schedule is probably not configured with PTP clock source */</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write to PTPCLKCORP */</div><div class='add'>+static int sja1105_tas_adjust_drift(struct sja1105_private *priv,</div><div class='add'>+				    u64 correction)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u32 ptpclkcorp = ns_to_sja1105_ticks(correction);</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u32(priv, SPI_WRITE, regs-&gt;ptpclkcorp,</div><div class='add'>+				&amp;ptpclkcorp, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Write to PTPSCHTM */</div><div class='add'>+static int sja1105_tas_set_base_time(struct sja1105_private *priv,</div><div class='add'>+				     u64 base_time)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u64 ptpschtm = ns_to_sja1105_ticks(base_time);</div><div class='add'>+</div><div class='add'>+	return sja1105_xfer_u64(priv, SPI_WRITE, regs-&gt;ptpschtm,</div><div class='add'>+				&amp;ptpschtm, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_tas_start(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	struct sja1105_ptp_cmd *cmd = &amp;priv-&gt;ptp_data.cmd;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ds-&gt;dev, "Starting the TAS\n");</div><div class='add'>+</div><div class='add'>+	if (tas_data-&gt;state == SJA1105_TAS_STATE_ENABLED_NOT_RUNNING ||</div><div class='add'>+	    tas_data-&gt;state == SJA1105_TAS_STATE_RUNNING) {</div><div class='add'>+		dev_err(ds-&gt;dev, "TAS already started\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ptpstrtsch = 1;</div><div class='add'>+	cmd-&gt;ptpstopsch = 0;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_commit(ds, cmd, SPI_WRITE);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;state = SJA1105_TAS_STATE_ENABLED_NOT_RUNNING;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_tas_stop(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+	struct sja1105_ptp_cmd *cmd = &amp;priv-&gt;ptp_data.cmd;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	dev_dbg(ds-&gt;dev, "Stopping the TAS\n");</div><div class='add'>+</div><div class='add'>+	if (tas_data-&gt;state == SJA1105_TAS_STATE_DISABLED) {</div><div class='add'>+		dev_err(ds-&gt;dev, "TAS already disabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cmd-&gt;ptpstopsch = 1;</div><div class='add'>+	cmd-&gt;ptpstrtsch = 0;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_ptp_commit(ds, cmd, SPI_WRITE);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;state = SJA1105_TAS_STATE_DISABLED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The schedule engine and the PTP clock are driven by the same oscillator, and</div><div class='add'>+ * they run in parallel. But whilst the PTP clock can keep an absolute</div><div class='add'>+ * time-of-day, the schedule engine is only running in 'ticks' (25 ticks make</div><div class='add'>+ * up a delta, which is 200ns), and wrapping around at the end of each cycle.</div><div class='add'>+ * The schedule engine is started when the PTP clock reaches the PTPSCHTM time</div><div class='add'>+ * (in PTP domain).</div><div class='add'>+ * Because the PTP clock can be rate-corrected (accelerated or slowed down) by</div><div class='add'>+ * a software servo, and the schedule engine clock runs in parallel to the PTP</div><div class='add'>+ * clock, there is logic internal to the switch that periodically keeps the</div><div class='add'>+ * schedule engine from drifting away. The frequency with which this internal</div><div class='add'>+ * syntonization happens is the PTP clock correction period (PTPCLKCORP). It is</div><div class='add'>+ * a value also in the PTP clock domain, and is also rate-corrected.</div><div class='add'>+ * To be precise, during a correction period, there is logic to determine by</div><div class='add'>+ * how many scheduler clock ticks has the PTP clock drifted. At the end of each</div><div class='add'>+ * correction period/beginning of new one, the length of a delta is shrunk or</div><div class='add'>+ * expanded with an integer number of ticks, compared with the typical 25.</div><div class='add'>+ * So a delta lasts for 200ns (or 25 ticks) only on average.</div><div class='add'>+ * Sometimes it is longer, sometimes it is shorter. The internal syntonization</div><div class='add'>+ * logic can adjust for at most 5 ticks each 20 ticks.</div><div class='add'>+ *</div><div class='add'>+ * The first implication is that you should choose your schedule correction</div><div class='add'>+ * period to be an integer multiple of the schedule length. Preferably one.</div><div class='add'>+ * In case there are schedules of multiple ports active, then the correction</div><div class='add'>+ * period needs to be a multiple of them all. Given the restriction that the</div><div class='add'>+ * cycle times have to be multiples of one another anyway, this means the</div><div class='add'>+ * correction period can simply be the largest cycle time, hence the current</div><div class='add'>+ * choice. This way, the updates are always synchronous to the transmission</div><div class='add'>+ * cycle, and therefore predictable.</div><div class='add'>+ *</div><div class='add'>+ * The second implication is that at the beginning of a correction period, the</div><div class='add'>+ * first few deltas will be modulated in time, until the schedule engine is</div><div class='add'>+ * properly phase-aligned with the PTP clock. For this reason, you should place</div><div class='add'>+ * your best-effort traffic at the beginning of a cycle, and your</div><div class='add'>+ * time-triggered traffic afterwards.</div><div class='add'>+ *</div><div class='add'>+ * The third implication is that once the schedule engine is started, it can</div><div class='add'>+ * only adjust for so much drift within a correction period. In the servo you</div><div class='add'>+ * can only change the PTPCLKRATE, but not step the clock (PTPCLKADD). If you</div><div class='add'>+ * want to do the latter, you need to stop and restart the schedule engine,</div><div class='add'>+ * which is what the state machine handles.</div><div class='add'>+ */</div><div class='add'>+static void sja1105_tas_state_machine(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_tas_data *tas_data = work_to_sja1105_tas(work);</div><div class='add'>+	struct sja1105_private *priv = tas_to_sja1105(tas_data);</div><div class='add'>+	struct sja1105_ptp_data *ptp_data = &amp;priv-&gt;ptp_data;</div><div class='add'>+	struct timespec64 base_time_ts, now_ts;</div><div class='add'>+	struct dsa_switch *ds = priv-&gt;ds;</div><div class='add'>+	struct timespec64 diff;</div><div class='add'>+	s64 base_time, now;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ptp_data-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (tas_data-&gt;state) {</div><div class='add'>+	case SJA1105_TAS_STATE_DISABLED:</div><div class='add'>+		/* Can't do anything at all if clock is still being stepped */</div><div class='add'>+		if (tas_data-&gt;last_op != SJA1105_PTP_ADJUSTFREQ)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_tas_adjust_drift(priv, tas_data-&gt;max_cycle_time);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rc = __sja1105_ptp_gettimex(ds, &amp;now, NULL);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Plan to start the earliest schedule first. The others</div><div class='add'>+		 * will be started in hardware, by way of their respective</div><div class='add'>+		 * entry points delta.</div><div class='add'>+		 * Try our best to avoid fringe cases (race condition between</div><div class='add'>+		 * ptpschtm and ptpstrtsch) by pushing the oper_base_time at</div><div class='add'>+		 * least one second in the future from now. This is not ideal,</div><div class='add'>+		 * but this only needs to buy us time until the</div><div class='add'>+		 * sja1105_tas_start command below gets executed.</div><div class='add'>+		 */</div><div class='add'>+		base_time = future_base_time(tas_data-&gt;earliest_base_time,</div><div class='add'>+					     tas_data-&gt;max_cycle_time,</div><div class='add'>+					     now + 1ull * NSEC_PER_SEC);</div><div class='add'>+		base_time -= sja1105_delta_to_ns(1);</div><div class='add'>+</div><div class='add'>+		rc = sja1105_tas_set_base_time(priv, base_time);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		tas_data-&gt;oper_base_time = base_time;</div><div class='add'>+</div><div class='add'>+		rc = sja1105_tas_start(priv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		base_time_ts = ns_to_timespec64(base_time);</div><div class='add'>+		now_ts = ns_to_timespec64(now);</div><div class='add'>+</div><div class='add'>+		dev_dbg(ds-&gt;dev, "OPER base time %ptSp (now %ptSp)\n",</div><div class='add'>+			&amp;base_time_ts, &amp;now_ts);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SJA1105_TAS_STATE_ENABLED_NOT_RUNNING:</div><div class='add'>+		if (tas_data-&gt;last_op != SJA1105_PTP_ADJUSTFREQ) {</div><div class='add'>+			/* Clock was stepped.. bad news for TAS */</div><div class='add'>+			sja1105_tas_stop(priv);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if TAS has actually started, by comparing the</div><div class='add'>+		 * scheduled start time with the SJA1105 PTP clock</div><div class='add'>+		 */</div><div class='add'>+		rc = __sja1105_ptp_gettimex(ds, &amp;now, NULL);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (now &lt; tas_data-&gt;oper_base_time) {</div><div class='add'>+			/* TAS has not started yet */</div><div class='add'>+			diff = ns_to_timespec64(tas_data-&gt;oper_base_time - now);</div><div class='add'>+			dev_dbg(ds-&gt;dev, "time to start: [%ptSp]", &amp;diff);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Time elapsed, what happened? */</div><div class='add'>+		rc = sja1105_tas_check_running(priv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (tas_data-&gt;state != SJA1105_TAS_STATE_RUNNING)</div><div class='add'>+			/* TAS has started */</div><div class='add'>+			dev_err(ds-&gt;dev,</div><div class='add'>+				"TAS not started despite time elapsed\n");</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case SJA1105_TAS_STATE_RUNNING:</div><div class='add'>+		/* Clock was stepped.. bad news for TAS */</div><div class='add'>+		if (tas_data-&gt;last_op != SJA1105_PTP_ADJUSTFREQ) {</div><div class='add'>+			sja1105_tas_stop(priv);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rc = sja1105_tas_check_running(priv);</div><div class='add'>+		if (rc &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (tas_data-&gt;state != SJA1105_TAS_STATE_RUNNING)</div><div class='add'>+			dev_err(ds-&gt;dev, "TAS surprisingly stopped\n");</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			dev_err(ds-&gt;dev, "TAS in an invalid state (incorrect use of API)!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc &amp;&amp; net_ratelimit())</div><div class='add'>+		dev_err(ds-&gt;dev, "An operation returned %d\n", rc);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ptp_data-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_tas_clockstep(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+</div><div class='add'>+	if (!tas_data-&gt;enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;last_op = SJA1105_PTP_CLOCKSTEP;</div><div class='add'>+	schedule_work(&amp;tas_data-&gt;tas_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_tas_adjfreq(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+</div><div class='add'>+	if (!tas_data-&gt;enabled)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* No reason to schedule the workqueue, nothing changed */</div><div class='add'>+	if (tas_data-&gt;state == SJA1105_TAS_STATE_RUNNING)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tas_data-&gt;last_op = SJA1105_PTP_ADJUSTFREQ;</div><div class='add'>+	schedule_work(&amp;tas_data-&gt;tas_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_tas_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct sja1105_tas_data *tas_data = &amp;priv-&gt;tas_data;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;tas_data-&gt;tas_work, sja1105_tas_state_machine);</div><div class='add'>+	tas_data-&gt;state = SJA1105_TAS_STATE_DISABLED;</div><div class='add'>+	tas_data-&gt;last_op = SJA1105_PTP_NONE;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;tas_data-&gt;gating_cfg.entries);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void sja1105_tas_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_private *priv = ds-&gt;priv;</div><div class='add'>+	struct tc_taprio_qopt_offload *offload;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;priv-&gt;tas_data.tas_work);</div><div class='add'>+</div><div class='add'>+	for (port = 0; port &lt; ds-&gt;num_ports; port++) {</div><div class='add'>+		offload = priv-&gt;tas_data.offload[port];</div><div class='add'>+		if (!offload)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		taprio_offload_free(offload);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_tas.h b/drivers/net/dsa/sja1105/sja1105_tas.h<br/>new file mode 100644<br/>index 000000000000..c05bd07e8221<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_tas.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_tas.h</a></div><div class='hunk'>@@ -0,0 +1,104 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2019, Vladimir Oltean &lt;olteanv@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+#ifndef _SJA1105_TAS_H</div><div class='add'>+#define _SJA1105_TAS_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+</div><div class='add'>+#define SJA1105_TAS_MAX_DELTA		BIT(18)</div><div class='add'>+</div><div class='add'>+struct sja1105_private;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_SJA1105_TAS)</div><div class='add'>+</div><div class='add'>+enum sja1105_tas_state {</div><div class='add'>+	SJA1105_TAS_STATE_DISABLED,</div><div class='add'>+	SJA1105_TAS_STATE_ENABLED_NOT_RUNNING,</div><div class='add'>+	SJA1105_TAS_STATE_RUNNING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sja1105_ptp_op {</div><div class='add'>+	SJA1105_PTP_NONE,</div><div class='add'>+	SJA1105_PTP_CLOCKSTEP,</div><div class='add'>+	SJA1105_PTP_ADJUSTFREQ,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_gate_entry {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct sja1105_rule *rule;</div><div class='add'>+	s64 interval;</div><div class='add'>+	u8 gate_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_gating_config {</div><div class='add'>+	u64 cycle_time;</div><div class='add'>+	s64 base_time;</div><div class='add'>+	int num_entries;</div><div class='add'>+	struct list_head entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sja1105_tas_data {</div><div class='add'>+	struct tc_taprio_qopt_offload *offload[SJA1105_MAX_NUM_PORTS];</div><div class='add'>+	struct sja1105_gating_config gating_cfg;</div><div class='add'>+	enum sja1105_tas_state state;</div><div class='add'>+	enum sja1105_ptp_op last_op;</div><div class='add'>+	struct work_struct tas_work;</div><div class='add'>+	s64 earliest_base_time;</div><div class='add'>+	s64 oper_base_time;</div><div class='add'>+	u64 max_cycle_time;</div><div class='add'>+	bool enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int sja1105_setup_tc_taprio(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct tc_taprio_qopt_offload *admin);</div><div class='add'>+</div><div class='add'>+void sja1105_tas_setup(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+void sja1105_tas_teardown(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+void sja1105_tas_clockstep(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+void sja1105_tas_adjfreq(struct dsa_switch *ds);</div><div class='add'>+</div><div class='add'>+bool sja1105_gating_check_conflicts(struct sja1105_private *priv, int port,</div><div class='add'>+				    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int sja1105_init_scheduling(struct sja1105_private *priv);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+/* C doesn't allow empty structures, bah! */</div><div class='add'>+struct sja1105_tas_data {</div><div class='add'>+	u8 dummy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int sja1105_setup_tc_taprio(struct dsa_switch *ds, int port,</div><div class='add'>+					  struct tc_taprio_qopt_offload *admin)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void sja1105_tas_setup(struct dsa_switch *ds) { }</div><div class='add'>+</div><div class='add'>+static inline void sja1105_tas_teardown(struct dsa_switch *ds) { }</div><div class='add'>+</div><div class='add'>+static inline void sja1105_tas_clockstep(struct dsa_switch *ds) { }</div><div class='add'>+</div><div class='add'>+static inline void sja1105_tas_adjfreq(struct dsa_switch *ds) { }</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+sja1105_gating_check_conflicts(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sja1105_init_scheduling(struct sja1105_private *priv)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NET_DSA_SJA1105_TAS) */</div><div class='add'>+</div><div class='add'>+#endif /* _SJA1105_TAS_H */</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_vl.c b/drivers/net/dsa/sja1105/sja1105_vl.c<br/>new file mode 100644<br/>index 000000000000..b7e95d60a6e4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_vl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_vl.c</a></div><div class='hunk'>@@ -0,0 +1,802 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright 2020 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;net/tc_act/tc_gate.h&gt;</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+#include "sja1105_vl.h"</div><div class='add'>+</div><div class='add'>+#define SJA1105_SIZE_VL_STATUS			8</div><div class='add'>+</div><div class='add'>+/* Insert into the global gate list, sorted by gate action time. */</div><div class='add'>+static int sja1105_insert_gate_entry(struct sja1105_gating_config *gating_cfg,</div><div class='add'>+				     struct sja1105_rule *rule,</div><div class='add'>+				     u8 gate_state, s64 entry_time,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_gate_entry *e;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	e = kzalloc(sizeof(*e), GFP_KERNEL);</div><div class='add'>+	if (!e)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	e-&gt;rule = rule;</div><div class='add'>+	e-&gt;gate_state = gate_state;</div><div class='add'>+	e-&gt;interval = entry_time;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;gating_cfg-&gt;entries)) {</div><div class='add'>+		list_add(&amp;e-&gt;list, &amp;gating_cfg-&gt;entries);</div><div class='add'>+	} else {</div><div class='add'>+		struct sja1105_gate_entry *p;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(p, &amp;gating_cfg-&gt;entries, list) {</div><div class='add'>+			if (p-&gt;interval == e-&gt;interval) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Gate conflict");</div><div class='add'>+				rc = -EBUSY;</div><div class='add'>+				goto err;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (e-&gt;interval &lt; p-&gt;interval)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		list_add(&amp;e-&gt;list, p-&gt;list.prev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	gating_cfg-&gt;num_entries++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	kfree(e);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The gate entries contain absolute times in their e-&gt;interval field. Convert</div><div class='add'>+ * that to proper intervals (i.e. "0, 5, 10, 15" to "5, 5, 5, 5").</div><div class='add'>+ */</div><div class='add'>+static void</div><div class='add'>+sja1105_gating_cfg_time_to_interval(struct sja1105_gating_config *gating_cfg,</div><div class='add'>+				    u64 cycle_time)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_gate_entry *last_e;</div><div class='add'>+	struct sja1105_gate_entry *e;</div><div class='add'>+	struct list_head *prev;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(e, &amp;gating_cfg-&gt;entries, list) {</div><div class='add'>+		struct sja1105_gate_entry *p;</div><div class='add'>+</div><div class='add'>+		prev = e-&gt;list.prev;</div><div class='add'>+</div><div class='add'>+		if (prev == &amp;gating_cfg-&gt;entries)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		p = list_entry(prev, struct sja1105_gate_entry, list);</div><div class='add'>+		p-&gt;interval = e-&gt;interval - p-&gt;interval;</div><div class='add'>+	}</div><div class='add'>+	last_e = list_last_entry(&amp;gating_cfg-&gt;entries,</div><div class='add'>+				 struct sja1105_gate_entry, list);</div><div class='add'>+	last_e-&gt;interval = cycle_time - last_e-&gt;interval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void sja1105_free_gating_config(struct sja1105_gating_config *gating_cfg)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_gate_entry *e, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(e, n, &amp;gating_cfg-&gt;entries, list) {</div><div class='add'>+		list_del(&amp;e-&gt;list);</div><div class='add'>+		kfree(e);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_compose_gating_subschedule(struct sja1105_private *priv,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_gating_config *gating_cfg = &amp;priv-&gt;tas_data.gating_cfg;</div><div class='add'>+	struct sja1105_rule *rule;</div><div class='add'>+	s64 max_cycle_time = 0;</div><div class='add'>+	s64 its_base_time = 0;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	sja1105_free_gating_config(gating_cfg);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;flow_block.rules, list) {</div><div class='add'>+		if (rule-&gt;type != SJA1105_RULE_VL)</div><div class='add'>+			continue;</div><div class='add'>+		if (rule-&gt;vl.type != SJA1105_VL_TIME_TRIGGERED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (max_cycle_time &lt; rule-&gt;vl.cycle_time) {</div><div class='add'>+			max_cycle_time = rule-&gt;vl.cycle_time;</div><div class='add'>+			its_base_time = rule-&gt;vl.base_time;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!max_cycle_time)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(priv-&gt;ds-&gt;dev, "max_cycle_time %lld its_base_time %lld\n",</div><div class='add'>+		max_cycle_time, its_base_time);</div><div class='add'>+</div><div class='add'>+	gating_cfg-&gt;base_time = its_base_time;</div><div class='add'>+	gating_cfg-&gt;cycle_time = max_cycle_time;</div><div class='add'>+	gating_cfg-&gt;num_entries = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;flow_block.rules, list) {</div><div class='add'>+		s64 time;</div><div class='add'>+		s64 rbt;</div><div class='add'>+</div><div class='add'>+		if (rule-&gt;type != SJA1105_RULE_VL)</div><div class='add'>+			continue;</div><div class='add'>+		if (rule-&gt;vl.type != SJA1105_VL_TIME_TRIGGERED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Calculate the difference between this gating schedule's</div><div class='add'>+		 * base time, and the base time of the gating schedule with the</div><div class='add'>+		 * longest cycle time. We call it the relative base time (rbt).</div><div class='add'>+		 */</div><div class='add'>+		rbt = future_base_time(rule-&gt;vl.base_time, rule-&gt;vl.cycle_time,</div><div class='add'>+				       its_base_time);</div><div class='add'>+		rbt -= its_base_time;</div><div class='add'>+</div><div class='add'>+		time = rbt;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; rule-&gt;vl.num_entries; i++) {</div><div class='add'>+			u8 gate_state = rule-&gt;vl.entries[i].gate_state;</div><div class='add'>+			s64 entry_time = time;</div><div class='add'>+</div><div class='add'>+			while (entry_time &lt; max_cycle_time) {</div><div class='add'>+				rc = sja1105_insert_gate_entry(gating_cfg, rule,</div><div class='add'>+							       gate_state,</div><div class='add'>+							       entry_time,</div><div class='add'>+							       extack);</div><div class='add'>+				if (rc)</div><div class='add'>+					goto err;</div><div class='add'>+</div><div class='add'>+				entry_time += rule-&gt;vl.cycle_time;</div><div class='add'>+			}</div><div class='add'>+			time += rule-&gt;vl.entries[i].interval;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sja1105_gating_cfg_time_to_interval(gating_cfg, max_cycle_time);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+err:</div><div class='add'>+	sja1105_free_gating_config(gating_cfg);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The switch flow classification core implements TTEthernet, which 'thinks' in</div><div class='add'>+ * terms of Virtual Links (VL), a concept borrowed from ARINC 664 part 7.</div><div class='add'>+ * However it also has one other operating mode (VLLUPFORMAT=0) where it acts</div><div class='add'>+ * somewhat closer to a pre-standard implementation of IEEE 802.1Qci</div><div class='add'>+ * (Per-Stream Filtering and Policing), which is what the driver is going to be</div><div class='add'>+ * implementing.</div><div class='add'>+ *</div><div class='add'>+ *                                 VL Lookup</div><div class='add'>+ *        Key = {DMAC &amp;&amp; VLANID   +---------+  Key = { (DMAC[47:16] &amp; VLMASK ==</div><div class='add'>+ *               &amp;&amp; VLAN PCP      |         |                         VLMARKER)</div><div class='add'>+ *               &amp;&amp; INGRESS PORT} +---------+                      (both fixed)</div><div class='add'>+ *            (exact match,            |             &amp;&amp; DMAC[15:0] == VLID</div><div class='add'>+ *         all specified in rule)      |                    (specified in rule)</div><div class='add'>+ *                                     v             &amp;&amp; INGRESS PORT }</div><div class='add'>+ *                               ------------</div><div class='add'>+ *                    0 (PSFP)  /            \  1 (ARINC664)</div><div class='add'>+ *                 +-----------/  VLLUPFORMAT \----------+</div><div class='add'>+ *                 |           \    (fixed)   /          |</div><div class='add'>+ *                 |            \            /           |</div><div class='add'>+ *  0 (forwarding) v             ------------            |</div><div class='add'>+ *           ------------                                |</div><div class='add'>+ *          /            \  1 (QoS classification)       |</div><div class='add'>+ *     +---/  ISCRITICAL  \-----------+                  |</div><div class='add'>+ *     |   \  (per rule)  /           |                  |</div><div class='add'>+ *     |    \            /   VLID taken from      VLID taken from</div><div class='add'>+ *     v     ------------     index of rule       contents of rule</div><div class='add'>+ *  select                     that matched         that matched</div><div class='add'>+ * DESTPORTS                          |                  |</div><div class='add'>+ *  |                                 +---------+--------+</div><div class='add'>+ *  |                                           |</div><div class='add'>+ *  |                                           v</div><div class='add'>+ *  |                                     VL Forwarding</div><div class='add'>+ *  |                                   (indexed by VLID)</div><div class='add'>+ *  |                                      +---------+</div><div class='add'>+ *  |                       +--------------|         |</div><div class='add'>+ *  |                       |  select TYPE +---------+</div><div class='add'>+ *  |                       v</div><div class='add'>+ *  |   0 (rate      ------------    1 (time</div><div class='add'>+ *  |  constrained) /            \   triggered)</div><div class='add'>+ *  |       +------/     TYPE     \------------+</div><div class='add'>+ *  |       |      \  (per VLID)  /            |</div><div class='add'>+ *  |       v       \            /             v</div><div class='add'>+ *  |  VL Policing   ------------         VL Policing</div><div class='add'>+ *  | (indexed by VLID)                (indexed by VLID)</div><div class='add'>+ *  |  +---------+                        +---------+</div><div class='add'>+ *  |  | TYPE=0  |                        | TYPE=1  |</div><div class='add'>+ *  |  +---------+                        +---------+</div><div class='add'>+ *  |  select SHARINDX                 select SHARINDX to</div><div class='add'>+ *  |  to rate-limit                 re-enter VL Forwarding</div><div class='add'>+ *  |  groups of VL's               with new VLID for egress</div><div class='add'>+ *  |  to same quota                           |</div><div class='add'>+ *  |       |                                  |</div><div class='add'>+ *  |  select MAXLEN -&gt; exceed =&gt; drop    select MAXLEN -&gt; exceed =&gt; drop</div><div class='add'>+ *  |       |                                  |</div><div class='add'>+ *  |       v                                  v</div><div class='add'>+ *  |  VL Forwarding                      VL Forwarding</div><div class='add'>+ *  | (indexed by SHARINDX)             (indexed by SHARINDX)</div><div class='add'>+ *  |  +---------+                        +---------+</div><div class='add'>+ *  |  | TYPE=0  |                        | TYPE=1  |</div><div class='add'>+ *  |  +---------+                        +---------+</div><div class='add'>+ *  |  select PRIORITY,                 select PRIORITY,</div><div class='add'>+ *  | PARTITION, DESTPORTS            PARTITION, DESTPORTS</div><div class='add'>+ *  |       |                                  |</div><div class='add'>+ *  |       v                                  v</div><div class='add'>+ *  |  VL Policing                        VL Policing</div><div class='add'>+ *  | (indexed by SHARINDX)           (indexed by SHARINDX)</div><div class='add'>+ *  |  +---------+                        +---------+</div><div class='add'>+ *  |  | TYPE=0  |                        | TYPE=1  |</div><div class='add'>+ *  |  +---------+                        +---------+</div><div class='add'>+ *  |       |                                  |</div><div class='add'>+ *  |       v                                  |</div><div class='add'>+ *  |  select BAG, -&gt; exceed =&gt; drop           |</div><div class='add'>+ *  |    JITTER                                v</div><div class='add'>+ *  |       |             ----------------------------------------------</div><div class='add'>+ *  |       |            /    Reception Window is open for this VL      \</div><div class='add'>+ *  |       |           /    (the Schedule Table executes an entry i     \</div><div class='add'>+ *  |       |          /   M &lt;= i &lt; N, for which these conditions hold):  \ no</div><div class='add'>+ *  |       |    +----/                                                    \-+</div><div class='add'>+ *  |       |    |yes \       WINST[M] == 1 &amp;&amp; WINSTINDEX[M] == VLID       / |</div><div class='add'>+ *  |       |    |     \     WINEND[N] == 1 &amp;&amp; WINSTINDEX[N] == VLID      /  |</div><div class='add'>+ *  |       |    |      \                                                /   |</div><div class='add'>+ *  |       |    |       \ (the VL window has opened and not yet closed)/    |</div><div class='add'>+ *  |       |    |        ----------------------------------------------     |</div><div class='add'>+ *  |       |    v                                                           v</div><div class='add'>+ *  |       |  dispatch to DESTPORTS when the Schedule Table               drop</div><div class='add'>+ *  |       |  executes an entry i with TXEN == 1 &amp;&amp; VLINDEX == i</div><div class='add'>+ *  v       v</div><div class='add'>+ * dispatch immediately to DESTPORTS</div><div class='add'>+ *</div><div class='add'>+ * The per-port classification key is always composed of {DMAC, VID, PCP} and</div><div class='add'>+ * is non-maskable. This 'looks like' the NULL stream identification function</div><div class='add'>+ * from IEEE 802.1CB clause 6, except for the extra VLAN PCP. When the switch</div><div class='add'>+ * ports operate as VLAN-unaware, we do allow the user to not specify the VLAN</div><div class='add'>+ * ID and PCP, and then the port-based defaults will be used.</div><div class='add'>+ *</div><div class='add'>+ * In TTEthernet, routing is something that needs to be done manually for each</div><div class='add'>+ * Virtual Link. So the flow action must always include one of:</div><div class='add'>+ * a. 'redirect', 'trap' or 'drop': select the egress port list</div><div class='add'>+ * Additionally, the following actions may be applied on a Virtual Link,</div><div class='add'>+ * turning it into 'critical' traffic:</div><div class='add'>+ * b. 'police': turn it into a rate-constrained VL, with bandwidth limitation</div><div class='add'>+ *    given by the maximum frame length, bandwidth allocation gap (BAG) and</div><div class='add'>+ *    maximum jitter.</div><div class='add'>+ * c. 'gate': turn it into a time-triggered VL, which can be only be received</div><div class='add'>+ *    and forwarded according to a given schedule.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static bool sja1105_vl_key_lower(struct sja1105_vl_lookup_entry *a,</div><div class='add'>+				 struct sja1105_vl_lookup_entry *b)</div><div class='add'>+{</div><div class='add'>+	if (a-&gt;macaddr &lt; b-&gt;macaddr)</div><div class='add'>+		return true;</div><div class='add'>+	if (a-&gt;macaddr &gt; b-&gt;macaddr)</div><div class='add'>+		return false;</div><div class='add'>+	if (a-&gt;vlanid &lt; b-&gt;vlanid)</div><div class='add'>+		return true;</div><div class='add'>+	if (a-&gt;vlanid &gt; b-&gt;vlanid)</div><div class='add'>+		return false;</div><div class='add'>+	if (a-&gt;port &lt; b-&gt;port)</div><div class='add'>+		return true;</div><div class='add'>+	if (a-&gt;port &gt; b-&gt;port)</div><div class='add'>+		return false;</div><div class='add'>+	if (a-&gt;vlanprior &lt; b-&gt;vlanprior)</div><div class='add'>+		return true;</div><div class='add'>+	if (a-&gt;vlanprior &gt; b-&gt;vlanprior)</div><div class='add'>+		return false;</div><div class='add'>+	/* Keys are equal */</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: this should change when the bridge upper of the port changes. */</div><div class='add'>+static u16 sja1105_port_get_tag_8021q_vid(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	unsigned long bridge_num;</div><div class='add'>+</div><div class='add'>+	if (!dp-&gt;bridge)</div><div class='add'>+		return dsa_tag_8021q_standalone_vid(dp);</div><div class='add'>+</div><div class='add'>+	bridge_num = dsa_port_bridge_num_get(dp);</div><div class='add'>+</div><div class='add'>+	return dsa_tag_8021q_bridge_vid(bridge_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_init_virtual_links(struct sja1105_private *priv,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_policing_entry *vl_policing;</div><div class='add'>+	struct sja1105_vl_forwarding_entry *vl_fwd;</div><div class='add'>+	struct sja1105_vl_lookup_entry *vl_lookup;</div><div class='add'>+	bool have_critical_virtual_links = false;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	struct sja1105_rule *rule;</div><div class='add'>+	int num_virtual_links = 0;</div><div class='add'>+	int max_sharindx = 0;</div><div class='add'>+	int i, j, k;</div><div class='add'>+</div><div class='add'>+	/* Figure out the dimensioning of the problem */</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;flow_block.rules, list) {</div><div class='add'>+		if (rule-&gt;type != SJA1105_RULE_VL)</div><div class='add'>+			continue;</div><div class='add'>+		/* Each VL lookup entry matches on a single ingress port */</div><div class='add'>+		num_virtual_links += hweight_long(rule-&gt;port_mask);</div><div class='add'>+</div><div class='add'>+		if (rule-&gt;vl.type != SJA1105_VL_NONCRITICAL)</div><div class='add'>+			have_critical_virtual_links = true;</div><div class='add'>+		if (max_sharindx &lt; rule-&gt;vl.sharindx)</div><div class='add'>+			max_sharindx = rule-&gt;vl.sharindx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_virtual_links &gt; SJA1105_MAX_VL_LOOKUP_COUNT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Not enough VL entries available");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (max_sharindx + 1 &gt; SJA1105_MAX_VL_LOOKUP_COUNT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Policer index out of range");</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_sharindx = max_t(int, num_virtual_links, max_sharindx) + 1;</div><div class='add'>+</div><div class='add'>+	/* Discard previous VL Lookup Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_LOOKUP];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard previous VL Policing Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_POLICING];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard previous VL Forwarding Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_FORWARDING];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Discard previous VL Forwarding Parameters Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_FORWARDING_PARAMS];</div><div class='add'>+	if (table-&gt;entry_count) {</div><div class='add'>+		kfree(table-&gt;entries);</div><div class='add'>+		table-&gt;entry_count = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Nothing to do */</div><div class='add'>+	if (!num_virtual_links)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Pre-allocate space in the static config tables */</div><div class='add'>+</div><div class='add'>+	/* VL Lookup Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_LOOKUP];</div><div class='add'>+	table-&gt;entries = kcalloc(num_virtual_links,</div><div class='add'>+				 table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = num_virtual_links;</div><div class='add'>+	vl_lookup = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	k = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;flow_block.rules, list) {</div><div class='add'>+		unsigned long port;</div><div class='add'>+</div><div class='add'>+		if (rule-&gt;type != SJA1105_RULE_VL)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for_each_set_bit(port, &amp;rule-&gt;port_mask, SJA1105_MAX_NUM_PORTS) {</div><div class='add'>+			vl_lookup[k].format = SJA1105_VL_FORMAT_PSFP;</div><div class='add'>+			vl_lookup[k].port = port;</div><div class='add'>+			vl_lookup[k].macaddr = rule-&gt;key.vl.dmac;</div><div class='add'>+			if (rule-&gt;key.type == SJA1105_KEY_VLAN_AWARE_VL) {</div><div class='add'>+				vl_lookup[k].vlanid = rule-&gt;key.vl.vid;</div><div class='add'>+				vl_lookup[k].vlanprior = rule-&gt;key.vl.pcp;</div><div class='add'>+			} else {</div><div class='add'>+				/* FIXME */</div><div class='add'>+				struct dsa_port *dp = dsa_to_port(priv-&gt;ds, port);</div><div class='add'>+				u16 vid = sja1105_port_get_tag_8021q_vid(dp);</div><div class='add'>+</div><div class='add'>+				vl_lookup[k].vlanid = vid;</div><div class='add'>+				vl_lookup[k].vlanprior = 0;</div><div class='add'>+			}</div><div class='add'>+			/* For critical VLs, the DESTPORTS mask is taken from</div><div class='add'>+			 * the VL Forwarding Table, so no point in putting it</div><div class='add'>+			 * in the VL Lookup Table</div><div class='add'>+			 */</div><div class='add'>+			if (rule-&gt;vl.type == SJA1105_VL_NONCRITICAL)</div><div class='add'>+				vl_lookup[k].destports = rule-&gt;vl.destports;</div><div class='add'>+			else</div><div class='add'>+				vl_lookup[k].iscritical = true;</div><div class='add'>+			vl_lookup[k].flow_cookie = rule-&gt;cookie;</div><div class='add'>+			k++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* UM10944.pdf chapter 4.2.3 VL Lookup table:</div><div class='add'>+	 * "the entries in the VL Lookup table must be sorted in ascending</div><div class='add'>+	 * order (i.e. the smallest value must be loaded first) according to</div><div class='add'>+	 * the following sort order: MACADDR, VLANID, PORT, VLANPRIOR."</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; num_virtual_links; i++) {</div><div class='add'>+		struct sja1105_vl_lookup_entry *a = &amp;vl_lookup[i];</div><div class='add'>+</div><div class='add'>+		for (j = i + 1; j &lt; num_virtual_links; j++) {</div><div class='add'>+			struct sja1105_vl_lookup_entry *b = &amp;vl_lookup[j];</div><div class='add'>+</div><div class='add'>+			if (sja1105_vl_key_lower(b, a)) {</div><div class='add'>+				struct sja1105_vl_lookup_entry tmp = *a;</div><div class='add'>+</div><div class='add'>+				*a = *b;</div><div class='add'>+				*b = tmp;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!have_critical_virtual_links)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* VL Policing Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_POLICING];</div><div class='add'>+	table-&gt;entries = kcalloc(max_sharindx, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = max_sharindx;</div><div class='add'>+	vl_policing = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* VL Forwarding Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_FORWARDING];</div><div class='add'>+	table-&gt;entries = kcalloc(max_sharindx, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = max_sharindx;</div><div class='add'>+	vl_fwd = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	/* VL Forwarding Parameters Table */</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_FORWARDING_PARAMS];</div><div class='add'>+	table-&gt;entries = kcalloc(1, table-&gt;ops-&gt;unpacked_entry_size,</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!table-&gt;entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	table-&gt;entry_count = 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_virtual_links; i++) {</div><div class='add'>+		unsigned long cookie = vl_lookup[i].flow_cookie;</div><div class='add'>+		struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);</div><div class='add'>+</div><div class='add'>+		if (rule-&gt;vl.type == SJA1105_VL_NONCRITICAL)</div><div class='add'>+			continue;</div><div class='add'>+		if (rule-&gt;vl.type == SJA1105_VL_TIME_TRIGGERED) {</div><div class='add'>+			int sharindx = rule-&gt;vl.sharindx;</div><div class='add'>+</div><div class='add'>+			vl_policing[i].type = 1;</div><div class='add'>+			vl_policing[i].sharindx = sharindx;</div><div class='add'>+			vl_policing[i].maxlen = rule-&gt;vl.maxlen;</div><div class='add'>+			vl_policing[sharindx].type = 1;</div><div class='add'>+</div><div class='add'>+			vl_fwd[i].type = 1;</div><div class='add'>+			vl_fwd[sharindx].type = 1;</div><div class='add'>+			vl_fwd[sharindx].priority = rule-&gt;vl.ipv;</div><div class='add'>+			vl_fwd[sharindx].partition = 0;</div><div class='add'>+			vl_fwd[sharindx].destports = rule-&gt;vl.destports;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sja1105_frame_memory_partitioning(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_vl_redirect(struct sja1105_private *priv, int port,</div><div class='add'>+			struct netlink_ext_ack *extack, unsigned long cookie,</div><div class='add'>+			struct sja1105_key *key, unsigned long destports,</div><div class='add'>+			bool append)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(priv-&gt;ds, port);</div><div class='add'>+	bool vlan_aware = dsa_port_is_vlan_filtering(dp);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!vlan_aware &amp;&amp; key-&gt;type != SJA1105_KEY_VLAN_UNAWARE_VL) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only redirect based on DMAC");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	} else if (vlan_aware &amp;&amp; key-&gt;type != SJA1105_KEY_VLAN_AWARE_VL) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only redirect based on {DMAC, VID, PCP}");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rule) {</div><div class='add'>+		rule = kzalloc(sizeof(*rule), GFP_KERNEL);</div><div class='add'>+		if (!rule)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		rule-&gt;cookie = cookie;</div><div class='add'>+		rule-&gt;type = SJA1105_RULE_VL;</div><div class='add'>+		rule-&gt;key = *key;</div><div class='add'>+		list_add(&amp;rule-&gt;list, &amp;priv-&gt;flow_block.rules);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule-&gt;port_mask |= BIT(port);</div><div class='add'>+	if (append)</div><div class='add'>+		rule-&gt;vl.destports |= destports;</div><div class='add'>+	else</div><div class='add'>+		rule-&gt;vl.destports = destports;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_init_virtual_links(priv, extack);</div><div class='add'>+	if (rc) {</div><div class='add'>+		rule-&gt;port_mask &amp;= ~BIT(port);</div><div class='add'>+		if (!rule-&gt;port_mask) {</div><div class='add'>+			list_del(&amp;rule-&gt;list);</div><div class='add'>+			kfree(rule);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_vl_delete(struct sja1105_private *priv, int port,</div><div class='add'>+		      struct sja1105_rule *rule, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rule-&gt;port_mask &amp;= ~BIT(port);</div><div class='add'>+	if (!rule-&gt;port_mask) {</div><div class='add'>+		list_del(&amp;rule-&gt;list);</div><div class='add'>+		kfree(rule);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = sja1105_compose_gating_subschedule(priv, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_init_virtual_links(priv, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_init_scheduling(priv);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return sja1105_static_config_reload(priv, SJA1105_VIRTUAL_LINKS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_vl_gate(struct sja1105_private *priv, int port,</div><div class='add'>+		    struct netlink_ext_ack *extack, unsigned long cookie,</div><div class='add'>+		    struct sja1105_key *key, u32 index, s32 prio,</div><div class='add'>+		    u64 base_time, u64 cycle_time, u64 cycle_time_ext,</div><div class='add'>+		    u32 num_entries, struct action_gate_entry *entries)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(priv-&gt;ds, port);</div><div class='add'>+	bool vlan_aware = dsa_port_is_vlan_filtering(dp);</div><div class='add'>+	int ipv = -1;</div><div class='add'>+	int i, rc;</div><div class='add'>+	s32 rem;</div><div class='add'>+</div><div class='add'>+	if (cycle_time_ext) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cycle time extension not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	div_s64_rem(base_time, sja1105_delta_to_ns(1), &amp;rem);</div><div class='add'>+	if (rem) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Base time must be multiple of 200 ns");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	div_s64_rem(cycle_time, sja1105_delta_to_ns(1), &amp;rem);</div><div class='add'>+	if (rem) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cycle time must be multiple of 200 ns");</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!vlan_aware &amp;&amp; key-&gt;type != SJA1105_KEY_VLAN_UNAWARE_VL) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only gate based on DMAC");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	} else if (vlan_aware &amp;&amp; key-&gt;type != SJA1105_KEY_VLAN_AWARE_VL) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Can only gate based on {DMAC, VID, PCP}");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rule) {</div><div class='add'>+		rule = kzalloc(sizeof(*rule), GFP_KERNEL);</div><div class='add'>+		if (!rule)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		list_add(&amp;rule-&gt;list, &amp;priv-&gt;flow_block.rules);</div><div class='add'>+		rule-&gt;cookie = cookie;</div><div class='add'>+		rule-&gt;type = SJA1105_RULE_VL;</div><div class='add'>+		rule-&gt;key = *key;</div><div class='add'>+		rule-&gt;vl.type = SJA1105_VL_TIME_TRIGGERED;</div><div class='add'>+		rule-&gt;vl.sharindx = index;</div><div class='add'>+		rule-&gt;vl.base_time = base_time;</div><div class='add'>+		rule-&gt;vl.cycle_time = cycle_time;</div><div class='add'>+		rule-&gt;vl.num_entries = num_entries;</div><div class='add'>+		rule-&gt;vl.entries = kcalloc(num_entries,</div><div class='add'>+					   sizeof(struct action_gate_entry),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!rule-&gt;vl.entries) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; num_entries; i++) {</div><div class='add'>+			div_s64_rem(entries[i].interval,</div><div class='add'>+				    sja1105_delta_to_ns(1), &amp;rem);</div><div class='add'>+			if (rem) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Interval must be multiple of 200 ns");</div><div class='add'>+				rc = -ERANGE;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!entries[i].interval) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Interval cannot be zero");</div><div class='add'>+				rc = -ERANGE;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ns_to_sja1105_delta(entries[i].interval) &gt;</div><div class='add'>+			    SJA1105_TAS_MAX_DELTA) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Maximum interval is 52 ms");</div><div class='add'>+				rc = -ERANGE;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (entries[i].maxoctets != -1) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Cannot offload IntervalOctetMax");</div><div class='add'>+				rc = -EOPNOTSUPP;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (ipv == -1) {</div><div class='add'>+				ipv = entries[i].ipv;</div><div class='add'>+			} else if (ipv != entries[i].ipv) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Only support a single IPV per VL");</div><div class='add'>+				rc = -EOPNOTSUPP;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			rule-&gt;vl.entries[i] = entries[i];</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ipv == -1) {</div><div class='add'>+			if (key-&gt;type == SJA1105_KEY_VLAN_AWARE_VL)</div><div class='add'>+				ipv = key-&gt;vl.pcp;</div><div class='add'>+			else</div><div class='add'>+				ipv = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* TODO: support per-flow MTU */</div><div class='add'>+		rule-&gt;vl.maxlen = VLAN_ETH_FRAME_LEN + ETH_FCS_LEN;</div><div class='add'>+		rule-&gt;vl.ipv = ipv;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule-&gt;port_mask |= BIT(port);</div><div class='add'>+</div><div class='add'>+	rc = sja1105_compose_gating_subschedule(priv, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_init_virtual_links(priv, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (sja1105_gating_check_conflicts(priv, -1, extack)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Conflict with tc-taprio schedule");</div><div class='add'>+		rc = -ERANGE;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (rc) {</div><div class='add'>+		rule-&gt;port_mask &amp;= ~BIT(port);</div><div class='add'>+		if (!rule-&gt;port_mask) {</div><div class='add'>+			list_del(&amp;rule-&gt;list);</div><div class='add'>+			kfree(rule-&gt;vl.entries);</div><div class='add'>+			kfree(rule);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int sja1105_find_vlid(struct sja1105_private *priv, int port,</div><div class='add'>+			     struct sja1105_key *key)</div><div class='add'>+{</div><div class='add'>+	struct sja1105_vl_lookup_entry *vl_lookup;</div><div class='add'>+	struct sja1105_table *table;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(key-&gt;type != SJA1105_KEY_VLAN_AWARE_VL &amp;&amp;</div><div class='add'>+		    key-&gt;type != SJA1105_KEY_VLAN_UNAWARE_VL))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	table = &amp;priv-&gt;static_config.tables[BLK_IDX_VL_LOOKUP];</div><div class='add'>+	vl_lookup = table-&gt;entries;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; table-&gt;entry_count; i++) {</div><div class='add'>+		if (key-&gt;type == SJA1105_KEY_VLAN_AWARE_VL) {</div><div class='add'>+			if (vl_lookup[i].port == port &amp;&amp;</div><div class='add'>+			    vl_lookup[i].macaddr == key-&gt;vl.dmac &amp;&amp;</div><div class='add'>+			    vl_lookup[i].vlanid == key-&gt;vl.vid &amp;&amp;</div><div class='add'>+			    vl_lookup[i].vlanprior == key-&gt;vl.pcp)</div><div class='add'>+				return i;</div><div class='add'>+		} else {</div><div class='add'>+			if (vl_lookup[i].port == port &amp;&amp;</div><div class='add'>+			    vl_lookup[i].macaddr == key-&gt;vl.dmac)</div><div class='add'>+				return i;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int sja1105_vl_stats(struct sja1105_private *priv, int port,</div><div class='add'>+		     struct sja1105_rule *rule, struct flow_stats *stats,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct sja1105_regs *regs = priv-&gt;info-&gt;regs;</div><div class='add'>+	u8 buf[SJA1105_SIZE_VL_STATUS] = {0};</div><div class='add'>+	u64 unreleased;</div><div class='add'>+	u64 timingerr;</div><div class='add'>+	u64 lengtherr;</div><div class='add'>+	int vlid, rc;</div><div class='add'>+	u64 pkts;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;vl.type != SJA1105_VL_TIME_TRIGGERED)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vlid = sja1105_find_vlid(priv, port, &amp;rule-&gt;key);</div><div class='add'>+	if (vlid &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = sja1105_xfer_buf(priv, SPI_READ, regs-&gt;vl_status + 2 * vlid, buf,</div><div class='add'>+			      SJA1105_SIZE_VL_STATUS);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "SPI access failed");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sja1105_unpack(buf, &amp;timingerr,  31, 16, SJA1105_SIZE_VL_STATUS);</div><div class='add'>+	sja1105_unpack(buf, &amp;unreleased, 15,  0, SJA1105_SIZE_VL_STATUS);</div><div class='add'>+	sja1105_unpack(buf, &amp;lengtherr,  47, 32, SJA1105_SIZE_VL_STATUS);</div><div class='add'>+</div><div class='add'>+	pkts = timingerr + unreleased + lengtherr;</div><div class='add'>+</div><div class='add'>+	flow_stats_update(stats, 0, pkts - rule-&gt;vl.stats.pkts, 0,</div><div class='add'>+			  jiffies - rule-&gt;vl.stats.lastused,</div><div class='add'>+			  FLOW_ACTION_HW_STATS_IMMEDIATE);</div><div class='add'>+</div><div class='add'>+	rule-&gt;vl.stats.pkts = pkts;</div><div class='add'>+	rule-&gt;vl.stats.lastused = jiffies;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/dsa/sja1105/sja1105_vl.h b/drivers/net/dsa/sja1105/sja1105_vl.h<br/>new file mode 100644<br/>index 000000000000..51fba0dce91a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/sja1105/sja1105_vl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/sja1105/sja1105_vl.h</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright 2020 NXP</div><div class='add'>+ */</div><div class='add'>+#ifndef _SJA1105_VL_H</div><div class='add'>+#define _SJA1105_VL_H</div><div class='add'>+</div><div class='add'>+#include "sja1105.h"</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA_SJA1105_VL)</div><div class='add'>+</div><div class='add'>+int sja1105_vl_redirect(struct sja1105_private *priv, int port,</div><div class='add'>+			struct netlink_ext_ack *extack, unsigned long cookie,</div><div class='add'>+			struct sja1105_key *key, unsigned long destports,</div><div class='add'>+			bool append);</div><div class='add'>+</div><div class='add'>+int sja1105_vl_delete(struct sja1105_private *priv, int port,</div><div class='add'>+		      struct sja1105_rule *rule,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int sja1105_vl_gate(struct sja1105_private *priv, int port,</div><div class='add'>+		    struct netlink_ext_ack *extack, unsigned long cookie,</div><div class='add'>+		    struct sja1105_key *key, u32 index, s32 prio,</div><div class='add'>+		    u64 base_time, u64 cycle_time, u64 cycle_time_ext,</div><div class='add'>+		    u32 num_entries, struct action_gate_entry *entries);</div><div class='add'>+</div><div class='add'>+int sja1105_vl_stats(struct sja1105_private *priv, int port,</div><div class='add'>+		     struct sja1105_rule *rule, struct flow_stats *stats,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int sja1105_vl_redirect(struct sja1105_private *priv, int port,</div><div class='add'>+				      struct netlink_ext_ack *extack,</div><div class='add'>+				      unsigned long cookie,</div><div class='add'>+				      struct sja1105_key *key,</div><div class='add'>+				      unsigned long destports,</div><div class='add'>+				      bool append)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Virtual Links not compiled in");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sja1105_vl_delete(struct sja1105_private *priv,</div><div class='add'>+				    int port, struct sja1105_rule *rule,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Virtual Links not compiled in");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sja1105_vl_gate(struct sja1105_private *priv, int port,</div><div class='add'>+				  struct netlink_ext_ack *extack,</div><div class='add'>+				  unsigned long cookie,</div><div class='add'>+				  struct sja1105_key *key, u32 index, s32 prio,</div><div class='add'>+				  u64 base_time, u64 cycle_time,</div><div class='add'>+				  u64 cycle_time_ext, u32 num_entries,</div><div class='add'>+				  struct action_gate_entry *entries)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Virtual Links not compiled in");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int sja1105_vl_stats(struct sja1105_private *priv, int port,</div><div class='add'>+				   struct sja1105_rule *rule,</div><div class='add'>+				   struct flow_stats *stats,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Virtual Links not compiled in");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* IS_ENABLED(CONFIG_NET_DSA_SJA1105_VL) */</div><div class='add'>+</div><div class='add'>+#endif /* _SJA1105_VL_H */</div><div class='head'>diff --git a/drivers/net/dsa/vitesse-vsc73xx-core.c b/drivers/net/dsa/vitesse-vsc73xx-core.c<br/>new file mode 100644<br/>index 000000000000..9d31b8258268<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/vitesse-vsc73xx-core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/vitesse-vsc73xx-core.c</a></div><div class='hunk'>@@ -0,0 +1,2416 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* DSA driver for:</div><div class='add'>+ * Vitesse VSC7385 SparX-G5 5+1-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7395 SparX-G5e 5+1-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7398 SparX-G8e 8-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ *</div><div class='add'>+ * These switches have a built-in 8051 CPU and can download and execute a</div><div class='add'>+ * firmware in this CPU. They can also be configured to use an external CPU</div><div class='add'>+ * handling the switch in a memory-mapped manner by connecting to that external</div><div class='add'>+ * CPU's memory bus.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Linus Wallej &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Includes portions of code from the firmware uploader by:</div><div class='add'>+ * Copyright (C) 2009 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+#include &lt;linux/dsa/8021q.h&gt;</div><div class='add'>+#include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vitesse-vsc73xx.h"</div><div class='add'>+</div><div class='add'>+#define VSC73XX_BLOCK_MAC	0x1 /* Subblocks 0-4, 6 (CPU port) */</div><div class='add'>+#define VSC73XX_BLOCK_ANALYZER	0x2 /* Only subblock 0 */</div><div class='add'>+#define VSC73XX_BLOCK_MII	0x3 /* Subblocks 0 and 1 */</div><div class='add'>+#define VSC73XX_BLOCK_MEMINIT	0x3 /* Only subblock 2 */</div><div class='add'>+#define VSC73XX_BLOCK_CAPTURE	0x4 /* Subblocks 0-4, 6, 7 */</div><div class='add'>+#define VSC73XX_BLOCK_ARBITER	0x5 /* Only subblock 0 */</div><div class='add'>+#define VSC73XX_BLOCK_SYSTEM	0x7 /* Only subblock 0 */</div><div class='add'>+</div><div class='add'>+/* MII Block subblock */</div><div class='add'>+#define VSC73XX_BLOCK_MII_INTERNAL	0x0 /* Internal MDIO subblock */</div><div class='add'>+#define VSC73XX_BLOCK_MII_EXTERNAL	0x1 /* External MDIO subblock */</div><div class='add'>+</div><div class='add'>+#define CPU_PORT	6 /* CPU port */</div><div class='add'>+#define VSC73XX_NUM_FDB_ROWS	2048</div><div class='add'>+#define VSC73XX_NUM_BUCKETS	4</div><div class='add'>+</div><div class='add'>+/* MAC Block registers */</div><div class='add'>+#define VSC73XX_MAC_CFG		0x00</div><div class='add'>+#define VSC73XX_MACHDXGAP	0x02</div><div class='add'>+#define VSC73XX_FCCONF		0x04</div><div class='add'>+#define VSC73XX_FCMACHI		0x08</div><div class='add'>+#define VSC73XX_FCMACLO		0x0c</div><div class='add'>+#define VSC73XX_MAXLEN		0x10</div><div class='add'>+#define VSC73XX_ADVPORTM	0x19</div><div class='add'>+#define VSC73XX_TXUPDCFG	0x24</div><div class='add'>+#define VSC73XX_TXQ_SELECT_CFG	0x28</div><div class='add'>+#define VSC73XX_RXOCT		0x50</div><div class='add'>+#define VSC73XX_TXOCT		0x51</div><div class='add'>+#define VSC73XX_C_RX0		0x52</div><div class='add'>+#define VSC73XX_C_RX1		0x53</div><div class='add'>+#define VSC73XX_C_RX2		0x54</div><div class='add'>+#define VSC73XX_C_TX0		0x55</div><div class='add'>+#define VSC73XX_C_TX1		0x56</div><div class='add'>+#define VSC73XX_C_TX2		0x57</div><div class='add'>+#define VSC73XX_C_CFG		0x58</div><div class='add'>+#define VSC73XX_CAT_DROP	0x6e</div><div class='add'>+#define VSC73XX_CAT_PR_MISC_L2	0x6f</div><div class='add'>+#define VSC73XX_CAT_PR_USR_PRIO	0x75</div><div class='add'>+#define VSC73XX_CAT_VLAN_MISC	0x79</div><div class='add'>+#define VSC73XX_CAT_PORT_VLAN	0x7a</div><div class='add'>+#define VSC73XX_Q_MISC_CONF	0xdf</div><div class='add'>+</div><div class='add'>+/* MAC_CFG register bits */</div><div class='add'>+#define VSC73XX_MAC_CFG_WEXC_DIS	BIT(31)</div><div class='add'>+#define VSC73XX_MAC_CFG_PORT_RST	BIT(29)</div><div class='add'>+#define VSC73XX_MAC_CFG_TX_EN		BIT(28)</div><div class='add'>+#define VSC73XX_MAC_CFG_SEED_LOAD	BIT(27)</div><div class='add'>+#define VSC73XX_MAC_CFG_SEED_MASK	GENMASK(26, 19)</div><div class='add'>+#define VSC73XX_MAC_CFG_SEED_OFFSET	19</div><div class='add'>+#define VSC73XX_MAC_CFG_FDX		BIT(18)</div><div class='add'>+#define VSC73XX_MAC_CFG_GIGA_MODE	BIT(17)</div><div class='add'>+#define VSC73XX_MAC_CFG_RX_EN		BIT(16)</div><div class='add'>+#define VSC73XX_MAC_CFG_VLAN_DBLAWR	BIT(15)</div><div class='add'>+#define VSC73XX_MAC_CFG_VLAN_AWR	BIT(14)</div><div class='add'>+#define VSC73XX_MAC_CFG_100_BASE_T	BIT(13) /* Not in manual */</div><div class='add'>+#define VSC73XX_MAC_CFG_TX_IPG_MASK	GENMASK(10, 6)</div><div class='add'>+#define VSC73XX_MAC_CFG_TX_IPG_OFFSET	6</div><div class='add'>+#define VSC73XX_MAC_CFG_TX_IPG_1000M	(6 &lt;&lt; VSC73XX_MAC_CFG_TX_IPG_OFFSET)</div><div class='add'>+#define VSC73XX_MAC_CFG_TX_IPG_100_10M	(17 &lt;&lt; VSC73XX_MAC_CFG_TX_IPG_OFFSET)</div><div class='add'>+#define VSC73XX_MAC_CFG_MAC_RX_RST	BIT(5)</div><div class='add'>+#define VSC73XX_MAC_CFG_MAC_TX_RST	BIT(4)</div><div class='add'>+#define VSC73XX_MAC_CFG_CLK_SEL_MASK	GENMASK(2, 0)</div><div class='add'>+#define VSC73XX_MAC_CFG_CLK_SEL_OFFSET	0</div><div class='add'>+#define VSC73XX_MAC_CFG_CLK_SEL_1000M	1</div><div class='add'>+#define VSC73XX_MAC_CFG_CLK_SEL_100M	2</div><div class='add'>+#define VSC73XX_MAC_CFG_CLK_SEL_10M	3</div><div class='add'>+#define VSC73XX_MAC_CFG_CLK_SEL_EXT	4</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MAC_CFG_1000M_F_PHY	(VSC73XX_MAC_CFG_FDX | \</div><div class='add'>+					 VSC73XX_MAC_CFG_GIGA_MODE | \</div><div class='add'>+					 VSC73XX_MAC_CFG_TX_IPG_1000M | \</div><div class='add'>+					 VSC73XX_MAC_CFG_CLK_SEL_EXT)</div><div class='add'>+#define VSC73XX_MAC_CFG_100_10M_F_PHY	(VSC73XX_MAC_CFG_FDX | \</div><div class='add'>+					 VSC73XX_MAC_CFG_TX_IPG_100_10M | \</div><div class='add'>+					 VSC73XX_MAC_CFG_CLK_SEL_EXT)</div><div class='add'>+#define VSC73XX_MAC_CFG_100_10M_H_PHY	(VSC73XX_MAC_CFG_TX_IPG_100_10M | \</div><div class='add'>+					 VSC73XX_MAC_CFG_CLK_SEL_EXT)</div><div class='add'>+#define VSC73XX_MAC_CFG_1000M_F_RGMII	(VSC73XX_MAC_CFG_FDX | \</div><div class='add'>+					 VSC73XX_MAC_CFG_GIGA_MODE | \</div><div class='add'>+					 VSC73XX_MAC_CFG_TX_IPG_1000M | \</div><div class='add'>+					 VSC73XX_MAC_CFG_CLK_SEL_1000M)</div><div class='add'>+#define VSC73XX_MAC_CFG_RESET		(VSC73XX_MAC_CFG_PORT_RST | \</div><div class='add'>+					 VSC73XX_MAC_CFG_MAC_RX_RST | \</div><div class='add'>+					 VSC73XX_MAC_CFG_MAC_TX_RST)</div><div class='add'>+</div><div class='add'>+/* Flow control register bits */</div><div class='add'>+#define VSC73XX_FCCONF_ZERO_PAUSE_EN	BIT(17)</div><div class='add'>+#define VSC73XX_FCCONF_FLOW_CTRL_OBEY	BIT(16)</div><div class='add'>+#define VSC73XX_FCCONF_PAUSE_VAL_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* ADVPORTM advanced port setup register bits */</div><div class='add'>+#define VSC73XX_ADVPORTM_IFG_PPM	BIT(7)</div><div class='add'>+#define VSC73XX_ADVPORTM_EXC_COL_CONT	BIT(6)</div><div class='add'>+#define VSC73XX_ADVPORTM_EXT_PORT	BIT(5)</div><div class='add'>+#define VSC73XX_ADVPORTM_INV_GTX	BIT(4)</div><div class='add'>+#define VSC73XX_ADVPORTM_ENA_GTX	BIT(3)</div><div class='add'>+#define VSC73XX_ADVPORTM_DDR_MODE	BIT(2)</div><div class='add'>+#define VSC73XX_ADVPORTM_IO_LOOPBACK	BIT(1)</div><div class='add'>+#define VSC73XX_ADVPORTM_HOST_LOOPBACK	BIT(0)</div><div class='add'>+</div><div class='add'>+/*  TXUPDCFG transmit modify setup bits */</div><div class='add'>+#define VSC73XX_TXUPDCFG_DSCP_REWR_MODE	GENMASK(20, 19)</div><div class='add'>+#define VSC73XX_TXUPDCFG_DSCP_REWR_ENA	BIT(18)</div><div class='add'>+#define VSC73XX_TXUPDCFG_TX_INT_TO_USRPRIO_ENA	BIT(17)</div><div class='add'>+#define VSC73XX_TXUPDCFG_TX_UNTAGGED_VID	GENMASK(15, 4)</div><div class='add'>+#define VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_ENA	BIT(3)</div><div class='add'>+#define VSC73XX_TXUPDCFG_TX_UPDATE_CRC_CPU_ENA	BIT(1)</div><div class='add'>+#define VSC73XX_TXUPDCFG_TX_INSERT_TAG	BIT(0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_SHIFT	4</div><div class='add'>+</div><div class='add'>+/* CAT_DROP categorizer frame dropping register bits */</div><div class='add'>+#define VSC73XX_CAT_DROP_DROP_MC_SMAC_ENA	BIT(6)</div><div class='add'>+#define VSC73XX_CAT_DROP_FWD_CTRL_ENA		BIT(4)</div><div class='add'>+#define VSC73XX_CAT_DROP_FWD_PAUSE_ENA		BIT(3)</div><div class='add'>+#define VSC73XX_CAT_DROP_UNTAGGED_ENA		BIT(2)</div><div class='add'>+#define VSC73XX_CAT_DROP_TAGGED_ENA		BIT(1)</div><div class='add'>+#define VSC73XX_CAT_DROP_NULL_MAC_ENA		BIT(0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_Q_MISC_CONF_EXTENT_MEM		BIT(31)</div><div class='add'>+#define VSC73XX_Q_MISC_CONF_EARLY_TX_MASK	GENMASK(4, 1)</div><div class='add'>+#define VSC73XX_Q_MISC_CONF_EARLY_TX_512	(1 &lt;&lt; 1)</div><div class='add'>+#define VSC73XX_Q_MISC_CONF_MAC_PAUSE_MODE	BIT(0)</div><div class='add'>+</div><div class='add'>+/* CAT_VLAN_MISC categorizer VLAN miscellaneous bits */</div><div class='add'>+#define VSC73XX_CAT_VLAN_MISC_VLAN_TCI_IGNORE_ENA BIT(8)</div><div class='add'>+#define VSC73XX_CAT_VLAN_MISC_VLAN_KEEP_TAG_ENA BIT(7)</div><div class='add'>+</div><div class='add'>+/* CAT_PORT_VLAN categorizer port VLAN */</div><div class='add'>+#define VSC73XX_CAT_PORT_VLAN_VLAN_CFI BIT(15)</div><div class='add'>+#define VSC73XX_CAT_PORT_VLAN_VLAN_USR_PRIO GENMASK(14, 12)</div><div class='add'>+#define VSC73XX_CAT_PORT_VLAN_VLAN_VID GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+/* Frame analyzer block 2 registers */</div><div class='add'>+#define VSC73XX_STORMLIMIT	0x02</div><div class='add'>+#define VSC73XX_ADVLEARN	0x03</div><div class='add'>+#define VSC73XX_IFLODMSK	0x04</div><div class='add'>+#define VSC73XX_VLANMASK	0x05</div><div class='add'>+#define VSC73XX_MACHDATA	0x06</div><div class='add'>+#define VSC73XX_MACLDATA	0x07</div><div class='add'>+#define VSC73XX_ANMOVED		0x08</div><div class='add'>+#define VSC73XX_ANAGEFIL	0x09</div><div class='add'>+#define VSC73XX_ANEVENTS	0x0a</div><div class='add'>+#define VSC73XX_ANCNTMASK	0x0b</div><div class='add'>+#define VSC73XX_ANCNTVAL	0x0c</div><div class='add'>+#define VSC73XX_LEARNMASK	0x0d</div><div class='add'>+#define VSC73XX_UFLODMASK	0x0e</div><div class='add'>+#define VSC73XX_MFLODMASK	0x0f</div><div class='add'>+#define VSC73XX_RECVMASK	0x10</div><div class='add'>+#define VSC73XX_AGGRCTRL	0x20</div><div class='add'>+#define VSC73XX_AGGRMSKS	0x30 /* Until 0x3f */</div><div class='add'>+#define VSC73XX_DSTMASKS	0x40 /* Until 0x7f */</div><div class='add'>+#define VSC73XX_SRCMASKS	0x80 /* Until 0x87 */</div><div class='add'>+#define VSC73XX_CAPENAB		0xa0</div><div class='add'>+#define VSC73XX_MACACCESS	0xb0</div><div class='add'>+#define VSC73XX_IPMCACCESS	0xb1</div><div class='add'>+#define VSC73XX_MACTINDX	0xc0</div><div class='add'>+#define VSC73XX_VLANACCESS	0xd0</div><div class='add'>+#define VSC73XX_VLANTIDX	0xe0</div><div class='add'>+#define VSC73XX_AGENCTRL	0xf0</div><div class='add'>+#define VSC73XX_CAPRST		0xff</div><div class='add'>+</div><div class='add'>+#define VSC73XX_SRCMASKS_CPU_COPY		BIT(27)</div><div class='add'>+#define VSC73XX_SRCMASKS_MIRROR			BIT(26)</div><div class='add'>+#define VSC73XX_SRCMASKS_PORTS_MASK		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MACHDATA_VID			GENMASK(27, 16)</div><div class='add'>+#define VSC73XX_MACHDATA_MAC0			GENMASK(15, 8)</div><div class='add'>+#define VSC73XX_MACHDATA_MAC1			GENMASK(7, 0)</div><div class='add'>+#define VSC73XX_MACLDATA_MAC2			GENMASK(31, 24)</div><div class='add'>+#define VSC73XX_MACLDATA_MAC3			GENMASK(23, 16)</div><div class='add'>+#define VSC73XX_MACLDATA_MAC4			GENMASK(15, 8)</div><div class='add'>+#define VSC73XX_MACLDATA_MAC5			GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_HASH0_VID_FROM_MASK		GENMASK(5, 0)</div><div class='add'>+#define VSC73XX_HASH0_MAC0_FROM_MASK		GENMASK(7, 4)</div><div class='add'>+#define VSC73XX_HASH1_MAC0_FROM_MASK		GENMASK(3, 0)</div><div class='add'>+#define VSC73XX_HASH1_MAC1_FROM_MASK		GENMASK(7, 1)</div><div class='add'>+#define VSC73XX_HASH2_MAC1_FROM_MASK		BIT(0)</div><div class='add'>+#define VSC73XX_HASH2_MAC2_FROM_MASK		GENMASK(7, 0)</div><div class='add'>+#define VSC73XX_HASH2_MAC3_FROM_MASK		GENMASK(7, 6)</div><div class='add'>+#define VSC73XX_HASH3_MAC3_FROM_MASK		GENMASK(5, 0)</div><div class='add'>+#define VSC73XX_HASH3_MAC4_FROM_MASK		GENMASK(7, 3)</div><div class='add'>+#define VSC73XX_HASH4_MAC4_FROM_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_HASH0_VID_TO_MASK		GENMASK(9, 4)</div><div class='add'>+#define VSC73XX_HASH0_MAC0_TO_MASK		GENMASK(3, 0)</div><div class='add'>+#define VSC73XX_HASH1_MAC0_TO_MASK		GENMASK(10, 7)</div><div class='add'>+#define VSC73XX_HASH1_MAC1_TO_MASK		GENMASK(6, 0)</div><div class='add'>+#define VSC73XX_HASH2_MAC1_TO_MASK		BIT(10)</div><div class='add'>+#define VSC73XX_HASH2_MAC2_TO_MASK		GENMASK(9, 2)</div><div class='add'>+#define VSC73XX_HASH2_MAC3_TO_MASK		GENMASK(1, 0)</div><div class='add'>+#define VSC73XX_HASH3_MAC3_TO_MASK		GENMASK(10, 5)</div><div class='add'>+#define VSC73XX_HASH3_MAC4_TO_MASK		GENMASK(4, 0)</div><div class='add'>+#define VSC73XX_HASH4_MAC4_TO_MASK		GENMASK(10, 8)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MACTINDX_SHADOW			BIT(13)</div><div class='add'>+#define VSC73XX_MACTINDX_BUCKET_MSK		GENMASK(12, 11)</div><div class='add'>+#define VSC73XX_MACTINDX_INDEX_MSK		GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MACACCESS_CPU_COPY		BIT(14)</div><div class='add'>+#define VSC73XX_MACACCESS_FWD_KILL		BIT(13)</div><div class='add'>+#define VSC73XX_MACACCESS_IGNORE_VLAN		BIT(12)</div><div class='add'>+#define VSC73XX_MACACCESS_AGED_FLAG		BIT(11)</div><div class='add'>+#define VSC73XX_MACACCESS_VALID			BIT(10)</div><div class='add'>+#define VSC73XX_MACACCESS_LOCKED		BIT(9)</div><div class='add'>+#define VSC73XX_MACACCESS_DEST_IDX_MASK		GENMASK(8, 3)</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_MASK		GENMASK(2, 0)</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_IDLE		0</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_LEARN		1</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_FORGET		2</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_AGE_TABLE		3</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_FLUSH_TABLE	4</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_CLEAR_TABLE	5</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_READ_ENTRY	6</div><div class='add'>+#define VSC73XX_MACACCESS_CMD_WRITE_ENTRY	7</div><div class='add'>+</div><div class='add'>+#define VSC73XX_VLANACCESS_LEARN_DISABLED	BIT(30)</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_MIRROR		BIT(29)</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_SRC_CHECK	BIT(28)</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_PORT_MASK	GENMASK(9, 2)</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_PORT_MASK_SHIFT	2</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK	GENMASK(1, 0)</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_IDLE	0</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_READ_ENTRY	1</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_WRITE_ENTRY	2</div><div class='add'>+#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_CLEAR_TABLE	3</div><div class='add'>+</div><div class='add'>+/* MII block 3 registers */</div><div class='add'>+#define VSC73XX_MII_STAT		0x0</div><div class='add'>+#define VSC73XX_MII_CMD			0x1</div><div class='add'>+#define VSC73XX_MII_DATA		0x2</div><div class='add'>+#define VSC73XX_MII_MPRES		0x3</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MII_STAT_BUSY		BIT(3)</div><div class='add'>+#define VSC73XX_MII_STAT_READ		BIT(2)</div><div class='add'>+#define VSC73XX_MII_STAT_WRITE		BIT(1)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MII_CMD_SCAN		BIT(27)</div><div class='add'>+#define VSC73XX_MII_CMD_OPERATION	BIT(26)</div><div class='add'>+#define VSC73XX_MII_CMD_PHY_ADDR	GENMASK(25, 21)</div><div class='add'>+#define VSC73XX_MII_CMD_PHY_REG		GENMASK(20, 16)</div><div class='add'>+#define VSC73XX_MII_CMD_WRITE_DATA	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MII_DATA_FAILURE	BIT(16)</div><div class='add'>+#define VSC73XX_MII_DATA_READ_DATA	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MII_MPRES_NOPREAMBLE	BIT(6)</div><div class='add'>+#define VSC73XX_MII_MPRES_PRESCALEVAL	GENMASK(5, 0)</div><div class='add'>+#define VSC73XX_MII_PRESCALEVAL_MIN	3 /* min allowed mdio clock prescaler */</div><div class='add'>+</div><div class='add'>+#define VSC73XX_MII_STAT_BUSY	BIT(3)</div><div class='add'>+</div><div class='add'>+/* Arbiter block 5 registers */</div><div class='add'>+#define VSC73XX_ARBEMPTY		0x0c</div><div class='add'>+#define VSC73XX_ARBDISC			0x0e</div><div class='add'>+#define VSC73XX_SBACKWDROP		0x12</div><div class='add'>+#define VSC73XX_DBACKWDROP		0x13</div><div class='add'>+#define VSC73XX_ARBBURSTPROB		0x15</div><div class='add'>+</div><div class='add'>+/* System block 7 registers */</div><div class='add'>+#define VSC73XX_ICPU_SIPAD		0x01</div><div class='add'>+#define VSC73XX_GMIIDELAY		0x05</div><div class='add'>+#define VSC73XX_ICPU_CTRL		0x10</div><div class='add'>+#define VSC73XX_ICPU_ADDR		0x11</div><div class='add'>+#define VSC73XX_ICPU_SRAM		0x12</div><div class='add'>+#define VSC73XX_HWSEM			0x13</div><div class='add'>+#define VSC73XX_GLORESET		0x14</div><div class='add'>+#define VSC73XX_ICPU_MBOX_VAL		0x15</div><div class='add'>+#define VSC73XX_ICPU_MBOX_SET		0x16</div><div class='add'>+#define VSC73XX_ICPU_MBOX_CLR		0x17</div><div class='add'>+#define VSC73XX_CHIPID			0x18</div><div class='add'>+#define VSC73XX_GPIO			0x34</div><div class='add'>+</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_NONE	0</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_1_4_NS	1</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_1_7_NS	2</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_2_0_NS	3</div><div class='add'>+</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_NONE	(0 &lt;&lt; 4)</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_1_4_NS	(1 &lt;&lt; 4)</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_1_7_NS	(2 &lt;&lt; 4)</div><div class='add'>+#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_2_0_NS	(3 &lt;&lt; 4)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_ICPU_CTRL_WATCHDOG_RST	BIT(31)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_CLK_DIV_MASK	GENMASK(12, 8)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_SRST_HOLD	BIT(7)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_ICPU_PI_EN	BIT(6)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_BOOT_EN	BIT(3)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_EXT_ACC_EN	BIT(2)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_CLK_EN	BIT(1)</div><div class='add'>+#define VSC73XX_ICPU_CTRL_SRST		BIT(0)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_CHIPID_ID_SHIFT		12</div><div class='add'>+#define VSC73XX_CHIPID_ID_MASK		0xffff</div><div class='add'>+#define VSC73XX_CHIPID_REV_SHIFT	28</div><div class='add'>+#define VSC73XX_CHIPID_REV_MASK		0xf</div><div class='add'>+#define VSC73XX_CHIPID_ID_7385		0x7385</div><div class='add'>+#define VSC73XX_CHIPID_ID_7388		0x7388</div><div class='add'>+#define VSC73XX_CHIPID_ID_7395		0x7395</div><div class='add'>+#define VSC73XX_CHIPID_ID_7398		0x7398</div><div class='add'>+</div><div class='add'>+#define VSC73XX_GLORESET_STROBE		BIT(4)</div><div class='add'>+#define VSC73XX_GLORESET_ICPU_LOCK	BIT(3)</div><div class='add'>+#define VSC73XX_GLORESET_MEM_LOCK	BIT(2)</div><div class='add'>+#define VSC73XX_GLORESET_PHY_RESET	BIT(1)</div><div class='add'>+#define VSC73XX_GLORESET_MASTER_RESET	BIT(0)</div><div class='add'>+</div><div class='add'>+#define VSC7385_CLOCK_DELAY		((3 &lt;&lt; 4) | 3)</div><div class='add'>+#define VSC7385_CLOCK_DELAY_MASK	((3 &lt;&lt; 4) | 3)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_ICPU_CTRL_STOP	(VSC73XX_ICPU_CTRL_SRST_HOLD | \</div><div class='add'>+				 VSC73XX_ICPU_CTRL_BOOT_EN | \</div><div class='add'>+				 VSC73XX_ICPU_CTRL_EXT_ACC_EN)</div><div class='add'>+</div><div class='add'>+#define VSC73XX_ICPU_CTRL_START	(VSC73XX_ICPU_CTRL_CLK_DIV | \</div><div class='add'>+				 VSC73XX_ICPU_CTRL_BOOT_EN | \</div><div class='add'>+				 VSC73XX_ICPU_CTRL_CLK_EN | \</div><div class='add'>+				 VSC73XX_ICPU_CTRL_SRST)</div><div class='add'>+</div><div class='add'>+#define IS_7385(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7385)</div><div class='add'>+#define IS_7388(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7388)</div><div class='add'>+#define IS_7395(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7395)</div><div class='add'>+#define IS_7398(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7398)</div><div class='add'>+#define IS_739X(a) (IS_7395(a) || IS_7398(a))</div><div class='add'>+</div><div class='add'>+#define VSC73XX_POLL_SLEEP_US		1000</div><div class='add'>+#define VSC73XX_MDIO_POLL_SLEEP_US	5</div><div class='add'>+#define VSC73XX_POLL_TIMEOUT_US		10000</div><div class='add'>+</div><div class='add'>+struct vsc73xx_counter {</div><div class='add'>+	u8 counter;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vsc73xx_fdb {</div><div class='add'>+	u16 vid;</div><div class='add'>+	u8 port;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	bool valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Counters are named according to the MIB standards where applicable.</div><div class='add'>+ * Some counters are custom, non-standard. The standard counters are</div><div class='add'>+ * named in accordance with RFC2819, RFC2021 and IEEE Std 802.3-2002 Annex</div><div class='add'>+ * 30A Counters.</div><div class='add'>+ */</div><div class='add'>+static const struct vsc73xx_counter vsc73xx_rx_counters[] = {</div><div class='add'>+	{ 0, "RxEtherStatsPkts" },</div><div class='add'>+	{ 1, "RxBroadcast+MulticastPkts" }, /* non-standard counter */</div><div class='add'>+	{ 2, "RxTotalErrorPackets" }, /* non-standard counter */</div><div class='add'>+	{ 3, "RxEtherStatsBroadcastPkts" },</div><div class='add'>+	{ 4, "RxEtherStatsMulticastPkts" },</div><div class='add'>+	{ 5, "RxEtherStatsPkts64Octets" },</div><div class='add'>+	{ 6, "RxEtherStatsPkts65to127Octets" },</div><div class='add'>+	{ 7, "RxEtherStatsPkts128to255Octets" },</div><div class='add'>+	{ 8, "RxEtherStatsPkts256to511Octets" },</div><div class='add'>+	{ 9, "RxEtherStatsPkts512to1023Octets" },</div><div class='add'>+	{ 10, "RxEtherStatsPkts1024to1518Octets" },</div><div class='add'>+	{ 11, "RxJumboFrames" }, /* non-standard counter */</div><div class='add'>+	{ 12, "RxaPauseMACControlFramesTransmitted" },</div><div class='add'>+	{ 13, "RxFIFODrops" }, /* non-standard counter */</div><div class='add'>+	{ 14, "RxBackwardDrops" }, /* non-standard counter */</div><div class='add'>+	{ 15, "RxClassifierDrops" }, /* non-standard counter */</div><div class='add'>+	{ 16, "RxEtherStatsCRCAlignErrors" },</div><div class='add'>+	{ 17, "RxEtherStatsUndersizePkts" },</div><div class='add'>+	{ 18, "RxEtherStatsOversizePkts" },</div><div class='add'>+	{ 19, "RxEtherStatsFragments" },</div><div class='add'>+	{ 20, "RxEtherStatsJabbers" },</div><div class='add'>+	{ 21, "RxaMACControlFramesReceived" },</div><div class='add'>+	/* 22-24 are undefined */</div><div class='add'>+	{ 25, "RxaFramesReceivedOK" },</div><div class='add'>+	{ 26, "RxQoSClass0" }, /* non-standard counter */</div><div class='add'>+	{ 27, "RxQoSClass1" }, /* non-standard counter */</div><div class='add'>+	{ 28, "RxQoSClass2" }, /* non-standard counter */</div><div class='add'>+	{ 29, "RxQoSClass3" }, /* non-standard counter */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vsc73xx_counter vsc73xx_tx_counters[] = {</div><div class='add'>+	{ 0, "TxEtherStatsPkts" },</div><div class='add'>+	{ 1, "TxBroadcast+MulticastPkts" }, /* non-standard counter */</div><div class='add'>+	{ 2, "TxTotalErrorPackets" }, /* non-standard counter */</div><div class='add'>+	{ 3, "TxEtherStatsBroadcastPkts" },</div><div class='add'>+	{ 4, "TxEtherStatsMulticastPkts" },</div><div class='add'>+	{ 5, "TxEtherStatsPkts64Octets" },</div><div class='add'>+	{ 6, "TxEtherStatsPkts65to127Octets" },</div><div class='add'>+	{ 7, "TxEtherStatsPkts128to255Octets" },</div><div class='add'>+	{ 8, "TxEtherStatsPkts256to511Octets" },</div><div class='add'>+	{ 9, "TxEtherStatsPkts512to1023Octets" },</div><div class='add'>+	{ 10, "TxEtherStatsPkts1024to1518Octets" },</div><div class='add'>+	{ 11, "TxJumboFrames" }, /* non-standard counter */</div><div class='add'>+	{ 12, "TxaPauseMACControlFramesTransmitted" },</div><div class='add'>+	{ 13, "TxFIFODrops" }, /* non-standard counter */</div><div class='add'>+	{ 14, "TxDrops" }, /* non-standard counter */</div><div class='add'>+	{ 15, "TxEtherStatsCollisions" },</div><div class='add'>+	{ 16, "TxEtherStatsCRCAlignErrors" },</div><div class='add'>+	{ 17, "TxEtherStatsUndersizePkts" },</div><div class='add'>+	{ 18, "TxEtherStatsOversizePkts" },</div><div class='add'>+	{ 19, "TxEtherStatsFragments" },</div><div class='add'>+	{ 20, "TxEtherStatsJabbers" },</div><div class='add'>+	/* 21-24 are undefined */</div><div class='add'>+	{ 25, "TxaFramesReceivedOK" },</div><div class='add'>+	{ 26, "TxQoSClass0" }, /* non-standard counter */</div><div class='add'>+	{ 27, "TxQoSClass1" }, /* non-standard counter */</div><div class='add'>+	{ 28, "TxQoSClass2" }, /* non-standard counter */</div><div class='add'>+	{ 29, "TxQoSClass3" }, /* non-standard counter */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct vsc73xx_vlan_summary {</div><div class='add'>+	size_t num_tagged;</div><div class='add'>+	size_t num_untagged;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum vsc73xx_port_vlan_conf {</div><div class='add'>+	VSC73XX_VLAN_FILTER,</div><div class='add'>+	VSC73XX_VLAN_FILTER_UNTAG_ALL,</div><div class='add'>+	VSC73XX_VLAN_IGNORE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int vsc73xx_is_addr_valid(u8 block, u8 subblock)</div><div class='add'>+{</div><div class='add'>+	switch (block) {</div><div class='add'>+	case VSC73XX_BLOCK_MAC:</div><div class='add'>+		switch (subblock) {</div><div class='add'>+		case 0 ... 4:</div><div class='add'>+		case 6:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VSC73XX_BLOCK_ANALYZER:</div><div class='add'>+	case VSC73XX_BLOCK_SYSTEM:</div><div class='add'>+		switch (subblock) {</div><div class='add'>+		case 0:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case VSC73XX_BLOCK_MII:</div><div class='add'>+	case VSC73XX_BLOCK_ARBITER:</div><div class='add'>+		switch (subblock) {</div><div class='add'>+		case 0 ... 1:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case VSC73XX_BLOCK_CAPTURE:</div><div class='add'>+		switch (subblock) {</div><div class='add'>+		case 0 ... 4:</div><div class='add'>+		case 6 ... 7:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vsc73xx_is_addr_valid);</div><div class='add'>+</div><div class='add'>+static int vsc73xx_read(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='add'>+			u32 *val)</div><div class='add'>+{</div><div class='add'>+	return vsc-&gt;ops-&gt;read(vsc, block, subblock, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_write(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='add'>+			 u32 val)</div><div class='add'>+{</div><div class='add'>+	return vsc-&gt;ops-&gt;write(vsc, block, subblock, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_update_bits(struct vsc73xx *vsc, u8 block, u8 subblock,</div><div class='add'>+			       u8 reg, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 tmp, orig;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Same read-modify-write algorithm as e.g. regmap */</div><div class='add'>+	ret = vsc73xx_read(vsc, block, subblock, reg, &amp;orig);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	tmp = orig &amp; ~mask;</div><div class='add'>+	tmp |= val &amp; mask;</div><div class='add'>+	return vsc73xx_write(vsc, block, subblock, reg, tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_detect(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	bool icpu_si_boot_en;</div><div class='add'>+	bool icpu_pi_en;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 rev;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+			   VSC73XX_ICPU_MBOX_VAL, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(vsc-&gt;dev, "unable to read mailbox (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val == 0xffffffff) {</div><div class='add'>+		dev_info(vsc-&gt;dev, "chip seems dead.\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+			   VSC73XX_CHIPID, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(vsc-&gt;dev, "unable to read chip id (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = (val &gt;&gt; VSC73XX_CHIPID_ID_SHIFT) &amp;</div><div class='add'>+		VSC73XX_CHIPID_ID_MASK;</div><div class='add'>+	switch (id) {</div><div class='add'>+	case VSC73XX_CHIPID_ID_7385:</div><div class='add'>+	case VSC73XX_CHIPID_ID_7388:</div><div class='add'>+	case VSC73XX_CHIPID_ID_7395:</div><div class='add'>+	case VSC73XX_CHIPID_ID_7398:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(vsc-&gt;dev, "unsupported chip, id=%04x\n", id);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsc-&gt;chipid = id;</div><div class='add'>+	rev = (val &gt;&gt; VSC73XX_CHIPID_REV_SHIFT) &amp;</div><div class='add'>+		VSC73XX_CHIPID_REV_MASK;</div><div class='add'>+	dev_info(vsc-&gt;dev, "VSC%04X (rev: %d) switch found\n", id, rev);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+			   VSC73XX_ICPU_CTRL, &amp;val);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(vsc-&gt;dev, "unable to read iCPU control\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The iCPU can always be used but can boot in different ways.</div><div class='add'>+	 * If it is initially disabled and has no external memory,</div><div class='add'>+	 * we are in control and can do whatever we like, else we</div><div class='add'>+	 * are probably in trouble (we need some way to communicate</div><div class='add'>+	 * with the running firmware) so we bail out for now.</div><div class='add'>+	 */</div><div class='add'>+	icpu_pi_en = !!(val &amp; VSC73XX_ICPU_CTRL_ICPU_PI_EN);</div><div class='add'>+	icpu_si_boot_en = !!(val &amp; VSC73XX_ICPU_CTRL_BOOT_EN);</div><div class='add'>+	if (icpu_si_boot_en &amp;&amp; icpu_pi_en) {</div><div class='add'>+		dev_err(vsc-&gt;dev,</div><div class='add'>+			"iCPU enabled boots from SI, has external memory\n");</div><div class='add'>+		dev_err(vsc-&gt;dev, "no idea how to deal with this\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	if (icpu_si_boot_en &amp;&amp; !icpu_pi_en) {</div><div class='add'>+		dev_err(vsc-&gt;dev,</div><div class='add'>+			"iCPU enabled boots from PI/SI, no external memory\n");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+	if (!icpu_si_boot_en &amp;&amp; icpu_pi_en) {</div><div class='add'>+		dev_err(vsc-&gt;dev,</div><div class='add'>+			"iCPU enabled, boots from PI external memory\n");</div><div class='add'>+		dev_err(vsc-&gt;dev, "no idea how to deal with this\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	/* !icpu_si_boot_en &amp;&amp; !cpu_pi_en */</div><div class='add'>+	dev_info(vsc-&gt;dev, "iCPU disabled, no external memory\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_mdio_busy_check(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	int ret, err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(vsc73xx_read, err,</div><div class='add'>+				err &lt; 0 || !(val &amp; VSC73XX_MII_STAT_BUSY),</div><div class='add'>+				VSC73XX_MDIO_POLL_SLEEP_US,</div><div class='add'>+				VSC73XX_POLL_TIMEOUT_US, false, vsc,</div><div class='add'>+				VSC73XX_BLOCK_MII, VSC73XX_BLOCK_MII_INTERNAL,</div><div class='add'>+				VSC73XX_MII_STAT, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_phy_read(struct dsa_switch *ds, int phy, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u32 cmd;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_mdio_busy_check(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Setting bit 26 means "read" */</div><div class='add'>+	cmd = VSC73XX_MII_CMD_OPERATION |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MII_CMD_PHY_ADDR, phy) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MII_CMD_PHY_REG, regnum);</div><div class='add'>+	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_MII, VSC73XX_BLOCK_MII_INTERNAL,</div><div class='add'>+			    VSC73XX_MII_CMD, cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_mdio_busy_check(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_MII, VSC73XX_BLOCK_MII_INTERNAL,</div><div class='add'>+			   VSC73XX_MII_DATA, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (val &amp; VSC73XX_MII_DATA_FAILURE) {</div><div class='add'>+		dev_err(vsc-&gt;dev, "reading reg %02x from phy%d failed\n",</div><div class='add'>+			regnum, phy);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	val &amp;= VSC73XX_MII_DATA_READ_DATA;</div><div class='add'>+</div><div class='add'>+	dev_dbg(vsc-&gt;dev, "read reg %02x from phy%d = %04x\n",</div><div class='add'>+		regnum, phy, val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_phy_write(struct dsa_switch *ds, int phy, int regnum,</div><div class='add'>+			     u16 val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u32 cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_mdio_busy_check(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cmd = FIELD_PREP(VSC73XX_MII_CMD_PHY_ADDR, phy) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MII_CMD_PHY_REG, regnum) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MII_CMD_WRITE_DATA, val);</div><div class='add'>+	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_MII, VSC73XX_BLOCK_MII_INTERNAL,</div><div class='add'>+			    VSC73XX_MII_CMD, cmd);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(vsc-&gt;dev, "write %04x to reg %02x in phy%d\n",</div><div class='add'>+		val, regnum, phy);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol vsc73xx_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						      int port,</div><div class='add'>+						      enum dsa_tag_protocol mp)</div><div class='add'>+{</div><div class='add'>+	/* The switch internally uses a 8 byte header with length,</div><div class='add'>+	 * source port, tag, LPA and priority. This is supposedly</div><div class='add'>+	 * only accessible when operating the switch using the internal</div><div class='add'>+	 * CPU or with an external CPU mapping the device in, but not</div><div class='add'>+	 * when operating the switch over SPI and putting frames in/out</div><div class='add'>+	 * on port 6 (the CPU port). So far we must assume that we</div><div class='add'>+	 * cannot access the tag. (See "Internal frame header" section</div><div class='add'>+	 * 3.9.1 in the manual.)</div><div class='add'>+	 */</div><div class='add'>+	return DSA_TAG_PROTO_VSC73XX_8021Q;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_wait_for_vlan_table_cmd(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	int ret, err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(vsc73xx_read, err,</div><div class='add'>+				err &lt; 0 ||</div><div class='add'>+				((val &amp; VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK) ==</div><div class='add'>+				VSC73XX_VLANACCESS_VLAN_TBL_CMD_IDLE),</div><div class='add'>+				VSC73XX_POLL_SLEEP_US, VSC73XX_POLL_TIMEOUT_US,</div><div class='add'>+				false, vsc, VSC73XX_BLOCK_ANALYZER,</div><div class='add'>+				0, VSC73XX_VLANACCESS, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_read_vlan_table_entry(struct vsc73xx *vsc, u16 vid, u8 *portmap)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANTIDX, vid);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_wait_for_vlan_table_cmd(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANACCESS,</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK,</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_TBL_CMD_READ_ENTRY);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_wait_for_vlan_table_cmd(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	vsc73xx_read(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANACCESS, &amp;val);</div><div class='add'>+	*portmap = (val &amp; VSC73XX_VLANACCESS_VLAN_PORT_MASK) &gt;&gt;</div><div class='add'>+		   VSC73XX_VLANACCESS_VLAN_PORT_MASK_SHIFT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_write_vlan_table_entry(struct vsc73xx *vsc, u16 vid, u8 portmap)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANTIDX, vid);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_wait_for_vlan_table_cmd(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANACCESS,</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK |</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_SRC_CHECK |</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_PORT_MASK,</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_TBL_CMD_WRITE_ENTRY |</div><div class='add'>+			    VSC73XX_VLANACCESS_VLAN_SRC_CHECK |</div><div class='add'>+			    (portmap &lt;&lt; VSC73XX_VLANACCESS_VLAN_PORT_MASK_SHIFT));</div><div class='add'>+</div><div class='add'>+	return vsc73xx_wait_for_vlan_table_cmd(vsc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_update_vlan_table(struct vsc73xx *vsc, int port, u16 vid, bool set)</div><div class='add'>+{</div><div class='add'>+	u8 portmap;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read_vlan_table_entry(vsc, vid, &amp;portmap);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		portmap |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		portmap &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	return vsc73xx_write_vlan_table_entry(vsc, vid, portmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_configure_rgmii_port_delay(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	/* Keep 2.0 ns delay for backward complatibility */</div><div class='add'>+	u32 tx_delay = VSC73XX_GMIIDELAY_GMII0_GTXDELAY_2_0_NS;</div><div class='add'>+	u32 rx_delay = VSC73XX_GMIIDELAY_GMII0_RXDELAY_2_0_NS;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, CPU_PORT);</div><div class='add'>+	struct device_node *port_dn = dp-&gt;dn;</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u32 delay;</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(port_dn, "tx-internal-delay-ps", &amp;delay)) {</div><div class='add'>+		switch (delay) {</div><div class='add'>+		case 0:</div><div class='add'>+			tx_delay = VSC73XX_GMIIDELAY_GMII0_GTXDELAY_NONE;</div><div class='add'>+			break;</div><div class='add'>+		case 1400:</div><div class='add'>+			tx_delay = VSC73XX_GMIIDELAY_GMII0_GTXDELAY_1_4_NS;</div><div class='add'>+			break;</div><div class='add'>+		case 1700:</div><div class='add'>+			tx_delay = VSC73XX_GMIIDELAY_GMII0_GTXDELAY_1_7_NS;</div><div class='add'>+			break;</div><div class='add'>+		case 2000:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(vsc-&gt;dev,</div><div class='add'>+				"Unsupported RGMII Transmit Clock Delay\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(vsc-&gt;dev,</div><div class='add'>+			"RGMII Transmit Clock Delay isn't configured, set to 2.0 ns\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!of_property_read_u32(port_dn, "rx-internal-delay-ps", &amp;delay)) {</div><div class='add'>+		switch (delay) {</div><div class='add'>+		case 0:</div><div class='add'>+			rx_delay = VSC73XX_GMIIDELAY_GMII0_RXDELAY_NONE;</div><div class='add'>+			break;</div><div class='add'>+		case 1400:</div><div class='add'>+			rx_delay = VSC73XX_GMIIDELAY_GMII0_RXDELAY_1_4_NS;</div><div class='add'>+			break;</div><div class='add'>+		case 1700:</div><div class='add'>+			rx_delay = VSC73XX_GMIIDELAY_GMII0_RXDELAY_1_7_NS;</div><div class='add'>+			break;</div><div class='add'>+		case 2000:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			dev_err(vsc-&gt;dev,</div><div class='add'>+				"Unsupported RGMII Receive Clock Delay value\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(vsc-&gt;dev,</div><div class='add'>+			"RGMII Receive Clock Delay isn't configured, set to 2.0 ns\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MII delay, set both GTX and RX delay */</div><div class='add'>+	return vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GMIIDELAY,</div><div class='add'>+			     tx_delay | rx_delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	int i, ret, val;</div><div class='add'>+</div><div class='add'>+	dev_info(vsc-&gt;dev, "set up the switch\n");</div><div class='add'>+</div><div class='add'>+	ds-&gt;max_num_bridges = DSA_TAG_8021Q_MAX_NUM_BRIDGES;</div><div class='add'>+	ds-&gt;fdb_isolation = true;</div><div class='add'>+</div><div class='add'>+	/* Issue RESET */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GLORESET,</div><div class='add'>+		      VSC73XX_GLORESET_MASTER_RESET);</div><div class='add'>+	usleep_range(125, 200);</div><div class='add'>+</div><div class='add'>+	/* Initialize memory, initialize RAM bank 0..15 except 6 and 7</div><div class='add'>+	 * This sequence appears in the</div><div class='add'>+	 * VSC7385 SparX-G5 datasheet section 6.6.1</div><div class='add'>+	 * VSC7395 SparX-G5e datasheet section 6.6.1</div><div class='add'>+	 * "initialization sequence".</div><div class='add'>+	 * No explanation is given to the 0x1010400 magic number.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt;= 15; i++) {</div><div class='add'>+		if (i != 6 &amp;&amp; i != 7) {</div><div class='add'>+			vsc73xx_write(vsc, VSC73XX_BLOCK_MEMINIT,</div><div class='add'>+				      2,</div><div class='add'>+				      0, 0x1010400 + i);</div><div class='add'>+			mdelay(1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mdelay(30);</div><div class='add'>+</div><div class='add'>+	/* Clear MAC table */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+		      VSC73XX_MACACCESS,</div><div class='add'>+		      VSC73XX_MACACCESS_CMD_CLEAR_TABLE);</div><div class='add'>+</div><div class='add'>+	/* Set VLAN table to default values */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+		      VSC73XX_VLANACCESS,</div><div class='add'>+		      VSC73XX_VLANACCESS_VLAN_TBL_CMD_CLEAR_TABLE);</div><div class='add'>+</div><div class='add'>+	msleep(40);</div><div class='add'>+</div><div class='add'>+	/* Use 20KiB buffers on all ports on VSC7395</div><div class='add'>+	 * The VSC7385 has 16KiB buffers and that is the</div><div class='add'>+	 * default if we don't set this up explicitly.</div><div class='add'>+	 * Port "31" is "all ports".</div><div class='add'>+	 */</div><div class='add'>+	if (IS_739X(vsc))</div><div class='add'>+		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, 0x1f,</div><div class='add'>+			      VSC73XX_Q_MISC_CONF,</div><div class='add'>+			      VSC73XX_Q_MISC_CONF_EXTENT_MEM);</div><div class='add'>+</div><div class='add'>+	/* Put all ports into reset until enabled */</div><div class='add'>+	for (i = 0; i &lt; 7; i++) {</div><div class='add'>+		if (i == 5)</div><div class='add'>+			continue;</div><div class='add'>+		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, 4,</div><div class='add'>+			      VSC73XX_MAC_CFG, VSC73XX_MAC_CFG_RESET);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure RGMII delay */</div><div class='add'>+	ret = vsc73xx_configure_rgmii_port_delay(ds);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Ingess VLAN reception mask (table 145) */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_VLANMASK,</div><div class='add'>+		      0xff);</div><div class='add'>+	/* IP multicast flood mask (table 144) */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_IFLODMSK,</div><div class='add'>+		      0xff);</div><div class='add'>+</div><div class='add'>+	mdelay(50);</div><div class='add'>+</div><div class='add'>+	/* Disable preamble and use maximum allowed clock for the internal</div><div class='add'>+	 * mdio bus, used for communication with internal PHYs only.</div><div class='add'>+	 */</div><div class='add'>+	val = VSC73XX_MII_MPRES_NOPREAMBLE |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MII_MPRES_PRESCALEVAL,</div><div class='add'>+			 VSC73XX_MII_PRESCALEVAL_MIN);</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MII, VSC73XX_BLOCK_MII_INTERNAL,</div><div class='add'>+		      VSC73XX_MII_MPRES, val);</div><div class='add'>+</div><div class='add'>+	/* Release reset from the internal PHYs */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GLORESET,</div><div class='add'>+		      VSC73XX_GLORESET_PHY_RESET);</div><div class='add'>+</div><div class='add'>+	udelay(4);</div><div class='add'>+</div><div class='add'>+	/* Clear VLAN table */</div><div class='add'>+	for (i = 0; i &lt; VLAN_N_VID; i++)</div><div class='add'>+		vsc73xx_write_vlan_table_entry(vsc, i, 0);</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;vsc-&gt;vlans);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	ret = dsa_tag_8021q_register(ds, htons(ETH_P_8021Q));</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	dsa_tag_8021q_unregister(ds);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_init_port(struct vsc73xx *vsc, int port)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* MAC configure, first reset the port and then write defaults */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_MAC_CFG,</div><div class='add'>+		      VSC73XX_MAC_CFG_RESET);</div><div class='add'>+</div><div class='add'>+	/* Take up the port in 1Gbit mode by default, this will be</div><div class='add'>+	 * augmented after auto-negotiation on the PHY-facing</div><div class='add'>+	 * ports.</div><div class='add'>+	 */</div><div class='add'>+	if (port == CPU_PORT)</div><div class='add'>+		val = VSC73XX_MAC_CFG_1000M_F_RGMII;</div><div class='add'>+	else</div><div class='add'>+		val = VSC73XX_MAC_CFG_1000M_F_PHY;</div><div class='add'>+</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_MAC_CFG,</div><div class='add'>+		      val |</div><div class='add'>+		      VSC73XX_MAC_CFG_TX_EN |</div><div class='add'>+		      VSC73XX_MAC_CFG_RX_EN);</div><div class='add'>+</div><div class='add'>+	/* Flow control for the CPU port:</div><div class='add'>+	 * Use a zero delay pause frame when pause condition is left</div><div class='add'>+	 * Obey pause control frames</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_FCCONF,</div><div class='add'>+		      VSC73XX_FCCONF_ZERO_PAUSE_EN |</div><div class='add'>+		      VSC73XX_FCCONF_FLOW_CTRL_OBEY);</div><div class='add'>+</div><div class='add'>+	/* Issue pause control frames on PHY facing ports.</div><div class='add'>+	 * Allow early initiation of MAC transmission if the amount</div><div class='add'>+	 * of egress data is below 512 bytes on CPU port.</div><div class='add'>+	 * FIXME: enable 20KiB buffers?</div><div class='add'>+	 */</div><div class='add'>+	if (port == CPU_PORT)</div><div class='add'>+		val = VSC73XX_Q_MISC_CONF_EARLY_TX_512;</div><div class='add'>+	else</div><div class='add'>+		val = VSC73XX_Q_MISC_CONF_MAC_PAUSE_MODE;</div><div class='add'>+	val |= VSC73XX_Q_MISC_CONF_EXTENT_MEM;</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_Q_MISC_CONF,</div><div class='add'>+		      val);</div><div class='add'>+</div><div class='add'>+	/* Flow control MAC: a MAC address used in flow control frames */</div><div class='add'>+	val = (vsc-&gt;addr[5] &lt;&lt; 16) | (vsc-&gt;addr[4] &lt;&lt; 8) | (vsc-&gt;addr[3]);</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_FCMACHI,</div><div class='add'>+		      val);</div><div class='add'>+	val = (vsc-&gt;addr[2] &lt;&lt; 16) | (vsc-&gt;addr[1] &lt;&lt; 8) | (vsc-&gt;addr[0]);</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_FCMACLO,</div><div class='add'>+		      val);</div><div class='add'>+</div><div class='add'>+	/* Tell the categorizer to forward pause frames, not control</div><div class='add'>+	 * frame. Do not drop anything.</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port,</div><div class='add'>+		      VSC73XX_CAT_DROP,</div><div class='add'>+		      VSC73XX_CAT_DROP_FWD_PAUSE_ENA);</div><div class='add'>+</div><div class='add'>+	/* Clear all counters */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+		      port, VSC73XX_C_RX0, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_reset_port(struct vsc73xx *vsc, int port, u32 initval)</div><div class='add'>+{</div><div class='add'>+	int ret, err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Disable RX on this port */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+			    VSC73XX_MAC_CFG,</div><div class='add'>+			    VSC73XX_MAC_CFG_RX_EN, 0);</div><div class='add'>+</div><div class='add'>+	/* Discard packets */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='add'>+			    VSC73XX_ARBDISC, BIT(port), BIT(port));</div><div class='add'>+</div><div class='add'>+	/* Wait until queue is empty */</div><div class='add'>+	ret = read_poll_timeout(vsc73xx_read, err,</div><div class='add'>+				err &lt; 0 || (val &amp; BIT(port)),</div><div class='add'>+				VSC73XX_POLL_SLEEP_US,</div><div class='add'>+				VSC73XX_POLL_TIMEOUT_US, false,</div><div class='add'>+				vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='add'>+				VSC73XX_ARBEMPTY, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(vsc-&gt;dev,</div><div class='add'>+			"timeout waiting for block arbiter\n");</div><div class='add'>+	else if (err &lt; 0)</div><div class='add'>+		dev_err(vsc-&gt;dev, "error reading arbiter\n");</div><div class='add'>+</div><div class='add'>+	/* Put this port into reset */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG,</div><div class='add'>+		      VSC73XX_MAC_CFG_RESET | initval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct vsc73xx *vsc = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	/* Special handling of the CPU-facing port */</div><div class='add'>+	if (port == CPU_PORT) {</div><div class='add'>+		/* Other ports are already initialized but not this one */</div><div class='add'>+		vsc73xx_init_port(vsc, CPU_PORT);</div><div class='add'>+		/* Select the external port for this interface (EXT_PORT)</div><div class='add'>+		 * Enable the GMII GTX external clock</div><div class='add'>+		 * Use double data rate (DDR mode)</div><div class='add'>+		 */</div><div class='add'>+		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='add'>+			      CPU_PORT,</div><div class='add'>+			      VSC73XX_ADVPORTM,</div><div class='add'>+			      VSC73XX_ADVPORTM_EXT_PORT |</div><div class='add'>+			      VSC73XX_ADVPORTM_ENA_GTX |</div><div class='add'>+			      VSC73XX_ADVPORTM_DDR_MODE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_mac_link_down(struct phylink_config *config,</div><div class='add'>+				  unsigned int mode, phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct vsc73xx *vsc = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+</div><div class='add'>+	/* This routine is described in the datasheet (below ARBDISC register</div><div class='add'>+	 * description)</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_reset_port(vsc, port, 0);</div><div class='add'>+</div><div class='add'>+	/* Allow backward dropping of frames from this port */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='add'>+			    VSC73XX_SBACKWDROP, BIT(port), BIT(port));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_mac_link_up(struct phylink_config *config,</div><div class='add'>+				struct phy_device *phy, unsigned int mode,</div><div class='add'>+				phy_interface_t interface, int speed,</div><div class='add'>+				int duplex, bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct vsc73xx *vsc = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	u32 val;</div><div class='add'>+	u8 seed;</div><div class='add'>+</div><div class='add'>+	if (speed == SPEED_1000)</div><div class='add'>+		val = VSC73XX_MAC_CFG_GIGA_MODE | VSC73XX_MAC_CFG_TX_IPG_1000M;</div><div class='add'>+	else</div><div class='add'>+		val = VSC73XX_MAC_CFG_TX_IPG_100_10M;</div><div class='add'>+</div><div class='add'>+	if (phy_interface_mode_is_rgmii(interface))</div><div class='add'>+		val |= VSC73XX_MAC_CFG_CLK_SEL_1000M;</div><div class='add'>+	else</div><div class='add'>+		val |= VSC73XX_MAC_CFG_CLK_SEL_EXT;</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		val |= VSC73XX_MAC_CFG_FDX;</div><div class='add'>+	else</div><div class='add'>+		/* In datasheet description ("Port Mode Procedure" in 5.6.2)</div><div class='add'>+		 * this bit is configured only for half duplex.</div><div class='add'>+		 */</div><div class='add'>+		val |= VSC73XX_MAC_CFG_WEXC_DIS;</div><div class='add'>+</div><div class='add'>+	/* This routine is described in the datasheet (below ARBDISC register</div><div class='add'>+	 * description)</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_reset_port(vsc, port, val);</div><div class='add'>+</div><div class='add'>+	/* Seed the port randomness with randomness */</div><div class='add'>+	get_random_bytes(&amp;seed, 1);</div><div class='add'>+	val |= seed &lt;&lt; VSC73XX_MAC_CFG_SEED_OFFSET;</div><div class='add'>+	val |= VSC73XX_MAC_CFG_SEED_LOAD;</div><div class='add'>+</div><div class='add'>+	/* Those bits are responsible for MTU only. Kernel takes care about MTU,</div><div class='add'>+	 * let's enable +8 bytes frame length unconditionally.</div><div class='add'>+	 */</div><div class='add'>+	val |= VSC73XX_MAC_CFG_VLAN_AWR | VSC73XX_MAC_CFG_VLAN_DBLAWR;</div><div class='add'>+</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG, val);</div><div class='add'>+</div><div class='add'>+	/* Flow control for the PHY facing ports:</div><div class='add'>+	 * Use a zero delay pause frame when pause condition is left</div><div class='add'>+	 * Obey pause control frames</div><div class='add'>+	 * When generating pause frames, use 0xff as pause value</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_FCCONF,</div><div class='add'>+		      VSC73XX_FCCONF_ZERO_PAUSE_EN |</div><div class='add'>+		      VSC73XX_FCCONF_FLOW_CTRL_OBEY |</div><div class='add'>+		      0xff);</div><div class='add'>+</div><div class='add'>+	/* Accept packets again */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='add'>+			    VSC73XX_ARBDISC, BIT(port), 0);</div><div class='add'>+</div><div class='add'>+	/* Disallow backward dropping of frames from this port */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='add'>+			    VSC73XX_SBACKWDROP, BIT(port), 0);</div><div class='add'>+</div><div class='add'>+	/* Enable TX, RX, deassert reset, stop loading seed */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+			    VSC73XX_MAC_CFG,</div><div class='add'>+			    VSC73XX_MAC_CFG_RESET | VSC73XX_MAC_CFG_SEED_LOAD |</div><div class='add'>+			    VSC73XX_MAC_CFG_TX_EN | VSC73XX_MAC_CFG_RX_EN,</div><div class='add'>+			    VSC73XX_MAC_CFG_TX_EN | VSC73XX_MAC_CFG_RX_EN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool vsc73xx_tag_8021q_active(struct dsa_port *dp)</div><div class='add'>+{</div><div class='add'>+	return !dsa_port_is_vlan_filtering(dp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct vsc73xx_bridge_vlan *</div><div class='add'>+vsc73xx_bridge_vlan_find(struct vsc73xx *vsc, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vlan, &amp;vsc-&gt;vlans, list)</div><div class='add'>+		if (vlan-&gt;vid == vid)</div><div class='add'>+			return vlan;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+vsc73xx_bridge_vlan_remove_port(struct vsc73xx_bridge_vlan *vsc73xx_vlan,</div><div class='add'>+				int port)</div><div class='add'>+{</div><div class='add'>+	vsc73xx_vlan-&gt;portmask &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	if (vsc73xx_vlan-&gt;portmask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;vsc73xx_vlan-&gt;list);</div><div class='add'>+	kfree(vsc73xx_vlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_bridge_vlan_summary(struct vsc73xx *vsc, int port,</div><div class='add'>+					struct vsc73xx_vlan_summary *summary,</div><div class='add'>+					u16 ignored_vid)</div><div class='add'>+{</div><div class='add'>+	size_t num_tagged = 0, num_untagged = 0;</div><div class='add'>+	struct vsc73xx_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vlan, &amp;vsc-&gt;vlans, list) {</div><div class='add'>+		if (!(vlan-&gt;portmask &amp; BIT(port)) || vlan-&gt;vid == ignored_vid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (vlan-&gt;untagged &amp; BIT(port))</div><div class='add'>+			num_untagged++;</div><div class='add'>+		else</div><div class='add'>+			num_tagged++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	summary-&gt;num_untagged = num_untagged;</div><div class='add'>+	summary-&gt;num_tagged = num_tagged;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 vsc73xx_find_first_vlan_untagged(struct vsc73xx *vsc, int port)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_bridge_vlan *vlan;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(vlan, &amp;vsc-&gt;vlans, list)</div><div class='add'>+		if ((vlan-&gt;portmask &amp; BIT(port)) &amp;&amp;</div><div class='add'>+		    (vlan-&gt;untagged &amp; BIT(port)))</div><div class='add'>+			return vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+	return VLAN_N_VID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_set_vlan_conf(struct vsc73xx *vsc, int port,</div><div class='add'>+				 enum vsc73xx_port_vlan_conf port_vlan_conf)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (port_vlan_conf == VSC73XX_VLAN_IGNORE)</div><div class='add'>+		val = VSC73XX_CAT_VLAN_MISC_VLAN_TCI_IGNORE_ENA |</div><div class='add'>+		      VSC73XX_CAT_VLAN_MISC_VLAN_KEEP_TAG_ENA;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+				  VSC73XX_CAT_VLAN_MISC,</div><div class='add'>+				  VSC73XX_CAT_VLAN_MISC_VLAN_TCI_IGNORE_ENA |</div><div class='add'>+				  VSC73XX_CAT_VLAN_MISC_VLAN_KEEP_TAG_ENA, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = (port_vlan_conf == VSC73XX_VLAN_FILTER) ?</div><div class='add'>+	      VSC73XX_TXUPDCFG_TX_INSERT_TAG : 0;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+				   VSC73XX_TXUPDCFG,</div><div class='add'>+				   VSC73XX_TXUPDCFG_TX_INSERT_TAG, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vsc73xx_vlan_commit_conf - Update VLAN configuration of a port</div><div class='add'>+ * @vsc: Switch private data structure</div><div class='add'>+ * @port: Port index on which to operate</div><div class='add'>+ *</div><div class='add'>+ * Update the VLAN behavior of a port to make sure that when it is under</div><div class='add'>+ * a VLAN filtering bridge, the port is either filtering with tag</div><div class='add'>+ * preservation, or filtering with all VLANs egress-untagged. Otherwise,</div><div class='add'>+ * the port ignores VLAN tags from packets and applies the port-based</div><div class='add'>+ * VID.</div><div class='add'>+ *</div><div class='add'>+ * Must be called when changes are made to:</div><div class='add'>+ * - the bridge VLAN filtering state of the port</div><div class='add'>+ * - the number or attributes of VLANs from the bridge VLAN table,</div><div class='add'>+ *   while the port is currently VLAN-aware</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+static int vsc73xx_vlan_commit_conf(struct vsc73xx *vsc, int port)</div><div class='add'>+{</div><div class='add'>+	enum vsc73xx_port_vlan_conf port_vlan_conf = VSC73XX_VLAN_IGNORE;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(vsc-&gt;ds, port);</div><div class='add'>+</div><div class='add'>+	if (port == CPU_PORT) {</div><div class='add'>+		port_vlan_conf = VSC73XX_VLAN_FILTER;</div><div class='add'>+	} else if (dsa_port_is_vlan_filtering(dp)) {</div><div class='add'>+		struct vsc73xx_vlan_summary summary;</div><div class='add'>+</div><div class='add'>+		port_vlan_conf = VSC73XX_VLAN_FILTER;</div><div class='add'>+</div><div class='add'>+		vsc73xx_bridge_vlan_summary(vsc, port, &amp;summary, VLAN_N_VID);</div><div class='add'>+		if (summary.num_tagged == 0)</div><div class='add'>+			port_vlan_conf = VSC73XX_VLAN_FILTER_UNTAG_ALL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_set_vlan_conf(vsc, port, port_vlan_conf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_vlan_change_untagged(struct vsc73xx *vsc, int port, u16 vid, bool set)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	if (set)</div><div class='add'>+		val = VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_ENA |</div><div class='add'>+		      ((vid &lt;&lt; VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_SHIFT) &amp;</div><div class='add'>+		       VSC73XX_TXUPDCFG_TX_UNTAGGED_VID);</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+				   VSC73XX_TXUPDCFG,</div><div class='add'>+				   VSC73XX_TXUPDCFG_TX_UNTAGGED_VID_ENA |</div><div class='add'>+				   VSC73XX_TXUPDCFG_TX_UNTAGGED_VID, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vsc73xx_vlan_commit_untagged - Update native VLAN of a port</div><div class='add'>+ * @vsc: Switch private data structure</div><div class='add'>+ * @port: Port index on which to operate</div><div class='add'>+ *</div><div class='add'>+ * Update the native VLAN of a port (the one VLAN which is transmitted</div><div class='add'>+ * as egress-tagged on a trunk port) when port is in VLAN filtering mode and</div><div class='add'>+ * only one untagged vid is configured.</div><div class='add'>+ * In other cases no need to configure it because switch can untag all vlans on</div><div class='add'>+ * the port.</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+static int vsc73xx_vlan_commit_untagged(struct vsc73xx *vsc, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(vsc-&gt;ds, port);</div><div class='add'>+	struct vsc73xx_vlan_summary summary;</div><div class='add'>+	u16 vid = 0;</div><div class='add'>+	bool valid;</div><div class='add'>+</div><div class='add'>+	if (!dsa_port_is_vlan_filtering(dp))</div><div class='add'>+		/* Port is configured to untag all vlans in that case.</div><div class='add'>+		 * No need to commit untagged config change.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vsc73xx_bridge_vlan_summary(vsc, port, &amp;summary, VLAN_N_VID);</div><div class='add'>+</div><div class='add'>+	if (summary.num_untagged &gt; 1)</div><div class='add'>+		/* Port must untag all vlans in that case.</div><div class='add'>+		 * No need to commit untagged config change.</div><div class='add'>+		 */</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	valid = (summary.num_untagged == 1);</div><div class='add'>+	if (valid)</div><div class='add'>+		vid = vsc73xx_find_first_vlan_untagged(vsc, port);</div><div class='add'>+</div><div class='add'>+	return vsc73xx_vlan_change_untagged(vsc, port, vid, valid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_vlan_change_pvid(struct vsc73xx *vsc, int port, u16 vid, bool set)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	val = set ? 0 : VSC73XX_CAT_DROP_UNTAGGED_ENA;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+				  VSC73XX_CAT_DROP,</div><div class='add'>+				  VSC73XX_CAT_DROP_UNTAGGED_ENA, val);</div><div class='add'>+	if (!set || ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+				   VSC73XX_CAT_PORT_VLAN,</div><div class='add'>+				   VSC73XX_CAT_PORT_VLAN_VLAN_VID,</div><div class='add'>+				   vid &amp; VSC73XX_CAT_PORT_VLAN_VLAN_VID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * vsc73xx_vlan_commit_pvid - Update port-based default VLAN of a port</div><div class='add'>+ * @vsc: Switch private data structure</div><div class='add'>+ * @port: Port index on which to operate</div><div class='add'>+ *</div><div class='add'>+ * Update the PVID of a port so that it follows either the bridge PVID</div><div class='add'>+ * configuration, when the bridge is currently VLAN-aware, or the PVID</div><div class='add'>+ * from tag_8021q, when the port is standalone or under a VLAN-unaware</div><div class='add'>+ * bridge. A port with no PVID drops all untagged and VID 0 tagged</div><div class='add'>+ * traffic.</div><div class='add'>+ *</div><div class='add'>+ * Must be called when changes are made to:</div><div class='add'>+ * - the bridge VLAN filtering state of the port</div><div class='add'>+ * - the number or attributes of VLANs from the bridge VLAN table,</div><div class='add'>+ *   while the port is currently VLAN-aware</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or negative errno on error.</div><div class='add'>+ */</div><div class='add'>+static int vsc73xx_vlan_commit_pvid(struct vsc73xx *vsc, int port)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_portinfo *portinfo = &amp;vsc-&gt;portinfo[port];</div><div class='add'>+	bool valid = portinfo-&gt;pvid_tag_8021q_configured;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(vsc-&gt;ds, port);</div><div class='add'>+	u16 vid = portinfo-&gt;pvid_tag_8021q;</div><div class='add'>+</div><div class='add'>+	if (dsa_port_is_vlan_filtering(dp)) {</div><div class='add'>+		vid = portinfo-&gt;pvid_vlan_filtering;</div><div class='add'>+		valid = portinfo-&gt;pvid_vlan_filtering_configured;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_vlan_change_pvid(vsc, port, vid, valid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_vlan_commit_settings(struct vsc73xx *vsc, int port)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_vlan_commit_untagged(vsc, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_vlan_commit_pvid(vsc, port);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_vlan_commit_conf(vsc, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_enable(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct phy_device *phy)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	dev_info(vsc-&gt;dev, "enable port %d\n", port);</div><div class='add'>+	vsc73xx_init_port(vsc, port);</div><div class='add'>+</div><div class='add'>+	return vsc73xx_vlan_commit_settings(vsc, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_port_disable(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* Just put the port into reset */</div><div class='add'>+	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+		      VSC73XX_MAC_CFG, VSC73XX_MAC_CFG_RESET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct vsc73xx_counter *</div><div class='add'>+vsc73xx_find_counter(struct vsc73xx *vsc,</div><div class='add'>+		     u8 counter,</div><div class='add'>+		     bool tx)</div><div class='add'>+{</div><div class='add'>+	const struct vsc73xx_counter *cnts;</div><div class='add'>+	int num_cnts;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (tx) {</div><div class='add'>+		cnts = vsc73xx_tx_counters;</div><div class='add'>+		num_cnts = ARRAY_SIZE(vsc73xx_tx_counters);</div><div class='add'>+	} else {</div><div class='add'>+		cnts = vsc73xx_rx_counters;</div><div class='add'>+		num_cnts = ARRAY_SIZE(vsc73xx_rx_counters);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_cnts; i++) {</div><div class='add'>+		const struct vsc73xx_counter *cnt;</div><div class='add'>+</div><div class='add'>+		cnt = &amp;cnts[i];</div><div class='add'>+		if (cnt-&gt;counter == counter)</div><div class='add'>+			return cnt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+				uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	const struct vsc73xx_counter *cnt;</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u8 indices[6];</div><div class='add'>+	u8 *buf = data;</div><div class='add'>+	int i;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+			   VSC73XX_C_CFG, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	indices[0] = (val &amp; 0x1f); /* RX counter 0 */</div><div class='add'>+	indices[1] = ((val &gt;&gt; 5) &amp; 0x1f); /* RX counter 1 */</div><div class='add'>+	indices[2] = ((val &gt;&gt; 10) &amp; 0x1f); /* RX counter 2 */</div><div class='add'>+	indices[3] = ((val &gt;&gt; 16) &amp; 0x1f); /* TX counter 0 */</div><div class='add'>+	indices[4] = ((val &gt;&gt; 21) &amp; 0x1f); /* TX counter 1 */</div><div class='add'>+	indices[5] = ((val &gt;&gt; 26) &amp; 0x1f); /* TX counter 2 */</div><div class='add'>+</div><div class='add'>+	/* The first counters is the RX octets */</div><div class='add'>+	ethtool_puts(&amp;buf, "RxEtherStatsOctets");</div><div class='add'>+</div><div class='add'>+	/* Each port supports recording 3 RX counters and 3 TX counters,</div><div class='add'>+	 * figure out what counters we use in this set-up and return the</div><div class='add'>+	 * names of them. The hardware default counters will be number of</div><div class='add'>+	 * packets on RX/TX, combined broadcast+multicast packets RX/TX and</div><div class='add'>+	 * total error packets RX/TX.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 3; i++) {</div><div class='add'>+		cnt = vsc73xx_find_counter(vsc, indices[i], false);</div><div class='add'>+		ethtool_puts(&amp;buf, cnt ? cnt-&gt;name : "");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TX stats begins with the number of TX octets */</div><div class='add'>+	ethtool_puts(&amp;buf, "TxEtherStatsOctets");</div><div class='add'>+</div><div class='add'>+	for (i = 3; i &lt; 6; i++) {</div><div class='add'>+		cnt = vsc73xx_find_counter(vsc, indices[i], true);</div><div class='add'>+		ethtool_puts(&amp;buf, cnt ? cnt-&gt;name : "");</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	/* We only support SS_STATS */</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+	/* RX and TX packets, then 3 RX counters, 3 TX counters */</div><div class='add'>+	return 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				      uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u8 regs[] = {</div><div class='add'>+		VSC73XX_RXOCT,</div><div class='add'>+		VSC73XX_C_RX0,</div><div class='add'>+		VSC73XX_C_RX1,</div><div class='add'>+		VSC73XX_C_RX2,</div><div class='add'>+		VSC73XX_TXOCT,</div><div class='add'>+		VSC73XX_C_TX0,</div><div class='add'>+		VSC73XX_C_TX1,</div><div class='add'>+		VSC73XX_C_TX2,</div><div class='add'>+	};</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(regs); i++) {</div><div class='add'>+		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+				   regs[i], &amp;val);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(vsc-&gt;dev, "error reading counter %d\n", i);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		data[i] = val;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='add'>+			     VSC73XX_MAXLEN, new_mtu + ETH_HLEN + ETH_FCS_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* According to application not "VSC7398 Jumbo Frames" setting</div><div class='add'>+ * up the frame size to 9.6 KB does not affect the performance on standard</div><div class='add'>+ * frames. It is clear from the application note that</div><div class='add'>+ * "9.6 kilobytes" == 9600 bytes.</div><div class='add'>+ */</div><div class='add'>+static int vsc73xx_get_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	return 9600 - ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_phylink_get_caps(struct dsa_switch *dsa, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	unsigned long *interfaces = config-&gt;supported_interfaces;</div><div class='add'>+</div><div class='add'>+	if (port == 5)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (port == CPU_PORT) {</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_REVMII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII, interfaces);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port &lt;= 4) {</div><div class='add'>+		/* Internal PHYs */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL, interfaces);</div><div class='add'>+		/* phylib default */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII, interfaces);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | MAC_1000;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+			    bool vlan_filtering, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	/* The commit to hardware processed below is required because vsc73xx</div><div class='add'>+	 * is using tag_8021q. When vlan_filtering is disabled, tag_8021q uses</div><div class='add'>+	 * pvid/untagged vlans for port recognition. The values configured for</div><div class='add'>+	 * vlans and pvid/untagged states are stored in portinfo structure.</div><div class='add'>+	 * When vlan_filtering is enabled, we need to restore pvid/untagged from</div><div class='add'>+	 * portinfo structure. Analogous routine is processed when</div><div class='add'>+	 * vlan_filtering is disabled, but values used for tag_8021q are</div><div class='add'>+	 * restored.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return vsc73xx_vlan_commit_settings(vsc, port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+				 const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool untagged = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED;</div><div class='add'>+	bool pvid = vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct vsc73xx_bridge_vlan *vsc73xx_vlan;</div><div class='add'>+	struct vsc73xx_vlan_summary summary;</div><div class='add'>+	struct vsc73xx_portinfo *portinfo;</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	bool commit_to_hardware;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Be sure to deny alterations to the configuration done by tag_8021q.</div><div class='add'>+	 */</div><div class='add'>+	if (vid_is_dsa_8021q(vlan-&gt;vid)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Range 3072-4095 reserved for dsa_8021q operation");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The processed vlan-&gt;vid is excluded from the search because the VLAN</div><div class='add'>+	 * can be re-added with a different set of flags, so it's easiest to</div><div class='add'>+	 * ignore its old flags from the VLAN database software copy.</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_bridge_vlan_summary(vsc, port, &amp;summary, vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	/* VSC73XX allows only three untagged states: none, one or all */</div><div class='add'>+	if ((untagged &amp;&amp; summary.num_tagged &gt; 0 &amp;&amp; summary.num_untagged &gt; 0) ||</div><div class='add'>+	    (!untagged &amp;&amp; summary.num_untagged &gt; 1)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Port can have only none, one or all untagged vlan");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsc73xx_vlan = vsc73xx_bridge_vlan_find(vsc, vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	if (!vsc73xx_vlan) {</div><div class='add'>+		vsc73xx_vlan = kzalloc(sizeof(*vsc73xx_vlan), GFP_KERNEL);</div><div class='add'>+		if (!vsc73xx_vlan)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		vsc73xx_vlan-&gt;vid = vlan-&gt;vid;</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;vsc73xx_vlan-&gt;list, &amp;vsc-&gt;vlans);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsc73xx_vlan-&gt;portmask |= BIT(port);</div><div class='add'>+</div><div class='add'>+	/* CPU port must be always tagged because source port identification is</div><div class='add'>+	 * based on tag_8021q.</div><div class='add'>+	 */</div><div class='add'>+	if (port == CPU_PORT)</div><div class='add'>+		goto update_vlan_table;</div><div class='add'>+</div><div class='add'>+	if (untagged)</div><div class='add'>+		vsc73xx_vlan-&gt;untagged |= BIT(port);</div><div class='add'>+	else</div><div class='add'>+		vsc73xx_vlan-&gt;untagged &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+	portinfo = &amp;vsc-&gt;portinfo[port];</div><div class='add'>+</div><div class='add'>+	if (pvid) {</div><div class='add'>+		portinfo-&gt;pvid_vlan_filtering_configured = true;</div><div class='add'>+		portinfo-&gt;pvid_vlan_filtering = vlan-&gt;vid;</div><div class='add'>+	} else if (portinfo-&gt;pvid_vlan_filtering_configured &amp;&amp;</div><div class='add'>+		   portinfo-&gt;pvid_vlan_filtering == vlan-&gt;vid) {</div><div class='add'>+		portinfo-&gt;pvid_vlan_filtering_configured = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	commit_to_hardware = !vsc73xx_tag_8021q_active(dp);</div><div class='add'>+	if (commit_to_hardware) {</div><div class='add'>+		ret = vsc73xx_vlan_commit_settings(vsc, port);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+update_vlan_table:</div><div class='add'>+	ret = vsc73xx_update_vlan_table(vsc, port, vlan-&gt;vid, true);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return 0;</div><div class='add'>+err:</div><div class='add'>+	vsc73xx_bridge_vlan_remove_port(vsc73xx_vlan, port);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+				 const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_bridge_vlan *vsc73xx_vlan;</div><div class='add'>+	struct vsc73xx_portinfo *portinfo;</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	bool commit_to_hardware;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_update_vlan_table(vsc, port, vlan-&gt;vid, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	portinfo = &amp;vsc-&gt;portinfo[port];</div><div class='add'>+</div><div class='add'>+	if (portinfo-&gt;pvid_vlan_filtering_configured &amp;&amp;</div><div class='add'>+	    portinfo-&gt;pvid_vlan_filtering == vlan-&gt;vid)</div><div class='add'>+		portinfo-&gt;pvid_vlan_filtering_configured = false;</div><div class='add'>+</div><div class='add'>+	vsc73xx_vlan = vsc73xx_bridge_vlan_find(vsc, vlan-&gt;vid);</div><div class='add'>+</div><div class='add'>+	if (vsc73xx_vlan)</div><div class='add'>+		vsc73xx_bridge_vlan_remove_port(vsc73xx_vlan, port);</div><div class='add'>+</div><div class='add'>+	commit_to_hardware = !vsc73xx_tag_8021q_active(dsa_to_port(ds, port));</div><div class='add'>+</div><div class='add'>+	if (commit_to_hardware)</div><div class='add'>+		return vsc73xx_vlan_commit_settings(vsc, port);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_tag_8021q_vlan_add(struct dsa_switch *ds, int port, u16 vid,</div><div class='add'>+				      u16 flags)</div><div class='add'>+{</div><div class='add'>+	bool pvid = flags &amp; BRIDGE_VLAN_INFO_PVID;</div><div class='add'>+	struct vsc73xx_portinfo *portinfo;</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	bool commit_to_hardware;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	portinfo = &amp;vsc-&gt;portinfo[port];</div><div class='add'>+</div><div class='add'>+	if (pvid) {</div><div class='add'>+		portinfo-&gt;pvid_tag_8021q_configured = true;</div><div class='add'>+		portinfo-&gt;pvid_tag_8021q = vid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	commit_to_hardware = vsc73xx_tag_8021q_active(dsa_to_port(ds, port));</div><div class='add'>+	if (commit_to_hardware) {</div><div class='add'>+		ret = vsc73xx_vlan_commit_settings(vsc, port);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_vlan_table(vsc, port, vid, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_tag_8021q_vlan_del(struct dsa_switch *ds, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_portinfo *portinfo;</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	portinfo = &amp;vsc-&gt;portinfo[port];</div><div class='add'>+</div><div class='add'>+	if (portinfo-&gt;pvid_tag_8021q_configured &amp;&amp;</div><div class='add'>+	    portinfo-&gt;pvid_tag_8021q == vid) {</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		bool commit_to_hardware;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		portinfo-&gt;pvid_tag_8021q_configured = false;</div><div class='add'>+</div><div class='add'>+		commit_to_hardware = vsc73xx_tag_8021q_active(dp);</div><div class='add'>+		if (commit_to_hardware) {</div><div class='add'>+			err = vsc73xx_vlan_commit_settings(vsc, port);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_vlan_table(vsc, port, vid, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+					 struct switchdev_brport_flags flags,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~BR_LEARNING)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct switchdev_brport_flags flags,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		u32 val = flags.val &amp; BR_LEARNING ? BIT(port) : 0;</div><div class='add'>+		struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+		return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+					   VSC73XX_LEARNMASK, BIT(port), val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_refresh_fwd_map(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *other_dp, *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u16 mask;</div><div class='add'>+</div><div class='add'>+	if (state != BR_STATE_FORWARDING) {</div><div class='add'>+		/* Ports that aren't in the forwarding state must not</div><div class='add'>+		 * forward packets anywhere.</div><div class='add'>+		 */</div><div class='add'>+		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				    VSC73XX_SRCMASKS + port,</div><div class='add'>+				    VSC73XX_SRCMASKS_PORTS_MASK, 0);</div><div class='add'>+</div><div class='add'>+		dsa_switch_for_each_available_port(other_dp, ds) {</div><div class='add'>+			if (other_dp == dp)</div><div class='add'>+				continue;</div><div class='add'>+			vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+					    VSC73XX_SRCMASKS + other_dp-&gt;index,</div><div class='add'>+					    BIT(port), 0);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Forwarding ports must forward to the CPU and to other ports</div><div class='add'>+	 * in the same bridge</div><div class='add'>+	 */</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+			    VSC73XX_SRCMASKS + CPU_PORT, BIT(port), BIT(port));</div><div class='add'>+</div><div class='add'>+	mask = BIT(CPU_PORT);</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(other_dp, ds) {</div><div class='add'>+		int other_port = other_dp-&gt;index;</div><div class='add'>+</div><div class='add'>+		if (port == other_port || !dsa_port_bridge_same(dp, other_dp) ||</div><div class='add'>+		    other_dp-&gt;stp_state != BR_STATE_FORWARDING)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mask |= BIT(other_port);</div><div class='add'>+</div><div class='add'>+		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				    VSC73XX_SRCMASKS + other_port,</div><div class='add'>+				    BIT(port), BIT(port));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+			    VSC73XX_SRCMASKS + port,</div><div class='add'>+			    VSC73XX_SRCMASKS_PORTS_MASK, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* FIXME: STP frames aren't forwarded at this moment. BPDU frames are</div><div class='add'>+ * forwarded only from and to PI/SI interface. For more info see chapter</div><div class='add'>+ * 2.7.1 (CPU Forwarding) in datasheet.</div><div class='add'>+ * This function is required for tag_8021q operations.</div><div class='add'>+ */</div><div class='add'>+static void vsc73xx_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+				       u8 state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	if (state == BR_STATE_LEARNING || state == BR_STATE_FORWARDING)</div><div class='add'>+		val = dp-&gt;learning ? BIT(port) : 0;</div><div class='add'>+</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+			    VSC73XX_LEARNMASK, BIT(port), val);</div><div class='add'>+</div><div class='add'>+	val = (state == BR_STATE_BLOCKING || state == BR_STATE_DISABLED) ?</div><div class='add'>+	      0 : BIT(port);</div><div class='add'>+	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+			    VSC73XX_RECVMASK, BIT(port), val);</div><div class='add'>+</div><div class='add'>+	/* CPU Port should always forward packets when user ports are forwarding</div><div class='add'>+	 * so let's configure it from other ports only.</div><div class='add'>+	 */</div><div class='add'>+	if (port != CPU_PORT)</div><div class='add'>+		vsc73xx_refresh_fwd_map(ds, port, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 vsc73xx_calc_hash(const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	/* VID 5-0, MAC 47-44 */</div><div class='add'>+	u16 hash = FIELD_PREP(VSC73XX_HASH0_VID_TO_MASK,</div><div class='add'>+			      FIELD_GET(VSC73XX_HASH0_VID_FROM_MASK, vid)) |</div><div class='add'>+		   FIELD_PREP(VSC73XX_HASH0_MAC0_TO_MASK,</div><div class='add'>+			      FIELD_GET(VSC73XX_HASH0_MAC0_FROM_MASK, addr[0]));</div><div class='add'>+	/* MAC 43-33 */</div><div class='add'>+	hash ^= FIELD_PREP(VSC73XX_HASH1_MAC0_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH1_MAC0_FROM_MASK, addr[0])) |</div><div class='add'>+		FIELD_PREP(VSC73XX_HASH1_MAC1_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH1_MAC1_FROM_MASK, addr[1]));</div><div class='add'>+	/* MAC 32-22 */</div><div class='add'>+	hash ^= FIELD_PREP(VSC73XX_HASH2_MAC1_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH2_MAC1_FROM_MASK, addr[1])) |</div><div class='add'>+		FIELD_PREP(VSC73XX_HASH2_MAC2_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH2_MAC2_FROM_MASK, addr[2])) |</div><div class='add'>+		FIELD_PREP(VSC73XX_HASH2_MAC3_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH2_MAC3_FROM_MASK, addr[3]));</div><div class='add'>+	/* MAC 21-11 */</div><div class='add'>+	hash ^= FIELD_PREP(VSC73XX_HASH3_MAC3_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH3_MAC3_FROM_MASK, addr[3])) |</div><div class='add'>+		FIELD_PREP(VSC73XX_HASH3_MAC4_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH3_MAC4_FROM_MASK, addr[4]));</div><div class='add'>+	/* MAC 10-0 */</div><div class='add'>+	hash ^= FIELD_PREP(VSC73XX_HASH4_MAC4_TO_MASK,</div><div class='add'>+			   FIELD_GET(VSC73XX_HASH4_MAC4_FROM_MASK, addr[4])) |</div><div class='add'>+		addr[5];</div><div class='add'>+</div><div class='add'>+	return hash;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_port_wait_for_mac_table_cmd(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	int ret, err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(vsc73xx_read, err,</div><div class='add'>+				err &lt; 0 ||</div><div class='add'>+				((val &amp; VSC73XX_MACACCESS_CMD_MASK) ==</div><div class='add'>+				 VSC73XX_MACACCESS_CMD_IDLE),</div><div class='add'>+				VSC73XX_POLL_SLEEP_US, VSC73XX_POLL_TIMEOUT_US,</div><div class='add'>+				false, vsc, VSC73XX_BLOCK_ANALYZER,</div><div class='add'>+				0, VSC73XX_MACACCESS, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_read_mac_table_row(struct vsc73xx *vsc, u16 index,</div><div class='add'>+					   struct vsc73xx_fdb *fdb)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!fdb)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (index &gt;= VSC73XX_NUM_FDB_ROWS)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VSC73XX_NUM_BUCKETS; i++) {</div><div class='add'>+		ret = vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				    VSC73XX_MACTINDX,</div><div class='add'>+				    (i ? 0 : VSC73XX_MACTINDX_SHADOW) |</div><div class='add'>+				    FIELD_PREP(VSC73XX_MACTINDX_BUCKET_MSK, i) |</div><div class='add'>+				    index);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = vsc73xx_port_wait_for_mac_table_cmd(vsc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+					  VSC73XX_MACACCESS,</div><div class='add'>+					  VSC73XX_MACACCESS_CMD_MASK,</div><div class='add'>+					  VSC73XX_MACACCESS_CMD_READ_ENTRY);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = vsc73xx_port_wait_for_mac_table_cmd(vsc);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				   VSC73XX_MACACCESS, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		fdb[i].valid = FIELD_GET(VSC73XX_MACACCESS_VALID, val);</div><div class='add'>+		if (!fdb[i].valid)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fdb[i].port = FIELD_GET(VSC73XX_MACACCESS_DEST_IDX_MASK, val);</div><div class='add'>+</div><div class='add'>+		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				   VSC73XX_MACHDATA, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		fdb[i].vid = FIELD_GET(VSC73XX_MACHDATA_VID, val);</div><div class='add'>+		fdb[i].mac[0] = FIELD_GET(VSC73XX_MACHDATA_MAC0, val);</div><div class='add'>+		fdb[i].mac[1] = FIELD_GET(VSC73XX_MACHDATA_MAC1, val);</div><div class='add'>+</div><div class='add'>+		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				   VSC73XX_MACLDATA, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		fdb[i].mac[2] = FIELD_GET(VSC73XX_MACLDATA_MAC2, val);</div><div class='add'>+		fdb[i].mac[3] = FIELD_GET(VSC73XX_MACLDATA_MAC3, val);</div><div class='add'>+		fdb[i].mac[4] = FIELD_GET(VSC73XX_MACLDATA_MAC4, val);</div><div class='add'>+		fdb[i].mac[5] = FIELD_GET(VSC73XX_MACLDATA_MAC5, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+vsc73xx_fdb_operation(struct vsc73xx *vsc, const unsigned char *addr, u16 vid,</div><div class='add'>+		      u16 hash, u16 cmd_mask, u16 cmd_val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(VSC73XX_MACHDATA_VID, vid) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MACHDATA_MAC0, addr[0]) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MACHDATA_MAC1, addr[1]);</div><div class='add'>+	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_MACHDATA,</div><div class='add'>+			    val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(VSC73XX_MACLDATA_MAC2, addr[2]) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MACLDATA_MAC3, addr[3]) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MACLDATA_MAC4, addr[4]) |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MACLDATA_MAC5, addr[5]);</div><div class='add'>+	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_MACLDATA,</div><div class='add'>+			    val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_MACTINDX,</div><div class='add'>+			    hash);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_port_wait_for_mac_table_cmd(vsc);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='add'>+				  VSC73XX_MACACCESS, cmd_mask, cmd_val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_port_wait_for_mac_table_cmd(vsc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_fdb_del_entry(struct vsc73xx *vsc, int port,</div><div class='add'>+				 const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_fdb fdb[VSC73XX_NUM_BUCKETS];</div><div class='add'>+	u16 hash = vsc73xx_calc_hash(addr, vid);</div><div class='add'>+	int bucket, ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_port_read_mac_table_row(vsc, hash, fdb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	for (bucket = 0; bucket &lt; VSC73XX_NUM_BUCKETS; bucket++) {</div><div class='add'>+		if (fdb[bucket].valid &amp;&amp; fdb[bucket].port == port &amp;&amp;</div><div class='add'>+		    ether_addr_equal(addr, fdb[bucket].mac))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bucket == VSC73XX_NUM_BUCKETS) {</div><div class='add'>+		/* Can't find MAC in MAC table */</div><div class='add'>+		ret = -ENODATA;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_fdb_operation(vsc, addr, vid, hash,</div><div class='add'>+				    VSC73XX_MACACCESS_CMD_MASK,</div><div class='add'>+				    VSC73XX_MACACCESS_CMD_FORGET);</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_fdb_add_entry(struct vsc73xx *vsc, int port,</div><div class='add'>+				 const unsigned char *addr, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_fdb fdb[VSC73XX_NUM_BUCKETS];</div><div class='add'>+	u16 hash = vsc73xx_calc_hash(addr, vid);</div><div class='add'>+	int bucket, ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_port_read_mac_table_row(vsc, hash, fdb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	for (bucket = 0; bucket &lt; VSC73XX_NUM_BUCKETS; bucket++) {</div><div class='add'>+		if (!fdb[bucket].valid)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bucket == VSC73XX_NUM_BUCKETS) {</div><div class='add'>+		/* Bucket is full */</div><div class='add'>+		ret = -EOVERFLOW;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = VSC73XX_MACACCESS_VALID | VSC73XX_MACACCESS_LOCKED |</div><div class='add'>+	      FIELD_PREP(VSC73XX_MACACCESS_DEST_IDX_MASK, port) |</div><div class='add'>+	      VSC73XX_MACACCESS_CMD_LEARN;</div><div class='add'>+	ret = vsc73xx_fdb_operation(vsc, addr, vid, hash,</div><div class='add'>+				    VSC73XX_MACACCESS_VALID |</div><div class='add'>+				    VSC73XX_MACACCESS_LOCKED |</div><div class='add'>+				    VSC73XX_MACACCESS_DEST_IDX_MASK |</div><div class='add'>+				    VSC73XX_MACACCESS_CMD_MASK, val);</div><div class='add'>+err:</div><div class='add'>+	mutex_unlock(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   const unsigned char *addr, u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!vid) {</div><div class='add'>+		switch (db.type) {</div><div class='add'>+		case DSA_DB_PORT:</div><div class='add'>+			vid = dsa_tag_8021q_standalone_vid(db.dp);</div><div class='add'>+			break;</div><div class='add'>+		case DSA_DB_BRIDGE:</div><div class='add'>+			vid = dsa_tag_8021q_bridge_vid(db.bridge.num);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_fdb_add_entry(vsc, port, addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   const unsigned char *addr, u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (!vid) {</div><div class='add'>+		switch (db.type) {</div><div class='add'>+		case DSA_DB_PORT:</div><div class='add'>+			vid = dsa_tag_8021q_standalone_vid(db.dp);</div><div class='add'>+			break;</div><div class='add'>+		case DSA_DB_BRIDGE:</div><div class='add'>+			vid = dsa_tag_8021q_bridge_vid(db.bridge.num);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_fdb_del_entry(vsc, port, addr, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_port_fdb_dump(struct dsa_switch *ds,</div><div class='add'>+				 int port, dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_fdb fdb[VSC73XX_NUM_BUCKETS];</div><div class='add'>+	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='add'>+	u16 i, bucket;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; VSC73XX_NUM_FDB_ROWS; i++) {</div><div class='add'>+		err = vsc73xx_port_read_mac_table_row(vsc, i, fdb);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		for (bucket = 0; bucket &lt; VSC73XX_NUM_BUCKETS; bucket++) {</div><div class='add'>+			if (!fdb[bucket].valid || fdb[bucket].port != port)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			/* We need to hide dsa_8021q VLANs from the user */</div><div class='add'>+			if (vid_is_dsa_8021q(fdb[bucket].vid))</div><div class='add'>+				fdb[bucket].vid = 0;</div><div class='add'>+</div><div class='add'>+			err = cb(fdb[bucket].mac, fdb[bucket].vid, false, data);</div><div class='add'>+			if (err)</div><div class='add'>+				goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops vsc73xx_phylink_mac_ops = {</div><div class='add'>+	.mac_config = vsc73xx_mac_config,</div><div class='add'>+	.mac_link_down = vsc73xx_mac_link_down,</div><div class='add'>+	.mac_link_up = vsc73xx_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops vsc73xx_ds_ops = {</div><div class='add'>+	.get_tag_protocol = vsc73xx_get_tag_protocol,</div><div class='add'>+	.setup = vsc73xx_setup,</div><div class='add'>+	.teardown = vsc73xx_teardown,</div><div class='add'>+	.phy_read = vsc73xx_phy_read,</div><div class='add'>+	.phy_write = vsc73xx_phy_write,</div><div class='add'>+	.get_strings = vsc73xx_get_strings,</div><div class='add'>+	.get_ethtool_stats = vsc73xx_get_ethtool_stats,</div><div class='add'>+	.get_sset_count = vsc73xx_get_sset_count,</div><div class='add'>+	.port_enable = vsc73xx_port_enable,</div><div class='add'>+	.port_disable = vsc73xx_port_disable,</div><div class='add'>+	.port_pre_bridge_flags = vsc73xx_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags = vsc73xx_port_bridge_flags,</div><div class='add'>+	.port_bridge_join = dsa_tag_8021q_bridge_join,</div><div class='add'>+	.port_bridge_leave = dsa_tag_8021q_bridge_leave,</div><div class='add'>+	.port_change_mtu = vsc73xx_change_mtu,</div><div class='add'>+	.port_fdb_add = vsc73xx_fdb_add,</div><div class='add'>+	.port_fdb_del = vsc73xx_fdb_del,</div><div class='add'>+	.port_fdb_dump = vsc73xx_port_fdb_dump,</div><div class='add'>+	.port_max_mtu = vsc73xx_get_max_mtu,</div><div class='add'>+	.port_stp_state_set = vsc73xx_port_stp_state_set,</div><div class='add'>+	.port_vlan_filtering = vsc73xx_port_vlan_filtering,</div><div class='add'>+	.port_vlan_add = vsc73xx_port_vlan_add,</div><div class='add'>+	.port_vlan_del = vsc73xx_port_vlan_del,</div><div class='add'>+	.phylink_get_caps = vsc73xx_phylink_get_caps,</div><div class='add'>+	.tag_8021q_vlan_add = vsc73xx_tag_8021q_vlan_add,</div><div class='add'>+	.tag_8021q_vlan_del = vsc73xx_tag_8021q_vlan_del,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int vsc73xx_gpio_get(struct gpio_chip *chip, unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+			   VSC73XX_GPIO, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return !!(val &amp; BIT(offset));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_gpio_set(struct gpio_chip *chip, unsigned int offset,</div><div class='add'>+			    int val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='add'>+	u32 tmp = val ? BIT(offset) : 0;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+				   VSC73XX_GPIO, BIT(offset), tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_gpio_direction_output(struct gpio_chip *chip,</div><div class='add'>+					 unsigned int offset, int val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='add'>+	u32 tmp = val ? BIT(offset) : 0;</div><div class='add'>+</div><div class='add'>+	return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+				   VSC73XX_GPIO, BIT(offset + 4) | BIT(offset),</div><div class='add'>+				   BIT(offset + 4) | tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_gpio_direction_input(struct gpio_chip *chip,</div><div class='add'>+					unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='add'>+</div><div class='add'>+	return  vsc73xx_update_bits(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+				    VSC73XX_GPIO, BIT(offset + 4),</div><div class='add'>+				    0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_gpio_get_direction(struct gpio_chip *chip,</div><div class='add'>+				      unsigned int offset)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='add'>+			   VSC73XX_GPIO, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return !(val &amp; BIT(offset + 4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_gpio_probe(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vsc-&gt;gc.label = devm_kasprintf(vsc-&gt;dev, GFP_KERNEL, "VSC%04x",</div><div class='add'>+				       vsc-&gt;chipid);</div><div class='add'>+	if (!vsc-&gt;gc.label)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	vsc-&gt;gc.ngpio = 4;</div><div class='add'>+	vsc-&gt;gc.owner = THIS_MODULE;</div><div class='add'>+	vsc-&gt;gc.parent = vsc-&gt;dev;</div><div class='add'>+	vsc-&gt;gc.base = -1;</div><div class='add'>+	vsc-&gt;gc.get = vsc73xx_gpio_get;</div><div class='add'>+	vsc-&gt;gc.set = vsc73xx_gpio_set;</div><div class='add'>+	vsc-&gt;gc.direction_input = vsc73xx_gpio_direction_input;</div><div class='add'>+	vsc-&gt;gc.direction_output = vsc73xx_gpio_direction_output;</div><div class='add'>+	vsc-&gt;gc.get_direction = vsc73xx_gpio_get_direction;</div><div class='add'>+	vsc-&gt;gc.can_sleep = true;</div><div class='add'>+	ret = devm_gpiochip_add_data(vsc-&gt;dev, &amp;vsc-&gt;gc, vsc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(vsc-&gt;dev, "unable to register GPIO chip\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int vsc73xx_probe(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = vsc-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Release reset, if any */</div><div class='add'>+	vsc-&gt;reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);</div><div class='add'>+	if (IS_ERR(vsc-&gt;reset)) {</div><div class='add'>+		dev_err(dev, "failed to get RESET GPIO\n");</div><div class='add'>+		return PTR_ERR(vsc-&gt;reset);</div><div class='add'>+	}</div><div class='add'>+	if (vsc-&gt;reset)</div><div class='add'>+		/* Wait 20ms according to datasheet table 245 */</div><div class='add'>+		msleep(20);</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_detect(vsc);</div><div class='add'>+	if (ret == -EAGAIN) {</div><div class='add'>+		dev_err(vsc-&gt;dev,</div><div class='add'>+			"Chip seems to be out of control. Assert reset and try again.\n");</div><div class='add'>+		gpiod_set_value_cansleep(vsc-&gt;reset, 1);</div><div class='add'>+		/* Reset pulse should be 20ns minimum, according to datasheet</div><div class='add'>+		 * table 245, so 10us should be fine</div><div class='add'>+		 */</div><div class='add'>+		usleep_range(10, 100);</div><div class='add'>+		gpiod_set_value_cansleep(vsc-&gt;reset, 0);</div><div class='add'>+		/* Wait 20ms according to datasheet table 245 */</div><div class='add'>+		msleep(20);</div><div class='add'>+		ret = vsc73xx_detect(vsc);</div><div class='add'>+	}</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "no chip found (%d)\n", ret);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;vsc-&gt;fdb_lock);</div><div class='add'>+</div><div class='add'>+	eth_random_addr(vsc-&gt;addr);</div><div class='add'>+	dev_info(vsc-&gt;dev,</div><div class='add'>+		 "MAC for control frames: %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='add'>+		 vsc-&gt;addr[0], vsc-&gt;addr[1], vsc-&gt;addr[2],</div><div class='add'>+		 vsc-&gt;addr[3], vsc-&gt;addr[4], vsc-&gt;addr[5]);</div><div class='add'>+</div><div class='add'>+	vsc-&gt;ds = devm_kzalloc(dev, sizeof(*vsc-&gt;ds), GFP_KERNEL);</div><div class='add'>+	if (!vsc-&gt;ds)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	vsc-&gt;ds-&gt;dev = dev;</div><div class='add'>+	vsc-&gt;ds-&gt;num_ports = VSC73XX_MAX_NUM_PORTS;</div><div class='add'>+	vsc-&gt;ds-&gt;priv = vsc;</div><div class='add'>+</div><div class='add'>+	vsc-&gt;ds-&gt;ops = &amp;vsc73xx_ds_ops;</div><div class='add'>+	vsc-&gt;ds-&gt;phylink_mac_ops = &amp;vsc73xx_phylink_mac_ops;</div><div class='add'>+	ret = dsa_register_switch(vsc-&gt;ds);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "unable to register switch (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = vsc73xx_gpio_probe(vsc);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dsa_unregister_switch(vsc-&gt;ds);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vsc73xx_probe);</div><div class='add'>+</div><div class='add'>+void vsc73xx_remove(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	dsa_unregister_switch(vsc-&gt;ds);</div><div class='add'>+	gpiod_set_value(vsc-&gt;reset, 1);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vsc73xx_remove);</div><div class='add'>+</div><div class='add'>+void vsc73xx_shutdown(struct vsc73xx *vsc)</div><div class='add'>+{</div><div class='add'>+	dsa_switch_shutdown(vsc-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(vsc73xx_shutdown);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Linus Walleij &lt;linus.walleij@linaro.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Vitesse VSC7385/7388/7395/7398 driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/vitesse-vsc73xx-platform.c b/drivers/net/dsa/vitesse-vsc73xx-platform.c<br/>new file mode 100644<br/>index 000000000000..7a2e0a619b85<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/vitesse-vsc73xx-platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/vitesse-vsc73xx-platform.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* DSA driver for:</div><div class='add'>+ * Vitesse VSC7385 SparX-G5 5+1-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7395 SparX-G5e 5+1-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7398 SparX-G8e 8-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ *</div><div class='add'>+ * This driver takes control of the switch chip connected over CPU-attached</div><div class='add'>+ * address bus and configures it to route packages around when connected to</div><div class='add'>+ * a CPU port.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2019 Pawel Dembicki &lt;paweldembicki@gmail.com&gt;</div><div class='add'>+ * Based on vitesse-vsc-spi.c by:</div><div class='add'>+ * Copyright (C) 2018 Linus Wallej &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Includes portions of code from the firmware uploader by:</div><div class='add'>+ * Copyright (C) 2009 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vitesse-vsc73xx.h"</div><div class='add'>+</div><div class='add'>+#define VSC73XX_CMD_PLATFORM_BLOCK_SHIFT		14</div><div class='add'>+#define VSC73XX_CMD_PLATFORM_BLOCK_MASK			0x7</div><div class='add'>+#define VSC73XX_CMD_PLATFORM_SUBBLOCK_SHIFT		10</div><div class='add'>+#define VSC73XX_CMD_PLATFORM_SUBBLOCK_MASK		0xf</div><div class='add'>+#define VSC73XX_CMD_PLATFORM_REGISTER_SHIFT		2</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct vsc73xx_platform - VSC73xx Platform state container</div><div class='add'>+ */</div><div class='add'>+struct vsc73xx_platform {</div><div class='add'>+	struct platform_device	*pdev;</div><div class='add'>+	void __iomem		*base_addr;</div><div class='add'>+	struct vsc73xx		vsc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vsc73xx_ops vsc73xx_platform_ops;</div><div class='add'>+</div><div class='add'>+static u32 vsc73xx_make_addr(u8 block, u8 subblock, u8 reg)</div><div class='add'>+{</div><div class='add'>+	u32 ret;</div><div class='add'>+</div><div class='add'>+	ret = (block &amp; VSC73XX_CMD_PLATFORM_BLOCK_MASK)</div><div class='add'>+	    &lt;&lt; VSC73XX_CMD_PLATFORM_BLOCK_SHIFT;</div><div class='add'>+	ret |= (subblock &amp; VSC73XX_CMD_PLATFORM_SUBBLOCK_MASK)</div><div class='add'>+	    &lt;&lt; VSC73XX_CMD_PLATFORM_SUBBLOCK_SHIFT;</div><div class='add'>+	ret |= reg &lt;&lt; VSC73XX_CMD_PLATFORM_REGISTER_SHIFT;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_platform_read(struct vsc73xx *vsc, u8 block, u8 subblock,</div><div class='add'>+				 u8 reg, u32 *val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_platform *vsc_platform = vsc-&gt;priv;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	if (!vsc73xx_is_addr_valid(block, subblock))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	offset = vsc73xx_make_addr(block, subblock, reg);</div><div class='add'>+	/* By default vsc73xx running in big-endian mode.</div><div class='add'>+	 * (See "Register Addressing" section 5.5.3 in the VSC7385 manual.)</div><div class='add'>+	 */</div><div class='add'>+	*val = ioread32be(vsc_platform-&gt;base_addr + offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_platform_write(struct vsc73xx *vsc, u8 block, u8 subblock,</div><div class='add'>+				  u8 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_platform *vsc_platform = vsc-&gt;priv;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	if (!vsc73xx_is_addr_valid(block, subblock))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	offset = vsc73xx_make_addr(block, subblock, reg);</div><div class='add'>+	iowrite32be(val, vsc_platform-&gt;base_addr + offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_platform_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct vsc73xx_platform *vsc_platform;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vsc_platform = devm_kzalloc(dev, sizeof(*vsc_platform), GFP_KERNEL);</div><div class='add'>+	if (!vsc_platform)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, vsc_platform);</div><div class='add'>+	vsc_platform-&gt;pdev = pdev;</div><div class='add'>+	vsc_platform-&gt;vsc.dev = dev;</div><div class='add'>+	vsc_platform-&gt;vsc.priv = vsc_platform;</div><div class='add'>+	vsc_platform-&gt;vsc.ops = &amp;vsc73xx_platform_ops;</div><div class='add'>+</div><div class='add'>+	/* obtain I/O memory space */</div><div class='add'>+	vsc_platform-&gt;base_addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(vsc_platform-&gt;base_addr)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot request I/O memory space\n");</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_probe(&amp;vsc_platform-&gt;vsc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_platform_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!vsc_platform)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vsc73xx_remove(&amp;vsc_platform-&gt;vsc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_platform_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (!vsc_platform)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vsc73xx_shutdown(&amp;vsc_platform-&gt;vsc);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct vsc73xx_ops vsc73xx_platform_ops = {</div><div class='add'>+	.read = vsc73xx_platform_read,</div><div class='add'>+	.write = vsc73xx_platform_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id vsc73xx_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7385",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7388",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7395",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7398",</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, vsc73xx_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver vsc73xx_platform_driver = {</div><div class='add'>+	.probe = vsc73xx_platform_probe,</div><div class='add'>+	.remove = vsc73xx_platform_remove,</div><div class='add'>+	.shutdown = vsc73xx_platform_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "vsc73xx-platform",</div><div class='add'>+		.of_match_table = vsc73xx_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(vsc73xx_platform_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Pawel Dembicki &lt;paweldembicki@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Vitesse VSC7385/7388/7395/7398 Platform driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/vitesse-vsc73xx-spi.c b/drivers/net/dsa/vitesse-vsc73xx-spi.c<br/>new file mode 100644<br/>index 000000000000..85b9a0f51dd8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/vitesse-vsc73xx-spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/vitesse-vsc73xx-spi.c</a></div><div class='hunk'>@@ -0,0 +1,229 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* DSA driver for:</div><div class='add'>+ * Vitesse VSC7385 SparX-G5 5+1-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7395 SparX-G5e 5+1-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ * Vitesse VSC7398 SparX-G8e 8-port Integrated Gigabit Ethernet Switch</div><div class='add'>+ *</div><div class='add'>+ * This driver takes control of the switch chip over SPI and</div><div class='add'>+ * configures it to route packages around when connected to a CPU port.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018 Linus Wallej &lt;linus.walleij@linaro.org&gt;</div><div class='add'>+ * Includes portions of code from the firmware uploader by:</div><div class='add'>+ * Copyright (C) 2009 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "vitesse-vsc73xx.h"</div><div class='add'>+</div><div class='add'>+#define VSC73XX_CMD_SPI_MODE_READ		0</div><div class='add'>+#define VSC73XX_CMD_SPI_MODE_WRITE		1</div><div class='add'>+#define VSC73XX_CMD_SPI_MODE_SHIFT		4</div><div class='add'>+#define VSC73XX_CMD_SPI_BLOCK_SHIFT		5</div><div class='add'>+#define VSC73XX_CMD_SPI_BLOCK_MASK		0x7</div><div class='add'>+#define VSC73XX_CMD_SPI_SUBBLOCK_MASK		0xf</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * struct vsc73xx_spi - VSC73xx SPI state container</div><div class='add'>+ */</div><div class='add'>+struct vsc73xx_spi {</div><div class='add'>+	struct spi_device	*spi;</div><div class='add'>+	struct mutex		lock; /* Protects SPI traffic */</div><div class='add'>+	struct vsc73xx		vsc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct vsc73xx_ops vsc73xx_spi_ops;</div><div class='add'>+</div><div class='add'>+static u8 vsc73xx_make_addr(u8 mode, u8 block, u8 subblock)</div><div class='add'>+{</div><div class='add'>+	u8 ret;</div><div class='add'>+</div><div class='add'>+	ret =</div><div class='add'>+	    (block &amp; VSC73XX_CMD_SPI_BLOCK_MASK) &lt;&lt; VSC73XX_CMD_SPI_BLOCK_SHIFT;</div><div class='add'>+	ret |= (mode &amp; 1) &lt;&lt; VSC73XX_CMD_SPI_MODE_SHIFT;</div><div class='add'>+	ret |= subblock &amp; VSC73XX_CMD_SPI_SUBBLOCK_MASK;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_spi_read(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='add'>+			    u32 *val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_spi *vsc_spi = vsc-&gt;priv;</div><div class='add'>+	struct spi_transfer t[2];</div><div class='add'>+	struct spi_message m;</div><div class='add'>+	u8 cmd[4];</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!vsc73xx_is_addr_valid(block, subblock))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;m);</div><div class='add'>+</div><div class='add'>+	memset(&amp;t, 0, sizeof(t));</div><div class='add'>+</div><div class='add'>+	t[0].tx_buf = cmd;</div><div class='add'>+	t[0].len = sizeof(cmd);</div><div class='add'>+	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='add'>+</div><div class='add'>+	t[1].rx_buf = buf;</div><div class='add'>+	t[1].len = sizeof(buf);</div><div class='add'>+	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='add'>+</div><div class='add'>+	cmd[0] = vsc73xx_make_addr(VSC73XX_CMD_SPI_MODE_READ, block, subblock);</div><div class='add'>+	cmd[1] = reg;</div><div class='add'>+	cmd[2] = 0;</div><div class='add'>+	cmd[3] = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vsc_spi-&gt;lock);</div><div class='add'>+	ret = spi_sync(vsc_spi-&gt;spi, &amp;m);</div><div class='add'>+	mutex_unlock(&amp;vsc_spi-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*val = (buf[0] &lt;&lt; 24) | (buf[1] &lt;&lt; 16) | (buf[2] &lt;&lt; 8) | buf[3];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_spi_write(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='add'>+			     u32 val)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_spi *vsc_spi = vsc-&gt;priv;</div><div class='add'>+	struct spi_transfer t[2];</div><div class='add'>+	struct spi_message m;</div><div class='add'>+	u8 cmd[2];</div><div class='add'>+	u8 buf[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!vsc73xx_is_addr_valid(block, subblock))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;m);</div><div class='add'>+</div><div class='add'>+	memset(&amp;t, 0, sizeof(t));</div><div class='add'>+</div><div class='add'>+	t[0].tx_buf = cmd;</div><div class='add'>+	t[0].len = sizeof(cmd);</div><div class='add'>+	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='add'>+</div><div class='add'>+	t[1].tx_buf = buf;</div><div class='add'>+	t[1].len = sizeof(buf);</div><div class='add'>+	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='add'>+</div><div class='add'>+	cmd[0] = vsc73xx_make_addr(VSC73XX_CMD_SPI_MODE_WRITE, block, subblock);</div><div class='add'>+	cmd[1] = reg;</div><div class='add'>+</div><div class='add'>+	buf[0] = (val &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	buf[1] = (val &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	buf[2] = (val &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	buf[3] = val &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;vsc_spi-&gt;lock);</div><div class='add'>+	ret = spi_sync(vsc_spi-&gt;spi, &amp;m);</div><div class='add'>+	mutex_unlock(&amp;vsc_spi-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int vsc73xx_spi_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;spi-&gt;dev;</div><div class='add'>+	struct vsc73xx_spi *vsc_spi;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	vsc_spi = devm_kzalloc(dev, sizeof(*vsc_spi), GFP_KERNEL);</div><div class='add'>+	if (!vsc_spi)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, vsc_spi);</div><div class='add'>+	vsc_spi-&gt;spi = spi_dev_get(spi);</div><div class='add'>+	vsc_spi-&gt;vsc.dev = dev;</div><div class='add'>+	vsc_spi-&gt;vsc.priv = vsc_spi;</div><div class='add'>+	vsc_spi-&gt;vsc.ops = &amp;vsc73xx_spi_ops;</div><div class='add'>+	mutex_init(&amp;vsc_spi-&gt;lock);</div><div class='add'>+</div><div class='add'>+	spi-&gt;mode = SPI_MODE_0;</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	ret = spi_setup(spi);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "spi setup failed.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return vsc73xx_probe(&amp;vsc_spi-&gt;vsc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_spi_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	if (!vsc_spi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vsc73xx_remove(&amp;vsc_spi-&gt;vsc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void vsc73xx_spi_shutdown(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi);</div><div class='add'>+</div><div class='add'>+	if (!vsc_spi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	vsc73xx_shutdown(&amp;vsc_spi-&gt;vsc);</div><div class='add'>+</div><div class='add'>+	spi_set_drvdata(spi, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct vsc73xx_ops vsc73xx_spi_ops = {</div><div class='add'>+	.read = vsc73xx_spi_read,</div><div class='add'>+	.write = vsc73xx_spi_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id vsc73xx_of_match[] = {</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7385",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7388",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7395",</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.compatible = "vitesse,vsc7398",</div><div class='add'>+	},</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, vsc73xx_of_match);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id vsc73xx_spi_ids[] = {</div><div class='add'>+	{ "vsc7385" },</div><div class='add'>+	{ "vsc7388" },</div><div class='add'>+	{ "vsc7395" },</div><div class='add'>+	{ "vsc7398" },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, vsc73xx_spi_ids);</div><div class='add'>+</div><div class='add'>+static struct spi_driver vsc73xx_spi_driver = {</div><div class='add'>+	.probe = vsc73xx_spi_probe,</div><div class='add'>+	.remove = vsc73xx_spi_remove,</div><div class='add'>+	.shutdown = vsc73xx_spi_shutdown,</div><div class='add'>+	.id_table = vsc73xx_spi_ids,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "vsc73xx-spi",</div><div class='add'>+		.of_match_table = vsc73xx_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_spi_driver(vsc73xx_spi_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Linus Walleij &lt;linus.walleij@linaro.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Vitesse VSC7385/7388/7395/7398 SPI driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/vitesse-vsc73xx.c b/drivers/net/dsa/vitesse-vsc73xx.c<br/>deleted file mode 100644<br/>index d4780610ea8a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/vitesse-vsc73xx.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dsa/vitesse-vsc73xx.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1364 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='del'>-/* DSA driver for:</div><div class='del'>- * Vitesse VSC7385 SparX-G5 5+1-port Integrated Gigabit Ethernet Switch</div><div class='del'>- * Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch</div><div class='del'>- * Vitesse VSC7395 SparX-G5e 5+1-port Integrated Gigabit Ethernet Switch</div><div class='del'>- * Vitesse VSC7398 SparX-G8e 8-port Integrated Gigabit Ethernet Switch</div><div class='del'>- *</div><div class='del'>- * These switches have a built-in 8051 CPU and can download and execute a</div><div class='del'>- * firmware in this CPU. They can also be configured to use an external CPU</div><div class='del'>- * handling the switch in a memory-mapped manner by connecting to that external</div><div class='del'>- * CPU's memory bus.</div><div class='del'>- *</div><div class='del'>- * This driver (currently) only takes control of the switch chip over SPI and</div><div class='del'>- * configures it to route packages around when connected to a CPU port. The</div><div class='del'>- * chip has embedded PHYs and VLAN support so we model it using DSA.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2018 Linus Wallej &lt;linus.walleij@linaro.org&gt;</div><div class='del'>- * Includes portions of code from the firmware uploader by:</div><div class='del'>- * Copyright (C) 2009 Gabor Juhos &lt;juhosg@openwrt.org&gt;</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/device.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/spi/spi.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/if_bridge.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='del'>-#include &lt;linux/gpio/driver.h&gt;</div><div class='del'>-#include &lt;linux/random.h&gt;</div><div class='del'>-#include &lt;net/dsa.h&gt;</div><div class='del'>-</div><div class='del'>-#define VSC73XX_BLOCK_MAC	0x1 /* Subblocks 0-4, 6 (CPU port) */</div><div class='del'>-#define VSC73XX_BLOCK_ANALYZER	0x2 /* Only subblock 0 */</div><div class='del'>-#define VSC73XX_BLOCK_MII	0x3 /* Subblocks 0 and 1 */</div><div class='del'>-#define VSC73XX_BLOCK_MEMINIT	0x3 /* Only subblock 2 */</div><div class='del'>-#define VSC73XX_BLOCK_CAPTURE	0x4 /* Only subblock 2 */</div><div class='del'>-#define VSC73XX_BLOCK_ARBITER	0x5 /* Only subblock 0 */</div><div class='del'>-#define VSC73XX_BLOCK_SYSTEM	0x7 /* Only subblock 0 */</div><div class='del'>-</div><div class='del'>-#define CPU_PORT	6 /* CPU port */</div><div class='del'>-</div><div class='del'>-/* MAC Block registers */</div><div class='del'>-#define VSC73XX_MAC_CFG		0x00</div><div class='del'>-#define VSC73XX_MACHDXGAP	0x02</div><div class='del'>-#define VSC73XX_FCCONF		0x04</div><div class='del'>-#define VSC73XX_FCMACHI		0x08</div><div class='del'>-#define VSC73XX_FCMACLO		0x0c</div><div class='del'>-#define VSC73XX_MAXLEN		0x10</div><div class='del'>-#define VSC73XX_ADVPORTM	0x19</div><div class='del'>-#define VSC73XX_TXUPDCFG	0x24</div><div class='del'>-#define VSC73XX_TXQ_SELECT_CFG	0x28</div><div class='del'>-#define VSC73XX_RXOCT		0x50</div><div class='del'>-#define VSC73XX_TXOCT		0x51</div><div class='del'>-#define VSC73XX_C_RX0		0x52</div><div class='del'>-#define VSC73XX_C_RX1		0x53</div><div class='del'>-#define VSC73XX_C_RX2		0x54</div><div class='del'>-#define VSC73XX_C_TX0		0x55</div><div class='del'>-#define VSC73XX_C_TX1		0x56</div><div class='del'>-#define VSC73XX_C_TX2		0x57</div><div class='del'>-#define VSC73XX_C_CFG		0x58</div><div class='del'>-#define VSC73XX_CAT_DROP	0x6e</div><div class='del'>-#define VSC73XX_CAT_PR_MISC_L2	0x6f</div><div class='del'>-#define VSC73XX_CAT_PR_USR_PRIO	0x75</div><div class='del'>-#define VSC73XX_Q_MISC_CONF	0xdf</div><div class='del'>-</div><div class='del'>-/* MAC_CFG register bits */</div><div class='del'>-#define VSC73XX_MAC_CFG_WEXC_DIS	BIT(31)</div><div class='del'>-#define VSC73XX_MAC_CFG_PORT_RST	BIT(29)</div><div class='del'>-#define VSC73XX_MAC_CFG_TX_EN		BIT(28)</div><div class='del'>-#define VSC73XX_MAC_CFG_SEED_LOAD	BIT(27)</div><div class='del'>-#define VSC73XX_MAC_CFG_SEED_MASK	GENMASK(26, 19)</div><div class='del'>-#define VSC73XX_MAC_CFG_SEED_OFFSET	19</div><div class='del'>-#define VSC73XX_MAC_CFG_FDX		BIT(18)</div><div class='del'>-#define VSC73XX_MAC_CFG_GIGA_MODE	BIT(17)</div><div class='del'>-#define VSC73XX_MAC_CFG_RX_EN		BIT(16)</div><div class='del'>-#define VSC73XX_MAC_CFG_VLAN_DBLAWR	BIT(15)</div><div class='del'>-#define VSC73XX_MAC_CFG_VLAN_AWR	BIT(14)</div><div class='del'>-#define VSC73XX_MAC_CFG_100_BASE_T	BIT(13) /* Not in manual */</div><div class='del'>-#define VSC73XX_MAC_CFG_TX_IPG_MASK	GENMASK(10, 6)</div><div class='del'>-#define VSC73XX_MAC_CFG_TX_IPG_OFFSET	6</div><div class='del'>-#define VSC73XX_MAC_CFG_TX_IPG_1000M	(6 &lt;&lt; VSC73XX_MAC_CFG_TX_IPG_OFFSET)</div><div class='del'>-#define VSC73XX_MAC_CFG_TX_IPG_100_10M	(17 &lt;&lt; VSC73XX_MAC_CFG_TX_IPG_OFFSET)</div><div class='del'>-#define VSC73XX_MAC_CFG_MAC_RX_RST	BIT(5)</div><div class='del'>-#define VSC73XX_MAC_CFG_MAC_TX_RST	BIT(4)</div><div class='del'>-#define VSC73XX_MAC_CFG_CLK_SEL_MASK	GENMASK(2, 0)</div><div class='del'>-#define VSC73XX_MAC_CFG_CLK_SEL_OFFSET	0</div><div class='del'>-#define VSC73XX_MAC_CFG_CLK_SEL_1000M	1</div><div class='del'>-#define VSC73XX_MAC_CFG_CLK_SEL_100M	2</div><div class='del'>-#define VSC73XX_MAC_CFG_CLK_SEL_10M	3</div><div class='del'>-#define VSC73XX_MAC_CFG_CLK_SEL_EXT	4</div><div class='del'>-</div><div class='del'>-#define VSC73XX_MAC_CFG_1000M_F_PHY	(VSC73XX_MAC_CFG_FDX | \</div><div class='del'>-					 VSC73XX_MAC_CFG_GIGA_MODE | \</div><div class='del'>-					 VSC73XX_MAC_CFG_TX_IPG_1000M | \</div><div class='del'>-					 VSC73XX_MAC_CFG_CLK_SEL_EXT)</div><div class='del'>-#define VSC73XX_MAC_CFG_100_10M_F_PHY	(VSC73XX_MAC_CFG_FDX | \</div><div class='del'>-					 VSC73XX_MAC_CFG_TX_IPG_100_10M | \</div><div class='del'>-					 VSC73XX_MAC_CFG_CLK_SEL_EXT)</div><div class='del'>-#define VSC73XX_MAC_CFG_100_10M_H_PHY	(VSC73XX_MAC_CFG_TX_IPG_100_10M | \</div><div class='del'>-					 VSC73XX_MAC_CFG_CLK_SEL_EXT)</div><div class='del'>-#define VSC73XX_MAC_CFG_1000M_F_RGMII	(VSC73XX_MAC_CFG_FDX | \</div><div class='del'>-					 VSC73XX_MAC_CFG_GIGA_MODE | \</div><div class='del'>-					 VSC73XX_MAC_CFG_TX_IPG_1000M | \</div><div class='del'>-					 VSC73XX_MAC_CFG_CLK_SEL_1000M)</div><div class='del'>-#define VSC73XX_MAC_CFG_RESET		(VSC73XX_MAC_CFG_PORT_RST | \</div><div class='del'>-					 VSC73XX_MAC_CFG_MAC_RX_RST | \</div><div class='del'>-					 VSC73XX_MAC_CFG_MAC_TX_RST)</div><div class='del'>-</div><div class='del'>-/* Flow control register bits */</div><div class='del'>-#define VSC73XX_FCCONF_ZERO_PAUSE_EN	BIT(17)</div><div class='del'>-#define VSC73XX_FCCONF_FLOW_CTRL_OBEY	BIT(16)</div><div class='del'>-#define VSC73XX_FCCONF_PAUSE_VAL_MASK	GENMASK(15, 0)</div><div class='del'>-</div><div class='del'>-/* ADVPORTM advanced port setup register bits */</div><div class='del'>-#define VSC73XX_ADVPORTM_IFG_PPM	BIT(7)</div><div class='del'>-#define VSC73XX_ADVPORTM_EXC_COL_CONT	BIT(6)</div><div class='del'>-#define VSC73XX_ADVPORTM_EXT_PORT	BIT(5)</div><div class='del'>-#define VSC73XX_ADVPORTM_INV_GTX	BIT(4)</div><div class='del'>-#define VSC73XX_ADVPORTM_ENA_GTX	BIT(3)</div><div class='del'>-#define VSC73XX_ADVPORTM_DDR_MODE	BIT(2)</div><div class='del'>-#define VSC73XX_ADVPORTM_IO_LOOPBACK	BIT(1)</div><div class='del'>-#define VSC73XX_ADVPORTM_HOST_LOOPBACK	BIT(0)</div><div class='del'>-</div><div class='del'>-/* CAT_DROP categorizer frame dropping register bits */</div><div class='del'>-#define VSC73XX_CAT_DROP_DROP_MC_SMAC_ENA	BIT(6)</div><div class='del'>-#define VSC73XX_CAT_DROP_FWD_CTRL_ENA		BIT(4)</div><div class='del'>-#define VSC73XX_CAT_DROP_FWD_PAUSE_ENA		BIT(3)</div><div class='del'>-#define VSC73XX_CAT_DROP_UNTAGGED_ENA		BIT(2)</div><div class='del'>-#define VSC73XX_CAT_DROP_TAGGED_ENA		BIT(1)</div><div class='del'>-#define VSC73XX_CAT_DROP_NULL_MAC_ENA		BIT(0)</div><div class='del'>-</div><div class='del'>-#define VSC73XX_Q_MISC_CONF_EXTENT_MEM		BIT(31)</div><div class='del'>-#define VSC73XX_Q_MISC_CONF_EARLY_TX_MASK	GENMASK(4, 1)</div><div class='del'>-#define VSC73XX_Q_MISC_CONF_EARLY_TX_512	(1 &lt;&lt; 1)</div><div class='del'>-#define VSC73XX_Q_MISC_CONF_MAC_PAUSE_MODE	BIT(0)</div><div class='del'>-</div><div class='del'>-/* Frame analyzer block 2 registers */</div><div class='del'>-#define VSC73XX_STORMLIMIT	0x02</div><div class='del'>-#define VSC73XX_ADVLEARN	0x03</div><div class='del'>-#define VSC73XX_IFLODMSK	0x04</div><div class='del'>-#define VSC73XX_VLANMASK	0x05</div><div class='del'>-#define VSC73XX_MACHDATA	0x06</div><div class='del'>-#define VSC73XX_MACLDATA	0x07</div><div class='del'>-#define VSC73XX_ANMOVED		0x08</div><div class='del'>-#define VSC73XX_ANAGEFIL	0x09</div><div class='del'>-#define VSC73XX_ANEVENTS	0x0a</div><div class='del'>-#define VSC73XX_ANCNTMASK	0x0b</div><div class='del'>-#define VSC73XX_ANCNTVAL	0x0c</div><div class='del'>-#define VSC73XX_LEARNMASK	0x0d</div><div class='del'>-#define VSC73XX_UFLODMASK	0x0e</div><div class='del'>-#define VSC73XX_MFLODMASK	0x0f</div><div class='del'>-#define VSC73XX_RECVMASK	0x10</div><div class='del'>-#define VSC73XX_AGGRCTRL	0x20</div><div class='del'>-#define VSC73XX_AGGRMSKS	0x30 /* Until 0x3f */</div><div class='del'>-#define VSC73XX_DSTMASKS	0x40 /* Until 0x7f */</div><div class='del'>-#define VSC73XX_SRCMASKS	0x80 /* Until 0x87 */</div><div class='del'>-#define VSC73XX_CAPENAB		0xa0</div><div class='del'>-#define VSC73XX_MACACCESS	0xb0</div><div class='del'>-#define VSC73XX_IPMCACCESS	0xb1</div><div class='del'>-#define VSC73XX_MACTINDX	0xc0</div><div class='del'>-#define VSC73XX_VLANACCESS	0xd0</div><div class='del'>-#define VSC73XX_VLANTIDX	0xe0</div><div class='del'>-#define VSC73XX_AGENCTRL	0xf0</div><div class='del'>-#define VSC73XX_CAPRST		0xff</div><div class='del'>-</div><div class='del'>-#define VSC73XX_MACACCESS_CPU_COPY		BIT(14)</div><div class='del'>-#define VSC73XX_MACACCESS_FWD_KILL		BIT(13)</div><div class='del'>-#define VSC73XX_MACACCESS_IGNORE_VLAN		BIT(12)</div><div class='del'>-#define VSC73XX_MACACCESS_AGED_FLAG		BIT(11)</div><div class='del'>-#define VSC73XX_MACACCESS_VALID			BIT(10)</div><div class='del'>-#define VSC73XX_MACACCESS_LOCKED		BIT(9)</div><div class='del'>-#define VSC73XX_MACACCESS_DEST_IDX_MASK		GENMASK(8, 3)</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_MASK		GENMASK(2, 0)</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_IDLE		0</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_LEARN		1</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_FORGET		2</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_AGE_TABLE		3</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_FLUSH_TABLE	4</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_CLEAR_TABLE	5</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_READ_ENTRY	6</div><div class='del'>-#define VSC73XX_MACACCESS_CMD_WRITE_ENTRY	7</div><div class='del'>-</div><div class='del'>-#define VSC73XX_VLANACCESS_LEARN_DISABLED	BIT(30)</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_MIRROR		BIT(29)</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_SRC_CHECK	BIT(28)</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_PORT_MASK	GENMASK(9, 2)</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_MASK	GENMASK(2, 0)</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_IDLE	0</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_READ_ENTRY	1</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_WRITE_ENTRY	2</div><div class='del'>-#define VSC73XX_VLANACCESS_VLAN_TBL_CMD_CLEAR_TABLE	3</div><div class='del'>-</div><div class='del'>-/* MII block 3 registers */</div><div class='del'>-#define VSC73XX_MII_STAT	0x0</div><div class='del'>-#define VSC73XX_MII_CMD		0x1</div><div class='del'>-#define VSC73XX_MII_DATA	0x2</div><div class='del'>-</div><div class='del'>-/* Arbiter block 5 registers */</div><div class='del'>-#define VSC73XX_ARBEMPTY		0x0c</div><div class='del'>-#define VSC73XX_ARBDISC			0x0e</div><div class='del'>-#define VSC73XX_SBACKWDROP		0x12</div><div class='del'>-#define VSC73XX_DBACKWDROP		0x13</div><div class='del'>-#define VSC73XX_ARBBURSTPROB		0x15</div><div class='del'>-</div><div class='del'>-/* System block 7 registers */</div><div class='del'>-#define VSC73XX_ICPU_SIPAD		0x01</div><div class='del'>-#define VSC73XX_GMIIDELAY		0x05</div><div class='del'>-#define VSC73XX_ICPU_CTRL		0x10</div><div class='del'>-#define VSC73XX_ICPU_ADDR		0x11</div><div class='del'>-#define VSC73XX_ICPU_SRAM		0x12</div><div class='del'>-#define VSC73XX_HWSEM			0x13</div><div class='del'>-#define VSC73XX_GLORESET		0x14</div><div class='del'>-#define VSC73XX_ICPU_MBOX_VAL		0x15</div><div class='del'>-#define VSC73XX_ICPU_MBOX_SET		0x16</div><div class='del'>-#define VSC73XX_ICPU_MBOX_CLR		0x17</div><div class='del'>-#define VSC73XX_CHIPID			0x18</div><div class='del'>-#define VSC73XX_GPIO			0x34</div><div class='del'>-</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_NONE	0</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_1_4_NS	1</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_1_7_NS	2</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_GTXDELAY_2_0_NS	3</div><div class='del'>-</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_NONE	(0 &lt;&lt; 4)</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_1_4_NS	(1 &lt;&lt; 4)</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_1_7_NS	(2 &lt;&lt; 4)</div><div class='del'>-#define VSC73XX_GMIIDELAY_GMII0_RXDELAY_2_0_NS	(3 &lt;&lt; 4)</div><div class='del'>-</div><div class='del'>-#define VSC73XX_ICPU_CTRL_WATCHDOG_RST	BIT(31)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_CLK_DIV_MASK	GENMASK(12, 8)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_SRST_HOLD	BIT(7)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_ICPU_PI_EN	BIT(6)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_BOOT_EN	BIT(3)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_EXT_ACC_EN	BIT(2)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_CLK_EN	BIT(1)</div><div class='del'>-#define VSC73XX_ICPU_CTRL_SRST		BIT(0)</div><div class='del'>-</div><div class='del'>-#define VSC73XX_CHIPID_ID_SHIFT		12</div><div class='del'>-#define VSC73XX_CHIPID_ID_MASK		0xffff</div><div class='del'>-#define VSC73XX_CHIPID_REV_SHIFT	28</div><div class='del'>-#define VSC73XX_CHIPID_REV_MASK		0xf</div><div class='del'>-#define VSC73XX_CHIPID_ID_7385		0x7385</div><div class='del'>-#define VSC73XX_CHIPID_ID_7388		0x7388</div><div class='del'>-#define VSC73XX_CHIPID_ID_7395		0x7395</div><div class='del'>-#define VSC73XX_CHIPID_ID_7398		0x7398</div><div class='del'>-</div><div class='del'>-#define VSC73XX_GLORESET_STROBE		BIT(4)</div><div class='del'>-#define VSC73XX_GLORESET_ICPU_LOCK	BIT(3)</div><div class='del'>-#define VSC73XX_GLORESET_MEM_LOCK	BIT(2)</div><div class='del'>-#define VSC73XX_GLORESET_PHY_RESET	BIT(1)</div><div class='del'>-#define VSC73XX_GLORESET_MASTER_RESET	BIT(0)</div><div class='del'>-</div><div class='del'>-#define VSC73XX_CMD_MODE_READ		0</div><div class='del'>-#define VSC73XX_CMD_MODE_WRITE		1</div><div class='del'>-#define VSC73XX_CMD_MODE_SHIFT		4</div><div class='del'>-#define VSC73XX_CMD_BLOCK_SHIFT		5</div><div class='del'>-#define VSC73XX_CMD_BLOCK_MASK		0x7</div><div class='del'>-#define VSC73XX_CMD_SUBBLOCK_MASK	0xf</div><div class='del'>-</div><div class='del'>-#define VSC7385_CLOCK_DELAY		((3 &lt;&lt; 4) | 3)</div><div class='del'>-#define VSC7385_CLOCK_DELAY_MASK	((3 &lt;&lt; 4) | 3)</div><div class='del'>-</div><div class='del'>-#define VSC73XX_ICPU_CTRL_STOP	(VSC73XX_ICPU_CTRL_SRST_HOLD | \</div><div class='del'>-				 VSC73XX_ICPU_CTRL_BOOT_EN | \</div><div class='del'>-				 VSC73XX_ICPU_CTRL_EXT_ACC_EN)</div><div class='del'>-</div><div class='del'>-#define VSC73XX_ICPU_CTRL_START	(VSC73XX_ICPU_CTRL_CLK_DIV | \</div><div class='del'>-				 VSC73XX_ICPU_CTRL_BOOT_EN | \</div><div class='del'>-				 VSC73XX_ICPU_CTRL_CLK_EN | \</div><div class='del'>-				 VSC73XX_ICPU_CTRL_SRST)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * struct vsc73xx - VSC73xx state container</div><div class='del'>- */</div><div class='del'>-struct vsc73xx {</div><div class='del'>-	struct device		*dev;</div><div class='del'>-	struct gpio_desc	*reset;</div><div class='del'>-	struct spi_device	*spi;</div><div class='del'>-	struct dsa_switch	*ds;</div><div class='del'>-	struct gpio_chip	gc;</div><div class='del'>-	u16			chipid;</div><div class='del'>-	u8			addr[ETH_ALEN];</div><div class='del'>-	struct mutex		lock; /* Protects SPI traffic */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IS_7385(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7385)</div><div class='del'>-#define IS_7388(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7388)</div><div class='del'>-#define IS_7395(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7395)</div><div class='del'>-#define IS_7398(a) ((a)-&gt;chipid == VSC73XX_CHIPID_ID_7398)</div><div class='del'>-#define IS_739X(a) (IS_7395(a) || IS_7398(a))</div><div class='del'>-</div><div class='del'>-struct vsc73xx_counter {</div><div class='del'>-	u8 counter;</div><div class='del'>-	const char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Counters are named according to the MIB standards where applicable.</div><div class='del'>- * Some counters are custom, non-standard. The standard counters are</div><div class='del'>- * named in accordance with RFC2819, RFC2021 and IEEE Std 802.3-2002 Annex</div><div class='del'>- * 30A Counters.</div><div class='del'>- */</div><div class='del'>-static const struct vsc73xx_counter vsc73xx_rx_counters[] = {</div><div class='del'>-	{ 0, "RxEtherStatsPkts" },</div><div class='del'>-	{ 1, "RxBroadcast+MulticastPkts" }, /* non-standard counter */</div><div class='del'>-	{ 2, "RxTotalErrorPackets" }, /* non-standard counter */</div><div class='del'>-	{ 3, "RxEtherStatsBroadcastPkts" },</div><div class='del'>-	{ 4, "RxEtherStatsMulticastPkts" },</div><div class='del'>-	{ 5, "RxEtherStatsPkts64Octets" },</div><div class='del'>-	{ 6, "RxEtherStatsPkts65to127Octets" },</div><div class='del'>-	{ 7, "RxEtherStatsPkts128to255Octets" },</div><div class='del'>-	{ 8, "RxEtherStatsPkts256to511Octets" },</div><div class='del'>-	{ 9, "RxEtherStatsPkts512to1023Octets" },</div><div class='del'>-	{ 10, "RxEtherStatsPkts1024to1518Octets" },</div><div class='del'>-	{ 11, "RxJumboFrames" }, /* non-standard counter */</div><div class='del'>-	{ 12, "RxaPauseMACControlFramesTransmitted" },</div><div class='del'>-	{ 13, "RxFIFODrops" }, /* non-standard counter */</div><div class='del'>-	{ 14, "RxBackwardDrops" }, /* non-standard counter */</div><div class='del'>-	{ 15, "RxClassifierDrops" }, /* non-standard counter */</div><div class='del'>-	{ 16, "RxEtherStatsCRCAlignErrors" },</div><div class='del'>-	{ 17, "RxEtherStatsUndersizePkts" },</div><div class='del'>-	{ 18, "RxEtherStatsOversizePkts" },</div><div class='del'>-	{ 19, "RxEtherStatsFragments" },</div><div class='del'>-	{ 20, "RxEtherStatsJabbers" },</div><div class='del'>-	{ 21, "RxaMACControlFramesReceived" },</div><div class='del'>-	/* 22-24 are undefined */</div><div class='del'>-	{ 25, "RxaFramesReceivedOK" },</div><div class='del'>-	{ 26, "RxQoSClass0" }, /* non-standard counter */</div><div class='del'>-	{ 27, "RxQoSClass1" }, /* non-standard counter */</div><div class='del'>-	{ 28, "RxQoSClass2" }, /* non-standard counter */</div><div class='del'>-	{ 29, "RxQoSClass3" }, /* non-standard counter */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct vsc73xx_counter vsc73xx_tx_counters[] = {</div><div class='del'>-	{ 0, "TxEtherStatsPkts" },</div><div class='del'>-	{ 1, "TxBroadcast+MulticastPkts" }, /* non-standard counter */</div><div class='del'>-	{ 2, "TxTotalErrorPackets" }, /* non-standard counter */</div><div class='del'>-	{ 3, "TxEtherStatsBroadcastPkts" },</div><div class='del'>-	{ 4, "TxEtherStatsMulticastPkts" },</div><div class='del'>-	{ 5, "TxEtherStatsPkts64Octets" },</div><div class='del'>-	{ 6, "TxEtherStatsPkts65to127Octets" },</div><div class='del'>-	{ 7, "TxEtherStatsPkts128to255Octets" },</div><div class='del'>-	{ 8, "TxEtherStatsPkts256to511Octets" },</div><div class='del'>-	{ 9, "TxEtherStatsPkts512to1023Octets" },</div><div class='del'>-	{ 10, "TxEtherStatsPkts1024to1518Octets" },</div><div class='del'>-	{ 11, "TxJumboFrames" }, /* non-standard counter */</div><div class='del'>-	{ 12, "TxaPauseMACControlFramesTransmitted" },</div><div class='del'>-	{ 13, "TxFIFODrops" }, /* non-standard counter */</div><div class='del'>-	{ 14, "TxDrops" }, /* non-standard counter */</div><div class='del'>-	{ 15, "TxEtherStatsCollisions" },</div><div class='del'>-	{ 16, "TxEtherStatsCRCAlignErrors" },</div><div class='del'>-	{ 17, "TxEtherStatsUndersizePkts" },</div><div class='del'>-	{ 18, "TxEtherStatsOversizePkts" },</div><div class='del'>-	{ 19, "TxEtherStatsFragments" },</div><div class='del'>-	{ 20, "TxEtherStatsJabbers" },</div><div class='del'>-	/* 21-24 are undefined */</div><div class='del'>-	{ 25, "TxaFramesReceivedOK" },</div><div class='del'>-	{ 26, "TxQoSClass0" }, /* non-standard counter */</div><div class='del'>-	{ 27, "TxQoSClass1" }, /* non-standard counter */</div><div class='del'>-	{ 28, "TxQoSClass2" }, /* non-standard counter */</div><div class='del'>-	{ 29, "TxQoSClass3" }, /* non-standard counter */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int vsc73xx_is_addr_valid(u8 block, u8 subblock)</div><div class='del'>-{</div><div class='del'>-	switch (block) {</div><div class='del'>-	case VSC73XX_BLOCK_MAC:</div><div class='del'>-		switch (subblock) {</div><div class='del'>-		case 0 ... 4:</div><div class='del'>-		case 6:</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case VSC73XX_BLOCK_ANALYZER:</div><div class='del'>-	case VSC73XX_BLOCK_SYSTEM:</div><div class='del'>-		switch (subblock) {</div><div class='del'>-		case 0:</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case VSC73XX_BLOCK_MII:</div><div class='del'>-	case VSC73XX_BLOCK_CAPTURE:</div><div class='del'>-	case VSC73XX_BLOCK_ARBITER:</div><div class='del'>-		switch (subblock) {</div><div class='del'>-		case 0 ... 1:</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u8 vsc73xx_make_addr(u8 mode, u8 block, u8 subblock)</div><div class='del'>-{</div><div class='del'>-	u8 ret;</div><div class='del'>-</div><div class='del'>-	ret = (block &amp; VSC73XX_CMD_BLOCK_MASK) &lt;&lt; VSC73XX_CMD_BLOCK_SHIFT;</div><div class='del'>-	ret |= (mode &amp; 1) &lt;&lt; VSC73XX_CMD_MODE_SHIFT;</div><div class='del'>-	ret |= subblock &amp; VSC73XX_CMD_SUBBLOCK_MASK;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_read(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='del'>-			u32 *val)</div><div class='del'>-{</div><div class='del'>-	struct spi_transfer t[2];</div><div class='del'>-	struct spi_message m;</div><div class='del'>-	u8 cmd[4];</div><div class='del'>-	u8 buf[4];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!vsc73xx_is_addr_valid(block, subblock))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	spi_message_init(&amp;m);</div><div class='del'>-</div><div class='del'>-	memset(&amp;t, 0, sizeof(t));</div><div class='del'>-</div><div class='del'>-	t[0].tx_buf = cmd;</div><div class='del'>-	t[0].len = sizeof(cmd);</div><div class='del'>-	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='del'>-</div><div class='del'>-	t[1].rx_buf = buf;</div><div class='del'>-	t[1].len = sizeof(buf);</div><div class='del'>-	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='del'>-</div><div class='del'>-	cmd[0] = vsc73xx_make_addr(VSC73XX_CMD_MODE_READ, block, subblock);</div><div class='del'>-	cmd[1] = reg;</div><div class='del'>-	cmd[2] = 0;</div><div class='del'>-	cmd[3] = 0;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vsc-&gt;lock);</div><div class='del'>-	ret = spi_sync(vsc-&gt;spi, &amp;m);</div><div class='del'>-	mutex_unlock(&amp;vsc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	*val = (buf[0] &lt;&lt; 24) | (buf[1] &lt;&lt; 16) | (buf[2] &lt;&lt; 8) | buf[3];</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_write(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='del'>-			 u32 val)</div><div class='del'>-{</div><div class='del'>-	struct spi_transfer t[2];</div><div class='del'>-	struct spi_message m;</div><div class='del'>-	u8 cmd[2];</div><div class='del'>-	u8 buf[4];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (!vsc73xx_is_addr_valid(block, subblock))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	spi_message_init(&amp;m);</div><div class='del'>-</div><div class='del'>-	memset(&amp;t, 0, sizeof(t));</div><div class='del'>-</div><div class='del'>-	t[0].tx_buf = cmd;</div><div class='del'>-	t[0].len = sizeof(cmd);</div><div class='del'>-	spi_message_add_tail(&amp;t[0], &amp;m);</div><div class='del'>-</div><div class='del'>-	t[1].tx_buf = buf;</div><div class='del'>-	t[1].len = sizeof(buf);</div><div class='del'>-	spi_message_add_tail(&amp;t[1], &amp;m);</div><div class='del'>-</div><div class='del'>-	cmd[0] = vsc73xx_make_addr(VSC73XX_CMD_MODE_WRITE, block, subblock);</div><div class='del'>-	cmd[1] = reg;</div><div class='del'>-</div><div class='del'>-	buf[0] = (val &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	buf[1] = (val &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	buf[2] = (val &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	buf[3] = val &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;vsc-&gt;lock);</div><div class='del'>-	ret = spi_sync(vsc-&gt;spi, &amp;m);</div><div class='del'>-	mutex_unlock(&amp;vsc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_update_bits(struct vsc73xx *vsc, u8 block, u8 subblock,</div><div class='del'>-			       u8 reg, u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 tmp, orig;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Same read-modify-write algorithm as e.g. regmap */</div><div class='del'>-	ret = vsc73xx_read(vsc, block, subblock, reg, &amp;orig);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	tmp = orig &amp; ~mask;</div><div class='del'>-	tmp |= val &amp; mask;</div><div class='del'>-	return vsc73xx_write(vsc, block, subblock, reg, tmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_detect(struct vsc73xx *vsc)</div><div class='del'>-{</div><div class='del'>-	bool icpu_si_boot_en;</div><div class='del'>-	bool icpu_pi_en;</div><div class='del'>-	u32 val;</div><div class='del'>-	u32 rev;</div><div class='del'>-	int ret;</div><div class='del'>-	u32 id;</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-			   VSC73XX_ICPU_MBOX_VAL, &amp;val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(vsc-&gt;dev, "unable to read mailbox (%d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (val == 0xffffffff) {</div><div class='del'>-		dev_info(vsc-&gt;dev, "chip seems dead, assert reset\n");</div><div class='del'>-		gpiod_set_value_cansleep(vsc-&gt;reset, 1);</div><div class='del'>-		/* Reset pulse should be 20ns minimum, according to datasheet</div><div class='del'>-		 * table 245, so 10us should be fine</div><div class='del'>-		 */</div><div class='del'>-		usleep_range(10, 100);</div><div class='del'>-		gpiod_set_value_cansleep(vsc-&gt;reset, 0);</div><div class='del'>-		/* Wait 20ms according to datasheet table 245 */</div><div class='del'>-		msleep(20);</div><div class='del'>-</div><div class='del'>-		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-				   VSC73XX_ICPU_MBOX_VAL, &amp;val);</div><div class='del'>-		if (val == 0xffffffff) {</div><div class='del'>-			dev_err(vsc-&gt;dev, "seems not to help, giving up\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-			   VSC73XX_CHIPID, &amp;val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(vsc-&gt;dev, "unable to read chip id (%d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id = (val &gt;&gt; VSC73XX_CHIPID_ID_SHIFT) &amp;</div><div class='del'>-		VSC73XX_CHIPID_ID_MASK;</div><div class='del'>-	switch (id) {</div><div class='del'>-	case VSC73XX_CHIPID_ID_7385:</div><div class='del'>-	case VSC73XX_CHIPID_ID_7388:</div><div class='del'>-	case VSC73XX_CHIPID_ID_7395:</div><div class='del'>-	case VSC73XX_CHIPID_ID_7398:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		dev_err(vsc-&gt;dev, "unsupported chip, id=%04x\n", id);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vsc-&gt;chipid = id;</div><div class='del'>-	rev = (val &gt;&gt; VSC73XX_CHIPID_REV_SHIFT) &amp;</div><div class='del'>-		VSC73XX_CHIPID_REV_MASK;</div><div class='del'>-	dev_info(vsc-&gt;dev, "VSC%04X (rev: %d) switch found\n", id, rev);</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-			   VSC73XX_ICPU_CTRL, &amp;val);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(vsc-&gt;dev, "unable to read iCPU control\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The iCPU can always be used but can boot in different ways.</div><div class='del'>-	 * If it is initially disabled and has no external memory,</div><div class='del'>-	 * we are in control and can do whatever we like, else we</div><div class='del'>-	 * are probably in trouble (we need some way to communicate</div><div class='del'>-	 * with the running firmware) so we bail out for now.</div><div class='del'>-	 */</div><div class='del'>-	icpu_pi_en = !!(val &amp; VSC73XX_ICPU_CTRL_ICPU_PI_EN);</div><div class='del'>-	icpu_si_boot_en = !!(val &amp; VSC73XX_ICPU_CTRL_BOOT_EN);</div><div class='del'>-	if (icpu_si_boot_en &amp;&amp; icpu_pi_en) {</div><div class='del'>-		dev_err(vsc-&gt;dev,</div><div class='del'>-			"iCPU enabled boots from SI, has external memory\n");</div><div class='del'>-		dev_err(vsc-&gt;dev, "no idea how to deal with this\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (icpu_si_boot_en &amp;&amp; !icpu_pi_en) {</div><div class='del'>-		dev_err(vsc-&gt;dev,</div><div class='del'>-			"iCPU enabled boots from SI, no external memory\n");</div><div class='del'>-		dev_err(vsc-&gt;dev, "no idea how to deal with this\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (!icpu_si_boot_en &amp;&amp; icpu_pi_en) {</div><div class='del'>-		dev_err(vsc-&gt;dev,</div><div class='del'>-			"iCPU enabled, boots from PI external memory\n");</div><div class='del'>-		dev_err(vsc-&gt;dev, "no idea how to deal with this\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	/* !icpu_si_boot_en &amp;&amp; !cpu_pi_en */</div><div class='del'>-	dev_info(vsc-&gt;dev, "iCPU disabled, no external memory\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_phy_read(struct dsa_switch *ds, int phy, int regnum)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-	u32 cmd;</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Setting bit 26 means "read" */</div><div class='del'>-	cmd = BIT(26) | (phy &lt;&lt; 21) | (regnum &lt;&lt; 16);</div><div class='del'>-	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_MII, 0, 1, cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	msleep(2);</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_MII, 0, 2, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-	if (val &amp; BIT(16)) {</div><div class='del'>-		dev_err(vsc-&gt;dev, "reading reg %02x from phy%d failed\n",</div><div class='del'>-			regnum, phy);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	val &amp;= 0xFFFFU;</div><div class='del'>-</div><div class='del'>-	dev_dbg(vsc-&gt;dev, "read reg %02x from phy%d = %04x\n",</div><div class='del'>-		regnum, phy, val);</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_phy_write(struct dsa_switch *ds, int phy, int regnum,</div><div class='del'>-			     u16 val)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-	u32 cmd;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* It was found through tedious experiments that this router</div><div class='del'>-	 * chip really hates to have it's PHYs reset. They</div><div class='del'>-	 * never recover if that happens: autonegotiation stops</div><div class='del'>-	 * working after a reset. Just filter out this command.</div><div class='del'>-	 * (Resetting the whole chip is OK.)</div><div class='del'>-	 */</div><div class='del'>-	if (regnum == 0 &amp;&amp; (val &amp; BIT(15))) {</div><div class='del'>-		dev_info(vsc-&gt;dev, "reset PHY - disallowed\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cmd = (phy &lt;&lt; 21) | (regnum &lt;&lt; 16);</div><div class='del'>-	ret = vsc73xx_write(vsc, VSC73XX_BLOCK_MII, 0, 1, cmd);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	dev_dbg(vsc-&gt;dev, "write %04x to reg %02x in phy%d\n",</div><div class='del'>-		val, regnum, phy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static enum dsa_tag_protocol vsc73xx_get_tag_protocol(struct dsa_switch *ds,</div><div class='del'>-						      int port)</div><div class='del'>-{</div><div class='del'>-	/* The switch internally uses a 8 byte header with length,</div><div class='del'>-	 * source port, tag, LPA and priority. This is supposedly</div><div class='del'>-	 * only accessible when operating the switch using the internal</div><div class='del'>-	 * CPU or with an external CPU mapping the device in, but not</div><div class='del'>-	 * when operating the switch over SPI and putting frames in/out</div><div class='del'>-	 * on port 6 (the CPU port). So far we must assume that we</div><div class='del'>-	 * cannot access the tag. (See "Internal frame header" section</div><div class='del'>-	 * 3.9.1 in the manual.)</div><div class='del'>-	 */</div><div class='del'>-	return DSA_TAG_PROTO_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_setup(struct dsa_switch *ds)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	dev_info(vsc-&gt;dev, "set up the switch\n");</div><div class='del'>-</div><div class='del'>-	/* Issue RESET */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GLORESET,</div><div class='del'>-		      VSC73XX_GLORESET_MASTER_RESET);</div><div class='del'>-	usleep_range(125, 200);</div><div class='del'>-</div><div class='del'>-	/* Initialize memory, initialize RAM bank 0..15 except 6 and 7</div><div class='del'>-	 * This sequence appears in the</div><div class='del'>-	 * VSC7385 SparX-G5 datasheet section 6.6.1</div><div class='del'>-	 * VSC7395 SparX-G5e datasheet section 6.6.1</div><div class='del'>-	 * "initialization sequence".</div><div class='del'>-	 * No explanation is given to the 0x1010400 magic number.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt;= 15; i++) {</div><div class='del'>-		if (i != 6 &amp;&amp; i != 7) {</div><div class='del'>-			vsc73xx_write(vsc, VSC73XX_BLOCK_MEMINIT,</div><div class='del'>-				      2,</div><div class='del'>-				      0, 0x1010400 + i);</div><div class='del'>-			mdelay(1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	mdelay(30);</div><div class='del'>-</div><div class='del'>-	/* Clear MAC table */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='del'>-		      VSC73XX_MACACCESS,</div><div class='del'>-		      VSC73XX_MACACCESS_CMD_CLEAR_TABLE);</div><div class='del'>-</div><div class='del'>-	/* Clear VLAN table */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='del'>-		      VSC73XX_VLANACCESS,</div><div class='del'>-		      VSC73XX_VLANACCESS_VLAN_TBL_CMD_CLEAR_TABLE);</div><div class='del'>-</div><div class='del'>-	msleep(40);</div><div class='del'>-</div><div class='del'>-	/* Use 20KiB buffers on all ports on VSC7395</div><div class='del'>-	 * The VSC7385 has 16KiB buffers and that is the</div><div class='del'>-	 * default if we don't set this up explicitly.</div><div class='del'>-	 * Port "31" is "all ports".</div><div class='del'>-	 */</div><div class='del'>-	if (IS_739X(vsc))</div><div class='del'>-		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, 0x1f,</div><div class='del'>-			      VSC73XX_Q_MISC_CONF,</div><div class='del'>-			      VSC73XX_Q_MISC_CONF_EXTENT_MEM);</div><div class='del'>-</div><div class='del'>-	/* Put all ports into reset until enabled */</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		if (i == 5)</div><div class='del'>-			continue;</div><div class='del'>-		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, 4,</div><div class='del'>-			      VSC73XX_MAC_CFG, VSC73XX_MAC_CFG_RESET);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* MII delay, set both GTX and RX delay to 2 ns */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GMIIDELAY,</div><div class='del'>-		      VSC73XX_GMIIDELAY_GMII0_GTXDELAY_2_0_NS |</div><div class='del'>-		      VSC73XX_GMIIDELAY_GMII0_RXDELAY_2_0_NS);</div><div class='del'>-	/* Enable reception of frames on all ports */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_RECVMASK,</div><div class='del'>-		      0x5f);</div><div class='del'>-	/* IP multicast flood mask (table 144) */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_ANALYZER, 0, VSC73XX_IFLODMSK,</div><div class='del'>-		      0xff);</div><div class='del'>-</div><div class='del'>-	mdelay(50);</div><div class='del'>-</div><div class='del'>-	/* Release reset from the internal PHYs */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_SYSTEM, 0, VSC73XX_GLORESET,</div><div class='del'>-		      VSC73XX_GLORESET_PHY_RESET);</div><div class='del'>-</div><div class='del'>-	udelay(4);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_init_port(struct vsc73xx *vsc, int port)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* MAC configure, first reset the port and then write defaults */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_MAC_CFG,</div><div class='del'>-		      VSC73XX_MAC_CFG_RESET);</div><div class='del'>-</div><div class='del'>-	/* Take up the port in 1Gbit mode by default, this will be</div><div class='del'>-	 * augmented after auto-negotiation on the PHY-facing</div><div class='del'>-	 * ports.</div><div class='del'>-	 */</div><div class='del'>-	if (port == CPU_PORT)</div><div class='del'>-		val = VSC73XX_MAC_CFG_1000M_F_RGMII;</div><div class='del'>-	else</div><div class='del'>-		val = VSC73XX_MAC_CFG_1000M_F_PHY;</div><div class='del'>-</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_MAC_CFG,</div><div class='del'>-		      val |</div><div class='del'>-		      VSC73XX_MAC_CFG_TX_EN |</div><div class='del'>-		      VSC73XX_MAC_CFG_RX_EN);</div><div class='del'>-</div><div class='del'>-	/* Max length, we can do up to 9.6 KiB, so allow that.</div><div class='del'>-	 * According to application not "VSC7398 Jumbo Frames" setting</div><div class='del'>-	 * up the MTU to 9.6 KB does not affect the performance on standard</div><div class='del'>-	 * frames, so just enable it. It is clear from the application note</div><div class='del'>-	 * that "9.6 kilobytes" == 9600 bytes.</div><div class='del'>-	 */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_MAXLEN, 9600);</div><div class='del'>-</div><div class='del'>-	/* Flow control for the CPU port:</div><div class='del'>-	 * Use a zero delay pause frame when pause condition is left</div><div class='del'>-	 * Obey pause control frames</div><div class='del'>-	 */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_FCCONF,</div><div class='del'>-		      VSC73XX_FCCONF_ZERO_PAUSE_EN |</div><div class='del'>-		      VSC73XX_FCCONF_FLOW_CTRL_OBEY);</div><div class='del'>-</div><div class='del'>-	/* Issue pause control frames on PHY facing ports.</div><div class='del'>-	 * Allow early initiation of MAC transmission if the amount</div><div class='del'>-	 * of egress data is below 512 bytes on CPU port.</div><div class='del'>-	 * FIXME: enable 20KiB buffers?</div><div class='del'>-	 */</div><div class='del'>-	if (port == CPU_PORT)</div><div class='del'>-		val = VSC73XX_Q_MISC_CONF_EARLY_TX_512;</div><div class='del'>-	else</div><div class='del'>-		val = VSC73XX_Q_MISC_CONF_MAC_PAUSE_MODE;</div><div class='del'>-	val |= VSC73XX_Q_MISC_CONF_EXTENT_MEM;</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_Q_MISC_CONF,</div><div class='del'>-		      val);</div><div class='del'>-</div><div class='del'>-	/* Flow control MAC: a MAC address used in flow control frames */</div><div class='del'>-	val = (vsc-&gt;addr[5] &lt;&lt; 16) | (vsc-&gt;addr[4] &lt;&lt; 8) | (vsc-&gt;addr[3]);</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_FCMACHI,</div><div class='del'>-		      val);</div><div class='del'>-	val = (vsc-&gt;addr[2] &lt;&lt; 16) | (vsc-&gt;addr[1] &lt;&lt; 8) | (vsc-&gt;addr[0]);</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_FCMACLO,</div><div class='del'>-		      val);</div><div class='del'>-</div><div class='del'>-	/* Tell the categorizer to forward pause frames, not control</div><div class='del'>-	 * frame. Do not drop anything.</div><div class='del'>-	 */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port,</div><div class='del'>-		      VSC73XX_CAT_DROP,</div><div class='del'>-		      VSC73XX_CAT_DROP_FWD_PAUSE_ENA);</div><div class='del'>-</div><div class='del'>-	/* Clear all counters */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-		      port, VSC73XX_C_RX0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_adjust_enable_port(struct vsc73xx *vsc,</div><div class='del'>-				       int port, struct phy_device *phydev,</div><div class='del'>-				       u32 initval)</div><div class='del'>-{</div><div class='del'>-	u32 val = initval;</div><div class='del'>-	u8 seed;</div><div class='del'>-</div><div class='del'>-	/* Reset this port FIXME: break out subroutine */</div><div class='del'>-	val |= VSC73XX_MAC_CFG_RESET;</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG, val);</div><div class='del'>-</div><div class='del'>-	/* Seed the port randomness with randomness */</div><div class='del'>-	get_random_bytes(&amp;seed, 1);</div><div class='del'>-	val |= seed &lt;&lt; VSC73XX_MAC_CFG_SEED_OFFSET;</div><div class='del'>-	val |= VSC73XX_MAC_CFG_SEED_LOAD;</div><div class='del'>-	val |= VSC73XX_MAC_CFG_WEXC_DIS;</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG, val);</div><div class='del'>-</div><div class='del'>-	/* Flow control for the PHY facing ports:</div><div class='del'>-	 * Use a zero delay pause frame when pause condition is left</div><div class='del'>-	 * Obey pause control frames</div><div class='del'>-	 * When generating pause frames, use 0xff as pause value</div><div class='del'>-	 */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_FCCONF,</div><div class='del'>-		      VSC73XX_FCCONF_ZERO_PAUSE_EN |</div><div class='del'>-		      VSC73XX_FCCONF_FLOW_CTRL_OBEY |</div><div class='del'>-		      0xff);</div><div class='del'>-</div><div class='del'>-	/* Disallow backward dropping of frames from this port */</div><div class='del'>-	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='del'>-			    VSC73XX_SBACKWDROP, BIT(port), 0);</div><div class='del'>-</div><div class='del'>-	/* Enable TX, RX, deassert reset, stop loading seed */</div><div class='del'>-	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='del'>-			    VSC73XX_MAC_CFG,</div><div class='del'>-			    VSC73XX_MAC_CFG_RESET | VSC73XX_MAC_CFG_SEED_LOAD |</div><div class='del'>-			    VSC73XX_MAC_CFG_TX_EN | VSC73XX_MAC_CFG_RX_EN,</div><div class='del'>-			    VSC73XX_MAC_CFG_TX_EN | VSC73XX_MAC_CFG_RX_EN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_adjust_link(struct dsa_switch *ds, int port,</div><div class='del'>-				struct phy_device *phydev)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* Special handling of the CPU-facing port */</div><div class='del'>-	if (port == CPU_PORT) {</div><div class='del'>-		/* Other ports are already initialized but not this one */</div><div class='del'>-		vsc73xx_init_port(vsc, CPU_PORT);</div><div class='del'>-		/* Select the external port for this interface (EXT_PORT)</div><div class='del'>-		 * Enable the GMII GTX external clock</div><div class='del'>-		 * Use double data rate (DDR mode)</div><div class='del'>-		 */</div><div class='del'>-		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC,</div><div class='del'>-			      CPU_PORT,</div><div class='del'>-			      VSC73XX_ADVPORTM,</div><div class='del'>-			      VSC73XX_ADVPORTM_EXT_PORT |</div><div class='del'>-			      VSC73XX_ADVPORTM_ENA_GTX |</div><div class='del'>-			      VSC73XX_ADVPORTM_DDR_MODE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This is the MAC confiuration that always need to happen</div><div class='del'>-	 * after a PHY or the CPU port comes up or down.</div><div class='del'>-	 */</div><div class='del'>-	if (!phydev-&gt;link) {</div><div class='del'>-		int maxloop = 10;</div><div class='del'>-</div><div class='del'>-		dev_dbg(vsc-&gt;dev, "port %d: went down\n",</div><div class='del'>-			port);</div><div class='del'>-</div><div class='del'>-		/* Disable RX on this port */</div><div class='del'>-		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='del'>-				    VSC73XX_MAC_CFG,</div><div class='del'>-				    VSC73XX_MAC_CFG_RX_EN, 0);</div><div class='del'>-</div><div class='del'>-		/* Discard packets */</div><div class='del'>-		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='del'>-				    VSC73XX_ARBDISC, BIT(port), BIT(port));</div><div class='del'>-</div><div class='del'>-		/* Wait until queue is empty */</div><div class='del'>-		vsc73xx_read(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='del'>-			     VSC73XX_ARBEMPTY, &amp;val);</div><div class='del'>-		while (!(val &amp; BIT(port))) {</div><div class='del'>-			msleep(1);</div><div class='del'>-			vsc73xx_read(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='del'>-				     VSC73XX_ARBEMPTY, &amp;val);</div><div class='del'>-			if (--maxloop == 0) {</div><div class='del'>-				dev_err(vsc-&gt;dev,</div><div class='del'>-					"timeout waiting for block arbiter\n");</div><div class='del'>-				/* Continue anyway */</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Put this port into reset */</div><div class='del'>-		vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port, VSC73XX_MAC_CFG,</div><div class='del'>-			      VSC73XX_MAC_CFG_RESET);</div><div class='del'>-</div><div class='del'>-		/* Accept packets again */</div><div class='del'>-		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='del'>-				    VSC73XX_ARBDISC, BIT(port), 0);</div><div class='del'>-</div><div class='del'>-		/* Allow backward dropping of frames from this port */</div><div class='del'>-		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ARBITER, 0,</div><div class='del'>-				    VSC73XX_SBACKWDROP, BIT(port), BIT(port));</div><div class='del'>-</div><div class='del'>-		/* Receive mask (disable forwarding) */</div><div class='del'>-		vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='del'>-				    VSC73XX_RECVMASK, BIT(port), 0);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Figure out what speed was negotiated */</div><div class='del'>-	if (phydev-&gt;speed == SPEED_1000) {</div><div class='del'>-		dev_dbg(vsc-&gt;dev, "port %d: 1000 Mbit mode full duplex\n",</div><div class='del'>-			port);</div><div class='del'>-</div><div class='del'>-		/* Set up default for internal port or external RGMII */</div><div class='del'>-		if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII)</div><div class='del'>-			val = VSC73XX_MAC_CFG_1000M_F_RGMII;</div><div class='del'>-		else</div><div class='del'>-			val = VSC73XX_MAC_CFG_1000M_F_PHY;</div><div class='del'>-		vsc73xx_adjust_enable_port(vsc, port, phydev, val);</div><div class='del'>-	} else if (phydev-&gt;speed == SPEED_100) {</div><div class='del'>-		if (phydev-&gt;duplex == DUPLEX_FULL) {</div><div class='del'>-			val = VSC73XX_MAC_CFG_100_10M_F_PHY;</div><div class='del'>-			dev_dbg(vsc-&gt;dev,</div><div class='del'>-				"port %d: 100 Mbit full duplex mode\n",</div><div class='del'>-				port);</div><div class='del'>-		} else {</div><div class='del'>-			val = VSC73XX_MAC_CFG_100_10M_H_PHY;</div><div class='del'>-			dev_dbg(vsc-&gt;dev,</div><div class='del'>-				"port %d: 100 Mbit half duplex mode\n",</div><div class='del'>-				port);</div><div class='del'>-		}</div><div class='del'>-		vsc73xx_adjust_enable_port(vsc, port, phydev, val);</div><div class='del'>-	} else if (phydev-&gt;speed == SPEED_10) {</div><div class='del'>-		if (phydev-&gt;duplex == DUPLEX_FULL) {</div><div class='del'>-			val = VSC73XX_MAC_CFG_100_10M_F_PHY;</div><div class='del'>-			dev_dbg(vsc-&gt;dev,</div><div class='del'>-				"port %d: 10 Mbit full duplex mode\n",</div><div class='del'>-				port);</div><div class='del'>-		} else {</div><div class='del'>-			val = VSC73XX_MAC_CFG_100_10M_H_PHY;</div><div class='del'>-			dev_dbg(vsc-&gt;dev,</div><div class='del'>-				"port %d: 10 Mbit half duplex mode\n",</div><div class='del'>-				port);</div><div class='del'>-		}</div><div class='del'>-		vsc73xx_adjust_enable_port(vsc, port, phydev, val);</div><div class='del'>-	} else {</div><div class='del'>-		dev_err(vsc-&gt;dev,</div><div class='del'>-			"could not adjust link: unknown speed\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable port (forwarding) in the receieve mask */</div><div class='del'>-	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_ANALYZER, 0,</div><div class='del'>-			    VSC73XX_RECVMASK, BIT(port), BIT(port));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_port_enable(struct dsa_switch *ds, int port,</div><div class='del'>-			       struct phy_device *phy)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	dev_info(vsc-&gt;dev, "enable port %d\n", port);</div><div class='del'>-	vsc73xx_init_port(vsc, port);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_port_disable(struct dsa_switch *ds, int port)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Just put the port into reset */</div><div class='del'>-	vsc73xx_write(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='del'>-		      VSC73XX_MAC_CFG, VSC73XX_MAC_CFG_RESET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct vsc73xx_counter *</div><div class='del'>-vsc73xx_find_counter(struct vsc73xx *vsc,</div><div class='del'>-		     u8 counter,</div><div class='del'>-		     bool tx)</div><div class='del'>-{</div><div class='del'>-	const struct vsc73xx_counter *cnts;</div><div class='del'>-	int num_cnts;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (tx) {</div><div class='del'>-		cnts = vsc73xx_tx_counters;</div><div class='del'>-		num_cnts = ARRAY_SIZE(vsc73xx_tx_counters);</div><div class='del'>-	} else {</div><div class='del'>-		cnts = vsc73xx_rx_counters;</div><div class='del'>-		num_cnts = ARRAY_SIZE(vsc73xx_rx_counters);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_cnts; i++) {</div><div class='del'>-		const struct vsc73xx_counter *cnt;</div><div class='del'>-</div><div class='del'>-		cnt = &amp;cnts[i];</div><div class='del'>-		if (cnt-&gt;counter == counter)</div><div class='del'>-			return cnt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='del'>-				uint8_t *data)</div><div class='del'>-{</div><div class='del'>-	const struct vsc73xx_counter *cnt;</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-	u8 indices[6];</div><div class='del'>-	int i, j;</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (stringset != ETH_SS_STATS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='del'>-			   VSC73XX_C_CFG, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	indices[0] = (val &amp; 0x1f); /* RX counter 0 */</div><div class='del'>-	indices[1] = ((val &gt;&gt; 5) &amp; 0x1f); /* RX counter 1 */</div><div class='del'>-	indices[2] = ((val &gt;&gt; 10) &amp; 0x1f); /* RX counter 2 */</div><div class='del'>-	indices[3] = ((val &gt;&gt; 16) &amp; 0x1f); /* TX counter 0 */</div><div class='del'>-	indices[4] = ((val &gt;&gt; 21) &amp; 0x1f); /* TX counter 1 */</div><div class='del'>-	indices[5] = ((val &gt;&gt; 26) &amp; 0x1f); /* TX counter 2 */</div><div class='del'>-</div><div class='del'>-	/* The first counters is the RX octets */</div><div class='del'>-	j = 0;</div><div class='del'>-	strncpy(data + j * ETH_GSTRING_LEN,</div><div class='del'>-		"RxEtherStatsOctets", ETH_GSTRING_LEN);</div><div class='del'>-	j++;</div><div class='del'>-</div><div class='del'>-	/* Each port supports recording 3 RX counters and 3 TX counters,</div><div class='del'>-	 * figure out what counters we use in this set-up and return the</div><div class='del'>-	 * names of them. The hardware default counters will be number of</div><div class='del'>-	 * packets on RX/TX, combined broadcast+multicast packets RX/TX and</div><div class='del'>-	 * total error packets RX/TX.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		cnt = vsc73xx_find_counter(vsc, indices[i], false);</div><div class='del'>-		if (cnt)</div><div class='del'>-			strncpy(data + j * ETH_GSTRING_LEN,</div><div class='del'>-				cnt-&gt;name, ETH_GSTRING_LEN);</div><div class='del'>-		j++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TX stats begins with the number of TX octets */</div><div class='del'>-	strncpy(data + j * ETH_GSTRING_LEN,</div><div class='del'>-		"TxEtherStatsOctets", ETH_GSTRING_LEN);</div><div class='del'>-	j++;</div><div class='del'>-</div><div class='del'>-	for (i = 3; i &lt; 6; i++) {</div><div class='del'>-		cnt = vsc73xx_find_counter(vsc, indices[i], true);</div><div class='del'>-		if (cnt)</div><div class='del'>-			strncpy(data + j * ETH_GSTRING_LEN,</div><div class='del'>-				cnt-&gt;name, ETH_GSTRING_LEN);</div><div class='del'>-		j++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='del'>-{</div><div class='del'>-	/* We only support SS_STATS */</div><div class='del'>-	if (sset != ETH_SS_STATS)</div><div class='del'>-		return 0;</div><div class='del'>-	/* RX and TX packets, then 3 RX counters, 3 TX counters */</div><div class='del'>-	return 8;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='del'>-				      uint64_t *data)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = ds-&gt;priv;</div><div class='del'>-	u8 regs[] = {</div><div class='del'>-		VSC73XX_RXOCT,</div><div class='del'>-		VSC73XX_C_RX0,</div><div class='del'>-		VSC73XX_C_RX1,</div><div class='del'>-		VSC73XX_C_RX2,</div><div class='del'>-		VSC73XX_TXOCT,</div><div class='del'>-		VSC73XX_C_TX0,</div><div class='del'>-		VSC73XX_C_TX1,</div><div class='del'>-		VSC73XX_C_TX2,</div><div class='del'>-	};</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(regs); i++) {</div><div class='del'>-		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_MAC, port,</div><div class='del'>-				   regs[i], &amp;val);</div><div class='del'>-		if (ret) {</div><div class='del'>-			dev_err(vsc-&gt;dev, "error reading counter %d\n", i);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		data[i] = val;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct dsa_switch_ops vsc73xx_ds_ops = {</div><div class='del'>-	.get_tag_protocol = vsc73xx_get_tag_protocol,</div><div class='del'>-	.setup = vsc73xx_setup,</div><div class='del'>-	.phy_read = vsc73xx_phy_read,</div><div class='del'>-	.phy_write = vsc73xx_phy_write,</div><div class='del'>-	.adjust_link = vsc73xx_adjust_link,</div><div class='del'>-	.get_strings = vsc73xx_get_strings,</div><div class='del'>-	.get_ethtool_stats = vsc73xx_get_ethtool_stats,</div><div class='del'>-	.get_sset_count = vsc73xx_get_sset_count,</div><div class='del'>-	.port_enable = vsc73xx_port_enable,</div><div class='del'>-	.port_disable = vsc73xx_port_disable,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int vsc73xx_gpio_get(struct gpio_chip *chip, unsigned int offset)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-			   VSC73XX_GPIO, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return !!(val &amp; BIT(offset));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vsc73xx_gpio_set(struct gpio_chip *chip, unsigned int offset,</div><div class='del'>-			     int val)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='del'>-	u32 tmp = val ? BIT(offset) : 0;</div><div class='del'>-</div><div class='del'>-	vsc73xx_update_bits(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-			    VSC73XX_GPIO, BIT(offset), tmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_gpio_direction_output(struct gpio_chip *chip,</div><div class='del'>-					 unsigned int offset, int val)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='del'>-	u32 tmp = val ? BIT(offset) : 0;</div><div class='del'>-</div><div class='del'>-	return vsc73xx_update_bits(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-				   VSC73XX_GPIO, BIT(offset + 4) | BIT(offset),</div><div class='del'>-				   BIT(offset + 4) | tmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_gpio_direction_input(struct gpio_chip *chip,</div><div class='del'>-					unsigned int offset)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='del'>-</div><div class='del'>-	return  vsc73xx_update_bits(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-				    VSC73XX_GPIO, BIT(offset + 4),</div><div class='del'>-				    0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_gpio_get_direction(struct gpio_chip *chip,</div><div class='del'>-				      unsigned int offset)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = gpiochip_get_data(chip);</div><div class='del'>-	u32 val;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,</div><div class='del'>-			   VSC73XX_GPIO, &amp;val);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	return !(val &amp; BIT(offset + 4));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_gpio_probe(struct vsc73xx *vsc)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	vsc-&gt;gc.label = devm_kasprintf(vsc-&gt;dev, GFP_KERNEL, "VSC%04x",</div><div class='del'>-				       vsc-&gt;chipid);</div><div class='del'>-	vsc-&gt;gc.ngpio = 4;</div><div class='del'>-	vsc-&gt;gc.owner = THIS_MODULE;</div><div class='del'>-	vsc-&gt;gc.parent = vsc-&gt;dev;</div><div class='del'>-	vsc-&gt;gc.of_node = vsc-&gt;dev-&gt;of_node;</div><div class='del'>-	vsc-&gt;gc.base = -1;</div><div class='del'>-	vsc-&gt;gc.get = vsc73xx_gpio_get;</div><div class='del'>-	vsc-&gt;gc.set = vsc73xx_gpio_set;</div><div class='del'>-	vsc-&gt;gc.direction_input = vsc73xx_gpio_direction_input;</div><div class='del'>-	vsc-&gt;gc.direction_output = vsc73xx_gpio_direction_output;</div><div class='del'>-	vsc-&gt;gc.get_direction = vsc73xx_gpio_get_direction;</div><div class='del'>-	vsc-&gt;gc.can_sleep = true;</div><div class='del'>-	ret = devm_gpiochip_add_data(vsc-&gt;dev, &amp;vsc-&gt;gc, vsc);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(vsc-&gt;dev, "unable to register GPIO chip\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_probe(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = &amp;spi-&gt;dev;</div><div class='del'>-	struct vsc73xx *vsc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	vsc = devm_kzalloc(dev, sizeof(*vsc), GFP_KERNEL);</div><div class='del'>-	if (!vsc)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	spi_set_drvdata(spi, vsc);</div><div class='del'>-	vsc-&gt;spi = spi_dev_get(spi);</div><div class='del'>-	vsc-&gt;dev = dev;</div><div class='del'>-	mutex_init(&amp;vsc-&gt;lock);</div><div class='del'>-</div><div class='del'>-	/* Release reset, if any */</div><div class='del'>-	vsc-&gt;reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);</div><div class='del'>-	if (IS_ERR(vsc-&gt;reset)) {</div><div class='del'>-		dev_err(dev, "failed to get RESET GPIO\n");</div><div class='del'>-		return PTR_ERR(vsc-&gt;reset);</div><div class='del'>-	}</div><div class='del'>-	if (vsc-&gt;reset)</div><div class='del'>-		/* Wait 20ms according to datasheet table 245 */</div><div class='del'>-		msleep(20);</div><div class='del'>-</div><div class='del'>-	spi-&gt;mode = SPI_MODE_0;</div><div class='del'>-	spi-&gt;bits_per_word = 8;</div><div class='del'>-	ret = spi_setup(spi);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "spi setup failed.\n");</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_detect(vsc);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "no chip found (%d)\n", ret);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eth_random_addr(vsc-&gt;addr);</div><div class='del'>-	dev_info(vsc-&gt;dev,</div><div class='del'>-		 "MAC for control frames: %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='del'>-		 vsc-&gt;addr[0], vsc-&gt;addr[1], vsc-&gt;addr[2],</div><div class='del'>-		 vsc-&gt;addr[3], vsc-&gt;addr[4], vsc-&gt;addr[5]);</div><div class='del'>-</div><div class='del'>-	/* The VSC7395 switch chips have 5+1 ports which means 5</div><div class='del'>-	 * ordinary ports and a sixth CPU port facing the processor</div><div class='del'>-	 * with an RGMII interface. These ports are numbered 0..4</div><div class='del'>-	 * and 6, so they leave a "hole" in the port map for port 5,</div><div class='del'>-	 * which is invalid.</div><div class='del'>-	 *</div><div class='del'>-	 * The VSC7398 has 8 ports, port 7 is again the CPU port.</div><div class='del'>-	 *</div><div class='del'>-	 * We allocate 8 ports and avoid access to the nonexistant</div><div class='del'>-	 * ports.</div><div class='del'>-	 */</div><div class='del'>-	vsc-&gt;ds = dsa_switch_alloc(dev, 8);</div><div class='del'>-	if (!vsc-&gt;ds)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	vsc-&gt;ds-&gt;priv = vsc;</div><div class='del'>-</div><div class='del'>-	vsc-&gt;ds-&gt;ops = &amp;vsc73xx_ds_ops;</div><div class='del'>-	ret = dsa_register_switch(vsc-&gt;ds);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(dev, "unable to register switch (%d)\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = vsc73xx_gpio_probe(vsc);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dsa_unregister_switch(vsc-&gt;ds);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int vsc73xx_remove(struct spi_device *spi)</div><div class='del'>-{</div><div class='del'>-	struct vsc73xx *vsc = spi_get_drvdata(spi);</div><div class='del'>-</div><div class='del'>-	dsa_unregister_switch(vsc-&gt;ds);</div><div class='del'>-	gpiod_set_value(vsc-&gt;reset, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id vsc73xx_of_match[] = {</div><div class='del'>-	{</div><div class='del'>-		.compatible = "vitesse,vsc7385",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.compatible = "vitesse,vsc7388",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.compatible = "vitesse,vsc7395",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.compatible = "vitesse,vsc7398",</div><div class='del'>-	},</div><div class='del'>-	{ },</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, vsc73xx_of_match);</div><div class='del'>-</div><div class='del'>-static struct spi_driver vsc73xx_driver = {</div><div class='del'>-	.probe = vsc73xx_probe,</div><div class='del'>-	.remove = vsc73xx_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = "vsc73xx",</div><div class='del'>-		.of_match_table = vsc73xx_of_match,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-module_spi_driver(vsc73xx_driver);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Linus Walleij &lt;linus.walleij@linaro.org&gt;");</div><div class='del'>-MODULE_DESCRIPTION("Vitesse VSC7385/7388/7395/7398 driver");</div><div class='del'>-MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/vitesse-vsc73xx.h b/drivers/net/dsa/vitesse-vsc73xx.h<br/>new file mode 100644<br/>index 000000000000..3c30e143c14f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/vitesse-vsc73xx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/vitesse-vsc73xx.h</a></div><div class='hunk'>@@ -0,0 +1,94 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/gpio/driver.h&gt;</div><div class='add'>+</div><div class='add'>+/* The VSC7395 switch chips have 5+1 ports which means 5 ordinary ports and</div><div class='add'>+ * a sixth CPU port facing the processor with an RGMII interface. These ports</div><div class='add'>+ * are numbered 0..4 and 6, so they leave a "hole" in the port map for port 5,</div><div class='add'>+ * which is invalid.</div><div class='add'>+ *</div><div class='add'>+ * The VSC7398 has 8 ports, port 7 is again the CPU port.</div><div class='add'>+ *</div><div class='add'>+ * We allocate 8 ports and avoid access to the nonexistent ports.</div><div class='add'>+ */</div><div class='add'>+#define VSC73XX_MAX_NUM_PORTS	8</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct vsc73xx_portinfo - port data structure: contains storage data</div><div class='add'>+ * @pvid_vlan_filtering: pvid vlan number used in vlan filtering mode</div><div class='add'>+ * @pvid_tag_8021q: pvid vlan number used in tag_8021q mode</div><div class='add'>+ * @pvid_vlan_filtering_configured: informs if port has configured pvid in vlan</div><div class='add'>+ *	filtering mode</div><div class='add'>+ * @pvid_tag_8021q_configured: imforms if port have configured pvid in tag_8021q</div><div class='add'>+ *	mode</div><div class='add'>+ */</div><div class='add'>+struct vsc73xx_portinfo {</div><div class='add'>+	u16		pvid_vlan_filtering;</div><div class='add'>+	u16		pvid_tag_8021q;</div><div class='add'>+	bool		pvid_vlan_filtering_configured;</div><div class='add'>+	bool		pvid_tag_8021q_configured;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct vsc73xx - VSC73xx state container: main data structure</div><div class='add'>+ * @dev: The device pointer</div><div class='add'>+ * @reset: The descriptor for the GPIO line tied to the reset pin</div><div class='add'>+ * @ds: Pointer to the DSA core structure</div><div class='add'>+ * @gc: Main structure of the GPIO controller</div><div class='add'>+ * @chipid: Storage for the Chip ID value read from the CHIPID register of the</div><div class='add'>+ *	switch</div><div class='add'>+ * @addr: MAC address used in flow control frames</div><div class='add'>+ * @ops: Structure with hardware-dependent operations</div><div class='add'>+ * @priv: Pointer to the configuration interface structure</div><div class='add'>+ * @portinfo: Storage table portinfo structructures</div><div class='add'>+ * @vlans: List of configured vlans. Contains port mask and untagged status of</div><div class='add'>+ *	every vlan configured in port vlan operation. It doesn't cover tag_8021q</div><div class='add'>+ *	vlans.</div><div class='add'>+ * @fdb_lock: Mutex protects fdb access</div><div class='add'>+ */</div><div class='add'>+struct vsc73xx {</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	struct gpio_desc		*reset;</div><div class='add'>+	struct dsa_switch		*ds;</div><div class='add'>+	struct gpio_chip		gc;</div><div class='add'>+	u16				chipid;</div><div class='add'>+	u8				addr[ETH_ALEN];</div><div class='add'>+	const struct vsc73xx_ops	*ops;</div><div class='add'>+	void				*priv;</div><div class='add'>+	struct vsc73xx_portinfo		portinfo[VSC73XX_MAX_NUM_PORTS];</div><div class='add'>+	struct list_head		vlans;</div><div class='add'>+	struct mutex			fdb_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct vsc73xx_ops - VSC73xx methods container</div><div class='add'>+ * @read: Method for register reading over the hardware-dependent interface</div><div class='add'>+ * @write: Method for register writing over the hardware-dependent interface</div><div class='add'>+ */</div><div class='add'>+struct vsc73xx_ops {</div><div class='add'>+	int (*read)(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='add'>+		    u32 *val);</div><div class='add'>+	int (*write)(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,</div><div class='add'>+		     u32 val);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct vsc73xx_bridge_vlan - VSC73xx driver structure which keeps vlan</div><div class='add'>+ *	database copy</div><div class='add'>+ * @vid: VLAN number</div><div class='add'>+ * @portmask: each bit represents one port</div><div class='add'>+ * @untagged: each bit represents one port configured with @vid untagged</div><div class='add'>+ * @list: list structure</div><div class='add'>+ */</div><div class='add'>+struct vsc73xx_bridge_vlan {</div><div class='add'>+	u16 vid;</div><div class='add'>+	u8 portmask;</div><div class='add'>+	u8 untagged;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int vsc73xx_is_addr_valid(u8 block, u8 subblock);</div><div class='add'>+int vsc73xx_probe(struct vsc73xx *vsc);</div><div class='add'>+void vsc73xx_remove(struct vsc73xx *vsc);</div><div class='add'>+void vsc73xx_shutdown(struct vsc73xx *vsc);</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/Kconfig b/drivers/net/dsa/xrs700x/Kconfig<br/>new file mode 100644<br/>index 000000000000..d10a4dce1676<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config NET_DSA_XRS700X</div><div class='add'>+	tristate</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+	select NET_DSA_TAG_XRS700X</div><div class='add'>+	select REGMAP</div><div class='add'>+	help</div><div class='add'>+	  This enables support for Arrow SpeedChips XRS7003/7004 gigabit</div><div class='add'>+	  Ethernet switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_XRS700X_I2C</div><div class='add'>+	tristate "Arrow XRS7000X series switch in I2C mode"</div><div class='add'>+	depends on NET_DSA &amp;&amp; I2C</div><div class='add'>+	select NET_DSA_XRS700X</div><div class='add'>+	select REGMAP_I2C</div><div class='add'>+	help</div><div class='add'>+	  Enable I2C support for Arrow SpeedChips XRS7003/7004 gigabit Ethernet</div><div class='add'>+	  switches.</div><div class='add'>+</div><div class='add'>+config NET_DSA_XRS700X_MDIO</div><div class='add'>+	tristate "Arrow XRS7000X series switch in MDIO mode"</div><div class='add'>+	depends on NET_DSA</div><div class='add'>+	select NET_DSA_XRS700X</div><div class='add'>+	help</div><div class='add'>+	  Enable MDIO support for Arrow SpeedChips XRS7003/7004 gigabit Ethernet</div><div class='add'>+	  switches.</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/Makefile b/drivers/net/dsa/xrs700x/Makefile<br/>new file mode 100644<br/>index 000000000000..51a3a7d9296a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-$(CONFIG_NET_DSA_XRS700X) += xrs700x.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_XRS700X_I2C) += xrs700x_i2c.o</div><div class='add'>+obj-$(CONFIG_NET_DSA_XRS700X_MDIO) += xrs700x_mdio.o</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/xrs700x.c b/drivers/net/dsa/xrs700x/xrs700x.c<br/>new file mode 100644<br/>index 000000000000..0a05f4156ef4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/xrs700x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/xrs700x.c</a></div><div class='hunk'>@@ -0,0 +1,860 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 NovaTech LLC</div><div class='add'>+ * George McCollister &lt;george.mccollister@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/netdev_features.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='add'>+#include "xrs700x.h"</div><div class='add'>+#include "xrs700x_reg.h"</div><div class='add'>+</div><div class='add'>+#define XRS700X_MIB_INTERVAL msecs_to_jiffies(3000)</div><div class='add'>+</div><div class='add'>+#define XRS7000X_SUPPORTED_HSR_FEATURES \</div><div class='add'>+	(NETIF_F_HW_HSR_TAG_INS | NETIF_F_HW_HSR_TAG_RM | \</div><div class='add'>+	 NETIF_F_HW_HSR_FWD | NETIF_F_HW_HSR_DUP)</div><div class='add'>+</div><div class='add'>+#define XRS7003E_ID	0x100</div><div class='add'>+#define XRS7003F_ID	0x101</div><div class='add'>+#define XRS7004E_ID	0x200</div><div class='add'>+#define XRS7004F_ID	0x201</div><div class='add'>+</div><div class='add'>+const struct xrs700x_info xrs7003e_info = {XRS7003E_ID, "XRS7003E", 3};</div><div class='add'>+EXPORT_SYMBOL(xrs7003e_info);</div><div class='add'>+</div><div class='add'>+const struct xrs700x_info xrs7003f_info = {XRS7003F_ID, "XRS7003F", 3};</div><div class='add'>+EXPORT_SYMBOL(xrs7003f_info);</div><div class='add'>+</div><div class='add'>+const struct xrs700x_info xrs7004e_info = {XRS7004E_ID, "XRS7004E", 4};</div><div class='add'>+EXPORT_SYMBOL(xrs7004e_info);</div><div class='add'>+</div><div class='add'>+const struct xrs700x_info xrs7004f_info = {XRS7004F_ID, "XRS7004F", 4};</div><div class='add'>+EXPORT_SYMBOL(xrs7004f_info);</div><div class='add'>+</div><div class='add'>+struct xrs700x_regfield {</div><div class='add'>+	struct reg_field rf;</div><div class='add'>+	struct regmap_field **rmf;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xrs700x_mib {</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	const char *name;</div><div class='add'>+	int stats64_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define XRS700X_MIB_ETHTOOL_ONLY(o, n) {o, n, -1}</div><div class='add'>+#define XRS700X_MIB(o, n, m) {o, n, offsetof(struct rtnl_link_stats64, m)}</div><div class='add'>+</div><div class='add'>+static const struct xrs700x_mib xrs700x_mibs[] = {</div><div class='add'>+	XRS700X_MIB(XRS_RX_GOOD_OCTETS_L, "rx_good_octets", rx_bytes),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_BAD_OCTETS_L, "rx_bad_octets"),</div><div class='add'>+	XRS700X_MIB(XRS_RX_UNICAST_L, "rx_unicast", rx_packets),</div><div class='add'>+	XRS700X_MIB(XRS_RX_BROADCAST_L, "rx_broadcast", rx_packets),</div><div class='add'>+	XRS700X_MIB(XRS_RX_MULTICAST_L, "rx_multicast", multicast),</div><div class='add'>+	XRS700X_MIB(XRS_RX_UNDERSIZE_L, "rx_undersize", rx_length_errors),</div><div class='add'>+	XRS700X_MIB(XRS_RX_FRAGMENTS_L, "rx_fragments", rx_length_errors),</div><div class='add'>+	XRS700X_MIB(XRS_RX_OVERSIZE_L, "rx_oversize", rx_length_errors),</div><div class='add'>+	XRS700X_MIB(XRS_RX_JABBER_L, "rx_jabber", rx_length_errors),</div><div class='add'>+	XRS700X_MIB(XRS_RX_ERR_L, "rx_err", rx_errors),</div><div class='add'>+	XRS700X_MIB(XRS_RX_CRC_L, "rx_crc", rx_crc_errors),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_64_L, "rx_64"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_65_127_L, "rx_65_127"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_128_255_L, "rx_128_255"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_256_511_L, "rx_256_511"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_512_1023_L, "rx_512_1023"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_1024_1536_L, "rx_1024_1536"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_HSR_PRP_L, "rx_hsr_prp"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_WRONGLAN_L, "rx_wronglan"),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_RX_DUPLICATE_L, "rx_duplicate"),</div><div class='add'>+	XRS700X_MIB(XRS_TX_OCTETS_L, "tx_octets", tx_bytes),</div><div class='add'>+	XRS700X_MIB(XRS_TX_UNICAST_L, "tx_unicast", tx_packets),</div><div class='add'>+	XRS700X_MIB(XRS_TX_BROADCAST_L, "tx_broadcast", tx_packets),</div><div class='add'>+	XRS700X_MIB(XRS_TX_MULTICAST_L, "tx_multicast", tx_packets),</div><div class='add'>+	XRS700X_MIB_ETHTOOL_ONLY(XRS_TX_HSR_PRP_L, "tx_hsr_prp"),</div><div class='add'>+	XRS700X_MIB(XRS_PRIQ_DROP_L, "priq_drop", tx_dropped),</div><div class='add'>+	XRS700X_MIB(XRS_EARLY_DROP_L, "early_drop", tx_dropped),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u8 eth_hsrsup_addr[ETH_ALEN] = {</div><div class='add'>+	0x01, 0x15, 0x4e, 0x00, 0x01, 0x00};</div><div class='add'>+</div><div class='add'>+static void xrs700x_get_strings(struct dsa_switch *ds, int port,</div><div class='add'>+				u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(xrs700x_mibs); i++)</div><div class='add'>+		ethtool_puts(&amp;data, xrs700x_mibs[i].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return ARRAY_SIZE(xrs700x_mibs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_read_port_counters(struct xrs700x *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x_port *p = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct rtnl_link_stats64 stats;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(&amp;stats, 0, sizeof(stats));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;p-&gt;mib_mutex);</div><div class='add'>+</div><div class='add'>+	/* Capture counter values */</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_CNT_CTRL(port), 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(xrs700x_mibs); i++) {</div><div class='add'>+		unsigned int high = 0, low = 0, reg;</div><div class='add'>+</div><div class='add'>+		reg = xrs700x_mibs[i].offset + XRS_PORT_OFFSET * port;</div><div class='add'>+		regmap_read(priv-&gt;regmap, reg, &amp;low);</div><div class='add'>+		regmap_read(priv-&gt;regmap, reg + 2, &amp;high);</div><div class='add'>+</div><div class='add'>+		p-&gt;mib_data[i] += (high &lt;&lt; 16) | low;</div><div class='add'>+</div><div class='add'>+		if (xrs700x_mibs[i].stats64_offset &gt;= 0) {</div><div class='add'>+			u8 *s = (u8 *)&amp;stats + xrs700x_mibs[i].stats64_offset;</div><div class='add'>+			*(u64 *)s += p-&gt;mib_data[i];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* multicast must be added to rx_packets (which already includes</div><div class='add'>+	 * unicast and broadcast)</div><div class='add'>+	 */</div><div class='add'>+	stats.rx_packets += stats.multicast;</div><div class='add'>+</div><div class='add'>+	flags = u64_stats_update_begin_irqsave(&amp;p-&gt;syncp);</div><div class='add'>+	p-&gt;stats64 = stats;</div><div class='add'>+	u64_stats_update_end_irqrestore(&amp;p-&gt;syncp, flags);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;p-&gt;mib_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_mib_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = container_of(work, struct xrs700x,</div><div class='add'>+					    mib_work.work);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++)</div><div class='add'>+		xrs700x_read_port_counters(priv, i);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;mib_work, XRS700X_MIB_INTERVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_get_ethtool_stats(struct dsa_switch *ds, int port,</div><div class='add'>+				      u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	struct xrs700x_port *p = &amp;priv-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	xrs700x_read_port_counters(priv, port);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;p-&gt;mib_mutex);</div><div class='add'>+	memcpy(data, p-&gt;mib_data, sizeof(*data) * ARRAY_SIZE(xrs700x_mibs));</div><div class='add'>+	mutex_unlock(&amp;p-&gt;mib_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+				struct rtnl_link_stats64 *s)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	struct xrs700x_port *p = &amp;priv-&gt;ports[port];</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;p-&gt;syncp);</div><div class='add'>+		*s = p-&gt;stats64;</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;p-&gt;syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_setup_regmap_range(struct xrs700x *priv)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x_regfield regfields[] = {</div><div class='add'>+		{</div><div class='add'>+			.rf = REG_FIELD_ID(XRS_PORT_STATE(0), 0, 1,</div><div class='add'>+					   priv-&gt;ds-&gt;num_ports,</div><div class='add'>+					   XRS_PORT_OFFSET),</div><div class='add'>+			.rmf = &amp;priv-&gt;ps_forward</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.rf = REG_FIELD_ID(XRS_PORT_STATE(0), 2, 3,</div><div class='add'>+					   priv-&gt;ds-&gt;num_ports,</div><div class='add'>+					   XRS_PORT_OFFSET),</div><div class='add'>+			.rmf = &amp;priv-&gt;ps_management</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.rf = REG_FIELD_ID(XRS_PORT_STATE(0), 4, 9,</div><div class='add'>+					   priv-&gt;ds-&gt;num_ports,</div><div class='add'>+					   XRS_PORT_OFFSET),</div><div class='add'>+			.rmf = &amp;priv-&gt;ps_sel_speed</div><div class='add'>+		},</div><div class='add'>+		{</div><div class='add'>+			.rf = REG_FIELD_ID(XRS_PORT_STATE(0), 10, 11,</div><div class='add'>+					   priv-&gt;ds-&gt;num_ports,</div><div class='add'>+					   XRS_PORT_OFFSET),</div><div class='add'>+			.rmf = &amp;priv-&gt;ps_cur_speed</div><div class='add'>+		}</div><div class='add'>+	};</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (; i &lt; ARRAY_SIZE(regfields); i++) {</div><div class='add'>+		*regfields[i].rmf = devm_regmap_field_alloc(priv-&gt;dev,</div><div class='add'>+							    priv-&gt;regmap,</div><div class='add'>+							    regfields[i].rf);</div><div class='add'>+		if (IS_ERR(*regfields[i].rmf))</div><div class='add'>+			return PTR_ERR(*regfields[i].rmf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol xrs700x_get_tag_protocol(struct dsa_switch *ds,</div><div class='add'>+						      int port,</div><div class='add'>+						      enum dsa_tag_protocol m)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_XRS700X;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_reset(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_GENERAL, XRS_GENERAL_RESET);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(priv-&gt;regmap, XRS_GENERAL,</div><div class='add'>+				       val, !(val &amp; XRS_GENERAL_RESET),</div><div class='add'>+				       10, 1000);</div><div class='add'>+error:</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err_ratelimited(priv-&gt;dev, "error resetting switch: %d\n",</div><div class='add'>+				    ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_port_stp_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+				       u8 state)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int bpdus = 1;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		bpdus = 0;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		val = XRS_PORT_DISABLED;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		val = XRS_PORT_LEARNING;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		val = XRS_PORT_FORWARDING;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ds-&gt;dev, "invalid STP state: %d\n", state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, port, val);</div><div class='add'>+</div><div class='add'>+	/* Enable/disable inbound policy added by xrs700x_port_add_bpdu_ipf()</div><div class='add'>+	 * which allows BPDU forwarding to the CPU port when the front facing</div><div class='add'>+	 * port is in disabled/learning state.</div><div class='add'>+	 */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, XRS_ETH_ADDR_CFG(port, 0), 1, bpdus);</div><div class='add'>+</div><div class='add'>+	dev_dbg_ratelimited(priv-&gt;dev, "%s - port: %d, state: %u, val: 0x%x\n",</div><div class='add'>+			    __func__, port, state, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add an inbound policy filter which matches the BPDU destination MAC</div><div class='add'>+ * and forwards to the CPU port. Leave the policy disabled, it will be</div><div class='add'>+ * enabled as needed.</div><div class='add'>+ */</div><div class='add'>+static int xrs700x_port_add_bpdu_ipf(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Compare all 48 bits of the destination MAC address. */</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_CFG(port, 0), 48 &lt;&lt; 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* match BPDU destination 01:80:c2:00:00:00 */</div><div class='add'>+	for (i = 0; i &lt; sizeof(eth_stp_addr); i += 2) {</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_0(port, 0) + i,</div><div class='add'>+				   eth_stp_addr[i] |</div><div class='add'>+				   (eth_stp_addr[i + 1] &lt;&lt; 8));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mirror BPDU to CPU port */</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		if (dsa_is_cpu_port(ds, i))</div><div class='add'>+			val |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_FWD_MIRROR(port, 0), val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_FWD_ALLOW(port, 0), 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add an inbound policy filter which matches the HSR/PRP supervision MAC</div><div class='add'>+ * range and forwards to the CPU port without discarding duplicates.</div><div class='add'>+ * This is required to correctly populate the HSR/PRP node_table.</div><div class='add'>+ * Leave the policy disabled, it will be enabled as needed.</div><div class='add'>+ */</div><div class='add'>+static int xrs700x_port_add_hsrsup_ipf(struct dsa_switch *ds, int port,</div><div class='add'>+				       int fwdport)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Compare 40 bits of the destination MAC address. */</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_CFG(port, 1), 40 &lt;&lt; 2);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* match HSR/PRP supervision destination 01:15:4e:00:01:XX */</div><div class='add'>+	for (i = 0; i &lt; sizeof(eth_hsrsup_addr); i += 2) {</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_0(port, 1) + i,</div><div class='add'>+				   eth_hsrsup_addr[i] |</div><div class='add'>+				   (eth_hsrsup_addr[i + 1] &lt;&lt; 8));</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mirror HSR/PRP supervision to CPU port */</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		if (dsa_is_cpu_port(ds, i))</div><div class='add'>+			val |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_FWD_MIRROR(port, 1), val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (fwdport &gt;= 0)</div><div class='add'>+		val |= BIT(fwdport);</div><div class='add'>+</div><div class='add'>+	/* Allow must be set prevent duplicate discard */</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_ETH_ADDR_FWD_ALLOW(port, 1), val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_port_setup(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	bool cpu_port = dsa_is_cpu_port(ds, port);</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	unsigned int val = 0;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	xrs700x_port_stp_state_set(ds, port, BR_STATE_DISABLED);</div><div class='add'>+</div><div class='add'>+	/* Disable forwarding to non-CPU ports */</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		if (!dsa_is_cpu_port(ds, i))</div><div class='add'>+			val |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 1 = Disable forwarding to the port */</div><div class='add'>+	ret = regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(port), val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = cpu_port ? XRS_PORT_MODE_MANAGEMENT : XRS_PORT_MODE_NORMAL;</div><div class='add'>+	ret = regmap_fields_write(priv-&gt;ps_management, port, val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!cpu_port) {</div><div class='add'>+		ret = xrs700x_port_add_bpdu_ipf(ds, port);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = xrs700x_reset(ds);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		ret = xrs700x_port_setup(ds, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;mib_work, XRS700X_MIB_INTERVAL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_teardown(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+</div><div class='add'>+	cancel_delayed_work_sync(&amp;priv-&gt;mib_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+				     struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	switch (port) {</div><div class='add'>+	case 0:</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		config-&gt;mac_capabilities = MAC_10FD | MAC_100FD;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case 1:</div><div class='add'>+	case 2:</div><div class='add'>+	case 3:</div><div class='add'>+		phy_interface_set_rgmii(config-&gt;supported_interfaces);</div><div class='add'>+		config-&gt;mac_capabilities = MAC_10FD | MAC_100FD | MAC_1000FD;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(ds-&gt;dev, "Unsupported port: %i\n", port);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_mac_link_down(struct phylink_config *config,</div><div class='add'>+				  unsigned int mode, phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_mac_link_up(struct phylink_config *config,</div><div class='add'>+				struct phy_device *phydev,</div><div class='add'>+				unsigned int mode, phy_interface_t interface,</div><div class='add'>+				int speed, int duplex,</div><div class='add'>+				bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct xrs700x *priv = dp-&gt;ds-&gt;priv;</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		val = XRS_PORT_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		val = XRS_PORT_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		val = XRS_PORT_SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_sel_speed, port, val);</div><div class='add'>+</div><div class='add'>+	dev_dbg_ratelimited(priv-&gt;dev, "%s: port: %d mode: %u speed: %u\n",</div><div class='add'>+			    __func__, port, mode, speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_bridge_common(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct dsa_bridge bridge, bool join)</div><div class='add'>+{</div><div class='add'>+	unsigned int i, cpu_mask = 0, mask = 0;</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		if (dsa_is_cpu_port(ds, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cpu_mask |= BIT(i);</div><div class='add'>+</div><div class='add'>+		if (dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		mask |= BIT(i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ds-&gt;num_ports; i++) {</div><div class='add'>+		if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &amp;bridge))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* 1 = Disable forwarding to the port */</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(i), mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!join) {</div><div class='add'>+		ret = regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(port),</div><div class='add'>+				   cpu_mask);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			       struct dsa_bridge bridge, bool *tx_fwd_offload,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return xrs700x_bridge_common(ds, port, bridge, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	xrs700x_bridge_common(ds, port, bridge, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_hsr_join(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct net_device *hsr,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned int val = XRS_HSR_CFG_HSR_PRP;</div><div class='add'>+	struct dsa_port *partner = NULL, *dp;</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *user;</div><div class='add'>+	int ret, i, hsr_pair[2];</div><div class='add'>+	enum hsr_port_type type;</div><div class='add'>+	enum hsr_version ver;</div><div class='add'>+	bool fwd = false;</div><div class='add'>+</div><div class='add'>+	ret = hsr_get_version(hsr, &amp;ver);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (port != 1 &amp;&amp; port != 2) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Only ports 1 and 2 can offload HSR/PRP");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ver == HSR_V1) {</div><div class='add'>+		val |= XRS_HSR_CFG_HSR;</div><div class='add'>+	} else if (ver == PRP_V1) {</div><div class='add'>+		val |= XRS_HSR_CFG_PRP;</div><div class='add'>+	} else {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Only HSR v1 and PRP v1 can be offloaded");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = hsr_get_port_type(hsr, dsa_to_port(ds, port)-&gt;user, &amp;type);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (type != HSR_PT_SLAVE_A &amp;&amp; type != HSR_PT_SLAVE_B) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Only HSR slave ports can be offloaded");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_hsr_foreach_port(dp, ds, hsr) {</div><div class='add'>+		if (dp-&gt;index != port) {</div><div class='add'>+			partner = dp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We can't enable redundancy on the switch until both</div><div class='add'>+	 * redundant ports have signed up.</div><div class='add'>+	 */</div><div class='add'>+	if (!partner)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, partner-&gt;index,</div><div class='add'>+			    XRS_PORT_DISABLED);</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, port, XRS_PORT_DISABLED);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_HSR_CFG(partner-&gt;index),</div><div class='add'>+		     val | XRS_HSR_CFG_LANID_A);</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_HSR_CFG(port),</div><div class='add'>+		     val | XRS_HSR_CFG_LANID_B);</div><div class='add'>+</div><div class='add'>+	/* Clear bits for both redundant ports (HSR only) and the CPU port to</div><div class='add'>+	 * enable forwarding.</div><div class='add'>+	 */</div><div class='add'>+	val = GENMASK(ds-&gt;num_ports - 1, 0);</div><div class='add'>+	if (ver == HSR_V1) {</div><div class='add'>+		val &amp;= ~BIT(partner-&gt;index);</div><div class='add'>+		val &amp;= ~BIT(port);</div><div class='add'>+		fwd = true;</div><div class='add'>+	}</div><div class='add'>+	val &amp;= ~BIT(dsa_upstream_port(ds, port));</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(partner-&gt;index), val);</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(port), val);</div><div class='add'>+</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, partner-&gt;index,</div><div class='add'>+			    XRS_PORT_FORWARDING);</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, port, XRS_PORT_FORWARDING);</div><div class='add'>+</div><div class='add'>+	/* Enable inbound policy which allows HSR/PRP supervision forwarding</div><div class='add'>+	 * to the CPU port without discarding duplicates. Continue to</div><div class='add'>+	 * forward to redundant ports when in HSR mode while discarding</div><div class='add'>+	 * duplicates.</div><div class='add'>+	 */</div><div class='add'>+	ret = xrs700x_port_add_hsrsup_ipf(ds, partner-&gt;index, fwd ? port : -1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = xrs700x_port_add_hsrsup_ipf(ds, port, fwd ? partner-&gt;index : -1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap,</div><div class='add'>+			   XRS_ETH_ADDR_CFG(partner-&gt;index, 1), 1, 1);</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, XRS_ETH_ADDR_CFG(port, 1), 1, 1);</div><div class='add'>+</div><div class='add'>+	hsr_pair[0] = port;</div><div class='add'>+	hsr_pair[1] = partner-&gt;index;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hsr_pair); i++) {</div><div class='add'>+		user = dsa_to_port(ds, hsr_pair[i])-&gt;user;</div><div class='add'>+		user-&gt;features |= XRS7000X_SUPPORTED_HSR_FEATURES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_hsr_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct net_device *hsr)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *partner = NULL, *dp;</div><div class='add'>+	struct xrs700x *priv = ds-&gt;priv;</div><div class='add'>+	struct net_device *user;</div><div class='add'>+	int i, hsr_pair[2];</div><div class='add'>+	unsigned int val;</div><div class='add'>+</div><div class='add'>+	dsa_hsr_foreach_port(dp, ds, hsr) {</div><div class='add'>+		if (dp-&gt;index != port) {</div><div class='add'>+			partner = dp;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!partner)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, partner-&gt;index,</div><div class='add'>+			    XRS_PORT_DISABLED);</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, port, XRS_PORT_DISABLED);</div><div class='add'>+</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_HSR_CFG(partner-&gt;index), 0);</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_HSR_CFG(port), 0);</div><div class='add'>+</div><div class='add'>+	/* Clear bit for the CPU port to enable forwarding. */</div><div class='add'>+	val = GENMASK(ds-&gt;num_ports - 1, 0);</div><div class='add'>+	val &amp;= ~BIT(dsa_upstream_port(ds, port));</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(partner-&gt;index), val);</div><div class='add'>+	regmap_write(priv-&gt;regmap, XRS_PORT_FWD_MASK(port), val);</div><div class='add'>+</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, partner-&gt;index,</div><div class='add'>+			    XRS_PORT_FORWARDING);</div><div class='add'>+	regmap_fields_write(priv-&gt;ps_forward, port, XRS_PORT_FORWARDING);</div><div class='add'>+</div><div class='add'>+	/* Disable inbound policy added by xrs700x_port_add_hsrsup_ipf()</div><div class='add'>+	 * which allows HSR/PRP supervision forwarding to the CPU port without</div><div class='add'>+	 * discarding duplicates.</div><div class='add'>+	 */</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap,</div><div class='add'>+			   XRS_ETH_ADDR_CFG(partner-&gt;index, 1), 1, 0);</div><div class='add'>+	regmap_update_bits(priv-&gt;regmap, XRS_ETH_ADDR_CFG(port, 1), 1, 0);</div><div class='add'>+</div><div class='add'>+	hsr_pair[0] = port;</div><div class='add'>+	hsr_pair[1] = partner-&gt;index;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(hsr_pair); i++) {</div><div class='add'>+		user = dsa_to_port(ds, hsr_pair[i])-&gt;user;</div><div class='add'>+		user-&gt;features &amp;= ~XRS7000X_SUPPORTED_HSR_FEATURES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops xrs700x_phylink_mac_ops = {</div><div class='add'>+	.mac_config		= xrs700x_mac_config,</div><div class='add'>+	.mac_link_down		= xrs700x_mac_link_down,</div><div class='add'>+	.mac_link_up		= xrs700x_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops xrs700x_ops = {</div><div class='add'>+	.get_tag_protocol	= xrs700x_get_tag_protocol,</div><div class='add'>+	.setup			= xrs700x_setup,</div><div class='add'>+	.teardown		= xrs700x_teardown,</div><div class='add'>+	.port_stp_state_set	= xrs700x_port_stp_state_set,</div><div class='add'>+	.phylink_get_caps	= xrs700x_phylink_get_caps,</div><div class='add'>+	.get_strings		= xrs700x_get_strings,</div><div class='add'>+	.get_sset_count		= xrs700x_get_sset_count,</div><div class='add'>+	.get_ethtool_stats	= xrs700x_get_ethtool_stats,</div><div class='add'>+	.get_stats64		= xrs700x_get_stats64,</div><div class='add'>+	.port_bridge_join	= xrs700x_bridge_join,</div><div class='add'>+	.port_bridge_leave	= xrs700x_bridge_leave,</div><div class='add'>+	.port_hsr_join		= xrs700x_hsr_join,</div><div class='add'>+	.port_hsr_leave		= xrs700x_hsr_leave,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xrs700x_detect(struct xrs700x *priv)</div><div class='add'>+{</div><div class='add'>+	const struct xrs700x_info *info;</div><div class='add'>+	unsigned int id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read(priv-&gt;regmap, XRS_DEV_ID0, &amp;id);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(priv-&gt;dev, "error %d while reading switch id.\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info = of_device_get_match_data(priv-&gt;dev);</div><div class='add'>+	if (!info)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;id == id) {</div><div class='add'>+		priv-&gt;ds-&gt;num_ports = info-&gt;num_ports;</div><div class='add'>+		dev_info(priv-&gt;dev, "%s detected.\n", info-&gt;name);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_err(priv-&gt;dev, "expected switch id 0x%x but found 0x%x.\n",</div><div class='add'>+		info-&gt;id, id);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct xrs700x *xrs700x_switch_alloc(struct device *base, void *devpriv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct xrs700x *priv;</div><div class='add'>+</div><div class='add'>+	ds = devm_kzalloc(base, sizeof(*ds), GFP_KERNEL);</div><div class='add'>+	if (!ds)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ds-&gt;dev = base;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(base, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;priv-&gt;mib_work, xrs700x_mib_work);</div><div class='add'>+</div><div class='add'>+	ds-&gt;ops = &amp;xrs700x_ops;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;xrs700x_phylink_mac_ops;</div><div class='add'>+	ds-&gt;priv = priv;</div><div class='add'>+	priv-&gt;dev = base;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ds = ds;</div><div class='add'>+	priv-&gt;priv = devpriv;</div><div class='add'>+</div><div class='add'>+	return priv;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xrs700x_switch_alloc);</div><div class='add'>+</div><div class='add'>+static int xrs700x_alloc_port_mib(struct xrs700x *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x_port *p = &amp;priv-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+	p-&gt;mib_data = devm_kcalloc(priv-&gt;dev, ARRAY_SIZE(xrs700x_mibs),</div><div class='add'>+				   sizeof(*p-&gt;mib_data), GFP_KERNEL);</div><div class='add'>+	if (!p-&gt;mib_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;p-&gt;mib_mutex);</div><div class='add'>+	u64_stats_init(&amp;p-&gt;syncp);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xrs700x_switch_register(struct xrs700x *priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	ret = xrs700x_detect(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = xrs700x_setup_regmap_range(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;ports = devm_kcalloc(priv-&gt;dev, priv-&gt;ds-&gt;num_ports,</div><div class='add'>+				   sizeof(*priv-&gt;ports), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;ports)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;ds-&gt;num_ports; i++) {</div><div class='add'>+		ret = xrs700x_alloc_port_mib(priv, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dsa_register_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xrs700x_switch_register);</div><div class='add'>+</div><div class='add'>+void xrs700x_switch_remove(struct xrs700x *priv)</div><div class='add'>+{</div><div class='add'>+	dsa_unregister_switch(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xrs700x_switch_remove);</div><div class='add'>+</div><div class='add'>+void xrs700x_switch_shutdown(struct xrs700x *priv)</div><div class='add'>+{</div><div class='add'>+	dsa_switch_shutdown(priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(xrs700x_switch_shutdown);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("George McCollister &lt;george.mccollister@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Arrow SpeedChips XRS700x DSA driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/xrs700x.h b/drivers/net/dsa/xrs700x/xrs700x.h<br/>new file mode 100644<br/>index 000000000000..4d58257471d2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/xrs700x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/xrs700x.h</a></div><div class='hunk'>@@ -0,0 +1,43 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#include &lt;linux/device.h&gt;</div><div class='add'>+#include &lt;linux/mutex.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/u64_stats_sync.h&gt;</div><div class='add'>+#include &lt;uapi/linux/if_link.h&gt;</div><div class='add'>+</div><div class='add'>+struct xrs700x_info {</div><div class='add'>+	unsigned int id;</div><div class='add'>+	const char *name;</div><div class='add'>+	size_t num_ports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct xrs700x_info xrs7003e_info;</div><div class='add'>+extern const struct xrs700x_info xrs7003f_info;</div><div class='add'>+extern const struct xrs700x_info xrs7004e_info;</div><div class='add'>+extern const struct xrs700x_info xrs7004f_info;</div><div class='add'>+</div><div class='add'>+struct xrs700x_port {</div><div class='add'>+	struct mutex mib_mutex; /* protects mib_data */</div><div class='add'>+	u64 *mib_data;</div><div class='add'>+	struct rtnl_link_stats64 stats64;</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xrs700x {</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	void *priv;</div><div class='add'>+	struct regmap *regmap;</div><div class='add'>+	struct regmap_field *ps_forward;</div><div class='add'>+	struct regmap_field *ps_management;</div><div class='add'>+	struct regmap_field *ps_sel_speed;</div><div class='add'>+	struct regmap_field *ps_cur_speed;</div><div class='add'>+	struct delayed_work mib_work;</div><div class='add'>+	struct xrs700x_port *ports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct xrs700x *xrs700x_switch_alloc(struct device *base, void *devpriv);</div><div class='add'>+int xrs700x_switch_register(struct xrs700x *priv);</div><div class='add'>+void xrs700x_switch_remove(struct xrs700x *priv);</div><div class='add'>+void xrs700x_switch_shutdown(struct xrs700x *priv);</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/xrs700x_i2c.c b/drivers/net/dsa/xrs700x/xrs700x_i2c.c<br/>new file mode 100644<br/>index 000000000000..9b731dea78c1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/xrs700x_i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/xrs700x_i2c.c</a></div><div class='hunk'>@@ -0,0 +1,160 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 NovaTech LLC</div><div class='add'>+ * George McCollister &lt;george.mccollister@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/i2c.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include "xrs700x.h"</div><div class='add'>+#include "xrs700x_reg.h"</div><div class='add'>+</div><div class='add'>+struct xrs700x_i2c_cmd {</div><div class='add'>+	__be32 reg;</div><div class='add'>+	__be16 val;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+static int xrs700x_i2c_reg_read(void *context, unsigned int reg,</div><div class='add'>+				unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = context;</div><div class='add'>+	struct i2c_client *i2c = to_i2c_client(dev);</div><div class='add'>+	struct xrs700x_i2c_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd.reg = cpu_to_be32(reg | 1);</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(i2c, (char *)&amp;cmd.reg, sizeof(cmd.reg));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs i2c_master_send returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_recv(i2c, (char *)&amp;cmd.val, sizeof(cmd.val));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs i2c_master_recv returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = be16_to_cpu(cmd.val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_i2c_reg_write(void *context, unsigned int reg,</div><div class='add'>+				 unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = context;</div><div class='add'>+	struct i2c_client *i2c = to_i2c_client(dev);</div><div class='add'>+	struct xrs700x_i2c_cmd cmd;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cmd.reg = cpu_to_be32(reg);</div><div class='add'>+	cmd.val = cpu_to_be16(val);</div><div class='add'>+</div><div class='add'>+	ret = i2c_master_send(i2c, (char *)&amp;cmd, sizeof(cmd));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs i2c_master_send returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_config xrs700x_i2c_regmap_config = {</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+	.reg_stride = 2,</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.pad_bits = 0,</div><div class='add'>+	.write_flag_mask = 0,</div><div class='add'>+	.read_flag_mask = 0,</div><div class='add'>+	.reg_read = xrs700x_i2c_reg_read,</div><div class='add'>+	.reg_write = xrs700x_i2c_reg_write,</div><div class='add'>+	.max_register = 0,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.reg_format_endian = REGMAP_ENDIAN_BIG,</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_BIG</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xrs700x_i2c_probe(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = xrs700x_switch_alloc(&amp;i2c-&gt;dev, i2c);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init(&amp;i2c-&gt;dev, NULL, &amp;i2c-&gt;dev,</div><div class='add'>+					&amp;xrs700x_i2c_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;regmap);</div><div class='add'>+		dev_err(&amp;i2c-&gt;dev, "Failed to initialize regmap: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(i2c, priv);</div><div class='add'>+</div><div class='add'>+	ret = xrs700x_switch_register(priv);</div><div class='add'>+</div><div class='add'>+	/* Main DSA driver may not be started yet. */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_i2c_remove(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xrs700x_switch_remove(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_i2c_shutdown(struct i2c_client *i2c)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = i2c_get_clientdata(i2c);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xrs700x_switch_shutdown(priv);</div><div class='add'>+</div><div class='add'>+	i2c_set_clientdata(i2c, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct i2c_device_id xrs700x_i2c_id[] = {</div><div class='add'>+	{ "xrs700x-switch" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+MODULE_DEVICE_TABLE(i2c, xrs700x_i2c_id);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id __maybe_unused xrs700x_i2c_dt_ids[] = {</div><div class='add'>+	{ .compatible = "arrow,xrs7003e", .data = &amp;xrs7003e_info },</div><div class='add'>+	{ .compatible = "arrow,xrs7003f", .data = &amp;xrs7003f_info },</div><div class='add'>+	{ .compatible = "arrow,xrs7004e", .data = &amp;xrs7004e_info },</div><div class='add'>+	{ .compatible = "arrow,xrs7004f", .data = &amp;xrs7004f_info },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, xrs700x_i2c_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct i2c_driver xrs700x_i2c_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "xrs700x-i2c",</div><div class='add'>+		.of_match_table = of_match_ptr(xrs700x_i2c_dt_ids),</div><div class='add'>+	},</div><div class='add'>+	.probe = xrs700x_i2c_probe,</div><div class='add'>+	.remove	= xrs700x_i2c_remove,</div><div class='add'>+	.shutdown = xrs700x_i2c_shutdown,</div><div class='add'>+	.id_table = xrs700x_i2c_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_i2c_driver(xrs700x_i2c_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("George McCollister &lt;george.mccollister@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Arrow SpeedChips XRS700x DSA I2C driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/xrs700x_mdio.c b/drivers/net/dsa/xrs700x/xrs700x_mdio.c<br/>new file mode 100644<br/>index 000000000000..5f7d344b5d73<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/xrs700x_mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/xrs700x_mdio.c</a></div><div class='hunk'>@@ -0,0 +1,180 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2020 NovaTech LLC</div><div class='add'>+ * George McCollister &lt;george.mccollister@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include "xrs700x.h"</div><div class='add'>+#include "xrs700x_reg.h"</div><div class='add'>+</div><div class='add'>+#define XRS_MDIO_IBA0	0x10</div><div class='add'>+#define XRS_MDIO_IBA1	0x11</div><div class='add'>+#define XRS_MDIO_IBD	0x14</div><div class='add'>+</div><div class='add'>+#define XRS_IB_READ	0x0</div><div class='add'>+#define XRS_IB_WRITE	0x1</div><div class='add'>+</div><div class='add'>+static int xrs700x_mdio_reg_read(void *context, unsigned int reg,</div><div class='add'>+				 unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	struct mdio_device *mdiodev = context;</div><div class='add'>+	struct device *dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	u16 uval;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	uval = (u16)FIELD_GET(GENMASK(31, 16), reg);</div><div class='add'>+</div><div class='add'>+	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA1, uval);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uval = (u16)((reg &amp; GENMASK(15, 1)) | XRS_IB_READ);</div><div class='add'>+</div><div class='add'>+	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA0, uval);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = mdiodev_read(mdiodev, XRS_MDIO_IBD);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs mdiobus_read returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = (unsigned int)ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xrs700x_mdio_reg_write(void *context, unsigned int reg,</div><div class='add'>+				  unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct mdio_device *mdiodev = context;</div><div class='add'>+	struct device *dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	u16 uval;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = mdiodev_write(mdiodev, XRS_MDIO_IBD, (u16)val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uval = (u16)FIELD_GET(GENMASK(31, 16), reg);</div><div class='add'>+</div><div class='add'>+	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA1, uval);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	uval = (u16)((reg &amp; GENMASK(15, 1)) | XRS_IB_WRITE);</div><div class='add'>+</div><div class='add'>+	ret = mdiodev_write(mdiodev, XRS_MDIO_IBA0, uval);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "xrs mdiobus_write returned %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct regmap_config xrs700x_mdio_regmap_config = {</div><div class='add'>+	.val_bits = 16,</div><div class='add'>+	.reg_stride = 2,</div><div class='add'>+	.reg_bits = 32,</div><div class='add'>+	.pad_bits = 0,</div><div class='add'>+	.write_flag_mask = 0,</div><div class='add'>+	.read_flag_mask = 0,</div><div class='add'>+	.reg_read = xrs700x_mdio_reg_read,</div><div class='add'>+	.reg_write = xrs700x_mdio_reg_write,</div><div class='add'>+	.max_register = XRS_VLAN(VLAN_N_VID - 1),</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.reg_format_endian = REGMAP_ENDIAN_BIG,</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_BIG</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int xrs700x_mdio_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = xrs700x_switch_alloc(&amp;mdiodev-&gt;dev, mdiodev);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;regmap = devm_regmap_init(&amp;mdiodev-&gt;dev, NULL, mdiodev,</div><div class='add'>+					&amp;xrs700x_mdio_regmap_config);</div><div class='add'>+	if (IS_ERR(priv-&gt;regmap)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;regmap);</div><div class='add'>+		dev_err(&amp;mdiodev-&gt;dev, "Failed to initialize regmap: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, priv);</div><div class='add'>+</div><div class='add'>+	ret = xrs700x_switch_register(priv);</div><div class='add'>+</div><div class='add'>+	/* Main DSA driver may not be started yet. */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_mdio_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xrs700x_switch_remove(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xrs700x_mdio_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct xrs700x *priv = dev_get_drvdata(&amp;mdiodev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	xrs700x_switch_shutdown(priv);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;mdiodev-&gt;dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id __maybe_unused xrs700x_mdio_dt_ids[] = {</div><div class='add'>+	{ .compatible = "arrow,xrs7003e", .data = &amp;xrs7003e_info },</div><div class='add'>+	{ .compatible = "arrow,xrs7003f", .data = &amp;xrs7003f_info },</div><div class='add'>+	{ .compatible = "arrow,xrs7004e", .data = &amp;xrs7004e_info },</div><div class='add'>+	{ .compatible = "arrow,xrs7004f", .data = &amp;xrs7004f_info },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, xrs700x_mdio_dt_ids);</div><div class='add'>+</div><div class='add'>+static struct mdio_driver xrs700x_mdio_driver = {</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name	= "xrs700x-mdio",</div><div class='add'>+		.of_match_table = of_match_ptr(xrs700x_mdio_dt_ids),</div><div class='add'>+	},</div><div class='add'>+	.probe	= xrs700x_mdio_probe,</div><div class='add'>+	.remove	= xrs700x_mdio_remove,</div><div class='add'>+	.shutdown = xrs700x_mdio_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(xrs700x_mdio_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("George McCollister &lt;george.mccollister@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Arrow SpeedChips XRS700x DSA MDIO driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/dsa/xrs700x/xrs700x_reg.h b/drivers/net/dsa/xrs700x/xrs700x_reg.h<br/>new file mode 100644<br/>index 000000000000..470d00e07f15<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/xrs700x/xrs700x_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/xrs700x/xrs700x_reg.h</a></div><div class='hunk'>@@ -0,0 +1,208 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+</div><div class='add'>+/* Register Base Addresses */</div><div class='add'>+#define XRS_DEVICE_ID_BASE		0x0</div><div class='add'>+#define XRS_GPIO_BASE			0x10000</div><div class='add'>+#define XRS_PORT_OFFSET			0x10000</div><div class='add'>+#define XRS_PORT_BASE(x)		(0x200000 + XRS_PORT_OFFSET * (x))</div><div class='add'>+#define XRS_RTC_BASE			0x280000</div><div class='add'>+#define XRS_TS_OFFSET			0x8000</div><div class='add'>+#define XRS_TS_BASE(x)			(0x290000 + XRS_TS_OFFSET * (x))</div><div class='add'>+#define XRS_SWITCH_CONF_BASE		0x300000</div><div class='add'>+</div><div class='add'>+/* Device Identification Registers */</div><div class='add'>+#define XRS_DEV_ID0			(XRS_DEVICE_ID_BASE + 0)</div><div class='add'>+#define XRS_DEV_ID1			(XRS_DEVICE_ID_BASE + 2)</div><div class='add'>+#define XRS_INT_ID0			(XRS_DEVICE_ID_BASE + 4)</div><div class='add'>+#define XRS_INT_ID1			(XRS_DEVICE_ID_BASE + 6)</div><div class='add'>+#define XRS_REV_ID			(XRS_DEVICE_ID_BASE + 8)</div><div class='add'>+</div><div class='add'>+/* GPIO Registers */</div><div class='add'>+#define XRS_CONFIG0			(XRS_GPIO_BASE + 0x1000)</div><div class='add'>+#define XRS_INPUT_STATUS0		(XRS_GPIO_BASE + 0x1002)</div><div class='add'>+#define XRS_CONFIG1			(XRS_GPIO_BASE + 0x1004)</div><div class='add'>+#define XRS_INPUT_STATUS1		(XRS_GPIO_BASE + 0x1006)</div><div class='add'>+#define XRS_CONFIG2			(XRS_GPIO_BASE + 0x1008)</div><div class='add'>+#define XRS_INPUT_STATUS2		(XRS_GPIO_BASE + 0x100a)</div><div class='add'>+</div><div class='add'>+/* Port Configuration Registers */</div><div class='add'>+#define XRS_PORT_GEN_BASE(x)		(XRS_PORT_BASE(x) + 0x0)</div><div class='add'>+#define XRS_PORT_HSR_BASE(x)		(XRS_PORT_BASE(x) + 0x2000)</div><div class='add'>+#define XRS_PORT_PTP_BASE(x)		(XRS_PORT_BASE(x) + 0x4000)</div><div class='add'>+#define XRS_PORT_CNT_BASE(x)		(XRS_PORT_BASE(x) + 0x6000)</div><div class='add'>+#define XRS_PORT_IPO_BASE(x)		(XRS_PORT_BASE(x) + 0x8000)</div><div class='add'>+</div><div class='add'>+/* Port Configuration Registers - General and State */</div><div class='add'>+#define XRS_PORT_STATE(x)		(XRS_PORT_GEN_BASE(x) + 0x0)</div><div class='add'>+#define XRS_PORT_FORWARDING		0</div><div class='add'>+#define XRS_PORT_LEARNING		1</div><div class='add'>+#define XRS_PORT_DISABLED		2</div><div class='add'>+#define XRS_PORT_MODE_NORMAL		0</div><div class='add'>+#define XRS_PORT_MODE_MANAGEMENT	1</div><div class='add'>+#define XRS_PORT_SPEED_1000		0x12</div><div class='add'>+#define XRS_PORT_SPEED_100		0x20</div><div class='add'>+#define XRS_PORT_SPEED_10		0x30</div><div class='add'>+#define XRS_PORT_VLAN(x)		(XRS_PORT_GEN_BASE(x) + 0x10)</div><div class='add'>+#define XRS_PORT_VLAN0_MAPPING(x)	(XRS_PORT_GEN_BASE(x) + 0x12)</div><div class='add'>+#define XRS_PORT_FWD_MASK(x)		(XRS_PORT_GEN_BASE(x) + 0x14)</div><div class='add'>+#define XRS_PORT_VLAN_PRIO(x)		(XRS_PORT_GEN_BASE(x) + 0x16)</div><div class='add'>+</div><div class='add'>+/* Port Configuration Registers - HSR/PRP */</div><div class='add'>+#define XRS_HSR_CFG(x)			(XRS_PORT_HSR_BASE(x) + 0x0)</div><div class='add'>+#define XRS_HSR_CFG_HSR_PRP		BIT(0)</div><div class='add'>+#define XRS_HSR_CFG_HSR			0</div><div class='add'>+#define XRS_HSR_CFG_PRP			BIT(8)</div><div class='add'>+#define XRS_HSR_CFG_LANID_A		0</div><div class='add'>+#define XRS_HSR_CFG_LANID_B		BIT(10)</div><div class='add'>+</div><div class='add'>+/* Port Configuration Registers - PTP */</div><div class='add'>+#define XRS_PTP_RX_SYNC_DELAY_NS_LO(x)	(XRS_PORT_PTP_BASE(x) + 0x2)</div><div class='add'>+#define XRS_PTP_RX_SYNC_DELAY_NS_HI(x)	(XRS_PORT_PTP_BASE(x) + 0x4)</div><div class='add'>+#define XRS_PTP_RX_EVENT_DELAY_NS(x)	(XRS_PORT_PTP_BASE(x) + 0xa)</div><div class='add'>+#define XRS_PTP_TX_EVENT_DELAY_NS(x)	(XRS_PORT_PTP_BASE(x) + 0x12)</div><div class='add'>+</div><div class='add'>+/* Port Configuration Registers - Counter */</div><div class='add'>+#define XRS_CNT_CTRL(x)			(XRS_PORT_CNT_BASE(x) + 0x0)</div><div class='add'>+#define XRS_RX_GOOD_OCTETS_L		(XRS_PORT_CNT_BASE(0) + 0x200)</div><div class='add'>+#define XRS_RX_GOOD_OCTETS_H		(XRS_PORT_CNT_BASE(0) + 0x202)</div><div class='add'>+#define XRS_RX_BAD_OCTETS_L		(XRS_PORT_CNT_BASE(0) + 0x204)</div><div class='add'>+#define XRS_RX_BAD_OCTETS_H		(XRS_PORT_CNT_BASE(0) + 0x206)</div><div class='add'>+#define XRS_RX_UNICAST_L		(XRS_PORT_CNT_BASE(0) + 0x208)</div><div class='add'>+#define XRS_RX_UNICAST_H		(XRS_PORT_CNT_BASE(0) + 0x20a)</div><div class='add'>+#define XRS_RX_BROADCAST_L		(XRS_PORT_CNT_BASE(0) + 0x20c)</div><div class='add'>+#define XRS_RX_BROADCAST_H		(XRS_PORT_CNT_BASE(0) + 0x20e)</div><div class='add'>+#define XRS_RX_MULTICAST_L		(XRS_PORT_CNT_BASE(0) + 0x210)</div><div class='add'>+#define XRS_RX_MULTICAST_H		(XRS_PORT_CNT_BASE(0) + 0x212)</div><div class='add'>+#define XRS_RX_UNDERSIZE_L		(XRS_PORT_CNT_BASE(0) + 0x214)</div><div class='add'>+#define XRS_RX_UNDERSIZE_H		(XRS_PORT_CNT_BASE(0) + 0x216)</div><div class='add'>+#define XRS_RX_FRAGMENTS_L		(XRS_PORT_CNT_BASE(0) + 0x218)</div><div class='add'>+#define XRS_RX_FRAGMENTS_H		(XRS_PORT_CNT_BASE(0) + 0x21a)</div><div class='add'>+#define XRS_RX_OVERSIZE_L		(XRS_PORT_CNT_BASE(0) + 0x21c)</div><div class='add'>+#define XRS_RX_OVERSIZE_H		(XRS_PORT_CNT_BASE(0) + 0x21e)</div><div class='add'>+#define XRS_RX_JABBER_L			(XRS_PORT_CNT_BASE(0) + 0x220)</div><div class='add'>+#define XRS_RX_JABBER_H			(XRS_PORT_CNT_BASE(0) + 0x222)</div><div class='add'>+#define XRS_RX_ERR_L			(XRS_PORT_CNT_BASE(0) + 0x224)</div><div class='add'>+#define XRS_RX_ERR_H			(XRS_PORT_CNT_BASE(0) + 0x226)</div><div class='add'>+#define XRS_RX_CRC_L			(XRS_PORT_CNT_BASE(0) + 0x228)</div><div class='add'>+#define XRS_RX_CRC_H			(XRS_PORT_CNT_BASE(0) + 0x22a)</div><div class='add'>+#define XRS_RX_64_L			(XRS_PORT_CNT_BASE(0) + 0x22c)</div><div class='add'>+#define XRS_RX_64_H			(XRS_PORT_CNT_BASE(0) + 0x22e)</div><div class='add'>+#define XRS_RX_65_127_L			(XRS_PORT_CNT_BASE(0) + 0x230)</div><div class='add'>+#define XRS_RX_65_127_H			(XRS_PORT_CNT_BASE(0) + 0x232)</div><div class='add'>+#define XRS_RX_128_255_L		(XRS_PORT_CNT_BASE(0) + 0x234)</div><div class='add'>+#define XRS_RX_128_255_H		(XRS_PORT_CNT_BASE(0) + 0x236)</div><div class='add'>+#define XRS_RX_256_511_L		(XRS_PORT_CNT_BASE(0) + 0x238)</div><div class='add'>+#define XRS_RX_256_511_H		(XRS_PORT_CNT_BASE(0) + 0x23a)</div><div class='add'>+#define XRS_RX_512_1023_L		(XRS_PORT_CNT_BASE(0) + 0x23c)</div><div class='add'>+#define XRS_RX_512_1023_H		(XRS_PORT_CNT_BASE(0) + 0x23e)</div><div class='add'>+#define XRS_RX_1024_1536_L		(XRS_PORT_CNT_BASE(0) + 0x240)</div><div class='add'>+#define XRS_RX_1024_1536_H		(XRS_PORT_CNT_BASE(0) + 0x242)</div><div class='add'>+#define XRS_RX_HSR_PRP_L		(XRS_PORT_CNT_BASE(0) + 0x244)</div><div class='add'>+#define XRS_RX_HSR_PRP_H		(XRS_PORT_CNT_BASE(0) + 0x246)</div><div class='add'>+#define XRS_RX_WRONGLAN_L		(XRS_PORT_CNT_BASE(0) + 0x248)</div><div class='add'>+#define XRS_RX_WRONGLAN_H		(XRS_PORT_CNT_BASE(0) + 0x24a)</div><div class='add'>+#define XRS_RX_DUPLICATE_L		(XRS_PORT_CNT_BASE(0) + 0x24c)</div><div class='add'>+#define XRS_RX_DUPLICATE_H		(XRS_PORT_CNT_BASE(0) + 0x24e)</div><div class='add'>+#define XRS_TX_OCTETS_L			(XRS_PORT_CNT_BASE(0) + 0x280)</div><div class='add'>+#define XRS_TX_OCTETS_H			(XRS_PORT_CNT_BASE(0) + 0x282)</div><div class='add'>+#define XRS_TX_UNICAST_L		(XRS_PORT_CNT_BASE(0) + 0x284)</div><div class='add'>+#define XRS_TX_UNICAST_H		(XRS_PORT_CNT_BASE(0) + 0x286)</div><div class='add'>+#define XRS_TX_BROADCAST_L		(XRS_PORT_CNT_BASE(0) + 0x288)</div><div class='add'>+#define XRS_TX_BROADCAST_H		(XRS_PORT_CNT_BASE(0) + 0x28a)</div><div class='add'>+#define XRS_TX_MULTICAST_L		(XRS_PORT_CNT_BASE(0) + 0x28c)</div><div class='add'>+#define XRS_TX_MULTICAST_H		(XRS_PORT_CNT_BASE(0) + 0x28e)</div><div class='add'>+#define XRS_TX_HSR_PRP_L		(XRS_PORT_CNT_BASE(0) + 0x290)</div><div class='add'>+#define XRS_TX_HSR_PRP_H		(XRS_PORT_CNT_BASE(0) + 0x292)</div><div class='add'>+#define XRS_PRIQ_DROP_L			(XRS_PORT_CNT_BASE(0) + 0x2c0)</div><div class='add'>+#define XRS_PRIQ_DROP_H			(XRS_PORT_CNT_BASE(0) + 0x2c2)</div><div class='add'>+#define XRS_EARLY_DROP_L		(XRS_PORT_CNT_BASE(0) + 0x2c4)</div><div class='add'>+#define XRS_EARLY_DROP_H		(XRS_PORT_CNT_BASE(0) + 0x2c6)</div><div class='add'>+</div><div class='add'>+/* Port Configuration Registers - Inbound Policy 0 - 15 */</div><div class='add'>+#define XRS_ETH_ADDR_CFG(x, p)		(XRS_PORT_IPO_BASE(x) + \</div><div class='add'>+					 (p) * 0x20 + 0x0)</div><div class='add'>+#define XRS_ETH_ADDR_FWD_ALLOW(x, p)	(XRS_PORT_IPO_BASE(x) + \</div><div class='add'>+					 (p) * 0x20 + 0x2)</div><div class='add'>+#define XRS_ETH_ADDR_FWD_MIRROR(x, p)	(XRS_PORT_IPO_BASE(x) + \</div><div class='add'>+					 (p) * 0x20 + 0x4)</div><div class='add'>+#define XRS_ETH_ADDR_0(x, p)		(XRS_PORT_IPO_BASE(x) + \</div><div class='add'>+					 (p) * 0x20 + 0x8)</div><div class='add'>+#define XRS_ETH_ADDR_1(x, p)		(XRS_PORT_IPO_BASE(x) + \</div><div class='add'>+					 (p) * 0x20 + 0xa)</div><div class='add'>+#define XRS_ETH_ADDR_2(x, p)		(XRS_PORT_IPO_BASE(x) + \</div><div class='add'>+					 (p) * 0x20 + 0xc)</div><div class='add'>+</div><div class='add'>+/* RTC Registers */</div><div class='add'>+#define XRS_CUR_NSEC0			(XRS_RTC_BASE + 0x1004)</div><div class='add'>+#define XRS_CUR_NSEC1			(XRS_RTC_BASE + 0x1006)</div><div class='add'>+#define XRS_CUR_SEC0			(XRS_RTC_BASE + 0x1008)</div><div class='add'>+#define XRS_CUR_SEC1			(XRS_RTC_BASE + 0x100a)</div><div class='add'>+#define XRS_CUR_SEC2			(XRS_RTC_BASE + 0x100c)</div><div class='add'>+#define XRS_TIME_CC0			(XRS_RTC_BASE + 0x1010)</div><div class='add'>+#define XRS_TIME_CC1			(XRS_RTC_BASE + 0x1012)</div><div class='add'>+#define XRS_TIME_CC2			(XRS_RTC_BASE + 0x1014)</div><div class='add'>+#define XRS_STEP_SIZE0			(XRS_RTC_BASE + 0x1020)</div><div class='add'>+#define XRS_STEP_SIZE1			(XRS_RTC_BASE + 0x1022)</div><div class='add'>+#define XRS_STEP_SIZE2			(XRS_RTC_BASE + 0x1024)</div><div class='add'>+#define XRS_ADJUST_NSEC0		(XRS_RTC_BASE + 0x1034)</div><div class='add'>+#define XRS_ADJUST_NSEC1		(XRS_RTC_BASE + 0x1036)</div><div class='add'>+#define XRS_ADJUST_SEC0			(XRS_RTC_BASE + 0x1038)</div><div class='add'>+#define XRS_ADJUST_SEC1			(XRS_RTC_BASE + 0x103a)</div><div class='add'>+#define XRS_ADJUST_SEC2			(XRS_RTC_BASE + 0x103c)</div><div class='add'>+#define XRS_TIME_CMD			(XRS_RTC_BASE + 0x1040)</div><div class='add'>+</div><div class='add'>+/* Time Stamper Registers */</div><div class='add'>+#define XRS_TS_CTRL(x)			(XRS_TS_BASE(x) + 0x1000)</div><div class='add'>+#define XRS_TS_INT_MASK(x)		(XRS_TS_BASE(x) + 0x1008)</div><div class='add'>+#define XRS_TS_INT_STATUS(x)		(XRS_TS_BASE(x) + 0x1010)</div><div class='add'>+#define XRS_TS_NSEC0(x)			(XRS_TS_BASE(x) + 0x1104)</div><div class='add'>+#define XRS_TS_NSEC1(x)			(XRS_TS_BASE(x) + 0x1106)</div><div class='add'>+#define XRS_TS_SEC0(x)			(XRS_TS_BASE(x) + 0x1108)</div><div class='add'>+#define XRS_TS_SEC1(x)			(XRS_TS_BASE(x) + 0x110a)</div><div class='add'>+#define XRS_TS_SEC2(x)			(XRS_TS_BASE(x) + 0x110c)</div><div class='add'>+#define XRS_PNCT0(x)			(XRS_TS_BASE(x) + 0x1110)</div><div class='add'>+#define XRS_PNCT1(x)			(XRS_TS_BASE(x) + 0x1112)</div><div class='add'>+</div><div class='add'>+/* Switch Configuration Registers */</div><div class='add'>+#define XRS_SWITCH_GEN_BASE		(XRS_SWITCH_CONF_BASE + 0x0)</div><div class='add'>+#define XRS_SWITCH_TS_BASE		(XRS_SWITCH_CONF_BASE + 0x2000)</div><div class='add'>+#define XRS_SWITCH_VLAN_BASE		(XRS_SWITCH_CONF_BASE + 0x4000)</div><div class='add'>+</div><div class='add'>+/* Switch Configuration Registers - General */</div><div class='add'>+#define XRS_GENERAL			(XRS_SWITCH_GEN_BASE + 0x10)</div><div class='add'>+#define XRS_GENERAL_TIME_TRAILER	BIT(9)</div><div class='add'>+#define XRS_GENERAL_MOD_SYNC		BIT(10)</div><div class='add'>+#define XRS_GENERAL_CUT_THRU		BIT(13)</div><div class='add'>+#define XRS_GENERAL_CLR_MAC_TBL		BIT(14)</div><div class='add'>+#define XRS_GENERAL_RESET		BIT(15)</div><div class='add'>+#define XRS_MT_CLEAR_MASK		(XRS_SWITCH_GEN_BASE + 0x12)</div><div class='add'>+#define XRS_ADDRESS_AGING		(XRS_SWITCH_GEN_BASE + 0x20)</div><div class='add'>+#define XRS_TS_CTRL_TX			(XRS_SWITCH_GEN_BASE + 0x28)</div><div class='add'>+#define XRS_TS_CTRL_RX			(XRS_SWITCH_GEN_BASE + 0x2a)</div><div class='add'>+#define XRS_INT_MASK			(XRS_SWITCH_GEN_BASE + 0x2c)</div><div class='add'>+#define XRS_INT_STATUS			(XRS_SWITCH_GEN_BASE + 0x2e)</div><div class='add'>+#define XRS_MAC_TABLE0			(XRS_SWITCH_GEN_BASE + 0x200)</div><div class='add'>+#define XRS_MAC_TABLE1			(XRS_SWITCH_GEN_BASE + 0x202)</div><div class='add'>+#define XRS_MAC_TABLE2			(XRS_SWITCH_GEN_BASE + 0x204)</div><div class='add'>+#define XRS_MAC_TABLE3			(XRS_SWITCH_GEN_BASE + 0x206)</div><div class='add'>+</div><div class='add'>+/* Switch Configuration Registers - Frame Timestamp */</div><div class='add'>+#define XRS_TX_TS_NS_LO(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + 0x0)</div><div class='add'>+#define XRS_TX_TS_NS_HI(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + 0x2)</div><div class='add'>+#define XRS_TX_TS_S_LO(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + 0x4)</div><div class='add'>+#define XRS_TX_TS_S_HI(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + 0x6)</div><div class='add'>+#define XRS_TX_TS_HDR(t, h)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + \</div><div class='add'>+					 0x2 * (h) + 0xe)</div><div class='add'>+#define XRS_RX_TS_NS_LO(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + \</div><div class='add'>+					 0x200)</div><div class='add'>+#define XRS_RX_TS_NS_HI(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + \</div><div class='add'>+					 0x202)</div><div class='add'>+#define XRS_RX_TS_S_LO(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + \</div><div class='add'>+					 0x204)</div><div class='add'>+#define XRS_RX_TS_S_HI(t)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + \</div><div class='add'>+					 0x206)</div><div class='add'>+#define XRS_RX_TS_HDR(t, h)		(XRS_SWITCH_TS_BASE + 0x80 * (t) + \</div><div class='add'>+					 0x2 * (h) + 0xe)</div><div class='add'>+</div><div class='add'>+/* Switch Configuration Registers - VLAN */</div><div class='add'>+#define XRS_VLAN(v)			(XRS_SWITCH_VLAN_BASE + 0x2 * (v))</div><div class='head'>diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c<br/>new file mode 100644<br/>index 000000000000..1c511f5dc6ab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/yt921x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/yt921x.c</a></div><div class='hunk'>@@ -0,0 +1,3006 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Driver for Motorcomm YT921x Switch</div><div class='add'>+ *</div><div class='add'>+ * Should work on YT9213/YT9214/YT9215/YT9218, but only tested on YT9215+SGMII,</div><div class='add'>+ * be sure to do your own checks before porting to another chip.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2025 David Yang</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/if_hsr.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#include "yt921x.h"</div><div class='add'>+</div><div class='add'>+struct yt921x_mib_desc {</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	const char *name;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MIB_DESC(_size, _offset, _name) \</div><div class='add'>+	{_size, _offset, _name}</div><div class='add'>+</div><div class='add'>+/* Must agree with yt921x_mib</div><div class='add'>+ *</div><div class='add'>+ * Unstructured fields (name != NULL) will appear in get_ethtool_stats(),</div><div class='add'>+ * structured go to their *_stats() methods, but we need their sizes and offsets</div><div class='add'>+ * to perform 32bit MIB overflow wraparound.</div><div class='add'>+ */</div><div class='add'>+static const struct yt921x_mib_desc yt921x_mib_descs[] = {</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_BROADCAST, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PAUSE, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_MULTICAST, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_CRC_ERR, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_ALIGN_ERR, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_UNDERSIZE_ERR, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_FRAG_ERR, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_64, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_65_TO_127, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_128_TO_255, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_256_TO_511, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_512_TO_1023, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_1024_TO_1518, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_PKT_SZ_1519_TO_MAX, NULL),</div><div class='add'>+	MIB_DESC(2, YT921X_MIB_DATA_RX_GOOD_BYTES, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(2, YT921X_MIB_DATA_RX_BAD_BYTES, "RxBadBytes"),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_OVERSIZE_ERR, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_DROPPED, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_BROADCAST, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PAUSE, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_MULTICAST, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_UNDERSIZE_ERR, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_64, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_65_TO_127, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_128_TO_255, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_256_TO_511, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_512_TO_1023, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_1024_TO_1518, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT_SZ_1519_TO_MAX, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(2, YT921X_MIB_DATA_TX_GOOD_BYTES, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_COLLISION, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_EXCESSIVE_COLLISION, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_MULTIPLE_COLLISION, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_SINGLE_COLLISION, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_PKT, NULL),</div><div class='add'>+</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_DEFERRED, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_LATE_COLLISION, NULL),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_RX_OAM, "RxOAM"),</div><div class='add'>+	MIB_DESC(1, YT921X_MIB_DATA_TX_OAM, "TxOAM"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct yt921x_info {</div><div class='add'>+	const char *name;</div><div class='add'>+	u16 major;</div><div class='add'>+	/* Unknown, seems to be plain enumeration */</div><div class='add'>+	u8 mode;</div><div class='add'>+	u8 extmode;</div><div class='add'>+	/* Ports with integral GbE PHYs, not including MCU Port 10 */</div><div class='add'>+	u16 internal_mask;</div><div class='add'>+	/* TODO: see comments in yt921x_dsa_phylink_get_caps() */</div><div class='add'>+	u16 external_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define YT921X_PORT_MASK_INTn(port)	BIT(port)</div><div class='add'>+#define YT921X_PORT_MASK_INT0_n(n)	GENMASK((n) - 1, 0)</div><div class='add'>+#define YT921X_PORT_MASK_EXT0		BIT(8)</div><div class='add'>+#define YT921X_PORT_MASK_EXT1		BIT(9)</div><div class='add'>+</div><div class='add'>+static const struct yt921x_info yt921x_infos[] = {</div><div class='add'>+	{</div><div class='add'>+		"YT9215SC", YT9215_MAJOR, 1, 0,</div><div class='add'>+		YT921X_PORT_MASK_INT0_n(5),</div><div class='add'>+		YT921X_PORT_MASK_EXT0 | YT921X_PORT_MASK_EXT1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		"YT9215S", YT9215_MAJOR, 2, 0,</div><div class='add'>+		YT921X_PORT_MASK_INT0_n(5),</div><div class='add'>+		YT921X_PORT_MASK_EXT0 | YT921X_PORT_MASK_EXT1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		"YT9215RB", YT9215_MAJOR, 3, 0,</div><div class='add'>+		YT921X_PORT_MASK_INT0_n(5),</div><div class='add'>+		YT921X_PORT_MASK_EXT0 | YT921X_PORT_MASK_EXT1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		"YT9214NB", YT9215_MAJOR, 3, 2,</div><div class='add'>+		YT921X_PORT_MASK_INTn(1) | YT921X_PORT_MASK_INTn(3),</div><div class='add'>+		YT921X_PORT_MASK_EXT0 | YT921X_PORT_MASK_EXT1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		"YT9213NB", YT9215_MAJOR, 3, 3,</div><div class='add'>+		YT921X_PORT_MASK_INTn(1) | YT921X_PORT_MASK_INTn(3),</div><div class='add'>+		YT921X_PORT_MASK_EXT1,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		"YT9218N", YT9218_MAJOR, 0, 0,</div><div class='add'>+		YT921X_PORT_MASK_INT0_n(8),</div><div class='add'>+		0,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		"YT9218MB", YT9218_MAJOR, 1, 0,</div><div class='add'>+		YT921X_PORT_MASK_INT0_n(8),</div><div class='add'>+		YT921X_PORT_MASK_EXT0 | YT921X_PORT_MASK_EXT1,</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define YT921X_NAME	"yt921x"</div><div class='add'>+</div><div class='add'>+#define YT921X_VID_UNWARE	4095</div><div class='add'>+</div><div class='add'>+#define YT921X_POLL_SLEEP_US	10000</div><div class='add'>+#define YT921X_POLL_TIMEOUT_US	100000</div><div class='add'>+</div><div class='add'>+/* The interval should be small enough to avoid overflow of 32bit MIBs.</div><div class='add'>+ *</div><div class='add'>+ * Until we can read MIBs from stats64 call directly (i.e. sleep</div><div class='add'>+ * there), we have to poll stats more frequently then it is actually needed.</div><div class='add'>+ * For overflow protection, normally, 100 sec interval should have been OK.</div><div class='add'>+ */</div><div class='add'>+#define YT921X_STATS_INTERVAL_JIFFIES	(3 * HZ)</div><div class='add'>+</div><div class='add'>+struct yt921x_reg_mdio {</div><div class='add'>+	struct mii_bus *bus;</div><div class='add'>+	int addr;</div><div class='add'>+	/* SWITCH_ID_1 / SWITCH_ID_0 of the device</div><div class='add'>+	 *</div><div class='add'>+	 * This is a way to multiplex multiple devices on the same MII phyaddr</div><div class='add'>+	 * and should be configurable in DT. However, MDIO core simply doesn't</div><div class='add'>+	 * allow multiple devices over one reg addr, so this is a fixed value</div><div class='add'>+	 * for now until a solution is found.</div><div class='add'>+	 *</div><div class='add'>+	 * Keep this because we need switchid to form MII regaddrs anyway.</div><div class='add'>+	 */</div><div class='add'>+	unsigned char switchid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TODO: SPI/I2C */</div><div class='add'>+</div><div class='add'>+#define to_yt921x_priv(_ds) container_of_const(_ds, struct yt921x_priv, ds)</div><div class='add'>+#define to_device(priv) ((priv)-&gt;ds.dev)</div><div class='add'>+</div><div class='add'>+static int yt921x_reg_read(struct yt921x_priv *priv, u32 reg, u32 *valp)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!mutex_is_locked(&amp;priv-&gt;reg_lock));</div><div class='add'>+</div><div class='add'>+	return priv-&gt;reg_ops-&gt;read(priv-&gt;reg_ctx, reg, valp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg_write(struct yt921x_priv *priv, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(!mutex_is_locked(&amp;priv-&gt;reg_lock));</div><div class='add'>+</div><div class='add'>+	return priv-&gt;reg_ops-&gt;write(priv-&gt;reg_ctx, reg, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_reg_wait(struct yt921x_priv *priv, u32 reg, u32 mask, u32 *valp)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(yt921x_reg_read, res,</div><div class='add'>+				res || (val &amp; mask) == *valp,</div><div class='add'>+				YT921X_POLL_SLEEP_US, YT921X_POLL_TIMEOUT_US,</div><div class='add'>+				false, priv, reg, &amp;val);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	*valp = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_reg_update_bits(struct yt921x_priv *priv, u32 reg, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+	u32 v;</div><div class='add'>+	u32 u;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, reg, &amp;v);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	u = v;</div><div class='add'>+	u &amp;= ~mask;</div><div class='add'>+	u |= val;</div><div class='add'>+	if (u == v)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return yt921x_reg_write(priv, reg, u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg_set_bits(struct yt921x_priv *priv, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	return yt921x_reg_update_bits(priv, reg, 0, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg_clear_bits(struct yt921x_priv *priv, u32 reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	return yt921x_reg_update_bits(priv, reg, mask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_reg_toggle_bits(struct yt921x_priv *priv, u32 reg, u32 mask, bool set)</div><div class='add'>+{</div><div class='add'>+	return yt921x_reg_update_bits(priv, reg, mask, !set ? 0 : mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Some registers, like VLANn_CTRL, should always be written in 64-bit, even if</div><div class='add'>+ * you are to write only the lower / upper 32 bits.</div><div class='add'>+ *</div><div class='add'>+ * There is no such restriction for reading, but we still provide 64-bit read</div><div class='add'>+ * wrappers so that we always handle u64 values.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int yt921x_reg64_read(struct yt921x_priv *priv, u32 reg, u64 *valp)</div><div class='add'>+{</div><div class='add'>+	u32 lo;</div><div class='add'>+	u32 hi;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, reg, &amp;lo);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_read(priv, reg + 4, &amp;hi);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	*valp = ((u64)hi &lt;&lt; 32) | lo;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg64_write(struct yt921x_priv *priv, u32 reg, u64 val)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_write(priv, reg, (u32)val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	return yt921x_reg_write(priv, reg + 4, (u32)(val &gt;&gt; 32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_reg64_update_bits(struct yt921x_priv *priv, u32 reg, u64 mask, u64 val)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+	u64 v;</div><div class='add'>+	u64 u;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg64_read(priv, reg, &amp;v);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	u = v;</div><div class='add'>+	u &amp;= ~mask;</div><div class='add'>+	u |= val;</div><div class='add'>+	if (u == v)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return yt921x_reg64_write(priv, reg, u);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg64_clear_bits(struct yt921x_priv *priv, u32 reg, u64 mask)</div><div class='add'>+{</div><div class='add'>+	return yt921x_reg64_update_bits(priv, reg, mask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg_mdio_read(void *context, u32 reg, u32 *valp)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_reg_mdio *mdio = context;</div><div class='add'>+	struct mii_bus *bus = mdio-&gt;bus;</div><div class='add'>+	int addr = mdio-&gt;addr;</div><div class='add'>+	u32 reg_addr;</div><div class='add'>+	u32 reg_data;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Hold the mdio bus lock to avoid (un)locking for 4 times */</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	reg_addr = YT921X_SMI_SWITCHID(mdio-&gt;switchid) | YT921X_SMI_ADDR |</div><div class='add'>+		   YT921X_SMI_READ;</div><div class='add'>+	res = __mdiobus_write(bus, addr, reg_addr, (u16)(reg &gt;&gt; 16));</div><div class='add'>+	if (res)</div><div class='add'>+		goto end;</div><div class='add'>+	res = __mdiobus_write(bus, addr, reg_addr, (u16)reg);</div><div class='add'>+	if (res)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	reg_data = YT921X_SMI_SWITCHID(mdio-&gt;switchid) | YT921X_SMI_DATA |</div><div class='add'>+		   YT921X_SMI_READ;</div><div class='add'>+	res = __mdiobus_read(bus, addr, reg_data);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	val = (u16)res;</div><div class='add'>+	res = __mdiobus_read(bus, addr, reg_data);</div><div class='add'>+	if (res &lt; 0)</div><div class='add'>+		goto end;</div><div class='add'>+	val = (val &lt;&lt; 16) | (u16)res;</div><div class='add'>+</div><div class='add'>+	*valp = val;</div><div class='add'>+	res = 0;</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_reg_mdio_write(void *context, u32 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_reg_mdio *mdio = context;</div><div class='add'>+	struct mii_bus *bus = mdio-&gt;bus;</div><div class='add'>+	int addr = mdio-&gt;addr;</div><div class='add'>+	u32 reg_addr;</div><div class='add'>+	u32 reg_data;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock_nested(&amp;bus-&gt;mdio_lock, MDIO_MUTEX_NESTED);</div><div class='add'>+</div><div class='add'>+	reg_addr = YT921X_SMI_SWITCHID(mdio-&gt;switchid) | YT921X_SMI_ADDR |</div><div class='add'>+		   YT921X_SMI_WRITE;</div><div class='add'>+	res = __mdiobus_write(bus, addr, reg_addr, (u16)(reg &gt;&gt; 16));</div><div class='add'>+	if (res)</div><div class='add'>+		goto end;</div><div class='add'>+	res = __mdiobus_write(bus, addr, reg_addr, (u16)reg);</div><div class='add'>+	if (res)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	reg_data = YT921X_SMI_SWITCHID(mdio-&gt;switchid) | YT921X_SMI_DATA |</div><div class='add'>+		   YT921X_SMI_WRITE;</div><div class='add'>+	res = __mdiobus_write(bus, addr, reg_data, (u16)(val &gt;&gt; 16));</div><div class='add'>+	if (res)</div><div class='add'>+		goto end;</div><div class='add'>+	res = __mdiobus_write(bus, addr, reg_data, (u16)val);</div><div class='add'>+	if (res)</div><div class='add'>+		goto end;</div><div class='add'>+</div><div class='add'>+	res = 0;</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	mutex_unlock(&amp;bus-&gt;mdio_lock);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct yt921x_reg_ops yt921x_reg_ops_mdio = {</div><div class='add'>+	.read = yt921x_reg_mdio_read,</div><div class='add'>+	.write = yt921x_reg_mdio_write,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TODO: SPI/I2C */</div><div class='add'>+</div><div class='add'>+static int yt921x_intif_wait(struct yt921x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	return yt921x_reg_wait(priv, YT921X_INT_MBUS_OP, YT921X_MBUS_OP_START,</div><div class='add'>+			       &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_intif_read(struct yt921x_priv *priv, int port, int reg, u16 *valp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_intif_wait(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_MBUS_CTRL_PORT_M | YT921X_MBUS_CTRL_REG_M |</div><div class='add'>+	       YT921X_MBUS_CTRL_OP_M;</div><div class='add'>+	ctrl = YT921X_MBUS_CTRL_PORT(port) | YT921X_MBUS_CTRL_REG(reg) |</div><div class='add'>+	       YT921X_MBUS_CTRL_READ;</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_INT_MBUS_CTRL, mask, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_INT_MBUS_OP, YT921X_MBUS_OP_START);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_intif_wait(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_INT_MBUS_DIN, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if ((u16)val != val)</div><div class='add'>+		dev_info(dev,</div><div class='add'>+			 "%s: port %d, reg 0x%x: Expected u16, got 0x%08x\n",</div><div class='add'>+			 __func__, port, reg, val);</div><div class='add'>+	*valp = (u16)val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_intif_write(struct yt921x_priv *priv, int port, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_intif_wait(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_MBUS_CTRL_PORT_M | YT921X_MBUS_CTRL_REG_M |</div><div class='add'>+	       YT921X_MBUS_CTRL_OP_M;</div><div class='add'>+	ctrl = YT921X_MBUS_CTRL_PORT(port) | YT921X_MBUS_CTRL_REG(reg) |</div><div class='add'>+	       YT921X_MBUS_CTRL_WRITE;</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_INT_MBUS_CTRL, mask, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_INT_MBUS_DOUT, val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_INT_MBUS_OP, YT921X_MBUS_OP_START);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return yt921x_intif_wait(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_mbus_int_read(struct mii_bus *mbus, int port, int reg)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = mbus-&gt;priv;</div><div class='add'>+	u16 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= YT921X_PORT_NUM)</div><div class='add'>+		return U16_MAX;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_intif_read(priv, port, reg, &amp;val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_mbus_int_write(struct mii_bus *mbus, int port, int reg, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = mbus-&gt;priv;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (port &gt;= YT921X_PORT_NUM)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_intif_write(priv, port, reg, data);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_mbus_int_init(struct yt921x_priv *priv, struct device_node *mnp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	struct mii_bus *mbus;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mbus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!mbus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mbus-&gt;name = "YT921x internal MDIO bus";</div><div class='add'>+	snprintf(mbus-&gt;id, MII_BUS_ID_SIZE, "%s", dev_name(dev));</div><div class='add'>+	mbus-&gt;priv = priv;</div><div class='add'>+	mbus-&gt;read = yt921x_mbus_int_read;</div><div class='add'>+	mbus-&gt;write = yt921x_mbus_int_write;</div><div class='add'>+	mbus-&gt;parent = dev;</div><div class='add'>+	mbus-&gt;phy_mask = (u32)~GENMASK(YT921X_PORT_NUM - 1, 0);</div><div class='add'>+</div><div class='add'>+	res = devm_of_mdiobus_register(dev, mbus, mnp);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mbus_int = mbus;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_extif_wait(struct yt921x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	return yt921x_reg_wait(priv, YT921X_EXT_MBUS_OP, YT921X_MBUS_OP_START,</div><div class='add'>+			       &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_extif_read(struct yt921x_priv *priv, int port, int reg, u16 *valp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_extif_wait(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_MBUS_CTRL_PORT_M | YT921X_MBUS_CTRL_REG_M |</div><div class='add'>+	       YT921X_MBUS_CTRL_TYPE_M | YT921X_MBUS_CTRL_OP_M;</div><div class='add'>+	ctrl = YT921X_MBUS_CTRL_PORT(port) | YT921X_MBUS_CTRL_REG(reg) |</div><div class='add'>+	       YT921X_MBUS_CTRL_TYPE_C22 | YT921X_MBUS_CTRL_READ;</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_EXT_MBUS_CTRL, mask, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_EXT_MBUS_OP, YT921X_MBUS_OP_START);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_extif_wait(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_EXT_MBUS_DIN, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if ((u16)val != val)</div><div class='add'>+		dev_info(dev,</div><div class='add'>+			 "%s: port %d, reg 0x%x: Expected u16, got 0x%08x\n",</div><div class='add'>+			 __func__, port, reg, val);</div><div class='add'>+	*valp = (u16)val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_extif_write(struct yt921x_priv *priv, int port, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_extif_wait(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_MBUS_CTRL_PORT_M | YT921X_MBUS_CTRL_REG_M |</div><div class='add'>+	       YT921X_MBUS_CTRL_TYPE_M | YT921X_MBUS_CTRL_OP_M;</div><div class='add'>+	ctrl = YT921X_MBUS_CTRL_PORT(port) | YT921X_MBUS_CTRL_REG(reg) |</div><div class='add'>+	       YT921X_MBUS_CTRL_TYPE_C22 | YT921X_MBUS_CTRL_WRITE;</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_EXT_MBUS_CTRL, mask, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_EXT_MBUS_DOUT, val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_EXT_MBUS_OP, YT921X_MBUS_OP_START);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return yt921x_extif_wait(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_mbus_ext_read(struct mii_bus *mbus, int port, int reg)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = mbus-&gt;priv;</div><div class='add'>+	u16 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_extif_read(priv, port, reg, &amp;val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_mbus_ext_write(struct mii_bus *mbus, int port, int reg, u16 data)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = mbus-&gt;priv;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_extif_write(priv, port, reg, data);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_mbus_ext_init(struct yt921x_priv *priv, struct device_node *mnp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	struct mii_bus *mbus;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mbus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!mbus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mbus-&gt;name = "YT921x external MDIO bus";</div><div class='add'>+	snprintf(mbus-&gt;id, MII_BUS_ID_SIZE, "%s@ext", dev_name(dev));</div><div class='add'>+	mbus-&gt;priv = priv;</div><div class='add'>+	/* TODO: c45? */</div><div class='add'>+	mbus-&gt;read = yt921x_mbus_ext_read;</div><div class='add'>+	mbus-&gt;write = yt921x_mbus_ext_write;</div><div class='add'>+	mbus-&gt;parent = dev;</div><div class='add'>+</div><div class='add'>+	res = devm_of_mdiobus_register(dev, mbus, mnp);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mbus_ext = mbus;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read and handle overflow of 32bit MIBs. MIB buffer must be zeroed before. */</div><div class='add'>+static int yt921x_read_mib(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	/* Reading of yt921x_port::mib is not protected by a lock and it's vain</div><div class='add'>+	 * to keep its consistency, since we have to read registers one by one</div><div class='add'>+	 * and there is no way to make a snapshot of MIB stats.</div><div class='add'>+	 *</div><div class='add'>+	 * Writing (by this function only) is and should be protected by</div><div class='add'>+	 * reg_lock.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	for (size_t i = 0; i &lt; ARRAY_SIZE(yt921x_mib_descs); i++) {</div><div class='add'>+		const struct yt921x_mib_desc *desc = &amp;yt921x_mib_descs[i];</div><div class='add'>+		u32 reg = YT921X_MIBn_DATA0(port) + desc-&gt;offset;</div><div class='add'>+		u64 *valp = &amp;((u64 *)mib)[i];</div><div class='add'>+		u64 val = *valp;</div><div class='add'>+		u32 val0;</div><div class='add'>+		u32 val1;</div><div class='add'>+</div><div class='add'>+		res = yt921x_reg_read(priv, reg, &amp;val0);</div><div class='add'>+		if (res)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;size &lt;= 1) {</div><div class='add'>+			if (val &lt; (u32)val)</div><div class='add'>+				/* overflow */</div><div class='add'>+				val += (u64)U32_MAX + 1;</div><div class='add'>+			val &amp;= ~U32_MAX;</div><div class='add'>+			val |= val0;</div><div class='add'>+		} else {</div><div class='add'>+			res = yt921x_reg_read(priv, reg + 4, &amp;val1);</div><div class='add'>+			if (res)</div><div class='add'>+				break;</div><div class='add'>+			val = ((u64)val1 &lt;&lt; 32) | val0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(*valp, val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pp-&gt;rx_frames = mib-&gt;rx_64byte + mib-&gt;rx_65_127byte +</div><div class='add'>+			mib-&gt;rx_128_255byte + mib-&gt;rx_256_511byte +</div><div class='add'>+			mib-&gt;rx_512_1023byte + mib-&gt;rx_1024_1518byte +</div><div class='add'>+			mib-&gt;rx_jumbo;</div><div class='add'>+	pp-&gt;tx_frames = mib-&gt;tx_64byte + mib-&gt;tx_65_127byte +</div><div class='add'>+			mib-&gt;tx_128_255byte + mib-&gt;tx_256_511byte +</div><div class='add'>+			mib-&gt;tx_512_1023byte + mib-&gt;tx_1024_1518byte +</div><div class='add'>+			mib-&gt;tx_jumbo;</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dev, "Failed to %s port %d: %i\n", "read stats for",</div><div class='add'>+			port, res);</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void yt921x_poll_mib(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_port *pp = container_of_const(work, struct yt921x_port,</div><div class='add'>+						    mib_read.work);</div><div class='add'>+	struct yt921x_priv *priv = (void *)(pp - pp-&gt;index) -</div><div class='add'>+				   offsetof(struct yt921x_priv, ports);</div><div class='add'>+	unsigned long delay = YT921X_STATS_INTERVAL_JIFFIES;</div><div class='add'>+	int port = pp-&gt;index;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_read_mib(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	if (res)</div><div class='add'>+		delay *= 4;</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;pp-&gt;mib_read, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_strings(struct dsa_switch *ds, int port, u32 stringset,</div><div class='add'>+		       uint8_t *data)</div><div class='add'>+{</div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (size_t i = 0; i &lt; ARRAY_SIZE(yt921x_mib_descs); i++) {</div><div class='add'>+		const struct yt921x_mib_desc *desc = &amp;yt921x_mib_descs[i];</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;name)</div><div class='add'>+			ethtool_puts(&amp;data, desc-&gt;name);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+	size_t j;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	yt921x_read_mib(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	j = 0;</div><div class='add'>+	for (size_t i = 0; i &lt; ARRAY_SIZE(yt921x_mib_descs); i++) {</div><div class='add'>+		const struct yt921x_mib_desc *desc = &amp;yt921x_mib_descs[i];</div><div class='add'>+</div><div class='add'>+		if (!desc-&gt;name)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		data[j] = ((u64 *)mib)[i];</div><div class='add'>+		j++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_dsa_get_sset_count(struct dsa_switch *ds, int port, int sset)</div><div class='add'>+{</div><div class='add'>+	int cnt = 0;</div><div class='add'>+</div><div class='add'>+	if (sset != ETH_SS_STATS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	for (size_t i = 0; i &lt; ARRAY_SIZE(yt921x_mib_descs); i++) {</div><div class='add'>+		const struct yt921x_mib_desc *desc = &amp;yt921x_mib_descs[i];</div><div class='add'>+</div><div class='add'>+		if (desc-&gt;name)</div><div class='add'>+			cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	yt921x_read_mib(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK = pp-&gt;tx_frames;</div><div class='add'>+	mac_stats-&gt;SingleCollisionFrames = mib-&gt;tx_single_collisions;</div><div class='add'>+	mac_stats-&gt;MultipleCollisionFrames = mib-&gt;tx_multiple_collisions;</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK = pp-&gt;rx_frames;</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors = mib-&gt;rx_crc_errors;</div><div class='add'>+	mac_stats-&gt;AlignmentErrors = mib-&gt;rx_alignment_errors;</div><div class='add'>+	mac_stats-&gt;OctetsTransmittedOK = mib-&gt;tx_good_bytes;</div><div class='add'>+	mac_stats-&gt;FramesWithDeferredXmissions = mib-&gt;tx_deferred;</div><div class='add'>+	mac_stats-&gt;LateCollisions = mib-&gt;tx_late_collisions;</div><div class='add'>+	mac_stats-&gt;FramesAbortedDueToXSColls = mib-&gt;tx_aborted_errors;</div><div class='add'>+	/* mac_stats-&gt;FramesLostDueToIntMACXmitError */</div><div class='add'>+	/* mac_stats-&gt;CarrierSenseErrors */</div><div class='add'>+	mac_stats-&gt;OctetsReceivedOK = mib-&gt;rx_good_bytes;</div><div class='add'>+	/* mac_stats-&gt;FramesLostDueToIntMACRcvError */</div><div class='add'>+	mac_stats-&gt;MulticastFramesXmittedOK = mib-&gt;tx_multicast;</div><div class='add'>+	mac_stats-&gt;BroadcastFramesXmittedOK = mib-&gt;tx_broadcast;</div><div class='add'>+	/* mac_stats-&gt;FramesWithExcessiveDeferral */</div><div class='add'>+	mac_stats-&gt;MulticastFramesReceivedOK = mib-&gt;rx_multicast;</div><div class='add'>+	mac_stats-&gt;BroadcastFramesReceivedOK = mib-&gt;rx_broadcast;</div><div class='add'>+	/* mac_stats-&gt;InRangeLengthErrors */</div><div class='add'>+	/* mac_stats-&gt;OutOfRangeLengthField */</div><div class='add'>+	mac_stats-&gt;FrameTooLongErrors = mib-&gt;rx_oversize_errors;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_eth_ctrl_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			      struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	yt921x_read_mib(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesTransmitted = mib-&gt;tx_pause;</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesReceived = mib-&gt;rx_pause;</div><div class='add'>+	/* ctrl_stats-&gt;UnsupportedOpcodesReceived */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range yt921x_rmon_ranges[] = {</div><div class='add'>+	{ 0, 64 },</div><div class='add'>+	{ 65, 127 },</div><div class='add'>+	{ 128, 255 },</div><div class='add'>+	{ 256, 511 },</div><div class='add'>+	{ 512, 1023 },</div><div class='add'>+	{ 1024, 1518 },</div><div class='add'>+	{ 1519, YT921X_FRAME_SIZE_MAX },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			  struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+			  const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	yt921x_read_mib(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	*ranges = yt921x_rmon_ranges;</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;undersize_pkts = mib-&gt;rx_undersize_errors;</div><div class='add'>+	rmon_stats-&gt;oversize_pkts = mib-&gt;rx_oversize_errors;</div><div class='add'>+	rmon_stats-&gt;fragments = mib-&gt;rx_alignment_errors;</div><div class='add'>+	/* rmon_stats-&gt;jabbers */</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;hist[0] = mib-&gt;rx_64byte;</div><div class='add'>+	rmon_stats-&gt;hist[1] = mib-&gt;rx_65_127byte;</div><div class='add'>+	rmon_stats-&gt;hist[2] = mib-&gt;rx_128_255byte;</div><div class='add'>+	rmon_stats-&gt;hist[3] = mib-&gt;rx_256_511byte;</div><div class='add'>+	rmon_stats-&gt;hist[4] = mib-&gt;rx_512_1023byte;</div><div class='add'>+	rmon_stats-&gt;hist[5] = mib-&gt;rx_1024_1518byte;</div><div class='add'>+	rmon_stats-&gt;hist[6] = mib-&gt;rx_jumbo;</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;hist_tx[0] = mib-&gt;tx_64byte;</div><div class='add'>+	rmon_stats-&gt;hist_tx[1] = mib-&gt;tx_65_127byte;</div><div class='add'>+	rmon_stats-&gt;hist_tx[2] = mib-&gt;tx_128_255byte;</div><div class='add'>+	rmon_stats-&gt;hist_tx[3] = mib-&gt;tx_256_511byte;</div><div class='add'>+	rmon_stats-&gt;hist_tx[4] = mib-&gt;tx_512_1023byte;</div><div class='add'>+	rmon_stats-&gt;hist_tx[5] = mib-&gt;tx_1024_1518byte;</div><div class='add'>+	rmon_stats-&gt;hist_tx[6] = mib-&gt;tx_jumbo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_stats64(struct dsa_switch *ds, int port,</div><div class='add'>+		       struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_length_errors = mib-&gt;rx_undersize_errors +</div><div class='add'>+				  mib-&gt;rx_fragment_errors;</div><div class='add'>+	stats-&gt;rx_over_errors = mib-&gt;rx_oversize_errors;</div><div class='add'>+	stats-&gt;rx_crc_errors = mib-&gt;rx_crc_errors;</div><div class='add'>+	stats-&gt;rx_frame_errors = mib-&gt;rx_alignment_errors;</div><div class='add'>+	/* stats-&gt;rx_fifo_errors */</div><div class='add'>+	/* stats-&gt;rx_missed_errors */</div><div class='add'>+</div><div class='add'>+	stats-&gt;tx_aborted_errors = mib-&gt;tx_aborted_errors;</div><div class='add'>+	/* stats-&gt;tx_carrier_errors */</div><div class='add'>+	stats-&gt;tx_fifo_errors = mib-&gt;tx_undersize_errors;</div><div class='add'>+	/* stats-&gt;tx_heartbeat_errors */</div><div class='add'>+	stats-&gt;tx_window_errors = mib-&gt;tx_late_collisions;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_packets = pp-&gt;rx_frames;</div><div class='add'>+	stats-&gt;tx_packets = pp-&gt;tx_frames;</div><div class='add'>+	stats-&gt;rx_bytes = mib-&gt;rx_good_bytes - ETH_FCS_LEN * stats-&gt;rx_packets;</div><div class='add'>+	stats-&gt;tx_bytes = mib-&gt;tx_good_bytes - ETH_FCS_LEN * stats-&gt;tx_packets;</div><div class='add'>+	stats-&gt;rx_errors = stats-&gt;rx_length_errors + stats-&gt;rx_over_errors +</div><div class='add'>+			   stats-&gt;rx_crc_errors + stats-&gt;rx_frame_errors;</div><div class='add'>+	stats-&gt;tx_errors = stats-&gt;tx_aborted_errors + stats-&gt;tx_fifo_errors +</div><div class='add'>+			   stats-&gt;tx_window_errors;</div><div class='add'>+	stats-&gt;rx_dropped = mib-&gt;rx_dropped;</div><div class='add'>+	/* stats-&gt;tx_dropped */</div><div class='add'>+	stats-&gt;multicast = mib-&gt;rx_multicast;</div><div class='add'>+	stats-&gt;collisions = mib-&gt;tx_collisions;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_get_pause_stats(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	struct yt921x_mib *mib = &amp;pp-&gt;mib;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	yt921x_read_mib(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	pause_stats-&gt;tx_pause_frames = mib-&gt;tx_pause;</div><div class='add'>+	pause_stats-&gt;rx_pause_frames = mib-&gt;rx_pause;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_set_eee(struct yt921x_priv *priv, int port, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	/* Poor datasheet for EEE operations; don't ask if you are confused */</div><div class='add'>+</div><div class='add'>+	bool enable = e-&gt;eee_enabled;</div><div class='add'>+	u16 new_mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Enable / disable global EEE */</div><div class='add'>+	new_mask = priv-&gt;eee_ports_mask;</div><div class='add'>+	new_mask &amp;= ~BIT(port);</div><div class='add'>+	new_mask |= !enable ? 0 : BIT(port);</div><div class='add'>+</div><div class='add'>+	if (!!new_mask != !!priv-&gt;eee_ports_mask) {</div><div class='add'>+		res = yt921x_reg_toggle_bits(priv, YT921X_PON_STRAP_FUNC,</div><div class='add'>+					     YT921X_PON_STRAP_EEE, !!new_mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+		res = yt921x_reg_toggle_bits(priv, YT921X_PON_STRAP_VAL,</div><div class='add'>+					     YT921X_PON_STRAP_EEE, !!new_mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;eee_ports_mask = new_mask;</div><div class='add'>+</div><div class='add'>+	/* Enable / disable port EEE */</div><div class='add'>+	res = yt921x_reg_toggle_bits(priv, YT921X_EEE_CTRL,</div><div class='add'>+				     YT921X_EEE_CTRL_ENn(port), enable);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_toggle_bits(priv, YT921X_EEEn_VAL(port),</div><div class='add'>+				     YT921X_EEE_VAL_DATA, enable);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_set_eee(priv, port, e);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	/* Only serves as packet filter, since the frame size is always set to</div><div class='add'>+	 * maximum after reset</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	int frame_size;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='add'>+	if (dsa_port_is_cpu(dp))</div><div class='add'>+		frame_size += YT921X_TAG_LEN;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_MACn_FRAME(port),</div><div class='add'>+				     YT921X_MAC_FRAME_SIZE_M,</div><div class='add'>+				     YT921X_MAC_FRAME_SIZE(frame_size));</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_dsa_port_max_mtu(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	/* Only called for user ports, exclude tag len here */</div><div class='add'>+	return YT921X_FRAME_SIZE_MAX - ETH_HLEN - ETH_FCS_LEN - YT921X_TAG_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_mirror_del(struct yt921x_priv *priv, int port, bool ingress)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	if (ingress)</div><div class='add'>+		mask = YT921X_MIRROR_IGR_PORTn(port);</div><div class='add'>+	else</div><div class='add'>+		mask = YT921X_MIRROR_EGR_PORTn(port);</div><div class='add'>+	return yt921x_reg_clear_bits(priv, YT921X_MIRROR, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_mirror_add(struct yt921x_priv *priv, int port, bool ingress,</div><div class='add'>+		  int to_local_port, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 srcs;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 dst;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (ingress)</div><div class='add'>+		srcs = YT921X_MIRROR_IGR_PORTn(port);</div><div class='add'>+	else</div><div class='add'>+		srcs = YT921X_MIRROR_EGR_PORTn(port);</div><div class='add'>+	dst = YT921X_MIRROR_PORT(to_local_port);</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_MIRROR, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* other mirror tasks &amp; different dst port -&gt; conflict */</div><div class='add'>+	if ((val &amp; ~srcs &amp; (YT921X_MIRROR_EGR_PORTS_M |</div><div class='add'>+			    YT921X_MIRROR_IGR_PORTS_M)) &amp;&amp;</div><div class='add'>+	    (val &amp; YT921X_MIRROR_PORT_M) != dst) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Sniffer port is already configured, delete existing rules &amp; retry");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctrl = val &amp; ~YT921X_MIRROR_PORT_M;</div><div class='add'>+	ctrl |= srcs;</div><div class='add'>+	ctrl |= dst;</div><div class='add'>+</div><div class='add'>+	if (ctrl == val)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return yt921x_reg_write(priv, YT921X_MIRROR, ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_port_mirror_del(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_mall_mirror_tc_entry *mirror)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_mirror_del(priv, port, mirror-&gt;ingress);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dev, "Failed to %s port %d: %i\n", "unmirror",</div><div class='add'>+			port, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_mirror_add(struct dsa_switch *ds, int port,</div><div class='add'>+			   struct dsa_mall_mirror_tc_entry *mirror,</div><div class='add'>+			   bool ingress, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_mirror_add(priv, port, ingress,</div><div class='add'>+				mirror-&gt;to_local_port, extack);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_fdb_wait(struct yt921x_priv *priv, u32 *valp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	u32 val = YT921X_FDB_RESULT_DONE;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_wait(priv, YT921X_FDB_RESULT, YT921X_FDB_RESULT_DONE,</div><div class='add'>+			      &amp;val);</div><div class='add'>+	if (res) {</div><div class='add'>+		dev_err(dev, "FDB probably stuck\n");</div><div class='add'>+		return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*valp = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_in01(struct yt921x_priv *priv, const unsigned char *addr,</div><div class='add'>+		u16 vid, u32 ctrl1)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ctrl = (addr[0] &lt;&lt; 24) | (addr[1] &lt;&lt; 16) | (addr[2] &lt;&lt; 8) | addr[3];</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN0, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = ctrl1 | YT921X_FDB_IO1_FID(vid) | (addr[4] &lt;&lt; 8) | addr[5];</div><div class='add'>+	return yt921x_reg_write(priv, YT921X_FDB_IN1, ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_has(struct yt921x_priv *priv, const unsigned char *addr, u16 vid,</div><div class='add'>+	       u16 *indexp)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_fdb_in01(priv, addr, vid, 0);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = 0;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN2, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_OP_OP_GET_ONE | YT921X_FDB_OP_START;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_fdb_wait(priv, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	if (val &amp; YT921X_FDB_RESULT_NOTFOUND) {</div><div class='add'>+		*indexp = YT921X_FDB_NUM;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*indexp = FIELD_GET(YT921X_FDB_RESULT_INDEX_M, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_read(struct yt921x_priv *priv, unsigned char *addr, u16 *vidp,</div><div class='add'>+		u16 *ports_maskp, u16 *indexp, u8 *statusp)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	u16 index;</div><div class='add'>+	u32 data0;</div><div class='add'>+	u32 data1;</div><div class='add'>+	u32 data2;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_fdb_wait(priv, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	if (val &amp; YT921X_FDB_RESULT_NOTFOUND) {</div><div class='add'>+		*ports_maskp = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	index = FIELD_GET(YT921X_FDB_RESULT_INDEX_M, val);</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT1, &amp;data1);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	if ((data1 &amp; YT921X_FDB_IO1_STATUS_M) ==</div><div class='add'>+	    YT921X_FDB_IO1_STATUS_INVALID) {</div><div class='add'>+		*ports_maskp = 0;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT0, &amp;data0);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT2, &amp;data2);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	addr[0] = data0 &gt;&gt; 24;</div><div class='add'>+	addr[1] = data0 &gt;&gt; 16;</div><div class='add'>+	addr[2] = data0 &gt;&gt; 8;</div><div class='add'>+	addr[3] = data0;</div><div class='add'>+	addr[4] = data1 &gt;&gt; 8;</div><div class='add'>+	addr[5] = data1;</div><div class='add'>+	*vidp = FIELD_GET(YT921X_FDB_IO1_FID_M, data1);</div><div class='add'>+	*indexp = index;</div><div class='add'>+	*ports_maskp = FIELD_GET(YT921X_FDB_IO2_EGR_PORTS_M, data2);</div><div class='add'>+	*statusp = FIELD_GET(YT921X_FDB_IO1_STATUS_M, data1);</div><div class='add'>+</div><div class='add'>+	dev_dbg(dev,</div><div class='add'>+		"%s: index 0x%x, mac %02x:%02x:%02x:%02x:%02x:%02x, vid %d, ports 0x%x, status %d\n",</div><div class='add'>+		__func__, *indexp, addr[0], addr[1], addr[2], addr[3],</div><div class='add'>+		addr[4], addr[5], *vidp, *ports_maskp, *statusp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_dump(struct yt921x_priv *priv, u16 ports_mask,</div><div class='add'>+		dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+	u8 status;</div><div class='add'>+	u16 pmask;</div><div class='add'>+	u16 index;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u16 vid;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_OP_INDEX(0) | YT921X_FDB_OP_MODE_INDEX |</div><div class='add'>+	       YT921X_FDB_OP_OP_GET_ONE | YT921X_FDB_OP_START;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_fdb_read(priv, addr, &amp;vid, &amp;pmask, &amp;index, &amp;status);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	if ((pmask &amp; ports_mask) &amp;&amp; !is_multicast_ether_addr(addr)) {</div><div class='add'>+		res = cb(addr, vid,</div><div class='add'>+			 status == YT921X_FDB_ENTRY_STATUS_STATIC, data);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_IO2_EGR_PORTS(ports_mask);</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN2, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	index = 0;</div><div class='add'>+	do {</div><div class='add'>+		ctrl = YT921X_FDB_OP_INDEX(index) | YT921X_FDB_OP_MODE_INDEX |</div><div class='add'>+		       YT921X_FDB_OP_NEXT_TYPE_UCAST_PORT |</div><div class='add'>+		       YT921X_FDB_OP_OP_GET_NEXT | YT921X_FDB_OP_START;</div><div class='add'>+		res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		res = yt921x_fdb_read(priv, addr, &amp;vid, &amp;pmask, &amp;index,</div><div class='add'>+				      &amp;status);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+		if (!pmask)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if ((pmask &amp; ports_mask) &amp;&amp; !is_multicast_ether_addr(addr)) {</div><div class='add'>+			res = cb(addr, vid,</div><div class='add'>+				 status == YT921X_FDB_ENTRY_STATUS_STATIC,</div><div class='add'>+				 data);</div><div class='add'>+			if (res)</div><div class='add'>+				return res;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Never call GET_NEXT with 4095, otherwise it will hang</div><div class='add'>+		 * forever until a reset!</div><div class='add'>+		 */</div><div class='add'>+	} while (index &lt; YT921X_FDB_NUM - 1);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_flush_raw(struct yt921x_priv *priv, u16 ports_mask, u16 vid,</div><div class='add'>+		     bool flush_static)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (vid &lt; 4096) {</div><div class='add'>+		ctrl = YT921X_FDB_IO1_FID(vid);</div><div class='add'>+		res = yt921x_reg_write(priv, YT921X_FDB_IN1, ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_IO2_EGR_PORTS(ports_mask);</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN2, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_OP_OP_FLUSH | YT921X_FDB_OP_START;</div><div class='add'>+	if (vid &gt;= 4096)</div><div class='add'>+		ctrl |= YT921X_FDB_OP_FLUSH_PORT;</div><div class='add'>+	else</div><div class='add'>+		ctrl |= YT921X_FDB_OP_FLUSH_PORT_VID;</div><div class='add'>+	if (flush_static)</div><div class='add'>+		ctrl |= YT921X_FDB_OP_FLUSH_STATIC;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_fdb_wait(priv, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_flush_port(struct yt921x_priv *priv, int port, bool flush_static)</div><div class='add'>+{</div><div class='add'>+	return yt921x_fdb_flush_raw(priv, BIT(port), 4096, flush_static);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_add_index_in12(struct yt921x_priv *priv, u16 index, u16 ctrl1,</div><div class='add'>+			  u16 ctrl2)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN1, ctrl1);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN2, ctrl2);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_OP_INDEX(index) | YT921X_FDB_OP_MODE_INDEX |</div><div class='add'>+	       YT921X_FDB_OP_OP_ADD | YT921X_FDB_OP_START;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return yt921x_fdb_wait(priv, &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_add(struct yt921x_priv *priv, const unsigned char *addr, u16 vid,</div><div class='add'>+	       u16 ports_mask)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_IO1_STATUS_STATIC;</div><div class='add'>+	res = yt921x_fdb_in01(priv, addr, vid, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_IO2_EGR_PORTS(ports_mask);</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_IN2, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_FDB_OP_OP_ADD | YT921X_FDB_OP_START;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return yt921x_fdb_wait(priv, &amp;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_leave(struct yt921x_priv *priv, const unsigned char *addr,</div><div class='add'>+		 u16 vid, u16 ports_mask)</div><div class='add'>+{</div><div class='add'>+	u16 index;</div><div class='add'>+	u32 ctrl1;</div><div class='add'>+	u32 ctrl2;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val2;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Check for presence */</div><div class='add'>+	res = yt921x_fdb_has(priv, addr, vid, &amp;index);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	if (index &gt;= YT921X_FDB_NUM)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Check if action required */</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT2, &amp;val2);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl2 = val2 &amp; ~YT921X_FDB_IO2_EGR_PORTS(ports_mask);</div><div class='add'>+	if (ctrl2 == val2)</div><div class='add'>+		return 0;</div><div class='add'>+	if (!(ctrl2 &amp; YT921X_FDB_IO2_EGR_PORTS_M)) {</div><div class='add'>+		ctrl = YT921X_FDB_OP_OP_DEL | YT921X_FDB_OP_START;</div><div class='add'>+		res = yt921x_reg_write(priv, YT921X_FDB_OP, ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		return yt921x_fdb_wait(priv, &amp;val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT1, &amp;ctrl1);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return yt921x_fdb_add_index_in12(priv, index, ctrl1, ctrl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_fdb_join(struct yt921x_priv *priv, const unsigned char *addr, u16 vid,</div><div class='add'>+		u16 ports_mask)</div><div class='add'>+{</div><div class='add'>+	u16 index;</div><div class='add'>+	u32 ctrl1;</div><div class='add'>+	u32 ctrl2;</div><div class='add'>+	u32 val1;</div><div class='add'>+	u32 val2;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Check for presence */</div><div class='add'>+	res = yt921x_fdb_has(priv, addr, vid, &amp;index);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	if (index &gt;= YT921X_FDB_NUM)</div><div class='add'>+		return yt921x_fdb_add(priv, addr, vid, ports_mask);</div><div class='add'>+</div><div class='add'>+	/* Check if action required */</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT1, &amp;val1);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_FDB_OUT2, &amp;val2);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl1 = val1 &amp; ~YT921X_FDB_IO1_STATUS_M;</div><div class='add'>+	ctrl1 |= YT921X_FDB_IO1_STATUS_STATIC;</div><div class='add'>+	ctrl2 = val2 | YT921X_FDB_IO2_EGR_PORTS(ports_mask);</div><div class='add'>+	if (ctrl1 == val1 &amp;&amp; ctrl2 == val2)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return yt921x_fdb_add_index_in12(priv, index, ctrl1, ctrl2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_fdb_dump(struct dsa_switch *ds, int port,</div><div class='add'>+			 dsa_fdb_dump_cb_t *cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	/* Hardware FDB is shared for fdb and mdb, "bridge fdb show"</div><div class='add'>+	 * only wants to see unicast</div><div class='add'>+	 */</div><div class='add'>+	res = yt921x_fdb_dump(priv, BIT(port), cb, data);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void yt921x_dsa_port_fast_age(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_fdb_flush_port(priv, port, false);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dev, "Failed to %s port %d: %i\n", "clear FDB for",</div><div class='add'>+			port, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_set_ageing_time(struct dsa_switch *ds, unsigned int msecs)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* AGEING reg is set in 5s step */</div><div class='add'>+	ctrl = clamp(msecs / 5000, 1, U16_MAX);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_AGEING, ctrl);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_fdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			const unsigned char *addr, u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_fdb_leave(priv, addr, vid, BIT(port));</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_fdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			const unsigned char *addr, u16 vid, struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_fdb_join(priv, addr, vid, BIT(port));</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_mdb_del(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	const unsigned char *addr = mdb-&gt;addr;</div><div class='add'>+	u16 vid = mdb-&gt;vid;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_fdb_leave(priv, addr, vid, BIT(port));</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_mdb_add(struct dsa_switch *ds, int port,</div><div class='add'>+			const struct switchdev_obj_port_mdb *mdb,</div><div class='add'>+			struct dsa_db db)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	const unsigned char *addr = mdb-&gt;addr;</div><div class='add'>+	u16 vid = mdb-&gt;vid;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_fdb_join(priv, addr, vid, BIT(port));</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_port_set_pvid(struct yt921x_priv *priv, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_PORT_VLAN_CTRL_CVID_M;</div><div class='add'>+	ctrl = YT921X_PORT_VLAN_CTRL_CVID(vid);</div><div class='add'>+	return yt921x_reg_update_bits(priv, YT921X_PORTn_VLAN_CTRL(port),</div><div class='add'>+				      mask, ctrl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_vlan_filtering(struct yt921x_priv *priv, int port, bool vlan_filtering)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(&amp;priv-&gt;ds, port);</div><div class='add'>+	struct net_device *bdev;</div><div class='add'>+	u16 pvid;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	bdev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+</div><div class='add'>+	if (!bdev || !vlan_filtering)</div><div class='add'>+		pvid = YT921X_VID_UNWARE;</div><div class='add'>+	else</div><div class='add'>+		br_vlan_get_pvid(bdev, &amp;pvid);</div><div class='add'>+	res = yt921x_port_set_pvid(priv, port, pvid);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_TAGGED |</div><div class='add'>+	       YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED;</div><div class='add'>+	ctrl = 0;</div><div class='add'>+	/* Do not drop tagged frames here; let VLAN_IGR_FILTER do it */</div><div class='add'>+	if (vlan_filtering &amp;&amp; !pvid)</div><div class='add'>+		ctrl |= YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED;</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_PORTn_VLAN_CTRL1(port),</div><div class='add'>+				     mask, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_toggle_bits(priv, YT921X_VLAN_IGR_FILTER,</div><div class='add'>+				     YT921X_VLAN_IGR_FILTER_PORTn(port),</div><div class='add'>+				     vlan_filtering);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Turn on / off VLAN awareness */</div><div class='add'>+	mask = YT921X_PORT_IGR_TPIDn_CTAG_M;</div><div class='add'>+	if (!vlan_filtering)</div><div class='add'>+		ctrl = 0;</div><div class='add'>+	else</div><div class='add'>+		ctrl = YT921X_PORT_IGR_TPIDn_CTAG(0);</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_PORTn_IGR_TPID(port),</div><div class='add'>+				     mask, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_vlan_del(struct yt921x_priv *priv, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	u64 mask64;</div><div class='add'>+</div><div class='add'>+	mask64 = YT921X_VLAN_CTRL_PORTS(port) |</div><div class='add'>+		 YT921X_VLAN_CTRL_UNTAG_PORTn(port);</div><div class='add'>+</div><div class='add'>+	return yt921x_reg64_clear_bits(priv, YT921X_VLANn_CTRL(vid), mask64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_vlan_add(struct yt921x_priv *priv, int port, u16 vid, bool untagged)</div><div class='add'>+{</div><div class='add'>+	u64 mask64;</div><div class='add'>+	u64 ctrl64;</div><div class='add'>+</div><div class='add'>+	mask64 = YT921X_VLAN_CTRL_PORTn(port) |</div><div class='add'>+		 YT921X_VLAN_CTRL_PORTS(priv-&gt;cpu_ports_mask);</div><div class='add'>+	ctrl64 = mask64;</div><div class='add'>+</div><div class='add'>+	mask64 |= YT921X_VLAN_CTRL_UNTAG_PORTn(port);</div><div class='add'>+	if (untagged)</div><div class='add'>+		ctrl64 |= YT921X_VLAN_CTRL_UNTAG_PORTn(port);</div><div class='add'>+</div><div class='add'>+	return yt921x_reg64_update_bits(priv, YT921X_VLANn_CTRL(vid),</div><div class='add'>+					mask64, ctrl64);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_pvid_clear(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(&amp;priv-&gt;ds, port);</div><div class='add'>+	bool vlan_filtering;</div><div class='add'>+	u32 mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	vlan_filtering = dsa_port_is_vlan_filtering(dp);</div><div class='add'>+</div><div class='add'>+	res = yt921x_port_set_pvid(priv, port,</div><div class='add'>+				   vlan_filtering ? 0 : YT921X_VID_UNWARE);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		mask = YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED;</div><div class='add'>+		res = yt921x_reg_set_bits(priv, YT921X_PORTn_VLAN_CTRL1(port),</div><div class='add'>+					  mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_pvid_set(struct yt921x_priv *priv, int port, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(&amp;priv-&gt;ds, port);</div><div class='add'>+	bool vlan_filtering;</div><div class='add'>+	u32 mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	vlan_filtering = dsa_port_is_vlan_filtering(dp);</div><div class='add'>+</div><div class='add'>+	if (vlan_filtering) {</div><div class='add'>+		res = yt921x_port_set_pvid(priv, port, vid);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mask = YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED;</div><div class='add'>+	res = yt921x_reg_clear_bits(priv, YT921X_PORTn_VLAN_CTRL1(port), mask);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_vlan_filtering(struct dsa_switch *ds, int port,</div><div class='add'>+			       bool vlan_filtering,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_vlan_filtering(priv, port, vlan_filtering);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_vlan_del(struct dsa_switch *ds, int port,</div><div class='add'>+			 const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	u16 vid = vlan-&gt;vid;</div><div class='add'>+	u16 pvid;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	do {</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		struct net_device *bdev;</div><div class='add'>+</div><div class='add'>+		res = yt921x_vlan_del(priv, port, vid);</div><div class='add'>+		if (res)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		bdev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+		if (bdev) {</div><div class='add'>+			br_vlan_get_pvid(bdev, &amp;pvid);</div><div class='add'>+			if (pvid == vid)</div><div class='add'>+				res = yt921x_pvid_clear(priv, port);</div><div class='add'>+		}</div><div class='add'>+	} while (0);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_vlan_add(struct dsa_switch *ds, int port,</div><div class='add'>+			 const struct switchdev_obj_port_vlan *vlan,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	u16 vid = vlan-&gt;vid;</div><div class='add'>+	u16 pvid;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* CPU port is supposed to be a member of every VLAN; see</div><div class='add'>+	 * yt921x_vlan_add() and yt921x_port_setup()</div><div class='add'>+	 */</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	do {</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		struct net_device *bdev;</div><div class='add'>+</div><div class='add'>+		res = yt921x_vlan_add(priv, port, vid,</div><div class='add'>+				      vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_UNTAGGED);</div><div class='add'>+		if (res)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		bdev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+		if (bdev) {</div><div class='add'>+			if (vlan-&gt;flags &amp; BRIDGE_VLAN_INFO_PVID) {</div><div class='add'>+				res = yt921x_pvid_set(priv, port, vid);</div><div class='add'>+			} else {</div><div class='add'>+				br_vlan_get_pvid(bdev, &amp;pvid);</div><div class='add'>+				if (pvid == vid)</div><div class='add'>+					res = yt921x_pvid_clear(priv, port);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} while (0);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_userport_standalone(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ctrl = ~priv-&gt;cpu_ports_mask;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_PORTn_ISOLATION(port), ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Turn off FDB learning to prevent FDB pollution */</div><div class='add'>+	mask = YT921X_PORT_LEARN_DIS;</div><div class='add'>+	res = yt921x_reg_set_bits(priv, YT921X_PORTn_LEARN(port), mask);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Turn off VLAN awareness */</div><div class='add'>+	mask = YT921X_PORT_IGR_TPIDn_CTAG_M;</div><div class='add'>+	res = yt921x_reg_clear_bits(priv, YT921X_PORTn_IGR_TPID(port), mask);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Unrelated since learning is off and all packets are trapped;</div><div class='add'>+	 * set it anyway</div><div class='add'>+	 */</div><div class='add'>+	res = yt921x_port_set_pvid(priv, port, YT921X_VID_UNWARE);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_userport_bridge(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_PORT_LEARN_DIS;</div><div class='add'>+	res = yt921x_reg_clear_bits(priv, YT921X_PORTn_LEARN(port), mask);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_isolate(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mask = BIT(port);</div><div class='add'>+	for (int i = 0; i &lt; YT921X_PORT_NUM; i++) {</div><div class='add'>+		if ((BIT(i) &amp; priv-&gt;cpu_ports_mask) || i == port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		res = yt921x_reg_set_bits(priv, YT921X_PORTn_ISOLATION(i),</div><div class='add'>+					  mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Make sure to include the CPU port in ports_mask, or your bridge will</div><div class='add'>+ * not have it.</div><div class='add'>+ */</div><div class='add'>+static int yt921x_bridge(struct yt921x_priv *priv, u16 ports_mask)</div><div class='add'>+{</div><div class='add'>+	unsigned long targets_mask = ports_mask &amp; ~priv-&gt;cpu_ports_mask;</div><div class='add'>+	u32 isolated_mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int port;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	isolated_mask = 0;</div><div class='add'>+	for_each_set_bit(port, &amp;targets_mask, YT921X_PORT_NUM) {</div><div class='add'>+		struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+		if (pp-&gt;isolated)</div><div class='add'>+			isolated_mask |= BIT(port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Block from non-cpu bridge ports ... */</div><div class='add'>+	for_each_set_bit(port, &amp;targets_mask, YT921X_PORT_NUM) {</div><div class='add'>+		struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+		/* to non-bridge ports */</div><div class='add'>+		ctrl = ~ports_mask;</div><div class='add'>+		/* to isolated ports when isolated */</div><div class='add'>+		if (pp-&gt;isolated)</div><div class='add'>+			ctrl |= isolated_mask;</div><div class='add'>+		/* to itself when non-hairpin */</div><div class='add'>+		if (!pp-&gt;hairpin)</div><div class='add'>+			ctrl |= BIT(port);</div><div class='add'>+		else</div><div class='add'>+			ctrl &amp;= ~BIT(port);</div><div class='add'>+</div><div class='add'>+		res = yt921x_reg_write(priv, YT921X_PORTn_ISOLATION(port),</div><div class='add'>+				       ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_bridge_leave(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_userport_standalone(priv, port);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_isolate(priv, port);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_bridge_join(struct yt921x_priv *priv, int port, u16 ports_mask)</div><div class='add'>+{</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_userport_bridge(priv, port);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_bridge(priv, ports_mask);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32</div><div class='add'>+dsa_bridge_ports(struct dsa_switch *ds, const struct net_device *bdev)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp;</div><div class='add'>+	u32 mask = 0;</div><div class='add'>+</div><div class='add'>+	dsa_switch_for_each_user_port(dp, ds)</div><div class='add'>+		if (dsa_port_offloads_bridge_dev(dp, bdev))</div><div class='add'>+			mask |= BIT(dp-&gt;index);</div><div class='add'>+</div><div class='add'>+	return mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_bridge_flags(struct yt921x_priv *priv, int port,</div><div class='add'>+		    struct switchdev_brport_flags flags)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_port *pp = &amp;priv-&gt;ports[port];</div><div class='add'>+	bool do_flush;</div><div class='add'>+	u32 mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		bool learning = flags.val &amp; BR_LEARNING;</div><div class='add'>+</div><div class='add'>+		mask = YT921X_PORT_LEARN_DIS;</div><div class='add'>+		res = yt921x_reg_toggle_bits(priv, YT921X_PORTn_LEARN(port),</div><div class='add'>+					     mask, !learning);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BR_FLOOD, BR_MCAST_FLOOD: see the comment where ACT_UNK_ACTn_TRAP</div><div class='add'>+	 * is set</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* BR_BCAST_FLOOD: we can filter bcast, but cannot trap them */</div><div class='add'>+</div><div class='add'>+	do_flush = false;</div><div class='add'>+	if (flags.mask &amp; BR_HAIRPIN_MODE) {</div><div class='add'>+		pp-&gt;hairpin = flags.val &amp; BR_HAIRPIN_MODE;</div><div class='add'>+		do_flush = true;</div><div class='add'>+	}</div><div class='add'>+	if (flags.mask &amp; BR_ISOLATED) {</div><div class='add'>+		pp-&gt;isolated = flags.val &amp; BR_ISOLATED;</div><div class='add'>+		do_flush = true;</div><div class='add'>+	}</div><div class='add'>+	if (do_flush) {</div><div class='add'>+		struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+		struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+		struct net_device *bdev;</div><div class='add'>+</div><div class='add'>+		bdev = dsa_port_bridge_dev_get(dp);</div><div class='add'>+		if (bdev) {</div><div class='add'>+			u32 ports_mask;</div><div class='add'>+</div><div class='add'>+			ports_mask = dsa_bridge_ports(ds, bdev);</div><div class='add'>+			ports_mask |= priv-&gt;cpu_ports_mask;</div><div class='add'>+			res = yt921x_bridge(priv, ports_mask);</div><div class='add'>+			if (res)</div><div class='add'>+				return res;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_pre_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+				 struct switchdev_brport_flags flags,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_HAIRPIN_MODE | BR_LEARNING | BR_FLOOD |</div><div class='add'>+			   BR_MCAST_FLOOD | BR_ISOLATED))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_bridge_flags(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct switchdev_brport_flags flags,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_bridge_flags(priv, port, flags);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_port_bridge_leave(struct dsa_switch *ds, int port,</div><div class='add'>+			     struct dsa_bridge bridge)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_bridge_leave(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dev, "Failed to %s port %d: %i\n", "unbridge",</div><div class='add'>+			port, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_bridge_join(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct dsa_bridge bridge, bool *tx_fwd_offload,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	u16 ports_mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ports_mask = dsa_bridge_ports(ds, bridge.dev);</div><div class='add'>+	ports_mask |= priv-&gt;cpu_ports_mask;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_bridge_join(priv, port, ports_mask);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_port_mst_state_set(struct dsa_switch *ds, int port,</div><div class='add'>+			      const struct switchdev_mst_state *st)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_STP_PORTn_M(port);</div><div class='add'>+	switch (st-&gt;state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_DISABLED(port);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_LEARNING(port);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+	default:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_FORWARD(port);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_BLOCKING(port);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_reg_update_bits(priv, YT921X_STPn(st-&gt;msti), mask, ctrl);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_dsa_vlan_msti_set(struct dsa_switch *ds, struct dsa_bridge bridge,</div><div class='add'>+			 const struct switchdev_vlan_msti *msti)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	u64 mask64;</div><div class='add'>+	u64 ctrl64;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (!msti-&gt;vid)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!msti-&gt;msti || msti-&gt;msti &gt;= YT921X_MSTI_NUM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mask64 = YT921X_VLAN_CTRL_STP_ID_M;</div><div class='add'>+	ctrl64 = YT921X_VLAN_CTRL_STP_ID(msti-&gt;msti);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_reg64_update_bits(priv, YT921X_VLANn_CTRL(msti-&gt;vid),</div><div class='add'>+				       mask64, ctrl64);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct dsa_port *dp = dsa_to_port(ds, port);</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	bool learning;</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_STP_PORTn_M(port);</div><div class='add'>+	learning = false;</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_DISABLED(port);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_LEARNING(port);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_LEARNING(port);</div><div class='add'>+		learning = dp-&gt;learning;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+	default:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_FORWARD(port);</div><div class='add'>+		learning = dp-&gt;learning;</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		ctrl = YT921X_STP_PORTn_BLOCKING(port);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	do {</div><div class='add'>+		res = yt921x_reg_update_bits(priv, YT921X_STPn(0), mask, ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mask = YT921X_PORT_LEARN_DIS;</div><div class='add'>+		ctrl = !learning ? YT921X_PORT_LEARN_DIS : 0;</div><div class='add'>+		res = yt921x_reg_update_bits(priv, YT921X_PORTn_LEARN(port),</div><div class='add'>+					     mask, ctrl);</div><div class='add'>+	} while (0);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dev, "Failed to %s port %d: %i\n", "set STP state for",</div><div class='add'>+			port, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_port_down(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mask = YT921X_PORT_LINK | YT921X_PORT_RX_MAC_EN | YT921X_PORT_TX_MAC_EN;</div><div class='add'>+	res = yt921x_reg_clear_bits(priv, YT921X_PORTn_CTRL(port), mask);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if (yt921x_port_is_external(port)) {</div><div class='add'>+		mask = YT921X_SERDES_LINK;</div><div class='add'>+		res = yt921x_reg_clear_bits(priv, YT921X_SERDESn(port), mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		mask = YT921X_XMII_LINK;</div><div class='add'>+		res = yt921x_reg_clear_bits(priv, YT921X_XMIIn(port), mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_port_up(struct yt921x_priv *priv, int port, unsigned int mode,</div><div class='add'>+	       phy_interface_t interface, int speed, int duplex,</div><div class='add'>+	       bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		ctrl = YT921X_PORT_SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		ctrl = YT921X_PORT_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		ctrl = YT921X_PORT_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_2500:</div><div class='add'>+		ctrl = YT921X_PORT_SPEED_2500;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10000:</div><div class='add'>+		ctrl = YT921X_PORT_SPEED_10000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (duplex == DUPLEX_FULL)</div><div class='add'>+		ctrl |= YT921X_PORT_DUPLEX_FULL;</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		ctrl |= YT921X_PORT_TX_PAUSE;</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		ctrl |= YT921X_PORT_RX_PAUSE;</div><div class='add'>+	ctrl |= YT921X_PORT_RX_MAC_EN | YT921X_PORT_TX_MAC_EN;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_PORTn_CTRL(port), ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if (yt921x_port_is_external(port)) {</div><div class='add'>+		mask = YT921X_SERDES_SPEED_M;</div><div class='add'>+		switch (speed) {</div><div class='add'>+		case SPEED_10:</div><div class='add'>+			ctrl = YT921X_SERDES_SPEED_10;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_100:</div><div class='add'>+			ctrl = YT921X_SERDES_SPEED_100;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_1000:</div><div class='add'>+			ctrl = YT921X_SERDES_SPEED_1000;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_2500:</div><div class='add'>+			ctrl = YT921X_SERDES_SPEED_2500;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_10000:</div><div class='add'>+			ctrl = YT921X_SERDES_SPEED_10000;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		mask |= YT921X_SERDES_DUPLEX_FULL;</div><div class='add'>+		if (duplex == DUPLEX_FULL)</div><div class='add'>+			ctrl |= YT921X_SERDES_DUPLEX_FULL;</div><div class='add'>+		mask |= YT921X_SERDES_TX_PAUSE;</div><div class='add'>+		if (tx_pause)</div><div class='add'>+			ctrl |= YT921X_SERDES_TX_PAUSE;</div><div class='add'>+		mask |= YT921X_SERDES_RX_PAUSE;</div><div class='add'>+		if (rx_pause)</div><div class='add'>+			ctrl |= YT921X_SERDES_RX_PAUSE;</div><div class='add'>+		mask |= YT921X_SERDES_LINK;</div><div class='add'>+		ctrl |= YT921X_SERDES_LINK;</div><div class='add'>+		res = yt921x_reg_update_bits(priv, YT921X_SERDESn(port),</div><div class='add'>+					     mask, ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		mask = YT921X_XMII_LINK;</div><div class='add'>+		res = yt921x_reg_set_bits(priv, YT921X_XMIIn(port), mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		switch (speed) {</div><div class='add'>+		case SPEED_10:</div><div class='add'>+			ctrl = YT921X_MDIO_POLLING_SPEED_10;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_100:</div><div class='add'>+			ctrl = YT921X_MDIO_POLLING_SPEED_100;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_1000:</div><div class='add'>+			ctrl = YT921X_MDIO_POLLING_SPEED_1000;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_2500:</div><div class='add'>+			ctrl = YT921X_MDIO_POLLING_SPEED_2500;</div><div class='add'>+			break;</div><div class='add'>+		case SPEED_10000:</div><div class='add'>+			ctrl = YT921X_MDIO_POLLING_SPEED_10000;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (duplex == DUPLEX_FULL)</div><div class='add'>+			ctrl |= YT921X_MDIO_POLLING_DUPLEX_FULL;</div><div class='add'>+		ctrl |= YT921X_MDIO_POLLING_LINK;</div><div class='add'>+		res = yt921x_reg_write(priv, YT921X_MDIO_POLLINGn(port), ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_port_config(struct yt921x_priv *priv, int port, unsigned int mode,</div><div class='add'>+		   phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	u32 mask;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	if (!yt921x_port_is_external(port)) {</div><div class='add'>+		if (interface != PHY_INTERFACE_MODE_INTERNAL) {</div><div class='add'>+			dev_err(dev, "Wrong mode %d on port %d\n",</div><div class='add'>+				interface, port);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (interface) {</div><div class='add'>+	/* SERDES */</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_100BASEX:</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+	case PHY_INTERFACE_MODE_2500BASEX:</div><div class='add'>+		mask = YT921X_SERDES_CTRL_PORTn(port);</div><div class='add'>+		res = yt921x_reg_set_bits(priv, YT921X_SERDES_CTRL, mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		mask = YT921X_XMII_CTRL_PORTn(port);</div><div class='add'>+		res = yt921x_reg_clear_bits(priv, YT921X_XMII_CTRL, mask);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		mask = YT921X_SERDES_MODE_M;</div><div class='add'>+		switch (interface) {</div><div class='add'>+		case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+			ctrl = YT921X_SERDES_MODE_SGMII;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_100BASEX:</div><div class='add'>+			ctrl = YT921X_SERDES_MODE_100BASEX;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+			ctrl = YT921X_SERDES_MODE_1000BASEX;</div><div class='add'>+			break;</div><div class='add'>+		case PHY_INTERFACE_MODE_2500BASEX:</div><div class='add'>+			ctrl = YT921X_SERDES_MODE_2500BASEX;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		res = yt921x_reg_update_bits(priv, YT921X_SERDESn(port),</div><div class='add'>+					     mask, ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	/* add XMII support here */</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_phylink_mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			     phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(dp-&gt;ds);</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* No need to sync; port control block is hold until device remove */</div><div class='add'>+	cancel_delayed_work(&amp;priv-&gt;ports[port].mib_read);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_port_down(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev, "Failed to %s port %d: %i\n", "bring down",</div><div class='add'>+			port, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_phylink_mac_link_up(struct phylink_config *config,</div><div class='add'>+			   struct phy_device *phydev, unsigned int mode,</div><div class='add'>+			   phy_interface_t interface, int speed, int duplex,</div><div class='add'>+			   bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(dp-&gt;ds);</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_port_up(priv, port, mode, interface, speed, duplex,</div><div class='add'>+			     tx_pause, rx_pause);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev, "Failed to %s port %d: %i\n", "bring up",</div><div class='add'>+			port, res);</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;priv-&gt;ports[port].mib_read, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_phylink_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			  const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dsa_port *dp = dsa_phylink_to_port(config);</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(dp-&gt;ds);</div><div class='add'>+	int port = dp-&gt;index;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_port_config(priv, port, mode, state-&gt;interface);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		dev_err(dp-&gt;ds-&gt;dev, "Failed to %s port %d: %i\n", "config",</div><div class='add'>+			port, res);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+yt921x_dsa_phylink_get_caps(struct dsa_switch *ds, int port,</div><div class='add'>+			    struct phylink_config *config)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	const struct yt921x_info *info = priv-&gt;info;</div><div class='add'>+</div><div class='add'>+	config-&gt;mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |</div><div class='add'>+				   MAC_10 | MAC_100 | MAC_1000;</div><div class='add'>+</div><div class='add'>+	if (info-&gt;internal_mask &amp; BIT(port)) {</div><div class='add'>+		/* Port 10 for MCU should probably go here too. But since that</div><div class='add'>+		 * is untested yet, turn it down for the moment by letting it</div><div class='add'>+		 * fall to the default branch.</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_INTERNAL,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+	} else if (info-&gt;external_mask &amp; BIT(port)) {</div><div class='add'>+		/* TODO: external ports may support SERDES only, XMII only, or</div><div class='add'>+		 * SERDES + XMII depending on the chip. However, we can't get</div><div class='add'>+		 * the accurate config table due to lack of document, thus</div><div class='add'>+		 * we simply declare SERDES + XMII and rely on the correctness</div><div class='add'>+		 * of devicetree for now.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* SERDES */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		/* REVSGMII (SGMII in PHY role) should go here, once</div><div class='add'>+		 * PHY_INTERFACE_MODE_REVSGMII is introduced.</div><div class='add'>+		 */</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_100BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_2500BASEX,</div><div class='add'>+			  config-&gt;supported_interfaces);</div><div class='add'>+		config-&gt;mac_capabilities |= MAC_2500FD;</div><div class='add'>+</div><div class='add'>+		/* XMII */</div><div class='add'>+</div><div class='add'>+		/* Not tested. To add support for XMII:</div><div class='add'>+		 *   - Add proper interface modes below</div><div class='add'>+		 *   - Handle them in yt921x_port_config()</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+	/* no such port: empty supported_interfaces causes phylink to turn it</div><div class='add'>+	 * down</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_port_setup(struct yt921x_priv *priv, int port)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_userport_standalone(priv, port);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	if (dsa_is_cpu_port(ds, port)) {</div><div class='add'>+		/* Egress of CPU port is supposed to be completely controlled</div><div class='add'>+		 * via tagging, so set to oneway isolated (drop all packets</div><div class='add'>+		 * without tag).</div><div class='add'>+		 */</div><div class='add'>+		ctrl = ~(u32)0;</div><div class='add'>+		res = yt921x_reg_write(priv, YT921X_PORTn_ISOLATION(port),</div><div class='add'>+				       ctrl);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		/* To simplify FDB "isolation" simulation, we also disable</div><div class='add'>+		 * learning on the CPU port, and let software identify packets</div><div class='add'>+		 * towarding CPU (either trapped or a static FDB entry is</div><div class='add'>+		 * matched, no matter which bridge that entry is for), which is</div><div class='add'>+		 * already done by yt921x_userport_standalone(). As a result,</div><div class='add'>+		 * VLAN-awareness becomes unrelated on the CPU port (set to</div><div class='add'>+		 * VLAN-unaware by the way).</div><div class='add'>+		 */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dsa_tag_protocol</div><div class='add'>+yt921x_dsa_get_tag_protocol(struct dsa_switch *ds, int port,</div><div class='add'>+			    enum dsa_tag_protocol m)</div><div class='add'>+{</div><div class='add'>+	return DSA_TAG_PROTO_YT921X;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_dsa_port_setup(struct dsa_switch *ds, int port)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_port_setup(priv, port);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_edata_wait(struct yt921x_priv *priv, u32 *valp)</div><div class='add'>+{</div><div class='add'>+	u32 val = YT921X_EDATA_DATA_IDLE;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_wait(priv, YT921X_EDATA_DATA,</div><div class='add'>+			      YT921X_EDATA_DATA_STATUS_M, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	*valp = val;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+yt921x_edata_read_cont(struct yt921x_priv *priv, u8 addr, u8 *valp)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_EDATA_CTRL_ADDR(addr) | YT921X_EDATA_CTRL_READ;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_EDATA_CTRL, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_edata_wait(priv, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	*valp = FIELD_GET(YT921X_EDATA_DATA_DATA_M, val);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_edata_read(struct yt921x_priv *priv, u8 addr, u8 *valp)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_edata_wait(priv, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	return yt921x_edata_read_cont(priv, addr, valp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_chip_detect(struct yt921x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	const struct yt921x_info *info;</div><div class='add'>+	u8 extmode;</div><div class='add'>+	u32 chipid;</div><div class='add'>+	u32 major;</div><div class='add'>+	u32 mode;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_CHIP_ID, &amp;chipid);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	major = FIELD_GET(YT921X_CHIP_ID_MAJOR, chipid);</div><div class='add'>+</div><div class='add'>+	for (info = yt921x_infos; info-&gt;name; info++)</div><div class='add'>+		if (info-&gt;major == major)</div><div class='add'>+			break;</div><div class='add'>+	if (!info-&gt;name) {</div><div class='add'>+		dev_err(dev, "Unexpected chipid 0x%x\n", chipid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_CHIP_MODE, &amp;mode);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_edata_read(priv, YT921X_EDATA_EXTMODE, &amp;extmode);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	for (; info-&gt;name; info++)</div><div class='add'>+		if (info-&gt;major == major &amp;&amp; info-&gt;mode == mode &amp;&amp;</div><div class='add'>+		    info-&gt;extmode == extmode)</div><div class='add'>+			break;</div><div class='add'>+	if (!info-&gt;name) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"Unsupported chipid 0x%x with chipmode 0x%x 0x%x\n",</div><div class='add'>+			chipid, mode, extmode);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Print chipid here since we are interested in lower 16 bits */</div><div class='add'>+	dev_info(dev,</div><div class='add'>+		 "Motorcomm %s ethernet switch, chipid: 0x%x, chipmode: 0x%x 0x%x\n",</div><div class='add'>+		 info-&gt;name, chipid, mode, extmode);</div><div class='add'>+</div><div class='add'>+	priv-&gt;info = info;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_chip_reset(struct yt921x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	u16 eth_p_tag;</div><div class='add'>+	u32 val;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	res = yt921x_chip_detect(priv);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Reset */</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_RST, YT921X_RST_HW);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* RST_HW is almost same as GPIO hard reset, so we need this delay. */</div><div class='add'>+	fsleep(YT921X_RST_DELAY_US);</div><div class='add'>+</div><div class='add'>+	val = 0;</div><div class='add'>+	res = yt921x_reg_wait(priv, YT921X_RST, ~0, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Check for tag EtherType; do it after reset in case you messed it up</div><div class='add'>+	 * before.</div><div class='add'>+	 */</div><div class='add'>+	res = yt921x_reg_read(priv, YT921X_CPU_TAG_TPID, &amp;val);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	eth_p_tag = FIELD_GET(YT921X_CPU_TAG_TPID_TPID_M, val);</div><div class='add'>+	if (eth_p_tag != ETH_P_YT921X) {</div><div class='add'>+		dev_err(dev, "Tag type 0x%x != 0x%x\n", eth_p_tag,</div><div class='add'>+			ETH_P_YT921X);</div><div class='add'>+		/* Despite being possible, we choose not to set CPU_TAG_TPID,</div><div class='add'>+		 * since there is no way it can be different unless you have the</div><div class='add'>+		 * wrong chip.</div><div class='add'>+		 */</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_chip_setup(struct yt921x_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dsa_switch *ds = &amp;priv-&gt;ds;</div><div class='add'>+	unsigned long cpu_ports_mask;</div><div class='add'>+	u64 ctrl64;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	int port;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	/* Enable DSA */</div><div class='add'>+	priv-&gt;cpu_ports_mask = dsa_cpu_ports(ds);</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_EXT_CPU_PORT_TAG_EN | YT921X_EXT_CPU_PORT_PORT_EN |</div><div class='add'>+	       YT921X_EXT_CPU_PORT_PORT(__ffs(priv-&gt;cpu_ports_mask));</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_EXT_CPU_PORT, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Enable and clear MIB */</div><div class='add'>+	res = yt921x_reg_set_bits(priv, YT921X_FUNC, YT921X_FUNC_MIB);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = YT921X_MIB_CTRL_CLEAN | YT921X_MIB_CTRL_ALL_PORT;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_MIB_CTRL, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Setup software switch */</div><div class='add'>+	ctrl = YT921X_CPU_COPY_TO_EXT_CPU;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_CPU_COPY, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	ctrl = GENMASK(10, 0);</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FILTER_UNK_UCAST, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_FILTER_UNK_MCAST, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* YT921x does not support native DSA port bridging, so we use port</div><div class='add'>+	 * isolation to emulate it. However, be especially careful that port</div><div class='add'>+	 * isolation takes _after_ FDB lookups, i.e. if an FDB entry (from</div><div class='add'>+	 * another bridge) is matched and the destination port (in another</div><div class='add'>+	 * bridge) is blocked, the packet will be dropped instead of flooding to</div><div class='add'>+	 * the "bridged" ports, thus we need to trap and handle those packets by</div><div class='add'>+	 * software.</div><div class='add'>+	 *</div><div class='add'>+	 * If there is no more than one bridge, we might be able to drop them</div><div class='add'>+	 * directly given some conditions are met, but we trap them in all cases</div><div class='add'>+	 * for now.</div><div class='add'>+	 */</div><div class='add'>+	ctrl = 0;</div><div class='add'>+	for (int i = 0; i &lt; YT921X_PORT_NUM; i++)</div><div class='add'>+		ctrl |= YT921X_ACT_UNK_ACTn_TRAP(i);</div><div class='add'>+	/* Except for CPU ports, if any packets are sent via CPU ports without</div><div class='add'>+	 * tag, they should be dropped.</div><div class='add'>+	 */</div><div class='add'>+	cpu_ports_mask = priv-&gt;cpu_ports_mask;</div><div class='add'>+	for_each_set_bit(port, &amp;cpu_ports_mask, YT921X_PORT_NUM) {</div><div class='add'>+		ctrl &amp;= ~YT921X_ACT_UNK_ACTn_M(port);</div><div class='add'>+		ctrl |= YT921X_ACT_UNK_ACTn_DROP(port);</div><div class='add'>+	}</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_ACT_UNK_UCAST, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+	res = yt921x_reg_write(priv, YT921X_ACT_UNK_MCAST, ctrl);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Tagged VID 0 should be treated as untagged, which confuses the</div><div class='add'>+	 * hardware a lot</div><div class='add'>+	 */</div><div class='add'>+	ctrl64 = YT921X_VLAN_CTRL_LEARN_DIS | YT921X_VLAN_CTRL_PORTS_M;</div><div class='add'>+	res = yt921x_reg64_write(priv, YT921X_VLANn_CTRL(0), ctrl64);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Miscellaneous */</div><div class='add'>+	res = yt921x_reg_set_bits(priv, YT921X_SENSOR, YT921X_SENSOR_TEMP);</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_dsa_setup(struct dsa_switch *ds)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = to_yt921x_priv(ds);</div><div class='add'>+	struct device *dev = to_device(priv);</div><div class='add'>+	struct device_node *np = dev-&gt;of_node;</div><div class='add'>+	struct device_node *child;</div><div class='add'>+	int res;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_chip_reset(priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	/* Register the internal mdio bus. Nodes for internal ports should have</div><div class='add'>+	 * proper phy-handle pointing to their PHYs. Not enabling the internal</div><div class='add'>+	 * bus is possible, though pretty wired, if internal ports are not used.</div><div class='add'>+	 */</div><div class='add'>+	child = of_get_child_by_name(np, "mdio");</div><div class='add'>+	if (child) {</div><div class='add'>+		res = yt921x_mbus_int_init(priv, child);</div><div class='add'>+		of_node_put(child);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* External mdio bus is optional */</div><div class='add'>+	child = of_get_child_by_name(np, "mdio-external");</div><div class='add'>+	if (child) {</div><div class='add'>+		res = yt921x_mbus_ext_init(priv, child);</div><div class='add'>+		of_node_put(child);</div><div class='add'>+		if (res)</div><div class='add'>+			return res;</div><div class='add'>+</div><div class='add'>+		dev_err(dev, "Untested external mdio bus\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;reg_lock);</div><div class='add'>+	res = yt921x_chip_setup(priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	if (res)</div><div class='add'>+		return res;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops yt921x_phylink_mac_ops = {</div><div class='add'>+	.mac_link_down	= yt921x_phylink_mac_link_down,</div><div class='add'>+	.mac_link_up	= yt921x_phylink_mac_link_up,</div><div class='add'>+	.mac_config	= yt921x_phylink_mac_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct dsa_switch_ops yt921x_dsa_switch_ops = {</div><div class='add'>+	/* mib */</div><div class='add'>+	.get_strings		= yt921x_dsa_get_strings,</div><div class='add'>+	.get_ethtool_stats	= yt921x_dsa_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= yt921x_dsa_get_sset_count,</div><div class='add'>+	.get_eth_mac_stats	= yt921x_dsa_get_eth_mac_stats,</div><div class='add'>+	.get_eth_ctrl_stats	= yt921x_dsa_get_eth_ctrl_stats,</div><div class='add'>+	.get_rmon_stats		= yt921x_dsa_get_rmon_stats,</div><div class='add'>+	.get_stats64		= yt921x_dsa_get_stats64,</div><div class='add'>+	.get_pause_stats	= yt921x_dsa_get_pause_stats,</div><div class='add'>+	/* eee */</div><div class='add'>+	.support_eee		= dsa_supports_eee,</div><div class='add'>+	.set_mac_eee		= yt921x_dsa_set_mac_eee,</div><div class='add'>+	/* mtu */</div><div class='add'>+	.port_change_mtu	= yt921x_dsa_port_change_mtu,</div><div class='add'>+	.port_max_mtu		= yt921x_dsa_port_max_mtu,</div><div class='add'>+	/* hsr */</div><div class='add'>+	.port_hsr_leave		= dsa_port_simple_hsr_leave,</div><div class='add'>+	.port_hsr_join		= dsa_port_simple_hsr_join,</div><div class='add'>+	/* mirror */</div><div class='add'>+	.port_mirror_del	= yt921x_dsa_port_mirror_del,</div><div class='add'>+	.port_mirror_add	= yt921x_dsa_port_mirror_add,</div><div class='add'>+	/* fdb */</div><div class='add'>+	.port_fdb_dump		= yt921x_dsa_port_fdb_dump,</div><div class='add'>+	.port_fast_age		= yt921x_dsa_port_fast_age,</div><div class='add'>+	.set_ageing_time	= yt921x_dsa_set_ageing_time,</div><div class='add'>+	.port_fdb_del		= yt921x_dsa_port_fdb_del,</div><div class='add'>+	.port_fdb_add		= yt921x_dsa_port_fdb_add,</div><div class='add'>+	.port_mdb_del		= yt921x_dsa_port_mdb_del,</div><div class='add'>+	.port_mdb_add		= yt921x_dsa_port_mdb_add,</div><div class='add'>+	/* vlan */</div><div class='add'>+	.port_vlan_filtering	= yt921x_dsa_port_vlan_filtering,</div><div class='add'>+	.port_vlan_del		= yt921x_dsa_port_vlan_del,</div><div class='add'>+	.port_vlan_add		= yt921x_dsa_port_vlan_add,</div><div class='add'>+	/* bridge */</div><div class='add'>+	.port_pre_bridge_flags	= yt921x_dsa_port_pre_bridge_flags,</div><div class='add'>+	.port_bridge_flags	= yt921x_dsa_port_bridge_flags,</div><div class='add'>+	.port_bridge_leave	= yt921x_dsa_port_bridge_leave,</div><div class='add'>+	.port_bridge_join	= yt921x_dsa_port_bridge_join,</div><div class='add'>+	/* mst */</div><div class='add'>+	.port_mst_state_set	= yt921x_dsa_port_mst_state_set,</div><div class='add'>+	.vlan_msti_set		= yt921x_dsa_vlan_msti_set,</div><div class='add'>+	.port_stp_state_set	= yt921x_dsa_port_stp_state_set,</div><div class='add'>+	/* port */</div><div class='add'>+	.get_tag_protocol	= yt921x_dsa_get_tag_protocol,</div><div class='add'>+	.phylink_get_caps	= yt921x_dsa_phylink_get_caps,</div><div class='add'>+	.port_setup		= yt921x_dsa_port_setup,</div><div class='add'>+	/* chip */</div><div class='add'>+	.setup			= yt921x_dsa_setup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void yt921x_mdio_shutdown(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = mdiodev_get_drvdata(mdiodev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dsa_switch_shutdown(&amp;priv-&gt;ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void yt921x_mdio_remove(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct yt921x_priv *priv = mdiodev_get_drvdata(mdiodev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (size_t i = ARRAY_SIZE(priv-&gt;ports); i-- &gt; 0; ) {</div><div class='add'>+		struct yt921x_port *pp = &amp;priv-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		disable_delayed_work_sync(&amp;pp-&gt;mib_read);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dsa_unregister_switch(&amp;priv-&gt;ds);</div><div class='add'>+</div><div class='add'>+	mutex_destroy(&amp;priv-&gt;reg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int yt921x_mdio_probe(struct mdio_device *mdiodev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;mdiodev-&gt;dev;</div><div class='add'>+	struct yt921x_reg_mdio *mdio;</div><div class='add'>+	struct yt921x_priv *priv;</div><div class='add'>+	struct dsa_switch *ds;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mdio = devm_kzalloc(dev, sizeof(*mdio), GFP_KERNEL);</div><div class='add'>+	if (!mdio)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mdio-&gt;bus = mdiodev-&gt;bus;</div><div class='add'>+	mdio-&gt;addr = mdiodev-&gt;addr;</div><div class='add'>+	mdio-&gt;switchid = 0;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	priv-&gt;reg_ops = &amp;yt921x_reg_ops_mdio;</div><div class='add'>+	priv-&gt;reg_ctx = mdio;</div><div class='add'>+</div><div class='add'>+	for (size_t i = 0; i &lt; ARRAY_SIZE(priv-&gt;ports); i++) {</div><div class='add'>+		struct yt921x_port *pp = &amp;priv-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		pp-&gt;index = i;</div><div class='add'>+		INIT_DELAYED_WORK(&amp;pp-&gt;mib_read, yt921x_poll_mib);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ds = &amp;priv-&gt;ds;</div><div class='add'>+	ds-&gt;dev = dev;</div><div class='add'>+	ds-&gt;assisted_learning_on_cpu_port = true;</div><div class='add'>+	ds-&gt;priv = priv;</div><div class='add'>+	ds-&gt;ops = &amp;yt921x_dsa_switch_ops;</div><div class='add'>+	ds-&gt;ageing_time_min = 1 * 5000;</div><div class='add'>+	ds-&gt;ageing_time_max = U16_MAX * 5000;</div><div class='add'>+	ds-&gt;phylink_mac_ops = &amp;yt921x_phylink_mac_ops;</div><div class='add'>+	ds-&gt;num_ports = YT921X_PORT_NUM;</div><div class='add'>+</div><div class='add'>+	mdiodev_set_drvdata(mdiodev, priv);</div><div class='add'>+</div><div class='add'>+	return dsa_register_switch(ds);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id yt921x_of_match[] = {</div><div class='add'>+	{ .compatible = "motorcomm,yt9215" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, yt921x_of_match);</div><div class='add'>+</div><div class='add'>+static struct mdio_driver yt921x_mdio_driver = {</div><div class='add'>+	.probe = yt921x_mdio_probe,</div><div class='add'>+	.remove = yt921x_mdio_remove,</div><div class='add'>+	.shutdown = yt921x_mdio_shutdown,</div><div class='add'>+	.mdiodrv.driver = {</div><div class='add'>+		.name = YT921X_NAME,</div><div class='add'>+		.of_match_table = yt921x_of_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+mdio_module_driver(yt921x_mdio_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("David Yang &lt;mmyangfl@gmail.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Driver for Motorcomm YT921x Switch");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h<br/>new file mode 100644<br/>index 000000000000..61bb0ab3b09a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dsa/yt921x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dsa/yt921x.h</a></div><div class='hunk'>@@ -0,0 +1,567 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 David Yang</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __YT921X_H</div><div class='add'>+#define __YT921X_H</div><div class='add'>+</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#define YT921X_SMI_SWITCHID_M		GENMASK(3, 2)</div><div class='add'>+#define  YT921X_SMI_SWITCHID(x)			FIELD_PREP(YT921X_SMI_SWITCHID_M, (x))</div><div class='add'>+#define YT921X_SMI_AD			BIT(1)</div><div class='add'>+#define  YT921X_SMI_ADDR			0</div><div class='add'>+#define  YT921X_SMI_DATA			YT921X_SMI_AD</div><div class='add'>+#define YT921X_SMI_RW			BIT(0)</div><div class='add'>+#define  YT921X_SMI_WRITE			0</div><div class='add'>+#define  YT921X_SMI_READ			YT921X_SMI_RW</div><div class='add'>+</div><div class='add'>+#define YT921X_SWITCHID_NUM		4</div><div class='add'>+</div><div class='add'>+#define YT921X_RST			0x80000</div><div class='add'>+#define  YT921X_RST_HW				BIT(31)</div><div class='add'>+#define  YT921X_RST_SW				BIT(1)</div><div class='add'>+#define YT921X_FUNC			0x80004</div><div class='add'>+#define  YT921X_FUNC_MIB			BIT(1)</div><div class='add'>+#define YT921X_CHIP_ID			0x80008</div><div class='add'>+#define  YT921X_CHIP_ID_MAJOR			GENMASK(31, 16)</div><div class='add'>+#define YT921X_EXT_CPU_PORT		0x8000c</div><div class='add'>+#define  YT921X_EXT_CPU_PORT_TAG_EN		BIT(15)</div><div class='add'>+#define  YT921X_EXT_CPU_PORT_PORT_EN		BIT(14)</div><div class='add'>+#define  YT921X_EXT_CPU_PORT_PORT_M		GENMASK(3, 0)</div><div class='add'>+#define   YT921X_EXT_CPU_PORT_PORT(x)			FIELD_PREP(YT921X_EXT_CPU_PORT_PORT_M, (x))</div><div class='add'>+#define YT921X_CPU_TAG_TPID		0x80010</div><div class='add'>+#define  YT921X_CPU_TAG_TPID_TPID_M		GENMASK(15, 0)</div><div class='add'>+/* Same as ETH_P_YT921X, but this represents the true HW default, while the</div><div class='add'>+ * former is a local convention chosen by us.</div><div class='add'>+ */</div><div class='add'>+#define   YT921X_CPU_TAG_TPID_TPID_DEFAULT		0x9988</div><div class='add'>+#define YT921X_PVID_SEL			0x80014</div><div class='add'>+#define  YT921X_PVID_SEL_SVID_PORTn(port)	BIT(port)</div><div class='add'>+#define YT921X_SERDES_CTRL		0x80028</div><div class='add'>+#define  YT921X_SERDES_CTRL_PORTn_TEST(port)	BIT((port) - 3)</div><div class='add'>+#define  YT921X_SERDES_CTRL_PORTn(port)		BIT((port) - 8)</div><div class='add'>+#define YT921X_IO_LEVEL			0x80030</div><div class='add'>+#define  YT9215_IO_LEVEL_NORMAL_M		GENMASK(5, 4)</div><div class='add'>+#define   YT9215_IO_LEVEL_NORMAL(x)			FIELD_PREP(YT9215_IO_LEVEL_NORMAL_M, (x))</div><div class='add'>+#define   YT9215_IO_LEVEL_NORMAL_3V3			YT9215_IO_LEVEL_NORMAL(0)</div><div class='add'>+#define   YT9215_IO_LEVEL_NORMAL_1V8			YT9215_IO_LEVEL_NORMAL(3)</div><div class='add'>+#define  YT9215_IO_LEVEL_RGMII1_M		GENMASK(3, 2)</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII1(x)			FIELD_PREP(YT9215_IO_LEVEL_RGMII1_M, (x))</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII1_3V3			YT9215_IO_LEVEL_RGMII1(0)</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII1_2V5			YT9215_IO_LEVEL_RGMII1(1)</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII1_1V8			YT9215_IO_LEVEL_RGMII1(2)</div><div class='add'>+#define  YT9215_IO_LEVEL_RGMII0_M		GENMASK(1, 0)</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII0(x)			FIELD_PREP(YT9215_IO_LEVEL_RGMII0_M, (x))</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII0_3V3			YT9215_IO_LEVEL_RGMII0(0)</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII0_2V5			YT9215_IO_LEVEL_RGMII0(1)</div><div class='add'>+#define   YT9215_IO_LEVEL_RGMII0_1V8			YT9215_IO_LEVEL_RGMII0(2)</div><div class='add'>+#define  YT9218_IO_LEVEL_RGMII1_M		GENMASK(5, 4)</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII1(x)			FIELD_PREP(YT9218_IO_LEVEL_RGMII1_M, (x))</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII1_3V3			YT9218_IO_LEVEL_RGMII1(0)</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII1_2V5			YT9218_IO_LEVEL_RGMII1(1)</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII1_1V8			YT9218_IO_LEVEL_RGMII1(2)</div><div class='add'>+#define  YT9218_IO_LEVEL_RGMII0_M		GENMASK(3, 2)</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII0(x)			FIELD_PREP(YT9218_IO_LEVEL_RGMII0_M, (x))</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII0_3V3			YT9218_IO_LEVEL_RGMII0(0)</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII0_2V5			YT9218_IO_LEVEL_RGMII0(1)</div><div class='add'>+#define   YT9218_IO_LEVEL_RGMII0_1V8			YT9218_IO_LEVEL_RGMII0(2)</div><div class='add'>+#define  YT9218_IO_LEVEL_NORMAL_M		GENMASK(1, 0)</div><div class='add'>+#define   YT9218_IO_LEVEL_NORMAL(x)			FIELD_PREP(YT9218_IO_LEVEL_NORMAL_M, (x))</div><div class='add'>+#define   YT9218_IO_LEVEL_NORMAL_3V3			YT9218_IO_LEVEL_NORMAL(0)</div><div class='add'>+#define   YT9218_IO_LEVEL_NORMAL_1V8			YT9218_IO_LEVEL_NORMAL(3)</div><div class='add'>+#define YT921X_MAC_ADDR_HI2		0x80080</div><div class='add'>+#define YT921X_MAC_ADDR_LO4		0x80084</div><div class='add'>+#define YT921X_SERDESn(port)		(0x8008c + 4 * ((port) - 8))</div><div class='add'>+#define  YT921X_SERDES_MODE_M			GENMASK(9, 7)</div><div class='add'>+#define   YT921X_SERDES_MODE(x)				FIELD_PREP(YT921X_SERDES_MODE_M, (x))</div><div class='add'>+#define   YT921X_SERDES_MODE_SGMII			YT921X_SERDES_MODE(0)</div><div class='add'>+#define   YT921X_SERDES_MODE_REVSGMII			YT921X_SERDES_MODE(1)</div><div class='add'>+#define   YT921X_SERDES_MODE_1000BASEX			YT921X_SERDES_MODE(2)</div><div class='add'>+#define   YT921X_SERDES_MODE_100BASEX			YT921X_SERDES_MODE(3)</div><div class='add'>+#define   YT921X_SERDES_MODE_2500BASEX			YT921X_SERDES_MODE(4)</div><div class='add'>+#define  YT921X_SERDES_RX_PAUSE			BIT(6)</div><div class='add'>+#define  YT921X_SERDES_TX_PAUSE			BIT(5)</div><div class='add'>+#define  YT921X_SERDES_LINK			BIT(4)  /* force link */</div><div class='add'>+#define  YT921X_SERDES_DUPLEX_FULL		BIT(3)</div><div class='add'>+#define  YT921X_SERDES_SPEED_M			GENMASK(2, 0)</div><div class='add'>+#define   YT921X_SERDES_SPEED(x)			FIELD_PREP(YT921X_SERDES_SPEED_M, (x))</div><div class='add'>+#define   YT921X_SERDES_SPEED_10			YT921X_SERDES_SPEED(0)</div><div class='add'>+#define   YT921X_SERDES_SPEED_100			YT921X_SERDES_SPEED(1)</div><div class='add'>+#define   YT921X_SERDES_SPEED_1000			YT921X_SERDES_SPEED(2)</div><div class='add'>+#define   YT921X_SERDES_SPEED_10000			YT921X_SERDES_SPEED(3)</div><div class='add'>+#define   YT921X_SERDES_SPEED_2500			YT921X_SERDES_SPEED(4)</div><div class='add'>+#define YT921X_PORTn_CTRL(port)		(0x80100 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_CTRL_PAUSE_AN		BIT(10)</div><div class='add'>+#define YT921X_PORTn_STATUS(port)	(0x80200 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_LINK			BIT(9)  /* CTRL: auto negotiation */</div><div class='add'>+#define  YT921X_PORT_HALF_PAUSE			BIT(8)  /* Half-duplex back pressure mode */</div><div class='add'>+#define  YT921X_PORT_DUPLEX_FULL		BIT(7)</div><div class='add'>+#define  YT921X_PORT_RX_PAUSE			BIT(6)</div><div class='add'>+#define  YT921X_PORT_TX_PAUSE			BIT(5)</div><div class='add'>+#define  YT921X_PORT_RX_MAC_EN			BIT(4)</div><div class='add'>+#define  YT921X_PORT_TX_MAC_EN			BIT(3)</div><div class='add'>+#define  YT921X_PORT_SPEED_M			GENMASK(2, 0)</div><div class='add'>+#define   YT921X_PORT_SPEED(x)				FIELD_PREP(YT921X_PORT_SPEED_M, (x))</div><div class='add'>+#define   YT921X_PORT_SPEED_10				YT921X_PORT_SPEED(0)</div><div class='add'>+#define   YT921X_PORT_SPEED_100				YT921X_PORT_SPEED(1)</div><div class='add'>+#define   YT921X_PORT_SPEED_1000			YT921X_PORT_SPEED(2)</div><div class='add'>+#define   YT921X_PORT_SPEED_10000			YT921X_PORT_SPEED(3)</div><div class='add'>+#define   YT921X_PORT_SPEED_2500			YT921X_PORT_SPEED(4)</div><div class='add'>+#define YT921X_PON_STRAP_FUNC		0x80320</div><div class='add'>+#define YT921X_PON_STRAP_VAL		0x80324</div><div class='add'>+#define YT921X_PON_STRAP_CAP		0x80328</div><div class='add'>+#define  YT921X_PON_STRAP_EEE			BIT(16)</div><div class='add'>+#define  YT921X_PON_STRAP_LOOP_DETECT		BIT(7)</div><div class='add'>+#define YT921X_MDIO_POLLINGn(port)	(0x80364 + 4 * ((port) - 8))</div><div class='add'>+#define  YT921X_MDIO_POLLING_DUPLEX_FULL	BIT(4)</div><div class='add'>+#define  YT921X_MDIO_POLLING_LINK		BIT(3)</div><div class='add'>+#define  YT921X_MDIO_POLLING_SPEED_M		GENMASK(2, 0)</div><div class='add'>+#define   YT921X_MDIO_POLLING_SPEED(x)			FIELD_PREP(YT921X_MDIO_POLLING_SPEED_M, (x))</div><div class='add'>+#define   YT921X_MDIO_POLLING_SPEED_10			YT921X_MDIO_POLLING_SPEED(0)</div><div class='add'>+#define   YT921X_MDIO_POLLING_SPEED_100			YT921X_MDIO_POLLING_SPEED(1)</div><div class='add'>+#define   YT921X_MDIO_POLLING_SPEED_1000		YT921X_MDIO_POLLING_SPEED(2)</div><div class='add'>+#define   YT921X_MDIO_POLLING_SPEED_10000		YT921X_MDIO_POLLING_SPEED(3)</div><div class='add'>+#define   YT921X_MDIO_POLLING_SPEED_2500		YT921X_MDIO_POLLING_SPEED(4)</div><div class='add'>+#define YT921X_SENSOR			0x8036c</div><div class='add'>+#define  YT921X_SENSOR_TEMP			BIT(18)</div><div class='add'>+#define YT921X_TEMP			0x80374</div><div class='add'>+#define YT921X_CHIP_MODE		0x80388</div><div class='add'>+#define  YT921X_CHIP_MODE_MODE			GENMASK(1, 0)</div><div class='add'>+#define YT921X_XMII_CTRL		0x80394</div><div class='add'>+#define  YT921X_XMII_CTRL_PORTn(port)		BIT(9 - (port))  /* Yes, it's reversed */</div><div class='add'>+#define YT921X_XMIIn(port)		(0x80400 + 8 * ((port) - 8))</div><div class='add'>+#define  YT921X_XMII_MODE_M			GENMASK(31, 29)</div><div class='add'>+#define   YT921X_XMII_MODE(x)				FIELD_PREP(YT921X_XMII_MODE_M, (x))</div><div class='add'>+#define   YT921X_XMII_MODE_MII				YT921X_XMII_MODE(0)</div><div class='add'>+#define   YT921X_XMII_MODE_REVMII			YT921X_XMII_MODE(1)</div><div class='add'>+#define   YT921X_XMII_MODE_RMII				YT921X_XMII_MODE(2)</div><div class='add'>+#define   YT921X_XMII_MODE_REVRMII			YT921X_XMII_MODE(3)</div><div class='add'>+#define   YT921X_XMII_MODE_RGMII			YT921X_XMII_MODE(4)</div><div class='add'>+#define   YT921X_XMII_MODE_DISABLE			YT921X_XMII_MODE(5)</div><div class='add'>+#define  YT921X_XMII_LINK			BIT(19)  /* force link */</div><div class='add'>+#define  YT921X_XMII_EN				BIT(18)</div><div class='add'>+#define  YT921X_XMII_SOFT_RST			BIT(17)</div><div class='add'>+#define  YT921X_XMII_RGMII_TX_DELAY_150PS_M	GENMASK(16, 13)</div><div class='add'>+#define   YT921X_XMII_RGMII_TX_DELAY_150PS(x)		FIELD_PREP(YT921X_XMII_RGMII_TX_DELAY_150PS_M, (x))</div><div class='add'>+#define  YT921X_XMII_TX_CLK_IN			BIT(11)</div><div class='add'>+#define  YT921X_XMII_RX_CLK_IN			BIT(10)</div><div class='add'>+#define  YT921X_XMII_RGMII_TX_DELAY_2NS		BIT(8)</div><div class='add'>+#define  YT921X_XMII_RGMII_TX_CLK_OUT		BIT(7)</div><div class='add'>+#define  YT921X_XMII_RGMII_RX_DELAY_150PS_M	GENMASK(6, 3)</div><div class='add'>+#define   YT921X_XMII_RGMII_RX_DELAY_150PS(x)		FIELD_PREP(YT921X_XMII_RGMII_RX_DELAY_150PS_M, (x))</div><div class='add'>+#define  YT921X_XMII_RMII_PHY_TX_CLK_OUT	BIT(2)</div><div class='add'>+#define  YT921X_XMII_REVMII_TX_CLK_OUT		BIT(1)</div><div class='add'>+#define  YT921X_XMII_REVMII_RX_CLK_OUT		BIT(0)</div><div class='add'>+</div><div class='add'>+#define YT921X_MACn_FRAME(port)		(0x81008 + 0x1000 * (port))</div><div class='add'>+#define  YT921X_MAC_FRAME_SIZE_M		GENMASK(21, 8)</div><div class='add'>+#define   YT921X_MAC_FRAME_SIZE(x)			FIELD_PREP(YT921X_MAC_FRAME_SIZE_M, (x))</div><div class='add'>+</div><div class='add'>+#define YT921X_EEEn_VAL(port)		(0xa0000 + 0x40 * (port))</div><div class='add'>+#define  YT921X_EEE_VAL_DATA			BIT(1)</div><div class='add'>+</div><div class='add'>+#define YT921X_EEE_CTRL			0xb0000</div><div class='add'>+#define  YT921X_EEE_CTRL_ENn(port)		BIT(port)</div><div class='add'>+</div><div class='add'>+#define YT921X_MIB_CTRL			0xc0004</div><div class='add'>+#define  YT921X_MIB_CTRL_CLEAN			BIT(30)</div><div class='add'>+#define  YT921X_MIB_CTRL_PORT_M			GENMASK(6, 3)</div><div class='add'>+#define   YT921X_MIB_CTRL_PORT(x)			FIELD_PREP(YT921X_MIB_CTRL_PORT_M, (x))</div><div class='add'>+#define  YT921X_MIB_CTRL_ONE_PORT		BIT(1)</div><div class='add'>+#define  YT921X_MIB_CTRL_ALL_PORT		BIT(0)</div><div class='add'>+#define YT921X_MIBn_DATA0(port)		(0xc0100 + 0x100 * (port))</div><div class='add'>+#define YT921X_MIBn_DATAm(port, x)	(YT921X_MIBn_DATA0(port) + 4 * (x))</div><div class='add'>+#define  YT921X_MIB_DATA_RX_BROADCAST		0x00</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PAUSE		0x04</div><div class='add'>+#define  YT921X_MIB_DATA_RX_MULTICAST		0x08</div><div class='add'>+#define  YT921X_MIB_DATA_RX_CRC_ERR		0x0c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_RX_ALIGN_ERR		0x10</div><div class='add'>+#define  YT921X_MIB_DATA_RX_UNDERSIZE_ERR	0x14</div><div class='add'>+#define  YT921X_MIB_DATA_RX_FRAG_ERR		0x18</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_64		0x1c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_65_TO_127	0x20</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_128_TO_255	0x24</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_256_TO_511	0x28</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_512_TO_1023	0x2c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_1024_TO_1518	0x30</div><div class='add'>+#define  YT921X_MIB_DATA_RX_PKT_SZ_1519_TO_MAX	0x34</div><div class='add'>+/* 0x38: unused */</div><div class='add'>+#define  YT921X_MIB_DATA_RX_GOOD_BYTES		0x3c</div><div class='add'>+</div><div class='add'>+/* 0x40: 64 bytes */</div><div class='add'>+#define  YT921X_MIB_DATA_RX_BAD_BYTES		0x44</div><div class='add'>+/* 0x48: 64 bytes */</div><div class='add'>+#define  YT921X_MIB_DATA_RX_OVERSIZE_ERR	0x4c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_RX_DROPPED		0x50</div><div class='add'>+#define  YT921X_MIB_DATA_TX_BROADCAST		0x54</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PAUSE		0x58</div><div class='add'>+#define  YT921X_MIB_DATA_TX_MULTICAST		0x5c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_TX_UNDERSIZE_ERR	0x60</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_64		0x64</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_65_TO_127	0x68</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_128_TO_255	0x6c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_256_TO_511	0x70</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_512_TO_1023	0x74</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_1024_TO_1518	0x78</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT_SZ_1519_TO_MAX	0x7c</div><div class='add'>+</div><div class='add'>+/* 0x80: unused */</div><div class='add'>+#define  YT921X_MIB_DATA_TX_GOOD_BYTES		0x84</div><div class='add'>+/* 0x88: 64 bytes */</div><div class='add'>+#define  YT921X_MIB_DATA_TX_COLLISION		0x8c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_TX_EXCESSIVE_COLLISION	0x90</div><div class='add'>+#define  YT921X_MIB_DATA_TX_MULTIPLE_COLLISION	0x94</div><div class='add'>+#define  YT921X_MIB_DATA_TX_SINGLE_COLLISION	0x98</div><div class='add'>+#define  YT921X_MIB_DATA_TX_PKT			0x9c</div><div class='add'>+</div><div class='add'>+#define  YT921X_MIB_DATA_TX_DEFERRED		0xa0</div><div class='add'>+#define  YT921X_MIB_DATA_TX_LATE_COLLISION	0xa4</div><div class='add'>+#define  YT921X_MIB_DATA_RX_OAM			0xa8</div><div class='add'>+#define  YT921X_MIB_DATA_TX_OAM			0xac</div><div class='add'>+</div><div class='add'>+#define YT921X_EDATA_CTRL		0xe0000</div><div class='add'>+#define  YT921X_EDATA_CTRL_ADDR_M		GENMASK(15, 8)</div><div class='add'>+#define   YT921X_EDATA_CTRL_ADDR(x)			FIELD_PREP(YT921X_EDATA_CTRL_ADDR_M, (x))</div><div class='add'>+#define  YT921X_EDATA_CTRL_OP_M			GENMASK(3, 0)</div><div class='add'>+#define   YT921X_EDATA_CTRL_OP(x)			FIELD_PREP(YT921X_EDATA_CTRL_OP_M, (x))</div><div class='add'>+#define   YT921X_EDATA_CTRL_READ			YT921X_EDATA_CTRL_OP(5)</div><div class='add'>+#define YT921X_EDATA_DATA		0xe0004</div><div class='add'>+#define  YT921X_EDATA_DATA_DATA_M			GENMASK(31, 24)</div><div class='add'>+#define  YT921X_EDATA_DATA_STATUS_M		GENMASK(3, 0)</div><div class='add'>+#define   YT921X_EDATA_DATA_STATUS(x)			FIELD_PREP(YT921X_EDATA_DATA_STATUS_M, (x))</div><div class='add'>+#define   YT921X_EDATA_DATA_IDLE			YT921X_EDATA_DATA_STATUS(3)</div><div class='add'>+</div><div class='add'>+#define YT921X_EXT_MBUS_OP		0x6a000</div><div class='add'>+#define YT921X_INT_MBUS_OP		0xf0000</div><div class='add'>+#define  YT921X_MBUS_OP_START			BIT(0)</div><div class='add'>+#define YT921X_EXT_MBUS_CTRL		0x6a004</div><div class='add'>+#define YT921X_INT_MBUS_CTRL		0xf0004</div><div class='add'>+#define  YT921X_MBUS_CTRL_PORT_M		GENMASK(25, 21)</div><div class='add'>+#define   YT921X_MBUS_CTRL_PORT(x)			FIELD_PREP(YT921X_MBUS_CTRL_PORT_M, (x))</div><div class='add'>+#define  YT921X_MBUS_CTRL_REG_M			GENMASK(20, 16)</div><div class='add'>+#define   YT921X_MBUS_CTRL_REG(x)			FIELD_PREP(YT921X_MBUS_CTRL_REG_M, (x))</div><div class='add'>+#define  YT921X_MBUS_CTRL_TYPE_M		GENMASK(11, 8)  /* wild guess */</div><div class='add'>+#define   YT921X_MBUS_CTRL_TYPE(x)			FIELD_PREP(YT921X_MBUS_CTRL_TYPE_M, (x))</div><div class='add'>+#define   YT921X_MBUS_CTRL_TYPE_C22			YT921X_MBUS_CTRL_TYPE(4)</div><div class='add'>+#define  YT921X_MBUS_CTRL_OP_M			GENMASK(3, 2)  /* wild guess */</div><div class='add'>+#define   YT921X_MBUS_CTRL_OP(x)			FIELD_PREP(YT921X_MBUS_CTRL_OP_M, (x))</div><div class='add'>+#define   YT921X_MBUS_CTRL_WRITE			YT921X_MBUS_CTRL_OP(1)</div><div class='add'>+#define   YT921X_MBUS_CTRL_READ				YT921X_MBUS_CTRL_OP(2)</div><div class='add'>+#define YT921X_EXT_MBUS_DOUT		0x6a008</div><div class='add'>+#define YT921X_INT_MBUS_DOUT		0xf0008</div><div class='add'>+#define YT921X_EXT_MBUS_DIN		0x6a00c</div><div class='add'>+#define YT921X_INT_MBUS_DIN		0xf000c</div><div class='add'>+</div><div class='add'>+#define YT921X_PORTn_EGR(port)		(0x100000 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_EGR_TPID_CTAG_M		GENMASK(5, 4)</div><div class='add'>+#define   YT921X_PORT_EGR_TPID_CTAG(x)			FIELD_PREP(YT921X_PORT_EGR_TPID_CTAG_M, (x))</div><div class='add'>+#define  YT921X_PORT_EGR_TPID_STAG_M		GENMASK(3, 2)</div><div class='add'>+#define   YT921X_PORT_EGR_TPID_STAG(x)			FIELD_PREP(YT921X_PORT_EGR_TPID_STAG_M, (x))</div><div class='add'>+#define YT921X_TPID_EGRn(x)		(0x100300 + 4 * (x))	/* [0, 3] */</div><div class='add'>+#define  YT921X_TPID_EGR_TPID_M			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define YT921X_VLAN_IGR_FILTER		0x180280</div><div class='add'>+#define  YT921X_VLAN_IGR_FILTER_PORTn_BYPASS_IGMP(port)	BIT((port) + 11)</div><div class='add'>+#define  YT921X_VLAN_IGR_FILTER_PORTn(port)	BIT(port)</div><div class='add'>+#define YT921X_PORTn_ISOLATION(port)	(0x180294 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_ISOLATION_BLOCKn(port)	BIT(port)</div><div class='add'>+#define YT921X_STPn(n)			(0x18038c + 4 * (n))</div><div class='add'>+#define  YT921X_STP_PORTn_M(port)		GENMASK(2 * (port) + 1, 2 * (port))</div><div class='add'>+#define   YT921X_STP_PORTn(port, x)			((x) &lt;&lt; (2 * (port)))</div><div class='add'>+#define   YT921X_STP_PORTn_DISABLED(port)		YT921X_STP_PORTn(port, 0)</div><div class='add'>+#define   YT921X_STP_PORTn_LEARNING(port)		YT921X_STP_PORTn(port, 1)</div><div class='add'>+#define   YT921X_STP_PORTn_BLOCKING(port)		YT921X_STP_PORTn(port, 2)</div><div class='add'>+#define   YT921X_STP_PORTn_FORWARD(port)		YT921X_STP_PORTn(port, 3)</div><div class='add'>+#define YT921X_PORTn_LEARN(port)	(0x1803d0 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_LEARN_VID_LEARN_MULTI_EN	BIT(22)</div><div class='add'>+#define  YT921X_PORT_LEARN_VID_LEARN_MODE	BIT(21)</div><div class='add'>+#define  YT921X_PORT_LEARN_VID_LEARN_EN		BIT(20)</div><div class='add'>+#define  YT921X_PORT_LEARN_SUSPEND_COPY_EN	BIT(19)</div><div class='add'>+#define  YT921X_PORT_LEARN_SUSPEND_DROP_EN	BIT(18)</div><div class='add'>+#define  YT921X_PORT_LEARN_DIS			BIT(17)</div><div class='add'>+#define  YT921X_PORT_LEARN_LIMIT_EN		BIT(16)</div><div class='add'>+#define  YT921X_PORT_LEARN_LIMIT_M		GENMASK(15, 8)</div><div class='add'>+#define   YT921X_PORT_LEARN_LIMIT(x)			FIELD_PREP(YT921X_PORT_LEARN_LIMIT_M, (x))</div><div class='add'>+#define  YT921X_PORT_LEARN_DROP_ON_EXCEEDED	BIT(2)</div><div class='add'>+#define  YT921X_PORT_LEARN_MODE_M		GENMASK(1, 0)</div><div class='add'>+#define   YT921X_PORT_LEARN_MODE(x)			FIELD_PREP(YT921X_PORT_LEARN_MODE_M, (x))</div><div class='add'>+#define   YT921X_PORT_LEARN_MODE_AUTO			YT921X_PORT_LEARN_MODE(0)</div><div class='add'>+#define   YT921X_PORT_LEARN_MODE_AUTO_AND_COPY		YT921X_PORT_LEARN_MODE(1)</div><div class='add'>+#define   YT921X_PORT_LEARN_MODE_CPU_CONTROL		YT921X_PORT_LEARN_MODE(2)</div><div class='add'>+#define YT921X_AGEING			0x180440</div><div class='add'>+#define  YT921X_AGEING_INTERVAL_M		GENMASK(15, 0)</div><div class='add'>+#define YT921X_FDB_IN0			0x180454</div><div class='add'>+#define YT921X_FDB_IN1			0x180458</div><div class='add'>+#define YT921X_FDB_IN2			0x18045c</div><div class='add'>+#define YT921X_FDB_OP			0x180460</div><div class='add'>+#define  YT921X_FDB_OP_INDEX_M			GENMASK(22, 11)</div><div class='add'>+#define   YT921X_FDB_OP_INDEX(x)			FIELD_PREP(YT921X_FDB_OP_INDEX_M, (x))</div><div class='add'>+#define  YT921X_FDB_OP_MODE_INDEX		BIT(10)  /* mac+fid / index */</div><div class='add'>+#define  YT921X_FDB_OP_FLUSH_MCAST		BIT(9)  /* ucast / mcast */</div><div class='add'>+#define  YT921X_FDB_OP_FLUSH_M			GENMASK(8, 7)</div><div class='add'>+#define   YT921X_FDB_OP_FLUSH(x)			FIELD_PREP(YT921X_FDB_OP_FLUSH_M, (x))</div><div class='add'>+#define   YT921X_FDB_OP_FLUSH_ALL			YT921X_FDB_OP_FLUSH(0)</div><div class='add'>+#define   YT921X_FDB_OP_FLUSH_PORT			YT921X_FDB_OP_FLUSH(1)</div><div class='add'>+#define   YT921X_FDB_OP_FLUSH_PORT_VID			YT921X_FDB_OP_FLUSH(2)</div><div class='add'>+#define   YT921X_FDB_OP_FLUSH_VID			YT921X_FDB_OP_FLUSH(3)</div><div class='add'>+#define  YT921X_FDB_OP_FLUSH_STATIC		BIT(6)</div><div class='add'>+#define  YT921X_FDB_OP_NEXT_TYPE_M		GENMASK(5, 4)</div><div class='add'>+#define   YT921X_FDB_OP_NEXT_TYPE(x)			FIELD_PREP(YT921X_FDB_OP_NEXT_TYPE_M, (x))</div><div class='add'>+#define   YT921X_FDB_OP_NEXT_TYPE_UCAST_PORT		YT921X_FDB_OP_NEXT_TYPE(0)</div><div class='add'>+#define   YT921X_FDB_OP_NEXT_TYPE_UCAST_VID		YT921X_FDB_OP_NEXT_TYPE(1)</div><div class='add'>+#define   YT921X_FDB_OP_NEXT_TYPE_UCAST			YT921X_FDB_OP_NEXT_TYPE(2)</div><div class='add'>+#define   YT921X_FDB_OP_NEXT_TYPE_MCAST			YT921X_FDB_OP_NEXT_TYPE(3)</div><div class='add'>+#define  YT921X_FDB_OP_OP_M			GENMASK(3, 1)</div><div class='add'>+#define   YT921X_FDB_OP_OP(x)				FIELD_PREP(YT921X_FDB_OP_OP_M, (x))</div><div class='add'>+#define   YT921X_FDB_OP_OP_ADD				YT921X_FDB_OP_OP(0)</div><div class='add'>+#define   YT921X_FDB_OP_OP_DEL				YT921X_FDB_OP_OP(1)</div><div class='add'>+#define   YT921X_FDB_OP_OP_GET_ONE			YT921X_FDB_OP_OP(2)</div><div class='add'>+#define   YT921X_FDB_OP_OP_GET_NEXT			YT921X_FDB_OP_OP(3)</div><div class='add'>+#define   YT921X_FDB_OP_OP_FLUSH			YT921X_FDB_OP_OP(4)</div><div class='add'>+#define  YT921X_FDB_OP_START			BIT(0)</div><div class='add'>+#define YT921X_FDB_RESULT		0x180464</div><div class='add'>+#define  YT921X_FDB_RESULT_DONE			BIT(15)</div><div class='add'>+#define  YT921X_FDB_RESULT_NOTFOUND		BIT(14)</div><div class='add'>+#define  YT921X_FDB_RESULT_OVERWRITED		BIT(13)</div><div class='add'>+#define  YT921X_FDB_RESULT_INDEX_M		GENMASK(11, 0)</div><div class='add'>+#define   YT921X_FDB_RESULT_INDEX(x)			FIELD_PREP(YT921X_FDB_RESULT_INDEX_M, (x))</div><div class='add'>+#define YT921X_FDB_OUT0			0x1804b0</div><div class='add'>+#define  YT921X_FDB_IO0_ADDR_HI4_M		GENMASK(31, 0)</div><div class='add'>+#define YT921X_FDB_OUT1			0x1804b4</div><div class='add'>+#define  YT921X_FDB_IO1_EGR_INT_PRI_EN		BIT(31)</div><div class='add'>+#define  YT921X_FDB_IO1_STATUS_M		GENMASK(30, 28)</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS(x)			FIELD_PREP(YT921X_FDB_IO1_STATUS_M, (x))</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS_INVALID			YT921X_FDB_IO1_STATUS(0)</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS_MIN_TIME		YT921X_FDB_IO1_STATUS(1)</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS_MOVE_AGING_MAX_TIME	YT921X_FDB_IO1_STATUS(3)</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS_MAX_TIME		YT921X_FDB_IO1_STATUS(5)</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS_PENDING			YT921X_FDB_IO1_STATUS(6)</div><div class='add'>+#define   YT921X_FDB_IO1_STATUS_STATIC			YT921X_FDB_IO1_STATUS(7)</div><div class='add'>+#define  YT921X_FDB_IO1_FID_M			GENMASK(27, 16)  /* filtering ID (VID) */</div><div class='add'>+#define   YT921X_FDB_IO1_FID(x)				FIELD_PREP(YT921X_FDB_IO1_FID_M, (x))</div><div class='add'>+#define  YT921X_FDB_IO1_ADDR_LO2_M		GENMASK(15, 0)</div><div class='add'>+#define YT921X_FDB_OUT2			0x1804b8</div><div class='add'>+#define  YT921X_FDB_IO2_MOVE_AGING_STATUS_M	GENMASK(31, 30)</div><div class='add'>+#define  YT921X_FDB_IO2_IGR_DROP		BIT(29)</div><div class='add'>+#define  YT921X_FDB_IO2_EGR_PORTS_M		GENMASK(28, 18)</div><div class='add'>+#define   YT921X_FDB_IO2_EGR_PORTS(x)			FIELD_PREP(YT921X_FDB_IO2_EGR_PORTS_M, (x))</div><div class='add'>+#define  YT921X_FDB_IO2_EGR_DROP		BIT(17)</div><div class='add'>+#define  YT921X_FDB_IO2_COPY_TO_CPU		BIT(16)</div><div class='add'>+#define  YT921X_FDB_IO2_IGR_INT_PRI_EN		BIT(15)</div><div class='add'>+#define  YT921X_FDB_IO2_INT_PRI_M		GENMASK(14, 12)</div><div class='add'>+#define   YT921X_FDB_IO2_INT_PRI(x)			FIELD_PREP(YT921X_FDB_IO2_INT_PRI_M, (x))</div><div class='add'>+#define  YT921X_FDB_IO2_NEW_VID_M		GENMASK(11, 0)</div><div class='add'>+#define   YT921X_FDB_IO2_NEW_VID(x)			FIELD_PREP(YT921X_FDB_IO2_NEW_VID_M, (x))</div><div class='add'>+#define YT921X_FILTER_UNK_UCAST		0x180508</div><div class='add'>+#define YT921X_FILTER_UNK_MCAST		0x18050c</div><div class='add'>+#define YT921X_FILTER_MCAST		0x180510</div><div class='add'>+#define YT921X_FILTER_BCAST		0x180514</div><div class='add'>+#define  YT921X_FILTER_PORTS_M			GENMASK(10, 0)</div><div class='add'>+#define   YT921X_FILTER_PORTS(x)			FIELD_PREP(YT921X_FILTER_PORTS_M, (x))</div><div class='add'>+#define  YT921X_FILTER_PORTn(port)		BIT(port)</div><div class='add'>+#define YT921X_VLAN_EGR_FILTER		0x180598</div><div class='add'>+#define  YT921X_VLAN_EGR_FILTER_PORTn(port)	BIT(port)</div><div class='add'>+#define YT921X_CPU_COPY			0x180690</div><div class='add'>+#define  YT921X_CPU_COPY_FORCE_INT_PORT		BIT(2)</div><div class='add'>+#define  YT921X_CPU_COPY_TO_INT_CPU		BIT(1)</div><div class='add'>+#define  YT921X_CPU_COPY_TO_EXT_CPU		BIT(0)</div><div class='add'>+#define YT921X_ACT_UNK_UCAST		0x180734</div><div class='add'>+#define YT921X_ACT_UNK_MCAST		0x180738</div><div class='add'>+#define  YT921X_ACT_UNK_MCAST_BYPASS_DROP_RMA	BIT(23)</div><div class='add'>+#define  YT921X_ACT_UNK_MCAST_BYPASS_DROP_IGMP	BIT(22)</div><div class='add'>+#define  YT921X_ACT_UNK_ACTn_M(port)		GENMASK(2 * (port) + 1, 2 * (port))</div><div class='add'>+#define   YT921X_ACT_UNK_ACTn(port, x)			((x) &lt;&lt; (2 * (port)))</div><div class='add'>+#define   YT921X_ACT_UNK_ACTn_FORWARD(port)		YT921X_ACT_UNK_ACTn(port, 0)  /* flood */</div><div class='add'>+#define   YT921X_ACT_UNK_ACTn_TRAP(port)		YT921X_ACT_UNK_ACTn(port, 1)  /* steer to CPU */</div><div class='add'>+#define   YT921X_ACT_UNK_ACTn_DROP(port)		YT921X_ACT_UNK_ACTn(port, 2)  /* discard */</div><div class='add'>+/* NEVER use this action; see comments in the tag driver */</div><div class='add'>+#define   YT921X_ACT_UNK_ACTn_COPY(port)		YT921X_ACT_UNK_ACTn(port, 3)  /* flood and copy */</div><div class='add'>+#define YT921X_FDB_HW_FLUSH		0x180958</div><div class='add'>+#define  YT921X_FDB_HW_FLUSH_ON_LINKDOWN	BIT(0)</div><div class='add'>+</div><div class='add'>+#define YT921X_VLANn_CTRL(vlan)		(0x188000 + 8 * (vlan))</div><div class='add'>+#define  YT921X_VLAN_CTRL_UNTAG_PORTS_M		GENMASK_ULL(50, 40)</div><div class='add'>+#define   YT921X_VLAN_CTRL_UNTAG_PORTS(x)		FIELD_PREP(YT921X_VLAN_CTRL_UNTAG_PORTS_M, (x))</div><div class='add'>+#define  YT921X_VLAN_CTRL_UNTAG_PORTn(port)	BIT_ULL((port) + 40)</div><div class='add'>+#define  YT921X_VLAN_CTRL_STP_ID_M		GENMASK_ULL(39, 36)</div><div class='add'>+#define   YT921X_VLAN_CTRL_STP_ID(x)			FIELD_PREP(YT921X_VLAN_CTRL_STP_ID_M, (x))</div><div class='add'>+#define  YT921X_VLAN_CTRL_SVLAN_EN		BIT_ULL(35)</div><div class='add'>+#define  YT921X_VLAN_CTRL_FID_M			GENMASK_ULL(34, 23)</div><div class='add'>+#define   YT921X_VLAN_CTRL_FID(x)			FIELD_PREP(YT921X_VLAN_CTRL_FID_M, (x))</div><div class='add'>+#define  YT921X_VLAN_CTRL_LEARN_DIS		BIT_ULL(22)</div><div class='add'>+#define  YT921X_VLAN_CTRL_INT_PRI_EN		BIT_ULL(21)</div><div class='add'>+#define  YT921X_VLAN_CTRL_INT_PRI_M		GENMASK_ULL(20, 18)</div><div class='add'>+#define  YT921X_VLAN_CTRL_PORTS_M		GENMASK_ULL(17, 7)</div><div class='add'>+#define   YT921X_VLAN_CTRL_PORTS(x)			FIELD_PREP(YT921X_VLAN_CTRL_PORTS_M, (x))</div><div class='add'>+#define  YT921X_VLAN_CTRL_PORTn(port)		BIT_ULL((port) + 7)</div><div class='add'>+#define  YT921X_VLAN_CTRL_BYPASS_1X_AC		BIT_ULL(6)</div><div class='add'>+#define  YT921X_VLAN_CTRL_METER_EN		BIT_ULL(5)</div><div class='add'>+#define  YT921X_VLAN_CTRL_METER_ID_M		GENMASK_ULL(4, 0)</div><div class='add'>+</div><div class='add'>+#define YT921X_TPID_IGRn(x)		(0x210000 + 4 * (x))	/* [0, 3] */</div><div class='add'>+#define  YT921X_TPID_IGR_TPID_M			GENMASK(15, 0)</div><div class='add'>+#define YT921X_PORTn_IGR_TPID(port)	(0x210010 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_IGR_TPIDn_STAG_M		GENMASK(7, 4)</div><div class='add'>+#define  YT921X_PORT_IGR_TPIDn_STAG(x)		BIT((x) + 4)</div><div class='add'>+#define  YT921X_PORT_IGR_TPIDn_CTAG_M		GENMASK(3, 0)</div><div class='add'>+#define  YT921X_PORT_IGR_TPIDn_CTAG(x)		BIT(x)</div><div class='add'>+</div><div class='add'>+#define YT921X_PORTn_VLAN_CTRL(port)	(0x230010 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL_SVLAN_PRI_EN	BIT(31)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL_CVLAN_PRI_EN	BIT(30)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL_SVID_M		GENMASK(29, 18)</div><div class='add'>+#define   YT921X_PORT_VLAN_CTRL_SVID(x)			FIELD_PREP(YT921X_PORT_VLAN_CTRL_SVID_M, (x))</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL_CVID_M		GENMASK(17, 6)</div><div class='add'>+#define   YT921X_PORT_VLAN_CTRL_CVID(x)			FIELD_PREP(YT921X_PORT_VLAN_CTRL_CVID_M, (x))</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL_SVLAN_PRI_M	GENMASK(5, 3)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL_CVLAN_PRI_M	GENMASK(2, 0)</div><div class='add'>+#define YT921X_PORTn_VLAN_CTRL1(port)	(0x230080 + 4 * (port))</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL1_VLAN_RANGE_EN	BIT(8)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL1_VLAN_RANGE_PROFILE_ID_M	GENMASK(7, 4)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL1_SVLAN_DROP_TAGGED	BIT(3)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL1_SVLAN_DROP_UNTAGGED	BIT(2)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_TAGGED	BIT(1)</div><div class='add'>+#define  YT921X_PORT_VLAN_CTRL1_CVLAN_DROP_UNTAGGED	BIT(0)</div><div class='add'>+</div><div class='add'>+#define YT921X_MIRROR			0x300300</div><div class='add'>+#define  YT921X_MIRROR_IGR_PORTS_M		GENMASK(26, 16)</div><div class='add'>+#define   YT921X_MIRROR_IGR_PORTS(x)			FIELD_PREP(YT921X_MIRROR_IGR_PORTS_M, (x))</div><div class='add'>+#define  YT921X_MIRROR_IGR_PORTn(port)		BIT((port) + 16)</div><div class='add'>+#define  YT921X_MIRROR_EGR_PORTS_M		GENMASK(14, 4)</div><div class='add'>+#define   YT921X_MIRROR_EGR_PORTS(x)			FIELD_PREP(YT921X_MIRROR_EGR_PORTS_M, (x))</div><div class='add'>+#define  YT921X_MIRROR_EGR_PORTn(port)		BIT((port) + 4)</div><div class='add'>+#define  YT921X_MIRROR_PORT_M			GENMASK(3, 0)</div><div class='add'>+#define   YT921X_MIRROR_PORT(x)				FIELD_PREP(YT921X_MIRROR_PORT_M, (x))</div><div class='add'>+</div><div class='add'>+#define YT921X_EDATA_EXTMODE	0xfb</div><div class='add'>+#define YT921X_EDATA_LEN	0x100</div><div class='add'>+</div><div class='add'>+#define YT921X_FDB_NUM	4096</div><div class='add'>+</div><div class='add'>+enum yt921x_fdb_entry_status {</div><div class='add'>+	YT921X_FDB_ENTRY_STATUS_INVALID = 0,</div><div class='add'>+	YT921X_FDB_ENTRY_STATUS_MIN_TIME = 1,</div><div class='add'>+	YT921X_FDB_ENTRY_STATUS_MOVE_AGING_MAX_TIME = 3,</div><div class='add'>+	YT921X_FDB_ENTRY_STATUS_MAX_TIME = 5,</div><div class='add'>+	YT921X_FDB_ENTRY_STATUS_PENDING = 6,</div><div class='add'>+	YT921X_FDB_ENTRY_STATUS_STATIC = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define YT921X_MSTI_NUM		16</div><div class='add'>+</div><div class='add'>+#define YT9215_MAJOR	0x9002</div><div class='add'>+#define YT9218_MAJOR	0x9001</div><div class='add'>+</div><div class='add'>+/* required for a hard reset */</div><div class='add'>+#define YT921X_RST_DELAY_US	10000</div><div class='add'>+</div><div class='add'>+#define YT921X_FRAME_SIZE_MAX	0x2400  /* 9216 */</div><div class='add'>+</div><div class='add'>+#define YT921X_TAG_LEN	8</div><div class='add'>+</div><div class='add'>+/* 8 internal + 2 external + 1 mcu */</div><div class='add'>+#define YT921X_PORT_NUM			11</div><div class='add'>+</div><div class='add'>+#define yt921x_port_is_internal(port) ((port) &lt; 8)</div><div class='add'>+#define yt921x_port_is_external(port) (8 &lt;= (port) &amp;&amp; (port) &lt; 9)</div><div class='add'>+</div><div class='add'>+struct yt921x_mib {</div><div class='add'>+	u64 rx_broadcast;</div><div class='add'>+	u64 rx_pause;</div><div class='add'>+	u64 rx_multicast;</div><div class='add'>+	u64 rx_crc_errors;</div><div class='add'>+</div><div class='add'>+	u64 rx_alignment_errors;</div><div class='add'>+	u64 rx_undersize_errors;</div><div class='add'>+	u64 rx_fragment_errors;</div><div class='add'>+	u64 rx_64byte;</div><div class='add'>+</div><div class='add'>+	u64 rx_65_127byte;</div><div class='add'>+	u64 rx_128_255byte;</div><div class='add'>+	u64 rx_256_511byte;</div><div class='add'>+	u64 rx_512_1023byte;</div><div class='add'>+</div><div class='add'>+	u64 rx_1024_1518byte;</div><div class='add'>+	u64 rx_jumbo;</div><div class='add'>+	u64 rx_good_bytes;</div><div class='add'>+</div><div class='add'>+	u64 rx_bad_bytes;</div><div class='add'>+	u64 rx_oversize_errors;</div><div class='add'>+</div><div class='add'>+	u64 rx_dropped;</div><div class='add'>+	u64 tx_broadcast;</div><div class='add'>+	u64 tx_pause;</div><div class='add'>+	u64 tx_multicast;</div><div class='add'>+</div><div class='add'>+	u64 tx_undersize_errors;</div><div class='add'>+	u64 tx_64byte;</div><div class='add'>+	u64 tx_65_127byte;</div><div class='add'>+	u64 tx_128_255byte;</div><div class='add'>+</div><div class='add'>+	u64 tx_256_511byte;</div><div class='add'>+	u64 tx_512_1023byte;</div><div class='add'>+	u64 tx_1024_1518byte;</div><div class='add'>+	u64 tx_jumbo;</div><div class='add'>+</div><div class='add'>+	u64 tx_good_bytes;</div><div class='add'>+	u64 tx_collisions;</div><div class='add'>+</div><div class='add'>+	u64 tx_aborted_errors;</div><div class='add'>+	u64 tx_multiple_collisions;</div><div class='add'>+	u64 tx_single_collisions;</div><div class='add'>+	u64 tx_good;</div><div class='add'>+</div><div class='add'>+	u64 tx_deferred;</div><div class='add'>+	u64 tx_late_collisions;</div><div class='add'>+	u64 rx_oam;</div><div class='add'>+	u64 tx_oam;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct yt921x_port {</div><div class='add'>+	unsigned char index;</div><div class='add'>+</div><div class='add'>+	bool hairpin;</div><div class='add'>+	bool isolated;</div><div class='add'>+</div><div class='add'>+	struct delayed_work mib_read;</div><div class='add'>+	struct yt921x_mib mib;</div><div class='add'>+	u64 rx_frames;</div><div class='add'>+	u64 tx_frames;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct yt921x_reg_ops {</div><div class='add'>+	int (*read)(void *context, u32 reg, u32 *valp);</div><div class='add'>+	int (*write)(void *context, u32 reg, u32 val);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct yt921x_priv {</div><div class='add'>+	struct dsa_switch ds;</div><div class='add'>+</div><div class='add'>+	const struct yt921x_info *info;</div><div class='add'>+	/* cache of dsa_cpu_ports(ds) */</div><div class='add'>+	u16 cpu_ports_mask;</div><div class='add'>+</div><div class='add'>+	/* protect the access to the switch registers */</div><div class='add'>+	struct mutex reg_lock;</div><div class='add'>+	const struct yt921x_reg_ops *reg_ops;</div><div class='add'>+	void *reg_ctx;</div><div class='add'>+</div><div class='add'>+	/* mdio master bus */</div><div class='add'>+	struct mii_bus *mbus_int;</div><div class='add'>+	struct mii_bus *mbus_ext;</div><div class='add'>+</div><div class='add'>+	struct yt921x_port ports[YT921X_PORT_NUM];</div><div class='add'>+</div><div class='add'>+	u16 eee_ports_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c<br/>index 54e4d8b07f0e..d6bdad4baadd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/dummy.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/dummy.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/dummy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/dummy.c</a></div><div class='hunk'>@@ -38,11 +38,11 @@</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='ctx'> #include &lt;net/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/u64_stats_sync.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"dummy"</div><div class='del'>-#define DRV_VERSION	"1.0"</div><div class='ctx'> </div><div class='ctx'> static int numdummies = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -51,41 +51,15 @@ static void set_multicast_list(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct pcpu_dstats {</div><div class='del'>-	u64			tx_packets;</div><div class='del'>-	u64			tx_bytes;</div><div class='del'>-	struct u64_stats_sync	syncp;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> static void dummy_get_stats64(struct net_device *dev,</div><div class='ctx'> 			      struct rtnl_link_stats64 *stats)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for_each_possible_cpu(i) {</div><div class='del'>-		const struct pcpu_dstats *dstats;</div><div class='del'>-		u64 tbytes, tpackets;</div><div class='del'>-		unsigned int start;</div><div class='del'>-</div><div class='del'>-		dstats = per_cpu_ptr(dev-&gt;dstats, i);</div><div class='del'>-		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;dstats-&gt;syncp);</div><div class='del'>-			tbytes = dstats-&gt;tx_bytes;</div><div class='del'>-			tpackets = dstats-&gt;tx_packets;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;dstats-&gt;syncp, start));</div><div class='del'>-		stats-&gt;tx_bytes += tbytes;</div><div class='del'>-		stats-&gt;tx_packets += tpackets;</div><div class='del'>-	}</div><div class='add'>+	dev_lstats_read(dev, &amp;stats-&gt;tx_packets, &amp;stats-&gt;tx_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pcpu_dstats *dstats = this_cpu_ptr(dev-&gt;dstats);</div><div class='del'>-</div><div class='del'>-	u64_stats_update_begin(&amp;dstats-&gt;syncp);</div><div class='del'>-	dstats-&gt;tx_packets++;</div><div class='del'>-	dstats-&gt;tx_bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;dstats-&gt;syncp);</div><div class='add'>+	dev_lstats_add(dev, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='hunk'>@@ -94,18 +68,12 @@ static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int dummy_dev_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;dstats = netdev_alloc_pcpu_stats(struct pcpu_dstats);</div><div class='del'>-	if (!dev-&gt;dstats)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	dev-&gt;pcpu_stat_type = NETDEV_PCPU_STAT_LSTATS;</div><div class='ctx'> </div><div class='add'>+	netdev_lockdep_set_classes(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dummy_dev_uninit(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	free_percpu(dev-&gt;dstats);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dummy_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='ctx'> {</div><div class='ctx'> 	if (new_carrier)</div><div class='hunk'>@@ -117,7 +85,6 @@ static int dummy_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops dummy_netdev_ops = {</div><div class='ctx'> 	.ndo_init		= dummy_dev_init,</div><div class='del'>-	.ndo_uninit		= dummy_dev_uninit,</div><div class='ctx'> 	.ndo_start_xmit		= dummy_xmit,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_multicast_list,</div><div class='hunk'>@@ -126,15 +93,7 @@ static const struct net_device_ops dummy_netdev_ops = {</div><div class='ctx'> 	.ndo_change_carrier	= dummy_change_carrier,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void dummy_get_drvinfo(struct net_device *dev,</div><div class='del'>-			      struct ethtool_drvinfo *info)</div><div class='del'>-{</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct ethtool_ops dummy_ethtool_ops = {</div><div class='del'>-	.get_drvinfo            = dummy_get_drvinfo,</div><div class='ctx'> 	.get_ts_info		= ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -146,14 +105,16 @@ static void dummy_setup(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;dummy_netdev_ops;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;dummy_ethtool_ops;</div><div class='ctx'> 	dev-&gt;needs_free_netdev = true;</div><div class='add'>+	dev-&gt;request_ops_lock = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in device structure with ethernet-generic values. */</div><div class='ctx'> 	dev-&gt;flags |= IFF_NOARP;</div><div class='ctx'> 	dev-&gt;flags &amp;= ~IFF_MULTICAST;</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;</div><div class='add'>+	dev-&gt;lltx = true;</div><div class='ctx'> 	dev-&gt;features	|= NETIF_F_SG | NETIF_F_FRAGLIST;</div><div class='del'>-	dev-&gt;features	|= NETIF_F_ALL_TSO;</div><div class='del'>-	dev-&gt;features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;</div><div class='add'>+	dev-&gt;features	|= NETIF_F_GSO_SOFTWARE;</div><div class='add'>+	dev-&gt;features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA;</div><div class='ctx'> 	dev-&gt;features	|= NETIF_F_GSO_ENCAP_ALL;</div><div class='ctx'> 	dev-&gt;hw_features |= dev-&gt;features;</div><div class='ctx'> 	dev-&gt;hw_enc_features |= dev-&gt;features;</div><div class='hunk'>@@ -209,22 +170,21 @@ static int __init dummy_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='del'>-	down_write(&amp;pernet_ops_rwsem);</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	err = __rtnl_link_register(&amp;dummy_link_ops);</div><div class='add'>+	err = rtnl_link_register(&amp;dummy_link_ops);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto out;</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rtnl_net_lock(&amp;init_net);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; numdummies &amp;&amp; !err; i++) {</div><div class='ctx'> 		err = dummy_init_one();</div><div class='ctx'> 		cond_resched();</div><div class='ctx'> 	}</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		__rtnl_link_unregister(&amp;dummy_link_ops);</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-	up_write(&amp;pernet_ops_rwsem);</div><div class='add'>+	rtnl_net_unlock(&amp;init_net);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		rtnl_link_unregister(&amp;dummy_link_ops);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -237,5 +197,5 @@ static void __exit dummy_cleanup_module(void)</div><div class='ctx'> module_init(dummy_init_module);</div><div class='ctx'> module_exit(dummy_cleanup_module);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION("Dummy netdevice driver which discards all packets sent to it");</div><div class='ctx'> MODULE_ALIAS_RTNL_LINK(DRV_NAME);</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/net/eql.c b/drivers/net/eql.c<br/>index 74263f8efe1a..9ba10efd3794 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/eql.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/eql.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/eql.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/eql.c</a></div><div class='hunk'>@@ -113,6 +113,7 @@</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compat.h&gt;</div><div class='ctx'> #include &lt;linux/capability.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -131,7 +132,8 @@</div><div class='ctx'> </div><div class='ctx'> static int eql_open(struct net_device *dev);</div><div class='ctx'> static int eql_close(struct net_device *dev);</div><div class='del'>-static int eql_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='add'>+static int eql_siocdevprivate(struct net_device *dev, struct ifreq *ifr,</div><div class='add'>+			      void __user *data, int cmd);</div><div class='ctx'> static netdev_tx_t eql_slave_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> #define eql_is_slave(dev)	((dev-&gt;flags &amp; IFF_SLAVE) == IFF_SLAVE)</div><div class='hunk'>@@ -141,7 +143,7 @@ static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave);</div><div class='ctx'> </div><div class='ctx'> static void eql_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	equalizer_t *eql = from_timer(eql, t, timer);</div><div class='add'>+	equalizer_t *eql = timer_container_of(eql, t, timer);</div><div class='ctx'> 	struct list_head *this, *tmp, *head;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;eql-&gt;queue.lock);</div><div class='hunk'>@@ -170,7 +172,7 @@ static const char version[] __initconst =</div><div class='ctx'> static const struct net_device_ops eql_netdev_ops = {</div><div class='ctx'> 	.ndo_open	= eql_open,</div><div class='ctx'> 	.ndo_stop	= eql_close,</div><div class='del'>-	.ndo_do_ioctl	= eql_ioctl,</div><div class='add'>+	.ndo_siocdevprivate = eql_siocdevprivate,</div><div class='ctx'> 	.ndo_start_xmit	= eql_slave_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +225,7 @@ static void eql_kill_one_slave(slave_queue_t *queue, slave_t *slave)</div><div class='ctx'> 	list_del(&amp;slave-&gt;list);</div><div class='ctx'> 	queue-&gt;num_slaves--;</div><div class='ctx'> 	slave-&gt;dev-&gt;flags &amp;= ~IFF_SLAVE;</div><div class='del'>-	dev_put(slave-&gt;dev);</div><div class='add'>+	netdev_put(slave-&gt;dev, &amp;slave-&gt;dev_tracker);</div><div class='ctx'> 	kfree(slave);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -252,7 +254,7 @@ static int eql_close(struct net_device *dev)</div><div class='ctx'> 	 *	at the data structure it scans every so often...</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;eql-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;eql-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	eql_kill_slave_queue(&amp;eql-&gt;queue);</div><div class='ctx'> </div><div class='hunk'>@@ -268,25 +270,29 @@ static int eql_s_slave_cfg(struct net_device *dev, slave_config_t __user *sc);</div><div class='ctx'> static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mc);</div><div class='ctx'> static int eql_s_master_cfg(struct net_device *dev, master_config_t __user *mc);</div><div class='ctx'> </div><div class='del'>-static int eql_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+static int eql_siocdevprivate(struct net_device *dev, struct ifreq *ifr,</div><div class='add'>+			      void __user *data, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	if (cmd != EQL_GETMASTRCFG &amp;&amp; cmd != EQL_GETSLAVECFG &amp;&amp;</div><div class='ctx'> 	    !capable(CAP_NET_ADMIN))</div><div class='ctx'> 	  	return -EPERM;</div><div class='ctx'> </div><div class='add'>+	if (in_compat_syscall()) /* to be implemented */</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	switch (cmd) {</div><div class='ctx'> 		case EQL_ENSLAVE:</div><div class='del'>-			return eql_enslave(dev, ifr-&gt;ifr_data);</div><div class='add'>+			return eql_enslave(dev, data);</div><div class='ctx'> 		case EQL_EMANCIPATE:</div><div class='del'>-			return eql_emancipate(dev, ifr-&gt;ifr_data);</div><div class='add'>+			return eql_emancipate(dev, data);</div><div class='ctx'> 		case EQL_GETSLAVECFG:</div><div class='del'>-			return eql_g_slave_cfg(dev, ifr-&gt;ifr_data);</div><div class='add'>+			return eql_g_slave_cfg(dev, data);</div><div class='ctx'> 		case EQL_SETSLAVECFG:</div><div class='del'>-			return eql_s_slave_cfg(dev, ifr-&gt;ifr_data);</div><div class='add'>+			return eql_s_slave_cfg(dev, data);</div><div class='ctx'> 		case EQL_GETMASTRCFG:</div><div class='del'>-			return eql_g_master_cfg(dev, ifr-&gt;ifr_data);</div><div class='add'>+			return eql_g_master_cfg(dev, data);</div><div class='ctx'> 		case EQL_SETMASTRCFG:</div><div class='del'>-			return eql_s_master_cfg(dev, ifr-&gt;ifr_data);</div><div class='add'>+			return eql_s_master_cfg(dev, data);</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -393,7 +399,7 @@ static int __eql_insert_slave(slave_queue_t *queue, slave_t *slave)</div><div class='ctx'> 		if (duplicate_slave)</div><div class='ctx'> 			eql_kill_one_slave(queue, duplicate_slave);</div><div class='ctx'> </div><div class='del'>-		dev_hold(slave-&gt;dev);</div><div class='add'>+		netdev_hold(slave-&gt;dev, &amp;slave-&gt;dev_tracker, GFP_ATOMIC);</div><div class='ctx'> 		list_add(&amp;slave-&gt;list, &amp;queue-&gt;all_slaves);</div><div class='ctx'> 		queue-&gt;num_slaves++;</div><div class='ctx'> 		slave-&gt;dev-&gt;flags |= IFF_SLAVE;</div><div class='hunk'>@@ -419,14 +425,13 @@ static int eql_enslave(struct net_device *master_dev, slaving_request_t __user *</div><div class='ctx'> 	if ((master_dev-&gt;flags &amp; IFF_UP) == IFF_UP) {</div><div class='ctx'> 		/* slave is not a master &amp; not already a slave: */</div><div class='ctx'> 		if (!eql_is_master(slave_dev) &amp;&amp; !eql_is_slave(slave_dev)) {</div><div class='del'>-			slave_t *s = kmalloc(sizeof(*s), GFP_KERNEL);</div><div class='add'>+			slave_t *s = kzalloc(sizeof(*s), GFP_KERNEL);</div><div class='ctx'> 			equalizer_t *eql = netdev_priv(master_dev);</div><div class='ctx'> 			int ret;</div><div class='ctx'> </div><div class='ctx'> 			if (!s)</div><div class='ctx'> 				return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-			memset(s, 0, sizeof(*s));</div><div class='ctx'> 			s-&gt;dev = slave_dev;</div><div class='ctx'> 			s-&gt;priority = srq.priority;</div><div class='ctx'> 			s-&gt;priority_bps = srq.priority;</div><div class='hunk'>@@ -602,4 +607,5 @@ static void __exit eql_cleanup_module(void)</div><div class='ctx'> </div><div class='ctx'> module_init(eql_init_module);</div><div class='ctx'> module_exit(eql_cleanup_module);</div><div class='add'>+MODULE_DESCRIPTION("Equalizer Load-balancer for serial network interfaces");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c<br/>index 3da97996bdf3..fb68339e1511 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c509.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c509.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c509.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/3c509.c</a></div><div class='hunk'>@@ -60,8 +60,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"3c509"</div><div class='del'>-#define DRV_VERSION	"1.20"</div><div class='del'>-#define DRV_RELDATE	"04Feb2008"</div><div class='ctx'> </div><div class='ctx'> /* A few values that may be tweaked. */</div><div class='ctx'> </div><div class='hunk'>@@ -92,8 +90,6 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='del'>-static char version[] = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";</div><div class='del'>-</div><div class='ctx'> #ifdef EL3_DEBUG</div><div class='ctx'> static int el3_debug = EL3_DEBUG;</div><div class='ctx'> #else</div><div class='hunk'>@@ -196,7 +192,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev);</div><div class='ctx'> static int el3_rx(struct net_device *dev);</div><div class='ctx'> static int el3_close(struct net_device *dev);</div><div class='ctx'> static void set_multicast_list(struct net_device *dev);</div><div class='del'>-static void el3_tx_timeout (struct net_device *dev);</div><div class='add'>+static void el3_tx_timeout (struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void el3_down(struct net_device *dev);</div><div class='ctx'> static void el3_up(struct net_device *dev);</div><div class='ctx'> static const struct ethtool_ops ethtool_ops;</div><div class='hunk'>@@ -274,7 +270,7 @@ static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr, int ioaddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct el3_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, phys_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)phys_addr);</div><div class='ctx'> 	dev-&gt;base_addr = ioaddr;</div><div class='ctx'> 	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;if_port = if_port;</div><div class='hunk'>@@ -306,7 +302,6 @@ static int el3_isa_match(struct device *pdev, unsigned int ndev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, pdev);</div><div class='del'>-	netdev_boot_setup_check(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) {</div><div class='ctx'> 		free_netdev(dev);</div><div class='hunk'>@@ -339,12 +334,11 @@ static int el3_isa_match(struct device *pdev, unsigned int ndev)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int el3_isa_remove(struct device *pdev,</div><div class='add'>+static void el3_isa_remove(struct device *pdev,</div><div class='ctx'> 				    unsigned int ndev)</div><div class='ctx'> {</div><div class='ctx'> 	el3_device_remove(pdev);</div><div class='ctx'> 	dev_set_drvdata(pdev, NULL);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -426,7 +420,6 @@ static int el3_pnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *id)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='del'>-	netdev_boot_setup_check(dev);</div><div class='ctx'> </div><div class='ctx'> 	el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_PNP);</div><div class='ctx'> 	pnp_set_drvdata(pdev, dev);</div><div class='hunk'>@@ -519,7 +512,9 @@ static int el3_common_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct el3_private *lp = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='del'>-	const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};</div><div class='add'>+	static const char * const if_names[] = {</div><div class='add'>+		"10baseT", "AUI", "undefined", "BNC"</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -547,8 +542,6 @@ static int el3_common_init(struct net_device *dev)</div><div class='ctx'> 	       dev-&gt;name, dev-&gt;base_addr, if_names[(dev-&gt;if_port &amp; 0x03)],</div><div class='ctx'> 	       dev-&gt;dev_addr, dev-&gt;irq);</div><div class='ctx'> </div><div class='del'>-	if (el3_debug &gt; 0)</div><div class='del'>-		pr_info("%s", version);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -595,7 +588,6 @@ static int el3_eisa_probe(struct device *device)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, device);</div><div class='del'>-	netdev_boot_setup_check(dev);</div><div class='ctx'> </div><div class='ctx'> 	el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA);</div><div class='ctx'> 	eisa_set_drvdata (edev, dev);</div><div class='hunk'>@@ -689,7 +681,7 @@ el3_open(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-el3_tx_timeout (struct net_device *dev)</div><div class='add'>+el3_tx_timeout (struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -1058,6 +1050,7 @@ el3_netdev_get_ecmd(struct net_device *dev, struct ethtool_link_ksettings *cmd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		cmd-&gt;base.port = PORT_BNC;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1142,8 +1135,7 @@ el3_netdev_set_ecmd(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int el3_get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1266,14 +1258,14 @@ el3_up(struct net_device *dev)</div><div class='ctx'> 					pr_cont("Forcing 3c5x9b full-duplex mode");</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case 8:</div><div class='ctx'> 				/* set full-duplex mode based on eeprom config setting */</div><div class='ctx'> 				if ((sw_info &amp; 0x000f) &amp;&amp; (sw_info &amp; 0x8000)) {</div><div class='ctx'> 					pr_cont("Setting 3c5x9b full-duplex mode (from EEPROM configuration bit)");</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			default:</div><div class='ctx'> 				/* xcvr=(0 || 4) OR user has an old 3c5x9 non "B" model */</div><div class='ctx'> 				pr_cont("Setting 3c5x9/3c5x9B half-duplex mode");</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c<br/>index b15752267c8d..2227c83a4862 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c515.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c515.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c515.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/3c515.c</a></div><div class='hunk'>@@ -23,11 +23,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"3c515"</div><div class='del'>-#define DRV_VERSION		"0.99t-ac"</div><div class='del'>-#define DRV_RELDATE		"28-Oct-2002"</div><div class='del'>-</div><div class='del'>-static char *version =</div><div class='del'>-DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " becker@scyld.com and others\n";</div><div class='ctx'> </div><div class='ctx'> #define CORKSCREW 1</div><div class='ctx'> </div><div class='hunk'>@@ -36,9 +31,6 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " becker@scyld.com and others\n";</div><div class='ctx'>    Setting to &gt; 1512 effectively disables this feature. */</div><div class='ctx'> static int rx_copybreak = 200;</div><div class='ctx'> </div><div class='del'>-/* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */</div><div class='del'>-static const int mtu = 1500;</div><div class='del'>-</div><div class='ctx'> /* Maximum events (Rx packets, etc.) to handle at each interrupt. */</div><div class='ctx'> static int max_interrupt_work = 20;</div><div class='ctx'> </div><div class='hunk'>@@ -71,8 +63,10 @@ static int max_interrupt_work = 20;</div><div class='ctx'> #include &lt;linux/timer.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/Space.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +78,6 @@ static int max_interrupt_work = 20;</div><div class='ctx'> MODULE_AUTHOR("Donald Becker &lt;becker@scyld.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("3Com 3c515 Corkscrew driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> /* "Knobs" for adjusting internal parameters. */</div><div class='ctx'> /* Put out somewhat more debugging messages. (0 - no msg, 1 minimal msgs). */</div><div class='hunk'>@@ -371,7 +364,7 @@ static void corkscrew_timer(struct timer_list *t);</div><div class='ctx'> static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					struct net_device *dev);</div><div class='ctx'> static int corkscrew_rx(struct net_device *dev);</div><div class='del'>-static void corkscrew_timeout(struct net_device *dev);</div><div class='add'>+static void corkscrew_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static int boomerang_rx(struct net_device *dev);</div><div class='ctx'> static irqreturn_t corkscrew_interrupt(int irq, void *dev_id);</div><div class='ctx'> static int corkscrew_close(struct net_device *dev);</div><div class='hunk'>@@ -413,32 +406,25 @@ MODULE_PARM_DESC(max_interrupt_work, "3c515 maximum events handled per interrupt</div><div class='ctx'> /* we will need locking (and refcounting) if we ever use it for more */</div><div class='ctx'> static LIST_HEAD(root_corkscrew_dev);</div><div class='ctx'> </div><div class='del'>-int init_module(void)</div><div class='add'>+static int corkscrew_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int found = 0;</div><div class='ctx'> 	if (debug &gt;= 0)</div><div class='ctx'> 		corkscrew_debug = debug;</div><div class='del'>-	if (corkscrew_debug)</div><div class='del'>-		pr_debug("%s", version);</div><div class='ctx'> 	while (corkscrew_scan(-1))</div><div class='ctx'> 		found++;</div><div class='ctx'> 	return found ? 0 : -ENODEV;</div><div class='ctx'> }</div><div class='add'>+module_init(corkscrew_init_module);</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> struct net_device *tc515_probe(int unit)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = corkscrew_scan(unit);</div><div class='del'>-	static int printed;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENODEV);</div><div class='ctx'> </div><div class='del'>-	if (corkscrew_debug &gt; 0 &amp;&amp; !printed) {</div><div class='del'>-		printed = 1;</div><div class='del'>-		pr_debug("%s", version);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> #endif				/* not MODULE */</div><div class='hunk'>@@ -580,6 +566,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,</div><div class='ctx'> {</div><div class='ctx'> 	struct corkscrew_private *vp = netdev_priv(dev);</div><div class='ctx'> 	unsigned int eeprom[0x40], checksum = 0;	/* EEPROM contents */</div><div class='add'>+	__be16 addr[ETH_ALEN / 2];</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int irq;</div><div class='ctx'> </div><div class='hunk'>@@ -632,7 +619,6 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,</div><div class='ctx'> 	/* Read the station address from the EEPROM. */</div><div class='ctx'> 	EL3WINDOW(0);</div><div class='ctx'> 	for (i = 0; i &lt; 0x18; i++) {</div><div class='del'>-		__be16 *phys_addr = (__be16 *) dev-&gt;dev_addr;</div><div class='ctx'> 		int timer;</div><div class='ctx'> 		outw(EEPROM_Read + i, ioaddr + Wn0EepromCmd);</div><div class='ctx'> 		/* Pause for at least 162 us. for the read to take place. */</div><div class='hunk'>@@ -644,8 +630,9 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,</div><div class='ctx'> 		eeprom[i] = inw(ioaddr + Wn0EepromData);</div><div class='ctx'> 		checksum ^= eeprom[i];</div><div class='ctx'> 		if (i &lt; 3)</div><div class='del'>-			phys_addr[i] = htons(eeprom[i]);</div><div class='add'>+			addr[i] = htons(eeprom[i]);</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)addr);</div><div class='ctx'> 	checksum = (checksum ^ (checksum &gt;&gt; 8)) &amp; 0xff;</div><div class='ctx'> 	if (checksum != 0x00)</div><div class='ctx'> 		pr_cont(" ***INVALID CHECKSUM %4.4x*** ", checksum);</div><div class='hunk'>@@ -872,7 +859,7 @@ static int corkscrew_open(struct net_device *dev)</div><div class='ctx'> static void corkscrew_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> #ifdef AUTOMEDIA</div><div class='del'>-	struct corkscrew_private *vp = from_timer(vp, t, timer);</div><div class='add'>+	struct corkscrew_private *vp = timer_container_of(vp, t, timer);</div><div class='ctx'> 	struct net_device *dev = vp-&gt;our_dev;</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -961,7 +948,7 @@ static void corkscrew_timer(struct timer_list *t)</div><div class='ctx'> #endif				/* AUTOMEDIA */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void corkscrew_timeout(struct net_device *dev)</div><div class='add'>+static void corkscrew_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct corkscrew_private *vp = netdev_priv(dev);</div><div class='hunk'>@@ -1063,7 +1050,7 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,</div><div class='ctx'> #ifdef VORTEX_BUS_MASTER</div><div class='ctx'> 	if (vp-&gt;bus_master) {</div><div class='ctx'> 		/* Set the bus-master controller to transfer the packet. */</div><div class='del'>-		outl((int) (skb-&gt;data), ioaddr + Wn7_MasterAddr);</div><div class='add'>+		outl(isa_virt_to_bus(skb-&gt;data), ioaddr + Wn7_MasterAddr);</div><div class='ctx'> 		outw((skb-&gt;len + 3) &amp; ~3, ioaddr + Wn7_MasterLen);</div><div class='ctx'> 		vp-&gt;tx_skb = skb;</div><div class='ctx'> 		outw(StartDMADown, ioaddr + EL3_CMD);</div><div class='hunk'>@@ -1427,7 +1414,7 @@ static int corkscrew_close(struct net_device *dev)</div><div class='ctx'> 			dev-&gt;name, rx_nocopy, rx_copy, queued_packet);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;vp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;vp-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off statistics ASAP.  We update lp-&gt;stats below. */</div><div class='ctx'> 	outw(StatsDisable, ioaddr + EL3_CMD);</div><div class='hunk'>@@ -1539,8 +1526,7 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info), "ISA 0x%lx",</div><div class='ctx'> 		 dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -1561,9 +1547,8 @@ static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='ctx'> 	.set_msglevel		= netdev_set_msglevel,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-void cleanup_module(void)</div><div class='add'>+static void __exit corkscrew_exit_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	while (!list_empty(&amp;root_corkscrew_dev)) {</div><div class='ctx'> 		struct net_device *dev;</div><div class='hunk'>@@ -1577,4 +1562,5 @@ void cleanup_module(void)</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+module_exit(corkscrew_exit_module);</div><div class='ctx'> #endif				/* MODULE */</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c574_cs.c b/drivers/net/ethernet/3com/3c574_cs.c<br/>index 3044a6f35f04..1f2070497a75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c574_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c574_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c574_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/3c574_cs.c</a></div><div class='hunk'>@@ -234,7 +234,7 @@ static void update_stats(struct net_device *dev);</div><div class='ctx'> static struct net_device_stats *el3_get_stats(struct net_device *dev);</div><div class='ctx'> static int el3_rx(struct net_device *dev, int worklimit);</div><div class='ctx'> static int el3_close(struct net_device *dev);</div><div class='del'>-static void el3_tx_timeout(struct net_device *dev);</div><div class='add'>+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='ctx'> static void set_rx_mode(struct net_device *dev);</div><div class='ctx'> static void set_multicast_list(struct net_device *dev);</div><div class='hunk'>@@ -252,7 +252,7 @@ static const struct net_device_ops el3_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= el3_start_xmit,</div><div class='ctx'> 	.ndo_tx_timeout 	= el3_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= el3_get_stats,</div><div class='del'>-	.ndo_do_ioctl		= el3_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= el3_ioctl,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_multicast_list,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='hunk'>@@ -305,15 +305,13 @@ static int tc574_config(struct pcmcia_device *link)</div><div class='ctx'> 	struct net_device *dev = link-&gt;priv;</div><div class='ctx'> 	struct el3_private *lp = netdev_priv(dev);</div><div class='ctx'> 	int ret, i, j;</div><div class='add'>+	__be16 addr[ETH_ALEN / 2];</div><div class='ctx'> 	unsigned int ioaddr;</div><div class='del'>-	__be16 *phys_addr;</div><div class='ctx'> 	char *cardname;</div><div class='ctx'> 	__u32 config;</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> 	size_t len;</div><div class='ctx'> </div><div class='del'>-	phys_addr = (__be16 *)dev-&gt;dev_addr;</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(&amp;link-&gt;dev, "3c574_config()\n");</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;io_lines = 16;</div><div class='hunk'>@@ -347,19 +345,20 @@ static int tc574_config(struct pcmcia_device *link)</div><div class='ctx'> 	len = pcmcia_get_tuple(link, 0x88, &amp;buf);</div><div class='ctx'> 	if (buf &amp;&amp; len &gt;= 6) {</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			phys_addr[i] = htons(le16_to_cpu(buf[i * 2]));</div><div class='add'>+			addr[i] = htons(le16_to_cpu(buf[i * 2]));</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kfree(buf); /* 0 &lt; len &lt; 6 */</div><div class='ctx'> 		EL3WINDOW(0);</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			phys_addr[i] = htons(read_eeprom(ioaddr, i + 10));</div><div class='del'>-		if (phys_addr[0] == htons(0x6060)) {</div><div class='add'>+			addr[i] = htons(read_eeprom(ioaddr, i + 10));</div><div class='add'>+		if (addr[0] == htons(0x6060)) {</div><div class='ctx'> 			pr_notice("IO port conflict at 0x%03lx-0x%03lx\n",</div><div class='ctx'> 				  dev-&gt;base_addr, dev-&gt;base_addr+15);</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)addr);</div><div class='ctx'> 	if (link-&gt;prod_id[1])</div><div class='ctx'> 		cardname = link-&gt;prod_id[1];</div><div class='ctx'> 	else</div><div class='hunk'>@@ -690,7 +689,7 @@ static int el3_open(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void el3_tx_timeout(struct net_device *dev)</div><div class='add'>+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	</div><div class='hunk'>@@ -859,7 +858,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)</div><div class='ctx'> */</div><div class='ctx'> static void media_check(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct el3_private *lp = from_timer(lp, t, media);</div><div class='add'>+	struct el3_private *lp = timer_container_of(lp, t, media);</div><div class='ctx'> 	struct net_device *dev = lp-&gt;p_dev-&gt;priv;</div><div class='ctx'> 	unsigned int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -951,7 +950,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)</div><div class='ctx'> static void update_stats(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ioaddr = dev-&gt;base_addr;</div><div class='del'>-	u8 rx, tx, up;</div><div class='add'>+	u8 up;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("%s: updating the statistics.\n", dev-&gt;name);</div><div class='ctx'> </div><div class='hunk'>@@ -972,8 +971,8 @@ static void update_stats(struct net_device *dev)</div><div class='ctx'> 	dev-&gt;stats.tx_packets			+= (up&amp;0x30) &lt;&lt; 4;</div><div class='ctx'> 	/* Rx packets   */			   inb(ioaddr + 7);</div><div class='ctx'> 	/* Tx deferrals */			   inb(ioaddr + 8);</div><div class='del'>-	rx		 			 = inw(ioaddr + 10);</div><div class='del'>-	tx					 = inw(ioaddr + 12);</div><div class='add'>+	/* rx */				   inw(ioaddr + 10);</div><div class='add'>+	/* tx */				   inw(ioaddr + 12);</div><div class='ctx'> </div><div class='ctx'> 	EL3WINDOW(4);</div><div class='ctx'> 	/* BadSSD */				   inb(ioaddr + 12);</div><div class='hunk'>@@ -1046,7 +1045,7 @@ static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 	case SIOCGMIIPHY:		/* Get the address of the PHY in use. */</div><div class='ctx'> 		data-&gt;phy_id = phy;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIREG:		/* Read the specified MII register. */</div><div class='ctx'> 		{</div><div class='ctx'> 			int saved_window;</div><div class='hunk'>@@ -1141,7 +1140,7 @@ static int el3_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;open--;</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;media);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;media);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c<br/>index 2b2695311bda..ea49be43b8c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c589_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c589_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c589_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/3c589_cs.c</a></div><div class='hunk'>@@ -23,7 +23,6 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"3c589_cs"</div><div class='del'>-#define DRV_VERSION	"1.162-ac"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -173,7 +172,7 @@ static void update_stats(struct net_device *dev);</div><div class='ctx'> static struct net_device_stats *el3_get_stats(struct net_device *dev);</div><div class='ctx'> static int el3_rx(struct net_device *dev);</div><div class='ctx'> static int el3_close(struct net_device *dev);</div><div class='del'>-static void el3_tx_timeout(struct net_device *dev);</div><div class='add'>+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void set_rx_mode(struct net_device *dev);</div><div class='ctx'> static void set_multicast_list(struct net_device *dev);</div><div class='ctx'> static const struct ethtool_ops netdev_ethtool_ops;</div><div class='hunk'>@@ -196,6 +195,7 @@ static int tc589_probe(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct el3_private *lp;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;link-&gt;dev, "3c589_attach()\n");</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +219,15 @@ static int tc589_probe(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;netdev_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	return tc589_config(link);</div><div class='add'>+	ret = tc589_config(link);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_netdev:</div><div class='add'>+	free_netdev(dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tc589_detach(struct pcmcia_device *link)</div><div class='hunk'>@@ -238,8 +246,8 @@ static void tc589_detach(struct pcmcia_device *link)</div><div class='ctx'> static int tc589_config(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = link-&gt;priv;</div><div class='del'>-	__be16 *phys_addr;</div><div class='ctx'> 	int ret, i, j, multi = 0, fifo;</div><div class='add'>+	__be16 addr[ETH_ALEN / 2];</div><div class='ctx'> 	unsigned int ioaddr;</div><div class='ctx'> 	static const char * const ram_split[] = {"5:3", "3:1", "1:1", "3:5"};</div><div class='ctx'> 	u8 *buf;</div><div class='hunk'>@@ -247,7 +255,6 @@ static int tc589_config(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;link-&gt;dev, "3c589_config\n");</div><div class='ctx'> </div><div class='del'>-	phys_addr = (__be16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	/* Is this a 3c562? */</div><div class='ctx'> 	if (link-&gt;manf_id != MANFID_3COM)</div><div class='ctx'> 		dev_info(&amp;link-&gt;dev, "hmmm, is this really a 3Com card??\n");</div><div class='hunk'>@@ -286,18 +293,19 @@ static int tc589_config(struct pcmcia_device *link)</div><div class='ctx'> 	len = pcmcia_get_tuple(link, 0x88, &amp;buf);</div><div class='ctx'> 	if (buf &amp;&amp; len &gt;= 6) {</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			phys_addr[i] = htons(le16_to_cpu(buf[i*2]));</div><div class='add'>+			addr[i] = htons(le16_to_cpu(buf[i*2]));</div><div class='ctx'> 		kfree(buf);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		kfree(buf); /* 0 &lt; len &lt; 6 */</div><div class='ctx'> 		for (i = 0; i &lt; 3; i++)</div><div class='del'>-			phys_addr[i] = htons(read_eeprom(ioaddr, i));</div><div class='del'>-		if (phys_addr[0] == htons(0x6060)) {</div><div class='add'>+			addr[i] = htons(read_eeprom(ioaddr, i));</div><div class='add'>+		if (addr[0] == htons(0x6060)) {</div><div class='ctx'> 			dev_err(&amp;link-&gt;dev, "IO port conflict at 0x%03lx-0x%03lx\n",</div><div class='ctx'> 					dev-&gt;base_addr, dev-&gt;base_addr+15);</div><div class='ctx'> 			goto failed;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)addr);</div><div class='ctx'> </div><div class='ctx'> 	/* The address and resource configuration register aren't loaded from</div><div class='ctx'> 	 * the EEPROM and *must* be set to 0 and IRQ3 for the PCMCIA version.</div><div class='hunk'>@@ -481,8 +489,7 @@ static void tc589_reset(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='ctx'> 		"PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -495,7 +502,7 @@ static int el3_config(struct net_device *dev, struct ifmap *map)</div><div class='ctx'> {</div><div class='ctx'> 	if ((map-&gt;port != (u_char)(-1)) &amp;&amp; (map-&gt;port != dev-&gt;if_port)) {</div><div class='ctx'> 		if (map-&gt;port &lt;= 3) {</div><div class='del'>-			dev-&gt;if_port = map-&gt;port;</div><div class='add'>+			WRITE_ONCE(dev-&gt;if_port, map-&gt;port);</div><div class='ctx'> 			netdev_info(dev, "switched to %s port\n", if_names[dev-&gt;if_port]);</div><div class='ctx'> 			tc589_set_xcvr(dev, dev-&gt;if_port);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -526,7 +533,7 @@ static int el3_open(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void el3_tx_timeout(struct net_device *dev)</div><div class='add'>+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -678,7 +685,7 @@ static irqreturn_t el3_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static void media_check(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct el3_private *lp = from_timer(lp, t, media);</div><div class='add'>+	struct el3_private *lp = timer_container_of(lp, t, media);</div><div class='ctx'> 	struct net_device *dev = lp-&gt;p_dev-&gt;priv;</div><div class='ctx'> 	unsigned int ioaddr = dev-&gt;base_addr;</div><div class='ctx'> 	u16 media, errs;</div><div class='hunk'>@@ -939,7 +946,7 @@ static int el3_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	link-&gt;open--;</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;media);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;media);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c<br/>index 147051404194..8c9cc97efd4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c59x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/3c59x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/3c59x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/3c59x.c</a></div><div class='hunk'>@@ -776,7 +776,7 @@ static void set_rx_mode(struct net_device *dev);</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='ctx'> static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='ctx'> #endif</div><div class='del'>-static void vortex_tx_timeout(struct net_device *dev);</div><div class='add'>+static void vortex_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void acpi_set_WOL(struct net_device *dev);</div><div class='ctx'> static const struct ethtool_ops vortex_ethtool_ops;</div><div class='ctx'> static void set_8021q_mode(struct net_device *dev, int enable);</div><div class='hunk'>@@ -847,8 +847,7 @@ static void poll_vortex(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int vortex_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!ndev || !netif_running(ndev))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -861,8 +860,7 @@ static int vortex_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int vortex_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct net_device *ndev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!ndev || !netif_running(ndev))</div><div class='hunk'>@@ -1054,7 +1052,7 @@ static const struct net_device_ops boomrang_netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= vortex_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= vortex_get_stats,</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-	.ndo_do_ioctl 		= vortex_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= vortex_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='hunk'>@@ -1071,7 +1069,7 @@ static const struct net_device_ops vortex_netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= vortex_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= vortex_get_stats,</div><div class='ctx'> #ifdef CONFIG_PCI</div><div class='del'>-	.ndo_do_ioctl 		= vortex_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= vortex_ioctl,</div><div class='ctx'> #endif</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='hunk'>@@ -1093,6 +1091,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,</div><div class='ctx'> 	struct vortex_private *vp;</div><div class='ctx'> 	int option;</div><div class='ctx'> 	unsigned int eeprom[0x40], checksum = 0;		/* EEPROM contents */</div><div class='add'>+	__be16 addr[ETH_ALEN / 2];</div><div class='ctx'> 	int i, step;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	static int printed_version;</div><div class='hunk'>@@ -1151,7 +1150,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,</div><div class='ctx'> </div><div class='ctx'> 	print_info = (vortex_debug &gt; 1);</div><div class='ctx'> 	if (print_info)</div><div class='del'>-		pr_info("See Documentation/networking/device_drivers/3com/vortex.txt\n");</div><div class='add'>+		pr_info("See Documentation/networking/device_drivers/ethernet/3com/vortex.rst\n");</div><div class='ctx'> </div><div class='ctx'> 	pr_info("%s: 3Com %s %s at %p.\n",</div><div class='ctx'> 	       print_name,</div><div class='hunk'>@@ -1286,7 +1285,8 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,</div><div class='ctx'> 	if ((checksum != 0x00) &amp;&amp; !(vci-&gt;drv_flags &amp; IS_TORNADO))</div><div class='ctx'> 		pr_cont(" ***INVALID CHECKSUM %4.4x*** ", checksum);</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		((__be16 *)dev-&gt;dev_addr)[i] = htons(eeprom[i + 10]);</div><div class='add'>+		addr[i] = htons(eeprom[i + 10]);</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)addr);</div><div class='ctx'> 	if (print_info)</div><div class='ctx'> 		pr_cont(" %pM", dev-&gt;dev_addr);</div><div class='ctx'> 	/* Unfortunately an all zero eeprom passes the checksum and this</div><div class='hunk'>@@ -1302,7 +1302,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,</div><div class='ctx'> 	if (print_info)</div><div class='ctx'> 		pr_cont(", IRQ %d\n", dev-&gt;irq);</div><div class='ctx'> 	/* Tell them about an invalid IRQ. */</div><div class='del'>-	if (dev-&gt;irq &lt;= 0 || dev-&gt;irq &gt;= nr_irqs)</div><div class='add'>+	if (dev-&gt;irq &lt;= 0 || dev-&gt;irq &gt;= irq_get_nr_irqs())</div><div class='ctx'> 		pr_warn(" *** Warning: IRQ %d is unlikely to work! ***\n",</div><div class='ctx'> 			dev-&gt;irq);</div><div class='ctx'> </div><div class='hunk'>@@ -1466,7 +1466,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,</div><div class='ctx'> 	if (pdev) {</div><div class='ctx'> 		vp-&gt;pm_state_valid = 1;</div><div class='ctx'> 		pci_save_state(pdev);</div><div class='del'>- 		acpi_set_WOL(dev);</div><div class='add'>+		acpi_set_WOL(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	retval = register_netdev(dev);</div><div class='ctx'> 	if (retval == 0)</div><div class='hunk'>@@ -1550,7 +1550,7 @@ vortex_up(struct net_device *dev)</div><div class='ctx'> 	struct vortex_private *vp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = vp-&gt;ioaddr;</div><div class='ctx'> 	unsigned int config;</div><div class='del'>-	int i, mii_reg1, mii_reg5, err = 0;</div><div class='add'>+	int i, mii_reg5, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (VORTEX_PCI(vp)) {</div><div class='ctx'> 		pci_set_power_state(VORTEX_PCI(vp), PCI_D0);	/* Go active */</div><div class='hunk'>@@ -1607,7 +1607,7 @@ vortex_up(struct net_device *dev)</div><div class='ctx'> 	window_write32(vp, config, 3, Wn3_Config);</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;if_port == XCVR_MII || dev-&gt;if_port == XCVR_NWAY) {</div><div class='del'>-		mii_reg1 = mdio_read(dev, vp-&gt;phys[0], MII_BMSR);</div><div class='add'>+		mdio_read(dev, vp-&gt;phys[0], MII_BMSR);</div><div class='ctx'> 		mii_reg5 = mdio_read(dev, vp-&gt;phys[0], MII_LPA);</div><div class='ctx'> 		vp-&gt;partner_flow_ctrl = ((mii_reg5 &amp; 0x0400) != 0);</div><div class='ctx'> 		vp-&gt;mii.full_duplex = vp-&gt;full_duplex;</div><div class='hunk'>@@ -1783,7 +1783,7 @@ out:</div><div class='ctx'> static void</div><div class='ctx'> vortex_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct vortex_private *vp = from_timer(vp, t, timer);</div><div class='add'>+	struct vortex_private *vp = timer_container_of(vp, t, timer);</div><div class='ctx'> 	struct net_device *dev = vp-&gt;mii.dev;</div><div class='ctx'> 	void __iomem *ioaddr = vp-&gt;ioaddr;</div><div class='ctx'> 	int next_tick = 60*HZ;</div><div class='hunk'>@@ -1879,7 +1879,7 @@ leave_media_alone:</div><div class='ctx'> 		iowrite16(FakeIntr, ioaddr + EL3_CMD);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void vortex_tx_timeout(struct net_device *dev)</div><div class='add'>+static void vortex_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct vortex_private *vp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = vp-&gt;ioaddr;</div><div class='hunk'>@@ -1956,7 +1956,7 @@ vortex_error(struct net_device *dev, int status)</div><div class='ctx'> 				   dev-&gt;name, tx_status);</div><div class='ctx'> 			if (tx_status == 0x82) {</div><div class='ctx'> 				pr_err("Probably a duplex mismatch.  See "</div><div class='del'>-						"Documentation/networking/device_drivers/3com/vortex.txt\n");</div><div class='add'>+						"Documentation/networking/device_drivers/ethernet/3com/vortex.rst\n");</div><div class='ctx'> 			}</div><div class='ctx'> 			dump_tx_ring(dev);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2175,7 +2175,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 			dma_addr = skb_frag_dma_map(vp-&gt;gendev, frag,</div><div class='ctx'> 						    0,</div><div class='del'>-						    frag-&gt;size,</div><div class='add'>+						    skb_frag_size(frag),</div><div class='ctx'> 						    DMA_TO_DEVICE);</div><div class='ctx'> 			if (dma_mapping_error(vp-&gt;gendev, dma_addr)) {</div><div class='ctx'> 				for(i = i-1; i &gt;= 0; i--)</div><div class='hunk'>@@ -2691,7 +2691,7 @@ vortex_down(struct net_device *dev, int final_down)</div><div class='ctx'> 	netdev_reset_queue(dev);</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;vp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;vp-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off statistics ASAP.  We update dev-&gt;stats below. */</div><div class='ctx'> 	iowrite16(StatsDisable, ioaddr + EL3_CMD);</div><div class='hunk'>@@ -2788,7 +2788,7 @@ static void</div><div class='ctx'> dump_tx_ring(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	if (vortex_debug &gt; 0) {</div><div class='del'>-	struct vortex_private *vp = netdev_priv(dev);</div><div class='add'>+		struct vortex_private *vp = netdev_priv(dev);</div><div class='ctx'> 		void __iomem *ioaddr = vp-&gt;ioaddr;</div><div class='ctx'> </div><div class='ctx'> 		if (vp-&gt;full_bus_master_tx) {</div><div class='hunk'>@@ -2959,13 +2959,13 @@ static void vortex_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct vortex_private *vp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	if (VORTEX_PCI(vp)) {</div><div class='del'>-		strlcpy(info-&gt;bus_info, pci_name(VORTEX_PCI(vp)),</div><div class='add'>+		strscpy(info-&gt;bus_info, pci_name(VORTEX_PCI(vp)),</div><div class='ctx'> 			sizeof(info-&gt;bus_info));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (VORTEX_EISA(vp))</div><div class='del'>-			strlcpy(info-&gt;bus_info, dev_name(vp-&gt;gendev),</div><div class='add'>+			strscpy(info-&gt;bus_info, dev_name(vp-&gt;gendev),</div><div class='ctx'> 				sizeof(info-&gt;bus_info));</div><div class='ctx'> 		else</div><div class='ctx'> 			snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='head'>diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig<br/>index 3a6fc99c6f32..1fbab79e2be4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_3COM</div><div class='ctx'> 	bool "3Com devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on ISA || EISA || PCI || PCMCIA</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -20,7 +20,7 @@ if NET_VENDOR_3COM</div><div class='ctx'> config EL3</div><div class='ctx'> 	tristate "3c509/3c579 \"EtherLink III\" support"</div><div class='ctx'> 	depends on (ISA || EISA)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to the 3Com</div><div class='ctx'> 	  EtherLinkIII series, say Y here.</div><div class='ctx'> </div><div class='hunk'>@@ -34,7 +34,8 @@ config EL3</div><div class='ctx'> config 3C515</div><div class='ctx'> 	tristate "3c515 ISA \"Fast EtherLink\""</div><div class='ctx'> 	depends on ISA &amp;&amp; ISA_DMA_API &amp;&amp; !PPC32</div><div class='del'>-	---help---</div><div class='add'>+	select NETDEV_LEGACY_INIT</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet</div><div class='ctx'> 	  network card, say Y here.</div><div class='ctx'> </div><div class='hunk'>@@ -43,8 +44,8 @@ config 3C515</div><div class='ctx'> </div><div class='ctx'> config PCMCIA_3C574</div><div class='ctx'> 	tristate "3Com 3c574 PCMCIA support"</div><div class='del'>-	depends on PCMCIA</div><div class='del'>-	---help---</div><div class='add'>+	depends on PCMCIA &amp;&amp; HAS_IOPORT</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you intend to attach a 3Com 3c574 or compatible PCMCIA</div><div class='ctx'> 	  (PC-card) Fast Ethernet card to your computer.</div><div class='ctx'> </div><div class='hunk'>@@ -53,8 +54,8 @@ config PCMCIA_3C574</div><div class='ctx'> </div><div class='ctx'> config PCMCIA_3C589</div><div class='ctx'> 	tristate "3Com 3c589 PCMCIA support"</div><div class='del'>-	depends on PCMCIA</div><div class='del'>-	---help---</div><div class='add'>+	depends on PCMCIA &amp;&amp; HAS_IOPORT</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you intend to attach a 3Com 3c589 or compatible PCMCIA</div><div class='ctx'> 	  (PC-card) Ethernet card to your computer.</div><div class='ctx'> </div><div class='hunk'>@@ -65,7 +66,7 @@ config VORTEX</div><div class='ctx'> 	tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"</div><div class='ctx'> 	depends on (PCI || EISA) &amp;&amp; HAS_IOPORT_MAP</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables driver support for a large number of 10Mbps and</div><div class='ctx'> 	  10/100Mbps EISA, PCI and Cardbus 3Com network cards:</div><div class='ctx'> </div><div class='hunk'>@@ -76,8 +77,8 @@ config VORTEX</div><div class='ctx'> 	  "Hurricane" (3c555/3cSOHO)                           PCI</div><div class='ctx'> </div><div class='ctx'> 	  If you have such a card, say Y here.  More specific information is in</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/3com/vortex.txt&gt; and</div><div class='del'>-	  in the comments at the beginning of</div><div class='add'>+	  &lt;file:Documentation/networking/device_drivers/ethernet/3com/vortex.rst&gt;</div><div class='add'>+	  and in the comments at the beginning of</div><div class='ctx'> 	  &lt;file:drivers/net/ethernet/3com/3c59x.c&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this support as a module, choose M here.</div><div class='hunk'>@@ -86,7 +87,7 @@ config TYPHOON</div><div class='ctx'> 	tristate "3cr990 series \"Typhoon\" support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables driver support for the 3cr990 series of cards:</div><div class='ctx'> </div><div class='ctx'> 	  3C990-TX, 3CR990-TX-95, 3CR990-TX-97, 3CR990-FX-95, 3CR990-FX-97,</div><div class='head'>diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c<br/>index be823c186517..aaaff3ba43ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/typhoon.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/typhoon.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/typhoon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/typhoon.c</a></div><div class='hunk'>@@ -127,7 +127,6 @@ static const int multicast_filter_limit = 32;</div><div class='ctx'> #include "typhoon.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("David Dillow &lt;dave@thedillows.org&gt;");</div><div class='del'>-MODULE_VERSION("1.0");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_FIRMWARE(FIRMWARE_NAME);</div><div class='ctx'> MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");</div><div class='hunk'>@@ -139,11 +138,6 @@ MODULE_PARM_DESC(use_mmio, "Use MMIO (1) or PIO(0) to access the NIC. "</div><div class='ctx'> module_param(rx_copybreak, int, 0);</div><div class='ctx'> module_param(use_mmio, int, 0);</div><div class='ctx'> </div><div class='del'>-#if defined(NETIF_F_TSO) &amp;&amp; MAX_SKB_FRAGS &gt; 32</div><div class='del'>-#warning Typhoon only supports 32 entries in its SG list for TSO, disabling TSO</div><div class='del'>-#undef NETIF_F_TSO</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> #if TXLO_ENTRIES &lt;= (2 * MAX_SKB_FRAGS)</div><div class='ctx'> #error TX ring too small!</div><div class='ctx'> #endif</div><div class='hunk'>@@ -311,7 +305,7 @@ enum state_values {</div><div class='ctx'>  * cannot pass a read, so this forces current writes to post.</div><div class='ctx'>  */</div><div class='ctx'> #define typhoon_post_pci_writes(x) \</div><div class='del'>-	do { if(likely(use_mmio)) ioread32(x+TYPHOON_REG_HEARTBEAT); } while(0)</div><div class='add'>+	do { if (likely(use_mmio)) ioread32(x+TYPHOON_REG_HEARTBEAT); } while (0)</div><div class='ctx'> </div><div class='ctx'> /* We'll wait up to six seconds for a reset, and half a second normally.</div><div class='ctx'>  */</div><div class='hunk'>@@ -381,7 +375,7 @@ typhoon_reset(void __iomem *ioaddr, int wait_type)</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> 	int timeout;</div><div class='ctx'> </div><div class='del'>-	if(wait_type == WaitNoSleep)</div><div class='add'>+	if (wait_type == WaitNoSleep)</div><div class='ctx'> 		timeout = TYPHOON_RESET_TIMEOUT_NOSLEEP;</div><div class='ctx'> 	else</div><div class='ctx'> 		timeout = TYPHOON_RESET_TIMEOUT_SLEEP;</div><div class='hunk'>@@ -394,13 +388,13 @@ typhoon_reset(void __iomem *ioaddr, int wait_type)</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> 	iowrite32(TYPHOON_RESET_NONE, ioaddr + TYPHOON_REG_SOFT_RESET);</div><div class='ctx'> </div><div class='del'>-	if(wait_type != NoWait) {</div><div class='del'>-		for(i = 0; i &lt; timeout; i++) {</div><div class='del'>-			if(ioread32(ioaddr + TYPHOON_REG_STATUS) ==</div><div class='add'>+	if (wait_type != NoWait) {</div><div class='add'>+		for (i = 0; i &lt; timeout; i++) {</div><div class='add'>+			if (ioread32(ioaddr + TYPHOON_REG_STATUS) ==</div><div class='ctx'> 			   TYPHOON_STATUS_WAITING_FOR_HOST)</div><div class='ctx'> 				goto out;</div><div class='ctx'> </div><div class='del'>-			if(wait_type == WaitSleep)</div><div class='add'>+			if (wait_type == WaitSleep)</div><div class='ctx'> 				schedule_timeout_uninterruptible(1);</div><div class='ctx'> 			else</div><div class='ctx'> 				udelay(TYPHOON_UDELAY);</div><div class='hunk'>@@ -423,7 +417,7 @@ out:</div><div class='ctx'> 	 * which should be enough (I've see it work well at 100us, but still</div><div class='ctx'> 	 * saw occasional problems.)</div><div class='ctx'> 	 */</div><div class='del'>-	if(wait_type == WaitSleep)</div><div class='add'>+	if (wait_type == WaitSleep)</div><div class='ctx'> 		msleep(5);</div><div class='ctx'> 	else</div><div class='ctx'> 		udelay(500);</div><div class='hunk'>@@ -435,8 +429,8 @@ typhoon_wait_status(void __iomem *ioaddr, u32 wait_value)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; TYPHOON_WAIT_TIMEOUT; i++) {</div><div class='del'>-		if(ioread32(ioaddr + TYPHOON_REG_STATUS) == wait_value)</div><div class='add'>+	for (i = 0; i &lt; TYPHOON_WAIT_TIMEOUT; i++) {</div><div class='add'>+		if (ioread32(ioaddr + TYPHOON_REG_STATUS) == wait_value)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		udelay(TYPHOON_UDELAY);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -450,7 +444,7 @@ out:</div><div class='ctx'> static inline void</div><div class='ctx'> typhoon_media_status(struct net_device *dev, struct resp_desc *resp)</div><div class='ctx'> {</div><div class='del'>-	if(resp-&gt;parm1 &amp; TYPHOON_MEDIA_STAT_NO_LINK)</div><div class='add'>+	if (resp-&gt;parm1 &amp; TYPHOON_MEDIA_STAT_NO_LINK)</div><div class='ctx'> 		netif_carrier_off(dev);</div><div class='ctx'> 	else</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='hunk'>@@ -466,7 +460,7 @@ typhoon_hello(struct typhoon *tp)</div><div class='ctx'> 	 * card in a long while. If the lock is held, then we're in the</div><div class='ctx'> 	 * process of issuing a command, so we don't need to respond.</div><div class='ctx'> 	 */</div><div class='del'>-	if(spin_trylock(&amp;tp-&gt;command_lock)) {</div><div class='add'>+	if (spin_trylock(&amp;tp-&gt;command_lock)) {</div><div class='ctx'> 		cmd = (struct cmd_desc *)(ring-&gt;ringBase + ring-&gt;lastWrite);</div><div class='ctx'> 		typhoon_inc_cmd_index(&amp;ring-&gt;lastWrite, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -490,32 +484,32 @@ typhoon_process_response(struct typhoon *tp, int resp_size,</div><div class='ctx'> </div><div class='ctx'> 	cleared = le32_to_cpu(indexes-&gt;respCleared);</div><div class='ctx'> 	ready = le32_to_cpu(indexes-&gt;respReady);</div><div class='del'>-	while(cleared != ready) {</div><div class='add'>+	while (cleared != ready) {</div><div class='ctx'> 		resp = (struct resp_desc *)(base + cleared);</div><div class='ctx'> 		count = resp-&gt;numDesc + 1;</div><div class='del'>-		if(resp_save &amp;&amp; resp-&gt;seqNo) {</div><div class='del'>-			if(count &gt; resp_size) {</div><div class='add'>+		if (resp_save &amp;&amp; resp-&gt;seqNo) {</div><div class='add'>+			if (count &gt; resp_size) {</div><div class='ctx'> 				resp_save-&gt;flags = TYPHOON_RESP_ERROR;</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			wrap_len = 0;</div><div class='ctx'> 			len = count * sizeof(*resp);</div><div class='del'>-			if(unlikely(cleared + len &gt; RESPONSE_RING_SIZE)) {</div><div class='add'>+			if (unlikely(cleared + len &gt; RESPONSE_RING_SIZE)) {</div><div class='ctx'> 				wrap_len = cleared + len - RESPONSE_RING_SIZE;</div><div class='ctx'> 				len = RESPONSE_RING_SIZE - cleared;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			memcpy(resp_save, resp, len);</div><div class='del'>-			if(unlikely(wrap_len)) {</div><div class='add'>+			if (unlikely(wrap_len)) {</div><div class='ctx'> 				resp_save += len / sizeof(*resp);</div><div class='ctx'> 				memcpy(resp_save, base, wrap_len);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			resp_save = NULL;</div><div class='del'>-		} else if(resp-&gt;cmd == TYPHOON_CMD_READ_MEDIA_STATUS) {</div><div class='add'>+		} else if (resp-&gt;cmd == TYPHOON_CMD_READ_MEDIA_STATUS) {</div><div class='ctx'> 			typhoon_media_status(tp-&gt;dev, resp);</div><div class='del'>-		} else if(resp-&gt;cmd == TYPHOON_CMD_HELLO_RESP) {</div><div class='add'>+		} else if (resp-&gt;cmd == TYPHOON_CMD_HELLO_RESP) {</div><div class='ctx'> 			typhoon_hello(tp);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			netdev_err(tp-&gt;dev,</div><div class='hunk'>@@ -589,19 +583,19 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,</div><div class='ctx'> 	freeCmd = typhoon_num_free_cmd(tp);</div><div class='ctx'> 	freeResp = typhoon_num_free_resp(tp);</div><div class='ctx'> </div><div class='del'>-	if(freeCmd &lt; num_cmd || freeResp &lt; num_resp) {</div><div class='add'>+	if (freeCmd &lt; num_cmd || freeResp &lt; num_resp) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "no descs for cmd, had (needed) %d (%d) cmd, %d (%d) resp\n",</div><div class='ctx'> 			   freeCmd, num_cmd, freeResp, num_resp);</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(cmd-&gt;flags &amp; TYPHOON_CMD_RESPOND) {</div><div class='add'>+	if (cmd-&gt;flags &amp; TYPHOON_CMD_RESPOND) {</div><div class='ctx'> 		/* If we're expecting a response, but the caller hasn't given</div><div class='ctx'> 		 * us a place to put it, we'll provide one.</div><div class='ctx'> 		 */</div><div class='ctx'> 		tp-&gt;awaiting_resp = 1;</div><div class='del'>-		if(resp == NULL) {</div><div class='add'>+		if (resp == NULL) {</div><div class='ctx'> 			resp = &amp;local_resp;</div><div class='ctx'> 			num_resp = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -609,13 +603,13 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,</div><div class='ctx'> </div><div class='ctx'> 	wrap_len = 0;</div><div class='ctx'> 	len = num_cmd * sizeof(*cmd);</div><div class='del'>-	if(unlikely(ring-&gt;lastWrite + len &gt; COMMAND_RING_SIZE)) {</div><div class='add'>+	if (unlikely(ring-&gt;lastWrite + len &gt; COMMAND_RING_SIZE)) {</div><div class='ctx'> 		wrap_len = ring-&gt;lastWrite + len - COMMAND_RING_SIZE;</div><div class='ctx'> 		len = COMMAND_RING_SIZE - ring-&gt;lastWrite;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ring-&gt;ringBase + ring-&gt;lastWrite, cmd, len);</div><div class='del'>-	if(unlikely(wrap_len)) {</div><div class='add'>+	if (unlikely(wrap_len)) {</div><div class='ctx'> 		struct cmd_desc *wrap_ptr = cmd;</div><div class='ctx'> 		wrap_ptr += len / sizeof(*cmd);</div><div class='ctx'> 		memcpy(ring-&gt;ringBase, wrap_ptr, wrap_len);</div><div class='hunk'>@@ -629,7 +623,7 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,</div><div class='ctx'> 	iowrite32(ring-&gt;lastWrite, tp-&gt;ioaddr + TYPHOON_REG_CMD_READY);</div><div class='ctx'> 	typhoon_post_pci_writes(tp-&gt;ioaddr);</div><div class='ctx'> </div><div class='del'>-	if((cmd-&gt;flags &amp; TYPHOON_CMD_RESPOND) == 0)</div><div class='add'>+	if ((cmd-&gt;flags &amp; TYPHOON_CMD_RESPOND) == 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Ugh. We'll be here about 8ms, spinning our thumbs, unable to</div><div class='hunk'>@@ -649,14 +643,14 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,</div><div class='ctx'> 	 * wait here.</div><div class='ctx'> 	 */</div><div class='ctx'> 	got_resp = 0;</div><div class='del'>-	for(i = 0; i &lt; TYPHOON_WAIT_TIMEOUT &amp;&amp; !got_resp; i++) {</div><div class='del'>-		if(indexes-&gt;respCleared != indexes-&gt;respReady)</div><div class='add'>+	for (i = 0; i &lt; TYPHOON_WAIT_TIMEOUT &amp;&amp; !got_resp; i++) {</div><div class='add'>+		if (indexes-&gt;respCleared != indexes-&gt;respReady)</div><div class='ctx'> 			got_resp = typhoon_process_response(tp, num_resp,</div><div class='ctx'> 								resp);</div><div class='ctx'> 		udelay(TYPHOON_UDELAY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(!got_resp) {</div><div class='add'>+	if (!got_resp) {</div><div class='ctx'> 		err = -ETIMEDOUT;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -664,11 +658,11 @@ typhoon_issue_command(struct typhoon *tp, int num_cmd, struct cmd_desc *cmd,</div><div class='ctx'> 	/* Collect the error response even if we don't care about the</div><div class='ctx'> 	 * rest of the response</div><div class='ctx'> 	 */</div><div class='del'>-	if(resp-&gt;flags &amp; TYPHOON_RESP_ERROR)</div><div class='add'>+	if (resp-&gt;flags &amp; TYPHOON_RESP_ERROR)</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if(tp-&gt;awaiting_resp) {</div><div class='add'>+	if (tp-&gt;awaiting_resp) {</div><div class='ctx'> 		tp-&gt;awaiting_resp = 0;</div><div class='ctx'> 		smp_wmb();</div><div class='ctx'> </div><div class='hunk'>@@ -679,7 +673,7 @@ out:</div><div class='ctx'> 		 * time. So, check for it, and interrupt ourselves if this</div><div class='ctx'> 		 * is the case.</div><div class='ctx'> 		 */</div><div class='del'>-		if(indexes-&gt;respCleared != indexes-&gt;respReady)</div><div class='add'>+		if (indexes-&gt;respCleared != indexes-&gt;respReady)</div><div class='ctx'> 			iowrite32(1, tp-&gt;ioaddr + TYPHOON_REG_SELF_INTERRUPT);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -749,7 +743,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 * between marking the queue awake and updating the cleared index.</div><div class='ctx'> 	 * Just loop and it will appear. This comes from the acenic driver.</div><div class='ctx'> 	 */</div><div class='del'>-	while(unlikely(typhoon_num_free_tx(txRing) &lt; (numDesc + 2)))</div><div class='add'>+	while (unlikely(typhoon_num_free_tx(txRing) &lt; (numDesc + 2)))</div><div class='ctx'> 		smp_rmb();</div><div class='ctx'> </div><div class='ctx'> 	first_txd = (struct tx_desc *) (txRing-&gt;ringBase + txRing-&gt;lastWrite);</div><div class='hunk'>@@ -761,7 +755,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	first_txd-&gt;tx_addr = (u64)((unsigned long) skb);</div><div class='ctx'> 	first_txd-&gt;processFlags = 0;</div><div class='ctx'> </div><div class='del'>-	if(skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='ctx'> 		/* The 3XP will figure out if this is UDP/TCP */</div><div class='ctx'> 		first_txd-&gt;processFlags |= TYPHOON_TX_PF_TCP_CHKSUM;</div><div class='ctx'> 		first_txd-&gt;processFlags |= TYPHOON_TX_PF_UDP_CHKSUM;</div><div class='hunk'>@@ -789,9 +783,9 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* No need to worry about padding packet -- the firmware pads</div><div class='ctx'> 	 * it with zeros to ETH_ZLEN for us.</div><div class='ctx'> 	 */</div><div class='del'>-	if(skb_shinfo(skb)-&gt;nr_frags == 0) {</div><div class='del'>-		skb_dma = pci_map_single(tp-&gt;tx_pdev, skb-&gt;data, skb-&gt;len,</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags == 0) {</div><div class='add'>+		skb_dma = dma_map_single(&amp;tp-&gt;tx_pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+					 skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 		txd-&gt;flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;</div><div class='ctx'> 		txd-&gt;len = cpu_to_le16(skb-&gt;len);</div><div class='ctx'> 		txd-&gt;frag.addr = cpu_to_le32(skb_dma);</div><div class='hunk'>@@ -801,8 +795,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		int i, len;</div><div class='ctx'> </div><div class='ctx'> 		len = skb_headlen(skb);</div><div class='del'>-		skb_dma = pci_map_single(tp-&gt;tx_pdev, skb-&gt;data, len,</div><div class='del'>-				         PCI_DMA_TODEVICE);</div><div class='add'>+		skb_dma = dma_map_single(&amp;tp-&gt;tx_pdev-&gt;dev, skb-&gt;data, len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 		txd-&gt;flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;</div><div class='ctx'> 		txd-&gt;len = cpu_to_le16(len);</div><div class='ctx'> 		txd-&gt;frag.addr = cpu_to_le32(skb_dma);</div><div class='hunk'>@@ -819,8 +813,8 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 			len = skb_frag_size(frag);</div><div class='ctx'> 			frag_addr = skb_frag_address(frag);</div><div class='del'>-			skb_dma = pci_map_single(tp-&gt;tx_pdev, frag_addr, len,</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='add'>+			skb_dma = dma_map_single(&amp;tp-&gt;tx_pdev-&gt;dev, frag_addr,</div><div class='add'>+						 len, DMA_TO_DEVICE);</div><div class='ctx'> 			txd-&gt;flags = TYPHOON_FRAG_DESC | TYPHOON_DESC_VALID;</div><div class='ctx'> 			txd-&gt;len = cpu_to_le16(len);</div><div class='ctx'> 			txd-&gt;frag.addr = cpu_to_le32(skb_dma);</div><div class='hunk'>@@ -841,14 +835,14 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	numDesc = MAX_SKB_FRAGS + TSO_NUM_DESCRIPTORS + 1;</div><div class='ctx'> </div><div class='del'>-	if(typhoon_num_free_tx(txRing) &lt; (numDesc + 2)) {</div><div class='add'>+	if (typhoon_num_free_tx(txRing) &lt; (numDesc + 2)) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* A Tx complete IRQ could have gotten between, making</div><div class='ctx'> 		 * the ring free again. Only need to recheck here, since</div><div class='ctx'> 		 * Tx is serialized.</div><div class='ctx'> 		 */</div><div class='del'>-		if(typhoon_num_free_tx(txRing) &gt;= (numDesc + 2))</div><div class='add'>+		if (typhoon_num_free_tx(txRing) &gt;= (numDesc + 2))</div><div class='ctx'> 			netif_wake_queue(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -864,7 +858,7 @@ typhoon_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	__le16 filter;</div><div class='ctx'> </div><div class='ctx'> 	filter = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST;</div><div class='del'>-	if(dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='ctx'> 		filter |= TYPHOON_RX_FILTER_PROMISCOUS;</div><div class='ctx'> 	} else if ((netdev_mc_count(dev) &gt; multicast_filter_limit) ||</div><div class='ctx'> 		  (dev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='hunk'>@@ -906,7 +900,7 @@ typhoon_do_get_stats(struct typhoon *tp)</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_WITH_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_READ_STATS);</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 7, xp_resp);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* 3Com's Linux driver uses txMultipleCollisions as it's</div><div class='hunk'>@@ -954,10 +948,10 @@ typhoon_get_stats(struct net_device *dev)</div><div class='ctx'> 	struct net_device_stats *saved = &amp;tp-&gt;stats_saved;</div><div class='ctx'> </div><div class='ctx'> 	smp_rmb();</div><div class='del'>-	if(tp-&gt;card_state == Sleeping)</div><div class='add'>+	if (tp-&gt;card_state == Sleeping)</div><div class='ctx'> 		return saved;</div><div class='ctx'> </div><div class='del'>-	if(typhoon_do_get_stats(tp) &lt; 0) {</div><div class='add'>+	if (typhoon_do_get_stats(tp) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "error getting stats\n");</div><div class='ctx'> 		return saved;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -974,13 +968,13 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 	struct resp_desc xp_resp[3];</div><div class='ctx'> </div><div class='ctx'> 	smp_rmb();</div><div class='del'>-	if(tp-&gt;card_state == Sleeping) {</div><div class='del'>-		strlcpy(info-&gt;fw_version, "Sleep image",</div><div class='add'>+	if (tp-&gt;card_state == Sleeping) {</div><div class='add'>+		strscpy(info-&gt;fw_version, "Sleep image",</div><div class='ctx'> 			sizeof(info-&gt;fw_version));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		INIT_COMMAND_WITH_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_READ_VERSIONS);</div><div class='del'>-		if(typhoon_issue_command(tp, 1, &amp;xp_cmd, 3, xp_resp) &lt; 0) {</div><div class='del'>-			strlcpy(info-&gt;fw_version, "Unknown runtime",</div><div class='add'>+		if (typhoon_issue_command(tp, 1, &amp;xp_cmd, 3, xp_resp) &lt; 0) {</div><div class='add'>+			strscpy(info-&gt;fw_version, "Unknown runtime",</div><div class='ctx'> 				sizeof(info-&gt;fw_version));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);</div><div class='hunk'>@@ -990,8 +984,8 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -1026,7 +1020,7 @@ typhoon_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(tp-&gt;capabilities &amp; TYPHOON_FIBER) {</div><div class='add'>+	if (tp-&gt;capabilities &amp; TYPHOON_FIBER) {</div><div class='ctx'> 		supported |= SUPPORTED_FIBRE;</div><div class='ctx'> 		advertising |= ADVERTISED_FIBRE;</div><div class='ctx'> 		cmd-&gt;base.port = PORT_FIBRE;</div><div class='hunk'>@@ -1043,7 +1037,7 @@ typhoon_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	cmd-&gt;base.speed = tp-&gt;speed;</div><div class='ctx'> 	cmd-&gt;base.duplex = tp-&gt;duplex;</div><div class='ctx'> 	cmd-&gt;base.phy_address = 0;</div><div class='del'>-	if(tp-&gt;xcvr_select == TYPHOON_XCVR_AUTONEG)</div><div class='add'>+	if (tp-&gt;xcvr_select == TYPHOON_XCVR_AUTONEG)</div><div class='ctx'> 		cmd-&gt;base.autoneg = AUTONEG_ENABLE;</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd-&gt;base.autoneg = AUTONEG_DISABLE;</div><div class='hunk'>@@ -1091,7 +1085,7 @@ typhoon_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_XCVR_SELECT);</div><div class='ctx'> 	xp_cmd.parm1 = xcvr;</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;xcvr_select = xcvr;</div><div class='hunk'>@@ -1114,9 +1108,9 @@ typhoon_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> </div><div class='ctx'> 	wol-&gt;supported = WAKE_PHY | WAKE_MAGIC;</div><div class='ctx'> 	wol-&gt;wolopts = 0;</div><div class='del'>-	if(tp-&gt;wol_events &amp; TYPHOON_WAKE_LINK_EVENT)</div><div class='add'>+	if (tp-&gt;wol_events &amp; TYPHOON_WAKE_LINK_EVENT)</div><div class='ctx'> 		wol-&gt;wolopts |= WAKE_PHY;</div><div class='del'>-	if(tp-&gt;wol_events &amp; TYPHOON_WAKE_MAGIC_PKT)</div><div class='add'>+	if (tp-&gt;wol_events &amp; TYPHOON_WAKE_MAGIC_PKT)</div><div class='ctx'> 		wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='ctx'> 	memset(&amp;wol-&gt;sopass, 0, sizeof(wol-&gt;sopass));</div><div class='ctx'> }</div><div class='hunk'>@@ -1126,20 +1120,22 @@ typhoon_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct typhoon *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if(wol-&gt;wolopts &amp; ~(WAKE_PHY | WAKE_MAGIC))</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~(WAKE_PHY | WAKE_MAGIC))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;wol_events = 0;</div><div class='del'>-	if(wol-&gt;wolopts &amp; WAKE_PHY)</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_PHY)</div><div class='ctx'> 		tp-&gt;wol_events |= TYPHOON_WAKE_LINK_EVENT;</div><div class='del'>-	if(wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='ctx'> 		tp-&gt;wol_events |= TYPHOON_WAKE_MAGIC_PKT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)</div><div class='add'>+typhoon_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering,</div><div class='add'>+		      struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	ering-&gt;rx_max_pending = RXENT_ENTRIES;</div><div class='ctx'> 	ering-&gt;tx_max_pending = TXLO_ENTRIES - 1;</div><div class='hunk'>@@ -1163,8 +1159,8 @@ typhoon_wait_interrupt(void __iomem *ioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; TYPHOON_WAIT_TIMEOUT; i++) {</div><div class='del'>-		if(ioread32(ioaddr + TYPHOON_REG_INTR_STATUS) &amp;</div><div class='add'>+	for (i = 0; i &lt; TYPHOON_WAIT_TIMEOUT; i++) {</div><div class='add'>+		if (ioread32(ioaddr + TYPHOON_REG_INTR_STATUS) &amp;</div><div class='ctx'> 		   TYPHOON_INTR_BOOTCMD)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		udelay(TYPHOON_UDELAY);</div><div class='hunk'>@@ -1350,13 +1346,13 @@ typhoon_download_firmware(struct typhoon *tp)</div><div class='ctx'> 	image_data = typhoon_fw-&gt;data;</div><div class='ctx'> 	fHdr = (struct typhoon_file_header *) image_data;</div><div class='ctx'> </div><div class='del'>-	/* Cannot just map the firmware image using pci_map_single() as</div><div class='add'>+	/* Cannot just map the firmware image using dma_map_single() as</div><div class='ctx'> 	 * the firmware is vmalloc()'d and may not be physically contiguous,</div><div class='del'>-	 * so we allocate some consistent memory to copy the sections into.</div><div class='add'>+	 * so we allocate some coherent memory to copy the sections into.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = -ENOMEM;</div><div class='del'>-	dpage = pci_alloc_consistent(pdev, PAGE_SIZE, &amp;dpage_dma);</div><div class='del'>-	if(!dpage) {</div><div class='add'>+	dpage = dma_alloc_coherent(&amp;pdev-&gt;dev, PAGE_SIZE, &amp;dpage_dma, GFP_ATOMIC);</div><div class='add'>+	if (!dpage) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "no DMA mem for firmware\n");</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1369,7 +1365,7 @@ typhoon_download_firmware(struct typhoon *tp)</div><div class='ctx'> 	       ioaddr + TYPHOON_REG_INTR_MASK);</div><div class='ctx'> </div><div class='ctx'> 	err = -ETIMEDOUT;</div><div class='del'>-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0) {</div><div class='add'>+	if (typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "card ready timeout\n");</div><div class='ctx'> 		goto err_out_irq;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1398,16 +1394,16 @@ typhoon_download_firmware(struct typhoon *tp)</div><div class='ctx'> 	 * last write to the command register to post, so</div><div class='ctx'> 	 * we don't need a typhoon_post_pci_writes() after it.</div><div class='ctx'> 	 */</div><div class='del'>-	for(i = 0; i &lt; numSections; i++) {</div><div class='add'>+	for (i = 0; i &lt; numSections; i++) {</div><div class='ctx'> 		sHdr = (struct typhoon_section_header *) image_data;</div><div class='ctx'> 		image_data += sizeof(struct typhoon_section_header);</div><div class='ctx'> 		load_addr = le32_to_cpu(sHdr-&gt;startAddr);</div><div class='ctx'> 		section_len = le32_to_cpu(sHdr-&gt;len);</div><div class='ctx'> </div><div class='del'>-		while(section_len) {</div><div class='add'>+		while (section_len) {</div><div class='ctx'> 			len = min_t(u32, section_len, PAGE_SIZE);</div><div class='ctx'> </div><div class='del'>-			if(typhoon_wait_interrupt(ioaddr) &lt; 0 ||</div><div class='add'>+			if (typhoon_wait_interrupt(ioaddr) &lt; 0 ||</div><div class='ctx'> 			   ioread32(ioaddr + TYPHOON_REG_STATUS) !=</div><div class='ctx'> 			   TYPHOON_STATUS_WAITING_FOR_SEGMENT) {</div><div class='ctx'> 				netdev_err(tp-&gt;dev, "segment ready timeout\n");</div><div class='hunk'>@@ -1420,8 +1416,7 @@ typhoon_download_firmware(struct typhoon *tp)</div><div class='ctx'> 			 * the checksum, we can do this once, at the end.</div><div class='ctx'> 			 */</div><div class='ctx'> 			csum = csum_fold(csum_partial_copy_nocheck(image_data,</div><div class='del'>-								   dpage, len,</div><div class='del'>-								   0));</div><div class='add'>+								   dpage, len));</div><div class='ctx'> </div><div class='ctx'> 			iowrite32(len, ioaddr + TYPHOON_REG_BOOT_LENGTH);</div><div class='ctx'> 			iowrite32(le16_to_cpu((__force __le16)csum),</div><div class='hunk'>@@ -1440,7 +1435,7 @@ typhoon_download_firmware(struct typhoon *tp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wait_interrupt(ioaddr) &lt; 0 ||</div><div class='add'>+	if (typhoon_wait_interrupt(ioaddr) &lt; 0 ||</div><div class='ctx'> 	   ioread32(ioaddr + TYPHOON_REG_STATUS) !=</div><div class='ctx'> 	   TYPHOON_STATUS_WAITING_FOR_SEGMENT) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "final segment ready timeout\n");</div><div class='hunk'>@@ -1449,7 +1444,7 @@ typhoon_download_firmware(struct typhoon *tp)</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(TYPHOON_BOOTCMD_DNLD_COMPLETE, ioaddr + TYPHOON_REG_COMMAND);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_BOOT) &lt; 0) {</div><div class='add'>+	if (typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_BOOT) &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "boot ready timeout, status 0x%0x\n",</div><div class='ctx'> 			   ioread32(ioaddr + TYPHOON_REG_STATUS));</div><div class='ctx'> 		goto err_out_irq;</div><div class='hunk'>@@ -1461,7 +1456,7 @@ err_out_irq:</div><div class='ctx'> 	iowrite32(irqMasked, ioaddr + TYPHOON_REG_INTR_MASK);</div><div class='ctx'> 	iowrite32(irqEnabled, ioaddr + TYPHOON_REG_INTR_ENABLE);</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(pdev, PAGE_SIZE, dpage, dpage_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, PAGE_SIZE, dpage, dpage_dma);</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1472,7 +1467,7 @@ typhoon_boot_3XP(struct typhoon *tp, u32 initial_status)</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;ioaddr;</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wait_status(ioaddr, initial_status) &lt; 0) {</div><div class='add'>+	if (typhoon_wait_status(ioaddr, initial_status) &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "boot ready timeout\n");</div><div class='ctx'> 		goto out_timeout;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1483,7 +1478,7 @@ typhoon_boot_3XP(struct typhoon *tp, u32 initial_status)</div><div class='ctx'> 	iowrite32(TYPHOON_BOOTCMD_REG_BOOT_RECORD,</div><div class='ctx'> 				ioaddr + TYPHOON_REG_COMMAND);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_RUNNING) &lt; 0) {</div><div class='add'>+	if (typhoon_wait_status(ioaddr, TYPHOON_STATUS_RUNNING) &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "boot finish timeout (status 0x%x)\n",</div><div class='ctx'> 			   ioread32(ioaddr + TYPHOON_REG_STATUS));</div><div class='ctx'> 		goto out_timeout;</div><div class='hunk'>@@ -1513,23 +1508,23 @@ typhoon_clean_tx(struct typhoon *tp, struct transmit_ring *txRing,</div><div class='ctx'> 	int dma_len;</div><div class='ctx'> 	int type;</div><div class='ctx'> </div><div class='del'>-	while(lastRead != le32_to_cpu(*index)) {</div><div class='add'>+	while (lastRead != le32_to_cpu(*index)) {</div><div class='ctx'> 		tx = (struct tx_desc *) (txRing-&gt;ringBase + lastRead);</div><div class='ctx'> 		type = tx-&gt;flags &amp; TYPHOON_TYPE_MASK;</div><div class='ctx'> </div><div class='del'>-		if(type == TYPHOON_TX_DESC) {</div><div class='add'>+		if (type == TYPHOON_TX_DESC) {</div><div class='ctx'> 			/* This tx_desc describes a packet.</div><div class='ctx'> 			 */</div><div class='ctx'> 			unsigned long ptr = tx-&gt;tx_addr;</div><div class='ctx'> 			struct sk_buff *skb = (struct sk_buff *) ptr;</div><div class='ctx'> 			dev_kfree_skb_irq(skb);</div><div class='del'>-		} else if(type == TYPHOON_FRAG_DESC) {</div><div class='add'>+		} else if (type == TYPHOON_FRAG_DESC) {</div><div class='ctx'> 			/* This tx_desc describes a memory mapping. Free it.</div><div class='ctx'> 			 */</div><div class='ctx'> 			skb_dma = (dma_addr_t) le32_to_cpu(tx-&gt;frag.addr);</div><div class='ctx'> 			dma_len = le16_to_cpu(tx-&gt;len);</div><div class='del'>-			pci_unmap_single(tp-&gt;pdev, skb_dma, dma_len,</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, skb_dma, dma_len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tx-&gt;flags = 0;</div><div class='hunk'>@@ -1548,7 +1543,7 @@ typhoon_tx_complete(struct typhoon *tp, struct transmit_ring *txRing,</div><div class='ctx'> </div><div class='ctx'> 	/* This will need changing if we start to use the Hi Tx ring. */</div><div class='ctx'> 	lastRead = typhoon_clean_tx(tp, txRing, index);</div><div class='del'>-	if(netif_queue_stopped(tp-&gt;dev) &amp;&amp; typhoon_num_free(txRing-&gt;lastWrite,</div><div class='add'>+	if (netif_queue_stopped(tp-&gt;dev) &amp;&amp; typhoon_num_free(txRing-&gt;lastWrite,</div><div class='ctx'> 				lastRead, TXLO_ENTRIES) &gt; (numDesc + 2))</div><div class='ctx'> 		netif_wake_queue(tp-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1564,7 +1559,7 @@ typhoon_recycle_rx_skb(struct typhoon *tp, u32 idx)</div><div class='ctx'> 	struct basic_ring *ring = &amp;tp-&gt;rxBuffRing;</div><div class='ctx'> 	struct rx_free *r;</div><div class='ctx'> </div><div class='del'>-	if((ring-&gt;lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) ==</div><div class='add'>+	if ((ring-&gt;lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) ==</div><div class='ctx'> 				le32_to_cpu(indexes-&gt;rxBuffCleared)) {</div><div class='ctx'> 		/* no room in ring, just drop the skb</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1595,12 +1590,12 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx)</div><div class='ctx'> </div><div class='ctx'> 	rxb-&gt;skb = NULL;</div><div class='ctx'> </div><div class='del'>-	if((ring-&gt;lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) ==</div><div class='add'>+	if ((ring-&gt;lastWrite + sizeof(*r)) % (RXFREE_ENTRIES * sizeof(*r)) ==</div><div class='ctx'> 				le32_to_cpu(indexes-&gt;rxBuffCleared))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	skb = netdev_alloc_skb(tp-&gt;dev, PKT_BUF_SZ);</div><div class='del'>-	if(!skb)</div><div class='add'>+	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> #if 0</div><div class='hunk'>@@ -1610,8 +1605,8 @@ typhoon_alloc_rx_skb(struct typhoon *tp, u32 idx)</div><div class='ctx'> 	skb_reserve(skb, 2);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	dma_addr = pci_map_single(tp-&gt;pdev, skb-&gt;data,</div><div class='del'>-				  PKT_BUF_SZ, PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_addr = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, skb-&gt;data, PKT_BUF_SZ,</div><div class='add'>+				  DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* Since no card does 64 bit DAC, the high bits will never</div><div class='ctx'> 	 * change from zero.</div><div class='hunk'>@@ -1647,7 +1642,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read</div><div class='ctx'> 	received = 0;</div><div class='ctx'> 	local_ready = le32_to_cpu(*ready);</div><div class='ctx'> 	rxaddr = le32_to_cpu(*cleared);</div><div class='del'>-	while(rxaddr != local_ready &amp;&amp; budget &gt; 0) {</div><div class='add'>+	while (rxaddr != local_ready &amp;&amp; budget &gt; 0) {</div><div class='ctx'> 		rx = (struct rx_desc *) (rxRing-&gt;ringBase + rxaddr);</div><div class='ctx'> 		idx = rx-&gt;addr;</div><div class='ctx'> 		rxb = &amp;tp-&gt;rxbuffers[idx];</div><div class='hunk'>@@ -1656,36 +1651,35 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile __le32 * read</div><div class='ctx'> </div><div class='ctx'> 		typhoon_inc_rx_index(&amp;rxaddr, 1);</div><div class='ctx'> </div><div class='del'>-		if(rx-&gt;flags &amp; TYPHOON_RX_ERROR) {</div><div class='add'>+		if (rx-&gt;flags &amp; TYPHOON_RX_ERROR) {</div><div class='ctx'> 			typhoon_recycle_rx_skb(tp, idx);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		pkt_len = le16_to_cpu(rx-&gt;frameLen);</div><div class='ctx'> </div><div class='del'>-		if(pkt_len &lt; rx_copybreak &amp;&amp;</div><div class='add'>+		if (pkt_len &lt; rx_copybreak &amp;&amp;</div><div class='ctx'> 		   (new_skb = netdev_alloc_skb(tp-&gt;dev, pkt_len + 2)) != NULL) {</div><div class='ctx'> 			skb_reserve(new_skb, 2);</div><div class='del'>-			pci_dma_sync_single_for_cpu(tp-&gt;pdev, dma_addr,</div><div class='del'>-						    PKT_BUF_SZ,</div><div class='del'>-						    PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;tp-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+						PKT_BUF_SZ, DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_copy_to_linear_data(new_skb, skb-&gt;data, pkt_len);</div><div class='del'>-			pci_dma_sync_single_for_device(tp-&gt;pdev, dma_addr,</div><div class='del'>-						       PKT_BUF_SZ,</div><div class='del'>-						       PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;tp-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+						   PKT_BUF_SZ,</div><div class='add'>+						   DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_put(new_skb, pkt_len);</div><div class='ctx'> 			typhoon_recycle_rx_skb(tp, idx);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			new_skb = skb;</div><div class='ctx'> 			skb_put(new_skb, pkt_len);</div><div class='del'>-			pci_unmap_single(tp-&gt;pdev, dma_addr, PKT_BUF_SZ,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, dma_addr, PKT_BUF_SZ,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			typhoon_alloc_rx_skb(tp, idx);</div><div class='ctx'> 		}</div><div class='ctx'> 		new_skb-&gt;protocol = eth_type_trans(new_skb, tp-&gt;dev);</div><div class='ctx'> 		csum_bits = rx-&gt;rxStatus &amp; (TYPHOON_RX_IP_CHK_GOOD |</div><div class='ctx'> 			TYPHOON_RX_UDP_CHK_GOOD | TYPHOON_RX_TCP_CHK_GOOD);</div><div class='del'>-		if(csum_bits ==</div><div class='add'>+		if (csum_bits ==</div><div class='ctx'> 		   (TYPHOON_RX_IP_CHK_GOOD | TYPHOON_RX_TCP_CHK_GOOD) ||</div><div class='ctx'> 		   csum_bits ==</div><div class='ctx'> 		   (TYPHOON_RX_IP_CHK_GOOD | TYPHOON_RX_UDP_CHK_GOOD)) {</div><div class='hunk'>@@ -1711,11 +1705,11 @@ typhoon_fill_free_ring(struct typhoon *tp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; RXENT_ENTRIES; i++) {</div><div class='add'>+	for (i = 0; i &lt; RXENT_ENTRIES; i++) {</div><div class='ctx'> 		struct rxbuff_ent *rxb = &amp;tp-&gt;rxbuffers[i];</div><div class='del'>-		if(rxb-&gt;skb)</div><div class='add'>+		if (rxb-&gt;skb)</div><div class='ctx'> 			continue;</div><div class='del'>-		if(typhoon_alloc_rx_skb(tp, i) &lt; 0)</div><div class='add'>+		if (typhoon_alloc_rx_skb(tp, i) &lt; 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1728,25 +1722,25 @@ typhoon_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	int work_done;</div><div class='ctx'> </div><div class='ctx'> 	rmb();</div><div class='del'>-	if(!tp-&gt;awaiting_resp &amp;&amp; indexes-&gt;respReady != indexes-&gt;respCleared)</div><div class='add'>+	if (!tp-&gt;awaiting_resp &amp;&amp; indexes-&gt;respReady != indexes-&gt;respCleared)</div><div class='ctx'> 			typhoon_process_response(tp, 0, NULL);</div><div class='ctx'> </div><div class='del'>-	if(le32_to_cpu(indexes-&gt;txLoCleared) != tp-&gt;txLoRing.lastRead)</div><div class='add'>+	if (le32_to_cpu(indexes-&gt;txLoCleared) != tp-&gt;txLoRing.lastRead)</div><div class='ctx'> 		typhoon_tx_complete(tp, &amp;tp-&gt;txLoRing, &amp;indexes-&gt;txLoCleared);</div><div class='ctx'> </div><div class='ctx'> 	work_done = 0;</div><div class='ctx'> </div><div class='del'>-	if(indexes-&gt;rxHiCleared != indexes-&gt;rxHiReady) {</div><div class='add'>+	if (indexes-&gt;rxHiCleared != indexes-&gt;rxHiReady) {</div><div class='ctx'> 		work_done += typhoon_rx(tp, &amp;tp-&gt;rxHiRing, &amp;indexes-&gt;rxHiReady,</div><div class='ctx'> 			   		&amp;indexes-&gt;rxHiCleared, budget);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(indexes-&gt;rxLoCleared != indexes-&gt;rxLoReady) {</div><div class='add'>+	if (indexes-&gt;rxLoCleared != indexes-&gt;rxLoReady) {</div><div class='ctx'> 		work_done += typhoon_rx(tp, &amp;tp-&gt;rxLoRing, &amp;indexes-&gt;rxLoReady,</div><div class='ctx'> 					&amp;indexes-&gt;rxLoCleared, budget - work_done);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(le32_to_cpu(indexes-&gt;rxBuffCleared) == tp-&gt;rxBuffRing.lastWrite) {</div><div class='add'>+	if (le32_to_cpu(indexes-&gt;rxBuffCleared) == tp-&gt;rxBuffRing.lastWrite) {</div><div class='ctx'> 		/* rxBuff ring is empty, try to fill it. */</div><div class='ctx'> 		typhoon_fill_free_ring(tp);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1770,7 +1764,7 @@ typhoon_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 	u32 intr_status;</div><div class='ctx'> </div><div class='ctx'> 	intr_status = ioread32(ioaddr + TYPHOON_REG_INTR_STATUS);</div><div class='del'>-	if(!(intr_status &amp; TYPHOON_INTR_HOST_INT))</div><div class='add'>+	if (!(intr_status &amp; TYPHOON_INTR_HOST_INT))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(intr_status, ioaddr + TYPHOON_REG_INTR_STATUS);</div><div class='hunk'>@@ -1790,11 +1784,11 @@ typhoon_free_rx_rings(struct typhoon *tp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='del'>-	for(i = 0; i &lt; RXENT_ENTRIES; i++) {</div><div class='add'>+	for (i = 0; i &lt; RXENT_ENTRIES; i++) {</div><div class='ctx'> 		struct rxbuff_ent *rxb = &amp;tp-&gt;rxbuffers[i];</div><div class='del'>-		if(rxb-&gt;skb) {</div><div class='del'>-			pci_unmap_single(tp-&gt;pdev, rxb-&gt;dma_addr, PKT_BUF_SZ,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+		if (rxb-&gt;skb) {</div><div class='add'>+			dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, rxb-&gt;dma_addr,</div><div class='add'>+					 PKT_BUF_SZ, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(rxb-&gt;skb);</div><div class='ctx'> 			rxb-&gt;skb = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1802,9 +1796,8 @@ typhoon_free_rx_rings(struct typhoon *tp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-typhoon_sleep(struct typhoon *tp, pci_power_t state, __le16 events)</div><div class='add'>+typhoon_sleep_early(struct typhoon *tp, __le16 events)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = tp-&gt;pdev;</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;ioaddr;</div><div class='ctx'> 	struct cmd_desc xp_cmd;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1812,7 +1805,7 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, __le16 events)</div><div class='ctx'> 	INIT_COMMAND_WITH_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_ENABLE_WAKE_EVENTS);</div><div class='ctx'> 	xp_cmd.parm1 = events;</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "typhoon_sleep(): wake events cmd err %d\n",</div><div class='ctx'> 			   err);</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -1820,12 +1813,12 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, __le16 events)</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_GOTO_SLEEP);</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "typhoon_sleep(): sleep cmd err %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_SLEEPING) &lt; 0)</div><div class='add'>+	if (typhoon_wait_status(ioaddr, TYPHOON_STATUS_SLEEPING) &lt; 0)</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='ctx'> 	/* Since we cannot monitor the status of the link while sleeping,</div><div class='hunk'>@@ -1833,26 +1826,35 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, __le16 events)</div><div class='ctx'> 	 */</div><div class='ctx'> 	netif_carrier_off(tp-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+typhoon_sleep(struct typhoon *tp, pci_power_t state, __le16 events)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = typhoon_sleep_early(tp, events);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='ctx'> 	pci_enable_wake(tp-&gt;pdev, state, 1);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	return pci_set_power_state(pdev, state);</div><div class='add'>+	pci_disable_device(tp-&gt;pdev);</div><div class='add'>+	return pci_set_power_state(tp-&gt;pdev, state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> typhoon_wakeup(struct typhoon *tp, int wait_type)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = tp-&gt;pdev;</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;ioaddr;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='ctx'> 	/* Post 2.x.x versions of the Sleep Image require a reset before</div><div class='ctx'> 	 * we can download the Runtime Image. But let's not make users of</div><div class='ctx'> 	 * the old firmware pay for the reset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	iowrite32(TYPHOON_BOOTCMD_WAKEUP, ioaddr + TYPHOON_REG_COMMAND);</div><div class='del'>-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0 ||</div><div class='add'>+	if (typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0 ||</div><div class='ctx'> 			(tp-&gt;capabilities &amp; TYPHOON_WAKEUP_NEEDS_RESET))</div><div class='ctx'> 		return typhoon_reset(ioaddr, wait_type);</div><div class='ctx'> </div><div class='hunk'>@@ -1871,12 +1873,12 @@ typhoon_start_runtime(struct typhoon *tp)</div><div class='ctx'> 	typhoon_fill_free_ring(tp);</div><div class='ctx'> </div><div class='ctx'> 	err = typhoon_download_firmware(tp);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "cannot load runtime on 3XP\n");</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_BOOT) &lt; 0) {</div><div class='add'>+	if (typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_BOOT) &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "cannot boot 3XP\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto error_out;</div><div class='hunk'>@@ -1885,14 +1887,14 @@ typhoon_start_runtime(struct typhoon *tp)</div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_SET_MAX_PKT_SIZE);</div><div class='ctx'> 	xp_cmd.parm1 = cpu_to_le16(PKT_BUF_SZ);</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_SET_MAC_ADDRESS);</div><div class='ctx'> 	xp_cmd.parm1 = cpu_to_le16(ntohs(*(__be16 *)&amp;dev-&gt;dev_addr[0]));</div><div class='ctx'> 	xp_cmd.parm2 = cpu_to_le32(ntohl(*(__be32 *)&amp;dev-&gt;dev_addr[2]));</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable IRQ coalescing -- we can reenable it when 3Com gives</div><div class='hunk'>@@ -1901,38 +1903,38 @@ typhoon_start_runtime(struct typhoon *tp)</div><div class='ctx'> 	INIT_COMMAND_WITH_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_IRQ_COALESCE_CTRL);</div><div class='ctx'> 	xp_cmd.parm1 = 0;</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_XCVR_SELECT);</div><div class='ctx'> 	xp_cmd.parm1 = tp-&gt;xcvr_select;</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_VLAN_TYPE_WRITE);</div><div class='ctx'> 	xp_cmd.parm1 = cpu_to_le16(ETH_P_8021Q);</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_SET_OFFLOAD_TASKS);</div><div class='ctx'> 	xp_cmd.parm2 = tp-&gt;offload;</div><div class='ctx'> 	xp_cmd.parm3 = tp-&gt;offload;</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	typhoon_set_rx_mode(dev);</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_TX_ENABLE);</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_WITH_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_RX_ENABLE);</div><div class='ctx'> 	err = typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto error_out;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;card_state = Running;</div><div class='hunk'>@@ -1972,13 +1974,13 @@ typhoon_stop_runtime(struct typhoon *tp, int wait_type)</div><div class='ctx'> 	/* Wait 1/2 sec for any outstanding transmits to occur</div><div class='ctx'> 	 * We'll cleanup after the reset if this times out.</div><div class='ctx'> 	 */</div><div class='del'>-	for(i = 0; i &lt; TYPHOON_WAIT_TIMEOUT; i++) {</div><div class='del'>-		if(indexes-&gt;txLoCleared == cpu_to_le32(txLo-&gt;lastWrite))</div><div class='add'>+	for (i = 0; i &lt; TYPHOON_WAIT_TIMEOUT; i++) {</div><div class='add'>+		if (indexes-&gt;txLoCleared == cpu_to_le32(txLo-&gt;lastWrite))</div><div class='ctx'> 			break;</div><div class='ctx'> 		udelay(TYPHOON_UDELAY);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(i == TYPHOON_WAIT_TIMEOUT)</div><div class='add'>+	if (i == TYPHOON_WAIT_TIMEOUT)</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "halt timed out waiting for Tx to complete\n");</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_TX_DISABLE);</div><div class='hunk'>@@ -1995,16 +1997,16 @@ typhoon_stop_runtime(struct typhoon *tp, int wait_type)</div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_HALT);</div><div class='ctx'> 	typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_HALTED) &lt; 0)</div><div class='add'>+	if (typhoon_wait_status(ioaddr, TYPHOON_STATUS_HALTED) &lt; 0)</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "timed out waiting for 3XP to halt\n");</div><div class='ctx'> </div><div class='del'>-	if(typhoon_reset(ioaddr, wait_type) &lt; 0) {</div><div class='add'>+	if (typhoon_reset(ioaddr, wait_type) &lt; 0) {</div><div class='ctx'> 		netdev_err(tp-&gt;dev, "unable to reset 3XP\n");</div><div class='ctx'> 		return -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* cleanup any outstanding Tx packets */</div><div class='del'>-	if(indexes-&gt;txLoCleared != cpu_to_le32(txLo-&gt;lastWrite)) {</div><div class='add'>+	if (indexes-&gt;txLoCleared != cpu_to_le32(txLo-&gt;lastWrite)) {</div><div class='ctx'> 		indexes-&gt;txLoCleared = cpu_to_le32(txLo-&gt;lastWrite);</div><div class='ctx'> 		typhoon_clean_tx(tp, &amp;tp-&gt;txLoRing, &amp;indexes-&gt;txLoCleared);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2013,11 +2015,11 @@ typhoon_stop_runtime(struct typhoon *tp, int wait_type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-typhoon_tx_timeout(struct net_device *dev)</div><div class='add'>+typhoon_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct typhoon *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_reset(tp-&gt;ioaddr, WaitNoSleep) &lt; 0) {</div><div class='add'>+	if (typhoon_reset(tp-&gt;ioaddr, WaitNoSleep) &lt; 0) {</div><div class='ctx'> 		netdev_warn(dev, "could not reset in tx timeout\n");</div><div class='ctx'> 		goto truly_dead;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2026,7 +2028,7 @@ typhoon_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	typhoon_clean_tx(tp, &amp;tp-&gt;txLoRing, &amp;tp-&gt;indexes-&gt;txLoCleared);</div><div class='ctx'> 	typhoon_free_rx_rings(tp);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_start_runtime(tp) &lt; 0) {</div><div class='add'>+	if (typhoon_start_runtime(tp) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "could not start runtime in tx timeout\n");</div><div class='ctx'> 		goto truly_dead;</div><div class='ctx'>         }</div><div class='hunk'>@@ -2050,21 +2052,24 @@ typhoon_open(struct net_device *dev)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	pci_set_power_state(tp-&gt;pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(tp-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> 	err = typhoon_wakeup(tp, WaitSleep);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to wakeup device\n");</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(dev-&gt;irq, typhoon_interrupt, IRQF_SHARED,</div><div class='ctx'> 				dev-&gt;name, dev);</div><div class='del'>-	if(err &lt; 0)</div><div class='add'>+	if (err &lt; 0)</div><div class='ctx'> 		goto out_sleep;</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;tp-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	err = typhoon_start_runtime(tp);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		napi_disable(&amp;tp-&gt;napi);</div><div class='ctx'> 		goto out_irq;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2076,13 +2081,13 @@ out_irq:</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='ctx'> out_sleep:</div><div class='del'>-	if(typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0) {</div><div class='add'>+	if (typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to reboot into sleep img\n");</div><div class='ctx'> 		typhoon_reset(tp-&gt;ioaddr, NoWait);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(typhoon_sleep(tp, PCI_D3hot, 0) &lt; 0)</div><div class='add'>+	if (typhoon_sleep(tp, PCI_D3hot, 0) &lt; 0)</div><div class='ctx'> 		netdev_err(dev, "unable to go back to sleep\n");</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='hunk'>@@ -2097,7 +2102,7 @@ typhoon_close(struct net_device *dev)</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	napi_disable(&amp;tp-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_stop_runtime(tp, WaitSleep) &lt; 0)</div><div class='add'>+	if (typhoon_stop_runtime(tp, WaitSleep) &lt; 0)</div><div class='ctx'> 		netdev_err(dev, "unable to stop runtime\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure there is no irq handler running on a different CPU. */</div><div class='hunk'>@@ -2106,33 +2111,32 @@ typhoon_close(struct net_device *dev)</div><div class='ctx'> 	typhoon_free_rx_rings(tp);</div><div class='ctx'> 	typhoon_init_rings(tp);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0)</div><div class='add'>+	if (typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0)</div><div class='ctx'> 		netdev_err(dev, "unable to boot sleep image\n");</div><div class='ctx'> </div><div class='del'>-	if(typhoon_sleep(tp, PCI_D3hot, 0) &lt; 0)</div><div class='add'>+	if (typhoon_sleep(tp, PCI_D3hot, 0) &lt; 0)</div><div class='ctx'> 		netdev_err(dev, "unable to put card to sleep\n");</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int</div><div class='del'>-typhoon_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused</div><div class='add'>+typhoon_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct typhoon *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* If we're down, resume when we are upped.</div><div class='ctx'> 	 */</div><div class='del'>-	if(!netif_running(dev))</div><div class='add'>+	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if(typhoon_wakeup(tp, WaitNoSleep) &lt; 0) {</div><div class='add'>+	if (typhoon_wakeup(tp, WaitNoSleep) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "critical: could not wake up in resume\n");</div><div class='ctx'> 		goto reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(typhoon_start_runtime(tp) &lt; 0) {</div><div class='add'>+	if (typhoon_start_runtime(tp) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "critical: could not start runtime in resume\n");</div><div class='ctx'> 		goto reset;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2145,25 +2149,26 @@ reset:</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-typhoon_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused</div><div class='add'>+typhoon_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct typhoon *tp = netdev_priv(dev);</div><div class='ctx'> 	struct cmd_desc xp_cmd;</div><div class='ctx'> </div><div class='ctx'> 	/* If we're down, we're already suspended.</div><div class='ctx'> 	 */</div><div class='del'>-	if(!netif_running(dev))</div><div class='add'>+	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* TYPHOON_OFFLOAD_VLAN is always on now, so this doesn't work */</div><div class='del'>-	if(tp-&gt;wol_events &amp; TYPHOON_WAKE_MAGIC_PKT)</div><div class='add'>+	if (tp-&gt;wol_events &amp; TYPHOON_WAKE_MAGIC_PKT)</div><div class='ctx'> 		netdev_warn(dev, "cannot do WAKE_MAGIC with VLAN offloading\n");</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_stop_runtime(tp, WaitNoSleep) &lt; 0) {</div><div class='add'>+	if (typhoon_stop_runtime(tp, WaitNoSleep) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to stop runtime\n");</div><div class='ctx'> 		goto need_resume;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2171,7 +2176,7 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	typhoon_free_rx_rings(tp);</div><div class='ctx'> 	typhoon_init_rings(tp);</div><div class='ctx'> </div><div class='del'>-	if(typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0) {</div><div class='add'>+	if (typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to boot sleep image\n");</div><div class='ctx'> 		goto need_resume;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2179,30 +2184,31 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_SET_MAC_ADDRESS);</div><div class='ctx'> 	xp_cmd.parm1 = cpu_to_le16(ntohs(*(__be16 *)&amp;dev-&gt;dev_addr[0]));</div><div class='ctx'> 	xp_cmd.parm2 = cpu_to_le32(ntohl(*(__be32 *)&amp;dev-&gt;dev_addr[2]));</div><div class='del'>-	if(typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL) &lt; 0) {</div><div class='add'>+	if (typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to set mac address in suspend\n");</div><div class='ctx'> 		goto need_resume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	INIT_COMMAND_NO_RESPONSE(&amp;xp_cmd, TYPHOON_CMD_SET_RX_FILTER);</div><div class='ctx'> 	xp_cmd.parm1 = TYPHOON_RX_FILTER_DIRECTED | TYPHOON_RX_FILTER_BROADCAST;</div><div class='del'>-	if(typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL) &lt; 0) {</div><div class='add'>+	if (typhoon_issue_command(tp, 1, &amp;xp_cmd, 0, NULL) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to set rx filter in suspend\n");</div><div class='ctx'> 		goto need_resume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(typhoon_sleep(tp, pci_choose_state(pdev, state), tp-&gt;wol_events) &lt; 0) {</div><div class='add'>+	if (typhoon_sleep_early(tp, tp-&gt;wol_events) &lt; 0) {</div><div class='ctx'> 		netdev_err(dev, "unable to put card to sleep\n");</div><div class='ctx'> 		goto need_resume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	device_wakeup_enable(dev_d);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> need_resume:</div><div class='del'>-	typhoon_resume(pdev);</div><div class='add'>+	typhoon_resume(dev_d);</div><div class='ctx'> 	return -EBUSY;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> typhoon_test_mmio(struct pci_dev *pdev)</div><div class='hunk'>@@ -2211,10 +2217,10 @@ typhoon_test_mmio(struct pci_dev *pdev)</div><div class='ctx'> 	int mode = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	if(!ioaddr)</div><div class='add'>+	if (!ioaddr)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if(ioread32(ioaddr + TYPHOON_REG_STATUS) !=</div><div class='add'>+	if (ioread32(ioaddr + TYPHOON_REG_STATUS) !=</div><div class='ctx'> 				TYPHOON_STATUS_WAITING_FOR_HOST)</div><div class='ctx'> 		goto out_unmap;</div><div class='ctx'> </div><div class='hunk'>@@ -2227,12 +2233,12 @@ typhoon_test_mmio(struct pci_dev *pdev)</div><div class='ctx'> 	 * The 50usec delay is arbitrary -- it could probably be smaller.</div><div class='ctx'> 	 */</div><div class='ctx'> 	val = ioread32(ioaddr + TYPHOON_REG_INTR_STATUS);</div><div class='del'>-	if((val &amp; TYPHOON_INTR_SELF) == 0) {</div><div class='add'>+	if ((val &amp; TYPHOON_INTR_SELF) == 0) {</div><div class='ctx'> 		iowrite32(1, ioaddr + TYPHOON_REG_SELF_INTERRUPT);</div><div class='ctx'> 		ioread32(ioaddr + TYPHOON_REG_INTR_STATUS);</div><div class='ctx'> 		udelay(50);</div><div class='ctx'> 		val = ioread32(ioaddr + TYPHOON_REG_INTR_STATUS);</div><div class='del'>-		if(val &amp; TYPHOON_INTR_SELF)</div><div class='add'>+		if (val &amp; TYPHOON_INTR_SELF)</div><div class='ctx'> 			mode = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2245,14 +2251,33 @@ out_unmap:</div><div class='ctx'> 	pci_iounmap(pdev, ioaddr);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	if(!mode)</div><div class='add'>+	if (!mode)</div><div class='ctx'> 		pr_info("%s: falling back to port IO\n", pci_name(pdev));</div><div class='ctx'> 	return mode;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#if MAX_SKB_FRAGS &gt; 32</div><div class='add'>+</div><div class='add'>+#include &lt;net/vxlan.h&gt;</div><div class='add'>+</div><div class='add'>+static netdev_features_t typhoon_features_check(struct sk_buff *skb,</div><div class='add'>+						struct net_device *dev,</div><div class='add'>+						netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags &gt; 32 &amp;&amp; skb_is_gso(skb))</div><div class='add'>+		features &amp;= ~NETIF_F_GSO_MASK;</div><div class='add'>+</div><div class='add'>+	features = vlan_features_check(skb, features);</div><div class='add'>+	return vxlan_features_check(skb, features);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops typhoon_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= typhoon_open,</div><div class='ctx'> 	.ndo_stop		= typhoon_close,</div><div class='add'>+#if MAX_SKB_FRAGS &gt; 32</div><div class='add'>+	.ndo_features_check	= typhoon_features_check,</div><div class='add'>+#endif</div><div class='ctx'> 	.ndo_start_xmit		= typhoon_start_tx,</div><div class='ctx'> 	.ndo_set_rx_mode	= typhoon_set_rx_mode,</div><div class='ctx'> 	.ndo_tx_timeout		= typhoon_tx_timeout,</div><div class='hunk'>@@ -2267,6 +2292,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct typhoon *tp;</div><div class='ctx'> 	int card_id = (int) ent-&gt;driver_data;</div><div class='add'>+	u8 addr[ETH_ALEN] __aligned(4);</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='ctx'> 	void *shared;</div><div class='ctx'> 	dma_addr_t shared_dma;</div><div class='hunk'>@@ -2276,7 +2302,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	const char *err_msg;</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*tp));</div><div class='del'>-	if(dev == NULL) {</div><div class='add'>+	if (dev == NULL) {</div><div class='ctx'> 		err_msg = "unable to alloc new net device";</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error_out;</div><div class='hunk'>@@ -2284,55 +2310,55 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		err_msg = "unable to enable device";</div><div class='ctx'> 		goto error_out_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_set_mwi(pdev);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		err_msg = "unable to set MWI";</div><div class='ctx'> 		goto error_out_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	err = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		err_msg = "No usable DMA configuration";</div><div class='ctx'> 		goto error_out_mwi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* sanity checks on IO and MMIO BARs</div><div class='ctx'> 	 */</div><div class='del'>-	if(!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_IO)) {</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_IO)) {</div><div class='ctx'> 		err_msg = "region #1 not a PCI IO resource, aborting";</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto error_out_mwi;</div><div class='ctx'> 	}</div><div class='del'>-	if(pci_resource_len(pdev, 0) &lt; 128) {</div><div class='add'>+	if (pci_resource_len(pdev, 0) &lt; 128) {</div><div class='ctx'> 		err_msg = "Invalid PCI IO region size, aborting";</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto error_out_mwi;</div><div class='ctx'> 	}</div><div class='del'>-	if(!(pci_resource_flags(pdev, 1) &amp; IORESOURCE_MEM)) {</div><div class='add'>+	if (!(pci_resource_flags(pdev, 1) &amp; IORESOURCE_MEM)) {</div><div class='ctx'> 		err_msg = "region #1 not a PCI MMIO resource, aborting";</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto error_out_mwi;</div><div class='ctx'> 	}</div><div class='del'>-	if(pci_resource_len(pdev, 1) &lt; 128) {</div><div class='add'>+	if (pci_resource_len(pdev, 1) &lt; 128) {</div><div class='ctx'> 		err_msg = "Invalid PCI MMIO region size, aborting";</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto error_out_mwi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, KBUILD_MODNAME);</div><div class='del'>-	if(err &lt; 0) {</div><div class='add'>+	if (err &lt; 0) {</div><div class='ctx'> 		err_msg = "could not request regions";</div><div class='ctx'> 		goto error_out_mwi;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* map our registers</div><div class='ctx'> 	 */</div><div class='del'>-	if(use_mmio != 0 &amp;&amp; use_mmio != 1)</div><div class='add'>+	if (use_mmio != 0 &amp;&amp; use_mmio != 1)</div><div class='ctx'> 		use_mmio = typhoon_test_mmio(pdev);</div><div class='ctx'> </div><div class='ctx'> 	ioaddr = pci_iomap(pdev, use_mmio, 128);</div><div class='hunk'>@@ -2344,9 +2370,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	/* allocate pci dma space for rx and tx descriptor rings</div><div class='ctx'> 	 */</div><div class='del'>-	shared = pci_alloc_consistent(pdev, sizeof(struct typhoon_shared),</div><div class='del'>-				      &amp;shared_dma);</div><div class='del'>-	if(!shared) {</div><div class='add'>+	shared = dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(struct typhoon_shared),</div><div class='add'>+				    &amp;shared_dma, GFP_KERNEL);</div><div class='add'>+	if (!shared) {</div><div class='ctx'> 		err_msg = "could not allocate DMA memory";</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto error_out_remap;</div><div class='hunk'>@@ -2398,8 +2424,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto error_out_reset;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*(__be16 *)&amp;dev-&gt;dev_addr[0] = htons(le16_to_cpu(xp_resp[0].parm1));</div><div class='del'>-	*(__be32 *)&amp;dev-&gt;dev_addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2));</div><div class='add'>+	*(__be16 *)&amp;addr[0] = htons(le16_to_cpu(xp_resp[0].parm1));</div><div class='add'>+	*(__be32 *)&amp;addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2));</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='ctx'> 		err_msg = "Could not obtain valid ethernet address, aborting";</div><div class='hunk'>@@ -2426,7 +2453,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 * seem to need a little extra help to get started. Since we don't</div><div class='ctx'> 	 * know how to nudge it along, just kick it.</div><div class='ctx'> 	 */</div><div class='del'>-	if(xp_resp[0].numDesc != 0)</div><div class='add'>+	if (xp_resp[0].numDesc != 0)</div><div class='ctx'> 		tp-&gt;capabilities |= TYPHOON_WAKEUP_NEEDS_RESET;</div><div class='ctx'> </div><div class='ctx'> 	err = typhoon_sleep(tp, PCI_D3hot, 0);</div><div class='hunk'>@@ -2437,7 +2464,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	/* The chip-specific entries in the device structure. */</div><div class='ctx'> 	dev-&gt;netdev_ops		= &amp;typhoon_netdev_ops;</div><div class='del'>-	netif_napi_add(dev, &amp;tp-&gt;napi, typhoon_poll, 16);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;tp-&gt;napi, typhoon_poll, 16);</div><div class='ctx'> 	dev-&gt;watchdog_timeo	= TX_TIMEOUT;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;typhoon_ethtool_ops;</div><div class='hunk'>@@ -2471,14 +2498,14 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* xp_resp still contains the response to the READ_VERSIONS command.</div><div class='ctx'> 	 * For debugging, let the user know what version he has.</div><div class='ctx'> 	 */</div><div class='del'>-	if(xp_resp[0].numDesc == 0) {</div><div class='add'>+	if (xp_resp[0].numDesc == 0) {</div><div class='ctx'> 		/* This is the Typhoon 1.0 type Sleep Image, last 16 bits</div><div class='ctx'> 		 * of version is Month/Day of build.</div><div class='ctx'> 		 */</div><div class='ctx'> 		u16 monthday = le32_to_cpu(xp_resp[0].parm2) &amp; 0xffff;</div><div class='ctx'> 		netdev_info(dev, "Typhoon 1.0 Sleep Image built %02u/%02u/2000\n",</div><div class='ctx'> 			    monthday &gt;&gt; 8, monthday &amp; 0xff);</div><div class='del'>-	} else if(xp_resp[0].numDesc == 2) {</div><div class='add'>+	} else if (xp_resp[0].numDesc == 2) {</div><div class='ctx'> 		/* This is the Typhoon 1.1+ type Sleep Image</div><div class='ctx'> 		 */</div><div class='ctx'> 		u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);</div><div class='hunk'>@@ -2498,8 +2525,8 @@ error_out_reset:</div><div class='ctx'> 	typhoon_reset(ioaddr, NoWait);</div><div class='ctx'> </div><div class='ctx'> error_out_dma:</div><div class='del'>-	pci_free_consistent(pdev, sizeof(struct typhoon_shared),</div><div class='del'>-			    shared, shared_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(struct typhoon_shared), shared,</div><div class='add'>+			  shared_dma);</div><div class='ctx'> error_out_remap:</div><div class='ctx'> 	pci_iounmap(pdev, ioaddr);</div><div class='ctx'> error_out_regions:</div><div class='hunk'>@@ -2526,23 +2553,22 @@ typhoon_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='ctx'> 	typhoon_reset(tp-&gt;ioaddr, NoWait);</div><div class='ctx'> 	pci_iounmap(pdev, tp-&gt;ioaddr);</div><div class='del'>-	pci_free_consistent(pdev, sizeof(struct typhoon_shared),</div><div class='del'>-			    tp-&gt;shared, tp-&gt;shared_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, sizeof(struct typhoon_shared),</div><div class='add'>+			  tp-&gt;shared, tp-&gt;shared_dma);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_clear_mwi(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(typhoon_pm_ops, typhoon_suspend, typhoon_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver typhoon_driver = {</div><div class='ctx'> 	.name		= KBUILD_MODNAME,</div><div class='ctx'> 	.id_table	= typhoon_pci_tbl,</div><div class='ctx'> 	.probe		= typhoon_init_one,</div><div class='ctx'> 	.remove		= typhoon_remove_one,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= typhoon_suspend,</div><div class='del'>-	.resume		= typhoon_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver.pm	= &amp;typhoon_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init</div><div class='head'>diff --git a/drivers/net/ethernet/3com/typhoon.h b/drivers/net/ethernet/3com/typhoon.h<br/>index 88187fc84aa3..38e6dcab4e94 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/typhoon.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/3com/typhoon.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/3com/typhoon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/3com/typhoon.h</a></div><div class='hunk'>@@ -33,7 +33,7 @@ struct basic_ring {</div><div class='ctx'> 	u32 lastWrite;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* The Typoon transmit ring -- same as a basic ring, plus:</div><div class='add'>+/* The Typhoon transmit ring -- same as a basic ring, plus:</div><div class='ctx'>  * lastRead:      where we're at in regard to cleaning up the ring</div><div class='ctx'>  * writeRegister: register to use for writing (different for Hi &amp; Lo rings)</div><div class='ctx'>  */</div><div class='hunk'>@@ -366,7 +366,7 @@ struct resp_desc {</div><div class='ctx'> 		memset(_ptr, 0, sizeof(struct cmd_desc));		\</div><div class='ctx'> 		_ptr-&gt;flags = TYPHOON_CMD_DESC | TYPHOON_DESC_VALID;	\</div><div class='ctx'> 		_ptr-&gt;cmd = command;					\</div><div class='del'>-	} while(0)</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* We set seqNo to 1 if we're expecting a response from this command */</div><div class='ctx'> #define INIT_COMMAND_WITH_RESPONSE(x, command)				\</div><div class='hunk'>@@ -376,7 +376,7 @@ struct resp_desc {</div><div class='ctx'> 		_ptr-&gt;flags |= TYPHOON_DESC_VALID; 			\</div><div class='ctx'> 		_ptr-&gt;cmd = command;					\</div><div class='ctx'> 		_ptr-&gt;seqNo = 1;					\</div><div class='del'>-	} while(0)</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> /* TYPHOON_CMD_SET_RX_FILTER filter bits (cmd.parm1)</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/8390.c b/drivers/net/ethernet/8390/8390.c<br/>index 78f3e532c600..c5636245f1ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/8390.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/8390.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/8390.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/8390.c</a></div><div class='hunk'>@@ -36,9 +36,9 @@ void ei_set_multicast_list(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ei_set_multicast_list);</div><div class='ctx'> </div><div class='del'>-void ei_tx_timeout(struct net_device *dev)</div><div class='add'>+void ei_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='del'>-	__ei_tx_timeout(dev);</div><div class='add'>+	__ei_tx_timeout(dev, txqueue);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(ei_tx_timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -100,4 +100,5 @@ static void __exit ns8390_module_exit(void)</div><div class='ctx'> module_init(ns8390_module_init);</div><div class='ctx'> module_exit(ns8390_module_exit);</div><div class='ctx'> #endif /* MODULE */</div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor 8390 core driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/8390/8390.h b/drivers/net/ethernet/8390/8390.h<br/>index 3e2f2c2e7b58..f784a6e2ab0e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/8390.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/8390.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/8390.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/8390.h</a></div><div class='hunk'>@@ -1,8 +1,12 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-1.0+ */</div><div class='add'>+</div><div class='ctx'> /* Generic NS8390 register definitions. */</div><div class='add'>+</div><div class='ctx'> /* This file is part of Donald Becker's 8390 drivers, and is distributed</div><div class='del'>-   under the same license. Auto-loading of 8390.o only in v2.2 - Paul G.</div><div class='del'>-   Some of these names and comments originated from the Crynwr</div><div class='del'>-   packet drivers, which are distributed under the GPL. */</div><div class='add'>+ * under the same license. Auto-loading of 8390.o only in v2.2 - Paul G.</div><div class='add'>+ * Some of these names and comments originated from the Crynwr</div><div class='add'>+ * packet drivers, which are distributed under the GPL.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #ifndef _8390_h</div><div class='ctx'> #define _8390_h</div><div class='hunk'>@@ -16,9 +20,9 @@</div><div class='ctx'> </div><div class='ctx'> /* The 8390 specific per-packet-header format. */</div><div class='ctx'> struct e8390_pkt_hdr {</div><div class='del'>-  unsigned char status; /* status */</div><div class='del'>-  unsigned char next;   /* pointer to next packet. */</div><div class='del'>-  unsigned short count; /* header + packet length in bytes */</div><div class='add'>+	unsigned char status; /* status */</div><div class='add'>+	unsigned char next;   /* pointer to next packet. */</div><div class='add'>+	unsigned short count; /* header + packet length in bytes */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -32,7 +36,7 @@ void NS8390_init(struct net_device *dev, int startp);</div><div class='ctx'> int ei_open(struct net_device *dev);</div><div class='ctx'> int ei_close(struct net_device *dev);</div><div class='ctx'> irqreturn_t ei_interrupt(int irq, void *dev_id);</div><div class='del'>-void ei_tx_timeout(struct net_device *dev);</div><div class='add'>+void ei_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> netdev_tx_t ei_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> void ei_set_multicast_list(struct net_device *dev);</div><div class='ctx'> struct net_device_stats *ei_get_stats(struct net_device *dev);</div><div class='hunk'>@@ -50,7 +54,7 @@ void NS8390p_init(struct net_device *dev, int startp);</div><div class='ctx'> int eip_open(struct net_device *dev);</div><div class='ctx'> int eip_close(struct net_device *dev);</div><div class='ctx'> irqreturn_t eip_interrupt(int irq, void *dev_id);</div><div class='del'>-void eip_tx_timeout(struct net_device *dev);</div><div class='add'>+void eip_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> netdev_tx_t eip_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> void eip_set_multicast_list(struct net_device *dev);</div><div class='ctx'> struct net_device_stats *eip_get_stats(struct net_device *dev);</div><div class='hunk'>@@ -66,18 +70,24 @@ static inline struct net_device *alloc_eip_netdev(void)</div><div class='ctx'> /* You have one of these per-board */</div><div class='ctx'> struct ei_device {</div><div class='ctx'> 	const char *name;</div><div class='del'>-	void (*reset_8390)(struct net_device *);</div><div class='del'>-	void (*get_8390_hdr)(struct net_device *, struct e8390_pkt_hdr *, int);</div><div class='del'>-	void (*block_output)(struct net_device *, int, const unsigned char *, int);</div><div class='del'>-	void (*block_input)(struct net_device *, int, struct sk_buff *, int);</div><div class='add'>+	void (*reset_8390)(struct net_device *dev);</div><div class='add'>+	void (*get_8390_hdr)(struct net_device *dev,</div><div class='add'>+			     struct e8390_pkt_hdr *hdr, int ring_page);</div><div class='add'>+	void (*block_output)(struct net_device *dev, int count,</div><div class='add'>+			     const unsigned char *buf, int start_page);</div><div class='add'>+	void (*block_input)(struct net_device *dev, int count,</div><div class='add'>+			    struct sk_buff *skb, int ring_offset);</div><div class='ctx'> 	unsigned long rmem_start;</div><div class='ctx'> 	unsigned long rmem_end;</div><div class='ctx'> 	void __iomem *mem;</div><div class='ctx'> 	unsigned char mcfilter[8];</div><div class='ctx'> 	unsigned open:1;</div><div class='del'>-	unsigned word16:1;  		/* We have the 16-bit (vs 8-bit) version of the card. */</div><div class='del'>-	unsigned bigendian:1;		/* 16-bit big endian mode. Do NOT */</div><div class='del'>-					/* set this on random 8390 clones! */</div><div class='add'>+	unsigned word16:1;		/* We have the 16-bit (vs 8-bit)</div><div class='add'>+					 * version of the card.</div><div class='add'>+					 */</div><div class='add'>+	unsigned bigendian:1;		/* 16-bit big endian mode. Do NOT</div><div class='add'>+					 * set this on random 8390 clones!</div><div class='add'>+					 */</div><div class='ctx'> 	unsigned txing:1;		/* Transmit Active */</div><div class='ctx'> 	unsigned irqlock:1;		/* 8390's intrs disabled when '1'. */</div><div class='ctx'> 	unsigned dmaing:1;		/* Remote DMA Active */</div><div class='hunk'>@@ -115,12 +125,16 @@ struct ei_device {</div><div class='ctx'> #define E8390_RXCONFIG		(ei_status.rxcr_base | 0x04)</div><div class='ctx'> #define E8390_RXOFF		(ei_status.rxcr_base | 0x20)</div><div class='ctx'> #else</div><div class='del'>-#define E8390_RXCONFIG		0x4	/* EN0_RXCR: broadcasts, no multicast,errors */</div><div class='del'>-#define E8390_RXOFF		0x20	/* EN0_RXCR: Accept no packets */</div><div class='add'>+/* EN0_RXCR: broadcasts, no multicast,errors */</div><div class='add'>+#define E8390_RXCONFIG		0x4</div><div class='add'>+/* EN0_RXCR: Accept no packets */</div><div class='add'>+#define E8390_RXOFF		0x20</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define E8390_TXCONFIG		0x00	/* EN0_TXCR: Normal transmit mode */</div><div class='del'>-#define E8390_TXOFF		0x02	/* EN0_TXCR: Transmitter off */</div><div class='add'>+/* EN0_TXCR: Normal transmit mode */</div><div class='add'>+#define E8390_TXCONFIG		0x00</div><div class='add'>+/* EN0_TXCR: Transmitter off */</div><div class='add'>+#define E8390_TXOFF		0x02</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*  Register accessed at EN_CMD, the 8390 base addr.  */</div><div class='hunk'>@@ -134,17 +148,16 @@ struct ei_device {</div><div class='ctx'> #define E8390_PAGE1	0x40	/* using the two high-order bits */</div><div class='ctx'> #define E8390_PAGE2	0x80	/* Page 3 is invalid. */</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- *	Only generate indirect loads given a machine that needs them.</div><div class='del'>- *      - removed AMIGA_PCMCIA from this list, handled as ISA io now</div><div class='del'>- *	- the _p for generates no delay by default 8390p.c overrides this.</div><div class='add'>+/* Only generate indirect loads given a machine that needs them.</div><div class='add'>+ * - removed AMIGA_PCMCIA from this list, handled as ISA io now</div><div class='add'>+ * - the _p for generates no delay by default 8390p.c overrides this.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ei_inb</div><div class='ctx'> #define ei_inb(_p)	inb(_p)</div><div class='del'>-#define ei_outb(_v,_p)	outb(_v,_p)</div><div class='add'>+#define ei_outb(_v, _p)	outb(_v, _p)</div><div class='ctx'> #define ei_inb_p(_p)	inb(_p)</div><div class='del'>-#define ei_outb_p(_v,_p) outb(_v,_p)</div><div class='add'>+#define ei_outb_p(_v, _p) outb(_v, _p)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #ifndef EI_SHIFT</div><div class='hunk'>@@ -153,9 +166,9 @@ struct ei_device {</div><div class='ctx'> </div><div class='ctx'> #define E8390_CMD	EI_SHIFT(0x00)  /* The command register (for all pages) */</div><div class='ctx'> /* Page 0 register offsets. */</div><div class='del'>-#define EN0_CLDALO	EI_SHIFT(0x01)	/* Low byte of current local dma addr  RD */</div><div class='add'>+#define EN0_CLDALO	EI_SHIFT(0x01)	/* Low byte of current local dma addr RD */</div><div class='ctx'> #define EN0_STARTPG	EI_SHIFT(0x01)	/* Starting page of ring bfr WR */</div><div class='del'>-#define EN0_CLDAHI	EI_SHIFT(0x02)	/* High byte of current local dma addr  RD */</div><div class='add'>+#define EN0_CLDAHI	EI_SHIFT(0x02)	/* High byte of current local dma addr RD */</div><div class='ctx'> #define EN0_STOPPG	EI_SHIFT(0x02)	/* Ending page +1 of ring bfr WR */</div><div class='ctx'> #define EN0_BOUNDARY	EI_SHIFT(0x03)	/* Boundary page of ring bfr RD WR */</div><div class='ctx'> #define EN0_TSR		EI_SHIFT(0x04)	/* Transmit status reg RD */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/8390p.c b/drivers/net/ethernet/8390/8390p.c<br/>index 6cf36992a2c6..6d429b11e9c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/8390p.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/8390p.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/8390p.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/8390p.c</a></div><div class='hunk'>@@ -41,9 +41,9 @@ void eip_set_multicast_list(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eip_set_multicast_list);</div><div class='ctx'> </div><div class='del'>-void eip_tx_timeout(struct net_device *dev)</div><div class='add'>+void eip_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='del'>-	__ei_tx_timeout(dev);</div><div class='add'>+	__ei_tx_timeout(dev, txqueue);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(eip_tx_timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -102,4 +102,5 @@ static void __exit NS8390p_cleanup_module(void)</div><div class='ctx'> </div><div class='ctx'> module_init(NS8390p_init_module);</div><div class='ctx'> module_exit(NS8390p_cleanup_module);</div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor 8390 core for ISA driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig<br/>index bb09319feedf..345f250781c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/Kconfig</a></div><div class='hunk'>@@ -7,20 +7,20 @@ config NET_VENDOR_8390</div><div class='ctx'> 	bool "National Semiconductor 8390 devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on NET_VENDOR_NATSEMI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='ctx'> 	  kernel: saying N will just cause the configurator to skip all</div><div class='del'>-	  the questions about Western Digital cards. If you say Y, you will be</div><div class='del'>-	  asked for your specific card in the following questions.</div><div class='add'>+	  the questions about National Semiconductor 8390 cards. If you say Y,</div><div class='add'>+	  you will be asked for your specific card in the following questions.</div><div class='ctx'> </div><div class='ctx'> if NET_VENDOR_8390</div><div class='ctx'> </div><div class='ctx'> config PCMCIA_AXNET</div><div class='ctx'> 	tristate "Asix AX88190 PCMCIA support"</div><div class='del'>-	depends on PCMCIA</div><div class='del'>-	---help---</div><div class='add'>+	depends on PCMCIA &amp;&amp; HAS_IOPORT</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you intend to attach an Asix AX88190-based PCMCIA</div><div class='ctx'> 	  (PC-card) Fast Ethernet card to your computer.  These cards are</div><div class='ctx'> 	  nearly NE2000 compatible but need a separate driver due to a few</div><div class='hunk'>@@ -35,7 +35,7 @@ config AX88796</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select MDIO_BITBANG</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  AX88796 driver, using platform bus to provide</div><div class='ctx'> 	  chip detection and resources</div><div class='ctx'> </div><div class='hunk'>@@ -43,14 +43,14 @@ config AX88796_93CX6</div><div class='ctx'> 	bool "ASIX AX88796 external 93CX6 eeprom support"</div><div class='ctx'> 	depends on AX88796</div><div class='ctx'> 	select EEPROM_93CX6</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Select this if your platform comes with an external 93CX6 eeprom.</div><div class='ctx'> </div><div class='ctx'> config XSURF100</div><div class='ctx'> 	tristate "Amiga XSurf 100 AX88796/NE2000 clone support"</div><div class='ctx'> 	depends on ZORRO</div><div class='ctx'> 	select AX88796</div><div class='del'>-	select ASIX_PHY</div><div class='add'>+	select AX88796B_PHY</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver is for the Individual Computers X-Surf 100 Ethernet</div><div class='ctx'> 	  card (based on the Asix AX88796 chip). If you have such a card,</div><div class='hunk'>@@ -63,7 +63,7 @@ config HYDRA</div><div class='ctx'> 	tristate "Hydra support"</div><div class='ctx'> 	depends on ZORRO</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a Hydra Ethernet adapter, say Y. Otherwise, say N.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -73,7 +73,7 @@ config ARM_ETHERH</div><div class='ctx'> 	tristate "I-cubed EtherH/ANT EtherM support"</div><div class='ctx'> 	depends on ARM &amp;&amp; ARCH_ACORN</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have an Acorn system with one of these network cards, you</div><div class='ctx'> 	  should say Y to this option if you wish to use it with Linux.</div><div class='ctx'> </div><div class='hunk'>@@ -81,7 +81,7 @@ config MAC8390</div><div class='ctx'> 	tristate "Macintosh NS 8390 based ethernet cards"</div><div class='ctx'> 	depends on MAC</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you want to include a driver to support Nubus or LC-PDS</div><div class='ctx'> 	  Ethernet cards using an NS8390 chipset or its equivalent, say Y.</div><div class='ctx'> </div><div class='hunk'>@@ -89,7 +89,7 @@ config MCF8390</div><div class='ctx'> 	tristate "ColdFire NS8390 based Ethernet support"</div><div class='ctx'> 	depends on COLDFIRE</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for Ethernet devices using an NS8390-compatible</div><div class='ctx'> 	  chipset on many common ColdFire CPU based boards. Many of the older</div><div class='ctx'> 	  Freescale dev boards use this, and some other common boards like</div><div class='hunk'>@@ -102,8 +102,9 @@ config MCF8390</div><div class='ctx'> config NE2000</div><div class='ctx'> 	tristate "NE2000/NE1000 support"</div><div class='ctx'> 	depends on (ISA || (Q40 &amp;&amp; m) || MACH_TX49XX || ATARI_ETHERNEC)</div><div class='add'>+	select NETDEV_LEGACY_INIT if ISA</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card of this type, say Y here.</div><div class='ctx'> 	  Many Ethernet cards without a specific driver are compatible with</div><div class='ctx'> 	  the NE2000.</div><div class='hunk'>@@ -116,9 +117,9 @@ config NE2000</div><div class='ctx'> </div><div class='ctx'> config NE2K_PCI</div><div class='ctx'> 	tristate "PCI NE2000 and clones support (see help)"</div><div class='del'>-	depends on PCI</div><div class='add'>+	depends on PCI &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for NE2000 compatible PCI cards. It will not work</div><div class='ctx'> 	  with ISA NE2000 cards (they have their own driver, "NE2000/NE1000</div><div class='ctx'> 	  support" below). If you have a PCI NE2000 network (Ethernet) card,</div><div class='hunk'>@@ -136,7 +137,7 @@ config APNE</div><div class='ctx'> 	tristate "PCMCIA NE2000 support"</div><div class='ctx'> 	depends on AMIGA_PCMCIA</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,</div><div class='ctx'> 	  say N.</div><div class='ctx'> </div><div class='hunk'>@@ -145,9 +146,9 @@ config APNE</div><div class='ctx'> </div><div class='ctx'> config PCMCIA_PCNET</div><div class='ctx'> 	tristate "NE2000 compatible PCMCIA support"</div><div class='del'>-	depends on PCMCIA</div><div class='add'>+	depends on PCMCIA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you intend to attach an NE2000 compatible PCMCIA</div><div class='ctx'> 	  (PC-card) Ethernet or Fast Ethernet card to your computer.</div><div class='ctx'> </div><div class='hunk'>@@ -158,7 +159,7 @@ config STNIC</div><div class='ctx'> 	tristate "National DP83902AV  support"</div><div class='ctx'> 	depends on SUPERH</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for cards based on the National Semiconductor DP83902AV</div><div class='ctx'> 	  ST-NIC Serial Network Interface Controller for Twisted Pair.  This</div><div class='ctx'> 	  is a 10Mbit/sec Ethernet controller.  Product overview and specs at</div><div class='hunk'>@@ -169,8 +170,9 @@ config STNIC</div><div class='ctx'> config ULTRA</div><div class='ctx'> 	tristate "SMC Ultra support"</div><div class='ctx'> 	depends on ISA</div><div class='add'>+	select NETDEV_LEGACY_INIT</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card of this type, say Y here.</div><div class='ctx'> </div><div class='ctx'> 	  Important: There have been many reports that, with some motherboards</div><div class='hunk'>@@ -186,8 +188,9 @@ config ULTRA</div><div class='ctx'> config WD80x3</div><div class='ctx'> 	tristate "WD80*3 support"</div><div class='ctx'> 	depends on ISA</div><div class='add'>+	select NETDEV_LEGACY_INIT</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card of this type, say Y here.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='hunk'>@@ -197,7 +200,7 @@ config ZORRO8390</div><div class='ctx'> 	tristate "Zorro NS8390-based Ethernet support"</div><div class='ctx'> 	depends on ZORRO</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for Zorro Ethernet cards using an NS8390-compatible</div><div class='ctx'> 	  chipset, like the Village Tronic Ariadne II and the Individual</div><div class='ctx'> 	  Computers X-Surf Ethernet cards. If you have such a card, say Y.</div><div class='head'>diff --git a/drivers/net/ethernet/8390/apne.c b/drivers/net/ethernet/8390/apne.c<br/>index fe6c834c422e..828edca8d30c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/apne.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/apne.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/apne.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/apne.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Amiga Linux/68k 8390 based PCMCIA Ethernet Driver for the Amiga 1200</div><div class='ctx'>  *</div><div class='hunk'>@@ -19,12 +20,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * ----------------------------------------------------------------------------</div><div class='ctx'>  *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file COPYING in the main directory of the Linux</div><div class='del'>- * distribution for more details.</div><div class='del'>- *</div><div class='del'>- * ----------------------------------------------------------------------------</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -75,7 +70,6 @@</div><div class='ctx'> #define NESM_STOP_PG	0x80	/* Last page +1 of RX ring */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct net_device * __init apne_probe(int unit);</div><div class='ctx'> static int apne_probe1(struct net_device *dev, int ioaddr);</div><div class='ctx'> </div><div class='ctx'> static void apne_reset_8390(struct net_device *dev);</div><div class='hunk'>@@ -120,7 +114,7 @@ static u32 apne_msg_enable;</div><div class='ctx'> module_param_named(msg_enable, apne_msg_enable, uint, 0444);</div><div class='ctx'> MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)");</div><div class='ctx'> </div><div class='del'>-struct net_device * __init apne_probe(int unit)</div><div class='add'>+static struct net_device * __init apne_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct ei_device *ei_local;</div><div class='hunk'>@@ -150,10 +144,6 @@ struct net_device * __init apne_probe(int unit)</div><div class='ctx'> 	dev = alloc_ei_netdev();</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (unit &gt;= 0) {</div><div class='del'>-		sprintf(dev-&gt;name, "eth%d", unit);</div><div class='del'>-		netdev_boot_setup_check(dev);</div><div class='del'>-	}</div><div class='ctx'> 	ei_local = netdev_priv(dev);</div><div class='ctx'> 	ei_local-&gt;msg_enable = apne_msg_enable;</div><div class='ctx'> </div><div class='hunk'>@@ -325,8 +315,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'>     i = request_irq(dev-&gt;irq, apne_interrupt, IRQF_SHARED, DRV_NAME, dev);</div><div class='ctx'>     if (i) return i;</div><div class='ctx'> </div><div class='del'>-    for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-	dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='add'>+    eth_hw_addr_set(dev, SA_prom);</div><div class='ctx'> </div><div class='ctx'>     pr_cont(" %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -554,12 +543,11 @@ static irqreturn_t apne_interrupt(int irq, void *dev_id)</div><div class='ctx'>     return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='ctx'> static struct net_device *apne_dev;</div><div class='ctx'> </div><div class='ctx'> static int __init apne_module_init(void)</div><div class='ctx'> {</div><div class='del'>-	apne_dev = apne_probe(-1);</div><div class='add'>+	apne_dev = apne_probe();</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(apne_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -579,7 +567,6 @@ static void __exit apne_module_exit(void)</div><div class='ctx'> }</div><div class='ctx'> module_init(apne_module_init);</div><div class='ctx'> module_exit(apne_module_exit);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int init_pcmcia(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -623,4 +610,5 @@ static int init_pcmcia(void)</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor 8390 Amiga PCMCIA ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c<br/>index 3dcc61821ed5..e1695d0fbd8b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/ax88796.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/ax88796.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/ax88796.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/ax88796.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* drivers/net/ethernet/8390/ax88796.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2005,2007 Simtec Electronics</div><div class='hunk'>@@ -5,10 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Asix AX88796 10/100 Ethernet controller support</div><div class='ctx'>  *	Based on ne.c, by Donald Becker, et-al.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -104,6 +101,13 @@ static inline struct ax_device *to_ax_dev(struct net_device *dev)</div><div class='ctx'> 	return (struct ax_device *)(ei_local + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ax_NS8390_reinit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	ax_NS8390_init(dev, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+EXPORT_SYMBOL_GPL(ax_NS8390_reinit);</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * ax_initial_check</div><div class='ctx'>  *</div><div class='hunk'>@@ -575,9 +579,9 @@ static void ax_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(dev-&gt;dev.parent);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pdev-&gt;name, sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pdev-&gt;name, sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 ax_get_msglevel(struct net_device *dev)</div><div class='hunk'>@@ -638,7 +642,7 @@ static void ax_eeprom_register_write(struct eeprom_93cx6 *eeprom)</div><div class='ctx'> static const struct net_device_ops ax_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ax_open,</div><div class='ctx'> 	.ndo_stop		= ax_close,</div><div class='del'>-	.ndo_do_ioctl		= ax_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= ax_ioctl,</div><div class='ctx'> </div><div class='ctx'> 	.ndo_start_xmit		= ax_ei_start_xmit,</div><div class='ctx'> 	.ndo_tx_timeout		= ax_ei_tx_timeout,</div><div class='hunk'>@@ -712,7 +716,7 @@ static int ax_init_dev(struct net_device *dev)</div><div class='ctx'> 			for (i = 0; i &lt; 16; i++)</div><div class='ctx'> 				SA_prom[i] = SA_prom[i+i];</div><div class='ctx'> </div><div class='del'>-		memcpy(dev-&gt;dev_addr, SA_prom, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, SA_prom);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AX88796_93CX6</div><div class='hunk'>@@ -729,7 +733,7 @@ static int ax_init_dev(struct net_device *dev)</div><div class='ctx'> 				       (__le16 __force *)mac_addr,</div><div class='ctx'> 				       sizeof(mac_addr) &gt;&gt; 1);</div><div class='ctx'> </div><div class='del'>-		memcpy(dev-&gt;dev_addr, mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (ax-&gt;plat-&gt;wordlength == 2) {</div><div class='hunk'>@@ -744,16 +748,18 @@ static int ax_init_dev(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* load the mac-address from the device */</div><div class='ctx'> 	if (ax-&gt;plat-&gt;flags &amp; AXFLG_MAC_FROMDEV) {</div><div class='add'>+		u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='ctx'> 		ei_outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP,</div><div class='ctx'> 			ei_local-&gt;mem + E8390_CMD); /* 0x61 */</div><div class='ctx'> 		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-			dev-&gt;dev_addr[i] =</div><div class='del'>-				ei_inb(ioaddr + EN1_PHYS_SHIFT(i));</div><div class='add'>+			addr[i] = ei_inb(ioaddr + EN1_PHYS_SHIFT(i));</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((ax-&gt;plat-&gt;flags &amp; AXFLG_MAC_FROMPLATFORM) &amp;&amp;</div><div class='ctx'> 	    ax-&gt;plat-&gt;mac_addr)</div><div class='del'>-		memcpy(dev-&gt;dev_addr, ax-&gt;plat-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, ax-&gt;plat-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='ctx'> 		eth_hw_addr_random(dev);</div><div class='hunk'>@@ -805,7 +811,7 @@ static int ax_init_dev(struct net_device *dev)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ax_remove(struct platform_device *pdev)</div><div class='add'>+static void ax_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct ei_device *ei_local = netdev_priv(dev);</div><div class='hunk'>@@ -826,8 +832,6 @@ static int ax_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/ethernet/8390/axnet_cs.c b/drivers/net/ethernet/8390/axnet_cs.c<br/>index 0b6bbf63f7ca..7c8213011b5c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/axnet_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/axnet_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/axnet_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/axnet_cs.c</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='add'>+</div><div class='ctx'> /*======================================================================</div><div class='ctx'> </div><div class='ctx'>     A PCMCIA ethernet driver for Asix AX88190-based cards</div><div class='hunk'>@@ -17,9 +19,7 @@</div><div class='ctx'> </div><div class='ctx'>     Written 1992,1993 by Donald Becker.</div><div class='ctx'>     Copyright 1993 United States Government as represented by the</div><div class='del'>-    Director, National Security Agency.  This software may be used and</div><div class='del'>-    distributed according to the terms of the GNU General Public License,</div><div class='del'>-    incorporated herein by reference.</div><div class='add'>+    Director, National Security Agency.</div><div class='ctx'>     Donald Becker may be reached at becker@scyld.com</div><div class='ctx'> </div><div class='ctx'> ======================================================================*/</div><div class='hunk'>@@ -83,7 +83,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					  struct net_device *dev);</div><div class='ctx'> static struct net_device_stats *get_stats(struct net_device *dev);</div><div class='ctx'> static void set_multicast_list(struct net_device *dev);</div><div class='del'>-static void axnet_tx_timeout(struct net_device *dev);</div><div class='add'>+static void axnet_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static irqreturn_t ei_irq_wrapper(int irq, void *dev_id);</div><div class='ctx'> static void ei_watchdog(struct timer_list *t);</div><div class='ctx'> static void axnet_reset_8390(struct net_device *dev);</div><div class='hunk'>@@ -128,7 +128,7 @@ static inline struct axnet_dev *PRIV(struct net_device *dev)</div><div class='ctx'> static const struct net_device_ops axnet_netdev_ops = {</div><div class='ctx'> 	.ndo_open 		= axnet_open,</div><div class='ctx'> 	.ndo_stop		= axnet_close,</div><div class='del'>-	.ndo_do_ioctl		= axnet_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= axnet_ioctl,</div><div class='ctx'> 	.ndo_start_xmit		= axnet_start_xmit,</div><div class='ctx'> 	.ndo_tx_timeout		= axnet_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= get_stats,</div><div class='hunk'>@@ -187,6 +187,7 @@ static int get_prom(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     unsigned int ioaddr = dev-&gt;base_addr;</div><div class='add'>+    u8 addr[ETH_ALEN];</div><div class='ctx'>     int i, j;</div><div class='ctx'> </div><div class='ctx'>     /* This is based on drivers/net/ethernet/8390/ne.c */</div><div class='hunk'>@@ -220,9 +221,11 @@ static int get_prom(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     for (i = 0; i &lt; 6; i += 2) {</div><div class='ctx'> 	j = inw(ioaddr + AXNET_DATAPORT);</div><div class='del'>-	dev-&gt;dev_addr[i] = j &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[i+1] = j &gt;&gt; 8;</div><div class='add'>+	addr[i] = j &amp; 0xff;</div><div class='add'>+	addr[i+1] = j &gt;&gt; 8;</div><div class='ctx'>     }</div><div class='add'>+    eth_hw_addr_set(dev, addr);</div><div class='add'>+</div><div class='ctx'>     return 1;</div><div class='ctx'> } /* get_prom */</div><div class='ctx'> </div><div class='hunk'>@@ -501,7 +504,7 @@ static int axnet_close(struct net_device *dev)</div><div class='ctx'>     </div><div class='ctx'>     link-&gt;open--;</div><div class='ctx'>     netif_stop_queue(dev);</div><div class='del'>-    del_timer_sync(&amp;info-&gt;watchdog);</div><div class='add'>+    timer_delete_sync(&amp;info-&gt;watchdog);</div><div class='ctx'> </div><div class='ctx'>     return 0;</div><div class='ctx'> } /* axnet_close */</div><div class='hunk'>@@ -547,7 +550,7 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static void ei_watchdog(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-    struct axnet_dev *info = from_timer(info, t, watchdog);</div><div class='add'>+    struct axnet_dev *info = timer_container_of(info, t, watchdog);</div><div class='ctx'>     struct net_device *dev = info-&gt;p_dev-&gt;priv;</div><div class='ctx'>     unsigned int nic_base = dev-&gt;base_addr;</div><div class='ctx'>     unsigned int mii_addr = nic_base + AXNET_MII_EEP;</div><div class='hunk'>@@ -610,7 +613,7 @@ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'>     switch (cmd) {</div><div class='ctx'>     case SIOCGMIIPHY:</div><div class='ctx'> 	data-&gt;phy_id = info-&gt;phy_id;</div><div class='del'>-	/* Fall through */</div><div class='add'>+	fallthrough;</div><div class='ctx'>     case SIOCGMIIREG:		/* Read MII PHY register. */</div><div class='ctx'> 	data-&gt;val_out = mdio_read(mii_addr, data-&gt;phy_id, data-&gt;reg_num &amp; 0x1f);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -647,7 +650,6 @@ static void block_input(struct net_device *dev, int count,</div><div class='ctx'> {</div><div class='ctx'>     unsigned int nic_base = dev-&gt;base_addr;</div><div class='ctx'>     struct ei_device *ei_local = netdev_priv(dev);</div><div class='del'>-    int xfer_count = count;</div><div class='ctx'>     char *buf = skb-&gt;data;</div><div class='ctx'> </div><div class='ctx'>     if ((netif_msg_rx_status(ei_local)) &amp;&amp; (count != 4))</div><div class='hunk'>@@ -657,9 +659,9 @@ static void block_input(struct net_device *dev, int count,</div><div class='ctx'>     outb_p(E8390_RREAD+E8390_START, nic_base + AXNET_CMD);</div><div class='ctx'> </div><div class='ctx'>     insw(nic_base + AXNET_DATAPORT,buf,count&gt;&gt;1);</div><div class='del'>-    if (count &amp; 0x01)</div><div class='del'>-	buf[count-1] = inb(nic_base + AXNET_DATAPORT), xfer_count++;</div><div class='del'>-</div><div class='add'>+    if (count &amp; 0x01) {</div><div class='add'>+	buf[count-1] = inb(nic_base + AXNET_DATAPORT);</div><div class='add'>+    }</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*====================================================================*/</div><div class='hunk'>@@ -765,7 +767,7 @@ module_pcmcia_driver(axnet_cs_driver);</div><div class='ctx'>   Paul Gortmaker	: tweak ANK's above multicast changes a bit.</div><div class='ctx'>   Paul Gortmaker	: update packet statistics for v2.1.x</div><div class='ctx'>   Alan Cox		: support arbitrary stupid port mappings on the</div><div class='del'>-  			  68K Macintosh. Support &gt;16bit I/O spaces</div><div class='add'>+			  68K Macintosh. Support &gt;16bit I/O spaces</div><div class='ctx'>   Paul Gortmaker	: add kmod support for auto-loading of the 8390</div><div class='ctx'> 			  module by all drivers that require it.</div><div class='ctx'>   Alan Cox		: Spinlocking work, added 'BUG_83C690'</div><div class='hunk'>@@ -898,12 +900,13 @@ static int ax_close(struct net_device *dev)</div><div class='ctx'> /**</div><div class='ctx'>  * axnet_tx_timeout - handle transmit time out condition</div><div class='ctx'>  * @dev: network device which has apparently fallen asleep</div><div class='add'>+ * @txqueue: unused</div><div class='ctx'>  *</div><div class='ctx'>  * Called by kernel when device never acknowledges a transmit has</div><div class='ctx'>  * completed (or failed) - i.e. never posted a Tx related interrupt.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void axnet_tx_timeout(struct net_device *dev)</div><div class='add'>+static void axnet_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	long e8390_base = dev-&gt;base_addr;</div><div class='ctx'> 	struct ei_device *ei_local = netdev_priv(dev);</div><div class='hunk'>@@ -1088,7 +1091,7 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	long e8390_base;</div><div class='ctx'> 	int interrupts, nr_serviced = 0, i;</div><div class='ctx'> 	struct ei_device *ei_local;</div><div class='del'>-    	int handled = 0;</div><div class='add'>+	int handled = 0;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	e8390_base = dev-&gt;base_addr;</div><div class='hunk'>@@ -1269,10 +1272,12 @@ static void ei_tx_intr(struct net_device *dev)</div><div class='ctx'> 			ei_local-&gt;txing = 1;</div><div class='ctx'> 			NS8390_trigger_send(dev, ei_local-&gt;tx2, ei_local-&gt;tx_start_page + 6);</div><div class='ctx'> 			netif_trans_update(dev);</div><div class='del'>-			ei_local-&gt;tx2 = -1,</div><div class='add'>+			ei_local-&gt;tx2 = -1;</div><div class='ctx'> 			ei_local-&gt;lasttx = 2;</div><div class='add'>+		} else {</div><div class='add'>+			ei_local-&gt;lasttx = 20;</div><div class='add'>+			ei_local-&gt;txing = 0;</div><div class='ctx'> 		}</div><div class='del'>-		else ei_local-&gt;lasttx = 20, ei_local-&gt;txing = 0;	</div><div class='ctx'> 	}</div><div class='ctx'> 	else if (ei_local-&gt;tx2 &lt; 0) </div><div class='ctx'> 	{</div><div class='hunk'>@@ -1288,9 +1293,10 @@ static void ei_tx_intr(struct net_device *dev)</div><div class='ctx'> 			netif_trans_update(dev);</div><div class='ctx'> 			ei_local-&gt;tx1 = -1;</div><div class='ctx'> 			ei_local-&gt;lasttx = 1;</div><div class='add'>+		} else {</div><div class='add'>+			ei_local-&gt;lasttx = 10;</div><div class='add'>+			ei_local-&gt;txing = 0;</div><div class='ctx'> 		}</div><div class='del'>-		else</div><div class='del'>-			ei_local-&gt;lasttx = 10, ei_local-&gt;txing = 0;</div><div class='ctx'> 	}</div><div class='ctx'> //	else</div><div class='ctx'> //		netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n",</div><div class='hunk'>@@ -1581,12 +1587,12 @@ static void do_set_multicast_list(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	outb_p(E8390_NODMA + E8390_PAGE0, e8390_base + E8390_CMD);</div><div class='ctx'> </div><div class='del'>-  	if(dev-&gt;flags&amp;IFF_PROMISC)</div><div class='del'>-  		outb_p(E8390_RXCONFIG | 0x58, e8390_base + EN0_RXCR);</div><div class='add'>+	if(dev-&gt;flags&amp;IFF_PROMISC)</div><div class='add'>+		outb_p(E8390_RXCONFIG | 0x58, e8390_base + EN0_RXCR);</div><div class='ctx'> 	else if (dev-&gt;flags &amp; IFF_ALLMULTI || !netdev_mc_empty(dev))</div><div class='del'>-  		outb_p(E8390_RXCONFIG | 0x48, e8390_base + EN0_RXCR);</div><div class='del'>-  	else</div><div class='del'>-  		outb_p(E8390_RXCONFIG | 0x40, e8390_base + EN0_RXCR);</div><div class='add'>+		outb_p(E8390_RXCONFIG | 0x48, e8390_base + EN0_RXCR);</div><div class='add'>+	else</div><div class='add'>+		outb_p(E8390_RXCONFIG | 0x40, e8390_base + EN0_RXCR);</div><div class='ctx'> </div><div class='ctx'> 	outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, e8390_base+E8390_CMD);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c<br/>index 77191a281866..e876fe52399a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/etherh.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/etherh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/etherh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/etherh.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  linux/drivers/acorn/net/etherh.c</div><div class='ctx'>  *</div><div class='ctx'>  *  Copyright (C) 2000-2002 Russell King</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * NS8390 I-cubed EtherH and ANT EtherM specific driver</div><div class='ctx'>  * Thanks to I-Cubed for information on their cards.</div><div class='ctx'>  * EtherM conversion (C) 1999 Chris Kemp and Tim Watterton</div><div class='hunk'>@@ -261,7 +258,7 @@ static int etherh_set_config(struct net_device *dev, struct ifmap *map)</div><div class='ctx'> 		 * media type, turn off automedia detection.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dev-&gt;flags &amp;= ~IFF_AUTOMEDIA;</div><div class='del'>-		dev-&gt;if_port = map-&gt;port;</div><div class='add'>+		WRITE_ONCE(dev-&gt;if_port, map-&gt;port);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -558,9 +555,9 @@ static int __init etherm_addr(char *addr)</div><div class='ctx'> </div><div class='ctx'> static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, dev_name(dev-&gt;dev.parent),</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(dev-&gt;dev.parent),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -658,6 +655,7 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)</div><div class='ctx'> 	struct ei_device *ei_local;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct etherh_priv *eh;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ecard_request_resources(ec);</div><div class='hunk'>@@ -727,12 +725,13 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)</div><div class='ctx'> 	spin_lock_init(&amp;ei_local-&gt;page_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (ec-&gt;cid.product == PROD_ANT_ETHERM) {</div><div class='del'>-		etherm_addr(dev-&gt;dev_addr);</div><div class='add'>+		etherm_addr(addr);</div><div class='ctx'> 		ei_local-&gt;reg_offset = etherm_regoffsets;</div><div class='ctx'> 	} else {</div><div class='del'>-		etherh_addr(dev-&gt;dev_addr, ec);</div><div class='add'>+		etherh_addr(addr, ec);</div><div class='ctx'> 		ei_local-&gt;reg_offset = etherh_regoffsets;</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	ei_local-&gt;name          = dev-&gt;name;</div><div class='ctx'> 	ei_local-&gt;word16        = 1;</div><div class='head'>diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c<br/>index 941754ea78ec..fd9dcdc356e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/hydra.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/hydra.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/hydra.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/hydra.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='ctx'> /* New Hydra driver using generic 8390 core */</div><div class='ctx'> /* Based on old hydra driver by Topi Kanerva (topi@susanna.oulu.fi) */</div><div class='ctx'> </div><div class='del'>-/* This file is subject to the terms and conditions of the GNU General      */</div><div class='del'>-/* Public License.  See the file COPYING in the main directory of the       */</div><div class='del'>-/* Linux distribution for more details.                                     */</div><div class='del'>-</div><div class='ctx'> /* Peter De Schrijver (p2@mind.be) */</div><div class='ctx'> /* Oldenburg 2000 */</div><div class='ctx'> </div><div class='hunk'>@@ -116,6 +114,7 @@ static int hydra_init(struct zorro_dev *z)</div><div class='ctx'>     unsigned long ioaddr = board+HYDRA_NIC_BASE;</div><div class='ctx'>     const char name[] = "NE2000";</div><div class='ctx'>     int start_page, stop_page;</div><div class='add'>+    u8 macaddr[ETH_ALEN];</div><div class='ctx'>     int j;</div><div class='ctx'>     int err;</div><div class='ctx'> </div><div class='hunk'>@@ -129,7 +128,8 @@ static int hydra_init(struct zorro_dev *z)</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'>     for (j = 0; j &lt; ETH_ALEN; j++)</div><div class='del'>-	dev-&gt;dev_addr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j));</div><div class='add'>+	macaddr[j] = *((u8 *)(board + HYDRA_ADDRPROM + 2*j));</div><div class='add'>+    eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> </div><div class='ctx'>     /* We must set the 8390 for word mode. */</div><div class='ctx'>     z_writeb(0x4b, ioaddr + NE_EN0_DCFG);</div><div class='hunk'>@@ -270,4 +270,5 @@ static void __exit hydra_cleanup_module(void)</div><div class='ctx'> module_init(hydra_init_module);</div><div class='ctx'> module_exit(hydra_cleanup_module);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Zorro-II Hydra 8390 ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/8390/lib8390.c b/drivers/net/ethernet/8390/lib8390.c<br/>index c9c55c9eab9f..84aeb8054304 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/lib8390.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/lib8390.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/lib8390.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/lib8390.c</a></div><div class='hunk'>@@ -1,3 +1,5 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='add'>+</div><div class='ctx'> /* 8390.c: A general NS8390 ethernet driver core for linux. */</div><div class='ctx'> /*</div><div class='ctx'> 	Written 1992-94 by Donald Becker.</div><div class='hunk'>@@ -5,9 +7,6 @@</div><div class='ctx'> 	Copyright 1993 United States Government as represented by the</div><div class='ctx'> 	Director, National Security Agency.</div><div class='ctx'> </div><div class='del'>-	This software may be used and distributed according to the terms</div><div class='del'>-	of the GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='ctx'> 	The author may be reached as becker@scyld.com, or C/O</div><div class='ctx'> 	Scyld Computing Corporation</div><div class='ctx'> 	410 Severn Ave., Suite 210</div><div class='hunk'>@@ -50,6 +49,7 @@</div><div class='ctx'> </div><div class='ctx'>   */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/build_bug.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='hunk'>@@ -112,8 +112,10 @@ static void do_set_multicast_list(struct net_device *dev);</div><div class='ctx'> static void __NS8390_init(struct net_device *dev, int startp);</div><div class='ctx'> </div><div class='ctx'> static unsigned version_printed;</div><div class='del'>-static u32 msg_enable;</div><div class='del'>-module_param(msg_enable, uint, 0444);</div><div class='add'>+static int msg_enable;</div><div class='add'>+static const int default_msg_level = (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_RX_ERR |</div><div class='add'>+				     NETIF_MSG_TX_ERR);</div><div class='add'>+module_param(msg_enable, int, 0444);</div><div class='ctx'> MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)");</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -251,7 +253,7 @@ static int __ei_close(struct net_device *dev)</div><div class='ctx'>  * completed (or failed) - i.e. never posted a Tx related interrupt.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __ei_tx_timeout(struct net_device *dev)</div><div class='add'>+static void __ei_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long e8390_base = dev-&gt;base_addr;</div><div class='ctx'> 	struct ei_device *ei_local = netdev_priv(dev);</div><div class='hunk'>@@ -597,10 +599,12 @@ static void ei_tx_intr(struct net_device *dev)</div><div class='ctx'> 			ei_local-&gt;txing = 1;</div><div class='ctx'> 			NS8390_trigger_send(dev, ei_local-&gt;tx2, ei_local-&gt;tx_start_page + 6);</div><div class='ctx'> 			netif_trans_update(dev);</div><div class='del'>-			ei_local-&gt;tx2 = -1,</div><div class='add'>+			ei_local-&gt;tx2 = -1;</div><div class='ctx'> 			ei_local-&gt;lasttx = 2;</div><div class='del'>-		} else</div><div class='del'>-			ei_local-&gt;lasttx = 20, ei_local-&gt;txing = 0;</div><div class='add'>+		} else {</div><div class='add'>+			ei_local-&gt;lasttx = 20;</div><div class='add'>+			ei_local-&gt;txing = 0;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (ei_local-&gt;tx2 &lt; 0) {</div><div class='ctx'> 		if (ei_local-&gt;lasttx != 2  &amp;&amp;  ei_local-&gt;lasttx != -2)</div><div class='ctx'> 			pr_err("%s: bogus last_tx_buffer %d, tx2=%d\n",</div><div class='hunk'>@@ -612,8 +616,10 @@ static void ei_tx_intr(struct net_device *dev)</div><div class='ctx'> 			netif_trans_update(dev);</div><div class='ctx'> 			ei_local-&gt;tx1 = -1;</div><div class='ctx'> 			ei_local-&gt;lasttx = 1;</div><div class='del'>-		} else</div><div class='del'>-			ei_local-&gt;lasttx = 10, ei_local-&gt;txing = 0;</div><div class='add'>+		} else {</div><div class='add'>+			ei_local-&gt;lasttx = 10;</div><div class='add'>+			ei_local-&gt;txing = 0;</div><div class='add'>+		}</div><div class='ctx'> 	} /* else</div><div class='ctx'> 		netdev_warn(dev, "unexpected TX-done interrupt, lasttx=%d\n",</div><div class='ctx'> 			    ei_local-&gt;lasttx);</div><div class='hunk'>@@ -969,14 +975,14 @@ static void ethdev_setup(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ei_device *ei_local = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if ((msg_enable &amp; NETIF_MSG_DRV) &amp;&amp; (version_printed++ == 0))</div><div class='del'>-		pr_info("%s", version);</div><div class='del'>-</div><div class='ctx'> 	ether_setup(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ei_local-&gt;page_lock);</div><div class='ctx'> </div><div class='del'>-	ei_local-&gt;msg_enable = msg_enable;</div><div class='add'>+	ei_local-&gt;msg_enable = netif_msg_init(msg_enable, default_msg_level);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_drv(ei_local) &amp;&amp; (version_printed++ == 0))</div><div class='add'>+		pr_info("%s", version);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1014,8 +1020,7 @@ static void __NS8390_init(struct net_device *dev, int startp)</div><div class='ctx'> 	    ? (0x48 | ENDCFG_WTS | (ei_local-&gt;bigendian ? ENDCFG_BOS : 0))</div><div class='ctx'> 	    : 0x48;</div><div class='ctx'> </div><div class='del'>-	if (sizeof(struct e8390_pkt_hdr) != 4)</div><div class='del'>-		panic("8390.c: header struct mispacked\n");</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct e8390_pkt_hdr) != 4);</div><div class='ctx'> 	/* Follow National Semi's recommendations for initing the DP83902. */</div><div class='ctx'> 	ei_outb_p(E8390_NODMA+E8390_PAGE0+E8390_STOP, e8390_base+E8390_CMD); /* 0x21 */</div><div class='ctx'> 	ei_outb_p(endcfg, e8390_base + EN0_DCFG);	/* 0x48 or 0x49 */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c<br/>index d60a86aa8aa8..4a0a095a1a8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/mac8390.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/mac8390.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/mac8390.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/mac8390.c</a></div><div class='hunk'>@@ -1,11 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='ctx'> /* mac8390.c: New driver for 8390-based Nubus (or Nubus-alike)</div><div class='ctx'>    Ethernet cards on Linux */</div><div class='ctx'> /* Based on the former daynaport.c driver, by Alan Cox.  Some code</div><div class='ctx'>    taken from or inspired by skeleton.c by Donald Becker, acenic.c by</div><div class='del'>-   Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker.</div><div class='del'>-</div><div class='del'>-   This software may be used and distributed according to the terms of</div><div class='del'>-   the GNU Public License, incorporated herein by reference.  */</div><div class='add'>+   Jes Sorensen, and ne2k-pci.c by Donald Becker and Paul Gortmaker. */</div><div class='ctx'> </div><div class='ctx'> /* 2000-02-28: support added for Dayna and Kinetics cards by</div><div class='ctx'>    A.G.deWijn@phys.uu.nl */</div><div class='hunk'>@@ -175,7 +173,6 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return MAC8390_APPLE;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	case NUBUS_DRSW_APPLE:</div><div class='ctx'> 		switch (fres-&gt;dr_hw) {</div><div class='hunk'>@@ -186,11 +183,9 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return MAC8390_APPLE;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	case NUBUS_DRSW_ASANTE:</div><div class='ctx'> 		return MAC8390_ASANTE;</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	case NUBUS_DRSW_TECHWORKS:</div><div class='ctx'> 	case NUBUS_DRSW_DAYNA2:</div><div class='hunk'>@@ -199,11 +194,9 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)</div><div class='ctx'> 			return MAC8390_CABLETRON;</div><div class='ctx'> 		else</div><div class='ctx'> 			return MAC8390_APPLE;</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	case NUBUS_DRSW_FARALLON:</div><div class='ctx'> 		return MAC8390_FARALLON;</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	case NUBUS_DRSW_KINETICS:</div><div class='ctx'> 		switch (fres-&gt;dr_hw) {</div><div class='hunk'>@@ -212,7 +205,6 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)</div><div class='ctx'> 		default:</div><div class='ctx'> 			return MAC8390_KINETICS;</div><div class='ctx'> 		}</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	case NUBUS_DRSW_DAYNA:</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -224,7 +216,6 @@ static enum mac8390_type mac8390_ident(struct nubus_rsrc *fres)</div><div class='ctx'> 			return MAC8390_NONE;</div><div class='ctx'> 		else</div><div class='ctx'> 			return MAC8390_DAYNA;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return MAC8390_NONE;</div><div class='ctx'> }</div><div class='hunk'>@@ -299,6 +290,7 @@ static bool mac8390_rsrc_init(struct net_device *dev,</div><div class='ctx'> 	struct nubus_dirent ent;</div><div class='ctx'> 	int offset;</div><div class='ctx'> 	volatile unsigned short *i;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = SLOT2IRQ(board-&gt;slot);</div><div class='ctx'> 	/* This is getting to be a habit */</div><div class='hunk'>@@ -321,7 +313,8 @@ static bool mac8390_rsrc_init(struct net_device *dev,</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nubus_get_rsrc_mem(dev-&gt;dev_addr, &amp;ent, 6);</div><div class='add'>+	nubus_get_rsrc_mem(addr, &amp;ent, 6);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (useresources[cardtype] == 1) {</div><div class='ctx'> 		nubus_rewinddir(&amp;dir);</div><div class='hunk'>@@ -435,13 +428,12 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mac8390_device_remove(struct nubus_board *board)</div><div class='add'>+static void mac8390_device_remove(struct nubus_board *board)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = nubus_get_drvdata(board);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct nubus_driver mac8390_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/8390/mcf8390.c b/drivers/net/ethernet/8390/mcf8390.c<br/>index 4ad8031ab669..94ff8364cdf0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/mcf8390.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/mcf8390.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/mcf8390.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/mcf8390.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  Support for ColdFire CPU based boards using a NS8390 Ethernet device.</div><div class='ctx'>  *</div><div class='hunk'>@@ -5,9 +6,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  (C) Copyright 2012,  Greg Ungerer &lt;gerg@uclinux.org&gt;</div><div class='ctx'>  *</div><div class='del'>- *  This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- *  License.  See the file COPYING in the main directory of the Linux</div><div class='del'>- *  distribution for more details.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -374,8 +372,7 @@ static int mcf8390_init(struct net_device *dev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='add'>+	eth_hw_addr_set(dev, SA_prom);</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(dev, "Found ethernet address: %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -406,15 +403,13 @@ static int mcf8390_init(struct net_device *dev)</div><div class='ctx'> static int mcf8390_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	struct resource *mem, *irq;</div><div class='add'>+	struct resource *mem;</div><div class='ctx'> 	resource_size_t msize;</div><div class='del'>-	int ret;</div><div class='add'>+	int ret, irq;</div><div class='ctx'> </div><div class='del'>-	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	if (irq == NULL) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no IRQ specified?\n");</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (mem == NULL) {</div><div class='hunk'>@@ -434,7 +429,7 @@ static int mcf8390_probe(struct platform_device *pdev)</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;irq = irq-&gt;start;</div><div class='add'>+	dev-&gt;irq = irq;</div><div class='ctx'> 	dev-&gt;base_addr = mem-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	ret = mcf8390_init(dev);</div><div class='hunk'>@@ -446,17 +441,15 @@ static int mcf8390_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mcf8390_remove(struct platform_device *pdev)</div><div class='add'>+static void mcf8390_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct resource *mem;</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (mem)</div><div class='del'>-		release_mem_region(mem-&gt;start, resource_size(mem));</div><div class='add'>+	release_mem_region(mem-&gt;start, resource_size(mem));</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver mcf8390_drv = {</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c<br/>index 1c97e39b478e..961019c32842 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/ne.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/ne.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/ne.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/ne.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='ctx'> /* ne.c: A general non-shared-memory NS8390 ethernet driver for linux. */</div><div class='ctx'> /*</div><div class='ctx'>     Written 1992-94 by Donald Becker.</div><div class='hunk'>@@ -5,9 +6,6 @@</div><div class='ctx'>     Copyright 1993 United States Government as represented by the</div><div class='ctx'>     Director, National Security Agency.</div><div class='ctx'> </div><div class='del'>-    This software may be used and distributed according to the terms</div><div class='del'>-    of the GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='ctx'>     The author may be reached as becker@scyld.com, or C/O</div><div class='ctx'>     Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403</div><div class='ctx'> </div><div class='hunk'>@@ -52,6 +50,7 @@ static const char version2[] =</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/jiffies.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;net/Space.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -500,9 +499,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = ioaddr;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++) {</div><div class='del'>-		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='del'>-	}</div><div class='add'>+	eth_hw_addr_set(dev, SA_prom);</div><div class='ctx'> </div><div class='ctx'> 	pr_cont("%pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -710,7 +707,7 @@ static void ne_block_output(struct net_device *dev, int count,</div><div class='ctx'> retry:</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#ifdef NE8390_RW_BUGFIX</div><div class='add'>+#ifdef NE_RW_BUGFIX</div><div class='ctx'> 	/* Handle the read-before-write bug the same way as the</div><div class='ctx'> 	   Crynwr packet driver -- the NatSemi method doesn't work.</div><div class='ctx'> 	   Actually this doesn't always work either, but if you have</div><div class='hunk'>@@ -826,7 +823,7 @@ static int __init ne_drv_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ne_drv_remove(struct platform_device *pdev)</div><div class='add'>+static void ne_drv_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -845,7 +842,6 @@ static int ne_drv_remove(struct platform_device *pdev)</div><div class='ctx'> 		release_region(dev-&gt;base_addr, NE_IO_EXTENT);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Remove unused devices or all if true. */</div><div class='hunk'>@@ -922,13 +918,16 @@ static void __init ne_add_devices(void)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-int __init init_module(void)</div><div class='add'>+static int __init ne_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int retval;</div><div class='del'>-	ne_add_devices();</div><div class='add'>+</div><div class='add'>+	if (IS_MODULE(CONFIG_NE2000))</div><div class='add'>+		ne_add_devices();</div><div class='add'>+</div><div class='ctx'> 	retval = platform_driver_probe(&amp;ne_driver, ne_drv_probe);</div><div class='del'>-	if (retval) {</div><div class='add'>+</div><div class='add'>+	if (IS_MODULE(CONFIG_NE2000) &amp;&amp; retval) {</div><div class='ctx'> 		if (io[0] == 0)</div><div class='ctx'> 			pr_notice("ne.c: You must supply \"io=0xNNN\""</div><div class='ctx'> 			       " value(s) for ISA cards.\n");</div><div class='hunk'>@@ -940,17 +939,9 @@ int __init init_module(void)</div><div class='ctx'> 	ne_loop_rm_unreg(0);</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='del'>-#else /* MODULE */</div><div class='del'>-static int __init ne_init(void)</div><div class='del'>-{</div><div class='del'>-	int retval = platform_driver_probe(&amp;ne_driver, ne_drv_probe);</div><div class='del'>-</div><div class='del'>-	/* Unregister unused platform_devices. */</div><div class='del'>-	ne_loop_rm_unreg(0);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='ctx'> module_init(ne_init);</div><div class='ctx'> </div><div class='add'>+#if !defined(MODULE) &amp;&amp; defined(CONFIG_NETDEV_LEGACY_INIT)</div><div class='ctx'> struct net_device * __init ne_probe(int unit)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev;</div><div class='hunk'>@@ -991,7 +982,7 @@ struct net_device * __init ne_probe(int unit)</div><div class='ctx'> </div><div class='ctx'> 	return ERR_PTR(-ENODEV);</div><div class='ctx'> }</div><div class='del'>-#endif /* MODULE */</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void __exit ne_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c<br/>index 42985a82321a..1a34da07c0db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/ne2k-pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/ne2k-pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/ne2k-pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/ne2k-pci.c</a></div><div class='hunk'>@@ -1,39 +1,44 @@</div><div class='del'>-/* ne2k-pci.c: A NE2000 clone on PCI bus driver for Linux. */</div><div class='del'>-/*</div><div class='del'>-	A Linux device driver for PCI NE2000 clones.</div><div class='del'>-</div><div class='del'>-	Authors and other copyright holders:</div><div class='del'>-	1992-2000 by Donald Becker, NE2000 core and various modifications.</div><div class='del'>-	1995-1998 by Paul Gortmaker, core modifications and PCI support.</div><div class='del'>-	Copyright 1993 assigned to the United States Government as represented</div><div class='del'>-	by the Director, National Security Agency.</div><div class='del'>-</div><div class='del'>-	This software may be used and distributed according to the terms of</div><div class='del'>-	the GNU General Public License (GPL), incorporated herein by reference.</div><div class='del'>-	Drivers based on or derived from this code fall under the GPL and must</div><div class='del'>-	retain the authorship, copyright and license notice.  This file is not</div><div class='del'>-	a complete program and may only be used when the entire operating</div><div class='del'>-	system is licensed under the GPL.</div><div class='del'>-</div><div class='del'>-	The author may be reached as becker@scyld.com, or C/O</div><div class='del'>-	Scyld Computing Corporation</div><div class='del'>-	410 Severn Ave., Suite 210</div><div class='del'>-	Annapolis MD 21403</div><div class='del'>-</div><div class='del'>-	Issues remaining:</div><div class='del'>-	People are making PCI ne2000 clones! Oh the horror, the horror...</div><div class='del'>-	Limited full-duplex support.</div><div class='del'>-*/</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='add'>+/* A Linux device driver for PCI NE2000 clones.</div><div class='add'>+ *</div><div class='add'>+ * Authors and other copyright holders:</div><div class='add'>+ * 1992-2000 by Donald Becker, NE2000 core and various modifications.</div><div class='add'>+ * 1995-1998 by Paul Gortmaker, core modifications and PCI support.</div><div class='add'>+ * Copyright 1993 assigned to the United States Government as represented</div><div class='add'>+ * by the Director, National Security Agency.</div><div class='add'>+ *</div><div class='add'>+ * This software may be used and distributed according to the terms of</div><div class='add'>+ * the GNU General Public License (GPL), incorporated herein by reference.</div><div class='add'>+ * Drivers based on or derived from this code fall under the GPL and must</div><div class='add'>+ * retain the authorship, copyright and license notice.  This file is not</div><div class='add'>+ * a complete program and may only be used when the entire operating</div><div class='add'>+ * system is licensed under the GPL.</div><div class='add'>+ *</div><div class='add'>+ * The author may be reached as becker@scyld.com, or C/O</div><div class='add'>+ * Scyld Computing Corporation</div><div class='add'>+ * 410 Severn Ave., Suite 210</div><div class='add'>+ * Annapolis MD 21403</div><div class='add'>+ *</div><div class='add'>+ * Issues remaining:</div><div class='add'>+ * People are making PCI NE2000 clones! Oh the horror, the horror...</div><div class='add'>+ * Limited full-duplex support.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ne2k-pci"</div><div class='add'>+#define DRV_DESCRIPTION	"PCI NE2000 clone driver"</div><div class='add'>+#define DRV_AUTHOR	"Donald Becker / Paul Gortmaker"</div><div class='ctx'> #define DRV_VERSION	"1.03"</div><div class='ctx'> #define DRV_RELDATE	"9/22/2003"</div><div class='ctx'> </div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> /* The user-configurable values.</div><div class='del'>-   These may be modified when a driver module is loaded.*/</div><div class='add'>+ * These may be modified when a driver module is loaded.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* More are supported, limit only on options */</div><div class='add'>+#define MAX_UNITS 8</div><div class='ctx'> </div><div class='del'>-#define MAX_UNITS 8				/* More are supported, limit only on options */</div><div class='ctx'> /* Used to pass the full-duplex flag, etc. */</div><div class='ctx'> static int full_duplex[MAX_UNITS];</div><div class='ctx'> static int options[MAX_UNITS];</div><div class='hunk'>@@ -52,38 +57,36 @@ static int options[MAX_UNITS];</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "8390.h"</div><div class='ctx'> </div><div class='del'>-static u32 ne2k_msg_enable;</div><div class='add'>+static int ne2k_msg_enable;</div><div class='ctx'> </div><div class='del'>-/* These identify the driver base version and may not be removed. */</div><div class='del'>-static const char version[] =</div><div class='del'>-	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE</div><div class='del'>-	" D. Becker/P. Gortmaker\n";</div><div class='add'>+static const int default_msg_level = (NETIF_MSG_DRV | NETIF_MSG_PROBE |</div><div class='add'>+				      NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR);</div><div class='ctx'> </div><div class='ctx'> #if defined(__powerpc__)</div><div class='ctx'> #define inl_le(addr)  le32_to_cpu(inl(addr))</div><div class='ctx'> #define inw_le(addr)  le16_to_cpu(inw(addr))</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define PFX DRV_NAME ": "</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Donald Becker / Paul Gortmaker");</div><div class='del'>-MODULE_DESCRIPTION("PCI NE2000 clone driver");</div><div class='add'>+MODULE_AUTHOR(DRV_AUTHOR);</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='add'>+MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-module_param_named(msg_enable, ne2k_msg_enable, uint, 0444);</div><div class='add'>+module_param_named(msg_enable, ne2k_msg_enable, int, 0444);</div><div class='ctx'> module_param_array(options, int, NULL, 0);</div><div class='ctx'> module_param_array(full_duplex, int, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(msg_enable, "Debug message level (see linux/netdevice.h for bitmap)");</div><div class='ctx'> MODULE_PARM_DESC(options, "Bit 5: full duplex");</div><div class='ctx'> MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");</div><div class='ctx'> </div><div class='del'>-/* Some defines that people can play with if so inclined. */</div><div class='add'>+/* Some defines that people can play with if so inclined.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /* Use 32 bit data-movement operations instead of 16 bit. */</div><div class='ctx'> #define USE_LONGIO</div><div class='hunk'>@@ -91,14 +94,18 @@ MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");</div><div class='ctx'> /* Do we implement the read before write bugfix ? */</div><div class='ctx'> /* #define NE_RW_BUGFIX */</div><div class='ctx'> </div><div class='del'>-/* Flags.  We rename an existing ei_status field to store flags! */</div><div class='del'>-/* Thus only the low 8 bits are usable for non-init-time flags. */</div><div class='add'>+/* Flags.  We rename an existing ei_status field to store flags!</div><div class='add'>+ * Thus only the low 8 bits are usable for non-init-time flags.</div><div class='add'>+ */</div><div class='ctx'> #define ne2k_flags reg0</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='del'>-	ONLY_16BIT_IO=8, ONLY_32BIT_IO=4,	/* Chip can do only 16/32-bit xfers. */</div><div class='del'>-	FORCE_FDX=0x20,						/* User override. */</div><div class='del'>-	REALTEK_FDX=0x40, HOLTEK_FDX=0x80,</div><div class='del'>-	STOP_PG_0x60=0x100,</div><div class='add'>+	/* Chip can do only 16/32-bit xfers. */</div><div class='add'>+	ONLY_16BIT_IO = 8, ONLY_32BIT_IO = 4,</div><div class='add'>+	/* User override. */</div><div class='add'>+	FORCE_FDX = 0x20,</div><div class='add'>+	REALTEK_FDX = 0x40, HOLTEK_FDX = 0x80,</div><div class='add'>+	STOP_PG_0x60 = 0x100,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ne2k_pci_chipsets {</div><div class='hunk'>@@ -120,7 +127,7 @@ static struct {</div><div class='ctx'> 	char *name;</div><div class='ctx'> 	int flags;</div><div class='ctx'> } pci_clone_list[] = {</div><div class='del'>-	{"RealTek RTL-8029", REALTEK_FDX},</div><div class='add'>+	{"RealTek RTL-8029(AS)", REALTEK_FDX},</div><div class='ctx'> 	{"Winbond 89C940", 0},</div><div class='ctx'> 	{"Compex RL2000", 0},</div><div class='ctx'> 	{"KTI ET32P2", 0},</div><div class='hunk'>@@ -149,13 +156,14 @@ static const struct pci_device_id ne2k_pci_tbl[] = {</div><div class='ctx'> 	{ 0x8c4a, 0x1980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940_8c4a },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='add'>+</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, ne2k_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* ---- No user-serviceable parts below ---- */</div><div class='ctx'> </div><div class='ctx'> #define NE_BASE	 (dev-&gt;base_addr)</div><div class='del'>-#define NE_CMD	 	0x00</div><div class='add'>+#define NE_CMD		0x00</div><div class='ctx'> #define NE_DATAPORT	0x10	/* NatSemi-defined port window offset. */</div><div class='ctx'> #define NE_RESET	0x1f	/* Issue a read to reset, a write to clear. */</div><div class='ctx'> #define NE_IO_EXTENT	0x20</div><div class='hunk'>@@ -168,37 +176,27 @@ static int ne2k_pci_open(struct net_device *dev);</div><div class='ctx'> static int ne2k_pci_close(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> static void ne2k_pci_reset_8390(struct net_device *dev);</div><div class='del'>-static void ne2k_pci_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,</div><div class='del'>-			  int ring_page);</div><div class='add'>+static void ne2k_pci_get_8390_hdr(struct net_device *dev,</div><div class='add'>+				  struct e8390_pkt_hdr *hdr, int ring_page);</div><div class='ctx'> static void ne2k_pci_block_input(struct net_device *dev, int count,</div><div class='del'>-			  struct sk_buff *skb, int ring_offset);</div><div class='add'>+				 struct sk_buff *skb, int ring_offset);</div><div class='ctx'> static void ne2k_pci_block_output(struct net_device *dev, const int count,</div><div class='del'>-		const unsigned char *buf, const int start_page);</div><div class='add'>+				  const unsigned char *buf,</div><div class='add'>+				  const int start_page);</div><div class='ctx'> static const struct ethtool_ops ne2k_pci_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-/* There is no room in the standard 8390 structure for extra info we need,</div><div class='del'>-   so we build a meta/outer-wrapper structure.. */</div><div class='del'>-struct ne2k_pci_card {</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct pci_dev *pci_dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  NEx000-clone boards have a Station Address (SA) PROM (SAPROM) in the packet</div><div class='del'>-  buffer memory space.  By-the-spec NE2000 clones have 0x57,0x57 in bytes</div><div class='del'>-  0x0e,0x0f of the SAPROM, while other supposed NE2000 clones must be</div><div class='del'>-  detected by their SA prefix.</div><div class='del'>-</div><div class='del'>-  Reading the SAPROM from a word-wide card with the 8390 set in byte-wide</div><div class='del'>-  mode results in doubled values, which can be detected and compensated for.</div><div class='del'>-</div><div class='del'>-  The probe is also responsible for initializing the card and filling</div><div class='del'>-  in the 'dev' and 'ei_status' structures.</div><div class='del'>-*/</div><div class='add'>+/* NEx000-clone boards have a Station Address (SA) PROM (SAPROM) in the packet</div><div class='add'>+ * buffer memory space.  By-the-spec NE2000 clones have 0x57,0x57 in bytes</div><div class='add'>+ * 0x0e,0x0f of the SAPROM, while other supposed NE2000 clones must be</div><div class='add'>+ * detected by their SA prefix.</div><div class='add'>+ *</div><div class='add'>+ * Reading the SAPROM from a word-wide card with the 8390 set in byte-wide</div><div class='add'>+ * mode results in doubled values, which can be detected and compensated for.</div><div class='add'>+ *</div><div class='add'>+ * The probe is also responsible for initializing the card and filling</div><div class='add'>+ * in the 'dev' and 'ei_status' structures.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops ne2k_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ne2k_pci_open,</div><div class='hunk'>@@ -208,7 +206,7 @@ static const struct net_device_ops ne2k_netdev_ops = {</div><div class='ctx'> 	.ndo_get_stats		= ei_get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= ei_set_multicast_list,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='add'>+	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller = ei_poll,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -227,28 +225,21 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	int flags = pci_clone_list[chip_idx].flags;</div><div class='ctx'> 	struct ei_device *ei_local;</div><div class='ctx'> </div><div class='del'>-/* when built into the kernel, we only print version if device is found */</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	static int printed_version;</div><div class='del'>-	if (!printed_version++)</div><div class='del'>-		printk(version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	fnd_cnt++;</div><div class='ctx'> </div><div class='del'>-	i = pci_enable_device (pdev);</div><div class='add'>+	i = pci_enable_device(pdev);</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return i;</div><div class='ctx'> </div><div class='del'>-	ioaddr = pci_resource_start (pdev, 0);</div><div class='add'>+	ioaddr = pci_resource_start(pdev, 0);</div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	if (!ioaddr || ((pci_resource_flags (pdev, 0) &amp; IORESOURCE_IO) == 0)) {</div><div class='add'>+	if (!ioaddr || ((pci_resource_flags(pdev, 0) &amp; IORESOURCE_IO) == 0)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no I/O resource at PCI BAR #0\n");</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) {</div><div class='add'>+	if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "I/O resource 0x%x @ 0x%lx busy\n",</div><div class='ctx'> 			NE_IO_EXTENT, ioaddr);</div><div class='ctx'> 		goto err_out;</div><div class='hunk'>@@ -261,14 +252,17 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	/* Do a preliminary verification that we have a 8390. */</div><div class='ctx'> 	{</div><div class='ctx'> 		int regd;</div><div class='del'>-		outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);</div><div class='add'>+</div><div class='add'>+		outb(E8390_NODMA + E8390_PAGE1 + E8390_STOP, ioaddr + E8390_CMD);</div><div class='ctx'> 		regd = inb(ioaddr + 0x0d);</div><div class='ctx'> 		outb(0xff, ioaddr + 0x0d);</div><div class='del'>-		outb(E8390_NODMA+E8390_PAGE0, ioaddr + E8390_CMD);</div><div class='del'>-		inb(ioaddr + EN0_COUNTER0); /* Clear the counter by reading. */</div><div class='add'>+		outb(E8390_NODMA + E8390_PAGE0, ioaddr + E8390_CMD);</div><div class='add'>+		/* Clear the counter by reading. */</div><div class='add'>+		inb(ioaddr + EN0_COUNTER0);</div><div class='ctx'> 		if (inb(ioaddr + EN0_COUNTER0) != 0) {</div><div class='ctx'> 			outb(reg0, ioaddr);</div><div class='del'>-			outb(regd, ioaddr + 0x0d);	/* Restore the old values. */</div><div class='add'>+			/*  Restore the old values. */</div><div class='add'>+			outb(regd, ioaddr + 0x0d);</div><div class='ctx'> 			goto err_out_free_res;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -281,7 +275,7 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;ne2k_netdev_ops;</div><div class='ctx'> 	ei_local = netdev_priv(dev);</div><div class='del'>-	ei_local-&gt;msg_enable = ne2k_msg_enable;</div><div class='add'>+	ei_local-&gt;msg_enable = netif_msg_init(ne2k_msg_enable, default_msg_level);</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -291,9 +285,9 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 		outb(inb(ioaddr + NE_RESET), ioaddr + NE_RESET);</div><div class='ctx'> </div><div class='del'>-		/* This looks like a horrible timing loop, but it should never take</div><div class='del'>-		   more than a few cycles.</div><div class='del'>-		*/</div><div class='add'>+		/* This looks like a horrible timing loop, but it should never</div><div class='add'>+		 * take more than a few cycles.</div><div class='add'>+		 */</div><div class='ctx'> 		while ((inb(ioaddr + EN0_ISR) &amp; ENISR_RESET) == 0)</div><div class='ctx'> 			/* Limit wait: '2' avoids jiffy roll-over. */</div><div class='ctx'> 			if (jiffies - reset_start_time &gt; 2) {</div><div class='hunk'>@@ -301,42 +295,53 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 					"Card failure (no reset ack).\n");</div><div class='ctx'> 				goto err_out_free_netdev;</div><div class='ctx'> 			}</div><div class='del'>-</div><div class='del'>-		outb(0xff, ioaddr + EN0_ISR);		/* Ack all intr. */</div><div class='add'>+		/* Ack all intr. */</div><div class='add'>+		outb(0xff, ioaddr + EN0_ISR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read the 16 bytes of station address PROM.</div><div class='del'>-	   We must first initialize registers, similar to NS8390_init(eifdev, 0).</div><div class='del'>-	   We can't reliably read the SAPROM address without this.</div><div class='del'>-	   (I learned the hard way!). */</div><div class='add'>+	 * We must first initialize registers, similar</div><div class='add'>+	 * to NS8390_init(eifdev, 0).</div><div class='add'>+	 * We can't reliably read the SAPROM address without this.</div><div class='add'>+	 * (I learned the hard way!).</div><div class='add'>+	 */</div><div class='ctx'> 	{</div><div class='ctx'> 		struct {unsigned char value, offset; } program_seq[] = {</div><div class='del'>-			{E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD}, /* Select page 0*/</div><div class='del'>-			{0x49,	EN0_DCFG},	/* Set word-wide access. */</div><div class='del'>-			{0x00,	EN0_RCNTLO},	/* Clear the count regs. */</div><div class='add'>+			/* Select page 0 */</div><div class='add'>+			{E8390_NODMA + E8390_PAGE0 + E8390_STOP, E8390_CMD},</div><div class='add'>+			/* Set word-wide access */</div><div class='add'>+			{0x49,	EN0_DCFG},</div><div class='add'>+			/* Clear the count regs. */</div><div class='add'>+			{0x00,	EN0_RCNTLO},</div><div class='add'>+			/* Mask completion IRQ */</div><div class='ctx'> 			{0x00,	EN0_RCNTHI},</div><div class='del'>-			{0x00,	EN0_IMR},	/* Mask completion irq. */</div><div class='add'>+			{0x00,	EN0_IMR},</div><div class='ctx'> 			{0xFF,	EN0_ISR},</div><div class='del'>-			{E8390_RXOFF, EN0_RXCR},	/* 0x20  Set to monitor */</div><div class='del'>-			{E8390_TXOFF, EN0_TXCR},	/* 0x02  and loopback mode. */</div><div class='add'>+			/* 0x20 Set to monitor */</div><div class='add'>+			{E8390_RXOFF, EN0_RXCR},</div><div class='add'>+			/* 0x02 and loopback mode */</div><div class='add'>+			{E8390_TXOFF, EN0_TXCR},</div><div class='ctx'> 			{32,	EN0_RCNTLO},</div><div class='ctx'> 			{0x00,	EN0_RCNTHI},</div><div class='del'>-			{0x00,	EN0_RSARLO},	/* DMA starting at 0x0000. */</div><div class='add'>+			/* DMA starting at 0x0000 */</div><div class='add'>+			{0x00,	EN0_RSARLO},</div><div class='ctx'> 			{0x00,	EN0_RSARHI},</div><div class='ctx'> 			{E8390_RREAD+E8390_START, E8390_CMD},</div><div class='ctx'> 		};</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(program_seq); i++)</div><div class='del'>-			outb(program_seq[i].value, ioaddr + program_seq[i].offset);</div><div class='add'>+			outb(program_seq[i].value,</div><div class='add'>+			     ioaddr + program_seq[i].offset);</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Note: all PCI cards have at least 16 bit access, so we don't have</div><div class='del'>-	   to check for 8 bit cards.  Most cards permit 32 bit access. */</div><div class='add'>+	 * to check for 8 bit cards.  Most cards permit 32 bit access.</div><div class='add'>+	 */</div><div class='ctx'> 	if (flags &amp; ONLY_32BIT_IO) {</div><div class='ctx'> 		for (i = 0; i &lt; 4 ; i++)</div><div class='ctx'> 			((u32 *)SA_prom)[i] = le32_to_cpu(inl(ioaddr + NE_DATAPORT));</div><div class='ctx'> 	} else</div><div class='del'>-		for(i = 0; i &lt; 32 /*sizeof(SA_prom)*/; i++)</div><div class='add'>+		for (i = 0; i &lt; 32 /* sizeof(SA_prom )*/; i++)</div><div class='ctx'> 			SA_prom[i] = inb(ioaddr + NE_DATAPORT);</div><div class='ctx'> </div><div class='ctx'> 	/* We always set the 8390 registers for word mode. */</div><div class='hunk'>@@ -356,7 +361,7 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	ei_status.word16 = 1;</div><div class='ctx'> 	ei_status.ne2k_flags = flags;</div><div class='ctx'> 	if (fnd_cnt &lt; MAX_UNITS) {</div><div class='del'>-		if (full_duplex[fnd_cnt] &gt; 0  ||  (options[fnd_cnt] &amp; FORCE_FDX))</div><div class='add'>+		if (full_duplex[fnd_cnt] &gt; 0 || (options[fnd_cnt] &amp; FORCE_FDX))</div><div class='ctx'> 			ei_status.ne2k_flags |= FORCE_FDX;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -375,7 +380,7 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;ne2k_pci_ethtool_ops;</div><div class='ctx'> 	NS8390_init(dev, 0);</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, SA_prom, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, SA_prom);</div><div class='ctx'> </div><div class='ctx'> 	i = register_netdev(dev);</div><div class='ctx'> 	if (i)</div><div class='hunk'>@@ -388,16 +393,15 @@ static int ne2k_pci_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_free_netdev:</div><div class='del'>-	free_netdev (dev);</div><div class='add'>+	free_netdev(dev);</div><div class='ctx'> err_out_free_res:</div><div class='del'>-	release_region (ioaddr, NE_IO_EXTENT);</div><div class='add'>+	release_region(ioaddr, NE_IO_EXTENT);</div><div class='ctx'> err_out:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Magic incantation sequence for full duplex on the supported cards.</div><div class='add'>+/* Magic incantation sequence for full duplex on the supported cards.</div><div class='ctx'>  */</div><div class='ctx'> static inline int set_realtek_fdx(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -431,7 +435,9 @@ static int ne2k_pci_set_fdx(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int ne2k_pci_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret = request_irq(dev-&gt;irq, ei_interrupt, IRQF_SHARED, dev-&gt;name, dev);</div><div class='add'>+	int ret = request_irq(dev-&gt;irq, ei_interrupt, IRQF_SHARED,</div><div class='add'>+			      dev-&gt;name, dev);</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -450,7 +456,8 @@ static int ne2k_pci_close(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Hard reset the card.  This used to pause for the same period that a</div><div class='del'>-   8390 reset command required, but that shouldn't be necessary. */</div><div class='add'>+ * 8390 reset command required, but that shouldn't be necessary.</div><div class='add'>+ */</div><div class='ctx'> static void ne2k_pci_reset_8390(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long reset_start_time = jiffies;</div><div class='hunk'>@@ -467,31 +474,34 @@ static void ne2k_pci_reset_8390(struct net_device *dev)</div><div class='ctx'> 	/* This check _should_not_ be necessary, omit eventually. */</div><div class='ctx'> 	while ((inb(NE_BASE+EN0_ISR) &amp; ENISR_RESET) == 0)</div><div class='ctx'> 		if (jiffies - reset_start_time &gt; 2) {</div><div class='del'>-			netdev_err(dev, "ne2k_pci_reset_8390() did not complete.\n");</div><div class='add'>+			netdev_err(dev, "%s did not complete.\n", __func__);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-	outb(ENISR_RESET, NE_BASE + EN0_ISR);	/* Ack intr. */</div><div class='add'>+	/* Ack intr. */</div><div class='add'>+	outb(ENISR_RESET, NE_BASE + EN0_ISR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Grab the 8390 specific header. Similar to the block_input routine, but</div><div class='del'>-   we don't need to be concerned with ring wrap as the header will be at</div><div class='del'>-   the start of a page, so we optimize accordingly. */</div><div class='add'>+ * we don't need to be concerned with ring wrap as the header will be at</div><div class='add'>+ * the start of a page, so we optimize accordingly.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='del'>-static void ne2k_pci_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)</div><div class='add'>+static void ne2k_pci_get_8390_hdr(struct net_device *dev,</div><div class='add'>+				  struct e8390_pkt_hdr *hdr, int ring_page)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	long nic_base = dev-&gt;base_addr;</div><div class='ctx'> </div><div class='del'>-	/* This *shouldn't* happen. If it does, it's the last thing you'll see */</div><div class='add'>+	/* This *shouldn't* happen. If it does, it's the last thing you'll see</div><div class='add'>+	 */</div><div class='ctx'> 	if (ei_status.dmaing) {</div><div class='del'>-		netdev_err(dev, "DMAing conflict in ne2k_pci_get_8390_hdr "</div><div class='del'>-			   "[DMAstat:%d][irqlock:%d].\n",</div><div class='del'>-			   ei_status.dmaing, ei_status.irqlock);</div><div class='add'>+		netdev_err(dev, "DMAing conflict in %s [DMAstat:%d][irqlock:%d].\n",</div><div class='add'>+			   __func__, ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ei_status.dmaing |= 0x01;</div><div class='del'>-	outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);</div><div class='add'>+	outb(E8390_NODMA + E8390_PAGE0 + E8390_START, nic_base + NE_CMD);</div><div class='ctx'> 	outb(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);</div><div class='ctx'> 	outb(0, nic_base + EN0_RCNTHI);</div><div class='ctx'> 	outb(0, nic_base + EN0_RSARLO);		/* On page boundary */</div><div class='hunk'>@@ -499,20 +509,22 @@ static void ne2k_pci_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *</div><div class='ctx'> 	outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);</div><div class='ctx'> </div><div class='ctx'> 	if (ei_status.ne2k_flags &amp; ONLY_16BIT_IO) {</div><div class='del'>-		insw(NE_BASE + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr)&gt;&gt;1);</div><div class='add'>+		insw(NE_BASE + NE_DATAPORT, hdr,</div><div class='add'>+		     sizeof(struct e8390_pkt_hdr) &gt;&gt; 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		*(u32*)hdr = le32_to_cpu(inl(NE_BASE + NE_DATAPORT));</div><div class='add'>+		*(u32 *)hdr = le32_to_cpu(inl(NE_BASE + NE_DATAPORT));</div><div class='ctx'> 		le16_to_cpus(&amp;hdr-&gt;count);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	outb(ENISR_RDC, nic_base + EN0_ISR);	/* Ack intr. */</div><div class='add'>+	/* Ack intr. */</div><div class='add'>+	outb(ENISR_RDC, nic_base + EN0_ISR);</div><div class='ctx'> 	ei_status.dmaing &amp;= ~0x01;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Block input and output, similar to the Crynwr packet driver.  If you</div><div class='del'>-   are porting to a new ethercard, look at the packet driver source for hints.</div><div class='del'>-   The NEx000 doesn't share the on-board packet memory -- you have to put</div><div class='del'>-   the packet out through the "remote DMA" dataport using outb. */</div><div class='add'>+ *are porting to a new ethercard, look at the packet driver source for hints.</div><div class='add'>+ *The NEx000 doesn't share the on-board packet memory -- you have to put</div><div class='add'>+ *the packet out through the "remote DMA" dataport using outb.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> static void ne2k_pci_block_input(struct net_device *dev, int count,</div><div class='ctx'> 				 struct sk_buff *skb, int ring_offset)</div><div class='hunk'>@@ -520,30 +532,30 @@ static void ne2k_pci_block_input(struct net_device *dev, int count,</div><div class='ctx'> 	long nic_base = dev-&gt;base_addr;</div><div class='ctx'> 	char *buf = skb-&gt;data;</div><div class='ctx'> </div><div class='del'>-	/* This *shouldn't* happen. If it does, it's the last thing you'll see */</div><div class='add'>+	/* This *shouldn't* happen.</div><div class='add'>+	 * If it does, it's the last thing you'll see.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ei_status.dmaing) {</div><div class='del'>-		netdev_err(dev, "DMAing conflict in ne2k_pci_block_input "</div><div class='del'>-			   "[DMAstat:%d][irqlock:%d].\n",</div><div class='del'>-			   ei_status.dmaing, ei_status.irqlock);</div><div class='add'>+		netdev_err(dev, "DMAing conflict in %s [DMAstat:%d][irqlock:%d]\n",</div><div class='add'>+			   __func__, ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	ei_status.dmaing |= 0x01;</div><div class='ctx'> 	if (ei_status.ne2k_flags &amp; ONLY_32BIT_IO)</div><div class='ctx'> 		count = (count + 3) &amp; 0xFFFC;</div><div class='del'>-	outb(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);</div><div class='add'>+	outb(E8390_NODMA + E8390_PAGE0 + E8390_START, nic_base + NE_CMD);</div><div class='ctx'> 	outb(count &amp; 0xff, nic_base + EN0_RCNTLO);</div><div class='ctx'> 	outb(count &gt;&gt; 8, nic_base + EN0_RCNTHI);</div><div class='ctx'> 	outb(ring_offset &amp; 0xff, nic_base + EN0_RSARLO);</div><div class='ctx'> 	outb(ring_offset &gt;&gt; 8, nic_base + EN0_RSARHI);</div><div class='del'>-	outb(E8390_RREAD+E8390_START, nic_base + NE_CMD);</div><div class='add'>+	outb(E8390_RREAD + E8390_START, nic_base + NE_CMD);</div><div class='ctx'> </div><div class='ctx'> 	if (ei_status.ne2k_flags &amp; ONLY_16BIT_IO) {</div><div class='del'>-		insw(NE_BASE + NE_DATAPORT,buf,count&gt;&gt;1);</div><div class='del'>-		if (count &amp; 0x01) {</div><div class='add'>+		insw(NE_BASE + NE_DATAPORT, buf, count &gt;&gt; 1);</div><div class='add'>+		if (count &amp; 0x01)</div><div class='ctx'> 			buf[count-1] = inb(NE_BASE + NE_DATAPORT);</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='del'>-		insl(NE_BASE + NE_DATAPORT, buf, count&gt;&gt;2);</div><div class='add'>+		insl(NE_BASE + NE_DATAPORT, buf, count &gt;&gt; 2);</div><div class='ctx'> 		if (count &amp; 3) {</div><div class='ctx'> 			buf += count &amp; ~3;</div><div class='ctx'> 			if (count &amp; 2) {</div><div class='hunk'>@@ -556,41 +568,44 @@ static void ne2k_pci_block_input(struct net_device *dev, int count,</div><div class='ctx'> 				*buf = inb(NE_BASE + NE_DATAPORT);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	outb(ENISR_RDC, nic_base + EN0_ISR);	/* Ack intr. */</div><div class='add'>+	/* Ack intr. */</div><div class='add'>+	outb(ENISR_RDC, nic_base + EN0_ISR);</div><div class='ctx'> 	ei_status.dmaing &amp;= ~0x01;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ne2k_pci_block_output(struct net_device *dev, int count,</div><div class='del'>-				  const unsigned char *buf, const int start_page)</div><div class='add'>+		const unsigned char *buf, const int start_page)</div><div class='ctx'> {</div><div class='ctx'> 	long nic_base = NE_BASE;</div><div class='ctx'> 	unsigned long dma_start;</div><div class='ctx'> </div><div class='ctx'> 	/* On little-endian it's always safe to round the count up for</div><div class='del'>-	   word writes. */</div><div class='add'>+	 * word writes.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ei_status.ne2k_flags &amp; ONLY_32BIT_IO)</div><div class='ctx'> 		count = (count + 3) &amp; 0xFFFC;</div><div class='ctx'> 	else</div><div class='ctx'> 		if (count &amp; 0x01)</div><div class='ctx'> 			count++;</div><div class='ctx'> </div><div class='del'>-	/* This *shouldn't* happen. If it does, it's the last thing you'll see */</div><div class='add'>+	/* This *shouldn't* happen.</div><div class='add'>+	 * If it does, it's the last thing you'll see.</div><div class='add'>+	 */</div><div class='ctx'> 	if (ei_status.dmaing) {</div><div class='del'>-		netdev_err(dev, "DMAing conflict in ne2k_pci_block_output."</div><div class='del'>-			   "[DMAstat:%d][irqlock:%d]\n",</div><div class='del'>-			   ei_status.dmaing, ei_status.irqlock);</div><div class='add'>+		netdev_err(dev, "DMAing conflict in %s [DMAstat:%d][irqlock:%d]\n",</div><div class='add'>+			   __func__, ei_status.dmaing, ei_status.irqlock);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	ei_status.dmaing |= 0x01;</div><div class='ctx'> 	/* We should already be in page 0, but to be safe... */</div><div class='ctx'> 	outb(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);</div><div class='ctx'> </div><div class='del'>-#ifdef NE8390_RW_BUGFIX</div><div class='add'>+#ifdef NE_RW_BUGFIX</div><div class='ctx'> 	/* Handle the read-before-write bug the same way as the</div><div class='del'>-	   Crynwr packet driver -- the NatSemi method doesn't work.</div><div class='del'>-	   Actually this doesn't always work either, but if you have</div><div class='del'>-	   problems with your NEx000 this is better than nothing! */</div><div class='add'>+	 * Crynwr packet driver -- the NatSemi method doesn't work.</div><div class='add'>+	 * Actually this doesn't always work either, but if you have</div><div class='add'>+	 * problems with your NEx000 this is better than nothing!</div><div class='add'>+	 */</div><div class='ctx'> 	outb(0x42, nic_base + EN0_RCNTLO);</div><div class='ctx'> 	outb(0x00, nic_base + EN0_RCNTHI);</div><div class='ctx'> 	outb(0x42, nic_base + EN0_RSARLO);</div><div class='hunk'>@@ -599,16 +614,16 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,</div><div class='ctx'> #endif</div><div class='ctx'> 	outb(ENISR_RDC, nic_base + EN0_ISR);</div><div class='ctx'> </div><div class='del'>-   /* Now the normal output. */</div><div class='add'>+	/* Now the normal output. */</div><div class='ctx'> 	outb(count &amp; 0xff, nic_base + EN0_RCNTLO);</div><div class='ctx'> 	outb(count &gt;&gt; 8,   nic_base + EN0_RCNTHI);</div><div class='ctx'> 	outb(0x00, nic_base + EN0_RSARLO);</div><div class='ctx'> 	outb(start_page, nic_base + EN0_RSARHI);</div><div class='ctx'> 	outb(E8390_RWRITE+E8390_START, nic_base + NE_CMD);</div><div class='ctx'> 	if (ei_status.ne2k_flags &amp; ONLY_16BIT_IO) {</div><div class='del'>-		outsw(NE_BASE + NE_DATAPORT, buf, count&gt;&gt;1);</div><div class='add'>+		outsw(NE_BASE + NE_DATAPORT, buf, count &gt;&gt; 1);</div><div class='ctx'> 	} else {</div><div class='del'>-		outsl(NE_BASE + NE_DATAPORT, buf, count&gt;&gt;2);</div><div class='add'>+		outsl(NE_BASE + NE_DATAPORT, buf, count &gt;&gt; 2);</div><div class='ctx'> 		if (count &amp; 3) {</div><div class='ctx'> 			buf += count &amp; ~3;</div><div class='ctx'> 			if (count &amp; 2) {</div><div class='hunk'>@@ -623,14 +638,15 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,</div><div class='ctx'> 	dma_start = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	while ((inb(nic_base + EN0_ISR) &amp; ENISR_RDC) == 0)</div><div class='del'>-		if (jiffies - dma_start &gt; 2) {			/* Avoid clock roll-over. */</div><div class='add'>+		/* Avoid clock roll-over. */</div><div class='add'>+		if (jiffies - dma_start &gt; 2) {</div><div class='ctx'> 			netdev_warn(dev, "timeout waiting for Tx RDC.\n");</div><div class='ctx'> 			ne2k_pci_reset_8390(dev);</div><div class='del'>-			NS8390_init(dev,1);</div><div class='add'>+			NS8390_init(dev, 1);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-	outb(ENISR_RDC, nic_base + EN0_ISR);	/* Ack intr. */</div><div class='add'>+	/* Ack intr. */</div><div class='add'>+	outb(ENISR_RDC, nic_base + EN0_ISR);</div><div class='ctx'> 	ei_status.dmaing &amp;= ~0x01;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -640,9 +656,9 @@ static void ne2k_pci_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	struct ei_device *ei = netdev_priv(dev);</div><div class='ctx'> 	struct pci_dev *pci_dev = (struct pci_dev *) ei-&gt;priv;</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 ne2k_pci_get_msglevel(struct net_device *dev)</div><div class='hunk'>@@ -676,30 +692,18 @@ static void ne2k_pci_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused ne2k_pci_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ne2k_pci_resume (struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused ne2k_pci_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='del'>-	rc = pci_enable_device(pdev);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	NS8390_init(dev, 1);</div><div class='ctx'> 	netif_device_attach(dev);</div><div class='hunk'>@@ -707,36 +711,13 @@ static int ne2k_pci_resume (struct pci_dev *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='add'>+static SIMPLE_DEV_PM_OPS(ne2k_pci_pm_ops, ne2k_pci_suspend, ne2k_pci_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver ne2k_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.probe		= ne2k_pci_init_one,</div><div class='ctx'> 	.remove		= ne2k_pci_remove_one,</div><div class='ctx'> 	.id_table	= ne2k_pci_tbl,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= ne2k_pci_suspend,</div><div class='del'>-	.resume		= ne2k_pci_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='add'>+	.driver.pm	= &amp;ne2k_pci_pm_ops,</div><div class='ctx'> };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int __init ne2k_pci_init(void)</div><div class='del'>-{</div><div class='del'>-/* when a module, this is printed whether or not devices are found in probe */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	printk(version);</div><div class='del'>-#endif</div><div class='del'>-	return pci_register_driver(&amp;ne2k_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void __exit ne2k_pci_cleanup(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver (&amp;ne2k_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ne2k_pci_init);</div><div class='del'>-module_exit(ne2k_pci_cleanup);</div><div class='add'>+module_pci_driver(ne2k_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/8390/pcnet_cs.c b/drivers/net/ethernet/8390/pcnet_cs.c<br/>index 645efac6310d..19f9c5db3f3b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/pcnet_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/pcnet_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/pcnet_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/pcnet_cs.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='ctx'> /*======================================================================</div><div class='ctx'> </div><div class='ctx'>     A PCMCIA ethernet driver for NS8390-based cards</div><div class='hunk'>@@ -17,9 +18,7 @@</div><div class='ctx'> </div><div class='ctx'>     Written 1992,1993 by Donald Becker.</div><div class='ctx'>     Copyright 1993 United States Government as represented by the</div><div class='del'>-    Director, National Security Agency.  This software may be used and</div><div class='del'>-    distributed according to the terms of the GNU General Public License,</div><div class='del'>-    incorporated herein by reference.</div><div class='add'>+    Director, National Security Agency.</div><div class='ctx'>     Donald Becker may be reached at becker@scyld.com</div><div class='ctx'> </div><div class='ctx'>     Based also on Keith Moore's changes to Don Becker's code, for IBM</div><div class='hunk'>@@ -223,7 +222,7 @@ static const struct net_device_ops pcnet_netdev_ops = {</div><div class='ctx'> 	.ndo_set_config		= set_config,</div><div class='ctx'> 	.ndo_start_xmit 	= ei_start_xmit,</div><div class='ctx'> 	.ndo_get_stats		= ei_get_stats,</div><div class='del'>-	.ndo_do_ioctl 		= ei_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= ei_ioctl,</div><div class='ctx'> 	.ndo_set_rx_mode	= ei_set_multicast_list,</div><div class='ctx'> 	.ndo_tx_timeout 	= ei_tx_timeout,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='hunk'>@@ -278,6 +277,7 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     u_char __iomem *base, *virt;</div><div class='add'>+    u8 addr[ETH_ALEN];</div><div class='ctx'>     int i, j;</div><div class='ctx'> </div><div class='ctx'>     /* Allocate a small memory window */</div><div class='hunk'>@@ -302,7 +302,8 @@ static struct hw_info *get_hwinfo(struct pcmcia_device *link)</div><div class='ctx'> 	    (readb(base+2) == hw_info[i].a1) &amp;&amp;</div><div class='ctx'> 	    (readb(base+4) == hw_info[i].a2)) {</div><div class='ctx'> 		for (j = 0; j &lt; 6; j++)</div><div class='del'>-		    dev-&gt;dev_addr[j] = readb(base + (j&lt;&lt;1));</div><div class='add'>+			addr[j] = readb(base + (j&lt;&lt;1));</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'>     }</div><div class='hunk'>@@ -324,6 +325,7 @@ static struct hw_info *get_prom(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     unsigned int ioaddr = dev-&gt;base_addr;</div><div class='add'>+    u8 addr[ETH_ALEN];</div><div class='ctx'>     u_char prom[32];</div><div class='ctx'>     int i, j;</div><div class='ctx'> </div><div class='hunk'>@@ -362,7 +364,8 @@ static struct hw_info *get_prom(struct pcmcia_device *link)</div><div class='ctx'>     }</div><div class='ctx'>     if ((i &lt; NR_INFO) || ((prom[28] == 0x57) &amp;&amp; (prom[30] == 0x57))) {</div><div class='ctx'> 	for (j = 0; j &lt; 6; j++)</div><div class='del'>-	    dev-&gt;dev_addr[j] = prom[j&lt;&lt;1];</div><div class='add'>+	    addr[j] = prom[j&lt;&lt;1];</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	return (i &lt; NR_INFO) ? hw_info+i : &amp;default_info;</div><div class='ctx'>     }</div><div class='ctx'>     return NULL;</div><div class='hunk'>@@ -377,6 +380,7 @@ static struct hw_info *get_prom(struct pcmcia_device *link)</div><div class='ctx'> static struct hw_info *get_dl10019(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='add'>+    u8 addr[ETH_ALEN];</div><div class='ctx'>     int i;</div><div class='ctx'>     u_char sum;</div><div class='ctx'> </div><div class='hunk'>@@ -385,7 +389,8 @@ static struct hw_info *get_dl10019(struct pcmcia_device *link)</div><div class='ctx'>     if (sum != 0xff)</div><div class='ctx'> 	return NULL;</div><div class='ctx'>     for (i = 0; i &lt; 6; i++)</div><div class='del'>-	dev-&gt;dev_addr[i] = inb_p(dev-&gt;base_addr + 0x14 + i);</div><div class='add'>+	addr[i] = inb_p(dev-&gt;base_addr + 0x14 + i);</div><div class='add'>+    eth_hw_addr_set(dev, addr);</div><div class='ctx'>     i = inb(dev-&gt;base_addr + 0x1f);</div><div class='ctx'>     return ((i == 0x91)||(i == 0x99)) ? &amp;dl10022_info : &amp;dl10019_info;</div><div class='ctx'> }</div><div class='hunk'>@@ -400,6 +405,7 @@ static struct hw_info *get_ax88190(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='ctx'>     unsigned int ioaddr = dev-&gt;base_addr;</div><div class='add'>+    u8 addr[ETH_ALEN];</div><div class='ctx'>     int i, j;</div><div class='ctx'> </div><div class='ctx'>     /* Not much of a test, but the alternatives are messy */</div><div class='hunk'>@@ -413,9 +419,10 @@ static struct hw_info *get_ax88190(struct pcmcia_device *link)</div><div class='ctx'> </div><div class='ctx'>     for (i = 0; i &lt; 6; i += 2) {</div><div class='ctx'> 	j = inw(ioaddr + PCNET_DATAPORT);</div><div class='del'>-	dev-&gt;dev_addr[i] = j &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[i+1] = j &gt;&gt; 8;</div><div class='add'>+	addr[i] = j &amp; 0xff;</div><div class='add'>+	addr[i+1] = j &gt;&gt; 8;</div><div class='ctx'>     }</div><div class='add'>+    eth_hw_addr_set(dev, addr);</div><div class='ctx'>     return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -430,6 +437,7 @@ static struct hw_info *get_ax88190(struct pcmcia_device *link)</div><div class='ctx'> static struct hw_info *get_hwired(struct pcmcia_device *link)</div><div class='ctx'> {</div><div class='ctx'>     struct net_device *dev = link-&gt;priv;</div><div class='add'>+    u8 addr[ETH_ALEN];</div><div class='ctx'>     int i;</div><div class='ctx'> </div><div class='ctx'>     for (i = 0; i &lt; 6; i++)</div><div class='hunk'>@@ -438,7 +446,8 @@ static struct hw_info *get_hwired(struct pcmcia_device *link)</div><div class='ctx'> 	return NULL;</div><div class='ctx'> </div><div class='ctx'>     for (i = 0; i &lt; 6; i++)</div><div class='del'>-	dev-&gt;dev_addr[i] = hw_addr[i];</div><div class='add'>+	addr[i] = hw_addr[i];</div><div class='add'>+    eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'>     return &amp;default_info;</div><div class='ctx'> } /* get_hwired */</div><div class='hunk'>@@ -938,7 +947,7 @@ static int pcnet_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'>     link-&gt;open--;</div><div class='ctx'>     netif_stop_queue(dev);</div><div class='del'>-    del_timer_sync(&amp;info-&gt;watchdog);</div><div class='add'>+    timer_delete_sync(&amp;info-&gt;watchdog);</div><div class='ctx'> </div><div class='ctx'>     return 0;</div><div class='ctx'> } /* pcnet_close */</div><div class='hunk'>@@ -985,7 +994,7 @@ static int set_config(struct net_device *dev, struct ifmap *map)</div><div class='ctx'> 	    return -EOPNOTSUPP;</div><div class='ctx'> 	else if ((map-&gt;port &lt; 1) || (map-&gt;port &gt; 2))</div><div class='ctx'> 	    return -EINVAL;</div><div class='del'>-	dev-&gt;if_port = map-&gt;port;</div><div class='add'>+	WRITE_ONCE(dev-&gt;if_port, map-&gt;port);</div><div class='ctx'> 	netdev_info(dev, "switched to %s port\n", if_names[dev-&gt;if_port]);</div><div class='ctx'> 	NS8390_init(dev, 1);</div><div class='ctx'>     }</div><div class='hunk'>@@ -1009,7 +1018,7 @@ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static void ei_watchdog(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-    struct pcnet_dev *info = from_timer(info, t, watchdog);</div><div class='add'>+    struct pcnet_dev *info = timer_container_of(info, t, watchdog);</div><div class='ctx'>     struct net_device *dev = info-&gt;p_dev-&gt;priv;</div><div class='ctx'>     unsigned int nic_base = dev-&gt;base_addr;</div><div class='ctx'>     unsigned int mii_addr = nic_base + DLINK_GPIO;</div><div class='hunk'>@@ -1108,7 +1117,7 @@ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'>     switch (cmd) {</div><div class='ctx'>     case SIOCGMIIPHY:</div><div class='ctx'> 	data-&gt;phy_id = info-&gt;phy_id;</div><div class='del'>-	/* fall through */</div><div class='add'>+	fallthrough;</div><div class='ctx'>     case SIOCGMIIREG:		/* Read MII PHY register. */</div><div class='ctx'> 	data-&gt;val_out = mdio_read(mii_addr, data-&gt;phy_id, data-&gt;reg_num &amp; 0x1f);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1178,8 +1187,10 @@ static void dma_block_input(struct net_device *dev, int count,</div><div class='ctx'>     outb_p(E8390_RREAD+E8390_START, nic_base + PCNET_CMD);</div><div class='ctx'> </div><div class='ctx'>     insw(nic_base + PCNET_DATAPORT,buf,count&gt;&gt;1);</div><div class='del'>-    if (count &amp; 0x01)</div><div class='del'>-	buf[count-1] = inb(nic_base + PCNET_DATAPORT), xfer_count++;</div><div class='add'>+    if (count &amp; 0x01) {</div><div class='add'>+	buf[count-1] = inb(nic_base + PCNET_DATAPORT);</div><div class='add'>+	xfer_count++;</div><div class='add'>+    }</div><div class='ctx'> </div><div class='ctx'>     /* This was for the ALPHA version only, but enough people have been</div><div class='ctx'>        encountering problems that it is still here. */</div><div class='hunk'>@@ -1525,7 +1536,7 @@ static const struct pcmcia_device_id pcnet_ids[] = {</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("ACCTON", "EN2216-PCMCIA-ETHERNET", 0xdfc6b5b2, 0x5542bfff),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Allied Telesis, K.K.", "CentreCOM LA100-PCM-T V2 100/10M LAN PC Card", 0xbb7fbdd7, 0xcd91cc68),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Allied Telesis K.K.", "LA100-PCM V2", 0x36634a66, 0xc6d05997),</div><div class='del'>-  	PCMCIA_DEVICE_PROD_ID12("Allied Telesis, K.K.", "CentreCOM LA-PCM_V2", 0xbb7fBdd7, 0x28e299f8),</div><div class='add'>+	PCMCIA_DEVICE_PROD_ID12("Allied Telesis, K.K.", "CentreCOM LA-PCM_V2", 0xbb7fBdd7, 0x28e299f8),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("Allied Telesis K.K.", "LA-PCM V3", 0x36634a66, 0x62241d96),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("AmbiCom", "AMB8010", 0x5070a7f9, 0x82f96e96),</div><div class='ctx'> 	PCMCIA_DEVICE_PROD_ID12("AmbiCom", "AMB8610", 0x5070a7f9, 0x86741224),</div><div class='head'>diff --git a/drivers/net/ethernet/8390/smc-ultra.c b/drivers/net/ethernet/8390/smc-ultra.c<br/>index 3fe3b4dfa7c5..22ca804b2e95 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/smc-ultra.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/smc-ultra.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/smc-ultra.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/smc-ultra.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='ctx'> /* smc-ultra.c: A SMC Ultra ethernet driver for linux. */</div><div class='ctx'> /*</div><div class='ctx'> 	This is a driver for the SMC Ultra and SMC EtherEZ ISA ethercards.</div><div class='hunk'>@@ -7,9 +8,6 @@</div><div class='ctx'> 	Copyright 1993 United States Government as represented by the</div><div class='ctx'> 	Director, National Security Agency.</div><div class='ctx'> </div><div class='del'>-	This software may be used and distributed according to the terms</div><div class='del'>-	of the GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='ctx'> 	The author may be reached as becker@scyld.com, or C/O</div><div class='ctx'> 	Scyld Computing Corporation</div><div class='ctx'> 	410 Severn Ave., Suite 210</div><div class='hunk'>@@ -66,6 +64,7 @@ static const char version[] =</div><div class='ctx'> #include &lt;linux/isapnp.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;net/Space.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -204,6 +203,7 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> {</div><div class='ctx'> 	int i, retval;</div><div class='ctx'> 	int checksum = 0;</div><div class='add'>+	u8 macaddr[ETH_ALEN];</div><div class='ctx'> 	const char *model_name;</div><div class='ctx'> 	unsigned char eeprom_irq = 0;</div><div class='ctx'> 	static unsigned version_printed;</div><div class='hunk'>@@ -239,7 +239,8 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 	model_name = (idreg &amp; 0xF0) == 0x20 ? "SMC Ultra" : "SMC EtherEZ";</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = inb(ioaddr + 8 + i);</div><div class='add'>+		macaddr[i] = inb(ioaddr + 8 + i);</div><div class='add'>+	eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(dev, "%s at %#3x, %pM", model_name,</div><div class='ctx'> 		    ioaddr, dev-&gt;dev_addr);</div><div class='hunk'>@@ -347,11 +348,11 @@ static int __init ultra_probe_isapnp(struct net_device *dev)</div><div class='ctx'>                                             idev))) {</div><div class='ctx'>                         /* Avoid already found cards from previous calls */</div><div class='ctx'>                         if (pnp_device_attach(idev) &lt; 0)</div><div class='del'>-                        	continue;</div><div class='add'>+				continue;</div><div class='ctx'>                         if (pnp_activate_dev(idev) &lt; 0) {</div><div class='ctx'>                               __again:</div><div class='del'>-                        	pnp_device_detach(idev);</div><div class='del'>-                        	continue;</div><div class='add'>+				pnp_device_detach(idev);</div><div class='add'>+				continue;</div><div class='ctx'>                         }</div><div class='ctx'> 			/* if no io and irq, search for next */</div><div class='ctx'> 			if (!pnp_port_valid(idev, 0) || !pnp_irq_valid(idev, 0))</div><div class='hunk'>@@ -522,7 +523,6 @@ static void ultra_pio_input(struct net_device *dev, int count,</div><div class='ctx'> 	/* We know skbuffs are padded to at least word alignment. */</div><div class='ctx'> 	insw(ioaddr + IOPD, buf, (count+1)&gt;&gt;1);</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> static void ultra_pio_output(struct net_device *dev, int count,</div><div class='ctx'> 							const unsigned char *buf, const int start_page)</div><div class='ctx'> {</div><div class='hunk'>@@ -572,8 +572,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* This is set up so that only a single autoprobe takes place per call.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended. */</div><div class='del'>-int __init</div><div class='del'>-init_module(void)</div><div class='add'>+static int __init ultra_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='hunk'>@@ -600,6 +599,7 @@ init_module(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='add'>+module_init(ultra_init_module);</div><div class='ctx'> </div><div class='ctx'> static void cleanup_card(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -613,8 +613,7 @@ static void cleanup_card(struct net_device *dev)</div><div class='ctx'> 	iounmap(ei_status.mem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit</div><div class='del'>-cleanup_module(void)</div><div class='add'>+static void __exit ultra_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -627,4 +626,5 @@ cleanup_module(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+module_exit(ultra_cleanup_module);</div><div class='ctx'> #endif /* MODULE */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/stnic.c b/drivers/net/ethernet/8390/stnic.c<br/>index 1f0670cd3ea3..6cc0e190aa79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/stnic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/stnic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/stnic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/stnic.c</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /* stnic.c : A SH7750 specific part of driver for NS DP83902A ST-NIC.</div><div class='ctx'>  *</div><div class='del'>- * This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- * License.  See the file "COPYING" in the main directory of this archive</div><div class='del'>- * for more details.</div><div class='del'>- *</div><div class='ctx'>  * Copyright (C) 1999 kaz Kojima</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -104,8 +101,8 @@ STNIC_WRITE (int reg, byte val)</div><div class='ctx'> static int __init stnic_probe(void)</div><div class='ctx'> {</div><div class='ctx'>   struct net_device *dev;</div><div class='del'>-  int i, err;</div><div class='ctx'>   struct ei_device *ei_local;</div><div class='add'>+  int err;</div><div class='ctx'> </div><div class='ctx'>   /* If we are not running on a SolutionEngine, give up now */</div><div class='ctx'>   if (! MACH_SE)</div><div class='hunk'>@@ -114,13 +111,12 @@ static int __init stnic_probe(void)</div><div class='ctx'>   /* New style probing API */</div><div class='ctx'>   dev = alloc_ei_netdev();</div><div class='ctx'>   if (!dev)</div><div class='del'>-  	return -ENOMEM;</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SH_STANDARD_BIOS</div><div class='ctx'>   sh_bios_get_node_addr (stnic_eadr);</div><div class='ctx'> #endif</div><div class='del'>-  for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-    dev-&gt;dev_addr[i] = stnic_eadr[i];</div><div class='add'>+  eth_hw_addr_set(dev, stnic_eadr);</div><div class='ctx'> </div><div class='ctx'>   /* Set the base address to point to the NIC, not the "real" base! */</div><div class='ctx'>   dev-&gt;base_addr = 0x1000;</div><div class='hunk'>@@ -300,4 +296,5 @@ static void __exit stnic_cleanup(void)</div><div class='ctx'> </div><div class='ctx'> module_init(stnic_probe);</div><div class='ctx'> module_exit(stnic_cleanup);</div><div class='add'>+MODULE_DESCRIPTION("National Semiconductor DP83902AV ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/8390/wd.c b/drivers/net/ethernet/8390/wd.c<br/>index c834123560f1..ffd639477dfc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/wd.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/wd.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/wd.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/wd.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-1.0+</div><div class='ctx'> /* wd.c: A WD80x3 ethernet driver for linux. */</div><div class='ctx'> /*</div><div class='ctx'> 	Written 1993-94 by Donald Becker.</div><div class='hunk'>@@ -5,9 +6,6 @@</div><div class='ctx'> 	Copyright 1993 United States Government as represented by the</div><div class='ctx'> 	Director, National Security Agency.</div><div class='ctx'> </div><div class='del'>-	This software may be used and distributed according to the terms</div><div class='del'>-	of the GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='ctx'> 	The author may be reached as becker@scyld.com, or C/O</div><div class='ctx'> 	Scyld Computing Corporation</div><div class='ctx'> 	410 Severn Ave., Suite 210</div><div class='hunk'>@@ -37,6 +35,7 @@ static const char version[] =</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;net/Space.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -168,6 +167,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 	int checksum = 0;</div><div class='ctx'> 	int ancient = 0;			/* An old card without config registers. */</div><div class='ctx'> 	int word16 = 0;				/* 0 = 8 bit, 1 = 16 bit */</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	const char *model_name;</div><div class='ctx'> 	static unsigned version_printed;</div><div class='ctx'> 	struct ei_device *ei_local = netdev_priv(dev);</div><div class='hunk'>@@ -191,7 +191,8 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)</div><div class='ctx'> 		netdev_info(dev, version);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = inb(ioaddr + 8 + i);</div><div class='add'>+		addr[i] = inb(ioaddr + 8 + i);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(dev, "WD80x3 at %#3x, %pM", ioaddr, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -519,7 +520,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> /* This is set up so that only a single autoprobe takes place per call.</div><div class='ctx'> ISA device autoprobes on a running machine are not recommended. */</div><div class='ctx'> </div><div class='del'>-int __init init_module(void)</div><div class='add'>+static int __init wd_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='hunk'>@@ -548,6 +549,7 @@ int __init init_module(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='add'>+module_init(wd_init_module);</div><div class='ctx'> </div><div class='ctx'> static void cleanup_card(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -556,8 +558,7 @@ static void cleanup_card(struct net_device *dev)</div><div class='ctx'> 	iounmap(ei_status.mem);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit</div><div class='del'>-cleanup_module(void)</div><div class='add'>+static void __exit wd_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -570,4 +571,5 @@ cleanup_module(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+module_exit(wd_cleanup_module);</div><div class='ctx'> #endif /* MODULE */</div><div class='head'>diff --git a/drivers/net/ethernet/8390/xsurf100.c b/drivers/net/ethernet/8390/xsurf100.c<br/>index e2c963821ffe..fe7a74707aa4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/xsurf100.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/xsurf100.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/xsurf100.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/xsurf100.c</a></div><div class='hunk'>@@ -22,8 +22,6 @@</div><div class='ctx'> #define XS100_8390_DATA_WRITE32_BASE 0x0C80</div><div class='ctx'> #define XS100_8390_DATA_AREA_SIZE 0x80</div><div class='ctx'> </div><div class='del'>-#define __NS8390_init ax_NS8390_init</div><div class='del'>-</div><div class='ctx'> /* force unsigned long back to 'void __iomem *' */</div><div class='ctx'> #define ax_convert_addr(_a) ((void __force __iomem *)(_a))</div><div class='ctx'> </div><div class='hunk'>@@ -42,10 +40,7 @@</div><div class='ctx'> /* Ensure we have our RCR base value */</div><div class='ctx'> #define AX88796_PLATFORM</div><div class='ctx'> </div><div class='del'>-static unsigned char version[] =</div><div class='del'>-		"ax88796.c: Copyright 2005,2007 Simtec Electronics\n";</div><div class='del'>-</div><div class='del'>-#include "lib8390.c"</div><div class='add'>+#include "8390.h"</div><div class='ctx'> </div><div class='ctx'> /* from ne.c */</div><div class='ctx'> #define NE_CMD		EI_SHIFT(0x00)</div><div class='hunk'>@@ -232,7 +227,7 @@ static void xs100_block_output(struct net_device *dev, int count,</div><div class='ctx'> 		if (jiffies - dma_start &gt; 2 * HZ / 100) {	/* 20ms */</div><div class='ctx'> 			netdev_warn(dev, "timeout waiting for Tx RDC.\n");</div><div class='ctx'> 			ei_local-&gt;reset_8390(dev);</div><div class='del'>-			ax_NS8390_init(dev, 1);</div><div class='add'>+			ax_NS8390_reinit(dev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c<br/>index 35a500a21521..c24dd4fe7a10 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/zorro8390.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/8390/zorro8390.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/8390/zorro8390.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/8390/zorro8390.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *  Amiga Linux/m68k and Linux/PPC Zorro NS8390 Ethernet Driver</div><div class='ctx'>  *</div><div class='hunk'>@@ -9,12 +10,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  *  ---------------------------------------------------------------------------</div><div class='ctx'>  *</div><div class='del'>- *  This file is subject to the terms and conditions of the GNU General Public</div><div class='del'>- *  License.  See the file COPYING in the main directory of the Linux</div><div class='del'>- *  distribution for more details.</div><div class='del'>- *</div><div class='del'>- *  ---------------------------------------------------------------------------</div><div class='del'>- *</div><div class='ctx'>  *  The Ariadne II and X-Surf are Zorro-II boards containing Realtek RTL8019AS</div><div class='ctx'>  *  Ethernet Controllers.</div><div class='ctx'>  */</div><div class='hunk'>@@ -364,8 +359,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,</div><div class='ctx'> 	if (i)</div><div class='ctx'> 		return i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = SA_prom[i];</div><div class='add'>+	eth_hw_addr_set(dev, SA_prom);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("Found ethernet address: %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -449,4 +443,5 @@ static void __exit zorro8390_cleanup_module(void)</div><div class='ctx'> module_init(zorro8390_init_module);</div><div class='ctx'> module_exit(zorro8390_cleanup_module);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Zorro NS8390-based ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig<br/>index fe115b7caba0..4a1b368ca7e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ menuconfig ETHERNET</div><div class='ctx'> 	bool "Ethernet driver support"</div><div class='ctx'> 	depends on NET</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This section contains all the Ethernet device drivers.</div><div class='ctx'> </div><div class='ctx'> if ETHERNET</div><div class='hunk'>@@ -15,13 +15,12 @@ if ETHERNET</div><div class='ctx'> config MDIO</div><div class='ctx'> 	tristate</div><div class='ctx'> </div><div class='del'>-config SUNGEM_PHY</div><div class='del'>-	tristate</div><div class='del'>-</div><div class='ctx'> source "drivers/net/ethernet/3com/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/actions/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/adaptec/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/aeroflex/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/agere/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/airoha/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/alacritech/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/allwinner/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/alteon/Kconfig"</div><div class='hunk'>@@ -32,23 +31,14 @@ source "drivers/net/ethernet/apm/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/apple/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/aquantia/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/arc/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/asix/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/atheros/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/aurora/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/broadcom/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/brocade/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/cadence/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/calxeda/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/cavium/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/chelsio/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/cirrus/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/cisco/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/cortina/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config CX_ECAT</div><div class='ctx'> 	tristate "Beckhoff CX5020 EtherCAT master support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	depends on X86 || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Driver for EtherCAT master module located on CCAT FPGA</div><div class='ctx'> 	  that can be found on Beckhoff CX5020, and possibly other of CX</div><div class='ctx'> 	  Beckhoff CX series industrial PCs.</div><div class='hunk'>@@ -56,13 +46,21 @@ config CX_ECAT</div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called ec_bhf.</div><div class='ctx'> </div><div class='add'>+source "drivers/net/ethernet/broadcom/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/cadence/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/calxeda/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/cavium/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/chelsio/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/cirrus/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/cisco/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/cortina/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/davicom/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config DNET</div><div class='ctx'> 	tristate "Dave ethernet support (DNET)"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.</div><div class='ctx'> 	  Say Y to include support for the DNET chip.</div><div class='ctx'> </div><div class='hunk'>@@ -72,12 +70,14 @@ config DNET</div><div class='ctx'> source "drivers/net/ethernet/dec/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/dlink/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/emulex/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/engleder/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/ezchip/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/faraday/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/freescale/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/fujitsu/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/fungible/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/google/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/hisilicon/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/hp/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/huawei/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/i825xx/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/ibm/Kconfig"</div><div class='hunk'>@@ -89,7 +89,7 @@ config JME</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the PCI-Express gigabit ethernet adapters</div><div class='ctx'> 	  based on JMicron JMC250 chipset.</div><div class='ctx'> </div><div class='hunk'>@@ -98,31 +98,38 @@ config JME</div><div class='ctx'> </div><div class='ctx'> config KORINA</div><div class='ctx'> 	tristate "Korina (IDT RC32434) Ethernet support"</div><div class='del'>-	depends on MIKROTIK_RB532</div><div class='del'>-	---help---</div><div class='add'>+	depends on MIKROTIK_RB532 || COMPILE_TEST</div><div class='add'>+	select CRC32</div><div class='add'>+	select MII</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a Mikrotik RouterBoard 500 or IDT RC32434</div><div class='ctx'> 	  based system say Y. Otherwise say N.</div><div class='ctx'> </div><div class='ctx'> config LANTIQ_ETOP</div><div class='ctx'> 	tristate "Lantiq SoC ETOP driver"</div><div class='ctx'> 	depends on SOC_TYPE_XWAY</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the MII0 inside the Lantiq SoC</div><div class='ctx'> </div><div class='ctx'> config LANTIQ_XRX200</div><div class='ctx'> 	tristate "Lantiq / Intel xRX200 PMAC network driver"</div><div class='ctx'> 	depends on SOC_TYPE_XWAY</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the PMAC of the Gigabit switch (GSWIP) inside the</div><div class='ctx'> 	  Lantiq / Intel VRX200 VDSL SoC</div><div class='ctx'> </div><div class='add'>+source "drivers/net/ethernet/adi/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/litex/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/marvell/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/mediatek/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/mellanox/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/meta/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/micrel/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/microchip/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/moxa/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/mscc/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/microsoft/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/moxa/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/mucse/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/myricom/Kconfig"</div><div class='ctx'> </div><div class='ctx'> config FEALNX</div><div class='hunk'>@@ -130,27 +137,15 @@ config FEALNX</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet</div><div class='ctx'> 	  cards. &lt;http://www.myson.com.tw/&gt;</div><div class='ctx'> </div><div class='add'>+source "drivers/net/ethernet/ni/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/natsemi/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/neterion/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/netronome/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/ni/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/8390/Kconfig"</div><div class='del'>-</div><div class='del'>-config NET_NETX</div><div class='del'>-	tristate "NetX Ethernet support"</div><div class='del'>-	select MII</div><div class='del'>-	depends on ARCH_NETX</div><div class='del'>-	---help---</div><div class='del'>-	  This is support for the Hilscher netX builtin Ethernet ports</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here. The module</div><div class='del'>-	  will be called netx-eth.</div><div class='del'>-</div><div class='del'>-source "drivers/net/ethernet/nuvoton/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/nvidia/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/nxp/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/oki-semi/Kconfig"</div><div class='hunk'>@@ -162,12 +157,25 @@ config ETHOC</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select BITREVERSE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.</div><div class='ctx'> </div><div class='add'>+config OA_TC6</div><div class='add'>+	tristate "OPEN Alliance TC6 10BASE-T1x MAC-PHY support" if COMPILE_TEST</div><div class='add'>+	depends on SPI</div><div class='add'>+	select PHYLIB</div><div class='add'>+	help</div><div class='add'>+	  This library implements OPEN Alliance TC6 10BASE-T1x MAC-PHY</div><div class='add'>+	  Serial Interface protocol for supporting 10BASE-T1x MAC-PHYs.</div><div class='add'>+</div><div class='add'>+	  To know the implementation details, refer documentation in</div><div class='add'>+	  &lt;file:Documentation/networking/oa-tc6-framework.rst&gt;.</div><div class='add'>+</div><div class='ctx'> source "drivers/net/ethernet/packetengines/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/pasemi/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/pensando/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/qlogic/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/brocade/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/qualcomm/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/rdc/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/realtek/Kconfig"</div><div class='hunk'>@@ -175,20 +183,24 @@ source "drivers/net/ethernet/renesas/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/rocker/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/samsung/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/seeq/Kconfig"</div><div class='del'>-source "drivers/net/ethernet/sfc/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/sgi/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/silan/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/sis/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/sfc/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/smsc/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/socionext/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/spacemit/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/stmicro/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/sun/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/sunplus/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/synopsys/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/tehuti/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/ti/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/toshiba/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/tundra/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/vertexcom/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/via/Kconfig"</div><div class='add'>+source "drivers/net/ethernet/wangxun/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/wiznet/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/xilinx/Kconfig"</div><div class='ctx'> source "drivers/net/ethernet/xircom/Kconfig"</div><div class='head'>diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile<br/>index 7b5bf9682066..2e18df8ca8ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/Makefile</a></div><div class='hunk'>@@ -5,9 +5,12 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_3COM) += 3com/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_8390) += 8390/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_ACTIONS) += actions/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/</div><div class='ctx'> obj-$(CONFIG_GRETH) += aeroflex/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_ADI) += adi/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_AGERE) += agere/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_AIROHA) += airoha/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ALACRITECH) += alacritech/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/</div><div class='hunk'>@@ -18,8 +21,8 @@ obj-$(CONFIG_NET_XGENE) += apm/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_APPLE) += apple/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ARC) += arc/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_ASIX) += asix/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/</div><div class='del'>-obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_CADENCE) += cadence/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/</div><div class='hunk'>@@ -35,36 +38,40 @@ obj-$(CONFIG_DNET) += dnet.o</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_DEC) += dec/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_ENGLEDER) += engleder/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_EZCHIP) += ezchip/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_FUNGIBLE) += fungible/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_GOOGLE) += google/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_HISILICON) += hisilicon/</div><div class='del'>-obj-$(CONFIG_NET_VENDOR_HP) += hp/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_HUAWEI) += huawei/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_IBM) += ibm/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_INTEL) += intel/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_MICROSOFT) += microsoft/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/</div><div class='ctx'> obj-$(CONFIG_JME) += jme.o</div><div class='ctx'> obj-$(CONFIG_KORINA) += korina.o</div><div class='ctx'> obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o</div><div class='ctx'> obj-$(CONFIG_LANTIQ_XRX200) += lantiq_xrx200.o</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_LITEX) += litex/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MEDIATEK) += mediatek/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_META) += meta/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MICROSEMI) += mscc/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_MUCSE) += mucse/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/</div><div class='ctx'> obj-$(CONFIG_FEALNX) += fealnx.o</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_NETERION) += neterion/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_NETRONOME) += netronome/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_NI) += ni/</div><div class='del'>-obj-$(CONFIG_NET_NETX) += netx-eth.o</div><div class='del'>-obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/</div><div class='ctx'> obj-$(CONFIG_LPC_ENET) += nxp/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/</div><div class='hunk'>@@ -85,14 +92,20 @@ obj-$(CONFIG_NET_VENDOR_SOLARFLARE) += sfc/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_SGI) += sgi/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_SOCIONEXT) += socionext/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_SPACEMIT) += spacemit/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_SUN) += sun/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_SUNPLUS) += sunplus/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_TI) += ti/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_TOSHIBA) += toshiba/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_VERTEXCOM) += vertexcom/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_VIA) += via/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_WANGXUN) += wangxun/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_WIZNET) += wiznet/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/</div><div class='ctx'> obj-$(CONFIG_NET_VENDOR_SYNOPSYS) += synopsys/</div><div class='add'>+obj-$(CONFIG_NET_VENDOR_PENSANDO) += pensando/</div><div class='add'>+obj-$(CONFIG_OA_TC6) += oa_tc6.o</div><div class='head'>diff --git a/drivers/net/ethernet/actions/Kconfig b/drivers/net/ethernet/actions/Kconfig<br/>new file mode 100644<br/>index 000000000000..f630cac2ab6c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/actions/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/actions/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+config NET_VENDOR_ACTIONS</div><div class='add'>+	bool "Actions Semi devices"</div><div class='add'>+	depends on ARCH_ACTIONS || COMPILE_TEST</div><div class='add'>+	default ARCH_ACTIONS</div><div class='add'>+	help</div><div class='add'>+	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='add'>+</div><div class='add'>+	  Note that the answer to this question doesn't directly affect the</div><div class='add'>+	  kernel: saying N will just cause the configurator to skip all the</div><div class='add'>+	  questions about Actions Semi devices.  If you say Y, you will be</div><div class='add'>+	  asked for your specific card in the following questions.</div><div class='add'>+</div><div class='add'>+if NET_VENDOR_ACTIONS</div><div class='add'>+</div><div class='add'>+config OWL_EMAC</div><div class='add'>+	tristate "Actions Semi Owl Ethernet MAC support"</div><div class='add'>+	select PHYLIB</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the Actions Semi Ethernet Media Access</div><div class='add'>+	  Controller (EMAC) found on the S500 and S900 SoCs.  The controller</div><div class='add'>+	  is compliant with the IEEE 802.3 CSMA/CD standard and supports</div><div class='add'>+	  both half-duplex and full-duplex operation modes at 10/100 Mb/s.</div><div class='add'>+</div><div class='add'>+endif # NET_VENDOR_ACTIONS</div><div class='head'>diff --git a/drivers/net/ethernet/actions/Makefile b/drivers/net/ethernet/actions/Makefile<br/>new file mode 100644<br/>index 000000000000..fde8001d538a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/actions/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/actions/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# Makefile for the Actions Semi Owl SoCs built-in ethernet macs</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_OWL_EMAC) += owl-emac.o</div><div class='head'>diff --git a/drivers/net/ethernet/actions/owl-emac.c b/drivers/net/ethernet/actions/owl-emac.c<br/>new file mode 100644<br/>index 000000000000..0a08da799255<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/actions/owl-emac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/actions/owl-emac.c</a></div><div class='hunk'>@@ -0,0 +1,1612 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Actions Semi Owl SoCs Ethernet MAC driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Actions Semi Inc.</div><div class='add'>+ * Copyright (c) 2021 Cristian Ciocaltea &lt;cristian.ciocaltea@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/circ_buf.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/pm.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+</div><div class='add'>+#include "owl-emac.h"</div><div class='add'>+</div><div class='add'>+#define OWL_EMAC_DEFAULT_MSG_ENABLE	(NETIF_MSG_DRV | \</div><div class='add'>+					 NETIF_MSG_PROBE | \</div><div class='add'>+					 NETIF_MSG_LINK)</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_reg_read(struct owl_emac_priv *priv, u32 reg)</div><div class='add'>+{</div><div class='add'>+	return readl(priv-&gt;base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_reg_write(struct owl_emac_priv *priv, u32 reg, u32 data)</div><div class='add'>+{</div><div class='add'>+	writel(data, priv-&gt;base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_reg_update(struct owl_emac_priv *priv,</div><div class='add'>+			       u32 reg, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 data, old_val;</div><div class='add'>+</div><div class='add'>+	data = owl_emac_reg_read(priv, reg);</div><div class='add'>+	old_val = data &amp; mask;</div><div class='add'>+</div><div class='add'>+	data &amp;= ~mask;</div><div class='add'>+	data |= val &amp; mask;</div><div class='add'>+</div><div class='add'>+	owl_emac_reg_write(priv, reg, data);</div><div class='add'>+</div><div class='add'>+	return old_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_reg_set(struct owl_emac_priv *priv, u32 reg, u32 bits)</div><div class='add'>+{</div><div class='add'>+	owl_emac_reg_update(priv, reg, bits, bits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_reg_clear(struct owl_emac_priv *priv, u32 reg, u32 bits)</div><div class='add'>+{</div><div class='add'>+	owl_emac_reg_update(priv, reg, bits, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct device *owl_emac_get_dev(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return priv-&gt;netdev-&gt;dev.parent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_irq_enable(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Enable all interrupts except TU.</div><div class='add'>+	 *</div><div class='add'>+	 * Note the NIE and AIE bits shall also be set in order to actually</div><div class='add'>+	 * enable the selected interrupts.</div><div class='add'>+	 */</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR7,</div><div class='add'>+			   OWL_EMAC_BIT_MAC_CSR7_NIE |</div><div class='add'>+			   OWL_EMAC_BIT_MAC_CSR7_AIE |</div><div class='add'>+			   OWL_EMAC_BIT_MAC_CSR7_ALL_NOT_TUE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_irq_disable(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Disable all interrupts.</div><div class='add'>+	 *</div><div class='add'>+	 * WARNING: Unset only the NIE and AIE bits in CSR7 to workaround an</div><div class='add'>+	 * unexpected side effect (MAC hardware bug?!) where some bits in the</div><div class='add'>+	 * status register (CSR5) are cleared automatically before being able</div><div class='add'>+	 * to read them via owl_emac_irq_clear().</div><div class='add'>+	 */</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR7,</div><div class='add'>+			   OWL_EMAC_BIT_MAC_CSR7_ALL_NOT_TUE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_irq_status(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_reg_read(priv, OWL_EMAC_REG_MAC_CSR5);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_irq_clear(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val = owl_emac_irq_status(priv);</div><div class='add'>+</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR5, val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_addr_t owl_emac_dma_map_rx(struct owl_emac_priv *priv,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+</div><div class='add'>+	/* Buffer pointer for the RX DMA descriptor must be word aligned. */</div><div class='add'>+	return dma_map_single(dev, skb_tail_pointer(skb),</div><div class='add'>+			      skb_tailroom(skb), DMA_FROM_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_dma_unmap_rx(struct owl_emac_priv *priv,</div><div class='add'>+				  struct sk_buff *skb, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(dev, dma_addr, skb_tailroom(skb), DMA_FROM_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static dma_addr_t owl_emac_dma_map_tx(struct owl_emac_priv *priv,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+</div><div class='add'>+	return dma_map_single(dev, skb-&gt;data, skb_headlen(skb), DMA_TO_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_dma_unmap_tx(struct owl_emac_priv *priv,</div><div class='add'>+				  struct sk_buff *skb, dma_addr_t dma_addr)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(dev, dma_addr, skb_headlen(skb), DMA_TO_DEVICE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int owl_emac_ring_num_unused(struct owl_emac_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return CIRC_SPACE(ring-&gt;head, ring-&gt;tail, ring-&gt;size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int owl_emac_ring_get_next(struct owl_emac_ring *ring,</div><div class='add'>+					   unsigned int cur)</div><div class='add'>+{</div><div class='add'>+	return (cur + 1) &amp; (ring-&gt;size - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ring_push_head(struct owl_emac_ring *ring)</div><div class='add'>+{</div><div class='add'>+	ring-&gt;head = owl_emac_ring_get_next(ring, ring-&gt;head);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ring_pop_tail(struct owl_emac_ring *ring)</div><div class='add'>+{</div><div class='add'>+	ring-&gt;tail = owl_emac_ring_get_next(ring, ring-&gt;tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *owl_emac_alloc_skb(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int offset;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(netdev, OWL_EMAC_RX_FRAME_MAX_LEN +</div><div class='add'>+			       OWL_EMAC_SKB_RESERVE);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* Ensure 4 bytes DMA alignment. */</div><div class='add'>+	offset = ((uintptr_t)skb-&gt;data) &amp; (OWL_EMAC_SKB_ALIGN - 1);</div><div class='add'>+	if (unlikely(offset))</div><div class='add'>+		skb_reserve(skb, OWL_EMAC_SKB_ALIGN - offset);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_ring_prepare_rx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;rx_ring;</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct owl_emac_ring_desc *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring-&gt;size; i++) {</div><div class='add'>+		skb = owl_emac_alloc_skb(netdev);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		dma_addr = owl_emac_dma_map_rx(priv, skb);</div><div class='add'>+		if (dma_mapping_error(dev, dma_addr)) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = &amp;ring-&gt;descs[i];</div><div class='add'>+		desc-&gt;status = OWL_EMAC_BIT_RDES0_OWN;</div><div class='add'>+		desc-&gt;control = skb_tailroom(skb) &amp; OWL_EMAC_MSK_RDES1_RBS1;</div><div class='add'>+		desc-&gt;buf_addr = dma_addr;</div><div class='add'>+		desc-&gt;reserved = 0;</div><div class='add'>+</div><div class='add'>+		ring-&gt;skbs[i] = skb;</div><div class='add'>+		ring-&gt;skbs_dma[i] = dma_addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;control |= OWL_EMAC_BIT_RDES1_RER;</div><div class='add'>+</div><div class='add'>+	ring-&gt;head = 0;</div><div class='add'>+	ring-&gt;tail = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ring_prepare_tx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;tx_ring;</div><div class='add'>+	struct owl_emac_ring_desc *desc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring-&gt;size; i++) {</div><div class='add'>+		desc = &amp;ring-&gt;descs[i];</div><div class='add'>+</div><div class='add'>+		desc-&gt;status = 0;</div><div class='add'>+		desc-&gt;control = OWL_EMAC_BIT_TDES1_IC;</div><div class='add'>+		desc-&gt;buf_addr = 0;</div><div class='add'>+		desc-&gt;reserved = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;control |= OWL_EMAC_BIT_TDES1_TER;</div><div class='add'>+</div><div class='add'>+	memset(ring-&gt;skbs_dma, 0, sizeof(dma_addr_t) * ring-&gt;size);</div><div class='add'>+</div><div class='add'>+	ring-&gt;head = 0;</div><div class='add'>+	ring-&gt;tail = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ring_unprepare_rx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;rx_ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring-&gt;size; i++) {</div><div class='add'>+		ring-&gt;descs[i].status = 0;</div><div class='add'>+</div><div class='add'>+		if (!ring-&gt;skbs_dma[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		owl_emac_dma_unmap_rx(priv, ring-&gt;skbs[i], ring-&gt;skbs_dma[i]);</div><div class='add'>+		ring-&gt;skbs_dma[i] = 0;</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb(ring-&gt;skbs[i]);</div><div class='add'>+		ring-&gt;skbs[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ring_unprepare_tx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;tx_ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring-&gt;size; i++) {</div><div class='add'>+		ring-&gt;descs[i].status = 0;</div><div class='add'>+</div><div class='add'>+		if (!ring-&gt;skbs_dma[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		owl_emac_dma_unmap_tx(priv, ring-&gt;skbs[i], ring-&gt;skbs_dma[i]);</div><div class='add'>+		ring-&gt;skbs_dma[i] = 0;</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb(ring-&gt;skbs[i]);</div><div class='add'>+		ring-&gt;skbs[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_ring_alloc(struct device *dev, struct owl_emac_ring *ring,</div><div class='add'>+			       unsigned int size)</div><div class='add'>+{</div><div class='add'>+	ring-&gt;descs = dmam_alloc_coherent(dev,</div><div class='add'>+					  sizeof(struct owl_emac_ring_desc) * size,</div><div class='add'>+					  &amp;ring-&gt;descs_dma, GFP_KERNEL);</div><div class='add'>+	if (!ring-&gt;descs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ring-&gt;skbs = devm_kcalloc(dev, size, sizeof(struct sk_buff *),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!ring-&gt;skbs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ring-&gt;skbs_dma = devm_kcalloc(dev, size, sizeof(dma_addr_t),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!ring-&gt;skbs_dma)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ring-&gt;size = size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_dma_cmd_resume_rx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR2,</div><div class='add'>+			   OWL_EMAC_VAL_MAC_CSR2_RPD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_dma_cmd_resume_tx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR1,</div><div class='add'>+			   OWL_EMAC_VAL_MAC_CSR1_TPD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_dma_cmd_set_tx(struct owl_emac_priv *priv, u32 status)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_reg_update(priv, OWL_EMAC_REG_MAC_CSR6,</div><div class='add'>+				   OWL_EMAC_BIT_MAC_CSR6_ST, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_dma_cmd_start_tx(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_dma_cmd_set_tx(priv, ~0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_dma_cmd_set(struct owl_emac_priv *priv, u32 status)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_reg_update(priv, OWL_EMAC_REG_MAC_CSR6,</div><div class='add'>+				   OWL_EMAC_MSK_MAC_CSR6_STSR, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_dma_cmd_start(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_dma_cmd_set(priv, ~0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_dma_cmd_stop(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_dma_cmd_set(priv, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_set_hw_mac_addr(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	const u8 *mac_addr = netdev-&gt;dev_addr;</div><div class='add'>+	u32 addr_high, addr_low;</div><div class='add'>+</div><div class='add'>+	addr_high = mac_addr[0] &lt;&lt; 8 | mac_addr[1];</div><div class='add'>+	addr_low = mac_addr[2] &lt;&lt; 24 | mac_addr[3] &lt;&lt; 16 |</div><div class='add'>+		   mac_addr[4] &lt;&lt; 8 | mac_addr[5];</div><div class='add'>+</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR17, addr_high);</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR16, addr_low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_update_link_state(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val, status;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;pause) {</div><div class='add'>+		val = OWL_EMAC_BIT_MAC_CSR20_FCE | OWL_EMAC_BIT_MAC_CSR20_TUE;</div><div class='add'>+		val |= OWL_EMAC_BIT_MAC_CSR20_TPE | OWL_EMAC_BIT_MAC_CSR20_RPE;</div><div class='add'>+		val |= OWL_EMAC_BIT_MAC_CSR20_BPE;</div><div class='add'>+	} else {</div><div class='add'>+		val = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update flow control. */</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR20, val);</div><div class='add'>+</div><div class='add'>+	val = (priv-&gt;speed == SPEED_100) ? OWL_EMAC_VAL_MAC_CSR6_SPEED_100M :</div><div class='add'>+					   OWL_EMAC_VAL_MAC_CSR6_SPEED_10M;</div><div class='add'>+	val &lt;&lt;= OWL_EMAC_OFF_MAC_CSR6_SPEED;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;duplex == DUPLEX_FULL)</div><div class='add'>+		val |= OWL_EMAC_BIT_MAC_CSR6_FD;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Temporarily stop DMA TX &amp; RX. */</div><div class='add'>+	status = owl_emac_dma_cmd_stop(priv);</div><div class='add'>+</div><div class='add'>+	/* Update operation modes. */</div><div class='add'>+	owl_emac_reg_update(priv, OWL_EMAC_REG_MAC_CSR6,</div><div class='add'>+			    OWL_EMAC_MSK_MAC_CSR6_SPEED |</div><div class='add'>+			    OWL_EMAC_BIT_MAC_CSR6_FD, val);</div><div class='add'>+</div><div class='add'>+	/* Restore DMA TX &amp; RX status. */</div><div class='add'>+	owl_emac_dma_cmd_set(priv, status);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_adjust_link(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='add'>+	bool state_changed = false;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link) {</div><div class='add'>+		if (!priv-&gt;link) {</div><div class='add'>+			priv-&gt;link = phydev-&gt;link;</div><div class='add'>+			state_changed = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;speed != phydev-&gt;speed) {</div><div class='add'>+			priv-&gt;speed = phydev-&gt;speed;</div><div class='add'>+			state_changed = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;duplex != phydev-&gt;duplex) {</div><div class='add'>+			priv-&gt;duplex = phydev-&gt;duplex;</div><div class='add'>+			state_changed = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;pause != phydev-&gt;pause) {</div><div class='add'>+			priv-&gt;pause = phydev-&gt;pause;</div><div class='add'>+			state_changed = true;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		if (priv-&gt;link) {</div><div class='add'>+			priv-&gt;link = phydev-&gt;link;</div><div class='add'>+			state_changed = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (state_changed) {</div><div class='add'>+		if (phydev-&gt;link)</div><div class='add'>+			owl_emac_update_link_state(priv);</div><div class='add'>+</div><div class='add'>+		if (netif_msg_link(priv))</div><div class='add'>+			phy_print_status(phydev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t owl_emac_handle_irq(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = data;</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		owl_emac_irq_disable(priv);</div><div class='add'>+		napi_schedule(&amp;priv-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ether_addr_push(u8 **dst, const u8 *src)</div><div class='add'>+{</div><div class='add'>+	u32 *a = (u32 *)(*dst);</div><div class='add'>+	const u16 *b = (const u16 *)src;</div><div class='add'>+</div><div class='add'>+	a[0] = b[0];</div><div class='add'>+	a[1] = b[1];</div><div class='add'>+	a[2] = b[2];</div><div class='add'>+</div><div class='add'>+	*dst += 12;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+owl_emac_setup_frame_prepare(struct owl_emac_priv *priv, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const u8 bcast_addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };</div><div class='add'>+	const u8 *mac_addr = priv-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	u8 *frame;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	skb_put(skb, OWL_EMAC_SETUP_FRAME_LEN);</div><div class='add'>+</div><div class='add'>+	frame = skb-&gt;data;</div><div class='add'>+	memset(frame, 0, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	owl_emac_ether_addr_push(&amp;frame, mac_addr);</div><div class='add'>+	owl_emac_ether_addr_push(&amp;frame, bcast_addr);</div><div class='add'>+</div><div class='add'>+	/* Fill multicast addresses. */</div><div class='add'>+	WARN_ON(priv-&gt;mcaddr_list.count &gt;= OWL_EMAC_MAX_MULTICAST_ADDRS);</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;mcaddr_list.count; i++) {</div><div class='add'>+		mac_addr = priv-&gt;mcaddr_list.addrs[i];</div><div class='add'>+		owl_emac_ether_addr_push(&amp;frame, mac_addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* The setup frame is a special descriptor which is used to provide physical</div><div class='add'>+ * addresses (i.e. mac, broadcast and multicast) to the MAC hardware for</div><div class='add'>+ * filtering purposes. To be recognized as a setup frame, the TDES1_SET bit</div><div class='add'>+ * must be set in the TX descriptor control field.</div><div class='add'>+ */</div><div class='add'>+static int owl_emac_setup_frame_xmit(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;tx_ring;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct owl_emac_ring_desc *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int tx_head;</div><div class='add'>+	u32 status, control;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = owl_emac_alloc_skb(netdev);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	owl_emac_setup_frame_prepare(priv, skb);</div><div class='add'>+</div><div class='add'>+	dma_addr = owl_emac_dma_map_tx(priv, skb);</div><div class='add'>+	if (dma_mapping_error(owl_emac_get_dev(priv), dma_addr)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tx_head = ring-&gt;head;</div><div class='add'>+	desc = &amp;ring-&gt;descs[tx_head];</div><div class='add'>+</div><div class='add'>+	status = READ_ONCE(desc-&gt;status);</div><div class='add'>+	control = READ_ONCE(desc-&gt;control);</div><div class='add'>+	dma_rmb(); /* Ensure data has been read before used. */</div><div class='add'>+</div><div class='add'>+	if (unlikely(status &amp; OWL_EMAC_BIT_TDES0_OWN) ||</div><div class='add'>+	    !owl_emac_ring_num_unused(ring)) {</div><div class='add'>+		spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+		owl_emac_dma_unmap_tx(priv, skb, dma_addr);</div><div class='add'>+		ret = -EBUSY;</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;skbs[tx_head] = skb;</div><div class='add'>+	ring-&gt;skbs_dma[tx_head] = dma_addr;</div><div class='add'>+</div><div class='add'>+	control &amp;= OWL_EMAC_BIT_TDES1_IC | OWL_EMAC_BIT_TDES1_TER; /* Maintain bits */</div><div class='add'>+	control |= OWL_EMAC_BIT_TDES1_SET;</div><div class='add'>+	control |= OWL_EMAC_MSK_TDES1_TBS1 &amp; skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(desc-&gt;control, control);</div><div class='add'>+	WRITE_ONCE(desc-&gt;buf_addr, dma_addr);</div><div class='add'>+	dma_wmb(); /* Flush descriptor before changing ownership. */</div><div class='add'>+	WRITE_ONCE(desc-&gt;status, OWL_EMAC_BIT_TDES0_OWN);</div><div class='add'>+</div><div class='add'>+	owl_emac_ring_push_head(ring);</div><div class='add'>+</div><div class='add'>+	/* Temporarily enable DMA TX. */</div><div class='add'>+	status = owl_emac_dma_cmd_start_tx(priv);</div><div class='add'>+</div><div class='add'>+	/* Trigger setup frame processing. */</div><div class='add'>+	owl_emac_dma_cmd_resume_tx(priv);</div><div class='add'>+</div><div class='add'>+	/* Restore DMA TX status. */</div><div class='add'>+	owl_emac_dma_cmd_set_tx(priv, status);</div><div class='add'>+</div><div class='add'>+	/* Stop regular TX until setup frame is processed. */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_skb:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t owl_emac_ndo_start_xmit(struct sk_buff *skb,</div><div class='add'>+					   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;tx_ring;</div><div class='add'>+	struct owl_emac_ring_desc *desc;</div><div class='add'>+	unsigned int tx_head;</div><div class='add'>+	u32 status, control;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	dma_addr = owl_emac_dma_map_tx(priv, skb);</div><div class='add'>+	if (dma_mapping_error(dev, dma_addr)) {</div><div class='add'>+		dev_err_ratelimited(&amp;netdev-&gt;dev, "TX DMA mapping failed\n");</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		netdev-&gt;stats.tx_dropped++;</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	tx_head = ring-&gt;head;</div><div class='add'>+	desc = &amp;ring-&gt;descs[tx_head];</div><div class='add'>+</div><div class='add'>+	status = READ_ONCE(desc-&gt;status);</div><div class='add'>+	control = READ_ONCE(desc-&gt;control);</div><div class='add'>+	dma_rmb(); /* Ensure data has been read before used. */</div><div class='add'>+</div><div class='add'>+	if (!owl_emac_ring_num_unused(ring) ||</div><div class='add'>+	    unlikely(status &amp; OWL_EMAC_BIT_TDES0_OWN)) {</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		dev_dbg_ratelimited(&amp;netdev-&gt;dev, "TX buffer full, status=0x%08x\n",</div><div class='add'>+				    owl_emac_irq_status(priv));</div><div class='add'>+		owl_emac_dma_unmap_tx(priv, skb, dma_addr);</div><div class='add'>+		netdev-&gt;stats.tx_dropped++;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;skbs[tx_head] = skb;</div><div class='add'>+	ring-&gt;skbs_dma[tx_head] = dma_addr;</div><div class='add'>+</div><div class='add'>+	control &amp;= OWL_EMAC_BIT_TDES1_IC | OWL_EMAC_BIT_TDES1_TER; /* Maintain bits */</div><div class='add'>+	control |= OWL_EMAC_BIT_TDES1_FS | OWL_EMAC_BIT_TDES1_LS;</div><div class='add'>+	control |= OWL_EMAC_MSK_TDES1_TBS1 &amp; skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(desc-&gt;control, control);</div><div class='add'>+	WRITE_ONCE(desc-&gt;buf_addr, dma_addr);</div><div class='add'>+	dma_wmb(); /* Flush descriptor before changing ownership. */</div><div class='add'>+	WRITE_ONCE(desc-&gt;status, OWL_EMAC_BIT_TDES0_OWN);</div><div class='add'>+</div><div class='add'>+	owl_emac_dma_cmd_resume_tx(priv);</div><div class='add'>+	owl_emac_ring_push_head(ring);</div><div class='add'>+</div><div class='add'>+	/* FIXME: The transmission is currently restricted to a single frame</div><div class='add'>+	 * at a time as a workaround for a MAC hardware bug that causes random</div><div class='add'>+	 * freeze of the TX queue processor.</div><div class='add'>+	 */</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool owl_emac_tx_complete_tail(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;tx_ring;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct owl_emac_ring_desc *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int tx_tail;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	tx_tail = ring-&gt;tail;</div><div class='add'>+	desc = &amp;ring-&gt;descs[tx_tail];</div><div class='add'>+</div><div class='add'>+	status = READ_ONCE(desc-&gt;status);</div><div class='add'>+	dma_rmb(); /* Ensure data has been read before used. */</div><div class='add'>+</div><div class='add'>+	if (status &amp; OWL_EMAC_BIT_TDES0_OWN)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Check for errors. */</div><div class='add'>+	if (status &amp; OWL_EMAC_BIT_TDES0_ES) {</div><div class='add'>+		dev_dbg_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+				    "TX complete error status: 0x%08x\n",</div><div class='add'>+				    status);</div><div class='add'>+</div><div class='add'>+		netdev-&gt;stats.tx_errors++;</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_TDES0_UF)</div><div class='add'>+			netdev-&gt;stats.tx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_TDES0_EC)</div><div class='add'>+			netdev-&gt;stats.tx_aborted_errors++;</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_TDES0_LC)</div><div class='add'>+			netdev-&gt;stats.tx_window_errors++;</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_TDES0_NC)</div><div class='add'>+			netdev-&gt;stats.tx_heartbeat_errors++;</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_TDES0_LO)</div><div class='add'>+			netdev-&gt;stats.tx_carrier_errors++;</div><div class='add'>+	} else {</div><div class='add'>+		netdev-&gt;stats.tx_packets++;</div><div class='add'>+		netdev-&gt;stats.tx_bytes += ring-&gt;skbs[tx_tail]-&gt;len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Some collisions occurred, but pkt has been transmitted. */</div><div class='add'>+	if (status &amp; OWL_EMAC_BIT_TDES0_DE)</div><div class='add'>+		netdev-&gt;stats.collisions++;</div><div class='add'>+</div><div class='add'>+	skb = ring-&gt;skbs[tx_tail];</div><div class='add'>+	owl_emac_dma_unmap_tx(priv, skb, ring-&gt;skbs_dma[tx_tail]);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	ring-&gt;skbs[tx_tail] = NULL;</div><div class='add'>+	ring-&gt;skbs_dma[tx_tail] = 0;</div><div class='add'>+</div><div class='add'>+	owl_emac_ring_pop_tail(ring);</div><div class='add'>+</div><div class='add'>+	if (unlikely(netif_queue_stopped(netdev)))</div><div class='add'>+		netif_wake_queue(netdev);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_tx_complete(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;tx_ring;</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	unsigned int tx_next;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while (ring-&gt;tail != ring-&gt;head) {</div><div class='add'>+		if (!owl_emac_tx_complete_tail(priv))</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FIXME: This is a workaround for a MAC hardware bug not clearing</div><div class='add'>+	 * (sometimes) the OWN bit for a transmitted frame descriptor.</div><div class='add'>+	 *</div><div class='add'>+	 * At this point, when TX queue is full, the tail descriptor has the</div><div class='add'>+	 * OWN bit set, which normally means the frame has not been processed</div><div class='add'>+	 * or transmitted yet. But if there is at least one descriptor in the</div><div class='add'>+	 * queue having the OWN bit cleared, we can safely assume the tail</div><div class='add'>+	 * frame has been also processed by the MAC hardware.</div><div class='add'>+	 *</div><div class='add'>+	 * If that's the case, let's force the frame completion by manually</div><div class='add'>+	 * clearing the OWN bit.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!owl_emac_ring_num_unused(ring))) {</div><div class='add'>+		tx_next = ring-&gt;tail;</div><div class='add'>+</div><div class='add'>+		while ((tx_next = owl_emac_ring_get_next(ring, tx_next)) != ring-&gt;head) {</div><div class='add'>+			status = READ_ONCE(ring-&gt;descs[tx_next].status);</div><div class='add'>+			dma_rmb(); /* Ensure data has been read before used. */</div><div class='add'>+</div><div class='add'>+			if (status &amp; OWL_EMAC_BIT_TDES0_OWN)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			netdev_dbg(netdev, "Found uncleared TX desc OWN bit\n");</div><div class='add'>+</div><div class='add'>+			status = READ_ONCE(ring-&gt;descs[ring-&gt;tail].status);</div><div class='add'>+			dma_rmb(); /* Ensure data has been read before used. */</div><div class='add'>+			status &amp;= ~OWL_EMAC_BIT_TDES0_OWN;</div><div class='add'>+			WRITE_ONCE(ring-&gt;descs[ring-&gt;tail].status, status);</div><div class='add'>+</div><div class='add'>+			owl_emac_tx_complete_tail(priv);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_rx_process(struct owl_emac_priv *priv, int budget)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_ring *ring = &amp;priv-&gt;rx_ring;</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	struct owl_emac_ring_desc *desc;</div><div class='add'>+	struct sk_buff *curr_skb, *new_skb;</div><div class='add'>+	dma_addr_t curr_dma, new_dma;</div><div class='add'>+	unsigned int rx_tail, len;</div><div class='add'>+	u32 status;</div><div class='add'>+	int recv = 0;</div><div class='add'>+</div><div class='add'>+	while (recv &lt; budget) {</div><div class='add'>+		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		rx_tail = ring-&gt;tail;</div><div class='add'>+		desc = &amp;ring-&gt;descs[rx_tail];</div><div class='add'>+</div><div class='add'>+		status = READ_ONCE(desc-&gt;status);</div><div class='add'>+		dma_rmb(); /* Ensure data has been read before used. */</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_RDES0_OWN) {</div><div class='add'>+			spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		curr_skb = ring-&gt;skbs[rx_tail];</div><div class='add'>+		curr_dma = ring-&gt;skbs_dma[rx_tail];</div><div class='add'>+		owl_emac_ring_pop_tail(ring);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (status &amp; (OWL_EMAC_BIT_RDES0_DE | OWL_EMAC_BIT_RDES0_RF |</div><div class='add'>+		    OWL_EMAC_BIT_RDES0_TL | OWL_EMAC_BIT_RDES0_CS |</div><div class='add'>+		    OWL_EMAC_BIT_RDES0_DB | OWL_EMAC_BIT_RDES0_CE |</div><div class='add'>+		    OWL_EMAC_BIT_RDES0_ZERO)) {</div><div class='add'>+			dev_dbg_ratelimited(&amp;netdev-&gt;dev,</div><div class='add'>+					    "RX desc error status: 0x%08x\n",</div><div class='add'>+					    status);</div><div class='add'>+</div><div class='add'>+			if (status &amp; OWL_EMAC_BIT_RDES0_DE)</div><div class='add'>+				netdev-&gt;stats.rx_over_errors++;</div><div class='add'>+</div><div class='add'>+			if (status &amp; (OWL_EMAC_BIT_RDES0_RF | OWL_EMAC_BIT_RDES0_DB))</div><div class='add'>+				netdev-&gt;stats.rx_frame_errors++;</div><div class='add'>+</div><div class='add'>+			if (status &amp; OWL_EMAC_BIT_RDES0_TL)</div><div class='add'>+				netdev-&gt;stats.rx_length_errors++;</div><div class='add'>+</div><div class='add'>+			if (status &amp; OWL_EMAC_BIT_RDES0_CS)</div><div class='add'>+				netdev-&gt;stats.collisions++;</div><div class='add'>+</div><div class='add'>+			if (status &amp; OWL_EMAC_BIT_RDES0_CE)</div><div class='add'>+				netdev-&gt;stats.rx_crc_errors++;</div><div class='add'>+</div><div class='add'>+			if (status &amp; OWL_EMAC_BIT_RDES0_ZERO)</div><div class='add'>+				netdev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+			goto drop_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		len = (status &amp; OWL_EMAC_MSK_RDES0_FL) &gt;&gt; OWL_EMAC_OFF_RDES0_FL;</div><div class='add'>+		if (unlikely(len &gt; OWL_EMAC_RX_FRAME_MAX_LEN)) {</div><div class='add'>+			netdev-&gt;stats.rx_length_errors++;</div><div class='add'>+			netdev_err(netdev, "invalid RX frame len: %u\n", len);</div><div class='add'>+			goto drop_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Prepare new skb before receiving the current one. */</div><div class='add'>+		new_skb = owl_emac_alloc_skb(netdev);</div><div class='add'>+		if (unlikely(!new_skb))</div><div class='add'>+			goto drop_skb;</div><div class='add'>+</div><div class='add'>+		new_dma = owl_emac_dma_map_rx(priv, new_skb);</div><div class='add'>+		if (dma_mapping_error(dev, new_dma)) {</div><div class='add'>+			dev_kfree_skb(new_skb);</div><div class='add'>+			netdev_err(netdev, "RX DMA mapping failed\n");</div><div class='add'>+			goto drop_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		owl_emac_dma_unmap_rx(priv, curr_skb, curr_dma);</div><div class='add'>+</div><div class='add'>+		skb_put(curr_skb, len - ETH_FCS_LEN);</div><div class='add'>+		curr_skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+		curr_skb-&gt;protocol = eth_type_trans(curr_skb, netdev);</div><div class='add'>+		curr_skb-&gt;dev = netdev;</div><div class='add'>+</div><div class='add'>+		netif_receive_skb(curr_skb);</div><div class='add'>+</div><div class='add'>+		netdev-&gt;stats.rx_packets++;</div><div class='add'>+		netdev-&gt;stats.rx_bytes += len;</div><div class='add'>+		recv++;</div><div class='add'>+		goto push_skb;</div><div class='add'>+</div><div class='add'>+drop_skb:</div><div class='add'>+		netdev-&gt;stats.rx_dropped++;</div><div class='add'>+		netdev-&gt;stats.rx_errors++;</div><div class='add'>+		/* Reuse the current skb. */</div><div class='add'>+		new_skb = curr_skb;</div><div class='add'>+		new_dma = curr_dma;</div><div class='add'>+</div><div class='add'>+push_skb:</div><div class='add'>+		spin_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		ring-&gt;skbs[ring-&gt;head] = new_skb;</div><div class='add'>+		ring-&gt;skbs_dma[ring-&gt;head] = new_dma;</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(desc-&gt;buf_addr, new_dma);</div><div class='add'>+		dma_wmb(); /* Flush descriptor before changing ownership. */</div><div class='add'>+		WRITE_ONCE(desc-&gt;status, OWL_EMAC_BIT_RDES0_OWN);</div><div class='add'>+</div><div class='add'>+		owl_emac_ring_push_head(ring);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return recv;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	int work_done = 0, ru_cnt = 0, recv;</div><div class='add'>+	static int tx_err_cnt, rx_err_cnt;</div><div class='add'>+	struct owl_emac_priv *priv;</div><div class='add'>+	u32 status, proc_status;</div><div class='add'>+</div><div class='add'>+	priv = container_of(napi, struct owl_emac_priv, napi);</div><div class='add'>+</div><div class='add'>+	while ((status = owl_emac_irq_clear(priv)) &amp;</div><div class='add'>+	       (OWL_EMAC_BIT_MAC_CSR5_NIS | OWL_EMAC_BIT_MAC_CSR5_AIS)) {</div><div class='add'>+		recv = 0;</div><div class='add'>+</div><div class='add'>+		/* TX setup frame raises ETI instead of TI. */</div><div class='add'>+		if (status &amp; (OWL_EMAC_BIT_MAC_CSR5_TI | OWL_EMAC_BIT_MAC_CSR5_ETI)) {</div><div class='add'>+			owl_emac_tx_complete(priv);</div><div class='add'>+			tx_err_cnt = 0;</div><div class='add'>+</div><div class='add'>+			/* Count MAC internal RX errors. */</div><div class='add'>+			proc_status = status &amp; OWL_EMAC_MSK_MAC_CSR5_RS;</div><div class='add'>+			proc_status &gt;&gt;= OWL_EMAC_OFF_MAC_CSR5_RS;</div><div class='add'>+			if (proc_status == OWL_EMAC_VAL_MAC_CSR5_RS_DATA ||</div><div class='add'>+			    proc_status == OWL_EMAC_VAL_MAC_CSR5_RS_CDES ||</div><div class='add'>+			    proc_status == OWL_EMAC_VAL_MAC_CSR5_RS_FDES)</div><div class='add'>+				rx_err_cnt++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; OWL_EMAC_BIT_MAC_CSR5_RI) {</div><div class='add'>+			recv = owl_emac_rx_process(priv, budget - work_done);</div><div class='add'>+			rx_err_cnt = 0;</div><div class='add'>+</div><div class='add'>+			/* Count MAC internal TX errors. */</div><div class='add'>+			proc_status = status &amp; OWL_EMAC_MSK_MAC_CSR5_TS;</div><div class='add'>+			proc_status &gt;&gt;= OWL_EMAC_OFF_MAC_CSR5_TS;</div><div class='add'>+			if (proc_status == OWL_EMAC_VAL_MAC_CSR5_TS_DATA ||</div><div class='add'>+			    proc_status == OWL_EMAC_VAL_MAC_CSR5_TS_CDES)</div><div class='add'>+				tx_err_cnt++;</div><div class='add'>+		} else if (status &amp; OWL_EMAC_BIT_MAC_CSR5_RU) {</div><div class='add'>+			/* MAC AHB is in suspended state, will return to RX</div><div class='add'>+			 * descriptor processing when the host changes ownership</div><div class='add'>+			 * of the descriptor and either an RX poll demand CMD is</div><div class='add'>+			 * issued or a new frame is recognized by the MAC AHB.</div><div class='add'>+			 */</div><div class='add'>+			if (++ru_cnt == 2)</div><div class='add'>+				owl_emac_dma_cmd_resume_rx(priv);</div><div class='add'>+</div><div class='add'>+			recv = owl_emac_rx_process(priv, budget - work_done);</div><div class='add'>+</div><div class='add'>+			/* Guard against too many RU interrupts. */</div><div class='add'>+			if (ru_cnt &gt; 3)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		work_done += recv;</div><div class='add'>+		if (work_done &gt;= budget)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		napi_complete_done(napi, work_done);</div><div class='add'>+		owl_emac_irq_enable(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Reset MAC when getting too many internal TX or RX errors. */</div><div class='add'>+	if (tx_err_cnt &gt; 10 || rx_err_cnt &gt; 10) {</div><div class='add'>+		netdev_dbg(priv-&gt;netdev, "%s error status: 0x%08x\n",</div><div class='add'>+			   tx_err_cnt &gt; 10 ? "TX" : "RX", status);</div><div class='add'>+		rx_err_cnt = 0;</div><div class='add'>+		tx_err_cnt = 0;</div><div class='add'>+		schedule_work(&amp;priv-&gt;mac_reset_task);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_mdio_clock_enable(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Enable MDC clock generation by adjusting CLKDIV according to</div><div class='add'>+	 * the vendor implementation of the original driver.</div><div class='add'>+	 */</div><div class='add'>+	val = owl_emac_reg_read(priv, OWL_EMAC_REG_MAC_CSR10);</div><div class='add'>+	val &amp;= OWL_EMAC_MSK_MAC_CSR10_CLKDIV;</div><div class='add'>+	val |= OWL_EMAC_VAL_MAC_CSR10_CLKDIV_128 &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_CLKDIV;</div><div class='add'>+</div><div class='add'>+	val |= OWL_EMAC_BIT_MAC_CSR10_SB;</div><div class='add'>+	val |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_CDS &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_OPCODE;</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR10, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_core_hw_reset(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	/* Trigger hardware reset. */</div><div class='add'>+	reset_control_assert(priv-&gt;reset);</div><div class='add'>+	usleep_range(10, 20);</div><div class='add'>+	reset_control_deassert(priv-&gt;reset);</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_core_sw_reset(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Trigger software reset. */</div><div class='add'>+	owl_emac_reg_set(priv, OWL_EMAC_REG_MAC_CSR0, OWL_EMAC_BIT_MAC_CSR0_SWR);</div><div class='add'>+	ret = readl_poll_timeout(priv-&gt;base + OWL_EMAC_REG_MAC_CSR0,</div><div class='add'>+				 val, !(val &amp; OWL_EMAC_BIT_MAC_CSR0_SWR),</div><div class='add'>+				 OWL_EMAC_POLL_DELAY_USEC,</div><div class='add'>+				 OWL_EMAC_RESET_POLL_TIMEOUT_USEC);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;phy_mode == PHY_INTERFACE_MODE_RMII) {</div><div class='add'>+		/* Enable RMII and use the 50MHz rmii clk as output to PHY. */</div><div class='add'>+		val = 0;</div><div class='add'>+	} else {</div><div class='add'>+		/* Enable SMII and use the 125MHz rmii clk as output to PHY.</div><div class='add'>+		 * Additionally set SMII SYNC delay to 4 half cycle.</div><div class='add'>+		 */</div><div class='add'>+		val = 0x04 &lt;&lt; OWL_EMAC_OFF_MAC_CTRL_SSDC;</div><div class='add'>+		val |= OWL_EMAC_BIT_MAC_CTRL_RSIS;</div><div class='add'>+	}</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CTRL, val);</div><div class='add'>+</div><div class='add'>+	/* MDC is disabled after reset. */</div><div class='add'>+	owl_emac_mdio_clock_enable(priv);</div><div class='add'>+</div><div class='add'>+	/* Set FIFO pause &amp; restart threshold levels. */</div><div class='add'>+	val = 0x40 &lt;&lt; OWL_EMAC_OFF_MAC_CSR19_FPTL;</div><div class='add'>+	val |= 0x10 &lt;&lt; OWL_EMAC_OFF_MAC_CSR19_FRTL;</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR19, val);</div><div class='add'>+</div><div class='add'>+	/* Set flow control pause quanta time to ~100 ms. */</div><div class='add'>+	val = 0x4FFF &lt;&lt; OWL_EMAC_OFF_MAC_CSR18_PQT;</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR18, val);</div><div class='add'>+</div><div class='add'>+	/* Setup interrupt mitigation. */</div><div class='add'>+	val = 7 &lt;&lt; OWL_EMAC_OFF_MAC_CSR11_NRP;</div><div class='add'>+	val |= 4 &lt;&lt; OWL_EMAC_OFF_MAC_CSR11_RT;</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR11, val);</div><div class='add'>+</div><div class='add'>+	/* Set RX/TX rings base addresses. */</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR3,</div><div class='add'>+			   (u32)(priv-&gt;rx_ring.descs_dma));</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR4,</div><div class='add'>+			   (u32)(priv-&gt;tx_ring.descs_dma));</div><div class='add'>+</div><div class='add'>+	/* Setup initial operation mode. */</div><div class='add'>+	val = OWL_EMAC_VAL_MAC_CSR6_SPEED_100M &lt;&lt; OWL_EMAC_OFF_MAC_CSR6_SPEED;</div><div class='add'>+	val |= OWL_EMAC_BIT_MAC_CSR6_FD;</div><div class='add'>+	owl_emac_reg_update(priv, OWL_EMAC_REG_MAC_CSR6,</div><div class='add'>+			    OWL_EMAC_MSK_MAC_CSR6_SPEED |</div><div class='add'>+			    OWL_EMAC_BIT_MAC_CSR6_FD, val);</div><div class='add'>+	owl_emac_reg_clear(priv, OWL_EMAC_REG_MAC_CSR6,</div><div class='add'>+			   OWL_EMAC_BIT_MAC_CSR6_PR | OWL_EMAC_BIT_MAC_CSR6_PM);</div><div class='add'>+</div><div class='add'>+	priv-&gt;link = 0;</div><div class='add'>+	priv-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+	priv-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	priv-&gt;pause = 0;</div><div class='add'>+	priv-&gt;mcaddr_list.count = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_enable(struct net_device *netdev, bool start_phy)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	owl_emac_dma_cmd_stop(priv);</div><div class='add'>+	owl_emac_irq_disable(priv);</div><div class='add'>+	owl_emac_irq_clear(priv);</div><div class='add'>+</div><div class='add'>+	owl_emac_ring_prepare_tx(priv);</div><div class='add'>+	ret = owl_emac_ring_prepare_rx(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_unprep;</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_core_sw_reset(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(netdev, "failed to soft reset MAC core: %d\n", ret);</div><div class='add'>+		goto err_unprep;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	owl_emac_set_hw_mac_addr(netdev);</div><div class='add'>+	owl_emac_setup_frame_xmit(priv);</div><div class='add'>+</div><div class='add'>+	netdev_reset_queue(netdev);</div><div class='add'>+	napi_enable(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+	owl_emac_irq_enable(priv);</div><div class='add'>+	owl_emac_dma_cmd_start(priv);</div><div class='add'>+</div><div class='add'>+	if (start_phy)</div><div class='add'>+		phy_start(netdev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unprep:</div><div class='add'>+	owl_emac_ring_unprepare_rx(priv);</div><div class='add'>+	owl_emac_ring_unprepare_tx(priv);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_disable(struct net_device *netdev, bool stop_phy)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	owl_emac_dma_cmd_stop(priv);</div><div class='add'>+	owl_emac_irq_disable(priv);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	napi_disable(&amp;priv-&gt;napi);</div><div class='add'>+</div><div class='add'>+	if (stop_phy)</div><div class='add'>+		phy_stop(netdev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	owl_emac_ring_unprepare_rx(priv);</div><div class='add'>+	owl_emac_ring_unprepare_tx(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_ndo_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return owl_emac_enable(netdev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_ndo_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	owl_emac_disable(netdev, true);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_set_multicast(struct net_device *netdev, int count)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	int index = 0;</div><div class='add'>+</div><div class='add'>+	if (count &lt;= 0) {</div><div class='add'>+		priv-&gt;mcaddr_list.count = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_for_each_mc_addr(ha, netdev) {</div><div class='add'>+		if (!is_multicast_ether_addr(ha-&gt;addr))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		WARN_ON(index &gt;= OWL_EMAC_MAX_MULTICAST_ADDRS);</div><div class='add'>+		ether_addr_copy(priv-&gt;mcaddr_list.addrs[index++], ha-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;mcaddr_list.count = index;</div><div class='add'>+</div><div class='add'>+	owl_emac_setup_frame_xmit(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ndo_set_rx_mode(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	u32 status, val = 0;</div><div class='add'>+	int mcast_count = 0;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		val = OWL_EMAC_BIT_MAC_CSR6_PR;</div><div class='add'>+	} else if (netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		val = OWL_EMAC_BIT_MAC_CSR6_PM;</div><div class='add'>+	} else if (netdev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='add'>+		mcast_count = netdev_mc_count(netdev);</div><div class='add'>+</div><div class='add'>+		if (mcast_count &gt; OWL_EMAC_MAX_MULTICAST_ADDRS) {</div><div class='add'>+			val = OWL_EMAC_BIT_MAC_CSR6_PM;</div><div class='add'>+			mcast_count = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Temporarily stop DMA TX &amp; RX. */</div><div class='add'>+	status = owl_emac_dma_cmd_stop(priv);</div><div class='add'>+</div><div class='add'>+	/* Update operation modes. */</div><div class='add'>+	owl_emac_reg_update(priv, OWL_EMAC_REG_MAC_CSR6,</div><div class='add'>+			    OWL_EMAC_BIT_MAC_CSR6_PR | OWL_EMAC_BIT_MAC_CSR6_PM,</div><div class='add'>+			    val);</div><div class='add'>+</div><div class='add'>+	/* Restore DMA TX &amp; RX status. */</div><div class='add'>+	owl_emac_dma_cmd_set(priv, status);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Set/reset multicast addr list. */</div><div class='add'>+	owl_emac_set_multicast(netdev, mcast_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_ndo_set_mac_addr(struct net_device *netdev, void *addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *skaddr = addr;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(skaddr-&gt;sa_data))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	eth_hw_addr_set(netdev, skaddr-&gt;sa_data);</div><div class='add'>+	owl_emac_set_hw_mac_addr(netdev);</div><div class='add'>+</div><div class='add'>+	return owl_emac_setup_frame_xmit(netdev_priv(netdev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_ndo_eth_ioctl(struct net_device *netdev,</div><div class='add'>+				  struct ifreq *req, int cmd)</div><div class='add'>+{</div><div class='add'>+	if (!netif_running(netdev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return phy_mii_ioctl(netdev-&gt;phydev, req, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ndo_tx_timeout(struct net_device *netdev,</div><div class='add'>+				    unsigned int txqueue)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;priv-&gt;mac_reset_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_reset_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv;</div><div class='add'>+</div><div class='add'>+	priv = container_of(work, struct owl_emac_priv, mac_reset_task);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(priv-&gt;netdev, "resetting MAC\n");</div><div class='add'>+	owl_emac_disable(priv-&gt;netdev, false);</div><div class='add'>+	owl_emac_enable(priv-&gt;netdev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device_stats *</div><div class='add'>+owl_emac_ndo_get_stats(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	/* FIXME: If possible, try to get stats from MAC hardware registers</div><div class='add'>+	 * instead of tracking them manually in the driver.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	return &amp;netdev-&gt;stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops owl_emac_netdev_ops = {</div><div class='add'>+	.ndo_open		= owl_emac_ndo_open,</div><div class='add'>+	.ndo_stop		= owl_emac_ndo_stop,</div><div class='add'>+	.ndo_start_xmit		= owl_emac_ndo_start_xmit,</div><div class='add'>+	.ndo_set_rx_mode	= owl_emac_ndo_set_rx_mode,</div><div class='add'>+	.ndo_set_mac_address	= owl_emac_ndo_set_mac_addr,</div><div class='add'>+	.ndo_validate_addr	= eth_validate_addr,</div><div class='add'>+	.ndo_eth_ioctl		= owl_emac_ndo_eth_ioctl,</div><div class='add'>+	.ndo_tx_timeout         = owl_emac_ndo_tx_timeout,</div><div class='add'>+	.ndo_get_stats		= owl_emac_ndo_get_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void owl_emac_ethtool_get_drvinfo(struct net_device *dev,</div><div class='add'>+					 struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	strscpy(info-&gt;driver, OWL_EMAC_DRVNAME, sizeof(info-&gt;driver));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 owl_emac_ethtool_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_ethtool_set_msglevel(struct net_device *ndev, u32 val)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;msg_enable = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops owl_emac_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= owl_emac_ethtool_get_drvinfo,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_link_ksettings	= phy_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings	= phy_ethtool_set_link_ksettings,</div><div class='add'>+	.get_msglevel		= owl_emac_ethtool_get_msglevel,</div><div class='add'>+	.set_msglevel		= owl_emac_ethtool_set_msglevel,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int owl_emac_mdio_wait(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Wait while data transfer is in progress. */</div><div class='add'>+	return readl_poll_timeout(priv-&gt;base + OWL_EMAC_REG_MAC_CSR10,</div><div class='add'>+				  val, !(val &amp; OWL_EMAC_BIT_MAC_CSR10_SB),</div><div class='add'>+				  OWL_EMAC_POLL_DELAY_USEC,</div><div class='add'>+				  OWL_EMAC_MDIO_POLL_TIMEOUT_USEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_mdio_read(struct mii_bus *bus, int addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = bus-&gt;priv;</div><div class='add'>+	u32 data, tmp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data = OWL_EMAC_BIT_MAC_CSR10_SB;</div><div class='add'>+	data |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_RD &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_OPCODE;</div><div class='add'>+</div><div class='add'>+	tmp = addr &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_PHYADD;</div><div class='add'>+	data |= tmp &amp; OWL_EMAC_MSK_MAC_CSR10_PHYADD;</div><div class='add'>+</div><div class='add'>+	tmp = regnum &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_REGADD;</div><div class='add'>+	data |= tmp &amp; OWL_EMAC_MSK_MAC_CSR10_REGADD;</div><div class='add'>+</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR10, data);</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_mdio_wait(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	data = owl_emac_reg_read(priv, OWL_EMAC_REG_MAC_CSR10);</div><div class='add'>+	data &amp;= OWL_EMAC_MSK_MAC_CSR10_DATA;</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+owl_emac_mdio_write(struct mii_bus *bus, int addr, int regnum, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = bus-&gt;priv;</div><div class='add'>+	u32 data, tmp;</div><div class='add'>+</div><div class='add'>+	data = OWL_EMAC_BIT_MAC_CSR10_SB;</div><div class='add'>+	data |= OWL_EMAC_VAL_MAC_CSR10_OPCODE_WR &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_OPCODE;</div><div class='add'>+</div><div class='add'>+	tmp = addr &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_PHYADD;</div><div class='add'>+	data |= tmp &amp; OWL_EMAC_MSK_MAC_CSR10_PHYADD;</div><div class='add'>+</div><div class='add'>+	tmp = regnum &lt;&lt; OWL_EMAC_OFF_MAC_CSR10_REGADD;</div><div class='add'>+	data |= tmp &amp; OWL_EMAC_MSK_MAC_CSR10_REGADD;</div><div class='add'>+</div><div class='add'>+	data |= val &amp; OWL_EMAC_MSK_MAC_CSR10_DATA;</div><div class='add'>+</div><div class='add'>+	owl_emac_reg_write(priv, OWL_EMAC_REG_MAC_CSR10, data);</div><div class='add'>+</div><div class='add'>+	return owl_emac_mdio_wait(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_mdio_init(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+	struct device_node *mdio_node;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mdio_node = of_get_available_child_by_name(dev-&gt;of_node, "mdio");</div><div class='add'>+	if (!mdio_node)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mii = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!priv-&gt;mii) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_put_node;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(priv-&gt;mii-&gt;id, MII_BUS_ID_SIZE, "%s", dev_name(dev));</div><div class='add'>+	priv-&gt;mii-&gt;name = "owl-emac-mdio";</div><div class='add'>+	priv-&gt;mii-&gt;parent = dev;</div><div class='add'>+	priv-&gt;mii-&gt;read = owl_emac_mdio_read;</div><div class='add'>+	priv-&gt;mii-&gt;write = owl_emac_mdio_write;</div><div class='add'>+	priv-&gt;mii-&gt;phy_mask = ~0; /* Mask out all PHYs from auto probing. */</div><div class='add'>+	priv-&gt;mii-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	ret = devm_of_mdiobus_register(dev, priv-&gt;mii, mdio_node);</div><div class='add'>+</div><div class='add'>+err_put_node:</div><div class='add'>+	of_node_put(mdio_node);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_phy_init(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+	struct phy_device *phy;</div><div class='add'>+</div><div class='add'>+	phy = of_phy_get_and_connect(netdev, dev-&gt;of_node,</div><div class='add'>+				     owl_emac_adjust_link);</div><div class='add'>+	if (!phy)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	phy_set_sym_pause(phy, true, true, true);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_link(priv))</div><div class='add'>+		phy_attached_info(phy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_get_mac_addr(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = netdev-&gt;dev.parent;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = platform_get_ethdev_address(dev, netdev);</div><div class='add'>+	if (!ret &amp;&amp; is_valid_ether_addr(netdev-&gt;dev_addr))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eth_hw_addr_random(netdev);</div><div class='add'>+	dev_warn(dev, "using random MAC address %pM\n", netdev-&gt;dev_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int owl_emac_suspend(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	disable_irq(netdev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		owl_emac_disable(netdev, true);</div><div class='add'>+		netif_device_detach(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_bulk_disable_unprepare(OWL_EMAC_NCLKS, priv-&gt;clks);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __maybe_unused int owl_emac_resume(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='add'>+	struct owl_emac_priv *priv = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_bulk_prepare_enable(OWL_EMAC_NCLKS, priv-&gt;clks);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		owl_emac_core_hw_reset(priv);</div><div class='add'>+		owl_emac_core_sw_reset(priv);</div><div class='add'>+</div><div class='add'>+		ret = owl_emac_enable(netdev, true);</div><div class='add'>+		if (ret) {</div><div class='add'>+			clk_bulk_disable_unprepare(OWL_EMAC_NCLKS, priv-&gt;clks);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_device_attach(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enable_irq(netdev-&gt;irq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_clk_disable_unprepare(void *data)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = data;</div><div class='add'>+</div><div class='add'>+	clk_bulk_disable_unprepare(OWL_EMAC_NCLKS, priv-&gt;clks);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_clk_set_rate(struct owl_emac_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = owl_emac_get_dev(priv);</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (priv-&gt;phy_mode) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RMII:</div><div class='add'>+		rate = 50000000;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PHY_INTERFACE_MODE_SMII:</div><div class='add'>+		rate = 125000000;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		dev_err(dev, "unsupported phy interface mode %d\n",</div><div class='add'>+			priv-&gt;phy_mode);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_set_rate(priv-&gt;clks[OWL_EMAC_CLK_RMII].clk, rate);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(dev, "failed to set RMII clock rate: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int owl_emac_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct owl_emac_priv *priv;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	netdev = devm_alloc_etherdev(dev, sizeof(*priv));</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, netdev);</div><div class='add'>+	SET_NETDEV_DEV(netdev, dev);</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(netdev);</div><div class='add'>+	priv-&gt;netdev = netdev;</div><div class='add'>+	priv-&gt;msg_enable = netif_msg_init(-1, OWL_EMAC_DEFAULT_MSG_ENABLE);</div><div class='add'>+</div><div class='add'>+	ret = of_get_phy_mode(dev-&gt;of_node, &amp;priv-&gt;phy_mode);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to get phy mode: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "unsupported DMA mask\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_ring_alloc(dev, &amp;priv-&gt;rx_ring, OWL_EMAC_RX_RING_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_ring_alloc(dev, &amp;priv-&gt;tx_ring, OWL_EMAC_TX_RING_SIZE);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;base))</div><div class='add'>+		return PTR_ERR(priv-&gt;base);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (netdev-&gt;irq &lt; 0)</div><div class='add'>+		return netdev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(dev, netdev-&gt;irq, owl_emac_handle_irq,</div><div class='add'>+			       IRQF_SHARED, netdev-&gt;name, netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to request irq: %d\n", netdev-&gt;irq);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; OWL_EMAC_NCLKS; i++)</div><div class='add'>+		priv-&gt;clks[i].id = owl_emac_clk_names[i];</div><div class='add'>+</div><div class='add'>+	ret = devm_clk_bulk_get(dev, OWL_EMAC_NCLKS, priv-&gt;clks);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_bulk_prepare_enable(OWL_EMAC_NCLKS, priv-&gt;clks);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = devm_add_action_or_reset(dev, owl_emac_clk_disable_unprepare, priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_clk_set_rate(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;reset = devm_reset_control_get_exclusive(dev, NULL);</div><div class='add'>+	if (IS_ERR(priv-&gt;reset))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(priv-&gt;reset),</div><div class='add'>+				     "failed to get reset control");</div><div class='add'>+</div><div class='add'>+	owl_emac_get_mac_addr(netdev);</div><div class='add'>+</div><div class='add'>+	owl_emac_core_hw_reset(priv);</div><div class='add'>+	owl_emac_mdio_clock_enable(priv);</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_mdio_init(netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to initialize MDIO bus\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = owl_emac_phy_init(netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to initialize PHY\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;mac_reset_task, owl_emac_reset_task);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;min_mtu = OWL_EMAC_MTU_MIN;</div><div class='add'>+	netdev-&gt;max_mtu = OWL_EMAC_MTU_MAX;</div><div class='add'>+	netdev-&gt;watchdog_timeo = OWL_EMAC_TX_TIMEOUT;</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;owl_emac_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;owl_emac_ethtool_ops;</div><div class='add'>+	netif_napi_add(netdev, &amp;priv-&gt;napi, owl_emac_poll);</div><div class='add'>+</div><div class='add'>+	ret = devm_register_netdev(dev, netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+		phy_disconnect(netdev-&gt;phydev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void owl_emac_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct owl_emac_priv *priv = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+	phy_disconnect(priv-&gt;netdev-&gt;phydev);</div><div class='add'>+	cancel_work_sync(&amp;priv-&gt;mac_reset_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id owl_emac_of_match[] = {</div><div class='add'>+	{ .compatible = "actions,owl-emac", },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, owl_emac_of_match);</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(owl_emac_pm_ops,</div><div class='add'>+			 owl_emac_suspend, owl_emac_resume);</div><div class='add'>+</div><div class='add'>+static struct platform_driver owl_emac_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = OWL_EMAC_DRVNAME,</div><div class='add'>+		.of_match_table = owl_emac_of_match,</div><div class='add'>+		.pm = &amp;owl_emac_pm_ops,</div><div class='add'>+	},</div><div class='add'>+	.probe = owl_emac_probe,</div><div class='add'>+	.remove = owl_emac_remove,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(owl_emac_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Actions Semi Owl SoCs Ethernet MAC Driver");</div><div class='add'>+MODULE_AUTHOR("Actions Semi Inc.");</div><div class='add'>+MODULE_AUTHOR("Cristian Ciocaltea &lt;cristian.ciocaltea@gmail.com&gt;");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/actions/owl-emac.h b/drivers/net/ethernet/actions/owl-emac.h<br/>new file mode 100644<br/>index 000000000000..9eb0d1a30242<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/actions/owl-emac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/actions/owl-emac.h</a></div><div class='hunk'>@@ -0,0 +1,280 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Actions Semi Owl SoCs Ethernet MAC driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2012 Actions Semi Inc.</div><div class='add'>+ * Copyright (c) 2021 Cristian Ciocaltea &lt;cristian.ciocaltea@gmail.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __OWL_EMAC_H__</div><div class='add'>+#define __OWL_EMAC_H__</div><div class='add'>+</div><div class='add'>+#define OWL_EMAC_DRVNAME			"owl-emac"</div><div class='add'>+</div><div class='add'>+#define OWL_EMAC_POLL_DELAY_USEC		5</div><div class='add'>+#define OWL_EMAC_MDIO_POLL_TIMEOUT_USEC		1000</div><div class='add'>+#define OWL_EMAC_RESET_POLL_TIMEOUT_USEC	2000</div><div class='add'>+#define OWL_EMAC_TX_TIMEOUT			(2 * HZ)</div><div class='add'>+</div><div class='add'>+#define OWL_EMAC_MTU_MIN			ETH_MIN_MTU</div><div class='add'>+#define OWL_EMAC_MTU_MAX			ETH_DATA_LEN</div><div class='add'>+#define OWL_EMAC_RX_FRAME_MAX_LEN		(ETH_FRAME_LEN + ETH_FCS_LEN)</div><div class='add'>+#define OWL_EMAC_SKB_ALIGN			4</div><div class='add'>+#define OWL_EMAC_SKB_RESERVE			18</div><div class='add'>+</div><div class='add'>+#define OWL_EMAC_MAX_MULTICAST_ADDRS		14</div><div class='add'>+#define OWL_EMAC_SETUP_FRAME_LEN		192</div><div class='add'>+</div><div class='add'>+#define OWL_EMAC_RX_RING_SIZE			64</div><div class='add'>+#define OWL_EMAC_TX_RING_SIZE			32</div><div class='add'>+</div><div class='add'>+/* Bus mode register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR0			0x0000</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR0_SWR		BIT(0)	/* Software reset */</div><div class='add'>+</div><div class='add'>+/* Transmit/receive poll demand registers */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR1			0x0008</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR1_TPD		0x01</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR2			0x0010</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR2_RPD		0x01</div><div class='add'>+</div><div class='add'>+/* Receive/transmit descriptor list base address registers */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR3			0x0018</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR4			0x0020</div><div class='add'>+</div><div class='add'>+/* Status register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR5			0x0028</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR5_TS		GENMASK(22, 20)	/* Transmit process state */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR5_TS		20</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR5_TS_DATA		0x03	/* Transferring data HOST -&gt; FIFO */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR5_TS_CDES		0x07	/* Closing transmit descriptor */</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR5_RS		GENMASK(19, 17)	/* Receive process state */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR5_RS		17</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR5_RS_FDES		0x01	/* Fetching receive descriptor */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR5_RS_CDES		0x05	/* Closing receive descriptor */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR5_RS_DATA		0x07	/* Transferring data FIFO -&gt; HOST */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_NIS		BIT(16)	/* Normal interrupt summary */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_AIS		BIT(15)	/* Abnormal interrupt summary */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_ERI		BIT(14)	/* Early receive interrupt */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_GTE		BIT(11)	/* General-purpose timer expiration */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_ETI		BIT(10)	/* Early transmit interrupt */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_RPS		BIT(8)	/* Receive process stopped */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_RU		BIT(7)	/* Receive buffer unavailable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_RI		BIT(6)	/* Receive interrupt */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_UNF		BIT(5)	/* Transmit underflow */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_LCIS		BIT(4)	/* Link change status */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_LCIQ		BIT(3)	/* Link change interrupt */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_TU		BIT(2)	/* Transmit buffer unavailable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_TPS		BIT(1)	/* Transmit process stopped */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR5_TI		BIT(0)	/* Transmit interrupt */</div><div class='add'>+</div><div class='add'>+/* Operation mode register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR6			0x0030</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_RA		BIT(30)	/* Receive all */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_TTM		BIT(22)	/* Transmit threshold mode */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_SF		BIT(21)	/* Store and forward */</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR6_SPEED		GENMASK(17, 16)	/* Eth speed selection */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR6_SPEED		16</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR6_SPEED_100M	0x00</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR6_SPEED_10M		0x02</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_ST		BIT(13)	/* Start/stop transmit command */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_LP		BIT(10)	/* Loopback mode */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_FD		BIT(9)	/* Full duplex mode */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_PM		BIT(7)	/* Pass all multicast */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_PR		BIT(6)	/* Promiscuous mode */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_IF		BIT(4)	/* Inverse filtering */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_PB		BIT(3)	/* Pass bad frames */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_HO		BIT(2)	/* Hash only filtering mode */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_SR		BIT(1)	/* Start/stop receive command */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR6_HP		BIT(0)	/* Hash/perfect receive filtering mode */</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR6_STSR	       (OWL_EMAC_BIT_MAC_CSR6_ST | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR6_SR)</div><div class='add'>+</div><div class='add'>+/* Interrupt enable register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR7			0x0038</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_NIE		BIT(16)	/* Normal interrupt summary enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_AIE		BIT(15)	/* Abnormal interrupt summary enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_ERE		BIT(14)	/* Early receive interrupt enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_GTE		BIT(11)	/* General-purpose timer overflow */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_ETE		BIT(10)	/* Early transmit interrupt enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_RSE		BIT(8)	/* Receive stopped enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_RUE		BIT(7)	/* Receive buffer unavailable enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_RIE		BIT(6)	/* Receive interrupt enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_UNE		BIT(5)	/* Underflow interrupt enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_TUE		BIT(2)	/* Transmit buffer unavailable enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_TSE		BIT(1)	/* Transmit stopped enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_TIE		BIT(0)	/* Transmit interrupt enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR7_ALL_NOT_TUE      (OWL_EMAC_BIT_MAC_CSR7_ERE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_GTE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_ETE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_RSE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_RUE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_RIE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_UNE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_TSE | \</div><div class='add'>+						OWL_EMAC_BIT_MAC_CSR7_TIE)</div><div class='add'>+</div><div class='add'>+/* Missed frames and overflow counter register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR8			0x0040</div><div class='add'>+/* MII management and serial ROM register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR9			0x0048</div><div class='add'>+</div><div class='add'>+/* MII serial management register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR10			0x0050</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR10_SB		BIT(31)	/* Start transfer or busy */</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR10_CLKDIV		GENMASK(30, 28)	/* Clock divider */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR10_CLKDIV		28</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR10_CLKDIV_128	0x04</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR10_OPCODE_WR	0x01	/* Register write command */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR10_OPCODE		26	/* Operation mode */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR10_OPCODE_DCG	0x00	/* Disable clock generation */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR10_OPCODE_WR	0x01	/* Register write command */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR10_OPCODE_RD	0x02	/* Register read command */</div><div class='add'>+#define OWL_EMAC_VAL_MAC_CSR10_OPCODE_CDS	0x03	/* Clock divider set */</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR10_PHYADD		GENMASK(25, 21)	/* Physical layer address */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR10_PHYADD		21</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR10_REGADD		GENMASK(20, 16)	/* Register address */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR10_REGADD		16</div><div class='add'>+#define OWL_EMAC_MSK_MAC_CSR10_DATA		GENMASK(15, 0)	/* Register data */</div><div class='add'>+</div><div class='add'>+/* General-purpose timer and interrupt mitigation control register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR11			0x0058</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR11_TT		27	/* Transmit timer */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR11_NTP		24	/* No. of transmit packets */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR11_RT		20	/* Receive timer */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR11_NRP		17	/* No. of receive packets */</div><div class='add'>+</div><div class='add'>+/* MAC address low/high registers */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR16			0x0080</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR17			0x0088</div><div class='add'>+</div><div class='add'>+/* Pause time &amp; cache thresholds register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR18			0x0090</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR18_CPTL		24	/* Cache pause threshold level */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR18_CRTL		16	/* Cache restart threshold level */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR18_PQT		0	/* Flow control pause quanta time */</div><div class='add'>+</div><div class='add'>+/* FIFO pause &amp; restart threshold register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR19			0x0098</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR19_FPTL		16	/* FIFO pause threshold level */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CSR19_FRTL		0	/* FIFO restart threshold level */</div><div class='add'>+</div><div class='add'>+/* Flow control setup &amp; status register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CSR20			0x00A0</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR20_FCE		BIT(31)	/* Flow Control Enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR20_TUE		BIT(30)	/* Transmit Un-pause frames Enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR20_TPE		BIT(29)	/* Transmit Pause frames Enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR20_RPE		BIT(28)	/* Receive Pause frames Enable */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CSR20_BPE		BIT(27)	/* Back pressure (half-duplex) Enable */</div><div class='add'>+</div><div class='add'>+/* MII control register */</div><div class='add'>+#define OWL_EMAC_REG_MAC_CTRL			0x00B0</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CTRL_RRSB		BIT(8)	/* RMII_REFCLK select bit */</div><div class='add'>+#define OWL_EMAC_OFF_MAC_CTRL_SSDC		4	/* SMII SYNC delay cycle */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CTRL_RCPS		BIT(1)	/* REF_CLK phase select */</div><div class='add'>+#define OWL_EMAC_BIT_MAC_CTRL_RSIS		BIT(0)	/* RMII/SMII interface select */</div><div class='add'>+</div><div class='add'>+/* Receive descriptor status field */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_OWN			BIT(31)	/* Ownership bit */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_FF			BIT(30)	/* Filtering fail */</div><div class='add'>+#define OWL_EMAC_MSK_RDES0_FL			GENMASK(29, 16)	/* Frame length */</div><div class='add'>+#define OWL_EMAC_OFF_RDES0_FL			16</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_ES			BIT(15)	/* Error summary */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_DE			BIT(14)	/* Descriptor error */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_RF			BIT(11)	/* Runt frame */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_MF			BIT(10)	/* Multicast frame */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_FS			BIT(9)	/* First descriptor */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_LS			BIT(8)	/* Last descriptor */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_TL			BIT(7)	/* Frame too long */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_CS			BIT(6)	/* Collision seen */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_FT			BIT(5)	/* Frame type */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_RE			BIT(3)	/* Report on MII error */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_DB			BIT(2)	/* Dribbling bit */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_CE			BIT(1)	/* CRC error */</div><div class='add'>+#define OWL_EMAC_BIT_RDES0_ZERO			BIT(0)	/* Legal frame length indicator */</div><div class='add'>+</div><div class='add'>+/* Receive descriptor control and count field */</div><div class='add'>+#define OWL_EMAC_BIT_RDES1_RER			BIT(25)	/* Receive end of ring */</div><div class='add'>+#define OWL_EMAC_MSK_RDES1_RBS1			GENMASK(10, 0) /* Buffer 1 size */</div><div class='add'>+</div><div class='add'>+/* Transmit descriptor status field */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_OWN			BIT(31)	/* Ownership bit */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_ES			BIT(15)	/* Error summary */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_LO			BIT(11)	/* Loss of carrier */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_NC			BIT(10)	/* No carrier */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_LC			BIT(9)	/* Late collision */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_EC			BIT(8)	/* Excessive collisions */</div><div class='add'>+#define OWL_EMAC_MSK_TDES0_CC			GENMASK(6, 3) /* Collision count */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_UF			BIT(1)	/* Underflow error */</div><div class='add'>+#define OWL_EMAC_BIT_TDES0_DE			BIT(0)	/* Deferred */</div><div class='add'>+</div><div class='add'>+/* Transmit descriptor control and count field */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_IC			BIT(31)	/* Interrupt on completion */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_LS			BIT(30)	/* Last descriptor */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_FS			BIT(29)	/* First descriptor */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_FT1			BIT(28)	/* Filtering type */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_SET			BIT(27)	/* Setup packet */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_AC			BIT(26)	/* Add CRC disable */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_TER			BIT(25)	/* Transmit end of ring */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_DPD			BIT(23)	/* Disabled padding */</div><div class='add'>+#define OWL_EMAC_BIT_TDES1_FT0			BIT(22)	/* Filtering type */</div><div class='add'>+#define OWL_EMAC_MSK_TDES1_TBS1			GENMASK(10, 0) /* Buffer 1 size */</div><div class='add'>+</div><div class='add'>+static const char *const owl_emac_clk_names[] = { "eth", "rmii" };</div><div class='add'>+#define OWL_EMAC_NCLKS ARRAY_SIZE(owl_emac_clk_names)</div><div class='add'>+</div><div class='add'>+enum owl_emac_clk_map {</div><div class='add'>+	OWL_EMAC_CLK_ETH = 0,</div><div class='add'>+	OWL_EMAC_CLK_RMII</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct owl_emac_addr_list {</div><div class='add'>+	u8 addrs[OWL_EMAC_MAX_MULTICAST_ADDRS][ETH_ALEN];</div><div class='add'>+	int count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TX/RX descriptors */</div><div class='add'>+struct owl_emac_ring_desc {</div><div class='add'>+	u32 status;</div><div class='add'>+	u32 control;</div><div class='add'>+	u32 buf_addr;</div><div class='add'>+	u32 reserved;		/* 2nd buffer address is not used */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct owl_emac_ring {</div><div class='add'>+	struct owl_emac_ring_desc *descs;</div><div class='add'>+	dma_addr_t descs_dma;</div><div class='add'>+	struct sk_buff **skbs;</div><div class='add'>+	dma_addr_t *skbs_dma;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct owl_emac_priv {</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+</div><div class='add'>+	struct clk_bulk_data clks[OWL_EMAC_NCLKS];</div><div class='add'>+	struct reset_control *reset;</div><div class='add'>+</div><div class='add'>+	struct owl_emac_ring rx_ring;</div><div class='add'>+	struct owl_emac_ring tx_ring;</div><div class='add'>+</div><div class='add'>+	struct mii_bus *mii;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	phy_interface_t phy_mode;</div><div class='add'>+	unsigned int link;</div><div class='add'>+	int speed;</div><div class='add'>+	int duplex;</div><div class='add'>+	int pause;</div><div class='add'>+	struct owl_emac_addr_list mcaddr_list;</div><div class='add'>+</div><div class='add'>+	struct work_struct mac_reset_task;</div><div class='add'>+</div><div class='add'>+	u32 msg_enable;		/* Debug message level */</div><div class='add'>+	spinlock_t lock;	/* Sync concurrent ring access */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __OWL_EMAC_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig<br/>index 86e02da4f993..c96edc2e582f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adaptec/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adaptec/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adaptec/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/adaptec/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_ADAPTEC</div><div class='ctx'> 	bool "Adaptec devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -22,7 +22,7 @@ config ADAPTEC_STARFIRE</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network</div><div class='ctx'> 	  adapter. The DuraLAN chip is used on the 64 bit PCI boards from</div><div class='ctx'> 	  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip</div><div class='head'>diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c<br/>index 816540e6beac..e1b8794b14c9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adaptec/starfire.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/adaptec/starfire.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adaptec/starfire.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/adaptec/starfire.c</a></div><div class='hunk'>@@ -27,8 +27,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"starfire"</div><div class='del'>-#define DRV_VERSION	"2.1"</div><div class='del'>-#define DRV_RELDATE	"July  6, 2008"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -165,15 +163,9 @@ static int rx_copybreak /* = 0 */;</div><div class='ctx'> #define FIRMWARE_RX	"adaptec/starfire_rx.bin"</div><div class='ctx'> #define FIRMWARE_TX	"adaptec/starfire_tx.bin"</div><div class='ctx'> </div><div class='del'>-/* These identify the driver base version and may not be removed. */</div><div class='del'>-static const char version[] =</div><div class='del'>-KERN_INFO "starfire.c:v1.03 7/26/2000  Written by Donald Becker &lt;becker@scyld.com&gt;\n"</div><div class='del'>-" (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n";</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Donald Becker &lt;becker@scyld.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Adaptec Starfire Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_FIRMWARE(FIRMWARE_RX);</div><div class='ctx'> MODULE_FIRMWARE(FIRMWARE_TX);</div><div class='ctx'> </div><div class='hunk'>@@ -449,14 +441,6 @@ enum rx_desc_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Completion queue entry. */</div><div class='del'>-struct short_rx_done_desc {</div><div class='del'>-	__le32 status;			/* Low 16 bits is length. */</div><div class='del'>-};</div><div class='del'>-struct basic_rx_done_desc {</div><div class='del'>-	__le32 status;			/* Low 16 bits is length. */</div><div class='del'>-	__le16 vlanid;</div><div class='del'>-	__le16 status2;</div><div class='del'>-};</div><div class='ctx'> struct csum_rx_done_desc {</div><div class='ctx'> 	__le32 status;			/* Low 16 bits is length. */</div><div class='ctx'> 	__le16 csum;			/* Partial checksum */</div><div class='hunk'>@@ -576,7 +560,7 @@ static int	mdio_read(struct net_device *dev, int phy_id, int location);</div><div class='ctx'> static void	mdio_write(struct net_device *dev, int phy_id, int location, int value);</div><div class='ctx'> static int	netdev_open(struct net_device *dev);</div><div class='ctx'> static void	check_duplex(struct net_device *dev);</div><div class='del'>-static void	tx_timeout(struct net_device *dev);</div><div class='add'>+static void	tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void	init_ring(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static irqreturn_t intr_handler(int irq, void *dev_instance);</div><div class='hunk'>@@ -633,7 +617,7 @@ static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= netdev_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= netdev_ioctl,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> #ifdef VLAN_SUPPORT</div><div class='hunk'>@@ -649,18 +633,12 @@ static int starfire_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	struct netdev_private *np;</div><div class='ctx'> 	int i, irq, chip_idx = ent-&gt;driver_data;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	long ioaddr;</div><div class='ctx'> 	void __iomem *base;</div><div class='ctx'> 	int drv_flags, io_size;</div><div class='ctx'> 	int boguscnt;</div><div class='ctx'> </div><div class='del'>-/* when built into the kernel, we only print version if device is found */</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	static int printed_version;</div><div class='del'>-	if (!printed_version++)</div><div class='del'>-		printk(version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (pci_enable_device (pdev))</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='hunk'>@@ -711,7 +689,8 @@ static int starfire_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* Serial EEPROM reads are hidden by the hardware. */</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = readb(base + EEPROMCtrl + 20 - i);</div><div class='add'>+		addr[i] = readb(base + EEPROMCtrl + 20 - i);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> #if ! defined(final_version) /* Dump the EEPROM contents during development. */</div><div class='ctx'> 	if (debug &gt; 4)</div><div class='hunk'>@@ -785,7 +764,7 @@ static int starfire_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	dev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;np-&gt;napi, netdev_poll, max_interrupt_work);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;np-&gt;napi, netdev_poll, max_interrupt_work);</div><div class='ctx'> </div><div class='ctx'> 	if (mtu)</div><div class='ctx'> 		dev-&gt;mtu = mtu;</div><div class='hunk'>@@ -901,7 +880,9 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 		tx_ring_size = ((sizeof(starfire_tx_desc) * TX_RING_SIZE + QUEUE_ALIGN - 1) / QUEUE_ALIGN) * QUEUE_ALIGN;</div><div class='ctx'> 		rx_ring_size = sizeof(struct starfire_rx_desc) * RX_RING_SIZE;</div><div class='ctx'> 		np-&gt;queue_mem_size = tx_done_q_size + rx_done_q_size + tx_ring_size + rx_ring_size;</div><div class='del'>-		np-&gt;queue_mem = pci_alloc_consistent(np-&gt;pci_dev, np-&gt;queue_mem_size, &amp;np-&gt;queue_mem_dma);</div><div class='add'>+		np-&gt;queue_mem = dma_alloc_coherent(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+						   np-&gt;queue_mem_size,</div><div class='add'>+						   &amp;np-&gt;queue_mem_dma, GFP_ATOMIC);</div><div class='ctx'> 		if (np-&gt;queue_mem == NULL) {</div><div class='ctx'> 			free_irq(irq, dev);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -968,7 +949,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 	writew(0, ioaddr + PerfFilterTable + 4);</div><div class='ctx'> 	writew(0, ioaddr + PerfFilterTable + 8);</div><div class='ctx'> 	for (i = 1; i &lt; 16; i++) {</div><div class='del'>-		__be16 *eaddrs = (__be16 *)dev-&gt;dev_addr;</div><div class='add'>+		const __be16 *eaddrs = (const __be16 *)dev-&gt;dev_addr;</div><div class='ctx'> 		void __iomem *setup_frm = ioaddr + PerfFilterTable + i * 16;</div><div class='ctx'> 		writew(be16_to_cpu(eaddrs[2]), setup_frm); setup_frm += 4;</div><div class='ctx'> 		writew(be16_to_cpu(eaddrs[1]), setup_frm); setup_frm += 4;</div><div class='hunk'>@@ -1105,7 +1086,7 @@ static void check_duplex(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void tx_timeout(struct net_device *dev)</div><div class='add'>+static void tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base;</div><div class='hunk'>@@ -1151,9 +1132,11 @@ static void init_ring(struct net_device *dev)</div><div class='ctx'> 		np-&gt;rx_info[i].skb = skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='del'>-		np-&gt;rx_info[i].mapping = pci_map_single(np-&gt;pci_dev, skb-&gt;data, np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='del'>-		if (pci_dma_mapping_error(np-&gt;pci_dev,</div><div class='del'>-					  np-&gt;rx_info[i].mapping)) {</div><div class='add'>+		np-&gt;rx_info[i].mapping = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							skb-&gt;data,</div><div class='add'>+							np-&gt;rx_buf_sz,</div><div class='add'>+							DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;rx_info[i].mapping)) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;rx_info[i].skb = NULL;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1232,18 +1215,19 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			status |= skb_first_frag_len(skb) | (skb_num_frags(skb) &lt;&lt; 16);</div><div class='ctx'> </div><div class='ctx'> 			np-&gt;tx_info[entry].mapping =</div><div class='del'>-				pci_map_single(np-&gt;pci_dev, skb-&gt;data, skb_first_frag_len(skb), PCI_DMA_TODEVICE);</div><div class='add'>+				dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+					       skb_first_frag_len(skb),</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			const skb_frag_t *this_frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> 			status |= skb_frag_size(this_frag);</div><div class='ctx'> 			np-&gt;tx_info[entry].mapping =</div><div class='del'>-				pci_map_single(np-&gt;pci_dev,</div><div class='add'>+				dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					       skb_frag_address(this_frag),</div><div class='ctx'> 					       skb_frag_size(this_frag),</div><div class='del'>-					       PCI_DMA_TODEVICE);</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 		}</div><div class='del'>-		if (pci_dma_mapping_error(np-&gt;pci_dev,</div><div class='del'>-					  np-&gt;tx_info[entry].mapping)) {</div><div class='add'>+		if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;tx_info[entry].mapping)) {</div><div class='ctx'> 			dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1286,18 +1270,16 @@ err_out:</div><div class='ctx'> 	entry = prev_tx % TX_RING_SIZE;</div><div class='ctx'> 	np-&gt;tx_info[entry].skb = NULL;</div><div class='ctx'> 	if (i &gt; 0) {</div><div class='del'>-		pci_unmap_single(np-&gt;pci_dev,</div><div class='add'>+		dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 				 np-&gt;tx_info[entry].mapping,</div><div class='del'>-				 skb_first_frag_len(skb),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='add'>+				 skb_first_frag_len(skb), DMA_TO_DEVICE);</div><div class='ctx'> 		np-&gt;tx_info[entry].mapping = 0;</div><div class='ctx'> 		entry = (entry + np-&gt;tx_info[entry].used_slots) % TX_RING_SIZE;</div><div class='ctx'> 		for (j = 1; j &lt; i; j++) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev,</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					 np-&gt;tx_info[entry].mapping,</div><div class='del'>-					 skb_frag_size(</div><div class='del'>-						&amp;skb_shinfo(skb)-&gt;frags[j-1]),</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='add'>+					 skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[j - 1]),</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			entry++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1371,20 +1353,20 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)</div><div class='ctx'> 				u16 entry = (tx_status &amp; 0x7fff) / sizeof(starfire_tx_desc);</div><div class='ctx'> 				struct sk_buff *skb = np-&gt;tx_info[entry].skb;</div><div class='ctx'> 				np-&gt;tx_info[entry].skb = NULL;</div><div class='del'>-				pci_unmap_single(np-&gt;pci_dev,</div><div class='add'>+				dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 np-&gt;tx_info[entry].mapping,</div><div class='ctx'> 						 skb_first_frag_len(skb),</div><div class='del'>-						 PCI_DMA_TODEVICE);</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 				np-&gt;tx_info[entry].mapping = 0;</div><div class='ctx'> 				np-&gt;dirty_tx += np-&gt;tx_info[entry].used_slots;</div><div class='ctx'> 				entry = (entry + np-&gt;tx_info[entry].used_slots) % TX_RING_SIZE;</div><div class='ctx'> 				{</div><div class='ctx'> 					int i;</div><div class='ctx'> 					for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-						pci_unmap_single(np-&gt;pci_dev,</div><div class='add'>+						dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 								 np-&gt;tx_info[entry].mapping,</div><div class='ctx'> 								 skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]),</div><div class='del'>-								 PCI_DMA_TODEVICE);</div><div class='add'>+								 DMA_TO_DEVICE);</div><div class='ctx'> 						np-&gt;dirty_tx++;</div><div class='ctx'> 						entry++;</div><div class='ctx'> 					}</div><div class='hunk'>@@ -1476,16 +1458,18 @@ static int __netdev_rx(struct net_device *dev, int *quota)</div><div class='ctx'> 		if (pkt_len &lt; rx_copybreak &amp;&amp;</div><div class='ctx'> 		    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {</div><div class='ctx'> 			skb_reserve(skb, 2);	/* 16 byte align the IP header */</div><div class='del'>-			pci_dma_sync_single_for_cpu(np-&gt;pci_dev,</div><div class='del'>-						    np-&gt;rx_info[entry].mapping,</div><div class='del'>-						    pkt_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+						np-&gt;rx_info[entry].mapping,</div><div class='add'>+						pkt_len, DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_copy_to_linear_data(skb, np-&gt;rx_info[entry].skb-&gt;data, pkt_len);</div><div class='del'>-			pci_dma_sync_single_for_device(np-&gt;pci_dev,</div><div class='del'>-						       np-&gt;rx_info[entry].mapping,</div><div class='del'>-						       pkt_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+						   np-&gt;rx_info[entry].mapping,</div><div class='add'>+						   pkt_len, DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_put(skb, pkt_len);</div><div class='ctx'> 		} else {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev, np-&gt;rx_info[entry].mapping, np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 np-&gt;rx_info[entry].mapping,</div><div class='add'>+					 np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='ctx'> 			skb = np-&gt;rx_info[entry].skb;</div><div class='ctx'> 			skb_put(skb, pkt_len);</div><div class='ctx'> 			np-&gt;rx_info[entry].skb = NULL;</div><div class='hunk'>@@ -1603,9 +1587,9 @@ static void refill_rx_ring(struct net_device *dev)</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;	/* Better luck next round. */</div><div class='ctx'> 			np-&gt;rx_info[entry].mapping =</div><div class='del'>-				pci_map_single(np-&gt;pci_dev, skb-&gt;data, np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='del'>-			if (pci_dma_mapping_error(np-&gt;pci_dev,</div><div class='del'>-						np-&gt;rx_info[entry].mapping)) {</div><div class='add'>+				dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+					       np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+			if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;rx_info[entry].mapping)) {</div><div class='ctx'> 				dev_kfree_skb(skb);</div><div class='ctx'> 				np-&gt;rx_info[entry].skb = NULL;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1797,14 +1781,14 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	} else if (netdev_mc_count(dev) &lt;= 14) {</div><div class='ctx'> 		/* Use the 16 element perfect filter, skip first two entries. */</div><div class='ctx'> 		void __iomem *filter_addr = ioaddr + PerfFilterTable + 2 * 16;</div><div class='del'>-		__be16 *eaddrs;</div><div class='add'>+		const __be16 *eaddrs;</div><div class='ctx'> 		netdev_for_each_mc_addr(ha, dev) {</div><div class='ctx'> 			eaddrs = (__be16 *) ha-&gt;addr;</div><div class='ctx'> 			writew(be16_to_cpu(eaddrs[2]), filter_addr); filter_addr += 4;</div><div class='ctx'> 			writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;</div><div class='ctx'> 			writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 8;</div><div class='ctx'> 		}</div><div class='del'>-		eaddrs = (__be16 *)dev-&gt;dev_addr;</div><div class='add'>+		eaddrs = (const __be16 *)dev-&gt;dev_addr;</div><div class='ctx'> 		i = netdev_mc_count(dev) + 2;</div><div class='ctx'> 		while (i++ &lt; 16) {</div><div class='ctx'> 			writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 4;</div><div class='hunk'>@@ -1815,7 +1799,7 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Must use a multicast hash table. */</div><div class='ctx'> 		void __iomem *filter_addr;</div><div class='del'>-		__be16 *eaddrs;</div><div class='add'>+		const __be16 *eaddrs;</div><div class='ctx'> 		__le16 mc_filter[32] __attribute__ ((aligned(sizeof(long))));	/* Multicast hash filter */</div><div class='ctx'> </div><div class='ctx'> 		memset(mc_filter, 0, sizeof(mc_filter));</div><div class='hunk'>@@ -1829,7 +1813,7 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Clear the perfect filter list, skip first two entries. */</div><div class='ctx'> 		filter_addr = ioaddr + PerfFilterTable + 2 * 16;</div><div class='del'>-		eaddrs = (__be16 *)dev-&gt;dev_addr;</div><div class='add'>+		eaddrs = (const __be16 *)dev-&gt;dev_addr;</div><div class='ctx'> 		for (i = 2; i &lt; 16; i++) {</div><div class='ctx'> 			writew(be16_to_cpu(eaddrs[0]), filter_addr); filter_addr += 4;</div><div class='ctx'> 			writew(be16_to_cpu(eaddrs[1]), filter_addr); filter_addr += 4;</div><div class='hunk'>@@ -1852,9 +1836,8 @@ static int check_if_running(struct net_device *dev)</div><div class='ctx'> static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1979,7 +1962,9 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='ctx'> 		np-&gt;rx_ring[i].rxaddr = cpu_to_dma(0xBADF00D0); /* An invalid address. */</div><div class='ctx'> 		if (np-&gt;rx_info[i].skb != NULL) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev, np-&gt;rx_info[i].mapping, np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 np-&gt;rx_info[i].mapping,</div><div class='add'>+					 np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(np-&gt;rx_info[i].skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		np-&gt;rx_info[i].skb = NULL;</div><div class='hunk'>@@ -1989,9 +1974,8 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 		struct sk_buff *skb = np-&gt;tx_info[i].skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			continue;</div><div class='del'>-		pci_unmap_single(np-&gt;pci_dev,</div><div class='del'>-				 np-&gt;tx_info[i].mapping,</div><div class='del'>-				 skb_first_frag_len(skb), PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;tx_info[i].mapping,</div><div class='add'>+				 skb_first_frag_len(skb), DMA_TO_DEVICE);</div><div class='ctx'> 		np-&gt;tx_info[i].mapping = 0;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		np-&gt;tx_info[i].skb = NULL;</div><div class='hunk'>@@ -2000,28 +1984,21 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int starfire_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused starfire_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='ctx'> 		netdev_close(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_set_power_state(pdev, pci_choose_state(pdev,state));</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int starfire_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused starfire_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		netdev_open(dev);</div><div class='hunk'>@@ -2030,8 +2007,6 @@ static int starfire_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> static void starfire_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2043,7 +2018,8 @@ static void starfire_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;queue_mem)</div><div class='del'>-		pci_free_consistent(pdev, np-&gt;queue_mem_size, np-&gt;queue_mem, np-&gt;queue_mem_dma);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, np-&gt;queue_mem_size,</div><div class='add'>+				  np-&gt;queue_mem, np-&gt;queue_mem_dma);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* XXX: add wakeup code -- requires firmware for MagicPacket */</div><div class='hunk'>@@ -2056,15 +2032,13 @@ static void starfire_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	free_netdev(dev);			/* Will also free np!! */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(starfire_pm_ops, starfire_suspend, starfire_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver starfire_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.probe		= starfire_init_one,</div><div class='ctx'> 	.remove		= starfire_remove_one,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= starfire_suspend,</div><div class='del'>-	.resume		= starfire_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+	.driver.pm	= &amp;starfire_pm_ops,</div><div class='ctx'> 	.id_table	= starfire_pci_tbl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2073,8 +2047,6 @@ static int __init starfire_init (void)</div><div class='ctx'> {</div><div class='ctx'> /* when a module, this is printed whether or not devices are found in probe */</div><div class='ctx'> #ifdef MODULE</div><div class='del'>-	printk(version);</div><div class='del'>-</div><div class='ctx'> 	printk(KERN_INFO DRV_NAME ": polling (NAPI) enabled\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -2092,11 +2064,3 @@ static void __exit starfire_cleanup (void)</div><div class='ctx'> </div><div class='ctx'> module_init(starfire_init);</div><div class='ctx'> module_exit(starfire_cleanup);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- *  c-basic-offset: 8</div><div class='del'>- *  tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig<br/>new file mode 100644<br/>index 000000000000..760a9a60bc15<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adi/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/adi/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,29 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+#</div><div class='add'>+# Analog Devices device configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config NET_VENDOR_ADI</div><div class='add'>+	bool "Analog Devices devices"</div><div class='add'>+	default y</div><div class='add'>+	depends on SPI</div><div class='add'>+	help</div><div class='add'>+	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='add'>+</div><div class='add'>+	  Note that the answer to this question doesn't directly affect the</div><div class='add'>+	  kernel: saying N will just cause the configurator to skip all</div><div class='add'>+	  the questions about ADI devices. If you say Y, you will be asked</div><div class='add'>+	  for your specific card in the following questions.</div><div class='add'>+</div><div class='add'>+if NET_VENDOR_ADI</div><div class='add'>+</div><div class='add'>+config ADIN1110</div><div class='add'>+	tristate "Analog Devices ADIN1110 MAC-PHY"</div><div class='add'>+	depends on SPI &amp;&amp; NET_SWITCHDEV</div><div class='add'>+	select CRC8</div><div class='add'>+	select PHYLIB</div><div class='add'>+	help</div><div class='add'>+	  Say yes here to build support for Analog Devices ADIN1110</div><div class='add'>+	  Low Power 10BASE-T1L Ethernet MAC-PHY.</div><div class='add'>+</div><div class='add'>+endif # NET_VENDOR_ADI</div><div class='head'>diff --git a/drivers/net/ethernet/adi/Makefile b/drivers/net/ethernet/adi/Makefile<br/>new file mode 100644<br/>index 000000000000..d0383d94303c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adi/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/adi/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+#</div><div class='add'>+# Makefile for the Analog Devices network device drivers.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_ADIN1110) += adin1110.o</div><div class='head'>diff --git a/drivers/net/ethernet/adi/adin1110.c b/drivers/net/ethernet/adi/adin1110.c<br/>new file mode 100644<br/>index 000000000000..30f9d271e595<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/adi/adin1110.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/adi/adin1110.c</a></div><div class='hunk'>@@ -0,0 +1,1737 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause</div><div class='add'>+/* ADIN1110 Low Power 10BASE-T1L Ethernet MAC-PHY</div><div class='add'>+ * ADIN2111 2-Port Ethernet Switch with Integrated 10BASE-T1L PHY</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2021 Analog Devices Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitfield.h&gt;</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/crc8.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/regulator/consumer.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+</div><div class='add'>+#define ADIN1110_PHY_ID				0x1</div><div class='add'>+</div><div class='add'>+#define ADIN1110_RESET				0x03</div><div class='add'>+#define   ADIN1110_SWRESET			BIT(0)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_CONFIG1			0x04</div><div class='add'>+#define   ADIN1110_CONFIG1_SYNC			BIT(15)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_CONFIG2			0x06</div><div class='add'>+#define   ADIN2111_P2_FWD_UNK2HOST		BIT(12)</div><div class='add'>+#define   ADIN2111_PORT_CUT_THRU_EN		BIT(11)</div><div class='add'>+#define   ADIN1110_CRC_APPEND			BIT(5)</div><div class='add'>+#define   ADIN1110_FWD_UNK2HOST			BIT(2)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_STATUS0			0x08</div><div class='add'>+</div><div class='add'>+#define ADIN1110_STATUS1			0x09</div><div class='add'>+#define   ADIN2111_P2_RX_RDY			BIT(17)</div><div class='add'>+#define   ADIN1110_SPI_ERR			BIT(10)</div><div class='add'>+#define   ADIN1110_RX_RDY			BIT(4)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_IMASK1				0x0D</div><div class='add'>+#define   ADIN2111_RX_RDY_IRQ			BIT(17)</div><div class='add'>+#define   ADIN1110_SPI_ERR_IRQ			BIT(10)</div><div class='add'>+#define   ADIN1110_RX_RDY_IRQ			BIT(4)</div><div class='add'>+#define   ADIN1110_TX_RDY_IRQ			BIT(3)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_MDIOACC			0x20</div><div class='add'>+#define   ADIN1110_MDIO_TRDONE			BIT(31)</div><div class='add'>+#define   ADIN1110_MDIO_ST			GENMASK(29, 28)</div><div class='add'>+#define   ADIN1110_MDIO_OP			GENMASK(27, 26)</div><div class='add'>+#define   ADIN1110_MDIO_PRTAD			GENMASK(25, 21)</div><div class='add'>+#define   ADIN1110_MDIO_DEVAD			GENMASK(20, 16)</div><div class='add'>+#define   ADIN1110_MDIO_DATA			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_TX_FSIZE			0x30</div><div class='add'>+#define ADIN1110_TX				0x31</div><div class='add'>+#define ADIN1110_TX_SPACE			0x32</div><div class='add'>+</div><div class='add'>+#define ADIN1110_MAC_ADDR_FILTER_UPR		0x50</div><div class='add'>+#define   ADIN2111_MAC_ADDR_APPLY2PORT2		BIT(31)</div><div class='add'>+#define   ADIN1110_MAC_ADDR_APPLY2PORT		BIT(30)</div><div class='add'>+#define   ADIN2111_MAC_ADDR_TO_OTHER_PORT	BIT(17)</div><div class='add'>+#define   ADIN1110_MAC_ADDR_TO_HOST		BIT(16)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_MAC_ADDR_FILTER_LWR		0x51</div><div class='add'>+</div><div class='add'>+#define ADIN1110_MAC_ADDR_MASK_UPR		0x70</div><div class='add'>+#define ADIN1110_MAC_ADDR_MASK_LWR		0x71</div><div class='add'>+</div><div class='add'>+#define ADIN1110_RX_FSIZE			0x90</div><div class='add'>+#define ADIN1110_RX				0x91</div><div class='add'>+</div><div class='add'>+#define ADIN2111_RX_P2_FSIZE			0xC0</div><div class='add'>+#define ADIN2111_RX_P2				0xC1</div><div class='add'>+</div><div class='add'>+#define ADIN1110_CLEAR_STATUS0			0xFFF</div><div class='add'>+</div><div class='add'>+/* MDIO_OP codes */</div><div class='add'>+#define ADIN1110_MDIO_OP_WR			0x1</div><div class='add'>+#define ADIN1110_MDIO_OP_RD			0x3</div><div class='add'>+</div><div class='add'>+#define ADIN1110_CD				BIT(7)</div><div class='add'>+#define ADIN1110_WRITE				BIT(5)</div><div class='add'>+</div><div class='add'>+#define ADIN1110_MAX_BUFF			2048</div><div class='add'>+#define ADIN1110_MAX_FRAMES_READ		64</div><div class='add'>+#define ADIN1110_WR_HEADER_LEN			2</div><div class='add'>+#define ADIN1110_FRAME_HEADER_LEN		2</div><div class='add'>+#define ADIN1110_INTERNAL_SIZE_HEADER_LEN	2</div><div class='add'>+#define ADIN1110_RD_HEADER_LEN			3</div><div class='add'>+#define ADIN1110_REG_LEN			4</div><div class='add'>+#define ADIN1110_FEC_LEN			4</div><div class='add'>+</div><div class='add'>+#define ADIN1110_PHY_ID_VAL			0x0283BC91</div><div class='add'>+#define ADIN2111_PHY_ID_VAL			0x0283BCA1</div><div class='add'>+</div><div class='add'>+#define ADIN_MAC_MAX_PORTS			2</div><div class='add'>+#define ADIN_MAC_MAX_ADDR_SLOTS			16</div><div class='add'>+</div><div class='add'>+#define ADIN_MAC_MULTICAST_ADDR_SLOT		0</div><div class='add'>+#define ADIN_MAC_BROADCAST_ADDR_SLOT		1</div><div class='add'>+#define ADIN_MAC_P1_ADDR_SLOT			2</div><div class='add'>+#define ADIN_MAC_P2_ADDR_SLOT			3</div><div class='add'>+#define ADIN_MAC_FDB_ADDR_SLOT			4</div><div class='add'>+</div><div class='add'>+DECLARE_CRC8_TABLE(adin1110_crc_table);</div><div class='add'>+</div><div class='add'>+enum adin1110_chips_id {</div><div class='add'>+	ADIN1110_MAC = 0,</div><div class='add'>+	ADIN2111_MAC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adin1110_cfg {</div><div class='add'>+	enum adin1110_chips_id	id;</div><div class='add'>+	char			name[MDIO_NAME_SIZE];</div><div class='add'>+	u32			phy_ids[PHY_MAX_ADDR];</div><div class='add'>+	u32			ports_nr;</div><div class='add'>+	u32			phy_id_val;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adin1110_port_priv {</div><div class='add'>+	struct adin1110_priv		*priv;</div><div class='add'>+	struct net_device		*netdev;</div><div class='add'>+	struct net_device		*bridge;</div><div class='add'>+	struct phy_device		*phydev;</div><div class='add'>+	struct work_struct		tx_work;</div><div class='add'>+	u64				rx_packets;</div><div class='add'>+	u64				tx_packets;</div><div class='add'>+	u64				rx_bytes;</div><div class='add'>+	u64				tx_bytes;</div><div class='add'>+	struct work_struct		rx_mode_work;</div><div class='add'>+	u32				flags;</div><div class='add'>+	struct sk_buff_head		txq;</div><div class='add'>+	u32				nr;</div><div class='add'>+	u32				state;</div><div class='add'>+	struct adin1110_cfg		*cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adin1110_priv {</div><div class='add'>+	struct mutex			lock; /* protect spi */</div><div class='add'>+	spinlock_t			state_lock; /* protect RX mode */</div><div class='add'>+	struct mii_bus			*mii_bus;</div><div class='add'>+	struct spi_device		*spidev;</div><div class='add'>+	bool				append_crc;</div><div class='add'>+	struct adin1110_cfg		*cfg;</div><div class='add'>+	u32				tx_space;</div><div class='add'>+	u32				irq_mask;</div><div class='add'>+	bool				forwarding;</div><div class='add'>+	int				irq;</div><div class='add'>+	struct adin1110_port_priv	*ports[ADIN_MAC_MAX_PORTS];</div><div class='add'>+	char				mii_bus_name[MII_BUS_ID_SIZE];</div><div class='add'>+	u8				data[ADIN1110_MAX_BUFF] ____cacheline_aligned;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct adin1110_switchdev_event_work {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct switchdev_notifier_fdb_info fdb_info;</div><div class='add'>+	struct adin1110_port_priv *port_priv;</div><div class='add'>+	unsigned long event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct adin1110_cfg adin1110_cfgs[] = {</div><div class='add'>+	{</div><div class='add'>+		.id = ADIN1110_MAC,</div><div class='add'>+		.name = "adin1110",</div><div class='add'>+		.phy_ids = {1},</div><div class='add'>+		.ports_nr = 1,</div><div class='add'>+		.phy_id_val = ADIN1110_PHY_ID_VAL,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.id = ADIN2111_MAC,</div><div class='add'>+		.name = "adin2111",</div><div class='add'>+		.phy_ids = {1, 2},</div><div class='add'>+		.ports_nr = 2,</div><div class='add'>+		.phy_id_val = ADIN2111_PHY_ID_VAL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 adin1110_crc_data(u8 *data, u32 len)</div><div class='add'>+{</div><div class='add'>+	return crc8(adin1110_crc_table, data, len, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_read_reg(struct adin1110_priv *priv, u16 reg, u32 *val)</div><div class='add'>+{</div><div class='add'>+	u32 header_len = ADIN1110_RD_HEADER_LEN;</div><div class='add'>+	u32 read_len = ADIN1110_REG_LEN;</div><div class='add'>+	struct spi_transfer t = {0};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;data[0] = ADIN1110_CD | FIELD_GET(GENMASK(12, 8), reg);</div><div class='add'>+	priv-&gt;data[1] = FIELD_GET(GENMASK(7, 0), reg);</div><div class='add'>+	priv-&gt;data[2] = 0x00;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;append_crc) {</div><div class='add'>+		priv-&gt;data[2] = adin1110_crc_data(&amp;priv-&gt;data[0], 2);</div><div class='add'>+		priv-&gt;data[3] = 0x00;</div><div class='add'>+		header_len++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;append_crc)</div><div class='add'>+		read_len++;</div><div class='add'>+</div><div class='add'>+	memset(&amp;priv-&gt;data[header_len], 0, read_len);</div><div class='add'>+	t.tx_buf = &amp;priv-&gt;data[0];</div><div class='add'>+	t.rx_buf = &amp;priv-&gt;data[0];</div><div class='add'>+	t.len = read_len + header_len;</div><div class='add'>+</div><div class='add'>+	ret = spi_sync_transfer(priv-&gt;spidev, &amp;t, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;append_crc) {</div><div class='add'>+		u8 recv_crc;</div><div class='add'>+		u8 crc;</div><div class='add'>+</div><div class='add'>+		crc = adin1110_crc_data(&amp;priv-&gt;data[header_len],</div><div class='add'>+					ADIN1110_REG_LEN);</div><div class='add'>+		recv_crc = priv-&gt;data[header_len + ADIN1110_REG_LEN];</div><div class='add'>+</div><div class='add'>+		if (crc != recv_crc) {</div><div class='add'>+			dev_err_ratelimited(&amp;priv-&gt;spidev-&gt;dev, "CRC error.");</div><div class='add'>+			return -EBADMSG;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*val = get_unaligned_be32(&amp;priv-&gt;data[header_len]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_write_reg(struct adin1110_priv *priv, u16 reg, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 header_len = ADIN1110_WR_HEADER_LEN;</div><div class='add'>+	u32 write_len = ADIN1110_REG_LEN;</div><div class='add'>+</div><div class='add'>+	priv-&gt;data[0] = ADIN1110_CD | ADIN1110_WRITE | FIELD_GET(GENMASK(12, 8), reg);</div><div class='add'>+	priv-&gt;data[1] = FIELD_GET(GENMASK(7, 0), reg);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;append_crc) {</div><div class='add'>+		priv-&gt;data[2] = adin1110_crc_data(&amp;priv-&gt;data[0], header_len);</div><div class='add'>+		header_len++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	put_unaligned_be32(val, &amp;priv-&gt;data[header_len]);</div><div class='add'>+	if (priv-&gt;append_crc) {</div><div class='add'>+		priv-&gt;data[header_len + write_len] = adin1110_crc_data(&amp;priv-&gt;data[header_len],</div><div class='add'>+								       write_len);</div><div class='add'>+		write_len++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return spi_write(priv-&gt;spidev, &amp;priv-&gt;data[0], header_len + write_len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_set_bits(struct adin1110_priv *priv, u16 reg,</div><div class='add'>+			     unsigned long mask, unsigned long val)</div><div class='add'>+{</div><div class='add'>+	u32 write_val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, reg, &amp;write_val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_mask_bits(&amp;write_val, mask, val);</div><div class='add'>+</div><div class='add'>+	return adin1110_write_reg(priv, reg, write_val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_round_len(int len)</div><div class='add'>+{</div><div class='add'>+	/* can read/write only mutiples of 4 bytes of payload */</div><div class='add'>+	len = ALIGN(len, 4);</div><div class='add'>+</div><div class='add'>+	/* NOTE: ADIN1110_WR_HEADER_LEN should be used for write ops. */</div><div class='add'>+	if (len + ADIN1110_RD_HEADER_LEN &gt; ADIN1110_MAX_BUFF)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_read_fifo(struct adin1110_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 header_len = ADIN1110_RD_HEADER_LEN;</div><div class='add'>+	struct spi_transfer t = {0};</div><div class='add'>+	u32 frame_size_no_fcs;</div><div class='add'>+	struct sk_buff *rxb;</div><div class='add'>+	u32 frame_size;</div><div class='add'>+	int round_len;</div><div class='add'>+	u16 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;nr) {</div><div class='add'>+		reg = ADIN1110_RX;</div><div class='add'>+		ret = adin1110_read_reg(priv, ADIN1110_RX_FSIZE, &amp;frame_size);</div><div class='add'>+	} else {</div><div class='add'>+		reg = ADIN2111_RX_P2;</div><div class='add'>+		ret = adin1110_read_reg(priv, ADIN2111_RX_P2_FSIZE,</div><div class='add'>+					&amp;frame_size);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* The read frame size includes the extra 2 bytes</div><div class='add'>+	 * from the  ADIN1110 frame header.</div><div class='add'>+	 */</div><div class='add'>+	if (frame_size &lt; ADIN1110_FRAME_HEADER_LEN + ADIN1110_FEC_LEN)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	round_len = adin1110_round_len(frame_size);</div><div class='add'>+	if (round_len &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	frame_size_no_fcs = frame_size - ADIN1110_FRAME_HEADER_LEN - ADIN1110_FEC_LEN;</div><div class='add'>+	memset(priv-&gt;data, 0, ADIN1110_RD_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	priv-&gt;data[0] = ADIN1110_CD | FIELD_GET(GENMASK(12, 8), reg);</div><div class='add'>+	priv-&gt;data[1] = FIELD_GET(GENMASK(7, 0), reg);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;append_crc) {</div><div class='add'>+		priv-&gt;data[2] = adin1110_crc_data(&amp;priv-&gt;data[0], 2);</div><div class='add'>+		header_len++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxb = netdev_alloc_skb(port_priv-&gt;netdev, round_len + header_len);</div><div class='add'>+	if (!rxb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(rxb, frame_size_no_fcs + header_len + ADIN1110_FRAME_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	t.tx_buf = &amp;priv-&gt;data[0];</div><div class='add'>+	t.rx_buf = &amp;rxb-&gt;data[0];</div><div class='add'>+	t.len = header_len + round_len;</div><div class='add'>+</div><div class='add'>+	ret = spi_sync_transfer(priv-&gt;spidev, &amp;t, 1);</div><div class='add'>+	if (ret) {</div><div class='add'>+		kfree_skb(rxb);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(rxb, header_len + ADIN1110_FRAME_HEADER_LEN);</div><div class='add'>+	rxb-&gt;protocol = eth_type_trans(rxb, port_priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	if ((port_priv-&gt;flags &amp; IFF_ALLMULTI &amp;&amp; rxb-&gt;pkt_type == PACKET_MULTICAST) ||</div><div class='add'>+	    (port_priv-&gt;flags &amp; IFF_BROADCAST &amp;&amp; rxb-&gt;pkt_type == PACKET_BROADCAST))</div><div class='add'>+		rxb-&gt;offload_fwd_mark = port_priv-&gt;priv-&gt;forwarding;</div><div class='add'>+</div><div class='add'>+	netif_rx(rxb);</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;rx_bytes += frame_size - ADIN1110_FRAME_HEADER_LEN;</div><div class='add'>+	port_priv-&gt;rx_packets++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_write_fifo(struct adin1110_port_priv *port_priv,</div><div class='add'>+			       struct sk_buff *txb)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 header_len = ADIN1110_WR_HEADER_LEN;</div><div class='add'>+	__be16 frame_header;</div><div class='add'>+	int padding = 0;</div><div class='add'>+	int padded_len;</div><div class='add'>+	int round_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Pad frame to 64 byte length,</div><div class='add'>+	 * MAC nor PHY will otherwise add the</div><div class='add'>+	 * required padding.</div><div class='add'>+	 * The FEC will be added by the MAC internally.</div><div class='add'>+	 */</div><div class='add'>+	if (txb-&gt;len + ADIN1110_FEC_LEN &lt; 64)</div><div class='add'>+		padding = 64 - (txb-&gt;len + ADIN1110_FEC_LEN);</div><div class='add'>+</div><div class='add'>+	padded_len = txb-&gt;len + padding + ADIN1110_FRAME_HEADER_LEN;</div><div class='add'>+</div><div class='add'>+	round_len = adin1110_round_len(padded_len);</div><div class='add'>+	if (round_len &lt; 0)</div><div class='add'>+		return round_len;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_TX_FSIZE, padded_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(priv-&gt;data, 0, round_len + ADIN1110_WR_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	priv-&gt;data[0] = ADIN1110_CD | ADIN1110_WRITE;</div><div class='add'>+	priv-&gt;data[0] |= FIELD_GET(GENMASK(12, 8), ADIN1110_TX);</div><div class='add'>+	priv-&gt;data[1] = FIELD_GET(GENMASK(7, 0), ADIN1110_TX);</div><div class='add'>+	if (priv-&gt;append_crc) {</div><div class='add'>+		priv-&gt;data[2] = adin1110_crc_data(&amp;priv-&gt;data[0], 2);</div><div class='add'>+		header_len++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* mention the port on which to send the frame in the frame header */</div><div class='add'>+	frame_header = cpu_to_be16(port_priv-&gt;nr);</div><div class='add'>+	memcpy(&amp;priv-&gt;data[header_len], &amp;frame_header,</div><div class='add'>+	       ADIN1110_FRAME_HEADER_LEN);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;priv-&gt;data[header_len + ADIN1110_FRAME_HEADER_LEN],</div><div class='add'>+	       txb-&gt;data, txb-&gt;len);</div><div class='add'>+</div><div class='add'>+	ret = spi_write(priv-&gt;spidev, &amp;priv-&gt;data[0], round_len + header_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;tx_bytes += txb-&gt;len;</div><div class='add'>+	port_priv-&gt;tx_packets++;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_read_mdio_acc(struct adin1110_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_MDIOACC, &amp;val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_mdio_read(struct mii_bus *bus, int phy_id, int reg)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = bus-&gt;priv;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mdio_phy_id_is_c45(phy_id))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_OP, ADIN1110_MDIO_OP_RD);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_ST, 0x1);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_PRTAD, phy_id);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_DEVAD, reg);</div><div class='add'>+</div><div class='add'>+	/* write the clause 22 read command to the chip */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_MDIOACC, val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* ADIN1110_MDIO_TRDONE BIT of the ADIN1110_MDIOACC</div><div class='add'>+	 * register is set when the read is done.</div><div class='add'>+	 * After the transaction is done, ADIN1110_MDIO_DATA</div><div class='add'>+	 * bitfield of ADIN1110_MDIOACC register will contain</div><div class='add'>+	 * the requested register value.</div><div class='add'>+	 */</div><div class='add'>+	ret = readx_poll_timeout_atomic(adin1110_read_mdio_acc, priv, val,</div><div class='add'>+					(val &amp; ADIN1110_MDIO_TRDONE),</div><div class='add'>+					100, 30000);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return (val &amp; ADIN1110_MDIO_DATA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_mdio_write(struct mii_bus *bus, int phy_id,</div><div class='add'>+			       int reg, u16 reg_val)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = bus-&gt;priv;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (mdio_phy_id_is_c45(phy_id))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_OP, ADIN1110_MDIO_OP_WR);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_ST, 0x1);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_PRTAD, phy_id);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_DEVAD, reg);</div><div class='add'>+	val |= FIELD_PREP(ADIN1110_MDIO_DATA, reg_val);</div><div class='add'>+</div><div class='add'>+	/* write the clause 22 write command to the chip */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_MDIOACC, val);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout_atomic(adin1110_read_mdio_acc, priv, val,</div><div class='add'>+					 (val &amp; ADIN1110_MDIO_TRDONE),</div><div class='add'>+					 100, 30000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ADIN1110 MAC-PHY contains an ADIN1100 PHY.</div><div class='add'>+ * ADIN2111 MAC-PHY contains two ADIN1100 PHYs.</div><div class='add'>+ * By registering a new MDIO bus we allow the PAL to discover</div><div class='add'>+ * the encapsulated PHY and probe the ADIN1100 driver.</div><div class='add'>+ */</div><div class='add'>+static int adin1110_register_mdiobus(struct adin1110_priv *priv,</div><div class='add'>+				     struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct mii_bus *mii_bus;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mii_bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!mii_bus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snprintf(priv-&gt;mii_bus_name, MII_BUS_ID_SIZE, "%s-%u",</div><div class='add'>+		 priv-&gt;cfg-&gt;name, spi_get_chipselect(priv-&gt;spidev, 0));</div><div class='add'>+</div><div class='add'>+	mii_bus-&gt;name = priv-&gt;mii_bus_name;</div><div class='add'>+	mii_bus-&gt;read = adin1110_mdio_read;</div><div class='add'>+	mii_bus-&gt;write = adin1110_mdio_write;</div><div class='add'>+	mii_bus-&gt;priv = priv;</div><div class='add'>+	mii_bus-&gt;parent = dev;</div><div class='add'>+	mii_bus-&gt;phy_mask = ~((u32)GENMASK(2, 0));</div><div class='add'>+	snprintf(mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s", dev_name(dev));</div><div class='add'>+</div><div class='add'>+	ret = devm_mdiobus_register(dev, mii_bus);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mii_bus = mii_bus;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool adin1110_port_rx_ready(struct adin1110_port_priv *port_priv,</div><div class='add'>+				   u32 status)</div><div class='add'>+{</div><div class='add'>+	if (!netif_oper_up(port_priv-&gt;netdev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;nr)</div><div class='add'>+		return !!(status &amp; ADIN1110_RX_RDY);</div><div class='add'>+	else</div><div class='add'>+		return !!(status &amp; ADIN2111_P2_RX_RDY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_read_frames(struct adin1110_port_priv *port_priv,</div><div class='add'>+				 unsigned int budget)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 status1;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (budget) {</div><div class='add'>+		ret = adin1110_read_reg(priv, ADIN1110_STATUS1, &amp;status1);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		if (!adin1110_port_rx_ready(port_priv, status1))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ret = adin1110_read_fifo(port_priv);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		budget--;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_wake_queues(struct adin1110_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;cfg-&gt;ports_nr; i++)</div><div class='add'>+		netif_wake_queue(priv-&gt;ports[i]-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t adin1110_irq(int irq, void *p)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = p;</div><div class='add'>+	u32 status1;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_STATUS1, &amp;status1);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;append_crc &amp;&amp; (status1 &amp; ADIN1110_SPI_ERR))</div><div class='add'>+		dev_warn_ratelimited(&amp;priv-&gt;spidev-&gt;dev,</div><div class='add'>+				     "SPI CRC error on write.\n");</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_TX_SPACE, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* TX FIFO space is expressed in half-words */</div><div class='add'>+	priv-&gt;tx_space = 2 * val;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;cfg-&gt;ports_nr; i++) {</div><div class='add'>+		if (adin1110_port_rx_ready(priv-&gt;ports[i], status1))</div><div class='add'>+			adin1110_read_frames(priv-&gt;ports[i],</div><div class='add'>+					     ADIN1110_MAX_FRAMES_READ);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear IRQ sources */</div><div class='add'>+	adin1110_write_reg(priv, ADIN1110_STATUS0, ADIN1110_CLEAR_STATUS0);</div><div class='add'>+	adin1110_write_reg(priv, ADIN1110_STATUS1, priv-&gt;irq_mask);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;tx_space &gt; 0 &amp;&amp; ret &gt;= 0)</div><div class='add'>+		adin1110_wake_queues(priv);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ADIN1110 can filter up to 16 MAC addresses, mac_nr here is the slot used */</div><div class='add'>+static int adin1110_write_mac_address(struct adin1110_port_priv *port_priv,</div><div class='add'>+				      int mac_nr, const u8 *addr,</div><div class='add'>+				      u8 *mask, u32 port_rules)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 offset = mac_nr * 2;</div><div class='add'>+	u32 port_rules_mask;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;nr)</div><div class='add'>+		port_rules_mask = ADIN1110_MAC_ADDR_APPLY2PORT;</div><div class='add'>+	else</div><div class='add'>+		port_rules_mask = ADIN2111_MAC_ADDR_APPLY2PORT2;</div><div class='add'>+</div><div class='add'>+	if (port_rules &amp; port_rules_mask)</div><div class='add'>+		port_rules_mask |= ADIN1110_MAC_ADDR_TO_HOST | ADIN2111_MAC_ADDR_TO_OTHER_PORT;</div><div class='add'>+</div><div class='add'>+	port_rules_mask |= GENMASK(15, 0);</div><div class='add'>+	val = port_rules | get_unaligned_be16(&amp;addr[0]);</div><div class='add'>+	ret = adin1110_set_bits(priv, ADIN1110_MAC_ADDR_FILTER_UPR + offset,</div><div class='add'>+				port_rules_mask, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	val = get_unaligned_be32(&amp;addr[2]);</div><div class='add'>+	ret =  adin1110_write_reg(priv,</div><div class='add'>+				  ADIN1110_MAC_ADDR_FILTER_LWR + offset, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Only the first two MAC address slots support masking. */</div><div class='add'>+	if (mac_nr &lt; ADIN_MAC_P1_ADDR_SLOT) {</div><div class='add'>+		val = get_unaligned_be16(&amp;mask[0]);</div><div class='add'>+		ret = adin1110_write_reg(priv,</div><div class='add'>+					 ADIN1110_MAC_ADDR_MASK_UPR + offset,</div><div class='add'>+					 val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		val = get_unaligned_be32(&amp;mask[2]);</div><div class='add'>+		return adin1110_write_reg(priv,</div><div class='add'>+					  ADIN1110_MAC_ADDR_MASK_LWR + offset,</div><div class='add'>+					  val);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_clear_mac_address(struct adin1110_priv *priv, int mac_nr)</div><div class='add'>+{</div><div class='add'>+	u32 offset = mac_nr * 2;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_FILTER_UPR + offset, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret =  adin1110_write_reg(priv, ADIN1110_MAC_ADDR_FILTER_LWR + offset, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* only the first two MAC address slots are maskable */</div><div class='add'>+	if (mac_nr &lt;= 1) {</div><div class='add'>+		ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_MASK_UPR + offset, 0);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = adin1110_write_reg(priv, ADIN1110_MAC_ADDR_MASK_LWR + offset, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 adin1110_port_rules(struct adin1110_port_priv *port_priv,</div><div class='add'>+			       bool fw_to_host,</div><div class='add'>+			       bool fw_to_other_port)</div><div class='add'>+{</div><div class='add'>+	u32 port_rules = 0;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;nr)</div><div class='add'>+		port_rules |= ADIN1110_MAC_ADDR_APPLY2PORT;</div><div class='add'>+	else</div><div class='add'>+		port_rules |= ADIN2111_MAC_ADDR_APPLY2PORT2;</div><div class='add'>+</div><div class='add'>+	if (fw_to_host)</div><div class='add'>+		port_rules |= ADIN1110_MAC_ADDR_TO_HOST;</div><div class='add'>+</div><div class='add'>+	if (fw_to_other_port &amp;&amp; port_priv-&gt;priv-&gt;forwarding)</div><div class='add'>+		port_rules |= ADIN2111_MAC_ADDR_TO_OTHER_PORT;</div><div class='add'>+</div><div class='add'>+	return port_rules;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_multicast_filter(struct adin1110_port_priv *port_priv,</div><div class='add'>+				     int mac_nr, bool accept_multicast)</div><div class='add'>+{</div><div class='add'>+	u8 mask[ETH_ALEN] = {0};</div><div class='add'>+	u8 mac[ETH_ALEN] = {0};</div><div class='add'>+	u32 port_rules = 0;</div><div class='add'>+</div><div class='add'>+	mask[0] = BIT(0);</div><div class='add'>+	mac[0] = BIT(0);</div><div class='add'>+</div><div class='add'>+	if (accept_multicast &amp;&amp; port_priv-&gt;state == BR_STATE_FORWARDING)</div><div class='add'>+		port_rules = adin1110_port_rules(port_priv, true, true);</div><div class='add'>+</div><div class='add'>+	return adin1110_write_mac_address(port_priv, mac_nr, mac,</div><div class='add'>+					  mask, port_rules);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_broadcasts_filter(struct adin1110_port_priv *port_priv,</div><div class='add'>+				      int mac_nr, bool accept_broadcast)</div><div class='add'>+{</div><div class='add'>+	u32 port_rules = 0;</div><div class='add'>+	u8 mask[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(mask);</div><div class='add'>+</div><div class='add'>+	if (accept_broadcast &amp;&amp; port_priv-&gt;state == BR_STATE_FORWARDING)</div><div class='add'>+		port_rules = adin1110_port_rules(port_priv, true, true);</div><div class='add'>+</div><div class='add'>+	return adin1110_write_mac_address(port_priv, mac_nr, mask,</div><div class='add'>+					  mask, port_rules);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_set_mac_address(struct net_device *netdev,</div><div class='add'>+				    const unsigned char *dev_addr)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	u8 mask[ETH_ALEN];</div><div class='add'>+	u32 port_rules;</div><div class='add'>+	u32 mac_slot;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(dev_addr))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	eth_hw_addr_set(netdev, dev_addr);</div><div class='add'>+	eth_broadcast_addr(mask);</div><div class='add'>+</div><div class='add'>+	mac_slot = (!port_priv-&gt;nr) ?  ADIN_MAC_P1_ADDR_SLOT : ADIN_MAC_P2_ADDR_SLOT;</div><div class='add'>+	port_rules = adin1110_port_rules(port_priv, true, false);</div><div class='add'>+</div><div class='add'>+	return adin1110_write_mac_address(port_priv, mac_slot, netdev-&gt;dev_addr,</div><div class='add'>+					  mask, port_rules);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_ndo_set_mac_address(struct net_device *netdev, void *addr)</div><div class='add'>+{</div><div class='add'>+	struct sockaddr *sa = addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = eth_prepare_mac_addr_change(netdev, addr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return adin1110_set_mac_address(netdev, sa-&gt;sa_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)</div><div class='add'>+{</div><div class='add'>+	if (!netif_running(netdev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return phy_do_ioctl(netdev, rq, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_set_promisc_mode(struct adin1110_port_priv *port_priv,</div><div class='add'>+				     bool promisc)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	if (port_priv-&gt;state != BR_STATE_FORWARDING)</div><div class='add'>+		promisc = false;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;nr)</div><div class='add'>+		mask = ADIN1110_FWD_UNK2HOST;</div><div class='add'>+	else</div><div class='add'>+		mask = ADIN2111_P2_FWD_UNK2HOST;</div><div class='add'>+</div><div class='add'>+	return adin1110_set_bits(priv, ADIN1110_CONFIG2,</div><div class='add'>+				 mask, promisc ? mask : 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_setup_rx_mode(struct adin1110_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_set_promisc_mode(port_priv,</div><div class='add'>+					!!(port_priv-&gt;flags &amp; IFF_PROMISC));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_multicast_filter(port_priv, ADIN_MAC_MULTICAST_ADDR_SLOT,</div><div class='add'>+					!!(port_priv-&gt;flags &amp; IFF_ALLMULTI));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_broadcasts_filter(port_priv,</div><div class='add'>+					 ADIN_MAC_BROADCAST_ADDR_SLOT,</div><div class='add'>+					 !!(port_priv-&gt;flags &amp; IFF_BROADCAST));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return adin1110_set_bits(port_priv-&gt;priv, ADIN1110_CONFIG1,</div><div class='add'>+				 ADIN1110_CONFIG1_SYNC, ADIN1110_CONFIG1_SYNC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool adin1110_can_offload_forwarding(struct adin1110_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;cfg-&gt;id != ADIN2111_MAC)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Can't enable forwarding if ports do not belong to the same bridge */</div><div class='add'>+	if (priv-&gt;ports[0]-&gt;bridge != priv-&gt;ports[1]-&gt;bridge || !priv-&gt;ports[0]-&gt;bridge)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Can't enable forwarding if there is a port</div><div class='add'>+	 * that has been blocked by STP.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;cfg-&gt;ports_nr; i++) {</div><div class='add'>+		if (priv-&gt;ports[i]-&gt;state != BR_STATE_FORWARDING)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_rx_mode_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv;</div><div class='add'>+	struct adin1110_priv *priv;</div><div class='add'>+</div><div class='add'>+	port_priv = container_of(work, struct adin1110_port_priv, rx_mode_work);</div><div class='add'>+	priv = port_priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	adin1110_setup_rx_mode(port_priv);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;state_lock);</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;flags = dev-&gt;flags;</div><div class='add'>+	schedule_work(&amp;port_priv-&gt;rx_mode_work);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;priv-&gt;state_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_net_open(struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(net_dev);</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Configure MAC to compute and append the FCS itself. */</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_CONFIG2, ADIN1110_CRC_APPEND);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	val = ADIN1110_TX_RDY_IRQ | ADIN1110_RX_RDY_IRQ | ADIN1110_SPI_ERR_IRQ;</div><div class='add'>+	if (priv-&gt;cfg-&gt;id == ADIN2111_MAC)</div><div class='add'>+		val |= ADIN2111_RX_RDY_IRQ;</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq_mask = val;</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_IMASK1, ~val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(net_dev, "Failed to enable chip IRQs: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_TX_SPACE, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(net_dev, "Failed to read TX FIFO space: %d\n", ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;tx_space = 2 * val;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+	ret = adin1110_set_mac_address(net_dev, net_dev-&gt;dev_addr);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(net_dev, "Could not set MAC address: %pM, %d\n",</div><div class='add'>+			   net_dev-&gt;dev_addr, ret);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = adin1110_set_bits(priv, ADIN1110_CONFIG1, ADIN1110_CONFIG1_SYNC,</div><div class='add'>+				ADIN1110_CONFIG1_SYNC);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	phy_start(port_priv-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(net_dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_net_stop(struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(net_dev);</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u32 mask;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mask = !port_priv-&gt;nr ? ADIN2111_RX_RDY_IRQ : ADIN1110_RX_RDY_IRQ;</div><div class='add'>+</div><div class='add'>+	/* Disable RX RDY IRQs */</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ret = adin1110_set_bits(priv, ADIN1110_IMASK1, mask, mask);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(port_priv-&gt;netdev);</div><div class='add'>+	flush_work(&amp;port_priv-&gt;tx_work);</div><div class='add'>+	phy_stop(port_priv-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_tx_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv;</div><div class='add'>+	struct adin1110_priv *priv;</div><div class='add'>+	struct sk_buff *txb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	port_priv = container_of(work, struct adin1110_port_priv, tx_work);</div><div class='add'>+	priv = port_priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	while ((txb = skb_dequeue(&amp;port_priv-&gt;txq))) {</div><div class='add'>+		ret = adin1110_write_fifo(port_priv, txb);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			dev_err_ratelimited(&amp;priv-&gt;spidev-&gt;dev,</div><div class='add'>+					    "Frame write error: %d\n", ret);</div><div class='add'>+</div><div class='add'>+		dev_kfree_skb(txb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t adin1110_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	netdev_tx_t netdev_ret = NETDEV_TX_OK;</div><div class='add'>+	u32 tx_space_needed;</div><div class='add'>+</div><div class='add'>+	tx_space_needed = skb-&gt;len + ADIN1110_FRAME_HEADER_LEN + ADIN1110_INTERNAL_SIZE_HEADER_LEN;</div><div class='add'>+	if (tx_space_needed &gt; priv-&gt;tx_space) {</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+		netdev_ret = NETDEV_TX_BUSY;</div><div class='add'>+	} else {</div><div class='add'>+		priv-&gt;tx_space -= tx_space_needed;</div><div class='add'>+		skb_queue_tail(&amp;port_priv-&gt;txq, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;port_priv-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	return netdev_ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_ndo_get_stats64(struct net_device *dev,</div><div class='add'>+				     struct rtnl_link_stats64 *storage)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	storage-&gt;rx_packets = port_priv-&gt;rx_packets;</div><div class='add'>+	storage-&gt;tx_packets = port_priv-&gt;tx_packets;</div><div class='add'>+</div><div class='add'>+	storage-&gt;rx_bytes = port_priv-&gt;rx_bytes;</div><div class='add'>+	storage-&gt;tx_bytes = port_priv-&gt;tx_bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_port_get_port_parent_id(struct net_device *dev,</div><div class='add'>+					    struct netdev_phys_item_id *ppid)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+</div><div class='add'>+	ppid-&gt;id_len = strnlen(priv-&gt;mii_bus_name, MAX_PHYS_ITEM_ID_LEN);</div><div class='add'>+	memcpy(ppid-&gt;id, priv-&gt;mii_bus_name, ppid-&gt;id_len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_ndo_get_phys_port_name(struct net_device *dev,</div><div class='add'>+					   char *name, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snprintf(name, len, "p%d", port_priv-&gt;nr);</div><div class='add'>+	if (err &gt;= len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops adin1110_netdev_ops = {</div><div class='add'>+	.ndo_open		= adin1110_net_open,</div><div class='add'>+	.ndo_stop		= adin1110_net_stop,</div><div class='add'>+	.ndo_eth_ioctl		= adin1110_ioctl,</div><div class='add'>+	.ndo_start_xmit		= adin1110_start_xmit,</div><div class='add'>+	.ndo_set_mac_address	= adin1110_ndo_set_mac_address,</div><div class='add'>+	.ndo_set_rx_mode	= adin1110_set_rx_mode,</div><div class='add'>+	.ndo_validate_addr	= eth_validate_addr,</div><div class='add'>+	.ndo_get_stats64	= adin1110_ndo_get_stats64,</div><div class='add'>+	.ndo_get_port_parent_id	= adin1110_port_get_port_parent_id,</div><div class='add'>+	.ndo_get_phys_port_name	= adin1110_ndo_get_phys_port_name,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void adin1110_get_drvinfo(struct net_device *dev,</div><div class='add'>+				 struct ethtool_drvinfo *di)</div><div class='add'>+{</div><div class='add'>+	strscpy(di-&gt;driver, "ADIN1110", sizeof(di-&gt;driver));</div><div class='add'>+	strscpy(di-&gt;bus_info, dev_name(dev-&gt;dev.parent), sizeof(di-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops adin1110_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= adin1110_get_drvinfo,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_link_ksettings	= phy_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings	= phy_ethtool_set_link_ksettings,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void adin1110_adjust_link(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;link)</div><div class='add'>+		phy_print_status(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PHY ID is stored in the MAC registers too,</div><div class='add'>+ * check spi connection by reading it.</div><div class='add'>+ */</div><div class='add'>+static int adin1110_check_spi(struct adin1110_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	reset_gpio = devm_gpiod_get_optional(&amp;priv-&gt;spidev-&gt;dev, "reset",</div><div class='add'>+					     GPIOD_OUT_LOW);</div><div class='add'>+	if (reset_gpio) {</div><div class='add'>+		/* MISO pin is used for internal configuration, can't have</div><div class='add'>+		 * anyone else disturbing the SDO line.</div><div class='add'>+		 */</div><div class='add'>+		spi_bus_lock(priv-&gt;spidev-&gt;controller);</div><div class='add'>+</div><div class='add'>+		gpiod_set_value(reset_gpio, 1);</div><div class='add'>+		fsleep(10000);</div><div class='add'>+		gpiod_set_value(reset_gpio, 0);</div><div class='add'>+</div><div class='add'>+		/* Need to wait 90 ms before interacting with</div><div class='add'>+		 * the MAC after a HW reset.</div><div class='add'>+		 */</div><div class='add'>+		fsleep(90000);</div><div class='add'>+</div><div class='add'>+		spi_bus_unlock(priv-&gt;spidev-&gt;controller);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_PHY_ID, &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (val != priv-&gt;cfg-&gt;phy_id_val) {</div><div class='add'>+		dev_err(&amp;priv-&gt;spidev-&gt;dev, "PHY ID expected: %x, read: %x\n",</div><div class='add'>+			priv-&gt;cfg-&gt;phy_id_val, val);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_hw_forwarding(struct adin1110_priv *priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	priv-&gt;forwarding = enable;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;forwarding) {</div><div class='add'>+		for (i = ADIN_MAC_FDB_ADDR_SLOT; i &lt; ADIN_MAC_MAX_ADDR_SLOTS; i++) {</div><div class='add'>+			ret = adin1110_clear_mac_address(priv, i);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Forwarding is optimised when MAC runs in Cut Through mode. */</div><div class='add'>+	ret = adin1110_set_bits(priv, ADIN1110_CONFIG2,</div><div class='add'>+				ADIN2111_PORT_CUT_THRU_EN,</div><div class='add'>+				priv-&gt;forwarding ? ADIN2111_PORT_CUT_THRU_EN : 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;cfg-&gt;ports_nr; i++) {</div><div class='add'>+		ret = adin1110_setup_rx_mode(priv-&gt;ports[i]);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_port_bridge_join(struct adin1110_port_priv *port_priv,</div><div class='add'>+				     struct net_device *bridge)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;bridge = bridge;</div><div class='add'>+</div><div class='add'>+	if (adin1110_can_offload_forwarding(priv)) {</div><div class='add'>+		mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+		ret = adin1110_hw_forwarding(priv, true);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return adin1110_set_mac_address(port_priv-&gt;netdev, bridge-&gt;dev_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_port_bridge_leave(struct adin1110_port_priv *port_priv,</div><div class='add'>+				      struct net_device *bridge)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;bridge = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ret = adin1110_hw_forwarding(priv, false);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool adin1110_port_dev_check(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return dev-&gt;netdev_ops == &amp;adin1110_netdev_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_netdevice_event(struct notifier_block *unused,</div><div class='add'>+				    unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+	struct netdev_notifier_changeupper_info *info = ptr;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!adin1110_port_dev_check(dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_CHANGEUPPER:</div><div class='add'>+		if (netif_is_bridge_master(info-&gt;upper_dev)) {</div><div class='add'>+			if (info-&gt;linking)</div><div class='add'>+				ret = adin1110_port_bridge_join(port_priv, info-&gt;upper_dev);</div><div class='add'>+			else</div><div class='add'>+				ret = adin1110_port_bridge_leave(port_priv, info-&gt;upper_dev);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return notifier_from_errno(ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block adin1110_netdevice_nb = {</div><div class='add'>+	.notifier_call = adin1110_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void adin1110_disconnect_phy(void *data)</div><div class='add'>+{</div><div class='add'>+	phy_disconnect(data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_port_set_forwarding_state(struct adin1110_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;state = BR_STATE_FORWARDING;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+	ret = adin1110_set_mac_address(port_priv-&gt;netdev,</div><div class='add'>+				       port_priv-&gt;netdev-&gt;dev_addr);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (adin1110_can_offload_forwarding(priv))</div><div class='add'>+		ret = adin1110_hw_forwarding(priv, true);</div><div class='add'>+	else</div><div class='add'>+		ret = adin1110_setup_rx_mode(port_priv);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_port_set_blocking_state(struct adin1110_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	u8 mac[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00};</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u8 mask[ETH_ALEN];</div><div class='add'>+	u32 port_rules;</div><div class='add'>+	int mac_slot;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;state = BR_STATE_BLOCKING;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	mac_slot = (!port_priv-&gt;nr) ?  ADIN_MAC_P1_ADDR_SLOT : ADIN_MAC_P2_ADDR_SLOT;</div><div class='add'>+	ret = adin1110_clear_mac_address(priv, mac_slot);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_hw_forwarding(priv, false);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Allow only BPDUs to be passed to the CPU */</div><div class='add'>+	eth_broadcast_addr(mask);</div><div class='add'>+	port_rules = adin1110_port_rules(port_priv, true, false);</div><div class='add'>+	ret = adin1110_write_mac_address(port_priv, mac_slot, mac,</div><div class='add'>+					 mask, port_rules);</div><div class='add'>+out:</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ADIN1110/2111 does not have any native STP support.</div><div class='add'>+ * Listen for bridge core state changes and</div><div class='add'>+ * allow all frames to pass or only the BPDUs.</div><div class='add'>+ */</div><div class='add'>+static int adin1110_port_attr_stp_state_set(struct adin1110_port_priv *port_priv,</div><div class='add'>+					    u8 state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		return adin1110_port_set_forwarding_state(port_priv);</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		return adin1110_port_set_blocking_state(port_priv);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_port_attr_set(struct net_device *dev, const void *ctx,</div><div class='add'>+				  const struct switchdev_attr *attr,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	switch (attr-&gt;id) {</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_STP_STATE:</div><div class='add'>+		return adin1110_port_attr_stp_state_set(port_priv,</div><div class='add'>+							attr-&gt;u.stp_state);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_switchdev_blocking_event(struct notifier_block *unused,</div><div class='add'>+					     unsigned long event,</div><div class='add'>+					     void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (event == SWITCHDEV_PORT_ATTR_SET) {</div><div class='add'>+		ret = switchdev_handle_port_attr_set(netdev, ptr,</div><div class='add'>+						     adin1110_port_dev_check,</div><div class='add'>+						     adin1110_port_attr_set);</div><div class='add'>+</div><div class='add'>+		return notifier_from_errno(ret);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block adin1110_switchdev_blocking_notifier = {</div><div class='add'>+	.notifier_call = adin1110_switchdev_blocking_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void adin1110_fdb_offload_notify(struct net_device *netdev,</div><div class='add'>+					struct switchdev_notifier_fdb_info *rcv)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_notifier_fdb_info info = {};</div><div class='add'>+</div><div class='add'>+	info.addr = rcv-&gt;addr;</div><div class='add'>+	info.vid = rcv-&gt;vid;</div><div class='add'>+	info.offloaded = true;</div><div class='add'>+	call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED,</div><div class='add'>+				 netdev, &amp;info.info, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_fdb_add(struct adin1110_port_priv *port_priv,</div><div class='add'>+			    struct switchdev_notifier_fdb_info *fdb)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	struct adin1110_port_priv *other_port;</div><div class='add'>+	u8 mask[ETH_ALEN];</div><div class='add'>+	u32 port_rules;</div><div class='add'>+	int mac_nr;</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(port_priv-&gt;netdev,</div><div class='add'>+		   "DEBUG: %s: MACID = %pM vid = %u flags = %u %u -- port %d\n",</div><div class='add'>+		    __func__, fdb-&gt;addr, fdb-&gt;vid, fdb-&gt;added_by_user,</div><div class='add'>+		    fdb-&gt;offloaded, port_priv-&gt;nr);</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;forwarding)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (fdb-&gt;is_local)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Find free FDB slot on device. */</div><div class='add'>+	for (mac_nr = ADIN_MAC_FDB_ADDR_SLOT; mac_nr &lt; ADIN_MAC_MAX_ADDR_SLOTS; mac_nr++) {</div><div class='add'>+		ret = adin1110_read_reg(priv, ADIN1110_MAC_ADDR_FILTER_UPR + (mac_nr * 2), &amp;val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+		if (!val)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (mac_nr == ADIN_MAC_MAX_ADDR_SLOTS)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	other_port = priv-&gt;ports[!port_priv-&gt;nr];</div><div class='add'>+	port_rules = adin1110_port_rules(other_port, false, true);</div><div class='add'>+	eth_broadcast_addr(mask);</div><div class='add'>+</div><div class='add'>+	return adin1110_write_mac_address(other_port, mac_nr, (u8 *)fdb-&gt;addr,</div><div class='add'>+					  mask, port_rules);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_read_mac(struct adin1110_priv *priv, int mac_nr, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_MAC_ADDR_FILTER_UPR + (mac_nr * 2), &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	put_unaligned_be16(val, addr);</div><div class='add'>+</div><div class='add'>+	ret = adin1110_read_reg(priv, ADIN1110_MAC_ADDR_FILTER_LWR + (mac_nr * 2), &amp;val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	put_unaligned_be32(val, addr + 2);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_fdb_del(struct adin1110_port_priv *port_priv,</div><div class='add'>+			    struct switchdev_notifier_fdb_info *fdb)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_priv *priv = port_priv-&gt;priv;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int mac_nr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(port_priv-&gt;netdev,</div><div class='add'>+		   "DEBUG: %s: MACID = %pM vid = %u flags = %u %u -- port %d\n",</div><div class='add'>+		   __func__, fdb-&gt;addr, fdb-&gt;vid, fdb-&gt;added_by_user,</div><div class='add'>+		   fdb-&gt;offloaded, port_priv-&gt;nr);</div><div class='add'>+</div><div class='add'>+	if (fdb-&gt;is_local)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (mac_nr = ADIN_MAC_FDB_ADDR_SLOT; mac_nr &lt; ADIN_MAC_MAX_ADDR_SLOTS; mac_nr++) {</div><div class='add'>+		ret = adin1110_read_mac(priv, mac_nr, addr);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if (ether_addr_equal(addr, fdb-&gt;addr)) {</div><div class='add'>+			ret = adin1110_clear_mac_address(priv, mac_nr);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adin1110_switchdev_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct adin1110_switchdev_event_work *switchdev_work;</div><div class='add'>+	struct adin1110_port_priv *port_priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switchdev_work = container_of(work, struct adin1110_switchdev_event_work, work);</div><div class='add'>+	port_priv = switchdev_work-&gt;port_priv;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	switch (switchdev_work-&gt;event) {</div><div class='add'>+	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='add'>+		ret = adin1110_fdb_add(port_priv, &amp;switchdev_work-&gt;fdb_info);</div><div class='add'>+		if (!ret)</div><div class='add'>+			adin1110_fdb_offload_notify(port_priv-&gt;netdev,</div><div class='add'>+						    &amp;switchdev_work-&gt;fdb_info);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='add'>+		adin1110_fdb_del(port_priv, &amp;switchdev_work-&gt;fdb_info);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;priv-&gt;lock);</div><div class='add'>+</div><div class='add'>+	kfree(switchdev_work-&gt;fdb_info.addr);</div><div class='add'>+	kfree(switchdev_work);</div><div class='add'>+	dev_put(port_priv-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* called under rcu_read_lock() */</div><div class='add'>+static int adin1110_switchdev_event(struct notifier_block *unused,</div><div class='add'>+				    unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct adin1110_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct adin1110_switchdev_event_work *switchdev_work;</div><div class='add'>+	struct switchdev_notifier_fdb_info *fdb_info = ptr;</div><div class='add'>+</div><div class='add'>+	if (!adin1110_port_dev_check(netdev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);</div><div class='add'>+	if (WARN_ON(!switchdev_work))</div><div class='add'>+		return NOTIFY_BAD;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;switchdev_work-&gt;work, adin1110_switchdev_event_work);</div><div class='add'>+	switchdev_work-&gt;port_priv = port_priv;</div><div class='add'>+	switchdev_work-&gt;event = event;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='add'>+	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='add'>+		memcpy(&amp;switchdev_work-&gt;fdb_info, ptr,</div><div class='add'>+		       sizeof(switchdev_work-&gt;fdb_info));</div><div class='add'>+		switchdev_work-&gt;fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+		if (!switchdev_work-&gt;fdb_info.addr)</div><div class='add'>+			goto err_addr_alloc;</div><div class='add'>+</div><div class='add'>+		ether_addr_copy((u8 *)switchdev_work-&gt;fdb_info.addr,</div><div class='add'>+				fdb_info-&gt;addr);</div><div class='add'>+		dev_hold(netdev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		kfree(switchdev_work);</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(system_long_wq, &amp;switchdev_work-&gt;work);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+err_addr_alloc:</div><div class='add'>+	kfree(switchdev_work);</div><div class='add'>+	return NOTIFY_BAD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block adin1110_switchdev_notifier = {</div><div class='add'>+	.notifier_call = adin1110_switchdev_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void adin1110_unregister_notifiers(void)</div><div class='add'>+{</div><div class='add'>+	unregister_switchdev_blocking_notifier(&amp;adin1110_switchdev_blocking_notifier);</div><div class='add'>+	unregister_switchdev_notifier(&amp;adin1110_switchdev_notifier);</div><div class='add'>+	unregister_netdevice_notifier(&amp;adin1110_netdevice_nb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_setup_notifiers(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = register_netdevice_notifier(&amp;adin1110_netdevice_nb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = register_switchdev_notifier(&amp;adin1110_switchdev_notifier);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_netdev;</div><div class='add'>+</div><div class='add'>+	ret = register_switchdev_blocking_notifier(&amp;adin1110_switchdev_blocking_notifier);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto err_sdev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_sdev:</div><div class='add'>+	unregister_switchdev_notifier(&amp;adin1110_switchdev_notifier);</div><div class='add'>+</div><div class='add'>+err_netdev:</div><div class='add'>+	unregister_netdevice_notifier(&amp;adin1110_netdevice_nb);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_probe_netdevs(struct adin1110_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;priv-&gt;spidev-&gt;dev;</div><div class='add'>+	struct adin1110_port_priv *port_priv;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;cfg-&gt;ports_nr; i++) {</div><div class='add'>+		netdev = devm_alloc_etherdev(dev, sizeof(*port_priv));</div><div class='add'>+		if (!netdev)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		port_priv = netdev_priv(netdev);</div><div class='add'>+		port_priv-&gt;netdev = netdev;</div><div class='add'>+		port_priv-&gt;priv = priv;</div><div class='add'>+		port_priv-&gt;cfg = priv-&gt;cfg;</div><div class='add'>+		port_priv-&gt;nr = i;</div><div class='add'>+		priv-&gt;ports[i] = port_priv;</div><div class='add'>+		SET_NETDEV_DEV(netdev, dev);</div><div class='add'>+</div><div class='add'>+		ret = device_get_ethdev_address(dev, netdev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		netdev-&gt;irq = priv-&gt;spidev-&gt;irq;</div><div class='add'>+		INIT_WORK(&amp;port_priv-&gt;tx_work, adin1110_tx_work);</div><div class='add'>+		INIT_WORK(&amp;port_priv-&gt;rx_mode_work, adin1110_rx_mode_work);</div><div class='add'>+		skb_queue_head_init(&amp;port_priv-&gt;txq);</div><div class='add'>+</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+</div><div class='add'>+		netdev-&gt;if_port = IF_PORT_10BASET;</div><div class='add'>+		netdev-&gt;netdev_ops = &amp;adin1110_netdev_ops;</div><div class='add'>+		netdev-&gt;ethtool_ops = &amp;adin1110_ethtool_ops;</div><div class='add'>+		netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='add'>+		netdev-&gt;netns_immutable = true;</div><div class='add'>+</div><div class='add'>+		port_priv-&gt;phydev = get_phy_device(priv-&gt;mii_bus, i + 1, false);</div><div class='add'>+		if (IS_ERR(port_priv-&gt;phydev)) {</div><div class='add'>+			netdev_err(netdev, "Could not find PHY with device address: %d.\n", i);</div><div class='add'>+			return PTR_ERR(port_priv-&gt;phydev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port_priv-&gt;phydev = phy_connect(netdev,</div><div class='add'>+						phydev_name(port_priv-&gt;phydev),</div><div class='add'>+						adin1110_adjust_link,</div><div class='add'>+						PHY_INTERFACE_MODE_INTERNAL);</div><div class='add'>+		if (IS_ERR(port_priv-&gt;phydev)) {</div><div class='add'>+			netdev_err(netdev, "Could not connect PHY with device address: %d.\n", i);</div><div class='add'>+			return PTR_ERR(port_priv-&gt;phydev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = devm_add_action_or_reset(dev, adin1110_disconnect_phy,</div><div class='add'>+					       port_priv-&gt;phydev);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* ADIN1110 INT_N pin will be used to signal the host */</div><div class='add'>+	ret = devm_request_threaded_irq(dev, priv-&gt;spidev-&gt;irq, NULL,</div><div class='add'>+					adin1110_irq,</div><div class='add'>+					IRQF_TRIGGER_LOW | IRQF_ONESHOT,</div><div class='add'>+					dev_name(dev), priv);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;cfg-&gt;ports_nr; i++) {</div><div class='add'>+		ret = devm_register_netdev(dev, priv-&gt;ports[i]-&gt;netdev);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(dev, "Failed to register network device.\n");</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int adin1110_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	const struct spi_device_id *dev_id = spi_get_device_id(spi);</div><div class='add'>+	struct device *dev = &amp;spi-&gt;dev;</div><div class='add'>+	struct adin1110_priv *priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(struct adin1110_priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;spidev = spi;</div><div class='add'>+	priv-&gt;cfg = &amp;adin1110_cfgs[dev_id-&gt;driver_data];</div><div class='add'>+	spi-&gt;bits_per_word = 8;</div><div class='add'>+	spi-&gt;mode = SPI_MODE_0;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;state_lock);</div><div class='add'>+</div><div class='add'>+	/* use of CRC on control and data transactions is pin dependent */</div><div class='add'>+	priv-&gt;append_crc = device_property_read_bool(dev, "adi,spi-crc");</div><div class='add'>+	if (priv-&gt;append_crc)</div><div class='add'>+		crc8_populate_msb(adin1110_crc_table, 0x7);</div><div class='add'>+</div><div class='add'>+	ret = adin1110_check_spi(priv);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Probe SPI Read check failed: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = adin1110_write_reg(priv, ADIN1110_RESET, ADIN1110_SWRESET);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_register_mdiobus(priv, dev);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "Could not register MDIO bus %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return adin1110_probe_netdevs(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id adin1110_match_table[] = {</div><div class='add'>+	{ .compatible = "adi,adin1110" },</div><div class='add'>+	{ .compatible = "adi,adin2111" },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, adin1110_match_table);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id adin1110_spi_id[] = {</div><div class='add'>+	{ .name = "adin1110", .driver_data = ADIN1110_MAC },</div><div class='add'>+	{ .name = "adin2111", .driver_data = ADIN2111_MAC },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, adin1110_spi_id);</div><div class='add'>+</div><div class='add'>+static struct spi_driver adin1110_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "adin1110",</div><div class='add'>+		.of_match_table = adin1110_match_table,</div><div class='add'>+	},</div><div class='add'>+	.probe = adin1110_probe,</div><div class='add'>+	.id_table = adin1110_spi_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init adin1110_driver_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = adin1110_setup_notifiers();</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = spi_register_driver(&amp;adin1110_driver);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		adin1110_unregister_notifiers();</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit adin1110_exit(void)</div><div class='add'>+{</div><div class='add'>+	adin1110_unregister_notifiers();</div><div class='add'>+	spi_unregister_driver(&amp;adin1110_driver);</div><div class='add'>+}</div><div class='add'>+module_init(adin1110_driver_init);</div><div class='add'>+module_exit(adin1110_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("ADIN1110 Network driver");</div><div class='add'>+MODULE_AUTHOR("Alexandru Tachici &lt;alexandru.tachici@analog.com&gt;");</div><div class='add'>+MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/aeroflex/Kconfig b/drivers/net/ethernet/aeroflex/Kconfig<br/>index 2fa0a317266b..ea4be67f787b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aeroflex/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aeroflex/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aeroflex/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aeroflex/Kconfig</a></div><div class='hunk'>@@ -8,5 +8,5 @@ config GRETH</div><div class='ctx'> 	depends on SPARC</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.</div><div class='head'>diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c<br/>index 010a2f48aea5..a593adc16c78 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aeroflex/greth.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aeroflex/greth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aeroflex/greth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aeroflex/greth.c</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'>  * available in the GRLIB VHDL IP core library.</div><div class='ctx'>  *</div><div class='ctx'>  * Full documentation of both cores can be found here:</div><div class='del'>- * http://www.gaisler.com/products/grlib/grip.pdf</div><div class='add'>+ * https://www.gaisler.com/products/grlib/grip.pdf</div><div class='ctx'>  *</div><div class='ctx'>  * The Gigabit version supports scatter/gather DMA, any alignment of</div><div class='ctx'>  * buffers and checksum offloading.</div><div class='hunk'>@@ -29,9 +29,9 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='hunk'>@@ -110,7 +110,7 @@ static void greth_print_tx_packet(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 		print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1,</div><div class='ctx'> 			       skb_frag_address(&amp;skb_shinfo(skb)-&gt;frags[i]),</div><div class='del'>-			       skb_shinfo(skb)-&gt;frags[i].size, true);</div><div class='add'>+			       skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]), true);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -258,6 +258,7 @@ static int greth_init_rings(struct greth_private *greth)</div><div class='ctx'> 			if (dma_mapping_error(greth-&gt;dev, dma_addr)) {</div><div class='ctx'> 				if (netif_msg_ifup(greth))</div><div class='ctx'> 					dev_err(greth-&gt;dev, "Could not create initial DMA mapping\n");</div><div class='add'>+				dev_kfree_skb(skb);</div><div class='ctx'> 				goto cleanup;</div><div class='ctx'> 			}</div><div class='ctx'> 			greth-&gt;rx_skbuff[i] = skb;</div><div class='hunk'>@@ -483,7 +484,7 @@ greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb-&gt;len &gt; MAX_FRAME_SIZE)) {</div><div class='ctx'> 		dev-&gt;stats.tx_errors++;</div><div class='del'>-		goto out;</div><div class='add'>+		goto len_error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Save skb pointer. */</div><div class='hunk'>@@ -574,6 +575,7 @@ frag_map_error:</div><div class='ctx'> map_error:</div><div class='ctx'> 	if (net_ratelimit())</div><div class='ctx'> 		dev_warn(greth-&gt;dev, "Could not create TX DMA mapping\n");</div><div class='add'>+len_error:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> out:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1025,7 +1027,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	GRETH_REGSAVE(regs-&gt;esa_msb, dev-&gt;dev_addr[0] &lt;&lt; 8 | dev-&gt;dev_addr[1]);</div><div class='ctx'> 	GRETH_REGSAVE(regs-&gt;esa_lsb, dev-&gt;dev_addr[2] &lt;&lt; 24 | dev-&gt;dev_addr[3] &lt;&lt; 16 |</div><div class='ctx'> 		      dev-&gt;dev_addr[4] &lt;&lt; 8 | dev-&gt;dev_addr[5]);</div><div class='hunk'>@@ -1112,11 +1114,9 @@ static void greth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *in</div><div class='ctx'> {</div><div class='ctx'> 	struct greth_private *greth = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, dev_driver_string(greth-&gt;dev),</div><div class='add'>+	strscpy(info-&gt;driver, dev_driver_string(greth-&gt;dev),</div><div class='ctx'> 		sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, "revision: 1.0", sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, greth-&gt;dev-&gt;bus-&gt;name, sizeof(info-&gt;bus_info));</div><div class='del'>-	strlcpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, greth-&gt;dev-&gt;bus-&gt;name, sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void greth_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)</div><div class='hunk'>@@ -1348,6 +1348,7 @@ static int greth_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int tmp;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct greth_private));</div><div class='hunk'>@@ -1451,10 +1452,8 @@ static int greth_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == 6) {</div><div class='del'>-		const u8 *addr;</div><div class='del'>-</div><div class='del'>-		addr = of_get_mac_address(ofdev-&gt;dev.of_node);</div><div class='del'>-		if (!IS_ERR(addr)) {</div><div class='add'>+		err = of_get_mac_address(ofdev-&gt;dev.of_node, addr);</div><div class='add'>+		if (!err) {</div><div class='ctx'> 			for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 				macaddr[i] = (unsigned int) addr[i];</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1466,7 +1465,8 @@ static int greth_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = macaddr[i];</div><div class='add'>+		addr[i] = macaddr[i];</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	macaddr[5]++;</div><div class='ctx'> </div><div class='hunk'>@@ -1509,7 +1509,7 @@ static int greth_of_probe(struct platform_device *ofdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup NAPI */</div><div class='del'>-	netif_napi_add(dev, &amp;greth-&gt;napi, greth_poll, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;greth-&gt;napi, greth_poll);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1526,7 +1526,7 @@ error1:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int greth_of_remove(struct platform_device *of_dev)</div><div class='add'>+static void greth_of_remove(struct platform_device *of_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(of_dev);</div><div class='ctx'> 	struct greth_private *greth = netdev_priv(ndev);</div><div class='hunk'>@@ -1541,11 +1541,10 @@ static int greth_of_remove(struct platform_device *of_dev)</div><div class='ctx'> 	mdiobus_unregister(greth-&gt;mdio);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	of_iounmap(&amp;of_dev-&gt;resource[0], greth-&gt;regs, resource_size(&amp;of_dev-&gt;resource[0]));</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	free_netdev(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id greth_of_match[] = {</div><div class='head'>diff --git a/drivers/net/ethernet/agere/Kconfig b/drivers/net/ethernet/agere/Kconfig<br/>index 084c7190ce2f..9cd750184947 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/agere/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/agere/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/agere/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/agere/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_AGERE</div><div class='ctx'> 	bool "Agere devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -21,7 +21,8 @@ config ET131X</div><div class='ctx'> 	tristate "Agere ET-1310 Gigabit Ethernet support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Agere ET-1310 ethernet adapters.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='head'>diff --git a/drivers/net/ethernet/agere/et131x.c b/drivers/net/ethernet/agere/et131x.c<br/>index ea34bcb868b5..5c8217638dda 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/agere/et131x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/agere/et131x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/agere/et131x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/agere/et131x.c</a></div><div class='hunk'>@@ -714,11 +714,11 @@ static int et131x_init_eeprom(struct et131x_adapter *adapter)</div><div class='ctx'> 			 * gather additional information that normally would</div><div class='ctx'> 			 * come from the eeprom, like MAC Address</div><div class='ctx'> 			 */</div><div class='del'>-			adapter-&gt;has_eeprom = 0;</div><div class='add'>+			adapter-&gt;has_eeprom = false;</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	adapter-&gt;has_eeprom = 1;</div><div class='add'>+	adapter-&gt;has_eeprom = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the EEPROM for information regarding LED behavior. Refer to</div><div class='ctx'> 	 * et131x_xcvr_init() for its use.</div><div class='hunk'>@@ -950,7 +950,6 @@ static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)</div><div class='ctx'> 	u32 hash2 = 0;</div><div class='ctx'> 	u32 hash3 = 0;</div><div class='ctx'> 	u32 hash4 = 0;</div><div class='del'>-	u32 pm_csr;</div><div class='ctx'> </div><div class='ctx'> 	/* If ET131X_PACKET_TYPE_MULTICAST is specified, then we provision</div><div class='ctx'> 	 * the multi-cast LIST.  If it is NOT specified, (and "ALL" is not</div><div class='hunk'>@@ -984,7 +983,6 @@ static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Write out the new hash to the device */</div><div class='del'>-	pm_csr = readl(&amp;adapter-&gt;regs-&gt;global.pm_csr);</div><div class='ctx'> 	if (!et1310_in_phy_coma(adapter)) {</div><div class='ctx'> 		writel(hash1, &amp;rxmac-&gt;multi_hash1);</div><div class='ctx'> 		writel(hash2, &amp;rxmac-&gt;multi_hash2);</div><div class='hunk'>@@ -999,7 +997,6 @@ static void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)</div><div class='ctx'> 	u32 uni_pf1;</div><div class='ctx'> 	u32 uni_pf2;</div><div class='ctx'> 	u32 uni_pf3;</div><div class='del'>-	u32 pm_csr;</div><div class='ctx'> </div><div class='ctx'> 	/* Set up unicast packet filter reg 3 to be the first two octets of</div><div class='ctx'> 	 * the MAC address for both address</div><div class='hunk'>@@ -1025,7 +1022,6 @@ static void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)</div><div class='ctx'> 		  (adapter-&gt;addr[4] &lt;&lt; ET_RX_UNI_PF_ADDR1_5_SHIFT) |</div><div class='ctx'> 		   adapter-&gt;addr[5];</div><div class='ctx'> </div><div class='del'>-	pm_csr = readl(&amp;adapter-&gt;regs-&gt;global.pm_csr);</div><div class='ctx'> 	if (!et1310_in_phy_coma(adapter)) {</div><div class='ctx'> 		writel(uni_pf1, &amp;rxmac-&gt;uni_pf_addr1);</div><div class='ctx'> 		writel(uni_pf2, &amp;rxmac-&gt;uni_pf_addr2);</div><div class='hunk'>@@ -1110,7 +1106,7 @@ static void et1310_config_rxmac_regs(struct et131x_adapter *adapter)</div><div class='ctx'> 	writel(0, &amp;rxmac-&gt;mif_ctrl);</div><div class='ctx'> 	writel(0, &amp;rxmac-&gt;space_avail);</div><div class='ctx'> </div><div class='del'>-	/* Initialize the the mif_ctrl register</div><div class='add'>+	/* Initialize the mif_ctrl register</div><div class='ctx'> 	 * bit 3:  Receive code error. One or more nibbles were signaled as</div><div class='ctx'> 	 *	   errors  during the reception of the packet.  Clear this</div><div class='ctx'> 	 *	   bit in Gigabit, set it in 100Mbit.  This was derived</div><div class='hunk'>@@ -2362,7 +2358,7 @@ static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate memory for the TCB's (Transmit Control Block) */</div><div class='ctx'> 	tx_ring-&gt;tcb_ring = kcalloc(NUM_TCB, sizeof(struct tcb),</div><div class='del'>-				    GFP_ATOMIC | GFP_DMA);</div><div class='add'>+				    GFP_KERNEL | GFP_DMA);</div><div class='ctx'> 	if (!tx_ring-&gt;tcb_ring)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2417,16 +2413,18 @@ static void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)</div><div class='ctx'> 	kfree(tx_ring-&gt;tcb_ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MAX_TX_DESC_PER_PKT 24</div><div class='add'>+</div><div class='ctx'> /* nic_send_packet - NIC specific send handler for version B silicon. */</div><div class='ctx'> static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='del'>-	struct tx_desc desc[24];</div><div class='add'>+	struct tx_desc desc[MAX_TX_DESC_PER_PKT];</div><div class='ctx'> 	u32 frag = 0;</div><div class='ctx'> 	u32 thiscopy, remainder;</div><div class='ctx'> 	struct sk_buff *skb = tcb-&gt;skb;</div><div class='ctx'> 	u32 nr_frags = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='del'>-	struct skb_frag_struct *frags = &amp;skb_shinfo(skb)-&gt;frags[0];</div><div class='add'>+	skb_frag_t *frags = &amp;skb_shinfo(skb)-&gt;frags[0];</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;netdev-&gt;phydev;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	struct tx_ring *tx_ring = &amp;adapter-&gt;tx_ring;</div><div class='hunk'>@@ -2436,9 +2434,6 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)</div><div class='ctx'> 	 * more than 5 fragments.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	/* nr_frags should be no more than 18. */</div><div class='del'>-	BUILD_BUG_ON(MAX_SKB_FRAGS + 1 &gt; 23);</div><div class='del'>-</div><div class='ctx'> 	memset(desc, 0, sizeof(struct tx_desc) * (nr_frags + 1));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_frags; i++) {</div><div class='hunk'>@@ -2464,6 +2459,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)</div><div class='ctx'> 							  skb-&gt;data,</div><div class='ctx'> 							  skb_headlen(skb),</div><div class='ctx'> 							  DMA_TO_DEVICE);</div><div class='add'>+				if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						      dma_addr))</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 				desc[frag].addr_lo = lower_32_bits(dma_addr);</div><div class='ctx'> 				desc[frag].addr_hi = upper_32_bits(dma_addr);</div><div class='ctx'> 				frag++;</div><div class='hunk'>@@ -2473,6 +2472,10 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)</div><div class='ctx'> 							  skb-&gt;data,</div><div class='ctx'> 							  skb_headlen(skb) / 2,</div><div class='ctx'> 							  DMA_TO_DEVICE);</div><div class='add'>+				if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						      dma_addr))</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+</div><div class='ctx'> 				desc[frag].addr_lo = lower_32_bits(dma_addr);</div><div class='ctx'> 				desc[frag].addr_hi = upper_32_bits(dma_addr);</div><div class='ctx'> 				frag++;</div><div class='hunk'>@@ -2483,17 +2486,24 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)</div><div class='ctx'> 							  skb_headlen(skb) / 2,</div><div class='ctx'> 							  skb_headlen(skb) / 2,</div><div class='ctx'> 							  DMA_TO_DEVICE);</div><div class='add'>+				if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						      dma_addr))</div><div class='add'>+					goto unmap_first_out;</div><div class='add'>+</div><div class='ctx'> 				desc[frag].addr_lo = lower_32_bits(dma_addr);</div><div class='ctx'> 				desc[frag].addr_hi = upper_32_bits(dma_addr);</div><div class='ctx'> 				frag++;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			desc[frag].len_vlan = frags[i - 1].size;</div><div class='add'>+			desc[frag].len_vlan = skb_frag_size(&amp;frags[i - 1]);</div><div class='ctx'> 			dma_addr = skb_frag_dma_map(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 						    &amp;frags[i - 1],</div><div class='ctx'> 						    0,</div><div class='del'>-						    frags[i - 1].size,</div><div class='add'>+						    desc[frag].len_vlan,</div><div class='ctx'> 						    DMA_TO_DEVICE);</div><div class='add'>+			if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, dma_addr))</div><div class='add'>+				goto unmap_out;</div><div class='add'>+</div><div class='ctx'> 			desc[frag].addr_lo = lower_32_bits(dma_addr);</div><div class='ctx'> 			desc[frag].addr_hi = upper_32_bits(dma_addr);</div><div class='ctx'> 			frag++;</div><div class='hunk'>@@ -2583,6 +2593,27 @@ static int nic_send_packet(struct et131x_adapter *adapter, struct tcb *tcb)</div><div class='ctx'> 		       &amp;adapter-&gt;regs-&gt;global.watchdog_timer);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+unmap_out:</div><div class='add'>+	// Unmap the body of the packet with map_page</div><div class='add'>+	while (--i) {</div><div class='add'>+		frag--;</div><div class='add'>+		dma_addr = desc[frag].addr_lo;</div><div class='add'>+		dma_addr |= (u64)desc[frag].addr_hi &lt;&lt; 32;</div><div class='add'>+		dma_unmap_page(&amp;adapter-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+			       desc[frag].len_vlan, DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+unmap_first_out:</div><div class='add'>+	// Unmap the header with map_single</div><div class='add'>+	while (frag--) {</div><div class='add'>+		dma_addr = desc[frag].addr_lo;</div><div class='add'>+		dma_addr |= (u64)desc[frag].addr_hi &lt;&lt; 32;</div><div class='add'>+		dma_unmap_single(&amp;adapter-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+				 desc[frag].len_vlan, DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter)</div><div class='hunk'>@@ -2957,9 +2988,8 @@ static void et131x_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRIVER_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRIVER_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(info-&gt;driver, DRIVER_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3082,7 +3112,8 @@ err_out:</div><div class='ctx'>  */</div><div class='ctx'> static void et131x_error_timer_handler(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct et131x_adapter *adapter = from_timer(adapter, t, error_timer);</div><div class='add'>+	struct et131x_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							    error_timer);</div><div class='ctx'> 	struct phy_device *phydev = adapter-&gt;netdev-&gt;phydev;</div><div class='ctx'> </div><div class='ctx'> 	if (et1310_in_phy_coma(adapter)) {</div><div class='hunk'>@@ -3444,12 +3475,9 @@ static irqreturn_t et131x_isr(int irq, void *dev_id)</div><div class='ctx'> 		 * send a pause packet, otherwise just exit</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (adapter-&gt;flow == FLOW_TXONLY || adapter-&gt;flow == FLOW_BOTH) {</div><div class='del'>-			u32 pm_csr;</div><div class='del'>-</div><div class='ctx'> 			/* Tell the device to send a pause packet via the back</div><div class='ctx'> 			 * pressure register (bp req and bp xon/xoff)</div><div class='ctx'> 			 */</div><div class='del'>-			pm_csr = readl(&amp;iomem-&gt;global.pm_csr);</div><div class='ctx'> 			if (!et1310_in_phy_coma(adapter))</div><div class='ctx'> 				writel(3, &amp;iomem-&gt;txmac.bp_ctrl);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3648,16 +3676,7 @@ static int et131x_close(struct net_device *netdev)</div><div class='ctx'> 	free_irq(adapter-&gt;pdev-&gt;irq, netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the error timer */</div><div class='del'>-	return del_timer_sync(&amp;adapter-&gt;error_timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf,</div><div class='del'>-			int cmd)</div><div class='del'>-{</div><div class='del'>-	if (!netdev-&gt;phydev)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	return phy_mii_ioctl(netdev-&gt;phydev, reqbuf, cmd);</div><div class='add'>+	return timer_delete_sync(&amp;adapter-&gt;error_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* et131x_set_packet_filter - Configures the Rx Packet filtering */</div><div class='hunk'>@@ -3779,6 +3798,13 @@ static netdev_tx_t et131x_tx(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct tx_ring *tx_ring = &amp;adapter-&gt;tx_ring;</div><div class='ctx'> </div><div class='add'>+	/* This driver does not support TSO, it is very unlikely</div><div class='add'>+	 * this condition is true.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb_shinfo(skb)-&gt;nr_frags &gt; MAX_TX_DESC_PER_PKT - 2)) {</div><div class='add'>+		if (skb_linearize(skb))</div><div class='add'>+			goto drop_err;</div><div class='add'>+	}</div><div class='ctx'> 	/* stop the queue if it's getting full */</div><div class='ctx'> 	if (tx_ring-&gt;used &gt;= NUM_TCB - 1 &amp;&amp; !netif_queue_stopped(netdev))</div><div class='ctx'> 		netif_stop_queue(netdev);</div><div class='hunk'>@@ -3811,7 +3837,7 @@ drop_err:</div><div class='ctx'>  * specified by the 'tx_timeo" element in the net_device structure (see</div><div class='ctx'>  * et131x_alloc_device() to see how this value is set).</div><div class='ctx'>  */</div><div class='del'>-static void et131x_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void et131x_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct et131x_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct tx_ring *tx_ring = &amp;adapter-&gt;tx_ring;</div><div class='hunk'>@@ -3863,7 +3889,7 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	et131x_disable_txrx(netdev);</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	et131x_adapter_memory_free(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -3880,7 +3906,7 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	et131x_init_send(adapter);</div><div class='ctx'> 	et131x_hwaddr_init(adapter);</div><div class='del'>-	ether_addr_copy(netdev-&gt;dev_addr, adapter-&gt;addr);</div><div class='add'>+	eth_hw_addr_set(netdev, adapter-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Init the device with the new settings */</div><div class='ctx'> 	et131x_adapter_setup(adapter);</div><div class='hunk'>@@ -3899,7 +3925,7 @@ static const struct net_device_ops et131x_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_get_stats		= et131x_stats,</div><div class='del'>-	.ndo_do_ioctl		= et131x_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int et131x_pci_setup(struct pci_dev *pdev,</div><div class='hunk'>@@ -3931,10 +3957,9 @@ static int et131x_pci_setup(struct pci_dev *pdev,</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Check the DMA addressing support of this device */</div><div class='del'>-	if (dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64)) &amp;&amp;</div><div class='del'>-	    dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='add'>+	rc = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "No usable DMA addressing method\n");</div><div class='del'>-		rc = -EIO;</div><div class='ctx'> 		goto err_release_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3981,9 +4006,9 @@ static int et131x_pci_setup(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	et131x_init_send(adapter);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(netdev, &amp;adapter-&gt;napi, et131x_poll, 64);</div><div class='add'>+	netif_napi_add(netdev, &amp;adapter-&gt;napi, et131x_poll);</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(netdev-&gt;dev_addr, adapter-&gt;addr);</div><div class='add'>+	eth_hw_addr_set(netdev, adapter-&gt;addr);</div><div class='ctx'> </div><div class='ctx'> 	rc = -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -3994,8 +4019,7 @@ static int et131x_pci_setup(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;mii_bus-&gt;name = "et131x_eth_mii";</div><div class='del'>-	snprintf(adapter-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x",</div><div class='del'>-		 (adapter-&gt;pdev-&gt;bus-&gt;number &lt;&lt; 8) | adapter-&gt;pdev-&gt;devfn);</div><div class='add'>+	snprintf(adapter-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%x", pci_dev_id(adapter-&gt;pdev));</div><div class='ctx'> 	adapter-&gt;mii_bus-&gt;priv = netdev;</div><div class='ctx'> 	adapter-&gt;mii_bus-&gt;read = et131x_mdio_read;</div><div class='ctx'> 	adapter-&gt;mii_bus-&gt;write = et131x_mdio_write;</div><div class='head'>diff --git a/drivers/net/ethernet/agere/et131x.h b/drivers/net/ethernet/agere/et131x.h<br/>index be9a11c02526..d0e922584d8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/agere/et131x.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/agere/et131x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/agere/et131x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/agere/et131x.h</a></div><div class='hunk'>@@ -46,7 +46,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define DRIVER_NAME "et131x"</div><div class='del'>-#define DRIVER_VERSION "v2.0"</div><div class='ctx'> </div><div class='ctx'> /* EEPROM registers */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/airoha/Kconfig b/drivers/net/ethernet/airoha/Kconfig<br/>new file mode 100644<br/>index 000000000000..ad3ce501e7a5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+config NET_VENDOR_AIROHA</div><div class='add'>+	bool "Airoha devices"</div><div class='add'>+	depends on ARCH_AIROHA || COMPILE_TEST</div><div class='add'>+	help</div><div class='add'>+	  If you have a Airoha SoC with ethernet, say Y.</div><div class='add'>+</div><div class='add'>+if NET_VENDOR_AIROHA</div><div class='add'>+</div><div class='add'>+config NET_AIROHA_NPU</div><div class='add'>+	tristate "Airoha NPU support"</div><div class='add'>+	select WANT_DEV_COREDUMP</div><div class='add'>+	select REGMAP_MMIO</div><div class='add'>+	help</div><div class='add'>+	  This driver supports Airoha Network Processor (NPU) available</div><div class='add'>+	  on the Airoha Soc family.</div><div class='add'>+</div><div class='add'>+config NET_AIROHA</div><div class='add'>+	tristate "Airoha SoC Gigabit Ethernet support"</div><div class='add'>+	depends on NET_DSA || !NET_DSA</div><div class='add'>+	select NET_AIROHA_NPU</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	help</div><div class='add'>+	  This driver supports the gigabit ethernet MACs in the</div><div class='add'>+	  Airoha SoC family.</div><div class='add'>+</div><div class='add'>+config NET_AIROHA_FLOW_STATS</div><div class='add'>+	default y</div><div class='add'>+	bool "Airoha flow stats"</div><div class='add'>+	depends on NET_AIROHA &amp;&amp; NET_AIROHA_NPU</div><div class='add'>+	help</div><div class='add'>+	  Enable Aiorha flowtable statistic counters.</div><div class='add'>+</div><div class='add'>+endif #NET_VENDOR_AIROHA</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/Makefile b/drivers/net/ethernet/airoha/Makefile<br/>new file mode 100644<br/>index 000000000000..94468053e34b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/Makefile</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# Airoha for the Mediatek SoCs built-in ethernet macs</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_NET_AIROHA) += airoha-eth.o</div><div class='add'>+airoha-eth-y := airoha_eth.o airoha_ppe.o</div><div class='add'>+airoha-eth-$(CONFIG_DEBUG_FS) += airoha_ppe_debugfs.o</div><div class='add'>+obj-$(CONFIG_NET_AIROHA_NPU) += airoha_npu.o</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c<br/>new file mode 100644<br/>index 000000000000..75893c90a0a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/airoha_eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/airoha_eth.c</a></div><div class='hunk'>@@ -0,0 +1,3180 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/u64_stats_sync.h&gt;</div><div class='add'>+#include &lt;net/dst_metadata.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+#include &lt;uapi/linux/ppp_defs.h&gt;</div><div class='add'>+</div><div class='add'>+#include "airoha_regs.h"</div><div class='add'>+#include "airoha_eth.h"</div><div class='add'>+</div><div class='add'>+u32 airoha_rr(void __iomem *base, u32 offset)</div><div class='add'>+{</div><div class='add'>+	return readl(base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void airoha_wr(void __iomem *base, u32 offset, u32 val)</div><div class='add'>+{</div><div class='add'>+	writel(val, base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val)</div><div class='add'>+{</div><div class='add'>+	val |= (airoha_rr(base, offset) &amp; ~mask);</div><div class='add'>+	airoha_wr(base, offset, val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_set_irqmask(struct airoha_irq_bank *irq_bank,</div><div class='add'>+				    int index, u32 clear, u32 set)</div><div class='add'>+{</div><div class='add'>+	struct airoha_qdma *qdma = irq_bank-&gt;qdma;</div><div class='add'>+	int bank = irq_bank - &amp;qdma-&gt;irq_banks[0];</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (WARN_ON_ONCE(index &gt;= ARRAY_SIZE(irq_bank-&gt;irqmask)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;irq_bank-&gt;irq_lock, flags);</div><div class='add'>+</div><div class='add'>+	irq_bank-&gt;irqmask[index] &amp;= ~clear;</div><div class='add'>+	irq_bank-&gt;irqmask[index] |= set;</div><div class='add'>+	airoha_qdma_wr(qdma, REG_INT_ENABLE(bank, index),</div><div class='add'>+		       irq_bank-&gt;irqmask[index]);</div><div class='add'>+	/* Read irq_enable register in order to guarantee the update above</div><div class='add'>+	 * completes in the spinlock critical section.</div><div class='add'>+	 */</div><div class='add'>+	airoha_qdma_rr(qdma, REG_INT_ENABLE(bank, index));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;irq_bank-&gt;irq_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_irq_enable(struct airoha_irq_bank *irq_bank,</div><div class='add'>+				   int index, u32 mask)</div><div class='add'>+{</div><div class='add'>+	airoha_qdma_set_irqmask(irq_bank, index, 0, mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_irq_disable(struct airoha_irq_bank *irq_bank,</div><div class='add'>+				    int index, u32 mask)</div><div class='add'>+{</div><div class='add'>+	airoha_qdma_set_irqmask(irq_bank, index, mask, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+	u32 val, reg;</div><div class='add'>+</div><div class='add'>+	reg = airhoa_is_lan_gdm_port(port) ? REG_FE_LAN_MAC_H</div><div class='add'>+					   : REG_FE_WAN_MAC_H;</div><div class='add'>+	val = (addr[0] &lt;&lt; 16) | (addr[1] &lt;&lt; 8) | addr[2];</div><div class='add'>+	airoha_fe_wr(eth, reg, val);</div><div class='add'>+</div><div class='add'>+	val = (addr[3] &lt;&lt; 16) | (addr[4] &lt;&lt; 8) | addr[5];</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_MAC_LMIN(reg), val);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_MAC_LMAX(reg), val);</div><div class='add'>+</div><div class='add'>+	airoha_ppe_init_upd_mem(port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_set_gdm_port_fwd_cfg(struct airoha_eth *eth, u32 addr,</div><div class='add'>+					u32 val)</div><div class='add'>+{</div><div class='add'>+	airoha_fe_rmw(eth, addr, GDM_OCFQ_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_OCFQ_MASK, val));</div><div class='add'>+	airoha_fe_rmw(eth, addr, GDM_MCFQ_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_MCFQ_MASK, val));</div><div class='add'>+	airoha_fe_rmw(eth, addr, GDM_BCFQ_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_BCFQ_MASK, val));</div><div class='add'>+	airoha_fe_rmw(eth, addr, GDM_UCFQ_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_UCFQ_MASK, val));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_set_vip_for_gdm_port(struct airoha_gdm_port *port,</div><div class='add'>+				       bool enable)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+	u32 vip_port;</div><div class='add'>+</div><div class='add'>+	switch (port-&gt;id) {</div><div class='add'>+	case 3:</div><div class='add'>+		/* FIXME: handle XSI_PCIE1_PORT */</div><div class='add'>+		vip_port = XSI_PCIE0_VIP_PORT_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		/* FIXME: handle XSI_USB_PORT */</div><div class='add'>+		vip_port = XSI_ETH_VIP_PORT_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		airoha_fe_set(eth, REG_FE_VIP_PORT_EN, vip_port);</div><div class='add'>+		airoha_fe_set(eth, REG_FE_IFC_PORT_EN, vip_port);</div><div class='add'>+	} else {</div><div class='add'>+		airoha_fe_clear(eth, REG_FE_VIP_PORT_EN, vip_port);</div><div class='add'>+		airoha_fe_clear(eth, REG_FE_IFC_PORT_EN, vip_port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_fe_maccr_init(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	int p;</div><div class='add'>+</div><div class='add'>+	for (p = 1; p &lt;= ARRAY_SIZE(eth-&gt;ports); p++)</div><div class='add'>+		airoha_fe_set(eth, REG_GDM_FWD_CFG(p),</div><div class='add'>+			      GDM_TCP_CKSUM_MASK | GDM_UDP_CKSUM_MASK |</div><div class='add'>+			      GDM_IP4_CKSUM_MASK | GDM_DROP_CRC_ERR_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_VLAN_CTRL(1), CDM_VLAN_MASK,</div><div class='add'>+		      FIELD_PREP(CDM_VLAN_MASK, 0x8100));</div><div class='add'>+</div><div class='add'>+	airoha_fe_set(eth, REG_FE_CPORT_CFG, FE_CPORT_PAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_fe_vip_setup(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(3), ETH_P_PPP_DISC);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(3), PATN_FCPU_EN_MASK | PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(4), PPP_LCP);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(4),</div><div class='add'>+		     PATN_FCPU_EN_MASK | FIELD_PREP(PATN_TYPE_MASK, 1) |</div><div class='add'>+		     PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(6), PPP_IPCP);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(6),</div><div class='add'>+		     PATN_FCPU_EN_MASK | FIELD_PREP(PATN_TYPE_MASK, 1) |</div><div class='add'>+		     PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(7), PPP_CHAP);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(7),</div><div class='add'>+		     PATN_FCPU_EN_MASK | FIELD_PREP(PATN_TYPE_MASK, 1) |</div><div class='add'>+		     PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	/* BOOTP (0x43) */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(8), 0x43);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(8),</div><div class='add'>+		     PATN_FCPU_EN_MASK | PATN_SP_EN_MASK |</div><div class='add'>+		     FIELD_PREP(PATN_TYPE_MASK, 4) | PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	/* BOOTP (0x44) */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(9), 0x44);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(9),</div><div class='add'>+		     PATN_FCPU_EN_MASK | PATN_SP_EN_MASK |</div><div class='add'>+		     FIELD_PREP(PATN_TYPE_MASK, 4) | PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	/* ISAKMP */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(10), 0x1f401f4);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(10),</div><div class='add'>+		     PATN_FCPU_EN_MASK | PATN_DP_EN_MASK | PATN_SP_EN_MASK |</div><div class='add'>+		     FIELD_PREP(PATN_TYPE_MASK, 4) | PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(11), PPP_IPV6CP);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(11),</div><div class='add'>+		     PATN_FCPU_EN_MASK | FIELD_PREP(PATN_TYPE_MASK, 1) |</div><div class='add'>+		     PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	/* DHCPv6 */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(12), 0x2220223);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(12),</div><div class='add'>+		     PATN_FCPU_EN_MASK | PATN_DP_EN_MASK | PATN_SP_EN_MASK |</div><div class='add'>+		     FIELD_PREP(PATN_TYPE_MASK, 4) | PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(19), PPP_PAP);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(19),</div><div class='add'>+		     PATN_FCPU_EN_MASK | FIELD_PREP(PATN_TYPE_MASK, 1) |</div><div class='add'>+		     PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	/* ETH-&gt;ETH_P_1905 (0x893a) */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(20), 0x893a);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(20),</div><div class='add'>+		     PATN_FCPU_EN_MASK | PATN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_PATN(21), ETH_P_LLDP);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_VIP_EN(21),</div><div class='add'>+		     PATN_FCPU_EN_MASK | PATN_EN_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_fe_get_pse_queue_rsv_pages(struct airoha_eth *eth,</div><div class='add'>+					     u32 port, u32 queue)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_PSE_QUEUE_CFG_WR,</div><div class='add'>+		      PSE_CFG_PORT_ID_MASK | PSE_CFG_QUEUE_ID_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_CFG_PORT_ID_MASK, port) |</div><div class='add'>+		      FIELD_PREP(PSE_CFG_QUEUE_ID_MASK, queue));</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_PSE_QUEUE_CFG_VAL);</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(PSE_CFG_OQ_RSV_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_fe_set_pse_queue_rsv_pages(struct airoha_eth *eth,</div><div class='add'>+					      u32 port, u32 queue, u32 val)</div><div class='add'>+{</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_PSE_QUEUE_CFG_VAL, PSE_CFG_OQ_RSV_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_CFG_OQ_RSV_MASK, val));</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_PSE_QUEUE_CFG_WR,</div><div class='add'>+		      PSE_CFG_PORT_ID_MASK | PSE_CFG_QUEUE_ID_MASK |</div><div class='add'>+		      PSE_CFG_WR_EN_MASK | PSE_CFG_OQRSV_SEL_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_CFG_PORT_ID_MASK, port) |</div><div class='add'>+		      FIELD_PREP(PSE_CFG_QUEUE_ID_MASK, queue) |</div><div class='add'>+		      PSE_CFG_WR_EN_MASK | PSE_CFG_OQRSV_SEL_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_fe_get_pse_all_rsv(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	u32 val = airoha_fe_rr(eth, REG_FE_PSE_BUF_SET);</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(PSE_ALLRSV_MASK, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_fe_set_pse_oq_rsv(struct airoha_eth *eth,</div><div class='add'>+				    u32 port, u32 queue, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 orig_val = airoha_fe_get_pse_queue_rsv_pages(eth, port, queue);</div><div class='add'>+	u32 tmp, all_rsv, fq_limit;</div><div class='add'>+</div><div class='add'>+	airoha_fe_set_pse_queue_rsv_pages(eth, port, queue, val);</div><div class='add'>+</div><div class='add'>+	/* modify all rsv */</div><div class='add'>+	all_rsv = airoha_fe_get_pse_all_rsv(eth);</div><div class='add'>+	all_rsv += (val - orig_val);</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_PSE_BUF_SET, PSE_ALLRSV_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_ALLRSV_MASK, all_rsv));</div><div class='add'>+</div><div class='add'>+	/* modify hthd */</div><div class='add'>+	tmp = airoha_fe_rr(eth, PSE_FQ_CFG);</div><div class='add'>+	fq_limit = FIELD_GET(PSE_FQ_LIMIT_MASK, tmp);</div><div class='add'>+	tmp = fq_limit - all_rsv - 0x20;</div><div class='add'>+	airoha_fe_rmw(eth, REG_PSE_SHARE_USED_THD,</div><div class='add'>+		      PSE_SHARE_USED_HTHD_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_SHARE_USED_HTHD_MASK, tmp));</div><div class='add'>+</div><div class='add'>+	tmp = fq_limit - all_rsv - 0x100;</div><div class='add'>+	airoha_fe_rmw(eth, REG_PSE_SHARE_USED_THD,</div><div class='add'>+		      PSE_SHARE_USED_MTHD_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_SHARE_USED_MTHD_MASK, tmp));</div><div class='add'>+	tmp = (3 * tmp) &gt;&gt; 2;</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_PSE_BUF_SET,</div><div class='add'>+		      PSE_SHARE_USED_LTHD_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_SHARE_USED_LTHD_MASK, tmp));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_fe_pse_ports_init(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	const u32 pse_port_num_queues[] = {</div><div class='add'>+		[FE_PSE_PORT_CDM1] = 6,</div><div class='add'>+		[FE_PSE_PORT_GDM1] = 6,</div><div class='add'>+		[FE_PSE_PORT_GDM2] = 32,</div><div class='add'>+		[FE_PSE_PORT_GDM3] = 6,</div><div class='add'>+		[FE_PSE_PORT_PPE1] = 4,</div><div class='add'>+		[FE_PSE_PORT_CDM2] = 6,</div><div class='add'>+		[FE_PSE_PORT_CDM3] = 8,</div><div class='add'>+		[FE_PSE_PORT_CDM4] = 10,</div><div class='add'>+		[FE_PSE_PORT_PPE2] = 4,</div><div class='add'>+		[FE_PSE_PORT_GDM4] = 2,</div><div class='add'>+		[FE_PSE_PORT_CDM5] = 2,</div><div class='add'>+	};</div><div class='add'>+	u32 all_rsv;</div><div class='add'>+	int q;</div><div class='add'>+</div><div class='add'>+	all_rsv = airoha_fe_get_pse_all_rsv(eth);</div><div class='add'>+	if (airoha_ppe_is_enabled(eth, 1)) {</div><div class='add'>+		/* hw misses PPE2 oq rsv */</div><div class='add'>+		all_rsv += PSE_RSV_PAGES *</div><div class='add'>+			   pse_port_num_queues[FE_PSE_PORT_PPE2];</div><div class='add'>+	}</div><div class='add'>+	airoha_fe_set(eth, REG_FE_PSE_BUF_SET, all_rsv);</div><div class='add'>+</div><div class='add'>+	/* CMD1 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_CDM1]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_CDM1, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+	/* GMD1 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_GDM1]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_GDM1, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+	/* GMD2 */</div><div class='add'>+	for (q = 6; q &lt; pse_port_num_queues[FE_PSE_PORT_GDM2]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_GDM2, q, 0);</div><div class='add'>+	/* GMD3 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_GDM3]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_GDM3, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+	/* PPE1 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_PPE1]; q++) {</div><div class='add'>+		if (q &lt; pse_port_num_queues[FE_PSE_PORT_PPE1])</div><div class='add'>+			airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_PPE1, q,</div><div class='add'>+						 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+		else</div><div class='add'>+			airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_PPE1, q, 0);</div><div class='add'>+	}</div><div class='add'>+	/* CDM2 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_CDM2]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_CDM2, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+	/* CDM3 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_CDM3] - 1; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_CDM3, q, 0);</div><div class='add'>+	/* CDM4 */</div><div class='add'>+	for (q = 4; q &lt; pse_port_num_queues[FE_PSE_PORT_CDM4]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_CDM4, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+	if (airoha_ppe_is_enabled(eth, 1)) {</div><div class='add'>+		/* PPE2 */</div><div class='add'>+		for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_PPE2]; q++) {</div><div class='add'>+			if (q &lt; pse_port_num_queues[FE_PSE_PORT_PPE2] / 2)</div><div class='add'>+				airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_PPE2,</div><div class='add'>+							 q,</div><div class='add'>+							 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+			else</div><div class='add'>+				airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_PPE2,</div><div class='add'>+							 q, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	/* GMD4 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_GDM4]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_GDM4, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+	/* CDM5 */</div><div class='add'>+	for (q = 0; q &lt; pse_port_num_queues[FE_PSE_PORT_CDM5]; q++)</div><div class='add'>+		airoha_fe_set_pse_oq_rsv(eth, FE_PSE_PORT_CDM5, q,</div><div class='add'>+					 PSE_QUEUE_RSV_PAGES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_fe_mc_vlan_clear(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AIROHA_FE_MC_MAX_VLAN_TABLE; i++) {</div><div class='add'>+		int err, j;</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		airoha_fe_wr(eth, REG_MC_VLAN_DATA, 0x0);</div><div class='add'>+</div><div class='add'>+		val = FIELD_PREP(MC_VLAN_CFG_TABLE_ID_MASK, i) |</div><div class='add'>+		      MC_VLAN_CFG_TABLE_SEL_MASK | MC_VLAN_CFG_RW_MASK;</div><div class='add'>+		airoha_fe_wr(eth, REG_MC_VLAN_CFG, val);</div><div class='add'>+		err = read_poll_timeout(airoha_fe_rr, val,</div><div class='add'>+					val &amp; MC_VLAN_CFG_CMD_DONE_MASK,</div><div class='add'>+					USEC_PER_MSEC, 5 * USEC_PER_MSEC,</div><div class='add'>+					false, eth, REG_MC_VLAN_CFG);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; AIROHA_FE_MC_MAX_VLAN_PORT; j++) {</div><div class='add'>+			airoha_fe_wr(eth, REG_MC_VLAN_DATA, 0x0);</div><div class='add'>+</div><div class='add'>+			val = FIELD_PREP(MC_VLAN_CFG_TABLE_ID_MASK, i) |</div><div class='add'>+			      FIELD_PREP(MC_VLAN_CFG_PORT_ID_MASK, j) |</div><div class='add'>+			      MC_VLAN_CFG_RW_MASK;</div><div class='add'>+			airoha_fe_wr(eth, REG_MC_VLAN_CFG, val);</div><div class='add'>+			err = read_poll_timeout(airoha_fe_rr, val,</div><div class='add'>+						val &amp; MC_VLAN_CFG_CMD_DONE_MASK,</div><div class='add'>+						USEC_PER_MSEC,</div><div class='add'>+						5 * USEC_PER_MSEC, false, eth,</div><div class='add'>+						REG_MC_VLAN_CFG);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_fe_crsn_qsel_init(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	/* CDM1_CRSN_QSEL */</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(1, CRSN_22 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_22),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_22),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(1, CRSN_08 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_08),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_08),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(1, CRSN_21 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_21),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_21),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(1, CRSN_24 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_24),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_24),</div><div class='add'>+				 CDM_CRSN_QSEL_Q6));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(1, CRSN_25 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_25),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_25),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	/* CDM2_CRSN_QSEL */</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(2, CRSN_08 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_08),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_08),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(2, CRSN_21 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_21),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_21),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(2, CRSN_22 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_22),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_22),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(2, CRSN_24 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_24),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_24),</div><div class='add'>+				 CDM_CRSN_QSEL_Q6));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_CRSN_QSEL(2, CRSN_25 &gt;&gt; 2),</div><div class='add'>+		      CDM_CRSN_QSEL_REASON_MASK(CRSN_25),</div><div class='add'>+		      FIELD_PREP(CDM_CRSN_QSEL_REASON_MASK(CRSN_25),</div><div class='add'>+				 CDM_CRSN_QSEL_Q1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_fe_init(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	airoha_fe_maccr_init(eth);</div><div class='add'>+</div><div class='add'>+	/* PSE IQ reserve */</div><div class='add'>+	airoha_fe_rmw(eth, REG_PSE_IQ_REV1, PSE_IQ_RES1_P2_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_IQ_RES1_P2_MASK, 0x10));</div><div class='add'>+	airoha_fe_rmw(eth, REG_PSE_IQ_REV2,</div><div class='add'>+		      PSE_IQ_RES2_P5_MASK | PSE_IQ_RES2_P4_MASK,</div><div class='add'>+		      FIELD_PREP(PSE_IQ_RES2_P5_MASK, 0x40) |</div><div class='add'>+		      FIELD_PREP(PSE_IQ_RES2_P4_MASK, 0x34));</div><div class='add'>+</div><div class='add'>+	/* enable FE copy engine for MC/KA/DPI */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_PCE_CFG,</div><div class='add'>+		     PCE_DPI_EN_MASK | PCE_KA_EN_MASK | PCE_MC_EN_MASK);</div><div class='add'>+	/* set vip queue selection to ring 1 */</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_FWD_CFG(1), CDM_VIP_QSEL_MASK,</div><div class='add'>+		      FIELD_PREP(CDM_VIP_QSEL_MASK, 0x4));</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_FWD_CFG(2), CDM_VIP_QSEL_MASK,</div><div class='add'>+		      FIELD_PREP(CDM_VIP_QSEL_MASK, 0x4));</div><div class='add'>+	/* set GDM4 source interface offset to 8 */</div><div class='add'>+	airoha_fe_rmw(eth, REG_GDM_SRC_PORT_SET(4),</div><div class='add'>+		      GDM_SPORT_OFF2_MASK |</div><div class='add'>+		      GDM_SPORT_OFF1_MASK |</div><div class='add'>+		      GDM_SPORT_OFF0_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_SPORT_OFF2_MASK, 8) |</div><div class='add'>+		      FIELD_PREP(GDM_SPORT_OFF1_MASK, 8) |</div><div class='add'>+		      FIELD_PREP(GDM_SPORT_OFF0_MASK, 8));</div><div class='add'>+</div><div class='add'>+	/* set PSE Page as 128B */</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_DMA_GLO_CFG,</div><div class='add'>+		      FE_DMA_GLO_L2_SPACE_MASK | FE_DMA_GLO_PG_SZ_MASK,</div><div class='add'>+		      FIELD_PREP(FE_DMA_GLO_L2_SPACE_MASK, 2) |</div><div class='add'>+		      FE_DMA_GLO_PG_SZ_MASK);</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_RST_GLO_CFG,</div><div class='add'>+		     FE_RST_CORE_MASK | FE_RST_GDM3_MBI_ARB_MASK |</div><div class='add'>+		     FE_RST_GDM4_MBI_ARB_MASK);</div><div class='add'>+	usleep_range(1000, 2000);</div><div class='add'>+</div><div class='add'>+	/* connect RxRing1 and RxRing15 to PSE Port0 OQ-1</div><div class='add'>+	 * connect other rings to PSE Port0 OQ-0</div><div class='add'>+	 */</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_CDM1_OQ_MAP0, BIT(4));</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_CDM1_OQ_MAP1, BIT(28));</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_CDM1_OQ_MAP2, BIT(4));</div><div class='add'>+	airoha_fe_wr(eth, REG_FE_CDM1_OQ_MAP3, BIT(28));</div><div class='add'>+</div><div class='add'>+	airoha_fe_vip_setup(eth);</div><div class='add'>+	airoha_fe_pse_ports_init(eth);</div><div class='add'>+</div><div class='add'>+	airoha_fe_set(eth, REG_GDM_MISC_CFG,</div><div class='add'>+		      GDM2_RDM_ACK_WAIT_PREF_MASK |</div><div class='add'>+		      GDM2_CHN_VLD_MODE_MASK);</div><div class='add'>+	airoha_fe_rmw(eth, REG_CDM_FWD_CFG(2), CDM_OAM_QSEL_MASK,</div><div class='add'>+		      FIELD_PREP(CDM_OAM_QSEL_MASK, 15));</div><div class='add'>+</div><div class='add'>+	/* init fragment and assemble Force Port */</div><div class='add'>+	/* NPU Core-3, NPU Bridge Channel-3 */</div><div class='add'>+	airoha_fe_rmw(eth, REG_IP_FRAG_FP,</div><div class='add'>+		      IP_FRAGMENT_PORT_MASK | IP_FRAGMENT_NBQ_MASK,</div><div class='add'>+		      FIELD_PREP(IP_FRAGMENT_PORT_MASK, 6) |</div><div class='add'>+		      FIELD_PREP(IP_FRAGMENT_NBQ_MASK, 3));</div><div class='add'>+	/* QDMA LAN, RX Ring-22 */</div><div class='add'>+	airoha_fe_rmw(eth, REG_IP_FRAG_FP,</div><div class='add'>+		      IP_ASSEMBLE_PORT_MASK | IP_ASSEMBLE_NBQ_MASK,</div><div class='add'>+		      FIELD_PREP(IP_ASSEMBLE_PORT_MASK, 0) |</div><div class='add'>+		      FIELD_PREP(IP_ASSEMBLE_NBQ_MASK, 22));</div><div class='add'>+</div><div class='add'>+	airoha_fe_set(eth, REG_GDM_FWD_CFG(3), GDM_PAD_EN_MASK);</div><div class='add'>+	airoha_fe_set(eth, REG_GDM_FWD_CFG(4), GDM_PAD_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_crsn_qsel_init(eth);</div><div class='add'>+</div><div class='add'>+	airoha_fe_clear(eth, REG_FE_CPORT_CFG, FE_CPORT_QUEUE_XFC_MASK);</div><div class='add'>+	airoha_fe_set(eth, REG_FE_CPORT_CFG, FE_CPORT_PORT_XFC_MASK);</div><div class='add'>+</div><div class='add'>+	/* default aging mode for mbi unlock issue */</div><div class='add'>+	airoha_fe_rmw(eth, REG_GDM_CHN_RLS(2),</div><div class='add'>+		      MBI_RX_AGE_SEL_MASK | MBI_TX_AGE_SEL_MASK,</div><div class='add'>+		      FIELD_PREP(MBI_RX_AGE_SEL_MASK, 3) |</div><div class='add'>+		      FIELD_PREP(MBI_TX_AGE_SEL_MASK, 3));</div><div class='add'>+</div><div class='add'>+	/* disable IFC by default */</div><div class='add'>+	airoha_fe_clear(eth, REG_FE_CSR_IFC_CFG, FE_IFC_EN_MASK);</div><div class='add'>+</div><div class='add'>+	/* enable 1:N vlan action, init vlan table */</div><div class='add'>+	airoha_fe_set(eth, REG_MC_VLAN_EN, MC_VLAN_EN_MASK);</div><div class='add'>+</div><div class='add'>+	return airoha_fe_mc_vlan_clear(eth);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_fill_rx_queue(struct airoha_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct airoha_qdma *qdma = q-&gt;qdma;</div><div class='add'>+	int qid = q - &amp;qdma-&gt;q_rx[0];</div><div class='add'>+	int nframes = 0;</div><div class='add'>+</div><div class='add'>+	while (q-&gt;queued &lt; q-&gt;ndesc - 1) {</div><div class='add'>+		struct airoha_queue_entry *e = &amp;q-&gt;entry[q-&gt;head];</div><div class='add'>+		struct airoha_qdma_desc *desc = &amp;q-&gt;desc[q-&gt;head];</div><div class='add'>+		struct page *page;</div><div class='add'>+		int offset;</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		page = page_pool_dev_alloc_frag(q-&gt;page_pool, &amp;offset,</div><div class='add'>+						q-&gt;buf_size);</div><div class='add'>+		if (!page)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		q-&gt;head = (q-&gt;head + 1) % q-&gt;ndesc;</div><div class='add'>+		q-&gt;queued++;</div><div class='add'>+		nframes++;</div><div class='add'>+</div><div class='add'>+		e-&gt;buf = page_address(page) + offset;</div><div class='add'>+		e-&gt;dma_addr = page_pool_get_dma_addr(page) + offset;</div><div class='add'>+		e-&gt;dma_len = SKB_WITH_OVERHEAD(q-&gt;buf_size);</div><div class='add'>+</div><div class='add'>+		val = FIELD_PREP(QDMA_DESC_LEN_MASK, e-&gt;dma_len);</div><div class='add'>+		WRITE_ONCE(desc-&gt;ctrl, cpu_to_le32(val));</div><div class='add'>+		WRITE_ONCE(desc-&gt;addr, cpu_to_le32(e-&gt;dma_addr));</div><div class='add'>+		val = FIELD_PREP(QDMA_DESC_NEXT_ID_MASK, q-&gt;head);</div><div class='add'>+		WRITE_ONCE(desc-&gt;data, cpu_to_le32(val));</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg0, 0);</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg1, 0);</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg2, 0);</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg3, 0);</div><div class='add'>+</div><div class='add'>+		airoha_qdma_rmw(qdma, REG_RX_CPU_IDX(qid),</div><div class='add'>+				RX_RING_CPU_IDX_MASK,</div><div class='add'>+				FIELD_PREP(RX_RING_CPU_IDX_MASK, q-&gt;head));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nframes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_get_gdm_port(struct airoha_eth *eth,</div><div class='add'>+				    struct airoha_qdma_desc *desc)</div><div class='add'>+{</div><div class='add'>+	u32 port, sport, msg1 = le32_to_cpu(desc-&gt;msg1);</div><div class='add'>+</div><div class='add'>+	sport = FIELD_GET(QDMA_ETH_RXMSG_SPORT_MASK, msg1);</div><div class='add'>+	switch (sport) {</div><div class='add'>+	case 0x10 ... 0x14:</div><div class='add'>+		port = 0;</div><div class='add'>+		break;</div><div class='add'>+	case 0x2 ... 0x4:</div><div class='add'>+		port = sport - 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return port &gt;= ARRAY_SIZE(eth-&gt;ports) ? -EINVAL : port;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_rx_process(struct airoha_queue *q, int budget)</div><div class='add'>+{</div><div class='add'>+	enum dma_data_direction dir = page_pool_get_dma_dir(q-&gt;page_pool);</div><div class='add'>+	struct airoha_qdma *qdma = q-&gt;qdma;</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	int qid = q - &amp;qdma-&gt;q_rx[0];</div><div class='add'>+	int done = 0;</div><div class='add'>+</div><div class='add'>+	while (done &lt; budget) {</div><div class='add'>+		struct airoha_queue_entry *e = &amp;q-&gt;entry[q-&gt;tail];</div><div class='add'>+		struct airoha_qdma_desc *desc = &amp;q-&gt;desc[q-&gt;tail];</div><div class='add'>+		u32 hash, reason, msg1 = le32_to_cpu(desc-&gt;msg1);</div><div class='add'>+		struct page *page = virt_to_head_page(e-&gt;buf);</div><div class='add'>+		u32 desc_ctrl = le32_to_cpu(desc-&gt;ctrl);</div><div class='add'>+		struct airoha_gdm_port *port;</div><div class='add'>+		int data_len, len, p;</div><div class='add'>+</div><div class='add'>+		if (!(desc_ctrl &amp; QDMA_DESC_DONE_MASK))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		q-&gt;tail = (q-&gt;tail + 1) % q-&gt;ndesc;</div><div class='add'>+		q-&gt;queued--;</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_cpu(eth-&gt;dev, e-&gt;dma_addr,</div><div class='add'>+					SKB_WITH_OVERHEAD(q-&gt;buf_size), dir);</div><div class='add'>+</div><div class='add'>+		len = FIELD_GET(QDMA_DESC_LEN_MASK, desc_ctrl);</div><div class='add'>+		data_len = q-&gt;skb ? q-&gt;buf_size</div><div class='add'>+				  : SKB_WITH_OVERHEAD(q-&gt;buf_size);</div><div class='add'>+		if (!len || data_len &lt; len)</div><div class='add'>+			goto free_frag;</div><div class='add'>+</div><div class='add'>+		p = airoha_qdma_get_gdm_port(eth, desc);</div><div class='add'>+		if (p &lt; 0 || !eth-&gt;ports[p])</div><div class='add'>+			goto free_frag;</div><div class='add'>+</div><div class='add'>+		port = eth-&gt;ports[p];</div><div class='add'>+		if (!q-&gt;skb) { /* first buffer */</div><div class='add'>+			q-&gt;skb = napi_build_skb(e-&gt;buf, q-&gt;buf_size);</div><div class='add'>+			if (!q-&gt;skb)</div><div class='add'>+				goto free_frag;</div><div class='add'>+</div><div class='add'>+			__skb_put(q-&gt;skb, len);</div><div class='add'>+			skb_mark_for_recycle(q-&gt;skb);</div><div class='add'>+			q-&gt;skb-&gt;dev = port-&gt;dev;</div><div class='add'>+			q-&gt;skb-&gt;protocol = eth_type_trans(q-&gt;skb, port-&gt;dev);</div><div class='add'>+			q-&gt;skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+			skb_record_rx_queue(q-&gt;skb, qid);</div><div class='add'>+		} else { /* scattered frame */</div><div class='add'>+			struct skb_shared_info *shinfo = skb_shinfo(q-&gt;skb);</div><div class='add'>+			int nr_frags = shinfo-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+			if (nr_frags &gt;= ARRAY_SIZE(shinfo-&gt;frags))</div><div class='add'>+				goto free_frag;</div><div class='add'>+</div><div class='add'>+			skb_add_rx_frag(q-&gt;skb, nr_frags, page,</div><div class='add'>+					e-&gt;buf - page_address(page), len,</div><div class='add'>+					q-&gt;buf_size);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (FIELD_GET(QDMA_DESC_MORE_MASK, desc_ctrl))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (netdev_uses_dsa(port-&gt;dev)) {</div><div class='add'>+			/* PPE module requires untagged packets to work</div><div class='add'>+			 * properly and it provides DSA port index via the</div><div class='add'>+			 * DMA descriptor. Report DSA tag to the DSA stack</div><div class='add'>+			 * via skb dst info.</div><div class='add'>+			 */</div><div class='add'>+			u32 sptag = FIELD_GET(QDMA_ETH_RXMSG_SPTAG,</div><div class='add'>+					      le32_to_cpu(desc-&gt;msg0));</div><div class='add'>+</div><div class='add'>+			if (sptag &lt; ARRAY_SIZE(port-&gt;dsa_meta) &amp;&amp;</div><div class='add'>+			    port-&gt;dsa_meta[sptag])</div><div class='add'>+				skb_dst_set_noref(q-&gt;skb,</div><div class='add'>+						  &amp;port-&gt;dsa_meta[sptag]-&gt;dst);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hash = FIELD_GET(AIROHA_RXD4_FOE_ENTRY, msg1);</div><div class='add'>+		if (hash != AIROHA_RXD4_FOE_ENTRY)</div><div class='add'>+			skb_set_hash(q-&gt;skb, jhash_1word(hash, 0),</div><div class='add'>+				     PKT_HASH_TYPE_L4);</div><div class='add'>+</div><div class='add'>+		reason = FIELD_GET(AIROHA_RXD4_PPE_CPU_REASON, msg1);</div><div class='add'>+		if (reason == PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)</div><div class='add'>+			airoha_ppe_check_skb(&amp;eth-&gt;ppe-&gt;dev, q-&gt;skb, hash,</div><div class='add'>+					     false);</div><div class='add'>+</div><div class='add'>+		done++;</div><div class='add'>+		napi_gro_receive(&amp;q-&gt;napi, q-&gt;skb);</div><div class='add'>+		q-&gt;skb = NULL;</div><div class='add'>+		continue;</div><div class='add'>+free_frag:</div><div class='add'>+		if (q-&gt;skb) {</div><div class='add'>+			dev_kfree_skb(q-&gt;skb);</div><div class='add'>+			q-&gt;skb = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			page_pool_put_full_page(q-&gt;page_pool, page, true);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	airoha_qdma_fill_rx_queue(q);</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_rx_napi_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct airoha_queue *q = container_of(napi, struct airoha_queue, napi);</div><div class='add'>+	int cur, done = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		cur = airoha_qdma_rx_process(q, budget - done);</div><div class='add'>+		done += cur;</div><div class='add'>+	} while (cur &amp;&amp; done &lt; budget);</div><div class='add'>+</div><div class='add'>+	if (done &lt; budget &amp;&amp; napi_complete(napi)) {</div><div class='add'>+		struct airoha_qdma *qdma = q-&gt;qdma;</div><div class='add'>+		int i, qid = q - &amp;qdma-&gt;q_rx[0];</div><div class='add'>+		int intr_reg = qid &lt; RX_DONE_HIGH_OFFSET ? QDMA_INT_REG_IDX1</div><div class='add'>+							 : QDMA_INT_REG_IDX2;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;irq_banks); i++) {</div><div class='add'>+			if (!(BIT(qid) &amp; RX_IRQ_BANK_PIN_MASK(i)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[i], intr_reg,</div><div class='add'>+					       BIT(qid % RX_DONE_HIGH_OFFSET));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_rx_queue(struct airoha_queue *q,</div><div class='add'>+				     struct airoha_qdma *qdma, int ndesc)</div><div class='add'>+{</div><div class='add'>+	const struct page_pool_params pp_params = {</div><div class='add'>+		.order = 0,</div><div class='add'>+		.pool_size = 256,</div><div class='add'>+		.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV,</div><div class='add'>+		.dma_dir = DMA_FROM_DEVICE,</div><div class='add'>+		.max_len = PAGE_SIZE,</div><div class='add'>+		.nid = NUMA_NO_NODE,</div><div class='add'>+		.dev = qdma-&gt;eth-&gt;dev,</div><div class='add'>+		.napi = &amp;q-&gt;napi,</div><div class='add'>+	};</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	int qid = q - &amp;qdma-&gt;q_rx[0], thr;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	q-&gt;buf_size = PAGE_SIZE / 2;</div><div class='add'>+	q-&gt;ndesc = ndesc;</div><div class='add'>+	q-&gt;qdma = qdma;</div><div class='add'>+</div><div class='add'>+	q-&gt;entry = devm_kzalloc(eth-&gt;dev, q-&gt;ndesc * sizeof(*q-&gt;entry),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	q-&gt;page_pool = page_pool_create(&amp;pp_params);</div><div class='add'>+	if (IS_ERR(q-&gt;page_pool)) {</div><div class='add'>+		int err = PTR_ERR(q-&gt;page_pool);</div><div class='add'>+</div><div class='add'>+		q-&gt;page_pool = NULL;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	q-&gt;desc = dmam_alloc_coherent(eth-&gt;dev, q-&gt;ndesc * sizeof(*q-&gt;desc),</div><div class='add'>+				      &amp;dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	netif_napi_add(eth-&gt;napi_dev, &amp;q-&gt;napi, airoha_qdma_rx_napi_poll);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_RX_RING_BASE(qid), dma_addr);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_RX_RING_SIZE(qid),</div><div class='add'>+			RX_RING_SIZE_MASK,</div><div class='add'>+			FIELD_PREP(RX_RING_SIZE_MASK, ndesc));</div><div class='add'>+</div><div class='add'>+	thr = clamp(ndesc &gt;&gt; 3, 1, 32);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_RX_RING_SIZE(qid), RX_RING_THR_MASK,</div><div class='add'>+			FIELD_PREP(RX_RING_THR_MASK, thr));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_RX_DMA_IDX(qid), RX_RING_DMA_IDX_MASK,</div><div class='add'>+			FIELD_PREP(RX_RING_DMA_IDX_MASK, q-&gt;head));</div><div class='add'>+	airoha_qdma_set(qdma, REG_RX_SCATTER_CFG(qid), RX_RING_SG_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_fill_rx_queue(q);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_cleanup_rx_queue(struct airoha_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = q-&gt;qdma-&gt;eth;</div><div class='add'>+</div><div class='add'>+	while (q-&gt;queued) {</div><div class='add'>+		struct airoha_queue_entry *e = &amp;q-&gt;entry[q-&gt;tail];</div><div class='add'>+		struct page *page = virt_to_head_page(e-&gt;buf);</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_cpu(eth-&gt;dev, e-&gt;dma_addr, e-&gt;dma_len,</div><div class='add'>+					page_pool_get_dma_dir(q-&gt;page_pool));</div><div class='add'>+		page_pool_put_full_page(q-&gt;page_pool, page, false);</div><div class='add'>+		q-&gt;tail = (q-&gt;tail + 1) % q-&gt;ndesc;</div><div class='add'>+		q-&gt;queued--;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_rx(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!(RX_DONE_INT_MASK &amp; BIT(i))) {</div><div class='add'>+			/* rx-queue not binded to irq */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = airoha_qdma_init_rx_queue(&amp;qdma-&gt;q_rx[i], qdma,</div><div class='add'>+						RX_DSCP_NUM(i));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_tx_napi_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct airoha_tx_irq_queue *irq_q;</div><div class='add'>+	int id, done = 0, irq_queued;</div><div class='add'>+	struct airoha_qdma *qdma;</div><div class='add'>+	struct airoha_eth *eth;</div><div class='add'>+	u32 status, head;</div><div class='add'>+</div><div class='add'>+	irq_q = container_of(napi, struct airoha_tx_irq_queue, napi);</div><div class='add'>+	qdma = irq_q-&gt;qdma;</div><div class='add'>+	id = irq_q - &amp;qdma-&gt;q_tx_irq[0];</div><div class='add'>+	eth = qdma-&gt;eth;</div><div class='add'>+</div><div class='add'>+	status = airoha_qdma_rr(qdma, REG_IRQ_STATUS(id));</div><div class='add'>+	head = FIELD_GET(IRQ_HEAD_IDX_MASK, status);</div><div class='add'>+	head = head % irq_q-&gt;size;</div><div class='add'>+	irq_queued = FIELD_GET(IRQ_ENTRY_LEN_MASK, status);</div><div class='add'>+</div><div class='add'>+	while (irq_queued &gt; 0 &amp;&amp; done &lt; budget) {</div><div class='add'>+		u32 qid, val = irq_q-&gt;q[head];</div><div class='add'>+		struct airoha_qdma_desc *desc;</div><div class='add'>+		struct airoha_queue_entry *e;</div><div class='add'>+		struct airoha_queue *q;</div><div class='add'>+		u32 index, desc_ctrl;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		if (val == 0xff)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		irq_q-&gt;q[head] = 0xff; /* mark as done */</div><div class='add'>+		head = (head + 1) % irq_q-&gt;size;</div><div class='add'>+		irq_queued--;</div><div class='add'>+		done++;</div><div class='add'>+</div><div class='add'>+		qid = FIELD_GET(IRQ_RING_IDX_MASK, val);</div><div class='add'>+		if (qid &gt;= ARRAY_SIZE(qdma-&gt;q_tx))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		q = &amp;qdma-&gt;q_tx[qid];</div><div class='add'>+		if (!q-&gt;ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		index = FIELD_GET(IRQ_DESC_IDX_MASK, val);</div><div class='add'>+		if (index &gt;= q-&gt;ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+</div><div class='add'>+		if (!q-&gt;queued)</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		desc = &amp;q-&gt;desc[index];</div><div class='add'>+		desc_ctrl = le32_to_cpu(desc-&gt;ctrl);</div><div class='add'>+</div><div class='add'>+		if (!(desc_ctrl &amp; QDMA_DESC_DONE_MASK) &amp;&amp;</div><div class='add'>+		    !(desc_ctrl &amp; QDMA_DESC_DROP_MASK))</div><div class='add'>+			goto unlock;</div><div class='add'>+</div><div class='add'>+		e = &amp;q-&gt;entry[index];</div><div class='add'>+		skb = e-&gt;skb;</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(eth-&gt;dev, e-&gt;dma_addr, e-&gt;dma_len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		e-&gt;dma_addr = 0;</div><div class='add'>+		list_add_tail(&amp;e-&gt;list, &amp;q-&gt;tx_list);</div><div class='add'>+</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg0, 0);</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg1, 0);</div><div class='add'>+		q-&gt;queued--;</div><div class='add'>+</div><div class='add'>+		if (skb) {</div><div class='add'>+			u16 queue = skb_get_queue_mapping(skb);</div><div class='add'>+			struct netdev_queue *txq;</div><div class='add'>+</div><div class='add'>+			txq = netdev_get_tx_queue(skb-&gt;dev, queue);</div><div class='add'>+			netdev_tx_completed_queue(txq, 1, skb-&gt;len);</div><div class='add'>+			if (netif_tx_queue_stopped(txq) &amp;&amp;</div><div class='add'>+			    q-&gt;ndesc - q-&gt;queued &gt;= q-&gt;free_thr)</div><div class='add'>+				netif_tx_wake_queue(txq);</div><div class='add'>+</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+		}</div><div class='add'>+unlock:</div><div class='add'>+		spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (done) {</div><div class='add'>+		int i, len = done &gt;&gt; 7;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; len; i++)</div><div class='add'>+			airoha_qdma_rmw(qdma, REG_IRQ_CLEAR_LEN(id),</div><div class='add'>+					IRQ_CLEAR_LEN_MASK, 0x80);</div><div class='add'>+		airoha_qdma_rmw(qdma, REG_IRQ_CLEAR_LEN(id),</div><div class='add'>+				IRQ_CLEAR_LEN_MASK, (done &amp; 0x7f));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (done &lt; budget &amp;&amp; napi_complete(napi))</div><div class='add'>+		airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[0], QDMA_INT_REG_IDX0,</div><div class='add'>+				       TX_DONE_INT_MASK(id));</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_tx_queue(struct airoha_queue *q,</div><div class='add'>+				     struct airoha_qdma *qdma, int size)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	int i, qid = q - &amp;qdma-&gt;q_tx[0];</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;q-&gt;lock);</div><div class='add'>+	q-&gt;ndesc = size;</div><div class='add'>+	q-&gt;qdma = qdma;</div><div class='add'>+	q-&gt;free_thr = 1 + MAX_SKB_FRAGS;</div><div class='add'>+	INIT_LIST_HEAD(&amp;q-&gt;tx_list);</div><div class='add'>+</div><div class='add'>+	q-&gt;entry = devm_kzalloc(eth-&gt;dev, q-&gt;ndesc * sizeof(*q-&gt;entry),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	q-&gt;desc = dmam_alloc_coherent(eth-&gt;dev, q-&gt;ndesc * sizeof(*q-&gt;desc),</div><div class='add'>+				      &amp;dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!q-&gt;desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; q-&gt;ndesc; i++) {</div><div class='add'>+		u32 val = FIELD_PREP(QDMA_DESC_DONE_MASK, 1);</div><div class='add'>+</div><div class='add'>+		list_add_tail(&amp;q-&gt;entry[i].list, &amp;q-&gt;tx_list);</div><div class='add'>+		WRITE_ONCE(q-&gt;desc[i].ctrl, cpu_to_le32(val));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* xmit ring drop default setting */</div><div class='add'>+	airoha_qdma_set(qdma, REG_TX_RING_BLOCKING(qid),</div><div class='add'>+			TX_RING_IRQ_BLOCKING_TX_DROP_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TX_RING_BASE(qid), dma_addr);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid), TX_RING_CPU_IDX_MASK,</div><div class='add'>+			FIELD_PREP(TX_RING_CPU_IDX_MASK, 0));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_TX_DMA_IDX(qid), TX_RING_DMA_IDX_MASK,</div><div class='add'>+			FIELD_PREP(TX_RING_DMA_IDX_MASK, 0));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_tx_irq_init(struct airoha_tx_irq_queue *irq_q,</div><div class='add'>+				   struct airoha_qdma *qdma, int size)</div><div class='add'>+{</div><div class='add'>+	int id = irq_q - &amp;qdma-&gt;q_tx_irq[0];</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	netif_napi_add_tx(eth-&gt;napi_dev, &amp;irq_q-&gt;napi,</div><div class='add'>+			  airoha_qdma_tx_napi_poll);</div><div class='add'>+	irq_q-&gt;q = dmam_alloc_coherent(eth-&gt;dev, size * sizeof(u32),</div><div class='add'>+				       &amp;dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!irq_q-&gt;q)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	memset(irq_q-&gt;q, 0xff, size * sizeof(u32));</div><div class='add'>+	irq_q-&gt;size = size;</div><div class='add'>+	irq_q-&gt;qdma = qdma;</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TX_IRQ_BASE(id), dma_addr);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_TX_IRQ_CFG(id), TX_IRQ_DEPTH_MASK,</div><div class='add'>+			FIELD_PREP(TX_IRQ_DEPTH_MASK, size));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_TX_IRQ_CFG(id), TX_IRQ_THR_MASK,</div><div class='add'>+			FIELD_PREP(TX_IRQ_THR_MASK, 1));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_tx(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx_irq); i++) {</div><div class='add'>+		err = airoha_qdma_tx_irq_init(&amp;qdma-&gt;q_tx_irq[i], qdma,</div><div class='add'>+					      IRQ_QUEUE_LEN(i));</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx); i++) {</div><div class='add'>+		err = airoha_qdma_init_tx_queue(&amp;qdma-&gt;q_tx[i], qdma,</div><div class='add'>+						TX_DSCP_NUM);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_cleanup_tx_queue(struct airoha_queue *q)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = q-&gt;qdma-&gt;eth;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+	for (i = 0; i &lt; q-&gt;ndesc; i++) {</div><div class='add'>+		struct airoha_queue_entry *e = &amp;q-&gt;entry[i];</div><div class='add'>+</div><div class='add'>+		if (!e-&gt;dma_addr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(eth-&gt;dev, e-&gt;dma_addr, e-&gt;dma_len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		dev_kfree_skb_any(e-&gt;skb);</div><div class='add'>+		e-&gt;dma_addr = 0;</div><div class='add'>+		e-&gt;skb = NULL;</div><div class='add'>+		list_add_tail(&amp;e-&gt;list, &amp;q-&gt;tx_list);</div><div class='add'>+		q-&gt;queued--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int size, index, num_desc = HW_DSCP_NUM;</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	int id = qdma - &amp;eth-&gt;qdma[0];</div><div class='add'>+	u32 status, buf_size;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	const char *name;</div><div class='add'>+</div><div class='add'>+	name = devm_kasprintf(eth-&gt;dev, GFP_KERNEL, "qdma%d-buf", id);</div><div class='add'>+	if (!name)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	buf_size = id ? AIROHA_MAX_PACKET_SIZE / 2 : AIROHA_MAX_PACKET_SIZE;</div><div class='add'>+	index = of_property_match_string(eth-&gt;dev-&gt;of_node,</div><div class='add'>+					 "memory-region-names", name);</div><div class='add'>+	if (index &gt;= 0) {</div><div class='add'>+		struct reserved_mem *rmem;</div><div class='add'>+		struct device_node *np;</div><div class='add'>+</div><div class='add'>+		/* Consume reserved memory for hw forwarding buffers queue if</div><div class='add'>+		 * available in the DTS</div><div class='add'>+		 */</div><div class='add'>+		np = of_parse_phandle(eth-&gt;dev-&gt;of_node, "memory-region",</div><div class='add'>+				      index);</div><div class='add'>+		if (!np)</div><div class='add'>+			return -ENODEV;</div><div class='add'>+</div><div class='add'>+		rmem = of_reserved_mem_lookup(np);</div><div class='add'>+		of_node_put(np);</div><div class='add'>+		dma_addr = rmem-&gt;base;</div><div class='add'>+		/* Compute the number of hw descriptors according to the</div><div class='add'>+		 * reserved memory size and the payload buffer size</div><div class='add'>+		 */</div><div class='add'>+		num_desc = div_u64(rmem-&gt;size, buf_size);</div><div class='add'>+	} else {</div><div class='add'>+		size = buf_size * num_desc;</div><div class='add'>+		if (!dmam_alloc_coherent(eth-&gt;dev, size, &amp;dma_addr,</div><div class='add'>+					 GFP_KERNEL))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_FWD_BUF_BASE, dma_addr);</div><div class='add'>+</div><div class='add'>+	size = num_desc * sizeof(struct airoha_qdma_fwd_desc);</div><div class='add'>+	if (!dmam_alloc_coherent(eth-&gt;dev, size, &amp;dma_addr, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr);</div><div class='add'>+	/* QDMA0: 2KB. QDMA1: 1KB */</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_HW_FWD_DSCP_CFG,</div><div class='add'>+			HW_FWD_DSCP_PAYLOAD_SIZE_MASK,</div><div class='add'>+			FIELD_PREP(HW_FWD_DSCP_PAYLOAD_SIZE_MASK, !!id));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_FWD_DSCP_LOW_THR, FWD_DSCP_LOW_THR_MASK,</div><div class='add'>+			FIELD_PREP(FWD_DSCP_LOW_THR_MASK, 128));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_LMGR_INIT_CFG,</div><div class='add'>+			LMGR_INIT_START | LMGR_SRAM_MODE_MASK |</div><div class='add'>+			HW_FWD_DESC_NUM_MASK,</div><div class='add'>+			FIELD_PREP(HW_FWD_DESC_NUM_MASK, num_desc) |</div><div class='add'>+			LMGR_INIT_START | LMGR_SRAM_MODE_MASK);</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(airoha_qdma_rr, status,</div><div class='add'>+				 !(status &amp; LMGR_INIT_START), USEC_PER_MSEC,</div><div class='add'>+				 30 * USEC_PER_MSEC, true, qdma,</div><div class='add'>+				 REG_LMGR_INIT_CFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_init_qos(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	airoha_qdma_clear(qdma, REG_TXWRR_MODE_CFG, TWRR_WEIGHT_SCALE_MASK);</div><div class='add'>+	airoha_qdma_set(qdma, REG_TXWRR_MODE_CFG, TWRR_WEIGHT_BASE_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_clear(qdma, REG_PSE_BUF_USAGE_CFG,</div><div class='add'>+			  PSE_BUF_ESTIMATE_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_set(qdma, REG_EGRESS_RATE_METER_CFG,</div><div class='add'>+			EGRESS_RATE_METER_EN_MASK |</div><div class='add'>+			EGRESS_RATE_METER_EQ_RATE_EN_MASK);</div><div class='add'>+	/* 2047us x 31 = 63.457ms */</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_EGRESS_RATE_METER_CFG,</div><div class='add'>+			EGRESS_RATE_METER_WINDOW_SZ_MASK,</div><div class='add'>+			FIELD_PREP(EGRESS_RATE_METER_WINDOW_SZ_MASK, 0x1f));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_EGRESS_RATE_METER_CFG,</div><div class='add'>+			EGRESS_RATE_METER_TIMESLICE_MASK,</div><div class='add'>+			FIELD_PREP(EGRESS_RATE_METER_TIMESLICE_MASK, 0x7ff));</div><div class='add'>+</div><div class='add'>+	/* ratelimit init */</div><div class='add'>+	airoha_qdma_set(qdma, REG_GLB_TRTCM_CFG, GLB_TRTCM_EN_MASK);</div><div class='add'>+	/* fast-tick 25us */</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_GLB_TRTCM_CFG, GLB_FAST_TICK_MASK,</div><div class='add'>+			FIELD_PREP(GLB_FAST_TICK_MASK, 25));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_GLB_TRTCM_CFG, GLB_SLOW_TICK_RATIO_MASK,</div><div class='add'>+			FIELD_PREP(GLB_SLOW_TICK_RATIO_MASK, 40));</div><div class='add'>+</div><div class='add'>+	airoha_qdma_set(qdma, REG_EGRESS_TRTCM_CFG, EGRESS_TRTCM_EN_MASK);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_EGRESS_TRTCM_CFG, EGRESS_FAST_TICK_MASK,</div><div class='add'>+			FIELD_PREP(EGRESS_FAST_TICK_MASK, 25));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_EGRESS_TRTCM_CFG,</div><div class='add'>+			EGRESS_SLOW_TICK_RATIO_MASK,</div><div class='add'>+			FIELD_PREP(EGRESS_SLOW_TICK_RATIO_MASK, 40));</div><div class='add'>+</div><div class='add'>+	airoha_qdma_set(qdma, REG_INGRESS_TRTCM_CFG, INGRESS_TRTCM_EN_MASK);</div><div class='add'>+	airoha_qdma_clear(qdma, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+			  INGRESS_TRTCM_MODE_MASK);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_INGRESS_TRTCM_CFG, INGRESS_FAST_TICK_MASK,</div><div class='add'>+			FIELD_PREP(INGRESS_FAST_TICK_MASK, 125));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+			INGRESS_SLOW_TICK_RATIO_MASK,</div><div class='add'>+			FIELD_PREP(INGRESS_SLOW_TICK_RATIO_MASK, 8));</div><div class='add'>+</div><div class='add'>+	airoha_qdma_set(qdma, REG_SLA_TRTCM_CFG, SLA_TRTCM_EN_MASK);</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_SLA_TRTCM_CFG, SLA_FAST_TICK_MASK,</div><div class='add'>+			FIELD_PREP(SLA_FAST_TICK_MASK, 25));</div><div class='add'>+	airoha_qdma_rmw(qdma, REG_SLA_TRTCM_CFG, SLA_SLOW_TICK_RATIO_MASK,</div><div class='add'>+			FIELD_PREP(SLA_SLOW_TICK_RATIO_MASK, 40));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_init_qos_stats(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AIROHA_NUM_QOS_CHANNELS; i++) {</div><div class='add'>+		/* Tx-cpu transferred count */</div><div class='add'>+		airoha_qdma_wr(qdma, REG_CNTR_VAL(i &lt;&lt; 1), 0);</div><div class='add'>+		airoha_qdma_wr(qdma, REG_CNTR_CFG(i &lt;&lt; 1),</div><div class='add'>+			       CNTR_EN_MASK | CNTR_ALL_QUEUE_EN_MASK |</div><div class='add'>+			       CNTR_ALL_DSCP_RING_EN_MASK |</div><div class='add'>+			       FIELD_PREP(CNTR_CHAN_MASK, i));</div><div class='add'>+		/* Tx-fwd transferred count */</div><div class='add'>+		airoha_qdma_wr(qdma, REG_CNTR_VAL((i &lt;&lt; 1) + 1), 0);</div><div class='add'>+		airoha_qdma_wr(qdma, REG_CNTR_CFG(i &lt;&lt; 1),</div><div class='add'>+			       CNTR_EN_MASK | CNTR_ALL_QUEUE_EN_MASK |</div><div class='add'>+			       CNTR_ALL_DSCP_RING_EN_MASK |</div><div class='add'>+			       FIELD_PREP(CNTR_SRC_MASK, 1) |</div><div class='add'>+			       FIELD_PREP(CNTR_CHAN_MASK, i));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_hw_init(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;irq_banks); i++) {</div><div class='add'>+		/* clear pending irqs */</div><div class='add'>+		airoha_qdma_wr(qdma, REG_INT_STATUS(i), 0xffffffff);</div><div class='add'>+		/* setup rx irqs */</div><div class='add'>+		airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[i], QDMA_INT_REG_IDX0,</div><div class='add'>+				       INT_RX0_MASK(RX_IRQ_BANK_PIN_MASK(i)));</div><div class='add'>+		airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[i], QDMA_INT_REG_IDX1,</div><div class='add'>+				       INT_RX1_MASK(RX_IRQ_BANK_PIN_MASK(i)));</div><div class='add'>+		airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[i], QDMA_INT_REG_IDX2,</div><div class='add'>+				       INT_RX2_MASK(RX_IRQ_BANK_PIN_MASK(i)));</div><div class='add'>+		airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[i], QDMA_INT_REG_IDX3,</div><div class='add'>+				       INT_RX3_MASK(RX_IRQ_BANK_PIN_MASK(i)));</div><div class='add'>+	}</div><div class='add'>+	/* setup tx irqs */</div><div class='add'>+	airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[0], QDMA_INT_REG_IDX0,</div><div class='add'>+			       TX_COHERENT_LOW_INT_MASK | INT_TX_MASK);</div><div class='add'>+	airoha_qdma_irq_enable(&amp;qdma-&gt;irq_banks[0], QDMA_INT_REG_IDX4,</div><div class='add'>+			       TX_COHERENT_HIGH_INT_MASK);</div><div class='add'>+</div><div class='add'>+	/* setup irq binding */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_tx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (TX_RING_IRQ_BLOCKING_MAP_MASK &amp; BIT(i))</div><div class='add'>+			airoha_qdma_set(qdma, REG_TX_RING_BLOCKING(i),</div><div class='add'>+					TX_RING_IRQ_BLOCKING_CFG_MASK);</div><div class='add'>+		else</div><div class='add'>+			airoha_qdma_clear(qdma, REG_TX_RING_BLOCKING(i),</div><div class='add'>+					  TX_RING_IRQ_BLOCKING_CFG_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_QDMA_GLOBAL_CFG,</div><div class='add'>+		       FIELD_PREP(GLOBAL_CFG_DMA_PREFERENCE_MASK, 3) |</div><div class='add'>+		       GLOBAL_CFG_CPU_TXR_RR_MASK |</div><div class='add'>+		       GLOBAL_CFG_PAYLOAD_BYTE_SWAP_MASK |</div><div class='add'>+		       GLOBAL_CFG_MULTICAST_MODIFY_FP_MASK |</div><div class='add'>+		       GLOBAL_CFG_MULTICAST_EN_MASK |</div><div class='add'>+		       GLOBAL_CFG_IRQ0_EN_MASK | GLOBAL_CFG_IRQ1_EN_MASK |</div><div class='add'>+		       GLOBAL_CFG_TX_WB_DONE_MASK |</div><div class='add'>+		       FIELD_PREP(GLOBAL_CFG_MAX_ISSUE_NUM_MASK, 2));</div><div class='add'>+</div><div class='add'>+	airoha_qdma_init_qos(qdma);</div><div class='add'>+</div><div class='add'>+	/* disable qdma rx delay interrupt */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_rx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		airoha_qdma_clear(qdma, REG_RX_DELAY_INT_IDX(i),</div><div class='add'>+				  RX_DELAY_INT_MASK);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_qdma_set(qdma, REG_TXQ_CNGST_CFG,</div><div class='add'>+			TXQ_CNGST_DROP_EN | TXQ_CNGST_DEI_DROP_EN);</div><div class='add'>+	airoha_qdma_init_qos_stats(qdma);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t airoha_irq_handler(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	struct airoha_irq_bank *irq_bank = dev_instance;</div><div class='add'>+	struct airoha_qdma *qdma = irq_bank-&gt;qdma;</div><div class='add'>+	u32 rx_intr_mask = 0, rx_intr1, rx_intr2;</div><div class='add'>+	u32 intr[ARRAY_SIZE(irq_bank-&gt;irqmask)];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(intr); i++) {</div><div class='add'>+		intr[i] = airoha_qdma_rr(qdma, REG_INT_STATUS(i));</div><div class='add'>+		intr[i] &amp;= irq_bank-&gt;irqmask[i];</div><div class='add'>+		airoha_qdma_wr(qdma, REG_INT_STATUS(i), intr[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!test_bit(DEV_STATE_INITIALIZED, &amp;qdma-&gt;eth-&gt;state))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	rx_intr1 = intr[1] &amp; RX_DONE_LOW_INT_MASK;</div><div class='add'>+	if (rx_intr1) {</div><div class='add'>+		airoha_qdma_irq_disable(irq_bank, QDMA_INT_REG_IDX1, rx_intr1);</div><div class='add'>+		rx_intr_mask |= rx_intr1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_intr2 = intr[2] &amp; RX_DONE_HIGH_INT_MASK;</div><div class='add'>+	if (rx_intr2) {</div><div class='add'>+		airoha_qdma_irq_disable(irq_bank, QDMA_INT_REG_IDX2, rx_intr2);</div><div class='add'>+		rx_intr_mask |= (rx_intr2 &lt;&lt; 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; rx_intr_mask &amp;&amp; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_rx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (rx_intr_mask &amp; BIT(i))</div><div class='add'>+			napi_schedule(&amp;qdma-&gt;q_rx[i].napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intr[0] &amp; INT_TX_MASK) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx_irq); i++) {</div><div class='add'>+			if (!(intr[0] &amp; TX_DONE_INT_MASK(i)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			airoha_qdma_irq_disable(irq_bank, QDMA_INT_REG_IDX0,</div><div class='add'>+						TX_DONE_INT_MASK(i));</div><div class='add'>+			napi_schedule(&amp;qdma-&gt;q_tx_irq[i].napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_irq_banks(struct platform_device *pdev,</div><div class='add'>+				      struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	int i, id = qdma - &amp;eth-&gt;qdma[0];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;irq_banks); i++) {</div><div class='add'>+		struct airoha_irq_bank *irq_bank = &amp;qdma-&gt;irq_banks[i];</div><div class='add'>+		int err, irq_index = 4 * id + i;</div><div class='add'>+		const char *name;</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;irq_bank-&gt;irq_lock);</div><div class='add'>+		irq_bank-&gt;qdma = qdma;</div><div class='add'>+</div><div class='add'>+		irq_bank-&gt;irq = platform_get_irq(pdev, irq_index);</div><div class='add'>+		if (irq_bank-&gt;irq &lt; 0)</div><div class='add'>+			return irq_bank-&gt;irq;</div><div class='add'>+</div><div class='add'>+		name = devm_kasprintf(eth-&gt;dev, GFP_KERNEL,</div><div class='add'>+				      KBUILD_MODNAME ".%d", irq_index);</div><div class='add'>+		if (!name)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		err = devm_request_irq(eth-&gt;dev, irq_bank-&gt;irq,</div><div class='add'>+				       airoha_irq_handler, IRQF_SHARED, name,</div><div class='add'>+				       irq_bank);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init(struct platform_device *pdev,</div><div class='add'>+			    struct airoha_eth *eth,</div><div class='add'>+			    struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int err, id = qdma - &amp;eth-&gt;qdma[0];</div><div class='add'>+	const char *res;</div><div class='add'>+</div><div class='add'>+	qdma-&gt;eth = eth;</div><div class='add'>+	res = devm_kasprintf(eth-&gt;dev, GFP_KERNEL, "qdma%d", id);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	qdma-&gt;regs = devm_platform_ioremap_resource_byname(pdev, res);</div><div class='add'>+	if (IS_ERR(qdma-&gt;regs))</div><div class='add'>+		return dev_err_probe(eth-&gt;dev, PTR_ERR(qdma-&gt;regs),</div><div class='add'>+				     "failed to iomap qdma%d regs\n", id);</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_init_irq_banks(pdev, qdma);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_init_rx(qdma);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_init_tx(qdma);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_init_hfwd_queues(qdma);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_hw_init(qdma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_hw_init(struct platform_device *pdev,</div><div class='add'>+			  struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	/* disable xsi */</div><div class='add'>+	err = reset_control_bulk_assert(eth-&gt;soc-&gt;num_xsi_rsts, eth-&gt;xsi_rsts);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = reset_control_bulk_assert(ARRAY_SIZE(eth-&gt;rsts), eth-&gt;rsts);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msleep(20);</div><div class='add'>+	err = reset_control_bulk_deassert(ARRAY_SIZE(eth-&gt;rsts), eth-&gt;rsts);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	msleep(20);</div><div class='add'>+	err = airoha_fe_init(eth);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;qdma); i++) {</div><div class='add'>+		err = airoha_qdma_init(pdev, eth, &amp;eth-&gt;qdma[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = airoha_ppe_init(eth);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	set_bit(DEV_STATE_INITIALIZED, &amp;eth-&gt;state);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_hw_cleanup(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_rx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		netif_napi_del(&amp;qdma-&gt;q_rx[i].napi);</div><div class='add'>+		airoha_qdma_cleanup_rx_queue(&amp;qdma-&gt;q_rx[i]);</div><div class='add'>+		if (qdma-&gt;q_rx[i].page_pool)</div><div class='add'>+			page_pool_destroy(qdma-&gt;q_rx[i].page_pool);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx_irq); i++)</div><div class='add'>+		netif_napi_del(&amp;qdma-&gt;q_tx_irq[i].napi);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_tx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		airoha_qdma_cleanup_tx_queue(&amp;qdma-&gt;q_tx[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_start_napi(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx_irq); i++)</div><div class='add'>+		napi_enable(&amp;qdma-&gt;q_tx_irq[i].napi);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_rx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		napi_enable(&amp;qdma-&gt;q_rx[i].napi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_qdma_stop_napi(struct airoha_qdma *qdma)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx_irq); i++)</div><div class='add'>+		napi_disable(&amp;qdma-&gt;q_tx_irq[i].napi);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		if (!qdma-&gt;q_rx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		napi_disable(&amp;qdma-&gt;q_rx[i].napi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_update_hw_stats(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+	u32 val, i = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;port-&gt;stats.lock);</div><div class='add'>+	u64_stats_update_begin(&amp;port-&gt;stats.syncp);</div><div class='add'>+</div><div class='add'>+	/* TX */</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_ok_pkts += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_PKT_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_ok_pkts += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_ok_bytes += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_OK_BYTE_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_ok_bytes += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_DROP_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_drops += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_BC_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_broadcast += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_MC_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_multicast += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_RUNT_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_E64_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L64_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L127_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L255_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L511_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_L1023_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_TX_ETH_LONG_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.tx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	/* RX */</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_ok_pkts += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_PKT_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_ok_pkts += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_ok_bytes += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_OK_BYTE_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_ok_bytes += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_DROP_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_drops += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_BC_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_broadcast += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_MC_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_multicast += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ERROR_DROP_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_errors += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_CRC_ERR_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_crc_error += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_OVERFLOW_DROP_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_over_errors += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_FRAG_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_fragment += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_JABBER_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_jabber += val;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_RUNT_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_E64_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L64_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L127_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L255_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L511_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_H(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i] += ((u64)val &lt;&lt; 32);</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_L1023_CNT_L(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	val = airoha_fe_rr(eth, REG_FE_GDM_RX_ETH_LONG_CNT(port-&gt;id));</div><div class='add'>+	port-&gt;stats.rx_len[i++] += val;</div><div class='add'>+</div><div class='add'>+	/* reset mib counters */</div><div class='add'>+	airoha_fe_set(eth, REG_FE_GDM_MIB_CLEAR(port-&gt;id),</div><div class='add'>+		      FE_GDM_MIB_RX_CLEAR_MASK | FE_GDM_MIB_TX_CLEAR_MASK);</div><div class='add'>+</div><div class='add'>+	u64_stats_update_end(&amp;port-&gt;stats.syncp);</div><div class='add'>+	spin_unlock(&amp;port-&gt;stats.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	int err, len = ETH_HLEN + dev-&gt;mtu + ETH_FCS_LEN;</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_qdma *qdma = port-&gt;qdma;</div><div class='add'>+</div><div class='add'>+	netif_tx_start_all_queues(dev);</div><div class='add'>+	err = airoha_set_vip_for_gdm_port(port, true);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (netdev_uses_dsa(dev))</div><div class='add'>+		airoha_fe_set(qdma-&gt;eth, REG_GDM_INGRESS_CFG(port-&gt;id),</div><div class='add'>+			      GDM_STAG_EN_MASK);</div><div class='add'>+	else</div><div class='add'>+		airoha_fe_clear(qdma-&gt;eth, REG_GDM_INGRESS_CFG(port-&gt;id),</div><div class='add'>+				GDM_STAG_EN_MASK);</div><div class='add'>+</div><div class='add'>+	airoha_fe_rmw(qdma-&gt;eth, REG_GDM_LEN_CFG(port-&gt;id),</div><div class='add'>+		      GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_SHORT_LEN_MASK, 60) |</div><div class='add'>+		      FIELD_PREP(GDM_LONG_LEN_MASK, len));</div><div class='add'>+</div><div class='add'>+	airoha_qdma_set(qdma, REG_QDMA_GLOBAL_CFG,</div><div class='add'>+			GLOBAL_CFG_TX_DMA_EN_MASK |</div><div class='add'>+			GLOBAL_CFG_RX_DMA_EN_MASK);</div><div class='add'>+	atomic_inc(&amp;qdma-&gt;users);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_qdma *qdma = port-&gt;qdma;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	netif_tx_disable(dev);</div><div class='add'>+	err = airoha_set_vip_for_gdm_port(port, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx); i++)</div><div class='add'>+		netdev_tx_reset_subqueue(dev, i);</div><div class='add'>+</div><div class='add'>+	if (atomic_dec_and_test(&amp;qdma-&gt;users)) {</div><div class='add'>+		airoha_qdma_clear(qdma, REG_QDMA_GLOBAL_CFG,</div><div class='add'>+				  GLOBAL_CFG_TX_DMA_EN_MASK |</div><div class='add'>+				  GLOBAL_CFG_RX_DMA_EN_MASK);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_tx); i++) {</div><div class='add'>+			if (!qdma-&gt;q_tx[i].ndesc)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			airoha_qdma_cleanup_tx_queue(&amp;qdma-&gt;q_tx[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_set_macaddr(struct net_device *dev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = eth_mac_addr(dev, p);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	airoha_set_macaddr(port, dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airhoha_set_gdm2_loopback(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+	u32 val, pse_port, chan, nbq;</div><div class='add'>+	int src_port;</div><div class='add'>+</div><div class='add'>+	/* Forward the traffic to the proper GDM port */</div><div class='add'>+	pse_port = port-&gt;id == AIROHA_GDM3_IDX ? FE_PSE_PORT_GDM3</div><div class='add'>+					       : FE_PSE_PORT_GDM4;</div><div class='add'>+	airoha_set_gdm_port_fwd_cfg(eth, REG_GDM_FWD_CFG(2), pse_port);</div><div class='add'>+	airoha_fe_clear(eth, REG_GDM_FWD_CFG(2), GDM_STRIP_CRC_MASK);</div><div class='add'>+</div><div class='add'>+	/* Enable GDM2 loopback */</div><div class='add'>+	airoha_fe_wr(eth, REG_GDM_TXCHN_EN(2), 0xffffffff);</div><div class='add'>+	airoha_fe_wr(eth, REG_GDM_RXCHN_EN(2), 0xffff);</div><div class='add'>+</div><div class='add'>+	chan = port-&gt;id == AIROHA_GDM3_IDX ? airoha_is_7581(eth) ? 4 : 3 : 0;</div><div class='add'>+	airoha_fe_rmw(eth, REG_GDM_LPBK_CFG(2),</div><div class='add'>+		      LPBK_CHAN_MASK | LPBK_MODE_MASK | LPBK_EN_MASK,</div><div class='add'>+		      FIELD_PREP(LPBK_CHAN_MASK, chan) |</div><div class='add'>+		      LBK_GAP_MODE_MASK | LBK_LEN_MODE_MASK |</div><div class='add'>+		      LBK_CHAN_MODE_MASK | LPBK_EN_MASK);</div><div class='add'>+	airoha_fe_rmw(eth, REG_GDM_LEN_CFG(2),</div><div class='add'>+		      GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_SHORT_LEN_MASK, 60) |</div><div class='add'>+		      FIELD_PREP(GDM_LONG_LEN_MASK, AIROHA_MAX_MTU));</div><div class='add'>+</div><div class='add'>+	/* Disable VIP and IFC for GDM2 */</div><div class='add'>+	airoha_fe_clear(eth, REG_FE_VIP_PORT_EN, BIT(2));</div><div class='add'>+	airoha_fe_clear(eth, REG_FE_IFC_PORT_EN, BIT(2));</div><div class='add'>+</div><div class='add'>+	/* XXX: handle XSI_USB_PORT and XSI_PCE1_PORT */</div><div class='add'>+	nbq = port-&gt;id == AIROHA_GDM3_IDX &amp;&amp; airoha_is_7581(eth) ? 4 : 0;</div><div class='add'>+	src_port = eth-&gt;soc-&gt;ops.get_src_port_id(port, nbq);</div><div class='add'>+	if (src_port &lt; 0)</div><div class='add'>+		return src_port;</div><div class='add'>+</div><div class='add'>+	airoha_fe_rmw(eth, REG_FE_WAN_PORT,</div><div class='add'>+		      WAN1_EN_MASK | WAN1_MASK | WAN0_MASK,</div><div class='add'>+		      FIELD_PREP(WAN0_MASK, src_port));</div><div class='add'>+	val = src_port &amp; SP_CPORT_DFT_MASK;</div><div class='add'>+	airoha_fe_rmw(eth,</div><div class='add'>+		      REG_SP_DFT_CPORT(src_port &gt;&gt; fls(SP_CPORT_DFT_MASK)),</div><div class='add'>+		      SP_CPORT_MASK(val),</div><div class='add'>+		      FE_PSE_PORT_CDM2 &lt;&lt; __ffs(SP_CPORT_MASK(val)));</div><div class='add'>+</div><div class='add'>+	if (port-&gt;id != AIROHA_GDM3_IDX &amp;&amp; airoha_is_7581(eth))</div><div class='add'>+		airoha_fe_rmw(eth, REG_SRC_PORT_FC_MAP6,</div><div class='add'>+			      FC_ID_OF_SRC_PORT24_MASK,</div><div class='add'>+			      FIELD_PREP(FC_ID_OF_SRC_PORT24_MASK, 2));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_qdma *qdma = port-&gt;qdma;</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+	u32 pse_port, fe_cpu_port;</div><div class='add'>+	u8 ppe_id;</div><div class='add'>+</div><div class='add'>+	airoha_set_macaddr(port, dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	switch (port-&gt;id) {</div><div class='add'>+	case 3:</div><div class='add'>+	case 4:</div><div class='add'>+		/* If GDM2 is active we can't enable loopback */</div><div class='add'>+		if (!eth-&gt;ports[1]) {</div><div class='add'>+			int err;</div><div class='add'>+</div><div class='add'>+			err = airhoha_set_gdm2_loopback(port);</div><div class='add'>+			if (err)</div><div class='add'>+				return err;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case 2:</div><div class='add'>+		if (airoha_ppe_is_enabled(eth, 1)) {</div><div class='add'>+			/* For PPE2 always use secondary cpu port. */</div><div class='add'>+			fe_cpu_port = FE_PSE_PORT_CDM2;</div><div class='add'>+			pse_port = FE_PSE_PORT_PPE2;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	default: {</div><div class='add'>+		u8 qdma_id = qdma - &amp;eth-&gt;qdma[0];</div><div class='add'>+</div><div class='add'>+		/* For PPE1 select cpu port according to the running QDMA. */</div><div class='add'>+		fe_cpu_port = qdma_id ? FE_PSE_PORT_CDM2 : FE_PSE_PORT_CDM1;</div><div class='add'>+		pse_port = FE_PSE_PORT_PPE1;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_set_gdm_port_fwd_cfg(eth, REG_GDM_FWD_CFG(port-&gt;id), pse_port);</div><div class='add'>+	ppe_id = pse_port == FE_PSE_PORT_PPE2 ? 1 : 0;</div><div class='add'>+	airoha_fe_rmw(eth, REG_PPE_DFT_CPORT0(ppe_id),</div><div class='add'>+		      DFT_CPORT_MASK(port-&gt;id),</div><div class='add'>+		      fe_cpu_port &lt;&lt; __ffs(DFT_CPORT_MASK(port-&gt;id)));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_dev_get_stats64(struct net_device *dev,</div><div class='add'>+				   struct rtnl_link_stats64 *storage)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	airoha_update_hw_stats(port);</div><div class='add'>+	do {</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;port-&gt;stats.syncp);</div><div class='add'>+		storage-&gt;rx_packets = port-&gt;stats.rx_ok_pkts;</div><div class='add'>+		storage-&gt;tx_packets = port-&gt;stats.tx_ok_pkts;</div><div class='add'>+		storage-&gt;rx_bytes = port-&gt;stats.rx_ok_bytes;</div><div class='add'>+		storage-&gt;tx_bytes = port-&gt;stats.tx_ok_bytes;</div><div class='add'>+		storage-&gt;multicast = port-&gt;stats.rx_multicast;</div><div class='add'>+		storage-&gt;rx_errors = port-&gt;stats.rx_errors;</div><div class='add'>+		storage-&gt;rx_dropped = port-&gt;stats.rx_drops;</div><div class='add'>+		storage-&gt;tx_dropped = port-&gt;stats.tx_drops;</div><div class='add'>+		storage-&gt;rx_crc_errors = port-&gt;stats.rx_crc_error;</div><div class='add'>+		storage-&gt;rx_over_errors = port-&gt;stats.rx_over_errors;</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;port-&gt;stats.syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_change_mtu(struct net_device *dev, int mtu)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+	u32 len = ETH_HLEN + mtu + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	airoha_fe_rmw(eth, REG_GDM_LEN_CFG(port-&gt;id),</div><div class='add'>+		      GDM_LONG_LEN_MASK,</div><div class='add'>+		      FIELD_PREP(GDM_LONG_LEN_MASK, len));</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, mtu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 airoha_dev_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='add'>+				   struct net_device *sb_dev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	int queue, channel;</div><div class='add'>+</div><div class='add'>+	/* For dsa device select QoS channel according to the dsa user port</div><div class='add'>+	 * index, rely on port id otherwise. Select QoS queue based on the</div><div class='add'>+	 * skb priority.</div><div class='add'>+	 */</div><div class='add'>+	channel = netdev_uses_dsa(dev) ? skb_get_queue_mapping(skb) : port-&gt;id;</div><div class='add'>+	channel = channel % AIROHA_NUM_QOS_CHANNELS;</div><div class='add'>+	queue = (skb-&gt;priority - 1) % AIROHA_NUM_QOS_QUEUES; /* QoS queue */</div><div class='add'>+	queue = channel * AIROHA_NUM_QOS_QUEUES + queue;</div><div class='add'>+</div><div class='add'>+	return queue &lt; dev-&gt;num_tx_queues ? queue : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_get_dsa_tag(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA)</div><div class='add'>+	struct ethhdr *ehdr;</div><div class='add'>+	u8 xmit_tpid;</div><div class='add'>+	u16 tag;</div><div class='add'>+</div><div class='add'>+	if (!netdev_uses_dsa(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;dsa_ptr-&gt;tag_ops-&gt;proto != DSA_TAG_PROTO_MTK)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (skb_cow_head(skb, 0))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ehdr = (struct ethhdr *)skb-&gt;data;</div><div class='add'>+	tag = be16_to_cpu(ehdr-&gt;h_proto);</div><div class='add'>+	xmit_tpid = tag &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+	switch (xmit_tpid) {</div><div class='add'>+	case MTK_HDR_XMIT_TAGGED_TPID_8100:</div><div class='add'>+		ehdr-&gt;h_proto = cpu_to_be16(ETH_P_8021Q);</div><div class='add'>+		tag &amp;= ~(MTK_HDR_XMIT_TAGGED_TPID_8100 &lt;&lt; 8);</div><div class='add'>+		break;</div><div class='add'>+	case MTK_HDR_XMIT_TAGGED_TPID_88A8:</div><div class='add'>+		ehdr-&gt;h_proto = cpu_to_be16(ETH_P_8021AD);</div><div class='add'>+		tag &amp;= ~(MTK_HDR_XMIT_TAGGED_TPID_88A8 &lt;&lt; 8);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* PPE module requires untagged DSA packets to work properly,</div><div class='add'>+		 * so move DSA tag to DMA descriptor.</div><div class='add'>+		 */</div><div class='add'>+		memmove(skb-&gt;data + MTK_HDR_LEN, skb-&gt;data, 2 * ETH_ALEN);</div><div class='add'>+		__skb_pull(skb, MTK_HDR_LEN);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return tag;</div><div class='add'>+#else</div><div class='add'>+	return 0;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_get_fe_port(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	struct airoha_qdma *qdma = port-&gt;qdma;</div><div class='add'>+	struct airoha_eth *eth = qdma-&gt;eth;</div><div class='add'>+</div><div class='add'>+	switch (eth-&gt;soc-&gt;version) {</div><div class='add'>+	case 0x7583:</div><div class='add'>+		return port-&gt;id == AIROHA_GDM3_IDX ? FE_PSE_PORT_GDM3</div><div class='add'>+						   : port-&gt;id;</div><div class='add'>+	case 0x7581:</div><div class='add'>+	default:</div><div class='add'>+		return port-&gt;id == AIROHA_GDM4_IDX ? FE_PSE_PORT_GDM4</div><div class='add'>+						   : port-&gt;id;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t airoha_dev_xmit(struct sk_buff *skb,</div><div class='add'>+				   struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_qdma *qdma = port-&gt;qdma;</div><div class='add'>+	u32 nr_frags, tag, msg0, msg1, len;</div><div class='add'>+	struct airoha_queue_entry *e;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	struct airoha_queue *q;</div><div class='add'>+	LIST_HEAD(tx_list);</div><div class='add'>+	void *data;</div><div class='add'>+	int i, qid;</div><div class='add'>+	u16 index;</div><div class='add'>+	u8 fport;</div><div class='add'>+</div><div class='add'>+	qid = skb_get_queue_mapping(skb) % ARRAY_SIZE(qdma-&gt;q_tx);</div><div class='add'>+	tag = airoha_get_dsa_tag(skb, dev);</div><div class='add'>+</div><div class='add'>+	msg0 = FIELD_PREP(QDMA_ETH_TXMSG_CHAN_MASK,</div><div class='add'>+			  qid / AIROHA_NUM_QOS_QUEUES) |</div><div class='add'>+	       FIELD_PREP(QDMA_ETH_TXMSG_QUEUE_MASK,</div><div class='add'>+			  qid % AIROHA_NUM_QOS_QUEUES) |</div><div class='add'>+	       FIELD_PREP(QDMA_ETH_TXMSG_SP_TAG_MASK, tag);</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='add'>+		msg0 |= FIELD_PREP(QDMA_ETH_TXMSG_TCO_MASK, 1) |</div><div class='add'>+			FIELD_PREP(QDMA_ETH_TXMSG_UCO_MASK, 1) |</div><div class='add'>+			FIELD_PREP(QDMA_ETH_TXMSG_ICO_MASK, 1);</div><div class='add'>+</div><div class='add'>+	/* TSO: fill MSS info in tcp checksum field */</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='add'>+		if (skb_cow_head(skb, 0))</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		if (skb_shinfo(skb)-&gt;gso_type &amp; (SKB_GSO_TCPV4 |</div><div class='add'>+						 SKB_GSO_TCPV6)) {</div><div class='add'>+			__be16 csum = cpu_to_be16(skb_shinfo(skb)-&gt;gso_size);</div><div class='add'>+</div><div class='add'>+			tcp_hdr(skb)-&gt;check = (__force __sum16)csum;</div><div class='add'>+			msg0 |= FIELD_PREP(QDMA_ETH_TXMSG_TSO_MASK, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fport = airoha_get_fe_port(port);</div><div class='add'>+	msg1 = FIELD_PREP(QDMA_ETH_TXMSG_FPORT_MASK, fport) |</div><div class='add'>+	       FIELD_PREP(QDMA_ETH_TXMSG_METER_MASK, 0x7f);</div><div class='add'>+</div><div class='add'>+	q = &amp;qdma-&gt;q_tx[qid];</div><div class='add'>+	if (WARN_ON_ONCE(!q-&gt;ndesc))</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;q-&gt;lock);</div><div class='add'>+</div><div class='add'>+	txq = netdev_get_tx_queue(dev, qid);</div><div class='add'>+	nr_frags = 1 + skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	if (q-&gt;queued + nr_frags &gt;= q-&gt;ndesc) {</div><div class='add'>+		/* not enough space in the queue */</div><div class='add'>+		netif_tx_stop_queue(txq);</div><div class='add'>+		spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = skb_headlen(skb);</div><div class='add'>+	data = skb-&gt;data;</div><div class='add'>+</div><div class='add'>+	e = list_first_entry(&amp;q-&gt;tx_list, struct airoha_queue_entry,</div><div class='add'>+			     list);</div><div class='add'>+	index = e - q-&gt;entry;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; nr_frags; i++) {</div><div class='add'>+		struct airoha_qdma_desc *desc = &amp;q-&gt;desc[index];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		dma_addr_t addr;</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		addr = dma_map_single(dev-&gt;dev.parent, data, len,</div><div class='add'>+				      DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(dev-&gt;dev.parent, addr)))</div><div class='add'>+			goto error_unmap;</div><div class='add'>+</div><div class='add'>+		list_move_tail(&amp;e-&gt;list, &amp;tx_list);</div><div class='add'>+		e-&gt;skb = i ? NULL : skb;</div><div class='add'>+		e-&gt;dma_addr = addr;</div><div class='add'>+		e-&gt;dma_len = len;</div><div class='add'>+</div><div class='add'>+		e = list_first_entry(&amp;q-&gt;tx_list, struct airoha_queue_entry,</div><div class='add'>+				     list);</div><div class='add'>+		index = e - q-&gt;entry;</div><div class='add'>+</div><div class='add'>+		val = FIELD_PREP(QDMA_DESC_LEN_MASK, len);</div><div class='add'>+		if (i &lt; nr_frags - 1)</div><div class='add'>+			val |= FIELD_PREP(QDMA_DESC_MORE_MASK, 1);</div><div class='add'>+		WRITE_ONCE(desc-&gt;ctrl, cpu_to_le32(val));</div><div class='add'>+		WRITE_ONCE(desc-&gt;addr, cpu_to_le32(addr));</div><div class='add'>+		val = FIELD_PREP(QDMA_DESC_NEXT_ID_MASK, index);</div><div class='add'>+		WRITE_ONCE(desc-&gt;data, cpu_to_le32(val));</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg0, cpu_to_le32(msg0));</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg1, cpu_to_le32(msg1));</div><div class='add'>+		WRITE_ONCE(desc-&gt;msg2, cpu_to_le32(0xffff));</div><div class='add'>+</div><div class='add'>+		data = skb_frag_address(frag);</div><div class='add'>+		len = skb_frag_size(frag);</div><div class='add'>+	}</div><div class='add'>+	q-&gt;queued += i;</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (netif_xmit_stopped(txq) || !netdev_xmit_more())</div><div class='add'>+		airoha_qdma_rmw(qdma, REG_TX_CPU_IDX(qid),</div><div class='add'>+				TX_RING_CPU_IDX_MASK,</div><div class='add'>+				FIELD_PREP(TX_RING_CPU_IDX_MASK, index));</div><div class='add'>+</div><div class='add'>+	if (q-&gt;ndesc - q-&gt;queued &lt; q-&gt;free_thr)</div><div class='add'>+		netif_tx_stop_queue(txq);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+error_unmap:</div><div class='add'>+	while (!list_empty(&amp;tx_list)) {</div><div class='add'>+		e = list_first_entry(&amp;tx_list, struct airoha_queue_entry,</div><div class='add'>+				     list);</div><div class='add'>+		dma_unmap_single(dev-&gt;dev.parent, e-&gt;dma_addr, e-&gt;dma_len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		e-&gt;dma_addr = 0;</div><div class='add'>+		list_move_tail(&amp;e-&gt;list, &amp;q-&gt;tx_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;q-&gt;lock);</div><div class='add'>+error:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	dev-&gt;stats.tx_dropped++;</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ethtool_get_drvinfo(struct net_device *dev,</div><div class='add'>+				       struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+</div><div class='add'>+	strscpy(info-&gt;driver, eth-&gt;dev-&gt;driver-&gt;name, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(eth-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ethtool_get_mac_stats(struct net_device *dev,</div><div class='add'>+					 struct ethtool_eth_mac_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	airoha_update_hw_stats(port);</div><div class='add'>+	do {</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;port-&gt;stats.syncp);</div><div class='add'>+		stats-&gt;FramesTransmittedOK = port-&gt;stats.tx_ok_pkts;</div><div class='add'>+		stats-&gt;OctetsTransmittedOK = port-&gt;stats.tx_ok_bytes;</div><div class='add'>+		stats-&gt;MulticastFramesXmittedOK = port-&gt;stats.tx_multicast;</div><div class='add'>+		stats-&gt;BroadcastFramesXmittedOK = port-&gt;stats.tx_broadcast;</div><div class='add'>+		stats-&gt;FramesReceivedOK = port-&gt;stats.rx_ok_pkts;</div><div class='add'>+		stats-&gt;OctetsReceivedOK = port-&gt;stats.rx_ok_bytes;</div><div class='add'>+		stats-&gt;BroadcastFramesReceivedOK = port-&gt;stats.rx_broadcast;</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;port-&gt;stats.syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range airoha_ethtool_rmon_ranges[] = {</div><div class='add'>+	{    0,    64 },</div><div class='add'>+	{   65,   127 },</div><div class='add'>+	{  128,   255 },</div><div class='add'>+	{  256,   511 },</div><div class='add'>+	{  512,  1023 },</div><div class='add'>+	{ 1024,  1518 },</div><div class='add'>+	{ 1519, 10239 },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+airoha_ethtool_get_rmon_stats(struct net_device *dev,</div><div class='add'>+			      struct ethtool_rmon_stats *stats,</div><div class='add'>+			      const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_hw_stats *hw_stats = &amp;port-&gt;stats;</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(airoha_ethtool_rmon_ranges) !=</div><div class='add'>+		     ARRAY_SIZE(hw_stats-&gt;tx_len) + 1);</div><div class='add'>+	BUILD_BUG_ON(ARRAY_SIZE(airoha_ethtool_rmon_ranges) !=</div><div class='add'>+		     ARRAY_SIZE(hw_stats-&gt;rx_len) + 1);</div><div class='add'>+</div><div class='add'>+	*ranges = airoha_ethtool_rmon_ranges;</div><div class='add'>+	airoha_update_hw_stats(port);</div><div class='add'>+	do {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;port-&gt;stats.syncp);</div><div class='add'>+		stats-&gt;fragments = hw_stats-&gt;rx_fragment;</div><div class='add'>+		stats-&gt;jabbers = hw_stats-&gt;rx_jabber;</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(airoha_ethtool_rmon_ranges) - 1;</div><div class='add'>+		     i++) {</div><div class='add'>+			stats-&gt;hist[i] = hw_stats-&gt;rx_len[i];</div><div class='add'>+			stats-&gt;hist_tx[i] = hw_stats-&gt;tx_len[i];</div><div class='add'>+		}</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;port-&gt;stats.syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_chan_tx_sched(struct airoha_gdm_port *port,</div><div class='add'>+					 int channel, enum tx_sched_mode mode,</div><div class='add'>+					 const u16 *weights, u8 n_weights)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AIROHA_NUM_TX_RING; i++)</div><div class='add'>+		airoha_qdma_clear(port-&gt;qdma, REG_QUEUE_CLOSE_CFG(channel),</div><div class='add'>+				  TXQ_DISABLE_CHAN_QUEUE_MASK(channel, i));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n_weights; i++) {</div><div class='add'>+		u32 status;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		airoha_qdma_wr(port-&gt;qdma, REG_TXWRR_WEIGHT_CFG,</div><div class='add'>+			       TWRR_RW_CMD_MASK |</div><div class='add'>+			       FIELD_PREP(TWRR_CHAN_IDX_MASK, channel) |</div><div class='add'>+			       FIELD_PREP(TWRR_QUEUE_IDX_MASK, i) |</div><div class='add'>+			       FIELD_PREP(TWRR_VALUE_MASK, weights[i]));</div><div class='add'>+		err = read_poll_timeout(airoha_qdma_rr, status,</div><div class='add'>+					status &amp; TWRR_RW_CMD_DONE,</div><div class='add'>+					USEC_PER_MSEC, 10 * USEC_PER_MSEC,</div><div class='add'>+					true, port-&gt;qdma,</div><div class='add'>+					REG_TXWRR_WEIGHT_CFG);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_qdma_rmw(port-&gt;qdma, REG_CHAN_QOS_MODE(channel &gt;&gt; 3),</div><div class='add'>+			CHAN_QOS_MODE_MASK(channel),</div><div class='add'>+			mode &lt;&lt; __ffs(CHAN_QOS_MODE_MASK(channel)));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_tx_prio_sched(struct airoha_gdm_port *port,</div><div class='add'>+					 int channel)</div><div class='add'>+{</div><div class='add'>+	static const u16 w[AIROHA_NUM_QOS_QUEUES] = {};</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_chan_tx_sched(port, channel, TC_SCH_SP, w,</div><div class='add'>+					     ARRAY_SIZE(w));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_tx_ets_sched(struct airoha_gdm_port *port,</div><div class='add'>+					int channel,</div><div class='add'>+					struct tc_ets_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	struct tc_ets_qopt_offload_replace_params *p = &amp;opt-&gt;replace_params;</div><div class='add'>+	enum tx_sched_mode mode = TC_SCH_SP;</div><div class='add'>+	u16 w[AIROHA_NUM_QOS_QUEUES] = {};</div><div class='add'>+	int i, nstrict = 0;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;bands &gt; AIROHA_NUM_QOS_QUEUES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; p-&gt;bands; i++) {</div><div class='add'>+		if (!p-&gt;quanta[i])</div><div class='add'>+			nstrict++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* this configuration is not supported by the hw */</div><div class='add'>+	if (nstrict == AIROHA_NUM_QOS_QUEUES - 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* EN7581 SoC supports fixed QoS band priority where WRR queues have</div><div class='add'>+	 * lowest priorities with respect to SP ones.</div><div class='add'>+	 * e.g: WRR0, WRR1, .., WRRm, SP0, SP1, .., SPn</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; nstrict; i++) {</div><div class='add'>+		if (p-&gt;priomap[p-&gt;bands - i - 1] != i)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; p-&gt;bands - nstrict; i++) {</div><div class='add'>+		if (p-&gt;priomap[i] != nstrict + i)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		w[i] = p-&gt;weights[nstrict + i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!nstrict)</div><div class='add'>+		mode = TC_SCH_WRR8;</div><div class='add'>+	else if (nstrict &lt; AIROHA_NUM_QOS_QUEUES - 1)</div><div class='add'>+		mode = nstrict + 1;</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_chan_tx_sched(port, channel, mode, w,</div><div class='add'>+					     ARRAY_SIZE(w));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_get_tx_ets_stats(struct airoha_gdm_port *port,</div><div class='add'>+					int channel,</div><div class='add'>+					struct tc_ets_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	u64 cpu_tx_packets = airoha_qdma_rr(port-&gt;qdma,</div><div class='add'>+					    REG_CNTR_VAL(channel &lt;&lt; 1));</div><div class='add'>+	u64 fwd_tx_packets = airoha_qdma_rr(port-&gt;qdma,</div><div class='add'>+					    REG_CNTR_VAL((channel &lt;&lt; 1) + 1));</div><div class='add'>+	u64 tx_packets = (cpu_tx_packets - port-&gt;cpu_tx_packets) +</div><div class='add'>+			 (fwd_tx_packets - port-&gt;fwd_tx_packets);</div><div class='add'>+	_bstats_update(opt-&gt;stats.bstats, 0, tx_packets);</div><div class='add'>+</div><div class='add'>+	port-&gt;cpu_tx_packets = cpu_tx_packets;</div><div class='add'>+	port-&gt;fwd_tx_packets = fwd_tx_packets;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_setup_qdisc_ets(struct airoha_gdm_port *port,</div><div class='add'>+				     struct tc_ets_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	int channel;</div><div class='add'>+</div><div class='add'>+	if (opt-&gt;parent == TC_H_ROOT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	channel = TC_H_MAJ(opt-&gt;handle) &gt;&gt; 16;</div><div class='add'>+	channel = channel % AIROHA_NUM_QOS_CHANNELS;</div><div class='add'>+</div><div class='add'>+	switch (opt-&gt;command) {</div><div class='add'>+	case TC_ETS_REPLACE:</div><div class='add'>+		return airoha_qdma_set_tx_ets_sched(port, channel, opt);</div><div class='add'>+	case TC_ETS_DESTROY:</div><div class='add'>+		/* PRIO is default qdisc scheduler */</div><div class='add'>+		return airoha_qdma_set_tx_prio_sched(port, channel);</div><div class='add'>+	case TC_ETS_STATS:</div><div class='add'>+		return airoha_qdma_get_tx_ets_stats(port, channel, opt);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_get_rl_param(struct airoha_qdma *qdma, int queue_id,</div><div class='add'>+				    u32 addr, enum trtcm_param_type param,</div><div class='add'>+				    u32 *val_low, u32 *val_high)</div><div class='add'>+{</div><div class='add'>+	u32 idx = QDMA_METER_IDX(queue_id), group = QDMA_METER_GROUP(queue_id);</div><div class='add'>+	u32 val, config = FIELD_PREP(RATE_LIMIT_PARAM_TYPE_MASK, param) |</div><div class='add'>+			  FIELD_PREP(RATE_LIMIT_METER_GROUP_MASK, group) |</div><div class='add'>+			  FIELD_PREP(RATE_LIMIT_PARAM_INDEX_MASK, idx);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TRTCM_CFG_PARAM(addr), config);</div><div class='add'>+	if (read_poll_timeout(airoha_qdma_rr, val,</div><div class='add'>+			      val &amp; RATE_LIMIT_PARAM_RW_DONE_MASK,</div><div class='add'>+			      USEC_PER_MSEC, 10 * USEC_PER_MSEC, true, qdma,</div><div class='add'>+			      REG_TRTCM_CFG_PARAM(addr)))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	*val_low = airoha_qdma_rr(qdma, REG_TRTCM_DATA_LOW(addr));</div><div class='add'>+	if (val_high)</div><div class='add'>+		*val_high = airoha_qdma_rr(qdma, REG_TRTCM_DATA_HIGH(addr));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_rl_param(struct airoha_qdma *qdma, int queue_id,</div><div class='add'>+				    u32 addr, enum trtcm_param_type param,</div><div class='add'>+				    u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 idx = QDMA_METER_IDX(queue_id), group = QDMA_METER_GROUP(queue_id);</div><div class='add'>+	u32 config = RATE_LIMIT_PARAM_RW_MASK |</div><div class='add'>+		     FIELD_PREP(RATE_LIMIT_PARAM_TYPE_MASK, param) |</div><div class='add'>+		     FIELD_PREP(RATE_LIMIT_METER_GROUP_MASK, group) |</div><div class='add'>+		     FIELD_PREP(RATE_LIMIT_PARAM_INDEX_MASK, idx);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TRTCM_DATA_LOW(addr), val);</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TRTCM_CFG_PARAM(addr), config);</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(airoha_qdma_rr, val,</div><div class='add'>+				 val &amp; RATE_LIMIT_PARAM_RW_DONE_MASK,</div><div class='add'>+				 USEC_PER_MSEC, 10 * USEC_PER_MSEC, true,</div><div class='add'>+				 qdma, REG_TRTCM_CFG_PARAM(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_rl_config(struct airoha_qdma *qdma, int queue_id,</div><div class='add'>+				     u32 addr, bool enable, u32 enable_mask)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_get_rl_param(qdma, queue_id, addr, TRTCM_MISC_MODE,</div><div class='add'>+				       &amp;val, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = enable ? val | enable_mask : val &amp; ~enable_mask;</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_rl_param(qdma, queue_id, addr, TRTCM_MISC_MODE,</div><div class='add'>+					val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_rl_token_bucket(struct airoha_qdma *qdma,</div><div class='add'>+					   int queue_id, u32 rate_val,</div><div class='add'>+					   u32 bucket_size)</div><div class='add'>+{</div><div class='add'>+	u32 val, config, tick, unit, rate, rate_frac;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_get_rl_param(qdma, queue_id, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+				       TRTCM_MISC_MODE, &amp;config, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = airoha_qdma_rr(qdma, REG_INGRESS_TRTCM_CFG);</div><div class='add'>+	tick = FIELD_GET(INGRESS_FAST_TICK_MASK, val);</div><div class='add'>+	if (config &amp; TRTCM_TICK_SEL)</div><div class='add'>+		tick *= FIELD_GET(INGRESS_SLOW_TICK_RATIO_MASK, val);</div><div class='add'>+	if (!tick)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	unit = (config &amp; TRTCM_PKT_MODE) ? 1000000 / tick : 8000 / tick;</div><div class='add'>+	if (!unit)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rate = rate_val / unit;</div><div class='add'>+	rate_frac = rate_val % unit;</div><div class='add'>+	rate_frac = FIELD_PREP(TRTCM_TOKEN_RATE_MASK, rate_frac) / unit;</div><div class='add'>+	rate = FIELD_PREP(TRTCM_TOKEN_RATE_MASK, rate) |</div><div class='add'>+	       FIELD_PREP(TRTCM_TOKEN_RATE_FRACTION_MASK, rate_frac);</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_set_rl_param(qdma, queue_id, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+				       TRTCM_TOKEN_RATE_MODE, rate);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = bucket_size;</div><div class='add'>+	if (!(config &amp; TRTCM_PKT_MODE))</div><div class='add'>+		val = max_t(u32, val, MIN_TOKEN_SIZE);</div><div class='add'>+	val = min_t(u32, __fls(val), MAX_TOKEN_SIZE_OFFSET);</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_rl_param(qdma, queue_id, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+					TRTCM_BUCKETSIZE_SHIFT_MODE, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_init_rl_config(struct airoha_qdma *qdma, int queue_id,</div><div class='add'>+				      bool enable, enum trtcm_unit_type unit)</div><div class='add'>+{</div><div class='add'>+	bool tick_sel = queue_id == 0 || queue_id == 2 || queue_id == 8;</div><div class='add'>+	enum trtcm_param mode = TRTCM_METER_MODE;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mode |= unit == TRTCM_PACKET_UNIT ? TRTCM_PKT_MODE : 0;</div><div class='add'>+	err = airoha_qdma_set_rl_config(qdma, queue_id, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+					enable, mode);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_rl_config(qdma, queue_id, REG_INGRESS_TRTCM_CFG,</div><div class='add'>+					 tick_sel, TRTCM_TICK_SEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_get_trtcm_param(struct airoha_qdma *qdma, int channel,</div><div class='add'>+				       u32 addr, enum trtcm_param_type param,</div><div class='add'>+				       enum trtcm_mode_type mode,</div><div class='add'>+				       u32 *val_low, u32 *val_high)</div><div class='add'>+{</div><div class='add'>+	u32 idx = QDMA_METER_IDX(channel), group = QDMA_METER_GROUP(channel);</div><div class='add'>+	u32 val, config = FIELD_PREP(TRTCM_PARAM_TYPE_MASK, param) |</div><div class='add'>+			  FIELD_PREP(TRTCM_METER_GROUP_MASK, group) |</div><div class='add'>+			  FIELD_PREP(TRTCM_PARAM_INDEX_MASK, idx) |</div><div class='add'>+			  FIELD_PREP(TRTCM_PARAM_RATE_TYPE_MASK, mode);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TRTCM_CFG_PARAM(addr), config);</div><div class='add'>+	if (read_poll_timeout(airoha_qdma_rr, val,</div><div class='add'>+			      val &amp; TRTCM_PARAM_RW_DONE_MASK,</div><div class='add'>+			      USEC_PER_MSEC, 10 * USEC_PER_MSEC, true,</div><div class='add'>+			      qdma, REG_TRTCM_CFG_PARAM(addr)))</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	*val_low = airoha_qdma_rr(qdma, REG_TRTCM_DATA_LOW(addr));</div><div class='add'>+	if (val_high)</div><div class='add'>+		*val_high = airoha_qdma_rr(qdma, REG_TRTCM_DATA_HIGH(addr));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_trtcm_param(struct airoha_qdma *qdma, int channel,</div><div class='add'>+				       u32 addr, enum trtcm_param_type param,</div><div class='add'>+				       enum trtcm_mode_type mode, u32 val)</div><div class='add'>+{</div><div class='add'>+	u32 idx = QDMA_METER_IDX(channel), group = QDMA_METER_GROUP(channel);</div><div class='add'>+	u32 config = TRTCM_PARAM_RW_MASK |</div><div class='add'>+		     FIELD_PREP(TRTCM_PARAM_TYPE_MASK, param) |</div><div class='add'>+		     FIELD_PREP(TRTCM_METER_GROUP_MASK, group) |</div><div class='add'>+		     FIELD_PREP(TRTCM_PARAM_INDEX_MASK, idx) |</div><div class='add'>+		     FIELD_PREP(TRTCM_PARAM_RATE_TYPE_MASK, mode);</div><div class='add'>+</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TRTCM_DATA_LOW(addr), val);</div><div class='add'>+	airoha_qdma_wr(qdma, REG_TRTCM_CFG_PARAM(addr), config);</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout(airoha_qdma_rr, val,</div><div class='add'>+				 val &amp; TRTCM_PARAM_RW_DONE_MASK,</div><div class='add'>+				 USEC_PER_MSEC, 10 * USEC_PER_MSEC, true,</div><div class='add'>+				 qdma, REG_TRTCM_CFG_PARAM(addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_trtcm_config(struct airoha_qdma *qdma, int channel,</div><div class='add'>+					u32 addr, enum trtcm_mode_type mode,</div><div class='add'>+					bool enable, u32 enable_mask)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (airoha_qdma_get_trtcm_param(qdma, channel, addr, TRTCM_MISC_MODE,</div><div class='add'>+					mode, &amp;val, NULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = enable ? val | enable_mask : val &amp; ~enable_mask;</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_trtcm_param(qdma, channel, addr, TRTCM_MISC_MODE,</div><div class='add'>+					   mode, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_trtcm_token_bucket(struct airoha_qdma *qdma,</div><div class='add'>+					      int channel, u32 addr,</div><div class='add'>+					      enum trtcm_mode_type mode,</div><div class='add'>+					      u32 rate_val, u32 bucket_size)</div><div class='add'>+{</div><div class='add'>+	u32 val, config, tick, unit, rate, rate_frac;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (airoha_qdma_get_trtcm_param(qdma, channel, addr, TRTCM_MISC_MODE,</div><div class='add'>+					mode, &amp;config, NULL))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	val = airoha_qdma_rr(qdma, addr);</div><div class='add'>+	tick = FIELD_GET(INGRESS_FAST_TICK_MASK, val);</div><div class='add'>+	if (config &amp; TRTCM_TICK_SEL)</div><div class='add'>+		tick *= FIELD_GET(INGRESS_SLOW_TICK_RATIO_MASK, val);</div><div class='add'>+	if (!tick)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	unit = (config &amp; TRTCM_PKT_MODE) ? 1000000 / tick : 8000 / tick;</div><div class='add'>+	if (!unit)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rate = rate_val / unit;</div><div class='add'>+	rate_frac = rate_val % unit;</div><div class='add'>+	rate_frac = FIELD_PREP(TRTCM_TOKEN_RATE_MASK, rate_frac) / unit;</div><div class='add'>+	rate = FIELD_PREP(TRTCM_TOKEN_RATE_MASK, rate) |</div><div class='add'>+	       FIELD_PREP(TRTCM_TOKEN_RATE_FRACTION_MASK, rate_frac);</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_set_trtcm_param(qdma, channel, addr,</div><div class='add'>+					  TRTCM_TOKEN_RATE_MODE, mode, rate);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = max_t(u32, bucket_size, MIN_TOKEN_SIZE);</div><div class='add'>+	val = min_t(u32, __fls(val), MAX_TOKEN_SIZE_OFFSET);</div><div class='add'>+</div><div class='add'>+	return airoha_qdma_set_trtcm_param(qdma, channel, addr,</div><div class='add'>+					   TRTCM_BUCKETSIZE_SHIFT_MODE,</div><div class='add'>+					   mode, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_tx_rate_limit(struct airoha_gdm_port *port,</div><div class='add'>+					 int channel, u32 rate,</div><div class='add'>+					 u32 bucket_size)</div><div class='add'>+{</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt;= TRTCM_PEAK_MODE; i++) {</div><div class='add'>+		err = airoha_qdma_set_trtcm_config(port-&gt;qdma, channel,</div><div class='add'>+						   REG_EGRESS_TRTCM_CFG, i,</div><div class='add'>+						   !!rate, TRTCM_METER_MODE);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = airoha_qdma_set_trtcm_token_bucket(port-&gt;qdma, channel,</div><div class='add'>+							 REG_EGRESS_TRTCM_CFG,</div><div class='add'>+							 i, rate, bucket_size);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_htb_alloc_leaf_queue(struct airoha_gdm_port *port,</div><div class='add'>+					  struct tc_htb_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	u32 channel = TC_H_MIN(opt-&gt;classid) % AIROHA_NUM_QOS_CHANNELS;</div><div class='add'>+	u32 rate = div_u64(opt-&gt;rate, 1000) &lt;&lt; 3; /* kbps */</div><div class='add'>+	struct net_device *dev = port-&gt;dev;</div><div class='add'>+	int num_tx_queues = dev-&gt;real_num_tx_queues;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (opt-&gt;parent_classid != TC_HTB_CLASSID_ROOT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(opt-&gt;extack, "invalid parent classid");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = airoha_qdma_set_tx_rate_limit(port, channel, rate, opt-&gt;quantum);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(opt-&gt;extack,</div><div class='add'>+				   "failed configuring htb offload");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (opt-&gt;command == TC_HTB_NODE_MODIFY)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = netif_set_real_num_tx_queues(dev, num_tx_queues + 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		airoha_qdma_set_tx_rate_limit(port, channel, 0, opt-&gt;quantum);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(opt-&gt;extack,</div><div class='add'>+				   "failed setting real_num_tx_queues");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_bit(channel, port-&gt;qos_sq_bmap);</div><div class='add'>+	opt-&gt;qid = AIROHA_NUM_TX_RING + channel;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_qdma_set_rx_meter(struct airoha_gdm_port *port,</div><div class='add'>+				    u32 rate, u32 bucket_size,</div><div class='add'>+				    enum trtcm_unit_type unit_type)</div><div class='add'>+{</div><div class='add'>+	struct airoha_qdma *qdma = port-&gt;qdma;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(qdma-&gt;q_rx); i++) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		if (!qdma-&gt;q_rx[i].ndesc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = airoha_qdma_init_rl_config(qdma, i, !!rate, unit_type);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		err = airoha_qdma_set_rl_token_bucket(qdma, i, rate,</div><div class='add'>+						      bucket_size);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_matchall_act_validate(struct tc_cls_matchall_offload *f)</div><div class='add'>+{</div><div class='add'>+	const struct flow_action *actions = &amp;f-&gt;rule-&gt;action;</div><div class='add'>+	const struct flow_action_entry *act;</div><div class='add'>+</div><div class='add'>+	if (!flow_action_has_entries(actions)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack,</div><div class='add'>+				   "filter run with no actions");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!flow_offload_has_one_action(actions)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack,</div><div class='add'>+				   "only once action per filter is supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	act = &amp;actions-&gt;entries[0];</div><div class='add'>+	if (act-&gt;id != FLOW_ACTION_POLICE) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack, "unsupported action");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.exceed.act_id != FLOW_ACTION_DROP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack,</div><div class='add'>+				   "invalid exceed action id");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.notexceed.act_id != FLOW_ACTION_ACCEPT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack,</div><div class='add'>+				   "invalid notexceed action id");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.notexceed.act_id == FLOW_ACTION_ACCEPT &amp;&amp;</div><div class='add'>+	    !flow_action_is_last_entry(actions, act)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack,</div><div class='add'>+				   "action accept must be last");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.peakrate_bytes_ps || act-&gt;police.avrate ||</div><div class='add'>+	    act-&gt;police.overhead || act-&gt;police.mtu) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(f-&gt;common.extack,</div><div class='add'>+				   "peakrate/avrate/overhead/mtu unsupported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_tc_matchall(struct net_device *dev,</div><div class='add'>+				  struct tc_cls_matchall_offload *f)</div><div class='add'>+{</div><div class='add'>+	enum trtcm_unit_type unit_type = TRTCM_BYTE_UNIT;</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	u32 rate = 0, bucket_size = 0;</div><div class='add'>+</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case TC_CLSMATCHALL_REPLACE: {</div><div class='add'>+		const struct flow_action_entry *act;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = airoha_tc_matchall_act_validate(f);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		act = &amp;f-&gt;rule-&gt;action.entries[0];</div><div class='add'>+		if (act-&gt;police.rate_pkt_ps) {</div><div class='add'>+			rate = act-&gt;police.rate_pkt_ps;</div><div class='add'>+			bucket_size = act-&gt;police.burst_pkt;</div><div class='add'>+			unit_type = TRTCM_PACKET_UNIT;</div><div class='add'>+		} else {</div><div class='add'>+			rate = div_u64(act-&gt;police.rate_bytes_ps, 1000);</div><div class='add'>+			rate = rate &lt;&lt; 3; /* Kbps */</div><div class='add'>+			bucket_size = act-&gt;police.burst;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	}</div><div class='add'>+	case TC_CLSMATCHALL_DESTROY:</div><div class='add'>+		return airoha_qdma_set_rx_meter(port, rate, bucket_size,</div><div class='add'>+						unit_type);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_setup_tc_block_cb(enum tc_setup_type type,</div><div class='add'>+					void *type_data, void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = cb_priv;</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+</div><div class='add'>+	if (!tc_can_offload(dev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_CLSFLOWER:</div><div class='add'>+		return airoha_ppe_setup_tc_block_cb(&amp;eth-&gt;ppe-&gt;dev, type_data);</div><div class='add'>+	case TC_SETUP_CLSMATCHALL:</div><div class='add'>+		return airoha_dev_tc_matchall(dev, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_setup_tc_block(struct airoha_gdm_port *port,</div><div class='add'>+				     struct flow_block_offload *f)</div><div class='add'>+{</div><div class='add'>+	flow_setup_cb_t *cb = airoha_dev_setup_tc_block_cb;</div><div class='add'>+	static LIST_HEAD(block_cb_list);</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	f-&gt;driver_block_list = &amp;block_cb_list;</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_BLOCK_BIND:</div><div class='add'>+		block_cb = flow_block_cb_lookup(f-&gt;block, cb, port-&gt;dev);</div><div class='add'>+		if (block_cb) {</div><div class='add'>+			flow_block_cb_incref(block_cb);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		block_cb = flow_block_cb_alloc(cb, port-&gt;dev, port-&gt;dev, NULL);</div><div class='add'>+		if (IS_ERR(block_cb))</div><div class='add'>+			return PTR_ERR(block_cb);</div><div class='add'>+</div><div class='add'>+		flow_block_cb_incref(block_cb);</div><div class='add'>+		flow_block_cb_add(block_cb, f);</div><div class='add'>+		list_add_tail(&amp;block_cb-&gt;driver_list, &amp;block_cb_list);</div><div class='add'>+		return 0;</div><div class='add'>+	case FLOW_BLOCK_UNBIND:</div><div class='add'>+		block_cb = flow_block_cb_lookup(f-&gt;block, cb, port-&gt;dev);</div><div class='add'>+		if (!block_cb)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		if (!flow_block_cb_decref(block_cb)) {</div><div class='add'>+			flow_block_cb_remove(block_cb, f);</div><div class='add'>+			list_del(&amp;block_cb-&gt;driver_list);</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_tc_remove_htb_queue(struct airoha_gdm_port *port, int queue)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = port-&gt;dev;</div><div class='add'>+</div><div class='add'>+	netif_set_real_num_tx_queues(dev, dev-&gt;real_num_tx_queues - 1);</div><div class='add'>+	airoha_qdma_set_tx_rate_limit(port, queue + 1, 0, 0);</div><div class='add'>+	clear_bit(queue, port-&gt;qos_sq_bmap);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_htb_delete_leaf_queue(struct airoha_gdm_port *port,</div><div class='add'>+					   struct tc_htb_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	u32 channel = TC_H_MIN(opt-&gt;classid) % AIROHA_NUM_QOS_CHANNELS;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(channel, port-&gt;qos_sq_bmap)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(opt-&gt;extack, "invalid queue id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_tc_remove_htb_queue(port, channel);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_htb_destroy(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	int q;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(q, port-&gt;qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS)</div><div class='add'>+		airoha_tc_remove_htb_queue(port, q);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_get_htb_get_leaf_queue(struct airoha_gdm_port *port,</div><div class='add'>+					    struct tc_htb_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	u32 channel = TC_H_MIN(opt-&gt;classid) % AIROHA_NUM_QOS_CHANNELS;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(channel, port-&gt;qos_sq_bmap)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(opt-&gt;extack, "invalid queue id");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	opt-&gt;qid = AIROHA_NUM_TX_RING + channel;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_tc_setup_qdisc_htb(struct airoha_gdm_port *port,</div><div class='add'>+				     struct tc_htb_qopt_offload *opt)</div><div class='add'>+{</div><div class='add'>+	switch (opt-&gt;command) {</div><div class='add'>+	case TC_HTB_CREATE:</div><div class='add'>+		break;</div><div class='add'>+	case TC_HTB_DESTROY:</div><div class='add'>+		return airoha_tc_htb_destroy(port);</div><div class='add'>+	case TC_HTB_NODE_MODIFY:</div><div class='add'>+	case TC_HTB_LEAF_ALLOC_QUEUE:</div><div class='add'>+		return airoha_tc_htb_alloc_leaf_queue(port, opt);</div><div class='add'>+	case TC_HTB_LEAF_DEL:</div><div class='add'>+	case TC_HTB_LEAF_DEL_LAST:</div><div class='add'>+	case TC_HTB_LEAF_DEL_LAST_FORCE:</div><div class='add'>+		return airoha_tc_htb_delete_leaf_queue(port, opt);</div><div class='add'>+	case TC_HTB_LEAF_QUERY_QUEUE:</div><div class='add'>+		return airoha_tc_get_htb_get_leaf_queue(port, opt);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_dev_tc_setup(struct net_device *dev, enum tc_setup_type type,</div><div class='add'>+			       void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_ETS:</div><div class='add'>+		return airoha_tc_setup_qdisc_ets(port, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_HTB:</div><div class='add'>+		return airoha_tc_setup_qdisc_htb(port, type_data);</div><div class='add'>+	case TC_SETUP_BLOCK:</div><div class='add'>+	case TC_SETUP_FT:</div><div class='add'>+		return airoha_dev_setup_tc_block(port, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops airoha_netdev_ops = {</div><div class='add'>+	.ndo_init		= airoha_dev_init,</div><div class='add'>+	.ndo_open		= airoha_dev_open,</div><div class='add'>+	.ndo_stop		= airoha_dev_stop,</div><div class='add'>+	.ndo_change_mtu		= airoha_dev_change_mtu,</div><div class='add'>+	.ndo_select_queue	= airoha_dev_select_queue,</div><div class='add'>+	.ndo_start_xmit		= airoha_dev_xmit,</div><div class='add'>+	.ndo_get_stats64        = airoha_dev_get_stats64,</div><div class='add'>+	.ndo_set_mac_address	= airoha_dev_set_macaddr,</div><div class='add'>+	.ndo_setup_tc		= airoha_dev_tc_setup,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops airoha_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= airoha_ethtool_get_drvinfo,</div><div class='add'>+	.get_eth_mac_stats      = airoha_ethtool_get_mac_stats,</div><div class='add'>+	.get_rmon_stats		= airoha_ethtool_get_rmon_stats,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int airoha_metadata_dst_alloc(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(port-&gt;dsa_meta); i++) {</div><div class='add'>+		struct metadata_dst *md_dst;</div><div class='add'>+</div><div class='add'>+		md_dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+		if (!md_dst)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		md_dst-&gt;u.port_info.port_id = i;</div><div class='add'>+		port-&gt;dsa_meta[i] = md_dst;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_metadata_dst_free(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(port-&gt;dsa_meta); i++) {</div><div class='add'>+		if (!port-&gt;dsa_meta[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		metadata_dst_free(port-&gt;dsa_meta[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool airoha_is_valid_gdm_port(struct airoha_eth *eth,</div><div class='add'>+			      struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;ports); i++) {</div><div class='add'>+		if (eth-&gt;ports[i] == port)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_alloc_gdm_port(struct airoha_eth *eth,</div><div class='add'>+				 struct device_node *np, int index)</div><div class='add'>+{</div><div class='add'>+	const __be32 *id_ptr = of_get_property(np, "reg", NULL);</div><div class='add'>+	struct airoha_gdm_port *port;</div><div class='add'>+	struct airoha_qdma *qdma;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int err, p;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	if (!id_ptr) {</div><div class='add'>+		dev_err(eth-&gt;dev, "missing gdm port id\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	id = be32_to_cpup(id_ptr);</div><div class='add'>+	p = id - 1;</div><div class='add'>+</div><div class='add'>+	if (!id || id &gt; ARRAY_SIZE(eth-&gt;ports)) {</div><div class='add'>+		dev_err(eth-&gt;dev, "invalid gdm port id: %d\n", id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eth-&gt;ports[p]) {</div><div class='add'>+		dev_err(eth-&gt;dev, "duplicate gdm port id: %d\n", id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev = devm_alloc_etherdev_mqs(eth-&gt;dev, sizeof(*port),</div><div class='add'>+				      AIROHA_NUM_NETDEV_TX_RINGS,</div><div class='add'>+				      AIROHA_NUM_RX_RING);</div><div class='add'>+	if (!dev) {</div><div class='add'>+		dev_err(eth-&gt;dev, "alloc_etherdev failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qdma = &amp;eth-&gt;qdma[index % AIROHA_MAX_NUM_QDMA];</div><div class='add'>+	dev-&gt;netdev_ops = &amp;airoha_netdev_ops;</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;airoha_ethtool_ops;</div><div class='add'>+	dev-&gt;max_mtu = AIROHA_MAX_MTU;</div><div class='add'>+	dev-&gt;watchdog_timeo = 5 * HZ;</div><div class='add'>+	dev-&gt;hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |</div><div class='add'>+			   NETIF_F_TSO6 | NETIF_F_IPV6_CSUM |</div><div class='add'>+			   NETIF_F_SG | NETIF_F_TSO |</div><div class='add'>+			   NETIF_F_HW_TC;</div><div class='add'>+	dev-&gt;features |= dev-&gt;hw_features;</div><div class='add'>+	dev-&gt;vlan_features = dev-&gt;hw_features;</div><div class='add'>+	dev-&gt;dev.of_node = np;</div><div class='add'>+	dev-&gt;irq = qdma-&gt;irq_banks[0].irq;</div><div class='add'>+	SET_NETDEV_DEV(dev, eth-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* reserve hw queues for HTB offloading */</div><div class='add'>+	err = netif_set_real_num_tx_queues(dev, AIROHA_NUM_TX_RING);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = of_get_ethdev_address(np, dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -EPROBE_DEFER)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		eth_hw_addr_random(dev);</div><div class='add'>+		dev_info(eth-&gt;dev, "generated random MAC address %pM\n",</div><div class='add'>+			 dev-&gt;dev_addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port = netdev_priv(dev);</div><div class='add'>+	u64_stats_init(&amp;port-&gt;stats.syncp);</div><div class='add'>+	spin_lock_init(&amp;port-&gt;stats.lock);</div><div class='add'>+	port-&gt;qdma = qdma;</div><div class='add'>+	port-&gt;dev = dev;</div><div class='add'>+	port-&gt;id = id;</div><div class='add'>+	eth-&gt;ports[p] = port;</div><div class='add'>+</div><div class='add'>+	err = airoha_metadata_dst_alloc(port);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = register_netdev(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_metadata_dst;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_metadata_dst:</div><div class='add'>+	airoha_metadata_dst_free(port);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct reset_control_bulk_data *xsi_rsts;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct airoha_eth *eth;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	eth = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*eth), GFP_KERNEL);</div><div class='add'>+	if (!eth)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	eth-&gt;soc = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!eth-&gt;soc)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	eth-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	err = dma_set_mask_and_coherent(eth-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(eth-&gt;dev, "failed configuring DMA mask\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eth-&gt;fe_regs = devm_platform_ioremap_resource_byname(pdev, "fe");</div><div class='add'>+	if (IS_ERR(eth-&gt;fe_regs))</div><div class='add'>+		return dev_err_probe(eth-&gt;dev, PTR_ERR(eth-&gt;fe_regs),</div><div class='add'>+				     "failed to iomap fe regs\n");</div><div class='add'>+</div><div class='add'>+	eth-&gt;rsts[0].id = "fe";</div><div class='add'>+	eth-&gt;rsts[1].id = "pdma";</div><div class='add'>+	eth-&gt;rsts[2].id = "qdma";</div><div class='add'>+	err = devm_reset_control_bulk_get_exclusive(eth-&gt;dev,</div><div class='add'>+						    ARRAY_SIZE(eth-&gt;rsts),</div><div class='add'>+						    eth-&gt;rsts);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(eth-&gt;dev, "failed to get bulk reset lines\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xsi_rsts = devm_kcalloc(eth-&gt;dev,</div><div class='add'>+				eth-&gt;soc-&gt;num_xsi_rsts, sizeof(*xsi_rsts),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!xsi_rsts)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	eth-&gt;xsi_rsts = xsi_rsts;</div><div class='add'>+	for (i = 0; i &lt; eth-&gt;soc-&gt;num_xsi_rsts; i++)</div><div class='add'>+		eth-&gt;xsi_rsts[i].id = eth-&gt;soc-&gt;xsi_rsts_names[i];</div><div class='add'>+</div><div class='add'>+	err = devm_reset_control_bulk_get_exclusive(eth-&gt;dev,</div><div class='add'>+						    eth-&gt;soc-&gt;num_xsi_rsts,</div><div class='add'>+						    eth-&gt;xsi_rsts);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(eth-&gt;dev, "failed to get bulk xsi reset lines\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eth-&gt;napi_dev = alloc_netdev_dummy(0);</div><div class='add'>+	if (!eth-&gt;napi_dev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Enable threaded NAPI by default */</div><div class='add'>+	eth-&gt;napi_dev-&gt;threaded = true;</div><div class='add'>+	strscpy(eth-&gt;napi_dev-&gt;name, "qdma_eth", sizeof(eth-&gt;napi_dev-&gt;name));</div><div class='add'>+	platform_set_drvdata(pdev, eth);</div><div class='add'>+</div><div class='add'>+	err = airoha_hw_init(pdev, eth);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_hw_cleanup;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;qdma); i++)</div><div class='add'>+		airoha_qdma_start_napi(&amp;eth-&gt;qdma[i]);</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	for_each_child_of_node(pdev-&gt;dev.of_node, np) {</div><div class='add'>+		if (!of_device_is_compatible(np, "airoha,eth-mac"))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!of_device_is_available(np))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = airoha_alloc_gdm_port(eth, np, i++);</div><div class='add'>+		if (err) {</div><div class='add'>+			of_node_put(np);</div><div class='add'>+			goto error_napi_stop;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error_napi_stop:</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;qdma); i++)</div><div class='add'>+		airoha_qdma_stop_napi(&amp;eth-&gt;qdma[i]);</div><div class='add'>+	airoha_ppe_deinit(eth);</div><div class='add'>+error_hw_cleanup:</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;qdma); i++)</div><div class='add'>+		airoha_hw_cleanup(&amp;eth-&gt;qdma[i]);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;ports); i++) {</div><div class='add'>+		struct airoha_gdm_port *port = eth-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		if (port &amp;&amp; port-&gt;dev-&gt;reg_state == NETREG_REGISTERED) {</div><div class='add'>+			unregister_netdev(port-&gt;dev);</div><div class='add'>+			airoha_metadata_dst_free(port);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	free_netdev(eth-&gt;napi_dev);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = platform_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;qdma); i++) {</div><div class='add'>+		airoha_qdma_stop_napi(&amp;eth-&gt;qdma[i]);</div><div class='add'>+		airoha_hw_cleanup(&amp;eth-&gt;qdma[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(eth-&gt;ports); i++) {</div><div class='add'>+		struct airoha_gdm_port *port = eth-&gt;ports[i];</div><div class='add'>+</div><div class='add'>+		if (!port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		airoha_dev_stop(port-&gt;dev);</div><div class='add'>+		unregister_netdev(port-&gt;dev);</div><div class='add'>+		airoha_metadata_dst_free(port);</div><div class='add'>+	}</div><div class='add'>+	free_netdev(eth-&gt;napi_dev);</div><div class='add'>+</div><div class='add'>+	airoha_ppe_deinit(eth);</div><div class='add'>+	platform_set_drvdata(pdev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const en7581_xsi_rsts_names[] = {</div><div class='add'>+	"xsi-mac",</div><div class='add'>+	"hsi0-mac",</div><div class='add'>+	"hsi1-mac",</div><div class='add'>+	"hsi-mac",</div><div class='add'>+	"xfp-mac",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int airoha_en7581_get_src_port_id(struct airoha_gdm_port *port, int nbq)</div><div class='add'>+{</div><div class='add'>+	switch (port-&gt;id) {</div><div class='add'>+	case 3:</div><div class='add'>+		/* 7581 SoC supports PCIe serdes on GDM3 port */</div><div class='add'>+		if (nbq == 4)</div><div class='add'>+			return HSGMII_LAN_7581_PCIE0_SRCPORT;</div><div class='add'>+		if (nbq == 5)</div><div class='add'>+			return HSGMII_LAN_7581_PCIE1_SRCPORT;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		/* 7581 SoC supports eth and usb serdes on GDM4 port */</div><div class='add'>+		if (!nbq)</div><div class='add'>+			return HSGMII_LAN_7581_ETH_SRCPORT;</div><div class='add'>+		if (nbq == 1)</div><div class='add'>+			return HSGMII_LAN_7581_USB_SRCPORT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char * const an7583_xsi_rsts_names[] = {</div><div class='add'>+	"xsi-mac",</div><div class='add'>+	"hsi0-mac",</div><div class='add'>+	"hsi1-mac",</div><div class='add'>+	"xfp-mac",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int airoha_an7583_get_src_port_id(struct airoha_gdm_port *port, int nbq)</div><div class='add'>+{</div><div class='add'>+	switch (port-&gt;id) {</div><div class='add'>+	case 3:</div><div class='add'>+		/* 7583 SoC supports eth serdes on GDM3 port */</div><div class='add'>+		if (!nbq)</div><div class='add'>+			return HSGMII_LAN_7583_ETH_SRCPORT;</div><div class='add'>+		break;</div><div class='add'>+	case 4:</div><div class='add'>+		/* 7583 SoC supports PCIe and USB serdes on GDM4 port */</div><div class='add'>+		if (!nbq)</div><div class='add'>+			return HSGMII_LAN_7583_PCIE_SRCPORT;</div><div class='add'>+		if (nbq == 1)</div><div class='add'>+			return HSGMII_LAN_7583_USB_SRCPORT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct airoha_eth_soc_data en7581_soc_data = {</div><div class='add'>+	.version = 0x7581,</div><div class='add'>+	.xsi_rsts_names = en7581_xsi_rsts_names,</div><div class='add'>+	.num_xsi_rsts = ARRAY_SIZE(en7581_xsi_rsts_names),</div><div class='add'>+	.num_ppe = 2,</div><div class='add'>+	.ops = {</div><div class='add'>+		.get_src_port_id = airoha_en7581_get_src_port_id,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct airoha_eth_soc_data an7583_soc_data = {</div><div class='add'>+	.version = 0x7583,</div><div class='add'>+	.xsi_rsts_names = an7583_xsi_rsts_names,</div><div class='add'>+	.num_xsi_rsts = ARRAY_SIZE(an7583_xsi_rsts_names),</div><div class='add'>+	.num_ppe = 1,</div><div class='add'>+	.ops = {</div><div class='add'>+		.get_src_port_id = airoha_an7583_get_src_port_id,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_airoha_match[] = {</div><div class='add'>+	{ .compatible = "airoha,en7581-eth", .data = &amp;en7581_soc_data },</div><div class='add'>+	{ .compatible = "airoha,an7583-eth", .data = &amp;an7583_soc_data },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, of_airoha_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver airoha_driver = {</div><div class='add'>+	.probe = airoha_probe,</div><div class='add'>+	.remove = airoha_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+		.of_match_table = of_airoha_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(airoha_driver);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Ethernet driver for Airoha SoC");</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h<br/>new file mode 100644<br/>index 000000000000..fbbc58133364<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/airoha_eth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/airoha_eth.h</a></div><div class='hunk'>@@ -0,0 +1,673 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef AIROHA_ETH_H</div><div class='add'>+#define AIROHA_ETH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/soc/airoha/airoha_offload.h&gt;</div><div class='add'>+#include &lt;net/dsa.h&gt;</div><div class='add'>+</div><div class='add'>+#define AIROHA_MAX_NUM_GDM_PORTS	4</div><div class='add'>+#define AIROHA_MAX_NUM_QDMA		2</div><div class='add'>+#define AIROHA_MAX_NUM_IRQ_BANKS	4</div><div class='add'>+#define AIROHA_MAX_DSA_PORTS		7</div><div class='add'>+#define AIROHA_MAX_NUM_RSTS		3</div><div class='add'>+#define AIROHA_MAX_MTU			9216</div><div class='add'>+#define AIROHA_MAX_PACKET_SIZE		2048</div><div class='add'>+#define AIROHA_NUM_QOS_CHANNELS		4</div><div class='add'>+#define AIROHA_NUM_QOS_QUEUES		8</div><div class='add'>+#define AIROHA_NUM_TX_RING		32</div><div class='add'>+#define AIROHA_NUM_RX_RING		32</div><div class='add'>+#define AIROHA_NUM_NETDEV_TX_RINGS	(AIROHA_NUM_TX_RING + \</div><div class='add'>+					 AIROHA_NUM_QOS_CHANNELS)</div><div class='add'>+#define AIROHA_FE_MC_MAX_VLAN_TABLE	64</div><div class='add'>+#define AIROHA_FE_MC_MAX_VLAN_PORT	16</div><div class='add'>+#define AIROHA_NUM_TX_IRQ		2</div><div class='add'>+#define HW_DSCP_NUM			2048</div><div class='add'>+#define IRQ_QUEUE_LEN(_n)		((_n) ? 1024 : 2048)</div><div class='add'>+#define TX_DSCP_NUM			1024</div><div class='add'>+#define RX_DSCP_NUM(_n)			\</div><div class='add'>+	((_n) ==  2 ? 128 :		\</div><div class='add'>+	 (_n) == 11 ? 128 :		\</div><div class='add'>+	 (_n) == 15 ? 128 :		\</div><div class='add'>+	 (_n) ==  0 ? 1024 : 16)</div><div class='add'>+</div><div class='add'>+#define PSE_RSV_PAGES			128</div><div class='add'>+#define PSE_QUEUE_RSV_PAGES		64</div><div class='add'>+</div><div class='add'>+#define QDMA_METER_IDX(_n)		((_n) &amp; 0xff)</div><div class='add'>+#define QDMA_METER_GROUP(_n)		(((_n) &gt;&gt; 8) &amp; 0x3)</div><div class='add'>+</div><div class='add'>+#define PPE_SRAM_NUM_ENTRIES		(8 * 1024)</div><div class='add'>+#define PPE_STATS_NUM_ENTRIES		(4 * 1024)</div><div class='add'>+#define PPE_DRAM_NUM_ENTRIES		(16 * 1024)</div><div class='add'>+#define PPE_ENTRY_SIZE			80</div><div class='add'>+#define PPE_RAM_NUM_ENTRIES_SHIFT(_n)	(__ffs((_n) &gt;&gt; 10))</div><div class='add'>+</div><div class='add'>+#define MTK_HDR_LEN			4</div><div class='add'>+#define MTK_HDR_XMIT_TAGGED_TPID_8100	1</div><div class='add'>+#define MTK_HDR_XMIT_TAGGED_TPID_88A8	2</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	QDMA_INT_REG_IDX0,</div><div class='add'>+	QDMA_INT_REG_IDX1,</div><div class='add'>+	QDMA_INT_REG_IDX2,</div><div class='add'>+	QDMA_INT_REG_IDX3,</div><div class='add'>+	QDMA_INT_REG_IDX4,</div><div class='add'>+	QDMA_INT_REG_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	HSGMII_LAN_7581_PCIE0_SRCPORT	= 0x16,</div><div class='add'>+	HSGMII_LAN_7581_PCIE1_SRCPORT,</div><div class='add'>+	HSGMII_LAN_7581_ETH_SRCPORT,</div><div class='add'>+	HSGMII_LAN_7581_USB_SRCPORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	HSGMII_LAN_7583_ETH_SRCPORT	= 0x16,</div><div class='add'>+	HSGMII_LAN_7583_PCIE_SRCPORT	= 0x18,</div><div class='add'>+	HSGMII_LAN_7583_USB_SRCPORT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	XSI_PCIE0_VIP_PORT_MASK	= BIT(22),</div><div class='add'>+	XSI_PCIE1_VIP_PORT_MASK	= BIT(23),</div><div class='add'>+	XSI_USB_VIP_PORT_MASK	= BIT(25),</div><div class='add'>+	XSI_ETH_VIP_PORT_MASK	= BIT(24),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	DEV_STATE_INITIALIZED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CDM_CRSN_QSEL_Q1 = 1,</div><div class='add'>+	CDM_CRSN_QSEL_Q5 = 5,</div><div class='add'>+	CDM_CRSN_QSEL_Q6 = 6,</div><div class='add'>+	CDM_CRSN_QSEL_Q15 = 15,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CRSN_08 = 0x8,</div><div class='add'>+	CRSN_21 = 0x15, /* KA */</div><div class='add'>+	CRSN_22 = 0x16, /* hit bind and force route to CPU */</div><div class='add'>+	CRSN_24 = 0x18,</div><div class='add'>+	CRSN_25 = 0x19,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum airoha_gdm_index {</div><div class='add'>+	AIROHA_GDM1_IDX = 1,</div><div class='add'>+	AIROHA_GDM2_IDX = 2,</div><div class='add'>+	AIROHA_GDM3_IDX = 3,</div><div class='add'>+	AIROHA_GDM4_IDX = 4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	FE_PSE_PORT_CDM1,</div><div class='add'>+	FE_PSE_PORT_GDM1,</div><div class='add'>+	FE_PSE_PORT_GDM2,</div><div class='add'>+	FE_PSE_PORT_GDM3,</div><div class='add'>+	FE_PSE_PORT_PPE1,</div><div class='add'>+	FE_PSE_PORT_CDM2,</div><div class='add'>+	FE_PSE_PORT_CDM3,</div><div class='add'>+	FE_PSE_PORT_CDM4,</div><div class='add'>+	FE_PSE_PORT_PPE2,</div><div class='add'>+	FE_PSE_PORT_GDM4,</div><div class='add'>+	FE_PSE_PORT_CDM5,</div><div class='add'>+	FE_PSE_PORT_DROP = 0xf,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tx_sched_mode {</div><div class='add'>+	TC_SCH_WRR8,</div><div class='add'>+	TC_SCH_SP,</div><div class='add'>+	TC_SCH_WRR7,</div><div class='add'>+	TC_SCH_WRR6,</div><div class='add'>+	TC_SCH_WRR5,</div><div class='add'>+	TC_SCH_WRR4,</div><div class='add'>+	TC_SCH_WRR3,</div><div class='add'>+	TC_SCH_WRR2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum trtcm_unit_type {</div><div class='add'>+	TRTCM_BYTE_UNIT,</div><div class='add'>+	TRTCM_PACKET_UNIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum trtcm_param_type {</div><div class='add'>+	TRTCM_MISC_MODE, /* meter_en, pps_mode, tick_sel */</div><div class='add'>+	TRTCM_TOKEN_RATE_MODE,</div><div class='add'>+	TRTCM_BUCKETSIZE_SHIFT_MODE,</div><div class='add'>+	TRTCM_BUCKET_COUNTER_MODE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum trtcm_mode_type {</div><div class='add'>+	TRTCM_COMMIT_MODE,</div><div class='add'>+	TRTCM_PEAK_MODE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum trtcm_param {</div><div class='add'>+	TRTCM_TICK_SEL = BIT(0),</div><div class='add'>+	TRTCM_PKT_MODE = BIT(1),</div><div class='add'>+	TRTCM_METER_MODE = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MIN_TOKEN_SIZE				4096</div><div class='add'>+#define MAX_TOKEN_SIZE_OFFSET			17</div><div class='add'>+#define TRTCM_TOKEN_RATE_MASK			GENMASK(23, 6)</div><div class='add'>+#define TRTCM_TOKEN_RATE_FRACTION_MASK		GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_queue_entry {</div><div class='add'>+	union {</div><div class='add'>+		void *buf;</div><div class='add'>+		struct {</div><div class='add'>+			struct list_head list;</div><div class='add'>+			struct sk_buff *skb;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	u16 dma_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_queue {</div><div class='add'>+	struct airoha_qdma *qdma;</div><div class='add'>+</div><div class='add'>+	/* protect concurrent queue accesses */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct airoha_queue_entry *entry;</div><div class='add'>+	struct airoha_qdma_desc *desc;</div><div class='add'>+	u16 head;</div><div class='add'>+	u16 tail;</div><div class='add'>+</div><div class='add'>+	int queued;</div><div class='add'>+	int ndesc;</div><div class='add'>+	int free_thr;</div><div class='add'>+	int buf_size;</div><div class='add'>+</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	struct page_pool *page_pool;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	struct list_head tx_list;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_tx_irq_queue {</div><div class='add'>+	struct airoha_qdma *qdma;</div><div class='add'>+</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	int size;</div><div class='add'>+	u32 *q;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_hw_stats {</div><div class='add'>+	/* protect concurrent hw_stats accesses */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+</div><div class='add'>+	/* get_stats64 */</div><div class='add'>+	u64 rx_ok_pkts;</div><div class='add'>+	u64 tx_ok_pkts;</div><div class='add'>+	u64 rx_ok_bytes;</div><div class='add'>+	u64 tx_ok_bytes;</div><div class='add'>+	u64 rx_multicast;</div><div class='add'>+	u64 rx_errors;</div><div class='add'>+	u64 rx_drops;</div><div class='add'>+	u64 tx_drops;</div><div class='add'>+	u64 rx_crc_error;</div><div class='add'>+	u64 rx_over_errors;</div><div class='add'>+	/* ethtool stats */</div><div class='add'>+	u64 tx_broadcast;</div><div class='add'>+	u64 tx_multicast;</div><div class='add'>+	u64 tx_len[7];</div><div class='add'>+	u64 rx_broadcast;</div><div class='add'>+	u64 rx_fragment;</div><div class='add'>+	u64 rx_jabber;</div><div class='add'>+	u64 rx_len[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	AIROHA_FOE_STATE_INVALID,</div><div class='add'>+	AIROHA_FOE_STATE_UNBIND,</div><div class='add'>+	AIROHA_FOE_STATE_BIND,</div><div class='add'>+	AIROHA_FOE_STATE_FIN</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PPE_PKT_TYPE_IPV4_HNAPT = 0,</div><div class='add'>+	PPE_PKT_TYPE_IPV4_ROUTE = 1,</div><div class='add'>+	PPE_PKT_TYPE_BRIDGE = 2,</div><div class='add'>+	PPE_PKT_TYPE_IPV4_DSLITE = 3,</div><div class='add'>+	PPE_PKT_TYPE_IPV6_ROUTE_3T = 4,</div><div class='add'>+	PPE_PKT_TYPE_IPV6_ROUTE_5T = 5,</div><div class='add'>+	PPE_PKT_TYPE_IPV6_6RD = 7,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_MAC_SMAC_ID		GENMASK(20, 16)</div><div class='add'>+#define AIROHA_FOE_MAC_PPPOE_ID		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_MAC_WDMA_QOS		GENMASK(15, 12)</div><div class='add'>+#define AIROHA_FOE_MAC_WDMA_BAND	BIT(11)</div><div class='add'>+#define AIROHA_FOE_MAC_WDMA_WCID	GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_foe_mac_info_common {</div><div class='add'>+	u16 vlan1;</div><div class='add'>+	u16 etype;</div><div class='add'>+</div><div class='add'>+	u32 dest_mac_hi;</div><div class='add'>+</div><div class='add'>+	u16 vlan2;</div><div class='add'>+	u16 dest_mac_lo;</div><div class='add'>+</div><div class='add'>+	u32 src_mac_hi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_mac_info {</div><div class='add'>+	struct airoha_foe_mac_info_common common;</div><div class='add'>+</div><div class='add'>+	u16 pppoe_id;</div><div class='add'>+	u16 src_mac_lo;</div><div class='add'>+</div><div class='add'>+	u32 meter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_IB1_UNBIND_PREBIND		BIT(24)</div><div class='add'>+#define AIROHA_FOE_IB1_UNBIND_PACKETS		GENMASK(23, 8)</div><div class='add'>+#define AIROHA_FOE_IB1_UNBIND_TIMESTAMP		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_STATIC		BIT(31)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_UDP			BIT(30)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_STATE		GENMASK(29, 28)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_PACKET_TYPE		GENMASK(27, 25)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_TTL			BIT(24)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_TUNNEL_DECAP	BIT(23)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_PPPOE		BIT(22)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_VPM			GENMASK(21, 20)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_VLAN_LAYER		GENMASK(19, 16)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_KEEPALIVE		BIT(15)</div><div class='add'>+#define AIROHA_FOE_IB1_BIND_TIMESTAMP		GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_IB2_DSCP			GENMASK(31, 24)</div><div class='add'>+#define AIROHA_FOE_IB2_PORT_AG			GENMASK(23, 13)</div><div class='add'>+#define AIROHA_FOE_IB2_PCP			BIT(12)</div><div class='add'>+#define AIROHA_FOE_IB2_MULTICAST		BIT(11)</div><div class='add'>+#define AIROHA_FOE_IB2_FAST_PATH		BIT(10)</div><div class='add'>+#define AIROHA_FOE_IB2_PSE_QOS			BIT(9)</div><div class='add'>+#define AIROHA_FOE_IB2_PSE_PORT			GENMASK(8, 5)</div><div class='add'>+#define AIROHA_FOE_IB2_NBQ			GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_ACTDP			GENMASK(31, 24)</div><div class='add'>+#define AIROHA_FOE_SHAPER_ID			GENMASK(23, 16)</div><div class='add'>+#define AIROHA_FOE_CHANNEL			GENMASK(15, 11)</div><div class='add'>+#define AIROHA_FOE_QID				GENMASK(10, 8)</div><div class='add'>+#define AIROHA_FOE_DPI				BIT(7)</div><div class='add'>+#define AIROHA_FOE_TUNNEL			BIT(6)</div><div class='add'>+#define AIROHA_FOE_TUNNEL_ID			GENMASK(5, 0)</div><div class='add'>+</div><div class='add'>+#define AIROHA_FOE_TUNNEL_MTU			GENMASK(31, 16)</div><div class='add'>+#define AIROHA_FOE_ACNT_GRP3			GENMASK(15, 9)</div><div class='add'>+#define AIROHA_FOE_METER_GRP3			GENMASK(8, 5)</div><div class='add'>+#define AIROHA_FOE_METER_GRP2			GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_foe_bridge {</div><div class='add'>+	u32 dest_mac_hi;</div><div class='add'>+</div><div class='add'>+	u16 src_mac_hi;</div><div class='add'>+	u16 dest_mac_lo;</div><div class='add'>+</div><div class='add'>+	u32 src_mac_lo;</div><div class='add'>+</div><div class='add'>+	u32 ib2;</div><div class='add'>+</div><div class='add'>+	u32 rsv[5];</div><div class='add'>+</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_mac_info l2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_ipv4_tuple {</div><div class='add'>+	u32 src_ip;</div><div class='add'>+	u32 dest_ip;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u16 dest_port;</div><div class='add'>+			u16 src_port;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			u8 protocol;</div><div class='add'>+			u8 _pad[3]; /* fill with 0xa5a5a5 */</div><div class='add'>+		};</div><div class='add'>+		u32 ports;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_ipv4 {</div><div class='add'>+	struct airoha_foe_ipv4_tuple orig_tuple;</div><div class='add'>+</div><div class='add'>+	u32 ib2;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_ipv4_tuple new_tuple;</div><div class='add'>+</div><div class='add'>+	u32 rsv[2];</div><div class='add'>+</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_mac_info l2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_ipv4_dslite {</div><div class='add'>+	struct airoha_foe_ipv4_tuple ip4;</div><div class='add'>+</div><div class='add'>+	u32 ib2;</div><div class='add'>+</div><div class='add'>+	u8 flow_label[3];</div><div class='add'>+	u8 priority;</div><div class='add'>+</div><div class='add'>+	u32 rsv[4];</div><div class='add'>+</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_mac_info l2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_ipv6 {</div><div class='add'>+	u32 src_ip[4];</div><div class='add'>+	u32 dest_ip[4];</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u16 dest_port;</div><div class='add'>+			u16 src_port;</div><div class='add'>+		};</div><div class='add'>+		struct {</div><div class='add'>+			u8 protocol;</div><div class='add'>+			u8 pad[3];</div><div class='add'>+		};</div><div class='add'>+		u32 ports;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	u32 data;</div><div class='add'>+</div><div class='add'>+	u32 ib2;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_mac_info_common l2;</div><div class='add'>+</div><div class='add'>+	u32 meter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_entry {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32 ib1;</div><div class='add'>+			union {</div><div class='add'>+				struct airoha_foe_bridge bridge;</div><div class='add'>+				struct airoha_foe_ipv4 ipv4;</div><div class='add'>+				struct airoha_foe_ipv4_dslite dslite;</div><div class='add'>+				struct airoha_foe_ipv6 ipv6;</div><div class='add'>+				DECLARE_FLEX_ARRAY(u32, d);</div><div class='add'>+			};</div><div class='add'>+		};</div><div class='add'>+		u8 data[PPE_ENTRY_SIZE];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_stats {</div><div class='add'>+	u32 bytes;</div><div class='add'>+	u32 packets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_foe_stats64 {</div><div class='add'>+	u64 bytes;</div><div class='add'>+	u64 packets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_flow_data {</div><div class='add'>+	struct ethhdr eth;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			__be32 src_addr;</div><div class='add'>+			__be32 dst_addr;</div><div class='add'>+		} v4;</div><div class='add'>+</div><div class='add'>+		struct {</div><div class='add'>+			struct in6_addr src_addr;</div><div class='add'>+			struct in6_addr dst_addr;</div><div class='add'>+		} v6;</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	__be16 src_port;</div><div class='add'>+	__be16 dst_port;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		struct {</div><div class='add'>+			u16 id;</div><div class='add'>+			__be16 proto;</div><div class='add'>+		} hdr[2];</div><div class='add'>+		u8 num;</div><div class='add'>+	} vlan;</div><div class='add'>+	struct {</div><div class='add'>+		u16 sid;</div><div class='add'>+		u8 num;</div><div class='add'>+	} pppoe;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum airoha_flow_entry_type {</div><div class='add'>+	FLOW_TYPE_L4,</div><div class='add'>+	FLOW_TYPE_L2,</div><div class='add'>+	FLOW_TYPE_L2_SUBFLOW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_flow_table_entry {</div><div class='add'>+	union {</div><div class='add'>+		struct hlist_node list; /* PPE L3 flow entry */</div><div class='add'>+		struct {</div><div class='add'>+			struct rhash_head l2_node;  /* L2 flow entry */</div><div class='add'>+			struct hlist_head l2_flows; /* PPE L2 subflows list */</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct hlist_node l2_subflow_node; /* PPE L2 subflow entry */</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_stats64 stats;</div><div class='add'>+	enum airoha_flow_entry_type type;</div><div class='add'>+</div><div class='add'>+	struct rhash_head node;</div><div class='add'>+	unsigned long cookie;</div><div class='add'>+</div><div class='add'>+	/* Must be last --ends in a flexible-array member. */</div><div class='add'>+	struct airoha_foe_entry data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_wdma_info {</div><div class='add'>+	u8 idx;</div><div class='add'>+	u8 queue;</div><div class='add'>+	u16 wcid;</div><div class='add'>+	u8 bss;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* RX queue to IRQ mapping: BIT(q) in IRQ(n) */</div><div class='add'>+#define RX_IRQ0_BANK_PIN_MASK			0x839f</div><div class='add'>+#define RX_IRQ1_BANK_PIN_MASK			0x7fe00000</div><div class='add'>+#define RX_IRQ2_BANK_PIN_MASK			0x20</div><div class='add'>+#define RX_IRQ3_BANK_PIN_MASK			0x40</div><div class='add'>+#define RX_IRQ_BANK_PIN_MASK(_n)		\</div><div class='add'>+	(((_n) == 3) ? RX_IRQ3_BANK_PIN_MASK :	\</div><div class='add'>+	 ((_n) == 2) ? RX_IRQ2_BANK_PIN_MASK :	\</div><div class='add'>+	 ((_n) == 1) ? RX_IRQ1_BANK_PIN_MASK :	\</div><div class='add'>+	 RX_IRQ0_BANK_PIN_MASK)</div><div class='add'>+</div><div class='add'>+struct airoha_irq_bank {</div><div class='add'>+	struct airoha_qdma *qdma;</div><div class='add'>+</div><div class='add'>+	/* protect concurrent irqmask accesses */</div><div class='add'>+	spinlock_t irq_lock;</div><div class='add'>+	u32 irqmask[QDMA_INT_REG_MAX];</div><div class='add'>+	int irq;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_qdma {</div><div class='add'>+	struct airoha_eth *eth;</div><div class='add'>+	void __iomem *regs;</div><div class='add'>+</div><div class='add'>+	atomic_t users;</div><div class='add'>+</div><div class='add'>+	struct airoha_irq_bank irq_banks[AIROHA_MAX_NUM_IRQ_BANKS];</div><div class='add'>+</div><div class='add'>+	struct airoha_tx_irq_queue q_tx_irq[AIROHA_NUM_TX_IRQ];</div><div class='add'>+</div><div class='add'>+	struct airoha_queue q_tx[AIROHA_NUM_TX_RING];</div><div class='add'>+	struct airoha_queue q_rx[AIROHA_NUM_RX_RING];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_gdm_port {</div><div class='add'>+	struct airoha_qdma *qdma;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	int id;</div><div class='add'>+</div><div class='add'>+	struct airoha_hw_stats stats;</div><div class='add'>+</div><div class='add'>+	DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS);</div><div class='add'>+</div><div class='add'>+	/* qos stats counters */</div><div class='add'>+	u64 cpu_tx_packets;</div><div class='add'>+	u64 fwd_tx_packets;</div><div class='add'>+</div><div class='add'>+	struct metadata_dst *dsa_meta[AIROHA_MAX_DSA_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AIROHA_RXD4_PPE_CPU_REASON	GENMASK(20, 16)</div><div class='add'>+#define AIROHA_RXD4_FOE_ENTRY		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_ppe {</div><div class='add'>+	struct airoha_ppe_dev dev;</div><div class='add'>+	struct airoha_eth *eth;</div><div class='add'>+</div><div class='add'>+	void *foe;</div><div class='add'>+	dma_addr_t foe_dma;</div><div class='add'>+</div><div class='add'>+	struct rhashtable l2_flows;</div><div class='add'>+</div><div class='add'>+	struct hlist_head *foe_flow;</div><div class='add'>+	u16 *foe_check_time;</div><div class='add'>+</div><div class='add'>+	struct airoha_foe_stats *foe_stats;</div><div class='add'>+	dma_addr_t foe_stats_dma;</div><div class='add'>+</div><div class='add'>+	struct dentry *debugfs_dir;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_eth_soc_data {</div><div class='add'>+	u16 version;</div><div class='add'>+	const char * const *xsi_rsts_names;</div><div class='add'>+	int num_xsi_rsts;</div><div class='add'>+	int num_ppe;</div><div class='add'>+	struct {</div><div class='add'>+		int (*get_src_port_id)(struct airoha_gdm_port *port, int nbq);</div><div class='add'>+	} ops;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_eth {</div><div class='add'>+	struct device *dev;</div><div class='add'>+</div><div class='add'>+	const struct airoha_eth_soc_data *soc;</div><div class='add'>+</div><div class='add'>+	unsigned long state;</div><div class='add'>+	void __iomem *fe_regs;</div><div class='add'>+</div><div class='add'>+	struct airoha_npu __rcu *npu;</div><div class='add'>+</div><div class='add'>+	struct airoha_ppe *ppe;</div><div class='add'>+	struct rhashtable flow_table;</div><div class='add'>+</div><div class='add'>+	struct reset_control_bulk_data rsts[AIROHA_MAX_NUM_RSTS];</div><div class='add'>+	struct reset_control_bulk_data *xsi_rsts;</div><div class='add'>+</div><div class='add'>+	struct net_device *napi_dev;</div><div class='add'>+</div><div class='add'>+	struct airoha_qdma qdma[AIROHA_MAX_NUM_QDMA];</div><div class='add'>+	struct airoha_gdm_port *ports[AIROHA_MAX_NUM_GDM_PORTS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 airoha_rr(void __iomem *base, u32 offset);</div><div class='add'>+void airoha_wr(void __iomem *base, u32 offset, u32 val);</div><div class='add'>+u32 airoha_rmw(void __iomem *base, u32 offset, u32 mask, u32 val);</div><div class='add'>+</div><div class='add'>+#define airoha_fe_rr(eth, offset)				\</div><div class='add'>+	airoha_rr((eth)-&gt;fe_regs, (offset))</div><div class='add'>+#define airoha_fe_wr(eth, offset, val)				\</div><div class='add'>+	airoha_wr((eth)-&gt;fe_regs, (offset), (val))</div><div class='add'>+#define airoha_fe_rmw(eth, offset, mask, val)			\</div><div class='add'>+	airoha_rmw((eth)-&gt;fe_regs, (offset), (mask), (val))</div><div class='add'>+#define airoha_fe_set(eth, offset, val)				\</div><div class='add'>+	airoha_rmw((eth)-&gt;fe_regs, (offset), 0, (val))</div><div class='add'>+#define airoha_fe_clear(eth, offset, val)			\</div><div class='add'>+	airoha_rmw((eth)-&gt;fe_regs, (offset), (val), 0)</div><div class='add'>+</div><div class='add'>+#define airoha_qdma_rr(qdma, offset)				\</div><div class='add'>+	airoha_rr((qdma)-&gt;regs, (offset))</div><div class='add'>+#define airoha_qdma_wr(qdma, offset, val)			\</div><div class='add'>+	airoha_wr((qdma)-&gt;regs, (offset), (val))</div><div class='add'>+#define airoha_qdma_rmw(qdma, offset, mask, val)		\</div><div class='add'>+	airoha_rmw((qdma)-&gt;regs, (offset), (mask), (val))</div><div class='add'>+#define airoha_qdma_set(qdma, offset, val)			\</div><div class='add'>+	airoha_rmw((qdma)-&gt;regs, (offset), 0, (val))</div><div class='add'>+#define airoha_qdma_clear(qdma, offset, val)			\</div><div class='add'>+	airoha_rmw((qdma)-&gt;regs, (offset), (val), 0)</div><div class='add'>+</div><div class='add'>+static inline bool airhoa_is_lan_gdm_port(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	/* GDM1 port on EN7581 SoC is connected to the lan dsa switch.</div><div class='add'>+	 * GDM{2,3,4} can be used as wan port connected to an external</div><div class='add'>+	 * phy module.</div><div class='add'>+	 */</div><div class='add'>+	return port-&gt;id == 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool airoha_is_7581(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	return eth-&gt;soc-&gt;version == 0x7581;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool airoha_is_7583(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	return eth-&gt;soc-&gt;version == 0x7583;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool airoha_is_valid_gdm_port(struct airoha_eth *eth,</div><div class='add'>+			      struct airoha_gdm_port *port);</div><div class='add'>+</div><div class='add'>+bool airoha_ppe_is_enabled(struct airoha_eth *eth, int index);</div><div class='add'>+void airoha_ppe_check_skb(struct airoha_ppe_dev *dev, struct sk_buff *skb,</div><div class='add'>+			  u16 hash, bool rx_wlan);</div><div class='add'>+int airoha_ppe_setup_tc_block_cb(struct airoha_ppe_dev *dev, void *type_data);</div><div class='add'>+int airoha_ppe_init(struct airoha_eth *eth);</div><div class='add'>+void airoha_ppe_deinit(struct airoha_eth *eth);</div><div class='add'>+void airoha_ppe_init_upd_mem(struct airoha_gdm_port *port);</div><div class='add'>+u32 airoha_ppe_get_total_num_entries(struct airoha_ppe *ppe);</div><div class='add'>+struct airoha_foe_entry *airoha_ppe_foe_get_entry(struct airoha_ppe *ppe,</div><div class='add'>+						  u32 hash);</div><div class='add'>+void airoha_ppe_foe_entry_get_stats(struct airoha_ppe *ppe, u32 hash,</div><div class='add'>+				    struct airoha_foe_stats64 *stats);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+int airoha_ppe_debugfs_init(struct airoha_ppe *ppe);</div><div class='add'>+#else</div><div class='add'>+static inline int airoha_ppe_debugfs_init(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* AIROHA_ETH_H */</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c<br/>new file mode 100644<br/>index 000000000000..68b7f9684dc7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/airoha_npu.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/airoha_npu.c</a></div><div class='hunk'>@@ -0,0 +1,783 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/devcoredump.h&gt;</div><div class='add'>+#include &lt;linux/firmware.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/of_reserved_mem.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+</div><div class='add'>+#include "airoha_eth.h"</div><div class='add'>+</div><div class='add'>+#define NPU_EN7581_FIRMWARE_DATA		"airoha/en7581_npu_data.bin"</div><div class='add'>+#define NPU_EN7581_FIRMWARE_RV32		"airoha/en7581_npu_rv32.bin"</div><div class='add'>+#define NPU_AN7583_FIRMWARE_DATA		"airoha/an7583_npu_data.bin"</div><div class='add'>+#define NPU_AN7583_FIRMWARE_RV32		"airoha/an7583_npu_rv32.bin"</div><div class='add'>+#define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE	0x200000</div><div class='add'>+#define NPU_EN7581_FIRMWARE_DATA_MAX_SIZE	0x10000</div><div class='add'>+#define NPU_DUMP_SIZE				512</div><div class='add'>+</div><div class='add'>+#define REG_NPU_LOCAL_SRAM		0x0</div><div class='add'>+</div><div class='add'>+#define NPU_PC_BASE_ADDR		0x305000</div><div class='add'>+#define REG_PC_DBG(_n)			(0x305000 + ((_n) * 0x100))</div><div class='add'>+</div><div class='add'>+#define NPU_CLUSTER_BASE_ADDR		0x306000</div><div class='add'>+</div><div class='add'>+#define REG_CR_BOOT_TRIGGER		(NPU_CLUSTER_BASE_ADDR + 0x000)</div><div class='add'>+#define REG_CR_BOOT_CONFIG		(NPU_CLUSTER_BASE_ADDR + 0x004)</div><div class='add'>+#define REG_CR_BOOT_BASE(_n)		(NPU_CLUSTER_BASE_ADDR + 0x020 + ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+#define NPU_MBOX_BASE_ADDR		0x30c000</div><div class='add'>+</div><div class='add'>+#define REG_CR_MBOX_INT_STATUS		(NPU_MBOX_BASE_ADDR + 0x000)</div><div class='add'>+#define MBOX_INT_STATUS_MASK		BIT(8)</div><div class='add'>+</div><div class='add'>+#define REG_CR_MBOX_INT_MASK(_n)	(NPU_MBOX_BASE_ADDR + 0x004 + ((_n) &lt;&lt; 2))</div><div class='add'>+#define REG_CR_MBQ0_CTRL(_n)		(NPU_MBOX_BASE_ADDR + 0x030 + ((_n) &lt;&lt; 2))</div><div class='add'>+#define REG_CR_MBQ8_CTRL(_n)		(NPU_MBOX_BASE_ADDR + 0x0b0 + ((_n) &lt;&lt; 2))</div><div class='add'>+#define REG_CR_NPU_MIB(_n)		(NPU_MBOX_BASE_ADDR + 0x140 + ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+#define NPU_WLAN_BASE_ADDR		0x30d000</div><div class='add'>+</div><div class='add'>+#define REG_IRQ_STATUS			(NPU_WLAN_BASE_ADDR + 0x030)</div><div class='add'>+#define REG_IRQ_RXDONE(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 2) + 0x034)</div><div class='add'>+#define NPU_IRQ_RX_MASK(_n)		((_n) == 1 ? BIT(17) : BIT(16))</div><div class='add'>+</div><div class='add'>+#define REG_TX_BASE(_n)			(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x080)</div><div class='add'>+#define REG_TX_DSCP_NUM(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x084)</div><div class='add'>+#define REG_TX_CPU_IDX(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x088)</div><div class='add'>+#define REG_TX_DMA_IDX(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x08c)</div><div class='add'>+</div><div class='add'>+#define REG_RX_BASE(_n)			(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x180)</div><div class='add'>+#define REG_RX_DSCP_NUM(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x184)</div><div class='add'>+#define REG_RX_CPU_IDX(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x188)</div><div class='add'>+#define REG_RX_DMA_IDX(_n)		(NPU_WLAN_BASE_ADDR + ((_n) &lt;&lt; 4) + 0x18c)</div><div class='add'>+</div><div class='add'>+#define NPU_TIMER_BASE_ADDR		0x310100</div><div class='add'>+#define REG_WDT_TIMER_CTRL(_n)		(NPU_TIMER_BASE_ADDR + ((_n) * 0x100))</div><div class='add'>+#define WDT_EN_MASK			BIT(25)</div><div class='add'>+#define WDT_INTR_MASK			BIT(21)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NPU_OP_SET = 1,</div><div class='add'>+	NPU_OP_SET_NO_WAIT,</div><div class='add'>+	NPU_OP_GET,</div><div class='add'>+	NPU_OP_GET_NO_WAIT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NPU_FUNC_WIFI,</div><div class='add'>+	NPU_FUNC_TUNNEL,</div><div class='add'>+	NPU_FUNC_NOTIFY,</div><div class='add'>+	NPU_FUNC_DBA,</div><div class='add'>+	NPU_FUNC_TR471,</div><div class='add'>+	NPU_FUNC_PPE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	NPU_MBOX_ERROR,</div><div class='add'>+	NPU_MBOX_SUCCESS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PPE_FUNC_SET_WAIT,</div><div class='add'>+	PPE_FUNC_SET_WAIT_HWNAT_INIT,</div><div class='add'>+	PPE_FUNC_SET_WAIT_HWNAT_DEINIT,</div><div class='add'>+	PPE_FUNC_SET_WAIT_API,</div><div class='add'>+	PPE_FUNC_SET_WAIT_FLOW_STATS_SETUP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	PPE2_SRAM_SET_ENTRY,</div><div class='add'>+	PPE_SRAM_SET_ENTRY,</div><div class='add'>+	PPE_SRAM_SET_VAL,</div><div class='add'>+	PPE_SRAM_RESET_VAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	QDMA_WAN_ETHER = 1,</div><div class='add'>+	QDMA_WAN_PON_XDSL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_npu_fw {</div><div class='add'>+	const char *name;</div><div class='add'>+	int max_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct airoha_npu_soc_data {</div><div class='add'>+	struct airoha_npu_fw fw_rv32;</div><div class='add'>+	struct airoha_npu_fw fw_data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MBOX_MSG_FUNC_ID	GENMASK(14, 11)</div><div class='add'>+#define MBOX_MSG_STATIC_BUF	BIT(5)</div><div class='add'>+#define MBOX_MSG_STATUS		GENMASK(4, 2)</div><div class='add'>+#define MBOX_MSG_DONE		BIT(1)</div><div class='add'>+#define MBOX_MSG_WAIT_RSP	BIT(0)</div><div class='add'>+</div><div class='add'>+#define PPE_TYPE_L2B_IPV4	2</div><div class='add'>+#define PPE_TYPE_L2B_IPV4_IPV6	3</div><div class='add'>+</div><div class='add'>+struct ppe_mbox_data {</div><div class='add'>+	u32 func_type;</div><div class='add'>+	u32 func_id;</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8 cds;</div><div class='add'>+			u8 xpon_hal_api;</div><div class='add'>+			u8 wan_xsi;</div><div class='add'>+			u8 ct_joyme4;</div><div class='add'>+			u8 max_packet;</div><div class='add'>+			u8 rsv[3];</div><div class='add'>+			u32 ppe_type;</div><div class='add'>+			u32 wan_mode;</div><div class='add'>+			u32 wan_sel;</div><div class='add'>+		} init_info;</div><div class='add'>+		struct {</div><div class='add'>+			u32 func_id;</div><div class='add'>+			u32 size;</div><div class='add'>+			u32 data;</div><div class='add'>+		} set_info;</div><div class='add'>+		struct {</div><div class='add'>+			u32 npu_stats_addr;</div><div class='add'>+			u32 foe_stats_addr;</div><div class='add'>+		} stats_info;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wlan_mbox_data {</div><div class='add'>+	u32 ifindex:4;</div><div class='add'>+	u32 func_type:4;</div><div class='add'>+	u32 func_id;</div><div class='add'>+	DECLARE_FLEX_ARRAY(u8, d);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int airoha_npu_send_msg(struct airoha_npu *npu, int func_id,</div><div class='add'>+			       void *p, int size)</div><div class='add'>+{</div><div class='add'>+	u16 core = 0; /* FIXME */</div><div class='add'>+	u32 val, offset = core &lt;&lt; 4;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dma_addr = dma_map_single(npu-&gt;dev, p, size, DMA_TO_DEVICE);</div><div class='add'>+	ret = dma_mapping_error(npu-&gt;dev, dma_addr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;npu-&gt;cores[core].lock);</div><div class='add'>+</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_MBQ0_CTRL(0) + offset, dma_addr);</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_MBQ0_CTRL(1) + offset, size);</div><div class='add'>+	regmap_read(npu-&gt;regmap, REG_CR_MBQ0_CTRL(2) + offset, &amp;val);</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_MBQ0_CTRL(2) + offset, val + 1);</div><div class='add'>+	val = FIELD_PREP(MBOX_MSG_FUNC_ID, func_id) | MBOX_MSG_WAIT_RSP;</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_MBQ0_CTRL(3) + offset, val);</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout_atomic(npu-&gt;regmap,</div><div class='add'>+					      REG_CR_MBQ0_CTRL(3) + offset,</div><div class='add'>+					      val, (val &amp; MBOX_MSG_DONE),</div><div class='add'>+					      100, 100 * MSEC_PER_SEC);</div><div class='add'>+	if (!ret &amp;&amp; FIELD_GET(MBOX_MSG_STATUS, val) != NPU_MBOX_SUCCESS)</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;npu-&gt;cores[core].lock);</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(npu-&gt;dev, dma_addr, size, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_load_firmware(struct device *dev, void __iomem *addr,</div><div class='add'>+				    const struct airoha_npu_fw *fw_info)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = request_firmware(&amp;fw, fw_info-&gt;name, dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret == -ENOENT ? -EPROBE_DEFER : ret;</div><div class='add'>+</div><div class='add'>+	if (fw-&gt;size &gt; fw_info-&gt;max_size) {</div><div class='add'>+		dev_err(dev, "%s: fw size too overlimit (%zu)\n",</div><div class='add'>+			fw_info-&gt;name, fw-&gt;size);</div><div class='add'>+		ret = -E2BIG;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy_toio(addr, fw-&gt;data, fw-&gt;size);</div><div class='add'>+out:</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,</div><div class='add'>+				   struct resource *res)</div><div class='add'>+{</div><div class='add'>+	const struct airoha_npu_soc_data *soc;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	soc = of_device_get_match_data(dev);</div><div class='add'>+	if (!soc)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	addr = devm_ioremap_resource(dev, res);</div><div class='add'>+	if (IS_ERR(addr))</div><div class='add'>+		return PTR_ERR(addr);</div><div class='add'>+</div><div class='add'>+	/* Load rv32 npu firmware */</div><div class='add'>+	ret = airoha_npu_load_firmware(dev, addr, &amp;soc-&gt;fw_rv32);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Load data npu firmware */</div><div class='add'>+	return airoha_npu_load_firmware(dev, base + REG_NPU_LOCAL_SRAM,</div><div class='add'>+					&amp;soc-&gt;fw_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t airoha_npu_mbox_handler(int irq, void *npu_instance)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu *npu = npu_instance;</div><div class='add'>+</div><div class='add'>+	/* clear mbox interrupt status */</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_MBOX_INT_STATUS,</div><div class='add'>+		     MBOX_INT_STATUS_MASK);</div><div class='add'>+</div><div class='add'>+	/* acknowledge npu */</div><div class='add'>+	regmap_update_bits(npu-&gt;regmap, REG_CR_MBQ8_CTRL(3),</div><div class='add'>+			   MBOX_MSG_STATUS | MBOX_MSG_DONE, MBOX_MSG_DONE);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_npu_wdt_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu_core *core;</div><div class='add'>+	struct airoha_npu *npu;</div><div class='add'>+	void *dump;</div><div class='add'>+	u32 val[3];</div><div class='add'>+	int c;</div><div class='add'>+</div><div class='add'>+	core = container_of(work, struct airoha_npu_core, wdt_work);</div><div class='add'>+	npu = core-&gt;npu;</div><div class='add'>+</div><div class='add'>+	dump = vzalloc(NPU_DUMP_SIZE);</div><div class='add'>+	if (!dump)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	c = core - &amp;npu-&gt;cores[0];</div><div class='add'>+	regmap_bulk_read(npu-&gt;regmap, REG_PC_DBG(c), val, ARRAY_SIZE(val));</div><div class='add'>+	snprintf(dump, NPU_DUMP_SIZE, "PC: %08x SP: %08x LR: %08x\n",</div><div class='add'>+		 val[0], val[1], val[2]);</div><div class='add'>+</div><div class='add'>+	dev_coredumpv(npu-&gt;dev, dump, NPU_DUMP_SIZE, GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t airoha_npu_wdt_handler(int irq, void *core_instance)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu_core *core = core_instance;</div><div class='add'>+	struct airoha_npu *npu = core-&gt;npu;</div><div class='add'>+	int c = core - &amp;npu-&gt;cores[0];</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	regmap_set_bits(npu-&gt;regmap, REG_WDT_TIMER_CTRL(c), WDT_INTR_MASK);</div><div class='add'>+	if (!regmap_read(npu-&gt;regmap, REG_WDT_TIMER_CTRL(c), &amp;val) &amp;&amp;</div><div class='add'>+	    FIELD_GET(WDT_EN_MASK, val))</div><div class='add'>+		schedule_work(&amp;core-&gt;wdt_work);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_ppe_init(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	struct ppe_mbox_data *ppe_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ppe_data = kzalloc(sizeof(*ppe_data), GFP_KERNEL);</div><div class='add'>+	if (!ppe_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe_data-&gt;func_type = NPU_OP_SET;</div><div class='add'>+	ppe_data-&gt;func_id = PPE_FUNC_SET_WAIT_HWNAT_INIT;</div><div class='add'>+	ppe_data-&gt;init_info.ppe_type = PPE_TYPE_L2B_IPV4_IPV6;</div><div class='add'>+	ppe_data-&gt;init_info.wan_mode = QDMA_WAN_ETHER;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_PPE, ppe_data,</div><div class='add'>+				  sizeof(*ppe_data));</div><div class='add'>+	kfree(ppe_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_ppe_deinit(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	struct ppe_mbox_data *ppe_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ppe_data = kzalloc(sizeof(*ppe_data), GFP_KERNEL);</div><div class='add'>+	if (!ppe_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe_data-&gt;func_type = NPU_OP_SET;</div><div class='add'>+	ppe_data-&gt;func_id = PPE_FUNC_SET_WAIT_HWNAT_DEINIT;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_PPE, ppe_data,</div><div class='add'>+				  sizeof(*ppe_data));</div><div class='add'>+	kfree(ppe_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_ppe_flush_sram_entries(struct airoha_npu *npu,</div><div class='add'>+					     dma_addr_t foe_addr,</div><div class='add'>+					     int sram_num_entries)</div><div class='add'>+{</div><div class='add'>+	struct ppe_mbox_data *ppe_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ppe_data = kzalloc(sizeof(*ppe_data), GFP_KERNEL);</div><div class='add'>+	if (!ppe_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe_data-&gt;func_type = NPU_OP_SET;</div><div class='add'>+	ppe_data-&gt;func_id = PPE_FUNC_SET_WAIT_API;</div><div class='add'>+	ppe_data-&gt;set_info.func_id = PPE_SRAM_RESET_VAL;</div><div class='add'>+	ppe_data-&gt;set_info.data = foe_addr;</div><div class='add'>+	ppe_data-&gt;set_info.size = sram_num_entries;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_PPE, ppe_data,</div><div class='add'>+				  sizeof(*ppe_data));</div><div class='add'>+	kfree(ppe_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_foe_commit_entry(struct airoha_npu *npu,</div><div class='add'>+				       dma_addr_t foe_addr,</div><div class='add'>+				       u32 entry_size, u32 hash, bool ppe2)</div><div class='add'>+{</div><div class='add'>+	struct ppe_mbox_data *ppe_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ppe_data = kzalloc(sizeof(*ppe_data), GFP_ATOMIC);</div><div class='add'>+	if (!ppe_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe_data-&gt;func_type = NPU_OP_SET;</div><div class='add'>+	ppe_data-&gt;func_id = PPE_FUNC_SET_WAIT_API;</div><div class='add'>+	ppe_data-&gt;set_info.data = foe_addr;</div><div class='add'>+	ppe_data-&gt;set_info.size = entry_size;</div><div class='add'>+	ppe_data-&gt;set_info.func_id = ppe2 ? PPE2_SRAM_SET_ENTRY</div><div class='add'>+					  : PPE_SRAM_SET_ENTRY;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_PPE, ppe_data,</div><div class='add'>+				  sizeof(*ppe_data));</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ppe_data-&gt;set_info.func_id = PPE_SRAM_SET_VAL;</div><div class='add'>+	ppe_data-&gt;set_info.data = hash;</div><div class='add'>+	ppe_data-&gt;set_info.size = sizeof(u32);</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_PPE, ppe_data,</div><div class='add'>+				  sizeof(*ppe_data));</div><div class='add'>+out:</div><div class='add'>+	kfree(ppe_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_ppe_stats_setup(struct airoha_npu *npu,</div><div class='add'>+				      dma_addr_t foe_stats_addr,</div><div class='add'>+				      u32 num_stats_entries)</div><div class='add'>+{</div><div class='add'>+	int err, size = num_stats_entries * sizeof(*npu-&gt;stats);</div><div class='add'>+	struct ppe_mbox_data *ppe_data;</div><div class='add'>+</div><div class='add'>+	ppe_data = kzalloc(sizeof(*ppe_data), GFP_ATOMIC);</div><div class='add'>+	if (!ppe_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe_data-&gt;func_type = NPU_OP_SET;</div><div class='add'>+	ppe_data-&gt;func_id = PPE_FUNC_SET_WAIT_FLOW_STATS_SETUP;</div><div class='add'>+	ppe_data-&gt;stats_info.foe_stats_addr = foe_stats_addr;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_PPE, ppe_data,</div><div class='add'>+				  sizeof(*ppe_data));</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	npu-&gt;stats = devm_ioremap(npu-&gt;dev,</div><div class='add'>+				  ppe_data-&gt;stats_info.npu_stats_addr,</div><div class='add'>+				  size);</div><div class='add'>+	if (!npu-&gt;stats)</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+out:</div><div class='add'>+	kfree(ppe_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_wlan_msg_send(struct airoha_npu *npu, int ifindex,</div><div class='add'>+				    enum airoha_npu_wlan_set_cmd func_id,</div><div class='add'>+				    void *data, int data_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct wlan_mbox_data *wlan_data;</div><div class='add'>+	int err, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*wlan_data) + data_len;</div><div class='add'>+	wlan_data = kzalloc(len, gfp);</div><div class='add'>+	if (!wlan_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	wlan_data-&gt;ifindex = ifindex;</div><div class='add'>+	wlan_data-&gt;func_type = NPU_OP_SET;</div><div class='add'>+	wlan_data-&gt;func_id = func_id;</div><div class='add'>+	memcpy(wlan_data-&gt;d, data, data_len);</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_WIFI, wlan_data, len);</div><div class='add'>+	kfree(wlan_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_wlan_msg_get(struct airoha_npu *npu, int ifindex,</div><div class='add'>+				   enum airoha_npu_wlan_get_cmd func_id,</div><div class='add'>+				   void *data, int data_len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct wlan_mbox_data *wlan_data;</div><div class='add'>+	int err, len;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*wlan_data) + data_len;</div><div class='add'>+	wlan_data = kzalloc(len, gfp);</div><div class='add'>+	if (!wlan_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	wlan_data-&gt;ifindex = ifindex;</div><div class='add'>+	wlan_data-&gt;func_type = NPU_OP_GET;</div><div class='add'>+	wlan_data-&gt;func_id = func_id;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_send_msg(npu, NPU_FUNC_WIFI, wlan_data, len);</div><div class='add'>+	if (!err)</div><div class='add'>+		memcpy(data, wlan_data-&gt;d, data_len);</div><div class='add'>+	kfree(wlan_data);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+airoha_npu_wlan_set_reserved_memory(struct airoha_npu *npu,</div><div class='add'>+				    int ifindex, const char *name,</div><div class='add'>+				    enum airoha_npu_wlan_set_cmd func_id)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = npu-&gt;dev;</div><div class='add'>+	struct resource res;</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	err = of_reserved_mem_region_to_resource_byname(dev-&gt;of_node, name,</div><div class='add'>+							&amp;res);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = res.start;</div><div class='add'>+	return airoha_npu_wlan_msg_send(npu, ifindex, func_id, &amp;val,</div><div class='add'>+					sizeof(val), GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_npu_wlan_init_memory(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	enum airoha_npu_wlan_set_cmd cmd = WLAN_FUNC_SET_WAIT_NPU_BAND0_ONCPU;</div><div class='add'>+	u32 val = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_wlan_msg_send(npu, 1, cmd, &amp;val, sizeof(val),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cmd = WLAN_FUNC_SET_WAIT_TX_BUF_CHECK_ADDR;</div><div class='add'>+	err = airoha_npu_wlan_set_reserved_memory(npu, 0, "tx-bufid", cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cmd = WLAN_FUNC_SET_WAIT_PKT_BUF_ADDR;</div><div class='add'>+	err = airoha_npu_wlan_set_reserved_memory(npu, 0, "pkt", cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cmd = WLAN_FUNC_SET_WAIT_TX_PKT_BUF_ADDR;</div><div class='add'>+	err = airoha_npu_wlan_set_reserved_memory(npu, 0, "tx-pkt", cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	cmd = WLAN_FUNC_SET_WAIT_IS_FORCE_TO_CPU;</div><div class='add'>+	return airoha_npu_wlan_msg_send(npu, 0, cmd, &amp;val, sizeof(val),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_npu_wlan_queue_addr_get(struct airoha_npu *npu, int qid,</div><div class='add'>+					  bool xmit)</div><div class='add'>+{</div><div class='add'>+	if (xmit)</div><div class='add'>+		return REG_TX_BASE(qid + 2);</div><div class='add'>+</div><div class='add'>+	return REG_RX_BASE(qid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_npu_wlan_irq_status_set(struct airoha_npu *npu, u32 val)</div><div class='add'>+{</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_IRQ_STATUS, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_npu_wlan_irq_status_get(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	regmap_read(npu-&gt;regmap, REG_IRQ_STATUS, &amp;val);</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_npu_wlan_irq_enable(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+	regmap_set_bits(npu-&gt;regmap, REG_IRQ_RXDONE(q), NPU_IRQ_RX_MASK(q));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_npu_wlan_irq_disable(struct airoha_npu *npu, int q)</div><div class='add'>+{</div><div class='add'>+	regmap_clear_bits(npu-&gt;regmap, REG_IRQ_RXDONE(q), NPU_IRQ_RX_MASK(q));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct airoha_npu *airoha_npu_get(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct airoha_npu *npu;</div><div class='add'>+</div><div class='add'>+	np = of_parse_phandle(dev-&gt;of_node, "airoha,npu", 0);</div><div class='add'>+	if (!np)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	pdev = of_find_device_by_node(np);</div><div class='add'>+</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		dev_err(dev, "cannot find device node %s\n", np-&gt;name);</div><div class='add'>+		of_node_put(np);</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(THIS_MODULE)) {</div><div class='add'>+		dev_err(dev, "failed to get the device driver module\n");</div><div class='add'>+		npu = ERR_PTR(-ENODEV);</div><div class='add'>+		goto error_pdev_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	npu = platform_get_drvdata(pdev);</div><div class='add'>+	if (!npu) {</div><div class='add'>+		npu = ERR_PTR(-ENODEV);</div><div class='add'>+		goto error_module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!device_link_add(dev, &amp;pdev-&gt;dev, DL_FLAG_AUTOREMOVE_SUPPLIER)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"failed to create device link to consumer %s\n",</div><div class='add'>+			dev_name(dev));</div><div class='add'>+		npu = ERR_PTR(-EINVAL);</div><div class='add'>+		goto error_module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return npu;</div><div class='add'>+</div><div class='add'>+error_module_put:</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+error_pdev_put:</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+</div><div class='add'>+	return npu;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(airoha_npu_get);</div><div class='add'>+</div><div class='add'>+void airoha_npu_put(struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+	put_device(npu-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(airoha_npu_put);</div><div class='add'>+</div><div class='add'>+static const struct airoha_npu_soc_data en7581_npu_soc_data = {</div><div class='add'>+	.fw_rv32 = {</div><div class='add'>+		.name = NPU_EN7581_FIRMWARE_RV32,</div><div class='add'>+		.max_size = NPU_EN7581_FIRMWARE_RV32_MAX_SIZE,</div><div class='add'>+	},</div><div class='add'>+	.fw_data = {</div><div class='add'>+		.name = NPU_EN7581_FIRMWARE_DATA,</div><div class='add'>+		.max_size = NPU_EN7581_FIRMWARE_DATA_MAX_SIZE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct airoha_npu_soc_data an7583_npu_soc_data = {</div><div class='add'>+	.fw_rv32 = {</div><div class='add'>+		.name = NPU_AN7583_FIRMWARE_RV32,</div><div class='add'>+		.max_size = NPU_EN7581_FIRMWARE_RV32_MAX_SIZE,</div><div class='add'>+	},</div><div class='add'>+	.fw_data = {</div><div class='add'>+		.name = NPU_AN7583_FIRMWARE_DATA,</div><div class='add'>+		.max_size = NPU_EN7581_FIRMWARE_DATA_MAX_SIZE,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id of_airoha_npu_match[] = {</div><div class='add'>+	{ .compatible = "airoha,en7581-npu", .data = &amp;en7581_npu_soc_data },</div><div class='add'>+	{ .compatible = "airoha,an7583-npu", .data = &amp;an7583_npu_soc_data },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, of_airoha_npu_match);</div><div class='add'>+</div><div class='add'>+static const struct regmap_config regmap_config = {</div><div class='add'>+	.name			= "npu",</div><div class='add'>+	.reg_bits		= 32,</div><div class='add'>+	.val_bits		= 32,</div><div class='add'>+	.reg_stride		= 4,</div><div class='add'>+	.disable_locking	= true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int airoha_npu_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct airoha_npu *npu;</div><div class='add'>+	struct resource res;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int i, irq, err;</div><div class='add'>+</div><div class='add'>+	base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(base))</div><div class='add'>+		return PTR_ERR(base);</div><div class='add'>+</div><div class='add'>+	npu = devm_kzalloc(dev, sizeof(*npu), GFP_KERNEL);</div><div class='add'>+	if (!npu)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	npu-&gt;dev = dev;</div><div class='add'>+	npu-&gt;ops.ppe_init = airoha_npu_ppe_init;</div><div class='add'>+	npu-&gt;ops.ppe_deinit = airoha_npu_ppe_deinit;</div><div class='add'>+	npu-&gt;ops.ppe_init_stats = airoha_npu_ppe_stats_setup;</div><div class='add'>+	npu-&gt;ops.ppe_flush_sram_entries = airoha_npu_ppe_flush_sram_entries;</div><div class='add'>+	npu-&gt;ops.ppe_foe_commit_entry = airoha_npu_foe_commit_entry;</div><div class='add'>+	npu-&gt;ops.wlan_init_reserved_memory = airoha_npu_wlan_init_memory;</div><div class='add'>+	npu-&gt;ops.wlan_send_msg = airoha_npu_wlan_msg_send;</div><div class='add'>+	npu-&gt;ops.wlan_get_msg = airoha_npu_wlan_msg_get;</div><div class='add'>+	npu-&gt;ops.wlan_get_queue_addr = airoha_npu_wlan_queue_addr_get;</div><div class='add'>+	npu-&gt;ops.wlan_set_irq_status = airoha_npu_wlan_irq_status_set;</div><div class='add'>+	npu-&gt;ops.wlan_get_irq_status = airoha_npu_wlan_irq_status_get;</div><div class='add'>+	npu-&gt;ops.wlan_enable_irq = airoha_npu_wlan_irq_enable;</div><div class='add'>+	npu-&gt;ops.wlan_disable_irq = airoha_npu_wlan_irq_disable;</div><div class='add'>+</div><div class='add'>+	npu-&gt;regmap = devm_regmap_init_mmio(dev, base, &amp;regmap_config);</div><div class='add'>+	if (IS_ERR(npu-&gt;regmap))</div><div class='add'>+		return PTR_ERR(npu-&gt;regmap);</div><div class='add'>+</div><div class='add'>+	err = of_reserved_mem_region_to_resource(dev-&gt;of_node, 0, &amp;res);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	err = devm_request_irq(dev, irq, airoha_npu_mbox_handler,</div><div class='add'>+			       IRQF_SHARED, "airoha-npu-mbox", npu);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(npu-&gt;cores); i++) {</div><div class='add'>+		struct airoha_npu_core *core = &amp;npu-&gt;cores[i];</div><div class='add'>+</div><div class='add'>+		spin_lock_init(&amp;core-&gt;lock);</div><div class='add'>+		core-&gt;npu = npu;</div><div class='add'>+</div><div class='add'>+		irq = platform_get_irq(pdev, i + 1);</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return irq;</div><div class='add'>+</div><div class='add'>+		err = devm_request_irq(dev, irq, airoha_npu_wdt_handler,</div><div class='add'>+				       IRQF_SHARED, "airoha-npu-wdt", core);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		INIT_WORK(&amp;core-&gt;wdt_work, airoha_npu_wdt_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* wlan IRQ lines */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(npu-&gt;irqs); i++) {</div><div class='add'>+		irq = platform_get_irq(pdev, i + ARRAY_SIZE(npu-&gt;cores) + 1);</div><div class='add'>+		if (irq &lt; 0)</div><div class='add'>+			return irq;</div><div class='add'>+</div><div class='add'>+		npu-&gt;irqs[i] = irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = airoha_npu_run_firmware(dev, base, &amp;res);</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(dev, err, "failed to run npu firmware\n");</div><div class='add'>+</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_NPU_MIB(10),</div><div class='add'>+		     res.start + NPU_EN7581_FIRMWARE_RV32_MAX_SIZE);</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_NPU_MIB(11), 0x40000); /* SRAM 256K */</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_NPU_MIB(12), 0);</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_NPU_MIB(21), 1);</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	/* setting booting address */</div><div class='add'>+	for (i = 0; i &lt; NPU_NUM_CORES; i++)</div><div class='add'>+		regmap_write(npu-&gt;regmap, REG_CR_BOOT_BASE(i), res.start);</div><div class='add'>+	usleep_range(1000, 2000);</div><div class='add'>+</div><div class='add'>+	/* enable NPU cores */</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_BOOT_CONFIG, 0xff);</div><div class='add'>+	regmap_write(npu-&gt;regmap, REG_CR_BOOT_TRIGGER, 0x1);</div><div class='add'>+	msleep(100);</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, npu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_npu_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu *npu = platform_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(npu-&gt;cores); i++)</div><div class='add'>+		cancel_work_sync(&amp;npu-&gt;cores[i].wdt_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct platform_driver airoha_npu_driver = {</div><div class='add'>+	.probe = airoha_npu_probe,</div><div class='add'>+	.remove = airoha_npu_remove,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "airoha-npu",</div><div class='add'>+		.of_match_table = of_airoha_npu_match,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(airoha_npu_driver);</div><div class='add'>+</div><div class='add'>+MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);</div><div class='add'>+MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);</div><div class='add'>+MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_DATA);</div><div class='add'>+MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_RV32);</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Airoha Network Processor Unit driver");</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c<br/>new file mode 100644<br/>index 000000000000..0caabb0c3aa0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/airoha_ppe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/airoha_ppe.c</a></div><div class='hunk'>@@ -0,0 +1,1561 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/rhashtable.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+</div><div class='add'>+#include "airoha_regs.h"</div><div class='add'>+#include "airoha_eth.h"</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(flow_offload_mutex);</div><div class='add'>+static DEFINE_SPINLOCK(ppe_lock);</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params airoha_flow_table_params = {</div><div class='add'>+	.head_offset = offsetof(struct airoha_flow_table_entry, node),</div><div class='add'>+	.key_offset = offsetof(struct airoha_flow_table_entry, cookie),</div><div class='add'>+	.key_len = sizeof(unsigned long),</div><div class='add'>+	.automatic_shrinking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct rhashtable_params airoha_l2_flow_table_params = {</div><div class='add'>+	.head_offset = offsetof(struct airoha_flow_table_entry, l2_node),</div><div class='add'>+	.key_offset = offsetof(struct airoha_flow_table_entry, data.bridge),</div><div class='add'>+	.key_len = 2 * ETH_ALEN,</div><div class='add'>+	.automatic_shrinking = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_get_num_stats_entries(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	if (!IS_ENABLED(CONFIG_NET_AIROHA_FLOW_STATS))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (airoha_is_7583(ppe-&gt;eth))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return PPE_STATS_NUM_ENTRIES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_get_total_num_stats_entries(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	int num_stats = airoha_ppe_get_num_stats_entries(ppe);</div><div class='add'>+</div><div class='add'>+	if (num_stats &gt; 0) {</div><div class='add'>+		struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+</div><div class='add'>+		num_stats = num_stats * eth-&gt;soc-&gt;num_ppe;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_ppe_get_total_sram_num_entries(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+</div><div class='add'>+	return PPE_SRAM_NUM_ENTRIES * eth-&gt;soc-&gt;num_ppe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 airoha_ppe_get_total_num_entries(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);</div><div class='add'>+</div><div class='add'>+	return sram_num_entries + PPE_DRAM_NUM_ENTRIES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool airoha_ppe_is_enabled(struct airoha_eth *eth, int index)</div><div class='add'>+{</div><div class='add'>+	if (index &gt;= eth-&gt;soc-&gt;num_ppe)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return airoha_fe_rr(eth, REG_PPE_GLO_CFG(index)) &amp; PPE_GLO_CFG_EN_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_ppe_get_timestamp(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	u16 timestamp = airoha_fe_rr(ppe-&gt;eth, REG_FE_FOE_TS);</div><div class='add'>+</div><div class='add'>+	return FIELD_GET(AIROHA_FOE_IB1_BIND_TIMESTAMP, timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_hw_init(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	u32 sram_ppe_num_data_entries = PPE_SRAM_NUM_ENTRIES, sram_num_entries;</div><div class='add'>+	u32 sram_tb_size, dram_num_entries;</div><div class='add'>+	struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+	int i, sram_num_stats_entries;</div><div class='add'>+</div><div class='add'>+	sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);</div><div class='add'>+	sram_tb_size = sram_num_entries * sizeof(struct airoha_foe_entry);</div><div class='add'>+	dram_num_entries = PPE_RAM_NUM_ENTRIES_SHIFT(PPE_DRAM_NUM_ENTRIES);</div><div class='add'>+</div><div class='add'>+	sram_num_stats_entries = airoha_ppe_get_num_stats_entries(ppe);</div><div class='add'>+	if (sram_num_stats_entries &gt; 0)</div><div class='add'>+		sram_ppe_num_data_entries -= sram_num_stats_entries;</div><div class='add'>+	sram_ppe_num_data_entries =</div><div class='add'>+		PPE_RAM_NUM_ENTRIES_SHIFT(sram_ppe_num_data_entries);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; eth-&gt;soc-&gt;num_ppe; i++) {</div><div class='add'>+		int p;</div><div class='add'>+</div><div class='add'>+		airoha_fe_wr(eth, REG_PPE_TB_BASE(i),</div><div class='add'>+			     ppe-&gt;foe_dma + sram_tb_size);</div><div class='add'>+</div><div class='add'>+		airoha_fe_rmw(eth, REG_PPE_BND_AGE0(i),</div><div class='add'>+			      PPE_BIND_AGE0_DELTA_NON_L4 |</div><div class='add'>+			      PPE_BIND_AGE0_DELTA_UDP,</div><div class='add'>+			      FIELD_PREP(PPE_BIND_AGE0_DELTA_NON_L4, 1) |</div><div class='add'>+			      FIELD_PREP(PPE_BIND_AGE0_DELTA_UDP, 12));</div><div class='add'>+		airoha_fe_rmw(eth, REG_PPE_BND_AGE1(i),</div><div class='add'>+			      PPE_BIND_AGE1_DELTA_TCP_FIN |</div><div class='add'>+			      PPE_BIND_AGE1_DELTA_TCP,</div><div class='add'>+			      FIELD_PREP(PPE_BIND_AGE1_DELTA_TCP_FIN, 1) |</div><div class='add'>+			      FIELD_PREP(PPE_BIND_AGE1_DELTA_TCP, 7));</div><div class='add'>+</div><div class='add'>+		airoha_fe_rmw(eth, REG_PPE_TB_HASH_CFG(i),</div><div class='add'>+			      PPE_SRAM_TABLE_EN_MASK |</div><div class='add'>+			      PPE_SRAM_HASH1_EN_MASK |</div><div class='add'>+			      PPE_DRAM_TABLE_EN_MASK |</div><div class='add'>+			      PPE_SRAM_HASH0_MODE_MASK |</div><div class='add'>+			      PPE_SRAM_HASH1_MODE_MASK |</div><div class='add'>+			      PPE_DRAM_HASH0_MODE_MASK |</div><div class='add'>+			      PPE_DRAM_HASH1_MODE_MASK,</div><div class='add'>+			      FIELD_PREP(PPE_SRAM_TABLE_EN_MASK, 1) |</div><div class='add'>+			      FIELD_PREP(PPE_SRAM_HASH1_EN_MASK, 1) |</div><div class='add'>+			      FIELD_PREP(PPE_SRAM_HASH1_MODE_MASK, 1) |</div><div class='add'>+			      FIELD_PREP(PPE_DRAM_HASH1_MODE_MASK, 3));</div><div class='add'>+</div><div class='add'>+		airoha_fe_rmw(eth, REG_PPE_TB_CFG(i),</div><div class='add'>+			      PPE_TB_CFG_SEARCH_MISS_MASK |</div><div class='add'>+			      PPE_SRAM_TB_NUM_ENTRY_MASK |</div><div class='add'>+			      PPE_DRAM_TB_NUM_ENTRY_MASK |</div><div class='add'>+			      PPE_TB_CFG_KEEPALIVE_MASK |</div><div class='add'>+			      PPE_TB_ENTRY_SIZE_MASK,</div><div class='add'>+			      FIELD_PREP(PPE_TB_CFG_SEARCH_MISS_MASK, 3) |</div><div class='add'>+			      FIELD_PREP(PPE_TB_ENTRY_SIZE_MASK, 0) |</div><div class='add'>+			      FIELD_PREP(PPE_SRAM_TB_NUM_ENTRY_MASK,</div><div class='add'>+					 sram_ppe_num_data_entries) |</div><div class='add'>+			      FIELD_PREP(PPE_DRAM_TB_NUM_ENTRY_MASK,</div><div class='add'>+					 dram_num_entries));</div><div class='add'>+</div><div class='add'>+		airoha_fe_wr(eth, REG_PPE_HASH_SEED(i), PPE_HASH_SEED);</div><div class='add'>+</div><div class='add'>+		for (p = 0; p &lt; ARRAY_SIZE(eth-&gt;ports); p++)</div><div class='add'>+			airoha_fe_rmw(eth, REG_PPE_MTU(i, p),</div><div class='add'>+				      FP0_EGRESS_MTU_MASK |</div><div class='add'>+				      FP1_EGRESS_MTU_MASK,</div><div class='add'>+				      FIELD_PREP(FP0_EGRESS_MTU_MASK,</div><div class='add'>+						 AIROHA_MAX_MTU) |</div><div class='add'>+				      FIELD_PREP(FP1_EGRESS_MTU_MASK,</div><div class='add'>+						 AIROHA_MAX_MTU));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_flow_mangle_eth(const struct flow_action_entry *act, void *eth)</div><div class='add'>+{</div><div class='add'>+	void *dest = eth + act-&gt;mangle.offset;</div><div class='add'>+	const void *src = &amp;act-&gt;mangle.val;</div><div class='add'>+</div><div class='add'>+	if (act-&gt;mangle.offset &gt; 8)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (act-&gt;mangle.mask == 0xffff) {</div><div class='add'>+		src += 2;</div><div class='add'>+		dest += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(dest, src, act-&gt;mangle.mask ? 2 : 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flow_mangle_ports(const struct flow_action_entry *act,</div><div class='add'>+					struct airoha_flow_data *data)</div><div class='add'>+{</div><div class='add'>+	u32 val = be32_to_cpu((__force __be32)act-&gt;mangle.val);</div><div class='add'>+</div><div class='add'>+	switch (act-&gt;mangle.offset) {</div><div class='add'>+	case 0:</div><div class='add'>+		if ((__force __be32)act-&gt;mangle.mask == ~cpu_to_be32(0xffff))</div><div class='add'>+			data-&gt;dst_port = cpu_to_be16(val);</div><div class='add'>+		else</div><div class='add'>+			data-&gt;src_port = cpu_to_be16(val &gt;&gt; 16);</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		data-&gt;dst_port = cpu_to_be16(val);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flow_mangle_ipv4(const struct flow_action_entry *act,</div><div class='add'>+				       struct airoha_flow_data *data)</div><div class='add'>+{</div><div class='add'>+	__be32 *dest;</div><div class='add'>+</div><div class='add'>+	switch (act-&gt;mangle.offset) {</div><div class='add'>+	case offsetof(struct iphdr, saddr):</div><div class='add'>+		dest = &amp;data-&gt;v4.src_addr;</div><div class='add'>+		break;</div><div class='add'>+	case offsetof(struct iphdr, daddr):</div><div class='add'>+		dest = &amp;data-&gt;v4.dst_addr;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(dest, &amp;act-&gt;mangle.val, sizeof(u32));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_get_wdma_info(struct net_device *dev, const u8 *addr,</div><div class='add'>+				    struct airoha_wdma_info *info)</div><div class='add'>+{</div><div class='add'>+	struct net_device_path_stack stack;</div><div class='add'>+	struct net_device_path *path;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	err = dev_fill_forward_path(dev, addr, &amp;stack);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	path = &amp;stack.path[stack.num_paths - 1];</div><div class='add'>+	if (path-&gt;type != DEV_PATH_MTK_WDMA)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	info-&gt;idx = path-&gt;mtk_wdma.wdma_idx;</div><div class='add'>+	info-&gt;bss = path-&gt;mtk_wdma.bss;</div><div class='add'>+	info-&gt;wcid = path-&gt;mtk_wdma.wcid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_get_dsa_port(struct net_device **dev)</div><div class='add'>+{</div><div class='add'>+#if IS_ENABLED(CONFIG_NET_DSA)</div><div class='add'>+	struct dsa_port *dp = dsa_port_from_netdev(*dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(dp))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	*dev = dsa_port_to_conduit(dp);</div><div class='add'>+	return dp-&gt;index;</div><div class='add'>+#else</div><div class='add'>+	return -ENODEV;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_set_bridge_addrs(struct airoha_foe_bridge *br,</div><div class='add'>+					    struct ethhdr *eh)</div><div class='add'>+{</div><div class='add'>+	br-&gt;dest_mac_hi = get_unaligned_be32(eh-&gt;h_dest);</div><div class='add'>+	br-&gt;dest_mac_lo = get_unaligned_be16(eh-&gt;h_dest + 4);</div><div class='add'>+	br-&gt;src_mac_hi = get_unaligned_be16(eh-&gt;h_source);</div><div class='add'>+	br-&gt;src_mac_lo = get_unaligned_be32(eh-&gt;h_source + 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth,</div><div class='add'>+					struct airoha_foe_entry *hwe,</div><div class='add'>+					struct net_device *dev, int type,</div><div class='add'>+					struct airoha_flow_data *data,</div><div class='add'>+					int l4proto)</div><div class='add'>+{</div><div class='add'>+	u32 qdata = FIELD_PREP(AIROHA_FOE_SHAPER_ID, 0x7f), ports_pad, val;</div><div class='add'>+	int wlan_etype = -EINVAL, dsa_port = airoha_get_dsa_port(&amp;dev);</div><div class='add'>+	struct airoha_foe_mac_info_common *l2;</div><div class='add'>+	u8 smac_id = 0xf;</div><div class='add'>+</div><div class='add'>+	memset(hwe, 0, sizeof(*hwe));</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(AIROHA_FOE_IB1_BIND_STATE, AIROHA_FOE_STATE_BIND) |</div><div class='add'>+	      FIELD_PREP(AIROHA_FOE_IB1_BIND_PACKET_TYPE, type) |</div><div class='add'>+	      FIELD_PREP(AIROHA_FOE_IB1_BIND_UDP, l4proto == IPPROTO_UDP) |</div><div class='add'>+	      FIELD_PREP(AIROHA_FOE_IB1_BIND_VLAN_LAYER, data-&gt;vlan.num) |</div><div class='add'>+	      FIELD_PREP(AIROHA_FOE_IB1_BIND_VPM, data-&gt;vlan.num) |</div><div class='add'>+	      FIELD_PREP(AIROHA_FOE_IB1_BIND_PPPOE, data-&gt;pppoe.num) |</div><div class='add'>+	      AIROHA_FOE_IB1_BIND_TTL;</div><div class='add'>+	hwe-&gt;ib1 = val;</div><div class='add'>+</div><div class='add'>+	val = FIELD_PREP(AIROHA_FOE_IB2_PORT_AG, 0x1f);</div><div class='add'>+	if (dev) {</div><div class='add'>+		struct airoha_wdma_info info = {};</div><div class='add'>+</div><div class='add'>+		if (!airoha_ppe_get_wdma_info(dev, data-&gt;eth.h_dest, &amp;info)) {</div><div class='add'>+			val |= FIELD_PREP(AIROHA_FOE_IB2_NBQ, info.idx) |</div><div class='add'>+			       FIELD_PREP(AIROHA_FOE_IB2_PSE_PORT,</div><div class='add'>+					  FE_PSE_PORT_CDM4);</div><div class='add'>+			qdata |= FIELD_PREP(AIROHA_FOE_ACTDP, info.bss);</div><div class='add'>+			wlan_etype = FIELD_PREP(AIROHA_FOE_MAC_WDMA_BAND,</div><div class='add'>+						info.idx) |</div><div class='add'>+				     FIELD_PREP(AIROHA_FOE_MAC_WDMA_WCID,</div><div class='add'>+						info.wcid);</div><div class='add'>+		} else {</div><div class='add'>+			struct airoha_gdm_port *port = netdev_priv(dev);</div><div class='add'>+			u8 pse_port;</div><div class='add'>+</div><div class='add'>+			if (!airoha_is_valid_gdm_port(eth, port))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			if (dsa_port &gt;= 0 || eth-&gt;ports[1])</div><div class='add'>+				pse_port = port-&gt;id == 4 ? FE_PSE_PORT_GDM4</div><div class='add'>+							 : port-&gt;id;</div><div class='add'>+			else</div><div class='add'>+				pse_port = 2; /* uplink relies on GDM2</div><div class='add'>+					       * loopback</div><div class='add'>+					       */</div><div class='add'>+</div><div class='add'>+			val |= FIELD_PREP(AIROHA_FOE_IB2_PSE_PORT, pse_port) |</div><div class='add'>+			       AIROHA_FOE_IB2_PSE_QOS;</div><div class='add'>+			/* For downlink traffic consume SRAM memory for hw</div><div class='add'>+			 * forwarding descriptors queue.</div><div class='add'>+			 */</div><div class='add'>+			if (airhoa_is_lan_gdm_port(port))</div><div class='add'>+				val |= AIROHA_FOE_IB2_FAST_PATH;</div><div class='add'>+			if (dsa_port &gt;= 0)</div><div class='add'>+				val |= FIELD_PREP(AIROHA_FOE_IB2_NBQ,</div><div class='add'>+						  dsa_port);</div><div class='add'>+</div><div class='add'>+			smac_id = port-&gt;id;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_multicast_ether_addr(data-&gt;eth.h_dest))</div><div class='add'>+		val |= AIROHA_FOE_IB2_MULTICAST;</div><div class='add'>+</div><div class='add'>+	ports_pad = 0xa5a5a500 | (l4proto &amp; 0xff);</div><div class='add'>+	if (type == PPE_PKT_TYPE_IPV4_ROUTE)</div><div class='add'>+		hwe-&gt;ipv4.orig_tuple.ports = ports_pad;</div><div class='add'>+	if (type == PPE_PKT_TYPE_IPV6_ROUTE_3T)</div><div class='add'>+		hwe-&gt;ipv6.ports = ports_pad;</div><div class='add'>+</div><div class='add'>+	if (type == PPE_PKT_TYPE_BRIDGE) {</div><div class='add'>+		airoha_ppe_foe_set_bridge_addrs(&amp;hwe-&gt;bridge, &amp;data-&gt;eth);</div><div class='add'>+		hwe-&gt;bridge.data = qdata;</div><div class='add'>+		hwe-&gt;bridge.ib2 = val;</div><div class='add'>+		l2 = &amp;hwe-&gt;bridge.l2.common;</div><div class='add'>+	} else if (type &gt;= PPE_PKT_TYPE_IPV6_ROUTE_3T) {</div><div class='add'>+		hwe-&gt;ipv6.data = qdata;</div><div class='add'>+		hwe-&gt;ipv6.ib2 = val;</div><div class='add'>+		l2 = &amp;hwe-&gt;ipv6.l2;</div><div class='add'>+		l2-&gt;etype = ETH_P_IPV6;</div><div class='add'>+	} else {</div><div class='add'>+		hwe-&gt;ipv4.data = qdata;</div><div class='add'>+		hwe-&gt;ipv4.ib2 = val;</div><div class='add'>+		l2 = &amp;hwe-&gt;ipv4.l2.common;</div><div class='add'>+		l2-&gt;etype = ETH_P_IP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	l2-&gt;dest_mac_hi = get_unaligned_be32(data-&gt;eth.h_dest);</div><div class='add'>+	l2-&gt;dest_mac_lo = get_unaligned_be16(data-&gt;eth.h_dest + 4);</div><div class='add'>+	if (type &lt;= PPE_PKT_TYPE_IPV4_DSLITE) {</div><div class='add'>+		struct airoha_foe_mac_info *mac_info;</div><div class='add'>+</div><div class='add'>+		l2-&gt;src_mac_hi = get_unaligned_be32(data-&gt;eth.h_source);</div><div class='add'>+		hwe-&gt;ipv4.l2.src_mac_lo =</div><div class='add'>+			get_unaligned_be16(data-&gt;eth.h_source + 4);</div><div class='add'>+</div><div class='add'>+		mac_info = (struct airoha_foe_mac_info *)l2;</div><div class='add'>+		mac_info-&gt;pppoe_id = data-&gt;pppoe.sid;</div><div class='add'>+	} else {</div><div class='add'>+		l2-&gt;src_mac_hi = FIELD_PREP(AIROHA_FOE_MAC_SMAC_ID, smac_id) |</div><div class='add'>+				 FIELD_PREP(AIROHA_FOE_MAC_PPPOE_ID,</div><div class='add'>+					    data-&gt;pppoe.sid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (data-&gt;vlan.num) {</div><div class='add'>+		l2-&gt;vlan1 = data-&gt;vlan.hdr[0].id;</div><div class='add'>+		if (data-&gt;vlan.num == 2)</div><div class='add'>+			l2-&gt;vlan2 = data-&gt;vlan.hdr[1].id;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wlan_etype &gt;= 0) {</div><div class='add'>+		l2-&gt;etype = wlan_etype;</div><div class='add'>+	} else if (dsa_port &gt;= 0) {</div><div class='add'>+		l2-&gt;etype = BIT(dsa_port);</div><div class='add'>+		l2-&gt;etype |= !data-&gt;vlan.num ? BIT(15) : 0;</div><div class='add'>+	} else if (data-&gt;pppoe.num) {</div><div class='add'>+		l2-&gt;etype = ETH_P_PPP_SES;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_entry_set_ipv4_tuple(struct airoha_foe_entry *hwe,</div><div class='add'>+					       struct airoha_flow_data *data,</div><div class='add'>+					       bool egress)</div><div class='add'>+{</div><div class='add'>+	int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe-&gt;ib1);</div><div class='add'>+	struct airoha_foe_ipv4_tuple *t;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PPE_PKT_TYPE_IPV4_HNAPT:</div><div class='add'>+		if (egress) {</div><div class='add'>+			t = &amp;hwe-&gt;ipv4.new_tuple;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case PPE_PKT_TYPE_IPV4_DSLITE:</div><div class='add'>+	case PPE_PKT_TYPE_IPV4_ROUTE:</div><div class='add'>+		t = &amp;hwe-&gt;ipv4.orig_tuple;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	t-&gt;src_ip = be32_to_cpu(data-&gt;v4.src_addr);</div><div class='add'>+	t-&gt;dest_ip = be32_to_cpu(data-&gt;v4.dst_addr);</div><div class='add'>+</div><div class='add'>+	if (type != PPE_PKT_TYPE_IPV4_ROUTE) {</div><div class='add'>+		t-&gt;src_port = be16_to_cpu(data-&gt;src_port);</div><div class='add'>+		t-&gt;dest_port = be16_to_cpu(data-&gt;dst_port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_entry_set_ipv6_tuple(struct airoha_foe_entry *hwe,</div><div class='add'>+					       struct airoha_flow_data *data)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe-&gt;ib1);</div><div class='add'>+	u32 *src, *dest;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PPE_PKT_TYPE_IPV6_ROUTE_5T:</div><div class='add'>+	case PPE_PKT_TYPE_IPV6_6RD:</div><div class='add'>+		hwe-&gt;ipv6.src_port = be16_to_cpu(data-&gt;src_port);</div><div class='add'>+		hwe-&gt;ipv6.dest_port = be16_to_cpu(data-&gt;dst_port);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case PPE_PKT_TYPE_IPV6_ROUTE_3T:</div><div class='add'>+		src = hwe-&gt;ipv6.src_ip;</div><div class='add'>+		dest = hwe-&gt;ipv6.dest_ip;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ipv6_addr_be32_to_cpu(src, data-&gt;v6.src_addr.s6_addr32);</div><div class='add'>+	ipv6_addr_be32_to_cpu(dest, data-&gt;v6.dst_addr.s6_addr32);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 airoha_ppe_foe_get_entry_hash(struct airoha_ppe *ppe,</div><div class='add'>+					 struct airoha_foe_entry *hwe)</div><div class='add'>+{</div><div class='add'>+	int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe-&gt;ib1);</div><div class='add'>+	u32 ppe_hash_mask = airoha_ppe_get_total_num_entries(ppe) - 1;</div><div class='add'>+	u32 hash, hv1, hv2, hv3;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case PPE_PKT_TYPE_IPV4_ROUTE:</div><div class='add'>+	case PPE_PKT_TYPE_IPV4_HNAPT:</div><div class='add'>+		hv1 = hwe-&gt;ipv4.orig_tuple.ports;</div><div class='add'>+		hv2 = hwe-&gt;ipv4.orig_tuple.dest_ip;</div><div class='add'>+		hv3 = hwe-&gt;ipv4.orig_tuple.src_ip;</div><div class='add'>+		break;</div><div class='add'>+	case PPE_PKT_TYPE_IPV6_ROUTE_3T:</div><div class='add'>+	case PPE_PKT_TYPE_IPV6_ROUTE_5T:</div><div class='add'>+		hv1 = hwe-&gt;ipv6.src_ip[3] ^ hwe-&gt;ipv6.dest_ip[3];</div><div class='add'>+		hv1 ^= hwe-&gt;ipv6.ports;</div><div class='add'>+</div><div class='add'>+		hv2 = hwe-&gt;ipv6.src_ip[2] ^ hwe-&gt;ipv6.dest_ip[2];</div><div class='add'>+		hv2 ^= hwe-&gt;ipv6.dest_ip[0];</div><div class='add'>+</div><div class='add'>+		hv3 = hwe-&gt;ipv6.src_ip[1] ^ hwe-&gt;ipv6.dest_ip[1];</div><div class='add'>+		hv3 ^= hwe-&gt;ipv6.src_ip[0];</div><div class='add'>+		break;</div><div class='add'>+	case PPE_PKT_TYPE_BRIDGE: {</div><div class='add'>+		struct airoha_foe_mac_info *l2 = &amp;hwe-&gt;bridge.l2;</div><div class='add'>+</div><div class='add'>+		hv1 = l2-&gt;common.src_mac_hi &amp; 0xffff;</div><div class='add'>+		hv1 = hv1 &lt;&lt; 16 | l2-&gt;src_mac_lo;</div><div class='add'>+</div><div class='add'>+		hv2 = l2-&gt;common.dest_mac_lo;</div><div class='add'>+		hv2 = hv2 &lt;&lt; 16;</div><div class='add'>+		hv2 = hv2 | ((l2-&gt;common.src_mac_hi &amp; 0xffff0000) &gt;&gt; 16);</div><div class='add'>+</div><div class='add'>+		hv3 = l2-&gt;common.dest_mac_hi;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case PPE_PKT_TYPE_IPV4_DSLITE:</div><div class='add'>+	case PPE_PKT_TYPE_IPV6_6RD:</div><div class='add'>+	default:</div><div class='add'>+		WARN_ON_ONCE(1);</div><div class='add'>+		return ppe_hash_mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hash = (hv1 &amp; hv2) | ((~hv1) &amp; hv3);</div><div class='add'>+	hash = (hash &gt;&gt; 24) | ((hash &amp; 0xffffff) &lt;&lt; 8);</div><div class='add'>+	hash ^= hv1 ^ hv2 ^ hv3;</div><div class='add'>+	hash ^= hash &gt;&gt; 16;</div><div class='add'>+	hash &amp;= ppe_hash_mask;</div><div class='add'>+</div><div class='add'>+	return hash;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_get_flow_stats_index(struct airoha_ppe *ppe,</div><div class='add'>+					       u32 hash, u32 *index)</div><div class='add'>+{</div><div class='add'>+	int ppe_num_stats_entries;</div><div class='add'>+</div><div class='add'>+	ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);</div><div class='add'>+	if (ppe_num_stats_entries &lt; 0)</div><div class='add'>+		return ppe_num_stats_entries;</div><div class='add'>+</div><div class='add'>+	*index = hash &gt;= ppe_num_stats_entries ? hash - PPE_STATS_NUM_ENTRIES</div><div class='add'>+					       : hash;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_flow_stat_entry_reset(struct airoha_ppe *ppe,</div><div class='add'>+						 struct airoha_npu *npu,</div><div class='add'>+						 int index)</div><div class='add'>+{</div><div class='add'>+	memset_io(&amp;npu-&gt;stats[index], 0, sizeof(*npu-&gt;stats));</div><div class='add'>+	memset(&amp;ppe-&gt;foe_stats[index], 0, sizeof(*ppe-&gt;foe_stats));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_flow_stats_reset(struct airoha_ppe *ppe,</div><div class='add'>+					    struct airoha_npu *npu)</div><div class='add'>+{</div><div class='add'>+	int i, ppe_num_stats_entries;</div><div class='add'>+</div><div class='add'>+	ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);</div><div class='add'>+	if (ppe_num_stats_entries &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ppe_num_stats_entries; i++)</div><div class='add'>+		airoha_ppe_foe_flow_stat_entry_reset(ppe, npu, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_flow_stats_update(struct airoha_ppe *ppe,</div><div class='add'>+					     struct airoha_npu *npu,</div><div class='add'>+					     struct airoha_foe_entry *hwe,</div><div class='add'>+					     u32 hash)</div><div class='add'>+{</div><div class='add'>+	int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe-&gt;ib1);</div><div class='add'>+	u32 index, pse_port, val, *data, *ib2, *meter;</div><div class='add'>+	int ppe_num_stats_entries;</div><div class='add'>+	u8 nbq;</div><div class='add'>+</div><div class='add'>+	ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);</div><div class='add'>+	if (ppe_num_stats_entries &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (airoha_ppe_foe_get_flow_stats_index(ppe, hash, &amp;index))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= ppe_num_stats_entries)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (type == PPE_PKT_TYPE_BRIDGE) {</div><div class='add'>+		data = &amp;hwe-&gt;bridge.data;</div><div class='add'>+		ib2 = &amp;hwe-&gt;bridge.ib2;</div><div class='add'>+		meter = &amp;hwe-&gt;bridge.l2.meter;</div><div class='add'>+	} else if (type &gt;= PPE_PKT_TYPE_IPV6_ROUTE_3T) {</div><div class='add'>+		data = &amp;hwe-&gt;ipv6.data;</div><div class='add'>+		ib2 = &amp;hwe-&gt;ipv6.ib2;</div><div class='add'>+		meter = &amp;hwe-&gt;ipv6.meter;</div><div class='add'>+	} else {</div><div class='add'>+		data = &amp;hwe-&gt;ipv4.data;</div><div class='add'>+		ib2 = &amp;hwe-&gt;ipv4.ib2;</div><div class='add'>+		meter = &amp;hwe-&gt;ipv4.l2.meter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pse_port = FIELD_GET(AIROHA_FOE_IB2_PSE_PORT, *ib2);</div><div class='add'>+	if (pse_port == FE_PSE_PORT_CDM4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	airoha_ppe_foe_flow_stat_entry_reset(ppe, npu, index);</div><div class='add'>+</div><div class='add'>+	val = FIELD_GET(AIROHA_FOE_CHANNEL | AIROHA_FOE_QID, *data);</div><div class='add'>+	*data = (*data &amp; ~AIROHA_FOE_ACTDP) |</div><div class='add'>+		FIELD_PREP(AIROHA_FOE_ACTDP, val);</div><div class='add'>+</div><div class='add'>+	val = *ib2 &amp; (AIROHA_FOE_IB2_NBQ | AIROHA_FOE_IB2_PSE_PORT |</div><div class='add'>+		      AIROHA_FOE_IB2_PSE_QOS | AIROHA_FOE_IB2_FAST_PATH);</div><div class='add'>+	*meter |= FIELD_PREP(AIROHA_FOE_TUNNEL_MTU, val);</div><div class='add'>+</div><div class='add'>+	nbq = pse_port == 1 ? 6 : 5;</div><div class='add'>+	*ib2 &amp;= ~(AIROHA_FOE_IB2_NBQ | AIROHA_FOE_IB2_PSE_PORT |</div><div class='add'>+		  AIROHA_FOE_IB2_PSE_QOS);</div><div class='add'>+	*ib2 |= FIELD_PREP(AIROHA_FOE_IB2_PSE_PORT, 6) |</div><div class='add'>+		FIELD_PREP(AIROHA_FOE_IB2_NBQ, nbq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct airoha_foe_entry *</div><div class='add'>+airoha_ppe_foe_get_entry_locked(struct airoha_ppe *ppe, u32 hash)</div><div class='add'>+{</div><div class='add'>+	u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	if (hash &lt; sram_num_entries) {</div><div class='add'>+		u32 *hwe = ppe-&gt;foe + hash * sizeof(struct airoha_foe_entry);</div><div class='add'>+		bool ppe2 = hash &gt;= PPE_SRAM_NUM_ENTRIES;</div><div class='add'>+		struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+		u32 val;</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		airoha_fe_wr(ppe-&gt;eth, REG_PPE_RAM_CTRL(ppe2),</div><div class='add'>+			     FIELD_PREP(PPE_SRAM_CTRL_ENTRY_MASK, hash) |</div><div class='add'>+			     PPE_SRAM_CTRL_REQ_MASK);</div><div class='add'>+		if (read_poll_timeout_atomic(airoha_fe_rr, val,</div><div class='add'>+					     val &amp; PPE_SRAM_CTRL_ACK_MASK,</div><div class='add'>+					     10, 100, false, eth,</div><div class='add'>+					     REG_PPE_RAM_CTRL(ppe2)))</div><div class='add'>+			return NULL;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; sizeof(struct airoha_foe_entry) / sizeof(*hwe);</div><div class='add'>+		     i++)</div><div class='add'>+			hwe[i] = airoha_fe_rr(eth,</div><div class='add'>+					      REG_PPE_RAM_ENTRY(ppe2, i));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ppe-&gt;foe + hash * sizeof(struct airoha_foe_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct airoha_foe_entry *airoha_ppe_foe_get_entry(struct airoha_ppe *ppe,</div><div class='add'>+						  u32 hash)</div><div class='add'>+{</div><div class='add'>+	struct airoha_foe_entry *hwe;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ppe_lock);</div><div class='add'>+	hwe = airoha_ppe_foe_get_entry_locked(ppe, hash);</div><div class='add'>+	spin_unlock_bh(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	return hwe;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool airoha_ppe_foe_compare_entry(struct airoha_flow_table_entry *e,</div><div class='add'>+					 struct airoha_foe_entry *hwe)</div><div class='add'>+{</div><div class='add'>+	int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, e-&gt;data.ib1);</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if ((hwe-&gt;ib1 ^ e-&gt;data.ib1) &amp; AIROHA_FOE_IB1_BIND_UDP)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (type &gt; PPE_PKT_TYPE_IPV4_DSLITE)</div><div class='add'>+		len = offsetof(struct airoha_foe_entry, ipv6.data);</div><div class='add'>+	else</div><div class='add'>+		len = offsetof(struct airoha_foe_entry, ipv4.ib2);</div><div class='add'>+</div><div class='add'>+	return !memcmp(&amp;e-&gt;data.d, &amp;hwe-&gt;d, len - sizeof(hwe-&gt;ib1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_commit_sram_entry(struct airoha_ppe *ppe, u32 hash)</div><div class='add'>+{</div><div class='add'>+	struct airoha_foe_entry *hwe = ppe-&gt;foe + hash * sizeof(*hwe);</div><div class='add'>+	bool ppe2 = hash &gt;= PPE_SRAM_NUM_ENTRIES;</div><div class='add'>+	u32 *ptr = (u32 *)hwe, val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(*hwe) / sizeof(*ptr); i++)</div><div class='add'>+		airoha_fe_wr(ppe-&gt;eth, REG_PPE_RAM_ENTRY(ppe2, i), ptr[i]);</div><div class='add'>+</div><div class='add'>+	wmb();</div><div class='add'>+	airoha_fe_wr(ppe-&gt;eth, REG_PPE_RAM_CTRL(ppe2),</div><div class='add'>+		     FIELD_PREP(PPE_SRAM_CTRL_ENTRY_MASK, hash) |</div><div class='add'>+		     PPE_SRAM_CTRL_WR_MASK | PPE_SRAM_CTRL_REQ_MASK);</div><div class='add'>+</div><div class='add'>+	return read_poll_timeout_atomic(airoha_fe_rr, val,</div><div class='add'>+					val &amp; PPE_SRAM_CTRL_ACK_MASK,</div><div class='add'>+					10, 100, false, ppe-&gt;eth,</div><div class='add'>+					REG_PPE_RAM_CTRL(ppe2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_commit_entry(struct airoha_ppe *ppe,</div><div class='add'>+				       struct airoha_foe_entry *e,</div><div class='add'>+				       u32 hash, bool rx_wlan)</div><div class='add'>+{</div><div class='add'>+	u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);</div><div class='add'>+	struct airoha_foe_entry *hwe = ppe-&gt;foe + hash * sizeof(*hwe);</div><div class='add'>+	u32 ts = airoha_ppe_get_timestamp(ppe);</div><div class='add'>+	struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+	struct airoha_npu *npu;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;hwe-&gt;d, &amp;e-&gt;d, sizeof(*hwe) - sizeof(hwe-&gt;ib1));</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	e-&gt;ib1 &amp;= ~AIROHA_FOE_IB1_BIND_TIMESTAMP;</div><div class='add'>+	e-&gt;ib1 |= FIELD_PREP(AIROHA_FOE_IB1_BIND_TIMESTAMP, ts);</div><div class='add'>+	hwe-&gt;ib1 = e-&gt;ib1;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	npu = rcu_dereference(eth-&gt;npu);</div><div class='add'>+	if (!npu) {</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rx_wlan)</div><div class='add'>+		airoha_ppe_foe_flow_stats_update(ppe, npu, hwe, hash);</div><div class='add'>+</div><div class='add'>+	if (hash &lt; sram_num_entries)</div><div class='add'>+		err = airoha_ppe_foe_commit_sram_entry(ppe, hash);</div><div class='add'>+unlock:</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_remove_flow(struct airoha_ppe *ppe,</div><div class='add'>+				       struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	hlist_del_init(&amp;e-&gt;list);</div><div class='add'>+	if (e-&gt;hash != 0xffff) {</div><div class='add'>+		e-&gt;data.ib1 &amp;= ~AIROHA_FOE_IB1_BIND_STATE;</div><div class='add'>+		e-&gt;data.ib1 |= FIELD_PREP(AIROHA_FOE_IB1_BIND_STATE,</div><div class='add'>+					  AIROHA_FOE_STATE_INVALID);</div><div class='add'>+		airoha_ppe_foe_commit_entry(ppe, &amp;e-&gt;data, e-&gt;hash, false);</div><div class='add'>+		e-&gt;hash = 0xffff;</div><div class='add'>+	}</div><div class='add'>+	if (e-&gt;type == FLOW_TYPE_L2_SUBFLOW) {</div><div class='add'>+		hlist_del_init(&amp;e-&gt;l2_subflow_node);</div><div class='add'>+		kfree(e);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_remove_l2_flow(struct airoha_ppe *ppe,</div><div class='add'>+					  struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = &amp;e-&gt;l2_flows;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	rhashtable_remove_fast(&amp;ppe-&gt;l2_flows, &amp;e-&gt;l2_node,</div><div class='add'>+			       airoha_l2_flow_table_params);</div><div class='add'>+	hlist_for_each_entry_safe(e, n, head, l2_subflow_node)</div><div class='add'>+		airoha_ppe_foe_remove_flow(ppe, e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_flow_remove_entry(struct airoha_ppe *ppe,</div><div class='add'>+					     struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type == FLOW_TYPE_L2)</div><div class='add'>+		airoha_ppe_foe_remove_l2_flow(ppe, e);</div><div class='add'>+	else</div><div class='add'>+		airoha_ppe_foe_remove_flow(ppe, e);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;ppe_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+airoha_ppe_foe_commit_subflow_entry(struct airoha_ppe *ppe,</div><div class='add'>+				    struct airoha_flow_table_entry *e,</div><div class='add'>+				    u32 hash, bool rx_wlan)</div><div class='add'>+{</div><div class='add'>+	u32 mask = AIROHA_FOE_IB1_BIND_PACKET_TYPE | AIROHA_FOE_IB1_BIND_UDP;</div><div class='add'>+	struct airoha_foe_entry *hwe_p, hwe;</div><div class='add'>+	struct airoha_flow_table_entry *f;</div><div class='add'>+	int type;</div><div class='add'>+</div><div class='add'>+	hwe_p = airoha_ppe_foe_get_entry_locked(ppe, hash);</div><div class='add'>+	if (!hwe_p)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	f = kzalloc(sizeof(*f), GFP_ATOMIC);</div><div class='add'>+	if (!f)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	hlist_add_head(&amp;f-&gt;l2_subflow_node, &amp;e-&gt;l2_flows);</div><div class='add'>+	f-&gt;type = FLOW_TYPE_L2_SUBFLOW;</div><div class='add'>+	f-&gt;hash = hash;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;hwe, hwe_p, sizeof(*hwe_p));</div><div class='add'>+	hwe.ib1 = (hwe.ib1 &amp; mask) | (e-&gt;data.ib1 &amp; ~mask);</div><div class='add'>+</div><div class='add'>+	type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe.ib1);</div><div class='add'>+	if (type &gt;= PPE_PKT_TYPE_IPV6_ROUTE_3T) {</div><div class='add'>+		memcpy(&amp;hwe.ipv6.l2, &amp;e-&gt;data.bridge.l2, sizeof(hwe.ipv6.l2));</div><div class='add'>+		hwe.ipv6.ib2 = e-&gt;data.bridge.ib2;</div><div class='add'>+		/* setting smac_id to 0xf instruct the hw to keep original</div><div class='add'>+		 * source mac address</div><div class='add'>+		 */</div><div class='add'>+		hwe.ipv6.l2.src_mac_hi = FIELD_PREP(AIROHA_FOE_MAC_SMAC_ID,</div><div class='add'>+						    0xf);</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(&amp;hwe.bridge.l2, &amp;e-&gt;data.bridge.l2,</div><div class='add'>+		       sizeof(hwe.bridge.l2));</div><div class='add'>+		hwe.bridge.ib2 = e-&gt;data.bridge.ib2;</div><div class='add'>+		if (type == PPE_PKT_TYPE_IPV4_HNAPT)</div><div class='add'>+			memcpy(&amp;hwe.ipv4.new_tuple, &amp;hwe.ipv4.orig_tuple,</div><div class='add'>+			       sizeof(hwe.ipv4.new_tuple));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwe.bridge.data = e-&gt;data.bridge.data;</div><div class='add'>+	airoha_ppe_foe_commit_entry(ppe, &amp;hwe, hash, rx_wlan);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_insert_entry(struct airoha_ppe *ppe,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					u32 hash, bool rx_wlan)</div><div class='add'>+{</div><div class='add'>+	struct airoha_flow_table_entry *e;</div><div class='add'>+	struct airoha_foe_bridge br = {};</div><div class='add'>+	struct airoha_foe_entry *hwe;</div><div class='add'>+	bool commit_done = false;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+	u32 index, state;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	hwe = airoha_ppe_foe_get_entry_locked(ppe, hash);</div><div class='add'>+	if (!hwe)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	state = FIELD_GET(AIROHA_FOE_IB1_BIND_STATE, hwe-&gt;ib1);</div><div class='add'>+	if (state == AIROHA_FOE_STATE_BIND)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	index = airoha_ppe_foe_get_entry_hash(ppe, hwe);</div><div class='add'>+	hlist_for_each_entry_safe(e, n, &amp;ppe-&gt;foe_flow[index], list) {</div><div class='add'>+		if (e-&gt;type == FLOW_TYPE_L2_SUBFLOW) {</div><div class='add'>+			state = FIELD_GET(AIROHA_FOE_IB1_BIND_STATE, hwe-&gt;ib1);</div><div class='add'>+			if (state != AIROHA_FOE_STATE_BIND) {</div><div class='add'>+				e-&gt;hash = 0xffff;</div><div class='add'>+				airoha_ppe_foe_remove_flow(ppe, e);</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!airoha_ppe_foe_compare_entry(e, hwe))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		airoha_ppe_foe_commit_entry(ppe, &amp;e-&gt;data, hash, rx_wlan);</div><div class='add'>+		commit_done = true;</div><div class='add'>+		e-&gt;hash = hash;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (commit_done)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	airoha_ppe_foe_set_bridge_addrs(&amp;br, eth_hdr(skb));</div><div class='add'>+	e = rhashtable_lookup_fast(&amp;ppe-&gt;l2_flows, &amp;br,</div><div class='add'>+				   airoha_l2_flow_table_params);</div><div class='add'>+	if (e)</div><div class='add'>+		airoha_ppe_foe_commit_subflow_entry(ppe, e, hash, rx_wlan);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;ppe_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+airoha_ppe_foe_l2_flow_commit_entry(struct airoha_ppe *ppe,</div><div class='add'>+				    struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	struct airoha_flow_table_entry *prev;</div><div class='add'>+</div><div class='add'>+	e-&gt;type = FLOW_TYPE_L2;</div><div class='add'>+	prev = rhashtable_lookup_get_insert_fast(&amp;ppe-&gt;l2_flows, &amp;e-&gt;l2_node,</div><div class='add'>+						 airoha_l2_flow_table_params);</div><div class='add'>+	if (!prev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(prev))</div><div class='add'>+		return PTR_ERR(prev);</div><div class='add'>+</div><div class='add'>+	return rhashtable_replace_fast(&amp;ppe-&gt;l2_flows, &amp;prev-&gt;l2_node,</div><div class='add'>+				       &amp;e-&gt;l2_node,</div><div class='add'>+				       airoha_l2_flow_table_params);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_foe_flow_commit_entry(struct airoha_ppe *ppe,</div><div class='add'>+					    struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	int type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, e-&gt;data.ib1);</div><div class='add'>+	u32 hash;</div><div class='add'>+</div><div class='add'>+	if (type == PPE_PKT_TYPE_BRIDGE)</div><div class='add'>+		return airoha_ppe_foe_l2_flow_commit_entry(ppe, e);</div><div class='add'>+</div><div class='add'>+	hash = airoha_ppe_foe_get_entry_hash(ppe, &amp;e-&gt;data);</div><div class='add'>+	e-&gt;type = FLOW_TYPE_L4;</div><div class='add'>+	e-&gt;hash = 0xffff;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ppe_lock);</div><div class='add'>+	hlist_add_head(&amp;e-&gt;list, &amp;ppe-&gt;foe_flow[hash]);</div><div class='add'>+	spin_unlock_bh(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_get_entry_idle_time(struct airoha_ppe *ppe, u32 ib1)</div><div class='add'>+{</div><div class='add'>+	u32 state = FIELD_GET(AIROHA_FOE_IB1_BIND_STATE, ib1);</div><div class='add'>+	u32 ts, ts_mask, now = airoha_ppe_get_timestamp(ppe);</div><div class='add'>+	int idle;</div><div class='add'>+</div><div class='add'>+	if (state == AIROHA_FOE_STATE_BIND) {</div><div class='add'>+		ts = FIELD_GET(AIROHA_FOE_IB1_BIND_TIMESTAMP, ib1);</div><div class='add'>+		ts_mask = AIROHA_FOE_IB1_BIND_TIMESTAMP;</div><div class='add'>+	} else {</div><div class='add'>+		ts = FIELD_GET(AIROHA_FOE_IB1_UNBIND_TIMESTAMP, ib1);</div><div class='add'>+		now = FIELD_GET(AIROHA_FOE_IB1_UNBIND_TIMESTAMP, now);</div><div class='add'>+		ts_mask = AIROHA_FOE_IB1_UNBIND_TIMESTAMP;</div><div class='add'>+	}</div><div class='add'>+	idle = now - ts;</div><div class='add'>+</div><div class='add'>+	return idle &lt; 0 ? idle + ts_mask + 1 : idle;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+airoha_ppe_foe_flow_l2_entry_update(struct airoha_ppe *ppe,</div><div class='add'>+				    struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	int min_idle = airoha_ppe_get_entry_idle_time(ppe, e-&gt;data.ib1);</div><div class='add'>+	struct airoha_flow_table_entry *iter;</div><div class='add'>+	struct hlist_node *n;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_safe(iter, n, &amp;e-&gt;l2_flows, l2_subflow_node) {</div><div class='add'>+		struct airoha_foe_entry *hwe;</div><div class='add'>+		u32 ib1, state;</div><div class='add'>+		int idle;</div><div class='add'>+</div><div class='add'>+		hwe = airoha_ppe_foe_get_entry_locked(ppe, iter-&gt;hash);</div><div class='add'>+		if (!hwe)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ib1 = READ_ONCE(hwe-&gt;ib1);</div><div class='add'>+		state = FIELD_GET(AIROHA_FOE_IB1_BIND_STATE, ib1);</div><div class='add'>+		if (state != AIROHA_FOE_STATE_BIND) {</div><div class='add'>+			iter-&gt;hash = 0xffff;</div><div class='add'>+			airoha_ppe_foe_remove_flow(ppe, iter);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		idle = airoha_ppe_get_entry_idle_time(ppe, ib1);</div><div class='add'>+		if (idle &gt;= min_idle)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		min_idle = idle;</div><div class='add'>+		e-&gt;data.ib1 &amp;= ~AIROHA_FOE_IB1_BIND_TIMESTAMP;</div><div class='add'>+		e-&gt;data.ib1 |= ib1 &amp; AIROHA_FOE_IB1_BIND_TIMESTAMP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void airoha_ppe_foe_flow_entry_update(struct airoha_ppe *ppe,</div><div class='add'>+					     struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	struct airoha_foe_entry *hwe_p, hwe = {};</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;ppe_lock);</div><div class='add'>+</div><div class='add'>+	if (e-&gt;type == FLOW_TYPE_L2) {</div><div class='add'>+		airoha_ppe_foe_flow_l2_entry_update(ppe, e);</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (e-&gt;hash == 0xffff)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	hwe_p = airoha_ppe_foe_get_entry_locked(ppe, e-&gt;hash);</div><div class='add'>+	if (!hwe_p)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;hwe, hwe_p, sizeof(*hwe_p));</div><div class='add'>+	if (!airoha_ppe_foe_compare_entry(e, &amp;hwe)) {</div><div class='add'>+		e-&gt;hash = 0xffff;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	e-&gt;data.ib1 = hwe.ib1;</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;ppe_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_entry_idle_time(struct airoha_ppe *ppe,</div><div class='add'>+				      struct airoha_flow_table_entry *e)</div><div class='add'>+{</div><div class='add'>+	airoha_ppe_foe_flow_entry_update(ppe, e);</div><div class='add'>+</div><div class='add'>+	return airoha_ppe_get_entry_idle_time(ppe, e-&gt;data.ib1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flow_offload_replace(struct airoha_eth *eth,</div><div class='add'>+					   struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(f);</div><div class='add'>+	struct airoha_flow_table_entry *e;</div><div class='add'>+	struct airoha_flow_data data = {};</div><div class='add'>+	struct net_device *odev = NULL;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	struct airoha_foe_entry hwe;</div><div class='add'>+	int err, i, offload_type;</div><div class='add'>+	u16 addr_type = 0;</div><div class='add'>+	u8 l4proto = 0;</div><div class='add'>+</div><div class='add'>+	if (rhashtable_lookup(&amp;eth-&gt;flow_table, &amp;f-&gt;cookie,</div><div class='add'>+			      airoha_flow_table_params))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	if (!flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {</div><div class='add'>+		struct flow_match_control match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_control(rule, &amp;match);</div><div class='add'>+		addr_type = match.key-&gt;addr_type;</div><div class='add'>+		if (flow_rule_has_control_flags(match.mask-&gt;flags,</div><div class='add'>+						f-&gt;common.extack))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	} else {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='add'>+		struct flow_match_basic match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_basic(rule, &amp;match);</div><div class='add'>+		l4proto = match.key-&gt;ip_proto;</div><div class='add'>+	} else {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (addr_type) {</div><div class='add'>+	case 0:</div><div class='add'>+		offload_type = PPE_PKT_TYPE_BRIDGE;</div><div class='add'>+		if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='add'>+			struct flow_match_eth_addrs match;</div><div class='add'>+</div><div class='add'>+			flow_rule_match_eth_addrs(rule, &amp;match);</div><div class='add'>+			memcpy(data.eth.h_dest, match.key-&gt;dst, ETH_ALEN);</div><div class='add'>+			memcpy(data.eth.h_source, match.key-&gt;src, ETH_ALEN);</div><div class='add'>+		} else {</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_DISSECTOR_KEY_IPV4_ADDRS:</div><div class='add'>+		offload_type = PPE_PKT_TYPE_IPV4_HNAPT;</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_DISSECTOR_KEY_IPV6_ADDRS:</div><div class='add'>+		offload_type = PPE_PKT_TYPE_IPV6_ROUTE_5T;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, act, &amp;rule-&gt;action) {</div><div class='add'>+		switch (act-&gt;id) {</div><div class='add'>+		case FLOW_ACTION_MANGLE:</div><div class='add'>+			if (offload_type == PPE_PKT_TYPE_BRIDGE)</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+			if (act-&gt;mangle.htype == FLOW_ACT_MANGLE_HDR_TYPE_ETH)</div><div class='add'>+				airoha_ppe_flow_mangle_eth(act, &amp;data.eth);</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_REDIRECT:</div><div class='add'>+			odev = act-&gt;dev;</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_CSUM:</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_VLAN_PUSH:</div><div class='add'>+			if (data.vlan.num == 2 ||</div><div class='add'>+			    act-&gt;vlan.proto != htons(ETH_P_8021Q))</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+			data.vlan.hdr[data.vlan.num].id = act-&gt;vlan.vid;</div><div class='add'>+			data.vlan.hdr[data.vlan.num].proto = act-&gt;vlan.proto;</div><div class='add'>+			data.vlan.num++;</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_VLAN_POP:</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACTION_PPPOE_PUSH:</div><div class='add'>+			if (data.pppoe.num == 1 || data.vlan.num == 2)</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+			data.pppoe.sid = act-&gt;pppoe.sid;</div><div class='add'>+			data.pppoe.num++;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(data.eth.h_source) ||</div><div class='add'>+	    !is_valid_ether_addr(data.eth.h_dest))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	err = airoha_ppe_foe_entry_prepare(eth, &amp;hwe, odev, offload_type,</div><div class='add'>+					   &amp;data, l4proto);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) {</div><div class='add'>+		struct flow_match_ports ports;</div><div class='add'>+</div><div class='add'>+		if (offload_type == PPE_PKT_TYPE_BRIDGE)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_ports(rule, &amp;ports);</div><div class='add'>+		data.src_port = ports.key-&gt;src;</div><div class='add'>+		data.dst_port = ports.key-&gt;dst;</div><div class='add'>+	} else if (offload_type != PPE_PKT_TYPE_BRIDGE) {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {</div><div class='add'>+		struct flow_match_ipv4_addrs addrs;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_ipv4_addrs(rule, &amp;addrs);</div><div class='add'>+		data.v4.src_addr = addrs.key-&gt;src;</div><div class='add'>+		data.v4.dst_addr = addrs.key-&gt;dst;</div><div class='add'>+		airoha_ppe_foe_entry_set_ipv4_tuple(&amp;hwe, &amp;data, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {</div><div class='add'>+		struct flow_match_ipv6_addrs addrs;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_ipv6_addrs(rule, &amp;addrs);</div><div class='add'>+</div><div class='add'>+		data.v6.src_addr = addrs.key-&gt;src;</div><div class='add'>+		data.v6.dst_addr = addrs.key-&gt;dst;</div><div class='add'>+		airoha_ppe_foe_entry_set_ipv6_tuple(&amp;hwe, &amp;data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, act, &amp;rule-&gt;action) {</div><div class='add'>+		if (act-&gt;id != FLOW_ACTION_MANGLE)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (offload_type == PPE_PKT_TYPE_BRIDGE)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		switch (act-&gt;mangle.htype) {</div><div class='add'>+		case FLOW_ACT_MANGLE_HDR_TYPE_TCP:</div><div class='add'>+		case FLOW_ACT_MANGLE_HDR_TYPE_UDP:</div><div class='add'>+			err = airoha_ppe_flow_mangle_ports(act, &amp;data);</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACT_MANGLE_HDR_TYPE_IP4:</div><div class='add'>+			err = airoha_ppe_flow_mangle_ipv4(act, &amp;data);</div><div class='add'>+			break;</div><div class='add'>+		case FLOW_ACT_MANGLE_HDR_TYPE_ETH:</div><div class='add'>+			/* handled earlier */</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS) {</div><div class='add'>+		err = airoha_ppe_foe_entry_set_ipv4_tuple(&amp;hwe, &amp;data, true);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	e = kzalloc(sizeof(*e), GFP_KERNEL);</div><div class='add'>+	if (!e)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	e-&gt;cookie = f-&gt;cookie;</div><div class='add'>+	memcpy(&amp;e-&gt;data, &amp;hwe, sizeof(e-&gt;data));</div><div class='add'>+</div><div class='add'>+	err = airoha_ppe_foe_flow_commit_entry(eth-&gt;ppe, e);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_entry;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_insert_fast(&amp;eth-&gt;flow_table, &amp;e-&gt;node,</div><div class='add'>+				     airoha_flow_table_params);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto remove_foe_entry;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+remove_foe_entry:</div><div class='add'>+	airoha_ppe_foe_flow_remove_entry(eth-&gt;ppe, e);</div><div class='add'>+free_entry:</div><div class='add'>+	kfree(e);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flow_offload_destroy(struct airoha_eth *eth,</div><div class='add'>+					   struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct airoha_flow_table_entry *e;</div><div class='add'>+</div><div class='add'>+	e = rhashtable_lookup(&amp;eth-&gt;flow_table, &amp;f-&gt;cookie,</div><div class='add'>+			      airoha_flow_table_params);</div><div class='add'>+	if (!e)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	airoha_ppe_foe_flow_remove_entry(eth-&gt;ppe, e);</div><div class='add'>+	rhashtable_remove_fast(&amp;eth-&gt;flow_table, &amp;e-&gt;node,</div><div class='add'>+			       airoha_flow_table_params);</div><div class='add'>+	kfree(e);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void airoha_ppe_foe_entry_get_stats(struct airoha_ppe *ppe, u32 hash,</div><div class='add'>+				    struct airoha_foe_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+	int ppe_num_stats_entries;</div><div class='add'>+	struct airoha_npu *npu;</div><div class='add'>+	u32 index;</div><div class='add'>+</div><div class='add'>+	ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);</div><div class='add'>+	if (ppe_num_stats_entries &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (airoha_ppe_foe_get_flow_stats_index(ppe, hash, &amp;index))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= ppe_num_stats_entries)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+</div><div class='add'>+	npu = rcu_dereference(eth-&gt;npu);</div><div class='add'>+	if (npu) {</div><div class='add'>+		u64 packets = ppe-&gt;foe_stats[index].packets;</div><div class='add'>+		u64 bytes = ppe-&gt;foe_stats[index].bytes;</div><div class='add'>+		struct airoha_foe_stats npu_stats;</div><div class='add'>+</div><div class='add'>+		memcpy_fromio(&amp;npu_stats, &amp;npu-&gt;stats[index],</div><div class='add'>+			      sizeof(*npu-&gt;stats));</div><div class='add'>+		stats-&gt;packets = packets &lt;&lt; 32 | npu_stats.packets;</div><div class='add'>+		stats-&gt;bytes = bytes &lt;&lt; 32 | npu_stats.bytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flow_offload_stats(struct airoha_eth *eth,</div><div class='add'>+					 struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct airoha_flow_table_entry *e;</div><div class='add'>+	u32 idle;</div><div class='add'>+</div><div class='add'>+	e = rhashtable_lookup(&amp;eth-&gt;flow_table, &amp;f-&gt;cookie,</div><div class='add'>+			      airoha_flow_table_params);</div><div class='add'>+	if (!e)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	idle = airoha_ppe_entry_idle_time(eth-&gt;ppe, e);</div><div class='add'>+	f-&gt;stats.lastused = jiffies - idle * HZ;</div><div class='add'>+</div><div class='add'>+	if (e-&gt;hash != 0xffff) {</div><div class='add'>+		struct airoha_foe_stats64 stats = {};</div><div class='add'>+</div><div class='add'>+		airoha_ppe_foe_entry_get_stats(eth-&gt;ppe, e-&gt;hash, &amp;stats);</div><div class='add'>+		f-&gt;stats.pkts += (stats.packets - e-&gt;stats.packets);</div><div class='add'>+		f-&gt;stats.bytes += (stats.bytes - e-&gt;stats.bytes);</div><div class='add'>+		e-&gt;stats = stats;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flow_offload_cmd(struct airoha_eth *eth,</div><div class='add'>+				       struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_CLS_REPLACE:</div><div class='add'>+		return airoha_ppe_flow_offload_replace(eth, f);</div><div class='add'>+	case FLOW_CLS_DESTROY:</div><div class='add'>+		return airoha_ppe_flow_offload_destroy(eth, f);</div><div class='add'>+	case FLOW_CLS_STATS:</div><div class='add'>+		return airoha_ppe_flow_offload_stats(eth, f);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_flush_sram_entries(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	u32 sram_num_entries = airoha_ppe_get_total_sram_num_entries(ppe);</div><div class='add'>+	struct airoha_foe_entry *hwe = ppe-&gt;foe;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sram_num_entries; i++) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		memset(&amp;hwe[i], 0, sizeof(*hwe));</div><div class='add'>+		err = airoha_ppe_foe_commit_sram_entry(ppe, i);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct airoha_npu *airoha_ppe_npu_get(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu *npu = airoha_npu_get(eth-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(npu)) {</div><div class='add'>+		request_module("airoha-npu");</div><div class='add'>+		npu = airoha_npu_get(eth-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return npu;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_offload_setup(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu *npu = airoha_ppe_npu_get(eth);</div><div class='add'>+	struct airoha_ppe *ppe = eth-&gt;ppe;</div><div class='add'>+	int err, ppe_num_stats_entries;</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(npu))</div><div class='add'>+		return PTR_ERR(npu);</div><div class='add'>+</div><div class='add'>+	err = npu-&gt;ops.ppe_init(npu);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_npu_put;</div><div class='add'>+</div><div class='add'>+	ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);</div><div class='add'>+	if (ppe_num_stats_entries &gt; 0) {</div><div class='add'>+		err = npu-&gt;ops.ppe_init_stats(npu, ppe-&gt;foe_stats_dma,</div><div class='add'>+					      ppe_num_stats_entries);</div><div class='add'>+		if (err)</div><div class='add'>+			goto error_npu_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	airoha_ppe_hw_init(ppe);</div><div class='add'>+	airoha_ppe_foe_flow_stats_reset(ppe, npu);</div><div class='add'>+</div><div class='add'>+	rcu_assign_pointer(eth-&gt;npu, npu);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error_npu_put:</div><div class='add'>+	airoha_npu_put(npu);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int airoha_ppe_setup_tc_block_cb(struct airoha_ppe_dev *dev, void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct airoha_ppe *ppe = dev-&gt;priv;</div><div class='add'>+	struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;flow_offload_mutex);</div><div class='add'>+</div><div class='add'>+	if (!eth-&gt;npu)</div><div class='add'>+		err = airoha_ppe_offload_setup(eth);</div><div class='add'>+	if (!err)</div><div class='add'>+		err = airoha_ppe_flow_offload_cmd(eth, type_data);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;flow_offload_mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void airoha_ppe_check_skb(struct airoha_ppe_dev *dev, struct sk_buff *skb,</div><div class='add'>+			  u16 hash, bool rx_wlan)</div><div class='add'>+{</div><div class='add'>+	struct airoha_ppe *ppe = dev-&gt;priv;</div><div class='add'>+	u32 ppe_hash_mask = airoha_ppe_get_total_num_entries(ppe) - 1;</div><div class='add'>+	u16 now, diff;</div><div class='add'>+</div><div class='add'>+	if (hash &gt; ppe_hash_mask)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	now = (u16)jiffies;</div><div class='add'>+	diff = now - ppe-&gt;foe_check_time[hash];</div><div class='add'>+	if (diff &lt; HZ / 10)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ppe-&gt;foe_check_time[hash] = now;</div><div class='add'>+	airoha_ppe_foe_insert_entry(ppe, skb, hash, rx_wlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void airoha_ppe_init_upd_mem(struct airoha_gdm_port *port)</div><div class='add'>+{</div><div class='add'>+	struct airoha_eth *eth = port-&gt;qdma-&gt;eth;</div><div class='add'>+	struct net_device *dev = port-&gt;dev;</div><div class='add'>+	const u8 *addr = dev-&gt;dev_addr;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = (addr[2] &lt;&lt; 24) | (addr[3] &lt;&lt; 16) | (addr[4] &lt;&lt; 8) | addr[5];</div><div class='add'>+	airoha_fe_wr(eth, REG_UPDMEM_DATA(0), val);</div><div class='add'>+	airoha_fe_wr(eth, REG_UPDMEM_CTRL(0),</div><div class='add'>+		     FIELD_PREP(PPE_UPDMEM_ADDR_MASK, port-&gt;id) |</div><div class='add'>+		     PPE_UPDMEM_WR_MASK | PPE_UPDMEM_REQ_MASK);</div><div class='add'>+</div><div class='add'>+	val = (addr[0] &lt;&lt; 8) | addr[1];</div><div class='add'>+	airoha_fe_wr(eth, REG_UPDMEM_DATA(0), val);</div><div class='add'>+	airoha_fe_wr(eth, REG_UPDMEM_CTRL(0),</div><div class='add'>+		     FIELD_PREP(PPE_UPDMEM_ADDR_MASK, port-&gt;id) |</div><div class='add'>+		     FIELD_PREP(PPE_UPDMEM_OFFSET_MASK, 1) |</div><div class='add'>+		     PPE_UPDMEM_WR_MASK | PPE_UPDMEM_REQ_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct airoha_ppe_dev *airoha_ppe_get_dev(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	struct airoha_eth *eth;</div><div class='add'>+</div><div class='add'>+	np = of_parse_phandle(dev-&gt;of_node, "airoha,eth", 0);</div><div class='add'>+	if (!np)</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+</div><div class='add'>+	pdev = of_find_device_by_node(np);</div><div class='add'>+	if (!pdev) {</div><div class='add'>+		dev_err(dev, "cannot find device node %s\n", np-&gt;name);</div><div class='add'>+		of_node_put(np);</div><div class='add'>+		return ERR_PTR(-ENODEV);</div><div class='add'>+	}</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(THIS_MODULE)) {</div><div class='add'>+		dev_err(dev, "failed to get the device driver module\n");</div><div class='add'>+		goto error_pdev_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eth = platform_get_drvdata(pdev);</div><div class='add'>+	if (!eth)</div><div class='add'>+		goto error_module_put;</div><div class='add'>+</div><div class='add'>+	if (!device_link_add(dev, &amp;pdev-&gt;dev, DL_FLAG_AUTOREMOVE_SUPPLIER)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"failed to create device link to consumer %s\n",</div><div class='add'>+			dev_name(dev));</div><div class='add'>+		goto error_module_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return &amp;eth-&gt;ppe-&gt;dev;</div><div class='add'>+</div><div class='add'>+error_module_put:</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+error_pdev_put:</div><div class='add'>+	platform_device_put(pdev);</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-ENODEV);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(airoha_ppe_get_dev);</div><div class='add'>+</div><div class='add'>+void airoha_ppe_put_dev(struct airoha_ppe_dev *dev)</div><div class='add'>+{</div><div class='add'>+	struct airoha_ppe *ppe = dev-&gt;priv;</div><div class='add'>+	struct airoha_eth *eth = ppe-&gt;eth;</div><div class='add'>+</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+	put_device(eth-&gt;dev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(airoha_ppe_put_dev);</div><div class='add'>+</div><div class='add'>+int airoha_ppe_init(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	int foe_size, err, ppe_num_stats_entries;</div><div class='add'>+	u32 ppe_num_entries;</div><div class='add'>+	struct airoha_ppe *ppe;</div><div class='add'>+</div><div class='add'>+	ppe = devm_kzalloc(eth-&gt;dev, sizeof(*ppe), GFP_KERNEL);</div><div class='add'>+	if (!ppe)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe-&gt;dev.ops.setup_tc_block_cb = airoha_ppe_setup_tc_block_cb;</div><div class='add'>+	ppe-&gt;dev.ops.check_skb = airoha_ppe_check_skb;</div><div class='add'>+	ppe-&gt;dev.priv = ppe;</div><div class='add'>+	ppe-&gt;eth = eth;</div><div class='add'>+	eth-&gt;ppe = ppe;</div><div class='add'>+</div><div class='add'>+	ppe_num_entries = airoha_ppe_get_total_num_entries(ppe);</div><div class='add'>+	foe_size = ppe_num_entries * sizeof(struct airoha_foe_entry);</div><div class='add'>+	ppe-&gt;foe = dmam_alloc_coherent(eth-&gt;dev, foe_size, &amp;ppe-&gt;foe_dma,</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!ppe-&gt;foe)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe-&gt;foe_flow = devm_kzalloc(eth-&gt;dev,</div><div class='add'>+				     ppe_num_entries * sizeof(*ppe-&gt;foe_flow),</div><div class='add'>+				     GFP_KERNEL);</div><div class='add'>+	if (!ppe-&gt;foe_flow)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ppe_num_stats_entries = airoha_ppe_get_total_num_stats_entries(ppe);</div><div class='add'>+	if (ppe_num_stats_entries &gt; 0) {</div><div class='add'>+		foe_size = ppe_num_stats_entries * sizeof(*ppe-&gt;foe_stats);</div><div class='add'>+		ppe-&gt;foe_stats = dmam_alloc_coherent(eth-&gt;dev, foe_size,</div><div class='add'>+						     &amp;ppe-&gt;foe_stats_dma,</div><div class='add'>+						     GFP_KERNEL);</div><div class='add'>+		if (!ppe-&gt;foe_stats)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppe-&gt;foe_check_time = devm_kzalloc(eth-&gt;dev, ppe_num_entries,</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	if (!ppe-&gt;foe_check_time)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = airoha_ppe_flush_sram_entries(ppe);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_init(&amp;eth-&gt;flow_table, &amp;airoha_flow_table_params);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = rhashtable_init(&amp;ppe-&gt;l2_flows, &amp;airoha_l2_flow_table_params);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_flow_table_destroy;</div><div class='add'>+</div><div class='add'>+	err = airoha_ppe_debugfs_init(ppe);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error_l2_flow_table_destroy;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error_l2_flow_table_destroy:</div><div class='add'>+	rhashtable_destroy(&amp;ppe-&gt;l2_flows);</div><div class='add'>+error_flow_table_destroy:</div><div class='add'>+	rhashtable_destroy(&amp;eth-&gt;flow_table);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void airoha_ppe_deinit(struct airoha_eth *eth)</div><div class='add'>+{</div><div class='add'>+	struct airoha_npu *npu;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	npu = rcu_dereference(eth-&gt;npu);</div><div class='add'>+	if (npu) {</div><div class='add'>+		npu-&gt;ops.ppe_deinit(npu);</div><div class='add'>+		airoha_npu_put(npu);</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	rhashtable_destroy(&amp;eth-&gt;ppe-&gt;l2_flows);</div><div class='add'>+	rhashtable_destroy(&amp;eth-&gt;flow_table);</div><div class='add'>+	debugfs_remove(eth-&gt;ppe-&gt;debugfs_dir);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c b/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c<br/>new file mode 100644<br/>index 000000000000..0112c41150bb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/airoha_ppe_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/airoha_ppe_debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,187 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2025 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "airoha_eth.h"</div><div class='add'>+</div><div class='add'>+static void airoha_debugfs_ppe_print_tuple(struct seq_file *m,</div><div class='add'>+					   void *src_addr, void *dest_addr,</div><div class='add'>+					   u16 *src_port, u16 *dest_port,</div><div class='add'>+					   bool ipv6)</div><div class='add'>+{</div><div class='add'>+	__be32 n_addr[IPV6_ADDR_WORDS];</div><div class='add'>+</div><div class='add'>+	if (ipv6) {</div><div class='add'>+		ipv6_addr_cpu_to_be32(n_addr, src_addr);</div><div class='add'>+		seq_printf(m, "%pI6", n_addr);</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(m, "%pI4h", src_addr);</div><div class='add'>+	}</div><div class='add'>+	if (src_port)</div><div class='add'>+		seq_printf(m, ":%d", *src_port);</div><div class='add'>+</div><div class='add'>+	seq_puts(m, "-&gt;");</div><div class='add'>+</div><div class='add'>+	if (ipv6) {</div><div class='add'>+		ipv6_addr_cpu_to_be32(n_addr, dest_addr);</div><div class='add'>+		seq_printf(m, "%pI6", n_addr);</div><div class='add'>+	} else {</div><div class='add'>+		seq_printf(m, "%pI4h", dest_addr);</div><div class='add'>+	}</div><div class='add'>+	if (dest_port)</div><div class='add'>+		seq_printf(m, ":%d", *dest_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_debugfs_foe_show(struct seq_file *m, void *private,</div><div class='add'>+				       bool bind)</div><div class='add'>+{</div><div class='add'>+	static const char *const ppe_type_str[] = {</div><div class='add'>+		[PPE_PKT_TYPE_IPV4_HNAPT] = "IPv4 5T",</div><div class='add'>+		[PPE_PKT_TYPE_IPV4_ROUTE] = "IPv4 3T",</div><div class='add'>+		[PPE_PKT_TYPE_BRIDGE] = "L2B",</div><div class='add'>+		[PPE_PKT_TYPE_IPV4_DSLITE] = "DS-LITE",</div><div class='add'>+		[PPE_PKT_TYPE_IPV6_ROUTE_3T] = "IPv6 3T",</div><div class='add'>+		[PPE_PKT_TYPE_IPV6_ROUTE_5T] = "IPv6 5T",</div><div class='add'>+		[PPE_PKT_TYPE_IPV6_6RD] = "6RD",</div><div class='add'>+	};</div><div class='add'>+	static const char *const ppe_state_str[] = {</div><div class='add'>+		[AIROHA_FOE_STATE_INVALID] = "INV",</div><div class='add'>+		[AIROHA_FOE_STATE_UNBIND] = "UNB",</div><div class='add'>+		[AIROHA_FOE_STATE_BIND] = "BND",</div><div class='add'>+		[AIROHA_FOE_STATE_FIN] = "FIN",</div><div class='add'>+	};</div><div class='add'>+	struct airoha_ppe *ppe = m-&gt;private;</div><div class='add'>+	u32 ppe_num_entries = airoha_ppe_get_total_num_entries(ppe);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ppe_num_entries; i++) {</div><div class='add'>+		const char *state_str, *type_str = "UNKNOWN";</div><div class='add'>+		void *src_addr = NULL, *dest_addr = NULL;</div><div class='add'>+		u16 *src_port = NULL, *dest_port = NULL;</div><div class='add'>+		struct airoha_foe_mac_info_common *l2;</div><div class='add'>+		unsigned char h_source[ETH_ALEN] = {};</div><div class='add'>+		struct airoha_foe_stats64 stats = {};</div><div class='add'>+		unsigned char h_dest[ETH_ALEN];</div><div class='add'>+		struct airoha_foe_entry *hwe;</div><div class='add'>+		u32 type, state, ib2, data;</div><div class='add'>+		bool ipv6 = false;</div><div class='add'>+</div><div class='add'>+		hwe = airoha_ppe_foe_get_entry(ppe, i);</div><div class='add'>+		if (!hwe)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		state = FIELD_GET(AIROHA_FOE_IB1_BIND_STATE, hwe-&gt;ib1);</div><div class='add'>+		if (!state)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (bind &amp;&amp; state != AIROHA_FOE_STATE_BIND)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		state_str = ppe_state_str[state % ARRAY_SIZE(ppe_state_str)];</div><div class='add'>+		type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe-&gt;ib1);</div><div class='add'>+		if (type &lt; ARRAY_SIZE(ppe_type_str) &amp;&amp; ppe_type_str[type])</div><div class='add'>+			type_str = ppe_type_str[type];</div><div class='add'>+</div><div class='add'>+		seq_printf(m, "%05x %s %7s", i, state_str, type_str);</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case PPE_PKT_TYPE_IPV4_HNAPT:</div><div class='add'>+		case PPE_PKT_TYPE_IPV4_DSLITE:</div><div class='add'>+			src_port = &amp;hwe-&gt;ipv4.orig_tuple.src_port;</div><div class='add'>+			dest_port = &amp;hwe-&gt;ipv4.orig_tuple.dest_port;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case PPE_PKT_TYPE_IPV4_ROUTE:</div><div class='add'>+			src_addr = &amp;hwe-&gt;ipv4.orig_tuple.src_ip;</div><div class='add'>+			dest_addr = &amp;hwe-&gt;ipv4.orig_tuple.dest_ip;</div><div class='add'>+			break;</div><div class='add'>+		case PPE_PKT_TYPE_IPV6_ROUTE_5T:</div><div class='add'>+			src_port = &amp;hwe-&gt;ipv6.src_port;</div><div class='add'>+			dest_port = &amp;hwe-&gt;ipv6.dest_port;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case PPE_PKT_TYPE_IPV6_ROUTE_3T:</div><div class='add'>+		case PPE_PKT_TYPE_IPV6_6RD:</div><div class='add'>+			src_addr = &amp;hwe-&gt;ipv6.src_ip;</div><div class='add'>+			dest_addr = &amp;hwe-&gt;ipv6.dest_ip;</div><div class='add'>+			ipv6 = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (src_addr &amp;&amp; dest_addr) {</div><div class='add'>+			seq_puts(m, " orig=");</div><div class='add'>+			airoha_debugfs_ppe_print_tuple(m, src_addr, dest_addr,</div><div class='add'>+						       src_port, dest_port, ipv6);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case PPE_PKT_TYPE_IPV4_HNAPT:</div><div class='add'>+		case PPE_PKT_TYPE_IPV4_DSLITE:</div><div class='add'>+			src_port = &amp;hwe-&gt;ipv4.new_tuple.src_port;</div><div class='add'>+			dest_port = &amp;hwe-&gt;ipv4.new_tuple.dest_port;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case PPE_PKT_TYPE_IPV4_ROUTE:</div><div class='add'>+			src_addr = &amp;hwe-&gt;ipv4.new_tuple.src_ip;</div><div class='add'>+			dest_addr = &amp;hwe-&gt;ipv4.new_tuple.dest_ip;</div><div class='add'>+			seq_puts(m, " new=");</div><div class='add'>+			airoha_debugfs_ppe_print_tuple(m, src_addr, dest_addr,</div><div class='add'>+						       src_port, dest_port,</div><div class='add'>+						       ipv6);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (type &gt;= PPE_PKT_TYPE_IPV6_ROUTE_3T) {</div><div class='add'>+			data = hwe-&gt;ipv6.data;</div><div class='add'>+			ib2 = hwe-&gt;ipv6.ib2;</div><div class='add'>+			l2 = &amp;hwe-&gt;ipv6.l2;</div><div class='add'>+		} else {</div><div class='add'>+			data = hwe-&gt;ipv4.data;</div><div class='add'>+			ib2 = hwe-&gt;ipv4.ib2;</div><div class='add'>+			l2 = &amp;hwe-&gt;ipv4.l2.common;</div><div class='add'>+			*((__be16 *)&amp;h_source[4]) =</div><div class='add'>+				cpu_to_be16(hwe-&gt;ipv4.l2.src_mac_lo);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		airoha_ppe_foe_entry_get_stats(ppe, i, &amp;stats);</div><div class='add'>+</div><div class='add'>+		*((__be32 *)h_dest) = cpu_to_be32(l2-&gt;dest_mac_hi);</div><div class='add'>+		*((__be16 *)&amp;h_dest[4]) = cpu_to_be16(l2-&gt;dest_mac_lo);</div><div class='add'>+		*((__be32 *)h_source) = cpu_to_be32(l2-&gt;src_mac_hi);</div><div class='add'>+</div><div class='add'>+		seq_printf(m, " eth=%pM-&gt;%pM etype=%04x data=%08x"</div><div class='add'>+			      " vlan=%d,%d ib1=%08x ib2=%08x"</div><div class='add'>+			      " packets=%llu bytes=%llu\n",</div><div class='add'>+			   h_source, h_dest, l2-&gt;etype, data,</div><div class='add'>+			   l2-&gt;vlan1, l2-&gt;vlan2, hwe-&gt;ib1, ib2,</div><div class='add'>+			   stats.packets, stats.bytes);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_debugfs_foe_all_show(struct seq_file *m, void *private)</div><div class='add'>+{</div><div class='add'>+	return airoha_ppe_debugfs_foe_show(m, private, false);</div><div class='add'>+}</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(airoha_ppe_debugfs_foe_all);</div><div class='add'>+</div><div class='add'>+static int airoha_ppe_debugfs_foe_bind_show(struct seq_file *m, void *private)</div><div class='add'>+{</div><div class='add'>+	return airoha_ppe_debugfs_foe_show(m, private, true);</div><div class='add'>+}</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(airoha_ppe_debugfs_foe_bind);</div><div class='add'>+</div><div class='add'>+int airoha_ppe_debugfs_init(struct airoha_ppe *ppe)</div><div class='add'>+{</div><div class='add'>+	ppe-&gt;debugfs_dir = debugfs_create_dir("ppe", NULL);</div><div class='add'>+	debugfs_create_file("entries", 0444, ppe-&gt;debugfs_dir, ppe,</div><div class='add'>+			    &amp;airoha_ppe_debugfs_foe_all_fops);</div><div class='add'>+	debugfs_create_file("bind", 0444, ppe-&gt;debugfs_dir, ppe,</div><div class='add'>+			    &amp;airoha_ppe_debugfs_foe_bind_fops);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/airoha/airoha_regs.h b/drivers/net/ethernet/airoha/airoha_regs.h<br/>new file mode 100644<br/>index 000000000000..ed4e3407f4a0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/airoha/airoha_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/airoha/airoha_regs.h</a></div><div class='hunk'>@@ -0,0 +1,923 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2024 AIROHA Inc</div><div class='add'>+ * Author: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef AIROHA_REGS_H</div><div class='add'>+#define AIROHA_REGS_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* FE */</div><div class='add'>+#define PSE_BASE			0x0100</div><div class='add'>+#define CSR_IFC_BASE			0x0200</div><div class='add'>+#define CDM1_BASE			0x0400</div><div class='add'>+#define GDM1_BASE			0x0500</div><div class='add'>+#define PPE1_BASE			0x0c00</div><div class='add'>+#define PPE2_BASE			0x1c00</div><div class='add'>+</div><div class='add'>+#define CDM2_BASE			0x1400</div><div class='add'>+#define GDM2_BASE			0x1500</div><div class='add'>+</div><div class='add'>+#define GDM3_BASE			0x1100</div><div class='add'>+#define GDM4_BASE			0x2500</div><div class='add'>+</div><div class='add'>+#define CDM_BASE(_n)			\</div><div class='add'>+	((_n) == 2 ? CDM2_BASE : CDM1_BASE)</div><div class='add'>+#define GDM_BASE(_n)			\</div><div class='add'>+	((_n) == 4 ? GDM4_BASE :	\</div><div class='add'>+	 (_n) == 3 ? GDM3_BASE :	\</div><div class='add'>+	 (_n) == 2 ? GDM2_BASE : GDM1_BASE)</div><div class='add'>+</div><div class='add'>+#define REG_FE_DMA_GLO_CFG		0x0000</div><div class='add'>+#define FE_DMA_GLO_L2_SPACE_MASK	GENMASK(7, 4)</div><div class='add'>+#define FE_DMA_GLO_PG_SZ_MASK		BIT(3)</div><div class='add'>+</div><div class='add'>+#define REG_FE_RST_GLO_CFG		0x0004</div><div class='add'>+#define FE_RST_GDM4_MBI_ARB_MASK	BIT(3)</div><div class='add'>+#define FE_RST_GDM3_MBI_ARB_MASK	BIT(2)</div><div class='add'>+#define FE_RST_CORE_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_FOE_TS			0x0010</div><div class='add'>+</div><div class='add'>+#define REG_FE_WAN_PORT			0x0024</div><div class='add'>+#define WAN1_EN_MASK			BIT(16)</div><div class='add'>+#define WAN1_MASK			GENMASK(12, 8)</div><div class='add'>+#define WAN0_MASK			GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_WAN_MAC_H		0x0030</div><div class='add'>+#define REG_FE_LAN_MAC_H		0x0040</div><div class='add'>+</div><div class='add'>+#define REG_FE_MAC_LMIN(_n)		((_n) + 0x04)</div><div class='add'>+#define REG_FE_MAC_LMAX(_n)		((_n) + 0x08)</div><div class='add'>+</div><div class='add'>+#define REG_FE_CDM1_OQ_MAP0		0x0050</div><div class='add'>+#define REG_FE_CDM1_OQ_MAP1		0x0054</div><div class='add'>+#define REG_FE_CDM1_OQ_MAP2		0x0058</div><div class='add'>+#define REG_FE_CDM1_OQ_MAP3		0x005c</div><div class='add'>+</div><div class='add'>+#define REG_FE_PCE_CFG			0x0070</div><div class='add'>+#define PCE_DPI_EN_MASK			BIT(2)</div><div class='add'>+#define PCE_KA_EN_MASK			BIT(1)</div><div class='add'>+#define PCE_MC_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_PSE_QUEUE_CFG_WR		0x0080</div><div class='add'>+#define PSE_CFG_PORT_ID_MASK		GENMASK(27, 24)</div><div class='add'>+#define PSE_CFG_QUEUE_ID_MASK		GENMASK(20, 16)</div><div class='add'>+#define PSE_CFG_WR_EN_MASK		BIT(8)</div><div class='add'>+#define PSE_CFG_OQRSV_SEL_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_PSE_QUEUE_CFG_VAL	0x0084</div><div class='add'>+#define PSE_CFG_OQ_RSV_MASK		GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define PSE_FQ_CFG			0x008c</div><div class='add'>+#define PSE_FQ_LIMIT_MASK		GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_PSE_BUF_SET		0x0090</div><div class='add'>+#define PSE_SHARE_USED_LTHD_MASK	GENMASK(31, 16)</div><div class='add'>+#define PSE_ALLRSV_MASK			GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PSE_SHARE_USED_THD		0x0094</div><div class='add'>+#define PSE_SHARE_USED_MTHD_MASK	GENMASK(31, 16)</div><div class='add'>+#define PSE_SHARE_USED_HTHD_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_MISC_CFG		0x0148</div><div class='add'>+#define GDM2_RDM_ACK_WAIT_PREF_MASK	BIT(9)</div><div class='add'>+#define GDM2_CHN_VLD_MODE_MASK		BIT(5)</div><div class='add'>+</div><div class='add'>+#define REG_FE_CSR_IFC_CFG		CSR_IFC_BASE</div><div class='add'>+#define FE_IFC_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_VIP_PORT_EN		0x01f0</div><div class='add'>+#define REG_FE_IFC_PORT_EN		0x01f4</div><div class='add'>+</div><div class='add'>+#define REG_PSE_IQ_REV1			(PSE_BASE + 0x08)</div><div class='add'>+#define PSE_IQ_RES1_P2_MASK		GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+#define REG_PSE_IQ_REV2			(PSE_BASE + 0x0c)</div><div class='add'>+#define PSE_IQ_RES2_P5_MASK		GENMASK(15, 8)</div><div class='add'>+#define PSE_IQ_RES2_P4_MASK		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_VIP_EN(_n)		(0x0300 + ((_n) &lt;&lt; 3))</div><div class='add'>+#define PATN_FCPU_EN_MASK		BIT(7)</div><div class='add'>+#define PATN_SWP_EN_MASK		BIT(6)</div><div class='add'>+#define PATN_DP_EN_MASK			BIT(5)</div><div class='add'>+#define PATN_SP_EN_MASK			BIT(4)</div><div class='add'>+#define PATN_TYPE_MASK			GENMASK(3, 1)</div><div class='add'>+#define PATN_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_VIP_PATN(_n)		(0x0304 + ((_n) &lt;&lt; 3))</div><div class='add'>+#define PATN_DP_MASK			GENMASK(31, 16)</div><div class='add'>+#define PATN_SP_MASK			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_CDM_VLAN_CTRL(_n)		CDM_BASE(_n)</div><div class='add'>+#define CDM_VLAN_MASK			GENMASK(31, 16)</div><div class='add'>+</div><div class='add'>+#define REG_CDM_FWD_CFG(_n)		(CDM_BASE(_n) + 0x08)</div><div class='add'>+#define CDM_OAM_QSEL_MASK		GENMASK(31, 27)</div><div class='add'>+#define CDM_VIP_QSEL_MASK		GENMASK(24, 20)</div><div class='add'>+</div><div class='add'>+#define REG_CDM_CRSN_QSEL(_n, _m)	(CDM_BASE(_n) + 0x10 + ((_m) &lt;&lt; 2))</div><div class='add'>+#define CDM_CRSN_QSEL_REASON_MASK(_n)	\</div><div class='add'>+	GENMASK(4 + (((_n) % 4) &lt;&lt; 3),	(((_n) % 4) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+#define REG_GDM_FWD_CFG(_n)		GDM_BASE(_n)</div><div class='add'>+#define GDM_PAD_EN_MASK			BIT(28)</div><div class='add'>+#define GDM_DROP_CRC_ERR_MASK		BIT(23)</div><div class='add'>+#define GDM_IP4_CKSUM_MASK		BIT(22)</div><div class='add'>+#define GDM_TCP_CKSUM_MASK		BIT(21)</div><div class='add'>+#define GDM_UDP_CKSUM_MASK		BIT(20)</div><div class='add'>+#define GDM_STRIP_CRC_MASK		BIT(16)</div><div class='add'>+#define GDM_UCFQ_MASK			GENMASK(15, 12)</div><div class='add'>+#define GDM_BCFQ_MASK			GENMASK(11, 8)</div><div class='add'>+#define GDM_MCFQ_MASK			GENMASK(7, 4)</div><div class='add'>+#define GDM_OCFQ_MASK			GENMASK(3, 0)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_INGRESS_CFG(_n)		(GDM_BASE(_n) + 0x10)</div><div class='add'>+#define GDM_INGRESS_FC_EN_MASK		BIT(1)</div><div class='add'>+#define GDM_STAG_EN_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_LEN_CFG(_n)		(GDM_BASE(_n) + 0x14)</div><div class='add'>+#define GDM_SHORT_LEN_MASK		GENMASK(13, 0)</div><div class='add'>+#define GDM_LONG_LEN_MASK		GENMASK(29, 16)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_LPBK_CFG(_n)		(GDM_BASE(_n) + 0x1c)</div><div class='add'>+#define LPBK_GAP_MASK			GENMASK(31, 24)</div><div class='add'>+#define LPBK_LEN_MASK			GENMASK(23, 10)</div><div class='add'>+#define LPBK_CHAN_MASK			GENMASK(8, 4)</div><div class='add'>+#define LPBK_MODE_MASK			GENMASK(3, 1)</div><div class='add'>+#define LBK_GAP_MODE_MASK		BIT(3)</div><div class='add'>+#define LBK_LEN_MODE_MASK		BIT(2)</div><div class='add'>+#define LBK_CHAN_MODE_MASK		BIT(1)</div><div class='add'>+#define LPBK_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_CHN_RLS(_n)		(GDM_BASE(_n) + 0x20)</div><div class='add'>+#define MBI_RX_AGE_SEL_MASK		GENMASK(26, 25)</div><div class='add'>+#define MBI_TX_AGE_SEL_MASK		GENMASK(18, 17)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_TXCHN_EN(_n)		(GDM_BASE(_n) + 0x24)</div><div class='add'>+#define REG_GDM_RXCHN_EN(_n)		(GDM_BASE(_n) + 0x28)</div><div class='add'>+</div><div class='add'>+#define REG_FE_CPORT_CFG		(GDM1_BASE + 0x40)</div><div class='add'>+#define FE_CPORT_PAD			BIT(26)</div><div class='add'>+#define FE_CPORT_PORT_XFC_MASK		BIT(25)</div><div class='add'>+#define FE_CPORT_QUEUE_XFC_MASK		BIT(24)</div><div class='add'>+</div><div class='add'>+#define REG_FE_GDM_MIB_CLEAR(_n)	(GDM_BASE(_n) + 0xf0)</div><div class='add'>+#define FE_GDM_MIB_RX_CLEAR_MASK	BIT(1)</div><div class='add'>+#define FE_GDM_MIB_TX_CLEAR_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_GDM_MIB_CFG(_n)		(GDM_BASE(_n) + 0xf4)</div><div class='add'>+#define FE_STRICT_RFC2819_MODE_MASK	BIT(31)</div><div class='add'>+#define FE_GDM_TX_MIB_SPLIT_EN_MASK	BIT(17)</div><div class='add'>+#define FE_GDM_RX_MIB_SPLIT_EN_MASK	BIT(16)</div><div class='add'>+#define FE_TX_MIB_ID_MASK		GENMASK(15, 8)</div><div class='add'>+#define FE_RX_MIB_ID_MASK		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define REG_FE_GDM_TX_OK_PKT_CNT_L(_n)		(GDM_BASE(_n) + 0x104)</div><div class='add'>+#define REG_FE_GDM_TX_OK_BYTE_CNT_L(_n)		(GDM_BASE(_n) + 0x10c)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_PKT_CNT_L(_n)		(GDM_BASE(_n) + 0x110)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_BYTE_CNT_L(_n)	(GDM_BASE(_n) + 0x114)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_DROP_CNT(_n)		(GDM_BASE(_n) + 0x118)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_BC_CNT(_n)		(GDM_BASE(_n) + 0x11c)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_MC_CNT(_n)		(GDM_BASE(_n) + 0x120)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_RUNT_CNT(_n)		(GDM_BASE(_n) + 0x124)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_LONG_CNT(_n)		(GDM_BASE(_n) + 0x128)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_E64_CNT_L(_n)		(GDM_BASE(_n) + 0x12c)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L64_CNT_L(_n)		(GDM_BASE(_n) + 0x130)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L127_CNT_L(_n)	(GDM_BASE(_n) + 0x134)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L255_CNT_L(_n)	(GDM_BASE(_n) + 0x138)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L511_CNT_L(_n)	(GDM_BASE(_n) + 0x13c)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L1023_CNT_L(_n)	(GDM_BASE(_n) + 0x140)</div><div class='add'>+</div><div class='add'>+#define REG_FE_GDM_RX_OK_PKT_CNT_L(_n)		(GDM_BASE(_n) + 0x148)</div><div class='add'>+#define REG_FE_GDM_RX_FC_DROP_CNT(_n)		(GDM_BASE(_n) + 0x14c)</div><div class='add'>+#define REG_FE_GDM_RX_RC_DROP_CNT(_n)		(GDM_BASE(_n) + 0x150)</div><div class='add'>+#define REG_FE_GDM_RX_OVERFLOW_DROP_CNT(_n)	(GDM_BASE(_n) + 0x154)</div><div class='add'>+#define REG_FE_GDM_RX_ERROR_DROP_CNT(_n)	(GDM_BASE(_n) + 0x158)</div><div class='add'>+#define REG_FE_GDM_RX_OK_BYTE_CNT_L(_n)		(GDM_BASE(_n) + 0x15c)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_PKT_CNT_L(_n)		(GDM_BASE(_n) + 0x160)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_BYTE_CNT_L(_n)	(GDM_BASE(_n) + 0x164)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_DROP_CNT(_n)		(GDM_BASE(_n) + 0x168)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_BC_CNT(_n)		(GDM_BASE(_n) + 0x16c)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_MC_CNT(_n)		(GDM_BASE(_n) + 0x170)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_CRC_ERR_CNT(_n)	(GDM_BASE(_n) + 0x174)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_FRAG_CNT(_n)		(GDM_BASE(_n) + 0x178)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_JABBER_CNT(_n)	(GDM_BASE(_n) + 0x17c)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_RUNT_CNT(_n)		(GDM_BASE(_n) + 0x180)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_LONG_CNT(_n)		(GDM_BASE(_n) + 0x184)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_E64_CNT_L(_n)		(GDM_BASE(_n) + 0x188)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L64_CNT_L(_n)		(GDM_BASE(_n) + 0x18c)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L127_CNT_L(_n)	(GDM_BASE(_n) + 0x190)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L255_CNT_L(_n)	(GDM_BASE(_n) + 0x194)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L511_CNT_L(_n)	(GDM_BASE(_n) + 0x198)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L1023_CNT_L(_n)	(GDM_BASE(_n) + 0x19c)</div><div class='add'>+</div><div class='add'>+#define REG_GDM_SRC_PORT_SET(_n)		(GDM_BASE(_n) + 0x23c)</div><div class='add'>+#define GDM_SPORT_OFF2_MASK			GENMASK(19, 16)</div><div class='add'>+#define GDM_SPORT_OFF1_MASK			GENMASK(15, 12)</div><div class='add'>+#define GDM_SPORT_OFF0_MASK			GENMASK(11, 8)</div><div class='add'>+</div><div class='add'>+#define REG_FE_GDM_TX_OK_PKT_CNT_H(_n)		(GDM_BASE(_n) + 0x280)</div><div class='add'>+#define REG_FE_GDM_TX_OK_BYTE_CNT_H(_n)		(GDM_BASE(_n) + 0x284)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_PKT_CNT_H(_n)		(GDM_BASE(_n) + 0x288)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_BYTE_CNT_H(_n)	(GDM_BASE(_n) + 0x28c)</div><div class='add'>+</div><div class='add'>+#define REG_FE_GDM_RX_OK_PKT_CNT_H(_n)		(GDM_BASE(_n) + 0x290)</div><div class='add'>+#define REG_FE_GDM_RX_OK_BYTE_CNT_H(_n)		(GDM_BASE(_n) + 0x294)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_PKT_CNT_H(_n)		(GDM_BASE(_n) + 0x298)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_BYTE_CNT_H(_n)	(GDM_BASE(_n) + 0x29c)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_E64_CNT_H(_n)		(GDM_BASE(_n) + 0x2b8)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L64_CNT_H(_n)		(GDM_BASE(_n) + 0x2bc)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L127_CNT_H(_n)	(GDM_BASE(_n) + 0x2c0)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L255_CNT_H(_n)	(GDM_BASE(_n) + 0x2c4)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L511_CNT_H(_n)	(GDM_BASE(_n) + 0x2c8)</div><div class='add'>+#define REG_FE_GDM_TX_ETH_L1023_CNT_H(_n)	(GDM_BASE(_n) + 0x2cc)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_E64_CNT_H(_n)		(GDM_BASE(_n) + 0x2e8)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L64_CNT_H(_n)		(GDM_BASE(_n) + 0x2ec)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L127_CNT_H(_n)	(GDM_BASE(_n) + 0x2f0)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L255_CNT_H(_n)	(GDM_BASE(_n) + 0x2f4)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L511_CNT_H(_n)	(GDM_BASE(_n) + 0x2f8)</div><div class='add'>+#define REG_FE_GDM_RX_ETH_L1023_CNT_H(_n)	(GDM_BASE(_n) + 0x2fc)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_GLO_CFG(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x200)</div><div class='add'>+#define PPE_GLO_CFG_BUSY_MASK			BIT(31)</div><div class='add'>+#define PPE_GLO_CFG_FLOW_DROP_UPDATE_MASK	BIT(9)</div><div class='add'>+#define PPE_GLO_CFG_PSE_HASH_OFS_MASK		BIT(6)</div><div class='add'>+#define PPE_GLO_CFG_PPE_BSWAP_MASK		BIT(5)</div><div class='add'>+#define PPE_GLO_CFG_TTL_DROP_MASK		BIT(4)</div><div class='add'>+#define PPE_GLO_CFG_IP4_CS_DROP_MASK		BIT(3)</div><div class='add'>+#define PPE_GLO_CFG_IP4_L4_CS_DROP_MASK		BIT(2)</div><div class='add'>+#define PPE_GLO_CFG_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_PPE_FLOW_CFG(_n)		(((_n) ? PPE2_BASE : PPE1_BASE) + 0x204)</div><div class='add'>+#define PPE_FLOW_CFG_IP6_HASH_GRE_KEY_MASK	BIT(20)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_HASH_GRE_KEY_MASK	BIT(19)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_HASH_FLOW_LABEL_MASK	BIT(18)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_NAT_FRAG_MASK		BIT(17)</div><div class='add'>+#define PPE_FLOW_CFG_IP_PROTO_BLACKLIST_MASK	BIT(16)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_DSLITE_MASK		BIT(14)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_NAPT_MASK		BIT(13)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_NAT_MASK		BIT(12)</div><div class='add'>+#define PPE_FLOW_CFG_IP6_6RD_MASK		BIT(10)</div><div class='add'>+#define PPE_FLOW_CFG_IP6_5T_ROUTE_MASK		BIT(9)</div><div class='add'>+#define PPE_FLOW_CFG_IP6_3T_ROUTE_MASK		BIT(8)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_UDP_FRAG_MASK		BIT(7)</div><div class='add'>+#define PPE_FLOW_CFG_IP4_TCP_FRAG_MASK		BIT(6)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_IP_PROTO_CHK(_n)		(((_n) ? PPE2_BASE : PPE1_BASE) + 0x208)</div><div class='add'>+#define PPE_IP_PROTO_CHK_IPV4_MASK		GENMASK(31, 16)</div><div class='add'>+#define PPE_IP_PROTO_CHK_IPV6_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_TB_CFG(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x21c)</div><div class='add'>+#define PPE_SRAM_TB_NUM_ENTRY_MASK		GENMASK(26, 24)</div><div class='add'>+#define PPE_TB_CFG_KEEPALIVE_MASK		GENMASK(13, 12)</div><div class='add'>+#define PPE_TB_CFG_AGE_TCP_FIN_MASK		BIT(11)</div><div class='add'>+#define PPE_TB_CFG_AGE_UDP_MASK			BIT(10)</div><div class='add'>+#define PPE_TB_CFG_AGE_TCP_MASK			BIT(9)</div><div class='add'>+#define PPE_TB_CFG_AGE_UNBIND_MASK		BIT(8)</div><div class='add'>+#define PPE_TB_CFG_AGE_NON_L4_MASK		BIT(7)</div><div class='add'>+#define PPE_TB_CFG_AGE_PREBIND_MASK		BIT(6)</div><div class='add'>+#define PPE_TB_CFG_SEARCH_MISS_MASK		GENMASK(5, 4)</div><div class='add'>+#define PPE_TB_ENTRY_SIZE_MASK			BIT(3)</div><div class='add'>+#define PPE_DRAM_TB_NUM_ENTRY_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_TB_BASE(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x220)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_BIND_RATE(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x228)</div><div class='add'>+#define PPE_BIND_RATE_L2B_BIND_MASK		GENMASK(31, 16)</div><div class='add'>+#define PPE_BIND_RATE_BIND_MASK			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_BIND_LIMIT0(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x22c)</div><div class='add'>+#define PPE_BIND_LIMIT0_HALF_MASK		GENMASK(29, 16)</div><div class='add'>+#define PPE_BIND_LIMIT0_QUARTER_MASK		GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_BIND_LIMIT1(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x230)</div><div class='add'>+#define PPE_BIND_LIMIT1_NON_L4_MASK		GENMASK(23, 16)</div><div class='add'>+#define PPE_BIND_LIMIT1_FULL_MASK		GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_BND_AGE0(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x23c)</div><div class='add'>+#define PPE_BIND_AGE0_DELTA_NON_L4		GENMASK(30, 16)</div><div class='add'>+#define PPE_BIND_AGE0_DELTA_UDP			GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_UNBIND_AGE(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x238)</div><div class='add'>+#define PPE_UNBIND_AGE_MIN_PACKETS_MASK		GENMASK(31, 16)</div><div class='add'>+#define PPE_UNBIND_AGE_DELTA_MASK		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_BND_AGE1(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x240)</div><div class='add'>+#define PPE_BIND_AGE1_DELTA_TCP_FIN		GENMASK(30, 16)</div><div class='add'>+#define PPE_BIND_AGE1_DELTA_TCP			GENMASK(14, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_HASH_SEED(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x244)</div><div class='add'>+#define PPE_HASH_SEED				0x12345678</div><div class='add'>+</div><div class='add'>+#define REG_PPE_DFT_CPORT0(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x248)</div><div class='add'>+#define DFT_CPORT_MASK(_n)			GENMASK(3 + ((_n) &lt;&lt; 2), ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+#define REG_PPE_DFT_CPORT1(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x24c)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_TB_HASH_CFG(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x250)</div><div class='add'>+#define PPE_DRAM_HASH1_MODE_MASK		GENMASK(31, 28)</div><div class='add'>+#define PPE_DRAM_HASH1_EN_MASK			BIT(24)</div><div class='add'>+#define PPE_DRAM_HASH0_MODE_MASK		GENMASK(23, 20)</div><div class='add'>+#define PPE_DRAM_TABLE_EN_MASK			BIT(16)</div><div class='add'>+#define PPE_SRAM_HASH1_MODE_MASK		GENMASK(15, 12)</div><div class='add'>+#define PPE_SRAM_HASH1_EN_MASK			BIT(8)</div><div class='add'>+#define PPE_SRAM_HASH0_MODE_MASK		GENMASK(7, 4)</div><div class='add'>+#define PPE_SRAM_TABLE_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_MTU_BASE(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x304)</div><div class='add'>+#define REG_PPE_MTU(_m, _n)			(REG_PPE_MTU_BASE(_m) + ((_n) &lt;&lt; 2))</div><div class='add'>+#define FP1_EGRESS_MTU_MASK			GENMASK(29, 16)</div><div class='add'>+#define FP0_EGRESS_MTU_MASK			GENMASK(13, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_RAM_CTRL(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x31c)</div><div class='add'>+#define PPE_SRAM_CTRL_ACK_MASK			BIT(31)</div><div class='add'>+#define PPE_SRAM_CTRL_DUAL_SUCESS_MASK		BIT(30)</div><div class='add'>+#define PPE_SRAM_CTRL_ENTRY_MASK		GENMASK(23, 8)</div><div class='add'>+#define PPE_SRAM_WR_DUAL_DIRECTION_MASK		BIT(2)</div><div class='add'>+#define PPE_SRAM_CTRL_WR_MASK			BIT(1)</div><div class='add'>+#define PPE_SRAM_CTRL_REQ_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_PPE_RAM_BASE(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x320)</div><div class='add'>+#define REG_PPE_RAM_ENTRY(_m, _n)		(REG_PPE_RAM_BASE(_m) + ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+#define REG_UPDMEM_CTRL(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x370)</div><div class='add'>+#define PPE_UPDMEM_ACK_MASK			BIT(31)</div><div class='add'>+#define PPE_UPDMEM_ADDR_MASK			GENMASK(11, 8)</div><div class='add'>+#define PPE_UPDMEM_OFFSET_MASK			GENMASK(7, 4)</div><div class='add'>+#define PPE_UPDMEM_SEL_MASK			GENMASK(3, 2)</div><div class='add'>+#define PPE_UPDMEM_WR_MASK			BIT(1)</div><div class='add'>+#define PPE_UPDMEM_REQ_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_UPDMEM_DATA(_n)			(((_n) ? PPE2_BASE : PPE1_BASE) + 0x374)</div><div class='add'>+</div><div class='add'>+#define REG_IP_FRAG_FP			0x2010</div><div class='add'>+#define IP_ASSEMBLE_PORT_MASK		GENMASK(24, 21)</div><div class='add'>+#define IP_ASSEMBLE_NBQ_MASK		GENMASK(20, 16)</div><div class='add'>+#define IP_FRAGMENT_PORT_MASK		GENMASK(8, 5)</div><div class='add'>+#define IP_FRAGMENT_NBQ_MASK		GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define REG_MC_VLAN_EN			0x2100</div><div class='add'>+#define MC_VLAN_EN_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_MC_VLAN_CFG			0x2104</div><div class='add'>+#define MC_VLAN_CFG_CMD_DONE_MASK	BIT(31)</div><div class='add'>+#define MC_VLAN_CFG_TABLE_ID_MASK	GENMASK(21, 16)</div><div class='add'>+#define MC_VLAN_CFG_PORT_ID_MASK	GENMASK(11, 8)</div><div class='add'>+#define MC_VLAN_CFG_TABLE_SEL_MASK	BIT(4)</div><div class='add'>+#define MC_VLAN_CFG_RW_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_MC_VLAN_DATA		0x2108</div><div class='add'>+</div><div class='add'>+#define REG_SP_DFT_CPORT(_n)		(0x20e0 + ((_n) &lt;&lt; 2))</div><div class='add'>+#define SP_CPORT_DFT_MASK		GENMASK(2, 0)</div><div class='add'>+#define SP_CPORT_MASK(_n)		GENMASK(3 + ((_n) &lt;&lt; 2), ((_n) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+#define REG_SRC_PORT_FC_MAP6		0x2298</div><div class='add'>+#define FC_ID_OF_SRC_PORT27_MASK	GENMASK(28, 24)</div><div class='add'>+#define FC_ID_OF_SRC_PORT26_MASK	GENMASK(20, 16)</div><div class='add'>+#define FC_ID_OF_SRC_PORT25_MASK	GENMASK(12, 8)</div><div class='add'>+#define FC_ID_OF_SRC_PORT24_MASK	GENMASK(4, 0)</div><div class='add'>+</div><div class='add'>+#define REG_CDM5_RX_OQ1_DROP_CNT	0x29d4</div><div class='add'>+</div><div class='add'>+/* QDMA */</div><div class='add'>+#define REG_QDMA_GLOBAL_CFG			0x0004</div><div class='add'>+#define GLOBAL_CFG_RX_2B_OFFSET_MASK		BIT(31)</div><div class='add'>+#define GLOBAL_CFG_DMA_PREFERENCE_MASK		GENMASK(30, 29)</div><div class='add'>+#define GLOBAL_CFG_CPU_TXR_RR_MASK		BIT(28)</div><div class='add'>+#define GLOBAL_CFG_DSCP_BYTE_SWAP_MASK		BIT(27)</div><div class='add'>+#define GLOBAL_CFG_PAYLOAD_BYTE_SWAP_MASK	BIT(26)</div><div class='add'>+#define GLOBAL_CFG_MULTICAST_MODIFY_FP_MASK	BIT(25)</div><div class='add'>+#define GLOBAL_CFG_OAM_MODIFY_MASK		BIT(24)</div><div class='add'>+#define GLOBAL_CFG_RESET_MASK			BIT(23)</div><div class='add'>+#define GLOBAL_CFG_RESET_DONE_MASK		BIT(22)</div><div class='add'>+#define GLOBAL_CFG_MULTICAST_EN_MASK		BIT(21)</div><div class='add'>+#define GLOBAL_CFG_IRQ1_EN_MASK			BIT(20)</div><div class='add'>+#define GLOBAL_CFG_IRQ0_EN_MASK			BIT(19)</div><div class='add'>+#define GLOBAL_CFG_LOOPCNT_EN_MASK		BIT(18)</div><div class='add'>+#define GLOBAL_CFG_RD_BYPASS_WR_MASK		BIT(17)</div><div class='add'>+#define GLOBAL_CFG_QDMA_LOOPBACK_MASK		BIT(16)</div><div class='add'>+#define GLOBAL_CFG_LPBK_RXQ_SEL_MASK		GENMASK(13, 8)</div><div class='add'>+#define GLOBAL_CFG_CHECK_DONE_MASK		BIT(7)</div><div class='add'>+#define GLOBAL_CFG_TX_WB_DONE_MASK		BIT(6)</div><div class='add'>+#define GLOBAL_CFG_MAX_ISSUE_NUM_MASK		GENMASK(5, 4)</div><div class='add'>+#define GLOBAL_CFG_RX_DMA_BUSY_MASK		BIT(3)</div><div class='add'>+#define GLOBAL_CFG_RX_DMA_EN_MASK		BIT(2)</div><div class='add'>+#define GLOBAL_CFG_TX_DMA_BUSY_MASK		BIT(1)</div><div class='add'>+#define GLOBAL_CFG_TX_DMA_EN_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_FWD_DSCP_BASE			0x0010</div><div class='add'>+#define REG_FWD_BUF_BASE			0x0014</div><div class='add'>+</div><div class='add'>+#define REG_HW_FWD_DSCP_CFG			0x0018</div><div class='add'>+#define HW_FWD_DSCP_PAYLOAD_SIZE_MASK		GENMASK(29, 28)</div><div class='add'>+#define HW_FWD_DSCP_SCATTER_LEN_MASK		GENMASK(17, 16)</div><div class='add'>+#define HW_FWD_DSCP_MIN_SCATTER_LEN_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_INT_STATUS(_n)		\</div><div class='add'>+	(((_n) == 4) ? 0x0730 :		\</div><div class='add'>+	 ((_n) == 3) ? 0x0724 :		\</div><div class='add'>+	 ((_n) == 2) ? 0x0720 :		\</div><div class='add'>+	 ((_n) == 1) ? 0x0024 : 0x0020)</div><div class='add'>+</div><div class='add'>+#define REG_INT_ENABLE(_b, _n)		\</div><div class='add'>+	(((_n) == 4) ? 0x0750 + ((_b) &lt;&lt; 5) :	\</div><div class='add'>+	 ((_n) == 3) ? 0x0744 + ((_b) &lt;&lt; 5) :	\</div><div class='add'>+	 ((_n) == 2) ? 0x0740 + ((_b) &lt;&lt; 5) :	\</div><div class='add'>+	 ((_n) == 1) ? 0x002c + ((_b) &lt;&lt; 3) :	\</div><div class='add'>+		       0x0028 + ((_b) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+/* QDMA_CSR_INT_ENABLE1 */</div><div class='add'>+#define RX15_COHERENT_INT_MASK		BIT(31)</div><div class='add'>+#define RX14_COHERENT_INT_MASK		BIT(30)</div><div class='add'>+#define RX13_COHERENT_INT_MASK		BIT(29)</div><div class='add'>+#define RX12_COHERENT_INT_MASK		BIT(28)</div><div class='add'>+#define RX11_COHERENT_INT_MASK		BIT(27)</div><div class='add'>+#define RX10_COHERENT_INT_MASK		BIT(26)</div><div class='add'>+#define RX9_COHERENT_INT_MASK		BIT(25)</div><div class='add'>+#define RX8_COHERENT_INT_MASK		BIT(24)</div><div class='add'>+#define RX7_COHERENT_INT_MASK		BIT(23)</div><div class='add'>+#define RX6_COHERENT_INT_MASK		BIT(22)</div><div class='add'>+#define RX5_COHERENT_INT_MASK		BIT(21)</div><div class='add'>+#define RX4_COHERENT_INT_MASK		BIT(20)</div><div class='add'>+#define RX3_COHERENT_INT_MASK		BIT(19)</div><div class='add'>+#define RX2_COHERENT_INT_MASK		BIT(18)</div><div class='add'>+#define RX1_COHERENT_INT_MASK		BIT(17)</div><div class='add'>+#define RX0_COHERENT_INT_MASK		BIT(16)</div><div class='add'>+#define TX7_COHERENT_INT_MASK		BIT(15)</div><div class='add'>+#define TX6_COHERENT_INT_MASK		BIT(14)</div><div class='add'>+#define TX5_COHERENT_INT_MASK		BIT(13)</div><div class='add'>+#define TX4_COHERENT_INT_MASK		BIT(12)</div><div class='add'>+#define TX3_COHERENT_INT_MASK		BIT(11)</div><div class='add'>+#define TX2_COHERENT_INT_MASK		BIT(10)</div><div class='add'>+#define TX1_COHERENT_INT_MASK		BIT(9)</div><div class='add'>+#define TX0_COHERENT_INT_MASK		BIT(8)</div><div class='add'>+#define CNT_OVER_FLOW_INT_MASK		BIT(7)</div><div class='add'>+#define IRQ1_FULL_INT_MASK		BIT(5)</div><div class='add'>+#define IRQ1_INT_MASK			BIT(4)</div><div class='add'>+#define HWFWD_DSCP_LOW_INT_MASK		BIT(3)</div><div class='add'>+#define HWFWD_DSCP_EMPTY_INT_MASK	BIT(2)</div><div class='add'>+#define IRQ0_FULL_INT_MASK		BIT(1)</div><div class='add'>+#define IRQ0_INT_MASK			BIT(0)</div><div class='add'>+</div><div class='add'>+#define RX_COHERENT_LOW_INT_MASK				\</div><div class='add'>+	(RX15_COHERENT_INT_MASK | RX14_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX13_COHERENT_INT_MASK | RX12_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX11_COHERENT_INT_MASK | RX10_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX9_COHERENT_INT_MASK | RX8_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX7_COHERENT_INT_MASK | RX6_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX5_COHERENT_INT_MASK | RX4_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX3_COHERENT_INT_MASK | RX2_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX1_COHERENT_INT_MASK | RX0_COHERENT_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define RX_COHERENT_LOW_OFFSET	__ffs(RX_COHERENT_LOW_INT_MASK)</div><div class='add'>+#define INT_RX0_MASK(_n)					\</div><div class='add'>+	(((_n) &lt;&lt; RX_COHERENT_LOW_OFFSET) &amp; RX_COHERENT_LOW_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define TX_COHERENT_LOW_INT_MASK				\</div><div class='add'>+	(TX7_COHERENT_INT_MASK | TX6_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX5_COHERENT_INT_MASK | TX4_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX3_COHERENT_INT_MASK | TX2_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX1_COHERENT_INT_MASK | TX0_COHERENT_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define TX_DONE_INT_MASK(_n)					\</div><div class='add'>+	((_n) ? IRQ1_INT_MASK | IRQ1_FULL_INT_MASK		\</div><div class='add'>+	      : IRQ0_INT_MASK | IRQ0_FULL_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define INT_TX_MASK						\</div><div class='add'>+	(IRQ1_INT_MASK | IRQ1_FULL_INT_MASK |			\</div><div class='add'>+	 IRQ0_INT_MASK | IRQ0_FULL_INT_MASK)</div><div class='add'>+</div><div class='add'>+/* QDMA_CSR_INT_ENABLE2 */</div><div class='add'>+#define RX15_NO_CPU_DSCP_INT_MASK	BIT(31)</div><div class='add'>+#define RX14_NO_CPU_DSCP_INT_MASK	BIT(30)</div><div class='add'>+#define RX13_NO_CPU_DSCP_INT_MASK	BIT(29)</div><div class='add'>+#define RX12_NO_CPU_DSCP_INT_MASK	BIT(28)</div><div class='add'>+#define RX11_NO_CPU_DSCP_INT_MASK	BIT(27)</div><div class='add'>+#define RX10_NO_CPU_DSCP_INT_MASK	BIT(26)</div><div class='add'>+#define RX9_NO_CPU_DSCP_INT_MASK	BIT(25)</div><div class='add'>+#define RX8_NO_CPU_DSCP_INT_MASK	BIT(24)</div><div class='add'>+#define RX7_NO_CPU_DSCP_INT_MASK	BIT(23)</div><div class='add'>+#define RX6_NO_CPU_DSCP_INT_MASK	BIT(22)</div><div class='add'>+#define RX5_NO_CPU_DSCP_INT_MASK	BIT(21)</div><div class='add'>+#define RX4_NO_CPU_DSCP_INT_MASK	BIT(20)</div><div class='add'>+#define RX3_NO_CPU_DSCP_INT_MASK	BIT(19)</div><div class='add'>+#define RX2_NO_CPU_DSCP_INT_MASK	BIT(18)</div><div class='add'>+#define RX1_NO_CPU_DSCP_INT_MASK	BIT(17)</div><div class='add'>+#define RX0_NO_CPU_DSCP_INT_MASK	BIT(16)</div><div class='add'>+#define RX15_DONE_INT_MASK		BIT(15)</div><div class='add'>+#define RX14_DONE_INT_MASK		BIT(14)</div><div class='add'>+#define RX13_DONE_INT_MASK		BIT(13)</div><div class='add'>+#define RX12_DONE_INT_MASK		BIT(12)</div><div class='add'>+#define RX11_DONE_INT_MASK		BIT(11)</div><div class='add'>+#define RX10_DONE_INT_MASK		BIT(10)</div><div class='add'>+#define RX9_DONE_INT_MASK		BIT(9)</div><div class='add'>+#define RX8_DONE_INT_MASK		BIT(8)</div><div class='add'>+#define RX7_DONE_INT_MASK		BIT(7)</div><div class='add'>+#define RX6_DONE_INT_MASK		BIT(6)</div><div class='add'>+#define RX5_DONE_INT_MASK		BIT(5)</div><div class='add'>+#define RX4_DONE_INT_MASK		BIT(4)</div><div class='add'>+#define RX3_DONE_INT_MASK		BIT(3)</div><div class='add'>+#define RX2_DONE_INT_MASK		BIT(2)</div><div class='add'>+#define RX1_DONE_INT_MASK		BIT(1)</div><div class='add'>+#define RX0_DONE_INT_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define RX_NO_CPU_DSCP_LOW_INT_MASK					\</div><div class='add'>+	(RX15_NO_CPU_DSCP_INT_MASK | RX14_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX13_NO_CPU_DSCP_INT_MASK | RX12_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX11_NO_CPU_DSCP_INT_MASK | RX10_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX9_NO_CPU_DSCP_INT_MASK | RX8_NO_CPU_DSCP_INT_MASK |		\</div><div class='add'>+	 RX7_NO_CPU_DSCP_INT_MASK | RX6_NO_CPU_DSCP_INT_MASK |		\</div><div class='add'>+	 RX5_NO_CPU_DSCP_INT_MASK | RX4_NO_CPU_DSCP_INT_MASK |		\</div><div class='add'>+	 RX3_NO_CPU_DSCP_INT_MASK | RX2_NO_CPU_DSCP_INT_MASK |		\</div><div class='add'>+	 RX1_NO_CPU_DSCP_INT_MASK | RX0_NO_CPU_DSCP_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define RX_DONE_LOW_INT_MASK				\</div><div class='add'>+	(RX15_DONE_INT_MASK | RX14_DONE_INT_MASK |	\</div><div class='add'>+	 RX13_DONE_INT_MASK | RX12_DONE_INT_MASK |	\</div><div class='add'>+	 RX11_DONE_INT_MASK | RX10_DONE_INT_MASK |	\</div><div class='add'>+	 RX9_DONE_INT_MASK | RX8_DONE_INT_MASK |	\</div><div class='add'>+	 RX7_DONE_INT_MASK | RX6_DONE_INT_MASK |	\</div><div class='add'>+	 RX5_DONE_INT_MASK | RX4_DONE_INT_MASK |	\</div><div class='add'>+	 RX3_DONE_INT_MASK | RX2_DONE_INT_MASK |	\</div><div class='add'>+	 RX1_DONE_INT_MASK | RX0_DONE_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define RX_NO_CPU_DSCP_LOW_OFFSET	__ffs(RX_NO_CPU_DSCP_LOW_INT_MASK)</div><div class='add'>+#define INT_RX1_MASK(_n)							\</div><div class='add'>+	((((_n) &lt;&lt; RX_NO_CPU_DSCP_LOW_OFFSET) &amp; RX_NO_CPU_DSCP_LOW_INT_MASK) |	\</div><div class='add'>+	 (RX_DONE_LOW_INT_MASK &amp; (_n)))</div><div class='add'>+</div><div class='add'>+/* QDMA_CSR_INT_ENABLE3 */</div><div class='add'>+#define RX31_NO_CPU_DSCP_INT_MASK	BIT(31)</div><div class='add'>+#define RX30_NO_CPU_DSCP_INT_MASK	BIT(30)</div><div class='add'>+#define RX29_NO_CPU_DSCP_INT_MASK	BIT(29)</div><div class='add'>+#define RX28_NO_CPU_DSCP_INT_MASK	BIT(28)</div><div class='add'>+#define RX27_NO_CPU_DSCP_INT_MASK	BIT(27)</div><div class='add'>+#define RX26_NO_CPU_DSCP_INT_MASK	BIT(26)</div><div class='add'>+#define RX25_NO_CPU_DSCP_INT_MASK	BIT(25)</div><div class='add'>+#define RX24_NO_CPU_DSCP_INT_MASK	BIT(24)</div><div class='add'>+#define RX23_NO_CPU_DSCP_INT_MASK	BIT(23)</div><div class='add'>+#define RX22_NO_CPU_DSCP_INT_MASK	BIT(22)</div><div class='add'>+#define RX21_NO_CPU_DSCP_INT_MASK	BIT(21)</div><div class='add'>+#define RX20_NO_CPU_DSCP_INT_MASK	BIT(20)</div><div class='add'>+#define RX19_NO_CPU_DSCP_INT_MASK	BIT(19)</div><div class='add'>+#define RX18_NO_CPU_DSCP_INT_MASK	BIT(18)</div><div class='add'>+#define RX17_NO_CPU_DSCP_INT_MASK	BIT(17)</div><div class='add'>+#define RX16_NO_CPU_DSCP_INT_MASK	BIT(16)</div><div class='add'>+#define RX31_DONE_INT_MASK		BIT(15)</div><div class='add'>+#define RX30_DONE_INT_MASK		BIT(14)</div><div class='add'>+#define RX29_DONE_INT_MASK		BIT(13)</div><div class='add'>+#define RX28_DONE_INT_MASK		BIT(12)</div><div class='add'>+#define RX27_DONE_INT_MASK		BIT(11)</div><div class='add'>+#define RX26_DONE_INT_MASK		BIT(10)</div><div class='add'>+#define RX25_DONE_INT_MASK		BIT(9)</div><div class='add'>+#define RX24_DONE_INT_MASK		BIT(8)</div><div class='add'>+#define RX23_DONE_INT_MASK		BIT(7)</div><div class='add'>+#define RX22_DONE_INT_MASK		BIT(6)</div><div class='add'>+#define RX21_DONE_INT_MASK		BIT(5)</div><div class='add'>+#define RX20_DONE_INT_MASK		BIT(4)</div><div class='add'>+#define RX19_DONE_INT_MASK		BIT(3)</div><div class='add'>+#define RX18_DONE_INT_MASK		BIT(2)</div><div class='add'>+#define RX17_DONE_INT_MASK		BIT(1)</div><div class='add'>+#define RX16_DONE_INT_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define RX_NO_CPU_DSCP_HIGH_INT_MASK					\</div><div class='add'>+	(RX31_NO_CPU_DSCP_INT_MASK | RX30_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX29_NO_CPU_DSCP_INT_MASK | RX28_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX27_NO_CPU_DSCP_INT_MASK | RX26_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX25_NO_CPU_DSCP_INT_MASK | RX24_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX23_NO_CPU_DSCP_INT_MASK | RX22_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX21_NO_CPU_DSCP_INT_MASK | RX20_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX19_NO_CPU_DSCP_INT_MASK | RX18_NO_CPU_DSCP_INT_MASK |	\</div><div class='add'>+	 RX17_NO_CPU_DSCP_INT_MASK | RX16_NO_CPU_DSCP_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define RX_DONE_HIGH_INT_MASK				\</div><div class='add'>+	(RX31_DONE_INT_MASK | RX30_DONE_INT_MASK |	\</div><div class='add'>+	 RX29_DONE_INT_MASK | RX28_DONE_INT_MASK |	\</div><div class='add'>+	 RX27_DONE_INT_MASK | RX26_DONE_INT_MASK |	\</div><div class='add'>+	 RX25_DONE_INT_MASK | RX24_DONE_INT_MASK |	\</div><div class='add'>+	 RX23_DONE_INT_MASK | RX22_DONE_INT_MASK |	\</div><div class='add'>+	 RX21_DONE_INT_MASK | RX20_DONE_INT_MASK |	\</div><div class='add'>+	 RX19_DONE_INT_MASK | RX18_DONE_INT_MASK |	\</div><div class='add'>+	 RX17_DONE_INT_MASK | RX16_DONE_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define RX_DONE_HIGH_OFFSET	fls(RX_DONE_HIGH_INT_MASK)</div><div class='add'>+#define RX_DONE_INT_MASK	\</div><div class='add'>+	((RX_DONE_HIGH_INT_MASK &lt;&lt; RX_DONE_HIGH_OFFSET) | RX_DONE_LOW_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define INT_RX2_MASK(_n)				\</div><div class='add'>+	((RX_NO_CPU_DSCP_HIGH_INT_MASK &amp; (_n)) |	\</div><div class='add'>+	 (((_n) &gt;&gt; RX_DONE_HIGH_OFFSET) &amp; RX_DONE_HIGH_INT_MASK))</div><div class='add'>+</div><div class='add'>+/* QDMA_CSR_INT_ENABLE4 */</div><div class='add'>+#define RX31_COHERENT_INT_MASK		BIT(31)</div><div class='add'>+#define RX30_COHERENT_INT_MASK		BIT(30)</div><div class='add'>+#define RX29_COHERENT_INT_MASK		BIT(29)</div><div class='add'>+#define RX28_COHERENT_INT_MASK		BIT(28)</div><div class='add'>+#define RX27_COHERENT_INT_MASK		BIT(27)</div><div class='add'>+#define RX26_COHERENT_INT_MASK		BIT(26)</div><div class='add'>+#define RX25_COHERENT_INT_MASK		BIT(25)</div><div class='add'>+#define RX24_COHERENT_INT_MASK		BIT(24)</div><div class='add'>+#define RX23_COHERENT_INT_MASK		BIT(23)</div><div class='add'>+#define RX22_COHERENT_INT_MASK		BIT(22)</div><div class='add'>+#define RX21_COHERENT_INT_MASK		BIT(21)</div><div class='add'>+#define RX20_COHERENT_INT_MASK		BIT(20)</div><div class='add'>+#define RX19_COHERENT_INT_MASK		BIT(19)</div><div class='add'>+#define RX18_COHERENT_INT_MASK		BIT(18)</div><div class='add'>+#define RX17_COHERENT_INT_MASK		BIT(17)</div><div class='add'>+#define RX16_COHERENT_INT_MASK		BIT(16)</div><div class='add'>+</div><div class='add'>+#define RX_COHERENT_HIGH_INT_MASK				\</div><div class='add'>+	(RX31_COHERENT_INT_MASK | RX30_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX29_COHERENT_INT_MASK | RX28_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX27_COHERENT_INT_MASK | RX26_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX25_COHERENT_INT_MASK | RX24_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX23_COHERENT_INT_MASK | RX22_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX21_COHERENT_INT_MASK | RX20_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX19_COHERENT_INT_MASK | RX18_COHERENT_INT_MASK |	\</div><div class='add'>+	 RX17_COHERENT_INT_MASK | RX16_COHERENT_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define INT_RX3_MASK(_n)	(RX_COHERENT_HIGH_INT_MASK &amp; (_n))</div><div class='add'>+</div><div class='add'>+/* QDMA_CSR_INT_ENABLE5 */</div><div class='add'>+#define TX31_COHERENT_INT_MASK		BIT(31)</div><div class='add'>+#define TX30_COHERENT_INT_MASK		BIT(30)</div><div class='add'>+#define TX29_COHERENT_INT_MASK		BIT(29)</div><div class='add'>+#define TX28_COHERENT_INT_MASK		BIT(28)</div><div class='add'>+#define TX27_COHERENT_INT_MASK		BIT(27)</div><div class='add'>+#define TX26_COHERENT_INT_MASK		BIT(26)</div><div class='add'>+#define TX25_COHERENT_INT_MASK		BIT(25)</div><div class='add'>+#define TX24_COHERENT_INT_MASK		BIT(24)</div><div class='add'>+#define TX23_COHERENT_INT_MASK		BIT(23)</div><div class='add'>+#define TX22_COHERENT_INT_MASK		BIT(22)</div><div class='add'>+#define TX21_COHERENT_INT_MASK		BIT(21)</div><div class='add'>+#define TX20_COHERENT_INT_MASK		BIT(20)</div><div class='add'>+#define TX19_COHERENT_INT_MASK		BIT(19)</div><div class='add'>+#define TX18_COHERENT_INT_MASK		BIT(18)</div><div class='add'>+#define TX17_COHERENT_INT_MASK		BIT(17)</div><div class='add'>+#define TX16_COHERENT_INT_MASK		BIT(16)</div><div class='add'>+#define TX15_COHERENT_INT_MASK		BIT(15)</div><div class='add'>+#define TX14_COHERENT_INT_MASK		BIT(14)</div><div class='add'>+#define TX13_COHERENT_INT_MASK		BIT(13)</div><div class='add'>+#define TX12_COHERENT_INT_MASK		BIT(12)</div><div class='add'>+#define TX11_COHERENT_INT_MASK		BIT(11)</div><div class='add'>+#define TX10_COHERENT_INT_MASK		BIT(10)</div><div class='add'>+#define TX9_COHERENT_INT_MASK		BIT(9)</div><div class='add'>+#define TX8_COHERENT_INT_MASK		BIT(8)</div><div class='add'>+</div><div class='add'>+#define TX_COHERENT_HIGH_INT_MASK				\</div><div class='add'>+	(TX31_COHERENT_INT_MASK | TX30_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX29_COHERENT_INT_MASK | TX28_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX27_COHERENT_INT_MASK | TX26_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX25_COHERENT_INT_MASK | TX24_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX23_COHERENT_INT_MASK | TX22_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX21_COHERENT_INT_MASK | TX20_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX19_COHERENT_INT_MASK | TX18_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX17_COHERENT_INT_MASK | TX16_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX15_COHERENT_INT_MASK | TX14_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX13_COHERENT_INT_MASK | TX12_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX11_COHERENT_INT_MASK | TX10_COHERENT_INT_MASK |	\</div><div class='add'>+	 TX9_COHERENT_INT_MASK | TX8_COHERENT_INT_MASK)</div><div class='add'>+</div><div class='add'>+#define REG_TX_IRQ_BASE(_n)		((_n) ? 0x0048 : 0x0050)</div><div class='add'>+</div><div class='add'>+#define REG_TX_IRQ_CFG(_n)		((_n) ? 0x004c : 0x0054)</div><div class='add'>+#define TX_IRQ_THR_MASK			GENMASK(27, 16)</div><div class='add'>+#define TX_IRQ_DEPTH_MASK		GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define REG_IRQ_CLEAR_LEN(_n)		((_n) ? 0x0064 : 0x0058)</div><div class='add'>+#define IRQ_CLEAR_LEN_MASK		GENMASK(7, 0)</div><div class='add'>+</div><div class='add'>+#define REG_IRQ_STATUS(_n)		((_n) ? 0x0068 : 0x005c)</div><div class='add'>+#define IRQ_ENTRY_LEN_MASK		GENMASK(27, 16)</div><div class='add'>+#define IRQ_HEAD_IDX_MASK		GENMASK(11, 0)</div><div class='add'>+</div><div class='add'>+#define REG_TX_RING_BASE(_n)	\</div><div class='add'>+	(((_n) &lt; 8) ? 0x0100 + ((_n) &lt;&lt; 5) : 0x0b00 + (((_n) - 8) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define REG_TX_RING_BLOCKING(_n)	\</div><div class='add'>+	(((_n) &lt; 8) ? 0x0104 + ((_n) &lt;&lt; 5) : 0x0b04 + (((_n) - 8) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define TX_RING_IRQ_BLOCKING_MAP_MASK			BIT(6)</div><div class='add'>+#define TX_RING_IRQ_BLOCKING_CFG_MASK			BIT(4)</div><div class='add'>+#define TX_RING_IRQ_BLOCKING_TX_DROP_EN_MASK		BIT(2)</div><div class='add'>+#define TX_RING_IRQ_BLOCKING_MAX_TH_TXRING_EN_MASK	BIT(1)</div><div class='add'>+#define TX_RING_IRQ_BLOCKING_MIN_TH_TXRING_EN_MASK	BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_TX_CPU_IDX(_n)	\</div><div class='add'>+	(((_n) &lt; 8) ? 0x0108 + ((_n) &lt;&lt; 5) : 0x0b08 + (((_n) - 8) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define TX_RING_CPU_IDX_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_TX_DMA_IDX(_n)	\</div><div class='add'>+	(((_n) &lt; 8) ? 0x010c + ((_n) &lt;&lt; 5) : 0x0b0c + (((_n) - 8) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define TX_RING_DMA_IDX_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define IRQ_RING_IDX_MASK		GENMASK(20, 16)</div><div class='add'>+#define IRQ_DESC_IDX_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_RX_RING_BASE(_n)	\</div><div class='add'>+	(((_n) &lt; 16) ? 0x0200 + ((_n) &lt;&lt; 5) : 0x0e00 + (((_n) - 16) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define REG_RX_RING_SIZE(_n)	\</div><div class='add'>+	(((_n) &lt; 16) ? 0x0204 + ((_n) &lt;&lt; 5) : 0x0e04 + (((_n) - 16) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define RX_RING_THR_MASK		GENMASK(31, 16)</div><div class='add'>+#define RX_RING_SIZE_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_RX_CPU_IDX(_n)	\</div><div class='add'>+	(((_n) &lt; 16) ? 0x0208 + ((_n) &lt;&lt; 5) : 0x0e08 + (((_n) - 16) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define RX_RING_CPU_IDX_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_RX_DMA_IDX(_n)	\</div><div class='add'>+	(((_n) &lt; 16) ? 0x020c + ((_n) &lt;&lt; 5) : 0x0e0c + (((_n) - 16) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define REG_RX_DELAY_INT_IDX(_n)	\</div><div class='add'>+	(((_n) &lt; 16) ? 0x0210 + ((_n) &lt;&lt; 5) : 0x0e10 + (((_n) - 16) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define REG_RX_SCATTER_CFG(_n)	\</div><div class='add'>+	(((_n) &lt; 16) ? 0x0214 + ((_n) &lt;&lt; 5) : 0x0e14 + (((_n) - 16) &lt;&lt; 5))</div><div class='add'>+</div><div class='add'>+#define RX_DELAY_INT_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define RX_RING_DMA_IDX_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define RX_RING_SG_EN_MASK		BIT(0)</div><div class='add'>+</div><div class='add'>+#define REG_INGRESS_TRTCM_CFG		0x0070</div><div class='add'>+#define INGRESS_TRTCM_EN_MASK		BIT(31)</div><div class='add'>+#define INGRESS_TRTCM_MODE_MASK		BIT(30)</div><div class='add'>+#define INGRESS_SLOW_TICK_RATIO_MASK	GENMASK(29, 16)</div><div class='add'>+#define INGRESS_FAST_TICK_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_QUEUE_CLOSE_CFG(_n)		(0x00a0 + ((_n) &amp; 0xfc))</div><div class='add'>+#define TXQ_DISABLE_CHAN_QUEUE_MASK(_n, _m)	BIT((_m) + (((_n) &amp; 0x3) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+#define REG_TXQ_DIS_CFG_BASE(_n)	((_n) ? 0x20a0 : 0x00a0)</div><div class='add'>+#define REG_TXQ_DIS_CFG(_n, _m)		(REG_TXQ_DIS_CFG_BASE((_n)) + (_m) &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+#define REG_CNTR_CFG(_n)		(0x0400 + ((_n) &lt;&lt; 3))</div><div class='add'>+#define CNTR_EN_MASK			BIT(31)</div><div class='add'>+#define CNTR_ALL_CHAN_EN_MASK		BIT(30)</div><div class='add'>+#define CNTR_ALL_QUEUE_EN_MASK		BIT(29)</div><div class='add'>+#define CNTR_ALL_DSCP_RING_EN_MASK	BIT(28)</div><div class='add'>+#define CNTR_SRC_MASK			GENMASK(27, 24)</div><div class='add'>+#define CNTR_DSCP_RING_MASK		GENMASK(20, 16)</div><div class='add'>+#define CNTR_CHAN_MASK			GENMASK(7, 3)</div><div class='add'>+#define CNTR_QUEUE_MASK			GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define REG_CNTR_VAL(_n)		(0x0404 + ((_n) &lt;&lt; 3))</div><div class='add'>+</div><div class='add'>+#define REG_LMGR_INIT_CFG		0x1000</div><div class='add'>+#define LMGR_INIT_START			BIT(31)</div><div class='add'>+#define LMGR_SRAM_MODE_MASK		BIT(30)</div><div class='add'>+#define HW_FWD_PKTSIZE_OVERHEAD_MASK	GENMASK(27, 20)</div><div class='add'>+#define HW_FWD_DESC_NUM_MASK		GENMASK(16, 0)</div><div class='add'>+</div><div class='add'>+#define REG_FWD_DSCP_LOW_THR		0x1004</div><div class='add'>+#define FWD_DSCP_LOW_THR_MASK		GENMASK(17, 0)</div><div class='add'>+</div><div class='add'>+#define REG_EGRESS_RATE_METER_CFG		0x100c</div><div class='add'>+#define EGRESS_RATE_METER_EN_MASK		BIT(31)</div><div class='add'>+#define EGRESS_RATE_METER_EQ_RATE_EN_MASK	BIT(17)</div><div class='add'>+#define EGRESS_RATE_METER_WINDOW_SZ_MASK	GENMASK(16, 12)</div><div class='add'>+#define EGRESS_RATE_METER_TIMESLICE_MASK	GENMASK(10, 0)</div><div class='add'>+</div><div class='add'>+#define REG_EGRESS_TRTCM_CFG		0x1010</div><div class='add'>+#define EGRESS_TRTCM_EN_MASK		BIT(31)</div><div class='add'>+#define EGRESS_TRTCM_MODE_MASK		BIT(30)</div><div class='add'>+#define EGRESS_SLOW_TICK_RATIO_MASK	GENMASK(29, 16)</div><div class='add'>+#define EGRESS_FAST_TICK_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define TRTCM_PARAM_RW_MASK		BIT(31)</div><div class='add'>+#define TRTCM_PARAM_RW_DONE_MASK	BIT(30)</div><div class='add'>+#define TRTCM_PARAM_TYPE_MASK		GENMASK(29, 28)</div><div class='add'>+#define TRTCM_METER_GROUP_MASK		GENMASK(27, 26)</div><div class='add'>+#define TRTCM_PARAM_INDEX_MASK		GENMASK(23, 17)</div><div class='add'>+#define TRTCM_PARAM_RATE_TYPE_MASK	BIT(16)</div><div class='add'>+</div><div class='add'>+#define REG_TRTCM_CFG_PARAM(_n)		((_n) + 0x4)</div><div class='add'>+#define REG_TRTCM_DATA_LOW(_n)		((_n) + 0x8)</div><div class='add'>+#define REG_TRTCM_DATA_HIGH(_n)		((_n) + 0xc)</div><div class='add'>+</div><div class='add'>+#define RATE_LIMIT_PARAM_RW_MASK	BIT(31)</div><div class='add'>+#define RATE_LIMIT_PARAM_RW_DONE_MASK	BIT(30)</div><div class='add'>+#define RATE_LIMIT_PARAM_TYPE_MASK	GENMASK(29, 28)</div><div class='add'>+#define RATE_LIMIT_METER_GROUP_MASK	GENMASK(27, 26)</div><div class='add'>+#define RATE_LIMIT_PARAM_INDEX_MASK	GENMASK(23, 16)</div><div class='add'>+</div><div class='add'>+#define REG_TXWRR_MODE_CFG		0x1020</div><div class='add'>+#define TWRR_WEIGHT_SCALE_MASK		BIT(31)</div><div class='add'>+#define TWRR_WEIGHT_BASE_MASK		BIT(3)</div><div class='add'>+</div><div class='add'>+#define REG_TXWRR_WEIGHT_CFG		0x1024</div><div class='add'>+#define TWRR_RW_CMD_MASK		BIT(31)</div><div class='add'>+#define TWRR_RW_CMD_DONE		BIT(30)</div><div class='add'>+#define TWRR_CHAN_IDX_MASK		GENMASK(23, 19)</div><div class='add'>+#define TWRR_QUEUE_IDX_MASK		GENMASK(18, 16)</div><div class='add'>+#define TWRR_VALUE_MASK			GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_PSE_BUF_USAGE_CFG		0x1028</div><div class='add'>+#define PSE_BUF_ESTIMATE_EN_MASK	BIT(29)</div><div class='add'>+</div><div class='add'>+#define REG_CHAN_QOS_MODE(_n)		(0x1040 + ((_n) &lt;&lt; 2))</div><div class='add'>+#define CHAN_QOS_MODE_MASK(_n)		GENMASK(2 + ((_n) &lt;&lt; 2), (_n) &lt;&lt; 2)</div><div class='add'>+</div><div class='add'>+#define REG_GLB_TRTCM_CFG		0x1080</div><div class='add'>+#define GLB_TRTCM_EN_MASK		BIT(31)</div><div class='add'>+#define GLB_TRTCM_MODE_MASK		BIT(30)</div><div class='add'>+#define GLB_SLOW_TICK_RATIO_MASK	GENMASK(29, 16)</div><div class='add'>+#define GLB_FAST_TICK_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+#define REG_TXQ_CNGST_CFG		0x10a0</div><div class='add'>+#define TXQ_CNGST_DROP_EN		BIT(31)</div><div class='add'>+#define TXQ_CNGST_DEI_DROP_EN		BIT(30)</div><div class='add'>+</div><div class='add'>+#define REG_SLA_TRTCM_CFG		0x1150</div><div class='add'>+#define SLA_TRTCM_EN_MASK		BIT(31)</div><div class='add'>+#define SLA_TRTCM_MODE_MASK		BIT(30)</div><div class='add'>+#define SLA_SLOW_TICK_RATIO_MASK	GENMASK(29, 16)</div><div class='add'>+#define SLA_FAST_TICK_MASK		GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+/* CTRL */</div><div class='add'>+#define QDMA_DESC_DONE_MASK		BIT(31)</div><div class='add'>+#define QDMA_DESC_DROP_MASK		BIT(30) /* tx: drop - rx: overflow */</div><div class='add'>+#define QDMA_DESC_MORE_MASK		BIT(29) /* more SG elements */</div><div class='add'>+#define QDMA_DESC_DEI_MASK		BIT(25)</div><div class='add'>+#define QDMA_DESC_NO_DROP_MASK		BIT(24)</div><div class='add'>+#define QDMA_DESC_LEN_MASK		GENMASK(15, 0)</div><div class='add'>+/* DATA */</div><div class='add'>+#define QDMA_DESC_NEXT_ID_MASK		GENMASK(15, 0)</div><div class='add'>+/* TX MSG0 */</div><div class='add'>+#define QDMA_ETH_TXMSG_MIC_IDX_MASK	BIT(30)</div><div class='add'>+#define QDMA_ETH_TXMSG_SP_TAG_MASK	GENMASK(29, 14)</div><div class='add'>+#define QDMA_ETH_TXMSG_ICO_MASK		BIT(13)</div><div class='add'>+#define QDMA_ETH_TXMSG_UCO_MASK		BIT(12)</div><div class='add'>+#define QDMA_ETH_TXMSG_TCO_MASK		BIT(11)</div><div class='add'>+#define QDMA_ETH_TXMSG_TSO_MASK		BIT(10)</div><div class='add'>+#define QDMA_ETH_TXMSG_FAST_MASK	BIT(9)</div><div class='add'>+#define QDMA_ETH_TXMSG_OAM_MASK		BIT(8)</div><div class='add'>+#define QDMA_ETH_TXMSG_CHAN_MASK	GENMASK(7, 3)</div><div class='add'>+#define QDMA_ETH_TXMSG_QUEUE_MASK	GENMASK(2, 0)</div><div class='add'>+/* TX MSG1 */</div><div class='add'>+#define QDMA_ETH_TXMSG_NO_DROP		BIT(31)</div><div class='add'>+#define QDMA_ETH_TXMSG_METER_MASK	GENMASK(30, 24)	/* 0x7f no meters */</div><div class='add'>+#define QDMA_ETH_TXMSG_FPORT_MASK	GENMASK(23, 20)</div><div class='add'>+#define QDMA_ETH_TXMSG_NBOQ_MASK	GENMASK(19, 15)</div><div class='add'>+#define QDMA_ETH_TXMSG_HWF_MASK		BIT(14)</div><div class='add'>+#define QDMA_ETH_TXMSG_HOP_MASK		BIT(13)</div><div class='add'>+#define QDMA_ETH_TXMSG_PTP_MASK		BIT(12)</div><div class='add'>+#define QDMA_ETH_TXMSG_ACNT_G1_MASK	GENMASK(10, 6)	/* 0x1f do not count */</div><div class='add'>+#define QDMA_ETH_TXMSG_ACNT_G0_MASK	GENMASK(5, 0)	/* 0x3f do not count */</div><div class='add'>+</div><div class='add'>+/* RX MSG0 */</div><div class='add'>+#define QDMA_ETH_RXMSG_SPTAG		GENMASK(21, 14)</div><div class='add'>+/* RX MSG1 */</div><div class='add'>+#define QDMA_ETH_RXMSG_DEI_MASK		BIT(31)</div><div class='add'>+#define QDMA_ETH_RXMSG_IP6_MASK		BIT(30)</div><div class='add'>+#define QDMA_ETH_RXMSG_IP4_MASK		BIT(29)</div><div class='add'>+#define QDMA_ETH_RXMSG_IP4F_MASK	BIT(28)</div><div class='add'>+#define QDMA_ETH_RXMSG_L4_VALID_MASK	BIT(27)</div><div class='add'>+#define QDMA_ETH_RXMSG_L4F_MASK		BIT(26)</div><div class='add'>+#define QDMA_ETH_RXMSG_SPORT_MASK	GENMASK(25, 21)</div><div class='add'>+#define QDMA_ETH_RXMSG_CRSN_MASK	GENMASK(20, 16)</div><div class='add'>+#define QDMA_ETH_RXMSG_PPE_ENTRY_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_qdma_desc {</div><div class='add'>+	__le32 rsv;</div><div class='add'>+	__le32 ctrl;</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 data;</div><div class='add'>+	__le32 msg0;</div><div class='add'>+	__le32 msg1;</div><div class='add'>+	__le32 msg2;</div><div class='add'>+	__le32 msg3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* CTRL0 */</div><div class='add'>+#define QDMA_FWD_DESC_CTX_MASK		BIT(31)</div><div class='add'>+#define QDMA_FWD_DESC_RING_MASK		GENMASK(30, 28)</div><div class='add'>+#define QDMA_FWD_DESC_IDX_MASK		GENMASK(27, 16)</div><div class='add'>+#define QDMA_FWD_DESC_LEN_MASK		GENMASK(15, 0)</div><div class='add'>+/* CTRL1 */</div><div class='add'>+#define QDMA_FWD_DESC_FIRST_IDX_MASK	GENMASK(15, 0)</div><div class='add'>+/* CTRL2 */</div><div class='add'>+#define QDMA_FWD_DESC_MORE_PKT_NUM_MASK	GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+struct airoha_qdma_fwd_desc {</div><div class='add'>+	__le32 addr;</div><div class='add'>+	__le32 ctrl0;</div><div class='add'>+	__le32 ctrl1;</div><div class='add'>+	__le32 ctrl2;</div><div class='add'>+	__le32 msg0;</div><div class='add'>+	__le32 msg1;</div><div class='add'>+	__le32 rsv0;</div><div class='add'>+	__le32 rsv1;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* AIROHA_REGS_H */</div><div class='head'>diff --git a/drivers/net/ethernet/alacritech/Kconfig b/drivers/net/ethernet/alacritech/Kconfig<br/>index 212f92c8e6a9..5f285e18faf7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alacritech/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alacritech/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alacritech/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/alacritech/Kconfig</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> config NET_VENDOR_ALACRITECH</div><div class='ctx'> 	bool "Alacritech devices"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -16,7 +16,7 @@ config SLICOSS</div><div class='ctx'> 	tristate "Alacritech Slicoss support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Gigabit Ethernet adapters based on the</div><div class='ctx'> 	  Session Layer Interface (SLIC) technology by Alacritech.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/alacritech/slic.h b/drivers/net/ethernet/alacritech/slic.h<br/>index 3add305d34b4..82071d0e5f7f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alacritech/slic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alacritech/slic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alacritech/slic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/alacritech/slic.h</a></div><div class='hunk'>@@ -265,8 +265,6 @@</div><div class='ctx'> #define SLIC_NUM_STAT_DESC_ARRAYS	4</div><div class='ctx'> #define SLIC_INVALID_STAT_DESC_IDX	0xffffffff</div><div class='ctx'> </div><div class='del'>-#define SLIC_NAPI_WEIGHT		64</div><div class='del'>-</div><div class='ctx'> #define SLIC_UPR_LSTAT			0</div><div class='ctx'> #define SLIC_UPR_CONFIG			1</div><div class='ctx'> </div><div class='hunk'>@@ -290,13 +288,13 @@ do {						\</div><div class='ctx'> 	u64_stats_update_end(&amp;(st)-&gt;syncp);	\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='del'>-#define SLIC_GET_STATS_COUNTER(newst, st, counter)			\</div><div class='del'>-{									\</div><div class='del'>-	unsigned int start;						\</div><div class='add'>+#define SLIC_GET_STATS_COUNTER(newst, st, counter)		\</div><div class='add'>+{								\</div><div class='add'>+	unsigned int start;					\</div><div class='ctx'> 	do {							\</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;(st)-&gt;syncp);	\</div><div class='del'>-		newst = (st)-&gt;counter;					\</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;(st)-&gt;syncp, start));	\</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;(st)-&gt;syncp);	\</div><div class='add'>+		newst = (st)-&gt;counter;				\</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;(st)-&gt;syncp, start));	\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct slic_upr {</div><div class='head'>diff --git a/drivers/net/ethernet/alacritech/slicoss.c b/drivers/net/ethernet/alacritech/slicoss.c<br/>index 4f7e792e50e9..f62851708d4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alacritech/slicoss.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alacritech/slicoss.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alacritech/slicoss.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/alacritech/slicoss.c</a></div><div class='hunk'>@@ -1,19 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Driver for Gigabit Ethernet adapters based on the Session Layer</div><div class='ctx'>  * Interface (SLIC) technology by Alacritech. The driver does not</div><div class='ctx'>  * support the hardware acceleration features provided by these cards.</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2016 Lino Sanfilippo &lt;LinoSanfilippo@gmx.de&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; either version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -35,7 +26,6 @@</div><div class='ctx'> #include "slic.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME			"slicoss"</div><div class='del'>-#define DRV_VERSION			"1.0"</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id slic_id_tbl[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH,</div><div class='hunk'>@@ -1018,7 +1008,7 @@ static void slic_set_link_autoneg(struct slic_device *sdev)</div><div class='ctx'> </div><div class='ctx'> static void slic_set_mac_address(struct slic_device *sdev)</div><div class='ctx'> {</div><div class='del'>-	u8 *addr = sdev-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	const u8 *addr = sdev-&gt;netdev-&gt;dev_addr;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	val = addr[5] | addr[4] &lt;&lt; 8 | addr[3] &lt;&lt; 16 | addr[2] &lt;&lt; 24;</div><div class='hunk'>@@ -1530,10 +1520,8 @@ static void slic_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static void slic_get_strings(struct net_device *dev, u32 stringset, u8 *data)</div><div class='ctx'> {</div><div class='del'>-	if (stringset == ETH_SS_STATS) {</div><div class='add'>+	if (stringset == ETH_SS_STATS)</div><div class='ctx'> 		memcpy(data, slic_stats_strings, sizeof(slic_stats_strings));</div><div class='del'>-		data += sizeof(slic_stats_strings);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void slic_get_drvinfo(struct net_device *dev,</div><div class='hunk'>@@ -1541,9 +1529,8 @@ static void slic_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct slic_device *sdev = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(sdev-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(sdev-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops slic_ethtool_ops = {</div><div class='hunk'>@@ -1671,7 +1658,7 @@ static int slic_read_eeprom(struct slic_device *sdev)</div><div class='ctx'> 		goto free_eeprom;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* set mac address */</div><div class='del'>-	ether_addr_copy(sdev-&gt;netdev-&gt;dev_addr, mac[devfn]);</div><div class='add'>+	eth_hw_addr_set(sdev-&gt;netdev, mac[devfn]);</div><div class='ctx'> free_eeprom:</div><div class='ctx'> 	dma_free_coherent(&amp;sdev-&gt;pdev-&gt;dev, SLIC_EEPROM_SIZE, eeprom, paddr);</div><div class='ctx'> </div><div class='hunk'>@@ -1691,17 +1678,15 @@ static int slic_init(struct slic_device *sdev)</div><div class='ctx'> 	slic_card_reset(sdev);</div><div class='ctx'> </div><div class='ctx'> 	err = slic_load_firmware(sdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;sdev-&gt;pdev-&gt;dev, "failed to load firmware\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;sdev-&gt;pdev-&gt;dev, err,</div><div class='add'>+			"failed to load firmware\n");</div><div class='ctx'> </div><div class='ctx'> 	/* we need the shared memory to read EEPROM so set it up temporarily */</div><div class='ctx'> 	err = slic_init_shmem(sdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;sdev-&gt;pdev-&gt;dev, "failed to init shared memory\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;sdev-&gt;pdev-&gt;dev, err,</div><div class='add'>+			"failed to init shared memory\n");</div><div class='ctx'> </div><div class='ctx'> 	err = slic_read_eeprom(sdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1723,13 +1708,13 @@ static bool slic_is_fiber(unsigned short subdev)</div><div class='ctx'> {</div><div class='ctx'> 	switch (subdev) {</div><div class='ctx'> 	/* Mojave */</div><div class='del'>-	case PCI_SUBDEVICE_ID_ALACRITECH_1000X1F: /* fallthrough */</div><div class='del'>-	case PCI_SUBDEVICE_ID_ALACRITECH_SES1001F: /* fallthrough */</div><div class='add'>+	case PCI_SUBDEVICE_ID_ALACRITECH_1000X1F:</div><div class='add'>+	case PCI_SUBDEVICE_ID_ALACRITECH_SES1001F: fallthrough;</div><div class='ctx'> 	/* Oasis */</div><div class='del'>-	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2002XF: /* fallthrough */</div><div class='del'>-	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2001XF: /* fallthrough */</div><div class='del'>-	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2104EF: /* fallthrough */</div><div class='del'>-	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2102EF: /* fallthrough */</div><div class='add'>+	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2002XF:</div><div class='add'>+	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2001XF:</div><div class='add'>+	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2104EF:</div><div class='add'>+	case PCI_SUBDEVICE_ID_ALACRITECH_SEN2102EF:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -1754,10 +1739,9 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, err,</div><div class='add'>+			"failed to enable PCI device\n");</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	pci_try_set_mwi(pdev);</div><div class='hunk'>@@ -1800,7 +1784,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	sdev-&gt;is_fiber = slic_is_fiber(pdev-&gt;subsystem_device);</div><div class='ctx'> 	sdev-&gt;pdev = pdev;</div><div class='ctx'> 	sdev-&gt;netdev = dev;</div><div class='del'>-	sdev-&gt;regs = ioremap_nocache(pci_resource_start(pdev, 0),</div><div class='add'>+	sdev-&gt;regs = ioremap(pci_resource_start(pdev, 0),</div><div class='ctx'> 				     pci_resource_len(pdev, 0));</div><div class='ctx'> 	if (!sdev-&gt;regs) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to map registers\n");</div><div class='hunk'>@@ -1814,7 +1798,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;sdev-&gt;napi, slic_poll, SLIC_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add(dev, &amp;sdev-&gt;napi, slic_poll);</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='hunk'>@@ -1861,4 +1845,3 @@ module_pci_driver(slic_driver);</div><div class='ctx'> MODULE_DESCRIPTION("Alacritech non-accelerated SLIC driver");</div><div class='ctx'> MODULE_AUTHOR("Lino Sanfilippo &lt;LinoSanfilippo@gmx.de&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig<br/>index a5e2bcbf2722..3e81059f8693 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/allwinner/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/allwinner/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/allwinner/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/allwinner/Kconfig</a></div><div class='hunk'>@@ -8,7 +8,7 @@ config NET_VENDOR_ALLWINNER</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='ctx'> 	depends on ARCH_SUNXI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this</div><div class='ctx'> 	  class, say Y here.</div><div class='ctx'> </div><div class='hunk'>@@ -21,17 +21,17 @@ config NET_VENDOR_ALLWINNER</div><div class='ctx'> if NET_VENDOR_ALLWINNER</div><div class='ctx'> </div><div class='ctx'> config SUN4I_EMAC</div><div class='del'>-        tristate "Allwinner A10 EMAC support"</div><div class='add'>+	tristate "Allwinner A10 EMAC support"</div><div class='ctx'> 	depends on ARCH_SUNXI</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select MDIO_SUN4I</div><div class='del'>-        ---help---</div><div class='del'>-          Support for Allwinner A10 EMAC ethernet driver.</div><div class='add'>+	help</div><div class='add'>+	  Support for Allwinner A10 EMAC ethernet driver.</div><div class='ctx'> </div><div class='del'>-          To compile this driver as a module, choose M here.  The module</div><div class='del'>-          will be called sun4i-emac.</div><div class='add'>+	  To compile this driver as a module, choose M here.  The module</div><div class='add'>+	  will be called sun4i-emac.</div><div class='ctx'> </div><div class='ctx'> endif # NET_VENDOR_ALLWINNER</div><div class='head'>diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c<br/>index 9e06dff619c3..2f516b950f4e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/allwinner/sun4i-emac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/allwinner/sun4i-emac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/allwinner/sun4i-emac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/allwinner/sun4i-emac.c</a></div><div class='hunk'>@@ -29,11 +29,11 @@</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/soc/sunxi/sunxi_sram.h&gt;</div><div class='add'>+#include &lt;linux/dmaengine.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "sun4i-emac.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"sun4i-emac"</div><div class='del'>-#define DRV_VERSION		"1.02"</div><div class='ctx'> </div><div class='ctx'> #define EMAC_MAX_FRAME_LEN	0x0600</div><div class='ctx'> </div><div class='hunk'>@@ -77,7 +77,6 @@ struct emac_board_info {</div><div class='ctx'> 	void __iomem		*membase;</div><div class='ctx'> 	u32			msg_enable;</div><div class='ctx'> 	struct net_device	*ndev;</div><div class='del'>-	struct sk_buff		*skb_last;</div><div class='ctx'> 	u16			tx_fifo_stat;</div><div class='ctx'> </div><div class='ctx'> 	int			emacrx_completed_flag;</div><div class='hunk'>@@ -88,6 +87,16 @@ struct emac_board_info {</div><div class='ctx'> 	unsigned int		duplex;</div><div class='ctx'> </div><div class='ctx'> 	phy_interface_t		phy_interface;</div><div class='add'>+	struct dma_chan	*rx_chan;</div><div class='add'>+	phys_addr_t emac_rx_fifo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct emac_dma_req {</div><div class='add'>+	struct emac_board_info *db;</div><div class='add'>+	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t rxbuf;</div><div class='add'>+	int count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void emac_update_speed(struct net_device *dev)</div><div class='hunk'>@@ -97,9 +106,9 @@ static void emac_update_speed(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* set EMAC SPEED, depend on PHY  */</div><div class='ctx'> 	reg_val = readl(db-&gt;membase + EMAC_MAC_SUPP_REG);</div><div class='del'>-	reg_val &amp;= ~(0x1 &lt;&lt; 8);</div><div class='add'>+	reg_val &amp;= ~EMAC_MAC_SUPP_100M;</div><div class='ctx'> 	if (db-&gt;speed == SPEED_100)</div><div class='del'>-		reg_val |= 1 &lt;&lt; 8;</div><div class='add'>+		reg_val |= EMAC_MAC_SUPP_100M;</div><div class='ctx'> 	writel(reg_val, db-&gt;membase + EMAC_MAC_SUPP_REG);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -207,26 +216,123 @@ static void emac_inblk_32bit(void __iomem *reg, void *data, int count)</div><div class='ctx'> 	readsl(reg, data, round_up(count, 4) / 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+static struct emac_dma_req *</div><div class='add'>+emac_alloc_dma_req(struct emac_board_info *db,</div><div class='add'>+		   struct dma_async_tx_descriptor *desc, struct sk_buff *skb,</div><div class='add'>+		   dma_addr_t rxbuf, int count)</div><div class='ctx'> {</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+	struct emac_dma_req *req;</div><div class='add'>+</div><div class='add'>+	req = kzalloc(sizeof(struct emac_dma_req), GFP_ATOMIC);</div><div class='add'>+	if (!req)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req-&gt;db = db;</div><div class='add'>+	req-&gt;desc = desc;</div><div class='add'>+	req-&gt;skb = skb;</div><div class='add'>+	req-&gt;rxbuf = rxbuf;</div><div class='add'>+	req-&gt;count = count;</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+static void emac_free_dma_req(struct emac_dma_req *req)</div><div class='add'>+{</div><div class='add'>+	kfree(req);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (!phydev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+static void emac_dma_done_callback(void *arg)</div><div class='add'>+{</div><div class='add'>+	struct emac_dma_req *req = arg;</div><div class='add'>+	struct emac_board_info *db = req-&gt;db;</div><div class='add'>+	struct sk_buff *skb = req-&gt;skb;</div><div class='add'>+	struct net_device *dev = db-&gt;ndev;</div><div class='add'>+	int rxlen = req-&gt;count;</div><div class='add'>+	u32 reg_val;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(db-&gt;dev, req-&gt;rxbuf, rxlen, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='add'>+	netif_rx(skb);</div><div class='add'>+	dev-&gt;stats.rx_bytes += rxlen;</div><div class='add'>+	/* Pass to upper layer */</div><div class='add'>+	dev-&gt;stats.rx_packets++;</div><div class='add'>+</div><div class='add'>+	/* re enable cpu receive */</div><div class='add'>+	reg_val = readl(db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='add'>+	reg_val &amp;= ~EMAC_RX_CTL_DMA_EN;</div><div class='add'>+	writel(reg_val, db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='add'>+</div><div class='add'>+	/* re enable interrupt */</div><div class='add'>+	reg_val = readl(db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='add'>+	reg_val |= EMAC_INT_CTL_RX_EN;</div><div class='add'>+	writel(reg_val, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='add'>+</div><div class='add'>+	db-&gt;emacrx_completed_flag = 1;</div><div class='add'>+	emac_free_dma_req(req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int emac_dma_inblk_32bit(struct emac_board_info *db,</div><div class='add'>+		struct sk_buff *skb, void *rdptr, int count)</div><div class='add'>+{</div><div class='add'>+	struct dma_async_tx_descriptor *desc;</div><div class='add'>+	dma_cookie_t cookie;</div><div class='add'>+	dma_addr_t rxbuf;</div><div class='add'>+	struct emac_dma_req *req;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rxbuf = dma_map_single(db-&gt;dev, rdptr, count, DMA_FROM_DEVICE);</div><div class='add'>+	ret = dma_mapping_error(db-&gt;dev, rxbuf);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(db-&gt;dev, "dma mapping error.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc = dmaengine_prep_slave_single(db-&gt;rx_chan, rxbuf, count,</div><div class='add'>+					   DMA_DEV_TO_MEM,</div><div class='add'>+					   DMA_PREP_INTERRUPT | DMA_CTRL_ACK);</div><div class='add'>+	if (!desc) {</div><div class='add'>+		dev_err(db-&gt;dev, "prepare slave single failed\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto prepare_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req = emac_alloc_dma_req(db, desc, skb, rxbuf, count);</div><div class='add'>+	if (!req) {</div><div class='add'>+		dev_err(db-&gt;dev, "alloc emac dma req error.\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto alloc_req_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	desc-&gt;callback_param = req;</div><div class='add'>+	desc-&gt;callback = emac_dma_done_callback;</div><div class='add'>+</div><div class='add'>+	cookie = dmaengine_submit(desc);</div><div class='add'>+	ret = dma_submit_error(cookie);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(db-&gt;dev, "dma submit error.\n");</div><div class='add'>+		goto submit_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_async_issue_pending(db-&gt;rx_chan);</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+submit_err:</div><div class='add'>+	emac_free_dma_req(req);</div><div class='add'>+</div><div class='add'>+alloc_req_err:</div><div class='add'>+	dmaengine_desc_free(desc);</div><div class='ctx'> </div><div class='del'>-	return phy_mii_ioctl(phydev, rq, cmd);</div><div class='add'>+prepare_err:</div><div class='add'>+	dma_unmap_single(db-&gt;dev, rxbuf, count, DMA_FROM_DEVICE);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ethtool ops */</div><div class='ctx'> static void emac_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			      struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(DRV_NAME));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(DRV_VERSION));</div><div class='del'>-	strlcpy(info-&gt;bus_info, dev_name(&amp;dev-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(&amp;dev-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 emac_get_msglevel(struct net_device *dev)</div><div class='hunk'>@@ -323,7 +429,7 @@ static unsigned int emac_powerup(struct net_device *ndev)</div><div class='ctx'> 	/* initial EMAC */</div><div class='ctx'> 	/* flush RX FIFO */</div><div class='ctx'> 	reg_val = readl(db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='del'>-	reg_val |= 0x8;</div><div class='add'>+	reg_val |= EMAC_RX_CTL_FLUSH_FIFO;</div><div class='ctx'> 	writel(reg_val, db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='ctx'> 	udelay(1);</div><div class='ctx'> </div><div class='hunk'>@@ -335,8 +441,8 @@ static unsigned int emac_powerup(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	/* set MII clock */</div><div class='ctx'> 	reg_val = readl(db-&gt;membase + EMAC_MAC_MCFG_REG);</div><div class='del'>-	reg_val &amp;= (~(0xf &lt;&lt; 2));</div><div class='del'>-	reg_val |= (0xD &lt;&lt; 2);</div><div class='add'>+	reg_val &amp;= ~EMAC_MAC_MCFG_MII_CLKD_MASK;</div><div class='add'>+	reg_val |= EMAC_MAC_MCFG_MII_CLKD_72;</div><div class='ctx'> 	writel(reg_val, db-&gt;membase + EMAC_MAC_MCFG_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* clear RX counter */</div><div class='hunk'>@@ -371,7 +477,7 @@ static int emac_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	writel(dev-&gt;dev_addr[0] &lt;&lt; 16 | dev-&gt;dev_addr[1] &lt;&lt; 8 | dev-&gt;</div><div class='ctx'> 	       dev_addr[2], db-&gt;membase + EMAC_MAC_A1_REG);</div><div class='hunk'>@@ -400,14 +506,14 @@ static void emac_init_device(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* enable RX/TX0/RX Hlevel interrup */</div><div class='ctx'> 	reg_val = readl(db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='del'>-	reg_val |= (0xf &lt;&lt; 0) | (0x01 &lt;&lt; 8);</div><div class='add'>+	reg_val |= (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | EMAC_INT_CTL_RX_EN);</div><div class='ctx'> 	writel(reg_val, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;db-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Our watchdog timed out. Called by the networking layer */</div><div class='del'>-static void emac_timeout(struct net_device *dev)</div><div class='add'>+static void emac_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct emac_board_info *db = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -432,7 +538,7 @@ static void emac_timeout(struct net_device *dev)</div><div class='ctx'> /* Hardware start transmission.</div><div class='ctx'>  * Send a packet to media from the upper layer.</div><div class='ctx'>  */</div><div class='del'>-static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t emac_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct emac_board_info *db = netdev_priv(dev);</div><div class='ctx'> 	unsigned long channel;</div><div class='hunk'>@@ -440,7 +546,7 @@ static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	channel = db-&gt;tx_fifo_stat &amp; 3;</div><div class='ctx'> 	if (channel == 3)</div><div class='del'>-		return 1;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='ctx'> </div><div class='ctx'> 	channel = (channel == 1 ? 1 : 0);</div><div class='ctx'> </div><div class='hunk'>@@ -514,7 +620,6 @@ static void emac_rx(struct net_device *dev)</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	u8 *rdptr;</div><div class='ctx'> 	bool good_packet;</div><div class='del'>-	static int rxlen_last;</div><div class='ctx'> 	unsigned int reg_val;</div><div class='ctx'> 	u32 rxhdr, rxstatus, rxcount, rxlen;</div><div class='ctx'> </div><div class='hunk'>@@ -529,26 +634,12 @@ static void emac_rx(struct net_device *dev)</div><div class='ctx'> 		if (netif_msg_rx_status(db))</div><div class='ctx'> 			dev_dbg(db-&gt;dev, "RXCount: %x\n", rxcount);</div><div class='ctx'> </div><div class='del'>-		if ((db-&gt;skb_last != NULL) &amp;&amp; (rxlen_last &gt; 0)) {</div><div class='del'>-			dev-&gt;stats.rx_bytes += rxlen_last;</div><div class='del'>-</div><div class='del'>-			/* Pass to upper layer */</div><div class='del'>-			db-&gt;skb_last-&gt;protocol = eth_type_trans(db-&gt;skb_last,</div><div class='del'>-								dev);</div><div class='del'>-			netif_rx(db-&gt;skb_last);</div><div class='del'>-			dev-&gt;stats.rx_packets++;</div><div class='del'>-			db-&gt;skb_last = NULL;</div><div class='del'>-			rxlen_last = 0;</div><div class='del'>-</div><div class='del'>-			reg_val = readl(db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='del'>-			reg_val &amp;= ~EMAC_RX_CTL_DMA_EN;</div><div class='del'>-			writel(reg_val, db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		if (!rxcount) {</div><div class='ctx'> 			db-&gt;emacrx_completed_flag = 1;</div><div class='ctx'> 			reg_val = readl(db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='del'>-			reg_val |= (0xf &lt;&lt; 0) | (0x01 &lt;&lt; 8);</div><div class='add'>+			reg_val |= (EMAC_INT_CTL_TX_EN |</div><div class='add'>+					EMAC_INT_CTL_TX_ABRT_EN |</div><div class='add'>+					EMAC_INT_CTL_RX_EN);</div><div class='ctx'> 			writel(reg_val, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='ctx'> </div><div class='ctx'> 			/* had one stuck? */</div><div class='hunk'>@@ -580,7 +671,9 @@ static void emac_rx(struct net_device *dev)</div><div class='ctx'> 			writel(reg_val | EMAC_CTL_RX_EN,</div><div class='ctx'> 			       db-&gt;membase + EMAC_CTL_REG);</div><div class='ctx'> 			reg_val = readl(db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='del'>-			reg_val |= (0xf &lt;&lt; 0) | (0x01 &lt;&lt; 8);</div><div class='add'>+			reg_val |= (EMAC_INT_CTL_TX_EN |</div><div class='add'>+					EMAC_INT_CTL_TX_ABRT_EN |</div><div class='add'>+					EMAC_INT_CTL_RX_EN);</div><div class='ctx'> 			writel(reg_val, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='ctx'> </div><div class='ctx'> 			db-&gt;emacrx_completed_flag = 1;</div><div class='hunk'>@@ -638,6 +731,19 @@ static void emac_rx(struct net_device *dev)</div><div class='ctx'> 			if (netif_msg_rx_status(db))</div><div class='ctx'> 				dev_dbg(db-&gt;dev, "RxLen %x\n", rxlen);</div><div class='ctx'> </div><div class='add'>+			if (rxlen &gt;= dev-&gt;mtu &amp;&amp; db-&gt;rx_chan) {</div><div class='add'>+				reg_val = readl(db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='add'>+				reg_val |= EMAC_RX_CTL_DMA_EN;</div><div class='add'>+				writel(reg_val, db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='add'>+				if (!emac_dma_inblk_32bit(db, skb, rdptr, rxlen))</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				/* re enable cpu receive. then try to receive by emac_inblk_32bit */</div><div class='add'>+				reg_val = readl(db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='add'>+				reg_val &amp;= ~EMAC_RX_CTL_DMA_EN;</div><div class='add'>+				writel(reg_val, db-&gt;membase + EMAC_RX_CTL_REG);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			emac_inblk_32bit(db-&gt;membase + EMAC_RX_IO_DATA_REG,</div><div class='ctx'> 					rdptr, rxlen);</div><div class='ctx'> 			dev-&gt;stats.rx_bytes += rxlen;</div><div class='hunk'>@@ -655,13 +761,11 @@ static irqreturn_t emac_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct net_device *dev = dev_id;</div><div class='ctx'> 	struct emac_board_info *db = netdev_priv(dev);</div><div class='ctx'> 	int int_status;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int reg_val;</div><div class='ctx'> </div><div class='ctx'> 	/* A real interrupt coming */</div><div class='ctx'> </div><div class='del'>-	/* holders of db-&gt;lock must always block IRQs */</div><div class='del'>-	spin_lock_irqsave(&amp;db-&gt;lock, flags);</div><div class='add'>+	spin_lock(&amp;db-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all interrupts */</div><div class='ctx'> 	writel(0, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='hunk'>@@ -683,19 +787,24 @@ static irqreturn_t emac_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Transmit Interrupt check */</div><div class='del'>-	if (int_status &amp; (0x01 | 0x02))</div><div class='add'>+	if (int_status &amp; EMAC_INT_STA_TX_COMPLETE)</div><div class='ctx'> 		emac_tx_done(dev, db, int_status);</div><div class='ctx'> </div><div class='del'>-	if (int_status &amp; (0x04 | 0x08))</div><div class='add'>+	if (int_status &amp; EMAC_INT_STA_TX_ABRT)</div><div class='ctx'> 		netdev_info(dev, " ab : %x\n", int_status);</div><div class='ctx'> </div><div class='ctx'> 	/* Re-enable interrupt mask */</div><div class='ctx'> 	if (db-&gt;emacrx_completed_flag == 1) {</div><div class='ctx'> 		reg_val = readl(db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='del'>-		reg_val |= (0xf &lt;&lt; 0) | (0x01 &lt;&lt; 8);</div><div class='add'>+		reg_val |= (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN | EMAC_INT_CTL_RX_EN);</div><div class='add'>+		writel(reg_val, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='add'>+	} else {</div><div class='add'>+		reg_val = readl(db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='add'>+		reg_val |= (EMAC_INT_CTL_TX_EN | EMAC_INT_CTL_TX_ABRT_EN);</div><div class='ctx'> 		writel(reg_val, db-&gt;membase + EMAC_INT_CTL_REG);</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_irqrestore(&amp;db-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;db-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -791,7 +900,7 @@ static const struct net_device_ops emac_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= emac_start_xmit,</div><div class='ctx'> 	.ndo_tx_timeout		= emac_timeout,</div><div class='ctx'> 	.ndo_set_rx_mode	= emac_set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= emac_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl_running,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= emac_set_mac_address,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -799,6 +908,58 @@ static const struct net_device_ops emac_netdev_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int emac_configure_dma(struct emac_board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = db-&gt;pdev;</div><div class='add'>+	struct net_device *ndev = db-&gt;ndev;</div><div class='add'>+	struct dma_slave_config conf = {};</div><div class='add'>+	struct resource *regs;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!regs) {</div><div class='add'>+		netdev_err(ndev, "get io resource from device failed.\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_clear_chan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(ndev, "get io resource from device: %pa, size = %u\n",</div><div class='add'>+		    &amp;regs-&gt;start, (unsigned int)resource_size(regs));</div><div class='add'>+	db-&gt;emac_rx_fifo = regs-&gt;start + EMAC_RX_IO_DATA_REG;</div><div class='add'>+</div><div class='add'>+	db-&gt;rx_chan = dma_request_chan(&amp;pdev-&gt;dev, "rx");</div><div class='add'>+	if (IS_ERR(db-&gt;rx_chan)) {</div><div class='add'>+		netdev_err(ndev,</div><div class='add'>+			   "failed to request dma channel. dma is disabled\n");</div><div class='add'>+		err = PTR_ERR(db-&gt;rx_chan);</div><div class='add'>+		goto out_clear_chan;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	conf.direction = DMA_DEV_TO_MEM;</div><div class='add'>+	conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='add'>+	conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;</div><div class='add'>+	conf.src_addr = db-&gt;emac_rx_fifo;</div><div class='add'>+	conf.dst_maxburst = 4;</div><div class='add'>+	conf.src_maxburst = 4;</div><div class='add'>+	conf.device_fc = false;</div><div class='add'>+</div><div class='add'>+	err = dmaengine_slave_config(db-&gt;rx_chan, &amp;conf);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(ndev, "config dma slave failed\n");</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_slave_configure_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_slave_configure_err:</div><div class='add'>+	dma_release_channel(db-&gt;rx_chan);</div><div class='add'>+</div><div class='add'>+out_clear_chan:</div><div class='add'>+	db-&gt;rx_chan = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Search EMAC board, allocate space and register it</div><div class='ctx'>  */</div><div class='ctx'> static int emac_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -807,7 +968,6 @@ static int emac_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct emac_board_info *db;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	const char *mac_addr;</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_etherdev(sizeof(struct emac_board_info));</div><div class='ctx'> 	if (!ndev) {</div><div class='hunk'>@@ -818,7 +978,6 @@ static int emac_probe(struct platform_device *pdev)</div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	db = netdev_priv(ndev);</div><div class='del'>-	memset(db, 0, sizeof(*db));</div><div class='ctx'> </div><div class='ctx'> 	db-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	db-&gt;ndev = ndev;</div><div class='hunk'>@@ -843,16 +1002,19 @@ static int emac_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_iounmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (emac_configure_dma(db))</div><div class='add'>+		netdev_info(ndev, "configure dma failed. disable dma.\n");</div><div class='add'>+</div><div class='ctx'> 	db-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='ctx'> 	if (IS_ERR(db-&gt;clk)) {</div><div class='ctx'> 		ret = PTR_ERR(db-&gt;clk);</div><div class='del'>-		goto out_iounmap;</div><div class='add'>+		goto out_dispose_mapping;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = clk_prepare_enable(db-&gt;clk);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Error couldn't enable clock (%d)\n", ret);</div><div class='del'>-		goto out_iounmap;</div><div class='add'>+		goto out_dispose_mapping;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = sunxi_sram_claim(&amp;pdev-&gt;dev);</div><div class='hunk'>@@ -861,7 +1023,9 @@ static int emac_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto out_clk_disable_unprepare;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	db-&gt;phy_node = of_parse_phandle(np, "phy", 0);</div><div class='add'>+	db-&gt;phy_node = of_parse_phandle(np, "phy-handle", 0);</div><div class='add'>+	if (!db-&gt;phy_node)</div><div class='add'>+		db-&gt;phy_node = of_parse_phandle(np, "phy", 0);</div><div class='ctx'> 	if (!db-&gt;phy_node) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no associated PHY\n");</div><div class='ctx'> 		ret = -ENODEV;</div><div class='hunk'>@@ -869,12 +1033,9 @@ static int emac_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Read MAC-address from DT */</div><div class='del'>-	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (!IS_ERR(mac_addr))</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='del'>-</div><div class='del'>-	/* Check if the MAC address is valid, if not get a random one */</div><div class='del'>-	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='add'>+	ret = of_get_ethdev_address(np, ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* if the MAC address is invalid get a random one */</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "using random MAC address %pM\n",</div><div class='ctx'> 			 ndev-&gt;dev_addr);</div><div class='hunk'>@@ -909,6 +1070,9 @@ out_release_sram:</div><div class='ctx'> 	sunxi_sram_release(&amp;pdev-&gt;dev);</div><div class='ctx'> out_clk_disable_unprepare:</div><div class='ctx'> 	clk_disable_unprepare(db-&gt;clk);</div><div class='add'>+out_dispose_mapping:</div><div class='add'>+	irq_dispose_mapping(ndev-&gt;irq);</div><div class='add'>+	dma_release_channel(db-&gt;rx_chan);</div><div class='ctx'> out_iounmap:</div><div class='ctx'> 	iounmap(db-&gt;membase);</div><div class='ctx'> out:</div><div class='hunk'>@@ -919,19 +1083,24 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int emac_remove(struct platform_device *pdev)</div><div class='add'>+static void emac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct emac_board_info *db = netdev_priv(ndev);</div><div class='ctx'> </div><div class='add'>+	if (db-&gt;rx_chan) {</div><div class='add'>+		dmaengine_terminate_all(db-&gt;rx_chan);</div><div class='add'>+		dma_release_channel(db-&gt;rx_chan);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='ctx'> 	sunxi_sram_release(&amp;pdev-&gt;dev);</div><div class='ctx'> 	clk_disable_unprepare(db-&gt;clk);</div><div class='add'>+	irq_dispose_mapping(ndev-&gt;irq);</div><div class='ctx'> 	iounmap(db-&gt;membase);</div><div class='ctx'> 	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "released and freed device\n");</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int emac_suspend(struct platform_device *dev, pm_message_t state)</div><div class='head'>diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.h b/drivers/net/ethernet/allwinner/sun4i-emac.h<br/>index 38c72d9ec600..90bd9ad77607 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/allwinner/sun4i-emac.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/allwinner/sun4i-emac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/allwinner/sun4i-emac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/allwinner/sun4i-emac.h</a></div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'> #define EMAC_RX_CTL_REG		(0x3c)</div><div class='ctx'> #define EMAC_RX_CTL_AUTO_DRQ_EN		(1 &lt;&lt; 1)</div><div class='ctx'> #define EMAC_RX_CTL_DMA_EN		(1 &lt;&lt; 2)</div><div class='add'>+#define EMAC_RX_CTL_FLUSH_FIFO		(1 &lt;&lt; 3)</div><div class='ctx'> #define EMAC_RX_CTL_PASS_ALL_EN		(1 &lt;&lt; 4)</div><div class='ctx'> #define EMAC_RX_CTL_PASS_CTL_EN		(1 &lt;&lt; 5)</div><div class='ctx'> #define EMAC_RX_CTL_PASS_CRC_ERR_EN	(1 &lt;&lt; 6)</div><div class='hunk'>@@ -61,7 +62,21 @@</div><div class='ctx'> #define EMAC_RX_IO_DATA_STATUS_OK	(1 &lt;&lt; 7)</div><div class='ctx'> #define EMAC_RX_FBC_REG		(0x50)</div><div class='ctx'> #define EMAC_INT_CTL_REG	(0x54)</div><div class='add'>+#define EMAC_INT_CTL_RX_EN	(1 &lt;&lt; 8)</div><div class='add'>+#define EMAC_INT_CTL_TX0_EN	(1)</div><div class='add'>+#define EMAC_INT_CTL_TX1_EN	(1 &lt;&lt; 1)</div><div class='add'>+#define EMAC_INT_CTL_TX_EN	(EMAC_INT_CTL_TX0_EN | EMAC_INT_CTL_TX1_EN)</div><div class='add'>+#define EMAC_INT_CTL_TX0_ABRT_EN	(0x1 &lt;&lt; 2)</div><div class='add'>+#define EMAC_INT_CTL_TX1_ABRT_EN	(0x1 &lt;&lt; 3)</div><div class='add'>+#define EMAC_INT_CTL_TX_ABRT_EN	(EMAC_INT_CTL_TX0_ABRT_EN | EMAC_INT_CTL_TX1_ABRT_EN)</div><div class='ctx'> #define EMAC_INT_STA_REG	(0x58)</div><div class='add'>+#define EMAC_INT_STA_TX0_COMPLETE	(0x1)</div><div class='add'>+#define EMAC_INT_STA_TX1_COMPLETE	(0x1 &lt;&lt; 1)</div><div class='add'>+#define EMAC_INT_STA_TX_COMPLETE	(EMAC_INT_STA_TX0_COMPLETE | EMAC_INT_STA_TX1_COMPLETE)</div><div class='add'>+#define EMAC_INT_STA_TX0_ABRT	(0x1 &lt;&lt; 2)</div><div class='add'>+#define EMAC_INT_STA_TX1_ABRT	(0x1 &lt;&lt; 3)</div><div class='add'>+#define EMAC_INT_STA_TX_ABRT	(EMAC_INT_STA_TX0_ABRT | EMAC_INT_STA_TX1_ABRT)</div><div class='add'>+#define EMAC_INT_STA_RX_COMPLETE	(0x1 &lt;&lt; 8)</div><div class='ctx'> #define EMAC_MAC_CTL0_REG	(0x5c)</div><div class='ctx'> #define EMAC_MAC_CTL0_RX_FLOW_CTL_EN	(1 &lt;&lt; 2)</div><div class='ctx'> #define EMAC_MAC_CTL0_TX_FLOW_CTL_EN	(1 &lt;&lt; 3)</div><div class='hunk'>@@ -87,8 +102,11 @@</div><div class='ctx'> #define EMAC_MAC_CLRT_RM		(0x0f)</div><div class='ctx'> #define EMAC_MAC_MAXF_REG	(0x70)</div><div class='ctx'> #define EMAC_MAC_SUPP_REG	(0x74)</div><div class='add'>+#define EMAC_MAC_SUPP_100M	(0x1 &lt;&lt; 8)</div><div class='ctx'> #define EMAC_MAC_TEST_REG	(0x78)</div><div class='ctx'> #define EMAC_MAC_MCFG_REG	(0x7c)</div><div class='add'>+#define EMAC_MAC_MCFG_MII_CLKD_MASK	(0xff &lt;&lt; 2)</div><div class='add'>+#define EMAC_MAC_MCFG_MII_CLKD_72	(0x0d &lt;&lt; 2)</div><div class='ctx'> #define EMAC_MAC_A0_REG		(0x98)</div><div class='ctx'> #define EMAC_MAC_A1_REG		(0x9c)</div><div class='ctx'> #define EMAC_MAC_A2_REG		(0xa0)</div><div class='head'>diff --git a/drivers/net/ethernet/alteon/Kconfig b/drivers/net/ethernet/alteon/Kconfig<br/>index c3f7067d2d10..cfe1f3159d61 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alteon/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alteon/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alteon/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/alteon/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_ALTEON</div><div class='ctx'> 	bool "Alteon devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -20,7 +20,7 @@ if NET_VENDOR_ALTEON</div><div class='ctx'> config ACENIC</div><div class='ctx'> 	tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear</div><div class='ctx'> 	  GA620, SGI Gigabit or Farallon PN9000-SX PCI Gigabit Ethernet</div><div class='ctx'> 	  adapter. The driver allows for using the Jumbo Frame option (9000</div><div class='hunk'>@@ -34,7 +34,7 @@ config ACENIC</div><div class='ctx'> config ACENIC_OMIT_TIGON_I</div><div class='ctx'> 	bool "Omit support for old Tigon I based AceNICs"</div><div class='ctx'> 	depends on ACENIC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you only have Tigon II based AceNICs and want to leave</div><div class='ctx'> 	  out support for the older Tigon I based cards which are no longer</div><div class='ctx'> 	  being sold (ie. the original Alteon AceNIC and 3Com 3C985 (non B</div><div class='head'>diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c<br/>index 46b4207d3266..9e6f91df2ba0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alteon/acenic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alteon/acenic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alteon/acenic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/alteon/acenic.c</a></div><div class='hunk'>@@ -437,7 +437,7 @@ static const struct ethtool_ops ace_ethtool_ops = {</div><div class='ctx'> 	.set_link_ksettings = ace_set_link_ksettings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void ace_watchdog(struct net_device *dev);</div><div class='add'>+static void ace_watchdog(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops ace_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ace_open,</div><div class='hunk'>@@ -465,6 +465,7 @@ static int acenic_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	ap = netdev_priv(dev);</div><div class='add'>+	ap-&gt;ndev = dev;</div><div class='ctx'> 	ap-&gt;pdev = pdev;</div><div class='ctx'> 	ap-&gt;name = pci_name(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -547,7 +548,7 @@ static int acenic_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 			       ap-&gt;name);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PCI_VENDOR_ID_SGI:</div><div class='ctx'> 		printk(KERN_INFO "%s: SGI AceNIC ", ap-&gt;name);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -588,8 +589,7 @@ static int acenic_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	ap-&gt;name = dev-&gt;name;</div><div class='ctx'> </div><div class='del'>-	if (ap-&gt;pci_using_dac)</div><div class='del'>-		dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+	dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -642,9 +642,8 @@ static void acenic_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 			ringp = &amp;ap-&gt;skb-&gt;rx_std_skbuff[i];</div><div class='ctx'> 			mapping = dma_unmap_addr(ringp, mapping);</div><div class='del'>-			pci_unmap_page(ap-&gt;pdev, mapping,</div><div class='del'>-				       ACE_STD_BUFSIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_page(&amp;ap-&gt;pdev-&gt;dev, mapping,</div><div class='add'>+				       ACE_STD_BUFSIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			ap-&gt;rx_std_ring[i].size = 0;</div><div class='ctx'> 			ap-&gt;skb-&gt;rx_std_skbuff[i].skb = NULL;</div><div class='hunk'>@@ -662,9 +661,9 @@ static void acenic_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 				ringp = &amp;ap-&gt;skb-&gt;rx_mini_skbuff[i];</div><div class='ctx'> 				mapping = dma_unmap_addr(ringp,mapping);</div><div class='del'>-				pci_unmap_page(ap-&gt;pdev, mapping,</div><div class='add'>+				dma_unmap_page(&amp;ap-&gt;pdev-&gt;dev, mapping,</div><div class='ctx'> 					       ACE_MINI_BUFSIZE,</div><div class='del'>-					       PCI_DMA_FROMDEVICE);</div><div class='add'>+					       DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 				ap-&gt;rx_mini_ring[i].size = 0;</div><div class='ctx'> 				ap-&gt;skb-&gt;rx_mini_skbuff[i].skb = NULL;</div><div class='hunk'>@@ -681,9 +680,8 @@ static void acenic_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 			ringp = &amp;ap-&gt;skb-&gt;rx_jumbo_skbuff[i];</div><div class='ctx'> 			mapping = dma_unmap_addr(ringp, mapping);</div><div class='del'>-			pci_unmap_page(ap-&gt;pdev, mapping,</div><div class='del'>-				       ACE_JUMBO_BUFSIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_page(&amp;ap-&gt;pdev-&gt;dev, mapping,</div><div class='add'>+				       ACE_JUMBO_BUFSIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			ap-&gt;rx_jumbo_ring[i].size = 0;</div><div class='ctx'> 			ap-&gt;skb-&gt;rx_jumbo_skbuff[i].skb = NULL;</div><div class='hunk'>@@ -713,8 +711,8 @@ static void ace_free_descriptors(struct net_device *dev)</div><div class='ctx'> 			 RX_JUMBO_RING_ENTRIES +</div><div class='ctx'> 			 RX_MINI_RING_ENTRIES +</div><div class='ctx'> 			 RX_RETURN_RING_ENTRIES));</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, size, ap-&gt;rx_std_ring,</div><div class='del'>-				    ap-&gt;rx_ring_base_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, size, ap-&gt;rx_std_ring,</div><div class='add'>+				  ap-&gt;rx_ring_base_dma);</div><div class='ctx'> 		ap-&gt;rx_std_ring = NULL;</div><div class='ctx'> 		ap-&gt;rx_jumbo_ring = NULL;</div><div class='ctx'> 		ap-&gt;rx_mini_ring = NULL;</div><div class='hunk'>@@ -722,31 +720,30 @@ static void ace_free_descriptors(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ap-&gt;evt_ring != NULL) {</div><div class='ctx'> 		size = (sizeof(struct event) * EVT_RING_ENTRIES);</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, size, ap-&gt;evt_ring,</div><div class='del'>-				    ap-&gt;evt_ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, size, ap-&gt;evt_ring,</div><div class='add'>+				  ap-&gt;evt_ring_dma);</div><div class='ctx'> 		ap-&gt;evt_ring = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ap-&gt;tx_ring != NULL &amp;&amp; !ACE_IS_TIGON_I(ap)) {</div><div class='ctx'> 		size = (sizeof(struct tx_desc) * MAX_TX_RING_ENTRIES);</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, size, ap-&gt;tx_ring,</div><div class='del'>-				    ap-&gt;tx_ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, size, ap-&gt;tx_ring,</div><div class='add'>+				  ap-&gt;tx_ring_dma);</div><div class='ctx'> 	}</div><div class='ctx'> 	ap-&gt;tx_ring = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;evt_prd != NULL) {</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, sizeof(u32),</div><div class='del'>-				    (void *)ap-&gt;evt_prd, ap-&gt;evt_prd_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(u32),</div><div class='add'>+				  (void *)ap-&gt;evt_prd, ap-&gt;evt_prd_dma);</div><div class='ctx'> 		ap-&gt;evt_prd = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ap-&gt;rx_ret_prd != NULL) {</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, sizeof(u32),</div><div class='del'>-				    (void *)ap-&gt;rx_ret_prd,</div><div class='del'>-				    ap-&gt;rx_ret_prd_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(u32),</div><div class='add'>+				  (void *)ap-&gt;rx_ret_prd, ap-&gt;rx_ret_prd_dma);</div><div class='ctx'> 		ap-&gt;rx_ret_prd = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (ap-&gt;tx_csm != NULL) {</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, sizeof(u32),</div><div class='del'>-				    (void *)ap-&gt;tx_csm, ap-&gt;tx_csm_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(u32),</div><div class='add'>+				  (void *)ap-&gt;tx_csm, ap-&gt;tx_csm_dma);</div><div class='ctx'> 		ap-&gt;tx_csm = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -763,8 +760,8 @@ static int ace_allocate_descriptors(struct net_device *dev)</div><div class='ctx'> 		 RX_MINI_RING_ENTRIES +</div><div class='ctx'> 		 RX_RETURN_RING_ENTRIES));</div><div class='ctx'> </div><div class='del'>-	ap-&gt;rx_std_ring = pci_alloc_consistent(ap-&gt;pdev, size,</div><div class='del'>-					       &amp;ap-&gt;rx_ring_base_dma);</div><div class='add'>+	ap-&gt;rx_std_ring = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, size,</div><div class='add'>+					     &amp;ap-&gt;rx_ring_base_dma, GFP_KERNEL);</div><div class='ctx'> 	if (ap-&gt;rx_std_ring == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -774,7 +771,8 @@ static int ace_allocate_descriptors(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	size = (sizeof(struct event) * EVT_RING_ENTRIES);</div><div class='ctx'> </div><div class='del'>-	ap-&gt;evt_ring = pci_alloc_consistent(ap-&gt;pdev, size, &amp;ap-&gt;evt_ring_dma);</div><div class='add'>+	ap-&gt;evt_ring = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, size,</div><div class='add'>+					  &amp;ap-&gt;evt_ring_dma, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;evt_ring == NULL)</div><div class='ctx'> 		goto fail;</div><div class='hunk'>@@ -786,25 +784,25 @@ static int ace_allocate_descriptors(struct net_device *dev)</div><div class='ctx'> 	if (!ACE_IS_TIGON_I(ap)) {</div><div class='ctx'> 		size = (sizeof(struct tx_desc) * MAX_TX_RING_ENTRIES);</div><div class='ctx'> </div><div class='del'>-		ap-&gt;tx_ring = pci_alloc_consistent(ap-&gt;pdev, size,</div><div class='del'>-						   &amp;ap-&gt;tx_ring_dma);</div><div class='add'>+		ap-&gt;tx_ring = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, size,</div><div class='add'>+						 &amp;ap-&gt;tx_ring_dma, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (ap-&gt;tx_ring == NULL)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ap-&gt;evt_prd = pci_alloc_consistent(ap-&gt;pdev, sizeof(u32),</div><div class='del'>-					   &amp;ap-&gt;evt_prd_dma);</div><div class='add'>+	ap-&gt;evt_prd = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(u32),</div><div class='add'>+					 &amp;ap-&gt;evt_prd_dma, GFP_KERNEL);</div><div class='ctx'> 	if (ap-&gt;evt_prd == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ap-&gt;rx_ret_prd = pci_alloc_consistent(ap-&gt;pdev, sizeof(u32),</div><div class='del'>-					      &amp;ap-&gt;rx_ret_prd_dma);</div><div class='add'>+	ap-&gt;rx_ret_prd = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(u32),</div><div class='add'>+					    &amp;ap-&gt;rx_ret_prd_dma, GFP_KERNEL);</div><div class='ctx'> 	if (ap-&gt;rx_ret_prd == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='del'>-	ap-&gt;tx_csm = pci_alloc_consistent(ap-&gt;pdev, sizeof(u32),</div><div class='del'>-					  &amp;ap-&gt;tx_csm_dma);</div><div class='add'>+	ap-&gt;tx_csm = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(u32),</div><div class='add'>+					&amp;ap-&gt;tx_csm_dma, GFP_KERNEL);</div><div class='ctx'> 	if (ap-&gt;tx_csm == NULL)</div><div class='ctx'> 		goto fail;</div><div class='ctx'> </div><div class='hunk'>@@ -830,8 +828,8 @@ static void ace_init_cleanup(struct net_device *dev)</div><div class='ctx'> 	ace_free_descriptors(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;info)</div><div class='del'>-		pci_free_consistent(ap-&gt;pdev, sizeof(struct ace_info),</div><div class='del'>-				    ap-&gt;info, ap-&gt;info_dma);</div><div class='add'>+		dma_free_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(struct ace_info),</div><div class='add'>+				  ap-&gt;info, ap-&gt;info_dma);</div><div class='ctx'> 	kfree(ap-&gt;skb);</div><div class='ctx'> 	kfree(ap-&gt;trace_buf);</div><div class='ctx'> </div><div class='hunk'>@@ -870,6 +868,7 @@ static int ace_init(struct net_device *dev)</div><div class='ctx'> 	int board_idx, ecode = 0;</div><div class='ctx'> 	short i;</div><div class='ctx'> 	unsigned char cache_size;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	ap = netdev_priv(dev);</div><div class='ctx'> 	regs = ap-&gt;regs;</div><div class='hunk'>@@ -989,12 +988,13 @@ static int ace_init(struct net_device *dev)</div><div class='ctx'> 	writel(mac1, &amp;regs-&gt;MacAddrHi);</div><div class='ctx'> 	writel(mac2, &amp;regs-&gt;MacAddrLo);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;dev_addr[0] = (mac1 &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[1] = mac1 &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[2] = (mac2 &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[3] = (mac2 &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[4] = (mac2 &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[5] = mac2 &amp; 0xff;</div><div class='add'>+	addr[0] = (mac1 &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	addr[1] = mac1 &amp; 0xff;</div><div class='add'>+	addr[2] = (mac2 &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	addr[3] = (mac2 &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	addr[4] = (mac2 &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	addr[5] = mac2 &amp; 0xff;</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	printk("MAC: %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1129,11 +1129,7 @@ static int ace_init(struct net_device *dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Configure DMA attributes.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='del'>-		ap-&gt;pci_using_dac = 1;</div><div class='del'>-	} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {</div><div class='del'>-		ap-&gt;pci_using_dac = 0;</div><div class='del'>-	} else {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(64))) {</div><div class='ctx'> 		ecode = -ENODEV;</div><div class='ctx'> 		goto init_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1143,8 +1139,8 @@ static int ace_init(struct net_device *dev)</div><div class='ctx'> 	 * and the control blocks for the transmit and receive rings</div><div class='ctx'> 	 * as they need to be setup once and for all.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(info = pci_alloc_consistent(ap-&gt;pdev, sizeof(struct ace_info),</div><div class='del'>-					  &amp;ap-&gt;info_dma))) {</div><div class='add'>+	if (!(info = dma_alloc_coherent(&amp;ap-&gt;pdev-&gt;dev, sizeof(struct ace_info),</div><div class='add'>+					&amp;ap-&gt;info_dma, GFP_KERNEL))) {</div><div class='ctx'> 		ecode = -EAGAIN;</div><div class='ctx'> 		goto init_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1153,7 +1149,7 @@ static int ace_init(struct net_device *dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Get the memory for the skb rings.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!(ap-&gt;skb = kmalloc(sizeof(struct ace_skb), GFP_KERNEL))) {</div><div class='add'>+	if (!(ap-&gt;skb = kzalloc(sizeof(struct ace_skb), GFP_KERNEL))) {</div><div class='ctx'> 		ecode = -EAGAIN;</div><div class='ctx'> 		goto init_error;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1174,9 +1170,6 @@ static int ace_init(struct net_device *dev)</div><div class='ctx'> 	ap-&gt;last_mini_rx = 0;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	memset(ap-&gt;info, 0, sizeof(struct ace_info));</div><div class='del'>-	memset(ap-&gt;skb, 0, sizeof(struct ace_skb));</div><div class='del'>-</div><div class='ctx'> 	ecode = ace_load_firmware(dev);</div><div class='ctx'> 	if (ecode)</div><div class='ctx'> 		goto init_error;</div><div class='hunk'>@@ -1542,7 +1535,7 @@ static void ace_set_rxtx_parms(struct net_device *dev, int jumbo)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void ace_watchdog(struct net_device *data)</div><div class='add'>+static void ace_watchdog(struct net_device *data, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = data;</div><div class='ctx'> 	struct ace_private *ap = netdev_priv(dev);</div><div class='hunk'>@@ -1567,10 +1560,10 @@ static void ace_watchdog(struct net_device *data)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void ace_tasklet(unsigned long arg)</div><div class='add'>+static void ace_bh_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *) arg;</div><div class='del'>-	struct ace_private *ap = netdev_priv(dev);</div><div class='add'>+	struct ace_private *ap = from_work(ap, work, ace_bh_work);</div><div class='add'>+	struct net_device *dev = ap-&gt;ndev;</div><div class='ctx'> 	int cur_size;</div><div class='ctx'> </div><div class='ctx'> 	cur_size = atomic_read(&amp;ap-&gt;cur_rx_bufs);</div><div class='hunk'>@@ -1602,7 +1595,7 @@ static void ace_tasklet(unsigned long arg)</div><div class='ctx'> #endif</div><div class='ctx'> 		ace_load_jumbo_rx_ring(dev, RX_JUMBO_SIZE - cur_size);</div><div class='ctx'> 	}</div><div class='del'>-	ap-&gt;tasklet_pending = 0;</div><div class='add'>+	ap-&gt;bh_work_pending = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1624,7 +1617,7 @@ static void ace_dump_trace(struct ace_private *ap)</div><div class='ctx'>  *</div><div class='ctx'>  * Loading rings is safe without holding the spin lock since this is</div><div class='ctx'>  * done only before the device is enabled, thus no interrupts are</div><div class='del'>- * generated and by the interrupt handler/tasklet handler.</div><div class='add'>+ * generated and by the interrupt handler/bh handler.</div><div class='ctx'>  */</div><div class='ctx'> static void ace_load_std_rx_ring(struct net_device *dev, int nr_bufs)</div><div class='ctx'> {</div><div class='hunk'>@@ -1646,10 +1639,10 @@ static void ace_load_std_rx_ring(struct net_device *dev, int nr_bufs)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mapping = pci_map_page(ap-&gt;pdev, virt_to_page(skb-&gt;data),</div><div class='add'>+		mapping = dma_map_page(&amp;ap-&gt;pdev-&gt;dev,</div><div class='add'>+				       virt_to_page(skb-&gt;data),</div><div class='ctx'> 				       offset_in_page(skb-&gt;data),</div><div class='del'>-				       ACE_STD_BUFSIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       ACE_STD_BUFSIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 		ap-&gt;skb-&gt;rx_std_skbuff[idx].skb = skb;</div><div class='ctx'> 		dma_unmap_addr_set(&amp;ap-&gt;skb-&gt;rx_std_skbuff[idx],</div><div class='ctx'> 				   mapping, mapping);</div><div class='hunk'>@@ -1707,10 +1700,10 @@ static void ace_load_mini_rx_ring(struct net_device *dev, int nr_bufs)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mapping = pci_map_page(ap-&gt;pdev, virt_to_page(skb-&gt;data),</div><div class='add'>+		mapping = dma_map_page(&amp;ap-&gt;pdev-&gt;dev,</div><div class='add'>+				       virt_to_page(skb-&gt;data),</div><div class='ctx'> 				       offset_in_page(skb-&gt;data),</div><div class='del'>-				       ACE_MINI_BUFSIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       ACE_MINI_BUFSIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 		ap-&gt;skb-&gt;rx_mini_skbuff[idx].skb = skb;</div><div class='ctx'> 		dma_unmap_addr_set(&amp;ap-&gt;skb-&gt;rx_mini_skbuff[idx],</div><div class='ctx'> 				   mapping, mapping);</div><div class='hunk'>@@ -1763,10 +1756,10 @@ static void ace_load_jumbo_rx_ring(struct net_device *dev, int nr_bufs)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mapping = pci_map_page(ap-&gt;pdev, virt_to_page(skb-&gt;data),</div><div class='add'>+		mapping = dma_map_page(&amp;ap-&gt;pdev-&gt;dev,</div><div class='add'>+				       virt_to_page(skb-&gt;data),</div><div class='ctx'> 				       offset_in_page(skb-&gt;data),</div><div class='del'>-				       ACE_JUMBO_BUFSIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       ACE_JUMBO_BUFSIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 		ap-&gt;skb-&gt;rx_jumbo_skbuff[idx].skb = skb;</div><div class='ctx'> 		dma_unmap_addr_set(&amp;ap-&gt;skb-&gt;rx_jumbo_skbuff[idx],</div><div class='ctx'> 				   mapping, mapping);</div><div class='hunk'>@@ -1887,16 +1880,16 @@ static u32 ace_handle_event(struct net_device *dev, u32 evtcsm, u32 evtprd)</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>- 			if (ACE_IS_TIGON_I(ap)) {</div><div class='del'>- 				struct cmd cmd;</div><div class='del'>- 				cmd.evt = C_SET_RX_JUMBO_PRD_IDX;</div><div class='del'>- 				cmd.code = 0;</div><div class='del'>- 				cmd.idx = 0;</div><div class='del'>- 				ace_issue_cmd(ap-&gt;regs, &amp;cmd);</div><div class='del'>- 			} else {</div><div class='del'>- 				writel(0, &amp;((ap-&gt;regs)-&gt;RxJumboPrd));</div><div class='del'>- 				wmb();</div><div class='del'>- 			}</div><div class='add'>+			if (ACE_IS_TIGON_I(ap)) {</div><div class='add'>+				struct cmd cmd;</div><div class='add'>+				cmd.evt = C_SET_RX_JUMBO_PRD_IDX;</div><div class='add'>+				cmd.code = 0;</div><div class='add'>+				cmd.idx = 0;</div><div class='add'>+				ace_issue_cmd(ap-&gt;regs, &amp;cmd);</div><div class='add'>+			} else {</div><div class='add'>+				writel(0, &amp;((ap-&gt;regs)-&gt;RxJumboPrd));</div><div class='add'>+				wmb();</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			ap-&gt;jumbo = 0;</div><div class='ctx'> 			ap-&gt;rx_jumbo_skbprd = 0;</div><div class='hunk'>@@ -1977,10 +1970,8 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)</div><div class='ctx'> </div><div class='ctx'> 		skb = rip-&gt;skb;</div><div class='ctx'> 		rip-&gt;skb = NULL;</div><div class='del'>-		pci_unmap_page(ap-&gt;pdev,</div><div class='del'>-			       dma_unmap_addr(rip, mapping),</div><div class='del'>-			       mapsize,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_page(&amp;ap-&gt;pdev-&gt;dev, dma_unmap_addr(rip, mapping),</div><div class='add'>+			       mapsize, DMA_FROM_DEVICE);</div><div class='ctx'> 		skb_put(skb, retdesc-&gt;size);</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='hunk'>@@ -2046,9 +2037,10 @@ static inline void ace_tx_int(struct net_device *dev,</div><div class='ctx'> 		skb = info-&gt;skb;</div><div class='ctx'> </div><div class='ctx'> 		if (dma_unmap_len(info, maplen)) {</div><div class='del'>-			pci_unmap_page(ap-&gt;pdev, dma_unmap_addr(info, mapping),</div><div class='add'>+			dma_unmap_page(&amp;ap-&gt;pdev-&gt;dev,</div><div class='add'>+				       dma_unmap_addr(info, mapping),</div><div class='ctx'> 				       dma_unmap_len(info, maplen),</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='ctx'> 			dma_unmap_len_set(info, maplen, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2168,7 +2160,7 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		int cur_size;</div><div class='del'>-		int run_tasklet = 0;</div><div class='add'>+		int run_bh_work = 0;</div><div class='ctx'> </div><div class='ctx'> 		cur_size = atomic_read(&amp;ap-&gt;cur_rx_bufs);</div><div class='ctx'> 		if (cur_size &lt; RX_LOW_STD_THRES) {</div><div class='hunk'>@@ -2180,7 +2172,7 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)</div><div class='ctx'> 				ace_load_std_rx_ring(dev,</div><div class='ctx'> 						     RX_RING_SIZE - cur_size);</div><div class='ctx'> 			} else</div><div class='del'>-				run_tasklet = 1;</div><div class='add'>+				run_bh_work = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!ACE_IS_TIGON_I(ap)) {</div><div class='hunk'>@@ -2196,7 +2188,7 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)</div><div class='ctx'> 					ace_load_mini_rx_ring(dev,</div><div class='ctx'> 							      RX_MINI_SIZE - cur_size);</div><div class='ctx'> 				} else</div><div class='del'>-					run_tasklet = 1;</div><div class='add'>+					run_bh_work = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2213,12 +2205,12 @@ static irqreturn_t ace_interrupt(int irq, void *dev_id)</div><div class='ctx'> 					ace_load_jumbo_rx_ring(dev,</div><div class='ctx'> 							       RX_JUMBO_SIZE - cur_size);</div><div class='ctx'> 				} else</div><div class='del'>-					run_tasklet = 1;</div><div class='add'>+					run_bh_work = 1;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (run_tasklet &amp;&amp; !ap-&gt;tasklet_pending) {</div><div class='del'>-			ap-&gt;tasklet_pending = 1;</div><div class='del'>-			tasklet_schedule(&amp;ap-&gt;ace_tasklet);</div><div class='add'>+		if (run_bh_work &amp;&amp; !ap-&gt;bh_work_pending) {</div><div class='add'>+			ap-&gt;bh_work_pending = 1;</div><div class='add'>+			queue_work(system_bh_wq, &amp;ap-&gt;ace_bh_work);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2275,7 +2267,7 @@ static int ace_open(struct net_device *dev)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Setup the bottom half rx ring refill handler</div><div class='ctx'> 	 */</div><div class='del'>-	tasklet_init(&amp;ap-&gt;ace_tasklet, ace_tasklet, (unsigned long)dev);</div><div class='add'>+	INIT_WORK(&amp;ap-&gt;ace_bh_work, ace_bh_work);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2309,7 +2301,7 @@ static int ace_close(struct net_device *dev)</div><div class='ctx'> 	cmd.idx = 0;</div><div class='ctx'> 	ace_issue_cmd(regs, &amp;cmd);</div><div class='ctx'> </div><div class='del'>-	tasklet_kill(&amp;ap-&gt;ace_tasklet);</div><div class='add'>+	cancel_work_sync(&amp;ap-&gt;ace_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Make sure one CPU is not processing packets while</div><div class='hunk'>@@ -2337,9 +2329,10 @@ static int ace_close(struct net_device *dev)</div><div class='ctx'> 			} else</div><div class='ctx'> 				memset(ap-&gt;tx_ring + i, 0,</div><div class='ctx'> 				       sizeof(struct tx_desc));</div><div class='del'>-			pci_unmap_page(ap-&gt;pdev, dma_unmap_addr(info, mapping),</div><div class='add'>+			dma_unmap_page(&amp;ap-&gt;pdev-&gt;dev,</div><div class='add'>+				       dma_unmap_addr(info, mapping),</div><div class='ctx'> 				       dma_unmap_len(info, maplen),</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='ctx'> 			dma_unmap_len_set(info, maplen, 0);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (skb) {</div><div class='hunk'>@@ -2369,9 +2362,9 @@ ace_map_tx_skb(struct ace_private *ap, struct sk_buff *skb,</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	struct tx_ring_info *info;</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_page(ap-&gt;pdev, virt_to_page(skb-&gt;data),</div><div class='del'>-			       offset_in_page(skb-&gt;data),</div><div class='del'>-			       skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	mapping = dma_map_page(&amp;ap-&gt;pdev-&gt;dev, virt_to_page(skb-&gt;data),</div><div class='add'>+			       offset_in_page(skb-&gt;data), skb-&gt;len,</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	info = ap-&gt;skb-&gt;tx_skbuff + idx;</div><div class='ctx'> 	info-&gt;skb = tail;</div><div class='hunk'>@@ -2442,7 +2435,7 @@ restart:</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dma_addr_t mapping;</div><div class='ctx'> 		u32 vlan_tag = 0;</div><div class='del'>-		int i, len = 0;</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='ctx'> 		mapping = ace_map_tx_skb(ap, skb, NULL, idx);</div><div class='ctx'> 		flagsize = (skb_headlen(skb) &lt;&lt; 16);</div><div class='hunk'>@@ -2461,7 +2454,6 @@ restart:</div><div class='ctx'> 			const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 			struct tx_ring_info *info;</div><div class='ctx'> </div><div class='del'>-			len += skb_frag_size(frag);</div><div class='ctx'> 			info = ap-&gt;skb-&gt;tx_skbuff + idx;</div><div class='ctx'> 			desc = ap-&gt;tx_ring + idx;</div><div class='ctx'> </div><div class='hunk'>@@ -2493,9 +2485,9 @@ restart:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- 	wmb();</div><div class='del'>- 	ap-&gt;tx_prd = idx;</div><div class='del'>- 	ace_set_txprd(regs, ap, idx);</div><div class='add'>+	wmb();</div><div class='add'>+	ap-&gt;tx_prd = idx;</div><div class='add'>+	ace_set_txprd(regs, ap, idx);</div><div class='ctx'> </div><div class='ctx'> 	if (flagsize &amp; BD_FLG_COAL_NOW) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='hunk'>@@ -2547,7 +2539,7 @@ static int ace_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	struct ace_regs __iomem *regs = ap-&gt;regs;</div><div class='ctx'> </div><div class='ctx'> 	writel(new_mtu + ETH_HLEN + 4, &amp;regs-&gt;IfMtu);</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (new_mtu &gt; ACE_STD_MTU) {</div><div class='ctx'> 		if (!(ap-&gt;jumbo)) {</div><div class='hunk'>@@ -2698,13 +2690,12 @@ static void ace_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ace_private *ap = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, "acenic", sizeof(info-&gt;driver));</div><div class='del'>-	snprintf(info-&gt;version, sizeof(info-&gt;version), "%i.%i.%i",</div><div class='del'>-		 ap-&gt;firmware_major, ap-&gt;firmware_minor,</div><div class='del'>-		 ap-&gt;firmware_fix);</div><div class='add'>+	strscpy(info-&gt;driver, "acenic", sizeof(info-&gt;driver));</div><div class='add'>+	snprintf(info-&gt;fw_version, sizeof(info-&gt;version), "%i.%i.%i",</div><div class='add'>+		 ap-&gt;firmware_major, ap-&gt;firmware_minor, ap-&gt;firmware_fix);</div><div class='ctx'> </div><div class='ctx'> 	if (ap-&gt;pdev)</div><div class='del'>-		strlcpy(info-&gt;bus_info, pci_name(ap-&gt;pdev),</div><div class='add'>+		strscpy(info-&gt;bus_info, pci_name(ap-&gt;pdev),</div><div class='ctx'> 			sizeof(info-&gt;bus_info));</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -2717,15 +2708,15 @@ static int ace_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	struct ace_private *ap = netdev_priv(dev);</div><div class='ctx'> 	struct ace_regs __iomem *regs = ap-&gt;regs;</div><div class='ctx'> 	struct sockaddr *addr=p;</div><div class='del'>-	u8 *da;</div><div class='add'>+	const u8 *da;</div><div class='ctx'> 	struct cmd cmd;</div><div class='ctx'> </div><div class='ctx'> 	if(netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data,dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='del'>-	da = (u8 *)dev-&gt;dev_addr;</div><div class='add'>+	da = (const u8 *)dev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	writel(da[0] &lt;&lt; 8 | da[1], &amp;regs-&gt;MacAddrHi);</div><div class='ctx'> 	writel((da[2] &lt;&lt; 24) | (da[3] &lt;&lt; 16) | (da[4] &lt;&lt; 8) | da[5],</div><div class='head'>diff --git a/drivers/net/ethernet/alteon/acenic.h b/drivers/net/ethernet/alteon/acenic.h<br/>index c670067b1541..0e45a97b9c9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alteon/acenic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/alteon/acenic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/alteon/acenic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/alteon/acenic.h</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'> #ifndef _ACENIC_H_</div><div class='ctx'> #define _ACENIC_H_</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Generate TX index update each time, when TX ring is closed.</div><div class='hunk'>@@ -633,6 +633,7 @@ struct ace_skb</div><div class='ctx'>  */</div><div class='ctx'> struct ace_private</div><div class='ctx'> {</div><div class='add'>+	struct net_device	*ndev;		/* backpointer */</div><div class='ctx'> 	struct ace_info		*info;</div><div class='ctx'> 	struct ace_regs	__iomem	*regs;		/* register base */</div><div class='ctx'> 	struct ace_skb		*skb;</div><div class='hunk'>@@ -666,8 +667,8 @@ struct ace_private</div><div class='ctx'> 	struct rx_desc		*rx_mini_ring;</div><div class='ctx'> 	struct rx_desc		*rx_return_ring;</div><div class='ctx'> </div><div class='del'>-	int			tasklet_pending, jumbo;</div><div class='del'>-	struct tasklet_struct	ace_tasklet;</div><div class='add'>+	int			bh_work_pending, jumbo;</div><div class='add'>+	struct work_struct	ace_bh_work;</div><div class='ctx'> </div><div class='ctx'> 	struct event		*evt_ring;</div><div class='ctx'> </div><div class='hunk'>@@ -691,7 +692,6 @@ struct ace_private</div><div class='ctx'> 				__attribute__ ((aligned (SMP_CACHE_BYTES)));</div><div class='ctx'> 	u32			last_tx, last_std_rx, last_mini_rx;</div><div class='ctx'> #endif</div><div class='del'>-	int			pci_using_dac;</div><div class='ctx'> 	u8			firmware_major;</div><div class='ctx'> 	u8			firmware_minor;</div><div class='ctx'> 	u8			firmware_fix;</div><div class='hunk'>@@ -776,7 +776,7 @@ static int ace_open(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t ace_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 				  struct net_device *dev);</div><div class='ctx'> static int ace_close(struct net_device *dev);</div><div class='del'>-static void ace_tasklet(unsigned long dev);</div><div class='add'>+static void ace_bh_work(struct work_struct *work);</div><div class='ctx'> static void ace_dump_trace(struct ace_private *ap);</div><div class='ctx'> static void ace_set_multicast_list(struct net_device *dev);</div><div class='ctx'> static int ace_change_mtu(struct net_device *dev, int new_mtu);</div><div class='head'>diff --git a/drivers/net/ethernet/altera/Kconfig b/drivers/net/ethernet/altera/Kconfig<br/>index 2690c398d2b2..4ef819a9a1ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/altera/Kconfig</a></div><div class='hunk'>@@ -2,8 +2,13 @@</div><div class='ctx'> config ALTERA_TSE</div><div class='ctx'> 	tristate "Altera Triple-Speed Ethernet MAC support"</div><div class='ctx'> 	depends on HAS_DMA</div><div class='add'>+	depends on HAS_IOMEM</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	select PHYLINK</div><div class='add'>+	select PCS_LYNX</div><div class='add'>+	select MDIO_REGMAP</div><div class='add'>+	select REGMAP_MMIO</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Altera Triple-Speed (TSE) Ethernet MAC.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='head'>diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c<br/>index db97170da8c7..7f247ccbe6ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_sgdma.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_sgdma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_sgdma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/altera/altera_sgdma.c</a></div><div class='hunk'>@@ -513,7 +513,7 @@ static int sgdma_txbusy(struct altera_tse_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int delay = 0;</div><div class='ctx'> </div><div class='del'>-	/* if DMA is busy, wait for current transactino to finish */</div><div class='add'>+	/* if DMA is busy, wait for current transaction to finish */</div><div class='ctx'> 	while ((csrrd32(priv-&gt;tx_dma_csr, sgdma_csroffs(status))</div><div class='ctx'> 		&amp; SGDMA_STSREG_BUSY) &amp;&amp; (delay++ &lt; 100))</div><div class='ctx'> 		udelay(1);</div><div class='head'>diff --git a/drivers/net/ethernet/altera/altera_tse.h b/drivers/net/ethernet/altera/altera_tse.h<br/>index f17acfb579a0..e5a56bb989da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_tse.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_tse.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_tse.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/altera/altera_tse.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define ALTERA_TSE_SW_RESET_WATCHDOG_CNTR	10000</div><div class='ctx'> #define ALTERA_TSE_MAC_FIFO_WIDTH		4	/* TX/RX FIFO width in</div><div class='hunk'>@@ -109,17 +110,6 @@</div><div class='ctx'> #define MAC_CMDCFG_DISABLE_READ_TIMEOUT_GET(v)	GET_BIT_VALUE(v, 27)</div><div class='ctx'> #define MAC_CMDCFG_CNT_RESET_GET(v)		GET_BIT_VALUE(v, 31)</div><div class='ctx'> </div><div class='del'>-/* SGMII PCS register addresses</div><div class='del'>- */</div><div class='del'>-#define SGMII_PCS_SCRATCH	0x10</div><div class='del'>-#define SGMII_PCS_REV		0x11</div><div class='del'>-#define SGMII_PCS_LINK_TIMER_0	0x12</div><div class='del'>-#define SGMII_PCS_LINK_TIMER_1	0x13</div><div class='del'>-#define SGMII_PCS_IF_MODE	0x14</div><div class='del'>-#define SGMII_PCS_DIS_READ_TO	0x15</div><div class='del'>-#define SGMII_PCS_READ_TO	0x16</div><div class='del'>-#define SGMII_PCS_SW_RESET_TIMEOUT 100 /* usecs */</div><div class='del'>-</div><div class='ctx'> /* MDIO registers within MAC register Space</div><div class='ctx'>  */</div><div class='ctx'> struct altera_tse_mdio {</div><div class='hunk'>@@ -411,9 +401,6 @@ struct altera_tse_private {</div><div class='ctx'> 	/* MAC address space */</div><div class='ctx'> 	struct altera_tse_mac __iomem *mac_dev;</div><div class='ctx'> </div><div class='del'>-	/* TSE Revision */</div><div class='del'>-	u32	revision;</div><div class='del'>-</div><div class='ctx'> 	/* mSGDMA Rx Dispatcher address space */</div><div class='ctx'> 	void __iomem *rx_dma_csr;</div><div class='ctx'> 	void __iomem *rx_dma_desc;</div><div class='hunk'>@@ -423,6 +410,9 @@ struct altera_tse_private {</div><div class='ctx'> 	void __iomem *tx_dma_csr;</div><div class='ctx'> 	void __iomem *tx_dma_desc;</div><div class='ctx'> </div><div class='add'>+	/* SGMII PCS address space */</div><div class='add'>+	void __iomem *pcs_base;</div><div class='add'>+</div><div class='ctx'> 	/* Rx buffers queue */</div><div class='ctx'> 	struct tse_buffer *rx_ring;</div><div class='ctx'> 	u32 rx_cons;</div><div class='hunk'>@@ -479,7 +469,11 @@ struct altera_tse_private {</div><div class='ctx'> 	/* ethtool msglvl option */</div><div class='ctx'> 	u32 msg_enable;</div><div class='ctx'> </div><div class='del'>-	struct altera_dmaops *dmaops;</div><div class='add'>+	const struct altera_dmaops *dmaops;</div><div class='add'>+</div><div class='add'>+	struct phylink *phylink;</div><div class='add'>+	struct phylink_config phylink_config;</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Function prototypes</div><div class='head'>diff --git a/drivers/net/ethernet/altera/altera_tse_ethtool.c b/drivers/net/ethernet/altera/altera_tse_ethtool.c<br/>index 23823464f2e7..81313c85833e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_tse_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_tse_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_tse_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/altera/altera_tse_ethtool.c</a></div><div class='hunk'>@@ -67,7 +67,6 @@ static void tse_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	u32 rev = ioread32(&amp;priv-&gt;mac_dev-&gt;megacore_revision);</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;driver, "altera_tse");</div><div class='del'>-	strcpy(info-&gt;version, "v8.0");</div><div class='ctx'> 	snprintf(info-&gt;fw_version, ETHTOOL_FWVERS_LEN, "v%d.%d",</div><div class='ctx'> 		 rev &amp; 0xFFFF, (rev &amp; 0xFFFF0000) &gt;&gt; 16);</div><div class='ctx'> 	sprintf(info-&gt;bus_info, "platform");</div><div class='hunk'>@@ -200,9 +199,9 @@ static int tse_reglen(struct net_device *dev)</div><div class='ctx'> static void tse_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='ctx'> 			 void *regbuf)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 *buf = regbuf;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Set version to a known value, so ethtool knows</div><div class='ctx'> 	 * how to do any special formatting of this data.</div><div class='hunk'>@@ -222,6 +221,22 @@ static void tse_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='ctx'> 		buf[i] = csrrd32(priv-&gt;mac_dev, i * 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int tse_ethtool_set_link_ksettings(struct net_device *dev,</div><div class='add'>+					  const struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_set(priv-&gt;phylink, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tse_ethtool_get_link_ksettings(struct net_device *dev,</div><div class='add'>+					  struct ethtool_link_ksettings *cmd)</div><div class='add'>+{</div><div class='add'>+	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_get(priv-&gt;phylink, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops tse_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo = tse_get_drvinfo,</div><div class='ctx'> 	.get_regs_len = tse_reglen,</div><div class='hunk'>@@ -232,8 +247,9 @@ static const struct ethtool_ops tse_ethtool_ops = {</div><div class='ctx'> 	.get_ethtool_stats = tse_fill_stats,</div><div class='ctx'> 	.get_msglevel = tse_get_msglevel,</div><div class='ctx'> 	.set_msglevel = tse_set_msglevel,</div><div class='del'>-	.get_link_ksettings = phy_ethtool_get_link_ksettings,</div><div class='del'>-	.set_link_ksettings = phy_ethtool_set_link_ksettings,</div><div class='add'>+	.get_link_ksettings = tse_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings = tse_ethtool_set_link_ksettings,</div><div class='add'>+	.get_ts_info = ethtool_op_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void altera_tse_set_ethtool_ops(struct net_device *netdev)</div><div class='head'>diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c<br/>index bb032be7fe31..ca55c5fd11df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_tse_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_tse_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_tse_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/altera/altera_tse_main.c</a></div><div class='hunk'>@@ -27,13 +27,16 @@</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/mdio/mdio-regmap.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/pcs-lynx.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -72,41 +75,18 @@ MODULE_PARM_DESC(dma_tx_num, "Number of descriptors in the TX list");</div><div class='ctx'>  */</div><div class='ctx'> #define ALTERA_RXDMABUFFER_SIZE	2048</div><div class='ctx'> </div><div class='del'>-/* Allow network stack to resume queueing packets after we've</div><div class='add'>+/* Allow network stack to resume queuing packets after we've</div><div class='ctx'>  * finished transmitting at least 1/4 of the packets in the queue.</div><div class='ctx'>  */</div><div class='ctx'> #define TSE_TX_THRESH(x)	(x-&gt;tx_ring_size / 4)</div><div class='ctx'> </div><div class='ctx'> #define TXQUEUESTOP_THRESHHOLD	2</div><div class='ctx'> </div><div class='del'>-static const struct of_device_id altera_tse_ids[];</div><div class='del'>-</div><div class='ctx'> static inline u32 tse_tx_avail(struct altera_tse_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	return priv-&gt;tx_cons + priv-&gt;tx_ring_size - priv-&gt;tx_prod - 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* PCS Register read/write functions</div><div class='del'>- */</div><div class='del'>-static u16 sgmii_pcs_read(struct altera_tse_private *priv, int regnum)</div><div class='del'>-{</div><div class='del'>-	return csrrd32(priv-&gt;mac_dev,</div><div class='del'>-		       tse_csroffs(mdio_phy0) + regnum * 4) &amp; 0xffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void sgmii_pcs_write(struct altera_tse_private *priv, int regnum,</div><div class='del'>-				u16 value)</div><div class='del'>-{</div><div class='del'>-	csrwr32(value, priv-&gt;mac_dev, tse_csroffs(mdio_phy0) + regnum * 4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Check PCS scratch memory */</div><div class='del'>-static int sgmii_pcs_scratch_test(struct altera_tse_private *priv, u16 value)</div><div class='del'>-{</div><div class='del'>-	sgmii_pcs_write(priv, SGMII_PCS_SCRATCH, value);</div><div class='del'>-	return (sgmii_pcs_read(priv, SGMII_PCS_SCRATCH) == value);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* MDIO specific functions</div><div class='ctx'>  */</div><div class='ctx'> static int altera_tse_mdio_read(struct mii_bus *bus, int mii_id, int regnum)</div><div class='hunk'>@@ -141,10 +121,10 @@ static int altera_tse_mdio_write(struct mii_bus *bus, int mii_id, int regnum,</div><div class='ctx'> static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct device_node *mdio_node = NULL;</div><div class='del'>-	struct mii_bus *mdio = NULL;</div><div class='ctx'> 	struct device_node *child_node = NULL;</div><div class='add'>+	struct mii_bus *mdio = NULL;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	for_each_child_of_node(priv-&gt;device-&gt;of_node, child_node) {</div><div class='ctx'> 		if (of_device_is_compatible(child_node, "altr,tse-mdio")) {</div><div class='hunk'>@@ -163,7 +143,8 @@ static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)</div><div class='ctx'> 	mdio = mdiobus_alloc();</div><div class='ctx'> 	if (mdio == NULL) {</div><div class='ctx'> 		netdev_err(dev, "Error allocating MDIO bus\n");</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto put_node;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mdio-&gt;name = ALTERA_TSE_RESOURCE_NAME;</div><div class='hunk'>@@ -180,6 +161,7 @@ static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)</div><div class='ctx'> 			   mdio-&gt;id);</div><div class='ctx'> 		goto out_free_mdio;</div><div class='ctx'> 	}</div><div class='add'>+	of_node_put(mdio_node);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_drv(priv))</div><div class='ctx'> 		netdev_info(dev, "MDIO bus %s: created\n", mdio-&gt;id);</div><div class='hunk'>@@ -189,6 +171,8 @@ static int altera_tse_mdio_create(struct net_device *dev, unsigned int id)</div><div class='ctx'> out_free_mdio:</div><div class='ctx'> 	mdiobus_free(mdio);</div><div class='ctx'> 	mdio = NULL;</div><div class='add'>+put_node:</div><div class='add'>+	of_node_put(mdio_node);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -232,8 +216,8 @@ static int tse_init_rx_buffer(struct altera_tse_private *priv,</div><div class='ctx'> static void tse_free_rx_buffer(struct altera_tse_private *priv,</div><div class='ctx'> 			       struct tse_buffer *rxbuffer)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb = rxbuffer-&gt;skb;</div><div class='ctx'> 	dma_addr_t dma_addr = rxbuffer-&gt;dma_addr;</div><div class='add'>+	struct sk_buff *skb = rxbuffer-&gt;skb;</div><div class='ctx'> </div><div class='ctx'> 	if (skb != NULL) {</div><div class='ctx'> 		if (dma_addr)</div><div class='hunk'>@@ -354,6 +338,7 @@ static inline void tse_rx_vlan(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethhdr *eth_hdr;</div><div class='ctx'> 	u16 vid;</div><div class='add'>+</div><div class='ctx'> 	if ((dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX) &amp;&amp;</div><div class='ctx'> 	    !__vlan_get_tag(skb, &amp;vid)) {</div><div class='ctx'> 		eth_hdr = (struct ethhdr *)skb-&gt;data;</div><div class='hunk'>@@ -367,10 +352,10 @@ static inline void tse_rx_vlan(struct net_device *dev, struct sk_buff *skb)</div><div class='ctx'>  */</div><div class='ctx'> static int tse_rx(struct altera_tse_private *priv, int limit)</div><div class='ctx'> {</div><div class='del'>-	unsigned int count = 0;</div><div class='add'>+	unsigned int entry = priv-&gt;rx_cons % priv-&gt;rx_ring_size;</div><div class='ctx'> 	unsigned int next_entry;</div><div class='add'>+	unsigned int count = 0;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	unsigned int entry = priv-&gt;rx_cons % priv-&gt;rx_ring_size;</div><div class='ctx'> 	u32 rxstatus;</div><div class='ctx'> 	u16 pktlength;</div><div class='ctx'> 	u16 pktstatus;</div><div class='hunk'>@@ -390,7 +375,7 @@ static int tse_rx(struct altera_tse_private *priv, int limit)</div><div class='ctx'> 				   "RCV pktstatus %08X pktlength %08X\n",</div><div class='ctx'> 				   pktstatus, pktlength);</div><div class='ctx'> </div><div class='del'>-		/* DMA trasfer from TSE starts with 2 aditional bytes for</div><div class='add'>+		/* DMA transfer from TSE starts with 2 additional bytes for</div><div class='ctx'> 		 * IP payload alignment. Status returned by get_rx_status()</div><div class='ctx'> 		 * contains DMA transfer length. Packet is 2 bytes shorter.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -444,10 +429,10 @@ static int tse_rx(struct altera_tse_private *priv, int limit)</div><div class='ctx'> static int tse_tx_complete(struct altera_tse_private *priv)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int txsize = priv-&gt;tx_ring_size;</div><div class='del'>-	u32 ready;</div><div class='del'>-	unsigned int entry;</div><div class='ctx'> 	struct tse_buffer *tx_buff;</div><div class='add'>+	unsigned int entry;</div><div class='ctx'> 	int txcomplete = 0;</div><div class='add'>+	u32 ready;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -493,8 +478,8 @@ static int tse_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv =</div><div class='ctx'> 			container_of(napi, struct altera_tse_private, napi);</div><div class='del'>-	int rxcomplete = 0;</div><div class='ctx'> 	unsigned long int flags;</div><div class='add'>+	int rxcomplete = 0;</div><div class='ctx'> </div><div class='ctx'> 	tse_tx_complete(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -554,16 +539,16 @@ static irqreturn_t altera_isr(int irq, void *dev_id)</div><div class='ctx'>  * physically contiguous fragment starting at</div><div class='ctx'>  * skb-&gt;data, for length of skb_headlen(skb).</div><div class='ctx'>  */</div><div class='del'>-static int tse_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t tse_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned int nopaged_len = skb_headlen(skb);</div><div class='ctx'> 	unsigned int txsize = priv-&gt;tx_ring_size;</div><div class='del'>-	unsigned int entry;</div><div class='del'>-	struct tse_buffer *buffer = NULL;</div><div class='ctx'> 	int nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	unsigned int nopaged_len = skb_headlen(skb);</div><div class='del'>-	enum netdev_tx ret = NETDEV_TX_OK;</div><div class='add'>+	struct tse_buffer *buffer = NULL;</div><div class='add'>+	netdev_tx_t ret = NETDEV_TX_OK;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='add'>+	unsigned int entry;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -615,127 +600,16 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Called every time the controller might need to be made</div><div class='del'>- * aware of new link state.  The PHY code conveys this</div><div class='del'>- * information through variables in the phydev structure, and this</div><div class='del'>- * function converts those variables into the appropriate</div><div class='del'>- * register values, and can bring down the device if needed.</div><div class='del'>- */</div><div class='del'>-static void altera_tse_adjust_link(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-	int new_state = 0;</div><div class='del'>-</div><div class='del'>-	/* only change config if there is a link */</div><div class='del'>-	spin_lock(&amp;priv-&gt;mac_cfg_lock);</div><div class='del'>-	if (phydev-&gt;link) {</div><div class='del'>-		/* Read old config */</div><div class='del'>-		u32 cfg_reg = ioread32(&amp;priv-&gt;mac_dev-&gt;command_config);</div><div class='del'>-</div><div class='del'>-		/* Check duplex */</div><div class='del'>-		if (phydev-&gt;duplex != priv-&gt;oldduplex) {</div><div class='del'>-			new_state = 1;</div><div class='del'>-			if (!(phydev-&gt;duplex))</div><div class='del'>-				cfg_reg |= MAC_CMDCFG_HD_ENA;</div><div class='del'>-			else</div><div class='del'>-				cfg_reg &amp;= ~MAC_CMDCFG_HD_ENA;</div><div class='del'>-</div><div class='del'>-			netdev_dbg(priv-&gt;dev, "%s: Link duplex = 0x%x\n",</div><div class='del'>-				   dev-&gt;name, phydev-&gt;duplex);</div><div class='del'>-</div><div class='del'>-			priv-&gt;oldduplex = phydev-&gt;duplex;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check speed */</div><div class='del'>-		if (phydev-&gt;speed != priv-&gt;oldspeed) {</div><div class='del'>-			new_state = 1;</div><div class='del'>-			switch (phydev-&gt;speed) {</div><div class='del'>-			case 1000:</div><div class='del'>-				cfg_reg |= MAC_CMDCFG_ETH_SPEED;</div><div class='del'>-				cfg_reg &amp;= ~MAC_CMDCFG_ENA_10;</div><div class='del'>-				break;</div><div class='del'>-			case 100:</div><div class='del'>-				cfg_reg &amp;= ~MAC_CMDCFG_ETH_SPEED;</div><div class='del'>-				cfg_reg &amp;= ~MAC_CMDCFG_ENA_10;</div><div class='del'>-				break;</div><div class='del'>-			case 10:</div><div class='del'>-				cfg_reg &amp;= ~MAC_CMDCFG_ETH_SPEED;</div><div class='del'>-				cfg_reg |= MAC_CMDCFG_ENA_10;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				if (netif_msg_link(priv))</div><div class='del'>-					netdev_warn(dev, "Speed (%d) is not 10/100/1000!\n",</div><div class='del'>-						    phydev-&gt;speed);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			priv-&gt;oldspeed = phydev-&gt;speed;</div><div class='del'>-		}</div><div class='del'>-		iowrite32(cfg_reg, &amp;priv-&gt;mac_dev-&gt;command_config);</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;oldlink) {</div><div class='del'>-			new_state = 1;</div><div class='del'>-			priv-&gt;oldlink = 1;</div><div class='del'>-		}</div><div class='del'>-	} else if (priv-&gt;oldlink) {</div><div class='del'>-		new_state = 1;</div><div class='del'>-		priv-&gt;oldlink = 0;</div><div class='del'>-		priv-&gt;oldspeed = 0;</div><div class='del'>-		priv-&gt;oldduplex = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (new_state &amp;&amp; netif_msg_link(priv))</div><div class='del'>-		phy_print_status(phydev);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;priv-&gt;mac_cfg_lock);</div><div class='del'>-}</div><div class='del'>-static struct phy_device *connect_local_phy(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = NULL;</div><div class='del'>-	char phy_id_fmt[MII_BUS_ID_SIZE + 3];</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;phy_addr != POLL_PHY) {</div><div class='del'>-		snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,</div><div class='del'>-			 priv-&gt;mdio-&gt;id, priv-&gt;phy_addr);</div><div class='del'>-</div><div class='del'>-		netdev_dbg(dev, "trying to attach to %s\n", phy_id_fmt);</div><div class='del'>-</div><div class='del'>-		phydev = phy_connect(dev, phy_id_fmt, &amp;altera_tse_adjust_link,</div><div class='del'>-				     priv-&gt;phy_iface);</div><div class='del'>-		if (IS_ERR(phydev)) {</div><div class='del'>-			netdev_err(dev, "Could not attach to PHY\n");</div><div class='del'>-			phydev = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		int ret;</div><div class='del'>-		phydev = phy_find_first(priv-&gt;mdio);</div><div class='del'>-		if (phydev == NULL) {</div><div class='del'>-			netdev_err(dev, "No PHY found\n");</div><div class='del'>-			return phydev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = phy_connect_direct(dev, phydev, &amp;altera_tse_adjust_link,</div><div class='del'>-				priv-&gt;phy_iface);</div><div class='del'>-		if (ret != 0) {</div><div class='del'>-			netdev_err(dev, "Could not attach to PHY\n");</div><div class='del'>-			phydev = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return phydev;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int altera_tse_phy_get_addr_mdio_create(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='ctx'> 	struct device_node *np = priv-&gt;device-&gt;of_node;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;phy_iface = of_get_phy_mode(np);</div><div class='add'>+	ret = of_get_phy_mode(np, &amp;priv-&gt;phy_iface);</div><div class='ctx'> </div><div class='ctx'> 	/* Avoid get phy addr and create mdio if no phy is present */</div><div class='del'>-	if (!priv-&gt;phy_iface)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* try to get PHY address from device tree, use PHY autodetection if</div><div class='hunk'>@@ -764,92 +638,7 @@ static int altera_tse_phy_get_addr_mdio_create(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Initialize driver's PHY state, and attach to the PHY</div><div class='del'>- */</div><div class='del'>-static int init_phy(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	struct device_node *phynode;</div><div class='del'>-	bool fixed_link = false;</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	/* Avoid init phy in case of no phy present */</div><div class='del'>-	if (!priv-&gt;phy_iface)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;oldlink = 0;</div><div class='del'>-	priv-&gt;oldspeed = 0;</div><div class='del'>-	priv-&gt;oldduplex = -1;</div><div class='del'>-</div><div class='del'>-	phynode = of_parse_phandle(priv-&gt;device-&gt;of_node, "phy-handle", 0);</div><div class='del'>-</div><div class='del'>-	if (!phynode) {</div><div class='del'>-		/* check if a fixed-link is defined in device-tree */</div><div class='del'>-		if (of_phy_is_fixed_link(priv-&gt;device-&gt;of_node)) {</div><div class='del'>-			rc = of_phy_register_fixed_link(priv-&gt;device-&gt;of_node);</div><div class='del'>-			if (rc &lt; 0) {</div><div class='del'>-				netdev_err(dev, "cannot register fixed PHY\n");</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* In the case of a fixed PHY, the DT node associated</div><div class='del'>-			 * to the PHY is the Ethernet MAC DT node.</div><div class='del'>-			 */</div><div class='del'>-			phynode = of_node_get(priv-&gt;device-&gt;of_node);</div><div class='del'>-			fixed_link = true;</div><div class='del'>-</div><div class='del'>-			netdev_dbg(dev, "fixed-link detected\n");</div><div class='del'>-			phydev = of_phy_connect(dev, phynode,</div><div class='del'>-						&amp;altera_tse_adjust_link,</div><div class='del'>-						0, priv-&gt;phy_iface);</div><div class='del'>-		} else {</div><div class='del'>-			netdev_dbg(dev, "no phy-handle found\n");</div><div class='del'>-			if (!priv-&gt;mdio) {</div><div class='del'>-				netdev_err(dev, "No phy-handle nor local mdio specified\n");</div><div class='del'>-				return -ENODEV;</div><div class='del'>-			}</div><div class='del'>-			phydev = connect_local_phy(dev);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		netdev_dbg(dev, "phy-handle found\n");</div><div class='del'>-		phydev = of_phy_connect(dev, phynode,</div><div class='del'>-			&amp;altera_tse_adjust_link, 0, priv-&gt;phy_iface);</div><div class='del'>-	}</div><div class='del'>-	of_node_put(phynode);</div><div class='del'>-</div><div class='del'>-	if (!phydev) {</div><div class='del'>-		netdev_err(dev, "Could not find the PHY\n");</div><div class='del'>-		if (fixed_link)</div><div class='del'>-			of_phy_deregister_fixed_link(priv-&gt;device-&gt;of_node);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Stop Advertising 1000BASE Capability if interface is not GMII</div><div class='del'>-	 */</div><div class='del'>-	if ((priv-&gt;phy_iface == PHY_INTERFACE_MODE_MII) ||</div><div class='del'>-	    (priv-&gt;phy_iface == PHY_INTERFACE_MODE_RMII))</div><div class='del'>-		phy_set_max_speed(phydev, SPEED_100);</div><div class='del'>-</div><div class='del'>-	/* Broken HW is sometimes missing the pull-up resistor on the</div><div class='del'>-	 * MDIO line, which results in reads to non-existent devices returning</div><div class='del'>-	 * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent</div><div class='del'>-	 * device as well. If a fixed-link is used the phy_id is always 0.</div><div class='del'>-	 * Note: phydev-&gt;phy_id is the result of reading the UID PHY registers.</div><div class='del'>-	 */</div><div class='del'>-	if ((phydev-&gt;phy_id == 0) &amp;&amp; !fixed_link) {</div><div class='del'>-		netdev_err(dev, "Bad PHY UID 0x%08x\n", phydev-&gt;phy_id);</div><div class='del'>-		phy_disconnect(phydev);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netdev_dbg(dev, "attached to PHY %d UID 0x%08x Link = %d\n",</div><div class='del'>-		   phydev-&gt;mdio.addr, phydev-&gt;phy_id, phydev-&gt;link);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tse_update_mac_addr(struct altera_tse_private *priv, u8 *addr)</div><div class='add'>+static void tse_update_mac_addr(struct altera_tse_private *priv, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 msb;</div><div class='ctx'> 	u32 lsb;</div><div class='hunk'>@@ -999,7 +788,7 @@ static int tse_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	netdev_update_features(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1008,8 +797,8 @@ static int tse_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> static void altera_tse_set_mcfilter(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	int i;</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* clear the hash filter */</div><div class='ctx'> 	for (i = 0; i &lt; 64; i++)</div><div class='hunk'>@@ -1044,7 +833,7 @@ static void altera_tse_set_mcfilterall(struct net_device *dev)</div><div class='ctx'> 		csrwr32(1, priv-&gt;mac_dev, tse_csroffs(hash_table) + i * 4);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set or clear the multicast filter for this adaptor</div><div class='add'>+/* Set or clear the multicast filter for this adapter</div><div class='ctx'>  */</div><div class='ctx'> static void tse_set_rx_mode_hashfilter(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1064,7 +853,7 @@ static void tse_set_rx_mode_hashfilter(struct net_device *dev)</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;mac_cfg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Set or clear the multicast filter for this adaptor</div><div class='add'>+/* Set or clear the multicast filter for this adapter</div><div class='ctx'>  */</div><div class='ctx'> static void tse_set_rx_mode(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1083,74 +872,14 @@ static void tse_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;mac_cfg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Initialise (if necessary) the SGMII PCS component</div><div class='del'>- */</div><div class='del'>-static int init_sgmii_pcs(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	int n;</div><div class='del'>-	unsigned int tmp_reg = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;phy_iface != PHY_INTERFACE_MODE_SGMII)</div><div class='del'>-		return 0; /* Nothing to do, not in SGMII mode */</div><div class='del'>-</div><div class='del'>-	/* The TSE SGMII PCS block looks a little like a PHY, it is</div><div class='del'>-	 * mapped into the zeroth MDIO space of the MAC and it has</div><div class='del'>-	 * ID registers like a PHY would.  Sadly this is often</div><div class='del'>-	 * configured to zeroes, so don't be surprised if it does</div><div class='del'>-	 * show 0x00000000.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (sgmii_pcs_scratch_test(priv, 0x0000) &amp;&amp;</div><div class='del'>-		sgmii_pcs_scratch_test(priv, 0xffff) &amp;&amp;</div><div class='del'>-		sgmii_pcs_scratch_test(priv, 0xa5a5) &amp;&amp;</div><div class='del'>-		sgmii_pcs_scratch_test(priv, 0x5a5a)) {</div><div class='del'>-		netdev_info(dev, "PCS PHY ID: 0x%04x%04x\n",</div><div class='del'>-				sgmii_pcs_read(priv, MII_PHYSID1),</div><div class='del'>-				sgmii_pcs_read(priv, MII_PHYSID2));</div><div class='del'>-	} else {</div><div class='del'>-		netdev_err(dev, "SGMII PCS Scratch memory test failed.\n");</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Starting on page 5-29 of the MegaCore Function User Guide</div><div class='del'>-	 * Set SGMII Link timer to 1.6ms</div><div class='del'>-	 */</div><div class='del'>-	sgmii_pcs_write(priv, SGMII_PCS_LINK_TIMER_0, 0x0D40);</div><div class='del'>-	sgmii_pcs_write(priv, SGMII_PCS_LINK_TIMER_1, 0x03);</div><div class='del'>-</div><div class='del'>-	/* Enable SGMII Interface and Enable SGMII Auto Negotiation */</div><div class='del'>-	sgmii_pcs_write(priv, SGMII_PCS_IF_MODE, 0x3);</div><div class='del'>-</div><div class='del'>-	/* Enable Autonegotiation */</div><div class='del'>-	tmp_reg = sgmii_pcs_read(priv, MII_BMCR);</div><div class='del'>-	tmp_reg |= (BMCR_SPEED1000 | BMCR_FULLDPLX | BMCR_ANENABLE);</div><div class='del'>-	sgmii_pcs_write(priv, MII_BMCR, tmp_reg);</div><div class='del'>-</div><div class='del'>-	/* Reset PCS block */</div><div class='del'>-	tmp_reg |= BMCR_RESET;</div><div class='del'>-	sgmii_pcs_write(priv, MII_BMCR, tmp_reg);</div><div class='del'>-	for (n = 0; n &lt; SGMII_PCS_SW_RESET_TIMEOUT; n++) {</div><div class='del'>-		if (!(sgmii_pcs_read(priv, MII_BMCR) &amp; BMCR_RESET)) {</div><div class='del'>-			netdev_info(dev, "SGMII PCS block initialised OK\n");</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We failed to reset the block, return a timeout */</div><div class='del'>-	netdev_err(dev, "SGMII PCS block reset failed.\n");</div><div class='del'>-	return -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Open and initialize the interface</div><div class='ctx'>  */</div><div class='ctx'> static int tse_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	int i;</div><div class='del'>-	unsigned long int flags;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset and configure TSE MAC and probe associated PHY */</div><div class='ctx'> 	ret = priv-&gt;dmaops-&gt;init_dma(priv);</div><div class='hunk'>@@ -1163,18 +892,7 @@ static int tse_open(struct net_device *dev)</div><div class='ctx'> 		netdev_warn(dev, "device MAC address %pM\n",</div><div class='ctx'> 			    dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	if ((priv-&gt;revision &lt; 0xd00) || (priv-&gt;revision &gt; 0xe00))</div><div class='del'>-		netdev_warn(dev, "TSE revision %x\n", priv-&gt;revision);</div><div class='del'>-</div><div class='ctx'> 	spin_lock(&amp;priv-&gt;mac_cfg_lock);</div><div class='del'>-	/* no-op if MAC not operating in SGMII mode*/</div><div class='del'>-	ret = init_sgmii_pcs(dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		netdev_err(dev,</div><div class='del'>-			   "Cannot init the SGMII PCS (error: %d)\n", ret);</div><div class='del'>-		spin_unlock(&amp;priv-&gt;mac_cfg_lock);</div><div class='del'>-		goto phy_error;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ret = reset_mac(priv);</div><div class='ctx'> 	/* Note that reset_mac will fail if the clocks are gated by the PHY</div><div class='hunk'>@@ -1232,8 +950,12 @@ static int tse_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;priv-&gt;rxdma_irq_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;phydev)</div><div class='del'>-		phy_start(dev-&gt;phydev);</div><div class='add'>+	ret = phylink_of_phy_connect(priv-&gt;phylink, priv-&gt;device-&gt;of_node, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(dev, "could not connect phylink (%d)\n", ret);</div><div class='add'>+		goto tx_request_irq_error;</div><div class='add'>+	}</div><div class='add'>+	phylink_start(priv-&gt;phylink);</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;priv-&gt;napi);</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='hunk'>@@ -1261,13 +983,11 @@ phy_error:</div><div class='ctx'> static int tse_shutdown(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(dev);</div><div class='del'>-	int ret;</div><div class='ctx'> 	unsigned long int flags;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Stop the PHY */</div><div class='del'>-	if (dev-&gt;phydev)</div><div class='del'>-		phy_stop(dev-&gt;phydev);</div><div class='del'>-</div><div class='add'>+	phylink_stop(priv-&gt;phylink);</div><div class='add'>+	phylink_disconnect_phy(priv-&gt;phylink);</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> </div><div class='hunk'>@@ -1313,11 +1033,73 @@ static struct net_device_ops altera_tse_netdev_ops = {</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static void alt_tse_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			       const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct altera_tse_private *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;mac_cfg_lock);</div><div class='add'>+	reset_mac(priv);</div><div class='add'>+	tse_set_mac(priv, true);</div><div class='add'>+	spin_unlock(&amp;priv-&gt;mac_cfg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alt_tse_mac_link_down(struct phylink_config *config,</div><div class='add'>+				  unsigned int mode, phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void alt_tse_mac_link_up(struct phylink_config *config,</div><div class='add'>+				struct phy_device *phy, unsigned int mode,</div><div class='add'>+				phy_interface_t interface, int speed,</div><div class='add'>+				int duplex, bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct altera_tse_private *priv = netdev_priv(ndev);</div><div class='add'>+	u32 ctrl;</div><div class='add'>+</div><div class='add'>+	ctrl = csrrd32(priv-&gt;mac_dev, tse_csroffs(command_config));</div><div class='add'>+	ctrl &amp;= ~(MAC_CMDCFG_ENA_10 | MAC_CMDCFG_ETH_SPEED | MAC_CMDCFG_HD_ENA);</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_HALF)</div><div class='add'>+		ctrl |= MAC_CMDCFG_HD_ENA;</div><div class='add'>+</div><div class='add'>+	if (speed == SPEED_1000)</div><div class='add'>+		ctrl |= MAC_CMDCFG_ETH_SPEED;</div><div class='add'>+	else if (speed == SPEED_10)</div><div class='add'>+		ctrl |= MAC_CMDCFG_ENA_10;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;priv-&gt;mac_cfg_lock);</div><div class='add'>+	csrwr32(ctrl, priv-&gt;mac_dev, tse_csroffs(command_config));</div><div class='add'>+	spin_unlock(&amp;priv-&gt;mac_cfg_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *alt_tse_select_pcs(struct phylink_config *config,</div><div class='add'>+					      phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct altera_tse_private *priv = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_SGMII ||</div><div class='add'>+	    interface == PHY_INTERFACE_MODE_1000BASEX)</div><div class='add'>+		return priv-&gt;pcs;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops alt_tse_phylink_ops = {</div><div class='add'>+	.mac_config = alt_tse_mac_config,</div><div class='add'>+	.mac_link_down = alt_tse_mac_link_down,</div><div class='add'>+	.mac_link_up = alt_tse_mac_link_up,</div><div class='add'>+	.mac_select_pcs = alt_tse_select_pcs,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int request_and_map(struct platform_device *pdev, const char *name,</div><div class='ctx'> 			   struct resource **res, void __iomem **ptr)</div><div class='ctx'> {</div><div class='del'>-	struct resource *region;</div><div class='ctx'> 	struct device *device = &amp;pdev-&gt;dev;</div><div class='add'>+	struct resource *region;</div><div class='ctx'> </div><div class='ctx'> 	*res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);</div><div class='ctx'> 	if (*res == NULL) {</div><div class='hunk'>@@ -1332,10 +1114,10 @@ static int request_and_map(struct platform_device *pdev, const char *name,</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*ptr = devm_ioremap_nocache(device, region-&gt;start,</div><div class='add'>+	*ptr = devm_ioremap(device, region-&gt;start,</div><div class='ctx'> 				    resource_size(region));</div><div class='ctx'> 	if (*ptr == NULL) {</div><div class='del'>-		dev_err(device, "ioremap_nocache of %s failed!", name);</div><div class='add'>+		dev_err(device, "ioremap of %s failed!", name);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1346,14 +1128,18 @@ static int request_and_map(struct platform_device *pdev, const char *name,</div><div class='ctx'>  */</div><div class='ctx'> static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	int ret = -ENODEV;</div><div class='add'>+	struct regmap_config pcs_regmap_cfg;</div><div class='add'>+	struct altera_tse_private *priv;</div><div class='add'>+	struct mdio_regmap_config mrc;</div><div class='ctx'> 	struct resource *control_port;</div><div class='add'>+	struct regmap *pcs_regmap;</div><div class='ctx'> 	struct resource *dma_res;</div><div class='del'>-	struct altera_tse_private *priv;</div><div class='del'>-	const unsigned char *macaddr;</div><div class='add'>+	struct resource *pcs_res;</div><div class='add'>+	struct mii_bus *pcs_bus;</div><div class='add'>+	struct net_device *ndev;</div><div class='ctx'> 	void __iomem *descmap;</div><div class='del'>-	const struct of_device_id *of_id = NULL;</div><div class='add'>+	int ret = -ENODEV;</div><div class='add'>+	u32 revision;</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_etherdev(sizeof(struct altera_tse_private));</div><div class='ctx'> 	if (!ndev) {</div><div class='hunk'>@@ -1362,17 +1148,14 @@ static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+	platform_set_drvdata(pdev, ndev);</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='ctx'> 	priv-&gt;device = &amp;pdev-&gt;dev;</div><div class='ctx'> 	priv-&gt;dev = ndev;</div><div class='ctx'> 	priv-&gt;msg_enable = netif_msg_init(debug, default_msg_level);</div><div class='ctx'> </div><div class='del'>-	of_id = of_match_device(altera_tse_ids, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	if (of_id)</div><div class='del'>-		priv-&gt;dmaops = (struct altera_dmaops *)of_id-&gt;data;</div><div class='del'>-</div><div class='add'>+	priv-&gt;dmaops = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;dmaops &amp;&amp;</div><div class='ctx'> 	    priv-&gt;dmaops-&gt;altera_dtype == ALTERA_DTYPE_SGDMA) {</div><div class='hunk'>@@ -1431,16 +1214,19 @@ static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> 		priv-&gt;rxdescmem_busaddr = dma_res-&gt;start;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='add'>+		ret = -ENODEV;</div><div class='ctx'> 		goto err_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!dma_set_mask(priv-&gt;device, DMA_BIT_MASK(priv-&gt;dmaops-&gt;dmamask)))</div><div class='add'>+	if (!dma_set_mask(priv-&gt;device, DMA_BIT_MASK(priv-&gt;dmaops-&gt;dmamask))) {</div><div class='ctx'> 		dma_set_coherent_mask(priv-&gt;device,</div><div class='ctx'> 				      DMA_BIT_MASK(priv-&gt;dmaops-&gt;dmamask));</div><div class='del'>-	else if (!dma_set_mask(priv-&gt;device, DMA_BIT_MASK(32)))</div><div class='add'>+	} else if (!dma_set_mask(priv-&gt;device, DMA_BIT_MASK(32))) {</div><div class='ctx'> 		dma_set_coherent_mask(priv-&gt;device, DMA_BIT_MASK(32));</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EIO;</div><div class='ctx'> 		goto err_free_netdev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* MAC address space */</div><div class='ctx'> 	ret = request_and_map(pdev, "control_port", &amp;control_port,</div><div class='hunk'>@@ -1461,6 +1247,40 @@ static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_free_netdev;</div><div class='ctx'> </div><div class='add'>+	memset(&amp;pcs_regmap_cfg, 0, sizeof(pcs_regmap_cfg));</div><div class='add'>+	memset(&amp;mrc, 0, sizeof(mrc));</div><div class='add'>+	/* SGMII PCS address space. The location can vary depending on how the</div><div class='add'>+	 * IP is integrated. We can have a resource dedicated to it at a specific</div><div class='add'>+	 * address space, but if it's not the case, we fallback to the mdiophy0</div><div class='add'>+	 * from the MAC's address space</div><div class='add'>+	 */</div><div class='add'>+	ret = request_and_map(pdev, "pcs", &amp;pcs_res, &amp;priv-&gt;pcs_base);</div><div class='add'>+	if (ret) {</div><div class='add'>+		/* If we can't find a dedicated resource for the PCS, fallback</div><div class='add'>+		 * to the internal PCS, that has a different address stride</div><div class='add'>+		 */</div><div class='add'>+		priv-&gt;pcs_base = priv-&gt;mac_dev + tse_csroffs(mdio_phy0);</div><div class='add'>+		pcs_regmap_cfg.reg_bits = 32;</div><div class='add'>+		/* Values are MDIO-like values, on 16 bits */</div><div class='add'>+		pcs_regmap_cfg.val_bits = 16;</div><div class='add'>+		pcs_regmap_cfg.reg_shift = REGMAP_UPSHIFT(2);</div><div class='add'>+	} else {</div><div class='add'>+		pcs_regmap_cfg.reg_bits = 16;</div><div class='add'>+		pcs_regmap_cfg.val_bits = 16;</div><div class='add'>+		pcs_regmap_cfg.reg_shift = REGMAP_UPSHIFT(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create a regmap for the PCS so that it can be used by the PCS driver */</div><div class='add'>+	pcs_regmap = devm_regmap_init_mmio(&amp;pdev-&gt;dev, priv-&gt;pcs_base,</div><div class='add'>+					   &amp;pcs_regmap_cfg);</div><div class='add'>+	if (IS_ERR(pcs_regmap)) {</div><div class='add'>+		ret = PTR_ERR(pcs_regmap);</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+	}</div><div class='add'>+	mrc.regmap = pcs_regmap;</div><div class='add'>+	mrc.parent = &amp;pdev-&gt;dev;</div><div class='add'>+	mrc.valid_addr = 0x0;</div><div class='add'>+	mrc.autoscan = false;</div><div class='ctx'> </div><div class='ctx'> 	/* Rx IRQ */</div><div class='ctx'> 	priv-&gt;rx_irq = platform_get_irq_byname(pdev, "rx_irq");</div><div class='hunk'>@@ -1525,10 +1345,8 @@ static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* get default MAC address from device tree */</div><div class='del'>-	macaddr = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-	if (!IS_ERR(macaddr))</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, macaddr);</div><div class='del'>-	else</div><div class='add'>+	ret = of_get_ethdev_address(pdev-&gt;dev.of_node, ndev);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* get phy addr and create mdio */</div><div class='hunk'>@@ -1562,40 +1380,73 @@ static int altera_tse_probe(struct platform_device *pdev)</div><div class='ctx'> 	ndev-&gt;features |= NETIF_F_HW_VLAN_CTAG_RX;</div><div class='ctx'> </div><div class='ctx'> 	/* setup NAPI interface */</div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, tse_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add(ndev, &amp;priv-&gt;napi, tse_poll);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;mac_cfg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;rxdma_irq_lock);</div><div class='ctx'> </div><div class='del'>-	netif_carrier_off(ndev);</div><div class='add'>+	snprintf(mrc.name, MII_BUS_ID_SIZE, "%s-pcs-mii", dev_name(&amp;pdev-&gt;dev));</div><div class='add'>+	pcs_bus = devm_mdio_regmap_register(&amp;pdev-&gt;dev, &amp;mrc);</div><div class='add'>+	if (IS_ERR(pcs_bus)) {</div><div class='add'>+		ret = PTR_ERR(pcs_bus);</div><div class='add'>+		goto err_init_pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;pcs = lynx_pcs_create_mdiodev(pcs_bus, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;pcs)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;pcs);</div><div class='add'>+		goto err_init_pcs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;phylink_config.dev = &amp;ndev-&gt;dev;</div><div class='add'>+	priv-&gt;phylink_config.type = PHYLINK_NETDEV;</div><div class='add'>+	priv-&gt;phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_10 |</div><div class='add'>+						MAC_100 | MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	phy_interface_set_rgmii(priv-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_MII,</div><div class='add'>+		  priv-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+		  priv-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+		  priv-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+		  priv-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	priv-&gt;phylink = phylink_create(&amp;priv-&gt;phylink_config,</div><div class='add'>+				       of_fwnode_handle(priv-&gt;device-&gt;of_node),</div><div class='add'>+				       priv-&gt;phy_iface, &amp;alt_tse_phylink_ops);</div><div class='add'>+	if (IS_ERR(priv-&gt;phylink)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to create phylink\n");</div><div class='add'>+		ret = PTR_ERR(priv-&gt;phylink);</div><div class='add'>+		goto err_init_phylink;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ret = register_netdev(ndev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to register TSE net device\n");</div><div class='ctx'> 		goto err_register_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	platform_set_drvdata(pdev, ndev);</div><div class='add'>+	revision = ioread32(&amp;priv-&gt;mac_dev-&gt;megacore_revision);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;revision = ioread32(&amp;priv-&gt;mac_dev-&gt;megacore_revision);</div><div class='add'>+	if (revision &lt; 0xd00 || revision &gt; 0xe00)</div><div class='add'>+		netdev_warn(ndev, "TSE revision %x\n", revision);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_msg_probe(priv))</div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev, "Altera TSE MAC version %d.%d at 0x%08lx irq %d/%d\n",</div><div class='del'>-			 (priv-&gt;revision &gt;&gt; 8) &amp; 0xff,</div><div class='del'>-			 priv-&gt;revision &amp; 0xff,</div><div class='del'>-			 (unsigned long) control_port-&gt;start, priv-&gt;rx_irq,</div><div class='add'>+			 (revision &gt;&gt; 8) &amp; 0xff, revision &amp; 0xff,</div><div class='add'>+			 (unsigned long)control_port-&gt;start, priv-&gt;rx_irq,</div><div class='ctx'> 			 priv-&gt;tx_irq);</div><div class='ctx'> </div><div class='del'>-	ret = init_phy(ndev);</div><div class='del'>-	if (ret != 0) {</div><div class='del'>-		netdev_err(ndev, "Cannot attach to PHY (error: %d)\n", ret);</div><div class='del'>-		goto err_init_phy;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_init_phy:</div><div class='del'>-	unregister_netdev(ndev);</div><div class='ctx'> err_register_netdev:</div><div class='add'>+	phylink_destroy(priv-&gt;phylink);</div><div class='add'>+err_init_phylink:</div><div class='add'>+	lynx_pcs_destroy(priv-&gt;pcs);</div><div class='add'>+err_init_pcs:</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> 	altera_tse_mdio_destroy(ndev);</div><div class='ctx'> err_free_netdev:</div><div class='hunk'>@@ -1605,24 +1456,18 @@ err_free_netdev:</div><div class='ctx'> </div><div class='ctx'> /* Remove Altera TSE MAC device</div><div class='ctx'>  */</div><div class='del'>-static int altera_tse_remove(struct platform_device *pdev)</div><div class='add'>+static void altera_tse_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct altera_tse_private *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	if (ndev-&gt;phydev) {</div><div class='del'>-		phy_disconnect(ndev-&gt;phydev);</div><div class='del'>-</div><div class='del'>-		if (of_phy_is_fixed_link(priv-&gt;device-&gt;of_node))</div><div class='del'>-			of_phy_deregister_fixed_link(priv-&gt;device-&gt;of_node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	platform_set_drvdata(pdev, NULL);</div><div class='ctx'> 	altera_tse_mdio_destroy(ndev);</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-	free_netdev(ndev);</div><div class='add'>+	phylink_destroy(priv-&gt;phylink);</div><div class='add'>+	lynx_pcs_destroy(priv-&gt;pcs);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	free_netdev(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct altera_dmaops altera_dtype_sgdma = {</div><div class='head'>diff --git a/drivers/net/ethernet/altera/altera_utils.h b/drivers/net/ethernet/altera/altera_utils.h<br/>index b7d772f2dcbb..3c2e32fb7389 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_utils.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/altera/altera_utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/altera/altera_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/altera/altera_utils.h</a></div><div class='hunk'>@@ -3,11 +3,12 @@</div><div class='ctx'>  * Copyright (C) 2014 Altera Corporation. All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-</div><div class='ctx'> #ifndef __ALTERA_UTILS_H__</div><div class='ctx'> #define __ALTERA_UTILS_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='ctx'> void tse_set_bit(void __iomem *ioaddr, size_t offs, u32 bit_mask);</div><div class='ctx'> void tse_clear_bit(void __iomem *ioaddr, size_t offs, u32 bit_mask);</div><div class='ctx'> int tse_bit_is_set(void __iomem *ioaddr, size_t offs, u32 bit_mask);</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/Kconfig b/drivers/net/ethernet/amazon/Kconfig<br/>index 69ca99d8ac26..95dcc3969f0c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config NET_VENDOR_AMAZON</div><div class='ctx'> 	bool "Amazon Devices"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) device belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -19,7 +19,10 @@ if NET_VENDOR_AMAZON</div><div class='ctx'> config ENA_ETHERNET</div><div class='ctx'> 	tristate "Elastic Network Adapter (ENA) support"</div><div class='ctx'> 	depends on PCI_MSI &amp;&amp; !CPU_BIG_ENDIAN</div><div class='del'>-	---help---</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select DIMLIB</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Elastic Network Adapter (ENA)"</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/Makefile b/drivers/net/ethernet/amazon/ena/Makefile<br/>index f1f752a8f7bb..6d8036bc1823 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/Makefile</a></div><div class='hunk'>@@ -5,4 +5,4 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_ENA_ETHERNET) += ena.o</div><div class='ctx'> </div><div class='del'>-ena-y := ena_netdev.o ena_com.o ena_eth_com.o ena_ethtool.o</div><div class='add'>+ena-y := ena_netdev.o ena_com.o ena_eth_com.o ena_ethtool.o ena_xdp.o ena_phc.o ena_devlink.o ena_debugfs.o</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_admin_defs.h b/drivers/net/ethernet/amazon/ena/ena_admin_defs.h<br/>index 9f80b73f90b1..898ecd96b96a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_admin_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_admin_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_admin_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_admin_defs.h</a></div><div class='hunk'>@@ -1,37 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 - 2016 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ENA_ADMIN_H_</div><div class='ctx'> #define _ENA_ADMIN_H_</div><div class='ctx'> </div><div class='add'>+#define ENA_ADMIN_RSS_KEY_PARTS              10</div><div class='add'>+</div><div class='add'>+#define ENA_ADMIN_CUSTOMER_METRICS_SUPPORT_MASK 0x3F</div><div class='add'>+#define ENA_ADMIN_CUSTOMER_METRICS_MIN_SUPPORT_MASK 0x1F</div><div class='add'>+</div><div class='add'>+ /* customer metrics - in correlation with</div><div class='add'>+  * ENA_ADMIN_CUSTOMER_METRICS_SUPPORT_MASK</div><div class='add'>+  */</div><div class='add'>+enum ena_admin_customer_metrics_id {</div><div class='add'>+	ENA_ADMIN_BW_IN_ALLOWANCE_EXCEEDED         = 0,</div><div class='add'>+	ENA_ADMIN_BW_OUT_ALLOWANCE_EXCEEDED        = 1,</div><div class='add'>+	ENA_ADMIN_PPS_ALLOWANCE_EXCEEDED           = 2,</div><div class='add'>+	ENA_ADMIN_CONNTRACK_ALLOWANCE_EXCEEDED     = 3,</div><div class='add'>+	ENA_ADMIN_LINKLOCAL_ALLOWANCE_EXCEEDED     = 4,</div><div class='add'>+	ENA_ADMIN_CONNTRACK_ALLOWANCE_AVAILABLE    = 5,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> enum ena_admin_aq_opcode {</div><div class='ctx'> 	ENA_ADMIN_CREATE_SQ                         = 1,</div><div class='hunk'>@@ -55,23 +44,34 @@ enum ena_admin_aq_completion_status {</div><div class='ctx'> 	ENA_ADMIN_RESOURCE_BUSY                     = 7,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* subcommands for the set/get feature admin commands */</div><div class='ctx'> enum ena_admin_aq_feature_id {</div><div class='ctx'> 	ENA_ADMIN_DEVICE_ATTRIBUTES                 = 1,</div><div class='ctx'> 	ENA_ADMIN_MAX_QUEUES_NUM                    = 2,</div><div class='ctx'> 	ENA_ADMIN_HW_HINTS                          = 3,</div><div class='ctx'> 	ENA_ADMIN_LLQ                               = 4,</div><div class='add'>+	ENA_ADMIN_MAX_QUEUES_EXT                    = 7,</div><div class='ctx'> 	ENA_ADMIN_RSS_HASH_FUNCTION                 = 10,</div><div class='ctx'> 	ENA_ADMIN_STATELESS_OFFLOAD_CONFIG          = 11,</div><div class='del'>-	ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG      = 12,</div><div class='add'>+	ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG      = 12,</div><div class='ctx'> 	ENA_ADMIN_MTU                               = 14,</div><div class='ctx'> 	ENA_ADMIN_RSS_HASH_INPUT                    = 18,</div><div class='ctx'> 	ENA_ADMIN_INTERRUPT_MODERATION              = 20,</div><div class='ctx'> 	ENA_ADMIN_AENQ_CONFIG                       = 26,</div><div class='ctx'> 	ENA_ADMIN_LINK_CONFIG                       = 27,</div><div class='ctx'> 	ENA_ADMIN_HOST_ATTR_CONFIG                  = 28,</div><div class='add'>+	ENA_ADMIN_PHC_CONFIG                        = 29,</div><div class='ctx'> 	ENA_ADMIN_FEATURES_OPCODE_NUM               = 32,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* device capabilities */</div><div class='add'>+enum ena_admin_aq_caps_id {</div><div class='add'>+	ENA_ADMIN_ENI_STATS                         = 0,</div><div class='add'>+	/* ENA SRD customer metrics */</div><div class='add'>+	ENA_ADMIN_ENA_SRD_INFO                      = 1,</div><div class='add'>+	ENA_ADMIN_CUSTOMER_METRICS                  = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum ena_admin_placement_policy_type {</div><div class='ctx'> 	/* descriptors and headers are in host memory */</div><div class='ctx'> 	ENA_ADMIN_PLACEMENT_POLICY_HOST             = 1,</div><div class='hunk'>@@ -116,6 +116,11 @@ enum ena_admin_completion_policy_type {</div><div class='ctx'> enum ena_admin_get_stats_type {</div><div class='ctx'> 	ENA_ADMIN_GET_STATS_TYPE_BASIC              = 0,</div><div class='ctx'> 	ENA_ADMIN_GET_STATS_TYPE_EXTENDED           = 1,</div><div class='add'>+	/* extra HW stats for specific network interface */</div><div class='add'>+	ENA_ADMIN_GET_STATS_TYPE_ENI                = 2,</div><div class='add'>+	/* extra HW stats for ENA SRD */</div><div class='add'>+	ENA_ADMIN_GET_STATS_TYPE_ENA_SRD            = 3,</div><div class='add'>+	ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS   = 4,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ena_admin_get_stats_scope {</div><div class='hunk'>@@ -123,6 +128,24 @@ enum ena_admin_get_stats_scope {</div><div class='ctx'> 	ENA_ADMIN_ETH_TRAFFIC                       = 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ena_admin_phc_type {</div><div class='add'>+	ENA_ADMIN_PHC_TYPE_READLESS                 = 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ena_admin_phc_error_flags {</div><div class='add'>+	ENA_ADMIN_PHC_ERROR_FLAG_TIMESTAMP   = BIT(0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ENA SRD configuration for ENI */</div><div class='add'>+enum ena_admin_ena_srd_flags {</div><div class='add'>+	/* Feature enabled */</div><div class='add'>+	ENA_ADMIN_ENA_SRD_ENABLED                   = BIT(0),</div><div class='add'>+	/* UDP support enabled */</div><div class='add'>+	ENA_ADMIN_ENA_SRD_UDP_ENABLED               = BIT(1),</div><div class='add'>+	/* Bypass Rx UDP ordering */</div><div class='add'>+	ENA_ADMIN_ENA_SRD_UDP_ORDERING_BYPASS_ENABLED = BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ena_admin_aq_common_desc {</div><div class='ctx'> 	/* 11:0 : command_id</div><div class='ctx'> 	 * 15:12 : reserved12</div><div class='hunk'>@@ -192,7 +215,7 @@ struct ena_admin_acq_common_desc {</div><div class='ctx'> 	u16 extended_status;</div><div class='ctx'> </div><div class='ctx'> 	/* indicates to the driver which AQ entry has been consumed by the</div><div class='del'>-	 *    device and could be reused</div><div class='add'>+	 * device and could be reused</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 sq_head_indx;</div><div class='ctx'> };</div><div class='hunk'>@@ -237,8 +260,8 @@ struct ena_admin_aq_create_sq_cmd {</div><div class='ctx'> 	 */</div><div class='ctx'> 	u8 sq_caps_3;</div><div class='ctx'> </div><div class='del'>-	/* associated completion queue id. This CQ must be created prior to</div><div class='del'>-	 *    SQ creation</div><div class='add'>+	/* associated completion queue id. This CQ must be created prior to SQ</div><div class='add'>+	 * creation</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 cq_idx;</div><div class='ctx'> </div><div class='hunk'>@@ -377,9 +400,12 @@ struct ena_admin_aq_get_stats_cmd {</div><div class='ctx'> 	u16 queue_idx;</div><div class='ctx'> </div><div class='ctx'> 	/* device id, value 0xFFFF means mine. only privileged device can get</div><div class='del'>-	 *    stats of other device</div><div class='add'>+	 * stats of other device</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 device_id;</div><div class='add'>+</div><div class='add'>+	/* a bitmap representing the requested metric values */</div><div class='add'>+	u64 requested_metrics;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Basic Statistics Command. */</div><div class='hunk'>@@ -403,12 +429,87 @@ struct ena_admin_basic_stats {</div><div class='ctx'> 	u32 rx_drops_low;</div><div class='ctx'> </div><div class='ctx'> 	u32 rx_drops_high;</div><div class='add'>+</div><div class='add'>+	u32 tx_drops_low;</div><div class='add'>+</div><div class='add'>+	u32 tx_drops_high;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ENI Statistics Command. */</div><div class='add'>+struct ena_admin_eni_stats {</div><div class='add'>+	/* The number of packets shaped due to inbound aggregate BW</div><div class='add'>+	 * allowance being exceeded</div><div class='add'>+	 */</div><div class='add'>+	u64 bw_in_allowance_exceeded;</div><div class='add'>+</div><div class='add'>+	/* The number of packets shaped due to outbound aggregate BW</div><div class='add'>+	 * allowance being exceeded</div><div class='add'>+	 */</div><div class='add'>+	u64 bw_out_allowance_exceeded;</div><div class='add'>+</div><div class='add'>+	/* The number of packets shaped due to PPS allowance being exceeded */</div><div class='add'>+	u64 pps_allowance_exceeded;</div><div class='add'>+</div><div class='add'>+	/* The number of packets shaped due to connection tracking</div><div class='add'>+	 * allowance being exceeded and leading to failure in establishment</div><div class='add'>+	 * of new connections</div><div class='add'>+	 */</div><div class='add'>+	u64 conntrack_allowance_exceeded;</div><div class='add'>+</div><div class='add'>+	/* The number of packets shaped due to linklocal packet rate</div><div class='add'>+	 * allowance being exceeded</div><div class='add'>+	 */</div><div class='add'>+	u64 linklocal_allowance_exceeded;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_admin_ena_srd_stats {</div><div class='add'>+	/* Number of packets transmitted over ENA SRD */</div><div class='add'>+	u64 ena_srd_tx_pkts;</div><div class='add'>+</div><div class='add'>+	/* Number of packets transmitted or could have been</div><div class='add'>+	 * transmitted over ENA SRD</div><div class='add'>+	 */</div><div class='add'>+	u64 ena_srd_eligible_tx_pkts;</div><div class='add'>+</div><div class='add'>+	/* Number of packets received over ENA SRD */</div><div class='add'>+	u64 ena_srd_rx_pkts;</div><div class='add'>+</div><div class='add'>+	/* Percentage of the ENA SRD resources that is in use */</div><div class='add'>+	u64 ena_srd_resource_utilization;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* ENA SRD Statistics Command */</div><div class='add'>+struct ena_admin_ena_srd_info {</div><div class='add'>+	/* ENA SRD configuration bitmap. See ena_admin_ena_srd_flags for</div><div class='add'>+	 * details</div><div class='add'>+	 */</div><div class='add'>+	u64 flags;</div><div class='add'>+</div><div class='add'>+	struct ena_admin_ena_srd_stats ena_srd_stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Customer Metrics Command. */</div><div class='add'>+struct ena_admin_customer_metrics {</div><div class='add'>+	/* A bitmap representing the reported customer metrics according to</div><div class='add'>+	 * the order they are reported</div><div class='add'>+	 */</div><div class='add'>+	u64 reported_metrics;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_acq_get_stats_resp {</div><div class='ctx'> 	struct ena_admin_acq_common_desc acq_common_desc;</div><div class='ctx'> </div><div class='del'>-	struct ena_admin_basic_stats basic_stats;</div><div class='add'>+	union {</div><div class='add'>+		u64 raw[7];</div><div class='add'>+</div><div class='add'>+		struct ena_admin_basic_stats basic_stats;</div><div class='add'>+</div><div class='add'>+		struct ena_admin_eni_stats eni_stats;</div><div class='add'>+</div><div class='add'>+		struct ena_admin_ena_srd_info ena_srd_info;</div><div class='add'>+</div><div class='add'>+		struct ena_admin_customer_metrics customer_metrics;</div><div class='add'>+	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_get_set_feature_common_desc {</div><div class='hunk'>@@ -421,7 +522,13 @@ struct ena_admin_get_set_feature_common_desc {</div><div class='ctx'> 	/* as appears in ena_admin_aq_feature_id */</div><div class='ctx'> 	u8 feature_id;</div><div class='ctx'> </div><div class='del'>-	u16 reserved16;</div><div class='add'>+	/* The driver specifies the max feature version it supports and the</div><div class='add'>+	 * device responds with the currently supported feature version. The</div><div class='add'>+	 * field is zero based</div><div class='add'>+	 */</div><div class='add'>+	u8 feature_version;</div><div class='add'>+</div><div class='add'>+	u8 reserved8;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_device_attr_feature_desc {</div><div class='hunk'>@@ -429,10 +536,15 @@ struct ena_admin_device_attr_feature_desc {</div><div class='ctx'> </div><div class='ctx'> 	u32 device_version;</div><div class='ctx'> </div><div class='del'>-	/* bitmap of ena_admin_aq_feature_id */</div><div class='add'>+	/* bitmap of ena_admin_aq_feature_id, which represents supported</div><div class='add'>+	 * subcommands for the set/get feature admin commands.</div><div class='add'>+	 */</div><div class='ctx'> 	u32 supported_features;</div><div class='ctx'> </div><div class='del'>-	u32 reserved3;</div><div class='add'>+	/* bitmap of ena_admin_aq_caps_id, which represents device</div><div class='add'>+	 * capabilities.</div><div class='add'>+	 */</div><div class='add'>+	u32 capabilities;</div><div class='ctx'> </div><div class='ctx'> 	/* Indicates how many bits are used physical address access. */</div><div class='ctx'> 	u32 phys_addr_width;</div><div class='hunk'>@@ -480,37 +592,65 @@ enum ena_admin_llq_stride_ctrl {</div><div class='ctx'> 	ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY          = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ena_admin_accel_mode_feat {</div><div class='add'>+	ENA_ADMIN_DISABLE_META_CACHING              = 0,</div><div class='add'>+	ENA_ADMIN_LIMIT_TX_BURST                    = 1,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_admin_accel_mode_get {</div><div class='add'>+	/* bit field of enum ena_admin_accel_mode_feat */</div><div class='add'>+	u16 supported_flags;</div><div class='add'>+</div><div class='add'>+	/* maximum burst size between two doorbells. The size is in bytes */</div><div class='add'>+	u16 max_tx_burst_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_admin_accel_mode_set {</div><div class='add'>+	/* bit field of enum ena_admin_accel_mode_feat */</div><div class='add'>+	u16 enabled_flags;</div><div class='add'>+</div><div class='add'>+	u16 reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_admin_accel_mode_req {</div><div class='add'>+	union {</div><div class='add'>+		u32 raw[2];</div><div class='add'>+</div><div class='add'>+		struct ena_admin_accel_mode_get get;</div><div class='add'>+</div><div class='add'>+		struct ena_admin_accel_mode_set set;</div><div class='add'>+	} u;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ena_admin_feature_llq_desc {</div><div class='ctx'> 	u32 max_llq_num;</div><div class='ctx'> </div><div class='ctx'> 	u32 max_llq_depth;</div><div class='ctx'> </div><div class='del'>-	/*  specify the header locations the device supports. bitfield of</div><div class='del'>-	 *    enum ena_admin_llq_header_location.</div><div class='add'>+	/* specify the header locations the device supports. bitfield of enum</div><div class='add'>+	 * ena_admin_llq_header_location.</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 header_location_ctrl_supported;</div><div class='ctx'> </div><div class='ctx'> 	/* the header location the driver selected to use. */</div><div class='ctx'> 	u16 header_location_ctrl_enabled;</div><div class='ctx'> </div><div class='del'>-	/* if inline header is specified - this is the size of descriptor</div><div class='del'>-	 *    list entry. If header in a separate ring is specified - this is</div><div class='del'>-	 *    the size of header ring entry. bitfield of enum</div><div class='del'>-	 *    ena_admin_llq_ring_entry_size. specify the entry sizes the device</div><div class='del'>-	 *    supports</div><div class='add'>+	/* if inline header is specified - this is the size of descriptor list</div><div class='add'>+	 * entry. If header in a separate ring is specified - this is the size</div><div class='add'>+	 * of header ring entry. bitfield of enum ena_admin_llq_ring_entry_size.</div><div class='add'>+	 * specify the entry sizes the device supports</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 entry_size_ctrl_supported;</div><div class='ctx'> </div><div class='ctx'> 	/* the entry size the driver selected to use. */</div><div class='ctx'> 	u16 entry_size_ctrl_enabled;</div><div class='ctx'> </div><div class='del'>-	/* valid only if inline header is specified. First entry associated</div><div class='del'>-	 *    with the packet includes descriptors and header. Rest of the</div><div class='del'>-	 *    entries occupied by descriptors. This parameter defines the max</div><div class='del'>-	 *    number of descriptors precedding the header in the first entry.</div><div class='del'>-	 *    The field is bitfield of enum</div><div class='del'>-	 *    ena_admin_llq_num_descs_before_header and specify the values the</div><div class='del'>-	 *    device supports</div><div class='add'>+	/* valid only if inline header is specified. First entry associated with</div><div class='add'>+	 * the packet includes descriptors and header. Rest of the entries</div><div class='add'>+	 * occupied by descriptors. This parameter defines the max number of</div><div class='add'>+	 * descriptors precedding the header in the first entry. The field is</div><div class='add'>+	 * bitfield of enum ena_admin_llq_num_descs_before_header and specify</div><div class='add'>+	 * the values the device supports</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 desc_num_before_header_supported;</div><div class='ctx'> </div><div class='hunk'>@@ -518,12 +658,48 @@ struct ena_admin_feature_llq_desc {</div><div class='ctx'> 	u16 desc_num_before_header_enabled;</div><div class='ctx'> </div><div class='ctx'> 	/* valid only if inline was chosen. bitfield of enum</div><div class='del'>-	 *    ena_admin_llq_stride_ctrl</div><div class='add'>+	 * ena_admin_llq_stride_ctrl</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 descriptors_stride_ctrl_supported;</div><div class='ctx'> </div><div class='ctx'> 	/* the stride control the driver selected to use */</div><div class='ctx'> 	u16 descriptors_stride_ctrl_enabled;</div><div class='add'>+</div><div class='add'>+	/* reserved */</div><div class='add'>+	u32 reserved1;</div><div class='add'>+</div><div class='add'>+	/* accelerated low latency queues requirement. driver needs to</div><div class='add'>+	 * support those requirements in order to use accelerated llq</div><div class='add'>+	 */</div><div class='add'>+	struct ena_admin_accel_mode_req accel_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_admin_queue_ext_feature_fields {</div><div class='add'>+	u32 max_tx_sq_num;</div><div class='add'>+</div><div class='add'>+	u32 max_tx_cq_num;</div><div class='add'>+</div><div class='add'>+	u32 max_rx_sq_num;</div><div class='add'>+</div><div class='add'>+	u32 max_rx_cq_num;</div><div class='add'>+</div><div class='add'>+	u32 max_tx_sq_depth;</div><div class='add'>+</div><div class='add'>+	u32 max_tx_cq_depth;</div><div class='add'>+</div><div class='add'>+	u32 max_rx_sq_depth;</div><div class='add'>+</div><div class='add'>+	u32 max_rx_cq_depth;</div><div class='add'>+</div><div class='add'>+	u32 max_tx_header_size;</div><div class='add'>+</div><div class='add'>+	/* Maximum Descriptors number, including meta descriptor, allowed for a</div><div class='add'>+	 * single Tx packet</div><div class='add'>+	 */</div><div class='add'>+	u16 max_per_packet_tx_descs;</div><div class='add'>+</div><div class='add'>+	/* Maximum Descriptors number allowed for a single Rx packet */</div><div class='add'>+	u16 max_per_packet_rx_descs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_queue_feature_desc {</div><div class='hunk'>@@ -541,8 +717,8 @@ struct ena_admin_queue_feature_desc {</div><div class='ctx'> </div><div class='ctx'> 	u32 max_header_size;</div><div class='ctx'> </div><div class='del'>-	/* Maximum Descriptors number, including meta descriptor, allowed for</div><div class='del'>-	 *    a single Tx packet</div><div class='add'>+	/* Maximum Descriptors number, including meta descriptor, allowed for a</div><div class='add'>+	 * single Tx packet</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 max_packet_tx_descs;</div><div class='ctx'> </div><div class='hunk'>@@ -630,11 +806,11 @@ enum ena_admin_hash_functions {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_feature_rss_flow_hash_control {</div><div class='del'>-	u32 keys_num;</div><div class='add'>+	u32 key_parts;</div><div class='ctx'> </div><div class='ctx'> 	u32 reserved;</div><div class='ctx'> </div><div class='del'>-	u32 key[10];</div><div class='add'>+	u32 key[ENA_ADMIN_RSS_KEY_PARTS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_feature_rss_flow_hash_function {</div><div class='hunk'>@@ -724,8 +900,8 @@ enum ena_admin_os_type {</div><div class='ctx'> 	ENA_ADMIN_OS_DPDK                           = 3,</div><div class='ctx'> 	ENA_ADMIN_OS_FREEBSD                        = 4,</div><div class='ctx'> 	ENA_ADMIN_OS_IPXE                           = 5,</div><div class='del'>-	ENA_ADMIN_OS_ESXI			    = 6,</div><div class='del'>-	ENA_ADMIN_OS_GROUPS_NUM			    = 6,</div><div class='add'>+	ENA_ADMIN_OS_ESXI                           = 6,</div><div class='add'>+	ENA_ADMIN_OS_GROUPS_NUM                     = 6,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_host_info {</div><div class='hunk'>@@ -768,6 +944,19 @@ struct ena_admin_host_info {</div><div class='ctx'> 	u16 num_cpus;</div><div class='ctx'> </div><div class='ctx'> 	u16 reserved;</div><div class='add'>+</div><div class='add'>+	/* 0 : reserved</div><div class='add'>+	 * 1 : rx_offset</div><div class='add'>+	 * 2 : interrupt_moderation</div><div class='add'>+	 * 3 : rx_buf_mirroring</div><div class='add'>+	 * 4 : rss_configurable_function_key</div><div class='add'>+	 * 5 : reserved</div><div class='add'>+	 * 6 : rx_page_reuse</div><div class='add'>+	 * 7 : reserved</div><div class='add'>+	 * 8 : phc</div><div class='add'>+	 * 31:9 : reserved</div><div class='add'>+	 */</div><div class='add'>+	u32 driver_supported_features;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_rss_ind_table_entry {</div><div class='hunk'>@@ -797,7 +986,7 @@ struct ena_admin_feature_rss_ind_table {</div><div class='ctx'> 	struct ena_admin_rss_ind_table_entry inline_entry;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* When hint value is 0, driver should use it's own predefined value */</div><div class='add'>+/* When hint value is 0, driver should use its own predefined value */</div><div class='ctx'> struct ena_admin_ena_hw_hints {</div><div class='ctx'> 	/* value in ms */</div><div class='ctx'> 	u16 mmio_read_timeout;</div><div class='hunk'>@@ -832,6 +1021,56 @@ struct ena_admin_get_feat_cmd {</div><div class='ctx'> 	u32 raw[11];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ena_admin_queue_ext_feature_desc {</div><div class='add'>+	/* version */</div><div class='add'>+	u8 version;</div><div class='add'>+</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct ena_admin_queue_ext_feature_fields max_queue_ext;</div><div class='add'>+</div><div class='add'>+		u32 raw[10];</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_admin_feature_phc_desc {</div><div class='add'>+	/* PHC type as defined in enum ena_admin_get_phc_type,</div><div class='add'>+	 * used only for GET command.</div><div class='add'>+	 */</div><div class='add'>+	u8 type;</div><div class='add'>+</div><div class='add'>+	/* Reserved - MBZ */</div><div class='add'>+	u8 reserved1[3];</div><div class='add'>+</div><div class='add'>+	/* PHC doorbell address as an offset to PCIe MMIO REG BAR,</div><div class='add'>+	 * used only for GET command.</div><div class='add'>+	 */</div><div class='add'>+	u32 doorbell_offset;</div><div class='add'>+</div><div class='add'>+	/* Max time for valid PHC retrieval, passing this threshold will</div><div class='add'>+	 * fail the get-time request and block PHC requests for</div><div class='add'>+	 * block_timeout_usec, used only for GET command.</div><div class='add'>+	 */</div><div class='add'>+	u32 expire_timeout_usec;</div><div class='add'>+</div><div class='add'>+	/* PHC requests block period, blocking starts if PHC request expired</div><div class='add'>+	 * in order to prevent floods on busy device,</div><div class='add'>+	 * used only for GET command.</div><div class='add'>+	 */</div><div class='add'>+	u32 block_timeout_usec;</div><div class='add'>+</div><div class='add'>+	/* Shared PHC physical address (ena_admin_phc_resp),</div><div class='add'>+	 * used only for SET command.</div><div class='add'>+	 */</div><div class='add'>+	struct ena_common_mem_addr output_address;</div><div class='add'>+</div><div class='add'>+	/* Shared PHC Size (ena_admin_phc_resp),</div><div class='add'>+	 * used only for SET command.</div><div class='add'>+	 */</div><div class='add'>+	u32 output_length;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ena_admin_get_feat_resp {</div><div class='ctx'> 	struct ena_admin_acq_common_desc acq_common_desc;</div><div class='ctx'> </div><div class='hunk'>@@ -844,6 +1083,8 @@ struct ena_admin_get_feat_resp {</div><div class='ctx'> </div><div class='ctx'> 		struct ena_admin_queue_feature_desc max_queue;</div><div class='ctx'> </div><div class='add'>+		struct ena_admin_queue_ext_feature_desc max_queue_ext;</div><div class='add'>+</div><div class='ctx'> 		struct ena_admin_feature_aenq_desc aenq;</div><div class='ctx'> </div><div class='ctx'> 		struct ena_admin_get_feature_link_desc link;</div><div class='hunk'>@@ -859,6 +1100,8 @@ struct ena_admin_get_feat_resp {</div><div class='ctx'> 		struct ena_admin_feature_intr_moder_desc intr_moderation;</div><div class='ctx'> </div><div class='ctx'> 		struct ena_admin_ena_hw_hints hw_hints;</div><div class='add'>+</div><div class='add'>+		struct ena_admin_feature_phc_desc phc;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -892,6 +1135,9 @@ struct ena_admin_set_feat_cmd {</div><div class='ctx'> </div><div class='ctx'> 		/* LLQ configuration */</div><div class='ctx'> 		struct ena_admin_feature_llq_desc llq;</div><div class='add'>+</div><div class='add'>+		/* PHC configuration */</div><div class='add'>+		struct ena_admin_feature_phc_desc phc;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -906,9 +1152,11 @@ struct ena_admin_set_feat_resp {</div><div class='ctx'> struct ena_admin_aenq_common_desc {</div><div class='ctx'> 	u16 group;</div><div class='ctx'> </div><div class='del'>-	u16 syndrom;</div><div class='add'>+	u16 syndrome;</div><div class='ctx'> </div><div class='del'>-	/* 0 : phase */</div><div class='add'>+	/* 0 : phase</div><div class='add'>+	 * 7:1 : reserved - MBZ</div><div class='add'>+	 */</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> </div><div class='ctx'> 	u8 reserved1[3];</div><div class='hunk'>@@ -928,9 +1176,7 @@ enum ena_admin_aenq_group {</div><div class='ctx'> 	ENA_ADMIN_AENQ_GROUPS_NUM                   = 5,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-enum ena_admin_aenq_notification_syndrom {</div><div class='del'>-	ENA_ADMIN_SUSPEND                           = 0,</div><div class='del'>-	ENA_ADMIN_RESUME                            = 1,</div><div class='add'>+enum ena_admin_aenq_notification_syndrome {</div><div class='ctx'> 	ENA_ADMIN_UPDATE_HINTS                      = 2,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -954,6 +1200,10 @@ struct ena_admin_aenq_keep_alive_desc {</div><div class='ctx'> 	u32 rx_drops_low;</div><div class='ctx'> </div><div class='ctx'> 	u32 rx_drops_high;</div><div class='add'>+</div><div class='add'>+	u32 tx_drops_low;</div><div class='add'>+</div><div class='add'>+	u32 tx_drops_high;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_admin_ena_mmio_req_read_less_resp {</div><div class='hunk'>@@ -965,6 +1215,23 @@ struct ena_admin_ena_mmio_req_read_less_resp {</div><div class='ctx'> 	u32 reg_val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ena_admin_phc_resp {</div><div class='add'>+	/* Request Id, received from DB register */</div><div class='add'>+	u16 req_id;</div><div class='add'>+</div><div class='add'>+	u8 reserved1[6];</div><div class='add'>+</div><div class='add'>+	/* PHC timestamp (nsec) */</div><div class='add'>+	u64 timestamp;</div><div class='add'>+</div><div class='add'>+	u8 reserved2[12];</div><div class='add'>+</div><div class='add'>+	/* Bit field of enum ena_admin_phc_error_flags */</div><div class='add'>+	u32 error_flags;</div><div class='add'>+</div><div class='add'>+	u8 reserved3[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* aq_common_desc */</div><div class='ctx'> #define ENA_ADMIN_AQ_COMMON_DESC_COMMAND_ID_MASK            GENMASK(11, 0)</div><div class='ctx'> #define ENA_ADMIN_AQ_COMMON_DESC_PHASE_MASK                 BIT(0)</div><div class='hunk'>@@ -1053,6 +1320,18 @@ struct ena_admin_ena_mmio_req_read_less_resp {</div><div class='ctx'> #define ENA_ADMIN_HOST_INFO_DEVICE_MASK                     GENMASK(7, 3)</div><div class='ctx'> #define ENA_ADMIN_HOST_INFO_BUS_SHIFT                       8</div><div class='ctx'> #define ENA_ADMIN_HOST_INFO_BUS_MASK                        GENMASK(15, 8)</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RX_OFFSET_SHIFT                 1</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RX_OFFSET_MASK                  BIT(1)</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_INTERRUPT_MODERATION_SHIFT      2</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_INTERRUPT_MODERATION_MASK       BIT(2)</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RX_BUF_MIRRORING_SHIFT          3</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RX_BUF_MIRRORING_MASK           BIT(3)</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RSS_CONFIGURABLE_FUNCTION_KEY_SHIFT 4</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RSS_CONFIGURABLE_FUNCTION_KEY_MASK BIT(4)</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RX_PAGE_REUSE_SHIFT             6</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_RX_PAGE_REUSE_MASK              BIT(6)</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_PHC_SHIFT                       8</div><div class='add'>+#define ENA_ADMIN_HOST_INFO_PHC_MASK                        BIT(8)</div><div class='ctx'> </div><div class='ctx'> /* aenq_common_desc */</div><div class='ctx'> #define ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK               BIT(0)</div><div class='hunk'>@@ -1060,4 +1339,4 @@ struct ena_admin_ena_mmio_req_read_less_resp {</div><div class='ctx'> /* aenq_link_change_desc */</div><div class='ctx'> #define ENA_ADMIN_AENQ_LINK_CHANGE_DESC_LINK_STATUS_MASK    BIT(0)</div><div class='ctx'> </div><div class='del'>-#endif /*_ENA_ADMIN_H_ */</div><div class='add'>+#endif /* _ENA_ADMIN_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_com.c b/drivers/net/ethernet/amazon/ena/ena_com.c<br/>index 7f8266b191ae..e67b592e5697 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_com.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_com.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_com.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_com.c</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ena_com.h"</div><div class='hunk'>@@ -62,7 +35,17 @@</div><div class='ctx'> </div><div class='ctx'> #define ENA_REGS_ADMIN_INTR_MASK 1</div><div class='ctx'> </div><div class='del'>-#define ENA_POLL_MS	5</div><div class='add'>+#define ENA_MAX_BACKOFF_DELAY_EXP 16U</div><div class='add'>+</div><div class='add'>+#define ENA_MIN_ADMIN_POLL_US 100</div><div class='add'>+</div><div class='add'>+#define ENA_MAX_ADMIN_POLL_US 5000</div><div class='add'>+</div><div class='add'>+/* PHC definitions */</div><div class='add'>+#define ENA_PHC_DEFAULT_EXPIRE_TIMEOUT_USEC 10</div><div class='add'>+#define ENA_PHC_DEFAULT_BLOCK_TIMEOUT_USEC 1000</div><div class='add'>+#define ENA_PHC_REQ_ID_OFFSET 0xDEAD</div><div class='add'>+#define ENA_PHC_ERROR_FLAGS (ENA_ADMIN_PHC_ERROR_FLAG_TIMESTAMP)</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -91,12 +74,13 @@ struct ena_com_stats_ctx {</div><div class='ctx'> 	struct ena_admin_acq_get_stats_resp get_resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,</div><div class='add'>+static int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				       struct ena_common_mem_addr *ena_addr,</div><div class='ctx'> 				       dma_addr_t addr)</div><div class='ctx'> {</div><div class='ctx'> 	if ((addr &amp; GENMASK_ULL(ena_dev-&gt;dma_addr_bits - 1, 0)) != addr) {</div><div class='del'>-		pr_err("dma address has more bits that the device supports\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "DMA address has more bits that the device supports\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -106,16 +90,16 @@ static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_com_admin_init_sq(struct ena_com_admin_queue *queue)</div><div class='add'>+static int ena_com_admin_init_sq(struct ena_com_admin_queue *admin_queue)</div><div class='ctx'> {</div><div class='del'>-	struct ena_com_admin_sq *sq = &amp;queue-&gt;sq;</div><div class='del'>-	u16 size = ADMIN_SQ_SIZE(queue-&gt;q_depth);</div><div class='add'>+	struct ena_com_dev *ena_dev = admin_queue-&gt;ena_dev;</div><div class='add'>+	struct ena_com_admin_sq *sq = &amp;admin_queue-&gt;sq;</div><div class='add'>+	u16 size = ADMIN_SQ_SIZE(admin_queue-&gt;q_depth);</div><div class='ctx'> </div><div class='del'>-	sq-&gt;entries = dma_alloc_coherent(queue-&gt;q_dmadev, size, &amp;sq-&gt;dma_addr,</div><div class='del'>-					 GFP_KERNEL);</div><div class='add'>+	sq-&gt;entries = dma_alloc_coherent(admin_queue-&gt;q_dmadev, size, &amp;sq-&gt;dma_addr, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!sq-&gt;entries) {</div><div class='del'>-		pr_err("memory allocation failed");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -128,16 +112,16 @@ static int ena_com_admin_init_sq(struct ena_com_admin_queue *queue)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_com_admin_init_cq(struct ena_com_admin_queue *queue)</div><div class='add'>+static int ena_com_admin_init_cq(struct ena_com_admin_queue *admin_queue)</div><div class='ctx'> {</div><div class='del'>-	struct ena_com_admin_cq *cq = &amp;queue-&gt;cq;</div><div class='del'>-	u16 size = ADMIN_CQ_SIZE(queue-&gt;q_depth);</div><div class='add'>+	struct ena_com_dev *ena_dev = admin_queue-&gt;ena_dev;</div><div class='add'>+	struct ena_com_admin_cq *cq = &amp;admin_queue-&gt;cq;</div><div class='add'>+	u16 size = ADMIN_CQ_SIZE(admin_queue-&gt;q_depth);</div><div class='ctx'> </div><div class='del'>-	cq-&gt;entries = dma_alloc_coherent(queue-&gt;q_dmadev, size, &amp;cq-&gt;dma_addr,</div><div class='del'>-					 GFP_KERNEL);</div><div class='add'>+	cq-&gt;entries = dma_alloc_coherent(admin_queue-&gt;q_dmadev, size, &amp;cq-&gt;dma_addr, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!cq-&gt;entries) {</div><div class='del'>-		pr_err("memory allocation failed");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -147,20 +131,19 @@ static int ena_com_admin_init_cq(struct ena_com_admin_queue *queue)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_com_admin_init_aenq(struct ena_com_dev *dev,</div><div class='add'>+static int ena_com_admin_init_aenq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				   struct ena_aenq_handlers *aenq_handlers)</div><div class='ctx'> {</div><div class='del'>-	struct ena_com_aenq *aenq = &amp;dev-&gt;aenq;</div><div class='add'>+	struct ena_com_aenq *aenq = &amp;ena_dev-&gt;aenq;</div><div class='ctx'> 	u32 addr_low, addr_high, aenq_caps;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;aenq.q_depth = ENA_ASYNC_QUEUE_DEPTH;</div><div class='add'>+	ena_dev-&gt;aenq.q_depth = ENA_ASYNC_QUEUE_DEPTH;</div><div class='ctx'> 	size = ADMIN_AENQ_SIZE(ENA_ASYNC_QUEUE_DEPTH);</div><div class='del'>-	aenq-&gt;entries = dma_alloc_coherent(dev-&gt;dmadev, size, &amp;aenq-&gt;dma_addr,</div><div class='del'>-					   GFP_KERNEL);</div><div class='add'>+	aenq-&gt;entries = dma_alloc_coherent(ena_dev-&gt;dmadev, size, &amp;aenq-&gt;dma_addr, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!aenq-&gt;entries) {</div><div class='del'>-		pr_err("memory allocation failed");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -170,18 +153,18 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *dev,</div><div class='ctx'> 	addr_low = ENA_DMA_ADDR_TO_UINT32_LOW(aenq-&gt;dma_addr);</div><div class='ctx'> 	addr_high = ENA_DMA_ADDR_TO_UINT32_HIGH(aenq-&gt;dma_addr);</div><div class='ctx'> </div><div class='del'>-	writel(addr_low, dev-&gt;reg_bar + ENA_REGS_AENQ_BASE_LO_OFF);</div><div class='del'>-	writel(addr_high, dev-&gt;reg_bar + ENA_REGS_AENQ_BASE_HI_OFF);</div><div class='add'>+	writel(addr_low, ena_dev-&gt;reg_bar + ENA_REGS_AENQ_BASE_LO_OFF);</div><div class='add'>+	writel(addr_high, ena_dev-&gt;reg_bar + ENA_REGS_AENQ_BASE_HI_OFF);</div><div class='ctx'> </div><div class='ctx'> 	aenq_caps = 0;</div><div class='del'>-	aenq_caps |= dev-&gt;aenq.q_depth &amp; ENA_REGS_AENQ_CAPS_AENQ_DEPTH_MASK;</div><div class='del'>-	aenq_caps |= (sizeof(struct ena_admin_aenq_entry)</div><div class='del'>-		      &lt;&lt; ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_SHIFT) &amp;</div><div class='del'>-		     ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_MASK;</div><div class='del'>-	writel(aenq_caps, dev-&gt;reg_bar + ENA_REGS_AENQ_CAPS_OFF);</div><div class='add'>+	aenq_caps |= ena_dev-&gt;aenq.q_depth &amp; ENA_REGS_AENQ_CAPS_AENQ_DEPTH_MASK;</div><div class='add'>+	aenq_caps |=</div><div class='add'>+		(sizeof(struct ena_admin_aenq_entry) &lt;&lt; ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_SHIFT) &amp;</div><div class='add'>+		ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_MASK;</div><div class='add'>+	writel(aenq_caps, ena_dev-&gt;reg_bar + ENA_REGS_AENQ_CAPS_OFF);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!aenq_handlers)) {</div><div class='del'>-		pr_err("aenq handlers pointer is NULL\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "AENQ handlers pointer is NULL\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -190,33 +173,39 @@ static int ena_com_admin_init_aenq(struct ena_com_dev *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void comp_ctxt_release(struct ena_com_admin_queue *queue,</div><div class='add'>+static void comp_ctxt_release(struct ena_com_admin_queue *queue,</div><div class='ctx'> 				     struct ena_comp_ctx *comp_ctx)</div><div class='ctx'> {</div><div class='ctx'> 	comp_ctx-&gt;occupied = false;</div><div class='ctx'> 	atomic_dec(&amp;queue-&gt;outstanding_cmds);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *queue,</div><div class='add'>+static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *admin_queue,</div><div class='ctx'> 					  u16 command_id, bool capture)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(command_id &gt;= queue-&gt;q_depth)) {</div><div class='del'>-		pr_err("command id is larger than the queue size. cmd_id: %u queue size %d\n",</div><div class='del'>-		       command_id, queue-&gt;q_depth);</div><div class='add'>+	if (unlikely(command_id &gt;= admin_queue-&gt;q_depth)) {</div><div class='add'>+		netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+			   "Command id is larger than the queue size. cmd_id: %u queue size %d\n",</div><div class='add'>+			   command_id, admin_queue-&gt;q_depth);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(queue-&gt;comp_ctx[command_id].occupied &amp;&amp; capture)) {</div><div class='del'>-		pr_err("Completion context is occupied\n");</div><div class='add'>+	if (unlikely(!admin_queue-&gt;comp_ctx)) {</div><div class='add'>+		netdev_err(admin_queue-&gt;ena_dev-&gt;net_device, "Completion context is NULL\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(admin_queue-&gt;comp_ctx[command_id].occupied &amp;&amp; capture)) {</div><div class='add'>+		netdev_err(admin_queue-&gt;ena_dev-&gt;net_device, "Completion context is occupied\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (capture) {</div><div class='del'>-		atomic_inc(&amp;queue-&gt;outstanding_cmds);</div><div class='del'>-		queue-&gt;comp_ctx[command_id].occupied = true;</div><div class='add'>+		atomic_inc(&amp;admin_queue-&gt;outstanding_cmds);</div><div class='add'>+		admin_queue-&gt;comp_ctx[command_id].occupied = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return &amp;queue-&gt;comp_ctx[command_id];</div><div class='add'>+	return &amp;admin_queue-&gt;comp_ctx[command_id];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,</div><div class='hunk'>@@ -237,7 +226,7 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queu</div><div class='ctx'> 	/* In case of queue FULL */</div><div class='ctx'> 	cnt = (u16)atomic_read(&amp;admin_queue-&gt;outstanding_cmds);</div><div class='ctx'> 	if (cnt &gt;= admin_queue-&gt;q_depth) {</div><div class='del'>-		pr_debug("admin queue is full.\n");</div><div class='add'>+		netdev_dbg(admin_queue-&gt;ena_dev-&gt;net_device, "Admin queue is full.\n");</div><div class='ctx'> 		admin_queue-&gt;stats.out_of_space++;</div><div class='ctx'> 		return ERR_PTR(-ENOSPC);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -277,20 +266,21 @@ static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queu</div><div class='ctx'> 	return comp_ctx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)</div><div class='add'>+static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *admin_queue)</div><div class='ctx'> {</div><div class='del'>-	size_t size = queue-&gt;q_depth * sizeof(struct ena_comp_ctx);</div><div class='add'>+	struct ena_com_dev *ena_dev = admin_queue-&gt;ena_dev;</div><div class='add'>+	size_t size = admin_queue-&gt;q_depth * sizeof(struct ena_comp_ctx);</div><div class='ctx'> 	struct ena_comp_ctx *comp_ctx;</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='del'>-	queue-&gt;comp_ctx = devm_kzalloc(queue-&gt;q_dmadev, size, GFP_KERNEL);</div><div class='del'>-	if (unlikely(!queue-&gt;comp_ctx)) {</div><div class='del'>-		pr_err("memory allocation failed");</div><div class='add'>+	admin_queue-&gt;comp_ctx = devm_kzalloc(admin_queue-&gt;q_dmadev, size, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!admin_queue-&gt;comp_ctx)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; queue-&gt;q_depth; i++) {</div><div class='del'>-		comp_ctx = get_comp_ctxt(queue, i, false);</div><div class='add'>+	for (i = 0; i &lt; admin_queue-&gt;q_depth; i++) {</div><div class='add'>+		comp_ctx = get_comp_ctxt(admin_queue, i, false);</div><div class='ctx'> 		if (comp_ctx)</div><div class='ctx'> 			init_completion(&amp;comp_ctx-&gt;wait_event);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -328,7 +318,6 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			      struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	size_t size;</div><div class='del'>-	int dev_node = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;io_sq-&gt;desc_addr, 0x0, sizeof(io_sq-&gt;desc_addr));</div><div class='ctx'> </div><div class='hunk'>@@ -341,22 +330,17 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	size = io_sq-&gt;desc_entry_size * io_sq-&gt;q_depth;</div><div class='ctx'> </div><div class='ctx'> 	if (io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) {</div><div class='del'>-		dev_node = dev_to_node(ena_dev-&gt;dmadev);</div><div class='del'>-		set_dev_node(ena_dev-&gt;dmadev, ctx-&gt;numa_node);</div><div class='ctx'> 		io_sq-&gt;desc_addr.virt_addr =</div><div class='del'>-			dma_alloc_coherent(ena_dev-&gt;dmadev, size,</div><div class='del'>-					   &amp;io_sq-&gt;desc_addr.phys_addr,</div><div class='add'>+			dma_alloc_coherent(ena_dev-&gt;dmadev, size, &amp;io_sq-&gt;desc_addr.phys_addr,</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='del'>-		set_dev_node(ena_dev-&gt;dmadev, dev_node);</div><div class='ctx'> 		if (!io_sq-&gt;desc_addr.virt_addr) {</div><div class='ctx'> 			io_sq-&gt;desc_addr.virt_addr =</div><div class='ctx'> 				dma_alloc_coherent(ena_dev-&gt;dmadev, size,</div><div class='del'>-						   &amp;io_sq-&gt;desc_addr.phys_addr,</div><div class='del'>-						   GFP_KERNEL);</div><div class='add'>+						   &amp;io_sq-&gt;desc_addr.phys_addr, GFP_KERNEL);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!io_sq-&gt;desc_addr.virt_addr) {</div><div class='del'>-			pr_err("memory allocation failed");</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device, "Memory allocation failed\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -369,20 +353,16 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			ENA_COM_BOUNCE_BUFFER_CNTRL_CNT;</div><div class='ctx'> 		io_sq-&gt;bounce_buf_ctrl.next_to_use = 0;</div><div class='ctx'> </div><div class='del'>-		size = io_sq-&gt;bounce_buf_ctrl.buffer_size *</div><div class='del'>-			 io_sq-&gt;bounce_buf_ctrl.buffers_num;</div><div class='add'>+		size = (size_t)io_sq-&gt;bounce_buf_ctrl.buffer_size *</div><div class='add'>+			io_sq-&gt;bounce_buf_ctrl.buffers_num;</div><div class='ctx'> </div><div class='del'>-		dev_node = dev_to_node(ena_dev-&gt;dmadev);</div><div class='del'>-		set_dev_node(ena_dev-&gt;dmadev, ctx-&gt;numa_node);</div><div class='del'>-		io_sq-&gt;bounce_buf_ctrl.base_buffer =</div><div class='del'>-			devm_kzalloc(ena_dev-&gt;dmadev, size, GFP_KERNEL);</div><div class='del'>-		set_dev_node(ena_dev-&gt;dmadev, dev_node);</div><div class='add'>+		io_sq-&gt;bounce_buf_ctrl.base_buffer = devm_kzalloc(ena_dev-&gt;dmadev, size, GFP_KERNEL);</div><div class='ctx'> 		if (!io_sq-&gt;bounce_buf_ctrl.base_buffer)</div><div class='ctx'> 			io_sq-&gt;bounce_buf_ctrl.base_buffer =</div><div class='ctx'> 				devm_kzalloc(ena_dev-&gt;dmadev, size, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (!io_sq-&gt;bounce_buf_ctrl.base_buffer) {</div><div class='del'>-			pr_err("bounce buffer memory allocation failed");</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device, "Bounce buffer memory allocation failed\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -396,6 +376,12 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 		       0x0, io_sq-&gt;llq_info.desc_list_entry_size);</div><div class='ctx'> 		io_sq-&gt;llq_buf_ctrl.descs_left_in_line =</div><div class='ctx'> 			io_sq-&gt;llq_info.descs_num_before_header;</div><div class='add'>+		io_sq-&gt;disable_meta_caching =</div><div class='add'>+			io_sq-&gt;llq_info.disable_meta_caching;</div><div class='add'>+</div><div class='add'>+		if (io_sq-&gt;llq_info.max_entries_in_tx_burst &gt; 0)</div><div class='add'>+			io_sq-&gt;entries_in_tx_burst_left =</div><div class='add'>+				io_sq-&gt;llq_info.max_entries_in_tx_burst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	io_sq-&gt;tail = 0;</div><div class='hunk'>@@ -410,7 +396,6 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			      struct ena_com_io_cq *io_cq)</div><div class='ctx'> {</div><div class='ctx'> 	size_t size;</div><div class='del'>-	int prev_node = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;io_cq-&gt;cdesc_addr, 0x0, sizeof(io_cq-&gt;cdesc_addr));</div><div class='ctx'> </div><div class='hunk'>@@ -422,21 +407,16 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'> </div><div class='ctx'> 	size = io_cq-&gt;cdesc_entry_size_in_bytes * io_cq-&gt;q_depth;</div><div class='ctx'> </div><div class='del'>-	prev_node = dev_to_node(ena_dev-&gt;dmadev);</div><div class='del'>-	set_dev_node(ena_dev-&gt;dmadev, ctx-&gt;numa_node);</div><div class='ctx'> 	io_cq-&gt;cdesc_addr.virt_addr =</div><div class='del'>-		dma_alloc_coherent(ena_dev-&gt;dmadev, size,</div><div class='del'>-				   &amp;io_cq-&gt;cdesc_addr.phys_addr, GFP_KERNEL);</div><div class='del'>-	set_dev_node(ena_dev-&gt;dmadev, prev_node);</div><div class='add'>+		dma_alloc_coherent(ena_dev-&gt;dmadev, size, &amp;io_cq-&gt;cdesc_addr.phys_addr, GFP_KERNEL);</div><div class='ctx'> 	if (!io_cq-&gt;cdesc_addr.virt_addr) {</div><div class='ctx'> 		io_cq-&gt;cdesc_addr.virt_addr =</div><div class='del'>-			dma_alloc_coherent(ena_dev-&gt;dmadev, size,</div><div class='del'>-					   &amp;io_cq-&gt;cdesc_addr.phys_addr,</div><div class='add'>+			dma_alloc_coherent(ena_dev-&gt;dmadev, size, &amp;io_cq-&gt;cdesc_addr.phys_addr,</div><div class='ctx'> 					   GFP_KERNEL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!io_cq-&gt;cdesc_addr.virt_addr) {</div><div class='del'>-		pr_err("memory allocation failed");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -457,7 +437,8 @@ static void ena_com_handle_single_admin_completion(struct ena_com_admin_queue *a</div><div class='ctx'> </div><div class='ctx'> 	comp_ctx = get_comp_ctxt(admin_queue, cmd_id, false);</div><div class='ctx'> 	if (unlikely(!comp_ctx)) {</div><div class='del'>-		pr_err("comp_ctx is NULL. Changing the admin queue running state\n");</div><div class='add'>+		netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+			   "comp_ctx is NULL. Changing the admin queue running state\n");</div><div class='ctx'> 		admin_queue-&gt;running_state = false;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -509,13 +490,12 @@ static void ena_com_handle_admin_completion(struct ena_com_admin_queue *admin_qu</div><div class='ctx'> 	admin_queue-&gt;stats.completed_cmd += comp_num;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_com_comp_status_to_errno(u8 comp_status)</div><div class='add'>+static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,</div><div class='add'>+					u8 comp_status)</div><div class='ctx'> {</div><div class='ctx'> 	if (unlikely(comp_status != 0))</div><div class='del'>-		pr_err("admin command failed[%u]\n", comp_status);</div><div class='del'>-</div><div class='del'>-	if (unlikely(comp_status &gt; ENA_ADMIN_UNKNOWN_ERROR))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		netdev_err(admin_queue-&gt;ena_dev-&gt;net_device, "Admin command failed[%u]\n",</div><div class='add'>+			   comp_status);</div><div class='ctx'> </div><div class='ctx'> 	switch (comp_status) {</div><div class='ctx'> 	case ENA_ADMIN_SUCCESS:</div><div class='hunk'>@@ -529,9 +509,19 @@ static int ena_com_comp_status_to_errno(u8 comp_status)</div><div class='ctx'> 	case ENA_ADMIN_ILLEGAL_PARAMETER:</div><div class='ctx'> 	case ENA_ADMIN_UNKNOWN_ERROR:</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	case ENA_ADMIN_RESOURCE_BUSY:</div><div class='add'>+		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_delay_exponential_backoff_us(u32 exp, u32 delay_us)</div><div class='add'>+{</div><div class='add'>+	exp = min_t(u32, exp, ENA_MAX_BACKOFF_DELAY_EXP);</div><div class='add'>+	delay_us = max_t(u32, ENA_MIN_ADMIN_POLL_US, delay_us);</div><div class='add'>+	delay_us = min_t(u32, delay_us * (1U &lt;&lt; exp), ENA_MAX_ADMIN_POLL_US);</div><div class='add'>+	usleep_range(delay_us, 2 * delay_us);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_ctx,</div><div class='hunk'>@@ -540,6 +530,7 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> 	unsigned long timeout;</div><div class='ctx'> 	int ret;</div><div class='add'>+	u32 exp = 0;</div><div class='ctx'> </div><div class='ctx'> 	timeout = jiffies + usecs_to_jiffies(admin_queue-&gt;completion_timeout);</div><div class='ctx'> </div><div class='hunk'>@@ -552,7 +543,8 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		if (time_is_before_jiffies(timeout)) {</div><div class='del'>-			pr_err("Wait for completion (polling) timeout\n");</div><div class='add'>+			netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "Wait for completion (polling) timeout\n");</div><div class='ctx'> 			/* ENA didn't have any completion */</div><div class='ctx'> 			spin_lock_irqsave(&amp;admin_queue-&gt;q_lock, flags);</div><div class='ctx'> 			admin_queue-&gt;stats.no_completion++;</div><div class='hunk'>@@ -563,11 +555,12 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		msleep(ENA_POLL_MS);</div><div class='add'>+		ena_delay_exponential_backoff_us(exp++,</div><div class='add'>+						 admin_queue-&gt;ena_dev-&gt;ena_min_poll_delay_us);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(comp_ctx-&gt;status == ENA_CMD_ABORTED)) {</div><div class='del'>-		pr_err("Command was aborted\n");</div><div class='add'>+		netdev_err(admin_queue-&gt;ena_dev-&gt;net_device, "Command was aborted\n");</div><div class='ctx'> 		spin_lock_irqsave(&amp;admin_queue-&gt;q_lock, flags);</div><div class='ctx'> 		admin_queue-&gt;stats.aborted_cmd++;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;admin_queue-&gt;q_lock, flags);</div><div class='hunk'>@@ -575,16 +568,15 @@ static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_c</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	WARN(comp_ctx-&gt;status != ENA_CMD_COMPLETED, "Invalid comp status %d\n",</div><div class='del'>-	     comp_ctx-&gt;status);</div><div class='add'>+	WARN(comp_ctx-&gt;status != ENA_CMD_COMPLETED, "Invalid comp status %d\n", comp_ctx-&gt;status);</div><div class='ctx'> </div><div class='del'>-	ret = ena_com_comp_status_to_errno(comp_ctx-&gt;comp_status);</div><div class='add'>+	ret = ena_com_comp_status_to_errno(admin_queue, comp_ctx-&gt;comp_status);</div><div class='ctx'> err:</div><div class='ctx'> 	comp_ctxt_release(admin_queue, comp_ctx);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Set the LLQ configurations of the firmware</div><div class='ctx'>  *</div><div class='ctx'>  * The driver provides only the enabled feature values to the device,</div><div class='hunk'>@@ -609,6 +601,10 @@ static int ena_com_set_llq(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	cmd.u.llq.desc_num_before_header_enabled = llq_info-&gt;descs_num_before_header;</div><div class='ctx'> 	cmd.u.llq.descriptors_stride_ctrl_enabled = llq_info-&gt;desc_stride_ctrl;</div><div class='ctx'> </div><div class='add'>+	cmd.u.llq.accel_mode.u.set.enabled_flags =</div><div class='add'>+		BIT(ENA_ADMIN_DISABLE_META_CACHING) |</div><div class='add'>+		BIT(ENA_ADMIN_LIMIT_TX_BURST);</div><div class='add'>+</div><div class='ctx'> 	ret = ena_com_execute_admin_command(admin_queue,</div><div class='ctx'> 					    (struct ena_admin_aq_entry *)&amp;cmd,</div><div class='ctx'> 					    sizeof(cmd),</div><div class='hunk'>@@ -616,7 +612,7 @@ static int ena_com_set_llq(struct ena_com_dev *ena_dev)</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to set LLQ configurations: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to set LLQ configurations: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -626,6 +622,7 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				   struct ena_llq_configurations *llq_default_cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_llq_info *llq_info = &amp;ena_dev-&gt;llq_info;</div><div class='add'>+	struct ena_admin_accel_mode_get llq_accel_mode_get;</div><div class='ctx'> 	u16 supported_feat;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -637,8 +634,8 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 		llq_info-&gt;header_location_ctrl =</div><div class='ctx'> 			llq_default_cfg-&gt;llq_header_location;</div><div class='ctx'> 	} else {</div><div class='del'>-		pr_err("Invalid header location control, supported: 0x%x\n",</div><div class='del'>-		       supported_feat);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Invalid header location control, supported: 0x%x\n", supported_feat);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -652,14 +649,16 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			} else if (supported_feat &amp; ENA_ADMIN_SINGLE_DESC_PER_ENTRY) {</div><div class='ctx'> 				llq_info-&gt;desc_stride_ctrl = ENA_ADMIN_SINGLE_DESC_PER_ENTRY;</div><div class='ctx'> 			} else {</div><div class='del'>-				pr_err("Invalid desc_stride_ctrl, supported: 0x%x\n",</div><div class='del'>-				       supported_feat);</div><div class='add'>+				netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+					   "Invalid desc_stride_ctrl, supported: 0x%x\n",</div><div class='add'>+					   supported_feat);</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			pr_err("Default llq stride ctrl is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",</div><div class='del'>-			       llq_default_cfg-&gt;llq_stride_ctrl, supported_feat,</div><div class='del'>-			       llq_info-&gt;desc_stride_ctrl);</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "Default llq stride ctrl is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",</div><div class='add'>+				   llq_default_cfg-&gt;llq_stride_ctrl, supported_feat,</div><div class='add'>+				   llq_info-&gt;desc_stride_ctrl);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		llq_info-&gt;desc_stride_ctrl = 0;</div><div class='hunk'>@@ -680,21 +679,22 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			llq_info-&gt;desc_list_entry_size_ctrl = ENA_ADMIN_LIST_ENTRY_SIZE_256B;</div><div class='ctx'> 			llq_info-&gt;desc_list_entry_size = 256;</div><div class='ctx'> 		} else {</div><div class='del'>-			pr_err("Invalid entry_size_ctrl, supported: 0x%x\n",</div><div class='del'>-			       supported_feat);</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "Invalid entry_size_ctrl, supported: 0x%x\n", supported_feat);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_err("Default llq ring entry size is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",</div><div class='del'>-		       llq_default_cfg-&gt;llq_ring_entry_size, supported_feat,</div><div class='del'>-		       llq_info-&gt;desc_list_entry_size);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Default llq ring entry size is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",</div><div class='add'>+			   llq_default_cfg-&gt;llq_ring_entry_size, supported_feat,</div><div class='add'>+			   llq_info-&gt;desc_list_entry_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (unlikely(llq_info-&gt;desc_list_entry_size &amp; 0x7)) {</div><div class='ctx'> 		/* The desc list entry size should be whole multiply of 8</div><div class='ctx'> 		 * This requirement comes from __iowrite64_copy()</div><div class='ctx'> 		 */</div><div class='del'>-		pr_err("illegal entry size %d\n",</div><div class='del'>-		       llq_info-&gt;desc_list_entry_size);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Illegal entry size %d\n",</div><div class='add'>+			   llq_info-&gt;desc_list_entry_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -717,19 +717,32 @@ static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,</div><div class='ctx'> 		} else if (supported_feat &amp; ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_8) {</div><div class='ctx'> 			llq_info-&gt;descs_num_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_8;</div><div class='ctx'> 		} else {</div><div class='del'>-			pr_err("Invalid descs_num_before_header, supported: 0x%x\n",</div><div class='del'>-			       supported_feat);</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "Invalid descs_num_before_header, supported: 0x%x\n",</div><div class='add'>+				   supported_feat);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pr_err("Default llq num descs before header is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",</div><div class='del'>-		       llq_default_cfg-&gt;llq_num_decs_before_header,</div><div class='del'>-		       supported_feat, llq_info-&gt;descs_num_before_header);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Default llq num descs before header is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",</div><div class='add'>+			   llq_default_cfg-&gt;llq_num_decs_before_header, supported_feat,</div><div class='add'>+			   llq_info-&gt;descs_num_before_header);</div><div class='ctx'> 	}</div><div class='add'>+	/* Check for accelerated queue supported */</div><div class='add'>+	llq_accel_mode_get = llq_features-&gt;accel_mode.u.get;</div><div class='add'>+</div><div class='add'>+	llq_info-&gt;disable_meta_caching =</div><div class='add'>+		!!(llq_accel_mode_get.supported_flags &amp;</div><div class='add'>+		   BIT(ENA_ADMIN_DISABLE_META_CACHING));</div><div class='add'>+</div><div class='add'>+	if (llq_accel_mode_get.supported_flags &amp; BIT(ENA_ADMIN_LIMIT_TX_BURST))</div><div class='add'>+		llq_info-&gt;max_entries_in_tx_burst =</div><div class='add'>+			llq_accel_mode_get.max_tx_burst_size /</div><div class='add'>+			llq_default_cfg-&gt;llq_ring_entry_size_value;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_set_llq(ena_dev);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		pr_err("Cannot set LLQ configuration: %d\n", rc);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Cannot set LLQ configuration: %d\n", rc);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -741,8 +754,7 @@ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *com</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion_timeout(&amp;comp_ctx-&gt;wait_event,</div><div class='del'>-				    usecs_to_jiffies(</div><div class='del'>-					    admin_queue-&gt;completion_timeout));</div><div class='add'>+				    usecs_to_jiffies(admin_queue-&gt;completion_timeout));</div><div class='ctx'> </div><div class='ctx'> 	/* In case the command wasn't completed find out the root cause.</div><div class='ctx'> 	 * There might be 2 kinds of errors</div><div class='hunk'>@@ -755,19 +767,21 @@ static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *com</div><div class='ctx'> 		admin_queue-&gt;stats.no_completion++;</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;admin_queue-&gt;q_lock, flags);</div><div class='ctx'> </div><div class='del'>-		if (comp_ctx-&gt;status == ENA_CMD_COMPLETED)</div><div class='del'>-			pr_err("The ena device have completion but the driver didn't receive any MSI-X interrupt (cmd %d)\n",</div><div class='del'>-			       comp_ctx-&gt;cmd_opcode);</div><div class='del'>-		else</div><div class='del'>-			pr_err("The ena device doesn't send any completion for the admin cmd %d status %d\n",</div><div class='del'>-			       comp_ctx-&gt;cmd_opcode, comp_ctx-&gt;status);</div><div class='del'>-</div><div class='add'>+		if (comp_ctx-&gt;status == ENA_CMD_COMPLETED) {</div><div class='add'>+			netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "The ena device sent a completion but the driver didn't receive a MSI-X interrupt (cmd %d)\n",</div><div class='add'>+				   comp_ctx-&gt;cmd_opcode);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "The ena device didn't send a completion for the admin cmd %d status %d\n",</div><div class='add'>+				   comp_ctx-&gt;cmd_opcode, comp_ctx-&gt;status);</div><div class='add'>+		}</div><div class='ctx'> 		admin_queue-&gt;running_state = false;</div><div class='ctx'> 		ret = -ETIME;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = ena_com_comp_status_to_errno(comp_ctx-&gt;comp_status);</div><div class='add'>+	ret = ena_com_comp_status_to_errno(admin_queue, comp_ctx-&gt;comp_status);</div><div class='ctx'> err:</div><div class='ctx'> 	comp_ctxt_release(admin_queue, comp_ctx);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -814,15 +828,15 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(i == timeout)) {</div><div class='del'>-		pr_err("reading reg failed for timeout. expected: req id[%hu] offset[%hu] actual: req id[%hu] offset[%hu]\n",</div><div class='del'>-		       mmio_read-&gt;seq_num, offset, read_resp-&gt;req_id,</div><div class='del'>-		       read_resp-&gt;reg_off);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Reading reg failed for timeout. expected: req id[%u] offset[%u] actual: req id[%u] offset[%u]\n",</div><div class='add'>+			   mmio_read-&gt;seq_num, offset, read_resp-&gt;req_id, read_resp-&gt;reg_off);</div><div class='ctx'> 		ret = ENA_MMIO_READ_TIMEOUT;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (read_resp-&gt;reg_off != offset) {</div><div class='del'>-		pr_err("Read failure: wrong offset provided");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Read failure: wrong offset provided\n");</div><div class='ctx'> 		ret = ENA_MMIO_READ_TIMEOUT;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = read_resp-&gt;reg_val;</div><div class='hunk'>@@ -881,7 +895,7 @@ static int ena_com_destroy_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 					    sizeof(destroy_resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret &amp;&amp; (ret != -ENODEV)))</div><div class='del'>-		pr_err("failed to destroy io sq error: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to destroy io sq error: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -895,8 +909,7 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	if (io_cq-&gt;cdesc_addr.virt_addr) {</div><div class='ctx'> 		size = io_cq-&gt;cdesc_entry_size_in_bytes * io_cq-&gt;q_depth;</div><div class='ctx'> </div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, size,</div><div class='del'>-				  io_cq-&gt;cdesc_addr.virt_addr,</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, size, io_cq-&gt;cdesc_addr.virt_addr,</div><div class='ctx'> 				  io_cq-&gt;cdesc_addr.phys_addr);</div><div class='ctx'> </div><div class='ctx'> 		io_cq-&gt;cdesc_addr.virt_addr = NULL;</div><div class='hunk'>@@ -905,8 +918,7 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	if (io_sq-&gt;desc_addr.virt_addr) {</div><div class='ctx'> 		size = io_sq-&gt;desc_entry_size * io_sq-&gt;q_depth;</div><div class='ctx'> </div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, size,</div><div class='del'>-				  io_sq-&gt;desc_addr.virt_addr,</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, size, io_sq-&gt;desc_addr.virt_addr,</div><div class='ctx'> 				  io_sq-&gt;desc_addr.phys_addr);</div><div class='ctx'> </div><div class='ctx'> 		io_sq-&gt;desc_addr.virt_addr = NULL;</div><div class='hunk'>@@ -921,16 +933,17 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,</div><div class='ctx'> static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout,</div><div class='ctx'> 				u16 exp_state)</div><div class='ctx'> {</div><div class='del'>-	u32 val, i;</div><div class='add'>+	u32 val, exp = 0;</div><div class='add'>+	unsigned long timeout_stamp;</div><div class='ctx'> </div><div class='del'>-	/* Convert timeout from resolution of 100ms to ENA_POLL_MS */</div><div class='del'>-	timeout = (timeout * 100) / ENA_POLL_MS;</div><div class='add'>+	/* Convert timeout from resolution of 100ms to us resolution. */</div><div class='add'>+	timeout_stamp = jiffies + usecs_to_jiffies(100 * 1000 * timeout);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; timeout; i++) {</div><div class='add'>+	while (1) {</div><div class='ctx'> 		val = ena_com_reg_bar_read32(ena_dev, ENA_REGS_DEV_STS_OFF);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(val == ENA_MMIO_READ_TIMEOUT)) {</div><div class='del'>-			pr_err("Reg read timeout occurred\n");</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device, "Reg read timeout occurred\n");</div><div class='ctx'> 			return -ETIME;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -938,10 +951,11 @@ static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout,</div><div class='ctx'> 			exp_state)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-		msleep(ENA_POLL_MS);</div><div class='del'>-	}</div><div class='add'>+		if (time_is_before_jiffies(timeout_stamp))</div><div class='add'>+			return -ETIME;</div><div class='ctx'> </div><div class='del'>-	return -ETIME;</div><div class='add'>+		ena_delay_exponential_backoff_us(exp++, ena_dev-&gt;ena_min_poll_delay_us);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool ena_com_check_supported_feature_id(struct ena_com_dev *ena_dev,</div><div class='hunk'>@@ -961,14 +975,15 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				  struct ena_admin_get_feat_resp *get_resp,</div><div class='ctx'> 				  enum ena_admin_aq_feature_id feature_id,</div><div class='ctx'> 				  dma_addr_t control_buf_dma_addr,</div><div class='del'>-				  u32 control_buff_size)</div><div class='add'>+				  u32 control_buff_size,</div><div class='add'>+				  u8 feature_ver)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_admin_queue *admin_queue;</div><div class='ctx'> 	struct ena_admin_get_feat_cmd get_cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ena_com_check_supported_feature_id(ena_dev, feature_id)) {</div><div class='del'>-		pr_debug("Feature %d isn't supported\n", feature_id);</div><div class='add'>+		netdev_dbg(ena_dev-&gt;net_device, "Feature %d isn't supported\n", feature_id);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -987,12 +1002,12 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				   &amp;get_cmd.control_buffer.address,</div><div class='ctx'> 				   control_buf_dma_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	get_cmd.control_buffer.length = control_buff_size;</div><div class='del'>-</div><div class='add'>+	get_cmd.feat_common.feature_version = feature_ver;</div><div class='ctx'> 	get_cmd.feat_common.feature_id = feature_id;</div><div class='ctx'> </div><div class='ctx'> 	ret = ena_com_execute_admin_command(admin_queue,</div><div class='hunk'>@@ -1004,30 +1019,51 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,</div><div class='ctx'> 					    sizeof(*get_resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to submit get_feature command %d error: %d\n",</div><div class='del'>-		       feature_id, ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Failed to submit get_feature command %d error: %d\n", feature_id, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ena_com_get_feature(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			       struct ena_admin_get_feat_resp *get_resp,</div><div class='del'>-			       enum ena_admin_aq_feature_id feature_id)</div><div class='add'>+			       enum ena_admin_aq_feature_id feature_id,</div><div class='add'>+			       u8 feature_ver)</div><div class='ctx'> {</div><div class='ctx'> 	return ena_com_get_feature_ex(ena_dev,</div><div class='ctx'> 				      get_resp,</div><div class='ctx'> 				      feature_id,</div><div class='ctx'> 				      0,</div><div class='del'>-				      0);</div><div class='add'>+				      0,</div><div class='add'>+				      feature_ver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_com_get_current_hash_function(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	return ena_dev-&gt;rss.hash_func;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_com_hash_key_fill_default_key(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_admin_feature_rss_flow_hash_control *hash_key =</div><div class='add'>+		(ena_dev-&gt;rss).hash_key;</div><div class='add'>+</div><div class='add'>+	netdev_rss_key_fill(&amp;hash_key-&gt;key, sizeof(hash_key-&gt;key));</div><div class='add'>+	/* The key buffer is stored in the device in an array of</div><div class='add'>+	 * uint32 elements.</div><div class='add'>+	 */</div><div class='add'>+	hash_key-&gt;key_parts = ENA_ADMIN_RSS_KEY_PARTS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ena_com_hash_key_allocate(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='ctx'> </div><div class='del'>-	rss-&gt;hash_key =</div><div class='del'>-		dma_alloc_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_key),</div><div class='del'>-				   &amp;rss-&gt;hash_key_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_HASH_FUNCTION))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rss-&gt;hash_key = dma_alloc_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_key),</div><div class='add'>+					   &amp;rss-&gt;hash_key_dma_addr, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!rss-&gt;hash_key))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1040,8 +1076,8 @@ static void ena_com_hash_key_destroy(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='ctx'> </div><div class='ctx'> 	if (rss-&gt;hash_key)</div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_key),</div><div class='del'>-				  rss-&gt;hash_key, rss-&gt;hash_key_dma_addr);</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_key), rss-&gt;hash_key,</div><div class='add'>+				  rss-&gt;hash_key_dma_addr);</div><div class='ctx'> 	rss-&gt;hash_key = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1049,9 +1085,8 @@ static int ena_com_hash_ctrl_init(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='ctx'> </div><div class='del'>-	rss-&gt;hash_ctrl =</div><div class='del'>-		dma_alloc_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_ctrl),</div><div class='del'>-				   &amp;rss-&gt;hash_ctrl_dma_addr, GFP_KERNEL);</div><div class='add'>+	rss-&gt;hash_ctrl = dma_alloc_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_ctrl),</div><div class='add'>+					    &amp;rss-&gt;hash_ctrl_dma_addr, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!rss-&gt;hash_ctrl))</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1064,8 +1099,8 @@ static void ena_com_hash_ctrl_destroy(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='ctx'> </div><div class='ctx'> 	if (rss-&gt;hash_ctrl)</div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_ctrl),</div><div class='del'>-				  rss-&gt;hash_ctrl, rss-&gt;hash_ctrl_dma_addr);</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, sizeof(*rss-&gt;hash_ctrl), rss-&gt;hash_ctrl,</div><div class='add'>+				  rss-&gt;hash_ctrl_dma_addr);</div><div class='ctx'> 	rss-&gt;hash_ctrl = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1078,30 +1113,29 @@ static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				  ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG);</div><div class='add'>+				  ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG, 0);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if ((get_resp.u.ind_table.min_size &gt; log_size) ||</div><div class='ctx'> 	    (get_resp.u.ind_table.max_size &lt; log_size)) {</div><div class='del'>-		pr_err("indirect table size doesn't fit. requested size: %d while min is:%d and max %d\n",</div><div class='del'>-		       1 &lt;&lt; log_size, 1 &lt;&lt; get_resp.u.ind_table.min_size,</div><div class='del'>-		       1 &lt;&lt; get_resp.u.ind_table.max_size);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Indirect table size doesn't fit. requested size: %d while min is:%d and max %d\n",</div><div class='add'>+			   1 &lt;&lt; log_size, 1 &lt;&lt; get_resp.u.ind_table.min_size,</div><div class='add'>+			   1 &lt;&lt; get_resp.u.ind_table.max_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tbl_size = (1ULL &lt;&lt; log_size) *</div><div class='ctx'> 		sizeof(struct ena_admin_rss_ind_table_entry);</div><div class='ctx'> </div><div class='del'>-	rss-&gt;rss_ind_tbl =</div><div class='del'>-		dma_alloc_coherent(ena_dev-&gt;dmadev, tbl_size,</div><div class='del'>-				   &amp;rss-&gt;rss_ind_tbl_dma_addr, GFP_KERNEL);</div><div class='add'>+	rss-&gt;rss_ind_tbl = dma_alloc_coherent(ena_dev-&gt;dmadev, tbl_size, &amp;rss-&gt;rss_ind_tbl_dma_addr,</div><div class='add'>+					      GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!rss-&gt;rss_ind_tbl))</div><div class='ctx'> 		goto mem_err1;</div><div class='ctx'> </div><div class='ctx'> 	tbl_size = (1ULL &lt;&lt; log_size) * sizeof(u16);</div><div class='del'>-	rss-&gt;host_rss_ind_tbl =</div><div class='del'>-		devm_kzalloc(ena_dev-&gt;dmadev, tbl_size, GFP_KERNEL);</div><div class='add'>+	rss-&gt;host_rss_ind_tbl = devm_kzalloc(ena_dev-&gt;dmadev, tbl_size, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!rss-&gt;host_rss_ind_tbl))</div><div class='ctx'> 		goto mem_err2;</div><div class='ctx'> </div><div class='hunk'>@@ -1113,8 +1147,7 @@ mem_err2:</div><div class='ctx'> 	tbl_size = (1ULL &lt;&lt; log_size) *</div><div class='ctx'> 		sizeof(struct ena_admin_rss_ind_table_entry);</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(ena_dev-&gt;dmadev, tbl_size, rss-&gt;rss_ind_tbl,</div><div class='del'>-			  rss-&gt;rss_ind_tbl_dma_addr);</div><div class='add'>+	dma_free_coherent(ena_dev-&gt;dmadev, tbl_size, rss-&gt;rss_ind_tbl, rss-&gt;rss_ind_tbl_dma_addr);</div><div class='ctx'> 	rss-&gt;rss_ind_tbl = NULL;</div><div class='ctx'> mem_err1:</div><div class='ctx'> 	rss-&gt;tbl_log_size = 0;</div><div class='hunk'>@@ -1177,7 +1210,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 					   &amp;create_cmd.sq_ba,</div><div class='ctx'> 					   io_sq-&gt;desc_addr.phys_addr);</div><div class='ctx'> 		if (unlikely(ret)) {</div><div class='del'>-			pr_err("memory address set failed\n");</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1188,7 +1221,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 					    (struct ena_admin_acq_entry *)&amp;cmd_completion,</div><div class='ctx'> 					    sizeof(cmd_completion));</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("Failed to create IO SQ. error: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to create IO SQ. error: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1198,15 +1231,12 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 		(uintptr_t)cmd_completion.sq_doorbell_offset);</div><div class='ctx'> </div><div class='ctx'> 	if (io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {</div><div class='del'>-		io_sq-&gt;header_addr = (u8 __iomem *)((uintptr_t)ena_dev-&gt;mem_bar</div><div class='del'>-				+ cmd_completion.llq_headers_offset);</div><div class='del'>-</div><div class='ctx'> 		io_sq-&gt;desc_addr.pbuf_dev_addr =</div><div class='ctx'> 			(u8 __iomem *)((uintptr_t)ena_dev-&gt;mem_bar +</div><div class='ctx'> 			cmd_completion.llq_descriptors_offset);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("created sq[%u], depth[%u]\n", io_sq-&gt;idx, io_sq-&gt;q_depth);</div><div class='add'>+	netdev_dbg(ena_dev-&gt;net_device, "Created sq[%u], depth[%u]\n", io_sq-&gt;idx, io_sq-&gt;q_depth);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1234,64 +1264,30 @@ static int ena_com_ind_tbl_convert_to_device(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_com_ind_tbl_convert_from_device(struct ena_com_dev *ena_dev)</div><div class='del'>-{</div><div class='del'>-	u16 dev_idx_to_host_tbl[ENA_TOTAL_NUM_QUEUES] = { (u16)-1 };</div><div class='del'>-	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='del'>-	u8 idx;</div><div class='del'>-	u16 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ENA_TOTAL_NUM_QUEUES; i++)</div><div class='del'>-		dev_idx_to_host_tbl[ena_dev-&gt;io_sq_queues[i].idx] = i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 1 &lt;&lt; rss-&gt;tbl_log_size; i++) {</div><div class='del'>-		if (rss-&gt;rss_ind_tbl[i].cq_idx &gt; ENA_TOTAL_NUM_QUEUES)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		idx = (u8)rss-&gt;rss_ind_tbl[i].cq_idx;</div><div class='del'>-</div><div class='del'>-		if (dev_idx_to_host_tbl[idx] &gt; ENA_TOTAL_NUM_QUEUES)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='del'>-		rss-&gt;host_rss_ind_tbl[i] = dev_idx_to_host_tbl[idx];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ena_com_init_interrupt_moderation_table(struct ena_com_dev *ena_dev)</div><div class='del'>-{</div><div class='del'>-	size_t size;</div><div class='del'>-</div><div class='del'>-	size = sizeof(struct ena_intr_moder_entry) * ENA_INTR_MAX_NUM_OF_LEVELS;</div><div class='del'>-</div><div class='del'>-	ena_dev-&gt;intr_moder_tbl =</div><div class='del'>-		devm_kzalloc(ena_dev-&gt;dmadev, size, GFP_KERNEL);</div><div class='del'>-	if (!ena_dev-&gt;intr_moder_tbl)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	ena_com_config_default_interrupt_moderation_table(ena_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void ena_com_update_intr_delay_resolution(struct ena_com_dev *ena_dev,</div><div class='ctx'> 						 u16 intr_delay_resolution)</div><div class='ctx'> {</div><div class='del'>-	struct ena_intr_moder_entry *intr_moder_tbl = ena_dev-&gt;intr_moder_tbl;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	u16 prev_intr_delay_resolution = ena_dev-&gt;intr_delay_resolution;</div><div class='ctx'> </div><div class='del'>-	if (!intr_delay_resolution) {</div><div class='del'>-		pr_err("Illegal intr_delay_resolution provided. Going to use default 1 usec resolution\n");</div><div class='del'>-		intr_delay_resolution = 1;</div><div class='add'>+	if (unlikely(!intr_delay_resolution)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Illegal intr_delay_resolution provided. Going to use default 1 usec resolution\n");</div><div class='add'>+		intr_delay_resolution = ENA_DEFAULT_INTR_DELAY_RESOLUTION;</div><div class='ctx'> 	}</div><div class='del'>-	ena_dev-&gt;intr_delay_resolution = intr_delay_resolution;</div><div class='ctx'> </div><div class='ctx'> 	/* update Rx */</div><div class='del'>-	for (i = 0; i &lt; ENA_INTR_MAX_NUM_OF_LEVELS; i++)</div><div class='del'>-		intr_moder_tbl[i].intr_moder_interval /= intr_delay_resolution;</div><div class='add'>+	ena_dev-&gt;intr_moder_rx_interval =</div><div class='add'>+		ena_dev-&gt;intr_moder_rx_interval *</div><div class='add'>+		prev_intr_delay_resolution /</div><div class='add'>+		intr_delay_resolution;</div><div class='ctx'> </div><div class='ctx'> 	/* update Tx */</div><div class='del'>-	ena_dev-&gt;intr_moder_tx_interval /= intr_delay_resolution;</div><div class='add'>+	ena_dev-&gt;intr_moder_tx_interval =</div><div class='add'>+		ena_dev-&gt;intr_moder_tx_interval *</div><div class='add'>+		prev_intr_delay_resolution /</div><div class='add'>+		intr_delay_resolution;</div><div class='add'>+</div><div class='add'>+	ena_dev-&gt;intr_delay_resolution = intr_delay_resolution;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -1310,22 +1306,25 @@ int ena_com_execute_admin_command(struct ena_com_admin_queue *admin_queue,</div><div class='ctx'> 	comp_ctx = ena_com_submit_admin_cmd(admin_queue, cmd, cmd_size,</div><div class='ctx'> 					    comp, comp_size);</div><div class='ctx'> 	if (IS_ERR(comp_ctx)) {</div><div class='del'>-		if (comp_ctx == ERR_PTR(-ENODEV))</div><div class='del'>-			pr_debug("Failed to submit command [%ld]\n",</div><div class='del'>-				 PTR_ERR(comp_ctx));</div><div class='add'>+		ret = PTR_ERR(comp_ctx);</div><div class='add'>+		if (ret == -ENODEV)</div><div class='add'>+			netdev_dbg(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "Failed to submit command [%d]\n", ret);</div><div class='ctx'> 		else</div><div class='del'>-			pr_err("Failed to submit command [%ld]\n",</div><div class='del'>-			       PTR_ERR(comp_ctx));</div><div class='add'>+			netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "Failed to submit command [%d]\n", ret);</div><div class='ctx'> </div><div class='del'>-		return PTR_ERR(comp_ctx);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ena_com_wait_and_process_admin_cq(comp_ctx, admin_queue);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='ctx'> 		if (admin_queue-&gt;running_state)</div><div class='del'>-			pr_err("Failed to process command. ret = %d\n", ret);</div><div class='add'>+			netdev_err(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "Failed to process command. ret = %d\n", ret);</div><div class='ctx'> 		else</div><div class='del'>-			pr_debug("Failed to process command. ret = %d\n", ret);</div><div class='add'>+			netdev_dbg(admin_queue-&gt;ena_dev-&gt;net_device,</div><div class='add'>+				   "Failed to process command. ret = %d\n", ret);</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1354,7 +1353,7 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				   &amp;create_cmd.cq_ba,</div><div class='ctx'> 				   io_cq-&gt;cdesc_addr.phys_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1364,7 +1363,7 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 					    (struct ena_admin_acq_entry *)&amp;cmd_completion,</div><div class='ctx'> 					    sizeof(cmd_completion));</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("Failed to create IO CQ. error: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to create IO CQ. error: %d\n", ret);</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1373,17 +1372,12 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	io_cq-&gt;unmask_reg = (u32 __iomem *)((uintptr_t)ena_dev-&gt;reg_bar +</div><div class='ctx'> 		cmd_completion.cq_interrupt_unmask_register_offset);</div><div class='ctx'> </div><div class='del'>-	if (cmd_completion.cq_head_db_register_offset)</div><div class='del'>-		io_cq-&gt;cq_head_db_reg =</div><div class='del'>-			(u32 __iomem *)((uintptr_t)ena_dev-&gt;reg_bar +</div><div class='del'>-			cmd_completion.cq_head_db_register_offset);</div><div class='del'>-</div><div class='ctx'> 	if (cmd_completion.numa_node_register_offset)</div><div class='ctx'> 		io_cq-&gt;numa_node_cfg_reg =</div><div class='ctx'> 			(u32 __iomem *)((uintptr_t)ena_dev-&gt;reg_bar +</div><div class='ctx'> 			cmd_completion.numa_node_register_offset);</div><div class='ctx'> </div><div class='del'>-	pr_debug("created cq[%u], depth[%u]\n", io_cq-&gt;idx, io_cq-&gt;q_depth);</div><div class='add'>+	netdev_dbg(ena_dev-&gt;net_device, "Created cq[%u], depth[%u]\n", io_cq-&gt;idx, io_cq-&gt;q_depth);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1393,8 +1387,8 @@ int ena_com_get_io_handlers(struct ena_com_dev *ena_dev, u16 qid,</div><div class='ctx'> 			    struct ena_com_io_cq **io_cq)</div><div class='ctx'> {</div><div class='ctx'> 	if (qid &gt;= ENA_TOTAL_NUM_QUEUES) {</div><div class='del'>-		pr_err("Invalid queue number %d but the max is %d\n", qid,</div><div class='del'>-		       ENA_TOTAL_NUM_QUEUES);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Invalid queue number %d but the max is %d\n", qid,</div><div class='add'>+			   ENA_TOTAL_NUM_QUEUES);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1428,11 +1422,12 @@ void ena_com_wait_for_abort_completion(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_admin_queue *admin_queue = &amp;ena_dev-&gt;admin_queue;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='add'>+	u32 exp = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;admin_queue-&gt;q_lock, flags);</div><div class='ctx'> 	while (atomic_read(&amp;admin_queue-&gt;outstanding_cmds) != 0) {</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;admin_queue-&gt;q_lock, flags);</div><div class='del'>-		msleep(ENA_POLL_MS);</div><div class='add'>+		ena_delay_exponential_backoff_us(exp++, ena_dev-&gt;ena_min_poll_delay_us);</div><div class='ctx'> 		spin_lock_irqsave(&amp;admin_queue-&gt;q_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;admin_queue-&gt;q_lock, flags);</div><div class='hunk'>@@ -1458,7 +1453,7 @@ int ena_com_destroy_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'> 					    sizeof(destroy_resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret &amp;&amp; (ret != -ENODEV)))</div><div class='del'>-		pr_err("Failed to destroy IO CQ. error: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to destroy IO CQ. error: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1498,15 +1493,16 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)</div><div class='ctx'> 	struct ena_admin_get_feat_resp get_resp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = ena_com_get_feature(ena_dev, &amp;get_resp, ENA_ADMIN_AENQ_CONFIG);</div><div class='add'>+	ret = ena_com_get_feature(ena_dev, &amp;get_resp, ENA_ADMIN_AENQ_CONFIG, 0);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		pr_info("Can't get aenq configuration\n");</div><div class='add'>+		dev_info(ena_dev-&gt;dmadev, "Can't get aenq configuration\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((get_resp.u.aenq.supported_groups &amp; groups_flag) != groups_flag) {</div><div class='del'>-		pr_warn("Trying to set unsupported aenq events. supported flag: 0x%x asked flag: 0x%x\n",</div><div class='del'>-			get_resp.u.aenq.supported_groups, groups_flag);</div><div class='add'>+		netdev_warn(ena_dev-&gt;net_device,</div><div class='add'>+			    "Trying to set unsupported aenq events. supported flag: 0x%x asked flag: 0x%x\n",</div><div class='add'>+			    get_resp.u.aenq.supported_groups, groups_flag);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1525,7 +1521,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to config AENQ ret: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to config AENQ ret: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1533,20 +1529,20 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)</div><div class='ctx'> int ena_com_get_dma_width(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 caps = ena_com_reg_bar_read32(ena_dev, ENA_REGS_CAPS_OFF);</div><div class='del'>-	int width;</div><div class='add'>+	u32 width;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(caps == ENA_MMIO_READ_TIMEOUT)) {</div><div class='del'>-		pr_err("Reg read timeout occurred\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Reg read timeout occurred\n");</div><div class='ctx'> 		return -ETIME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	width = (caps &amp; ENA_REGS_CAPS_DMA_ADDR_WIDTH_MASK) &gt;&gt;</div><div class='ctx'> 		ENA_REGS_CAPS_DMA_ADDR_WIDTH_SHIFT;</div><div class='ctx'> </div><div class='del'>-	pr_debug("ENA dma width: %d\n", width);</div><div class='add'>+	netdev_dbg(ena_dev-&gt;net_device, "ENA dma width: %d\n", width);</div><div class='ctx'> </div><div class='ctx'> 	if ((width &lt; 32) || width &gt; ENA_MAX_PHYS_ADDR_SIZE_BITS) {</div><div class='del'>-		pr_err("DMA width illegal value: %d\n", width);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "DMA width illegal value: %d\n", width);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1568,25 +1564,23 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	ctrl_ver = ena_com_reg_bar_read32(ena_dev,</div><div class='ctx'> 					  ENA_REGS_CONTROLLER_VERSION_OFF);</div><div class='ctx'> </div><div class='del'>-	if (unlikely((ver == ENA_MMIO_READ_TIMEOUT) ||</div><div class='del'>-		     (ctrl_ver == ENA_MMIO_READ_TIMEOUT))) {</div><div class='del'>-		pr_err("Reg read timeout occurred\n");</div><div class='add'>+	if (unlikely((ver == ENA_MMIO_READ_TIMEOUT) || (ctrl_ver == ENA_MMIO_READ_TIMEOUT))) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Reg read timeout occurred\n");</div><div class='ctx'> 		return -ETIME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_info("ena device version: %d.%d\n",</div><div class='del'>-		(ver &amp; ENA_REGS_VERSION_MAJOR_VERSION_MASK) &gt;&gt;</div><div class='del'>-			ENA_REGS_VERSION_MAJOR_VERSION_SHIFT,</div><div class='del'>-		ver &amp; ENA_REGS_VERSION_MINOR_VERSION_MASK);</div><div class='add'>+	dev_info(ena_dev-&gt;dmadev, "ENA device version: %d.%d\n",</div><div class='add'>+		 (ver &amp; ENA_REGS_VERSION_MAJOR_VERSION_MASK) &gt;&gt; ENA_REGS_VERSION_MAJOR_VERSION_SHIFT,</div><div class='add'>+		 ver &amp; ENA_REGS_VERSION_MINOR_VERSION_MASK);</div><div class='ctx'> </div><div class='del'>-	pr_info("ena controller version: %d.%d.%d implementation version %d\n",</div><div class='del'>-		(ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_MASK) &gt;&gt;</div><div class='del'>-			ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_SHIFT,</div><div class='del'>-		(ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_MINOR_VERSION_MASK) &gt;&gt;</div><div class='del'>-			ENA_REGS_CONTROLLER_VERSION_MINOR_VERSION_SHIFT,</div><div class='del'>-		(ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_SUBMINOR_VERSION_MASK),</div><div class='del'>-		(ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_IMPL_ID_MASK) &gt;&gt;</div><div class='del'>-			ENA_REGS_CONTROLLER_VERSION_IMPL_ID_SHIFT);</div><div class='add'>+	dev_info(ena_dev-&gt;dmadev, "ENA controller version: %d.%d.%d implementation version %d\n",</div><div class='add'>+		 (ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_MASK) &gt;&gt;</div><div class='add'>+			 ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_SHIFT,</div><div class='add'>+		 (ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_MINOR_VERSION_MASK) &gt;&gt;</div><div class='add'>+			 ENA_REGS_CONTROLLER_VERSION_MINOR_VERSION_SHIFT,</div><div class='add'>+		 (ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_SUBMINOR_VERSION_MASK),</div><div class='add'>+		 (ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_IMPL_ID_MASK) &gt;&gt;</div><div class='add'>+			 ENA_REGS_CONTROLLER_VERSION_IMPL_ID_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	ctrl_ver_masked =</div><div class='ctx'> 		(ctrl_ver &amp; ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_MASK) |</div><div class='hunk'>@@ -1595,13 +1589,27 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Validate the ctrl version without the implementation ID */</div><div class='ctx'> 	if (ctrl_ver_masked &lt; MIN_ENA_CTRL_VER) {</div><div class='del'>-		pr_err("ENA ctrl version is lower than the minimal ctrl version the driver supports\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "ENA ctrl version is lower than the minimal ctrl version the driver supports\n");</div><div class='ctx'> 		return -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void</div><div class='add'>+ena_com_free_ena_admin_queue_comp_ctx(struct ena_com_dev *ena_dev,</div><div class='add'>+				      struct ena_com_admin_queue *admin_queue)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	if (!admin_queue-&gt;comp_ctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	devm_kfree(ena_dev-&gt;dmadev, admin_queue-&gt;comp_ctx);</div><div class='add'>+</div><div class='add'>+	admin_queue-&gt;comp_ctx = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ena_com_admin_destroy(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_admin_queue *admin_queue = &amp;ena_dev-&gt;admin_queue;</div><div class='hunk'>@@ -1610,25 +1618,21 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	struct ena_com_aenq *aenq = &amp;ena_dev-&gt;aenq;</div><div class='ctx'> 	u16 size;</div><div class='ctx'> </div><div class='del'>-	if (admin_queue-&gt;comp_ctx)</div><div class='del'>-		devm_kfree(ena_dev-&gt;dmadev, admin_queue-&gt;comp_ctx);</div><div class='del'>-	admin_queue-&gt;comp_ctx = NULL;</div><div class='add'>+	ena_com_free_ena_admin_queue_comp_ctx(ena_dev, admin_queue);</div><div class='add'>+</div><div class='ctx'> 	size = ADMIN_SQ_SIZE(admin_queue-&gt;q_depth);</div><div class='ctx'> 	if (sq-&gt;entries)</div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, size, sq-&gt;entries,</div><div class='del'>-				  sq-&gt;dma_addr);</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, size, sq-&gt;entries, sq-&gt;dma_addr);</div><div class='ctx'> 	sq-&gt;entries = NULL;</div><div class='ctx'> </div><div class='ctx'> 	size = ADMIN_CQ_SIZE(admin_queue-&gt;q_depth);</div><div class='ctx'> 	if (cq-&gt;entries)</div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, size, cq-&gt;entries,</div><div class='del'>-				  cq-&gt;dma_addr);</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, size, cq-&gt;entries, cq-&gt;dma_addr);</div><div class='ctx'> 	cq-&gt;entries = NULL;</div><div class='ctx'> </div><div class='ctx'> 	size = ADMIN_AENQ_SIZE(aenq-&gt;q_depth);</div><div class='ctx'> 	if (ena_dev-&gt;aenq.entries)</div><div class='del'>-		dma_free_coherent(ena_dev-&gt;dmadev, size, aenq-&gt;entries,</div><div class='del'>-				  aenq-&gt;dma_addr);</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, size, aenq-&gt;entries, aenq-&gt;dma_addr);</div><div class='ctx'> 	aenq-&gt;entries = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1643,15 +1647,274 @@ void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling)</div><div class='ctx'> 	ena_dev-&gt;admin_queue.polling = polling;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool ena_com_phc_supported(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	return ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_PHC_CONFIG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_com_phc_init(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_phc_info *phc = &amp;ena_dev-&gt;phc;</div><div class='add'>+</div><div class='add'>+	memset(phc, 0x0, sizeof(*phc));</div><div class='add'>+</div><div class='add'>+	/* Allocate shared mem used PHC timestamp retrieved from device */</div><div class='add'>+	phc-&gt;virt_addr = dma_alloc_coherent(ena_dev-&gt;dmadev,</div><div class='add'>+					    sizeof(*phc-&gt;virt_addr),</div><div class='add'>+					    &amp;phc-&gt;phys_addr,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+	if (unlikely(!phc-&gt;virt_addr))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;phc-&gt;lock);</div><div class='add'>+</div><div class='add'>+	phc-&gt;virt_addr-&gt;req_id = 0;</div><div class='add'>+	phc-&gt;virt_addr-&gt;timestamp = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_com_phc_config(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_phc_info *phc = &amp;ena_dev-&gt;phc;</div><div class='add'>+	struct ena_admin_get_feat_resp get_feat_resp;</div><div class='add'>+	struct ena_admin_set_feat_resp set_feat_resp;</div><div class='add'>+	struct ena_admin_set_feat_cmd set_feat_cmd;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Get device PHC default configuration */</div><div class='add'>+	ret = ena_com_get_feature(ena_dev,</div><div class='add'>+				  &amp;get_feat_resp,</div><div class='add'>+				  ENA_ADMIN_PHC_CONFIG,</div><div class='add'>+				  0);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Failed to get PHC feature configuration, error: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Supporting only readless PHC retrieval */</div><div class='add'>+	if (get_feat_resp.u.phc.type != ENA_ADMIN_PHC_TYPE_READLESS) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Unsupported PHC type, error: %d\n",</div><div class='add'>+			   -EOPNOTSUPP);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update PHC doorbell offset according to device value,</div><div class='add'>+	 * used to write req_id to PHC bar</div><div class='add'>+	 */</div><div class='add'>+	phc-&gt;doorbell_offset = get_feat_resp.u.phc.doorbell_offset;</div><div class='add'>+</div><div class='add'>+	/* Update PHC expire timeout according to device</div><div class='add'>+	 * or default driver value</div><div class='add'>+	 */</div><div class='add'>+	phc-&gt;expire_timeout_usec = (get_feat_resp.u.phc.expire_timeout_usec) ?</div><div class='add'>+				    get_feat_resp.u.phc.expire_timeout_usec :</div><div class='add'>+				    ENA_PHC_DEFAULT_EXPIRE_TIMEOUT_USEC;</div><div class='add'>+</div><div class='add'>+	/* Update PHC block timeout according to device</div><div class='add'>+	 * or default driver value</div><div class='add'>+	 */</div><div class='add'>+	phc-&gt;block_timeout_usec = (get_feat_resp.u.phc.block_timeout_usec) ?</div><div class='add'>+				   get_feat_resp.u.phc.block_timeout_usec :</div><div class='add'>+				   ENA_PHC_DEFAULT_BLOCK_TIMEOUT_USEC;</div><div class='add'>+</div><div class='add'>+	/* Sanity check - expire timeout must not exceed block timeout */</div><div class='add'>+	if (phc-&gt;expire_timeout_usec &gt; phc-&gt;block_timeout_usec)</div><div class='add'>+		phc-&gt;expire_timeout_usec = phc-&gt;block_timeout_usec;</div><div class='add'>+</div><div class='add'>+	/* Prepare PHC feature command */</div><div class='add'>+	memset(&amp;set_feat_cmd, 0x0, sizeof(set_feat_cmd));</div><div class='add'>+	set_feat_cmd.aq_common_descriptor.opcode = ENA_ADMIN_SET_FEATURE;</div><div class='add'>+	set_feat_cmd.feat_common.feature_id = ENA_ADMIN_PHC_CONFIG;</div><div class='add'>+	set_feat_cmd.u.phc.output_length = sizeof(*phc-&gt;virt_addr);</div><div class='add'>+	ret = ena_com_mem_addr_set(ena_dev,</div><div class='add'>+				   &amp;set_feat_cmd.u.phc.output_address,</div><div class='add'>+				   phc-&gt;phys_addr);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Failed setting PHC output address, error: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Send PHC feature command to the device */</div><div class='add'>+	ret = ena_com_execute_admin_command(&amp;ena_dev-&gt;admin_queue,</div><div class='add'>+					    (struct ena_admin_aq_entry *)&amp;set_feat_cmd,</div><div class='add'>+					    sizeof(set_feat_cmd),</div><div class='add'>+					    (struct ena_admin_acq_entry *)&amp;set_feat_resp,</div><div class='add'>+					    sizeof(set_feat_resp));</div><div class='add'>+</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Failed to enable PHC, error: %d\n",</div><div class='add'>+			   ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phc-&gt;active = true;</div><div class='add'>+	netdev_dbg(ena_dev-&gt;net_device, "PHC is active in the device\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_com_phc_destroy(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_phc_info *phc = &amp;ena_dev-&gt;phc;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+</div><div class='add'>+	/* In case PHC is not supported by the device, silently exiting */</div><div class='add'>+	if (!phc-&gt;virt_addr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;phc-&gt;lock, flags);</div><div class='add'>+	phc-&gt;active = false;</div><div class='add'>+	spin_unlock_irqrestore(&amp;phc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	dma_free_coherent(ena_dev-&gt;dmadev,</div><div class='add'>+			  sizeof(*phc-&gt;virt_addr),</div><div class='add'>+			  phc-&gt;virt_addr,</div><div class='add'>+			  phc-&gt;phys_addr);</div><div class='add'>+	phc-&gt;virt_addr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_com_phc_get_timestamp(struct ena_com_dev *ena_dev, u64 *timestamp)</div><div class='add'>+{</div><div class='add'>+	volatile struct ena_admin_phc_resp *resp = ena_dev-&gt;phc.virt_addr;</div><div class='add'>+	const ktime_t zero_system_time = ktime_set(0, 0);</div><div class='add'>+	struct ena_com_phc_info *phc = &amp;ena_dev-&gt;phc;</div><div class='add'>+	ktime_t expire_time;</div><div class='add'>+	ktime_t block_time;</div><div class='add'>+	unsigned long flags = 0;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!phc-&gt;active) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "PHC feature is not active in the device\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;phc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	/* Check if PHC is in blocked state */</div><div class='add'>+	if (unlikely(ktime_compare(phc-&gt;system_time, zero_system_time))) {</div><div class='add'>+		/* Check if blocking time expired */</div><div class='add'>+		block_time = ktime_add_us(phc-&gt;system_time, phc-&gt;block_timeout_usec);</div><div class='add'>+		if (!ktime_after(ktime_get(), block_time)) {</div><div class='add'>+			/* PHC is still in blocked state, skip PHC request */</div><div class='add'>+			phc-&gt;stats.phc_skp++;</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			goto skip;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* PHC is in active state, update statistics according</div><div class='add'>+		 * to req_id and error_flags</div><div class='add'>+		 */</div><div class='add'>+		if (READ_ONCE(resp-&gt;req_id) != phc-&gt;req_id) {</div><div class='add'>+			/* Device didn't update req_id during blocking time,</div><div class='add'>+			 * this indicates on a device error</div><div class='add'>+			 */</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "PHC get time request 0x%x failed (device error)\n",</div><div class='add'>+				   phc-&gt;req_id);</div><div class='add'>+			phc-&gt;stats.phc_err_dv++;</div><div class='add'>+		} else if (resp-&gt;error_flags &amp; ENA_PHC_ERROR_FLAGS) {</div><div class='add'>+			/* Device updated req_id during blocking time but got</div><div class='add'>+			 * a PHC error, this occurs if device:</div><div class='add'>+			 * - exceeded the get time request limit</div><div class='add'>+			 * - received an invalid timestamp</div><div class='add'>+			 */</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "PHC get time request 0x%x failed (error 0x%x)\n",</div><div class='add'>+				   phc-&gt;req_id,</div><div class='add'>+				   resp-&gt;error_flags);</div><div class='add'>+			phc-&gt;stats.phc_err_ts += !!(resp-&gt;error_flags &amp;</div><div class='add'>+				ENA_ADMIN_PHC_ERROR_FLAG_TIMESTAMP);</div><div class='add'>+		} else {</div><div class='add'>+			/* Device updated req_id during blocking time</div><div class='add'>+			 * with valid timestamp</div><div class='add'>+			 */</div><div class='add'>+			phc-&gt;stats.phc_exp++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setting relative timeouts */</div><div class='add'>+	phc-&gt;system_time = ktime_get();</div><div class='add'>+	block_time = ktime_add_us(phc-&gt;system_time, phc-&gt;block_timeout_usec);</div><div class='add'>+	expire_time = ktime_add_us(phc-&gt;system_time, phc-&gt;expire_timeout_usec);</div><div class='add'>+</div><div class='add'>+	/* We expect the device to return this req_id once</div><div class='add'>+	 * the new PHC timestamp is updated</div><div class='add'>+	 */</div><div class='add'>+	phc-&gt;req_id++;</div><div class='add'>+</div><div class='add'>+	/* Initialize PHC shared memory with different req_id value</div><div class='add'>+	 * to be able to identify once the device changes it to req_id</div><div class='add'>+	 */</div><div class='add'>+	resp-&gt;req_id = phc-&gt;req_id + ENA_PHC_REQ_ID_OFFSET;</div><div class='add'>+</div><div class='add'>+	/* Writing req_id to PHC bar */</div><div class='add'>+	writel(phc-&gt;req_id, ena_dev-&gt;reg_bar + phc-&gt;doorbell_offset);</div><div class='add'>+</div><div class='add'>+	/* Stalling until the device updates req_id */</div><div class='add'>+	while (1) {</div><div class='add'>+		if (unlikely(ktime_after(ktime_get(), expire_time))) {</div><div class='add'>+			/* Gave up waiting for updated req_id, PHC enters into</div><div class='add'>+			 * blocked state until passing blocking time,</div><div class='add'>+			 * during this time any get PHC timestamp will fail with</div><div class='add'>+			 * device busy error</div><div class='add'>+			 */</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check if req_id was updated by the device */</div><div class='add'>+		if (READ_ONCE(resp-&gt;req_id) != phc-&gt;req_id) {</div><div class='add'>+			/* req_id was not updated by the device yet,</div><div class='add'>+			 * check again on next loop</div><div class='add'>+			 */</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* req_id was updated by the device which indicates that</div><div class='add'>+		 * PHC timestamp and error_flags are updated too,</div><div class='add'>+		 * checking errors before retrieving timestamp</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(resp-&gt;error_flags &amp; ENA_PHC_ERROR_FLAGS)) {</div><div class='add'>+			/* Retrieved invalid PHC timestamp, PHC enters into</div><div class='add'>+			 * blocked state until passing blocking time,</div><div class='add'>+			 * during this time any get PHC timestamp requests</div><div class='add'>+			 * will fail with device busy error</div><div class='add'>+			 */</div><div class='add'>+			ret = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* PHC timestamp value is returned to the caller */</div><div class='add'>+		*timestamp = resp-&gt;timestamp;</div><div class='add'>+</div><div class='add'>+		/* Update statistic on valid PHC timestamp retrieval */</div><div class='add'>+		phc-&gt;stats.phc_cnt++;</div><div class='add'>+</div><div class='add'>+		/* This indicates PHC state is active */</div><div class='add'>+		phc-&gt;system_time = zero_system_time;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+	spin_unlock_irqrestore(&amp;phc-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_mmio_read *mmio_read = &amp;ena_dev-&gt;mmio_read;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;mmio_read-&gt;lock);</div><div class='del'>-	mmio_read-&gt;read_resp =</div><div class='del'>-		dma_alloc_coherent(ena_dev-&gt;dmadev,</div><div class='del'>-				   sizeof(*mmio_read-&gt;read_resp),</div><div class='del'>-				   &amp;mmio_read-&gt;read_resp_dma_addr, GFP_KERNEL);</div><div class='add'>+	mmio_read-&gt;read_resp = dma_alloc_coherent(ena_dev-&gt;dmadev, sizeof(*mmio_read-&gt;read_resp),</div><div class='add'>+						  &amp;mmio_read-&gt;read_resp_dma_addr, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!mmio_read-&gt;read_resp))</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='hunk'>@@ -1682,8 +1945,8 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	writel(0x0, ena_dev-&gt;reg_bar + ENA_REGS_MMIO_RESP_LO_OFF);</div><div class='ctx'> 	writel(0x0, ena_dev-&gt;reg_bar + ENA_REGS_MMIO_RESP_HI_OFF);</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(ena_dev-&gt;dmadev, sizeof(*mmio_read-&gt;read_resp),</div><div class='del'>-			  mmio_read-&gt;read_resp, mmio_read-&gt;read_resp_dma_addr);</div><div class='add'>+	dma_free_coherent(ena_dev-&gt;dmadev, sizeof(*mmio_read-&gt;read_resp), mmio_read-&gt;read_resp,</div><div class='add'>+			  mmio_read-&gt;read_resp_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	mmio_read-&gt;read_resp = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1710,12 +1973,12 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	dev_sts = ena_com_reg_bar_read32(ena_dev, ENA_REGS_DEV_STS_OFF);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(dev_sts == ENA_MMIO_READ_TIMEOUT)) {</div><div class='del'>-		pr_err("Reg read timeout occurred\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Reg read timeout occurred\n");</div><div class='ctx'> 		return -ETIME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!(dev_sts &amp; ENA_REGS_DEV_STS_READY_MASK)) {</div><div class='del'>-		pr_err("Device isn't ready, abort com init\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Device isn't ready, abort com init\n");</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1774,6 +2037,7 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='add'>+	admin_queue-&gt;ena_dev = ena_dev;</div><div class='ctx'> 	admin_queue-&gt;running_state = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1791,8 +2055,8 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;qid &gt;= ENA_TOTAL_NUM_QUEUES) {</div><div class='del'>-		pr_err("Qid (%d) is bigger than max num of queues (%d)\n",</div><div class='del'>-		       ctx-&gt;qid, ENA_TOTAL_NUM_QUEUES);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Qid (%d) is bigger than max num of queues (%d)\n",</div><div class='add'>+			   ctx-&gt;qid, ENA_TOTAL_NUM_QUEUES);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1817,8 +2081,7 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,</div><div class='ctx'> </div><div class='ctx'> 	if (ctx-&gt;direction == ENA_COM_IO_QUEUE_DIRECTION_TX)</div><div class='ctx'> 		/* header length is limited to 8 bits */</div><div class='del'>-		io_sq-&gt;tx_max_header_size =</div><div class='del'>-			min_t(u32, ena_dev-&gt;tx_max_header_size, SZ_256);</div><div class='add'>+		io_sq-&gt;tx_max_header_size = min_t(u32, ena_dev-&gt;tx_max_header_size, SZ_256);</div><div class='ctx'> </div><div class='ctx'> 	ret = ena_com_init_io_sq(ena_dev, ctx, io_sq);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -1850,8 +2113,8 @@ void ena_com_destroy_io_queue(struct ena_com_dev *ena_dev, u16 qid)</div><div class='ctx'> 	struct ena_com_io_cq *io_cq;</div><div class='ctx'> </div><div class='ctx'> 	if (qid &gt;= ENA_TOTAL_NUM_QUEUES) {</div><div class='del'>-		pr_err("Qid (%d) is bigger than max num of queues (%d)\n", qid,</div><div class='del'>-		       ENA_TOTAL_NUM_QUEUES);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Qid (%d) is bigger than max num of queues (%d)\n",</div><div class='add'>+			   qid, ENA_TOTAL_NUM_QUEUES);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1867,7 +2130,57 @@ void ena_com_destroy_io_queue(struct ena_com_dev *ena_dev, u16 qid)</div><div class='ctx'> int ena_com_get_link_params(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			    struct ena_admin_get_feat_resp *resp)</div><div class='ctx'> {</div><div class='del'>-	return ena_com_get_feature(ena_dev, resp, ENA_ADMIN_LINK_CONFIG);</div><div class='add'>+	return ena_com_get_feature(ena_dev, resp, ENA_ADMIN_LINK_CONFIG, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_get_dev_stats(struct ena_com_dev *ena_dev,</div><div class='add'>+			     struct ena_com_stats_ctx *ctx,</div><div class='add'>+			     enum ena_admin_get_stats_type type)</div><div class='add'>+{</div><div class='add'>+	struct ena_admin_acq_get_stats_resp *get_resp = &amp;ctx-&gt;get_resp;</div><div class='add'>+	struct ena_admin_aq_get_stats_cmd *get_cmd = &amp;ctx-&gt;get_cmd;</div><div class='add'>+	struct ena_com_admin_queue *admin_queue;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	admin_queue = &amp;ena_dev-&gt;admin_queue;</div><div class='add'>+</div><div class='add'>+	get_cmd-&gt;aq_common_descriptor.opcode = ENA_ADMIN_GET_STATS;</div><div class='add'>+	get_cmd-&gt;aq_common_descriptor.flags = 0;</div><div class='add'>+	get_cmd-&gt;type = type;</div><div class='add'>+</div><div class='add'>+	ret = ena_com_execute_admin_command(admin_queue,</div><div class='add'>+					    (struct ena_admin_aq_entry *)get_cmd,</div><div class='add'>+					    sizeof(*get_cmd),</div><div class='add'>+					    (struct ena_admin_acq_entry *)get_resp,</div><div class='add'>+					    sizeof(*get_resp));</div><div class='add'>+</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to get stats. error: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_com_set_supported_customer_metrics(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_customer_metrics *customer_metrics;</div><div class='add'>+	struct ena_com_stats_ctx ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	customer_metrics = &amp;ena_dev-&gt;customer_metrics;</div><div class='add'>+	if (!ena_com_get_cap(ena_dev, ENA_ADMIN_CUSTOMER_METRICS)) {</div><div class='add'>+		customer_metrics-&gt;supported_metrics = ENA_ADMIN_CUSTOMER_METRICS_MIN_SUPPORT_MASK;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctx, 0x0, sizeof(ctx));</div><div class='add'>+	ctx.get_cmd.requested_metrics = ENA_ADMIN_CUSTOMER_METRICS_SUPPORT_MASK;</div><div class='add'>+	ret = ena_get_dev_stats(ena_dev, &amp;ctx, ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS);</div><div class='add'>+	if (likely(ret == 0))</div><div class='add'>+		customer_metrics-&gt;supported_metrics =</div><div class='add'>+			ctx.get_resp.u.customer_metrics.reported_metrics;</div><div class='add'>+	else</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Failed to query customer metrics support. error: %d\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,</div><div class='hunk'>@@ -1877,25 +2190,44 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				 ENA_ADMIN_DEVICE_ATTRIBUTES);</div><div class='add'>+				 ENA_ADMIN_DEVICE_ATTRIBUTES, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(&amp;get_feat_ctx-&gt;dev_attr, &amp;get_resp.u.dev_attr,</div><div class='ctx'> 	       sizeof(get_resp.u.dev_attr));</div><div class='add'>+</div><div class='ctx'> 	ena_dev-&gt;supported_features = get_resp.u.dev_attr.supported_features;</div><div class='add'>+	ena_dev-&gt;capabilities = get_resp.u.dev_attr.capabilities;</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				 ENA_ADMIN_MAX_QUEUES_NUM);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	if (ena_dev-&gt;supported_features &amp; BIT(ENA_ADMIN_MAX_QUEUES_EXT)) {</div><div class='add'>+		rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='add'>+					 ENA_ADMIN_MAX_QUEUES_EXT,</div><div class='add'>+					 ENA_FEATURE_MAX_QUEUE_EXT_VER);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;get_feat_ctx-&gt;max_queues, &amp;get_resp.u.max_queue,</div><div class='del'>-	       sizeof(get_resp.u.max_queue));</div><div class='del'>-	ena_dev-&gt;tx_max_header_size = get_resp.u.max_queue.max_header_size;</div><div class='add'>+		if (get_resp.u.max_queue_ext.version != ENA_FEATURE_MAX_QUEUE_EXT_VER)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;get_feat_ctx-&gt;max_queue_ext, &amp;get_resp.u.max_queue_ext,</div><div class='add'>+		       sizeof(get_resp.u.max_queue_ext));</div><div class='add'>+		ena_dev-&gt;tx_max_header_size =</div><div class='add'>+			get_resp.u.max_queue_ext.max_queue_ext.max_tx_header_size;</div><div class='add'>+	} else {</div><div class='add'>+		rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='add'>+					 ENA_ADMIN_MAX_QUEUES_NUM, 0);</div><div class='add'>+		memcpy(&amp;get_feat_ctx-&gt;max_queues, &amp;get_resp.u.max_queue,</div><div class='add'>+		       sizeof(get_resp.u.max_queue));</div><div class='add'>+		ena_dev-&gt;tx_max_header_size =</div><div class='add'>+			get_resp.u.max_queue.max_header_size;</div><div class='add'>+</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				 ENA_ADMIN_AENQ_CONFIG);</div><div class='add'>+				 ENA_ADMIN_AENQ_CONFIG, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -1903,7 +2235,7 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	       sizeof(get_resp.u.aenq));</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				 ENA_ADMIN_STATELESS_OFFLOAD_CONFIG);</div><div class='add'>+				 ENA_ADMIN_STATELESS_OFFLOAD_CONFIG, 0);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -1913,26 +2245,25 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	/* Driver hints isn't mandatory admin command. So in case the</div><div class='ctx'> 	 * command isn't supported set driver hints to 0</div><div class='ctx'> 	 */</div><div class='del'>-	rc = ena_com_get_feature(ena_dev, &amp;get_resp, ENA_ADMIN_HW_HINTS);</div><div class='add'>+	rc = ena_com_get_feature(ena_dev, &amp;get_resp, ENA_ADMIN_HW_HINTS, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (!rc)</div><div class='del'>-		memcpy(&amp;get_feat_ctx-&gt;hw_hints, &amp;get_resp.u.hw_hints,</div><div class='del'>-		       sizeof(get_resp.u.hw_hints));</div><div class='add'>+		memcpy(&amp;get_feat_ctx-&gt;hw_hints, &amp;get_resp.u.hw_hints, sizeof(get_resp.u.hw_hints));</div><div class='ctx'> 	else if (rc == -EOPNOTSUPP)</div><div class='del'>-		memset(&amp;get_feat_ctx-&gt;hw_hints, 0x0,</div><div class='del'>-		       sizeof(get_feat_ctx-&gt;hw_hints));</div><div class='add'>+		memset(&amp;get_feat_ctx-&gt;hw_hints, 0x0, sizeof(get_feat_ctx-&gt;hw_hints));</div><div class='ctx'> 	else</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_get_feature(ena_dev, &amp;get_resp, ENA_ADMIN_LLQ);</div><div class='add'>+	rc = ena_com_get_feature(ena_dev, &amp;get_resp, ENA_ADMIN_LLQ, 0);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		memcpy(&amp;get_feat_ctx-&gt;llq, &amp;get_resp.u.llq,</div><div class='del'>-		       sizeof(get_resp.u.llq));</div><div class='add'>+		memcpy(&amp;get_feat_ctx-&gt;llq, &amp;get_resp.u.llq, sizeof(get_resp.u.llq));</div><div class='ctx'> 	else if (rc == -EOPNOTSUPP)</div><div class='ctx'> 		memset(&amp;get_feat_ctx-&gt;llq, 0x0, sizeof(get_feat_ctx-&gt;llq));</div><div class='ctx'> 	else</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	ena_com_set_supported_customer_metrics(ena_dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1944,10 +2275,10 @@ void ena_com_admin_q_comp_intr_handler(struct ena_com_dev *ena_dev)</div><div class='ctx'> /* ena_handle_specific_aenq_event:</div><div class='ctx'>  * return the handler that is relevant to the specific event group</div><div class='ctx'>  */</div><div class='del'>-static ena_aenq_handler ena_com_get_specific_aenq_cb(struct ena_com_dev *dev,</div><div class='add'>+static ena_aenq_handler ena_com_get_specific_aenq_cb(struct ena_com_dev *ena_dev,</div><div class='ctx'> 						     u16 group)</div><div class='ctx'> {</div><div class='del'>-	struct ena_aenq_handlers *aenq_handlers = dev-&gt;aenq.aenq_handlers;</div><div class='add'>+	struct ena_aenq_handlers *aenq_handlers = ena_dev-&gt;aenq.aenq_handlers;</div><div class='ctx'> </div><div class='ctx'> 	if ((group &lt; ENA_MAX_HANDLERS) &amp;&amp; aenq_handlers-&gt;handlers[group])</div><div class='ctx'> 		return aenq_handlers-&gt;handlers[group];</div><div class='hunk'>@@ -1959,12 +2290,12 @@ static ena_aenq_handler ena_com_get_specific_aenq_cb(struct ena_com_dev *dev,</div><div class='ctx'>  * handles the aenq incoming events.</div><div class='ctx'>  * pop events from the queue and apply the specific handler</div><div class='ctx'>  */</div><div class='del'>-void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)</div><div class='add'>+void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_admin_aenq_entry *aenq_e;</div><div class='ctx'> 	struct ena_admin_aenq_common_desc *aenq_common;</div><div class='del'>-	struct ena_com_aenq *aenq  = &amp;dev-&gt;aenq;</div><div class='del'>-	unsigned long long timestamp;</div><div class='add'>+	struct ena_com_aenq *aenq  = &amp;ena_dev-&gt;aenq;</div><div class='add'>+	u64 timestamp;</div><div class='ctx'> 	ena_aenq_handler handler_cb;</div><div class='ctx'> 	u16 masked_head, processed = 0;</div><div class='ctx'> 	u8 phase;</div><div class='hunk'>@@ -1975,21 +2306,20 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)</div><div class='ctx'> 	aenq_common = &amp;aenq_e-&gt;aenq_common_desc;</div><div class='ctx'> </div><div class='ctx'> 	/* Go over all the events */</div><div class='del'>-	while ((READ_ONCE(aenq_common-&gt;flags) &amp;</div><div class='del'>-		ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) {</div><div class='add'>+	while ((READ_ONCE(aenq_common-&gt;flags) &amp; ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) {</div><div class='ctx'> 		/* Make sure the phase bit (ownership) is as expected before</div><div class='ctx'> 		 * reading the rest of the descriptor.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dma_rmb();</div><div class='ctx'> </div><div class='del'>-		timestamp =</div><div class='del'>-			(unsigned long long)aenq_common-&gt;timestamp_low |</div><div class='del'>-			((unsigned long long)aenq_common-&gt;timestamp_high &lt;&lt; 32);</div><div class='del'>-		pr_debug("AENQ! Group[%x] Syndrom[%x] timestamp: [%llus]\n",</div><div class='del'>-			 aenq_common-&gt;group, aenq_common-&gt;syndrom, timestamp);</div><div class='add'>+		timestamp = (u64)aenq_common-&gt;timestamp_low |</div><div class='add'>+			((u64)aenq_common-&gt;timestamp_high &lt;&lt; 32);</div><div class='add'>+</div><div class='add'>+		netdev_dbg(ena_dev-&gt;net_device, "AENQ! Group[%x] Syndrome[%x] timestamp: [%llus]\n",</div><div class='add'>+			   aenq_common-&gt;group, aenq_common-&gt;syndrome, timestamp);</div><div class='ctx'> </div><div class='ctx'> 		/* Handle specific event*/</div><div class='del'>-		handler_cb = ena_com_get_specific_aenq_cb(dev,</div><div class='add'>+		handler_cb = ena_com_get_specific_aenq_cb(ena_dev,</div><div class='ctx'> 							  aenq_common-&gt;group);</div><div class='ctx'> 		handler_cb(data, aenq_e); /* call the actual event handler*/</div><div class='ctx'> </div><div class='hunk'>@@ -2014,8 +2344,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	/* write the aenq doorbell after all AENQ descriptors were read */</div><div class='ctx'> 	mb();</div><div class='del'>-	writel_relaxed((u32)aenq-&gt;head,</div><div class='del'>-		       dev-&gt;reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);</div><div class='add'>+	writel_relaxed((u32)aenq-&gt;head, ena_dev-&gt;reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ena_com_dev_reset(struct ena_com_dev *ena_dev,</div><div class='hunk'>@@ -2027,21 +2356,20 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	stat = ena_com_reg_bar_read32(ena_dev, ENA_REGS_DEV_STS_OFF);</div><div class='ctx'> 	cap = ena_com_reg_bar_read32(ena_dev, ENA_REGS_CAPS_OFF);</div><div class='ctx'> </div><div class='del'>-	if (unlikely((stat == ENA_MMIO_READ_TIMEOUT) ||</div><div class='del'>-		     (cap == ENA_MMIO_READ_TIMEOUT))) {</div><div class='del'>-		pr_err("Reg read32 timeout occurred\n");</div><div class='add'>+	if (unlikely((stat == ENA_MMIO_READ_TIMEOUT) || (cap == ENA_MMIO_READ_TIMEOUT))) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Reg read32 timeout occurred\n");</div><div class='ctx'> 		return -ETIME;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((stat &amp; ENA_REGS_DEV_STS_READY_MASK) == 0) {</div><div class='del'>-		pr_err("Device isn't ready, can't reset device\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Device isn't ready, can't reset device\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	timeout = (cap &amp; ENA_REGS_CAPS_RESET_TIMEOUT_MASK) &gt;&gt;</div><div class='ctx'> 			ENA_REGS_CAPS_RESET_TIMEOUT_SHIFT;</div><div class='ctx'> 	if (timeout == 0) {</div><div class='del'>-		pr_err("Invalid timeout value\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Invalid timeout value\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2057,7 +2385,7 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	rc = wait_for_reset_state(ena_dev, timeout,</div><div class='ctx'> 				  ENA_REGS_DEV_STS_RESET_IN_PROGRESS_MASK);</div><div class='ctx'> 	if (rc != 0) {</div><div class='del'>-		pr_err("Reset indication didn't turn on\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Reset indication didn't turn on\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2065,7 +2393,7 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	writel(0, ena_dev-&gt;reg_bar + ENA_REGS_DEV_CTL_OFF);</div><div class='ctx'> 	rc = wait_for_reset_state(ena_dev, timeout, 0);</div><div class='ctx'> 	if (rc != 0) {</div><div class='del'>-		pr_err("Reset indication didn't turn off\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Reset indication didn't turn off\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2080,49 +2408,93 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_get_dev_stats(struct ena_com_dev *ena_dev,</div><div class='del'>-			     struct ena_com_stats_ctx *ctx,</div><div class='del'>-			     enum ena_admin_get_stats_type type)</div><div class='add'>+int ena_com_get_eni_stats(struct ena_com_dev *ena_dev,</div><div class='add'>+			  struct ena_admin_eni_stats *stats)</div><div class='ctx'> {</div><div class='del'>-	struct ena_admin_aq_get_stats_cmd *get_cmd = &amp;ctx-&gt;get_cmd;</div><div class='del'>-	struct ena_admin_acq_get_stats_resp *get_resp = &amp;ctx-&gt;get_resp;</div><div class='del'>-	struct ena_com_admin_queue *admin_queue;</div><div class='add'>+	struct ena_com_stats_ctx ctx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	admin_queue = &amp;ena_dev-&gt;admin_queue;</div><div class='add'>+	if (!ena_com_get_cap(ena_dev, ENA_ADMIN_ENI_STATS)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Capability %d isn't supported\n",</div><div class='add'>+			   ENA_ADMIN_ENI_STATS);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	get_cmd-&gt;aq_common_descriptor.opcode = ENA_ADMIN_GET_STATS;</div><div class='del'>-	get_cmd-&gt;aq_common_descriptor.flags = 0;</div><div class='del'>-	get_cmd-&gt;type = type;</div><div class='add'>+	memset(&amp;ctx, 0x0, sizeof(ctx));</div><div class='add'>+	ret = ena_get_dev_stats(ena_dev, &amp;ctx, ENA_ADMIN_GET_STATS_TYPE_ENI);</div><div class='add'>+	if (likely(ret == 0))</div><div class='add'>+		memcpy(stats, &amp;ctx.get_resp.u.eni_stats,</div><div class='add'>+		       sizeof(ctx.get_resp.u.eni_stats));</div><div class='ctx'> </div><div class='del'>-	ret =  ena_com_execute_admin_command(admin_queue,</div><div class='del'>-					     (struct ena_admin_aq_entry *)get_cmd,</div><div class='del'>-					     sizeof(*get_cmd),</div><div class='del'>-					     (struct ena_admin_acq_entry *)get_resp,</div><div class='del'>-					     sizeof(*get_resp));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to get stats. error: %d\n", ret);</div><div class='add'>+int ena_com_get_ena_srd_info(struct ena_com_dev *ena_dev,</div><div class='add'>+			     struct ena_admin_ena_srd_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_stats_ctx ctx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!ena_com_get_cap(ena_dev, ENA_ADMIN_ENA_SRD_INFO)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Capability %d isn't supported\n",</div><div class='add'>+			   ENA_ADMIN_ENA_SRD_INFO);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctx, 0x0, sizeof(ctx));</div><div class='add'>+	ret = ena_get_dev_stats(ena_dev, &amp;ctx, ENA_ADMIN_GET_STATS_TYPE_ENA_SRD);</div><div class='add'>+	if (likely(ret == 0))</div><div class='add'>+		memcpy(info, &amp;ctx.get_resp.u.ena_srd_info,</div><div class='add'>+		       sizeof(ctx.get_resp.u.ena_srd_info));</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ena_com_get_dev_basic_stats(struct ena_com_dev *ena_dev,</div><div class='del'>-				struct ena_admin_basic_stats *stats)</div><div class='add'>+int ena_com_get_customer_metrics(struct ena_com_dev *ena_dev, char *buffer, u32 len)</div><div class='ctx'> {</div><div class='add'>+	struct ena_admin_aq_get_stats_cmd *get_cmd;</div><div class='ctx'> 	struct ena_com_stats_ctx ctx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(len &gt; ena_dev-&gt;customer_metrics.buffer_len)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Invalid buffer size %u. The given buffer is too big.\n", len);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ena_com_get_cap(ena_dev, ENA_ADMIN_CUSTOMER_METRICS)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Capability %d not supported.\n",</div><div class='add'>+			   ENA_ADMIN_CUSTOMER_METRICS);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ena_dev-&gt;customer_metrics.supported_metrics) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "No supported customer metrics.\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_cmd = &amp;ctx.get_cmd;</div><div class='ctx'> 	memset(&amp;ctx, 0x0, sizeof(ctx));</div><div class='del'>-	ret = ena_get_dev_stats(ena_dev, &amp;ctx, ENA_ADMIN_GET_STATS_TYPE_BASIC);</div><div class='add'>+	ret = ena_com_mem_addr_set(ena_dev,</div><div class='add'>+				   &amp;get_cmd-&gt;u.control_buffer.address,</div><div class='add'>+				   ena_dev-&gt;customer_metrics.buffer_dma_addr);</div><div class='add'>+	if (unlikely(ret)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed.\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	get_cmd-&gt;u.control_buffer.length = ena_dev-&gt;customer_metrics.buffer_len;</div><div class='add'>+	get_cmd-&gt;requested_metrics = ena_dev-&gt;customer_metrics.supported_metrics;</div><div class='add'>+	ret = ena_get_dev_stats(ena_dev, &amp;ctx, ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS);</div><div class='ctx'> 	if (likely(ret == 0))</div><div class='del'>-		memcpy(stats, &amp;ctx.get_resp.basic_stats,</div><div class='del'>-		       sizeof(ctx.get_resp.basic_stats));</div><div class='add'>+		memcpy(buffer, ena_dev-&gt;customer_metrics.buffer_virt_addr, len);</div><div class='add'>+	else</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to get customer metrics. error: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)</div><div class='add'>+int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_admin_queue *admin_queue;</div><div class='ctx'> 	struct ena_admin_set_feat_cmd cmd;</div><div class='hunk'>@@ -2130,7 +2502,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_MTU)) {</div><div class='del'>-		pr_debug("Feature %d isn't supported\n", ENA_ADMIN_MTU);</div><div class='add'>+		netdev_dbg(ena_dev-&gt;net_device, "Feature %d isn't supported\n", ENA_ADMIN_MTU);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2149,29 +2521,11 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to set mtu %d. error: %d\n", mtu, ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to set mtu %d. error: %d\n", mtu, ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ena_com_get_offload_settings(struct ena_com_dev *ena_dev,</div><div class='del'>-				 struct ena_admin_feature_offload_desc *offload)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct ena_admin_get_feat_resp resp;</div><div class='del'>-</div><div class='del'>-	ret = ena_com_get_feature(ena_dev, &amp;resp,</div><div class='del'>-				  ENA_ADMIN_STATELESS_OFFLOAD_CONFIG);</div><div class='del'>-	if (unlikely(ret)) {</div><div class='del'>-		pr_err("Failed to get offload capabilities %d\n", ret);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy(offload, &amp;resp.u.offload, sizeof(resp.u.offload));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> int ena_com_set_hash_function(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_admin_queue *admin_queue = &amp;ena_dev-&gt;admin_queue;</div><div class='hunk'>@@ -2181,22 +2535,21 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	struct ena_admin_get_feat_resp get_resp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!ena_com_check_supported_feature_id(ena_dev,</div><div class='del'>-						ENA_ADMIN_RSS_HASH_FUNCTION)) {</div><div class='del'>-		pr_debug("Feature %d isn't supported\n",</div><div class='del'>-			 ENA_ADMIN_RSS_HASH_FUNCTION);</div><div class='add'>+	if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_HASH_FUNCTION)) {</div><div class='add'>+		netdev_dbg(ena_dev-&gt;net_device, "Feature %d isn't supported\n",</div><div class='add'>+			   ENA_ADMIN_RSS_HASH_FUNCTION);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Validate hash function is supported */</div><div class='ctx'> 	ret = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				  ENA_ADMIN_RSS_HASH_FUNCTION);</div><div class='add'>+				  ENA_ADMIN_RSS_HASH_FUNCTION, 0);</div><div class='ctx'> 	if (unlikely(ret))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!(get_resp.u.flow_hash_func.supported_func &amp; BIT(rss-&gt;hash_func))) {</div><div class='del'>-		pr_err("Func hash %d isn't supported by device, abort\n",</div><div class='del'>-		       rss-&gt;hash_func);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Func hash %d isn't supported by device, abort\n",</div><div class='add'>+			   rss-&gt;hash_func);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2213,7 +2566,7 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)</div><div class='ctx'> 				   &amp;cmd.control_buffer.address,</div><div class='ctx'> 				   rss-&gt;hash_key_dma_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2225,8 +2578,8 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)</div><div class='ctx'> 					    (struct ena_admin_acq_entry *)&amp;resp,</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("Failed to set hash function %d. error: %d\n",</div><div class='del'>-		       rss-&gt;hash_func, ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to set hash function %d. error: %d\n",</div><div class='add'>+			   rss-&gt;hash_func, ret);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2237,12 +2590,14 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			       enum ena_admin_hash_functions func,</div><div class='ctx'> 			       const u8 *key, u16 key_len, u32 init_val)</div><div class='ctx'> {</div><div class='del'>-	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='add'>+	struct ena_admin_feature_rss_flow_hash_control *hash_key;</div><div class='ctx'> 	struct ena_admin_get_feat_resp get_resp;</div><div class='del'>-	struct ena_admin_feature_rss_flow_hash_control *hash_key =</div><div class='del'>-		rss-&gt;hash_key;</div><div class='add'>+	enum ena_admin_hash_functions old_func;</div><div class='add'>+	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	hash_key = rss-&gt;hash_key;</div><div class='add'>+</div><div class='ctx'> 	/* Make sure size is a mult of DWs */</div><div class='ctx'> 	if (unlikely(key_len &amp; 0x3))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2250,68 +2605,73 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	rc = ena_com_get_feature_ex(ena_dev, &amp;get_resp,</div><div class='ctx'> 				    ENA_ADMIN_RSS_HASH_FUNCTION,</div><div class='ctx'> 				    rss-&gt;hash_key_dma_addr,</div><div class='del'>-				    sizeof(*rss-&gt;hash_key));</div><div class='add'>+				    sizeof(*rss-&gt;hash_key), 0);</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (!((1 &lt;&lt; func) &amp; get_resp.u.flow_hash_func.supported_func)) {</div><div class='del'>-		pr_err("Flow hash function %d isn't supported\n", func);</div><div class='add'>+	if (!(BIT(func) &amp; get_resp.u.flow_hash_func.supported_func)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Flow hash function %d isn't supported\n", func);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (func) {</div><div class='del'>-	case ENA_ADMIN_TOEPLITZ:</div><div class='del'>-		if (key_len &gt; sizeof(hash_key-&gt;key)) {</div><div class='del'>-			pr_err("key len (%hu) is bigger than the max supported (%zu)\n",</div><div class='del'>-			       key_len, sizeof(hash_key-&gt;key));</div><div class='add'>+	if ((func == ENA_ADMIN_TOEPLITZ) &amp;&amp; key) {</div><div class='add'>+		if (key_len != sizeof(hash_key-&gt;key)) {</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "key len (%u) doesn't equal the supported size (%zu)\n", key_len,</div><div class='add'>+				   sizeof(hash_key-&gt;key));</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		memcpy(hash_key-&gt;key, key, key_len);</div><div class='del'>-		rss-&gt;hash_init_val = init_val;</div><div class='del'>-		hash_key-&gt;keys_num = key_len &gt;&gt; 2;</div><div class='del'>-		break;</div><div class='del'>-	case ENA_ADMIN_CRC32:</div><div class='del'>-		rss-&gt;hash_init_val = init_val;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		pr_err("Invalid hash function (%d)\n", func);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		hash_key-&gt;key_parts = key_len / sizeof(hash_key-&gt;key[0]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rss-&gt;hash_init_val = init_val;</div><div class='add'>+	old_func = rss-&gt;hash_func;</div><div class='ctx'> 	rss-&gt;hash_func = func;</div><div class='ctx'> 	rc = ena_com_set_hash_function(ena_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Restore the old function */</div><div class='ctx'> 	if (unlikely(rc))</div><div class='del'>-		ena_com_get_hash_function(ena_dev, NULL, NULL);</div><div class='add'>+		rss-&gt;hash_func = old_func;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ena_com_get_hash_function(struct ena_com_dev *ena_dev,</div><div class='del'>-			      enum ena_admin_hash_functions *func,</div><div class='del'>-			      u8 *key)</div><div class='add'>+			      enum ena_admin_hash_functions *func)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_rss *rss = &amp;ena_dev-&gt;rss;</div><div class='ctx'> 	struct ena_admin_get_feat_resp get_resp;</div><div class='del'>-	struct ena_admin_feature_rss_flow_hash_control *hash_key =</div><div class='del'>-		rss-&gt;hash_key;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!func))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	rc = ena_com_get_feature_ex(ena_dev, &amp;get_resp,</div><div class='ctx'> 				    ENA_ADMIN_RSS_HASH_FUNCTION,</div><div class='ctx'> 				    rss-&gt;hash_key_dma_addr,</div><div class='del'>-				    sizeof(*rss-&gt;hash_key));</div><div class='add'>+				    sizeof(*rss-&gt;hash_key), 0);</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	rss-&gt;hash_func = get_resp.u.flow_hash_func.selected_func;</div><div class='del'>-	if (func)</div><div class='del'>-		*func = rss-&gt;hash_func;</div><div class='add'>+	/* ffs() returns 1 in case the lsb is set */</div><div class='add'>+	rss-&gt;hash_func = ffs(get_resp.u.flow_hash_func.selected_func);</div><div class='add'>+	if (rss-&gt;hash_func)</div><div class='add'>+		rss-&gt;hash_func--;</div><div class='add'>+</div><div class='add'>+	*func = rss-&gt;hash_func;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_com_get_hash_key(struct ena_com_dev *ena_dev, u8 *key)</div><div class='add'>+{</div><div class='add'>+	struct ena_admin_feature_rss_flow_hash_control *hash_key =</div><div class='add'>+		ena_dev-&gt;rss.hash_key;</div><div class='ctx'> </div><div class='ctx'> 	if (key)</div><div class='del'>-		memcpy(key, hash_key-&gt;key, (size_t)(hash_key-&gt;keys_num) &lt;&lt; 2);</div><div class='add'>+		memcpy(key, hash_key-&gt;key,</div><div class='add'>+		       (size_t)(hash_key-&gt;key_parts) * sizeof(hash_key-&gt;key[0]));</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2327,7 +2687,7 @@ int ena_com_get_hash_ctrl(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	rc = ena_com_get_feature_ex(ena_dev, &amp;get_resp,</div><div class='ctx'> 				    ENA_ADMIN_RSS_HASH_INPUT,</div><div class='ctx'> 				    rss-&gt;hash_ctrl_dma_addr,</div><div class='del'>-				    sizeof(*rss-&gt;hash_ctrl));</div><div class='add'>+				    sizeof(*rss-&gt;hash_ctrl), 0);</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -2346,10 +2706,9 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	struct ena_admin_set_feat_resp resp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!ena_com_check_supported_feature_id(ena_dev,</div><div class='del'>-						ENA_ADMIN_RSS_HASH_INPUT)) {</div><div class='del'>-		pr_debug("Feature %d isn't supported\n",</div><div class='del'>-			 ENA_ADMIN_RSS_HASH_INPUT);</div><div class='add'>+	if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_HASH_INPUT)) {</div><div class='add'>+		netdev_dbg(ena_dev-&gt;net_device, "Feature %d isn't supported\n",</div><div class='add'>+			   ENA_ADMIN_RSS_HASH_INPUT);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2367,7 +2726,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)</div><div class='ctx'> 				   &amp;cmd.control_buffer.address,</div><div class='ctx'> 				   rss-&gt;hash_ctrl_dma_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	cmd.control_buffer.length = sizeof(*hash_ctrl);</div><div class='hunk'>@@ -2378,7 +2737,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)</div><div class='ctx'> 					    (struct ena_admin_acq_entry *)&amp;resp,</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to set hash input. error: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to set hash input. error: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2428,9 +2787,10 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev)</div><div class='ctx'> 		available_fields = hash_ctrl-&gt;selected_fields[i].fields &amp;</div><div class='ctx'> 				hash_ctrl-&gt;supported_fields[i].fields;</div><div class='ctx'> 		if (available_fields != hash_ctrl-&gt;selected_fields[i].fields) {</div><div class='del'>-			pr_err("hash control doesn't support all the desire configuration. proto %x supported %x selected %x\n",</div><div class='del'>-			       i, hash_ctrl-&gt;supported_fields[i].fields,</div><div class='del'>-			       hash_ctrl-&gt;selected_fields[i].fields);</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "Hash control doesn't support all the desire configuration. proto %x supported %x selected %x\n",</div><div class='add'>+				   i, hash_ctrl-&gt;supported_fields[i].fields,</div><div class='add'>+				   hash_ctrl-&gt;selected_fields[i].fields);</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2454,7 +2814,7 @@ int ena_com_fill_hash_ctrl(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (proto &gt;= ENA_ADMIN_RSS_PROTO_NUM) {</div><div class='del'>-		pr_err("Invalid proto num (%u)\n", proto);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Invalid proto num (%u)\n", proto);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2466,8 +2826,9 @@ int ena_com_fill_hash_ctrl(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	/* Make sure all the fields are supported */</div><div class='ctx'> 	supported_fields = hash_ctrl-&gt;supported_fields[proto].fields;</div><div class='ctx'> 	if ((hash_fields &amp; supported_fields) != hash_fields) {</div><div class='del'>-		pr_err("proto %d doesn't support the required fields %x. supports only: %x\n",</div><div class='del'>-		       proto, hash_fields, supported_fields);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Proto %d doesn't support the required fields %x. supports only: %x\n",</div><div class='add'>+			   proto, hash_fields, supported_fields);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hash_ctrl-&gt;selected_fields[proto].fields = hash_fields;</div><div class='hunk'>@@ -2505,16 +2866,16 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	struct ena_admin_set_feat_resp resp;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!ena_com_check_supported_feature_id(</div><div class='del'>-		    ena_dev, ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG)) {</div><div class='del'>-		pr_debug("Feature %d isn't supported\n",</div><div class='del'>-			 ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG);</div><div class='add'>+	if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG)) {</div><div class='add'>+		netdev_dbg(ena_dev-&gt;net_device, "Feature %d isn't supported\n",</div><div class='add'>+			   ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ena_com_ind_tbl_convert_to_device(ena_dev);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		pr_err("Failed to convert host indirection table to device table\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "Failed to convert host indirection table to device table\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2523,7 +2884,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	cmd.aq_common_descriptor.opcode = ENA_ADMIN_SET_FEATURE;</div><div class='ctx'> 	cmd.aq_common_descriptor.flags =</div><div class='ctx'> 		ENA_ADMIN_AQ_COMMON_DESC_CTRL_DATA_INDIRECT_MASK;</div><div class='del'>-	cmd.feat_common.feature_id = ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG;</div><div class='add'>+	cmd.feat_common.feature_id = ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG;</div><div class='ctx'> 	cmd.u.ind_table.size = rss-&gt;tbl_log_size;</div><div class='ctx'> 	cmd.u.ind_table.inline_index = 0xFFFFFFFF;</div><div class='ctx'> </div><div class='hunk'>@@ -2531,7 +2892,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)</div><div class='ctx'> 				   &amp;cmd.control_buffer.address,</div><div class='ctx'> 				   rss-&gt;rss_ind_tbl_dma_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2545,7 +2906,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to set indirect table. error: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to set indirect table. error: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2561,19 +2922,15 @@ int ena_com_indirect_table_get(struct ena_com_dev *ena_dev, u32 *ind_tbl)</div><div class='ctx'> 		sizeof(struct ena_admin_rss_ind_table_entry);</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_get_feature_ex(ena_dev, &amp;get_resp,</div><div class='del'>-				    ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG,</div><div class='add'>+				    ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG,</div><div class='ctx'> 				    rss-&gt;rss_ind_tbl_dma_addr,</div><div class='del'>-				    tbl_size);</div><div class='add'>+				    tbl_size, 0);</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!ind_tbl)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_ind_tbl_convert_from_device(ena_dev);</div><div class='del'>-	if (unlikely(rc))</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; (1 &lt;&lt; rss-&gt;tbl_log_size); i++)</div><div class='ctx'> 		ind_tbl[i] = rss-&gt;host_rss_ind_tbl[i];</div><div class='ctx'> </div><div class='hunk'>@@ -2590,8 +2947,14 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 indr_tbl_log_size)</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		goto err_indr_tbl;</div><div class='ctx'> </div><div class='add'>+	/* The following function might return unsupported in case the</div><div class='add'>+	 * device doesn't support setting the key / hash function. We can safely</div><div class='add'>+	 * ignore this error and have indirection table support only.</div><div class='add'>+	 */</div><div class='ctx'> 	rc = ena_com_hash_key_allocate(ena_dev);</div><div class='del'>-	if (unlikely(rc))</div><div class='add'>+	if (likely(!rc))</div><div class='add'>+		ena_com_hash_key_fill_default_key(ena_dev);</div><div class='add'>+	else if (rc != -EOPNOTSUPP)</div><div class='ctx'> 		goto err_hash_key;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_hash_ctrl_init(ena_dev);</div><div class='hunk'>@@ -2622,9 +2985,8 @@ int ena_com_allocate_host_info(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_host_attribute *host_attr = &amp;ena_dev-&gt;host_attr;</div><div class='ctx'> </div><div class='del'>-	host_attr-&gt;host_info =</div><div class='del'>-		dma_alloc_coherent(ena_dev-&gt;dmadev, SZ_4K,</div><div class='del'>-				   &amp;host_attr-&gt;host_info_dma_addr, GFP_KERNEL);</div><div class='add'>+	host_attr-&gt;host_info = dma_alloc_coherent(ena_dev-&gt;dmadev, SZ_4K,</div><div class='add'>+						  &amp;host_attr-&gt;host_info_dma_addr, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!host_attr-&gt;host_info))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2642,8 +3004,7 @@ int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,</div><div class='ctx'> </div><div class='ctx'> 	host_attr-&gt;debug_area_virt_addr =</div><div class='ctx'> 		dma_alloc_coherent(ena_dev-&gt;dmadev, debug_area_size,</div><div class='del'>-				   &amp;host_attr-&gt;debug_area_dma_addr,</div><div class='del'>-				   GFP_KERNEL);</div><div class='add'>+				   &amp;host_attr-&gt;debug_area_dma_addr, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!host_attr-&gt;debug_area_virt_addr)) {</div><div class='ctx'> 		host_attr-&gt;debug_area_size = 0;</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2654,6 +3015,24 @@ int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_customer_metrics *customer_metrics = &amp;ena_dev-&gt;customer_metrics;</div><div class='add'>+</div><div class='add'>+	customer_metrics-&gt;buffer_len = ENA_CUSTOMER_METRICS_BUFFER_SIZE;</div><div class='add'>+	customer_metrics-&gt;buffer_virt_addr = NULL;</div><div class='add'>+</div><div class='add'>+	customer_metrics-&gt;buffer_virt_addr =</div><div class='add'>+		dma_alloc_coherent(ena_dev-&gt;dmadev, customer_metrics-&gt;buffer_len,</div><div class='add'>+				   &amp;customer_metrics-&gt;buffer_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!customer_metrics-&gt;buffer_virt_addr) {</div><div class='add'>+		customer_metrics-&gt;buffer_len = 0;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void ena_com_delete_host_info(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_host_attribute *host_attr = &amp;ena_dev-&gt;host_attr;</div><div class='hunk'>@@ -2671,12 +3050,24 @@ void ena_com_delete_debug_area(struct ena_com_dev *ena_dev)</div><div class='ctx'> </div><div class='ctx'> 	if (host_attr-&gt;debug_area_virt_addr) {</div><div class='ctx'> 		dma_free_coherent(ena_dev-&gt;dmadev, host_attr-&gt;debug_area_size,</div><div class='del'>-				  host_attr-&gt;debug_area_virt_addr,</div><div class='del'>-				  host_attr-&gt;debug_area_dma_addr);</div><div class='add'>+				  host_attr-&gt;debug_area_virt_addr, host_attr-&gt;debug_area_dma_addr);</div><div class='ctx'> 		host_attr-&gt;debug_area_virt_addr = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void ena_com_delete_customer_metrics_buffer(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_customer_metrics *customer_metrics = &amp;ena_dev-&gt;customer_metrics;</div><div class='add'>+</div><div class='add'>+	if (customer_metrics-&gt;buffer_virt_addr) {</div><div class='add'>+		dma_free_coherent(ena_dev-&gt;dmadev, customer_metrics-&gt;buffer_len,</div><div class='add'>+				  customer_metrics-&gt;buffer_virt_addr,</div><div class='add'>+				  customer_metrics-&gt;buffer_dma_addr);</div><div class='add'>+		customer_metrics-&gt;buffer_virt_addr = NULL;</div><div class='add'>+		customer_metrics-&gt;buffer_len = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_host_attribute *host_attr = &amp;ena_dev-&gt;host_attr;</div><div class='hunk'>@@ -2700,7 +3091,7 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)</div><div class='ctx'> 				   &amp;cmd.u.host_attr.debug_ba,</div><div class='ctx'> 				   host_attr-&gt;debug_area_dma_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2708,7 +3099,7 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)</div><div class='ctx'> 				   &amp;cmd.u.host_attr.os_info_ba,</div><div class='ctx'> 				   host_attr-&gt;host_info_dma_addr);</div><div class='ctx'> 	if (unlikely(ret)) {</div><div class='del'>-		pr_err("memory address set failed\n");</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Memory address set failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2721,7 +3112,7 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)</div><div class='ctx'> 					    sizeof(resp));</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(ret))</div><div class='del'>-		pr_err("Failed to set host attributes: %d\n", ret);</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Failed to set host attributes: %d\n", ret);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2733,42 +3124,37 @@ bool ena_com_interrupt_moderation_supported(struct ena_com_dev *ena_dev)</div><div class='ctx'> 						  ENA_ADMIN_INTERRUPT_MODERATION);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ena_com_update_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev,</div><div class='del'>-						      u32 tx_coalesce_usecs)</div><div class='add'>+static int ena_com_update_nonadaptive_moderation_interval(struct ena_com_dev *ena_dev,</div><div class='add'>+							  u32 coalesce_usecs,</div><div class='add'>+							  u32 intr_delay_resolution,</div><div class='add'>+							  u32 *intr_moder_interval)</div><div class='ctx'> {</div><div class='del'>-	if (!ena_dev-&gt;intr_delay_resolution) {</div><div class='del'>-		pr_err("Illegal interrupt delay granularity value\n");</div><div class='add'>+	if (!intr_delay_resolution) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "Illegal interrupt delay granularity value\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ena_dev-&gt;intr_moder_tx_interval = tx_coalesce_usecs /</div><div class='del'>-		ena_dev-&gt;intr_delay_resolution;</div><div class='add'>+	*intr_moder_interval = coalesce_usecs / intr_delay_resolution;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ena_com_update_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev,</div><div class='del'>-						      u32 rx_coalesce_usecs)</div><div class='add'>+int ena_com_update_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev,</div><div class='add'>+						      u32 tx_coalesce_usecs)</div><div class='ctx'> {</div><div class='del'>-	if (!ena_dev-&gt;intr_delay_resolution) {</div><div class='del'>-		pr_err("Illegal interrupt delay granularity value\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We use LOWEST entry of moderation table for storing</div><div class='del'>-	 * nonadaptive interrupt coalescing values</div><div class='del'>-	 */</div><div class='del'>-	ena_dev-&gt;intr_moder_tbl[ENA_INTR_MODER_LOWEST].intr_moder_interval =</div><div class='del'>-		rx_coalesce_usecs / ena_dev-&gt;intr_delay_resolution;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return ena_com_update_nonadaptive_moderation_interval(ena_dev,</div><div class='add'>+							      tx_coalesce_usecs,</div><div class='add'>+							      ena_dev-&gt;intr_delay_resolution,</div><div class='add'>+							      &amp;ena_dev-&gt;intr_moder_tx_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void ena_com_destroy_interrupt_moderation(struct ena_com_dev *ena_dev)</div><div class='add'>+int ena_com_update_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev,</div><div class='add'>+						      u32 rx_coalesce_usecs)</div><div class='ctx'> {</div><div class='del'>-	if (ena_dev-&gt;intr_moder_tbl)</div><div class='del'>-		devm_kfree(ena_dev-&gt;dmadev, ena_dev-&gt;intr_moder_tbl);</div><div class='del'>-	ena_dev-&gt;intr_moder_tbl = NULL;</div><div class='add'>+	return ena_com_update_nonadaptive_moderation_interval(ena_dev,</div><div class='add'>+							      rx_coalesce_usecs,</div><div class='add'>+							      ena_dev-&gt;intr_delay_resolution,</div><div class='add'>+							      &amp;ena_dev-&gt;intr_moder_rx_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)</div><div class='hunk'>@@ -2778,16 +3164,16 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_get_feature(ena_dev, &amp;get_resp,</div><div class='del'>-				 ENA_ADMIN_INTERRUPT_MODERATION);</div><div class='add'>+				 ENA_ADMIN_INTERRUPT_MODERATION, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		if (rc == -EOPNOTSUPP) {</div><div class='del'>-			pr_debug("Feature %d isn't supported\n",</div><div class='del'>-				 ENA_ADMIN_INTERRUPT_MODERATION);</div><div class='add'>+			netdev_dbg(ena_dev-&gt;net_device, "Feature %d isn't supported\n",</div><div class='add'>+				   ENA_ADMIN_INTERRUPT_MODERATION);</div><div class='ctx'> 			rc = 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			pr_err("Failed to get interrupt moderation admin cmd. rc: %d\n",</div><div class='del'>-			       rc);</div><div class='add'>+			netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+				   "Failed to get interrupt moderation admin cmd. rc: %d\n", rc);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* no moderation supported, disable adaptive support */</div><div class='hunk'>@@ -2795,66 +3181,14 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_init_interrupt_moderation_table(ena_dev);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err;</div><div class='del'>-</div><div class='ctx'> 	/* if moderation is supported by device we set adaptive moderation */</div><div class='ctx'> 	delay_resolution = get_resp.u.intr_moderation.intr_delay_resolution;</div><div class='ctx'> 	ena_com_update_intr_delay_resolution(ena_dev, delay_resolution);</div><div class='ctx'> </div><div class='del'>-	/* Disable adaptive moderation by default - can be enabled from</div><div class='del'>-	 * ethtool</div><div class='del'>-	 */</div><div class='add'>+	/* Disable adaptive moderation by default - can be enabled later */</div><div class='ctx'> 	ena_com_disable_adaptive_moderation(ena_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-err:</div><div class='del'>-	ena_com_destroy_interrupt_moderation(ena_dev);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ena_com_config_default_interrupt_moderation_table(struct ena_com_dev *ena_dev)</div><div class='del'>-{</div><div class='del'>-	struct ena_intr_moder_entry *intr_moder_tbl = ena_dev-&gt;intr_moder_tbl;</div><div class='del'>-</div><div class='del'>-	if (!intr_moder_tbl)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_LOWEST].intr_moder_interval =</div><div class='del'>-		ENA_INTR_LOWEST_USECS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_LOWEST].pkts_per_interval =</div><div class='del'>-		ENA_INTR_LOWEST_PKTS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_LOWEST].bytes_per_interval =</div><div class='del'>-		ENA_INTR_LOWEST_BYTES;</div><div class='del'>-</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_LOW].intr_moder_interval =</div><div class='del'>-		ENA_INTR_LOW_USECS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_LOW].pkts_per_interval =</div><div class='del'>-		ENA_INTR_LOW_PKTS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_LOW].bytes_per_interval =</div><div class='del'>-		ENA_INTR_LOW_BYTES;</div><div class='del'>-</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_MID].intr_moder_interval =</div><div class='del'>-		ENA_INTR_MID_USECS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_MID].pkts_per_interval =</div><div class='del'>-		ENA_INTR_MID_PKTS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_MID].bytes_per_interval =</div><div class='del'>-		ENA_INTR_MID_BYTES;</div><div class='del'>-</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_HIGH].intr_moder_interval =</div><div class='del'>-		ENA_INTR_HIGH_USECS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_HIGH].pkts_per_interval =</div><div class='del'>-		ENA_INTR_HIGH_PKTS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_HIGH].bytes_per_interval =</div><div class='del'>-		ENA_INTR_HIGH_BYTES;</div><div class='del'>-</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_HIGHEST].intr_moder_interval =</div><div class='del'>-		ENA_INTR_HIGHEST_USECS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_HIGHEST].pkts_per_interval =</div><div class='del'>-		ENA_INTR_HIGHEST_PKTS;</div><div class='del'>-	intr_moder_tbl[ENA_INTR_MODER_HIGHEST].bytes_per_interval =</div><div class='del'>-		ENA_INTR_HIGHEST_BYTES;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> unsigned int ena_com_get_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev)</div><div class='hunk'>@@ -2864,57 +3198,15 @@ unsigned int ena_com_get_nonadaptive_moderation_interval_tx(struct ena_com_dev *</div><div class='ctx'> </div><div class='ctx'> unsigned int ena_com_get_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='del'>-	struct ena_intr_moder_entry *intr_moder_tbl = ena_dev-&gt;intr_moder_tbl;</div><div class='del'>-</div><div class='del'>-	if (intr_moder_tbl)</div><div class='del'>-		return intr_moder_tbl[ENA_INTR_MODER_LOWEST].intr_moder_interval;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ena_com_init_intr_moderation_entry(struct ena_com_dev *ena_dev,</div><div class='del'>-					enum ena_intr_moder_level level,</div><div class='del'>-					struct ena_intr_moder_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct ena_intr_moder_entry *intr_moder_tbl = ena_dev-&gt;intr_moder_tbl;</div><div class='del'>-</div><div class='del'>-	if (level &gt;= ENA_INTR_MAX_NUM_OF_LEVELS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	intr_moder_tbl[level].intr_moder_interval = entry-&gt;intr_moder_interval;</div><div class='del'>-	if (ena_dev-&gt;intr_delay_resolution)</div><div class='del'>-		intr_moder_tbl[level].intr_moder_interval /=</div><div class='del'>-			ena_dev-&gt;intr_delay_resolution;</div><div class='del'>-	intr_moder_tbl[level].pkts_per_interval = entry-&gt;pkts_per_interval;</div><div class='del'>-</div><div class='del'>-	/* use hardcoded value until ethtool supports bytecount parameter */</div><div class='del'>-	if (entry-&gt;bytes_per_interval != ENA_INTR_BYTE_COUNT_NOT_SUPPORTED)</div><div class='del'>-		intr_moder_tbl[level].bytes_per_interval = entry-&gt;bytes_per_interval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void ena_com_get_intr_moderation_entry(struct ena_com_dev *ena_dev,</div><div class='del'>-				       enum ena_intr_moder_level level,</div><div class='del'>-				       struct ena_intr_moder_entry *entry)</div><div class='del'>-{</div><div class='del'>-	struct ena_intr_moder_entry *intr_moder_tbl = ena_dev-&gt;intr_moder_tbl;</div><div class='del'>-</div><div class='del'>-	if (level &gt;= ENA_INTR_MAX_NUM_OF_LEVELS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	entry-&gt;intr_moder_interval = intr_moder_tbl[level].intr_moder_interval;</div><div class='del'>-	if (ena_dev-&gt;intr_delay_resolution)</div><div class='del'>-		entry-&gt;intr_moder_interval *= ena_dev-&gt;intr_delay_resolution;</div><div class='del'>-	entry-&gt;pkts_per_interval =</div><div class='del'>-	intr_moder_tbl[level].pkts_per_interval;</div><div class='del'>-	entry-&gt;bytes_per_interval = intr_moder_tbl[level].bytes_per_interval;</div><div class='add'>+	return ena_dev-&gt;intr_moder_rx_interval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int ena_com_config_dev_mode(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			    struct ena_admin_feature_llq_desc *llq_features,</div><div class='ctx'> 			    struct ena_llq_configurations *llq_default_cfg)</div><div class='ctx'> {</div><div class='add'>+	struct ena_com_llq_info *llq_info = &amp;ena_dev-&gt;llq_info;</div><div class='ctx'> 	int rc;</div><div class='del'>-	int size;</div><div class='ctx'> </div><div class='ctx'> 	if (!llq_features-&gt;max_llq_num) {</div><div class='ctx'> 		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='hunk'>@@ -2925,13 +3217,11 @@ int ena_com_config_dev_mode(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	/* Validate the descriptor is not too big */</div><div class='del'>-	size = ena_dev-&gt;tx_max_header_size;</div><div class='del'>-	size += ena_dev-&gt;llq_info.descs_num_before_header *</div><div class='del'>-		sizeof(struct ena_eth_io_tx_desc);</div><div class='add'>+	ena_dev-&gt;tx_max_header_size = llq_info-&gt;desc_list_entry_size -</div><div class='add'>+		(llq_info-&gt;descs_num_before_header * sizeof(struct ena_eth_io_tx_desc));</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ena_dev-&gt;llq_info.desc_list_entry_size &lt; size)) {</div><div class='del'>-		pr_err("the size of the LLQ entry is smaller than needed\n");</div><div class='add'>+	if (unlikely(ena_dev-&gt;tx_max_header_size == 0)) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device, "The size of the LLQ entry is smaller than needed\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_com.h b/drivers/net/ethernet/amazon/ena/ena_com.h<br/>index 078d6f2b4f39..64df2c48c9a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_com.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_com.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_com.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_com.h</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ENA_COM</div><div class='hunk'>@@ -44,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ena_common_defs.h"</div><div class='ctx'> #include "ena_admin_defs.h"</div><div class='hunk'>@@ -53,9 +27,9 @@</div><div class='ctx'> #undef pr_fmt</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='del'>-#define ENA_MAX_NUM_IO_QUEUES		128U</div><div class='add'>+#define ENA_MAX_NUM_IO_QUEUES 128U</div><div class='ctx'> /* We need to queues for each IO (on for Tx and one for Rx) */</div><div class='del'>-#define ENA_TOTAL_NUM_QUEUES		(2 * (ENA_MAX_NUM_IO_QUEUES))</div><div class='add'>+#define ENA_TOTAL_NUM_QUEUES (2 * (ENA_MAX_NUM_IO_QUEUES))</div><div class='ctx'> </div><div class='ctx'> #define ENA_MAX_HANDLERS 256</div><div class='ctx'> </div><div class='hunk'>@@ -68,47 +42,21 @@</div><div class='ctx'> #define ADMIN_CQ_SIZE(depth)	((depth) * sizeof(struct ena_admin_acq_entry))</div><div class='ctx'> #define ADMIN_AENQ_SIZE(depth)	((depth) * sizeof(struct ena_admin_aenq_entry))</div><div class='ctx'> </div><div class='add'>+#define ENA_CUSTOMER_METRICS_BUFFER_SIZE 512</div><div class='add'>+</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> /* ENA adaptive interrupt moderation settings */</div><div class='ctx'> </div><div class='del'>-#define ENA_INTR_LOWEST_USECS           (0)</div><div class='del'>-#define ENA_INTR_LOWEST_PKTS            (3)</div><div class='del'>-#define ENA_INTR_LOWEST_BYTES           (2 * 1524)</div><div class='del'>-</div><div class='del'>-#define ENA_INTR_LOW_USECS              (32)</div><div class='del'>-#define ENA_INTR_LOW_PKTS               (12)</div><div class='del'>-#define ENA_INTR_LOW_BYTES              (16 * 1024)</div><div class='del'>-</div><div class='del'>-#define ENA_INTR_MID_USECS              (80)</div><div class='del'>-#define ENA_INTR_MID_PKTS               (48)</div><div class='del'>-#define ENA_INTR_MID_BYTES              (64 * 1024)</div><div class='del'>-</div><div class='del'>-#define ENA_INTR_HIGH_USECS             (128)</div><div class='del'>-#define ENA_INTR_HIGH_PKTS              (96)</div><div class='del'>-#define ENA_INTR_HIGH_BYTES             (128 * 1024)</div><div class='del'>-</div><div class='del'>-#define ENA_INTR_HIGHEST_USECS          (192)</div><div class='del'>-#define ENA_INTR_HIGHEST_PKTS           (128)</div><div class='del'>-#define ENA_INTR_HIGHEST_BYTES          (192 * 1024)</div><div class='del'>-</div><div class='del'>-#define ENA_INTR_INITIAL_TX_INTERVAL_USECS		196</div><div class='del'>-#define ENA_INTR_INITIAL_RX_INTERVAL_USECS		4</div><div class='del'>-#define ENA_INTR_DELAY_OLD_VALUE_WEIGHT			6</div><div class='del'>-#define ENA_INTR_DELAY_NEW_VALUE_WEIGHT			4</div><div class='del'>-#define ENA_INTR_MODER_LEVEL_STRIDE			2</div><div class='del'>-#define ENA_INTR_BYTE_COUNT_NOT_SUPPORTED		0xFFFFFF</div><div class='del'>-</div><div class='del'>-#define ENA_HW_HINTS_NO_TIMEOUT				0xFFFF</div><div class='del'>-</div><div class='del'>-enum ena_intr_moder_level {</div><div class='del'>-	ENA_INTR_MODER_LOWEST = 0,</div><div class='del'>-	ENA_INTR_MODER_LOW,</div><div class='del'>-	ENA_INTR_MODER_MID,</div><div class='del'>-	ENA_INTR_MODER_HIGH,</div><div class='del'>-	ENA_INTR_MODER_HIGHEST,</div><div class='del'>-	ENA_INTR_MAX_NUM_OF_LEVELS,</div><div class='del'>-};</div><div class='add'>+#define ENA_INTR_INITIAL_TX_INTERVAL_USECS 64</div><div class='add'>+#define ENA_INTR_INITIAL_RX_INTERVAL_USECS 20</div><div class='add'>+#define ENA_DEFAULT_INTR_DELAY_RESOLUTION 1</div><div class='add'>+</div><div class='add'>+#define ENA_HASH_KEY_SIZE 40</div><div class='add'>+</div><div class='add'>+#define ENA_HW_HINTS_NO_TIMEOUT	0xFFFF</div><div class='add'>+</div><div class='add'>+#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1</div><div class='ctx'> </div><div class='ctx'> struct ena_llq_configurations {</div><div class='ctx'> 	enum ena_admin_llq_header_location llq_header_location;</div><div class='hunk'>@@ -118,12 +66,6 @@ struct ena_llq_configurations {</div><div class='ctx'> 	u16 llq_ring_entry_size_value;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct ena_intr_moder_entry {</div><div class='del'>-	unsigned int intr_moder_interval;</div><div class='del'>-	unsigned int pkts_per_interval;</div><div class='del'>-	unsigned int bytes_per_interval;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> enum queue_direction {</div><div class='ctx'> 	ENA_COM_IO_QUEUE_DIRECTION_TX,</div><div class='ctx'> 	ENA_COM_IO_QUEUE_DIRECTION_RX</div><div class='hunk'>@@ -159,6 +101,8 @@ struct ena_com_llq_info {</div><div class='ctx'> 	u16 desc_list_entry_size;</div><div class='ctx'> 	u16 descs_num_before_header;</div><div class='ctx'> 	u16 descs_per_entry;</div><div class='add'>+	u16 max_entries_in_tx_burst;</div><div class='add'>+	bool disable_meta_caching;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_com_io_cq {</div><div class='hunk'>@@ -167,22 +111,19 @@ struct ena_com_io_cq {</div><div class='ctx'> 	/* Interrupt unmask register */</div><div class='ctx'> 	u32 __iomem *unmask_reg;</div><div class='ctx'> </div><div class='del'>-	/* The completion queue head doorbell register */</div><div class='del'>-	u32 __iomem *cq_head_db_reg;</div><div class='del'>-</div><div class='ctx'> 	/* numa configuration register (for TPH) */</div><div class='ctx'> 	u32 __iomem *numa_node_cfg_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* The value to write to the above register to unmask</div><div class='ctx'> 	 * the interrupt of this queue</div><div class='ctx'> 	 */</div><div class='del'>-	u32 msix_vector;</div><div class='add'>+	u32 msix_vector ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> 	enum queue_direction direction;</div><div class='ctx'> </div><div class='ctx'> 	/* holds the number of cdesc of the current packet */</div><div class='ctx'> 	u16 cur_rx_pkt_cdesc_count;</div><div class='del'>-	/* save the firt cdesc idx of the current packet */</div><div class='add'>+	/* save the first cdesc idx of the current packet */</div><div class='ctx'> 	u16 cur_rx_pkt_cdesc_start_idx;</div><div class='ctx'> </div><div class='ctx'> 	u16 q_depth;</div><div class='hunk'>@@ -192,7 +133,6 @@ struct ena_com_io_cq {</div><div class='ctx'> 	/* Device queue index */</div><div class='ctx'> 	u16 idx;</div><div class='ctx'> 	u16 head;</div><div class='del'>-	u16 last_head_update;</div><div class='ctx'> 	u8 phase;</div><div class='ctx'> 	u8 cdesc_entry_size_in_bytes;</div><div class='ctx'> </div><div class='hunk'>@@ -216,11 +156,12 @@ struct ena_com_io_sq {</div><div class='ctx'> 	struct ena_com_io_desc_addr desc_addr;</div><div class='ctx'> </div><div class='ctx'> 	u32 __iomem *db_addr;</div><div class='del'>-	u8 __iomem *header_addr;</div><div class='ctx'> </div><div class='ctx'> 	enum queue_direction direction;</div><div class='ctx'> 	enum ena_admin_placement_policy_type mem_queue_type;</div><div class='ctx'> </div><div class='add'>+	bool disable_meta_caching;</div><div class='add'>+</div><div class='ctx'> 	u32 msix_vector;</div><div class='ctx'> 	struct ena_com_tx_meta cached_tx_meta;</div><div class='ctx'> 	struct ena_com_llq_info llq_info;</div><div class='hunk'>@@ -238,6 +179,7 @@ struct ena_com_io_sq {</div><div class='ctx'> 	u8 phase;</div><div class='ctx'> 	u8 desc_entry_size;</div><div class='ctx'> 	u8 dma_addr_bits;</div><div class='add'>+	u16 entries_in_tx_burst_left;</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='ctx'> struct ena_com_admin_cq {</div><div class='hunk'>@@ -261,15 +203,24 @@ struct ena_com_admin_sq {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_com_stats_admin {</div><div class='del'>-	u32 aborted_cmd;</div><div class='del'>-	u32 submitted_cmd;</div><div class='del'>-	u32 completed_cmd;</div><div class='del'>-	u32 out_of_space;</div><div class='del'>-	u32 no_completion;</div><div class='add'>+	u64 aborted_cmd;</div><div class='add'>+	u64 submitted_cmd;</div><div class='add'>+	u64 completed_cmd;</div><div class='add'>+	u64 out_of_space;</div><div class='add'>+	u64 no_completion;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ena_com_stats_phc {</div><div class='add'>+	u64 phc_cnt;</div><div class='add'>+	u64 phc_exp;</div><div class='add'>+	u64 phc_skp;</div><div class='add'>+	u64 phc_err_dv;</div><div class='add'>+	u64 phc_err_ts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_com_admin_queue {</div><div class='ctx'> 	void *q_dmadev;</div><div class='add'>+	struct ena_com_dev *ena_dev;</div><div class='ctx'> 	spinlock_t q_lock; /* spinlock for the admin queue */</div><div class='ctx'> </div><div class='ctx'> 	struct ena_comp_ctx *comp_ctx;</div><div class='hunk'>@@ -315,6 +266,47 @@ struct ena_com_mmio_read {</div><div class='ctx'> 	spinlock_t lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* PTP hardware clock (PHC) MMIO read data info */</div><div class='add'>+struct ena_com_phc_info {</div><div class='add'>+	/* Internal PHC statistics */</div><div class='add'>+	struct ena_com_stats_phc stats;</div><div class='add'>+</div><div class='add'>+	/* PHC shared memory - virtual address */</div><div class='add'>+	struct ena_admin_phc_resp *virt_addr;</div><div class='add'>+</div><div class='add'>+	/* System time of last PHC request */</div><div class='add'>+	ktime_t system_time;</div><div class='add'>+</div><div class='add'>+	/* Spin lock to ensure a single outstanding PHC read */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* PHC doorbell address as an offset to PCIe MMIO REG BAR */</div><div class='add'>+	u32 doorbell_offset;</div><div class='add'>+</div><div class='add'>+	/* Shared memory read expire timeout (usec)</div><div class='add'>+	 * Max time for valid PHC retrieval, passing this threshold will fail</div><div class='add'>+	 * the get time request and block new PHC requests for block_timeout_usec</div><div class='add'>+	 * in order to prevent floods on busy device</div><div class='add'>+	 */</div><div class='add'>+	u32 expire_timeout_usec;</div><div class='add'>+</div><div class='add'>+	/* Shared memory read abort timeout (usec)</div><div class='add'>+	 * PHC requests block period, blocking starts once PHC request expired</div><div class='add'>+	 * in order to prevent floods on busy device,</div><div class='add'>+	 * any PHC requests during block period will be skipped</div><div class='add'>+	 */</div><div class='add'>+	u32 block_timeout_usec;</div><div class='add'>+</div><div class='add'>+	/* PHC shared memory - physical address */</div><div class='add'>+	dma_addr_t phys_addr;</div><div class='add'>+</div><div class='add'>+	/* Request id sent to the device */</div><div class='add'>+	u16 req_id;</div><div class='add'>+</div><div class='add'>+	/* True if PHC is active in the device */</div><div class='add'>+	bool active;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ena_rss {</div><div class='ctx'> 	/* Indirect table */</div><div class='ctx'> 	u16 *host_rss_ind_tbl;</div><div class='hunk'>@@ -334,6 +326,16 @@ struct ena_rss {</div><div class='ctx'> </div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ena_customer_metrics {</div><div class='add'>+	/* in correlation with ENA_ADMIN_CUSTOMER_METRICS_SUPPORT_MASK</div><div class='add'>+	 * and ena_admin_customer_metrics_id</div><div class='add'>+	 */</div><div class='add'>+	u64 supported_metrics;</div><div class='add'>+	dma_addr_t buffer_dma_addr;</div><div class='add'>+	void *buffer_virt_addr;</div><div class='add'>+	u32 buffer_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ena_host_attribute {</div><div class='ctx'> 	/* Debug area */</div><div class='ctx'> 	u8 *debug_area_virt_addr;</div><div class='hunk'>@@ -354,29 +356,43 @@ struct ena_com_dev {</div><div class='ctx'> 	u8 __iomem *reg_bar;</div><div class='ctx'> 	void __iomem *mem_bar;</div><div class='ctx'> 	void *dmadev;</div><div class='add'>+	struct net_device *net_device;</div><div class='ctx'> </div><div class='ctx'> 	enum ena_admin_placement_policy_type tx_mem_queue_type;</div><div class='ctx'> 	u32 tx_max_header_size;</div><div class='ctx'> 	u16 stats_func; /* Selected function for extended statistic dump */</div><div class='ctx'> 	u16 stats_queue; /* Selected queue for extended statistic dump */</div><div class='ctx'> </div><div class='add'>+	u32 ena_min_poll_delay_us;</div><div class='add'>+</div><div class='ctx'> 	struct ena_com_mmio_read mmio_read;</div><div class='add'>+	struct ena_com_phc_info phc;</div><div class='ctx'> </div><div class='ctx'> 	struct ena_rss rss;</div><div class='ctx'> 	u32 supported_features;</div><div class='add'>+	u32 capabilities;</div><div class='ctx'> 	u32 dma_addr_bits;</div><div class='ctx'> </div><div class='ctx'> 	struct ena_host_attribute host_attr;</div><div class='ctx'> 	bool adaptive_coalescing;</div><div class='ctx'> 	u16 intr_delay_resolution;</div><div class='add'>+</div><div class='add'>+	/* interrupt moderation intervals are in usec divided by</div><div class='add'>+	 * intr_delay_resolution, which is supplied by the device.</div><div class='add'>+	 */</div><div class='ctx'> 	u32 intr_moder_tx_interval;</div><div class='add'>+	u32 intr_moder_rx_interval;</div><div class='add'>+</div><div class='ctx'> 	struct ena_intr_moder_entry *intr_moder_tbl;</div><div class='ctx'> </div><div class='ctx'> 	struct ena_com_llq_info llq_info;</div><div class='add'>+</div><div class='add'>+	struct ena_customer_metrics customer_metrics;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_com_dev_get_features_ctx {</div><div class='ctx'> 	struct ena_admin_queue_feature_desc max_queues;</div><div class='add'>+	struct ena_admin_queue_ext_feature_desc max_queue_ext;</div><div class='ctx'> 	struct ena_admin_device_attr_feature_desc dev_attr;</div><div class='ctx'> 	struct ena_admin_feature_aenq_desc aenq;</div><div class='ctx'> 	struct ena_admin_feature_offload_desc offload;</div><div class='hunk'>@@ -416,7 +432,41 @@ struct ena_aenq_handlers {</div><div class='ctx'>  */</div><div class='ctx'> int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='del'>-/* ena_com_set_mmio_read_mode - Enable/disable the mmio reg read mechanism</div><div class='add'>+/* ena_com_phc_init - Allocate and initialize PHC feature</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * @note: This method assumes PHC is supported by the device</div><div class='add'>+ * @return - 0 on success, negative value on failure</div><div class='add'>+ */</div><div class='add'>+int ena_com_phc_init(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='add'>+/* ena_com_phc_supported - Return if PHC feature is supported by the device</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * @note: This method must be called after getting supported features</div><div class='add'>+ * @return - supported or not</div><div class='add'>+ */</div><div class='add'>+bool ena_com_phc_supported(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='add'>+/* ena_com_phc_config - Configure PHC feature</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * Configure PHC feature in driver and device</div><div class='add'>+ * @note: This method assumes PHC is supported by the device</div><div class='add'>+ * @return - 0 on success, negative value on failure</div><div class='add'>+ */</div><div class='add'>+int ena_com_phc_config(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='add'>+/* ena_com_phc_destroy - Destroy PHC feature</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ */</div><div class='add'>+void ena_com_phc_destroy(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='add'>+/* ena_com_phc_get_timestamp - Retrieve PHC timestamp</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * @timestamp: Retrieved PHC timestamp</div><div class='add'>+ * @return - 0 on success, negative value on failure</div><div class='add'>+ */</div><div class='add'>+int ena_com_phc_get_timestamp(struct ena_com_dev *ena_dev, u64 *timestamp);</div><div class='add'>+</div><div class='add'>+/* ena_com_set_mmio_read_mode - Enable/disable the indirect mmio reg read mechanism</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  * @readless_supported: readless mode (enable/disable)</div><div class='ctx'>  */</div><div class='hunk'>@@ -524,22 +574,10 @@ bool ena_com_get_admin_running_state(struct ena_com_dev *ena_dev);</div><div class='ctx'>  */</div><div class='ctx'> void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling);</div><div class='ctx'> </div><div class='del'>-/* ena_com_set_admin_polling_mode - Get the admin completion queue polling mode</div><div class='del'>- * @ena_dev: ENA communication layer struct</div><div class='del'>- *</div><div class='del'>- * Get the admin completion mode.</div><div class='del'>- * If polling mode is on, ena_com_execute_admin_command will perform a</div><div class='del'>- * polling on the admin completion queue for the commands completion,</div><div class='del'>- * otherwise it will wait on wait event.</div><div class='del'>- *</div><div class='del'>- * @return state</div><div class='del'>- */</div><div class='del'>-bool ena_com_get_ena_admin_polling_mode(struct ena_com_dev *ena_dev);</div><div class='del'>-</div><div class='ctx'> /* ena_com_admin_q_comp_intr_handler - admin queue interrupt handler</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  *</div><div class='del'>- * This method go over the admin completion queue and wake up all the pending</div><div class='add'>+ * This method goes over the admin completion queue and wakes up all the pending</div><div class='ctx'>  * threads that wait on the commands wait event.</div><div class='ctx'>  *</div><div class='ctx'>  * @note: Should be called after MSI-X interrupt.</div><div class='hunk'>@@ -549,10 +587,10 @@ void ena_com_admin_q_comp_intr_handler(struct ena_com_dev *ena_dev);</div><div class='ctx'> /* ena_com_aenq_intr_handler - AENQ interrupt handler</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  *</div><div class='del'>- * This method go over the async event notification queue and call the proper</div><div class='add'>+ * This method goes over the async event notification queue and calls the proper</div><div class='ctx'>  * aenq handler.</div><div class='ctx'>  */</div><div class='del'>-void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data);</div><div class='add'>+void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data);</div><div class='ctx'> </div><div class='ctx'> /* ena_com_abort_admin_commands - Abort all the outstanding admin commands.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='hunk'>@@ -566,14 +604,14 @@ void ena_com_abort_admin_commands(struct ena_com_dev *ena_dev);</div><div class='ctx'> /* ena_com_wait_for_abort_completion - Wait for admin commands abort.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  *</div><div class='del'>- * This method wait until all the outstanding admin commands will be completed.</div><div class='add'>+ * This method waits until all the outstanding admin commands are completed.</div><div class='ctx'>  */</div><div class='ctx'> void ena_com_wait_for_abort_completion(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='ctx'> /* ena_com_validate_version - Validate the device parameters</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  *</div><div class='del'>- * This method validate the device parameters are the same as the saved</div><div class='add'>+ * This method verifies the device parameters are the same as the saved</div><div class='ctx'>  * parameters in ena_dev.</div><div class='ctx'>  * This method is useful after device reset, to validate the device mac address</div><div class='ctx'>  * and the device offloads are the same as before the reset.</div><div class='hunk'>@@ -623,31 +661,40 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag);</div><div class='ctx'> int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			      struct ena_com_dev_get_features_ctx *get_feat_ctx);</div><div class='ctx'> </div><div class='del'>-/* ena_com_get_dev_basic_stats - Get device basic statistics</div><div class='add'>+/* ena_com_get_eni_stats - Get extended network interface statistics</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  * @stats: stats return value</div><div class='ctx'>  *</div><div class='ctx'>  * @return: 0 on Success and negative value otherwise.</div><div class='ctx'>  */</div><div class='del'>-int ena_com_get_dev_basic_stats(struct ena_com_dev *ena_dev,</div><div class='del'>-				struct ena_admin_basic_stats *stats);</div><div class='add'>+int ena_com_get_eni_stats(struct ena_com_dev *ena_dev,</div><div class='add'>+			  struct ena_admin_eni_stats *stats);</div><div class='ctx'> </div><div class='del'>-/* ena_com_set_dev_mtu - Configure the device mtu.</div><div class='add'>+/* ena_com_get_ena_srd_info - Get ENA SRD network interface statistics</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='del'>- * @mtu: mtu value</div><div class='add'>+ * @info: ena srd stats and flags</div><div class='ctx'>  *</div><div class='ctx'>  * @return: 0 on Success and negative value otherwise.</div><div class='ctx'>  */</div><div class='del'>-int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu);</div><div class='add'>+int ena_com_get_ena_srd_info(struct ena_com_dev *ena_dev,</div><div class='add'>+			     struct ena_admin_ena_srd_info *info);</div><div class='ctx'> </div><div class='del'>-/* ena_com_get_offload_settings - Retrieve the device offloads capabilities</div><div class='add'>+/* ena_com_get_customer_metrics - Get customer metrics for network interface</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='del'>- * @offlad: offload return value</div><div class='add'>+ * @buffer: buffer for returned customer metrics</div><div class='add'>+ * @len: size of the buffer</div><div class='ctx'>  *</div><div class='ctx'>  * @return: 0 on Success and negative value otherwise.</div><div class='ctx'>  */</div><div class='del'>-int ena_com_get_offload_settings(struct ena_com_dev *ena_dev,</div><div class='del'>-				 struct ena_admin_feature_offload_desc *offload);</div><div class='add'>+int ena_com_get_customer_metrics(struct ena_com_dev *ena_dev, char *buffer, u32 len);</div><div class='add'>+</div><div class='add'>+/* ena_com_set_dev_mtu - Configure the device mtu.</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * @mtu: mtu value</div><div class='add'>+ *</div><div class='add'>+ * @return: 0 on Success and negative value otherwise.</div><div class='add'>+ */</div><div class='add'>+int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, u32 mtu);</div><div class='ctx'> </div><div class='ctx'> /* ena_com_rss_init - Init RSS</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='hunk'>@@ -668,6 +715,14 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 log_size);</div><div class='ctx'>  */</div><div class='ctx'> void ena_com_rss_destroy(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='add'>+/* ena_com_get_current_hash_function - Get RSS hash function</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ *</div><div class='add'>+ * Return the current hash function.</div><div class='add'>+ * @return: 0 or one of the ena_admin_hash_functions values.</div><div class='add'>+ */</div><div class='add'>+int ena_com_get_current_hash_function(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='ctx'> /* ena_com_fill_hash_function - Fill RSS hash function</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  * @func: The hash function (Toeplitz or crc)</div><div class='hunk'>@@ -699,23 +754,32 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,</div><div class='ctx'>  */</div><div class='ctx'> int ena_com_set_hash_function(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='del'>-/* ena_com_get_hash_function - Retrieve the hash function and the hash key</div><div class='del'>- * from the device.</div><div class='add'>+/* ena_com_get_hash_function - Retrieve the hash function from the device.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  * @func: hash function</div><div class='del'>- * @key: hash key</div><div class='ctx'>  *</div><div class='del'>- * Retrieve the hash function and the hash key from the device.</div><div class='add'>+ * Retrieve the hash function from the device.</div><div class='ctx'>  *</div><div class='del'>- * @note: If the caller called ena_com_fill_hash_function but didn't flash</div><div class='add'>+ * @note: If the caller called ena_com_fill_hash_function but didn't flush</div><div class='ctx'>  * it to the device, the new configuration will be lost.</div><div class='ctx'>  *</div><div class='ctx'>  * @return: 0 on Success and negative value otherwise.</div><div class='ctx'>  */</div><div class='ctx'> int ena_com_get_hash_function(struct ena_com_dev *ena_dev,</div><div class='del'>-			      enum ena_admin_hash_functions *func,</div><div class='del'>-			      u8 *key);</div><div class='add'>+			      enum ena_admin_hash_functions *func);</div><div class='ctx'> </div><div class='add'>+/* ena_com_get_hash_key - Retrieve the hash key</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * @key: hash key</div><div class='add'>+ *</div><div class='add'>+ * Retrieve the hash key.</div><div class='add'>+ *</div><div class='add'>+ * @note: If the caller called ena_com_fill_hash_key but didn't flush</div><div class='add'>+ * it to the device, the new configuration will be lost.</div><div class='add'>+ *</div><div class='add'>+ * @return: 0 on Success and negative value otherwise.</div><div class='add'>+ */</div><div class='add'>+int ena_com_get_hash_key(struct ena_com_dev *ena_dev, u8 *key);</div><div class='ctx'> /* ena_com_fill_hash_ctrl - Fill RSS hash control</div><div class='ctx'>  * @ena_dev: ENA communication layer struct.</div><div class='ctx'>  * @proto: The protocol to configure.</div><div class='hunk'>@@ -750,7 +814,7 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev);</div><div class='ctx'>  *</div><div class='ctx'>  * Retrieve the hash control from the device.</div><div class='ctx'>  *</div><div class='del'>- * @note, If the caller called ena_com_fill_hash_ctrl but didn't flash</div><div class='add'>+ * @note: If the caller called ena_com_fill_hash_ctrl but didn't flush</div><div class='ctx'>  * it to the device, the new configuration will be lost.</div><div class='ctx'>  *</div><div class='ctx'>  * @return: 0 on Success and negative value otherwise.</div><div class='hunk'>@@ -802,7 +866,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev);</div><div class='ctx'>  *</div><div class='ctx'>  * Retrieve the RSS indirection table from the device.</div><div class='ctx'>  *</div><div class='del'>- * @note: If the caller called ena_com_indirect_table_fill_entry but didn't flash</div><div class='add'>+ * @note: If the caller called ena_com_indirect_table_fill_entry but didn't flush</div><div class='ctx'>  * it to the device, the new configuration will be lost.</div><div class='ctx'>  *</div><div class='ctx'>  * @return: 0 on Success and negative value otherwise.</div><div class='hunk'>@@ -825,20 +889,34 @@ int ena_com_allocate_host_info(struct ena_com_dev *ena_dev);</div><div class='ctx'> int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,</div><div class='ctx'> 				u32 debug_area_size);</div><div class='ctx'> </div><div class='add'>+/* ena_com_allocate_customer_metrics_buffer - Allocate customer metrics resources.</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ *</div><div class='add'>+ * @return: 0 on Success and negative value otherwise.</div><div class='add'>+ */</div><div class='add'>+int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='ctx'> /* ena_com_delete_debug_area - Free the debug area resources.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  *</div><div class='del'>- * Free the allocate debug area.</div><div class='add'>+ * Free the allocated debug area.</div><div class='ctx'>  */</div><div class='ctx'> void ena_com_delete_debug_area(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='ctx'> /* ena_com_delete_host_info - Free the host info resources.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  *</div><div class='del'>- * Free the allocate host info.</div><div class='add'>+ * Free the allocated host info.</div><div class='ctx'>  */</div><div class='ctx'> void ena_com_delete_host_info(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='add'>+/* ena_com_delete_customer_metrics_buffer - Free the customer metrics resources.</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ *</div><div class='add'>+ * Free the allocated customer metrics area.</div><div class='add'>+ */</div><div class='add'>+void ena_com_delete_customer_metrics_buffer(struct ena_com_dev *ena_dev);</div><div class='add'>+</div><div class='ctx'> /* ena_com_set_host_attributes - Update the device with the host</div><div class='ctx'>  * attributes (debug area and host info) base address.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='hunk'>@@ -876,9 +954,9 @@ int ena_com_destroy_io_cq(struct ena_com_dev *ena_dev,</div><div class='ctx'>  * @cmd_completion: command completion return value.</div><div class='ctx'>  * @cmd_comp_size: command completion size.</div><div class='ctx'> </div><div class='del'>- * Submit an admin command and then wait until the device will return a</div><div class='add'>+ * Submit an admin command and then wait until the device returns a</div><div class='ctx'>  * completion.</div><div class='del'>- * The completion will be copyed into cmd_comp.</div><div class='add'>+ * The completion will be copied into cmd_comp.</div><div class='ctx'>  *</div><div class='ctx'>  * @return - 0 on success, negative value on failure.</div><div class='ctx'>  */</div><div class='hunk'>@@ -895,11 +973,6 @@ int ena_com_execute_admin_command(struct ena_com_admin_queue *admin_queue,</div><div class='ctx'>  */</div><div class='ctx'> int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='del'>-/* ena_com_destroy_interrupt_moderation - Destroy interrupt moderation resources</div><div class='del'>- * @ena_dev: ENA communication layer struct</div><div class='del'>- */</div><div class='del'>-void ena_com_destroy_interrupt_moderation(struct ena_com_dev *ena_dev);</div><div class='del'>-</div><div class='ctx'> /* ena_com_interrupt_moderation_supported - Return if interrupt moderation</div><div class='ctx'>  * capability is supported by the device.</div><div class='ctx'>  *</div><div class='hunk'>@@ -907,12 +980,6 @@ void ena_com_destroy_interrupt_moderation(struct ena_com_dev *ena_dev);</div><div class='ctx'>  */</div><div class='ctx'> bool ena_com_interrupt_moderation_supported(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='del'>-/* ena_com_config_default_interrupt_moderation_table - Restore the interrupt</div><div class='del'>- * moderation table back to the default parameters.</div><div class='del'>- * @ena_dev: ENA communication layer struct</div><div class='del'>- */</div><div class='del'>-void ena_com_config_default_interrupt_moderation_table(struct ena_com_dev *ena_dev);</div><div class='del'>-</div><div class='ctx'> /* ena_com_update_nonadaptive_moderation_interval_tx - Update the</div><div class='ctx'>  * non-adaptive interval in Tx direction.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='hunk'>@@ -949,39 +1016,36 @@ unsigned int ena_com_get_nonadaptive_moderation_interval_tx(struct ena_com_dev *</div><div class='ctx'>  */</div><div class='ctx'> unsigned int ena_com_get_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev);</div><div class='ctx'> </div><div class='del'>-/* ena_com_init_intr_moderation_entry - Update a single entry in the interrupt</div><div class='del'>- * moderation table.</div><div class='del'>- * @ena_dev: ENA communication layer struct</div><div class='del'>- * @level: Interrupt moderation table level</div><div class='del'>- * @entry: Entry value</div><div class='del'>- *</div><div class='del'>- * Update a single entry in the interrupt moderation table.</div><div class='del'>- */</div><div class='del'>-void ena_com_init_intr_moderation_entry(struct ena_com_dev *ena_dev,</div><div class='del'>-					enum ena_intr_moder_level level,</div><div class='del'>-					struct ena_intr_moder_entry *entry);</div><div class='del'>-</div><div class='del'>-/* ena_com_get_intr_moderation_entry - Init ena_intr_moder_entry.</div><div class='del'>- * @ena_dev: ENA communication layer struct</div><div class='del'>- * @level: Interrupt moderation table level</div><div class='del'>- * @entry: Entry to fill.</div><div class='del'>- *</div><div class='del'>- * Initialize the entry according to the adaptive interrupt moderation table.</div><div class='del'>- */</div><div class='del'>-void ena_com_get_intr_moderation_entry(struct ena_com_dev *ena_dev,</div><div class='del'>-				       enum ena_intr_moder_level level,</div><div class='del'>-				       struct ena_intr_moder_entry *entry);</div><div class='del'>-</div><div class='ctx'> /* ena_com_config_dev_mode - Configure the placement policy of the device.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='ctx'>  * @llq_features: LLQ feature descriptor, retrieve via</div><div class='del'>- *                ena_com_get_dev_attr_feat.</div><div class='add'>+ *		   ena_com_get_dev_attr_feat.</div><div class='ctx'>  * @ena_llq_config: The default driver LLQ parameters configurations</div><div class='ctx'>  */</div><div class='ctx'> int ena_com_config_dev_mode(struct ena_com_dev *ena_dev,</div><div class='ctx'> 			    struct ena_admin_feature_llq_desc *llq_features,</div><div class='ctx'> 			    struct ena_llq_configurations *llq_default_config);</div><div class='ctx'> </div><div class='add'>+/* ena_com_io_sq_to_ena_dev - Extract ena_com_dev using contained field io_sq.</div><div class='add'>+ * @io_sq: IO submit queue struct</div><div class='add'>+ *</div><div class='add'>+ * @return - ena_com_dev struct extracted from io_sq</div><div class='add'>+ */</div><div class='add'>+static inline struct ena_com_dev *ena_com_io_sq_to_ena_dev(struct ena_com_io_sq *io_sq)</div><div class='add'>+{</div><div class='add'>+	return container_of(io_sq, struct ena_com_dev, io_sq_queues[io_sq-&gt;qid]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ena_com_io_cq_to_ena_dev - Extract ena_com_dev using contained field io_cq.</div><div class='add'>+ * @io_sq: IO submit queue struct</div><div class='add'>+ *</div><div class='add'>+ * @return - ena_com_dev struct extracted from io_sq</div><div class='add'>+ */</div><div class='add'>+static inline struct ena_com_dev *ena_com_io_cq_to_ena_dev(struct ena_com_io_cq *io_cq)</div><div class='add'>+{</div><div class='add'>+	return container_of(io_cq, struct ena_com_dev, io_cq_queues[io_cq-&gt;qid]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline bool ena_com_get_adaptive_moderation_enabled(struct ena_com_dev *ena_dev)</div><div class='ctx'> {</div><div class='ctx'> 	return ena_dev-&gt;adaptive_coalescing;</div><div class='hunk'>@@ -997,80 +1061,45 @@ static inline void ena_com_disable_adaptive_moderation(struct ena_com_dev *ena_d</div><div class='ctx'> 	ena_dev-&gt;adaptive_coalescing = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ena_com_calculate_interrupt_delay - Calculate new interrupt delay</div><div class='add'>+/* ena_com_get_cap - query whether device supports a capability.</div><div class='ctx'>  * @ena_dev: ENA communication layer struct</div><div class='del'>- * @pkts: Number of packets since the last update</div><div class='del'>- * @bytes: Number of bytes received since the last update.</div><div class='del'>- * @smoothed_interval: Returned interval</div><div class='del'>- * @moder_tbl_idx: Current table level as input update new level as return</div><div class='del'>- * value.</div><div class='del'>- */</div><div class='del'>-static inline void ena_com_calculate_interrupt_delay(struct ena_com_dev *ena_dev,</div><div class='del'>-						     unsigned int pkts,</div><div class='del'>-						     unsigned int bytes,</div><div class='del'>-						     unsigned int *smoothed_interval,</div><div class='del'>-						     unsigned int *moder_tbl_idx)</div><div class='add'>+ * @cap_id: enum value representing the capability</div><div class='add'>+ *</div><div class='add'>+ * @return - true if capability is supported or false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool ena_com_get_cap(struct ena_com_dev *ena_dev,</div><div class='add'>+				   enum ena_admin_aq_caps_id cap_id)</div><div class='ctx'> {</div><div class='del'>-	enum ena_intr_moder_level curr_moder_idx, new_moder_idx;</div><div class='del'>-	struct ena_intr_moder_entry *curr_moder_entry;</div><div class='del'>-	struct ena_intr_moder_entry *pred_moder_entry;</div><div class='del'>-	struct ena_intr_moder_entry *new_moder_entry;</div><div class='del'>-	struct ena_intr_moder_entry *intr_moder_tbl = ena_dev-&gt;intr_moder_tbl;</div><div class='del'>-	unsigned int interval;</div><div class='del'>-</div><div class='del'>-	/* We apply adaptive moderation on Rx path only.</div><div class='del'>-	 * Tx uses static interrupt moderation.</div><div class='del'>-	 */</div><div class='del'>-	if (!pkts || !bytes)</div><div class='del'>-		/* Tx interrupt, or spurious interrupt,</div><div class='del'>-		 * in both cases we just use same delay values</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	curr_moder_idx = (enum ena_intr_moder_level)(*moder_tbl_idx);</div><div class='del'>-	if (unlikely(curr_moder_idx &gt;= ENA_INTR_MAX_NUM_OF_LEVELS)) {</div><div class='del'>-		pr_err("Wrong moderation index %u\n", curr_moder_idx);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	curr_moder_entry = &amp;intr_moder_tbl[curr_moder_idx];</div><div class='del'>-	new_moder_idx = curr_moder_idx;</div><div class='del'>-</div><div class='del'>-	if (curr_moder_idx == ENA_INTR_MODER_LOWEST) {</div><div class='del'>-		if ((pkts &gt; curr_moder_entry-&gt;pkts_per_interval) ||</div><div class='del'>-		    (bytes &gt; curr_moder_entry-&gt;bytes_per_interval))</div><div class='del'>-			new_moder_idx =</div><div class='del'>-				(enum ena_intr_moder_level)(curr_moder_idx + ENA_INTR_MODER_LEVEL_STRIDE);</div><div class='del'>-	} else {</div><div class='del'>-		pred_moder_entry = &amp;intr_moder_tbl[curr_moder_idx - ENA_INTR_MODER_LEVEL_STRIDE];</div><div class='del'>-</div><div class='del'>-		if ((pkts &lt;= pred_moder_entry-&gt;pkts_per_interval) ||</div><div class='del'>-		    (bytes &lt;= pred_moder_entry-&gt;bytes_per_interval))</div><div class='del'>-			new_moder_idx =</div><div class='del'>-				(enum ena_intr_moder_level)(curr_moder_idx - ENA_INTR_MODER_LEVEL_STRIDE);</div><div class='del'>-		else if ((pkts &gt; curr_moder_entry-&gt;pkts_per_interval) ||</div><div class='del'>-			 (bytes &gt; curr_moder_entry-&gt;bytes_per_interval)) {</div><div class='del'>-			if (curr_moder_idx != ENA_INTR_MODER_HIGHEST)</div><div class='del'>-				new_moder_idx =</div><div class='del'>-					(enum ena_intr_moder_level)(curr_moder_idx + ENA_INTR_MODER_LEVEL_STRIDE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	new_moder_entry = &amp;intr_moder_tbl[new_moder_idx];</div><div class='del'>-</div><div class='del'>-	interval = new_moder_entry-&gt;intr_moder_interval;</div><div class='del'>-	*smoothed_interval = (</div><div class='del'>-		(interval * ENA_INTR_DELAY_NEW_VALUE_WEIGHT +</div><div class='del'>-		ENA_INTR_DELAY_OLD_VALUE_WEIGHT * (*smoothed_interval)) + 5) /</div><div class='del'>-		10;</div><div class='del'>-</div><div class='del'>-	*moder_tbl_idx = new_moder_idx;</div><div class='add'>+	return !!(ena_dev-&gt;capabilities &amp; BIT(cap_id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ena_com_get_customer_metric_support - query whether device supports a given customer metric.</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ * @metric_id: enum value representing the customer metric</div><div class='add'>+ *</div><div class='add'>+ * @return - true if customer metric is supported or false otherwise</div><div class='add'>+ */</div><div class='add'>+static inline bool ena_com_get_customer_metric_support(struct ena_com_dev *ena_dev,</div><div class='add'>+						       enum ena_admin_customer_metrics_id metric_id)</div><div class='add'>+{</div><div class='add'>+	return !!(ena_dev-&gt;customer_metrics.supported_metrics &amp; BIT(metric_id));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ena_com_get_customer_metric_count - return the number of supported customer metrics.</div><div class='add'>+ * @ena_dev: ENA communication layer struct</div><div class='add'>+ *</div><div class='add'>+ * @return - the number of supported customer metrics</div><div class='add'>+ */</div><div class='add'>+static inline int ena_com_get_customer_metric_count(struct ena_com_dev *ena_dev)</div><div class='add'>+{</div><div class='add'>+	return hweight64(ena_dev-&gt;customer_metrics.supported_metrics);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ena_com_update_intr_reg - Prepare interrupt register</div><div class='ctx'>  * @intr_reg: interrupt register to update.</div><div class='ctx'>  * @rx_delay_interval: Rx interval in usecs</div><div class='ctx'>  * @tx_delay_interval: Tx interval in usecs</div><div class='del'>- * @unmask: unask enable/disable</div><div class='add'>+ * @unmask: unmask enable/disable</div><div class='ctx'>  *</div><div class='ctx'>  * Prepare interrupt update register with the supplied parameters.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_common_defs.h b/drivers/net/ethernet/amazon/ena/ena_common_defs.h<br/>index 23beb7e7ed7b..e210c8a81fc0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_common_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_common_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_common_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_common_defs.h</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 - 2016 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ENA_COMMON_H_</div><div class='ctx'> #define _ENA_COMMON_H_</div><div class='hunk'>@@ -45,4 +18,4 @@ struct ena_common_mem_addr {</div><div class='ctx'> 	u16 reserved16;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#endif /*_ENA_COMMON_H_ */</div><div class='add'>+#endif /* _ENA_COMMON_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_debugfs.c b/drivers/net/ethernet/amazon/ena/ena_debugfs.c<br/>new file mode 100644<br/>index 000000000000..46ed80986724<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,62 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='add'>+/* Copyright (c) Amazon.com, Inc. or its affiliates.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+#include &lt;linux/seq_file.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "ena_debugfs.h"</div><div class='add'>+#include "ena_phc.h"</div><div class='add'>+</div><div class='add'>+static int phc_stats_show(struct seq_file *file, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = file-&gt;private;</div><div class='add'>+</div><div class='add'>+	if (!ena_phc_is_active(adapter))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	seq_printf(file,</div><div class='add'>+		   "phc_cnt: %llu\n",</div><div class='add'>+		   adapter-&gt;ena_dev-&gt;phc.stats.phc_cnt);</div><div class='add'>+	seq_printf(file,</div><div class='add'>+		   "phc_exp: %llu\n",</div><div class='add'>+		   adapter-&gt;ena_dev-&gt;phc.stats.phc_exp);</div><div class='add'>+	seq_printf(file,</div><div class='add'>+		   "phc_skp: %llu\n",</div><div class='add'>+		   adapter-&gt;ena_dev-&gt;phc.stats.phc_skp);</div><div class='add'>+	seq_printf(file,</div><div class='add'>+		   "phc_err_dv: %llu\n",</div><div class='add'>+		   adapter-&gt;ena_dev-&gt;phc.stats.phc_err_dv);</div><div class='add'>+	seq_printf(file,</div><div class='add'>+		   "phc_err_ts: %llu\n",</div><div class='add'>+		   adapter-&gt;ena_dev-&gt;phc.stats.phc_err_ts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(phc_stats);</div><div class='add'>+</div><div class='add'>+void ena_debugfs_init(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;debugfs_base =</div><div class='add'>+		debugfs_create_dir(dev_name(&amp;adapter-&gt;pdev-&gt;dev), NULL);</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("phc_stats",</div><div class='add'>+			    0400,</div><div class='add'>+			    adapter-&gt;debugfs_base,</div><div class='add'>+			    adapter,</div><div class='add'>+			    &amp;phc_stats_fops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_debugfs_terminate(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	debugfs_remove_recursive(adapter-&gt;debugfs_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_debugfs.h b/drivers/net/ethernet/amazon/ena/ena_debugfs.h<br/>new file mode 100644<br/>index 000000000000..dc61dd998867<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_debugfs.h</a></div><div class='hunk'>@@ -0,0 +1,27 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='add'>+/* Copyright (c) Amazon.com, Inc. or its affiliates.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ENA_DEBUGFS_H__</div><div class='add'>+#define __ENA_DEBUGFS_H__</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include "ena_netdev.h"</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+void ena_debugfs_init(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+void ena_debugfs_terminate(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+#else /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+static inline void ena_debugfs_init(struct net_device *dev) {}</div><div class='add'>+</div><div class='add'>+static inline void ena_debugfs_terminate(struct net_device *dev) {}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='add'>+</div><div class='add'>+#endif /* __ENA_DEBUGFS_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_devlink.c b/drivers/net/ethernet/amazon/ena/ena_devlink.c<br/>new file mode 100644<br/>index 000000000000..ac81c24016dd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_devlink.c</a></div><div class='hunk'>@@ -0,0 +1,210 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='add'>+/* Copyright (c) Amazon.com, Inc. or its affiliates.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "linux/pci.h"</div><div class='add'>+#include "ena_devlink.h"</div><div class='add'>+#include "ena_phc.h"</div><div class='add'>+</div><div class='add'>+static int ena_devlink_enable_phc_validate(struct devlink *devlink, u32 id,</div><div class='add'>+					   union devlink_param_value val,</div><div class='add'>+					   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+</div><div class='add'>+	if (!val.vbool)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!ena_com_phc_supported(adapter-&gt;ena_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Device doesn't support PHC");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_param ena_devlink_params[] = {</div><div class='add'>+	DEVLINK_PARAM_GENERIC(ENABLE_PHC,</div><div class='add'>+			      BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),</div><div class='add'>+			      NULL,</div><div class='add'>+			      NULL,</div><div class='add'>+			      ena_devlink_enable_phc_validate),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ena_devlink_params_get(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+	union devlink_param_value val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = devl_param_driverinit_value_get(devlink,</div><div class='add'>+					      DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,</div><div class='add'>+					      &amp;val);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "Failed to query PHC param\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ena_phc_enable(adapter, val.vbool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_devlink_disable_phc_param(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	union devlink_param_value value;</div><div class='add'>+</div><div class='add'>+	value.vbool = false;</div><div class='add'>+	devl_param_driverinit_value_set(devlink,</div><div class='add'>+					DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,</div><div class='add'>+					value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_devlink_port_register(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+	struct devlink_port_attrs attrs = {};</div><div class='add'>+</div><div class='add'>+	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;</div><div class='add'>+	devlink_port_attrs_set(&amp;adapter-&gt;devlink_port, &amp;attrs);</div><div class='add'>+	devl_port_register(devlink, &amp;adapter-&gt;devlink_port, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_devlink_port_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+</div><div class='add'>+	devl_port_unregister(&amp;adapter-&gt;devlink_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_devlink_reload_down(struct devlink *devlink,</div><div class='add'>+				   bool netns_change,</div><div class='add'>+				   enum devlink_reload_action action,</div><div class='add'>+				   enum devlink_reload_limit limit,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+</div><div class='add'>+	if (netns_change) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Namespace change is not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ena_devlink_port_unregister(devlink);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	ena_destroy_device(adapter, false);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_devlink_reload_up(struct devlink *devlink,</div><div class='add'>+				 enum devlink_reload_action action,</div><div class='add'>+				 enum devlink_reload_limit limit,</div><div class='add'>+				 u32 *actions_performed,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	/* Check that no other routine initialized the device (e.g.</div><div class='add'>+	 * ena_fw_reset_device()). Also we're under devlink_mutex here,</div><div class='add'>+	 * so devlink isn't freed under our feet.</div><div class='add'>+	 */</div><div class='add'>+	if (!test_bit(ENA_FLAG_DEVICE_RUNNING, &amp;adapter-&gt;flags))</div><div class='add'>+		err = ena_restore_device(adapter);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	ena_devlink_port_register(devlink);</div><div class='add'>+</div><div class='add'>+	if (!err)</div><div class='add'>+		*actions_performed = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops ena_devlink_ops = {</div><div class='add'>+	.reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT),</div><div class='add'>+	.reload_down	= ena_devlink_reload_down,</div><div class='add'>+	.reload_up	= ena_devlink_reload_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ena_devlink_configure_params(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = ENA_DEVLINK_PRIV(devlink);</div><div class='add'>+	union devlink_param_value value;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = devlink_params_register(devlink, ena_devlink_params,</div><div class='add'>+				     ARRAY_SIZE(ena_devlink_params));</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "Failed to register devlink params\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	value.vbool = ena_phc_is_enabled(adapter);</div><div class='add'>+	devl_param_driverinit_value_set(devlink,</div><div class='add'>+					DEVLINK_PARAM_GENERIC_ID_ENABLE_PHC,</div><div class='add'>+					value);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct devlink *ena_devlink_alloc(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;adapter-&gt;pdev-&gt;dev;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_alloc(&amp;ena_devlink_ops,</div><div class='add'>+				sizeof(struct ena_adapter *),</div><div class='add'>+				dev);</div><div class='add'>+	if (!devlink) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev,</div><div class='add'>+			   "Failed to allocate devlink struct\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ENA_DEVLINK_PRIV(devlink) = adapter;</div><div class='add'>+	adapter-&gt;devlink = devlink;</div><div class='add'>+</div><div class='add'>+	if (ena_devlink_configure_params(devlink))</div><div class='add'>+		goto free_devlink;</div><div class='add'>+</div><div class='add'>+	return devlink;</div><div class='add'>+</div><div class='add'>+free_devlink:</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_devlink_configure_params_clean(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devlink_params_unregister(devlink, ena_devlink_params,</div><div class='add'>+				  ARRAY_SIZE(ena_devlink_params));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_devlink_free(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	ena_devlink_configure_params_clean(devlink);</div><div class='add'>+</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_devlink_register(struct devlink *devlink, struct device *dev)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	ena_devlink_port_register(devlink);</div><div class='add'>+	devl_register(devlink);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_devlink_unregister(struct devlink *devlink)</div><div class='add'>+{</div><div class='add'>+	devl_lock(devlink);</div><div class='add'>+	ena_devlink_port_unregister(devlink);</div><div class='add'>+	devl_unregister(devlink);</div><div class='add'>+	devl_unlock(devlink);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_devlink.h b/drivers/net/ethernet/amazon/ena/ena_devlink.h<br/>new file mode 100644<br/>index 000000000000..7a19ce4830d9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_devlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_devlink.h</a></div><div class='hunk'>@@ -0,0 +1,21 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='add'>+/* Copyright (c) Amazon.com, Inc. or its affiliates.</div><div class='add'>+ * All rights reserved.</div><div class='add'>+ */</div><div class='add'>+#ifndef DEVLINK_H</div><div class='add'>+#define DEVLINK_H</div><div class='add'>+</div><div class='add'>+#include "ena_netdev.h"</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#define ENA_DEVLINK_PRIV(devlink) \</div><div class='add'>+	(*(struct ena_adapter **)devlink_priv(devlink))</div><div class='add'>+</div><div class='add'>+struct devlink *ena_devlink_alloc(struct ena_adapter *adapter);</div><div class='add'>+void ena_devlink_free(struct devlink *devlink);</div><div class='add'>+void ena_devlink_register(struct devlink *devlink, struct device *dev);</div><div class='add'>+void ena_devlink_unregister(struct devlink *devlink);</div><div class='add'>+void ena_devlink_params_get(struct devlink *devlink);</div><div class='add'>+void ena_devlink_disable_phc_param(struct devlink *devlink);</div><div class='add'>+</div><div class='add'>+#endif /* DEVLINK_H */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.c b/drivers/net/ethernet/amazon/ena/ena_eth_com.c<br/>index f6c2d3855be8..4c6e07aa4bbb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_eth_com.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_eth_com.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_eth_com.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_eth_com.c</a></div><div class='hunk'>@@ -1,38 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "ena_eth_com.h"</div><div class='ctx'> </div><div class='del'>-static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(</div><div class='add'>+static struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(</div><div class='ctx'> 	struct ena_com_io_cq *io_cq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_eth_io_rx_cdesc_base *cdesc;</div><div class='hunk'>@@ -46,7 +19,7 @@ static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(</div><div class='ctx'> 			+ (head_masked * io_cq-&gt;cdesc_entry_size_in_bytes));</div><div class='ctx'> </div><div class='ctx'> 	desc_phase = (READ_ONCE(cdesc-&gt;status) &amp; ENA_ETH_IO_RX_CDESC_BASE_PHASE_MASK) &gt;&gt;</div><div class='del'>-			ENA_ETH_IO_RX_CDESC_BASE_PHASE_SHIFT;</div><div class='add'>+		     ENA_ETH_IO_RX_CDESC_BASE_PHASE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (desc_phase != expected_phase)</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -59,7 +32,7 @@ static inline struct ena_eth_io_rx_cdesc_base *ena_com_get_next_rx_cdesc(</div><div class='ctx'> 	return cdesc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)</div><div class='add'>+static void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tail_masked;</div><div class='ctx'> 	u32 offset;</div><div class='hunk'>@@ -71,7 +44,7 @@ static inline void *get_sq_desc_regular_queue(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	return (void *)((uintptr_t)io_sq-&gt;desc_addr.virt_addr + offset);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,</div><div class='add'>+static int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 						     u8 *bounce_buffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_llq_info *llq_info = &amp;io_sq-&gt;llq_info;</div><div class='hunk'>@@ -82,14 +55,27 @@ static inline int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq</div><div class='ctx'> 	dst_tail_mask = io_sq-&gt;tail &amp; (io_sq-&gt;q_depth - 1);</div><div class='ctx'> 	dst_offset = dst_tail_mask * llq_info-&gt;desc_list_entry_size;</div><div class='ctx'> </div><div class='add'>+	if (is_llq_max_tx_burst_exists(io_sq)) {</div><div class='add'>+		if (unlikely(!io_sq-&gt;entries_in_tx_burst_left)) {</div><div class='add'>+			netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+				   "Error: trying to send more packets than tx burst allows\n");</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		io_sq-&gt;entries_in_tx_burst_left--;</div><div class='add'>+		netdev_dbg(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Decreasing entries_in_tx_burst_left of queue %d to %d\n", io_sq-&gt;qid,</div><div class='add'>+			   io_sq-&gt;entries_in_tx_burst_left);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Make sure everything was written into the bounce buffer before</div><div class='ctx'> 	 * writing the bounce buffer to the device</div><div class='ctx'> 	 */</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='ctx'> 	/* The line is completed. Copy it to dev */</div><div class='del'>-	__iowrite64_copy(io_sq-&gt;desc_addr.pbuf_dev_addr + dst_offset,</div><div class='del'>-			 bounce_buffer, (llq_info-&gt;desc_list_entry_size) / 8);</div><div class='add'>+	__iowrite64_copy(io_sq-&gt;desc_addr.pbuf_dev_addr + dst_offset, bounce_buffer,</div><div class='add'>+			 (llq_info-&gt;desc_list_entry_size) / 8);</div><div class='ctx'> </div><div class='ctx'> 	io_sq-&gt;tail++;</div><div class='ctx'> </div><div class='hunk'>@@ -100,7 +86,7 @@ static inline int ena_com_write_bounce_buffer_to_dev(struct ena_com_io_sq *io_sq</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,</div><div class='add'>+static int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 						 u8 *header_src,</div><div class='ctx'> 						 u16 header_len)</div><div class='ctx'> {</div><div class='hunk'>@@ -115,14 +101,14 @@ static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 	header_offset =</div><div class='ctx'> 		llq_info-&gt;descs_num_before_header * io_sq-&gt;desc_entry_size;</div><div class='ctx'> </div><div class='del'>-	if (unlikely((header_offset + header_len) &gt;</div><div class='del'>-		     llq_info-&gt;desc_list_entry_size)) {</div><div class='del'>-		pr_err("trying to write header larger than llq entry can accommodate\n");</div><div class='add'>+	if (unlikely((header_offset + header_len) &gt; llq_info-&gt;desc_list_entry_size)) {</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Trying to write header larger than llq entry can accommodate\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!bounce_buffer)) {</div><div class='del'>-		pr_err("bounce buffer is NULL\n");</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device, "Bounce buffer is NULL\n");</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -131,7 +117,7 @@ static inline int ena_com_write_header_to_bounce(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)</div><div class='add'>+static void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_llq_pkt_ctrl *pkt_ctrl = &amp;io_sq-&gt;llq_buf_ctrl;</div><div class='ctx'> 	u8 *bounce_buffer;</div><div class='hunk'>@@ -140,7 +126,7 @@ static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	bounce_buffer = pkt_ctrl-&gt;curr_bounce_buf;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!bounce_buffer)) {</div><div class='del'>-		pr_err("bounce buffer is NULL\n");</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device, "Bounce buffer is NULL\n");</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -151,7 +137,7 @@ static inline void *get_sq_desc_llq(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	return sq_desc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)</div><div class='add'>+static int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_llq_pkt_ctrl *pkt_ctrl = &amp;io_sq-&gt;llq_buf_ctrl;</div><div class='ctx'> 	struct ena_com_llq_info *llq_info = &amp;io_sq-&gt;llq_info;</div><div class='hunk'>@@ -161,11 +147,14 @@ static inline int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* bounce buffer was used, so write it and get a new one */</div><div class='del'>-	if (pkt_ctrl-&gt;idx) {</div><div class='add'>+	if (likely(pkt_ctrl-&gt;idx)) {</div><div class='ctx'> 		rc = ena_com_write_bounce_buffer_to_dev(io_sq,</div><div class='ctx'> 							pkt_ctrl-&gt;curr_bounce_buf);</div><div class='del'>-		if (unlikely(rc))</div><div class='add'>+		if (unlikely(rc)) {</div><div class='add'>+			netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+				   "Failed to write bounce buffer to device\n");</div><div class='ctx'> 			return rc;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		pkt_ctrl-&gt;curr_bounce_buf =</div><div class='ctx'> 			ena_com_get_next_bounce_buffer(&amp;io_sq-&gt;bounce_buf_ctrl);</div><div class='hunk'>@@ -178,7 +167,7 @@ static inline int ena_com_close_bounce_buffer(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void *get_sq_desc(struct ena_com_io_sq *io_sq)</div><div class='add'>+static void *get_sq_desc(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	if (io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='ctx'> 		return get_sq_desc_llq(io_sq);</div><div class='hunk'>@@ -186,7 +175,7 @@ static inline void *get_sq_desc(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	return get_sq_desc_regular_queue(io_sq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)</div><div class='add'>+static int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_llq_pkt_ctrl *pkt_ctrl = &amp;io_sq-&gt;llq_buf_ctrl;</div><div class='ctx'> 	struct ena_com_llq_info *llq_info = &amp;io_sq-&gt;llq_info;</div><div class='hunk'>@@ -195,13 +184,16 @@ static inline int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	if (!pkt_ctrl-&gt;descs_left_in_line) {</div><div class='ctx'> 		rc = ena_com_write_bounce_buffer_to_dev(io_sq,</div><div class='ctx'> 							pkt_ctrl-&gt;curr_bounce_buf);</div><div class='del'>-		if (unlikely(rc))</div><div class='add'>+		if (unlikely(rc)) {</div><div class='add'>+			netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+				   "Failed to write bounce buffer to device\n");</div><div class='ctx'> 			return rc;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		pkt_ctrl-&gt;curr_bounce_buf =</div><div class='ctx'> 			ena_com_get_next_bounce_buffer(&amp;io_sq-&gt;bounce_buf_ctrl);</div><div class='del'>-			memset(io_sq-&gt;llq_buf_ctrl.curr_bounce_buf,</div><div class='del'>-			       0x0, llq_info-&gt;desc_list_entry_size);</div><div class='add'>+		memset(io_sq-&gt;llq_buf_ctrl.curr_bounce_buf,</div><div class='add'>+		       0x0, llq_info-&gt;desc_list_entry_size);</div><div class='ctx'> </div><div class='ctx'> 		pkt_ctrl-&gt;idx = 0;</div><div class='ctx'> 		if (unlikely(llq_info-&gt;desc_stride_ctrl == ENA_ADMIN_SINGLE_DESC_PER_ENTRY))</div><div class='hunk'>@@ -214,7 +206,7 @@ static inline int ena_com_sq_update_llq_tail(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)</div><div class='add'>+static int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	if (io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='ctx'> 		return ena_com_sq_update_llq_tail(io_sq);</div><div class='hunk'>@@ -228,7 +220,7 @@ static inline int ena_com_sq_update_tail(struct ena_com_io_sq *io_sq)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct ena_eth_io_rx_cdesc_base *</div><div class='add'>+static struct ena_eth_io_rx_cdesc_base *</div><div class='ctx'> 	ena_com_rx_cdesc_idx_to_ptr(struct ena_com_io_cq *io_cq, u16 idx)</div><div class='ctx'> {</div><div class='ctx'> 	idx &amp;= (io_cq-&gt;q_depth - 1);</div><div class='hunk'>@@ -237,67 +229,66 @@ static inline struct ena_eth_io_rx_cdesc_base *</div><div class='ctx'> 		idx * io_cq-&gt;cdesc_entry_size_in_bytes);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,</div><div class='del'>-					   u16 *first_cdesc_idx)</div><div class='add'>+static int ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,</div><div class='add'>+				    u16 *first_cdesc_idx,</div><div class='add'>+				    u16 *num_descs)</div><div class='ctx'> {</div><div class='add'>+	u16 count = io_cq-&gt;cur_rx_pkt_cdesc_count, head_masked;</div><div class='ctx'> 	struct ena_eth_io_rx_cdesc_base *cdesc;</div><div class='del'>-	u16 count = 0, head_masked;</div><div class='ctx'> 	u32 last = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='add'>+		u32 status;</div><div class='add'>+</div><div class='ctx'> 		cdesc = ena_com_get_next_rx_cdesc(io_cq);</div><div class='ctx'> 		if (!cdesc)</div><div class='ctx'> 			break;</div><div class='add'>+		status = READ_ONCE(cdesc-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 		ena_com_cq_inc_head(io_cq);</div><div class='add'>+		if (unlikely((status &amp; ENA_ETH_IO_RX_CDESC_BASE_FIRST_MASK) &gt;&gt;</div><div class='add'>+		    ENA_ETH_IO_RX_CDESC_BASE_FIRST_SHIFT &amp;&amp; count != 0)) {</div><div class='add'>+			struct ena_com_dev *dev = ena_com_io_cq_to_ena_dev(io_cq);</div><div class='add'>+</div><div class='add'>+			netdev_err(dev-&gt;net_device,</div><div class='add'>+				   "First bit is on in descriptor #%d on q_id: %d, req_id: %u\n",</div><div class='add'>+				   count, io_cq-&gt;qid, cdesc-&gt;req_id);</div><div class='add'>+			return -EFAULT;</div><div class='add'>+		}</div><div class='ctx'> 		count++;</div><div class='del'>-		last = (READ_ONCE(cdesc-&gt;status) &amp; ENA_ETH_IO_RX_CDESC_BASE_LAST_MASK) &gt;&gt;</div><div class='add'>+		last = (status &amp; ENA_ETH_IO_RX_CDESC_BASE_LAST_MASK) &gt;&gt;</div><div class='ctx'> 			ENA_ETH_IO_RX_CDESC_BASE_LAST_SHIFT;</div><div class='ctx'> 	} while (!last);</div><div class='ctx'> </div><div class='ctx'> 	if (last) {</div><div class='ctx'> 		*first_cdesc_idx = io_cq-&gt;cur_rx_pkt_cdesc_start_idx;</div><div class='del'>-		count += io_cq-&gt;cur_rx_pkt_cdesc_count;</div><div class='ctx'> </div><div class='ctx'> 		head_masked = io_cq-&gt;head &amp; (io_cq-&gt;q_depth - 1);</div><div class='ctx'> </div><div class='add'>+		*num_descs = count;</div><div class='ctx'> 		io_cq-&gt;cur_rx_pkt_cdesc_count = 0;</div><div class='ctx'> 		io_cq-&gt;cur_rx_pkt_cdesc_start_idx = head_masked;</div><div class='ctx'> </div><div class='del'>-		pr_debug("ena q_id: %d packets were completed. first desc idx %u descs# %d\n",</div><div class='del'>-			 io_cq-&gt;qid, *first_cdesc_idx, count);</div><div class='add'>+		netdev_dbg(ena_com_io_cq_to_ena_dev(io_cq)-&gt;net_device,</div><div class='add'>+			   "ENA q_id: %d packets were completed. first desc idx %u descs# %d\n",</div><div class='add'>+			   io_cq-&gt;qid, *first_cdesc_idx, count);</div><div class='ctx'> 	} else {</div><div class='del'>-		io_cq-&gt;cur_rx_pkt_cdesc_count += count;</div><div class='del'>-		count = 0;</div><div class='add'>+		io_cq-&gt;cur_rx_pkt_cdesc_count = count;</div><div class='add'>+		*num_descs = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool ena_com_meta_desc_changed(struct ena_com_io_sq *io_sq,</div><div class='del'>-					     struct ena_com_tx_ctx *ena_tx_ctx)</div><div class='del'>-{</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	if (ena_tx_ctx-&gt;meta_valid) {</div><div class='del'>-		rc = memcmp(&amp;io_sq-&gt;cached_tx_meta,</div><div class='del'>-			    &amp;ena_tx_ctx-&gt;ena_meta,</div><div class='del'>-			    sizeof(struct ena_com_tx_meta));</div><div class='del'>-</div><div class='del'>-		if (unlikely(rc != 0))</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return false;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,</div><div class='del'>-							struct ena_com_tx_ctx *ena_tx_ctx)</div><div class='add'>+static int ena_com_create_meta(struct ena_com_io_sq *io_sq,</div><div class='add'>+			       struct ena_com_tx_meta *ena_meta)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_eth_io_tx_meta_desc *meta_desc = NULL;</div><div class='del'>-	struct ena_com_tx_meta *ena_meta = &amp;ena_tx_ctx-&gt;ena_meta;</div><div class='ctx'> </div><div class='ctx'> 	meta_desc = get_sq_desc(io_sq);</div><div class='add'>+	if (unlikely(!meta_desc))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	memset(meta_desc, 0x0, sizeof(struct ena_eth_io_tx_meta_desc));</div><div class='ctx'> </div><div class='ctx'> 	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_META_DESC_MASK;</div><div class='hunk'>@@ -305,7 +296,7 @@ static inline int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io</div><div class='ctx'> 	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_EXT_VALID_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* bits 0-9 of the mss */</div><div class='del'>-	meta_desc-&gt;word2 |= (ena_meta-&gt;mss &lt;&lt;</div><div class='add'>+	meta_desc-&gt;word2 |= ((u32)ena_meta-&gt;mss &lt;&lt;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_MSS_LO_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_MSS_LO_MASK;</div><div class='ctx'> 	/* bits 10-13 of the mss */</div><div class='hunk'>@@ -315,33 +306,55 @@ static inline int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io</div><div class='ctx'> </div><div class='ctx'> 	/* Extended meta desc */</div><div class='ctx'> 	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_ETH_META_TYPE_MASK;</div><div class='del'>-	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_META_STORE_MASK;</div><div class='del'>-	meta_desc-&gt;len_ctrl |= (io_sq-&gt;phase &lt;&lt;</div><div class='add'>+	meta_desc-&gt;len_ctrl |= ((u32)io_sq-&gt;phase &lt;&lt;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_PHASE_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_PHASE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_FIRST_MASK;</div><div class='add'>+	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_META_STORE_MASK;</div><div class='add'>+</div><div class='ctx'> 	meta_desc-&gt;word2 |= ena_meta-&gt;l3_hdr_len &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_L3_HDR_LEN_MASK;</div><div class='ctx'> 	meta_desc-&gt;word2 |= (ena_meta-&gt;l3_hdr_offset &lt;&lt;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_L3_HDR_OFF_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_L3_HDR_OFF_MASK;</div><div class='ctx'> </div><div class='del'>-	meta_desc-&gt;word2 |= (ena_meta-&gt;l4_hdr_len &lt;&lt;</div><div class='add'>+	meta_desc-&gt;word2 |= ((u32)ena_meta-&gt;l4_hdr_len &lt;&lt;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_L4_HDR_LEN_IN_WORDS_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_META_DESC_L4_HDR_LEN_IN_WORDS_MASK;</div><div class='ctx'> </div><div class='del'>-	meta_desc-&gt;len_ctrl |= ENA_ETH_IO_TX_META_DESC_META_STORE_MASK;</div><div class='add'>+	return ena_com_sq_update_tail(io_sq);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Cached the meta desc */</div><div class='del'>-	memcpy(&amp;io_sq-&gt;cached_tx_meta, ena_meta,</div><div class='del'>-	       sizeof(struct ena_com_tx_meta));</div><div class='add'>+static int ena_com_create_and_store_tx_meta_desc(struct ena_com_io_sq *io_sq,</div><div class='add'>+						 struct ena_com_tx_ctx *ena_tx_ctx,</div><div class='add'>+						 bool *have_meta)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_tx_meta *ena_meta = &amp;ena_tx_ctx-&gt;ena_meta;</div><div class='ctx'> </div><div class='del'>-	return ena_com_sq_update_tail(io_sq);</div><div class='add'>+	/* When disable meta caching is set, don't bother to save the meta and</div><div class='add'>+	 * compare it to the stored version, just create the meta</div><div class='add'>+	 */</div><div class='add'>+	if (io_sq-&gt;disable_meta_caching) {</div><div class='add'>+		*have_meta = true;</div><div class='add'>+		return ena_com_create_meta(io_sq, ena_meta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ena_com_meta_desc_changed(io_sq, ena_tx_ctx)) {</div><div class='add'>+		*have_meta = true;</div><div class='add'>+		/* Cache the meta desc */</div><div class='add'>+		memcpy(&amp;io_sq-&gt;cached_tx_meta, ena_meta,</div><div class='add'>+		       sizeof(struct ena_com_tx_meta));</div><div class='add'>+		return ena_com_create_meta(io_sq, ena_meta);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*have_meta = false;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ena_com_rx_set_flags(struct ena_com_rx_ctx *ena_rx_ctx,</div><div class='del'>-					struct ena_eth_io_rx_cdesc_base *cdesc)</div><div class='add'>+static void ena_com_rx_set_flags(struct ena_com_io_cq *io_cq,</div><div class='add'>+				 struct ena_com_rx_ctx *ena_rx_ctx,</div><div class='add'>+				 struct ena_eth_io_rx_cdesc_base *cdesc)</div><div class='ctx'> {</div><div class='ctx'> 	ena_rx_ctx-&gt;l3_proto = cdesc-&gt;status &amp;</div><div class='ctx'> 		ENA_ETH_IO_RX_CDESC_BASE_L3_PROTO_IDX_MASK;</div><div class='hunk'>@@ -362,10 +375,10 @@ static inline void ena_com_rx_set_flags(struct ena_com_rx_ctx *ena_rx_ctx,</div><div class='ctx'> 		(cdesc-&gt;status &amp; ENA_ETH_IO_RX_CDESC_BASE_IPV4_FRAG_MASK) &gt;&gt;</div><div class='ctx'> 		ENA_ETH_IO_RX_CDESC_BASE_IPV4_FRAG_SHIFT;</div><div class='ctx'> </div><div class='del'>-	pr_debug("ena_rx_ctx-&gt;l3_proto %d ena_rx_ctx-&gt;l4_proto %d\nena_rx_ctx-&gt;l3_csum_err %d ena_rx_ctx-&gt;l4_csum_err %d\nhash frag %d frag: %d cdesc_status: %x\n",</div><div class='del'>-		 ena_rx_ctx-&gt;l3_proto, ena_rx_ctx-&gt;l4_proto,</div><div class='del'>-		 ena_rx_ctx-&gt;l3_csum_err, ena_rx_ctx-&gt;l4_csum_err,</div><div class='del'>-		 ena_rx_ctx-&gt;hash, ena_rx_ctx-&gt;frag, cdesc-&gt;status);</div><div class='add'>+	netdev_dbg(ena_com_io_cq_to_ena_dev(io_cq)-&gt;net_device,</div><div class='add'>+		   "l3_proto %d l4_proto %d l3_csum_err %d l4_csum_err %d hash %d frag %d cdesc_status %x\n",</div><div class='add'>+		   ena_rx_ctx-&gt;l3_proto, ena_rx_ctx-&gt;l4_proto, ena_rx_ctx-&gt;l3_csum_err,</div><div class='add'>+		   ena_rx_ctx-&gt;l4_csum_err, ena_rx_ctx-&gt;hash, ena_rx_ctx-&gt;frag, cdesc-&gt;status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='hunk'>@@ -390,35 +403,41 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,</div><div class='ctx'> </div><div class='ctx'> 	/* num_bufs +1 for potential meta desc */</div><div class='ctx'> 	if (unlikely(!ena_com_sq_have_enough_space(io_sq, num_bufs + 1))) {</div><div class='del'>-		pr_debug("Not enough space in the tx queue\n");</div><div class='add'>+		netdev_dbg(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Not enough space in the tx queue\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(header_len &gt; io_sq-&gt;tx_max_header_size)) {</div><div class='del'>-		pr_err("header size is too large %d max header: %d\n",</div><div class='del'>-		       header_len, io_sq-&gt;tx_max_header_size);</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Header size is too large %d max header: %d\n", header_len,</div><div class='add'>+			   io_sq-&gt;tx_max_header_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV &amp;&amp;</div><div class='del'>-		     !buffer_to_push))</div><div class='add'>+	if (unlikely(io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV &amp;&amp; !buffer_to_push)) {</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Push header wasn't provided in LLQ mode\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_write_header_to_bounce(io_sq, buffer_to_push, header_len);</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	have_meta = ena_tx_ctx-&gt;meta_valid &amp;&amp; ena_com_meta_desc_changed(io_sq,</div><div class='del'>-			ena_tx_ctx);</div><div class='del'>-	if (have_meta) {</div><div class='del'>-		rc = ena_com_create_and_store_tx_meta_desc(io_sq, ena_tx_ctx);</div><div class='del'>-		if (unlikely(rc))</div><div class='del'>-			return rc;</div><div class='add'>+	rc = ena_com_create_and_store_tx_meta_desc(io_sq, ena_tx_ctx, &amp;have_meta);</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Failed to create and store tx meta desc\n");</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If the caller doesn't want to send packets */</div><div class='ctx'> 	if (unlikely(!num_bufs &amp;&amp; !header_len)) {</div><div class='ctx'> 		rc = ena_com_close_bounce_buffer(io_sq);</div><div class='add'>+		if (rc)</div><div class='add'>+			netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+				   "Failed to write buffers to LLQ\n");</div><div class='ctx'> 		*nb_hw_desc = io_sq-&gt;tail - start_tail;</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -432,16 +451,16 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 	if (!have_meta)</div><div class='ctx'> 		desc-&gt;len_ctrl |= ENA_ETH_IO_TX_DESC_FIRST_MASK;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;buff_addr_hi_hdr_sz |= (header_len &lt;&lt;</div><div class='add'>+	desc-&gt;buff_addr_hi_hdr_sz |= ((u32)header_len &lt;&lt;</div><div class='ctx'> 		ENA_ETH_IO_TX_DESC_HEADER_LENGTH_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_DESC_HEADER_LENGTH_MASK;</div><div class='del'>-	desc-&gt;len_ctrl |= (io_sq-&gt;phase &lt;&lt; ENA_ETH_IO_TX_DESC_PHASE_SHIFT) &amp;</div><div class='add'>+	desc-&gt;len_ctrl |= ((u32)io_sq-&gt;phase &lt;&lt; ENA_ETH_IO_TX_DESC_PHASE_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_DESC_PHASE_MASK;</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;len_ctrl |= ENA_ETH_IO_TX_DESC_COMP_REQ_MASK;</div><div class='ctx'> </div><div class='ctx'> 	/* Bits 0-9 */</div><div class='del'>-	desc-&gt;meta_ctrl |= (ena_tx_ctx-&gt;req_id &lt;&lt;</div><div class='add'>+	desc-&gt;meta_ctrl |= ((u32)ena_tx_ctx-&gt;req_id &lt;&lt;</div><div class='ctx'> 		ENA_ETH_IO_TX_DESC_REQ_ID_LO_SHIFT) &amp;</div><div class='ctx'> 		ENA_ETH_IO_TX_DESC_REQ_ID_LO_MASK;</div><div class='ctx'> </div><div class='hunk'>@@ -478,8 +497,11 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 		/* The first desc share the same desc as the header */</div><div class='ctx'> 		if (likely(i != 0)) {</div><div class='ctx'> 			rc = ena_com_sq_update_tail(io_sq);</div><div class='del'>-			if (unlikely(rc))</div><div class='add'>+			if (unlikely(rc)) {</div><div class='add'>+				netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+					   "Failed to update sq tail\n");</div><div class='ctx'> 				return rc;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			desc = get_sq_desc(io_sq);</div><div class='ctx'> 			if (unlikely(!desc))</div><div class='hunk'>@@ -487,7 +509,7 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,</div><div class='ctx'> </div><div class='ctx'> 			memset(desc, 0x0, sizeof(struct ena_eth_io_tx_desc));</div><div class='ctx'> </div><div class='del'>-			desc-&gt;len_ctrl |= (io_sq-&gt;phase &lt;&lt;</div><div class='add'>+			desc-&gt;len_ctrl |= ((u32)io_sq-&gt;phase &lt;&lt;</div><div class='ctx'> 				ENA_ETH_IO_TX_DESC_PHASE_SHIFT) &amp;</div><div class='ctx'> 				ENA_ETH_IO_TX_DESC_PHASE_MASK;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -508,8 +530,11 @@ int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 	desc-&gt;len_ctrl |= ENA_ETH_IO_TX_DESC_LAST_MASK;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_sq_update_tail(io_sq);</div><div class='del'>-	if (unlikely(rc))</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		netdev_err(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Failed to update sq tail of the last descriptor\n");</div><div class='ctx'> 		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_close_bounce_buffer(io_sq);</div><div class='ctx'> </div><div class='hunk'>@@ -523,45 +548,60 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq,</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_rx_buf_info *ena_buf = &amp;ena_rx_ctx-&gt;ena_bufs[0];</div><div class='ctx'> 	struct ena_eth_io_rx_cdesc_base *cdesc = NULL;</div><div class='add'>+	u16 q_depth = io_cq-&gt;q_depth;</div><div class='ctx'> 	u16 cdesc_idx = 0;</div><div class='ctx'> 	u16 nb_hw_desc;</div><div class='del'>-	u16 i;</div><div class='add'>+	u16 i = 0;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	WARN(io_cq-&gt;direction != ENA_COM_IO_QUEUE_DIRECTION_RX, "wrong Q type");</div><div class='ctx'> </div><div class='del'>-	nb_hw_desc = ena_com_cdesc_rx_pkt_get(io_cq, &amp;cdesc_idx);</div><div class='add'>+	rc = ena_com_cdesc_rx_pkt_get(io_cq, &amp;cdesc_idx, &amp;nb_hw_desc);</div><div class='add'>+	if (unlikely(rc != 0))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='ctx'> 	if (nb_hw_desc == 0) {</div><div class='ctx'> 		ena_rx_ctx-&gt;descs = nb_hw_desc;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pr_debug("fetch rx packet: queue %d completed desc: %d\n", io_cq-&gt;qid,</div><div class='del'>-		 nb_hw_desc);</div><div class='add'>+	netdev_dbg(ena_com_io_cq_to_ena_dev(io_cq)-&gt;net_device,</div><div class='add'>+		   "Fetch rx packet: queue %d completed desc: %d\n", io_cq-&gt;qid, nb_hw_desc);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(nb_hw_desc &gt; ena_rx_ctx-&gt;max_bufs)) {</div><div class='del'>-		pr_err("Too many RX cdescs (%d) &gt; MAX(%d)\n", nb_hw_desc,</div><div class='del'>-		       ena_rx_ctx-&gt;max_bufs);</div><div class='add'>+		netdev_err(ena_com_io_cq_to_ena_dev(io_cq)-&gt;net_device,</div><div class='add'>+			   "Too many RX cdescs (%d) &gt; MAX(%d)\n", nb_hw_desc, ena_rx_ctx-&gt;max_bufs);</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nb_hw_desc; i++) {</div><div class='add'>+	cdesc = ena_com_rx_cdesc_idx_to_ptr(io_cq, cdesc_idx);</div><div class='add'>+	ena_rx_ctx-&gt;pkt_offset = cdesc-&gt;offset;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ena_buf[i].len = cdesc-&gt;length;</div><div class='add'>+		ena_buf[i].req_id = cdesc-&gt;req_id;</div><div class='add'>+		if (unlikely(ena_buf[i].req_id &gt;= q_depth))</div><div class='add'>+			return -EIO;</div><div class='add'>+</div><div class='add'>+		if (++i &gt;= nb_hw_desc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		cdesc = ena_com_rx_cdesc_idx_to_ptr(io_cq, cdesc_idx + i);</div><div class='ctx'> </div><div class='del'>-		ena_buf-&gt;len = cdesc-&gt;length;</div><div class='del'>-		ena_buf-&gt;req_id = cdesc-&gt;req_id;</div><div class='del'>-		ena_buf++;</div><div class='del'>-	}</div><div class='add'>+	} while (1);</div><div class='ctx'> </div><div class='ctx'> 	/* Update SQ head ptr */</div><div class='ctx'> 	io_sq-&gt;next_to_comp += nb_hw_desc;</div><div class='ctx'> </div><div class='del'>-	pr_debug("[%s][QID#%d] Updating SQ head to: %d\n", __func__, io_sq-&gt;qid,</div><div class='del'>-		 io_sq-&gt;next_to_comp);</div><div class='add'>+	netdev_dbg(ena_com_io_cq_to_ena_dev(io_cq)-&gt;net_device,</div><div class='add'>+		   "[%s][QID#%d] Updating SQ head to: %d\n", __func__, io_sq-&gt;qid,</div><div class='add'>+		   io_sq-&gt;next_to_comp);</div><div class='ctx'> </div><div class='ctx'> 	/* Get rx flags from the last pkt */</div><div class='del'>-	ena_com_rx_set_flags(ena_rx_ctx, cdesc);</div><div class='add'>+	ena_com_rx_set_flags(io_cq, ena_rx_ctx, cdesc);</div><div class='ctx'> </div><div class='ctx'> 	ena_rx_ctx-&gt;descs = nb_hw_desc;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -584,13 +624,17 @@ int ena_com_add_single_rx_desc(struct ena_com_io_sq *io_sq,</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;length = ena_buf-&gt;len;</div><div class='ctx'> </div><div class='del'>-	desc-&gt;ctrl = ENA_ETH_IO_RX_DESC_FIRST_MASK;</div><div class='del'>-	desc-&gt;ctrl |= ENA_ETH_IO_RX_DESC_LAST_MASK;</div><div class='del'>-	desc-&gt;ctrl |= io_sq-&gt;phase &amp; ENA_ETH_IO_RX_DESC_PHASE_MASK;</div><div class='del'>-	desc-&gt;ctrl |= ENA_ETH_IO_RX_DESC_COMP_REQ_MASK;</div><div class='add'>+	desc-&gt;ctrl = ENA_ETH_IO_RX_DESC_FIRST_MASK |</div><div class='add'>+		     ENA_ETH_IO_RX_DESC_LAST_MASK |</div><div class='add'>+		     ENA_ETH_IO_RX_DESC_COMP_REQ_MASK |</div><div class='add'>+		     (io_sq-&gt;phase &amp; ENA_ETH_IO_RX_DESC_PHASE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	desc-&gt;req_id = req_id;</div><div class='ctx'> </div><div class='add'>+	netdev_dbg(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+		   "[%s] Adding single RX desc, Queue: %u, req_id: %u\n", __func__, io_sq-&gt;qid,</div><div class='add'>+		   req_id);</div><div class='add'>+</div><div class='ctx'> 	desc-&gt;buff_addr_lo = (u32)ena_buf-&gt;paddr;</div><div class='ctx'> 	desc-&gt;buff_addr_hi =</div><div class='ctx'> 		((ena_buf-&gt;paddr &amp; GENMASK_ULL(io_sq-&gt;dma_addr_bits - 1, 32)) &gt;&gt; 32);</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.h b/drivers/net/ethernet/amazon/ena/ena_eth_com.h<br/>index 340d02b64ca6..449bc4960ccc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_eth_com.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_eth_com.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_eth_com.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_eth_com.h</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ENA_ETH_COM_H_</div><div class='hunk'>@@ -35,8 +8,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "ena_com.h"</div><div class='ctx'> </div><div class='del'>-/* head update threshold in units of (queue size / ENA_COMP_HEAD_THRESH) */</div><div class='del'>-#define ENA_COMP_HEAD_THRESH 4</div><div class='add'>+/* we allow 2 DMA descriptors per LLQ entry */</div><div class='add'>+#define ENA_LLQ_ENTRY_DESC_CHUNK_SIZE	(2 * sizeof(struct ena_eth_io_tx_desc))</div><div class='add'>+#define ENA_LLQ_HEADER		(128UL - ENA_LLQ_ENTRY_DESC_CHUNK_SIZE)</div><div class='add'>+#define ENA_LLQ_LARGE_HEADER	(256UL - ENA_LLQ_ENTRY_DESC_CHUNK_SIZE)</div><div class='ctx'> </div><div class='ctx'> struct ena_com_tx_ctx {</div><div class='ctx'> 	struct ena_com_tx_meta ena_meta;</div><div class='hunk'>@@ -72,7 +47,8 @@ struct ena_com_rx_ctx {</div><div class='ctx'> 	bool frag;</div><div class='ctx'> 	u32 hash;</div><div class='ctx'> 	u16 descs;</div><div class='del'>-	int max_bufs;</div><div class='add'>+	u16 max_bufs;</div><div class='add'>+	u8 pkt_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int ena_com_prepare_tx(struct ena_com_io_sq *io_sq,</div><div class='hunk'>@@ -95,7 +71,7 @@ static inline void ena_com_unmask_intr(struct ena_com_io_cq *io_cq,</div><div class='ctx'> 	writel(intr_reg-&gt;intr_control, io_cq-&gt;unmask_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_free_desc(struct ena_com_io_sq *io_sq)</div><div class='add'>+static inline int ena_com_free_q_entries(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tail, next_to_comp, cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +89,7 @@ static inline bool ena_com_sq_have_enough_space(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 	int temp;</div><div class='ctx'> </div><div class='ctx'> 	if (io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST)</div><div class='del'>-		return ena_com_free_desc(io_sq) &gt;= required_buffers;</div><div class='add'>+		return ena_com_free_q_entries(io_sq) &gt;= required_buffers;</div><div class='ctx'> </div><div class='ctx'> 	/* This calculation doesn't need to be 100% accurate. So to reduce</div><div class='ctx'> 	 * the calculation overhead just Subtract 2 lines from the free descs</div><div class='hunk'>@@ -122,35 +98,72 @@ static inline bool ena_com_sq_have_enough_space(struct ena_com_io_sq *io_sq,</div><div class='ctx'> 	 */</div><div class='ctx'> 	temp = required_buffers / io_sq-&gt;llq_info.descs_per_entry + 2;</div><div class='ctx'> </div><div class='del'>-	return ena_com_free_desc(io_sq) &gt; temp;</div><div class='add'>+	return ena_com_free_q_entries(io_sq) &gt; temp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq)</div><div class='add'>+static inline bool ena_com_meta_desc_changed(struct ena_com_io_sq *io_sq,</div><div class='add'>+					     struct ena_com_tx_ctx *ena_tx_ctx)</div><div class='ctx'> {</div><div class='del'>-	u16 tail = io_sq-&gt;tail;</div><div class='add'>+	if (!ena_tx_ctx-&gt;meta_valid)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	pr_debug("write submission queue doorbell for queue: %d tail: %d\n",</div><div class='del'>-		 io_sq-&gt;qid, tail);</div><div class='add'>+	return !!memcmp(&amp;io_sq-&gt;cached_tx_meta,</div><div class='add'>+			&amp;ena_tx_ctx-&gt;ena_meta,</div><div class='add'>+			sizeof(struct ena_com_tx_meta));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	writel(tail, io_sq-&gt;db_addr);</div><div class='add'>+static inline bool is_llq_max_tx_burst_exists(struct ena_com_io_sq *io_sq)</div><div class='add'>+{</div><div class='add'>+	return (io_sq-&gt;mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) &amp;&amp;</div><div class='add'>+	       io_sq-&gt;llq_info.max_entries_in_tx_burst &gt; 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static inline bool ena_com_is_doorbell_needed(struct ena_com_io_sq *io_sq,</div><div class='add'>+					      struct ena_com_tx_ctx *ena_tx_ctx)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_llq_info *llq_info;</div><div class='add'>+	int descs_after_first_entry;</div><div class='add'>+	int num_entries_needed = 1;</div><div class='add'>+	u16 num_descs;</div><div class='add'>+</div><div class='add'>+	if (!is_llq_max_tx_burst_exists(io_sq))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	llq_info = &amp;io_sq-&gt;llq_info;</div><div class='add'>+	num_descs = ena_tx_ctx-&gt;num_bufs;</div><div class='add'>+</div><div class='add'>+	if (llq_info-&gt;disable_meta_caching ||</div><div class='add'>+	    unlikely(ena_com_meta_desc_changed(io_sq, ena_tx_ctx)))</div><div class='add'>+		++num_descs;</div><div class='add'>+</div><div class='add'>+	if (num_descs &gt; llq_info-&gt;descs_num_before_header) {</div><div class='add'>+		descs_after_first_entry = num_descs - llq_info-&gt;descs_num_before_header;</div><div class='add'>+		num_entries_needed += DIV_ROUND_UP(descs_after_first_entry,</div><div class='add'>+						   llq_info-&gt;descs_per_entry);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+		   "Queue: %d num_descs: %d num_entries_needed: %d\n", io_sq-&gt;qid, num_descs,</div><div class='add'>+		   num_entries_needed);</div><div class='add'>+</div><div class='add'>+	return num_entries_needed &gt; io_sq-&gt;entries_in_tx_burst_left;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_com_update_dev_comp_head(struct ena_com_io_cq *io_cq)</div><div class='add'>+static inline int ena_com_write_sq_doorbell(struct ena_com_io_sq *io_sq)</div><div class='ctx'> {</div><div class='del'>-	u16 unreported_comp, head;</div><div class='del'>-	bool need_update;</div><div class='del'>-</div><div class='del'>-	head = io_cq-&gt;head;</div><div class='del'>-	unreported_comp = head - io_cq-&gt;last_head_update;</div><div class='del'>-	need_update = unreported_comp &gt; (io_cq-&gt;q_depth / ENA_COMP_HEAD_THRESH);</div><div class='del'>-</div><div class='del'>-	if (io_cq-&gt;cq_head_db_reg &amp;&amp; need_update) {</div><div class='del'>-		pr_debug("Write completion queue doorbell for queue %d: head: %d\n",</div><div class='del'>-			 io_cq-&gt;qid, head);</div><div class='del'>-		writel(head, io_cq-&gt;cq_head_db_reg);</div><div class='del'>-		io_cq-&gt;last_head_update = head;</div><div class='add'>+	u16 max_entries_in_tx_burst = io_sq-&gt;llq_info.max_entries_in_tx_burst;</div><div class='add'>+	u16 tail = io_sq-&gt;tail;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+		   "Write submission queue doorbell for queue: %d tail: %d\n", io_sq-&gt;qid, tail);</div><div class='add'>+</div><div class='add'>+	writel(tail, io_sq-&gt;db_addr);</div><div class='add'>+</div><div class='add'>+	if (is_llq_max_tx_burst_exists(io_sq)) {</div><div class='add'>+		netdev_dbg(ena_com_io_sq_to_ena_dev(io_sq)-&gt;net_device,</div><div class='add'>+			   "Reset available entries in tx burst for queue %d to %d\n", io_sq-&gt;qid,</div><div class='add'>+			   max_entries_in_tx_burst);</div><div class='add'>+		io_sq-&gt;entries_in_tx_burst_left = max_entries_in_tx_burst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -210,7 +223,8 @@ static inline int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq,</div><div class='ctx'> </div><div class='ctx'> 	*req_id = READ_ONCE(cdesc-&gt;req_id);</div><div class='ctx'> 	if (unlikely(*req_id &gt;= io_cq-&gt;q_depth)) {</div><div class='del'>-		pr_err("Invalid req id %d\n", cdesc-&gt;req_id);</div><div class='add'>+		netdev_err(ena_com_io_cq_to_ena_dev(io_cq)-&gt;net_device, "Invalid req id %d\n",</div><div class='add'>+			   cdesc-&gt;req_id);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h b/drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h<br/>index 00e0f056a741..332ac0d28ac7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_eth_io_defs.h</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 - 2016 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ENA_ETH_IO_H_</div><div class='ctx'> #define _ENA_ETH_IO_H_</div><div class='hunk'>@@ -264,7 +237,9 @@ struct ena_eth_io_rx_cdesc_base {</div><div class='ctx'> </div><div class='ctx'> 	u16 sub_qid;</div><div class='ctx'> </div><div class='del'>-	u16 reserved;</div><div class='add'>+	u8 offset;</div><div class='add'>+</div><div class='add'>+	u8 reserved;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* 8-word format */</div><div class='hunk'>@@ -412,4 +387,4 @@ struct ena_eth_io_numa_node_cfg_reg {</div><div class='ctx'> #define ENA_ETH_IO_NUMA_NODE_CFG_REG_ENABLED_SHIFT          31</div><div class='ctx'> #define ENA_ETH_IO_NUMA_NODE_CFG_REG_ENABLED_MASK           BIT(31)</div><div class='ctx'> </div><div class='del'>-#endif /*_ENA_ETH_IO_H_ */</div><div class='add'>+#endif /* _ENA_ETH_IO_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c<br/>index fe596bc30a96..fe3479b84a1f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_ethtool.c</a></div><div class='hunk'>@@ -1,52 +1,38 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ena_netdev.h"</div><div class='add'>+#include "ena_xdp.h"</div><div class='add'>+#include "ena_phc.h"</div><div class='ctx'> </div><div class='ctx'> struct ena_stats {</div><div class='ctx'> 	char name[ETH_GSTRING_LEN];</div><div class='ctx'> 	int stat_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct ena_hw_metrics {</div><div class='add'>+	char name[ETH_GSTRING_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define ENA_STAT_ENA_COM_ENTRY(stat) { \</div><div class='ctx'> 	.name = #stat, \</div><div class='del'>-	.stat_offset = offsetof(struct ena_com_stats_admin, stat) \</div><div class='add'>+	.stat_offset = offsetof(struct ena_com_stats_admin, stat) / sizeof(u64) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ENA_STAT_ENTRY(stat, stat_type) { \</div><div class='ctx'> 	.name = #stat, \</div><div class='del'>-	.stat_offset = offsetof(struct ena_stats_##stat_type, stat) \</div><div class='add'>+	.stat_offset = offsetof(struct ena_stats_##stat_type, stat) / sizeof(u64) \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ENA_STAT_HW_ENTRY(stat, stat_type) { \</div><div class='add'>+	.name = #stat, \</div><div class='add'>+	.stat_offset = offsetof(struct ena_admin_##stat_type, stat) / sizeof(u64) \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define ENA_STAT_RX_ENTRY(stat) \</div><div class='hunk'>@@ -58,6 +44,21 @@ struct ena_stats {</div><div class='ctx'> #define ENA_STAT_GLOBAL_ENTRY(stat) \</div><div class='ctx'> 	ENA_STAT_ENTRY(stat, dev)</div><div class='ctx'> </div><div class='add'>+#define ENA_STAT_ENI_ENTRY(stat) \</div><div class='add'>+	ENA_STAT_HW_ENTRY(stat, eni_stats)</div><div class='add'>+</div><div class='add'>+#define ENA_STAT_ENA_SRD_ENTRY(stat) \</div><div class='add'>+	ENA_STAT_HW_ENTRY(stat, ena_srd_stats)</div><div class='add'>+</div><div class='add'>+#define ENA_STAT_ENA_SRD_MODE_ENTRY(stat) { \</div><div class='add'>+	.name = #stat, \</div><div class='add'>+	.stat_offset = offsetof(struct ena_admin_ena_srd_info, flags) / sizeof(u64) \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ENA_METRIC_ENI_ENTRY(stat) { \</div><div class='add'>+	.name = #stat \</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ena_stats ena_stats_global_strings[] = {</div><div class='ctx'> 	ENA_STAT_GLOBAL_ENTRY(tx_timeout),</div><div class='ctx'> 	ENA_STAT_GLOBAL_ENTRY(suspend),</div><div class='hunk'>@@ -66,6 +67,35 @@ static const struct ena_stats ena_stats_global_strings[] = {</div><div class='ctx'> 	ENA_STAT_GLOBAL_ENTRY(interface_up),</div><div class='ctx'> 	ENA_STAT_GLOBAL_ENTRY(interface_down),</div><div class='ctx'> 	ENA_STAT_GLOBAL_ENTRY(admin_q_pause),</div><div class='add'>+	ENA_STAT_GLOBAL_ENTRY(reset_fail),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A partial list of hw stats. Used when admin command</div><div class='add'>+ * with type ENA_ADMIN_GET_STATS_TYPE_CUSTOMER_METRICS is not supported</div><div class='add'>+ */</div><div class='add'>+static const struct ena_stats ena_stats_eni_strings[] = {</div><div class='add'>+	ENA_STAT_ENI_ENTRY(bw_in_allowance_exceeded),</div><div class='add'>+	ENA_STAT_ENI_ENTRY(bw_out_allowance_exceeded),</div><div class='add'>+	ENA_STAT_ENI_ENTRY(pps_allowance_exceeded),</div><div class='add'>+	ENA_STAT_ENI_ENTRY(conntrack_allowance_exceeded),</div><div class='add'>+	ENA_STAT_ENI_ENTRY(linklocal_allowance_exceeded),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ena_hw_metrics ena_hw_stats_strings[] = {</div><div class='add'>+	ENA_METRIC_ENI_ENTRY(bw_in_allowance_exceeded),</div><div class='add'>+	ENA_METRIC_ENI_ENTRY(bw_out_allowance_exceeded),</div><div class='add'>+	ENA_METRIC_ENI_ENTRY(pps_allowance_exceeded),</div><div class='add'>+	ENA_METRIC_ENI_ENTRY(conntrack_allowance_exceeded),</div><div class='add'>+	ENA_METRIC_ENI_ENTRY(linklocal_allowance_exceeded),</div><div class='add'>+	ENA_METRIC_ENI_ENTRY(conntrack_allowance_available),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ena_stats ena_srd_info_strings[] = {</div><div class='add'>+	ENA_STAT_ENA_SRD_MODE_ENTRY(ena_srd_mode),</div><div class='add'>+	ENA_STAT_ENA_SRD_ENTRY(ena_srd_tx_pkts),</div><div class='add'>+	ENA_STAT_ENA_SRD_ENTRY(ena_srd_eligible_tx_pkts),</div><div class='add'>+	ENA_STAT_ENA_SRD_ENTRY(ena_srd_rx_pkts),</div><div class='add'>+	ENA_STAT_ENA_SRD_ENTRY(ena_srd_resource_utilization)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ena_stats ena_stats_tx_strings[] = {</div><div class='hunk'>@@ -83,21 +113,29 @@ static const struct ena_stats ena_stats_tx_strings[] = {</div><div class='ctx'> 	ENA_STAT_TX_ENTRY(bad_req_id),</div><div class='ctx'> 	ENA_STAT_TX_ENTRY(llq_buffer_copy),</div><div class='ctx'> 	ENA_STAT_TX_ENTRY(missed_tx),</div><div class='add'>+	ENA_STAT_TX_ENTRY(unmask_interrupt),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ena_stats ena_stats_rx_strings[] = {</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(cnt),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(bytes),</div><div class='add'>+	ENA_STAT_RX_ENTRY(rx_copybreak_pkt),</div><div class='add'>+	ENA_STAT_RX_ENTRY(csum_good),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(refil_partial),</div><div class='del'>-	ENA_STAT_RX_ENTRY(bad_csum),</div><div class='add'>+	ENA_STAT_RX_ENTRY(csum_bad),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(page_alloc_fail),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(skb_alloc_fail),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(dma_mapping_err),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(bad_desc_num),</div><div class='del'>-	ENA_STAT_RX_ENTRY(rx_copybreak_pkt),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(bad_req_id),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(empty_rx_ring),</div><div class='ctx'> 	ENA_STAT_RX_ENTRY(csum_unchecked),</div><div class='add'>+	ENA_STAT_RX_ENTRY(xdp_aborted),</div><div class='add'>+	ENA_STAT_RX_ENTRY(xdp_drop),</div><div class='add'>+	ENA_STAT_RX_ENTRY(xdp_pass),</div><div class='add'>+	ENA_STAT_RX_ENTRY(xdp_tx),</div><div class='add'>+	ENA_STAT_RX_ENTRY(xdp_invalid),</div><div class='add'>+	ENA_STAT_RX_ENTRY(xdp_redirect),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ena_stats ena_stats_ena_com_strings[] = {</div><div class='hunk'>@@ -108,10 +146,13 @@ static const struct ena_stats ena_stats_ena_com_strings[] = {</div><div class='ctx'> 	ENA_STAT_ENA_COM_ENTRY(no_completion),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define ENA_STATS_ARRAY_GLOBAL	ARRAY_SIZE(ena_stats_global_strings)</div><div class='del'>-#define ENA_STATS_ARRAY_TX	ARRAY_SIZE(ena_stats_tx_strings)</div><div class='del'>-#define ENA_STATS_ARRAY_RX	ARRAY_SIZE(ena_stats_rx_strings)</div><div class='del'>-#define ENA_STATS_ARRAY_ENA_COM	ARRAY_SIZE(ena_stats_ena_com_strings)</div><div class='add'>+#define ENA_STATS_ARRAY_GLOBAL		ARRAY_SIZE(ena_stats_global_strings)</div><div class='add'>+#define ENA_STATS_ARRAY_TX		ARRAY_SIZE(ena_stats_tx_strings)</div><div class='add'>+#define ENA_STATS_ARRAY_RX		ARRAY_SIZE(ena_stats_rx_strings)</div><div class='add'>+#define ENA_STATS_ARRAY_ENA_COM		ARRAY_SIZE(ena_stats_ena_com_strings)</div><div class='add'>+#define ENA_STATS_ARRAY_ENI		ARRAY_SIZE(ena_stats_eni_strings)</div><div class='add'>+#define ENA_STATS_ARRAY_ENA_SRD		ARRAY_SIZE(ena_srd_info_strings)</div><div class='add'>+#define ENA_METRICS_ARRAY_ENI		ARRAY_SIZE(ena_hw_stats_strings)</div><div class='ctx'> </div><div class='ctx'> static void ena_safe_update_stat(u64 *src, u64 *dst,</div><div class='ctx'> 				 struct u64_stats_sync *syncp)</div><div class='hunk'>@@ -119,9 +160,60 @@ static void ena_safe_update_stat(u64 *src, u64 *dst,</div><div class='ctx'> 	unsigned int start;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(syncp);</div><div class='add'>+		start = u64_stats_fetch_begin(syncp);</div><div class='ctx'> 		*(dst) = *src;</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(syncp, start));</div><div class='add'>+	} while (u64_stats_fetch_retry(syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_metrics_stats(struct ena_adapter *adapter, u64 **data)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *dev = adapter-&gt;ena_dev;</div><div class='add'>+	const struct ena_stats *ena_stats;</div><div class='add'>+	u64 *ptr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ena_com_get_cap(dev, ENA_ADMIN_CUSTOMER_METRICS)) {</div><div class='add'>+		u32 supported_metrics_count;</div><div class='add'>+		int len;</div><div class='add'>+</div><div class='add'>+		supported_metrics_count = ena_com_get_customer_metric_count(dev);</div><div class='add'>+		len = supported_metrics_count * sizeof(u64);</div><div class='add'>+</div><div class='add'>+		/* Fill the data buffer, and advance its pointer */</div><div class='add'>+		ena_com_get_customer_metrics(dev, (char *)(*data), len);</div><div class='add'>+		(*data) += supported_metrics_count;</div><div class='add'>+</div><div class='add'>+	} else if (ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS)) {</div><div class='add'>+		ena_com_get_eni_stats(dev, &amp;adapter-&gt;eni_stats);</div><div class='add'>+		/* Updating regardless of rc - once we told ethtool how many stats we have</div><div class='add'>+		 * it will print that much stats. We can't leave holes in the stats</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ENA_STATS_ARRAY_ENI; i++) {</div><div class='add'>+			ena_stats = &amp;ena_stats_eni_strings[i];</div><div class='add'>+</div><div class='add'>+			ptr = (u64 *)&amp;adapter-&gt;eni_stats +</div><div class='add'>+				ena_stats-&gt;stat_offset;</div><div class='add'>+</div><div class='add'>+			ena_safe_update_stat(ptr, (*data)++, &amp;adapter-&gt;syncp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ena_com_get_cap(dev, ENA_ADMIN_ENA_SRD_INFO)) {</div><div class='add'>+		ena_com_get_ena_srd_info(dev, &amp;adapter-&gt;ena_srd_info);</div><div class='add'>+		/* Get ENA SRD mode */</div><div class='add'>+		ptr = (u64 *)&amp;adapter-&gt;ena_srd_info;</div><div class='add'>+		ena_safe_update_stat(ptr, (*data)++, &amp;adapter-&gt;syncp);</div><div class='add'>+		for (i = 1; i &lt; ENA_STATS_ARRAY_ENA_SRD; i++) {</div><div class='add'>+			ena_stats = &amp;ena_srd_info_strings[i];</div><div class='add'>+			/* Wrapped within an outer struct - need to accommodate an</div><div class='add'>+			 * additional offset of the ENA SRD mode that was already processed</div><div class='add'>+			 */</div><div class='add'>+			ptr = (u64 *)&amp;adapter-&gt;ena_srd_info +</div><div class='add'>+				ena_stats-&gt;stat_offset + 1;</div><div class='add'>+</div><div class='add'>+			ena_safe_update_stat(ptr, (*data)++, &amp;adapter-&gt;syncp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)</div><div class='hunk'>@@ -132,29 +224,30 @@ static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)</div><div class='ctx'> 	u64 *ptr;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues; i++) {</div><div class='ctx'> 		/* Tx stats */</div><div class='ctx'> 		ring = &amp;adapter-&gt;tx_ring[i];</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; ENA_STATS_ARRAY_TX; j++) {</div><div class='ctx'> 			ena_stats = &amp;ena_stats_tx_strings[j];</div><div class='ctx'> </div><div class='del'>-			ptr = (u64 *)((uintptr_t)&amp;ring-&gt;tx_stats +</div><div class='del'>-				(uintptr_t)ena_stats-&gt;stat_offset);</div><div class='add'>+			ptr = (u64 *)&amp;ring-&gt;tx_stats + ena_stats-&gt;stat_offset;</div><div class='ctx'> </div><div class='ctx'> 			ena_safe_update_stat(ptr, (*data)++, &amp;ring-&gt;syncp);</div><div class='ctx'> 		}</div><div class='add'>+		/* XDP TX queues don't have a RX queue counterpart */</div><div class='add'>+		if (!ENA_IS_XDP_INDEX(adapter, i)) {</div><div class='add'>+			/* Rx stats */</div><div class='add'>+			ring = &amp;adapter-&gt;rx_ring[i];</div><div class='ctx'> </div><div class='del'>-		/* Rx stats */</div><div class='del'>-		ring = &amp;adapter-&gt;rx_ring[i];</div><div class='add'>+			for (j = 0; j &lt; ENA_STATS_ARRAY_RX; j++) {</div><div class='add'>+				ena_stats = &amp;ena_stats_rx_strings[j];</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; ENA_STATS_ARRAY_RX; j++) {</div><div class='del'>-			ena_stats = &amp;ena_stats_rx_strings[j];</div><div class='del'>-</div><div class='del'>-			ptr = (u64 *)((uintptr_t)&amp;ring-&gt;rx_stats +</div><div class='del'>-				(uintptr_t)ena_stats-&gt;stat_offset);</div><div class='add'>+				ptr = (u64 *)&amp;ring-&gt;rx_stats +</div><div class='add'>+					ena_stats-&gt;stat_offset;</div><div class='ctx'> </div><div class='del'>-			ena_safe_update_stat(ptr, (*data)++, &amp;ring-&gt;syncp);</div><div class='add'>+				ena_safe_update_stat(ptr, (*data)++, &amp;ring-&gt;syncp);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -162,24 +255,23 @@ static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)</div><div class='ctx'> static void ena_dev_admin_queue_stats(struct ena_adapter *adapter, u64 **data)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ena_stats *ena_stats;</div><div class='del'>-	u32 *ptr;</div><div class='add'>+	u64 *ptr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ENA_STATS_ARRAY_ENA_COM; i++) {</div><div class='ctx'> 		ena_stats = &amp;ena_stats_ena_com_strings[i];</div><div class='ctx'> </div><div class='del'>-		ptr = (u32 *)((uintptr_t)&amp;adapter-&gt;ena_dev-&gt;admin_queue.stats +</div><div class='del'>-			(uintptr_t)ena_stats-&gt;stat_offset);</div><div class='add'>+		ptr = (u64 *)&amp;adapter-&gt;ena_dev-&gt;admin_queue.stats +</div><div class='add'>+			ena_stats-&gt;stat_offset;</div><div class='ctx'> </div><div class='ctx'> 		*(*data)++ = *ptr;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_get_ethtool_stats(struct net_device *netdev,</div><div class='del'>-				  struct ethtool_stats *stats,</div><div class='del'>-				  u64 *data)</div><div class='add'>+static void ena_get_stats(struct ena_adapter *adapter,</div><div class='add'>+			  u64 *data,</div><div class='add'>+			  bool hw_stats_needed)</div><div class='ctx'> {</div><div class='del'>-	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	const struct ena_stats *ena_stats;</div><div class='ctx'> 	u64 *ptr;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -187,48 +279,129 @@ static void ena_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 	for (i = 0; i &lt; ENA_STATS_ARRAY_GLOBAL; i++) {</div><div class='ctx'> 		ena_stats = &amp;ena_stats_global_strings[i];</div><div class='ctx'> </div><div class='del'>-		ptr = (u64 *)((uintptr_t)&amp;adapter-&gt;dev_stats +</div><div class='del'>-			(uintptr_t)ena_stats-&gt;stat_offset);</div><div class='add'>+		ptr = (u64 *)&amp;adapter-&gt;dev_stats + ena_stats-&gt;stat_offset;</div><div class='ctx'> </div><div class='ctx'> 		ena_safe_update_stat(ptr, data++, &amp;adapter-&gt;syncp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hw_stats_needed)</div><div class='add'>+		ena_metrics_stats(adapter, &amp;data);</div><div class='add'>+</div><div class='ctx'> 	ena_queue_stats(adapter, &amp;data);</div><div class='ctx'> 	ena_dev_admin_queue_stats(adapter, &amp;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int ena_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+static void ena_get_ethtool_stats(struct net_device *netdev,</div><div class='add'>+				  struct ethtool_stats *stats,</div><div class='add'>+				  u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (sset != ETH_SS_STATS)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	ena_get_stats(adapter, data, true);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return  adapter-&gt;num_queues * (ENA_STATS_ARRAY_TX + ENA_STATS_ARRAY_RX)</div><div class='add'>+static int ena_get_ts_info(struct net_device *netdev,</div><div class='add'>+			   struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	info-&gt;phc_index = ena_phc_get_index(adapter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_get_sw_stats_count(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return adapter-&gt;num_io_queues * (ENA_STATS_ARRAY_TX + ENA_STATS_ARRAY_RX)</div><div class='add'>+		+ adapter-&gt;xdp_num_queues * ENA_STATS_ARRAY_TX</div><div class='ctx'> 		+ ENA_STATS_ARRAY_GLOBAL + ENA_STATS_ARRAY_ENA_COM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ena_get_hw_stats_count(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *dev = adapter-&gt;ena_dev;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	count = ENA_STATS_ARRAY_ENA_SRD * ena_com_get_cap(dev, ENA_ADMIN_ENA_SRD_INFO);</div><div class='add'>+</div><div class='add'>+	if (ena_com_get_cap(dev, ENA_ADMIN_CUSTOMER_METRICS))</div><div class='add'>+		count += ena_com_get_customer_metric_count(dev);</div><div class='add'>+	else if (ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS))</div><div class='add'>+		count += ENA_STATS_ARRAY_ENI;</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return ena_get_sw_stats_count(adapter) +</div><div class='add'>+		       ena_get_hw_stats_count(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_metrics_stats_strings(struct ena_adapter *adapter, u8 **data)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *dev = adapter-&gt;ena_dev;</div><div class='add'>+	const struct ena_hw_metrics *ena_metrics;</div><div class='add'>+	const struct ena_stats *ena_stats;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (ena_com_get_cap(dev, ENA_ADMIN_CUSTOMER_METRICS)) {</div><div class='add'>+		for (i = 0; i &lt; ENA_METRICS_ARRAY_ENI; i++) {</div><div class='add'>+			if (ena_com_get_customer_metric_support(dev, i)) {</div><div class='add'>+				ena_metrics = &amp;ena_hw_stats_strings[i];</div><div class='add'>+				ethtool_puts(data, ena_metrics-&gt;name);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else if (ena_com_get_cap(dev, ENA_ADMIN_ENI_STATS)) {</div><div class='add'>+		for (i = 0; i &lt; ENA_STATS_ARRAY_ENI; i++) {</div><div class='add'>+			ena_stats = &amp;ena_stats_eni_strings[i];</div><div class='add'>+			ethtool_puts(data, ena_stats-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ena_com_get_cap(dev, ENA_ADMIN_ENA_SRD_INFO)) {</div><div class='add'>+		for (i = 0; i &lt; ENA_STATS_ARRAY_ENA_SRD; i++) {</div><div class='add'>+			ena_stats = &amp;ena_srd_info_strings[i];</div><div class='add'>+			ethtool_puts(data, ena_stats-&gt;name);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)</div><div class='ctx'> {</div><div class='ctx'> 	const struct ena_stats *ena_stats;</div><div class='add'>+	bool is_xdp;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues; i++) {</div><div class='add'>+		is_xdp = ENA_IS_XDP_INDEX(adapter, i);</div><div class='ctx'> 		/* Tx stats */</div><div class='ctx'> 		for (j = 0; j &lt; ENA_STATS_ARRAY_TX; j++) {</div><div class='ctx'> 			ena_stats = &amp;ena_stats_tx_strings[j];</div><div class='ctx'> </div><div class='del'>-			snprintf(*data, ETH_GSTRING_LEN,</div><div class='del'>-				 "queue_%u_tx_%s", i, ena_stats-&gt;name);</div><div class='del'>-			 (*data) += ETH_GSTRING_LEN;</div><div class='add'>+			ethtool_sprintf(data,</div><div class='add'>+					"queue_%u_%s_%s", i,</div><div class='add'>+					is_xdp ? "xdp_tx" : "tx",</div><div class='add'>+					ena_stats-&gt;name);</div><div class='ctx'> 		}</div><div class='del'>-		/* Rx stats */</div><div class='add'>+</div><div class='add'>+		/* In XDP there isn't an RX queue counterpart */</div><div class='add'>+		if (is_xdp)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		for (j = 0; j &lt; ENA_STATS_ARRAY_RX; j++) {</div><div class='ctx'> 			ena_stats = &amp;ena_stats_rx_strings[j];</div><div class='ctx'> </div><div class='del'>-			snprintf(*data, ETH_GSTRING_LEN,</div><div class='del'>-				 "queue_%u_rx_%s", i, ena_stats-&gt;name);</div><div class='del'>-			(*data) += ETH_GSTRING_LEN;</div><div class='add'>+			ethtool_sprintf(data, "queue_%u_rx_%s", i, ena_stats-&gt;name);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -241,32 +414,43 @@ static void ena_com_dev_strings(u8 **data)</div><div class='ctx'> 	for (i = 0; i &lt; ENA_STATS_ARRAY_ENA_COM; i++) {</div><div class='ctx'> 		ena_stats = &amp;ena_stats_ena_com_strings[i];</div><div class='ctx'> </div><div class='del'>-		snprintf(*data, ETH_GSTRING_LEN,</div><div class='del'>-			 "ena_admin_q_%s", ena_stats-&gt;name);</div><div class='del'>-		(*data) += ETH_GSTRING_LEN;</div><div class='add'>+		ethtool_sprintf(data,</div><div class='add'>+				"ena_admin_q_%s", ena_stats-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_get_strings(struct net_device *netdev, u32 sset, u8 *data)</div><div class='add'>+static void ena_get_strings(struct ena_adapter *adapter,</div><div class='add'>+			    u8 *data,</div><div class='add'>+			    bool hw_stats_needed)</div><div class='ctx'> {</div><div class='del'>-	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	const struct ena_stats *ena_stats;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (sset != ETH_SS_STATS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; ENA_STATS_ARRAY_GLOBAL; i++) {</div><div class='ctx'> 		ena_stats = &amp;ena_stats_global_strings[i];</div><div class='del'>-</div><div class='del'>-		memcpy(data, ena_stats-&gt;name, ETH_GSTRING_LEN);</div><div class='del'>-		data += ETH_GSTRING_LEN;</div><div class='add'>+		ethtool_puts(&amp;data, ena_stats-&gt;name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (hw_stats_needed)</div><div class='add'>+		ena_metrics_stats_strings(adapter, &amp;data);</div><div class='add'>+</div><div class='ctx'> 	ena_queue_strings(adapter, &amp;data);</div><div class='ctx'> 	ena_com_dev_strings(&amp;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ena_get_ethtool_strings(struct net_device *netdev,</div><div class='add'>+				    u32 sset,</div><div class='add'>+				    u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		ena_get_strings(adapter, data, true);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ena_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 				  struct ethtool_link_ksettings *link_ksettings)</div><div class='ctx'> {</div><div class='hunk'>@@ -300,120 +484,85 @@ static int ena_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ena_get_coalesce(struct net_device *net_dev,</div><div class='del'>-			    struct ethtool_coalesce *coalesce)</div><div class='add'>+			    struct ethtool_coalesce *coalesce,</div><div class='add'>+			    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(net_dev);</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='del'>-	struct ena_intr_moder_entry intr_moder_entry;</div><div class='ctx'> </div><div class='del'>-	if (!ena_com_interrupt_moderation_supported(ena_dev)) {</div><div class='del'>-		/* the devie doesn't support interrupt moderation */</div><div class='add'>+	if (!ena_com_interrupt_moderation_supported(ena_dev))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	coalesce-&gt;tx_coalesce_usecs =</div><div class='del'>-		ena_com_get_nonadaptive_moderation_interval_tx(ena_dev) /</div><div class='add'>+		ena_com_get_nonadaptive_moderation_interval_tx(ena_dev) *</div><div class='ctx'> 			ena_dev-&gt;intr_delay_resolution;</div><div class='del'>-	if (!ena_com_get_adaptive_moderation_enabled(ena_dev)) {</div><div class='del'>-		coalesce-&gt;rx_coalesce_usecs =</div><div class='del'>-			ena_com_get_nonadaptive_moderation_interval_rx(ena_dev)</div><div class='del'>-			/ ena_dev-&gt;intr_delay_resolution;</div><div class='del'>-	} else {</div><div class='del'>-		ena_com_get_intr_moderation_entry(adapter-&gt;ena_dev, ENA_INTR_MODER_LOWEST, &amp;intr_moder_entry);</div><div class='del'>-		coalesce-&gt;rx_coalesce_usecs_low = intr_moder_entry.intr_moder_interval;</div><div class='del'>-		coalesce-&gt;rx_max_coalesced_frames_low = intr_moder_entry.pkts_per_interval;</div><div class='ctx'> </div><div class='del'>-		ena_com_get_intr_moderation_entry(adapter-&gt;ena_dev, ENA_INTR_MODER_MID, &amp;intr_moder_entry);</div><div class='del'>-		coalesce-&gt;rx_coalesce_usecs = intr_moder_entry.intr_moder_interval;</div><div class='del'>-		coalesce-&gt;rx_max_coalesced_frames = intr_moder_entry.pkts_per_interval;</div><div class='add'>+	coalesce-&gt;rx_coalesce_usecs =</div><div class='add'>+		ena_com_get_nonadaptive_moderation_interval_rx(ena_dev)</div><div class='add'>+		* ena_dev-&gt;intr_delay_resolution;</div><div class='ctx'> </div><div class='del'>-		ena_com_get_intr_moderation_entry(adapter-&gt;ena_dev, ENA_INTR_MODER_HIGHEST, &amp;intr_moder_entry);</div><div class='del'>-		coalesce-&gt;rx_coalesce_usecs_high = intr_moder_entry.intr_moder_interval;</div><div class='del'>-		coalesce-&gt;rx_max_coalesced_frames_high = intr_moder_entry.pkts_per_interval;</div><div class='del'>-	}</div><div class='ctx'> 	coalesce-&gt;use_adaptive_rx_coalesce =</div><div class='ctx'> 		ena_com_get_adaptive_moderation_enabled(ena_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_update_tx_rings_intr_moderation(struct ena_adapter *adapter)</div><div class='add'>+static void ena_update_tx_rings_nonadaptive_intr_moderation(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	val = ena_com_get_nonadaptive_moderation_interval_tx(adapter-&gt;ena_dev);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++)</div><div class='ctx'> 		adapter-&gt;tx_ring[i].smoothed_interval = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ena_update_rx_rings_nonadaptive_intr_moderation(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	unsigned int val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	val = ena_com_get_nonadaptive_moderation_interval_rx(adapter-&gt;ena_dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++)</div><div class='add'>+		adapter-&gt;rx_ring[i].smoothed_interval = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ena_set_coalesce(struct net_device *net_dev,</div><div class='del'>-			    struct ethtool_coalesce *coalesce)</div><div class='add'>+			    struct ethtool_coalesce *coalesce,</div><div class='add'>+			    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(net_dev);</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='del'>-	struct ena_intr_moder_entry intr_moder_entry;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!ena_com_interrupt_moderation_supported(ena_dev)) {</div><div class='del'>-		/* the devie doesn't support interrupt moderation */</div><div class='add'>+	if (!ena_com_interrupt_moderation_supported(ena_dev))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (coalesce-&gt;rx_coalesce_usecs_irq ||</div><div class='del'>-	    coalesce-&gt;rx_max_coalesced_frames_irq ||</div><div class='del'>-	    coalesce-&gt;tx_coalesce_usecs_irq ||</div><div class='del'>-	    coalesce-&gt;tx_max_coalesced_frames ||</div><div class='del'>-	    coalesce-&gt;tx_max_coalesced_frames_irq ||</div><div class='del'>-	    coalesce-&gt;stats_block_coalesce_usecs ||</div><div class='del'>-	    coalesce-&gt;use_adaptive_tx_coalesce ||</div><div class='del'>-	    coalesce-&gt;pkt_rate_low ||</div><div class='del'>-	    coalesce-&gt;tx_coalesce_usecs_low ||</div><div class='del'>-	    coalesce-&gt;tx_max_coalesced_frames_low ||</div><div class='del'>-	    coalesce-&gt;pkt_rate_high ||</div><div class='del'>-	    coalesce-&gt;tx_coalesce_usecs_high ||</div><div class='del'>-	    coalesce-&gt;tx_max_coalesced_frames_high ||</div><div class='del'>-	    coalesce-&gt;rate_sample_interval)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_update_nonadaptive_moderation_interval_tx(ena_dev,</div><div class='ctx'> 							       coalesce-&gt;tx_coalesce_usecs);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	ena_update_tx_rings_intr_moderation(adapter);</div><div class='add'>+	ena_update_tx_rings_nonadaptive_intr_moderation(adapter);</div><div class='ctx'> </div><div class='del'>-	if (ena_com_get_adaptive_moderation_enabled(ena_dev)) {</div><div class='del'>-		if (!coalesce-&gt;use_adaptive_rx_coalesce) {</div><div class='del'>-			ena_com_disable_adaptive_moderation(ena_dev);</div><div class='del'>-			rc = ena_com_update_nonadaptive_moderation_interval_rx(ena_dev,</div><div class='del'>-									       coalesce-&gt;rx_coalesce_usecs);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	} else { /* was in non-adaptive mode */</div><div class='del'>-		if (coalesce-&gt;use_adaptive_rx_coalesce) {</div><div class='del'>-			ena_com_enable_adaptive_moderation(ena_dev);</div><div class='del'>-		} else {</div><div class='del'>-			rc = ena_com_update_nonadaptive_moderation_interval_rx(ena_dev,</div><div class='del'>-									       coalesce-&gt;rx_coalesce_usecs);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	rc = ena_com_update_nonadaptive_moderation_interval_rx(ena_dev,</div><div class='add'>+							       coalesce-&gt;rx_coalesce_usecs);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	intr_moder_entry.intr_moder_interval = coalesce-&gt;rx_coalesce_usecs_low;</div><div class='del'>-	intr_moder_entry.pkts_per_interval = coalesce-&gt;rx_max_coalesced_frames_low;</div><div class='del'>-	intr_moder_entry.bytes_per_interval = ENA_INTR_BYTE_COUNT_NOT_SUPPORTED;</div><div class='del'>-	ena_com_init_intr_moderation_entry(adapter-&gt;ena_dev, ENA_INTR_MODER_LOWEST, &amp;intr_moder_entry);</div><div class='add'>+	ena_update_rx_rings_nonadaptive_intr_moderation(adapter);</div><div class='ctx'> </div><div class='del'>-	intr_moder_entry.intr_moder_interval = coalesce-&gt;rx_coalesce_usecs;</div><div class='del'>-	intr_moder_entry.pkts_per_interval = coalesce-&gt;rx_max_coalesced_frames;</div><div class='del'>-	intr_moder_entry.bytes_per_interval = ENA_INTR_BYTE_COUNT_NOT_SUPPORTED;</div><div class='del'>-	ena_com_init_intr_moderation_entry(adapter-&gt;ena_dev, ENA_INTR_MODER_MID, &amp;intr_moder_entry);</div><div class='add'>+	if (coalesce-&gt;use_adaptive_rx_coalesce &amp;&amp;</div><div class='add'>+	    !ena_com_get_adaptive_moderation_enabled(ena_dev))</div><div class='add'>+		ena_com_enable_adaptive_moderation(ena_dev);</div><div class='ctx'> </div><div class='del'>-	intr_moder_entry.intr_moder_interval = coalesce-&gt;rx_coalesce_usecs_high;</div><div class='del'>-	intr_moder_entry.pkts_per_interval = coalesce-&gt;rx_max_coalesced_frames_high;</div><div class='del'>-	intr_moder_entry.bytes_per_interval = ENA_INTR_BYTE_COUNT_NOT_SUPPORTED;</div><div class='del'>-	ena_com_init_intr_moderation_entry(adapter-&gt;ena_dev, ENA_INTR_MODER_HIGHEST, &amp;intr_moder_entry);</div><div class='add'>+	if (!coalesce-&gt;use_adaptive_rx_coalesce &amp;&amp;</div><div class='add'>+	    ena_com_get_adaptive_moderation_enabled(ena_dev))</div><div class='add'>+		ena_com_disable_adaptive_moderation(ena_dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -436,24 +585,110 @@ static void ena_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='del'>-		sizeof(info-&gt;bus_info));</div><div class='add'>+	ssize_t ret = 0;</div><div class='add'>+</div><div class='add'>+	ret = strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_dbg(adapter, drv, dev,</div><div class='add'>+			  "module name will be truncated, status = %zd\n", ret);</div><div class='add'>+</div><div class='add'>+	ret = strscpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+		      sizeof(info-&gt;bus_info));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_dbg(adapter, drv, dev,</div><div class='add'>+			  "bus info will be truncated, status = %zd\n", ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ena_get_ringparam(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_ringparam *ring)</div><div class='add'>+			      struct ethtool_ringparam *ring,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ring-&gt;tx_max_pending = adapter-&gt;max_tx_ring_size;</div><div class='add'>+	ring-&gt;rx_max_pending = adapter-&gt;max_rx_ring_size;</div><div class='add'>+	if (adapter-&gt;ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {</div><div class='add'>+		bool large_llq_supported = adapter-&gt;large_llq_header_supported;</div><div class='add'>+</div><div class='add'>+		kernel_ring-&gt;tx_push = true;</div><div class='add'>+		kernel_ring-&gt;tx_push_buf_len = adapter-&gt;ena_dev-&gt;tx_max_header_size;</div><div class='add'>+		if (large_llq_supported)</div><div class='add'>+			kernel_ring-&gt;tx_push_buf_max_len = ENA_LLQ_LARGE_HEADER;</div><div class='add'>+		else</div><div class='add'>+			kernel_ring-&gt;tx_push_buf_max_len = ENA_LLQ_HEADER;</div><div class='add'>+	} else {</div><div class='add'>+		kernel_ring-&gt;tx_push = false;</div><div class='add'>+		kernel_ring-&gt;tx_push_buf_max_len = 0;</div><div class='add'>+		kernel_ring-&gt;tx_push_buf_len = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;tx_pending = adapter-&gt;tx_ring[0].ring_size;</div><div class='add'>+	ring-&gt;rx_pending = adapter-&gt;rx_ring[0].ring_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_set_ringparam(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_ringparam *ring,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	struct ena_ring *tx_ring = &amp;adapter-&gt;tx_ring[0];</div><div class='del'>-	struct ena_ring *rx_ring = &amp;adapter-&gt;rx_ring[0];</div><div class='add'>+	u32 new_tx_size, new_rx_size, new_tx_push_buf_len;</div><div class='add'>+	bool changed = false;</div><div class='add'>+</div><div class='add'>+	new_tx_size = ring-&gt;tx_pending &lt; ENA_MIN_RING_SIZE ?</div><div class='add'>+			ENA_MIN_RING_SIZE : ring-&gt;tx_pending;</div><div class='add'>+	new_tx_size = rounddown_pow_of_two(new_tx_size);</div><div class='add'>+</div><div class='add'>+	new_rx_size = ring-&gt;rx_pending &lt; ENA_MIN_RING_SIZE ?</div><div class='add'>+			ENA_MIN_RING_SIZE : ring-&gt;rx_pending;</div><div class='add'>+	new_rx_size = rounddown_pow_of_two(new_rx_size);</div><div class='add'>+</div><div class='add'>+	changed |= new_tx_size != adapter-&gt;requested_tx_ring_size ||</div><div class='add'>+		   new_rx_size != adapter-&gt;requested_rx_ring_size;</div><div class='add'>+</div><div class='add'>+	/* This value is ignored if LLQ is not supported */</div><div class='add'>+	new_tx_push_buf_len = adapter-&gt;ena_dev-&gt;tx_max_header_size;</div><div class='add'>+</div><div class='add'>+	if ((adapter-&gt;ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) !=</div><div class='add'>+	    kernel_ring-&gt;tx_push) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Push mode state cannot be modified");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate that the push buffer is supported on the underlying device */</div><div class='add'>+	if (kernel_ring-&gt;tx_push_buf_len) {</div><div class='add'>+		enum ena_admin_placement_policy_type placement;</div><div class='add'>+</div><div class='add'>+		new_tx_push_buf_len = kernel_ring-&gt;tx_push_buf_len;</div><div class='add'>+</div><div class='add'>+		placement = adapter-&gt;ena_dev-&gt;tx_mem_queue_type;</div><div class='add'>+		if (placement == ENA_ADMIN_PLACEMENT_POLICY_HOST)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (new_tx_push_buf_len != ENA_LLQ_HEADER &amp;&amp;</div><div class='add'>+		    new_tx_push_buf_len != ENA_LLQ_LARGE_HEADER) {</div><div class='add'>+			bool large_llq_sup = adapter-&gt;large_llq_header_supported;</div><div class='add'>+			char large_llq_size_str[40];</div><div class='add'>+</div><div class='add'>+			snprintf(large_llq_size_str, 40, ", %lu", ENA_LLQ_LARGE_HEADER);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;rx_max_pending = rx_ring-&gt;ring_size;</div><div class='del'>-	ring-&gt;tx_max_pending = tx_ring-&gt;ring_size;</div><div class='del'>-	ring-&gt;rx_pending = rx_ring-&gt;ring_size;</div><div class='del'>-	ring-&gt;tx_pending = tx_ring-&gt;ring_size;</div><div class='add'>+			NL_SET_ERR_MSG_FMT_MOD(extack,</div><div class='add'>+					       "Supported tx push buff values: [%lu%s]",</div><div class='add'>+					       ENA_LLQ_HEADER,</div><div class='add'>+					       large_llq_sup ? large_llq_size_str : "");</div><div class='add'>+</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		changed |= new_tx_push_buf_len != adapter-&gt;ena_dev-&gt;tx_max_header_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!changed)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return ena_update_queue_params(adapter, new_tx_size, new_rx_size,</div><div class='add'>+				       new_tx_push_buf_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 ena_flow_hash_to_flow_type(u16 hash_fields)</div><div class='hunk'>@@ -500,9 +735,11 @@ static u16 ena_flow_data_to_flow_hash(u32 hash_fields)</div><div class='ctx'> 	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_get_rss_hash(struct ena_com_dev *ena_dev,</div><div class='del'>-			    struct ethtool_rxnfc *cmd)</div><div class='add'>+static int ena_get_rxfh_fields(struct net_device *netdev,</div><div class='add'>+			       struct ethtool_rxfh_fields *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	enum ena_admin_flow_hash_proto proto;</div><div class='ctx'> 	u16 hash_fields;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -551,9 +788,12 @@ static int ena_get_rss_hash(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_set_rss_hash(struct ena_com_dev *ena_dev,</div><div class='del'>-			    struct ethtool_rxnfc *cmd)</div><div class='add'>+static int ena_set_rxfh_fields(struct net_device *netdev,</div><div class='add'>+			       const struct ethtool_rxfh_fields *cmd,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	enum ena_admin_flow_hash_proto proto;</div><div class='ctx'> 	u16 hash_fields;</div><div class='ctx'> </div><div class='hunk'>@@ -595,26 +835,6 @@ static int ena_set_rss_hash(struct ena_com_dev *ena_dev,</div><div class='ctx'> 	return ena_com_fill_hash_ctrl(ena_dev, proto, hash_fields);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info)</div><div class='del'>-{</div><div class='del'>-	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		rc = ena_set_rss_hash(adapter-&gt;ena_dev, info);</div><div class='del'>-		break;</div><div class='del'>-	case ETHTOOL_SRXCLSRLDEL:</div><div class='del'>-	case ETHTOOL_SRXCLSRLINS:</div><div class='del'>-	default:</div><div class='del'>-		netif_err(adapter, drv, netdev,</div><div class='del'>-			  "Command parameter %d is not supported\n", info-&gt;cmd);</div><div class='del'>-		rc = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,</div><div class='ctx'> 			 u32 *rules)</div><div class='ctx'> {</div><div class='hunk'>@@ -623,12 +843,9 @@ static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;cmd) {</div><div class='ctx'> 	case ETHTOOL_GRXRINGS:</div><div class='del'>-		info-&gt;data = adapter-&gt;num_queues;</div><div class='add'>+		info-&gt;data = adapter-&gt;num_io_queues;</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 		break;</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		rc = ena_get_rss_hash(adapter-&gt;ena_dev, info);</div><div class='del'>-		break;</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLCNT:</div><div class='ctx'> 	case ETHTOOL_GRXCLSRULE:</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLALL:</div><div class='hunk'>@@ -648,22 +865,84 @@ static u32 ena_get_rxfh_indir_size(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> static u32 ena_get_rxfh_key_size(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	return ENA_HASH_KEY_SIZE;</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct ena_rss *rss = &amp;adapter-&gt;ena_dev-&gt;rss;</div><div class='add'>+</div><div class='add'>+	return rss-&gt;hash_key ? ENA_HASH_KEY_SIZE : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_indirection_table_set(struct ena_adapter *adapter,</div><div class='add'>+				     const u32 *indir)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ENA_RX_RSS_TABLE_SIZE; i++) {</div><div class='add'>+		rc = ena_com_indirect_table_fill_entry(ena_dev,</div><div class='add'>+						       i,</div><div class='add'>+						       ENA_IO_RXQ_IDX(indir[i]));</div><div class='add'>+		if (unlikely(rc)) {</div><div class='add'>+			netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+				  "Cannot fill indirect table (index is too large)\n");</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = ena_com_indirect_table_set(ena_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+			  "Cannot set indirect table\n");</div><div class='add'>+		return rc == -EPERM ? -EOPNOTSUPP : rc;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_indirection_table_get(struct ena_adapter *adapter, u32 *indir)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	if (!indir)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = ena_com_indirect_table_get(ena_dev, indir);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Our internal representation of the indices is: even indices</div><div class='add'>+	 * for Tx and uneven indices for Rx. We need to convert the Rx</div><div class='add'>+	 * indices to be consecutive</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ENA_RX_RSS_TABLE_SIZE; i++)</div><div class='add'>+		indir[i] = ENA_IO_RXQ_IDX_TO_COMBINED_IDX(indir[i]);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,</div><div class='del'>-			u8 *hfunc)</div><div class='add'>+static int ena_get_rxfh(struct net_device *netdev,</div><div class='add'>+			struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	enum ena_admin_hash_functions ena_func;</div><div class='ctx'> 	u8 func;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_indirect_table_get(adapter-&gt;ena_dev, indir);</div><div class='add'>+	rc = ena_indirection_table_get(adapter, rxfh-&gt;indir);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_get_hash_function(adapter-&gt;ena_dev, &amp;ena_func, key);</div><div class='add'>+	/* We call this function in order to check if the device</div><div class='add'>+	 * supports getting/setting the hash function.</div><div class='add'>+	 */</div><div class='add'>+	rc = ena_com_get_hash_function(adapter-&gt;ena_dev, &amp;ena_func);</div><div class='add'>+	if (rc) {</div><div class='add'>+		if (rc == -EOPNOTSUPP)</div><div class='add'>+			rc = 0;</div><div class='add'>+</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = ena_com_get_hash_key(adapter-&gt;ena_dev, rxfh-&gt;key);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -672,7 +951,7 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,</div><div class='ctx'> 		func = ETH_RSS_HASH_TOP;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ENA_ADMIN_CRC32:</div><div class='del'>-		func = ETH_RSS_HASH_XOR;</div><div class='add'>+		func = ETH_RSS_HASH_CRC32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netif_err(adapter, drv, netdev,</div><div class='hunk'>@@ -680,55 +959,44 @@ static int ena_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = func;</div><div class='add'>+	rxfh-&gt;hfunc = func;</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_set_rxfh(struct net_device *netdev, const u32 *indir,</div><div class='del'>-			const u8 *key, const u8 hfunc)</div><div class='add'>+static int ena_set_rxfh(struct net_device *netdev,</div><div class='add'>+			struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='del'>-	enum ena_admin_hash_functions func;</div><div class='del'>-	int rc, i;</div><div class='del'>-</div><div class='del'>-	if (indir) {</div><div class='del'>-		for (i = 0; i &lt; ENA_RX_RSS_TABLE_SIZE; i++) {</div><div class='del'>-			rc = ena_com_indirect_table_fill_entry(ena_dev,</div><div class='del'>-							       i,</div><div class='del'>-							       ENA_IO_RXQ_IDX(indir[i]));</div><div class='del'>-			if (unlikely(rc)) {</div><div class='del'>-				netif_err(adapter, drv, netdev,</div><div class='del'>-					  "Cannot fill indirect table (index is too large)\n");</div><div class='del'>-				return rc;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	enum ena_admin_hash_functions func = 0;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-		rc = ena_com_indirect_table_set(ena_dev);</div><div class='del'>-		if (rc) {</div><div class='del'>-			netif_err(adapter, drv, netdev,</div><div class='del'>-				  "Cannot set indirect table\n");</div><div class='del'>-			return rc == -EPERM ? -EOPNOTSUPP : rc;</div><div class='del'>-		}</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='add'>+		rc = ena_indirection_table_set(adapter, rxfh-&gt;indir);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (hfunc) {</div><div class='add'>+	switch (rxfh-&gt;hfunc) {</div><div class='add'>+	case ETH_RSS_HASH_NO_CHANGE:</div><div class='add'>+		func = ena_com_get_current_hash_function(ena_dev);</div><div class='add'>+		break;</div><div class='ctx'> 	case ETH_RSS_HASH_TOP:</div><div class='ctx'> 		func = ENA_ADMIN_TOEPLITZ;</div><div class='ctx'> 		break;</div><div class='del'>-	case ETH_RSS_HASH_XOR:</div><div class='add'>+	case ETH_RSS_HASH_CRC32:</div><div class='ctx'> 		func = ENA_ADMIN_CRC32;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netif_err(adapter, drv, netdev, "Unsupported hfunc %d\n",</div><div class='del'>-			  hfunc);</div><div class='add'>+			  rxfh-&gt;hfunc);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (key) {</div><div class='del'>-		rc = ena_com_fill_hash_function(ena_dev, func, key,</div><div class='add'>+	if (rxfh-&gt;key || func) {</div><div class='add'>+		rc = ena_com_fill_hash_function(ena_dev, func, rxfh-&gt;key,</div><div class='ctx'> 						ENA_HASH_KEY_SIZE,</div><div class='ctx'> 						0xFFFFFFFF);</div><div class='ctx'> 		if (unlikely(rc)) {</div><div class='hunk'>@@ -745,14 +1013,31 @@ static void ena_get_channels(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	channels-&gt;max_rx = adapter-&gt;num_queues;</div><div class='del'>-	channels-&gt;max_tx = adapter-&gt;num_queues;</div><div class='del'>-	channels-&gt;max_other = 0;</div><div class='del'>-	channels-&gt;max_combined = 0;</div><div class='del'>-	channels-&gt;rx_count = adapter-&gt;num_queues;</div><div class='del'>-	channels-&gt;tx_count = adapter-&gt;num_queues;</div><div class='del'>-	channels-&gt;other_count = 0;</div><div class='del'>-	channels-&gt;combined_count = 0;</div><div class='add'>+	channels-&gt;max_combined = adapter-&gt;max_num_io_queues;</div><div class='add'>+	channels-&gt;combined_count = adapter-&gt;num_io_queues;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_set_channels(struct net_device *netdev,</div><div class='add'>+			    struct ethtool_channels *channels)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u32 count = channels-&gt;combined_count;</div><div class='add'>+	/* The check for max value is already done in ethtool */</div><div class='add'>+	if (count &lt; ENA_MIN_NUM_IO_QUEUES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!ena_xdp_legal_queue_count(adapter, count)) {</div><div class='add'>+		if (ena_xdp_present(adapter))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		xdp_clear_features_flag(netdev);</div><div class='add'>+	} else {</div><div class='add'>+		xdp_set_features_flag(netdev,</div><div class='add'>+				      NETDEV_XDP_ACT_BASIC |</div><div class='add'>+				      NETDEV_XDP_ACT_REDIRECT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ena_update_queue_count(adapter, count);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ena_get_tunable(struct net_device *netdev,</div><div class='hunk'>@@ -784,11 +1069,7 @@ static int ena_set_tunable(struct net_device *netdev,</div><div class='ctx'> 	switch (tuna-&gt;id) {</div><div class='ctx'> 	case ETHTOOL_RX_COPYBREAK:</div><div class='ctx'> 		len = *(u32 *)data;</div><div class='del'>-		if (len &gt; adapter-&gt;netdev-&gt;mtu) {</div><div class='del'>-			ret = -EINVAL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		adapter-&gt;rx_copybreak = len;</div><div class='add'>+		ret = ena_set_rx_copybreak(adapter, len);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EINVAL;</div><div class='hunk'>@@ -799,6 +1080,10 @@ static int ena_set_tunable(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops ena_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,</div><div class='add'>+	.supported_ring_params	= ETHTOOL_RING_USE_TX_PUSH_BUF_LEN |</div><div class='add'>+				  ETHTOOL_RING_USE_TX_PUSH,</div><div class='ctx'> 	.get_link_ksettings	= ena_get_link_ksettings,</div><div class='ctx'> 	.get_drvinfo		= ena_get_drvinfo,</div><div class='ctx'> 	.get_msglevel		= ena_get_msglevel,</div><div class='hunk'>@@ -807,18 +1092,22 @@ static const struct ethtool_ops ena_ethtool_ops = {</div><div class='ctx'> 	.get_coalesce		= ena_get_coalesce,</div><div class='ctx'> 	.set_coalesce		= ena_set_coalesce,</div><div class='ctx'> 	.get_ringparam		= ena_get_ringparam,</div><div class='add'>+	.set_ringparam		= ena_set_ringparam,</div><div class='ctx'> 	.get_sset_count         = ena_get_sset_count,</div><div class='del'>-	.get_strings		= ena_get_strings,</div><div class='add'>+	.get_strings		= ena_get_ethtool_strings,</div><div class='ctx'> 	.get_ethtool_stats      = ena_get_ethtool_stats,</div><div class='ctx'> 	.get_rxnfc		= ena_get_rxnfc,</div><div class='del'>-	.set_rxnfc		= ena_set_rxnfc,</div><div class='ctx'> 	.get_rxfh_indir_size    = ena_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh_key_size	= ena_get_rxfh_key_size,</div><div class='ctx'> 	.get_rxfh		= ena_get_rxfh,</div><div class='ctx'> 	.set_rxfh		= ena_set_rxfh,</div><div class='add'>+	.get_rxfh_fields	= ena_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields	= ena_set_rxfh_fields,</div><div class='ctx'> 	.get_channels		= ena_get_channels,</div><div class='add'>+	.set_channels		= ena_set_channels,</div><div class='ctx'> 	.get_tunable		= ena_get_tunable,</div><div class='ctx'> 	.set_tunable		= ena_set_tunable,</div><div class='add'>+	.get_ts_info		= ena_get_ts_info,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void ena_set_ethtool_ops(struct net_device *netdev)</div><div class='hunk'>@@ -834,33 +1123,29 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)</div><div class='ctx'> 	int strings_num;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='del'>-	strings_num = ena_get_sset_count(netdev, ETH_SS_STATS);</div><div class='add'>+	strings_num = ena_get_sw_stats_count(adapter);</div><div class='ctx'> 	if (strings_num &lt;= 0) {</div><div class='ctx'> 		netif_err(adapter, drv, netdev, "Can't get stats num\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strings_buf = devm_kcalloc(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-				   ETH_GSTRING_LEN, strings_num,</div><div class='del'>-				   GFP_ATOMIC);</div><div class='add'>+	strings_buf = kcalloc(strings_num, ETH_GSTRING_LEN, GFP_ATOMIC);</div><div class='ctx'> 	if (!strings_buf) {</div><div class='ctx'> 		netif_err(adapter, drv, netdev,</div><div class='del'>-			  "failed to alloc strings_buf\n");</div><div class='add'>+			  "Failed to allocate strings_buf\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	data_buf = devm_kcalloc(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-				strings_num, sizeof(u64),</div><div class='del'>-				GFP_ATOMIC);</div><div class='add'>+	data_buf = kcalloc(strings_num, sizeof(u64), GFP_ATOMIC);</div><div class='ctx'> 	if (!data_buf) {</div><div class='ctx'> 		netif_err(adapter, drv, netdev,</div><div class='del'>-			  "failed to allocate data buf\n");</div><div class='del'>-		devm_kfree(&amp;adapter-&gt;pdev-&gt;dev, strings_buf);</div><div class='add'>+			  "Failed to allocate data buf\n");</div><div class='add'>+		kfree(strings_buf);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ena_get_strings(netdev, ETH_SS_STATS, strings_buf);</div><div class='del'>-	ena_get_ethtool_stats(netdev, NULL, data_buf);</div><div class='add'>+	ena_get_strings(adapter, strings_buf, false);</div><div class='add'>+	ena_get_stats(adapter, data_buf, false);</div><div class='ctx'> </div><div class='ctx'> 	/* If there is a buffer, dump stats, otherwise print them to dmesg */</div><div class='ctx'> 	if (buf)</div><div class='hunk'>@@ -877,8 +1162,8 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)</div><div class='ctx'> 				  strings_buf + i * ETH_GSTRING_LEN,</div><div class='ctx'> 				  data_buf[i]);</div><div class='ctx'> </div><div class='del'>-	devm_kfree(&amp;adapter-&gt;pdev-&gt;dev, strings_buf);</div><div class='del'>-	devm_kfree(&amp;adapter-&gt;pdev-&gt;dev, data_buf);</div><div class='add'>+	kfree(strings_buf);</div><div class='add'>+	kfree(data_buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf)</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c<br/>index 9c83642922c7..92d149d4f091 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_netdev.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_netdev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_netdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_netdev.c</a></div><div class='hunk'>@@ -1,42 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-#include &lt;linux/cpu_rmap.h&gt;</div><div class='del'>-#endif /* CONFIG_RFS_ACCEL */</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/numa.h&gt;</div><div class='hunk'>@@ -48,24 +17,25 @@</div><div class='ctx'> </div><div class='ctx'> #include "ena_netdev.h"</div><div class='ctx'> #include "ena_pci_id_tbl.h"</div><div class='add'>+#include "ena_xdp.h"</div><div class='add'>+</div><div class='add'>+#include "ena_phc.h"</div><div class='ctx'> </div><div class='del'>-static char version[] = DEVICE_NAME " v" DRV_MODULE_VERSION "\n";</div><div class='add'>+#include "ena_devlink.h"</div><div class='add'>+</div><div class='add'>+#include "ena_debugfs.h"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Amazon.com, Inc. or its affiliates");</div><div class='ctx'> MODULE_DESCRIPTION(DEVICE_NAME);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='ctx'> /* Time in jiffies before concluding the transmitter is hung. */</div><div class='ctx'> #define TX_TIMEOUT  (5 * HZ)</div><div class='ctx'> </div><div class='del'>-#define ENA_NAPI_BUDGET 64</div><div class='add'>+#define ENA_MAX_RINGS min_t(unsigned int, ENA_MAX_NUM_IO_QUEUES, num_possible_cpus())</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | \</div><div class='del'>-		NETIF_MSG_TX_DONE | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR)</div><div class='del'>-static int debug = -1;</div><div class='del'>-module_param(debug, int, 0);</div><div class='del'>-MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");</div><div class='add'>+		NETIF_MSG_IFDOWN | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR)</div><div class='ctx'> </div><div class='ctx'> static struct ena_aenq_handlers aenq_handlers;</div><div class='ctx'> </div><div class='hunk'>@@ -75,33 +45,54 @@ MODULE_DEVICE_TABLE(pci, ena_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> static int ena_rss_init_default(struct ena_adapter *adapter);</div><div class='ctx'> static void check_for_admin_com_state(struct ena_adapter *adapter);</div><div class='del'>-static void ena_destroy_device(struct ena_adapter *adapter, bool graceful);</div><div class='del'>-static int ena_restore_device(struct ena_adapter *adapter);</div><div class='ctx'> </div><div class='del'>-static void ena_tx_timeout(struct net_device *dev)</div><div class='add'>+static void ena_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='add'>+	enum ena_regs_reset_reason_types reset_reason = ENA_REGS_RESET_OS_NETDEV_WD;</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(dev);</div><div class='add'>+	unsigned int time_since_last_napi, threshold;</div><div class='add'>+	struct ena_ring *tx_ring;</div><div class='add'>+	int napi_scheduled;</div><div class='add'>+</div><div class='add'>+	if (txqueue &gt;= adapter-&gt;num_io_queues) {</div><div class='add'>+		netdev_err(dev, "TX timeout on invalid queue %u\n", txqueue);</div><div class='add'>+		goto schedule_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	threshold = jiffies_to_usecs(dev-&gt;watchdog_timeo);</div><div class='add'>+	tx_ring = &amp;adapter-&gt;tx_ring[txqueue];</div><div class='add'>+</div><div class='add'>+	time_since_last_napi = jiffies_to_usecs(jiffies - tx_ring-&gt;tx_stats.last_napi_jiffies);</div><div class='add'>+	napi_scheduled = !!(tx_ring-&gt;napi-&gt;state &amp; NAPIF_STATE_SCHED);</div><div class='ctx'> </div><div class='add'>+	netdev_err(dev,</div><div class='add'>+		   "TX q %d is paused for too long (threshold %u). Time since last napi %u usec. napi scheduled: %d\n",</div><div class='add'>+		   txqueue,</div><div class='add'>+		   threshold,</div><div class='add'>+		   time_since_last_napi,</div><div class='add'>+		   napi_scheduled);</div><div class='add'>+</div><div class='add'>+	if (threshold &lt; time_since_last_napi &amp;&amp; napi_scheduled) {</div><div class='add'>+		netdev_err(dev,</div><div class='add'>+			   "napi handler hasn't been called for a long time but is scheduled\n");</div><div class='add'>+		reset_reason = ENA_REGS_RESET_SUSPECTED_POLL_STARVATION;</div><div class='add'>+	}</div><div class='add'>+schedule_reset:</div><div class='ctx'> 	/* Change the state of the device to trigger reset</div><div class='ctx'> 	 * Check that we are not in the middle or a trigger already</div><div class='ctx'> 	 */</div><div class='del'>-</div><div class='ctx'> 	if (test_and_set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;reset_reason = ENA_REGS_RESET_OS_NETDEV_WD;</div><div class='del'>-	u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-	adapter-&gt;dev_stats.tx_timeout++;</div><div class='del'>-	u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='del'>-</div><div class='del'>-	netif_err(adapter, tx_err, dev, "Transmit time out\n");</div><div class='add'>+	ena_reset_device(adapter, reset_reason);</div><div class='add'>+	ena_increase_stat(&amp;adapter-&gt;dev_stats.tx_timeout, 1, &amp;adapter-&gt;syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void update_rx_ring_mtu(struct ena_adapter *adapter, int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++)</div><div class='ctx'> 		adapter-&gt;rx_ring[i].mtu = mtu;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -112,9 +103,9 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	ret = ena_com_set_dev_mtu(adapter-&gt;ena_dev, new_mtu);</div><div class='ctx'> 	if (!ret) {</div><div class='del'>-		netif_dbg(adapter, drv, dev, "set MTU to %d\n", new_mtu);</div><div class='add'>+		netif_dbg(adapter, drv, dev, "Set MTU to %d\n", new_mtu);</div><div class='ctx'> 		update_rx_ring_mtu(adapter, new_mtu);</div><div class='del'>-		dev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netif_err(adapter, drv, dev, "Failed to set MTU to %d\n",</div><div class='ctx'> 			  new_mtu);</div><div class='hunk'>@@ -123,27 +114,52 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_init_rx_cpu_rmap(struct ena_adapter *adapter)</div><div class='add'>+int ena_xmit_common(struct ena_adapter *adapter,</div><div class='add'>+		    struct ena_ring *ring,</div><div class='add'>+		    struct ena_tx_buffer *tx_info,</div><div class='add'>+		    struct ena_com_tx_ctx *ena_tx_ctx,</div><div class='add'>+		    u16 next_to_use,</div><div class='add'>+		    u32 bytes)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	u32 i;</div><div class='del'>-	int rc;</div><div class='add'>+	int rc, nb_hw_desc;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;netdev-&gt;rx_cpu_rmap = alloc_irq_cpu_rmap(adapter-&gt;num_queues);</div><div class='del'>-	if (!adapter-&gt;netdev-&gt;rx_cpu_rmap)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='del'>-		int irq_idx = ENA_IO_IRQ_IDX(i);</div><div class='add'>+	if (unlikely(ena_com_is_doorbell_needed(ring-&gt;ena_com_io_sq,</div><div class='add'>+						ena_tx_ctx))) {</div><div class='add'>+		netif_dbg(adapter, tx_queued, adapter-&gt;netdev,</div><div class='add'>+			  "llq tx max burst size of queue %d achieved, writing doorbell to send burst\n",</div><div class='add'>+			  ring-&gt;qid);</div><div class='add'>+		ena_ring_tx_doorbell(ring);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		rc = irq_cpu_rmap_add(adapter-&gt;netdev-&gt;rx_cpu_rmap,</div><div class='del'>-				      pci_irq_vector(adapter-&gt;pdev, irq_idx));</div><div class='del'>-		if (rc) {</div><div class='del'>-			free_irq_cpu_rmap(adapter-&gt;netdev-&gt;rx_cpu_rmap);</div><div class='del'>-			adapter-&gt;netdev-&gt;rx_cpu_rmap = NULL;</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='add'>+	/* prepare the packet's descriptors to dma engine */</div><div class='add'>+	rc = ena_com_prepare_tx(ring-&gt;ena_com_io_sq, ena_tx_ctx,</div><div class='add'>+				&amp;nb_hw_desc);</div><div class='add'>+</div><div class='add'>+	/* In case there isn't enough space in the queue for the packet,</div><div class='add'>+	 * we simply drop it. All other failure reasons of</div><div class='add'>+	 * ena_com_prepare_tx() are fatal and therefore require a device reset.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		netif_err(adapter, tx_queued, adapter-&gt;netdev,</div><div class='add'>+			  "Failed to prepare tx bufs\n");</div><div class='add'>+		ena_increase_stat(&amp;ring-&gt;tx_stats.prepare_ctx_err, 1, &amp;ring-&gt;syncp);</div><div class='add'>+		if (rc != -ENOMEM)</div><div class='add'>+			ena_reset_device(adapter, ENA_REGS_RESET_DRIVER_INVALID_STATE);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* CONFIG_RFS_ACCEL */</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;ring-&gt;syncp);</div><div class='add'>+	ring-&gt;tx_stats.cnt++;</div><div class='add'>+	ring-&gt;tx_stats.bytes += bytes;</div><div class='add'>+	u64_stats_update_end(&amp;ring-&gt;syncp);</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;tx_descs = nb_hw_desc;</div><div class='add'>+	tx_info-&gt;total_tx_size = bytes;</div><div class='add'>+	tx_info-&gt;last_jiffies = jiffies;</div><div class='add'>+	tx_info-&gt;print_once = 0;</div><div class='add'>+</div><div class='add'>+	ring-&gt;next_to_use = ENA_TX_RING_IDX_NEXT(next_to_use,</div><div class='add'>+						 ring-&gt;ring_size);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -158,14 +174,14 @@ static void ena_init_io_rings_common(struct ena_adapter *adapter,</div><div class='ctx'> 	ring-&gt;adapter = adapter;</div><div class='ctx'> 	ring-&gt;ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	ring-&gt;per_napi_packets = 0;</div><div class='del'>-	ring-&gt;per_napi_bytes = 0;</div><div class='ctx'> 	ring-&gt;cpu = 0;</div><div class='del'>-	ring-&gt;first_interrupt = false;</div><div class='add'>+	ring-&gt;numa_node = 0;</div><div class='ctx'> 	ring-&gt;no_interrupt_event_cnt = 0;</div><div class='ctx'> 	u64_stats_init(&amp;ring-&gt;syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_init_io_rings(struct ena_adapter *adapter)</div><div class='add'>+void ena_init_io_rings(struct ena_adapter *adapter,</div><div class='add'>+		       int first_index, int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_dev *ena_dev;</div><div class='ctx'> 	struct ena_ring *txr, *rxr;</div><div class='hunk'>@@ -173,29 +189,39 @@ static void ena_init_io_rings(struct ena_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='ctx'> 		txr = &amp;adapter-&gt;tx_ring[i];</div><div class='ctx'> 		rxr = &amp;adapter-&gt;rx_ring[i];</div><div class='ctx'> </div><div class='del'>-		/* TX/RX common ring state */</div><div class='add'>+		/* TX common ring state */</div><div class='ctx'> 		ena_init_io_rings_common(adapter, txr, i);</div><div class='del'>-		ena_init_io_rings_common(adapter, rxr, i);</div><div class='ctx'> </div><div class='ctx'> 		/* TX specific ring state */</div><div class='del'>-		txr-&gt;ring_size = adapter-&gt;tx_ring_size;</div><div class='add'>+		txr-&gt;ring_size = adapter-&gt;requested_tx_ring_size;</div><div class='ctx'> 		txr-&gt;tx_max_header_size = ena_dev-&gt;tx_max_header_size;</div><div class='ctx'> 		txr-&gt;tx_mem_queue_type = ena_dev-&gt;tx_mem_queue_type;</div><div class='ctx'> 		txr-&gt;sgl_size = adapter-&gt;max_tx_sgl_size;</div><div class='ctx'> 		txr-&gt;smoothed_interval =</div><div class='ctx'> 			ena_com_get_nonadaptive_moderation_interval_tx(ena_dev);</div><div class='del'>-</div><div class='del'>-		/* RX specific ring state */</div><div class='del'>-		rxr-&gt;ring_size = adapter-&gt;rx_ring_size;</div><div class='del'>-		rxr-&gt;rx_copybreak = adapter-&gt;rx_copybreak;</div><div class='del'>-		rxr-&gt;sgl_size = adapter-&gt;max_rx_sgl_size;</div><div class='del'>-		rxr-&gt;smoothed_interval =</div><div class='del'>-			ena_com_get_nonadaptive_moderation_interval_rx(ena_dev);</div><div class='del'>-		rxr-&gt;empty_rx_queue = 0;</div><div class='add'>+		txr-&gt;disable_meta_caching = adapter-&gt;disable_meta_caching;</div><div class='add'>+		spin_lock_init(&amp;txr-&gt;xdp_tx_lock);</div><div class='add'>+</div><div class='add'>+		/* Don't init RX queues for xdp queues */</div><div class='add'>+		if (!ENA_IS_XDP_INDEX(adapter, i)) {</div><div class='add'>+			/* RX common ring state */</div><div class='add'>+			ena_init_io_rings_common(adapter, rxr, i);</div><div class='add'>+</div><div class='add'>+			/* RX specific ring state */</div><div class='add'>+			rxr-&gt;ring_size = adapter-&gt;requested_rx_ring_size;</div><div class='add'>+			rxr-&gt;rx_copybreak = adapter-&gt;rx_copybreak;</div><div class='add'>+			rxr-&gt;sgl_size = adapter-&gt;max_rx_sgl_size;</div><div class='add'>+			rxr-&gt;smoothed_interval =</div><div class='add'>+				ena_com_get_nonadaptive_moderation_interval_rx(ena_dev);</div><div class='add'>+			rxr-&gt;empty_rx_queue = 0;</div><div class='add'>+			rxr-&gt;rx_headroom = NET_SKB_PAD;</div><div class='add'>+			adapter-&gt;ena_napi[i].dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='add'>+			rxr-&gt;xdp_ring = &amp;adapter-&gt;tx_ring[i + adapter-&gt;num_io_queues];</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -228,11 +254,11 @@ static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(u16) * tx_ring-&gt;ring_size;</div><div class='del'>-	tx_ring-&gt;free_tx_ids = vzalloc_node(size, node);</div><div class='del'>-	if (!tx_ring-&gt;free_tx_ids) {</div><div class='del'>-		tx_ring-&gt;free_tx_ids = vzalloc(size);</div><div class='del'>-		if (!tx_ring-&gt;free_tx_ids)</div><div class='del'>-			goto err_free_tx_ids;</div><div class='add'>+	tx_ring-&gt;free_ids = vzalloc_node(size, node);</div><div class='add'>+	if (!tx_ring-&gt;free_ids) {</div><div class='add'>+		tx_ring-&gt;free_ids = vzalloc(size);</div><div class='add'>+		if (!tx_ring-&gt;free_ids)</div><div class='add'>+			goto err_tx_free_ids;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = tx_ring-&gt;tx_max_header_size;</div><div class='hunk'>@@ -245,7 +271,7 @@ static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid)</div><div class='ctx'> </div><div class='ctx'> 	/* Req id ring for TX out of order completions */</div><div class='ctx'> 	for (i = 0; i &lt; tx_ring-&gt;ring_size; i++)</div><div class='del'>-		tx_ring-&gt;free_tx_ids[i] = i;</div><div class='add'>+		tx_ring-&gt;free_ids[i] = i;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset tx statistics */</div><div class='ctx'> 	memset(&amp;tx_ring-&gt;tx_stats, 0x0, sizeof(tx_ring-&gt;tx_stats));</div><div class='hunk'>@@ -253,12 +279,13 @@ static int ena_setup_tx_resources(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	tx_ring-&gt;next_to_use = 0;</div><div class='ctx'> 	tx_ring-&gt;next_to_clean = 0;</div><div class='ctx'> 	tx_ring-&gt;cpu = ena_irq-&gt;cpu;</div><div class='add'>+	tx_ring-&gt;numa_node = node;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_push_buf_intermediate_buf:</div><div class='del'>-	vfree(tx_ring-&gt;free_tx_ids);</div><div class='del'>-	tx_ring-&gt;free_tx_ids = NULL;</div><div class='del'>-err_free_tx_ids:</div><div class='add'>+	vfree(tx_ring-&gt;free_ids);</div><div class='add'>+	tx_ring-&gt;free_ids = NULL;</div><div class='add'>+err_tx_free_ids:</div><div class='ctx'> 	vfree(tx_ring-&gt;tx_buffer_info);</div><div class='ctx'> 	tx_ring-&gt;tx_buffer_info = NULL;</div><div class='ctx'> err_tx_buffer_info:</div><div class='hunk'>@@ -278,23 +305,19 @@ static void ena_free_tx_resources(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	vfree(tx_ring-&gt;tx_buffer_info);</div><div class='ctx'> 	tx_ring-&gt;tx_buffer_info = NULL;</div><div class='ctx'> </div><div class='del'>-	vfree(tx_ring-&gt;free_tx_ids);</div><div class='del'>-	tx_ring-&gt;free_tx_ids = NULL;</div><div class='add'>+	vfree(tx_ring-&gt;free_ids);</div><div class='add'>+	tx_ring-&gt;free_ids = NULL;</div><div class='ctx'> </div><div class='ctx'> 	vfree(tx_ring-&gt;push_buf_intermediate_buf);</div><div class='ctx'> 	tx_ring-&gt;push_buf_intermediate_buf = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ena_setup_all_tx_resources - allocate I/O Tx queues resources for All queues</div><div class='del'>- * @adapter: private structure</div><div class='del'>- *</div><div class='del'>- * Return 0 on success, negative on failure</div><div class='del'>- */</div><div class='del'>-static int ena_setup_all_tx_resources(struct ena_adapter *adapter)</div><div class='add'>+int ena_setup_tx_resources_in_range(struct ena_adapter *adapter,</div><div class='add'>+				    int first_index, int count)</div><div class='ctx'> {</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='ctx'> 		rc = ena_setup_tx_resources(adapter, i);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_setup_tx;</div><div class='hunk'>@@ -308,40 +331,31 @@ err_setup_tx:</div><div class='ctx'> 		  "Tx queue %d: allocation failed\n", i);</div><div class='ctx'> </div><div class='ctx'> 	/* rewind the index freeing the rings as we go */</div><div class='del'>-	while (i--)</div><div class='add'>+	while (first_index &lt; i--)</div><div class='ctx'> 		ena_free_tx_resources(adapter, i);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* ena_free_all_io_tx_resources - Free I/O Tx Resources for All Queues</div><div class='del'>- * @adapter: board private structure</div><div class='del'>- *</div><div class='del'>- * Free all transmit software resources</div><div class='del'>- */</div><div class='del'>-static void ena_free_all_io_tx_resources(struct ena_adapter *adapter)</div><div class='add'>+void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,</div><div class='add'>+					   int first_index, int count)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++)</div><div class='ctx'> 		ena_free_tx_resources(adapter, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int validate_rx_req_id(struct ena_ring *rx_ring, u16 req_id)</div><div class='add'>+/* ena_free_all_io_tx_resources - Free I/O Tx Resources for All Queues</div><div class='add'>+ * @adapter: board private structure</div><div class='add'>+ *</div><div class='add'>+ * Free all transmit software resources</div><div class='add'>+ */</div><div class='add'>+void ena_free_all_io_tx_resources(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	if (likely(req_id &lt; rx_ring-&gt;ring_size))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	netif_err(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='del'>-		  "Invalid rx req_id: %hu\n", req_id);</div><div class='del'>-</div><div class='del'>-	u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-	rx_ring-&gt;rx_stats.bad_req_id++;</div><div class='del'>-	u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='del'>-</div><div class='del'>-	/* Trigger device reset */</div><div class='del'>-	rx_ring-&gt;adapter-&gt;reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;</div><div class='del'>-	set_bit(ENA_FLAG_TRIGGER_RESET, &amp;rx_ring-&gt;adapter-&gt;flags);</div><div class='del'>-	return -EFAULT;</div><div class='add'>+	ena_free_all_io_tx_resources_in_range(adapter,</div><div class='add'>+					      0,</div><div class='add'>+					      adapter-&gt;xdp_num_queues +</div><div class='add'>+					      adapter-&gt;num_io_queues);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ena_setup_rx_resources - allocate I/O Rx resources (Descriptors)</div><div class='hunk'>@@ -377,10 +391,10 @@ static int ena_setup_rx_resources(struct ena_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	size = sizeof(u16) * rx_ring-&gt;ring_size;</div><div class='del'>-	rx_ring-&gt;free_rx_ids = vzalloc_node(size, node);</div><div class='del'>-	if (!rx_ring-&gt;free_rx_ids) {</div><div class='del'>-		rx_ring-&gt;free_rx_ids = vzalloc(size);</div><div class='del'>-		if (!rx_ring-&gt;free_rx_ids) {</div><div class='add'>+	rx_ring-&gt;free_ids = vzalloc_node(size, node);</div><div class='add'>+	if (!rx_ring-&gt;free_ids) {</div><div class='add'>+		rx_ring-&gt;free_ids = vzalloc(size);</div><div class='add'>+		if (!rx_ring-&gt;free_ids) {</div><div class='ctx'> 			vfree(rx_ring-&gt;rx_buffer_info);</div><div class='ctx'> 			rx_ring-&gt;rx_buffer_info = NULL;</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -389,7 +403,7 @@ static int ena_setup_rx_resources(struct ena_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	/* Req id ring for receiving RX pkts out of order */</div><div class='ctx'> 	for (i = 0; i &lt; rx_ring-&gt;ring_size; i++)</div><div class='del'>-		rx_ring-&gt;free_rx_ids[i] = i;</div><div class='add'>+		rx_ring-&gt;free_ids[i] = i;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset rx statistics */</div><div class='ctx'> 	memset(&amp;rx_ring-&gt;rx_stats, 0x0, sizeof(rx_ring-&gt;rx_stats));</div><div class='hunk'>@@ -397,6 +411,7 @@ static int ena_setup_rx_resources(struct ena_adapter *adapter,</div><div class='ctx'> 	rx_ring-&gt;next_to_clean = 0;</div><div class='ctx'> 	rx_ring-&gt;next_to_use = 0;</div><div class='ctx'> 	rx_ring-&gt;cpu = ena_irq-&gt;cpu;</div><div class='add'>+	rx_ring-&gt;numa_node = node;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -415,8 +430,8 @@ static void ena_free_rx_resources(struct ena_adapter *adapter,</div><div class='ctx'> 	vfree(rx_ring-&gt;rx_buffer_info);</div><div class='ctx'> 	rx_ring-&gt;rx_buffer_info = NULL;</div><div class='ctx'> </div><div class='del'>-	vfree(rx_ring-&gt;free_rx_ids);</div><div class='del'>-	rx_ring-&gt;free_rx_ids = NULL;</div><div class='add'>+	vfree(rx_ring-&gt;free_ids);</div><div class='add'>+	rx_ring-&gt;free_ids = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ena_setup_all_rx_resources - allocate I/O Rx queues resources for all queues</div><div class='hunk'>@@ -428,7 +443,7 @@ static int ena_setup_all_rx_resources(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='ctx'> 		rc = ena_setup_rx_resources(adapter, i);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_setup_rx;</div><div class='hunk'>@@ -456,56 +471,87 @@ static void ena_free_all_io_rx_resources(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++)</div><div class='ctx'> 		ena_free_rx_resources(adapter, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int ena_alloc_rx_page(struct ena_ring *rx_ring,</div><div class='del'>-				    struct ena_rx_buffer *rx_info, gfp_t gfp)</div><div class='add'>+static struct page *ena_alloc_map_page(struct ena_ring *rx_ring,</div><div class='add'>+				       dma_addr_t *dma)</div><div class='add'>+{</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	/* This would allocate the page on the same NUMA node the executing code</div><div class='add'>+	 * is running on.</div><div class='add'>+	 */</div><div class='add'>+	page = dev_alloc_page();</div><div class='add'>+	if (!page) {</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.page_alloc_fail, 1, &amp;rx_ring-&gt;syncp);</div><div class='add'>+		return ERR_PTR(-ENOSPC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* To enable NIC-side port-mirroring, AKA SPAN port,</div><div class='add'>+	 * we make the buffer readable from the nic as well</div><div class='add'>+	 */</div><div class='add'>+	*dma = dma_map_page(rx_ring-&gt;dev, page, 0, ENA_PAGE_SIZE,</div><div class='add'>+			    DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(rx_ring-&gt;dev, *dma))) {</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.dma_mapping_err, 1,</div><div class='add'>+				  &amp;rx_ring-&gt;syncp);</div><div class='add'>+		__free_page(page);</div><div class='add'>+		return ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return page;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_alloc_rx_buffer(struct ena_ring *rx_ring,</div><div class='add'>+			       struct ena_rx_buffer *rx_info)</div><div class='ctx'> {</div><div class='add'>+	int headroom = rx_ring-&gt;rx_headroom;</div><div class='ctx'> 	struct ena_com_buf *ena_buf;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	dma_addr_t dma;</div><div class='add'>+	int tailroom;</div><div class='add'>+</div><div class='add'>+	/* restore page offset value in case it has been changed by device */</div><div class='add'>+	rx_info-&gt;buf_offset = headroom;</div><div class='ctx'> </div><div class='ctx'> 	/* if previous allocated page is not used */</div><div class='ctx'> 	if (unlikely(rx_info-&gt;page))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	page = alloc_page(gfp);</div><div class='del'>-	if (unlikely(!page)) {</div><div class='del'>-		u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		rx_ring-&gt;rx_stats.page_alloc_fail++;</div><div class='del'>-		u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dma = dma_map_page(rx_ring-&gt;dev, page, 0, ENA_PAGE_SIZE,</div><div class='del'>-			   DMA_FROM_DEVICE);</div><div class='del'>-	if (unlikely(dma_mapping_error(rx_ring-&gt;dev, dma))) {</div><div class='del'>-		u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		rx_ring-&gt;rx_stats.dma_mapping_err++;</div><div class='del'>-		u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+	/* We handle DMA here */</div><div class='add'>+	page = ena_alloc_map_page(rx_ring, &amp;dma);</div><div class='add'>+	if (IS_ERR(page))</div><div class='add'>+		return PTR_ERR(page);</div><div class='ctx'> </div><div class='del'>-		__free_page(page);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='ctx'> 	netif_dbg(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='del'>-		  "alloc page %p, rx_info %p\n", page, rx_info);</div><div class='add'>+		  "Allocate page %p, rx_info %p\n", page, rx_info);</div><div class='add'>+</div><div class='add'>+	tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> </div><div class='ctx'> 	rx_info-&gt;page = page;</div><div class='add'>+	rx_info-&gt;dma_addr = dma;</div><div class='ctx'> 	rx_info-&gt;page_offset = 0;</div><div class='ctx'> 	ena_buf = &amp;rx_info-&gt;ena_buf;</div><div class='del'>-	ena_buf-&gt;paddr = dma;</div><div class='del'>-	ena_buf-&gt;len = ENA_PAGE_SIZE;</div><div class='add'>+	ena_buf-&gt;paddr = dma + headroom;</div><div class='add'>+	ena_buf-&gt;len = ENA_PAGE_SIZE - headroom - tailroom;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ena_unmap_rx_buff_attrs(struct ena_ring *rx_ring,</div><div class='add'>+				    struct ena_rx_buffer *rx_info,</div><div class='add'>+				    unsigned long attrs)</div><div class='add'>+{</div><div class='add'>+	dma_unmap_page_attrs(rx_ring-&gt;dev, rx_info-&gt;dma_addr, ENA_PAGE_SIZE, DMA_BIDIRECTIONAL,</div><div class='add'>+			     attrs);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ena_free_rx_page(struct ena_ring *rx_ring,</div><div class='ctx'> 			     struct ena_rx_buffer *rx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct page *page = rx_info-&gt;page;</div><div class='del'>-	struct ena_com_buf *ena_buf = &amp;rx_info-&gt;ena_buf;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!page)) {</div><div class='ctx'> 		netif_warn(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='hunk'>@@ -513,8 +559,7 @@ static void ena_free_rx_page(struct ena_ring *rx_ring,</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_unmap_page(rx_ring-&gt;dev, ena_buf-&gt;paddr, ENA_PAGE_SIZE,</div><div class='del'>-		       DMA_FROM_DEVICE);</div><div class='add'>+	ena_unmap_rx_buff_attrs(rx_ring, rx_info, 0);</div><div class='ctx'> </div><div class='ctx'> 	__free_page(page);</div><div class='ctx'> 	rx_info-&gt;page = NULL;</div><div class='hunk'>@@ -531,19 +576,14 @@ static int ena_refill_rx_bufs(struct ena_ring *rx_ring, u32 num)</div><div class='ctx'> 	for (i = 0; i &lt; num; i++) {</div><div class='ctx'> 		struct ena_rx_buffer *rx_info;</div><div class='ctx'> </div><div class='del'>-		req_id = rx_ring-&gt;free_rx_ids[next_to_use];</div><div class='del'>-		rc = validate_rx_req_id(rx_ring, req_id);</div><div class='del'>-		if (unlikely(rc &lt; 0))</div><div class='del'>-			break;</div><div class='add'>+		req_id = rx_ring-&gt;free_ids[next_to_use];</div><div class='ctx'> </div><div class='ctx'> 		rx_info = &amp;rx_ring-&gt;rx_buffer_info[req_id];</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-		rc = ena_alloc_rx_page(rx_ring, rx_info,</div><div class='del'>-				       GFP_ATOMIC | __GFP_COMP);</div><div class='add'>+		rc = ena_alloc_rx_buffer(rx_ring, rx_info);</div><div class='ctx'> 		if (unlikely(rc &lt; 0)) {</div><div class='ctx'> 			netif_warn(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='del'>-				   "failed to alloc buffer for rx queue %d\n",</div><div class='add'>+				   "Failed to allocate buffer for rx queue %d\n",</div><div class='ctx'> 				   rx_ring-&gt;qid);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -552,7 +592,7 @@ static int ena_refill_rx_bufs(struct ena_ring *rx_ring, u32 num)</div><div class='ctx'> 						req_id);</div><div class='ctx'> 		if (unlikely(rc)) {</div><div class='ctx'> 			netif_warn(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='del'>-				   "failed to add buffer for rx queue %d\n",</div><div class='add'>+				   "Failed to add buffer for rx queue %d\n",</div><div class='ctx'> 				   rx_ring-&gt;qid);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -561,12 +601,11 @@ static int ena_refill_rx_bufs(struct ena_ring *rx_ring, u32 num)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(i &lt; num)) {</div><div class='del'>-		u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		rx_ring-&gt;rx_stats.refil_partial++;</div><div class='del'>-		u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		netdev_warn(rx_ring-&gt;netdev,</div><div class='del'>-			    "refilled rx qid %d with only %d buffers (from %d)\n",</div><div class='del'>-			    rx_ring-&gt;qid, i, num);</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.refil_partial, 1,</div><div class='add'>+				  &amp;rx_ring-&gt;syncp);</div><div class='add'>+		netif_warn(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='add'>+			   "Refilled rx qid %d with only %d buffers (from %d)\n",</div><div class='add'>+			   rx_ring-&gt;qid, i, num);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* ena_com_write_sq_doorbell issues a wmb() */</div><div class='hunk'>@@ -594,21 +633,20 @@ static void ena_free_rx_bufs(struct ena_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> /* ena_refill_all_rx_bufs - allocate all queues Rx buffers</div><div class='ctx'>  * @adapter: board private structure</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> static void ena_refill_all_rx_bufs(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_ring *rx_ring;</div><div class='ctx'> 	int i, rc, bufs_num;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='ctx'> 		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='ctx'> 		bufs_num = rx_ring-&gt;ring_size - 1;</div><div class='ctx'> 		rc = ena_refill_rx_bufs(rx_ring, bufs_num);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(rc != bufs_num))</div><div class='ctx'> 			netif_warn(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='del'>-				   "refilling Queue %d failed. allocated %d buffers from: %d\n",</div><div class='add'>+				   "Refilling Queue %d failed. allocated %d buffers from: %d\n",</div><div class='ctx'> 				   i, rc, bufs_num);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -617,12 +655,12 @@ static void ena_free_all_rx_bufs(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++)</div><div class='ctx'> 		ena_free_rx_bufs(adapter, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ena_unmap_tx_skb(struct ena_ring *tx_ring,</div><div class='del'>-				    struct ena_tx_buffer *tx_info)</div><div class='add'>+void ena_unmap_tx_buff(struct ena_ring *tx_ring,</div><div class='add'>+		       struct ena_tx_buffer *tx_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_buf *ena_buf;</div><div class='ctx'> 	u32 cnt;</div><div class='hunk'>@@ -657,8 +695,11 @@ static inline void ena_unmap_tx_skb(struct ena_ring *tx_ring,</div><div class='ctx'> static void ena_free_tx_bufs(struct ena_ring *tx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	bool print_once = true;</div><div class='add'>+	bool is_xdp_ring;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='add'>+	is_xdp_ring = ENA_IS_XDP_INDEX(tx_ring-&gt;adapter, tx_ring-&gt;qid);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; tx_ring-&gt;ring_size; i++) {</div><div class='ctx'> 		struct ena_tx_buffer *tx_info = &amp;tx_ring-&gt;tx_buffer_info[i];</div><div class='ctx'> </div><div class='hunk'>@@ -666,22 +707,27 @@ static void ena_free_tx_bufs(struct ena_ring *tx_ring)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (print_once) {</div><div class='del'>-			netdev_notice(tx_ring-&gt;netdev,</div><div class='del'>-				      "free uncompleted tx skb qid %d idx 0x%x\n",</div><div class='del'>-				      tx_ring-&gt;qid, i);</div><div class='add'>+			netif_notice(tx_ring-&gt;adapter, ifdown, tx_ring-&gt;netdev,</div><div class='add'>+				     "Free uncompleted tx skb qid %d idx 0x%x\n",</div><div class='add'>+				     tx_ring-&gt;qid, i);</div><div class='ctx'> 			print_once = false;</div><div class='ctx'> 		} else {</div><div class='del'>-			netdev_dbg(tx_ring-&gt;netdev,</div><div class='del'>-				   "free uncompleted tx skb qid %d idx 0x%x\n",</div><div class='del'>-				   tx_ring-&gt;qid, i);</div><div class='add'>+			netif_dbg(tx_ring-&gt;adapter, ifdown, tx_ring-&gt;netdev,</div><div class='add'>+				  "Free uncompleted tx skb qid %d idx 0x%x\n",</div><div class='add'>+				  tx_ring-&gt;qid, i);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ena_unmap_tx_skb(tx_ring, tx_info);</div><div class='add'>+		ena_unmap_tx_buff(tx_ring, tx_info);</div><div class='ctx'> </div><div class='del'>-		dev_kfree_skb_any(tx_info-&gt;skb);</div><div class='add'>+		if (is_xdp_ring)</div><div class='add'>+			xdp_return_frame(tx_info-&gt;xdpf);</div><div class='add'>+		else</div><div class='add'>+			dev_kfree_skb_any(tx_info-&gt;skb);</div><div class='ctx'> 	}</div><div class='del'>-	netdev_tx_reset_queue(netdev_get_tx_queue(tx_ring-&gt;netdev,</div><div class='del'>-						  tx_ring-&gt;qid));</div><div class='add'>+</div><div class='add'>+	if (!is_xdp_ring)</div><div class='add'>+		netdev_tx_reset_queue(netdev_get_tx_queue(tx_ring-&gt;netdev,</div><div class='add'>+							  tx_ring-&gt;qid));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ena_free_all_tx_bufs(struct ena_adapter *adapter)</div><div class='hunk'>@@ -689,7 +735,7 @@ static void ena_free_all_tx_bufs(struct ena_adapter *adapter)</div><div class='ctx'> 	struct ena_ring *tx_ring;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues; i++) {</div><div class='ctx'> 		tx_ring = &amp;adapter-&gt;tx_ring[i];</div><div class='ctx'> 		ena_free_tx_bufs(tx_ring);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -700,7 +746,7 @@ static void ena_destroy_all_tx_queues(struct ena_adapter *adapter)</div><div class='ctx'> 	u16 ena_qid;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues; i++) {</div><div class='ctx'> 		ena_qid = ENA_IO_TXQ_IDX(i);</div><div class='ctx'> 		ena_com_destroy_io_queue(adapter-&gt;ena_dev, ena_qid);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -711,8 +757,10 @@ static void ena_destroy_all_rx_queues(struct ena_adapter *adapter)</div><div class='ctx'> 	u16 ena_qid;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='ctx'> 		ena_qid = ENA_IO_RXQ_IDX(i);</div><div class='add'>+		cancel_work_sync(&amp;adapter-&gt;ena_napi[i].dim.work);</div><div class='add'>+		ena_xdp_unregister_rxq_info(&amp;adapter-&gt;rx_ring[i]);</div><div class='ctx'> 		ena_com_destroy_io_queue(adapter-&gt;ena_dev, ena_qid);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -723,33 +771,39 @@ static void ena_destroy_all_io_queues(struct ena_adapter *adapter)</div><div class='ctx'> 	ena_destroy_all_rx_queues(adapter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int validate_tx_req_id(struct ena_ring *tx_ring, u16 req_id)</div><div class='add'>+int handle_invalid_req_id(struct ena_ring *ring, u16 req_id,</div><div class='add'>+			  struct ena_tx_buffer *tx_info, bool is_xdp)</div><div class='ctx'> {</div><div class='del'>-	struct ena_tx_buffer *tx_info = NULL;</div><div class='del'>-</div><div class='del'>-	if (likely(req_id &lt; tx_ring-&gt;ring_size)) {</div><div class='del'>-		tx_info = &amp;tx_ring-&gt;tx_buffer_info[req_id];</div><div class='del'>-		if (likely(tx_info-&gt;skb))</div><div class='del'>-			return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (tx_info)</div><div class='del'>-		netif_err(tx_ring-&gt;adapter, tx_done, tx_ring-&gt;netdev,</div><div class='del'>-			  "tx_info doesn't have valid skb\n");</div><div class='add'>+		netif_err(ring-&gt;adapter,</div><div class='add'>+			  tx_done,</div><div class='add'>+			  ring-&gt;netdev,</div><div class='add'>+			  "tx_info doesn't have valid %s. qid %u req_id %u",</div><div class='add'>+			   is_xdp ? "xdp frame" : "skb", ring-&gt;qid, req_id);</div><div class='ctx'> 	else</div><div class='del'>-		netif_err(tx_ring-&gt;adapter, tx_done, tx_ring-&gt;netdev,</div><div class='del'>-			  "Invalid req_id: %hu\n", req_id);</div><div class='add'>+		netif_err(ring-&gt;adapter,</div><div class='add'>+			  tx_done,</div><div class='add'>+			  ring-&gt;netdev,</div><div class='add'>+			  "Invalid req_id %u in qid %u\n",</div><div class='add'>+			  req_id, ring-&gt;qid);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	tx_ring-&gt;tx_stats.bad_req_id++;</div><div class='del'>-	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;ring-&gt;tx_stats.bad_req_id, 1, &amp;ring-&gt;syncp);</div><div class='add'>+	ena_reset_device(ring-&gt;adapter, ENA_REGS_RESET_INV_TX_REQ_ID);</div><div class='ctx'> </div><div class='del'>-	/* Trigger device reset */</div><div class='del'>-	tx_ring-&gt;adapter-&gt;reset_reason = ENA_REGS_RESET_INV_TX_REQ_ID;</div><div class='del'>-	set_bit(ENA_FLAG_TRIGGER_RESET, &amp;tx_ring-&gt;adapter-&gt;flags);</div><div class='ctx'> 	return -EFAULT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int validate_tx_req_id(struct ena_ring *tx_ring, u16 req_id)</div><div class='add'>+{</div><div class='add'>+	struct ena_tx_buffer *tx_info;</div><div class='add'>+</div><div class='add'>+	tx_info = &amp;tx_ring-&gt;tx_buffer_info[req_id];</div><div class='add'>+	if (likely(tx_info-&gt;skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return handle_invalid_req_id(tx_ring, req_id, tx_info, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='hunk'>@@ -770,9 +824,13 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)</div><div class='ctx'> </div><div class='ctx'> 		rc = ena_com_tx_comp_req_id_get(tx_ring-&gt;ena_com_io_cq,</div><div class='ctx'> 						&amp;req_id);</div><div class='del'>-		if (rc)</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (unlikely(rc == -EINVAL))</div><div class='add'>+				handle_invalid_req_id(tx_ring, req_id, NULL, false);</div><div class='ctx'> 			break;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+		/* validate that the request id points to a valid skb */</div><div class='ctx'> 		rc = validate_tx_req_id(tx_ring, req_id);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -786,25 +844,24 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)</div><div class='ctx'> 		tx_info-&gt;skb = NULL;</div><div class='ctx'> 		tx_info-&gt;last_jiffies = 0;</div><div class='ctx'> </div><div class='del'>-		ena_unmap_tx_skb(tx_ring, tx_info);</div><div class='add'>+		ena_unmap_tx_buff(tx_ring, tx_info);</div><div class='ctx'> </div><div class='ctx'> 		netif_dbg(tx_ring-&gt;adapter, tx_done, tx_ring-&gt;netdev,</div><div class='ctx'> 			  "tx_poll: q %d skb %p completed\n", tx_ring-&gt;qid,</div><div class='ctx'> 			  skb);</div><div class='ctx'> </div><div class='del'>-		tx_bytes += skb-&gt;len;</div><div class='add'>+		tx_bytes += tx_info-&gt;total_tx_size;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		tx_pkts++;</div><div class='ctx'> 		total_done += tx_info-&gt;tx_descs;</div><div class='ctx'> </div><div class='del'>-		tx_ring-&gt;free_tx_ids[next_to_clean] = req_id;</div><div class='add'>+		tx_ring-&gt;free_ids[next_to_clean] = req_id;</div><div class='ctx'> 		next_to_clean = ENA_TX_RING_IDX_NEXT(next_to_clean,</div><div class='ctx'> 						     tx_ring-&gt;ring_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tx_ring-&gt;next_to_clean = next_to_clean;</div><div class='ctx'> 	ena_com_comp_ack(tx_ring-&gt;ena_com_io_sq, total_done);</div><div class='del'>-	ena_com_update_dev_comp_head(tx_ring-&gt;ena_com_io_cq);</div><div class='ctx'> </div><div class='ctx'> 	netdev_tx_completed_queue(txq, tx_pkts, tx_bytes);</div><div class='ctx'> </div><div class='hunk'>@@ -824,60 +881,87 @@ static int ena_clean_tx_irq(struct ena_ring *tx_ring, u32 budget)</div><div class='ctx'> 		above_thresh =</div><div class='ctx'> 			ena_com_sq_have_enough_space(tx_ring-&gt;ena_com_io_sq,</div><div class='ctx'> 						     ENA_TX_WAKEUP_THRESH);</div><div class='del'>-		if (netif_tx_queue_stopped(txq) &amp;&amp; above_thresh) {</div><div class='add'>+		if (netif_tx_queue_stopped(txq) &amp;&amp; above_thresh &amp;&amp;</div><div class='add'>+		    test_bit(ENA_FLAG_DEV_UP, &amp;tx_ring-&gt;adapter-&gt;flags)) {</div><div class='ctx'> 			netif_tx_wake_queue(txq);</div><div class='del'>-			u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-			tx_ring-&gt;tx_stats.queue_wakeup++;</div><div class='del'>-			u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+			ena_increase_stat(&amp;tx_ring-&gt;tx_stats.queue_wakeup, 1,</div><div class='add'>+					  &amp;tx_ring-&gt;syncp);</div><div class='ctx'> 		}</div><div class='ctx'> 		__netif_tx_unlock(txq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tx_ring-&gt;per_napi_bytes += tx_bytes;</div><div class='del'>-	tx_ring-&gt;per_napi_packets += tx_pkts;</div><div class='del'>-</div><div class='ctx'> 	return tx_pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *ena_alloc_skb(struct ena_ring *rx_ring, bool frags)</div><div class='add'>+static struct sk_buff *ena_alloc_skb(struct ena_ring *rx_ring, void *first_frag, u16 len)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	if (frags)</div><div class='del'>-		skb = napi_get_frags(rx_ring-&gt;napi);</div><div class='add'>+	if (!first_frag)</div><div class='add'>+		skb = napi_alloc_skb(rx_ring-&gt;napi, len);</div><div class='ctx'> 	else</div><div class='del'>-		skb = netdev_alloc_skb_ip_align(rx_ring-&gt;netdev,</div><div class='del'>-						rx_ring-&gt;rx_copybreak);</div><div class='add'>+		skb = napi_build_skb(first_frag, len);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!skb)) {</div><div class='del'>-		u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		rx_ring-&gt;rx_stats.skb_alloc_fail++;</div><div class='del'>-		u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.skb_alloc_fail, 1,</div><div class='add'>+				  &amp;rx_ring-&gt;syncp);</div><div class='add'>+</div><div class='ctx'> 		netif_dbg(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='del'>-			  "Failed to allocate skb. frags: %d\n", frags);</div><div class='del'>-		return NULL;</div><div class='add'>+			  "Failed to allocate skb. first_frag %s\n",</div><div class='add'>+			  first_frag ? "provided" : "not provided");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool ena_try_rx_buf_page_reuse(struct ena_rx_buffer *rx_info, u16 buf_len,</div><div class='add'>+				      u16 len, int pkt_offset)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_buf *ena_buf = &amp;rx_info-&gt;ena_buf;</div><div class='add'>+</div><div class='add'>+	/* More than ENA_MIN_RX_BUF_SIZE left in the reused buffer</div><div class='add'>+	 * for data + headroom + tailroom.</div><div class='add'>+	 */</div><div class='add'>+	if (SKB_DATA_ALIGN(len + pkt_offset) + ENA_MIN_RX_BUF_SIZE &lt;= ena_buf-&gt;len) {</div><div class='add'>+		page_ref_inc(rx_info-&gt;page);</div><div class='add'>+		rx_info-&gt;page_offset += buf_len;</div><div class='add'>+		ena_buf-&gt;paddr += buf_len;</div><div class='add'>+		ena_buf-&gt;len -= buf_len;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,</div><div class='ctx'> 				  struct ena_com_rx_buf_info *ena_bufs,</div><div class='ctx'> 				  u32 descs,</div><div class='ctx'> 				  u16 *next_to_clean)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	int tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	bool is_xdp_loaded = ena_xdp_present_ring(rx_ring);</div><div class='ctx'> 	struct ena_rx_buffer *rx_info;</div><div class='add'>+	struct ena_adapter *adapter;</div><div class='add'>+	int page_offset, pkt_offset;</div><div class='add'>+	dma_addr_t pre_reuse_paddr;</div><div class='ctx'> 	u16 len, req_id, buf = 0;</div><div class='del'>-	void *va;</div><div class='add'>+	bool reuse_rx_buf_page;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *buf_addr;</div><div class='add'>+	int buf_offset;</div><div class='add'>+	u16 buf_len;</div><div class='ctx'> </div><div class='ctx'> 	len = ena_bufs[buf].len;</div><div class='ctx'> 	req_id = ena_bufs[buf].req_id;</div><div class='add'>+</div><div class='ctx'> 	rx_info = &amp;rx_ring-&gt;rx_buffer_info[req_id];</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!rx_info-&gt;page)) {</div><div class='del'>-		netif_err(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='del'>-			  "Page is NULL\n");</div><div class='add'>+		adapter = rx_ring-&gt;adapter;</div><div class='add'>+		netif_err(adapter, rx_err, rx_ring-&gt;netdev,</div><div class='add'>+			  "Page is NULL. qid %u req_id %u\n", rx_ring-&gt;qid, req_id);</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.bad_req_id, 1, &amp;rx_ring-&gt;syncp);</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_INV_RX_REQ_ID);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -885,57 +969,59 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,</div><div class='ctx'> 		  "rx_info %p page %p\n",</div><div class='ctx'> 		  rx_info, rx_info-&gt;page);</div><div class='ctx'> </div><div class='del'>-	/* save virt address of first buffer */</div><div class='del'>-	va = page_address(rx_info-&gt;page) + rx_info-&gt;page_offset;</div><div class='del'>-	prefetch(va + NET_IP_ALIGN);</div><div class='add'>+	buf_offset = rx_info-&gt;buf_offset;</div><div class='add'>+	pkt_offset = buf_offset - rx_ring-&gt;rx_headroom;</div><div class='add'>+	page_offset = rx_info-&gt;page_offset;</div><div class='add'>+	buf_addr = page_address(rx_info-&gt;page) + page_offset;</div><div class='ctx'> </div><div class='ctx'> 	if (len &lt;= rx_ring-&gt;rx_copybreak) {</div><div class='del'>-		skb = ena_alloc_skb(rx_ring, false);</div><div class='add'>+		skb = ena_alloc_skb(rx_ring, NULL, len);</div><div class='ctx'> 		if (unlikely(!skb))</div><div class='ctx'> 			return NULL;</div><div class='ctx'> </div><div class='del'>-		netif_dbg(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='del'>-			  "rx allocated small packet. len %d. data_len %d\n",</div><div class='del'>-			  skb-&gt;len, skb-&gt;data_len);</div><div class='del'>-</div><div class='del'>-		/* sync this buffer for CPU use */</div><div class='del'>-		dma_sync_single_for_cpu(rx_ring-&gt;dev,</div><div class='del'>-					dma_unmap_addr(&amp;rx_info-&gt;ena_buf, paddr),</div><div class='del'>-					len,</div><div class='del'>-					DMA_FROM_DEVICE);</div><div class='del'>-		skb_copy_to_linear_data(skb, va, len);</div><div class='add'>+		skb_copy_to_linear_data(skb, buf_addr + buf_offset, len);</div><div class='ctx'> 		dma_sync_single_for_device(rx_ring-&gt;dev,</div><div class='del'>-					   dma_unmap_addr(&amp;rx_info-&gt;ena_buf, paddr),</div><div class='add'>+					   dma_unmap_addr(&amp;rx_info-&gt;ena_buf, paddr) + pkt_offset,</div><div class='ctx'> 					   len,</div><div class='ctx'> 					   DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		skb_put(skb, len);</div><div class='add'>+		netif_dbg(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='add'>+			  "RX allocated small packet. len %d.\n", skb-&gt;len);</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, rx_ring-&gt;netdev);</div><div class='del'>-		rx_ring-&gt;free_rx_ids[*next_to_clean] = req_id;</div><div class='add'>+		rx_ring-&gt;free_ids[*next_to_clean] = req_id;</div><div class='ctx'> 		*next_to_clean = ENA_RX_RING_IDX_ADD(*next_to_clean, descs,</div><div class='ctx'> 						     rx_ring-&gt;ring_size);</div><div class='ctx'> 		return skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = ena_alloc_skb(rx_ring, true);</div><div class='add'>+	buf_len = SKB_DATA_ALIGN(len + buf_offset + tailroom);</div><div class='add'>+</div><div class='add'>+	/* If XDP isn't loaded try to reuse part of the RX buffer */</div><div class='add'>+	reuse_rx_buf_page = !is_xdp_loaded &amp;&amp;</div><div class='add'>+			    ena_try_rx_buf_page_reuse(rx_info, buf_len, len, pkt_offset);</div><div class='add'>+</div><div class='add'>+	if (!reuse_rx_buf_page)</div><div class='add'>+		ena_unmap_rx_buff_attrs(rx_ring, rx_info, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+</div><div class='add'>+	skb = ena_alloc_skb(rx_ring, buf_addr, buf_len);</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		dma_unmap_page(rx_ring-&gt;dev,</div><div class='del'>-			       dma_unmap_addr(&amp;rx_info-&gt;ena_buf, paddr),</div><div class='del'>-			       ENA_PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-		skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags, rx_info-&gt;page,</div><div class='del'>-				rx_info-&gt;page_offset, len, ENA_PAGE_SIZE);</div><div class='add'>+	/* Populate skb's linear part */</div><div class='add'>+	skb_reserve(skb, buf_offset);</div><div class='add'>+	skb_put(skb, len);</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, rx_ring-&gt;netdev);</div><div class='ctx'> </div><div class='add'>+	do {</div><div class='ctx'> 		netif_dbg(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='del'>-			  "rx skb updated. len %d. data_len %d\n",</div><div class='add'>+			  "RX skb updated. len %d. data_len %d\n",</div><div class='ctx'> 			  skb-&gt;len, skb-&gt;data_len);</div><div class='ctx'> </div><div class='del'>-		rx_info-&gt;page = NULL;</div><div class='add'>+		if (!reuse_rx_buf_page)</div><div class='add'>+			rx_info-&gt;page = NULL;</div><div class='ctx'> </div><div class='del'>-		rx_ring-&gt;free_rx_ids[*next_to_clean] = req_id;</div><div class='add'>+		rx_ring-&gt;free_ids[*next_to_clean] = req_id;</div><div class='ctx'> 		*next_to_clean =</div><div class='ctx'> 			ENA_RX_RING_IDX_NEXT(*next_to_clean,</div><div class='ctx'> 					     rx_ring-&gt;ring_size);</div><div class='hunk'>@@ -945,7 +1031,31 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,</div><div class='ctx'> 		buf++;</div><div class='ctx'> 		len = ena_bufs[buf].len;</div><div class='ctx'> 		req_id = ena_bufs[buf].req_id;</div><div class='add'>+</div><div class='ctx'> 		rx_info = &amp;rx_ring-&gt;rx_buffer_info[req_id];</div><div class='add'>+</div><div class='add'>+		/* rx_info-&gt;buf_offset includes rx_ring-&gt;rx_headroom */</div><div class='add'>+		buf_offset = rx_info-&gt;buf_offset;</div><div class='add'>+		pkt_offset = buf_offset - rx_ring-&gt;rx_headroom;</div><div class='add'>+		buf_len = SKB_DATA_ALIGN(len + buf_offset + tailroom);</div><div class='add'>+		page_offset = rx_info-&gt;page_offset;</div><div class='add'>+</div><div class='add'>+		pre_reuse_paddr = dma_unmap_addr(&amp;rx_info-&gt;ena_buf, paddr);</div><div class='add'>+</div><div class='add'>+		reuse_rx_buf_page = !is_xdp_loaded &amp;&amp;</div><div class='add'>+				    ena_try_rx_buf_page_reuse(rx_info, buf_len, len, pkt_offset);</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_cpu(rx_ring-&gt;dev,</div><div class='add'>+					pre_reuse_paddr + pkt_offset,</div><div class='add'>+					len,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (!reuse_rx_buf_page)</div><div class='add'>+			ena_unmap_rx_buff_attrs(rx_ring, rx_info, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+</div><div class='add'>+		skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags, rx_info-&gt;page,</div><div class='add'>+				page_offset + buf_offset, len, buf_len);</div><div class='add'>+</div><div class='ctx'> 	} while (1);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='hunk'>@@ -956,7 +1066,7 @@ static struct sk_buff *ena_rx_skb(struct ena_ring *rx_ring,</div><div class='ctx'>  * @ena_rx_ctx: received packet context/metadata</div><div class='ctx'>  * @skb: skb currently being received and modified</div><div class='ctx'>  */</div><div class='del'>-static inline void ena_rx_checksum(struct ena_ring *rx_ring,</div><div class='add'>+static void ena_rx_checksum(struct ena_ring *rx_ring,</div><div class='ctx'> 				   struct ena_com_rx_ctx *ena_rx_ctx,</div><div class='ctx'> 				   struct sk_buff *skb)</div><div class='ctx'> {</div><div class='hunk'>@@ -977,9 +1087,8 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,</div><div class='ctx'> 		     (ena_rx_ctx-&gt;l3_csum_err))) {</div><div class='ctx'> 		/* ipv4 checksum error */</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='del'>-		u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-		rx_ring-&gt;rx_stats.bad_csum++;</div><div class='del'>-		u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.csum_bad, 1,</div><div class='add'>+				  &amp;rx_ring-&gt;syncp);</div><div class='ctx'> 		netif_dbg(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='ctx'> 			  "RX IPv4 header checksum error\n");</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -990,9 +1099,8 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,</div><div class='ctx'> 		   (ena_rx_ctx-&gt;l4_proto == ENA_ETH_IO_L4_PROTO_UDP))) {</div><div class='ctx'> 		if (unlikely(ena_rx_ctx-&gt;l4_csum_err)) {</div><div class='ctx'> 			/* TCP/UDP checksum error */</div><div class='del'>-			u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-			rx_ring-&gt;rx_stats.bad_csum++;</div><div class='del'>-			u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+			ena_increase_stat(&amp;rx_ring-&gt;rx_stats.csum_bad, 1,</div><div class='add'>+					  &amp;rx_ring-&gt;syncp);</div><div class='ctx'> 			netif_dbg(rx_ring-&gt;adapter, rx_err, rx_ring-&gt;netdev,</div><div class='ctx'> 				  "RX L4 checksum error\n");</div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='hunk'>@@ -1001,10 +1109,11 @@ static inline void ena_rx_checksum(struct ena_ring *rx_ring,</div><div class='ctx'> </div><div class='ctx'> 		if (likely(ena_rx_ctx-&gt;l4_csum_checked)) {</div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+			ena_increase_stat(&amp;rx_ring-&gt;rx_stats.csum_good, 1,</div><div class='add'>+					  &amp;rx_ring-&gt;syncp);</div><div class='ctx'> 		} else {</div><div class='del'>-			u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-			rx_ring-&gt;rx_stats.csum_unchecked++;</div><div class='del'>-			u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+			ena_increase_stat(&amp;rx_ring-&gt;rx_stats.csum_unchecked, 1,</div><div class='add'>+					  &amp;rx_ring-&gt;syncp);</div><div class='ctx'> 			skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1036,6 +1145,35 @@ static void ena_set_rx_hash(struct ena_ring *rx_ring,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ena_xdp_handle_buff(struct ena_ring *rx_ring, struct xdp_buff *xdp, u16 num_descs)</div><div class='add'>+{</div><div class='add'>+	struct ena_rx_buffer *rx_info;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* XDP multi-buffer packets not supported */</div><div class='add'>+	if (unlikely(num_descs &gt; 1)) {</div><div class='add'>+		netdev_err_once(rx_ring-&gt;adapter-&gt;netdev,</div><div class='add'>+				"xdp: dropped unsupported multi-buffer packets\n");</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.xdp_drop, 1, &amp;rx_ring-&gt;syncp);</div><div class='add'>+		return ENA_XDP_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_info = &amp;rx_ring-&gt;rx_buffer_info[rx_ring-&gt;ena_bufs[0].req_id];</div><div class='add'>+	xdp_prepare_buff(xdp, page_address(rx_info-&gt;page),</div><div class='add'>+			 rx_info-&gt;buf_offset,</div><div class='add'>+			 rx_ring-&gt;ena_bufs[0].len, false);</div><div class='add'>+</div><div class='add'>+	ret = ena_xdp_execute(rx_ring, xdp);</div><div class='add'>+</div><div class='add'>+	/* The xdp program might expand the headers */</div><div class='add'>+	if (ret == ENA_XDP_PASS) {</div><div class='add'>+		rx_info-&gt;buf_offset = xdp-&gt;data - xdp-&gt;data_hard_start;</div><div class='add'>+		rx_ring-&gt;ena_bufs[0].len = xdp-&gt;data_end - xdp-&gt;data;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* ena_clean_rx_irq - Cleanup RX irq</div><div class='ctx'>  * @rx_ring: RX ring to clean</div><div class='ctx'>  * @napi: napi handler</div><div class='hunk'>@@ -1047,26 +1185,34 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,</div><div class='ctx'> 			    u32 budget)</div><div class='ctx'> {</div><div class='ctx'> 	u16 next_to_clean = rx_ring-&gt;next_to_clean;</div><div class='del'>-	u32 res_budget, work_done;</div><div class='del'>-</div><div class='ctx'> 	struct ena_com_rx_ctx ena_rx_ctx;</div><div class='add'>+	struct ena_rx_buffer *rx_info;</div><div class='ctx'> 	struct ena_adapter *adapter;</div><div class='add'>+	u32 res_budget, work_done;</div><div class='add'>+	int rx_copybreak_pkt = 0;</div><div class='add'>+	int refill_threshold;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int refill_required;</div><div class='del'>-	int refill_threshold;</div><div class='del'>-	int rc = 0;</div><div class='add'>+	struct xdp_buff xdp;</div><div class='add'>+	int xdp_flags = 0;</div><div class='ctx'> 	int total_len = 0;</div><div class='del'>-	int rx_copybreak_pkt = 0;</div><div class='add'>+	int xdp_verdict;</div><div class='add'>+	u8 pkt_offset;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='ctx'> 		  "%s qid %d\n", __func__, rx_ring-&gt;qid);</div><div class='ctx'> 	res_budget = budget;</div><div class='add'>+	xdp_init_buff(&amp;xdp, ENA_PAGE_SIZE, &amp;rx_ring-&gt;xdp_rxq);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='add'>+		xdp_verdict = ENA_XDP_PASS;</div><div class='add'>+		skb = NULL;</div><div class='ctx'> 		ena_rx_ctx.ena_bufs = rx_ring-&gt;ena_bufs;</div><div class='ctx'> 		ena_rx_ctx.max_bufs = rx_ring-&gt;sgl_size;</div><div class='ctx'> 		ena_rx_ctx.descs = 0;</div><div class='add'>+		ena_rx_ctx.pkt_offset = 0;</div><div class='ctx'> 		rc = ena_com_rx_pkt(rx_ring-&gt;ena_com_io_cq,</div><div class='ctx'> 				    rx_ring-&gt;ena_com_io_sq,</div><div class='ctx'> 				    &amp;ena_rx_ctx);</div><div class='hunk'>@@ -1076,23 +1222,55 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,</div><div class='ctx'> 		if (unlikely(ena_rx_ctx.descs == 0))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		/* First descriptor might have an offset set by the device */</div><div class='add'>+		rx_info = &amp;rx_ring-&gt;rx_buffer_info[rx_ring-&gt;ena_bufs[0].req_id];</div><div class='add'>+		pkt_offset = ena_rx_ctx.pkt_offset;</div><div class='add'>+		rx_info-&gt;buf_offset += pkt_offset;</div><div class='add'>+</div><div class='ctx'> 		netif_dbg(rx_ring-&gt;adapter, rx_status, rx_ring-&gt;netdev,</div><div class='ctx'> 			  "rx_poll: q %d got packet from ena. descs #: %d l3 proto %d l4 proto %d hash: %x\n",</div><div class='ctx'> 			  rx_ring-&gt;qid, ena_rx_ctx.descs, ena_rx_ctx.l3_proto,</div><div class='ctx'> 			  ena_rx_ctx.l4_proto, ena_rx_ctx.hash);</div><div class='ctx'> </div><div class='add'>+		dma_sync_single_for_cpu(rx_ring-&gt;dev,</div><div class='add'>+					dma_unmap_addr(&amp;rx_info-&gt;ena_buf, paddr) + pkt_offset,</div><div class='add'>+					rx_ring-&gt;ena_bufs[0].len,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (ena_xdp_present_ring(rx_ring))</div><div class='add'>+			xdp_verdict = ena_xdp_handle_buff(rx_ring, &amp;xdp, ena_rx_ctx.descs);</div><div class='add'>+</div><div class='ctx'> 		/* allocate skb and fill it */</div><div class='del'>-		skb = ena_rx_skb(rx_ring, rx_ring-&gt;ena_bufs, ena_rx_ctx.descs,</div><div class='del'>-				 &amp;next_to_clean);</div><div class='add'>+		if (xdp_verdict == ENA_XDP_PASS)</div><div class='add'>+			skb = ena_rx_skb(rx_ring,</div><div class='add'>+					 rx_ring-&gt;ena_bufs,</div><div class='add'>+					 ena_rx_ctx.descs,</div><div class='add'>+					 &amp;next_to_clean);</div><div class='ctx'> </div><div class='del'>-		/* exit if we failed to retrieve a buffer */</div><div class='ctx'> 		if (unlikely(!skb)) {</div><div class='ctx'> 			for (i = 0; i &lt; ena_rx_ctx.descs; i++) {</div><div class='del'>-				rx_ring-&gt;free_tx_ids[next_to_clean] =</div><div class='del'>-					rx_ring-&gt;ena_bufs[i].req_id;</div><div class='add'>+				int req_id = rx_ring-&gt;ena_bufs[i].req_id;</div><div class='add'>+</div><div class='add'>+				rx_ring-&gt;free_ids[next_to_clean] = req_id;</div><div class='ctx'> 				next_to_clean =</div><div class='ctx'> 					ENA_RX_RING_IDX_NEXT(next_to_clean,</div><div class='ctx'> 							     rx_ring-&gt;ring_size);</div><div class='add'>+</div><div class='add'>+				/* Packets was passed for transmission, unmap it</div><div class='add'>+				 * from RX side.</div><div class='add'>+				 */</div><div class='add'>+				if (xdp_verdict &amp; ENA_XDP_FORWARDED) {</div><div class='add'>+					ena_unmap_rx_buff_attrs(rx_ring,</div><div class='add'>+								&amp;rx_ring-&gt;rx_buffer_info[req_id],</div><div class='add'>+								DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+					rx_ring-&gt;rx_buffer_info[req_id].page = NULL;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			if (xdp_verdict != ENA_XDP_PASS) {</div><div class='add'>+				xdp_flags |= xdp_verdict;</div><div class='add'>+				total_len += ena_rx_ctx.ena_bufs[0].len;</div><div class='add'>+				res_budget--;</div><div class='add'>+				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1103,20 +1281,17 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 		skb_record_rx_queue(skb, rx_ring-&gt;qid);</div><div class='ctx'> </div><div class='del'>-		if (rx_ring-&gt;ena_bufs[0].len &lt;= rx_ring-&gt;rx_copybreak) {</div><div class='del'>-			total_len += rx_ring-&gt;ena_bufs[0].len;</div><div class='add'>+		if (rx_ring-&gt;ena_bufs[0].len &lt;= rx_ring-&gt;rx_copybreak)</div><div class='ctx'> 			rx_copybreak_pkt++;</div><div class='del'>-			napi_gro_receive(napi, skb);</div><div class='del'>-		} else {</div><div class='del'>-			total_len += skb-&gt;len;</div><div class='del'>-			napi_gro_frags(napi);</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		total_len += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+		napi_gro_receive(napi, skb);</div><div class='ctx'> </div><div class='ctx'> 		res_budget--;</div><div class='ctx'> 	} while (likely(res_budget));</div><div class='ctx'> </div><div class='ctx'> 	work_done = budget - res_budget;</div><div class='del'>-	rx_ring-&gt;per_napi_bytes += total_len;</div><div class='ctx'> 	rx_ring-&gt;per_napi_packets += work_done;</div><div class='ctx'> 	u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='ctx'> 	rx_ring-&gt;rx_stats.bytes += total_len;</div><div class='hunk'>@@ -1126,74 +1301,105 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,</div><div class='ctx'> </div><div class='ctx'> 	rx_ring-&gt;next_to_clean = next_to_clean;</div><div class='ctx'> </div><div class='del'>-	refill_required = ena_com_free_desc(rx_ring-&gt;ena_com_io_sq);</div><div class='add'>+	refill_required = ena_com_free_q_entries(rx_ring-&gt;ena_com_io_sq);</div><div class='ctx'> 	refill_threshold =</div><div class='ctx'> 		min_t(int, rx_ring-&gt;ring_size / ENA_RX_REFILL_THRESH_DIVIDER,</div><div class='ctx'> 		      ENA_RX_REFILL_THRESH_PACKET);</div><div class='ctx'> </div><div class='ctx'> 	/* Optimization, try to batch new rx buffers */</div><div class='del'>-	if (refill_required &gt; refill_threshold) {</div><div class='del'>-		ena_com_update_dev_comp_head(rx_ring-&gt;ena_com_io_cq);</div><div class='add'>+	if (refill_required &gt; refill_threshold)</div><div class='ctx'> 		ena_refill_rx_bufs(rx_ring, refill_required);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	if (xdp_flags &amp; ENA_XDP_REDIRECT)</div><div class='add'>+		xdp_do_flush();</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='add'>+	if (xdp_flags &amp; ENA_XDP_REDIRECT)</div><div class='add'>+		xdp_do_flush();</div><div class='add'>+</div><div class='ctx'> 	adapter = netdev_priv(rx_ring-&gt;netdev);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-	rx_ring-&gt;rx_stats.bad_desc_num++;</div><div class='del'>-	u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+	if (rc == -ENOSPC) {</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.bad_desc_num, 1, &amp;rx_ring-&gt;syncp);</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_TOO_MANY_RX_DESCS);</div><div class='add'>+	} else if (rc == -EFAULT) {</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_RX_DESCRIPTOR_MALFORMED);</div><div class='add'>+	} else {</div><div class='add'>+		ena_increase_stat(&amp;rx_ring-&gt;rx_stats.bad_req_id, 1,</div><div class='add'>+				  &amp;rx_ring-&gt;syncp);</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_INV_RX_REQ_ID);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Too many desc from the device. Trigger reset */</div><div class='del'>-	adapter-&gt;reset_reason = ENA_REGS_RESET_TOO_MANY_RX_DESCS;</div><div class='del'>-	set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+static void ena_dim_work(struct work_struct *w)</div><div class='add'>+{</div><div class='add'>+	struct dim *dim = container_of(w, struct dim, work);</div><div class='add'>+	struct dim_cq_moder cur_moder =</div><div class='add'>+		net_dim_get_rx_moderation(dim-&gt;mode, dim-&gt;profile_ix);</div><div class='add'>+	struct ena_napi *ena_napi = container_of(dim, struct ena_napi, dim);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	ena_napi-&gt;rx_ring-&gt;smoothed_interval = cur_moder.usec;</div><div class='add'>+	dim-&gt;state = DIM_START_MEASURE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-inline void ena_adjust_intr_moderation(struct ena_ring *rx_ring,</div><div class='del'>-				       struct ena_ring *tx_ring)</div><div class='add'>+static void ena_adjust_adaptive_rx_intr_moderation(struct ena_napi *ena_napi)</div><div class='ctx'> {</div><div class='del'>-	/* We apply adaptive moderation on Rx path only.</div><div class='del'>-	 * Tx uses static interrupt moderation.</div><div class='del'>-	 */</div><div class='del'>-	ena_com_calculate_interrupt_delay(rx_ring-&gt;ena_dev,</div><div class='del'>-					  rx_ring-&gt;per_napi_packets,</div><div class='del'>-					  rx_ring-&gt;per_napi_bytes,</div><div class='del'>-					  &amp;rx_ring-&gt;smoothed_interval,</div><div class='del'>-					  &amp;rx_ring-&gt;moder_tbl_idx);</div><div class='del'>-</div><div class='del'>-	/* Reset per napi packets/bytes */</div><div class='del'>-	tx_ring-&gt;per_napi_packets = 0;</div><div class='del'>-	tx_ring-&gt;per_napi_bytes = 0;</div><div class='add'>+	struct dim_sample dim_sample;</div><div class='add'>+	struct ena_ring *rx_ring = ena_napi-&gt;rx_ring;</div><div class='add'>+</div><div class='add'>+	if (!rx_ring-&gt;per_napi_packets)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;non_empty_napi_events++;</div><div class='add'>+</div><div class='add'>+	dim_update_sample(rx_ring-&gt;non_empty_napi_events,</div><div class='add'>+			  rx_ring-&gt;rx_stats.cnt,</div><div class='add'>+			  rx_ring-&gt;rx_stats.bytes,</div><div class='add'>+			  &amp;dim_sample);</div><div class='add'>+</div><div class='add'>+	net_dim(&amp;ena_napi-&gt;dim, &amp;dim_sample);</div><div class='add'>+</div><div class='ctx'> 	rx_ring-&gt;per_napi_packets = 0;</div><div class='del'>-	rx_ring-&gt;per_napi_bytes = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ena_unmask_interrupt(struct ena_ring *tx_ring,</div><div class='del'>-					struct ena_ring *rx_ring)</div><div class='add'>+void ena_unmask_interrupt(struct ena_ring *tx_ring,</div><div class='add'>+			  struct ena_ring *rx_ring)</div><div class='ctx'> {</div><div class='add'>+	u32 rx_interval = tx_ring-&gt;smoothed_interval;</div><div class='ctx'> 	struct ena_eth_io_intr_reg intr_reg;</div><div class='ctx'> </div><div class='add'>+	/* Rx ring can be NULL when for XDP tx queues which don't have an</div><div class='add'>+	 * accompanying rx_ring pair.</div><div class='add'>+	 */</div><div class='add'>+	if (rx_ring)</div><div class='add'>+		rx_interval = ena_com_get_adaptive_moderation_enabled(rx_ring-&gt;ena_dev) ?</div><div class='add'>+			rx_ring-&gt;smoothed_interval :</div><div class='add'>+			ena_com_get_nonadaptive_moderation_interval_rx(rx_ring-&gt;ena_dev);</div><div class='add'>+</div><div class='ctx'> 	/* Update intr register: rx intr delay,</div><div class='ctx'> 	 * tx intr delay and interrupt unmask</div><div class='ctx'> 	 */</div><div class='ctx'> 	ena_com_update_intr_reg(&amp;intr_reg,</div><div class='del'>-				rx_ring-&gt;smoothed_interval,</div><div class='add'>+				rx_interval,</div><div class='ctx'> 				tx_ring-&gt;smoothed_interval,</div><div class='ctx'> 				true);</div><div class='ctx'> </div><div class='add'>+	ena_increase_stat(&amp;tx_ring-&gt;tx_stats.unmask_interrupt, 1,</div><div class='add'>+			  &amp;tx_ring-&gt;syncp);</div><div class='add'>+</div><div class='ctx'> 	/* It is a shared MSI-X.</div><div class='ctx'> 	 * Tx and Rx CQ have pointer to it.</div><div class='ctx'> 	 * So we use one of them to reach the intr reg</div><div class='add'>+	 * The Tx ring is used because the rx_ring is NULL for XDP queues</div><div class='ctx'> 	 */</div><div class='del'>-	ena_com_unmask_intr(rx_ring-&gt;ena_com_io_cq, &amp;intr_reg);</div><div class='add'>+	ena_com_unmask_intr(tx_ring-&gt;ena_com_io_cq, &amp;intr_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void ena_update_ring_numa_node(struct ena_ring *tx_ring,</div><div class='del'>-					     struct ena_ring *rx_ring)</div><div class='add'>+void ena_update_ring_numa_node(struct ena_ring *tx_ring,</div><div class='add'>+			       struct ena_ring *rx_ring)</div><div class='ctx'> {</div><div class='ctx'> 	int cpu = get_cpu();</div><div class='ctx'> 	int numa_node;</div><div class='hunk'>@@ -1202,17 +1408,27 @@ static inline void ena_update_ring_numa_node(struct ena_ring *tx_ring,</div><div class='ctx'> 	if (likely(tx_ring-&gt;cpu == cpu))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='add'>+	tx_ring-&gt;cpu = cpu;</div><div class='add'>+	if (rx_ring)</div><div class='add'>+		rx_ring-&gt;cpu = cpu;</div><div class='add'>+</div><div class='ctx'> 	numa_node = cpu_to_node(cpu);</div><div class='add'>+</div><div class='add'>+	if (likely(tx_ring-&gt;numa_node == numa_node))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	put_cpu();</div><div class='ctx'> </div><div class='ctx'> 	if (numa_node != NUMA_NO_NODE) {</div><div class='ctx'> 		ena_com_update_numa_node(tx_ring-&gt;ena_com_io_cq, numa_node);</div><div class='del'>-		ena_com_update_numa_node(rx_ring-&gt;ena_com_io_cq, numa_node);</div><div class='add'>+		tx_ring-&gt;numa_node = numa_node;</div><div class='add'>+		if (rx_ring) {</div><div class='add'>+			rx_ring-&gt;numa_node = numa_node;</div><div class='add'>+			ena_com_update_numa_node(rx_ring-&gt;ena_com_io_cq,</div><div class='add'>+						 numa_node);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tx_ring-&gt;cpu = cpu;</div><div class='del'>-	rx_ring-&gt;cpu = cpu;</div><div class='del'>-</div><div class='ctx'> 	return;</div><div class='ctx'> out:</div><div class='ctx'> 	put_cpu();</div><div class='hunk'>@@ -1222,9 +1438,8 @@ static int ena_io_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);</div><div class='ctx'> 	struct ena_ring *tx_ring, *rx_ring;</div><div class='del'>-</div><div class='del'>-	u32 tx_work_done;</div><div class='del'>-	u32 rx_work_done;</div><div class='add'>+	int tx_work_done;</div><div class='add'>+	int rx_work_done = 0;</div><div class='ctx'> 	int tx_budget;</div><div class='ctx'> 	int napi_comp_call = 0;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1241,7 +1456,11 @@ static int ena_io_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tx_work_done = ena_clean_tx_irq(tx_ring, tx_budget);</div><div class='del'>-	rx_work_done = ena_clean_rx_irq(rx_ring, napi, budget);</div><div class='add'>+	/* On netpoll the budget is zero and the handler should only clean the</div><div class='add'>+	 * tx completions.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(budget))</div><div class='add'>+		rx_work_done = ena_clean_rx_irq(rx_ring, napi, budget);</div><div class='ctx'> </div><div class='ctx'> 	/* If the device is about to reset or down, avoid unmask</div><div class='ctx'> 	 * the interrupt and return 0 so NAPI won't reschedule</div><div class='hunk'>@@ -1257,16 +1476,20 @@ static int ena_io_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		/* Update numa and unmask the interrupt only when schedule</div><div class='ctx'> 		 * from the interrupt context (vs from sk_busy_loop)</div><div class='ctx'> 		 */</div><div class='del'>-		if (napi_complete_done(napi, rx_work_done)) {</div><div class='del'>-			/* Tx and Rx share the same interrupt vector */</div><div class='add'>+		if (napi_complete_done(napi, rx_work_done) &amp;&amp;</div><div class='add'>+		    READ_ONCE(ena_napi-&gt;interrupts_masked)) {</div><div class='add'>+			smp_rmb(); /* make sure interrupts_masked is read */</div><div class='add'>+			WRITE_ONCE(ena_napi-&gt;interrupts_masked, false);</div><div class='add'>+			/* We apply adaptive moderation on Rx path only.</div><div class='add'>+			 * Tx uses static interrupt moderation.</div><div class='add'>+			 */</div><div class='ctx'> 			if (ena_com_get_adaptive_moderation_enabled(rx_ring-&gt;ena_dev))</div><div class='del'>-				ena_adjust_intr_moderation(rx_ring, tx_ring);</div><div class='add'>+				ena_adjust_adaptive_rx_intr_moderation(ena_napi);</div><div class='ctx'> </div><div class='add'>+			ena_update_ring_numa_node(tx_ring, rx_ring);</div><div class='ctx'> 			ena_unmask_interrupt(tx_ring, rx_ring);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		ena_update_ring_numa_node(tx_ring, rx_ring);</div><div class='del'>-</div><div class='ctx'> 		ret = rx_work_done;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = budget;</div><div class='hunk'>@@ -1277,6 +1500,8 @@ static int ena_io_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	tx_ring-&gt;tx_stats.tx_poll++;</div><div class='ctx'> 	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='ctx'> </div><div class='add'>+	tx_ring-&gt;tx_stats.last_napi_jiffies = jiffies;</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1301,8 +1526,11 @@ static irqreturn_t ena_intr_msix_io(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_napi *ena_napi = data;</div><div class='ctx'> </div><div class='del'>-	ena_napi-&gt;tx_ring-&gt;first_interrupt = true;</div><div class='del'>-	ena_napi-&gt;rx_ring-&gt;first_interrupt = true;</div><div class='add'>+	/* Used to check HW health */</div><div class='add'>+	WRITE_ONCE(ena_napi-&gt;first_interrupt, true);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(ena_napi-&gt;interrupts_masked, true);</div><div class='add'>+	smp_wmb(); /* write interrupts_masked before calling napi */</div><div class='ctx'> </div><div class='ctx'> 	napi_schedule_irqoff(&amp;ena_napi-&gt;napi);</div><div class='ctx'> </div><div class='hunk'>@@ -1314,7 +1542,7 @@ static irqreturn_t ena_intr_msix_io(int irq, void *data)</div><div class='ctx'>  * the number of potential io queues is the minimum of what the device</div><div class='ctx'>  * supports and the number of vCPUs.</div><div class='ctx'>  */</div><div class='del'>-static int ena_enable_msix(struct ena_adapter *adapter, int num_queues)</div><div class='add'>+static int ena_enable_msix(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int msix_vecs, irq_cnt;</div><div class='ctx'> </div><div class='hunk'>@@ -1325,9 +1553,9 @@ static int ena_enable_msix(struct ena_adapter *adapter, int num_queues)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reserved the max msix vectors we might need */</div><div class='del'>-	msix_vecs = ENA_MAX_MSIX_VEC(num_queues);</div><div class='add'>+	msix_vecs = ENA_MAX_MSIX_VEC(adapter-&gt;max_num_io_queues);</div><div class='ctx'> 	netif_dbg(adapter, probe, adapter-&gt;netdev,</div><div class='del'>-		  "trying to enable MSI-X, vectors %d\n", msix_vecs);</div><div class='add'>+		  "Trying to enable MSI-X, vectors %d\n", msix_vecs);</div><div class='ctx'> </div><div class='ctx'> 	irq_cnt = pci_alloc_irq_vectors(adapter-&gt;pdev, ENA_MIN_MSIX_VEC,</div><div class='ctx'> 					msix_vecs, PCI_IRQ_MSIX);</div><div class='hunk'>@@ -1340,12 +1568,12 @@ static int ena_enable_msix(struct ena_adapter *adapter, int num_queues)</div><div class='ctx'> </div><div class='ctx'> 	if (irq_cnt != msix_vecs) {</div><div class='ctx'> 		netif_notice(adapter, probe, adapter-&gt;netdev,</div><div class='del'>-			     "enable only %d MSI-X (out of %d), reduce the number of queues\n",</div><div class='add'>+			     "Enable only %d MSI-X (out of %d), reduce the number of queues\n",</div><div class='ctx'> 			     irq_cnt, msix_vecs);</div><div class='del'>-		adapter-&gt;num_queues = irq_cnt - ENA_ADMIN_MSIX_VEC;</div><div class='add'>+		adapter-&gt;num_io_queues = irq_cnt - ENA_ADMIN_MSIX_VEC;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ena_init_rx_cpu_rmap(adapter))</div><div class='add'>+	if (netif_enable_cpu_rmap(adapter-&gt;netdev, adapter-&gt;num_io_queues))</div><div class='ctx'> 		netif_warn(adapter, probe, adapter-&gt;netdev,</div><div class='ctx'> 			   "Failed to map IRQs to CPUs\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1377,10 +1605,12 @@ static void ena_setup_io_intr(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	int irq_idx, i, cpu;</div><div class='add'>+	int io_queue_count;</div><div class='ctx'> </div><div class='ctx'> 	netdev = adapter-&gt;netdev;</div><div class='add'>+	io_queue_count = adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; io_queue_count; i++) {</div><div class='ctx'> 		irq_idx = ENA_IO_IRQ_IDX(i);</div><div class='ctx'> 		cpu = i % num_online_cpus();</div><div class='ctx'> </div><div class='hunk'>@@ -1408,12 +1638,12 @@ static int ena_request_mgmnt_irq(struct ena_adapter *adapter)</div><div class='ctx'> 			 irq-&gt;data);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netif_err(adapter, probe, adapter-&gt;netdev,</div><div class='del'>-			  "failed to request admin irq\n");</div><div class='add'>+			  "Failed to request admin irq\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(adapter, probe, adapter-&gt;netdev,</div><div class='del'>-		  "set affinity hint of mgmnt irq.to 0x%lx (irq vector: %d)\n",</div><div class='add'>+		  "Set affinity hint of mgmnt irq.to 0x%lx (irq vector: %d)\n",</div><div class='ctx'> 		  irq-&gt;affinity_hint_mask.bits[0], irq-&gt;vector);</div><div class='ctx'> </div><div class='ctx'> 	irq_set_affinity_hint(irq-&gt;vector, &amp;irq-&gt;affinity_hint_mask);</div><div class='hunk'>@@ -1423,9 +1653,10 @@ static int ena_request_mgmnt_irq(struct ena_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static int ena_request_io_irq(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	u32 io_queue_count = adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues;</div><div class='add'>+	int rc = 0, i, k, irq_idx;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='ctx'> 	struct ena_irq *irq;</div><div class='del'>-	int rc = 0, i, k;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ENA_FLAG_MSIX_ENABLED, &amp;adapter-&gt;flags)) {</div><div class='ctx'> 		netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='hunk'>@@ -1433,7 +1664,7 @@ static int ena_request_io_irq(struct ena_adapter *adapter)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = ENA_IO_IRQ_FIRST_IDX; i &lt; adapter-&gt;msix_vecs; i++) {</div><div class='add'>+	for (i = ENA_IO_IRQ_FIRST_IDX; i &lt; ENA_MAX_MSIX_VEC(io_queue_count); i++) {</div><div class='ctx'> 		irq = &amp;adapter-&gt;irq_tbl[i];</div><div class='ctx'> 		rc = request_irq(irq-&gt;vector, irq-&gt;handler, flags, irq-&gt;name,</div><div class='ctx'> 				 irq-&gt;data);</div><div class='hunk'>@@ -1445,12 +1676,22 @@ static int ena_request_io_irq(struct ena_adapter *adapter)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		netif_dbg(adapter, ifup, adapter-&gt;netdev,</div><div class='del'>-			  "set affinity hint of irq. index %d to 0x%lx (irq vector: %d)\n",</div><div class='add'>+			  "Set affinity hint of irq. index %d to 0x%lx (irq vector: %d)\n",</div><div class='ctx'> 			  i, irq-&gt;affinity_hint_mask.bits[0], irq-&gt;vector);</div><div class='ctx'> </div><div class='ctx'> 		irq_set_affinity_hint(irq-&gt;vector, &amp;irq-&gt;affinity_hint_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Now that IO IRQs have been successfully allocated map them to the</div><div class='add'>+	 * corresponding IO NAPI instance. Note that the mgmnt IRQ does not</div><div class='add'>+	 * have a NAPI, so care must be taken to correctly map IRQs to NAPIs.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; io_queue_count; i++) {</div><div class='add'>+		irq_idx = ENA_IO_IRQ_IDX(i);</div><div class='add'>+		irq = &amp;adapter-&gt;irq_tbl[irq_idx];</div><div class='add'>+		netif_napi_set_irq(&amp;adapter-&gt;ena_napi[i].napi, irq-&gt;vector);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -1474,19 +1715,17 @@ static void ena_free_mgmnt_irq(struct ena_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void ena_free_io_irq(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	u32 io_queue_count = adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues;</div><div class='ctx'> 	struct ena_irq *irq;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	if (adapter-&gt;msix_vecs &gt;= 1) {</div><div class='del'>-		free_irq_cpu_rmap(adapter-&gt;netdev-&gt;rx_cpu_rmap);</div><div class='del'>-		adapter-&gt;netdev-&gt;rx_cpu_rmap = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_RFS_ACCEL */</div><div class='add'>+	for (i = ENA_IO_IRQ_FIRST_IDX; i &lt; ENA_MAX_MSIX_VEC(io_queue_count); i++) {</div><div class='add'>+		struct ena_napi *ena_napi;</div><div class='ctx'> </div><div class='del'>-	for (i = ENA_IO_IRQ_FIRST_IDX; i &lt; adapter-&gt;msix_vecs; i++) {</div><div class='ctx'> 		irq = &amp;adapter-&gt;irq_tbl[i];</div><div class='ctx'> 		irq_set_affinity_hint(irq-&gt;vector, NULL);</div><div class='add'>+		ena_napi = irq-&gt;data;</div><div class='add'>+		netif_napi_set_irq(&amp;ena_napi-&gt;napi, -1);</div><div class='ctx'> 		free_irq(irq-&gt;vector, irq-&gt;data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1499,63 +1738,97 @@ static void ena_disable_msix(struct ena_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void ena_disable_io_intr_sync(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	u32 io_queue_count = adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(adapter-&gt;netdev))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = ENA_IO_IRQ_FIRST_IDX; i &lt; adapter-&gt;msix_vecs; i++)</div><div class='add'>+	for (i = ENA_IO_IRQ_FIRST_IDX; i &lt; ENA_MAX_MSIX_VEC(io_queue_count); i++)</div><div class='ctx'> 		synchronize_irq(adapter-&gt;irq_tbl[i].vector);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_del_napi(struct ena_adapter *adapter)</div><div class='add'>+static void ena_del_napi_in_range(struct ena_adapter *adapter,</div><div class='add'>+				  int first_index,</div><div class='add'>+				  int count)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='ctx'> 		netif_napi_del(&amp;adapter-&gt;ena_napi[i].napi);</div><div class='add'>+</div><div class='add'>+		WARN_ON(ENA_IS_XDP_INDEX(adapter, i) &amp;&amp;</div><div class='add'>+			adapter-&gt;ena_napi[i].rx_ring);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_init_napi(struct ena_adapter *adapter)</div><div class='add'>+static void ena_init_napi_in_range(struct ena_adapter *adapter,</div><div class='add'>+				   int first_index, int count)</div><div class='ctx'> {</div><div class='del'>-	struct ena_napi *napi;</div><div class='add'>+	int (*napi_handler)(struct napi_struct *napi, int budget);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='del'>-		napi = &amp;adapter-&gt;ena_napi[i];</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='add'>+		struct ena_napi *napi = &amp;adapter-&gt;ena_napi[i];</div><div class='add'>+		struct ena_ring *rx_ring, *tx_ring;</div><div class='add'>+</div><div class='add'>+		memset(napi, 0, sizeof(*napi));</div><div class='ctx'> </div><div class='del'>-		netif_napi_add(adapter-&gt;netdev,</div><div class='del'>-			       &amp;adapter-&gt;ena_napi[i].napi,</div><div class='del'>-			       ena_io_poll,</div><div class='del'>-			       ENA_NAPI_BUDGET);</div><div class='del'>-		napi-&gt;rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='del'>-		napi-&gt;tx_ring = &amp;adapter-&gt;tx_ring[i];</div><div class='add'>+		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='add'>+		tx_ring = &amp;adapter-&gt;tx_ring[i];</div><div class='add'>+</div><div class='add'>+		napi_handler = ena_io_poll;</div><div class='add'>+		if (ENA_IS_XDP_INDEX(adapter, i))</div><div class='add'>+			napi_handler = ena_xdp_io_poll;</div><div class='add'>+</div><div class='add'>+		netif_napi_add_config(adapter-&gt;netdev, &amp;napi-&gt;napi, napi_handler, i);</div><div class='add'>+</div><div class='add'>+		if (!ENA_IS_XDP_INDEX(adapter, i))</div><div class='add'>+			napi-&gt;rx_ring = rx_ring;</div><div class='add'>+</div><div class='add'>+		napi-&gt;tx_ring = tx_ring;</div><div class='ctx'> 		napi-&gt;qid = i;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_napi_disable_all(struct ena_adapter *adapter)</div><div class='add'>+static void ena_napi_disable_in_range(struct ena_adapter *adapter,</div><div class='add'>+				      int first_index,</div><div class='add'>+				      int count)</div><div class='ctx'> {</div><div class='add'>+	struct napi_struct *napi;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='del'>-		napi_disable(&amp;adapter-&gt;ena_napi[i].napi);</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='add'>+		napi = &amp;adapter-&gt;ena_napi[i].napi;</div><div class='add'>+		if (!ENA_IS_XDP_INDEX(adapter, i)) {</div><div class='add'>+			/* This API is supported for non-XDP queues only */</div><div class='add'>+			netif_queue_set_napi(adapter-&gt;netdev, i,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_TX, NULL);</div><div class='add'>+			netif_queue_set_napi(adapter-&gt;netdev, i,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_RX, NULL);</div><div class='add'>+		}</div><div class='add'>+		napi_disable(napi);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_napi_enable_all(struct ena_adapter *adapter)</div><div class='add'>+static void ena_napi_enable_in_range(struct ena_adapter *adapter,</div><div class='add'>+				     int first_index,</div><div class='add'>+				     int count)</div><div class='ctx'> {</div><div class='add'>+	struct napi_struct *napi;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='del'>-		napi_enable(&amp;adapter-&gt;ena_napi[i].napi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ena_restore_ethtool_params(struct ena_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	adapter-&gt;tx_usecs = 0;</div><div class='del'>-	adapter-&gt;rx_usecs = 0;</div><div class='del'>-	adapter-&gt;tx_frames = 1;</div><div class='del'>-	adapter-&gt;rx_frames = 1;</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='add'>+		napi = &amp;adapter-&gt;ena_napi[i].napi;</div><div class='add'>+		napi_enable(napi);</div><div class='add'>+		if (!ENA_IS_XDP_INDEX(adapter, i)) {</div><div class='add'>+			/* This API is supported for non-XDP queues only */</div><div class='add'>+			netif_queue_set_napi(adapter-&gt;netdev, i,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_RX, napi);</div><div class='add'>+			netif_queue_set_napi(adapter-&gt;netdev, i,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_TX, napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configure the Rx forwarding */</div><div class='hunk'>@@ -1568,8 +1841,7 @@ static int ena_rss_configure(struct ena_adapter *adapter)</div><div class='ctx'> 	if (!ena_dev-&gt;rss.tbl_log_size) {</div><div class='ctx'> 		rc = ena_rss_init_default(adapter);</div><div class='ctx'> 		if (rc &amp;&amp; (rc != -EOPNOTSUPP)) {</div><div class='del'>-			netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='del'>-				  "Failed to init RSS rc: %d\n", rc);</div><div class='add'>+			netif_err(adapter, ifup, adapter-&gt;netdev, "Failed to init RSS rc: %d\n", rc);</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1607,9 +1879,9 @@ static int ena_up_complete(struct ena_adapter *adapter)</div><div class='ctx'> 	/* enable transmits */</div><div class='ctx'> 	netif_tx_start_all_queues(adapter-&gt;netdev);</div><div class='ctx'> </div><div class='del'>-	ena_restore_ethtool_params(adapter);</div><div class='del'>-</div><div class='del'>-	ena_napi_enable_all(adapter);</div><div class='add'>+	ena_napi_enable_in_range(adapter,</div><div class='add'>+				 0,</div><div class='add'>+				 adapter-&gt;xdp_num_queues + adapter-&gt;num_io_queues);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1635,8 +1907,8 @@ static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	ctx.qid = ena_qid;</div><div class='ctx'> 	ctx.mem_queue_type = ena_dev-&gt;tx_mem_queue_type;</div><div class='ctx'> 	ctx.msix_vector = msix_vector;</div><div class='del'>-	ctx.queue_size = adapter-&gt;tx_ring_size;</div><div class='del'>-	ctx.numa_node = cpu_to_node(tx_ring-&gt;cpu);</div><div class='add'>+	ctx.queue_size = tx_ring-&gt;ring_size;</div><div class='add'>+	ctx.numa_node = tx_ring-&gt;numa_node;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_create_io_queue(ena_dev, &amp;ctx);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -1661,12 +1933,13 @@ static int ena_create_io_tx_queue(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_create_all_io_tx_queues(struct ena_adapter *adapter)</div><div class='add'>+int ena_create_io_tx_queues_in_range(struct ena_adapter *adapter,</div><div class='add'>+				     int first_index, int count)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = first_index; i &lt; first_index + count; i++) {</div><div class='ctx'> 		rc = ena_create_io_tx_queue(adapter, i);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto create_err;</div><div class='hunk'>@@ -1675,7 +1948,7 @@ static int ena_create_all_io_tx_queues(struct ena_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> create_err:</div><div class='del'>-	while (i--)</div><div class='add'>+	while (i-- &gt; first_index)</div><div class='ctx'> 		ena_com_destroy_io_queue(ena_dev, ENA_IO_TXQ_IDX(i));</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -1702,8 +1975,8 @@ static int ena_create_io_rx_queue(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 	ctx.direction = ENA_COM_IO_QUEUE_DIRECTION_RX;</div><div class='ctx'> 	ctx.mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='ctx'> 	ctx.msix_vector = msix_vector;</div><div class='del'>-	ctx.queue_size = adapter-&gt;rx_ring_size;</div><div class='del'>-	ctx.numa_node = cpu_to_node(rx_ring-&gt;cpu);</div><div class='add'>+	ctx.queue_size = rx_ring-&gt;ring_size;</div><div class='add'>+	ctx.numa_node = rx_ring-&gt;numa_node;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_create_io_queue(ena_dev, &amp;ctx);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -1720,13 +1993,15 @@ static int ena_create_io_rx_queue(struct ena_adapter *adapter, int qid)</div><div class='ctx'> 		netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='ctx'> 			  "Failed to get RX queue handlers. RX queue num %d rc: %d\n",</div><div class='ctx'> 			  qid, rc);</div><div class='del'>-		ena_com_destroy_io_queue(ena_dev, ena_qid);</div><div class='del'>-		return rc;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ena_com_update_numa_node(rx_ring-&gt;ena_com_io_cq, ctx.numa_node);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='add'>+err:</div><div class='add'>+	ena_com_destroy_io_queue(ena_dev, ena_qid);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ena_create_all_io_rx_queues(struct ena_adapter *adapter)</div><div class='hunk'>@@ -1734,27 +2009,151 @@ static int ena_create_all_io_rx_queues(struct ena_adapter *adapter)</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='ctx'> 		rc = ena_create_io_rx_queue(adapter, i);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto create_err;</div><div class='add'>+		INIT_WORK(&amp;adapter-&gt;ena_napi[i].dim.work, ena_dim_work);</div><div class='add'>+</div><div class='add'>+		ena_xdp_register_rxq_info(&amp;adapter-&gt;rx_ring[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> create_err:</div><div class='del'>-	while (i--)</div><div class='add'>+	while (i--) {</div><div class='add'>+		ena_xdp_unregister_rxq_info(&amp;adapter-&gt;rx_ring[i]);</div><div class='add'>+		cancel_work_sync(&amp;adapter-&gt;ena_napi[i].dim.work);</div><div class='ctx'> 		ena_com_destroy_io_queue(ena_dev, ENA_IO_RXQ_IDX(i));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_up(struct ena_adapter *adapter)</div><div class='add'>+static void set_io_rings_size(struct ena_adapter *adapter,</div><div class='add'>+			      int new_tx_size,</div><div class='add'>+			      int new_rx_size)</div><div class='ctx'> {</div><div class='del'>-	int rc, i;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='add'>+		adapter-&gt;tx_ring[i].ring_size = new_tx_size;</div><div class='add'>+		adapter-&gt;rx_ring[i].ring_size = new_rx_size;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function allows queue allocation to backoff when the system is</div><div class='add'>+ * low on memory. If there is not enough memory to allocate io queues</div><div class='add'>+ * the driver will try to allocate smaller queues.</div><div class='add'>+ *</div><div class='add'>+ * The backoff algorithm is as follows:</div><div class='add'>+ *  1. Try to allocate TX and RX and if successful.</div><div class='add'>+ *  1.1. return success</div><div class='add'>+ *</div><div class='add'>+ *  2. Divide by 2 the size of the larger of RX and TX queues (or both if their size is the same).</div><div class='add'>+ *</div><div class='add'>+ *  3. If TX or RX is smaller than 256</div><div class='add'>+ *  3.1. return failure.</div><div class='add'>+ *  4. else</div><div class='add'>+ *  4.1. go back to 1.</div><div class='add'>+ */</div><div class='add'>+static int create_queues_with_size_backoff(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int rc, cur_rx_ring_size, cur_tx_ring_size;</div><div class='add'>+	int new_rx_ring_size, new_tx_ring_size;</div><div class='add'>+</div><div class='add'>+	/* current queue sizes might be set to smaller than the requested</div><div class='add'>+	 * ones due to past queue allocation failures.</div><div class='add'>+	 */</div><div class='add'>+	set_io_rings_size(adapter, adapter-&gt;requested_tx_ring_size,</div><div class='add'>+			  adapter-&gt;requested_rx_ring_size);</div><div class='ctx'> </div><div class='del'>-	netdev_dbg(adapter-&gt;netdev, "%s\n", __func__);</div><div class='add'>+	while (1) {</div><div class='add'>+		if (ena_xdp_present(adapter)) {</div><div class='add'>+			rc = ena_setup_and_create_all_xdp_queues(adapter);</div><div class='add'>+</div><div class='add'>+			if (rc)</div><div class='add'>+				goto err_setup_tx;</div><div class='add'>+		}</div><div class='add'>+		rc = ena_setup_tx_resources_in_range(adapter,</div><div class='add'>+						     0,</div><div class='add'>+						     adapter-&gt;num_io_queues);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_setup_tx;</div><div class='add'>+</div><div class='add'>+		rc = ena_create_io_tx_queues_in_range(adapter,</div><div class='add'>+						      0,</div><div class='add'>+						      adapter-&gt;num_io_queues);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_create_tx_queues;</div><div class='add'>+</div><div class='add'>+		rc = ena_setup_all_rx_resources(adapter);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_setup_rx;</div><div class='add'>+</div><div class='add'>+		rc = ena_create_all_io_rx_queues(adapter);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_create_rx_queues;</div><div class='ctx'> </div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+err_create_rx_queues:</div><div class='add'>+		ena_free_all_io_rx_resources(adapter);</div><div class='add'>+err_setup_rx:</div><div class='add'>+		ena_destroy_all_tx_queues(adapter);</div><div class='add'>+err_create_tx_queues:</div><div class='add'>+		ena_free_all_io_tx_resources(adapter);</div><div class='add'>+err_setup_tx:</div><div class='add'>+		if (rc != -ENOMEM) {</div><div class='add'>+			netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='add'>+				  "Queue creation failed with error code %d\n",</div><div class='add'>+				  rc);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cur_tx_ring_size = adapter-&gt;tx_ring[0].ring_size;</div><div class='add'>+		cur_rx_ring_size = adapter-&gt;rx_ring[0].ring_size;</div><div class='add'>+</div><div class='add'>+		netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='add'>+			  "Not enough memory to create queues with sizes TX=%d, RX=%d\n",</div><div class='add'>+			  cur_tx_ring_size, cur_rx_ring_size);</div><div class='add'>+</div><div class='add'>+		new_tx_ring_size = cur_tx_ring_size;</div><div class='add'>+		new_rx_ring_size = cur_rx_ring_size;</div><div class='add'>+</div><div class='add'>+		/* Decrease the size of the larger queue, or</div><div class='add'>+		 * decrease both if they are the same size.</div><div class='add'>+		 */</div><div class='add'>+		if (cur_rx_ring_size &lt;= cur_tx_ring_size)</div><div class='add'>+			new_tx_ring_size = cur_tx_ring_size / 2;</div><div class='add'>+		if (cur_rx_ring_size &gt;= cur_tx_ring_size)</div><div class='add'>+			new_rx_ring_size = cur_rx_ring_size / 2;</div><div class='add'>+</div><div class='add'>+		if (new_tx_ring_size &lt; ENA_MIN_RING_SIZE ||</div><div class='add'>+		    new_rx_ring_size &lt; ENA_MIN_RING_SIZE) {</div><div class='add'>+			netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='add'>+				  "Queue creation failed with the smallest possible queue size of %d for both queues. Not retrying with smaller queues\n",</div><div class='add'>+				  ENA_MIN_RING_SIZE);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netif_err(adapter, ifup, adapter-&gt;netdev,</div><div class='add'>+			  "Retrying queue creation with sizes TX=%d, RX=%d\n",</div><div class='add'>+			  new_tx_ring_size,</div><div class='add'>+			  new_rx_ring_size);</div><div class='add'>+</div><div class='add'>+		set_io_rings_size(adapter, new_tx_ring_size,</div><div class='add'>+				  new_rx_ring_size);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_up(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int io_queue_count, rc, i;</div><div class='add'>+</div><div class='add'>+	netif_dbg(adapter, ifup, adapter-&gt;netdev, "%s\n", __func__);</div><div class='add'>+</div><div class='add'>+	io_queue_count = adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues;</div><div class='ctx'> 	ena_setup_io_intr(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* napi poll functions should be initialized before running</div><div class='hunk'>@@ -1762,31 +2161,21 @@ static int ena_up(struct ena_adapter *adapter)</div><div class='ctx'> 	 * interrupt, causing the ISR to fire immediately while the poll</div><div class='ctx'> 	 * function wasn't set yet, causing a null dereference</div><div class='ctx'> 	 */</div><div class='del'>-	ena_init_napi(adapter);</div><div class='add'>+	ena_init_napi_in_range(adapter, 0, io_queue_count);</div><div class='add'>+</div><div class='add'>+	/* Enabling DIM needs to happen before enabling IRQs since DIM</div><div class='add'>+	 * is run from napi routine</div><div class='add'>+	 */</div><div class='add'>+	if (ena_com_interrupt_moderation_supported(adapter-&gt;ena_dev))</div><div class='add'>+		ena_com_enable_adaptive_moderation(adapter-&gt;ena_dev);</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_request_io_irq(adapter);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_req_irq;</div><div class='ctx'> </div><div class='del'>-	/* allocate transmit descriptors */</div><div class='del'>-	rc = ena_setup_all_tx_resources(adapter);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_setup_tx;</div><div class='del'>-</div><div class='del'>-	/* allocate receive descriptors */</div><div class='del'>-	rc = ena_setup_all_rx_resources(adapter);</div><div class='add'>+	rc = create_queues_with_size_backoff(adapter);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto err_setup_rx;</div><div class='del'>-</div><div class='del'>-	/* Create TX queues */</div><div class='del'>-	rc = ena_create_all_io_tx_queues(adapter);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_create_tx_queues;</div><div class='del'>-</div><div class='del'>-	/* Create RX queues */</div><div class='del'>-	rc = ena_create_all_io_rx_queues(adapter);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto err_create_rx_queues;</div><div class='add'>+		goto err_create_queues_with_backoff;</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_up_complete(adapter);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -1795,65 +2184,61 @@ static int ena_up(struct ena_adapter *adapter)</div><div class='ctx'> 	if (test_bit(ENA_FLAG_LINK_UP, &amp;adapter-&gt;flags))</div><div class='ctx'> 		netif_carrier_on(adapter-&gt;netdev);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-	adapter-&gt;dev_stats.interface_up++;</div><div class='del'>-	u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;adapter-&gt;dev_stats.interface_up, 1,</div><div class='add'>+			  &amp;adapter-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable completion queues interrupt */</div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++)</div><div class='ctx'> 		ena_unmask_interrupt(&amp;adapter-&gt;tx_ring[i],</div><div class='ctx'> 				     &amp;adapter-&gt;rx_ring[i]);</div><div class='ctx'> </div><div class='ctx'> 	/* schedule napi in case we had pending packets</div><div class='ctx'> 	 * from the last time we disable napi</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+	for (i = 0; i &lt; io_queue_count; i++)</div><div class='ctx'> 		napi_schedule(&amp;adapter-&gt;ena_napi[i].napi);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> </div><div class='ctx'> err_up:</div><div class='del'>-	ena_destroy_all_rx_queues(adapter);</div><div class='del'>-err_create_rx_queues:</div><div class='ctx'> 	ena_destroy_all_tx_queues(adapter);</div><div class='del'>-err_create_tx_queues:</div><div class='del'>-	ena_free_all_io_rx_resources(adapter);</div><div class='del'>-err_setup_rx:</div><div class='ctx'> 	ena_free_all_io_tx_resources(adapter);</div><div class='del'>-err_setup_tx:</div><div class='add'>+	ena_destroy_all_rx_queues(adapter);</div><div class='add'>+	ena_free_all_io_rx_resources(adapter);</div><div class='add'>+err_create_queues_with_backoff:</div><div class='ctx'> 	ena_free_io_irq(adapter);</div><div class='ctx'> err_req_irq:</div><div class='del'>-	ena_del_napi(adapter);</div><div class='add'>+	ena_del_napi_in_range(adapter, 0, io_queue_count);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_down(struct ena_adapter *adapter)</div><div class='add'>+void ena_down(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	netif_info(adapter, ifdown, adapter-&gt;netdev, "%s\n", __func__);</div><div class='add'>+	int io_queue_count = adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues;</div><div class='add'>+</div><div class='add'>+	netif_dbg(adapter, ifdown, adapter-&gt;netdev, "%s\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-	adapter-&gt;dev_stats.interface_down++;</div><div class='del'>-	u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;adapter-&gt;dev_stats.interface_down, 1,</div><div class='add'>+			  &amp;adapter-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(adapter-&gt;netdev);</div><div class='ctx'> 	netif_tx_disable(adapter-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* After this point the napi handler won't enable the tx queue */</div><div class='del'>-	ena_napi_disable_all(adapter);</div><div class='del'>-</div><div class='del'>-	/* After destroy the queue there won't be any new interrupts */</div><div class='add'>+	ena_napi_disable_in_range(adapter, 0, io_queue_count);</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags)) {</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='ctx'> 		rc = ena_com_dev_reset(adapter-&gt;ena_dev, adapter-&gt;reset_reason);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			dev_err(&amp;adapter-&gt;pdev-&gt;dev, "Device reset failed\n");</div><div class='add'>+			netif_err(adapter, ifdown, adapter-&gt;netdev,</div><div class='add'>+				  "Device reset failed\n");</div><div class='ctx'> 		/* stop submitting admin commands on a device that was reset */</div><div class='ctx'> 		ena_com_set_admin_running_state(adapter-&gt;ena_dev, false);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1862,7 +2247,7 @@ static void ena_down(struct ena_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	ena_disable_io_intr_sync(adapter);</div><div class='ctx'> 	ena_free_io_irq(adapter);</div><div class='del'>-	ena_del_napi(adapter);</div><div class='add'>+	ena_del_napi_in_range(adapter, 0, io_queue_count);</div><div class='ctx'> </div><div class='ctx'> 	ena_free_all_tx_bufs(adapter);</div><div class='ctx'> 	ena_free_all_rx_bufs(adapter);</div><div class='hunk'>@@ -1887,13 +2272,13 @@ static int ena_open(struct net_device *netdev)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Notify the stack of the actual queue counts. */</div><div class='del'>-	rc = netif_set_real_num_tx_queues(netdev, adapter-&gt;num_queues);</div><div class='add'>+	rc = netif_set_real_num_tx_queues(netdev, adapter-&gt;num_io_queues);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netif_err(adapter, ifup, netdev, "Can't set num tx queues\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = netif_set_real_num_rx_queues(netdev, adapter-&gt;num_queues);</div><div class='add'>+	rc = netif_set_real_num_rx_queues(netdev, adapter-&gt;num_io_queues);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netif_err(adapter, ifup, netdev, "Can't set num rx queues\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -1942,7 +2327,97 @@ static int ena_close(struct net_device *netdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_tx_csum(struct ena_com_tx_ctx *ena_tx_ctx, struct sk_buff *skb)</div><div class='add'>+int ena_update_queue_params(struct ena_adapter *adapter,</div><div class='add'>+			    u32 new_tx_size,</div><div class='add'>+			    u32 new_rx_size,</div><div class='add'>+			    u32 new_llq_header_len)</div><div class='add'>+{</div><div class='add'>+	bool dev_was_up, large_llq_changed = false;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	dev_was_up = test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='add'>+	ena_close(adapter-&gt;netdev);</div><div class='add'>+	adapter-&gt;requested_tx_ring_size = new_tx_size;</div><div class='add'>+	adapter-&gt;requested_rx_ring_size = new_rx_size;</div><div class='add'>+	ena_init_io_rings(adapter,</div><div class='add'>+			  0,</div><div class='add'>+			  adapter-&gt;xdp_num_queues +</div><div class='add'>+			  adapter-&gt;num_io_queues);</div><div class='add'>+</div><div class='add'>+	large_llq_changed = adapter-&gt;ena_dev-&gt;tx_mem_queue_type ==</div><div class='add'>+			    ENA_ADMIN_PLACEMENT_POLICY_DEV;</div><div class='add'>+	large_llq_changed &amp;=</div><div class='add'>+		new_llq_header_len != adapter-&gt;ena_dev-&gt;tx_max_header_size;</div><div class='add'>+</div><div class='add'>+	/* a check that the configuration is valid is done by caller */</div><div class='add'>+	if (large_llq_changed) {</div><div class='add'>+		adapter-&gt;large_llq_header_enabled = !adapter-&gt;large_llq_header_enabled;</div><div class='add'>+</div><div class='add'>+		ena_destroy_device(adapter, false);</div><div class='add'>+		rc = ena_restore_device(adapter);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dev_was_up &amp;&amp; !rc ? ena_up(adapter) : rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_set_rx_copybreak(struct ena_adapter *adapter, u32 rx_copybreak)</div><div class='add'>+{</div><div class='add'>+	struct ena_ring *rx_ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (rx_copybreak &gt; min_t(u16, adapter-&gt;netdev-&gt;mtu, ENA_PAGE_SIZE))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;rx_copybreak = rx_copybreak;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='add'>+		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='add'>+		rx_ring-&gt;rx_copybreak = rx_copybreak;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_update_queue_count(struct ena_adapter *adapter, u32 new_channel_count)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+	int prev_channel_count;</div><div class='add'>+	bool dev_was_up;</div><div class='add'>+</div><div class='add'>+	dev_was_up = test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='add'>+	ena_close(adapter-&gt;netdev);</div><div class='add'>+	prev_channel_count = adapter-&gt;num_io_queues;</div><div class='add'>+	adapter-&gt;num_io_queues = new_channel_count;</div><div class='add'>+	if (ena_xdp_present(adapter) &amp;&amp;</div><div class='add'>+	    ena_xdp_allowed(adapter) == ENA_XDP_ALLOWED) {</div><div class='add'>+		adapter-&gt;xdp_first_ring = new_channel_count;</div><div class='add'>+		adapter-&gt;xdp_num_queues = new_channel_count;</div><div class='add'>+		if (prev_channel_count &gt; new_channel_count)</div><div class='add'>+			ena_xdp_exchange_program_rx_in_range(adapter,</div><div class='add'>+							     NULL,</div><div class='add'>+							     new_channel_count,</div><div class='add'>+							     prev_channel_count);</div><div class='add'>+		else</div><div class='add'>+			ena_xdp_exchange_program_rx_in_range(adapter,</div><div class='add'>+							     adapter-&gt;xdp_bpf_prog,</div><div class='add'>+							     prev_channel_count,</div><div class='add'>+							     new_channel_count);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We need to destroy the rss table so that the indirection</div><div class='add'>+	 * table will be reinitialized by ena_up()</div><div class='add'>+	 */</div><div class='add'>+	ena_com_rss_destroy(ena_dev);</div><div class='add'>+	ena_init_io_rings(adapter,</div><div class='add'>+			  0,</div><div class='add'>+			  adapter-&gt;xdp_num_queues +</div><div class='add'>+			  adapter-&gt;num_io_queues);</div><div class='add'>+	return dev_was_up ? ena_open(adapter-&gt;netdev) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_tx_csum(struct ena_com_tx_ctx *ena_tx_ctx,</div><div class='add'>+			struct sk_buff *skb,</div><div class='add'>+			bool disable_meta_caching)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 	struct ena_com_tx_meta *ena_meta = &amp;ena_tx_ctx-&gt;ena_meta;</div><div class='hunk'>@@ -1986,7 +2461,9 @@ static void ena_tx_csum(struct ena_com_tx_ctx *ena_tx_ctx, struct sk_buff *skb)</div><div class='ctx'> 		ena_meta-&gt;l3_hdr_len = skb_network_header_len(skb);</div><div class='ctx'> 		ena_meta-&gt;l3_hdr_offset = skb_network_offset(skb);</div><div class='ctx'> 		ena_tx_ctx-&gt;meta_valid = 1;</div><div class='del'>-</div><div class='add'>+	} else if (disable_meta_caching) {</div><div class='add'>+		memset(ena_meta, 0, sizeof(*ena_meta));</div><div class='add'>+		ena_tx_ctx-&gt;meta_valid = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ena_tx_ctx-&gt;meta_valid = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2007,15 +2484,12 @@ static int ena_check_and_linearize_skb(struct ena_ring *tx_ring,</div><div class='ctx'> 	    (header_len &lt; tx_ring-&gt;tx_max_header_size))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	tx_ring-&gt;tx_stats.linearize++;</div><div class='del'>-	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;tx_ring-&gt;tx_stats.linearize, 1, &amp;tx_ring-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	rc = skb_linearize(skb);</div><div class='ctx'> 	if (unlikely(rc)) {</div><div class='del'>-		u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-		tx_ring-&gt;tx_stats.linearize_failed++;</div><div class='del'>-		u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+		ena_increase_stat(&amp;tx_ring-&gt;tx_stats.linearize_failed, 1,</div><div class='add'>+				  &amp;tx_ring-&gt;syncp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -2055,9 +2529,8 @@ static int ena_tx_map_skb(struct ena_ring *tx_ring,</div><div class='ctx'> 					       tx_ring-&gt;push_buf_intermediate_buf);</div><div class='ctx'> 		*header_len = push_len;</div><div class='ctx'> 		if (unlikely(skb-&gt;data != *push_hdr)) {</div><div class='del'>-			u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-			tx_ring-&gt;tx_stats.llq_buffer_copy++;</div><div class='del'>-			u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+			ena_increase_stat(&amp;tx_ring-&gt;tx_stats.llq_buffer_copy, 1,</div><div class='add'>+					  &amp;tx_ring-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 			delta = push_len - skb_head_len;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2114,15 +2587,14 @@ static int ena_tx_map_skb(struct ena_ring *tx_ring,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> error_report_dma_error:</div><div class='del'>-	u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	tx_ring-&gt;tx_stats.dma_mapping_err++;</div><div class='del'>-	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	netdev_warn(adapter-&gt;netdev, "failed to map skb\n");</div><div class='add'>+	ena_increase_stat(&amp;tx_ring-&gt;tx_stats.dma_mapping_err, 1,</div><div class='add'>+			  &amp;tx_ring-&gt;syncp);</div><div class='add'>+	netif_warn(adapter, tx_queued, adapter-&gt;netdev, "Failed to map skb\n");</div><div class='ctx'> </div><div class='ctx'> 	tx_info-&gt;skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 	tx_info-&gt;num_of_bufs += i;</div><div class='del'>-	ena_unmap_tx_skb(tx_ring, tx_info);</div><div class='add'>+	ena_unmap_tx_buff(tx_ring, tx_info);</div><div class='ctx'> </div><div class='ctx'> 	return -EINVAL;</div><div class='ctx'> }</div><div class='hunk'>@@ -2137,7 +2609,7 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	void *push_hdr;</div><div class='ctx'> 	u16 next_to_use, req_id, header_len;</div><div class='del'>-	int qid, rc, nb_hw_desc;</div><div class='add'>+	int qid, rc;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(adapter, tx_queued, dev, "%s skb %p\n", __func__, skb);</div><div class='ctx'> 	/*  Determine which tx ring we will be placed on */</div><div class='hunk'>@@ -2149,10 +2621,8 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	if (unlikely(rc))</div><div class='ctx'> 		goto error_drop_packet;</div><div class='ctx'> </div><div class='del'>-	skb_tx_timestamp(skb);</div><div class='del'>-</div><div class='ctx'> 	next_to_use = tx_ring-&gt;next_to_use;</div><div class='del'>-	req_id = tx_ring-&gt;free_tx_ids[next_to_use];</div><div class='add'>+	req_id = tx_ring-&gt;free_ids[next_to_use];</div><div class='ctx'> 	tx_info = &amp;tx_ring-&gt;tx_buffer_info[req_id];</div><div class='ctx'> 	tx_info-&gt;num_of_bufs = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2170,45 +2640,19 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	ena_tx_ctx.header_len = header_len;</div><div class='ctx'> </div><div class='ctx'> 	/* set flags and meta data */</div><div class='del'>-	ena_tx_csum(&amp;ena_tx_ctx, skb);</div><div class='del'>-</div><div class='del'>-	/* prepare the packet's descriptors to dma engine */</div><div class='del'>-	rc = ena_com_prepare_tx(tx_ring-&gt;ena_com_io_sq, &amp;ena_tx_ctx,</div><div class='del'>-				&amp;nb_hw_desc);</div><div class='del'>-</div><div class='del'>-	/* ena_com_prepare_tx() can't fail due to overflow of tx queue,</div><div class='del'>-	 * since the number of free descriptors in the queue is checked</div><div class='del'>-	 * after sending the previous packet. In case there isn't enough</div><div class='del'>-	 * space in the queue for the next packet, it is stopped</div><div class='del'>-	 * until there is again enough available space in the queue.</div><div class='del'>-	 * All other failure reasons of ena_com_prepare_tx() are fatal</div><div class='del'>-	 * and therefore require a device reset.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(rc)) {</div><div class='del'>-		netif_err(adapter, tx_queued, dev,</div><div class='del'>-			  "failed to prepare tx bufs\n");</div><div class='del'>-		u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-		tx_ring-&gt;tx_stats.prepare_ctx_err++;</div><div class='del'>-		u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='del'>-		adapter-&gt;reset_reason = ENA_REGS_RESET_DRIVER_INVALID_STATE;</div><div class='del'>-		set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+	ena_tx_csum(&amp;ena_tx_ctx, skb, tx_ring-&gt;disable_meta_caching);</div><div class='add'>+</div><div class='add'>+	rc = ena_xmit_common(adapter,</div><div class='add'>+			     tx_ring,</div><div class='add'>+			     tx_info,</div><div class='add'>+			     &amp;ena_tx_ctx,</div><div class='add'>+			     next_to_use,</div><div class='add'>+			     skb-&gt;len);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		goto error_unmap_dma;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	tx_ring-&gt;tx_stats.cnt++;</div><div class='del'>-	tx_ring-&gt;tx_stats.bytes += skb-&gt;len;</div><div class='del'>-	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='del'>-</div><div class='del'>-	tx_info-&gt;tx_descs = nb_hw_desc;</div><div class='del'>-	tx_info-&gt;last_jiffies = jiffies;</div><div class='del'>-	tx_info-&gt;print_once = 0;</div><div class='del'>-</div><div class='del'>-	tx_ring-&gt;next_to_use = ENA_TX_RING_IDX_NEXT(next_to_use,</div><div class='del'>-		tx_ring-&gt;ring_size);</div><div class='del'>-</div><div class='ctx'> 	/* stop the queue when no more space available, the packet can have up</div><div class='ctx'> 	 * to sgl_size + 2. one for the meta descriptor and one for header</div><div class='ctx'> 	 * (if the header is larger than tx_max_header_size).</div><div class='hunk'>@@ -2219,9 +2663,8 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			  __func__, qid);</div><div class='ctx'> </div><div class='ctx'> 		netif_tx_stop_queue(txq);</div><div class='del'>-		u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-		tx_ring-&gt;tx_stats.queue_stop++;</div><div class='del'>-		u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+		ena_increase_stat(&amp;tx_ring-&gt;tx_stats.queue_stop, 1,</div><div class='add'>+				  &amp;tx_ring-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 		/* There is a rare condition where this function decide to</div><div class='ctx'> 		 * stop the queue but meanwhile clean_tx_irq updates</div><div class='hunk'>@@ -2236,26 +2679,23 @@ static netdev_tx_t ena_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		if (ena_com_sq_have_enough_space(tx_ring-&gt;ena_com_io_sq,</div><div class='ctx'> 						 ENA_TX_WAKEUP_THRESH)) {</div><div class='ctx'> 			netif_tx_wake_queue(txq);</div><div class='del'>-			u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-			tx_ring-&gt;tx_stats.queue_wakeup++;</div><div class='del'>-			u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+			ena_increase_stat(&amp;tx_ring-&gt;tx_stats.queue_wakeup, 1,</div><div class='add'>+					  &amp;tx_ring-&gt;syncp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netif_xmit_stopped(txq) || !netdev_xmit_more()) {</div><div class='del'>-		/* trigger the dma engine. ena_com_write_sq_doorbell()</div><div class='del'>-		 * has a mb</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+	if (netif_xmit_stopped(txq) || !netdev_xmit_more())</div><div class='add'>+		/* trigger the dma engine. ena_ring_tx_doorbell()</div><div class='add'>+		 * calls a memory barrier inside it.</div><div class='ctx'> 		 */</div><div class='del'>-		ena_com_write_sq_doorbell(tx_ring-&gt;ena_com_io_sq);</div><div class='del'>-		u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-		tx_ring-&gt;tx_stats.doorbells++;</div><div class='del'>-		u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	}</div><div class='add'>+		ena_ring_tx_doorbell(tx_ring);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> error_unmap_dma:</div><div class='del'>-	ena_unmap_tx_skb(tx_ring, tx_info);</div><div class='add'>+	ena_unmap_tx_buff(tx_ring, tx_info);</div><div class='ctx'> 	tx_info-&gt;skb = NULL;</div><div class='ctx'> </div><div class='ctx'> error_drop_packet:</div><div class='hunk'>@@ -2263,58 +2703,59 @@ error_drop_packet:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u16 ena_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='del'>-			    struct net_device *sb_dev)</div><div class='del'>-{</div><div class='del'>-	u16 qid;</div><div class='del'>-	/* we suspect that this is good for in--kernel network services that</div><div class='del'>-	 * want to loop incoming skb rx to tx in normal user generated traffic,</div><div class='del'>-	 * most probably we will not get to this</div><div class='del'>-	 */</div><div class='del'>-	if (skb_rx_queue_recorded(skb))</div><div class='del'>-		qid = skb_get_rx_queue(skb);</div><div class='del'>-	else</div><div class='del'>-		qid = netdev_pick_tx(dev, skb, NULL);</div><div class='del'>-</div><div class='del'>-	return qid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ena_config_host_info(struct ena_com_dev *ena_dev,</div><div class='del'>-				 struct pci_dev *pdev)</div><div class='add'>+static void ena_config_host_info(struct ena_com_dev *ena_dev, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct ena_admin_host_info *host_info;</div><div class='add'>+	ssize_t ret;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate only the host info */</div><div class='ctx'> 	rc = ena_com_allocate_host_info(ena_dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		pr_err("Cannot allocate host info\n");</div><div class='add'>+		dev_err(dev, "Cannot allocate host info\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	host_info = ena_dev-&gt;host_attr.host_info;</div><div class='ctx'> </div><div class='del'>-	host_info-&gt;bdf = (pdev-&gt;bus-&gt;number &lt;&lt; 8) | pdev-&gt;devfn;</div><div class='add'>+	host_info-&gt;bdf = pci_dev_id(pdev);</div><div class='ctx'> 	host_info-&gt;os_type = ENA_ADMIN_OS_LINUX;</div><div class='ctx'> 	host_info-&gt;kernel_ver = LINUX_VERSION_CODE;</div><div class='del'>-	strlcpy(host_info-&gt;kernel_ver_str, utsname()-&gt;version,</div><div class='del'>-		sizeof(host_info-&gt;kernel_ver_str) - 1);</div><div class='add'>+	ret = strscpy(host_info-&gt;kernel_ver_str, utsname()-&gt;version,</div><div class='add'>+		      sizeof(host_info-&gt;kernel_ver_str));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_dbg(dev,</div><div class='add'>+			"kernel version string will be truncated, status = %zd\n", ret);</div><div class='add'>+</div><div class='ctx'> 	host_info-&gt;os_dist = 0;</div><div class='del'>-	strncpy(host_info-&gt;os_dist_str, utsname()-&gt;release,</div><div class='del'>-		sizeof(host_info-&gt;os_dist_str) - 1);</div><div class='add'>+	ret = strscpy(host_info-&gt;os_dist_str, utsname()-&gt;release,</div><div class='add'>+		      sizeof(host_info-&gt;os_dist_str));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_dbg(dev,</div><div class='add'>+			"OS distribution string will be truncated, status = %zd\n", ret);</div><div class='add'>+</div><div class='ctx'> 	host_info-&gt;driver_version =</div><div class='del'>-		(DRV_MODULE_VER_MAJOR) |</div><div class='del'>-		(DRV_MODULE_VER_MINOR &lt;&lt; ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |</div><div class='del'>-		(DRV_MODULE_VER_SUBMINOR &lt;&lt; ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT) |</div><div class='add'>+		(DRV_MODULE_GEN_MAJOR) |</div><div class='add'>+		(DRV_MODULE_GEN_MINOR &lt;&lt; ENA_ADMIN_HOST_INFO_MINOR_SHIFT) |</div><div class='add'>+		(DRV_MODULE_GEN_SUBMINOR &lt;&lt; ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT) |</div><div class='ctx'> 		("K"[0] &lt;&lt; ENA_ADMIN_HOST_INFO_MODULE_TYPE_SHIFT);</div><div class='ctx'> 	host_info-&gt;num_cpus = num_online_cpus();</div><div class='ctx'> </div><div class='add'>+	host_info-&gt;driver_supported_features =</div><div class='add'>+		ENA_ADMIN_HOST_INFO_RX_OFFSET_MASK |</div><div class='add'>+		ENA_ADMIN_HOST_INFO_INTERRUPT_MODERATION_MASK |</div><div class='add'>+		ENA_ADMIN_HOST_INFO_RX_BUF_MIRRORING_MASK |</div><div class='add'>+		ENA_ADMIN_HOST_INFO_RSS_CONFIGURABLE_FUNCTION_KEY_MASK |</div><div class='add'>+		ENA_ADMIN_HOST_INFO_RX_PAGE_REUSE_MASK |</div><div class='add'>+		ENA_ADMIN_HOST_INFO_PHC_MASK;</div><div class='add'>+</div><div class='ctx'> 	rc = ena_com_set_host_attributes(ena_dev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		if (rc == -EOPNOTSUPP)</div><div class='del'>-			pr_warn("Cannot set host attributes\n");</div><div class='add'>+			dev_warn(dev, "Cannot set host attributes\n");</div><div class='ctx'> 		else</div><div class='del'>-			pr_err("Cannot set host attributes\n");</div><div class='add'>+			dev_err(dev, "Cannot set host attributes\n");</div><div class='ctx'> </div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2342,15 +2783,15 @@ static void ena_config_debug_area(struct ena_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_allocate_debug_area(adapter-&gt;ena_dev, debug_area_size);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		pr_err("Cannot allocate debug area\n");</div><div class='add'>+		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+			  "Cannot allocate debug area\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_set_host_attributes(adapter-&gt;ena_dev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		if (rc == -EOPNOTSUPP)</div><div class='del'>-			netif_warn(adapter, drv, adapter-&gt;netdev,</div><div class='del'>-				   "Cannot set host attributes\n");</div><div class='add'>+			netif_warn(adapter, drv, adapter-&gt;netdev, "Cannot set host attributes\n");</div><div class='ctx'> 		else</div><div class='ctx'> 			netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='ctx'> 				  "Cannot set host attributes\n");</div><div class='hunk'>@@ -2367,45 +2808,55 @@ static void ena_get_stats64(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct ena_ring *rx_ring, *tx_ring;</div><div class='add'>+	u64 total_xdp_rx_drops = 0;</div><div class='ctx'> 	unsigned int start;</div><div class='ctx'> 	u64 rx_drops;</div><div class='add'>+	u64 tx_drops;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='del'>-		u64 bytes, packets;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues + adapter-&gt;xdp_num_queues; i++) {</div><div class='add'>+		u64 bytes, packets, xdp_rx_drops;</div><div class='ctx'> </div><div class='ctx'> 		tx_ring = &amp;adapter-&gt;tx_ring[i];</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;tx_ring-&gt;syncp);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;tx_ring-&gt;syncp);</div><div class='ctx'> 			packets = tx_ring-&gt;tx_stats.cnt;</div><div class='ctx'> 			bytes = tx_ring-&gt;tx_stats.bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;tx_ring-&gt;syncp, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;tx_ring-&gt;syncp, start));</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;tx_packets += packets;</div><div class='ctx'> 		stats-&gt;tx_bytes += bytes;</div><div class='ctx'> </div><div class='add'>+		/* In XDP there isn't an RX queue counterpart */</div><div class='add'>+		if (ENA_IS_XDP_INDEX(adapter, i))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='ctx'> 		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;rx_ring-&gt;syncp);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;rx_ring-&gt;syncp);</div><div class='ctx'> 			packets = rx_ring-&gt;rx_stats.cnt;</div><div class='ctx'> 			bytes = rx_ring-&gt;rx_stats.bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;rx_ring-&gt;syncp, start));</div><div class='add'>+			xdp_rx_drops = rx_ring-&gt;rx_stats.xdp_drop;</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;rx_ring-&gt;syncp, start));</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;rx_packets += packets;</div><div class='ctx'> 		stats-&gt;rx_bytes += bytes;</div><div class='add'>+		total_xdp_rx_drops += xdp_rx_drops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;adapter-&gt;syncp);</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;adapter-&gt;syncp);</div><div class='ctx'> 		rx_drops = adapter-&gt;dev_stats.rx_drops;</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;adapter-&gt;syncp, start));</div><div class='add'>+		tx_drops = adapter-&gt;dev_stats.tx_drops;</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;adapter-&gt;syncp, start));</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_dropped = rx_drops;</div><div class='add'>+	stats-&gt;rx_dropped = rx_drops + total_xdp_rx_drops;</div><div class='add'>+	stats-&gt;tx_dropped = tx_drops;</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;multicast = 0;</div><div class='ctx'> 	stats-&gt;collisions = 0;</div><div class='hunk'>@@ -2425,14 +2876,120 @@ static const struct net_device_ops ena_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ena_open,</div><div class='ctx'> 	.ndo_stop		= ena_close,</div><div class='ctx'> 	.ndo_start_xmit		= ena_start_xmit,</div><div class='del'>-	.ndo_select_queue	= ena_select_queue,</div><div class='ctx'> 	.ndo_get_stats64	= ena_get_stats64,</div><div class='ctx'> 	.ndo_tx_timeout		= ena_tx_timeout,</div><div class='ctx'> 	.ndo_change_mtu		= ena_change_mtu,</div><div class='del'>-	.ndo_set_mac_address	= NULL,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='add'>+	.ndo_bpf		= ena_xdp,</div><div class='add'>+	.ndo_xdp_xmit		= ena_xdp_xmit,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static int ena_calc_io_queue_size(struct ena_adapter *adapter,</div><div class='add'>+				  struct ena_com_dev_get_features_ctx *get_feat_ctx)</div><div class='add'>+{</div><div class='add'>+	struct ena_admin_feature_llq_desc *llq = &amp;get_feat_ctx-&gt;llq;</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+	u32 tx_queue_size = ENA_DEFAULT_RING_SIZE;</div><div class='add'>+	u32 rx_queue_size = ENA_DEFAULT_RING_SIZE;</div><div class='add'>+	u32 max_tx_queue_size;</div><div class='add'>+	u32 max_rx_queue_size;</div><div class='add'>+</div><div class='add'>+	/* If this function is called after driver load, the ring sizes have already</div><div class='add'>+	 * been configured. Take it into account when recalculating ring size.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;tx_ring-&gt;ring_size)</div><div class='add'>+		tx_queue_size = adapter-&gt;tx_ring-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;rx_ring-&gt;ring_size)</div><div class='add'>+		rx_queue_size = adapter-&gt;rx_ring-&gt;ring_size;</div><div class='add'>+</div><div class='add'>+	if (ena_dev-&gt;supported_features &amp; BIT(ENA_ADMIN_MAX_QUEUES_EXT)) {</div><div class='add'>+		struct ena_admin_queue_ext_feature_fields *max_queue_ext =</div><div class='add'>+			&amp;get_feat_ctx-&gt;max_queue_ext.max_queue_ext;</div><div class='add'>+		max_rx_queue_size = min_t(u32, max_queue_ext-&gt;max_rx_cq_depth,</div><div class='add'>+					  max_queue_ext-&gt;max_rx_sq_depth);</div><div class='add'>+		max_tx_queue_size = max_queue_ext-&gt;max_tx_cq_depth;</div><div class='add'>+</div><div class='add'>+		if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='add'>+			max_tx_queue_size = min_t(u32, max_tx_queue_size,</div><div class='add'>+						  llq-&gt;max_llq_depth);</div><div class='add'>+		else</div><div class='add'>+			max_tx_queue_size = min_t(u32, max_tx_queue_size,</div><div class='add'>+						  max_queue_ext-&gt;max_tx_sq_depth);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;max_tx_sgl_size = min_t(u16, ENA_PKT_MAX_BUFS,</div><div class='add'>+						 max_queue_ext-&gt;max_per_packet_tx_descs);</div><div class='add'>+		adapter-&gt;max_rx_sgl_size = min_t(u16, ENA_PKT_MAX_BUFS,</div><div class='add'>+						 max_queue_ext-&gt;max_per_packet_rx_descs);</div><div class='add'>+	} else {</div><div class='add'>+		struct ena_admin_queue_feature_desc *max_queues =</div><div class='add'>+			&amp;get_feat_ctx-&gt;max_queues;</div><div class='add'>+		max_rx_queue_size = min_t(u32, max_queues-&gt;max_cq_depth,</div><div class='add'>+					  max_queues-&gt;max_sq_depth);</div><div class='add'>+		max_tx_queue_size = max_queues-&gt;max_cq_depth;</div><div class='add'>+</div><div class='add'>+		if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='add'>+			max_tx_queue_size = min_t(u32, max_tx_queue_size,</div><div class='add'>+						  llq-&gt;max_llq_depth);</div><div class='add'>+		else</div><div class='add'>+			max_tx_queue_size = min_t(u32, max_tx_queue_size,</div><div class='add'>+						  max_queues-&gt;max_sq_depth);</div><div class='add'>+</div><div class='add'>+		adapter-&gt;max_tx_sgl_size = min_t(u16, ENA_PKT_MAX_BUFS,</div><div class='add'>+						 max_queues-&gt;max_packet_tx_descs);</div><div class='add'>+		adapter-&gt;max_rx_sgl_size = min_t(u16, ENA_PKT_MAX_BUFS,</div><div class='add'>+						 max_queues-&gt;max_packet_rx_descs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_tx_queue_size = rounddown_pow_of_two(max_tx_queue_size);</div><div class='add'>+	max_rx_queue_size = rounddown_pow_of_two(max_rx_queue_size);</div><div class='add'>+</div><div class='add'>+	if (max_tx_queue_size &lt; ENA_MIN_RING_SIZE) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "Device max TX queue size: %d &lt; minimum: %d\n",</div><div class='add'>+			   max_tx_queue_size, ENA_MIN_RING_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (max_rx_queue_size &lt; ENA_MIN_RING_SIZE) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "Device max RX queue size: %d &lt; minimum: %d\n",</div><div class='add'>+			   max_rx_queue_size, ENA_MIN_RING_SIZE);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* When forcing large headers, we multiply the entry size by 2, and therefore divide</div><div class='add'>+	 * the queue size by 2, leaving the amount of memory used by the queues unchanged.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;large_llq_header_enabled) {</div><div class='add'>+		if ((llq-&gt;entry_size_ctrl_supported &amp; ENA_ADMIN_LIST_ENTRY_SIZE_256B) &amp;&amp;</div><div class='add'>+		    ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {</div><div class='add'>+			max_tx_queue_size /= 2;</div><div class='add'>+			dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				 "Forcing large headers and decreasing maximum TX queue size to %d\n",</div><div class='add'>+				 max_tx_queue_size);</div><div class='add'>+		} else {</div><div class='add'>+			dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				"Forcing large headers failed: LLQ is disabled or device does not support large headers\n");</div><div class='add'>+</div><div class='add'>+			adapter-&gt;large_llq_header_enabled = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_queue_size = clamp_val(tx_queue_size, ENA_MIN_RING_SIZE,</div><div class='add'>+				  max_tx_queue_size);</div><div class='add'>+	rx_queue_size = clamp_val(rx_queue_size, ENA_MIN_RING_SIZE,</div><div class='add'>+				  max_rx_queue_size);</div><div class='add'>+</div><div class='add'>+	tx_queue_size = rounddown_pow_of_two(tx_queue_size);</div><div class='add'>+	rx_queue_size = rounddown_pow_of_two(rx_queue_size);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;max_tx_ring_size  = max_tx_queue_size;</div><div class='add'>+	adapter-&gt;max_rx_ring_size = max_rx_queue_size;</div><div class='add'>+	adapter-&gt;requested_tx_ring_size = tx_queue_size;</div><div class='add'>+	adapter-&gt;requested_rx_ring_size = rx_queue_size;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ena_device_validate_params(struct ena_adapter *adapter,</div><div class='ctx'> 				      struct ena_com_dev_get_features_ctx *get_feat_ctx)</div><div class='ctx'> {</div><div class='hunk'>@@ -2447,13 +3004,6 @@ static int ena_device_validate_params(struct ena_adapter *adapter,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((get_feat_ctx-&gt;max_queues.max_cq_num &lt; adapter-&gt;num_queues) ||</div><div class='del'>-	    (get_feat_ctx-&gt;max_queues.max_sq_num &lt; adapter-&gt;num_queues)) {</div><div class='del'>-		netif_err(adapter, drv, netdev,</div><div class='del'>-			  "Error, device doesn't support enough queues\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (get_feat_ctx-&gt;dev_attr.max_mtu &lt; netdev-&gt;mtu) {</div><div class='ctx'> 		netif_err(adapter, drv, netdev,</div><div class='ctx'> 			  "Error, device max mtu is smaller than netdev MTU\n");</div><div class='hunk'>@@ -2463,10 +3013,90 @@ static int ena_device_validate_params(struct ena_adapter *adapter,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,</div><div class='add'>+static void set_default_llq_configurations(struct ena_adapter *adapter,</div><div class='add'>+					   struct ena_llq_configurations *llq_config,</div><div class='add'>+					   struct ena_admin_feature_llq_desc *llq)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+</div><div class='add'>+	llq_config-&gt;llq_header_location = ENA_ADMIN_INLINE_HEADER;</div><div class='add'>+	llq_config-&gt;llq_stride_ctrl = ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY;</div><div class='add'>+	llq_config-&gt;llq_num_decs_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;large_llq_header_supported =</div><div class='add'>+		!!(ena_dev-&gt;supported_features &amp; BIT(ENA_ADMIN_LLQ));</div><div class='add'>+	adapter-&gt;large_llq_header_supported &amp;=</div><div class='add'>+		!!(llq-&gt;entry_size_ctrl_supported &amp;</div><div class='add'>+			ENA_ADMIN_LIST_ENTRY_SIZE_256B);</div><div class='add'>+</div><div class='add'>+	if ((llq-&gt;entry_size_ctrl_supported &amp; ENA_ADMIN_LIST_ENTRY_SIZE_256B) &amp;&amp;</div><div class='add'>+	    adapter-&gt;large_llq_header_enabled) {</div><div class='add'>+		llq_config-&gt;llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_256B;</div><div class='add'>+		llq_config-&gt;llq_ring_entry_size_value = 256;</div><div class='add'>+	} else {</div><div class='add'>+		llq_config-&gt;llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B;</div><div class='add'>+		llq_config-&gt;llq_ring_entry_size_value = 128;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_set_queues_placement_policy(struct pci_dev *pdev,</div><div class='add'>+					   struct ena_com_dev *ena_dev,</div><div class='add'>+					   struct ena_admin_feature_llq_desc *llq,</div><div class='add'>+					   struct ena_llq_configurations *llq_default_configurations)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+	u32 llq_feature_mask;</div><div class='add'>+</div><div class='add'>+	llq_feature_mask = 1 &lt;&lt; ENA_ADMIN_LLQ;</div><div class='add'>+	if (!(ena_dev-&gt;supported_features &amp; llq_feature_mask)) {</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+			"LLQ is not supported Fallback to host mode policy.\n");</div><div class='add'>+		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ena_dev-&gt;mem_bar) {</div><div class='add'>+		netdev_err(ena_dev-&gt;net_device,</div><div class='add'>+			   "LLQ is advertised as supported but device doesn't expose mem bar\n");</div><div class='add'>+		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = ena_com_config_dev_mode(ena_dev, llq, llq_default_configurations);</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Failed to configure the device mode.  Fallback to host mode policy.\n");</div><div class='add'>+		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_map_llq_mem_bar(struct pci_dev *pdev, struct ena_com_dev *ena_dev,</div><div class='add'>+			       int bars)</div><div class='add'>+{</div><div class='add'>+	bool has_mem_bar = !!(bars &amp; BIT(ENA_MEM_BAR));</div><div class='add'>+</div><div class='add'>+	if (!has_mem_bar)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ena_dev-&gt;mem_bar = devm_ioremap_wc(&amp;pdev-&gt;dev,</div><div class='add'>+					   pci_resource_start(pdev, ENA_MEM_BAR),</div><div class='add'>+					   pci_resource_len(pdev, ENA_MEM_BAR));</div><div class='add'>+</div><div class='add'>+	if (!ena_dev-&gt;mem_bar)</div><div class='add'>+		return -EFAULT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_device_init(struct ena_adapter *adapter, struct pci_dev *pdev,</div><div class='ctx'> 			   struct ena_com_dev_get_features_ctx *get_feat_ctx,</div><div class='ctx'> 			   bool *wd_state)</div><div class='ctx'> {</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct ena_llq_configurations llq_config;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	bool readless_supported;</div><div class='ctx'> 	u32 aenq_groups;</div><div class='hunk'>@@ -2475,7 +3105,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_mmio_reg_read_request_init(ena_dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		dev_err(dev, "failed to init mmio read less\n");</div><div class='add'>+		dev_err(dev, "Failed to init mmio read less\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2493,7 +3123,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	rc = ena_com_validate_version(ena_dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		dev_err(dev, "device version is too low\n");</div><div class='add'>+		dev_err(dev, "Device version is too low\n");</div><div class='ctx'> 		goto err_mmio_read_less;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2504,18 +3134,13 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,</div><div class='ctx'> 		goto err_mmio_read_less;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(dma_width));</div><div class='add'>+	rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_width));</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		dev_err(dev, "pci_set_dma_mask failed 0x%x\n", rc);</div><div class='add'>+		dev_err(dev, "dma_set_mask_and_coherent failed %d\n", rc);</div><div class='ctx'> 		goto err_mmio_read_less;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(dma_width));</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(dev, "err_pci_set_consistent_dma_mask failed 0x%x\n",</div><div class='del'>-			rc);</div><div class='del'>-		goto err_mmio_read_less;</div><div class='del'>-	}</div><div class='add'>+	ena_devlink_params_get(adapter-&gt;devlink);</div><div class='ctx'> </div><div class='ctx'> 	/* ENA admin level init */</div><div class='ctx'> 	rc = ena_com_admin_init(ena_dev, &amp;aenq_handlers);</div><div class='hunk'>@@ -2557,9 +3182,28 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	*wd_state = !!(aenq_groups &amp; BIT(ENA_ADMIN_KEEP_ALIVE));</div><div class='ctx'> </div><div class='add'>+	set_default_llq_configurations(adapter, &amp;llq_config, &amp;get_feat_ctx-&gt;llq);</div><div class='add'>+</div><div class='add'>+	rc = ena_set_queues_placement_policy(pdev, ena_dev, &amp;get_feat_ctx-&gt;llq,</div><div class='add'>+					     &amp;llq_config);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(netdev, "Cannot set queues placement policy rc= %d\n", rc);</div><div class='add'>+		goto err_admin_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = ena_calc_io_queue_size(adapter, get_feat_ctx);</div><div class='add'>+	if (unlikely(rc))</div><div class='add'>+		goto err_admin_init;</div><div class='add'>+</div><div class='add'>+	rc = ena_phc_init(adapter);</div><div class='add'>+	if (unlikely(rc &amp;&amp; (rc != -EOPNOTSUPP)))</div><div class='add'>+		netdev_err(netdev, "Failed initializing PHC, error: %d\n", rc);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_admin_init:</div><div class='add'>+	ena_com_abort_admin_commands(ena_dev);</div><div class='add'>+	ena_com_wait_for_abort_completion(ena_dev);</div><div class='ctx'> 	ena_com_delete_host_info(ena_dev);</div><div class='ctx'> 	ena_com_admin_destroy(ena_dev);</div><div class='ctx'> err_mmio_read_less:</div><div class='hunk'>@@ -2568,14 +3212,13 @@ err_mmio_read_less:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *adapter,</div><div class='del'>-						    int io_vectors)</div><div class='add'>+static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	struct device *dev = &amp;adapter-&gt;pdev-&gt;dev;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	rc = ena_enable_msix(adapter, io_vectors);</div><div class='add'>+	rc = ena_enable_msix(adapter);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(dev, "Can not reserve msix vectors\n");</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -2601,32 +3244,33 @@ err_disable_msix:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)</div><div class='add'>+int ena_destroy_device(struct ena_adapter *adapter, bool graceful)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	bool dev_up;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(ENA_FLAG_DEVICE_RUNNING, &amp;adapter-&gt;flags))</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;timer_service);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;timer_service);</div><div class='ctx'> </div><div class='ctx'> 	dev_up = test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='ctx'> 	adapter-&gt;dev_up_before_reset = dev_up;</div><div class='ctx'> 	if (!graceful)</div><div class='ctx'> 		ena_com_set_admin_running_state(ena_dev, false);</div><div class='ctx'> </div><div class='del'>-	if (test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags))</div><div class='add'>+	if (dev_up)</div><div class='ctx'> 		ena_down(adapter);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the device from sending AENQ events (in case reset flag is set</div><div class='ctx'> 	 *  and device is up, ena_down() already reset the device.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!(test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags) &amp;&amp; dev_up))</div><div class='del'>-		ena_com_dev_reset(adapter-&gt;ena_dev, adapter-&gt;reset_reason);</div><div class='add'>+		rc = ena_com_dev_reset(adapter-&gt;ena_dev, adapter-&gt;reset_reason);</div><div class='ctx'> </div><div class='ctx'> 	ena_free_mgmnt_irq(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -2638,38 +3282,50 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)</div><div class='ctx'> </div><div class='ctx'> 	ena_com_admin_destroy(ena_dev);</div><div class='ctx'> </div><div class='add'>+	ena_phc_destroy(adapter);</div><div class='add'>+</div><div class='ctx'> 	ena_com_mmio_reg_read_request_destroy(ena_dev);</div><div class='ctx'> </div><div class='add'>+	/* return reset reason to default value */</div><div class='ctx'> 	adapter-&gt;reset_reason = ENA_REGS_RESET_NORMAL;</div><div class='ctx'> </div><div class='ctx'> 	clear_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='ctx'> 	clear_bit(ENA_FLAG_DEVICE_RUNNING, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_restore_device(struct ena_adapter *adapter)</div><div class='add'>+int ena_restore_device(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_dev_get_features_ctx get_feat_ctx;</div><div class='ctx'> 	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+	struct ena_ring *txr;</div><div class='add'>+	int rc, count, i;</div><div class='ctx'> 	bool wd_state;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ENA_FLAG_ONGOING_RESET, &amp;adapter-&gt;flags);</div><div class='del'>-	rc = ena_device_init(ena_dev, adapter-&gt;pdev, &amp;get_feat_ctx, &amp;wd_state);</div><div class='add'>+	rc = ena_device_init(adapter, adapter-&gt;pdev, &amp;get_feat_ctx, &amp;wd_state);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Can not initialize device\n");</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> 	adapter-&gt;wd_state = wd_state;</div><div class='ctx'> </div><div class='add'>+	count =  adapter-&gt;xdp_num_queues + adapter-&gt;num_io_queues;</div><div class='add'>+	for (i = 0 ; i &lt; count; i++) {</div><div class='add'>+		txr = &amp;adapter-&gt;tx_ring[i];</div><div class='add'>+		txr-&gt;tx_mem_queue_type = ena_dev-&gt;tx_mem_queue_type;</div><div class='add'>+		txr-&gt;tx_max_header_size = ena_dev-&gt;tx_max_header_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = ena_device_validate_params(adapter, &amp;get_feat_ctx);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Validation of device parameters failed\n");</div><div class='ctx'> 		goto err_device_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = ena_enable_msix_and_set_admin_interrupts(adapter,</div><div class='del'>-						      adapter-&gt;num_queues);</div><div class='add'>+	rc = ena_enable_msix_and_set_admin_interrupts(adapter);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Enable MSI-X failed\n");</div><div class='ctx'> 		goto err_device_destroy;</div><div class='hunk'>@@ -2690,9 +3346,7 @@ static int ena_restore_device(struct ena_adapter *adapter)</div><div class='ctx'> 		netif_carrier_on(adapter-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;adapter-&gt;timer_service, round_jiffies(jiffies + HZ));</div><div class='del'>-	dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-		"Device reset completed successfully, Driver info: %s\n",</div><div class='del'>-		version);</div><div class='add'>+	adapter-&gt;last_keep_alive_jiffies = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> err_disable_msix:</div><div class='hunk'>@@ -2703,6 +3357,7 @@ err_device_destroy:</div><div class='ctx'> 	ena_com_wait_for_abort_completion(ena_dev);</div><div class='ctx'> 	ena_com_admin_destroy(ena_dev);</div><div class='ctx'> 	ena_com_dev_reset(ena_dev, ENA_REGS_RESET_DRIVER_INVALID_STATE);</div><div class='add'>+	ena_phc_destroy(adapter);</div><div class='ctx'> 	ena_com_mmio_reg_read_request_destroy(ena_dev);</div><div class='ctx'> err:</div><div class='ctx'> 	clear_bit(ENA_FLAG_DEVICE_RUNNING, &amp;adapter-&gt;flags);</div><div class='hunk'>@@ -2715,25 +3370,30 @@ err:</div><div class='ctx'> </div><div class='ctx'> static void ena_fw_reset_device(struct work_struct *work)</div><div class='ctx'> {</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='ctx'> 	struct ena_adapter *adapter =</div><div class='ctx'> 		container_of(work, struct ena_adapter, reset_task);</div><div class='del'>-	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(!test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags))) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"device reset schedule while reset bit is off\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> 	rtnl_lock();</div><div class='del'>-	ena_destroy_device(adapter, false);</div><div class='del'>-	ena_restore_device(adapter);</div><div class='add'>+</div><div class='add'>+	if (likely(test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags))) {</div><div class='add'>+		rc |= ena_destroy_device(adapter, false);</div><div class='add'>+		rc |= ena_restore_device(adapter);</div><div class='add'>+		adapter-&gt;dev_stats.reset_fail += !!rc;</div><div class='add'>+</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "Device reset completed successfully\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int check_for_rx_interrupt_queue(struct ena_adapter *adapter,</div><div class='ctx'> 					struct ena_ring *rx_ring)</div><div class='ctx'> {</div><div class='del'>-	if (likely(rx_ring-&gt;first_interrupt))</div><div class='add'>+	struct ena_napi *ena_napi = container_of(rx_ring-&gt;napi, struct ena_napi, napi);</div><div class='add'>+</div><div class='add'>+	if (likely(READ_ONCE(ena_napi-&gt;first_interrupt)))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (ena_com_cq_empty(rx_ring-&gt;ena_com_io_cq))</div><div class='hunk'>@@ -2745,9 +3405,8 @@ static int check_for_rx_interrupt_queue(struct ena_adapter *adapter,</div><div class='ctx'> 		netif_err(adapter, rx_err, adapter-&gt;netdev,</div><div class='ctx'> 			  "Potential MSIX issue on Rx side Queue = %d. Reset the device\n",</div><div class='ctx'> 			  rx_ring-&gt;qid);</div><div class='del'>-		adapter-&gt;reset_reason = ENA_REGS_RESET_MISS_INTERRUPT;</div><div class='del'>-		smp_mb__before_atomic();</div><div class='del'>-		set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_MISS_INTERRUPT);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2757,11 +3416,19 @@ static int check_for_rx_interrupt_queue(struct ena_adapter *adapter,</div><div class='ctx'> static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter,</div><div class='ctx'> 					  struct ena_ring *tx_ring)</div><div class='ctx'> {</div><div class='add'>+	struct ena_napi *ena_napi = container_of(tx_ring-&gt;napi, struct ena_napi, napi);</div><div class='add'>+	enum ena_regs_reset_reason_types reset_reason = ENA_REGS_RESET_MISS_TX_CMPL;</div><div class='add'>+	unsigned int time_since_last_napi;</div><div class='add'>+	unsigned int missing_tx_comp_to;</div><div class='add'>+	bool is_tx_comp_time_expired;</div><div class='ctx'> 	struct ena_tx_buffer *tx_buf;</div><div class='ctx'> 	unsigned long last_jiffies;</div><div class='add'>+	int napi_scheduled;</div><div class='ctx'> 	u32 missed_tx = 0;</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> </div><div class='add'>+	missing_tx_comp_to = jiffies_to_msecs(adapter-&gt;missing_tx_completion_to);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; tx_ring-&gt;ring_size; i++) {</div><div class='ctx'> 		tx_buf = &amp;tx_ring-&gt;tx_buffer_info[i];</div><div class='ctx'> 		last_jiffies = tx_buf-&gt;last_jiffies;</div><div class='hunk'>@@ -2770,46 +3437,68 @@ static int check_missing_comp_in_tx_queue(struct ena_adapter *adapter,</div><div class='ctx'> 			/* no pending Tx at this location */</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (unlikely(!tx_ring-&gt;first_interrupt &amp;&amp; time_is_before_jiffies(last_jiffies +</div><div class='del'>-			     2 * adapter-&gt;missing_tx_completion_to))) {</div><div class='add'>+		is_tx_comp_time_expired = time_is_before_jiffies(last_jiffies +</div><div class='add'>+			 2 * adapter-&gt;missing_tx_completion_to);</div><div class='add'>+</div><div class='add'>+		if (unlikely(!READ_ONCE(ena_napi-&gt;first_interrupt) &amp;&amp; is_tx_comp_time_expired)) {</div><div class='ctx'> 			/* If after graceful period interrupt is still not</div><div class='ctx'> 			 * received, we schedule a reset</div><div class='ctx'> 			 */</div><div class='ctx'> 			netif_err(adapter, tx_err, adapter-&gt;netdev,</div><div class='ctx'> 				  "Potential MSIX issue on Tx side Queue = %d. Reset the device\n",</div><div class='ctx'> 				  tx_ring-&gt;qid);</div><div class='del'>-			adapter-&gt;reset_reason = ENA_REGS_RESET_MISS_INTERRUPT;</div><div class='del'>-			smp_mb__before_atomic();</div><div class='del'>-			set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+			ena_reset_device(adapter, ENA_REGS_RESET_MISS_INTERRUPT);</div><div class='ctx'> 			return -EIO;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(time_is_before_jiffies(last_jiffies +</div><div class='del'>-				adapter-&gt;missing_tx_completion_to))) {</div><div class='del'>-			if (!tx_buf-&gt;print_once)</div><div class='del'>-				netif_notice(adapter, tx_err, adapter-&gt;netdev,</div><div class='del'>-					     "Found a Tx that wasn't completed on time, qid %d, index %d.\n",</div><div class='del'>-					     tx_ring-&gt;qid, i);</div><div class='add'>+		is_tx_comp_time_expired = time_is_before_jiffies(last_jiffies +</div><div class='add'>+			adapter-&gt;missing_tx_completion_to);</div><div class='add'>+</div><div class='add'>+		if (unlikely(is_tx_comp_time_expired)) {</div><div class='add'>+			time_since_last_napi =</div><div class='add'>+				jiffies_to_usecs(jiffies - tx_ring-&gt;tx_stats.last_napi_jiffies);</div><div class='add'>+			napi_scheduled = !!(ena_napi-&gt;napi.state &amp; NAPIF_STATE_SCHED);</div><div class='add'>+</div><div class='add'>+			if (missing_tx_comp_to &lt; time_since_last_napi &amp;&amp; napi_scheduled) {</div><div class='add'>+				/* We suspect napi isn't called because the</div><div class='add'>+				 * bottom half is not run. Require a bigger</div><div class='add'>+				 * timeout for these cases</div><div class='add'>+				 */</div><div class='add'>+				if (!time_is_before_jiffies(last_jiffies +</div><div class='add'>+					2 * adapter-&gt;missing_tx_completion_to))</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				reset_reason = ENA_REGS_RESET_SUSPECTED_POLL_STARVATION;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			tx_buf-&gt;print_once = 1;</div><div class='ctx'> 			missed_tx++;</div><div class='add'>+</div><div class='add'>+			if (tx_buf-&gt;print_once)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			netif_notice(adapter, tx_err, adapter-&gt;netdev,</div><div class='add'>+				     "TX hasn't completed, qid %d, index %d. %u usecs from last napi execution, napi scheduled: %d\n",</div><div class='add'>+				     tx_ring-&gt;qid, i, time_since_last_napi, napi_scheduled);</div><div class='add'>+</div><div class='add'>+			tx_buf-&gt;print_once = 1;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(missed_tx &gt; adapter-&gt;missing_tx_completion_threshold)) {</div><div class='ctx'> 		netif_err(adapter, tx_err, adapter-&gt;netdev,</div><div class='del'>-			  "The number of lost tx completions is above the threshold (%d &gt; %d). Reset the device\n",</div><div class='add'>+			  "Lost TX completions are above the threshold (%d &gt; %d). Completion transmission timeout: %u.\n",</div><div class='ctx'> 			  missed_tx,</div><div class='del'>-			  adapter-&gt;missing_tx_completion_threshold);</div><div class='del'>-		adapter-&gt;reset_reason =</div><div class='del'>-			ENA_REGS_RESET_MISS_TX_CMPL;</div><div class='del'>-		set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+			  adapter-&gt;missing_tx_completion_threshold,</div><div class='add'>+			  missing_tx_comp_to);</div><div class='add'>+		netif_err(adapter, tx_err, adapter-&gt;netdev,</div><div class='add'>+			  "Resetting the device\n");</div><div class='add'>+</div><div class='add'>+		ena_reset_device(adapter, reset_reason);</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='del'>-	tx_ring-&gt;tx_stats.missed_tx = missed_tx;</div><div class='del'>-	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;tx_ring-&gt;tx_stats.missed_tx, missed_tx,</div><div class='add'>+			  &amp;tx_ring-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2818,7 +3507,10 @@ static void check_for_missing_completions(struct ena_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_ring *tx_ring;</div><div class='ctx'> 	struct ena_ring *rx_ring;</div><div class='del'>-	int i, budget, rc;</div><div class='add'>+	int qid, budget, rc;</div><div class='add'>+	int io_queue_count;</div><div class='add'>+</div><div class='add'>+	io_queue_count = adapter-&gt;xdp_num_queues + adapter-&gt;num_io_queues;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure the driver doesn't turn the device in other process */</div><div class='ctx'> 	smp_rmb();</div><div class='hunk'>@@ -2832,26 +3524,29 @@ static void check_for_missing_completions(struct ena_adapter *adapter)</div><div class='ctx'> 	if (adapter-&gt;missing_tx_completion_to == ENA_HW_HINTS_NO_TIMEOUT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	budget = ENA_MONITORED_TX_QUEUES;</div><div class='add'>+	budget = min_t(u32, io_queue_count, ENA_MONITORED_TX_QUEUES);</div><div class='ctx'> </div><div class='del'>-	for (i = adapter-&gt;last_monitored_tx_qid; i &lt; adapter-&gt;num_queues; i++) {</div><div class='del'>-		tx_ring = &amp;adapter-&gt;tx_ring[i];</div><div class='del'>-		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='add'>+	qid = adapter-&gt;last_monitored_tx_qid;</div><div class='add'>+</div><div class='add'>+	while (budget) {</div><div class='add'>+		qid = (qid + 1) % io_queue_count;</div><div class='add'>+</div><div class='add'>+		tx_ring = &amp;adapter-&gt;tx_ring[qid];</div><div class='add'>+		rx_ring = &amp;adapter-&gt;rx_ring[qid];</div><div class='ctx'> </div><div class='ctx'> 		rc = check_missing_comp_in_tx_queue(adapter, tx_ring);</div><div class='ctx'> 		if (unlikely(rc))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		rc = check_for_rx_interrupt_queue(adapter, rx_ring);</div><div class='add'>+		rc =  !ENA_IS_XDP_INDEX(adapter, qid) ?</div><div class='add'>+			check_for_rx_interrupt_queue(adapter, rx_ring) : 0;</div><div class='ctx'> 		if (unlikely(rc))</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='ctx'> 		budget--;</div><div class='del'>-		if (!budget)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;last_monitored_tx_qid = i % adapter-&gt;num_queues;</div><div class='add'>+	adapter-&gt;last_monitored_tx_qid = qid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* trigger napi schedule after 2 consecutive detections */</div><div class='hunk'>@@ -2881,21 +3576,19 @@ static void check_for_empty_rx_ring(struct ena_adapter *adapter)</div><div class='ctx'> 	if (test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_io_queues; i++) {</div><div class='ctx'> 		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='ctx'> </div><div class='del'>-		refill_required =</div><div class='del'>-			ena_com_free_desc(rx_ring-&gt;ena_com_io_sq);</div><div class='add'>+		refill_required = ena_com_free_q_entries(rx_ring-&gt;ena_com_io_sq);</div><div class='ctx'> 		if (unlikely(refill_required == (rx_ring-&gt;ring_size - 1))) {</div><div class='ctx'> 			rx_ring-&gt;empty_rx_queue++;</div><div class='ctx'> </div><div class='ctx'> 			if (rx_ring-&gt;empty_rx_queue &gt;= EMPTY_RX_REFILL) {</div><div class='del'>-				u64_stats_update_begin(&amp;rx_ring-&gt;syncp);</div><div class='del'>-				rx_ring-&gt;rx_stats.empty_rx_ring++;</div><div class='del'>-				u64_stats_update_end(&amp;rx_ring-&gt;syncp);</div><div class='add'>+				ena_increase_stat(&amp;rx_ring-&gt;rx_stats.empty_rx_ring, 1,</div><div class='add'>+						  &amp;rx_ring-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 				netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='del'>-					  "trigger refill for ring %d\n", i);</div><div class='add'>+					  "Trigger refill for ring %d\n", i);</div><div class='ctx'> </div><div class='ctx'> 				napi_schedule(rx_ring-&gt;napi);</div><div class='ctx'> 				rx_ring-&gt;empty_rx_queue = 0;</div><div class='hunk'>@@ -2917,16 +3610,14 @@ static void check_for_missing_keep_alive(struct ena_adapter *adapter)</div><div class='ctx'> 	if (adapter-&gt;keep_alive_timeout == ENA_HW_HINTS_NO_TIMEOUT)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	keep_alive_expired = round_jiffies(adapter-&gt;last_keep_alive_jiffies +</div><div class='del'>-					   adapter-&gt;keep_alive_timeout);</div><div class='add'>+	keep_alive_expired = adapter-&gt;last_keep_alive_jiffies +</div><div class='add'>+			     adapter-&gt;keep_alive_timeout;</div><div class='ctx'> 	if (unlikely(time_is_before_jiffies(keep_alive_expired))) {</div><div class='ctx'> 		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='ctx'> 			  "Keep alive watchdog timeout.\n");</div><div class='del'>-		u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-		adapter-&gt;dev_stats.wd_expired++;</div><div class='del'>-		u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='del'>-		adapter-&gt;reset_reason = ENA_REGS_RESET_KEEP_ALIVE_TO;</div><div class='del'>-		set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+		ena_increase_stat(&amp;adapter-&gt;dev_stats.wd_expired, 1,</div><div class='add'>+				  &amp;adapter-&gt;syncp);</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_KEEP_ALIVE_TO);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2935,11 +3626,9 @@ static void check_for_admin_com_state(struct ena_adapter *adapter)</div><div class='ctx'> 	if (unlikely(!ena_com_get_admin_running_state(adapter-&gt;ena_dev))) {</div><div class='ctx'> 		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='ctx'> 			  "ENA admin queue is not in running state!\n");</div><div class='del'>-		u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-		adapter-&gt;dev_stats.admin_q_pause++;</div><div class='del'>-		u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='del'>-		adapter-&gt;reset_reason = ENA_REGS_RESET_ADMIN_TO;</div><div class='del'>-		set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+		ena_increase_stat(&amp;adapter-&gt;dev_stats.admin_q_pause, 1,</div><div class='add'>+				  &amp;adapter-&gt;syncp);</div><div class='add'>+		ena_reset_device(adapter, ENA_REGS_RESET_ADMIN_TO);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2992,7 +3681,8 @@ static void ena_update_host_info(struct ena_admin_host_info *host_info,</div><div class='ctx'> </div><div class='ctx'> static void ena_timer_service(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct ena_adapter *adapter = from_timer(adapter, t, timer_service);</div><div class='add'>+	struct ena_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							 timer_service);</div><div class='ctx'> 	u8 *debug_area = adapter-&gt;ena_dev-&gt;host_attr.debug_area_virt_addr;</div><div class='ctx'> 	struct ena_admin_host_info *host_info =</div><div class='ctx'> 		adapter-&gt;ena_dev-&gt;host_attr.host_info;</div><div class='hunk'>@@ -3020,81 +3710,43 @@ static void ena_timer_service(struct timer_list *t)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the timer */</div><div class='del'>-	mod_timer(&amp;adapter-&gt;timer_service, jiffies + HZ);</div><div class='add'>+	mod_timer(&amp;adapter-&gt;timer_service, round_jiffies(jiffies + HZ));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ena_calc_io_queue_num(struct pci_dev *pdev,</div><div class='del'>-				 struct ena_com_dev *ena_dev,</div><div class='del'>-				 struct ena_com_dev_get_features_ctx *get_feat_ctx)</div><div class='add'>+static u32 ena_calc_max_io_queue_num(struct pci_dev *pdev,</div><div class='add'>+				     struct ena_com_dev *ena_dev,</div><div class='add'>+				     struct ena_com_dev_get_features_ctx *get_feat_ctx)</div><div class='ctx'> {</div><div class='del'>-	int io_sq_num, io_queue_num;</div><div class='del'>-</div><div class='del'>-	/* In case of LLQ use the llq number in the get feature cmd */</div><div class='del'>-	if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='del'>-		io_sq_num = get_feat_ctx-&gt;llq.max_llq_num;</div><div class='del'>-	else</div><div class='del'>-		io_sq_num = get_feat_ctx-&gt;max_queues.max_sq_num;</div><div class='del'>-</div><div class='del'>-	io_queue_num = min_t(int, num_online_cpus(), ENA_MAX_NUM_IO_QUEUES);</div><div class='del'>-	io_queue_num = min_t(int, io_queue_num, io_sq_num);</div><div class='del'>-	io_queue_num = min_t(int, io_queue_num,</div><div class='del'>-			     get_feat_ctx-&gt;max_queues.max_cq_num);</div><div class='del'>-	/* 1 IRQ for for mgmnt and 1 IRQs for each IO direction */</div><div class='del'>-	io_queue_num = min_t(int, io_queue_num, pci_msix_vec_count(pdev) - 1);</div><div class='del'>-	if (unlikely(!io_queue_num)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "The device doesn't have io queues\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return io_queue_num;</div><div class='del'>-}</div><div class='add'>+	u32 io_tx_sq_num, io_tx_cq_num, io_rx_num, max_num_io_queues;</div><div class='ctx'> </div><div class='del'>-static int ena_set_queues_placement_policy(struct pci_dev *pdev,</div><div class='del'>-					   struct ena_com_dev *ena_dev,</div><div class='del'>-					   struct ena_admin_feature_llq_desc *llq,</div><div class='del'>-					   struct ena_llq_configurations *llq_default_configurations)</div><div class='del'>-{</div><div class='del'>-	bool has_mem_bar;</div><div class='del'>-	int rc;</div><div class='del'>-	u32 llq_feature_mask;</div><div class='add'>+	if (ena_dev-&gt;supported_features &amp; BIT(ENA_ADMIN_MAX_QUEUES_EXT)) {</div><div class='add'>+		struct ena_admin_queue_ext_feature_fields *max_queue_ext =</div><div class='add'>+			&amp;get_feat_ctx-&gt;max_queue_ext.max_queue_ext;</div><div class='add'>+		io_rx_num = min_t(u32, max_queue_ext-&gt;max_rx_sq_num,</div><div class='add'>+				  max_queue_ext-&gt;max_rx_cq_num);</div><div class='ctx'> </div><div class='del'>-	llq_feature_mask = 1 &lt;&lt; ENA_ADMIN_LLQ;</div><div class='del'>-	if (!(ena_dev-&gt;supported_features &amp; llq_feature_mask)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"LLQ is not supported Fallback to host mode policy.\n");</div><div class='del'>-		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	has_mem_bar = pci_select_bars(pdev, IORESOURCE_MEM) &amp; BIT(ENA_MEM_BAR);</div><div class='del'>-</div><div class='del'>-	rc = ena_com_config_dev_mode(ena_dev, llq, llq_default_configurations);</div><div class='del'>-	if (unlikely(rc)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"Failed to configure the device mode.  Fallback to host mode policy.\n");</div><div class='del'>-		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='del'>-		return 0;</div><div class='add'>+		io_tx_sq_num = max_queue_ext-&gt;max_tx_sq_num;</div><div class='add'>+		io_tx_cq_num = max_queue_ext-&gt;max_tx_cq_num;</div><div class='add'>+	} else {</div><div class='add'>+		struct ena_admin_queue_feature_desc *max_queues =</div><div class='add'>+			&amp;get_feat_ctx-&gt;max_queues;</div><div class='add'>+		io_tx_sq_num = max_queues-&gt;max_sq_num;</div><div class='add'>+		io_tx_cq_num = max_queues-&gt;max_cq_num;</div><div class='add'>+		io_rx_num = min_t(u32, io_tx_sq_num, io_tx_cq_num);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Nothing to config, exit */</div><div class='del'>-	if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST)</div><div class='del'>-		return 0;</div><div class='add'>+	/* In case of LLQ use the llq fields for the tx SQ/CQ */</div><div class='add'>+	if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='add'>+		io_tx_sq_num = get_feat_ctx-&gt;llq.max_llq_num;</div><div class='ctx'> </div><div class='del'>-	if (!has_mem_bar) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"ENA device does not expose LLQ bar. Fallback to host mode policy.\n");</div><div class='del'>-		ena_dev-&gt;tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='add'>+	max_num_io_queues = min_t(u32, num_online_cpus(), ENA_MAX_NUM_IO_QUEUES);</div><div class='add'>+	max_num_io_queues = min_t(u32, max_num_io_queues, io_rx_num);</div><div class='add'>+	max_num_io_queues = min_t(u32, max_num_io_queues, io_tx_sq_num);</div><div class='add'>+	max_num_io_queues = min_t(u32, max_num_io_queues, io_tx_cq_num);</div><div class='add'>+	/* 1 IRQ for mgmnt and 1 IRQs for each IO direction */</div><div class='add'>+	max_num_io_queues = min_t(u32, max_num_io_queues, pci_msix_vec_count(pdev) - 1);</div><div class='ctx'> </div><div class='del'>-	ena_dev-&gt;mem_bar = devm_ioremap_wc(&amp;pdev-&gt;dev,</div><div class='del'>-					   pci_resource_start(pdev, ENA_MEM_BAR),</div><div class='del'>-					   pci_resource_len(pdev, ENA_MEM_BAR));</div><div class='del'>-</div><div class='del'>-	if (!ena_dev-&gt;mem_bar)</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return max_num_io_queues;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ena_set_dev_offloads(struct ena_com_dev_get_features_ctx *feat,</div><div class='hunk'>@@ -3149,7 +3801,7 @@ static void ena_set_conf_feat_params(struct ena_adapter *adapter,</div><div class='ctx'> 		ether_addr_copy(adapter-&gt;mac_addr, netdev-&gt;dev_addr);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ether_addr_copy(adapter-&gt;mac_addr, feat-&gt;dev_attr.mac_addr);</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, adapter-&gt;mac_addr);</div><div class='add'>+		eth_hw_addr_set(netdev, adapter-&gt;mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set offload features */</div><div class='hunk'>@@ -3174,17 +3826,17 @@ static int ena_rss_init_default(struct ena_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ENA_RX_RSS_TABLE_SIZE; i++) {</div><div class='del'>-		val = ethtool_rxfh_indir_default(i, adapter-&gt;num_queues);</div><div class='add'>+		val = ethtool_rxfh_indir_default(i, adapter-&gt;num_io_queues);</div><div class='ctx'> 		rc = ena_com_indirect_table_fill_entry(ena_dev, i,</div><div class='ctx'> 						       ENA_IO_RXQ_IDX(val));</div><div class='del'>-		if (unlikely(rc &amp;&amp; (rc != -EOPNOTSUPP))) {</div><div class='add'>+		if (unlikely(rc)) {</div><div class='ctx'> 			dev_err(dev, "Cannot fill indirect table\n");</div><div class='ctx'> 			goto err_fill_indir;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_CRC32, NULL,</div><div class='del'>-					ENA_HASH_KEY_SIZE, 0xFFFFFFFF);</div><div class='add'>+	rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_TOEPLITZ, NULL, ENA_HASH_KEY_SIZE,</div><div class='add'>+					0xFFFFFFFF);</div><div class='ctx'> 	if (unlikely(rc &amp;&amp; (rc != -EOPNOTSUPP))) {</div><div class='ctx'> 		dev_err(dev, "Cannot fill hash function\n");</div><div class='ctx'> 		goto err_fill_indir;</div><div class='hunk'>@@ -3212,47 +3864,6 @@ static void ena_release_bars(struct ena_com_dev *ena_dev, struct pci_dev *pdev)</div><div class='ctx'> 	pci_release_selected_regions(pdev, release_bars);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void set_default_llq_configurations(struct ena_llq_configurations *llq_config)</div><div class='del'>-{</div><div class='del'>-	llq_config-&gt;llq_header_location = ENA_ADMIN_INLINE_HEADER;</div><div class='del'>-	llq_config-&gt;llq_ring_entry_size = ENA_ADMIN_LIST_ENTRY_SIZE_128B;</div><div class='del'>-	llq_config-&gt;llq_stride_ctrl = ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY;</div><div class='del'>-	llq_config-&gt;llq_num_decs_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2;</div><div class='del'>-	llq_config-&gt;llq_ring_entry_size_value = 128;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ena_calc_queue_size(struct pci_dev *pdev,</div><div class='del'>-			       struct ena_com_dev *ena_dev,</div><div class='del'>-			       u16 *max_tx_sgl_size,</div><div class='del'>-			       u16 *max_rx_sgl_size,</div><div class='del'>-			       struct ena_com_dev_get_features_ctx *get_feat_ctx)</div><div class='del'>-{</div><div class='del'>-	u32 queue_size = ENA_DEFAULT_RING_SIZE;</div><div class='del'>-</div><div class='del'>-	queue_size = min_t(u32, queue_size,</div><div class='del'>-			   get_feat_ctx-&gt;max_queues.max_cq_depth);</div><div class='del'>-	queue_size = min_t(u32, queue_size,</div><div class='del'>-			   get_feat_ctx-&gt;max_queues.max_sq_depth);</div><div class='del'>-</div><div class='del'>-	if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='del'>-		queue_size = min_t(u32, queue_size,</div><div class='del'>-				   get_feat_ctx-&gt;llq.max_llq_depth);</div><div class='del'>-</div><div class='del'>-	queue_size = rounddown_pow_of_two(queue_size);</div><div class='del'>-</div><div class='del'>-	if (unlikely(!queue_size)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Invalid queue size\n");</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*max_tx_sgl_size = min_t(u16, ENA_PKT_MAX_BUFS,</div><div class='del'>-				 get_feat_ctx-&gt;max_queues.max_packet_tx_descs);</div><div class='del'>-	*max_rx_sgl_size = min_t(u16, ENA_PKT_MAX_BUFS,</div><div class='del'>-				 get_feat_ctx-&gt;max_queues.max_packet_rx_descs);</div><div class='del'>-</div><div class='del'>-	return queue_size;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* ena_probe - Device Initialization Routine</div><div class='ctx'>  * @pdev: PCI device information struct</div><div class='ctx'>  * @ent: entry in ena_pci_tbl</div><div class='hunk'>@@ -3266,30 +3877,29 @@ static int ena_calc_queue_size(struct pci_dev *pdev,</div><div class='ctx'> static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_com_dev_get_features_ctx get_feat_ctx;</div><div class='del'>-	static int version_printed;</div><div class='del'>-	struct net_device *netdev;</div><div class='del'>-	struct ena_adapter *adapter;</div><div class='del'>-	struct ena_llq_configurations llq_config;</div><div class='ctx'> 	struct ena_com_dev *ena_dev = NULL;</div><div class='del'>-	char *queue_type_str;</div><div class='add'>+	struct ena_adapter *adapter;</div><div class='add'>+	struct net_device *netdev;</div><div class='ctx'> 	static int adapters_found;</div><div class='del'>-	int io_queue_num, bars, rc;</div><div class='del'>-	int queue_size;</div><div class='del'>-	u16 tx_sgl_size = 0;</div><div class='del'>-	u16 rx_sgl_size = 0;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	u32 max_num_io_queues;</div><div class='ctx'> 	bool wd_state;</div><div class='add'>+	int bars, rc;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "%s\n", __func__);</div><div class='ctx'> </div><div class='del'>-	if (version_printed++ == 0)</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "%s", version);</div><div class='del'>-</div><div class='ctx'> 	rc = pci_enable_device_mem(pdev);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "pci_enable_device_mem() failed!\n");</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rc = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(ENA_MAX_PHYS_ADDR_SIZE_BITS));</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "dma_set_mask_and_coherent failed %d\n", rc);</div><div class='add'>+		goto err_disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	ena_dev = vzalloc(sizeof(*ena_dev));</div><div class='hunk'>@@ -3310,79 +3920,96 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 					pci_resource_start(pdev, ENA_REG_BAR),</div><div class='ctx'> 					pci_resource_len(pdev, ENA_REG_BAR));</div><div class='ctx'> 	if (!ena_dev-&gt;reg_bar) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to remap regs bar\n");</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to remap regs bar\n");</div><div class='ctx'> 		rc = -EFAULT;</div><div class='ctx'> 		goto err_free_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ena_dev-&gt;ena_min_poll_delay_us = ENA_ADMIN_POLL_DELAY_US;</div><div class='add'>+</div><div class='ctx'> 	ena_dev-&gt;dmadev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	rc = ena_device_init(ena_dev, pdev, &amp;get_feat_ctx, &amp;wd_state);</div><div class='del'>-	if (rc) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "ena device init failed\n");</div><div class='del'>-		if (rc == -ETIME)</div><div class='del'>-			rc = -EPROBE_DEFER;</div><div class='add'>+	netdev = alloc_etherdev_mq(sizeof(struct ena_adapter), ENA_MAX_RINGS);</div><div class='add'>+	if (!netdev) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "alloc_etherdev_mq failed\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='ctx'> 		goto err_free_region;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	set_default_llq_configurations(&amp;llq_config);</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+	adapter-&gt;ena_dev = ena_dev;</div><div class='add'>+	adapter-&gt;netdev = netdev;</div><div class='add'>+	adapter-&gt;pdev = pdev;</div><div class='add'>+	adapter-&gt;msg_enable = DEFAULT_MSG_ENABLE;</div><div class='ctx'> </div><div class='del'>-	rc = ena_set_queues_placement_policy(pdev, ena_dev, &amp;get_feat_ctx.llq,</div><div class='del'>-					     &amp;llq_config);</div><div class='add'>+	ena_dev-&gt;net_device = netdev;</div><div class='add'>+</div><div class='add'>+	pci_set_drvdata(pdev, adapter);</div><div class='add'>+</div><div class='add'>+	rc = ena_phc_alloc(adapter);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "ena device init failed\n");</div><div class='del'>-		goto err_device_destroy;</div><div class='add'>+		netdev_err(netdev, "ena_phc_alloc failed\n");</div><div class='add'>+		goto err_netdev_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* initial Tx interrupt delay, Assumes 1 usec granularity.</div><div class='del'>-	* Updated during device initialization with the real granularity</div><div class='del'>-	*/</div><div class='del'>-	ena_dev-&gt;intr_moder_tx_interval = ENA_INTR_INITIAL_TX_INTERVAL_USECS;</div><div class='del'>-	io_queue_num = ena_calc_io_queue_num(pdev, ena_dev, &amp;get_feat_ctx);</div><div class='del'>-	queue_size = ena_calc_queue_size(pdev, ena_dev, &amp;tx_sgl_size,</div><div class='del'>-					 &amp;rx_sgl_size, &amp;get_feat_ctx);</div><div class='del'>-	if ((queue_size &lt;= 0) || (io_queue_num &lt;= 0)) {</div><div class='del'>-		rc = -EFAULT;</div><div class='del'>-		goto err_device_destroy;</div><div class='add'>+	rc = ena_com_allocate_customer_metrics_buffer(ena_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(netdev, "ena_com_allocate_customer_metrics_buffer failed\n");</div><div class='add'>+		goto err_free_phc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "creating %d io queues. queue size: %d. LLQ is %s\n",</div><div class='del'>-		 io_queue_num, queue_size,</div><div class='del'>-		 (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) ?</div><div class='del'>-		 "ENABLED" : "DISABLED");</div><div class='add'>+	rc = ena_map_llq_mem_bar(pdev, ena_dev, bars);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ENA LLQ bar mapping failed\n");</div><div class='add'>+		goto err_metrics_destroy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* dev zeroed in init_etherdev */</div><div class='del'>-	netdev = alloc_etherdev_mq(sizeof(struct ena_adapter), io_queue_num);</div><div class='del'>-	if (!netdev) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "alloc_etherdev_mq failed\n");</div><div class='add'>+	/* Need to do this before ena_device_init */</div><div class='add'>+	devlink = ena_devlink_alloc(adapter);</div><div class='add'>+	if (!devlink) {</div><div class='add'>+		netdev_err(netdev, "ena_devlink_alloc failed\n");</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='del'>-		goto err_device_destroy;</div><div class='add'>+		goto err_metrics_destroy;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	adapter = netdev_priv(netdev);</div><div class='del'>-	pci_set_drvdata(pdev, adapter);</div><div class='add'>+	rc = ena_device_init(adapter, pdev, &amp;get_feat_ctx, &amp;wd_state);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "ENA device init failed\n");</div><div class='add'>+		if (rc == -ETIME)</div><div class='add'>+			rc = -EPROBE_DEFER;</div><div class='add'>+		goto ena_devlink_destroy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;ena_dev = ena_dev;</div><div class='del'>-	adapter-&gt;netdev = netdev;</div><div class='del'>-	adapter-&gt;pdev = pdev;</div><div class='add'>+	/* Initial TX and RX interrupt delay. Assumes 1 usec granularity.</div><div class='add'>+	 * Updated during device initialization with the real granularity</div><div class='add'>+	 */</div><div class='add'>+	ena_dev-&gt;intr_moder_tx_interval = ENA_INTR_INITIAL_TX_INTERVAL_USECS;</div><div class='add'>+	ena_dev-&gt;intr_moder_rx_interval = ENA_INTR_INITIAL_RX_INTERVAL_USECS;</div><div class='add'>+	ena_dev-&gt;intr_delay_resolution = ENA_DEFAULT_INTR_DELAY_RESOLUTION;</div><div class='add'>+	max_num_io_queues = ena_calc_max_io_queue_num(pdev, ena_dev, &amp;get_feat_ctx);</div><div class='add'>+	if (unlikely(!max_num_io_queues)) {</div><div class='add'>+		rc = -EFAULT;</div><div class='add'>+		goto err_device_destroy;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ena_set_conf_feat_params(adapter, &amp;get_feat_ctx);</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);</div><div class='ctx'> 	adapter-&gt;reset_reason = ENA_REGS_RESET_NORMAL;</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;tx_ring_size = queue_size;</div><div class='del'>-	adapter-&gt;rx_ring_size = queue_size;</div><div class='del'>-</div><div class='del'>-	adapter-&gt;max_tx_sgl_size = tx_sgl_size;</div><div class='del'>-	adapter-&gt;max_rx_sgl_size = rx_sgl_size;</div><div class='del'>-</div><div class='del'>-	adapter-&gt;num_queues = io_queue_num;</div><div class='add'>+	adapter-&gt;num_io_queues = max_num_io_queues;</div><div class='add'>+	adapter-&gt;max_num_io_queues = max_num_io_queues;</div><div class='ctx'> 	adapter-&gt;last_monitored_tx_qid = 0;</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;xdp_first_ring = 0;</div><div class='add'>+	adapter-&gt;xdp_num_queues = 0;</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;rx_copybreak = ENA_DEFAULT_RX_COPYBREAK;</div><div class='add'>+	if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV)</div><div class='add'>+		adapter-&gt;disable_meta_caching =</div><div class='add'>+			!!(get_feat_ctx.llq.accel_mode.u.get.supported_flags &amp;</div><div class='add'>+			   BIT(ENA_ADMIN_DISABLE_META_CACHING));</div><div class='add'>+</div><div class='ctx'> 	adapter-&gt;wd_state = wd_state;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(adapter-&gt;name, ENA_NAME_MAX_LEN, "ena_%d", adapters_found);</div><div class='hunk'>@@ -3391,9 +4018,13 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Failed to query interrupt moderation feature\n");</div><div class='del'>-		goto err_netdev_destroy;</div><div class='add'>+		goto err_device_destroy;</div><div class='ctx'> 	}</div><div class='del'>-	ena_init_io_rings(adapter);</div><div class='add'>+</div><div class='add'>+	ena_init_io_rings(adapter,</div><div class='add'>+			  0,</div><div class='add'>+			  adapter-&gt;xdp_num_queues +</div><div class='add'>+			  adapter-&gt;num_io_queues);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;ena_netdev_ops;</div><div class='ctx'> 	netdev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='hunk'>@@ -3403,7 +4034,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	u64_stats_init(&amp;adapter-&gt;syncp);</div><div class='ctx'> </div><div class='del'>-	rc = ena_enable_msix_and_set_admin_interrupts(adapter, io_queue_num);</div><div class='add'>+	rc = ena_enable_msix_and_set_admin_interrupts(adapter);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Failed to enable and set the admin interrupts\n");</div><div class='hunk'>@@ -3417,6 +4048,10 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	ena_config_debug_area(adapter);</div><div class='ctx'> </div><div class='add'>+	if (ena_xdp_legal_queue_count(adapter, adapter-&gt;num_io_queues))</div><div class='add'>+		netdev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC |</div><div class='add'>+				       NETDEV_XDP_ACT_REDIRECT;</div><div class='add'>+</div><div class='ctx'> 	memcpy(adapter-&gt;netdev-&gt;perm_addr, adapter-&gt;mac_addr, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='hunk'>@@ -3427,6 +4062,8 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_rss;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ena_debugfs_init(netdev);</div><div class='add'>+</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;reset_task, ena_fw_reset_device);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;last_keep_alive_jiffies = jiffies;</div><div class='hunk'>@@ -3439,20 +4076,21 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	timer_setup(&amp;adapter-&gt;timer_service, ena_timer_service, 0);</div><div class='ctx'> 	mod_timer(&amp;adapter-&gt;timer_service, round_jiffies(jiffies + HZ));</div><div class='ctx'> </div><div class='del'>-	if (ena_dev-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST)</div><div class='del'>-		queue_type_str = "Regular";</div><div class='del'>-	else</div><div class='del'>-		queue_type_str = "Low Latency";</div><div class='del'>-</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev,</div><div class='del'>-		 "%s found at mem %lx, mac addr %pM Queues %d, Placement policy: %s\n",</div><div class='add'>+		 "%s found at mem %lx, mac addr %pM\n",</div><div class='ctx'> 		 DEVICE_NAME, (long)pci_resource_start(pdev, 0),</div><div class='del'>-		 netdev-&gt;dev_addr, io_queue_num, queue_type_str);</div><div class='add'>+		 netdev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(ENA_FLAG_DEVICE_RUNNING, &amp;adapter-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	adapters_found++;</div><div class='ctx'> </div><div class='add'>+	/* From this point, the devlink device is visible to users.</div><div class='add'>+	 * Perform the registration last to ensure that all the resources</div><div class='add'>+	 * are available and that the netdevice is registered.</div><div class='add'>+	 */</div><div class='add'>+	ena_devlink_register(devlink, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_rss:</div><div class='hunk'>@@ -3465,13 +4103,18 @@ err_free_msix:</div><div class='ctx'> 	ena_free_mgmnt_irq(adapter);</div><div class='ctx'> 	ena_disable_msix(adapter);</div><div class='ctx'> err_worker_destroy:</div><div class='del'>-	ena_com_destroy_interrupt_moderation(ena_dev);</div><div class='del'>-	del_timer(&amp;adapter-&gt;timer_service);</div><div class='del'>-err_netdev_destroy:</div><div class='del'>-	free_netdev(netdev);</div><div class='add'>+	timer_delete(&amp;adapter-&gt;timer_service);</div><div class='ctx'> err_device_destroy:</div><div class='ctx'> 	ena_com_delete_host_info(ena_dev);</div><div class='ctx'> 	ena_com_admin_destroy(ena_dev);</div><div class='add'>+ena_devlink_destroy:</div><div class='add'>+	ena_devlink_free(devlink);</div><div class='add'>+err_metrics_destroy:</div><div class='add'>+	ena_com_delete_customer_metrics_buffer(ena_dev);</div><div class='add'>+err_free_phc:</div><div class='add'>+	ena_phc_free(adapter);</div><div class='add'>+err_netdev_destroy:</div><div class='add'>+	free_netdev(netdev);</div><div class='ctx'> err_free_region:</div><div class='ctx'> 	ena_release_bars(ena_dev, pdev);</div><div class='ctx'> err_free_ena_dev:</div><div class='hunk'>@@ -3483,13 +4126,15 @@ err_disable_device:</div><div class='ctx'> </div><div class='ctx'> /*****************************************************************************/</div><div class='ctx'> </div><div class='del'>-/* ena_remove - Device Removal Routine</div><div class='add'>+/* __ena_shutoff - Helper used in both PCI remove/shutdown routines</div><div class='ctx'>  * @pdev: PCI device information struct</div><div class='add'>+ * @shutdown: Is it a shutdown operation? If false, means it is a removal</div><div class='ctx'>  *</div><div class='del'>- * ena_remove is called by the PCI subsystem to alert the driver</div><div class='del'>- * that it should release a PCI device.</div><div class='add'>+ * __ena_shutoff is a helper routine that does the real work on shutdown and</div><div class='add'>+ * removal paths; the difference between those paths is with regards to whether</div><div class='add'>+ * dettach or unregister the netdevice.</div><div class='ctx'>  */</div><div class='del'>-static void ena_remove(struct pci_dev *pdev)</div><div class='add'>+static void __ena_shutoff(struct pci_dev *pdev, bool shutdown)</div><div class='ctx'> {</div><div class='ctx'> 	struct ena_adapter *adapter = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct ena_com_dev *ena_dev;</div><div class='hunk'>@@ -3498,23 +4143,32 @@ static void ena_remove(struct pci_dev *pdev)</div><div class='ctx'> 	ena_dev = adapter-&gt;ena_dev;</div><div class='ctx'> 	netdev = adapter-&gt;netdev;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	if ((adapter-&gt;msix_vecs &gt;= 1) &amp;&amp; (netdev-&gt;rx_cpu_rmap)) {</div><div class='del'>-		free_irq_cpu_rmap(netdev-&gt;rx_cpu_rmap);</div><div class='del'>-		netdev-&gt;rx_cpu_rmap = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif /* CONFIG_RFS_ACCEL */</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;timer_service);</div><div class='add'>+	ena_debugfs_terminate(netdev);</div><div class='ctx'> </div><div class='add'>+	/* Make sure timer and reset routine won't be called after</div><div class='add'>+	 * freeing device resources.</div><div class='add'>+	 */</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;timer_service);</div><div class='ctx'> 	cancel_work_sync(&amp;adapter-&gt;reset_task);</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	rtnl_lock(); /* lock released inside the below if-else block */</div><div class='add'>+	adapter-&gt;reset_reason = ENA_REGS_RESET_SHUTDOWN;</div><div class='ctx'> 	ena_destroy_device(adapter, true);</div><div class='del'>-	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	unregister_netdev(netdev);</div><div class='add'>+	ena_phc_free(adapter);</div><div class='ctx'> </div><div class='del'>-	free_netdev(netdev);</div><div class='add'>+	ena_devlink_unregister(adapter-&gt;devlink);</div><div class='add'>+	ena_devlink_free(adapter-&gt;devlink);</div><div class='add'>+</div><div class='add'>+	if (shutdown) {</div><div class='add'>+		netif_device_detach(netdev);</div><div class='add'>+		dev_close(netdev);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	} else {</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		unregister_netdev(netdev);</div><div class='add'>+		free_netdev(netdev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ena_com_rss_destroy(ena_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3522,32 +4176,53 @@ static void ena_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ena_com_delete_host_info(ena_dev);</div><div class='ctx'> </div><div class='add'>+	ena_com_delete_customer_metrics_buffer(ena_dev);</div><div class='add'>+</div><div class='ctx'> 	ena_release_bars(ena_dev, pdev);</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	ena_com_destroy_interrupt_moderation(ena_dev);</div><div class='del'>-</div><div class='ctx'> 	vfree(ena_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/* ena_suspend - PM suspend callback</div><div class='add'>+/* ena_remove - Device Removal Routine</div><div class='add'>+ * @pdev: PCI device information struct</div><div class='add'>+ *</div><div class='add'>+ * ena_remove is called by the PCI subsystem to alert the driver</div><div class='add'>+ * that it should release a PCI device.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void ena_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	__ena_shutoff(pdev, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ena_shutdown - Device Shutdown Routine</div><div class='ctx'>  * @pdev: PCI device information struct</div><div class='del'>- * @state:power state</div><div class='add'>+ *</div><div class='add'>+ * ena_shutdown is called by the PCI subsystem to alert the driver that</div><div class='add'>+ * a shutdown/reboot (or kexec) is happening and device must be disabled.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void ena_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	__ena_shutoff(pdev, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ena_suspend - PM suspend callback</div><div class='add'>+ * @dev_d: Device information struct</div><div class='ctx'>  */</div><div class='del'>-static int ena_suspend(struct pci_dev *pdev,  pm_message_t state)</div><div class='add'>+static int __maybe_unused ena_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='ctx'> 	struct ena_adapter *adapter = pci_get_drvdata(pdev);</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-	adapter-&gt;dev_stats.suspend++;</div><div class='del'>-	u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;adapter-&gt;dev_stats.suspend, 1, &amp;adapter-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	if (unlikely(test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags))) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-			"ignoring device reset request as the device is being suspended\n");</div><div class='add'>+			"Ignoring device reset request as the device is being suspended\n");</div><div class='ctx'> 		clear_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	ena_destroy_device(adapter, true);</div><div class='hunk'>@@ -3556,40 +4231,36 @@ static int ena_suspend(struct pci_dev *pdev,  pm_message_t state)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ena_resume - PM resume callback</div><div class='del'>- * @pdev: PCI device information struct</div><div class='del'>- *</div><div class='add'>+ * @dev_d: Device information struct</div><div class='ctx'>  */</div><div class='del'>-static int ena_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused ena_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct ena_adapter *adapter = pci_get_drvdata(pdev);</div><div class='add'>+	struct ena_adapter *adapter = dev_get_drvdata(dev_d);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='del'>-	adapter-&gt;dev_stats.resume++;</div><div class='del'>-	u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='add'>+	ena_increase_stat(&amp;adapter-&gt;dev_stats.resume, 1, &amp;adapter-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	rc = ena_restore_device(adapter);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(ena_pm_ops, ena_suspend, ena_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver ena_pci_driver = {</div><div class='ctx'> 	.name		= DRV_MODULE_NAME,</div><div class='ctx'> 	.id_table	= ena_pci_tbl,</div><div class='ctx'> 	.probe		= ena_probe,</div><div class='ctx'> 	.remove		= ena_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend    = ena_suspend,</div><div class='del'>-	.resume     = ena_resume,</div><div class='del'>-#endif</div><div class='add'>+	.shutdown	= ena_shutdown,</div><div class='add'>+	.driver.pm	= &amp;ena_pm_ops,</div><div class='ctx'> 	.sriov_configure = pci_sriov_configure_simple,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init ena_init(void)</div><div class='ctx'> {</div><div class='del'>-	pr_info("%s", version);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ena_wq = create_singlethread_workqueue(DRV_MODULE_NAME);</div><div class='ctx'> 	if (!ena_wq) {</div><div class='hunk'>@@ -3597,7 +4268,11 @@ static int __init ena_init(void)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return pci_register_driver(&amp;ena_pci_driver);</div><div class='add'>+	ret = pci_register_driver(&amp;ena_pci_driver);</div><div class='add'>+	if (ret)</div><div class='add'>+		destroy_workqueue(ena_wq);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit ena_cleanup(void)</div><div class='hunk'>@@ -3626,7 +4301,7 @@ static void ena_update_on_link_change(void *adapter_data,</div><div class='ctx'> 		ENA_ADMIN_AENQ_LINK_CHANGE_DESC_LINK_STATUS_MASK;</div><div class='ctx'> </div><div class='ctx'> 	if (status) {</div><div class='del'>-		netdev_dbg(adapter-&gt;netdev, "%s\n", __func__);</div><div class='add'>+		netif_dbg(adapter, ifup, adapter-&gt;netdev, "%s\n", __func__);</div><div class='ctx'> 		set_bit(ENA_FLAG_LINK_UP, &amp;adapter-&gt;flags);</div><div class='ctx'> 		if (!test_bit(ENA_FLAG_ONGOING_RESET, &amp;adapter-&gt;flags))</div><div class='ctx'> 			netif_carrier_on(adapter-&gt;netdev);</div><div class='hunk'>@@ -3642,14 +4317,20 @@ static void ena_keep_alive_wd(void *adapter_data,</div><div class='ctx'> 	struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;</div><div class='ctx'> 	struct ena_admin_aenq_keep_alive_desc *desc;</div><div class='ctx'> 	u64 rx_drops;</div><div class='add'>+	u64 tx_drops;</div><div class='ctx'> </div><div class='ctx'> 	desc = (struct ena_admin_aenq_keep_alive_desc *)aenq_e;</div><div class='ctx'> 	adapter-&gt;last_keep_alive_jiffies = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	rx_drops = ((u64)desc-&gt;rx_drops_high &lt;&lt; 32) | desc-&gt;rx_drops_low;</div><div class='add'>+	tx_drops = ((u64)desc-&gt;tx_drops_high &lt;&lt; 32) | desc-&gt;tx_drops_low;</div><div class='ctx'> </div><div class='ctx'> 	u64_stats_update_begin(&amp;adapter-&gt;syncp);</div><div class='add'>+	/* These stats are accumulated by the device, so the counters indicate</div><div class='add'>+	 * all drops since last reset.</div><div class='add'>+	 */</div><div class='ctx'> 	adapter-&gt;dev_stats.rx_drops = rx_drops;</div><div class='add'>+	adapter-&gt;dev_stats.tx_drops = tx_drops;</div><div class='ctx'> 	u64_stats_update_end(&amp;adapter-&gt;syncp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3664,7 +4345,7 @@ static void ena_notification(void *adapter_data,</div><div class='ctx'> 	     aenq_e-&gt;aenq_common_desc.group,</div><div class='ctx'> 	     ENA_ADMIN_NOTIFICATION);</div><div class='ctx'> </div><div class='del'>-	switch (aenq_e-&gt;aenq_common_desc.syndrom) {</div><div class='add'>+	switch (aenq_e-&gt;aenq_common_desc.syndrome) {</div><div class='ctx'> 	case ENA_ADMIN_UPDATE_HINTS:</div><div class='ctx'> 		hints = (struct ena_admin_ena_hw_hints *)</div><div class='ctx'> 			(&amp;aenq_e-&gt;inline_data_w4);</div><div class='hunk'>@@ -3673,7 +4354,7 @@ static void ena_notification(void *adapter_data,</div><div class='ctx'> 	default:</div><div class='ctx'> 		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='ctx'> 			  "Invalid aenq notification link state %d\n",</div><div class='del'>-			  aenq_e-&gt;aenq_common_desc.syndrom);</div><div class='add'>+			  aenq_e-&gt;aenq_common_desc.syndrome);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h<br/>index 63870072cbbd..006f9a3acea6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_netdev.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_netdev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_netdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_netdev.h</a></div><div class='hunk'>@@ -1,59 +1,31 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ENA_H</div><div class='ctx'> #define ENA_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;uapi/linux/bpf.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ena_com.h"</div><div class='ctx'> #include "ena_eth_com.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_MODULE_VER_MAJOR	2</div><div class='del'>-#define DRV_MODULE_VER_MINOR	0</div><div class='del'>-#define DRV_MODULE_VER_SUBMINOR 3</div><div class='add'>+#define DRV_MODULE_GEN_MAJOR	2</div><div class='add'>+#define DRV_MODULE_GEN_MINOR	1</div><div class='add'>+#define DRV_MODULE_GEN_SUBMINOR 0</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"ena"</div><div class='del'>-#ifndef DRV_MODULE_VERSION</div><div class='del'>-#define DRV_MODULE_VERSION \</div><div class='del'>-	__stringify(DRV_MODULE_VER_MAJOR) "."	\</div><div class='del'>-	__stringify(DRV_MODULE_VER_MINOR) "."	\</div><div class='del'>-	__stringify(DRV_MODULE_VER_SUBMINOR) "K"</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> #define DEVICE_NAME	"Elastic Network Adapter (ENA)"</div><div class='ctx'> </div><div class='hunk'>@@ -67,7 +39,7 @@</div><div class='ctx'>  * 16kB.</div><div class='ctx'>  */</div><div class='ctx'> #if PAGE_SIZE &gt; SZ_16K</div><div class='del'>-#define ENA_PAGE_SIZE SZ_16K</div><div class='add'>+#define ENA_PAGE_SIZE (_AC(SZ_16K, UL))</div><div class='ctx'> #else</div><div class='ctx'> #define ENA_PAGE_SIZE PAGE_SIZE</div><div class='ctx'> #endif</div><div class='hunk'>@@ -79,16 +51,15 @@</div><div class='ctx'> #define ENA_BAR_MASK (BIT(ENA_REG_BAR) | BIT(ENA_MEM_BAR))</div><div class='ctx'> </div><div class='ctx'> #define ENA_DEFAULT_RING_SIZE	(1024)</div><div class='add'>+#define ENA_MIN_RING_SIZE	(256)</div><div class='add'>+</div><div class='add'>+#define ENA_MIN_RX_BUF_SIZE (2048)</div><div class='add'>+</div><div class='add'>+#define ENA_MIN_NUM_IO_QUEUES	(1)</div><div class='ctx'> </div><div class='ctx'> #define ENA_TX_WAKEUP_THRESH		(MAX_SKB_FRAGS + 2)</div><div class='ctx'> #define ENA_DEFAULT_RX_COPYBREAK	(256 - NET_IP_ALIGN)</div><div class='ctx'> </div><div class='del'>-/* limit the buffer size to 600 bytes to handle MTU changes from very</div><div class='del'>- * small to very large, in which case the number of buffers per packet</div><div class='del'>- * could exceed ENA_PKT_MAX_BUFS</div><div class='del'>- */</div><div class='del'>-#define ENA_DEFAULT_MIN_RX_BUFF_ALLOC_SIZE 600</div><div class='del'>-</div><div class='ctx'> #define ENA_MIN_MTU		128</div><div class='ctx'> </div><div class='ctx'> #define ENA_NAME_MAX_LEN	20</div><div class='hunk'>@@ -99,8 +70,6 @@</div><div class='ctx'> #define ENA_RX_RSS_TABLE_LOG_SIZE  7</div><div class='ctx'> #define ENA_RX_RSS_TABLE_SIZE	(1 &lt;&lt; ENA_RX_RSS_TABLE_LOG_SIZE)</div><div class='ctx'> </div><div class='del'>-#define ENA_HASH_KEY_SIZE	40</div><div class='del'>-</div><div class='ctx'> /* The number of tx packet completions that will be handled each NAPI poll</div><div class='ctx'>  * cycle is ring_size / ENA_TX_POLL_BUDGET_DIVIDER.</div><div class='ctx'>  */</div><div class='hunk'>@@ -125,11 +94,15 @@</div><div class='ctx'> </div><div class='ctx'> #define ENA_IO_TXQ_IDX(q)	(2 * (q))</div><div class='ctx'> #define ENA_IO_RXQ_IDX(q)	(2 * (q) + 1)</div><div class='add'>+#define ENA_IO_TXQ_IDX_TO_COMBINED_IDX(q)	((q) / 2)</div><div class='add'>+#define ENA_IO_RXQ_IDX_TO_COMBINED_IDX(q)	(((q) - 1) / 2)</div><div class='ctx'> </div><div class='ctx'> #define ENA_MGMNT_IRQ_IDX		0</div><div class='ctx'> #define ENA_IO_IRQ_FIRST_IDX		1</div><div class='ctx'> #define ENA_IO_IRQ_IDX(q)		(ENA_IO_IRQ_FIRST_IDX + (q))</div><div class='ctx'> </div><div class='add'>+#define ENA_ADMIN_POLL_DELAY_US 100</div><div class='add'>+</div><div class='ctx'> /* ENA device should send keep alive msg every 1 sec.</div><div class='ctx'>  * We wait for 6 sec just to be on the safe side.</div><div class='ctx'>  */</div><div class='hunk'>@@ -138,6 +111,8 @@</div><div class='ctx'> </div><div class='ctx'> #define ENA_MMIO_DISABLE_REG_READ	BIT(0)</div><div class='ctx'> </div><div class='add'>+struct ena_phc_info;</div><div class='add'>+</div><div class='ctx'> struct ena_irq {</div><div class='ctx'> 	irq_handler_t handler;</div><div class='ctx'> 	void *data;</div><div class='hunk'>@@ -148,14 +123,23 @@ struct ena_irq {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_napi {</div><div class='del'>-	struct napi_struct napi ____cacheline_aligned;</div><div class='add'>+	u8 first_interrupt ____cacheline_aligned;</div><div class='add'>+	u8 interrupts_masked;</div><div class='add'>+	struct napi_struct napi;</div><div class='ctx'> 	struct ena_ring *tx_ring;</div><div class='ctx'> 	struct ena_ring *rx_ring;</div><div class='ctx'> 	u32 qid;</div><div class='add'>+	struct dim dim;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_tx_buffer {</div><div class='del'>-	struct sk_buff *skb;</div><div class='add'>+	union {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		/* XDP buffer structure which is used for sending packets in</div><div class='add'>+		 * the xdp queues</div><div class='add'>+		 */</div><div class='add'>+		struct xdp_frame *xdpf;</div><div class='add'>+	};</div><div class='ctx'> 	/* num of ena desc for this specific skb</div><div class='ctx'> 	 * (includes data desc and metadata desc)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -163,11 +147,14 @@ struct ena_tx_buffer {</div><div class='ctx'> 	/* num of buffers used by this skb */</div><div class='ctx'> 	u32 num_of_bufs;</div><div class='ctx'> </div><div class='add'>+	/* Total size of all buffers in bytes */</div><div class='add'>+	u32 total_tx_size;</div><div class='add'>+</div><div class='ctx'> 	/* Indicate if bufs[0] map the linear data of the skb. */</div><div class='ctx'> 	u8 map_linear_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Used for detect missing tx packets to limit the number of prints */</div><div class='del'>-	u32 print_once;</div><div class='add'>+	u8 print_once;</div><div class='ctx'> 	/* Save the last jiffies to detect missing tx packets</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * sets to non zero value on ena_start_xmit and set to zero on</div><div class='hunk'>@@ -184,7 +171,9 @@ struct ena_tx_buffer {</div><div class='ctx'> struct ena_rx_buffer {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct page *page;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='ctx'> 	u32 page_offset;</div><div class='add'>+	u32 buf_offset;</div><div class='ctx'> 	struct ena_com_buf ena_buf;</div><div class='ctx'> } ____cacheline_aligned;</div><div class='ctx'> </div><div class='hunk'>@@ -203,31 +192,37 @@ struct ena_stats_tx {</div><div class='ctx'> 	u64 bad_req_id;</div><div class='ctx'> 	u64 llq_buffer_copy;</div><div class='ctx'> 	u64 missed_tx;</div><div class='add'>+	u64 unmask_interrupt;</div><div class='add'>+	u64 last_napi_jiffies;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_stats_rx {</div><div class='ctx'> 	u64 cnt;</div><div class='ctx'> 	u64 bytes;</div><div class='add'>+	u64 rx_copybreak_pkt;</div><div class='add'>+	u64 csum_good;</div><div class='ctx'> 	u64 refil_partial;</div><div class='del'>-	u64 bad_csum;</div><div class='add'>+	u64 csum_bad;</div><div class='ctx'> 	u64 page_alloc_fail;</div><div class='ctx'> 	u64 skb_alloc_fail;</div><div class='ctx'> 	u64 dma_mapping_err;</div><div class='ctx'> 	u64 bad_desc_num;</div><div class='del'>-	u64 rx_copybreak_pkt;</div><div class='ctx'> 	u64 bad_req_id;</div><div class='ctx'> 	u64 empty_rx_ring;</div><div class='ctx'> 	u64 csum_unchecked;</div><div class='add'>+	u64 xdp_aborted;</div><div class='add'>+	u64 xdp_drop;</div><div class='add'>+	u64 xdp_pass;</div><div class='add'>+	u64 xdp_tx;</div><div class='add'>+	u64 xdp_invalid;</div><div class='add'>+	u64 xdp_redirect;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ena_ring {</div><div class='del'>-	union {</div><div class='del'>-		/* Holds the empty requests for TX/RX</div><div class='del'>-		 * out of order completions</div><div class='del'>-		 */</div><div class='del'>-		u16 *free_tx_ids;</div><div class='del'>-		u16 *free_rx_ids;</div><div class='del'>-	};</div><div class='add'>+	/* Holds the empty requests for TX/RX</div><div class='add'>+	 * out of order completions</div><div class='add'>+	 */</div><div class='add'>+	u16 *free_ids;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ena_tx_buffer *tx_buffer_info;</div><div class='hunk'>@@ -243,10 +238,18 @@ struct ena_ring {</div><div class='ctx'> 	struct ena_adapter *adapter;</div><div class='ctx'> 	struct ena_com_io_cq *ena_com_io_cq;</div><div class='ctx'> 	struct ena_com_io_sq *ena_com_io_sq;</div><div class='add'>+	struct bpf_prog *xdp_bpf_prog;</div><div class='add'>+	struct xdp_rxq_info xdp_rxq;</div><div class='add'>+	spinlock_t xdp_tx_lock;	/* synchronize XDP TX/Redirect traffic */</div><div class='add'>+	/* Used for rx queues only to point to the xdp tx ring, to</div><div class='add'>+	 * which traffic should be redirected from this rx ring.</div><div class='add'>+	 */</div><div class='add'>+	struct ena_ring *xdp_ring;</div><div class='ctx'> </div><div class='ctx'> 	u16 next_to_use;</div><div class='ctx'> 	u16 next_to_clean;</div><div class='ctx'> 	u16 rx_copybreak;</div><div class='add'>+	u16 rx_headroom;</div><div class='ctx'> 	u16 qid;</div><div class='ctx'> 	u16 mtu;</div><div class='ctx'> 	u16 sgl_size;</div><div class='hunk'>@@ -254,12 +257,14 @@ struct ena_ring {</div><div class='ctx'> 	/* The maximum header length the device can handle */</div><div class='ctx'> 	u8 tx_max_header_size;</div><div class='ctx'> </div><div class='del'>-	bool first_interrupt;</div><div class='add'>+	bool disable_meta_caching;</div><div class='ctx'> 	u16 no_interrupt_event_cnt;</div><div class='ctx'> </div><div class='del'>-	/* cpu for TPH */</div><div class='add'>+	/* cpu and NUMA for TPH */</div><div class='ctx'> 	int cpu;</div><div class='del'>-	 /* number of tx/rx_buffer_info's entries */</div><div class='add'>+	int numa_node;</div><div class='add'>+</div><div class='add'>+	/* number of tx/rx_buffer_info's entries */</div><div class='ctx'> 	int ring_size;</div><div class='ctx'> </div><div class='ctx'> 	enum ena_admin_placement_policy_type tx_mem_queue_type;</div><div class='hunk'>@@ -267,8 +272,7 @@ struct ena_ring {</div><div class='ctx'> 	struct ena_com_rx_buf_info ena_bufs[ENA_PKT_MAX_BUFS];</div><div class='ctx'> 	u32  smoothed_interval;</div><div class='ctx'> 	u32  per_napi_packets;</div><div class='del'>-	u32  per_napi_bytes;</div><div class='del'>-	enum ena_intr_moder_level moder_tbl_idx;</div><div class='add'>+	u16 non_empty_napi_events;</div><div class='ctx'> 	struct u64_stats_sync syncp;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct ena_stats_tx tx_stats;</div><div class='hunk'>@@ -288,6 +292,8 @@ struct ena_stats_dev {</div><div class='ctx'> 	u64 interface_down;</div><div class='ctx'> 	u64 admin_q_pause;</div><div class='ctx'> 	u64 rx_drops;</div><div class='add'>+	u64 tx_drops;</div><div class='add'>+	u64 reset_fail;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum ena_flags_t {</div><div class='hunk'>@@ -312,20 +318,29 @@ struct ena_adapter {</div><div class='ctx'> 	u32 rx_copybreak;</div><div class='ctx'> 	u32 max_mtu;</div><div class='ctx'> </div><div class='del'>-	int num_queues;</div><div class='add'>+	u32 num_io_queues;</div><div class='add'>+	u32 max_num_io_queues;</div><div class='ctx'> </div><div class='ctx'> 	int msix_vecs;</div><div class='ctx'> </div><div class='ctx'> 	u32 missing_tx_completion_threshold;</div><div class='ctx'> </div><div class='del'>-	u32 tx_usecs, rx_usecs; /* interrupt moderation */</div><div class='del'>-	u32 tx_frames, rx_frames; /* interrupt moderation */</div><div class='add'>+	u32 requested_tx_ring_size;</div><div class='add'>+	u32 requested_rx_ring_size;</div><div class='ctx'> </div><div class='del'>-	u32 tx_ring_size;</div><div class='del'>-	u32 rx_ring_size;</div><div class='add'>+	u32 max_tx_ring_size;</div><div class='add'>+	u32 max_rx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 	u32 msg_enable;</div><div class='ctx'> </div><div class='add'>+	/* large_llq_header_enabled is used for two purposes:</div><div class='add'>+	 * 1. Indicates that large LLQ has been requested.</div><div class='add'>+	 * 2. Indicates whether large LLQ is set or not after device</div><div class='add'>+	 *    initialization / configuration.</div><div class='add'>+	 */</div><div class='add'>+	bool large_llq_header_enabled;</div><div class='add'>+	bool large_llq_header_supported;</div><div class='add'>+</div><div class='ctx'> 	u16 max_tx_sgl_size;</div><div class='ctx'> 	u16 max_rx_sgl_size;</div><div class='ctx'> </div><div class='hunk'>@@ -336,6 +351,8 @@ struct ena_adapter {</div><div class='ctx'> </div><div class='ctx'> 	char name[ENA_NAME_MAX_LEN];</div><div class='ctx'> </div><div class='add'>+	struct ena_phc_info *phc_info;</div><div class='add'>+</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	/* TX */</div><div class='ctx'> 	struct ena_ring tx_ring[ENA_MAX_NUM_IO_QUEUES]</div><div class='hunk'>@@ -355,15 +372,29 @@ struct ena_adapter {</div><div class='ctx'> </div><div class='ctx'> 	bool wd_state;</div><div class='ctx'> 	bool dev_up_before_reset;</div><div class='add'>+	bool disable_meta_caching;</div><div class='ctx'> 	unsigned long last_keep_alive_jiffies;</div><div class='ctx'> </div><div class='ctx'> 	struct u64_stats_sync syncp;</div><div class='ctx'> 	struct ena_stats_dev dev_stats;</div><div class='add'>+	struct ena_admin_eni_stats eni_stats;</div><div class='add'>+	struct ena_admin_ena_srd_info ena_srd_info;</div><div class='ctx'> </div><div class='ctx'> 	/* last queue index that was checked for uncompleted tx packets */</div><div class='ctx'> 	u32 last_monitored_tx_qid;</div><div class='ctx'> </div><div class='ctx'> 	enum ena_regs_reset_reason_types reset_reason;</div><div class='add'>+</div><div class='add'>+	struct bpf_prog *xdp_bpf_prog;</div><div class='add'>+	u32 xdp_first_ring;</div><div class='add'>+	u32 xdp_num_queues;</div><div class='add'>+</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	struct devlink_port devlink_port;</div><div class='add'>+#ifdef CONFIG_DEBUG_FS</div><div class='add'>+</div><div class='add'>+	struct dentry *debugfs_base;</div><div class='add'>+#endif /* CONFIG_DEBUG_FS */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void ena_set_ethtool_ops(struct net_device *netdev);</div><div class='hunk'>@@ -372,6 +403,67 @@ void ena_dump_stats_to_dmesg(struct ena_adapter *adapter);</div><div class='ctx'> </div><div class='ctx'> void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+int ena_update_queue_params(struct ena_adapter *adapter,</div><div class='add'>+			    u32 new_tx_size,</div><div class='add'>+			    u32 new_rx_size,</div><div class='add'>+			    u32 new_llq_header_len);</div><div class='add'>+</div><div class='add'>+int ena_update_queue_count(struct ena_adapter *adapter, u32 new_channel_count);</div><div class='add'>+</div><div class='add'>+int ena_set_rx_copybreak(struct ena_adapter *adapter, u32 rx_copybreak);</div><div class='add'>+</div><div class='ctx'> int ena_get_sset_count(struct net_device *netdev, int sset);</div><div class='ctx'> </div><div class='add'>+static inline void ena_reset_device(struct ena_adapter *adapter,</div><div class='add'>+				    enum ena_regs_reset_reason_types reset_reason)</div><div class='add'>+{</div><div class='add'>+	adapter-&gt;reset_reason = reset_reason;</div><div class='add'>+	/* Make sure reset reason is set before triggering the reset */</div><div class='add'>+	smp_mb__before_atomic();</div><div class='add'>+	set_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_destroy_device(struct ena_adapter *adapter, bool graceful);</div><div class='add'>+int ena_restore_device(struct ena_adapter *adapter);</div><div class='add'>+int handle_invalid_req_id(struct ena_ring *ring, u16 req_id,</div><div class='add'>+			  struct ena_tx_buffer *tx_info, bool is_xdp);</div><div class='add'>+</div><div class='add'>+/* Increase a stat by cnt while holding syncp seqlock on 32bit machines */</div><div class='add'>+static inline void ena_increase_stat(u64 *statp, u64 cnt,</div><div class='add'>+				     struct u64_stats_sync *syncp)</div><div class='add'>+{</div><div class='add'>+	u64_stats_update_begin(syncp);</div><div class='add'>+	(*statp) += cnt;</div><div class='add'>+	u64_stats_update_end(syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void ena_ring_tx_doorbell(struct ena_ring *tx_ring)</div><div class='add'>+{</div><div class='add'>+	ena_com_write_sq_doorbell(tx_ring-&gt;ena_com_io_sq);</div><div class='add'>+	ena_increase_stat(&amp;tx_ring-&gt;tx_stats.doorbells, 1, &amp;tx_ring-&gt;syncp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_xmit_common(struct ena_adapter *adapter,</div><div class='add'>+		    struct ena_ring *ring,</div><div class='add'>+		    struct ena_tx_buffer *tx_info,</div><div class='add'>+		    struct ena_com_tx_ctx *ena_tx_ctx,</div><div class='add'>+		    u16 next_to_use,</div><div class='add'>+		    u32 bytes);</div><div class='add'>+void ena_unmap_tx_buff(struct ena_ring *tx_ring,</div><div class='add'>+		       struct ena_tx_buffer *tx_info);</div><div class='add'>+void ena_init_io_rings(struct ena_adapter *adapter,</div><div class='add'>+		       int first_index, int count);</div><div class='add'>+int ena_create_io_tx_queues_in_range(struct ena_adapter *adapter,</div><div class='add'>+				     int first_index, int count);</div><div class='add'>+int ena_setup_tx_resources_in_range(struct ena_adapter *adapter,</div><div class='add'>+				    int first_index, int count);</div><div class='add'>+void ena_free_all_io_tx_resources_in_range(struct ena_adapter *adapter,</div><div class='add'>+					   int first_index, int count);</div><div class='add'>+void ena_free_all_io_tx_resources(struct ena_adapter *adapter);</div><div class='add'>+void ena_down(struct ena_adapter *adapter);</div><div class='add'>+int ena_up(struct ena_adapter *adapter);</div><div class='add'>+void ena_unmask_interrupt(struct ena_ring *tx_ring, struct ena_ring *rx_ring);</div><div class='add'>+void ena_update_ring_numa_node(struct ena_ring *tx_ring,</div><div class='add'>+			       struct ena_ring *rx_ring);</div><div class='ctx'> #endif /* !(ENA_H) */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h b/drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h<br/>index f80d2a47fa94..3ecdf29160ca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_pci_id_tbl.h</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef ENA_PCI_ID_TBL_H_</div><div class='hunk'>@@ -53,10 +26,15 @@</div><div class='ctx'> #define PCI_DEV_ID_ENA_LLQ_VF	0xec21</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef PCI_DEV_ID_ENA_RESRV0</div><div class='add'>+#define PCI_DEV_ID_ENA_RESRV0	0x0051</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define ENA_PCI_ID_TABLE_ENTRY(devid) \</div><div class='ctx'> 	{PCI_DEVICE(PCI_VENDOR_ID_AMAZON, devid)},</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id ena_pci_tbl[] = {</div><div class='add'>+	ENA_PCI_ID_TABLE_ENTRY(PCI_DEV_ID_ENA_RESRV0)</div><div class='ctx'> 	ENA_PCI_ID_TABLE_ENTRY(PCI_DEV_ID_ENA_PF)</div><div class='ctx'> 	ENA_PCI_ID_TABLE_ENTRY(PCI_DEV_ID_ENA_LLQ_PF)</div><div class='ctx'> 	ENA_PCI_ID_TABLE_ENTRY(PCI_DEV_ID_ENA_VF)</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_phc.c b/drivers/net/ethernet/amazon/ena/ena_phc.c<br/>new file mode 100644<br/>index 000000000000..7867e893fd15<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_phc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_phc.c</a></div><div class='hunk'>@@ -0,0 +1,233 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015-2022 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include "ena_netdev.h"</div><div class='add'>+#include "ena_phc.h"</div><div class='add'>+#include "ena_devlink.h"</div><div class='add'>+</div><div class='add'>+static int ena_phc_adjtime(struct ptp_clock_info *clock_info, s64 delta)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_phc_adjfine(struct ptp_clock_info *clock_info, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_phc_feature_enable(struct ptp_clock_info *clock_info,</div><div class='add'>+				  struct ptp_clock_request *rq,</div><div class='add'>+				  int on)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_phc_gettimex64(struct ptp_clock_info *clock_info,</div><div class='add'>+			      struct timespec64 *ts,</div><div class='add'>+			      struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	struct ena_phc_info *phc_info =</div><div class='add'>+		container_of(clock_info, struct ena_phc_info, clock_info);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 timestamp_nsec;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;phc_info-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	ptp_read_system_prets(sts);</div><div class='add'>+</div><div class='add'>+	rc = ena_com_phc_get_timestamp(phc_info-&gt;adapter-&gt;ena_dev,</div><div class='add'>+				       &amp;timestamp_nsec);</div><div class='add'>+</div><div class='add'>+	ptp_read_system_postts(sts);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;phc_info-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(timestamp_nsec);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_phc_settime64(struct ptp_clock_info *clock_info,</div><div class='add'>+			     const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ptp_clock_info ena_ptp_clock_info = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.n_alarm	= 0,</div><div class='add'>+	.n_ext_ts	= 0,</div><div class='add'>+	.n_per_out	= 0,</div><div class='add'>+	.pps		= 0,</div><div class='add'>+	.adjtime	= ena_phc_adjtime,</div><div class='add'>+	.adjfine	= ena_phc_adjfine,</div><div class='add'>+	.gettimex64	= ena_phc_gettimex64,</div><div class='add'>+	.settime64	= ena_phc_settime64,</div><div class='add'>+	.enable		= ena_phc_feature_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Enable/Disable PHC by the kernel, affects on the next init flow */</div><div class='add'>+void ena_phc_enable(struct ena_adapter *adapter, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ena_phc_info *phc_info = adapter-&gt;phc_info;</div><div class='add'>+</div><div class='add'>+	if (!phc_info) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "phc_info is not allocated\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phc_info-&gt;enabled = enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if PHC is enabled by the kernel */</div><div class='add'>+bool ena_phc_is_enabled(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct ena_phc_info *phc_info = adapter-&gt;phc_info;</div><div class='add'>+</div><div class='add'>+	return (phc_info &amp;&amp; phc_info-&gt;enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PHC is activated if ptp clock is registered in the kernel */</div><div class='add'>+bool ena_phc_is_active(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct ena_phc_info *phc_info = adapter-&gt;phc_info;</div><div class='add'>+</div><div class='add'>+	return (phc_info &amp;&amp; phc_info-&gt;clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_phc_register(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='add'>+	struct ptp_clock_info *clock_info;</div><div class='add'>+	struct ena_phc_info *phc_info;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	phc_info = adapter-&gt;phc_info;</div><div class='add'>+	clock_info = &amp;phc_info-&gt;clock_info;</div><div class='add'>+</div><div class='add'>+	/* PHC may already be registered in case of a reset */</div><div class='add'>+	if (ena_phc_is_active(adapter))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	phc_info-&gt;adapter = adapter;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;phc_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* Fill the ptp_clock_info struct and register PTP clock */</div><div class='add'>+	*clock_info = ena_ptp_clock_info;</div><div class='add'>+	snprintf(clock_info-&gt;name,</div><div class='add'>+		 sizeof(clock_info-&gt;name),</div><div class='add'>+		 "ena-ptp-%02x",</div><div class='add'>+		 PCI_SLOT(pdev-&gt;devfn));</div><div class='add'>+</div><div class='add'>+	phc_info-&gt;clock = ptp_clock_register(clock_info, &amp;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(phc_info-&gt;clock)) {</div><div class='add'>+		rc = PTR_ERR(phc_info-&gt;clock);</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "Failed registering ptp clock, error: %d\n",</div><div class='add'>+			   rc);</div><div class='add'>+		phc_info-&gt;clock = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_phc_unregister(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct ena_phc_info *phc_info = adapter-&gt;phc_info;</div><div class='add'>+</div><div class='add'>+	/* During reset flow, PHC must stay registered</div><div class='add'>+	 * to keep kernel's PHC index</div><div class='add'>+	 */</div><div class='add'>+	if (ena_phc_is_active(adapter) &amp;&amp;</div><div class='add'>+	    !test_bit(ENA_FLAG_TRIGGER_RESET, &amp;adapter-&gt;flags)) {</div><div class='add'>+		ptp_clock_unregister(phc_info-&gt;clock);</div><div class='add'>+		phc_info-&gt;clock = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_phc_alloc(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	/* Allocate driver specific PHC info */</div><div class='add'>+	adapter-&gt;phc_info = vzalloc(sizeof(*adapter-&gt;phc_info));</div><div class='add'>+	if (unlikely(!adapter-&gt;phc_info)) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "Failed to alloc phc_info\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_phc_free(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;phc_info) {</div><div class='add'>+		vfree(adapter-&gt;phc_info);</div><div class='add'>+		adapter-&gt;phc_info = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_phc_init(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_dev *ena_dev = adapter-&gt;ena_dev;</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int rc = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Validate PHC feature is supported in the device */</div><div class='add'>+	if (!ena_com_phc_supported(ena_dev)) {</div><div class='add'>+		netdev_dbg(netdev, "PHC feature is not supported by the device\n");</div><div class='add'>+		goto err_ena_com_phc_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Validate PHC feature is enabled by the kernel */</div><div class='add'>+	if (!ena_phc_is_enabled(adapter)) {</div><div class='add'>+		netdev_dbg(netdev, "PHC feature is not enabled by the kernel\n");</div><div class='add'>+		goto err_ena_com_phc_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize device specific PHC info */</div><div class='add'>+	rc = ena_com_phc_init(ena_dev);</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		netdev_err(netdev, "Failed to init phc, error: %d\n", rc);</div><div class='add'>+		goto err_ena_com_phc_init;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure PHC feature in driver and device */</div><div class='add'>+	rc = ena_com_phc_config(ena_dev);</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		netdev_err(netdev, "Failed to config phc, error: %d\n", rc);</div><div class='add'>+		goto err_ena_com_phc_config;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register to PTP class driver */</div><div class='add'>+	rc = ena_phc_register(adapter);</div><div class='add'>+	if (unlikely(rc)) {</div><div class='add'>+		netdev_err(netdev, "Failed to register phc, error: %d\n", rc);</div><div class='add'>+		goto err_ena_com_phc_config;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_ena_com_phc_config:</div><div class='add'>+	ena_com_phc_destroy(ena_dev);</div><div class='add'>+err_ena_com_phc_init:</div><div class='add'>+	ena_phc_enable(adapter, false);</div><div class='add'>+	ena_devlink_disable_phc_param(adapter-&gt;devlink);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_phc_destroy(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	ena_phc_unregister(adapter);</div><div class='add'>+	ena_com_phc_destroy(adapter-&gt;ena_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_phc_get_index(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (ena_phc_is_active(adapter))</div><div class='add'>+		return ptp_clock_index(adapter-&gt;phc_info-&gt;clock);</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_phc.h b/drivers/net/ethernet/amazon/ena/ena_phc.h<br/>new file mode 100644<br/>index 000000000000..7364fe714e44<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_phc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_phc.h</a></div><div class='hunk'>@@ -0,0 +1,37 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015-2022 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ENA_PHC_H</div><div class='add'>+#define ENA_PHC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+</div><div class='add'>+struct ena_phc_info {</div><div class='add'>+	/* PTP hardware capabilities */</div><div class='add'>+	struct ptp_clock_info clock_info;</div><div class='add'>+</div><div class='add'>+	/* Registered PTP clock device */</div><div class='add'>+	struct ptp_clock *clock;</div><div class='add'>+</div><div class='add'>+	/* Adapter specific private data structure */</div><div class='add'>+	struct ena_adapter *adapter;</div><div class='add'>+</div><div class='add'>+	/* PHC lock */</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+</div><div class='add'>+	/* Enabled by kernel */</div><div class='add'>+	bool enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void ena_phc_enable(struct ena_adapter *adapter, bool enable);</div><div class='add'>+bool ena_phc_is_enabled(struct ena_adapter *adapter);</div><div class='add'>+bool ena_phc_is_active(struct ena_adapter *adapter);</div><div class='add'>+int ena_phc_get_index(struct ena_adapter *adapter);</div><div class='add'>+int ena_phc_init(struct ena_adapter *adapter);</div><div class='add'>+void ena_phc_destroy(struct ena_adapter *adapter);</div><div class='add'>+int ena_phc_alloc(struct ena_adapter *adapter);</div><div class='add'>+void ena_phc_free(struct ena_adapter *adapter);</div><div class='add'>+</div><div class='add'>+#endif /* ENA_PHC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_regs_defs.h b/drivers/net/ethernet/amazon/ena/ena_regs_defs.h<br/>index 04fcafcc059c..51068dc1cc2a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_regs_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amazon/ena/ena_regs_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_regs_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_regs_defs.h</a></div><div class='hunk'>@@ -1,33 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='ctx'> /*</div><div class='del'>- * Copyright 2015 - 2016 Amazon.com, Inc. or its affiliates.</div><div class='del'>- *</div><div class='del'>- * This software is available to you under a choice of one of two</div><div class='del'>- * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='del'>- * General Public License (GPL) Version 2, available from the file</div><div class='del'>- * COPYING in the main directory of this source tree, or the</div><div class='del'>- * BSD license below:</div><div class='del'>- *</div><div class='del'>- *     Redistribution and use in source and binary forms, with or</div><div class='del'>- *     without modification, are permitted provided that the following</div><div class='del'>- *     conditions are met:</div><div class='del'>- *</div><div class='del'>- *      - Redistributions of source code must retain the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer.</div><div class='del'>- *</div><div class='del'>- *      - Redistributions in binary form must reproduce the above</div><div class='del'>- *        copyright notice, this list of conditions and the following</div><div class='del'>- *        disclaimer in the documentation and/or other materials</div><div class='del'>- *        provided with the distribution.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='add'>+ * Copyright 2015-2020 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _ENA_REGS_H_</div><div class='ctx'> #define _ENA_REGS_H_</div><div class='hunk'>@@ -48,6 +21,8 @@ enum ena_regs_reset_reason_types {</div><div class='ctx'> 	ENA_REGS_RESET_USER_TRIGGER                 = 12,</div><div class='ctx'> 	ENA_REGS_RESET_GENERIC                      = 13,</div><div class='ctx'> 	ENA_REGS_RESET_MISS_INTERRUPT               = 14,</div><div class='add'>+	ENA_REGS_RESET_SUSPECTED_POLL_STARVATION    = 15,</div><div class='add'>+	ENA_REGS_RESET_RX_DESCRIPTOR_MALFORMED	    = 16,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* ena_registers offsets */</div><div class='hunk'>@@ -78,6 +53,11 @@ enum ena_regs_reset_reason_types {</div><div class='ctx'> #define ENA_REGS_MMIO_RESP_HI_OFF                           0x64</div><div class='ctx'> #define ENA_REGS_RSS_IND_ENTRY_UPDATE_OFF                   0x68</div><div class='ctx'> </div><div class='add'>+/* phc_registers offsets */</div><div class='add'>+</div><div class='add'>+/* 100 base */</div><div class='add'>+#define ENA_REGS_PHC_DB_OFF                                 0x100</div><div class='add'>+</div><div class='ctx'> /* version register */</div><div class='ctx'> #define ENA_REGS_VERSION_MINOR_VERSION_MASK                 0xff</div><div class='ctx'> #define ENA_REGS_VERSION_MAJOR_VERSION_SHIFT                8</div><div class='hunk'>@@ -154,4 +134,7 @@ enum ena_regs_reset_reason_types {</div><div class='ctx'> #define ENA_REGS_RSS_IND_ENTRY_UPDATE_CQ_IDX_SHIFT          16</div><div class='ctx'> #define ENA_REGS_RSS_IND_ENTRY_UPDATE_CQ_IDX_MASK           0xffff0000</div><div class='ctx'> </div><div class='del'>-#endif /*_ENA_REGS_H_ */</div><div class='add'>+/* phc_db_req_id register */</div><div class='add'>+#define ENA_REGS_PHC_DB_REQ_ID_MASK                         0xffff</div><div class='add'>+</div><div class='add'>+#endif /* _ENA_REGS_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_xdp.c b/drivers/net/ethernet/amazon/ena/ena_xdp.c<br/>new file mode 100644<br/>index 000000000000..5b175e7e92a1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_xdp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_xdp.c</a></div><div class='hunk'>@@ -0,0 +1,469 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015-2021 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "ena_xdp.h"</div><div class='add'>+</div><div class='add'>+static int validate_xdp_req_id(struct ena_ring *tx_ring, u16 req_id)</div><div class='add'>+{</div><div class='add'>+	struct ena_tx_buffer *tx_info;</div><div class='add'>+</div><div class='add'>+	tx_info = &amp;tx_ring-&gt;tx_buffer_info[req_id];</div><div class='add'>+	if (likely(tx_info-&gt;xdpf))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return handle_invalid_req_id(tx_ring, req_id, tx_info, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_xdp_tx_map_frame(struct ena_ring *tx_ring,</div><div class='add'>+				struct ena_tx_buffer *tx_info,</div><div class='add'>+				struct xdp_frame *xdpf,</div><div class='add'>+				struct ena_com_tx_ctx *ena_tx_ctx)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = tx_ring-&gt;adapter;</div><div class='add'>+	struct ena_com_buf *ena_buf;</div><div class='add'>+	int push_len = 0;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	void *data;</div><div class='add'>+	u32 size;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;xdpf = xdpf;</div><div class='add'>+	data = tx_info-&gt;xdpf-&gt;data;</div><div class='add'>+	size = tx_info-&gt;xdpf-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (tx_ring-&gt;tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {</div><div class='add'>+		/* Designate part of the packet for LLQ */</div><div class='add'>+		push_len = min_t(u32, size, tx_ring-&gt;tx_max_header_size);</div><div class='add'>+</div><div class='add'>+		ena_tx_ctx-&gt;push_header = data;</div><div class='add'>+</div><div class='add'>+		size -= push_len;</div><div class='add'>+		data += push_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ena_tx_ctx-&gt;header_len = push_len;</div><div class='add'>+</div><div class='add'>+	if (size &gt; 0) {</div><div class='add'>+		dma = dma_map_single(tx_ring-&gt;dev,</div><div class='add'>+				     data,</div><div class='add'>+				     size,</div><div class='add'>+				     DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(tx_ring-&gt;dev, dma)))</div><div class='add'>+			goto error_report_dma_error;</div><div class='add'>+</div><div class='add'>+		tx_info-&gt;map_linear_data = 0;</div><div class='add'>+</div><div class='add'>+		ena_buf = tx_info-&gt;bufs;</div><div class='add'>+		ena_buf-&gt;paddr = dma;</div><div class='add'>+		ena_buf-&gt;len = size;</div><div class='add'>+</div><div class='add'>+		ena_tx_ctx-&gt;ena_bufs = ena_buf;</div><div class='add'>+		ena_tx_ctx-&gt;num_bufs = tx_info-&gt;num_of_bufs = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+error_report_dma_error:</div><div class='add'>+	ena_increase_stat(&amp;tx_ring-&gt;tx_stats.dma_mapping_err, 1,</div><div class='add'>+			  &amp;tx_ring-&gt;syncp);</div><div class='add'>+	netif_warn(adapter, tx_queued, adapter-&gt;netdev, "Failed to map xdp buff\n");</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_xdp_xmit_frame(struct ena_ring *tx_ring,</div><div class='add'>+		       struct ena_adapter *adapter,</div><div class='add'>+		       struct xdp_frame *xdpf,</div><div class='add'>+		       int flags)</div><div class='add'>+{</div><div class='add'>+	struct ena_com_tx_ctx ena_tx_ctx = {};</div><div class='add'>+	struct ena_tx_buffer *tx_info;</div><div class='add'>+	u16 next_to_use, req_id;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	next_to_use = tx_ring-&gt;next_to_use;</div><div class='add'>+	req_id = tx_ring-&gt;free_ids[next_to_use];</div><div class='add'>+	tx_info = &amp;tx_ring-&gt;tx_buffer_info[req_id];</div><div class='add'>+	tx_info-&gt;num_of_bufs = 0;</div><div class='add'>+</div><div class='add'>+	rc = ena_xdp_tx_map_frame(tx_ring, tx_info, xdpf, &amp;ena_tx_ctx);</div><div class='add'>+	if (unlikely(rc))</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	ena_tx_ctx.req_id = req_id;</div><div class='add'>+</div><div class='add'>+	rc = ena_xmit_common(adapter,</div><div class='add'>+			     tx_ring,</div><div class='add'>+			     tx_info,</div><div class='add'>+			     &amp;ena_tx_ctx,</div><div class='add'>+			     next_to_use,</div><div class='add'>+			     xdpf-&gt;len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto error_unmap_dma;</div><div class='add'>+</div><div class='add'>+	/* trigger the dma engine. ena_ring_tx_doorbell()</div><div class='add'>+	 * calls a memory barrier inside it.</div><div class='add'>+	 */</div><div class='add'>+	if (flags &amp; XDP_XMIT_FLUSH)</div><div class='add'>+		ena_ring_tx_doorbell(tx_ring);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+error_unmap_dma:</div><div class='add'>+	ena_unmap_tx_buff(tx_ring, tx_info);</div><div class='add'>+err:</div><div class='add'>+	tx_info-&gt;xdpf = NULL;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_xdp_xmit(struct net_device *dev, int n,</div><div class='add'>+		 struct xdp_frame **frames, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(dev);</div><div class='add'>+	struct ena_ring *tx_ring;</div><div class='add'>+	int qid, i, nxmit = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~XDP_XMIT_FLAGS_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags))</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	/* We assume that all rings have the same XDP program */</div><div class='add'>+	if (!READ_ONCE(adapter-&gt;rx_ring-&gt;xdp_bpf_prog))</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	qid = smp_processor_id() % adapter-&gt;xdp_num_queues;</div><div class='add'>+	qid += adapter-&gt;xdp_first_ring;</div><div class='add'>+	tx_ring = &amp;adapter-&gt;tx_ring[qid];</div><div class='add'>+</div><div class='add'>+	/* Other CPU ids might try to send thorugh this queue */</div><div class='add'>+	spin_lock(&amp;tx_ring-&gt;xdp_tx_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		if (ena_xdp_xmit_frame(tx_ring, adapter, frames[i], 0))</div><div class='add'>+			break;</div><div class='add'>+		nxmit++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ring doorbell to make device aware of the packets */</div><div class='add'>+	if (flags &amp; XDP_XMIT_FLUSH)</div><div class='add'>+		ena_ring_tx_doorbell(tx_ring);</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;tx_ring-&gt;xdp_tx_lock);</div><div class='add'>+</div><div class='add'>+	/* Return number of packets sent */</div><div class='add'>+	return nxmit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_init_all_xdp_queues(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	adapter-&gt;xdp_first_ring = adapter-&gt;num_io_queues;</div><div class='add'>+	adapter-&gt;xdp_num_queues = adapter-&gt;num_io_queues;</div><div class='add'>+</div><div class='add'>+	ena_init_io_rings(adapter,</div><div class='add'>+			  adapter-&gt;xdp_first_ring,</div><div class='add'>+			  adapter-&gt;xdp_num_queues);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ena_setup_and_create_all_xdp_queues(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 xdp_first_ring = adapter-&gt;xdp_first_ring;</div><div class='add'>+	u32 xdp_num_queues = adapter-&gt;xdp_num_queues;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	rc = ena_setup_tx_resources_in_range(adapter, xdp_first_ring, xdp_num_queues);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto setup_err;</div><div class='add'>+</div><div class='add'>+	rc = ena_create_io_tx_queues_in_range(adapter, xdp_first_ring, xdp_num_queues);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto create_err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+create_err:</div><div class='add'>+	ena_free_all_io_tx_resources_in_range(adapter, xdp_first_ring, xdp_num_queues);</div><div class='add'>+setup_err:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Provides a way for both kernel and bpf-prog to know</div><div class='add'>+ * more about the RX-queue a given XDP frame arrived on.</div><div class='add'>+ */</div><div class='add'>+int ena_xdp_register_rxq_info(struct ena_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = xdp_rxq_info_reg(&amp;rx_ring-&gt;xdp_rxq, rx_ring-&gt;netdev, rx_ring-&gt;qid, 0);</div><div class='add'>+</div><div class='add'>+	netif_dbg(rx_ring-&gt;adapter, ifup, rx_ring-&gt;netdev, "Registering RX info for queue %d",</div><div class='add'>+		  rx_ring-&gt;qid);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netif_err(rx_ring-&gt;adapter, ifup, rx_ring-&gt;netdev,</div><div class='add'>+			  "Failed to register xdp rx queue info. RX queue num %d rc: %d\n",</div><div class='add'>+			  rx_ring-&gt;qid, rc);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = xdp_rxq_info_reg_mem_model(&amp;rx_ring-&gt;xdp_rxq, MEM_TYPE_PAGE_SHARED, NULL);</div><div class='add'>+</div><div class='add'>+	if (rc) {</div><div class='add'>+		netif_err(rx_ring-&gt;adapter, ifup, rx_ring-&gt;netdev,</div><div class='add'>+			  "Failed to register xdp rx queue info memory model. RX queue num %d rc: %d\n",</div><div class='add'>+			  rx_ring-&gt;qid, rc);</div><div class='add'>+		xdp_rxq_info_unreg(&amp;rx_ring-&gt;xdp_rxq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_xdp_unregister_rxq_info(struct ena_ring *rx_ring)</div><div class='add'>+{</div><div class='add'>+	netif_dbg(rx_ring-&gt;adapter, ifdown, rx_ring-&gt;netdev,</div><div class='add'>+		  "Unregistering RX info for queue %d",</div><div class='add'>+		  rx_ring-&gt;qid);</div><div class='add'>+	xdp_rxq_info_unreg_mem_model(&amp;rx_ring-&gt;xdp_rxq);</div><div class='add'>+	xdp_rxq_info_unreg(&amp;rx_ring-&gt;xdp_rxq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void ena_xdp_exchange_program_rx_in_range(struct ena_adapter *adapter,</div><div class='add'>+					  struct bpf_prog *prog,</div><div class='add'>+					  int first, int count)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *old_bpf_prog;</div><div class='add'>+	struct ena_ring *rx_ring;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (i = first; i &lt; count; i++) {</div><div class='add'>+		rx_ring = &amp;adapter-&gt;rx_ring[i];</div><div class='add'>+		old_bpf_prog = xchg(&amp;rx_ring-&gt;xdp_bpf_prog, prog);</div><div class='add'>+</div><div class='add'>+		if (!old_bpf_prog &amp;&amp; prog) {</div><div class='add'>+			rx_ring-&gt;rx_headroom = XDP_PACKET_HEADROOM;</div><div class='add'>+		} else if (old_bpf_prog &amp;&amp; !prog) {</div><div class='add'>+			rx_ring-&gt;rx_headroom = NET_SKB_PAD;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ena_xdp_exchange_program(struct ena_adapter *adapter,</div><div class='add'>+				     struct bpf_prog *prog)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *old_bpf_prog = xchg(&amp;adapter-&gt;xdp_bpf_prog, prog);</div><div class='add'>+</div><div class='add'>+	ena_xdp_exchange_program_rx_in_range(adapter,</div><div class='add'>+					     prog,</div><div class='add'>+					     0,</div><div class='add'>+					     adapter-&gt;num_io_queues);</div><div class='add'>+</div><div class='add'>+	if (old_bpf_prog)</div><div class='add'>+		bpf_prog_put(old_bpf_prog);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_destroy_and_free_all_xdp_queues(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	bool was_up;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	was_up = test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if (was_up)</div><div class='add'>+		ena_down(adapter);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;xdp_first_ring = 0;</div><div class='add'>+	adapter-&gt;xdp_num_queues = 0;</div><div class='add'>+	ena_xdp_exchange_program(adapter, NULL);</div><div class='add'>+	if (was_up) {</div><div class='add'>+		rc = ena_up(adapter);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_xdp_set(struct net_device *netdev, struct netdev_bpf *bpf)</div><div class='add'>+{</div><div class='add'>+	struct ena_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct bpf_prog *prog = bpf-&gt;prog;</div><div class='add'>+	struct bpf_prog *old_bpf_prog;</div><div class='add'>+	int rc, prev_mtu;</div><div class='add'>+	bool is_up;</div><div class='add'>+</div><div class='add'>+	is_up = test_bit(ENA_FLAG_DEV_UP, &amp;adapter-&gt;flags);</div><div class='add'>+	rc = ena_xdp_allowed(adapter);</div><div class='add'>+	if (rc == ENA_XDP_ALLOWED) {</div><div class='add'>+		old_bpf_prog = adapter-&gt;xdp_bpf_prog;</div><div class='add'>+		if (prog) {</div><div class='add'>+			if (!is_up) {</div><div class='add'>+				ena_init_all_xdp_queues(adapter);</div><div class='add'>+			} else if (!old_bpf_prog) {</div><div class='add'>+				ena_down(adapter);</div><div class='add'>+				ena_init_all_xdp_queues(adapter);</div><div class='add'>+			}</div><div class='add'>+			ena_xdp_exchange_program(adapter, prog);</div><div class='add'>+</div><div class='add'>+			netif_dbg(adapter, drv, adapter-&gt;netdev, "Set a new XDP program\n");</div><div class='add'>+</div><div class='add'>+			if (is_up &amp;&amp; !old_bpf_prog) {</div><div class='add'>+				rc = ena_up(adapter);</div><div class='add'>+				if (rc)</div><div class='add'>+					return rc;</div><div class='add'>+			}</div><div class='add'>+			xdp_features_set_redirect_target(netdev, false);</div><div class='add'>+		} else if (old_bpf_prog) {</div><div class='add'>+			xdp_features_clear_redirect_target(netdev);</div><div class='add'>+			netif_dbg(adapter, drv, adapter-&gt;netdev, "Removing XDP program\n");</div><div class='add'>+</div><div class='add'>+			rc = ena_destroy_and_free_all_xdp_queues(adapter);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		prev_mtu = netdev-&gt;max_mtu;</div><div class='add'>+		netdev-&gt;max_mtu = prog ? ENA_XDP_MAX_MTU : adapter-&gt;max_mtu;</div><div class='add'>+</div><div class='add'>+		if (!old_bpf_prog)</div><div class='add'>+			netif_info(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+				   "XDP program is set, changing the max_mtu from %d to %d",</div><div class='add'>+				   prev_mtu, netdev-&gt;max_mtu);</div><div class='add'>+</div><div class='add'>+	} else if (rc == ENA_XDP_CURRENT_MTU_TOO_LARGE) {</div><div class='add'>+		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+			  "Failed to set xdp program, the current MTU (%d) is larger than the maximum allowed MTU (%lu) while xdp is on",</div><div class='add'>+			  netdev-&gt;mtu, ENA_XDP_MAX_MTU);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(bpf-&gt;extack,</div><div class='add'>+				   "Failed to set xdp program, the current MTU is larger than the maximum allowed MTU. Check the dmesg for more info");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (rc == ENA_XDP_NO_ENOUGH_QUEUES) {</div><div class='add'>+		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+			  "Failed to set xdp program, the Rx/Tx channel count should be at most half of the maximum allowed channel count. The current queue count (%d), the maximal queue count (%d)\n",</div><div class='add'>+			  adapter-&gt;num_io_queues, adapter-&gt;max_num_io_queues);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(bpf-&gt;extack,</div><div class='add'>+				   "Failed to set xdp program, there is no enough space for allocating XDP queues, Check the dmesg for more info");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is the main xdp callback, it's used by the kernel to set/unset the xdp</div><div class='add'>+ * program as well as to query the current xdp program id.</div><div class='add'>+ */</div><div class='add'>+int ena_xdp(struct net_device *netdev, struct netdev_bpf *bpf)</div><div class='add'>+{</div><div class='add'>+	switch (bpf-&gt;command) {</div><div class='add'>+	case XDP_SETUP_PROG:</div><div class='add'>+		return ena_xdp_set(netdev, bpf);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ena_clean_xdp_irq(struct ena_ring *tx_ring, u32 budget)</div><div class='add'>+{</div><div class='add'>+	u32 total_done = 0;</div><div class='add'>+	u16 next_to_clean;</div><div class='add'>+	int tx_pkts = 0;</div><div class='add'>+	u16 req_id;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!tx_ring))</div><div class='add'>+		return 0;</div><div class='add'>+	next_to_clean = tx_ring-&gt;next_to_clean;</div><div class='add'>+</div><div class='add'>+	while (tx_pkts &lt; budget) {</div><div class='add'>+		struct ena_tx_buffer *tx_info;</div><div class='add'>+		struct xdp_frame *xdpf;</div><div class='add'>+</div><div class='add'>+		rc = ena_com_tx_comp_req_id_get(tx_ring-&gt;ena_com_io_cq,</div><div class='add'>+						&amp;req_id);</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (unlikely(rc == -EINVAL))</div><div class='add'>+				handle_invalid_req_id(tx_ring, req_id, NULL, true);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* validate that the request id points to a valid xdp_frame */</div><div class='add'>+		rc = validate_xdp_req_id(tx_ring, req_id);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		tx_info = &amp;tx_ring-&gt;tx_buffer_info[req_id];</div><div class='add'>+</div><div class='add'>+		tx_info-&gt;last_jiffies = 0;</div><div class='add'>+</div><div class='add'>+		xdpf = tx_info-&gt;xdpf;</div><div class='add'>+		tx_info-&gt;xdpf = NULL;</div><div class='add'>+		ena_unmap_tx_buff(tx_ring, tx_info);</div><div class='add'>+		xdp_return_frame(xdpf);</div><div class='add'>+</div><div class='add'>+		tx_pkts++;</div><div class='add'>+		total_done += tx_info-&gt;tx_descs;</div><div class='add'>+		tx_ring-&gt;free_ids[next_to_clean] = req_id;</div><div class='add'>+		next_to_clean = ENA_TX_RING_IDX_NEXT(next_to_clean,</div><div class='add'>+						     tx_ring-&gt;ring_size);</div><div class='add'>+</div><div class='add'>+		netif_dbg(tx_ring-&gt;adapter, tx_done, tx_ring-&gt;netdev,</div><div class='add'>+			  "tx_poll: q %d pkt #%d req_id %d\n", tx_ring-&gt;qid, tx_pkts, req_id);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;next_to_clean = next_to_clean;</div><div class='add'>+	ena_com_comp_ack(tx_ring-&gt;ena_com_io_sq, total_done);</div><div class='add'>+</div><div class='add'>+	netif_dbg(tx_ring-&gt;adapter, tx_done, tx_ring-&gt;netdev,</div><div class='add'>+		  "tx_poll: q %d done. total pkts: %d\n",</div><div class='add'>+		  tx_ring-&gt;qid, tx_pkts);</div><div class='add'>+</div><div class='add'>+	return tx_pkts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This is the XDP napi callback. XDP queues use a separate napi callback</div><div class='add'>+ * than Rx/Tx queues.</div><div class='add'>+ */</div><div class='add'>+int ena_xdp_io_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);</div><div class='add'>+	struct ena_ring *tx_ring;</div><div class='add'>+	u32 work_done;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tx_ring = ena_napi-&gt;tx_ring;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(ENA_FLAG_DEV_UP, &amp;tx_ring-&gt;adapter-&gt;flags) ||</div><div class='add'>+	    test_bit(ENA_FLAG_TRIGGER_RESET, &amp;tx_ring-&gt;adapter-&gt;flags)) {</div><div class='add'>+		napi_complete_done(napi, 0);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	work_done = ena_clean_xdp_irq(tx_ring, budget);</div><div class='add'>+</div><div class='add'>+	/* If the device is about to reset or down, avoid unmask</div><div class='add'>+	 * the interrupt and return 0 so NAPI won't reschedule</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(!test_bit(ENA_FLAG_DEV_UP, &amp;tx_ring-&gt;adapter-&gt;flags))) {</div><div class='add'>+		napi_complete_done(napi, 0);</div><div class='add'>+		ret = 0;</div><div class='add'>+	} else if (budget &gt; work_done) {</div><div class='add'>+		ena_increase_stat(&amp;tx_ring-&gt;tx_stats.napi_comp, 1,</div><div class='add'>+				  &amp;tx_ring-&gt;syncp);</div><div class='add'>+		if (napi_complete_done(napi, work_done))</div><div class='add'>+			ena_unmask_interrupt(tx_ring, NULL);</div><div class='add'>+</div><div class='add'>+		ena_update_ring_numa_node(tx_ring, NULL);</div><div class='add'>+		ret = work_done;</div><div class='add'>+	} else {</div><div class='add'>+		ret = budget;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;tx_ring-&gt;syncp);</div><div class='add'>+	tx_ring-&gt;tx_stats.tx_poll++;</div><div class='add'>+	u64_stats_update_end(&amp;tx_ring-&gt;syncp);</div><div class='add'>+	tx_ring-&gt;tx_stats.last_napi_jiffies = jiffies;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amazon/ena/ena_xdp.h b/drivers/net/ethernet/amazon/ena/ena_xdp.h<br/>new file mode 100644<br/>index 000000000000..cfd82728486a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amazon/ena/ena_xdp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amazon/ena/ena_xdp.h</a></div><div class='hunk'>@@ -0,0 +1,151 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2015-2021 Amazon.com, Inc. or its affiliates. All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef ENA_XDP_H</div><div class='add'>+#define ENA_XDP_H</div><div class='add'>+</div><div class='add'>+#include "ena_netdev.h"</div><div class='add'>+#include &lt;linux/bpf_trace.h&gt;</div><div class='add'>+</div><div class='add'>+/* The max MTU size is configured to be the ethernet frame size without</div><div class='add'>+ * the overhead of the ethernet header, which can have a VLAN header, and</div><div class='add'>+ * a frame check sequence (FCS).</div><div class='add'>+ * The buffer size we share with the device is defined to be ENA_PAGE_SIZE</div><div class='add'>+ */</div><div class='add'>+#define ENA_XDP_MAX_MTU (ENA_PAGE_SIZE - ETH_HLEN - ETH_FCS_LEN -	\</div><div class='add'>+			 VLAN_HLEN - XDP_PACKET_HEADROOM -		\</div><div class='add'>+			 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='add'>+</div><div class='add'>+#define ENA_IS_XDP_INDEX(adapter, index) (((index) &gt;= (adapter)-&gt;xdp_first_ring) &amp;&amp; \</div><div class='add'>+	((index) &lt; (adapter)-&gt;xdp_first_ring + (adapter)-&gt;xdp_num_queues))</div><div class='add'>+</div><div class='add'>+enum ENA_XDP_ACTIONS {</div><div class='add'>+	ENA_XDP_PASS		= 0,</div><div class='add'>+	ENA_XDP_TX		= BIT(0),</div><div class='add'>+	ENA_XDP_REDIRECT	= BIT(1),</div><div class='add'>+	ENA_XDP_DROP		= BIT(2)</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ENA_XDP_FORWARDED (ENA_XDP_TX | ENA_XDP_REDIRECT)</div><div class='add'>+</div><div class='add'>+int ena_setup_and_create_all_xdp_queues(struct ena_adapter *adapter);</div><div class='add'>+void ena_xdp_exchange_program_rx_in_range(struct ena_adapter *adapter,</div><div class='add'>+					  struct bpf_prog *prog,</div><div class='add'>+					  int first, int count);</div><div class='add'>+int ena_xdp_io_poll(struct napi_struct *napi, int budget);</div><div class='add'>+int ena_xdp_xmit_frame(struct ena_ring *tx_ring,</div><div class='add'>+		       struct ena_adapter *adapter,</div><div class='add'>+		       struct xdp_frame *xdpf,</div><div class='add'>+		       int flags);</div><div class='add'>+int ena_xdp_xmit(struct net_device *dev, int n,</div><div class='add'>+		 struct xdp_frame **frames, u32 flags);</div><div class='add'>+int ena_xdp(struct net_device *netdev, struct netdev_bpf *bpf);</div><div class='add'>+int ena_xdp_register_rxq_info(struct ena_ring *rx_ring);</div><div class='add'>+void ena_xdp_unregister_rxq_info(struct ena_ring *rx_ring);</div><div class='add'>+</div><div class='add'>+enum ena_xdp_errors_t {</div><div class='add'>+	ENA_XDP_ALLOWED = 0,</div><div class='add'>+	ENA_XDP_CURRENT_MTU_TOO_LARGE,</div><div class='add'>+	ENA_XDP_NO_ENOUGH_QUEUES,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool ena_xdp_present(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	return !!adapter-&gt;xdp_bpf_prog;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ena_xdp_present_ring(struct ena_ring *ring)</div><div class='add'>+{</div><div class='add'>+	return !!ring-&gt;xdp_bpf_prog;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool ena_xdp_legal_queue_count(struct ena_adapter *adapter,</div><div class='add'>+					     u32 queues)</div><div class='add'>+{</div><div class='add'>+	return 2 * queues &lt;= adapter-&gt;max_num_io_queues;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline enum ena_xdp_errors_t ena_xdp_allowed(struct ena_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	enum ena_xdp_errors_t rc = ENA_XDP_ALLOWED;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;netdev-&gt;mtu &gt; ENA_XDP_MAX_MTU)</div><div class='add'>+		rc = ENA_XDP_CURRENT_MTU_TOO_LARGE;</div><div class='add'>+	else if (!ena_xdp_legal_queue_count(adapter, adapter-&gt;num_io_queues))</div><div class='add'>+		rc = ENA_XDP_NO_ENOUGH_QUEUES;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int ena_xdp_execute(struct ena_ring *rx_ring, struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	u32 verdict = ENA_XDP_PASS;</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='add'>+	struct ena_ring *xdp_ring;</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+	u64 *xdp_stat;</div><div class='add'>+</div><div class='add'>+	xdp_prog = READ_ONCE(rx_ring-&gt;xdp_bpf_prog);</div><div class='add'>+</div><div class='add'>+	verdict = bpf_prog_run_xdp(xdp_prog, xdp);</div><div class='add'>+</div><div class='add'>+	switch (verdict) {</div><div class='add'>+	case XDP_TX:</div><div class='add'>+		xdpf = xdp_convert_buff_to_frame(xdp);</div><div class='add'>+		if (unlikely(!xdpf)) {</div><div class='add'>+			trace_xdp_exception(rx_ring-&gt;netdev, xdp_prog, verdict);</div><div class='add'>+			xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_aborted;</div><div class='add'>+			verdict = ENA_XDP_DROP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Find xmit queue */</div><div class='add'>+		xdp_ring = rx_ring-&gt;xdp_ring;</div><div class='add'>+</div><div class='add'>+		/* The XDP queues are shared between XDP_TX and XDP_REDIRECT */</div><div class='add'>+		spin_lock(&amp;xdp_ring-&gt;xdp_tx_lock);</div><div class='add'>+</div><div class='add'>+		if (ena_xdp_xmit_frame(xdp_ring, rx_ring-&gt;adapter, xdpf,</div><div class='add'>+				       XDP_XMIT_FLUSH))</div><div class='add'>+			xdp_return_frame(xdpf);</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;xdp_ring-&gt;xdp_tx_lock);</div><div class='add'>+		xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_tx;</div><div class='add'>+		verdict = ENA_XDP_TX;</div><div class='add'>+		break;</div><div class='add'>+	case XDP_REDIRECT:</div><div class='add'>+		if (likely(!xdp_do_redirect(rx_ring-&gt;netdev, xdp, xdp_prog))) {</div><div class='add'>+			xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_redirect;</div><div class='add'>+			verdict = ENA_XDP_REDIRECT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		trace_xdp_exception(rx_ring-&gt;netdev, xdp_prog, verdict);</div><div class='add'>+		xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_aborted;</div><div class='add'>+		verdict = ENA_XDP_DROP;</div><div class='add'>+		break;</div><div class='add'>+	case XDP_ABORTED:</div><div class='add'>+		trace_xdp_exception(rx_ring-&gt;netdev, xdp_prog, verdict);</div><div class='add'>+		xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_aborted;</div><div class='add'>+		verdict = ENA_XDP_DROP;</div><div class='add'>+		break;</div><div class='add'>+	case XDP_DROP:</div><div class='add'>+		xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_drop;</div><div class='add'>+		verdict = ENA_XDP_DROP;</div><div class='add'>+		break;</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+		xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_pass;</div><div class='add'>+		verdict = ENA_XDP_PASS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bpf_warn_invalid_xdp_action(rx_ring-&gt;netdev, xdp_prog, verdict);</div><div class='add'>+		xdp_stat = &amp;rx_ring-&gt;rx_stats.xdp_invalid;</div><div class='add'>+		verdict = ENA_XDP_DROP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ena_increase_stat(xdp_stat, 1, &amp;rx_ring-&gt;syncp);</div><div class='add'>+</div><div class='add'>+	return verdict;</div><div class='add'>+}</div><div class='add'>+#endif /* ENA_XDP_H */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c<br/>index ab30761003da..27792a52b6cf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/7990.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/7990.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/7990.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/7990.c</a></div><div class='hunk'>@@ -28,6 +28,7 @@</div><div class='ctx'> #include &lt;linux/route.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> /* Used for the temporal inet entries and routing */</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='hunk'>@@ -35,7 +36,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #ifdef CONFIG_HP300</div><div class='ctx'> #include &lt;asm/blinken.h&gt;</div><div class='ctx'> #endif</div><div class='hunk'>@@ -527,7 +527,7 @@ int lance_close(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lance_close);</div><div class='ctx'> </div><div class='del'>-void lance_tx_timeout(struct net_device *dev)</div><div class='add'>+void lance_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	printk("lance_tx_timeout\n");</div><div class='ctx'> 	lance_reset(dev);</div><div class='hunk'>@@ -536,7 +536,7 @@ void lance_tx_timeout(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(lance_tx_timeout);</div><div class='ctx'> </div><div class='del'>-int lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+netdev_tx_t lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> 	volatile struct lance_init_block *ib = lp-&gt;init_block;</div><div class='hunk'>@@ -667,4 +667,5 @@ void lance_poll(struct net_device *dev)</div><div class='ctx'> EXPORT_SYMBOL_GPL(lance_poll);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("LANCE Ethernet IC generic routines");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/7990.h b/drivers/net/ethernet/amd/7990.h<br/>index 741cdc392c6b..e53551daeea1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/7990.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/7990.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/7990.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/7990.h</a></div><div class='hunk'>@@ -241,9 +241,9 @@ struct lance_private {</div><div class='ctx'> /* Now the prototypes we export */</div><div class='ctx'> int lance_open(struct net_device *dev);</div><div class='ctx'> int lance_close(struct net_device *dev);</div><div class='del'>-int lance_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+netdev_tx_t lance_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> void lance_set_multicast(struct net_device *dev);</div><div class='del'>-void lance_tx_timeout(struct net_device *dev);</div><div class='add'>+void lance_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> void lance_poll(struct net_device *dev);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig<br/>index de4950d2022e..d54dca3074eb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/Kconfig</a></div><div class='hunk'>@@ -8,13 +8,13 @@ config NET_VENDOR_AMD</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \</div><div class='ctx'> 		   SUN3X || SBUS || PCI || ZORRO || (ISA &amp;&amp; ISA_DMA_API) || \</div><div class='del'>-		   (ARM &amp;&amp; ARCH_EBSA110) || ISA || EISA || PCMCIA || ARM64</div><div class='del'>-	---help---</div><div class='add'>+		   ISA || EISA || PCMCIA || ARM64</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) chipset belonging to this class,</div><div class='ctx'> 	  say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question does not directly affect</div><div class='del'>-	  the kernel: saying N will just case the configurator to skip all</div><div class='add'>+	  the kernel: saying N will just cause the configurator to skip all</div><div class='ctx'> 	  the questions regarding AMD chipsets. If you say Y, you will be asked</div><div class='ctx'> 	  for your specific chipset/driver in the following questions.</div><div class='ctx'> </div><div class='hunk'>@@ -24,7 +24,7 @@ config A2065</div><div class='ctx'> 	tristate "A2065 support"</div><div class='ctx'> 	depends on ZORRO</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,</div><div class='ctx'> 	  say N.</div><div class='ctx'> </div><div class='hunk'>@@ -36,7 +36,7 @@ config AMD8111_ETH</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have an AMD 8111-based PCI LANCE ethernet card,</div><div class='ctx'> 	  answer Y here.</div><div class='ctx'> </div><div class='hunk'>@@ -46,7 +46,8 @@ config AMD8111_ETH</div><div class='ctx'> config LANCE</div><div class='ctx'> 	tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"</div><div class='ctx'> 	depends on ISA &amp;&amp; ISA_DMA_API &amp;&amp; !ARM &amp;&amp; !PPC32</div><div class='del'>-	---help---</div><div class='add'>+	select NETDEV_LEGACY_INIT</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card of this type, say Y here.</div><div class='ctx'> 	  Some LinkSys cards are of this type.</div><div class='ctx'> </div><div class='hunk'>@@ -55,10 +56,10 @@ config LANCE</div><div class='ctx'> </div><div class='ctx'> config PCNET32</div><div class='ctx'> 	tristate "AMD PCnet32 PCI support"</div><div class='del'>-	depends on PCI</div><div class='add'>+	depends on PCI &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a PCnet32 or PCnetPCI based network (Ethernet) card,</div><div class='ctx'> 	  answer Y here.</div><div class='ctx'> </div><div class='hunk'>@@ -68,25 +69,17 @@ config PCNET32</div><div class='ctx'> config ARIADNE</div><div class='ctx'> 	tristate "Ariadne support"</div><div class='ctx'> 	depends on ZORRO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a Village Tronic Ariadne Ethernet adapter, say Y.</div><div class='ctx'> 	  Otherwise, say N.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called ariadne.</div><div class='ctx'> </div><div class='del'>-config ARM_AM79C961A</div><div class='del'>-	bool "ARM EBSA110 AM79C961A support"</div><div class='del'>-	depends on ARM &amp;&amp; ARCH_EBSA110</div><div class='del'>-	select CRC32</div><div class='del'>-	---help---</div><div class='del'>-	  If you wish to compile a kernel for the EBSA-110, then you should</div><div class='del'>-	  always answer Y to this.</div><div class='del'>-</div><div class='ctx'> config ATARILANCE</div><div class='ctx'> 	tristate "Atari LANCE support"</div><div class='ctx'> 	depends on ATARI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y to include support for several Atari Ethernet adapters based</div><div class='ctx'> 	  on the AMD LANCE chipset: RieblCard (with or without battery), or</div><div class='ctx'> 	  PAMCard VME (also the version by Rhotron, with different addresses).</div><div class='hunk'>@@ -95,7 +88,7 @@ config DECLANCE</div><div class='ctx'> 	tristate "DEC LANCE ethernet controller support"</div><div class='ctx'> 	depends on MACH_DECSTATION</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the series of Ethernet controllers produced by</div><div class='ctx'> 	  DEC (now Compaq) based on the AMD LANCE chipset, including the</div><div class='ctx'> 	  DEPCA series.  (This chipset is better known via the NE2100 cards.)</div><div class='hunk'>@@ -104,7 +97,7 @@ config HPLANCE</div><div class='ctx'> 	tristate "HP on-board LANCE support"</div><div class='ctx'> 	depends on DIO</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you want to use the builtin "LANCE" Ethernet controller on an</div><div class='ctx'> 	  HP300 machine, say Y here.</div><div class='ctx'> </div><div class='hunk'>@@ -113,7 +106,7 @@ config MIPS_AU1X00_ENET</div><div class='ctx'> 	depends on MIPS_ALCHEMY</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have an Alchemy Semi AU1X00 based system</div><div class='ctx'> 	  say Y.  Otherwise, say N.</div><div class='ctx'> </div><div class='hunk'>@@ -121,7 +114,7 @@ config MVME147_NET</div><div class='ctx'> 	tristate "MVME147 (LANCE) Ethernet support"</div><div class='ctx'> 	depends on MVME147</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the on-board Ethernet interface on the Motorola MVME147</div><div class='ctx'> 	  single-board computer.  Say Y here to include the</div><div class='ctx'> 	  driver for this chip in your kernel.</div><div class='hunk'>@@ -129,7 +122,7 @@ config MVME147_NET</div><div class='ctx'> </div><div class='ctx'> config PCMCIA_NMCLAN</div><div class='ctx'> 	tristate "New Media PCMCIA support"</div><div class='del'>-	depends on PCMCIA</div><div class='add'>+	depends on PCMCIA &amp;&amp; HAS_IOPORT</div><div class='ctx'> 	help</div><div class='ctx'> 	  Say Y here if you intend to attach a New Media Ethernet or LiveWire</div><div class='ctx'> 	  PCMCIA (PC-card) Ethernet card to your computer.</div><div class='hunk'>@@ -137,19 +130,10 @@ config PCMCIA_NMCLAN</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module will be</div><div class='ctx'> 	  called nmclan_cs.  If unsure, say N.</div><div class='ctx'> </div><div class='del'>-config NI65</div><div class='del'>-	tristate "NI6510 support"</div><div class='del'>-	depends on ISA &amp;&amp; ISA_DMA_API &amp;&amp; !ARM &amp;&amp; !PPC32</div><div class='del'>-	---help---</div><div class='del'>-	  If you have a network (Ethernet) card of this type, say Y here.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here. The module</div><div class='del'>-	  will be called ni65.</div><div class='del'>-</div><div class='ctx'> config SUN3LANCE</div><div class='ctx'> 	tristate "Sun3/Sun3x on-board LANCE support"</div><div class='ctx'> 	depends on (SUN3 || SUN3X)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Most Sun3 and Sun3x motherboards (including the 3/50, 3/60 and 3/80)</div><div class='ctx'> 	  featured an AMD LANCE 10Mbit Ethernet controller on board; say Y</div><div class='ctx'> 	  here to compile in the Linux driver for this and enable Ethernet.</div><div class='hunk'>@@ -163,7 +147,7 @@ config SUNLANCE</div><div class='ctx'> 	tristate "Sun LANCE support"</div><div class='ctx'> 	depends on SBUS</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the "le" interface present on all 32-bit Sparc</div><div class='ctx'> 	  systems, on some older Ultra systems and as an Sbus option.  These</div><div class='ctx'> 	  cards are based on the AMD LANCE chipset, which is better known</div><div class='hunk'>@@ -174,14 +158,15 @@ config SUNLANCE</div><div class='ctx'> </div><div class='ctx'> config AMD_XGBE</div><div class='ctx'> 	tristate "AMD 10GbE Ethernet driver"</div><div class='del'>-	depends on ((OF_NET &amp;&amp; OF_ADDRESS) || ACPI || PCI) &amp;&amp; HAS_IOMEM</div><div class='add'>+	depends on (OF_ADDRESS || ACPI || PCI) &amp;&amp; HAS_IOMEM</div><div class='ctx'> 	depends on X86 || ARM64 || COMPILE_TEST</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='ctx'> 	select BITREVERSE</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select AMD_XGBE_HAVE_ECC if X86</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='del'>-	---help---</div><div class='add'>+	select NET_SELFTESTS</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the AMD 10GbE Ethernet device found on an</div><div class='ctx'> 	  AMD SoC.</div><div class='ctx'> </div><div class='hunk'>@@ -192,7 +177,7 @@ config AMD_XGBE_DCB</div><div class='ctx'> 	bool "Data Center Bridging (DCB) support"</div><div class='ctx'> 	default n</div><div class='ctx'> 	depends on AMD_XGBE &amp;&amp; DCB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here to enable Data Center Bridging (DCB) support in the</div><div class='ctx'> 	  driver.</div><div class='ctx'> </div><div class='hunk'>@@ -202,4 +187,18 @@ config AMD_XGBE_HAVE_ECC</div><div class='ctx'> 	bool</div><div class='ctx'> 	default n</div><div class='ctx'> </div><div class='add'>+config PDS_CORE</div><div class='add'>+	tristate "AMD/Pensando Data Systems Core Device Support"</div><div class='add'>+	depends on 64BIT &amp;&amp; PCI</div><div class='add'>+	select AUXILIARY_BUS</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	help</div><div class='add'>+	  This enables the support for the AMD/Pensando Core device family of</div><div class='add'>+	  adapters.  More specific information on this driver can be</div><div class='add'>+	  found in</div><div class='add'>+	  &lt;file:Documentation/networking/device_drivers/ethernet/amd/pds_core.rst&gt;.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here. The module</div><div class='add'>+	  will be called pds_core.</div><div class='add'>+</div><div class='ctx'> endif # NET_VENDOR_AMD</div><div class='head'>diff --git a/drivers/net/ethernet/amd/Makefile b/drivers/net/ethernet/amd/Makefile<br/>index 45f86822a5f7..2dcfb84731e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/Makefile</a></div><div class='hunk'>@@ -5,7 +5,6 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_A2065) += a2065.o</div><div class='ctx'> obj-$(CONFIG_AMD8111_ETH) += amd8111e.o</div><div class='del'>-obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o</div><div class='ctx'> obj-$(CONFIG_ARIADNE) += ariadne.o</div><div class='ctx'> obj-$(CONFIG_ATARILANCE) += atarilance.o</div><div class='ctx'> obj-$(CONFIG_DECLANCE) += declance.o</div><div class='hunk'>@@ -14,8 +13,8 @@ obj-$(CONFIG_LANCE) += lance.o</div><div class='ctx'> obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o</div><div class='ctx'> obj-$(CONFIG_MVME147_NET) += mvme147.o 7990.o</div><div class='ctx'> obj-$(CONFIG_PCMCIA_NMCLAN) += nmclan_cs.o</div><div class='del'>-obj-$(CONFIG_NI65) += ni65.o</div><div class='ctx'> obj-$(CONFIG_PCNET32) += pcnet32.o</div><div class='ctx'> obj-$(CONFIG_SUN3LANCE) += sun3lance.o</div><div class='ctx'> obj-$(CONFIG_SUNLANCE) += sunlance.o</div><div class='ctx'> obj-$(CONFIG_AMD_XGBE) += xgbe/</div><div class='add'>+obj-$(CONFIG_PDS_CORE) += pds_core/</div><div class='head'>diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c<br/>index 212fe72a190b..ce9445425045 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/a2065.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/a2065.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/a2065.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/a2065.c</a></div><div class='hunk'>@@ -118,10 +118,6 @@ struct lance_private {</div><div class='ctx'> 	int auto_select;	      /* cable-selection by carrier */</div><div class='ctx'> 	unsigned short busmaster_regval;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_SUNLANCE</div><div class='del'>-	struct Linux_SBus_DMA *ledma; /* if set this points to ledma and arch=4m */</div><div class='del'>-	int burst_sizes;	      /* ledma SBus burst sizes */</div><div class='del'>-#endif</div><div class='ctx'> 	struct timer_list         multicast_timer;</div><div class='ctx'> 	struct net_device	  *dev;</div><div class='ctx'> };</div><div class='hunk'>@@ -490,7 +486,7 @@ static int lance_close(struct net_device *dev)</div><div class='ctx'> 	volatile struct lance_regs *ll = lp-&gt;ll;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;multicast_timer);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;multicast_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the card */</div><div class='ctx'> 	ll-&gt;rap = LE_CSR0;</div><div class='hunk'>@@ -522,7 +518,7 @@ static inline int lance_reset(struct net_device *dev)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lance_tx_timeout(struct net_device *dev)</div><div class='add'>+static void lance_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> 	volatile struct lance_regs *ll = lp-&gt;ll;</div><div class='hunk'>@@ -551,11 +547,10 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (!lance_tx_buffs_avail(lp))</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='del'>-#ifdef DEBUG</div><div class='ctx'> 	/* dump the packet */</div><div class='del'>-	print_hex_dump(KERN_DEBUG, "skb-&gt;data: ", DUMP_PREFIX_NONE,</div><div class='del'>-		       16, 1, skb-&gt;data, 64, true);</div><div class='del'>-#endif</div><div class='add'>+	print_hex_dump_debug("skb-&gt;data: ", DUMP_PREFIX_NONE, 16, 1, skb-&gt;data,</div><div class='add'>+			     64, true);</div><div class='add'>+</div><div class='ctx'> 	entry = lp-&gt;tx_new &amp; lp-&gt;tx_ring_mod_mask;</div><div class='ctx'> 	ib-&gt;btx_ring[entry].length = (-skblen) | 0xf000;</div><div class='ctx'> 	ib-&gt;btx_ring[entry].misc = 0;</div><div class='hunk'>@@ -641,7 +636,7 @@ static void lance_set_multicast(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void lance_set_multicast_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp = from_timer(lp, t, multicast_timer);</div><div class='add'>+	struct lance_private *lp = timer_container_of(lp, t, multicast_timer);</div><div class='ctx'> </div><div class='ctx'> 	lance_set_multicast(lp-&gt;dev);</div><div class='ctx'> }</div><div class='hunk'>@@ -685,6 +680,7 @@ static int a2065_init_one(struct zorro_dev *z,</div><div class='ctx'> 	unsigned long base_addr = board + A2065_LANCE;</div><div class='ctx'> 	unsigned long mem_start = board + A2065_RAM;</div><div class='ctx'> 	struct resource *r1, *r2;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	u32 serial;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -699,7 +695,7 @@ static int a2065_init_one(struct zorro_dev *z,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct lance_private));</div><div class='del'>-	if (dev == NULL) {</div><div class='add'>+	if (!dev) {</div><div class='ctx'> 		release_mem_region(base_addr, sizeof(struct lance_regs));</div><div class='ctx'> 		release_mem_region(mem_start, A2065_RAM_SIZE);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -711,17 +707,18 @@ static int a2065_init_one(struct zorro_dev *z,</div><div class='ctx'> 	r2-&gt;name = dev-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	serial = be32_to_cpu(z-&gt;rom.er_SerialNumber);</div><div class='del'>-	dev-&gt;dev_addr[0] = 0x00;</div><div class='add'>+	addr[0] = 0x00;</div><div class='ctx'> 	if (z-&gt;id != ZORRO_PROD_AMERISTAR_A2065) {	/* Commodore */</div><div class='del'>-		dev-&gt;dev_addr[1] = 0x80;</div><div class='del'>-		dev-&gt;dev_addr[2] = 0x10;</div><div class='add'>+		addr[1] = 0x80;</div><div class='add'>+		addr[2] = 0x10;</div><div class='ctx'> 	} else {					/* Ameristar */</div><div class='del'>-		dev-&gt;dev_addr[1] = 0x00;</div><div class='del'>-		dev-&gt;dev_addr[2] = 0x9f;</div><div class='add'>+		addr[1] = 0x00;</div><div class='add'>+		addr[2] = 0x9f;</div><div class='ctx'> 	}</div><div class='del'>-	dev-&gt;dev_addr[3] = (serial &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[4] = (serial &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[5] = serial &amp; 0xff;</div><div class='add'>+	addr[3] = (serial &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	addr[4] = (serial &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	addr[5] = serial &amp; 0xff;</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long)ZTWO_VADDR(base_addr);</div><div class='ctx'> 	dev-&gt;mem_start = (unsigned long)ZTWO_VADDR(mem_start);</div><div class='ctx'> 	dev-&gt;mem_end = dev-&gt;mem_start + A2065_RAM_SIZE;</div><div class='hunk'>@@ -784,4 +781,5 @@ static void __exit a2065_cleanup_module(void)</div><div class='ctx'> module_init(a2065_init_module);</div><div class='ctx'> module_exit(a2065_cleanup_module);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Commodore A2065 Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c<br/>deleted file mode 100644<br/>index 265039c57023..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/am79c961a.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/am79c961a.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,766 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  linux/drivers/net/ethernet/amd/am79c961a.c</div><div class='del'>- *</div><div class='del'>- *  by Russell King &lt;rmk@arm.linux.org.uk&gt; 1995-2001.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * Derived from various things including skeleton.c</div><div class='del'>- *</div><div class='del'>- * This is a special driver for the am79c961A Lance chip used in the</div><div class='del'>- * Intel (formally Digital Equipment Corp) EBSA110 platform.  Please</div><div class='del'>- * note that this can not be built as a module (it doesn't make sense).</div><div class='del'>- */</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;mach/hardware.h&gt;</div><div class='del'>-</div><div class='del'>-#define TX_BUFFERS 15</div><div class='del'>-#define RX_BUFFERS 25</div><div class='del'>-</div><div class='del'>-#include "am79c961a.h"</div><div class='del'>-</div><div class='del'>-static irqreturn_t</div><div class='del'>-am79c961_interrupt (int irq, void *dev_id);</div><div class='del'>-</div><div class='del'>-static unsigned int net_debug = NET_DEBUG;</div><div class='del'>-</div><div class='del'>-static const char version[] =</div><div class='del'>-	"am79c961 ethernet driver (C) 1995-2001 Russell King v0.04\n";</div><div class='del'>-</div><div class='del'>-/* --------------------------------------------------------------------------- */</div><div class='del'>-</div><div class='del'>-#ifdef __arm__</div><div class='del'>-static void write_rreg(u_long base, u_int reg, u_int val)</div><div class='del'>-{</div><div class='del'>-	asm volatile(</div><div class='del'>-	"strh	%1, [%2]	@ NET_RAP\n\t"</div><div class='del'>-	"strh	%0, [%2, #-4]	@ NET_RDP"</div><div class='del'>-	:</div><div class='del'>-	: "r" (val), "r" (reg), "r" (ISAIO_BASE + 0x0464));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned short read_rreg(u_long base_addr, u_int reg)</div><div class='del'>-{</div><div class='del'>-	unsigned short v;</div><div class='del'>-	asm volatile(</div><div class='del'>-	"strh	%1, [%2]	@ NET_RAP\n\t"</div><div class='del'>-	"ldrh	%0, [%2, #-4]	@ NET_RDP"</div><div class='del'>-	: "=r" (v)</div><div class='del'>-	: "r" (reg), "r" (ISAIO_BASE + 0x0464));</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void write_ireg(u_long base, u_int reg, u_int val)</div><div class='del'>-{</div><div class='del'>-	asm volatile(</div><div class='del'>-	"strh	%1, [%2]	@ NET_RAP\n\t"</div><div class='del'>-	"strh	%0, [%2, #8]	@ NET_IDP"</div><div class='del'>-	:</div><div class='del'>-	: "r" (val), "r" (reg), "r" (ISAIO_BASE + 0x0464));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned short read_ireg(u_long base_addr, u_int reg)</div><div class='del'>-{</div><div class='del'>-	u_short v;</div><div class='del'>-	asm volatile(</div><div class='del'>-	"strh	%1, [%2]	@ NAT_RAP\n\t"</div><div class='del'>-	"ldrh	%0, [%2, #8]	@ NET_IDP\n\t"</div><div class='del'>-	: "=r" (v)</div><div class='del'>-	: "r" (reg), "r" (ISAIO_BASE + 0x0464));</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define am_writeword(dev,off,val) __raw_writew(val, ISAMEM_BASE + ((off) &lt;&lt; 1))</div><div class='del'>-#define am_readword(dev,off)      __raw_readw(ISAMEM_BASE + ((off) &lt;&lt; 1))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-am_writebuffer(struct net_device *dev, u_int offset, unsigned char *buf, unsigned int length)</div><div class='del'>-{</div><div class='del'>-	offset = ISAMEM_BASE + (offset &lt;&lt; 1);</div><div class='del'>-	length = (length + 1) &amp; ~1;</div><div class='del'>-	if ((int)buf &amp; 2) {</div><div class='del'>-		asm volatile("strh	%2, [%0], #4"</div><div class='del'>-		 : "=&amp;r" (offset) : "0" (offset), "r" (buf[0] | (buf[1] &lt;&lt; 8)));</div><div class='del'>-		buf += 2;</div><div class='del'>-		length -= 2;</div><div class='del'>-	}</div><div class='del'>-	while (length &gt; 8) {</div><div class='del'>-		register unsigned int tmp asm("r2"), tmp2 asm("r3");</div><div class='del'>-		asm volatile(</div><div class='del'>-			"ldmia	%0!, {%1, %2}"</div><div class='del'>-			: "+r" (buf), "=&amp;r" (tmp), "=&amp;r" (tmp2));</div><div class='del'>-		length -= 8;</div><div class='del'>-		asm volatile(</div><div class='del'>-			"strh	%1, [%0], #4\n\t"</div><div class='del'>-			"mov	%1, %1, lsr #16\n\t"</div><div class='del'>-			"strh	%1, [%0], #4\n\t"</div><div class='del'>-			"strh	%2, [%0], #4\n\t"</div><div class='del'>-			"mov	%2, %2, lsr #16\n\t"</div><div class='del'>-			"strh	%2, [%0], #4"</div><div class='del'>-		: "+r" (offset), "=&amp;r" (tmp), "=&amp;r" (tmp2));</div><div class='del'>-	}</div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		asm volatile("strh	%2, [%0], #4"</div><div class='del'>-		 : "=&amp;r" (offset) : "0" (offset), "r" (buf[0] | (buf[1] &lt;&lt; 8)));</div><div class='del'>-		buf += 2;</div><div class='del'>-		length -= 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-am_readbuffer(struct net_device *dev, u_int offset, unsigned char *buf, unsigned int length)</div><div class='del'>-{</div><div class='del'>-	offset = ISAMEM_BASE + (offset &lt;&lt; 1);</div><div class='del'>-	length = (length + 1) &amp; ~1;</div><div class='del'>-	if ((int)buf &amp; 2) {</div><div class='del'>-		unsigned int tmp;</div><div class='del'>-		asm volatile(</div><div class='del'>-			"ldrh	%2, [%0], #4\n\t"</div><div class='del'>-			"strb	%2, [%1], #1\n\t"</div><div class='del'>-			"mov	%2, %2, lsr #8\n\t"</div><div class='del'>-			"strb	%2, [%1], #1"</div><div class='del'>-		: "=&amp;r" (offset), "=&amp;r" (buf), "=r" (tmp): "0" (offset), "1" (buf));</div><div class='del'>-		length -= 2;</div><div class='del'>-	}</div><div class='del'>-	while (length &gt; 8) {</div><div class='del'>-		register unsigned int tmp asm("r2"), tmp2 asm("r3"), tmp3;</div><div class='del'>-		asm volatile(</div><div class='del'>-			"ldrh	%2, [%0], #4\n\t"</div><div class='del'>-			"ldrh	%4, [%0], #4\n\t"</div><div class='del'>-			"ldrh	%3, [%0], #4\n\t"</div><div class='del'>-			"orr	%2, %2, %4, lsl #16\n\t"</div><div class='del'>-			"ldrh	%4, [%0], #4\n\t"</div><div class='del'>-			"orr	%3, %3, %4, lsl #16\n\t"</div><div class='del'>-			"stmia	%1!, {%2, %3}"</div><div class='del'>-		: "=&amp;r" (offset), "=&amp;r" (buf), "=r" (tmp), "=r" (tmp2), "=r" (tmp3)</div><div class='del'>-		: "0" (offset), "1" (buf));</div><div class='del'>-		length -= 8;</div><div class='del'>-	}</div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		unsigned int tmp;</div><div class='del'>-		asm volatile(</div><div class='del'>-			"ldrh	%2, [%0], #4\n\t"</div><div class='del'>-			"strb	%2, [%1], #1\n\t"</div><div class='del'>-			"mov	%2, %2, lsr #8\n\t"</div><div class='del'>-			"strb	%2, [%1], #1"</div><div class='del'>-		: "=&amp;r" (offset), "=&amp;r" (buf), "=r" (tmp) : "0" (offset), "1" (buf));</div><div class='del'>-		length -= 2;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#error Not compatible</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-am79c961_ramtest(struct net_device *dev, unsigned int val)</div><div class='del'>-{</div><div class='del'>-	unsigned char *buffer = kmalloc (65536, GFP_KERNEL);</div><div class='del'>-	int i, error = 0, errorcount = 0;</div><div class='del'>-</div><div class='del'>-	if (!buffer)</div><div class='del'>-		return 0;</div><div class='del'>-	memset (buffer, val, 65536);</div><div class='del'>-	am_writebuffer(dev, 0, buffer, 65536);</div><div class='del'>-	memset (buffer, val ^ 255, 65536);</div><div class='del'>-	am_readbuffer(dev, 0, buffer, 65536);</div><div class='del'>-	for (i = 0; i &lt; 65536; i++) {</div><div class='del'>-		if (buffer[i] != val &amp;&amp; !error) {</div><div class='del'>-			printk ("%s: buffer error (%02X %02X) %05X - ", dev-&gt;name, val, buffer[i], i);</div><div class='del'>-			error = 1;</div><div class='del'>-			errorcount ++;</div><div class='del'>-		} else if (error &amp;&amp; buffer[i] == val) {</div><div class='del'>-			printk ("%05X\n", i);</div><div class='del'>-			error = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (error)</div><div class='del'>-		printk ("10000\n");</div><div class='del'>-	kfree (buffer);</div><div class='del'>-	return errorcount;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am79c961_mc_hash(char *addr, u16 *hash)</div><div class='del'>-{</div><div class='del'>-	int idx, bit;</div><div class='del'>-	u32 crc;</div><div class='del'>-</div><div class='del'>-	crc = ether_crc_le(ETH_ALEN, addr);</div><div class='del'>-</div><div class='del'>-	idx = crc &gt;&gt; 30;</div><div class='del'>-	bit = (crc &gt;&gt; 26) &amp; 15;</div><div class='del'>-</div><div class='del'>-	hash[idx] |= 1 &lt;&lt; bit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int am79c961_get_rx_mode(struct net_device *dev, u16 *hash)</div><div class='del'>-{</div><div class='del'>-	unsigned int mode = MODE_PORT_10BT;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='del'>-		mode |= MODE_PROMISC;</div><div class='del'>-		memset(hash, 0xff, 4 * sizeof(*hash));</div><div class='del'>-	} else if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='del'>-		memset(hash, 0xff, 4 * sizeof(*hash));</div><div class='del'>-	} else {</div><div class='del'>-		struct netdev_hw_addr *ha;</div><div class='del'>-</div><div class='del'>-		memset(hash, 0, 4 * sizeof(*hash));</div><div class='del'>-</div><div class='del'>-		netdev_for_each_mc_addr(ha, dev)</div><div class='del'>-			am79c961_mc_hash(ha-&gt;addr, hash);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-am79c961_init_for_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	u_int hdr_addr, first_free_addr;</div><div class='del'>-	u16 multi_hash[4], mode = am79c961_get_rx_mode(dev, multi_hash);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Stop the chip.</div><div class='del'>-	 */</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR0, CSR0_BABL|CSR0_CERR|CSR0_MISS|CSR0_MERR|CSR0_TINT|CSR0_RINT|CSR0_STOP);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-</div><div class='del'>-	write_ireg (dev-&gt;base_addr, 5, 0x00a0); /* Receive address LED */</div><div class='del'>-	write_ireg (dev-&gt;base_addr, 6, 0x0081); /* Collision LED */</div><div class='del'>-	write_ireg (dev-&gt;base_addr, 7, 0x0090); /* XMIT LED */</div><div class='del'>-	write_ireg (dev-&gt;base_addr, 2, 0x0000); /* MODE register selects media */</div><div class='del'>-</div><div class='del'>-	for (i = LADRL; i &lt;= LADRH; i++)</div><div class='del'>-		write_rreg (dev-&gt;base_addr, i, multi_hash[i - LADRL]);</div><div class='del'>-</div><div class='del'>-	for (i = PADRL, p = dev-&gt;dev_addr; i &lt;= PADRH; i++, p += 2)</div><div class='del'>-		write_rreg (dev-&gt;base_addr, i, p[0] | (p[1] &lt;&lt; 8));</div><div class='del'>-</div><div class='del'>-	write_rreg (dev-&gt;base_addr, MODE, mode);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, POLLINT, 0);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, SIZERXR, -RX_BUFFERS);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, SIZETXR, -TX_BUFFERS);</div><div class='del'>-</div><div class='del'>-	first_free_addr = RX_BUFFERS * 8 + TX_BUFFERS * 8 + 16;</div><div class='del'>-	hdr_addr = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rxhead = 0;</div><div class='del'>-	priv-&gt;rxtail = 0;</div><div class='del'>-	priv-&gt;rxhdr = hdr_addr;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; RX_BUFFERS; i++) {</div><div class='del'>-		priv-&gt;rxbuffer[i] = first_free_addr;</div><div class='del'>-		am_writeword (dev, hdr_addr, first_free_addr);</div><div class='del'>-		am_writeword (dev, hdr_addr + 2, RMD_OWN);</div><div class='del'>-		am_writeword (dev, hdr_addr + 4, (-1600));</div><div class='del'>-		am_writeword (dev, hdr_addr + 6, 0);</div><div class='del'>-		first_free_addr += 1600;</div><div class='del'>-		hdr_addr += 8;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;txhead = 0;</div><div class='del'>-	priv-&gt;txtail = 0;</div><div class='del'>-	priv-&gt;txhdr = hdr_addr;</div><div class='del'>-	for (i = 0; i &lt; TX_BUFFERS; i++) {</div><div class='del'>-		priv-&gt;txbuffer[i] = first_free_addr;</div><div class='del'>-		am_writeword (dev, hdr_addr, first_free_addr);</div><div class='del'>-		am_writeword (dev, hdr_addr + 2, TMD_STP|TMD_ENP);</div><div class='del'>-		am_writeword (dev, hdr_addr + 4, 0xf000);</div><div class='del'>-		am_writeword (dev, hdr_addr + 6, 0);</div><div class='del'>-		first_free_addr += 1600;</div><div class='del'>-		hdr_addr += 8;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_rreg (dev-&gt;base_addr, BASERXL, priv-&gt;rxhdr);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, BASERXH, 0);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, BASETXL, priv-&gt;txhdr);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, BASERXH, 0);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR0, CSR0_STOP);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR3, CSR3_IDONM|CSR3_BABLM|CSR3_DXSUFLO);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR4, CSR4_APAD_XMIT|CSR4_MFCOM|CSR4_RCVCCOM|CSR4_TXSTRTM|CSR4_JABM);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR0, CSR0_IENA|CSR0_STRT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am79c961_timer(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = from_timer(priv, t, timer);</div><div class='del'>-	struct net_device *dev = priv-&gt;dev;</div><div class='del'>-	unsigned int lnkstat, carrier;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-	lnkstat = read_ireg(dev-&gt;base_addr, ISALED0) &amp; ISALED0_LNKST;</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-	carrier = netif_carrier_ok(dev);</div><div class='del'>-</div><div class='del'>-	if (lnkstat &amp;&amp; !carrier) {</div><div class='del'>-		netif_carrier_on(dev);</div><div class='del'>-		printk("%s: link up\n", dev-&gt;name);</div><div class='del'>-	} else if (!lnkstat &amp;&amp; carrier) {</div><div class='del'>-		netif_carrier_off(dev);</div><div class='del'>-		printk("%s: link down\n", dev-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;priv-&gt;timer, jiffies + msecs_to_jiffies(500));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Open/initialize the board.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-am79c961_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = request_irq(dev-&gt;irq, am79c961_interrupt, 0, dev-&gt;name, dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	am79c961_init_for_open(dev);</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;timer.expires = jiffies;</div><div class='del'>-	add_timer(&amp;priv-&gt;timer);</div><div class='del'>-</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The inverse routine to am79c961_open().</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-am79c961_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;timer);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR0, CSR0_STOP);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR3, CSR3_MASKALL);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-</div><div class='del'>-	free_irq (dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Set or clear promiscuous/multicast mode filter for this adapter.</div><div class='del'>- */</div><div class='del'>-static void am79c961_setmulticastlist (struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	u16 multi_hash[4], mode = am79c961_get_rx_mode(dev, multi_hash);</div><div class='del'>-	int i, stopped;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-</div><div class='del'>-	stopped = read_rreg(dev-&gt;base_addr, CSR0) &amp; CSR0_STOP;</div><div class='del'>-</div><div class='del'>-	if (!stopped) {</div><div class='del'>-		/*</div><div class='del'>-		 * Put the chip into suspend mode</div><div class='del'>-		 */</div><div class='del'>-		write_rreg(dev-&gt;base_addr, CTRL1, CTRL1_SPND);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Spin waiting for chip to report suspend mode</div><div class='del'>-		 */</div><div class='del'>-		while ((read_rreg(dev-&gt;base_addr, CTRL1) &amp; CTRL1_SPND) == 0) {</div><div class='del'>-			spin_unlock_irqrestore(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-			nop();</div><div class='del'>-			spin_lock_irqsave(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Update the multicast hash table</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(multi_hash); i++)</div><div class='del'>-		write_rreg(dev-&gt;base_addr, i + LADRL, multi_hash[i]);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Write the mode register</div><div class='del'>-	 */</div><div class='del'>-	write_rreg(dev-&gt;base_addr, MODE, mode);</div><div class='del'>-</div><div class='del'>-	if (!stopped) {</div><div class='del'>-		/*</div><div class='del'>-		 * Put the chip back into running mode</div><div class='del'>-		 */</div><div class='del'>-		write_rreg(dev-&gt;base_addr, CTRL1, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void am79c961_timeout(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_WARNING "%s: transmit timed out, network cable problem?\n",</div><div class='del'>-		dev-&gt;name);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ought to do some setup of the tx side here</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Transmit a packet</div><div class='del'>- */</div><div class='del'>-static netdev_tx_t</div><div class='del'>-am79c961_sendpacket(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned int hdraddr, bufaddr;</div><div class='del'>-	unsigned int head;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	head = priv-&gt;txhead;</div><div class='del'>-	hdraddr = priv-&gt;txhdr + (head &lt;&lt; 3);</div><div class='del'>-	bufaddr = priv-&gt;txbuffer[head];</div><div class='del'>-	head += 1;</div><div class='del'>-	if (head &gt;= TX_BUFFERS)</div><div class='del'>-		head = 0;</div><div class='del'>-</div><div class='del'>-	am_writebuffer (dev, bufaddr, skb-&gt;data, skb-&gt;len);</div><div class='del'>-	am_writeword (dev, hdraddr + 4, -skb-&gt;len);</div><div class='del'>-	am_writeword (dev, hdraddr + 2, TMD_OWN|TMD_STP|TMD_ENP);</div><div class='del'>-	priv-&gt;txhead = head;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR0, CSR0_TDMD|CSR0_IENA);</div><div class='del'>-	spin_unlock_irqrestore(&amp;priv-&gt;chip_lock, flags);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If the next packet is owned by the ethernet device,</div><div class='del'>-	 * then the tx ring is full and we can't add another</div><div class='del'>-	 * packet.</div><div class='del'>-	 */</div><div class='del'>-	if (am_readword(dev, priv-&gt;txhdr + (priv-&gt;txhead &lt;&lt; 3) + 2) &amp; TMD_OWN)</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	dev_consume_skb_any(skb);</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If we have a good packet(s), get it/them out of the buffers.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-am79c961_rx(struct net_device *dev, struct dev_priv *priv)</div><div class='del'>-{</div><div class='del'>-	do {</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		u_int hdraddr;</div><div class='del'>-		u_int pktaddr;</div><div class='del'>-		u_int status;</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		hdraddr = priv-&gt;rxhdr + (priv-&gt;rxtail &lt;&lt; 3);</div><div class='del'>-		pktaddr = priv-&gt;rxbuffer[priv-&gt;rxtail];</div><div class='del'>-</div><div class='del'>-		status = am_readword (dev, hdraddr + 2);</div><div class='del'>-		if (status &amp; RMD_OWN) /* do we own it? */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		priv-&gt;rxtail ++;</div><div class='del'>-		if (priv-&gt;rxtail &gt;= RX_BUFFERS)</div><div class='del'>-			priv-&gt;rxtail = 0;</div><div class='del'>-</div><div class='del'>-		if ((status &amp; (RMD_ERR|RMD_STP|RMD_ENP)) != (RMD_STP|RMD_ENP)) {</div><div class='del'>-			am_writeword (dev, hdraddr + 2, RMD_OWN);</div><div class='del'>-			dev-&gt;stats.rx_errors++;</div><div class='del'>-			if (status &amp; RMD_ERR) {</div><div class='del'>-				if (status &amp; RMD_FRAM)</div><div class='del'>-					dev-&gt;stats.rx_frame_errors++;</div><div class='del'>-				if (status &amp; RMD_CRC)</div><div class='del'>-					dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-			} else if (status &amp; RMD_STP)</div><div class='del'>-				dev-&gt;stats.rx_length_errors++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		len = am_readword(dev, hdraddr + 6);</div><div class='del'>-		skb = netdev_alloc_skb(dev, len + 2);</div><div class='del'>-</div><div class='del'>-		if (skb) {</div><div class='del'>-			skb_reserve(skb, 2);</div><div class='del'>-</div><div class='del'>-			am_readbuffer(dev, pktaddr, skb_put(skb, len), len);</div><div class='del'>-			am_writeword(dev, hdraddr + 2, RMD_OWN);</div><div class='del'>-			skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-			netif_rx(skb);</div><div class='del'>-			dev-&gt;stats.rx_bytes += len;</div><div class='del'>-			dev-&gt;stats.rx_packets++;</div><div class='del'>-		} else {</div><div class='del'>-			am_writeword (dev, hdraddr + 2, RMD_OWN);</div><div class='del'>-			dev-&gt;stats.rx_dropped++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Update stats for the transmitted packet</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-am79c961_tx(struct net_device *dev, struct dev_priv *priv)</div><div class='del'>-{</div><div class='del'>-	do {</div><div class='del'>-		short len;</div><div class='del'>-		u_int hdraddr;</div><div class='del'>-		u_int status;</div><div class='del'>-</div><div class='del'>-		hdraddr = priv-&gt;txhdr + (priv-&gt;txtail &lt;&lt; 3);</div><div class='del'>-		status = am_readword (dev, hdraddr + 2);</div><div class='del'>-		if (status &amp; TMD_OWN)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		priv-&gt;txtail ++;</div><div class='del'>-		if (priv-&gt;txtail &gt;= TX_BUFFERS)</div><div class='del'>-			priv-&gt;txtail = 0;</div><div class='del'>-</div><div class='del'>-		if (status &amp; TMD_ERR) {</div><div class='del'>-			u_int status2;</div><div class='del'>-</div><div class='del'>-			dev-&gt;stats.tx_errors++;</div><div class='del'>-</div><div class='del'>-			status2 = am_readword (dev, hdraddr + 6);</div><div class='del'>-</div><div class='del'>-			/*</div><div class='del'>-			 * Clear the error byte</div><div class='del'>-			 */</div><div class='del'>-			am_writeword (dev, hdraddr + 6, 0);</div><div class='del'>-</div><div class='del'>-			if (status2 &amp; TST_RTRY)</div><div class='del'>-				dev-&gt;stats.collisions += 16;</div><div class='del'>-			if (status2 &amp; TST_LCOL)</div><div class='del'>-				dev-&gt;stats.tx_window_errors++;</div><div class='del'>-			if (status2 &amp; TST_LCAR)</div><div class='del'>-				dev-&gt;stats.tx_carrier_errors++;</div><div class='del'>-			if (status2 &amp; TST_UFLO)</div><div class='del'>-				dev-&gt;stats.tx_fifo_errors++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		dev-&gt;stats.tx_packets++;</div><div class='del'>-		len = am_readword (dev, hdraddr + 4);</div><div class='del'>-		dev-&gt;stats.tx_bytes += -len;</div><div class='del'>-	} while (priv-&gt;txtail != priv-&gt;txhead);</div><div class='del'>-</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t</div><div class='del'>-am79c961_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = (struct net_device *)dev_id;</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-	u_int status, n = 100;</div><div class='del'>-	int handled = 0;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		status = read_rreg(dev-&gt;base_addr, CSR0);</div><div class='del'>-		write_rreg(dev-&gt;base_addr, CSR0, status &amp;</div><div class='del'>-			   (CSR0_IENA|CSR0_TINT|CSR0_RINT|</div><div class='del'>-			    CSR0_MERR|CSR0_MISS|CSR0_CERR|CSR0_BABL));</div><div class='del'>-</div><div class='del'>-		if (status &amp; CSR0_RINT) {</div><div class='del'>-			handled = 1;</div><div class='del'>-			am79c961_rx(dev, priv);</div><div class='del'>-		}</div><div class='del'>-		if (status &amp; CSR0_TINT) {</div><div class='del'>-			handled = 1;</div><div class='del'>-			am79c961_tx(dev, priv);</div><div class='del'>-		}</div><div class='del'>-		if (status &amp; CSR0_MISS) {</div><div class='del'>-			handled = 1;</div><div class='del'>-			dev-&gt;stats.rx_dropped++;</div><div class='del'>-		}</div><div class='del'>-		if (status &amp; CSR0_CERR) {</div><div class='del'>-			handled = 1;</div><div class='del'>-			mod_timer(&amp;priv-&gt;timer, jiffies);</div><div class='del'>-		}</div><div class='del'>-	} while (--n &amp;&amp; status &amp; (CSR0_RINT | CSR0_TINT));</div><div class='del'>-</div><div class='del'>-	return IRQ_RETVAL(handled);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-static void am79c961_poll_controller(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	local_irq_save(flags);</div><div class='del'>-	am79c961_interrupt(dev-&gt;irq, dev);</div><div class='del'>-	local_irq_restore(flags);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initialise the chip.  Note that we always expect</div><div class='del'>- * to be entered with interrupts enabled.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-am79c961_hw_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct dev_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;chip_lock);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR0, CSR0_STOP);</div><div class='del'>-	write_rreg (dev-&gt;base_addr, CSR3, CSR3_MASKALL);</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;chip_lock);</div><div class='del'>-</div><div class='del'>-	am79c961_ramtest(dev, 0x66);</div><div class='del'>-	am79c961_ramtest(dev, 0x99);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __init am79c961_banner(void)</div><div class='del'>-{</div><div class='del'>-	static unsigned version_printed;</div><div class='del'>-</div><div class='del'>-	if (net_debug &amp;&amp; version_printed++ == 0)</div><div class='del'>-		printk(KERN_INFO "%s", version);</div><div class='del'>-}</div><div class='del'>-static const struct net_device_ops am79c961_netdev_ops = {</div><div class='del'>-	.ndo_open		= am79c961_open,</div><div class='del'>-	.ndo_stop		= am79c961_close,</div><div class='del'>-	.ndo_start_xmit		= am79c961_sendpacket,</div><div class='del'>-	.ndo_set_rx_mode	= am79c961_setmulticastlist,</div><div class='del'>-	.ndo_tx_timeout		= am79c961_timeout,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_set_mac_address	= eth_mac_addr,</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	.ndo_poll_controller	= am79c961_poll_controller,</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int am79c961_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct resource *res;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct dev_priv *priv;</div><div class='del'>-	int i, ret;</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IO, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(sizeof(struct dev_priv));</div><div class='del'>-	ret = -ENOMEM;</div><div class='del'>-	if (!dev)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Fixed address and IRQ lines here.</div><div class='del'>-	 * The PNP initialisation should have been</div><div class='del'>-	 * done by the ether bootp loader.</div><div class='del'>-	 */</div><div class='del'>-	dev-&gt;base_addr = res-&gt;start;</div><div class='del'>-	ret = platform_get_irq(pdev, 0);</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto nodev;</div><div class='del'>-	}</div><div class='del'>-	dev-&gt;irq = ret;</div><div class='del'>-</div><div class='del'>-	ret = -ENODEV;</div><div class='del'>-	if (!request_region(dev-&gt;base_addr, 0x18, dev-&gt;name))</div><div class='del'>-		goto nodev;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Reset the device.</div><div class='del'>-	 */</div><div class='del'>-	inb(dev-&gt;base_addr + NET_RESET);</div><div class='del'>-	udelay(5);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check the manufacturer part of the</div><div class='del'>-	 * ether address.</div><div class='del'>-	 */</div><div class='del'>-	if (inb(dev-&gt;base_addr) != 0x08 ||</div><div class='del'>-	    inb(dev-&gt;base_addr + 2) != 0x00 ||</div><div class='del'>-	    inb(dev-&gt;base_addr + 4) != 0x2b)</div><div class='del'>-	    	goto release;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = inb(dev-&gt;base_addr + i * 2) &amp; 0xff;</div><div class='del'>-</div><div class='del'>-	am79c961_banner();</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;chip_lock);</div><div class='del'>-	priv-&gt;dev = dev;</div><div class='del'>-	timer_setup(&amp;priv-&gt;timer, am79c961_timer, 0);</div><div class='del'>-</div><div class='del'>-	if (am79c961_hw_init(dev))</div><div class='del'>-		goto release;</div><div class='del'>-</div><div class='del'>-	dev-&gt;netdev_ops = &amp;am79c961_netdev_ops;</div><div class='del'>-</div><div class='del'>-	ret = register_netdev(dev);</div><div class='del'>-	if (ret == 0) {</div><div class='del'>-		printk(KERN_INFO "%s: ether address %pM\n",</div><div class='del'>-		       dev-&gt;name, dev-&gt;dev_addr);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-release:</div><div class='del'>-	release_region(dev-&gt;base_addr, 0x18);</div><div class='del'>-nodev:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver am79c961_driver = {</div><div class='del'>-	.probe		= am79c961_probe,</div><div class='del'>-	.driver		= {</div><div class='del'>-		.name	= "am79c961",</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int __init am79c961_init(void)</div><div class='del'>-{</div><div class='del'>-	return platform_driver_register(&amp;am79c961_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-__initcall(am79c961_init);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/am79c961a.h b/drivers/net/ethernet/amd/am79c961a.h<br/>deleted file mode 100644<br/>index fc5088c70731..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/am79c961a.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/am79c961a.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,146 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * linux/drivers/net/ethernet/amd/am79c961a.h</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _LINUX_am79c961a_H</div><div class='del'>-#define _LINUX_am79c961a_H</div><div class='del'>-</div><div class='del'>-/* use 0 for production, 1 for verification, &gt;2 for debug. debug flags: */</div><div class='del'>-#define DEBUG_TX	 2</div><div class='del'>-#define DEBUG_RX	 4</div><div class='del'>-#define DEBUG_INT	 8</div><div class='del'>-#define DEBUG_IC	16</div><div class='del'>-#ifndef NET_DEBUG</div><div class='del'>-#define NET_DEBUG 	0</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define NET_UID		0</div><div class='del'>-#define NET_RDP		0x10</div><div class='del'>-#define NET_RAP		0x12</div><div class='del'>-#define NET_RESET	0x14</div><div class='del'>-#define NET_IDP		0x16</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * RAP registers</div><div class='del'>- */</div><div class='del'>-#define CSR0		0</div><div class='del'>-#define CSR0_INIT	0x0001</div><div class='del'>-#define CSR0_STRT	0x0002</div><div class='del'>-#define CSR0_STOP	0x0004</div><div class='del'>-#define CSR0_TDMD	0x0008</div><div class='del'>-#define CSR0_TXON	0x0010</div><div class='del'>-#define CSR0_RXON	0x0020</div><div class='del'>-#define CSR0_IENA	0x0040</div><div class='del'>-#define CSR0_INTR	0x0080</div><div class='del'>-#define CSR0_IDON	0x0100</div><div class='del'>-#define CSR0_TINT	0x0200</div><div class='del'>-#define CSR0_RINT	0x0400</div><div class='del'>-#define CSR0_MERR	0x0800</div><div class='del'>-#define CSR0_MISS	0x1000</div><div class='del'>-#define CSR0_CERR	0x2000</div><div class='del'>-#define CSR0_BABL	0x4000</div><div class='del'>-#define CSR0_ERR	0x8000</div><div class='del'>-</div><div class='del'>-#define CSR3		3</div><div class='del'>-#define CSR3_EMBA	0x0008</div><div class='del'>-#define CSR3_DXMT2PD	0x0010</div><div class='del'>-#define CSR3_LAPPEN	0x0020</div><div class='del'>-#define CSR3_DXSUFLO	0x0040</div><div class='del'>-#define CSR3_IDONM	0x0100</div><div class='del'>-#define CSR3_TINTM	0x0200</div><div class='del'>-#define CSR3_RINTM	0x0400</div><div class='del'>-#define CSR3_MERRM	0x0800</div><div class='del'>-#define CSR3_MISSM	0x1000</div><div class='del'>-#define CSR3_BABLM	0x4000</div><div class='del'>-#define CSR3_MASKALL	0x5F00</div><div class='del'>-</div><div class='del'>-#define CSR4		4</div><div class='del'>-#define CSR4_JABM	0x0001</div><div class='del'>-#define CSR4_JAB	0x0002</div><div class='del'>-#define CSR4_TXSTRTM	0x0004</div><div class='del'>-#define CSR4_TXSTRT	0x0008</div><div class='del'>-#define CSR4_RCVCCOM	0x0010</div><div class='del'>-#define CSR4_RCVCCO	0x0020</div><div class='del'>-#define CSR4_MFCOM	0x0100</div><div class='del'>-#define CSR4_MFCO	0x0200</div><div class='del'>-#define CSR4_ASTRP_RCV	0x0400</div><div class='del'>-#define CSR4_APAD_XMIT	0x0800</div><div class='del'>-</div><div class='del'>-#define CTRL1		5</div><div class='del'>-#define CTRL1_SPND	0x0001</div><div class='del'>-</div><div class='del'>-#define LADRL		8</div><div class='del'>-#define LADRM1		9</div><div class='del'>-#define LADRM2		10</div><div class='del'>-#define LADRH		11</div><div class='del'>-#define PADRL		12</div><div class='del'>-#define PADRM		13</div><div class='del'>-#define PADRH		14</div><div class='del'>-</div><div class='del'>-#define MODE		15</div><div class='del'>-#define MODE_DISRX	0x0001</div><div class='del'>-#define MODE_DISTX	0x0002</div><div class='del'>-#define MODE_LOOP	0x0004</div><div class='del'>-#define MODE_DTCRC	0x0008</div><div class='del'>-#define MODE_COLL	0x0010</div><div class='del'>-#define MODE_DRETRY	0x0020</div><div class='del'>-#define MODE_INTLOOP	0x0040</div><div class='del'>-#define MODE_PORT_AUI	0x0000</div><div class='del'>-#define MODE_PORT_10BT	0x0080</div><div class='del'>-#define MODE_DRXPA	0x2000</div><div class='del'>-#define MODE_DRXBA	0x4000</div><div class='del'>-#define MODE_PROMISC	0x8000</div><div class='del'>-</div><div class='del'>-#define BASERXL		24</div><div class='del'>-#define BASERXH		25</div><div class='del'>-#define BASETXL		30</div><div class='del'>-#define BASETXH		31</div><div class='del'>-</div><div class='del'>-#define POLLINT		47</div><div class='del'>-</div><div class='del'>-#define SIZERXR		76</div><div class='del'>-#define SIZETXR		78</div><div class='del'>-</div><div class='del'>-#define CSR_MFC		112</div><div class='del'>-</div><div class='del'>-#define RMD_ENP		0x0100</div><div class='del'>-#define RMD_STP		0x0200</div><div class='del'>-#define RMD_CRC		0x0800</div><div class='del'>-#define RMD_FRAM	0x2000</div><div class='del'>-#define RMD_ERR		0x4000</div><div class='del'>-#define RMD_OWN		0x8000</div><div class='del'>-</div><div class='del'>-#define TMD_ENP		0x0100</div><div class='del'>-#define TMD_STP		0x0200</div><div class='del'>-#define TMD_MORE	0x1000</div><div class='del'>-#define TMD_ERR		0x4000</div><div class='del'>-#define TMD_OWN		0x8000</div><div class='del'>-</div><div class='del'>-#define TST_RTRY	0x0400</div><div class='del'>-#define TST_LCAR	0x0800</div><div class='del'>-#define TST_LCOL	0x1000</div><div class='del'>-#define TST_UFLO	0x4000</div><div class='del'>-#define TST_BUFF	0x8000</div><div class='del'>-</div><div class='del'>-#define ISALED0		0x0004</div><div class='del'>-#define ISALED0_LNKST	0x8000</div><div class='del'>-</div><div class='del'>-struct dev_priv {</div><div class='del'>-    unsigned long	rxbuffer[RX_BUFFERS];</div><div class='del'>-    unsigned long	txbuffer[TX_BUFFERS];</div><div class='del'>-    unsigned char	txhead;</div><div class='del'>-    unsigned char	txtail;</div><div class='del'>-    unsigned char	rxhead;</div><div class='del'>-    unsigned char	rxtail;</div><div class='del'>-    unsigned long	rxhdr;</div><div class='del'>-    unsigned long	txhdr;</div><div class='del'>-    spinlock_t		chip_lock;</div><div class='del'>-    struct timer_list	timer;</div><div class='del'>-    struct net_device   *dev;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c<br/>index 573e88fc8ede..76e8c13d5985 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/amd8111e.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/amd8111e.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/amd8111e.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/amd8111e.c</a></div><div class='hunk'>@@ -19,14 +19,14 @@ Module Name:</div><div class='ctx'> </div><div class='ctx'> Abstract:</div><div class='ctx'> </div><div class='del'>- 	 AMD8111 based 10/100 Ethernet Controller Driver.</div><div class='add'>+	 AMD8111 based 10/100 Ethernet Controller Driver.</div><div class='ctx'> </div><div class='ctx'> Environment:</div><div class='ctx'> </div><div class='ctx'> 	Kernel Mode</div><div class='ctx'> </div><div class='ctx'> Revision History:</div><div class='del'>- 	3.0.0</div><div class='add'>+	3.0.0</div><div class='ctx'> 	   Initial Revision.</div><div class='ctx'> 	3.0.1</div><div class='ctx'> 	 1. Dynamic interrupt coalescing.</div><div class='hunk'>@@ -43,7 +43,7 @@ Revision History:</div><div class='ctx'> 	3.0.4 12/09/2003</div><div class='ctx'> 	 1. Added set_mac_address routine for bonding driver support.</div><div class='ctx'> 	 2. Tested the driver for bonding support</div><div class='del'>-	 3. Bug fix: Fixed mismach in actual receive buffer lenth and lenth</div><div class='add'>+	 3. Bug fix: Fixed mismach in actual receive buffer length and length</div><div class='ctx'> 	    indicated to the h/w.</div><div class='ctx'> 	 4. Modified amd8111e_rx() routine to receive all the received packets</div><div class='ctx'> 	    in the first interrupt.</div><div class='hunk'>@@ -84,9 +84,8 @@ Revision History:</div><div class='ctx'> </div><div class='ctx'> #include "amd8111e.h"</div><div class='ctx'> #define MODULE_NAME	"amd8111e"</div><div class='del'>-#define MODULE_VERS	"3.0.7"</div><div class='ctx'> MODULE_AUTHOR("Advanced Micro Devices, Inc.");</div><div class='del'>-MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "MODULE_VERS);</div><div class='add'>+MODULE_DESCRIPTION("AMD8111 based 10/100 Ethernet Controller.");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> module_param_array(speed_duplex, int, NULL, 0);</div><div class='ctx'> MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");</div><div class='hunk'>@@ -101,19 +100,19 @@ static int amd8111e_read_phy(struct amd8111e_priv *lp,</div><div class='ctx'> {</div><div class='ctx'> 	void __iomem *mmio = lp-&gt;mmio;</div><div class='ctx'> 	unsigned int reg_val;</div><div class='del'>-	unsigned int repeat= REPEAT_CNT;</div><div class='add'>+	unsigned int repeat = REPEAT_CNT;</div><div class='ctx'> </div><div class='ctx'> 	reg_val = readl(mmio + PHY_ACCESS);</div><div class='ctx'> 	while (reg_val &amp; PHY_CMD_ACTIVE)</div><div class='del'>-		reg_val = readl( mmio + PHY_ACCESS );</div><div class='add'>+		reg_val = readl(mmio + PHY_ACCESS);</div><div class='ctx'> </div><div class='del'>-	writel( PHY_RD_CMD | ((phy_id &amp; 0x1f) &lt;&lt; 21) |</div><div class='del'>-			   ((reg &amp; 0x1f) &lt;&lt; 16),  mmio +PHY_ACCESS);</div><div class='del'>-	do{</div><div class='add'>+	writel(PHY_RD_CMD | ((phy_id &amp; 0x1f) &lt;&lt; 21) |</div><div class='add'>+			   ((reg &amp; 0x1f) &lt;&lt; 16), mmio + PHY_ACCESS);</div><div class='add'>+	do {</div><div class='ctx'> 		reg_val = readl(mmio + PHY_ACCESS);</div><div class='ctx'> 		udelay(30);  /* It takes 30 us to read/write data */</div><div class='ctx'> 	} while (--repeat &amp;&amp; (reg_val &amp; PHY_CMD_ACTIVE));</div><div class='del'>-	if(reg_val &amp; PHY_RD_ERR)</div><div class='add'>+	if (reg_val &amp; PHY_RD_ERR)</div><div class='ctx'> 		goto err_phy_read;</div><div class='ctx'> </div><div class='ctx'> 	*val = reg_val &amp; 0xffff;</div><div class='hunk'>@@ -134,17 +133,17 @@ static int amd8111e_write_phy(struct amd8111e_priv *lp,</div><div class='ctx'> </div><div class='ctx'> 	reg_val = readl(mmio + PHY_ACCESS);</div><div class='ctx'> 	while (reg_val &amp; PHY_CMD_ACTIVE)</div><div class='del'>-		reg_val = readl( mmio + PHY_ACCESS );</div><div class='add'>+		reg_val = readl(mmio + PHY_ACCESS);</div><div class='ctx'> </div><div class='del'>-	writel( PHY_WR_CMD | ((phy_id &amp; 0x1f) &lt;&lt; 21) |</div><div class='add'>+	writel(PHY_WR_CMD | ((phy_id &amp; 0x1f) &lt;&lt; 21) |</div><div class='ctx'> 			   ((reg &amp; 0x1f) &lt;&lt; 16)|val, mmio + PHY_ACCESS);</div><div class='ctx'> </div><div class='del'>-	do{</div><div class='add'>+	do {</div><div class='ctx'> 		reg_val = readl(mmio + PHY_ACCESS);</div><div class='ctx'> 		udelay(30);  /* It takes 30 us to read/write the data */</div><div class='ctx'> 	} while (--repeat &amp;&amp; (reg_val &amp; PHY_CMD_ACTIVE));</div><div class='ctx'> </div><div class='del'>-	if(reg_val &amp; PHY_RD_ERR)</div><div class='add'>+	if (reg_val &amp; PHY_RD_ERR)</div><div class='ctx'> 		goto err_phy_write;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -160,7 +159,7 @@ static int amd8111e_mdio_read(struct net_device *dev, int phy_id, int reg_num)</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	unsigned int reg_val;</div><div class='ctx'> </div><div class='del'>-	amd8111e_read_phy(lp,phy_id,reg_num,&amp;reg_val);</div><div class='add'>+	amd8111e_read_phy(lp, phy_id, reg_num, &amp;reg_val);</div><div class='ctx'> 	return reg_val;</div><div class='ctx'> </div><div class='ctx'> }</div><div class='hunk'>@@ -180,30 +179,29 @@ static void amd8111e_mdio_write(struct net_device *dev,</div><div class='ctx'> static void amd8111e_set_ext_phy(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='del'>-	u32 bmcr,advert,tmp;</div><div class='add'>+	u32 bmcr, advert, tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* Determine mii register values to set the speed */</div><div class='ctx'> 	advert = amd8111e_mdio_read(dev, lp-&gt;ext_phy_addr, MII_ADVERTISE);</div><div class='ctx'> 	tmp = advert &amp; ~(ADVERTISE_ALL | ADVERTISE_100BASE4);</div><div class='del'>-	switch (lp-&gt;ext_phy_option){</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-		case SPEED_AUTONEG: /* advertise all values */</div><div class='del'>-			tmp |= ( ADVERTISE_10HALF|ADVERTISE_10FULL|</div><div class='del'>-				ADVERTISE_100HALF|ADVERTISE_100FULL) ;</div><div class='del'>-			break;</div><div class='del'>-		case SPEED10_HALF:</div><div class='del'>-			tmp |= ADVERTISE_10HALF;</div><div class='del'>-			break;</div><div class='del'>-		case SPEED10_FULL:</div><div class='del'>-			tmp |= ADVERTISE_10FULL;</div><div class='del'>-			break;</div><div class='del'>-		case SPEED100_HALF:</div><div class='del'>-			tmp |= ADVERTISE_100HALF;</div><div class='del'>-			break;</div><div class='del'>-		case SPEED100_FULL:</div><div class='del'>-			tmp |= ADVERTISE_100FULL;</div><div class='del'>-			break;</div><div class='add'>+	switch (lp-&gt;ext_phy_option) {</div><div class='add'>+	default:</div><div class='add'>+	case SPEED_AUTONEG: /* advertise all values */</div><div class='add'>+		tmp |= (ADVERTISE_10HALF | ADVERTISE_10FULL |</div><div class='add'>+			ADVERTISE_100HALF | ADVERTISE_100FULL);</div><div class='add'>+		break;</div><div class='add'>+	case SPEED10_HALF:</div><div class='add'>+		tmp |= ADVERTISE_10HALF;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED10_FULL:</div><div class='add'>+		tmp |= ADVERTISE_10FULL;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED100_HALF:</div><div class='add'>+		tmp |= ADVERTISE_100HALF;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED100_FULL:</div><div class='add'>+		tmp |= ADVERTISE_100FULL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if(advert != tmp)</div><div class='hunk'>@@ -225,20 +223,23 @@ static int amd8111e_free_skbs(struct net_device *dev)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Freeing transmit skbs */</div><div class='del'>-	for(i = 0; i &lt; NUM_TX_BUFFERS; i++){</div><div class='del'>-		if(lp-&gt;tx_skbuff[i]){</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev,lp-&gt;tx_dma_addr[i],					lp-&gt;tx_skbuff[i]-&gt;len,PCI_DMA_TODEVICE);</div><div class='del'>-			dev_kfree_skb (lp-&gt;tx_skbuff[i]);</div><div class='add'>+	for (i = 0; i &lt; NUM_TX_BUFFERS; i++) {</div><div class='add'>+		if (lp-&gt;tx_skbuff[i]) {</div><div class='add'>+			dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 lp-&gt;tx_dma_addr[i],</div><div class='add'>+					 lp-&gt;tx_skbuff[i]-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+			dev_kfree_skb(lp-&gt;tx_skbuff[i]);</div><div class='ctx'> 			lp-&gt;tx_skbuff[i] = NULL;</div><div class='ctx'> 			lp-&gt;tx_dma_addr[i] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Freeing previously allocated receive buffers */</div><div class='del'>-	for (i = 0; i &lt; NUM_RX_BUFFERS; i++){</div><div class='add'>+	for (i = 0; i &lt; NUM_RX_BUFFERS; i++) {</div><div class='ctx'> 		rx_skbuff = lp-&gt;rx_skbuff[i];</div><div class='del'>-		if(rx_skbuff != NULL){</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev,lp-&gt;rx_dma_addr[i],</div><div class='del'>-				  lp-&gt;rx_buff_len - 2,PCI_DMA_FROMDEVICE);</div><div class='add'>+		if (rx_skbuff) {</div><div class='add'>+			dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 lp-&gt;rx_dma_addr[i],</div><div class='add'>+					 lp-&gt;rx_buff_len - 2, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(lp-&gt;rx_skbuff[i]);</div><div class='ctx'> 			lp-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 			lp-&gt;rx_dma_addr[i] = 0;</div><div class='hunk'>@@ -256,13 +257,13 @@ static inline void amd8111e_set_rx_buff_len(struct net_device *dev)</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	unsigned int mtu = dev-&gt;mtu;</div><div class='ctx'> </div><div class='del'>-	if (mtu &gt; ETH_DATA_LEN){</div><div class='add'>+	if (mtu &gt; ETH_DATA_LEN) {</div><div class='ctx'> 		/* MTU + ethernet header + FCS</div><div class='ctx'> 		 * + optional VLAN tag + skb reserve space 2</div><div class='ctx'> 		 */</div><div class='ctx'> 		lp-&gt;rx_buff_len = mtu + ETH_HLEN + 10;</div><div class='ctx'> 		lp-&gt;options |= OPTION_JUMBO_ENABLE;</div><div class='del'>-	} else{</div><div class='add'>+	} else {</div><div class='ctx'> 		lp-&gt;rx_buff_len = PKT_BUFF_SZ;</div><div class='ctx'> 		lp-&gt;options &amp;= ~OPTION_JUMBO_ENABLE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -283,25 +284,25 @@ static int amd8111e_init_ring(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;tx_ring_idx = 0;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-	if(lp-&gt;opened)</div><div class='add'>+	if (lp-&gt;opened)</div><div class='ctx'> 		/* Free previously allocated transmit and receive skbs */</div><div class='ctx'> 		amd8111e_free_skbs(dev);</div><div class='ctx'> </div><div class='del'>-	else{</div><div class='del'>-		 /* allocate the tx and rx descriptors */</div><div class='del'>-	     	if((lp-&gt;tx_ring = pci_alloc_consistent(lp-&gt;pci_dev,</div><div class='del'>-			sizeof(struct amd8111e_tx_dr)*NUM_TX_RING_DR,</div><div class='del'>-			&amp;lp-&gt;tx_ring_dma_addr)) == NULL)</div><div class='del'>-</div><div class='add'>+	else {</div><div class='add'>+		/* allocate the tx and rx descriptors */</div><div class='add'>+		lp-&gt;tx_ring = dma_alloc_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			sizeof(struct amd8111e_tx_dr) * NUM_TX_RING_DR,</div><div class='add'>+			&amp;lp-&gt;tx_ring_dma_addr, GFP_ATOMIC);</div><div class='add'>+		if (!lp-&gt;tx_ring)</div><div class='ctx'> 			goto err_no_mem;</div><div class='ctx'> </div><div class='del'>-	     	if((lp-&gt;rx_ring = pci_alloc_consistent(lp-&gt;pci_dev,</div><div class='del'>-			sizeof(struct amd8111e_rx_dr)*NUM_RX_RING_DR,</div><div class='del'>-			&amp;lp-&gt;rx_ring_dma_addr)) == NULL)</div><div class='del'>-</div><div class='add'>+		lp-&gt;rx_ring = dma_alloc_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			sizeof(struct amd8111e_rx_dr) * NUM_RX_RING_DR,</div><div class='add'>+			&amp;lp-&gt;rx_ring_dma_addr, GFP_ATOMIC);</div><div class='add'>+		if (!lp-&gt;rx_ring)</div><div class='ctx'> 			goto err_free_tx_ring;</div><div class='del'>-</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	/* Set new receive buff size */</div><div class='ctx'> 	amd8111e_set_rx_buff_len(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -310,17 +311,19 @@ static int amd8111e_init_ring(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;rx_skbuff[i] = netdev_alloc_skb(dev, lp-&gt;rx_buff_len);</div><div class='ctx'> 		if (!lp-&gt;rx_skbuff[i]) {</div><div class='del'>-				/* Release previos allocated skbs */</div><div class='del'>-				for(--i; i &gt;= 0 ;i--)</div><div class='del'>-					dev_kfree_skb(lp-&gt;rx_skbuff[i]);</div><div class='del'>-				goto err_free_rx_ring;</div><div class='add'>+			/* Release previos allocated skbs */</div><div class='add'>+			for (--i; i &gt;= 0; i--)</div><div class='add'>+				dev_kfree_skb(lp-&gt;rx_skbuff[i]);</div><div class='add'>+			goto err_free_rx_ring;</div><div class='ctx'> 		}</div><div class='del'>-		skb_reserve(lp-&gt;rx_skbuff[i],2);</div><div class='add'>+		skb_reserve(lp-&gt;rx_skbuff[i], 2);</div><div class='ctx'> 	}</div><div class='ctx'>         /* Initilaizing receive descriptors */</div><div class='ctx'> 	for (i = 0; i &lt; NUM_RX_BUFFERS; i++) {</div><div class='del'>-		lp-&gt;rx_dma_addr[i] = pci_map_single(lp-&gt;pci_dev,</div><div class='del'>-			lp-&gt;rx_skbuff[i]-&gt;data,lp-&gt;rx_buff_len-2, PCI_DMA_FROMDEVICE);</div><div class='add'>+		lp-&gt;rx_dma_addr[i] = dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+						    lp-&gt;rx_skbuff[i]-&gt;data,</div><div class='add'>+						    lp-&gt;rx_buff_len - 2,</div><div class='add'>+						    DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;rx_ring[i].buff_phy_addr = cpu_to_le32(lp-&gt;rx_dma_addr[i]);</div><div class='ctx'> 		lp-&gt;rx_ring[i].buff_count = cpu_to_le16(lp-&gt;rx_buff_len-2);</div><div class='hunk'>@@ -339,15 +342,15 @@ static int amd8111e_init_ring(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> err_free_rx_ring:</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-		sizeof(struct amd8111e_rx_dr)*NUM_RX_RING_DR,lp-&gt;rx_ring,</div><div class='del'>-		lp-&gt;rx_ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct amd8111e_rx_dr) * NUM_RX_RING_DR,</div><div class='add'>+			  lp-&gt;rx_ring, lp-&gt;rx_ring_dma_addr);</div><div class='ctx'> </div><div class='ctx'> err_free_tx_ring:</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-		 sizeof(struct amd8111e_tx_dr)*NUM_TX_RING_DR,lp-&gt;tx_ring,</div><div class='del'>-		 lp-&gt;tx_ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct amd8111e_tx_dr) * NUM_TX_RING_DR,</div><div class='add'>+			  lp-&gt;tx_ring, lp-&gt;tx_ring_dma_addr);</div><div class='ctx'> </div><div class='ctx'> err_no_mem:</div><div class='ctx'> 	return -ENOMEM;</div><div class='hunk'>@@ -371,40 +374,40 @@ static int amd8111e_set_coalesce(struct net_device *dev, enum coal_mode cmod)</div><div class='ctx'> 		case RX_INTR_COAL :</div><div class='ctx'> 			timeout = coal_conf-&gt;rx_timeout;</div><div class='ctx'> 			event_count = coal_conf-&gt;rx_event_count;</div><div class='del'>-			if( timeout &gt; MAX_TIMEOUT ||</div><div class='del'>-					event_count &gt; MAX_EVENT_COUNT )</div><div class='add'>+			if (timeout &gt; MAX_TIMEOUT ||</div><div class='add'>+			    event_count &gt; MAX_EVENT_COUNT)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 			timeout = timeout * DELAY_TIMER_CONV;</div><div class='ctx'> 			writel(VAL0|STINTEN, mmio+INTEN0);</div><div class='del'>-			writel((u32)DLY_INT_A_R0|( event_count&lt;&lt; 16 )|timeout,</div><div class='del'>-							mmio+DLY_INT_A);</div><div class='add'>+			writel((u32)DLY_INT_A_R0 | (event_count &lt;&lt; 16) |</div><div class='add'>+				timeout, mmio + DLY_INT_A);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case TX_INTR_COAL :</div><div class='add'>+		case TX_INTR_COAL:</div><div class='ctx'> 			timeout = coal_conf-&gt;tx_timeout;</div><div class='ctx'> 			event_count = coal_conf-&gt;tx_event_count;</div><div class='del'>-			if( timeout &gt; MAX_TIMEOUT ||</div><div class='del'>-					event_count &gt; MAX_EVENT_COUNT )</div><div class='add'>+			if (timeout &gt; MAX_TIMEOUT ||</div><div class='add'>+			    event_count &gt; MAX_EVENT_COUNT)</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 			timeout = timeout * DELAY_TIMER_CONV;</div><div class='del'>-			writel(VAL0|STINTEN,mmio+INTEN0);</div><div class='del'>-			writel((u32)DLY_INT_B_T0|( event_count&lt;&lt; 16 )|timeout,</div><div class='del'>-							 mmio+DLY_INT_B);</div><div class='add'>+			writel(VAL0 | STINTEN, mmio + INTEN0);</div><div class='add'>+			writel((u32)DLY_INT_B_T0 | (event_count &lt;&lt; 16) |</div><div class='add'>+				timeout, mmio + DLY_INT_B);</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case DISABLE_COAL:</div><div class='del'>-			writel(0,mmio+STVAL);</div><div class='del'>-			writel(STINTEN, mmio+INTEN0);</div><div class='del'>-			writel(0, mmio +DLY_INT_B);</div><div class='del'>-			writel(0, mmio+DLY_INT_A);</div><div class='add'>+			writel(0, mmio + STVAL);</div><div class='add'>+			writel(STINTEN, mmio + INTEN0);</div><div class='add'>+			writel(0, mmio + DLY_INT_B);</div><div class='add'>+			writel(0, mmio + DLY_INT_A);</div><div class='ctx'> 			break;</div><div class='ctx'> 		 case ENABLE_COAL:</div><div class='ctx'> 		       /* Start the timer */</div><div class='del'>-			writel((u32)SOFT_TIMER_FREQ, mmio+STVAL); /*  0.5 sec */</div><div class='del'>-			writel(VAL0|STINTEN, mmio+INTEN0);</div><div class='add'>+			writel((u32)SOFT_TIMER_FREQ, mmio + STVAL); /* 0.5 sec */</div><div class='add'>+			writel(VAL0 | STINTEN, mmio + INTEN0);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -419,67 +422,67 @@ static int amd8111e_restart(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *mmio = lp-&gt;mmio;</div><div class='del'>-	int i,reg_val;</div><div class='add'>+	int i, reg_val;</div><div class='ctx'> </div><div class='ctx'> 	/* stop the chip */</div><div class='ctx'> 	writel(RUN, mmio + CMD0);</div><div class='ctx'> </div><div class='del'>-	if(amd8111e_init_ring(dev))</div><div class='add'>+	if (amd8111e_init_ring(dev))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* enable the port manager and set auto negotiation always */</div><div class='del'>-	writel((u32) VAL1|EN_PMGR, mmio + CMD3 );</div><div class='del'>-	writel((u32)XPHYANE|XPHYRST , mmio + CTRL2);</div><div class='add'>+	writel((u32)VAL1 | EN_PMGR, mmio + CMD3);</div><div class='add'>+	writel((u32)XPHYANE | XPHYRST, mmio + CTRL2);</div><div class='ctx'> </div><div class='ctx'> 	amd8111e_set_ext_phy(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* set control registers */</div><div class='ctx'> 	reg_val = readl(mmio + CTRL1);</div><div class='ctx'> 	reg_val &amp;= ~XMTSP_MASK;</div><div class='del'>-	writel( reg_val| XMTSP_128 | CACHE_ALIGN, mmio + CTRL1 );</div><div class='add'>+	writel(reg_val | XMTSP_128 | CACHE_ALIGN, mmio + CTRL1);</div><div class='ctx'> </div><div class='ctx'> 	/* enable interrupt */</div><div class='del'>-	writel( APINT5EN | APINT4EN | APINT3EN | APINT2EN | APINT1EN |</div><div class='add'>+	writel(APINT5EN | APINT4EN | APINT3EN | APINT2EN | APINT1EN |</div><div class='ctx'> 		APINT0EN | MIIPDTINTEN | MCCIINTEN | MCCINTEN | MREINTEN |</div><div class='ctx'> 		SPNDINTEN | MPINTEN | SINTEN | STINTEN, mmio + INTEN0);</div><div class='ctx'> </div><div class='ctx'> 	writel(VAL3 | LCINTEN | VAL1 | TINTEN0 | VAL0 | RINTEN0, mmio + INTEN0);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize tx and rx ring base addresses */</div><div class='del'>-	writel((u32)lp-&gt;tx_ring_dma_addr,mmio + XMT_RING_BASE_ADDR0);</div><div class='del'>-	writel((u32)lp-&gt;rx_ring_dma_addr,mmio+ RCV_RING_BASE_ADDR0);</div><div class='add'>+	writel((u32)lp-&gt;tx_ring_dma_addr, mmio + XMT_RING_BASE_ADDR0);</div><div class='add'>+	writel((u32)lp-&gt;rx_ring_dma_addr, mmio + RCV_RING_BASE_ADDR0);</div><div class='ctx'> </div><div class='ctx'> 	writew((u32)NUM_TX_RING_DR, mmio + XMT_RING_LEN0);</div><div class='ctx'> 	writew((u16)NUM_RX_RING_DR, mmio + RCV_RING_LEN0);</div><div class='ctx'> </div><div class='ctx'> 	/* set default IPG to 96 */</div><div class='del'>-	writew((u32)DEFAULT_IPG,mmio+IPG);</div><div class='add'>+	writew((u32)DEFAULT_IPG, mmio + IPG);</div><div class='ctx'> 	writew((u32)(DEFAULT_IPG-IFS1_DELTA), mmio + IFS1);</div><div class='ctx'> </div><div class='del'>-	if(lp-&gt;options &amp; OPTION_JUMBO_ENABLE){</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_JUMBO_ENABLE) {</div><div class='ctx'> 		writel((u32)VAL2|JUMBO, mmio + CMD3);</div><div class='ctx'> 		/* Reset REX_UFLO */</div><div class='del'>-		writel( REX_UFLO, mmio + CMD2);</div><div class='add'>+		writel(REX_UFLO, mmio + CMD2);</div><div class='ctx'> 		/* Should not set REX_UFLO for jumbo frames */</div><div class='del'>-		writel( VAL0 | APAD_XMT|REX_RTRY , mmio + CMD2);</div><div class='del'>-	}else{</div><div class='del'>-		writel( VAL0 | APAD_XMT | REX_RTRY|REX_UFLO, mmio + CMD2);</div><div class='add'>+		writel(VAL0 | APAD_XMT | REX_RTRY, mmio + CMD2);</div><div class='add'>+	} else {</div><div class='add'>+		writel(VAL0 | APAD_XMT | REX_RTRY | REX_UFLO, mmio + CMD2);</div><div class='ctx'> 		writel((u32)JUMBO, mmio + CMD3);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #if AMD8111E_VLAN_TAG_USED</div><div class='del'>-	writel((u32) VAL2|VSIZE|VL_TAG_DEL, mmio + CMD3);</div><div class='add'>+	writel((u32)VAL2 | VSIZE | VL_TAG_DEL, mmio + CMD3);</div><div class='ctx'> #endif</div><div class='del'>-	writel( VAL0 | APAD_XMT | REX_RTRY, mmio + CMD2 );</div><div class='add'>+	writel(VAL0 | APAD_XMT | REX_RTRY, mmio + CMD2);</div><div class='ctx'> </div><div class='ctx'> 	/* Setting the MAC address to the device */</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		writeb( dev-&gt;dev_addr[i], mmio + PADR + i );</div><div class='add'>+		writeb(dev-&gt;dev_addr[i], mmio + PADR + i);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable interrupt coalesce */</div><div class='del'>-	if(lp-&gt;options &amp; OPTION_INTR_COAL_ENABLE){</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_INTR_COAL_ENABLE) {</div><div class='ctx'> 		netdev_info(dev, "Interrupt Coalescing Enabled.\n");</div><div class='del'>-		amd8111e_set_coalesce(dev,ENABLE_COAL);</div><div class='add'>+		amd8111e_set_coalesce(dev, ENABLE_COAL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* set RUN bit to start the chip */</div><div class='hunk'>@@ -495,11 +498,11 @@ static int amd8111e_restart(struct net_device *dev)</div><div class='ctx'> static void amd8111e_init_hw_default(struct amd8111e_priv *lp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int reg_val;</div><div class='del'>-	unsigned int logic_filter[2] ={0,};</div><div class='add'>+	unsigned int logic_filter[2] = {0,};</div><div class='ctx'> 	void __iomem *mmio = lp-&gt;mmio;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-        /* stop the chip */</div><div class='add'>+	/* stop the chip */</div><div class='ctx'> 	writel(RUN, mmio + CMD0);</div><div class='ctx'> </div><div class='ctx'> 	/* AUTOPOLL0 Register *//*TBD default value is 8100 in FPS */</div><div class='hunk'>@@ -515,13 +518,13 @@ static void amd8111e_init_hw_default(struct amd8111e_priv *lp)</div><div class='ctx'> 	writel(0, mmio + XMT_RING_BASE_ADDR3);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear CMD0  */</div><div class='del'>-	writel(CMD0_CLEAR,mmio + CMD0);</div><div class='add'>+	writel(CMD0_CLEAR, mmio + CMD0);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear CMD2 */</div><div class='del'>-	writel(CMD2_CLEAR, mmio +CMD2);</div><div class='add'>+	writel(CMD2_CLEAR, mmio + CMD2);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear CMD7 */</div><div class='del'>-	writel(CMD7_CLEAR , mmio + CMD7);</div><div class='add'>+	writel(CMD7_CLEAR, mmio + CMD7);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear DLY_INT_A and DLY_INT_B */</div><div class='ctx'> 	writel(0x0, mmio + DLY_INT_A);</div><div class='hunk'>@@ -538,16 +541,16 @@ static void amd8111e_init_hw_default(struct amd8111e_priv *lp)</div><div class='ctx'> 	writel(0x0, mmio + STVAL);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear INTEN0 */</div><div class='del'>-	writel( INTEN0_CLEAR, mmio + INTEN0);</div><div class='add'>+	writel(INTEN0_CLEAR, mmio + INTEN0);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear LADRF */</div><div class='del'>-	writel(0x0 , mmio + LADRF);</div><div class='add'>+	writel(0x0, mmio + LADRF);</div><div class='ctx'> </div><div class='ctx'> 	/* Set SRAM_SIZE &amp; SRAM_BOUNDARY registers  */</div><div class='del'>-	writel( 0x80010,mmio + SRAM_SIZE);</div><div class='add'>+	writel(0x80010, mmio + SRAM_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear RCV_RING0_LEN */</div><div class='del'>-	writel(0x0, mmio +  RCV_RING_LEN0);</div><div class='add'>+	writel(0x0, mmio + RCV_RING_LEN0);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear XMT_RING0/1/2/3_LEN */</div><div class='ctx'> 	writel(0x0, mmio +  XMT_RING_LEN0);</div><div class='hunk'>@@ -567,10 +570,10 @@ static void amd8111e_init_hw_default(struct amd8111e_priv *lp)</div><div class='ctx'> 	/* SRAM_SIZE register */</div><div class='ctx'> 	reg_val = readl(mmio + SRAM_SIZE);</div><div class='ctx'> </div><div class='del'>-	if(lp-&gt;options &amp; OPTION_JUMBO_ENABLE)</div><div class='del'>-		writel( VAL2|JUMBO, mmio + CMD3);</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_JUMBO_ENABLE)</div><div class='add'>+		writel(VAL2 | JUMBO, mmio + CMD3);</div><div class='ctx'> #if AMD8111E_VLAN_TAG_USED</div><div class='del'>-	writel(VAL2|VSIZE|VL_TAG_DEL, mmio + CMD3 );</div><div class='add'>+	writel(VAL2 | VSIZE | VL_TAG_DEL, mmio + CMD3);</div><div class='ctx'> #endif</div><div class='ctx'> 	/* Set default value to CTRL1 Register */</div><div class='ctx'> 	writel(CTRL1_DEFAULT, mmio + CTRL1);</div><div class='hunk'>@@ -612,17 +615,17 @@ static void amd8111e_stop_chip(struct amd8111e_priv *lp)</div><div class='ctx'> static void amd8111e_free_ring(struct amd8111e_priv *lp)</div><div class='ctx'> {</div><div class='ctx'> 	/* Free transmit and receive descriptor rings */</div><div class='del'>-	if(lp-&gt;rx_ring){</div><div class='del'>-		pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-			sizeof(struct amd8111e_rx_dr)*NUM_RX_RING_DR,</div><div class='del'>-			lp-&gt;rx_ring, lp-&gt;rx_ring_dma_addr);</div><div class='add'>+	if (lp-&gt;rx_ring) {</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+				  sizeof(struct amd8111e_rx_dr) * NUM_RX_RING_DR,</div><div class='add'>+				  lp-&gt;rx_ring, lp-&gt;rx_ring_dma_addr);</div><div class='ctx'> 		lp-&gt;rx_ring = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(lp-&gt;tx_ring){</div><div class='del'>-		pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-			sizeof(struct amd8111e_tx_dr)*NUM_TX_RING_DR,</div><div class='del'>-			lp-&gt;tx_ring, lp-&gt;tx_ring_dma_addr);</div><div class='add'>+	if (lp-&gt;tx_ring) {</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+				  sizeof(struct amd8111e_tx_dr) * NUM_TX_RING_DR,</div><div class='add'>+				  lp-&gt;tx_ring, lp-&gt;tx_ring_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;tx_ring = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -639,20 +642,21 @@ static int amd8111e_tx(struct net_device *dev)</div><div class='ctx'> 	int tx_index;</div><div class='ctx'> 	int status;</div><div class='ctx'> 	/* Complete all the transmit packet */</div><div class='del'>-	while (lp-&gt;tx_complete_idx != lp-&gt;tx_idx){</div><div class='add'>+	while (lp-&gt;tx_complete_idx != lp-&gt;tx_idx) {</div><div class='ctx'> 		tx_index =  lp-&gt;tx_complete_idx &amp; TX_RING_DR_MOD_MASK;</div><div class='ctx'> 		status = le16_to_cpu(lp-&gt;tx_ring[tx_index].tx_flags);</div><div class='ctx'> </div><div class='del'>-		if(status &amp; OWN_BIT)</div><div class='add'>+		if (status &amp; OWN_BIT)</div><div class='ctx'> 			break;	/* It still hasn't been Txed */</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;tx_ring[tx_index].buff_phy_addr = 0;</div><div class='ctx'> </div><div class='ctx'> 		/* We must free the original skb */</div><div class='ctx'> 		if (lp-&gt;tx_skbuff[tx_index]) {</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev, lp-&gt;tx_dma_addr[tx_index],</div><div class='del'>-				  	lp-&gt;tx_skbuff[tx_index]-&gt;len,</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 lp-&gt;tx_dma_addr[tx_index],</div><div class='add'>+					 lp-&gt;tx_skbuff[tx_index]-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_consume_skb_irq(lp-&gt;tx_skbuff[tx_index]);</div><div class='ctx'> 			lp-&gt;tx_skbuff[tx_index] = NULL;</div><div class='ctx'> 			lp-&gt;tx_dma_addr[tx_index] = 0;</div><div class='hunk'>@@ -664,10 +668,10 @@ static int amd8111e_tx(struct net_device *dev)</div><div class='ctx'> 			le16_to_cpu(lp-&gt;tx_ring[tx_index].buff_count);</div><div class='ctx'> </div><div class='ctx'> 		if (netif_queue_stopped(dev) &amp;&amp;</div><div class='del'>-			lp-&gt;tx_complete_idx &gt; lp-&gt;tx_idx - NUM_TX_BUFFERS +2){</div><div class='add'>+			lp-&gt;tx_complete_idx &gt; lp-&gt;tx_idx - NUM_TX_BUFFERS + 2) {</div><div class='ctx'> 			/* The ring is no longer full, clear tbusy. */</div><div class='ctx'> 			/* lp-&gt;tx_full = 0; */</div><div class='del'>-			netif_wake_queue (dev);</div><div class='add'>+			netif_wake_queue(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -680,7 +684,7 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct net_device *dev = lp-&gt;amd8111e_net_dev;</div><div class='ctx'> 	int rx_index = lp-&gt;rx_idx &amp; RX_RING_DR_MOD_MASK;</div><div class='ctx'> 	void __iomem *mmio = lp-&gt;mmio;</div><div class='del'>-	struct sk_buff *skb,*new_skb;</div><div class='add'>+	struct sk_buff *skb, *new_skb;</div><div class='ctx'> 	int min_pkt_len, status;</div><div class='ctx'> 	int num_rx_pkt = 0;</div><div class='ctx'> 	short pkt_len;</div><div class='hunk'>@@ -705,7 +709,7 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			goto err_next_pkt;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* check for STP and ENP */</div><div class='del'>-		if (!((status &amp; STP_BIT) &amp;&amp; (status &amp; ENP_BIT))){</div><div class='add'>+		if (!((status &amp; STP_BIT) &amp;&amp; (status &amp; ENP_BIT))) {</div><div class='ctx'> 			/* resetting flags */</div><div class='ctx'> 			lp-&gt;rx_ring[rx_index].rx_flags &amp;= RESET_RX_FLAGS;</div><div class='ctx'> 			goto err_next_pkt;</div><div class='hunk'>@@ -738,19 +742,19 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 		skb_reserve(new_skb, 2);</div><div class='ctx'> 		skb = lp-&gt;rx_skbuff[rx_index];</div><div class='del'>-		pci_unmap_single(lp-&gt;pci_dev,lp-&gt;rx_dma_addr[rx_index],</div><div class='del'>-				 lp-&gt;rx_buff_len-2, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;rx_dma_addr[rx_index],</div><div class='add'>+				 lp-&gt;rx_buff_len - 2, DMA_FROM_DEVICE);</div><div class='ctx'> 		skb_put(skb, pkt_len);</div><div class='ctx'> 		lp-&gt;rx_skbuff[rx_index] = new_skb;</div><div class='del'>-		lp-&gt;rx_dma_addr[rx_index] = pci_map_single(lp-&gt;pci_dev,</div><div class='add'>+		lp-&gt;rx_dma_addr[rx_index] = dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 							   new_skb-&gt;data,</div><div class='del'>-							   lp-&gt;rx_buff_len-2,</div><div class='del'>-							   PCI_DMA_FROMDEVICE);</div><div class='add'>+							   lp-&gt;rx_buff_len - 2,</div><div class='add'>+							   DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> </div><div class='ctx'> #if AMD8111E_VLAN_TAG_USED</div><div class='del'>-		if (vtag == TT_VLAN_TAGGED){</div><div class='add'>+		if (vtag == TT_VLAN_TAGGED) {</div><div class='ctx'> 			u16 vlan_tag = le16_to_cpu(lp-&gt;rx_ring[rx_index].tag_ctrl_info);</div><div class='ctx'> 			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -788,25 +792,25 @@ err_next_pkt:</div><div class='ctx'> static int amd8111e_link_change(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='del'>-	int status0,speed;</div><div class='add'>+	int status0, speed;</div><div class='ctx'> </div><div class='ctx'> 	/* read the link change */</div><div class='del'>-     	status0 = readl(lp-&gt;mmio + STAT0);</div><div class='add'>+	status0 = readl(lp-&gt;mmio + STAT0);</div><div class='ctx'> </div><div class='del'>-	if(status0 &amp; LINK_STATS){</div><div class='del'>-		if(status0 &amp; AUTONEG_COMPLETE)</div><div class='add'>+	if (status0 &amp; LINK_STATS) {</div><div class='add'>+		if (status0 &amp; AUTONEG_COMPLETE)</div><div class='ctx'> 			lp-&gt;link_config.autoneg = AUTONEG_ENABLE;</div><div class='ctx'> 		else</div><div class='ctx'> 			lp-&gt;link_config.autoneg = AUTONEG_DISABLE;</div><div class='ctx'> </div><div class='del'>-		if(status0 &amp; FULL_DPLX)</div><div class='add'>+		if (status0 &amp; FULL_DPLX)</div><div class='ctx'> 			lp-&gt;link_config.duplex = DUPLEX_FULL;</div><div class='ctx'> 		else</div><div class='ctx'> 			lp-&gt;link_config.duplex = DUPLEX_HALF;</div><div class='ctx'> 		speed = (status0 &amp; SPEED_MASK) &gt;&gt; 7;</div><div class='del'>-		if(speed == PHY_SPEED_10)</div><div class='add'>+		if (speed == PHY_SPEED_10)</div><div class='ctx'> 			lp-&gt;link_config.speed = SPEED_10;</div><div class='del'>-		else if(speed == PHY_SPEED_100)</div><div class='add'>+		else if (speed == PHY_SPEED_100)</div><div class='ctx'> 			lp-&gt;link_config.speed = SPEED_100;</div><div class='ctx'> </div><div class='ctx'> 		netdev_info(dev, "Link is Up. Speed is %s Mbps %s Duplex\n",</div><div class='hunk'>@@ -816,8 +820,7 @@ static int amd8111e_link_change(struct net_device *dev)</div><div class='ctx'> 							"Full" : "Half");</div><div class='ctx'> </div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='del'>-	}</div><div class='del'>-	else{</div><div class='add'>+	} else {</div><div class='ctx'> 		lp-&gt;link_config.speed = SPEED_INVALID;</div><div class='ctx'> 		lp-&gt;link_config.duplex = DUPLEX_INVALID;</div><div class='ctx'> 		lp-&gt;link_config.autoneg = AUTONEG_INVALID;</div><div class='hunk'>@@ -835,7 +838,7 @@ static int amd8111e_read_mib(void __iomem *mmio, u8 MIB_COUNTER)</div><div class='ctx'> 	unsigned  int data;</div><div class='ctx'> 	unsigned int repeat = REPEAT_CNT;</div><div class='ctx'> </div><div class='del'>-	writew( MIB_RD_CMD | MIB_COUNTER, mmio + MIB_ADDR);</div><div class='add'>+	writew(MIB_RD_CMD | MIB_COUNTER, mmio + MIB_ADDR);</div><div class='ctx'> 	do {</div><div class='ctx'> 		status = readw(mmio + MIB_ADDR);</div><div class='ctx'> 		udelay(2);	/* controller takes MAX 2 us to get mib data */</div><div class='hunk'>@@ -858,7 +861,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (!lp-&gt;opened)</div><div class='ctx'> 		return new_stats;</div><div class='del'>-	spin_lock_irqsave (&amp;lp-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* stats.rx_packets */</div><div class='ctx'> 	new_stats-&gt;rx_packets = amd8111e_read_mib(mmio, rcv_broadcast_pkts)+</div><div class='hunk'>@@ -938,7 +941,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device *dev)</div><div class='ctx'> 	/* Reset the mibs for collecting new statistics */</div><div class='ctx'> 	/* writew(MIB_CLEAR, mmio + MIB_ADDR);*/</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore (&amp;lp-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return new_stats;</div><div class='ctx'> }</div><div class='hunk'>@@ -969,96 +972,90 @@ static int amd8111e_calc_coalesce(struct net_device *dev)</div><div class='ctx'> 	rx_data_rate = coal_conf-&gt;rx_bytes - coal_conf-&gt;rx_prev_bytes;</div><div class='ctx'> 	coal_conf-&gt;rx_prev_bytes =  coal_conf-&gt;rx_bytes;</div><div class='ctx'> </div><div class='del'>-	if(rx_pkt_rate &lt; 800){</div><div class='del'>-		if(coal_conf-&gt;rx_coal_type != NO_COALESCE){</div><div class='add'>+	if (rx_pkt_rate &lt; 800) {</div><div class='add'>+		if (coal_conf-&gt;rx_coal_type != NO_COALESCE) {</div><div class='ctx'> </div><div class='ctx'> 			coal_conf-&gt;rx_timeout = 0x0;</div><div class='ctx'> 			coal_conf-&gt;rx_event_count = 0;</div><div class='del'>-			amd8111e_set_coalesce(dev,RX_INTR_COAL);</div><div class='add'>+			amd8111e_set_coalesce(dev, RX_INTR_COAL);</div><div class='ctx'> 			coal_conf-&gt;rx_coal_type = NO_COALESCE;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	else{</div><div class='add'>+	} else {</div><div class='ctx'> </div><div class='ctx'> 		rx_pkt_size = rx_data_rate/rx_pkt_rate;</div><div class='del'>-		if (rx_pkt_size &lt; 128){</div><div class='del'>-			if(coal_conf-&gt;rx_coal_type != NO_COALESCE){</div><div class='add'>+		if (rx_pkt_size &lt; 128) {</div><div class='add'>+			if (coal_conf-&gt;rx_coal_type != NO_COALESCE) {</div><div class='ctx'> </div><div class='ctx'> 				coal_conf-&gt;rx_timeout = 0;</div><div class='ctx'> 				coal_conf-&gt;rx_event_count = 0;</div><div class='del'>-				amd8111e_set_coalesce(dev,RX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, RX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;rx_coal_type = NO_COALESCE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-		}</div><div class='del'>-		else if ( (rx_pkt_size &gt;= 128) &amp;&amp; (rx_pkt_size &lt; 512) ){</div><div class='add'>+		} else if ((rx_pkt_size &gt;= 128) &amp;&amp; (rx_pkt_size &lt; 512)) {</div><div class='ctx'> </div><div class='del'>-			if(coal_conf-&gt;rx_coal_type !=  LOW_COALESCE){</div><div class='add'>+			if (coal_conf-&gt;rx_coal_type !=  LOW_COALESCE) {</div><div class='ctx'> 				coal_conf-&gt;rx_timeout = 1;</div><div class='ctx'> 				coal_conf-&gt;rx_event_count = 4;</div><div class='del'>-				amd8111e_set_coalesce(dev,RX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, RX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;rx_coal_type = LOW_COALESCE;</div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		else if ((rx_pkt_size &gt;= 512) &amp;&amp; (rx_pkt_size &lt; 1024)){</div><div class='add'>+		} else if ((rx_pkt_size &gt;= 512) &amp;&amp; (rx_pkt_size &lt; 1024)) {</div><div class='ctx'> </div><div class='del'>-			if(coal_conf-&gt;rx_coal_type !=  MEDIUM_COALESCE){</div><div class='add'>+			if (coal_conf-&gt;rx_coal_type != MEDIUM_COALESCE) {</div><div class='ctx'> 				coal_conf-&gt;rx_timeout = 1;</div><div class='ctx'> 				coal_conf-&gt;rx_event_count = 4;</div><div class='del'>-				amd8111e_set_coalesce(dev,RX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, RX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;rx_coal_type = MEDIUM_COALESCE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-		}</div><div class='del'>-		else if(rx_pkt_size &gt;= 1024){</div><div class='del'>-			if(coal_conf-&gt;rx_coal_type !=  HIGH_COALESCE){</div><div class='add'>+		} else if (rx_pkt_size &gt;= 1024) {</div><div class='add'>+</div><div class='add'>+			if (coal_conf-&gt;rx_coal_type !=  HIGH_COALESCE) {</div><div class='ctx'> 				coal_conf-&gt;rx_timeout = 2;</div><div class='ctx'> 				coal_conf-&gt;rx_event_count = 3;</div><div class='del'>-				amd8111e_set_coalesce(dev,RX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, RX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;rx_coal_type = HIGH_COALESCE;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-    	/* NOW FOR TX INTR COALESC */</div><div class='del'>-	if(tx_pkt_rate &lt; 800){</div><div class='del'>-		if(coal_conf-&gt;tx_coal_type != NO_COALESCE){</div><div class='add'>+	/* NOW FOR TX INTR COALESC */</div><div class='add'>+	if (tx_pkt_rate &lt; 800) {</div><div class='add'>+		if (coal_conf-&gt;tx_coal_type != NO_COALESCE) {</div><div class='ctx'> </div><div class='ctx'> 			coal_conf-&gt;tx_timeout = 0x0;</div><div class='ctx'> 			coal_conf-&gt;tx_event_count = 0;</div><div class='del'>-			amd8111e_set_coalesce(dev,TX_INTR_COAL);</div><div class='add'>+			amd8111e_set_coalesce(dev, TX_INTR_COAL);</div><div class='ctx'> 			coal_conf-&gt;tx_coal_type = NO_COALESCE;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	else{</div><div class='add'>+	} else {</div><div class='ctx'> </div><div class='ctx'> 		tx_pkt_size = tx_data_rate/tx_pkt_rate;</div><div class='del'>-		if (tx_pkt_size &lt; 128){</div><div class='add'>+		if (tx_pkt_size &lt; 128) {</div><div class='ctx'> </div><div class='del'>-			if(coal_conf-&gt;tx_coal_type != NO_COALESCE){</div><div class='add'>+			if (coal_conf-&gt;tx_coal_type != NO_COALESCE) {</div><div class='ctx'> </div><div class='ctx'> 				coal_conf-&gt;tx_timeout = 0;</div><div class='ctx'> 				coal_conf-&gt;tx_event_count = 0;</div><div class='del'>-				amd8111e_set_coalesce(dev,TX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, TX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;tx_coal_type = NO_COALESCE;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-		}</div><div class='del'>-		else if ( (tx_pkt_size &gt;= 128) &amp;&amp; (tx_pkt_size &lt; 512) ){</div><div class='add'>+		} else if ((tx_pkt_size &gt;= 128) &amp;&amp; (tx_pkt_size &lt; 512)) {</div><div class='ctx'> </div><div class='del'>-			if(coal_conf-&gt;tx_coal_type !=  LOW_COALESCE){</div><div class='add'>+			if (coal_conf-&gt;tx_coal_type != LOW_COALESCE) {</div><div class='ctx'> 				coal_conf-&gt;tx_timeout = 1;</div><div class='ctx'> 				coal_conf-&gt;tx_event_count = 2;</div><div class='del'>-				amd8111e_set_coalesce(dev,TX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, TX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;tx_coal_type = LOW_COALESCE;</div><div class='ctx'> </div><div class='ctx'> 			}</div><div class='del'>-		}</div><div class='del'>-		else if ((tx_pkt_size &gt;= 512) &amp;&amp; (tx_pkt_size &lt; 1024)){</div><div class='add'>+		} else if ((tx_pkt_size &gt;= 512) &amp;&amp; (tx_pkt_size &lt; 1024)) {</div><div class='ctx'> </div><div class='del'>-			if(coal_conf-&gt;tx_coal_type !=  MEDIUM_COALESCE){</div><div class='add'>+			if (coal_conf-&gt;tx_coal_type != MEDIUM_COALESCE) {</div><div class='ctx'> 				coal_conf-&gt;tx_timeout = 2;</div><div class='ctx'> 				coal_conf-&gt;tx_event_count = 5;</div><div class='del'>-				amd8111e_set_coalesce(dev,TX_INTR_COAL);</div><div class='add'>+				amd8111e_set_coalesce(dev, TX_INTR_COAL);</div><div class='ctx'> 				coal_conf-&gt;tx_coal_type = MEDIUM_COALESCE;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else if (tx_pkt_size &gt;= 1024) {</div><div class='hunk'>@@ -1086,7 +1083,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	unsigned int intr0, intren0;</div><div class='ctx'> 	unsigned int handled = 1;</div><div class='ctx'> </div><div class='del'>-	if(unlikely(dev == NULL))</div><div class='add'>+	if (unlikely(!dev))</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -1100,7 +1097,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	/* Process all the INT event until INTR bit is clear. */</div><div class='ctx'> </div><div class='del'>-	if (!(intr0 &amp; INTR)){</div><div class='add'>+	if (!(intr0 &amp; INTR)) {</div><div class='ctx'> 		handled = 0;</div><div class='ctx'> 		goto err_no_interrupt;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1111,7 +1108,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	/* Check if Receive Interrupt has occurred. */</div><div class='ctx'> 	if (intr0 &amp; RINT0) {</div><div class='ctx'> 		if (napi_schedule_prep(&amp;lp-&gt;napi)) {</div><div class='del'>-			/* Disable receive interupts */</div><div class='add'>+			/* Disable receive interrupts */</div><div class='ctx'> 			writel(RINTEN0, mmio + INTEN0);</div><div class='ctx'> 			/* Schedule a polling routine */</div><div class='ctx'> 			__napi_schedule(&amp;lp-&gt;napi);</div><div class='hunk'>@@ -1135,7 +1132,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		amd8111e_calc_coalesce(dev);</div><div class='ctx'> </div><div class='ctx'> err_no_interrupt:</div><div class='del'>-	writel( VAL0 | INTREN,mmio + CMD0);</div><div class='add'>+	writel(VAL0 | INTREN, mmio + CMD0);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1175,8 +1172,8 @@ static int amd8111e_close(struct net_device *dev)</div><div class='ctx'> 	netif_carrier_off(lp-&gt;amd8111e_net_dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Delete ipg timer */</div><div class='del'>-	if(lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE)</div><div class='del'>-		del_timer_sync(&amp;lp-&gt;ipg_data.ipg_timer);</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE)</div><div class='add'>+		timer_delete_sync(&amp;lp-&gt;ipg_data.ipg_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='hunk'>@@ -1195,8 +1192,8 @@ static int amd8111e_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if(dev-&gt;irq ==0 || request_irq(dev-&gt;irq, amd8111e_interrupt, IRQF_SHARED,</div><div class='del'>-					 dev-&gt;name, dev))</div><div class='add'>+	if (dev-&gt;irq == 0 || request_irq(dev-&gt;irq, amd8111e_interrupt,</div><div class='add'>+					 IRQF_SHARED, dev-&gt;name, dev))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	napi_enable(&amp;lp-&gt;napi);</div><div class='hunk'>@@ -1205,7 +1202,7 @@ static int amd8111e_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	amd8111e_init_hw_default(lp);</div><div class='ctx'> </div><div class='del'>-	if(amd8111e_restart(dev)){</div><div class='add'>+	if (amd8111e_restart(dev)) {</div><div class='ctx'> 		spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 		napi_disable(&amp;lp-&gt;napi);</div><div class='ctx'> 		if (dev-&gt;irq)</div><div class='hunk'>@@ -1213,7 +1210,7 @@ static int amd8111e_open(struct net_device *dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Start ipg timer */</div><div class='del'>-	if(lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE){</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE) {</div><div class='ctx'> 		add_timer(&amp;lp-&gt;ipg_data.ipg_timer);</div><div class='ctx'> 		netdev_info(dev, "Dynamic IPG Enabled\n");</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1271,7 +1268,8 @@ static netdev_tx_t amd8111e_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	lp-&gt;tx_dma_addr[tx_index] =</div><div class='del'>-	    pci_map_single(lp-&gt;pci_dev, skb-&gt;data, skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	    dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+			   DMA_TO_DEVICE);</div><div class='ctx'> 	lp-&gt;tx_ring[tx_index].buff_phy_addr =</div><div class='ctx'> 	    cpu_to_le32(lp-&gt;tx_dma_addr[tx_index]);</div><div class='ctx'> </div><div class='hunk'>@@ -1283,10 +1281,10 @@ static netdev_tx_t amd8111e_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	lp-&gt;tx_idx++;</div><div class='ctx'> </div><div class='ctx'> 	/* Trigger an immediate send poll. */</div><div class='del'>-	writel( VAL1 | TDMD0, lp-&gt;mmio + CMD0);</div><div class='del'>-	writel( VAL2 | RDMD0,lp-&gt;mmio + CMD0);</div><div class='add'>+	writel(VAL1 | TDMD0, lp-&gt;mmio + CMD0);</div><div class='add'>+	writel(VAL2 | RDMD0, lp-&gt;mmio + CMD0);</div><div class='ctx'> </div><div class='del'>-	if(amd8111e_tx_queue_avail(lp) &lt; 0){</div><div class='add'>+	if (amd8111e_tx_queue_avail(lp) &lt; 0) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='hunk'>@@ -1320,15 +1318,15 @@ static void amd8111e_set_multicast_list(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='del'>-	u32 mc_filter[2] ;</div><div class='add'>+	u32 mc_filter[2];</div><div class='ctx'> 	int bit_num;</div><div class='ctx'> </div><div class='del'>-	if(dev-&gt;flags &amp; IFF_PROMISC){</div><div class='del'>-		writel( VAL2 | PROM, lp-&gt;mmio + CMD2);</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		writel(VAL2 | PROM, lp-&gt;mmio + CMD2);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	else</div><div class='del'>-		writel( PROM, lp-&gt;mmio + CMD2);</div><div class='add'>+		writel(PROM, lp-&gt;mmio + CMD2);</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_ALLMULTI ||</div><div class='ctx'> 	    netdev_mc_count(dev) &gt; MAX_FILTER_SIZE) {</div><div class='ctx'> 		/* get all multicast packet */</div><div class='hunk'>@@ -1365,11 +1363,10 @@ static void amd8111e_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	struct pci_dev *pci_dev = lp-&gt;pci_dev;</div><div class='del'>-	strlcpy(info-&gt;driver, MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, MODULE_VERS, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, MODULE_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='ctx'> 		"%u", chip_version);</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amd8111e_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -1434,7 +1431,7 @@ static int amd8111e_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol_</div><div class='ctx'> 	if (wol_info-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='ctx'> 		lp-&gt;options |=</div><div class='ctx'> 			(OPTION_WOL_ENABLE | OPTION_WAKE_MAGIC_ENABLE);</div><div class='del'>-	else if(wol_info-&gt;wolopts &amp; WAKE_PHY)</div><div class='add'>+	else if (wol_info-&gt;wolopts &amp; WAKE_PHY)</div><div class='ctx'> 		lp-&gt;options |=</div><div class='ctx'> 			(OPTION_WOL_ENABLE | OPTION_WAKE_PHY_ENABLE);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1459,18 +1456,18 @@ static const struct ethtool_ops ops = {</div><div class='ctx'>  * gets/sets driver speed, gets memory mapped register values, forces</div><div class='ctx'>  * auto negotiation, sets/gets WOL options for ethtool application.</div><div class='ctx'>  */</div><div class='del'>-static int amd8111e_ioctl(struct net_device *dev , struct ifreq *ifr, int cmd)</div><div class='add'>+static int amd8111e_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_ioctl_data *data = if_mii(ifr);</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u32 mii_regval;</div><div class='ctx'> </div><div class='del'>-	switch(cmd) {</div><div class='add'>+	switch (cmd) {</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		data-&gt;phy_id = lp-&gt;ext_phy_addr;</div><div class='ctx'> </div><div class='del'>-	/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIREG:</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -1502,11 +1499,11 @@ static int amd8111e_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct sockaddr *addr = p;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	/* Setting the MAC address to the device */</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		writeb( dev-&gt;dev_addr[i], lp-&gt;mmio + PADR + i );</div><div class='add'>+		writeb(dev-&gt;dev_addr[i], lp-&gt;mmio + PADR + i);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1523,30 +1520,30 @@ static int amd8111e_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		/* new_mtu will be used</div><div class='del'>-		 * when device starts netxt time</div><div class='add'>+		 * when device starts next time</div><div class='ctx'> 		 */</div><div class='del'>-		dev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-        /* stop the chip */</div><div class='add'>+	/* stop the chip */</div><div class='ctx'> 	writel(RUN, lp-&gt;mmio + CMD0);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	err = amd8111e_restart(dev);</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='del'>-	if(!err)</div><div class='add'>+	if (!err)</div><div class='ctx'> 		netif_start_queue(dev);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int amd8111e_enable_magicpkt(struct amd8111e_priv *lp)</div><div class='ctx'> {</div><div class='del'>-	writel( VAL1|MPPLBA, lp-&gt;mmio + CMD3);</div><div class='del'>-	writel( VAL0|MPEN_SW, lp-&gt;mmio + CMD7);</div><div class='add'>+	writel(VAL1 | MPPLBA, lp-&gt;mmio + CMD3);</div><div class='add'>+	writel(VAL0 | MPEN_SW, lp-&gt;mmio + CMD7);</div><div class='ctx'> </div><div class='ctx'> 	/* To eliminate PCI posting bug */</div><div class='ctx'> 	readl(lp-&gt;mmio + CMD7);</div><div class='hunk'>@@ -1556,8 +1553,8 @@ static int amd8111e_enable_magicpkt(struct amd8111e_priv *lp)</div><div class='ctx'> static int amd8111e_enable_link_change(struct amd8111e_priv *lp)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	/* Adapter is already stoped/suspended/interrupt-disabled */</div><div class='del'>-	writel(VAL0|LCMODE_SW,lp-&gt;mmio + CMD7);</div><div class='add'>+	/* Adapter is already stopped/suspended/interrupt-disabled */</div><div class='add'>+	writel(VAL0 | LCMODE_SW, lp-&gt;mmio + CMD7);</div><div class='ctx'> </div><div class='ctx'> 	/* To eliminate PCI posting bug */</div><div class='ctx'> 	readl(lp-&gt;mmio + CMD7);</div><div class='hunk'>@@ -1569,7 +1566,7 @@ static int amd8111e_enable_link_change(struct amd8111e_priv *lp)</div><div class='ctx'>  * failed or the interface is locked up. This function will reinitialize</div><div class='ctx'>  * the hardware.</div><div class='ctx'>  */</div><div class='del'>-static void amd8111e_tx_timeout(struct net_device *dev)</div><div class='add'>+static void amd8111e_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1579,12 +1576,13 @@ static void amd8111e_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	err = amd8111e_restart(dev);</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='del'>-	if(!err)</div><div class='add'>+	if (!err)</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='del'>-static int amd8111e_suspend(struct pci_dev *pci_dev, pm_message_t state)</div><div class='add'>+</div><div class='add'>+static int __maybe_unused amd8111e_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='hunk'>@@ -1599,52 +1597,41 @@ static int amd8111e_suspend(struct pci_dev *pci_dev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	/* stop chip */</div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='del'>-	if(lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE)</div><div class='del'>-		del_timer_sync(&amp;lp-&gt;ipg_data.ipg_timer);</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE)</div><div class='add'>+		timer_delete_sync(&amp;lp-&gt;ipg_data.ipg_timer);</div><div class='ctx'> 	amd8111e_stop_chip(lp);</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	if(lp-&gt;options &amp; OPTION_WOL_ENABLE){</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_WOL_ENABLE) {</div><div class='ctx'> 		 /* enable wol */</div><div class='del'>-		if(lp-&gt;options &amp; OPTION_WAKE_MAGIC_ENABLE)</div><div class='add'>+		if (lp-&gt;options &amp; OPTION_WAKE_MAGIC_ENABLE)</div><div class='ctx'> 			amd8111e_enable_magicpkt(lp);</div><div class='del'>-		if(lp-&gt;options &amp; OPTION_WAKE_PHY_ENABLE)</div><div class='add'>+		if (lp-&gt;options &amp; OPTION_WAKE_PHY_ENABLE)</div><div class='ctx'> 			amd8111e_enable_link_change(lp);</div><div class='ctx'> </div><div class='del'>-		pci_enable_wake(pci_dev, PCI_D3hot, 1);</div><div class='del'>-		pci_enable_wake(pci_dev, PCI_D3cold, 1);</div><div class='add'>+		device_set_wakeup_enable(dev_d, 1);</div><div class='ctx'> </div><div class='del'>-	}</div><div class='del'>-	else{</div><div class='del'>-		pci_enable_wake(pci_dev, PCI_D3hot, 0);</div><div class='del'>-		pci_enable_wake(pci_dev, PCI_D3cold, 0);</div><div class='add'>+	} else {</div><div class='add'>+		device_set_wakeup_enable(dev_d, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pci_dev);</div><div class='del'>-	pci_set_power_state(pci_dev, PCI_D3hot);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-static int amd8111e_resume(struct pci_dev *pci_dev)</div><div class='add'>+</div><div class='add'>+static int __maybe_unused amd8111e_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct amd8111e_priv *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci_dev, PCI_D0);</div><div class='del'>-	pci_restore_state(pci_dev);</div><div class='del'>-</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D3hot, 0);</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D3cold, 0); /* D3 cold */</div><div class='del'>-</div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;lp-&gt;lock);</div><div class='ctx'> 	amd8111e_restart(dev);</div><div class='ctx'> 	/* Restart ipg timer */</div><div class='del'>-	if(lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE)</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE)</div><div class='ctx'> 		mod_timer(&amp;lp-&gt;ipg_data.ipg_timer,</div><div class='ctx'> 				jiffies + IPG_CONVERGE_JIFFIES);</div><div class='ctx'> 	spin_unlock_irq(&amp;lp-&gt;lock);</div><div class='hunk'>@@ -1654,21 +1641,22 @@ static int amd8111e_resume(struct pci_dev *pci_dev)</div><div class='ctx'> </div><div class='ctx'> static void amd8111e_config_ipg(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct amd8111e_priv *lp = from_timer(lp, t, ipg_data.ipg_timer);</div><div class='add'>+	struct amd8111e_priv *lp = timer_container_of(lp, t,</div><div class='add'>+						      ipg_data.ipg_timer);</div><div class='ctx'> 	struct ipg_info *ipg_data = &amp;lp-&gt;ipg_data;</div><div class='ctx'> 	void __iomem *mmio = lp-&gt;mmio;</div><div class='ctx'> 	unsigned int prev_col_cnt = ipg_data-&gt;col_cnt;</div><div class='ctx'> 	unsigned int total_col_cnt;</div><div class='ctx'> 	unsigned int tmp_ipg;</div><div class='ctx'> </div><div class='del'>-	if(lp-&gt;link_config.duplex == DUPLEX_FULL){</div><div class='add'>+	if (lp-&gt;link_config.duplex == DUPLEX_FULL) {</div><div class='ctx'> 		ipg_data-&gt;ipg = DEFAULT_IPG;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(ipg_data-&gt;ipg_state == SSTATE){</div><div class='add'>+	if (ipg_data-&gt;ipg_state == SSTATE) {</div><div class='ctx'> </div><div class='del'>-		if(ipg_data-&gt;timer_tick == IPG_STABLE_TIME){</div><div class='add'>+		if (ipg_data-&gt;timer_tick == IPG_STABLE_TIME) {</div><div class='ctx'> </div><div class='ctx'> 			ipg_data-&gt;timer_tick = 0;</div><div class='ctx'> 			ipg_data-&gt;ipg = MIN_IPG - IPG_STEP;</div><div class='hunk'>@@ -1680,7 +1668,7 @@ static void amd8111e_config_ipg(struct timer_list *t)</div><div class='ctx'> 			ipg_data-&gt;timer_tick++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(ipg_data-&gt;ipg_state == CSTATE){</div><div class='add'>+	if (ipg_data-&gt;ipg_state == CSTATE) {</div><div class='ctx'> </div><div class='ctx'> 		/* Get the current collision count */</div><div class='ctx'> </div><div class='hunk'>@@ -1688,10 +1676,10 @@ static void amd8111e_config_ipg(struct timer_list *t)</div><div class='ctx'> 				amd8111e_read_mib(mmio, xmt_collisions);</div><div class='ctx'> </div><div class='ctx'> 		if ((total_col_cnt - prev_col_cnt) &lt;</div><div class='del'>-				(ipg_data-&gt;diff_col_cnt)){</div><div class='add'>+				(ipg_data-&gt;diff_col_cnt)) {</div><div class='ctx'> </div><div class='ctx'> 			ipg_data-&gt;diff_col_cnt =</div><div class='del'>-				total_col_cnt - prev_col_cnt ;</div><div class='add'>+				total_col_cnt - prev_col_cnt;</div><div class='ctx'> </div><div class='ctx'> 			ipg_data-&gt;ipg = ipg_data-&gt;current_ipg;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1700,7 +1688,7 @@ static void amd8111e_config_ipg(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 		if (ipg_data-&gt;current_ipg &lt;= MAX_IPG)</div><div class='ctx'> 			tmp_ipg = ipg_data-&gt;current_ipg;</div><div class='del'>-		else{</div><div class='add'>+		else {</div><div class='ctx'> 			tmp_ipg = ipg_data-&gt;ipg;</div><div class='ctx'> 			ipg_data-&gt;ipg_state = SSTATE;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1741,7 +1729,7 @@ static const struct net_device_ops amd8111e_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode	= amd8111e_set_multicast_list,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= amd8111e_set_mac_address,</div><div class='del'>-	.ndo_do_ioctl		= amd8111e_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= amd8111e_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= amd8111e_change_mtu,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	 = amd8111e_poll,</div><div class='hunk'>@@ -1752,24 +1740,25 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 				  const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	int err, i;</div><div class='del'>-	unsigned long reg_addr,reg_len;</div><div class='add'>+	unsigned long reg_addr, reg_len;</div><div class='ctx'> 	struct amd8111e_priv *lp;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='del'>-	if(err){</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot enable new PCI device\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if(!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)){</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot find PCI base address\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_disable_pdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, MODULE_NAME);</div><div class='del'>-	if(err){</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot obtain PCI resources\n");</div><div class='ctx'> 		goto err_disable_pdev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1784,7 +1773,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize DMA */</div><div class='del'>-	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) &lt; 0) {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32)) &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "DMA not supported\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_free_reg;</div><div class='hunk'>@@ -1802,13 +1791,12 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> #if AMD8111E_VLAN_TAG_USED</div><div class='del'>-	dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX ;</div><div class='add'>+	dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='ctx'> 	lp-&gt;pci_dev = pdev;</div><div class='ctx'> 	lp-&gt;amd8111e_net_dev = dev;</div><div class='del'>-	lp-&gt;pm_cap = pdev-&gt;pm_cap;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1821,28 +1809,26 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* Initializing MAC address */</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = readb(lp-&gt;mmio + PADR + i);</div><div class='add'>+		addr[i] = readb(lp-&gt;mmio + PADR + i);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Setting user defined parametrs */</div><div class='ctx'> 	lp-&gt;ext_phy_option = speed_duplex[card_idx];</div><div class='del'>-	if(coalesce[card_idx])</div><div class='add'>+	if (coalesce[card_idx])</div><div class='ctx'> 		lp-&gt;options |= OPTION_INTR_COAL_ENABLE;</div><div class='del'>-	if(dynamic_ipg[card_idx++])</div><div class='add'>+	if (dynamic_ipg[card_idx++])</div><div class='ctx'> 		lp-&gt;options |= OPTION_DYN_IPG_ENABLE;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* Initialize driver entry points */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;amd8111e_netdev_ops;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;ops;</div><div class='del'>-	dev-&gt;irq =pdev-&gt;irq;</div><div class='add'>+	dev-&gt;irq = pdev-&gt;irq;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = AMD8111E_TX_TIMEOUT;</div><div class='ctx'> 	dev-&gt;min_mtu = AMD8111E_MIN_MTU;</div><div class='ctx'> 	dev-&gt;max_mtu = AMD8111E_MAX_MTU;</div><div class='del'>-	netif_napi_add(dev, &amp;lp-&gt;napi, amd8111e_rx_poll, 32);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;lp-&gt;napi, amd8111e_rx_poll, 32);</div><div class='ctx'> </div><div class='del'>-#if AMD8111E_VLAN_TAG_USED</div><div class='del'>-	dev-&gt;features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;</div><div class='del'>-#endif</div><div class='ctx'> 	/* Probe the external PHY */</div><div class='ctx'> 	amd8111e_probe_ext_phy(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1865,7 +1851,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize software ipg timer */</div><div class='del'>-	if(lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE){</div><div class='add'>+	if (lp-&gt;options &amp; OPTION_DYN_IPG_ENABLE) {</div><div class='ctx'> 		timer_setup(&amp;lp-&gt;ipg_data.ipg_timer, amd8111e_config_ipg, 0);</div><div class='ctx'> 		lp-&gt;ipg_data.ipg_timer.expires = jiffies +</div><div class='ctx'> 						 IPG_CONVERGE_JIFFIES;</div><div class='hunk'>@@ -1874,8 +1860,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*  display driver and device information */</div><div class='del'>-    	chip_version = (readl(lp-&gt;mmio + CHIPID) &amp; 0xf0000000)&gt;&gt;28;</div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "AMD-8111e Driver Version: %s\n", MODULE_VERS);</div><div class='add'>+	chip_version = (readl(lp-&gt;mmio + CHIPID) &amp; 0xf0000000) &gt;&gt; 28;</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "[ Rev %x ] PCI 10/100BaseT Ethernet %pM\n",</div><div class='ctx'> 		 chip_version, dev-&gt;dev_addr);</div><div class='ctx'> 	if (lp-&gt;ext_phy_id)</div><div class='hunk'>@@ -1884,7 +1869,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev, "Couldn't detect MII PHY, assuming address 0x01\n");</div><div class='ctx'> </div><div class='del'>-    	return 0;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> err_free_dev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='hunk'>@@ -1921,13 +1906,14 @@ static const struct pci_device_id amd8111e_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(amd8111e_pm_ops, amd8111e_suspend, amd8111e_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver amd8111e_driver = {</div><div class='del'>-	.name   	= MODULE_NAME,</div><div class='add'>+	.name		= MODULE_NAME,</div><div class='ctx'> 	.id_table	= amd8111e_pci_tbl,</div><div class='ctx'> 	.probe		= amd8111e_probe_one,</div><div class='ctx'> 	.remove		= amd8111e_remove_one,</div><div class='del'>-	.suspend	= amd8111e_suspend,</div><div class='del'>-	.resume		= amd8111e_resume</div><div class='add'>+	.driver.pm	= &amp;amd8111e_pm_ops</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_pci_driver(amd8111e_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/amd8111e.h b/drivers/net/ethernet/amd/amd8111e.h<br/>index 493f154eccf4..e4ee4c28800c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/amd8111e.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/amd8111e.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/amd8111e.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/amd8111e.h</a></div><div class='hunk'>@@ -10,14 +10,14 @@ Module Name:</div><div class='ctx'> </div><div class='ctx'> Abstract:</div><div class='ctx'> </div><div class='del'>- 	 AMD8111 based 10/100 Ethernet Controller driver definitions.</div><div class='add'>+	 AMD8111 based 10/100 Ethernet Controller driver definitions.</div><div class='ctx'> </div><div class='ctx'> Environment:</div><div class='ctx'> </div><div class='ctx'> 	Kernel Mode</div><div class='ctx'> </div><div class='ctx'> Revision History:</div><div class='del'>- 	3.0.0</div><div class='add'>+	3.0.0</div><div class='ctx'> 	   Initial Revision.</div><div class='ctx'> 	3.0.1</div><div class='ctx'> */</div><div class='hunk'>@@ -550,7 +550,6 @@ typedef enum {</div><div class='ctx'> </div><div class='ctx'> /* Driver definitions */</div><div class='ctx'> </div><div class='del'>-#define	 PCI_VENDOR_ID_AMD		0x1022</div><div class='ctx'> #define  PCI_DEVICE_ID_AMD8111E_7462	0x7462</div><div class='ctx'> </div><div class='ctx'> #define MAX_UNITS			8 /* Maximum number of devices possible */</div><div class='hunk'>@@ -600,7 +599,7 @@ typedef enum {</div><div class='ctx'> #define CSTATE  1</div><div class='ctx'> #define SSTATE  2</div><div class='ctx'> </div><div class='del'>-/* Assume contoller gets data 10 times the maximum processing time */</div><div class='add'>+/* Assume controller gets data 10 times the maximum processing time */</div><div class='ctx'> #define  REPEAT_CNT			10</div><div class='ctx'> </div><div class='ctx'> /* amd8111e descriptor flag definitions */</div><div class='hunk'>@@ -692,7 +691,7 @@ enum coal_type{</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum coal_mode{</div><div class='del'>-       	RX_INTR_COAL,</div><div class='add'>+	RX_INTR_COAL,</div><div class='ctx'> 	TX_INTR_COAL,</div><div class='ctx'> 	DISABLE_COAL,</div><div class='ctx'> 	ENABLE_COAL,</div><div class='hunk'>@@ -764,7 +763,6 @@ struct amd8111e_priv{</div><div class='ctx'> 	u32 ext_phy_id;</div><div class='ctx'> </div><div class='ctx'> 	struct amd8111e_link_config link_config;</div><div class='del'>-	int pm_cap;</div><div class='ctx'> </div><div class='ctx'> 	struct net_device *next;</div><div class='ctx'> 	int mii;</div><div class='head'>diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c<br/>index 4b6a5cb85dd2..fa201da567ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/ariadne.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/ariadne.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/ariadne.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/ariadne.c</a></div><div class='hunk'>@@ -193,7 +193,7 @@ static int ariadne_rx(struct net_device *dev)</div><div class='ctx'> 			struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 			skb = netdev_alloc_skb(dev, pkt_len + 2);</div><div class='del'>-			if (skb == NULL) {</div><div class='add'>+			if (!skb) {</div><div class='ctx'> 				for (i = 0; i &lt; RX_RING_SIZE; i++)</div><div class='ctx'> 					if (lowb(priv-&gt;rx_ring[(entry + i) % RX_RING_SIZE]-&gt;RMD1) &amp; RF_OWN)</div><div class='ctx'> 						break;</div><div class='hunk'>@@ -441,11 +441,11 @@ static int ariadne_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Set the Ethernet Hardware Address */</div><div class='ctx'> 	lance-&gt;RAP = CSR12;		/* Physical Address Register, PADR[15:0] */</div><div class='del'>-	lance-&gt;RDP = ((u_short *)&amp;dev-&gt;dev_addr[0])[0];</div><div class='add'>+	lance-&gt;RDP = ((const u_short *)&amp;dev-&gt;dev_addr[0])[0];</div><div class='ctx'> 	lance-&gt;RAP = CSR13;		/* Physical Address Register, PADR[31:16] */</div><div class='del'>-	lance-&gt;RDP = ((u_short *)&amp;dev-&gt;dev_addr[0])[1];</div><div class='add'>+	lance-&gt;RDP = ((const u_short *)&amp;dev-&gt;dev_addr[0])[1];</div><div class='ctx'> 	lance-&gt;RAP = CSR14;		/* Physical Address Register, PADR[47:32] */</div><div class='del'>-	lance-&gt;RDP = ((u_short *)&amp;dev-&gt;dev_addr[0])[2];</div><div class='add'>+	lance-&gt;RDP = ((const u_short *)&amp;dev-&gt;dev_addr[0])[2];</div><div class='ctx'> </div><div class='ctx'> 	/* Set the Init Block Mode */</div><div class='ctx'> 	lance-&gt;RAP = CSR15;		/* Mode Register */</div><div class='hunk'>@@ -530,7 +530,7 @@ static inline void ariadne_reset(struct net_device *dev)</div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ariadne_tx_timeout(struct net_device *dev)</div><div class='add'>+static void ariadne_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	volatile struct Am79C960 *lance = (struct Am79C960 *)dev-&gt;base_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -717,6 +717,7 @@ static int ariadne_init_one(struct zorro_dev *z,</div><div class='ctx'> 	unsigned long mem_start = board + ARIADNE_RAM;</div><div class='ctx'> 	struct resource *r1, *r2;</div><div class='ctx'> 	struct net_device *dev;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	u32 serial;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -730,7 +731,7 @@ static int ariadne_init_one(struct zorro_dev *z,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct ariadne_private));</div><div class='del'>-	if (dev == NULL) {</div><div class='add'>+	if (!dev) {</div><div class='ctx'> 		release_mem_region(base_addr, sizeof(struct Am79C960));</div><div class='ctx'> 		release_mem_region(mem_start, ARIADNE_RAM_SIZE);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -740,12 +741,13 @@ static int ariadne_init_one(struct zorro_dev *z,</div><div class='ctx'> 	r2-&gt;name = dev-&gt;name;</div><div class='ctx'> </div><div class='ctx'> 	serial = be32_to_cpu(z-&gt;rom.er_SerialNumber);</div><div class='del'>-	dev-&gt;dev_addr[0] = 0x00;</div><div class='del'>-	dev-&gt;dev_addr[1] = 0x60;</div><div class='del'>-	dev-&gt;dev_addr[2] = 0x30;</div><div class='del'>-	dev-&gt;dev_addr[3] = (serial &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[4] = (serial &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	dev-&gt;dev_addr[5] = serial &amp; 0xff;</div><div class='add'>+	addr[0] = 0x00;</div><div class='add'>+	addr[1] = 0x60;</div><div class='add'>+	addr[2] = 0x30;</div><div class='add'>+	addr[3] = (serial &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+	addr[4] = (serial &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+	addr[5] = serial &amp; 0xff;</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long)ZTWO_VADDR(base_addr);</div><div class='ctx'> 	dev-&gt;mem_start = (unsigned long)ZTWO_VADDR(mem_start);</div><div class='ctx'> 	dev-&gt;mem_end = dev-&gt;mem_start + ARIADNE_RAM_SIZE;</div><div class='hunk'>@@ -788,4 +790,5 @@ static void __exit ariadne_cleanup_module(void)</div><div class='ctx'> module_init(ariadne_init_module);</div><div class='ctx'> module_exit(ariadne_cleanup_module);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Ariadne Ethernet Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c<br/>index d3d44e07afbc..8c8cc7d0f42d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/atarilance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/atarilance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/atarilance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/atarilance.c</a></div><div class='hunk'>@@ -79,6 +79,7 @@ static int lance_debug = 1;</div><div class='ctx'> #endif</div><div class='ctx'> module_param(lance_debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(lance_debug, "atarilance debug level (0-3)");</div><div class='add'>+MODULE_DESCRIPTION("Atari LANCE Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> /* Print debug messages on probing? */</div><div class='hunk'>@@ -156,7 +157,7 @@ struct lance_memory {</div><div class='ctx'> 	struct lance_init_block	init;</div><div class='ctx'> 	struct lance_tx_head	tx_head[TX_RING_SIZE];</div><div class='ctx'> 	struct lance_rx_head	rx_head[RX_RING_SIZE];</div><div class='del'>-	char					packet_area[0];	/* packet data follow after the</div><div class='add'>+	char					packet_area[];	/* packet data follow after the</div><div class='ctx'> 											 * init block and the ring</div><div class='ctx'> 											 * descriptors and are located</div><div class='ctx'> 											 * at runtime */</div><div class='hunk'>@@ -346,7 +347,7 @@ static int lance_rx( struct net_device *dev );</div><div class='ctx'> static int lance_close( struct net_device *dev );</div><div class='ctx'> static void set_multicast_list( struct net_device *dev );</div><div class='ctx'> static int lance_set_mac_address( struct net_device *dev, void *addr );</div><div class='del'>-static void lance_tx_timeout (struct net_device *dev);</div><div class='add'>+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> </div><div class='ctx'> /************************* End of Prototypes **************************/</div><div class='ctx'> </div><div class='hunk'>@@ -367,7 +368,7 @@ static void *slow_memcpy( void *dst, const void *src, size_t len )</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-struct net_device * __init atarilance_probe(int unit)</div><div class='add'>+static struct net_device * __init atarilance_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	static int found;</div><div class='hunk'>@@ -382,10 +383,6 @@ struct net_device * __init atarilance_probe(int unit)</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct lance_private));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (unit &gt;= 0) {</div><div class='del'>-		sprintf(dev-&gt;name, "eth%d", unit);</div><div class='del'>-		netdev_boot_setup_check(dev);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	for( i = 0; i &lt; N_LANCE_ADDR; ++i ) {</div><div class='ctx'> 		if (lance_probe1( dev, &amp;lance_addr_list[i] )) {</div><div class='hunk'>@@ -475,6 +472,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,</div><div class='ctx'> 	int 					i;</div><div class='ctx'> 	static int 				did_version;</div><div class='ctx'> 	unsigned short			save1, save2;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",</div><div class='ctx'> 				  (long)memaddr, (long)ioaddr ));</div><div class='hunk'>@@ -584,19 +582,21 @@ static unsigned long __init lance_probe1( struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	/* Get the ethernet address */</div><div class='ctx'> 	switch( lp-&gt;cardtype ) {</div><div class='del'>-	  case OLD_RIEBL:</div><div class='add'>+	case OLD_RIEBL:</div><div class='ctx'> 		/* No ethernet address! (Set some default address) */</div><div class='del'>-		memcpy(dev-&gt;dev_addr, OldRieblDefHwaddr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, OldRieblDefHwaddr);</div><div class='ctx'> 		break;</div><div class='del'>-	  case NEW_RIEBL:</div><div class='del'>-		lp-&gt;memcpy_f(dev-&gt;dev_addr, RIEBL_HWADDR_ADDR, ETH_ALEN);</div><div class='add'>+	case NEW_RIEBL:</div><div class='add'>+		lp-&gt;memcpy_f(addr, RIEBL_HWADDR_ADDR, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 		break;</div><div class='del'>-	  case PAM_CARD:</div><div class='add'>+	case PAM_CARD:</div><div class='ctx'> 		i = IO-&gt;eeprom;</div><div class='ctx'> 		for( i = 0; i &lt; 6; ++i )</div><div class='del'>-			dev-&gt;dev_addr[i] =</div><div class='add'>+			addr[i] =</div><div class='ctx'> 				((((unsigned short *)MEM)[i*2] &amp; 0x0f) &lt;&lt; 4) |</div><div class='ctx'> 				((((unsigned short *)MEM)[i*2+1] &amp; 0x0f));</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 		i = IO-&gt;mem;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -706,7 +706,7 @@ static void lance_init_ring( struct net_device *dev )</div><div class='ctx'> 		CHECK_OFFSET(offset);</div><div class='ctx'> 		MEM-&gt;tx_head[i].base = offset;</div><div class='ctx'> 		MEM-&gt;tx_head[i].flag = TMD1_OWN_HOST;</div><div class='del'>- 		MEM-&gt;tx_head[i].base_hi = 0;</div><div class='add'>+		MEM-&gt;tx_head[i].base_hi = 0;</div><div class='ctx'> 		MEM-&gt;tx_head[i].length = 0;</div><div class='ctx'> 		MEM-&gt;tx_head[i].misc = 0;</div><div class='ctx'> 		offset += PKT_BUF_SZ;</div><div class='hunk'>@@ -727,7 +727,7 @@ static void lance_init_ring( struct net_device *dev )</div><div class='ctx'> /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void lance_tx_timeout (struct net_device *dev)</div><div class='add'>+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> 	struct lance_ioreg	 *IO = lp-&gt;iobase;</div><div class='hunk'>@@ -825,7 +825,7 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	lp-&gt;memcpy_f( PKTBUF_ADDR(head), (void *)skb-&gt;data, skb-&gt;len );</div><div class='ctx'> 	head-&gt;flag = TMD1_OWN_CHIP | TMD1_ENP | TMD1_STP;</div><div class='ctx'> 	dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-	dev_kfree_skb( skb );</div><div class='add'>+	dev_consume_skb_irq(skb);</div><div class='ctx'> 	lp-&gt;cur_tx++;</div><div class='ctx'> 	while( lp-&gt;cur_tx &gt;= TX_RING_SIZE &amp;&amp; lp-&gt;dirty_tx &gt;= TX_RING_SIZE ) {</div><div class='ctx'> 		lp-&gt;cur_tx -= TX_RING_SIZE;</div><div class='hunk'>@@ -855,7 +855,7 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id )</div><div class='ctx'> 	int csr0, boguscnt = 10;</div><div class='ctx'> 	int handled = 0;</div><div class='ctx'> </div><div class='del'>-	if (dev == NULL) {</div><div class='add'>+	if (!dev) {</div><div class='ctx'> 		DPRINTK( 1, ( "lance_interrupt(): interrupt for unknown device.\n" ));</div><div class='ctx'> 		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -996,7 +996,7 @@ static int lance_rx( struct net_device *dev )</div><div class='ctx'> 			}</div><div class='ctx'> 			else {</div><div class='ctx'> 				skb = netdev_alloc_skb(dev, pkt_len + 2);</div><div class='del'>-				if (skb == NULL) {</div><div class='add'>+				if (!skb) {</div><div class='ctx'> 					for( i = 0; i &lt; RX_RING_SIZE; i++ )</div><div class='ctx'> 						if (MEM-&gt;rx_head[(entry+i) &amp; RX_RING_MOD_MASK].flag &amp;</div><div class='ctx'> 							RMD1_OWN_CHIP)</div><div class='hunk'>@@ -1127,7 +1127,7 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy( dev-&gt;dev_addr, saddr-&gt;sa_data, dev-&gt;addr_len );</div><div class='add'>+	eth_hw_addr_set(dev, saddr-&gt;sa_data);</div><div class='ctx'> 	for( i = 0; i &lt; 6; i++ )</div><div class='ctx'> 		MEM-&gt;init.hwaddr[i] = dev-&gt;dev_addr[i^1]; /* &lt;- 16 bit swap! */</div><div class='ctx'> 	lp-&gt;memcpy_f( RIEBL_HWADDR_ADDR, dev-&gt;dev_addr, 6 );</div><div class='hunk'>@@ -1137,13 +1137,11 @@ static int lance_set_mac_address( struct net_device *dev, void *addr )</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='ctx'> static struct net_device *atarilance_dev;</div><div class='ctx'> </div><div class='ctx'> static int __init atarilance_module_init(void)</div><div class='ctx'> {</div><div class='del'>-	atarilance_dev = atarilance_probe(-1);</div><div class='add'>+	atarilance_dev = atarilance_probe();</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(atarilance_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1155,12 +1153,3 @@ static void __exit atarilance_module_exit(void)</div><div class='ctx'> }</div><div class='ctx'> module_init(atarilance_module_init);</div><div class='ctx'> module_exit(atarilance_module_exit);</div><div class='del'>-#endif /* MODULE */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- *  c-indent-level: 4</div><div class='del'>- *  tab-width: 4</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c<br/>index e5073aeea06a..9d35ac348ebe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/au1000_eth.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/au1000_eth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/au1000_eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/au1000_eth.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='ctx'>  * Alchemy Au1x00 ethernet driver</div><div class='hunk'>@@ -14,24 +15,6 @@</div><div class='ctx'>  *</div><div class='ctx'>  * Author: MontaVista Software, Inc.</div><div class='ctx'>  *		ppopov@mvista.com or source@mvista.com</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='hunk'>@@ -80,14 +63,12 @@ static int au1000_debug = 3;</div><div class='ctx'> 				NETIF_MSG_LINK)</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"au1000_eth"</div><div class='del'>-#define DRV_VERSION	"1.7"</div><div class='ctx'> #define DRV_AUTHOR	"Pete Popov &lt;ppopov@embeddedalley.com&gt;"</div><div class='ctx'> #define DRV_DESC	"Au1xxx on-chip Ethernet driver"</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR(DRV_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESC);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> /* AU1000 MAC registers and bits */</div><div class='ctx'> #define MAC_CONTROL		0x0</div><div class='hunk'>@@ -260,7 +241,6 @@ MODULE_VERSION(DRV_VERSION);</div><div class='ctx'>  * ps: make sure the used irqs are configured properly in the board</div><div class='ctx'>  * specific irq-map</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static void au1000_enable_mac(struct net_device *dev, int force_reset)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -575,7 +555,6 @@ static int au1000_mii_probe(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Buffer allocation/deallocation routines. The buffer descriptor returned</div><div class='ctx'>  * has the virtual and dma address of a buffer suitable for</div><div class='hunk'>@@ -592,7 +571,7 @@ static struct db_dest *au1000_GetFreeDB(struct au1000_private *aup)</div><div class='ctx'> 	return pDB;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void au1000_ReleaseDB(struct au1000_private *aup, struct db_dest *pDB)</div><div class='add'>+static void au1000_ReleaseDB(struct au1000_private *aup, struct db_dest *pDB)</div><div class='ctx'> {</div><div class='ctx'> 	struct db_dest *pDBfree = aup-&gt;pDBfree;</div><div class='ctx'> 	if (pDBfree)</div><div class='hunk'>@@ -666,14 +645,12 @@ au1000_setup_hw_rings(struct au1000_private *aup, void __iomem *tx_base)</div><div class='ctx'> /*</div><div class='ctx'>  * ethtool operations</div><div class='ctx'>  */</div><div class='del'>-</div><div class='ctx'> static void</div><div class='ctx'> au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct au1000_private *aup = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info), "%s %d", DRV_NAME,</div><div class='ctx'> 		 aup-&gt;mac_id);</div><div class='ctx'> }</div><div class='hunk'>@@ -699,7 +676,6 @@ static const struct ethtool_ops au1000_ethtool_ops = {</div><div class='ctx'> 	.set_link_ksettings = phy_ethtool_set_link_ksettings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Initialize the interface.</div><div class='ctx'>  *</div><div class='hunk'>@@ -810,7 +786,7 @@ static int au1000_rx(struct net_device *dev)</div><div class='ctx'> 			frmlen = (status &amp; RX_FRAME_LEN_MASK);</div><div class='ctx'> 			frmlen -= 4; /* Remove FCS */</div><div class='ctx'> 			skb = netdev_alloc_skb(dev, frmlen + 2);</div><div class='del'>-			if (skb == NULL) {</div><div class='add'>+			if (!skb) {</div><div class='ctx'> 				dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -844,7 +820,7 @@ static int au1000_rx(struct net_device *dev)</div><div class='ctx'> 				pr_cont("\n");</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		prxd-&gt;buff_stat = (u32)(pDB-&gt;dma_addr | RX_DMA_ENABLE);</div><div class='add'>+		prxd-&gt;buff_stat = lower_32_bits(pDB-&gt;dma_addr) | RX_DMA_ENABLE;</div><div class='ctx'> 		aup-&gt;rx_head = (aup-&gt;rx_head + 1) &amp; (NUM_RX_DMA - 1);</div><div class='ctx'> 		wmb(); /* drain writebuffer */</div><div class='ctx'> </div><div class='hunk'>@@ -1020,7 +996,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	ps-&gt;tx_packets++;</div><div class='ctx'> 	ps-&gt;tx_bytes += ptxd-&gt;len;</div><div class='ctx'> </div><div class='del'>-	ptxd-&gt;buff_stat = pDB-&gt;dma_addr | TX_DMA_ENABLE;</div><div class='add'>+	ptxd-&gt;buff_stat = lower_32_bits(pDB-&gt;dma_addr) | TX_DMA_ENABLE;</div><div class='ctx'> 	wmb(); /* drain writebuffer */</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	aup-&gt;tx_head = (aup-&gt;tx_head + 1) &amp; (NUM_TX_DMA - 1);</div><div class='hunk'>@@ -1031,7 +1007,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'>  * The Tx ring has been full longer than the watchdog timeout</div><div class='ctx'>  * value. The transmitter must be hung?</div><div class='ctx'>  */</div><div class='del'>-static void au1000_tx_timeout(struct net_device *dev)</div><div class='add'>+static void au1000_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	netdev_err(dev, "au1000_tx_timeout: dev=%p\n", dev);</div><div class='ctx'> 	au1000_reset_mac(dev);</div><div class='hunk'>@@ -1070,23 +1046,12 @@ static void au1000_multicast_list(struct net_device *dev)</div><div class='ctx'> 	writel(reg, &amp;aup-&gt;mac-&gt;control);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;phydev)</div><div class='del'>-		return -EINVAL; /* PHY not controllable */</div><div class='del'>-</div><div class='del'>-	return phy_mii_ioctl(dev-&gt;phydev, rq, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct net_device_ops au1000_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= au1000_open,</div><div class='ctx'> 	.ndo_stop		= au1000_close,</div><div class='ctx'> 	.ndo_start_xmit		= au1000_tx,</div><div class='ctx'> 	.ndo_set_rx_mode	= au1000_multicast_list,</div><div class='del'>-	.ndo_do_ioctl		= au1000_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl_running,</div><div class='ctx'> 	.ndo_tx_timeout		= au1000_tx_timeout,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='hunk'>@@ -1117,7 +1082,6 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to retrieve IRQ\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1167,10 +1131,9 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Allocate the data buffers</div><div class='ctx'> 	 * Snooping works fine with eth on all au1xxx</div><div class='ctx'> 	 */</div><div class='del'>-	aup-&gt;vaddr = (u32)dma_alloc_attrs(&amp;pdev-&gt;dev, MAX_BUF_SIZE *</div><div class='del'>-					  (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='del'>-					  &amp;aup-&gt;dma_addr, 0,</div><div class='del'>-					  DMA_ATTR_NON_CONSISTENT);</div><div class='add'>+	aup-&gt;vaddr = dma_alloc_coherent(&amp;pdev-&gt;dev, MAX_BUF_SIZE *</div><div class='add'>+					(NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='add'>+					&amp;aup-&gt;dma_addr, 0);</div><div class='ctx'> 	if (!aup-&gt;vaddr) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to allocate data buffers\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -1179,7 +1142,7 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* aup-&gt;mac is the base address of the MAC's registers */</div><div class='ctx'> 	aup-&gt;mac = (struct mac_reg *)</div><div class='del'>-			ioremap_nocache(base-&gt;start, resource_size(base));</div><div class='add'>+			ioremap(base-&gt;start, resource_size(base));</div><div class='ctx'> 	if (!aup-&gt;mac) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to ioremap MAC registers\n");</div><div class='ctx'> 		err = -ENXIO;</div><div class='hunk'>@@ -1187,7 +1150,7 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup some variables for quick register address access */</div><div class='del'>-	aup-&gt;enable = (u32 *)ioremap_nocache(macen-&gt;start,</div><div class='add'>+	aup-&gt;enable = (u32 *)ioremap(macen-&gt;start,</div><div class='ctx'> 						resource_size(macen));</div><div class='ctx'> 	if (!aup-&gt;enable) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to ioremap MAC enable register\n");</div><div class='hunk'>@@ -1196,7 +1159,7 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	aup-&gt;mac_id = pdev-&gt;id;</div><div class='ctx'> </div><div class='del'>-	aup-&gt;macdma = ioremap_nocache(macdma-&gt;start, resource_size(macdma));</div><div class='add'>+	aup-&gt;macdma = ioremap(macdma-&gt;start, resource_size(macdma));</div><div class='ctx'> 	if (!aup-&gt;macdma) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to ioremap MACDMA registers\n");</div><div class='ctx'> 		err = -ENXIO;</div><div class='hunk'>@@ -1215,7 +1178,7 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 		aup-&gt;phy1_search_mac0 = 1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (is_valid_ether_addr(pd-&gt;mac)) {</div><div class='del'>-			memcpy(dev-&gt;dev_addr, pd-&gt;mac, ETH_ALEN);</div><div class='add'>+			eth_hw_addr_set(dev, pd-&gt;mac);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Set a random MAC since no valid provided by platform_data. */</div><div class='ctx'> 			eth_hw_addr_random(dev);</div><div class='hunk'>@@ -1236,7 +1199,7 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	aup-&gt;mii_bus = mdiobus_alloc();</div><div class='del'>-	if (aup-&gt;mii_bus == NULL) {</div><div class='add'>+	if (!aup-&gt;mii_bus) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to allocate mdiobus structure\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_mdiobus_alloc;</div><div class='hunk'>@@ -1271,8 +1234,8 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (i = 0; i &lt; (NUM_TX_BUFFS+NUM_RX_BUFFS); i++) {</div><div class='ctx'> 		pDB-&gt;pnext = pDBfree;</div><div class='ctx'> 		pDBfree = pDB;</div><div class='del'>-		pDB-&gt;vaddr = (u32 *)((unsigned)aup-&gt;vaddr + MAX_BUF_SIZE*i);</div><div class='del'>-		pDB-&gt;dma_addr = (dma_addr_t)virt_to_bus(pDB-&gt;vaddr);</div><div class='add'>+		pDB-&gt;vaddr = aup-&gt;vaddr + MAX_BUF_SIZE * i;</div><div class='add'>+		pDB-&gt;dma_addr = aup-&gt;dma_addr + MAX_BUF_SIZE * i;</div><div class='ctx'> 		pDB++;</div><div class='ctx'> 	}</div><div class='ctx'> 	aup-&gt;pDBfree = pDBfree;</div><div class='hunk'>@@ -1283,17 +1246,16 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 		if (!pDB)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='del'>-		aup-&gt;rx_dma_ring[i]-&gt;buff_stat = (unsigned)pDB-&gt;dma_addr;</div><div class='add'>+		aup-&gt;rx_dma_ring[i]-&gt;buff_stat = lower_32_bits(pDB-&gt;dma_addr);</div><div class='ctx'> 		aup-&gt;rx_db_inuse[i] = pDB;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = -ENODEV;</div><div class='ctx'> 	for (i = 0; i &lt; NUM_TX_DMA; i++) {</div><div class='ctx'> 		pDB = au1000_GetFreeDB(aup);</div><div class='ctx'> 		if (!pDB)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='del'>-		aup-&gt;tx_dma_ring[i]-&gt;buff_stat = (unsigned)pDB-&gt;dma_addr;</div><div class='add'>+		aup-&gt;tx_dma_ring[i]-&gt;buff_stat = lower_32_bits(pDB-&gt;dma_addr);</div><div class='ctx'> 		aup-&gt;tx_dma_ring[i]-&gt;len = 0;</div><div class='ctx'> 		aup-&gt;tx_db_inuse[i] = pDB;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1319,12 +1281,10 @@ static int au1000_probe(struct platform_device *pdev)</div><div class='ctx'> 	netdev_info(dev, "Au1xx0 Ethernet found at 0x%lx, irq %d\n",</div><div class='ctx'> 			(unsigned long)base-&gt;start, irq);</div><div class='ctx'> </div><div class='del'>-	pr_info_once("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out:</div><div class='del'>-	if (aup-&gt;mii_bus != NULL)</div><div class='add'>+	if (aup-&gt;mii_bus)</div><div class='ctx'> 		mdiobus_unregister(aup-&gt;mii_bus);</div><div class='ctx'> </div><div class='ctx'> 	/* here we should have a valid dev plus aup-&gt; register addresses</div><div class='hunk'>@@ -1349,9 +1309,8 @@ err_remap3:</div><div class='ctx'> err_remap2:</div><div class='ctx'> 	iounmap(aup-&gt;mac);</div><div class='ctx'> err_remap1:</div><div class='del'>-	dma_free_attrs(&amp;pdev-&gt;dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='del'>-			(void *)aup-&gt;vaddr, aup-&gt;dma_addr,</div><div class='del'>-			DMA_ATTR_NON_CONSISTENT);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='add'>+			  aup-&gt;vaddr, aup-&gt;dma_addr);</div><div class='ctx'> err_vaddr:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> err_alloc:</div><div class='hunk'>@@ -1364,7 +1323,7 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int au1000_remove(struct platform_device *pdev)</div><div class='add'>+static void au1000_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct au1000_private *aup = netdev_priv(dev);</div><div class='hunk'>@@ -1383,9 +1342,8 @@ static int au1000_remove(struct platform_device *pdev)</div><div class='ctx'> 		if (aup-&gt;tx_db_inuse[i])</div><div class='ctx'> 			au1000_ReleaseDB(aup, aup-&gt;tx_db_inuse[i]);</div><div class='ctx'> </div><div class='del'>-	dma_free_attrs(&amp;pdev-&gt;dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='del'>-			(void *)aup-&gt;vaddr, aup-&gt;dma_addr,</div><div class='del'>-			DMA_ATTR_NON_CONSISTENT);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),</div><div class='add'>+			  aup-&gt;vaddr, aup-&gt;dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(aup-&gt;macdma);</div><div class='ctx'> 	iounmap(aup-&gt;mac);</div><div class='hunk'>@@ -1401,8 +1359,6 @@ static int au1000_remove(struct platform_device *pdev)</div><div class='ctx'> 	release_mem_region(macen-&gt;start, resource_size(macen));</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver au1000_eth_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/amd/au1000_eth.h b/drivers/net/ethernet/amd/au1000_eth.h<br/>index 4c47c2377d74..2489c2f4fd8a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/au1000_eth.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/au1000_eth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/au1000_eth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/au1000_eth.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  *</div><div class='ctx'>  * Alchemy Au1x00 ethernet driver include file</div><div class='hunk'>@@ -5,24 +6,6 @@</div><div class='ctx'>  * Author: Pete Popov &lt;ppopov@mvista.com&gt;</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright 2001 MontaVista Software Inc.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can distribute it and/or modify it</div><div class='del'>- *  under the terms of the GNU General Public License (Version 2) as</div><div class='del'>- *  published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License</div><div class='del'>- *  for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License along</div><div class='del'>- *  with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * ########################################################################</div><div class='del'>- *</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -123,8 +106,8 @@ struct au1000_private {</div><div class='ctx'> 	struct mac_reg *mac;  /* mac registers                      */</div><div class='ctx'> 	u32 *enable;     /* address of MAC Enable Register     */</div><div class='ctx'> 	void __iomem *macdma;	/* base of MAC DMA port */</div><div class='del'>-	u32 vaddr;                /* virtual address of rx/tx buffers   */</div><div class='del'>-	dma_addr_t dma_addr;      /* dma address of rx/tx buffers       */</div><div class='add'>+	void *vaddr;		/* virtual address of rx/tx buffers   */</div><div class='add'>+	dma_addr_t dma_addr;	/* dma address of rx/tx buffers       */</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t lock;       /* Serialise access to device */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c<br/>index dac4a2fcad6a..8d05a0c5f2d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/declance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/declance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/declance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/declance.c</a></div><div class='hunk'>@@ -608,7 +608,7 @@ static int lance_rx(struct net_device *dev)</div><div class='ctx'> 			len = (*rds_ptr(rd, mblength, lp-&gt;type) &amp; 0xfff) - 4;</div><div class='ctx'> 			skb = netdev_alloc_skb(dev, len + 2);</div><div class='ctx'> </div><div class='del'>-			if (skb == 0) {</div><div class='add'>+			if (!skb) {</div><div class='ctx'> 				dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 				*rds_ptr(rd, mblength, lp-&gt;type) = 0;</div><div class='ctx'> 				*rds_ptr(rd, rmd1, lp-&gt;type) =</div><div class='hunk'>@@ -842,7 +842,7 @@ static int lance_close(struct net_device *dev)</div><div class='ctx'> 	volatile struct lance_regs *ll = lp-&gt;ll;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;multicast_timer);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;multicast_timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the card */</div><div class='ctx'> 	writereg(&amp;ll-&gt;rap, LE_CSR0);</div><div class='hunk'>@@ -884,7 +884,7 @@ static inline int lance_reset(struct net_device *dev)</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lance_tx_timeout(struct net_device *dev)</div><div class='add'>+static void lance_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> 	volatile struct lance_regs *ll = lp-&gt;ll;</div><div class='hunk'>@@ -937,7 +937,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>- 	return NETDEV_TX_OK;</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void lance_load_multicast(struct net_device *dev)</div><div class='hunk'>@@ -1004,7 +1004,7 @@ static void lance_set_multicast(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void lance_set_multicast_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp = from_timer(lp, t, multicast_timer);</div><div class='add'>+	struct lance_private *lp = timer_container_of(lp, t, multicast_timer);</div><div class='ctx'> 	struct net_device *dev = lp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	lance_set_multicast(dev);</div><div class='hunk'>@@ -1032,6 +1032,7 @@ static int dec_lance_probe(struct device *bdev, const int type)</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> 	unsigned long esar_base;</div><div class='ctx'> 	unsigned char *esar;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	const char *desc;</div><div class='ctx'> </div><div class='ctx'> 	if (dec_lance_debug &amp;&amp; version_printed++ == 0)</div><div class='hunk'>@@ -1228,7 +1229,8 @@ static int dec_lance_probe(struct device *bdev, const int type)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = esar[i * 4];</div><div class='add'>+		addr[i] = esar[i * 4];</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	printk("%s: %s, addr = %pM, irq = %d\n",</div><div class='ctx'> 	       name, desc, dev-&gt;dev_addr, dev-&gt;irq);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c<br/>index 1381a474063f..df42294530cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/hplance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/hplance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/hplance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/hplance.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> /* Used for the temporal inet entries and routing */</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/route.h&gt;</div><div class='hunk'>@@ -24,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "hplance.h"</div><div class='ctx'> </div><div class='hunk'>@@ -129,6 +129,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long va = (d-&gt;resource.start + DIO_VIRADDRBASE);</div><div class='ctx'> 	struct hplance_private *lp;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* reset the board */</div><div class='hunk'>@@ -144,9 +145,10 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)</div><div class='ctx'> 		/* The NVRAM holds our ethernet address, one nibble per byte,</div><div class='ctx'> 		 * at bytes NVRAMOFF+1,3,5,7,9...</div><div class='ctx'> 		 */</div><div class='del'>-		dev-&gt;dev_addr[i] = ((in_8(va + HPLANCE_NVRAMOFF + i*4 + 1) &amp; 0xF) &lt;&lt; 4)</div><div class='add'>+		addr[i] = ((in_8(va + HPLANCE_NVRAMOFF + i*4 + 1) &amp; 0xF) &lt;&lt; 4)</div><div class='ctx'> 			| (in_8(va + HPLANCE_NVRAMOFF + i*4 + 3) &amp; 0xF);</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='ctx'> 	lp-&gt;lance.name = d-&gt;name;</div><div class='hunk'>@@ -170,6 +172,7 @@ static void hplance_init(struct net_device *dev, struct dio_dev *d)</div><div class='ctx'> static void hplance_writerap(void *priv, unsigned short value)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = (struct lance_private *)priv;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		out_be16(lp-&gt;base + HPLANCE_REGOFF + LANCE_RAP, value);</div><div class='ctx'> 	} while ((in_8(lp-&gt;base + HPLANCE_STATUS) &amp; LE_ACK) == 0);</div><div class='hunk'>@@ -178,6 +181,7 @@ static void hplance_writerap(void *priv, unsigned short value)</div><div class='ctx'> static void hplance_writerdp(void *priv, unsigned short value)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = (struct lance_private *)priv;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		out_be16(lp-&gt;base + HPLANCE_REGOFF + LANCE_RDP, value);</div><div class='ctx'> 	} while ((in_8(lp-&gt;base + HPLANCE_STATUS) &amp; LE_ACK) == 0);</div><div class='hunk'>@@ -187,6 +191,7 @@ static unsigned short hplance_readrdp(void *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = (struct lance_private *)priv;</div><div class='ctx'> 	__u16 value;</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='ctx'> 		value = in_be16(lp-&gt;base + HPLANCE_REGOFF + LANCE_RDP);</div><div class='ctx'> 	} while ((in_8(lp-&gt;base + HPLANCE_STATUS) &amp; LE_ACK) == 0);</div><div class='hunk'>@@ -229,4 +234,5 @@ static void __exit hplance_cleanup_module(void)</div><div class='ctx'> module_init(hplance_init_module);</div><div class='ctx'> module_exit(hplance_cleanup_module);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("HP300 on-board LANCE Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c<br/>index f90b454b1642..b1e6620ad41d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/lance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/lance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/lance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/lance.c</a></div><div class='hunk'>@@ -59,6 +59,7 @@ static const char version[] = "lance.c:v1.16 2006/11/09 dplatt@3do.com, becker@c</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/mm.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;net/Space.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='hunk'>@@ -306,7 +307,7 @@ static irqreturn_t lance_interrupt(int irq, void *dev_id);</div><div class='ctx'> static int lance_close(struct net_device *dev);</div><div class='ctx'> static struct net_device_stats *lance_get_stats(struct net_device *dev);</div><div class='ctx'> static void set_multicast_list(struct net_device *dev);</div><div class='del'>-static void lance_tx_timeout (struct net_device *dev);</div><div class='add'>+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -327,7 +328,7 @@ MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)");</div><div class='ctx'> MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)");</div><div class='ctx'> MODULE_PARM_DESC(lance_debug, "LANCE/PCnet debug level (0-7)");</div><div class='ctx'> </div><div class='del'>-int __init init_module(void)</div><div class='add'>+static int __init lance_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int this_dev, found = 0;</div><div class='hunk'>@@ -356,6 +357,7 @@ int __init init_module(void)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	return -ENXIO;</div><div class='ctx'> }</div><div class='add'>+module_init(lance_init_module);</div><div class='ctx'> </div><div class='ctx'> static void cleanup_card(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -368,7 +370,7 @@ static void cleanup_card(struct net_device *dev)</div><div class='ctx'> 	kfree(lp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void __exit cleanup_module(void)</div><div class='add'>+static void __exit lance_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int this_dev;</div><div class='ctx'> </div><div class='hunk'>@@ -381,7 +383,9 @@ void __exit cleanup_module(void)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+module_exit(lance_cleanup_module);</div><div class='ctx'> #endif /* MODULE */</div><div class='add'>+MODULE_DESCRIPTION("AMD LANCE/PCnet Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -478,6 +482,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	int err = -ENOMEM;</div><div class='ctx'> 	void __iomem *bios;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	/* First we look for special cases.</div><div class='ctx'> 	   Check for HP's on-board ethernet by looking for 'HP' in the BIOS.</div><div class='hunk'>@@ -539,7 +544,8 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int</div><div class='ctx'> 	/* There is a 16 byte station address PROM at the base address.</div><div class='ctx'> 	   The first six bytes are the station address. */</div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = inb(ioaddr + i);</div><div class='add'>+		addr[i] = inb(ioaddr + i);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	printk("%pM", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = ioaddr;</div><div class='hunk'>@@ -780,7 +786,7 @@ lance_open(struct net_device *dev)</div><div class='ctx'> 		outw(0x0002, ioaddr+LANCE_ADDR);</div><div class='ctx'> 		/* Only touch autoselect bit. */</div><div class='ctx'> 		outw(inw(ioaddr+LANCE_BUS_IF) | 0x0002, ioaddr+LANCE_BUS_IF);</div><div class='del'>- 	}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (lance_debug &gt; 1)</div><div class='ctx'> 		printk("%s: lance_open() irq %d dma %d tx/rx rings %#x/%#x init %#x.\n",</div><div class='hunk'>@@ -812,7 +818,7 @@ lance_open(struct net_device *dev)</div><div class='ctx'> 	 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton</div><div class='ctx'> 	 * reports that doing so triggers a bug in the '974.</div><div class='ctx'> 	 */</div><div class='del'>- 	outw(0x0042, ioaddr+LANCE_DATA);</div><div class='add'>+	outw(0x0042, ioaddr+LANCE_DATA);</div><div class='ctx'> </div><div class='ctx'> 	if (lance_debug &gt; 2)</div><div class='ctx'> 		printk("%s: LANCE open after %d ticks, init block %#x csr0 %4.4x.\n",</div><div class='hunk'>@@ -876,7 +882,7 @@ lance_init_ring(struct net_device *dev, gfp_t gfp)</div><div class='ctx'> 			rx_buff = skb-&gt;data;</div><div class='ctx'> 		else</div><div class='ctx'> 			rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp);</div><div class='del'>-		if (rx_buff == NULL)</div><div class='add'>+		if (!rx_buff)</div><div class='ctx'> 			lp-&gt;rx_ring[i].base = 0;</div><div class='ctx'> 		else</div><div class='ctx'> 			lp-&gt;rx_ring[i].base = (u32)isa_virt_to_bus(rx_buff) | 0x80000000;</div><div class='hunk'>@@ -913,7 +919,7 @@ lance_restart(struct net_device *dev, unsigned int csr0_bits, int must_reinit)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void lance_tx_timeout (struct net_device *dev)</div><div class='add'>+static void lance_tx_timeout (struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = (struct lance_private *) dev-&gt;ml_priv;</div><div class='ctx'> 	int ioaddr = dev-&gt;base_addr;</div><div class='hunk'>@@ -997,7 +1003,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		skb_copy_from_linear_data(skb, &amp;lp-&gt;tx_bounce_buffs[entry], skb-&gt;len);</div><div class='ctx'> 		lp-&gt;tx_ring[entry].base =</div><div class='ctx'> 			((u32)isa_virt_to_bus((lp-&gt;tx_bounce_buffs + entry)) &amp; 0xffffff) | 0x83000000;</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		dev_consume_skb_irq(skb);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		lp-&gt;tx_skbuff[entry] = skb;</div><div class='ctx'> 		lp-&gt;tx_ring[entry].base = ((u32)isa_virt_to_bus(skb-&gt;data) &amp; 0xffffff) | 0x83000000;</div><div class='hunk'>@@ -1182,7 +1188,7 @@ lance_rx(struct net_device *dev)</div><div class='ctx'> 			else</div><div class='ctx'> 			{</div><div class='ctx'> 				skb = dev_alloc_skb(pkt_len+2);</div><div class='del'>-				if (skb == NULL)</div><div class='add'>+				if (!skb)</div><div class='ctx'> 				{</div><div class='ctx'> 					printk("%s: Memory squeeze, deferring packet.\n", dev-&gt;name);</div><div class='ctx'> 					for (i=0; i &lt; RX_RING_SIZE; i++)</div><div class='head'>diff --git a/drivers/net/ethernet/amd/mvme147.c b/drivers/net/ethernet/amd/mvme147.c<br/>index 72abd3f82249..f19b04b92fa9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/mvme147.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/mvme147.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/mvme147.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/mvme147.c</a></div><div class='hunk'>@@ -16,6 +16,7 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> /* Used for the temporal inet entries and routing */</div><div class='ctx'> #include &lt;linux/socket.h&gt;</div><div class='ctx'> #include &lt;linux/route.h&gt;</div><div class='hunk'>@@ -24,7 +25,6 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/mvme147hw.h&gt;</div><div class='ctx'> </div><div class='ctx'> /* We have 32K of RAM for the init block and buffers. This places</div><div class='hunk'>@@ -68,12 +68,13 @@ static const struct net_device_ops lance_netdev_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Initialise the one and only on-board 7990 */</div><div class='del'>-struct net_device * __init mvme147lance_probe(int unit)</div><div class='add'>+static struct net_device * __init mvme147lance_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	static int called;</div><div class='ctx'> 	static const char name[] = "MVME147 LANCE";</div><div class='ctx'> 	struct m147lance_private *lp;</div><div class='add'>+	u8 macaddr[ETH_ALEN];</div><div class='ctx'> 	u_long *addr;</div><div class='ctx'> 	u_long address;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -86,9 +87,6 @@ struct net_device * __init mvme147lance_probe(int unit)</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (unit &gt;= 0)</div><div class='del'>-		sprintf(dev-&gt;name, "eth%d", unit);</div><div class='del'>-</div><div class='ctx'> 	/* Fill the dev fields */</div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long)MVME147_LANCE_BASE;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;lance_netdev_ops;</div><div class='hunk'>@@ -96,19 +94,16 @@ struct net_device * __init mvme147lance_probe(int unit)</div><div class='ctx'> </div><div class='ctx'> 	addr = (u_long *)ETHERNET_ADDRESS;</div><div class='ctx'> 	address = *addr;</div><div class='del'>-	dev-&gt;dev_addr[0] = 0x08;</div><div class='del'>-	dev-&gt;dev_addr[1] = 0x00;</div><div class='del'>-	dev-&gt;dev_addr[2] = 0x3e;</div><div class='add'>+	macaddr[0] = 0x08;</div><div class='add'>+	macaddr[1] = 0x00;</div><div class='add'>+	macaddr[2] = 0x3e;</div><div class='ctx'> 	address = address &gt;&gt; 8;</div><div class='del'>-	dev-&gt;dev_addr[5] = address&amp;0xff;</div><div class='add'>+	macaddr[5] = address&amp;0xff;</div><div class='ctx'> 	address = address &gt;&gt; 8;</div><div class='del'>-	dev-&gt;dev_addr[4] = address&amp;0xff;</div><div class='add'>+	macaddr[4] = address&amp;0xff;</div><div class='ctx'> 	address = address &gt;&gt; 8;</div><div class='del'>-	dev-&gt;dev_addr[3] = address&amp;0xff;</div><div class='del'>-</div><div class='del'>-	printk("%s: MVME147 at 0x%08lx, irq %d, Hardware Address %pM\n",</div><div class='del'>-	       dev-&gt;name, dev-&gt;base_addr, MVME147_LANCE_IRQ,</div><div class='del'>-	       dev-&gt;dev_addr);</div><div class='add'>+	macaddr[3] = address&amp;0xff;</div><div class='add'>+	eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> </div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='ctx'> 	lp-&gt;ram = __get_dma_pages(GFP_ATOMIC, 3);	/* 32K */</div><div class='hunk'>@@ -139,6 +134,9 @@ struct net_device * __init mvme147lance_probe(int unit)</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_info(dev, "MVME147 at 0x%08lx, irq %d, Hardware Address %pM\n",</div><div class='add'>+		    dev-&gt;base_addr, MVME147_LANCE_IRQ, dev-&gt;dev_addr);</div><div class='add'>+</div><div class='ctx'> 	return dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -179,22 +177,22 @@ static int m147lance_close(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='add'>+MODULE_DESCRIPTION("MVME147 LANCE Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static struct net_device *dev_mvme147_lance;</div><div class='del'>-int __init init_module(void)</div><div class='add'>+static int __init m147lance_init(void)</div><div class='ctx'> {</div><div class='del'>-	dev_mvme147_lance = mvme147lance_probe(-1);</div><div class='add'>+	dev_mvme147_lance = mvme147lance_probe();</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(dev_mvme147_lance);</div><div class='ctx'> }</div><div class='add'>+module_init(m147lance_init);</div><div class='ctx'> </div><div class='del'>-void __exit cleanup_module(void)</div><div class='add'>+static void __exit m147lance_exit(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct m147lance_private *lp = netdev_priv(dev_mvme147_lance);</div><div class='ctx'> 	unregister_netdev(dev_mvme147_lance);</div><div class='ctx'> 	free_pages(lp-&gt;ram, 3);</div><div class='ctx'> 	free_netdev(dev_mvme147_lance);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* MODULE */</div><div class='add'>+module_exit(m147lance_exit);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c<br/>deleted file mode 100644<br/>index 87ff5d6d1b22..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/ni65.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/ni65.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1249 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * ni6510 (am7990 'lance' chip) driver for Linux-net-3</div><div class='del'>- * BETAcode v0.71 (96/09/29) for 2.0.0 (or later)</div><div class='del'>- * copyrights (c) 1994,1995,1996 by M.Hipp</div><div class='del'>- *</div><div class='del'>- * This driver can handle the old ni6510 board and the newer ni6510</div><div class='del'>- * EtherBlaster. (probably it also works with every full NE2100</div><div class='del'>- * compatible card)</div><div class='del'>- *</div><div class='del'>- * driver probes: io: 0x360,0x300,0x320,0x340 / dma: 3,5,6,7</div><div class='del'>- *</div><div class='del'>- * This is an extension to the Linux operating system, and is covered by the</div><div class='del'>- * same GNU General Public License that covers the Linux-kernel.</div><div class='del'>- *</div><div class='del'>- * comments/bugs/suggestions can be sent to:</div><div class='del'>- *   Michael Hipp</div><div class='del'>- *   email: hippm@informatik.uni-tuebingen.de</div><div class='del'>- *</div><div class='del'>- * sources:</div><div class='del'>- *   some things are from the 'ni6510-packet-driver for dos by Russ Nelson'</div><div class='del'>- *   and from the original drivers by D.Becker</div><div class='del'>- *</div><div class='del'>- * known problems:</div><div class='del'>- *   - on some PCI boards (including my own) the card/board/ISA-bridge has</div><div class='del'>- *     problems with bus master DMA. This results in lotsa overruns.</div><div class='del'>- *     It may help to '#define RCV_PARANOIA_CHECK' or try to #undef</div><div class='del'>- *     the XMT and RCV_VIA_SKB option .. this reduces driver performance.</div><div class='del'>- *     Or just play with your BIOS options to optimize ISA-DMA access.</div><div class='del'>- *     Maybe you also wanna play with the LOW_PERFORAMCE and MID_PERFORMANCE</div><div class='del'>- *     defines -&gt; please report me your experience then</div><div class='del'>- *   - Harald reported for ASUS SP3G mainboards, that you should use</div><div class='del'>- *     the 'optimal settings' from the user's manual on page 3-12!</div><div class='del'>- *</div><div class='del'>- * credits:</div><div class='del'>- *   thanx to Jason Sullivan for sending me a ni6510 card!</div><div class='del'>- *   lot of debug runs with ASUS SP3G Boards (Intel Saturn) by Harald Koenig</div><div class='del'>- *</div><div class='del'>- * simple performance test: (486DX-33/Ni6510-EB receives from 486DX4-100/Ni6510-EB)</div><div class='del'>- *    average: FTP -&gt; 8384421 bytes received in 8.5 seconds</div><div class='del'>- *           (no RCV_VIA_SKB,no XMT_VIA_SKB,PARANOIA_CHECK,4 XMIT BUFS, 8 RCV_BUFFS)</div><div class='del'>- *    peak: FTP -&gt; 8384421 bytes received in 7.5 seconds</div><div class='del'>- *           (RCV_VIA_SKB,XMT_VIA_SKB,no PARANOIA_CHECK,1(!) XMIT BUF, 16 RCV BUFFS)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 99.Jun.8: added support for /proc/net/dev byte count for xosview (HK)</div><div class='del'>- * 96.Sept.29: virt_to_bus stuff added for new memory modell</div><div class='del'>- * 96.April.29: Added Harald Koenig's Patches (MH)</div><div class='del'>- * 96.April.13: enhanced error handling .. more tests (MH)</div><div class='del'>- * 96.April.5/6: a lot of performance tests. Got it stable now (hopefully) (MH)</div><div class='del'>- * 96.April.1: (no joke ;) .. added EtherBlaster and Module support (MH)</div><div class='del'>- * 96.Feb.19: fixed a few bugs .. cleanups .. tested for 1.3.66 (MH)</div><div class='del'>- *            hopefully no more 16MB limit</div><div class='del'>- *</div><div class='del'>- * 95.Nov.18: multicast tweaked (AC).</div><div class='del'>- *</div><div class='del'>- * 94.Aug.22: changes in xmit_intr (ack more than one xmitted-packet), ni65_send_packet (p-&gt;lock) (MH)</div><div class='del'>- *</div><div class='del'>- * 94.July.16: fixed bugs in recv_skb and skb-alloc stuff  (MH)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-</div><div class='del'>-#include "ni65.h"</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * the current setting allows an acceptable performance</div><div class='del'>- * for 'RCV_PARANOIA_CHECK' read the 'known problems' part in</div><div class='del'>- * the header of this file</div><div class='del'>- * 'invert' the defines for max. performance. This may cause DMA problems</div><div class='del'>- * on some boards (e.g on my ASUS SP3G)</div><div class='del'>- */</div><div class='del'>-#undef XMT_VIA_SKB</div><div class='del'>-#undef RCV_VIA_SKB</div><div class='del'>-#define RCV_PARANOIA_CHECK</div><div class='del'>-</div><div class='del'>-#define MID_PERFORMANCE</div><div class='del'>-</div><div class='del'>-#if   defined( LOW_PERFORMANCE )</div><div class='del'>- static int isa0=7,isa1=7,csr80=0x0c10;</div><div class='del'>-#elif defined( MID_PERFORMANCE )</div><div class='del'>- static int isa0=5,isa1=5,csr80=0x2810;</div><div class='del'>-#else	/* high performance */</div><div class='del'>- static int isa0=4,isa1=4,csr80=0x0017;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * a few card/vendor specific defines</div><div class='del'>- */</div><div class='del'>-#define NI65_ID0    0x00</div><div class='del'>-#define NI65_ID1    0x55</div><div class='del'>-#define NI65_EB_ID0 0x52</div><div class='del'>-#define NI65_EB_ID1 0x44</div><div class='del'>-#define NE2100_ID0  0x57</div><div class='del'>-#define NE2100_ID1  0x57</div><div class='del'>-</div><div class='del'>-#define PORT p-&gt;cmdr_addr</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * buffer configuration</div><div class='del'>- */</div><div class='del'>-#if 1</div><div class='del'>-#define RMDNUM 16</div><div class='del'>-#define RMDNUMMASK 0x80000000</div><div class='del'>-#else</div><div class='del'>-#define RMDNUM 8</div><div class='del'>-#define RMDNUMMASK 0x60000000 /* log2(RMDNUM)&lt;&lt;29 */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#define TMDNUM 1</div><div class='del'>-#define TMDNUMMASK 0x00000000</div><div class='del'>-#else</div><div class='del'>-#define TMDNUM 4</div><div class='del'>-#define TMDNUMMASK 0x40000000 /* log2(TMDNUM)&lt;&lt;29 */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* slightly oversized */</div><div class='del'>-#define R_BUF_SIZE 1544</div><div class='del'>-#define T_BUF_SIZE 1544</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * lance register defines</div><div class='del'>- */</div><div class='del'>-#define L_DATAREG 0x00</div><div class='del'>-#define L_ADDRREG 0x02</div><div class='del'>-#define L_RESET   0x04</div><div class='del'>-#define L_CONFIG  0x05</div><div class='del'>-#define L_BUSIF   0x06</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * to access the lance/am7990-regs, you have to write</div><div class='del'>- * reg-number into L_ADDRREG, then you can access it using L_DATAREG</div><div class='del'>- */</div><div class='del'>-#define CSR0  0x00</div><div class='del'>-#define CSR1  0x01</div><div class='del'>-#define CSR2  0x02</div><div class='del'>-#define CSR3  0x03</div><div class='del'>-</div><div class='del'>-#define INIT_RING_BEFORE_START	0x1</div><div class='del'>-#define FULL_RESET_ON_ERROR	0x2</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#define writereg(val,reg) {outw(reg,PORT+L_ADDRREG);inw(PORT+L_ADDRREG); \</div><div class='del'>-                           outw(val,PORT+L_DATAREG);inw(PORT+L_DATAREG);}</div><div class='del'>-#define readreg(reg) (outw(reg,PORT+L_ADDRREG),inw(PORT+L_ADDRREG),\</div><div class='del'>-                       inw(PORT+L_DATAREG))</div><div class='del'>-#if 0</div><div class='del'>-#define writedatareg(val) {outw(val,PORT+L_DATAREG);inw(PORT+L_DATAREG);}</div><div class='del'>-#else</div><div class='del'>-#define writedatareg(val) {  writereg(val,CSR0); }</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-#define writereg(val,reg) {outw(reg,PORT+L_ADDRREG);outw(val,PORT+L_DATAREG);}</div><div class='del'>-#define readreg(reg) (outw(reg,PORT+L_ADDRREG),inw(PORT+L_DATAREG))</div><div class='del'>-#define writedatareg(val) { writereg(val,CSR0); }</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static unsigned char ni_vendor[] = { 0x02,0x07,0x01 };</div><div class='del'>-</div><div class='del'>-static struct card {</div><div class='del'>-	unsigned char id0,id1;</div><div class='del'>-	short id_offset;</div><div class='del'>-	short total_size;</div><div class='del'>-	short cmd_offset;</div><div class='del'>-	short addr_offset;</div><div class='del'>-	unsigned char *vendor_id;</div><div class='del'>-	char *cardname;</div><div class='del'>-	unsigned long config;</div><div class='del'>-} cards[] = {</div><div class='del'>-	{</div><div class='del'>-		.id0	     = NI65_ID0,</div><div class='del'>-		.id1	     = NI65_ID1,</div><div class='del'>-		.id_offset   = 0x0e,</div><div class='del'>-		.total_size  = 0x10,</div><div class='del'>-		.cmd_offset  = 0x0,</div><div class='del'>-		.addr_offset = 0x8,</div><div class='del'>-		.vendor_id   = ni_vendor,</div><div class='del'>-		.cardname    = "ni6510",</div><div class='del'>-		.config	     = 0x1,</div><div class='del'>-       	},</div><div class='del'>-	{</div><div class='del'>-		.id0	     = NI65_EB_ID0,</div><div class='del'>-		.id1	     = NI65_EB_ID1,</div><div class='del'>-		.id_offset   = 0x0e,</div><div class='del'>-		.total_size  = 0x18,</div><div class='del'>-		.cmd_offset  = 0x10,</div><div class='del'>-		.addr_offset = 0x0,</div><div class='del'>-		.vendor_id   = ni_vendor,</div><div class='del'>-		.cardname    = "ni6510 EtherBlaster",</div><div class='del'>-		.config	     = 0x2,</div><div class='del'>-       	},</div><div class='del'>-	{</div><div class='del'>-		.id0	     = NE2100_ID0,</div><div class='del'>-		.id1	     = NE2100_ID1,</div><div class='del'>-		.id_offset   = 0x0e,</div><div class='del'>-		.total_size  = 0x18,</div><div class='del'>-		.cmd_offset  = 0x10,</div><div class='del'>-		.addr_offset = 0x0,</div><div class='del'>-		.vendor_id   = NULL,</div><div class='del'>-		.cardname    = "generic NE2100",</div><div class='del'>-		.config	     = 0x0,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-#define NUM_CARDS 3</div><div class='del'>-</div><div class='del'>-struct priv</div><div class='del'>-{</div><div class='del'>-	struct rmd rmdhead[RMDNUM];</div><div class='del'>-	struct tmd tmdhead[TMDNUM];</div><div class='del'>-	struct init_block ib;</div><div class='del'>-	int rmdnum;</div><div class='del'>-	int tmdnum,tmdlast;</div><div class='del'>-#ifdef RCV_VIA_SKB</div><div class='del'>-	struct sk_buff *recv_skb[RMDNUM];</div><div class='del'>-#else</div><div class='del'>-	void *recvbounce[RMDNUM];</div><div class='del'>-#endif</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-	struct sk_buff *tmd_skb[TMDNUM];</div><div class='del'>-#endif</div><div class='del'>-	void *tmdbounce[TMDNUM];</div><div class='del'>-	int tmdbouncenum;</div><div class='del'>-	int lock,xmit_queued;</div><div class='del'>-</div><div class='del'>-	void *self;</div><div class='del'>-	int cmdr_addr;</div><div class='del'>-	int cardno;</div><div class='del'>-	int features;</div><div class='del'>-	spinlock_t ring_lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int  ni65_probe1(struct net_device *dev,int);</div><div class='del'>-static irqreturn_t ni65_interrupt(int irq, void * dev_id);</div><div class='del'>-static void ni65_recv_intr(struct net_device *dev,int);</div><div class='del'>-static void ni65_xmit_intr(struct net_device *dev,int);</div><div class='del'>-static int  ni65_open(struct net_device *dev);</div><div class='del'>-static int  ni65_lance_reinit(struct net_device *dev);</div><div class='del'>-static void ni65_init_lance(struct priv *p,unsigned char*,int,int);</div><div class='del'>-static netdev_tx_t ni65_send_packet(struct sk_buff *skb,</div><div class='del'>-				    struct net_device *dev);</div><div class='del'>-static void  ni65_timeout(struct net_device *dev);</div><div class='del'>-static int  ni65_close(struct net_device *dev);</div><div class='del'>-static int  ni65_alloc_buffer(struct net_device *dev);</div><div class='del'>-static void ni65_free_buffer(struct priv *p);</div><div class='del'>-static void set_multicast_list(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static int irqtab[] __initdata = { 9,12,15,5 }; /* irq config-translate */</div><div class='del'>-static int dmatab[] __initdata = { 0,3,5,6,7 }; /* dma config-translate and autodetect */</div><div class='del'>-</div><div class='del'>-static int debuglevel = 1;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set 'performance' registers .. we must STOP lance for that</div><div class='del'>- */</div><div class='del'>-static void ni65_set_performance(struct priv *p)</div><div class='del'>-{</div><div class='del'>-	writereg(CSR0_STOP | CSR0_CLRALL,CSR0); /* STOP */</div><div class='del'>-</div><div class='del'>-	if( !(cards[p-&gt;cardno].config &amp; 0x02) )</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	outw(80,PORT+L_ADDRREG);</div><div class='del'>-	if(inw(PORT+L_ADDRREG) != 80)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	writereg( (csr80 &amp; 0x3fff) ,80); /* FIFO watermarks */</div><div class='del'>-	outw(0,PORT+L_ADDRREG);</div><div class='del'>-	outw((short)isa0,PORT+L_BUSIF); /* write ISA 0: DMA_R : isa0 * 50ns */</div><div class='del'>-	outw(1,PORT+L_ADDRREG);</div><div class='del'>-	outw((short)isa1,PORT+L_BUSIF); /* write ISA 1: DMA_W : isa1 * 50ns	*/</div><div class='del'>-</div><div class='del'>-	outw(CSR0,PORT+L_ADDRREG);	/* switch back to CSR0 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * open interface (up)</div><div class='del'>- */</div><div class='del'>-static int ni65_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-	int irqval = request_irq(dev-&gt;irq, ni65_interrupt,0,</div><div class='del'>-                        cards[p-&gt;cardno].cardname,dev);</div><div class='del'>-	if (irqval) {</div><div class='del'>-		printk(KERN_ERR "%s: unable to get IRQ %d (irqval=%d).\n",</div><div class='del'>-		          dev-&gt;name,dev-&gt;irq, irqval);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(ni65_lance_reinit(dev))</div><div class='del'>-	{</div><div class='del'>-		netif_start_queue(dev);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-	{</div><div class='del'>-		free_irq(dev-&gt;irq,dev);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * close interface (down)</div><div class='del'>- */</div><div class='del'>-static int ni65_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	outw(inw(PORT+L_RESET),PORT+L_RESET); /* that's the hard way */</div><div class='del'>-</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-		for(i=0;i&lt;TMDNUM;i++)</div><div class='del'>-		{</div><div class='del'>-			if(p-&gt;tmd_skb[i]) {</div><div class='del'>-				dev_kfree_skb(p-&gt;tmd_skb[i]);</div><div class='del'>-				p-&gt;tmd_skb[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	free_irq(dev-&gt;irq,dev);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cleanup_card(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-	disable_dma(dev-&gt;dma);</div><div class='del'>-	free_dma(dev-&gt;dma);</div><div class='del'>-	release_region(dev-&gt;base_addr, cards[p-&gt;cardno].total_size);</div><div class='del'>-	ni65_free_buffer(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set: io,irq,dma or set it when calling insmod */</div><div class='del'>-static int irq;</div><div class='del'>-static int io;</div><div class='del'>-static int dma;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Probe The Card (not the lance-chip)</div><div class='del'>- */</div><div class='del'>-struct net_device * __init ni65_probe(int unit)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = alloc_etherdev(0);</div><div class='del'>-	static const int ports[] = { 0x360, 0x300, 0x320, 0x340, 0 };</div><div class='del'>-	const int *port;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (!dev)</div><div class='del'>-		return ERR_PTR(-ENOMEM);</div><div class='del'>-</div><div class='del'>-	if (unit &gt;= 0) {</div><div class='del'>-		sprintf(dev-&gt;name, "eth%d", unit);</div><div class='del'>-		netdev_boot_setup_check(dev);</div><div class='del'>-		irq = dev-&gt;irq;</div><div class='del'>-		dma = dev-&gt;dma;</div><div class='del'>-	} else {</div><div class='del'>-		dev-&gt;base_addr = io;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;base_addr &gt; 0x1ff) { /* Check a single specified location. */</div><div class='del'>-		err = ni65_probe1(dev, dev-&gt;base_addr);</div><div class='del'>-	} else if (dev-&gt;base_addr &gt; 0) { /* Don't probe at all. */</div><div class='del'>-		err = -ENXIO;</div><div class='del'>-	} else {</div><div class='del'>-		for (port = ports; *port &amp;&amp; ni65_probe1(dev, *port); port++)</div><div class='del'>-			;</div><div class='del'>-		if (!*port)</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	if (err)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	err = register_netdev(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto out1;</div><div class='del'>-	return dev;</div><div class='del'>-out1:</div><div class='del'>-	cleanup_card(dev);</div><div class='del'>-out:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-	return ERR_PTR(err);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops ni65_netdev_ops = {</div><div class='del'>-	.ndo_open		= ni65_open,</div><div class='del'>-	.ndo_stop		= ni65_close,</div><div class='del'>-	.ndo_start_xmit		= ni65_send_packet,</div><div class='del'>-	.ndo_tx_timeout		= ni65_timeout,</div><div class='del'>-	.ndo_set_rx_mode	= set_multicast_list,</div><div class='del'>-	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * this is the real card probe ..</div><div class='del'>- */</div><div class='del'>-static int __init ni65_probe1(struct net_device *dev,int ioaddr)</div><div class='del'>-{</div><div class='del'>-	int i,j;</div><div class='del'>-	struct priv *p;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-	dev-&gt;dma = dma;</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;NUM_CARDS;i++) {</div><div class='del'>-		if(!request_region(ioaddr, cards[i].total_size, cards[i].cardname))</div><div class='del'>-			continue;</div><div class='del'>-		if(cards[i].id_offset &gt;= 0) {</div><div class='del'>-			if(inb(ioaddr+cards[i].id_offset+0) != cards[i].id0 ||</div><div class='del'>-				 inb(ioaddr+cards[i].id_offset+1) != cards[i].id1) {</div><div class='del'>-				 release_region(ioaddr, cards[i].total_size);</div><div class='del'>-				 continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if(cards[i].vendor_id) {</div><div class='del'>-			for(j=0;j&lt;3;j++)</div><div class='del'>-				if(inb(ioaddr+cards[i].addr_offset+j) != cards[i].vendor_id[j])</div><div class='del'>-					release_region(ioaddr, cards[i].total_size);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if(i == NUM_CARDS)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	for(j=0;j&lt;6;j++)</div><div class='del'>-		dev-&gt;dev_addr[j] = inb(ioaddr+cards[i].addr_offset+j);</div><div class='del'>-</div><div class='del'>-	if( (j=ni65_alloc_buffer(dev)) &lt; 0) {</div><div class='del'>-		release_region(ioaddr, cards[i].total_size);</div><div class='del'>-		return j;</div><div class='del'>-	}</div><div class='del'>-	p = dev-&gt;ml_priv;</div><div class='del'>-	p-&gt;cmdr_addr = ioaddr + cards[i].cmd_offset;</div><div class='del'>-	p-&gt;cardno = i;</div><div class='del'>-	spin_lock_init(&amp;p-&gt;ring_lock);</div><div class='del'>-</div><div class='del'>-	printk(KERN_INFO "%s: %s found at %#3x, ", dev-&gt;name, cards[p-&gt;cardno].cardname , ioaddr);</div><div class='del'>-</div><div class='del'>-	outw(inw(PORT+L_RESET),PORT+L_RESET); /* first: reset the card */</div><div class='del'>-	if( (j=readreg(CSR0)) != 0x4) {</div><div class='del'>-		 printk("failed.\n");</div><div class='del'>-		 printk(KERN_ERR "%s: Can't RESET card: %04x\n", dev-&gt;name, j);</div><div class='del'>-		 ni65_free_buffer(p);</div><div class='del'>-		 release_region(ioaddr, cards[p-&gt;cardno].total_size);</div><div class='del'>-		 return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outw(88,PORT+L_ADDRREG);</div><div class='del'>-	if(inw(PORT+L_ADDRREG) == 88) {</div><div class='del'>-		unsigned long v;</div><div class='del'>-		v = inw(PORT+L_DATAREG);</div><div class='del'>-		v &lt;&lt;= 16;</div><div class='del'>-		outw(89,PORT+L_ADDRREG);</div><div class='del'>-		v |= inw(PORT+L_DATAREG);</div><div class='del'>-		printk("Version %#08lx, ",v);</div><div class='del'>-		p-&gt;features = INIT_RING_BEFORE_START;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		printk("ancient LANCE, ");</div><div class='del'>-		p-&gt;features = 0x0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(test_bit(0,&amp;cards[i].config)) {</div><div class='del'>-		dev-&gt;irq = irqtab[(inw(ioaddr+L_CONFIG)&gt;&gt;2)&amp;3];</div><div class='del'>-		dev-&gt;dma = dmatab[inw(ioaddr+L_CONFIG)&amp;3];</div><div class='del'>-		printk("IRQ %d (from card), DMA %d (from card).\n",dev-&gt;irq,dev-&gt;dma);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if(dev-&gt;dma == 0) {</div><div class='del'>-		/* 'stuck test' from lance.c */</div><div class='del'>-			unsigned long dma_channels =</div><div class='del'>-				((inb(DMA1_STAT_REG) &gt;&gt; 4) &amp; 0x0f)</div><div class='del'>-				| (inb(DMA2_STAT_REG) &amp; 0xf0);</div><div class='del'>-			for(i=1;i&lt;5;i++) {</div><div class='del'>-				int dma = dmatab[i];</div><div class='del'>-				if(test_bit(dma,&amp;dma_channels) || request_dma(dma,"ni6510"))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				flags=claim_dma_lock();</div><div class='del'>-				disable_dma(dma);</div><div class='del'>-				set_dma_mode(dma,DMA_MODE_CASCADE);</div><div class='del'>-				enable_dma(dma);</div><div class='del'>-				release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-				ni65_init_lance(p,dev-&gt;dev_addr,0,0); /* trigger memory access */</div><div class='del'>-</div><div class='del'>-				flags=claim_dma_lock();</div><div class='del'>-				disable_dma(dma);</div><div class='del'>-				free_dma(dma);</div><div class='del'>-				release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-				if(readreg(CSR0) &amp; CSR0_IDON)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if(i == 5) {</div><div class='del'>-				printk("failed.\n");</div><div class='del'>-				printk(KERN_ERR "%s: Can't detect DMA channel!\n", dev-&gt;name);</div><div class='del'>-				ni65_free_buffer(p);</div><div class='del'>-				release_region(ioaddr, cards[p-&gt;cardno].total_size);</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-			dev-&gt;dma = dmatab[i];</div><div class='del'>-			printk("DMA %d (autodetected), ",dev-&gt;dma);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			printk("DMA %d (assigned), ",dev-&gt;dma);</div><div class='del'>-</div><div class='del'>-		if(dev-&gt;irq &lt; 2)</div><div class='del'>-		{</div><div class='del'>-			unsigned long irq_mask;</div><div class='del'>-</div><div class='del'>-			ni65_init_lance(p,dev-&gt;dev_addr,0,0);</div><div class='del'>-			irq_mask = probe_irq_on();</div><div class='del'>-			writereg(CSR0_INIT|CSR0_INEA,CSR0); /* trigger interrupt */</div><div class='del'>-			msleep(20);</div><div class='del'>-			dev-&gt;irq = probe_irq_off(irq_mask);</div><div class='del'>-			if(!dev-&gt;irq)</div><div class='del'>-			{</div><div class='del'>-				printk("Failed to detect IRQ line!\n");</div><div class='del'>-				ni65_free_buffer(p);</div><div class='del'>-				release_region(ioaddr, cards[p-&gt;cardno].total_size);</div><div class='del'>-				return -EAGAIN;</div><div class='del'>-			}</div><div class='del'>-			printk("IRQ %d (autodetected).\n",dev-&gt;irq);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			printk("IRQ %d (assigned).\n",dev-&gt;irq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(request_dma(dev-&gt;dma, cards[p-&gt;cardno].cardname ) != 0)</div><div class='del'>-	{</div><div class='del'>-		printk(KERN_ERR "%s: Can't request dma-channel %d\n",dev-&gt;name,(int) dev-&gt;dma);</div><div class='del'>-		ni65_free_buffer(p);</div><div class='del'>-		release_region(ioaddr, cards[p-&gt;cardno].total_size);</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;base_addr = ioaddr;</div><div class='del'>-	dev-&gt;netdev_ops = &amp;ni65_netdev_ops;</div><div class='del'>-	dev-&gt;watchdog_timeo	= HZ/2;</div><div class='del'>-</div><div class='del'>-	return 0; /* everything is OK */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * set lance register and trigger init</div><div class='del'>- */</div><div class='del'>-static void ni65_init_lance(struct priv *p,unsigned char *daddr,int filter,int mode)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	u32 pib;</div><div class='del'>-</div><div class='del'>-	writereg(CSR0_CLRALL|CSR0_STOP,CSR0);</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;6;i++)</div><div class='del'>-		p-&gt;ib.eaddr[i] = daddr[i];</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;8;i++)</div><div class='del'>-		p-&gt;ib.filter[i] = filter;</div><div class='del'>-	p-&gt;ib.mode = mode;</div><div class='del'>-</div><div class='del'>-	p-&gt;ib.trp = (u32) isa_virt_to_bus(p-&gt;tmdhead) | TMDNUMMASK;</div><div class='del'>-	p-&gt;ib.rrp = (u32) isa_virt_to_bus(p-&gt;rmdhead) | RMDNUMMASK;</div><div class='del'>-	writereg(0,CSR3);	/* busmaster/no word-swap */</div><div class='del'>-	pib = (u32) isa_virt_to_bus(&amp;p-&gt;ib);</div><div class='del'>-	writereg(pib &amp; 0xffff,CSR1);</div><div class='del'>-	writereg(pib &gt;&gt; 16,CSR2);</div><div class='del'>-</div><div class='del'>-	writereg(CSR0_INIT,CSR0); /* this changes L_ADDRREG to CSR0 */</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;32;i++)</div><div class='del'>-	{</div><div class='del'>-		mdelay(4);</div><div class='del'>-		if(inw(PORT+L_DATAREG) &amp; (CSR0_IDON | CSR0_MERR) )</div><div class='del'>-			break; /* init ok ? */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * allocate memory area and check the 16MB border</div><div class='del'>- */</div><div class='del'>-static void *ni65_alloc_mem(struct net_device *dev,char *what,int size,int type)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb=NULL;</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	void *ret;</div><div class='del'>-</div><div class='del'>-	if(type) {</div><div class='del'>-		ret = skb = alloc_skb(2+16+size,GFP_KERNEL|GFP_DMA);</div><div class='del'>-		if(!skb) {</div><div class='del'>-			printk(KERN_WARNING "%s: unable to allocate %s memory.\n",dev-&gt;name,what);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		skb_reserve(skb,2+16);</div><div class='del'>-		skb_put(skb,R_BUF_SIZE);	 /* grab the whole space .. (not necessary) */</div><div class='del'>-		ptr = skb-&gt;data;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		ret = ptr = kmalloc(T_BUF_SIZE,GFP_KERNEL | GFP_DMA);</div><div class='del'>-		if(!ret)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	if( (u32) virt_to_phys(ptr+size) &gt; 0x1000000) {</div><div class='del'>-		printk(KERN_WARNING "%s: unable to allocate %s memory in lower 16MB!\n",dev-&gt;name,what);</div><div class='del'>-		if(type)</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		else</div><div class='del'>-			kfree(ptr);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * allocate all memory structures .. send/recv buffers etc ...</div><div class='del'>- */</div><div class='del'>-static int ni65_alloc_buffer(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	unsigned char *ptr;</div><div class='del'>-	struct priv *p;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * we need 8-aligned memory ..</div><div class='del'>-	 */</div><div class='del'>-	ptr = ni65_alloc_mem(dev,"BUFFER",sizeof(struct priv)+8,0);</div><div class='del'>-	if(!ptr)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	p = dev-&gt;ml_priv = (struct priv *) (((unsigned long) ptr + 7) &amp; ~0x7);</div><div class='del'>-	memset((char *)p, 0, sizeof(struct priv));</div><div class='del'>-	p-&gt;self = ptr;</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;TMDNUM;i++)</div><div class='del'>-	{</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		p-&gt;tmd_skb[i] = NULL;</div><div class='del'>-#endif</div><div class='del'>-		p-&gt;tmdbounce[i] = ni65_alloc_mem(dev,"XMIT",T_BUF_SIZE,0);</div><div class='del'>-		if(!p-&gt;tmdbounce[i]) {</div><div class='del'>-			ni65_free_buffer(p);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;RMDNUM;i++)</div><div class='del'>-	{</div><div class='del'>-#ifdef RCV_VIA_SKB</div><div class='del'>-		p-&gt;recv_skb[i] = ni65_alloc_mem(dev,"RECV",R_BUF_SIZE,1);</div><div class='del'>-		if(!p-&gt;recv_skb[i]) {</div><div class='del'>-			ni65_free_buffer(p);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		p-&gt;recvbounce[i] = ni65_alloc_mem(dev,"RECV",R_BUF_SIZE,0);</div><div class='del'>-		if(!p-&gt;recvbounce[i]) {</div><div class='del'>-			ni65_free_buffer(p);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0; /* everything is OK */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * free buffers and private struct</div><div class='del'>- */</div><div class='del'>-static void ni65_free_buffer(struct priv *p)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if(!p)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;TMDNUM;i++) {</div><div class='del'>-		kfree(p-&gt;tmdbounce[i]);</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		if(p-&gt;tmd_skb[i])</div><div class='del'>-			dev_kfree_skb(p-&gt;tmd_skb[i]);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;RMDNUM;i++)</div><div class='del'>-	{</div><div class='del'>-#ifdef RCV_VIA_SKB</div><div class='del'>-		if(p-&gt;recv_skb[i])</div><div class='del'>-			dev_kfree_skb(p-&gt;recv_skb[i]);</div><div class='del'>-#else</div><div class='del'>-		kfree(p-&gt;recvbounce[i]);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	kfree(p-&gt;self);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * stop and (re)start lance .. e.g after an error</div><div class='del'>- */</div><div class='del'>-static void ni65_stop_start(struct net_device *dev,struct priv *p)</div><div class='del'>-{</div><div class='del'>-	int csr0 = CSR0_INEA;</div><div class='del'>-</div><div class='del'>-	writedatareg(CSR0_STOP);</div><div class='del'>-</div><div class='del'>-	if(debuglevel &gt; 1)</div><div class='del'>-		printk(KERN_DEBUG "ni65_stop_start\n");</div><div class='del'>-</div><div class='del'>-	if(p-&gt;features &amp; INIT_RING_BEFORE_START) {</div><div class='del'>-		int i;</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		struct sk_buff *skb_save[TMDNUM];</div><div class='del'>-#endif</div><div class='del'>-		unsigned long buffer[TMDNUM];</div><div class='del'>-		short blen[TMDNUM];</div><div class='del'>-</div><div class='del'>-		if(p-&gt;xmit_queued) {</div><div class='del'>-			while(1) {</div><div class='del'>-				if((p-&gt;tmdhead[p-&gt;tmdlast].u.s.status &amp; XMIT_OWN))</div><div class='del'>-					break;</div><div class='del'>-				p-&gt;tmdlast = (p-&gt;tmdlast + 1) &amp; (TMDNUM-1);</div><div class='del'>-				if(p-&gt;tmdlast == p-&gt;tmdnum)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for(i=0;i&lt;TMDNUM;i++) {</div><div class='del'>-			struct tmd *tmdp = p-&gt;tmdhead + i;</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-			skb_save[i] = p-&gt;tmd_skb[i];</div><div class='del'>-#endif</div><div class='del'>-			buffer[i] = (u32) isa_bus_to_virt(tmdp-&gt;u.buffer);</div><div class='del'>-			blen[i] = tmdp-&gt;blen;</div><div class='del'>-			tmdp-&gt;u.s.status = 0x0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for(i=0;i&lt;RMDNUM;i++) {</div><div class='del'>-			struct rmd *rmdp = p-&gt;rmdhead + i;</div><div class='del'>-			rmdp-&gt;u.s.status = RCV_OWN;</div><div class='del'>-		}</div><div class='del'>-		p-&gt;tmdnum = p-&gt;xmit_queued = 0;</div><div class='del'>-		writedatareg(CSR0_STRT | csr0);</div><div class='del'>-</div><div class='del'>-		for(i=0;i&lt;TMDNUM;i++) {</div><div class='del'>-			int num = (i + p-&gt;tmdlast) &amp; (TMDNUM-1);</div><div class='del'>-			p-&gt;tmdhead[i].u.buffer = (u32) isa_virt_to_bus((char *)buffer[num]); /* status is part of buffer field */</div><div class='del'>-			p-&gt;tmdhead[i].blen = blen[num];</div><div class='del'>-			if(p-&gt;tmdhead[i].u.s.status &amp; XMIT_OWN) {</div><div class='del'>-				 p-&gt;tmdnum = (p-&gt;tmdnum + 1) &amp; (TMDNUM-1);</div><div class='del'>-				 p-&gt;xmit_queued = 1;</div><div class='del'>-	 writedatareg(CSR0_TDMD | CSR0_INEA | csr0);</div><div class='del'>-			}</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-			p-&gt;tmd_skb[i] = skb_save[num];</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		p-&gt;rmdnum = p-&gt;tmdlast = 0;</div><div class='del'>-		if(!p-&gt;lock)</div><div class='del'>-			if (p-&gt;tmdnum || !p-&gt;xmit_queued)</div><div class='del'>-				netif_wake_queue(dev);</div><div class='del'>-		netif_trans_update(dev); /* prevent tx timeout */</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		writedatareg(CSR0_STRT | csr0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * init lance (write init-values .. init-buffers) (open-helper)</div><div class='del'>- */</div><div class='del'>-static int ni65_lance_reinit(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	 int i;</div><div class='del'>-	 struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-	 unsigned long flags;</div><div class='del'>-</div><div class='del'>-	 p-&gt;lock = 0;</div><div class='del'>-	 p-&gt;xmit_queued = 0;</div><div class='del'>-</div><div class='del'>-	 flags=claim_dma_lock();</div><div class='del'>-	 disable_dma(dev-&gt;dma); /* I've never worked with dma, but we do it like the packetdriver */</div><div class='del'>-	 set_dma_mode(dev-&gt;dma,DMA_MODE_CASCADE);</div><div class='del'>-	 enable_dma(dev-&gt;dma);</div><div class='del'>-	 release_dma_lock(flags);</div><div class='del'>-</div><div class='del'>-	 outw(inw(PORT+L_RESET),PORT+L_RESET); /* first: reset the card */</div><div class='del'>-	 if( (i=readreg(CSR0) ) != 0x4)</div><div class='del'>-	 {</div><div class='del'>-		 printk(KERN_ERR "%s: can't RESET %s card: %04x\n",dev-&gt;name,</div><div class='del'>-							cards[p-&gt;cardno].cardname,(int) i);</div><div class='del'>-		 flags=claim_dma_lock();</div><div class='del'>-		 disable_dma(dev-&gt;dma);</div><div class='del'>-		 release_dma_lock(flags);</div><div class='del'>-		 return 0;</div><div class='del'>-	 }</div><div class='del'>-</div><div class='del'>-	 p-&gt;rmdnum = p-&gt;tmdnum = p-&gt;tmdlast = p-&gt;tmdbouncenum = 0;</div><div class='del'>-	 for(i=0;i&lt;TMDNUM;i++)</div><div class='del'>-	 {</div><div class='del'>-		 struct tmd *tmdp = p-&gt;tmdhead + i;</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		 if(p-&gt;tmd_skb[i]) {</div><div class='del'>-			 dev_kfree_skb(p-&gt;tmd_skb[i]);</div><div class='del'>-			 p-&gt;tmd_skb[i] = NULL;</div><div class='del'>-		 }</div><div class='del'>-#endif</div><div class='del'>-		 tmdp-&gt;u.buffer = 0x0;</div><div class='del'>-		 tmdp-&gt;u.s.status = XMIT_START | XMIT_END;</div><div class='del'>-		 tmdp-&gt;blen = tmdp-&gt;status2 = 0;</div><div class='del'>-	 }</div><div class='del'>-</div><div class='del'>-	 for(i=0;i&lt;RMDNUM;i++)</div><div class='del'>-	 {</div><div class='del'>-		 struct rmd *rmdp = p-&gt;rmdhead + i;</div><div class='del'>-#ifdef RCV_VIA_SKB</div><div class='del'>-		 rmdp-&gt;u.buffer = (u32) isa_virt_to_bus(p-&gt;recv_skb[i]-&gt;data);</div><div class='del'>-#else</div><div class='del'>-		 rmdp-&gt;u.buffer = (u32) isa_virt_to_bus(p-&gt;recvbounce[i]);</div><div class='del'>-#endif</div><div class='del'>-		 rmdp-&gt;blen = -(R_BUF_SIZE-8);</div><div class='del'>-		 rmdp-&gt;mlen = 0;</div><div class='del'>-		 rmdp-&gt;u.s.status = RCV_OWN;</div><div class='del'>-	 }</div><div class='del'>-</div><div class='del'>-	 if(dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-		 ni65_init_lance(p,dev-&gt;dev_addr,0x00,M_PROM);</div><div class='del'>-	 else if (netdev_mc_count(dev) || dev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='del'>-		 ni65_init_lance(p,dev-&gt;dev_addr,0xff,0x0);</div><div class='del'>-	 else</div><div class='del'>-		 ni65_init_lance(p,dev-&gt;dev_addr,0x00,0x00);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * ni65_set_lance_mem() sets L_ADDRREG to CSR0</div><div class='del'>-	 * NOW, WE WILL NEVER CHANGE THE L_ADDRREG, CSR0 IS ALWAYS SELECTED</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	 if(inw(PORT+L_DATAREG) &amp; CSR0_IDON)	{</div><div class='del'>-		 ni65_set_performance(p);</div><div class='del'>-					 /* init OK: start lance , enable interrupts */</div><div class='del'>-		 writedatareg(CSR0_CLRALL | CSR0_INEA | CSR0_STRT);</div><div class='del'>-		 return 1; /* -&gt;OK */</div><div class='del'>-	 }</div><div class='del'>-	 printk(KERN_ERR "%s: can't init lance, status: %04x\n",dev-&gt;name,(int) inw(PORT+L_DATAREG));</div><div class='del'>-	 flags=claim_dma_lock();</div><div class='del'>-	 disable_dma(dev-&gt;dma);</div><div class='del'>-	 release_dma_lock(flags);</div><div class='del'>-	 return 0; /* -&gt;Error */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * interrupt handler</div><div class='del'>- */</div><div class='del'>-static irqreturn_t ni65_interrupt(int irq, void * dev_id)</div><div class='del'>-{</div><div class='del'>-	int csr0 = 0;</div><div class='del'>-	struct net_device *dev = dev_id;</div><div class='del'>-	struct priv *p;</div><div class='del'>-	int bcnt = 32;</div><div class='del'>-</div><div class='del'>-	p = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;p-&gt;ring_lock);</div><div class='del'>-</div><div class='del'>-	while(--bcnt) {</div><div class='del'>-		csr0 = inw(PORT+L_DATAREG);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		writedatareg( (csr0 &amp; CSR0_CLRALL) ); /* ack interrupts, disable int. */</div><div class='del'>-#else</div><div class='del'>-		writedatareg( (csr0 &amp; CSR0_CLRALL) | CSR0_INEA ); /* ack interrupts, interrupts enabled */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		if(!(csr0 &amp; (CSR0_ERR | CSR0_RINT | CSR0_TINT)))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if(csr0 &amp; CSR0_RINT) /* RECV-int? */</div><div class='del'>-			ni65_recv_intr(dev,csr0);</div><div class='del'>-		if(csr0 &amp; CSR0_TINT) /* XMIT-int? */</div><div class='del'>-			ni65_xmit_intr(dev,csr0);</div><div class='del'>-</div><div class='del'>-		if(csr0 &amp; CSR0_ERR)</div><div class='del'>-		{</div><div class='del'>-			if(debuglevel &gt; 1)</div><div class='del'>-				printk(KERN_ERR "%s: general error: %04x.\n",dev-&gt;name,csr0);</div><div class='del'>-			if(csr0 &amp; CSR0_BABL)</div><div class='del'>-				dev-&gt;stats.tx_errors++;</div><div class='del'>-			if(csr0 &amp; CSR0_MISS) {</div><div class='del'>-				int i;</div><div class='del'>-				for(i=0;i&lt;RMDNUM;i++)</div><div class='del'>-					printk("%02x ",p-&gt;rmdhead[i].u.s.status);</div><div class='del'>-				printk("\n");</div><div class='del'>-				dev-&gt;stats.rx_errors++;</div><div class='del'>-			}</div><div class='del'>-			if(csr0 &amp; CSR0_MERR) {</div><div class='del'>-				if(debuglevel &gt; 1)</div><div class='del'>-					printk(KERN_ERR "%s: Ooops .. memory error: %04x.\n",dev-&gt;name,csr0);</div><div class='del'>-				ni65_stop_start(dev,p);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef RCV_PARANOIA_CHECK</div><div class='del'>-{</div><div class='del'>- int j;</div><div class='del'>- for(j=0;j&lt;RMDNUM;j++)</div><div class='del'>- {</div><div class='del'>-	int i, num2;</div><div class='del'>-	for(i=RMDNUM-1;i&gt;0;i--) {</div><div class='del'>-		 num2 = (p-&gt;rmdnum + i) &amp; (RMDNUM-1);</div><div class='del'>-		 if(!(p-&gt;rmdhead[num2].u.s.status &amp; RCV_OWN))</div><div class='del'>-				break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if(i) {</div><div class='del'>-		int k, num1;</div><div class='del'>-		for(k=0;k&lt;RMDNUM;k++) {</div><div class='del'>-			num1 = (p-&gt;rmdnum + k) &amp; (RMDNUM-1);</div><div class='del'>-			if(!(p-&gt;rmdhead[num1].u.s.status &amp; RCV_OWN))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if(!k)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if(debuglevel &gt; 0)</div><div class='del'>-		{</div><div class='del'>-			char buf[256],*buf1;</div><div class='del'>-			buf1 = buf;</div><div class='del'>-			for(k=0;k&lt;RMDNUM;k++) {</div><div class='del'>-				sprintf(buf1,"%02x ",(p-&gt;rmdhead[k].u.s.status)); /* &amp; RCV_OWN) ); */</div><div class='del'>-				buf1 += 3;</div><div class='del'>-			}</div><div class='del'>-			*buf1 = 0;</div><div class='del'>-			printk(KERN_ERR "%s: Ooops, receive ring corrupted %2d %2d | %s\n",dev-&gt;name,p-&gt;rmdnum,i,buf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		p-&gt;rmdnum = num1;</div><div class='del'>-		ni65_recv_intr(dev,csr0);</div><div class='del'>-		if((p-&gt;rmdhead[num2].u.s.status &amp; RCV_OWN))</div><div class='del'>-			break;	/* ok, we are 'in sync' again */</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		break;</div><div class='del'>- }</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if( (csr0 &amp; (CSR0_RXON | CSR0_TXON)) != (CSR0_RXON | CSR0_TXON) ) {</div><div class='del'>-		printk(KERN_DEBUG "%s: RX or TX was offline -&gt; restart\n",dev-&gt;name);</div><div class='del'>-		ni65_stop_start(dev,p);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		writedatareg(CSR0_INEA);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;p-&gt;ring_lock);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We have received an Xmit-Interrupt ..</div><div class='del'>- * send a new packet if necessary</div><div class='del'>- */</div><div class='del'>-static void ni65_xmit_intr(struct net_device *dev,int csr0)</div><div class='del'>-{</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	while(p-&gt;xmit_queued)</div><div class='del'>-	{</div><div class='del'>-		struct tmd *tmdp = p-&gt;tmdhead + p-&gt;tmdlast;</div><div class='del'>-		int tmdstat = tmdp-&gt;u.s.status;</div><div class='del'>-</div><div class='del'>-		if(tmdstat &amp; XMIT_OWN)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if(tmdstat &amp; XMIT_ERR)</div><div class='del'>-		{</div><div class='del'>-#if 0</div><div class='del'>-			if(tmdp-&gt;status2 &amp; XMIT_TDRMASK &amp;&amp; debuglevel &gt; 3)</div><div class='del'>-				printk(KERN_ERR "%s: tdr-problems (e.g. no resistor)\n",dev-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		 /* checking some errors */</div><div class='del'>-			if(tmdp-&gt;status2 &amp; XMIT_RTRY)</div><div class='del'>-				dev-&gt;stats.tx_aborted_errors++;</div><div class='del'>-			if(tmdp-&gt;status2 &amp; XMIT_LCAR)</div><div class='del'>-				dev-&gt;stats.tx_carrier_errors++;</div><div class='del'>-			if(tmdp-&gt;status2 &amp; (XMIT_BUFF | XMIT_UFLO )) {</div><div class='del'>-		/* this stops the xmitter */</div><div class='del'>-				dev-&gt;stats.tx_fifo_errors++;</div><div class='del'>-				if(debuglevel &gt; 0)</div><div class='del'>-					printk(KERN_ERR "%s: Xmit FIFO/BUFF error\n",dev-&gt;name);</div><div class='del'>-				if(p-&gt;features &amp; INIT_RING_BEFORE_START) {</div><div class='del'>-					tmdp-&gt;u.s.status = XMIT_OWN | XMIT_START | XMIT_END;	/* test: resend this frame */</div><div class='del'>-					ni65_stop_start(dev,p);</div><div class='del'>-					break;	/* no more Xmit processing .. */</div><div class='del'>-				}</div><div class='del'>-				else</div><div class='del'>-				 ni65_stop_start(dev,p);</div><div class='del'>-			}</div><div class='del'>-			if(debuglevel &gt; 2)</div><div class='del'>-				printk(KERN_ERR "%s: xmit-error: %04x %02x-%04x\n",dev-&gt;name,csr0,(int) tmdstat,(int) tmdp-&gt;status2);</div><div class='del'>-			if(!(csr0 &amp; CSR0_BABL)) /* don't count errors twice */</div><div class='del'>-				dev-&gt;stats.tx_errors++;</div><div class='del'>-			tmdp-&gt;status2 = 0;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			dev-&gt;stats.tx_bytes -= (short)(tmdp-&gt;blen);</div><div class='del'>-			dev-&gt;stats.tx_packets++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		if(p-&gt;tmd_skb[p-&gt;tmdlast]) {</div><div class='del'>-			 dev_consume_skb_irq(p-&gt;tmd_skb[p-&gt;tmdlast]);</div><div class='del'>-			 p-&gt;tmd_skb[p-&gt;tmdlast] = NULL;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		p-&gt;tmdlast = (p-&gt;tmdlast + 1) &amp; (TMDNUM-1);</div><div class='del'>-		if(p-&gt;tmdlast == p-&gt;tmdnum)</div><div class='del'>-			p-&gt;xmit_queued = 0;</div><div class='del'>-	}</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We have received a packet</div><div class='del'>- */</div><div class='del'>-static void ni65_recv_intr(struct net_device *dev,int csr0)</div><div class='del'>-{</div><div class='del'>-	struct rmd *rmdp;</div><div class='del'>-	int rmdstat,len;</div><div class='del'>-	int cnt=0;</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	rmdp = p-&gt;rmdhead + p-&gt;rmdnum;</div><div class='del'>-	while(!( (rmdstat = rmdp-&gt;u.s.status) &amp; RCV_OWN))</div><div class='del'>-	{</div><div class='del'>-		cnt++;</div><div class='del'>-		if( (rmdstat &amp; (RCV_START | RCV_END | RCV_ERR)) != (RCV_START | RCV_END) ) /* error or oversized? */</div><div class='del'>-		{</div><div class='del'>-			if(!(rmdstat &amp; RCV_ERR)) {</div><div class='del'>-				if(rmdstat &amp; RCV_START)</div><div class='del'>-				{</div><div class='del'>-					dev-&gt;stats.rx_length_errors++;</div><div class='del'>-					printk(KERN_ERR "%s: recv, packet too long: %d\n",dev-&gt;name,rmdp-&gt;mlen &amp; 0x0fff);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				if(debuglevel &gt; 2)</div><div class='del'>-					printk(KERN_ERR "%s: receive-error: %04x, lance-status: %04x/%04x\n",</div><div class='del'>-									dev-&gt;name,(int) rmdstat,csr0,(int) inw(PORT+L_DATAREG) );</div><div class='del'>-				if(rmdstat &amp; RCV_FRAM)</div><div class='del'>-					dev-&gt;stats.rx_frame_errors++;</div><div class='del'>-				if(rmdstat &amp; RCV_OFLO)</div><div class='del'>-					dev-&gt;stats.rx_over_errors++;</div><div class='del'>-				if(rmdstat &amp; RCV_CRC)</div><div class='del'>-					dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-				if(rmdstat &amp; RCV_BUF_ERR)</div><div class='del'>-					dev-&gt;stats.rx_fifo_errors++;</div><div class='del'>-			}</div><div class='del'>-			if(!(csr0 &amp; CSR0_MISS)) /* don't count errors twice */</div><div class='del'>-				dev-&gt;stats.rx_errors++;</div><div class='del'>-		}</div><div class='del'>-		else if( (len = (rmdp-&gt;mlen &amp; 0x0fff) - 4) &gt;= 60)</div><div class='del'>-		{</div><div class='del'>-#ifdef RCV_VIA_SKB</div><div class='del'>-			struct sk_buff *skb = alloc_skb(R_BUF_SIZE+2+16,GFP_ATOMIC);</div><div class='del'>-			if (skb)</div><div class='del'>-				skb_reserve(skb,16);</div><div class='del'>-#else</div><div class='del'>-			struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);</div><div class='del'>-#endif</div><div class='del'>-			if(skb)</div><div class='del'>-			{</div><div class='del'>-				skb_reserve(skb,2);</div><div class='del'>-#ifdef RCV_VIA_SKB</div><div class='del'>-				if( (unsigned long) (skb-&gt;data + R_BUF_SIZE) &gt; 0x1000000) {</div><div class='del'>-					skb_put(skb,len);</div><div class='del'>-					skb_copy_to_linear_data(skb, (unsigned char *)(p-&gt;recv_skb[p-&gt;rmdnum]-&gt;data),len);</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					struct sk_buff *skb1 = p-&gt;recv_skb[p-&gt;rmdnum];</div><div class='del'>-					skb_put(skb,R_BUF_SIZE);</div><div class='del'>-					p-&gt;recv_skb[p-&gt;rmdnum] = skb;</div><div class='del'>-					rmdp-&gt;u.buffer = (u32) isa_virt_to_bus(skb-&gt;data);</div><div class='del'>-					skb = skb1;</div><div class='del'>-					skb_trim(skb,len);</div><div class='del'>-				}</div><div class='del'>-#else</div><div class='del'>-				skb_put(skb,len);</div><div class='del'>-				skb_copy_to_linear_data(skb, (unsigned char *) p-&gt;recvbounce[p-&gt;rmdnum],len);</div><div class='del'>-#endif</div><div class='del'>-				dev-&gt;stats.rx_packets++;</div><div class='del'>-				dev-&gt;stats.rx_bytes += len;</div><div class='del'>-				skb-&gt;protocol=eth_type_trans(skb,dev);</div><div class='del'>-				netif_rx(skb);</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-			{</div><div class='del'>-				printk(KERN_ERR "%s: can't alloc new sk_buff\n",dev-&gt;name);</div><div class='del'>-				dev-&gt;stats.rx_dropped++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			printk(KERN_INFO "%s: received runt packet\n",dev-&gt;name);</div><div class='del'>-			dev-&gt;stats.rx_errors++;</div><div class='del'>-		}</div><div class='del'>-		rmdp-&gt;blen = -(R_BUF_SIZE-8);</div><div class='del'>-		rmdp-&gt;mlen = 0;</div><div class='del'>-		rmdp-&gt;u.s.status = RCV_OWN; /* change owner */</div><div class='del'>-		p-&gt;rmdnum = (p-&gt;rmdnum + 1) &amp; (RMDNUM-1);</div><div class='del'>-		rmdp = p-&gt;rmdhead + p-&gt;rmdnum;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * kick xmitter ..</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void ni65_timeout(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	printk(KERN_ERR "%s: xmitter timed out, try to restart!\n",dev-&gt;name);</div><div class='del'>-	for(i=0;i&lt;TMDNUM;i++)</div><div class='del'>-		printk("%02x ",p-&gt;tmdhead[i].u.s.status);</div><div class='del'>-	printk("\n");</div><div class='del'>-	ni65_lance_reinit(dev);</div><div class='del'>-	netif_trans_update(dev); /* prevent tx timeout */</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Send a packet</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static netdev_tx_t ni65_send_packet(struct sk_buff *skb,</div><div class='del'>-				    struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct priv *p = dev-&gt;ml_priv;</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-	if (test_and_set_bit(0, (void*)&amp;p-&gt;lock)) {</div><div class='del'>-		printk(KERN_ERR "%s: Queue was locked.\n", dev-&gt;name);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		short len = ETH_ZLEN &lt; skb-&gt;len ? skb-&gt;len : ETH_ZLEN;</div><div class='del'>-		struct tmd *tmdp;</div><div class='del'>-		unsigned long flags;</div><div class='del'>-</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		if( (unsigned long) (skb-&gt;data + skb-&gt;len) &gt; 0x1000000) {</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-			skb_copy_from_linear_data(skb, p-&gt;tmdbounce[p-&gt;tmdbouncenum],</div><div class='del'>-				      skb-&gt;len &gt; T_BUF_SIZE ? T_BUF_SIZE :</div><div class='del'>-							      skb-&gt;len);</div><div class='del'>-			if (len &gt; skb-&gt;len)</div><div class='del'>-				memset((char *)p-&gt;tmdbounce[p-&gt;tmdbouncenum]+skb-&gt;len, 0, len-skb-&gt;len);</div><div class='del'>-			dev_kfree_skb (skb);</div><div class='del'>-</div><div class='del'>-			spin_lock_irqsave(&amp;p-&gt;ring_lock, flags);</div><div class='del'>-			tmdp = p-&gt;tmdhead + p-&gt;tmdnum;</div><div class='del'>-			tmdp-&gt;u.buffer = (u32) isa_virt_to_bus(p-&gt;tmdbounce[p-&gt;tmdbouncenum]);</div><div class='del'>-			p-&gt;tmdbouncenum = (p-&gt;tmdbouncenum + 1) &amp; (TMDNUM - 1);</div><div class='del'>-</div><div class='del'>-#ifdef XMT_VIA_SKB</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			spin_lock_irqsave(&amp;p-&gt;ring_lock, flags);</div><div class='del'>-</div><div class='del'>-			tmdp = p-&gt;tmdhead + p-&gt;tmdnum;</div><div class='del'>-			tmdp-&gt;u.buffer = (u32) isa_virt_to_bus(skb-&gt;data);</div><div class='del'>-			p-&gt;tmd_skb[p-&gt;tmdnum] = skb;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		tmdp-&gt;blen = -len;</div><div class='del'>-</div><div class='del'>-		tmdp-&gt;u.s.status = XMIT_OWN | XMIT_START | XMIT_END;</div><div class='del'>-		writedatareg(CSR0_TDMD | CSR0_INEA); /* enable xmit &amp; interrupt */</div><div class='del'>-</div><div class='del'>-		p-&gt;xmit_queued = 1;</div><div class='del'>-		p-&gt;tmdnum = (p-&gt;tmdnum + 1) &amp; (TMDNUM-1);</div><div class='del'>-</div><div class='del'>-		if(p-&gt;tmdnum != p-&gt;tmdlast)</div><div class='del'>-			netif_wake_queue(dev);</div><div class='del'>-</div><div class='del'>-		p-&gt;lock = 0;</div><div class='del'>-</div><div class='del'>-		spin_unlock_irqrestore(&amp;p-&gt;ring_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	if(!ni65_lance_reinit(dev))</div><div class='del'>-		printk(KERN_ERR "%s: Can't switch card into MC mode!\n",dev-&gt;name);</div><div class='del'>-	netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MODULE</div><div class='del'>-static struct net_device *dev_ni65;</div><div class='del'>-</div><div class='del'>-module_param_hw(irq, int, irq, 0);</div><div class='del'>-module_param_hw(io, int, ioport, 0);</div><div class='del'>-module_param_hw(dma, int, dma, 0);</div><div class='del'>-MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)");</div><div class='del'>-MODULE_PARM_DESC(io, "ni6510 I/O base address");</div><div class='del'>-MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)");</div><div class='del'>-</div><div class='del'>-int __init init_module(void)</div><div class='del'>-{</div><div class='del'>- 	dev_ni65 = ni65_probe(-1);</div><div class='del'>-	return PTR_ERR_OR_ZERO(dev_ni65);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void __exit cleanup_module(void)</div><div class='del'>-{</div><div class='del'>- 	unregister_netdev(dev_ni65);</div><div class='del'>- 	cleanup_card(dev_ni65);</div><div class='del'>- 	free_netdev(dev_ni65);</div><div class='del'>-}</div><div class='del'>-#endif /* MODULE */</div><div class='del'>-</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/amd/ni65.h b/drivers/net/ethernet/amd/ni65.h<br/>deleted file mode 100644<br/>index e6217e35edf0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/ni65.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/ni65.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,121 +0,0 @@</div><div class='del'>-/* am7990 (lance) definitions</div><div class='del'>- *</div><div class='del'>- * This is an extension to the Linux operating system, and is covered by</div><div class='del'>- * same GNU General Public License that covers that work.</div><div class='del'>- *</div><div class='del'>- * Michael Hipp</div><div class='del'>- * email: mhipp@student.uni-tuebingen.de</div><div class='del'>- *</div><div class='del'>- * sources: (mail me or ask archie if you need them)</div><div class='del'>- *    crynwr-packet-driver</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 	Control and Status Register 0 (CSR0) bit definitions</div><div class='del'>- * (R=Readable) (W=Writeable) (S=Set on write) (C-Clear on write)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define CSR0_ERR	0x8000	/* Error summary (R) */</div><div class='del'>-#define CSR0_BABL	0x4000	/* Babble transmitter timeout error (RC) */</div><div class='del'>-#define CSR0_CERR	0x2000	/* Collision Error (RC) */</div><div class='del'>-#define CSR0_MISS	0x1000	/* Missed packet (RC) */</div><div class='del'>-#define CSR0_MERR	0x0800	/* Memory Error (RC) */</div><div class='del'>-#define CSR0_RINT	0x0400	/* Receiver Interrupt (RC) */</div><div class='del'>-#define CSR0_TINT       0x0200	/* Transmit Interrupt (RC) */</div><div class='del'>-#define CSR0_IDON	0x0100	/* Initialization Done (RC) */</div><div class='del'>-#define CSR0_INTR	0x0080	/* Interrupt Flag (R) */</div><div class='del'>-#define CSR0_INEA	0x0040	/* Interrupt Enable (RW) */</div><div class='del'>-#define CSR0_RXON	0x0020	/* Receiver on (R) */</div><div class='del'>-#define CSR0_TXON	0x0010	/* Transmitter on (R) */</div><div class='del'>-#define CSR0_TDMD	0x0008	/* Transmit Demand (RS) */</div><div class='del'>-#define CSR0_STOP	0x0004	/* Stop (RS) */</div><div class='del'>-#define CSR0_STRT	0x0002	/* Start (RS) */</div><div class='del'>-#define CSR0_INIT	0x0001	/* Initialize (RS) */</div><div class='del'>-</div><div class='del'>-#define CSR0_CLRALL    0x7f00	/* mask for all clearable bits */</div><div class='del'>-/*</div><div class='del'>- *	Initialization Block  Mode operation Bit Definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define M_PROM		0x8000	/* Promiscuous Mode */</div><div class='del'>-#define M_INTL		0x0040	/* Internal Loopback */</div><div class='del'>-#define M_DRTY		0x0020	/* Disable Retry */</div><div class='del'>-#define M_COLL		0x0010	/* Force Collision */</div><div class='del'>-#define M_DTCR		0x0008	/* Disable Transmit CRC) */</div><div class='del'>-#define M_LOOP		0x0004	/* Loopback */</div><div class='del'>-#define M_DTX		0x0002	/* Disable the Transmitter */</div><div class='del'>-#define M_DRX		0x0001	/* Disable the Receiver */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * 	Receive message descriptor bit definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define RCV_OWN		0x80	/* owner bit 0 = host, 1 = lance */</div><div class='del'>-#define RCV_ERR		0x40	/* Error Summary */</div><div class='del'>-#define RCV_FRAM	0x20	/* Framing Error */</div><div class='del'>-#define RCV_OFLO	0x10	/* Overflow Error */</div><div class='del'>-#define RCV_CRC		0x08	/* CRC Error */</div><div class='del'>-#define RCV_BUF_ERR	0x04	/* Buffer Error */</div><div class='del'>-#define RCV_START	0x02	/* Start of Packet */</div><div class='del'>-#define RCV_END		0x01	/* End of Packet */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *	Transmit  message descriptor bit definitions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define XMIT_OWN	0x80	/* owner bit 0 = host, 1 = lance */</div><div class='del'>-#define XMIT_ERR	0x40	/* Error Summary */</div><div class='del'>-#define XMIT_RETRY	0x10	/* more the 1 retry needed to Xmit */</div><div class='del'>-#define XMIT_1_RETRY	0x08	/* one retry needed to Xmit */</div><div class='del'>-#define XMIT_DEF	0x04	/* Deferred */</div><div class='del'>-#define XMIT_START	0x02	/* Start of Packet */</div><div class='del'>-#define XMIT_END	0x01	/* End of Packet */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * transmit status (2) (valid if XMIT_ERR == 1)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define XMIT_TDRMASK    0x03ff	/* time-domain-reflectometer-value */</div><div class='del'>-#define XMIT_RTRY 	0x0400	/* Failed after 16 retransmissions  */</div><div class='del'>-#define XMIT_LCAR 	0x0800	/* Loss of Carrier */</div><div class='del'>-#define XMIT_LCOL 	0x1000	/* Late collision */</div><div class='del'>-#define XMIT_RESERV 	0x2000	/* Reserved */</div><div class='del'>-#define XMIT_UFLO 	0x4000	/* Underflow (late memory) */</div><div class='del'>-#define XMIT_BUFF 	0x8000	/* Buffering error (no ENP) */</div><div class='del'>-</div><div class='del'>-struct init_block {</div><div class='del'>-	unsigned short mode;</div><div class='del'>-	unsigned char eaddr[6];</div><div class='del'>-	unsigned char filter[8];</div><div class='del'>-	/* bit 29-31: number of rmd's (power of 2) */</div><div class='del'>-	u32 rrp;		/* receive ring pointer (align 8) */</div><div class='del'>-	/* bit 29-31: number of tmd's (power of 2) */</div><div class='del'>-	u32 trp;		/* transmit ring pointer (align 8) */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct rmd {			/* Receive Message Descriptor */</div><div class='del'>-	union {</div><div class='del'>-		volatile u32 buffer;</div><div class='del'>-		struct {</div><div class='del'>-			volatile unsigned char dummy[3];</div><div class='del'>-			volatile unsigned char status;</div><div class='del'>-		} s;</div><div class='del'>-	} u;</div><div class='del'>-	volatile short blen;</div><div class='del'>-	volatile unsigned short mlen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct tmd {</div><div class='del'>-	union {</div><div class='del'>-		volatile u32 buffer;</div><div class='del'>-		struct {</div><div class='del'>-			volatile unsigned char dummy[3];</div><div class='del'>-			volatile unsigned char status;</div><div class='del'>-		} s;</div><div class='del'>-	} u;</div><div class='del'>-	volatile unsigned short blen;</div><div class='del'>-	volatile unsigned short status2;</div><div class='del'>-};</div><div class='head'>diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c<br/>index 9c152d85840d..37054a670407 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/nmclan_cs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/nmclan_cs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/nmclan_cs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/nmclan_cs.c</a></div><div class='hunk'>@@ -114,8 +114,6 @@ Log: nmclan_cs.c,v</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"nmclan_cs"</div><div class='del'>-#define DRV_VERSION	"0.16"</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* ----------------------------------------------------------------------------</div><div class='ctx'> Conditional Compilation Options</div><div class='hunk'>@@ -367,7 +365,7 @@ typedef struct _mace_private {</div><div class='ctx'> </div><div class='ctx'>     char tx_free_frames; /* Number of free transmit frame buffers */</div><div class='ctx'>     char tx_irq_disabled; /* MACE TX interrupt disabled */</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     spinlock_t bank_lock; /* Must be held if you step off bank 0 */</div><div class='ctx'> } mace_private;</div><div class='ctx'> </div><div class='hunk'>@@ -407,7 +405,7 @@ static int mace_open(struct net_device *dev);</div><div class='ctx'> static int mace_close(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t mace_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 					 struct net_device *dev);</div><div class='del'>-static void mace_tx_timeout(struct net_device *dev);</div><div class='add'>+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static irqreturn_t mace_interrupt(int irq, void *dev_id);</div><div class='ctx'> static struct net_device_stats *mace_get_stats(struct net_device *dev);</div><div class='ctx'> static int mace_rx(struct net_device *dev, unsigned char RxCnt);</div><div class='hunk'>@@ -444,7 +442,7 @@ static int nmclan_probe(struct pcmcia_device *link)</div><div class='ctx'>     lp = netdev_priv(dev);</div><div class='ctx'>     lp-&gt;p_dev = link;</div><div class='ctx'>     link-&gt;priv = dev;</div><div class='del'>-    </div><div class='add'>+</div><div class='ctx'>     spin_lock_init(&amp;lp-&gt;bank_lock);</div><div class='ctx'>     link-&gt;resource[0]-&gt;end = 32;</div><div class='ctx'>     link-&gt;resource[0]-&gt;flags |= IO_DATA_PATH_WIDTH_AUTO;</div><div class='hunk'>@@ -487,10 +485,10 @@ static int mace_read(mace_private *lp, unsigned int ioaddr, int reg)</div><div class='ctx'>   unsigned long flags;</div><div class='ctx'> </div><div class='ctx'>   switch (reg &gt;&gt; 4) {</div><div class='del'>-    case 0: /* register 0-15 */</div><div class='add'>+  case 0: /* register 0-15 */</div><div class='ctx'>       data = inb(ioaddr + AM2150_MACE_BASE + reg);</div><div class='ctx'>       break;</div><div class='del'>-    case 1: /* register 16-31 */</div><div class='add'>+  case 1: /* register 16-31 */</div><div class='ctx'>       spin_lock_irqsave(&amp;lp-&gt;bank_lock, flags);</div><div class='ctx'>       MACEBANK(1);</div><div class='ctx'>       data = inb(ioaddr + AM2150_MACE_BASE + (reg &amp; 0x0F));</div><div class='hunk'>@@ -514,10 +512,10 @@ static void mace_write(mace_private *lp, unsigned int ioaddr, int reg,</div><div class='ctx'>   unsigned long flags;</div><div class='ctx'> </div><div class='ctx'>   switch (reg &gt;&gt; 4) {</div><div class='del'>-    case 0: /* register 0-15 */</div><div class='add'>+  case 0: /* register 0-15 */</div><div class='ctx'>       outb(data &amp; 0xFF, ioaddr + AM2150_MACE_BASE + reg);</div><div class='ctx'>       break;</div><div class='del'>-    case 1: /* register 16-31 */</div><div class='add'>+  case 1: /* register 16-31 */</div><div class='ctx'>       spin_lock_irqsave(&amp;lp-&gt;bank_lock, flags);</div><div class='ctx'>       MACEBANK(1);</div><div class='ctx'>       outb(data &amp; 0xFF, ioaddr + AM2150_MACE_BASE + (reg &amp; 0x0F));</div><div class='hunk'>@@ -531,7 +529,8 @@ static void mace_write(mace_private *lp, unsigned int ioaddr, int reg,</div><div class='ctx'> mace_init</div><div class='ctx'> 	Resets the MACE chip.</div><div class='ctx'> ---------------------------------------------------------------------------- */</div><div class='del'>-static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)</div><div class='add'>+static int mace_init(mace_private *lp, unsigned int ioaddr,</div><div class='add'>+		     const char *enet_addr)</div><div class='ctx'> {</div><div class='ctx'>   int i;</div><div class='ctx'>   int ct = 0;</div><div class='hunk'>@@ -543,7 +542,7 @@ static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)</div><div class='ctx'>     if(++ct &gt; 500)</div><div class='ctx'>     {</div><div class='ctx'> 	pr_err("reset failed, card removed?\n");</div><div class='del'>-    	return -1;</div><div class='add'>+	return -1;</div><div class='ctx'>     }</div><div class='ctx'>     udelay(1);</div><div class='ctx'>   }</div><div class='hunk'>@@ -568,13 +567,13 @@ static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)</div><div class='ctx'>    * Or just set ASEL in PHYCC below!</div><div class='ctx'>    */</div><div class='ctx'>   switch (if_port) {</div><div class='del'>-    case 1:</div><div class='add'>+  case 1:</div><div class='ctx'>       mace_write(lp, ioaddr, MACE_PLSCC, 0x02);</div><div class='ctx'>       break;</div><div class='del'>-    case 2:</div><div class='add'>+  case 2:</div><div class='ctx'>       mace_write(lp, ioaddr, MACE_PLSCC, 0x00);</div><div class='ctx'>       break;</div><div class='del'>-    default:</div><div class='add'>+  default:</div><div class='ctx'>       mace_write(lp, ioaddr, MACE_PHYCC, /* ASEL */ 4);</div><div class='ctx'>       /* ASEL Auto Select.  When set, the PORTSEL[1-0] bits are overridden,</div><div class='ctx'> 	 and the MACE device will automatically select the operating media</div><div class='hunk'>@@ -587,11 +586,11 @@ static int mace_init(mace_private *lp, unsigned int ioaddr, char *enet_addr)</div><div class='ctx'>   ct = 0;</div><div class='ctx'>   while (mace_read(lp, ioaddr, MACE_IAC) &amp; MACE_IAC_ADDRCHG)</div><div class='ctx'>   {</div><div class='del'>-  	if(++ ct &gt; 500)</div><div class='del'>-  	{</div><div class='add'>+	if(++ ct &gt; 500)</div><div class='add'>+	{</div><div class='ctx'> 		pr_err("ADDRCHG timeout, card removed?\n");</div><div class='del'>-  		return -1;</div><div class='del'>-  	}</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='ctx'>   }</div><div class='ctx'>   /* Set PADR register */</div><div class='ctx'>   for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='hunk'>@@ -637,7 +636,7 @@ static int nmclan_config(struct pcmcia_device *link)</div><div class='ctx'> 	  kfree(buf);</div><div class='ctx'> 	  goto failed;</div><div class='ctx'>   }</div><div class='del'>-  memcpy(dev-&gt;dev_addr, buf, ETH_ALEN);</div><div class='add'>+  eth_hw_addr_set(dev, buf);</div><div class='ctx'>   kfree(buf);</div><div class='ctx'> </div><div class='ctx'>   /* Verify configuration by reading the MACE ID. */</div><div class='hunk'>@@ -652,12 +651,12 @@ static int nmclan_config(struct pcmcia_device *link)</div><div class='ctx'>     } else {</div><div class='ctx'>       pr_notice("mace id not found: %x %x should be 0x40 0x?9\n",</div><div class='ctx'> 		sig[0], sig[1]);</div><div class='del'>-      return -ENODEV;</div><div class='add'>+      goto failed;</div><div class='ctx'>     }</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='ctx'>   if(mace_init(lp, ioaddr, dev-&gt;dev_addr) == -1)</div><div class='del'>-  	goto failed;</div><div class='add'>+	goto failed;</div><div class='ctx'> </div><div class='ctx'>   /* The if_port symbol can be set when the module is loaded */</div><div class='ctx'>   if (if_port &lt;= 2)</div><div class='hunk'>@@ -761,7 +760,7 @@ static int mace_config(struct net_device *dev, struct ifmap *map)</div><div class='ctx'> {</div><div class='ctx'>   if ((map-&gt;port != (u_char)(-1)) &amp;&amp; (map-&gt;port != dev-&gt;if_port)) {</div><div class='ctx'>     if (map-&gt;port &lt;= 2) {</div><div class='del'>-      dev-&gt;if_port = map-&gt;port;</div><div class='add'>+      WRITE_ONCE(dev-&gt;if_port, map-&gt;port);</div><div class='ctx'>       netdev_info(dev, "switched to %s port\n", if_names[dev-&gt;if_port]);</div><div class='ctx'>     } else</div><div class='ctx'>       return -EINVAL;</div><div class='hunk'>@@ -816,8 +815,7 @@ static int mace_close(struct net_device *dev)</div><div class='ctx'> static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='ctx'> 		"PCMCIA 0x%lx", dev-&gt;base_addr);</div><div class='ctx'> }</div><div class='hunk'>@@ -837,7 +835,7 @@ mace_start_xmit</div><div class='ctx'> 	failed, put skb back into a list."</div><div class='ctx'> ---------------------------------------------------------------------------- */</div><div class='ctx'> </div><div class='del'>-static void mace_tx_timeout(struct net_device *dev)</div><div class='add'>+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'>   mace_private *lp = netdev_priv(dev);</div><div class='ctx'>   struct pcmcia_device *link = lp-&gt;p_dev;</div><div class='hunk'>@@ -920,7 +918,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)</div><div class='ctx'>   int status;</div><div class='ctx'>   int IntrCnt = MACE_MAX_IR_ITERATIONS;</div><div class='ctx'> </div><div class='del'>-  if (dev == NULL) {</div><div class='add'>+  if (!dev) {</div><div class='ctx'>     pr_debug("mace_interrupt(): irq 0x%X for unknown device.\n",</div><div class='ctx'> 	  irq);</div><div class='ctx'>     return IRQ_NONE;</div><div class='hunk'>@@ -1104,13 +1102,13 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)</div><div class='ctx'> </div><div class='ctx'>       skb = netdev_alloc_skb(dev, pkt_len + 2);</div><div class='ctx'> </div><div class='del'>-      if (skb != NULL) {</div><div class='add'>+      if (skb) {</div><div class='ctx'> 	skb_reserve(skb, 2);</div><div class='ctx'> 	insw(ioaddr + AM2150_RCV, skb_put(skb, pkt_len), pkt_len&gt;&gt;1);</div><div class='ctx'> 	if (pkt_len &amp; 1)</div><div class='ctx'> 	    *(skb_tail_pointer(skb) - 1) = inb(ioaddr + AM2150_RCV);</div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-	</div><div class='add'>+</div><div class='ctx'> 	netif_rx(skb); /* Send the packet to the upper (protocol) layers. */</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;stats.rx_packets++;</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c<br/>index f5ad12c10934..9eaefa0f5e80 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pcnet32.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/pcnet32.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pcnet32.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pcnet32.c</a></div><div class='hunk'>@@ -24,13 +24,9 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"pcnet32"</div><div class='del'>-#define DRV_VERSION	"1.35"</div><div class='ctx'> #define DRV_RELDATE	"21.Apr.2008"</div><div class='ctx'> #define PFX		DRV_NAME ": "</div><div class='ctx'> </div><div class='del'>-static const char *const version =</div><div class='del'>-    DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";</div><div class='del'>-</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -254,7 +250,7 @@ struct pcnet32_access {</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * The first field of pcnet32_private is read by the ethernet device</div><div class='del'>- * so the structure should be allocated using pci_alloc_consistent().</div><div class='add'>+ * so the structure should be allocated using dma_alloc_coherent().</div><div class='ctx'>  */</div><div class='ctx'> struct pcnet32_private {</div><div class='ctx'> 	struct pcnet32_init_block *init_block;</div><div class='hunk'>@@ -262,7 +258,7 @@ struct pcnet32_private {</div><div class='ctx'> 	struct pcnet32_rx_head	*rx_ring;</div><div class='ctx'> 	struct pcnet32_tx_head	*tx_ring;</div><div class='ctx'> 	dma_addr_t		init_dma_addr;/* DMA address of beginning of the init block,</div><div class='del'>-				   returned by pci_alloc_consistent */</div><div class='add'>+				   returned by dma_alloc_coherent */</div><div class='ctx'> 	struct pci_dev		*pci_dev;</div><div class='ctx'> 	const char		*name;</div><div class='ctx'> 	/* The saved address of a sent-in-place packet/buffer, for skfree(). */</div><div class='hunk'>@@ -314,7 +310,7 @@ static int pcnet32_open(struct net_device *);</div><div class='ctx'> static int pcnet32_init_ring(struct net_device *);</div><div class='ctx'> static netdev_tx_t pcnet32_start_xmit(struct sk_buff *,</div><div class='ctx'> 				      struct net_device *);</div><div class='del'>-static void pcnet32_tx_timeout(struct net_device *dev);</div><div class='add'>+static void pcnet32_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static irqreturn_t pcnet32_interrupt(int, void *);</div><div class='ctx'> static int pcnet32_close(struct net_device *);</div><div class='ctx'> static struct net_device_stats *pcnet32_get_stats(struct net_device *);</div><div class='hunk'>@@ -466,7 +462,7 @@ static void pcnet32_netif_start(struct net_device *dev)</div><div class='ctx'> 	val = lp-&gt;a-&gt;read_csr(ioaddr, CSR3);</div><div class='ctx'> 	val &amp;= 0x00ff;</div><div class='ctx'> 	lp-&gt;a-&gt;write_csr(ioaddr, CSR3, val);</div><div class='del'>-	napi_enable(&amp;lp-&gt;napi);</div><div class='add'>+	napi_enable_locked(&amp;lp-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -489,10 +485,10 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,</div><div class='ctx'> 	pcnet32_purge_tx_ring(dev);</div><div class='ctx'> </div><div class='ctx'> 	new_tx_ring =</div><div class='del'>-		pci_zalloc_consistent(lp-&gt;pci_dev,</div><div class='del'>-				      sizeof(struct pcnet32_tx_head) * entries,</div><div class='del'>-				      &amp;new_ring_dma_addr);</div><div class='del'>-	if (new_tx_ring == NULL)</div><div class='add'>+		dma_alloc_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+				   sizeof(struct pcnet32_tx_head) * entries,</div><div class='add'>+				   &amp;new_ring_dma_addr, GFP_ATOMIC);</div><div class='add'>+	if (!new_tx_ring)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);</div><div class='hunk'>@@ -505,9 +501,9 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	kfree(lp-&gt;tx_skbuff);</div><div class='ctx'> 	kfree(lp-&gt;tx_dma_addr);</div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-			    sizeof(struct pcnet32_tx_head) * lp-&gt;tx_ring_size,</div><div class='del'>-			    lp-&gt;tx_ring, lp-&gt;tx_ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct pcnet32_tx_head) * lp-&gt;tx_ring_size,</div><div class='add'>+			  lp-&gt;tx_ring, lp-&gt;tx_ring_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;tx_ring_size = entries;</div><div class='ctx'> 	lp-&gt;tx_mod_mask = lp-&gt;tx_ring_size - 1;</div><div class='hunk'>@@ -521,10 +517,9 @@ static void pcnet32_realloc_tx_ring(struct net_device *dev,</div><div class='ctx'> free_new_lists:</div><div class='ctx'> 	kfree(new_dma_addr_list);</div><div class='ctx'> free_new_tx_ring:</div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-			    sizeof(struct pcnet32_tx_head) * entries,</div><div class='del'>-			    new_tx_ring,</div><div class='del'>-			    new_ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct pcnet32_tx_head) * entries,</div><div class='add'>+			  new_tx_ring, new_ring_dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -549,10 +544,10 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,</div><div class='ctx'> 	unsigned int entries = BIT(size);</div><div class='ctx'> </div><div class='ctx'> 	new_rx_ring =</div><div class='del'>-		pci_zalloc_consistent(lp-&gt;pci_dev,</div><div class='del'>-				      sizeof(struct pcnet32_rx_head) * entries,</div><div class='del'>-				      &amp;new_ring_dma_addr);</div><div class='del'>-	if (new_rx_ring == NULL)</div><div class='add'>+		dma_alloc_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+				   sizeof(struct pcnet32_rx_head) * entries,</div><div class='add'>+				   &amp;new_ring_dma_addr, GFP_ATOMIC);</div><div class='add'>+	if (!new_rx_ring)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	new_dma_addr_list = kcalloc(entries, sizeof(dma_addr_t), GFP_ATOMIC);</div><div class='hunk'>@@ -584,10 +579,9 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,</div><div class='ctx'> 		skb_reserve(rx_skbuff, NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 		new_dma_addr_list[new] =</div><div class='del'>-			    pci_map_single(lp-&gt;pci_dev, rx_skbuff-&gt;data,</div><div class='del'>-					   PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-		if (pci_dma_mapping_error(lp-&gt;pci_dev,</div><div class='del'>-					  new_dma_addr_list[new])) {</div><div class='add'>+			    dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev, rx_skbuff-&gt;data,</div><div class='add'>+					   PKT_BUF_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, new_dma_addr_list[new])) {</div><div class='ctx'> 			netif_err(lp, drv, dev, "%s dma mapping failed\n",</div><div class='ctx'> 				  __func__);</div><div class='ctx'> 			dev_kfree_skb(new_skb_list[new]);</div><div class='hunk'>@@ -600,22 +594,20 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,</div><div class='ctx'> 	/* and free any unneeded buffers */</div><div class='ctx'> 	for (; new &lt; lp-&gt;rx_ring_size; new++) {</div><div class='ctx'> 		if (lp-&gt;rx_skbuff[new]) {</div><div class='del'>-			if (!pci_dma_mapping_error(lp-&gt;pci_dev,</div><div class='del'>-						   lp-&gt;rx_dma_addr[new]))</div><div class='del'>-				pci_unmap_single(lp-&gt;pci_dev,</div><div class='add'>+			if (!dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;rx_dma_addr[new]))</div><div class='add'>+				dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 lp-&gt;rx_dma_addr[new],</div><div class='ctx'> 						 PKT_BUF_SIZE,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(lp-&gt;rx_skbuff[new]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(lp-&gt;rx_skbuff);</div><div class='ctx'> 	kfree(lp-&gt;rx_dma_addr);</div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-			    sizeof(struct pcnet32_rx_head) *</div><div class='del'>-			    lp-&gt;rx_ring_size, lp-&gt;rx_ring,</div><div class='del'>-			    lp-&gt;rx_ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct pcnet32_rx_head) * lp-&gt;rx_ring_size,</div><div class='add'>+			  lp-&gt;rx_ring, lp-&gt;rx_ring_dma_addr);</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;rx_ring_size = entries;</div><div class='ctx'> 	lp-&gt;rx_mod_mask = lp-&gt;rx_ring_size - 1;</div><div class='hunk'>@@ -629,12 +621,11 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,</div><div class='ctx'> free_all_new:</div><div class='ctx'> 	while (--new &gt;= lp-&gt;rx_ring_size) {</div><div class='ctx'> 		if (new_skb_list[new]) {</div><div class='del'>-			if (!pci_dma_mapping_error(lp-&gt;pci_dev,</div><div class='del'>-						   new_dma_addr_list[new]))</div><div class='del'>-				pci_unmap_single(lp-&gt;pci_dev,</div><div class='add'>+			if (!dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, new_dma_addr_list[new]))</div><div class='add'>+				dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 new_dma_addr_list[new],</div><div class='ctx'> 						 PKT_BUF_SIZE,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(new_skb_list[new]);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -642,10 +633,9 @@ free_all_new:</div><div class='ctx'> free_new_lists:</div><div class='ctx'> 	kfree(new_dma_addr_list);</div><div class='ctx'> free_new_rx_ring:</div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-			    sizeof(struct pcnet32_rx_head) * entries,</div><div class='del'>-			    new_rx_ring,</div><div class='del'>-			    new_ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct pcnet32_rx_head) * entries,</div><div class='add'>+			  new_rx_ring, new_ring_dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pcnet32_purge_rx_ring(struct net_device *dev)</div><div class='hunk'>@@ -658,12 +648,11 @@ static void pcnet32_purge_rx_ring(struct net_device *dev)</div><div class='ctx'> 		lp-&gt;rx_ring[i].status = 0;	/* CPU owns buffer */</div><div class='ctx'> 		wmb();		/* Make sure adapter sees owner change */</div><div class='ctx'> 		if (lp-&gt;rx_skbuff[i]) {</div><div class='del'>-			if (!pci_dma_mapping_error(lp-&gt;pci_dev,</div><div class='del'>-						   lp-&gt;rx_dma_addr[i]))</div><div class='del'>-				pci_unmap_single(lp-&gt;pci_dev,</div><div class='add'>+			if (!dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;rx_dma_addr[i]))</div><div class='add'>+				dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 lp-&gt;rx_dma_addr[i],</div><div class='ctx'> 						 PKT_BUF_SIZE,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(lp-&gt;rx_skbuff[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 		lp-&gt;rx_skbuff[i] = NULL;</div><div class='hunk'>@@ -808,10 +797,9 @@ static void pcnet32_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	if (lp-&gt;pci_dev)</div><div class='del'>-		strlcpy(info-&gt;bus_info, pci_name(lp-&gt;pci_dev),</div><div class='add'>+		strscpy(info-&gt;bus_info, pci_name(lp-&gt;pci_dev),</div><div class='ctx'> 			sizeof(info-&gt;bus_info));</div><div class='ctx'> 	else</div><div class='ctx'> 		snprintf(info-&gt;bus_info, sizeof(info-&gt;bus_info),</div><div class='hunk'>@@ -872,7 +860,9 @@ static int pcnet32_nway_reset(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void pcnet32_get_ringparam(struct net_device *dev,</div><div class='del'>-				  struct ethtool_ringparam *ering)</div><div class='add'>+				  struct ethtool_ringparam *ering,</div><div class='add'>+				  struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -883,7 +873,9 @@ static void pcnet32_get_ringparam(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int pcnet32_set_ringparam(struct net_device *dev,</div><div class='del'>-				 struct ethtool_ringparam *ering)</div><div class='add'>+				 struct ethtool_ringparam *ering,</div><div class='add'>+				 struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -897,6 +889,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		pcnet32_netif_stop(dev);</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	lp-&gt;a-&gt;write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */</div><div class='ctx'> </div><div class='hunk'>@@ -928,6 +921,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_info(lp, drv, dev, "Ring Param Settings: RX: %d, TX: %d\n",</div><div class='ctx'> 		   lp-&gt;rx_ring_size, lp-&gt;tx_ring_size);</div><div class='hunk'>@@ -993,6 +987,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		pcnet32_netif_stop(dev);</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	lp-&gt;a-&gt;write_csr(ioaddr, CSR0, CSR0_STOP);	/* stop the chip */</div><div class='ctx'> </div><div class='hunk'>@@ -1041,9 +1036,9 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)</div><div class='ctx'> 			*packet++ = i;</div><div class='ctx'> </div><div class='ctx'> 		lp-&gt;tx_dma_addr[x] =</div><div class='del'>-			pci_map_single(lp-&gt;pci_dev, skb-&gt;data, skb-&gt;len,</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='del'>-		if (pci_dma_mapping_error(lp-&gt;pci_dev, lp-&gt;tx_dma_addr[x])) {</div><div class='add'>+			dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;tx_dma_addr[x])) {</div><div class='ctx'> 			netif_printk(lp, hw, KERN_DEBUG, dev,</div><div class='ctx'> 				     "DMA mapping error at line: %d!\n",</div><div class='ctx'> 				     __LINE__);</div><div class='hunk'>@@ -1130,6 +1125,7 @@ clean_up:</div><div class='ctx'> 		lp-&gt;a-&gt;write_bcr(ioaddr, 20, 4);	/* return to 16bit mode */</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }				/* end pcnet32_loopback_test  */</div><div class='hunk'>@@ -1231,21 +1227,21 @@ static void pcnet32_rx_entry(struct net_device *dev,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (newskb) {</div><div class='ctx'> 			skb_reserve(newskb, NET_IP_ALIGN);</div><div class='del'>-			new_dma_addr = pci_map_single(lp-&gt;pci_dev,</div><div class='add'>+			new_dma_addr = dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						      newskb-&gt;data,</div><div class='ctx'> 						      PKT_BUF_SIZE,</div><div class='del'>-						      PCI_DMA_FROMDEVICE);</div><div class='del'>-			if (pci_dma_mapping_error(lp-&gt;pci_dev, new_dma_addr)) {</div><div class='add'>+						      DMA_FROM_DEVICE);</div><div class='add'>+			if (dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, new_dma_addr)) {</div><div class='ctx'> 				netif_err(lp, rx_err, dev,</div><div class='ctx'> 					  "DMA mapping error.\n");</div><div class='ctx'> 				dev_kfree_skb(newskb);</div><div class='ctx'> 				skb = NULL;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				skb = lp-&gt;rx_skbuff[entry];</div><div class='del'>-				pci_unmap_single(lp-&gt;pci_dev,</div><div class='add'>+				dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 lp-&gt;rx_dma_addr[entry],</div><div class='ctx'> 						 PKT_BUF_SIZE,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_put(skb, pkt_len);</div><div class='ctx'> 				lp-&gt;rx_skbuff[entry] = newskb;</div><div class='ctx'> 				lp-&gt;rx_dma_addr[entry] = new_dma_addr;</div><div class='hunk'>@@ -1257,24 +1253,22 @@ static void pcnet32_rx_entry(struct net_device *dev,</div><div class='ctx'> 	} else</div><div class='ctx'> 		skb = netdev_alloc_skb(dev, pkt_len + NET_IP_ALIGN);</div><div class='ctx'> </div><div class='del'>-	if (skb == NULL) {</div><div class='add'>+	if (!skb) {</div><div class='ctx'> 		dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!rx_in_place) {</div><div class='ctx'> 		skb_reserve(skb, NET_IP_ALIGN);</div><div class='ctx'> 		skb_put(skb, pkt_len);	/* Make room */</div><div class='del'>-		pci_dma_sync_single_for_cpu(lp-&gt;pci_dev,</div><div class='del'>-					    lp-&gt;rx_dma_addr[entry],</div><div class='del'>-					    pkt_len,</div><div class='del'>-					    PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_sync_single_for_cpu(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					lp-&gt;rx_dma_addr[entry], pkt_len,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='ctx'> 		skb_copy_to_linear_data(skb,</div><div class='ctx'> 				 (unsigned char *)(lp-&gt;rx_skbuff[entry]-&gt;data),</div><div class='ctx'> 				 pkt_len);</div><div class='del'>-		pci_dma_sync_single_for_device(lp-&gt;pci_dev,</div><div class='del'>-					       lp-&gt;rx_dma_addr[entry],</div><div class='del'>-					       pkt_len,</div><div class='del'>-					       PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_sync_single_for_device(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					   lp-&gt;rx_dma_addr[entry], pkt_len,</div><div class='add'>+					   DMA_FROM_DEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> 	dev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='hunk'>@@ -1363,10 +1357,10 @@ static int pcnet32_tx(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		/* We must free the original skb */</div><div class='ctx'> 		if (lp-&gt;tx_skbuff[entry]) {</div><div class='del'>-			pci_unmap_single(lp-&gt;pci_dev,</div><div class='add'>+			dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					 lp-&gt;tx_dma_addr[entry],</div><div class='del'>-					 lp-&gt;tx_skbuff[entry]-&gt;</div><div class='del'>-					 len, PCI_DMA_TODEVICE);</div><div class='add'>+					 lp-&gt;tx_skbuff[entry]-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(lp-&gt;tx_skbuff[entry]);</div><div class='ctx'> 			lp-&gt;tx_skbuff[entry] = NULL;</div><div class='ctx'> 			lp-&gt;tx_dma_addr[entry] = 0;</div><div class='hunk'>@@ -1548,20 +1542,21 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	ioaddr = pci_resource_start(pdev, 0);</div><div class='del'>-	if (!ioaddr) {</div><div class='add'>+	if (!pci_resource_len(pdev, 0)) {</div><div class='ctx'> 		if (pcnet32_debug &amp; NETIF_MSG_PROBE)</div><div class='ctx'> 			pr_err("card has no PCI IO resources, aborting\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_disable_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, PCNET32_DMA_MASK);</div><div class='add'>+	err = dma_set_mask(&amp;pdev-&gt;dev, PCNET32_DMA_MASK);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (pcnet32_debug &amp; NETIF_MSG_PROBE)</div><div class='ctx'> 			pr_err("architecture does not support 32bit PCI busmaster DMA\n");</div><div class='ctx'> 		goto err_disable_dev;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ioaddr = pci_resource_start(pdev, 0);</div><div class='ctx'> 	if (!request_region(ioaddr, PCNET32_TOTAL_SIZE, "pcnet32_probe_pci")) {</div><div class='ctx'> 		if (pcnet32_debug &amp; NETIF_MSG_PROBE)</div><div class='ctx'> 			pr_err("io address range already allocated\n");</div><div class='hunk'>@@ -1585,7 +1580,7 @@ static const struct net_device_ops pcnet32_netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= pcnet32_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= pcnet32_get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= pcnet32_set_multicast_list,</div><div class='del'>-	.ndo_do_ioctl		= pcnet32_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= pcnet32_ioctl,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -1608,6 +1603,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	const struct pcnet32_access *a = NULL;</div><div class='ctx'> 	u8 promaddr[ETH_ALEN];</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	int ret = -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/* reset the chip */</div><div class='hunk'>@@ -1773,9 +1769,10 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)</div><div class='ctx'> 		unsigned int val;</div><div class='ctx'> 		val = a-&gt;read_csr(ioaddr, i + 12) &amp; 0x0ffff;</div><div class='ctx'> 		/* There may be endianness issues here. */</div><div class='del'>-		dev-&gt;dev_addr[2 * i] = val &amp; 0x0ff;</div><div class='del'>-		dev-&gt;dev_addr[2 * i + 1] = (val &gt;&gt; 8) &amp; 0x0ff;</div><div class='add'>+		addr[2 * i] = val &amp; 0x0ff;</div><div class='add'>+		addr[2 * i + 1] = (val &gt;&gt; 8) &amp; 0x0ff;</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	/* read PROM address and compare with CSR address */</div><div class='ctx'> 	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='hunk'>@@ -1788,13 +1785,16 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)</div><div class='ctx'> 				pr_cont(" warning: CSR address invalid,\n");</div><div class='ctx'> 				pr_info("    using instead PROM address of");</div><div class='ctx'> 			}</div><div class='del'>-			memcpy(dev-&gt;dev_addr, promaddr, ETH_ALEN);</div><div class='add'>+			eth_hw_addr_set(dev, promaddr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* if the ethernet address is not valid, force to 00:00:00:00:00:00 */</div><div class='del'>-	if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='del'>-		eth_zero_addr(dev-&gt;dev_addr);</div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='add'>+		static const u8 zero_addr[ETH_ALEN] = {};</div><div class='add'>+</div><div class='add'>+		eth_hw_addr_set(dev, zero_addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (pcnet32_debug &amp; NETIF_MSG_PROBE) {</div><div class='ctx'> 		pr_cont(" %pM", dev-&gt;dev_addr);</div><div class='hunk'>@@ -1839,12 +1839,13 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = ioaddr;</div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='del'>-	/* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */</div><div class='del'>-	lp-&gt;init_block = pci_alloc_consistent(pdev, sizeof(*lp-&gt;init_block),</div><div class='del'>-					      &amp;lp-&gt;init_dma_addr);</div><div class='add'>+	/* dma_alloc_coherent returns page-aligned memory, so we do not have to check the alignment */</div><div class='add'>+	lp-&gt;init_block = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					    sizeof(*lp-&gt;init_block),</div><div class='add'>+					    &amp;lp-&gt;init_dma_addr, GFP_KERNEL);</div><div class='ctx'> 	if (!lp-&gt;init_block) {</div><div class='ctx'> 		if (pcnet32_debug &amp; NETIF_MSG_PROBE)</div><div class='del'>-			pr_err("Consistent memory allocation failed\n");</div><div class='add'>+			pr_err("Coherent memory allocation failed\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto err_free_netdev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1884,7 +1885,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)</div><div class='ctx'> 	/* napi.weight is used in both the napi and non-napi cases */</div><div class='ctx'> 	lp-&gt;napi.weight = lp-&gt;rx_ring_size / 2;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;lp-&gt;napi, pcnet32_poll, lp-&gt;rx_ring_size / 2);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;lp-&gt;napi, pcnet32_poll,</div><div class='add'>+			      lp-&gt;rx_ring_size / 2);</div><div class='ctx'> </div><div class='ctx'> 	if (fdx &amp;&amp; !(lp-&gt;options &amp; PCNET32_PORT_ASEL) &amp;&amp;</div><div class='ctx'> 	    ((cards_found &gt;= MAX_UNITS) || full_duplex[cards_found]))</div><div class='hunk'>@@ -2003,8 +2005,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> err_free_ring:</div><div class='ctx'> 	pcnet32_free_ring(dev);</div><div class='del'>-	pci_free_consistent(lp-&gt;pci_dev, sizeof(*lp-&gt;init_block),</div><div class='del'>-			    lp-&gt;init_block, lp-&gt;init_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev, sizeof(*lp-&gt;init_block),</div><div class='add'>+			  lp-&gt;init_block, lp-&gt;init_dma_addr);</div><div class='ctx'> err_free_netdev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> err_release_region:</div><div class='hunk'>@@ -2017,21 +2019,19 @@ static int pcnet32_alloc_ring(struct net_device *dev, const char *name)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	lp-&gt;tx_ring = pci_alloc_consistent(lp-&gt;pci_dev,</div><div class='del'>-					   sizeof(struct pcnet32_tx_head) *</div><div class='del'>-					   lp-&gt;tx_ring_size,</div><div class='del'>-					   &amp;lp-&gt;tx_ring_dma_addr);</div><div class='del'>-	if (lp-&gt;tx_ring == NULL) {</div><div class='del'>-		netif_err(lp, drv, dev, "Consistent memory allocation failed\n");</div><div class='add'>+	lp-&gt;tx_ring = dma_alloc_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 sizeof(struct pcnet32_tx_head) * lp-&gt;tx_ring_size,</div><div class='add'>+					 &amp;lp-&gt;tx_ring_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!lp-&gt;tx_ring) {</div><div class='add'>+		netif_err(lp, drv, dev, "Coherent memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	lp-&gt;rx_ring = pci_alloc_consistent(lp-&gt;pci_dev,</div><div class='del'>-					   sizeof(struct pcnet32_rx_head) *</div><div class='del'>-					   lp-&gt;rx_ring_size,</div><div class='del'>-					   &amp;lp-&gt;rx_ring_dma_addr);</div><div class='del'>-	if (lp-&gt;rx_ring == NULL) {</div><div class='del'>-		netif_err(lp, drv, dev, "Consistent memory allocation failed\n");</div><div class='add'>+	lp-&gt;rx_ring = dma_alloc_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 sizeof(struct pcnet32_rx_head) * lp-&gt;rx_ring_size,</div><div class='add'>+					 &amp;lp-&gt;rx_ring_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!lp-&gt;rx_ring) {</div><div class='add'>+		netif_err(lp, drv, dev, "Coherent memory allocation failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2075,18 +2075,16 @@ static void pcnet32_free_ring(struct net_device *dev)</div><div class='ctx'> 	lp-&gt;rx_dma_addr = NULL;</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;tx_ring) {</div><div class='del'>-		pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-				    sizeof(struct pcnet32_tx_head) *</div><div class='del'>-				    lp-&gt;tx_ring_size, lp-&gt;tx_ring,</div><div class='del'>-				    lp-&gt;tx_ring_dma_addr);</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+				  sizeof(struct pcnet32_tx_head) * lp-&gt;tx_ring_size,</div><div class='add'>+				  lp-&gt;tx_ring, lp-&gt;tx_ring_dma_addr);</div><div class='ctx'> 		lp-&gt;tx_ring = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (lp-&gt;rx_ring) {</div><div class='del'>-		pci_free_consistent(lp-&gt;pci_dev,</div><div class='del'>-				    sizeof(struct pcnet32_rx_head) *</div><div class='del'>-				    lp-&gt;rx_ring_size, lp-&gt;rx_ring,</div><div class='del'>-				    lp-&gt;rx_ring_dma_addr);</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='add'>+				  sizeof(struct pcnet32_rx_head) * lp-&gt;rx_ring_size,</div><div class='add'>+				  lp-&gt;rx_ring, lp-&gt;rx_ring_dma_addr);</div><div class='ctx'> 		lp-&gt;rx_ring = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2107,6 +2105,7 @@ static int pcnet32_open(struct net_device *dev)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='ctx'> 	/* Check for a valid station address */</div><div class='ctx'> 	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='hunk'>@@ -2272,7 +2271,7 @@ static int pcnet32_open(struct net_device *dev)</div><div class='ctx'> 		goto err_free_ring;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	napi_enable(&amp;lp-&gt;napi);</div><div class='add'>+	napi_enable_locked(&amp;lp-&gt;napi);</div><div class='ctx'> </div><div class='ctx'> 	/* Re-initialize the PCNET32, and start it when done. */</div><div class='ctx'> 	lp-&gt;a-&gt;write_csr(ioaddr, 1, (lp-&gt;init_dma_addr &amp; 0xffff));</div><div class='hunk'>@@ -2306,6 +2305,7 @@ static int pcnet32_open(struct net_device *dev)</div><div class='ctx'> 		     lp-&gt;a-&gt;read_csr(ioaddr, CSR0));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;		/* Always succeed */</div><div class='ctx'> </div><div class='hunk'>@@ -2321,6 +2321,7 @@ err_free_ring:</div><div class='ctx'> </div><div class='ctx'> err_free_irq:</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> 	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2347,12 +2348,11 @@ static void pcnet32_purge_tx_ring(struct net_device *dev)</div><div class='ctx'> 		lp-&gt;tx_ring[i].status = 0;	/* CPU owns buffer */</div><div class='ctx'> 		wmb();		/* Make sure adapter sees owner change */</div><div class='ctx'> 		if (lp-&gt;tx_skbuff[i]) {</div><div class='del'>-			if (!pci_dma_mapping_error(lp-&gt;pci_dev,</div><div class='del'>-						   lp-&gt;tx_dma_addr[i]))</div><div class='del'>-				pci_unmap_single(lp-&gt;pci_dev,</div><div class='add'>+			if (!dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;tx_dma_addr[i]))</div><div class='add'>+				dma_unmap_single(&amp;lp-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 lp-&gt;tx_dma_addr[i],</div><div class='ctx'> 						 lp-&gt;tx_skbuff[i]-&gt;len,</div><div class='del'>-						 PCI_DMA_TODEVICE);</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(lp-&gt;tx_skbuff[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 		lp-&gt;tx_skbuff[i] = NULL;</div><div class='hunk'>@@ -2372,7 +2372,7 @@ static int pcnet32_init_ring(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; lp-&gt;rx_ring_size; i++) {</div><div class='ctx'> 		struct sk_buff *rx_skbuff = lp-&gt;rx_skbuff[i];</div><div class='del'>-		if (rx_skbuff == NULL) {</div><div class='add'>+		if (!rx_skbuff) {</div><div class='ctx'> 			lp-&gt;rx_skbuff[i] = netdev_alloc_skb(dev, PKT_BUF_SKB);</div><div class='ctx'> 			rx_skbuff = lp-&gt;rx_skbuff[i];</div><div class='ctx'> 			if (!rx_skbuff) {</div><div class='hunk'>@@ -2387,10 +2387,9 @@ static int pcnet32_init_ring(struct net_device *dev)</div><div class='ctx'> 		rmb();</div><div class='ctx'> 		if (lp-&gt;rx_dma_addr[i] == 0) {</div><div class='ctx'> 			lp-&gt;rx_dma_addr[i] =</div><div class='del'>-			    pci_map_single(lp-&gt;pci_dev, rx_skbuff-&gt;data,</div><div class='del'>-					   PKT_BUF_SIZE, PCI_DMA_FROMDEVICE);</div><div class='del'>-			if (pci_dma_mapping_error(lp-&gt;pci_dev,</div><div class='del'>-						  lp-&gt;rx_dma_addr[i])) {</div><div class='add'>+			    dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev, rx_skbuff-&gt;data,</div><div class='add'>+					   PKT_BUF_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+			if (dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;rx_dma_addr[i])) {</div><div class='ctx'> 				/* there is not much we can do at this point */</div><div class='ctx'> 				netif_err(lp, drv, dev,</div><div class='ctx'> 					  "%s pci dma mapping error\n",</div><div class='hunk'>@@ -2455,7 +2454,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)</div><div class='ctx'> 	lp-&gt;a-&gt;write_csr(ioaddr, CSR0, csr0_bits);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void pcnet32_tx_timeout(struct net_device *dev)</div><div class='add'>+static void pcnet32_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> 	unsigned long ioaddr = dev-&gt;base_addr, flags;</div><div class='hunk'>@@ -2528,8 +2527,9 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	lp-&gt;tx_ring[entry].misc = 0x00000000;</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;tx_dma_addr[entry] =</div><div class='del'>-	    pci_map_single(lp-&gt;pci_dev, skb-&gt;data, skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='del'>-	if (pci_dma_mapping_error(lp-&gt;pci_dev, lp-&gt;tx_dma_addr[entry])) {</div><div class='add'>+	    dma_map_single(&amp;lp-&gt;pci_dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+			   DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;lp-&gt;pci_dev-&gt;dev, lp-&gt;tx_dma_addr[entry])) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 		goto drop_packet;</div><div class='hunk'>@@ -2630,7 +2630,7 @@ static int pcnet32_close(struct net_device *dev)</div><div class='ctx'> 	struct pcnet32_private *lp = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;lp-&gt;watchdog_timer);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;watchdog_timer);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	napi_disable(&amp;lp-&gt;napi);</div><div class='hunk'>@@ -2870,8 +2870,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)</div><div class='ctx'> 			netif_info(lp, link, dev, "link down\n");</div><div class='ctx'> 		}</div><div class='ctx'> 		if (lp-&gt;phycount &gt; 1) {</div><div class='del'>-			curr_link = pcnet32_check_otherphy(dev);</div><div class='del'>-			prev_link = 0;</div><div class='add'>+			pcnet32_check_otherphy(dev);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (verbose || !prev_link) {</div><div class='ctx'> 		netif_carrier_on(dev);</div><div class='hunk'>@@ -2906,7 +2905,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)</div><div class='ctx'> </div><div class='ctx'> static void pcnet32_watchdog(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct pcnet32_private *lp = from_timer(lp, t, watchdog_timer);</div><div class='add'>+	struct pcnet32_private *lp = timer_container_of(lp, t, watchdog_timer);</div><div class='ctx'> 	struct net_device *dev = lp-&gt;dev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2918,30 +2917,27 @@ static void pcnet32_watchdog(struct timer_list *t)</div><div class='ctx'> 	mod_timer(&amp;lp-&gt;watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused pcnet32_pm_suspend(struct device *device_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device_d);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='ctx'> 		pcnet32_close(dev);</div><div class='ctx'> 	}</div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pcnet32_pm_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused pcnet32_pm_resume(struct device *device_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device_d);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		pcnet32_open(dev);</div><div class='ctx'> 		netif_device_attach(dev);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2955,20 +2951,23 @@ static void pcnet32_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> 		pcnet32_free_ring(dev);</div><div class='ctx'> 		release_region(dev-&gt;base_addr, PCNET32_TOTAL_SIZE);</div><div class='del'>-		pci_free_consistent(lp-&gt;pci_dev, sizeof(*lp-&gt;init_block),</div><div class='del'>-				    lp-&gt;init_block, lp-&gt;init_dma_addr);</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev, sizeof(*lp-&gt;init_block),</div><div class='add'>+				  lp-&gt;init_block, lp-&gt;init_dma_addr);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(pcnet32_pm_ops, pcnet32_pm_suspend, pcnet32_pm_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver pcnet32_driver = {</div><div class='ctx'> 	.name = DRV_NAME,</div><div class='ctx'> 	.probe = pcnet32_probe_pci,</div><div class='ctx'> 	.remove = pcnet32_remove_one,</div><div class='ctx'> 	.id_table = pcnet32_pci_tbl,</div><div class='del'>-	.suspend = pcnet32_pm_suspend,</div><div class='del'>-	.resume = pcnet32_pm_resume,</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;pcnet32_pm_ops,</div><div class='add'>+	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* An additional parameter that may be passed in... */</div><div class='hunk'>@@ -3006,8 +3005,6 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> static int __init pcnet32_init_module(void)</div><div class='ctx'> {</div><div class='del'>-	pr_info("%s", version);</div><div class='del'>-</div><div class='ctx'> 	pcnet32_debug = netif_msg_init(debug, PCNET32_MSG_DEFAULT);</div><div class='ctx'> </div><div class='ctx'> 	if ((tx_start_pt &gt;= 0) &amp;&amp; (tx_start_pt &lt;= 3))</div><div class='hunk'>@@ -3037,8 +3034,8 @@ static void __exit pcnet32_cleanup_module(void)</div><div class='ctx'> 		unregister_netdev(pcnet32_dev);</div><div class='ctx'> 		pcnet32_free_ring(pcnet32_dev);</div><div class='ctx'> 		release_region(pcnet32_dev-&gt;base_addr, PCNET32_TOTAL_SIZE);</div><div class='del'>-		pci_free_consistent(lp-&gt;pci_dev, sizeof(*lp-&gt;init_block),</div><div class='del'>-				    lp-&gt;init_block, lp-&gt;init_dma_addr);</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pci_dev-&gt;dev, sizeof(*lp-&gt;init_block),</div><div class='add'>+				  lp-&gt;init_block, lp-&gt;init_dma_addr);</div><div class='ctx'> 		free_netdev(pcnet32_dev);</div><div class='ctx'> 		pcnet32_dev = next_dev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3049,10 +3046,3 @@ static void __exit pcnet32_cleanup_module(void)</div><div class='ctx'> </div><div class='ctx'> module_init(pcnet32_init_module);</div><div class='ctx'> module_exit(pcnet32_cleanup_module);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local variables:</div><div class='del'>- *  c-indent-level: 4</div><div class='del'>- *  tab-width: 8</div><div class='del'>- * End:</div><div class='del'>- */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/Makefile b/drivers/net/ethernet/amd/pds_core/Makefile<br/>new file mode 100644<br/>index 000000000000..8239742e681f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+# Copyright (c) 2023 Advanced Micro Devices, Inc.</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_PDS_CORE) := pds_core.o</div><div class='add'>+</div><div class='add'>+pds_core-y := main.o \</div><div class='add'>+	      devlink.o \</div><div class='add'>+	      auxbus.o \</div><div class='add'>+	      dev.o \</div><div class='add'>+	      adminq.o \</div><div class='add'>+	      core.o \</div><div class='add'>+	      debugfs.o \</div><div class='add'>+	      fw.o</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/adminq.c b/drivers/net/ethernet/amd/pds_core/adminq.c<br/>new file mode 100644<br/>index 000000000000..097bb092bdb8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/adminq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/adminq.c</a></div><div class='hunk'>@@ -0,0 +1,310 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dynamic_debug.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+static int pdsc_process_notifyq(struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	union pds_core_notifyq_comp *comp;</div><div class='add'>+	struct pdsc *pdsc = qcq-&gt;pdsc;</div><div class='add'>+	struct pdsc_cq *cq = &amp;qcq-&gt;cq;</div><div class='add'>+	struct pdsc_cq_info *cq_info;</div><div class='add'>+	int nq_work = 0;</div><div class='add'>+	u64 eid;</div><div class='add'>+</div><div class='add'>+	cq_info = &amp;cq-&gt;info[cq-&gt;tail_idx];</div><div class='add'>+	comp = cq_info-&gt;comp;</div><div class='add'>+	eid = le64_to_cpu(comp-&gt;event.eid);</div><div class='add'>+	while (eid &gt; pdsc-&gt;last_eid) {</div><div class='add'>+		u16 ecode = le16_to_cpu(comp-&gt;event.ecode);</div><div class='add'>+</div><div class='add'>+		switch (ecode) {</div><div class='add'>+		case PDS_EVENT_LINK_CHANGE:</div><div class='add'>+			dev_info(pdsc-&gt;dev, "NotifyQ LINK_CHANGE ecode %d eid %lld\n",</div><div class='add'>+				 ecode, eid);</div><div class='add'>+			pdsc_notify(PDS_EVENT_LINK_CHANGE, comp);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case PDS_EVENT_RESET:</div><div class='add'>+			dev_info(pdsc-&gt;dev, "NotifyQ RESET ecode %d eid %lld\n",</div><div class='add'>+				 ecode, eid);</div><div class='add'>+			pdsc_notify(PDS_EVENT_RESET, comp);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		case PDS_EVENT_XCVR:</div><div class='add'>+			dev_info(pdsc-&gt;dev, "NotifyQ XCVR ecode %d eid %lld\n",</div><div class='add'>+				 ecode, eid);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			dev_info(pdsc-&gt;dev, "NotifyQ ecode %d eid %lld\n",</div><div class='add'>+				 ecode, eid);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		pdsc-&gt;last_eid = eid;</div><div class='add'>+		cq-&gt;tail_idx = (cq-&gt;tail_idx + 1) &amp; (cq-&gt;num_descs - 1);</div><div class='add'>+		cq_info = &amp;cq-&gt;info[cq-&gt;tail_idx];</div><div class='add'>+		comp = cq_info-&gt;comp;</div><div class='add'>+		eid = le64_to_cpu(comp-&gt;event.eid);</div><div class='add'>+</div><div class='add'>+		nq_work++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcq-&gt;accum_work += nq_work;</div><div class='add'>+</div><div class='add'>+	return nq_work;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool pdsc_adminq_inc_if_up(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	if (pdsc-&gt;state &amp; BIT_ULL(PDSC_S_STOPPING_DRIVER) ||</div><div class='add'>+	    pdsc-&gt;state &amp; BIT_ULL(PDSC_S_FW_DEAD))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return refcount_inc_not_zero(&amp;pdsc-&gt;adminq_refcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_process_adminq(struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	union pds_core_adminq_comp *comp;</div><div class='add'>+	struct pdsc_queue *q = &amp;qcq-&gt;q;</div><div class='add'>+	struct pdsc *pdsc = qcq-&gt;pdsc;</div><div class='add'>+	struct pdsc_cq *cq = &amp;qcq-&gt;cq;</div><div class='add'>+	struct pdsc_q_info *q_info;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	int nq_work = 0;</div><div class='add'>+	int aq_work = 0;</div><div class='add'>+</div><div class='add'>+	/* Don't process AdminQ when it's not up */</div><div class='add'>+	if (!pdsc_adminq_inc_if_up(pdsc)) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "%s: called while adminq is unavailable\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check for NotifyQ event */</div><div class='add'>+	nq_work = pdsc_process_notifyq(&amp;pdsc-&gt;notifyqcq);</div><div class='add'>+</div><div class='add'>+	/* Check for empty queue, which can happen if the interrupt was</div><div class='add'>+	 * for a NotifyQ event and there are no new AdminQ completions.</div><div class='add'>+	 */</div><div class='add'>+	if (q-&gt;tail_idx == q-&gt;head_idx)</div><div class='add'>+		goto credits;</div><div class='add'>+</div><div class='add'>+	/* Find the first completion to clean,</div><div class='add'>+	 * run the callback in the related q_info,</div><div class='add'>+	 * and continue while we still match done color</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;pdsc-&gt;adminq_lock, irqflags);</div><div class='add'>+	comp = cq-&gt;info[cq-&gt;tail_idx].comp;</div><div class='add'>+	while (pdsc_color_match(comp-&gt;color, cq-&gt;done_color)) {</div><div class='add'>+		q_info = &amp;q-&gt;info[q-&gt;tail_idx];</div><div class='add'>+		q-&gt;tail_idx = (q-&gt;tail_idx + 1) &amp; (q-&gt;num_descs - 1);</div><div class='add'>+</div><div class='add'>+		if (!completion_done(&amp;q_info-&gt;completion)) {</div><div class='add'>+			memcpy(q_info-&gt;dest, comp, sizeof(*comp));</div><div class='add'>+			complete(&amp;q_info-&gt;completion);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cq-&gt;tail_idx == cq-&gt;num_descs - 1)</div><div class='add'>+			cq-&gt;done_color = !cq-&gt;done_color;</div><div class='add'>+		cq-&gt;tail_idx = (cq-&gt;tail_idx + 1) &amp; (cq-&gt;num_descs - 1);</div><div class='add'>+		comp = cq-&gt;info[cq-&gt;tail_idx].comp;</div><div class='add'>+</div><div class='add'>+		aq_work++;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdsc-&gt;adminq_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	qcq-&gt;accum_work += aq_work;</div><div class='add'>+</div><div class='add'>+credits:</div><div class='add'>+	/* Return the interrupt credits, one for each completion */</div><div class='add'>+	pds_core_intr_credits(&amp;pdsc-&gt;intr_ctrl[qcq-&gt;intx],</div><div class='add'>+			      nq_work + aq_work,</div><div class='add'>+			      PDS_CORE_INTR_CRED_REARM);</div><div class='add'>+	refcount_dec(&amp;pdsc-&gt;adminq_refcnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_work_thread(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_qcq *qcq = container_of(work, struct pdsc_qcq, work);</div><div class='add'>+</div><div class='add'>+	pdsc_process_adminq(qcq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+irqreturn_t pdsc_adminq_isr(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = data;</div><div class='add'>+	struct pdsc_qcq *qcq;</div><div class='add'>+</div><div class='add'>+	/* Don't process AdminQ when it's not up */</div><div class='add'>+	if (!pdsc_adminq_inc_if_up(pdsc)) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "%s: called while adminq is unavailable\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcq = &amp;pdsc-&gt;adminqcq;</div><div class='add'>+	queue_work(pdsc-&gt;wq, &amp;qcq-&gt;work);</div><div class='add'>+	refcount_dec(&amp;pdsc-&gt;adminq_refcnt);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __pdsc_adminq_post(struct pdsc *pdsc,</div><div class='add'>+			      struct pdsc_qcq *qcq,</div><div class='add'>+			      union pds_core_adminq_cmd *cmd,</div><div class='add'>+			      union pds_core_adminq_comp *comp)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_queue *q = &amp;qcq-&gt;q;</div><div class='add'>+	struct pdsc_q_info *q_info;</div><div class='add'>+	unsigned long irqflags;</div><div class='add'>+	unsigned int avail;</div><div class='add'>+	int index;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdsc-&gt;adminq_lock, irqflags);</div><div class='add'>+</div><div class='add'>+	/* Check for space in the queue */</div><div class='add'>+	avail = q-&gt;tail_idx;</div><div class='add'>+	if (q-&gt;head_idx &gt;= avail)</div><div class='add'>+		avail += q-&gt;num_descs - q-&gt;head_idx - 1;</div><div class='add'>+	else</div><div class='add'>+		avail -= q-&gt;head_idx + 1;</div><div class='add'>+	if (!avail) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto err_out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check that the FW is running */</div><div class='add'>+	if (!pdsc_is_fw_running(pdsc)) {</div><div class='add'>+		if (pdsc-&gt;info_regs) {</div><div class='add'>+			u8 fw_status =</div><div class='add'>+				ioread8(&amp;pdsc-&gt;info_regs-&gt;fw_status);</div><div class='add'>+</div><div class='add'>+			dev_info(pdsc-&gt;dev, "%s: post failed - fw not running %#02x:\n",</div><div class='add'>+				 __func__, fw_status);</div><div class='add'>+		} else {</div><div class='add'>+			dev_info(pdsc-&gt;dev, "%s: post failed - BARs not setup\n",</div><div class='add'>+				 __func__);</div><div class='add'>+		}</div><div class='add'>+		ret = -ENXIO;</div><div class='add'>+</div><div class='add'>+		goto err_out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Post the request */</div><div class='add'>+	index = q-&gt;head_idx;</div><div class='add'>+	q_info = &amp;q-&gt;info[index];</div><div class='add'>+	q_info-&gt;dest = comp;</div><div class='add'>+	memcpy(q_info-&gt;desc, cmd, sizeof(*cmd));</div><div class='add'>+	reinit_completion(&amp;q_info-&gt;completion);</div><div class='add'>+</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "head_idx %d tail_idx %d\n",</div><div class='add'>+		q-&gt;head_idx, q-&gt;tail_idx);</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "post admin queue command:\n");</div><div class='add'>+	dynamic_hex_dump("cmd ", DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			 cmd, sizeof(*cmd), true);</div><div class='add'>+</div><div class='add'>+	q-&gt;head_idx = (q-&gt;head_idx + 1) &amp; (q-&gt;num_descs - 1);</div><div class='add'>+</div><div class='add'>+	pds_core_dbell_ring(pdsc-&gt;kern_dbpage,</div><div class='add'>+			    q-&gt;hw_type, q-&gt;dbval | q-&gt;head_idx);</div><div class='add'>+	ret = index;</div><div class='add'>+</div><div class='add'>+err_out_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdsc-&gt;adminq_lock, irqflags);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_adminq_post(struct pdsc *pdsc,</div><div class='add'>+		     union pds_core_adminq_cmd *cmd,</div><div class='add'>+		     union pds_core_adminq_comp *comp,</div><div class='add'>+		     bool fast_poll)</div><div class='add'>+{</div><div class='add'>+	unsigned long poll_interval = 200;</div><div class='add'>+	unsigned long poll_jiffies;</div><div class='add'>+	unsigned long time_limit;</div><div class='add'>+	unsigned long time_start;</div><div class='add'>+	unsigned long time_done;</div><div class='add'>+	unsigned long remaining;</div><div class='add'>+	struct completion *wc;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (!pdsc_adminq_inc_if_up(pdsc)) {</div><div class='add'>+		dev_dbg(pdsc-&gt;dev, "%s: preventing adminq cmd %u\n",</div><div class='add'>+			__func__, cmd-&gt;opcode);</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	index = __pdsc_adminq_post(pdsc, &amp;pdsc-&gt;adminqcq, cmd, comp);</div><div class='add'>+	if (index &lt; 0) {</div><div class='add'>+		err = index;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wc = &amp;pdsc-&gt;adminqcq.q.info[index].completion;</div><div class='add'>+	time_start = jiffies;</div><div class='add'>+	time_limit = time_start + HZ * pdsc-&gt;devcmd_timeout;</div><div class='add'>+	do {</div><div class='add'>+		/* Timeslice the actual wait to catch IO errors etc early */</div><div class='add'>+		poll_jiffies = usecs_to_jiffies(poll_interval);</div><div class='add'>+		remaining = wait_for_completion_timeout(wc, poll_jiffies);</div><div class='add'>+		if (remaining)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (!pdsc_is_fw_running(pdsc)) {</div><div class='add'>+			if (pdsc-&gt;info_regs) {</div><div class='add'>+				u8 fw_status =</div><div class='add'>+					ioread8(&amp;pdsc-&gt;info_regs-&gt;fw_status);</div><div class='add'>+</div><div class='add'>+				dev_dbg(pdsc-&gt;dev, "%s: post wait failed - fw not running %#02x:\n",</div><div class='add'>+					__func__, fw_status);</div><div class='add'>+			} else {</div><div class='add'>+				dev_dbg(pdsc-&gt;dev, "%s: post wait failed - BARs not setup\n",</div><div class='add'>+					__func__);</div><div class='add'>+			}</div><div class='add'>+			err = -ENXIO;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* When fast_poll is not requested, prevent aggressive polling</div><div class='add'>+		 * on failures due to timeouts by doing exponential back off.</div><div class='add'>+		 */</div><div class='add'>+		if (!fast_poll &amp;&amp; poll_interval &lt; PDSC_ADMINQ_MAX_POLL_INTERVAL)</div><div class='add'>+			poll_interval &lt;&lt;= 1;</div><div class='add'>+	} while (time_before(jiffies, time_limit));</div><div class='add'>+	time_done = jiffies;</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "%s: elapsed %d msecs\n",</div><div class='add'>+		__func__, jiffies_to_msecs(time_done - time_start));</div><div class='add'>+</div><div class='add'>+	/* Check the results and clear an un-completed timeout */</div><div class='add'>+	if (time_after_eq(time_done, time_limit) &amp;&amp; !completion_done(wc)) {</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+		complete(wc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "read admin queue completion idx %d:\n", index);</div><div class='add'>+	dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			 comp, sizeof(*comp), true);</div><div class='add'>+</div><div class='add'>+	if (remaining &amp;&amp; comp-&gt;status)</div><div class='add'>+		err = pdsc_err_to_errno(comp-&gt;status);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_dbg(pdsc-&gt;dev, "%s: opcode %d status %d err %pe\n",</div><div class='add'>+			__func__, cmd-&gt;opcode, comp-&gt;status, ERR_PTR(err));</div><div class='add'>+		if (err == -ENXIO || err == -ETIMEDOUT)</div><div class='add'>+			queue_work(pdsc-&gt;wq, &amp;pdsc-&gt;health_work);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refcount_dec(&amp;pdsc-&gt;adminq_refcnt);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pdsc_adminq_post);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/auxbus.c b/drivers/net/ethernet/amd/pds_core/auxbus.c<br/>new file mode 100644<br/>index 000000000000..92f359f2b449<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/auxbus.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/auxbus.c</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include &lt;linux/pds/pds_auxbus.h&gt;</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pds_client_register - Link the client to the firmware</div><div class='add'>+ * @pf:		ptr to the PF driver's private data struct</div><div class='add'>+ * @devname:	name that includes service into, e.g. pds_core.vDPA</div><div class='add'>+ *</div><div class='add'>+ * Return: positive client ID (ci) on success, or</div><div class='add'>+ *         negative for error</div><div class='add'>+ */</div><div class='add'>+int pds_client_register(struct pdsc *pf, char *devname)</div><div class='add'>+{</div><div class='add'>+	union pds_core_adminq_comp comp = {};</div><div class='add'>+	union pds_core_adminq_cmd cmd = {};</div><div class='add'>+	int err;</div><div class='add'>+	u16 ci;</div><div class='add'>+</div><div class='add'>+	cmd.client_reg.opcode = PDS_AQ_CMD_CLIENT_REG;</div><div class='add'>+	strscpy(cmd.client_reg.devname, devname,</div><div class='add'>+		sizeof(cmd.client_reg.devname));</div><div class='add'>+</div><div class='add'>+	err = pdsc_adminq_post(pf, &amp;cmd, &amp;comp, false);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_info(pf-&gt;dev, "register dev_name %s with DSC failed, status %d: %pe\n",</div><div class='add'>+			 devname, comp.status, ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ci = le16_to_cpu(comp.client_reg.client_id);</div><div class='add'>+	if (!ci) {</div><div class='add'>+		dev_err(pf-&gt;dev, "%s: device returned null client_id\n",</div><div class='add'>+			__func__);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_dbg(pf-&gt;dev, "%s: device returned client_id %d for %s\n",</div><div class='add'>+		__func__, ci, devname);</div><div class='add'>+</div><div class='add'>+	return ci;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pds_client_register);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pds_client_unregister - Unlink the client from the firmware</div><div class='add'>+ * @pf:		ptr to the PF driver's private data struct</div><div class='add'>+ * @client_id:	id returned from pds_client_register()</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or</div><div class='add'>+ *         negative for error</div><div class='add'>+ */</div><div class='add'>+int pds_client_unregister(struct pdsc *pf, u16 client_id)</div><div class='add'>+{</div><div class='add'>+	union pds_core_adminq_comp comp = {};</div><div class='add'>+	union pds_core_adminq_cmd cmd = {};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd.client_unreg.opcode = PDS_AQ_CMD_CLIENT_UNREG;</div><div class='add'>+	cmd.client_unreg.client_id = cpu_to_le16(client_id);</div><div class='add'>+</div><div class='add'>+	err = pdsc_adminq_post(pf, &amp;cmd, &amp;comp, false);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_info(pf-&gt;dev, "unregister client_id %d failed, status %d: %pe\n",</div><div class='add'>+			 client_id, comp.status, ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pds_client_unregister);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * pds_client_adminq_cmd - Process an adminq request for the client</div><div class='add'>+ * @padev:   ptr to the client device</div><div class='add'>+ * @req:     ptr to buffer with request</div><div class='add'>+ * @req_len: length of actual struct used for request</div><div class='add'>+ * @resp:    ptr to buffer where answer is to be copied</div><div class='add'>+ * @flags:   optional flags from pds_core_adminq_flags</div><div class='add'>+ *</div><div class='add'>+ * Return: 0 on success, or</div><div class='add'>+ *         negative for error</div><div class='add'>+ *</div><div class='add'>+ * Client sends pointers to request and response buffers</div><div class='add'>+ * Core copies request data into pds_core_client_request_cmd</div><div class='add'>+ * Core sets other fields as needed</div><div class='add'>+ * Core posts to AdminQ</div><div class='add'>+ * Core copies completion data into response buffer</div><div class='add'>+ */</div><div class='add'>+int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev,</div><div class='add'>+			  union pds_core_adminq_cmd *req,</div><div class='add'>+			  size_t req_len,</div><div class='add'>+			  union pds_core_adminq_comp *resp,</div><div class='add'>+			  u64 flags)</div><div class='add'>+{</div><div class='add'>+	union pds_core_adminq_cmd cmd = {};</div><div class='add'>+	struct pci_dev *pf_pdev;</div><div class='add'>+	struct pdsc *pf;</div><div class='add'>+	size_t cp_len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pf_pdev = pci_physfn(padev-&gt;vf_pdev);</div><div class='add'>+	pf = pci_get_drvdata(pf_pdev);</div><div class='add'>+</div><div class='add'>+	dev_dbg(pf-&gt;dev, "%s: %s opcode %d\n",</div><div class='add'>+		__func__, dev_name(&amp;padev-&gt;aux_dev.dev), req-&gt;opcode);</div><div class='add'>+</div><div class='add'>+	/* Wrap the client's request */</div><div class='add'>+	cmd.client_request.opcode = PDS_AQ_CMD_CLIENT_CMD;</div><div class='add'>+	cmd.client_request.client_id = cpu_to_le16(padev-&gt;client_id);</div><div class='add'>+	cp_len = min_t(size_t, req_len, sizeof(cmd.client_request.client_cmd));</div><div class='add'>+	memcpy(cmd.client_request.client_cmd, req, cp_len);</div><div class='add'>+</div><div class='add'>+	err = pdsc_adminq_post(pf, &amp;cmd, resp,</div><div class='add'>+			       !!(flags &amp; PDS_AQ_FLAG_FASTPOLL));</div><div class='add'>+	if (err &amp;&amp; err != -EAGAIN)</div><div class='add'>+		dev_info(pf-&gt;dev, "client admin cmd failed: %pe\n",</div><div class='add'>+			 ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pds_client_adminq_cmd);</div><div class='add'>+</div><div class='add'>+static void pdsc_auxbus_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct pds_auxiliary_dev *padev =</div><div class='add'>+		container_of(dev, struct pds_auxiliary_dev, aux_dev.dev);</div><div class='add'>+</div><div class='add'>+	kfree(padev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *cf,</div><div class='add'>+							  struct pdsc *pf,</div><div class='add'>+							  u16 client_id,</div><div class='add'>+							  char *name)</div><div class='add'>+{</div><div class='add'>+	struct auxiliary_device *aux_dev;</div><div class='add'>+	struct pds_auxiliary_dev *padev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	padev = kzalloc(sizeof(*padev), GFP_KERNEL);</div><div class='add'>+	if (!padev)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	padev-&gt;vf_pdev = cf-&gt;pdev;</div><div class='add'>+	padev-&gt;client_id = client_id;</div><div class='add'>+</div><div class='add'>+	aux_dev = &amp;padev-&gt;aux_dev;</div><div class='add'>+	aux_dev-&gt;name = name;</div><div class='add'>+	aux_dev-&gt;id = cf-&gt;uid;</div><div class='add'>+	aux_dev-&gt;dev.parent = cf-&gt;dev;</div><div class='add'>+	aux_dev-&gt;dev.release = pdsc_auxbus_dev_release;</div><div class='add'>+</div><div class='add'>+	err = auxiliary_device_init(aux_dev);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_warn(cf-&gt;dev, "auxiliary_device_init of %s failed: %pe\n",</div><div class='add'>+			 name, ERR_PTR(err));</div><div class='add'>+		kfree(padev);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = auxiliary_device_add(aux_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_warn(cf-&gt;dev, "auxiliary_device_add of %s failed: %pe\n",</div><div class='add'>+			 name, ERR_PTR(err));</div><div class='add'>+		auxiliary_device_uninit(aux_dev);</div><div class='add'>+		return ERR_PTR(err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return padev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf,</div><div class='add'>+			 struct pds_auxiliary_dev **pd_ptr)</div><div class='add'>+{</div><div class='add'>+	struct pds_auxiliary_dev *padev;</div><div class='add'>+</div><div class='add'>+	if (!*pd_ptr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pf-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	padev = *pd_ptr;</div><div class='add'>+	pds_client_unregister(pf, padev-&gt;client_id);</div><div class='add'>+	auxiliary_device_delete(&amp;padev-&gt;aux_dev);</div><div class='add'>+	auxiliary_device_uninit(&amp;padev-&gt;aux_dev);</div><div class='add'>+	*pd_ptr = NULL;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;pf-&gt;config_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf,</div><div class='add'>+			enum pds_core_vif_types vt,</div><div class='add'>+			struct pds_auxiliary_dev **pd_ptr)</div><div class='add'>+{</div><div class='add'>+	struct pds_auxiliary_dev *padev;</div><div class='add'>+	char devname[PDS_DEVNAME_LEN];</div><div class='add'>+	unsigned long mask;</div><div class='add'>+	u16 vt_support;</div><div class='add'>+	int client_id;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!cf)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (vt &gt;= PDS_DEV_TYPE_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pf-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	mask = BIT_ULL(PDSC_S_FW_DEAD) |</div><div class='add'>+	       BIT_ULL(PDSC_S_STOPPING_DRIVER);</div><div class='add'>+	if (cf-&gt;state &amp; mask) {</div><div class='add'>+		dev_err(pf-&gt;dev, "%s: can't add dev, VF client in bad state %#lx\n",</div><div class='add'>+			__func__, cf-&gt;state);</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Verify that the type is supported and enabled.  It is not</div><div class='add'>+	 * an error if the firmware doesn't support the feature, the</div><div class='add'>+	 * driver just won't set up an auxiliary_device for it.</div><div class='add'>+	 */</div><div class='add'>+	vt_support = !!le16_to_cpu(pf-&gt;dev_ident.vif_types[vt]);</div><div class='add'>+	if (!(vt_support &amp;&amp;</div><div class='add'>+	      pf-&gt;viftype_status[vt].supported &amp;&amp;</div><div class='add'>+	      pf-&gt;viftype_status[vt].enabled))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* Need to register with FW and get the client_id before</div><div class='add'>+	 * creating the aux device so that the aux client can run</div><div class='add'>+	 * adminq commands as part its probe</div><div class='add'>+	 */</div><div class='add'>+	snprintf(devname, sizeof(devname), "%s.%s.%d",</div><div class='add'>+		 PDS_CORE_DRV_NAME, pf-&gt;viftype_status[vt].name, cf-&gt;uid);</div><div class='add'>+	client_id = pds_client_register(pf, devname);</div><div class='add'>+	if (client_id &lt; 0) {</div><div class='add'>+		err = client_id;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	padev = pdsc_auxbus_dev_register(cf, pf, client_id,</div><div class='add'>+					 pf-&gt;viftype_status[vt].name);</div><div class='add'>+	if (IS_ERR(padev)) {</div><div class='add'>+		pds_client_unregister(pf, client_id);</div><div class='add'>+		err = PTR_ERR(padev);</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+	*pd_ptr = padev;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;pf-&gt;config_lock);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c<br/>new file mode 100644<br/>index 000000000000..076dfe2910c7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/core.c</a></div><div class='hunk'>@@ -0,0 +1,661 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+static BLOCKING_NOTIFIER_HEAD(pds_notify_chain);</div><div class='add'>+</div><div class='add'>+int pdsc_register_notify(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	return blocking_notifier_chain_register(&amp;pds_notify_chain, nb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pdsc_register_notify);</div><div class='add'>+</div><div class='add'>+void pdsc_unregister_notify(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	blocking_notifier_chain_unregister(&amp;pds_notify_chain, nb);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pdsc_unregister_notify);</div><div class='add'>+</div><div class='add'>+void pdsc_notify(unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	blocking_notifier_call_chain(&amp;pds_notify_chain, event, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_intr_free(struct pdsc *pdsc, int index)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_intr_info *intr_info;</div><div class='add'>+</div><div class='add'>+	if (index &gt;= pdsc-&gt;nintrs || index &lt; 0) {</div><div class='add'>+		WARN(true, "bad intr index %d\n", index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	intr_info = &amp;pdsc-&gt;intr_info[index];</div><div class='add'>+	if (!intr_info-&gt;vector)</div><div class='add'>+		return;</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "%s: idx %d vec %d name %s\n",</div><div class='add'>+		__func__, index, intr_info-&gt;vector, intr_info-&gt;name);</div><div class='add'>+</div><div class='add'>+	pds_core_intr_mask(&amp;pdsc-&gt;intr_ctrl[index], PDS_CORE_INTR_MASK_SET);</div><div class='add'>+	pds_core_intr_clean(&amp;pdsc-&gt;intr_ctrl[index]);</div><div class='add'>+</div><div class='add'>+	free_irq(intr_info-&gt;vector, intr_info-&gt;data);</div><div class='add'>+</div><div class='add'>+	memset(intr_info, 0, sizeof(*intr_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_intr_alloc(struct pdsc *pdsc, char *name,</div><div class='add'>+		    irq_handler_t handler, void *data)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_intr_info *intr_info;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Find the first available interrupt */</div><div class='add'>+	for (index = 0; index &lt; pdsc-&gt;nintrs; index++)</div><div class='add'>+		if (!pdsc-&gt;intr_info[index].vector)</div><div class='add'>+			break;</div><div class='add'>+	if (index &gt;= pdsc-&gt;nintrs) {</div><div class='add'>+		dev_warn(pdsc-&gt;dev, "%s: no intr, index=%d nintrs=%d\n",</div><div class='add'>+			 __func__, index, pdsc-&gt;nintrs);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pds_core_intr_clean_flags(&amp;pdsc-&gt;intr_ctrl[index],</div><div class='add'>+				  PDS_CORE_INTR_CRED_RESET_COALESCE);</div><div class='add'>+</div><div class='add'>+	intr_info = &amp;pdsc-&gt;intr_info[index];</div><div class='add'>+</div><div class='add'>+	intr_info-&gt;index = index;</div><div class='add'>+	intr_info-&gt;data = data;</div><div class='add'>+	strscpy(intr_info-&gt;name, name, sizeof(intr_info-&gt;name));</div><div class='add'>+</div><div class='add'>+	/* Get the OS vector number for the interrupt */</div><div class='add'>+	err = pci_irq_vector(pdsc-&gt;pdev, index);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "failed to get intr vector index %d: %pe\n",</div><div class='add'>+			index, ERR_PTR(err));</div><div class='add'>+		goto err_out_free_intr;</div><div class='add'>+	}</div><div class='add'>+	intr_info-&gt;vector = err;</div><div class='add'>+</div><div class='add'>+	/* Init the device's intr mask */</div><div class='add'>+	pds_core_intr_clean(&amp;pdsc-&gt;intr_ctrl[index]);</div><div class='add'>+	pds_core_intr_mask_assert(&amp;pdsc-&gt;intr_ctrl[index], 1);</div><div class='add'>+	pds_core_intr_mask(&amp;pdsc-&gt;intr_ctrl[index], PDS_CORE_INTR_MASK_SET);</div><div class='add'>+</div><div class='add'>+	/* Register the isr with a name */</div><div class='add'>+	err = request_irq(intr_info-&gt;vector, handler, 0, intr_info-&gt;name, data);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "failed to get intr irq vector %d: %pe\n",</div><div class='add'>+			intr_info-&gt;vector, ERR_PTR(err));</div><div class='add'>+		goto err_out_free_intr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+</div><div class='add'>+err_out_free_intr:</div><div class='add'>+	pdsc_intr_free(pdsc, index);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_qcq_intr_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	if (!(qcq-&gt;flags &amp; PDS_CORE_QCQ_F_INTR) ||</div><div class='add'>+	    qcq-&gt;intx == PDS_CORE_INTR_INDEX_NOT_ASSIGNED)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pdsc_intr_free(pdsc, qcq-&gt;intx);</div><div class='add'>+	qcq-&gt;intx = PDS_CORE_INTR_INDEX_NOT_ASSIGNED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_qcq_intr_alloc(struct pdsc *pdsc, struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	char name[PDSC_INTR_NAME_MAX_SZ];</div><div class='add'>+	int index;</div><div class='add'>+</div><div class='add'>+	if (!(qcq-&gt;flags &amp; PDS_CORE_QCQ_F_INTR)) {</div><div class='add'>+		qcq-&gt;intx = PDS_CORE_INTR_INDEX_NOT_ASSIGNED;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(name, sizeof(name), "%s-%d-%s",</div><div class='add'>+		 PDS_CORE_DRV_NAME, pdsc-&gt;pdev-&gt;bus-&gt;number, qcq-&gt;q.name);</div><div class='add'>+	index = pdsc_intr_alloc(pdsc, name, pdsc_adminq_isr, pdsc);</div><div class='add'>+	if (index &lt; 0)</div><div class='add'>+		return index;</div><div class='add'>+	qcq-&gt;intx = index;</div><div class='add'>+	qcq-&gt;cq.bound_intr = &amp;pdsc-&gt;intr_info[index];</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_qcq_free(struct pdsc *pdsc, struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = pdsc-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (!(qcq &amp;&amp; qcq-&gt;pdsc))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pdsc_debugfs_del_qcq(qcq);</div><div class='add'>+</div><div class='add'>+	pdsc_qcq_intr_free(pdsc, qcq);</div><div class='add'>+</div><div class='add'>+	if (qcq-&gt;q_base)</div><div class='add'>+		dma_free_coherent(dev, qcq-&gt;q_size,</div><div class='add'>+				  qcq-&gt;q_base, qcq-&gt;q_base_pa);</div><div class='add'>+</div><div class='add'>+	if (qcq-&gt;cq_base)</div><div class='add'>+		dma_free_coherent(dev, qcq-&gt;cq_size,</div><div class='add'>+				  qcq-&gt;cq_base, qcq-&gt;cq_base_pa);</div><div class='add'>+</div><div class='add'>+	vfree(qcq-&gt;cq.info);</div><div class='add'>+	vfree(qcq-&gt;q.info);</div><div class='add'>+</div><div class='add'>+	memset(qcq, 0, sizeof(*qcq));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_q_info *cur;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	q-&gt;base = base;</div><div class='add'>+	q-&gt;base_pa = base_pa;</div><div class='add'>+</div><div class='add'>+	for (i = 0, cur = q-&gt;info; i &lt; q-&gt;num_descs; i++, cur++) {</div><div class='add'>+		cur-&gt;desc = base + (i * q-&gt;desc_size);</div><div class='add'>+		init_completion(&amp;cur-&gt;completion);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_cq_map(struct pdsc_cq *cq, void *base, dma_addr_t base_pa)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_cq_info *cur;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	cq-&gt;base = base;</div><div class='add'>+	cq-&gt;base_pa = base_pa;</div><div class='add'>+</div><div class='add'>+	for (i = 0, cur = cq-&gt;info; i &lt; cq-&gt;num_descs; i++, cur++)</div><div class='add'>+		cur-&gt;comp = base + (i * cq-&gt;desc_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index,</div><div class='add'>+		   const char *name, unsigned int flags, unsigned int num_descs,</div><div class='add'>+		   unsigned int desc_size, unsigned int cq_desc_size,</div><div class='add'>+		   unsigned int pid, struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = pdsc-&gt;dev;</div><div class='add'>+	void *q_base, *cq_base;</div><div class='add'>+	dma_addr_t cq_base_pa;</div><div class='add'>+	dma_addr_t q_base_pa;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	qcq-&gt;q.info = vcalloc(num_descs, sizeof(*qcq-&gt;q.info));</div><div class='add'>+	if (!qcq-&gt;q.info) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcq-&gt;pdsc = pdsc;</div><div class='add'>+	qcq-&gt;flags = flags;</div><div class='add'>+	INIT_WORK(&amp;qcq-&gt;work, pdsc_work_thread);</div><div class='add'>+</div><div class='add'>+	qcq-&gt;q.type = type;</div><div class='add'>+	qcq-&gt;q.index = index;</div><div class='add'>+	qcq-&gt;q.num_descs = num_descs;</div><div class='add'>+	qcq-&gt;q.desc_size = desc_size;</div><div class='add'>+	qcq-&gt;q.tail_idx = 0;</div><div class='add'>+	qcq-&gt;q.head_idx = 0;</div><div class='add'>+	qcq-&gt;q.pid = pid;</div><div class='add'>+	snprintf(qcq-&gt;q.name, sizeof(qcq-&gt;q.name), "%s%u", name, index);</div><div class='add'>+</div><div class='add'>+	err = pdsc_qcq_intr_alloc(pdsc, qcq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_free_q_info;</div><div class='add'>+</div><div class='add'>+	qcq-&gt;cq.info = vcalloc(num_descs, sizeof(*qcq-&gt;cq.info));</div><div class='add'>+	if (!qcq-&gt;cq.info) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qcq-&gt;cq.num_descs = num_descs;</div><div class='add'>+	qcq-&gt;cq.desc_size = cq_desc_size;</div><div class='add'>+	qcq-&gt;cq.tail_idx = 0;</div><div class='add'>+	qcq-&gt;cq.done_color = 1;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; PDS_CORE_QCQ_F_NOTIFYQ) {</div><div class='add'>+		/* q &amp; cq need to be contiguous in case of notifyq */</div><div class='add'>+		qcq-&gt;q_size = PDS_PAGE_SIZE +</div><div class='add'>+			      ALIGN(num_descs * desc_size, PDS_PAGE_SIZE) +</div><div class='add'>+			      ALIGN(num_descs * cq_desc_size, PDS_PAGE_SIZE);</div><div class='add'>+		qcq-&gt;q_base = dma_alloc_coherent(dev,</div><div class='add'>+						 qcq-&gt;q_size + qcq-&gt;cq_size,</div><div class='add'>+						 &amp;qcq-&gt;q_base_pa,</div><div class='add'>+						 GFP_KERNEL);</div><div class='add'>+		if (!qcq-&gt;q_base) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_out_free_cq_info;</div><div class='add'>+		}</div><div class='add'>+		q_base = PTR_ALIGN(qcq-&gt;q_base, PDS_PAGE_SIZE);</div><div class='add'>+		q_base_pa = ALIGN(qcq-&gt;q_base_pa, PDS_PAGE_SIZE);</div><div class='add'>+		pdsc_q_map(&amp;qcq-&gt;q, q_base, q_base_pa);</div><div class='add'>+</div><div class='add'>+		cq_base = PTR_ALIGN(q_base +</div><div class='add'>+				    ALIGN(num_descs * desc_size, PDS_PAGE_SIZE),</div><div class='add'>+				    PDS_PAGE_SIZE);</div><div class='add'>+		cq_base_pa = ALIGN(qcq-&gt;q_base_pa +</div><div class='add'>+				   ALIGN(num_descs * desc_size, PDS_PAGE_SIZE),</div><div class='add'>+				   PDS_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	} else {</div><div class='add'>+		/* q DMA descriptors */</div><div class='add'>+		qcq-&gt;q_size = PDS_PAGE_SIZE + (num_descs * desc_size);</div><div class='add'>+		qcq-&gt;q_base = dma_alloc_coherent(dev, qcq-&gt;q_size,</div><div class='add'>+						 &amp;qcq-&gt;q_base_pa,</div><div class='add'>+						 GFP_KERNEL);</div><div class='add'>+		if (!qcq-&gt;q_base) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_out_free_cq_info;</div><div class='add'>+		}</div><div class='add'>+		q_base = PTR_ALIGN(qcq-&gt;q_base, PDS_PAGE_SIZE);</div><div class='add'>+		q_base_pa = ALIGN(qcq-&gt;q_base_pa, PDS_PAGE_SIZE);</div><div class='add'>+		pdsc_q_map(&amp;qcq-&gt;q, q_base, q_base_pa);</div><div class='add'>+</div><div class='add'>+		/* cq DMA descriptors */</div><div class='add'>+		qcq-&gt;cq_size = PDS_PAGE_SIZE + (num_descs * cq_desc_size);</div><div class='add'>+		qcq-&gt;cq_base = dma_alloc_coherent(dev, qcq-&gt;cq_size,</div><div class='add'>+						  &amp;qcq-&gt;cq_base_pa,</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+		if (!qcq-&gt;cq_base) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_out_free_q;</div><div class='add'>+		}</div><div class='add'>+		cq_base = PTR_ALIGN(qcq-&gt;cq_base, PDS_PAGE_SIZE);</div><div class='add'>+		cq_base_pa = ALIGN(qcq-&gt;cq_base_pa, PDS_PAGE_SIZE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc_cq_map(&amp;qcq-&gt;cq, cq_base, cq_base_pa);</div><div class='add'>+	qcq-&gt;cq.bound_q = &amp;qcq-&gt;q;</div><div class='add'>+</div><div class='add'>+	pdsc_debugfs_add_qcq(pdsc, qcq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_free_q:</div><div class='add'>+	dma_free_coherent(dev, qcq-&gt;q_size, qcq-&gt;q_base, qcq-&gt;q_base_pa);</div><div class='add'>+err_out_free_cq_info:</div><div class='add'>+	vfree(qcq-&gt;cq.info);</div><div class='add'>+err_out_free_irq:</div><div class='add'>+	pdsc_qcq_intr_free(pdsc, qcq);</div><div class='add'>+err_out_free_q_info:</div><div class='add'>+	vfree(qcq-&gt;q.info);</div><div class='add'>+	memset(qcq, 0, sizeof(*qcq));</div><div class='add'>+err_out:</div><div class='add'>+	dev_err(dev, "qcq alloc of %s%d failed %d\n", name, index, err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_core_uninit(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	pdsc_qcq_free(pdsc, &amp;pdsc-&gt;notifyqcq);</div><div class='add'>+	pdsc_qcq_free(pdsc, &amp;pdsc-&gt;adminqcq);</div><div class='add'>+</div><div class='add'>+	if (pdsc-&gt;kern_dbpage) {</div><div class='add'>+		iounmap(pdsc-&gt;kern_dbpage);</div><div class='add'>+		pdsc-&gt;kern_dbpage = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_core_init(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_comp comp = {};</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.init.opcode = PDS_CORE_CMD_INIT,</div><div class='add'>+	};</div><div class='add'>+	struct pds_core_dev_init_data_out cido;</div><div class='add'>+	struct pds_core_dev_init_data_in cidi;</div><div class='add'>+	u32 dbid_count;</div><div class='add'>+	u32 dbpage_num;</div><div class='add'>+	int numdescs;</div><div class='add'>+	size_t sz;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	numdescs = PDSC_ADMINQ_MAX_LENGTH;</div><div class='add'>+	err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_ADMINQ, 0, "adminq",</div><div class='add'>+			     PDS_CORE_QCQ_F_CORE | PDS_CORE_QCQ_F_INTR,</div><div class='add'>+			     numdescs,</div><div class='add'>+			     sizeof(union pds_core_adminq_cmd),</div><div class='add'>+			     sizeof(union pds_core_adminq_comp),</div><div class='add'>+			     0, &amp;pdsc-&gt;adminqcq);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_NOTIFYQ, 0, "notifyq",</div><div class='add'>+			     PDS_CORE_QCQ_F_NOTIFYQ,</div><div class='add'>+			     PDSC_NOTIFYQ_LENGTH,</div><div class='add'>+			     sizeof(struct pds_core_notifyq_cmd),</div><div class='add'>+			     sizeof(union pds_core_notifyq_comp),</div><div class='add'>+			     0, &amp;pdsc-&gt;notifyqcq);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_uninit;</div><div class='add'>+</div><div class='add'>+	cidi.adminq_q_base = cpu_to_le64(pdsc-&gt;adminqcq.q_base_pa);</div><div class='add'>+	cidi.adminq_cq_base = cpu_to_le64(pdsc-&gt;adminqcq.cq_base_pa);</div><div class='add'>+	cidi.notifyq_cq_base = cpu_to_le64(pdsc-&gt;notifyqcq.cq.base_pa);</div><div class='add'>+	cidi.flags = cpu_to_le32(PDS_CORE_QINIT_F_IRQ | PDS_CORE_QINIT_F_ENA);</div><div class='add'>+	cidi.intr_index = cpu_to_le16(pdsc-&gt;adminqcq.intx);</div><div class='add'>+	cidi.adminq_ring_size = ilog2(pdsc-&gt;adminqcq.q.num_descs);</div><div class='add'>+	cidi.notifyq_ring_size = ilog2(pdsc-&gt;notifyqcq.q.num_descs);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	sz = min_t(size_t, sizeof(cidi), sizeof(pdsc-&gt;cmd_regs-&gt;data));</div><div class='add'>+	memcpy_toio(&amp;pdsc-&gt;cmd_regs-&gt;data, &amp;cidi, sz);</div><div class='add'>+</div><div class='add'>+	err = pdsc_devcmd_locked(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+	if (!err) {</div><div class='add'>+		sz = min_t(size_t, sizeof(cido), sizeof(pdsc-&gt;cmd_regs-&gt;data));</div><div class='add'>+		memcpy_fromio(&amp;cido, &amp;pdsc-&gt;cmd_regs-&gt;data, sz);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "Device init command failed: %pe\n",</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+		goto err_out_uninit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;hw_index = le32_to_cpu(cido.core_hw_index);</div><div class='add'>+</div><div class='add'>+	dbid_count = le32_to_cpu(pdsc-&gt;dev_ident.ndbpgs_per_lif);</div><div class='add'>+	dbpage_num = pdsc-&gt;hw_index * dbid_count;</div><div class='add'>+	pdsc-&gt;kern_dbpage = pdsc_map_dbpage(pdsc, dbpage_num);</div><div class='add'>+	if (!pdsc-&gt;kern_dbpage) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "Cannot map dbpage, aborting\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_out_uninit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;adminqcq.q.hw_type = cido.adminq_hw_type;</div><div class='add'>+	pdsc-&gt;adminqcq.q.hw_index = le32_to_cpu(cido.adminq_hw_index);</div><div class='add'>+	pdsc-&gt;adminqcq.q.dbval = PDS_CORE_DBELL_QID(pdsc-&gt;adminqcq.q.hw_index);</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;notifyqcq.q.hw_type = cido.notifyq_hw_type;</div><div class='add'>+	pdsc-&gt;notifyqcq.q.hw_index = le32_to_cpu(cido.notifyq_hw_index);</div><div class='add'>+	pdsc-&gt;notifyqcq.q.dbval = PDS_CORE_DBELL_QID(pdsc-&gt;notifyqcq.q.hw_index);</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;last_eid = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_uninit:</div><div class='add'>+	pdsc_core_uninit(pdsc);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pdsc_viftype pdsc_viftype_defaults[] = {</div><div class='add'>+	[PDS_DEV_TYPE_FWCTL] = { .name = PDS_DEV_TYPE_FWCTL_STR,</div><div class='add'>+				 .enabled = true,</div><div class='add'>+				 .vif_id = PDS_DEV_TYPE_FWCTL,</div><div class='add'>+				 .dl_id = -1 },</div><div class='add'>+	[PDS_DEV_TYPE_VDPA] = { .name = PDS_DEV_TYPE_VDPA_STR,</div><div class='add'>+				.vif_id = PDS_DEV_TYPE_VDPA,</div><div class='add'>+				.dl_id = DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET },</div><div class='add'>+	[PDS_DEV_TYPE_MAX] = {}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int pdsc_viftypes_init(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	enum pds_core_vif_types vt;</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;viftype_status = kcalloc(ARRAY_SIZE(pdsc_viftype_defaults),</div><div class='add'>+				       sizeof(*pdsc-&gt;viftype_status),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!pdsc-&gt;viftype_status)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (vt = 0; vt &lt; PDS_DEV_TYPE_MAX; vt++) {</div><div class='add'>+		bool vt_support;</div><div class='add'>+</div><div class='add'>+		if (!pdsc_viftype_defaults[vt].name)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Grab the defaults */</div><div class='add'>+		pdsc-&gt;viftype_status[vt] = pdsc_viftype_defaults[vt];</div><div class='add'>+</div><div class='add'>+		/* See what the Core device has for support */</div><div class='add'>+		vt_support = !!le16_to_cpu(pdsc-&gt;dev_ident.vif_types[vt]);</div><div class='add'>+</div><div class='add'>+		dev_dbg(pdsc-&gt;dev, "VIF %s is %ssupported\n",</div><div class='add'>+			pdsc-&gt;viftype_status[vt].name,</div><div class='add'>+			vt_support ? "" : "not ");</div><div class='add'>+</div><div class='add'>+		pdsc-&gt;viftype_status[vt].supported = vt_support;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_setup(struct pdsc *pdsc, bool init)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pdsc_dev_init(pdsc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Set up the Core with the AdminQ and NotifyQ info */</div><div class='add'>+	err = pdsc_core_init(pdsc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_teardown;</div><div class='add'>+</div><div class='add'>+	/* Set up the VIFs */</div><div class='add'>+	if (init) {</div><div class='add'>+		err = pdsc_viftypes_init(pdsc);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_out_teardown;</div><div class='add'>+</div><div class='add'>+		pdsc_debugfs_add_viftype(pdsc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	refcount_set(&amp;pdsc-&gt;adminq_refcnt, 1);</div><div class='add'>+	clear_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_teardown:</div><div class='add'>+	pdsc_teardown(pdsc, init);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_teardown(struct pdsc *pdsc, bool removing)</div><div class='add'>+{</div><div class='add'>+	if (!pdsc-&gt;pdev-&gt;is_virtfn)</div><div class='add'>+		pdsc_devcmd_reset(pdsc);</div><div class='add'>+	if (pdsc-&gt;adminqcq.work.func)</div><div class='add'>+		cancel_work_sync(&amp;pdsc-&gt;adminqcq.work);</div><div class='add'>+</div><div class='add'>+	pdsc_core_uninit(pdsc);</div><div class='add'>+</div><div class='add'>+	if (removing) {</div><div class='add'>+		kfree(pdsc-&gt;viftype_status);</div><div class='add'>+		pdsc-&gt;viftype_status = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc_dev_uninit(pdsc);</div><div class='add'>+</div><div class='add'>+	set_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_start(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	pds_core_intr_mask(&amp;pdsc-&gt;intr_ctrl[pdsc-&gt;adminqcq.intx],</div><div class='add'>+			   PDS_CORE_INTR_MASK_CLEAR);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_stop(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!pdsc-&gt;intr_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Mask interrupts that are in use */</div><div class='add'>+	for (i = 0; i &lt; pdsc-&gt;nintrs; i++)</div><div class='add'>+		if (pdsc-&gt;intr_info[i].vector)</div><div class='add'>+			pds_core_intr_mask(&amp;pdsc-&gt;intr_ctrl[i],</div><div class='add'>+					   PDS_CORE_INTR_MASK_SET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_adminq_wait_and_dec_once_unused(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	/* The driver initializes the adminq_refcnt to 1 when the adminq is</div><div class='add'>+	 * allocated and ready for use. Other users/requesters will increment</div><div class='add'>+	 * the refcnt while in use. If the refcnt is down to 1 then the adminq</div><div class='add'>+	 * is not in use and the refcnt can be cleared and adminq freed. Before</div><div class='add'>+	 * calling this function the driver will set PDSC_S_FW_DEAD, which</div><div class='add'>+	 * prevent subsequent attempts to use the adminq and increment the</div><div class='add'>+	 * refcnt to fail. This guarantees that this function will eventually</div><div class='add'>+	 * exit.</div><div class='add'>+	 */</div><div class='add'>+	while (!refcount_dec_if_one(&amp;pdsc-&gt;adminq_refcnt)) {</div><div class='add'>+		dev_dbg_ratelimited(pdsc-&gt;dev, "%s: adminq in use\n",</div><div class='add'>+				    __func__);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_fw_down(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_notifyq_comp reset_event = {</div><div class='add'>+		.reset.ecode = cpu_to_le16(PDS_EVENT_RESET),</div><div class='add'>+		.reset.state = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (test_and_set_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state)) {</div><div class='add'>+		dev_warn(pdsc-&gt;dev, "%s: already happening\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdsc-&gt;pdev-&gt;is_virtfn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	pdsc_adminq_wait_and_dec_once_unused(pdsc);</div><div class='add'>+</div><div class='add'>+	/* Notify clients of fw_down */</div><div class='add'>+	if (pdsc-&gt;fw_reporter)</div><div class='add'>+		devlink_health_report(pdsc-&gt;fw_reporter, "FW down reported", pdsc);</div><div class='add'>+	pdsc_notify(PDS_EVENT_RESET, &amp;reset_event);</div><div class='add'>+</div><div class='add'>+	pdsc_stop(pdsc);</div><div class='add'>+	pdsc_teardown(pdsc, PDSC_TEARDOWN_RECOVERY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_fw_up(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_notifyq_comp reset_event = {</div><div class='add'>+		.reset.ecode = cpu_to_le16(PDS_EVENT_RESET),</div><div class='add'>+		.reset.state = 1,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state)) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "%s: fw not dead\n", __func__);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdsc-&gt;pdev-&gt;is_virtfn) {</div><div class='add'>+		clear_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pdsc_setup(pdsc, PDSC_SETUP_RECOVERY);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	err = pdsc_start(pdsc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	/* Notify clients of fw_up */</div><div class='add'>+	pdsc-&gt;fw_recoveries++;</div><div class='add'>+	if (pdsc-&gt;fw_reporter)</div><div class='add'>+		devlink_health_reporter_state_update(pdsc-&gt;fw_reporter,</div><div class='add'>+						     DEVLINK_HEALTH_REPORTER_STATE_HEALTHY);</div><div class='add'>+	pdsc_notify(PDS_EVENT_RESET, &amp;reset_event);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	pdsc_teardown(pdsc, PDSC_TEARDOWN_RECOVERY);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_pci_reset_thread(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = container_of(work, struct pdsc, pci_reset_work);</div><div class='add'>+	struct pci_dev *pdev = pdsc-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	pci_dev_get(pdev);</div><div class='add'>+	pci_reset_function(pdev);</div><div class='add'>+	pci_dev_put(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_check_pci_health(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	u8 fw_status;</div><div class='add'>+</div><div class='add'>+	/* some sort of teardown already in progress */</div><div class='add'>+	if (!pdsc-&gt;info_regs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fw_status = ioread8(&amp;pdsc-&gt;info_regs-&gt;fw_status);</div><div class='add'>+</div><div class='add'>+	/* is PCI broken? */</div><div class='add'>+	if (fw_status != PDS_RC_BAD_PCI)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* prevent deadlock between pdsc_reset_prepare and pdsc_health_thread */</div><div class='add'>+	queue_work(pdsc-&gt;wq, &amp;pdsc-&gt;pci_reset_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_health_thread(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = container_of(work, struct pdsc, health_work);</div><div class='add'>+	unsigned long mask;</div><div class='add'>+	bool healthy;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	/* Don't do a check when in a transition state */</div><div class='add'>+	mask = BIT_ULL(PDSC_S_INITING_DRIVER) |</div><div class='add'>+	       BIT_ULL(PDSC_S_STOPPING_DRIVER);</div><div class='add'>+	if (pdsc-&gt;state &amp; mask)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	healthy = pdsc_is_fw_good(pdsc);</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "%s: health %d fw_status %#02x fw_heartbeat %d\n",</div><div class='add'>+		__func__, healthy, pdsc-&gt;fw_status, pdsc-&gt;last_hb);</div><div class='add'>+</div><div class='add'>+	if (test_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state)) {</div><div class='add'>+		if (healthy)</div><div class='add'>+			pdsc_fw_up(pdsc);</div><div class='add'>+	} else {</div><div class='add'>+		if (!healthy)</div><div class='add'>+			pdsc_fw_down(pdsc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc_check_pci_health(pdsc);</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;fw_generation = pdsc-&gt;fw_status &amp; PDS_CORE_FW_STS_F_GENERATION;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h<br/>new file mode 100644<br/>index 000000000000..4a6b35c84dab<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/core.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/core.h</a></div><div class='hunk'>@@ -0,0 +1,325 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#ifndef _PDSC_H_</div><div class='add'>+#define _PDSC_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/debugfs.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pds/pds_common.h&gt;</div><div class='add'>+#include &lt;linux/pds/pds_core_if.h&gt;</div><div class='add'>+#include &lt;linux/pds/pds_adminq.h&gt;</div><div class='add'>+#include &lt;linux/pds/pds_intr.h&gt;</div><div class='add'>+</div><div class='add'>+#define PDSC_DRV_DESCRIPTION	"AMD/Pensando Core Driver"</div><div class='add'>+</div><div class='add'>+#define PDSC_WATCHDOG_SECS	5</div><div class='add'>+#define PDSC_QUEUE_NAME_MAX_SZ  16</div><div class='add'>+#define PDSC_ADMINQ_MAX_LENGTH	16	/* must be a power of two */</div><div class='add'>+#define PDSC_NOTIFYQ_LENGTH	64	/* must be a power of two */</div><div class='add'>+#define PDSC_TEARDOWN_RECOVERY	false</div><div class='add'>+#define PDSC_TEARDOWN_REMOVING	true</div><div class='add'>+#define PDSC_SETUP_RECOVERY	false</div><div class='add'>+#define PDSC_SETUP_INIT		true</div><div class='add'>+</div><div class='add'>+struct pdsc_dev_bar {</div><div class='add'>+	void __iomem *vaddr;</div><div class='add'>+	phys_addr_t bus_addr;</div><div class='add'>+	unsigned long len;</div><div class='add'>+	int res_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc;</div><div class='add'>+</div><div class='add'>+struct pdsc_vf {</div><div class='add'>+	struct pds_auxiliary_dev *padev;</div><div class='add'>+	struct pdsc *vf;</div><div class='add'>+	u16     index;</div><div class='add'>+	__le16  vif_types[PDS_DEV_TYPE_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_devinfo {</div><div class='add'>+	u8 asic_type;</div><div class='add'>+	u8 asic_rev;</div><div class='add'>+	char fw_version[PDS_CORE_DEVINFO_FWVERS_BUFLEN + 1];</div><div class='add'>+	char serial_num[PDS_CORE_DEVINFO_SERIAL_BUFLEN + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_queue {</div><div class='add'>+	struct pdsc_q_info *info;</div><div class='add'>+	u64 dbval;</div><div class='add'>+	u16 head_idx;</div><div class='add'>+	u16 tail_idx;</div><div class='add'>+	u8 hw_type;</div><div class='add'>+	unsigned int index;</div><div class='add'>+	unsigned int num_descs;</div><div class='add'>+	u64 dbell_count;</div><div class='add'>+	u64 features;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	unsigned int hw_index;</div><div class='add'>+	union {</div><div class='add'>+		void *base;</div><div class='add'>+		struct pds_core_admin_cmd *adminq;</div><div class='add'>+	};</div><div class='add'>+	dma_addr_t base_pa;	/* must be page aligned */</div><div class='add'>+	unsigned int desc_size;</div><div class='add'>+	unsigned int pid;</div><div class='add'>+	char name[PDSC_QUEUE_NAME_MAX_SZ];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PDSC_INTR_NAME_MAX_SZ		32</div><div class='add'>+</div><div class='add'>+struct pdsc_intr_info {</div><div class='add'>+	char name[PDSC_INTR_NAME_MAX_SZ];</div><div class='add'>+	unsigned int index;</div><div class='add'>+	unsigned int vector;</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_cq_info {</div><div class='add'>+	void *comp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_buf_info {</div><div class='add'>+	struct page *page;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	u32 page_offset;</div><div class='add'>+	u32 len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_q_info {</div><div class='add'>+	union {</div><div class='add'>+		void *desc;</div><div class='add'>+		struct pdsc_admin_cmd *adminq_desc;</div><div class='add'>+	};</div><div class='add'>+	unsigned int bytes;</div><div class='add'>+	unsigned int nbufs;</div><div class='add'>+	struct pdsc_buf_info bufs[PDS_CORE_MAX_FRAGS];</div><div class='add'>+	struct completion completion;</div><div class='add'>+	void *dest;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_cq {</div><div class='add'>+	struct pdsc_cq_info *info;</div><div class='add'>+	struct pdsc_queue *bound_q;</div><div class='add'>+	struct pdsc_intr_info *bound_intr;</div><div class='add'>+	u16 tail_idx;</div><div class='add'>+	bool done_color;</div><div class='add'>+	unsigned int num_descs;</div><div class='add'>+	unsigned int desc_size;</div><div class='add'>+	void *base;</div><div class='add'>+	dma_addr_t base_pa;	/* must be page aligned */</div><div class='add'>+} ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+struct pdsc_qcq {</div><div class='add'>+	struct pdsc *pdsc;</div><div class='add'>+	void *q_base;</div><div class='add'>+	dma_addr_t q_base_pa;	/* might not be page aligned */</div><div class='add'>+	void *cq_base;</div><div class='add'>+	dma_addr_t cq_base_pa;	/* might not be page aligned */</div><div class='add'>+	u32 q_size;</div><div class='add'>+	u32 cq_size;</div><div class='add'>+	bool armed;</div><div class='add'>+	unsigned int flags;</div><div class='add'>+</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct pdsc_queue q;</div><div class='add'>+	struct pdsc_cq cq;</div><div class='add'>+	int intx;</div><div class='add'>+</div><div class='add'>+	u32 accum_work;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc_viftype {</div><div class='add'>+	char *name;</div><div class='add'>+	bool supported;</div><div class='add'>+	bool enabled;</div><div class='add'>+	int dl_id;</div><div class='add'>+	int vif_id;</div><div class='add'>+	struct pds_auxiliary_dev *padev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* No state flags set means we are in a steady running state */</div><div class='add'>+enum pdsc_state_flags {</div><div class='add'>+	PDSC_S_FW_DEAD,		    /* stopped, wait on startup or recovery */</div><div class='add'>+	PDSC_S_INITING_DRIVER,	    /* initial startup from probe */</div><div class='add'>+	PDSC_S_STOPPING_DRIVER,	    /* driver remove */</div><div class='add'>+</div><div class='add'>+	/* leave this as last */</div><div class='add'>+	PDSC_S_STATE_SIZE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pdsc {</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct dentry *dentry;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct pdsc_dev_bar bars[PDS_CORE_BARS_MAX];</div><div class='add'>+	struct pds_auxiliary_dev *padev;</div><div class='add'>+	struct pdsc_vf *vfs;</div><div class='add'>+	int num_vfs;</div><div class='add'>+	int vf_id;</div><div class='add'>+	int hw_index;</div><div class='add'>+	int uid;</div><div class='add'>+</div><div class='add'>+	unsigned long state;</div><div class='add'>+	u8 fw_status;</div><div class='add'>+	u8 fw_generation;</div><div class='add'>+	unsigned long last_fw_time;</div><div class='add'>+	u32 last_hb;</div><div class='add'>+	struct timer_list wdtimer;</div><div class='add'>+	unsigned int wdtimer_period;</div><div class='add'>+	struct work_struct health_work;</div><div class='add'>+	struct devlink_health_reporter *fw_reporter;</div><div class='add'>+	u32 fw_recoveries;</div><div class='add'>+</div><div class='add'>+	struct pdsc_devinfo dev_info;</div><div class='add'>+	struct pds_core_dev_identity dev_ident;</div><div class='add'>+	unsigned int nintrs;</div><div class='add'>+	struct pdsc_intr_info *intr_info;	/* array of nintrs elements */</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct *wq;</div><div class='add'>+</div><div class='add'>+	unsigned int devcmd_timeout;</div><div class='add'>+	struct mutex devcmd_lock;	/* lock for dev_cmd operations */</div><div class='add'>+	struct mutex config_lock;	/* lock for configuration operations */</div><div class='add'>+	spinlock_t adminq_lock;		/* lock for adminq operations */</div><div class='add'>+	refcount_t adminq_refcnt;</div><div class='add'>+	struct pds_core_dev_info_regs __iomem *info_regs;</div><div class='add'>+	struct pds_core_dev_cmd_regs __iomem *cmd_regs;</div><div class='add'>+	struct pds_core_intr __iomem *intr_ctrl;</div><div class='add'>+	u64 __iomem *intr_status;</div><div class='add'>+	u64 __iomem *db_pages;</div><div class='add'>+	dma_addr_t phy_db_pages;</div><div class='add'>+	u64 __iomem *kern_dbpage;</div><div class='add'>+</div><div class='add'>+	struct pdsc_qcq adminqcq;</div><div class='add'>+	struct pdsc_qcq notifyqcq;</div><div class='add'>+	u64 last_eid;</div><div class='add'>+	struct pdsc_viftype *viftype_status;</div><div class='add'>+	struct work_struct pci_reset_work;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/** enum pds_core_dbell_bits - bitwise composition of dbell values.</div><div class='add'>+ *</div><div class='add'>+ * @PDS_CORE_DBELL_QID_MASK:	unshifted mask of valid queue id bits.</div><div class='add'>+ * @PDS_CORE_DBELL_QID_SHIFT:	queue id shift amount in dbell value.</div><div class='add'>+ * @PDS_CORE_DBELL_QID:		macro to build QID component of dbell value.</div><div class='add'>+ *</div><div class='add'>+ * @PDS_CORE_DBELL_RING_MASK:	unshifted mask of valid ring bits.</div><div class='add'>+ * @PDS_CORE_DBELL_RING_SHIFT:	ring shift amount in dbell value.</div><div class='add'>+ * @PDS_CORE_DBELL_RING:	macro to build ring component of dbell value.</div><div class='add'>+ *</div><div class='add'>+ * @PDS_CORE_DBELL_RING_0:	ring zero dbell component value.</div><div class='add'>+ * @PDS_CORE_DBELL_RING_1:	ring one dbell component value.</div><div class='add'>+ * @PDS_CORE_DBELL_RING_2:	ring two dbell component value.</div><div class='add'>+ * @PDS_CORE_DBELL_RING_3:	ring three dbell component value.</div><div class='add'>+ *</div><div class='add'>+ * @PDS_CORE_DBELL_INDEX_MASK:	bit mask of valid index bits, no shift needed.</div><div class='add'>+ */</div><div class='add'>+enum pds_core_dbell_bits {</div><div class='add'>+	PDS_CORE_DBELL_QID_MASK		= 0xffffff,</div><div class='add'>+	PDS_CORE_DBELL_QID_SHIFT		= 24,</div><div class='add'>+</div><div class='add'>+#define PDS_CORE_DBELL_QID(n) \</div><div class='add'>+	(((u64)(n) &amp; PDS_CORE_DBELL_QID_MASK) &lt;&lt; PDS_CORE_DBELL_QID_SHIFT)</div><div class='add'>+</div><div class='add'>+	PDS_CORE_DBELL_RING_MASK		= 0x7,</div><div class='add'>+	PDS_CORE_DBELL_RING_SHIFT		= 16,</div><div class='add'>+</div><div class='add'>+#define PDS_CORE_DBELL_RING(n) \</div><div class='add'>+	(((u64)(n) &amp; PDS_CORE_DBELL_RING_MASK) &lt;&lt; PDS_CORE_DBELL_RING_SHIFT)</div><div class='add'>+</div><div class='add'>+	PDS_CORE_DBELL_RING_0		= 0,</div><div class='add'>+	PDS_CORE_DBELL_RING_1		= PDS_CORE_DBELL_RING(1),</div><div class='add'>+	PDS_CORE_DBELL_RING_2		= PDS_CORE_DBELL_RING(2),</div><div class='add'>+	PDS_CORE_DBELL_RING_3		= PDS_CORE_DBELL_RING(3),</div><div class='add'>+</div><div class='add'>+	PDS_CORE_DBELL_INDEX_MASK		= 0xffff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void pds_core_dbell_ring(u64 __iomem *db_page,</div><div class='add'>+				       enum pds_core_logical_qtype qtype,</div><div class='add'>+				       u64 val)</div><div class='add'>+{</div><div class='add'>+	writeq(val, &amp;db_page[qtype]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_fw_reporter_diagnose(struct devlink_health_reporter *reporter,</div><div class='add'>+			      struct devlink_fmsg *fmsg,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,</div><div class='add'>+		     struct netlink_ext_ack *extack);</div><div class='add'>+int pdsc_dl_flash_update(struct devlink *dl,</div><div class='add'>+			 struct devlink_flash_update_params *params,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+int pdsc_dl_enable_get(struct devlink *dl, u32 id,</div><div class='add'>+		       struct devlink_param_gset_ctx *ctx,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+int pdsc_dl_enable_set(struct devlink *dl, u32 id,</div><div class='add'>+		       struct devlink_param_gset_ctx *ctx,</div><div class='add'>+		       struct netlink_ext_ack *extack);</div><div class='add'>+int pdsc_dl_enable_validate(struct devlink *dl, u32 id,</div><div class='add'>+			    union devlink_param_value val,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+void __iomem *pdsc_map_dbpage(struct pdsc *pdsc, int page_num);</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_create(void);</div><div class='add'>+void pdsc_debugfs_destroy(void);</div><div class='add'>+void pdsc_debugfs_add_dev(struct pdsc *pdsc);</div><div class='add'>+void pdsc_debugfs_del_dev(struct pdsc *pdsc);</div><div class='add'>+void pdsc_debugfs_add_ident(struct pdsc *pdsc);</div><div class='add'>+void pdsc_debugfs_add_viftype(struct pdsc *pdsc);</div><div class='add'>+void pdsc_debugfs_add_irqs(struct pdsc *pdsc);</div><div class='add'>+void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq);</div><div class='add'>+void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq);</div><div class='add'>+</div><div class='add'>+int pdsc_err_to_errno(enum pds_core_status_code code);</div><div class='add'>+bool pdsc_is_fw_running(struct pdsc *pdsc);</div><div class='add'>+bool pdsc_is_fw_good(struct pdsc *pdsc);</div><div class='add'>+int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,</div><div class='add'>+		union pds_core_dev_comp *comp, int max_seconds);</div><div class='add'>+int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,</div><div class='add'>+		       union pds_core_dev_comp *comp, int max_seconds);</div><div class='add'>+int pdsc_devcmd_init(struct pdsc *pdsc);</div><div class='add'>+int pdsc_devcmd_reset(struct pdsc *pdsc);</div><div class='add'>+int pdsc_dev_init(struct pdsc *pdsc);</div><div class='add'>+void pdsc_dev_uninit(struct pdsc *pdsc);</div><div class='add'>+</div><div class='add'>+int pdsc_intr_alloc(struct pdsc *pdsc, char *name,</div><div class='add'>+		    irq_handler_t handler, void *data);</div><div class='add'>+void pdsc_intr_free(struct pdsc *pdsc, int index);</div><div class='add'>+void pdsc_qcq_free(struct pdsc *pdsc, struct pdsc_qcq *qcq);</div><div class='add'>+int pdsc_qcq_alloc(struct pdsc *pdsc, unsigned int type, unsigned int index,</div><div class='add'>+		   const char *name, unsigned int flags, unsigned int num_descs,</div><div class='add'>+		   unsigned int desc_size, unsigned int cq_desc_size,</div><div class='add'>+		   unsigned int pid, struct pdsc_qcq *qcq);</div><div class='add'>+int pdsc_setup(struct pdsc *pdsc, bool init);</div><div class='add'>+void pdsc_teardown(struct pdsc *pdsc, bool removing);</div><div class='add'>+int pdsc_start(struct pdsc *pdsc);</div><div class='add'>+void pdsc_stop(struct pdsc *pdsc);</div><div class='add'>+void pdsc_health_thread(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+int pdsc_register_notify(struct notifier_block *nb);</div><div class='add'>+void pdsc_unregister_notify(struct notifier_block *nb);</div><div class='add'>+void pdsc_notify(unsigned long event, void *data);</div><div class='add'>+int pdsc_auxbus_dev_add(struct pdsc *cf, struct pdsc *pf,</div><div class='add'>+			enum pds_core_vif_types vt,</div><div class='add'>+			struct pds_auxiliary_dev **pd_ptr);</div><div class='add'>+void pdsc_auxbus_dev_del(struct pdsc *cf, struct pdsc *pf,</div><div class='add'>+			 struct pds_auxiliary_dev **pd_ptr);</div><div class='add'>+</div><div class='add'>+void pdsc_process_adminq(struct pdsc_qcq *qcq);</div><div class='add'>+void pdsc_work_thread(struct work_struct *work);</div><div class='add'>+irqreturn_t pdsc_adminq_isr(int irq, void *data);</div><div class='add'>+</div><div class='add'>+int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+void pdsc_fw_down(struct pdsc *pdsc);</div><div class='add'>+void pdsc_fw_up(struct pdsc *pdsc);</div><div class='add'>+void pdsc_pci_reset_thread(struct work_struct *work);</div><div class='add'>+</div><div class='add'>+#endif /* _PDSC_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/debugfs.c b/drivers/net/ethernet/amd/pds_core/debugfs.c<br/>new file mode 100644<br/>index 000000000000..04c5e3abd8d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/debugfs.c</a></div><div class='hunk'>@@ -0,0 +1,175 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+static struct dentry *pdsc_dir;</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_create(void)</div><div class='add'>+{</div><div class='add'>+	pdsc_dir = debugfs_create_dir(PDS_CORE_DRV_NAME, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_destroy(void)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(pdsc_dir);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_add_dev(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	pdsc-&gt;dentry = debugfs_create_dir(pci_name(pdsc-&gt;pdev), pdsc_dir);</div><div class='add'>+</div><div class='add'>+	debugfs_create_ulong("state", 0400, pdsc-&gt;dentry, &amp;pdsc-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_del_dev(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(pdsc-&gt;dentry);</div><div class='add'>+	pdsc-&gt;dentry = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int identity_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct pds_core_dev_identity *ident;</div><div class='add'>+	struct pdsc *pdsc = seq-&gt;private;</div><div class='add'>+	int vt;</div><div class='add'>+</div><div class='add'>+	ident = &amp;pdsc-&gt;dev_ident;</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "fw_heartbeat:     0x%x\n",</div><div class='add'>+		   ioread32(&amp;pdsc-&gt;info_regs-&gt;fw_heartbeat));</div><div class='add'>+</div><div class='add'>+	seq_printf(seq, "nlifs:            %d\n",</div><div class='add'>+		   le32_to_cpu(ident-&gt;nlifs));</div><div class='add'>+	seq_printf(seq, "nintrs:           %d\n",</div><div class='add'>+		   le32_to_cpu(ident-&gt;nintrs));</div><div class='add'>+	seq_printf(seq, "ndbpgs_per_lif:   %d\n",</div><div class='add'>+		   le32_to_cpu(ident-&gt;ndbpgs_per_lif));</div><div class='add'>+	seq_printf(seq, "intr_coal_mult:   %d\n",</div><div class='add'>+		   le32_to_cpu(ident-&gt;intr_coal_mult));</div><div class='add'>+	seq_printf(seq, "intr_coal_div:    %d\n",</div><div class='add'>+		   le32_to_cpu(ident-&gt;intr_coal_div));</div><div class='add'>+</div><div class='add'>+	seq_puts(seq, "vif_types:        ");</div><div class='add'>+	for (vt = 0; vt &lt; PDS_DEV_TYPE_MAX; vt++)</div><div class='add'>+		seq_printf(seq, "%d ",</div><div class='add'>+			   le16_to_cpu(pdsc-&gt;dev_ident.vif_types[vt]));</div><div class='add'>+	seq_puts(seq, "\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(identity);</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_add_ident(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	/* This file will already exist in the reset flow */</div><div class='add'>+	if (debugfs_lookup("identity", pdsc-&gt;dentry))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_create_file("identity", 0400, pdsc-&gt;dentry,</div><div class='add'>+			    pdsc, &amp;identity_fops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int viftype_show(struct seq_file *seq, void *v)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = seq-&gt;private;</div><div class='add'>+	int vt;</div><div class='add'>+</div><div class='add'>+	for (vt = 0; vt &lt; PDS_DEV_TYPE_MAX; vt++) {</div><div class='add'>+		if (!pdsc-&gt;viftype_status[vt].name)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seq_printf(seq, "%s\t%d supported %d enabled\n",</div><div class='add'>+			   pdsc-&gt;viftype_status[vt].name,</div><div class='add'>+			   pdsc-&gt;viftype_status[vt].supported,</div><div class='add'>+			   pdsc-&gt;viftype_status[vt].enabled);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(viftype);</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_add_viftype(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	debugfs_create_file("viftypes", 0400, pdsc-&gt;dentry,</div><div class='add'>+			    pdsc, &amp;viftype_fops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct debugfs_reg32 intr_ctrl_regs[] = {</div><div class='add'>+	{ .name = "coal_init", .offset = 0, },</div><div class='add'>+	{ .name = "mask", .offset = 4, },</div><div class='add'>+	{ .name = "credits", .offset = 8, },</div><div class='add'>+	{ .name = "mask_on_assert", .offset = 12, },</div><div class='add'>+	{ .name = "coal_timer", .offset = 16, },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	struct dentry *qcq_dentry, *q_dentry, *cq_dentry, *intr_dentry;</div><div class='add'>+	struct debugfs_regset32 *intr_ctrl_regset;</div><div class='add'>+	struct pdsc_queue *q = &amp;qcq-&gt;q;</div><div class='add'>+	struct pdsc_cq *cq = &amp;qcq-&gt;cq;</div><div class='add'>+</div><div class='add'>+	qcq_dentry = debugfs_create_dir(q-&gt;name, pdsc-&gt;dentry);</div><div class='add'>+	if (IS_ERR(qcq_dentry))</div><div class='add'>+		return;</div><div class='add'>+	qcq-&gt;dentry = qcq_dentry;</div><div class='add'>+</div><div class='add'>+	debugfs_create_x64("q_base_pa", 0400, qcq_dentry, &amp;qcq-&gt;q_base_pa);</div><div class='add'>+	debugfs_create_x32("q_size", 0400, qcq_dentry, &amp;qcq-&gt;q_size);</div><div class='add'>+	debugfs_create_x64("cq_base_pa", 0400, qcq_dentry, &amp;qcq-&gt;cq_base_pa);</div><div class='add'>+	debugfs_create_x32("cq_size", 0400, qcq_dentry, &amp;qcq-&gt;cq_size);</div><div class='add'>+	debugfs_create_x32("accum_work", 0400, qcq_dentry, &amp;qcq-&gt;accum_work);</div><div class='add'>+</div><div class='add'>+	q_dentry = debugfs_create_dir("q", qcq-&gt;dentry);</div><div class='add'>+	if (IS_ERR(q_dentry))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_create_u32("index", 0400, q_dentry, &amp;q-&gt;index);</div><div class='add'>+	debugfs_create_u32("num_descs", 0400, q_dentry, &amp;q-&gt;num_descs);</div><div class='add'>+	debugfs_create_u32("desc_size", 0400, q_dentry, &amp;q-&gt;desc_size);</div><div class='add'>+	debugfs_create_u32("pid", 0400, q_dentry, &amp;q-&gt;pid);</div><div class='add'>+</div><div class='add'>+	debugfs_create_u16("tail", 0400, q_dentry, &amp;q-&gt;tail_idx);</div><div class='add'>+	debugfs_create_u16("head", 0400, q_dentry, &amp;q-&gt;head_idx);</div><div class='add'>+</div><div class='add'>+	cq_dentry = debugfs_create_dir("cq", qcq-&gt;dentry);</div><div class='add'>+	if (IS_ERR(cq_dentry))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	debugfs_create_x64("base_pa", 0400, cq_dentry, &amp;cq-&gt;base_pa);</div><div class='add'>+	debugfs_create_u32("num_descs", 0400, cq_dentry, &amp;cq-&gt;num_descs);</div><div class='add'>+	debugfs_create_u32("desc_size", 0400, cq_dentry, &amp;cq-&gt;desc_size);</div><div class='add'>+	debugfs_create_bool("done_color", 0400, cq_dentry, &amp;cq-&gt;done_color);</div><div class='add'>+	debugfs_create_u16("tail", 0400, cq_dentry, &amp;cq-&gt;tail_idx);</div><div class='add'>+</div><div class='add'>+	if (qcq-&gt;flags &amp; PDS_CORE_QCQ_F_INTR) {</div><div class='add'>+		struct pdsc_intr_info *intr = &amp;pdsc-&gt;intr_info[qcq-&gt;intx];</div><div class='add'>+</div><div class='add'>+		intr_dentry = debugfs_create_dir("intr", qcq-&gt;dentry);</div><div class='add'>+		if (IS_ERR(intr_dentry))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		debugfs_create_u32("index", 0400, intr_dentry, &amp;intr-&gt;index);</div><div class='add'>+		debugfs_create_u32("vector", 0400, intr_dentry, &amp;intr-&gt;vector);</div><div class='add'>+</div><div class='add'>+		intr_ctrl_regset = devm_kzalloc(pdsc-&gt;dev,</div><div class='add'>+						sizeof(*intr_ctrl_regset),</div><div class='add'>+						GFP_KERNEL);</div><div class='add'>+		if (!intr_ctrl_regset)</div><div class='add'>+			return;</div><div class='add'>+		intr_ctrl_regset-&gt;regs = intr_ctrl_regs;</div><div class='add'>+		intr_ctrl_regset-&gt;nregs = ARRAY_SIZE(intr_ctrl_regs);</div><div class='add'>+		intr_ctrl_regset-&gt;base = &amp;pdsc-&gt;intr_ctrl[intr-&gt;index];</div><div class='add'>+</div><div class='add'>+		debugfs_create_regset32("intr_ctrl", 0400, intr_dentry,</div><div class='add'>+					intr_ctrl_regset);</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq)</div><div class='add'>+{</div><div class='add'>+	debugfs_remove_recursive(qcq-&gt;dentry);</div><div class='add'>+	qcq-&gt;dentry = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c<br/>new file mode 100644<br/>index 000000000000..495ef4ef8c10<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/dev.c</a></div><div class='hunk'>@@ -0,0 +1,382 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+int pdsc_err_to_errno(enum pds_core_status_code code)</div><div class='add'>+{</div><div class='add'>+	switch (code) {</div><div class='add'>+	case PDS_RC_SUCCESS:</div><div class='add'>+		return 0;</div><div class='add'>+	case PDS_RC_EVERSION:</div><div class='add'>+	case PDS_RC_EQTYPE:</div><div class='add'>+	case PDS_RC_EQID:</div><div class='add'>+	case PDS_RC_EINVAL:</div><div class='add'>+	case PDS_RC_ENOSUPP:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case PDS_RC_EPERM:</div><div class='add'>+		return -EPERM;</div><div class='add'>+	case PDS_RC_ENOENT:</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	case PDS_RC_EAGAIN:</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	case PDS_RC_ENOMEM:</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	case PDS_RC_EFAULT:</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	case PDS_RC_EBUSY:</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	case PDS_RC_EEXIST:</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	case PDS_RC_EVFID:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	case PDS_RC_ECLIENT:</div><div class='add'>+		return -ECHILD;</div><div class='add'>+	case PDS_RC_ENOSPC:</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	case PDS_RC_ERANGE:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	case PDS_RC_BAD_ADDR:</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	case PDS_RC_BAD_PCI:</div><div class='add'>+		return -ENXIO;</div><div class='add'>+	case PDS_RC_EOPCODE:</div><div class='add'>+	case PDS_RC_EINTR:</div><div class='add'>+	case PDS_RC_DEV_CMD:</div><div class='add'>+	case PDS_RC_ERROR:</div><div class='add'>+	case PDS_RC_ERDMA:</div><div class='add'>+	case PDS_RC_EIO:</div><div class='add'>+	default:</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool pdsc_is_fw_running(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	if (!pdsc-&gt;info_regs)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;fw_status = ioread8(&amp;pdsc-&gt;info_regs-&gt;fw_status);</div><div class='add'>+	pdsc-&gt;last_fw_time = jiffies;</div><div class='add'>+	pdsc-&gt;last_hb = ioread32(&amp;pdsc-&gt;info_regs-&gt;fw_heartbeat);</div><div class='add'>+</div><div class='add'>+	/* Firmware is useful only if the running bit is set and</div><div class='add'>+	 * fw_status != 0xff (bad PCI read)</div><div class='add'>+	 */</div><div class='add'>+	return (pdsc-&gt;fw_status != PDS_RC_BAD_PCI) &amp;&amp;</div><div class='add'>+		(pdsc-&gt;fw_status &amp; PDS_CORE_FW_STS_F_RUNNING);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool pdsc_is_fw_good(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	bool fw_running = pdsc_is_fw_running(pdsc);</div><div class='add'>+	u8 gen;</div><div class='add'>+</div><div class='add'>+	/* Make sure to update the cached fw_status by calling</div><div class='add'>+	 * pdsc_is_fw_running() before getting the generation</div><div class='add'>+	 */</div><div class='add'>+	gen = pdsc-&gt;fw_status &amp; PDS_CORE_FW_STS_F_GENERATION;</div><div class='add'>+</div><div class='add'>+	return fw_running &amp;&amp; gen == pdsc-&gt;fw_generation;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 pdsc_devcmd_status(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	return ioread8(&amp;pdsc-&gt;cmd_regs-&gt;comp.status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool pdsc_devcmd_done(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	return ioread32(&amp;pdsc-&gt;cmd_regs-&gt;done) &amp; PDS_CORE_DEV_CMD_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_devcmd_dbell(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	iowrite32(0, &amp;pdsc-&gt;cmd_regs-&gt;done);</div><div class='add'>+	iowrite32(1, &amp;pdsc-&gt;cmd_regs-&gt;doorbell);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_devcmd_clean(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	iowrite32(0, &amp;pdsc-&gt;cmd_regs-&gt;doorbell);</div><div class='add'>+	memset_io(&amp;pdsc-&gt;cmd_regs-&gt;cmd, 0, sizeof(pdsc-&gt;cmd_regs-&gt;cmd));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const char *pdsc_devcmd_str(int opcode)</div><div class='add'>+{</div><div class='add'>+	switch (opcode) {</div><div class='add'>+	case PDS_CORE_CMD_NOP:</div><div class='add'>+		return "PDS_CORE_CMD_NOP";</div><div class='add'>+	case PDS_CORE_CMD_IDENTIFY:</div><div class='add'>+		return "PDS_CORE_CMD_IDENTIFY";</div><div class='add'>+	case PDS_CORE_CMD_RESET:</div><div class='add'>+		return "PDS_CORE_CMD_RESET";</div><div class='add'>+	case PDS_CORE_CMD_INIT:</div><div class='add'>+		return "PDS_CORE_CMD_INIT";</div><div class='add'>+	case PDS_CORE_CMD_FW_DOWNLOAD:</div><div class='add'>+		return "PDS_CORE_CMD_FW_DOWNLOAD";</div><div class='add'>+	case PDS_CORE_CMD_FW_CONTROL:</div><div class='add'>+		return "PDS_CORE_CMD_FW_CONTROL";</div><div class='add'>+	default:</div><div class='add'>+		return "PDS_CORE_CMD_UNKNOWN";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = pdsc-&gt;dev;</div><div class='add'>+	unsigned long start_time;</div><div class='add'>+	unsigned long max_wait;</div><div class='add'>+	unsigned long duration;</div><div class='add'>+	int timeout = 0;</div><div class='add'>+	bool running;</div><div class='add'>+	int done = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	start_time = jiffies;</div><div class='add'>+	max_wait = start_time + (max_seconds * HZ);</div><div class='add'>+</div><div class='add'>+	while (!done &amp;&amp; !timeout) {</div><div class='add'>+		running = pdsc_is_fw_running(pdsc);</div><div class='add'>+		if (!running)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		done = pdsc_devcmd_done(pdsc);</div><div class='add'>+		if (done)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		timeout = time_after(jiffies, max_wait);</div><div class='add'>+		if (timeout)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		usleep_range(100, 200);</div><div class='add'>+	}</div><div class='add'>+	duration = jiffies - start_time;</div><div class='add'>+</div><div class='add'>+	if (done &amp;&amp; duration &gt; HZ)</div><div class='add'>+		dev_dbg(dev, "DEVCMD %d %s after %ld secs\n",</div><div class='add'>+			opcode, pdsc_devcmd_str(opcode), duration / HZ);</div><div class='add'>+</div><div class='add'>+	if ((!done || timeout) &amp;&amp; running) {</div><div class='add'>+		dev_err(dev, "DEVCMD %d %s timeout, done %d timeout %d max_seconds=%d\n",</div><div class='add'>+			opcode, pdsc_devcmd_str(opcode), done, timeout,</div><div class='add'>+			max_seconds);</div><div class='add'>+		err = -ETIMEDOUT;</div><div class='add'>+		pdsc_devcmd_clean(pdsc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = pdsc_devcmd_status(pdsc);</div><div class='add'>+	err = pdsc_err_to_errno(status);</div><div class='add'>+	if (err &amp;&amp; err != -EAGAIN)</div><div class='add'>+		dev_err(dev, "DEVCMD %d %s failed, status=%d err %d %pe\n",</div><div class='add'>+			opcode, pdsc_devcmd_str(opcode), status, err,</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,</div><div class='add'>+		       union pds_core_dev_comp *comp, int max_seconds)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!pdsc-&gt;cmd_regs)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	memcpy_toio(&amp;pdsc-&gt;cmd_regs-&gt;cmd, cmd, sizeof(*cmd));</div><div class='add'>+	pdsc_devcmd_dbell(pdsc);</div><div class='add'>+	err = pdsc_devcmd_wait(pdsc, cmd-&gt;opcode, max_seconds);</div><div class='add'>+</div><div class='add'>+	if ((err == -ENXIO || err == -ETIMEDOUT) &amp;&amp; pdsc-&gt;wq)</div><div class='add'>+		queue_work(pdsc-&gt;wq, &amp;pdsc-&gt;health_work);</div><div class='add'>+	else</div><div class='add'>+		memcpy_fromio(comp, &amp;pdsc-&gt;cmd_regs-&gt;comp, sizeof(*comp));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd,</div><div class='add'>+		union pds_core_dev_comp *comp, int max_seconds)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+	err = pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds);</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_devcmd_init(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_comp comp = {};</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.opcode = PDS_CORE_CMD_INIT,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return pdsc_devcmd(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_devcmd_reset(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_comp comp = {};</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.reset.opcode = PDS_CORE_CMD_RESET,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	if (!pdsc_is_fw_running(pdsc))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return pdsc_devcmd(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_devcmd_identify_locked(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_comp comp = {};</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.identify.opcode = PDS_CORE_CMD_IDENTIFY,</div><div class='add'>+		.identify.ver = PDS_CORE_IDENTITY_VERSION_1,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return pdsc_devcmd_locked(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_init_devinfo(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	pdsc-&gt;dev_info.asic_type = ioread8(&amp;pdsc-&gt;info_regs-&gt;asic_type);</div><div class='add'>+	pdsc-&gt;dev_info.asic_rev = ioread8(&amp;pdsc-&gt;info_regs-&gt;asic_rev);</div><div class='add'>+	pdsc-&gt;fw_generation = PDS_CORE_FW_STS_F_GENERATION &amp;</div><div class='add'>+			      ioread8(&amp;pdsc-&gt;info_regs-&gt;fw_status);</div><div class='add'>+</div><div class='add'>+	memcpy_fromio(pdsc-&gt;dev_info.fw_version,</div><div class='add'>+		      pdsc-&gt;info_regs-&gt;fw_version,</div><div class='add'>+		      PDS_CORE_DEVINFO_FWVERS_BUFLEN);</div><div class='add'>+	pdsc-&gt;dev_info.fw_version[PDS_CORE_DEVINFO_FWVERS_BUFLEN] = 0;</div><div class='add'>+</div><div class='add'>+	memcpy_fromio(pdsc-&gt;dev_info.serial_num,</div><div class='add'>+		      pdsc-&gt;info_regs-&gt;serial_num,</div><div class='add'>+		      PDS_CORE_DEVINFO_SERIAL_BUFLEN);</div><div class='add'>+	pdsc-&gt;dev_info.serial_num[PDS_CORE_DEVINFO_SERIAL_BUFLEN] = 0;</div><div class='add'>+</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "fw_version %s\n", pdsc-&gt;dev_info.fw_version);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_identify(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	struct pds_core_drv_identity drv = {};</div><div class='add'>+	size_t sz;</div><div class='add'>+	int err;</div><div class='add'>+	int n;</div><div class='add'>+</div><div class='add'>+	drv.drv_type = cpu_to_le32(PDS_DRIVER_LINUX);</div><div class='add'>+	/* Catching the return quiets a Wformat-truncation complaint */</div><div class='add'>+	n = snprintf(drv.driver_ver_str, sizeof(drv.driver_ver_str),</div><div class='add'>+		     "%s %s", PDS_CORE_DRV_NAME, utsname()-&gt;release);</div><div class='add'>+	if (n &gt; sizeof(drv.driver_ver_str))</div><div class='add'>+		dev_dbg(pdsc-&gt;dev, "release name truncated, don't care\n");</div><div class='add'>+</div><div class='add'>+	/* Next let's get some info about the device</div><div class='add'>+	 * We use the devcmd_lock at this level in order to</div><div class='add'>+	 * get safe access to the cmd_regs-&gt;data before anyone</div><div class='add'>+	 * else can mess it up</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	sz = min_t(size_t, sizeof(drv), sizeof(pdsc-&gt;cmd_regs-&gt;data));</div><div class='add'>+	memcpy_toio(&amp;pdsc-&gt;cmd_regs-&gt;data, &amp;drv, sz);</div><div class='add'>+</div><div class='add'>+	err = pdsc_devcmd_identify_locked(pdsc);</div><div class='add'>+	if (!err) {</div><div class='add'>+		sz = min_t(size_t, sizeof(pdsc-&gt;dev_ident),</div><div class='add'>+			   sizeof(pdsc-&gt;cmd_regs-&gt;data));</div><div class='add'>+		memcpy_fromio(&amp;pdsc-&gt;dev_ident, &amp;pdsc-&gt;cmd_regs-&gt;data, sz);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "Cannot identify device: %pe\n",</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (isprint(pdsc-&gt;dev_info.fw_version[0]) &amp;&amp;</div><div class='add'>+	    isascii(pdsc-&gt;dev_info.fw_version[0]))</div><div class='add'>+		dev_info(pdsc-&gt;dev, "FW: %.*s\n",</div><div class='add'>+			 (int)(sizeof(pdsc-&gt;dev_info.fw_version) - 1),</div><div class='add'>+			 pdsc-&gt;dev_info.fw_version);</div><div class='add'>+	else</div><div class='add'>+		dev_info(pdsc-&gt;dev, "FW: (invalid string) 0x%02x 0x%02x 0x%02x 0x%02x ...\n",</div><div class='add'>+			 (u8)pdsc-&gt;dev_info.fw_version[0],</div><div class='add'>+			 (u8)pdsc-&gt;dev_info.fw_version[1],</div><div class='add'>+			 (u8)pdsc-&gt;dev_info.fw_version[2],</div><div class='add'>+			 (u8)pdsc-&gt;dev_info.fw_version[3]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void pdsc_dev_uninit(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	if (pdsc-&gt;intr_info) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; pdsc-&gt;nintrs; i++)</div><div class='add'>+			pdsc_intr_free(pdsc, i);</div><div class='add'>+</div><div class='add'>+		kfree(pdsc-&gt;intr_info);</div><div class='add'>+		pdsc-&gt;intr_info = NULL;</div><div class='add'>+		pdsc-&gt;nintrs = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_free_irq_vectors(pdsc-&gt;pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_dev_init(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	unsigned int nintrs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Initial init and reset of device */</div><div class='add'>+	pdsc_init_devinfo(pdsc);</div><div class='add'>+	pdsc-&gt;devcmd_timeout = PDS_CORE_DEVCMD_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	err = pdsc_devcmd_reset(pdsc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = pdsc_identify(pdsc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	pdsc_debugfs_add_ident(pdsc);</div><div class='add'>+</div><div class='add'>+	/* Now we can reserve interrupts */</div><div class='add'>+	nintrs = le32_to_cpu(pdsc-&gt;dev_ident.nintrs);</div><div class='add'>+	nintrs = min_t(unsigned int, num_online_cpus(), nintrs);</div><div class='add'>+</div><div class='add'>+	/* Get intr_info struct array for tracking */</div><div class='add'>+	pdsc-&gt;intr_info = kcalloc(nintrs, sizeof(*pdsc-&gt;intr_info), GFP_KERNEL);</div><div class='add'>+	if (!pdsc-&gt;intr_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = pci_alloc_irq_vectors(pdsc-&gt;pdev, nintrs, nintrs, PCI_IRQ_MSIX);</div><div class='add'>+	if (err != nintrs) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "Can't get %d intrs from OS: %pe\n",</div><div class='add'>+			nintrs, ERR_PTR(err));</div><div class='add'>+		err = -ENOSPC;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	pdsc-&gt;nintrs = nintrs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	kfree(pdsc-&gt;intr_info);</div><div class='add'>+	pdsc-&gt;intr_info = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c<br/>new file mode 100644<br/>index 000000000000..b576be626a29<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/devlink.c</a></div><div class='hunk'>@@ -0,0 +1,179 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+#include &lt;linux/pds/pds_auxbus.h&gt;</div><div class='add'>+</div><div class='add'>+static struct</div><div class='add'>+pdsc_viftype *pdsc_dl_find_viftype_by_id(struct pdsc *pdsc,</div><div class='add'>+					 enum devlink_param_type dl_id)</div><div class='add'>+{</div><div class='add'>+	int vt;</div><div class='add'>+</div><div class='add'>+	if (!pdsc-&gt;viftype_status)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	for (vt = 0; vt &lt; PDS_DEV_TYPE_MAX; vt++) {</div><div class='add'>+		if (pdsc-&gt;viftype_status[vt].dl_id == dl_id)</div><div class='add'>+			return &amp;pdsc-&gt;viftype_status[vt];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_dl_enable_get(struct devlink *dl, u32 id,</div><div class='add'>+		       struct devlink_param_gset_ctx *ctx,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = devlink_priv(dl);</div><div class='add'>+	struct pdsc_viftype *vt_entry;</div><div class='add'>+</div><div class='add'>+	vt_entry = pdsc_dl_find_viftype_by_id(pdsc, id);</div><div class='add'>+	if (!vt_entry)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;val.vbool = vt_entry-&gt;enabled;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_dl_enable_set(struct devlink *dl, u32 id,</div><div class='add'>+		       struct devlink_param_gset_ctx *ctx,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = devlink_priv(dl);</div><div class='add'>+	struct pdsc_viftype *vt_entry;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int vf_id;</div><div class='add'>+</div><div class='add'>+	vt_entry = pdsc_dl_find_viftype_by_id(pdsc, id);</div><div class='add'>+	if (!vt_entry || !vt_entry-&gt;supported)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (vt_entry-&gt;enabled == ctx-&gt;val.vbool)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vt_entry-&gt;enabled = ctx-&gt;val.vbool;</div><div class='add'>+	for (vf_id = 0; vf_id &lt; pdsc-&gt;num_vfs; vf_id++) {</div><div class='add'>+		struct pdsc *vf = pdsc-&gt;vfs[vf_id].vf;</div><div class='add'>+</div><div class='add'>+		if (ctx-&gt;val.vbool)</div><div class='add'>+			err = pdsc_auxbus_dev_add(vf, pdsc, vt_entry-&gt;vif_id,</div><div class='add'>+						  &amp;pdsc-&gt;vfs[vf_id].padev);</div><div class='add'>+		else</div><div class='add'>+			pdsc_auxbus_dev_del(vf, pdsc, &amp;pdsc-&gt;vfs[vf_id].padev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_dl_enable_validate(struct devlink *dl, u32 id,</div><div class='add'>+			    union devlink_param_value val,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = devlink_priv(dl);</div><div class='add'>+	struct pdsc_viftype *vt_entry;</div><div class='add'>+</div><div class='add'>+	vt_entry = pdsc_dl_find_viftype_by_id(pdsc, id);</div><div class='add'>+	if (!vt_entry || !vt_entry-&gt;supported)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!pdsc-&gt;viftype_status[vt_entry-&gt;vif_id].supported)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_dl_flash_update(struct devlink *dl,</div><div class='add'>+			 struct devlink_flash_update_params *params,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = devlink_priv(dl);</div><div class='add'>+</div><div class='add'>+	return pdsc_firmware_update(pdsc, params-&gt;fw, extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *fw_slotnames[] = {</div><div class='add'>+	"fw.goldfw",</div><div class='add'>+	"fw.mainfwa",</div><div class='add'>+	"fw.mainfwb",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.fw_control.opcode = PDS_CORE_CMD_FW_CONTROL,</div><div class='add'>+		.fw_control.oper = PDS_CORE_FW_GET_LIST,</div><div class='add'>+	};</div><div class='add'>+	struct pds_core_fw_list_info fw_list = {};</div><div class='add'>+	struct pdsc *pdsc = devlink_priv(dl);</div><div class='add'>+	union pds_core_dev_comp comp;</div><div class='add'>+	char buf[32];</div><div class='add'>+	int listlen;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+	err = pdsc_devcmd_locked(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout * 2);</div><div class='add'>+	if (!err)</div><div class='add'>+		memcpy_fromio(&amp;fw_list, pdsc-&gt;cmd_regs-&gt;data, sizeof(fw_list));</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	listlen = min(fw_list.num_fw_slots, ARRAY_SIZE(fw_list.fw_names));</div><div class='add'>+	for (i = 0; i &lt; listlen; i++) {</div><div class='add'>+		if (i &lt; ARRAY_SIZE(fw_slotnames))</div><div class='add'>+			strscpy(buf, fw_slotnames[i], sizeof(buf));</div><div class='add'>+		else</div><div class='add'>+			snprintf(buf, sizeof(buf), "fw.slot_%d", i);</div><div class='add'>+		err = devlink_info_version_stored_put(req, buf,</div><div class='add'>+						      fw_list.fw_names[i].fw_version);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_info_version_running_put(req,</div><div class='add'>+					       DEVLINK_INFO_VERSION_GENERIC_FW,</div><div class='add'>+					       pdsc-&gt;dev_info.fw_version);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "0x%x", pdsc-&gt;dev_info.asic_type);</div><div class='add'>+	err = devlink_info_version_fixed_put(req,</div><div class='add'>+					     DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,</div><div class='add'>+					     buf);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	snprintf(buf, sizeof(buf), "0x%x", pdsc-&gt;dev_info.asic_rev);</div><div class='add'>+	err = devlink_info_version_fixed_put(req,</div><div class='add'>+					     DEVLINK_INFO_VERSION_GENERIC_ASIC_REV,</div><div class='add'>+					     buf);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return devlink_info_serial_number_put(req, pdsc-&gt;dev_info.serial_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_fw_reporter_diagnose(struct devlink_health_reporter *reporter,</div><div class='add'>+			      struct devlink_fmsg *fmsg,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = devlink_health_reporter_priv(reporter);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+	if (test_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state))</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "dead");</div><div class='add'>+	else if (!pdsc_is_fw_good(pdsc))</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "unhealthy");</div><div class='add'>+	else</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "healthy");</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "State",</div><div class='add'>+				  pdsc-&gt;fw_status &amp; ~PDS_CORE_FW_STS_F_GENERATION);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Generation", pdsc-&gt;fw_generation &gt;&gt; 4);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Recoveries", pdsc-&gt;fw_recoveries);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/fw.c b/drivers/net/ethernet/amd/pds_core/fw.c<br/>new file mode 100644<br/>index 000000000000..fa626719e68d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/fw.c</a></div><div class='hunk'>@@ -0,0 +1,197 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+/* The worst case wait for the install activity is about 25 minutes when</div><div class='add'>+ * installing a new CPLD, which is very seldom.  Normal is about 30-35</div><div class='add'>+ * seconds.  Since the driver can't tell if a CPLD update will happen we</div><div class='add'>+ * set the timeout for the ugly case.</div><div class='add'>+ */</div><div class='add'>+#define PDSC_FW_INSTALL_TIMEOUT	(25 * 60)</div><div class='add'>+#define PDSC_FW_SELECT_TIMEOUT	30</div><div class='add'>+</div><div class='add'>+/* Number of periodic log updates during fw file download */</div><div class='add'>+#define PDSC_FW_INTERVAL_FRACTION	32</div><div class='add'>+</div><div class='add'>+static int pdsc_devcmd_fw_download_locked(struct pdsc *pdsc, u64 addr,</div><div class='add'>+					  u32 offset, u32 length)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.fw_download.opcode = PDS_CORE_CMD_FW_DOWNLOAD,</div><div class='add'>+		.fw_download.offset = cpu_to_le32(offset),</div><div class='add'>+		.fw_download.addr = cpu_to_le64(addr),</div><div class='add'>+		.fw_download.length = cpu_to_le32(length),</div><div class='add'>+	};</div><div class='add'>+	union pds_core_dev_comp comp;</div><div class='add'>+</div><div class='add'>+	return pdsc_devcmd_locked(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_devcmd_fw_install(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.fw_control.opcode = PDS_CORE_CMD_FW_CONTROL,</div><div class='add'>+		.fw_control.oper = PDS_CORE_FW_INSTALL_ASYNC</div><div class='add'>+	};</div><div class='add'>+	union pds_core_dev_comp comp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pdsc_devcmd(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return comp.fw_control.slot;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_devcmd_fw_activate(struct pdsc *pdsc,</div><div class='add'>+				   enum pds_core_fw_slot slot)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.fw_control.opcode = PDS_CORE_CMD_FW_CONTROL,</div><div class='add'>+		.fw_control.oper = PDS_CORE_FW_ACTIVATE_ASYNC,</div><div class='add'>+		.fw_control.slot = slot</div><div class='add'>+	};</div><div class='add'>+	union pds_core_dev_comp comp;</div><div class='add'>+</div><div class='add'>+	return pdsc_devcmd(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_fw_status_long_wait(struct pdsc *pdsc,</div><div class='add'>+				    const char *label,</div><div class='add'>+				    unsigned long timeout,</div><div class='add'>+				    u8 fw_cmd,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	union pds_core_dev_cmd cmd = {</div><div class='add'>+		.fw_control.opcode = PDS_CORE_CMD_FW_CONTROL,</div><div class='add'>+		.fw_control.oper = fw_cmd,</div><div class='add'>+	};</div><div class='add'>+	union pds_core_dev_comp comp;</div><div class='add'>+	unsigned long start_time;</div><div class='add'>+	unsigned long end_time;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Ping on the status of the long running async install</div><div class='add'>+	 * command.  We get EAGAIN while the command is still</div><div class='add'>+	 * running, else we get the final command status.</div><div class='add'>+	 */</div><div class='add'>+	start_time = jiffies;</div><div class='add'>+	end_time = start_time + (timeout * HZ);</div><div class='add'>+	do {</div><div class='add'>+		err = pdsc_devcmd(pdsc, &amp;cmd, &amp;comp, pdsc-&gt;devcmd_timeout);</div><div class='add'>+		msleep(20);</div><div class='add'>+	} while (time_before(jiffies, end_time) &amp;&amp;</div><div class='add'>+		 (err == -EAGAIN || err == -ETIMEDOUT));</div><div class='add'>+</div><div class='add'>+	if (err == -EAGAIN || err == -ETIMEDOUT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Firmware wait timed out");</div><div class='add'>+		dev_err(pdsc-&gt;dev, "DEV_CMD firmware wait %s timed out\n",</div><div class='add'>+			label);</div><div class='add'>+	} else if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Firmware wait failed");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u32 buf_sz, copy_sz, offset;</div><div class='add'>+	struct devlink *dl;</div><div class='add'>+	int next_interval;</div><div class='add'>+	u64 data_addr;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int fw_slot;</div><div class='add'>+</div><div class='add'>+	dev_info(pdsc-&gt;dev, "Installing firmware\n");</div><div class='add'>+</div><div class='add'>+	if (!pdsc-&gt;cmd_regs)</div><div class='add'>+		return -ENXIO;</div><div class='add'>+</div><div class='add'>+	dl = priv_to_devlink(pdsc);</div><div class='add'>+	devlink_flash_update_status_notify(dl, "Preparing to flash",</div><div class='add'>+					   NULL, 0, 0);</div><div class='add'>+</div><div class='add'>+	buf_sz = sizeof(pdsc-&gt;cmd_regs-&gt;data);</div><div class='add'>+</div><div class='add'>+	dev_dbg(pdsc-&gt;dev,</div><div class='add'>+		"downloading firmware - size %d part_sz %d nparts %lu\n",</div><div class='add'>+		(int)fw-&gt;size, buf_sz, DIV_ROUND_UP(fw-&gt;size, buf_sz));</div><div class='add'>+</div><div class='add'>+	offset = 0;</div><div class='add'>+	next_interval = 0;</div><div class='add'>+	data_addr = offsetof(struct pds_core_dev_cmd_regs, data);</div><div class='add'>+	while (offset &lt; fw-&gt;size) {</div><div class='add'>+		if (offset &gt;= next_interval) {</div><div class='add'>+			devlink_flash_update_status_notify(dl, "Downloading",</div><div class='add'>+							   NULL, offset,</div><div class='add'>+							   fw-&gt;size);</div><div class='add'>+			next_interval = offset +</div><div class='add'>+					(fw-&gt;size / PDSC_FW_INTERVAL_FRACTION);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		copy_sz = min_t(unsigned int, buf_sz, fw-&gt;size - offset);</div><div class='add'>+		mutex_lock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+		memcpy_toio(&amp;pdsc-&gt;cmd_regs-&gt;data, fw-&gt;data + offset, copy_sz);</div><div class='add'>+		err = pdsc_devcmd_fw_download_locked(pdsc, data_addr,</div><div class='add'>+						     offset, copy_sz);</div><div class='add'>+		mutex_unlock(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(pdsc-&gt;dev,</div><div class='add'>+				"download failed offset 0x%x addr 0x%llx len 0x%x: %pe\n",</div><div class='add'>+				offset, data_addr, copy_sz, ERR_PTR(err));</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Segment download failed");</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+		offset += copy_sz;</div><div class='add'>+	}</div><div class='add'>+	devlink_flash_update_status_notify(dl, "Downloading", NULL,</div><div class='add'>+					   fw-&gt;size, fw-&gt;size);</div><div class='add'>+</div><div class='add'>+	devlink_flash_update_timeout_notify(dl, "Installing", NULL,</div><div class='add'>+					    PDSC_FW_INSTALL_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	fw_slot = pdsc_devcmd_fw_install(pdsc);</div><div class='add'>+	if (fw_slot &lt; 0) {</div><div class='add'>+		err = fw_slot;</div><div class='add'>+		dev_err(pdsc-&gt;dev, "install failed: %pe\n", ERR_PTR(err));</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to start firmware install");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pdsc_fw_status_long_wait(pdsc, "Installing",</div><div class='add'>+				       PDSC_FW_INSTALL_TIMEOUT,</div><div class='add'>+				       PDS_CORE_FW_INSTALL_STATUS,</div><div class='add'>+				       extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	devlink_flash_update_timeout_notify(dl, "Selecting", NULL,</div><div class='add'>+					    PDSC_FW_SELECT_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	err = pdsc_devcmd_fw_activate(pdsc, fw_slot);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to start firmware select");</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pdsc_fw_status_long_wait(pdsc, "Selecting",</div><div class='add'>+				       PDSC_FW_SELECT_TIMEOUT,</div><div class='add'>+				       PDS_CORE_FW_ACTIVATE_STATUS,</div><div class='add'>+				       extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	dev_info(pdsc-&gt;dev, "Firmware update completed, slot %d\n", fw_slot);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	if (err)</div><div class='add'>+		devlink_flash_update_status_notify(dl, "Flash failed",</div><div class='add'>+						   NULL, 0, 0);</div><div class='add'>+	else</div><div class='add'>+		devlink_flash_update_status_notify(dl, "Flash done",</div><div class='add'>+						   NULL, 0, 0);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c<br/>new file mode 100644<br/>index 000000000000..c7a2eff57632<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/pds_core/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/pds_core/main.c</a></div><div class='hunk'>@@ -0,0 +1,609 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright(c) 2023 Advanced Micro Devices, Inc */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/pds/pds_common.h&gt;</div><div class='add'>+</div><div class='add'>+#include "core.h"</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION(PDSC_DRV_DESCRIPTION);</div><div class='add'>+MODULE_AUTHOR("Advanced Micro Devices, Inc");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='add'>+/* Supported devices */</div><div class='add'>+static const struct pci_device_id pdsc_id_table[] = {</div><div class='add'>+	{ PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_CORE_PF) },</div><div class='add'>+	{ PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_VDPA_VF) },</div><div class='add'>+	{ 0, }	/* end of table */</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, pdsc_id_table);</div><div class='add'>+</div><div class='add'>+static void pdsc_wdtimer_cb(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = timer_container_of(pdsc, t, wdtimer);</div><div class='add'>+</div><div class='add'>+	dev_dbg(pdsc-&gt;dev, "%s: jiffies %ld\n", __func__, jiffies);</div><div class='add'>+	mod_timer(&amp;pdsc-&gt;wdtimer,</div><div class='add'>+		  round_jiffies(jiffies + pdsc-&gt;wdtimer_period));</div><div class='add'>+</div><div class='add'>+	queue_work(pdsc-&gt;wq, &amp;pdsc-&gt;health_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_unmap_bars(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_dev_bar *bars = pdsc-&gt;bars;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;info_regs = NULL;</div><div class='add'>+	pdsc-&gt;cmd_regs = NULL;</div><div class='add'>+	pdsc-&gt;intr_status = NULL;</div><div class='add'>+	pdsc-&gt;intr_ctrl = NULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; PDS_CORE_BARS_MAX; i++) {</div><div class='add'>+		if (bars[i].vaddr)</div><div class='add'>+			pci_iounmap(pdsc-&gt;pdev, bars[i].vaddr);</div><div class='add'>+		bars[i].vaddr = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_map_bars(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	struct pdsc_dev_bar *bar = pdsc-&gt;bars;</div><div class='add'>+	struct pci_dev *pdev = pdsc-&gt;pdev;</div><div class='add'>+	struct device *dev = pdsc-&gt;dev;</div><div class='add'>+	struct pdsc_dev_bar *bars;</div><div class='add'>+	unsigned int i, j;</div><div class='add'>+	int num_bars = 0;</div><div class='add'>+	int err;</div><div class='add'>+	u32 sig;</div><div class='add'>+</div><div class='add'>+	bars = pdsc-&gt;bars;</div><div class='add'>+</div><div class='add'>+	/* Since the PCI interface in the hardware is configurable,</div><div class='add'>+	 * we need to poke into all the bars to find the set we're</div><div class='add'>+	 * expecting.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0, j = 0; i &lt; PDS_CORE_BARS_MAX; i++) {</div><div class='add'>+		if (!(pci_resource_flags(pdev, i) &amp; IORESOURCE_MEM))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bars[j].len = pci_resource_len(pdev, i);</div><div class='add'>+		bars[j].bus_addr = pci_resource_start(pdev, i);</div><div class='add'>+		bars[j].res_index = i;</div><div class='add'>+</div><div class='add'>+		/* only map the whole bar 0 */</div><div class='add'>+		if (j &gt; 0) {</div><div class='add'>+			bars[j].vaddr = NULL;</div><div class='add'>+		} else {</div><div class='add'>+			bars[j].vaddr = pci_iomap(pdev, i, bars[j].len);</div><div class='add'>+			if (!bars[j].vaddr) {</div><div class='add'>+				dev_err(dev, "Cannot map BAR %d, aborting\n", i);</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		j++;</div><div class='add'>+	}</div><div class='add'>+	num_bars = j;</div><div class='add'>+</div><div class='add'>+	/* BAR0: dev_cmd and interrupts */</div><div class='add'>+	if (num_bars &lt; 1) {</div><div class='add'>+		dev_err(dev, "No bars found\n");</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bar-&gt;len &lt; PDS_CORE_BAR0_SIZE) {</div><div class='add'>+		dev_err(dev, "Resource bar size %lu too small\n", bar-&gt;len);</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;info_regs = bar-&gt;vaddr + PDS_CORE_BAR0_DEV_INFO_REGS_OFFSET;</div><div class='add'>+	pdsc-&gt;cmd_regs = bar-&gt;vaddr + PDS_CORE_BAR0_DEV_CMD_REGS_OFFSET;</div><div class='add'>+	pdsc-&gt;intr_status = bar-&gt;vaddr + PDS_CORE_BAR0_INTR_STATUS_OFFSET;</div><div class='add'>+	pdsc-&gt;intr_ctrl = bar-&gt;vaddr + PDS_CORE_BAR0_INTR_CTRL_OFFSET;</div><div class='add'>+</div><div class='add'>+	sig = ioread32(&amp;pdsc-&gt;info_regs-&gt;signature);</div><div class='add'>+	if (sig != PDS_CORE_DEV_INFO_SIGNATURE) {</div><div class='add'>+		dev_err(dev, "Incompatible firmware signature %x", sig);</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* BAR1: doorbells */</div><div class='add'>+	bar++;</div><div class='add'>+	if (num_bars &lt; 2) {</div><div class='add'>+		dev_err(dev, "Doorbell bar missing\n");</div><div class='add'>+		err = -EFAULT;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;db_pages = bar-&gt;vaddr;</div><div class='add'>+	pdsc-&gt;phy_db_pages = bar-&gt;bus_addr;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	pdsc_unmap_bars(pdsc);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void __iomem *pdsc_map_dbpage(struct pdsc *pdsc, int page_num)</div><div class='add'>+{</div><div class='add'>+	return pci_iomap_range(pdsc-&gt;pdev,</div><div class='add'>+			       pdsc-&gt;bars[PDS_CORE_PCI_BAR_DBELL].res_index,</div><div class='add'>+			       (u64)page_num &lt;&lt; PAGE_SHIFT, PAGE_SIZE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_sriov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = pci_get_drvdata(pdev);</div><div class='add'>+	struct device *dev = pdsc-&gt;dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (num_vfs &gt; 0) {</div><div class='add'>+		pdsc-&gt;vfs = kcalloc(num_vfs, sizeof(struct pdsc_vf),</div><div class='add'>+				    GFP_KERNEL);</div><div class='add'>+		if (!pdsc-&gt;vfs)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		pdsc-&gt;num_vfs = num_vfs;</div><div class='add'>+</div><div class='add'>+		ret = pci_enable_sriov(pdev, num_vfs);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_err(dev, "Cannot enable SRIOV: %pe\n",</div><div class='add'>+				ERR_PTR(ret));</div><div class='add'>+			goto no_vfs;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return num_vfs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+no_vfs:</div><div class='add'>+	pci_disable_sriov(pdev);</div><div class='add'>+</div><div class='add'>+	kfree(pdsc-&gt;vfs);</div><div class='add'>+	pdsc-&gt;vfs = NULL;</div><div class='add'>+	pdsc-&gt;num_vfs = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pdsc_init_vf(struct pdsc *vf)</div><div class='add'>+{</div><div class='add'>+	struct devlink *dl;</div><div class='add'>+	struct pdsc *pf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pf = pdsc_get_pf_struct(vf-&gt;pdev);</div><div class='add'>+	if (IS_ERR_OR_NULL(pf))</div><div class='add'>+		return PTR_ERR(pf) ?: -1;</div><div class='add'>+</div><div class='add'>+	vf-&gt;vf_id = pci_iov_vf_id(vf-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	dl = priv_to_devlink(vf);</div><div class='add'>+	devl_lock(dl);</div><div class='add'>+	devl_register(dl);</div><div class='add'>+	devl_unlock(dl);</div><div class='add'>+</div><div class='add'>+	pf-&gt;vfs[vf-&gt;vf_id].vf = vf;</div><div class='add'>+	err = pdsc_auxbus_dev_add(vf, pf, PDS_DEV_TYPE_VDPA,</div><div class='add'>+				  &amp;pf-&gt;vfs[vf-&gt;vf_id].padev);</div><div class='add'>+	if (err) {</div><div class='add'>+		devl_lock(dl);</div><div class='add'>+		devl_unregister(dl);</div><div class='add'>+		devl_unlock(dl);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_health_reporter_ops pdsc_fw_reporter_ops = {</div><div class='add'>+	.name = "fw",</div><div class='add'>+	.diagnose = pdsc_fw_reporter_diagnose,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_param pdsc_dl_params[] = {</div><div class='add'>+	DEVLINK_PARAM_GENERIC(ENABLE_VNET,</div><div class='add'>+			      BIT(DEVLINK_PARAM_CMODE_RUNTIME),</div><div class='add'>+			      pdsc_dl_enable_get,</div><div class='add'>+			      pdsc_dl_enable_set,</div><div class='add'>+			      pdsc_dl_enable_validate),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define PDSC_WQ_NAME_LEN 24</div><div class='add'>+</div><div class='add'>+static int pdsc_init_pf(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *hr;</div><div class='add'>+	char wq_name[PDSC_WQ_NAME_LEN];</div><div class='add'>+	struct devlink *dl;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pcie_print_link_status(pdsc-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	err = pci_request_regions(pdsc-&gt;pdev, PDS_CORE_DRV_NAME);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "Cannot request PCI regions: %pe\n",</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pdsc_map_bars(pdsc);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_release_regions;</div><div class='add'>+</div><div class='add'>+	/* General workqueue and timer, but don't start timer yet */</div><div class='add'>+	snprintf(wq_name, sizeof(wq_name), "%s.%d", PDS_CORE_DRV_NAME, pdsc-&gt;uid);</div><div class='add'>+	pdsc-&gt;wq = create_singlethread_workqueue(wq_name);</div><div class='add'>+	INIT_WORK(&amp;pdsc-&gt;health_work, pdsc_health_thread);</div><div class='add'>+	INIT_WORK(&amp;pdsc-&gt;pci_reset_work, pdsc_pci_reset_thread);</div><div class='add'>+	timer_setup(&amp;pdsc-&gt;wdtimer, pdsc_wdtimer_cb, 0);</div><div class='add'>+	pdsc-&gt;wdtimer_period = PDSC_WATCHDOG_SECS * HZ;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+	mutex_init(&amp;pdsc-&gt;config_lock);</div><div class='add'>+	spin_lock_init(&amp;pdsc-&gt;adminq_lock);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+	set_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state);</div><div class='add'>+</div><div class='add'>+	err = pdsc_setup(pdsc, PDSC_SETUP_INIT);</div><div class='add'>+	if (err) {</div><div class='add'>+		mutex_unlock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+		goto err_out_unmap_bars;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pdsc_start(pdsc);</div><div class='add'>+	if (err) {</div><div class='add'>+		mutex_unlock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+		goto err_out_teardown;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+</div><div class='add'>+	err = pdsc_auxbus_dev_add(pdsc, pdsc, PDS_DEV_TYPE_FWCTL, &amp;pdsc-&gt;padev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_out_stop;</div><div class='add'>+</div><div class='add'>+	dl = priv_to_devlink(pdsc);</div><div class='add'>+	devl_lock(dl);</div><div class='add'>+	err = devl_params_register(dl, pdsc_dl_params,</div><div class='add'>+				   ARRAY_SIZE(pdsc_dl_params));</div><div class='add'>+	if (err) {</div><div class='add'>+		devl_unlock(dl);</div><div class='add'>+		dev_warn(pdsc-&gt;dev, "Failed to register devlink params: %pe\n",</div><div class='add'>+			 ERR_PTR(err));</div><div class='add'>+		goto err_out_del_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hr = devl_health_reporter_create(dl, &amp;pdsc_fw_reporter_ops, pdsc);</div><div class='add'>+	if (IS_ERR(hr)) {</div><div class='add'>+		devl_unlock(dl);</div><div class='add'>+		dev_warn(pdsc-&gt;dev, "Failed to create fw reporter: %pe\n", hr);</div><div class='add'>+		err = PTR_ERR(hr);</div><div class='add'>+		goto err_out_unreg_params;</div><div class='add'>+	}</div><div class='add'>+	pdsc-&gt;fw_reporter = hr;</div><div class='add'>+</div><div class='add'>+	devl_register(dl);</div><div class='add'>+	devl_unlock(dl);</div><div class='add'>+</div><div class='add'>+	/* Lastly, start the health check timer */</div><div class='add'>+	mod_timer(&amp;pdsc-&gt;wdtimer, round_jiffies(jiffies + pdsc-&gt;wdtimer_period));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_unreg_params:</div><div class='add'>+	devlink_params_unregister(dl, pdsc_dl_params,</div><div class='add'>+				  ARRAY_SIZE(pdsc_dl_params));</div><div class='add'>+err_out_del_dev:</div><div class='add'>+	pdsc_auxbus_dev_del(pdsc, pdsc, &amp;pdsc-&gt;padev);</div><div class='add'>+err_out_stop:</div><div class='add'>+	pdsc_stop(pdsc);</div><div class='add'>+err_out_teardown:</div><div class='add'>+	pdsc_teardown(pdsc, PDSC_TEARDOWN_REMOVING);</div><div class='add'>+err_out_unmap_bars:</div><div class='add'>+	timer_shutdown_sync(&amp;pdsc-&gt;wdtimer);</div><div class='add'>+	if (pdsc-&gt;wq)</div><div class='add'>+		destroy_workqueue(pdsc-&gt;wq);</div><div class='add'>+	mutex_destroy(&amp;pdsc-&gt;config_lock);</div><div class='add'>+	mutex_destroy(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+	pci_free_irq_vectors(pdsc-&gt;pdev);</div><div class='add'>+	pdsc_unmap_bars(pdsc);</div><div class='add'>+err_out_release_regions:</div><div class='add'>+	pci_release_regions(pdsc-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops pdsc_dl_ops = {</div><div class='add'>+	.info_get	= pdsc_dl_info_get,</div><div class='add'>+	.flash_update	= pdsc_dl_flash_update,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops pdsc_dl_vf_ops = {</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static DEFINE_IDA(pdsc_ida);</div><div class='add'>+</div><div class='add'>+static int pdsc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	const struct devlink_ops *ops;</div><div class='add'>+	struct devlink *dl;</div><div class='add'>+	struct pdsc *pdsc;</div><div class='add'>+	bool is_pf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	is_pf = !pdev-&gt;is_virtfn;</div><div class='add'>+	ops = is_pf ? &amp;pdsc_dl_ops : &amp;pdsc_dl_vf_ops;</div><div class='add'>+	dl = devlink_alloc(ops, sizeof(struct pdsc), dev);</div><div class='add'>+	if (!dl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	pdsc = devlink_priv(dl);</div><div class='add'>+</div><div class='add'>+	pdsc-&gt;pdev = pdev;</div><div class='add'>+	pdsc-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	set_bit(PDSC_S_INITING_DRIVER, &amp;pdsc-&gt;state);</div><div class='add'>+	pci_set_drvdata(pdev, pdsc);</div><div class='add'>+	pdsc_debugfs_add_dev(pdsc);</div><div class='add'>+</div><div class='add'>+	err = ida_alloc(&amp;pdsc_ida, GFP_KERNEL);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(pdsc-&gt;dev, "%s: id alloc failed: %pe\n",</div><div class='add'>+			__func__, ERR_PTR(err));</div><div class='add'>+		goto err_out_free_devlink;</div><div class='add'>+	}</div><div class='add'>+	pdsc-&gt;uid = err;</div><div class='add'>+</div><div class='add'>+	/* Query system for DMA addressing limitation for the device. */</div><div class='add'>+	err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(PDS_CORE_ADDR_LEN));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Unable to obtain 64-bit DMA for consistent allocations, aborting: %pe\n",</div><div class='add'>+			ERR_PTR(err));</div><div class='add'>+		goto err_out_free_ida;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Cannot enable PCI device: %pe\n", ERR_PTR(err));</div><div class='add'>+		goto err_out_free_ida;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	if (is_pf)</div><div class='add'>+		err = pdsc_init_pf(pdsc);</div><div class='add'>+	else</div><div class='add'>+		err = pdsc_init_vf(pdsc);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Cannot init device: %pe\n", ERR_PTR(err));</div><div class='add'>+		goto err_out_disable_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clear_bit(PDSC_S_INITING_DRIVER, &amp;pdsc-&gt;state);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out_disable_device:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+err_out_free_ida:</div><div class='add'>+	ida_free(&amp;pdsc_ida, pdsc-&gt;uid);</div><div class='add'>+err_out_free_devlink:</div><div class='add'>+	pdsc_debugfs_del_dev(pdsc);</div><div class='add'>+	devlink_free(dl);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_remove(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = pci_get_drvdata(pdev);</div><div class='add'>+	struct devlink *dl;</div><div class='add'>+</div><div class='add'>+	/* Unhook the registrations first to be sure there</div><div class='add'>+	 * are no requests while we're stopping.</div><div class='add'>+	 */</div><div class='add'>+	dl = priv_to_devlink(pdsc);</div><div class='add'>+	devl_lock(dl);</div><div class='add'>+	devl_unregister(dl);</div><div class='add'>+	if (!pdev-&gt;is_virtfn) {</div><div class='add'>+		if (pdsc-&gt;fw_reporter) {</div><div class='add'>+			devl_health_reporter_destroy(pdsc-&gt;fw_reporter);</div><div class='add'>+			pdsc-&gt;fw_reporter = NULL;</div><div class='add'>+		}</div><div class='add'>+		devl_params_unregister(dl, pdsc_dl_params,</div><div class='add'>+				       ARRAY_SIZE(pdsc_dl_params));</div><div class='add'>+	}</div><div class='add'>+	devl_unlock(dl);</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;is_virtfn) {</div><div class='add'>+		struct pdsc *pf;</div><div class='add'>+</div><div class='add'>+		pf = pdsc_get_pf_struct(pdsc-&gt;pdev);</div><div class='add'>+		if (!IS_ERR(pf)) {</div><div class='add'>+			pdsc_auxbus_dev_del(pdsc, pf, &amp;pf-&gt;vfs[pdsc-&gt;vf_id].padev);</div><div class='add'>+			pf-&gt;vfs[pdsc-&gt;vf_id].vf = NULL;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* Remove the VFs and their aux_bus connections before other</div><div class='add'>+		 * cleanup so that the clients can use the AdminQ to cleanly</div><div class='add'>+		 * shut themselves down.</div><div class='add'>+		 */</div><div class='add'>+		pdsc_sriov_configure(pdev, 0);</div><div class='add'>+		pdsc_auxbus_dev_del(pdsc, pdsc, &amp;pdsc-&gt;padev);</div><div class='add'>+</div><div class='add'>+		timer_shutdown_sync(&amp;pdsc-&gt;wdtimer);</div><div class='add'>+		if (pdsc-&gt;wq)</div><div class='add'>+			destroy_workqueue(pdsc-&gt;wq);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+		set_bit(PDSC_S_STOPPING_DRIVER, &amp;pdsc-&gt;state);</div><div class='add'>+</div><div class='add'>+		pdsc_stop(pdsc);</div><div class='add'>+		pdsc_teardown(pdsc, PDSC_TEARDOWN_REMOVING);</div><div class='add'>+		mutex_unlock(&amp;pdsc-&gt;config_lock);</div><div class='add'>+		mutex_destroy(&amp;pdsc-&gt;config_lock);</div><div class='add'>+		mutex_destroy(&amp;pdsc-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+		pdsc_unmap_bars(pdsc);</div><div class='add'>+		pci_release_regions(pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	ida_free(&amp;pdsc_ida, pdsc-&gt;uid);</div><div class='add'>+	pdsc_debugfs_del_dev(pdsc);</div><div class='add'>+	devlink_free(dl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_stop_health_thread(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	if (pdsc-&gt;pdev-&gt;is_virtfn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	timer_shutdown_sync(&amp;pdsc-&gt;wdtimer);</div><div class='add'>+	if (pdsc-&gt;health_work.func)</div><div class='add'>+		cancel_work_sync(&amp;pdsc-&gt;health_work);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_restart_health_thread(struct pdsc *pdsc)</div><div class='add'>+{</div><div class='add'>+	if (pdsc-&gt;pdev-&gt;is_virtfn)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	timer_setup(&amp;pdsc-&gt;wdtimer, pdsc_wdtimer_cb, 0);</div><div class='add'>+	mod_timer(&amp;pdsc-&gt;wdtimer, jiffies + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_reset_prepare(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	pdsc_stop_health_thread(pdsc);</div><div class='add'>+	pdsc_fw_down(pdsc);</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;is_virtfn) {</div><div class='add'>+		struct pdsc *pf;</div><div class='add'>+</div><div class='add'>+		pf = pdsc_get_pf_struct(pdsc-&gt;pdev);</div><div class='add'>+		if (!IS_ERR(pf))</div><div class='add'>+			pdsc_auxbus_dev_del(pdsc, pf,</div><div class='add'>+					    &amp;pf-&gt;vfs[pdsc-&gt;vf_id].padev);</div><div class='add'>+	} else {</div><div class='add'>+		pdsc_auxbus_dev_del(pdsc, pdsc, &amp;pdsc-&gt;padev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc_unmap_bars(pdsc);</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	if (pci_is_enabled(pdev))</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_reset_done(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = pci_get_drvdata(pdev);</div><div class='add'>+	struct device *dev = pdsc-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = pci_enable_device(pdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Cannot enable PCI device: %pe\n", ERR_PTR(err));</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	if (!pdev-&gt;is_virtfn) {</div><div class='add'>+		pcie_print_link_status(pdsc-&gt;pdev);</div><div class='add'>+</div><div class='add'>+		err = pci_request_regions(pdsc-&gt;pdev, PDS_CORE_DRV_NAME);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(pdsc-&gt;dev, "Cannot request PCI regions: %pe\n",</div><div class='add'>+				ERR_PTR(err));</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = pdsc_map_bars(pdsc);</div><div class='add'>+		if (err)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pdsc_fw_up(pdsc);</div><div class='add'>+	pdsc_restart_health_thread(pdsc);</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;is_virtfn) {</div><div class='add'>+		struct pdsc *pf;</div><div class='add'>+</div><div class='add'>+		pf = pdsc_get_pf_struct(pdsc-&gt;pdev);</div><div class='add'>+		if (!IS_ERR(pf))</div><div class='add'>+			pdsc_auxbus_dev_add(pdsc, pf, PDS_DEV_TYPE_VDPA,</div><div class='add'>+					    &amp;pf-&gt;vfs[pdsc-&gt;vf_id].padev);</div><div class='add'>+	} else {</div><div class='add'>+		pdsc_auxbus_dev_add(pdsc, pdsc, PDS_DEV_TYPE_FWCTL,</div><div class='add'>+				    &amp;pdsc-&gt;padev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static pci_ers_result_t pdsc_pci_error_detected(struct pci_dev *pdev,</div><div class='add'>+						pci_channel_state_t error)</div><div class='add'>+{</div><div class='add'>+	if (error == pci_channel_io_frozen) {</div><div class='add'>+		pdsc_reset_prepare(pdev);</div><div class='add'>+		return PCI_ERS_RESULT_NEED_RESET;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return PCI_ERS_RESULT_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pdsc_pci_error_resume(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct pdsc *pdsc = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (test_bit(PDSC_S_FW_DEAD, &amp;pdsc-&gt;state))</div><div class='add'>+		pci_reset_function_locked(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct pci_error_handlers pdsc_err_handler = {</div><div class='add'>+	/* FLR handling */</div><div class='add'>+	.reset_prepare      = pdsc_reset_prepare,</div><div class='add'>+	.reset_done         = pdsc_reset_done,</div><div class='add'>+</div><div class='add'>+	/* AER handling */</div><div class='add'>+	.error_detected     = pdsc_pci_error_detected,</div><div class='add'>+	.resume             = pdsc_pci_error_resume,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct pci_driver pdsc_driver = {</div><div class='add'>+	.name = PDS_CORE_DRV_NAME,</div><div class='add'>+	.id_table = pdsc_id_table,</div><div class='add'>+	.probe = pdsc_probe,</div><div class='add'>+	.remove = pdsc_remove,</div><div class='add'>+	.sriov_configure = pdsc_sriov_configure,</div><div class='add'>+	.err_handler = &amp;pdsc_err_handler,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void *pdsc_get_pf_struct(struct pci_dev *vf_pdev)</div><div class='add'>+{</div><div class='add'>+	return pci_iov_get_pf_drvdata(vf_pdev, &amp;pdsc_driver);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(pdsc_get_pf_struct);</div><div class='add'>+</div><div class='add'>+static int __init pdsc_init_module(void)</div><div class='add'>+{</div><div class='add'>+	if (strcmp(KBUILD_MODNAME, PDS_CORE_DRV_NAME))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pdsc_debugfs_create();</div><div class='add'>+	return pci_register_driver(&amp;pdsc_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit pdsc_cleanup_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;pdsc_driver);</div><div class='add'>+	pdsc_debugfs_destroy();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(pdsc_init_module);</div><div class='add'>+module_exit(pdsc_cleanup_module);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c<br/>index da7e3d4f4166..c60df4a21158 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/sun3lance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/sun3lance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/sun3lance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/sun3lance.c</a></div><div class='hunk'>@@ -37,12 +37,12 @@ static const char version[] =</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/cacheflush.h&gt;</div><div class='ctx'> #include &lt;asm/setup.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/dvma.h&gt;</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/machines.h&gt;</div><div class='hunk'>@@ -74,6 +74,7 @@ static int lance_debug = 1;</div><div class='ctx'> #endif</div><div class='ctx'> module_param(lance_debug, int, 0);</div><div class='ctx'> MODULE_PARM_DESC(lance_debug, "SUN3 Lance debug level (0-3)");</div><div class='add'>+MODULE_DESCRIPTION("Sun3/Sun3x on-board LANCE Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='ctx'> #define	DPRINTK(n,a) \</div><div class='hunk'>@@ -150,7 +151,7 @@ struct lance_memory {</div><div class='ctx'> struct lance_private {</div><div class='ctx'> 	volatile unsigned short	*iobase;</div><div class='ctx'> 	struct lance_memory	*mem;</div><div class='del'>-     	int new_rx, new_tx;	/* The next free ring entry */</div><div class='add'>+	int new_rx, new_tx;	/* The next free ring entry */</div><div class='ctx'> 	int old_tx, old_rx;     /* ring entry to be processed */</div><div class='ctx'> /* These two must be longs for set_bit() */</div><div class='ctx'> 	long	    tx_full;</div><div class='hunk'>@@ -245,7 +246,7 @@ static void set_multicast_list( struct net_device *dev );</div><div class='ctx'> </div><div class='ctx'> /************************* End of Prototypes **************************/</div><div class='ctx'> </div><div class='del'>-struct net_device * __init sun3lance_probe(int unit)</div><div class='add'>+static struct net_device * __init sun3lance_probe(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	static int found;</div><div class='hunk'>@@ -272,10 +273,6 @@ struct net_device * __init sun3lance_probe(int unit)</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct lance_private));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='del'>-	if (unit &gt;= 0) {</div><div class='del'>-		sprintf(dev-&gt;name, "eth%d", unit);</div><div class='del'>-		netdev_boot_setup_check(dev);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (!lance_probe(dev))</div><div class='ctx'> 		goto out;</div><div class='hunk'>@@ -309,7 +306,6 @@ static int __init lance_probe( struct net_device *dev)</div><div class='ctx'> 	unsigned long ioaddr;</div><div class='ctx'> </div><div class='ctx'> 	struct lance_private	*lp;</div><div class='del'>-	int 			i;</div><div class='ctx'> 	static int 		did_version;</div><div class='ctx'> 	volatile unsigned short *ioaddr_probe;</div><div class='ctx'> 	unsigned short tmp1, tmp2;</div><div class='hunk'>@@ -346,7 +342,7 @@ static int __init lance_probe( struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* XXX - leak? */</div><div class='ctx'> 	MEM = dvma_malloc_align(sizeof(struct lance_memory), 0x10000);</div><div class='del'>-	if (MEM == NULL) {</div><div class='add'>+	if (!MEM) {</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='ctx'> 		iounmap((void __iomem *)ioaddr);</div><div class='ctx'> #endif</div><div class='hunk'>@@ -377,8 +373,7 @@ static int __init lance_probe( struct net_device *dev)</div><div class='ctx'> 		   dev-&gt;irq);</div><div class='ctx'> </div><div class='ctx'> 	/* copy in the ethernet address from the prom */</div><div class='del'>-	for(i = 0; i &lt; 6 ; i++)</div><div class='del'>-	     dev-&gt;dev_addr[i] = idprom-&gt;id_ethaddr[i];</div><div class='add'>+	eth_hw_addr_set(dev, idprom-&gt;id_ethaddr);</div><div class='ctx'> </div><div class='ctx'> 	/* tell the card it's ether address, bytes swapped */</div><div class='ctx'> 	MEM-&gt;init.hwaddr[0] = dev-&gt;dev_addr[1];</div><div class='hunk'>@@ -465,7 +460,7 @@ static void lance_init_ring( struct net_device *dev )</div><div class='ctx'> 	for( i = 0; i &lt; TX_RING_SIZE; i++ ) {</div><div class='ctx'> 		MEM-&gt;tx_head[i].base = dvma_vtob(MEM-&gt;tx_data[i]);</div><div class='ctx'> 		MEM-&gt;tx_head[i].flag = 0;</div><div class='del'>- 		MEM-&gt;tx_head[i].base_hi =</div><div class='add'>+		MEM-&gt;tx_head[i].base_hi =</div><div class='ctx'> 			(dvma_vtob(MEM-&gt;tx_data[i])) &gt;&gt;16;</div><div class='ctx'> 		MEM-&gt;tx_head[i].length = 0;</div><div class='ctx'> 		MEM-&gt;tx_head[i].misc = 0;</div><div class='hunk'>@@ -581,8 +576,8 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	AREG = CSR0;</div><div class='del'>-  	DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",</div><div class='del'>-  				  dev-&gt;name, DREG ));</div><div class='add'>+	DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",</div><div class='add'>+				  dev-&gt;name, DREG ));</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SUN3X</div><div class='ctx'> 	/* this weirdness doesn't appear on sun3... */</div><div class='hunk'>@@ -636,8 +631,8 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Trigger an immediate send poll. */</div><div class='ctx'> 	REGA(CSR0) = CSR0_INEA | CSR0_TDMD | CSR0_STRT;</div><div class='ctx'> 	AREG = CSR0;</div><div class='del'>-  	DPRINTK( 2, ( "%s: lance_start_xmit() exiting, csr0 %4.4x.\n",</div><div class='del'>-  				  dev-&gt;name, DREG ));</div><div class='add'>+	DPRINTK( 2, ( "%s: lance_start_xmit() exiting, csr0 %4.4x.\n",</div><div class='add'>+				  dev-&gt;name, DREG ));</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	lp-&gt;lock = 0;</div><div class='hunk'>@@ -657,16 +652,6 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id)</div><div class='ctx'> 	struct net_device *dev = dev_id;</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> 	int csr0;</div><div class='del'>-	static int in_interrupt;</div><div class='del'>-</div><div class='del'>-	if (dev == NULL) {</div><div class='del'>-		DPRINTK( 1, ( "lance_interrupt(): invalid dev_id\n" ));</div><div class='del'>-		return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (in_interrupt)</div><div class='del'>-		DPRINTK( 2, ( "%s: Re-entering the interrupt handler.\n", dev-&gt;name ));</div><div class='del'>-	in_interrupt = 1;</div><div class='ctx'> </div><div class='ctx'>  still_more:</div><div class='ctx'> 	flush_cache_all();</div><div class='hunk'>@@ -774,7 +759,6 @@ static irqreturn_t lance_interrupt( int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 	DPRINTK( 2, ( "%s: exiting interrupt, csr0=%#04x.\n",</div><div class='ctx'> 				  dev-&gt;name, DREG ));</div><div class='del'>-	in_interrupt = 0;</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -813,7 +797,7 @@ static int lance_rx( struct net_device *dev )</div><div class='ctx'> 			}</div><div class='ctx'> 			else {</div><div class='ctx'> 				skb = netdev_alloc_skb(dev, pkt_len + 2);</div><div class='del'>-				if (skb == NULL) {</div><div class='add'>+				if (!skb) {</div><div class='ctx'> 					dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 					head-&gt;msg_length = 0;</div><div class='ctx'> 					head-&gt;flag |= RMD1_OWN_CHIP;</div><div class='hunk'>@@ -935,17 +919,16 @@ static void set_multicast_list( struct net_device *dev )</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifdef MODULE</div><div class='del'>-</div><div class='ctx'> static struct net_device *sun3lance_dev;</div><div class='ctx'> </div><div class='del'>-int __init init_module(void)</div><div class='add'>+static int __init sun3lance_init(void)</div><div class='ctx'> {</div><div class='del'>-	sun3lance_dev = sun3lance_probe(-1);</div><div class='add'>+	sun3lance_dev = sun3lance_probe();</div><div class='ctx'> 	return PTR_ERR_OR_ZERO(sun3lance_dev);</div><div class='ctx'> }</div><div class='add'>+module_init(sun3lance_init);</div><div class='ctx'> </div><div class='del'>-void __exit cleanup_module(void)</div><div class='add'>+static void __exit sun3lance_cleanup(void)</div><div class='ctx'> {</div><div class='ctx'> 	unregister_netdev(sun3lance_dev);</div><div class='ctx'> #ifdef CONFIG_SUN3</div><div class='hunk'>@@ -953,6 +936,4 @@ void __exit cleanup_module(void)</div><div class='ctx'> #endif</div><div class='ctx'> 	free_netdev(sun3lance_dev);</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#endif /* MODULE */</div><div class='del'>-</div><div class='add'>+module_exit(sun3lance_cleanup);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c<br/>index ebcbf8ca4829..0b273327f5a6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/sunlance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/sunlance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/sunlance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/sunlance.c</a></div><div class='hunk'>@@ -92,12 +92,12 @@ static char lancestr[] = "LANCE";</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;	/* Used by the checksum routines */</div><div class='ctx'> #include &lt;asm/idprom.h&gt;</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='hunk'>@@ -105,14 +105,9 @@ static char lancestr[] = "LANCE";</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sunlance"</div><div class='del'>-#define DRV_VERSION	"2.02"</div><div class='ctx'> #define DRV_RELDATE	"8/24/03"</div><div class='ctx'> #define DRV_AUTHOR	"Miguel de Icaza (miguel@nuclecu.unam.mx)"</div><div class='ctx'> </div><div class='del'>-static char version[] =</div><div class='del'>-	DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " " DRV_AUTHOR "\n";</div><div class='del'>-</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_AUTHOR(DRV_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION("Sun Lance ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='hunk'>@@ -535,7 +530,7 @@ static void lance_rx_dvma(struct net_device *dev)</div><div class='ctx'> 			len = (rd-&gt;mblength &amp; 0xfff) - 4;</div><div class='ctx'> 			skb = netdev_alloc_skb(dev, len + 2);</div><div class='ctx'> </div><div class='del'>-			if (skb == NULL) {</div><div class='add'>+			if (!skb) {</div><div class='ctx'> 				dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 				rd-&gt;mblength = 0;</div><div class='ctx'> 				rd-&gt;rmd1_bits = LE_R1_OWN;</div><div class='hunk'>@@ -705,7 +700,7 @@ static void lance_rx_pio(struct net_device *dev)</div><div class='ctx'> 			len = (sbus_readw(&amp;rd-&gt;mblength) &amp; 0xfff) - 4;</div><div class='ctx'> 			skb = netdev_alloc_skb(dev, len + 2);</div><div class='ctx'> </div><div class='del'>-			if (skb == NULL) {</div><div class='add'>+			if (!skb) {</div><div class='ctx'> 				dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 				sbus_writew(0, &amp;rd-&gt;mblength);</div><div class='ctx'> 				sbus_writeb(LE_R1_OWN, &amp;rd-&gt;rmd1_bits);</div><div class='hunk'>@@ -968,7 +963,7 @@ static int lance_close(struct net_device *dev)</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;multicast_timer);</div><div class='add'>+	timer_delete_sync(&amp;lp-&gt;multicast_timer);</div><div class='ctx'> </div><div class='ctx'> 	STOP_LANCE(lp);</div><div class='ctx'> </div><div class='hunk'>@@ -1097,7 +1092,7 @@ static void lance_piozero(void __iomem *dest, int len)</div><div class='ctx'> 		sbus_writeb(0, piobuf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void lance_tx_timeout(struct net_device *dev)</div><div class='add'>+static void lance_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1251,7 +1246,7 @@ static void lance_set_multicast(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void lance_set_multicast_retry(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct lance_private *lp = from_timer(lp, t, multicast_timer);</div><div class='add'>+	struct lance_private *lp = timer_container_of(lp, t, multicast_timer);</div><div class='ctx'> 	struct net_device *dev = lp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	lance_set_multicast(dev);</div><div class='hunk'>@@ -1281,8 +1276,7 @@ static void lance_free_hwresources(struct lance_private *lp)</div><div class='ctx'> /* Ethtool support... */</div><div class='ctx'> static void sparc_lance_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, "sunlance", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, "2.02", sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, "sunlance", sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops sparc_lance_ethtool_ops = {</div><div class='hunk'>@@ -1305,10 +1299,8 @@ static int sparc_lance_probe_one(struct platform_device *op,</div><div class='ctx'> 				 struct platform_device *lebuffer)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dp = op-&gt;dev.of_node;</div><div class='del'>-	static unsigned version_printed;</div><div class='ctx'> 	struct lance_private *lp;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	int    i;</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct lance_private) + 8);</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -1316,17 +1308,13 @@ static int sparc_lance_probe_one(struct platform_device *op,</div><div class='ctx'> </div><div class='ctx'> 	lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (sparc_lance_debug &amp;&amp; version_printed++ == 0)</div><div class='del'>-		printk (KERN_INFO "%s", version);</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;lp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the IDPROM ethernet address to the device structure, later we</div><div class='ctx'> 	 * will copy the address in the device structure to the lance</div><div class='ctx'> 	 * initialization block.</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = idprom-&gt;id_ethaddr[i];</div><div class='add'>+	eth_hw_addr_set(dev, idprom-&gt;id_ethaddr);</div><div class='ctx'> </div><div class='ctx'> 	/* Get the IO region */</div><div class='ctx'> 	lp-&gt;lregs = of_ioremap(&amp;op-&gt;resource[0], 0,</div><div class='hunk'>@@ -1499,7 +1487,7 @@ static int sunlance_sbus_probe(struct platform_device *op)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sunlance_sbus_remove(struct platform_device *op)</div><div class='add'>+static void sunlance_sbus_remove(struct platform_device *op)</div><div class='ctx'> {</div><div class='ctx'> 	struct lance_private *lp = platform_get_drvdata(op);</div><div class='ctx'> 	struct net_device *net_dev = lp-&gt;dev;</div><div class='hunk'>@@ -1509,8 +1497,6 @@ static int sunlance_sbus_remove(struct platform_device *op)</div><div class='ctx'> 	lance_free_hwresources(lp);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id sunlance_sbus_match[] = {</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/Makefile b/drivers/net/ethernet/amd/xgbe/Makefile<br/>index 620785ffbd51..5992f7fd4d9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/Makefile</a></div><div class='hunk'>@@ -3,9 +3,9 @@ obj-$(CONFIG_AMD_XGBE) += amd-xgbe.o</div><div class='ctx'> </div><div class='ctx'> amd-xgbe-objs := xgbe-main.o xgbe-drv.o xgbe-dev.o \</div><div class='ctx'> 		 xgbe-desc.o xgbe-ethtool.o xgbe-mdio.o \</div><div class='del'>-		 xgbe-ptp.o \</div><div class='add'>+		 xgbe-hwtstamp.o xgbe-ptp.o xgbe-pps.o \</div><div class='ctx'> 		 xgbe-i2c.o xgbe-phy-v1.o xgbe-phy-v2.o \</div><div class='del'>-		 xgbe-platform.o</div><div class='add'>+		 xgbe-platform.o xgbe-selftest.o</div><div class='ctx'> </div><div class='ctx'> amd-xgbe-$(CONFIG_PCI) += xgbe-pci.o</div><div class='ctx'> amd-xgbe-$(CONFIG_AMD_XGBE_DCB) += xgbe-dcb.o</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h<br/>index b40d4377cc71..62b01de93db4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-common.h</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __XGBE_COMMON_H__</div><div class='hunk'>@@ -332,7 +223,15 @@</div><div class='ctx'> #define MAC_TSSR			0x0d20</div><div class='ctx'> #define MAC_TXSNR			0x0d30</div><div class='ctx'> #define MAC_TXSSR			0x0d34</div><div class='del'>-</div><div class='add'>+#define MAC_TICNR                       0x0d58</div><div class='add'>+#define MAC_TICSNR                      0x0d5C</div><div class='add'>+#define MAC_TECNR                       0x0d60</div><div class='add'>+#define MAC_TECSNR                      0x0d64</div><div class='add'>+#define MAC_PPSCR			0x0d70</div><div class='add'>+#define MAC_PPS0_TTSR			0x0d80</div><div class='add'>+#define MAC_PPS0_TTNSR			0x0d84</div><div class='add'>+#define MAC_PPS0_INTERVAL		0x0d88</div><div class='add'>+#define MAC_PPS0_WIDTH			0x0d8C</div><div class='ctx'> #define MAC_QTFCR_INC			4</div><div class='ctx'> #define MAC_MACA_INC			4</div><div class='ctx'> #define MAC_HTR_INC			4</div><div class='hunk'>@@ -340,6 +239,18 @@</div><div class='ctx'> #define MAC_RQC2_INC			4</div><div class='ctx'> #define MAC_RQC2_Q_PER_REG		4</div><div class='ctx'> </div><div class='add'>+/* PPS helpers */</div><div class='add'>+#define PPSEN0				BIT(4)</div><div class='add'>+#define MAC_PPSx_TTSR(x)		((MAC_PPS0_TTSR) + ((x) * 0x10))</div><div class='add'>+#define MAC_PPSx_TTNSR(x)		((MAC_PPS0_TTNSR) + ((x) * 0x10))</div><div class='add'>+#define MAC_PPSx_INTERVAL(x)		((MAC_PPS0_INTERVAL) + ((x) * 0x10))</div><div class='add'>+#define MAC_PPSx_WIDTH(x)		((MAC_PPS0_WIDTH) + ((x) * 0x10))</div><div class='add'>+#define PPS_MAXIDX(x)			((((x) + 1) * 8) - 1)</div><div class='add'>+#define PPS_MINIDX(x)			((x) * 8)</div><div class='add'>+#define XGBE_PPSCMD_STOP		0x5</div><div class='add'>+#define XGBE_PPSCMD_START		0x2</div><div class='add'>+#define XGBE_PPSTARGET_PULSE		0x2</div><div class='add'>+</div><div class='ctx'> /* MAC register entry bit positions and sizes */</div><div class='ctx'> #define MAC_HWF0R_ADDMACADRSEL_INDEX	18</div><div class='ctx'> #define MAC_HWF0R_ADDMACADRSEL_WIDTH	5</div><div class='hunk'>@@ -473,6 +384,10 @@</div><div class='ctx'> #define MAC_RCR_CST_WIDTH		1</div><div class='ctx'> #define MAC_RCR_DCRCC_INDEX		3</div><div class='ctx'> #define MAC_RCR_DCRCC_WIDTH		1</div><div class='add'>+#define MAC_RCR_GPSLCE_INDEX		6</div><div class='add'>+#define MAC_RCR_GPSLCE_WIDTH		1</div><div class='add'>+#define MAC_RCR_WD_INDEX		7</div><div class='add'>+#define MAC_RCR_WD_WIDTH		1</div><div class='ctx'> #define MAC_RCR_HDSMS_INDEX		12</div><div class='ctx'> #define MAC_RCR_HDSMS_WIDTH		3</div><div class='ctx'> #define MAC_RCR_IPC_INDEX		9</div><div class='hunk'>@@ -483,6 +398,8 @@</div><div class='ctx'> #define MAC_RCR_LM_WIDTH		1</div><div class='ctx'> #define MAC_RCR_RE_INDEX		0</div><div class='ctx'> #define MAC_RCR_RE_WIDTH		1</div><div class='add'>+#define MAC_RCR_GPSL_INDEX		16</div><div class='add'>+#define MAC_RCR_GPSL_WIDTH		14</div><div class='ctx'> #define MAC_RFCR_PFCE_INDEX		8</div><div class='ctx'> #define MAC_RFCR_PFCE_WIDTH		1</div><div class='ctx'> #define MAC_RFCR_RFE_INDEX		0</div><div class='hunk'>@@ -521,6 +438,8 @@</div><div class='ctx'> #define MAC_TCR_VNE_WIDTH		1</div><div class='ctx'> #define MAC_TCR_VNM_INDEX		25</div><div class='ctx'> #define MAC_TCR_VNM_WIDTH		1</div><div class='add'>+#define MAC_TCR_JD_INDEX		16</div><div class='add'>+#define MAC_TCR_JD_WIDTH		1</div><div class='ctx'> #define MAC_TIR_TNID_INDEX		0</div><div class='ctx'> #define MAC_TIR_TNID_WIDTH		16</div><div class='ctx'> #define MAC_TSCR_AV8021ASMEN_INDEX	28</div><div class='hunk'>@@ -529,6 +448,8 @@</div><div class='ctx'> #define MAC_TSCR_SNAPTYPSEL_WIDTH	2</div><div class='ctx'> #define MAC_TSCR_TSADDREG_INDEX		5</div><div class='ctx'> #define MAC_TSCR_TSADDREG_WIDTH		1</div><div class='add'>+#define MAC_TSCR_TSUPDT_INDEX		3</div><div class='add'>+#define MAC_TSCR_TSUPDT_WIDTH		1</div><div class='ctx'> #define MAC_TSCR_TSCFUPDT_INDEX		1</div><div class='ctx'> #define MAC_TSCR_TSCFUPDT_WIDTH		1</div><div class='ctx'> #define MAC_TSCR_TSCTRLSSR_INDEX	9</div><div class='hunk'>@@ -557,6 +478,10 @@</div><div class='ctx'> #define MAC_TSSR_TXTSC_WIDTH		1</div><div class='ctx'> #define MAC_TXSNR_TXTSSTSMIS_INDEX	31</div><div class='ctx'> #define MAC_TXSNR_TXTSSTSMIS_WIDTH	1</div><div class='add'>+#define MAC_TICSNR_TSICSNS_INDEX	8</div><div class='add'>+#define MAC_TICSNR_TSICSNS_WIDTH	8</div><div class='add'>+#define MAC_TECSNR_TSECSNS_INDEX	8</div><div class='add'>+#define MAC_TECSNR_TSECSNS_WIDTH	8</div><div class='ctx'> #define MAC_VLANHTR_VLHT_INDEX		0</div><div class='ctx'> #define MAC_VLANHTR_VLHT_WIDTH		16</div><div class='ctx'> #define MAC_VLANIR_VLTI_INDEX		20</div><div class='hunk'>@@ -587,8 +512,10 @@</div><div class='ctx'> #define MAC_VR_SNPSVER_WIDTH		8</div><div class='ctx'> #define MAC_VR_USERVER_INDEX		16</div><div class='ctx'> #define MAC_VR_USERVER_WIDTH		8</div><div class='add'>+#define MAC_PPSx_TTNSR_TRGTBUSY0_INDEX	31</div><div class='add'>+#define MAC_PPSx_TTNSR_TRGTBUSY0_WIDTH	1</div><div class='ctx'> </div><div class='del'>-/* MMC register offsets */</div><div class='add'>+ /* MMC register offsets */</div><div class='ctx'> #define MMC_CR				0x0800</div><div class='ctx'> #define MMC_RISR			0x0804</div><div class='ctx'> #define MMC_TISR			0x0808</div><div class='hunk'>@@ -898,6 +825,13 @@</div><div class='ctx'> #define PCS_V2_WINDOW_SELECT		0x9064</div><div class='ctx'> #define PCS_V2_RV_WINDOW_DEF		0x1060</div><div class='ctx'> #define PCS_V2_RV_WINDOW_SELECT		0x1064</div><div class='add'>+#define PCS_V2_YC_WINDOW_DEF		0x18060</div><div class='add'>+#define PCS_V2_YC_WINDOW_SELECT		0x18064</div><div class='add'>+#define PCS_V3_RN_WINDOW_DEF		0xf8078</div><div class='add'>+#define PCS_V3_RN_WINDOW_SELECT		0xf807c</div><div class='add'>+</div><div class='add'>+#define PCS_RN_SMN_BASE_ADDR		0x11e00000</div><div class='add'>+#define PCS_RN_PORT_ADDR_SIZE		0x100000</div><div class='ctx'> </div><div class='ctx'> /* PCS register entry bit positions and sizes */</div><div class='ctx'> #define PCS_V2_WINDOW_DEF_OFFSET_INDEX	6</div><div class='hunk'>@@ -1030,8 +964,8 @@</div><div class='ctx'> #define XP_PROP_0_PORT_ID_WIDTH			8</div><div class='ctx'> #define XP_PROP_0_PORT_MODE_INDEX		8</div><div class='ctx'> #define XP_PROP_0_PORT_MODE_WIDTH		4</div><div class='del'>-#define XP_PROP_0_PORT_SPEEDS_INDEX		23</div><div class='del'>-#define XP_PROP_0_PORT_SPEEDS_WIDTH		4</div><div class='add'>+#define XP_PROP_0_PORT_SPEEDS_INDEX		22</div><div class='add'>+#define XP_PROP_0_PORT_SPEEDS_WIDTH		5</div><div class='ctx'> #define XP_PROP_1_MAX_RX_DMA_INDEX		24</div><div class='ctx'> #define XP_PROP_1_MAX_RX_DMA_WIDTH		5</div><div class='ctx'> #define XP_PROP_1_MAX_RX_QUEUES_INDEX		8</div><div class='hunk'>@@ -1279,10 +1213,34 @@</div><div class='ctx'> #define MDIO_PMA_10GBR_FECCTRL		0x00ab</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef MDIO_PMA_RX_CTRL1</div><div class='add'>+#define MDIO_PMA_RX_CTRL1		0x8051</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MDIO_PMA_RX_LSTS</div><div class='add'>+#define MDIO_PMA_RX_LSTS		0x018020</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MDIO_PMA_RX_EQ_CTRL4</div><div class='add'>+#define MDIO_PMA_RX_EQ_CTRL4		0x0001805C</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MDIO_PMA_MP_MISC_STS</div><div class='add'>+#define MDIO_PMA_MP_MISC_STS		0x0078</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#ifndef MDIO_PMA_PHY_RX_EQ_CEU</div><div class='add'>+#define MDIO_PMA_PHY_RX_EQ_CEU		0x1800E</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef MDIO_PCS_DIG_CTRL</div><div class='ctx'> #define MDIO_PCS_DIG_CTRL		0x8000</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef MDIO_PCS_DIGITAL_STAT</div><div class='add'>+#define MDIO_PCS_DIGITAL_STAT		0x8010</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef MDIO_AN_XNP</div><div class='ctx'> #define MDIO_AN_XNP			0x0016</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1323,6 +1281,10 @@</div><div class='ctx'> #define MDIO_VEND2_PMA_CDR_CONTROL	0x8056</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifndef MDIO_VEND2_PMA_MISC_CTRL0</div><div class='add'>+#define MDIO_VEND2_PMA_MISC_CTRL0	0x8090</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #ifndef MDIO_CTRL1_SPEED1G</div><div class='ctx'> #define MDIO_CTRL1_SPEED1G		(MDIO_CTRL1_SPEED10G &amp; ~BMCR_SPEED100)</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1343,6 +1305,8 @@</div><div class='ctx'> #define MDIO_VEND2_CTRL1_SS13		BIT(13)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#define XGBE_VEND2_MAC_AUTO_SW		BIT(9)</div><div class='add'>+</div><div class='ctx'> /* MDIO mask values */</div><div class='ctx'> #define XGBE_AN_CL73_INT_CMPLT		BIT(0)</div><div class='ctx'> #define XGBE_AN_CL73_INC_LINK		BIT(1)</div><div class='hunk'>@@ -1358,6 +1322,8 @@</div><div class='ctx'> #define XGBE_KR_TRAINING_ENABLE		BIT(1)</div><div class='ctx'> </div><div class='ctx'> #define XGBE_PCS_CL37_BP		BIT(12)</div><div class='add'>+#define XGBE_PCS_PSEQ_STATE_MASK	0x1c</div><div class='add'>+#define XGBE_PCS_PSEQ_STATE_POWER_GOOD	0x10</div><div class='ctx'> </div><div class='ctx'> #define XGBE_AN_CL37_INT_CMPLT		BIT(0)</div><div class='ctx'> #define XGBE_AN_CL37_INT_MASK		0x01</div><div class='hunk'>@@ -1375,6 +1341,36 @@</div><div class='ctx'> #define XGBE_PMA_CDR_TRACK_EN_OFF	0x00</div><div class='ctx'> #define XGBE_PMA_CDR_TRACK_EN_ON	0x01</div><div class='ctx'> </div><div class='add'>+#define XGBE_PMA_RX_RST_0_MASK		BIT(4)</div><div class='add'>+#define XGBE_PMA_RX_RST_0_RESET_ON	0x10</div><div class='add'>+#define XGBE_PMA_RX_RST_0_RESET_OFF	0x00</div><div class='add'>+</div><div class='add'>+#define XGBE_PMA_RX_SIG_DET_0_MASK	BIT(4)</div><div class='add'>+#define XGBE_PMA_RX_SIG_DET_0_ENABLE	BIT(4)</div><div class='add'>+#define XGBE_PMA_RX_SIG_DET_0_DISABLE	0x0000</div><div class='add'>+</div><div class='add'>+#define XGBE_PMA_RX_VALID_0_MASK	BIT(12)</div><div class='add'>+#define XGBE_PMA_RX_VALID_0_ENABLE	BIT(12)</div><div class='add'>+#define XGBE_PMA_RX_VALID_0_DISABLE	0x0000</div><div class='add'>+</div><div class='add'>+#define XGBE_PMA_RX_AD_REQ_MASK		BIT(12)</div><div class='add'>+#define XGBE_PMA_RX_AD_REQ_ENABLE	BIT(12)</div><div class='add'>+#define XGBE_PMA_RX_AD_REQ_DISABLE	0x0000</div><div class='add'>+</div><div class='add'>+#define XGBE_PMA_RX_ADPT_ACK_MASK	BIT(12)</div><div class='add'>+#define XGBE_PMA_RX_ADPT_ACK		BIT(12)</div><div class='add'>+</div><div class='add'>+#define XGBE_PMA_CFF_UPDTM1_VLD		BIT(8)</div><div class='add'>+#define XGBE_PMA_CFF_UPDT0_VLD		BIT(9)</div><div class='add'>+#define XGBE_PMA_CFF_UPDT1_VLD		BIT(10)</div><div class='add'>+#define XGBE_PMA_CFF_UPDT_MASK		(XGBE_PMA_CFF_UPDTM1_VLD |\</div><div class='add'>+					 XGBE_PMA_CFF_UPDT0_VLD | \</div><div class='add'>+					 XGBE_PMA_CFF_UPDT1_VLD)</div><div class='add'>+</div><div class='add'>+#define XGBE_PMA_PLL_CTRL_MASK		BIT(15)</div><div class='add'>+#define XGBE_PMA_PLL_CTRL_ENABLE	BIT(15)</div><div class='add'>+#define XGBE_PMA_PLL_CTRL_DISABLE	0x0000</div><div class='add'>+</div><div class='ctx'> /* Bit setting and getting macros</div><div class='ctx'>  *  The get macro will extract the current bit field value from within</div><div class='ctx'>  *  the variable</div><div class='hunk'>@@ -1675,20 +1671,21 @@ do {									\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> /* Macros for building, reading or writing register values or bits</div><div class='del'>- * using MDIO.  Different from above because of the use of standardized</div><div class='del'>- * Linux include values.  No shifting is performed with the bit</div><div class='del'>- * operations, everything works on mask values.</div><div class='add'>+ * using MDIO.</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#define XGBE_ADDR_C45 BIT(30)</div><div class='add'>+</div><div class='ctx'> #define XMDIO_READ(_pdata, _mmd, _reg)					\</div><div class='ctx'> 	((_pdata)-&gt;hw_if.read_mmd_regs((_pdata), 0,			\</div><div class='del'>-		MII_ADDR_C45 | (_mmd &lt;&lt; 16) | ((_reg) &amp; 0xffff)))</div><div class='add'>+		XGBE_ADDR_C45 | (_mmd &lt;&lt; 16) | ((_reg) &amp; 0xffff)))</div><div class='ctx'> </div><div class='ctx'> #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask)			\</div><div class='ctx'> 	(XMDIO_READ((_pdata), _mmd, _reg) &amp; _mask)</div><div class='ctx'> </div><div class='ctx'> #define XMDIO_WRITE(_pdata, _mmd, _reg, _val)				\</div><div class='ctx'> 	((_pdata)-&gt;hw_if.write_mmd_regs((_pdata), 0,			\</div><div class='del'>-		MII_ADDR_C45 | (_mmd &lt;&lt; 16) | ((_reg) &amp; 0xffff), (_val)))</div><div class='add'>+		XGBE_ADDR_C45 | (_mmd &lt;&lt; 16) | ((_reg) &amp; 0xffff), (_val)))</div><div class='ctx'> </div><div class='ctx'> #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val)		\</div><div class='ctx'> do {									\</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c<br/>index 895d35639129..1474df5544fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-dcb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-dcb.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -230,7 +121,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, drv, netdev,</div><div class='del'>-		  "cap=%hhu, en=%#hhx, mbc=%hhu, delay=%hhu\n",</div><div class='add'>+		  "cap=%d, en=%#x, mbc=%d, delay=%d\n",</div><div class='ctx'> 		  pfc-&gt;pfc_cap, pfc-&gt;pfc_en, pfc-&gt;mbc, pfc-&gt;delay);</div><div class='ctx'> </div><div class='ctx'> 	/* Check PFC for supported number of traffic classes */</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c b/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c<br/>index b91143947ed2..d9157c4acde9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='hunk'>@@ -438,7 +329,6 @@ static const struct file_operations xi2c_reg_value_fops = {</div><div class='ctx'> </div><div class='ctx'> void xgbe_debugfs_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *pfile;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Set defaults */</div><div class='hunk'>@@ -451,88 +341,48 @@ void xgbe_debugfs_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;xgbe_debugfs = debugfs_create_dir(buf, NULL);</div><div class='del'>-	if (!pdata-&gt;xgbe_debugfs) {</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_create_dir failed\n");</div><div class='del'>-		kfree(buf);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	pfile = debugfs_create_file("xgmac_register", 0600,</div><div class='del'>-				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-				    &amp;xgmac_reg_addr_fops);</div><div class='del'>-	if (!pfile)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_create_file failed\n");</div><div class='add'>+	debugfs_create_file("xgmac_register", 0600, pdata-&gt;xgbe_debugfs, pdata,</div><div class='add'>+			    &amp;xgmac_reg_addr_fops);</div><div class='ctx'> </div><div class='del'>-	pfile = debugfs_create_file("xgmac_register_value", 0600,</div><div class='del'>-				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-				    &amp;xgmac_reg_value_fops);</div><div class='del'>-	if (!pfile)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_create_file failed\n");</div><div class='add'>+	debugfs_create_file("xgmac_register_value", 0600, pdata-&gt;xgbe_debugfs,</div><div class='add'>+			    pdata, &amp;xgmac_reg_value_fops);</div><div class='ctx'> </div><div class='del'>-	pfile = debugfs_create_file("xpcs_mmd", 0600,</div><div class='del'>-				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-				    &amp;xpcs_mmd_fops);</div><div class='del'>-	if (!pfile)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_create_file failed\n");</div><div class='add'>+	debugfs_create_file("xpcs_mmd", 0600, pdata-&gt;xgbe_debugfs, pdata,</div><div class='add'>+			    &amp;xpcs_mmd_fops);</div><div class='ctx'> </div><div class='del'>-	pfile = debugfs_create_file("xpcs_register", 0600,</div><div class='del'>-				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-				    &amp;xpcs_reg_addr_fops);</div><div class='del'>-	if (!pfile)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_create_file failed\n");</div><div class='add'>+	debugfs_create_file("xpcs_register", 0600, pdata-&gt;xgbe_debugfs, pdata,</div><div class='add'>+			    &amp;xpcs_reg_addr_fops);</div><div class='ctx'> </div><div class='del'>-	pfile = debugfs_create_file("xpcs_register_value", 0600,</div><div class='del'>-				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-				    &amp;xpcs_reg_value_fops);</div><div class='del'>-	if (!pfile)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_create_file failed\n");</div><div class='add'>+	debugfs_create_file("xpcs_register_value", 0600, pdata-&gt;xgbe_debugfs,</div><div class='add'>+			    pdata, &amp;xpcs_reg_value_fops);</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;xprop_regs) {</div><div class='del'>-		pfile = debugfs_create_file("xprop_register", 0600,</div><div class='del'>-					    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-					    &amp;xprop_reg_addr_fops);</div><div class='del'>-		if (!pfile)</div><div class='del'>-			netdev_err(pdata-&gt;netdev,</div><div class='del'>-				   "debugfs_create_file failed\n");</div><div class='del'>-</div><div class='del'>-		pfile = debugfs_create_file("xprop_register_value", 0600,</div><div class='del'>-					    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-					    &amp;xprop_reg_value_fops);</div><div class='del'>-		if (!pfile)</div><div class='del'>-			netdev_err(pdata-&gt;netdev,</div><div class='del'>-				   "debugfs_create_file failed\n");</div><div class='add'>+		debugfs_create_file("xprop_register", 0600, pdata-&gt;xgbe_debugfs,</div><div class='add'>+				    pdata, &amp;xprop_reg_addr_fops);</div><div class='add'>+</div><div class='add'>+		debugfs_create_file("xprop_register_value", 0600,</div><div class='add'>+				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='add'>+				    &amp;xprop_reg_value_fops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;xi2c_regs) {</div><div class='del'>-		pfile = debugfs_create_file("xi2c_register", 0600,</div><div class='del'>-					    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-					    &amp;xi2c_reg_addr_fops);</div><div class='del'>-		if (!pfile)</div><div class='del'>-			netdev_err(pdata-&gt;netdev,</div><div class='del'>-				   "debugfs_create_file failed\n");</div><div class='del'>-</div><div class='del'>-		pfile = debugfs_create_file("xi2c_register_value", 0600,</div><div class='del'>-					    pdata-&gt;xgbe_debugfs, pdata,</div><div class='del'>-					    &amp;xi2c_reg_value_fops);</div><div class='del'>-		if (!pfile)</div><div class='del'>-			netdev_err(pdata-&gt;netdev,</div><div class='del'>-				   "debugfs_create_file failed\n");</div><div class='add'>+		debugfs_create_file("xi2c_register", 0600, pdata-&gt;xgbe_debugfs,</div><div class='add'>+				    pdata, &amp;xi2c_reg_addr_fops);</div><div class='add'>+</div><div class='add'>+		debugfs_create_file("xi2c_register_value", 0600,</div><div class='add'>+				    pdata-&gt;xgbe_debugfs, pdata,</div><div class='add'>+				    &amp;xi2c_reg_value_fops);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;vdata-&gt;an_cdr_workaround) {</div><div class='del'>-		pfile = debugfs_create_bool("an_cdr_workaround", 0600,</div><div class='del'>-					    pdata-&gt;xgbe_debugfs,</div><div class='del'>-					    &amp;pdata-&gt;debugfs_an_cdr_workaround);</div><div class='del'>-		if (!pfile)</div><div class='del'>-			netdev_err(pdata-&gt;netdev,</div><div class='del'>-				   "debugfs_create_bool failed\n");</div><div class='del'>-</div><div class='del'>-		pfile = debugfs_create_bool("an_cdr_track_early", 0600,</div><div class='del'>-					    pdata-&gt;xgbe_debugfs,</div><div class='del'>-					    &amp;pdata-&gt;debugfs_an_cdr_track_early);</div><div class='del'>-		if (!pfile)</div><div class='del'>-			netdev_err(pdata-&gt;netdev,</div><div class='del'>-				   "debugfs_create_bool failed\n");</div><div class='add'>+		debugfs_create_bool("an_cdr_workaround", 0600,</div><div class='add'>+				    pdata-&gt;xgbe_debugfs,</div><div class='add'>+				    &amp;pdata-&gt;debugfs_an_cdr_workaround);</div><div class='add'>+</div><div class='add'>+		debugfs_create_bool("an_cdr_track_early", 0600,</div><div class='add'>+				    pdata-&gt;xgbe_debugfs,</div><div class='add'>+				    &amp;pdata-&gt;debugfs_an_cdr_track_early);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -546,25 +396,6 @@ void xgbe_debugfs_exit(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> void xgbe_debugfs_rename(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	struct dentry *pfile;</div><div class='del'>-	char *buf;</div><div class='del'>-</div><div class='del'>-	if (!pdata-&gt;xgbe_debugfs)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	buf = kasprintf(GFP_KERNEL, "amd-xgbe-%s", pdata-&gt;netdev-&gt;name);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!strcmp(pdata-&gt;xgbe_debugfs-&gt;d_name.name, buf))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	pfile = debugfs_rename(pdata-&gt;xgbe_debugfs-&gt;d_parent,</div><div class='del'>-			       pdata-&gt;xgbe_debugfs,</div><div class='del'>-			       pdata-&gt;xgbe_debugfs-&gt;d_parent, buf);</div><div class='del'>-	if (!pfile)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "debugfs_rename failed\n");</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(buf);</div><div class='add'>+	debugfs_change_name(pdata-&gt;xgbe_debugfs,</div><div class='add'>+			    "amd-xgbe-%s", pdata-&gt;netdev-&gt;name);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c<br/>index 533094233659..7c8a19988a52 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-desc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-desc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-desc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-desc.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "xgbe.h"</div><div class='hunk'>@@ -373,8 +264,13 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the header page info */</div><div class='del'>-	xgbe_set_buffer_data(&amp;rdata-&gt;rx.hdr, &amp;ring-&gt;rx_hdr_pa,</div><div class='del'>-			     XGBE_SKB_ALLOC_SIZE);</div><div class='add'>+	if (pdata-&gt;netdev-&gt;features &amp; NETIF_F_RXCSUM) {</div><div class='add'>+		xgbe_set_buffer_data(&amp;rdata-&gt;rx.hdr, &amp;ring-&gt;rx_hdr_pa,</div><div class='add'>+				     XGBE_SKB_ALLOC_SIZE);</div><div class='add'>+	} else {</div><div class='add'>+		xgbe_set_buffer_data(&amp;rdata-&gt;rx.hdr, &amp;ring-&gt;rx_hdr_pa,</div><div class='add'>+				     pdata-&gt;rx_buf_size);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set up the buffer page info */</div><div class='ctx'> 	xgbe_set_buffer_data(&amp;rdata-&gt;rx.buf, &amp;ring-&gt;rx_buf_pa,</div><div class='hunk'>@@ -526,7 +422,7 @@ static int xgbe_map_tx_skb(struct xgbe_channel *channel, struct sk_buff *skb)</div><div class='ctx'> 	struct xgbe_ring *ring = channel-&gt;tx_ring;</div><div class='ctx'> 	struct xgbe_ring_data *rdata;</div><div class='ctx'> 	struct xgbe_packet_data *packet;</div><div class='del'>-	struct skb_frag_struct *frag;</div><div class='add'>+	skb_frag_t *frag;</div><div class='ctx'> 	dma_addr_t skb_dma;</div><div class='ctx'> 	unsigned int start_index, cur_index;</div><div class='ctx'> 	unsigned int offset, tso, vlan, datalen, len;</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c<br/>index d5fd49dd25f3..b646ae575e6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-dev.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='hunk'>@@ -120,9 +11,11 @@</div><div class='ctx'> #include &lt;linux/bitrev.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/crc32poly.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "xgbe.h"</div><div class='ctx'> #include "xgbe-common.h"</div><div class='add'>+#include "xgbe-smn.h"</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int xgbe_get_max_frame(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='hunk'>@@ -318,6 +211,20 @@ static void xgbe_config_sph_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, HDSMS, XGBE_SPH_HDSMS_SIZE);</div><div class='add'>+	pdata-&gt;sph = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgbe_disable_sph_mode(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pdata-&gt;channel_count; i++) {</div><div class='add'>+		if (!pdata-&gt;channel[i]-&gt;rx_ring)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		XGMAC_DMA_IOWRITE_BITS(pdata-&gt;channel[i], DMA_CH_CR, SPH, 0);</div><div class='add'>+	}</div><div class='add'>+	pdata-&gt;sph = false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_write_rss_reg(struct xgbe_prv_data *pdata, unsigned int type,</div><div class='hunk'>@@ -524,19 +431,28 @@ static void xgbe_disable_vxlan(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	netif_dbg(pdata, drv, pdata-&gt;netdev, "VXLAN acceleration disabled\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int xgbe_get_fc_queue_count(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;</div><div class='add'>+</div><div class='add'>+	/* From MAC ver 30H the TFCR is per priority, instead of per queue */</div><div class='add'>+	if (XGMAC_GET_BITS(pdata-&gt;hw_feat.version, MAC_VR, SNPSVER) &gt;= 0x30)</div><div class='add'>+		return max_q_count;</div><div class='add'>+	else</div><div class='add'>+		return min_t(unsigned int, pdata-&gt;tx_q_count, max_q_count);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xgbe_disable_tx_flow_control(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	unsigned int max_q_count, q_count;</div><div class='ctx'> 	unsigned int reg, reg_val;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	unsigned int i, q_count;</div><div class='ctx'> </div><div class='ctx'> 	/* Clear MTL flow control */</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;rx_q_count; i++)</div><div class='ctx'> 		XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, EHFC, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Clear MAC flow control */</div><div class='del'>-	max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;</div><div class='del'>-	q_count = min_t(unsigned int, pdata-&gt;tx_q_count, max_q_count);</div><div class='add'>+	q_count = xgbe_get_fc_queue_count(pdata);</div><div class='ctx'> 	reg = MAC_Q0TFCR;</div><div class='ctx'> 	for (i = 0; i &lt; q_count; i++) {</div><div class='ctx'> 		reg_val = XGMAC_IOREAD(pdata, reg);</div><div class='hunk'>@@ -553,9 +469,8 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct ieee_pfc *pfc = pdata-&gt;pfc;</div><div class='ctx'> 	struct ieee_ets *ets = pdata-&gt;ets;</div><div class='del'>-	unsigned int max_q_count, q_count;</div><div class='ctx'> 	unsigned int reg, reg_val;</div><div class='del'>-	unsigned int i;</div><div class='add'>+	unsigned int i, q_count;</div><div class='ctx'> </div><div class='ctx'> 	/* Set MTL flow control */</div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;rx_q_count; i++) {</div><div class='hunk'>@@ -579,8 +494,7 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set MAC flow control */</div><div class='del'>-	max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES;</div><div class='del'>-	q_count = min_t(unsigned int, pdata-&gt;tx_q_count, max_q_count);</div><div class='add'>+	q_count = xgbe_get_fc_queue_count(pdata);</div><div class='ctx'> 	reg = MAC_Q0TFCR;</div><div class='ctx'> 	for (i = 0; i &lt; q_count; i++) {</div><div class='ctx'> 		reg_val = XGMAC_IOREAD(pdata, reg);</div><div class='hunk'>@@ -807,6 +721,9 @@ static int xgbe_set_speed(struct xgbe_prv_data *pdata, int speed)</div><div class='ctx'> 	unsigned int ss;</div><div class='ctx'> </div><div class='ctx'> 	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		ss = 0x07;</div><div class='add'>+		break;</div><div class='ctx'> 	case SPEED_1000:</div><div class='ctx'> 		ss = 0x03;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1080,7 +997,7 @@ static int xgbe_add_mac_addresses(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_set_mac_address(struct xgbe_prv_data *pdata, u8 *addr)</div><div class='add'>+static int xgbe_set_mac_address(struct xgbe_prv_data *pdata, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mac_addr_hi, mac_addr_lo;</div><div class='ctx'> </div><div class='hunk'>@@ -1140,18 +1057,19 @@ static int xgbe_set_gpio(struct xgbe_prv_data *pdata, unsigned int gpio)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad,</div><div class='del'>-				 int mmd_reg)</div><div class='add'>+static unsigned int xgbe_get_mmd_address(struct xgbe_prv_data *pdata,</div><div class='add'>+					 int mmd_reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int mmd_address, index, offset;</div><div class='del'>-	int mmd_data;</div><div class='del'>-</div><div class='del'>-	if (mmd_reg &amp; MII_ADDR_C45)</div><div class='del'>-		mmd_address = mmd_reg &amp; ~MII_ADDR_C45;</div><div class='del'>-	else</div><div class='del'>-		mmd_address = (pdata-&gt;mdio_mmd &lt;&lt; 16) | (mmd_reg &amp; 0xffff);</div><div class='add'>+	return (mmd_reg &amp; XGBE_ADDR_C45) ?</div><div class='add'>+		mmd_reg &amp; ~XGBE_ADDR_C45 :</div><div class='add'>+		(pdata-&gt;mdio_mmd &lt;&lt; 16) | (mmd_reg &amp; 0xffff);</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static void xgbe_get_pcs_index_and_offset(struct xgbe_prv_data *pdata,</div><div class='add'>+					  unsigned int mmd_address,</div><div class='add'>+					  unsigned int *index,</div><div class='add'>+					  unsigned int *offset)</div><div class='add'>+{</div><div class='ctx'> 	/* The PCS registers are accessed using mmio. The underlying</div><div class='ctx'> 	 * management interface uses indirect addressing to access the MMD</div><div class='ctx'> 	 * register sets. This requires accessing of the PCS register in two</div><div class='hunk'>@@ -1162,8 +1080,98 @@ static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad,</div><div class='ctx'> 	 * offset 1 bit and reading 16 bits of data.</div><div class='ctx'> 	 */</div><div class='ctx'> 	mmd_address &lt;&lt;= 1;</div><div class='del'>-	index = mmd_address &amp; ~pdata-&gt;xpcs_window_mask;</div><div class='del'>-	offset = pdata-&gt;xpcs_window + (mmd_address &amp; pdata-&gt;xpcs_window_mask);</div><div class='add'>+	*index = mmd_address &amp; ~pdata-&gt;xpcs_window_mask;</div><div class='add'>+	*offset = pdata-&gt;xpcs_window + (mmd_address &amp; pdata-&gt;xpcs_window_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_read_mmd_regs_v3(struct xgbe_prv_data *pdata, int prtad,</div><div class='add'>+				 int mmd_reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int mmd_address, index, offset;</div><div class='add'>+	u32 smn_address;</div><div class='add'>+	int mmd_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);</div><div class='add'>+</div><div class='add'>+	xgbe_get_pcs_index_and_offset(pdata, mmd_address, &amp;index, &amp;offset);</div><div class='add'>+</div><div class='add'>+	smn_address = pdata-&gt;smn_base + pdata-&gt;xpcs_window_sel_reg;</div><div class='add'>+	ret = amd_smn_write(0, smn_address, index);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = amd_smn_read(0, pdata-&gt;smn_base + offset, &amp;mmd_data);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mmd_data = (offset % 4) ? FIELD_GET(XGBE_GEN_HI_MASK, mmd_data) :</div><div class='add'>+				  FIELD_GET(XGBE_GEN_LO_MASK, mmd_data);</div><div class='add'>+</div><div class='add'>+	return mmd_data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgbe_write_mmd_regs_v3(struct xgbe_prv_data *pdata, int prtad,</div><div class='add'>+				   int mmd_reg, int mmd_data)</div><div class='add'>+{</div><div class='add'>+	unsigned int pci_mmd_data, hi_mask, lo_mask;</div><div class='add'>+	unsigned int mmd_address, index, offset;</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	u32 smn_address;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev = pdata-&gt;pcidev;</div><div class='add'>+	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);</div><div class='add'>+</div><div class='add'>+	xgbe_get_pcs_index_and_offset(pdata, mmd_address, &amp;index, &amp;offset);</div><div class='add'>+</div><div class='add'>+	smn_address = pdata-&gt;smn_base + pdata-&gt;xpcs_window_sel_reg;</div><div class='add'>+	ret = amd_smn_write(0, smn_address, index);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pci_err(dev, "Failed to write data 0x%x\n", index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = amd_smn_read(0, pdata-&gt;smn_base + offset, &amp;pci_mmd_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pci_err(dev, "Failed to read data\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (offset % 4) {</div><div class='add'>+		hi_mask = FIELD_PREP(XGBE_GEN_HI_MASK, mmd_data);</div><div class='add'>+		lo_mask = FIELD_GET(XGBE_GEN_LO_MASK, pci_mmd_data);</div><div class='add'>+	} else {</div><div class='add'>+		hi_mask = FIELD_PREP(XGBE_GEN_HI_MASK,</div><div class='add'>+				     FIELD_GET(XGBE_GEN_HI_MASK, pci_mmd_data));</div><div class='add'>+		lo_mask = FIELD_GET(XGBE_GEN_LO_MASK, mmd_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_mmd_data = hi_mask | lo_mask;</div><div class='add'>+</div><div class='add'>+	ret = amd_smn_write(0, smn_address, index);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pci_err(dev, "Failed to write data 0x%x\n", index);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = amd_smn_write(0, (pdata-&gt;smn_base + offset), pci_mmd_data);</div><div class='add'>+	if (ret) {</div><div class='add'>+		pci_err(dev, "Failed to write data 0x%x\n", pci_mmd_data);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_read_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad,</div><div class='add'>+				 int mmd_reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int mmd_address, index, offset;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int mmd_data;</div><div class='add'>+</div><div class='add'>+	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);</div><div class='add'>+</div><div class='add'>+	xgbe_get_pcs_index_and_offset(pdata, mmd_address, &amp;index, &amp;offset);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pdata-&gt;xpcs_lock, flags);</div><div class='ctx'> 	XPCS32_IOWRITE(pdata, pdata-&gt;xpcs_window_sel_reg, index);</div><div class='hunk'>@@ -1179,23 +1187,9 @@ static void xgbe_write_mmd_regs_v2(struct xgbe_prv_data *pdata, int prtad,</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int mmd_address, index, offset;</div><div class='ctx'> </div><div class='del'>-	if (mmd_reg &amp; MII_ADDR_C45)</div><div class='del'>-		mmd_address = mmd_reg &amp; ~MII_ADDR_C45;</div><div class='del'>-	else</div><div class='del'>-		mmd_address = (pdata-&gt;mdio_mmd &lt;&lt; 16) | (mmd_reg &amp; 0xffff);</div><div class='add'>+	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);</div><div class='ctx'> </div><div class='del'>-	/* The PCS registers are accessed using mmio. The underlying</div><div class='del'>-	 * management interface uses indirect addressing to access the MMD</div><div class='del'>-	 * register sets. This requires accessing of the PCS register in two</div><div class='del'>-	 * phases, an address phase and a data phase.</div><div class='del'>-	 *</div><div class='del'>-	 * The mmio interface is based on 16-bit offsets and values. All</div><div class='del'>-	 * register offsets must therefore be adjusted by left shifting the</div><div class='del'>-	 * offset 1 bit and writing 16 bits of data.</div><div class='del'>-	 */</div><div class='del'>-	mmd_address &lt;&lt;= 1;</div><div class='del'>-	index = mmd_address &amp; ~pdata-&gt;xpcs_window_mask;</div><div class='del'>-	offset = pdata-&gt;xpcs_window + (mmd_address &amp; pdata-&gt;xpcs_window_mask);</div><div class='add'>+	xgbe_get_pcs_index_and_offset(pdata, mmd_address, &amp;index, &amp;offset);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pdata-&gt;xpcs_lock, flags);</div><div class='ctx'> 	XPCS32_IOWRITE(pdata, pdata-&gt;xpcs_window_sel_reg, index);</div><div class='hunk'>@@ -1210,10 +1204,7 @@ static int xgbe_read_mmd_regs_v1(struct xgbe_prv_data *pdata, int prtad,</div><div class='ctx'> 	unsigned int mmd_address;</div><div class='ctx'> 	int mmd_data;</div><div class='ctx'> </div><div class='del'>-	if (mmd_reg &amp; MII_ADDR_C45)</div><div class='del'>-		mmd_address = mmd_reg &amp; ~MII_ADDR_C45;</div><div class='del'>-	else</div><div class='del'>-		mmd_address = (pdata-&gt;mdio_mmd &lt;&lt; 16) | (mmd_reg &amp; 0xffff);</div><div class='add'>+	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* The PCS registers are accessed using mmio. The underlying APB3</div><div class='ctx'> 	 * management interface uses indirect addressing to access the MMD</div><div class='hunk'>@@ -1238,10 +1229,7 @@ static void xgbe_write_mmd_regs_v1(struct xgbe_prv_data *pdata, int prtad,</div><div class='ctx'> 	unsigned int mmd_address;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	if (mmd_reg &amp; MII_ADDR_C45)</div><div class='del'>-		mmd_address = mmd_reg &amp; ~MII_ADDR_C45;</div><div class='del'>-	else</div><div class='del'>-		mmd_address = (pdata-&gt;mdio_mmd &lt;&lt; 16) | (mmd_reg &amp; 0xffff);</div><div class='add'>+	mmd_address = xgbe_get_mmd_address(pdata, mmd_reg);</div><div class='ctx'> </div><div class='ctx'> 	/* The PCS registers are accessed using mmio. The underlying APB3</div><div class='ctx'> 	 * management interface uses indirect addressing to access the MMD</div><div class='hunk'>@@ -1268,6 +1256,9 @@ static int xgbe_read_mmd_regs(struct xgbe_prv_data *pdata, int prtad,</div><div class='ctx'> 	case XGBE_XPCS_ACCESS_V2:</div><div class='ctx'> 	default:</div><div class='ctx'> 		return xgbe_read_mmd_regs_v2(pdata, prtad, mmd_reg);</div><div class='add'>+</div><div class='add'>+	case XGBE_XPCS_ACCESS_V3:</div><div class='add'>+		return xgbe_read_mmd_regs_v3(pdata, prtad, mmd_reg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1278,17 +1269,29 @@ static void xgbe_write_mmd_regs(struct xgbe_prv_data *pdata, int prtad,</div><div class='ctx'> 	case XGBE_XPCS_ACCESS_V1:</div><div class='ctx'> 		return xgbe_write_mmd_regs_v1(pdata, prtad, mmd_reg, mmd_data);</div><div class='ctx'> </div><div class='add'>+	case XGBE_XPCS_ACCESS_V3:</div><div class='add'>+		return xgbe_write_mmd_regs_v3(pdata, prtad, mmd_reg, mmd_data);</div><div class='add'>+</div><div class='ctx'> 	case XGBE_XPCS_ACCESS_V2:</div><div class='ctx'> 	default:</div><div class='ctx'> 		return xgbe_write_mmd_regs_v2(pdata, prtad, mmd_reg, mmd_data);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int xgbe_create_mdio_sca(int port, int reg)</div><div class='add'>+static unsigned int xgbe_create_mdio_sca_c22(int port, int reg)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mdio_sca, da;</div><div class='add'>+	unsigned int mdio_sca;</div><div class='add'>+</div><div class='add'>+	mdio_sca = 0;</div><div class='add'>+	XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, RA, reg);</div><div class='add'>+	XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, PA, port);</div><div class='add'>+</div><div class='add'>+	return mdio_sca;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	da = (reg &amp; MII_ADDR_C45) ? reg &gt;&gt; 16 : 0;</div><div class='add'>+static unsigned int xgbe_create_mdio_sca_c45(int port, unsigned int da, int reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int mdio_sca;</div><div class='ctx'> </div><div class='ctx'> 	mdio_sca = 0;</div><div class='ctx'> 	XGMAC_SET_BITS(mdio_sca, MAC_MDIOSCAR, RA, reg);</div><div class='hunk'>@@ -1298,14 +1301,13 @@ static unsigned int xgbe_create_mdio_sca(int port, int reg)</div><div class='ctx'> 	return mdio_sca;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_write_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,</div><div class='del'>-				   int reg, u16 val)</div><div class='add'>+static int xgbe_write_ext_mii_regs(struct xgbe_prv_data *pdata,</div><div class='add'>+				   unsigned int mdio_sca, u16 val)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mdio_sca, mdio_sccd;</div><div class='add'>+	unsigned int mdio_sccd;</div><div class='ctx'> </div><div class='ctx'> 	reinit_completion(&amp;pdata-&gt;mdio_complete);</div><div class='ctx'> </div><div class='del'>-	mdio_sca = xgbe_create_mdio_sca(addr, reg);</div><div class='ctx'> 	XGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca);</div><div class='ctx'> </div><div class='ctx'> 	mdio_sccd = 0;</div><div class='hunk'>@@ -1322,14 +1324,33 @@ static int xgbe_write_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_read_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,</div><div class='del'>-				  int reg)</div><div class='add'>+static int xgbe_write_ext_mii_regs_c22(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				       int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	unsigned int mdio_sca;</div><div class='add'>+</div><div class='add'>+	mdio_sca = xgbe_create_mdio_sca_c22(addr, reg);</div><div class='add'>+</div><div class='add'>+	return xgbe_write_ext_mii_regs(pdata, mdio_sca, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_write_ext_mii_regs_c45(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				       int devad, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	unsigned int mdio_sca;</div><div class='add'>+</div><div class='add'>+	mdio_sca = xgbe_create_mdio_sca_c45(addr, devad, reg);</div><div class='add'>+</div><div class='add'>+	return xgbe_write_ext_mii_regs(pdata, mdio_sca, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_read_ext_mii_regs(struct xgbe_prv_data *pdata,</div><div class='add'>+				  unsigned int mdio_sca)</div><div class='ctx'> {</div><div class='del'>-	unsigned int mdio_sca, mdio_sccd;</div><div class='add'>+	unsigned int mdio_sccd;</div><div class='ctx'> </div><div class='ctx'> 	reinit_completion(&amp;pdata-&gt;mdio_complete);</div><div class='ctx'> </div><div class='del'>-	mdio_sca = xgbe_create_mdio_sca(addr, reg);</div><div class='ctx'> 	XGMAC_IOWRITE(pdata, MAC_MDIOSCAR, mdio_sca);</div><div class='ctx'> </div><div class='ctx'> 	mdio_sccd = 0;</div><div class='hunk'>@@ -1345,6 +1366,26 @@ static int xgbe_read_ext_mii_regs(struct xgbe_prv_data *pdata, int addr,</div><div class='ctx'> 	return XGMAC_IOREAD_BITS(pdata, MAC_MDIOSCCDR, DATA);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int xgbe_read_ext_mii_regs_c22(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				      int reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int mdio_sca;</div><div class='add'>+</div><div class='add'>+	mdio_sca = xgbe_create_mdio_sca_c22(addr, reg);</div><div class='add'>+</div><div class='add'>+	return xgbe_read_ext_mii_regs(pdata, mdio_sca);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_read_ext_mii_regs_c45(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				      int devad, int reg)</div><div class='add'>+{</div><div class='add'>+	unsigned int mdio_sca;</div><div class='add'>+</div><div class='add'>+	mdio_sca = xgbe_create_mdio_sca_c45(addr, devad, reg);</div><div class='add'>+</div><div class='add'>+	return xgbe_read_ext_mii_regs(pdata, mdio_sca);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int xgbe_set_ext_mii_mode(struct xgbe_prv_data *pdata, unsigned int port,</div><div class='ctx'> 				 enum xgbe_mdio_mode mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -1519,125 +1560,6 @@ static void xgbe_rx_desc_init(struct xgbe_channel *channel)</div><div class='ctx'> 	DBGPR("&lt;--rx_desc_init\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_update_tstamp_addend(struct xgbe_prv_data *pdata,</div><div class='del'>-				      unsigned int addend)</div><div class='del'>-{</div><div class='del'>-	unsigned int count = 10000;</div><div class='del'>-</div><div class='del'>-	/* Set the addend register value and tell the device */</div><div class='del'>-	XGMAC_IOWRITE(pdata, MAC_TSAR, addend);</div><div class='del'>-	XGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSADDREG, 1);</div><div class='del'>-</div><div class='del'>-	/* Wait for addend update to complete */</div><div class='del'>-	while (--count &amp;&amp; XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSADDREG))</div><div class='del'>-		udelay(5);</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		netdev_err(pdata-&gt;netdev,</div><div class='del'>-			   "timed out updating timestamp addend register\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_set_tstamp_time(struct xgbe_prv_data *pdata, unsigned int sec,</div><div class='del'>-				 unsigned int nsec)</div><div class='del'>-{</div><div class='del'>-	unsigned int count = 10000;</div><div class='del'>-</div><div class='del'>-	/* Set the time values and tell the device */</div><div class='del'>-	XGMAC_IOWRITE(pdata, MAC_STSUR, sec);</div><div class='del'>-	XGMAC_IOWRITE(pdata, MAC_STNUR, nsec);</div><div class='del'>-	XGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSINIT, 1);</div><div class='del'>-</div><div class='del'>-	/* Wait for time update to complete */</div><div class='del'>-	while (--count &amp;&amp; XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSINIT))</div><div class='del'>-		udelay(5);</div><div class='del'>-</div><div class='del'>-	if (!count)</div><div class='del'>-		netdev_err(pdata-&gt;netdev, "timed out initializing timestamp\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 xgbe_get_tstamp_time(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	u64 nsec;</div><div class='del'>-</div><div class='del'>-	nsec = XGMAC_IOREAD(pdata, MAC_STSR);</div><div class='del'>-	nsec *= NSEC_PER_SEC;</div><div class='del'>-	nsec += XGMAC_IOREAD(pdata, MAC_STNR);</div><div class='del'>-</div><div class='del'>-	return nsec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u64 xgbe_get_tx_tstamp(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	unsigned int tx_snr, tx_ssr;</div><div class='del'>-	u64 nsec;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vdata-&gt;tx_tstamp_workaround) {</div><div class='del'>-		tx_snr = XGMAC_IOREAD(pdata, MAC_TXSNR);</div><div class='del'>-		tx_ssr = XGMAC_IOREAD(pdata, MAC_TXSSR);</div><div class='del'>-	} else {</div><div class='del'>-		tx_ssr = XGMAC_IOREAD(pdata, MAC_TXSSR);</div><div class='del'>-		tx_snr = XGMAC_IOREAD(pdata, MAC_TXSNR);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (XGMAC_GET_BITS(tx_snr, MAC_TXSNR, TXTSSTSMIS))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	nsec = tx_ssr;</div><div class='del'>-	nsec *= NSEC_PER_SEC;</div><div class='del'>-	nsec += tx_snr;</div><div class='del'>-</div><div class='del'>-	return nsec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_get_rx_tstamp(struct xgbe_packet_data *packet,</div><div class='del'>-			       struct xgbe_ring_desc *rdesc)</div><div class='del'>-{</div><div class='del'>-	u64 nsec;</div><div class='del'>-</div><div class='del'>-	if (XGMAC_GET_BITS_LE(rdesc-&gt;desc3, RX_CONTEXT_DESC3, TSA) &amp;&amp;</div><div class='del'>-	    !XGMAC_GET_BITS_LE(rdesc-&gt;desc3, RX_CONTEXT_DESC3, TSD)) {</div><div class='del'>-		nsec = le32_to_cpu(rdesc-&gt;desc1);</div><div class='del'>-		nsec &lt;&lt;= 32;</div><div class='del'>-		nsec |= le32_to_cpu(rdesc-&gt;desc0);</div><div class='del'>-		if (nsec != 0xffffffffffffffffULL) {</div><div class='del'>-			packet-&gt;rx_tstamp = nsec;</div><div class='del'>-			XGMAC_SET_BITS(packet-&gt;attributes, RX_PACKET_ATTRIBUTES,</div><div class='del'>-				       RX_TSTAMP, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xgbe_config_tstamp(struct xgbe_prv_data *pdata,</div><div class='del'>-			      unsigned int mac_tscr)</div><div class='del'>-{</div><div class='del'>-	/* Set one nano-second accuracy */</div><div class='del'>-	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCTRLSSR, 1);</div><div class='del'>-</div><div class='del'>-	/* Set fine timestamp update */</div><div class='del'>-	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCFUPDT, 1);</div><div class='del'>-</div><div class='del'>-	/* Overwrite earlier timestamps */</div><div class='del'>-	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TXTSSTSM, 1);</div><div class='del'>-</div><div class='del'>-	XGMAC_IOWRITE(pdata, MAC_TSCR, mac_tscr);</div><div class='del'>-</div><div class='del'>-	/* Exit if timestamping is not enabled */</div><div class='del'>-	if (!XGMAC_GET_BITS(mac_tscr, MAC_TSCR, TSENA))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Initialize time registers */</div><div class='del'>-	XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SSINC, XGBE_TSTAMP_SSINC);</div><div class='del'>-	XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SNSINC, XGBE_TSTAMP_SNSINC);</div><div class='del'>-	xgbe_update_tstamp_addend(pdata, pdata-&gt;tstamp_addend);</div><div class='del'>-	xgbe_set_tstamp_time(pdata, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* Initialize the timecounter */</div><div class='del'>-	timecounter_init(&amp;pdata-&gt;tstamp_tc, &amp;pdata-&gt;tstamp_cc,</div><div class='del'>-			 ktime_to_ns(ktime_get_real()));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void xgbe_tx_start_xmit(struct xgbe_channel *channel,</div><div class='ctx'> 			       struct xgbe_ring *ring)</div><div class='ctx'> {</div><div class='hunk'>@@ -2811,9 +2733,19 @@ static void xgbe_config_jumbo_enable(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int val;</div><div class='ctx'> </div><div class='del'>-	val = (pdata-&gt;netdev-&gt;mtu &gt; XGMAC_STD_PACKET_MTU) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, JE, val);</div><div class='add'>+	if (pdata-&gt;netdev-&gt;mtu &gt; XGMAC_JUMBO_PACKET_MTU) {</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_RCR, GPSL,</div><div class='add'>+				   XGMAC_GIANT_PACKET_MTU);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_RCR, WD, 1);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_TCR, JD, 1);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_RCR, GPSLCE, 1);</div><div class='add'>+	} else {</div><div class='add'>+		val = pdata-&gt;netdev-&gt;mtu &gt; XGMAC_STD_PACKET_MTU ? 1 : 0;</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_RCR, GPSLCE, 0);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_RCR, WD, 0);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_TCR, JD, 0);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_RCR, JE, val);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_config_mac_speed(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -3488,8 +3420,12 @@ static int xgbe_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_config_tx_coalesce(pdata);</div><div class='ctx'> 	xgbe_config_rx_buffer_size(pdata);</div><div class='ctx'> 	xgbe_config_tso_mode(pdata);</div><div class='del'>-	xgbe_config_sph_mode(pdata);</div><div class='del'>-	xgbe_config_rss(pdata);</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;netdev-&gt;features &amp; NETIF_F_RXCSUM) {</div><div class='add'>+		xgbe_config_sph_mode(pdata);</div><div class='add'>+		xgbe_config_rss(pdata);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	desc_if-&gt;wrapper_tx_desc_init(pdata);</div><div class='ctx'> 	desc_if-&gt;wrapper_rx_desc_init(pdata);</div><div class='ctx'> 	xgbe_enable_dma_interrupts(pdata);</div><div class='hunk'>@@ -3558,8 +3494,10 @@ void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)</div><div class='ctx'> 	hw_if-&gt;set_speed = xgbe_set_speed;</div><div class='ctx'> </div><div class='ctx'> 	hw_if-&gt;set_ext_mii_mode = xgbe_set_ext_mii_mode;</div><div class='del'>-	hw_if-&gt;read_ext_mii_regs = xgbe_read_ext_mii_regs;</div><div class='del'>-	hw_if-&gt;write_ext_mii_regs = xgbe_write_ext_mii_regs;</div><div class='add'>+	hw_if-&gt;read_ext_mii_regs_c22 = xgbe_read_ext_mii_regs_c22;</div><div class='add'>+	hw_if-&gt;write_ext_mii_regs_c22 = xgbe_write_ext_mii_regs_c22;</div><div class='add'>+	hw_if-&gt;read_ext_mii_regs_c45 = xgbe_read_ext_mii_regs_c45;</div><div class='add'>+	hw_if-&gt;write_ext_mii_regs_c45 = xgbe_write_ext_mii_regs_c45;</div><div class='ctx'> </div><div class='ctx'> 	hw_if-&gt;set_gpio = xgbe_set_gpio;</div><div class='ctx'> 	hw_if-&gt;clr_gpio = xgbe_clr_gpio;</div><div class='hunk'>@@ -3616,13 +3554,6 @@ void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)</div><div class='ctx'> 	hw_if-&gt;rx_mmc_int = xgbe_rx_mmc_int;</div><div class='ctx'> 	hw_if-&gt;read_mmc_stats = xgbe_read_mmc_stats;</div><div class='ctx'> </div><div class='del'>-	/* For PTP config */</div><div class='del'>-	hw_if-&gt;config_tstamp = xgbe_config_tstamp;</div><div class='del'>-	hw_if-&gt;update_tstamp_addend = xgbe_update_tstamp_addend;</div><div class='del'>-	hw_if-&gt;set_tstamp_time = xgbe_set_tstamp_time;</div><div class='del'>-	hw_if-&gt;get_tstamp_time = xgbe_get_tstamp_time;</div><div class='del'>-	hw_if-&gt;get_tx_tstamp = xgbe_get_tx_tstamp;</div><div class='del'>-</div><div class='ctx'> 	/* For Data Center Bridging config */</div><div class='ctx'> 	hw_if-&gt;config_tc = xgbe_config_tc;</div><div class='ctx'> 	hw_if-&gt;config_dcb_tc = xgbe_config_dcb_tc;</div><div class='hunk'>@@ -3643,5 +3574,26 @@ void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)</div><div class='ctx'> 	hw_if-&gt;disable_vxlan = xgbe_disable_vxlan;</div><div class='ctx'> 	hw_if-&gt;set_vxlan_id = xgbe_set_vxlan_id;</div><div class='ctx'> </div><div class='add'>+	/* For Split Header*/</div><div class='add'>+	hw_if-&gt;enable_sph = xgbe_config_sph_mode;</div><div class='add'>+	hw_if-&gt;disable_sph = xgbe_disable_sph_mode;</div><div class='add'>+</div><div class='ctx'> 	DBGPR("&lt;--xgbe_init_function_ptrs\n");</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int xgbe_enable_mac_loopback(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	/* Enable MAC loopback mode */</div><div class='add'>+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, LM, 1);</div><div class='add'>+</div><div class='add'>+	/* Wait for loopback to stabilize */</div><div class='add'>+	usleep_range(10, 15);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_disable_mac_loopback(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	/* Disable MAC loopback mode */</div><div class='add'>+	XGMAC_IOWRITE_BITS(pdata, MAC_RCR, LM, 0);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c<br/>index 3dd0cecddba8..3ddd896d6987 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-drv.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-drv.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-drv.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -403,9 +294,9 @@ static bool xgbe_ecc_ded(struct xgbe_prv_data *pdata, unsigned long *period,</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_ecc_isr_task(unsigned long data)</div><div class='add'>+static void xgbe_ecc_isr_bh_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;</div><div class='add'>+	struct xgbe_prv_data *pdata = from_work(pdata, work, ecc_bh_work);</div><div class='ctx'> 	unsigned int ecc_isr;</div><div class='ctx'> 	bool stop = false;</div><div class='ctx'> </div><div class='hunk'>@@ -465,21 +356,22 @@ static irqreturn_t xgbe_ecc_isr(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = data;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;isr_as_tasklet)</div><div class='del'>-		tasklet_schedule(&amp;pdata-&gt;tasklet_ecc);</div><div class='add'>+	if (pdata-&gt;isr_as_bh_work)</div><div class='add'>+		queue_work(system_bh_wq, &amp;pdata-&gt;ecc_bh_work);</div><div class='ctx'> 	else</div><div class='del'>-		xgbe_ecc_isr_task((unsigned long)pdata);</div><div class='add'>+		xgbe_ecc_isr_bh_work(&amp;pdata-&gt;ecc_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_isr_task(unsigned long data)</div><div class='add'>+static void xgbe_isr_bh_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;</div><div class='add'>+	struct xgbe_prv_data *pdata = from_work(pdata, work, dev_bh_work);</div><div class='add'>+	unsigned int mac_isr, mac_tssr, mac_mdioisr;</div><div class='ctx'> 	struct xgbe_hw_if *hw_if = &amp;pdata-&gt;hw_if;</div><div class='del'>-	struct xgbe_channel *channel;</div><div class='add'>+	bool per_ch_irq, ti, ri, rbu, fbe;</div><div class='ctx'> 	unsigned int dma_isr, dma_ch_isr;</div><div class='del'>-	unsigned int mac_isr, mac_tssr, mac_mdioisr;</div><div class='add'>+	struct xgbe_channel *channel;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/* The DMA interrupt status register also reports MAC and MTL</div><div class='hunk'>@@ -493,43 +385,73 @@ static void xgbe_isr_task(unsigned long data)</div><div class='ctx'> 	netif_dbg(pdata, intr, pdata-&gt;netdev, "DMA_ISR=%#010x\n", dma_isr);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;channel_count; i++) {</div><div class='add'>+		bool schedule_napi = false;</div><div class='add'>+		struct napi_struct *napi;</div><div class='add'>+</div><div class='ctx'> 		if (!(dma_isr &amp; (1 &lt;&lt; i)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		channel = pdata-&gt;channel[i];</div><div class='ctx'> </div><div class='ctx'> 		dma_ch_isr = XGMAC_DMA_IOREAD(channel, DMA_CH_SR);</div><div class='add'>+</div><div class='add'>+		/* Precompute flags once */</div><div class='add'>+		ti  = !!XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, TI);</div><div class='add'>+		ri  = !!XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RI);</div><div class='add'>+		rbu = !!XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RBU);</div><div class='add'>+		fbe = !!XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, FBE);</div><div class='add'>+</div><div class='ctx'> 		netif_dbg(pdata, intr, pdata-&gt;netdev, "DMA_CH%u_ISR=%#010x\n",</div><div class='ctx'> 			  i, dma_ch_isr);</div><div class='ctx'> </div><div class='del'>-		/* The TI or RI interrupt bits may still be set even if using</div><div class='del'>-		 * per channel DMA interrupts. Check to be sure those are not</div><div class='del'>-		 * enabled before using the private data napi structure.</div><div class='add'>+		per_ch_irq = pdata-&gt;per_channel_irq;</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * Decide which NAPI to use and whether to schedule:</div><div class='add'>+		 * - When not using per-channel IRQs: schedule on global NAPI</div><div class='add'>+		 *   if TI or RI are set.</div><div class='add'>+		 * - RBU should also trigger NAPI (either per-channel or global)</div><div class='add'>+		 *   to allow refill.</div><div class='ctx'> 		 */</div><div class='del'>-		if (!pdata-&gt;per_channel_irq &amp;&amp;</div><div class='del'>-		    (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, TI) ||</div><div class='del'>-		     XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RI))) {</div><div class='del'>-			if (napi_schedule_prep(&amp;pdata-&gt;napi)) {</div><div class='del'>-				/* Disable Tx and Rx interrupts */</div><div class='del'>-				xgbe_disable_rx_tx_ints(pdata);</div><div class='add'>+		if (!per_ch_irq &amp;&amp; (ti || ri))</div><div class='add'>+			schedule_napi = true;</div><div class='add'>+</div><div class='add'>+		if (rbu) {</div><div class='add'>+			schedule_napi = true;</div><div class='add'>+			pdata-&gt;ext_stats.rx_buffer_unavailable++;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-				/* Turn on polling */</div><div class='del'>-				__napi_schedule_irqoff(&amp;pdata-&gt;napi);</div><div class='add'>+		napi = per_ch_irq ? &amp;channel-&gt;napi : &amp;pdata-&gt;napi;</div><div class='add'>+</div><div class='add'>+		if (schedule_napi &amp;&amp; napi_schedule_prep(napi)) {</div><div class='add'>+			/* Disable interrupts appropriately before polling */</div><div class='add'>+			if (per_ch_irq) {</div><div class='add'>+				if (pdata-&gt;channel_irq_mode)</div><div class='add'>+					xgbe_disable_rx_tx_int(pdata, channel);</div><div class='add'>+				else</div><div class='add'>+					disable_irq_nosync(channel-&gt;dma_irq);</div><div class='add'>+			} else {</div><div class='add'>+				xgbe_disable_rx_tx_ints(pdata);</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			/* Turn on polling */</div><div class='add'>+			__napi_schedule(napi);</div><div class='ctx'> 		} else {</div><div class='del'>-			/* Don't clear Rx/Tx status if doing per channel DMA</div><div class='del'>-			 * interrupts, these will be cleared by the ISR for</div><div class='del'>-			 * per channel DMA interrupts.</div><div class='add'>+			/*</div><div class='add'>+			 * Don't clear Rx/Tx status if doing per-channel DMA</div><div class='add'>+			 * interrupts; those bits will be serviced/cleared by</div><div class='add'>+			 * the per-channel ISR/NAPI. In non-per-channel mode</div><div class='add'>+			 * when we're not scheduling NAPI here, ensure we don't</div><div class='add'>+			 * accidentally clear TI/RI in HW: zero them in the</div><div class='add'>+			 * local copy so that the eventual write-back does not</div><div class='add'>+			 * clear TI/RI.</div><div class='ctx'> 			 */</div><div class='ctx'> 			XGMAC_SET_BITS(dma_ch_isr, DMA_CH_SR, TI, 0);</div><div class='ctx'> 			XGMAC_SET_BITS(dma_ch_isr, DMA_CH_SR, RI, 0);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, RBU))</div><div class='del'>-			pdata-&gt;ext_stats.rx_buffer_unavailable++;</div><div class='del'>-</div><div class='ctx'> 		/* Restart the device on a Fatal Bus Error */</div><div class='del'>-		if (XGMAC_GET_BITS(dma_ch_isr, DMA_CH_SR, FBE))</div><div class='add'>+		if (fbe)</div><div class='ctx'> 			schedule_work(&amp;pdata-&gt;restart_work);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear interrupt signals */</div><div class='hunk'>@@ -557,7 +479,7 @@ static void xgbe_isr_task(unsigned long data)</div><div class='ctx'> 			if (XGMAC_GET_BITS(mac_tssr, MAC_TSSR, TXTSC)) {</div><div class='ctx'> 				/* Read Tx Timestamp to clear interrupt */</div><div class='ctx'> 				pdata-&gt;tx_tstamp =</div><div class='del'>-					hw_if-&gt;get_tx_tstamp(pdata);</div><div class='add'>+					xgbe_get_tx_tstamp(pdata);</div><div class='ctx'> 				queue_work(pdata-&gt;dev_workqueue,</div><div class='ctx'> 					   &amp;pdata-&gt;tx_tstamp_work);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -582,7 +504,7 @@ isr_done:</div><div class='ctx'> </div><div class='ctx'> 	/* If there is not a separate ECC irq, handle it here */</div><div class='ctx'> 	if (pdata-&gt;vdata-&gt;ecc_support &amp;&amp; (pdata-&gt;dev_irq == pdata-&gt;ecc_irq))</div><div class='del'>-		xgbe_ecc_isr_task((unsigned long)pdata);</div><div class='add'>+		xgbe_ecc_isr_bh_work(&amp;pdata-&gt;ecc_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	/* If there is not a separate I2C irq, handle it here */</div><div class='ctx'> 	if (pdata-&gt;vdata-&gt;i2c_support &amp;&amp; (pdata-&gt;dev_irq == pdata-&gt;i2c_irq))</div><div class='hunk'>@@ -604,10 +526,10 @@ static irqreturn_t xgbe_isr(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = data;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;isr_as_tasklet)</div><div class='del'>-		tasklet_schedule(&amp;pdata-&gt;tasklet_dev);</div><div class='add'>+	if (pdata-&gt;isr_as_bh_work)</div><div class='add'>+		queue_work(system_bh_wq, &amp;pdata-&gt;dev_bh_work);</div><div class='ctx'> 	else</div><div class='del'>-		xgbe_isr_task((unsigned long)pdata);</div><div class='add'>+		xgbe_isr_bh_work(&amp;pdata-&gt;dev_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -643,7 +565,8 @@ static irqreturn_t xgbe_dma_isr(int irq, void *data)</div><div class='ctx'> </div><div class='ctx'> static void xgbe_tx_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_channel *channel = from_timer(channel, t, tx_timer);</div><div class='add'>+	struct xgbe_channel *channel = timer_container_of(channel, t,</div><div class='add'>+							  tx_timer);</div><div class='ctx'> 	struct xgbe_prv_data *pdata = channel-&gt;pdata;</div><div class='ctx'> 	struct napi_struct *napi;</div><div class='ctx'> </div><div class='hunk'>@@ -681,11 +604,26 @@ static void xgbe_service(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void xgbe_service_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = from_timer(pdata, t, service_timer);</div><div class='add'>+	struct xgbe_prv_data *pdata = timer_container_of(pdata, t,</div><div class='add'>+							 service_timer);</div><div class='add'>+	struct xgbe_channel *channel;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	queue_work(pdata-&gt;dev_workqueue, &amp;pdata-&gt;service_work);</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;pdata-&gt;service_timer, jiffies + HZ);</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;tx_usecs)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pdata-&gt;channel_count; i++) {</div><div class='add'>+		channel = pdata-&gt;channel[i];</div><div class='add'>+		if (!channel-&gt;tx_ring || channel-&gt;tx_timer_active)</div><div class='add'>+			break;</div><div class='add'>+		channel-&gt;tx_timer_active = 1;</div><div class='add'>+		mod_timer(&amp;channel-&gt;tx_timer,</div><div class='add'>+			  jiffies + usecs_to_jiffies(pdata-&gt;tx_usecs));</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_init_timers(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -714,14 +652,16 @@ static void xgbe_stop_timers(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	struct xgbe_channel *channel;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;pdata-&gt;service_timer);</div><div class='add'>+	timer_delete_sync(&amp;pdata-&gt;service_timer);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;channel_count; i++) {</div><div class='ctx'> 		channel = pdata-&gt;channel[i];</div><div class='ctx'> 		if (!channel-&gt;tx_ring)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		del_timer_sync(&amp;channel-&gt;tx_timer);</div><div class='add'>+		/* Deactivate the Tx timer */</div><div class='add'>+		timer_delete_sync(&amp;channel-&gt;tx_timer);</div><div class='add'>+		channel-&gt;tx_timer_active = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -782,6 +722,21 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	hw_feat-&gt;pps_out_num  = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, PPSOUTNUM);</div><div class='ctx'> 	hw_feat-&gt;aux_snap_num = XGMAC_GET_BITS(mac_hfr2, MAC_HWF2R, AUXSNAPNUM);</div><div class='ctx'> </div><div class='add'>+	/* Sanity check and warn if hardware reports more than supported */</div><div class='add'>+	if (hw_feat-&gt;pps_out_num &gt; XGBE_MAX_PPS_OUT) {</div><div class='add'>+		dev_warn(pdata-&gt;dev,</div><div class='add'>+			 "Hardware reports %u PPS outputs, limiting to %u\n",</div><div class='add'>+			 hw_feat-&gt;pps_out_num, XGBE_MAX_PPS_OUT);</div><div class='add'>+		hw_feat-&gt;pps_out_num = XGBE_MAX_PPS_OUT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_feat-&gt;aux_snap_num &gt; XGBE_MAX_AUX_SNAP) {</div><div class='add'>+		dev_warn(pdata-&gt;dev,</div><div class='add'>+			 "Hardware reports %u aux snapshot inputs, limiting to %u\n",</div><div class='add'>+			 hw_feat-&gt;aux_snap_num, XGBE_MAX_AUX_SNAP);</div><div class='add'>+		hw_feat-&gt;aux_snap_num = XGBE_MAX_AUX_SNAP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Translate the Hash Table size into actual number */</div><div class='ctx'> 	switch (hw_feat-&gt;hash_table_size) {</div><div class='ctx'> 	case 0:</div><div class='hunk'>@@ -904,114 +859,40 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_disable_vxlan_offloads(struct xgbe_prv_data *pdata)</div><div class='add'>+static int xgbe_vxlan_set_port(struct net_device *netdev, unsigned int table,</div><div class='add'>+			       unsigned int entry, struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = pdata-&gt;netdev;</div><div class='del'>-</div><div class='del'>-	if (!pdata-&gt;vxlan_offloads_set)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	netdev_info(netdev, "disabling VXLAN offloads\n");</div><div class='del'>-</div><div class='del'>-	netdev-&gt;hw_enc_features &amp;= ~(NETIF_F_SG |</div><div class='del'>-				     NETIF_F_IP_CSUM |</div><div class='del'>-				     NETIF_F_IPV6_CSUM |</div><div class='del'>-				     NETIF_F_RXCSUM |</div><div class='del'>-				     NETIF_F_TSO |</div><div class='del'>-				     NETIF_F_TSO6 |</div><div class='del'>-				     NETIF_F_GRO |</div><div class='del'>-				     NETIF_F_GSO_UDP_TUNNEL |</div><div class='del'>-				     NETIF_F_GSO_UDP_TUNNEL_CSUM);</div><div class='add'>+	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;features &amp;= ~(NETIF_F_GSO_UDP_TUNNEL |</div><div class='del'>-			      NETIF_F_GSO_UDP_TUNNEL_CSUM);</div><div class='add'>+	pdata-&gt;vxlan_port = be16_to_cpu(ti-&gt;port);</div><div class='add'>+	pdata-&gt;hw_if.enable_vxlan(pdata);</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;vxlan_offloads_set = 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_disable_vxlan_hw(struct xgbe_prv_data *pdata)</div><div class='add'>+static int xgbe_vxlan_unset_port(struct net_device *netdev, unsigned int table,</div><div class='add'>+				 unsigned int entry, struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='del'>-	if (!pdata-&gt;vxlan_port_set)</div><div class='del'>-		return;</div><div class='add'>+	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;hw_if.disable_vxlan(pdata);</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_port_set = 0;</div><div class='ctx'> 	pdata-&gt;vxlan_port = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_disable_vxlan_accel(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	xgbe_disable_vxlan_offloads(pdata);</div><div class='del'>-</div><div class='del'>-	xgbe_disable_vxlan_hw(pdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_enable_vxlan_offloads(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	struct net_device *netdev = pdata-&gt;netdev;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vxlan_offloads_set)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	netdev_info(netdev, "enabling VXLAN offloads\n");</div><div class='del'>-</div><div class='del'>-	netdev-&gt;hw_enc_features |= NETIF_F_SG |</div><div class='del'>-				   NETIF_F_IP_CSUM |</div><div class='del'>-				   NETIF_F_IPV6_CSUM |</div><div class='del'>-				   NETIF_F_RXCSUM |</div><div class='del'>-				   NETIF_F_TSO |</div><div class='del'>-				   NETIF_F_TSO6 |</div><div class='del'>-				   NETIF_F_GRO |</div><div class='del'>-				   pdata-&gt;vxlan_features;</div><div class='del'>-</div><div class='del'>-	netdev-&gt;features |= pdata-&gt;vxlan_features;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_offloads_set = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_enable_vxlan_hw(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	struct xgbe_vxlan_data *vdata;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vxlan_port_set)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (list_empty(&amp;pdata-&gt;vxlan_ports))</div><div class='del'>-		return;</div><div class='ctx'> </div><div class='del'>-	vdata = list_first_entry(&amp;pdata-&gt;vxlan_ports,</div><div class='del'>-				 struct xgbe_vxlan_data, list);</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_port_set = 1;</div><div class='del'>-	pdata-&gt;vxlan_port = be16_to_cpu(vdata-&gt;port);</div><div class='del'>-</div><div class='del'>-	pdata-&gt;hw_if.enable_vxlan(pdata);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_enable_vxlan_accel(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	/* VXLAN acceleration desired? */</div><div class='del'>-	if (!pdata-&gt;vxlan_features)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* VXLAN acceleration possible? */</div><div class='del'>-	if (pdata-&gt;vxlan_force_disable)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	xgbe_enable_vxlan_hw(pdata);</div><div class='del'>-</div><div class='del'>-	xgbe_enable_vxlan_offloads(pdata);</div><div class='del'>-}</div><div class='add'>+static const struct udp_tunnel_nic_info xgbe_udp_tunnels = {</div><div class='add'>+	.set_port	= xgbe_vxlan_set_port,</div><div class='add'>+	.unset_port	= xgbe_vxlan_unset_port,</div><div class='add'>+	.flags		= UDP_TUNNEL_NIC_INFO_OPEN_ONLY,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-static void xgbe_reset_vxlan_accel(struct xgbe_prv_data *pdata)</div><div class='add'>+const struct udp_tunnel_nic_info *xgbe_get_udp_tunnel_info(void)</div><div class='ctx'> {</div><div class='del'>-	xgbe_disable_vxlan_hw(pdata);</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vxlan_features)</div><div class='del'>-		xgbe_enable_vxlan_offloads(pdata);</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_force_disable = 0;</div><div class='add'>+	return &amp;xgbe_udp_tunnels;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_napi_enable(struct xgbe_prv_data *pdata, unsigned int add)</div><div class='hunk'>@@ -1024,14 +905,14 @@ static void xgbe_napi_enable(struct xgbe_prv_data *pdata, unsigned int add)</div><div class='ctx'> 			channel = pdata-&gt;channel[i];</div><div class='ctx'> 			if (add)</div><div class='ctx'> 				netif_napi_add(pdata-&gt;netdev, &amp;channel-&gt;napi,</div><div class='del'>-					       xgbe_one_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+					       xgbe_one_poll);</div><div class='ctx'> </div><div class='ctx'> 			napi_enable(&amp;channel-&gt;napi);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (add)</div><div class='ctx'> 			netif_napi_add(pdata-&gt;netdev, &amp;pdata-&gt;napi,</div><div class='del'>-				       xgbe_all_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+				       xgbe_all_poll);</div><div class='ctx'> </div><div class='ctx'> 		napi_enable(&amp;pdata-&gt;napi);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1065,9 +946,8 @@ static int xgbe_request_irqs(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;pdata-&gt;tasklet_dev, xgbe_isr_task, (unsigned long)pdata);</div><div class='del'>-	tasklet_init(&amp;pdata-&gt;tasklet_ecc, xgbe_ecc_isr_task,</div><div class='del'>-		     (unsigned long)pdata);</div><div class='add'>+	INIT_WORK(&amp;pdata-&gt;dev_bh_work, xgbe_isr_bh_work);</div><div class='add'>+	INIT_WORK(&amp;pdata-&gt;ecc_bh_work, xgbe_ecc_isr_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	ret = devm_request_irq(pdata-&gt;dev, pdata-&gt;dev_irq, xgbe_isr, 0,</div><div class='ctx'> 			       netdev_name(netdev), pdata);</div><div class='hunk'>@@ -1137,6 +1017,9 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	devm_free_irq(pdata-&gt;dev, pdata-&gt;dev_irq, pdata);</div><div class='ctx'> </div><div class='add'>+	cancel_work_sync(&amp;pdata-&gt;dev_bh_work);</div><div class='add'>+	cancel_work_sync(&amp;pdata-&gt;ecc_bh_work);</div><div class='add'>+</div><div class='ctx'> 	if (pdata-&gt;vdata-&gt;ecc_support &amp;&amp; (pdata-&gt;dev_irq != pdata-&gt;ecc_irq))</div><div class='ctx'> 		devm_free_irq(pdata-&gt;dev, pdata-&gt;ecc_irq, pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -1228,7 +1111,6 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> static int xgbe_phy_reset(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	pdata-&gt;phy_link = -1;</div><div class='ctx'> 	pdata-&gt;phy_speed = SPEED_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	return pdata-&gt;phy_if.phy_reset(pdata);</div><div class='hunk'>@@ -1406,7 +1288,12 @@ static int xgbe_start(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	hw_if-&gt;enable_tx(pdata);</div><div class='ctx'> 	hw_if-&gt;enable_rx(pdata);</div><div class='ctx'> </div><div class='del'>-	udp_tunnel_get_rx_info(netdev);</div><div class='add'>+	udp_tunnel_nic_reset_ntf(netdev);</div><div class='add'>+</div><div class='add'>+	/* Reset the phy settings */</div><div class='add'>+	ret = xgbe_phy_reset(pdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_txrx;</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1417,6 +1304,10 @@ static int xgbe_start(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_txrx:</div><div class='add'>+	hw_if-&gt;disable_rx(pdata);</div><div class='add'>+	hw_if-&gt;disable_tx(pdata);</div><div class='add'>+</div><div class='ctx'> err_irqs:</div><div class='ctx'> 	xgbe_free_irqs(pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -1443,11 +1334,12 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_stop_all_queues(netdev);</div><div class='add'>+	netif_carrier_off(pdata-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	xgbe_stop_timers(pdata);</div><div class='ctx'> 	flush_workqueue(pdata-&gt;dev_workqueue);</div><div class='ctx'> </div><div class='del'>-	xgbe_reset_vxlan_accel(pdata);</div><div class='add'>+	xgbe_vxlan_unset_port(netdev, 0, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	hw_if-&gt;disable_tx(pdata);</div><div class='ctx'> 	hw_if-&gt;disable_rx(pdata);</div><div class='hunk'>@@ -1533,202 +1425,6 @@ static void xgbe_restart(struct work_struct *work)</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_tx_tstamp(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct xgbe_prv_data *pdata = container_of(work,</div><div class='del'>-						   struct xgbe_prv_data,</div><div class='del'>-						   tx_tstamp_work);</div><div class='del'>-	struct skb_shared_hwtstamps hwtstamps;</div><div class='del'>-	u64 nsec;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-	if (!pdata-&gt;tx_tstamp_skb)</div><div class='del'>-		goto unlock;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;tx_tstamp) {</div><div class='del'>-		nsec = timecounter_cyc2time(&amp;pdata-&gt;tstamp_tc,</div><div class='del'>-					    pdata-&gt;tx_tstamp);</div><div class='del'>-</div><div class='del'>-		memset(&amp;hwtstamps, 0, sizeof(hwtstamps));</div><div class='del'>-		hwtstamps.hwtstamp = ns_to_ktime(nsec);</div><div class='del'>-		skb_tstamp_tx(pdata-&gt;tx_tstamp_skb, &amp;hwtstamps);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_kfree_skb_any(pdata-&gt;tx_tstamp_skb);</div><div class='del'>-</div><div class='del'>-	pdata-&gt;tx_tstamp_skb = NULL;</div><div class='del'>-</div><div class='del'>-unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xgbe_get_hwtstamp_settings(struct xgbe_prv_data *pdata,</div><div class='del'>-				      struct ifreq *ifreq)</div><div class='del'>-{</div><div class='del'>-	if (copy_to_user(ifreq-&gt;ifr_data, &amp;pdata-&gt;tstamp_config,</div><div class='del'>-			 sizeof(pdata-&gt;tstamp_config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,</div><div class='del'>-				      struct ifreq *ifreq)</div><div class='del'>-{</div><div class='del'>-	struct hwtstamp_config config;</div><div class='del'>-	unsigned int mac_tscr;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;config, ifreq-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (config.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	mac_tscr = 0;</div><div class='del'>-</div><div class='del'>-	switch (config.tx_type) {</div><div class='del'>-	case HWTSTAMP_TX_OFF:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HWTSTAMP_TX_ON:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (config.rx_filter) {</div><div class='del'>-	case HWTSTAMP_FILTER_NONE:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='del'>-	case HWTSTAMP_FILTER_ALL:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENALL, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* PTP v2, UDP, any kind of event packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-		/* Fall through - to PTP v1, UDP, any kind of event packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* PTP v2, UDP, Sync packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-		/* Fall through - to PTP v1, UDP, Sync packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* PTP v2, UDP, Delay_req packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-		/* Fall through - to PTP v1, UDP, Delay_req packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* 802.AS1, Ethernet, any kind of event packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* 802.AS1, Ethernet, Sync packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* 802.AS1, Ethernet, Delay_req packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* PTP v2/802.AS1, any layer, any kind of event packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* PTP v2/802.AS1, any layer, Sync packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* PTP v2/802.AS1, any layer, Delay_req packet */</div><div class='del'>-	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='del'>-		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return -ERANGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdata-&gt;hw_if.config_tstamp(pdata, mac_tscr);</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;pdata-&gt;tstamp_config, &amp;config, sizeof(config));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_prep_tx_tstamp(struct xgbe_prv_data *pdata,</div><div class='del'>-				struct sk_buff *skb,</div><div class='del'>-				struct xgbe_packet_data *packet)</div><div class='del'>-{</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	if (XGMAC_GET_BITS(packet-&gt;attributes, TX_PACKET_ATTRIBUTES, PTP)) {</div><div class='del'>-		spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-		if (pdata-&gt;tx_tstamp_skb) {</div><div class='del'>-			/* Another timestamp in progress, ignore this one */</div><div class='del'>-			XGMAC_SET_BITS(packet-&gt;attributes,</div><div class='del'>-				       TX_PACKET_ATTRIBUTES, PTP, 0);</div><div class='del'>-		} else {</div><div class='del'>-			pdata-&gt;tx_tstamp_skb = skb_get(skb);</div><div class='del'>-			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb_tx_timestamp(skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void xgbe_prep_vlan(struct sk_buff *skb, struct xgbe_packet_data *packet)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb_vlan_tag_present(skb))</div><div class='hunk'>@@ -1748,12 +1444,10 @@ static int xgbe_prep_tso(struct sk_buff *skb, struct xgbe_packet_data *packet)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (XGMAC_GET_BITS(packet-&gt;attributes, TX_PACKET_ATTRIBUTES, VXLAN)) {</div><div class='del'>-		packet-&gt;header_len = skb_inner_transport_offset(skb) +</div><div class='del'>-				     inner_tcp_hdrlen(skb);</div><div class='add'>+		packet-&gt;header_len = skb_inner_tcp_all_headers(skb);</div><div class='ctx'> 		packet-&gt;tcp_header_len = inner_tcp_hdrlen(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		packet-&gt;header_len = skb_transport_offset(skb) +</div><div class='del'>-				     tcp_hdrlen(skb);</div><div class='add'>+		packet-&gt;header_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 		packet-&gt;tcp_header_len = tcp_hdrlen(skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	packet-&gt;tcp_payload_len = skb-&gt;len - packet-&gt;header_len;</div><div class='hunk'>@@ -1773,13 +1467,8 @@ static int xgbe_prep_tso(struct sk_buff *skb, struct xgbe_packet_data *packet)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool xgbe_is_vxlan(struct xgbe_prv_data *pdata, struct sk_buff *skb)</div><div class='add'>+static bool xgbe_is_vxlan(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_vxlan_data *vdata;</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vxlan_force_disable)</div><div class='del'>-		return false;</div><div class='del'>-</div><div class='ctx'> 	if (!skb-&gt;encapsulation)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='hunk'>@@ -1801,19 +1490,13 @@ static bool xgbe_is_vxlan(struct xgbe_prv_data *pdata, struct sk_buff *skb)</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* See if we have the UDP port in our list */</div><div class='del'>-	list_for_each_entry(vdata, &amp;pdata-&gt;vxlan_ports, list) {</div><div class='del'>-		if ((skb-&gt;protocol == htons(ETH_P_IP)) &amp;&amp;</div><div class='del'>-		    (vdata-&gt;sa_family == AF_INET) &amp;&amp;</div><div class='del'>-		    (vdata-&gt;port == udp_hdr(skb)-&gt;dest))</div><div class='del'>-			return true;</div><div class='del'>-		else if ((skb-&gt;protocol == htons(ETH_P_IPV6)) &amp;&amp;</div><div class='del'>-			 (vdata-&gt;sa_family == AF_INET6) &amp;&amp;</div><div class='del'>-			 (vdata-&gt;port == udp_hdr(skb)-&gt;dest))</div><div class='del'>-			return true;</div><div class='del'>-	}</div><div class='add'>+	if (skb-&gt;inner_protocol_type != ENCAP_TYPE_ETHER ||</div><div class='add'>+	    skb-&gt;inner_protocol != htons(ETH_P_TEB) ||</div><div class='add'>+	    (skb_inner_mac_header(skb) - skb_transport_header(skb) !=</div><div class='add'>+	     sizeof(struct udphdr) + sizeof(struct vxlanhdr)))</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_is_tso(struct sk_buff *skb)</div><div class='hunk'>@@ -1833,7 +1516,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,</div><div class='ctx'> 			     struct xgbe_ring *ring, struct sk_buff *skb,</div><div class='ctx'> 			     struct xgbe_packet_data *packet)</div><div class='ctx'> {</div><div class='del'>-	struct skb_frag_struct *frag;</div><div class='add'>+	skb_frag_t *frag;</div><div class='ctx'> 	unsigned int context_desc;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -1864,7 +1547,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,</div><div class='ctx'> 		XGMAC_SET_BITS(packet-&gt;attributes, TX_PACKET_ATTRIBUTES,</div><div class='ctx'> 			       CSUM_ENABLE, 1);</div><div class='ctx'> </div><div class='del'>-	if (xgbe_is_vxlan(pdata, skb))</div><div class='add'>+	if (xgbe_is_vxlan(skb))</div><div class='ctx'> 		XGMAC_SET_BITS(packet-&gt;attributes, TX_PACKET_ATTRIBUTES,</div><div class='ctx'> 			       VXLAN, 1);</div><div class='ctx'> </div><div class='hunk'>@@ -1931,11 +1614,6 @@ static int xgbe_open(struct net_device *netdev)</div><div class='ctx'> 		goto err_dev_wq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Reset the phy settings */</div><div class='del'>-	ret = xgbe_phy_reset(pdata);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_an_wq;</div><div class='del'>-</div><div class='ctx'> 	/* Enable the clocks */</div><div class='ctx'> 	ret = clk_prepare_enable(pdata-&gt;sysclk);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -1954,6 +1632,9 @@ static int xgbe_open(struct net_device *netdev)</div><div class='ctx'> 	INIT_WORK(&amp;pdata-&gt;stopdev_work, xgbe_stopdev);</div><div class='ctx'> 	INIT_WORK(&amp;pdata-&gt;tx_tstamp_work, xgbe_tx_tstamp);</div><div class='ctx'> </div><div class='add'>+	/* Initialize PTP timestamping and clock. */</div><div class='add'>+	xgbe_init_ptp(pdata);</div><div class='add'>+</div><div class='ctx'> 	ret = xgbe_alloc_memory(pdata);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_ptpclk;</div><div class='hunk'>@@ -1997,10 +1678,8 @@ static int xgbe_close(struct net_device *netdev)</div><div class='ctx'> 	clk_disable_unprepare(pdata-&gt;ptpclk);</div><div class='ctx'> 	clk_disable_unprepare(pdata-&gt;sysclk);</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(pdata-&gt;an_workqueue);</div><div class='ctx'> 	destroy_workqueue(pdata-&gt;an_workqueue);</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(pdata-&gt;dev_workqueue);</div><div class='ctx'> 	destroy_workqueue(pdata-&gt;dev_workqueue);</div><div class='ctx'> </div><div class='ctx'> 	set_bit(XGBE_DOWN, &amp;pdata-&gt;dev_state);</div><div class='hunk'>@@ -2101,7 +1780,7 @@ static int xgbe_set_mac_address(struct net_device *netdev, void *addr)</div><div class='ctx'> 	if (!is_valid_ether_addr(saddr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, saddr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, saddr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	hw_if-&gt;set_mac_address(pdata, netdev-&gt;dev_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -2110,27 +1789,6 @@ static int xgbe_set_mac_address(struct net_device *netdev, void *addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_ioctl(struct net_device *netdev, struct ifreq *ifreq, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCGHWTSTAMP:</div><div class='del'>-		ret = xgbe_get_hwtstamp_settings(pdata, ifreq);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		ret = xgbe_set_hwtstamp_settings(pdata, ifreq);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		ret = -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xgbe_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='hunk'>@@ -2143,7 +1801,7 @@ static int xgbe_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;rx_buf_size = ret;</div><div class='del'>-	netdev-&gt;mtu = mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, mtu);</div><div class='ctx'> </div><div class='ctx'> 	xgbe_restart_dev(pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -2152,7 +1810,7 @@ static int xgbe_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void xgbe_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2271,23 +1929,12 @@ static netdev_features_t xgbe_fix_features(struct net_device *netdev,</div><div class='ctx'> 					   netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='del'>-	netdev_features_t vxlan_base, vxlan_mask;</div><div class='add'>+	netdev_features_t vxlan_base;</div><div class='ctx'> </div><div class='ctx'> 	vxlan_base = NETIF_F_GSO_UDP_TUNNEL | NETIF_F_RX_UDP_TUNNEL_PORT;</div><div class='del'>-	vxlan_mask = vxlan_base | NETIF_F_GSO_UDP_TUNNEL_CSUM;</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;vxlan_features = features &amp; vxlan_mask;</div><div class='del'>-</div><div class='del'>-	/* Only fix VXLAN-related features */</div><div class='del'>-	if (!pdata-&gt;vxlan_features)</div><div class='del'>-		return features;</div><div class='del'>-</div><div class='del'>-	/* If VXLAN isn't supported then clear any features:</div><div class='del'>-	 *   This is needed because NETIF_F_RX_UDP_TUNNEL_PORT gets</div><div class='del'>-	 *   automatically set if ndo_udp_tunnel_add is set.</div><div class='del'>-	 */</div><div class='ctx'> 	if (!pdata-&gt;hw_feat.vxn)</div><div class='del'>-		return features &amp; ~vxlan_mask;</div><div class='add'>+		return features;</div><div class='ctx'> </div><div class='ctx'> 	/* VXLAN CSUM requires VXLAN base */</div><div class='ctx'> 	if ((features &amp; NETIF_F_GSO_UDP_TUNNEL_CSUM) &amp;&amp;</div><div class='hunk'>@@ -2318,15 +1965,6 @@ static netdev_features_t xgbe_fix_features(struct net_device *netdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;vxlan_features = features &amp; vxlan_mask;</div><div class='del'>-</div><div class='del'>-	/* Adjust UDP Tunnel based on current state */</div><div class='del'>-	if (pdata-&gt;vxlan_force_disable) {</div><div class='del'>-		netdev_notice(netdev,</div><div class='del'>-			      "VXLAN acceleration disabled, turning off udp tunnel features\n");</div><div class='del'>-		features &amp;= ~vxlan_mask;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2336,14 +1974,12 @@ static int xgbe_set_features(struct net_device *netdev,</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> 	struct xgbe_hw_if *hw_if = &amp;pdata-&gt;hw_if;</div><div class='ctx'> 	netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;</div><div class='del'>-	netdev_features_t udp_tunnel;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	rxhash = pdata-&gt;netdev_features &amp; NETIF_F_RXHASH;</div><div class='ctx'> 	rxcsum = pdata-&gt;netdev_features &amp; NETIF_F_RXCSUM;</div><div class='ctx'> 	rxvlan = pdata-&gt;netdev_features &amp; NETIF_F_HW_VLAN_CTAG_RX;</div><div class='ctx'> 	rxvlan_filter = pdata-&gt;netdev_features &amp; NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='del'>-	udp_tunnel = pdata-&gt;netdev_features &amp; NETIF_F_GSO_UDP_TUNNEL;</div><div class='ctx'> </div><div class='ctx'> 	if ((features &amp; NETIF_F_RXHASH) &amp;&amp; !rxhash)</div><div class='ctx'> 		ret = hw_if-&gt;enable_rss(pdata);</div><div class='hunk'>@@ -2352,10 +1988,17 @@ static int xgbe_set_features(struct net_device *netdev,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	if ((features &amp; NETIF_F_RXCSUM) &amp;&amp; !rxcsum)</div><div class='add'>+	if ((features &amp; NETIF_F_RXCSUM) &amp;&amp; !rxcsum) {</div><div class='add'>+		hw_if-&gt;enable_sph(pdata);</div><div class='add'>+		hw_if-&gt;enable_vxlan(pdata);</div><div class='ctx'> 		hw_if-&gt;enable_rx_csum(pdata);</div><div class='del'>-	else if (!(features &amp; NETIF_F_RXCSUM) &amp;&amp; rxcsum)</div><div class='add'>+		schedule_work(&amp;pdata-&gt;restart_work);</div><div class='add'>+	} else if (!(features &amp; NETIF_F_RXCSUM) &amp;&amp; rxcsum) {</div><div class='add'>+		hw_if-&gt;disable_sph(pdata);</div><div class='add'>+		hw_if-&gt;disable_vxlan(pdata);</div><div class='ctx'> 		hw_if-&gt;disable_rx_csum(pdata);</div><div class='add'>+		schedule_work(&amp;pdata-&gt;restart_work);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ((features &amp; NETIF_F_HW_VLAN_CTAG_RX) &amp;&amp; !rxvlan)</div><div class='ctx'> 		hw_if-&gt;enable_rx_vlan_stripping(pdata);</div><div class='hunk'>@@ -2367,11 +2010,6 @@ static int xgbe_set_features(struct net_device *netdev,</div><div class='ctx'> 	else if (!(features &amp; NETIF_F_HW_VLAN_CTAG_FILTER) &amp;&amp; rxvlan_filter)</div><div class='ctx'> 		hw_if-&gt;disable_rx_vlan_filtering(pdata);</div><div class='ctx'> </div><div class='del'>-	if ((features &amp; NETIF_F_GSO_UDP_TUNNEL) &amp;&amp; !udp_tunnel)</div><div class='del'>-		xgbe_enable_vxlan_accel(pdata);</div><div class='del'>-	else if (!(features &amp; NETIF_F_GSO_UDP_TUNNEL) &amp;&amp; udp_tunnel)</div><div class='del'>-		xgbe_disable_vxlan_accel(pdata);</div><div class='del'>-</div><div class='ctx'> 	pdata-&gt;netdev_features = features;</div><div class='ctx'> </div><div class='ctx'> 	DBGPR("&lt;--xgbe_set_features\n");</div><div class='hunk'>@@ -2379,101 +2017,6 @@ static int xgbe_set_features(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_udp_tunnel_add(struct net_device *netdev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='del'>-	struct xgbe_vxlan_data *vdata;</div><div class='del'>-</div><div class='del'>-	if (!pdata-&gt;hw_feat.vxn)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_port_count++;</div><div class='del'>-</div><div class='del'>-	netif_dbg(pdata, drv, netdev,</div><div class='del'>-		  "adding VXLAN tunnel, family=%hx/port=%hx\n",</div><div class='del'>-		  ti-&gt;sa_family, be16_to_cpu(ti-&gt;port));</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vxlan_force_disable)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	vdata = kzalloc(sizeof(*vdata), GFP_ATOMIC);</div><div class='del'>-	if (!vdata) {</div><div class='del'>-		/* Can no longer properly track VXLAN ports */</div><div class='del'>-		pdata-&gt;vxlan_force_disable = 1;</div><div class='del'>-		netif_dbg(pdata, drv, netdev,</div><div class='del'>-			  "internal error, disabling VXLAN accelerations\n");</div><div class='del'>-</div><div class='del'>-		xgbe_disable_vxlan_accel(pdata);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	vdata-&gt;sa_family = ti-&gt;sa_family;</div><div class='del'>-	vdata-&gt;port = ti-&gt;port;</div><div class='del'>-</div><div class='del'>-	list_add_tail(&amp;vdata-&gt;list, &amp;pdata-&gt;vxlan_ports);</div><div class='del'>-</div><div class='del'>-	/* First port added? */</div><div class='del'>-	if (pdata-&gt;vxlan_port_count == 1) {</div><div class='del'>-		xgbe_enable_vxlan_accel(pdata);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xgbe_udp_tunnel_del(struct net_device *netdev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='del'>-	struct xgbe_vxlan_data *vdata;</div><div class='del'>-</div><div class='del'>-	if (!pdata-&gt;hw_feat.vxn)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	netif_dbg(pdata, drv, netdev,</div><div class='del'>-		  "deleting VXLAN tunnel, family=%hx/port=%hx\n",</div><div class='del'>-		  ti-&gt;sa_family, be16_to_cpu(ti-&gt;port));</div><div class='del'>-</div><div class='del'>-	/* Don't need safe version since loop terminates with deletion */</div><div class='del'>-	list_for_each_entry(vdata, &amp;pdata-&gt;vxlan_ports, list) {</div><div class='del'>-		if (vdata-&gt;sa_family != ti-&gt;sa_family)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (vdata-&gt;port != ti-&gt;port)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		list_del(&amp;vdata-&gt;list);</div><div class='del'>-		kfree(vdata);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_port_count--;</div><div class='del'>-	if (!pdata-&gt;vxlan_port_count) {</div><div class='del'>-		xgbe_reset_vxlan_accel(pdata);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pdata-&gt;vxlan_force_disable)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* See if VXLAN tunnel id needs to be changed */</div><div class='del'>-	vdata = list_first_entry(&amp;pdata-&gt;vxlan_ports,</div><div class='del'>-				 struct xgbe_vxlan_data, list);</div><div class='del'>-	if (pdata-&gt;vxlan_port == be16_to_cpu(vdata-&gt;port))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pdata-&gt;vxlan_port = be16_to_cpu(vdata-&gt;port);</div><div class='del'>-	pdata-&gt;hw_if.set_vxlan_id(pdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static netdev_features_t xgbe_features_check(struct sk_buff *skb,</div><div class='ctx'> 					     struct net_device *netdev,</div><div class='ctx'> 					     netdev_features_t features)</div><div class='hunk'>@@ -2491,7 +2034,6 @@ static const struct net_device_ops xgbe_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode	= xgbe_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= xgbe_set_mac_address,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= xgbe_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= xgbe_change_mtu,</div><div class='ctx'> 	.ndo_tx_timeout		= xgbe_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats64	= xgbe_get_stats64,</div><div class='hunk'>@@ -2503,9 +2045,9 @@ static const struct net_device_ops xgbe_netdev_ops = {</div><div class='ctx'> 	.ndo_setup_tc		= xgbe_setup_tc,</div><div class='ctx'> 	.ndo_fix_features	= xgbe_fix_features,</div><div class='ctx'> 	.ndo_set_features	= xgbe_set_features,</div><div class='del'>-	.ndo_udp_tunnel_add	= xgbe_udp_tunnel_add,</div><div class='del'>-	.ndo_udp_tunnel_del	= xgbe_udp_tunnel_del,</div><div class='ctx'> 	.ndo_features_check	= xgbe_features_check,</div><div class='add'>+	.ndo_hwtstamp_get	= xgbe_get_hwtstamp_settings,</div><div class='add'>+	.ndo_hwtstamp_set	= xgbe_set_hwtstamp_settings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct net_device_ops *xgbe_get_netdev_ops(void)</div><div class='hunk'>@@ -2764,6 +2306,14 @@ read_again:</div><div class='ctx'> 			buf2_len = xgbe_rx_buf2_len(rdata, packet, len);</div><div class='ctx'> 			len += buf2_len;</div><div class='ctx'> </div><div class='add'>+			if (buf2_len &gt; rdata-&gt;rx.buf.dma_len) {</div><div class='add'>+				/* Hardware inconsistency within the descriptors</div><div class='add'>+				 * that has resulted in a length underflow.</div><div class='add'>+				 */</div><div class='add'>+				error = 1;</div><div class='add'>+				goto skip_data;</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			if (!skb) {</div><div class='ctx'> 				skb = xgbe_create_skb(pdata, napi, rdata,</div><div class='ctx'> 						      buf1_len);</div><div class='hunk'>@@ -2793,8 +2343,10 @@ skip_data:</div><div class='ctx'> 		if (!last || context_next)</div><div class='ctx'> 			goto read_again;</div><div class='ctx'> </div><div class='del'>-		if (!skb)</div><div class='add'>+		if (!skb || error) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='ctx'> 			goto next_packet;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Be sure we don't exceed the configured MTU */</div><div class='ctx'> 		max_len = netdev-&gt;mtu + ETH_HLEN;</div><div class='hunk'>@@ -2833,12 +2385,8 @@ skip_data:</div><div class='ctx'> </div><div class='ctx'> 		if (XGMAC_GET_BITS(packet-&gt;attributes,</div><div class='ctx'> 				   RX_PACKET_ATTRIBUTES, RX_TSTAMP)) {</div><div class='del'>-			u64 nsec;</div><div class='del'>-</div><div class='del'>-			nsec = timecounter_cyc2time(&amp;pdata-&gt;tstamp_tc,</div><div class='del'>-						    packet-&gt;rx_tstamp);</div><div class='ctx'> 			hwtstamps = skb_hwtstamps(skb);</div><div class='del'>-			hwtstamps-&gt;hwtstamp = ns_to_ktime(nsec);</div><div class='add'>+			hwtstamps-&gt;hwtstamp = ns_to_ktime(packet-&gt;rx_tstamp);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (XGMAC_GET_BITS(packet-&gt;attributes,</div><div class='hunk'>@@ -2986,7 +2534,7 @@ void xgbe_print_pkt(struct net_device *netdev, struct sk_buff *skb, bool tx_rx)</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(netdev, "Dst MAC addr: %pM\n", eth-&gt;h_dest);</div><div class='ctx'> 	netdev_dbg(netdev, "Src MAC addr: %pM\n", eth-&gt;h_source);</div><div class='del'>-	netdev_dbg(netdev, "Protocol: %#06hx\n", ntohs(eth-&gt;h_proto));</div><div class='add'>+	netdev_dbg(netdev, "Protocol: %#06x\n", ntohs(eth-&gt;h_proto));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; skb-&gt;len; i += 32) {</div><div class='ctx'> 		unsigned int len = min(skb-&gt;len - i, 32U);</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c<br/>index a880f10e3e70..0d19b09497a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -129,13 +20,13 @@ struct xgbe_stats {</div><div class='ctx'> </div><div class='ctx'> #define XGMAC_MMC_STAT(_string, _var)				\</div><div class='ctx'> 	{ _string,						\</div><div class='del'>-	  FIELD_SIZEOF(struct xgbe_mmc_stats, _var),		\</div><div class='add'>+	  sizeof_field(struct xgbe_mmc_stats, _var),		\</div><div class='ctx'> 	  offsetof(struct xgbe_prv_data, mmc_stats._var),	\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #define XGMAC_EXT_STAT(_string, _var)				\</div><div class='ctx'> 	{ _string,						\</div><div class='del'>-	  FIELD_SIZEOF(struct xgbe_ext_stats, _var),		\</div><div class='add'>+	  sizeof_field(struct xgbe_ext_stats, _var),		\</div><div class='ctx'> 	  offsetof(struct xgbe_prv_data, ext_stats._var),	\</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -194,24 +85,23 @@ static void xgbe_get_strings(struct net_device *netdev, u32 stringset, u8 *data)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		xgbe_selftest_get_strings(pdata, data);</div><div class='add'>+		break;</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; XGBE_STATS_COUNT; i++) {</div><div class='del'>-			memcpy(data, xgbe_gstring_stats[i].stat_string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			data += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='add'>+		for (i = 0; i &lt; XGBE_STATS_COUNT; i++)</div><div class='add'>+			ethtool_puts(&amp;data, xgbe_gstring_stats[i].stat_string);</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; pdata-&gt;tx_ring_count; i++) {</div><div class='del'>-			sprintf(data, "txq_%u_packets", i);</div><div class='del'>-			data += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(data, "txq_%u_bytes", i);</div><div class='del'>-			data += ETH_GSTRING_LEN;</div><div class='add'>+			ethtool_sprintf(&amp;data, "txq_%u_packets", i);</div><div class='add'>+			ethtool_sprintf(&amp;data, "txq_%u_bytes", i);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		for (i = 0; i &lt; pdata-&gt;rx_ring_count; i++) {</div><div class='del'>-			sprintf(data, "rxq_%u_packets", i);</div><div class='del'>-			data += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(data, "rxq_%u_bytes", i);</div><div class='del'>-			data += ETH_GSTRING_LEN;</div><div class='add'>+			ethtool_sprintf(&amp;data, "rxq_%u_packets", i);</div><div class='add'>+			ethtool_sprintf(&amp;data, "rxq_%u_bytes", i);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -244,6 +134,9 @@ static int xgbe_get_sset_count(struct net_device *netdev, int stringset)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		ret = xgbe_selftest_get_count(pdata);</div><div class='add'>+		break;</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='ctx'> 		ret = XGBE_STATS_COUNT +</div><div class='ctx'> 		      (pdata-&gt;tx_ring_count * 2) +</div><div class='hunk'>@@ -314,10 +207,15 @@ static int xgbe_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	cmd-&gt;base.phy_address = pdata-&gt;phy.address;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;base.autoneg = pdata-&gt;phy.autoneg;</div><div class='del'>-	cmd-&gt;base.speed = pdata-&gt;phy.speed;</div><div class='del'>-	cmd-&gt;base.duplex = pdata-&gt;phy.duplex;</div><div class='add'>+	if (netif_carrier_ok(netdev)) {</div><div class='add'>+		cmd-&gt;base.speed = pdata-&gt;phy.speed;</div><div class='add'>+		cmd-&gt;base.duplex = pdata-&gt;phy.duplex;</div><div class='add'>+	} else {</div><div class='add'>+		cmd-&gt;base.speed = SPEED_UNKNOWN;</div><div class='add'>+		cmd-&gt;base.duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	cmd-&gt;base.autoneg = pdata-&gt;phy.autoneg;</div><div class='ctx'> 	cmd-&gt;base.port = PORT_NONE;</div><div class='ctx'> </div><div class='ctx'> 	XGBE_LM_COPY(cmd, supported, lks, supported);</div><div class='hunk'>@@ -369,9 +267,8 @@ static int xgbe_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 		  __ETHTOOL_LINK_MODE_MASK_NBITS, cmd-&gt;link_modes.advertising,</div><div class='ctx'> 		  __ETHTOOL_LINK_MODE_MASK_NBITS, lks-&gt;link_modes.supported);</div><div class='ctx'> </div><div class='del'>-	bitmap_and(advertising,</div><div class='del'>-		   cmd-&gt;link_modes.advertising, lks-&gt;link_modes.supported,</div><div class='del'>-		   __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	linkmode_and(advertising, cmd-&gt;link_modes.advertising,</div><div class='add'>+		     lks-&gt;link_modes.supported);</div><div class='ctx'> </div><div class='ctx'> 	if ((cmd-&gt;base.autoneg == AUTONEG_ENABLE) &amp;&amp;</div><div class='ctx'> 	    bitmap_empty(advertising, __ETHTOOL_LINK_MODE_MASK_NBITS)) {</div><div class='hunk'>@@ -384,8 +281,7 @@ static int xgbe_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 	pdata-&gt;phy.autoneg = cmd-&gt;base.autoneg;</div><div class='ctx'> 	pdata-&gt;phy.speed = speed;</div><div class='ctx'> 	pdata-&gt;phy.duplex = cmd-&gt;base.duplex;</div><div class='del'>-	bitmap_copy(lks-&gt;link_modes.advertising, advertising,</div><div class='del'>-		    __ETHTOOL_LINK_MODE_MASK_NBITS);</div><div class='add'>+	linkmode_copy(lks-&gt;link_modes.advertising, advertising);</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;base.autoneg == AUTONEG_ENABLE)</div><div class='ctx'> 		XGBE_SET_ADV(lks, Autoneg);</div><div class='hunk'>@@ -404,9 +300,8 @@ static void xgbe_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> 	struct xgbe_hw_features *hw_feat = &amp;pdata-&gt;hw_feat;</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, XGBE_DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, XGBE_DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, dev_name(pdata-&gt;dev),</div><div class='add'>+	strscpy(drvinfo-&gt;driver, XGBE_DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, dev_name(pdata-&gt;dev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version), "%d.%d.%d",</div><div class='ctx'> 		 XGMAC_GET_BITS(hw_feat-&gt;version, MAC_VR, USERVER),</div><div class='hunk'>@@ -429,7 +324,9 @@ static void xgbe_set_msglevel(struct net_device *netdev, u32 msglevel)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_get_coalesce(struct net_device *netdev,</div><div class='del'>-			     struct ethtool_coalesce *ec)</div><div class='add'>+			     struct ethtool_coalesce *ec,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -438,42 +335,22 @@ static int xgbe_get_coalesce(struct net_device *netdev,</div><div class='ctx'> 	ec-&gt;rx_coalesce_usecs = pdata-&gt;rx_usecs;</div><div class='ctx'> 	ec-&gt;rx_max_coalesced_frames = pdata-&gt;rx_frames;</div><div class='ctx'> </div><div class='add'>+	ec-&gt;tx_coalesce_usecs = pdata-&gt;tx_usecs;</div><div class='ctx'> 	ec-&gt;tx_max_coalesced_frames = pdata-&gt;tx_frames;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_set_coalesce(struct net_device *netdev,</div><div class='del'>-			     struct ethtool_coalesce *ec)</div><div class='add'>+			     struct ethtool_coalesce *ec,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> 	struct xgbe_hw_if *hw_if = &amp;pdata-&gt;hw_if;</div><div class='ctx'> 	unsigned int rx_frames, rx_riwt, rx_usecs;</div><div class='del'>-	unsigned int tx_frames;</div><div class='del'>-</div><div class='del'>-	/* Check for not supported parameters  */</div><div class='del'>-	if ((ec-&gt;rx_coalesce_usecs_irq) ||</div><div class='del'>-	    (ec-&gt;rx_max_coalesced_frames_irq) ||</div><div class='del'>-	    (ec-&gt;tx_coalesce_usecs) ||</div><div class='del'>-	    (ec-&gt;tx_coalesce_usecs_irq) ||</div><div class='del'>-	    (ec-&gt;tx_max_coalesced_frames_irq) ||</div><div class='del'>-	    (ec-&gt;stats_block_coalesce_usecs) ||</div><div class='del'>-	    (ec-&gt;use_adaptive_rx_coalesce) ||</div><div class='del'>-	    (ec-&gt;use_adaptive_tx_coalesce) ||</div><div class='del'>-	    (ec-&gt;pkt_rate_low) ||</div><div class='del'>-	    (ec-&gt;rx_coalesce_usecs_low) ||</div><div class='del'>-	    (ec-&gt;rx_max_coalesced_frames_low) ||</div><div class='del'>-	    (ec-&gt;tx_coalesce_usecs_low) ||</div><div class='del'>-	    (ec-&gt;tx_max_coalesced_frames_low) ||</div><div class='del'>-	    (ec-&gt;pkt_rate_high) ||</div><div class='del'>-	    (ec-&gt;rx_coalesce_usecs_high) ||</div><div class='del'>-	    (ec-&gt;rx_max_coalesced_frames_high) ||</div><div class='del'>-	    (ec-&gt;tx_coalesce_usecs_high) ||</div><div class='del'>-	    (ec-&gt;tx_max_coalesced_frames_high) ||</div><div class='del'>-	    (ec-&gt;rate_sample_interval)) {</div><div class='del'>-		netdev_err(netdev, "unsupported coalescing parameter\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	unsigned int tx_frames, tx_usecs;</div><div class='add'>+	unsigned int jiffy_us = jiffies_to_usecs(1);</div><div class='ctx'> </div><div class='ctx'> 	rx_riwt = hw_if-&gt;usec_to_riwt(pdata, ec-&gt;rx_coalesce_usecs);</div><div class='ctx'> 	rx_usecs = ec-&gt;rx_coalesce_usecs;</div><div class='hunk'>@@ -495,20 +372,42 @@ static int xgbe_set_coalesce(struct net_device *netdev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	tx_usecs = ec-&gt;tx_coalesce_usecs;</div><div class='ctx'> 	tx_frames = ec-&gt;tx_max_coalesced_frames;</div><div class='ctx'> </div><div class='ctx'> 	/* Check the bounds of values for Tx */</div><div class='add'>+	if (!tx_usecs) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack,</div><div class='add'>+				       "tx-usecs must not be 0");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (tx_usecs &gt; XGMAC_MAX_COAL_TX_TICK) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack, "tx-usecs is limited to %d usec",</div><div class='add'>+				       XGMAC_MAX_COAL_TX_TICK);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	if (tx_frames &gt; pdata-&gt;tx_desc_count) {</div><div class='ctx'> 		netdev_err(netdev, "tx-frames is limited to %d frames\n",</div><div class='ctx'> 			   pdata-&gt;tx_desc_count);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Round tx-usecs to nearest multiple of jiffy granularity */</div><div class='add'>+	if (tx_usecs % jiffy_us) {</div><div class='add'>+		tx_usecs = rounddown(tx_usecs, jiffy_us);</div><div class='add'>+		if (!tx_usecs)</div><div class='add'>+			tx_usecs = jiffy_us;</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack,</div><div class='add'>+				       "tx-usecs rounded to %u usec due to jiffy granularity (%u usec)",</div><div class='add'>+				       tx_usecs, jiffy_us);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pdata-&gt;rx_riwt = rx_riwt;</div><div class='ctx'> 	pdata-&gt;rx_usecs = rx_usecs;</div><div class='ctx'> 	pdata-&gt;rx_frames = rx_frames;</div><div class='ctx'> 	hw_if-&gt;config_rx_coalesce(pdata);</div><div class='ctx'> </div><div class='add'>+	pdata-&gt;tx_usecs = tx_usecs;</div><div class='ctx'> 	pdata-&gt;tx_frames = tx_frames;</div><div class='ctx'> 	hw_if-&gt;config_tx_coalesce(pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -545,47 +444,48 @@ static u32 xgbe_get_rxfh_indir_size(struct net_device *netdev)</div><div class='ctx'> 	return ARRAY_SIZE(pdata-&gt;rss_table);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,</div><div class='del'>-			 u8 *hfunc)</div><div class='add'>+static int xgbe_get_rxfh(struct net_device *netdev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	if (indir) {</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(pdata-&gt;rss_table); i++)</div><div class='del'>-			indir[i] = XGMAC_GET_BITS(pdata-&gt;rss_table[i],</div><div class='del'>-						  MAC_RSSDR, DMCH);</div><div class='add'>+			rxfh-&gt;indir[i] = XGMAC_GET_BITS(pdata-&gt;rss_table[i],</div><div class='add'>+							MAC_RSSDR, DMCH);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (key)</div><div class='del'>-		memcpy(key, pdata-&gt;rss_key, sizeof(pdata-&gt;rss_key));</div><div class='add'>+	if (rxfh-&gt;key)</div><div class='add'>+		memcpy(rxfh-&gt;key, pdata-&gt;rss_key, sizeof(pdata-&gt;rss_key));</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,</div><div class='del'>-			 const u8 *key, const u8 hfunc)</div><div class='add'>+static int xgbe_set_rxfh(struct net_device *netdev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> 	struct xgbe_hw_if *hw_if = &amp;pdata-&gt;hw_if;</div><div class='del'>-	unsigned int ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP) {</div><div class='add'>+	if (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	    rxfh-&gt;hfunc != ETH_RSS_HASH_TOP) {</div><div class='ctx'> 		netdev_err(netdev, "unsupported hash function\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (indir) {</div><div class='del'>-		ret = hw_if-&gt;set_rss_lookup_table(pdata, indir);</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='add'>+		ret = hw_if-&gt;set_rss_lookup_table(pdata, rxfh-&gt;indir);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (key) {</div><div class='del'>-		ret = hw_if-&gt;set_rss_hash_key(pdata, key);</div><div class='add'>+	if (rxfh-&gt;key) {</div><div class='add'>+		ret = hw_if-&gt;set_rss_hash_key(pdata, rxfh-&gt;key);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -594,21 +494,17 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_get_ts_info(struct net_device *netdev,</div><div class='del'>-			    struct ethtool_ts_info *ts_info)</div><div class='add'>+			    struct kernel_ethtool_ts_info *ts_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	ts_info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-				   SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-				   SOF_TIMESTAMPING_SOFTWARE |</div><div class='ctx'> 				   SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='ctx'> 				   SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='ctx'> 				   SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;ptp_clock)</div><div class='ctx'> 		ts_info-&gt;phc_index = ptp_clock_index(pdata-&gt;ptp_clock);</div><div class='del'>-	else</div><div class='del'>-		ts_info-&gt;phc_index = -1;</div><div class='ctx'> </div><div class='ctx'> 	ts_info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) | (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='ctx'> 	ts_info-&gt;rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='hunk'>@@ -642,8 +538,11 @@ static int xgbe_get_module_eeprom(struct net_device *netdev,</div><div class='ctx'> 	return pdata-&gt;phy_if.module_eeprom(pdata, eeprom, data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_get_ringparam(struct net_device *netdev,</div><div class='del'>-			       struct ethtool_ringparam *ringparam)</div><div class='add'>+static void</div><div class='add'>+xgbe_get_ringparam(struct net_device *netdev,</div><div class='add'>+		   struct ethtool_ringparam *ringparam,</div><div class='add'>+		   struct kernel_ethtool_ringparam *kernel_ringparam,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -654,7 +553,9 @@ static void xgbe_get_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_set_ringparam(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_ringparam *ringparam)</div><div class='add'>+			      struct ethtool_ringparam *ringparam,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ringparam,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='ctx'> 	unsigned int rx, tx;</div><div class='hunk'>@@ -838,6 +739,8 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops xgbe_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES,</div><div class='ctx'> 	.get_drvinfo = xgbe_get_drvinfo,</div><div class='ctx'> 	.get_msglevel = xgbe_get_msglevel,</div><div class='ctx'> 	.set_msglevel = xgbe_set_msglevel,</div><div class='hunk'>@@ -863,6 +766,7 @@ static const struct ethtool_ops xgbe_ethtool_ops = {</div><div class='ctx'> 	.set_ringparam = xgbe_set_ringparam,</div><div class='ctx'> 	.get_channels = xgbe_get_channels,</div><div class='ctx'> 	.set_channels = xgbe_set_channels,</div><div class='add'>+	.self_test = xgbe_selftest_run,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> const struct ethtool_ops *xgbe_get_ethtool_ops(void)</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c b/drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c<br/>new file mode 100644<br/>index 000000000000..0127988e10be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-hwtstamp.c</a></div><div class='hunk'>@@ -0,0 +1,399 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * Author: Raju Rangoju &lt;Raju.Rangoju@amd.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "xgbe.h"</div><div class='add'>+#include "xgbe-common.h"</div><div class='add'>+</div><div class='add'>+void xgbe_update_tstamp_time(struct xgbe_prv_data *pdata,</div><div class='add'>+			     unsigned int sec, unsigned int nsec)</div><div class='add'>+{</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	/* Set the time values and tell the device */</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_STSUR, sec);</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_STNUR, nsec);</div><div class='add'>+</div><div class='add'>+	/* issue command to update the system time value */</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_TSCR,</div><div class='add'>+		      XGMAC_IOREAD(pdata, MAC_TSCR) |</div><div class='add'>+		      (1 &lt;&lt; MAC_TSCR_TSUPDT_INDEX));</div><div class='add'>+</div><div class='add'>+	/* Wait for the time adjust/update to complete */</div><div class='add'>+	count = 10000;</div><div class='add'>+	while (--count &amp;&amp; XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSUPDT))</div><div class='add'>+		udelay(5);</div><div class='add'>+</div><div class='add'>+	if (count &lt; 0)</div><div class='add'>+		netdev_err(pdata-&gt;netdev,</div><div class='add'>+			   "timed out updating system timestamp\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_update_tstamp_addend(struct xgbe_prv_data *pdata,</div><div class='add'>+			       unsigned int addend)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = 10000;</div><div class='add'>+</div><div class='add'>+	/* Set the addend register value and tell the device */</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_TSAR, addend);</div><div class='add'>+	XGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSADDREG, 1);</div><div class='add'>+</div><div class='add'>+	/* Wait for addend update to complete */</div><div class='add'>+	while (--count &amp;&amp; XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSADDREG))</div><div class='add'>+		udelay(5);</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		netdev_err(pdata-&gt;netdev,</div><div class='add'>+			   "timed out updating timestamp addend register\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_set_tstamp_time(struct xgbe_prv_data *pdata, unsigned int sec,</div><div class='add'>+			  unsigned int nsec)</div><div class='add'>+{</div><div class='add'>+	unsigned int count = 10000;</div><div class='add'>+</div><div class='add'>+	/* Set the time values and tell the device */</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_STSUR, sec);</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_STNUR, nsec);</div><div class='add'>+	XGMAC_IOWRITE_BITS(pdata, MAC_TSCR, TSINIT, 1);</div><div class='add'>+</div><div class='add'>+	/* Wait for time update to complete */</div><div class='add'>+	while (--count &amp;&amp; XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSINIT))</div><div class='add'>+		udelay(5);</div><div class='add'>+</div><div class='add'>+	if (!count)</div><div class='add'>+		netdev_err(pdata-&gt;netdev, "timed out initializing timestamp\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 xgbe_get_tstamp_time(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	u64 nsec;</div><div class='add'>+</div><div class='add'>+	nsec = XGMAC_IOREAD(pdata, MAC_STSR);</div><div class='add'>+	nsec *= NSEC_PER_SEC;</div><div class='add'>+	nsec += XGMAC_IOREAD(pdata, MAC_STNR);</div><div class='add'>+</div><div class='add'>+	return nsec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 xgbe_get_tx_tstamp(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	unsigned int tx_snr, tx_ssr;</div><div class='add'>+	u64 nsec;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;vdata-&gt;tx_tstamp_workaround) {</div><div class='add'>+		tx_snr = XGMAC_IOREAD(pdata, MAC_TXSNR);</div><div class='add'>+		tx_ssr = XGMAC_IOREAD(pdata, MAC_TXSSR);</div><div class='add'>+	} else {</div><div class='add'>+		tx_ssr = XGMAC_IOREAD(pdata, MAC_TXSSR);</div><div class='add'>+		tx_snr = XGMAC_IOREAD(pdata, MAC_TXSNR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (XGMAC_GET_BITS(tx_snr, MAC_TXSNR, TXTSSTSMIS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nsec = tx_ssr;</div><div class='add'>+	nsec *= NSEC_PER_SEC;</div><div class='add'>+	nsec += tx_snr;</div><div class='add'>+</div><div class='add'>+	return nsec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_get_rx_tstamp(struct xgbe_packet_data *packet,</div><div class='add'>+			struct xgbe_ring_desc *rdesc)</div><div class='add'>+{</div><div class='add'>+	u64 nsec;</div><div class='add'>+</div><div class='add'>+	if (XGMAC_GET_BITS_LE(rdesc-&gt;desc3, RX_CONTEXT_DESC3, TSA) &amp;&amp;</div><div class='add'>+	    !XGMAC_GET_BITS_LE(rdesc-&gt;desc3, RX_CONTEXT_DESC3, TSD)) {</div><div class='add'>+		nsec = le32_to_cpu(rdesc-&gt;desc1);</div><div class='add'>+		nsec *= NSEC_PER_SEC;</div><div class='add'>+		nsec += le32_to_cpu(rdesc-&gt;desc0);</div><div class='add'>+		if (nsec != 0xffffffffffffffffULL) {</div><div class='add'>+			packet-&gt;rx_tstamp = nsec;</div><div class='add'>+			XGMAC_SET_BITS(packet-&gt;attributes, RX_PACKET_ATTRIBUTES,</div><div class='add'>+				       RX_TSTAMP, 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_config_tstamp(struct xgbe_prv_data *pdata, unsigned int mac_tscr)</div><div class='add'>+{</div><div class='add'>+	unsigned int value = 0;</div><div class='add'>+</div><div class='add'>+	value = XGMAC_IOREAD(pdata, MAC_TSCR);</div><div class='add'>+	value |= mac_tscr;</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_TSCR, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_tx_tstamp(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_prv_data *pdata = container_of(work,</div><div class='add'>+						   struct xgbe_prv_data,</div><div class='add'>+						   tx_tstamp_work);</div><div class='add'>+	struct skb_shared_hwtstamps hwtstamps;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='add'>+	if (!pdata-&gt;tx_tstamp_skb)</div><div class='add'>+		goto unlock;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;tx_tstamp) {</div><div class='add'>+		memset(&amp;hwtstamps, 0, sizeof(hwtstamps));</div><div class='add'>+		hwtstamps.hwtstamp = ns_to_ktime(pdata-&gt;tx_tstamp);</div><div class='add'>+		skb_tstamp_tx(pdata-&gt;tx_tstamp_skb, &amp;hwtstamps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb_any(pdata-&gt;tx_tstamp_skb);</div><div class='add'>+</div><div class='add'>+	pdata-&gt;tx_tstamp_skb = NULL;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xgbe_get_hwtstamp_settings(struct net_device *netdev,</div><div class='add'>+			       struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	*config = pdata-&gt;tstamp_config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xgbe_set_hwtstamp_settings(struct net_device *netdev,</div><div class='add'>+			       struct kernel_hwtstamp_config *config,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_prv_data *pdata = netdev_priv(netdev);</div><div class='add'>+	unsigned int mac_tscr = 0;</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='add'>+	case HWTSTAMP_FILTER_ALL:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENALL, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* PTP v2, UDP, any kind of event packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='add'>+		fallthrough;    /* to PTP v1, UDP, any kind of event packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+		/* PTP v2, UDP, Sync packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='add'>+		fallthrough;    /* to PTP v1, UDP, Sync packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* PTP v2, UDP, Delay_req packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='add'>+		fallthrough;    /* to PTP v1, UDP, Delay_req packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* 802.AS1, Ethernet, any kind of event packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* 802.AS1, Ethernet, Sync packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* 802.AS1, Ethernet, Delay_req packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, AV8021ASMEN, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* PTP v2/802.AS1, any layer, any kind of event packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, SNAPTYPSEL, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* PTP v2/802.AS1, any layer, Sync packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+		/* PTP v2/802.AS1, any layer, Delay_req packet */</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSVER2ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV4ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSIPV6ENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSMSTRENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSEVNTENA, 1);</div><div class='add'>+		XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xgbe_config_tstamp(pdata, mac_tscr);</div><div class='add'>+</div><div class='add'>+	pdata-&gt;tstamp_config = *config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_prep_tx_tstamp(struct xgbe_prv_data *pdata,</div><div class='add'>+			 struct sk_buff *skb,</div><div class='add'>+			 struct xgbe_packet_data *packet)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (XGMAC_GET_BITS(packet-&gt;attributes, TX_PACKET_ATTRIBUTES, PTP)) {</div><div class='add'>+		spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='add'>+		if (pdata-&gt;tx_tstamp_skb) {</div><div class='add'>+			/* Another timestamp in progress, ignore this one */</div><div class='add'>+			XGMAC_SET_BITS(packet-&gt;attributes,</div><div class='add'>+				       TX_PACKET_ATTRIBUTES, PTP, 0);</div><div class='add'>+		} else {</div><div class='add'>+			pdata-&gt;tx_tstamp_skb = skb_get(skb);</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xgbe_init_ptp(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	unsigned int mac_tscr = 0;</div><div class='add'>+	struct timespec64 now;</div><div class='add'>+	u64 dividend;</div><div class='add'>+</div><div class='add'>+	/* Register Settings to be done based on the link speed. */</div><div class='add'>+	switch (pdata-&gt;phy.speed) {</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		XGMAC_IOWRITE(pdata, MAC_TICNR, MAC_TICNR_1G_INITVAL);</div><div class='add'>+		XGMAC_IOWRITE(pdata, MAC_TECNR, MAC_TECNR_1G_INITVAL);</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_2500:</div><div class='add'>+	case SPEED_10000:</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_TICSNR, TSICSNS,</div><div class='add'>+				   MAC_TICSNR_10G_INITVAL);</div><div class='add'>+		XGMAC_IOWRITE(pdata, MAC_TECNR, MAC_TECNR_10G_INITVAL);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_TECSNR, TSECSNS,</div><div class='add'>+				   MAC_TECSNR_10G_INITVAL);</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_UNKNOWN:</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable IEEE1588 PTP clock. */</div><div class='add'>+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSENA, 1);</div><div class='add'>+</div><div class='add'>+	/* Overwrite earlier timestamps */</div><div class='add'>+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TXTSSTSM, 1);</div><div class='add'>+</div><div class='add'>+	/* Set one nano-second accuracy */</div><div class='add'>+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCTRLSSR, 1);</div><div class='add'>+</div><div class='add'>+	/* Set fine timestamp update */</div><div class='add'>+	XGMAC_SET_BITS(mac_tscr, MAC_TSCR, TSCFUPDT, 1);</div><div class='add'>+</div><div class='add'>+	xgbe_config_tstamp(pdata, mac_tscr);</div><div class='add'>+</div><div class='add'>+	/* Exit if timestamping is not enabled */</div><div class='add'>+	if (!XGMAC_GET_BITS(mac_tscr, MAC_TSCR, TSENA))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;vdata-&gt;tstamp_ptp_clock_freq) {</div><div class='add'>+		/* Initialize time registers based on</div><div class='add'>+		 * 125MHz PTP Clock Frequency</div><div class='add'>+		 */</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SSINC,</div><div class='add'>+				   XGBE_V2_TSTAMP_SSINC);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SNSINC,</div><div class='add'>+				   XGBE_V2_TSTAMP_SNSINC);</div><div class='add'>+	} else {</div><div class='add'>+		/* Initialize time registers based on</div><div class='add'>+		 * 50MHz PTP Clock Frequency</div><div class='add'>+		 */</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SSINC, XGBE_TSTAMP_SSINC);</div><div class='add'>+		XGMAC_IOWRITE_BITS(pdata, MAC_SSIR, SNSINC, XGBE_TSTAMP_SNSINC);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate the addend:</div><div class='add'>+	 *   addend = 2^32 / (PTP ref clock / (PTP clock based on SSINC))</div><div class='add'>+	 *          = (2^32 * (PTP clock based on SSINC)) / PTP ref clock</div><div class='add'>+	 */</div><div class='add'>+	if (pdata-&gt;vdata-&gt;tstamp_ptp_clock_freq)</div><div class='add'>+		dividend = XGBE_V2_PTP_ACT_CLK_FREQ;</div><div class='add'>+	else</div><div class='add'>+		dividend = XGBE_PTP_ACT_CLK_FREQ;</div><div class='add'>+</div><div class='add'>+	dividend = (u64)(dividend &lt;&lt; 32);</div><div class='add'>+	pdata-&gt;tstamp_addend = div_u64(dividend, pdata-&gt;ptpclk_rate);</div><div class='add'>+</div><div class='add'>+	xgbe_update_tstamp_addend(pdata, pdata-&gt;tstamp_addend);</div><div class='add'>+</div><div class='add'>+	dma_wmb();</div><div class='add'>+	/* initialize system time */</div><div class='add'>+	ktime_get_real_ts64(&amp;now);</div><div class='add'>+</div><div class='add'>+	/* lower 32 bits of tv_sec are safe until y2106 */</div><div class='add'>+	xgbe_set_tstamp_time(pdata, (u32)now.tv_sec, now.tv_nsec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c b/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c<br/>index 4d9062d35930..65eb7b577b65 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-i2c.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-i2c.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -179,7 +70,7 @@ static int xgbe_i2c_set_enable(struct xgbe_prv_data *pdata, bool enable)</div><div class='ctx'> </div><div class='ctx'> static int xgbe_i2c_disable(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	unsigned int ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = xgbe_i2c_set_enable(pdata, false);</div><div class='ctx'> 	if (ret) {</div><div class='hunk'>@@ -274,9 +165,9 @@ static void xgbe_i2c_clear_isr_interrupts(struct xgbe_prv_data *pdata,</div><div class='ctx'> 		XI2C_IOREAD(pdata, IC_CLR_STOP_DET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_i2c_isr_task(unsigned long data)</div><div class='add'>+static void xgbe_i2c_isr_bh_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;</div><div class='add'>+	struct xgbe_prv_data *pdata = from_work(pdata, work, i2c_bh_work);</div><div class='ctx'> 	struct xgbe_i2c_op_state *state = &amp;pdata-&gt;i2c.op_state;</div><div class='ctx'> 	unsigned int isr;</div><div class='ctx'> </div><div class='hunk'>@@ -321,10 +212,10 @@ static irqreturn_t xgbe_i2c_isr(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;isr_as_tasklet)</div><div class='del'>-		tasklet_schedule(&amp;pdata-&gt;tasklet_i2c);</div><div class='add'>+	if (pdata-&gt;isr_as_bh_work)</div><div class='add'>+		queue_work(system_bh_wq, &amp;pdata-&gt;i2c_bh_work);</div><div class='ctx'> 	else</div><div class='del'>-		xgbe_i2c_isr_task((unsigned long)pdata);</div><div class='add'>+		xgbe_i2c_isr_bh_work(&amp;pdata-&gt;i2c_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -369,7 +260,7 @@ static void xgbe_i2c_set_target(struct xgbe_prv_data *pdata, unsigned int addr)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t xgbe_i2c_combined_isr(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	xgbe_i2c_isr_task((unsigned long)pdata);</div><div class='add'>+	xgbe_i2c_isr_bh_work(&amp;pdata-&gt;i2c_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -447,8 +338,10 @@ static void xgbe_i2c_stop(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_i2c_disable(pdata);</div><div class='ctx'> 	xgbe_i2c_clear_all_interrupts(pdata);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;dev_irq != pdata-&gt;i2c_irq)</div><div class='add'>+	if (pdata-&gt;dev_irq != pdata-&gt;i2c_irq) {</div><div class='ctx'> 		devm_free_irq(pdata-&gt;dev, pdata-&gt;i2c_irq, pdata);</div><div class='add'>+		cancel_work_sync(&amp;pdata-&gt;i2c_bh_work);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_i2c_start(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -462,8 +355,7 @@ static int xgbe_i2c_start(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	/* If we have a separate I2C irq, enable it */</div><div class='ctx'> 	if (pdata-&gt;dev_irq != pdata-&gt;i2c_irq) {</div><div class='del'>-		tasklet_init(&amp;pdata-&gt;tasklet_i2c, xgbe_i2c_isr_task,</div><div class='del'>-			     (unsigned long)pdata);</div><div class='add'>+		INIT_WORK(&amp;pdata-&gt;i2c_bh_work, xgbe_i2c_isr_bh_work);</div><div class='ctx'> </div><div class='ctx'> 		ret = devm_request_irq(pdata-&gt;dev, pdata-&gt;i2c_irq,</div><div class='ctx'> 				       xgbe_i2c_isr, 0, pdata-&gt;i2c_name,</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c<br/>index b41f23679a08..d1f0419edb23 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-main.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -127,7 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Tom Lendacky &lt;thomas.lendacky@amd.com&gt;");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_VERSION(XGBE_DRV_VERSION);</div><div class='ctx'> MODULE_DESCRIPTION(XGBE_DRV_DESC);</div><div class='ctx'> </div><div class='ctx'> static int debug = -1;</div><div class='hunk'>@@ -193,7 +83,6 @@ struct xgbe_prv_data *xgbe_alloc_pdata(struct device *dev)</div><div class='ctx'> 	mutex_init(&amp;pdata-&gt;i2c_mutex);</div><div class='ctx'> 	init_completion(&amp;pdata-&gt;i2c_complete);</div><div class='ctx'> 	init_completion(&amp;pdata-&gt;mdio_complete);</div><div class='del'>-	INIT_LIST_HEAD(&amp;pdata-&gt;vxlan_ports);</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;msg_enable = netif_msg_init(debug, default_msg_level);</div><div class='ctx'> </div><div class='hunk'>@@ -269,7 +158,7 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;irq = pdata-&gt;dev_irq;</div><div class='ctx'> 	netdev-&gt;base_addr = (unsigned long)pdata-&gt;xgmac_regs;</div><div class='del'>-	memcpy(netdev-&gt;dev_addr, pdata-&gt;mac_addr, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, pdata-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize ECC timestamps */</div><div class='ctx'> 	pdata-&gt;tx_sec_period = jiffies;</div><div class='hunk'>@@ -367,17 +256,12 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata)</div><div class='ctx'> 					  NETIF_F_TSO6 |</div><div class='ctx'> 					  NETIF_F_GRO |</div><div class='ctx'> 					  NETIF_F_GSO_UDP_TUNNEL |</div><div class='del'>-					  NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='del'>-					  NETIF_F_RX_UDP_TUNNEL_PORT;</div><div class='add'>+					  NETIF_F_GSO_UDP_TUNNEL_CSUM;</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;hw_features |= NETIF_F_GSO_UDP_TUNNEL |</div><div class='del'>-				       NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='del'>-				       NETIF_F_RX_UDP_TUNNEL_PORT;</div><div class='add'>+				       NETIF_F_GSO_UDP_TUNNEL_CSUM;</div><div class='ctx'> </div><div class='del'>-		pdata-&gt;vxlan_offloads_set = 1;</div><div class='del'>-		pdata-&gt;vxlan_features = NETIF_F_GSO_UDP_TUNNEL |</div><div class='del'>-					NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='del'>-					NETIF_F_RX_UDP_TUNNEL_PORT;</div><div class='add'>+		netdev-&gt;udp_tunnel_nic_info = xgbe_get_udp_tunnel_info();</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;vlan_features |= NETIF_F_SG |</div><div class='hunk'>@@ -391,7 +275,7 @@ int xgbe_config_netdev(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='ctx'> 	netdev-&gt;min_mtu = 0;</div><div class='del'>-	netdev-&gt;max_mtu = XGMAC_JUMBO_PACKET_MTU;</div><div class='add'>+	netdev-&gt;max_mtu = XGMAC_GIANT_PACKET_MTU - XGBE_ETH_FRAME_HDR;</div><div class='ctx'> </div><div class='ctx'> 	/* Use default watchdog timeout */</div><div class='ctx'> 	netdev-&gt;watchdog_timeo = 0;</div><div class='hunk'>@@ -469,13 +353,19 @@ static int __init xgbe_mod_init(void)</div><div class='ctx'> </div><div class='ctx'> 	ret = xgbe_platform_init();</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_platform_init;</div><div class='ctx'> </div><div class='ctx'> 	ret = xgbe_pci_init();</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto err_pci_init;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_pci_init:</div><div class='add'>+	xgbe_platform_exit();</div><div class='add'>+err_platform_init:</div><div class='add'>+	unregister_netdevice_notifier(&amp;xgbe_netdev_notifier);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit xgbe_mod_exit(void)</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c<br/>index 8a3a60bb2688..7675bb98f029 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-mdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-mdio.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='hunk'>@@ -274,6 +165,15 @@ static void xgbe_sgmii_1000_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	pdata-&gt;phy_if.phy_impl.set_mode(pdata, XGBE_MODE_SGMII_1000);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void xgbe_sgmii_10_mode(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	/* Set MAC to 10M speed */</div><div class='add'>+	pdata-&gt;hw_if.set_speed(pdata, SPEED_10);</div><div class='add'>+</div><div class='add'>+	/* Call PHY implementation support to complete rate change */</div><div class='add'>+	pdata-&gt;phy_if.phy_impl.set_mode(pdata, XGBE_MODE_SGMII_10);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void xgbe_sgmii_100_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	/* Set MAC to 1G speed */</div><div class='hunk'>@@ -306,6 +206,9 @@ static void xgbe_change_mode(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	case XGBE_MODE_KR:</div><div class='ctx'> 		xgbe_kr_mode(pdata);</div><div class='ctx'> 		break;</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='add'>+		xgbe_sgmii_10_mode(pdata);</div><div class='add'>+		break;</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 		xgbe_sgmii_100_mode(pdata);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -363,6 +266,10 @@ static void xgbe_an37_set(struct xgbe_prv_data *pdata, bool enable,</div><div class='ctx'> 		reg |= MDIO_VEND2_CTRL1_AN_RESTART;</div><div class='ctx'> </div><div class='ctx'> 	XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_CTRL1, reg);</div><div class='add'>+</div><div class='add'>+	reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_PCS_DIG_CTRL);</div><div class='add'>+	reg |= XGBE_VEND2_MAC_AUTO_SW;</div><div class='add'>+	XMDIO_WRITE(pdata, MDIO_MMD_VEND2, MDIO_PCS_DIG_CTRL, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_an37_restart(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -496,6 +403,7 @@ static enum xgbe_an xgbe_an73_tx_training(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	reg |= XGBE_KR_TRAINING_ENABLE;</div><div class='ctx'> 	reg |= XGBE_KR_TRAINING_START;</div><div class='ctx'> 	XMDIO_WRITE(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, reg);</div><div class='add'>+	pdata-&gt;kr_start_time = jiffies;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, link, pdata-&gt;netdev,</div><div class='ctx'> 		  "KR training initiated\n");</div><div class='hunk'>@@ -632,6 +540,8 @@ static enum xgbe_an xgbe_an73_incompat_link(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	xgbe_switch_mode(pdata);</div><div class='ctx'> </div><div class='add'>+	pdata-&gt;an_result = XGBE_AN_READY;</div><div class='add'>+</div><div class='ctx'> 	xgbe_an_restart(pdata);</div><div class='ctx'> </div><div class='ctx'> 	return XGBE_AN_INCOMPAT_LINK;</div><div class='hunk'>@@ -688,9 +598,9 @@ static void xgbe_an73_isr(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_an_isr_task(unsigned long data)</div><div class='add'>+static void xgbe_an_isr_bh_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;</div><div class='add'>+	struct xgbe_prv_data *pdata = from_work(pdata, work, an_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, intr, pdata-&gt;netdev, "AN interrupt received\n");</div><div class='ctx'> </div><div class='hunk'>@@ -712,17 +622,17 @@ static irqreturn_t xgbe_an_isr(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;isr_as_tasklet)</div><div class='del'>-		tasklet_schedule(&amp;pdata-&gt;tasklet_an);</div><div class='add'>+	if (pdata-&gt;isr_as_bh_work)</div><div class='add'>+		queue_work(system_bh_wq, &amp;pdata-&gt;an_bh_work);</div><div class='ctx'> 	else</div><div class='del'>-		xgbe_an_isr_task((unsigned long)pdata);</div><div class='add'>+		xgbe_an_isr_bh_work(&amp;pdata-&gt;an_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t xgbe_an_combined_isr(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	xgbe_an_isr_task((unsigned long)pdata);</div><div class='add'>+	xgbe_an_isr_bh_work(&amp;pdata-&gt;an_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='hunk'>@@ -988,6 +898,11 @@ static void xgbe_an37_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, link, pdata-&gt;netdev, "CL37 AN (%s) initialized\n",</div><div class='ctx'> 		  (pdata-&gt;an_mode == XGBE_AN_MODE_CL37) ? "BaseX" : "SGMII");</div><div class='add'>+</div><div class='add'>+	reg = XMDIO_READ(pdata, MDIO_MMD_AN, MDIO_CTRL1);</div><div class='add'>+	reg &amp;= ~MDIO_AN_CTRL1_ENABLE;</div><div class='add'>+	XMDIO_WRITE(pdata, MDIO_MMD_AN, MDIO_CTRL1, reg);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_an73_init(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -1074,6 +989,8 @@ static const char *xgbe_phy_fc_string(struct xgbe_prv_data *pdata)</div><div class='ctx'> static const char *xgbe_phy_speed_string(int speed)</div><div class='ctx'> {</div><div class='ctx'> 	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		return "10Mbps";</div><div class='ctx'> 	case SPEED_100:</div><div class='ctx'> 		return "100Mbps";</div><div class='ctx'> 	case SPEED_1000:</div><div class='hunk'>@@ -1161,6 +1078,7 @@ static int xgbe_phy_config_fixed(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	case XGBE_MODE_KX_1000:</div><div class='ctx'> 	case XGBE_MODE_KX_2500:</div><div class='ctx'> 	case XGBE_MODE_KR:</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 	case XGBE_MODE_SGMII_1000:</div><div class='ctx'> 	case XGBE_MODE_X:</div><div class='hunk'>@@ -1175,7 +1093,19 @@ static int xgbe_phy_config_fixed(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	if (pdata-&gt;phy.duplex != DUPLEX_FULL)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	xgbe_set_mode(pdata, mode);</div><div class='add'>+	/* Force the mode change for SFI in Fixed PHY config.</div><div class='add'>+	 * Fixed PHY configs needs PLL to be enabled while doing mode set.</div><div class='add'>+	 * When the SFP module isn't connected during boot, driver assumes</div><div class='add'>+	 * AN is ON and attempts autonegotiation. However, if the connected</div><div class='add'>+	 * SFP comes up in Fixed PHY config, the link will not come up as</div><div class='add'>+	 * PLL isn't enabled while the initial mode set command is issued.</div><div class='add'>+	 * So, force the mode change for SFI in Fixed PHY configuration to</div><div class='add'>+	 * fix link issues.</div><div class='add'>+	 */</div><div class='add'>+	if (mode == XGBE_MODE_SFI)</div><div class='add'>+		xgbe_change_mode(pdata, mode);</div><div class='add'>+	else</div><div class='add'>+		xgbe_set_mode(pdata, mode);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1222,6 +1152,8 @@ static int __xgbe_phy_config_aneg(struct xgbe_prv_data *pdata, bool set_mode)</div><div class='ctx'> 			xgbe_set_mode(pdata, XGBE_MODE_SGMII_1000);</div><div class='ctx'> 		} else if (xgbe_use_mode(pdata, XGBE_MODE_SGMII_100)) {</div><div class='ctx'> 			xgbe_set_mode(pdata, XGBE_MODE_SGMII_100);</div><div class='add'>+		} else if (xgbe_use_mode(pdata, XGBE_MODE_SGMII_10)) {</div><div class='add'>+			xgbe_set_mode(pdata, XGBE_MODE_SGMII_10);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			enable_irq(pdata-&gt;an_irq);</div><div class='ctx'> 			ret = -EINVAL;</div><div class='hunk'>@@ -1275,9 +1207,30 @@ static bool xgbe_phy_aneg_done(struct xgbe_prv_data *pdata)</div><div class='ctx'> static void xgbe_check_link_timeout(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long link_timeout;</div><div class='add'>+	unsigned long kr_time;</div><div class='add'>+	int wait;</div><div class='ctx'> </div><div class='ctx'> 	link_timeout = pdata-&gt;link_check + (XGBE_LINK_TIMEOUT * HZ);</div><div class='ctx'> 	if (time_after(jiffies, link_timeout)) {</div><div class='add'>+		if ((xgbe_cur_mode(pdata) == XGBE_MODE_KR) &amp;&amp;</div><div class='add'>+		    pdata-&gt;phy.autoneg == AUTONEG_ENABLE) {</div><div class='add'>+			/* AN restart should not happen while KR training is in progress.</div><div class='add'>+			 * The while loop ensures no AN restart during KR training,</div><div class='add'>+			 * waits up to 500ms and AN restart is triggered only if KR</div><div class='add'>+			 * training is failed.</div><div class='add'>+			 */</div><div class='add'>+			wait = XGBE_KR_TRAINING_WAIT_ITER;</div><div class='add'>+			while (wait--) {</div><div class='add'>+				kr_time = pdata-&gt;kr_start_time +</div><div class='add'>+					  msecs_to_jiffies(XGBE_AN_MS_TIMEOUT);</div><div class='add'>+				if (time_after(jiffies, kr_time))</div><div class='add'>+					break;</div><div class='add'>+				/* AN restart is not required, if AN result is COMPLETE */</div><div class='add'>+				if (pdata-&gt;an_result == XGBE_AN_COMPLETE)</div><div class='add'>+					return;</div><div class='add'>+				usleep_range(10000, 11000);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		netif_dbg(pdata, link, pdata-&gt;netdev, "AN link timeout\n");</div><div class='ctx'> 		xgbe_phy_config_aneg(pdata);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1288,7 +1241,7 @@ static enum xgbe_mode xgbe_phy_status_aneg(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	return pdata-&gt;phy_if.phy_impl.an_outcome(pdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgbe_phy_status_result(struct xgbe_prv_data *pdata)</div><div class='add'>+static bool xgbe_phy_status_result(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_link_ksettings *lks = &amp;pdata-&gt;phy.lks;</div><div class='ctx'> 	enum xgbe_mode mode;</div><div class='hunk'>@@ -1301,6 +1254,9 @@ static void xgbe_phy_status_result(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		mode = xgbe_phy_status_aneg(pdata);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='add'>+		pdata-&gt;phy.speed = SPEED_10;</div><div class='add'>+		break;</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 		pdata-&gt;phy.speed = SPEED_100;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1323,8 +1279,13 @@ static void xgbe_phy_status_result(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;phy.duplex = DUPLEX_FULL;</div><div class='ctx'> </div><div class='del'>-	if (xgbe_set_mode(pdata, mode) &amp;&amp; pdata-&gt;an_again)</div><div class='add'>+	if (!xgbe_set_mode(pdata, mode))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;an_again)</div><div class='ctx'> 		xgbe_phy_reconfig_aneg(pdata);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_phy_status(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -1343,9 +1304,13 @@ static void xgbe_phy_status(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;phy.link = pdata-&gt;phy_if.phy_impl.link_status(pdata,</div><div class='ctx'> 							     &amp;an_restart);</div><div class='add'>+	/* bail out if the link status register read fails */</div><div class='add'>+	if (pdata-&gt;phy.link &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (an_restart) {</div><div class='ctx'> 		xgbe_phy_config_aneg(pdata);</div><div class='del'>-		return;</div><div class='add'>+		goto adjust_link;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (pdata-&gt;phy.link) {</div><div class='hunk'>@@ -1354,7 +1319,8 @@ static void xgbe_phy_status(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		xgbe_phy_status_result(pdata);</div><div class='add'>+		if (xgbe_phy_status_result(pdata))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='ctx'> 		if (test_bit(XGBE_LINK_INIT, &amp;pdata-&gt;dev_state))</div><div class='ctx'> 			clear_bit(XGBE_LINK_INIT, &amp;pdata-&gt;dev_state);</div><div class='hunk'>@@ -1390,13 +1356,14 @@ static void xgbe_phy_stop(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	/* Disable auto-negotiation */</div><div class='ctx'> 	xgbe_an_disable_all(pdata);</div><div class='ctx'> </div><div class='del'>-	if (pdata-&gt;dev_irq != pdata-&gt;an_irq)</div><div class='add'>+	if (pdata-&gt;dev_irq != pdata-&gt;an_irq) {</div><div class='ctx'> 		devm_free_irq(pdata-&gt;dev, pdata-&gt;an_irq, pdata);</div><div class='add'>+		cancel_work_sync(&amp;pdata-&gt;an_bh_work);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;phy_if.phy_impl.stop(pdata);</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;phy.link = 0;</div><div class='del'>-	netif_carrier_off(pdata-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	xgbe_phy_adjust_link(pdata);</div><div class='ctx'> }</div><div class='hunk'>@@ -1414,8 +1381,7 @@ static int xgbe_phy_start(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	/* If we have a separate AN irq, enable it */</div><div class='ctx'> 	if (pdata-&gt;dev_irq != pdata-&gt;an_irq) {</div><div class='del'>-		tasklet_init(&amp;pdata-&gt;tasklet_an, xgbe_an_isr_task,</div><div class='del'>-			     (unsigned long)pdata);</div><div class='add'>+		INIT_WORK(&amp;pdata-&gt;an_bh_work, xgbe_an_isr_bh_work);</div><div class='ctx'> </div><div class='ctx'> 		ret = devm_request_irq(pdata-&gt;dev, pdata-&gt;an_irq,</div><div class='ctx'> 				       xgbe_an_isr, 0, pdata-&gt;an_name,</div><div class='hunk'>@@ -1443,6 +1409,8 @@ static int xgbe_phy_start(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		xgbe_sgmii_1000_mode(pdata);</div><div class='ctx'> 	} else if (xgbe_use_mode(pdata, XGBE_MODE_SGMII_100)) {</div><div class='ctx'> 		xgbe_sgmii_100_mode(pdata);</div><div class='add'>+	} else if (xgbe_use_mode(pdata, XGBE_MODE_SGMII_10)) {</div><div class='add'>+		xgbe_sgmii_10_mode(pdata);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto err_irq;</div><div class='hunk'>@@ -1540,6 +1508,8 @@ static int xgbe_phy_best_advertised_speed(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		return SPEED_1000;</div><div class='ctx'> 	else if (XGBE_ADV(lks, 100baseT_Full))</div><div class='ctx'> 		return SPEED_100;</div><div class='add'>+	else if (XGBE_ADV(lks, 10baseT_Full))</div><div class='add'>+		return SPEED_10;</div><div class='ctx'> </div><div class='ctx'> 	return SPEED_UNKNOWN;</div><div class='ctx'> }</div><div class='hunk'>@@ -1585,6 +1555,7 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		pdata-&gt;phy.duplex = DUPLEX_FULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	pdata-&gt;phy_link = 0;</div><div class='ctx'> 	pdata-&gt;phy.link = 0;</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;phy.pause_autoneg = pdata-&gt;pause_autoneg;</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pci.c b/drivers/net/ethernet/amd/xgbe/xgbe-pci.c<br/>index 7b86240ecd5f..e3e1dca9856a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-pci.c</a></div><div class='hunk'>@@ -1,123 +1,15 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/device.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='add'>+#include "xgbe-smn.h"</div><div class='ctx'> </div><div class='ctx'> #include "xgbe.h"</div><div class='ctx'> #include "xgbe-common.h"</div><div class='hunk'>@@ -139,7 +31,7 @@ static int xgbe_config_multi_msi(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;isr_as_tasklet = 1;</div><div class='add'>+	pdata-&gt;isr_as_bh_work = 1;</div><div class='ctx'> 	pdata-&gt;irq_count = ret;</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;dev_irq = pci_irq_vector(pdata-&gt;pcidev, 0);</div><div class='hunk'>@@ -170,13 +62,13 @@ static int xgbe_config_irqs(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_alloc_irq_vectors(pdata-&gt;pcidev, 1, 1,</div><div class='del'>-				    PCI_IRQ_LEGACY | PCI_IRQ_MSI);</div><div class='add'>+				    PCI_IRQ_INTX | PCI_IRQ_MSI);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		dev_info(pdata-&gt;dev, "single IRQ enablement failed\n");</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;isr_as_tasklet = pdata-&gt;pcidev-&gt;msi_enabled ? 1 : 0;</div><div class='add'>+	pdata-&gt;isr_as_bh_work = pdata-&gt;pcidev-&gt;msi_enabled ? 1 : 0;</div><div class='ctx'> 	pdata-&gt;irq_count = 1;</div><div class='ctx'> 	pdata-&gt;channel_irq_count = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -207,14 +99,14 @@ out:</div><div class='ctx'> </div><div class='ctx'> static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata;</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	void __iomem * const *iomap_table;</div><div class='del'>-	struct pci_dev *rdev;</div><div class='add'>+	unsigned int port_addr_size, reg;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct xgbe_prv_data *pdata;</div><div class='ctx'> 	unsigned int ma_lo, ma_hi;</div><div class='del'>-	unsigned int reg;</div><div class='del'>-	int bar_mask;</div><div class='del'>-	int ret;</div><div class='add'>+	struct pci_dev *rdev;</div><div class='add'>+	int bar_mask, ret;</div><div class='add'>+	u32 address;</div><div class='ctx'> </div><div class='ctx'> 	pdata = xgbe_alloc_pdata(dev);</div><div class='ctx'> 	if (IS_ERR(pdata)) {</div><div class='hunk'>@@ -274,10 +166,31 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	/* Set the PCS indirect addressing definition registers */</div><div class='ctx'> 	rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));</div><div class='del'>-	if (rdev &amp;&amp;</div><div class='del'>-	    (rdev-&gt;vendor == PCI_VENDOR_ID_AMD) &amp;&amp; (rdev-&gt;device == 0x15d0)) {</div><div class='del'>-		pdata-&gt;xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;</div><div class='del'>-		pdata-&gt;xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;</div><div class='add'>+	if (rdev &amp;&amp; rdev-&gt;vendor == PCI_VENDOR_ID_AMD) {</div><div class='add'>+		switch (rdev-&gt;device) {</div><div class='add'>+		case XGBE_RV_PCI_DEVICE_ID:</div><div class='add'>+			pdata-&gt;xpcs_window_def_reg = PCS_V2_RV_WINDOW_DEF;</div><div class='add'>+			pdata-&gt;xpcs_window_sel_reg = PCS_V2_RV_WINDOW_SELECT;</div><div class='add'>+			break;</div><div class='add'>+		case XGBE_YC_PCI_DEVICE_ID:</div><div class='add'>+			pdata-&gt;xpcs_window_def_reg = PCS_V2_YC_WINDOW_DEF;</div><div class='add'>+			pdata-&gt;xpcs_window_sel_reg = PCS_V2_YC_WINDOW_SELECT;</div><div class='add'>+</div><div class='add'>+			/* Yellow Carp devices do not need cdr workaround */</div><div class='add'>+			pdata-&gt;vdata-&gt;an_cdr_workaround = 0;</div><div class='add'>+</div><div class='add'>+			/* Yellow Carp devices do not need rrc */</div><div class='add'>+			pdata-&gt;vdata-&gt;enable_rrc = 0;</div><div class='add'>+			break;</div><div class='add'>+		case XGBE_RN_PCI_DEVICE_ID:</div><div class='add'>+			pdata-&gt;xpcs_window_def_reg = PCS_V3_RN_WINDOW_DEF;</div><div class='add'>+			pdata-&gt;xpcs_window_sel_reg = PCS_V3_RN_WINDOW_SELECT;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			pdata-&gt;xpcs_window_def_reg = PCS_V2_WINDOW_DEF;</div><div class='add'>+			pdata-&gt;xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pdata-&gt;xpcs_window_def_reg = PCS_V2_WINDOW_DEF;</div><div class='ctx'> 		pdata-&gt;xpcs_window_sel_reg = PCS_V2_WINDOW_SELECT;</div><div class='hunk'>@@ -285,7 +198,22 @@ static int xgbe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)</div><div class='ctx'> 	pci_dev_put(rdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the PCS indirect addressing support */</div><div class='del'>-	reg = XPCS32_IOREAD(pdata, pdata-&gt;xpcs_window_def_reg);</div><div class='add'>+	if (pdata-&gt;vdata-&gt;xpcs_access == XGBE_XPCS_ACCESS_V3) {</div><div class='add'>+		reg = XP_IOREAD(pdata, XP_PROP_0);</div><div class='add'>+		port_addr_size = PCS_RN_PORT_ADDR_SIZE *</div><div class='add'>+				 XP_GET_BITS(reg, XP_PROP_0, PORT_ID);</div><div class='add'>+		pdata-&gt;smn_base = PCS_RN_SMN_BASE_ADDR + port_addr_size;</div><div class='add'>+</div><div class='add'>+		address = pdata-&gt;smn_base + (pdata-&gt;xpcs_window_def_reg);</div><div class='add'>+		ret = amd_smn_read(0, address, &amp;reg);</div><div class='add'>+		if (ret) {</div><div class='add'>+			pci_err(pdata-&gt;pcidev, "Failed to read data\n");</div><div class='add'>+			goto err_pci_enable;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		reg = XPCS32_IOREAD(pdata, pdata-&gt;xpcs_window_def_reg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	pdata-&gt;xpcs_window = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, OFFSET);</div><div class='ctx'> 	pdata-&gt;xpcs_window &lt;&lt;= 6;</div><div class='ctx'> 	pdata-&gt;xpcs_window_size = XPCS_GET_BITS(reg, PCS_V2_WINDOW_DEF, SIZE);</div><div class='hunk'>@@ -418,13 +346,15 @@ static void xgbe_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_free_irq_vectors(pdata-&gt;pcidev);</div><div class='ctx'> </div><div class='add'>+	/* Disable all interrupts in the hardware */</div><div class='add'>+	XP_IOWRITE(pdata, XP_INT_EN, 0x0);</div><div class='add'>+</div><div class='ctx'> 	xgbe_free_pdata(pdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int xgbe_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused xgbe_pci_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = pci_get_drvdata(pdev);</div><div class='add'>+	struct xgbe_prv_data *pdata = dev_get_drvdata(dev);</div><div class='ctx'> 	struct net_device *netdev = pdata-&gt;netdev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -438,9 +368,9 @@ static int xgbe_pci_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_pci_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused xgbe_pci_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct xgbe_prv_data *pdata = pci_get_drvdata(pdev);</div><div class='add'>+	struct xgbe_prv_data *pdata = dev_get_drvdata(dev);</div><div class='ctx'> 	struct net_device *netdev = pdata-&gt;netdev;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -460,36 +390,55 @@ static int xgbe_pci_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='ctx'> </div><div class='del'>-static const struct xgbe_version_data xgbe_v2a = {</div><div class='add'>+static struct xgbe_version_data xgbe_v3 = {</div><div class='add'>+	.init_function_ptrs_phy_impl	= xgbe_init_function_ptrs_phy_v2,</div><div class='add'>+	.xpcs_access			= XGBE_XPCS_ACCESS_V3,</div><div class='add'>+	.mmc_64bit			= 1,</div><div class='add'>+	.tx_max_fifo_size		= 65536,</div><div class='add'>+	.rx_max_fifo_size		= 65536,</div><div class='add'>+	.tx_tstamp_workaround		= 1,</div><div class='add'>+	.ecc_support			= 1,</div><div class='add'>+	.i2c_support			= 1,</div><div class='add'>+	.irq_reissue_support		= 1,</div><div class='add'>+	.tx_desc_prefetch		= 5,</div><div class='add'>+	.rx_desc_prefetch		= 5,</div><div class='add'>+	.an_cdr_workaround		= 0,</div><div class='add'>+	.enable_rrc			= 0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct xgbe_version_data xgbe_v2a = {</div><div class='ctx'> 	.init_function_ptrs_phy_impl	= xgbe_init_function_ptrs_phy_v2,</div><div class='ctx'> 	.xpcs_access			= XGBE_XPCS_ACCESS_V2,</div><div class='ctx'> 	.mmc_64bit			= 1,</div><div class='ctx'> 	.tx_max_fifo_size		= 229376,</div><div class='ctx'> 	.rx_max_fifo_size		= 229376,</div><div class='ctx'> 	.tx_tstamp_workaround		= 1,</div><div class='add'>+	.tstamp_ptp_clock_freq		= 1,</div><div class='ctx'> 	.ecc_support			= 1,</div><div class='ctx'> 	.i2c_support			= 1,</div><div class='ctx'> 	.irq_reissue_support		= 1,</div><div class='ctx'> 	.tx_desc_prefetch		= 5,</div><div class='ctx'> 	.rx_desc_prefetch		= 5,</div><div class='ctx'> 	.an_cdr_workaround		= 1,</div><div class='add'>+	.enable_rrc			= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct xgbe_version_data xgbe_v2b = {</div><div class='add'>+static struct xgbe_version_data xgbe_v2b = {</div><div class='ctx'> 	.init_function_ptrs_phy_impl	= xgbe_init_function_ptrs_phy_v2,</div><div class='ctx'> 	.xpcs_access			= XGBE_XPCS_ACCESS_V2,</div><div class='ctx'> 	.mmc_64bit			= 1,</div><div class='ctx'> 	.tx_max_fifo_size		= 65536,</div><div class='ctx'> 	.rx_max_fifo_size		= 65536,</div><div class='ctx'> 	.tx_tstamp_workaround		= 1,</div><div class='add'>+	.tstamp_ptp_clock_freq		= 1,</div><div class='ctx'> 	.ecc_support			= 1,</div><div class='ctx'> 	.i2c_support			= 1,</div><div class='ctx'> 	.irq_reissue_support		= 1,</div><div class='ctx'> 	.tx_desc_prefetch		= 5,</div><div class='ctx'> 	.rx_desc_prefetch		= 5,</div><div class='ctx'> 	.an_cdr_workaround		= 1,</div><div class='add'>+	.enable_rrc			= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id xgbe_pci_table[] = {</div><div class='hunk'>@@ -497,20 +446,23 @@ static const struct pci_device_id xgbe_pci_table[] = {</div><div class='ctx'> 	  .driver_data = (kernel_ulong_t)&amp;xgbe_v2a },</div><div class='ctx'> 	{ PCI_VDEVICE(AMD, 0x1459),</div><div class='ctx'> 	  .driver_data = (kernel_ulong_t)&amp;xgbe_v2b },</div><div class='add'>+	{ PCI_VDEVICE(AMD, 0x1641),</div><div class='add'>+	  .driver_data = (kernel_ulong_t)&amp;xgbe_v3 },</div><div class='ctx'> 	/* Last entry must be zero */</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, xgbe_pci_table);</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(xgbe_pci_pm_ops, xgbe_pci_suspend, xgbe_pci_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver xgbe_driver = {</div><div class='ctx'> 	.name = XGBE_DRV_NAME,</div><div class='ctx'> 	.id_table = xgbe_pci_table,</div><div class='ctx'> 	.probe = xgbe_pci_probe,</div><div class='ctx'> 	.remove = xgbe_pci_remove,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend = xgbe_pci_suspend,</div><div class='del'>-	.resume = xgbe_pci_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver = {</div><div class='add'>+		.pm = &amp;xgbe_pci_pm_ops,</div><div class='add'>+	}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int xgbe_pci_init(void)</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c<br/>index d16eae415f72..2e6b8ffe785c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c<br/>index 128cd648ba99..a68757e8fd22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -124,10 +15,11 @@</div><div class='ctx'> #include "xgbe.h"</div><div class='ctx'> #include "xgbe-common.h"</div><div class='ctx'> </div><div class='del'>-#define XGBE_PHY_PORT_SPEED_100		BIT(0)</div><div class='del'>-#define XGBE_PHY_PORT_SPEED_1000	BIT(1)</div><div class='del'>-#define XGBE_PHY_PORT_SPEED_2500	BIT(2)</div><div class='del'>-#define XGBE_PHY_PORT_SPEED_10000	BIT(3)</div><div class='add'>+#define XGBE_PHY_PORT_SPEED_10		BIT(0)</div><div class='add'>+#define XGBE_PHY_PORT_SPEED_100		BIT(1)</div><div class='add'>+#define XGBE_PHY_PORT_SPEED_1000	BIT(2)</div><div class='add'>+#define XGBE_PHY_PORT_SPEED_2500	BIT(3)</div><div class='add'>+#define XGBE_PHY_PORT_SPEED_10000	BIT(4)</div><div class='ctx'> </div><div class='ctx'> #define XGBE_MUTEX_RELEASE		0x80000000</div><div class='ctx'> </div><div class='hunk'>@@ -166,6 +58,7 @@ enum xgbe_port_mode {</div><div class='ctx'> 	XGBE_PORT_MODE_10GBASE_T,</div><div class='ctx'> 	XGBE_PORT_MODE_10GBASE_R,</div><div class='ctx'> 	XGBE_PORT_MODE_SFP,</div><div class='add'>+	XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG,</div><div class='ctx'> 	XGBE_PORT_MODE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -188,6 +81,7 @@ enum xgbe_sfp_cable {</div><div class='ctx'> 	XGBE_SFP_CABLE_UNKNOWN = 0,</div><div class='ctx'> 	XGBE_SFP_CABLE_ACTIVE,</div><div class='ctx'> 	XGBE_SFP_CABLE_PASSIVE,</div><div class='add'>+	XGBE_SFP_CABLE_FIBER,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum xgbe_sfp_base {</div><div class='hunk'>@@ -235,9 +129,7 @@ enum xgbe_sfp_speed {</div><div class='ctx'> </div><div class='ctx'> #define XGBE_SFP_BASE_BR			12</div><div class='ctx'> #define XGBE_SFP_BASE_BR_1GBE_MIN		0x0a</div><div class='del'>-#define XGBE_SFP_BASE_BR_1GBE_MAX		0x0d</div><div class='ctx'> #define XGBE_SFP_BASE_BR_10GBE_MIN		0x64</div><div class='del'>-#define XGBE_SFP_BASE_BR_10GBE_MAX		0x68</div><div class='ctx'> </div><div class='ctx'> #define XGBE_SFP_BASE_CU_CABLE_LEN		18</div><div class='ctx'> </div><div class='hunk'>@@ -283,6 +175,8 @@ struct xgbe_sfp_eeprom {</div><div class='ctx'> #define XGBE_BEL_FUSE_VENDOR	"BEL-FUSE        "</div><div class='ctx'> #define XGBE_BEL_FUSE_PARTNO	"1GBT-SFP06      "</div><div class='ctx'> </div><div class='add'>+#define XGBE_MOLEX_VENDOR	"Molex Inc.      "</div><div class='add'>+</div><div class='ctx'> struct xgbe_sfp_ascii {</div><div class='ctx'> 	union {</div><div class='ctx'> 		char vendor[XGBE_SFP_BASE_VENDOR_NAME_LEN + 1];</div><div class='hunk'>@@ -385,6 +279,10 @@ struct xgbe_phy_data {</div><div class='ctx'> static DEFINE_MUTEX(xgbe_phy_comm_lock);</div><div class='ctx'> </div><div class='ctx'> static enum xgbe_an_mode xgbe_phy_an_mode(struct xgbe_prv_data *pdata);</div><div class='add'>+static void xgbe_phy_rrc(struct xgbe_prv_data *pdata);</div><div class='add'>+static void xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata,</div><div class='add'>+					enum xgbe_mb_cmd cmd,</div><div class='add'>+					enum xgbe_mb_subcmd sub_cmd);</div><div class='ctx'> </div><div class='ctx'> static int xgbe_phy_i2c_xfer(struct xgbe_prv_data *pdata,</div><div class='ctx'> 			     struct xgbe_i2c_op *i2c_op)</div><div class='hunk'>@@ -597,20 +495,27 @@ static int xgbe_phy_get_comm_ownership(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_phy_mdio_mii_write(struct xgbe_prv_data *pdata, int addr,</div><div class='del'>-				   int reg, u16 val)</div><div class='add'>+static int xgbe_phy_mdio_mii_write_c22(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				       int reg, u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='ctx'> </div><div class='del'>-	if (reg &amp; MII_ADDR_C45) {</div><div class='del'>-		if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL45)</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-	} else {</div><div class='del'>-		if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL22)</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL22)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return pdata-&gt;hw_if.write_ext_mii_regs_c22(pdata, addr, reg, val);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return pdata-&gt;hw_if.write_ext_mii_regs(pdata, addr, reg, val);</div><div class='add'>+static int xgbe_phy_mdio_mii_write_c45(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				       int devad, int reg, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL45)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return pdata-&gt;hw_if.write_ext_mii_regs_c45(pdata, addr, devad,</div><div class='add'>+						   reg, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_phy_i2c_mii_write(struct xgbe_prv_data *pdata, int reg, u16 val)</div><div class='hunk'>@@ -635,7 +540,8 @@ static int xgbe_phy_i2c_mii_write(struct xgbe_prv_data *pdata, int reg, u16 val)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_phy_mii_write(struct mii_bus *mii, int addr, int reg, u16 val)</div><div class='add'>+static int xgbe_phy_mii_write_c22(struct mii_bus *mii, int addr, int reg,</div><div class='add'>+				  u16 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = mii-&gt;priv;</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='hunk'>@@ -648,29 +554,58 @@ static int xgbe_phy_mii_write(struct mii_bus *mii, int addr, int reg, u16 val)</div><div class='ctx'> 	if (phy_data-&gt;conn_type == XGBE_CONN_TYPE_SFP)</div><div class='ctx'> 		ret = xgbe_phy_i2c_mii_write(pdata, reg, val);</div><div class='ctx'> 	else if (phy_data-&gt;conn_type &amp; XGBE_CONN_TYPE_MDIO)</div><div class='del'>-		ret = xgbe_phy_mdio_mii_write(pdata, addr, reg, val);</div><div class='add'>+		ret = xgbe_phy_mdio_mii_write_c22(pdata, addr, reg, val);</div><div class='ctx'> 	else</div><div class='del'>-		ret = -ENOTSUPP;</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	xgbe_phy_put_comm_ownership(pdata);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_phy_mdio_mii_read(struct xgbe_prv_data *pdata, int addr,</div><div class='del'>-				  int reg)</div><div class='add'>+static int xgbe_phy_mii_write_c45(struct mii_bus *mii, int addr, int devad,</div><div class='add'>+				  int reg, u16 val)</div><div class='ctx'> {</div><div class='add'>+	struct xgbe_prv_data *pdata = mii-&gt;priv;</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (reg &amp; MII_ADDR_C45) {</div><div class='del'>-		if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL45)</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-	} else {</div><div class='del'>-		if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL22)</div><div class='del'>-			return -ENOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	ret = xgbe_phy_get_comm_ownership(pdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;conn_type == XGBE_CONN_TYPE_SFP)</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (phy_data-&gt;conn_type &amp; XGBE_CONN_TYPE_MDIO)</div><div class='add'>+		ret = xgbe_phy_mdio_mii_write_c45(pdata, addr, devad, reg, val);</div><div class='add'>+	else</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	xgbe_phy_put_comm_ownership(pdata);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_phy_mdio_mii_read_c22(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				      int reg)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL22)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return pdata-&gt;hw_if.read_ext_mii_regs_c22(pdata, addr, reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_phy_mdio_mii_read_c45(struct xgbe_prv_data *pdata, int addr,</div><div class='add'>+				      int devad, int reg)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;phydev_mode != XGBE_MDIO_MODE_CL45)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return pdata-&gt;hw_if.read_ext_mii_regs(pdata, addr, reg);</div><div class='add'>+	return pdata-&gt;hw_if.read_ext_mii_regs_c45(pdata, addr, devad, reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_phy_i2c_mii_read(struct xgbe_prv_data *pdata, int reg)</div><div class='hunk'>@@ -695,7 +630,7 @@ static int xgbe_phy_i2c_mii_read(struct xgbe_prv_data *pdata, int reg)</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_phy_mii_read(struct mii_bus *mii, int addr, int reg)</div><div class='add'>+static int xgbe_phy_mii_read_c22(struct mii_bus *mii, int addr, int reg)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = mii-&gt;priv;</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='hunk'>@@ -708,9 +643,32 @@ static int xgbe_phy_mii_read(struct mii_bus *mii, int addr, int reg)</div><div class='ctx'> 	if (phy_data-&gt;conn_type == XGBE_CONN_TYPE_SFP)</div><div class='ctx'> 		ret = xgbe_phy_i2c_mii_read(pdata, reg);</div><div class='ctx'> 	else if (phy_data-&gt;conn_type &amp; XGBE_CONN_TYPE_MDIO)</div><div class='del'>-		ret = xgbe_phy_mdio_mii_read(pdata, addr, reg);</div><div class='add'>+		ret = xgbe_phy_mdio_mii_read_c22(pdata, addr, reg);</div><div class='ctx'> 	else</div><div class='del'>-		ret = -ENOTSUPP;</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	xgbe_phy_put_comm_ownership(pdata);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_phy_mii_read_c45(struct mii_bus *mii, int addr, int devad,</div><div class='add'>+				 int reg)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_prv_data *pdata = mii-&gt;priv;</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = xgbe_phy_get_comm_ownership(pdata);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (phy_data-&gt;conn_type == XGBE_CONN_TYPE_SFP)</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	else if (phy_data-&gt;conn_type &amp; XGBE_CONN_TYPE_MDIO)</div><div class='add'>+		ret = xgbe_phy_mdio_mii_read_c45(pdata, addr, devad, reg);</div><div class='add'>+	else</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	xgbe_phy_put_comm_ownership(pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -757,6 +715,8 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		XGBE_SET_SUP(lks, Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, Asym_Pause);</div><div class='ctx'> 		if (phy_data-&gt;sfp_base == XGBE_SFP_BASE_1000_T) {</div><div class='add'>+			if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10)</div><div class='add'>+				XGBE_SET_SUP(lks, 10baseT_Full);</div><div class='ctx'> 			if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100)</div><div class='ctx'> 				XGBE_SET_SUP(lks, 100baseT_Full);</div><div class='ctx'> 			if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000)</div><div class='hunk'>@@ -822,25 +782,22 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata)</div><div class='ctx'> static bool xgbe_phy_sfp_bit_rate(struct xgbe_sfp_eeprom *sfp_eeprom,</div><div class='ctx'> 				  enum xgbe_sfp_speed sfp_speed)</div><div class='ctx'> {</div><div class='del'>-	u8 *sfp_base, min, max;</div><div class='add'>+	u8 *sfp_base, min;</div><div class='ctx'> </div><div class='ctx'> 	sfp_base = sfp_eeprom-&gt;base;</div><div class='ctx'> </div><div class='ctx'> 	switch (sfp_speed) {</div><div class='ctx'> 	case XGBE_SFP_SPEED_1000:</div><div class='ctx'> 		min = XGBE_SFP_BASE_BR_1GBE_MIN;</div><div class='del'>-		max = XGBE_SFP_BASE_BR_1GBE_MAX;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XGBE_SFP_SPEED_10000:</div><div class='ctx'> 		min = XGBE_SFP_BASE_BR_10GBE_MIN;</div><div class='del'>-		max = XGBE_SFP_BASE_BR_10GBE_MAX;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return ((sfp_base[XGBE_SFP_BASE_BR] &gt;= min) &amp;&amp;</div><div class='del'>-		(sfp_base[XGBE_SFP_BASE_BR] &lt;= max));</div><div class='add'>+	return sfp_base[XGBE_SFP_BASE_BR] &gt;= min;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_phy_free_phy_device(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -857,7 +814,6 @@ static void xgbe_phy_free_phy_device(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='ctx'> 	unsigned int phy_id = phy_data-&gt;phydev-&gt;phy_id;</div><div class='ctx'> </div><div class='hunk'>@@ -879,14 +835,7 @@ static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	phy_write(phy_data-&gt;phydev, 0x04, 0x0d01);</div><div class='ctx'> 	phy_write(phy_data-&gt;phydev, 0x00, 0x9140);</div><div class='ctx'> </div><div class='del'>-	linkmode_set_bit_array(phy_10_100_features_array,</div><div class='del'>-			       ARRAY_SIZE(phy_10_100_features_array),</div><div class='del'>-			       supported);</div><div class='del'>-	linkmode_set_bit_array(phy_gbit_features_array,</div><div class='del'>-			       ARRAY_SIZE(phy_gbit_features_array),</div><div class='del'>-			       supported);</div><div class='del'>-</div><div class='del'>-	linkmode_copy(phy_data-&gt;phydev-&gt;supported, supported);</div><div class='add'>+	linkmode_copy(phy_data-&gt;phydev-&gt;supported, PHY_GBIT_FEATURES);</div><div class='ctx'> </div><div class='ctx'> 	phy_support_asym_pause(phy_data-&gt;phydev);</div><div class='ctx'> </div><div class='hunk'>@@ -898,7 +847,6 @@ static bool xgbe_phy_finisar_phy_quirks(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='ctx'> 	struct xgbe_sfp_eeprom *sfp_eeprom = &amp;phy_data-&gt;sfp_eeprom;</div><div class='ctx'> 	unsigned int phy_id = phy_data-&gt;phydev-&gt;phy_id;</div><div class='hunk'>@@ -921,6 +869,9 @@ static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	if ((phy_id &amp; 0xfffffff0) != 0x03625d10)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	/* Reset PHY - wait for self-clearing reset bit to clear */</div><div class='add'>+	genphy_soft_reset(phy_data-&gt;phydev);</div><div class='add'>+</div><div class='ctx'> 	/* Disable RGMII mode */</div><div class='ctx'> 	phy_write(phy_data-&gt;phydev, 0x18, 0x7007);</div><div class='ctx'> 	reg = phy_read(phy_data-&gt;phydev, 0x18);</div><div class='hunk'>@@ -959,13 +910,7 @@ static bool xgbe_phy_belfuse_phy_quirks(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	reg = phy_read(phy_data-&gt;phydev, 0x00);</div><div class='ctx'> 	phy_write(phy_data-&gt;phydev, 0x00, reg &amp; ~0x00800);</div><div class='ctx'> </div><div class='del'>-	linkmode_set_bit_array(phy_10_100_features_array,</div><div class='del'>-			       ARRAY_SIZE(phy_10_100_features_array),</div><div class='del'>-			       supported);</div><div class='del'>-	linkmode_set_bit_array(phy_gbit_features_array,</div><div class='del'>-			       ARRAY_SIZE(phy_gbit_features_array),</div><div class='del'>-			       supported);</div><div class='del'>-	linkmode_copy(phy_data-&gt;phydev-&gt;supported, supported);</div><div class='add'>+	linkmode_copy(phy_data-&gt;phydev-&gt;supported, PHY_GBIT_FEATURES);</div><div class='ctx'> 	phy_support_asym_pause(phy_data-&gt;phydev);</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, drv, pdata-&gt;netdev,</div><div class='hunk'>@@ -1044,6 +989,7 @@ static int xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> 	phy_data-&gt;phydev = phydev;</div><div class='add'>+	phy_data-&gt;phydev-&gt;mac_managed_pm = true;</div><div class='ctx'> </div><div class='ctx'> 	xgbe_phy_external_phy_quirks(pdata);</div><div class='ctx'> </div><div class='hunk'>@@ -1138,16 +1084,21 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	phy_data-&gt;sfp_tx_fault = xgbe_phy_check_sfp_tx_fault(phy_data);</div><div class='ctx'> 	phy_data-&gt;sfp_rx_los = xgbe_phy_check_sfp_rx_los(phy_data);</div><div class='ctx'> </div><div class='del'>-	/* Assume ACTIVE cable unless told it is PASSIVE */</div><div class='add'>+	/* Assume FIBER cable unless told otherwise */</div><div class='ctx'> 	if (sfp_base[XGBE_SFP_BASE_CABLE] &amp; XGBE_SFP_BASE_CABLE_PASSIVE) {</div><div class='ctx'> 		phy_data-&gt;sfp_cable = XGBE_SFP_CABLE_PASSIVE;</div><div class='ctx'> 		phy_data-&gt;sfp_cable_len = sfp_base[XGBE_SFP_BASE_CU_CABLE_LEN];</div><div class='del'>-	} else {</div><div class='add'>+	} else if (sfp_base[XGBE_SFP_BASE_CABLE] &amp; XGBE_SFP_BASE_CABLE_ACTIVE) {</div><div class='ctx'> 		phy_data-&gt;sfp_cable = XGBE_SFP_CABLE_ACTIVE;</div><div class='add'>+	} else {</div><div class='add'>+		phy_data-&gt;sfp_cable = XGBE_SFP_CABLE_FIBER;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Determine the type of SFP */</div><div class='del'>-	if (sfp_base[XGBE_SFP_BASE_10GBE_CC] &amp; XGBE_SFP_BASE_10GBE_CC_SR)</div><div class='add'>+	if (phy_data-&gt;sfp_cable != XGBE_SFP_CABLE_FIBER &amp;&amp;</div><div class='add'>+	    xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000))</div><div class='add'>+		phy_data-&gt;sfp_base = XGBE_SFP_BASE_10000_CR;</div><div class='add'>+	else if (sfp_base[XGBE_SFP_BASE_10GBE_CC] &amp; XGBE_SFP_BASE_10GBE_CC_SR)</div><div class='ctx'> 		phy_data-&gt;sfp_base = XGBE_SFP_BASE_10000_SR;</div><div class='ctx'> 	else if (sfp_base[XGBE_SFP_BASE_10GBE_CC] &amp; XGBE_SFP_BASE_10GBE_CC_LR)</div><div class='ctx'> 		phy_data-&gt;sfp_base = XGBE_SFP_BASE_10000_LR;</div><div class='hunk'>@@ -1163,9 +1114,6 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		phy_data-&gt;sfp_base = XGBE_SFP_BASE_1000_CX;</div><div class='ctx'> 	else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] &amp; XGBE_SFP_BASE_1GBE_CC_T)</div><div class='ctx'> 		phy_data-&gt;sfp_base = XGBE_SFP_BASE_1000_T;</div><div class='del'>-	else if ((phy_data-&gt;sfp_cable == XGBE_SFP_CABLE_PASSIVE) &amp;&amp;</div><div class='del'>-		 xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000))</div><div class='del'>-		phy_data-&gt;sfp_base = XGBE_SFP_BASE_10000_CR;</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;sfp_base) {</div><div class='ctx'> 	case XGBE_SFP_BASE_1000_T:</div><div class='hunk'>@@ -1227,7 +1175,7 @@ static bool xgbe_phy_sfp_verify_eeprom(u8 cc_in, u8 *buf, unsigned int len)</div><div class='ctx'> 	for (cc = 0; len; buf++, len--)</div><div class='ctx'> 		cc += *buf;</div><div class='ctx'> </div><div class='del'>-	return (cc == cc_in) ? true : false;</div><div class='add'>+	return cc == cc_in;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_phy_sfp_read_eeprom(struct xgbe_prv_data *pdata)</div><div class='hunk'>@@ -1538,6 +1486,16 @@ static enum xgbe_mode xgbe_phy_an37_sgmii_outcome(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		xgbe_phy_phydev_flowctrl(pdata);</div><div class='ctx'> </div><div class='ctx'> 	switch (pdata-&gt;an_status &amp; XGBE_SGMII_AN_LINK_SPEED) {</div><div class='add'>+	case XGBE_SGMII_AN_LINK_SPEED_10:</div><div class='add'>+		if (pdata-&gt;an_status &amp; XGBE_SGMII_AN_LINK_DUPLEX) {</div><div class='add'>+			XGBE_SET_LP_ADV(lks, 10baseT_Full);</div><div class='add'>+			mode = XGBE_MODE_SGMII_10;</div><div class='add'>+		} else {</div><div class='add'>+			/* Half-duplex not supported */</div><div class='add'>+			XGBE_SET_LP_ADV(lks, 10baseT_Half);</div><div class='add'>+			mode = XGBE_MODE_UNKNOWN;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='ctx'> 	case XGBE_SGMII_AN_LINK_SPEED_100:</div><div class='ctx'> 		if (pdata-&gt;an_status &amp; XGBE_SGMII_AN_LINK_DUPLEX) {</div><div class='ctx'> 			XGBE_SET_LP_ADV(lks, 100baseT_Full);</div><div class='hunk'>@@ -1634,6 +1592,7 @@ static enum xgbe_mode xgbe_phy_an73_redrv_outcome(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	if (ad_reg &amp; 0x80) {</div><div class='ctx'> 		switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 		case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+		case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 			mode = XGBE_MODE_KR;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='hunk'>@@ -1643,6 +1602,7 @@ static enum xgbe_mode xgbe_phy_an73_redrv_outcome(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	} else if (ad_reg &amp; 0x20) {</div><div class='ctx'> 		switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 		case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+		case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 			mode = XGBE_MODE_KX_1000;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case XGBE_PORT_MODE_1000BASE_X:</div><div class='hunk'>@@ -1652,7 +1612,10 @@ static enum xgbe_mode xgbe_phy_an73_redrv_outcome(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			switch (phy_data-&gt;sfp_base) {</div><div class='ctx'> 			case XGBE_SFP_BASE_1000_T:</div><div class='ctx'> 				if (phy_data-&gt;phydev &amp;&amp;</div><div class='del'>-				    (phy_data-&gt;phydev-&gt;speed == SPEED_100))</div><div class='add'>+				    (phy_data-&gt;phydev-&gt;speed == SPEED_10))</div><div class='add'>+					mode = XGBE_MODE_SGMII_10;</div><div class='add'>+				else if (phy_data-&gt;phydev &amp;&amp;</div><div class='add'>+					 (phy_data-&gt;phydev-&gt;speed == SPEED_100))</div><div class='ctx'> 					mode = XGBE_MODE_SGMII_100;</div><div class='ctx'> 				else</div><div class='ctx'> 					mode = XGBE_MODE_SGMII_1000;</div><div class='hunk'>@@ -1667,7 +1630,10 @@ static enum xgbe_mode xgbe_phy_an73_redrv_outcome(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			if (phy_data-&gt;phydev &amp;&amp;</div><div class='del'>-			    (phy_data-&gt;phydev-&gt;speed == SPEED_100))</div><div class='add'>+			    (phy_data-&gt;phydev-&gt;speed == SPEED_10))</div><div class='add'>+				mode = XGBE_MODE_SGMII_10;</div><div class='add'>+			else if (phy_data-&gt;phydev &amp;&amp;</div><div class='add'>+				 (phy_data-&gt;phydev-&gt;speed == SPEED_100))</div><div class='ctx'> 				mode = XGBE_MODE_SGMII_100;</div><div class='ctx'> 			else</div><div class='ctx'> 				mode = XGBE_MODE_SGMII_1000;</div><div class='hunk'>@@ -1782,6 +1748,7 @@ static void xgbe_phy_an_advertising(struct xgbe_prv_data *pdata,</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		XGBE_SET_ADV(dlks, 10000baseKR_Full);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='hunk'>@@ -1796,6 +1763,9 @@ static void xgbe_phy_an_advertising(struct xgbe_prv_data *pdata,</div><div class='ctx'> 		if (phy_data-&gt;phydev &amp;&amp;</div><div class='ctx'> 		    (phy_data-&gt;phydev-&gt;speed == SPEED_10000))</div><div class='ctx'> 			XGBE_SET_ADV(dlks, 10000baseKR_Full);</div><div class='add'>+		else if (phy_data-&gt;phydev &amp;&amp;</div><div class='add'>+			 (phy_data-&gt;phydev-&gt;speed == SPEED_2500))</div><div class='add'>+			XGBE_SET_ADV(dlks, 2500baseX_Full);</div><div class='ctx'> 		else</div><div class='ctx'> 			XGBE_SET_ADV(dlks, 1000baseKX_Full);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1874,6 +1844,7 @@ static enum xgbe_an_mode xgbe_phy_an_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='ctx'> 		return XGBE_AN_MODE_CL73;</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='ctx'> 		return XGBE_AN_MODE_NONE;</div><div class='ctx'> 	case XGBE_PORT_MODE_1000BASE_T:</div><div class='hunk'>@@ -1902,8 +1873,8 @@ static int xgbe_phy_set_redrv_mode_mdio(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	redrv_reg = XGBE_PHY_REDRV_MODE_REG + (phy_data-&gt;redrv_lane * 0x1000);</div><div class='ctx'> 	redrv_val = (u16)mode;</div><div class='ctx'> </div><div class='del'>-	return pdata-&gt;hw_if.write_ext_mii_regs(pdata, phy_data-&gt;redrv_addr,</div><div class='del'>-					       redrv_reg, redrv_val);</div><div class='add'>+	return pdata-&gt;hw_if.write_ext_mii_regs_c22(pdata, phy_data-&gt;redrv_addr,</div><div class='add'>+						   redrv_reg, redrv_val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int xgbe_phy_set_redrv_mode_i2c(struct xgbe_prv_data *pdata,</div><div class='hunk'>@@ -1948,16 +1919,144 @@ static void xgbe_phy_set_redrv_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_put_comm_ownership(pdata);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define MAX_RX_ADAPT_RETRIES		1</div><div class='add'>+#define XGBE_PMA_RX_VAL_SIG_MASK	(XGBE_PMA_RX_SIG_DET_0_MASK | \</div><div class='add'>+					 XGBE_PMA_RX_VALID_0_MASK)</div><div class='add'>+</div><div class='add'>+static void xgbe_set_rx_adap_mode(struct xgbe_prv_data *pdata,</div><div class='add'>+				  enum xgbe_mode mode)</div><div class='add'>+{</div><div class='add'>+	if (pdata-&gt;rx_adapt_retries++ &gt;= MAX_RX_ADAPT_RETRIES) {</div><div class='add'>+		pdata-&gt;rx_adapt_retries = 0;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata,</div><div class='add'>+				    mode == XGBE_MODE_KR ?</div><div class='add'>+				    XGBE_MB_CMD_SET_10G_KR :</div><div class='add'>+				    XGBE_MB_CMD_SET_10G_SFI,</div><div class='add'>+				    XGBE_MB_SUBCMD_RX_ADAP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgbe_rx_adaptation(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+	/* step 2: force PCS to send RX_ADAPT Req to PHY */</div><div class='add'>+	XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_EQ_CTRL4,</div><div class='add'>+			 XGBE_PMA_RX_AD_REQ_MASK, XGBE_PMA_RX_AD_REQ_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* Step 3: Wait for RX_ADAPT ACK from the PHY */</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	/* Software polls for coefficient update command (given by local PHY) */</div><div class='add'>+	reg = XMDIO_READ(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_PHY_RX_EQ_CEU);</div><div class='add'>+</div><div class='add'>+	/* Clear the RX_AD_REQ bit */</div><div class='add'>+	XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_EQ_CTRL4,</div><div class='add'>+			 XGBE_PMA_RX_AD_REQ_MASK, XGBE_PMA_RX_AD_REQ_DISABLE);</div><div class='add'>+</div><div class='add'>+	/* Check if coefficient update command is set */</div><div class='add'>+	if ((reg &amp; XGBE_PMA_CFF_UPDT_MASK) != XGBE_PMA_CFF_UPDT_MASK)</div><div class='add'>+		goto set_mode;</div><div class='add'>+</div><div class='add'>+	/* Step 4: Check for Block lock */</div><div class='add'>+</div><div class='add'>+	/* Link status is latched low, so read once to clear</div><div class='add'>+	 * and then read again to get current state</div><div class='add'>+	 */</div><div class='add'>+	reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);</div><div class='add'>+	reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);</div><div class='add'>+	if (reg &amp; MDIO_STAT1_LSTATUS) {</div><div class='add'>+		/* If the block lock is found, update the helpers</div><div class='add'>+		 * and declare the link up</div><div class='add'>+		 */</div><div class='add'>+		netif_dbg(pdata, link, pdata-&gt;netdev, "Block_lock done");</div><div class='add'>+		pdata-&gt;rx_adapt_done = true;</div><div class='add'>+		pdata-&gt;mode_set = false;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+set_mode:</div><div class='add'>+	xgbe_set_rx_adap_mode(pdata, phy_data-&gt;cur_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgbe_phy_rx_adaptation(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	unsigned int reg;</div><div class='add'>+</div><div class='add'>+rx_adapt_reinit:</div><div class='add'>+	reg = XMDIO_READ_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_LSTS,</div><div class='add'>+			      XGBE_PMA_RX_VAL_SIG_MASK);</div><div class='add'>+</div><div class='add'>+	/* step 1: Check for RX_VALID &amp;&amp; LF_SIGDET */</div><div class='add'>+	if ((reg &amp; XGBE_PMA_RX_VAL_SIG_MASK) != XGBE_PMA_RX_VAL_SIG_MASK) {</div><div class='add'>+		netif_dbg(pdata, link, pdata-&gt;netdev,</div><div class='add'>+			  "RX_VALID or LF_SIGDET is unset, issue rrc");</div><div class='add'>+		xgbe_phy_rrc(pdata);</div><div class='add'>+		if (pdata-&gt;rx_adapt_retries++ &gt;= MAX_RX_ADAPT_RETRIES) {</div><div class='add'>+			pdata-&gt;rx_adapt_retries = 0;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		goto rx_adapt_reinit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* perform rx adaptation */</div><div class='add'>+	xgbe_rx_adaptation(pdata);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgbe_phy_rx_reset(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	int reg;</div><div class='add'>+</div><div class='add'>+	reg = XMDIO_READ_BITS(pdata, MDIO_MMD_PCS, MDIO_PCS_DIGITAL_STAT,</div><div class='add'>+			      XGBE_PCS_PSEQ_STATE_MASK);</div><div class='add'>+	if (reg == XGBE_PCS_PSEQ_STATE_POWER_GOOD) {</div><div class='add'>+		/* Mailbox command timed out, reset of RX block is required.</div><div class='add'>+		 * This can be done by asseting the reset bit and wait for</div><div class='add'>+		 * its compeletion.</div><div class='add'>+		 */</div><div class='add'>+		XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_CTRL1,</div><div class='add'>+				 XGBE_PMA_RX_RST_0_MASK, XGBE_PMA_RX_RST_0_RESET_ON);</div><div class='add'>+		ndelay(20);</div><div class='add'>+		XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_RX_CTRL1,</div><div class='add'>+				 XGBE_PMA_RX_RST_0_MASK, XGBE_PMA_RX_RST_0_RESET_OFF);</div><div class='add'>+		usleep_range(40, 50);</div><div class='add'>+		netif_err(pdata, link, pdata-&gt;netdev, "firmware mailbox reset performed\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void xgbe_phy_pll_ctrl(struct xgbe_prv_data *pdata, bool enable)</div><div class='add'>+{</div><div class='add'>+	/* PLL_CTRL feature needs to be enabled for fixed PHY modes (Non-Autoneg) only */</div><div class='add'>+	if (pdata-&gt;phy.autoneg != AUTONEG_DISABLE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	XMDIO_WRITE_BITS(pdata, MDIO_MMD_PMAPMD, MDIO_VEND2_PMA_MISC_CTRL0,</div><div class='add'>+			 XGBE_PMA_PLL_CTRL_MASK,</div><div class='add'>+			 enable ? XGBE_PMA_PLL_CTRL_ENABLE</div><div class='add'>+				: XGBE_PMA_PLL_CTRL_DISABLE);</div><div class='add'>+</div><div class='add'>+	/* Wait for command to complete */</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata,</div><div class='del'>-					unsigned int cmd, unsigned int sub_cmd)</div><div class='add'>+					enum xgbe_mb_cmd cmd, enum xgbe_mb_subcmd sub_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int s0 = 0;</div><div class='ctx'> 	unsigned int wait;</div><div class='ctx'> </div><div class='add'>+	/* Disable PLL re-initialization during FW command processing */</div><div class='add'>+	xgbe_phy_pll_ctrl(pdata, false);</div><div class='add'>+</div><div class='ctx'> 	/* Log if a previous command did not complete */</div><div class='del'>-	if (XP_IOREAD_BITS(pdata, XP_DRIVER_INT_RO, STATUS))</div><div class='add'>+	if (XP_IOREAD_BITS(pdata, XP_DRIVER_INT_RO, STATUS)) {</div><div class='ctx'> 		netif_dbg(pdata, link, pdata-&gt;netdev,</div><div class='ctx'> 			  "firmware mailbox not ready for command\n");</div><div class='add'>+		xgbe_phy_rx_reset(pdata);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Construct the command */</div><div class='ctx'> 	XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, cmd);</div><div class='hunk'>@@ -1972,19 +2071,42 @@ static void xgbe_phy_perform_ratechange(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	wait = XGBE_RATECHANGE_COUNT;</div><div class='ctx'> 	while (wait--) {</div><div class='ctx'> 		if (!XP_IOREAD_BITS(pdata, XP_DRIVER_INT_RO, STATUS))</div><div class='del'>-			return;</div><div class='add'>+			goto do_rx_adaptation;</div><div class='ctx'> </div><div class='ctx'> 		usleep_range(1000, 2000);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, link, pdata-&gt;netdev,</div><div class='ctx'> 		  "firmware mailbox command did not complete\n");</div><div class='add'>+</div><div class='add'>+	/* Reset on error */</div><div class='add'>+	xgbe_phy_rx_reset(pdata);</div><div class='add'>+	goto reenable_pll;</div><div class='add'>+</div><div class='add'>+do_rx_adaptation:</div><div class='add'>+	if (pdata-&gt;en_rx_adap &amp;&amp; sub_cmd == XGBE_MB_SUBCMD_RX_ADAP &amp;&amp;</div><div class='add'>+	    (cmd == XGBE_MB_CMD_SET_10G_KR || cmd == XGBE_MB_CMD_SET_10G_SFI)) {</div><div class='add'>+		netif_dbg(pdata, link, pdata-&gt;netdev,</div><div class='add'>+			  "Enabling RX adaptation\n");</div><div class='add'>+		pdata-&gt;mode_set = true;</div><div class='add'>+		xgbe_phy_rx_adaptation(pdata);</div><div class='add'>+		/* return from here to avoid enabling PLL ctrl</div><div class='add'>+		 * during adaptation phase</div><div class='add'>+		 */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+reenable_pll:</div><div class='add'>+	/* Enable PLL re-initialization, not needed for PHY Power Off and RRC cmds */</div><div class='add'>+	if (cmd != XGBE_MB_CMD_POWER_OFF &amp;&amp;</div><div class='add'>+	    cmd != XGBE_MB_CMD_RRC)</div><div class='add'>+		xgbe_phy_pll_ctrl(pdata, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgbe_phy_rrc(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	/* Receiver Reset Cycle */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 5, 0);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_RRC, XGBE_MB_SUBCMD_NONE);</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, link, pdata-&gt;netdev, "receiver reset complete\n");</div><div class='ctx'> }</div><div class='hunk'>@@ -1994,13 +2116,38 @@ static void xgbe_phy_power_off(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='ctx'> </div><div class='ctx'> 	/* Power off */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 0, 0);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_POWER_OFF, XGBE_MB_SUBCMD_NONE);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, link, pdata-&gt;netdev, "phy powered off\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool enable_rx_adap(struct xgbe_prv_data *pdata, enum xgbe_mode mode)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	unsigned int ver;</div><div class='add'>+</div><div class='add'>+	/* Rx-Adaptation is not supported on older platforms(&lt; 0x30H) */</div><div class='add'>+	ver = XGMAC_GET_BITS(pdata-&gt;hw_feat.version, MAC_VR, SNPSVER);</div><div class='add'>+	if (ver &lt; 0x30)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Re-driver models 4223 &amp;&amp; 4227 do not support Rx-Adaptation */</div><div class='add'>+	if (phy_data-&gt;redrv &amp;&amp;</div><div class='add'>+	    (phy_data-&gt;redrv_model == XGBE_PHY_REDRV_MODEL_4223 ||</div><div class='add'>+	     phy_data-&gt;redrv_model == XGBE_PHY_REDRV_MODEL_4227))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* 10G KR mode with AN does not support Rx-Adaptation */</div><div class='add'>+	if (mode == XGBE_MODE_KR &amp;&amp;</div><div class='add'>+	    phy_data-&gt;port_mode != XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	pdata-&gt;en_rx_adap = 1;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void xgbe_phy_sfi_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='hunk'>@@ -2009,14 +2156,22 @@ static void xgbe_phy_sfi_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	/* 10G/SFI */</div><div class='ctx'> 	if (phy_data-&gt;sfp_cable != XGBE_SFP_CABLE_PASSIVE) {</div><div class='del'>-		xgbe_phy_perform_ratechange(pdata, 3, 0);</div><div class='add'>+		pdata-&gt;en_rx_adap = 0;</div><div class='add'>+		xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_SFI, XGBE_MB_SUBCMD_ACTIVE);</div><div class='add'>+	} else if ((phy_data-&gt;sfp_cable == XGBE_SFP_CABLE_PASSIVE) &amp;&amp;</div><div class='add'>+		   (enable_rx_adap(pdata, XGBE_MODE_SFI))) {</div><div class='add'>+		xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_SFI,</div><div class='add'>+					    XGBE_MB_SUBCMD_RX_ADAP);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (phy_data-&gt;sfp_cable_len &lt;= 1)</div><div class='del'>-			xgbe_phy_perform_ratechange(pdata, 3, 1);</div><div class='add'>+			xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_SFI,</div><div class='add'>+						    XGBE_MB_SUBCMD_PASSIVE_1M);</div><div class='ctx'> 		else if (phy_data-&gt;sfp_cable_len &lt;= 3)</div><div class='del'>-			xgbe_phy_perform_ratechange(pdata, 3, 2);</div><div class='add'>+			xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_SFI,</div><div class='add'>+						    XGBE_MB_SUBCMD_PASSIVE_3M);</div><div class='ctx'> 		else</div><div class='del'>-			xgbe_phy_perform_ratechange(pdata, 3, 3);</div><div class='add'>+			xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_SFI,</div><div class='add'>+						    XGBE_MB_SUBCMD_PASSIVE_OTHER);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_SFI;</div><div class='hunk'>@@ -2031,7 +2186,7 @@ static void xgbe_phy_x_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_set_redrv_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	/* 1G/X */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 1, 3);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_1G, XGBE_MB_SUBCMD_1G_KX);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_X;</div><div class='ctx'> </div><div class='hunk'>@@ -2045,7 +2200,7 @@ static void xgbe_phy_sgmii_1000_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_set_redrv_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	/* 1G/SGMII */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 1, 2);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_1G, XGBE_MB_SUBCMD_1G_SGMII);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_SGMII_1000;</div><div class='ctx'> </div><div class='hunk'>@@ -2059,13 +2214,27 @@ static void xgbe_phy_sgmii_100_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_set_redrv_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	/* 100M/SGMII */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 1, 1);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_1G, XGBE_MB_SUBCMD_100MBITS);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_SGMII_100;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(pdata, link, pdata-&gt;netdev, "100MbE SGMII mode set\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void xgbe_phy_sgmii_10_mode(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+</div><div class='add'>+	xgbe_phy_set_redrv_mode(pdata);</div><div class='add'>+</div><div class='add'>+	/* 10M/SGMII */</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_1G, XGBE_MB_SUBCMD_10MBITS);</div><div class='add'>+</div><div class='add'>+	phy_data-&gt;cur_mode = XGBE_MODE_SGMII_10;</div><div class='add'>+</div><div class='add'>+	netif_dbg(pdata, link, pdata-&gt;netdev, "10MbE SGMII mode set\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void xgbe_phy_kr_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='hunk'>@@ -2073,7 +2242,12 @@ static void xgbe_phy_kr_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_set_redrv_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	/* 10G/KR */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 4, 0);</div><div class='add'>+	if (enable_rx_adap(pdata, XGBE_MODE_KR))</div><div class='add'>+		xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_KR,</div><div class='add'>+					    XGBE_MB_SUBCMD_RX_ADAP);</div><div class='add'>+	else</div><div class='add'>+		xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_10G_KR,</div><div class='add'>+					    XGBE_MB_SUBCMD_NONE);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_KR;</div><div class='ctx'> </div><div class='hunk'>@@ -2087,7 +2261,7 @@ static void xgbe_phy_kx_2500_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_set_redrv_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	/* 2.5G/KX */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 2, 0);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_2_5G, XGBE_MB_SUBCMD_NONE);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_KX_2500;</div><div class='ctx'> </div><div class='hunk'>@@ -2101,7 +2275,7 @@ static void xgbe_phy_kx_1000_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	xgbe_phy_set_redrv_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	/* 1G/KX */</div><div class='del'>-	xgbe_phy_perform_ratechange(pdata, 1, 3);</div><div class='add'>+	xgbe_phy_perform_ratechange(pdata, XGBE_MB_CMD_SET_1G, XGBE_MB_SUBCMD_1G_KX);</div><div class='ctx'> </div><div class='ctx'> 	phy_data-&gt;cur_mode = XGBE_MODE_KX_1000;</div><div class='ctx'> </div><div class='hunk'>@@ -2124,12 +2298,15 @@ static enum xgbe_mode xgbe_phy_switch_baset_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		return xgbe_phy_cur_mode(pdata);</div><div class='ctx'> </div><div class='ctx'> 	switch (xgbe_phy_cur_mode(pdata)) {</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 	case XGBE_MODE_SGMII_1000:</div><div class='ctx'> 		return XGBE_MODE_KR;</div><div class='add'>+	case XGBE_MODE_KX_2500:</div><div class='add'>+		return XGBE_MODE_SGMII_1000;</div><div class='ctx'> 	case XGBE_MODE_KR:</div><div class='ctx'> 	default:</div><div class='del'>-		return XGBE_MODE_SGMII_1000;</div><div class='add'>+		return XGBE_MODE_KX_2500;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2156,6 +2333,7 @@ static enum xgbe_mode xgbe_phy_switch_mode(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		return xgbe_phy_switch_bp_mode(pdata);</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='ctx'> 		return xgbe_phy_switch_bp_2500_mode(pdata);</div><div class='hunk'>@@ -2190,6 +2368,8 @@ static enum xgbe_mode xgbe_phy_get_baset_mode(struct xgbe_phy_data *phy_data,</div><div class='ctx'> 					      int speed)</div><div class='ctx'> {</div><div class='ctx'> 	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		return XGBE_MODE_SGMII_10;</div><div class='ctx'> 	case SPEED_100:</div><div class='ctx'> 		return XGBE_MODE_SGMII_100;</div><div class='ctx'> 	case SPEED_1000:</div><div class='hunk'>@@ -2207,6 +2387,8 @@ static enum xgbe_mode xgbe_phy_get_sfp_mode(struct xgbe_phy_data *phy_data,</div><div class='ctx'> 					    int speed)</div><div class='ctx'> {</div><div class='ctx'> 	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		return XGBE_MODE_SGMII_10;</div><div class='ctx'> 	case SPEED_100:</div><div class='ctx'> 		return XGBE_MODE_SGMII_100;</div><div class='ctx'> 	case SPEED_1000:</div><div class='hunk'>@@ -2251,6 +2433,7 @@ static enum xgbe_mode xgbe_phy_get_mode(struct xgbe_prv_data *pdata,</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		return xgbe_phy_get_bp_mode(speed);</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='ctx'> 		return xgbe_phy_get_bp_2500_mode(speed);</div><div class='hunk'>@@ -2280,6 +2463,9 @@ static void xgbe_phy_set_mode(struct xgbe_prv_data *pdata, enum xgbe_mode mode)</div><div class='ctx'> 	case XGBE_MODE_KR:</div><div class='ctx'> 		xgbe_phy_kr_mode(pdata);</div><div class='ctx'> 		break;</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='add'>+		xgbe_phy_sgmii_10_mode(pdata);</div><div class='add'>+		break;</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 		xgbe_phy_sgmii_100_mode(pdata);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2336,6 +2522,9 @@ static bool xgbe_phy_use_baset_mode(struct xgbe_prv_data *pdata,</div><div class='ctx'> 	struct ethtool_link_ksettings *lks = &amp;pdata-&gt;phy.lks;</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='add'>+		return xgbe_phy_check_mode(pdata, mode,</div><div class='add'>+					   XGBE_ADV(lks, 10baseT_Full));</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 		return xgbe_phy_check_mode(pdata, mode,</div><div class='ctx'> 					   XGBE_ADV(lks, 100baseT_Full));</div><div class='hunk'>@@ -2365,6 +2554,11 @@ static bool xgbe_phy_use_sfp_mode(struct xgbe_prv_data *pdata,</div><div class='ctx'> 			return false;</div><div class='ctx'> 		return xgbe_phy_check_mode(pdata, mode,</div><div class='ctx'> 					   XGBE_ADV(lks, 1000baseX_Full));</div><div class='add'>+	case XGBE_MODE_SGMII_10:</div><div class='add'>+		if (phy_data-&gt;sfp_base != XGBE_SFP_BASE_1000_T)</div><div class='add'>+			return false;</div><div class='add'>+		return xgbe_phy_check_mode(pdata, mode,</div><div class='add'>+					   XGBE_ADV(lks, 10baseT_Full));</div><div class='ctx'> 	case XGBE_MODE_SGMII_100:</div><div class='ctx'> 		if (phy_data-&gt;sfp_base != XGBE_SFP_BASE_1000_T)</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -2426,6 +2620,7 @@ static bool xgbe_phy_use_mode(struct xgbe_prv_data *pdata, enum xgbe_mode mode)</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		return xgbe_phy_use_bp_mode(pdata, mode);</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='ctx'> 		return xgbe_phy_use_bp_2500_mode(pdata, mode);</div><div class='hunk'>@@ -2456,15 +2651,23 @@ static bool xgbe_phy_valid_speed_basex_mode(struct xgbe_phy_data *phy_data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool xgbe_phy_valid_speed_baset_mode(struct xgbe_phy_data *phy_data,</div><div class='add'>+static bool xgbe_phy_valid_speed_baset_mode(struct xgbe_prv_data *pdata,</div><div class='ctx'> 					    int speed)</div><div class='ctx'> {</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	unsigned int ver;</div><div class='add'>+</div><div class='ctx'> 	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		/* Supported in ver 21H and ver &gt;= 30H */</div><div class='add'>+		ver = XGMAC_GET_BITS(pdata-&gt;hw_feat.version, MAC_VR, SNPSVER);</div><div class='add'>+		return (ver == 0x21 || ver &gt;= 0x30);</div><div class='ctx'> 	case SPEED_100:</div><div class='ctx'> 	case SPEED_1000:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	case SPEED_2500:</div><div class='del'>-		return (phy_data-&gt;port_mode == XGBE_PORT_MODE_NBASE_T);</div><div class='add'>+		return ((phy_data-&gt;port_mode == XGBE_PORT_MODE_10GBASE_T) ||</div><div class='add'>+			(phy_data-&gt;port_mode == XGBE_PORT_MODE_NBASE_T));</div><div class='ctx'> 	case SPEED_10000:</div><div class='ctx'> 		return (phy_data-&gt;port_mode == XGBE_PORT_MODE_10GBASE_T);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -2472,10 +2675,18 @@ static bool xgbe_phy_valid_speed_baset_mode(struct xgbe_phy_data *phy_data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool xgbe_phy_valid_speed_sfp_mode(struct xgbe_phy_data *phy_data,</div><div class='add'>+static bool xgbe_phy_valid_speed_sfp_mode(struct xgbe_prv_data *pdata,</div><div class='ctx'> 					  int speed)</div><div class='ctx'> {</div><div class='add'>+	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	unsigned int ver;</div><div class='add'>+</div><div class='ctx'> 	switch (speed) {</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		/* Supported in ver 21H and ver &gt;= 30H */</div><div class='add'>+		ver = XGMAC_GET_BITS(pdata-&gt;hw_feat.version, MAC_VR, SNPSVER);</div><div class='add'>+		return ((ver == 0x21 || ver &gt;= 0x30) &amp;&amp;</div><div class='add'>+			(phy_data-&gt;sfp_speed == XGBE_SFP_SPEED_100_1000));</div><div class='ctx'> 	case SPEED_100:</div><div class='ctx'> 		return (phy_data-&gt;sfp_speed == XGBE_SFP_SPEED_100_1000);</div><div class='ctx'> 	case SPEED_1000:</div><div class='hunk'>@@ -2515,18 +2726,19 @@ static bool xgbe_phy_valid_speed(struct xgbe_prv_data *pdata, int speed)</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		return xgbe_phy_valid_speed_bp_mode(speed);</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='ctx'> 		return xgbe_phy_valid_speed_bp_2500_mode(speed);</div><div class='ctx'> 	case XGBE_PORT_MODE_1000BASE_T:</div><div class='ctx'> 	case XGBE_PORT_MODE_NBASE_T:</div><div class='ctx'> 	case XGBE_PORT_MODE_10GBASE_T:</div><div class='del'>-		return xgbe_phy_valid_speed_baset_mode(phy_data, speed);</div><div class='add'>+		return xgbe_phy_valid_speed_baset_mode(pdata, speed);</div><div class='ctx'> 	case XGBE_PORT_MODE_1000BASE_X:</div><div class='ctx'> 	case XGBE_PORT_MODE_10GBASE_R:</div><div class='ctx'> 		return xgbe_phy_valid_speed_basex_mode(phy_data, speed);</div><div class='ctx'> 	case XGBE_PORT_MODE_SFP:</div><div class='del'>-		return xgbe_phy_valid_speed_sfp_mode(phy_data, speed);</div><div class='add'>+		return xgbe_phy_valid_speed_sfp_mode(pdata, speed);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2535,8 +2747,7 @@ static bool xgbe_phy_valid_speed(struct xgbe_prv_data *pdata, int speed)</div><div class='ctx'> static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='del'>-	unsigned int reg;</div><div class='del'>-	int ret;</div><div class='add'>+	int reg, ret;</div><div class='ctx'> </div><div class='ctx'> 	*an_restart = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2549,8 +2760,11 @@ static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (phy_data-&gt;sfp_mod_absent || phy_data-&gt;sfp_rx_los)</div><div class='add'>+		if (phy_data-&gt;sfp_mod_absent || phy_data-&gt;sfp_rx_los) {</div><div class='add'>+			if (pdata-&gt;en_rx_adap)</div><div class='add'>+				pdata-&gt;rx_adapt_done = false;</div><div class='ctx'> 			return 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phy_data-&gt;phydev) {</div><div class='hunk'>@@ -2567,16 +2781,53 @@ static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart)</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Link status is latched low, so read once to clear</div><div class='del'>-	 * and then read again to get current state</div><div class='del'>-	 */</div><div class='del'>-	reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);</div><div class='ctx'> 	reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);</div><div class='del'>-	if (reg &amp; MDIO_STAT1_LSTATUS)</div><div class='add'>+	if (reg &lt; 0)</div><div class='add'>+		return reg;</div><div class='add'>+</div><div class='add'>+	/* Link status is latched low so that momentary link drops</div><div class='add'>+	 * can be detected. If link was already down read again</div><div class='add'>+	 * to get the latest state.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;phy.link &amp;&amp; !(reg &amp; MDIO_STAT1_LSTATUS)) {</div><div class='add'>+		reg = XMDIO_READ(pdata, MDIO_MMD_PCS, MDIO_STAT1);</div><div class='add'>+		if (reg &lt; 0)</div><div class='add'>+			return reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pdata-&gt;en_rx_adap) {</div><div class='add'>+		/* if the link is available and adaptation is done,</div><div class='add'>+		 * declare link up</div><div class='add'>+		 */</div><div class='add'>+		if ((reg &amp; MDIO_STAT1_LSTATUS) &amp;&amp; pdata-&gt;rx_adapt_done)</div><div class='add'>+			return 1;</div><div class='add'>+		/* If either link is not available or adaptation is not done,</div><div class='add'>+		 * retrigger the adaptation logic. (if the mode is not set,</div><div class='add'>+		 * then issue mailbox command first)</div><div class='add'>+		 */</div><div class='add'>+		if (pdata-&gt;mode_set) {</div><div class='add'>+			xgbe_phy_rx_adaptation(pdata);</div><div class='add'>+		} else {</div><div class='add'>+			pdata-&gt;rx_adapt_done = false;</div><div class='add'>+			xgbe_phy_set_mode(pdata, phy_data-&gt;cur_mode);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (pdata-&gt;rx_adapt_done)</div><div class='add'>+			return 1;</div><div class='add'>+	} else if (reg &amp; MDIO_STAT1_LSTATUS)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='add'>+	if (pdata-&gt;phy.autoneg == AUTONEG_ENABLE &amp;&amp;</div><div class='add'>+	    phy_data-&gt;port_mode == XGBE_PORT_MODE_BACKPLANE) {</div><div class='add'>+		if (!test_bit(XGBE_LINK_INIT, &amp;pdata-&gt;dev_state)) {</div><div class='add'>+			netif_carrier_off(pdata-&gt;netdev);</div><div class='add'>+			*an_restart = 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* No link, attempt a receiver reset cycle */</div><div class='del'>-	if (phy_data-&gt;rrc_count++ &gt; XGBE_RRC_FREQUENCY) {</div><div class='add'>+	if (pdata-&gt;vdata-&gt;enable_rrc &amp;&amp; phy_data-&gt;rrc_count++ &gt; XGBE_RRC_FREQUENCY) {</div><div class='ctx'> 		phy_data-&gt;rrc_count = 0;</div><div class='ctx'> 		xgbe_phy_rrc(pdata);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2652,7 +2903,7 @@ static void xgbe_phy_sfp_setup(struct xgbe_prv_data *pdata)</div><div class='ctx'> static int xgbe_phy_int_mdio_reset(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='del'>-	unsigned int ret;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = pdata-&gt;hw_if.set_gpio(pdata, phy_data-&gt;mdio_reset_gpio);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2789,9 +3040,16 @@ static int xgbe_phy_mdio_reset_setup(struct xgbe_prv_data *pdata)</div><div class='ctx'> static bool xgbe_phy_port_mode_mismatch(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_phy_data *phy_data = pdata-&gt;phy_data;</div><div class='add'>+	unsigned int ver;</div><div class='add'>+</div><div class='add'>+	/* 10 Mbps speed is supported in ver 21H and ver &gt;= 30H */</div><div class='add'>+	ver = XGMAC_GET_BITS(pdata-&gt;hw_feat.version, MAC_VR, SNPSVER);</div><div class='add'>+	if ((ver &lt; 0x30 &amp;&amp; ver != 0x21) &amp;&amp; (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10))</div><div class='add'>+		return true;</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10000))</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -2801,7 +3059,8 @@ static bool xgbe_phy_port_mode_mismatch(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XGBE_PORT_MODE_1000BASE_T:</div><div class='del'>-		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='add'>+		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) ||</div><div class='add'>+		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2810,14 +3069,17 @@ static bool xgbe_phy_port_mode_mismatch(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XGBE_PORT_MODE_NBASE_T:</div><div class='del'>-		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='add'>+		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) ||</div><div class='add'>+		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_2500))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XGBE_PORT_MODE_10GBASE_T:</div><div class='del'>-		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='add'>+		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) ||</div><div class='add'>+		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000) ||</div><div class='add'>+		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_2500) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10000))</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2826,7 +3088,8 @@ static bool xgbe_phy_port_mode_mismatch(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			return false;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XGBE_PORT_MODE_SFP:</div><div class='del'>-		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='add'>+		if ((phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) ||</div><div class='add'>+		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000) ||</div><div class='ctx'> 		    (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10000))</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -2844,6 +3107,7 @@ static bool xgbe_phy_conn_type_mismatch(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	switch (phy_data-&gt;port_mode) {</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE_2500:</div><div class='ctx'> 		if (phy_data-&gt;conn_type == XGBE_CONN_TYPE_BACKPLANE)</div><div class='ctx'> 			return false;</div><div class='hunk'>@@ -3160,6 +3424,8 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	/* Backplane support */</div><div class='ctx'> 	case XGBE_PORT_MODE_BACKPLANE:</div><div class='ctx'> 		XGBE_SET_SUP(lks, Autoneg);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XGBE_PORT_MODE_BACKPLANE_NO_AUTONEG:</div><div class='ctx'> 		XGBE_SET_SUP(lks, Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, Asym_Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, Backplane);</div><div class='hunk'>@@ -3192,6 +3458,10 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		XGBE_SET_SUP(lks, Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, Asym_Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, TP);</div><div class='add'>+		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) {</div><div class='add'>+			XGBE_SET_SUP(lks, 10baseT_Full);</div><div class='add'>+			phy_data-&gt;start_mode = XGBE_MODE_SGMII_10;</div><div class='add'>+		}</div><div class='ctx'> 		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) {</div><div class='ctx'> 			XGBE_SET_SUP(lks, 100baseT_Full);</div><div class='ctx'> 			phy_data-&gt;start_mode = XGBE_MODE_SGMII_100;</div><div class='hunk'>@@ -3222,6 +3492,10 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		XGBE_SET_SUP(lks, Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, Asym_Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, TP);</div><div class='add'>+		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) {</div><div class='add'>+			XGBE_SET_SUP(lks, 10baseT_Full);</div><div class='add'>+			phy_data-&gt;start_mode = XGBE_MODE_SGMII_10;</div><div class='add'>+		}</div><div class='ctx'> 		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) {</div><div class='ctx'> 			XGBE_SET_SUP(lks, 100baseT_Full);</div><div class='ctx'> 			phy_data-&gt;start_mode = XGBE_MODE_SGMII_100;</div><div class='hunk'>@@ -3244,6 +3518,10 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		XGBE_SET_SUP(lks, Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, Asym_Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, TP);</div><div class='add'>+		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10) {</div><div class='add'>+			XGBE_SET_SUP(lks, 10baseT_Full);</div><div class='add'>+			phy_data-&gt;start_mode = XGBE_MODE_SGMII_10;</div><div class='add'>+		}</div><div class='ctx'> 		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100) {</div><div class='ctx'> 			XGBE_SET_SUP(lks, 100baseT_Full);</div><div class='ctx'> 			phy_data-&gt;start_mode = XGBE_MODE_SGMII_100;</div><div class='hunk'>@@ -3252,6 +3530,10 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 			XGBE_SET_SUP(lks, 1000baseT_Full);</div><div class='ctx'> 			phy_data-&gt;start_mode = XGBE_MODE_SGMII_1000;</div><div class='ctx'> 		}</div><div class='add'>+		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_2500) {</div><div class='add'>+			XGBE_SET_SUP(lks, 2500baseT_Full);</div><div class='add'>+			phy_data-&gt;start_mode = XGBE_MODE_KX_2500;</div><div class='add'>+		}</div><div class='ctx'> 		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10000) {</div><div class='ctx'> 			XGBE_SET_SUP(lks, 10000baseT_Full);</div><div class='ctx'> 			phy_data-&gt;start_mode = XGBE_MODE_KR;</div><div class='hunk'>@@ -3284,6 +3566,8 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> 		XGBE_SET_SUP(lks, Asym_Pause);</div><div class='ctx'> 		XGBE_SET_SUP(lks, TP);</div><div class='ctx'> 		XGBE_SET_SUP(lks, FIBRE);</div><div class='add'>+		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_10)</div><div class='add'>+			phy_data-&gt;start_mode = XGBE_MODE_SGMII_10;</div><div class='ctx'> 		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_100)</div><div class='ctx'> 			phy_data-&gt;start_mode = XGBE_MODE_SGMII_100;</div><div class='ctx'> 		if (phy_data-&gt;port_speeds &amp; XGBE_PHY_PORT_SPEED_1000)</div><div class='hunk'>@@ -3338,8 +3622,10 @@ static int xgbe_phy_init(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	mii-&gt;priv = pdata;</div><div class='ctx'> 	mii-&gt;name = "amd-xgbe-mii";</div><div class='del'>-	mii-&gt;read = xgbe_phy_mii_read;</div><div class='del'>-	mii-&gt;write = xgbe_phy_mii_write;</div><div class='add'>+	mii-&gt;read = xgbe_phy_mii_read_c22;</div><div class='add'>+	mii-&gt;write = xgbe_phy_mii_write_c22;</div><div class='add'>+	mii-&gt;read_c45 = xgbe_phy_mii_read_c45;</div><div class='add'>+	mii-&gt;write_c45 = xgbe_phy_mii_write_c45;</div><div class='ctx'> 	mii-&gt;parent = pdata-&gt;dev;</div><div class='ctx'> 	mii-&gt;phy_mask = ~0;</div><div class='ctx'> 	snprintf(mii-&gt;id, sizeof(mii-&gt;id), "%s", dev_name(pdata-&gt;dev));</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c<br/>index d0f3dfb88202..47d53e59ccf6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-platform.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-platform.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-platform.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -123,9 +14,7 @@</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/acpi.h&gt;</div><div class='hunk'>@@ -135,17 +24,6 @@</div><div class='ctx'> #include "xgbe-common.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-static const struct acpi_device_id xgbe_acpi_match[];</div><div class='del'>-</div><div class='del'>-static struct xgbe_version_data *xgbe_acpi_vdata(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	const struct acpi_device_id *id;</div><div class='del'>-</div><div class='del'>-	id = acpi_match_device(xgbe_acpi_match, pdata-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return id ? (struct xgbe_version_data *)id-&gt;driver_data : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xgbe_acpi_support(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = pdata-&gt;dev;</div><div class='hunk'>@@ -173,11 +51,6 @@ static int xgbe_acpi_support(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> #else   /* CONFIG_ACPI */</div><div class='del'>-static struct xgbe_version_data *xgbe_acpi_vdata(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xgbe_acpi_support(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -185,17 +58,6 @@ static int xgbe_acpi_support(struct xgbe_prv_data *pdata)</div><div class='ctx'> #endif  /* CONFIG_ACPI */</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OF</div><div class='del'>-static const struct of_device_id xgbe_of_match[];</div><div class='del'>-</div><div class='del'>-static struct xgbe_version_data *xgbe_of_vdata(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	const struct of_device_id *id;</div><div class='del'>-</div><div class='del'>-	id = of_match_device(xgbe_of_match, pdata-&gt;dev);</div><div class='del'>-</div><div class='del'>-	return id ? (struct xgbe_version_data *)id-&gt;data : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xgbe_of_support(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = pdata-&gt;dev;</div><div class='hunk'>@@ -244,11 +106,6 @@ static struct platform_device *xgbe_of_get_phy_pdev(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	return phy_pdev;</div><div class='ctx'> }</div><div class='ctx'> #else   /* CONFIG_OF */</div><div class='del'>-static struct xgbe_version_data *xgbe_of_vdata(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xgbe_of_support(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	return -EINVAL;</div><div class='hunk'>@@ -290,18 +147,11 @@ static struct platform_device *xgbe_get_phy_pdev(struct xgbe_prv_data *pdata)</div><div class='ctx'> 	return phy_pdev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct xgbe_version_data *xgbe_get_vdata(struct xgbe_prv_data *pdata)</div><div class='del'>-{</div><div class='del'>-	return pdata-&gt;use_acpi ? xgbe_acpi_vdata(pdata)</div><div class='del'>-			       : xgbe_of_vdata(pdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct platform_device *phy_pdev;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	const char *phy_mode;</div><div class='ctx'> 	unsigned int phy_memnum, phy_irqnum;</div><div class='ctx'> 	unsigned int dma_irqnum, dma_irqend;</div><div class='hunk'>@@ -322,7 +172,7 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	pdata-&gt;use_acpi = dev-&gt;of_node ? 0 : 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the version data */</div><div class='del'>-	pdata-&gt;vdata = xgbe_get_vdata(pdata);</div><div class='add'>+	pdata-&gt;vdata = (struct xgbe_version_data *)device_get_match_data(dev);</div><div class='ctx'> </div><div class='ctx'> 	phy_pdev = xgbe_get_phy_pdev(pdata);</div><div class='ctx'> 	if (!phy_pdev) {</div><div class='hunk'>@@ -339,7 +189,7 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 		 *   the PHY resources listed last</div><div class='ctx'> 		 */</div><div class='ctx'> 		phy_memnum = xgbe_resource_count(pdev, IORESOURCE_MEM) - 3;</div><div class='del'>-		phy_irqnum = xgbe_resource_count(pdev, IORESOURCE_IRQ) - 1;</div><div class='add'>+		phy_irqnum = platform_irq_count(pdev) - 1;</div><div class='ctx'> 		dma_irqnum = 1;</div><div class='ctx'> 		dma_irqend = phy_irqnum;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -349,12 +199,11 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 		phy_memnum = 0;</div><div class='ctx'> 		phy_irqnum = 0;</div><div class='ctx'> 		dma_irqnum = 1;</div><div class='del'>-		dma_irqend = xgbe_resource_count(pdev, IORESOURCE_IRQ);</div><div class='add'>+		dma_irqend = platform_irq_count(pdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Obtain the mmio areas for the device */</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	pdata-&gt;xgmac_regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	pdata-&gt;xgmac_regs = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(pdata-&gt;xgmac_regs)) {</div><div class='ctx'> 		dev_err(dev, "xgmac ioremap failed\n");</div><div class='ctx'> 		ret = PTR_ERR(pdata-&gt;xgmac_regs);</div><div class='hunk'>@@ -363,8 +212,7 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (netif_msg_probe(pdata))</div><div class='ctx'> 		dev_dbg(dev, "xgmac_regs = %p\n", pdata-&gt;xgmac_regs);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	pdata-&gt;xpcs_regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	pdata-&gt;xpcs_regs = devm_platform_ioremap_resource(pdev, 1);</div><div class='ctx'> 	if (IS_ERR(pdata-&gt;xpcs_regs)) {</div><div class='ctx'> 		dev_err(dev, "xpcs ioremap failed\n");</div><div class='ctx'> 		ret = PTR_ERR(pdata-&gt;xpcs_regs);</div><div class='hunk'>@@ -373,8 +221,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (netif_msg_probe(pdata))</div><div class='ctx'> 		dev_dbg(dev, "xpcs_regs  = %p\n", pdata-&gt;xpcs_regs);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);</div><div class='del'>-	pdata-&gt;rxtx_regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	pdata-&gt;rxtx_regs = devm_platform_ioremap_resource(phy_pdev,</div><div class='add'>+							  phy_memnum++);</div><div class='ctx'> 	if (IS_ERR(pdata-&gt;rxtx_regs)) {</div><div class='ctx'> 		dev_err(dev, "rxtx ioremap failed\n");</div><div class='ctx'> 		ret = PTR_ERR(pdata-&gt;rxtx_regs);</div><div class='hunk'>@@ -383,8 +231,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (netif_msg_probe(pdata))</div><div class='ctx'> 		dev_dbg(dev, "rxtx_regs  = %p\n", pdata-&gt;rxtx_regs);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);</div><div class='del'>-	pdata-&gt;sir0_regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	pdata-&gt;sir0_regs = devm_platform_ioremap_resource(phy_pdev,</div><div class='add'>+							  phy_memnum++);</div><div class='ctx'> 	if (IS_ERR(pdata-&gt;sir0_regs)) {</div><div class='ctx'> 		dev_err(dev, "sir0 ioremap failed\n");</div><div class='ctx'> 		ret = PTR_ERR(pdata-&gt;sir0_regs);</div><div class='hunk'>@@ -393,8 +241,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (netif_msg_probe(pdata))</div><div class='ctx'> 		dev_dbg(dev, "sir0_regs  = %p\n", pdata-&gt;sir0_regs);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);</div><div class='del'>-	pdata-&gt;sir1_regs = devm_ioremap_resource(dev, res);</div><div class='add'>+	pdata-&gt;sir1_regs = devm_platform_ioremap_resource(phy_pdev,</div><div class='add'>+							  phy_memnum++);</div><div class='ctx'> 	if (IS_ERR(pdata-&gt;sir1_regs)) {</div><div class='ctx'> 		dev_err(dev, "sir1 ioremap failed\n");</div><div class='ctx'> 		ret = PTR_ERR(pdata-&gt;sir1_regs);</div><div class='hunk'>@@ -467,10 +315,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Get the device interrupt */</div><div class='ctx'> 	ret = platform_get_irq(pdev, 0);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "platform_get_irq 0 failed\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto err_io;</div><div class='del'>-	}</div><div class='ctx'> 	pdata-&gt;dev_irq = ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the per channel DMA interrupts */</div><div class='hunk'>@@ -479,12 +325,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; (i &lt; max) &amp;&amp; (dma_irqnum &lt; dma_irqend); i++) {</div><div class='ctx'> 			ret = platform_get_irq(pdata-&gt;platdev, dma_irqnum++);</div><div class='del'>-			if (ret &lt; 0) {</div><div class='del'>-				netdev_err(pdata-&gt;netdev,</div><div class='del'>-					   "platform_get_irq %u failed\n",</div><div class='del'>-					   dma_irqnum - 1);</div><div class='add'>+			if (ret &lt; 0)</div><div class='ctx'> 				goto err_io;</div><div class='del'>-			}</div><div class='ctx'> </div><div class='ctx'> 			pdata-&gt;channel_irq[i] = ret;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -496,10 +338,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Get the auto-negotiation interrupt */</div><div class='ctx'> 	ret = platform_get_irq(phy_pdev, phy_irqnum++);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "platform_get_irq phy 0 failed\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto err_io;</div><div class='del'>-	}</div><div class='ctx'> 	pdata-&gt;an_irq = ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure the netdev resource */</div><div class='hunk'>@@ -523,7 +363,7 @@ err_alloc:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_platform_remove(struct platform_device *pdev)</div><div class='add'>+static void xgbe_platform_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -532,8 +372,6 @@ static int xgbe_platform_remove(struct platform_device *pdev)</div><div class='ctx'> 	platform_device_put(pdata-&gt;phy_platdev);</div><div class='ctx'> </div><div class='ctx'> 	xgbe_free_pdata(pdata);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -591,7 +429,6 @@ static const struct xgbe_version_data xgbe_v1 = {</div><div class='ctx'> 	.tx_tstamp_workaround		= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='ctx'> static const struct acpi_device_id xgbe_acpi_match[] = {</div><div class='ctx'> 	{ .id = "AMDI8001",</div><div class='ctx'> 	  .driver_data = (kernel_ulong_t)&amp;xgbe_v1 },</div><div class='hunk'>@@ -599,9 +436,7 @@ static const struct acpi_device_id xgbe_acpi_match[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(acpi, xgbe_acpi_match);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_OF</div><div class='ctx'> static const struct of_device_id xgbe_of_match[] = {</div><div class='ctx'> 	{ .compatible = "amd,xgbe-seattle-v1a",</div><div class='ctx'> 	  .data = &amp;xgbe_v1 },</div><div class='hunk'>@@ -609,7 +444,6 @@ static const struct of_device_id xgbe_of_match[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(of, xgbe_of_match);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static SIMPLE_DEV_PM_OPS(xgbe_platform_pm_ops,</div><div class='ctx'> 			 xgbe_platform_suspend, xgbe_platform_resume);</div><div class='hunk'>@@ -617,12 +451,8 @@ static SIMPLE_DEV_PM_OPS(xgbe_platform_pm_ops,</div><div class='ctx'> static struct platform_driver xgbe_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = XGBE_DRV_NAME,</div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='ctx'> 		.acpi_match_table = xgbe_acpi_match,</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_OF</div><div class='ctx'> 		.of_match_table = xgbe_of_match,</div><div class='del'>-#endif</div><div class='ctx'> 		.pm = &amp;xgbe_platform_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = xgbe_platform_probe,</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-pps.c b/drivers/net/ethernet/amd/xgbe/xgbe-pps.c<br/>new file mode 100644<br/>index 000000000000..6d03ae7ab36f<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-pps.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-pps.c</a></div><div class='hunk'>@@ -0,0 +1,74 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * Author: Raju Rangoju &lt;Raju.Rangoju@amd.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "xgbe.h"</div><div class='add'>+#include "xgbe-common.h"</div><div class='add'>+</div><div class='add'>+static u32 get_pps_mask(unsigned int x)</div><div class='add'>+{</div><div class='add'>+	return GENMASK(PPS_MAXIDX(x), PPS_MINIDX(x));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 get_pps_cmd(unsigned int x, u32 val)</div><div class='add'>+{</div><div class='add'>+	return (val &amp; GENMASK(3, 0)) &lt;&lt; PPS_MINIDX(x);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 get_target_mode_sel(unsigned int x, u32 val)</div><div class='add'>+{</div><div class='add'>+	return (val &amp; GENMASK(1, 0)) &lt;&lt; (PPS_MAXIDX(x) - 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xgbe_pps_config(struct xgbe_prv_data *pdata,</div><div class='add'>+		    struct xgbe_pps_config *cfg, int index, bool on)</div><div class='add'>+{</div><div class='add'>+	unsigned int ppscr = 0;</div><div class='add'>+	unsigned int tnsec;</div><div class='add'>+	u64 period;</div><div class='add'>+</div><div class='add'>+	/* Check if target time register is busy */</div><div class='add'>+	tnsec = XGMAC_IOREAD(pdata, MAC_PPSx_TTNSR(index));</div><div class='add'>+	if (XGMAC_GET_BITS(tnsec, MAC_PPSx_TTNSR, TRGTBUSY0))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ppscr = XGMAC_IOREAD(pdata, MAC_PPSCR);</div><div class='add'>+	ppscr &amp;= ~get_pps_mask(index);</div><div class='add'>+</div><div class='add'>+	if (!on) {</div><div class='add'>+		/* Disable PPS output */</div><div class='add'>+		ppscr |= get_pps_cmd(index, XGBE_PPSCMD_STOP);</div><div class='add'>+		ppscr |= PPSEN0;</div><div class='add'>+		XGMAC_IOWRITE(pdata, MAC_PPSCR, ppscr);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure start time */</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_PPSx_TTSR(index), cfg-&gt;start.tv_sec);</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_PPSx_TTNSR(index), cfg-&gt;start.tv_nsec);</div><div class='add'>+</div><div class='add'>+	period = cfg-&gt;period.tv_sec * NSEC_PER_SEC + cfg-&gt;period.tv_nsec;</div><div class='add'>+	period = div_u64(period, XGBE_V2_TSTAMP_SSINC);</div><div class='add'>+</div><div class='add'>+	if (period &lt; 4)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Configure interval and pulse width (50% duty cycle) */</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_PPSx_INTERVAL(index), period - 1);</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_PPSx_WIDTH(index), (period &gt;&gt; 1) - 1);</div><div class='add'>+</div><div class='add'>+	/* Enable PPS with pulse train mode */</div><div class='add'>+	ppscr |= get_pps_cmd(index, XGBE_PPSCMD_START);</div><div class='add'>+	ppscr |= get_target_mode_sel(index, XGBE_PPSTARGET_PULSE);</div><div class='add'>+	ppscr |= PPSEN0;</div><div class='add'>+</div><div class='add'>+	XGMAC_IOWRITE(pdata, MAC_PPSCR, ppscr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c<br/>index d06d260cf1e2..0e0b8ec3b504 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe-ptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-ptp.c</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -122,43 +13,19 @@</div><div class='ctx'> #include "xgbe.h"</div><div class='ctx'> #include "xgbe-common.h"</div><div class='ctx'> </div><div class='del'>-static u64 xgbe_cc_read(const struct cyclecounter *cc)</div><div class='del'>-{</div><div class='del'>-	struct xgbe_prv_data *pdata = container_of(cc,</div><div class='del'>-						   struct xgbe_prv_data,</div><div class='del'>-						   tstamp_cc);</div><div class='del'>-	u64 nsec;</div><div class='del'>-</div><div class='del'>-	nsec = pdata-&gt;hw_if.get_tstamp_time(pdata);</div><div class='del'>-</div><div class='del'>-	return nsec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)</div><div class='add'>+static int xgbe_adjfine(struct ptp_clock_info *info, long scaled_ppm)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = container_of(info,</div><div class='ctx'> 						   struct xgbe_prv_data,</div><div class='ctx'> 						   ptp_clock_info);</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u64 adjust;</div><div class='del'>-	u32 addend, diff;</div><div class='del'>-	unsigned int neg_adjust = 0;</div><div class='del'>-</div><div class='del'>-	if (delta &lt; 0) {</div><div class='del'>-		neg_adjust = 1;</div><div class='del'>-		delta = -delta;</div><div class='del'>-	}</div><div class='add'>+	u64 addend;</div><div class='ctx'> </div><div class='del'>-	adjust = pdata-&gt;tstamp_addend;</div><div class='del'>-	adjust *= delta;</div><div class='del'>-	diff = div_u64(adjust, 1000000000UL);</div><div class='del'>-</div><div class='del'>-	addend = (neg_adjust) ? pdata-&gt;tstamp_addend - diff :</div><div class='del'>-				pdata-&gt;tstamp_addend + diff;</div><div class='add'>+	addend = adjust_by_scaled_ppm(pdata-&gt;tstamp_addend, scaled_ppm);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='ctx'> </div><div class='del'>-	pdata-&gt;hw_if.update_tstamp_addend(pdata, addend);</div><div class='add'>+	xgbe_update_tstamp_addend(pdata, addend);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -170,16 +37,39 @@ static int xgbe_adjtime(struct ptp_clock_info *info, s64 delta)</div><div class='ctx'> 	struct xgbe_prv_data *pdata = container_of(info,</div><div class='ctx'> 						   struct xgbe_prv_data,</div><div class='ctx'> 						   ptp_clock_info);</div><div class='add'>+	unsigned int neg_adjust = 0;</div><div class='add'>+	unsigned int sec, nsec;</div><div class='add'>+	u32 quotient, reminder;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	if (delta &lt; 0) {</div><div class='add'>+		neg_adjust = 1;</div><div class='add'>+		delta = -delta;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	quotient = div_u64_rem(delta, 1000000000ULL, &amp;reminder);</div><div class='add'>+	sec = quotient;</div><div class='add'>+	nsec = reminder;</div><div class='add'>+</div><div class='add'>+	/* Negative adjustment for Hw timer register. */</div><div class='add'>+	if (neg_adjust) {</div><div class='add'>+		sec = -sec;</div><div class='add'>+		if (XGMAC_IOREAD_BITS(pdata, MAC_TSCR, TSCTRLSSR))</div><div class='add'>+			nsec = (1000000000UL - nsec);</div><div class='add'>+		else</div><div class='add'>+			nsec = (0x80000000UL - nsec);</div><div class='add'>+	}</div><div class='add'>+	nsec = (neg_adjust &lt;&lt; 31) | nsec;</div><div class='add'>+</div><div class='ctx'> 	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-	timecounter_adjtime(&amp;pdata-&gt;tstamp_tc, delta);</div><div class='add'>+	xgbe_update_tstamp_time(pdata, sec, nsec);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgbe_gettime(struct ptp_clock_info *info, struct timespec64 *ts)</div><div class='add'>+static int xgbe_gettimex(struct ptp_clock_info *info, struct timespec64 *ts,</div><div class='add'>+			 struct ptp_system_timestamp *sts)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgbe_prv_data *pdata = container_of(info,</div><div class='ctx'> 						   struct xgbe_prv_data,</div><div class='hunk'>@@ -188,9 +78,9 @@ static int xgbe_gettime(struct ptp_clock_info *info, struct timespec64 *ts)</div><div class='ctx'> 	u64 nsec;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-</div><div class='del'>-	nsec = timecounter_read(&amp;pdata-&gt;tstamp_tc);</div><div class='del'>-</div><div class='add'>+	ptp_read_system_prets(sts);</div><div class='add'>+	nsec = xgbe_get_tstamp_time(pdata);</div><div class='add'>+	ptp_read_system_postts(sts);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	*ts = ns_to_timespec64(nsec);</div><div class='hunk'>@@ -205,14 +95,9 @@ static int xgbe_settime(struct ptp_clock_info *info,</div><div class='ctx'> 						   struct xgbe_prv_data,</div><div class='ctx'> 						   ptp_clock_info);</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u64 nsec;</div><div class='del'>-</div><div class='del'>-	nsec = timespec64_to_ns(ts);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='del'>-</div><div class='del'>-	timecounter_init(&amp;pdata-&gt;tstamp_tc, &amp;pdata-&gt;tstamp_cc, nsec);</div><div class='del'>-</div><div class='add'>+	xgbe_set_tstamp_time(pdata, ts-&gt;tv_sec, ts-&gt;tv_nsec);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -221,24 +106,46 @@ static int xgbe_settime(struct ptp_clock_info *info,</div><div class='ctx'> static int xgbe_enable(struct ptp_clock_info *info,</div><div class='ctx'> 		       struct ptp_clock_request *request, int on)</div><div class='ctx'> {</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='add'>+	struct xgbe_prv_data *pdata = container_of(info, struct xgbe_prv_data,</div><div class='add'>+						   ptp_clock_info);</div><div class='add'>+	struct xgbe_pps_config *pps_cfg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	dev_dbg(pdata-&gt;dev, "rq-&gt;type %d on %d\n", request-&gt;type, on);</div><div class='add'>+</div><div class='add'>+	if (request-&gt;type != PTP_CLK_REQ_PEROUT)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	pps_cfg = &amp;pdata-&gt;pps[request-&gt;perout.index];</div><div class='add'>+</div><div class='add'>+	pps_cfg-&gt;start.tv_sec = request-&gt;perout.start.sec;</div><div class='add'>+	pps_cfg-&gt;start.tv_nsec = request-&gt;perout.start.nsec;</div><div class='add'>+	pps_cfg-&gt;period.tv_sec = request-&gt;perout.period.sec;</div><div class='add'>+	pps_cfg-&gt;period.tv_nsec = request-&gt;perout.period.nsec;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='add'>+	ret = xgbe_pps_config(pdata, pps_cfg, request-&gt;perout.index, on);</div><div class='add'>+	spin_unlock_irqrestore(&amp;pdata-&gt;tstamp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void xgbe_ptp_register(struct xgbe_prv_data *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct ptp_clock_info *info = &amp;pdata-&gt;ptp_clock_info;</div><div class='ctx'> 	struct ptp_clock *clock;</div><div class='del'>-	struct cyclecounter *cc = &amp;pdata-&gt;tstamp_cc;</div><div class='del'>-	u64 dividend;</div><div class='ctx'> </div><div class='ctx'> 	snprintf(info-&gt;name, sizeof(info-&gt;name), "%s",</div><div class='ctx'> 		 netdev_name(pdata-&gt;netdev));</div><div class='ctx'> 	info-&gt;owner = THIS_MODULE;</div><div class='ctx'> 	info-&gt;max_adj = pdata-&gt;ptpclk_rate;</div><div class='del'>-	info-&gt;adjfreq = xgbe_adjfreq;</div><div class='add'>+	info-&gt;adjfine = xgbe_adjfine;</div><div class='ctx'> 	info-&gt;adjtime = xgbe_adjtime;</div><div class='del'>-	info-&gt;gettime64 = xgbe_gettime;</div><div class='add'>+	info-&gt;gettimex64 = xgbe_gettimex;</div><div class='ctx'> 	info-&gt;settime64 = xgbe_settime;</div><div class='add'>+	info-&gt;n_per_out = pdata-&gt;hw_feat.pps_out_num;</div><div class='add'>+	info-&gt;n_ext_ts = pdata-&gt;hw_feat.aux_snap_num;</div><div class='ctx'> 	info-&gt;enable = xgbe_enable;</div><div class='ctx'> </div><div class='ctx'> 	clock = ptp_clock_register(info, pdata-&gt;dev);</div><div class='hunk'>@@ -249,23 +156,6 @@ void xgbe_ptp_register(struct xgbe_prv_data *pdata)</div><div class='ctx'> </div><div class='ctx'> 	pdata-&gt;ptp_clock = clock;</div><div class='ctx'> </div><div class='del'>-	/* Calculate the addend:</div><div class='del'>-	 *   addend = 2^32 / (PTP ref clock / 50Mhz)</div><div class='del'>-	 *          = (2^32 * 50Mhz) / PTP ref clock</div><div class='del'>-	 */</div><div class='del'>-	dividend = 50000000;</div><div class='del'>-	dividend &lt;&lt;= 32;</div><div class='del'>-	pdata-&gt;tstamp_addend = div_u64(dividend, pdata-&gt;ptpclk_rate);</div><div class='del'>-</div><div class='del'>-	/* Setup the timecounter */</div><div class='del'>-	cc-&gt;read = xgbe_cc_read;</div><div class='del'>-	cc-&gt;mask = CLOCKSOURCE_MASK(64);</div><div class='del'>-	cc-&gt;mult = 1;</div><div class='del'>-	cc-&gt;shift = 0;</div><div class='del'>-</div><div class='del'>-	timecounter_init(&amp;pdata-&gt;tstamp_tc, &amp;pdata-&gt;tstamp_cc,</div><div class='del'>-			 ktime_to_ns(ktime_get_real()));</div><div class='del'>-</div><div class='ctx'> 	/* Disable all timestamping to start */</div><div class='ctx'> 	XGMAC_IOWRITE(pdata, MAC_TSCR, 0);</div><div class='ctx'> 	pdata-&gt;tstamp_config.tx_type = HWTSTAMP_TX_OFF;</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c b/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c<br/>new file mode 100644<br/>index 000000000000..55e5e467facd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-selftest.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-selftest.c</a></div><div class='hunk'>@@ -0,0 +1,346 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * Author: Raju Rangoju &lt;Raju.Rangoju@amd.com&gt;</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/udp.h&gt;</div><div class='add'>+#include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;net/selftests.h&gt;</div><div class='add'>+</div><div class='add'>+#include "xgbe.h"</div><div class='add'>+#include "xgbe-common.h"</div><div class='add'>+</div><div class='add'>+#define XGBE_LOOPBACK_NONE	0</div><div class='add'>+#define XGBE_LOOPBACK_MAC	1</div><div class='add'>+#define XGBE_LOOPBACK_PHY	2</div><div class='add'>+</div><div class='add'>+struct xgbe_test {</div><div class='add'>+	char name[ETH_GSTRING_LEN];</div><div class='add'>+	int lb;</div><div class='add'>+	int (*fn)(struct xgbe_prv_data *pdata);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u8 xgbe_test_id;</div><div class='add'>+</div><div class='add'>+static int xgbe_test_loopback_validate(struct sk_buff *skb,</div><div class='add'>+				       struct net_device *ndev,</div><div class='add'>+				       struct packet_type *pt,</div><div class='add'>+				       struct net_device *orig_ndev)</div><div class='add'>+{</div><div class='add'>+	struct net_test_priv *tdata = pt-&gt;af_packet_priv;</div><div class='add'>+	const unsigned char *dst = tdata-&gt;packet-&gt;dst;</div><div class='add'>+	const unsigned char *src = tdata-&gt;packet-&gt;src;</div><div class='add'>+	struct netsfhdr *hdr;</div><div class='add'>+	struct ethhdr *eh;</div><div class='add'>+	struct tcphdr *th;</div><div class='add'>+	struct udphdr *uh;</div><div class='add'>+	struct iphdr *ih;</div><div class='add'>+	int eat;</div><div class='add'>+</div><div class='add'>+	skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	eat = (skb-&gt;tail + skb-&gt;data_len) - skb-&gt;end;</div><div class='add'>+	if (eat &gt; 0 &amp;&amp; skb_shared(skb)) {</div><div class='add'>+		skb = skb_share_check(skb, GFP_ATOMIC);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_linearize(skb))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (skb_headlen(skb) &lt; (NET_TEST_PKT_SIZE - ETH_HLEN))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	eh = (struct ethhdr *)skb_mac_header(skb);</div><div class='add'>+	if (dst) {</div><div class='add'>+		if (!ether_addr_equal_unaligned(eh-&gt;h_dest, dst))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+	if (src) {</div><div class='add'>+		if (!ether_addr_equal_unaligned(eh-&gt;h_source, src))</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ih = ip_hdr(skb);</div><div class='add'>+</div><div class='add'>+	if (tdata-&gt;packet-&gt;tcp) {</div><div class='add'>+		if (ih-&gt;protocol != IPPROTO_TCP)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		th = (struct tcphdr *)((u8 *)ih + 4 * ih-&gt;ihl);</div><div class='add'>+		if (th-&gt;dest != htons(tdata-&gt;packet-&gt;dport))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		hdr = (struct netsfhdr *)((u8 *)th + sizeof(*th));</div><div class='add'>+	} else {</div><div class='add'>+		if (ih-&gt;protocol != IPPROTO_UDP)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		uh = (struct udphdr *)((u8 *)ih + 4 * ih-&gt;ihl);</div><div class='add'>+		if (uh-&gt;dest != htons(tdata-&gt;packet-&gt;dport))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		hdr = (struct netsfhdr *)((u8 *)uh + sizeof(*uh));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;magic != cpu_to_be64(NET_TEST_PKT_MAGIC))</div><div class='add'>+		goto out;</div><div class='add'>+	if (tdata-&gt;packet-&gt;id != hdr-&gt;id)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tdata-&gt;ok = true;</div><div class='add'>+	complete(&amp;tdata-&gt;comp);</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __xgbe_test_loopback(struct xgbe_prv_data *pdata,</div><div class='add'>+				struct net_packet_attrs *attr)</div><div class='add'>+{</div><div class='add'>+	struct net_test_priv *tdata;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	tdata = kzalloc(sizeof(*tdata), GFP_KERNEL);</div><div class='add'>+	if (!tdata)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tdata-&gt;ok = false;</div><div class='add'>+	init_completion(&amp;tdata-&gt;comp);</div><div class='add'>+</div><div class='add'>+	tdata-&gt;pt.type = htons(ETH_P_IP);</div><div class='add'>+	tdata-&gt;pt.func = xgbe_test_loopback_validate;</div><div class='add'>+	tdata-&gt;pt.dev = pdata-&gt;netdev;</div><div class='add'>+	tdata-&gt;pt.af_packet_priv = tdata;</div><div class='add'>+	tdata-&gt;packet = attr;</div><div class='add'>+</div><div class='add'>+	dev_add_pack(&amp;tdata-&gt;pt);</div><div class='add'>+</div><div class='add'>+	skb = net_test_get_skb(pdata-&gt;netdev, xgbe_test_id, attr);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xgbe_test_id++;</div><div class='add'>+	ret = dev_direct_xmit(skb, attr-&gt;queue_mapping);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto cleanup;</div><div class='add'>+</div><div class='add'>+	if (!attr-&gt;timeout)</div><div class='add'>+		attr-&gt;timeout = NET_LB_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	wait_for_completion_timeout(&amp;tdata-&gt;comp, attr-&gt;timeout);</div><div class='add'>+	ret = tdata-&gt;ok ? 0 : -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		netdev_err(pdata-&gt;netdev, "Response timedout: ret %d\n", ret);</div><div class='add'>+cleanup:</div><div class='add'>+	dev_remove_pack(&amp;tdata-&gt;pt);</div><div class='add'>+	kfree(tdata);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_test_mac_loopback(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = {};</div><div class='add'>+</div><div class='add'>+	attr.dst = pdata-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	return __xgbe_test_loopback(pdata, &amp;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_test_phy_loopback(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = {};</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;netdev-&gt;phydev) {</div><div class='add'>+		netdev_err(pdata-&gt;netdev, "phydev not found: cannot start PHY loopback test\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = phy_loopback(pdata-&gt;netdev-&gt;phydev, true, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	attr.dst = pdata-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	ret = __xgbe_test_loopback(pdata, &amp;attr);</div><div class='add'>+</div><div class='add'>+	phy_loopback(pdata-&gt;netdev-&gt;phydev, false, 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_test_sph(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = {};</div><div class='add'>+	unsigned long cnt_end, cnt_start;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cnt_start = pdata-&gt;ext_stats.rx_split_header_packets;</div><div class='add'>+</div><div class='add'>+	if (!pdata-&gt;sph) {</div><div class='add'>+		netdev_err(pdata-&gt;netdev, "Split Header not enabled\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* UDP test */</div><div class='add'>+	attr.dst = pdata-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	attr.tcp = false;</div><div class='add'>+</div><div class='add'>+	ret = __xgbe_test_loopback(pdata, &amp;attr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cnt_end = pdata-&gt;ext_stats.rx_split_header_packets;</div><div class='add'>+	if (cnt_end &lt;= cnt_start)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* TCP test */</div><div class='add'>+	cnt_start = cnt_end;</div><div class='add'>+</div><div class='add'>+	attr.dst = pdata-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	attr.tcp = true;</div><div class='add'>+</div><div class='add'>+	ret = __xgbe_test_loopback(pdata, &amp;attr);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cnt_end = pdata-&gt;ext_stats.rx_split_header_packets;</div><div class='add'>+	if (cnt_end &lt;= cnt_start)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int xgbe_test_jumbo(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	struct net_packet_attrs attr = {};</div><div class='add'>+	int size = pdata-&gt;rx_buf_size;</div><div class='add'>+</div><div class='add'>+	attr.dst = pdata-&gt;netdev-&gt;dev_addr;</div><div class='add'>+	attr.max_size = size - ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	return __xgbe_test_loopback(pdata, &amp;attr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xgbe_test xgbe_selftests[] = {</div><div class='add'>+	{</div><div class='add'>+		.name = "MAC Loopback   ",</div><div class='add'>+		.lb = XGBE_LOOPBACK_MAC,</div><div class='add'>+		.fn = xgbe_test_mac_loopback,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "PHY Loopback   ",</div><div class='add'>+		.lb = XGBE_LOOPBACK_NONE,</div><div class='add'>+		.fn = xgbe_test_phy_loopback,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "Split Header   ",</div><div class='add'>+		.lb = XGBE_LOOPBACK_PHY,</div><div class='add'>+		.fn = xgbe_test_sph,</div><div class='add'>+	}, {</div><div class='add'>+		.name = "Jumbo Frame    ",</div><div class='add'>+		.lb = XGBE_LOOPBACK_PHY,</div><div class='add'>+		.fn = xgbe_test_jumbo,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void xgbe_selftest_run(struct net_device *dev,</div><div class='add'>+		       struct ethtool_test *etest, u64 *buf)</div><div class='add'>+{</div><div class='add'>+	struct xgbe_prv_data *pdata = netdev_priv(dev);</div><div class='add'>+	int count = xgbe_selftest_get_count(pdata);</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	memset(buf, 0, sizeof(*buf) * count);</div><div class='add'>+	xgbe_test_id = 0;</div><div class='add'>+</div><div class='add'>+	if (etest-&gt;flags != ETH_TEST_FL_OFFLINE) {</div><div class='add'>+		netdev_err(pdata-&gt;netdev, "Only offline tests are supported\n");</div><div class='add'>+		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		return;</div><div class='add'>+	} else if (!netif_carrier_ok(dev)) {</div><div class='add'>+		netdev_err(pdata-&gt;netdev,</div><div class='add'>+			   "Invalid link, cannot execute tests\n");</div><div class='add'>+		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for queues drain */</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		ret = 0;</div><div class='add'>+</div><div class='add'>+		switch (xgbe_selftests[i].lb) {</div><div class='add'>+		case XGBE_LOOPBACK_PHY:</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			if (dev-&gt;phydev)</div><div class='add'>+				ret = phy_loopback(dev-&gt;phydev, true, 0);</div><div class='add'>+			if (!ret)</div><div class='add'>+				break;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case XGBE_LOOPBACK_MAC:</div><div class='add'>+			ret = xgbe_enable_mac_loopback(pdata);</div><div class='add'>+			break;</div><div class='add'>+		case XGBE_LOOPBACK_NONE:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * First tests will always be MAC / PHY loopback.</div><div class='add'>+		 * If any of them is not supported we abort earlier.</div><div class='add'>+		 */</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(pdata-&gt;netdev, "Loopback not supported\n");</div><div class='add'>+			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = xgbe_selftests[i].fn(pdata);</div><div class='add'>+		if (ret &amp;&amp; (ret != -EOPNOTSUPP))</div><div class='add'>+			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		buf[i] = ret;</div><div class='add'>+</div><div class='add'>+		switch (xgbe_selftests[i].lb) {</div><div class='add'>+		case XGBE_LOOPBACK_PHY:</div><div class='add'>+			ret = -EOPNOTSUPP;</div><div class='add'>+			if (dev-&gt;phydev)</div><div class='add'>+				ret = phy_loopback(dev-&gt;phydev, false, 0);</div><div class='add'>+			if (!ret)</div><div class='add'>+				break;</div><div class='add'>+			fallthrough;</div><div class='add'>+		case XGBE_LOOPBACK_MAC:</div><div class='add'>+			xgbe_disable_mac_loopback(pdata);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void xgbe_selftest_get_strings(struct xgbe_prv_data *pdata, u8 *data)</div><div class='add'>+{</div><div class='add'>+	u8 *p = data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; xgbe_selftest_get_count(pdata); i++)</div><div class='add'>+		ethtool_puts(&amp;p, xgbe_selftests[i].name);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int xgbe_selftest_get_count(struct xgbe_prv_data *pdata)</div><div class='add'>+{</div><div class='add'>+	return ARRAY_SIZE(xgbe_selftests);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-smn.h b/drivers/net/ethernet/amd/xgbe/xgbe-smn.h<br/>new file mode 100644<br/>index 000000000000..c6ae127ced03<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe-smn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe-smn.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='add'>+ *</div><div class='add'>+ * Author: Raju Rangoju &lt;Raju.Rangoju@amd.com&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __SMN_H__</div><div class='add'>+#define __SMN_H__</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_AMD_NB</div><div class='add'>+</div><div class='add'>+#include &lt;asm/amd/nb.h&gt;</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int amd_smn_write(u16 node, u32 address, u32 value)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int amd_smn_read(u16 node, u32 address, u32 *value)</div><div class='add'>+{</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h<br/>index 47bcbcf58048..03ef0f548483 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/amd/xgbe/xgbe.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/amd/xgbe/xgbe.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/amd/xgbe/xgbe.h</a></div><div class='hunk'>@@ -1,117 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)</div><div class='ctx'> /*</div><div class='del'>- * AMD 10Gb Ethernet driver</div><div class='del'>- *</div><div class='del'>- * This file is available to you under your choice of the following two</div><div class='del'>- * licenses:</div><div class='del'>- *</div><div class='del'>- * License 1: GPLv2</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- *</div><div class='del'>- * This file is free software; you may copy, redistribute and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation, either version 2 of the License, or (at</div><div class='del'>- * your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This file is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * License 2: Modified BSD</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *       notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *       documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Advanced Micro Devices, Inc. nor the</div><div class='del'>- *       names of its contributors may be used to endorse or promote products</div><div class='del'>- *       derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"</div><div class='del'>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='del'>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='del'>- * ARE DISCLAIMED. IN NO EVENT SHALL &lt;COPYRIGHT HOLDER&gt; BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>- *</div><div class='del'>- * This file incorporates work covered by the following copyright and</div><div class='del'>- * permission notice:</div><div class='del'>- *     The Synopsys DWC ETHER XGMAC Software Driver and documentation</div><div class='del'>- *     (hereinafter "Software") is an unsupported proprietary work of Synopsys,</div><div class='del'>- *     Inc. unless otherwise expressly agreed to in writing between Synopsys</div><div class='del'>- *     and you.</div><div class='del'>- *</div><div class='del'>- *     The Software IS NOT an item of Licensed Software or Licensed Product</div><div class='del'>- *     under any End User Software License Agreement or Agreement for Licensed</div><div class='del'>- *     Product with Synopsys or any supplement thereto.  Permission is hereby</div><div class='del'>- *     granted, free of charge, to any person obtaining a copy of this software</div><div class='del'>- *     annotated with this license and the Software, to deal in the Software</div><div class='del'>- *     without restriction, including without limitation the rights to use,</div><div class='del'>- *     copy, modify, merge, publish, distribute, sublicense, and/or sell copies</div><div class='del'>- *     of the Software, and to permit persons to whom the Software is furnished</div><div class='del'>- *     to do so, subject to the following conditions:</div><div class='del'>- *</div><div class='del'>- *     The above copyright notice and this permission notice shall be included</div><div class='del'>- *     in all copies or substantial portions of the Software.</div><div class='del'>- *</div><div class='del'>- *     THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"</div><div class='del'>- *     BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED</div><div class='del'>- *     TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</div><div class='del'>- *     PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS</div><div class='del'>- *     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR</div><div class='del'>- *     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF</div><div class='del'>- *     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS</div><div class='del'>- *     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN</div><div class='del'>- *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)</div><div class='del'>- *     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF</div><div class='del'>- *     THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+ * Copyright (c) 2014-2025, Advanced Micro Devices, Inc.</div><div class='add'>+ * Copyright (c) 2014, Synopsys, Inc.</div><div class='add'>+ * All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __XGBE_H__</div><div class='hunk'>@@ -135,7 +26,6 @@</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define XGBE_DRV_NAME		"amd-xgbe"</div><div class='del'>-#define XGBE_DRV_VERSION	"1.0.3"</div><div class='ctx'> #define XGBE_DRV_DESC		"AMD 10 Gigabit Ethernet Driver"</div><div class='ctx'> </div><div class='ctx'> /* Descriptor related defines */</div><div class='hunk'>@@ -152,7 +42,8 @@</div><div class='ctx'> #define XGBE_TX_MAX_BUF_SIZE	(0x3fff &amp; ~(64 - 1))</div><div class='ctx'> </div><div class='ctx'> /* Descriptors required for maximum contiguous TSO/GSO packet */</div><div class='del'>-#define XGBE_TX_MAX_SPLIT	((GSO_MAX_SIZE / XGBE_TX_MAX_BUF_SIZE) + 1)</div><div class='add'>+#define XGBE_TX_MAX_SPLIT	\</div><div class='add'>+	((GSO_LEGACY_MAX_SIZE / XGBE_TX_MAX_BUF_SIZE) + 1)</div><div class='ctx'> </div><div class='ctx'> /* Maximum possible descriptors needed for an SKB:</div><div class='ctx'>  * - Maximum number of SKB frags</div><div class='hunk'>@@ -181,19 +72,21 @@</div><div class='ctx'> #define XGBE_DMA_SYS_AWCR	0x30303030</div><div class='ctx'> </div><div class='ctx'> /* DMA cache settings - PCI device */</div><div class='del'>-#define XGBE_DMA_PCI_ARCR	0x00000003</div><div class='del'>-#define XGBE_DMA_PCI_AWCR	0x13131313</div><div class='del'>-#define XGBE_DMA_PCI_AWARCR	0x00000313</div><div class='add'>+#define XGBE_DMA_PCI_ARCR	0x000f0f0f</div><div class='add'>+#define XGBE_DMA_PCI_AWCR	0x0f0f0f0f</div><div class='add'>+#define XGBE_DMA_PCI_AWARCR	0x00000f0f</div><div class='ctx'> </div><div class='ctx'> /* DMA channel interrupt modes */</div><div class='ctx'> #define XGBE_IRQ_MODE_EDGE	0</div><div class='ctx'> #define XGBE_IRQ_MODE_LEVEL	1</div><div class='ctx'> </div><div class='add'>+#define XGBE_ETH_FRAME_HDR	(ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN)</div><div class='ctx'> #define XGMAC_MIN_PACKET	60</div><div class='ctx'> #define XGMAC_STD_PACKET_MTU	1500</div><div class='ctx'> #define XGMAC_MAX_STD_PACKET	1518</div><div class='ctx'> #define XGMAC_JUMBO_PACKET_MTU	9000</div><div class='ctx'> #define XGMAC_MAX_JUMBO_PACKET	9018</div><div class='add'>+#define XGMAC_GIANT_PACKET_MTU	16368</div><div class='ctx'> #define XGMAC_ETH_PREAMBLE	(12 + 8)	/* Inter-frame gap + preamble */</div><div class='ctx'> </div><div class='ctx'> #define XGMAC_PFC_DATA_LEN	46</div><div class='hunk'>@@ -226,6 +119,14 @@</div><div class='ctx'> #define XGBE_MSI_BASE_COUNT	4</div><div class='ctx'> #define XGBE_MSI_MIN_COUNT	(XGBE_MSI_BASE_COUNT + 1)</div><div class='ctx'> </div><div class='add'>+/* Initial PTP register values based on Link Speed. */</div><div class='add'>+#define MAC_TICNR_1G_INITVAL	0x10</div><div class='add'>+#define MAC_TECNR_1G_INITVAL	0x28</div><div class='add'>+</div><div class='add'>+#define MAC_TICSNR_10G_INITVAL	0x33</div><div class='add'>+#define MAC_TECNR_10G_INITVAL	0x14</div><div class='add'>+#define MAC_TECSNR_10G_INITVAL	0xCC</div><div class='add'>+</div><div class='ctx'> /* PCI clock frequencies */</div><div class='ctx'> #define XGBE_V2_DMA_CLOCK_FREQ	500000000	/* 500 MHz */</div><div class='ctx'> #define XGBE_V2_PTP_CLOCK_FREQ	125000000	/* 125 MHz */</div><div class='hunk'>@@ -235,6 +136,15 @@</div><div class='ctx'>  */</div><div class='ctx'> #define XGBE_TSTAMP_SSINC	20</div><div class='ctx'> #define XGBE_TSTAMP_SNSINC	0</div><div class='add'>+#define XGBE_PTP_ACT_CLK_FREQ	500000000</div><div class='add'>+</div><div class='add'>+#define XGBE_V2_TSTAMP_SSINC	0xA</div><div class='add'>+#define XGBE_V2_TSTAMP_SNSINC	0</div><div class='add'>+#define XGBE_V2_PTP_ACT_CLK_FREQ	1000000000</div><div class='add'>+</div><div class='add'>+/* Define maximum supported values */</div><div class='add'>+#define XGBE_MAX_PPS_OUT	4</div><div class='add'>+#define XGBE_MAX_AUX_SNAP	4</div><div class='ctx'> </div><div class='ctx'> /* Driver PMT macros */</div><div class='ctx'> #define XGMAC_DRIVER_CONTEXT	1</div><div class='hunk'>@@ -262,6 +172,7 @@</div><div class='ctx'> /* Default coalescing parameters */</div><div class='ctx'> #define XGMAC_INIT_DMA_TX_USECS		1000</div><div class='ctx'> #define XGMAC_INIT_DMA_TX_FRAMES	25</div><div class='add'>+#define XGMAC_MAX_COAL_TX_TICK		100000</div><div class='ctx'> </div><div class='ctx'> #define XGMAC_MAX_DMA_RIWT		0xff</div><div class='ctx'> #define XGMAC_INIT_DMA_RX_USECS		30</div><div class='hunk'>@@ -290,12 +201,14 @@</div><div class='ctx'> /* Auto-negotiation */</div><div class='ctx'> #define XGBE_AN_MS_TIMEOUT		500</div><div class='ctx'> #define XGBE_LINK_TIMEOUT		5</div><div class='add'>+#define XGBE_KR_TRAINING_WAIT_ITER	50</div><div class='ctx'> </div><div class='del'>-#define XGBE_SGMII_AN_LINK_STATUS	BIT(1)</div><div class='add'>+#define XGBE_SGMII_AN_LINK_DUPLEX	BIT(1)</div><div class='ctx'> #define XGBE_SGMII_AN_LINK_SPEED	(BIT(2) | BIT(3))</div><div class='add'>+#define XGBE_SGMII_AN_LINK_SPEED_10	0x00</div><div class='ctx'> #define XGBE_SGMII_AN_LINK_SPEED_100	0x04</div><div class='ctx'> #define XGBE_SGMII_AN_LINK_SPEED_1000	0x08</div><div class='del'>-#define XGBE_SGMII_AN_LINK_DUPLEX	BIT(4)</div><div class='add'>+#define XGBE_SGMII_AN_LINK_STATUS	BIT(4)</div><div class='ctx'> </div><div class='ctx'> /* ECC correctable error notification window (seconds) */</div><div class='ctx'> #define XGBE_ECC_LIMIT			60</div><div class='hunk'>@@ -345,6 +258,15 @@</div><div class='ctx'> 		    (_src)-&gt;link_modes._sname,		\</div><div class='ctx'> 		    __ETHTOOL_LINK_MODE_MASK_NBITS)</div><div class='ctx'> </div><div class='add'>+/* XGBE PCI device id */</div><div class='add'>+#define XGBE_RV_PCI_DEVICE_ID	0x15d0</div><div class='add'>+#define XGBE_YC_PCI_DEVICE_ID	0x14b5</div><div class='add'>+#define XGBE_RN_PCI_DEVICE_ID	0x1630</div><div class='add'>+</div><div class='add'>+ /* Generic low and high masks */</div><div class='add'>+#define XGBE_GEN_HI_MASK	GENMASK(31, 16)</div><div class='add'>+#define XGBE_GEN_LO_MASK	GENMASK(15, 0)</div><div class='add'>+</div><div class='ctx'> struct xgbe_prv_data;</div><div class='ctx'> </div><div class='ctx'> struct xgbe_packet_data {</div><div class='hunk'>@@ -417,7 +339,7 @@ struct xgbe_rx_ring_data {</div><div class='ctx'> </div><div class='ctx'> /* Structure used to hold information related to the descriptor</div><div class='ctx'>  * and the packet associated with the descriptor (always use</div><div class='del'>- * use the XGBE_GET_DESC_DATA macro to access this data from the ring)</div><div class='add'>+ * the XGBE_GET_DESC_DATA macro to access this data from the ring)</div><div class='ctx'>  */</div><div class='ctx'> struct xgbe_ring_data {</div><div class='ctx'> 	struct xgbe_ring_desc *rdesc;	/* Virtual address of descriptor */</div><div class='hunk'>@@ -493,7 +415,7 @@ struct xgbe_ring {</div><div class='ctx'>  * a DMA channel.</div><div class='ctx'>  */</div><div class='ctx'> struct xgbe_channel {</div><div class='del'>-	char name[16];</div><div class='add'>+	char name[20];</div><div class='ctx'> </div><div class='ctx'> 	/* Address of private data area for device */</div><div class='ctx'> 	struct xgbe_prv_data *pdata;</div><div class='hunk'>@@ -563,6 +485,7 @@ enum xgbe_speed {</div><div class='ctx'> enum xgbe_xpcs_access {</div><div class='ctx'> 	XGBE_XPCS_ACCESS_V1 = 0,</div><div class='ctx'> 	XGBE_XPCS_ACCESS_V2,</div><div class='add'>+	XGBE_XPCS_ACCESS_V3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum xgbe_an_mode {</div><div class='hunk'>@@ -594,6 +517,7 @@ enum xgbe_mode {</div><div class='ctx'> 	XGBE_MODE_KX_2500,</div><div class='ctx'> 	XGBE_MODE_KR,</div><div class='ctx'> 	XGBE_MODE_X,</div><div class='add'>+	XGBE_MODE_SGMII_10,</div><div class='ctx'> 	XGBE_MODE_SGMII_100,</div><div class='ctx'> 	XGBE_MODE_SGMII_1000,</div><div class='ctx'> 	XGBE_MODE_SFI,</div><div class='hunk'>@@ -611,6 +535,32 @@ enum xgbe_mdio_mode {</div><div class='ctx'> 	XGBE_MDIO_MODE_CL45,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum xgbe_mb_cmd {</div><div class='add'>+	XGBE_MB_CMD_POWER_OFF = 0,</div><div class='add'>+	XGBE_MB_CMD_SET_1G,</div><div class='add'>+	XGBE_MB_CMD_SET_2_5G,</div><div class='add'>+	XGBE_MB_CMD_SET_10G_SFI,</div><div class='add'>+	XGBE_MB_CMD_SET_10G_KR,</div><div class='add'>+	XGBE_MB_CMD_RRC</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum xgbe_mb_subcmd {</div><div class='add'>+	XGBE_MB_SUBCMD_NONE = 0,</div><div class='add'>+	XGBE_MB_SUBCMD_RX_ADAP,</div><div class='add'>+</div><div class='add'>+	/* 10GbE SFP subcommands */</div><div class='add'>+	XGBE_MB_SUBCMD_ACTIVE = 0,</div><div class='add'>+	XGBE_MB_SUBCMD_PASSIVE_1M,</div><div class='add'>+	XGBE_MB_SUBCMD_PASSIVE_3M,</div><div class='add'>+	XGBE_MB_SUBCMD_PASSIVE_OTHER,</div><div class='add'>+</div><div class='add'>+	/* 1GbE Mode subcommands */</div><div class='add'>+	XGBE_MB_SUBCMD_10MBITS = 0,</div><div class='add'>+	XGBE_MB_SUBCMD_100MBITS,</div><div class='add'>+	XGBE_MB_SUBCMD_1G_SGMII,</div><div class='add'>+	XGBE_MB_SUBCMD_1G_KX</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct xgbe_phy {</div><div class='ctx'> 	struct ethtool_link_ksettings lks;</div><div class='ctx'> </div><div class='hunk'>@@ -727,10 +677,15 @@ struct xgbe_ext_stats {</div><div class='ctx'> 	u64 rx_vxlan_csum_errors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct xgbe_pps_config {</div><div class='add'>+	struct timespec64 start;</div><div class='add'>+	struct timespec64 period;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct xgbe_hw_if {</div><div class='ctx'> 	int (*tx_complete)(struct xgbe_ring_desc *);</div><div class='ctx'> </div><div class='del'>-	int (*set_mac_address)(struct xgbe_prv_data *, u8 *addr);</div><div class='add'>+	int (*set_mac_address)(struct xgbe_prv_data *, const u8 *addr);</div><div class='ctx'> 	int (*config_rx_mode)(struct xgbe_prv_data *);</div><div class='ctx'> </div><div class='ctx'> 	int (*enable_rx_csum)(struct xgbe_prv_data *);</div><div class='hunk'>@@ -748,8 +703,11 @@ struct xgbe_hw_if {</div><div class='ctx'> </div><div class='ctx'> 	int (*set_ext_mii_mode)(struct xgbe_prv_data *, unsigned int,</div><div class='ctx'> 				enum xgbe_mdio_mode);</div><div class='del'>-	int (*read_ext_mii_regs)(struct xgbe_prv_data *, int, int);</div><div class='del'>-	int (*write_ext_mii_regs)(struct xgbe_prv_data *, int, int, u16);</div><div class='add'>+	int (*read_ext_mii_regs_c22)(struct xgbe_prv_data *, int, int);</div><div class='add'>+	int (*write_ext_mii_regs_c22)(struct xgbe_prv_data *, int, int, u16);</div><div class='add'>+	int (*read_ext_mii_regs_c45)(struct xgbe_prv_data *, int, int, int);</div><div class='add'>+	int (*write_ext_mii_regs_c45)(struct xgbe_prv_data *, int, int, int,</div><div class='add'>+				      u16);</div><div class='ctx'> </div><div class='ctx'> 	int (*set_gpio)(struct xgbe_prv_data *, unsigned int);</div><div class='ctx'> 	int (*clr_gpio)(struct xgbe_prv_data *, unsigned int);</div><div class='hunk'>@@ -806,14 +764,6 @@ struct xgbe_hw_if {</div><div class='ctx'> 	void (*tx_mmc_int)(struct xgbe_prv_data *);</div><div class='ctx'> 	void (*read_mmc_stats)(struct xgbe_prv_data *);</div><div class='ctx'> </div><div class='del'>-	/* For Timestamp config */</div><div class='del'>-	int (*config_tstamp)(struct xgbe_prv_data *, unsigned int);</div><div class='del'>-	void (*update_tstamp_addend)(struct xgbe_prv_data *, unsigned int);</div><div class='del'>-	void (*set_tstamp_time)(struct xgbe_prv_data *, unsigned int sec,</div><div class='del'>-				unsigned int nsec);</div><div class='del'>-	u64 (*get_tstamp_time)(struct xgbe_prv_data *);</div><div class='del'>-	u64 (*get_tx_tstamp)(struct xgbe_prv_data *);</div><div class='del'>-</div><div class='ctx'> 	/* For Data Center Bridging config */</div><div class='ctx'> 	void (*config_tc)(struct xgbe_prv_data *);</div><div class='ctx'> 	void (*config_dcb_tc)(struct xgbe_prv_data *);</div><div class='hunk'>@@ -833,6 +783,10 @@ struct xgbe_hw_if {</div><div class='ctx'> 	void (*enable_vxlan)(struct xgbe_prv_data *);</div><div class='ctx'> 	void (*disable_vxlan)(struct xgbe_prv_data *);</div><div class='ctx'> 	void (*set_vxlan_id)(struct xgbe_prv_data *);</div><div class='add'>+</div><div class='add'>+	/* For Split Header */</div><div class='add'>+	void (*enable_sph)(struct xgbe_prv_data *pdata);</div><div class='add'>+	void (*disable_sph)(struct xgbe_prv_data *pdata);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* This structure represents implementation specific routines for an</div><div class='hunk'>@@ -1007,18 +961,14 @@ struct xgbe_version_data {</div><div class='ctx'> 	unsigned int tx_max_fifo_size;</div><div class='ctx'> 	unsigned int rx_max_fifo_size;</div><div class='ctx'> 	unsigned int tx_tstamp_workaround;</div><div class='add'>+	unsigned int tstamp_ptp_clock_freq;</div><div class='ctx'> 	unsigned int ecc_support;</div><div class='ctx'> 	unsigned int i2c_support;</div><div class='ctx'> 	unsigned int irq_reissue_support;</div><div class='ctx'> 	unsigned int tx_desc_prefetch;</div><div class='ctx'> 	unsigned int rx_desc_prefetch;</div><div class='ctx'> 	unsigned int an_cdr_workaround;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct xgbe_vxlan_data {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	sa_family_t sa_family;</div><div class='del'>-	__be16 port;</div><div class='add'>+	unsigned int enable_rrc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct xgbe_prv_data {</div><div class='hunk'>@@ -1029,6 +979,7 @@ struct xgbe_prv_data {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct platform_device *phy_platdev;</div><div class='ctx'> 	struct device *phy_dev;</div><div class='add'>+	unsigned int smn_base;</div><div class='ctx'> </div><div class='ctx'> 	/* Version related data */</div><div class='ctx'> 	struct xgbe_version_data *vdata;</div><div class='hunk'>@@ -1173,13 +1124,7 @@ struct xgbe_prv_data {</div><div class='ctx'> 	u32 rss_options;</div><div class='ctx'> </div><div class='ctx'> 	/* VXLAN settings */</div><div class='del'>-	unsigned int vxlan_port_set;</div><div class='del'>-	unsigned int vxlan_offloads_set;</div><div class='del'>-	unsigned int vxlan_force_disable;</div><div class='del'>-	unsigned int vxlan_port_count;</div><div class='del'>-	struct list_head vxlan_ports;</div><div class='ctx'> 	u16 vxlan_port;</div><div class='del'>-	netdev_features_t vxlan_features;</div><div class='ctx'> </div><div class='ctx'> 	/* Netdev related settings */</div><div class='ctx'> 	unsigned char mac_addr[ETH_ALEN];</div><div class='hunk'>@@ -1201,14 +1146,15 @@ struct xgbe_prv_data {</div><div class='ctx'> 	spinlock_t tstamp_lock;</div><div class='ctx'> 	struct ptp_clock_info ptp_clock_info;</div><div class='ctx'> 	struct ptp_clock *ptp_clock;</div><div class='del'>-	struct hwtstamp_config tstamp_config;</div><div class='del'>-	struct cyclecounter tstamp_cc;</div><div class='del'>-	struct timecounter tstamp_tc;</div><div class='add'>+	struct kernel_hwtstamp_config tstamp_config;</div><div class='ctx'> 	unsigned int tstamp_addend;</div><div class='ctx'> 	struct work_struct tx_tstamp_work;</div><div class='ctx'> 	struct sk_buff *tx_tstamp_skb;</div><div class='ctx'> 	u64 tx_tstamp;</div><div class='ctx'> </div><div class='add'>+	/* Pulse Per Second output */</div><div class='add'>+	struct xgbe_pps_config pps[XGBE_MAX_PPS_OUT];</div><div class='add'>+</div><div class='ctx'> 	/* DCB support */</div><div class='ctx'> 	struct ieee_ets *ets;</div><div class='ctx'> 	struct ieee_pfc *pfc;</div><div class='hunk'>@@ -1266,6 +1212,7 @@ struct xgbe_prv_data {</div><div class='ctx'> 	unsigned int parallel_detect;</div><div class='ctx'> 	unsigned int fec_ability;</div><div class='ctx'> 	unsigned long an_start;</div><div class='add'>+	unsigned long kr_start_time;</div><div class='ctx'> 	enum xgbe_an_mode an_mode;</div><div class='ctx'> </div><div class='ctx'> 	/* I2C support */</div><div class='hunk'>@@ -1276,11 +1223,11 @@ struct xgbe_prv_data {</div><div class='ctx'> </div><div class='ctx'> 	unsigned int lpm_ctrl;		/* CTRL1 for resume */</div><div class='ctx'> </div><div class='del'>-	unsigned int isr_as_tasklet;</div><div class='del'>-	struct tasklet_struct tasklet_dev;</div><div class='del'>-	struct tasklet_struct tasklet_ecc;</div><div class='del'>-	struct tasklet_struct tasklet_i2c;</div><div class='del'>-	struct tasklet_struct tasklet_an;</div><div class='add'>+	unsigned int isr_as_bh_work;</div><div class='add'>+	struct work_struct dev_bh_work;</div><div class='add'>+	struct work_struct ecc_bh_work;</div><div class='add'>+	struct work_struct i2c_bh_work;</div><div class='add'>+	struct work_struct an_bh_work;</div><div class='ctx'> </div><div class='ctx'> 	struct dentry *xgbe_debugfs;</div><div class='ctx'> </div><div class='hunk'>@@ -1295,6 +1242,11 @@ struct xgbe_prv_data {</div><div class='ctx'> </div><div class='ctx'> 	bool debugfs_an_cdr_workaround;</div><div class='ctx'> 	bool debugfs_an_cdr_track_early;</div><div class='add'>+	bool en_rx_adap;</div><div class='add'>+	int rx_adapt_retries;</div><div class='add'>+	bool rx_adapt_done;</div><div class='add'>+	bool mode_set;</div><div class='add'>+	bool sph;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Function prototypes*/</div><div class='hunk'>@@ -1322,6 +1274,7 @@ void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *);</div><div class='ctx'> void xgbe_init_function_ptrs_i2c(struct xgbe_i2c_if *);</div><div class='ctx'> const struct net_device_ops *xgbe_get_netdev_ops(void);</div><div class='ctx'> const struct ethtool_ops *xgbe_get_ethtool_ops(void);</div><div class='add'>+const struct udp_tunnel_nic_info *xgbe_get_udp_tunnel_info(void);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_AMD_XGBE_DCB</div><div class='ctx'> const struct dcbnl_rtnl_ops *xgbe_get_dcbnl_ops(void);</div><div class='hunk'>@@ -1342,6 +1295,44 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *);</div><div class='ctx'> void xgbe_restart_dev(struct xgbe_prv_data *pdata);</div><div class='ctx'> void xgbe_full_restart_dev(struct xgbe_prv_data *pdata);</div><div class='ctx'> </div><div class='add'>+/* For Timestamp config */</div><div class='add'>+void xgbe_config_tstamp(struct xgbe_prv_data *pdata, unsigned int mac_tscr);</div><div class='add'>+u64 xgbe_get_tstamp_time(struct xgbe_prv_data *pdata);</div><div class='add'>+u64 xgbe_get_tx_tstamp(struct xgbe_prv_data *pdata);</div><div class='add'>+void xgbe_get_rx_tstamp(struct xgbe_packet_data *packet,</div><div class='add'>+			struct xgbe_ring_desc *rdesc);</div><div class='add'>+void xgbe_get_rx_tstamp(struct xgbe_packet_data *packet,</div><div class='add'>+			struct xgbe_ring_desc *rdesc);</div><div class='add'>+void xgbe_update_tstamp_addend(struct xgbe_prv_data *pdata,</div><div class='add'>+			       unsigned int addend);</div><div class='add'>+void xgbe_set_tstamp_time(struct xgbe_prv_data *pdata, unsigned int sec,</div><div class='add'>+			  unsigned int nsec);</div><div class='add'>+void xgbe_tx_tstamp(struct work_struct *work);</div><div class='add'>+int xgbe_get_hwtstamp_settings(struct net_device *netdev,</div><div class='add'>+			       struct kernel_hwtstamp_config *config);</div><div class='add'>+int xgbe_set_hwtstamp_settings(struct net_device *netdev,</div><div class='add'>+			       struct kernel_hwtstamp_config *config,</div><div class='add'>+			       struct netlink_ext_ack *extack);</div><div class='add'>+void xgbe_prep_tx_tstamp(struct xgbe_prv_data *pdata,</div><div class='add'>+			 struct sk_buff *skb,</div><div class='add'>+			 struct xgbe_packet_data *packet);</div><div class='add'>+int xgbe_init_ptp(struct xgbe_prv_data *pdata);</div><div class='add'>+void xgbe_update_tstamp_time(struct xgbe_prv_data *pdata, unsigned int sec,</div><div class='add'>+			     unsigned int nsec);</div><div class='add'>+</div><div class='add'>+int xgbe_pps_config(struct xgbe_prv_data *pdata, struct xgbe_pps_config *cfg,</div><div class='add'>+		    int index, bool on);</div><div class='add'>+</div><div class='add'>+/* Selftest functions */</div><div class='add'>+void xgbe_selftest_run(struct net_device *dev,</div><div class='add'>+		       struct ethtool_test *etest, u64 *buf);</div><div class='add'>+void xgbe_selftest_get_strings(struct xgbe_prv_data *pdata, u8 *data);</div><div class='add'>+int xgbe_selftest_get_count(struct xgbe_prv_data *pdata);</div><div class='add'>+</div><div class='add'>+/* Loopback control */</div><div class='add'>+int xgbe_enable_mac_loopback(struct xgbe_prv_data *pdata);</div><div class='add'>+void xgbe_disable_mac_loopback(struct xgbe_prv_data *pdata);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> void xgbe_debugfs_init(struct xgbe_prv_data *);</div><div class='ctx'> void xgbe_debugfs_exit(struct xgbe_prv_data *);</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene-v2/ethtool.c b/drivers/net/ethernet/apm/xgene-v2/ethtool.c<br/>index a58250c1b57a..b78d1a99fe81 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene-v2/ethtool.c</a></div><div class='hunk'>@@ -89,8 +89,6 @@ static void xge_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 	struct platform_device *pdev = pdata-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;driver, "xgene-enet-v2");</div><div class='del'>-	strcpy(info-&gt;version, XGENE_ENET_V2_VERSION);</div><div class='del'>-	snprintf(info-&gt;fw_version, ETHTOOL_FWVERS_LEN, "N/A");</div><div class='ctx'> 	sprintf(info-&gt;bus_info, "%s", pdev-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene-v2/mac.c b/drivers/net/ethernet/apm/xgene-v2/mac.c<br/>index 2da979e4fad1..6423e22e05b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/mac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene-v2/mac.c</a></div><div class='hunk'>@@ -65,7 +65,7 @@ void xge_mac_set_speed(struct xge_pdata *pdata)</div><div class='ctx'> </div><div class='ctx'> void xge_mac_set_station_addr(struct xge_pdata *pdata)</div><div class='ctx'> {</div><div class='del'>-	u8 *dev_addr = pdata-&gt;ndev-&gt;dev_addr;</div><div class='add'>+	const u8 *dev_addr = pdata-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> 	u32 addr0, addr1;</div><div class='ctx'> </div><div class='ctx'> 	addr0 = (dev_addr[3] &lt;&lt; 24) | (dev_addr[2] &lt;&lt; 16) |</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene-v2/main.c b/drivers/net/ethernet/apm/xgene-v2/main.c<br/>index 79048cc46703..d7ca847d44c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene-v2/main.c</a></div><div class='hunk'>@@ -9,8 +9,6 @@</div><div class='ctx'> </div><div class='ctx'> #include "main.h"</div><div class='ctx'> </div><div class='del'>-static const struct acpi_device_id xge_acpi_match[];</div><div class='del'>-</div><div class='ctx'> static int xge_get_resources(struct xge_pdata *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev;</div><div class='hunk'>@@ -36,7 +34,7 @@ static int xge_get_resources(struct xge_pdata *pdata)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!device_get_mac_address(dev, ndev-&gt;dev_addr, ETH_ALEN))</div><div class='add'>+	if (device_get_ethdev_address(dev, ndev))</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ndev-&gt;perm_addr, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='hunk'>@@ -54,10 +52,8 @@ static int xge_get_resources(struct xge_pdata *pdata)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_get_irq(pdev, 0);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		dev_err(dev, "Unable to get irq\n");</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	}</div><div class='ctx'> 	pdata-&gt;resources.irq = ret;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -577,7 +573,7 @@ static void xge_free_pending_skb(struct net_device *ndev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xge_timeout(struct net_device *ndev)</div><div class='add'>+static void xge_timeout(struct net_device *ndev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct xge_pdata *pdata = netdev_priv(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -674,23 +670,25 @@ static int xge_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;pdata-&gt;napi, xge_napi, NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add(ndev, &amp;pdata-&gt;napi, xge_napi);</div><div class='ctx'> </div><div class='ctx'> 	ret = register_netdev(ndev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		netdev_err(ndev, "Failed to register netdev\n");</div><div class='del'>-		goto err;</div><div class='add'>+		goto err_mdio_remove;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_mdio_remove:</div><div class='add'>+	xge_mdio_remove(ndev);</div><div class='ctx'> err:</div><div class='ctx'> 	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xge_remove(struct platform_device *pdev)</div><div class='add'>+static void xge_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xge_pdata *pdata;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='hunk'>@@ -706,8 +704,6 @@ static int xge_remove(struct platform_device *pdev)</div><div class='ctx'> 	xge_mdio_remove(ndev);</div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='ctx'> 	free_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xge_shutdown(struct platform_device *pdev)</div><div class='hunk'>@@ -733,7 +729,7 @@ MODULE_DEVICE_TABLE(acpi, xge_acpi_match);</div><div class='ctx'> static struct platform_driver xge_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		   .name = "xgene-enet-v2",</div><div class='del'>-		   .acpi_match_table = ACPI_PTR(xge_acpi_match),</div><div class='add'>+		   .acpi_match_table = xge_acpi_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = xge_probe,</div><div class='ctx'> 	.remove = xge_remove,</div><div class='hunk'>@@ -743,5 +739,4 @@ module_platform_driver(xge_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("APM X-Gene SoC Ethernet v2 driver");</div><div class='ctx'> MODULE_AUTHOR("Iyappan Subramanian &lt;isubramanian@apm.com&gt;");</div><div class='del'>-MODULE_VERSION(XGENE_ENET_V2_VERSION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene-v2/main.h b/drivers/net/ethernet/apm/xgene-v2/main.h<br/>index d41439d2709d..7be6f83e22fe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/main.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene-v2/main.h</a></div><div class='hunk'>@@ -22,13 +22,13 @@</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include "mac.h"</div><div class='ctx'> #include "enet.h"</div><div class='ctx'> #include "ring.h"</div><div class='ctx'> #include "ethtool.h"</div><div class='ctx'> </div><div class='del'>-#define XGENE_ENET_V2_VERSION	"v1.0"</div><div class='ctx'> #define XGENE_ENET_STD_MTU	1536</div><div class='ctx'> #define XGENE_ENET_MIN_FRAME	60</div><div class='ctx'> #define IRQ_ID_SIZE             16</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene-v2/mdio.c b/drivers/net/ethernet/apm/xgene-v2/mdio.c<br/>index eba06831aec2..6a17045a5f62 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/mdio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene-v2/mdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene-v2/mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene-v2/mdio.c</a></div><div class='hunk'>@@ -97,7 +97,6 @@ void xge_mdio_remove(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> int xge_mdio_config(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='ctx'> 	struct xge_pdata *pdata = netdev_priv(ndev);</div><div class='ctx'> 	struct device *dev = &amp;pdata-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct mii_bus *mdio_bus;</div><div class='hunk'>@@ -137,17 +136,12 @@ int xge_mdio_config(struct net_device *ndev)</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	linkmode_set_bit_array(phy_10_100_features_array,</div><div class='del'>-			       ARRAY_SIZE(phy_10_100_features_array),</div><div class='del'>-			       mask);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, mask);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_AUI_BIT, mask);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_MII_BIT, mask);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, mask);</div><div class='del'>-	linkmode_set_bit(ETHTOOL_LINK_MODE_BNC_BIT, mask);</div><div class='del'>-</div><div class='del'>-	linkmode_andnot(phydev-&gt;supported, phydev-&gt;supported, mask);</div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Full_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Full_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);</div><div class='add'>+</div><div class='ctx'> 	pdata-&gt;phy_speed = SPEED_UNKNOWN;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c<br/>index 246dec27140d..ada70425b48c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c</a></div><div class='hunk'>@@ -103,8 +103,6 @@ static void xgene_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 	struct platform_device *pdev = pdata-&gt;pdev;</div><div class='ctx'> </div><div class='ctx'> 	strcpy(info-&gt;driver, "xgene_enet");</div><div class='del'>-	strcpy(info-&gt;version, XGENE_DRV_VERSION);</div><div class='del'>-	snprintf(info-&gt;fw_version, ETHTOOL_FWVERS_LEN, "N/A");</div><div class='ctx'> 	sprintf(info-&gt;bus_info, "%s", pdev-&gt;name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c<br/>index 61a465097cb8..b854b6b42d77 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene/xgene_enet_hw.c</a></div><div class='hunk'>@@ -378,8 +378,8 @@ u32 xgene_enet_rd_stat(struct xgene_enet_pdata *pdata, u32 rd_addr)</div><div class='ctx'> </div><div class='ctx'> static void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)</div><div class='ctx'> {</div><div class='add'>+	const u8 *dev_addr = pdata-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> 	u32 addr0, addr1;</div><div class='del'>-	u8 *dev_addr = pdata-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	addr0 = (dev_addr[3] &lt;&lt; 24) | (dev_addr[2] &lt;&lt; 16) |</div><div class='ctx'> 		(dev_addr[1] &lt;&lt; 8) | dev_addr[0];</div><div class='hunk'>@@ -421,18 +421,12 @@ static void xgene_enet_configure_clock(struct xgene_enet_pdata *pdata)</div><div class='ctx'> </div><div class='ctx'> 	if (dev-&gt;of_node) {</div><div class='ctx'> 		struct clk *parent = clk_get_parent(pdata-&gt;clk);</div><div class='add'>+		long rate = rgmii_clock(pdata-&gt;phy_speed);</div><div class='ctx'> </div><div class='del'>-		switch (pdata-&gt;phy_speed) {</div><div class='del'>-		case SPEED_10:</div><div class='del'>-			clk_set_rate(parent, 2500000);</div><div class='del'>-			break;</div><div class='del'>-		case SPEED_100:</div><div class='del'>-			clk_set_rate(parent, 25000000);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			clk_set_rate(parent, 125000000);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+		if (rate &lt; 0)</div><div class='add'>+			rate = 125000000;</div><div class='add'>+</div><div class='add'>+		clk_set_rate(parent, rate);</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -712,11 +706,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata)</div><div class='ctx'> 		udelay(5);</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-		if (acpi_has_method(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev), "_RST")) {</div><div class='del'>-			acpi_evaluate_object(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='del'>-					     "_RST", NULL, NULL);</div><div class='del'>-		} else if (acpi_has_method(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='del'>-					 "_INI")) {</div><div class='add'>+		acpi_status status;</div><div class='add'>+</div><div class='add'>+		status = acpi_evaluate_object(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='add'>+					      "_RST", NULL, NULL);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			acpi_evaluate_object(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='ctx'> 					     "_INI", NULL, NULL);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c<br/>index 10b1c053e70a..3b2951030a38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene/xgene_enet_main.c</a></div><div class='hunk'>@@ -340,7 +340,8 @@ static int xgene_enet_work_msg(struct sk_buff *skb, u64 *hopinfo)</div><div class='ctx'> 				nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 				for (i = 0; i &lt; 2 &amp;&amp; i &lt; nr_frags; i++)</div><div class='del'>-					len += skb_shinfo(skb)-&gt;frags[i].size;</div><div class='add'>+					len += skb_frag_size(</div><div class='add'>+						&amp;skb_shinfo(skb)-&gt;frags[i]);</div><div class='ctx'> </div><div class='ctx'> 				/* HW requires header must reside in 3 buffer */</div><div class='ctx'> 				if (unlikely(hdr_len &gt; len)) {</div><div class='hunk'>@@ -695,6 +696,12 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,</div><div class='ctx'> 	buf_pool-&gt;rx_skb[skb_index] = NULL;</div><div class='ctx'> </div><div class='ctx'> 	datalen = xgene_enet_get_data_len(le64_to_cpu(raw_desc-&gt;m1));</div><div class='add'>+</div><div class='add'>+	/* strip off CRC as HW isn't doing this */</div><div class='add'>+	nv = GET_VAL(NV, le64_to_cpu(raw_desc-&gt;m0));</div><div class='add'>+	if (!nv)</div><div class='add'>+		datalen -= 4;</div><div class='add'>+</div><div class='ctx'> 	skb_put(skb, datalen);</div><div class='ctx'> 	prefetch(skb-&gt;data - NET_IP_ALIGN);</div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='hunk'>@@ -716,12 +723,8 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	nv = GET_VAL(NV, le64_to_cpu(raw_desc-&gt;m0));</div><div class='del'>-	if (!nv) {</div><div class='del'>-		/* strip off CRC as HW isn't doing this */</div><div class='del'>-		datalen -= 4;</div><div class='add'>+	if (!nv)</div><div class='ctx'> 		goto skip_jumbo;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	slots = page_pool-&gt;slots - 1;</div><div class='ctx'> 	head = page_pool-&gt;head;</div><div class='hunk'>@@ -858,7 +861,7 @@ static int xgene_enet_napi(struct napi_struct *napi, const int budget)</div><div class='ctx'> 	return processed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgene_enet_timeout(struct net_device *ndev)</div><div class='add'>+static void xgene_enet_timeout(struct net_device *ndev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgene_enet_pdata *pdata = netdev_priv(ndev);</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='hunk'>@@ -868,7 +871,7 @@ static void xgene_enet_timeout(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;txq_cnt; i++) {</div><div class='ctx'> 		txq = netdev_get_tx_queue(ndev, i);</div><div class='del'>-		txq-&gt;trans_start = jiffies;</div><div class='add'>+		txq_trans_cond_update(txq);</div><div class='ctx'> 		netif_tx_start_queue(txq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1001,8 +1004,10 @@ static int xgene_enet_open(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	xgene_enet_napi_enable(pdata);</div><div class='ctx'> 	ret = xgene_enet_register_irq(ndev);</div><div class='del'>-	if (ret)</div><div class='add'>+	if (ret) {</div><div class='add'>+		xgene_enet_napi_disable(pdata);</div><div class='ctx'> 		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ndev-&gt;phydev) {</div><div class='ctx'> 		phy_start(ndev-&gt;phydev);</div><div class='hunk'>@@ -1525,7 +1530,7 @@ static int xgene_change_mtu(struct net_device *ndev, int new_mtu)</div><div class='ctx'> 	frame_size = (new_mtu &gt; ETH_DATA_LEN) ? (new_mtu + 18) : 0x600;</div><div class='ctx'> </div><div class='ctx'> 	xgene_enet_close(ndev);</div><div class='del'>-	ndev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(ndev-&gt;mtu, new_mtu);</div><div class='ctx'> 	pdata-&gt;mac_ops-&gt;set_framesize(pdata, frame_size);</div><div class='ctx'> 	xgene_enet_open(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -1616,7 +1621,6 @@ static int xgene_get_rx_delay(struct xgene_enet_pdata *pdata)</div><div class='ctx'> static int xgene_enet_get_irqs(struct xgene_enet_pdata *pdata)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev = pdata-&gt;pdev;</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	int i, ret, max_irqs;</div><div class='ctx'> </div><div class='ctx'> 	if (phy_interface_mode_is_rgmii(pdata-&gt;phy_mode))</div><div class='hunk'>@@ -1628,7 +1632,7 @@ static int xgene_enet_get_irqs(struct xgene_enet_pdata *pdata)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; max_irqs; i++) {</div><div class='ctx'> 		ret = platform_get_irq(pdev, i);</div><div class='del'>-		if (ret &lt;= 0) {</div><div class='add'>+		if (ret &lt; 0) {</div><div class='ctx'> 			if (pdata-&gt;phy_mode == PHY_INTERFACE_MODE_XGMII) {</div><div class='ctx'> 				max_irqs = i;</div><div class='ctx'> 				pdata-&gt;rxq_cnt = max_irqs / 2;</div><div class='hunk'>@@ -1636,8 +1640,6 @@ static int xgene_enet_get_irqs(struct xgene_enet_pdata *pdata)</div><div class='ctx'> 				pdata-&gt;cq_cnt = max_irqs / 2;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			dev_err(dev, "Unable to get ENET IRQ\n");</div><div class='del'>-			ret = ret ? : -ENXIO;</div><div class='ctx'> 			return ret;</div><div class='ctx'> 		}</div><div class='ctx'> 		pdata-&gt;irqs[i] = ret;</div><div class='hunk'>@@ -1733,7 +1735,7 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)</div><div class='ctx'> 		xgene_get_port_id_acpi(dev, pdata);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	if (!device_get_mac_address(dev, ndev-&gt;dev_addr, ETH_ALEN))</div><div class='add'>+	if (device_get_ethdev_address(dev, ndev))</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(ndev-&gt;perm_addr, ndev-&gt;dev_addr, ndev-&gt;addr_len);</div><div class='hunk'>@@ -1977,14 +1979,12 @@ static void xgene_enet_napi_add(struct xgene_enet_pdata *pdata)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;rxq_cnt; i++) {</div><div class='ctx'> 		napi = &amp;pdata-&gt;rx_ring[i]-&gt;napi;</div><div class='del'>-		netif_napi_add(pdata-&gt;ndev, napi, xgene_enet_napi,</div><div class='del'>-			       NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(pdata-&gt;ndev, napi, xgene_enet_napi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; pdata-&gt;cq_cnt; i++) {</div><div class='ctx'> 		napi = &amp;pdata-&gt;tx_ring[i]-&gt;cp_ring-&gt;napi;</div><div class='del'>-		netif_napi_add(pdata-&gt;ndev, napi, xgene_enet_napi,</div><div class='del'>-			       NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(pdata-&gt;ndev, napi, xgene_enet_napi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2018,11 +2018,10 @@ static int xgene_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct xgene_enet_pdata *pdata;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	void (*link_state)(struct work_struct *);</div><div class='del'>-	const struct of_device_id *of_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ndev = alloc_etherdev_mqs(sizeof(struct xgene_enet_pdata),</div><div class='del'>-				  XGENE_NUM_RX_RING, XGENE_NUM_TX_RING);</div><div class='add'>+				  XGENE_NUM_TX_RING, XGENE_NUM_RX_RING);</div><div class='ctx'> 	if (!ndev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2039,19 +2038,7 @@ static int xgene_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 			  NETIF_F_GRO |</div><div class='ctx'> 			  NETIF_F_SG;</div><div class='ctx'> </div><div class='del'>-	of_id = of_match_device(xgene_enet_of_match, &amp;pdev-&gt;dev);</div><div class='del'>-	if (of_id) {</div><div class='del'>-		pdata-&gt;enet_id = (enum xgene_enet_id)of_id-&gt;data;</div><div class='del'>-	}</div><div class='del'>-#ifdef CONFIG_ACPI</div><div class='del'>-	else {</div><div class='del'>-		const struct acpi_device_id *acpi_id;</div><div class='del'>-</div><div class='del'>-		acpi_id = acpi_match_device(xgene_enet_acpi_match, &amp;pdev-&gt;dev);</div><div class='del'>-		if (acpi_id)</div><div class='del'>-			pdata-&gt;enet_id = (enum xgene_enet_id) acpi_id-&gt;driver_data;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='add'>+	pdata-&gt;enet_id = (enum xgene_enet_id)device_get_match_data(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!pdata-&gt;enet_id) {</div><div class='ctx'> 		ret = -ENODEV;</div><div class='ctx'> 		goto err;</div><div class='hunk'>@@ -2127,7 +2114,7 @@ err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xgene_enet_remove(struct platform_device *pdev)</div><div class='add'>+static void xgene_enet_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgene_enet_pdata *pdata;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='hunk'>@@ -2149,8 +2136,6 @@ static int xgene_enet_remove(struct platform_device *pdev)</div><div class='ctx'> 	xgene_enet_delete_desc_rings(pdata);</div><div class='ctx'> 	pdata-&gt;port_ops-&gt;shutdown(pdata);</div><div class='ctx'> 	free_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void xgene_enet_shutdown(struct platform_device *pdev)</div><div class='hunk'>@@ -2170,7 +2155,7 @@ static void xgene_enet_shutdown(struct platform_device *pdev)</div><div class='ctx'> static struct platform_driver xgene_enet_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		   .name = "xgene-enet",</div><div class='del'>-		   .of_match_table = of_match_ptr(xgene_enet_of_match),</div><div class='add'>+		   .of_match_table = xgene_enet_of_match,</div><div class='ctx'> 		   .acpi_match_table = ACPI_PTR(xgene_enet_acpi_match),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = xgene_enet_probe,</div><div class='hunk'>@@ -2181,7 +2166,6 @@ static struct platform_driver xgene_enet_driver = {</div><div class='ctx'> module_platform_driver(xgene_enet_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_DESCRIPTION("APM X-Gene SoC Ethernet driver");</div><div class='del'>-MODULE_VERSION(XGENE_DRV_VERSION);</div><div class='ctx'> MODULE_AUTHOR("Iyappan Subramanian &lt;isubramanian@apm.com&gt;");</div><div class='ctx'> MODULE_AUTHOR("Keyur Chudgar &lt;kchudgar@apm.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h<br/>index 18f4923b1723..bce2c19e3f22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_main.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene/xgene_enet_main.h</a></div><div class='hunk'>@@ -15,9 +15,11 @@</div><div class='ctx'> #include &lt;linux/efi.h&gt;</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/mdio/mdio-xgene.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='hunk'>@@ -26,9 +28,7 @@</div><div class='ctx'> #include "xgene_enet_hw.h"</div><div class='ctx'> #include "xgene_enet_cle.h"</div><div class='ctx'> #include "xgene_enet_ring2.h"</div><div class='del'>-#include "../../../phy/mdio-xgene.h"</div><div class='ctx'> </div><div class='del'>-#define XGENE_DRV_VERSION	"v1.0"</div><div class='ctx'> #define ETHER_MIN_PACKET	64</div><div class='ctx'> #define ETHER_STD_PACKET	1518</div><div class='ctx'> #define XGENE_ENET_STD_MTU	1536</div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c<br/>index 6453fc2ebb1f..72b5e8eb0ec7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c</a></div><div class='hunk'>@@ -165,8 +165,8 @@ static void xgene_sgmac_reset(struct xgene_enet_pdata *p)</div><div class='ctx'> </div><div class='ctx'> static void xgene_sgmac_set_mac_addr(struct xgene_enet_pdata *p)</div><div class='ctx'> {</div><div class='add'>+	const u8 *dev_addr = p-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> 	u32 addr0, addr1;</div><div class='del'>-	u8 *dev_addr = p-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	addr0 = (dev_addr[3] &lt;&lt; 24) | (dev_addr[2] &lt;&lt; 16) |</div><div class='ctx'> 		(dev_addr[1] &lt;&lt; 8) | dev_addr[0];</div><div class='hunk'>@@ -460,12 +460,14 @@ static int xgene_enet_reset(struct xgene_enet_pdata *p)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-		if (acpi_has_method(ACPI_HANDLE(&amp;p-&gt;pdev-&gt;dev), "_RST"))</div><div class='del'>-			acpi_evaluate_object(ACPI_HANDLE(&amp;p-&gt;pdev-&gt;dev),</div><div class='del'>-					     "_RST", NULL, NULL);</div><div class='del'>-		else if (acpi_has_method(ACPI_HANDLE(&amp;p-&gt;pdev-&gt;dev), "_INI"))</div><div class='add'>+		acpi_status status;</div><div class='add'>+</div><div class='add'>+		status = acpi_evaluate_object(ACPI_HANDLE(&amp;p-&gt;pdev-&gt;dev),</div><div class='add'>+					      "_RST", NULL, NULL);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			acpi_evaluate_object(ACPI_HANDLE(&amp;p-&gt;pdev-&gt;dev),</div><div class='ctx'> 					     "_INI", NULL, NULL);</div><div class='add'>+		}</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c<br/>index 133eb91c542e..cc3b1631c905 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c</a></div><div class='hunk'>@@ -6,8 +6,14 @@</div><div class='ctx'>  *	    Keyur Chudgar &lt;kchudgar@apm.com&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/of_gpio.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/err.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "xgene_enet_main.h"</div><div class='ctx'> #include "xgene_enet_hw.h"</div><div class='ctx'> #include "xgene_enet_xgmac.h"</div><div class='hunk'>@@ -207,8 +213,8 @@ static void xgene_pcs_reset(struct xgene_enet_pdata *pdata)</div><div class='ctx'> </div><div class='ctx'> static void xgene_xgmac_set_mac_addr(struct xgene_enet_pdata *pdata)</div><div class='ctx'> {</div><div class='add'>+	const u8 *dev_addr = pdata-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> 	u32 addr0, addr1;</div><div class='del'>-	u8 *dev_addr = pdata-&gt;ndev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	addr0 = (dev_addr[3] &lt;&lt; 24) | (dev_addr[2] &lt;&lt; 16) |</div><div class='ctx'> 		(dev_addr[1] &lt;&lt; 8) | dev_addr[0];</div><div class='hunk'>@@ -393,11 +399,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata)</div><div class='ctx'> 		udelay(5);</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef CONFIG_ACPI</div><div class='del'>-		if (acpi_has_method(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev), "_RST")) {</div><div class='del'>-			acpi_evaluate_object(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='del'>-					     "_RST", NULL, NULL);</div><div class='del'>-		} else if (acpi_has_method(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='del'>-					   "_INI")) {</div><div class='add'>+		acpi_status status;</div><div class='add'>+</div><div class='add'>+		status = acpi_evaluate_object(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='add'>+					      "_RST", NULL, NULL);</div><div class='add'>+		if (ACPI_FAILURE(status)) {</div><div class='ctx'> 			acpi_evaluate_object(ACPI_HANDLE(&amp;pdata-&gt;pdev-&gt;dev),</div><div class='ctx'> 					     "_INI", NULL, NULL);</div><div class='ctx'> 		}</div><div class='head'>diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig<br/>index fde7ae33e302..a4176d2ecec6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apple/Kconfig</a></div><div class='hunk'>@@ -7,12 +7,12 @@ config NET_VENDOR_APPLE</div><div class='ctx'> 	bool "Apple devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on (PPC_PMAC &amp;&amp; PPC32) || MAC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='del'>-	  kernel: saying N will just cause the configurator to skip all</div><div class='del'>-	  the questions about IBM devices. If you say Y, you will be asked for</div><div class='add'>+	  kernel: saying N will just cause the configurator to skip all the</div><div class='add'>+	  questions about Apple devices. If you say Y, you will be asked for</div><div class='ctx'> 	  your specific card in the following questions.</div><div class='ctx'> </div><div class='ctx'> if NET_VENDOR_APPLE</div><div class='hunk'>@@ -21,7 +21,7 @@ config MACE</div><div class='ctx'> 	tristate "MACE (Power Mac ethernet) support"</div><div class='ctx'> 	depends on PPC_PMAC &amp;&amp; PPC32</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Power Macintoshes and clones with Ethernet built-in on the</div><div class='ctx'> 	  motherboard will usually use a MACE (Medium Access Control for</div><div class='ctx'> 	  Ethernet) interface. Say Y to include support for the MACE chip.</div><div class='hunk'>@@ -32,7 +32,7 @@ config MACE</div><div class='ctx'> config MACE_AAUI_PORT</div><div class='ctx'> 	bool "Use AAUI port instead of TP by default"</div><div class='ctx'> 	depends on MACE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Some Apple machines (notably the Apple Network Server) which use the</div><div class='ctx'> 	  MACE ethernet chip have an Apple AUI port (small 15-pin connector),</div><div class='ctx'> 	  instead of an 8-pin RJ45 connector for twisted-pair ethernet.  Say</div><div class='hunk'>@@ -44,7 +44,7 @@ config BMAC</div><div class='ctx'> 	tristate "BMAC (G3 ethernet) support"</div><div class='ctx'> 	depends on PPC_PMAC &amp;&amp; PPC32</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y for support of BMAC Ethernet interfaces. These are used on G3</div><div class='ctx'> 	  computers.</div><div class='ctx'> </div><div class='hunk'>@@ -55,7 +55,7 @@ config MACMACE</div><div class='ctx'> 	tristate "Macintosh (AV) onboard MACE ethernet"</div><div class='ctx'> 	depends on MAC</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for the onboard AMD 79C940 MACE Ethernet controller used in</div><div class='ctx'> 	  the 660AV and 840AV Macintosh.  If you have one of these Macintoshes</div><div class='ctx'> 	  say Y here.</div><div class='head'>diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c<br/>index c40daad515d5..b3bf8d6f88e8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/bmac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/bmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/bmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apple/bmac.c</a></div><div class='hunk'>@@ -20,15 +20,13 @@</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;linux/crc32poly.h&gt;</div><div class='ctx'> #include &lt;linux/bitrev.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/dbdma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/page.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/machdep.h&gt;</div><div class='ctx'> #include &lt;asm/pmac_feature.h&gt;</div><div class='ctx'> #include &lt;asm/macio.h&gt;</div><div class='hunk'>@@ -308,7 +306,7 @@ bmac_init_registers(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bmac_data *bp = netdev_priv(dev);</div><div class='ctx'> 	volatile unsigned short regValue;</div><div class='del'>-	unsigned short *pWord16;</div><div class='add'>+	const unsigned short *pWord16;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* XXDEBUG(("bmac: enter init_registers\n")); */</div><div class='hunk'>@@ -371,7 +369,7 @@ bmac_init_registers(struct net_device *dev)</div><div class='ctx'> 	bmwrite(dev, BHASH1, bp-&gt;hash_table_mask[2]); 	/* bits 47 - 32 */</div><div class='ctx'> 	bmwrite(dev, BHASH0, bp-&gt;hash_table_mask[3]); 	/* bits 63 - 48 */</div><div class='ctx'> </div><div class='del'>-	pWord16 = (unsigned short *)dev-&gt;dev_addr;</div><div class='add'>+	pWord16 = (const unsigned short *)dev-&gt;dev_addr;</div><div class='ctx'> 	bmwrite(dev, MADD0, *pWord16++);</div><div class='ctx'> 	bmwrite(dev, MADD1, *pWord16++);</div><div class='ctx'> 	bmwrite(dev, MADD2, *pWord16);</div><div class='hunk'>@@ -462,7 +460,7 @@ static int bmac_suspend(struct macio_dev *mdev, pm_message_t state)</div><div class='ctx'> 	/* prolly should wait for dma to finish &amp; turn off the chip */</div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> 	if (bp-&gt;timeout_active) {</div><div class='del'>-		del_timer(&amp;bp-&gt;tx_timeout);</div><div class='add'>+		timer_delete(&amp;bp-&gt;tx_timeout);</div><div class='ctx'> 		bp-&gt;timeout_active = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	disable_irq(dev-&gt;irq);</div><div class='hunk'>@@ -477,26 +475,26 @@ static int bmac_suspend(struct macio_dev *mdev, pm_message_t state)</div><div class='ctx'> 		config = bmread(dev, RXCFG);</div><div class='ctx'> 		bmwrite(dev, RXCFG, (config &amp; ~RxMACEnable));</div><div class='ctx'> 		config = bmread(dev, TXCFG);</div><div class='del'>-       		bmwrite(dev, TXCFG, (config &amp; ~TxMACEnable));</div><div class='add'>+		bmwrite(dev, TXCFG, (config &amp; ~TxMACEnable));</div><div class='ctx'> 		bmwrite(dev, INTDISABLE, DisableAll); /* disable all intrs */</div><div class='del'>-       		/* disable rx and tx dma */</div><div class='add'>+		/* disable rx and tx dma */</div><div class='ctx'> 		rd-&gt;control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE));	/* clear run bit */</div><div class='ctx'> 		td-&gt;control = cpu_to_le32(DBDMA_CLEAR(RUN|PAUSE|FLUSH|WAKE));	/* clear run bit */</div><div class='del'>-       		/* free some skb's */</div><div class='del'>-       		for (i=0; i&lt;N_RX_RING; i++) {</div><div class='del'>-       			if (bp-&gt;rx_bufs[i] != NULL) {</div><div class='del'>-       				dev_kfree_skb(bp-&gt;rx_bufs[i]);</div><div class='del'>-       				bp-&gt;rx_bufs[i] = NULL;</div><div class='del'>-       			}</div><div class='del'>-       		}</div><div class='del'>-       		for (i = 0; i&lt;N_TX_RING; i++) {</div><div class='add'>+		/* free some skb's */</div><div class='add'>+		for (i=0; i&lt;N_RX_RING; i++) {</div><div class='add'>+			if (bp-&gt;rx_bufs[i] != NULL) {</div><div class='add'>+				dev_kfree_skb(bp-&gt;rx_bufs[i]);</div><div class='add'>+				bp-&gt;rx_bufs[i] = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i&lt;N_TX_RING; i++) {</div><div class='ctx'> 			if (bp-&gt;tx_bufs[i] != NULL) {</div><div class='ctx'> 		       		dev_kfree_skb(bp-&gt;tx_bufs[i]);</div><div class='ctx'> 	       			bp-&gt;tx_bufs[i] = NULL;</div><div class='ctx'> 		       	}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-       	pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp-&gt;mdev), 0, 0);</div><div class='add'>+	pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp-&gt;mdev), 0, 0);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -510,9 +508,9 @@ static int bmac_resume(struct macio_dev *mdev)</div><div class='ctx'> 		bmac_reset_and_enable(dev);</div><div class='ctx'> </div><div class='ctx'> 	enable_irq(dev-&gt;irq);</div><div class='del'>-       	enable_irq(bp-&gt;tx_dma_intr);</div><div class='del'>-       	enable_irq(bp-&gt;rx_dma_intr);</div><div class='del'>-       	netif_device_attach(dev);</div><div class='add'>+	enable_irq(bp-&gt;tx_dma_intr);</div><div class='add'>+	enable_irq(bp-&gt;rx_dma_intr);</div><div class='add'>+	netif_device_attach(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -521,19 +519,16 @@ static int bmac_resume(struct macio_dev *mdev)</div><div class='ctx'> static int bmac_set_address(struct net_device *dev, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct bmac_data *bp = netdev_priv(dev);</div><div class='del'>-	unsigned char *p = addr;</div><div class='del'>-	unsigned short *pWord16;</div><div class='add'>+	const unsigned short *pWord16;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	XXDEBUG(("bmac: enter set_address\n"));</div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 6; ++i) {</div><div class='del'>-		dev-&gt;dev_addr[i] = p[i];</div><div class='del'>-	}</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='add'>+</div><div class='ctx'> 	/* load up the hardware address */</div><div class='del'>-	pWord16  = (unsigned short *)dev-&gt;dev_addr;</div><div class='add'>+	pWord16  = (const unsigned short *)dev-&gt;dev_addr;</div><div class='ctx'> 	bmwrite(dev, MADD0, *pWord16++);</div><div class='ctx'> 	bmwrite(dev, MADD1, *pWord16++);</div><div class='ctx'> 	bmwrite(dev, MADD2, *pWord16);</div><div class='hunk'>@@ -550,7 +545,7 @@ static inline void bmac_set_timeout(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> 	if (bp-&gt;timeout_active)</div><div class='del'>-		del_timer(&amp;bp-&gt;tx_timeout);</div><div class='add'>+		timer_delete(&amp;bp-&gt;tx_timeout);</div><div class='ctx'> 	bp-&gt;tx_timeout.expires = jiffies + TX_TIMEOUT;</div><div class='ctx'> 	add_timer(&amp;bp-&gt;tx_timeout);</div><div class='ctx'> 	bp-&gt;timeout_active = 1;</div><div class='hunk'>@@ -759,7 +754,7 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id)</div><div class='ctx'> 		XXDEBUG(("bmac_txdma_intr\n"));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*     del_timer(&amp;bp-&gt;tx_timeout); */</div><div class='add'>+	/*     timer_delete(&amp;bp-&gt;tx_timeout); */</div><div class='ctx'> 	/*     bp-&gt;timeout_active = 0; */</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='hunk'>@@ -800,59 +795,6 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifndef SUNHME_MULTICAST</div><div class='del'>-/* Real fast bit-reversal algorithm, 6-bit values */</div><div class='del'>-static int reverse6[64] = {</div><div class='del'>-	0x0,0x20,0x10,0x30,0x8,0x28,0x18,0x38,</div><div class='del'>-	0x4,0x24,0x14,0x34,0xc,0x2c,0x1c,0x3c,</div><div class='del'>-	0x2,0x22,0x12,0x32,0xa,0x2a,0x1a,0x3a,</div><div class='del'>-	0x6,0x26,0x16,0x36,0xe,0x2e,0x1e,0x3e,</div><div class='del'>-	0x1,0x21,0x11,0x31,0x9,0x29,0x19,0x39,</div><div class='del'>-	0x5,0x25,0x15,0x35,0xd,0x2d,0x1d,0x3d,</div><div class='del'>-	0x3,0x23,0x13,0x33,0xb,0x2b,0x1b,0x3b,</div><div class='del'>-	0x7,0x27,0x17,0x37,0xf,0x2f,0x1f,0x3f</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-crc416(unsigned int curval, unsigned short nxtval)</div><div class='del'>-{</div><div class='del'>-	register unsigned int counter, cur = curval, next = nxtval;</div><div class='del'>-	register int high_crc_set, low_data_set;</div><div class='del'>-</div><div class='del'>-	/* Swap bytes */</div><div class='del'>-	next = ((next &amp; 0x00FF) &lt;&lt; 8) | (next &gt;&gt; 8);</div><div class='del'>-</div><div class='del'>-	/* Compute bit-by-bit */</div><div class='del'>-	for (counter = 0; counter &lt; 16; ++counter) {</div><div class='del'>-		/* is high CRC bit set? */</div><div class='del'>-		if ((cur &amp; 0x80000000) == 0) high_crc_set = 0;</div><div class='del'>-		else high_crc_set = 1;</div><div class='del'>-</div><div class='del'>-		cur = cur &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-		if ((next &amp; 0x0001) == 0) low_data_set = 0;</div><div class='del'>-		else low_data_set = 1;</div><div class='del'>-</div><div class='del'>-		next = next &gt;&gt; 1;</div><div class='del'>-</div><div class='del'>-		/* do the XOR */</div><div class='del'>-		if (high_crc_set ^ low_data_set) cur = cur ^ CRC32_POLY_BE;</div><div class='del'>-	}</div><div class='del'>-	return cur;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-bmac_crc(unsigned short *address)</div><div class='del'>-{</div><div class='del'>-	unsigned int newcrc;</div><div class='del'>-</div><div class='del'>-	XXDEBUG(("bmac_crc: addr=%#04x, %#04x, %#04x\n", *address, address[1], address[2]));</div><div class='del'>-	newcrc = crc416(0xffffffff, *address);	/* address bits 47 - 32 */</div><div class='del'>-	newcrc = crc416(newcrc, address[1]);	/* address bits 31 - 16 */</div><div class='del'>-	newcrc = crc416(newcrc, address[2]);	/* address bits 15 - 0  */</div><div class='del'>-</div><div class='del'>-	return(newcrc);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Add requested mcast addr to BMac's hash table filter.</div><div class='ctx'>  *</div><div class='hunk'>@@ -865,8 +807,7 @@ bmac_addhash(struct bmac_data *bp, unsigned char *addr)</div><div class='ctx'> 	unsigned short	 mask;</div><div class='ctx'> </div><div class='ctx'> 	if (!(*addr)) return;</div><div class='del'>-	crc = bmac_crc((unsigned short *)addr) &amp; 0x3f; /* Big-endian alert! */</div><div class='del'>-	crc = reverse6[crc];	/* Hyperfast bit-reversing algorithm */</div><div class='add'>+	crc = crc32(~0, addr, ETH_ALEN) &gt;&gt; 26;</div><div class='ctx'> 	if (bp-&gt;hash_use_count[crc]++) return; /* This bit is already set */</div><div class='ctx'> 	mask = crc % 16;</div><div class='ctx'> 	mask = (unsigned char)1 &lt;&lt; mask;</div><div class='hunk'>@@ -880,8 +821,7 @@ bmac_removehash(struct bmac_data *bp, unsigned char *addr)</div><div class='ctx'> 	unsigned char mask;</div><div class='ctx'> </div><div class='ctx'> 	/* Now, delete the address from the filter copy, as indicated */</div><div class='del'>-	crc = bmac_crc((unsigned short *)addr) &amp; 0x3f; /* Big-endian alert! */</div><div class='del'>-	crc = reverse6[crc];	/* Hyperfast bit-reversing algorithm */</div><div class='add'>+	crc = crc32(~0, addr, ETH_ALEN) &gt;&gt; 26;</div><div class='ctx'> 	if (bp-&gt;hash_use_count[crc] == 0) return; /* That bit wasn't in use! */</div><div class='ctx'> 	if (--bp-&gt;hash_use_count[crc]) return; /* That bit is still in use */</div><div class='ctx'> 	mask = crc % 16;</div><div class='hunk'>@@ -1182,7 +1122,7 @@ bmac_get_station_address(struct net_device *dev, unsigned char *ea)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	unsigned short data;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='add'>+	for (i = 0; i &lt; 3; i++)</div><div class='ctx'> 		{</div><div class='ctx'> 			reset_and_select_srom(dev);</div><div class='ctx'> 			data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits);</div><div class='hunk'>@@ -1240,6 +1180,7 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> 	struct bmac_data *bp;</div><div class='ctx'> 	const unsigned char *prop_addr;</div><div class='ctx'> 	unsigned char addr[6];</div><div class='add'>+	u8 macaddr[6];</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int is_bmac_plus = ((int)match-&gt;data) != 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1287,7 +1228,9 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> </div><div class='ctx'> 	rev = addr[0] == 0 &amp;&amp; addr[1] == 0xA0;</div><div class='ctx'> 	for (j = 0; j &lt; 6; ++j)</div><div class='del'>-		dev-&gt;dev_addr[j] = rev ? bitrev8(addr[j]): addr[j];</div><div class='add'>+		macaddr[j] = rev ? bitrev8(addr[j]): addr[j];</div><div class='add'>+</div><div class='add'>+	eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable chip without interrupts for now */</div><div class='ctx'> 	bmac_enable_and_reset_chip(dev);</div><div class='hunk'>@@ -1318,7 +1261,7 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;bp-&gt;tx_timeout, bmac_tx_timeout, 0);</div><div class='ctx'> </div><div class='del'>-	ret = request_irq(dev-&gt;irq, bmac_misc_intr, 0, "BMAC-misc", dev);</div><div class='add'>+	ret = request_irq(dev-&gt;irq, bmac_misc_intr, IRQF_NO_AUTOEN, "BMAC-misc", dev);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		printk(KERN_ERR "BMAC: can't get irq %d\n", dev-&gt;irq);</div><div class='ctx'> 		goto err_out_iounmap_rx;</div><div class='hunk'>@@ -1337,7 +1280,6 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> 	/* Mask chip interrupts and disable chip, will be</div><div class='ctx'> 	 * re-enabled on open()</div><div class='ctx'> 	 */</div><div class='del'>-	disable_irq(dev-&gt;irq);</div><div class='ctx'> 	pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp-&gt;mdev), 0, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (register_netdev(dev) != 0) {</div><div class='hunk'>@@ -1468,7 +1410,7 @@ bmac_output(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void bmac_tx_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bmac_data *bp = from_timer(bp, t, tx_timeout);</div><div class='add'>+	struct bmac_data *bp = timer_container_of(bp, t, tx_timeout);</div><div class='ctx'> 	struct net_device *dev = macio_get_drvdata(bp-&gt;mdev);</div><div class='ctx'> 	volatile struct dbdma_regs __iomem *td = bp-&gt;tx_dma;</div><div class='ctx'> 	volatile struct dbdma_regs __iomem *rd = bp-&gt;rx_dma;</div><div class='hunk'>@@ -1511,7 +1453,7 @@ static void bmac_tx_timeout(struct timer_list *t)</div><div class='ctx'> 	i = bp-&gt;tx_empty;</div><div class='ctx'> 	++dev-&gt;stats.tx_errors;</div><div class='ctx'> 	if (i != bp-&gt;tx_fill) {</div><div class='del'>-		dev_kfree_skb(bp-&gt;tx_bufs[i]);</div><div class='add'>+		dev_kfree_skb_irq(bp-&gt;tx_bufs[i]);</div><div class='ctx'> 		bp-&gt;tx_bufs[i] = NULL;</div><div class='ctx'> 		if (++i &gt;= N_TX_RING) i = 0;</div><div class='ctx'> 		bp-&gt;tx_empty = i;</div><div class='hunk'>@@ -1592,14 +1534,14 @@ bmac_proc_info(char *buffer, char **start, off_t offset, int length)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static int bmac_remove(struct macio_dev *mdev)</div><div class='add'>+static void bmac_remove(struct macio_dev *mdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = macio_get_drvdata(mdev);</div><div class='ctx'> 	struct bmac_data *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> </div><div class='del'>-       	free_irq(dev-&gt;irq, dev);</div><div class='add'>+	free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 	free_irq(bp-&gt;tx_dma_intr, dev);</div><div class='ctx'> 	free_irq(bp-&gt;rx_dma_intr, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1610,8 +1552,6 @@ static int bmac_remove(struct macio_dev *mdev)</div><div class='ctx'> 	macio_release_resources(mdev);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id bmac_match[] =</div><div class='head'>diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c<br/>index b8ba2abf5b3a..af26905e44e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/mace.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/mace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/mace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apple/mace.c</a></div><div class='hunk'>@@ -19,10 +19,9 @@</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='ctx'> #include &lt;linux/bitrev.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;asm/prom.h&gt;</div><div class='add'>+#include &lt;linux/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/dbdma.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/pgtable.h&gt;</div><div class='ctx'> #include &lt;asm/macio.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "mace.h"</div><div class='hunk'>@@ -90,7 +89,7 @@ static void mace_set_timeout(struct net_device *dev);</div><div class='ctx'> static void mace_tx_timeout(struct timer_list *t);</div><div class='ctx'> static inline void dbdma_reset(volatile struct dbdma_regs __iomem *dma);</div><div class='ctx'> static inline void mace_clean_rings(struct mace_data *mp);</div><div class='del'>-static void __mace_set_address(struct net_device *dev, void *addr);</div><div class='add'>+static void __mace_set_address(struct net_device *dev, const void *addr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * If we can't get a skbuff when we need it, we use this area for DMA.</div><div class='hunk'>@@ -112,6 +111,7 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct mace_data *mp;</div><div class='ctx'> 	const unsigned char *addr;</div><div class='add'>+	u8 macaddr[ETH_ALEN];</div><div class='ctx'> 	int j, rev, rc = -EBUSY;</div><div class='ctx'> </div><div class='ctx'> 	if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {</div><div class='hunk'>@@ -167,8 +167,9 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> </div><div class='ctx'> 	rev = addr[0] == 0 &amp;&amp; addr[1] == 0xA0;</div><div class='ctx'> 	for (j = 0; j &lt; 6; ++j) {</div><div class='del'>-		dev-&gt;dev_addr[j] = rev ? bitrev8(addr[j]): addr[j];</div><div class='add'>+		macaddr[j] = rev ? bitrev8(addr[j]): addr[j];</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> 	mp-&gt;chipid = (in_8(&amp;mp-&gt;mace-&gt;chipid_hi) &lt;&lt; 8) |</div><div class='ctx'> 			in_8(&amp;mp-&gt;mace-&gt;chipid_lo);</div><div class='ctx'> </div><div class='hunk'>@@ -271,7 +272,7 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int mace_remove(struct macio_dev *mdev)</div><div class='add'>+static void mace_remove(struct macio_dev *mdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = macio_get_drvdata(mdev);</div><div class='ctx'> 	struct mace_data *mp;</div><div class='hunk'>@@ -295,8 +296,6 @@ static int mace_remove(struct macio_dev *mdev)</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> 	macio_release_resources(mdev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dbdma_reset(volatile struct dbdma_regs __iomem *dma)</div><div class='hunk'>@@ -364,28 +363,32 @@ static void mace_reset(struct net_device *dev)</div><div class='ctx'> 	out_8(&amp;mb-&gt;iac, 0);</div><div class='ctx'> </div><div class='ctx'>     if (mp-&gt;port_aaui)</div><div class='del'>-    	out_8(&amp;mb-&gt;plscc, PORTSEL_AUI + ENPLSIO);</div><div class='add'>+	out_8(&amp;mb-&gt;plscc, PORTSEL_AUI + ENPLSIO);</div><div class='ctx'>     else</div><div class='del'>-    	out_8(&amp;mb-&gt;plscc, PORTSEL_GPSI + ENPLSIO);</div><div class='add'>+	out_8(&amp;mb-&gt;plscc, PORTSEL_GPSI + ENPLSIO);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __mace_set_address(struct net_device *dev, void *addr)</div><div class='add'>+static void __mace_set_address(struct net_device *dev, const void *addr)</div><div class='ctx'> {</div><div class='ctx'>     struct mace_data *mp = netdev_priv(dev);</div><div class='ctx'>     volatile struct mace __iomem *mb = mp-&gt;mace;</div><div class='del'>-    unsigned char *p = addr;</div><div class='add'>+    const unsigned char *p = addr;</div><div class='add'>+    u8 macaddr[ETH_ALEN];</div><div class='ctx'>     int i;</div><div class='ctx'> </div><div class='ctx'>     /* load up the hardware address */</div><div class='ctx'>     if (mp-&gt;chipid == BROKEN_ADDRCHG_REV)</div><div class='del'>-    	out_8(&amp;mb-&gt;iac, PHYADDR);</div><div class='add'>+	out_8(&amp;mb-&gt;iac, PHYADDR);</div><div class='ctx'>     else {</div><div class='del'>-    	out_8(&amp;mb-&gt;iac, ADDRCHG | PHYADDR);</div><div class='add'>+	out_8(&amp;mb-&gt;iac, ADDRCHG | PHYADDR);</div><div class='ctx'> 	while ((in_8(&amp;mb-&gt;iac) &amp; ADDRCHG) != 0)</div><div class='ctx'> 	    ;</div><div class='ctx'>     }</div><div class='ctx'>     for (i = 0; i &lt; 6; ++i)</div><div class='del'>-	out_8(&amp;mb-&gt;padr, dev-&gt;dev_addr[i] = p[i]);</div><div class='add'>+        out_8(&amp;mb-&gt;padr, macaddr[i] = p[i]);</div><div class='add'>+</div><div class='add'>+    eth_hw_addr_set(dev, macaddr);</div><div class='add'>+</div><div class='ctx'>     if (mp-&gt;chipid != BROKEN_ADDRCHG_REV)</div><div class='ctx'>         out_8(&amp;mb-&gt;iac, 0);</div><div class='ctx'> }</div><div class='hunk'>@@ -520,7 +523,7 @@ static inline void mace_set_timeout(struct net_device *dev)</div><div class='ctx'>     struct mace_data *mp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'>     if (mp-&gt;timeout_active)</div><div class='del'>-	del_timer(&amp;mp-&gt;tx_timeout);</div><div class='add'>+	timer_delete(&amp;mp-&gt;tx_timeout);</div><div class='ctx'>     mp-&gt;tx_timeout.expires = jiffies + TX_TIMEOUT;</div><div class='ctx'>     add_timer(&amp;mp-&gt;tx_timeout);</div><div class='ctx'>     mp-&gt;timeout_active = 1;</div><div class='hunk'>@@ -673,7 +676,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'>     i = mp-&gt;tx_empty;</div><div class='ctx'>     while (in_8(&amp;mb-&gt;pr) &amp; XMTSV) {</div><div class='del'>-	del_timer(&amp;mp-&gt;tx_timeout);</div><div class='add'>+	timer_delete(&amp;mp-&gt;tx_timeout);</div><div class='ctx'> 	mp-&gt;timeout_active = 0;</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clear any interrupt indication associated with this status</div><div class='hunk'>@@ -802,7 +805,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static void mace_tx_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-    struct mace_data *mp = from_timer(mp, t, tx_timeout);</div><div class='add'>+    struct mace_data *mp = timer_container_of(mp, t, tx_timeout);</div><div class='ctx'>     struct net_device *dev = macio_get_drvdata(mp-&gt;mdev);</div><div class='ctx'>     volatile struct mace __iomem *mb = mp-&gt;mace;</div><div class='ctx'>     volatile struct dbdma_regs __iomem *td = mp-&gt;tx_dma;</div><div class='hunk'>@@ -841,7 +844,7 @@ static void mace_tx_timeout(struct timer_list *t)</div><div class='ctx'>     if (mp-&gt;tx_bad_runt) {</div><div class='ctx'> 	mp-&gt;tx_bad_runt = 0;</div><div class='ctx'>     } else if (i != mp-&gt;tx_fill) {</div><div class='del'>-	dev_kfree_skb(mp-&gt;tx_bufs[i]);</div><div class='add'>+	dev_kfree_skb_irq(mp-&gt;tx_bufs[i]);</div><div class='ctx'> 	if (++i &gt;= N_TX_RING)</div><div class='ctx'> 	    i = 0;</div><div class='ctx'> 	mp-&gt;tx_empty = i;</div><div class='head'>diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c<br/>index 8d03578d5e8c..8989506e6248 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/macmace.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/apple/macmace.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/apple/macmace.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/apple/macmace.c</a></div><div class='hunk'>@@ -77,7 +77,7 @@ struct mace_frame {</div><div class='ctx'> 	u8	pad4;</div><div class='ctx'> 	u32	pad5;</div><div class='ctx'> 	u32	pad6;</div><div class='del'>-	u8	data[1];</div><div class='add'>+	DECLARE_FLEX_ARRAY(u8, data);</div><div class='ctx'> 	/* And frame continues.. */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -91,8 +91,8 @@ static int mace_set_address(struct net_device *dev, void *addr);</div><div class='ctx'> static void mace_reset(struct net_device *dev);</div><div class='ctx'> static irqreturn_t mace_interrupt(int irq, void *dev_id);</div><div class='ctx'> static irqreturn_t mace_dma_intr(int irq, void *dev_id);</div><div class='del'>-static void mace_tx_timeout(struct net_device *dev);</div><div class='del'>-static void __mace_set_address(struct net_device *dev, void *addr);</div><div class='add'>+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='add'>+static void __mace_set_address(struct net_device *dev, const void *addr);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Load a receive DMA channel with a base address and ring length</div><div class='hunk'>@@ -197,6 +197,7 @@ static int mace_probe(struct platform_device *pdev)</div><div class='ctx'> 	unsigned char *addr;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	unsigned char checksum = 0;</div><div class='add'>+	u8 macaddr[ETH_ALEN];</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	dev = alloc_etherdev(PRIV_BYTES);</div><div class='hunk'>@@ -229,8 +230,9 @@ static int mace_probe(struct platform_device *pdev)</div><div class='ctx'> 	for (j = 0; j &lt; 6; ++j) {</div><div class='ctx'> 		u8 v = bitrev8(addr[j&lt;&lt;4]);</div><div class='ctx'> 		checksum ^= v;</div><div class='del'>-		dev-&gt;dev_addr[j] = v;</div><div class='add'>+		macaddr[j] = v;</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> 	for (; j &lt; 8; ++j) {</div><div class='ctx'> 		checksum ^= bitrev8(addr[j&lt;&lt;4]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -315,11 +317,12 @@ static void mace_reset(struct net_device *dev)</div><div class='ctx'>  * Load the address on a mace controller.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static void __mace_set_address(struct net_device *dev, void *addr)</div><div class='add'>+static void __mace_set_address(struct net_device *dev, const void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct mace_data *mp = netdev_priv(dev);</div><div class='ctx'> 	volatile struct mace *mb = mp-&gt;mace;</div><div class='del'>-	unsigned char *p = addr;</div><div class='add'>+	const unsigned char *p = addr;</div><div class='add'>+	u8 macaddr[ETH_ALEN];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* load up the hardware address */</div><div class='hunk'>@@ -331,7 +334,8 @@ static void __mace_set_address(struct net_device *dev, void *addr)</div><div class='ctx'> 			;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; 6; ++i)</div><div class='del'>-		mb-&gt;padr = dev-&gt;dev_addr[i] = p[i];</div><div class='add'>+		mb-&gt;padr = macaddr[i] = p[i];</div><div class='add'>+	eth_hw_addr_set(dev, macaddr);</div><div class='ctx'> 	if (mp-&gt;chipid != BROKEN_ADDRCHG_REV)</div><div class='ctx'> 		mb-&gt;iac = 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -600,7 +604,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void mace_tx_timeout(struct net_device *dev)</div><div class='add'>+static void mace_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct mace_data *mp = netdev_priv(dev);</div><div class='ctx'> 	volatile struct mace *mb = mp-&gt;mace;</div><div class='hunk'>@@ -735,7 +739,7 @@ MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("Macintosh MACE ethernet driver");</div><div class='ctx'> MODULE_ALIAS("platform:macmace");</div><div class='ctx'> </div><div class='del'>-static int mac_mace_device_remove(struct platform_device *pdev)</div><div class='add'>+static void mac_mace_device_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct mace_data *mp = netdev_priv(dev);</div><div class='hunk'>@@ -751,8 +755,6 @@ static int mac_mace_device_remove(struct platform_device *pdev)</div><div class='ctx'> 	                  mp-&gt;tx_ring, mp-&gt;tx_ring_phys);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver mac_mace_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/Kconfig b/drivers/net/ethernet/aquantia/Kconfig<br/>index 350a48e4f124..cec2018c84a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config NET_VENDOR_AQUANTIA</div><div class='ctx'> 	bool "aQuantia devices"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Set this to y if you have an Ethernet network cards that uses the aQuantia</div><div class='ctx'> 	  AQC107/AQC108 chipset.</div><div class='ctx'> </div><div class='hunk'>@@ -19,8 +19,8 @@ if NET_VENDOR_AQUANTIA</div><div class='ctx'> config AQTION</div><div class='ctx'> 	tristate "aQuantia AQtion(tm) Support"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	depends on X86_64 || ARM64 || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	depends on MACSEC || MACSEC=n</div><div class='add'>+	help</div><div class='ctx'> 	  This enables the support for the aQuantia AQtion(tm) Ethernet card.</div><div class='ctx'> </div><div class='ctx'> endif # NET_VENDOR_AQUANTIA</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/Makefile b/drivers/net/ethernet/aquantia/atlantic/Makefile<br/>index 1f99cf832476..f6a96931c89a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/Makefile</a></div><div class='hunk'>@@ -1,34 +1,15 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> ################################################################################</div><div class='ctx'> #</div><div class='ctx'> # aQuantia Ethernet Controller AQtion Linux Driver</div><div class='ctx'> # Copyright(c) 2014-2017 aQuantia Corporation.</div><div class='ctx'> #</div><div class='del'>-# This program is free software; you can redistribute it and/or modify it</div><div class='del'>-# under the terms and conditions of the GNU General Public License,</div><div class='del'>-# version 2, as published by the Free Software Foundation.</div><div class='del'>-#</div><div class='del'>-# This program is distributed in the hope it will be useful, but WITHOUT</div><div class='del'>-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or</div><div class='del'>-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for</div><div class='del'>-# more details.</div><div class='del'>-#</div><div class='del'>-# You should have received a copy of the GNU General Public License along</div><div class='del'>-# with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='del'>-#</div><div class='del'>-# The full GNU General Public License is included in this distribution in</div><div class='del'>-# the file called "COPYING".</div><div class='del'>-#</div><div class='del'>-# Contact Information: &lt;rdc-drv@aquantia.com&gt;</div><div class='del'>-# aQuantia Corporation, 105 E. Tasman Dr. San Jose, CA 95134, USA</div><div class='del'>-#</div><div class='ctx'> ################################################################################</div><div class='ctx'> </div><div class='del'>-#</div><div class='del'>-# Makefile for the AQtion(tm) Ethernet driver</div><div class='del'>-#</div><div class='del'>-</div><div class='ctx'> obj-$(CONFIG_AQTION) += atlantic.o</div><div class='ctx'> </div><div class='add'>+ccflags-y += -I$(src)</div><div class='add'>+</div><div class='ctx'> atlantic-objs := aq_main.o \</div><div class='ctx'> 	aq_nic.o \</div><div class='ctx'> 	aq_pci_func.o \</div><div class='hunk'>@@ -38,8 +19,18 @@ atlantic-objs := aq_main.o \</div><div class='ctx'> 	aq_ethtool.o \</div><div class='ctx'> 	aq_drvinfo.o \</div><div class='ctx'> 	aq_filters.o \</div><div class='add'>+	aq_phy.o \</div><div class='ctx'> 	hw_atl/hw_atl_a0.o \</div><div class='ctx'> 	hw_atl/hw_atl_b0.o \</div><div class='ctx'> 	hw_atl/hw_atl_utils.o \</div><div class='ctx'> 	hw_atl/hw_atl_utils_fw2x.o \</div><div class='del'>-	hw_atl/hw_atl_llh.o</div><div class='add'>+	hw_atl/hw_atl_llh.o \</div><div class='add'>+	hw_atl2/hw_atl2.o \</div><div class='add'>+	hw_atl2/hw_atl2_utils.o \</div><div class='add'>+	hw_atl2/hw_atl2_utils_fw.o \</div><div class='add'>+	hw_atl2/hw_atl2_llh.o \</div><div class='add'>+	macsec/macsec_api.o</div><div class='add'>+</div><div class='add'>+atlantic-$(CONFIG_MACSEC) += aq_macsec.o</div><div class='add'>+</div><div class='add'>+atlantic-$(CONFIG_PTP_1588_CLOCK) += aq_ptp.o</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h<br/>index 8f35c3f883f0..fc2b325f34e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_cfg.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_cfg.h: Definition of configuration parameters and constants. */</div><div class='hunk'>@@ -20,7 +17,7 @@</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_IS_POLLING_DEF 0U</div><div class='ctx'> </div><div class='del'>-#define AQ_CFG_FORCE_LEGACY_INT 0U</div><div class='add'>+#define AQ_CFG_FORCE_INTX	0U</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_INTERRUPT_MODERATION_OFF		0</div><div class='ctx'> #define AQ_CFG_INTERRUPT_MODERATION_ON		1</div><div class='hunk'>@@ -28,7 +25,7 @@</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_INTERRUPT_MODERATION_USEC_MAX (0x1FF * 2)</div><div class='ctx'> </div><div class='del'>-#define AQ_CFG_IRQ_MASK                      0x1FFU</div><div class='add'>+#define AQ_CFG_IRQ_MASK                      0x3FFU</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_VECS_MAX   8U</div><div class='ctx'> #define AQ_CFG_TCS_MAX    8U</div><div class='hunk'>@@ -43,6 +40,7 @@</div><div class='ctx'> #define AQ_CFG_RX_HDR_SIZE 256U</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_RX_PAGEORDER 0U</div><div class='add'>+#define AQ_CFG_XDP_PAGEORDER 2U</div><div class='ctx'> </div><div class='ctx'> /* LRO */</div><div class='ctx'> #define AQ_CFG_IS_LRO_DEF           1U</div><div class='hunk'>@@ -67,18 +65,13 @@</div><div class='ctx'>  */</div><div class='ctx'> #define AQ_CFG_RESTART_DESC_THRES   (AQ_CFG_SKB_FRAGS_MAX * 2)</div><div class='ctx'> </div><div class='del'>-#define AQ_CFG_NAPI_WEIGHT     64U</div><div class='del'>-</div><div class='ctx'> /*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/</div><div class='ctx'> </div><div class='del'>-#define AQ_NIC_FC_OFF    0U</div><div class='del'>-#define AQ_NIC_FC_TX     1U</div><div class='del'>-#define AQ_NIC_FC_RX     2U</div><div class='del'>-#define AQ_NIC_FC_FULL   3U</div><div class='del'>-#define AQ_NIC_FC_AUTO   4U</div><div class='del'>-</div><div class='ctx'> #define AQ_CFG_FC_MODE AQ_NIC_FC_FULL</div><div class='ctx'> </div><div class='add'>+/* Default WOL modes used on initialization */</div><div class='add'>+#define AQ_CFG_WOL_MODES WAKE_MAGIC</div><div class='add'>+</div><div class='ctx'> #define AQ_CFG_SPEED_MSK  0xFFFFU	/* 0xFFFFU==auto_neg */</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_IS_AUTONEG_DEF       1U</div><div class='hunk'>@@ -86,13 +79,8 @@</div><div class='ctx'> </div><div class='ctx'> #define AQ_CFG_LOCK_TRYS   100U</div><div class='ctx'> </div><div class='del'>-#define AQ_CFG_DRV_AUTHOR      "aQuantia"</div><div class='del'>-#define AQ_CFG_DRV_DESC        "aQuantia Corporation(R) Network Driver"</div><div class='add'>+#define AQ_CFG_DRV_AUTHOR      "Marvell"</div><div class='add'>+#define AQ_CFG_DRV_DESC        "Marvell (Aquantia) Corporation(R) Network Driver"</div><div class='ctx'> #define AQ_CFG_DRV_NAME        "atlantic"</div><div class='del'>-#define AQ_CFG_DRV_VERSION	__stringify(NIC_MAJOR_DRIVER_VERSION)"."\</div><div class='del'>-				__stringify(NIC_MINOR_DRIVER_VERSION)"."\</div><div class='del'>-				__stringify(NIC_BUILD_DRIVER_VERSION)"."\</div><div class='del'>-				__stringify(NIC_REVISION_DRIVER_VERSION) \</div><div class='del'>-				AQ_CFG_DRV_VERSION_SUFFIX</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_CFG_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_common.h b/drivers/net/ethernet/aquantia/atlantic/aq_common.h<br/>index 235bb3a72d66..ace691d7cd75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_common.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_common.h: Basic includes for all files in project. */</div><div class='hunk'>@@ -15,7 +13,6 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include "ver.h"</div><div class='ctx'> #include "aq_cfg.h"</div><div class='ctx'> #include "aq_utils.h"</div><div class='ctx'> </div><div class='hunk'>@@ -41,22 +38,40 @@</div><div class='ctx'> #define AQ_DEVICE_ID_AQC111S	0x91B1</div><div class='ctx'> #define AQ_DEVICE_ID_AQC112S	0x92B1</div><div class='ctx'> </div><div class='del'>-#define HW_ATL_NIC_NAME "aQuantia AQtion 10Gbit Network Adapter"</div><div class='add'>+#define AQ_DEVICE_ID_AQC113DEV	0x00C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC113CS	0x94C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC113CA	0x34C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC114CS	0x93C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC113	0x04C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC113C	0x14C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC115C	0x12C0</div><div class='add'>+#define AQ_DEVICE_ID_AQC116C	0x11C0</div><div class='add'>+</div><div class='add'>+#define HW_ATL_NIC_NAME "Marvell (aQuantia) AQtion 10Gbit Network Adapter"</div><div class='ctx'> </div><div class='ctx'> #define AQ_HWREV_ANY	0</div><div class='ctx'> #define AQ_HWREV_1	1</div><div class='ctx'> #define AQ_HWREV_2	2</div><div class='ctx'> </div><div class='del'>-#define AQ_NIC_RATE_10G        BIT(0)</div><div class='del'>-#define AQ_NIC_RATE_5G         BIT(1)</div><div class='del'>-#define AQ_NIC_RATE_5GSR       BIT(2)</div><div class='del'>-#define AQ_NIC_RATE_2GS        BIT(3)</div><div class='del'>-#define AQ_NIC_RATE_1G         BIT(4)</div><div class='del'>-#define AQ_NIC_RATE_100M       BIT(5)</div><div class='del'>-</div><div class='del'>-#define AQ_NIC_RATE_EEE_10G	BIT(6)</div><div class='del'>-#define AQ_NIC_RATE_EEE_5G	BIT(7)</div><div class='del'>-#define AQ_NIC_RATE_EEE_2GS	BIT(8)</div><div class='del'>-#define AQ_NIC_RATE_EEE_1G	BIT(9)</div><div class='add'>+#define AQ_NIC_RATE_10G		BIT(0)</div><div class='add'>+#define AQ_NIC_RATE_5G		BIT(1)</div><div class='add'>+#define AQ_NIC_RATE_2G5		BIT(2)</div><div class='add'>+#define AQ_NIC_RATE_1G		BIT(3)</div><div class='add'>+#define AQ_NIC_RATE_100M	BIT(4)</div><div class='add'>+#define AQ_NIC_RATE_10M		BIT(5)</div><div class='add'>+#define AQ_NIC_RATE_1G_HALF	BIT(6)</div><div class='add'>+#define AQ_NIC_RATE_100M_HALF	BIT(7)</div><div class='add'>+#define AQ_NIC_RATE_10M_HALF	BIT(8)</div><div class='add'>+</div><div class='add'>+#define AQ_NIC_RATE_EEE_10G	BIT(9)</div><div class='add'>+#define AQ_NIC_RATE_EEE_5G	BIT(10)</div><div class='add'>+#define AQ_NIC_RATE_EEE_2G5	BIT(11)</div><div class='add'>+#define AQ_NIC_RATE_EEE_1G	BIT(12)</div><div class='add'>+#define AQ_NIC_RATE_EEE_100M	BIT(13)</div><div class='add'>+#define AQ_NIC_RATE_EEE_MSK     (AQ_NIC_RATE_EEE_10G |\</div><div class='add'>+				 AQ_NIC_RATE_EEE_5G |\</div><div class='add'>+				 AQ_NIC_RATE_EEE_2G5 |\</div><div class='add'>+				 AQ_NIC_RATE_EEE_1G |\</div><div class='add'>+				 AQ_NIC_RATE_EEE_100M)</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_COMMON_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c b/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c<br/>index adad6a7acabe..787ea91802e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.c</a></div><div class='hunk'>@@ -1,5 +1,9 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/* Copyright (C) 2014-2019 aQuantia Corporation. */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /* File aq_drvinfo.c: Definition of common code for firmware info in sys.*/</div><div class='ctx'> </div><div class='hunk'>@@ -12,32 +16,51 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "aq_drvinfo.h"</div><div class='add'>+#include "aq_nic.h"</div><div class='ctx'> </div><div class='ctx'> #if IS_REACHABLE(CONFIG_HWMON)</div><div class='add'>+static const char * const atl_temp_label[] = {</div><div class='add'>+	"PHY Temperature",</div><div class='add'>+	"MAC Temperature",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int aq_hwmon_read(struct device *dev, enum hwmon_sensor_types type,</div><div class='ctx'> 			 u32 attr, int channel, long *value)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = dev_get_drvdata(dev);</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	int temp;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!aq_nic)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (type != hwmon_temp)</div><div class='add'>+	if (type != hwmon_temp || attr != hwmon_temp_input)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	switch (channel) {</div><div class='add'>+	case 0:</div><div class='add'>+		if (!aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	switch (attr) {</div><div class='del'>-	case hwmon_temp_input:</div><div class='ctx'> 		err = aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp(aq_nic-&gt;aq_hw, &amp;temp);</div><div class='ctx'> 		*value = temp;</div><div class='del'>-		return err;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		if (!aq_nic-&gt;aq_fw_ops-&gt;get_mac_temp &amp;&amp;</div><div class='add'>+		    !aq_nic-&gt;aq_hw_ops-&gt;hw_get_mac_temp)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		if (aq_nic-&gt;aq_fw_ops-&gt;get_mac_temp)</div><div class='add'>+			err = aq_nic-&gt;aq_fw_ops-&gt;get_mac_temp(aq_nic-&gt;aq_hw, &amp;temp);</div><div class='add'>+		else</div><div class='add'>+			err = aq_nic-&gt;aq_hw_ops-&gt;hw_get_mac_temp(aq_nic-&gt;aq_hw, &amp;temp);</div><div class='add'>+		*value = temp;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_hwmon_read_string(struct device *dev,</div><div class='hunk'>@@ -49,28 +72,32 @@ static int aq_hwmon_read_string(struct device *dev,</div><div class='ctx'> 	if (!aq_nic)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (type != hwmon_temp)</div><div class='add'>+	if (type != hwmon_temp || attr != hwmon_temp_label)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!aq_nic-&gt;aq_fw_ops-&gt;get_phy_temp)</div><div class='add'>+	if (channel &lt; ARRAY_SIZE(atl_temp_label))</div><div class='add'>+		*str = atl_temp_label[channel];</div><div class='add'>+	else</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	switch (attr) {</div><div class='del'>-	case hwmon_temp_label:</div><div class='del'>-		*str = "PHY Temperature";</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static umode_t aq_hwmon_is_visible(const void *data,</div><div class='ctx'> 				   enum hwmon_sensor_types type,</div><div class='ctx'> 				   u32 attr, int channel)</div><div class='ctx'> {</div><div class='add'>+	const struct aq_nic_s *nic = data;</div><div class='add'>+</div><div class='ctx'> 	if (type != hwmon_temp)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (channel == 0 &amp;&amp; !nic-&gt;aq_fw_ops-&gt;get_phy_temp)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (channel == 1 &amp;&amp; !nic-&gt;aq_fw_ops-&gt;get_mac_temp &amp;&amp;</div><div class='add'>+		 !nic-&gt;aq_hw_ops-&gt;hw_get_mac_temp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	switch (attr) {</div><div class='ctx'> 	case hwmon_temp_input:</div><div class='ctx'> 	case hwmon_temp_label:</div><div class='hunk'>@@ -86,18 +113,9 @@ static const struct hwmon_ops aq_hwmon_ops = {</div><div class='ctx'> 	.read_string = aq_hwmon_read_string,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 aq_hwmon_temp_config[] = {</div><div class='del'>-	HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='del'>-	0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info aq_hwmon_temp = {</div><div class='del'>-	.type = hwmon_temp,</div><div class='del'>-	.config = aq_hwmon_temp_config,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct hwmon_channel_info *aq_hwmon_info[] = {</div><div class='del'>-	&amp;aq_hwmon_temp,</div><div class='add'>+static const struct hwmon_channel_info * const aq_hwmon_info[] = {</div><div class='add'>+	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_LABEL,</div><div class='add'>+			   HWMON_T_INPUT | HWMON_T_LABEL),</div><div class='ctx'> 	NULL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h b/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h<br/>index 41fbb1358068..59113a20622a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_drvinfo.h</a></div><div class='hunk'>@@ -1,14 +1,16 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='del'>-/* Copyright (C) 2014-2017 aQuantia Corporation. */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='ctx'> </div><div class='ctx'> /* File aq_drvinfo.h: Declaration of common code for firmware info in sys.*/</div><div class='ctx'> </div><div class='ctx'> #ifndef AQ_DRVINFO_H</div><div class='ctx'> #define AQ_DRVINFO_H</div><div class='ctx'> </div><div class='del'>-#include "aq_nic.h"</div><div class='del'>-#include "aq_hw.h"</div><div class='del'>-#include "hw_atl/hw_atl_utils.h"</div><div class='add'>+struct net_device;</div><div class='ctx'> </div><div class='ctx'> int aq_drvinfo_init(struct net_device *ndev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c<br/>index 79da48094770..6fef47ba0a59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_ethtool.c: Definition of ethertool related functions. */</div><div class='hunk'>@@ -12,13 +10,22 @@</div><div class='ctx'> #include "aq_ethtool.h"</div><div class='ctx'> #include "aq_nic.h"</div><div class='ctx'> #include "aq_vec.h"</div><div class='add'>+#include "aq_ptp.h"</div><div class='ctx'> #include "aq_filters.h"</div><div class='add'>+#include "aq_macsec.h"</div><div class='add'>+#include "aq_main.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/linkmode.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> </div><div class='ctx'> static void aq_ethtool_get_regs(struct net_device *ndev,</div><div class='ctx'> 				struct ethtool_regs *regs, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	u32 regs_count = aq_nic_get_regs_count(aq_nic);</div><div class='add'>+	u32 regs_count;</div><div class='add'>+</div><div class='add'>+	regs_count = aq_nic_get_regs_count(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	memset(p, 0, regs_count * sizeof(u32));</div><div class='ctx'> 	aq_nic_get_regs(aq_nic, regs, p);</div><div class='hunk'>@@ -27,7 +34,9 @@ static void aq_ethtool_get_regs(struct net_device *ndev,</div><div class='ctx'> static int aq_ethtool_get_regs_len(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	u32 regs_count = aq_nic_get_regs_count(aq_nic);</div><div class='add'>+	u32 regs_count;</div><div class='add'>+</div><div class='add'>+	regs_count = aq_nic_get_regs_count(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	return regs_count * sizeof(u32);</div><div class='ctx'> }</div><div class='hunk'>@@ -83,47 +92,158 @@ static const char aq_ethtool_stat_names[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"InDroppedDma",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const char aq_ethtool_queue_stat_names[][ETH_GSTRING_LEN] = {</div><div class='del'>-	"Queue[%d] InPackets",</div><div class='del'>-	"Queue[%d] OutPackets",</div><div class='del'>-	"Queue[%d] Restarts",</div><div class='del'>-	"Queue[%d] InJumboPackets",</div><div class='del'>-	"Queue[%d] InLroPackets",</div><div class='del'>-	"Queue[%d] InErrors",</div><div class='add'>+static const char * const aq_ethtool_queue_rx_stat_names[] = {</div><div class='add'>+	"%sQueue[%d] InPackets",</div><div class='add'>+	"%sQueue[%d] InJumboPackets",</div><div class='add'>+	"%sQueue[%d] InLroPackets",</div><div class='add'>+	"%sQueue[%d] InErrors",</div><div class='add'>+	"%sQueue[%d] AllocFails",</div><div class='add'>+	"%sQueue[%d] SkbAllocFails",</div><div class='add'>+	"%sQueue[%d] Polls",</div><div class='add'>+	"%sQueue[%d] PageFlips",</div><div class='add'>+	"%sQueue[%d] PageReuses",</div><div class='add'>+	"%sQueue[%d] PageFrees",</div><div class='add'>+	"%sQueue[%d] XdpAbort",</div><div class='add'>+	"%sQueue[%d] XdpDrop",</div><div class='add'>+	"%sQueue[%d] XdpPass",</div><div class='add'>+	"%sQueue[%d] XdpTx",</div><div class='add'>+	"%sQueue[%d] XdpInvalid",</div><div class='add'>+	"%sQueue[%d] XdpRedirect",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aq_ethtool_queue_tx_stat_names[] = {</div><div class='add'>+	"%sQueue[%d] OutPackets",</div><div class='add'>+	"%sQueue[%d] Restarts",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+static const char aq_macsec_stat_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"MACSec InCtlPackets",</div><div class='add'>+	"MACSec InTaggedMissPackets",</div><div class='add'>+	"MACSec InUntaggedMissPackets",</div><div class='add'>+	"MACSec InNotagPackets",</div><div class='add'>+	"MACSec InUntaggedPackets",</div><div class='add'>+	"MACSec InBadTagPackets",</div><div class='add'>+	"MACSec InNoSciPackets",</div><div class='add'>+	"MACSec InUnknownSciPackets",</div><div class='add'>+	"MACSec InCtrlPortPassPackets",</div><div class='add'>+	"MACSec InUnctrlPortPassPackets",</div><div class='add'>+	"MACSec InCtrlPortFailPackets",</div><div class='add'>+	"MACSec InUnctrlPortFailPackets",</div><div class='add'>+	"MACSec InTooLongPackets",</div><div class='add'>+	"MACSec InIgpocCtlPackets",</div><div class='add'>+	"MACSec InEccErrorPackets",</div><div class='add'>+	"MACSec InUnctrlHitDropRedir",</div><div class='add'>+	"MACSec OutCtlPackets",</div><div class='add'>+	"MACSec OutUnknownSaPackets",</div><div class='add'>+	"MACSec OutUntaggedPackets",</div><div class='add'>+	"MACSec OutTooLong",</div><div class='add'>+	"MACSec OutEccErrorPackets",</div><div class='add'>+	"MACSec OutUnctrlHitDropRedir",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aq_macsec_txsc_stat_names[] = {</div><div class='add'>+	"MACSecTXSC%d ProtectedPkts",</div><div class='add'>+	"MACSecTXSC%d EncryptedPkts",</div><div class='add'>+	"MACSecTXSC%d ProtectedOctets",</div><div class='add'>+	"MACSecTXSC%d EncryptedOctets",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aq_macsec_txsa_stat_names[] = {</div><div class='add'>+	"MACSecTXSC%dSA%d HitDropRedirect",</div><div class='add'>+	"MACSecTXSC%dSA%d Protected2Pkts",</div><div class='add'>+	"MACSecTXSC%dSA%d ProtectedPkts",</div><div class='add'>+	"MACSecTXSC%dSA%d EncryptedPkts",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const aq_macsec_rxsa_stat_names[] = {</div><div class='add'>+	"MACSecRXSC%dSA%d UntaggedHitPkts",</div><div class='add'>+	"MACSecRXSC%dSA%d CtrlHitDrpRedir",</div><div class='add'>+	"MACSecRXSC%dSA%d NotUsingSa",</div><div class='add'>+	"MACSecRXSC%dSA%d UnusedSa",</div><div class='add'>+	"MACSecRXSC%dSA%d NotValidPkts",</div><div class='add'>+	"MACSecRXSC%dSA%d InvalidPkts",</div><div class='add'>+	"MACSecRXSC%dSA%d OkPkts",</div><div class='add'>+	"MACSecRXSC%dSA%d LatePkts",</div><div class='add'>+	"MACSecRXSC%dSA%d DelayedPkts",</div><div class='add'>+	"MACSecRXSC%dSA%d UncheckedPkts",</div><div class='add'>+	"MACSecRXSC%dSA%d ValidatedOctets",</div><div class='add'>+	"MACSecRXSC%dSA%d DecryptedOctets",</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const char aq_ethtool_priv_flag_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"DMASystemLoopback",</div><div class='add'>+	"PKTSystemLoopback",</div><div class='add'>+	"DMANetworkLoopback",</div><div class='add'>+	"PHYInternalLoopback",</div><div class='add'>+	"PHYExternalLoopback",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static u32 aq_ethtool_n_stats(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	const int rx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_rx_stat_names);</div><div class='add'>+	const int tx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_tx_stat_names);</div><div class='add'>+	struct aq_nic_s *nic = netdev_priv(ndev);</div><div class='add'>+	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(nic);</div><div class='add'>+	u32 n_stats = ARRAY_SIZE(aq_ethtool_stat_names) +</div><div class='add'>+		      (rx_stat_cnt + tx_stat_cnt) * cfg-&gt;vecs * cfg-&gt;tcs;</div><div class='add'>+</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+	n_stats += rx_stat_cnt * aq_ptp_get_ring_cnt(nic, ATL_RING_RX) +</div><div class='add'>+		   tx_stat_cnt * aq_ptp_get_ring_cnt(nic, ATL_RING_TX);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	if (nic-&gt;macsec_cfg) {</div><div class='add'>+		n_stats += ARRAY_SIZE(aq_macsec_stat_names) +</div><div class='add'>+			   ARRAY_SIZE(aq_macsec_txsc_stat_names) *</div><div class='add'>+				   aq_macsec_tx_sc_cnt(nic) +</div><div class='add'>+			   ARRAY_SIZE(aq_macsec_txsa_stat_names) *</div><div class='add'>+				   aq_macsec_tx_sa_cnt(nic) +</div><div class='add'>+			   ARRAY_SIZE(aq_macsec_rxsa_stat_names) *</div><div class='add'>+				   aq_macsec_rx_sa_cnt(nic);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return n_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void aq_ethtool_stats(struct net_device *ndev,</div><div class='ctx'> 			     struct ethtool_stats *stats, u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> </div><div class='del'>-	memset(data, 0, (ARRAY_SIZE(aq_ethtool_stat_names) +</div><div class='del'>-			 ARRAY_SIZE(aq_ethtool_queue_stat_names) *</div><div class='del'>-			 cfg-&gt;vecs) * sizeof(u64));</div><div class='del'>-	aq_nic_get_stats(aq_nic, data);</div><div class='add'>+	memset(data, 0, aq_ethtool_n_stats(ndev) * sizeof(u64));</div><div class='add'>+	data = aq_nic_get_stats(aq_nic, data);</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+	data = aq_ptp_get_stats(aq_nic, data);</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	data = aq_macsec_get_stats(aq_nic, data);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aq_ethtool_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> 				   struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ndev-&gt;dev.parent);</div><div class='del'>-	u32 firmware_version = aq_nic_get_fw_version(aq_nic);</div><div class='del'>-	u32 regs_count = aq_nic_get_regs_count(aq_nic);</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	u32 firmware_version;</div><div class='add'>+	u32 regs_count;</div><div class='add'>+</div><div class='add'>+	firmware_version = aq_nic_get_fw_version(aq_nic);</div><div class='add'>+	regs_count = aq_nic_get_regs_count(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	strlcat(drvinfo-&gt;driver, AQ_CFG_DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcat(drvinfo-&gt;version, AQ_CFG_DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='ctx'> </div><div class='ctx'> 	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='ctx'> 		 "%u.%u.%u", firmware_version &gt;&gt; 24,</div><div class='ctx'> 		 (firmware_version &gt;&gt; 16) &amp; 0xFFU, firmware_version &amp; 0xFFFFU);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pdev ? pci_name(pdev) : "",</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pdev ? pci_name(pdev) : "",</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='del'>-	drvinfo-&gt;n_stats = ARRAY_SIZE(aq_ethtool_stat_names) +</div><div class='del'>-		cfg-&gt;vecs * ARRAY_SIZE(aq_ethtool_queue_stat_names);</div><div class='add'>+	drvinfo-&gt;n_stats = aq_ethtool_n_stats(ndev);</div><div class='ctx'> 	drvinfo-&gt;testinfo_len = 0;</div><div class='ctx'> 	drvinfo-&gt;regdump_len = regs_count;</div><div class='ctx'> 	drvinfo-&gt;eedump_len = 0;</div><div class='hunk'>@@ -132,41 +252,178 @@ static void aq_ethtool_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> static void aq_ethtool_get_strings(struct net_device *ndev,</div><div class='ctx'> 				   u32 stringset, u8 *data)</div><div class='ctx'> {</div><div class='del'>-	int i, si;</div><div class='del'>-	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_s *nic = netdev_priv(ndev);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> 	u8 *p = data;</div><div class='add'>+	int i, si;</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	int sa;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	cfg = aq_nic_get_cfg(nic);</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS: {</div><div class='add'>+		const int rx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_rx_stat_names);</div><div class='add'>+		const int tx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_tx_stat_names);</div><div class='add'>+		char tc_string[8];</div><div class='add'>+		unsigned int tc;</div><div class='ctx'> </div><div class='del'>-	if (stringset == ETH_SS_STATS) {</div><div class='add'>+		memset(tc_string, 0, sizeof(tc_string));</div><div class='ctx'> 		memcpy(p, aq_ethtool_stat_names,</div><div class='ctx'> 		       sizeof(aq_ethtool_stat_names));</div><div class='ctx'> 		p = p + sizeof(aq_ethtool_stat_names);</div><div class='del'>-		for (i = 0; i &lt; cfg-&gt;vecs; i++) {</div><div class='add'>+</div><div class='add'>+		for (tc = 0; tc &lt; cfg-&gt;tcs; tc++) {</div><div class='add'>+			if (cfg-&gt;is_qos)</div><div class='add'>+				snprintf(tc_string, 8, "TC%u ", tc);</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; cfg-&gt;vecs; i++) {</div><div class='add'>+				for (si = 0; si &lt; rx_stat_cnt; si++) {</div><div class='add'>+					ethtool_sprintf(&amp;p,</div><div class='add'>+					     aq_ethtool_queue_rx_stat_names[si],</div><div class='add'>+					     tc_string,</div><div class='add'>+					     AQ_NIC_CFG_TCVEC2RING(cfg, tc, i));</div><div class='add'>+				}</div><div class='add'>+				for (si = 0; si &lt; tx_stat_cnt; si++) {</div><div class='add'>+					ethtool_sprintf(&amp;p,</div><div class='add'>+					     aq_ethtool_queue_tx_stat_names[si],</div><div class='add'>+					     tc_string,</div><div class='add'>+					     AQ_NIC_CFG_TCVEC2RING(cfg, tc, i));</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+		if (nic-&gt;aq_ptp) {</div><div class='add'>+			const int rx_ring_cnt = aq_ptp_get_ring_cnt(nic, ATL_RING_RX);</div><div class='add'>+			const int tx_ring_cnt = aq_ptp_get_ring_cnt(nic, ATL_RING_TX);</div><div class='add'>+			unsigned int ptp_ring_idx =</div><div class='add'>+				aq_ptp_ring_idx(nic-&gt;aq_nic_cfg.tc_mode);</div><div class='add'>+</div><div class='add'>+			snprintf(tc_string, 8, "PTP ");</div><div class='add'>+</div><div class='add'>+			for (i = 0; i &lt; max(rx_ring_cnt, tx_ring_cnt); i++) {</div><div class='add'>+				for (si = 0; si &lt; rx_stat_cnt; si++) {</div><div class='add'>+					ethtool_sprintf(&amp;p,</div><div class='add'>+						 aq_ethtool_queue_rx_stat_names[si],</div><div class='add'>+						 tc_string,</div><div class='add'>+						 i ? PTP_HWST_RING_IDX : ptp_ring_idx);</div><div class='add'>+				}</div><div class='add'>+				if (i &gt;= tx_ring_cnt)</div><div class='add'>+					continue;</div><div class='add'>+				for (si = 0; si &lt; tx_stat_cnt; si++) {</div><div class='add'>+					ethtool_sprintf(&amp;p,</div><div class='add'>+						 aq_ethtool_queue_tx_stat_names[si],</div><div class='add'>+						 tc_string,</div><div class='add'>+						 i ? PTP_HWST_RING_IDX : ptp_ring_idx);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+		if (!nic-&gt;macsec_cfg)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		memcpy(p, aq_macsec_stat_names, sizeof(aq_macsec_stat_names));</div><div class='add'>+		p = p + sizeof(aq_macsec_stat_names);</div><div class='add'>+		for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+			struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+</div><div class='add'>+			if (!(test_bit(i, &amp;nic-&gt;macsec_cfg-&gt;txsc_idx_busy)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='ctx'> 			for (si = 0;</div><div class='del'>-				si &lt; ARRAY_SIZE(aq_ethtool_queue_stat_names);</div><div class='add'>+				si &lt; ARRAY_SIZE(aq_macsec_txsc_stat_names);</div><div class='ctx'> 				si++) {</div><div class='del'>-				snprintf(p, ETH_GSTRING_LEN,</div><div class='del'>-					 aq_ethtool_queue_stat_names[si], i);</div><div class='del'>-				p += ETH_GSTRING_LEN;</div><div class='add'>+				ethtool_sprintf(&amp;p,</div><div class='add'>+					 aq_macsec_txsc_stat_names[si], i);</div><div class='add'>+			}</div><div class='add'>+			aq_txsc = &amp;nic-&gt;macsec_cfg-&gt;aq_txsc[i];</div><div class='add'>+			for (sa = 0; sa &lt; MACSEC_NUM_AN; sa++) {</div><div class='add'>+				if (!(test_bit(sa, &amp;aq_txsc-&gt;tx_sa_idx_busy)))</div><div class='add'>+					continue;</div><div class='add'>+				for (si = 0;</div><div class='add'>+				     si &lt; ARRAY_SIZE(aq_macsec_txsa_stat_names);</div><div class='add'>+				     si++) {</div><div class='add'>+					ethtool_sprintf(&amp;p,</div><div class='add'>+						 aq_macsec_txsa_stat_names[si],</div><div class='add'>+						 i, sa);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+			struct aq_macsec_rxsc *aq_rxsc;</div><div class='add'>+</div><div class='add'>+			if (!(test_bit(i, &amp;nic-&gt;macsec_cfg-&gt;rxsc_idx_busy)))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			aq_rxsc = &amp;nic-&gt;macsec_cfg-&gt;aq_rxsc[i];</div><div class='add'>+			for (sa = 0; sa &lt; MACSEC_NUM_AN; sa++) {</div><div class='add'>+				if (!(test_bit(sa, &amp;aq_rxsc-&gt;rx_sa_idx_busy)))</div><div class='add'>+					continue;</div><div class='add'>+				for (si = 0;</div><div class='add'>+				     si &lt; ARRAY_SIZE(aq_macsec_rxsa_stat_names);</div><div class='add'>+				     si++) {</div><div class='add'>+					ethtool_sprintf(&amp;p,</div><div class='add'>+						 aq_macsec_rxsa_stat_names[si],</div><div class='add'>+						 i, sa);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		memcpy(p, aq_ethtool_priv_flag_names,</div><div class='add'>+		       sizeof(aq_ethtool_priv_flag_names));</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aq_ethtool_set_phys_id(struct net_device *ndev,</div><div class='add'>+				  enum ethtool_phys_id_state state)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	struct aq_hw_s *hw = aq_nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_fw_ops-&gt;led_control)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case ETHTOOL_ID_ACTIVE:</div><div class='add'>+		ret = aq_nic-&gt;aq_fw_ops-&gt;led_control(hw, AQ_HW_LED_BLINK |</div><div class='add'>+				 AQ_HW_LED_BLINK &lt;&lt; 2 | AQ_HW_LED_BLINK &lt;&lt; 4);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_ID_INACTIVE:</div><div class='add'>+		ret = aq_nic-&gt;aq_fw_ops-&gt;led_control(hw, AQ_HW_LED_DEFAULT);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aq_ethtool_get_sset_count(struct net_device *ndev, int stringset)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		ret = ARRAY_SIZE(aq_ethtool_stat_names) +</div><div class='del'>-			cfg-&gt;vecs * ARRAY_SIZE(aq_ethtool_queue_stat_names);</div><div class='add'>+		ret = aq_ethtool_n_stats(ndev);</div><div class='add'>+		break;</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		ret = ARRAY_SIZE(aq_ethtool_priv_flag_names);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -178,32 +435,37 @@ static u32 aq_ethtool_get_rss_indir_size(struct net_device *ndev)</div><div class='ctx'> static u32 aq_ethtool_get_rss_key_size(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='add'>+</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	return sizeof(cfg-&gt;aq_rss.hash_secret_key);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key,</div><div class='del'>-			      u8 *hfunc)</div><div class='add'>+static int aq_ethtool_get_rss(struct net_device *ndev,</div><div class='add'>+			      struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP; /* Toeplitz */</div><div class='del'>-	if (indir) {</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP; /* Toeplitz */</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='ctx'> 		for (i = 0; i &lt; AQ_CFG_RSS_INDIRECTION_TABLE_MAX; i++)</div><div class='del'>-			indir[i] = cfg-&gt;aq_rss.indirection_table[i];</div><div class='add'>+			rxfh-&gt;indir[i] = cfg-&gt;aq_rss.indirection_table[i];</div><div class='ctx'> 	}</div><div class='del'>-	if (key)</div><div class='del'>-		memcpy(key, cfg-&gt;aq_rss.hash_secret_key,</div><div class='add'>+	if (rxfh-&gt;key)</div><div class='add'>+		memcpy(rxfh-&gt;key, cfg-&gt;aq_rss.hash_secret_key,</div><div class='ctx'> 		       sizeof(cfg-&gt;aq_rss.hash_secret_key));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ethtool_set_rss(struct net_device *netdev, const u32 *indir,</div><div class='del'>-			      const u8 *key, const u8 hfunc)</div><div class='add'>+static int aq_ethtool_set_rss(struct net_device *netdev,</div><div class='add'>+			      struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(netdev);</div><div class='ctx'> 	struct aq_nic_cfg_s *cfg;</div><div class='hunk'>@@ -215,16 +477,17 @@ static int aq_ethtool_set_rss(struct net_device *netdev, const u32 *indir,</div><div class='ctx'> 	rss_entries = cfg-&gt;aq_rss.indirection_table_size;</div><div class='ctx'> </div><div class='ctx'> 	/* We do not allow change in unsupported parameters */</div><div class='del'>-	if (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP)</div><div class='add'>+	if (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	    rxfh-&gt;hfunc != ETH_RSS_HASH_TOP)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	/* Fill out the redirection table */</div><div class='del'>-	if (indir)</div><div class='add'>+	if (rxfh-&gt;indir)</div><div class='ctx'> 		for (i = 0; i &lt; rss_entries; i++)</div><div class='del'>-			cfg-&gt;aq_rss.indirection_table[i] = indir[i];</div><div class='add'>+			cfg-&gt;aq_rss.indirection_table[i] = rxfh-&gt;indir[i];</div><div class='ctx'> </div><div class='ctx'> 	/* Fill out the rss hash key */</div><div class='del'>-	if (key) {</div><div class='del'>-		memcpy(cfg-&gt;aq_rss.hash_secret_key, key,</div><div class='add'>+	if (rxfh-&gt;key) {</div><div class='add'>+		memcpy(cfg-&gt;aq_rss.hash_secret_key, rxfh-&gt;key,</div><div class='ctx'> 		       sizeof(cfg-&gt;aq_rss.hash_secret_key));</div><div class='ctx'> 		err = aq_nic-&gt;aq_hw_ops-&gt;hw_rss_hash_set(aq_nic-&gt;aq_hw,</div><div class='ctx'> 			&amp;cfg-&gt;aq_rss);</div><div class='hunk'>@@ -242,9 +505,11 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev,</div><div class='ctx'> 				u32 *rule_locs)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+</div><div class='ctx'> 	switch (cmd-&gt;cmd) {</div><div class='ctx'> 	case ETHTOOL_GRXRINGS:</div><div class='ctx'> 		cmd-&gt;data = cfg-&gt;vecs;</div><div class='hunk'>@@ -269,8 +534,8 @@ static int aq_ethtool_get_rxnfc(struct net_device *ndev,</div><div class='ctx'> static int aq_ethtool_set_rxnfc(struct net_device *ndev,</div><div class='ctx'> 				struct ethtool_rxnfc *cmd)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd-&gt;cmd) {</div><div class='ctx'> 	case ETHTOOL_SRXCLSRLINS:</div><div class='hunk'>@@ -288,10 +553,14 @@ static int aq_ethtool_set_rxnfc(struct net_device *ndev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_ethtool_get_coalesce(struct net_device *ndev,</div><div class='del'>-				   struct ethtool_coalesce *coal)</div><div class='add'>+				   struct ethtool_coalesce *coal,</div><div class='add'>+				   struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='add'>+</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	if (cfg-&gt;itr == AQ_CFG_INTERRUPT_MODERATION_ON ||</div><div class='ctx'> 	    cfg-&gt;itr == AQ_CFG_INTERRUPT_MODERATION_AUTO) {</div><div class='hunk'>@@ -305,30 +574,24 @@ static int aq_ethtool_get_coalesce(struct net_device *ndev,</div><div class='ctx'> 		coal-&gt;rx_max_coalesced_frames = 1;</div><div class='ctx'> 		coal-&gt;tx_max_coalesced_frames = 1;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_ethtool_set_coalesce(struct net_device *ndev,</div><div class='del'>-				   struct ethtool_coalesce *coal)</div><div class='add'>+				   struct ethtool_coalesce *coal,</div><div class='add'>+				   struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> </div><div class='del'>-	/* This is not yet supported</div><div class='del'>-	 */</div><div class='del'>-	if (coal-&gt;use_adaptive_rx_coalesce || coal-&gt;use_adaptive_tx_coalesce)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> </div><div class='ctx'> 	/* Atlantic only supports timing based coalescing</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (coal-&gt;rx_max_coalesced_frames &gt; 1 ||</div><div class='del'>-	    coal-&gt;rx_coalesce_usecs_irq ||</div><div class='del'>-	    coal-&gt;rx_max_coalesced_frames_irq)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	if (coal-&gt;tx_max_coalesced_frames &gt; 1 ||</div><div class='del'>-	    coal-&gt;tx_coalesce_usecs_irq ||</div><div class='del'>-	    coal-&gt;tx_max_coalesced_frames_irq)</div><div class='add'>+	    coal-&gt;tx_max_coalesced_frames &gt; 1)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* We do not support frame counting. Check this</div><div class='hunk'>@@ -354,13 +617,12 @@ static void aq_ethtool_get_wol(struct net_device *ndev,</div><div class='ctx'> 			       struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> </div><div class='del'>-	wol-&gt;supported = WAKE_MAGIC;</div><div class='del'>-	wol-&gt;wolopts = 0;</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='ctx'> </div><div class='del'>-	if (cfg-&gt;wol)</div><div class='del'>-		wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='add'>+	wol-&gt;supported = AQ_NIC_WOL_MODES;</div><div class='add'>+	wol-&gt;wolopts = cfg-&gt;wol;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_ethtool_set_wol(struct net_device *ndev,</div><div class='hunk'>@@ -368,35 +630,65 @@ static int aq_ethtool_set_wol(struct net_device *ndev,</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = to_pci_dev(ndev-&gt;dev.parent);</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='del'>-		cfg-&gt;wol |= AQ_NIC_WOL_ENABLED;</div><div class='del'>-	else</div><div class='del'>-		cfg-&gt;wol &amp;= ~AQ_NIC_WOL_ENABLED;</div><div class='del'>-	err = device_set_wakeup_enable(&amp;pdev-&gt;dev, wol-&gt;wolopts);</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~AQ_NIC_WOL_MODES)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;wol = wol-&gt;wolopts;</div><div class='add'>+</div><div class='add'>+	err = device_set_wakeup_enable(&amp;pdev-&gt;dev, !!cfg-&gt;wol);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static enum hw_atl_fw2x_rate eee_mask_to_ethtool_mask(u32 speed)</div><div class='add'>+static int aq_ethtool_get_ts_info(struct net_device *ndev,</div><div class='add'>+				  struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='del'>-	u32 rate = 0;</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	if (speed &amp; AQ_NIC_RATE_EEE_10G)</div><div class='del'>-		rate |= SUPPORTED_10000baseT_Full;</div><div class='add'>+	ethtool_op_get_ts_info(ndev, info);</div><div class='ctx'> </div><div class='del'>-	if (speed &amp; AQ_NIC_RATE_EEE_2GS)</div><div class='del'>-		rate |= SUPPORTED_2500baseX_Full;</div><div class='add'>+	if (!aq_nic-&gt;aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping |=</div><div class='add'>+		SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_OFF) |</div><div class='add'>+			 BIT(HWTSTAMP_TX_ON);</div><div class='add'>+</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_NONE);</div><div class='add'>+</div><div class='add'>+	info-&gt;rx_filters |= BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |</div><div class='add'>+			    BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |</div><div class='add'>+			    BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);</div><div class='add'>+</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+	info-&gt;phc_index = ptp_clock_index(aq_ptp_get_ptp_clock(aq_nic-&gt;aq_ptp));</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eee_mask_to_ethtool_mask(unsigned long *mode, u32 speed)</div><div class='add'>+{</div><div class='add'>+	if (speed &amp; AQ_NIC_RATE_EEE_10G)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, mode);</div><div class='ctx'> </div><div class='ctx'> 	if (speed &amp; AQ_NIC_RATE_EEE_1G)</div><div class='del'>-		rate |= SUPPORTED_1000baseT_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, mode);</div><div class='ctx'> </div><div class='del'>-	return rate;</div><div class='add'>+	if (speed &amp; AQ_NIC_RATE_EEE_100M)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_eee *eee)</div><div class='add'>+static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_keee *eee)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='ctx'> 	u32 rate, supported_rates;</div><div class='hunk'>@@ -412,23 +704,23 @@ static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_eee *eee)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	eee-&gt;supported = eee_mask_to_ethtool_mask(supported_rates);</div><div class='add'>+	eee_mask_to_ethtool_mask(eee-&gt;supported, supported_rates);</div><div class='ctx'> </div><div class='ctx'> 	if (aq_nic-&gt;aq_nic_cfg.eee_speeds)</div><div class='del'>-		eee-&gt;advertised = eee-&gt;supported;</div><div class='add'>+		linkmode_copy(eee-&gt;advertised, eee-&gt;supported);</div><div class='ctx'> </div><div class='del'>-	eee-&gt;lp_advertised = eee_mask_to_ethtool_mask(rate);</div><div class='add'>+	eee_mask_to_ethtool_mask(eee-&gt;lp_advertised, rate);</div><div class='ctx'> </div><div class='del'>-	eee-&gt;eee_enabled = !!eee-&gt;advertised;</div><div class='add'>+	eee-&gt;eee_enabled = !linkmode_empty(eee-&gt;advertised);</div><div class='ctx'> </div><div class='ctx'> 	eee-&gt;tx_lpi_enabled = eee-&gt;eee_enabled;</div><div class='del'>-	if (eee-&gt;advertised &amp; eee-&gt;lp_advertised)</div><div class='add'>+	if ((supported_rates &amp; rate) &amp; AQ_NIC_RATE_EEE_MSK)</div><div class='ctx'> 		eee-&gt;eee_active = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ethtool_set_eee(struct net_device *ndev, struct ethtool_eee *eee)</div><div class='add'>+static int aq_ethtool_set_eee(struct net_device *ndev, struct ethtool_keee *eee)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='ctx'> 	u32 rate, supported_rates;</div><div class='hunk'>@@ -484,13 +776,12 @@ static void aq_ethtool_get_pauseparam(struct net_device *ndev,</div><div class='ctx'> 				      struct ethtool_pauseparam *pause)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	u32 fc = aq_nic-&gt;aq_nic_cfg.flow_control;</div><div class='add'>+	int fc = aq_nic-&gt;aq_nic_cfg.fc.req;</div><div class='ctx'> </div><div class='ctx'> 	pause-&gt;autoneg = 0;</div><div class='ctx'> </div><div class='ctx'> 	pause-&gt;rx_pause = !!(fc &amp; AQ_NIC_FC_RX);</div><div class='ctx'> 	pause-&gt;tx_pause = !!(fc &amp; AQ_NIC_FC_TX);</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_ethtool_set_pauseparam(struct net_device *ndev,</div><div class='hunk'>@@ -506,14 +797,14 @@ static int aq_ethtool_set_pauseparam(struct net_device *ndev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (pause-&gt;rx_pause)</div><div class='del'>-		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;flow_control |= AQ_NIC_FC_RX;</div><div class='add'>+		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;fc.req |= AQ_NIC_FC_RX;</div><div class='ctx'> 	else</div><div class='del'>-		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;flow_control &amp;= ~AQ_NIC_FC_RX;</div><div class='add'>+		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;fc.req &amp;= ~AQ_NIC_FC_RX;</div><div class='ctx'> </div><div class='ctx'> 	if (pause-&gt;tx_pause)</div><div class='del'>-		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;flow_control |= AQ_NIC_FC_TX;</div><div class='add'>+		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;fc.req |= AQ_NIC_FC_TX;</div><div class='ctx'> 	else</div><div class='del'>-		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;flow_control &amp;= ~AQ_NIC_FC_TX;</div><div class='add'>+		aq_nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;fc.req &amp;= ~AQ_NIC_FC_TX;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='ctx'> 	err = aq_nic-&gt;aq_fw_ops-&gt;set_flow_control(aq_nic-&gt;aq_hw);</div><div class='hunk'>@@ -523,26 +814,35 @@ static int aq_ethtool_set_pauseparam(struct net_device *ndev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aq_get_ringparam(struct net_device *ndev,</div><div class='del'>-			     struct ethtool_ringparam *ring)</div><div class='add'>+			     struct ethtool_ringparam *ring,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *aq_nic_cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;rx_pending = aq_nic_cfg-&gt;rxds;</div><div class='del'>-	ring-&gt;tx_pending = aq_nic_cfg-&gt;txds;</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+</div><div class='add'>+	ring-&gt;rx_pending = cfg-&gt;rxds;</div><div class='add'>+	ring-&gt;tx_pending = cfg-&gt;txds;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;rx_max_pending = aq_nic_cfg-&gt;aq_hw_caps-&gt;rxds_max;</div><div class='del'>-	ring-&gt;tx_max_pending = aq_nic_cfg-&gt;aq_hw_caps-&gt;txds_max;</div><div class='add'>+	ring-&gt;rx_max_pending = cfg-&gt;aq_hw_caps-&gt;rxds_max;</div><div class='add'>+	ring-&gt;tx_max_pending = cfg-&gt;aq_hw_caps-&gt;txds_max;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_set_ringparam(struct net_device *ndev,</div><div class='del'>-			    struct ethtool_ringparam *ring)</div><div class='add'>+			    struct ethtool_ringparam *ring,</div><div class='add'>+			    struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	bool ndev_running = false;</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *aq_nic_cfg = aq_nic_get_cfg(aq_nic);</div><div class='del'>-	const struct aq_hw_caps_s *hw_caps = aq_nic_cfg-&gt;aq_hw_caps;</div><div class='add'>+	const struct aq_hw_caps_s *hw_caps;</div><div class='add'>+	bool ndev_running = false;</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	hw_caps = cfg-&gt;aq_hw_caps;</div><div class='ctx'> </div><div class='ctx'> 	if (ring-&gt;rx_mini_pending || ring-&gt;rx_jumbo_pending) {</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='hunk'>@@ -551,41 +851,212 @@ static int aq_set_ringparam(struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(ndev)) {</div><div class='ctx'> 		ndev_running = true;</div><div class='del'>-		dev_close(ndev);</div><div class='add'>+		aq_ndev_close(ndev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	aq_nic_free_vectors(aq_nic);</div><div class='add'>+	cfg-&gt;rxds = max(ring-&gt;rx_pending, hw_caps-&gt;rxds_min);</div><div class='add'>+	cfg-&gt;rxds = min(cfg-&gt;rxds, hw_caps-&gt;rxds_max);</div><div class='add'>+	cfg-&gt;rxds = ALIGN(cfg-&gt;rxds, AQ_HW_RXD_MULTIPLE);</div><div class='ctx'> </div><div class='del'>-	aq_nic_cfg-&gt;rxds = max(ring-&gt;rx_pending, hw_caps-&gt;rxds_min);</div><div class='del'>-	aq_nic_cfg-&gt;rxds = min(aq_nic_cfg-&gt;rxds, hw_caps-&gt;rxds_max);</div><div class='del'>-	aq_nic_cfg-&gt;rxds = ALIGN(aq_nic_cfg-&gt;rxds, AQ_HW_RXD_MULTIPLE);</div><div class='add'>+	cfg-&gt;txds = max(ring-&gt;tx_pending, hw_caps-&gt;txds_min);</div><div class='add'>+	cfg-&gt;txds = min(cfg-&gt;txds, hw_caps-&gt;txds_max);</div><div class='add'>+	cfg-&gt;txds = ALIGN(cfg-&gt;txds, AQ_HW_TXD_MULTIPLE);</div><div class='ctx'> </div><div class='del'>-	aq_nic_cfg-&gt;txds = max(ring-&gt;tx_pending, hw_caps-&gt;txds_min);</div><div class='del'>-	aq_nic_cfg-&gt;txds = min(aq_nic_cfg-&gt;txds, hw_caps-&gt;txds_max);</div><div class='del'>-	aq_nic_cfg-&gt;txds = ALIGN(aq_nic_cfg-&gt;txds, AQ_HW_TXD_MULTIPLE);</div><div class='add'>+	err = aq_nic_realloc_vectors(aq_nic);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	for (aq_nic-&gt;aq_vecs = 0; aq_nic-&gt;aq_vecs &lt; aq_nic_cfg-&gt;vecs;</div><div class='del'>-	     aq_nic-&gt;aq_vecs++) {</div><div class='del'>-		aq_nic-&gt;aq_vec[aq_nic-&gt;aq_vecs] =</div><div class='del'>-		    aq_vec_alloc(aq_nic, aq_nic-&gt;aq_vecs, aq_nic_cfg);</div><div class='del'>-		if (unlikely(!aq_nic-&gt;aq_vec[aq_nic-&gt;aq_vecs])) {</div><div class='del'>-			err = -ENOMEM;</div><div class='del'>-			goto err_exit;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	if (ndev_running)</div><div class='del'>-		err = dev_open(ndev, NULL);</div><div class='add'>+		err = aq_ndev_open(ndev);</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 aq_get_msg_level(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return aq_nic-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_set_msg_level(struct net_device *ndev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	aq_nic-&gt;msg_enable = data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 aq_ethtool_get_priv_flags(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return aq_nic-&gt;aq_nic_cfg.priv_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ethtool_set_priv_flags(struct net_device *ndev, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='add'>+	u32 priv_flags;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	priv_flags = cfg-&gt;priv_flags;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ~AQ_PRIV_FLAGS_MASK)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (hweight32((flags | priv_flags) &amp; AQ_HW_LOOPBACK_MASK) &gt; 1) {</div><div class='add'>+		netdev_info(ndev, "Can't enable more than one loopback simultaneously\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg-&gt;priv_flags = flags;</div><div class='add'>+</div><div class='add'>+	if ((priv_flags ^ flags) &amp; BIT(AQ_HW_LOOPBACK_DMA_NET)) {</div><div class='add'>+		if (netif_running(ndev)) {</div><div class='add'>+			dev_close(ndev);</div><div class='add'>+</div><div class='add'>+			dev_open(ndev, NULL);</div><div class='add'>+		}</div><div class='add'>+	} else if ((priv_flags ^ flags) &amp; AQ_HW_LOOPBACK_MASK) {</div><div class='add'>+		ret = aq_nic_set_loopback(aq_nic);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ethtool_get_phy_tunable(struct net_device *ndev,</div><div class='add'>+				      const struct ethtool_tunable *tuna, void *data)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_EDPD: {</div><div class='add'>+		u16 *val = data;</div><div class='add'>+</div><div class='add'>+		*val = aq_nic-&gt;aq_nic_cfg.is_media_detect ? AQ_HW_MEDIA_DETECT_CNT : 0;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ETHTOOL_PHY_DOWNSHIFT: {</div><div class='add'>+		u8 *val = data;</div><div class='add'>+</div><div class='add'>+		*val = (u8)aq_nic-&gt;aq_nic_cfg.downshift_counter;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ethtool_set_phy_tunable(struct net_device *ndev,</div><div class='add'>+				      const struct ethtool_tunable *tuna, const void *data)</div><div class='add'>+{</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_PHY_EDPD: {</div><div class='add'>+		const u16 *val = data;</div><div class='add'>+</div><div class='add'>+		err = aq_nic_set_media_detect(aq_nic, *val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ETHTOOL_PHY_DOWNSHIFT: {</div><div class='add'>+		const u8 *val = data;</div><div class='add'>+</div><div class='add'>+		err = aq_nic_set_downshift(aq_nic, *val);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ethtool_get_module_info(struct net_device *ndev,</div><div class='add'>+				      struct ethtool_modinfo *modinfo)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	u8 compliance_val, dom_type;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Module EEPROM is only supported for controllers with external PHY */</div><div class='add'>+	if (aq_nic-&gt;aq_nic_cfg.aq_hw_caps-&gt;media_type != AQ_HW_MEDIA_TYPE_FIBRE ||</div><div class='add'>+	    !aq_nic-&gt;aq_hw_ops-&gt;hw_read_module_eeprom)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_read_module_eeprom(aq_nic-&gt;aq_hw,</div><div class='add'>+		SFF_8472_ID_ADDR, SFF_8472_COMP_ADDR, 1, &amp;compliance_val);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_read_module_eeprom(aq_nic-&gt;aq_hw,</div><div class='add'>+		SFF_8472_ID_ADDR, SFF_8472_DOM_TYPE_ADDR, 1, &amp;dom_type);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (dom_type &amp; SFF_8472_ADDRESS_CHANGE_REQ_MASK || compliance_val == 0x00) {</div><div class='add'>+		modinfo-&gt;type = ETH_MODULE_SFF_8079;</div><div class='add'>+		modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8079_LEN;</div><div class='add'>+	} else {</div><div class='add'>+		modinfo-&gt;type = ETH_MODULE_SFF_8472;</div><div class='add'>+		modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8472_LEN;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ethtool_get_module_eeprom(struct net_device *ndev,</div><div class='add'>+					struct ethtool_eeprom *ee, unsigned char *data)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	unsigned int first, last, len;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_hw_ops-&gt;hw_read_module_eeprom)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	first = ee-&gt;offset;</div><div class='add'>+	last = ee-&gt;offset + ee-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (first &lt; ETH_MODULE_SFF_8079_LEN) {</div><div class='add'>+		len = min(last, ETH_MODULE_SFF_8079_LEN);</div><div class='add'>+		len -= first;</div><div class='add'>+</div><div class='add'>+		err = aq_nic-&gt;aq_hw_ops-&gt;hw_read_module_eeprom(aq_nic-&gt;aq_hw,</div><div class='add'>+			SFF_8472_ID_ADDR, first, len, data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		first += len;</div><div class='add'>+		data += len;</div><div class='add'>+	}</div><div class='add'>+	if (first &lt; ETH_MODULE_SFF_8472_LEN &amp;&amp; last &gt; ETH_MODULE_SFF_8079_LEN) {</div><div class='add'>+		len = min(last, ETH_MODULE_SFF_8472_LEN);</div><div class='add'>+		len -= first;</div><div class='add'>+		first -= ETH_MODULE_SFF_8079_LEN;</div><div class='add'>+</div><div class='add'>+		err = aq_nic-&gt;aq_hw_ops-&gt;hw_read_module_eeprom(aq_nic-&gt;aq_hw,</div><div class='add'>+			SFF_8472_DIAGNOSTICS_ADDR, first, len, data);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ethtool_ops aq_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES,</div><div class='ctx'> 	.get_link            = aq_ethtool_get_link,</div><div class='ctx'> 	.get_regs_len        = aq_ethtool_get_regs_len,</div><div class='ctx'> 	.get_regs            = aq_ethtool_get_regs,</div><div class='ctx'> 	.get_drvinfo         = aq_ethtool_get_drvinfo,</div><div class='ctx'> 	.get_strings         = aq_ethtool_get_strings,</div><div class='add'>+	.set_phys_id         = aq_ethtool_set_phys_id,</div><div class='ctx'> 	.get_rxfh_indir_size = aq_ethtool_get_rss_indir_size,</div><div class='ctx'> 	.get_wol             = aq_ethtool_get_wol,</div><div class='ctx'> 	.set_wol             = aq_ethtool_set_wol,</div><div class='hunk'>@@ -601,10 +1072,19 @@ const struct ethtool_ops aq_ethtool_ops = {</div><div class='ctx'> 	.set_rxfh            = aq_ethtool_set_rss,</div><div class='ctx'> 	.get_rxnfc           = aq_ethtool_get_rxnfc,</div><div class='ctx'> 	.set_rxnfc           = aq_ethtool_set_rxnfc,</div><div class='add'>+	.get_msglevel        = aq_get_msg_level,</div><div class='add'>+	.set_msglevel        = aq_set_msg_level,</div><div class='ctx'> 	.get_sset_count      = aq_ethtool_get_sset_count,</div><div class='ctx'> 	.get_ethtool_stats   = aq_ethtool_stats,</div><div class='add'>+	.get_priv_flags      = aq_ethtool_get_priv_flags,</div><div class='add'>+	.set_priv_flags      = aq_ethtool_set_priv_flags,</div><div class='ctx'> 	.get_link_ksettings  = aq_ethtool_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings  = aq_ethtool_set_link_ksettings,</div><div class='ctx'> 	.get_coalesce	     = aq_ethtool_get_coalesce,</div><div class='ctx'> 	.set_coalesce	     = aq_ethtool_set_coalesce,</div><div class='add'>+	.get_ts_info         = aq_ethtool_get_ts_info,</div><div class='add'>+	.get_phy_tunable     = aq_ethtool_get_phy_tunable,</div><div class='add'>+	.set_phy_tunable     = aq_ethtool_set_phy_tunable,</div><div class='add'>+	.get_module_info     = aq_ethtool_get_module_info,</div><div class='add'>+	.get_module_eeprom   = aq_ethtool_get_module_eeprom,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h<br/>index 21c126eeb5eb..f26fe1a75539 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_ethtool.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='ctx'>  * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_ethtool.h: Declaration of ethertool related functions. */</div><div class='hunk'>@@ -15,5 +12,14 @@</div><div class='ctx'> #include "aq_common.h"</div><div class='ctx'> </div><div class='ctx'> extern const struct ethtool_ops aq_ethtool_ops;</div><div class='add'>+#define AQ_PRIV_FLAGS_MASK   (AQ_HW_LOOPBACK_MASK)</div><div class='add'>+</div><div class='add'>+#define SFF_8472_ID_ADDR 0x50</div><div class='add'>+#define SFF_8472_DIAGNOSTICS_ADDR 0x51</div><div class='add'>+</div><div class='add'>+#define SFF_8472_COMP_ADDR	0x5e</div><div class='add'>+#define SFF_8472_DOM_TYPE_ADDR	0x5c</div><div class='add'>+</div><div class='add'>+#define SFF_8472_ADDRESS_CHANGE_REQ_MASK 0x4</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_ETHTOOL_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.c b/drivers/net/ethernet/aquantia/atlantic/aq_filters.c<br/>index 18bc035da850..30a573db02bb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_filters.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_filters.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_filters.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_filters.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/* Copyright (C) 2014-2017 aQuantia Corporation. */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2014-2019 aQuantia Corporation. */</div><div class='ctx'> </div><div class='ctx'> /* File aq_filters.c: RX filters related functions. */</div><div class='ctx'> </div><div class='hunk'>@@ -89,12 +89,14 @@ static int aq_check_approve_fl3l4(struct aq_nic_s *aq_nic,</div><div class='ctx'> 				  struct aq_hw_rx_fltrs_s *rx_fltrs,</div><div class='ctx'> 				  struct ethtool_rx_flow_spec *fsp)</div><div class='ctx'> {</div><div class='add'>+	u32 last_location = AQ_RX_LAST_LOC_FL3L4 -</div><div class='add'>+			    aq_nic-&gt;aq_hw_rx_fltrs.fl3l4.reserved_count;</div><div class='add'>+</div><div class='ctx'> 	if (fsp-&gt;location &lt; AQ_RX_FIRST_LOC_FL3L4 ||</div><div class='del'>-	    fsp-&gt;location &gt; AQ_RX_LAST_LOC_FL3L4) {</div><div class='add'>+	    fsp-&gt;location &gt; last_location) {</div><div class='ctx'> 		netdev_err(aq_nic-&gt;ndev,</div><div class='ctx'> 			   "ethtool: location must be in range [%d, %d]",</div><div class='del'>-			   AQ_RX_FIRST_LOC_FL3L4,</div><div class='del'>-			   AQ_RX_LAST_LOC_FL3L4);</div><div class='add'>+			   AQ_RX_FIRST_LOC_FL3L4, last_location);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rx_fltrs-&gt;fl3l4.is_ipv6 &amp;&amp; rx_fltrs-&gt;fl3l4.active_ipv4) {</div><div class='hunk'>@@ -124,12 +126,15 @@ aq_check_approve_fl2(struct aq_nic_s *aq_nic,</div><div class='ctx'> 		     struct aq_hw_rx_fltrs_s *rx_fltrs,</div><div class='ctx'> 		     struct ethtool_rx_flow_spec *fsp)</div><div class='ctx'> {</div><div class='add'>+	u32 last_location = AQ_RX_LAST_LOC_FETHERT -</div><div class='add'>+			    aq_nic-&gt;aq_hw_rx_fltrs.fet_reserved_count;</div><div class='add'>+</div><div class='ctx'> 	if (fsp-&gt;location &lt; AQ_RX_FIRST_LOC_FETHERT ||</div><div class='del'>-	    fsp-&gt;location &gt; AQ_RX_LAST_LOC_FETHERT) {</div><div class='add'>+	    fsp-&gt;location &gt; last_location) {</div><div class='ctx'> 		netdev_err(aq_nic-&gt;ndev,</div><div class='ctx'> 			   "ethtool: location must be in range [%d, %d]",</div><div class='ctx'> 			   AQ_RX_FIRST_LOC_FETHERT,</div><div class='del'>-			   AQ_RX_LAST_LOC_FETHERT);</div><div class='add'>+			   last_location);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -148,6 +153,8 @@ aq_check_approve_fvlan(struct aq_nic_s *aq_nic,</div><div class='ctx'> 		       struct aq_hw_rx_fltrs_s *rx_fltrs,</div><div class='ctx'> 		       struct ethtool_rx_flow_spec *fsp)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;aq_nic-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='ctx'> 	if (fsp-&gt;location &lt; AQ_RX_FIRST_LOC_FVLANID ||</div><div class='ctx'> 	    fsp-&gt;location &gt; AQ_RX_LAST_LOC_FVLANID) {</div><div class='ctx'> 		netdev_err(aq_nic-&gt;ndev,</div><div class='hunk'>@@ -158,17 +165,17 @@ aq_check_approve_fvlan(struct aq_nic_s *aq_nic,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((aq_nic-&gt;ndev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER) &amp;&amp;</div><div class='del'>-	    (!test_bit(be16_to_cpu(fsp-&gt;h_ext.vlan_tci),</div><div class='add'>+	    (!test_bit(be16_to_cpu(fsp-&gt;h_ext.vlan_tci) &amp; VLAN_VID_MASK,</div><div class='ctx'> 		       aq_nic-&gt;active_vlans))) {</div><div class='ctx'> 		netdev_err(aq_nic-&gt;ndev,</div><div class='ctx'> 			   "ethtool: unknown vlan-id specified");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fsp-&gt;ring_cookie &gt; aq_nic-&gt;aq_nic_cfg.num_rss_queues) {</div><div class='add'>+	if (fsp-&gt;ring_cookie &gt; cfg-&gt;num_rss_queues * cfg-&gt;tcs) {</div><div class='ctx'> 		netdev_err(aq_nic-&gt;ndev,</div><div class='ctx'> 			   "ethtool: queue number must be in range [0, %d]",</div><div class='del'>-			   aq_nic-&gt;aq_nic_cfg.num_rss_queues - 1);</div><div class='add'>+			   cfg-&gt;num_rss_queues * cfg-&gt;tcs - 1);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -257,6 +264,7 @@ static bool __must_check</div><div class='ctx'> aq_rule_is_not_correct(struct aq_nic_s *aq_nic,</div><div class='ctx'> 		       struct ethtool_rx_flow_spec *fsp)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;aq_nic-&gt;aq_nic_cfg;</div><div class='ctx'> 	bool rule_is_not_correct = false;</div><div class='ctx'> </div><div class='ctx'> 	if (!aq_nic) {</div><div class='hunk'>@@ -269,11 +277,11 @@ aq_rule_is_not_correct(struct aq_nic_s *aq_nic,</div><div class='ctx'> 	} else if (aq_check_filter(aq_nic, fsp)) {</div><div class='ctx'> 		rule_is_not_correct = true;</div><div class='ctx'> 	} else if (fsp-&gt;ring_cookie != RX_CLS_FLOW_DISC) {</div><div class='del'>-		if (fsp-&gt;ring_cookie &gt;= aq_nic-&gt;aq_nic_cfg.num_rss_queues) {</div><div class='add'>+		if (fsp-&gt;ring_cookie &gt;= cfg-&gt;num_rss_queues * cfg-&gt;tcs) {</div><div class='ctx'> 			netdev_err(aq_nic-&gt;ndev,</div><div class='ctx'> 				   "ethtool: The specified action is invalid.\n"</div><div class='ctx'> 				   "Maximum allowable value action is %u.\n",</div><div class='del'>-				   aq_nic-&gt;aq_nic_cfg.num_rss_queues - 1);</div><div class='add'>+				   cfg-&gt;num_rss_queues * cfg-&gt;tcs - 1);</div><div class='ctx'> 			rule_is_not_correct = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -431,7 +439,8 @@ int aq_del_fvlan_by_vlan(struct aq_nic_s *aq_nic, u16 vlan_id)</div><div class='ctx'> 		if (be16_to_cpu(rule-&gt;aq_fsp.h_ext.vlan_tci) == vlan_id)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	if (rule &amp;&amp; be16_to_cpu(rule-&gt;aq_fsp.h_ext.vlan_tci) == vlan_id) {</div><div class='add'>+	if (rule &amp;&amp; rule-&gt;type == aq_rx_filter_vlan &amp;&amp;</div><div class='add'>+	    be16_to_cpu(rule-&gt;aq_fsp.h_ext.vlan_tci) == vlan_id) {</div><div class='ctx'> 		struct ethtool_rxnfc cmd;</div><div class='ctx'> </div><div class='ctx'> 		cmd.fs.location = rule-&gt;aq_fsp.location;</div><div class='hunk'>@@ -817,7 +826,6 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic)</div><div class='ctx'> 	struct aq_hw_s *aq_hw = aq_nic-&gt;aq_hw;</div><div class='ctx'> 	int hweight = 0;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!aq_hw_ops-&gt;hw_filter_vlan_set))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -828,8 +836,7 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic)</div><div class='ctx'> 			 aq_nic-&gt;aq_hw_rx_fltrs.fl2.aq_vlans);</div><div class='ctx'> </div><div class='ctx'> 	if (aq_nic-&gt;ndev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER) {</div><div class='del'>-		for (i = 0; i &lt; BITS_TO_LONGS(VLAN_N_VID); i++)</div><div class='del'>-			hweight += hweight_long(aq_nic-&gt;active_vlans[i]);</div><div class='add'>+		hweight = bitmap_weight(aq_nic-&gt;active_vlans, VLAN_N_VID);</div><div class='ctx'> </div><div class='ctx'> 		err = aq_hw_ops-&gt;hw_filter_vlan_ctrl(aq_hw, false);</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -843,9 +850,14 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (aq_nic-&gt;ndev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_FILTER) {</div><div class='del'>-		if (hweight &lt; AQ_VLAN_MAX_FILTERS)</div><div class='del'>-			err = aq_hw_ops-&gt;hw_filter_vlan_ctrl(aq_hw, true);</div><div class='add'>+		if (hweight &lt;= AQ_VLAN_MAX_FILTERS &amp;&amp; hweight &gt; 0) {</div><div class='add'>+			err = aq_hw_ops-&gt;hw_filter_vlan_ctrl(aq_hw,</div><div class='add'>+				!(aq_nic-&gt;packet_filter &amp; IFF_PROMISC));</div><div class='add'>+			aq_nic-&gt;aq_nic_cfg.is_vlan_force_promisc = false;</div><div class='add'>+		} else {</div><div class='ctx'> 		/* otherwise left in promiscue mode */</div><div class='add'>+			aq_nic-&gt;aq_nic_cfg.is_vlan_force_promisc = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -857,7 +869,7 @@ int aq_filters_vlan_offload_off(struct aq_nic_s *aq_nic)</div><div class='ctx'> 	struct aq_hw_s *aq_hw = aq_nic-&gt;aq_hw;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	memset(aq_nic-&gt;active_vlans, 0, sizeof(aq_nic-&gt;active_vlans));</div><div class='add'>+	bitmap_zero(aq_nic-&gt;active_vlans, VLAN_N_VID);</div><div class='ctx'> 	aq_fvlan_rebuild(aq_nic, aq_nic-&gt;active_vlans,</div><div class='ctx'> 			 aq_nic-&gt;aq_hw_rx_fltrs.fl2.aq_vlans);</div><div class='ctx'> </div><div class='hunk'>@@ -866,6 +878,7 @@ int aq_filters_vlan_offload_off(struct aq_nic_s *aq_nic)</div><div class='ctx'> 	if (unlikely(!aq_hw_ops-&gt;hw_filter_vlan_ctrl))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	aq_nic-&gt;aq_nic_cfg.is_vlan_force_promisc = true;</div><div class='ctx'> 	err = aq_hw_ops-&gt;hw_filter_vlan_ctrl(aq_hw, false);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_filters.h b/drivers/net/ethernet/aquantia/atlantic/aq_filters.h<br/>index c6a08c6585d5..122e06c88a33 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_filters.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_filters.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_filters.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_filters.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0-or-later */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /* Copyright (C) 2014-2017 aQuantia Corporation. */</div><div class='ctx'> </div><div class='ctx'> /* File aq_filters.h: RX filters related functions. */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h<br/>index 95fd6c852a9d..4e66fd9b2ab1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_hw.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_hw.h: Declaration of abstract interface for NIC hardware specific</div><div class='hunk'>@@ -18,6 +16,15 @@</div><div class='ctx'> #include "aq_rss.h"</div><div class='ctx'> #include "hw_atl/hw_atl_utils.h"</div><div class='ctx'> </div><div class='add'>+#define AQ_HW_MAC_COUNTER_HZ   312500000ll</div><div class='add'>+#define AQ_HW_PHY_COUNTER_HZ   160000000ll</div><div class='add'>+</div><div class='add'>+enum aq_tc_mode {</div><div class='add'>+	AQ_TC_MODE_INVALID = -1,</div><div class='add'>+	AQ_TC_MODE_8TCS,</div><div class='add'>+	AQ_TC_MODE_4TCS,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define AQ_RX_FIRST_LOC_FVLANID     0U</div><div class='ctx'> #define AQ_RX_LAST_LOC_FVLANID	   15U</div><div class='ctx'> #define AQ_RX_FIRST_LOC_FETHERT    16U</div><div class='hunk'>@@ -29,6 +36,11 @@</div><div class='ctx'> 			(AQ_RX_LAST_LOC_FVLANID - AQ_RX_FIRST_LOC_FVLANID + 1U)</div><div class='ctx'> #define AQ_RX_QUEUE_NOT_ASSIGNED   0xFFU</div><div class='ctx'> </div><div class='add'>+#define AQ_FRAC_PER_NS 0x100000000LL</div><div class='add'>+</div><div class='add'>+/* Used for rate to Mbps conversion */</div><div class='add'>+#define AQ_MBPS_DIVISOR         125000 /* 1000000 / 8 */</div><div class='add'>+</div><div class='ctx'> /* NIC H/W capabilities */</div><div class='ctx'> struct aq_hw_caps_s {</div><div class='ctx'> 	u64 hw_features;</div><div class='hunk'>@@ -46,7 +58,7 @@ struct aq_hw_caps_s {</div><div class='ctx'> 	u32 mac_regs_count;</div><div class='ctx'> 	u32 hw_alive_check_addr;</div><div class='ctx'> 	u8 msix_irqs;</div><div class='del'>-	u8 tcs;</div><div class='add'>+	u8 tcs_max;</div><div class='ctx'> 	u8 rxd_alignment;</div><div class='ctx'> 	u8 rxd_size;</div><div class='ctx'> 	u8 txd_alignment;</div><div class='hunk'>@@ -55,13 +67,21 @@ struct aq_hw_caps_s {</div><div class='ctx'> 	u8 rx_rings;</div><div class='ctx'> 	bool flow_control;</div><div class='ctx'> 	bool is_64_dma;</div><div class='add'>+	bool op64bit;</div><div class='add'>+	u32 quirks;</div><div class='add'>+	u32 priv_data_len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_hw_link_status_s {</div><div class='ctx'> 	unsigned int mbps;</div><div class='add'>+	bool full_duplex;</div><div class='add'>+	u32 lp_link_speed_msk;</div><div class='add'>+	u32 lp_flow_control;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_stats_s {</div><div class='add'>+	u64 brc;</div><div class='add'>+	u64 btc;</div><div class='ctx'> 	u64 uprc;</div><div class='ctx'> 	u64 mprc;</div><div class='ctx'> 	u64 bprc;</div><div class='hunk'>@@ -84,7 +104,7 @@ struct aq_stats_s {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define AQ_HW_IRQ_INVALID 0U</div><div class='del'>-#define AQ_HW_IRQ_LEGACY  1U</div><div class='add'>+#define AQ_HW_IRQ_INTX	  1U</div><div class='ctx'> #define AQ_HW_IRQ_MSI     2U</div><div class='ctx'> #define AQ_HW_IRQ_MSIX    3U</div><div class='ctx'> </div><div class='hunk'>@@ -93,10 +113,13 @@ struct aq_stats_s {</div><div class='ctx'> #define AQ_HW_POWER_STATE_D0   0U</div><div class='ctx'> #define AQ_HW_POWER_STATE_D3   3U</div><div class='ctx'> </div><div class='add'>+#define	AQ_FW_WAKE_ON_LINK_RTPM BIT(10)</div><div class='add'>+</div><div class='ctx'> #define AQ_HW_FLAG_STARTED     0x00000004U</div><div class='ctx'> #define AQ_HW_FLAG_STOPPING    0x00000008U</div><div class='ctx'> #define AQ_HW_FLAG_RESETTING   0x00000010U</div><div class='ctx'> #define AQ_HW_FLAG_CLOSING     0x00000020U</div><div class='add'>+#define AQ_HW_PTP_AVAILABLE    0x01000000U</div><div class='ctx'> #define AQ_HW_LINK_DOWN        0x04000000U</div><div class='ctx'> #define AQ_HW_FLAG_ERR_UNPLUG  0x40000000U</div><div class='ctx'> #define AQ_HW_FLAG_ERR_HW      0x80000000U</div><div class='hunk'>@@ -116,8 +139,43 @@ struct aq_stats_s {</div><div class='ctx'> #define AQ_HW_TXD_MULTIPLE 8U</div><div class='ctx'> #define AQ_HW_RXD_MULTIPLE 8U</div><div class='ctx'> </div><div class='add'>+#define AQ_HW_QUEUES_MAX                32U</div><div class='ctx'> #define AQ_HW_MULTICAST_ADDRESS_MAX     32U</div><div class='ctx'> </div><div class='add'>+#define AQ_HW_PTP_TC                    2U</div><div class='add'>+</div><div class='add'>+#define AQ_HW_LED_BLINK    0x2U</div><div class='add'>+#define AQ_HW_LED_DEFAULT  0x0U</div><div class='add'>+</div><div class='add'>+#define AQ_HW_MEDIA_DETECT_CNT 6000</div><div class='add'>+</div><div class='add'>+enum aq_priv_flags {</div><div class='add'>+	AQ_HW_LOOPBACK_DMA_SYS,</div><div class='add'>+	AQ_HW_LOOPBACK_PKT_SYS,</div><div class='add'>+	AQ_HW_LOOPBACK_DMA_NET,</div><div class='add'>+	AQ_HW_LOOPBACK_PHYINT_SYS,</div><div class='add'>+	AQ_HW_LOOPBACK_PHYEXT_SYS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define AQ_HW_LOOPBACK_MASK	(BIT(AQ_HW_LOOPBACK_DMA_SYS) |\</div><div class='add'>+				 BIT(AQ_HW_LOOPBACK_PKT_SYS) |\</div><div class='add'>+				 BIT(AQ_HW_LOOPBACK_DMA_NET) |\</div><div class='add'>+				 BIT(AQ_HW_LOOPBACK_PHYINT_SYS) |\</div><div class='add'>+				 BIT(AQ_HW_LOOPBACK_PHYEXT_SYS))</div><div class='add'>+</div><div class='add'>+#define ATL_HW_CHIP_MIPS         0x00000001U</div><div class='add'>+#define ATL_HW_CHIP_TPO2         0x00000002U</div><div class='add'>+#define ATL_HW_CHIP_RPF2         0x00000004U</div><div class='add'>+#define ATL_HW_CHIP_MPI_AQ       0x00000010U</div><div class='add'>+#define ATL_HW_CHIP_ATLANTIC     0x00800000U</div><div class='add'>+#define ATL_HW_CHIP_REVISION_A0  0x01000000U</div><div class='add'>+#define ATL_HW_CHIP_REVISION_B0  0x02000000U</div><div class='add'>+#define ATL_HW_CHIP_REVISION_B1  0x04000000U</div><div class='add'>+#define ATL_HW_CHIP_ANTIGUA      0x08000000U</div><div class='add'>+</div><div class='add'>+#define ATL_HW_IS_CHIP_FEATURE(_HW_, _F_) (!!(ATL_HW_CHIP_##_F_ &amp; \</div><div class='add'>+	(_HW_)-&gt;chip_features))</div><div class='add'>+</div><div class='ctx'> struct aq_hw_s {</div><div class='ctx'> 	atomic_t flags;</div><div class='ctx'> 	u8 rbl_enabled:1;</div><div class='hunk'>@@ -136,8 +194,12 @@ struct aq_hw_s {</div><div class='ctx'> 	atomic_t dpc;</div><div class='ctx'> 	u32 mbox_addr;</div><div class='ctx'> 	u32 rpc_addr;</div><div class='add'>+	u32 settings_addr;</div><div class='ctx'> 	u32 rpc_tid;</div><div class='ctx'> 	struct hw_atl_utils_fw_rpc rpc;</div><div class='add'>+	s64 ptp_clk_offset;</div><div class='add'>+	u16 phy_id;</div><div class='add'>+	void *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_ring_s;</div><div class='hunk'>@@ -159,11 +221,16 @@ struct aq_hw_ops {</div><div class='ctx'> 	int (*hw_ring_tx_head_update)(struct aq_hw_s *self,</div><div class='ctx'> 				      struct aq_ring_s *aq_ring);</div><div class='ctx'> </div><div class='del'>-	int (*hw_set_mac_address)(struct aq_hw_s *self, u8 *mac_addr);</div><div class='add'>+	int (*hw_set_mac_address)(struct aq_hw_s *self, const u8 *mac_addr);</div><div class='add'>+</div><div class='add'>+	int (*hw_soft_reset)(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+	int (*hw_prepare)(struct aq_hw_s *self,</div><div class='add'>+			  const struct aq_fw_ops **fw_ops);</div><div class='ctx'> </div><div class='ctx'> 	int (*hw_reset)(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='del'>-	int (*hw_init)(struct aq_hw_s *self, u8 *mac_addr);</div><div class='add'>+	int (*hw_init)(struct aq_hw_s *self, const u8 *mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	int (*hw_start)(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='hunk'>@@ -227,18 +294,57 @@ struct aq_hw_ops {</div><div class='ctx'> 	int (*hw_rss_hash_set)(struct aq_hw_s *self,</div><div class='ctx'> 			       struct aq_rss_parameters *rss_params);</div><div class='ctx'> </div><div class='add'>+	int (*hw_tc_rate_limit_set)(struct aq_hw_s *self);</div><div class='add'>+</div><div class='ctx'> 	int (*hw_get_regs)(struct aq_hw_s *self,</div><div class='ctx'> 			   const struct aq_hw_caps_s *aq_hw_caps,</div><div class='ctx'> 			   u32 *regs_buff);</div><div class='ctx'> </div><div class='ctx'> 	struct aq_stats_s *(*hw_get_hw_stats)(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='del'>-	int (*hw_get_fw_version)(struct aq_hw_s *self, u32 *fw_version);</div><div class='add'>+	u32 (*hw_get_fw_version)(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='ctx'> 	int (*hw_set_offload)(struct aq_hw_s *self,</div><div class='ctx'> 			      struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='ctx'> </div><div class='add'>+	int (*hw_ring_hwts_rx_fill)(struct aq_hw_s *self,</div><div class='add'>+				    struct aq_ring_s *aq_ring);</div><div class='add'>+</div><div class='add'>+	int (*hw_ring_hwts_rx_receive)(struct aq_hw_s *self,</div><div class='add'>+				       struct aq_ring_s *ring);</div><div class='add'>+</div><div class='add'>+	void (*hw_get_ptp_ts)(struct aq_hw_s *self, u64 *stamp);</div><div class='add'>+</div><div class='add'>+	int (*hw_adj_clock_freq)(struct aq_hw_s *self, s32 delta);</div><div class='add'>+</div><div class='add'>+	int (*hw_adj_sys_clock)(struct aq_hw_s *self, s64 delta);</div><div class='add'>+</div><div class='add'>+	int (*hw_set_sys_clock)(struct aq_hw_s *self, u64 time, u64 ts);</div><div class='add'>+</div><div class='add'>+	int (*hw_ts_to_sys_clock)(struct aq_hw_s *self, u64 ts, u64 *time);</div><div class='add'>+</div><div class='add'>+	int (*hw_gpio_pulse)(struct aq_hw_s *self, u32 index, u64 start,</div><div class='add'>+			     u32 period);</div><div class='add'>+</div><div class='add'>+	int (*hw_extts_gpio_enable)(struct aq_hw_s *self, u32 index,</div><div class='add'>+				    u32 enable);</div><div class='add'>+</div><div class='add'>+	int (*hw_get_sync_ts)(struct aq_hw_s *self, u64 *ts);</div><div class='add'>+</div><div class='add'>+	u16 (*rx_extract_ts)(struct aq_hw_s *self, u8 *p, unsigned int len,</div><div class='add'>+			     u64 *timestamp);</div><div class='add'>+</div><div class='add'>+	int (*extract_hwts)(struct aq_hw_s *self, u8 *p, unsigned int len,</div><div class='add'>+			    u64 *timestamp);</div><div class='add'>+</div><div class='ctx'> 	int (*hw_set_fc)(struct aq_hw_s *self, u32 fc, u32 tc);</div><div class='add'>+</div><div class='add'>+	int (*hw_set_loopback)(struct aq_hw_s *self, u32 mode, bool enable);</div><div class='add'>+</div><div class='add'>+	int (*hw_get_mac_temp)(struct aq_hw_s *self, u32 *temp);</div><div class='add'>+</div><div class='add'>+	int (*hw_read_module_eeprom)(struct aq_hw_s *self, u8 dev_addr,</div><div class='add'>+				     u8 reg_start_addr, int len, u8 *data);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_fw_ops {</div><div class='hunk'>@@ -261,19 +367,43 @@ struct aq_fw_ops {</div><div class='ctx'> </div><div class='ctx'> 	int (*update_stats)(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='add'>+	int (*get_mac_temp)(struct aq_hw_s *self, int *temp);</div><div class='add'>+</div><div class='ctx'> 	int (*get_phy_temp)(struct aq_hw_s *self, int *temp);</div><div class='ctx'> </div><div class='ctx'> 	u32 (*get_flow_control)(struct aq_hw_s *self, u32 *fcmode);</div><div class='ctx'> </div><div class='ctx'> 	int (*set_flow_control)(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='add'>+	int (*led_control)(struct aq_hw_s *self, u32 mode);</div><div class='add'>+</div><div class='add'>+	int (*set_phyloopback)(struct aq_hw_s *self, u32 mode, bool enable);</div><div class='add'>+</div><div class='ctx'> 	int (*set_power)(struct aq_hw_s *self, unsigned int power_state,</div><div class='del'>-			 u8 *mac);</div><div class='add'>+			 const u8 *mac);</div><div class='add'>+</div><div class='add'>+	int (*send_fw_request)(struct aq_hw_s *self,</div><div class='add'>+			       const struct hw_fw_request_iface *fw_req,</div><div class='add'>+			       size_t size);</div><div class='add'>+</div><div class='add'>+	void (*enable_ptp)(struct aq_hw_s *self, int enable);</div><div class='add'>+</div><div class='add'>+	void (*adjust_ptp)(struct aq_hw_s *self, uint64_t adj);</div><div class='ctx'> </div><div class='ctx'> 	int (*set_eee_rate)(struct aq_hw_s *self, u32 speed);</div><div class='ctx'> </div><div class='ctx'> 	int (*get_eee_rate)(struct aq_hw_s *self, u32 *rate,</div><div class='ctx'> 			    u32 *supported_rates);</div><div class='add'>+</div><div class='add'>+	int (*set_downshift)(struct aq_hw_s *self, u32 counter);</div><div class='add'>+</div><div class='add'>+	int (*set_media_detect)(struct aq_hw_s *self, bool enable);</div><div class='add'>+</div><div class='add'>+	u32 (*get_link_capabilities)(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+	int (*send_macsec_req)(struct aq_hw_s *self,</div><div class='add'>+			       struct macsec_msg_fw_request *msg,</div><div class='add'>+			       struct macsec_msg_fw_response *resp);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_HW_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c b/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c<br/>index 22a1c784dc9c..18b08277d2e1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_hw_utils.c: Definitions of helper functions used across</div><div class='hunk'>@@ -12,8 +10,12 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "aq_hw_utils.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "aq_hw.h"</div><div class='ctx'> #include "aq_nic.h"</div><div class='add'>+#include "hw_atl/hw_atl_llh.h"</div><div class='ctx'> </div><div class='ctx'> void aq_hw_write_reg_bit(struct aq_hw_s *aq_hw, u32 addr, u32 msk,</div><div class='ctx'> 			 u32 shift, u32 val)</div><div class='hunk'>@@ -40,9 +42,8 @@ u32 aq_hw_read_reg(struct aq_hw_s *hw, u32 reg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 value = readl(hw-&gt;mmio + reg);</div><div class='ctx'> </div><div class='del'>-	if ((~0U) == value &amp;&amp;</div><div class='del'>-	    (~0U) == readl(hw-&gt;mmio +</div><div class='del'>-			   hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;hw_alive_check_addr))</div><div class='add'>+	if (value == U32_MAX &amp;&amp;</div><div class='add'>+	    readl(hw-&gt;mmio + hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;hw_alive_check_addr) == U32_MAX)</div><div class='ctx'> 		aq_utils_obj_set(&amp;hw-&gt;flags, AQ_HW_FLAG_ERR_UNPLUG);</div><div class='ctx'> </div><div class='ctx'> 	return value;</div><div class='hunk'>@@ -59,12 +60,49 @@ void aq_hw_write_reg(struct aq_hw_s *hw, u32 reg, u32 value)</div><div class='ctx'>  */</div><div class='ctx'> u64 aq_hw_read_reg64(struct aq_hw_s *hw, u32 reg)</div><div class='ctx'> {</div><div class='del'>-	u64 value = aq_hw_read_reg(hw, reg);</div><div class='add'>+	u64 value = U64_MAX;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;op64bit)</div><div class='add'>+		value = readq(hw-&gt;mmio + reg);</div><div class='add'>+	else</div><div class='add'>+		value = lo_hi_readq(hw-&gt;mmio + reg);</div><div class='add'>+</div><div class='add'>+	if (value == U64_MAX &amp;&amp;</div><div class='add'>+	    readl(hw-&gt;mmio + hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;hw_alive_check_addr) == U32_MAX)</div><div class='add'>+		aq_utils_obj_set(&amp;hw-&gt;flags, AQ_HW_FLAG_ERR_UNPLUG);</div><div class='ctx'> </div><div class='del'>-	value |= (u64)aq_hw_read_reg(hw, reg + 4) &lt;&lt; 32;</div><div class='ctx'> 	return value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void aq_hw_write_reg64(struct aq_hw_s *hw, u32 reg, u64 value)</div><div class='add'>+{</div><div class='add'>+	if (hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;op64bit)</div><div class='add'>+		writeq(value, hw-&gt;mmio + reg);</div><div class='add'>+	else</div><div class='add'>+		lo_hi_writeq(value, hw-&gt;mmio + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_hw_invalidate_descriptor_cache(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Invalidate Descriptor Cache to prevent writing to the cached</div><div class='add'>+	 * descriptors and to the data pointer of those descriptors</div><div class='add'>+	 */</div><div class='add'>+	hw_atl_rdm_rx_dma_desc_cache_init_tgl(hw);</div><div class='add'>+</div><div class='add'>+	err = aq_hw_err_from_flags(hw);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	readx_poll_timeout_atomic(hw_atl_rdm_rx_dma_desc_cache_init_done_get,</div><div class='add'>+				  hw, val, val == 1, 1000U, 10000U);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int aq_hw_err_from_flags(struct aq_hw_s *hw)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -81,3 +119,29 @@ int aq_hw_err_from_flags(struct aq_hw_s *hw)</div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+int aq_hw_num_tcs(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	switch (hw-&gt;aq_nic_cfg-&gt;tc_mode) {</div><div class='add'>+	case AQ_TC_MODE_8TCS:</div><div class='add'>+		return 8;</div><div class='add'>+	case AQ_TC_MODE_4TCS:</div><div class='add'>+		return 4;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_hw_q_per_tc(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	switch (hw-&gt;aq_nic_cfg-&gt;tc_mode) {</div><div class='add'>+	case AQ_TC_MODE_8TCS:</div><div class='add'>+		return 4;</div><div class='add'>+	case AQ_TC_MODE_4TCS:</div><div class='add'>+		return 8;</div><div class='add'>+	default:</div><div class='add'>+		return 4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h<br/>index bf73428ed689..d89c63d88e4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_hw_utils.h: Declaration of helper functions used across hardware</div><div class='hunk'>@@ -36,6 +34,10 @@ u32 aq_hw_read_reg_bit(struct aq_hw_s *aq_hw, u32 addr, u32 msk, u32 shift);</div><div class='ctx'> u32 aq_hw_read_reg(struct aq_hw_s *hw, u32 reg);</div><div class='ctx'> void aq_hw_write_reg(struct aq_hw_s *hw, u32 reg, u32 value);</div><div class='ctx'> u64 aq_hw_read_reg64(struct aq_hw_s *hw, u32 reg);</div><div class='add'>+void aq_hw_write_reg64(struct aq_hw_s *hw, u32 reg, u64 value);</div><div class='add'>+int aq_hw_invalidate_descriptor_cache(struct aq_hw_s *hw);</div><div class='ctx'> int aq_hw_err_from_flags(struct aq_hw_s *hw);</div><div class='add'>+int aq_hw_num_tcs(struct aq_hw_s *hw);</div><div class='add'>+int aq_hw_q_per_tc(struct aq_hw_s *hw);</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_HW_UTILS_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c<br/>new file mode 100644<br/>index 000000000000..6afff8af5e86<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_macsec.c</a></div><div class='hunk'>@@ -0,0 +1,1770 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "aq_macsec.h"</div><div class='add'>+#include "aq_nic.h"</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "macsec/macsec_api.h"</div><div class='add'>+#define AQ_MACSEC_KEY_LEN_128_BIT 16</div><div class='add'>+#define AQ_MACSEC_KEY_LEN_192_BIT 24</div><div class='add'>+#define AQ_MACSEC_KEY_LEN_256_BIT 32</div><div class='add'>+</div><div class='add'>+enum aq_clear_type {</div><div class='add'>+	/* update HW configuration */</div><div class='add'>+	AQ_CLEAR_HW = BIT(0),</div><div class='add'>+	/* update SW configuration (busy bits, pointers) */</div><div class='add'>+	AQ_CLEAR_SW = BIT(1),</div><div class='add'>+	/* update both HW and SW configuration */</div><div class='add'>+	AQ_CLEAR_ALL = AQ_CLEAR_HW | AQ_CLEAR_SW,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int aq_clear_txsc(struct aq_nic_s *nic, const int txsc_idx,</div><div class='add'>+			 enum aq_clear_type clear_type);</div><div class='add'>+static int aq_clear_txsa(struct aq_nic_s *nic, struct aq_macsec_txsc *aq_txsc,</div><div class='add'>+			 const int sa_num, enum aq_clear_type clear_type);</div><div class='add'>+static int aq_clear_rxsc(struct aq_nic_s *nic, const int rxsc_idx,</div><div class='add'>+			 enum aq_clear_type clear_type);</div><div class='add'>+static int aq_clear_rxsa(struct aq_nic_s *nic, struct aq_macsec_rxsc *aq_rxsc,</div><div class='add'>+			 const int sa_num, enum aq_clear_type clear_type);</div><div class='add'>+static int aq_clear_secy(struct aq_nic_s *nic, const struct macsec_secy *secy,</div><div class='add'>+			 enum aq_clear_type clear_type);</div><div class='add'>+static int aq_apply_macsec_cfg(struct aq_nic_s *nic);</div><div class='add'>+static int aq_apply_secy_cfg(struct aq_nic_s *nic,</div><div class='add'>+			     const struct macsec_secy *secy);</div><div class='add'>+</div><div class='add'>+static void aq_ether_addr_to_mac(u32 mac[2], const unsigned char *emac)</div><div class='add'>+{</div><div class='add'>+	u32 tmp[2] = { 0 };</div><div class='add'>+</div><div class='add'>+	memcpy(((u8 *)tmp) + 2, emac, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	mac[0] = swab32(tmp[1]);</div><div class='add'>+	mac[1] = swab32(tmp[0]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There's a 1:1 mapping between SecY and TX SC */</div><div class='add'>+static int aq_get_txsc_idx_from_secy(struct aq_macsec_cfg *macsec_cfg,</div><div class='add'>+				     const struct macsec_secy *secy)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!secy))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (macsec_cfg-&gt;aq_txsc[i].sw_secy == secy)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_rxsc_idx_from_rxsc(struct aq_macsec_cfg *macsec_cfg,</div><div class='add'>+				     const struct macsec_rx_sc *rxsc)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!rxsc))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (macsec_cfg-&gt;aq_rxsc[i].sw_rxsc == rxsc)</div><div class='add'>+			return i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_txsc_idx_from_sc_idx(const enum aq_macsec_sc_sa sc_sa,</div><div class='add'>+				       const int sc_idx)</div><div class='add'>+{</div><div class='add'>+	switch (sc_sa) {</div><div class='add'>+	case aq_macsec_sa_sc_4sa_8sc:</div><div class='add'>+		return sc_idx &gt;&gt; 2;</div><div class='add'>+	case aq_macsec_sa_sc_2sa_16sc:</div><div class='add'>+		return sc_idx &gt;&gt; 1;</div><div class='add'>+	case aq_macsec_sa_sc_1sa_32sc:</div><div class='add'>+		return sc_idx;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(true, "Invalid sc_sa");</div><div class='add'>+	}</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Rotate keys u32[8] */</div><div class='add'>+static void aq_rotate_keys(u32 (*key)[8], const int key_len)</div><div class='add'>+{</div><div class='add'>+	u32 tmp[8] = { 0 };</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;tmp, key, sizeof(tmp));</div><div class='add'>+	memset(*key, 0, sizeof(*key));</div><div class='add'>+</div><div class='add'>+	if (key_len == AQ_MACSEC_KEY_LEN_128_BIT) {</div><div class='add'>+		(*key)[0] = swab32(tmp[3]);</div><div class='add'>+		(*key)[1] = swab32(tmp[2]);</div><div class='add'>+		(*key)[2] = swab32(tmp[1]);</div><div class='add'>+		(*key)[3] = swab32(tmp[0]);</div><div class='add'>+	} else if (key_len == AQ_MACSEC_KEY_LEN_192_BIT) {</div><div class='add'>+		(*key)[0] = swab32(tmp[5]);</div><div class='add'>+		(*key)[1] = swab32(tmp[4]);</div><div class='add'>+		(*key)[2] = swab32(tmp[3]);</div><div class='add'>+		(*key)[3] = swab32(tmp[2]);</div><div class='add'>+		(*key)[4] = swab32(tmp[1]);</div><div class='add'>+		(*key)[5] = swab32(tmp[0]);</div><div class='add'>+	} else if (key_len == AQ_MACSEC_KEY_LEN_256_BIT) {</div><div class='add'>+		(*key)[0] = swab32(tmp[7]);</div><div class='add'>+		(*key)[1] = swab32(tmp[6]);</div><div class='add'>+		(*key)[2] = swab32(tmp[5]);</div><div class='add'>+		(*key)[3] = swab32(tmp[4]);</div><div class='add'>+		(*key)[4] = swab32(tmp[3]);</div><div class='add'>+		(*key)[5] = swab32(tmp[2]);</div><div class='add'>+		(*key)[6] = swab32(tmp[1]);</div><div class='add'>+		(*key)[7] = swab32(tmp[0]);</div><div class='add'>+	} else {</div><div class='add'>+		pr_warn("Rotate_keys: invalid key_len\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define STATS_2x32_TO_64(stat_field)                                           \</div><div class='add'>+	(((u64)stat_field[1] &lt;&lt; 32) | stat_field[0])</div><div class='add'>+</div><div class='add'>+static int aq_get_macsec_common_stats(struct aq_hw_s *hw,</div><div class='add'>+				      struct aq_macsec_common_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_ingress_common_counters ingress_counters;</div><div class='add'>+	struct aq_mss_egress_common_counters egress_counters;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* MACSEC counters */</div><div class='add'>+	ret = aq_mss_get_ingress_common_counters(hw, &amp;ingress_counters);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stats-&gt;in.ctl_pkts = STATS_2x32_TO_64(ingress_counters.ctl_pkts);</div><div class='add'>+	stats-&gt;in.tagged_miss_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.tagged_miss_pkts);</div><div class='add'>+	stats-&gt;in.untagged_miss_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.untagged_miss_pkts);</div><div class='add'>+	stats-&gt;in.notag_pkts = STATS_2x32_TO_64(ingress_counters.notag_pkts);</div><div class='add'>+	stats-&gt;in.untagged_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.untagged_pkts);</div><div class='add'>+	stats-&gt;in.bad_tag_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.bad_tag_pkts);</div><div class='add'>+	stats-&gt;in.no_sci_pkts = STATS_2x32_TO_64(ingress_counters.no_sci_pkts);</div><div class='add'>+	stats-&gt;in.unknown_sci_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.unknown_sci_pkts);</div><div class='add'>+	stats-&gt;in.ctrl_prt_pass_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.ctrl_prt_pass_pkts);</div><div class='add'>+	stats-&gt;in.unctrl_prt_pass_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.unctrl_prt_pass_pkts);</div><div class='add'>+	stats-&gt;in.ctrl_prt_fail_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.ctrl_prt_fail_pkts);</div><div class='add'>+	stats-&gt;in.unctrl_prt_fail_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.unctrl_prt_fail_pkts);</div><div class='add'>+	stats-&gt;in.too_long_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.too_long_pkts);</div><div class='add'>+	stats-&gt;in.igpoc_ctl_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.igpoc_ctl_pkts);</div><div class='add'>+	stats-&gt;in.ecc_error_pkts =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.ecc_error_pkts);</div><div class='add'>+	stats-&gt;in.unctrl_hit_drop_redir =</div><div class='add'>+		STATS_2x32_TO_64(ingress_counters.unctrl_hit_drop_redir);</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_egress_common_counters(hw, &amp;egress_counters);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	stats-&gt;out.ctl_pkts = STATS_2x32_TO_64(egress_counters.ctl_pkt);</div><div class='add'>+	stats-&gt;out.unknown_sa_pkts =</div><div class='add'>+		STATS_2x32_TO_64(egress_counters.unknown_sa_pkts);</div><div class='add'>+	stats-&gt;out.untagged_pkts =</div><div class='add'>+		STATS_2x32_TO_64(egress_counters.untagged_pkts);</div><div class='add'>+	stats-&gt;out.too_long = STATS_2x32_TO_64(egress_counters.too_long);</div><div class='add'>+	stats-&gt;out.ecc_error_pkts =</div><div class='add'>+		STATS_2x32_TO_64(egress_counters.ecc_error_pkts);</div><div class='add'>+	stats-&gt;out.unctrl_hit_drop_redir =</div><div class='add'>+		STATS_2x32_TO_64(egress_counters.unctrl_hit_drop_redir);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_rxsa_stats(struct aq_hw_s *hw, const int sa_idx,</div><div class='add'>+			     struct aq_macsec_rx_sa_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_ingress_sa_counters i_sa_counters;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_ingress_sa_counters(hw, &amp;i_sa_counters, sa_idx);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stats-&gt;untagged_hit_pkts =</div><div class='add'>+		STATS_2x32_TO_64(i_sa_counters.untagged_hit_pkts);</div><div class='add'>+	stats-&gt;ctrl_hit_drop_redir_pkts =</div><div class='add'>+		STATS_2x32_TO_64(i_sa_counters.ctrl_hit_drop_redir_pkts);</div><div class='add'>+	stats-&gt;not_using_sa = STATS_2x32_TO_64(i_sa_counters.not_using_sa);</div><div class='add'>+	stats-&gt;unused_sa = STATS_2x32_TO_64(i_sa_counters.unused_sa);</div><div class='add'>+	stats-&gt;not_valid_pkts = STATS_2x32_TO_64(i_sa_counters.not_valid_pkts);</div><div class='add'>+	stats-&gt;invalid_pkts = STATS_2x32_TO_64(i_sa_counters.invalid_pkts);</div><div class='add'>+	stats-&gt;ok_pkts = STATS_2x32_TO_64(i_sa_counters.ok_pkts);</div><div class='add'>+	stats-&gt;late_pkts = STATS_2x32_TO_64(i_sa_counters.late_pkts);</div><div class='add'>+	stats-&gt;delayed_pkts = STATS_2x32_TO_64(i_sa_counters.delayed_pkts);</div><div class='add'>+	stats-&gt;unchecked_pkts = STATS_2x32_TO_64(i_sa_counters.unchecked_pkts);</div><div class='add'>+	stats-&gt;validated_octets =</div><div class='add'>+		STATS_2x32_TO_64(i_sa_counters.validated_octets);</div><div class='add'>+	stats-&gt;decrypted_octets =</div><div class='add'>+		STATS_2x32_TO_64(i_sa_counters.decrypted_octets);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_txsa_stats(struct aq_hw_s *hw, const int sa_idx,</div><div class='add'>+			     struct aq_macsec_tx_sa_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_egress_sa_counters e_sa_counters;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_egress_sa_counters(hw, &amp;e_sa_counters, sa_idx);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stats-&gt;sa_hit_drop_redirect =</div><div class='add'>+		STATS_2x32_TO_64(e_sa_counters.sa_hit_drop_redirect);</div><div class='add'>+	stats-&gt;sa_protected2_pkts =</div><div class='add'>+		STATS_2x32_TO_64(e_sa_counters.sa_protected2_pkts);</div><div class='add'>+	stats-&gt;sa_protected_pkts =</div><div class='add'>+		STATS_2x32_TO_64(e_sa_counters.sa_protected_pkts);</div><div class='add'>+	stats-&gt;sa_encrypted_pkts =</div><div class='add'>+		STATS_2x32_TO_64(e_sa_counters.sa_encrypted_pkts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_txsa_next_pn(struct aq_hw_s *hw, const int sa_idx, u32 *pn)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_egress_sa_record sa_rec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_egress_sa_record(hw, &amp;sa_rec, sa_idx);</div><div class='add'>+	if (likely(!ret))</div><div class='add'>+		*pn = sa_rec.next_pn;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_rxsa_next_pn(struct aq_hw_s *hw, const int sa_idx, u32 *pn)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_ingress_sa_record sa_rec;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_ingress_sa_record(hw, &amp;sa_rec, sa_idx);</div><div class='add'>+	if (likely(!ret))</div><div class='add'>+		*pn = (!sa_rec.sat_nextpn) ? sa_rec.next_pn : 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_get_txsc_stats(struct aq_hw_s *hw, const int sc_idx,</div><div class='add'>+			     struct aq_macsec_tx_sc_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_egress_sc_counters e_sc_counters;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_egress_sc_counters(hw, &amp;e_sc_counters, sc_idx);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	stats-&gt;sc_protected_pkts =</div><div class='add'>+		STATS_2x32_TO_64(e_sc_counters.sc_protected_pkts);</div><div class='add'>+	stats-&gt;sc_encrypted_pkts =</div><div class='add'>+		STATS_2x32_TO_64(e_sc_counters.sc_encrypted_pkts);</div><div class='add'>+	stats-&gt;sc_protected_octets =</div><div class='add'>+		STATS_2x32_TO_64(e_sc_counters.sc_protected_octets);</div><div class='add'>+	stats-&gt;sc_encrypted_octets =</div><div class='add'>+		STATS_2x32_TO_64(e_sc_counters.sc_encrypted_octets);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_dev_open(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev))</div><div class='add'>+		ret = aq_apply_secy_cfg(nic, ctx-&gt;secy);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_dev_stop(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (nic-&gt;macsec_cfg-&gt;txsc_idx_busy &amp; BIT(i))</div><div class='add'>+			aq_clear_secy(nic, nic-&gt;macsec_cfg-&gt;aq_txsc[i].sw_secy,</div><div class='add'>+				      AQ_CLEAR_HW);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_set_txsc(struct aq_nic_s *nic, const int txsc_idx)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc = &amp;nic-&gt;macsec_cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	struct aq_mss_egress_class_record tx_class_rec = { 0 };</div><div class='add'>+	const struct macsec_secy *secy = aq_txsc-&gt;sw_secy;</div><div class='add'>+	struct aq_mss_egress_sc_record sc_rec = { 0 };</div><div class='add'>+	unsigned int sc_idx = aq_txsc-&gt;hw_sc_idx;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	aq_ether_addr_to_mac(tx_class_rec.mac_sa, secy-&gt;netdev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	put_unaligned_be64((__force u64)secy-&gt;sci, tx_class_rec.sci);</div><div class='add'>+	tx_class_rec.sci_mask = 0;</div><div class='add'>+</div><div class='add'>+	tx_class_rec.sa_mask = 0x3f;</div><div class='add'>+</div><div class='add'>+	tx_class_rec.action = 0; /* forward to SA/SC table */</div><div class='add'>+	tx_class_rec.valid = 1;</div><div class='add'>+</div><div class='add'>+	tx_class_rec.sc_idx = sc_idx;</div><div class='add'>+</div><div class='add'>+	tx_class_rec.sc_sa = nic-&gt;macsec_cfg-&gt;sc_sa;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_egress_class_record(hw, &amp;tx_class_rec, txsc_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	sc_rec.protect = secy-&gt;protect_frames;</div><div class='add'>+	if (secy-&gt;tx_sc.encrypt)</div><div class='add'>+		sc_rec.tci |= BIT(1);</div><div class='add'>+	if (secy-&gt;tx_sc.scb)</div><div class='add'>+		sc_rec.tci |= BIT(2);</div><div class='add'>+	if (secy-&gt;tx_sc.send_sci)</div><div class='add'>+		sc_rec.tci |= BIT(3);</div><div class='add'>+	if (secy-&gt;tx_sc.end_station)</div><div class='add'>+		sc_rec.tci |= BIT(4);</div><div class='add'>+	/* The C bit is clear if and only if the Secure Data is</div><div class='add'>+	 * exactly the same as the User Data and the ICV is 16 octets long.</div><div class='add'>+	 */</div><div class='add'>+	if (!(secy-&gt;icv_len == 16 &amp;&amp; !secy-&gt;tx_sc.encrypt))</div><div class='add'>+		sc_rec.tci |= BIT(0);</div><div class='add'>+</div><div class='add'>+	sc_rec.an_roll = 0;</div><div class='add'>+</div><div class='add'>+	switch (secy-&gt;key_len) {</div><div class='add'>+	case AQ_MACSEC_KEY_LEN_128_BIT:</div><div class='add'>+		sc_rec.sak_len = 0;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_MACSEC_KEY_LEN_192_BIT:</div><div class='add'>+		sc_rec.sak_len = 1;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_MACSEC_KEY_LEN_256_BIT:</div><div class='add'>+		sc_rec.sak_len = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(true, "Invalid sc_sa");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sc_rec.curr_an = secy-&gt;tx_sc.encoding_sa;</div><div class='add'>+	sc_rec.valid = 1;</div><div class='add'>+	sc_rec.fresh = 1;</div><div class='add'>+</div><div class='add'>+	return aq_mss_set_egress_sc_record(hw, &amp;sc_rec, sc_idx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 aq_sc_idx_max(const enum aq_macsec_sc_sa sc_sa)</div><div class='add'>+{</div><div class='add'>+	u32 result = 0;</div><div class='add'>+</div><div class='add'>+	switch (sc_sa) {</div><div class='add'>+	case aq_macsec_sa_sc_4sa_8sc:</div><div class='add'>+		result = 8;</div><div class='add'>+		break;</div><div class='add'>+	case aq_macsec_sa_sc_2sa_16sc:</div><div class='add'>+		result = 16;</div><div class='add'>+		break;</div><div class='add'>+	case aq_macsec_sa_sc_1sa_32sc:</div><div class='add'>+		result = 32;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 aq_to_hw_sc_idx(const u32 sc_idx, const enum aq_macsec_sc_sa sc_sa)</div><div class='add'>+{</div><div class='add'>+	switch (sc_sa) {</div><div class='add'>+	case aq_macsec_sa_sc_4sa_8sc:</div><div class='add'>+		return sc_idx &lt;&lt; 2;</div><div class='add'>+	case aq_macsec_sa_sc_2sa_16sc:</div><div class='add'>+		return sc_idx &lt;&lt; 1;</div><div class='add'>+	case aq_macsec_sa_sc_1sa_32sc:</div><div class='add'>+		return sc_idx;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(true, "Invalid sc_sa");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sc_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum aq_macsec_sc_sa sc_sa_from_num_an(const int num_an)</div><div class='add'>+{</div><div class='add'>+	enum aq_macsec_sc_sa sc_sa = aq_macsec_sa_sc_not_used;</div><div class='add'>+</div><div class='add'>+	switch (num_an) {</div><div class='add'>+	case 4:</div><div class='add'>+		sc_sa = aq_macsec_sa_sc_4sa_8sc;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		sc_sa = aq_macsec_sa_sc_2sa_16sc;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		sc_sa = aq_macsec_sa_sc_1sa_32sc;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return sc_sa;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_add_secy(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	const struct macsec_secy *secy = ctx-&gt;secy;</div><div class='add'>+	enum aq_macsec_sc_sa sc_sa;</div><div class='add'>+	u32 txsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (secy-&gt;xpn)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	sc_sa = sc_sa_from_num_an(MACSEC_NUM_AN);</div><div class='add'>+	if (sc_sa == aq_macsec_sa_sc_not_used)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (hweight32(cfg-&gt;txsc_idx_busy) &gt;= aq_sc_idx_max(sc_sa))</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	txsc_idx = ffz(cfg-&gt;txsc_idx_busy);</div><div class='add'>+	if (txsc_idx == AQ_MACSEC_MAX_SC)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;sc_sa = sc_sa;</div><div class='add'>+	cfg-&gt;aq_txsc[txsc_idx].hw_sc_idx = aq_to_hw_sc_idx(txsc_idx, sc_sa);</div><div class='add'>+	cfg-&gt;aq_txsc[txsc_idx].sw_secy = secy;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(secy-&gt;netdev))</div><div class='add'>+		ret = aq_set_txsc(nic, txsc_idx);</div><div class='add'>+</div><div class='add'>+	set_bit(txsc_idx, &amp;cfg-&gt;txsc_idx_busy);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_upd_secy(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	const struct macsec_secy *secy = ctx-&gt;secy;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(nic-&gt;macsec_cfg, secy);</div><div class='add'>+	if (txsc_idx &lt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(secy-&gt;netdev))</div><div class='add'>+		ret = aq_set_txsc(nic, txsc_idx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_clear_txsc(struct aq_nic_s *nic, const int txsc_idx,</div><div class='add'>+			 enum aq_clear_type clear_type)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_txsc *tx_sc = &amp;nic-&gt;macsec_cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	struct aq_mss_egress_class_record tx_class_rec = { 0 };</div><div class='add'>+	struct aq_mss_egress_sc_record sc_rec = { 0 };</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int sa_num;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit (sa_num, &amp;tx_sc-&gt;tx_sa_idx_busy, AQ_MACSEC_MAX_SA) {</div><div class='add'>+		ret = aq_clear_txsa(nic, tx_sc, sa_num, clear_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clear_type &amp; AQ_CLEAR_HW) {</div><div class='add'>+		ret = aq_mss_set_egress_class_record(hw, &amp;tx_class_rec,</div><div class='add'>+						     txsc_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		sc_rec.fresh = 1;</div><div class='add'>+		ret = aq_mss_set_egress_sc_record(hw, &amp;sc_rec,</div><div class='add'>+						  tx_sc-&gt;hw_sc_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clear_type &amp; AQ_CLEAR_SW) {</div><div class='add'>+		clear_bit(txsc_idx, &amp;nic-&gt;macsec_cfg-&gt;txsc_idx_busy);</div><div class='add'>+		nic-&gt;macsec_cfg-&gt;aq_txsc[txsc_idx].sw_secy = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_del_secy(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!nic-&gt;macsec_cfg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = aq_clear_secy(nic, ctx-&gt;secy, AQ_CLEAR_ALL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_update_txsa(struct aq_nic_s *nic, const unsigned int sc_idx,</div><div class='add'>+			  const struct macsec_secy *secy,</div><div class='add'>+			  const struct macsec_tx_sa *tx_sa,</div><div class='add'>+			  const unsigned char *key, const unsigned char an)</div><div class='add'>+{</div><div class='add'>+	const u32 next_pn = tx_sa-&gt;next_pn_halves.lower;</div><div class='add'>+	struct aq_mss_egress_sakey_record key_rec;</div><div class='add'>+	const unsigned int sa_idx = sc_idx | an;</div><div class='add'>+	struct aq_mss_egress_sa_record sa_rec;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sa_rec, 0, sizeof(sa_rec));</div><div class='add'>+	sa_rec.valid = tx_sa-&gt;active;</div><div class='add'>+	sa_rec.fresh = 1;</div><div class='add'>+	sa_rec.next_pn = next_pn;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_egress_sa_record(hw, &amp;sa_rec, sa_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!key)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;key_rec, 0, sizeof(key_rec));</div><div class='add'>+	memcpy(&amp;key_rec.key, key, secy-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	aq_rotate_keys(&amp;key_rec.key, secy-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_egress_sakey_record(hw, &amp;key_rec, sa_idx);</div><div class='add'>+</div><div class='add'>+	memzero_explicit(&amp;key_rec, sizeof(key_rec));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_add_txsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	const struct macsec_secy *secy = ctx-&gt;secy;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(cfg, secy);</div><div class='add'>+	if (txsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_txsc = &amp;cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	set_bit(ctx-&gt;sa.assoc_num, &amp;aq_txsc-&gt;tx_sa_idx_busy);</div><div class='add'>+</div><div class='add'>+	memcpy(aq_txsc-&gt;tx_sa_key[ctx-&gt;sa.assoc_num], ctx-&gt;sa.key,</div><div class='add'>+	       secy-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(secy-&gt;netdev))</div><div class='add'>+		ret = aq_update_txsa(nic, aq_txsc-&gt;hw_sc_idx, secy,</div><div class='add'>+				     ctx-&gt;sa.tx_sa, ctx-&gt;sa.key,</div><div class='add'>+				     ctx-&gt;sa.assoc_num);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_upd_txsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	const struct macsec_secy *secy = ctx-&gt;secy;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(cfg, secy);</div><div class='add'>+	if (txsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_txsc = &amp;cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(secy-&gt;netdev))</div><div class='add'>+		ret = aq_update_txsa(nic, aq_txsc-&gt;hw_sc_idx, secy,</div><div class='add'>+				     ctx-&gt;sa.tx_sa, NULL, ctx-&gt;sa.assoc_num);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_clear_txsa(struct aq_nic_s *nic, struct aq_macsec_txsc *aq_txsc,</div><div class='add'>+			 const int sa_num, enum aq_clear_type clear_type)</div><div class='add'>+{</div><div class='add'>+	const int sa_idx = aq_txsc-&gt;hw_sc_idx | sa_num;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (clear_type &amp; AQ_CLEAR_SW)</div><div class='add'>+		clear_bit(sa_num, &amp;aq_txsc-&gt;tx_sa_idx_busy);</div><div class='add'>+</div><div class='add'>+	if ((clear_type &amp; AQ_CLEAR_HW) &amp;&amp; netif_carrier_ok(nic-&gt;ndev)) {</div><div class='add'>+		struct aq_mss_egress_sakey_record key_rec;</div><div class='add'>+		struct aq_mss_egress_sa_record sa_rec;</div><div class='add'>+</div><div class='add'>+		memset(&amp;sa_rec, 0, sizeof(sa_rec));</div><div class='add'>+		sa_rec.fresh = 1;</div><div class='add'>+</div><div class='add'>+		ret = aq_mss_set_egress_sa_record(hw, &amp;sa_rec, sa_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		memset(&amp;key_rec, 0, sizeof(key_rec));</div><div class='add'>+		return aq_mss_set_egress_sakey_record(hw, &amp;key_rec, sa_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_del_txsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(cfg, ctx-&gt;secy);</div><div class='add'>+	if (txsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = aq_clear_txsa(nic, &amp;cfg-&gt;aq_txsc[txsc_idx], ctx-&gt;sa.assoc_num,</div><div class='add'>+			    AQ_CLEAR_ALL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_rxsc_validate_frames(const enum macsec_validation_type validate)</div><div class='add'>+{</div><div class='add'>+	switch (validate) {</div><div class='add'>+	case MACSEC_VALIDATE_DISABLED:</div><div class='add'>+		return 2;</div><div class='add'>+	case MACSEC_VALIDATE_CHECK:</div><div class='add'>+		return 1;</div><div class='add'>+	case MACSEC_VALIDATE_STRICT:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(true, "Invalid validation type");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_set_rxsc(struct aq_nic_s *nic, const u32 rxsc_idx)</div><div class='add'>+{</div><div class='add'>+	const struct aq_macsec_rxsc *aq_rxsc =</div><div class='add'>+		&amp;nic-&gt;macsec_cfg-&gt;aq_rxsc[rxsc_idx];</div><div class='add'>+	struct aq_mss_ingress_preclass_record pre_class_record;</div><div class='add'>+	const struct macsec_rx_sc *rx_sc = aq_rxsc-&gt;sw_rxsc;</div><div class='add'>+	const struct macsec_secy *secy = aq_rxsc-&gt;sw_secy;</div><div class='add'>+	const u32 hw_sc_idx = aq_rxsc-&gt;hw_sc_idx;</div><div class='add'>+	struct aq_mss_ingress_sc_record sc_record;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;pre_class_record, 0, sizeof(pre_class_record));</div><div class='add'>+	put_unaligned_be64((__force u64)rx_sc-&gt;sci, pre_class_record.sci);</div><div class='add'>+	pre_class_record.sci_mask = 0xff;</div><div class='add'>+	/* match all MACSEC ethertype packets */</div><div class='add'>+	pre_class_record.eth_type = ETH_P_MACSEC;</div><div class='add'>+	pre_class_record.eth_type_mask = 0x3;</div><div class='add'>+</div><div class='add'>+	aq_ether_addr_to_mac(pre_class_record.mac_sa, (char *)&amp;rx_sc-&gt;sci);</div><div class='add'>+	pre_class_record.sa_mask = 0x3f;</div><div class='add'>+</div><div class='add'>+	pre_class_record.an_mask = nic-&gt;macsec_cfg-&gt;sc_sa;</div><div class='add'>+	pre_class_record.sc_idx = hw_sc_idx;</div><div class='add'>+	/* strip SecTAG &amp; forward for decryption */</div><div class='add'>+	pre_class_record.action = 0x0;</div><div class='add'>+	pre_class_record.valid = 1;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_ingress_preclass_record(hw, &amp;pre_class_record,</div><div class='add'>+						 2 * rxsc_idx + 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If SCI is absent, then match by SA alone */</div><div class='add'>+	pre_class_record.sci_mask = 0;</div><div class='add'>+	pre_class_record.sci_from_table = 1;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_ingress_preclass_record(hw, &amp;pre_class_record,</div><div class='add'>+						 2 * rxsc_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sc_record, 0, sizeof(sc_record));</div><div class='add'>+	sc_record.validate_frames =</div><div class='add'>+		aq_rxsc_validate_frames(secy-&gt;validate_frames);</div><div class='add'>+	if (secy-&gt;replay_protect) {</div><div class='add'>+		sc_record.replay_protect = 1;</div><div class='add'>+		sc_record.anti_replay_window = secy-&gt;replay_window;</div><div class='add'>+	}</div><div class='add'>+	sc_record.valid = 1;</div><div class='add'>+	sc_record.fresh = 1;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_ingress_sc_record(hw, &amp;sc_record, hw_sc_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_add_rxsc(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	const u32 rxsc_idx_max = aq_sc_idx_max(cfg-&gt;sc_sa);</div><div class='add'>+	u32 rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (hweight32(cfg-&gt;rxsc_idx_busy) &gt;= rxsc_idx_max)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = ffz(cfg-&gt;rxsc_idx_busy);</div><div class='add'>+	if (rxsc_idx &gt;= rxsc_idx_max)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;aq_rxsc[rxsc_idx].hw_sc_idx = aq_to_hw_sc_idx(rxsc_idx,</div><div class='add'>+							   cfg-&gt;sc_sa);</div><div class='add'>+	cfg-&gt;aq_rxsc[rxsc_idx].sw_secy = ctx-&gt;secy;</div><div class='add'>+	cfg-&gt;aq_rxsc[rxsc_idx].sw_rxsc = ctx-&gt;rx_sc;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(ctx-&gt;secy-&gt;netdev))</div><div class='add'>+		ret = aq_set_rxsc(nic, rxsc_idx);</div><div class='add'>+</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	set_bit(rxsc_idx, &amp;cfg-&gt;rxsc_idx_busy);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_upd_rxsc(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(nic-&gt;macsec_cfg, ctx-&gt;rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(ctx-&gt;secy-&gt;netdev))</div><div class='add'>+		ret = aq_set_rxsc(nic, rxsc_idx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_clear_rxsc(struct aq_nic_s *nic, const int rxsc_idx,</div><div class='add'>+			 enum aq_clear_type clear_type)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_rxsc *rx_sc = &amp;nic-&gt;macsec_cfg-&gt;aq_rxsc[rxsc_idx];</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int sa_num;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit (sa_num, &amp;rx_sc-&gt;rx_sa_idx_busy, AQ_MACSEC_MAX_SA) {</div><div class='add'>+		ret = aq_clear_rxsa(nic, rx_sc, sa_num, clear_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clear_type &amp; AQ_CLEAR_HW) {</div><div class='add'>+		struct aq_mss_ingress_preclass_record pre_class_record;</div><div class='add'>+		struct aq_mss_ingress_sc_record sc_record;</div><div class='add'>+</div><div class='add'>+		memset(&amp;pre_class_record, 0, sizeof(pre_class_record));</div><div class='add'>+		memset(&amp;sc_record, 0, sizeof(sc_record));</div><div class='add'>+</div><div class='add'>+		ret = aq_mss_set_ingress_preclass_record(hw, &amp;pre_class_record,</div><div class='add'>+							 2 * rxsc_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = aq_mss_set_ingress_preclass_record(hw, &amp;pre_class_record,</div><div class='add'>+							 2 * rxsc_idx + 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		sc_record.fresh = 1;</div><div class='add'>+		ret = aq_mss_set_ingress_sc_record(hw, &amp;sc_record,</div><div class='add'>+						   rx_sc-&gt;hw_sc_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (clear_type &amp; AQ_CLEAR_SW) {</div><div class='add'>+		clear_bit(rxsc_idx, &amp;nic-&gt;macsec_cfg-&gt;rxsc_idx_busy);</div><div class='add'>+		rx_sc-&gt;sw_secy = NULL;</div><div class='add'>+		rx_sc-&gt;sw_rxsc = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_del_rxsc(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	enum aq_clear_type clear_type = AQ_CLEAR_SW;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(nic-&gt;macsec_cfg, ctx-&gt;rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev))</div><div class='add'>+		clear_type = AQ_CLEAR_ALL;</div><div class='add'>+</div><div class='add'>+	ret = aq_clear_rxsc(nic, rxsc_idx, clear_type);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_update_rxsa(struct aq_nic_s *nic, const unsigned int sc_idx,</div><div class='add'>+			  const struct macsec_secy *secy,</div><div class='add'>+			  const struct macsec_rx_sa *rx_sa,</div><div class='add'>+			  const unsigned char *key, const unsigned char an)</div><div class='add'>+{</div><div class='add'>+	struct aq_mss_ingress_sakey_record sa_key_record;</div><div class='add'>+	const u32 next_pn = rx_sa-&gt;next_pn_halves.lower;</div><div class='add'>+	struct aq_mss_ingress_sa_record sa_record;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	const int sa_idx = sc_idx | an;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sa_record, 0, sizeof(sa_record));</div><div class='add'>+	sa_record.valid = rx_sa-&gt;active;</div><div class='add'>+	sa_record.fresh = 1;</div><div class='add'>+	sa_record.next_pn = next_pn;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_ingress_sa_record(hw, &amp;sa_record, sa_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!key)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;sa_key_record, 0, sizeof(sa_key_record));</div><div class='add'>+	memcpy(&amp;sa_key_record.key, key, secy-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	switch (secy-&gt;key_len) {</div><div class='add'>+	case AQ_MACSEC_KEY_LEN_128_BIT:</div><div class='add'>+		sa_key_record.key_len = 0;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_MACSEC_KEY_LEN_192_BIT:</div><div class='add'>+		sa_key_record.key_len = 1;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_MACSEC_KEY_LEN_256_BIT:</div><div class='add'>+		sa_key_record.key_len = 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aq_rotate_keys(&amp;sa_key_record.key, secy-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_set_ingress_sakey_record(hw, &amp;sa_key_record, sa_idx);</div><div class='add'>+</div><div class='add'>+	memzero_explicit(&amp;sa_key_record, sizeof(sa_key_record));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_add_rxsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	const struct macsec_rx_sc *rx_sc = ctx-&gt;sa.rx_sa-&gt;sc;</div><div class='add'>+	const struct macsec_secy *secy = ctx-&gt;secy;</div><div class='add'>+	struct aq_macsec_rxsc *aq_rxsc;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(nic-&gt;macsec_cfg, rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_rxsc = &amp;nic-&gt;macsec_cfg-&gt;aq_rxsc[rxsc_idx];</div><div class='add'>+	set_bit(ctx-&gt;sa.assoc_num, &amp;aq_rxsc-&gt;rx_sa_idx_busy);</div><div class='add'>+</div><div class='add'>+	memcpy(aq_rxsc-&gt;rx_sa_key[ctx-&gt;sa.assoc_num], ctx-&gt;sa.key,</div><div class='add'>+	       secy-&gt;key_len);</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(secy-&gt;netdev))</div><div class='add'>+		ret = aq_update_rxsa(nic, aq_rxsc-&gt;hw_sc_idx, secy,</div><div class='add'>+				     ctx-&gt;sa.rx_sa, ctx-&gt;sa.key,</div><div class='add'>+				     ctx-&gt;sa.assoc_num);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_upd_rxsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	const struct macsec_rx_sc *rx_sc = ctx-&gt;sa.rx_sa-&gt;sc;</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	const struct macsec_secy *secy = ctx-&gt;secy;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(cfg, rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(nic-&gt;ndev) &amp;&amp; netif_running(secy-&gt;netdev))</div><div class='add'>+		ret = aq_update_rxsa(nic, cfg-&gt;aq_rxsc[rxsc_idx].hw_sc_idx,</div><div class='add'>+				     secy, ctx-&gt;sa.rx_sa, NULL,</div><div class='add'>+				     ctx-&gt;sa.assoc_num);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_clear_rxsa(struct aq_nic_s *nic, struct aq_macsec_rxsc *aq_rxsc,</div><div class='add'>+			 const int sa_num, enum aq_clear_type clear_type)</div><div class='add'>+{</div><div class='add'>+	int sa_idx = aq_rxsc-&gt;hw_sc_idx | sa_num;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (clear_type &amp; AQ_CLEAR_SW)</div><div class='add'>+		clear_bit(sa_num, &amp;aq_rxsc-&gt;rx_sa_idx_busy);</div><div class='add'>+</div><div class='add'>+	if ((clear_type &amp; AQ_CLEAR_HW) &amp;&amp; netif_carrier_ok(nic-&gt;ndev)) {</div><div class='add'>+		struct aq_mss_ingress_sakey_record sa_key_record;</div><div class='add'>+		struct aq_mss_ingress_sa_record sa_record;</div><div class='add'>+</div><div class='add'>+		memset(&amp;sa_key_record, 0, sizeof(sa_key_record));</div><div class='add'>+		memset(&amp;sa_record, 0, sizeof(sa_record));</div><div class='add'>+		sa_record.fresh = 1;</div><div class='add'>+		ret = aq_mss_set_ingress_sa_record(hw, &amp;sa_record, sa_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return aq_mss_set_ingress_sakey_record(hw, &amp;sa_key_record,</div><div class='add'>+						       sa_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_del_rxsa(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	const struct macsec_rx_sc *rx_sc = ctx-&gt;sa.rx_sa-&gt;sc;</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(cfg, rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = aq_clear_rxsa(nic, &amp;cfg-&gt;aq_rxsc[rxsc_idx], ctx-&gt;sa.assoc_num,</div><div class='add'>+			    AQ_CLEAR_ALL);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_get_dev_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_common_stats *stats = &amp;nic-&gt;macsec_cfg-&gt;stats;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+</div><div class='add'>+	aq_get_macsec_common_stats(hw, stats);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;OutPktsUntagged = stats-&gt;out.untagged_pkts;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;InPktsUntagged = stats-&gt;in.untagged_pkts;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;OutPktsTooLong = stats-&gt;out.too_long;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;InPktsNoTag = stats-&gt;in.notag_pkts;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;InPktsBadTag = stats-&gt;in.bad_tag_pkts;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;InPktsUnknownSCI = stats-&gt;in.unknown_sci_pkts;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;InPktsNoSCI = stats-&gt;in.no_sci_pkts;</div><div class='add'>+	ctx-&gt;stats.dev_stats-&gt;InPktsOverrun = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_get_tx_sc_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_tx_sc_stats *stats;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(nic-&gt;macsec_cfg, ctx-&gt;secy);</div><div class='add'>+	if (txsc_idx &lt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	aq_txsc = &amp;nic-&gt;macsec_cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	stats = &amp;aq_txsc-&gt;stats;</div><div class='add'>+	aq_get_txsc_stats(hw, aq_txsc-&gt;hw_sc_idx, stats);</div><div class='add'>+</div><div class='add'>+	ctx-&gt;stats.tx_sc_stats-&gt;OutPktsProtected = stats-&gt;sc_protected_pkts;</div><div class='add'>+	ctx-&gt;stats.tx_sc_stats-&gt;OutPktsEncrypted = stats-&gt;sc_encrypted_pkts;</div><div class='add'>+	ctx-&gt;stats.tx_sc_stats-&gt;OutOctetsProtected = stats-&gt;sc_protected_octets;</div><div class='add'>+	ctx-&gt;stats.tx_sc_stats-&gt;OutOctetsEncrypted = stats-&gt;sc_encrypted_octets;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_get_tx_sa_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	struct aq_macsec_tx_sa_stats *stats;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	const struct macsec_secy *secy;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	struct macsec_tx_sa *tx_sa;</div><div class='add'>+	unsigned int sa_idx;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	u32 next_pn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(cfg, ctx-&gt;secy);</div><div class='add'>+	if (txsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_txsc = &amp;cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	sa_idx = aq_txsc-&gt;hw_sc_idx | ctx-&gt;sa.assoc_num;</div><div class='add'>+	stats = &amp;aq_txsc-&gt;tx_sa_stats[ctx-&gt;sa.assoc_num];</div><div class='add'>+	ret = aq_get_txsa_stats(hw, sa_idx, stats);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;stats.tx_sa_stats-&gt;OutPktsProtected = stats-&gt;sa_protected_pkts;</div><div class='add'>+	ctx-&gt;stats.tx_sa_stats-&gt;OutPktsEncrypted = stats-&gt;sa_encrypted_pkts;</div><div class='add'>+</div><div class='add'>+	secy = aq_txsc-&gt;sw_secy;</div><div class='add'>+	tx_sa = rcu_dereference_bh(secy-&gt;tx_sc.sa[ctx-&gt;sa.assoc_num]);</div><div class='add'>+	ret = aq_get_txsa_next_pn(hw, sa_idx, &amp;next_pn);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		spin_lock_bh(&amp;tx_sa-&gt;lock);</div><div class='add'>+		tx_sa-&gt;next_pn = next_pn;</div><div class='add'>+		spin_unlock_bh(&amp;tx_sa-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_get_rx_sc_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	struct aq_macsec_rx_sa_stats *stats;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	struct aq_macsec_rxsc *aq_rxsc;</div><div class='add'>+	unsigned int sa_idx;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(cfg, ctx-&gt;rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	aq_rxsc = &amp;cfg-&gt;aq_rxsc[rxsc_idx];</div><div class='add'>+	for (i = 0; i &lt; MACSEC_NUM_AN; i++) {</div><div class='add'>+		if (!test_bit(i, &amp;aq_rxsc-&gt;rx_sa_idx_busy))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		stats = &amp;aq_rxsc-&gt;rx_sa_stats[i];</div><div class='add'>+		sa_idx = aq_rxsc-&gt;hw_sc_idx | i;</div><div class='add'>+		ret = aq_get_rxsa_stats(hw, sa_idx, stats);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InOctetsValidated +=</div><div class='add'>+			stats-&gt;validated_octets;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InOctetsDecrypted +=</div><div class='add'>+			stats-&gt;decrypted_octets;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsUnchecked +=</div><div class='add'>+			stats-&gt;unchecked_pkts;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsDelayed += stats-&gt;delayed_pkts;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsOK += stats-&gt;ok_pkts;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsInvalid += stats-&gt;invalid_pkts;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsLate += stats-&gt;late_pkts;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsNotValid += stats-&gt;not_valid_pkts;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsNotUsingSA += stats-&gt;not_using_sa;</div><div class='add'>+		ctx-&gt;stats.rx_sc_stats-&gt;InPktsUnusedSA += stats-&gt;unused_sa;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mdo_get_rx_sa_stats(struct macsec_context *ctx)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	struct aq_macsec_rx_sa_stats *stats;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	struct aq_macsec_rxsc *aq_rxsc;</div><div class='add'>+	struct macsec_rx_sa *rx_sa;</div><div class='add'>+	unsigned int sa_idx;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	u32 next_pn;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	rxsc_idx = aq_get_rxsc_idx_from_rxsc(cfg, ctx-&gt;rx_sc);</div><div class='add'>+	if (rxsc_idx &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_rxsc = &amp;cfg-&gt;aq_rxsc[rxsc_idx];</div><div class='add'>+	stats = &amp;aq_rxsc-&gt;rx_sa_stats[ctx-&gt;sa.assoc_num];</div><div class='add'>+	sa_idx = aq_rxsc-&gt;hw_sc_idx | ctx-&gt;sa.assoc_num;</div><div class='add'>+	ret = aq_get_rxsa_stats(hw, sa_idx, stats);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;stats.rx_sa_stats-&gt;InPktsOK = stats-&gt;ok_pkts;</div><div class='add'>+	ctx-&gt;stats.rx_sa_stats-&gt;InPktsInvalid = stats-&gt;invalid_pkts;</div><div class='add'>+	ctx-&gt;stats.rx_sa_stats-&gt;InPktsNotValid = stats-&gt;not_valid_pkts;</div><div class='add'>+	ctx-&gt;stats.rx_sa_stats-&gt;InPktsNotUsingSA = stats-&gt;not_using_sa;</div><div class='add'>+	ctx-&gt;stats.rx_sa_stats-&gt;InPktsUnusedSA = stats-&gt;unused_sa;</div><div class='add'>+</div><div class='add'>+	rx_sa = rcu_dereference_bh(aq_rxsc-&gt;sw_rxsc-&gt;sa[ctx-&gt;sa.assoc_num]);</div><div class='add'>+	ret = aq_get_rxsa_next_pn(hw, sa_idx, &amp;next_pn);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		spin_lock_bh(&amp;rx_sa-&gt;lock);</div><div class='add'>+		rx_sa-&gt;next_pn = next_pn;</div><div class='add'>+		spin_unlock_bh(&amp;rx_sa-&gt;lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apply_txsc_cfg(struct aq_nic_s *nic, const int txsc_idx)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc = &amp;nic-&gt;macsec_cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+	const struct macsec_secy *secy = aq_txsc-&gt;sw_secy;</div><div class='add'>+	struct macsec_tx_sa *tx_sa;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(secy-&gt;netdev))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_set_txsc(nic, txsc_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MACSEC_NUM_AN; i++) {</div><div class='add'>+		tx_sa = rcu_dereference_bh(secy-&gt;tx_sc.sa[i]);</div><div class='add'>+		if (tx_sa) {</div><div class='add'>+			ret = aq_update_txsa(nic, aq_txsc-&gt;hw_sc_idx, secy,</div><div class='add'>+					     tx_sa, aq_txsc-&gt;tx_sa_key[i], i);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int apply_rxsc_cfg(struct aq_nic_s *nic, const int rxsc_idx)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_rxsc *aq_rxsc = &amp;nic-&gt;macsec_cfg-&gt;aq_rxsc[rxsc_idx];</div><div class='add'>+	const struct macsec_secy *secy = aq_rxsc-&gt;sw_secy;</div><div class='add'>+	struct macsec_rx_sa *rx_sa;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(secy-&gt;netdev))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_set_rxsc(nic, rxsc_idx);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MACSEC_NUM_AN; i++) {</div><div class='add'>+		rx_sa = rcu_dereference_bh(aq_rxsc-&gt;sw_rxsc-&gt;sa[i]);</div><div class='add'>+		if (rx_sa) {</div><div class='add'>+			ret = aq_update_rxsa(nic, aq_rxsc-&gt;hw_sc_idx, secy,</div><div class='add'>+					     rx_sa, aq_rxsc-&gt;rx_sa_key[i], i);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_clear_secy(struct aq_nic_s *nic, const struct macsec_secy *secy,</div><div class='add'>+			 enum aq_clear_type clear_type)</div><div class='add'>+{</div><div class='add'>+	struct macsec_rx_sc *rx_sc;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(nic-&gt;macsec_cfg, secy);</div><div class='add'>+	if (txsc_idx &gt;= 0) {</div><div class='add'>+		ret = aq_clear_txsc(nic, txsc_idx, clear_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (rx_sc = rcu_dereference_bh(secy-&gt;rx_sc); rx_sc;</div><div class='add'>+	     rx_sc = rcu_dereference_bh(rx_sc-&gt;next)) {</div><div class='add'>+		rxsc_idx = aq_get_rxsc_idx_from_rxsc(nic-&gt;macsec_cfg, rx_sc);</div><div class='add'>+		if (rxsc_idx &lt; 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = aq_clear_rxsc(nic, rxsc_idx, clear_type);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_apply_secy_cfg(struct aq_nic_s *nic,</div><div class='add'>+			     const struct macsec_secy *secy)</div><div class='add'>+{</div><div class='add'>+	struct macsec_rx_sc *rx_sc;</div><div class='add'>+	int txsc_idx;</div><div class='add'>+	int rxsc_idx;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	txsc_idx = aq_get_txsc_idx_from_secy(nic-&gt;macsec_cfg, secy);</div><div class='add'>+	if (txsc_idx &gt;= 0)</div><div class='add'>+		apply_txsc_cfg(nic, txsc_idx);</div><div class='add'>+</div><div class='add'>+	for (rx_sc = rcu_dereference_bh(secy-&gt;rx_sc); rx_sc &amp;&amp; rx_sc-&gt;active;</div><div class='add'>+	     rx_sc = rcu_dereference_bh(rx_sc-&gt;next)) {</div><div class='add'>+		rxsc_idx = aq_get_rxsc_idx_from_rxsc(nic-&gt;macsec_cfg, rx_sc);</div><div class='add'>+		if (unlikely(rxsc_idx &lt; 0))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = apply_rxsc_cfg(nic, rxsc_idx);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_apply_macsec_cfg(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (nic-&gt;macsec_cfg-&gt;txsc_idx_busy &amp; BIT(i)) {</div><div class='add'>+			ret = apply_txsc_cfg(nic, i);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (nic-&gt;macsec_cfg-&gt;rxsc_idx_busy &amp; BIT(i)) {</div><div class='add'>+			ret = apply_rxsc_cfg(nic, i);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_sa_from_sa_idx(const enum aq_macsec_sc_sa sc_sa, const int sa_idx)</div><div class='add'>+{</div><div class='add'>+	switch (sc_sa) {</div><div class='add'>+	case aq_macsec_sa_sc_4sa_8sc:</div><div class='add'>+		return sa_idx &amp; 3;</div><div class='add'>+	case aq_macsec_sa_sc_2sa_16sc:</div><div class='add'>+		return sa_idx &amp; 1;</div><div class='add'>+	case aq_macsec_sa_sc_1sa_32sc:</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(true, "Invalid sc_sa");</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_sc_idx_from_sa_idx(const enum aq_macsec_sc_sa sc_sa,</div><div class='add'>+				 const int sa_idx)</div><div class='add'>+{</div><div class='add'>+	switch (sc_sa) {</div><div class='add'>+	case aq_macsec_sa_sc_4sa_8sc:</div><div class='add'>+		return sa_idx &amp; ~3;</div><div class='add'>+	case aq_macsec_sa_sc_2sa_16sc:</div><div class='add'>+		return sa_idx &amp; ~1;</div><div class='add'>+	case aq_macsec_sa_sc_1sa_32sc:</div><div class='add'>+		return sa_idx;</div><div class='add'>+	default:</div><div class='add'>+		WARN_ONCE(true, "Invalid sc_sa");</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_check_txsa_expiration(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	u32 egress_sa_expired, egress_sa_threshold_expired;</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	const struct macsec_secy *secy;</div><div class='add'>+	int sc_idx = 0, txsc_idx = 0;</div><div class='add'>+	enum aq_macsec_sc_sa sc_sa;</div><div class='add'>+	struct macsec_tx_sa *tx_sa;</div><div class='add'>+	unsigned char an = 0;</div><div class='add'>+	int ret;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	sc_sa = cfg-&gt;sc_sa;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_egress_sa_expired(hw, &amp;egress_sa_expired);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_get_egress_sa_threshold_expired(hw,</div><div class='add'>+		&amp;egress_sa_threshold_expired);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SA; i++) {</div><div class='add'>+		if (egress_sa_expired &amp; BIT(i)) {</div><div class='add'>+			an = aq_sa_from_sa_idx(sc_sa, i);</div><div class='add'>+			sc_idx = aq_sc_idx_from_sa_idx(sc_sa, i);</div><div class='add'>+			txsc_idx = aq_get_txsc_idx_from_sc_idx(sc_sa, sc_idx);</div><div class='add'>+			if (txsc_idx &lt; 0)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			aq_txsc = &amp;cfg-&gt;aq_txsc[txsc_idx];</div><div class='add'>+			if (!(cfg-&gt;txsc_idx_busy &amp; BIT(txsc_idx))) {</div><div class='add'>+				netdev_warn(nic-&gt;ndev,</div><div class='add'>+					"PN threshold expired on invalid TX SC");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			secy = aq_txsc-&gt;sw_secy;</div><div class='add'>+			if (!netif_running(secy-&gt;netdev)) {</div><div class='add'>+				netdev_warn(nic-&gt;ndev,</div><div class='add'>+					"PN threshold expired on down TX SC");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (unlikely(!(aq_txsc-&gt;tx_sa_idx_busy &amp; BIT(an)))) {</div><div class='add'>+				netdev_warn(nic-&gt;ndev,</div><div class='add'>+					"PN threshold expired on invalid TX SA");</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tx_sa = rcu_dereference_bh(secy-&gt;tx_sc.sa[an]);</div><div class='add'>+			macsec_pn_wrapped((struct macsec_secy *)secy, tx_sa);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aq_mss_set_egress_sa_expired(hw, egress_sa_expired);</div><div class='add'>+	if (likely(!ret))</div><div class='add'>+		aq_mss_set_egress_sa_threshold_expired(hw,</div><div class='add'>+			egress_sa_threshold_expired);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define AQ_LOCKED_MDO_DEF(mdo)						\</div><div class='add'>+static int aq_locked_mdo_##mdo(struct macsec_context *ctx)		\</div><div class='add'>+{									\</div><div class='add'>+	struct aq_nic_s *nic = macsec_netdev_priv(ctx-&gt;netdev);		\</div><div class='add'>+	int ret;							\</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);					\</div><div class='add'>+	ret = aq_mdo_##mdo(ctx);					\</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);				\</div><div class='add'>+	return ret;							\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+AQ_LOCKED_MDO_DEF(dev_open)</div><div class='add'>+AQ_LOCKED_MDO_DEF(dev_stop)</div><div class='add'>+AQ_LOCKED_MDO_DEF(add_secy)</div><div class='add'>+AQ_LOCKED_MDO_DEF(upd_secy)</div><div class='add'>+AQ_LOCKED_MDO_DEF(del_secy)</div><div class='add'>+AQ_LOCKED_MDO_DEF(add_rxsc)</div><div class='add'>+AQ_LOCKED_MDO_DEF(upd_rxsc)</div><div class='add'>+AQ_LOCKED_MDO_DEF(del_rxsc)</div><div class='add'>+AQ_LOCKED_MDO_DEF(add_rxsa)</div><div class='add'>+AQ_LOCKED_MDO_DEF(upd_rxsa)</div><div class='add'>+AQ_LOCKED_MDO_DEF(del_rxsa)</div><div class='add'>+AQ_LOCKED_MDO_DEF(add_txsa)</div><div class='add'>+AQ_LOCKED_MDO_DEF(upd_txsa)</div><div class='add'>+AQ_LOCKED_MDO_DEF(del_txsa)</div><div class='add'>+AQ_LOCKED_MDO_DEF(get_dev_stats)</div><div class='add'>+AQ_LOCKED_MDO_DEF(get_tx_sc_stats)</div><div class='add'>+AQ_LOCKED_MDO_DEF(get_tx_sa_stats)</div><div class='add'>+AQ_LOCKED_MDO_DEF(get_rx_sc_stats)</div><div class='add'>+AQ_LOCKED_MDO_DEF(get_rx_sa_stats)</div><div class='add'>+</div><div class='add'>+const struct macsec_ops aq_macsec_ops = {</div><div class='add'>+	.mdo_dev_open = aq_locked_mdo_dev_open,</div><div class='add'>+	.mdo_dev_stop = aq_locked_mdo_dev_stop,</div><div class='add'>+	.mdo_add_secy = aq_locked_mdo_add_secy,</div><div class='add'>+	.mdo_upd_secy = aq_locked_mdo_upd_secy,</div><div class='add'>+	.mdo_del_secy = aq_locked_mdo_del_secy,</div><div class='add'>+	.mdo_add_rxsc = aq_locked_mdo_add_rxsc,</div><div class='add'>+	.mdo_upd_rxsc = aq_locked_mdo_upd_rxsc,</div><div class='add'>+	.mdo_del_rxsc = aq_locked_mdo_del_rxsc,</div><div class='add'>+	.mdo_add_rxsa = aq_locked_mdo_add_rxsa,</div><div class='add'>+	.mdo_upd_rxsa = aq_locked_mdo_upd_rxsa,</div><div class='add'>+	.mdo_del_rxsa = aq_locked_mdo_del_rxsa,</div><div class='add'>+	.mdo_add_txsa = aq_locked_mdo_add_txsa,</div><div class='add'>+	.mdo_upd_txsa = aq_locked_mdo_upd_txsa,</div><div class='add'>+	.mdo_del_txsa = aq_locked_mdo_del_txsa,</div><div class='add'>+	.mdo_get_dev_stats = aq_locked_mdo_get_dev_stats,</div><div class='add'>+	.mdo_get_tx_sc_stats = aq_locked_mdo_get_tx_sc_stats,</div><div class='add'>+	.mdo_get_tx_sa_stats = aq_locked_mdo_get_tx_sa_stats,</div><div class='add'>+	.mdo_get_rx_sc_stats = aq_locked_mdo_get_rx_sc_stats,</div><div class='add'>+	.mdo_get_rx_sa_stats = aq_locked_mdo_get_rx_sa_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int aq_macsec_init(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_cfg *cfg;</div><div class='add'>+	u32 caps_lo;</div><div class='add'>+</div><div class='add'>+	if (!nic-&gt;aq_fw_ops-&gt;get_link_capabilities)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	caps_lo = nic-&gt;aq_fw_ops-&gt;get_link_capabilities(nic-&gt;aq_hw);</div><div class='add'>+</div><div class='add'>+	if (!(caps_lo &amp; BIT(CAPS_LO_MACSEC)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	nic-&gt;macsec_cfg = kzalloc(sizeof(*cfg), GFP_KERNEL);</div><div class='add'>+	if (!nic-&gt;macsec_cfg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nic-&gt;ndev-&gt;features |= NETIF_F_HW_MACSEC;</div><div class='add'>+	nic-&gt;ndev-&gt;macsec_ops = &amp;aq_macsec_ops;</div><div class='add'>+	mutex_init(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_macsec_free(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	kfree(nic-&gt;macsec_cfg);</div><div class='add'>+	nic-&gt;macsec_cfg = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_macsec_enable(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	u32 ctl_ether_types[1] = { ETH_P_PAE };</div><div class='add'>+	struct macsec_msg_fw_response resp = { 0 };</div><div class='add'>+	struct macsec_msg_fw_request msg = { 0 };</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	int num_ctl_ether_types = 0;</div><div class='add'>+	int index = 0, tbl_idx;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!nic-&gt;macsec_cfg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	if (nic-&gt;aq_fw_ops-&gt;send_macsec_req) {</div><div class='add'>+		struct macsec_cfg_request cfg = { 0 };</div><div class='add'>+</div><div class='add'>+		cfg.enabled = 1;</div><div class='add'>+		cfg.egress_threshold = 0xffffffff;</div><div class='add'>+		cfg.ingress_threshold = 0xffffffff;</div><div class='add'>+		cfg.interrupts_enabled = 1;</div><div class='add'>+</div><div class='add'>+		msg.msg_type = macsec_cfg_msg;</div><div class='add'>+		msg.cfg = cfg;</div><div class='add'>+</div><div class='add'>+		ret = nic-&gt;aq_fw_ops-&gt;send_macsec_req(hw, &amp;msg, &amp;resp);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Init Ethertype bypass filters */</div><div class='add'>+	for (index = 0; index &lt; ARRAY_SIZE(ctl_ether_types); index++) {</div><div class='add'>+		struct aq_mss_ingress_prectlf_record rx_prectlf_rec;</div><div class='add'>+		struct aq_mss_egress_ctlf_record tx_ctlf_rec;</div><div class='add'>+</div><div class='add'>+		if (ctl_ether_types[index] == 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		memset(&amp;tx_ctlf_rec, 0, sizeof(tx_ctlf_rec));</div><div class='add'>+		tx_ctlf_rec.eth_type = ctl_ether_types[index];</div><div class='add'>+		tx_ctlf_rec.match_type = 4; /* Match eth_type only */</div><div class='add'>+		tx_ctlf_rec.match_mask = 0xf; /* match for eth_type */</div><div class='add'>+		tx_ctlf_rec.action = 0; /* Bypass MACSEC modules */</div><div class='add'>+		tbl_idx = NUMROWS_EGRESSCTLFRECORD - num_ctl_ether_types - 1;</div><div class='add'>+		aq_mss_set_egress_ctlf_record(hw, &amp;tx_ctlf_rec, tbl_idx);</div><div class='add'>+</div><div class='add'>+		memset(&amp;rx_prectlf_rec, 0, sizeof(rx_prectlf_rec));</div><div class='add'>+		rx_prectlf_rec.eth_type = ctl_ether_types[index];</div><div class='add'>+		rx_prectlf_rec.match_type = 4; /* Match eth_type only */</div><div class='add'>+		rx_prectlf_rec.match_mask = 0xf; /* match for eth_type */</div><div class='add'>+		rx_prectlf_rec.action = 0; /* Bypass MACSEC modules */</div><div class='add'>+		tbl_idx =</div><div class='add'>+			NUMROWS_INGRESSPRECTLFRECORD - num_ctl_ether_types - 1;</div><div class='add'>+		aq_mss_set_ingress_prectlf_record(hw, &amp;rx_prectlf_rec, tbl_idx);</div><div class='add'>+</div><div class='add'>+		num_ctl_ether_types++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = aq_apply_macsec_cfg(nic);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_macsec_work(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	if (!nic-&gt;macsec_cfg)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!netif_carrier_ok(nic-&gt;ndev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+	aq_check_txsa_expiration(nic);</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_macsec_rx_sa_cnt(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	int i, cnt = 0;</div><div class='add'>+</div><div class='add'>+	if (!cfg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (!test_bit(i, &amp;cfg-&gt;rxsc_idx_busy))</div><div class='add'>+			continue;</div><div class='add'>+		cnt += hweight_long(cfg-&gt;aq_rxsc[i].rx_sa_idx_busy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_macsec_tx_sc_cnt(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	int cnt;</div><div class='add'>+</div><div class='add'>+	if (!nic-&gt;macsec_cfg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+	cnt = hweight_long(nic-&gt;macsec_cfg-&gt;txsc_idx_busy);</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_macsec_tx_sa_cnt(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	int i, cnt = 0;</div><div class='add'>+</div><div class='add'>+	if (!cfg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (!test_bit(i, &amp;cfg-&gt;txsc_idx_busy))</div><div class='add'>+			continue;</div><div class='add'>+		cnt += hweight_long(cfg-&gt;aq_txsc[i].tx_sa_idx_busy);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_macsec_update_stats(struct aq_nic_s *nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	struct aq_hw_s *hw = nic-&gt;aq_hw;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	struct aq_macsec_rxsc *aq_rxsc;</div><div class='add'>+	int i, sa_idx, assoc_num;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	aq_get_macsec_common_stats(hw, &amp;cfg-&gt;stats);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (!(cfg-&gt;txsc_idx_busy &amp; BIT(i)))</div><div class='add'>+			continue;</div><div class='add'>+		aq_txsc = &amp;cfg-&gt;aq_txsc[i];</div><div class='add'>+</div><div class='add'>+		ret = aq_get_txsc_stats(hw, aq_txsc-&gt;hw_sc_idx,</div><div class='add'>+					&amp;aq_txsc-&gt;stats);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		for (assoc_num = 0; assoc_num &lt; MACSEC_NUM_AN; assoc_num++) {</div><div class='add'>+			if (!test_bit(assoc_num, &amp;aq_txsc-&gt;tx_sa_idx_busy))</div><div class='add'>+				continue;</div><div class='add'>+			sa_idx = aq_txsc-&gt;hw_sc_idx | assoc_num;</div><div class='add'>+			ret = aq_get_txsa_stats(hw, sa_idx,</div><div class='add'>+					      &amp;aq_txsc-&gt;tx_sa_stats[assoc_num]);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AQ_MACSEC_MAX_SC; i++) {</div><div class='add'>+		if (!(test_bit(i, &amp;cfg-&gt;rxsc_idx_busy)))</div><div class='add'>+			continue;</div><div class='add'>+		aq_rxsc = &amp;cfg-&gt;aq_rxsc[i];</div><div class='add'>+</div><div class='add'>+		for (assoc_num = 0; assoc_num &lt; MACSEC_NUM_AN; assoc_num++) {</div><div class='add'>+			if (!test_bit(assoc_num, &amp;aq_rxsc-&gt;rx_sa_idx_busy))</div><div class='add'>+				continue;</div><div class='add'>+			sa_idx = aq_rxsc-&gt;hw_sc_idx | assoc_num;</div><div class='add'>+</div><div class='add'>+			ret = aq_get_rxsa_stats(hw, sa_idx,</div><div class='add'>+					      &amp;aq_rxsc-&gt;rx_sa_stats[assoc_num]);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 *aq_macsec_get_stats(struct aq_nic_s *nic, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct aq_macsec_cfg *cfg = nic-&gt;macsec_cfg;</div><div class='add'>+	struct aq_macsec_common_stats *common_stats;</div><div class='add'>+	struct aq_macsec_tx_sc_stats *txsc_stats;</div><div class='add'>+	struct aq_macsec_tx_sa_stats *txsa_stats;</div><div class='add'>+	struct aq_macsec_rx_sa_stats *rxsa_stats;</div><div class='add'>+	struct aq_macsec_txsc *aq_txsc;</div><div class='add'>+	struct aq_macsec_rxsc *aq_rxsc;</div><div class='add'>+	unsigned int assoc_num;</div><div class='add'>+	unsigned int sc_num;</div><div class='add'>+	unsigned int i = 0U;</div><div class='add'>+</div><div class='add'>+	if (!cfg)</div><div class='add'>+		return data;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	aq_macsec_update_stats(nic);</div><div class='add'>+</div><div class='add'>+	common_stats = &amp;cfg-&gt;stats;</div><div class='add'>+	data[i] = common_stats-&gt;in.ctl_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.tagged_miss_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.untagged_miss_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.notag_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.untagged_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.bad_tag_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.no_sci_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.unknown_sci_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.ctrl_prt_pass_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.unctrl_prt_pass_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.ctrl_prt_fail_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.unctrl_prt_fail_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.too_long_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.igpoc_ctl_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.ecc_error_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;in.unctrl_hit_drop_redir;</div><div class='add'>+	data[++i] = common_stats-&gt;out.ctl_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;out.unknown_sa_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;out.untagged_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;out.too_long;</div><div class='add'>+	data[++i] = common_stats-&gt;out.ecc_error_pkts;</div><div class='add'>+	data[++i] = common_stats-&gt;out.unctrl_hit_drop_redir;</div><div class='add'>+</div><div class='add'>+	for (sc_num = 0; sc_num &lt; AQ_MACSEC_MAX_SC; sc_num++) {</div><div class='add'>+		if (!(test_bit(sc_num, &amp;cfg-&gt;txsc_idx_busy)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		aq_txsc = &amp;cfg-&gt;aq_txsc[sc_num];</div><div class='add'>+		txsc_stats = &amp;aq_txsc-&gt;stats;</div><div class='add'>+</div><div class='add'>+		data[++i] = txsc_stats-&gt;sc_protected_pkts;</div><div class='add'>+		data[++i] = txsc_stats-&gt;sc_encrypted_pkts;</div><div class='add'>+		data[++i] = txsc_stats-&gt;sc_protected_octets;</div><div class='add'>+		data[++i] = txsc_stats-&gt;sc_encrypted_octets;</div><div class='add'>+</div><div class='add'>+		for (assoc_num = 0; assoc_num &lt; MACSEC_NUM_AN; assoc_num++) {</div><div class='add'>+			if (!test_bit(assoc_num, &amp;aq_txsc-&gt;tx_sa_idx_busy))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			txsa_stats = &amp;aq_txsc-&gt;tx_sa_stats[assoc_num];</div><div class='add'>+</div><div class='add'>+			data[++i] = txsa_stats-&gt;sa_hit_drop_redirect;</div><div class='add'>+			data[++i] = txsa_stats-&gt;sa_protected2_pkts;</div><div class='add'>+			data[++i] = txsa_stats-&gt;sa_protected_pkts;</div><div class='add'>+			data[++i] = txsa_stats-&gt;sa_encrypted_pkts;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (sc_num = 0; sc_num &lt; AQ_MACSEC_MAX_SC; sc_num++) {</div><div class='add'>+		if (!(test_bit(sc_num, &amp;cfg-&gt;rxsc_idx_busy)))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		aq_rxsc = &amp;cfg-&gt;aq_rxsc[sc_num];</div><div class='add'>+</div><div class='add'>+		for (assoc_num = 0; assoc_num &lt; MACSEC_NUM_AN; assoc_num++) {</div><div class='add'>+			if (!test_bit(assoc_num, &amp;aq_rxsc-&gt;rx_sa_idx_busy))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			rxsa_stats = &amp;aq_rxsc-&gt;rx_sa_stats[assoc_num];</div><div class='add'>+</div><div class='add'>+			data[++i] = rxsa_stats-&gt;untagged_hit_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;ctrl_hit_drop_redir_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;not_using_sa;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;unused_sa;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;not_valid_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;invalid_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;ok_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;late_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;delayed_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;unchecked_pkts;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;validated_octets;</div><div class='add'>+			data[++i] = rxsa_stats-&gt;decrypted_octets;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i++;</div><div class='add'>+</div><div class='add'>+	data += i;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;nic-&gt;macsec_mutex);</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.h b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.h<br/>new file mode 100644<br/>index 000000000000..a47e2710487e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_macsec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_macsec.h</a></div><div class='hunk'>@@ -0,0 +1,133 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef AQ_MACSEC_H</div><div class='add'>+#define AQ_MACSEC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+</div><div class='add'>+#include "net/macsec.h"</div><div class='add'>+</div><div class='add'>+struct aq_nic_s;</div><div class='add'>+</div><div class='add'>+#define AQ_MACSEC_MAX_SC 32</div><div class='add'>+#define AQ_MACSEC_MAX_SA 32</div><div class='add'>+</div><div class='add'>+enum aq_macsec_sc_sa {</div><div class='add'>+	aq_macsec_sa_sc_4sa_8sc,</div><div class='add'>+	aq_macsec_sa_sc_not_used,</div><div class='add'>+	aq_macsec_sa_sc_2sa_16sc,</div><div class='add'>+	aq_macsec_sa_sc_1sa_32sc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aq_macsec_common_stats {</div><div class='add'>+	/* Ingress Common Counters */</div><div class='add'>+	struct {</div><div class='add'>+		u64 ctl_pkts;</div><div class='add'>+		u64 tagged_miss_pkts;</div><div class='add'>+		u64 untagged_miss_pkts;</div><div class='add'>+		u64 notag_pkts;</div><div class='add'>+		u64 untagged_pkts;</div><div class='add'>+		u64 bad_tag_pkts;</div><div class='add'>+		u64 no_sci_pkts;</div><div class='add'>+		u64 unknown_sci_pkts;</div><div class='add'>+		u64 ctrl_prt_pass_pkts;</div><div class='add'>+		u64 unctrl_prt_pass_pkts;</div><div class='add'>+		u64 ctrl_prt_fail_pkts;</div><div class='add'>+		u64 unctrl_prt_fail_pkts;</div><div class='add'>+		u64 too_long_pkts;</div><div class='add'>+		u64 igpoc_ctl_pkts;</div><div class='add'>+		u64 ecc_error_pkts;</div><div class='add'>+		u64 unctrl_hit_drop_redir;</div><div class='add'>+	} in;</div><div class='add'>+</div><div class='add'>+	/* Egress Common Counters */</div><div class='add'>+	struct {</div><div class='add'>+		u64 ctl_pkts;</div><div class='add'>+		u64 unknown_sa_pkts;</div><div class='add'>+		u64 untagged_pkts;</div><div class='add'>+		u64 too_long;</div><div class='add'>+		u64 ecc_error_pkts;</div><div class='add'>+		u64 unctrl_hit_drop_redir;</div><div class='add'>+	} out;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Ingress SA Counters */</div><div class='add'>+struct aq_macsec_rx_sa_stats {</div><div class='add'>+	u64 untagged_hit_pkts;</div><div class='add'>+	u64 ctrl_hit_drop_redir_pkts;</div><div class='add'>+	u64 not_using_sa;</div><div class='add'>+	u64 unused_sa;</div><div class='add'>+	u64 not_valid_pkts;</div><div class='add'>+	u64 invalid_pkts;</div><div class='add'>+	u64 ok_pkts;</div><div class='add'>+	u64 late_pkts;</div><div class='add'>+	u64 delayed_pkts;</div><div class='add'>+	u64 unchecked_pkts;</div><div class='add'>+	u64 validated_octets;</div><div class='add'>+	u64 decrypted_octets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Egress SA Counters */</div><div class='add'>+struct aq_macsec_tx_sa_stats {</div><div class='add'>+	u64 sa_hit_drop_redirect;</div><div class='add'>+	u64 sa_protected2_pkts;</div><div class='add'>+	u64 sa_protected_pkts;</div><div class='add'>+	u64 sa_encrypted_pkts;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Egress SC Counters */</div><div class='add'>+struct aq_macsec_tx_sc_stats {</div><div class='add'>+	u64 sc_protected_pkts;</div><div class='add'>+	u64 sc_encrypted_pkts;</div><div class='add'>+	u64 sc_protected_octets;</div><div class='add'>+	u64 sc_encrypted_octets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aq_macsec_txsc {</div><div class='add'>+	u32 hw_sc_idx;</div><div class='add'>+	unsigned long tx_sa_idx_busy;</div><div class='add'>+	const struct macsec_secy *sw_secy;</div><div class='add'>+	u8 tx_sa_key[MACSEC_NUM_AN][MACSEC_MAX_KEY_LEN];</div><div class='add'>+	struct aq_macsec_tx_sc_stats stats;</div><div class='add'>+	struct aq_macsec_tx_sa_stats tx_sa_stats[MACSEC_NUM_AN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aq_macsec_rxsc {</div><div class='add'>+	u32 hw_sc_idx;</div><div class='add'>+	unsigned long rx_sa_idx_busy;</div><div class='add'>+	const struct macsec_secy *sw_secy;</div><div class='add'>+	const struct macsec_rx_sc *sw_rxsc;</div><div class='add'>+	u8 rx_sa_key[MACSEC_NUM_AN][MACSEC_MAX_KEY_LEN];</div><div class='add'>+	struct aq_macsec_rx_sa_stats rx_sa_stats[MACSEC_NUM_AN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aq_macsec_cfg {</div><div class='add'>+	enum aq_macsec_sc_sa sc_sa;</div><div class='add'>+	/* Egress channel configuration */</div><div class='add'>+	unsigned long txsc_idx_busy;</div><div class='add'>+	struct aq_macsec_txsc aq_txsc[AQ_MACSEC_MAX_SC];</div><div class='add'>+	/* Ingress channel configuration */</div><div class='add'>+	unsigned long rxsc_idx_busy;</div><div class='add'>+	struct aq_macsec_rxsc aq_rxsc[AQ_MACSEC_MAX_SC];</div><div class='add'>+	/* Statistics / counters */</div><div class='add'>+	struct aq_macsec_common_stats stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct macsec_ops aq_macsec_ops;</div><div class='add'>+</div><div class='add'>+int aq_macsec_init(struct aq_nic_s *nic);</div><div class='add'>+void aq_macsec_free(struct aq_nic_s *nic);</div><div class='add'>+int aq_macsec_enable(struct aq_nic_s *nic);</div><div class='add'>+void aq_macsec_work(struct aq_nic_s *nic);</div><div class='add'>+u64 *aq_macsec_get_stats(struct aq_nic_s *nic, u64 *data);</div><div class='add'>+int aq_macsec_rx_sa_cnt(struct aq_nic_s *nic);</div><div class='add'>+int aq_macsec_tx_sc_cnt(struct aq_nic_s *nic);</div><div class='add'>+int aq_macsec_tx_sa_cnt(struct aq_nic_s *nic);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* AQ_MACSEC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c<br/>index 1ea8b77fc1a7..4ef4fe64b8ac 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_main.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_main.c: Main file for aQuantia Linux driver. */</div><div class='hunk'>@@ -13,16 +11,26 @@</div><div class='ctx'> #include "aq_nic.h"</div><div class='ctx'> #include "aq_pci_func.h"</div><div class='ctx'> #include "aq_ethtool.h"</div><div class='add'>+#include "aq_ptp.h"</div><div class='ctx'> #include "aq_filters.h"</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='add'>+#include "aq_vec.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='del'>-MODULE_VERSION(AQ_CFG_DRV_VERSION);</div><div class='ctx'> MODULE_AUTHOR(AQ_CFG_DRV_AUTHOR);</div><div class='ctx'> MODULE_DESCRIPTION(AQ_CFG_DRV_DESC);</div><div class='ctx'> </div><div class='add'>+DEFINE_STATIC_KEY_FALSE(aq_xdp_locking_key);</div><div class='add'>+EXPORT_SYMBOL(aq_xdp_locking_key);</div><div class='add'>+</div><div class='ctx'> static const char aq_ndev_driver_name[] = AQ_CFG_DRV_NAME;</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops aq_ndev_ops;</div><div class='hunk'>@@ -39,7 +47,7 @@ struct net_device *aq_ndev_alloc(void)</div><div class='ctx'> 	struct net_device *ndev = NULL;</div><div class='ctx'> 	struct aq_nic_s *aq_nic = NULL;</div><div class='ctx'> </div><div class='del'>-	ndev = alloc_etherdev_mq(sizeof(struct aq_nic_s), AQ_CFG_VECS_MAX);</div><div class='add'>+	ndev = alloc_etherdev_mq(sizeof(struct aq_nic_s), AQ_HW_QUEUES_MAX);</div><div class='ctx'> 	if (!ndev)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -51,10 +59,10 @@ struct net_device *aq_ndev_alloc(void)</div><div class='ctx'> 	return ndev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ndev_open(struct net_device *ndev)</div><div class='add'>+int aq_ndev_open(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = aq_nic_init(aq_nic);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -64,45 +72,80 @@ static int aq_ndev_open(struct net_device *ndev)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	err = aq_nic_start(aq_nic);</div><div class='add'>+	err = aq_filters_vlans_update(aq_nic);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='add'>+	err = aq_nic_start(aq_nic);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		aq_nic_stop(aq_nic);</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> err_exit:</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		aq_nic_deinit(aq_nic);</div><div class='add'>+		aq_nic_deinit(aq_nic, true);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ndev_close(struct net_device *ndev)</div><div class='add'>+int aq_ndev_close(struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = aq_nic_stop(aq_nic);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err_exit;</div><div class='del'>-	aq_nic_deinit(aq_nic);</div><div class='add'>+	aq_nic_deinit(aq_nic, true);</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='ctx'> </div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+	if (unlikely(aq_utils_obj_test(&amp;aq_nic-&gt;flags, AQ_NIC_PTP_DPATH_UP))) {</div><div class='add'>+		/* Hardware adds the Timestamp for PTPv2 802.AS1</div><div class='add'>+		 * and PTPv2 IPv4 UDP.</div><div class='add'>+		 * We have to push even general 320 port messages to the ptp</div><div class='add'>+		 * queue explicitly. This is a limitation of current firmware</div><div class='add'>+		 * and hardware PTP design of the chip. Otherwise ptp stream</div><div class='add'>+		 * will fail to sync</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) ||</div><div class='add'>+		    unlikely((ip_hdr(skb)-&gt;version == 4) &amp;&amp;</div><div class='add'>+			     (ip_hdr(skb)-&gt;protocol == IPPROTO_UDP) &amp;&amp;</div><div class='add'>+			     ((udp_hdr(skb)-&gt;dest == htons(319)) ||</div><div class='add'>+			      (udp_hdr(skb)-&gt;dest == htons(320)))) ||</div><div class='add'>+		    unlikely(eth_hdr(skb)-&gt;h_proto == htons(ETH_P_1588)))</div><div class='add'>+			return aq_ptp_xmit(aq_nic, skb);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	return aq_nic_xmit(aq_nic, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_ndev_change_mtu(struct net_device *ndev, int new_mtu)</div><div class='ctx'> {</div><div class='add'>+	int new_frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	int err = aq_nic_set_mtu(aq_nic, new_mtu + ETH_HLEN);</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	prog = READ_ONCE(aq_nic-&gt;xdp_prog);</div><div class='add'>+	if (prog &amp;&amp; !prog-&gt;aux-&gt;xdp_has_frags &amp;&amp;</div><div class='add'>+	    new_frame_size &gt; AQ_CFG_RX_FRAME_MAX) {</div><div class='add'>+		netdev_err(ndev, "Illegal MTU %d for XDP prog without frags\n",</div><div class='add'>+			   ndev-&gt;mtu);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aq_nic_set_mtu(aq_nic, new_mtu + ETH_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='del'>-	ndev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(ndev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -111,11 +154,16 @@ err_exit:</div><div class='ctx'> static int aq_ndev_set_features(struct net_device *ndev,</div><div class='ctx'> 				netdev_features_t features)</div><div class='ctx'> {</div><div class='add'>+	bool is_vlan_tx_insert = !!(features &amp; NETIF_F_HW_VLAN_CTAG_TX);</div><div class='add'>+	bool is_vlan_rx_strip = !!(features &amp; NETIF_F_HW_VLAN_CTAG_RX);</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='del'>-	struct aq_nic_cfg_s *aq_cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	bool need_ndev_restart = false;</div><div class='add'>+	struct aq_nic_cfg_s *aq_cfg;</div><div class='ctx'> 	bool is_lro = false;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	aq_cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+</div><div class='ctx'> 	if (!(features &amp; NETIF_F_NTUPLE)) {</div><div class='ctx'> 		if (aq_nic-&gt;ndev-&gt;features &amp; NETIF_F_NTUPLE) {</div><div class='ctx'> 			err = aq_clear_rxnfc_all_rules(aq_nic);</div><div class='hunk'>@@ -138,21 +186,55 @@ static int aq_ndev_set_features(struct net_device *ndev,</div><div class='ctx'> </div><div class='ctx'> 		if (aq_cfg-&gt;is_lro != is_lro) {</div><div class='ctx'> 			aq_cfg-&gt;is_lro = is_lro;</div><div class='del'>-</div><div class='del'>-			if (netif_running(ndev)) {</div><div class='del'>-				aq_ndev_close(ndev);</div><div class='del'>-				aq_ndev_open(ndev);</div><div class='del'>-			}</div><div class='add'>+			need_ndev_restart = true;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if ((aq_nic-&gt;ndev-&gt;features ^ features) &amp; NETIF_F_RXCSUM)</div><div class='add'>+</div><div class='add'>+	if ((aq_nic-&gt;ndev-&gt;features ^ features) &amp; NETIF_F_RXCSUM) {</div><div class='ctx'> 		err = aq_nic-&gt;aq_hw_ops-&gt;hw_set_offload(aq_nic-&gt;aq_hw,</div><div class='ctx'> 							aq_cfg);</div><div class='ctx'> </div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aq_cfg-&gt;is_vlan_rx_strip != is_vlan_rx_strip) {</div><div class='add'>+		aq_cfg-&gt;is_vlan_rx_strip = is_vlan_rx_strip;</div><div class='add'>+		need_ndev_restart = true;</div><div class='add'>+	}</div><div class='add'>+	if (aq_cfg-&gt;is_vlan_tx_insert != is_vlan_tx_insert) {</div><div class='add'>+		aq_cfg-&gt;is_vlan_tx_insert = is_vlan_tx_insert;</div><div class='add'>+		need_ndev_restart = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (need_ndev_restart &amp;&amp; netif_running(ndev)) {</div><div class='add'>+		aq_ndev_close(ndev);</div><div class='add'>+		aq_ndev_open(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static netdev_features_t aq_ndev_fix_features(struct net_device *ndev,</div><div class='add'>+					      netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+</div><div class='add'>+	if (!(features &amp; NETIF_F_RXCSUM))</div><div class='add'>+		features &amp;= ~NETIF_F_LRO;</div><div class='add'>+</div><div class='add'>+	prog = READ_ONCE(aq_nic-&gt;xdp_prog);</div><div class='add'>+	if (prog &amp;&amp; !prog-&gt;aux-&gt;xdp_has_frags &amp;&amp;</div><div class='add'>+	    aq_nic-&gt;xdp_prog &amp;&amp; features &amp; NETIF_F_LRO) {</div><div class='add'>+		netdev_err(ndev, "LRO is not supported with single buffer XDP, disabling\n");</div><div class='add'>+		features &amp;= ~NETIF_F_LRO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return features;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int aq_ndev_set_mac_address(struct net_device *ndev, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='hunk'>@@ -173,9 +255,57 @@ static void aq_ndev_set_multicast_settings(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	aq_nic_set_packet_filter(aq_nic, ndev-&gt;flags);</div><div class='add'>+	(void)aq_nic_set_multicast_list(aq_nic, ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ndev_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+				struct kernel_hwtstamp_config *config,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!IS_REACHABLE(CONFIG_PTP_1588_CLOCK) || !aq_nic-&gt;aq_ptp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_ptp_hwtstamp_config_set(aq_nic-&gt;aq_ptp, config);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ndev_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+				struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_ptp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	aq_nic_set_multicast_list(aq_nic, ndev);</div><div class='add'>+	aq_ptp_hwtstamp_config_get(aq_nic-&gt;aq_ptp, config);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_ndo_vlan_rx_add_vid(struct net_device *ndev, __be16 proto,</div><div class='hunk'>@@ -207,6 +337,123 @@ static int aq_ndo_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aq_validate_mqprio_opt(struct aq_nic_s *self,</div><div class='add'>+				  struct tc_mqprio_qopt_offload *mqprio,</div><div class='add'>+				  const unsigned int num_tc)</div><div class='add'>+{</div><div class='add'>+	const bool has_min_rate = !!(mqprio-&gt;flags &amp; TC_MQPRIO_F_MIN_RATE);</div><div class='add'>+	struct aq_nic_cfg_s *aq_nic_cfg = aq_nic_get_cfg(self);</div><div class='add'>+	const unsigned int tcs_max = min_t(u8, aq_nic_cfg-&gt;aq_hw_caps-&gt;tcs_max,</div><div class='add'>+					   AQ_CFG_TCS_MAX);</div><div class='add'>+</div><div class='add'>+	if (num_tc &gt; tcs_max) {</div><div class='add'>+		netdev_err(self-&gt;ndev, "Too many TCs requested\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (num_tc != 0 &amp;&amp; !is_power_of_2(num_tc)) {</div><div class='add'>+		netdev_err(self-&gt;ndev, "TC count should be power of 2\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (has_min_rate &amp;&amp; !ATL_HW_IS_CHIP_FEATURE(self-&gt;aq_hw, ANTIGUA)) {</div><div class='add'>+		netdev_err(self-&gt;ndev, "Min tx rate is not supported\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ndo_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='add'>+			   void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct tc_mqprio_qopt_offload *mqprio = type_data;</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(dev);</div><div class='add'>+	bool has_min_rate;</div><div class='add'>+	bool has_max_rate;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (type != TC_SETUP_QDISC_MQPRIO)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	has_min_rate = !!(mqprio-&gt;flags &amp; TC_MQPRIO_F_MIN_RATE);</div><div class='add'>+	has_max_rate = !!(mqprio-&gt;flags &amp; TC_MQPRIO_F_MAX_RATE);</div><div class='add'>+</div><div class='add'>+	err = aq_validate_mqprio_opt(aq_nic, mqprio, mqprio-&gt;qopt.num_tc);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mqprio-&gt;qopt.num_tc; i++) {</div><div class='add'>+		if (has_max_rate) {</div><div class='add'>+			u64 max_rate = mqprio-&gt;max_rate[i];</div><div class='add'>+</div><div class='add'>+			do_div(max_rate, AQ_MBPS_DIVISOR);</div><div class='add'>+			aq_nic_setup_tc_max_rate(aq_nic, i, (u32)max_rate);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (has_min_rate) {</div><div class='add'>+			u64 min_rate = mqprio-&gt;min_rate[i];</div><div class='add'>+</div><div class='add'>+			do_div(min_rate, AQ_MBPS_DIVISOR);</div><div class='add'>+			aq_nic_setup_tc_min_rate(aq_nic, i, (u32)min_rate);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_nic_setup_tc_mqprio(aq_nic, mqprio-&gt;qopt.num_tc,</div><div class='add'>+				      mqprio-&gt;qopt.prio_tc_map);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_xdp_setup(struct net_device *ndev, struct bpf_prog *prog,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool need_update, running = netif_running(ndev);</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(ndev);</div><div class='add'>+	struct bpf_prog *old_prog;</div><div class='add'>+</div><div class='add'>+	if (prog &amp;&amp; !prog-&gt;aux-&gt;xdp_has_frags) {</div><div class='add'>+		if (ndev-&gt;mtu &gt; AQ_CFG_RX_FRAME_MAX) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "prog does not support XDP frags");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (prog &amp;&amp; ndev-&gt;features &amp; NETIF_F_LRO) {</div><div class='add'>+			netdev_err(ndev,</div><div class='add'>+				   "LRO is not supported with single buffer XDP, disabling\n");</div><div class='add'>+			ndev-&gt;features &amp;= ~NETIF_F_LRO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	need_update = !!aq_nic-&gt;xdp_prog != !!prog;</div><div class='add'>+	if (running &amp;&amp; need_update)</div><div class='add'>+		aq_ndev_close(ndev);</div><div class='add'>+</div><div class='add'>+	old_prog = xchg(&amp;aq_nic-&gt;xdp_prog, prog);</div><div class='add'>+	if (old_prog)</div><div class='add'>+		bpf_prog_put(old_prog);</div><div class='add'>+</div><div class='add'>+	if (!old_prog &amp;&amp; prog)</div><div class='add'>+		static_branch_inc(&amp;aq_xdp_locking_key);</div><div class='add'>+	else if (old_prog &amp;&amp; !prog)</div><div class='add'>+		static_branch_dec(&amp;aq_xdp_locking_key);</div><div class='add'>+</div><div class='add'>+	if (running &amp;&amp; need_update)</div><div class='add'>+		return aq_ndev_open(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_xdp(struct net_device *dev, struct netdev_bpf *xdp)</div><div class='add'>+{</div><div class='add'>+	switch (xdp-&gt;command) {</div><div class='add'>+	case XDP_SETUP_PROG:</div><div class='add'>+		return aq_xdp_setup(dev, xdp-&gt;prog, xdp-&gt;extack);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops aq_ndev_ops = {</div><div class='ctx'> 	.ndo_open = aq_ndev_open,</div><div class='ctx'> 	.ndo_stop = aq_ndev_close,</div><div class='hunk'>@@ -215,8 +462,14 @@ static const struct net_device_ops aq_ndev_ops = {</div><div class='ctx'> 	.ndo_change_mtu = aq_ndev_change_mtu,</div><div class='ctx'> 	.ndo_set_mac_address = aq_ndev_set_mac_address,</div><div class='ctx'> 	.ndo_set_features = aq_ndev_set_features,</div><div class='add'>+	.ndo_fix_features = aq_ndev_fix_features,</div><div class='ctx'> 	.ndo_vlan_rx_add_vid = aq_ndo_vlan_rx_add_vid,</div><div class='ctx'> 	.ndo_vlan_rx_kill_vid = aq_ndo_vlan_rx_kill_vid,</div><div class='add'>+	.ndo_setup_tc = aq_ndo_setup_tc,</div><div class='add'>+	.ndo_bpf = aq_xdp,</div><div class='add'>+	.ndo_xdp_xmit = aq_xdp_xmit,</div><div class='add'>+	.ndo_hwtstamp_get = aq_ndev_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = aq_ndev_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int __init aq_ndev_init_module(void)</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.h b/drivers/net/ethernet/aquantia/atlantic/aq_main.h<br/>index 5448b82fb7ea..a78c1a168d8e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_main.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='ctx'>  * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_main.h: Main file for aQuantia Linux driver. */</div><div class='hunk'>@@ -15,7 +12,11 @@</div><div class='ctx'> #include "aq_common.h"</div><div class='ctx'> #include "aq_nic.h"</div><div class='ctx'> </div><div class='add'>+DECLARE_STATIC_KEY_FALSE(aq_xdp_locking_key);</div><div class='add'>+</div><div class='ctx'> void aq_ndev_schedule_work(struct work_struct *work);</div><div class='ctx'> struct net_device *aq_ndev_alloc(void);</div><div class='add'>+int aq_ndev_open(struct net_device *ndev);</div><div class='add'>+int aq_ndev_close(struct net_device *ndev);</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_MAIN_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c<br/>index e82d25a91bc1..b24eaa5283fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_nic.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_nic.c: Definition of common code for NIC. */</div><div class='hunk'>@@ -14,7 +12,11 @@</div><div class='ctx'> #include "aq_vec.h"</div><div class='ctx'> #include "aq_hw.h"</div><div class='ctx'> #include "aq_pci_func.h"</div><div class='add'>+#include "aq_macsec.h"</div><div class='ctx'> #include "aq_main.h"</div><div class='add'>+#include "aq_phy.h"</div><div class='add'>+#include "aq_ptp.h"</div><div class='add'>+#include "aq_filters.h"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -24,6 +26,7 @@</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> </div><div class='ctx'> static unsigned int aq_itr = AQ_CFG_INTERRUPT_MODERATION_AUTO;</div><div class='ctx'> module_param_named(aq_itr, aq_itr, uint, 0644);</div><div class='hunk'>@@ -41,10 +44,6 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self);</div><div class='ctx'> </div><div class='ctx'> static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='del'>-	struct aq_rss_parameters *rss_params = &amp;cfg-&gt;aq_rss;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='ctx'> 	static u8 rss_key[AQ_CFG_RSS_HASHKEY_SIZE] = {</div><div class='ctx'> 		0x1e, 0xad, 0x71, 0x87, 0x65, 0xfc, 0x26, 0x7d,</div><div class='ctx'> 		0x0d, 0x45, 0x67, 0x74, 0xcd, 0x06, 0x1a, 0x18,</div><div class='hunk'>@@ -52,6 +51,11 @@ static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues)</div><div class='ctx'> 		0x19, 0x13, 0x4b, 0xa9, 0xd0, 0x3e, 0xfe, 0x70,</div><div class='ctx'> 		0x25, 0x03, 0xab, 0x50, 0x6a, 0x8b, 0x82, 0x0c</div><div class='ctx'> 	};</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+	struct aq_rss_parameters *rss_params;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	rss_params = &amp;cfg-&gt;aq_rss;</div><div class='ctx'> </div><div class='ctx'> 	rss_params-&gt;hash_secret_key_size = sizeof(rss_key);</div><div class='ctx'> 	memcpy(rss_params-&gt;hash_secret_key, rss_key, sizeof(rss_key));</div><div class='hunk'>@@ -61,10 +65,38 @@ static void aq_nic_rss_init(struct aq_nic_s *self, unsigned int num_rss_queues)</div><div class='ctx'> 		rss_params-&gt;indirection_table[i] = i &amp; (num_rss_queues - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Recalculate the number of vectors */</div><div class='add'>+static void aq_nic_cfg_update_num_vecs(struct aq_nic_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;vecs = min(cfg-&gt;aq_hw_caps-&gt;vecs, AQ_CFG_VECS_DEF);</div><div class='add'>+	cfg-&gt;vecs = min(cfg-&gt;vecs, num_online_cpus());</div><div class='add'>+	if (self-&gt;irqvecs &gt; AQ_HW_SERVICE_IRQS)</div><div class='add'>+		cfg-&gt;vecs = min(cfg-&gt;vecs, self-&gt;irqvecs - AQ_HW_SERVICE_IRQS);</div><div class='add'>+	/* cfg-&gt;vecs should be power of 2 for RSS */</div><div class='add'>+	cfg-&gt;vecs = rounddown_pow_of_two(cfg-&gt;vecs);</div><div class='add'>+</div><div class='add'>+	if (ATL_HW_IS_CHIP_FEATURE(self-&gt;aq_hw, ANTIGUA)) {</div><div class='add'>+		if (cfg-&gt;tcs &gt; 2)</div><div class='add'>+			cfg-&gt;vecs = min(cfg-&gt;vecs, 4U);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;vecs &lt;= 4)</div><div class='add'>+		cfg-&gt;tc_mode = AQ_TC_MODE_8TCS;</div><div class='add'>+	else</div><div class='add'>+		cfg-&gt;tc_mode = AQ_TC_MODE_4TCS;</div><div class='add'>+</div><div class='add'>+	/*rss rings */</div><div class='add'>+	cfg-&gt;num_rss_queues = min(cfg-&gt;vecs, AQ_CFG_NUM_RSS_QUEUES_DEF);</div><div class='add'>+	aq_nic_rss_init(self, cfg-&gt;num_rss_queues);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Checks hw_caps and 'corrects' aq_nic_cfg in runtime */</div><div class='ctx'> void aq_nic_cfg_start(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;tcs = AQ_CFG_TCS_DEF;</div><div class='ctx'> </div><div class='hunk'>@@ -76,42 +108,26 @@ void aq_nic_cfg_start(struct aq_nic_s *self)</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;rxpageorder = AQ_CFG_RX_PAGEORDER;</div><div class='ctx'> 	cfg-&gt;is_rss = AQ_CFG_IS_RSS_DEF;</div><div class='del'>-	cfg-&gt;num_rss_queues = AQ_CFG_NUM_RSS_QUEUES_DEF;</div><div class='ctx'> 	cfg-&gt;aq_rss.base_cpu_number = AQ_CFG_RSS_BASE_CPU_NUM_DEF;</div><div class='del'>-	cfg-&gt;flow_control = AQ_CFG_FC_MODE;</div><div class='add'>+	cfg-&gt;fc.req = AQ_CFG_FC_MODE;</div><div class='add'>+	cfg-&gt;wol = AQ_CFG_WOL_MODES;</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;mtu = AQ_CFG_MTU_DEF;</div><div class='ctx'> 	cfg-&gt;link_speed_msk = AQ_CFG_SPEED_MSK;</div><div class='ctx'> 	cfg-&gt;is_autoneg = AQ_CFG_IS_AUTONEG_DEF;</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;is_lro = AQ_CFG_IS_LRO_DEF;</div><div class='add'>+	cfg-&gt;is_ptp = true;</div><div class='ctx'> </div><div class='ctx'> 	/*descriptors */</div><div class='ctx'> 	cfg-&gt;rxds = min(cfg-&gt;aq_hw_caps-&gt;rxds_max, AQ_CFG_RXDS_DEF);</div><div class='ctx'> 	cfg-&gt;txds = min(cfg-&gt;aq_hw_caps-&gt;txds_max, AQ_CFG_TXDS_DEF);</div><div class='ctx'> </div><div class='del'>-	/*rss rings */</div><div class='del'>-	cfg-&gt;vecs = min(cfg-&gt;aq_hw_caps-&gt;vecs, AQ_CFG_VECS_DEF);</div><div class='del'>-	cfg-&gt;vecs = min(cfg-&gt;vecs, num_online_cpus());</div><div class='del'>-	if (self-&gt;irqvecs &gt; AQ_HW_SERVICE_IRQS)</div><div class='del'>-		cfg-&gt;vecs = min(cfg-&gt;vecs, self-&gt;irqvecs - AQ_HW_SERVICE_IRQS);</div><div class='del'>-	/* cfg-&gt;vecs should be power of 2 for RSS */</div><div class='del'>-	if (cfg-&gt;vecs &gt;= 8U)</div><div class='del'>-		cfg-&gt;vecs = 8U;</div><div class='del'>-	else if (cfg-&gt;vecs &gt;= 4U)</div><div class='del'>-		cfg-&gt;vecs = 4U;</div><div class='del'>-	else if (cfg-&gt;vecs &gt;= 2U)</div><div class='del'>-		cfg-&gt;vecs = 2U;</div><div class='del'>-	else</div><div class='del'>-		cfg-&gt;vecs = 1U;</div><div class='del'>-</div><div class='del'>-	cfg-&gt;num_rss_queues = min(cfg-&gt;vecs, AQ_CFG_NUM_RSS_QUEUES_DEF);</div><div class='del'>-</div><div class='del'>-	aq_nic_rss_init(self, cfg-&gt;num_rss_queues);</div><div class='add'>+	aq_nic_cfg_update_num_vecs(self);</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;irq_type = aq_pci_func_get_irq_type(self);</div><div class='ctx'> </div><div class='del'>-	if ((cfg-&gt;irq_type == AQ_HW_IRQ_LEGACY) ||</div><div class='add'>+	if ((cfg-&gt;irq_type == AQ_HW_IRQ_INTX) ||</div><div class='ctx'> 	    (cfg-&gt;aq_hw_caps-&gt;vecs == 1U) ||</div><div class='ctx'> 	    (cfg-&gt;vecs == 1U)) {</div><div class='ctx'> 		cfg-&gt;is_rss = 0U;</div><div class='hunk'>@@ -129,6 +145,12 @@ void aq_nic_cfg_start(struct aq_nic_s *self)</div><div class='ctx'> </div><div class='ctx'> 	cfg-&gt;link_speed_msk &amp;= cfg-&gt;aq_hw_caps-&gt;link_speed_msk;</div><div class='ctx'> 	cfg-&gt;features = cfg-&gt;aq_hw_caps-&gt;hw_features;</div><div class='add'>+	cfg-&gt;is_vlan_rx_strip = !!(cfg-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX);</div><div class='add'>+	cfg-&gt;is_vlan_tx_insert = !!(cfg-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX);</div><div class='add'>+	cfg-&gt;is_vlan_force_promisc = true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; sizeof(cfg-&gt;prio_tc_map); i++)</div><div class='add'>+		cfg-&gt;prio_tc_map[i] = cfg-&gt;tcs * i / 8;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_nic_update_link_status(struct aq_nic_s *self)</div><div class='hunk'>@@ -139,18 +161,27 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='add'>+	if (self-&gt;aq_fw_ops-&gt;get_flow_control)</div><div class='add'>+		self-&gt;aq_fw_ops-&gt;get_flow_control(self-&gt;aq_hw, &amp;fc);</div><div class='add'>+	self-&gt;aq_nic_cfg.fc.cur = fc;</div><div class='add'>+</div><div class='ctx'> 	if (self-&gt;link_status.mbps != self-&gt;aq_hw-&gt;aq_link_status.mbps) {</div><div class='del'>-		pr_info("%s: link change old %d new %d\n",</div><div class='del'>-			AQ_CFG_DRV_NAME, self-&gt;link_status.mbps,</div><div class='del'>-			self-&gt;aq_hw-&gt;aq_link_status.mbps);</div><div class='add'>+		netdev_info(self-&gt;ndev, "%s: link change old %d new %d\n",</div><div class='add'>+			    AQ_CFG_DRV_NAME, self-&gt;link_status.mbps,</div><div class='add'>+			    self-&gt;aq_hw-&gt;aq_link_status.mbps);</div><div class='ctx'> 		aq_nic_update_interrupt_moderation_settings(self);</div><div class='ctx'> </div><div class='add'>+		if (self-&gt;aq_ptp) {</div><div class='add'>+			aq_ptp_clock_init(self);</div><div class='add'>+			aq_ptp_tm_offset_set(self,</div><div class='add'>+					     self-&gt;aq_hw-&gt;aq_link_status.mbps);</div><div class='add'>+			aq_ptp_link_change(self);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* Driver has to update flow control settings on RX block</div><div class='ctx'> 		 * on any link event.</div><div class='ctx'> 		 * We should query FW whether it negotiated FC.</div><div class='ctx'> 		 */</div><div class='del'>-		if (self-&gt;aq_fw_ops-&gt;get_flow_control)</div><div class='del'>-			self-&gt;aq_fw_ops-&gt;get_flow_control(self-&gt;aq_hw, &amp;fc);</div><div class='ctx'> 		if (self-&gt;aq_hw_ops-&gt;hw_set_fc)</div><div class='ctx'> 			self-&gt;aq_hw_ops-&gt;hw_set_fc(self-&gt;aq_hw, fc, 0);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -162,6 +193,12 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)</div><div class='ctx'> 		aq_utils_obj_clear(&amp;self-&gt;flags,</div><div class='ctx'> 				   AQ_NIC_LINK_DOWN);</div><div class='ctx'> 		netif_carrier_on(self-&gt;ndev);</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+		aq_macsec_enable(self);</div><div class='add'>+#endif</div><div class='add'>+		if (self-&gt;aq_hw_ops-&gt;hw_tc_rate_limit_set)</div><div class='add'>+			self-&gt;aq_hw_ops-&gt;hw_tc_rate_limit_set(self-&gt;aq_hw);</div><div class='add'>+</div><div class='ctx'> 		netif_tx_wake_all_queues(self-&gt;ndev);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (netif_carrier_ok(self-&gt;ndev) &amp;&amp; !self-&gt;link_status.mbps) {</div><div class='hunk'>@@ -169,6 +206,7 @@ static int aq_nic_update_link_status(struct aq_nic_s *self)</div><div class='ctx'> 		netif_tx_disable(self-&gt;ndev);</div><div class='ctx'> 		aq_utils_obj_set(&amp;self-&gt;flags, AQ_NIC_LINK_DOWN);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -183,6 +221,7 @@ static irqreturn_t aq_linkstate_threaded_isr(int irq, void *private)</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;aq_hw_ops-&gt;hw_irq_enable(self-&gt;aq_hw,</div><div class='ctx'> 				       BIT(self-&gt;aq_nic_cfg.link_irq_vec));</div><div class='add'>+</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -192,6 +231,8 @@ static void aq_nic_service_task(struct work_struct *work)</div><div class='ctx'> 					     service_task);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	aq_ptp_service_task(self);</div><div class='add'>+</div><div class='ctx'> 	if (aq_utils_obj_test(&amp;self-&gt;flags, AQ_NIC_FLAGS_IS_NOT_READY))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -199,6 +240,10 @@ static void aq_nic_service_task(struct work_struct *work)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	aq_macsec_work(self);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	if (self-&gt;aq_fw_ops-&gt;update_stats)</div><div class='ctx'> 		self-&gt;aq_fw_ops-&gt;update_stats(self-&gt;aq_hw);</div><div class='hunk'>@@ -209,29 +254,51 @@ static void aq_nic_service_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void aq_nic_service_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *self = from_timer(self, t, service_timer);</div><div class='add'>+	struct aq_nic_s *self = timer_container_of(self, t, service_timer);</div><div class='ctx'> </div><div class='del'>-	mod_timer(&amp;self-&gt;service_timer, jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);</div><div class='add'>+	mod_timer(&amp;self-&gt;service_timer,</div><div class='add'>+		  jiffies + AQ_CFG_SERVICE_TIMER_INTERVAL);</div><div class='ctx'> </div><div class='ctx'> 	aq_ndev_schedule_work(&amp;self-&gt;service_task);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aq_nic_polling_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *self = from_timer(self, t, polling_timer);</div><div class='del'>-	struct aq_vec_s *aq_vec = NULL;</div><div class='add'>+	struct aq_nic_s *self = timer_container_of(self, t, polling_timer);</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-		self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i])</div><div class='del'>-		aq_vec_isr(i, (void *)aq_vec);</div><div class='add'>+	for (i = 0U; self-&gt;aq_vecs &gt; i; ++i)</div><div class='add'>+		aq_vec_isr(i, (void *)self-&gt;aq_vec[i]);</div><div class='ctx'> </div><div class='ctx'> 	mod_timer(&amp;self-&gt;polling_timer, jiffies +</div><div class='ctx'> 		  AQ_CFG_POLLING_TIMER_INTERVAL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aq_nic_hw_prepare(struct aq_nic_s *self)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err = self-&gt;aq_hw_ops-&gt;hw_soft_reset(self-&gt;aq_hw);</div><div class='add'>+	if (err)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	err = self-&gt;aq_hw_ops-&gt;hw_prepare(self-&gt;aq_hw, &amp;self-&gt;aq_fw_ops);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool aq_nic_is_valid_ether_addr(const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	/* Some engineering samples of Aquantia NICs are provisioned with a</div><div class='add'>+	 * partially populated MAC, which is still invalid.</div><div class='add'>+	 */</div><div class='add'>+	return !(addr[0] == 0 &amp;&amp; addr[1] == 0 &amp;&amp; addr[2] == 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int aq_nic_ndev_register(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!self-&gt;ndev) {</div><div class='hunk'>@@ -239,22 +306,37 @@ int aq_nic_ndev_register(struct aq_nic_s *self)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_initfw(self-&gt;aq_hw, &amp;self-&gt;aq_fw_ops);</div><div class='add'>+	err = aq_nic_hw_prepare(self);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='del'>-	err = self-&gt;aq_fw_ops-&gt;get_mac_permanent(self-&gt;aq_hw,</div><div class='del'>-			    self-&gt;ndev-&gt;dev_addr);</div><div class='del'>-	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_exit;</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	aq_macsec_init(self);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (platform_get_ethdev_address(&amp;self-&gt;pdev-&gt;dev, self-&gt;ndev) != 0) {</div><div class='add'>+		// If DT has none or an invalid one, ask device for MAC address</div><div class='add'>+		mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+		err = self-&gt;aq_fw_ops-&gt;get_mac_permanent(self-&gt;aq_hw, addr);</div><div class='add'>+		mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		if (is_valid_ether_addr(addr) &amp;&amp;</div><div class='add'>+		    aq_nic_is_valid_ether_addr(addr)) {</div><div class='add'>+			eth_hw_addr_set(self-&gt;ndev, addr);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_warn(self-&gt;ndev, "MAC is invalid, will use random.");</div><div class='add'>+			eth_hw_addr_random(self-&gt;ndev);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #if defined(AQ_CFG_MAC_ADDR_PERMANENT)</div><div class='ctx'> 	{</div><div class='ctx'> 		static u8 mac_addr_permanent[] = AQ_CFG_MAC_ADDR_PERMANENT;</div><div class='ctx'> </div><div class='del'>-		ether_addr_copy(self-&gt;ndev-&gt;dev_addr, mac_addr_permanent);</div><div class='add'>+		eth_hw_addr_set(self-&gt;ndev, mac_addr_permanent);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -277,6 +359,10 @@ int aq_nic_ndev_register(struct aq_nic_s *self)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	if (err)</div><div class='add'>+		aq_macsec_free(self);</div><div class='add'>+#endif</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -288,13 +374,21 @@ void aq_nic_ndev_init(struct aq_nic_s *self)</div><div class='ctx'> 	self-&gt;ndev-&gt;hw_features |= aq_hw_caps-&gt;hw_features;</div><div class='ctx'> 	self-&gt;ndev-&gt;features = aq_hw_caps-&gt;hw_features;</div><div class='ctx'> 	self-&gt;ndev-&gt;vlan_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM |</div><div class='del'>-				     NETIF_F_RXHASH | NETIF_F_SG | NETIF_F_LRO;</div><div class='add'>+				     NETIF_F_RXHASH | NETIF_F_SG |</div><div class='add'>+				     NETIF_F_LRO | NETIF_F_TSO | NETIF_F_TSO6;</div><div class='add'>+	self-&gt;ndev-&gt;gso_partial_features = NETIF_F_GSO_UDP_L4;</div><div class='ctx'> 	self-&gt;ndev-&gt;priv_flags = aq_hw_caps-&gt;hw_priv_flags;</div><div class='ctx'> 	self-&gt;ndev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='ctx'> </div><div class='add'>+	self-&gt;msg_enable = NETIF_MSG_DRV | NETIF_MSG_LINK;</div><div class='ctx'> 	self-&gt;ndev-&gt;mtu = aq_nic_cfg-&gt;mtu - ETH_HLEN;</div><div class='ctx'> 	self-&gt;ndev-&gt;max_mtu = aq_hw_caps-&gt;mtu - ETH_FCS_LEN - ETH_HLEN;</div><div class='ctx'> </div><div class='add'>+	self-&gt;ndev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC |</div><div class='add'>+				   NETDEV_XDP_ACT_REDIRECT |</div><div class='add'>+				   NETDEV_XDP_ACT_NDO_XMIT |</div><div class='add'>+				   NETDEV_XDP_ACT_RX_SG |</div><div class='add'>+				   NETDEV_XDP_ACT_NDO_XMIT_SG;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void aq_nic_set_tx_ring(struct aq_nic_s *self, unsigned int idx,</div><div class='hunk'>@@ -311,8 +405,8 @@ struct net_device *aq_nic_get_ndev(struct aq_nic_s *self)</div><div class='ctx'> int aq_nic_init(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_vec_s *aq_vec = NULL;</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;power_state = AQ_HW_POWER_STATE_D0;</div><div class='ctx'> 	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='hunk'>@@ -320,15 +414,54 @@ int aq_nic_init(struct aq_nic_s *self)</div><div class='ctx'> 	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='add'>+	/* Restore default settings */</div><div class='add'>+	aq_nic_set_downshift(self, self-&gt;aq_nic_cfg.downshift_counter);</div><div class='add'>+	aq_nic_set_media_detect(self, self-&gt;aq_nic_cfg.is_media_detect ?</div><div class='add'>+				AQ_HW_MEDIA_DETECT_CNT : 0);</div><div class='ctx'> </div><div class='ctx'> 	err = self-&gt;aq_hw_ops-&gt;hw_init(self-&gt;aq_hw,</div><div class='ctx'> 				       aq_nic_get_ndev(self)-&gt;dev_addr);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-		self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i])</div><div class='add'>+	if (ATL_HW_IS_CHIP_FEATURE(self-&gt;aq_hw, ATLANTIC) &amp;&amp;</div><div class='add'>+	    self-&gt;aq_nic_cfg.aq_hw_caps-&gt;media_type == AQ_HW_MEDIA_TYPE_TP) {</div><div class='add'>+		self-&gt;aq_hw-&gt;phy_id = HW_ATL_PHY_ID_MAX;</div><div class='add'>+		err = aq_phy_init(self-&gt;aq_hw);</div><div class='add'>+</div><div class='add'>+		/* Disable the PTP on NICs where it's known to cause datapath</div><div class='add'>+		 * problems.</div><div class='add'>+		 * Ideally this should have been done by PHY provisioning, but</div><div class='add'>+		 * many units have been shipped with enabled PTP block already.</div><div class='add'>+		 */</div><div class='add'>+		if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;quirks &amp; AQ_NIC_QUIRK_BAD_PTP)</div><div class='add'>+			if (self-&gt;aq_hw-&gt;phy_id != HW_ATL_PHY_ID_MAX)</div><div class='add'>+				aq_phy_disable_ptp(self-&gt;aq_hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0U; i &lt; self-&gt;aq_vecs; i++) {</div><div class='add'>+		aq_vec = self-&gt;aq_vec[i];</div><div class='add'>+		err = aq_vec_ring_alloc(aq_vec, self, i,</div><div class='add'>+					aq_nic_get_cfg(self));</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='ctx'> 		aq_vec_init(aq_vec, self-&gt;aq_hw_ops, self-&gt;aq_hw);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (aq_nic_get_cfg(self)-&gt;is_ptp) {</div><div class='add'>+		err = aq_ptp_init(self, self-&gt;irqvecs - 1);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		err = aq_ptp_ring_alloc(self);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		err = aq_ptp_ring_init(self);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(self-&gt;ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -339,8 +472,11 @@ err_exit:</div><div class='ctx'> int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_vec_s *aq_vec = NULL;</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct aq_nic_cfg_s *cfg;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	cfg = aq_nic_get_cfg(self);</div><div class='ctx'> </div><div class='ctx'> 	err = self-&gt;aq_hw_ops-&gt;hw_multicast_list_set(self-&gt;aq_hw,</div><div class='ctx'> 						     self-&gt;mc_list.ar,</div><div class='hunk'>@@ -353,13 +489,19 @@ int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-		self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i]) {</div><div class='add'>+	for (i = 0U; self-&gt;aq_vecs &gt; i; ++i) {</div><div class='add'>+		aq_vec = self-&gt;aq_vec[i];</div><div class='ctx'> 		err = aq_vec_start(aq_vec);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = aq_ptp_ring_start(self);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	aq_nic_set_loopback(self);</div><div class='add'>+</div><div class='ctx'> 	err = self-&gt;aq_hw_ops-&gt;hw_start(self-&gt;aq_hw);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='hunk'>@@ -373,13 +515,13 @@ int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> 	timer_setup(&amp;self-&gt;service_timer, aq_nic_service_timer_cb, 0);</div><div class='ctx'> 	aq_nic_service_timer_cb(&amp;self-&gt;service_timer);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.is_polling) {</div><div class='add'>+	if (cfg-&gt;is_polling) {</div><div class='ctx'> 		timer_setup(&amp;self-&gt;polling_timer, aq_nic_polling_timer_cb, 0);</div><div class='ctx'> 		mod_timer(&amp;self-&gt;polling_timer, jiffies +</div><div class='ctx'> 			  AQ_CFG_POLLING_TIMER_INTERVAL);</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-			self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i]) {</div><div class='add'>+		for (i = 0U; self-&gt;aq_vecs &gt; i; ++i) {</div><div class='add'>+			aq_vec = self-&gt;aq_vec[i];</div><div class='ctx'> 			err = aq_pci_func_alloc_irq(self, i, self-&gt;ndev-&gt;name,</div><div class='ctx'> 						    aq_vec_isr, aq_vec,</div><div class='ctx'> 						    aq_vec_get_affinity_mask(aq_vec));</div><div class='hunk'>@@ -387,16 +529,20 @@ int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> 				goto err_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (self-&gt;aq_nic_cfg.link_irq_vec) {</div><div class='add'>+		err = aq_ptp_irq_alloc(self);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		if (cfg-&gt;link_irq_vec) {</div><div class='ctx'> 			int irqvec = pci_irq_vector(self-&gt;pdev,</div><div class='del'>-						   self-&gt;aq_nic_cfg.link_irq_vec);</div><div class='add'>+						    cfg-&gt;link_irq_vec);</div><div class='ctx'> 			err = request_threaded_irq(irqvec, NULL,</div><div class='ctx'> 						   aq_linkstate_threaded_isr,</div><div class='del'>-						   IRQF_SHARED,</div><div class='add'>+						   IRQF_SHARED | IRQF_ONESHOT,</div><div class='ctx'> 						   self-&gt;ndev-&gt;name, self);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto err_exit;</div><div class='del'>-			self-&gt;msix_entry_mask |= (1 &lt;&lt; self-&gt;aq_nic_cfg.link_irq_vec);</div><div class='add'>+			self-&gt;msix_entry_mask |= (1 &lt;&lt; cfg-&gt;link_irq_vec);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		err = self-&gt;aq_hw_ops-&gt;hw_irq_enable(self-&gt;aq_hw,</div><div class='hunk'>@@ -405,58 +551,195 @@ int aq_nic_start(struct aq_nic_s *self)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = netif_set_real_num_tx_queues(self-&gt;ndev, self-&gt;aq_vecs);</div><div class='add'>+	err = netif_set_real_num_tx_queues(self-&gt;ndev,</div><div class='add'>+					   self-&gt;aq_vecs * cfg-&gt;tcs);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	err = netif_set_real_num_rx_queues(self-&gt;ndev, self-&gt;aq_vecs);</div><div class='add'>+	err = netif_set_real_num_rx_queues(self-&gt;ndev,</div><div class='add'>+					   self-&gt;aq_vecs * cfg-&gt;tcs);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; cfg-&gt;tcs; i++) {</div><div class='add'>+		u16 offset = self-&gt;aq_vecs * i;</div><div class='add'>+</div><div class='add'>+		netdev_set_tc_queue(self-&gt;ndev, i, self-&gt;aq_vecs, offset);</div><div class='add'>+	}</div><div class='ctx'> 	netif_tx_start_all_queues(self-&gt;ndev);</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static unsigned int aq_nic_map_skb(struct aq_nic_s *self,</div><div class='del'>-				   struct sk_buff *skb,</div><div class='add'>+static unsigned int aq_nic_map_xdp(struct aq_nic_s *self,</div><div class='add'>+				   struct xdp_frame *xdpf,</div><div class='ctx'> 				   struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = aq_nic_get_dev(self);</div><div class='add'>+	struct aq_ring_buff_s *first = NULL;</div><div class='add'>+	unsigned int dx = ring-&gt;sw_tail;</div><div class='add'>+	struct aq_ring_buff_s *dx_buff;</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+	unsigned int frag_count = 0U;</div><div class='add'>+	unsigned int nr_frags = 0U;</div><div class='ctx'> 	unsigned int ret = 0U;</div><div class='add'>+	u16 total_len;</div><div class='add'>+</div><div class='add'>+	dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='add'>+	dx_buff-&gt;flags = 0U;</div><div class='add'>+</div><div class='add'>+	sinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+	total_len = xdpf-&gt;len;</div><div class='add'>+	dx_buff-&gt;len = total_len;</div><div class='add'>+	if (xdp_frame_has_frags(xdpf)) {</div><div class='add'>+		nr_frags = sinfo-&gt;nr_frags;</div><div class='add'>+		total_len += sinfo-&gt;xdp_frags_size;</div><div class='add'>+	}</div><div class='add'>+	dx_buff-&gt;pa = dma_map_single(dev, xdpf-&gt;data, dx_buff-&gt;len,</div><div class='add'>+				     DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, dx_buff-&gt;pa)))</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	first = dx_buff;</div><div class='add'>+	dx_buff-&gt;len_pkt = total_len;</div><div class='add'>+	dx_buff-&gt;is_sop = 1U;</div><div class='add'>+	dx_buff-&gt;is_mapped = 1U;</div><div class='add'>+	++ret;</div><div class='add'>+</div><div class='add'>+	for (; nr_frags--; ++frag_count) {</div><div class='add'>+		skb_frag_t *frag = &amp;sinfo-&gt;frags[frag_count];</div><div class='add'>+		unsigned int frag_len = skb_frag_size(frag);</div><div class='add'>+		unsigned int buff_offset = 0U;</div><div class='add'>+		unsigned int buff_size = 0U;</div><div class='add'>+		dma_addr_t frag_pa;</div><div class='add'>+</div><div class='add'>+		while (frag_len) {</div><div class='add'>+			if (frag_len &gt; AQ_CFG_TX_FRAME_MAX)</div><div class='add'>+				buff_size = AQ_CFG_TX_FRAME_MAX;</div><div class='add'>+			else</div><div class='add'>+				buff_size = frag_len;</div><div class='add'>+</div><div class='add'>+			frag_pa = skb_frag_dma_map(dev, frag, buff_offset,</div><div class='add'>+						   buff_size, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+			if (unlikely(dma_mapping_error(dev, frag_pa)))</div><div class='add'>+				goto mapping_error;</div><div class='add'>+</div><div class='add'>+			dx = aq_ring_next_dx(ring, dx);</div><div class='add'>+			dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='add'>+</div><div class='add'>+			dx_buff-&gt;flags = 0U;</div><div class='add'>+			dx_buff-&gt;len = buff_size;</div><div class='add'>+			dx_buff-&gt;pa = frag_pa;</div><div class='add'>+			dx_buff-&gt;is_mapped = 1U;</div><div class='add'>+			dx_buff-&gt;eop_index = 0xffffU;</div><div class='add'>+</div><div class='add'>+			frag_len -= buff_size;</div><div class='add'>+			buff_offset += buff_size;</div><div class='add'>+</div><div class='add'>+			++ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	first-&gt;eop_index = dx;</div><div class='add'>+	dx_buff-&gt;is_eop = 1U;</div><div class='add'>+	dx_buff-&gt;skb = NULL;</div><div class='add'>+	dx_buff-&gt;xdpf = xdpf;</div><div class='add'>+	goto exit;</div><div class='add'>+</div><div class='add'>+mapping_error:</div><div class='add'>+	for (dx = ring-&gt;sw_tail;</div><div class='add'>+	     ret &gt; 0;</div><div class='add'>+	     --ret, dx = aq_ring_next_dx(ring, dx)) {</div><div class='add'>+		dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='add'>+</div><div class='add'>+		if (!dx_buff-&gt;pa)</div><div class='add'>+			continue;</div><div class='add'>+		if (unlikely(dx_buff-&gt;is_sop))</div><div class='add'>+			dma_unmap_single(dev, dx_buff-&gt;pa, dx_buff-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+		else</div><div class='add'>+			dma_unmap_page(dev, dx_buff-&gt;pa, dx_buff-&gt;len,</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,</div><div class='add'>+			    struct aq_ring_s *ring)</div><div class='add'>+{</div><div class='ctx'> 	unsigned int nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	unsigned int frag_count = 0U;</div><div class='del'>-	unsigned int dx = ring-&gt;sw_tail;</div><div class='add'>+	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(self);</div><div class='add'>+	struct device *dev = aq_nic_get_dev(self);</div><div class='ctx'> 	struct aq_ring_buff_s *first = NULL;</div><div class='del'>-	struct aq_ring_buff_s *dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='add'>+	u8 ipver = ip_hdr(skb)-&gt;version;</div><div class='add'>+	struct aq_ring_buff_s *dx_buff;</div><div class='add'>+	bool need_context_tag = false;</div><div class='add'>+	unsigned int frag_count = 0U;</div><div class='add'>+	unsigned int ret = 0U;</div><div class='add'>+	unsigned int dx;</div><div class='add'>+	u8 l4proto = 0;</div><div class='add'>+</div><div class='add'>+	if (ipver == 4)</div><div class='add'>+		l4proto = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+	else if (ipver == 6)</div><div class='add'>+		l4proto = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+</div><div class='add'>+	dx = ring-&gt;sw_tail;</div><div class='add'>+	dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='add'>+	dx_buff-&gt;flags = 0U;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb_is_gso(skb))) {</div><div class='del'>-		dx_buff-&gt;flags = 0U;</div><div class='add'>+		dx_buff-&gt;mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+		if (l4proto == IPPROTO_TCP) {</div><div class='add'>+			dx_buff-&gt;is_gso_tcp = 1U;</div><div class='add'>+			dx_buff-&gt;len_l4 = tcp_hdrlen(skb);</div><div class='add'>+		} else if (l4proto == IPPROTO_UDP) {</div><div class='add'>+			dx_buff-&gt;is_gso_udp = 1U;</div><div class='add'>+			dx_buff-&gt;len_l4 = sizeof(struct udphdr);</div><div class='add'>+			/* UDP GSO Hardware does not replace packet length. */</div><div class='add'>+			udp_hdr(skb)-&gt;len = htons(dx_buff-&gt;mss +</div><div class='add'>+						  dx_buff-&gt;len_l4);</div><div class='add'>+		} else {</div><div class='add'>+			WARN_ONCE(true, "Bad GSO mode");</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='ctx'> 		dx_buff-&gt;len_pkt = skb-&gt;len;</div><div class='ctx'> 		dx_buff-&gt;len_l2 = ETH_HLEN;</div><div class='del'>-		dx_buff-&gt;len_l3 = ip_hdrlen(skb);</div><div class='del'>-		dx_buff-&gt;len_l4 = tcp_hdrlen(skb);</div><div class='del'>-		dx_buff-&gt;mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='del'>-		dx_buff-&gt;is_txc = 1U;</div><div class='add'>+		dx_buff-&gt;len_l3 = skb_network_header_len(skb);</div><div class='ctx'> 		dx_buff-&gt;eop_index = 0xffffU;</div><div class='add'>+		dx_buff-&gt;is_ipv6 = (ipver == 6);</div><div class='add'>+		need_context_tag = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		dx_buff-&gt;is_ipv6 =</div><div class='del'>-			(ip_hdr(skb)-&gt;version == 6) ? 1U : 0U;</div><div class='add'>+	if (cfg-&gt;is_vlan_tx_insert &amp;&amp; skb_vlan_tag_present(skb)) {</div><div class='add'>+		dx_buff-&gt;vlan_tx_tag = skb_vlan_tag_get(skb);</div><div class='add'>+		dx_buff-&gt;len_pkt = skb-&gt;len;</div><div class='add'>+		dx_buff-&gt;is_vlan = 1U;</div><div class='add'>+		need_context_tag = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (need_context_tag) {</div><div class='ctx'> 		dx = aq_ring_next_dx(ring, dx);</div><div class='ctx'> 		dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='add'>+		dx_buff-&gt;flags = 0U;</div><div class='ctx'> 		++ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dx_buff-&gt;flags = 0U;</div><div class='ctx'> 	dx_buff-&gt;len = skb_headlen(skb);</div><div class='del'>-	dx_buff-&gt;pa = dma_map_single(aq_nic_get_dev(self),</div><div class='add'>+	dx_buff-&gt;pa = dma_map_single(dev,</div><div class='ctx'> 				     skb-&gt;data,</div><div class='ctx'> 				     dx_buff-&gt;len,</div><div class='ctx'> 				     DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dma_mapping_error(aq_nic_get_dev(self), dx_buff-&gt;pa)))</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, dx_buff-&gt;pa))) {</div><div class='add'>+		ret = 0;</div><div class='ctx'> 		goto exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	first = dx_buff;</div><div class='ctx'> 	dx_buff-&gt;len_pkt = skb-&gt;len;</div><div class='hunk'>@@ -465,24 +748,9 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self,</div><div class='ctx'> 	++ret;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='del'>-		dx_buff-&gt;is_ip_cso = (htons(ETH_P_IP) == skb-&gt;protocol) ?</div><div class='del'>-			1U : 0U;</div><div class='del'>-</div><div class='del'>-		if (ip_hdr(skb)-&gt;version == 4) {</div><div class='del'>-			dx_buff-&gt;is_tcp_cso =</div><div class='del'>-				(ip_hdr(skb)-&gt;protocol == IPPROTO_TCP) ?</div><div class='del'>-					1U : 0U;</div><div class='del'>-			dx_buff-&gt;is_udp_cso =</div><div class='del'>-				(ip_hdr(skb)-&gt;protocol == IPPROTO_UDP) ?</div><div class='del'>-					1U : 0U;</div><div class='del'>-		} else if (ip_hdr(skb)-&gt;version == 6) {</div><div class='del'>-			dx_buff-&gt;is_tcp_cso =</div><div class='del'>-				(ipv6_hdr(skb)-&gt;nexthdr == NEXTHDR_TCP) ?</div><div class='del'>-					1U : 0U;</div><div class='del'>-			dx_buff-&gt;is_udp_cso =</div><div class='del'>-				(ipv6_hdr(skb)-&gt;nexthdr == NEXTHDR_UDP) ?</div><div class='del'>-					1U : 0U;</div><div class='del'>-		}</div><div class='add'>+		dx_buff-&gt;is_ip_cso = (htons(ETH_P_IP) == skb-&gt;protocol);</div><div class='add'>+		dx_buff-&gt;is_tcp_cso = (l4proto == IPPROTO_TCP);</div><div class='add'>+		dx_buff-&gt;is_udp_cso = (l4proto == IPPROTO_UDP);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (; nr_frags--; ++frag_count) {</div><div class='hunk'>@@ -500,13 +768,13 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self,</div><div class='ctx'> 			else</div><div class='ctx'> 				buff_size = frag_len;</div><div class='ctx'> </div><div class='del'>-			frag_pa = skb_frag_dma_map(aq_nic_get_dev(self),</div><div class='add'>+			frag_pa = skb_frag_dma_map(dev,</div><div class='ctx'> 						   frag,</div><div class='ctx'> 						   buff_offset,</div><div class='ctx'> 						   buff_size,</div><div class='ctx'> 						   DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-			if (unlikely(dma_mapping_error(aq_nic_get_dev(self),</div><div class='add'>+			if (unlikely(dma_mapping_error(dev,</div><div class='ctx'> 						       frag_pa)))</div><div class='ctx'> 				goto mapping_error;</div><div class='ctx'> </div><div class='hunk'>@@ -529,6 +797,7 @@ static unsigned int aq_nic_map_skb(struct aq_nic_s *self,</div><div class='ctx'> 	first-&gt;eop_index = dx;</div><div class='ctx'> 	dx_buff-&gt;is_eop = 1U;</div><div class='ctx'> 	dx_buff-&gt;skb = skb;</div><div class='add'>+	dx_buff-&gt;xdpf = NULL;</div><div class='ctx'> 	goto exit;</div><div class='ctx'> </div><div class='ctx'> mapping_error:</div><div class='hunk'>@@ -537,14 +806,15 @@ mapping_error:</div><div class='ctx'> 	     --ret, dx = aq_ring_next_dx(ring, dx)) {</div><div class='ctx'> 		dx_buff = &amp;ring-&gt;buff_ring[dx];</div><div class='ctx'> </div><div class='del'>-		if (!dx_buff-&gt;is_txc &amp;&amp; dx_buff-&gt;pa) {</div><div class='add'>+		if (!(dx_buff-&gt;is_gso_tcp || dx_buff-&gt;is_gso_udp) &amp;&amp;</div><div class='add'>+		    !dx_buff-&gt;is_vlan &amp;&amp; dx_buff-&gt;pa) {</div><div class='ctx'> 			if (unlikely(dx_buff-&gt;is_sop)) {</div><div class='del'>-				dma_unmap_single(aq_nic_get_dev(self),</div><div class='add'>+				dma_unmap_single(dev,</div><div class='ctx'> 						 dx_buff-&gt;pa,</div><div class='ctx'> 						 dx_buff-&gt;len,</div><div class='ctx'> 						 DMA_TO_DEVICE);</div><div class='ctx'> 			} else {</div><div class='del'>-				dma_unmap_page(aq_nic_get_dev(self),</div><div class='add'>+				dma_unmap_page(dev,</div><div class='ctx'> 					       dx_buff-&gt;pa,</div><div class='ctx'> 					       dx_buff-&gt;len,</div><div class='ctx'> 					       DMA_TO_DEVICE);</div><div class='hunk'>@@ -556,17 +826,56 @@ exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int aq_nic_xmit_xdpf(struct aq_nic_s *aq_nic, struct aq_ring_s *tx_ring,</div><div class='add'>+		     struct xdp_frame *xdpf)</div><div class='add'>+{</div><div class='add'>+	u16 queue_index = AQ_NIC_RING2QMAP(aq_nic, tx_ring-&gt;idx);</div><div class='add'>+	struct net_device *ndev = aq_nic_get_ndev(aq_nic);</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	int err = NETDEV_TX_BUSY;</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+	unsigned int frags = 1;</div><div class='add'>+</div><div class='add'>+	if (xdp_frame_has_frags(xdpf)) {</div><div class='add'>+		sinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+		frags += sinfo-&gt;nr_frags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (frags &gt; AQ_CFG_SKB_FRAGS_MAX)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	nq = netdev_get_tx_queue(ndev, tx_ring-&gt;idx);</div><div class='add'>+	__netif_tx_lock(nq, cpu);</div><div class='add'>+</div><div class='add'>+	aq_ring_update_queue_state(tx_ring);</div><div class='add'>+</div><div class='add'>+	/* Above status update may stop the queue. Check this. */</div><div class='add'>+	if (__netif_subqueue_stopped(aq_nic_get_ndev(aq_nic), queue_index))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	frags = aq_nic_map_xdp(aq_nic, xdpf, tx_ring);</div><div class='add'>+	if (likely(frags))</div><div class='add'>+		err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_tx_xmit(aq_nic-&gt;aq_hw, tx_ring,</div><div class='add'>+							 frags);</div><div class='add'>+out:</div><div class='add'>+	__netif_tx_unlock(nq);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(self);</div><div class='add'>+	unsigned int vec = skb-&gt;queue_mapping % cfg-&gt;vecs;</div><div class='add'>+	unsigned int tc = skb-&gt;queue_mapping / cfg-&gt;vecs;</div><div class='ctx'> 	struct aq_ring_s *ring = NULL;</div><div class='ctx'> 	unsigned int frags = 0U;</div><div class='del'>-	unsigned int vec = skb-&gt;queue_mapping % self-&gt;aq_nic_cfg.vecs;</div><div class='del'>-	unsigned int tc = 0U;</div><div class='ctx'> 	int err = NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	frags = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='ctx'> </div><div class='del'>-	ring = self-&gt;aq_ring_tx[AQ_NIC_TCVEC2RING(self, tc, vec)];</div><div class='add'>+	ring = self-&gt;aq_ring_tx[AQ_NIC_CFG_TCVEC2RING(cfg, tc, vec)];</div><div class='ctx'> </div><div class='ctx'> 	if (frags &gt; AQ_CFG_SKB_FRAGS_MAX) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -575,21 +884,25 @@ int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> 	aq_ring_update_queue_state(ring);</div><div class='ctx'> </div><div class='add'>+	if (cfg-&gt;priv_flags &amp; BIT(AQ_HW_LOOPBACK_DMA_NET)) {</div><div class='add'>+		err = NETDEV_TX_BUSY;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Above status update may stop the queue. Check this. */</div><div class='del'>-	if (__netif_subqueue_stopped(self-&gt;ndev, ring-&gt;idx)) {</div><div class='add'>+	if (__netif_subqueue_stopped(self-&gt;ndev,</div><div class='add'>+				     AQ_NIC_RING2QMAP(self, ring-&gt;idx))) {</div><div class='ctx'> 		err = NETDEV_TX_BUSY;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	frags = aq_nic_map_skb(self, skb, ring);</div><div class='ctx'> </div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='ctx'> 	if (likely(frags)) {</div><div class='ctx'> 		err = self-&gt;aq_hw_ops-&gt;hw_ring_tx_xmit(self-&gt;aq_hw,</div><div class='ctx'> 						       ring, frags);</div><div class='del'>-		if (err &gt;= 0) {</div><div class='del'>-			++ring-&gt;stats.tx.packets;</div><div class='del'>-			ring-&gt;stats.tx.bytes += skb-&gt;len;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -619,9 +932,12 @@ err_exit:</div><div class='ctx'> </div><div class='ctx'> int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int packet_filter = self-&gt;packet_filter;</div><div class='add'>+	const struct aq_hw_ops *hw_ops = self-&gt;aq_hw_ops;</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+	unsigned int packet_filter = ndev-&gt;flags;</div><div class='ctx'> 	struct netdev_hw_addr *ha = NULL;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;mc_list.count = 0;</div><div class='ctx'> 	if (netdev_uc_count(ndev) &gt; AQ_HW_MULTICAST_ADDRESS_MAX) {</div><div class='hunk'>@@ -629,30 +945,30 @@ int aq_nic_set_multicast_list(struct aq_nic_s *self, struct net_device *ndev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_for_each_uc_addr(ha, ndev) {</div><div class='ctx'> 			ether_addr_copy(self-&gt;mc_list.ar[i++], ha-&gt;addr);</div><div class='del'>-</div><div class='del'>-			if (i &gt;= AQ_HW_MULTICAST_ADDRESS_MAX)</div><div class='del'>-				break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i + netdev_mc_count(ndev) &gt; AQ_HW_MULTICAST_ADDRESS_MAX) {</div><div class='del'>-		packet_filter |= IFF_ALLMULTI;</div><div class='del'>-	} else {</div><div class='del'>-		netdev_for_each_mc_addr(ha, ndev) {</div><div class='del'>-			ether_addr_copy(self-&gt;mc_list.ar[i++], ha-&gt;addr);</div><div class='del'>-</div><div class='del'>-			if (i &gt;= AQ_HW_MULTICAST_ADDRESS_MAX)</div><div class='del'>-				break;</div><div class='add'>+	cfg-&gt;is_mc_list_enabled = !!(packet_filter &amp; IFF_MULTICAST);</div><div class='add'>+	if (cfg-&gt;is_mc_list_enabled) {</div><div class='add'>+		if (i + netdev_mc_count(ndev) &gt; AQ_HW_MULTICAST_ADDRESS_MAX) {</div><div class='add'>+			packet_filter |= IFF_ALLMULTI;</div><div class='add'>+		} else {</div><div class='add'>+			netdev_for_each_mc_addr(ha, ndev) {</div><div class='add'>+				ether_addr_copy(self-&gt;mc_list.ar[i++],</div><div class='add'>+						ha-&gt;addr);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (i &gt; 0 &amp;&amp; i &lt;= AQ_HW_MULTICAST_ADDRESS_MAX) {</div><div class='del'>-		packet_filter |= IFF_MULTICAST;</div><div class='ctx'> 		self-&gt;mc_list.count = i;</div><div class='del'>-		self-&gt;aq_hw_ops-&gt;hw_multicast_list_set(self-&gt;aq_hw,</div><div class='del'>-						       self-&gt;mc_list.ar,</div><div class='del'>-						       self-&gt;mc_list.count);</div><div class='add'>+		err = hw_ops-&gt;hw_multicast_list_set(self-&gt;aq_hw,</div><div class='add'>+						    self-&gt;mc_list.ar,</div><div class='add'>+						    self-&gt;mc_list.count);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			return err;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return aq_nic_set_packet_filter(self, packet_filter);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -678,6 +994,9 @@ int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p)</div><div class='ctx'> 	u32 *regs_buff = p;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(!self-&gt;aq_hw_ops-&gt;hw_get_regs))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	regs-&gt;version = 1;</div><div class='ctx'> </div><div class='ctx'> 	err = self-&gt;aq_hw_ops-&gt;hw_get_regs(self-&gt;aq_hw,</div><div class='hunk'>@@ -692,15 +1011,18 @@ err_exit:</div><div class='ctx'> </div><div class='ctx'> int aq_nic_get_regs_count(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='add'>+	if (unlikely(!self-&gt;aq_hw_ops-&gt;hw_get_regs))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	return self-&gt;aq_nic_cfg.aq_hw_caps-&gt;mac_regs_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)</div><div class='add'>+u64 *aq_nic_get_stats(struct aq_nic_s *self, u64 *data)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i = 0U;</div><div class='del'>-	unsigned int count = 0U;</div><div class='del'>-	struct aq_vec_s *aq_vec = NULL;</div><div class='ctx'> 	struct aq_stats_s *stats;</div><div class='add'>+	unsigned int count = 0U;</div><div class='add'>+	unsigned int i = 0U;</div><div class='add'>+	unsigned int tc;</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;aq_fw_ops-&gt;update_stats) {</div><div class='ctx'> 		mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='hunk'>@@ -727,8 +1049,14 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)</div><div class='ctx'> 	data[++i] = stats-&gt;mbtc;</div><div class='ctx'> 	data[++i] = stats-&gt;bbrc;</div><div class='ctx'> 	data[++i] = stats-&gt;bbtc;</div><div class='del'>-	data[++i] = stats-&gt;ubrc + stats-&gt;mbrc + stats-&gt;bbrc;</div><div class='del'>-	data[++i] = stats-&gt;ubtc + stats-&gt;mbtc + stats-&gt;bbtc;</div><div class='add'>+	if (stats-&gt;brc)</div><div class='add'>+		data[++i] = stats-&gt;brc;</div><div class='add'>+	else</div><div class='add'>+		data[++i] = stats-&gt;ubrc + stats-&gt;mbrc + stats-&gt;bbrc;</div><div class='add'>+	if (stats-&gt;btc)</div><div class='add'>+		data[++i] = stats-&gt;btc;</div><div class='add'>+	else</div><div class='add'>+		data[++i] = stats-&gt;ubtc + stats-&gt;mbtc + stats-&gt;bbtc;</div><div class='ctx'> 	data[++i] = stats-&gt;dma_pkt_rc;</div><div class='ctx'> 	data[++i] = stats-&gt;dma_pkt_tc;</div><div class='ctx'> 	data[++i] = stats-&gt;dma_oct_rc;</div><div class='hunk'>@@ -739,19 +1067,25 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data)</div><div class='ctx'> </div><div class='ctx'> 	data += i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-		aq_vec &amp;&amp; self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i]) {</div><div class='del'>-		data += count;</div><div class='del'>-		aq_vec_get_sw_stats(aq_vec, data, &amp;count);</div><div class='add'>+	for (tc = 0U; tc &lt; self-&gt;aq_nic_cfg.tcs; tc++) {</div><div class='add'>+		for (i = 0U; self-&gt;aq_vecs &gt; i; ++i) {</div><div class='add'>+			if (!self-&gt;aq_vec[i])</div><div class='add'>+				break;</div><div class='add'>+			data += count;</div><div class='add'>+			count = aq_vec_get_sw_stats(self-&gt;aq_vec[i], tc, data);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-err_exit:;</div><div class='add'>+	data += count;</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return data;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aq_nic_update_ndev_stats(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = self-&gt;ndev;</div><div class='ctx'> 	struct aq_stats_s *stats = self-&gt;aq_hw_ops-&gt;hw_get_hw_stats(self-&gt;aq_hw);</div><div class='add'>+	struct net_device *ndev = self-&gt;ndev;</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;stats.rx_packets = stats-&gt;dma_pkt_rc;</div><div class='ctx'> 	ndev-&gt;stats.rx_bytes = stats-&gt;dma_oct_rc;</div><div class='hunk'>@@ -766,12 +1100,17 @@ static void aq_nic_update_ndev_stats(struct aq_nic_s *self)</div><div class='ctx'> void aq_nic_get_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 			       struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='add'>+	u32 lp_link_speed_msk;</div><div class='add'>+</div><div class='ctx'> 	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;media_type == AQ_HW_MEDIA_TYPE_FIBRE)</div><div class='ctx'> 		cmd-&gt;base.port = PORT_FIBRE;</div><div class='ctx'> 	else</div><div class='ctx'> 		cmd-&gt;base.port = PORT_TP;</div><div class='del'>-	/* This driver supports only 10G capable adapters, so DUPLEX_FULL */</div><div class='del'>-	cmd-&gt;base.duplex = DUPLEX_FULL;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;base.duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	if (self-&gt;link_status.mbps)</div><div class='add'>+		cmd-&gt;base.duplex = self-&gt;link_status.full_duplex ?</div><div class='add'>+				   DUPLEX_FULL : DUPLEX_HALF;</div><div class='ctx'> 	cmd-&gt;base.autoneg = self-&gt;aq_nic_cfg.is_autoneg;</div><div class='ctx'> </div><div class='ctx'> 	ethtool_link_ksettings_zero_link_mode(cmd, supported);</div><div class='hunk'>@@ -784,7 +1123,7 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='ctx'> 						     5000baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_2GS)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_2G5)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='ctx'> 						     2500baseT_Full);</div><div class='ctx'> </div><div class='hunk'>@@ -792,13 +1131,32 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='ctx'> 						     1000baseT_Full);</div><div class='ctx'> </div><div class='add'>+	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_1G_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='add'>+						     1000baseT_Half);</div><div class='add'>+</div><div class='ctx'> 	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_100M)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='ctx'> 						     100baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;flow_control)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_100M_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='add'>+						     100baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_10M)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='add'>+						     10baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; AQ_NIC_RATE_10M_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='add'>+						     10baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.aq_hw_caps-&gt;flow_control) {</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='ctx'> 						     Pause);</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, supported,</div><div class='add'>+						     Asym_Pause);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ethtool_link_ksettings_add_link_mode(cmd, supported, Autoneg);</div><div class='ctx'> </div><div class='hunk'>@@ -812,33 +1170,49 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 	if (self-&gt;aq_nic_cfg.is_autoneg)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising, Autoneg);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.link_speed_msk  &amp; AQ_NIC_RATE_10G)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_10G)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     10000baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.link_speed_msk  &amp; AQ_NIC_RATE_5G)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_5G)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     5000baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.link_speed_msk  &amp; AQ_NIC_RATE_2GS)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_2G5)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     2500baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.link_speed_msk  &amp; AQ_NIC_RATE_1G)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_1G)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     1000baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.link_speed_msk  &amp; AQ_NIC_RATE_100M)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_1G_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='add'>+						     1000baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_100M)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     100baseT_Full);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg.flow_control &amp; AQ_NIC_FC_RX)</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_100M_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='add'>+						     100baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_10M)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='add'>+						     10baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.link_speed_msk &amp; AQ_NIC_RATE_10M_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='add'>+						     10baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_nic_cfg.fc.cur &amp; AQ_NIC_FC_RX)</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     Pause);</div><div class='ctx'> </div><div class='ctx'> 	/* Asym is when either RX or TX, but not both */</div><div class='del'>-	if (!!(self-&gt;aq_nic_cfg.flow_control &amp; AQ_NIC_FC_TX) ^</div><div class='del'>-	    !!(self-&gt;aq_nic_cfg.flow_control &amp; AQ_NIC_FC_RX))</div><div class='add'>+	if (!!(self-&gt;aq_nic_cfg.fc.cur &amp; AQ_NIC_FC_TX) ^</div><div class='add'>+	    !!(self-&gt;aq_nic_cfg.fc.cur &amp; AQ_NIC_FC_RX))</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising,</div><div class='ctx'> 						     Asym_Pause);</div><div class='ctx'> </div><div class='hunk'>@@ -846,32 +1220,88 @@ void aq_nic_get_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);</div><div class='ctx'> 	else</div><div class='ctx'> 		ethtool_link_ksettings_add_link_mode(cmd, advertising, TP);</div><div class='add'>+</div><div class='add'>+	ethtool_link_ksettings_zero_link_mode(cmd, lp_advertising);</div><div class='add'>+	lp_link_speed_msk = self-&gt;aq_hw-&gt;aq_link_status.lp_link_speed_msk;</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_10G)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     10000baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_5G)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     5000baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_2G5)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     2500baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_1G)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     1000baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_1G_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     1000baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_100M)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     100baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_100M_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     100baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_10M)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     10baseT_Full);</div><div class='add'>+</div><div class='add'>+	if (lp_link_speed_msk &amp; AQ_NIC_RATE_10M_HALF)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     10baseT_Half);</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_hw-&gt;aq_link_status.lp_flow_control &amp; AQ_NIC_FC_RX)</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     Pause);</div><div class='add'>+	if (!!(self-&gt;aq_hw-&gt;aq_link_status.lp_flow_control &amp; AQ_NIC_FC_TX) ^</div><div class='add'>+	    !!(self-&gt;aq_hw-&gt;aq_link_status.lp_flow_control &amp; AQ_NIC_FC_RX))</div><div class='add'>+		ethtool_link_ksettings_add_link_mode(cmd, lp_advertising,</div><div class='add'>+						     Asym_Pause);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int aq_nic_set_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 			      const struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='del'>-	u32 speed = 0U;</div><div class='add'>+	int fduplex = (cmd-&gt;base.duplex == DUPLEX_FULL);</div><div class='add'>+	u32 speed = cmd-&gt;base.speed;</div><div class='ctx'> 	u32 rate = 0U;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='add'>+	if (!fduplex &amp;&amp; speed &gt; SPEED_1000) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (cmd-&gt;base.autoneg == AUTONEG_ENABLE) {</div><div class='ctx'> 		rate = self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk;</div><div class='ctx'> 		self-&gt;aq_nic_cfg.is_autoneg = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		speed = cmd-&gt;base.speed;</div><div class='del'>-</div><div class='ctx'> 		switch (speed) {</div><div class='add'>+		case SPEED_10:</div><div class='add'>+			rate = fduplex ? AQ_NIC_RATE_10M : AQ_NIC_RATE_10M_HALF;</div><div class='add'>+			break;</div><div class='add'>+</div><div class='ctx'> 		case SPEED_100:</div><div class='del'>-			rate = AQ_NIC_RATE_100M;</div><div class='add'>+			rate = fduplex ? AQ_NIC_RATE_100M</div><div class='add'>+				       : AQ_NIC_RATE_100M_HALF;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case SPEED_1000:</div><div class='del'>-			rate = AQ_NIC_RATE_1G;</div><div class='add'>+			rate = fduplex ? AQ_NIC_RATE_1G : AQ_NIC_RATE_1G_HALF;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case SPEED_2500:</div><div class='del'>-			rate = AQ_NIC_RATE_2GS;</div><div class='add'>+			rate = AQ_NIC_RATE_2G5;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case SPEED_5000:</div><div class='hunk'>@@ -885,7 +1315,6 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 		default:</div><div class='ctx'> 			err = -1;</div><div class='ctx'> 			goto err_exit;</div><div class='del'>-		break;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (!(self-&gt;aq_nic_cfg.aq_hw_caps-&gt;link_speed_msk &amp; rate)) {</div><div class='ctx'> 			err = -1;</div><div class='hunk'>@@ -914,39 +1343,88 @@ struct aq_nic_cfg_s *aq_nic_get_cfg(struct aq_nic_s *self)</div><div class='ctx'> </div><div class='ctx'> u32 aq_nic_get_fw_version(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='del'>-	u32 fw_version = 0U;</div><div class='add'>+	return self-&gt;aq_hw_ops-&gt;hw_get_fw_version(self-&gt;aq_hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_nic_set_loopback(struct aq_nic_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='ctx'> </div><div class='del'>-	self-&gt;aq_hw_ops-&gt;hw_get_fw_version(self-&gt;aq_hw, &amp;fw_version);</div><div class='add'>+	if (!self-&gt;aq_hw_ops-&gt;hw_set_loopback ||</div><div class='add'>+	    !self-&gt;aq_fw_ops-&gt;set_phyloopback)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	return fw_version;</div><div class='add'>+	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+	self-&gt;aq_hw_ops-&gt;hw_set_loopback(self-&gt;aq_hw,</div><div class='add'>+					 AQ_HW_LOOPBACK_DMA_SYS,</div><div class='add'>+					 !!(cfg-&gt;priv_flags &amp;</div><div class='add'>+					    BIT(AQ_HW_LOOPBACK_DMA_SYS)));</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_hw_ops-&gt;hw_set_loopback(self-&gt;aq_hw,</div><div class='add'>+					 AQ_HW_LOOPBACK_PKT_SYS,</div><div class='add'>+					 !!(cfg-&gt;priv_flags &amp;</div><div class='add'>+					    BIT(AQ_HW_LOOPBACK_PKT_SYS)));</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_hw_ops-&gt;hw_set_loopback(self-&gt;aq_hw,</div><div class='add'>+					 AQ_HW_LOOPBACK_DMA_NET,</div><div class='add'>+					 !!(cfg-&gt;priv_flags &amp;</div><div class='add'>+					    BIT(AQ_HW_LOOPBACK_DMA_NET)));</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;set_phyloopback(self-&gt;aq_hw,</div><div class='add'>+					 AQ_HW_LOOPBACK_PHYINT_SYS,</div><div class='add'>+					 !!(cfg-&gt;priv_flags &amp;</div><div class='add'>+					    BIT(AQ_HW_LOOPBACK_PHYINT_SYS)));</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;set_phyloopback(self-&gt;aq_hw,</div><div class='add'>+					 AQ_HW_LOOPBACK_PHYEXT_SYS,</div><div class='add'>+					 !!(cfg-&gt;priv_flags &amp;</div><div class='add'>+					    BIT(AQ_HW_LOOPBACK_PHYEXT_SYS)));</div><div class='add'>+	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int aq_nic_stop(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='del'>-	struct aq_vec_s *aq_vec = NULL;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_disable(self-&gt;ndev);</div><div class='ctx'> 	netif_carrier_off(self-&gt;ndev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;self-&gt;service_timer);</div><div class='add'>+	timer_delete_sync(&amp;self-&gt;service_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;self-&gt;service_task);</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;aq_hw_ops-&gt;hw_irq_disable(self-&gt;aq_hw, AQ_CFG_IRQ_MASK);</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;aq_nic_cfg.is_polling)</div><div class='del'>-		del_timer_sync(&amp;self-&gt;polling_timer);</div><div class='add'>+		timer_delete_sync(&amp;self-&gt;polling_timer);</div><div class='ctx'> 	else</div><div class='ctx'> 		aq_pci_func_free_irqs(self);</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-		self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i])</div><div class='del'>-		aq_vec_stop(aq_vec);</div><div class='add'>+	aq_ptp_irq_free(self);</div><div class='add'>+</div><div class='add'>+	for (i = 0U; self-&gt;aq_vecs &gt; i; ++i)</div><div class='add'>+		aq_vec_stop(self-&gt;aq_vec[i]);</div><div class='add'>+</div><div class='add'>+	aq_ptp_ring_stop(self);</div><div class='ctx'> </div><div class='ctx'> 	return self-&gt;aq_hw_ops-&gt;hw_stop(self-&gt;aq_hw);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void aq_nic_deinit(struct aq_nic_s *self)</div><div class='add'>+void aq_nic_set_power(struct aq_nic_s *self)</div><div class='add'>+{</div><div class='add'>+	if (self-&gt;power_state != AQ_HW_POWER_STATE_D0 ||</div><div class='add'>+	    self-&gt;aq_hw-&gt;aq_nic_cfg-&gt;wol)</div><div class='add'>+		if (likely(self-&gt;aq_fw_ops-&gt;set_power)) {</div><div class='add'>+			mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+			self-&gt;aq_fw_ops-&gt;set_power(self-&gt;aq_hw,</div><div class='add'>+						   self-&gt;power_state,</div><div class='add'>+						   self-&gt;ndev-&gt;dev_addr);</div><div class='add'>+			mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_nic_deinit(struct aq_nic_s *self, bool link_down)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_vec_s *aq_vec = NULL;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='hunk'>@@ -954,27 +1432,25 @@ void aq_nic_deinit(struct aq_nic_s *self)</div><div class='ctx'> 	if (!self)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, aq_vec = self-&gt;aq_vec[0];</div><div class='del'>-		self-&gt;aq_vecs &gt; i; ++i, aq_vec = self-&gt;aq_vec[i])</div><div class='add'>+	for (i = 0U; i &lt; self-&gt;aq_vecs; i++) {</div><div class='add'>+		aq_vec = self-&gt;aq_vec[i];</div><div class='ctx'> 		aq_vec_deinit(aq_vec);</div><div class='add'>+		aq_vec_ring_free(aq_vec);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (likely(self-&gt;aq_fw_ops-&gt;deinit)) {</div><div class='add'>+	aq_ptp_unregister(self);</div><div class='add'>+	aq_ptp_ring_deinit(self);</div><div class='add'>+	aq_ptp_ring_free(self);</div><div class='add'>+	aq_ptp_free(self);</div><div class='add'>+</div><div class='add'>+	/* May be invoked during hot unplug. */</div><div class='add'>+	if (pci_device_is_present(self-&gt;pdev) &amp;&amp;</div><div class='add'>+	    likely(self-&gt;aq_fw_ops-&gt;deinit) &amp;&amp; link_down) {</div><div class='ctx'> 		mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 		self-&gt;aq_fw_ops-&gt;deinit(self-&gt;aq_hw);</div><div class='ctx'> 		mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;power_state != AQ_HW_POWER_STATE_D0 ||</div><div class='del'>-	    self-&gt;aq_hw-&gt;aq_nic_cfg-&gt;wol)</div><div class='del'>-		if (likely(self-&gt;aq_fw_ops-&gt;set_power)) {</div><div class='del'>-			mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='del'>-			self-&gt;aq_fw_ops-&gt;set_power(self-&gt;aq_hw,</div><div class='del'>-						   self-&gt;power_state,</div><div class='del'>-						   self-&gt;ndev-&gt;dev_addr);</div><div class='del'>-			mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> err_exit:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -995,42 +1471,20 @@ void aq_nic_free_vectors(struct aq_nic_s *self)</div><div class='ctx'> err_exit:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int aq_nic_change_pm_state(struct aq_nic_s *self, pm_message_t *pm_msg)</div><div class='add'>+int aq_nic_realloc_vectors(struct aq_nic_s *self)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(self);</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(self-&gt;ndev)) {</div><div class='del'>-		err = 0;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-	rtnl_lock();</div><div class='del'>-	if (pm_msg-&gt;event &amp; PM_EVENT_SLEEP || pm_msg-&gt;event &amp; PM_EVENT_FREEZE) {</div><div class='del'>-		self-&gt;power_state = AQ_HW_POWER_STATE_D3;</div><div class='del'>-		netif_device_detach(self-&gt;ndev);</div><div class='del'>-		netif_tx_stop_all_queues(self-&gt;ndev);</div><div class='del'>-</div><div class='del'>-		err = aq_nic_stop(self);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_exit;</div><div class='add'>+	aq_nic_free_vectors(self);</div><div class='ctx'> </div><div class='del'>-		aq_nic_deinit(self);</div><div class='del'>-	} else {</div><div class='del'>-		err = aq_nic_init(self);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_exit;</div><div class='del'>-</div><div class='del'>-		err = aq_nic_start(self);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_exit;</div><div class='del'>-</div><div class='del'>-		netif_device_attach(self-&gt;ndev);</div><div class='del'>-		netif_tx_start_all_queues(self-&gt;ndev);</div><div class='add'>+	for (self-&gt;aq_vecs = 0; self-&gt;aq_vecs &lt; cfg-&gt;vecs; self-&gt;aq_vecs++) {</div><div class='add'>+		self-&gt;aq_vec[self-&gt;aq_vecs] = aq_vec_alloc(self, self-&gt;aq_vecs,</div><div class='add'>+							   cfg);</div><div class='add'>+		if (unlikely(!self-&gt;aq_vec[self-&gt;aq_vecs]))</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='del'>-	rtnl_unlock();</div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void aq_nic_shutdown(struct aq_nic_s *self)</div><div class='hunk'>@@ -1049,8 +1503,193 @@ void aq_nic_shutdown(struct aq_nic_s *self)</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> 	}</div><div class='del'>-	aq_nic_deinit(self);</div><div class='add'>+	aq_nic_deinit(self, !self-&gt;aq_hw-&gt;aq_nic_cfg-&gt;wol);</div><div class='add'>+	aq_nic_set_power(self);</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+u8 aq_nic_reserve_filter(struct aq_nic_s *self, enum aq_rx_filter_type type)</div><div class='add'>+{</div><div class='add'>+	u8 location = 0xFF;</div><div class='add'>+	u32 fltr_cnt;</div><div class='add'>+	u32 n_bit;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case aq_rx_filter_ethertype:</div><div class='add'>+		location = AQ_RX_LAST_LOC_FETHERT - AQ_RX_FIRST_LOC_FETHERT -</div><div class='add'>+			   self-&gt;aq_hw_rx_fltrs.fet_reserved_count;</div><div class='add'>+		self-&gt;aq_hw_rx_fltrs.fet_reserved_count++;</div><div class='add'>+		break;</div><div class='add'>+	case aq_rx_filter_l3l4:</div><div class='add'>+		fltr_cnt = AQ_RX_LAST_LOC_FL3L4 - AQ_RX_FIRST_LOC_FL3L4;</div><div class='add'>+		n_bit = fltr_cnt - self-&gt;aq_hw_rx_fltrs.fl3l4.reserved_count;</div><div class='add'>+</div><div class='add'>+		self-&gt;aq_hw_rx_fltrs.fl3l4.active_ipv4 |= BIT(n_bit);</div><div class='add'>+		self-&gt;aq_hw_rx_fltrs.fl3l4.reserved_count++;</div><div class='add'>+		location = n_bit;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return location;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_nic_release_filter(struct aq_nic_s *self, enum aq_rx_filter_type type,</div><div class='add'>+			   u32 location)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case aq_rx_filter_ethertype:</div><div class='add'>+		self-&gt;aq_hw_rx_fltrs.fet_reserved_count--;</div><div class='add'>+		break;</div><div class='add'>+	case aq_rx_filter_l3l4:</div><div class='add'>+		self-&gt;aq_hw_rx_fltrs.fl3l4.reserved_count--;</div><div class='add'>+		self-&gt;aq_hw_rx_fltrs.fl3l4.active_ipv4 &amp;= ~BIT(location);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_nic_set_downshift(struct aq_nic_s *self, int val)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='add'>+	if (!self-&gt;aq_fw_ops-&gt;set_downshift)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (val &gt; 15) {</div><div class='add'>+		netdev_err(self-&gt;ndev, "downshift counter should be &lt;= 15\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	cfg-&gt;downshift_counter = val;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+	err = self-&gt;aq_fw_ops-&gt;set_downshift(self-&gt;aq_hw, cfg-&gt;downshift_counter);</div><div class='add'>+	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_nic_set_media_detect(struct aq_nic_s *self, int val)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!self-&gt;aq_fw_ops-&gt;set_media_detect)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (val &gt; 0 &amp;&amp; val != AQ_HW_MEDIA_DETECT_CNT) {</div><div class='add'>+		netdev_err(self-&gt;ndev, "EDPD on this device could have only fixed value of %d\n",</div><div class='add'>+			   AQ_HW_MEDIA_DETECT_CNT);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+	err = self-&gt;aq_fw_ops-&gt;set_media_detect(self-&gt;aq_hw, !!val);</div><div class='add'>+	mutex_unlock(&amp;self-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	/* msecs plays no role - configuration is always fixed in PHY */</div><div class='add'>+	if (!err)</div><div class='add'>+		cfg-&gt;is_media_detect = !!val;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_nic_setup_tc_mqprio(struct aq_nic_s *self, u32 tcs, u8 *prio_tc_map)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+	const unsigned int prev_vecs = cfg-&gt;vecs;</div><div class='add'>+	bool ndev_running;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* if already the same configuration or</div><div class='add'>+	 * disable request (tcs is 0) and we already is disabled</div><div class='add'>+	 */</div><div class='add'>+	if (tcs == cfg-&gt;tcs || (tcs == 0 &amp;&amp; !cfg-&gt;is_qos))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ndev_running = netif_running(self-&gt;ndev);</div><div class='add'>+	if (ndev_running)</div><div class='add'>+		dev_close(self-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	cfg-&gt;tcs = tcs;</div><div class='add'>+	if (cfg-&gt;tcs == 0)</div><div class='add'>+		cfg-&gt;tcs = 1;</div><div class='add'>+	if (prio_tc_map)</div><div class='add'>+		memcpy(cfg-&gt;prio_tc_map, prio_tc_map, sizeof(cfg-&gt;prio_tc_map));</div><div class='add'>+	else</div><div class='add'>+		for (i = 0; i &lt; sizeof(cfg-&gt;prio_tc_map); i++)</div><div class='add'>+			cfg-&gt;prio_tc_map[i] = cfg-&gt;tcs * i / 8;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;is_qos = !!tcs;</div><div class='add'>+	cfg-&gt;is_ptp = (cfg-&gt;tcs &lt;= AQ_HW_PTP_TC);</div><div class='add'>+	if (!cfg-&gt;is_ptp)</div><div class='add'>+		netdev_warn(self-&gt;ndev, "%s\n",</div><div class='add'>+			    "PTP is auto disabled due to requested TC count.");</div><div class='add'>+</div><div class='add'>+	netdev_set_num_tc(self-&gt;ndev, cfg-&gt;tcs);</div><div class='add'>+</div><div class='add'>+	/* Changing the number of TCs might change the number of vectors */</div><div class='add'>+	aq_nic_cfg_update_num_vecs(self);</div><div class='add'>+	if (prev_vecs != cfg-&gt;vecs) {</div><div class='add'>+		err = aq_nic_realloc_vectors(self);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndev_running)</div><div class='add'>+		err = dev_open(self-&gt;ndev, NULL);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_nic_setup_tc_max_rate(struct aq_nic_s *self, const unsigned int tc,</div><div class='add'>+			     const u32 max_rate)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='add'>+	if (tc &gt;= AQ_CFG_TCS_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (max_rate &amp;&amp; max_rate &lt; 10) {</div><div class='add'>+		netdev_warn(self-&gt;ndev,</div><div class='add'>+			"Setting %s to the minimum usable value of %dMbps.\n",</div><div class='add'>+			"max rate", 10);</div><div class='add'>+		cfg-&gt;tc_max_rate[tc] = 10;</div><div class='add'>+	} else {</div><div class='add'>+		cfg-&gt;tc_max_rate[tc] = max_rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_nic_setup_tc_min_rate(struct aq_nic_s *self, const unsigned int tc,</div><div class='add'>+			     const u32 min_rate)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = &amp;self-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='add'>+	if (tc &gt;= AQ_CFG_TCS_MAX)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (min_rate)</div><div class='add'>+		set_bit(tc, &amp;cfg-&gt;tc_min_rate_msk);</div><div class='add'>+	else</div><div class='add'>+		clear_bit(tc, &amp;cfg-&gt;tc_min_rate_msk);</div><div class='add'>+</div><div class='add'>+	if (min_rate &amp;&amp; min_rate &lt; 20) {</div><div class='add'>+		netdev_warn(self-&gt;ndev,</div><div class='add'>+			"Setting %s to the minimum usable value of %dMbps.\n",</div><div class='add'>+			"min rate", 20);</div><div class='add'>+		cfg-&gt;tc_min_rate[tc] = 20;</div><div class='add'>+	} else {</div><div class='add'>+		cfg-&gt;tc_min_rate[tc] = min_rate;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h<br/>index c03d38ed105d..ad33f8586532 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_nic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_nic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_nic.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_nic.h: Declaration of common code for NIC. */</div><div class='hunk'>@@ -12,6 +10,10 @@</div><div class='ctx'> #ifndef AQ_NIC_H</div><div class='ctx'> #define AQ_NIC_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "aq_common.h"</div><div class='ctx'> #include "aq_rss.h"</div><div class='ctx'> #include "aq_hw.h"</div><div class='hunk'>@@ -20,6 +22,21 @@ struct aq_ring_s;</div><div class='ctx'> struct aq_hw_ops;</div><div class='ctx'> struct aq_fw_s;</div><div class='ctx'> struct aq_vec_s;</div><div class='add'>+struct aq_macsec_cfg;</div><div class='add'>+struct aq_ptp_s;</div><div class='add'>+enum aq_rx_filter_type;</div><div class='add'>+</div><div class='add'>+enum aq_fc_mode {</div><div class='add'>+	AQ_NIC_FC_OFF = 0,</div><div class='add'>+	AQ_NIC_FC_TX,</div><div class='add'>+	AQ_NIC_FC_RX,</div><div class='add'>+	AQ_NIC_FC_FULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aq_fc_info {</div><div class='add'>+	enum aq_fc_mode req;</div><div class='add'>+	enum aq_fc_mode cur;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct aq_nic_cfg_s {</div><div class='ctx'> 	const struct aq_hw_caps_s *aq_hw_caps;</div><div class='hunk'>@@ -35,16 +52,29 @@ struct aq_nic_cfg_s {</div><div class='ctx'> 	u32 rxpageorder;</div><div class='ctx'> 	u32 num_rss_queues;</div><div class='ctx'> 	u32 mtu;</div><div class='del'>-	u32 flow_control;</div><div class='add'>+	struct aq_fc_info fc;</div><div class='ctx'> 	u32 link_speed_msk;</div><div class='ctx'> 	u32 wol;</div><div class='add'>+	u8 is_vlan_rx_strip;</div><div class='add'>+	u8 is_vlan_tx_insert;</div><div class='add'>+	bool is_vlan_force_promisc;</div><div class='ctx'> 	u16 is_mc_list_enabled;</div><div class='ctx'> 	u16 mc_list_count;</div><div class='ctx'> 	bool is_autoneg;</div><div class='ctx'> 	bool is_polling;</div><div class='ctx'> 	bool is_rss;</div><div class='ctx'> 	bool is_lro;</div><div class='add'>+	bool is_qos;</div><div class='add'>+	bool is_ptp;</div><div class='add'>+	bool is_media_detect;</div><div class='add'>+	int downshift_counter;</div><div class='add'>+	enum aq_tc_mode tc_mode;</div><div class='add'>+	u32 priv_flags;</div><div class='ctx'> 	u8  tcs;</div><div class='add'>+	u8 prio_tc_map[8];</div><div class='add'>+	u32 tc_max_rate[AQ_CFG_TCS_MAX];</div><div class='add'>+	unsigned long tc_min_rate_msk;</div><div class='add'>+	u32 tc_min_rate[AQ_CFG_TCS_MAX];</div><div class='ctx'> 	struct aq_rss_parameters aq_rss;</div><div class='ctx'> 	u32 eee_speeds;</div><div class='ctx'> };</div><div class='hunk'>@@ -53,23 +83,36 @@ struct aq_nic_cfg_s {</div><div class='ctx'> #define AQ_NIC_FLAG_STOPPING    0x00000008U</div><div class='ctx'> #define AQ_NIC_FLAG_RESETTING   0x00000010U</div><div class='ctx'> #define AQ_NIC_FLAG_CLOSING     0x00000020U</div><div class='add'>+#define AQ_NIC_PTP_DPATH_UP     0x02000000U</div><div class='ctx'> #define AQ_NIC_LINK_DOWN        0x04000000U</div><div class='ctx'> #define AQ_NIC_FLAG_ERR_UNPLUG  0x40000000U</div><div class='ctx'> #define AQ_NIC_FLAG_ERR_HW      0x80000000U</div><div class='ctx'> </div><div class='del'>-#define AQ_NIC_WOL_ENABLED	BIT(0)</div><div class='add'>+#define AQ_NIC_QUIRK_BAD_PTP    BIT(0)</div><div class='ctx'> </div><div class='del'>-#define AQ_NIC_TCVEC2RING(_NIC_, _TC_, _VEC_) \</div><div class='del'>-	((_TC_) * AQ_CFG_TCS_MAX + (_VEC_))</div><div class='add'>+#define AQ_NIC_WOL_MODES        (WAKE_MAGIC |\</div><div class='add'>+				 WAKE_PHY)</div><div class='add'>+</div><div class='add'>+#define AQ_NIC_CFG_RING_PER_TC(_NIC_CFG_) \</div><div class='add'>+	(((_NIC_CFG_)-&gt;tc_mode == AQ_TC_MODE_4TCS) ? 8 : 4)</div><div class='add'>+</div><div class='add'>+#define AQ_NIC_CFG_TCVEC2RING(_NIC_CFG_, _TC_, _VEC_) \</div><div class='add'>+	((_TC_) * AQ_NIC_CFG_RING_PER_TC(_NIC_CFG_) + (_VEC_))</div><div class='add'>+</div><div class='add'>+#define AQ_NIC_RING2QMAP(_NIC_, _ID_) \</div><div class='add'>+	((_ID_) / AQ_NIC_CFG_RING_PER_TC(&amp;(_NIC_)-&gt;aq_nic_cfg) * \</div><div class='add'>+		(_NIC_)-&gt;aq_vecs + \</div><div class='add'>+	((_ID_) % AQ_NIC_CFG_RING_PER_TC(&amp;(_NIC_)-&gt;aq_nic_cfg)))</div><div class='ctx'> </div><div class='ctx'> struct aq_hw_rx_fl2 {</div><div class='ctx'> 	struct aq_rx_filter_vlan aq_vlans[AQ_VLAN_MAX_FILTERS];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_hw_rx_fl3l4 {</div><div class='del'>-	u8   active_ipv4;</div><div class='del'>-	u8   active_ipv6:2;</div><div class='add'>+	u8 active_ipv4;</div><div class='add'>+	u8 active_ipv6:2;</div><div class='ctx'> 	u8 is_ipv6;</div><div class='add'>+	u8 reserved_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_hw_rx_fltrs_s {</div><div class='hunk'>@@ -77,13 +120,17 @@ struct aq_hw_rx_fltrs_s {</div><div class='ctx'> 	u16                   active_filters;</div><div class='ctx'> 	struct aq_hw_rx_fl2   fl2;</div><div class='ctx'> 	struct aq_hw_rx_fl3l4 fl3l4;</div><div class='add'>+	/* filter ether type */</div><div class='add'>+	u8 fet_reserved_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_nic_s {</div><div class='ctx'> 	atomic_t flags;</div><div class='add'>+	u32 msg_enable;</div><div class='ctx'> 	struct aq_vec_s *aq_vec[AQ_CFG_VECS_MAX];</div><div class='del'>-	struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX];</div><div class='add'>+	struct aq_ring_s *aq_ring_tx[AQ_HW_QUEUES_MAX];</div><div class='ctx'> 	struct aq_hw_s *aq_hw;</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	unsigned int aq_vecs;</div><div class='ctx'> 	unsigned int packet_filter;</div><div class='hunk'>@@ -108,6 +155,13 @@ struct aq_nic_s {</div><div class='ctx'> 	u32 irqvecs;</div><div class='ctx'> 	/* mutex to serialize FW interface access operations */</div><div class='ctx'> 	struct mutex fwreq_mutex;</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+	struct aq_macsec_cfg *macsec_cfg;</div><div class='add'>+	/* mutex to protect data in macsec_cfg */</div><div class='add'>+	struct mutex macsec_mutex;</div><div class='add'>+#endif</div><div class='add'>+	/* PTP support */</div><div class='add'>+	struct aq_ptp_s *aq_ptp;</div><div class='ctx'> 	struct aq_hw_rx_fltrs_s aq_hw_rx_fltrs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -126,14 +180,20 @@ void aq_nic_cfg_start(struct aq_nic_s *self);</div><div class='ctx'> int aq_nic_ndev_register(struct aq_nic_s *self);</div><div class='ctx'> void aq_nic_ndev_free(struct aq_nic_s *self);</div><div class='ctx'> int aq_nic_start(struct aq_nic_s *self);</div><div class='add'>+unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,</div><div class='add'>+			    struct aq_ring_s *ring);</div><div class='add'>+int aq_nic_xmit_xdpf(struct aq_nic_s *aq_nic, struct aq_ring_s *tx_ring,</div><div class='add'>+		     struct xdp_frame *xdpf);</div><div class='ctx'> int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb);</div><div class='ctx'> int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p);</div><div class='ctx'> int aq_nic_get_regs_count(struct aq_nic_s *self);</div><div class='del'>-void aq_nic_get_stats(struct aq_nic_s *self, u64 *data);</div><div class='add'>+u64 *aq_nic_get_stats(struct aq_nic_s *self, u64 *data);</div><div class='ctx'> int aq_nic_stop(struct aq_nic_s *self);</div><div class='del'>-void aq_nic_deinit(struct aq_nic_s *self);</div><div class='add'>+void aq_nic_deinit(struct aq_nic_s *self, bool link_down);</div><div class='add'>+void aq_nic_set_power(struct aq_nic_s *self);</div><div class='ctx'> void aq_nic_free_hot_resources(struct aq_nic_s *self);</div><div class='ctx'> void aq_nic_free_vectors(struct aq_nic_s *self);</div><div class='add'>+int aq_nic_realloc_vectors(struct aq_nic_s *self);</div><div class='ctx'> int aq_nic_set_mtu(struct aq_nic_s *self, int new_mtu);</div><div class='ctx'> int aq_nic_set_mac(struct aq_nic_s *self, struct net_device *ndev);</div><div class='ctx'> int aq_nic_set_packet_filter(struct aq_nic_s *self, unsigned int flags);</div><div class='hunk'>@@ -145,8 +205,17 @@ int aq_nic_set_link_ksettings(struct aq_nic_s *self,</div><div class='ctx'> 			      const struct ethtool_link_ksettings *cmd);</div><div class='ctx'> struct aq_nic_cfg_s *aq_nic_get_cfg(struct aq_nic_s *self);</div><div class='ctx'> u32 aq_nic_get_fw_version(struct aq_nic_s *self);</div><div class='del'>-int aq_nic_change_pm_state(struct aq_nic_s *self, pm_message_t *pm_msg);</div><div class='add'>+int aq_nic_set_loopback(struct aq_nic_s *self);</div><div class='add'>+int aq_nic_set_downshift(struct aq_nic_s *self, int val);</div><div class='add'>+int aq_nic_set_media_detect(struct aq_nic_s *self, int val);</div><div class='ctx'> int aq_nic_update_interrupt_moderation_settings(struct aq_nic_s *self);</div><div class='ctx'> void aq_nic_shutdown(struct aq_nic_s *self);</div><div class='del'>-</div><div class='add'>+u8 aq_nic_reserve_filter(struct aq_nic_s *self, enum aq_rx_filter_type type);</div><div class='add'>+void aq_nic_release_filter(struct aq_nic_s *self, enum aq_rx_filter_type type,</div><div class='add'>+			   u32 location);</div><div class='add'>+int aq_nic_setup_tc_mqprio(struct aq_nic_s *self, u32 tcs, u8 *prio_tc_map);</div><div class='add'>+int aq_nic_setup_tc_max_rate(struct aq_nic_s *self, const unsigned int tc,</div><div class='add'>+			     const u32 max_rate);</div><div class='add'>+int aq_nic_setup_tc_min_rate(struct aq_nic_s *self, const unsigned int tc,</div><div class='add'>+			     const u32 min_rate);</div><div class='ctx'> #endif /* AQ_NIC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c<br/>index 9cb0864d6d8d..ed5231dece3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_pci_func.c: Definition of PCI functions. */</div><div class='hunk'>@@ -19,8 +17,10 @@</div><div class='ctx'> #include "aq_pci_func.h"</div><div class='ctx'> #include "hw_atl/hw_atl_a0.h"</div><div class='ctx'> #include "hw_atl/hw_atl_b0.h"</div><div class='add'>+#include "hw_atl2/hw_atl2.h"</div><div class='ctx'> #include "aq_filters.h"</div><div class='ctx'> #include "aq_drvinfo.h"</div><div class='add'>+#include "aq_macsec.h"</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id aq_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_0001), },</div><div class='hunk'>@@ -43,6 +43,15 @@ static const struct pci_device_id aq_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC111S), },</div><div class='ctx'> 	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC112S), },</div><div class='ctx'> </div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC113DEV), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC113CS), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC114CS), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC113), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC113C), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC115C), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC113CA), },</div><div class='add'>+	{ PCI_VDEVICE(AQUANTIA, AQ_DEVICE_ID_AQC116C), },</div><div class='add'>+</div><div class='ctx'> 	{}</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -59,7 +68,7 @@ static const struct aq_board_revision_s hw_atl_boards[] = {</div><div class='ctx'> 	{ AQ_DEVICE_ID_D108,	AQ_HWREV_2,	&amp;hw_atl_ops_b0, &amp;hw_atl_b0_caps_aqc108, },</div><div class='ctx'> 	{ AQ_DEVICE_ID_D109,	AQ_HWREV_2,	&amp;hw_atl_ops_b0, &amp;hw_atl_b0_caps_aqc109, },</div><div class='ctx'> </div><div class='del'>-	{ AQ_DEVICE_ID_AQC100,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc107, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC100,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc100, },</div><div class='ctx'> 	{ AQ_DEVICE_ID_AQC107,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc107, },</div><div class='ctx'> 	{ AQ_DEVICE_ID_AQC108,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc108, },</div><div class='ctx'> 	{ AQ_DEVICE_ID_AQC109,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc109, },</div><div class='hunk'>@@ -72,6 +81,16 @@ static const struct aq_board_revision_s hw_atl_boards[] = {</div><div class='ctx'> 	{ AQ_DEVICE_ID_AQC109S,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc109s, },</div><div class='ctx'> 	{ AQ_DEVICE_ID_AQC111S,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc111s, },</div><div class='ctx'> 	{ AQ_DEVICE_ID_AQC112S,	AQ_HWREV_ANY,	&amp;hw_atl_ops_b1, &amp;hw_atl_b0_caps_aqc112s, },</div><div class='add'>+</div><div class='add'>+	{ AQ_DEVICE_ID_AQC113DEV,	AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc113, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC113,		AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc113, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC113CS,	AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc113, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC114CS,	AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc113, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC113C,		AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc113, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC115C,		AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc115c, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC113CA,	AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc113, },</div><div class='add'>+	{ AQ_DEVICE_ID_AQC116C,		AQ_HWREV_ANY,	&amp;hw_atl2_ops, &amp;hw_atl2_caps_aqc116c, },</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, aq_pci_tbl);</div><div class='hunk'>@@ -101,22 +120,14 @@ static int aq_pci_probe_get_hw_by_id(struct pci_dev *pdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int aq_pci_func_init(struct pci_dev *pdev)</div><div class='add'>+static int aq_pci_func_init(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='del'>-	if (!err) {</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='del'>-</div><div class='del'>-	}</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (err)</div><div class='add'>+		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (!err)</div><div class='del'>-			err = pci_set_consistent_dma_mask(pdev,</div><div class='del'>-							  DMA_BIT_MASK(32));</div><div class='del'>-	}</div><div class='del'>-	if (err != 0) {</div><div class='ctx'> 		err = -ENOSR;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -151,8 +162,8 @@ int aq_pci_func_alloc_irq(struct aq_nic_s *self, unsigned int i,</div><div class='ctx'> 		self-&gt;msix_entry_mask |= (1 &lt;&lt; i);</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;msix_enabled &amp;&amp; affinity_mask)</div><div class='del'>-			irq_set_affinity_hint(pci_irq_vector(pdev, i),</div><div class='del'>-					      affinity_mask);</div><div class='add'>+			irq_update_affinity_hint(pci_irq_vector(pdev, i),</div><div class='add'>+						 affinity_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -176,7 +187,7 @@ void aq_pci_func_free_irqs(struct aq_nic_s *self)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (pdev-&gt;msix_enabled)</div><div class='del'>-			irq_set_affinity_hint(pci_irq_vector(pdev, i), NULL);</div><div class='add'>+			irq_update_affinity_hint(pci_irq_vector(pdev, i), NULL);</div><div class='ctx'> 		free_irq(pci_irq_vector(pdev, i), irq_data);</div><div class='ctx'> 		self-&gt;msix_entry_mask &amp;= ~(1U &lt;&lt; i);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -188,7 +199,8 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self)</div><div class='ctx'> 		return AQ_HW_IRQ_MSIX;</div><div class='ctx'> 	if (self-&gt;pdev-&gt;msi_enabled)</div><div class='ctx'> 		return AQ_HW_IRQ_MSI;</div><div class='del'>-	return AQ_HW_IRQ_LEGACY;</div><div class='add'>+</div><div class='add'>+	return AQ_HW_IRQ_INTX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aq_pci_free_irq_vectors(struct aq_nic_s *self)</div><div class='hunk'>@@ -199,12 +211,12 @@ static void aq_pci_free_irq_vectors(struct aq_nic_s *self)</div><div class='ctx'> static int aq_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			const struct pci_device_id *pci_id)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *self;</div><div class='del'>-	int err;</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	resource_size_t mmio_pa;</div><div class='del'>-	u32 bar;</div><div class='add'>+	struct aq_nic_s *self;</div><div class='ctx'> 	u32 numvecs;</div><div class='add'>+	u32 bar;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -238,6 +250,15 @@ static int aq_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_ioremap;</div><div class='ctx'> 	}</div><div class='ctx'> 	self-&gt;aq_hw-&gt;aq_nic_cfg = aq_nic_get_cfg(self);</div><div class='add'>+	if (self-&gt;aq_hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;priv_data_len) {</div><div class='add'>+		int len = self-&gt;aq_hw-&gt;aq_nic_cfg-&gt;aq_hw_caps-&gt;priv_data_len;</div><div class='add'>+</div><div class='add'>+		self-&gt;aq_hw-&gt;priv = kzalloc(len, GFP_KERNEL);</div><div class='add'>+		if (!self-&gt;aq_hw-&gt;priv) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_free_aq_hw;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (bar = 0; bar &lt; 4; ++bar) {</div><div class='ctx'> 		if (IORESOURCE_MEM &amp; pci_resource_flags(pdev, bar)) {</div><div class='hunk'>@@ -246,19 +267,19 @@ static int aq_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			mmio_pa = pci_resource_start(pdev, bar);</div><div class='ctx'> 			if (mmio_pa == 0U) {</div><div class='ctx'> 				err = -EIO;</div><div class='del'>-				goto err_free_aq_hw;</div><div class='add'>+				goto err_free_aq_hw_priv;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			reg_sz = pci_resource_len(pdev, bar);</div><div class='ctx'> 			if ((reg_sz &lt;= 24 /*ATL_REGS_SIZE*/)) {</div><div class='ctx'> 				err = -EIO;</div><div class='del'>-				goto err_free_aq_hw;</div><div class='add'>+				goto err_free_aq_hw_priv;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			self-&gt;aq_hw-&gt;mmio = ioremap_nocache(mmio_pa, reg_sz);</div><div class='add'>+			self-&gt;aq_hw-&gt;mmio = ioremap(mmio_pa, reg_sz);</div><div class='ctx'> 			if (!self-&gt;aq_hw-&gt;mmio) {</div><div class='ctx'> 				err = -EIO;</div><div class='del'>-				goto err_free_aq_hw;</div><div class='add'>+				goto err_free_aq_hw_priv;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -266,19 +287,19 @@ static int aq_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	if (bar == 4) {</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		goto err_free_aq_hw;</div><div class='add'>+		goto err_free_aq_hw_priv;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	numvecs = min((u8)AQ_CFG_VECS_DEF,</div><div class='ctx'> 		      aq_nic_get_cfg(self)-&gt;aq_hw_caps-&gt;msix_irqs);</div><div class='ctx'> 	numvecs = min(numvecs, num_online_cpus());</div><div class='add'>+	/* Request IRQ vector for PTP */</div><div class='add'>+	numvecs += 1;</div><div class='add'>+</div><div class='ctx'> 	numvecs += AQ_HW_SERVICE_IRQS;</div><div class='ctx'> 	/*enable interrupts */</div><div class='del'>-#if !AQ_CFG_FORCE_LEGACY_INT</div><div class='del'>-	err = pci_alloc_irq_vectors(self-&gt;pdev, 1, numvecs,</div><div class='del'>-				    PCI_IRQ_MSIX | PCI_IRQ_MSI |</div><div class='del'>-				    PCI_IRQ_LEGACY);</div><div class='del'>-</div><div class='add'>+#if !AQ_CFG_FORCE_INTX</div><div class='add'>+	err = pci_alloc_irq_vectors(self-&gt;pdev, 1, numvecs, PCI_IRQ_ALL_TYPES);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_hwinit;</div><div class='ctx'> 	numvecs = err;</div><div class='hunk'>@@ -303,6 +324,8 @@ err_register:</div><div class='ctx'> 	aq_pci_free_irq_vectors(self);</div><div class='ctx'> err_hwinit:</div><div class='ctx'> 	iounmap(self-&gt;aq_hw-&gt;mmio);</div><div class='add'>+err_free_aq_hw_priv:</div><div class='add'>+	kfree(self-&gt;aq_hw-&gt;priv);</div><div class='ctx'> err_free_aq_hw:</div><div class='ctx'> 	kfree(self-&gt;aq_hw);</div><div class='ctx'> err_ioremap:</div><div class='hunk'>@@ -311,6 +334,7 @@ err_ndev:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> err_pci_func:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -322,9 +346,14 @@ static void aq_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 		aq_clear_rxnfc_all_rules(self);</div><div class='ctx'> 		if (self-&gt;ndev-&gt;reg_state == NETREG_REGISTERED)</div><div class='ctx'> 			unregister_netdev(self-&gt;ndev);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_MACSEC)</div><div class='add'>+		aq_macsec_free(self);</div><div class='add'>+#endif</div><div class='ctx'> 		aq_nic_free_vectors(self);</div><div class='ctx'> 		aq_pci_free_irq_vectors(self);</div><div class='ctx'> 		iounmap(self-&gt;aq_hw-&gt;mmio);</div><div class='add'>+		kfree(self-&gt;aq_hw-&gt;priv);</div><div class='ctx'> 		kfree(self-&gt;aq_hw);</div><div class='ctx'> 		pci_release_regions(pdev);</div><div class='ctx'> 		free_netdev(self-&gt;ndev);</div><div class='hunk'>@@ -347,38 +376,111 @@ static void aq_pci_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_pci_suspend(struct pci_dev *pdev, pm_message_t pm_msg)</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+static int aq_suspend_common(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *self = pci_get_drvdata(pdev);</div><div class='add'>+	struct aq_nic_s *nic = pci_get_drvdata(to_pci_dev(dev));</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	nic-&gt;power_state = AQ_HW_POWER_STATE_D3;</div><div class='add'>+	netif_device_detach(nic-&gt;ndev);</div><div class='add'>+	netif_tx_stop_all_queues(nic-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(nic-&gt;ndev))</div><div class='add'>+		aq_nic_stop(nic);</div><div class='add'>+</div><div class='add'>+	aq_nic_deinit(nic, !nic-&gt;aq_hw-&gt;aq_nic_cfg-&gt;wol);</div><div class='add'>+	aq_nic_set_power(nic);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	return aq_nic_change_pm_state(self, &amp;pm_msg);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_pci_resume(struct pci_dev *pdev)</div><div class='add'>+static int atl_resume_common(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct aq_nic_s *self = pci_get_drvdata(pdev);</div><div class='del'>-	pm_message_t pm_msg = PMSG_RESTORE;</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='add'>+	struct aq_nic_s *nic;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	nic = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	pci_set_power_state(pdev, PCI_D0);</div><div class='add'>+	pci_restore_state(pdev);</div><div class='add'>+</div><div class='add'>+	if (netif_running(nic-&gt;ndev)) {</div><div class='add'>+		ret = aq_nic_init(nic);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		ret = aq_nic_start(nic);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_attach(nic-&gt;ndev);</div><div class='add'>+	netif_tx_start_all_queues(nic-&gt;ndev);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		aq_nic_deinit(nic, true);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return aq_nic_change_pm_state(self, &amp;pm_msg);</div><div class='add'>+static int aq_pm_freeze(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return aq_suspend_common(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_pm_suspend_poweroff(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return aq_suspend_common(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_pm_thaw(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return atl_resume_common(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct pci_driver aq_pci_ops = {</div><div class='add'>+static int aq_pm_resume_restore(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	return atl_resume_common(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct dev_pm_ops aq_pm_ops = {</div><div class='add'>+	.suspend = aq_pm_suspend_poweroff,</div><div class='add'>+	.poweroff = aq_pm_suspend_poweroff,</div><div class='add'>+	.freeze = aq_pm_freeze,</div><div class='add'>+	.resume = aq_pm_resume_restore,</div><div class='add'>+	.restore = aq_pm_resume_restore,</div><div class='add'>+	.thaw = aq_pm_thaw,</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static struct pci_driver aq_pci_driver = {</div><div class='ctx'> 	.name = AQ_CFG_DRV_NAME,</div><div class='ctx'> 	.id_table = aq_pci_tbl,</div><div class='ctx'> 	.probe = aq_pci_probe,</div><div class='ctx'> 	.remove = aq_pci_remove,</div><div class='del'>-	.suspend = aq_pci_suspend,</div><div class='del'>-	.resume = aq_pci_resume,</div><div class='ctx'> 	.shutdown = aq_pci_shutdown,</div><div class='add'>+#ifdef CONFIG_PM</div><div class='add'>+	.driver.pm = &amp;aq_pm_ops,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int aq_pci_func_register_driver(void)</div><div class='ctx'> {</div><div class='del'>-	return pci_register_driver(&amp;aq_pci_ops);</div><div class='add'>+	return pci_register_driver(&amp;aq_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void aq_pci_func_unregister_driver(void)</div><div class='ctx'> {</div><div class='del'>-	pci_unregister_driver(&amp;aq_pci_ops);</div><div class='add'>+	pci_unregister_driver(&amp;aq_pci_driver);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h<br/>index 670f9a940d65..3fa5f7a73680 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_pci_func.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_pci_func.h: Declaration of PCI functions. */</div><div class='hunk'>@@ -22,7 +20,6 @@ struct aq_board_revision_s {</div><div class='ctx'> 	const struct aq_hw_caps_s *caps;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-int aq_pci_func_init(struct pci_dev *pdev);</div><div class='ctx'> int aq_pci_func_alloc_irq(struct aq_nic_s *self, unsigned int i,</div><div class='ctx'> 			  char *name, irq_handler_t irq_handler,</div><div class='ctx'> 			  void *irq_arg, cpumask_t *affinity_mask);</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_phy.c b/drivers/net/ethernet/aquantia/atlantic/aq_phy.c<br/>new file mode 100644<br/>index 000000000000..949ac2351701<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_phy.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_phy.c</a></div><div class='hunk'>@@ -0,0 +1,172 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "aq_phy.h"</div><div class='add'>+</div><div class='add'>+#define HW_ATL_PTP_DISABLE_MSK	BIT(10)</div><div class='add'>+</div><div class='add'>+bool aq_mdio_busy_wait(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl_mdio_busy_get, aq_hw,</div><div class='add'>+					val, val == 0U, 10U, 100000U);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 aq_mdio_read_word(struct aq_hw_s *aq_hw, u16 mmd, u16 addr)</div><div class='add'>+{</div><div class='add'>+	u16 phy_addr = aq_hw-&gt;phy_id &lt;&lt; 5 | mmd;</div><div class='add'>+</div><div class='add'>+	/* Set Address register. */</div><div class='add'>+	hw_atl_glb_mdio_iface4_set(aq_hw, (addr &amp; HW_ATL_MDIO_ADDRESS_MSK) &lt;&lt;</div><div class='add'>+				   HW_ATL_MDIO_ADDRESS_SHIFT);</div><div class='add'>+	/* Send Address command. */</div><div class='add'>+	hw_atl_glb_mdio_iface2_set(aq_hw, HW_ATL_MDIO_EXECUTE_OPERATION_MSK |</div><div class='add'>+				   (3 &lt;&lt; HW_ATL_MDIO_OP_MODE_SHIFT) |</div><div class='add'>+				   ((phy_addr &amp; HW_ATL_MDIO_PHY_ADDRESS_MSK) &lt;&lt;</div><div class='add'>+				    HW_ATL_MDIO_PHY_ADDRESS_SHIFT));</div><div class='add'>+</div><div class='add'>+	aq_mdio_busy_wait(aq_hw);</div><div class='add'>+</div><div class='add'>+	/* Send Read command. */</div><div class='add'>+	hw_atl_glb_mdio_iface2_set(aq_hw, HW_ATL_MDIO_EXECUTE_OPERATION_MSK |</div><div class='add'>+				   (1 &lt;&lt; HW_ATL_MDIO_OP_MODE_SHIFT) |</div><div class='add'>+				   ((phy_addr &amp; HW_ATL_MDIO_PHY_ADDRESS_MSK) &lt;&lt;</div><div class='add'>+				    HW_ATL_MDIO_PHY_ADDRESS_SHIFT));</div><div class='add'>+	/* Read result. */</div><div class='add'>+	aq_mdio_busy_wait(aq_hw);</div><div class='add'>+</div><div class='add'>+	return (u16)hw_atl_glb_mdio_iface5_get(aq_hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_mdio_write_word(struct aq_hw_s *aq_hw, u16 mmd, u16 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	u16 phy_addr = aq_hw-&gt;phy_id &lt;&lt; 5 | mmd;</div><div class='add'>+</div><div class='add'>+	/* Set Address register. */</div><div class='add'>+	hw_atl_glb_mdio_iface4_set(aq_hw, (addr &amp; HW_ATL_MDIO_ADDRESS_MSK) &lt;&lt;</div><div class='add'>+				   HW_ATL_MDIO_ADDRESS_SHIFT);</div><div class='add'>+	/* Send Address command. */</div><div class='add'>+	hw_atl_glb_mdio_iface2_set(aq_hw, HW_ATL_MDIO_EXECUTE_OPERATION_MSK |</div><div class='add'>+				   (3 &lt;&lt; HW_ATL_MDIO_OP_MODE_SHIFT) |</div><div class='add'>+				   ((phy_addr &amp; HW_ATL_MDIO_PHY_ADDRESS_MSK) &lt;&lt;</div><div class='add'>+				    HW_ATL_MDIO_PHY_ADDRESS_SHIFT));</div><div class='add'>+</div><div class='add'>+	aq_mdio_busy_wait(aq_hw);</div><div class='add'>+</div><div class='add'>+	hw_atl_glb_mdio_iface3_set(aq_hw, (data &amp; HW_ATL_MDIO_WRITE_DATA_MSK) &lt;&lt;</div><div class='add'>+				   HW_ATL_MDIO_WRITE_DATA_SHIFT);</div><div class='add'>+	/* Send Write command. */</div><div class='add'>+	hw_atl_glb_mdio_iface2_set(aq_hw, HW_ATL_MDIO_EXECUTE_OPERATION_MSK |</div><div class='add'>+				   (2 &lt;&lt; HW_ATL_MDIO_OP_MODE_SHIFT) |</div><div class='add'>+				   ((phy_addr &amp; HW_ATL_MDIO_PHY_ADDRESS_MSK) &lt;&lt;</div><div class='add'>+				    HW_ATL_MDIO_PHY_ADDRESS_SHIFT));</div><div class='add'>+</div><div class='add'>+	aq_mdio_busy_wait(aq_hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 aq_phy_read_reg(struct aq_hw_s *aq_hw, u16 mmd, u16 address)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl_sem_mdio_get, aq_hw,</div><div class='add'>+					val, val == 1U, 10U, 100000U);</div><div class='add'>+</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		err = 0xffff;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aq_mdio_read_word(aq_hw, mmd, address);</div><div class='add'>+</div><div class='add'>+	hw_atl_reg_glb_cpu_sem_set(aq_hw, 1U, HW_ATL_FW_SM_MDIO);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_phy_write_reg(struct aq_hw_s *aq_hw, u16 mmd, u16 address, u16 data)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl_sem_mdio_get, aq_hw,</div><div class='add'>+					val, val == 1U, 10U, 100000U);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aq_mdio_write_word(aq_hw, mmd, address, data);</div><div class='add'>+	hw_atl_reg_glb_cpu_sem_set(aq_hw, 1U, HW_ATL_FW_SM_MDIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool aq_phy_init_phy_id(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+</div><div class='add'>+	for (aq_hw-&gt;phy_id = 0; aq_hw-&gt;phy_id &lt; HW_ATL_PHY_ID_MAX;</div><div class='add'>+	     ++aq_hw-&gt;phy_id) {</div><div class='add'>+		/* PMA Standard Device Identifier 2: Address 1.3 */</div><div class='add'>+		val = aq_phy_read_reg(aq_hw, MDIO_MMD_PMAPMD, 3);</div><div class='add'>+</div><div class='add'>+		if (val != 0xffff)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool aq_phy_init(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	u32 dev_id;</div><div class='add'>+</div><div class='add'>+	if (aq_hw-&gt;phy_id == HW_ATL_PHY_ID_MAX)</div><div class='add'>+		if (!aq_phy_init_phy_id(aq_hw))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+	/* PMA Standard Device Identifier:</div><div class='add'>+	 * Address 1.2 = MSW,</div><div class='add'>+	 * Address 1.3 = LSW</div><div class='add'>+	 */</div><div class='add'>+	dev_id = aq_phy_read_reg(aq_hw, MDIO_MMD_PMAPMD, 2);</div><div class='add'>+	dev_id &lt;&lt;= 16;</div><div class='add'>+	dev_id |= aq_phy_read_reg(aq_hw, MDIO_MMD_PMAPMD, 3);</div><div class='add'>+</div><div class='add'>+	if (dev_id == 0xffffffff) {</div><div class='add'>+		aq_hw-&gt;phy_id = HW_ATL_PHY_ID_MAX;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_phy_disable_ptp(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	static const u16 ptp_registers[] = {</div><div class='add'>+		0x031e,</div><div class='add'>+		0x031d,</div><div class='add'>+		0x031c,</div><div class='add'>+		0x031b,</div><div class='add'>+	};</div><div class='add'>+	u16 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ptp_registers); i++) {</div><div class='add'>+		val = aq_phy_read_reg(aq_hw, MDIO_MMD_VEND1,</div><div class='add'>+				      ptp_registers[i]);</div><div class='add'>+</div><div class='add'>+		aq_phy_write_reg(aq_hw, MDIO_MMD_VEND1,</div><div class='add'>+				 ptp_registers[i],</div><div class='add'>+				 val &amp; ~HW_ATL_PTP_DISABLE_MSK);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_phy.h b/drivers/net/ethernet/aquantia/atlantic/aq_phy.h<br/>new file mode 100644<br/>index 000000000000..86cc1ee836e2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_phy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_phy.h</a></div><div class='hunk'>@@ -0,0 +1,36 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2018-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef AQ_PHY_H</div><div class='add'>+#define AQ_PHY_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+</div><div class='add'>+#include "hw_atl/hw_atl_llh.h"</div><div class='add'>+#include "hw_atl/hw_atl_llh_internal.h"</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+</div><div class='add'>+#define HW_ATL_PHY_ID_MAX 32U</div><div class='add'>+</div><div class='add'>+bool aq_mdio_busy_wait(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+u16 aq_mdio_read_word(struct aq_hw_s *aq_hw, u16 mmd, u16 addr);</div><div class='add'>+</div><div class='add'>+void aq_mdio_write_word(struct aq_hw_s *aq_hw, u16 mmd, u16 addr, u16 data);</div><div class='add'>+</div><div class='add'>+u16 aq_phy_read_reg(struct aq_hw_s *aq_hw, u16 mmd, u16 address);</div><div class='add'>+</div><div class='add'>+void aq_phy_write_reg(struct aq_hw_s *aq_hw, u16 mmd, u16 address, u16 data);</div><div class='add'>+</div><div class='add'>+bool aq_phy_init_phy_id(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+bool aq_phy_init(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+void aq_phy_disable_ptp(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+#endif /* AQ_PHY_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c<br/>new file mode 100644<br/>index 000000000000..0fa0f891c0e0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_ptp.c</a></div><div class='hunk'>@@ -0,0 +1,1415 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* File aq_ptp.c:</div><div class='add'>+ * Definition of functions for Linux PTP support.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+</div><div class='add'>+#include "aq_nic.h"</div><div class='add'>+#include "aq_ptp.h"</div><div class='add'>+#include "aq_ring.h"</div><div class='add'>+#include "aq_phy.h"</div><div class='add'>+#include "aq_filters.h"</div><div class='add'>+</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+</div><div class='add'>+#define AQ_PTP_TX_TIMEOUT        (HZ *  10)</div><div class='add'>+</div><div class='add'>+#define POLL_SYNC_TIMER_MS 15</div><div class='add'>+</div><div class='add'>+enum ptp_speed_offsets {</div><div class='add'>+	ptp_offset_idx_10 = 0,</div><div class='add'>+	ptp_offset_idx_100,</div><div class='add'>+	ptp_offset_idx_1000,</div><div class='add'>+	ptp_offset_idx_2500,</div><div class='add'>+	ptp_offset_idx_5000,</div><div class='add'>+	ptp_offset_idx_10000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ptp_skb_ring {</div><div class='add'>+	struct sk_buff **buff;</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	unsigned int head;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ptp_tx_timeout {</div><div class='add'>+	spinlock_t lock;</div><div class='add'>+	bool active;</div><div class='add'>+	unsigned long tx_start;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct aq_ptp_s {</div><div class='add'>+	struct aq_nic_s *aq_nic;</div><div class='add'>+	struct kernel_hwtstamp_config hwtstamp_config;</div><div class='add'>+	spinlock_t ptp_lock;</div><div class='add'>+	spinlock_t ptp_ring_lock;</div><div class='add'>+	struct ptp_clock *ptp_clock;</div><div class='add'>+	struct ptp_clock_info ptp_info;</div><div class='add'>+</div><div class='add'>+	atomic_t offset_egress;</div><div class='add'>+	atomic_t offset_ingress;</div><div class='add'>+</div><div class='add'>+	struct aq_ring_param_s ptp_ring_param;</div><div class='add'>+</div><div class='add'>+	struct ptp_tx_timeout ptp_tx_timeout;</div><div class='add'>+</div><div class='add'>+	unsigned int idx_vector;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	struct aq_ring_s ptp_tx;</div><div class='add'>+	struct aq_ring_s ptp_rx;</div><div class='add'>+	struct aq_ring_s hwts_rx;</div><div class='add'>+</div><div class='add'>+	struct ptp_skb_ring skb_ring;</div><div class='add'>+</div><div class='add'>+	struct aq_rx_filter_l3l4 udp_filter;</div><div class='add'>+	struct aq_rx_filter_l2 eth_type_filter;</div><div class='add'>+</div><div class='add'>+	struct delayed_work poll_sync;</div><div class='add'>+	u32 poll_timeout_ms;</div><div class='add'>+</div><div class='add'>+	bool extts_pin_enabled;</div><div class='add'>+	u64 last_sync1588_ts;</div><div class='add'>+</div><div class='add'>+	bool a1_ptp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ptp_tm_offset {</div><div class='add'>+	unsigned int mbps;</div><div class='add'>+	int egress;</div><div class='add'>+	int ingress;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct ptp_tm_offset ptp_offset[6];</div><div class='add'>+</div><div class='add'>+void aq_ptp_tm_offset_set(struct aq_nic_s *aq_nic, unsigned int mbps)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	int i, egress, ingress;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	egress = 0;</div><div class='add'>+	ingress = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ptp_offset); i++) {</div><div class='add'>+		if (mbps == ptp_offset[i].mbps) {</div><div class='add'>+			egress = ptp_offset[i].egress;</div><div class='add'>+			ingress = ptp_offset[i].ingress;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;aq_ptp-&gt;offset_egress, egress);</div><div class='add'>+	atomic_set(&amp;aq_ptp-&gt;offset_ingress, ingress);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __aq_ptp_skb_put(struct ptp_skb_ring *ring, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int next_head = (ring-&gt;head + 1) % ring-&gt;size;</div><div class='add'>+</div><div class='add'>+	if (next_head == ring-&gt;tail)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ring-&gt;buff[ring-&gt;head] = skb_get(skb);</div><div class='add'>+	ring-&gt;head = next_head;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_skb_put(struct ptp_skb_ring *ring, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ring-&gt;lock, flags);</div><div class='add'>+	ret = __aq_ptp_skb_put(ring, skb);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *__aq_ptp_skb_get(struct ptp_skb_ring *ring)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (ring-&gt;tail == ring-&gt;head)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = ring-&gt;buff[ring-&gt;tail];</div><div class='add'>+	ring-&gt;tail = (ring-&gt;tail + 1) % ring-&gt;size;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *aq_ptp_skb_get(struct ptp_skb_ring *ring)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ring-&gt;lock, flags);</div><div class='add'>+	skb = __aq_ptp_skb_get(ring);</div><div class='add'>+	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int aq_ptp_skb_buf_len(struct ptp_skb_ring *ring)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;ring-&gt;lock, flags);</div><div class='add'>+	len = (ring-&gt;head &gt;= ring-&gt;tail) ?</div><div class='add'>+	ring-&gt;head - ring-&gt;tail :</div><div class='add'>+	ring-&gt;size - ring-&gt;tail + ring-&gt;head;</div><div class='add'>+	spin_unlock_irqrestore(&amp;ring-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_skb_ring_init(struct ptp_skb_ring *ring, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff **buff = kmalloc(sizeof(*buff) * size, GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;ring-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ring-&gt;buff = buff;</div><div class='add'>+	ring-&gt;size = size;</div><div class='add'>+	ring-&gt;head = 0;</div><div class='add'>+	ring-&gt;tail = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_skb_ring_clean(struct ptp_skb_ring *ring)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = aq_ptp_skb_get(ring)) != NULL)</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_skb_ring_release(struct ptp_skb_ring *ring)</div><div class='add'>+{</div><div class='add'>+	if (ring-&gt;buff) {</div><div class='add'>+		aq_ptp_skb_ring_clean(ring);</div><div class='add'>+		kfree(ring-&gt;buff);</div><div class='add'>+		ring-&gt;buff = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_tx_timeout_init(struct ptp_tx_timeout *timeout)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;timeout-&gt;lock);</div><div class='add'>+	timeout-&gt;active = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_tx_timeout_start(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	struct ptp_tx_timeout *timeout = &amp;aq_ptp-&gt;ptp_tx_timeout;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;timeout-&gt;lock, flags);</div><div class='add'>+	timeout-&gt;active = true;</div><div class='add'>+	timeout-&gt;tx_start = jiffies;</div><div class='add'>+	spin_unlock_irqrestore(&amp;timeout-&gt;lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_tx_timeout_update(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	if (!aq_ptp_skb_buf_len(&amp;aq_ptp-&gt;skb_ring)) {</div><div class='add'>+		struct ptp_tx_timeout *timeout = &amp;aq_ptp-&gt;ptp_tx_timeout;</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		spin_lock_irqsave(&amp;timeout-&gt;lock, flags);</div><div class='add'>+		timeout-&gt;active = false;</div><div class='add'>+		spin_unlock_irqrestore(&amp;timeout-&gt;lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_tx_timeout_check(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	struct ptp_tx_timeout *timeout = &amp;aq_ptp-&gt;ptp_tx_timeout;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool timeout_flag;</div><div class='add'>+</div><div class='add'>+	timeout_flag = false;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;timeout-&gt;lock, flags);</div><div class='add'>+	if (timeout-&gt;active) {</div><div class='add'>+		timeout_flag = time_is_before_jiffies(timeout-&gt;tx_start +</div><div class='add'>+						      AQ_PTP_TX_TIMEOUT);</div><div class='add'>+		/* reset active flag if timeout detected */</div><div class='add'>+		if (timeout_flag)</div><div class='add'>+			timeout-&gt;active = false;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;timeout-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (timeout_flag) {</div><div class='add'>+		aq_ptp_skb_ring_clean(&amp;aq_ptp-&gt;skb_ring);</div><div class='add'>+		netdev_err(aq_ptp-&gt;aq_nic-&gt;ndev,</div><div class='add'>+			   "PTP Timeout. Clearing Tx Timestamp SKBs\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_adjfine</div><div class='add'>+ * @ptp: the ptp clock structure</div><div class='add'>+ * @ppb: parts per billion adjustment from base</div><div class='add'>+ *</div><div class='add'>+ * adjust the frequency of the ptp cycle counter by the</div><div class='add'>+ * indicated ppb from the base frequency.</div><div class='add'>+ */</div><div class='add'>+static int aq_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_adj_clock_freq(aq_nic-&gt;aq_hw,</div><div class='add'>+					     scaled_ppm_to_ppb(scaled_ppm));</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_adjtime</div><div class='add'>+ * @ptp: the ptp clock structure</div><div class='add'>+ * @delta: offset to adjust the cycle counter by</div><div class='add'>+ *</div><div class='add'>+ * adjust the timer by resetting the timecounter structure.</div><div class='add'>+ */</div><div class='add'>+static int aq_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aq_ptp-&gt;ptp_lock, flags);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_adj_sys_clock(aq_nic-&gt;aq_hw, delta);</div><div class='add'>+	spin_unlock_irqrestore(&amp;aq_ptp-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_gettime</div><div class='add'>+ * @ptp: the ptp clock structure</div><div class='add'>+ * @ts: timespec structure to hold the current time value</div><div class='add'>+ *</div><div class='add'>+ * read the timecounter and return the correct value on ns,</div><div class='add'>+ * after converting it into a struct timespec.</div><div class='add'>+ */</div><div class='add'>+static int aq_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aq_ptp-&gt;ptp_lock, flags);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_get_ptp_ts(aq_nic-&gt;aq_hw, &amp;ns);</div><div class='add'>+	spin_unlock_irqrestore(&amp;aq_ptp-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(ns);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_settime</div><div class='add'>+ * @ptp: the ptp clock structure</div><div class='add'>+ * @ts: the timespec containing the new time for the cycle counter</div><div class='add'>+ *</div><div class='add'>+ * reset the timecounter to use a new base value instead of the kernel</div><div class='add'>+ * wall timer value.</div><div class='add'>+ */</div><div class='add'>+static int aq_ptp_settime(struct ptp_clock_info *ptp,</div><div class='add'>+			  const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 ns = timespec64_to_ns(ts);</div><div class='add'>+	u64 now;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aq_ptp-&gt;ptp_lock, flags);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_get_ptp_ts(aq_nic-&gt;aq_hw, &amp;now);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_adj_sys_clock(aq_nic-&gt;aq_hw, (s64)ns - (s64)now);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;aq_ptp-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_convert_to_hwtstamp(struct aq_ptp_s *aq_ptp,</div><div class='add'>+				       struct skb_shared_hwtstamps *hwtstamp,</div><div class='add'>+				       u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	memset(hwtstamp, 0, sizeof(*hwtstamp));</div><div class='add'>+	hwtstamp-&gt;hwtstamp = ns_to_ktime(timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_hw_pin_conf(struct aq_nic_s *aq_nic, u32 pin_index, u64 start,</div><div class='add'>+			      u64 period)</div><div class='add'>+{</div><div class='add'>+	if (period)</div><div class='add'>+		netdev_dbg(aq_nic-&gt;ndev,</div><div class='add'>+			   "Enable GPIO %d pulsing, start time %llu, period %u\n",</div><div class='add'>+			   pin_index, start, (u32)period);</div><div class='add'>+	else</div><div class='add'>+		netdev_dbg(aq_nic-&gt;ndev,</div><div class='add'>+			   "Disable GPIO %d pulsing, start time %llu, period %u\n",</div><div class='add'>+			   pin_index, start, (u32)period);</div><div class='add'>+</div><div class='add'>+	/* Notify hardware of request to being sending pulses.</div><div class='add'>+	 * If period is ZERO then pulsen is disabled.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_gpio_pulse(aq_nic-&gt;aq_hw, pin_index,</div><div class='add'>+					 start, (u32)period);</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_perout_pin_configure(struct ptp_clock_info *ptp,</div><div class='add'>+				       struct ptp_clock_request *rq, int on)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+	struct ptp_clock_time *t = &amp;rq-&gt;perout.period;</div><div class='add'>+	struct ptp_clock_time *s = &amp;rq-&gt;perout.start;</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	u64 start, period;</div><div class='add'>+	u32 pin_index = rq-&gt;perout.index;</div><div class='add'>+</div><div class='add'>+	/* verify the request channel is there */</div><div class='add'>+	if (pin_index &gt;= ptp-&gt;n_per_out)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* we cannot support periods greater</div><div class='add'>+	 * than 4 seconds due to reg limit</div><div class='add'>+	 */</div><div class='add'>+	if (t-&gt;sec &gt; 4 || t-&gt;sec &lt; 0)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* convert to unsigned 64b ns,</div><div class='add'>+	 * verify we can put it in a 32b register</div><div class='add'>+	 */</div><div class='add'>+	period = on ? t-&gt;sec * NSEC_PER_SEC + t-&gt;nsec : 0;</div><div class='add'>+</div><div class='add'>+	/* verify the value is in range supported by hardware */</div><div class='add'>+	if (period &gt; U32_MAX)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	/* convert to unsigned 64b ns */</div><div class='add'>+	/* TODO convert to AQ time */</div><div class='add'>+	start = on ? s-&gt;sec * NSEC_PER_SEC + s-&gt;nsec : 0;</div><div class='add'>+</div><div class='add'>+	aq_ptp_hw_pin_conf(aq_nic, pin_index, start, period);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_pps_pin_configure(struct ptp_clock_info *ptp,</div><div class='add'>+				    struct ptp_clock_request *rq, int on)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	u64 start, period;</div><div class='add'>+	u32 pin_index = 0;</div><div class='add'>+	u32 rest = 0;</div><div class='add'>+</div><div class='add'>+	/* verify the request channel is there */</div><div class='add'>+	if (pin_index &gt;= ptp-&gt;n_per_out)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_get_ptp_ts(aq_nic-&gt;aq_hw, &amp;start);</div><div class='add'>+	div_u64_rem(start, NSEC_PER_SEC, &amp;rest);</div><div class='add'>+	period = on ? NSEC_PER_SEC : 0; /* PPS - pulse per second */</div><div class='add'>+	start = on ? start - rest + NSEC_PER_SEC *</div><div class='add'>+		(rest &gt; 990000000LL ? 2 : 1) : 0;</div><div class='add'>+</div><div class='add'>+	aq_ptp_hw_pin_conf(aq_nic, pin_index, start, period);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_extts_pin_ctrl(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	u32 enable = aq_ptp-&gt;extts_pin_enabled;</div><div class='add'>+</div><div class='add'>+	if (aq_nic-&gt;aq_hw_ops-&gt;hw_extts_gpio_enable)</div><div class='add'>+		aq_nic-&gt;aq_hw_ops-&gt;hw_extts_gpio_enable(aq_nic-&gt;aq_hw, 0,</div><div class='add'>+							enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_extts_pin_configure(struct ptp_clock_info *ptp,</div><div class='add'>+				      struct ptp_clock_request *rq, int on)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(ptp, struct aq_ptp_s, ptp_info);</div><div class='add'>+</div><div class='add'>+	u32 pin_index = rq-&gt;extts.index;</div><div class='add'>+</div><div class='add'>+	if (pin_index &gt;= ptp-&gt;n_ext_ts)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;extts_pin_enabled = !!on;</div><div class='add'>+	if (on) {</div><div class='add'>+		aq_ptp-&gt;poll_timeout_ms = POLL_SYNC_TIMER_MS;</div><div class='add'>+		cancel_delayed_work_sync(&amp;aq_ptp-&gt;poll_sync);</div><div class='add'>+		schedule_delayed_work(&amp;aq_ptp-&gt;poll_sync,</div><div class='add'>+				      msecs_to_jiffies(aq_ptp-&gt;poll_timeout_ms));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aq_ptp_extts_pin_ctrl(aq_ptp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_gpio_feature_enable</div><div class='add'>+ * @ptp: the ptp clock structure</div><div class='add'>+ * @rq: the requested feature to change</div><div class='add'>+ * @on: whether to enable or disable the feature</div><div class='add'>+ */</div><div class='add'>+static int aq_ptp_gpio_feature_enable(struct ptp_clock_info *ptp,</div><div class='add'>+				      struct ptp_clock_request *rq, int on)</div><div class='add'>+{</div><div class='add'>+	switch (rq-&gt;type) {</div><div class='add'>+	case PTP_CLK_REQ_EXTTS:</div><div class='add'>+		return aq_ptp_extts_pin_configure(ptp, rq, on);</div><div class='add'>+	case PTP_CLK_REQ_PEROUT:</div><div class='add'>+		return aq_ptp_perout_pin_configure(ptp, rq, on);</div><div class='add'>+	case PTP_CLK_REQ_PPS:</div><div class='add'>+		return aq_ptp_pps_pin_configure(ptp, rq, on);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_verify</div><div class='add'>+ * @ptp: the ptp clock structure</div><div class='add'>+ * @pin: index of the pin in question</div><div class='add'>+ * @func: the desired function to use</div><div class='add'>+ * @chan: the function channel index to use</div><div class='add'>+ */</div><div class='add'>+static int aq_ptp_verify(struct ptp_clock_info *ptp, unsigned int pin,</div><div class='add'>+			 enum ptp_pin_function func, unsigned int chan)</div><div class='add'>+{</div><div class='add'>+	/* verify the requested pin is there */</div><div class='add'>+	if (!ptp-&gt;pin_config || pin &gt;= ptp-&gt;n_pins)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* enforce locked channels, no changing them */</div><div class='add'>+	if (chan != ptp-&gt;pin_config[pin].chan)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* we want to keep the functions locked as well */</div><div class='add'>+	if (func != ptp-&gt;pin_config[pin].func)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_tx_hwtstamp - utility function which checks for TX time stamp</div><div class='add'>+ * @adapter: the private adapter struct</div><div class='add'>+ *</div><div class='add'>+ * if the timestamp is valid, we convert it into the timecounter ns</div><div class='add'>+ * value, then store that result into the hwtstamps structure which</div><div class='add'>+ * is passed up the network stack</div><div class='add'>+ */</div><div class='add'>+void aq_ptp_tx_hwtstamp(struct aq_nic_s *aq_nic, u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	struct sk_buff *skb = aq_ptp_skb_get(&amp;aq_ptp-&gt;skb_ring);</div><div class='add'>+	struct skb_shared_hwtstamps hwtstamp;</div><div class='add'>+</div><div class='add'>+	if (!skb) {</div><div class='add'>+		netdev_err(aq_nic-&gt;ndev, "have timestamp but tx_queues empty\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	timestamp += atomic_read(&amp;aq_ptp-&gt;offset_egress);</div><div class='add'>+	aq_ptp_convert_to_hwtstamp(aq_ptp, &amp;hwtstamp, timestamp);</div><div class='add'>+	skb_tstamp_tx(skb, &amp;hwtstamp);</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	aq_ptp_tx_timeout_update(aq_ptp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* aq_ptp_rx_hwtstamp - utility function which checks for RX time stamp</div><div class='add'>+ * @adapter: pointer to adapter struct</div><div class='add'>+ * @shhwtstamps: particular skb_shared_hwtstamps to save timestamp</div><div class='add'>+ *</div><div class='add'>+ * if the timestamp is valid, we convert it into the timecounter ns</div><div class='add'>+ * value, then store that result into the hwtstamps structure which</div><div class='add'>+ * is passed up the network stack</div><div class='add'>+ */</div><div class='add'>+static void aq_ptp_rx_hwtstamp(struct aq_ptp_s *aq_ptp, struct skb_shared_hwtstamps *shhwtstamps,</div><div class='add'>+			       u64 timestamp)</div><div class='add'>+{</div><div class='add'>+	timestamp -= atomic_read(&amp;aq_ptp-&gt;offset_ingress);</div><div class='add'>+	aq_ptp_convert_to_hwtstamp(aq_ptp, shhwtstamps, timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_hwtstamp_config_get(struct aq_ptp_s *aq_ptp,</div><div class='add'>+				struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	*config = aq_ptp-&gt;hwtstamp_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_prepare_filters(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	aq_ptp-&gt;udp_filter.cmd = HW_ATL_RX_ENABLE_FLTR_L3L4 |</div><div class='add'>+			       HW_ATL_RX_ENABLE_CMP_PROT_L4 |</div><div class='add'>+			       HW_ATL_RX_UDP |</div><div class='add'>+			       HW_ATL_RX_ENABLE_CMP_DEST_PORT_L4 |</div><div class='add'>+			       HW_ATL_RX_HOST &lt;&lt; HW_ATL_RX_ACTION_FL3F4_SHIFT |</div><div class='add'>+			       HW_ATL_RX_ENABLE_QUEUE_L3L4 |</div><div class='add'>+			       aq_ptp-&gt;ptp_rx.idx &lt;&lt; HW_ATL_RX_QUEUE_FL3L4_SHIFT;</div><div class='add'>+	aq_ptp-&gt;udp_filter.p_dst = PTP_EV_PORT;</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;eth_type_filter.ethertype = ETH_P_1588;</div><div class='add'>+	aq_ptp-&gt;eth_type_filter.queue = aq_ptp-&gt;ptp_rx.idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_hwtstamp_config_set(struct aq_ptp_s *aq_ptp,</div><div class='add'>+			       struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	const struct aq_hw_ops *hw_ops;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	hw_ops = aq_nic-&gt;aq_hw_ops;</div><div class='add'>+	if (config-&gt;tx_type == HWTSTAMP_TX_ON ||</div><div class='add'>+	    config-&gt;rx_filter == HWTSTAMP_FILTER_PTP_V2_EVENT) {</div><div class='add'>+		aq_ptp_prepare_filters(aq_ptp);</div><div class='add'>+		if (hw_ops-&gt;hw_filter_l3l4_set) {</div><div class='add'>+			err = hw_ops-&gt;hw_filter_l3l4_set(aq_nic-&gt;aq_hw,</div><div class='add'>+							 &amp;aq_ptp-&gt;udp_filter);</div><div class='add'>+		}</div><div class='add'>+		if (!err &amp;&amp; hw_ops-&gt;hw_filter_l2_set) {</div><div class='add'>+			err = hw_ops-&gt;hw_filter_l2_set(aq_nic-&gt;aq_hw,</div><div class='add'>+						       &amp;aq_ptp-&gt;eth_type_filter);</div><div class='add'>+		}</div><div class='add'>+		aq_utils_obj_set(&amp;aq_nic-&gt;flags, AQ_NIC_PTP_DPATH_UP);</div><div class='add'>+	} else {</div><div class='add'>+		aq_ptp-&gt;udp_filter.cmd &amp;= ~HW_ATL_RX_ENABLE_FLTR_L3L4;</div><div class='add'>+		if (hw_ops-&gt;hw_filter_l3l4_set) {</div><div class='add'>+			err = hw_ops-&gt;hw_filter_l3l4_set(aq_nic-&gt;aq_hw,</div><div class='add'>+							 &amp;aq_ptp-&gt;udp_filter);</div><div class='add'>+		}</div><div class='add'>+		if (!err &amp;&amp; hw_ops-&gt;hw_filter_l2_clear) {</div><div class='add'>+			err = hw_ops-&gt;hw_filter_l2_clear(aq_nic-&gt;aq_hw,</div><div class='add'>+							&amp;aq_ptp-&gt;eth_type_filter);</div><div class='add'>+		}</div><div class='add'>+		aq_utils_obj_clear(&amp;aq_nic-&gt;flags, AQ_NIC_PTP_DPATH_UP);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return -EREMOTEIO;</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;hwtstamp_config = *config;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool aq_ptp_ring(struct aq_nic_s *aq_nic, struct aq_ring_s *ring)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return &amp;aq_ptp-&gt;ptp_tx == ring ||</div><div class='add'>+	       &amp;aq_ptp-&gt;ptp_rx == ring || &amp;aq_ptp-&gt;hwts_rx == ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct skb_shared_hwtstamps *shhwtstamps, u8 *p,</div><div class='add'>+		      unsigned int len)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	u64 timestamp = 0;</div><div class='add'>+	u16 ret = aq_nic-&gt;aq_hw_ops-&gt;rx_extract_ts(aq_nic-&gt;aq_hw,</div><div class='add'>+						   p, len, &amp;timestamp);</div><div class='add'>+</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		aq_ptp_rx_hwtstamp(aq_ptp, shhwtstamps, timestamp);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(napi, struct aq_ptp_s, napi);</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	bool was_cleaned = false;</div><div class='add'>+	int work_done = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Processing PTP TX traffic */</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_tx_head_update(aq_nic-&gt;aq_hw,</div><div class='add'>+							&amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	if (aq_ptp-&gt;ptp_tx.sw_head != aq_ptp-&gt;ptp_tx.hw_head) {</div><div class='add'>+		aq_ring_tx_clean(&amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+</div><div class='add'>+		was_cleaned = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Processing HW_TIMESTAMP RX traffic */</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_hwts_rx_receive(aq_nic-&gt;aq_hw,</div><div class='add'>+							 &amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	if (aq_ptp-&gt;hwts_rx.sw_head != aq_ptp-&gt;hwts_rx.hw_head) {</div><div class='add'>+		aq_ring_hwts_rx_clean(&amp;aq_ptp-&gt;hwts_rx, aq_nic);</div><div class='add'>+</div><div class='add'>+		err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_hwts_rx_fill(aq_nic-&gt;aq_hw,</div><div class='add'>+							      &amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		was_cleaned = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Processing PTP RX traffic */</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_receive(aq_nic-&gt;aq_hw,</div><div class='add'>+						    &amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	if (aq_ptp-&gt;ptp_rx.sw_head != aq_ptp-&gt;ptp_rx.hw_head) {</div><div class='add'>+		unsigned int sw_tail_old;</div><div class='add'>+</div><div class='add'>+		err = aq_ring_rx_clean(&amp;aq_ptp-&gt;ptp_rx, napi, &amp;work_done, budget);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		sw_tail_old = aq_ptp-&gt;ptp_rx.sw_tail;</div><div class='add'>+		err = aq_ring_rx_fill(&amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_fill(aq_nic-&gt;aq_hw,</div><div class='add'>+							 &amp;aq_ptp-&gt;ptp_rx,</div><div class='add'>+							 sw_tail_old);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (was_cleaned)</div><div class='add'>+		work_done = budget;</div><div class='add'>+</div><div class='add'>+	if (work_done &lt; budget) {</div><div class='add'>+		napi_complete_done(napi, work_done);</div><div class='add'>+		aq_nic-&gt;aq_hw_ops-&gt;hw_irq_enable(aq_nic-&gt;aq_hw,</div><div class='add'>+					BIT_ULL(aq_ptp-&gt;ptp_ring_param.vec_idx));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t aq_ptp_isr(int irq, void *private)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = private;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+	napi_schedule(&amp;aq_ptp-&gt;napi);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err &gt;= 0 ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_xmit(struct aq_nic_s *aq_nic, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	struct aq_ring_s *ring = &amp;aq_ptp-&gt;ptp_tx;</div><div class='add'>+	unsigned long irq_flags;</div><div class='add'>+	int err = NETDEV_TX_OK;</div><div class='add'>+	unsigned int frags;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt;= 0) {</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	frags = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='add'>+	/* Frags cannot be bigger 16KB</div><div class='add'>+	 * because PTP usually works</div><div class='add'>+	 * without Jumbo even in a background</div><div class='add'>+	 */</div><div class='add'>+	if (frags &gt; AQ_CFG_SKB_FRAGS_MAX || frags &gt; aq_ring_avail_dx(ring)) {</div><div class='add'>+		/* Drop packet because it doesn't make sence to delay it */</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aq_ptp_skb_put(&amp;aq_ptp-&gt;skb_ring, skb);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(aq_nic-&gt;ndev, "SKB Ring is overflow (%u)!\n",</div><div class='add'>+			   ring-&gt;size);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+	skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+	aq_ptp_tx_timeout_start(aq_ptp);</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;aq_nic-&gt;aq_ptp-&gt;ptp_ring_lock, irq_flags);</div><div class='add'>+	frags = aq_nic_map_skb(aq_nic, skb, ring);</div><div class='add'>+</div><div class='add'>+	if (likely(frags)) {</div><div class='add'>+		err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_tx_xmit(aq_nic-&gt;aq_hw,</div><div class='add'>+						       ring, frags);</div><div class='add'>+		if (err &gt;= 0) {</div><div class='add'>+			u64_stats_update_begin(&amp;ring-&gt;stats.tx.syncp);</div><div class='add'>+			++ring-&gt;stats.tx.packets;</div><div class='add'>+			ring-&gt;stats.tx.bytes += skb-&gt;len;</div><div class='add'>+			u64_stats_update_end(&amp;ring-&gt;stats.tx.syncp);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		err = NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;aq_nic-&gt;aq_ptp-&gt;ptp_ring_lock, irq_flags);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_service_task(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aq_ptp_tx_timeout_check(aq_ptp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_irq_alloc(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = aq_nic-&gt;pdev;</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (pdev-&gt;msix_enabled || pdev-&gt;msi_enabled) {</div><div class='add'>+		err = request_irq(pci_irq_vector(pdev, aq_ptp-&gt;idx_vector),</div><div class='add'>+				  aq_ptp_isr, 0, aq_nic-&gt;ndev-&gt;name, aq_ptp);</div><div class='add'>+	} else {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_irq_free(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	struct pci_dev *pdev = aq_nic-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	free_irq(pci_irq_vector(pdev, aq_ptp-&gt;idx_vector), aq_ptp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_ring_init(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = aq_ring_init(&amp;aq_ptp-&gt;ptp_tx, ATL_RING_TX);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_tx_init(aq_nic-&gt;aq_hw,</div><div class='add'>+						 &amp;aq_ptp-&gt;ptp_tx,</div><div class='add'>+						 &amp;aq_ptp-&gt;ptp_ring_param);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	err = aq_ring_init(&amp;aq_ptp-&gt;ptp_rx, ATL_RING_RX);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_init(aq_nic-&gt;aq_hw,</div><div class='add'>+						 &amp;aq_ptp-&gt;ptp_rx,</div><div class='add'>+						 &amp;aq_ptp-&gt;ptp_ring_param);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	err = aq_ring_rx_fill(&amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_rx_free;</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_fill(aq_nic-&gt;aq_hw,</div><div class='add'>+						 &amp;aq_ptp-&gt;ptp_rx,</div><div class='add'>+						 0U);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_rx_free;</div><div class='add'>+</div><div class='add'>+	err = aq_ring_init(&amp;aq_ptp-&gt;hwts_rx, ATL_RING_RX);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_rx_free;</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_init(aq_nic-&gt;aq_hw,</div><div class='add'>+						 &amp;aq_ptp-&gt;hwts_rx,</div><div class='add'>+						 &amp;aq_ptp-&gt;ptp_ring_param);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_hwts_rx_fill(aq_nic-&gt;aq_hw,</div><div class='add'>+						      &amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+err_rx_free:</div><div class='add'>+	aq_ring_rx_deinit(&amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_ring_start(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_tx_start(aq_nic-&gt;aq_hw, &amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_start(aq_nic-&gt;aq_hw, &amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	err = aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_start(aq_nic-&gt;aq_hw,</div><div class='add'>+						  &amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;aq_ptp-&gt;napi);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_ring_stop(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_ring_tx_stop(aq_nic-&gt;aq_hw, &amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_stop(aq_nic-&gt;aq_hw, &amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+</div><div class='add'>+	aq_nic-&gt;aq_hw_ops-&gt;hw_ring_rx_stop(aq_nic-&gt;aq_hw, &amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;aq_ptp-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_ring_deinit(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp || !aq_ptp-&gt;ptp_tx.aq_nic || !aq_ptp-&gt;ptp_rx.aq_nic)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aq_ring_tx_clean(&amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+	aq_ring_rx_deinit(&amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	unsigned int tx_ring_idx, rx_ring_idx;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tx_ring_idx = aq_ptp_ring_idx(aq_nic-&gt;aq_nic_cfg.tc_mode);</div><div class='add'>+</div><div class='add'>+	err = aq_ring_tx_alloc(&amp;aq_ptp-&gt;ptp_tx, aq_nic,</div><div class='add'>+			       tx_ring_idx, &amp;aq_nic-&gt;aq_nic_cfg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	rx_ring_idx = aq_ptp_ring_idx(aq_nic-&gt;aq_nic_cfg.tc_mode);</div><div class='add'>+</div><div class='add'>+	err = aq_ring_rx_alloc(&amp;aq_ptp-&gt;ptp_rx, aq_nic,</div><div class='add'>+			       rx_ring_idx, &amp;aq_nic-&gt;aq_nic_cfg);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_exit_ptp_tx;</div><div class='add'>+</div><div class='add'>+	err = aq_ring_hwts_rx_alloc(&amp;aq_ptp-&gt;hwts_rx, aq_nic, PTP_HWST_RING_IDX,</div><div class='add'>+				    aq_nic-&gt;aq_nic_cfg.rxds,</div><div class='add'>+				    aq_nic-&gt;aq_nic_cfg.aq_hw_caps-&gt;rxd_size);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_exit_ptp_rx;</div><div class='add'>+</div><div class='add'>+	err = aq_ptp_skb_ring_init(&amp;aq_ptp-&gt;skb_ring, aq_nic-&gt;aq_nic_cfg.rxds);</div><div class='add'>+	if (err != 0) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_exit_hwts_rx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;ptp_ring_param.vec_idx = aq_ptp-&gt;idx_vector;</div><div class='add'>+	aq_ptp-&gt;ptp_ring_param.cpu = aq_ptp-&gt;ptp_ring_param.vec_idx +</div><div class='add'>+			aq_nic_get_cfg(aq_nic)-&gt;aq_rss.base_cpu_number;</div><div class='add'>+	cpumask_set_cpu(aq_ptp-&gt;ptp_ring_param.cpu,</div><div class='add'>+			&amp;aq_ptp-&gt;ptp_ring_param.affinity_mask);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_exit_hwts_rx:</div><div class='add'>+	aq_ring_hwts_rx_free(&amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+err_exit_ptp_rx:</div><div class='add'>+	aq_ring_free(&amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+err_exit_ptp_tx:</div><div class='add'>+	aq_ring_free(&amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_ring_free(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aq_ring_free(&amp;aq_ptp-&gt;ptp_tx);</div><div class='add'>+	aq_ring_free(&amp;aq_ptp-&gt;ptp_rx);</div><div class='add'>+	aq_ring_hwts_rx_free(&amp;aq_ptp-&gt;hwts_rx);</div><div class='add'>+</div><div class='add'>+	aq_ptp_skb_ring_release(&amp;aq_ptp-&gt;skb_ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_PTP_GPIO_COUNT 4</div><div class='add'>+</div><div class='add'>+static struct ptp_clock_info aq_ptp_clock = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "atlantic ptp",</div><div class='add'>+	.max_adj	= 999999999,</div><div class='add'>+	.n_ext_ts	= 0,</div><div class='add'>+	.pps		= 0,</div><div class='add'>+	.adjfine	= aq_ptp_adjfine,</div><div class='add'>+	.adjtime	= aq_ptp_adjtime,</div><div class='add'>+	.gettime64	= aq_ptp_gettime,</div><div class='add'>+	.settime64	= aq_ptp_settime,</div><div class='add'>+	.n_per_out	= 0,</div><div class='add'>+	.enable		= aq_ptp_gpio_feature_enable,</div><div class='add'>+	.n_pins		= 0,</div><div class='add'>+	.verify		= aq_ptp_verify,</div><div class='add'>+	.pin_config	= NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ptp_offset_init(__idx, __mbps, __egress, __ingress)   do { \</div><div class='add'>+		ptp_offset[__idx].mbps = (__mbps); \</div><div class='add'>+		ptp_offset[__idx].egress = (__egress); \</div><div class='add'>+		ptp_offset[__idx].ingress = (__ingress); } \</div><div class='add'>+		while (0)</div><div class='add'>+</div><div class='add'>+static void aq_ptp_offset_init_from_fw(const struct hw_atl_ptp_offset *offsets)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Load offsets for PTP */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ptp_offset); i++) {</div><div class='add'>+		switch (i) {</div><div class='add'>+		/* 100M */</div><div class='add'>+		case ptp_offset_idx_100:</div><div class='add'>+			ptp_offset_init(i, 100,</div><div class='add'>+					offsets-&gt;egress_100,</div><div class='add'>+					offsets-&gt;ingress_100);</div><div class='add'>+			break;</div><div class='add'>+		/* 1G */</div><div class='add'>+		case ptp_offset_idx_1000:</div><div class='add'>+			ptp_offset_init(i, 1000,</div><div class='add'>+					offsets-&gt;egress_1000,</div><div class='add'>+					offsets-&gt;ingress_1000);</div><div class='add'>+			break;</div><div class='add'>+		/* 2.5G */</div><div class='add'>+		case ptp_offset_idx_2500:</div><div class='add'>+			ptp_offset_init(i, 2500,</div><div class='add'>+					offsets-&gt;egress_2500,</div><div class='add'>+					offsets-&gt;ingress_2500);</div><div class='add'>+			break;</div><div class='add'>+		/* 5G */</div><div class='add'>+		case ptp_offset_idx_5000:</div><div class='add'>+			ptp_offset_init(i, 5000,</div><div class='add'>+					offsets-&gt;egress_5000,</div><div class='add'>+					offsets-&gt;ingress_5000);</div><div class='add'>+			break;</div><div class='add'>+		/* 10G */</div><div class='add'>+		case ptp_offset_idx_10000:</div><div class='add'>+			ptp_offset_init(i, 10000,</div><div class='add'>+					offsets-&gt;egress_10000,</div><div class='add'>+					offsets-&gt;ingress_10000);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_offset_init(const struct hw_atl_ptp_offset *offsets)</div><div class='add'>+{</div><div class='add'>+	memset(ptp_offset, 0, sizeof(ptp_offset));</div><div class='add'>+</div><div class='add'>+	aq_ptp_offset_init_from_fw(offsets);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_gpio_init(struct ptp_clock_info *info,</div><div class='add'>+			     struct hw_atl_info *hw_info)</div><div class='add'>+{</div><div class='add'>+	struct ptp_pin_desc pin_desc[MAX_PTP_GPIO_COUNT];</div><div class='add'>+	u32 extts_pin_cnt = 0;</div><div class='add'>+	u32 out_pin_cnt = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	memset(pin_desc, 0, sizeof(pin_desc));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_PTP_GPIO_COUNT - 1; i++) {</div><div class='add'>+		if (hw_info-&gt;gpio_pin[i] ==</div><div class='add'>+		    (GPIO_PIN_FUNCTION_PTP0 + out_pin_cnt)) {</div><div class='add'>+			snprintf(pin_desc[out_pin_cnt].name,</div><div class='add'>+				 sizeof(pin_desc[out_pin_cnt].name),</div><div class='add'>+				 "AQ_GPIO%d", i);</div><div class='add'>+			pin_desc[out_pin_cnt].index = out_pin_cnt;</div><div class='add'>+			pin_desc[out_pin_cnt].chan = out_pin_cnt;</div><div class='add'>+			pin_desc[out_pin_cnt++].func = PTP_PF_PEROUT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;n_per_out = out_pin_cnt;</div><div class='add'>+</div><div class='add'>+	if (hw_info-&gt;caps_ex &amp; BIT(CAPS_EX_PHY_CTRL_TS_PIN)) {</div><div class='add'>+		extts_pin_cnt += 1;</div><div class='add'>+</div><div class='add'>+		snprintf(pin_desc[out_pin_cnt].name,</div><div class='add'>+			 sizeof(pin_desc[out_pin_cnt].name),</div><div class='add'>+			  "AQ_GPIO%d", out_pin_cnt);</div><div class='add'>+		pin_desc[out_pin_cnt].index = out_pin_cnt;</div><div class='add'>+		pin_desc[out_pin_cnt].chan = 0;</div><div class='add'>+		pin_desc[out_pin_cnt].func = PTP_PF_EXTTS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info-&gt;n_pins = out_pin_cnt + extts_pin_cnt;</div><div class='add'>+	info-&gt;n_ext_ts = extts_pin_cnt;</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;n_pins)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	info-&gt;pin_config = kcalloc(info-&gt;n_pins, sizeof(struct ptp_pin_desc),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!info-&gt;pin_config)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(info-&gt;pin_config, &amp;pin_desc,</div><div class='add'>+	       sizeof(struct ptp_pin_desc) * info-&gt;n_pins);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_clock_init(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+</div><div class='add'>+	ktime_get_real_ts64(&amp;ts);</div><div class='add'>+	aq_ptp_settime(&amp;aq_ptp-&gt;ptp_info, &amp;ts);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_poll_sync_work_cb(struct work_struct *w);</div><div class='add'>+</div><div class='add'>+int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)</div><div class='add'>+{</div><div class='add'>+	bool a1_ptp = ATL_HW_IS_CHIP_FEATURE(aq_nic-&gt;aq_hw, ATLANTIC);</div><div class='add'>+	struct hw_atl_utils_mbox mbox;</div><div class='add'>+	struct ptp_clock *clock;</div><div class='add'>+	struct aq_ptp_s *aq_ptp;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!a1_ptp) {</div><div class='add'>+		aq_nic-&gt;aq_ptp = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_hw_ops-&gt;hw_get_ptp_ts) {</div><div class='add'>+		aq_nic-&gt;aq_ptp = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!aq_nic-&gt;aq_fw_ops-&gt;enable_ptp) {</div><div class='add'>+		aq_nic-&gt;aq_ptp = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_atl_utils_mpi_read_stats(aq_nic-&gt;aq_hw, &amp;mbox);</div><div class='add'>+</div><div class='add'>+	if (!(mbox.info.caps_ex &amp; BIT(CAPS_EX_PHY_PTP_EN))) {</div><div class='add'>+		aq_nic-&gt;aq_ptp = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aq_ptp_offset_init(&amp;mbox.info.ptp_offset);</div><div class='add'>+</div><div class='add'>+	aq_ptp = kzalloc(sizeof(*aq_ptp), GFP_KERNEL);</div><div class='add'>+	if (!aq_ptp) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;aq_nic = aq_nic;</div><div class='add'>+	aq_ptp-&gt;a1_ptp = a1_ptp;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;aq_ptp-&gt;ptp_lock);</div><div class='add'>+	spin_lock_init(&amp;aq_ptp-&gt;ptp_ring_lock);</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;ptp_info = aq_ptp_clock;</div><div class='add'>+	aq_ptp_gpio_init(&amp;aq_ptp-&gt;ptp_info, &amp;mbox.info);</div><div class='add'>+	clock = ptp_clock_register(&amp;aq_ptp-&gt;ptp_info, &amp;aq_nic-&gt;ndev-&gt;dev);</div><div class='add'>+	if (IS_ERR(clock)) {</div><div class='add'>+		netdev_err(aq_nic-&gt;ndev, "ptp_clock_register failed\n");</div><div class='add'>+		err = PTR_ERR(clock);</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+	aq_ptp-&gt;ptp_clock = clock;</div><div class='add'>+	aq_ptp_tx_timeout_init(&amp;aq_ptp-&gt;ptp_tx_timeout);</div><div class='add'>+</div><div class='add'>+	atomic_set(&amp;aq_ptp-&gt;offset_egress, 0);</div><div class='add'>+	atomic_set(&amp;aq_ptp-&gt;offset_ingress, 0);</div><div class='add'>+</div><div class='add'>+	netif_napi_add(aq_nic_get_ndev(aq_nic), &amp;aq_ptp-&gt;napi, aq_ptp_poll);</div><div class='add'>+</div><div class='add'>+	aq_ptp-&gt;idx_vector = idx_vec;</div><div class='add'>+</div><div class='add'>+	aq_nic-&gt;aq_ptp = aq_ptp;</div><div class='add'>+</div><div class='add'>+	/* enable ptp counter */</div><div class='add'>+	aq_utils_obj_set(&amp;aq_nic-&gt;aq_hw-&gt;flags, AQ_HW_PTP_AVAILABLE);</div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+	aq_nic-&gt;aq_fw_ops-&gt;enable_ptp(aq_nic-&gt;aq_hw, 1);</div><div class='add'>+	aq_ptp_clock_init(aq_nic);</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;aq_ptp-&gt;poll_sync, &amp;aq_ptp_poll_sync_work_cb);</div><div class='add'>+	aq_ptp-&gt;eth_type_filter.location =</div><div class='add'>+			aq_nic_reserve_filter(aq_nic, aq_rx_filter_ethertype);</div><div class='add'>+	aq_ptp-&gt;udp_filter.location =</div><div class='add'>+			aq_nic_reserve_filter(aq_nic, aq_rx_filter_l3l4);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	if (aq_ptp)</div><div class='add'>+		kfree(aq_ptp-&gt;ptp_info.pin_config);</div><div class='add'>+	kfree(aq_ptp);</div><div class='add'>+	aq_nic-&gt;aq_ptp = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_unregister(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	ptp_clock_unregister(aq_ptp-&gt;ptp_clock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ptp_free(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aq_nic_release_filter(aq_nic, aq_rx_filter_ethertype,</div><div class='add'>+			      aq_ptp-&gt;eth_type_filter.location);</div><div class='add'>+	aq_nic_release_filter(aq_nic, aq_rx_filter_l3l4,</div><div class='add'>+			      aq_ptp-&gt;udp_filter.location);</div><div class='add'>+	cancel_delayed_work_sync(&amp;aq_ptp-&gt;poll_sync);</div><div class='add'>+	/* disable ptp */</div><div class='add'>+	mutex_lock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+	aq_nic-&gt;aq_fw_ops-&gt;enable_ptp(aq_nic-&gt;aq_hw, 0);</div><div class='add'>+	mutex_unlock(&amp;aq_nic-&gt;fwreq_mutex);</div><div class='add'>+</div><div class='add'>+	kfree(aq_ptp-&gt;ptp_info.pin_config);</div><div class='add'>+</div><div class='add'>+	netif_napi_del(&amp;aq_ptp-&gt;napi);</div><div class='add'>+	kfree(aq_ptp);</div><div class='add'>+	aq_nic-&gt;aq_ptp = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ptp_clock *aq_ptp_get_ptp_clock(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	return aq_ptp-&gt;ptp_clock;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* PTP external GPIO nanoseconds count */</div><div class='add'>+static uint64_t aq_ptp_get_sync1588_ts(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	u64 ts = 0;</div><div class='add'>+</div><div class='add'>+	if (aq_nic-&gt;aq_hw_ops-&gt;hw_get_sync_ts)</div><div class='add'>+		aq_nic-&gt;aq_hw_ops-&gt;hw_get_sync_ts(aq_nic-&gt;aq_hw, &amp;ts);</div><div class='add'>+</div><div class='add'>+	return ts;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_start_work(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	if (aq_ptp-&gt;extts_pin_enabled) {</div><div class='add'>+		aq_ptp-&gt;poll_timeout_ms = POLL_SYNC_TIMER_MS;</div><div class='add'>+		aq_ptp-&gt;last_sync1588_ts =</div><div class='add'>+				aq_ptp_get_sync1588_ts(aq_ptp-&gt;aq_nic);</div><div class='add'>+		schedule_delayed_work(&amp;aq_ptp-&gt;poll_sync,</div><div class='add'>+				      msecs_to_jiffies(aq_ptp-&gt;poll_timeout_ms));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_link_change(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (aq_nic-&gt;aq_hw-&gt;aq_link_status.mbps)</div><div class='add'>+		aq_ptp_start_work(aq_ptp);</div><div class='add'>+	else</div><div class='add'>+		cancel_delayed_work_sync(&amp;aq_ptp-&gt;poll_sync);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool aq_ptp_sync_ts_updated(struct aq_ptp_s *aq_ptp, u64 *new_ts)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	u64 sync_ts2;</div><div class='add'>+	u64 sync_ts;</div><div class='add'>+</div><div class='add'>+	sync_ts = aq_ptp_get_sync1588_ts(aq_nic);</div><div class='add'>+</div><div class='add'>+	if (sync_ts != aq_ptp-&gt;last_sync1588_ts) {</div><div class='add'>+		sync_ts2 = aq_ptp_get_sync1588_ts(aq_nic);</div><div class='add'>+		if (sync_ts != sync_ts2) {</div><div class='add'>+			sync_ts = sync_ts2;</div><div class='add'>+			sync_ts2 = aq_ptp_get_sync1588_ts(aq_nic);</div><div class='add'>+			if (sync_ts != sync_ts2) {</div><div class='add'>+				netdev_err(aq_nic-&gt;ndev,</div><div class='add'>+					   "%s: Unable to get correct GPIO TS",</div><div class='add'>+					   __func__);</div><div class='add'>+				sync_ts = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*new_ts = sync_ts;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_ptp_check_sync1588(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = aq_ptp-&gt;aq_nic;</div><div class='add'>+	u64 sync_ts;</div><div class='add'>+</div><div class='add'>+	 /* Sync1588 pin was triggered */</div><div class='add'>+	if (aq_ptp_sync_ts_updated(aq_ptp, &amp;sync_ts)) {</div><div class='add'>+		if (aq_ptp-&gt;extts_pin_enabled) {</div><div class='add'>+			struct ptp_clock_event ptp_event;</div><div class='add'>+			u64 time = 0;</div><div class='add'>+</div><div class='add'>+			aq_nic-&gt;aq_hw_ops-&gt;hw_ts_to_sys_clock(aq_nic-&gt;aq_hw,</div><div class='add'>+							      sync_ts, &amp;time);</div><div class='add'>+			ptp_event.index = aq_ptp-&gt;ptp_info.n_pins - 1;</div><div class='add'>+			ptp_event.timestamp = time;</div><div class='add'>+</div><div class='add'>+			ptp_event.type = PTP_CLOCK_EXTTS;</div><div class='add'>+			ptp_clock_event(aq_ptp-&gt;ptp_clock, &amp;ptp_event);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		aq_ptp-&gt;last_sync1588_ts = sync_ts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_ptp_poll_sync_work_cb(struct work_struct *w)</div><div class='add'>+{</div><div class='add'>+	struct delayed_work *dw = to_delayed_work(w);</div><div class='add'>+	struct aq_ptp_s *aq_ptp = container_of(dw, struct aq_ptp_s, poll_sync);</div><div class='add'>+</div><div class='add'>+	aq_ptp_check_sync1588(aq_ptp);</div><div class='add'>+</div><div class='add'>+	if (aq_ptp-&gt;extts_pin_enabled) {</div><div class='add'>+		unsigned long timeout = msecs_to_jiffies(aq_ptp-&gt;poll_timeout_ms);</div><div class='add'>+</div><div class='add'>+		schedule_delayed_work(&amp;aq_ptp-&gt;poll_sync, timeout);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_ptp_get_ring_cnt(struct aq_nic_s *aq_nic, const enum atl_ring_type ring_type)</div><div class='add'>+{</div><div class='add'>+	if (!aq_nic-&gt;aq_ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Additional RX ring is allocated for PTP HWTS on A1 */</div><div class='add'>+	return (aq_nic-&gt;aq_ptp-&gt;a1_ptp &amp;&amp; ring_type == ATL_RING_RX) ? 2 : 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u64 *aq_ptp_get_stats(struct aq_nic_s *aq_nic, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct aq_ptp_s *aq_ptp = aq_nic-&gt;aq_ptp;</div><div class='add'>+	unsigned int count = 0U;</div><div class='add'>+</div><div class='add'>+	if (!aq_ptp)</div><div class='add'>+		return data;</div><div class='add'>+</div><div class='add'>+	count = aq_ring_fill_stats_data(&amp;aq_ptp-&gt;ptp_rx, data);</div><div class='add'>+	data += count;</div><div class='add'>+	count = aq_ring_fill_stats_data(&amp;aq_ptp-&gt;ptp_tx, data);</div><div class='add'>+	data += count;</div><div class='add'>+</div><div class='add'>+	if (aq_ptp-&gt;a1_ptp) {</div><div class='add'>+		/* Only Receive ring for HWTS */</div><div class='add'>+		count = aq_ring_fill_stats_data(&amp;aq_ptp-&gt;hwts_rx, data);</div><div class='add'>+		data += count;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ptp.h b/drivers/net/ethernet/aquantia/atlantic/aq_ptp.h<br/>new file mode 100644<br/>index 000000000000..5e643ec7cc06<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_ptp.h</a></div><div class='hunk'>@@ -0,0 +1,163 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* File aq_ptp.h: Declaration of PTP functions.</div><div class='add'>+ */</div><div class='add'>+#ifndef AQ_PTP_H</div><div class='add'>+#define AQ_PTP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+</div><div class='add'>+#include "aq_ring.h"</div><div class='add'>+</div><div class='add'>+#define PTP_8TC_RING_IDX             8</div><div class='add'>+#define PTP_4TC_RING_IDX            16</div><div class='add'>+#define PTP_HWST_RING_IDX           31</div><div class='add'>+</div><div class='add'>+/* Index must to be 8 (8 TCs) or 16 (4 TCs).</div><div class='add'>+ * It depends from Traffic Class mode.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int aq_ptp_ring_idx(const enum aq_tc_mode tc_mode)</div><div class='add'>+{</div><div class='add'>+	if (tc_mode == AQ_TC_MODE_8TCS)</div><div class='add'>+		return PTP_8TC_RING_IDX;</div><div class='add'>+</div><div class='add'>+	return PTP_4TC_RING_IDX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+</div><div class='add'>+/* Common functions */</div><div class='add'>+int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec);</div><div class='add'>+</div><div class='add'>+void aq_ptp_unregister(struct aq_nic_s *aq_nic);</div><div class='add'>+void aq_ptp_free(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+int aq_ptp_irq_alloc(struct aq_nic_s *aq_nic);</div><div class='add'>+void aq_ptp_irq_free(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic);</div><div class='add'>+void aq_ptp_ring_free(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+int aq_ptp_ring_init(struct aq_nic_s *aq_nic);</div><div class='add'>+int aq_ptp_ring_start(struct aq_nic_s *aq_nic);</div><div class='add'>+void aq_ptp_ring_stop(struct aq_nic_s *aq_nic);</div><div class='add'>+void aq_ptp_ring_deinit(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+void aq_ptp_service_task(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+void aq_ptp_tm_offset_set(struct aq_nic_s *aq_nic, unsigned int mbps);</div><div class='add'>+</div><div class='add'>+void aq_ptp_clock_init(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+/* Traffic processing functions */</div><div class='add'>+int aq_ptp_xmit(struct aq_nic_s *aq_nic, struct sk_buff *skb);</div><div class='add'>+void aq_ptp_tx_hwtstamp(struct aq_nic_s *aq_nic, u64 timestamp);</div><div class='add'>+</div><div class='add'>+/* Must be to check available of PTP before call */</div><div class='add'>+void aq_ptp_hwtstamp_config_get(struct aq_ptp_s *aq_ptp,</div><div class='add'>+				struct kernel_hwtstamp_config *config);</div><div class='add'>+int aq_ptp_hwtstamp_config_set(struct aq_ptp_s *aq_ptp,</div><div class='add'>+			       struct kernel_hwtstamp_config *config);</div><div class='add'>+</div><div class='add'>+/* Return either ring is belong to PTP or not*/</div><div class='add'>+bool aq_ptp_ring(struct aq_nic_s *aq_nic, struct aq_ring_s *ring);</div><div class='add'>+</div><div class='add'>+u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic, struct skb_shared_hwtstamps *shhwtstamps, u8 *p,</div><div class='add'>+		      unsigned int len);</div><div class='add'>+</div><div class='add'>+struct ptp_clock *aq_ptp_get_ptp_clock(struct aq_ptp_s *aq_ptp);</div><div class='add'>+</div><div class='add'>+int aq_ptp_link_change(struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+/* PTP ring statistics */</div><div class='add'>+int aq_ptp_get_ring_cnt(struct aq_nic_s *aq_nic, const enum atl_ring_type ring_type);</div><div class='add'>+u64 *aq_ptp_get_stats(struct aq_nic_s *aq_nic, u64 *data);</div><div class='add'>+</div><div class='add'>+#else</div><div class='add'>+</div><div class='add'>+static inline int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void aq_ptp_unregister(struct aq_nic_s *aq_nic) {}</div><div class='add'>+</div><div class='add'>+static inline void aq_ptp_free(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int aq_ptp_irq_alloc(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void aq_ptp_irq_free(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int aq_ptp_ring_alloc(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void aq_ptp_ring_free(struct aq_nic_s *aq_nic) {}</div><div class='add'>+</div><div class='add'>+static inline int aq_ptp_ring_init(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int aq_ptp_ring_start(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void aq_ptp_ring_stop(struct aq_nic_s *aq_nic) {}</div><div class='add'>+static inline void aq_ptp_ring_deinit(struct aq_nic_s *aq_nic) {}</div><div class='add'>+static inline void aq_ptp_service_task(struct aq_nic_s *aq_nic) {}</div><div class='add'>+static inline void aq_ptp_tm_offset_set(struct aq_nic_s *aq_nic,</div><div class='add'>+					unsigned int mbps) {}</div><div class='add'>+static inline void aq_ptp_clock_init(struct aq_nic_s *aq_nic) {}</div><div class='add'>+static inline int aq_ptp_xmit(struct aq_nic_s *aq_nic, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void aq_ptp_tx_hwtstamp(struct aq_nic_s *aq_nic, u64 timestamp) {}</div><div class='add'>+static inline void aq_ptp_hwtstamp_config_get(struct aq_ptp_s *aq_ptp,</div><div class='add'>+					      struct kernel_hwtstamp_config *config) {}</div><div class='add'>+static inline int aq_ptp_hwtstamp_config_set(struct aq_ptp_s *aq_ptp,</div><div class='add'>+					     struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool aq_ptp_ring(struct aq_nic_s *aq_nic, struct aq_ring_s *ring)</div><div class='add'>+{</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u16 aq_ptp_extract_ts(struct aq_nic_s *aq_nic,</div><div class='add'>+				    struct skb_shared_hwtstamps *shhwtstamps, u8 *p,</div><div class='add'>+				    unsigned int len)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct ptp_clock *aq_ptp_get_ptp_clock(struct aq_ptp_s *aq_ptp)</div><div class='add'>+{</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int aq_ptp_link_change(struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#endif /* AQ_PTP_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c<br/>index 941b0beb87ef..d23d23bed39f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_ring.c</a></div><div class='hunk'>@@ -1,22 +1,43 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_ring.c: Definition of functions for Rx/Tx rings. */</div><div class='ctx'> </div><div class='del'>-#include "aq_ring.h"</div><div class='ctx'> #include "aq_nic.h"</div><div class='ctx'> #include "aq_hw.h"</div><div class='ctx'> #include "aq_hw_utils.h"</div><div class='add'>+#include "aq_ptp.h"</div><div class='add'>+#include "aq_vec.h"</div><div class='add'>+#include "aq_main.h"</div><div class='ctx'> </div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;linux/bpf_trace.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> </div><div class='add'>+static void aq_get_rxpages_xdp(struct aq_ring_buff_s *buff,</div><div class='add'>+			       struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (xdp_buff_has_frags(xdp)) {</div><div class='add'>+		sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; sinfo-&gt;nr_frags; i++) {</div><div class='add'>+			skb_frag_t *frag = &amp;sinfo-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+			page_ref_inc(skb_frag_page(frag));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	page_ref_inc(buff-&gt;rxdata.page);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void aq_free_rxpage(struct aq_rxpage *rxpage, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len = PAGE_SIZE &lt;&lt; rxpage-&gt;order;</div><div class='hunk'>@@ -28,12 +49,13 @@ static inline void aq_free_rxpage(struct aq_rxpage *rxpage, struct device *dev)</div><div class='ctx'> 	rxpage-&gt;page = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_get_rxpage(struct aq_rxpage *rxpage, unsigned int order,</div><div class='del'>-			 struct device *dev)</div><div class='add'>+static int aq_alloc_rxpages(struct aq_rxpage *rxpage, struct aq_ring_s *rx_ring)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = aq_nic_get_dev(rx_ring-&gt;aq_nic);</div><div class='add'>+	unsigned int order = rx_ring-&gt;page_order;</div><div class='ctx'> 	struct page *page;</div><div class='del'>-	dma_addr_t daddr;</div><div class='ctx'> 	int ret = -ENOMEM;</div><div class='add'>+	dma_addr_t daddr;</div><div class='ctx'> </div><div class='ctx'> 	page = dev_alloc_pages(order);</div><div class='ctx'> 	if (unlikely(!page))</div><div class='hunk'>@@ -48,7 +70,7 @@ static int aq_get_rxpage(struct aq_rxpage *rxpage, unsigned int order,</div><div class='ctx'> 	rxpage-&gt;page = page;</div><div class='ctx'> 	rxpage-&gt;daddr = daddr;</div><div class='ctx'> 	rxpage-&gt;order = order;</div><div class='del'>-	rxpage-&gt;pg_off = 0;</div><div class='add'>+	rxpage-&gt;pg_off = rx_ring-&gt;page_offset;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -59,44 +81,59 @@ err_exit:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_get_rxpages(struct aq_ring_s *self, struct aq_ring_buff_s *rxbuf,</div><div class='del'>-			  int order)</div><div class='add'>+static int aq_get_rxpages(struct aq_ring_s *self, struct aq_ring_buff_s *rxbuf)</div><div class='ctx'> {</div><div class='add'>+	unsigned int order = self-&gt;page_order;</div><div class='add'>+	u16 page_offset = self-&gt;page_offset;</div><div class='add'>+	u16 frame_max = self-&gt;frame_max;</div><div class='add'>+	u16 tail_size = self-&gt;tail_size;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (rxbuf-&gt;rxdata.page) {</div><div class='ctx'> 		/* One means ring is the only user and can reuse */</div><div class='ctx'> 		if (page_ref_count(rxbuf-&gt;rxdata.page) &gt; 1) {</div><div class='ctx'> 			/* Try reuse buffer */</div><div class='del'>-			rxbuf-&gt;rxdata.pg_off += AQ_CFG_RX_FRAME_MAX;</div><div class='del'>-			if (rxbuf-&gt;rxdata.pg_off + AQ_CFG_RX_FRAME_MAX &lt;=</div><div class='del'>-				(PAGE_SIZE &lt;&lt; order)) {</div><div class='add'>+			rxbuf-&gt;rxdata.pg_off += frame_max + page_offset +</div><div class='add'>+						tail_size;</div><div class='add'>+			if (rxbuf-&gt;rxdata.pg_off + frame_max + tail_size &lt;=</div><div class='add'>+			    (PAGE_SIZE &lt;&lt; order)) {</div><div class='add'>+				u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 				self-&gt;stats.rx.pg_flips++;</div><div class='add'>+				u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+</div><div class='ctx'> 			} else {</div><div class='ctx'> 				/* Buffer exhausted. We have other users and</div><div class='ctx'> 				 * should release this page and realloc</div><div class='ctx'> 				 */</div><div class='ctx'> 				aq_free_rxpage(&amp;rxbuf-&gt;rxdata,</div><div class='ctx'> 					       aq_nic_get_dev(self-&gt;aq_nic));</div><div class='add'>+				u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 				self-&gt;stats.rx.pg_losts++;</div><div class='add'>+				u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='del'>-			rxbuf-&gt;rxdata.pg_off = 0;</div><div class='add'>+			rxbuf-&gt;rxdata.pg_off = page_offset;</div><div class='add'>+			u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 			self-&gt;stats.rx.pg_reuses++;</div><div class='add'>+			u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!rxbuf-&gt;rxdata.page) {</div><div class='del'>-		ret = aq_get_rxpage(&amp;rxbuf-&gt;rxdata, order,</div><div class='del'>-				    aq_nic_get_dev(self-&gt;aq_nic));</div><div class='add'>+		ret = aq_alloc_rxpages(&amp;rxbuf-&gt;rxdata, self);</div><div class='add'>+		if (ret) {</div><div class='add'>+			u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+			self-&gt;stats.rx.alloc_fails++;</div><div class='add'>+			u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+		}</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,</div><div class='del'>-				       struct aq_nic_s *aq_nic)</div><div class='add'>+static int aq_ring_alloc(struct aq_ring_s *self,</div><div class='add'>+			 struct aq_nic_s *aq_nic)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -107,6 +144,7 @@ static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	self-&gt;dx_ring = dma_alloc_coherent(aq_nic_get_dev(aq_nic),</div><div class='ctx'> 					   self-&gt;size * self-&gt;dx_size,</div><div class='ctx'> 					   &amp;self-&gt;dx_ring_pa, GFP_KERNEL);</div><div class='hunk'>@@ -118,73 +156,89 @@ static struct aq_ring_s *aq_ring_alloc(struct aq_ring_s *self,</div><div class='ctx'> err_exit:</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		aq_ring_free(self);</div><div class='del'>-		self = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	return self;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct aq_ring_s *aq_ring_tx_alloc(struct aq_ring_s *self,</div><div class='del'>-				   struct aq_nic_s *aq_nic,</div><div class='del'>-				   unsigned int idx,</div><div class='del'>-				   struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='add'>+int aq_ring_tx_alloc(struct aq_ring_s *self,</div><div class='add'>+		     struct aq_nic_s *aq_nic,</div><div class='add'>+		     unsigned int idx,</div><div class='add'>+		     struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='ctx'> 	self-&gt;aq_nic = aq_nic;</div><div class='ctx'> 	self-&gt;idx = idx;</div><div class='ctx'> 	self-&gt;size = aq_nic_cfg-&gt;txds;</div><div class='ctx'> 	self-&gt;dx_size = aq_nic_cfg-&gt;aq_hw_caps-&gt;txd_size;</div><div class='ctx'> </div><div class='del'>-	self = aq_ring_alloc(self, aq_nic);</div><div class='del'>-	if (!self) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-err_exit:</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		aq_ring_free(self);</div><div class='del'>-		self = NULL;</div><div class='del'>-	}</div><div class='del'>-	return self;</div><div class='add'>+	return aq_ring_alloc(self, aq_nic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,</div><div class='del'>-				   struct aq_nic_s *aq_nic,</div><div class='del'>-				   unsigned int idx,</div><div class='del'>-				   struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='add'>+int aq_ring_rx_alloc(struct aq_ring_s *self,</div><div class='add'>+		     struct aq_nic_s *aq_nic,</div><div class='add'>+		     unsigned int idx,</div><div class='add'>+		     struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='ctx'> 	self-&gt;aq_nic = aq_nic;</div><div class='ctx'> 	self-&gt;idx = idx;</div><div class='ctx'> 	self-&gt;size = aq_nic_cfg-&gt;rxds;</div><div class='ctx'> 	self-&gt;dx_size = aq_nic_cfg-&gt;aq_hw_caps-&gt;rxd_size;</div><div class='del'>-	self-&gt;page_order = fls(AQ_CFG_RX_FRAME_MAX / PAGE_SIZE +</div><div class='del'>-			       (AQ_CFG_RX_FRAME_MAX % PAGE_SIZE ? 1 : 0)) - 1;</div><div class='add'>+	self-&gt;xdp_prog = aq_nic-&gt;xdp_prog;</div><div class='add'>+	self-&gt;frame_max = AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+</div><div class='add'>+	/* Only order-2 is allowed if XDP is enabled */</div><div class='add'>+	if (READ_ONCE(self-&gt;xdp_prog)) {</div><div class='add'>+		self-&gt;page_offset = AQ_XDP_HEADROOM;</div><div class='add'>+		self-&gt;page_order = AQ_CFG_XDP_PAGEORDER;</div><div class='add'>+		self-&gt;tail_size = AQ_XDP_TAILROOM;</div><div class='add'>+	} else {</div><div class='add'>+		self-&gt;page_offset = 0;</div><div class='add'>+		self-&gt;page_order = fls(self-&gt;frame_max / PAGE_SIZE +</div><div class='add'>+				       (self-&gt;frame_max % PAGE_SIZE ? 1 : 0)) - 1;</div><div class='add'>+		if (aq_nic_cfg-&gt;rxpageorder &gt; self-&gt;page_order)</div><div class='add'>+			self-&gt;page_order = aq_nic_cfg-&gt;rxpageorder;</div><div class='add'>+		self-&gt;tail_size = 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (aq_nic_cfg-&gt;rxpageorder &gt; self-&gt;page_order)</div><div class='del'>-		self-&gt;page_order = aq_nic_cfg-&gt;rxpageorder;</div><div class='add'>+	return aq_ring_alloc(self, aq_nic);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	self = aq_ring_alloc(self, aq_nic);</div><div class='del'>-	if (!self) {</div><div class='del'>-		err = -ENOMEM;</div><div class='del'>-		goto err_exit;</div><div class='del'>-	}</div><div class='add'>+int</div><div class='add'>+aq_ring_hwts_rx_alloc(struct aq_ring_s *self, struct aq_nic_s *aq_nic,</div><div class='add'>+		      unsigned int idx, unsigned int size, unsigned int dx_size)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = aq_nic_get_dev(aq_nic);</div><div class='add'>+	size_t sz = size * dx_size + AQ_CFG_RXDS_DEF;</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='del'>-	if (err &lt; 0) {</div><div class='add'>+	memset(self, 0, sizeof(*self));</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_nic = aq_nic;</div><div class='add'>+	self-&gt;idx = idx;</div><div class='add'>+	self-&gt;size = size;</div><div class='add'>+	self-&gt;dx_size = dx_size;</div><div class='add'>+</div><div class='add'>+	self-&gt;dx_ring = dma_alloc_coherent(dev, sz, &amp;self-&gt;dx_ring_pa,</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	if (!self-&gt;dx_ring) {</div><div class='ctx'> 		aq_ring_free(self);</div><div class='del'>-		self = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	return self;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int aq_ring_init(struct aq_ring_s *self)</div><div class='add'>+int aq_ring_init(struct aq_ring_s *self, const enum atl_ring_type ring_type)</div><div class='ctx'> {</div><div class='ctx'> 	self-&gt;hw_head = 0;</div><div class='ctx'> 	self-&gt;sw_head = 0;</div><div class='ctx'> 	self-&gt;sw_tail = 0;</div><div class='add'>+	self-&gt;ring_type = ring_type;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;ring_type == ATL_RING_RX)</div><div class='add'>+		u64_stats_init(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+	else</div><div class='add'>+		u64_stats_init(&amp;self-&gt;stats.tx.syncp);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -206,9 +260,14 @@ void aq_ring_queue_wake(struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = aq_nic_get_ndev(ring-&gt;aq_nic);</div><div class='ctx'> </div><div class='del'>-	if (__netif_subqueue_stopped(ndev, ring-&gt;idx)) {</div><div class='del'>-		netif_wake_subqueue(ndev, ring-&gt;idx);</div><div class='add'>+	if (__netif_subqueue_stopped(ndev,</div><div class='add'>+				     AQ_NIC_RING2QMAP(ring-&gt;aq_nic,</div><div class='add'>+						      ring-&gt;idx))) {</div><div class='add'>+		netif_wake_subqueue(ndev,</div><div class='add'>+				    AQ_NIC_RING2QMAP(ring-&gt;aq_nic, ring-&gt;idx));</div><div class='add'>+		u64_stats_update_begin(&amp;ring-&gt;stats.tx.syncp);</div><div class='ctx'> 		ring-&gt;stats.tx.queue_restarts++;</div><div class='add'>+		u64_stats_update_end(&amp;ring-&gt;stats.tx.syncp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -216,8 +275,11 @@ void aq_ring_queue_stop(struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = aq_nic_get_ndev(ring-&gt;aq_nic);</div><div class='ctx'> </div><div class='del'>-	if (!__netif_subqueue_stopped(ndev, ring-&gt;idx))</div><div class='del'>-		netif_stop_subqueue(ndev, ring-&gt;idx);</div><div class='add'>+	if (!__netif_subqueue_stopped(ndev,</div><div class='add'>+				      AQ_NIC_RING2QMAP(ring-&gt;aq_nic,</div><div class='add'>+						       ring-&gt;idx)))</div><div class='add'>+		netif_stop_subqueue(ndev,</div><div class='add'>+				    AQ_NIC_RING2QMAP(ring-&gt;aq_nic, ring-&gt;idx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> bool aq_ring_tx_clean(struct aq_ring_s *self)</div><div class='hunk'>@@ -246,9 +308,26 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (unlikely(buff-&gt;is_eop))</div><div class='add'>+		if (likely(!buff-&gt;is_eop))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (buff-&gt;skb) {</div><div class='add'>+			u64_stats_update_begin(&amp;self-&gt;stats.tx.syncp);</div><div class='add'>+			++self-&gt;stats.tx.packets;</div><div class='add'>+			self-&gt;stats.tx.bytes += buff-&gt;skb-&gt;len;</div><div class='add'>+			u64_stats_update_end(&amp;self-&gt;stats.tx.syncp);</div><div class='ctx'> 			dev_kfree_skb_any(buff-&gt;skb);</div><div class='add'>+		} else if (buff-&gt;xdpf) {</div><div class='add'>+			u64_stats_update_begin(&amp;self-&gt;stats.tx.syncp);</div><div class='add'>+			++self-&gt;stats.tx.packets;</div><div class='add'>+			self-&gt;stats.tx.bytes += xdp_get_frame_len(buff-&gt;xdpf);</div><div class='add'>+			u64_stats_update_end(&amp;self-&gt;stats.tx.syncp);</div><div class='add'>+			xdp_return_frame_rx_napi(buff-&gt;xdpf);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+		buff-&gt;skb = NULL;</div><div class='add'>+		buff-&gt;xdpf = NULL;</div><div class='ctx'> 		buff-&gt;pa = 0U;</div><div class='ctx'> 		buff-&gt;eop_index = 0xffffU;</div><div class='ctx'> 		self-&gt;sw_head = aq_ring_next_dx(self, self-&gt;sw_head);</div><div class='hunk'>@@ -265,7 +344,9 @@ static void aq_rx_checksum(struct aq_ring_s *self,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(buff-&gt;is_cso_err)) {</div><div class='add'>+		u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 		++self-&gt;stats.rx.errors;</div><div class='add'>+		u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -279,20 +360,182 @@ static void aq_rx_checksum(struct aq_ring_s *self,</div><div class='ctx'> 		__skb_incr_checksum_unnecessary(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define AQ_SKB_ALIGN SKB_DATA_ALIGN(sizeof(struct skb_shared_info))</div><div class='del'>-int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='del'>-		     struct napi_struct *napi,</div><div class='del'>-		     int *work_done,</div><div class='del'>-		     int budget)</div><div class='add'>+int aq_xdp_xmit(struct net_device *dev, int num_frames,</div><div class='add'>+		struct xdp_frame **frames, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_s *aq_nic = netdev_priv(dev);</div><div class='add'>+	unsigned int vec, i, drop = 0;</div><div class='add'>+	int cpu = smp_processor_id();</div><div class='add'>+	struct aq_nic_cfg_s *aq_cfg;</div><div class='add'>+	struct aq_ring_s *ring;</div><div class='add'>+</div><div class='add'>+	aq_cfg = aq_nic_get_cfg(aq_nic);</div><div class='add'>+	vec = cpu % aq_cfg-&gt;vecs;</div><div class='add'>+	ring = aq_nic-&gt;aq_ring_tx[AQ_NIC_CFG_TCVEC2RING(aq_cfg, 0, vec)];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_frames; i++) {</div><div class='add'>+		struct xdp_frame *xdpf = frames[i];</div><div class='add'>+</div><div class='add'>+		if (aq_nic_xmit_xdpf(aq_nic, ring, xdpf) == NETDEV_TX_BUSY)</div><div class='add'>+			drop++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num_frames - drop;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *aq_xdp_build_skb(struct xdp_buff *xdp,</div><div class='add'>+					struct net_device *dev,</div><div class='add'>+					struct aq_ring_buff_s *buff)</div><div class='add'>+{</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	xdpf = xdp_convert_buff_to_frame(xdp);</div><div class='add'>+	if (unlikely(!xdpf))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = xdp_build_skb_from_frame(xdpf, dev);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	aq_get_rxpages_xdp(buff, xdp);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *aq_xdp_run_prog(struct aq_nic_s *aq_nic,</div><div class='add'>+				       struct xdp_buff *xdp,</div><div class='add'>+				       struct aq_ring_s *rx_ring,</div><div class='add'>+				       struct aq_ring_buff_s *buff)</div><div class='add'>+{</div><div class='add'>+	int result = NETDEV_TX_BUSY;</div><div class='add'>+	struct aq_ring_s *tx_ring;</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	u32 act = XDP_ABORTED;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+	++rx_ring-&gt;stats.rx.packets;</div><div class='add'>+	rx_ring-&gt;stats.rx.bytes += xdp_get_buff_len(xdp);</div><div class='add'>+	u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+</div><div class='add'>+	prog = READ_ONCE(rx_ring-&gt;xdp_prog);</div><div class='add'>+	if (!prog)</div><div class='add'>+		return aq_xdp_build_skb(xdp, aq_nic-&gt;ndev, buff);</div><div class='add'>+</div><div class='add'>+	prefetchw(xdp-&gt;data_hard_start); /* xdp_frame write */</div><div class='add'>+</div><div class='add'>+	/* single buffer XDP program, but packet is multi buffer, aborted */</div><div class='add'>+	if (xdp_buff_has_frags(xdp) &amp;&amp; !prog-&gt;aux-&gt;xdp_has_frags)</div><div class='add'>+		goto out_aborted;</div><div class='add'>+</div><div class='add'>+	act = bpf_prog_run_xdp(prog, xdp);</div><div class='add'>+	switch (act) {</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+		skb = aq_xdp_build_skb(xdp, aq_nic-&gt;ndev, buff);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto out_aborted;</div><div class='add'>+		u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		++rx_ring-&gt;stats.rx.xdp_pass;</div><div class='add'>+		u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		return skb;</div><div class='add'>+	case XDP_TX:</div><div class='add'>+		xdpf = xdp_convert_buff_to_frame(xdp);</div><div class='add'>+		if (unlikely(!xdpf))</div><div class='add'>+			goto out_aborted;</div><div class='add'>+		tx_ring = aq_nic-&gt;aq_ring_tx[rx_ring-&gt;idx];</div><div class='add'>+		result = aq_nic_xmit_xdpf(aq_nic, tx_ring, xdpf);</div><div class='add'>+		if (result == NETDEV_TX_BUSY)</div><div class='add'>+			goto out_aborted;</div><div class='add'>+		u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		++rx_ring-&gt;stats.rx.xdp_tx;</div><div class='add'>+		u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		aq_get_rxpages_xdp(buff, xdp);</div><div class='add'>+		break;</div><div class='add'>+	case XDP_REDIRECT:</div><div class='add'>+		if (xdp_do_redirect(aq_nic-&gt;ndev, xdp, prog) &lt; 0)</div><div class='add'>+			goto out_aborted;</div><div class='add'>+		xdp_do_flush();</div><div class='add'>+		u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		++rx_ring-&gt;stats.rx.xdp_redirect;</div><div class='add'>+		u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		aq_get_rxpages_xdp(buff, xdp);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_ABORTED:</div><div class='add'>+out_aborted:</div><div class='add'>+		u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		++rx_ring-&gt;stats.rx.xdp_aborted;</div><div class='add'>+		u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		trace_xdp_exception(aq_nic-&gt;ndev, prog, act);</div><div class='add'>+		bpf_warn_invalid_xdp_action(aq_nic-&gt;ndev, prog, act);</div><div class='add'>+		break;</div><div class='add'>+	case XDP_DROP:</div><div class='add'>+		u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		++rx_ring-&gt;stats.rx.xdp_drop;</div><div class='add'>+		u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ERR_PTR(-result);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool aq_add_rx_fragment(struct device *dev,</div><div class='add'>+			       struct aq_ring_s *ring,</div><div class='add'>+			       struct aq_ring_buff_s *buff,</div><div class='add'>+			       struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	struct aq_ring_buff_s *buff_ = buff;</div><div class='add'>+</div><div class='add'>+	memset(sinfo, 0, sizeof(*sinfo));</div><div class='add'>+	do {</div><div class='add'>+		skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+		if (unlikely(sinfo-&gt;nr_frags &gt;= MAX_SKB_FRAGS))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		frag = &amp;sinfo-&gt;frags[sinfo-&gt;nr_frags++];</div><div class='add'>+		buff_ = &amp;ring-&gt;buff_ring[buff_-&gt;next];</div><div class='add'>+		dma_sync_single_range_for_cpu(dev,</div><div class='add'>+					      buff_-&gt;rxdata.daddr,</div><div class='add'>+					      buff_-&gt;rxdata.pg_off,</div><div class='add'>+					      buff_-&gt;len,</div><div class='add'>+					      DMA_FROM_DEVICE);</div><div class='add'>+		sinfo-&gt;xdp_frags_size += buff_-&gt;len;</div><div class='add'>+		skb_frag_fill_page_desc(frag, buff_-&gt;rxdata.page,</div><div class='add'>+					buff_-&gt;rxdata.pg_off,</div><div class='add'>+					buff_-&gt;len);</div><div class='add'>+</div><div class='add'>+		buff_-&gt;is_cleaned = 1;</div><div class='add'>+</div><div class='add'>+		buff-&gt;is_ip_cso &amp;= buff_-&gt;is_ip_cso;</div><div class='add'>+		buff-&gt;is_udp_cso &amp;= buff_-&gt;is_udp_cso;</div><div class='add'>+		buff-&gt;is_tcp_cso &amp;= buff_-&gt;is_tcp_cso;</div><div class='add'>+		buff-&gt;is_cso_err |= buff_-&gt;is_cso_err;</div><div class='add'>+</div><div class='add'>+		if (page_is_pfmemalloc(buff_-&gt;rxdata.page))</div><div class='add'>+			xdp_buff_set_frag_pfmemalloc(xdp);</div><div class='add'>+</div><div class='add'>+	} while (!buff_-&gt;is_eop);</div><div class='add'>+</div><div class='add'>+	xdp_buff_set_frags_flag(xdp);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __aq_ring_rx_clean(struct aq_ring_s *self, struct napi_struct *napi,</div><div class='add'>+			      int *work_done, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = aq_nic_get_ndev(self-&gt;aq_nic);</div><div class='del'>-	bool is_rsc_completed = true;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (; (self-&gt;sw_head != self-&gt;hw_head) &amp;&amp; budget;</div><div class='ctx'> 		self-&gt;sw_head = aq_ring_next_dx(self, self-&gt;sw_head),</div><div class='ctx'> 		--budget, ++(*work_done)) {</div><div class='ctx'> 		struct aq_ring_buff_s *buff = &amp;self-&gt;buff_ring[self-&gt;sw_head];</div><div class='add'>+		bool is_ptp_ring = aq_ptp_ring(self-&gt;aq_nic, self);</div><div class='ctx'> 		struct aq_ring_buff_s *buff_ = NULL;</div><div class='ctx'> 		struct sk_buff *skb = NULL;</div><div class='ctx'> 		unsigned int next_ = 0U;</div><div class='hunk'>@@ -303,42 +546,65 @@ int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (!buff-&gt;is_eop) {</div><div class='add'>+			unsigned int frag_cnt = 0U;</div><div class='add'>+</div><div class='add'>+			/* There will be an extra fragment */</div><div class='add'>+			if (buff-&gt;len &gt; AQ_CFG_RX_HDR_SIZE)</div><div class='add'>+				frag_cnt++;</div><div class='add'>+</div><div class='ctx'> 			buff_ = buff;</div><div class='ctx'> 			do {</div><div class='del'>-				next_ = buff_-&gt;next,</div><div class='add'>+				bool is_rsc_completed = true;</div><div class='add'>+</div><div class='add'>+				if (buff_-&gt;next &gt;= self-&gt;size) {</div><div class='add'>+					err = -EIO;</div><div class='add'>+					goto err_exit;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				frag_cnt++;</div><div class='add'>+				next_ = buff_-&gt;next;</div><div class='ctx'> 				buff_ = &amp;self-&gt;buff_ring[next_];</div><div class='ctx'> 				is_rsc_completed =</div><div class='ctx'> 					aq_ring_dx_in_range(self-&gt;sw_head,</div><div class='ctx'> 							    next_,</div><div class='ctx'> 							    self-&gt;hw_head);</div><div class='ctx'> </div><div class='del'>-				if (unlikely(!is_rsc_completed))</div><div class='del'>-					break;</div><div class='add'>+				if (unlikely(!is_rsc_completed) ||</div><div class='add'>+						frag_cnt &gt; MAX_SKB_FRAGS) {</div><div class='add'>+					err = 0;</div><div class='add'>+					goto err_exit;</div><div class='add'>+				}</div><div class='ctx'> </div><div class='ctx'> 				buff-&gt;is_error |= buff_-&gt;is_error;</div><div class='add'>+				buff-&gt;is_cso_err |= buff_-&gt;is_cso_err;</div><div class='ctx'> </div><div class='ctx'> 			} while (!buff_-&gt;is_eop);</div><div class='ctx'> </div><div class='del'>-			if (!is_rsc_completed) {</div><div class='del'>-				err = 0;</div><div class='del'>-				goto err_exit;</div><div class='del'>-			}</div><div class='del'>-			if (buff-&gt;is_error) {</div><div class='add'>+			if (buff-&gt;is_error ||</div><div class='add'>+			    (buff-&gt;is_lro &amp;&amp; buff-&gt;is_cso_err)) {</div><div class='ctx'> 				buff_ = buff;</div><div class='ctx'> 				do {</div><div class='del'>-					next_ = buff_-&gt;next,</div><div class='add'>+					if (buff_-&gt;next &gt;= self-&gt;size) {</div><div class='add'>+						err = -EIO;</div><div class='add'>+						goto err_exit;</div><div class='add'>+					}</div><div class='add'>+					next_ = buff_-&gt;next;</div><div class='ctx'> 					buff_ = &amp;self-&gt;buff_ring[next_];</div><div class='ctx'> </div><div class='ctx'> 					buff_-&gt;is_cleaned = true;</div><div class='ctx'> 				} while (!buff_-&gt;is_eop);</div><div class='ctx'> </div><div class='add'>+				u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 				++self-&gt;stats.rx.errors;</div><div class='add'>+				u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (buff-&gt;is_error) {</div><div class='add'>+			u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 			++self-&gt;stats.rx.errors;</div><div class='add'>+			u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -347,71 +613,68 @@ int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='ctx'> 					      buff-&gt;rxdata.pg_off,</div><div class='ctx'> 					      buff-&gt;len, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='del'>-		/* for single fragment packets use build_skb() */</div><div class='del'>-		if (buff-&gt;is_eop &amp;&amp;</div><div class='del'>-		    buff-&gt;len &lt;= AQ_CFG_RX_FRAME_MAX - AQ_SKB_ALIGN) {</div><div class='del'>-			skb = build_skb(aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='del'>-					AQ_CFG_RX_FRAME_MAX);</div><div class='del'>-			if (unlikely(!skb)) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto err_exit;</div><div class='del'>-			}</div><div class='del'>-			skb_put(skb, buff-&gt;len);</div><div class='add'>+		skb = napi_alloc_skb(napi, AQ_CFG_RX_HDR_SIZE);</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+			self-&gt;stats.rx.skb_alloc_fails++;</div><div class='add'>+			u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+		if (is_ptp_ring)</div><div class='add'>+			buff-&gt;len -=</div><div class='add'>+				aq_ptp_extract_ts(self-&gt;aq_nic, skb_hwtstamps(skb),</div><div class='add'>+						  aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='add'>+						  buff-&gt;len);</div><div class='add'>+</div><div class='add'>+		hdr_len = buff-&gt;len;</div><div class='add'>+		if (hdr_len &gt; AQ_CFG_RX_HDR_SIZE)</div><div class='add'>+			hdr_len = eth_get_headlen(skb-&gt;dev,</div><div class='add'>+						  aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='add'>+						  AQ_CFG_RX_HDR_SIZE);</div><div class='add'>+</div><div class='add'>+		memcpy(__skb_put(skb, hdr_len), aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='add'>+		       ALIGN(hdr_len, sizeof(long)));</div><div class='add'>+</div><div class='add'>+		if (buff-&gt;len - hdr_len &gt; 0) {</div><div class='add'>+			skb_add_rx_frag(skb, i++, buff-&gt;rxdata.page,</div><div class='add'>+					buff-&gt;rxdata.pg_off + hdr_len,</div><div class='add'>+					buff-&gt;len - hdr_len,</div><div class='add'>+					self-&gt;frame_max);</div><div class='ctx'> 			page_ref_inc(buff-&gt;rxdata.page);</div><div class='del'>-		} else {</div><div class='del'>-			skb = napi_alloc_skb(napi, AQ_CFG_RX_HDR_SIZE);</div><div class='del'>-			if (unlikely(!skb)) {</div><div class='del'>-				err = -ENOMEM;</div><div class='del'>-				goto err_exit;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			hdr_len = buff-&gt;len;</div><div class='del'>-			if (hdr_len &gt; AQ_CFG_RX_HDR_SIZE)</div><div class='del'>-				hdr_len = eth_get_headlen(skb-&gt;dev,</div><div class='del'>-							  aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='del'>-							  AQ_CFG_RX_HDR_SIZE);</div><div class='del'>-</div><div class='del'>-			memcpy(__skb_put(skb, hdr_len), aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='del'>-			       ALIGN(hdr_len, sizeof(long)));</div><div class='del'>-</div><div class='del'>-			if (buff-&gt;len - hdr_len &gt; 0) {</div><div class='del'>-				skb_add_rx_frag(skb, 0, buff-&gt;rxdata.page,</div><div class='del'>-						buff-&gt;rxdata.pg_off + hdr_len,</div><div class='del'>-						buff-&gt;len - hdr_len,</div><div class='del'>-						AQ_CFG_RX_FRAME_MAX);</div><div class='del'>-				page_ref_inc(buff-&gt;rxdata.page);</div><div class='del'>-			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (!buff-&gt;is_eop) {</div><div class='del'>-				buff_ = buff;</div><div class='del'>-				i = 1U;</div><div class='del'>-				do {</div><div class='del'>-					next_ = buff_-&gt;next,</div><div class='del'>-					buff_ = &amp;self-&gt;buff_ring[next_];</div><div class='add'>+		if (!buff-&gt;is_eop) {</div><div class='add'>+			buff_ = buff;</div><div class='add'>+			do {</div><div class='add'>+				next_ = buff_-&gt;next;</div><div class='add'>+				buff_ = &amp;self-&gt;buff_ring[next_];</div><div class='ctx'> </div><div class='del'>-					dma_sync_single_range_for_cpu(</div><div class='del'>-							aq_nic_get_dev(self-&gt;aq_nic),</div><div class='del'>-							buff_-&gt;rxdata.daddr,</div><div class='del'>-							buff_-&gt;rxdata.pg_off,</div><div class='del'>-							buff_-&gt;len,</div><div class='del'>-							DMA_FROM_DEVICE);</div><div class='del'>-					skb_add_rx_frag(skb, i++,</div><div class='del'>-							buff_-&gt;rxdata.page,</div><div class='del'>-							buff_-&gt;rxdata.pg_off,</div><div class='del'>-							buff_-&gt;len,</div><div class='del'>-							AQ_CFG_RX_FRAME_MAX);</div><div class='del'>-					page_ref_inc(buff_-&gt;rxdata.page);</div><div class='del'>-					buff_-&gt;is_cleaned = 1;</div><div class='del'>-</div><div class='del'>-					buff-&gt;is_ip_cso &amp;= buff_-&gt;is_ip_cso;</div><div class='del'>-					buff-&gt;is_udp_cso &amp;= buff_-&gt;is_udp_cso;</div><div class='del'>-					buff-&gt;is_tcp_cso &amp;= buff_-&gt;is_tcp_cso;</div><div class='del'>-					buff-&gt;is_cso_err |= buff_-&gt;is_cso_err;</div><div class='add'>+				dma_sync_single_range_for_cpu(aq_nic_get_dev(self-&gt;aq_nic),</div><div class='add'>+							      buff_-&gt;rxdata.daddr,</div><div class='add'>+							      buff_-&gt;rxdata.pg_off,</div><div class='add'>+							      buff_-&gt;len,</div><div class='add'>+							      DMA_FROM_DEVICE);</div><div class='add'>+				skb_add_rx_frag(skb, i++,</div><div class='add'>+						buff_-&gt;rxdata.page,</div><div class='add'>+						buff_-&gt;rxdata.pg_off,</div><div class='add'>+						buff_-&gt;len,</div><div class='add'>+						self-&gt;frame_max);</div><div class='add'>+				page_ref_inc(buff_-&gt;rxdata.page);</div><div class='add'>+				buff_-&gt;is_cleaned = 1;</div><div class='add'>+</div><div class='add'>+				buff-&gt;is_ip_cso &amp;= buff_-&gt;is_ip_cso;</div><div class='add'>+				buff-&gt;is_udp_cso &amp;= buff_-&gt;is_udp_cso;</div><div class='add'>+				buff-&gt;is_tcp_cso &amp;= buff_-&gt;is_tcp_cso;</div><div class='add'>+				buff-&gt;is_cso_err |= buff_-&gt;is_cso_err;</div><div class='ctx'> </div><div class='del'>-				} while (!buff_-&gt;is_eop);</div><div class='del'>-			}</div><div class='add'>+			} while (!buff_-&gt;is_eop);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (buff-&gt;is_vlan)</div><div class='add'>+			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),</div><div class='add'>+					       buff-&gt;vlan_rx_tag);</div><div class='add'>+</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='ctx'> </div><div class='ctx'> 		aq_rx_checksum(self, buff, skb);</div><div class='hunk'>@@ -419,11 +682,154 @@ int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='ctx'> 		skb_set_hash(skb, buff-&gt;rss_hash,</div><div class='ctx'> 			     buff-&gt;is_hash_l4 ? PKT_HASH_TYPE_L4 :</div><div class='ctx'> 			     PKT_HASH_TYPE_NONE);</div><div class='add'>+		/* Send all PTP traffic to 0 queue */</div><div class='add'>+		skb_record_rx_queue(skb,</div><div class='add'>+				    is_ptp_ring ? 0</div><div class='add'>+						: AQ_NIC_RING2QMAP(self-&gt;aq_nic,</div><div class='add'>+								   self-&gt;idx));</div><div class='ctx'> </div><div class='del'>-		skb_record_rx_queue(skb, self-&gt;idx);</div><div class='del'>-</div><div class='add'>+		u64_stats_update_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='ctx'> 		++self-&gt;stats.rx.packets;</div><div class='ctx'> 		self-&gt;stats.rx.bytes += skb-&gt;len;</div><div class='add'>+		u64_stats_update_end(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+</div><div class='add'>+		napi_gro_receive(napi, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __aq_ring_xdp_clean(struct aq_ring_s *rx_ring,</div><div class='add'>+			       struct napi_struct *napi, int *work_done,</div><div class='add'>+			       int budget)</div><div class='add'>+{</div><div class='add'>+	int frame_sz = rx_ring-&gt;page_offset + rx_ring-&gt;frame_max +</div><div class='add'>+		       rx_ring-&gt;tail_size;</div><div class='add'>+	struct aq_nic_s *aq_nic = rx_ring-&gt;aq_nic;</div><div class='add'>+	bool is_rsc_completed = true;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	dev = aq_nic_get_dev(aq_nic);</div><div class='add'>+	for (; (rx_ring-&gt;sw_head != rx_ring-&gt;hw_head) &amp;&amp; budget;</div><div class='add'>+		rx_ring-&gt;sw_head = aq_ring_next_dx(rx_ring, rx_ring-&gt;sw_head),</div><div class='add'>+		--budget, ++(*work_done)) {</div><div class='add'>+		struct aq_ring_buff_s *buff = &amp;rx_ring-&gt;buff_ring[rx_ring-&gt;sw_head];</div><div class='add'>+		bool is_ptp_ring = aq_ptp_ring(rx_ring-&gt;aq_nic, rx_ring);</div><div class='add'>+		struct aq_ring_buff_s *buff_ = NULL;</div><div class='add'>+		u16 ptp_hwtstamp_len = 0;</div><div class='add'>+		struct skb_shared_hwtstamps shhwtstamps;</div><div class='add'>+		struct sk_buff *skb = NULL;</div><div class='add'>+		unsigned int next_ = 0U;</div><div class='add'>+		struct xdp_buff xdp;</div><div class='add'>+		void *hard_start;</div><div class='add'>+</div><div class='add'>+		if (buff-&gt;is_cleaned)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (!buff-&gt;is_eop) {</div><div class='add'>+			buff_ = buff;</div><div class='add'>+			do {</div><div class='add'>+				if (buff_-&gt;next &gt;= rx_ring-&gt;size) {</div><div class='add'>+					err = -EIO;</div><div class='add'>+					goto err_exit;</div><div class='add'>+				}</div><div class='add'>+				next_ = buff_-&gt;next;</div><div class='add'>+				buff_ = &amp;rx_ring-&gt;buff_ring[next_];</div><div class='add'>+				is_rsc_completed =</div><div class='add'>+					aq_ring_dx_in_range(rx_ring-&gt;sw_head,</div><div class='add'>+							    next_,</div><div class='add'>+							    rx_ring-&gt;hw_head);</div><div class='add'>+</div><div class='add'>+				if (unlikely(!is_rsc_completed))</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				buff-&gt;is_error |= buff_-&gt;is_error;</div><div class='add'>+				buff-&gt;is_cso_err |= buff_-&gt;is_cso_err;</div><div class='add'>+			} while (!buff_-&gt;is_eop);</div><div class='add'>+</div><div class='add'>+			if (!is_rsc_completed) {</div><div class='add'>+				err = 0;</div><div class='add'>+				goto err_exit;</div><div class='add'>+			}</div><div class='add'>+			if (buff-&gt;is_error ||</div><div class='add'>+			    (buff-&gt;is_lro &amp;&amp; buff-&gt;is_cso_err)) {</div><div class='add'>+				buff_ = buff;</div><div class='add'>+				do {</div><div class='add'>+					if (buff_-&gt;next &gt;= rx_ring-&gt;size) {</div><div class='add'>+						err = -EIO;</div><div class='add'>+						goto err_exit;</div><div class='add'>+					}</div><div class='add'>+					next_ = buff_-&gt;next;</div><div class='add'>+					buff_ = &amp;rx_ring-&gt;buff_ring[next_];</div><div class='add'>+</div><div class='add'>+					buff_-&gt;is_cleaned = true;</div><div class='add'>+				} while (!buff_-&gt;is_eop);</div><div class='add'>+</div><div class='add'>+				u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+				++rx_ring-&gt;stats.rx.errors;</div><div class='add'>+				u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (buff-&gt;is_error) {</div><div class='add'>+			u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+			++rx_ring-&gt;stats.rx.errors;</div><div class='add'>+			u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_sync_single_range_for_cpu(dev,</div><div class='add'>+					      buff-&gt;rxdata.daddr,</div><div class='add'>+					      buff-&gt;rxdata.pg_off,</div><div class='add'>+					      buff-&gt;len, DMA_FROM_DEVICE);</div><div class='add'>+		hard_start = page_address(buff-&gt;rxdata.page) +</div><div class='add'>+			     buff-&gt;rxdata.pg_off - rx_ring-&gt;page_offset;</div><div class='add'>+</div><div class='add'>+		if (is_ptp_ring) {</div><div class='add'>+			ptp_hwtstamp_len = aq_ptp_extract_ts(rx_ring-&gt;aq_nic, &amp;shhwtstamps,</div><div class='add'>+							     aq_buf_vaddr(&amp;buff-&gt;rxdata),</div><div class='add'>+							     buff-&gt;len);</div><div class='add'>+			buff-&gt;len -= ptp_hwtstamp_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		xdp_init_buff(&amp;xdp, frame_sz, &amp;rx_ring-&gt;xdp_rxq);</div><div class='add'>+		xdp_prepare_buff(&amp;xdp, hard_start, rx_ring-&gt;page_offset,</div><div class='add'>+				 buff-&gt;len, false);</div><div class='add'>+		if (!buff-&gt;is_eop) {</div><div class='add'>+			if (aq_add_rx_fragment(dev, rx_ring, buff, &amp;xdp)) {</div><div class='add'>+				u64_stats_update_begin(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+				++rx_ring-&gt;stats.rx.packets;</div><div class='add'>+				rx_ring-&gt;stats.rx.bytes += xdp_get_buff_len(&amp;xdp);</div><div class='add'>+				++rx_ring-&gt;stats.rx.xdp_aborted;</div><div class='add'>+				u64_stats_update_end(&amp;rx_ring-&gt;stats.rx.syncp);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb = aq_xdp_run_prog(aq_nic, &amp;xdp, rx_ring, buff);</div><div class='add'>+		if (IS_ERR(skb) || !skb)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ptp_hwtstamp_len &gt; 0)</div><div class='add'>+			*skb_hwtstamps(skb) = shhwtstamps;</div><div class='add'>+</div><div class='add'>+		if (buff-&gt;is_vlan)</div><div class='add'>+			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),</div><div class='add'>+					       buff-&gt;vlan_rx_tag);</div><div class='add'>+</div><div class='add'>+		aq_rx_checksum(rx_ring, buff, skb);</div><div class='add'>+</div><div class='add'>+		skb_set_hash(skb, buff-&gt;rss_hash,</div><div class='add'>+			     buff-&gt;is_hash_l4 ? PKT_HASH_TYPE_L4 :</div><div class='add'>+			     PKT_HASH_TYPE_NONE);</div><div class='add'>+		/* Send all PTP traffic to 0 queue */</div><div class='add'>+		skb_record_rx_queue(skb,</div><div class='add'>+				    is_ptp_ring ? 0</div><div class='add'>+						: AQ_NIC_RING2QMAP(rx_ring-&gt;aq_nic,</div><div class='add'>+								   rx_ring-&gt;idx));</div><div class='ctx'> </div><div class='ctx'> 		napi_gro_receive(napi, skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -432,9 +838,36 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='add'>+		     struct napi_struct *napi,</div><div class='add'>+		     int *work_done,</div><div class='add'>+		     int budget)</div><div class='add'>+{</div><div class='add'>+	if (static_branch_unlikely(&amp;aq_xdp_locking_key))</div><div class='add'>+		return __aq_ring_xdp_clean(self, napi, work_done, budget);</div><div class='add'>+	else</div><div class='add'>+		return __aq_ring_rx_clean(self, napi, work_done, budget);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic)</div><div class='add'>+{</div><div class='add'>+#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)</div><div class='add'>+	while (self-&gt;sw_head != self-&gt;hw_head) {</div><div class='add'>+		u64 ns;</div><div class='add'>+</div><div class='add'>+		aq_nic-&gt;aq_hw_ops-&gt;extract_hwts(aq_nic-&gt;aq_hw,</div><div class='add'>+						self-&gt;dx_ring +</div><div class='add'>+						(self-&gt;sw_head * self-&gt;dx_size),</div><div class='add'>+						self-&gt;dx_size, &amp;ns);</div><div class='add'>+		aq_ptp_tx_hwtstamp(aq_nic, ns);</div><div class='add'>+</div><div class='add'>+		self-&gt;sw_head = aq_ring_next_dx(self, self-&gt;sw_head);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int aq_ring_rx_fill(struct aq_ring_s *self)</div><div class='ctx'> {</div><div class='del'>-	unsigned int page_order = self-&gt;page_order;</div><div class='ctx'> 	struct aq_ring_buff_s *buff = NULL;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i = 0;</div><div class='hunk'>@@ -448,9 +881,9 @@ int aq_ring_rx_fill(struct aq_ring_s *self)</div><div class='ctx'> 		buff = &amp;self-&gt;buff_ring[self-&gt;sw_tail];</div><div class='ctx'> </div><div class='ctx'> 		buff-&gt;flags = 0U;</div><div class='del'>-		buff-&gt;len = AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+		buff-&gt;len = self-&gt;frame_max;</div><div class='ctx'> </div><div class='del'>-		err = aq_get_rxpages(self, buff, page_order);</div><div class='add'>+		err = aq_get_rxpages(self, buff);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -465,7 +898,7 @@ err_exit:</div><div class='ctx'> void aq_ring_rx_deinit(struct aq_ring_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	if (!self)</div><div class='del'>-		goto err_exit;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	for (; self-&gt;sw_head != self-&gt;sw_tail;</div><div class='ctx'> 		self-&gt;sw_head = aq_ring_next_dx(self, self-&gt;sw_head)) {</div><div class='hunk'>@@ -473,21 +906,73 @@ void aq_ring_rx_deinit(struct aq_ring_s *self)</div><div class='ctx'> </div><div class='ctx'> 		aq_free_rxpage(&amp;buff-&gt;rxdata, aq_nic_get_dev(self-&gt;aq_nic));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-err_exit:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void aq_ring_free(struct aq_ring_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	if (!self)</div><div class='del'>-		goto err_exit;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	kfree(self-&gt;buff_ring);</div><div class='add'>+	self-&gt;buff_ring = NULL;</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;dx_ring)</div><div class='add'>+	if (self-&gt;dx_ring) {</div><div class='ctx'> 		dma_free_coherent(aq_nic_get_dev(self-&gt;aq_nic),</div><div class='ctx'> 				  self-&gt;size * self-&gt;dx_size, self-&gt;dx_ring,</div><div class='ctx'> 				  self-&gt;dx_ring_pa);</div><div class='add'>+		self-&gt;dx_ring = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_ring_hwts_rx_free(struct aq_ring_s *self)</div><div class='add'>+{</div><div class='add'>+	if (!self)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;dx_ring) {</div><div class='add'>+		dma_free_coherent(aq_nic_get_dev(self-&gt;aq_nic),</div><div class='add'>+				  self-&gt;size * self-&gt;dx_size + AQ_CFG_RXDS_DEF,</div><div class='add'>+				  self-&gt;dx_ring, self-&gt;dx_ring_pa);</div><div class='add'>+		self-&gt;dx_ring = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data)</div><div class='add'>+{</div><div class='add'>+	unsigned int count;</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;ring_type == ATL_RING_RX) {</div><div class='add'>+		/* This data should mimic aq_ethtool_queue_rx_stat_names structure */</div><div class='add'>+		do {</div><div class='add'>+			count = 0;</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;self-&gt;stats.rx.syncp);</div><div class='add'>+			data[count] = self-&gt;stats.rx.packets;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.jumbo_packets;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.lro_packets;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.errors;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.alloc_fails;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.skb_alloc_fails;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.polls;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.pg_flips;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.pg_reuses;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.pg_losts;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.xdp_aborted;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.xdp_drop;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.xdp_pass;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.xdp_tx;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.xdp_invalid;</div><div class='add'>+			data[++count] = self-&gt;stats.rx.xdp_redirect;</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;self-&gt;stats.rx.syncp, start));</div><div class='add'>+	} else {</div><div class='add'>+		/* This data should mimic aq_ethtool_queue_tx_stat_names structure */</div><div class='add'>+		do {</div><div class='add'>+			count = 0;</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;self-&gt;stats.tx.syncp);</div><div class='add'>+			data[count] = self-&gt;stats.tx.packets;</div><div class='add'>+			data[++count] = self-&gt;stats.tx.queue_restarts;</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;self-&gt;stats.tx.syncp, start));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-err_exit:;</div><div class='add'>+	return ++count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ring.h b/drivers/net/ethernet/aquantia/atlantic/aq_ring.h<br/>index cfffc301e746..d627ace850ff 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_ring.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_ring.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_ring.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_ring.h: Declaration of functions for Rx/Tx rings. */</div><div class='hunk'>@@ -13,6 +11,10 @@</div><div class='ctx'> #define AQ_RING_H</div><div class='ctx'> </div><div class='ctx'> #include "aq_common.h"</div><div class='add'>+#include "aq_vec.h"</div><div class='add'>+</div><div class='add'>+#define AQ_XDP_HEADROOM		ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8)</div><div class='add'>+#define AQ_XDP_TAILROOM		SKB_DATA_ALIGN(sizeof(struct skb_shared_info))</div><div class='ctx'> </div><div class='ctx'> struct page;</div><div class='ctx'> struct aq_nic_cfg_s;</div><div class='hunk'>@@ -30,7 +32,7 @@ struct aq_rxpage {</div><div class='ctx'>  *         +----------+----------+----------+-----------</div><div class='ctx'>  * 4/8bytes|len pkt   |len pkt   |          | skb</div><div class='ctx'>  *         +----------+----------+----------+-----------</div><div class='del'>- * 4/8bytes|is_txc    |len,flags |len       |len,is_eop</div><div class='add'>+ * 4/8bytes|is_gso    |len,flags |len       |len,is_eop</div><div class='ctx'>  *         +----------+----------+----------+-----------</div><div class='ctx'>  *</div><div class='ctx'>  *  This aq_ring_buff_s doesn't have endianness dependency.</div><div class='hunk'>@@ -47,11 +49,13 @@ struct __packed aq_ring_buff_s {</div><div class='ctx'> 			u8 is_hash_l4;</div><div class='ctx'> 			u8 rsvd1;</div><div class='ctx'> 			struct aq_rxpage rxdata;</div><div class='add'>+			u16 vlan_rx_tag;</div><div class='ctx'> 		};</div><div class='ctx'> 		/* EOP */</div><div class='ctx'> 		struct {</div><div class='ctx'> 			dma_addr_t pa_eop;</div><div class='ctx'> 			struct sk_buff *skb;</div><div class='add'>+			struct xdp_frame *xdpf;</div><div class='ctx'> 		};</div><div class='ctx'> 		/* TxC */</div><div class='ctx'> 		struct {</div><div class='hunk'>@@ -62,22 +66,26 @@ struct __packed aq_ring_buff_s {</div><div class='ctx'> 			u8 is_ipv6:1;</div><div class='ctx'> 			u8 rsvd2:7;</div><div class='ctx'> 			u32 len_pkt;</div><div class='add'>+			u16 vlan_tx_tag;</div><div class='ctx'> 		};</div><div class='ctx'> 	};</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='del'>-			u16 len;</div><div class='add'>+			u32 len:16;</div><div class='ctx'> 			u32 is_ip_cso:1;</div><div class='ctx'> 			u32 is_udp_cso:1;</div><div class='ctx'> 			u32 is_tcp_cso:1;</div><div class='ctx'> 			u32 is_cso_err:1;</div><div class='ctx'> 			u32 is_sop:1;</div><div class='ctx'> 			u32 is_eop:1;</div><div class='del'>-			u32 is_txc:1;</div><div class='add'>+			u32 is_gso_tcp:1;</div><div class='add'>+			u32 is_gso_udp:1;</div><div class='ctx'> 			u32 is_mapped:1;</div><div class='ctx'> 			u32 is_cleaned:1;</div><div class='ctx'> 			u32 is_error:1;</div><div class='del'>-			u32 rsvd3:6;</div><div class='add'>+			u32 is_vlan:1;</div><div class='add'>+			u32 is_lro:1;</div><div class='add'>+			u32 rsvd3:3;</div><div class='ctx'> 			u16 eop_index;</div><div class='ctx'> 			u16 rsvd4;</div><div class='ctx'> 		};</div><div class='hunk'>@@ -86,17 +94,28 @@ struct __packed aq_ring_buff_s {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_ring_stats_rx_s {</div><div class='add'>+	struct u64_stats_sync syncp;	/* must be first */</div><div class='ctx'> 	u64 errors;</div><div class='ctx'> 	u64 packets;</div><div class='ctx'> 	u64 bytes;</div><div class='ctx'> 	u64 lro_packets;</div><div class='ctx'> 	u64 jumbo_packets;</div><div class='add'>+	u64 alloc_fails;</div><div class='add'>+	u64 skb_alloc_fails;</div><div class='add'>+	u64 polls;</div><div class='ctx'> 	u64 pg_losts;</div><div class='ctx'> 	u64 pg_flips;</div><div class='ctx'> 	u64 pg_reuses;</div><div class='add'>+	u64 xdp_aborted;</div><div class='add'>+	u64 xdp_drop;</div><div class='add'>+	u64 xdp_pass;</div><div class='add'>+	u64 xdp_tx;</div><div class='add'>+	u64 xdp_invalid;</div><div class='add'>+	u64 xdp_redirect;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_ring_stats_tx_s {</div><div class='add'>+	struct u64_stats_sync syncp;	/* must be first */</div><div class='ctx'> 	u64 errors;</div><div class='ctx'> 	u64 packets;</div><div class='ctx'> 	u64 bytes;</div><div class='hunk'>@@ -108,6 +127,11 @@ union aq_ring_stats_s {</div><div class='ctx'> 	struct aq_ring_stats_tx_s tx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum atl_ring_type {</div><div class='add'>+	ATL_RING_TX,</div><div class='add'>+	ATL_RING_RX,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct aq_ring_s {</div><div class='ctx'> 	struct aq_ring_buff_s *buff_ring;</div><div class='ctx'> 	u8 *dx_ring;		/* descriptors ring, dma shared mem */</div><div class='hunk'>@@ -119,9 +143,15 @@ struct aq_ring_s {</div><div class='ctx'> 	unsigned int size;	/* descriptors number */</div><div class='ctx'> 	unsigned int dx_size;	/* TX or RX descriptor size,  */</div><div class='ctx'> 				/* stored here for fater math */</div><div class='del'>-	unsigned int page_order;</div><div class='add'>+	u16 page_order;</div><div class='add'>+	u16 page_offset;</div><div class='add'>+	u16 frame_max;</div><div class='add'>+	u16 tail_size;</div><div class='ctx'> 	union aq_ring_stats_s stats;</div><div class='ctx'> 	dma_addr_t dx_ring_pa;</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='add'>+	enum atl_ring_type ring_type;</div><div class='add'>+	struct xdp_rxq_info xdp_rxq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_ring_param_s {</div><div class='hunk'>@@ -153,25 +183,36 @@ static inline unsigned int aq_ring_avail_dx(struct aq_ring_s *self)</div><div class='ctx'> 		self-&gt;sw_head - self-&gt;sw_tail - 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct aq_ring_s *aq_ring_tx_alloc(struct aq_ring_s *self,</div><div class='del'>-				   struct aq_nic_s *aq_nic,</div><div class='del'>-				   unsigned int idx,</div><div class='del'>-				   struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='del'>-struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,</div><div class='del'>-				   struct aq_nic_s *aq_nic,</div><div class='del'>-				   unsigned int idx,</div><div class='del'>-				   struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='del'>-int aq_ring_init(struct aq_ring_s *self);</div><div class='add'>+int aq_ring_tx_alloc(struct aq_ring_s *self,</div><div class='add'>+		     struct aq_nic_s *aq_nic,</div><div class='add'>+		     unsigned int idx,</div><div class='add'>+		     struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='add'>+int aq_ring_rx_alloc(struct aq_ring_s *self,</div><div class='add'>+		     struct aq_nic_s *aq_nic,</div><div class='add'>+		     unsigned int idx,</div><div class='add'>+		     struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='add'>+</div><div class='add'>+int aq_ring_init(struct aq_ring_s *self, const enum atl_ring_type ring_type);</div><div class='ctx'> void aq_ring_rx_deinit(struct aq_ring_s *self);</div><div class='ctx'> void aq_ring_free(struct aq_ring_s *self);</div><div class='ctx'> void aq_ring_update_queue_state(struct aq_ring_s *ring);</div><div class='ctx'> void aq_ring_queue_wake(struct aq_ring_s *ring);</div><div class='ctx'> void aq_ring_queue_stop(struct aq_ring_s *ring);</div><div class='ctx'> bool aq_ring_tx_clean(struct aq_ring_s *self);</div><div class='add'>+int aq_xdp_xmit(struct net_device *dev, int num_frames,</div><div class='add'>+		struct xdp_frame **frames, u32 flags);</div><div class='ctx'> int aq_ring_rx_clean(struct aq_ring_s *self,</div><div class='ctx'> 		     struct napi_struct *napi,</div><div class='ctx'> 		     int *work_done,</div><div class='ctx'> 		     int budget);</div><div class='ctx'> int aq_ring_rx_fill(struct aq_ring_s *self);</div><div class='ctx'> </div><div class='add'>+int aq_ring_hwts_rx_alloc(struct aq_ring_s *self,</div><div class='add'>+			  struct aq_nic_s *aq_nic, unsigned int idx,</div><div class='add'>+			  unsigned int size, unsigned int dx_size);</div><div class='add'>+void aq_ring_hwts_rx_free(struct aq_ring_s *self);</div><div class='add'>+void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic);</div><div class='add'>+</div><div class='add'>+unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data);</div><div class='add'>+</div><div class='ctx'> #endif /* AQ_RING_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_rss.h b/drivers/net/ethernet/aquantia/atlantic/aq_rss.h<br/>index 1db6eb20a8f2..39b1f43c8ad7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_rss.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_rss.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_rss.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_rss.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='ctx'>  * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_rss.h: Receive Side Scaling definitions. */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_utils.h b/drivers/net/ethernet/aquantia/atlantic/aq_utils.h<br/>index 786ea8187c69..d3a0b2ec0279 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_utils.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_utils.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='ctx'>  * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_utils.h: Useful macro and structures used in all layers of driver. */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.c b/drivers/net/ethernet/aquantia/atlantic/aq_vec.c<br/>index a2e4ca1782ae..9769ab4f9bef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_vec.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_vec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_vec.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_vec.c: Definition of common structure for vector of Rx and Tx rings.</div><div class='hunk'>@@ -12,11 +10,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include "aq_vec.h"</div><div class='del'>-#include "aq_nic.h"</div><div class='del'>-#include "aq_ring.h"</div><div class='del'>-#include "aq_hw.h"</div><div class='del'>-</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct aq_vec_s {</div><div class='ctx'> 	const struct aq_hw_ops *aq_hw_ops;</div><div class='hunk'>@@ -45,8 +38,11 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	if (!self) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 	} else {</div><div class='del'>-		for (i = 0U, ring = self-&gt;ring[0];</div><div class='del'>-			self-&gt;tx_rings &gt; i; ++i, ring = self-&gt;ring[i]) {</div><div class='add'>+		for (i = 0U; self-&gt;tx_rings &gt; i; ++i) {</div><div class='add'>+			ring = self-&gt;ring[i];</div><div class='add'>+			u64_stats_update_begin(&amp;ring[AQ_VEC_RX_ID].stats.rx.syncp);</div><div class='add'>+			ring[AQ_VEC_RX_ID].stats.rx.polls++;</div><div class='add'>+			u64_stats_update_end(&amp;ring[AQ_VEC_RX_ID].stats.rx.syncp);</div><div class='ctx'> 			if (self-&gt;aq_hw_ops-&gt;hw_ring_tx_head_update) {</div><div class='ctx'> 				err = self-&gt;aq_hw_ops-&gt;hw_ring_tx_head_update(</div><div class='ctx'> 							self-&gt;aq_hw,</div><div class='hunk'>@@ -89,6 +85,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+err_exit:</div><div class='ctx'> 		if (!was_tx_cleaned)</div><div class='ctx'> 			work_done = budget;</div><div class='ctx'> </div><div class='hunk'>@@ -98,7 +95,7 @@ static int aq_vec_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 					1U &lt;&lt; self-&gt;aq_ring_param.vec_idx);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-err_exit:</div><div class='add'>+</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -106,15 +103,10 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,</div><div class='ctx'> 			      struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_vec_s *self = NULL;</div><div class='del'>-	struct aq_ring_s *ring = NULL;</div><div class='del'>-	unsigned int i = 0U;</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	self = kzalloc(sizeof(*self), GFP_KERNEL);</div><div class='del'>-	if (!self) {</div><div class='del'>-		err = -ENOMEM;</div><div class='add'>+	if (!self)</div><div class='ctx'> 		goto err_exit;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;aq_nic = aq_nic;</div><div class='ctx'> 	self-&gt;aq_ring_param.vec_idx = idx;</div><div class='hunk'>@@ -127,41 +119,62 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,</div><div class='ctx'> 	self-&gt;tx_rings = 0;</div><div class='ctx'> 	self-&gt;rx_rings = 0;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(aq_nic_get_ndev(aq_nic), &amp;self-&gt;napi,</div><div class='del'>-		       aq_vec_poll, AQ_CFG_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add(aq_nic_get_ndev(aq_nic), &amp;self-&gt;napi, aq_vec_poll);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return self;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_vec_ring_alloc(struct aq_vec_s *self, struct aq_nic_s *aq_nic,</div><div class='add'>+		      unsigned int idx, struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='add'>+{</div><div class='add'>+	struct aq_ring_s *ring = NULL;</div><div class='add'>+	unsigned int i = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; aq_nic_cfg-&gt;tcs; ++i) {</div><div class='del'>-		unsigned int idx_ring = AQ_NIC_TCVEC2RING(self-&gt;nic,</div><div class='del'>-						self-&gt;tx_rings,</div><div class='del'>-						self-&gt;aq_ring_param.vec_idx);</div><div class='add'>+		const unsigned int idx_ring = AQ_NIC_CFG_TCVEC2RING(aq_nic_cfg,</div><div class='add'>+								    i, idx);</div><div class='ctx'> </div><div class='del'>-		ring = aq_ring_tx_alloc(&amp;self-&gt;ring[i][AQ_VEC_TX_ID], aq_nic,</div><div class='del'>-					idx_ring, aq_nic_cfg);</div><div class='del'>-		if (!ring) {</div><div class='del'>-			err = -ENOMEM;</div><div class='add'>+		ring = &amp;self-&gt;ring[i][AQ_VEC_TX_ID];</div><div class='add'>+		err = aq_ring_tx_alloc(ring, aq_nic, idx_ring, aq_nic_cfg);</div><div class='add'>+		if (err)</div><div class='ctx'> 			goto err_exit;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		++self-&gt;tx_rings;</div><div class='ctx'> </div><div class='ctx'> 		aq_nic_set_tx_ring(aq_nic, idx_ring, ring);</div><div class='ctx'> </div><div class='del'>-		ring = aq_ring_rx_alloc(&amp;self-&gt;ring[i][AQ_VEC_RX_ID], aq_nic,</div><div class='del'>-					idx_ring, aq_nic_cfg);</div><div class='del'>-		if (!ring) {</div><div class='add'>+		ring = &amp;self-&gt;ring[i][AQ_VEC_RX_ID];</div><div class='add'>+		if (xdp_rxq_info_reg(&amp;ring-&gt;xdp_rxq,</div><div class='add'>+				     aq_nic-&gt;ndev, idx,</div><div class='add'>+				     self-&gt;napi.napi_id) &lt; 0) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+		if (xdp_rxq_info_reg_mem_model(&amp;ring-&gt;xdp_rxq,</div><div class='add'>+					       MEM_TYPE_PAGE_SHARED, NULL) &lt; 0) {</div><div class='add'>+			xdp_rxq_info_unreg(&amp;ring-&gt;xdp_rxq);</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		err = aq_ring_rx_alloc(ring, aq_nic, idx_ring, aq_nic_cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			xdp_rxq_info_unreg(&amp;ring-&gt;xdp_rxq);</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		++self-&gt;rx_rings;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_exit:</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		aq_vec_free(self);</div><div class='add'>+		aq_vec_ring_free(self);</div><div class='ctx'> 		self = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	return self;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,</div><div class='hunk'>@@ -174,9 +187,9 @@ int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,</div><div class='ctx'> 	self-&gt;aq_hw_ops = aq_hw_ops;</div><div class='ctx'> 	self-&gt;aq_hw = aq_hw;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, ring = self-&gt;ring[0];</div><div class='del'>-		self-&gt;tx_rings &gt; i; ++i, ring = self-&gt;ring[i]) {</div><div class='del'>-		err = aq_ring_init(&amp;ring[AQ_VEC_TX_ID]);</div><div class='add'>+	for (i = 0U; self-&gt;tx_rings &gt; i; ++i) {</div><div class='add'>+		ring = self-&gt;ring[i];</div><div class='add'>+		err = aq_ring_init(&amp;ring[AQ_VEC_TX_ID], ATL_RING_TX);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -186,7 +199,7 @@ int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> </div><div class='del'>-		err = aq_ring_init(&amp;ring[AQ_VEC_RX_ID]);</div><div class='add'>+		err = aq_ring_init(&amp;ring[AQ_VEC_RX_ID], ATL_RING_RX);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -216,8 +229,8 @@ int aq_vec_start(struct aq_vec_s *self)</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, ring = self-&gt;ring[0];</div><div class='del'>-		self-&gt;tx_rings &gt; i; ++i, ring = self-&gt;ring[i]) {</div><div class='add'>+	for (i = 0U; self-&gt;tx_rings &gt; i; ++i) {</div><div class='add'>+		ring = self-&gt;ring[i];</div><div class='ctx'> 		err = self-&gt;aq_hw_ops-&gt;hw_ring_tx_start(self-&gt;aq_hw,</div><div class='ctx'> 							&amp;ring[AQ_VEC_TX_ID]);</div><div class='ctx'> 		if (err &lt; 0)</div><div class='hunk'>@@ -240,8 +253,8 @@ void aq_vec_stop(struct aq_vec_s *self)</div><div class='ctx'> 	struct aq_ring_s *ring = NULL;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, ring = self-&gt;ring[0];</div><div class='del'>-		self-&gt;tx_rings &gt; i; ++i, ring = self-&gt;ring[i]) {</div><div class='add'>+	for (i = 0U; self-&gt;tx_rings &gt; i; ++i) {</div><div class='add'>+		ring = self-&gt;ring[i];</div><div class='ctx'> 		self-&gt;aq_hw_ops-&gt;hw_ring_tx_stop(self-&gt;aq_hw,</div><div class='ctx'> 						 &amp;ring[AQ_VEC_TX_ID]);</div><div class='ctx'> </div><div class='hunk'>@@ -260,32 +273,46 @@ void aq_vec_deinit(struct aq_vec_s *self)</div><div class='ctx'> 	if (!self)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, ring = self-&gt;ring[0];</div><div class='del'>-		self-&gt;tx_rings &gt; i; ++i, ring = self-&gt;ring[i]) {</div><div class='add'>+	for (i = 0U; self-&gt;tx_rings &gt; i; ++i) {</div><div class='add'>+		ring = self-&gt;ring[i];</div><div class='ctx'> 		aq_ring_tx_clean(&amp;ring[AQ_VEC_TX_ID]);</div><div class='ctx'> 		aq_ring_rx_deinit(&amp;ring[AQ_VEC_RX_ID]);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> err_exit:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void aq_vec_free(struct aq_vec_s *self)</div><div class='ctx'> {</div><div class='add'>+	if (!self)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	netif_napi_del(&amp;self-&gt;napi);</div><div class='add'>+</div><div class='add'>+	kfree(self);</div><div class='add'>+</div><div class='add'>+err_exit:;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void aq_vec_ring_free(struct aq_vec_s *self)</div><div class='add'>+{</div><div class='ctx'> 	struct aq_ring_s *ring = NULL;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='ctx'> 	if (!self)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	for (i = 0U, ring = self-&gt;ring[0];</div><div class='del'>-		self-&gt;tx_rings &gt; i; ++i, ring = self-&gt;ring[i]) {</div><div class='add'>+	for (i = 0U; self-&gt;tx_rings &gt; i; ++i) {</div><div class='add'>+		ring = self-&gt;ring[i];</div><div class='ctx'> 		aq_ring_free(&amp;ring[AQ_VEC_TX_ID]);</div><div class='del'>-		aq_ring_free(&amp;ring[AQ_VEC_RX_ID]);</div><div class='add'>+		if (i &lt; self-&gt;rx_rings) {</div><div class='add'>+			xdp_rxq_info_unreg(&amp;ring[AQ_VEC_RX_ID].xdp_rxq);</div><div class='add'>+			aq_ring_free(&amp;ring[AQ_VEC_RX_ID]);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netif_napi_del(&amp;self-&gt;napi);</div><div class='del'>-</div><div class='del'>-	kfree(self);</div><div class='del'>-</div><div class='add'>+	self-&gt;tx_rings = 0;</div><div class='add'>+	self-&gt;rx_rings = 0;</div><div class='ctx'> err_exit:;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -308,15 +335,13 @@ irqreturn_t aq_vec_isr_legacy(int irq, void *private)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_vec_s *self = private;</div><div class='ctx'> 	u64 irq_mask = 0U;</div><div class='del'>-	irqreturn_t err = 0;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	if (!self) {</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto err_exit;</div><div class='del'>-	}</div><div class='add'>+	if (!self)</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> 	err = self-&gt;aq_hw_ops-&gt;hw_irq_read(self-&gt;aq_hw, &amp;irq_mask);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto err_exit;</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	if (irq_mask) {</div><div class='ctx'> 		self-&gt;aq_hw_ops-&gt;hw_irq_disable(self-&gt;aq_hw,</div><div class='hunk'>@@ -324,11 +349,10 @@ irqreturn_t aq_vec_isr_legacy(int irq, void *private)</div><div class='ctx'> 		napi_schedule(&amp;self-&gt;napi);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		self-&gt;aq_hw_ops-&gt;hw_irq_enable(self-&gt;aq_hw, 1U);</div><div class='del'>-		err = IRQ_NONE;</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='del'>-	return err &gt;= 0 ? IRQ_HANDLED : IRQ_NONE;</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> cpumask_t *aq_vec_get_affinity_mask(struct aq_vec_s *self)</div><div class='hunk'>@@ -336,55 +360,20 @@ cpumask_t *aq_vec_get_affinity_mask(struct aq_vec_s *self)</div><div class='ctx'> 	return &amp;self-&gt;aq_ring_param.affinity_mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void aq_vec_add_stats(struct aq_vec_s *self,</div><div class='del'>-		      struct aq_ring_stats_rx_s *stats_rx,</div><div class='del'>-		      struct aq_ring_stats_tx_s *stats_tx)</div><div class='add'>+bool aq_vec_is_valid_tc(struct aq_vec_s *self, const unsigned int tc)</div><div class='ctx'> {</div><div class='del'>-	struct aq_ring_s *ring = NULL;</div><div class='del'>-	unsigned int r = 0U;</div><div class='del'>-</div><div class='del'>-	for (r = 0U, ring = self-&gt;ring[0];</div><div class='del'>-		self-&gt;tx_rings &gt; r; ++r, ring = self-&gt;ring[r]) {</div><div class='del'>-		struct aq_ring_stats_tx_s *tx = &amp;ring[AQ_VEC_TX_ID].stats.tx;</div><div class='del'>-		struct aq_ring_stats_rx_s *rx = &amp;ring[AQ_VEC_RX_ID].stats.rx;</div><div class='del'>-</div><div class='del'>-		stats_rx-&gt;packets += rx-&gt;packets;</div><div class='del'>-		stats_rx-&gt;bytes += rx-&gt;bytes;</div><div class='del'>-		stats_rx-&gt;errors += rx-&gt;errors;</div><div class='del'>-		stats_rx-&gt;jumbo_packets += rx-&gt;jumbo_packets;</div><div class='del'>-		stats_rx-&gt;lro_packets += rx-&gt;lro_packets;</div><div class='del'>-		stats_rx-&gt;pg_losts += rx-&gt;pg_losts;</div><div class='del'>-		stats_rx-&gt;pg_flips += rx-&gt;pg_flips;</div><div class='del'>-		stats_rx-&gt;pg_reuses += rx-&gt;pg_reuses;</div><div class='del'>-</div><div class='del'>-		stats_tx-&gt;packets += tx-&gt;packets;</div><div class='del'>-		stats_tx-&gt;bytes += tx-&gt;bytes;</div><div class='del'>-		stats_tx-&gt;errors += tx-&gt;errors;</div><div class='del'>-		stats_tx-&gt;queue_restarts += tx-&gt;queue_restarts;</div><div class='del'>-	}</div><div class='add'>+	return tc &lt; self-&gt;rx_rings &amp;&amp; tc &lt; self-&gt;tx_rings;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int aq_vec_get_sw_stats(struct aq_vec_s *self, u64 *data, unsigned int *p_count)</div><div class='add'>+unsigned int aq_vec_get_sw_stats(struct aq_vec_s *self, const unsigned int tc, u64 *data)</div><div class='ctx'> {</div><div class='del'>-	unsigned int count = 0U;</div><div class='del'>-	struct aq_ring_stats_rx_s stats_rx;</div><div class='del'>-	struct aq_ring_stats_tx_s stats_tx;</div><div class='del'>-</div><div class='del'>-	memset(&amp;stats_rx, 0U, sizeof(struct aq_ring_stats_rx_s));</div><div class='del'>-	memset(&amp;stats_tx, 0U, sizeof(struct aq_ring_stats_tx_s));</div><div class='del'>-	aq_vec_add_stats(self, &amp;stats_rx, &amp;stats_tx);</div><div class='del'>-</div><div class='del'>-	/* This data should mimic aq_ethtool_queue_stat_names structure</div><div class='del'>-	 */</div><div class='del'>-	data[count] += stats_rx.packets;</div><div class='del'>-	data[++count] += stats_tx.packets;</div><div class='del'>-	data[++count] += stats_tx.queue_restarts;</div><div class='del'>-	data[++count] += stats_rx.jumbo_packets;</div><div class='del'>-	data[++count] += stats_rx.lro_packets;</div><div class='del'>-	data[++count] += stats_rx.errors;</div><div class='del'>-</div><div class='del'>-	if (p_count)</div><div class='del'>-		*p_count = ++count;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	if (!aq_vec_is_valid_tc(self, tc))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	count = aq_ring_fill_stats_data(&amp;self-&gt;ring[tc][AQ_VEC_RX_ID], data);</div><div class='add'>+	count += aq_ring_fill_stats_data(&amp;self-&gt;ring[tc][AQ_VEC_TX_ID], data + count);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_vec.h b/drivers/net/ethernet/aquantia/atlantic/aq_vec.h<br/>index 8bdf60bb3f63..78fac609b71d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_vec.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/aq_vec.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/aq_vec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/aq_vec.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File aq_vec.h: Definition of common structures for vector of Rx and Tx rings.</div><div class='hunk'>@@ -15,7 +13,13 @@</div><div class='ctx'> #define AQ_VEC_H</div><div class='ctx'> </div><div class='ctx'> #include "aq_common.h"</div><div class='add'>+#include "aq_nic.h"</div><div class='add'>+#include "aq_ring.h"</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+</div><div class='ctx'> #include &lt;linux/irqreturn.h&gt;</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='ctx'> </div><div class='ctx'> struct aq_hw_s;</div><div class='ctx'> struct aq_hw_ops;</div><div class='hunk'>@@ -28,17 +32,17 @@ irqreturn_t aq_vec_isr(int irq, void *private);</div><div class='ctx'> irqreturn_t aq_vec_isr_legacy(int irq, void *private);</div><div class='ctx'> struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,</div><div class='ctx'> 			      struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='add'>+int aq_vec_ring_alloc(struct aq_vec_s *self, struct aq_nic_s *aq_nic,</div><div class='add'>+		      unsigned int idx, struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='ctx'> int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,</div><div class='ctx'> 		struct aq_hw_s *aq_hw);</div><div class='ctx'> void aq_vec_deinit(struct aq_vec_s *self);</div><div class='ctx'> void aq_vec_free(struct aq_vec_s *self);</div><div class='add'>+void aq_vec_ring_free(struct aq_vec_s *self);</div><div class='ctx'> int aq_vec_start(struct aq_vec_s *self);</div><div class='ctx'> void aq_vec_stop(struct aq_vec_s *self);</div><div class='ctx'> cpumask_t *aq_vec_get_affinity_mask(struct aq_vec_s *self);</div><div class='del'>-int aq_vec_get_sw_stats(struct aq_vec_s *self, u64 *data,</div><div class='del'>-			unsigned int *p_count);</div><div class='del'>-void aq_vec_add_stats(struct aq_vec_s *self,</div><div class='del'>-		      struct aq_ring_stats_rx_s *stats_rx,</div><div class='del'>-		      struct aq_ring_stats_tx_s *stats_tx);</div><div class='add'>+bool aq_vec_is_valid_tc(struct aq_vec_s *self, const unsigned int tc);</div><div class='add'>+unsigned int aq_vec_get_sw_stats(struct aq_vec_s *self, const unsigned int tc, u64 *data);</div><div class='ctx'> </div><div class='ctx'> #endif /* AQ_VEC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile b/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile<br/>deleted file mode 100644<br/>index 805fa28f391a..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0</div><div class='del'>-# kbuild requires Makefile in a directory to build individual objects</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c<br/>index 9fe507fe2d7f..8de2cdd09213 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_a0.c: Definition of Atlantic hardware specific functions. */</div><div class='hunk'>@@ -18,39 +16,42 @@</div><div class='ctx'> #include "hw_atl_llh.h"</div><div class='ctx'> #include "hw_atl_a0_internal.h"</div><div class='ctx'> </div><div class='del'>-#define DEFAULT_A0_BOARD_BASIC_CAPABILITIES \</div><div class='del'>-	.is_64_dma = true,		  \</div><div class='del'>-	.msix_irqs = 4U,		  \</div><div class='del'>-	.irq_mask = ~0U,		  \</div><div class='del'>-	.vecs = HW_ATL_A0_RSS_MAX,	  \</div><div class='del'>-	.tcs = HW_ATL_A0_TC_MAX,	  \</div><div class='del'>-	.rxd_alignment = 1U,		  \</div><div class='del'>-	.rxd_size = HW_ATL_A0_RXD_SIZE,   \</div><div class='del'>-	.rxds_max = HW_ATL_A0_MAX_RXD,    \</div><div class='del'>-	.rxds_min = HW_ATL_A0_MIN_RXD,    \</div><div class='del'>-	.txd_alignment = 1U,		  \</div><div class='del'>-	.txd_size = HW_ATL_A0_TXD_SIZE,   \</div><div class='del'>-	.txds_max = HW_ATL_A0_MAX_TXD,    \</div><div class='del'>-	.txds_min = HW_ATL_A0_MIN_RXD,    \</div><div class='del'>-	.txhwb_alignment = 4096U,	  \</div><div class='del'>-	.tx_rings = HW_ATL_A0_TX_RINGS,   \</div><div class='del'>-	.rx_rings = HW_ATL_A0_RX_RINGS,   \</div><div class='del'>-	.hw_features = NETIF_F_HW_CSUM |  \</div><div class='del'>-			NETIF_F_RXHASH |  \</div><div class='del'>-			NETIF_F_RXCSUM |  \</div><div class='del'>-			NETIF_F_SG |	  \</div><div class='del'>-			NETIF_F_TSO,	  \</div><div class='del'>-	.hw_priv_flags = IFF_UNICAST_FLT, \</div><div class='del'>-	.flow_control = true,		  \</div><div class='del'>-	.mtu = HW_ATL_A0_MTU_JUMBO,       \</div><div class='del'>-	.mac_regs_count = 88,		  \</div><div class='add'>+#define DEFAULT_A0_BOARD_BASIC_CAPABILITIES	     \</div><div class='add'>+	.is_64_dma = true,			     \</div><div class='add'>+	.op64bit = false,			     \</div><div class='add'>+	.msix_irqs = 4U,			     \</div><div class='add'>+	.irq_mask = ~0U,			     \</div><div class='add'>+	.vecs = HW_ATL_A0_RSS_MAX,		     \</div><div class='add'>+	.tcs_max = HW_ATL_A0_TC_MAX,		     \</div><div class='add'>+	.rxd_alignment = 1U,			     \</div><div class='add'>+	.rxd_size = HW_ATL_A0_RXD_SIZE,		     \</div><div class='add'>+	.rxds_max = HW_ATL_A0_MAX_RXD,		     \</div><div class='add'>+	.rxds_min = HW_ATL_A0_MIN_RXD,		     \</div><div class='add'>+	.txd_alignment = 1U,			     \</div><div class='add'>+	.txd_size = HW_ATL_A0_TXD_SIZE,		     \</div><div class='add'>+	.txds_max = HW_ATL_A0_MAX_TXD,		     \</div><div class='add'>+	.txds_min = HW_ATL_A0_MIN_RXD,		     \</div><div class='add'>+	.txhwb_alignment = 4096U,		     \</div><div class='add'>+	.tx_rings = HW_ATL_A0_TX_RINGS,		     \</div><div class='add'>+	.rx_rings = HW_ATL_A0_RX_RINGS,		     \</div><div class='add'>+	.hw_features = NETIF_F_HW_CSUM |	     \</div><div class='add'>+			NETIF_F_RXHASH |	     \</div><div class='add'>+			NETIF_F_RXCSUM |	     \</div><div class='add'>+			NETIF_F_SG |		     \</div><div class='add'>+			NETIF_F_TSO |		     \</div><div class='add'>+			NETIF_F_NTUPLE |	     \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_FILTER, \</div><div class='add'>+	.hw_priv_flags = IFF_UNICAST_FLT,	     \</div><div class='add'>+	.flow_control = true,			     \</div><div class='add'>+	.mtu = HW_ATL_A0_MTU_JUMBO,		     \</div><div class='add'>+	.mac_regs_count = 88,			     \</div><div class='ctx'> 	.hw_alive_check_addr = 0x10U</div><div class='ctx'> </div><div class='ctx'> const struct aq_hw_caps_s hw_atl_a0_caps_aqc100 = {</div><div class='ctx'> 	DEFAULT_A0_BOARD_BASIC_CAPABILITIES,</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_FIBRE,</div><div class='ctx'> 	.link_speed_msk = AQ_NIC_RATE_5G |</div><div class='del'>-			  AQ_NIC_RATE_2GS |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -60,7 +61,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc107 = {</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='ctx'> 	.link_speed_msk = AQ_NIC_RATE_10G |</div><div class='ctx'> 			  AQ_NIC_RATE_5G |</div><div class='del'>-			  AQ_NIC_RATE_2GS |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -69,7 +70,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = {</div><div class='ctx'> 	DEFAULT_A0_BOARD_BASIC_CAPABILITIES,</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='ctx'> 	.link_speed_msk = AQ_NIC_RATE_5G |</div><div class='del'>-			  AQ_NIC_RATE_2GS |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -77,7 +78,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc108 = {</div><div class='ctx'> const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = {</div><div class='ctx'> 	DEFAULT_A0_BOARD_BASIC_CAPABILITIES,</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='del'>-	.link_speed_msk = AQ_NIC_RATE_2GS |</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -122,10 +123,10 @@ err_exit:</div><div class='ctx'> </div><div class='ctx'> static int hw_atl_a0_hw_qos_set(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	u32 tc = 0U;</div><div class='del'>-	u32 buff_size = 0U;</div><div class='del'>-	unsigned int i_priority = 0U;</div><div class='ctx'> 	bool is_rx_flow_control = false;</div><div class='add'>+	unsigned int i_priority = 0U;</div><div class='add'>+	u32 buff_size = 0U;</div><div class='add'>+	u32 tc = 0U;</div><div class='ctx'> </div><div class='ctx'> 	/* TPS Descriptor rate init */</div><div class='ctx'> 	hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set(self, 0x0U);</div><div class='hunk'>@@ -138,10 +139,10 @@ static int hw_atl_a0_hw_qos_set(struct aq_hw_s *self)</div><div class='ctx'> 	hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(self, 0U);</div><div class='ctx'> 	hw_atl_tps_tx_pkt_shed_data_arb_mode_set(self, 0U);</div><div class='ctx'> </div><div class='del'>-	hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, 0xFFF, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, 0x64, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, 0x50, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0x1E, 0U);</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, 0U, 0xFFF);</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, 0U, 0x64);</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, 0U, 0x50);</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0U, 0x1E);</div><div class='ctx'> </div><div class='ctx'> 	/* Tx buf size */</div><div class='ctx'> 	buff_size = HW_ATL_A0_TXBUF_MAX;</div><div class='hunk'>@@ -158,7 +159,7 @@ static int hw_atl_a0_hw_qos_set(struct aq_hw_s *self)</div><div class='ctx'> </div><div class='ctx'> 	/* QoS Rx buf size per TC */</div><div class='ctx'> 	tc = 0;</div><div class='del'>-	is_rx_flow_control = (AQ_NIC_FC_RX &amp; self-&gt;aq_nic_cfg-&gt;flow_control);</div><div class='add'>+	is_rx_flow_control = (AQ_NIC_FC_RX &amp; self-&gt;aq_nic_cfg-&gt;fc.req);</div><div class='ctx'> 	buff_size = HW_ATL_A0_RXBUF_MAX;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, buff_size, tc);</div><div class='hunk'>@@ -183,9 +184,9 @@ static int hw_atl_a0_hw_rss_hash_set(struct aq_hw_s *self,</div><div class='ctx'> 				     struct aq_rss_parameters *rss_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned int i = 0U;</div><div class='ctx'> 	unsigned int addr = 0U;</div><div class='add'>+	unsigned int i = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 10, addr = 0U; i--; ++addr) {</div><div class='hunk'>@@ -210,12 +211,12 @@ err_exit:</div><div class='ctx'> static int hw_atl_a0_hw_rss_set(struct aq_hw_s *self,</div><div class='ctx'> 				struct aq_rss_parameters *rss_params)</div><div class='ctx'> {</div><div class='del'>-	u8 *indirection_table =	rss_params-&gt;indirection_table;</div><div class='del'>-	u32 i = 0U;</div><div class='ctx'> 	u32 num_rss_queues = max(1U, self-&gt;aq_nic_cfg-&gt;num_rss_queues);</div><div class='del'>-	int err = 0;</div><div class='add'>+	u8 *indirection_table =	rss_params-&gt;indirection_table;</div><div class='ctx'> 	u16 bitary[1 + (HW_ATL_A0_RSS_REDIRECTION_MAX *</div><div class='ctx'> 		   HW_ATL_A0_RSS_REDIRECTION_BITS / 16U)];</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 i = 0U;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	memset(bitary, 0, sizeof(bitary));</div><div class='hunk'>@@ -270,8 +271,7 @@ static int hw_atl_a0_hw_init_tx_path(struct aq_hw_s *self)</div><div class='ctx'> 	hw_atl_tdm_tx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='ctx'> </div><div class='ctx'> 	/* misc */</div><div class='del'>-	aq_hw_write_reg(self, 0x00007040U, IS_CHIP_FEATURE(TPO2) ?</div><div class='del'>-			0x00010000U : 0x00000000U);</div><div class='add'>+	aq_hw_write_reg(self, 0x00007040U, 0x00000000U);</div><div class='ctx'> 	hw_atl_tdm_tx_dca_en_set(self, 0U);</div><div class='ctx'> 	hw_atl_tdm_tx_dca_mode_set(self, 0U);</div><div class='ctx'> </div><div class='hunk'>@@ -322,16 +322,17 @@ static int hw_atl_a0_hw_init_rx_path(struct aq_hw_s *self)</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_a0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr)</div><div class='add'>+static int hw_atl_a0_hw_mac_addr_set(struct aq_hw_s *self, const u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	unsigned int h = 0U;</div><div class='ctx'> 	unsigned int l = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!mac_addr) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	h = (mac_addr[0] &lt;&lt; 8) | (mac_addr[1]);</div><div class='ctx'> 	l = (mac_addr[2] &lt;&lt; 24) | (mac_addr[3] &lt;&lt; 16) |</div><div class='ctx'> 	    (mac_addr[4] &lt;&lt; 8) | mac_addr[5];</div><div class='hunk'>@@ -347,18 +348,16 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_a0_hw_init(struct aq_hw_s *self, u8 *mac_addr)</div><div class='add'>+static int hw_atl_a0_hw_init(struct aq_hw_s *self, const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	static u32 aq_hw_atl_igcr_table_[4][2] = {</div><div class='ctx'> 		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },</div><div class='del'>-		[AQ_HW_IRQ_LEGACY]  = { 0x20000080U, 0x20000080U },</div><div class='add'>+		[AQ_HW_IRQ_INTX]    = { 0x20000080U, 0x20000080U },</div><div class='ctx'> 		[AQ_HW_IRQ_MSI]     = { 0x20000021U, 0x20000025U },</div><div class='ctx'> 		[AQ_HW_IRQ_MSIX]    = { 0x20000022U, 0x20000026U },</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='ctx'> 	struct aq_nic_cfg_s *aq_nic_cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_a0_hw_init_tx_path(self);</div><div class='ctx'> 	hw_atl_a0_hw_init_rx_path(self);</div><div class='hunk'>@@ -407,6 +406,7 @@ static int hw_atl_a0_hw_ring_tx_start(struct aq_hw_s *self,</div><div class='ctx'> 				      struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_tdm_tx_desc_en_set(self, 1, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -414,6 +414,7 @@ static int hw_atl_a0_hw_ring_rx_start(struct aq_hw_s *self,</div><div class='ctx'> 				      struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_rdm_rx_desc_en_set(self, 1, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -421,6 +422,7 @@ static int hw_atl_a0_hw_start(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_tpb_tx_buff_en_set(self, 1);</div><div class='ctx'> 	hw_atl_rpb_rx_buff_en_set(self, 1);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -428,6 +430,7 @@ static int hw_atl_a0_hw_tx_ring_tail_update(struct aq_hw_s *self,</div><div class='ctx'> 					    struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_reg_tx_dma_desc_tail_ptr_set(self, ring-&gt;sw_tail, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -438,8 +441,8 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self,</div><div class='ctx'> 	struct aq_ring_buff_s *buff = NULL;</div><div class='ctx'> 	struct hw_atl_txd_s *txd = NULL;</div><div class='ctx'> 	unsigned int buff_pa_len = 0U;</div><div class='del'>-	unsigned int pkt_len = 0U;</div><div class='ctx'> 	unsigned int frag_count = 0U;</div><div class='add'>+	unsigned int pkt_len = 0U;</div><div class='ctx'> 	bool is_gso = false;</div><div class='ctx'> </div><div class='ctx'> 	buff = &amp;ring-&gt;buff_ring[ring-&gt;sw_tail];</div><div class='hunk'>@@ -454,7 +457,7 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 		buff = &amp;ring-&gt;buff_ring[ring-&gt;sw_tail];</div><div class='ctx'> </div><div class='del'>-		if (buff-&gt;is_txc) {</div><div class='add'>+		if (buff-&gt;is_gso_tcp) {</div><div class='ctx'> 			txd-&gt;ctl |= (buff-&gt;len_l3 &lt;&lt; 31) |</div><div class='ctx'> 				(buff-&gt;len_l2 &lt;&lt; 24) |</div><div class='ctx'> 				HW_ATL_A0_TXD_CTL_CMD_TCP |</div><div class='hunk'>@@ -503,6 +506,7 @@ static int hw_atl_a0_hw_ring_tx_xmit(struct aq_hw_s *self,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_a0_hw_tx_ring_tail_update(self, ring);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -510,8 +514,8 @@ static int hw_atl_a0_hw_ring_rx_init(struct aq_hw_s *self,</div><div class='ctx'> 				     struct aq_ring_s *aq_ring,</div><div class='ctx'> 				     struct aq_ring_param_s *aq_ring_param)</div><div class='ctx'> {</div><div class='del'>-	u32 dma_desc_addr_lsw = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> 	u32 dma_desc_addr_msw = (u32)(((u64)aq_ring-&gt;dx_ring_pa) &gt;&gt; 32);</div><div class='add'>+	u32 dma_desc_addr_lsw = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rdm_rx_desc_en_set(self, false, aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='hunk'>@@ -527,7 +531,7 @@ static int hw_atl_a0_hw_ring_rx_init(struct aq_hw_s *self,</div><div class='ctx'> 	hw_atl_rdm_rx_desc_len_set(self, aq_ring-&gt;size / 8U, aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rdm_rx_desc_data_buff_size_set(self,</div><div class='del'>-					      AQ_CFG_RX_FRAME_MAX / 1024U,</div><div class='add'>+					      aq_ring-&gt;frame_max / 1024U,</div><div class='ctx'> 					      aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rdm_rx_desc_head_buff_size_set(self, 0U, aq_ring-&gt;idx);</div><div class='hunk'>@@ -552,8 +556,8 @@ static int hw_atl_a0_hw_ring_tx_init(struct aq_hw_s *self,</div><div class='ctx'> 				     struct aq_ring_s *aq_ring,</div><div class='ctx'> 				     struct aq_ring_param_s *aq_ring_param)</div><div class='ctx'> {</div><div class='del'>-	u32 dma_desc_lsw_addr = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> 	u32 dma_desc_msw_addr = (u32)(((u64)aq_ring-&gt;dx_ring_pa) &gt;&gt; 32);</div><div class='add'>+	u32 dma_desc_lsw_addr = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_reg_tx_dma_desc_base_addresslswset(self, dma_desc_lsw_addr,</div><div class='ctx'> 						  aq_ring-&gt;idx);</div><div class='hunk'>@@ -602,8 +606,8 @@ static int hw_atl_a0_hw_ring_rx_fill(struct aq_hw_s *self,</div><div class='ctx'> static int hw_atl_a0_hw_ring_tx_head_update(struct aq_hw_s *self,</div><div class='ctx'> 					    struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	unsigned int hw_head = hw_atl_tdm_tx_desc_head_ptr_get(self, ring-&gt;idx);</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (aq_utils_obj_test(&amp;self-&gt;flags, AQ_HW_FLAG_ERR_UNPLUG)) {</div><div class='ctx'> 		err = -ENXIO;</div><div class='hunk'>@@ -702,9 +706,9 @@ static int hw_atl_a0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 			if (HW_ATL_A0_RXD_WB_STAT2_EOP &amp; rxd_wb-&gt;status) {</div><div class='ctx'> 				buff-&gt;len = rxd_wb-&gt;pkt_len %</div><div class='del'>-					AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+					    ring-&gt;frame_max;</div><div class='ctx'> 				buff-&gt;len = buff-&gt;len ?</div><div class='del'>-					buff-&gt;len : AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+					buff-&gt;len : ring-&gt;frame_max;</div><div class='ctx'> 				buff-&gt;next = 0U;</div><div class='ctx'> 				buff-&gt;is_eop = 1U;</div><div class='ctx'> 			} else {</div><div class='hunk'>@@ -723,6 +727,7 @@ static int hw_atl_a0_hw_irq_enable(struct aq_hw_s *self, u64 mask)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_itr_irq_msk_setlsw_set(self, LODWORD(mask) |</div><div class='ctx'> 			       (1U &lt;&lt; HW_ATL_A0_ERR_INT));</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -740,6 +745,7 @@ static int hw_atl_a0_hw_irq_disable(struct aq_hw_s *self, u64 mask)</div><div class='ctx'> static int hw_atl_a0_hw_irq_read(struct aq_hw_s *self, u64 *mask)</div><div class='ctx'> {</div><div class='ctx'> 	*mask = hw_atl_itr_irq_statuslsw_get(self);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -748,6 +754,7 @@ static int hw_atl_a0_hw_irq_read(struct aq_hw_s *self, u64 *mask)</div><div class='ctx'> static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,</div><div class='ctx'> 					  unsigned int packet_filter)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rpfl2promiscuous_mode_en_set(self,</div><div class='hunk'>@@ -756,14 +763,13 @@ static int hw_atl_a0_hw_packet_filter_set(struct aq_hw_s *self,</div><div class='ctx'> 					 IS_FILTER_ENABLED(IFF_MULTICAST), 0);</div><div class='ctx'> 	hw_atl_rpfl2broadcast_en_set(self, IS_FILTER_ENABLED(IFF_BROADCAST));</div><div class='ctx'> </div><div class='del'>-	self-&gt;aq_nic_cfg-&gt;is_mc_list_enabled =</div><div class='del'>-			IS_FILTER_ENABLED(IFF_MULTICAST);</div><div class='add'>+	cfg-&gt;is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST);</div><div class='ctx'> </div><div class='ctx'> 	for (i = HW_ATL_A0_MAC_MIN; i &lt; HW_ATL_A0_MAC_MAX; ++i)</div><div class='ctx'> 		hw_atl_rpfl2_uc_flr_en_set(self,</div><div class='del'>-					   (self-&gt;aq_nic_cfg-&gt;is_mc_list_enabled &amp;&amp;</div><div class='del'>-					   (i &lt;= self-&gt;aq_nic_cfg-&gt;mc_list_count)) ?</div><div class='del'>-					   1U : 0U, i);</div><div class='add'>+					   (cfg-&gt;is_mc_list_enabled &amp;&amp;</div><div class='add'>+					    (i &lt;= cfg-&gt;mc_list_count)) ? 1U : 0U,</div><div class='add'>+					   i);</div><div class='ctx'> </div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='hunk'>@@ -776,19 +782,18 @@ static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self,</div><div class='ctx'> 					   [ETH_ALEN],</div><div class='ctx'> 					   u32 count)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; (HW_ATL_A0_MAC_MAX - HW_ATL_A0_MAC_MIN)) {</div><div class='del'>-		err = EBADRQC;</div><div class='add'>+		err = -EBADRQC;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='del'>-	for (self-&gt;aq_nic_cfg-&gt;mc_list_count = 0U;</div><div class='del'>-			self-&gt;aq_nic_cfg-&gt;mc_list_count &lt; count;</div><div class='del'>-			++self-&gt;aq_nic_cfg-&gt;mc_list_count) {</div><div class='del'>-		u32 i = self-&gt;aq_nic_cfg-&gt;mc_list_count;</div><div class='add'>+	for (cfg-&gt;mc_list_count = 0U; cfg-&gt;mc_list_count &lt; count; ++cfg-&gt;mc_list_count) {</div><div class='add'>+		u32 i = cfg-&gt;mc_list_count;</div><div class='ctx'> 		u32 h = (ar_mac[i][0] &lt;&lt; 8) | (ar_mac[i][1]);</div><div class='ctx'> 		u32 l = (ar_mac[i][2] &lt;&lt; 24) | (ar_mac[i][3] &lt;&lt; 16) |</div><div class='del'>-					(ar_mac[i][4] &lt;&lt; 8) | ar_mac[i][5];</div><div class='add'>+			(ar_mac[i][4] &lt;&lt; 8) | ar_mac[i][5];</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpfl2_uc_flr_en_set(self, 0U, HW_ATL_A0_MAC_MIN + i);</div><div class='ctx'> </div><div class='hunk'>@@ -801,7 +806,7 @@ static int hw_atl_a0_hw_multicast_list_set(struct aq_hw_s *self,</div><div class='ctx'> 							HW_ATL_A0_MAC_MIN + i);</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpfl2_uc_flr_en_set(self,</div><div class='del'>-					   (self-&gt;aq_nic_cfg-&gt;is_mc_list_enabled),</div><div class='add'>+					   (cfg-&gt;is_mc_list_enabled),</div><div class='ctx'> 					   HW_ATL_A0_MAC_MIN + i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -862,6 +867,7 @@ static int hw_atl_a0_hw_interrupt_moderation_set(struct aq_hw_s *self)</div><div class='ctx'> static int hw_atl_a0_hw_stop(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_a0_hw_irq_disable(self, HW_ATL_A0_INT_MASK);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -869,6 +875,7 @@ static int hw_atl_a0_hw_ring_tx_stop(struct aq_hw_s *self,</div><div class='ctx'> 				     struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_tdm_tx_desc_en_set(self, 0U, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -876,10 +883,70 @@ static int hw_atl_a0_hw_ring_rx_stop(struct aq_hw_s *self,</div><div class='ctx'> 				     struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_rdm_rx_desc_en_set(self, 0U, ring-&gt;idx);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_a0_hw_fl3l4_clear(struct aq_hw_s *self,</div><div class='add'>+				    struct aq_rx_filter_l3l4 *data)</div><div class='add'>+{</div><div class='add'>+	u8 location = data-&gt;location;</div><div class='add'>+</div><div class='add'>+	if (!data-&gt;is_ipv6) {</div><div class='add'>+		hw_atl_rpfl3l4_cmd_clear(self, location);</div><div class='add'>+		hw_atl_rpf_l4_spd_set(self, 0U, location);</div><div class='add'>+		hw_atl_rpf_l4_dpd_set(self, 0U, location);</div><div class='add'>+		hw_atl_rpfl3l4_ipv4_src_addr_clear(self, location);</div><div class='add'>+		hw_atl_rpfl3l4_ipv4_dest_addr_clear(self, location);</div><div class='add'>+	} else {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; HW_ATL_RX_CNT_REG_ADDR_IPV6; ++i) {</div><div class='add'>+			hw_atl_rpfl3l4_cmd_clear(self, location + i);</div><div class='add'>+			hw_atl_rpf_l4_spd_set(self, 0U, location + i);</div><div class='add'>+			hw_atl_rpf_l4_dpd_set(self, 0U, location + i);</div><div class='add'>+		}</div><div class='add'>+		hw_atl_rpfl3l4_ipv6_src_addr_clear(self, location);</div><div class='add'>+		hw_atl_rpfl3l4_ipv6_dest_addr_clear(self, location);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_a0_hw_fl3l4_set(struct aq_hw_s *self,</div><div class='add'>+				  struct aq_rx_filter_l3l4 *data)</div><div class='add'>+{</div><div class='add'>+	u8 location = data-&gt;location;</div><div class='add'>+</div><div class='add'>+	hw_atl_a0_hw_fl3l4_clear(self, data);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;cmd) {</div><div class='add'>+		if (!data-&gt;is_ipv6) {</div><div class='add'>+			hw_atl_rpfl3l4_ipv4_dest_addr_set(self,</div><div class='add'>+							  location,</div><div class='add'>+							  data-&gt;ip_dst[0]);</div><div class='add'>+			hw_atl_rpfl3l4_ipv4_src_addr_set(self,</div><div class='add'>+							 location,</div><div class='add'>+							 data-&gt;ip_src[0]);</div><div class='add'>+		} else {</div><div class='add'>+			hw_atl_rpfl3l4_ipv6_dest_addr_set(self,</div><div class='add'>+							  location,</div><div class='add'>+							  data-&gt;ip_dst);</div><div class='add'>+			hw_atl_rpfl3l4_ipv6_src_addr_set(self,</div><div class='add'>+							 location,</div><div class='add'>+							 data-&gt;ip_src);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hw_atl_rpf_l4_dpd_set(self, data-&gt;p_dst, location);</div><div class='add'>+	hw_atl_rpf_l4_spd_set(self, data-&gt;p_src, location);</div><div class='add'>+	hw_atl_rpfl3l4_cmd_set(self, location, data-&gt;cmd);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct aq_hw_ops hw_atl_ops_a0 = {</div><div class='add'>+	.hw_soft_reset        = hw_atl_utils_soft_reset,</div><div class='add'>+	.hw_prepare           = hw_atl_utils_initfw,</div><div class='ctx'> 	.hw_set_mac_address   = hw_atl_a0_hw_mac_addr_set,</div><div class='ctx'> 	.hw_init              = hw_atl_a0_hw_init,</div><div class='ctx'> 	.hw_reset             = hw_atl_a0_hw_reset,</div><div class='hunk'>@@ -903,6 +970,7 @@ const struct aq_hw_ops hw_atl_ops_a0 = {</div><div class='ctx'> 	.hw_ring_rx_init             = hw_atl_a0_hw_ring_rx_init,</div><div class='ctx'> 	.hw_ring_tx_init             = hw_atl_a0_hw_ring_tx_init,</div><div class='ctx'> 	.hw_packet_filter_set        = hw_atl_a0_hw_packet_filter_set,</div><div class='add'>+	.hw_filter_l3l4_set          = hw_atl_a0_hw_fl3l4_set,</div><div class='ctx'> 	.hw_multicast_list_set       = hw_atl_a0_hw_multicast_list_set,</div><div class='ctx'> 	.hw_interrupt_moderation_set = hw_atl_a0_hw_interrupt_moderation_set,</div><div class='ctx'> 	.hw_rss_set                  = hw_atl_a0_hw_rss_set,</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h<br/>index 25fe954def03..1a294ad4d17d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='ctx'>  * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_a0.h: Declaration of abstract interface for Atlantic hardware</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h<br/>index a021dc431ef7..1b9b2e5601ed 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='ctx'>  * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_a0_internal.h: Definition of Atlantic A0 chip specific</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c<br/>index 5c3065bdfddf..c7895bfb2ecf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_b0.c: Definition of Atlantic hardware specific functions. */</div><div class='hunk'>@@ -13,6 +11,7 @@</div><div class='ctx'> #include "../aq_hw_utils.h"</div><div class='ctx'> #include "../aq_ring.h"</div><div class='ctx'> #include "../aq_nic.h"</div><div class='add'>+#include "../aq_phy.h"</div><div class='ctx'> #include "hw_atl_b0.h"</div><div class='ctx'> #include "hw_atl_utils.h"</div><div class='ctx'> #include "hw_atl_llh.h"</div><div class='hunk'>@@ -21,10 +20,11 @@</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_B0_BOARD_BASIC_CAPABILITIES \</div><div class='ctx'> 	.is_64_dma = true,		  \</div><div class='add'>+	.op64bit = false,		  \</div><div class='ctx'> 	.msix_irqs = 8U,		  \</div><div class='ctx'> 	.irq_mask = ~0U,		  \</div><div class='ctx'> 	.vecs = HW_ATL_B0_RSS_MAX,	  \</div><div class='del'>-	.tcs = HW_ATL_B0_TC_MAX,	  \</div><div class='add'>+	.tcs_max = HW_ATL_B0_TC_MAX,	  \</div><div class='ctx'> 	.rxd_alignment = 1U,		  \</div><div class='ctx'> 	.rxd_size = HW_ATL_B0_RXD_SIZE,   \</div><div class='ctx'> 	.rxds_max = HW_ATL_B0_MAX_RXD,    \</div><div class='hunk'>@@ -41,9 +41,15 @@</div><div class='ctx'> 			NETIF_F_RXHASH |  \</div><div class='ctx'> 			NETIF_F_SG |      \</div><div class='ctx'> 			NETIF_F_TSO |     \</div><div class='add'>+			NETIF_F_TSO6 |    \</div><div class='ctx'> 			NETIF_F_LRO |     \</div><div class='ctx'> 			NETIF_F_NTUPLE |  \</div><div class='del'>-			NETIF_F_HW_VLAN_CTAG_FILTER, \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_FILTER | \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_RX |     \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_TX |     \</div><div class='add'>+			NETIF_F_GSO_UDP_L4      |     \</div><div class='add'>+			NETIF_F_GSO_PARTIAL |         \</div><div class='add'>+			NETIF_F_HW_TC,                \</div><div class='ctx'> 	.hw_priv_flags = IFF_UNICAST_FLT, \</div><div class='ctx'> 	.flow_control = true,		  \</div><div class='ctx'> 	.mtu = HW_ATL_B0_MTU_JUMBO,	  \</div><div class='hunk'>@@ -55,7 +61,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc100 = {</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_FIBRE,</div><div class='ctx'> 	.link_speed_msk = AQ_NIC_RATE_10G |</div><div class='ctx'> 			  AQ_NIC_RATE_5G |</div><div class='del'>-			  AQ_NIC_RATE_2GS |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -65,7 +71,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc107 = {</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='ctx'> 	.link_speed_msk = AQ_NIC_RATE_10G |</div><div class='ctx'> 			  AQ_NIC_RATE_5G |</div><div class='del'>-			  AQ_NIC_RATE_2GS |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -74,7 +80,7 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {</div><div class='ctx'> 	DEFAULT_B0_BOARD_BASIC_CAPABILITIES,</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='ctx'> 	.link_speed_msk = AQ_NIC_RATE_5G |</div><div class='del'>-			  AQ_NIC_RATE_2GS |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='ctx'> };</div><div class='hunk'>@@ -82,9 +88,28 @@ const struct aq_hw_caps_s hw_atl_b0_caps_aqc108 = {</div><div class='ctx'> const struct aq_hw_caps_s hw_atl_b0_caps_aqc109 = {</div><div class='ctx'> 	DEFAULT_B0_BOARD_BASIC_CAPABILITIES,</div><div class='ctx'> 	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='del'>-	.link_speed_msk = AQ_NIC_RATE_2GS |</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_2G5 |</div><div class='add'>+			  AQ_NIC_RATE_1G |</div><div class='add'>+			  AQ_NIC_RATE_100M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct aq_hw_caps_s hw_atl_b0_caps_aqc111 = {</div><div class='add'>+	DEFAULT_B0_BOARD_BASIC_CAPABILITIES,</div><div class='add'>+	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_5G |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='ctx'> 			  AQ_NIC_RATE_1G |</div><div class='ctx'> 			  AQ_NIC_RATE_100M,</div><div class='add'>+	.quirks = AQ_NIC_QUIRK_BAD_PTP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct aq_hw_caps_s hw_atl_b0_caps_aqc112 = {</div><div class='add'>+	DEFAULT_B0_BOARD_BASIC_CAPABILITIES,</div><div class='add'>+	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_2G5 |</div><div class='add'>+			  AQ_NIC_RATE_1G  |</div><div class='add'>+			  AQ_NIC_RATE_100M,</div><div class='add'>+	.quirks = AQ_NIC_QUIRK_BAD_PTP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int hw_atl_b0_hw_reset(struct aq_hw_s *self)</div><div class='hunk'>@@ -102,17 +127,40 @@ static int hw_atl_b0_hw_reset(struct aq_hw_s *self)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc)</div><div class='add'>+int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_rpb_rx_xoff_en_per_tc_set(self, !!(fc &amp; AQ_NIC_FC_RX), tc);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int hw_atl_b0_tc_ptp_set(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	/* Init TC2 for PTP_TX */</div><div class='add'>+	hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, HW_ATL_B0_PTP_TXBUF_SIZE,</div><div class='add'>+					       AQ_HW_PTP_TC);</div><div class='add'>+</div><div class='add'>+	/* Init TC2 for PTP_RX */</div><div class='add'>+	hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, HW_ATL_B0_PTP_RXBUF_SIZE,</div><div class='add'>+					       AQ_HW_PTP_TC);</div><div class='add'>+	/* No flow control for PTP */</div><div class='add'>+	hw_atl_rpb_rx_xoff_en_per_tc_set(self, 0U, AQ_HW_PTP_TC);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	u32 tx_buff_size = HW_ATL_B0_TXBUF_MAX;</div><div class='add'>+	u32 rx_buff_size = HW_ATL_B0_RXBUF_MAX;</div><div class='add'>+	unsigned int prio = 0U;</div><div class='ctx'> 	u32 tc = 0U;</div><div class='del'>-	u32 buff_size = 0U;</div><div class='del'>-	unsigned int i_priority = 0U;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;is_ptp) {</div><div class='add'>+		tx_buff_size -= HW_ATL_B0_PTP_TXBUF_SIZE;</div><div class='add'>+		rx_buff_size -= HW_ATL_B0_PTP_RXBUF_SIZE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* TPS Descriptor rate init */</div><div class='ctx'> 	hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set(self, 0x0U);</div><div class='hunk'>@@ -121,58 +169,50 @@ static int hw_atl_b0_hw_qos_set(struct aq_hw_s *self)</div><div class='ctx'> 	/* TPS VM init */</div><div class='ctx'> 	hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(self, 0U);</div><div class='ctx'> </div><div class='del'>-	/* TPS TC credits init */</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(self, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_data_arb_mode_set(self, 0U);</div><div class='del'>-</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, 0xFFF, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, 0x64, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, 0x50, 0U);</div><div class='del'>-	hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, 0x1E, 0U);</div><div class='del'>-</div><div class='del'>-	/* Tx buf size */</div><div class='del'>-	buff_size = HW_ATL_B0_TXBUF_MAX;</div><div class='del'>-</div><div class='del'>-	hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, buff_size, tc);</div><div class='del'>-	hw_atl_tpb_tx_buff_hi_threshold_per_tc_set(self,</div><div class='del'>-						   (buff_size *</div><div class='del'>-						   (1024 / 32U) * 66U) /</div><div class='del'>-						   100U, tc);</div><div class='del'>-	hw_atl_tpb_tx_buff_lo_threshold_per_tc_set(self,</div><div class='del'>-						   (buff_size *</div><div class='del'>-						   (1024 / 32U) * 50U) /</div><div class='del'>-						   100U, tc);</div><div class='del'>-</div><div class='del'>-	/* QoS Rx buf size per TC */</div><div class='del'>-	tc = 0;</div><div class='del'>-	buff_size = HW_ATL_B0_RXBUF_MAX;</div><div class='del'>-</div><div class='del'>-	hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, buff_size, tc);</div><div class='del'>-	hw_atl_rpb_rx_buff_hi_threshold_per_tc_set(self,</div><div class='del'>-						   (buff_size *</div><div class='del'>-						   (1024U / 32U) * 66U) /</div><div class='del'>-						   100U, tc);</div><div class='del'>-	hw_atl_rpb_rx_buff_lo_threshold_per_tc_set(self,</div><div class='del'>-						   (buff_size *</div><div class='del'>-						   (1024U / 32U) * 50U) /</div><div class='del'>-						   100U, tc);</div><div class='del'>-</div><div class='del'>-	hw_atl_b0_set_fc(self, self-&gt;aq_nic_cfg-&gt;flow_control, tc);</div><div class='add'>+	tx_buff_size /= cfg-&gt;tcs;</div><div class='add'>+	rx_buff_size /= cfg-&gt;tcs;</div><div class='add'>+	for (tc = 0; tc &lt; cfg-&gt;tcs; tc++) {</div><div class='add'>+		u32 threshold = 0U;</div><div class='add'>+</div><div class='add'>+		/* Tx buf size TC0 */</div><div class='add'>+		hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, tx_buff_size, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (tx_buff_size * (1024 / 32U) * 66U) / 100U;</div><div class='add'>+		hw_atl_tpb_tx_buff_hi_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (tx_buff_size * (1024 / 32U) * 50U) / 100U;</div><div class='add'>+		hw_atl_tpb_tx_buff_lo_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		/* QoS Rx buf size per TC */</div><div class='add'>+		hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, rx_buff_size, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (rx_buff_size * (1024U / 32U) * 66U) / 100U;</div><div class='add'>+		hw_atl_rpb_rx_buff_hi_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (rx_buff_size * (1024U / 32U) * 50U) / 100U;</div><div class='add'>+		hw_atl_rpb_rx_buff_lo_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		hw_atl_b0_set_fc(self, self-&gt;aq_nic_cfg-&gt;fc.req, tc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;is_ptp)</div><div class='add'>+		hw_atl_b0_tc_ptp_set(self);</div><div class='ctx'> </div><div class='ctx'> 	/* QoS 802.1p priority -&gt; TC mapping */</div><div class='del'>-	for (i_priority = 8U; i_priority--;)</div><div class='del'>-		hw_atl_rpf_rpb_user_priority_tc_map_set(self, i_priority, 0U);</div><div class='add'>+	for (prio = 0; prio &lt; 8; ++prio)</div><div class='add'>+		hw_atl_rpf_rpb_user_priority_tc_map_set(self, prio,</div><div class='add'>+							cfg-&gt;prio_tc_map[prio]);</div><div class='ctx'> </div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_rss_parameters *rss_params)</div><div class='add'>+int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,</div><div class='add'>+			      struct aq_rss_parameters *rss_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='del'>-	int err = 0;</div><div class='del'>-	unsigned int i = 0U;</div><div class='ctx'> 	unsigned int addr = 0U;</div><div class='add'>+	unsigned int i = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 10, addr = 0U; i--; ++addr) {</div><div class='hunk'>@@ -197,12 +237,12 @@ err_exit:</div><div class='ctx'> static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self,</div><div class='ctx'> 				struct aq_rss_parameters *rss_params)</div><div class='ctx'> {</div><div class='del'>-	u8 *indirection_table =	rss_params-&gt;indirection_table;</div><div class='del'>-	u32 i = 0U;</div><div class='ctx'> 	u32 num_rss_queues = max(1U, self-&gt;aq_nic_cfg-&gt;num_rss_queues);</div><div class='del'>-	int err = 0;</div><div class='add'>+	u8 *indirection_table =	rss_params-&gt;indirection_table;</div><div class='ctx'> 	u16 bitary[1 + (HW_ATL_B0_RSS_REDIRECTION_MAX *</div><div class='ctx'> 		   HW_ATL_B0_RSS_REDIRECTION_BITS / 16U)];</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 i = 0U;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	memset(bitary, 0, sizeof(bitary));</div><div class='hunk'>@@ -230,9 +270,10 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='del'>-				    struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='add'>+int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='add'>+			     struct aq_nic_cfg_s *aq_nic_cfg)</div><div class='ctx'> {</div><div class='add'>+	u64 rxcsum = !!(aq_nic_cfg-&gt;features &amp; NETIF_F_RXCSUM);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	/* TX checksums offloads*/</div><div class='hunk'>@@ -240,15 +281,16 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='ctx'> 	hw_atl_tpo_tcp_udp_crc_offload_en_set(self, 1);</div><div class='ctx'> </div><div class='ctx'> 	/* RX checksums offloads*/</div><div class='del'>-	hw_atl_rpo_ipv4header_crc_offload_en_set(self, !!(aq_nic_cfg-&gt;features &amp;</div><div class='del'>-						 NETIF_F_RXCSUM));</div><div class='del'>-	hw_atl_rpo_tcp_udp_crc_offload_en_set(self, !!(aq_nic_cfg-&gt;features &amp;</div><div class='del'>-					      NETIF_F_RXCSUM));</div><div class='add'>+	hw_atl_rpo_ipv4header_crc_offload_en_set(self, rxcsum);</div><div class='add'>+	hw_atl_rpo_tcp_udp_crc_offload_en_set(self, rxcsum);</div><div class='ctx'> </div><div class='ctx'> 	/* LSO offloads*/</div><div class='ctx'> 	hw_atl_tdm_large_send_offload_en_set(self, 0xFFFFFFFFU);</div><div class='ctx'> </div><div class='del'>-/* LRO offloads */</div><div class='add'>+	/* Outer VLAN tag offload */</div><div class='add'>+	hw_atl_rpo_outer_vlan_tag_mode_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	/* LRO offloads */</div><div class='ctx'> 	{</div><div class='ctx'> 		unsigned int val = (8U &lt; HW_ATL_B0_LRO_RXD_MAX) ? 0x3U :</div><div class='ctx'> 			((4U &lt; HW_ATL_B0_LRO_RXD_MAX) ? 0x2U :</div><div class='hunk'>@@ -283,13 +325,133 @@ static int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_itr_rsc_delay_set(self, 1U);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_hw_init_tx_tc_rate_limit(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	static const u32 max_weight = BIT(HW_ATL_TPS_DATA_TCTWEIGHT_WIDTH) - 1;</div><div class='add'>+	/* Scale factor is based on the number of bits in fractional portion */</div><div class='add'>+	static const u32 scale = BIT(HW_ATL_TPS_DESC_RATE_Y_WIDTH);</div><div class='add'>+	static const u32 frac_msk = HW_ATL_TPS_DESC_RATE_Y_MSK &gt;&gt;</div><div class='add'>+				    HW_ATL_TPS_DESC_RATE_Y_SHIFT;</div><div class='add'>+	const u32 link_speed = self-&gt;aq_link_status.mbps;</div><div class='add'>+	struct aq_nic_cfg_s *nic_cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	unsigned long num_min_rated_tcs = 0;</div><div class='add'>+	u32 tc_weight[AQ_CFG_TCS_MAX];</div><div class='add'>+	u32 fixed_max_credit;</div><div class='add'>+	u8 min_rate_msk = 0;</div><div class='add'>+	u32 sum_weight = 0;</div><div class='add'>+	int tc;</div><div class='add'>+</div><div class='add'>+	/* By default max_credit is based upon MTU (in unit of 64b) */</div><div class='add'>+	fixed_max_credit = nic_cfg-&gt;aq_hw_caps-&gt;mtu / 64;</div><div class='add'>+</div><div class='add'>+	if (link_speed) {</div><div class='add'>+		min_rate_msk = nic_cfg-&gt;tc_min_rate_msk &amp;</div><div class='add'>+			       (BIT(nic_cfg-&gt;tcs) - 1);</div><div class='add'>+		num_min_rated_tcs = hweight8(min_rate_msk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First, calculate weights where min_rate is specified */</div><div class='add'>+	if (num_min_rated_tcs) {</div><div class='add'>+		for (tc = 0; tc != nic_cfg-&gt;tcs; tc++) {</div><div class='add'>+			if (!nic_cfg-&gt;tc_min_rate[tc]) {</div><div class='add'>+				tc_weight[tc] = 0;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tc_weight[tc] = (-1L + link_speed +</div><div class='add'>+					 nic_cfg-&gt;tc_min_rate[tc] *</div><div class='add'>+					 max_weight) /</div><div class='add'>+					link_speed;</div><div class='add'>+			tc_weight[tc] = min(tc_weight[tc], max_weight);</div><div class='add'>+			sum_weight += tc_weight[tc];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* WSP, if min_rate is set for at least one TC.</div><div class='add'>+	 * RR otherwise.</div><div class='add'>+	 *</div><div class='add'>+	 * NB! MAC FW sets arb mode itself if PTP is enabled. We shouldn't</div><div class='add'>+	 * overwrite it here in that case.</div><div class='add'>+	 */</div><div class='add'>+	if (!nic_cfg-&gt;is_ptp)</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_data_arb_mode_set(self, min_rate_msk ? 1U : 0U);</div><div class='add'>+</div><div class='add'>+	/* Data TC Arbiter takes precedence over Descriptor TC Arbiter,</div><div class='add'>+	 * leave Descriptor TC Arbiter as RR.</div><div class='add'>+	 */</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(self, 0U);</div><div class='add'>+</div><div class='add'>+	hw_atl_tps_tx_desc_rate_mode_set(self, nic_cfg-&gt;is_qos ? 1U : 0U);</div><div class='add'>+</div><div class='add'>+	for (tc = 0; tc != nic_cfg-&gt;tcs; tc++) {</div><div class='add'>+		const u32 en = (nic_cfg-&gt;tc_max_rate[tc] != 0) ? 1U : 0U;</div><div class='add'>+		const u32 desc = AQ_NIC_CFG_TCVEC2RING(nic_cfg, tc, 0);</div><div class='add'>+		u32 weight, max_credit;</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, tc,</div><div class='add'>+							      fixed_max_credit);</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, tc, 0x1E);</div><div class='add'>+</div><div class='add'>+		if (num_min_rated_tcs) {</div><div class='add'>+			weight = tc_weight[tc];</div><div class='add'>+</div><div class='add'>+			if (!weight &amp;&amp; sum_weight &lt; max_weight)</div><div class='add'>+				weight = (max_weight - sum_weight) /</div><div class='add'>+					 (nic_cfg-&gt;tcs - num_min_rated_tcs);</div><div class='add'>+			else if (!weight)</div><div class='add'>+				weight = 0x64;</div><div class='add'>+</div><div class='add'>+			max_credit = max(8 * weight, fixed_max_credit);</div><div class='add'>+		} else {</div><div class='add'>+			weight = 0x64;</div><div class='add'>+			max_credit = 0xFFF;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_tc_data_weight_set(self, tc, weight);</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(self, tc,</div><div class='add'>+							      max_credit);</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_desc_rate_en_set(self, desc, en);</div><div class='add'>+</div><div class='add'>+		if (en) {</div><div class='add'>+			/* Nominal rate is always 10G */</div><div class='add'>+			const u32 rate = 10000U * scale /</div><div class='add'>+					 nic_cfg-&gt;tc_max_rate[tc];</div><div class='add'>+			const u32 rate_int = rate &gt;&gt;</div><div class='add'>+					     HW_ATL_TPS_DESC_RATE_Y_WIDTH;</div><div class='add'>+			const u32 rate_frac = rate &amp; frac_msk;</div><div class='add'>+</div><div class='add'>+			hw_atl_tps_tx_desc_rate_x_set(self, desc, rate_int);</div><div class='add'>+			hw_atl_tps_tx_desc_rate_y_set(self, desc, rate_frac);</div><div class='add'>+		} else {</div><div class='add'>+			/* A value of 1 indicates the queue is not</div><div class='add'>+			 * rate controlled.</div><div class='add'>+			 */</div><div class='add'>+			hw_atl_tps_tx_desc_rate_x_set(self, desc, 1U);</div><div class='add'>+			hw_atl_tps_tx_desc_rate_y_set(self, desc, 0U);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (tc = nic_cfg-&gt;tcs; tc != AQ_CFG_TCS_MAX; tc++) {</div><div class='add'>+		const u32 desc = AQ_NIC_CFG_TCVEC2RING(nic_cfg, tc, 0);</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_desc_rate_en_set(self, desc, 0U);</div><div class='add'>+		hw_atl_tps_tx_desc_rate_x_set(self, desc, 1U);</div><div class='add'>+		hw_atl_tps_tx_desc_rate_y_set(self, desc, 0U);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hw_atl_b0_hw_init_tx_path(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *nic_cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='ctx'> 	/* Tx TC/Queue number config */</div><div class='del'>-	hw_atl_rpb_tps_tx_tc_mode_set(self, 1U);</div><div class='add'>+	hw_atl_tpb_tps_tx_tc_mode_set(self, nic_cfg-&gt;tc_mode);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_thm_lso_tcp_flag_of_first_pkt_set(self, 0x0FF6U);</div><div class='ctx'> 	hw_atl_thm_lso_tcp_flag_of_middle_pkt_set(self, 0x0FF6U);</div><div class='hunk'>@@ -299,7 +461,7 @@ static int hw_atl_b0_hw_init_tx_path(struct aq_hw_s *self)</div><div class='ctx'> 	hw_atl_tdm_tx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='ctx'> </div><div class='ctx'> 	/* misc */</div><div class='del'>-	aq_hw_write_reg(self, 0x00007040U, IS_CHIP_FEATURE(TPO2) ?</div><div class='add'>+	aq_hw_write_reg(self, 0x00007040U, ATL_HW_IS_CHIP_FEATURE(self, TPO2) ?</div><div class='ctx'> 			0x00010000U : 0x00000000U);</div><div class='ctx'> 	hw_atl_tdm_tx_dca_en_set(self, 0U);</div><div class='ctx'> 	hw_atl_tdm_tx_dca_mode_set(self, 0U);</div><div class='hunk'>@@ -309,20 +471,32 @@ static int hw_atl_b0_hw_init_tx_path(struct aq_hw_s *self)</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hw_atl_b0_hw_init_rx_rss_ctrl1(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	u32 rss_ctrl1 = HW_ATL_RSS_DISABLED;</div><div class='add'>+</div><div class='add'>+	if (cfg-&gt;is_rss)</div><div class='add'>+		rss_ctrl1 = (cfg-&gt;tc_mode == AQ_TC_MODE_8TCS) ?</div><div class='add'>+			    HW_ATL_RSS_ENABLED_8TCS_2INDEX_BITS :</div><div class='add'>+			    HW_ATL_RSS_ENABLED_4TCS_3INDEX_BITS;</div><div class='add'>+</div><div class='add'>+	hw_atl_reg_rx_flr_rss_control1set(self, rss_ctrl1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_atl_b0_hw_init_rx_path(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Rx TC/RSS number config */</div><div class='del'>-	hw_atl_rpb_rpf_rx_traf_class_mode_set(self, 1U);</div><div class='add'>+	hw_atl_rpb_rpf_rx_traf_class_mode_set(self, cfg-&gt;tc_mode);</div><div class='ctx'> </div><div class='ctx'> 	/* Rx flow control */</div><div class='ctx'> 	hw_atl_rpb_rx_flow_ctl_mode_set(self, 1U);</div><div class='ctx'> </div><div class='ctx'> 	/* RSS Ring selection */</div><div class='del'>-	hw_atl_reg_rx_flr_rss_control1set(self, cfg-&gt;is_rss ?</div><div class='del'>-					0xB3333333U : 0x00000000U);</div><div class='add'>+	hw_atl_b0_hw_init_rx_rss_ctrl1(self);</div><div class='ctx'> </div><div class='ctx'> 	/* Multicast filters */</div><div class='ctx'> 	for (i = HW_ATL_B0_MAC_MAX; i--;) {</div><div class='hunk'>@@ -347,8 +521,8 @@ static int hw_atl_b0_hw_init_rx_path(struct aq_hw_s *self)</div><div class='ctx'> 	hw_atl_rdm_rx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='ctx'> </div><div class='ctx'> 	/* misc */</div><div class='del'>-	aq_hw_write_reg(self, 0x00005040U,</div><div class='del'>-			IS_CHIP_FEATURE(RPF2) ? 0x000F0000U : 0x00000000U);</div><div class='add'>+	aq_hw_write_reg(self, 0x00005040U, ATL_HW_IS_CHIP_FEATURE(self, RPF2) ?</div><div class='add'>+			0x000F0000U : 0x00000000U);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rpfl2broadcast_flr_act_set(self, 1U);</div><div class='ctx'> 	hw_atl_rpfl2broadcast_count_threshold_set(self, 0xFFFFU &amp; (~0U / 256U));</div><div class='hunk'>@@ -359,11 +533,11 @@ static int hw_atl_b0_hw_init_rx_path(struct aq_hw_s *self)</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_mac_addr_set(struct aq_hw_s *self, u8 *mac_addr)</div><div class='add'>+int hw_atl_b0_hw_mac_addr_set(struct aq_hw_s *self, const u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	unsigned int h = 0U;</div><div class='ctx'> 	unsigned int l = 0U;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!mac_addr) {</div><div class='ctx'> 		err = -EINVAL;</div><div class='hunk'>@@ -384,19 +558,18 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_init(struct aq_hw_s *self, u8 *mac_addr)</div><div class='add'>+static int hw_atl_b0_hw_init(struct aq_hw_s *self, const u8 *mac_addr)</div><div class='ctx'> {</div><div class='ctx'> 	static u32 aq_hw_atl_igcr_table_[4][2] = {</div><div class='ctx'> 		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },</div><div class='del'>-		[AQ_HW_IRQ_LEGACY]  = { 0x20000080U, 0x20000080U },</div><div class='add'>+		[AQ_HW_IRQ_INTX]    = { 0x20000080U, 0x20000080U },</div><div class='ctx'> 		[AQ_HW_IRQ_MSI]     = { 0x20000021U, 0x20000025U },</div><div class='ctx'> 		[AQ_HW_IRQ_MSIX]    = { 0x20000022U, 0x20000026U },</div><div class='ctx'> 	};</div><div class='del'>-</div><div class='add'>+	struct aq_nic_cfg_s *aq_nic_cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	struct aq_nic_cfg_s *aq_nic_cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_b0_hw_init_tx_path(self);</div><div class='ctx'> 	hw_atl_b0_hw_init_rx_path(self);</div><div class='hunk'>@@ -439,8 +612,10 @@ static int hw_atl_b0_hw_init(struct aq_hw_s *self, u8 *mac_addr)</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupts */</div><div class='ctx'> 	hw_atl_reg_gen_irq_map_set(self,</div><div class='del'>-				   ((HW_ATL_B0_ERR_INT &lt;&lt; 0x18) | (1U &lt;&lt; 0x1F)) |</div><div class='del'>-			    ((HW_ATL_B0_ERR_INT &lt;&lt; 0x10) | (1U &lt;&lt; 0x17)), 0U);</div><div class='add'>+				   ((HW_ATL_B0_ERR_INT &lt;&lt; 0x18) |</div><div class='add'>+				    (1U &lt;&lt; 0x1F)) |</div><div class='add'>+				   ((HW_ATL_B0_ERR_INT &lt;&lt; 0x10) |</div><div class='add'>+				    (1U &lt;&lt; 0x17)), 0U);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable link interrupt */</div><div class='ctx'> 	if (aq_nic_cfg-&gt;link_irq_vec)</div><div class='hunk'>@@ -453,24 +628,25 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_tx_start(struct aq_hw_s *self,</div><div class='del'>-				      struct aq_ring_s *ring)</div><div class='add'>+int hw_atl_b0_hw_ring_tx_start(struct aq_hw_s *self, struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_tdm_tx_desc_en_set(self, 1, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_rx_start(struct aq_hw_s *self,</div><div class='del'>-				      struct aq_ring_s *ring)</div><div class='add'>+int hw_atl_b0_hw_ring_rx_start(struct aq_hw_s *self, struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_rdm_rx_desc_en_set(self, 1, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_start(struct aq_hw_s *self)</div><div class='add'>+int hw_atl_b0_hw_start(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_tpb_tx_buff_en_set(self, 1);</div><div class='ctx'> 	hw_atl_rpb_rx_buff_en_set(self, 1);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -478,18 +654,19 @@ static int hw_atl_b0_hw_tx_ring_tail_update(struct aq_hw_s *self,</div><div class='ctx'> 					    struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_reg_tx_dma_desc_tail_ptr_set(self, ring-&gt;sw_tail, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_ring_s *ring,</div><div class='del'>-				     unsigned int frags)</div><div class='add'>+int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, struct aq_ring_s *ring,</div><div class='add'>+			      unsigned int frags)</div><div class='ctx'> {</div><div class='ctx'> 	struct aq_ring_buff_s *buff = NULL;</div><div class='ctx'> 	struct hw_atl_txd_s *txd = NULL;</div><div class='ctx'> 	unsigned int buff_pa_len = 0U;</div><div class='del'>-	unsigned int pkt_len = 0U;</div><div class='ctx'> 	unsigned int frag_count = 0U;</div><div class='add'>+	unsigned int pkt_len = 0U;</div><div class='add'>+	bool is_vlan = false;</div><div class='ctx'> 	bool is_gso = false;</div><div class='ctx'> </div><div class='ctx'> 	buff = &amp;ring-&gt;buff_ring[ring-&gt;sw_tail];</div><div class='hunk'>@@ -504,36 +681,45 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 		buff = &amp;ring-&gt;buff_ring[ring-&gt;sw_tail];</div><div class='ctx'> </div><div class='del'>-		if (buff-&gt;is_txc) {</div><div class='add'>+		if (buff-&gt;is_gso_tcp || buff-&gt;is_gso_udp) {</div><div class='add'>+			if (buff-&gt;is_gso_tcp)</div><div class='add'>+				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_TCP;</div><div class='add'>+			txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_DESC_TYPE_TXC;</div><div class='ctx'> 			txd-&gt;ctl |= (buff-&gt;len_l3 &lt;&lt; 31) |</div><div class='del'>-				(buff-&gt;len_l2 &lt;&lt; 24) |</div><div class='del'>-				HW_ATL_B0_TXD_CTL_CMD_TCP |</div><div class='del'>-				HW_ATL_B0_TXD_CTL_DESC_TYPE_TXC;</div><div class='del'>-			txd-&gt;ctl2 |= (buff-&gt;mss &lt;&lt; 16) |</div><div class='del'>-				(buff-&gt;len_l4 &lt;&lt; 8) |</div><div class='del'>-				(buff-&gt;len_l3 &gt;&gt; 1);</div><div class='add'>+				    (buff-&gt;len_l2 &lt;&lt; 24);</div><div class='add'>+			txd-&gt;ctl2 |= (buff-&gt;mss &lt;&lt; 16);</div><div class='add'>+			is_gso = true;</div><div class='ctx'> </div><div class='ctx'> 			pkt_len -= (buff-&gt;len_l4 +</div><div class='ctx'> 				    buff-&gt;len_l3 +</div><div class='ctx'> 				    buff-&gt;len_l2);</div><div class='del'>-			is_gso = true;</div><div class='del'>-</div><div class='ctx'> 			if (buff-&gt;is_ipv6)</div><div class='ctx'> 				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_IPV6;</div><div class='del'>-		} else {</div><div class='add'>+			txd-&gt;ctl2 |= (buff-&gt;len_l4 &lt;&lt; 8) |</div><div class='add'>+				     (buff-&gt;len_l3 &gt;&gt; 1);</div><div class='add'>+		}</div><div class='add'>+		if (buff-&gt;is_vlan) {</div><div class='add'>+			txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_DESC_TYPE_TXC;</div><div class='add'>+			txd-&gt;ctl |= buff-&gt;vlan_tx_tag &lt;&lt; 4;</div><div class='add'>+			is_vlan = true;</div><div class='add'>+		}</div><div class='add'>+		if (!buff-&gt;is_gso_tcp &amp;&amp; !buff-&gt;is_gso_udp &amp;&amp; !buff-&gt;is_vlan) {</div><div class='ctx'> 			buff_pa_len = buff-&gt;len;</div><div class='ctx'> </div><div class='ctx'> 			txd-&gt;buf_addr = buff-&gt;pa;</div><div class='ctx'> 			txd-&gt;ctl |= (HW_ATL_B0_TXD_CTL_BLEN &amp;</div><div class='ctx'> 						((u32)buff_pa_len &lt;&lt; 4));</div><div class='ctx'> 			txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_DESC_TYPE_TXD;</div><div class='add'>+</div><div class='ctx'> 			/* PAY_LEN */</div><div class='ctx'> 			txd-&gt;ctl2 |= HW_ATL_B0_TXD_CTL2_LEN &amp; (pkt_len &lt;&lt; 14);</div><div class='ctx'> </div><div class='del'>-			if (is_gso) {</div><div class='del'>-				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_LSO;</div><div class='add'>+			if (is_gso || is_vlan) {</div><div class='add'>+				/* enable tx context */</div><div class='ctx'> 				txd-&gt;ctl2 |= HW_ATL_B0_TXD_CTL2_CTX_EN;</div><div class='ctx'> 			}</div><div class='add'>+			if (is_gso)</div><div class='add'>+				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_LSO;</div><div class='ctx'> </div><div class='ctx'> 			/* Tx checksum offloads */</div><div class='ctx'> 			if (buff-&gt;is_ip_cso)</div><div class='hunk'>@@ -542,26 +728,30 @@ static int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self,</div><div class='ctx'> 			if (buff-&gt;is_udp_cso || buff-&gt;is_tcp_cso)</div><div class='ctx'> 				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_TUCSO;</div><div class='ctx'> </div><div class='add'>+			if (is_vlan)</div><div class='add'>+				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_VLAN;</div><div class='add'>+</div><div class='ctx'> 			if (unlikely(buff-&gt;is_eop)) {</div><div class='ctx'> 				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_EOP;</div><div class='ctx'> 				txd-&gt;ctl |= HW_ATL_B0_TXD_CTL_CMD_WB;</div><div class='ctx'> 				is_gso = false;</div><div class='add'>+				is_vlan = false;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='ctx'> 		ring-&gt;sw_tail = aq_ring_next_dx(ring, ring-&gt;sw_tail);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_b0_hw_tx_ring_tail_update(self, ring);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_rx_init(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_ring_s *aq_ring,</div><div class='del'>-				     struct aq_ring_param_s *aq_ring_param)</div><div class='add'>+int hw_atl_b0_hw_ring_rx_init(struct aq_hw_s *self, struct aq_ring_s *aq_ring,</div><div class='add'>+			      struct aq_ring_param_s *aq_ring_param)</div><div class='ctx'> {</div><div class='del'>-	u32 dma_desc_addr_lsw = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> 	u32 dma_desc_addr_msw = (u32)(((u64)aq_ring-&gt;dx_ring_pa) &gt;&gt; 32);</div><div class='add'>+	u32 vlan_rx_stripping = self-&gt;aq_nic_cfg-&gt;is_vlan_rx_strip;</div><div class='add'>+	u32 dma_desc_addr_lsw = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rdm_rx_desc_en_set(self, false, aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='hunk'>@@ -576,12 +766,13 @@ static int hw_atl_b0_hw_ring_rx_init(struct aq_hw_s *self,</div><div class='ctx'> 	hw_atl_rdm_rx_desc_len_set(self, aq_ring-&gt;size / 8U, aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rdm_rx_desc_data_buff_size_set(self,</div><div class='del'>-					      AQ_CFG_RX_FRAME_MAX / 1024U,</div><div class='add'>+					      aq_ring-&gt;frame_max / 1024U,</div><div class='ctx'> 				       aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rdm_rx_desc_head_buff_size_set(self, 0U, aq_ring-&gt;idx);</div><div class='ctx'> 	hw_atl_rdm_rx_desc_head_splitting_set(self, 0U, aq_ring-&gt;idx);</div><div class='del'>-	hw_atl_rpo_rx_desc_vlan_stripping_set(self, 0U, aq_ring-&gt;idx);</div><div class='add'>+	hw_atl_rpo_rx_desc_vlan_stripping_set(self, !!vlan_rx_stripping,</div><div class='add'>+					      aq_ring-&gt;idx);</div><div class='ctx'> </div><div class='ctx'> 	/* Rx ring set mode */</div><div class='ctx'> </div><div class='hunk'>@@ -597,12 +788,11 @@ static int hw_atl_b0_hw_ring_rx_init(struct aq_hw_s *self,</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_tx_init(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_ring_s *aq_ring,</div><div class='del'>-				     struct aq_ring_param_s *aq_ring_param)</div><div class='add'>+int hw_atl_b0_hw_ring_tx_init(struct aq_hw_s *self, struct aq_ring_s *aq_ring,</div><div class='add'>+			      struct aq_ring_param_s *aq_ring_param)</div><div class='ctx'> {</div><div class='del'>-	u32 dma_desc_lsw_addr = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> 	u32 dma_desc_msw_addr = (u32)(((u64)aq_ring-&gt;dx_ring_pa) &gt;&gt; 32);</div><div class='add'>+	u32 dma_desc_lsw_addr = (u32)aq_ring-&gt;dx_ring_pa;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_reg_tx_dma_desc_base_addresslswset(self, dma_desc_lsw_addr,</div><div class='ctx'> 						  aq_ring-&gt;idx);</div><div class='hunk'>@@ -627,9 +817,8 @@ static int hw_atl_b0_hw_ring_tx_init(struct aq_hw_s *self,</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_rx_fill(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_ring_s *ring,</div><div class='del'>-				     unsigned int sw_tail_old)</div><div class='add'>+int hw_atl_b0_hw_ring_rx_fill(struct aq_hw_s *self, struct aq_ring_s *ring,</div><div class='add'>+			      unsigned int sw_tail_old)</div><div class='ctx'> {</div><div class='ctx'> 	for (; sw_tail_old != ring-&gt;sw_tail;</div><div class='ctx'> 		sw_tail_old = aq_ring_next_dx(ring, sw_tail_old)) {</div><div class='hunk'>@@ -648,16 +837,65 @@ static int hw_atl_b0_hw_ring_rx_fill(struct aq_hw_s *self,</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_tx_head_update(struct aq_hw_s *self,</div><div class='del'>-					    struct aq_ring_s *ring)</div><div class='add'>+static int hw_atl_b0_hw_ring_hwts_rx_fill(struct aq_hw_s *self,</div><div class='add'>+					  struct aq_ring_s *ring)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = aq_ring_avail_dx(ring); i--;</div><div class='add'>+			ring-&gt;sw_tail = aq_ring_next_dx(ring, ring-&gt;sw_tail)) {</div><div class='add'>+		struct hw_atl_rxd_s *rxd =</div><div class='add'>+			(struct hw_atl_rxd_s *)</div><div class='add'>+			&amp;ring-&gt;dx_ring[ring-&gt;sw_tail * HW_ATL_B0_RXD_SIZE];</div><div class='add'>+</div><div class='add'>+		rxd-&gt;buf_addr = ring-&gt;dx_ring_pa + ring-&gt;size * ring-&gt;dx_size;</div><div class='add'>+		rxd-&gt;hdr_addr = 0U;</div><div class='add'>+	}</div><div class='add'>+	/* Make sure descriptors are updated before bump tail*/</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	hw_atl_reg_rx_dma_desc_tail_ptr_set(self, ring-&gt;sw_tail, ring-&gt;idx);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_hw_ring_hwts_rx_receive(struct aq_hw_s *self,</div><div class='add'>+					     struct aq_ring_s *ring)</div><div class='add'>+{</div><div class='add'>+	while (ring-&gt;hw_head != ring-&gt;sw_tail) {</div><div class='add'>+		struct hw_atl_rxd_hwts_wb_s *hwts_wb =</div><div class='add'>+			(struct hw_atl_rxd_hwts_wb_s *)</div><div class='add'>+			(ring-&gt;dx_ring + (ring-&gt;hw_head * HW_ATL_B0_RXD_SIZE));</div><div class='add'>+</div><div class='add'>+		/* RxD is not done */</div><div class='add'>+		if (!(hwts_wb-&gt;sec_lw0 &amp; 0x1U))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		ring-&gt;hw_head = aq_ring_next_dx(ring, ring-&gt;hw_head);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_ring_tx_head_update(struct aq_hw_s *self,</div><div class='add'>+				     struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='add'>+	unsigned int hw_head_;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	unsigned int hw_head_ = hw_atl_tdm_tx_desc_head_ptr_get(self, ring-&gt;idx);</div><div class='add'>+</div><div class='add'>+	hw_head_ = hw_atl_tdm_tx_desc_head_ptr_get(self, ring-&gt;idx);</div><div class='ctx'> </div><div class='ctx'> 	if (aq_utils_obj_test(&amp;self-&gt;flags, AQ_HW_FLAG_ERR_UNPLUG)) {</div><div class='ctx'> 		err = -ENXIO;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Validate that the new hw_head_ is reasonable. */</div><div class='add'>+	if (hw_head_ &gt;= ring-&gt;size) {</div><div class='add'>+		err = -ENXIO;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	ring-&gt;hw_head = hw_head_;</div><div class='ctx'> 	err = aq_hw_err_from_flags(self);</div><div class='ctx'> </div><div class='hunk'>@@ -665,8 +903,7 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='del'>-					struct aq_ring_s *ring)</div><div class='add'>+int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	for (; ring-&gt;hw_head != ring-&gt;sw_tail;</div><div class='ctx'> 		ring-&gt;hw_head = aq_ring_next_dx(ring, ring-&gt;hw_head)) {</div><div class='hunk'>@@ -684,11 +921,15 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 		buff = &amp;ring-&gt;buff_ring[ring-&gt;hw_head];</div><div class='ctx'> </div><div class='add'>+		buff-&gt;flags = 0U;</div><div class='add'>+		buff-&gt;is_hash_l4 = 0U;</div><div class='add'>+</div><div class='ctx'> 		rx_stat = (0x0000003CU &amp; rxd_wb-&gt;status) &gt;&gt; 2;</div><div class='ctx'> </div><div class='ctx'> 		is_rx_check_sum_enabled = (rxd_wb-&gt;type &gt;&gt; 19) &amp; 0x3U;</div><div class='ctx'> </div><div class='del'>-		pkt_type = 0xFFU &amp; (rxd_wb-&gt;type &gt;&gt; 4);</div><div class='add'>+		pkt_type = (rxd_wb-&gt;type &amp; HW_ATL_B0_RXD_WB_STAT_PKTTYPE) &gt;&gt;</div><div class='add'>+			   HW_ATL_B0_RXD_WB_STAT_PKTTYPE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		if (is_rx_check_sum_enabled &amp; BIT(0) &amp;&amp;</div><div class='ctx'> 		    (0x0U == (pkt_type &amp; 0x3U)))</div><div class='hunk'>@@ -709,6 +950,13 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> 			buff-&gt;is_cso_err = 0U;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (self-&gt;aq_nic_cfg-&gt;is_vlan_rx_strip &amp;&amp;</div><div class='add'>+		    ((pkt_type &amp; HW_ATL_B0_RXD_WB_PKTTYPE_VLAN) ||</div><div class='add'>+		     (pkt_type &amp; HW_ATL_B0_RXD_WB_PKTTYPE_VLAN_DOUBLE))) {</div><div class='add'>+			buff-&gt;is_vlan = 1;</div><div class='add'>+			buff-&gt;vlan_rx_tag = le16_to_cpu(rxd_wb-&gt;vlan);</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if ((rx_stat &amp; BIT(0)) || rxd_wb-&gt;type &amp; 0x1000U) {</div><div class='ctx'> 			/* MAC error or DMA error */</div><div class='ctx'> 			buff-&gt;is_error = 1U;</div><div class='hunk'>@@ -724,20 +972,21 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		buff-&gt;is_lro = !!(HW_ATL_B0_RXD_WB_STAT2_RSCCNT &amp;</div><div class='add'>+				  rxd_wb-&gt;status);</div><div class='ctx'> 		if (HW_ATL_B0_RXD_WB_STAT2_EOP &amp; rxd_wb-&gt;status) {</div><div class='ctx'> 			buff-&gt;len = rxd_wb-&gt;pkt_len %</div><div class='del'>-				AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+				ring-&gt;frame_max;</div><div class='ctx'> 			buff-&gt;len = buff-&gt;len ?</div><div class='del'>-				buff-&gt;len : AQ_CFG_RX_FRAME_MAX;</div><div class='add'>+				buff-&gt;len : ring-&gt;frame_max;</div><div class='ctx'> 			buff-&gt;next = 0U;</div><div class='ctx'> 			buff-&gt;is_eop = 1U;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			buff-&gt;len =</div><div class='del'>-				rxd_wb-&gt;pkt_len &gt; AQ_CFG_RX_FRAME_MAX ?</div><div class='del'>-				AQ_CFG_RX_FRAME_MAX : rxd_wb-&gt;pkt_len;</div><div class='add'>+				rxd_wb-&gt;pkt_len &gt; ring-&gt;frame_max ?</div><div class='add'>+				ring-&gt;frame_max : rxd_wb-&gt;pkt_len;</div><div class='ctx'> </div><div class='del'>-			if (HW_ATL_B0_RXD_WB_STAT2_RSCCNT &amp;</div><div class='del'>-				rxd_wb-&gt;status) {</div><div class='add'>+			if (buff-&gt;is_lro) {</div><div class='ctx'> 				/* LRO */</div><div class='ctx'> 				buff-&gt;next = rxd_wb-&gt;next_desc_ptr;</div><div class='ctx'> 				++ring-&gt;stats.rx.lro_packets;</div><div class='hunk'>@@ -754,50 +1003,64 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_irq_enable(struct aq_hw_s *self, u64 mask)</div><div class='add'>+int hw_atl_b0_hw_irq_enable(struct aq_hw_s *self, u64 mask)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_itr_irq_msk_setlsw_set(self, LODWORD(mask));</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask)</div><div class='add'>+int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_itr_irq_msk_clearlsw_set(self, LODWORD(mask));</div><div class='ctx'> 	hw_atl_itr_irq_status_clearlsw_set(self, LODWORD(mask));</div><div class='ctx'> </div><div class='ctx'> 	atomic_inc(&amp;self-&gt;dpc);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask)</div><div class='add'>+int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask)</div><div class='ctx'> {</div><div class='ctx'> 	*mask = hw_atl_itr_irq_statuslsw_get(self);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define IS_FILTER_ENABLED(_F_) ((packet_filter &amp; (_F_)) ? 1U : 0U)</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,</div><div class='del'>-					  unsigned int packet_filter)</div><div class='add'>+int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,</div><div class='add'>+				   unsigned int packet_filter)</div><div class='ctx'> {</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> 	unsigned int i = 0U;</div><div class='add'>+	u32 vlan_promisc;</div><div class='add'>+	u32 l2_promisc;</div><div class='add'>+</div><div class='add'>+	l2_promisc = IS_FILTER_ENABLED(IFF_PROMISC) ||</div><div class='add'>+		     !!(cfg-&gt;priv_flags &amp; BIT(AQ_HW_LOOPBACK_DMA_NET));</div><div class='add'>+	vlan_promisc = l2_promisc || cfg-&gt;is_vlan_force_promisc;</div><div class='add'>+</div><div class='add'>+	hw_atl_rpfl2promiscuous_mode_en_set(self, l2_promisc);</div><div class='add'>+</div><div class='add'>+	hw_atl_rpf_vlan_prom_mode_en_set(self, vlan_promisc);</div><div class='ctx'> </div><div class='del'>-	hw_atl_rpfl2promiscuous_mode_en_set(self, IS_FILTER_ENABLED(IFF_PROMISC));</div><div class='ctx'> 	hw_atl_rpfl2multicast_flr_en_set(self,</div><div class='del'>-					 IS_FILTER_ENABLED(IFF_ALLMULTI), 0);</div><div class='add'>+					 IS_FILTER_ENABLED(IFF_ALLMULTI) &amp;&amp;</div><div class='add'>+					 IS_FILTER_ENABLED(IFF_MULTICAST), 0);</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rpfl2_accept_all_mc_packets_set(self,</div><div class='del'>-					       IS_FILTER_ENABLED(IFF_ALLMULTI));</div><div class='add'>+					      IS_FILTER_ENABLED(IFF_ALLMULTI) &amp;&amp;</div><div class='add'>+					      IS_FILTER_ENABLED(IFF_MULTICAST));</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_rpfl2broadcast_en_set(self, IS_FILTER_ENABLED(IFF_BROADCAST));</div><div class='ctx'> </div><div class='del'>-	self-&gt;aq_nic_cfg-&gt;is_mc_list_enabled = IS_FILTER_ENABLED(IFF_MULTICAST);</div><div class='ctx'> </div><div class='ctx'> 	for (i = HW_ATL_B0_MAC_MIN; i &lt; HW_ATL_B0_MAC_MAX; ++i)</div><div class='ctx'> 		hw_atl_rpfl2_uc_flr_en_set(self,</div><div class='del'>-					   (self-&gt;aq_nic_cfg-&gt;is_mc_list_enabled &amp;&amp;</div><div class='del'>-				    (i &lt;= self-&gt;aq_nic_cfg-&gt;mc_list_count)) ?</div><div class='del'>-				    1U : 0U, i);</div><div class='add'>+					   (cfg-&gt;is_mc_list_enabled &amp;&amp;</div><div class='add'>+					    (i &lt;= cfg-&gt;mc_list_count)) ?</div><div class='add'>+					   1U : 0U, i);</div><div class='ctx'> </div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='hunk'>@@ -811,29 +1074,30 @@ static int hw_atl_b0_hw_multicast_list_set(struct aq_hw_s *self,</div><div class='ctx'> 					   u32 count)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='ctx'> </div><div class='ctx'> 	if (count &gt; (HW_ATL_B0_MAC_MAX - HW_ATL_B0_MAC_MIN)) {</div><div class='ctx'> 		err = -EBADRQC;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='del'>-	for (self-&gt;aq_nic_cfg-&gt;mc_list_count = 0U;</div><div class='del'>-			self-&gt;aq_nic_cfg-&gt;mc_list_count &lt; count;</div><div class='del'>-			++self-&gt;aq_nic_cfg-&gt;mc_list_count) {</div><div class='del'>-		u32 i = self-&gt;aq_nic_cfg-&gt;mc_list_count;</div><div class='add'>+	for (cfg-&gt;mc_list_count = 0U;</div><div class='add'>+			cfg-&gt;mc_list_count &lt; count;</div><div class='add'>+			++cfg-&gt;mc_list_count) {</div><div class='add'>+		u32 i = cfg-&gt;mc_list_count;</div><div class='ctx'> 		u32 h = (ar_mac[i][0] &lt;&lt; 8) | (ar_mac[i][1]);</div><div class='ctx'> 		u32 l = (ar_mac[i][2] &lt;&lt; 24) | (ar_mac[i][3] &lt;&lt; 16) |</div><div class='ctx'> 					(ar_mac[i][4] &lt;&lt; 8) | ar_mac[i][5];</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpfl2_uc_flr_en_set(self, 0U, HW_ATL_B0_MAC_MIN + i);</div><div class='ctx'> </div><div class='del'>-		hw_atl_rpfl2unicast_dest_addresslsw_set(self,</div><div class='del'>-							l, HW_ATL_B0_MAC_MIN + i);</div><div class='add'>+		hw_atl_rpfl2unicast_dest_addresslsw_set(self, l,</div><div class='add'>+							HW_ATL_B0_MAC_MIN + i);</div><div class='ctx'> </div><div class='del'>-		hw_atl_rpfl2unicast_dest_addressmsw_set(self,</div><div class='del'>-							h, HW_ATL_B0_MAC_MIN + i);</div><div class='add'>+		hw_atl_rpfl2unicast_dest_addressmsw_set(self, h,</div><div class='add'>+							HW_ATL_B0_MAC_MIN + i);</div><div class='ctx'> </div><div class='ctx'> 		hw_atl_rpfl2_uc_flr_en_set(self,</div><div class='del'>-					   (self-&gt;aq_nic_cfg-&gt;is_mc_list_enabled),</div><div class='add'>+					   (cfg-&gt;is_mc_list_enabled),</div><div class='ctx'> 					   HW_ATL_B0_MAC_MIN + i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -936,28 +1200,234 @@ static int hw_atl_b0_hw_stop(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_b0_hw_irq_disable(self, HW_ATL_B0_INT_MASK);</div><div class='ctx'> </div><div class='del'>-	/* Invalidate Descriptor Cache to prevent writing to the cached</div><div class='del'>-	 * descriptors and to the data pointer of those descriptors</div><div class='del'>-	 */</div><div class='del'>-	hw_atl_rdm_rx_dma_desc_cache_init_set(self, 1);</div><div class='del'>-</div><div class='del'>-	return aq_hw_err_from_flags(self);</div><div class='add'>+	return aq_hw_invalidate_descriptor_cache(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_tx_stop(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_ring_s *ring)</div><div class='add'>+int hw_atl_b0_hw_ring_tx_stop(struct aq_hw_s *self, struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_tdm_tx_desc_en_set(self, 0U, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_b0_hw_ring_rx_stop(struct aq_hw_s *self,</div><div class='del'>-				     struct aq_ring_s *ring)</div><div class='add'>+int hw_atl_b0_hw_ring_rx_stop(struct aq_hw_s *self, struct aq_ring_s *ring)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_rdm_rx_desc_en_set(self, 0U, ring-&gt;idx);</div><div class='add'>+</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define get_ptp_ts_val_u64(self, indx) \</div><div class='add'>+	((u64)(hw_atl_pcs_ptp_clock_get(self, indx) &amp; 0xffff))</div><div class='add'>+</div><div class='add'>+static void hw_atl_b0_get_ptp_ts(struct aq_hw_s *self, u64 *stamp)</div><div class='add'>+{</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	hw_atl_pcs_ptp_clock_read_enable(self, 1);</div><div class='add'>+	hw_atl_pcs_ptp_clock_read_enable(self, 0);</div><div class='add'>+	ns = (get_ptp_ts_val_u64(self, 0) +</div><div class='add'>+	      (get_ptp_ts_val_u64(self, 1) &lt;&lt; 16)) * NSEC_PER_SEC +</div><div class='add'>+	     (get_ptp_ts_val_u64(self, 3) +</div><div class='add'>+	      (get_ptp_ts_val_u64(self, 4) &lt;&lt; 16));</div><div class='add'>+</div><div class='add'>+	*stamp = ns + self-&gt;ptp_clk_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_atl_b0_adj_params_get(u64 freq, s64 adj, u32 *ns, u32 *fns)</div><div class='add'>+{</div><div class='add'>+	/* For accuracy, the digit is extended */</div><div class='add'>+	s64 base_ns = ((adj + NSEC_PER_SEC) * NSEC_PER_SEC);</div><div class='add'>+	u64 nsi_frac = 0;</div><div class='add'>+	u64 nsi;</div><div class='add'>+</div><div class='add'>+	base_ns = div64_s64(base_ns, freq);</div><div class='add'>+	nsi = div64_u64(base_ns, NSEC_PER_SEC);</div><div class='add'>+</div><div class='add'>+	if (base_ns != nsi * NSEC_PER_SEC) {</div><div class='add'>+		s64 divisor = div64_s64((s64)NSEC_PER_SEC * NSEC_PER_SEC,</div><div class='add'>+					base_ns - nsi * NSEC_PER_SEC);</div><div class='add'>+		nsi_frac = div64_s64(AQ_FRAC_PER_NS * NSEC_PER_SEC, divisor);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*ns = (u32)nsi;</div><div class='add'>+	*fns = (u32)nsi_frac;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+hw_atl_b0_mac_adj_param_calc(struct hw_fw_request_ptp_adj_freq *ptp_adj_freq,</div><div class='add'>+			     u64 phyfreq, u64 macfreq)</div><div class='add'>+{</div><div class='add'>+	s64 adj_fns_val;</div><div class='add'>+	s64 fns_in_sec_phy = phyfreq * (ptp_adj_freq-&gt;fns_phy +</div><div class='add'>+					AQ_FRAC_PER_NS * ptp_adj_freq-&gt;ns_phy);</div><div class='add'>+	s64 fns_in_sec_mac = macfreq * (ptp_adj_freq-&gt;fns_mac +</div><div class='add'>+					AQ_FRAC_PER_NS * ptp_adj_freq-&gt;ns_mac);</div><div class='add'>+	s64 fault_in_sec_phy = AQ_FRAC_PER_NS * NSEC_PER_SEC - fns_in_sec_phy;</div><div class='add'>+	s64 fault_in_sec_mac = AQ_FRAC_PER_NS * NSEC_PER_SEC - fns_in_sec_mac;</div><div class='add'>+	/* MAC MCP counter freq is macfreq / 4 */</div><div class='add'>+	s64 diff_in_mcp_overflow = (fault_in_sec_mac - fault_in_sec_phy) *</div><div class='add'>+				   4 * AQ_FRAC_PER_NS;</div><div class='add'>+</div><div class='add'>+	diff_in_mcp_overflow = div64_s64(diff_in_mcp_overflow,</div><div class='add'>+					 AQ_HW_MAC_COUNTER_HZ);</div><div class='add'>+	adj_fns_val = (ptp_adj_freq-&gt;fns_mac + AQ_FRAC_PER_NS *</div><div class='add'>+		       ptp_adj_freq-&gt;ns_mac) + diff_in_mcp_overflow;</div><div class='add'>+</div><div class='add'>+	ptp_adj_freq-&gt;mac_ns_adj = div64_s64(adj_fns_val, AQ_FRAC_PER_NS);</div><div class='add'>+	ptp_adj_freq-&gt;mac_fns_adj = adj_fns_val - ptp_adj_freq-&gt;mac_ns_adj *</div><div class='add'>+				    AQ_FRAC_PER_NS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_adj_sys_clock(struct aq_hw_s *self, s64 delta)</div><div class='add'>+{</div><div class='add'>+	self-&gt;ptp_clk_offset += delta;</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;adjust_ptp(self, self-&gt;ptp_clk_offset);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_set_sys_clock(struct aq_hw_s *self, u64 time, u64 ts)</div><div class='add'>+{</div><div class='add'>+	s64 delta = time - (self-&gt;ptp_clk_offset + ts);</div><div class='add'>+</div><div class='add'>+	return hw_atl_b0_adj_sys_clock(self, delta);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_ts_to_sys_clock(struct aq_hw_s *self, u64 ts, u64 *time)</div><div class='add'>+{</div><div class='add'>+	*time = self-&gt;ptp_clk_offset + ts;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_adj_clock_freq(struct aq_hw_s *self, s32 ppb)</div><div class='add'>+{</div><div class='add'>+	struct hw_fw_request_iface fwreq;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fwreq, 0, sizeof(fwreq));</div><div class='add'>+</div><div class='add'>+	fwreq.msg_id = HW_AQ_FW_REQUEST_PTP_ADJ_FREQ;</div><div class='add'>+	hw_atl_b0_adj_params_get(AQ_HW_MAC_COUNTER_HZ, ppb,</div><div class='add'>+				 &amp;fwreq.ptp_adj_freq.ns_mac,</div><div class='add'>+				 &amp;fwreq.ptp_adj_freq.fns_mac);</div><div class='add'>+	hw_atl_b0_adj_params_get(AQ_HW_PHY_COUNTER_HZ, ppb,</div><div class='add'>+				 &amp;fwreq.ptp_adj_freq.ns_phy,</div><div class='add'>+				 &amp;fwreq.ptp_adj_freq.fns_phy);</div><div class='add'>+	hw_atl_b0_mac_adj_param_calc(&amp;fwreq.ptp_adj_freq,</div><div class='add'>+				     AQ_HW_PHY_COUNTER_HZ,</div><div class='add'>+				     AQ_HW_MAC_COUNTER_HZ);</div><div class='add'>+</div><div class='add'>+	size = sizeof(fwreq.msg_id) + sizeof(fwreq.ptp_adj_freq);</div><div class='add'>+	return self-&gt;aq_fw_ops-&gt;send_fw_request(self, &amp;fwreq, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_gpio_pulse(struct aq_hw_s *self, u32 index,</div><div class='add'>+				u64 start, u32 period)</div><div class='add'>+{</div><div class='add'>+	struct hw_fw_request_iface fwreq;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fwreq, 0, sizeof(fwreq));</div><div class='add'>+</div><div class='add'>+	fwreq.msg_id = HW_AQ_FW_REQUEST_PTP_GPIO_CTRL;</div><div class='add'>+	fwreq.ptp_gpio_ctrl.index = index;</div><div class='add'>+	fwreq.ptp_gpio_ctrl.period = period;</div><div class='add'>+	/* Apply time offset */</div><div class='add'>+	fwreq.ptp_gpio_ctrl.start = start;</div><div class='add'>+</div><div class='add'>+	size = sizeof(fwreq.msg_id) + sizeof(fwreq.ptp_gpio_ctrl);</div><div class='add'>+	return self-&gt;aq_fw_ops-&gt;send_fw_request(self, &amp;fwreq, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_extts_gpio_enable(struct aq_hw_s *self, u32 index,</div><div class='add'>+				       u32 enable)</div><div class='add'>+{</div><div class='add'>+	/* Enable/disable Sync1588 GPIO Timestamping */</div><div class='add'>+	aq_phy_write_reg(self, MDIO_MMD_PCS, 0xc611, enable ? 0x71 : 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_get_sync_ts(struct aq_hw_s *self, u64 *ts)</div><div class='add'>+{</div><div class='add'>+	u64 sec_l;</div><div class='add'>+	u64 sec_h;</div><div class='add'>+	u64 nsec_l;</div><div class='add'>+	u64 nsec_h;</div><div class='add'>+</div><div class='add'>+	if (!ts)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	/* PTP external GPIO clock seconds count 15:0 */</div><div class='add'>+	sec_l = aq_phy_read_reg(self, MDIO_MMD_PCS, 0xc914);</div><div class='add'>+	/* PTP external GPIO clock seconds count 31:16 */</div><div class='add'>+	sec_h = aq_phy_read_reg(self, MDIO_MMD_PCS, 0xc915);</div><div class='add'>+	/* PTP external GPIO clock nanoseconds count 15:0 */</div><div class='add'>+	nsec_l = aq_phy_read_reg(self, MDIO_MMD_PCS, 0xc916);</div><div class='add'>+	/* PTP external GPIO clock nanoseconds count 31:16 */</div><div class='add'>+	nsec_h = aq_phy_read_reg(self, MDIO_MMD_PCS, 0xc917);</div><div class='add'>+</div><div class='add'>+	*ts = (nsec_h &lt;&lt; 16) + nsec_l + ((sec_h &lt;&lt; 16) + sec_l) * NSEC_PER_SEC;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 hw_atl_b0_rx_extract_ts(struct aq_hw_s *self, u8 *p,</div><div class='add'>+				   unsigned int len, u64 *timestamp)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset = 14;</div><div class='add'>+	struct ethhdr *eth;</div><div class='add'>+	__be64 sec;</div><div class='add'>+	__be32 ns;</div><div class='add'>+	u8 *ptr;</div><div class='add'>+</div><div class='add'>+	if (len &lt;= offset || !timestamp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* The TIMESTAMP in the end of package has following format:</div><div class='add'>+	 * (big-endian)</div><div class='add'>+	 *   struct {</div><div class='add'>+	 *     uint64_t sec;</div><div class='add'>+	 *     uint32_t ns;</div><div class='add'>+	 *     uint16_t stream_id;</div><div class='add'>+	 *   };</div><div class='add'>+	 */</div><div class='add'>+	ptr = p + (len - offset);</div><div class='add'>+	memcpy(&amp;sec, ptr, sizeof(sec));</div><div class='add'>+	ptr += sizeof(sec);</div><div class='add'>+	memcpy(&amp;ns, ptr, sizeof(ns));</div><div class='add'>+</div><div class='add'>+	*timestamp = (be64_to_cpu(sec) &amp; 0xffffffffffffllu) * NSEC_PER_SEC +</div><div class='add'>+		     be32_to_cpu(ns) + self-&gt;ptp_clk_offset;</div><div class='add'>+</div><div class='add'>+	eth = (struct ethhdr *)p;</div><div class='add'>+</div><div class='add'>+	return (eth-&gt;h_proto == htons(ETH_P_1588)) ? 12 : 14;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_extract_hwts(struct aq_hw_s *self, u8 *p, unsigned int len,</div><div class='add'>+				  u64 *timestamp)</div><div class='add'>+{</div><div class='add'>+	struct hw_atl_rxd_hwts_wb_s *hwts_wb = (struct hw_atl_rxd_hwts_wb_s *)p;</div><div class='add'>+	u64 tmp, sec, ns;</div><div class='add'>+</div><div class='add'>+	sec = 0;</div><div class='add'>+	tmp = (hwts_wb-&gt;sec_lw0 &gt;&gt; 2) &amp; 0x3ff;</div><div class='add'>+	sec += tmp;</div><div class='add'>+	tmp = (u64)((hwts_wb-&gt;sec_lw1 &gt;&gt; 16) &amp; 0xffff) &lt;&lt; 10;</div><div class='add'>+	sec += tmp;</div><div class='add'>+	tmp = (u64)(hwts_wb-&gt;sec_hw &amp; 0xfff) &lt;&lt; 26;</div><div class='add'>+	sec += tmp;</div><div class='add'>+	tmp = (u64)((hwts_wb-&gt;sec_hw &gt;&gt; 22) &amp; 0x3ff) &lt;&lt; 38;</div><div class='add'>+	sec += tmp;</div><div class='add'>+	ns = sec * NSEC_PER_SEC + hwts_wb-&gt;ns;</div><div class='add'>+	if (timestamp)</div><div class='add'>+		*timestamp = ns + self-&gt;ptp_clk_offset;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hw_atl_b0_hw_fl3l4_clear(struct aq_hw_s *self,</div><div class='ctx'> 				    struct aq_rx_filter_l3l4 *data)</div><div class='ctx'> {</div><div class='hunk'>@@ -991,7 +1461,8 @@ static int hw_atl_b0_hw_fl3l4_set(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_b0_hw_fl3l4_clear(self, data);</div><div class='ctx'> </div><div class='del'>-	if (data-&gt;cmd) {</div><div class='add'>+	if (data-&gt;cmd &amp; (HW_ATL_RX_ENABLE_CMP_DEST_ADDR_L3 |</div><div class='add'>+			 HW_ATL_RX_ENABLE_CMP_SRC_ADDR_L3)) {</div><div class='ctx'> 		if (!data-&gt;is_ipv6) {</div><div class='ctx'> 			hw_atl_rpfl3l4_ipv4_dest_addr_set(self,</div><div class='ctx'> 							  location,</div><div class='hunk'>@@ -1008,8 +1479,13 @@ static int hw_atl_b0_hw_fl3l4_set(struct aq_hw_s *self,</div><div class='ctx'> 							 data-&gt;ip_src);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	hw_atl_rpf_l4_dpd_set(self, data-&gt;p_dst, location);</div><div class='del'>-	hw_atl_rpf_l4_spd_set(self, data-&gt;p_src, location);</div><div class='add'>+</div><div class='add'>+	if (data-&gt;cmd &amp; (HW_ATL_RX_ENABLE_CMP_DEST_PORT_L4 |</div><div class='add'>+			 HW_ATL_RX_ENABLE_CMP_SRC_PORT_L4)) {</div><div class='add'>+		hw_atl_rpf_l4_dpd_set(self, data-&gt;p_dst, location);</div><div class='add'>+		hw_atl_rpf_l4_spd_set(self, data-&gt;p_src, location);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	hw_atl_rpfl3l4_cmd_set(self, location, data-&gt;cmd);</div><div class='ctx'> </div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='hunk'>@@ -1050,7 +1526,7 @@ static int hw_atl_b0_hw_fl2_clear(struct aq_hw_s *self,</div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * @brief Set VLAN filter table</div><div class='ctx'>  * @details Configure VLAN filter table to accept (and assign the queue) traffic</div><div class='ctx'>  *  for the particular vlan ids.</div><div class='hunk'>@@ -1089,12 +1565,212 @@ static int hw_atl_b0_hw_vlan_set(struct aq_hw_s *self,</div><div class='ctx'> static int hw_atl_b0_hw_vlan_ctrl(struct aq_hw_s *self, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	/* set promisc in case of disabing the vland filter */</div><div class='del'>-	hw_atl_rpf_vlan_prom_mode_en_set(self, !!!enable);</div><div class='add'>+	hw_atl_rpf_vlan_prom_mode_en_set(self, !enable);</div><div class='ctx'> </div><div class='ctx'> 	return aq_hw_err_from_flags(self);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int hw_atl_b0_set_loopback(struct aq_hw_s *self, u32 mode, bool enable)</div><div class='add'>+{</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case AQ_HW_LOOPBACK_DMA_SYS:</div><div class='add'>+		hw_atl_tpb_tx_dma_sys_lbk_en_set(self, enable);</div><div class='add'>+		hw_atl_rpb_dma_sys_lbk_set(self, enable);</div><div class='add'>+		break;</div><div class='add'>+	case AQ_HW_LOOPBACK_PKT_SYS:</div><div class='add'>+		hw_atl_tpo_tx_pkt_sys_lbk_en_set(self, enable);</div><div class='add'>+		hw_atl_rpf_tpo_to_rpf_sys_lbk_set(self, enable);</div><div class='add'>+		break;</div><div class='add'>+	case AQ_HW_LOOPBACK_DMA_NET:</div><div class='add'>+		hw_atl_rpf_vlan_prom_mode_en_set(self, enable);</div><div class='add'>+		hw_atl_rpfl2promiscuous_mode_en_set(self, enable);</div><div class='add'>+		hw_atl_tpb_tx_tx_clk_gate_en_set(self, !enable);</div><div class='add'>+		hw_atl_tpb_tx_dma_net_lbk_en_set(self, enable);</div><div class='add'>+		hw_atl_rpb_dma_net_lbk_set(self, enable);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 hw_atl_b0_ts_ready_and_latch_high_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	if (hw_atl_ts_ready_get(self) &amp;&amp; hw_atl_ts_ready_latch_high_get(self))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_get_mac_temp(struct aq_hw_s *self, u32 *temp)</div><div class='add'>+{</div><div class='add'>+	bool ts_disabled;</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+	u32 ts;</div><div class='add'>+</div><div class='add'>+	ts_disabled = (hw_atl_ts_power_down_get(self) == 1U);</div><div class='add'>+</div><div class='add'>+	if (ts_disabled) {</div><div class='add'>+		// Set AFE Temperature Sensor to on (off by default)</div><div class='add'>+		hw_atl_ts_power_down_set(self, 0U);</div><div class='add'>+</div><div class='add'>+		// Reset internal capacitors, biasing, and counters</div><div class='add'>+		hw_atl_ts_reset_set(self, 1);</div><div class='add'>+		hw_atl_ts_reset_set(self, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(hw_atl_b0_ts_ready_and_latch_high_get, self,</div><div class='add'>+				 val, val == 1, 10000U, 500000U);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ts = hw_atl_ts_data_get(self);</div><div class='add'>+	*temp = ts * ts * 16 / 100000 + 60 * ts - 83410;</div><div class='add'>+</div><div class='add'>+	if (ts_disabled) {</div><div class='add'>+		// Set AFE Temperature Sensor back to off</div><div class='add'>+		hw_atl_ts_power_down_set(self, 1U);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define START_TRANSMIT 0x5001</div><div class='add'>+#define START_READ_TRANSMIT 0x5101</div><div class='add'>+#define STOP_TRANSMIT 0x3001</div><div class='add'>+#define REPEAT_TRANSMIT 0x1001</div><div class='add'>+#define REPEAT_NACK_TRANSMIT 0x1011</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_smb0_wait_result(struct aq_hw_s *self, bool expect_ack)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout(hw_atl_smb0_byte_transfer_complete_get,</div><div class='add'>+				 self, val, val == 1, 100U, 10000U);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (hw_atl_smb0_receive_acknowledged_get(self) != expect_ack)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Starts an I2C/SMBUS write to a given address. addr is in 7-bit format,</div><div class='add'>+ * the read/write bit is not part of it.</div><div class='add'>+ */</div><div class='add'>+static int hw_atl_b0_smb0_start_write(struct aq_hw_s *self, u32 addr)</div><div class='add'>+{</div><div class='add'>+	hw_atl_smb0_tx_data_set(self, (addr &lt;&lt; 1) | 0);</div><div class='add'>+	hw_atl_smb0_provisioning2_set(self, START_TRANSMIT);</div><div class='add'>+	return hw_atl_b0_smb0_wait_result(self, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Writes a single byte as part of an ongoing write started by start_write. */</div><div class='add'>+static int hw_atl_b0_smb0_write_byte(struct aq_hw_s *self, u32 data)</div><div class='add'>+{</div><div class='add'>+	hw_atl_smb0_tx_data_set(self, data);</div><div class='add'>+	hw_atl_smb0_provisioning2_set(self, REPEAT_TRANSMIT);</div><div class='add'>+	return hw_atl_b0_smb0_wait_result(self, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Starts an I2C/SMBUS read to a given address. addr is in 7-bit format,</div><div class='add'>+ * the read/write bit is not part of it.</div><div class='add'>+ */</div><div class='add'>+static int hw_atl_b0_smb0_start_read(struct aq_hw_s *self, u32 addr)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl_smb0_tx_data_set(self, (addr &lt;&lt; 1) | 1);</div><div class='add'>+	hw_atl_smb0_provisioning2_set(self, START_READ_TRANSMIT);</div><div class='add'>+	err = hw_atl_b0_smb0_wait_result(self, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	if (hw_atl_smb0_repeated_start_detect_get(self) == 0)</div><div class='add'>+		return -EIO;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reads a single byte as part of an ongoing read started by start_read. */</div><div class='add'>+static int hw_atl_b0_smb0_read_byte(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl_smb0_provisioning2_set(self, REPEAT_TRANSMIT);</div><div class='add'>+	err = hw_atl_b0_smb0_wait_result(self, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return hw_atl_smb0_rx_data_get(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Reads the last byte of an ongoing read. */</div><div class='add'>+static int hw_atl_b0_smb0_read_byte_nack(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl_smb0_provisioning2_set(self, REPEAT_NACK_TRANSMIT);</div><div class='add'>+	err = hw_atl_b0_smb0_wait_result(self, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	return hw_atl_smb0_rx_data_get(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Sends a stop condition and ends a transfer. */</div><div class='add'>+static void hw_atl_b0_smb0_stop(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	hw_atl_smb0_provisioning2_set(self, STOP_TRANSMIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_b0_read_module_eeprom(struct aq_hw_s *self, u8 dev_addr,</div><div class='add'>+					u8 reg_start_addr, int len, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i, b;</div><div class='add'>+	int err;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	/* Wait for SMBUS0 to be idle */</div><div class='add'>+	err = readx_poll_timeout(hw_atl_smb0_bus_busy_get, self,</div><div class='add'>+				 val, val == 0, 100U, 10000U);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hw_atl_b0_smb0_start_write(self, dev_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = hw_atl_b0_smb0_write_byte(self, reg_start_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	err = hw_atl_b0_smb0_start_read(self, dev_addr);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len - 1; i++) {</div><div class='add'>+		b = hw_atl_b0_smb0_read_byte(self);</div><div class='add'>+		if (b &lt; 0) {</div><div class='add'>+			err = b;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		data[i] = (u8)b;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	b = hw_atl_b0_smb0_read_byte_nack(self);</div><div class='add'>+	if (b &lt; 0) {</div><div class='add'>+		err = b;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	data[i] = (u8)b;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	hw_atl_b0_smb0_stop(self);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct aq_hw_ops hw_atl_ops_b0 = {</div><div class='add'>+	.hw_soft_reset        = hw_atl_utils_soft_reset,</div><div class='add'>+	.hw_prepare           = hw_atl_utils_initfw,</div><div class='ctx'> 	.hw_set_mac_address   = hw_atl_b0_hw_mac_addr_set,</div><div class='ctx'> 	.hw_init              = hw_atl_b0_hw_init,</div><div class='ctx'> 	.hw_reset             = hw_atl_b0_hw_reset,</div><div class='hunk'>@@ -1127,9 +1803,28 @@ const struct aq_hw_ops hw_atl_ops_b0 = {</div><div class='ctx'> 	.hw_interrupt_moderation_set = hw_atl_b0_hw_interrupt_moderation_set,</div><div class='ctx'> 	.hw_rss_set                  = hw_atl_b0_hw_rss_set,</div><div class='ctx'> 	.hw_rss_hash_set             = hw_atl_b0_hw_rss_hash_set,</div><div class='add'>+	.hw_tc_rate_limit_set        = hw_atl_b0_hw_init_tx_tc_rate_limit,</div><div class='ctx'> 	.hw_get_regs                 = hw_atl_utils_hw_get_regs,</div><div class='ctx'> 	.hw_get_hw_stats             = hw_atl_utils_get_hw_stats,</div><div class='ctx'> 	.hw_get_fw_version           = hw_atl_utils_get_fw_version,</div><div class='del'>-	.hw_set_offload              = hw_atl_b0_hw_offload_set,</div><div class='del'>-	.hw_set_fc                   = hw_atl_b0_set_fc,</div><div class='add'>+</div><div class='add'>+	.hw_ring_hwts_rx_fill        = hw_atl_b0_hw_ring_hwts_rx_fill,</div><div class='add'>+	.hw_ring_hwts_rx_receive     = hw_atl_b0_hw_ring_hwts_rx_receive,</div><div class='add'>+</div><div class='add'>+	.hw_get_ptp_ts           = hw_atl_b0_get_ptp_ts,</div><div class='add'>+	.hw_adj_sys_clock        = hw_atl_b0_adj_sys_clock,</div><div class='add'>+	.hw_set_sys_clock        = hw_atl_b0_set_sys_clock,</div><div class='add'>+	.hw_ts_to_sys_clock      = hw_atl_b0_ts_to_sys_clock,</div><div class='add'>+	.hw_adj_clock_freq       = hw_atl_b0_adj_clock_freq,</div><div class='add'>+	.hw_gpio_pulse           = hw_atl_b0_gpio_pulse,</div><div class='add'>+	.hw_extts_gpio_enable    = hw_atl_b0_extts_gpio_enable,</div><div class='add'>+	.hw_get_sync_ts          = hw_atl_b0_get_sync_ts,</div><div class='add'>+	.rx_extract_ts           = hw_atl_b0_rx_extract_ts,</div><div class='add'>+	.extract_hwts            = hw_atl_b0_extract_hwts,</div><div class='add'>+	.hw_set_offload          = hw_atl_b0_hw_offload_set,</div><div class='add'>+	.hw_set_loopback         = hw_atl_b0_set_loopback,</div><div class='add'>+	.hw_set_fc               = hw_atl_b0_set_fc,</div><div class='add'>+</div><div class='add'>+	.hw_get_mac_temp         = hw_atl_b0_get_mac_temp,</div><div class='add'>+	.hw_read_module_eeprom   = hw_atl_b0_read_module_eeprom,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h<br/>index b1c0b6850e60..5298846dd9f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_b0.h: Declaration of abstract interface for Atlantic hardware</div><div class='hunk'>@@ -20,20 +18,58 @@ extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc100;</div><div class='ctx'> extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc107;</div><div class='ctx'> extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc108;</div><div class='ctx'> extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc109;</div><div class='del'>-</div><div class='del'>-#define hw_atl_b0_caps_aqc111 hw_atl_b0_caps_aqc108</div><div class='del'>-#define hw_atl_b0_caps_aqc112 hw_atl_b0_caps_aqc109</div><div class='add'>+extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc111;</div><div class='add'>+extern const struct aq_hw_caps_s hw_atl_b0_caps_aqc112;</div><div class='ctx'> </div><div class='ctx'> #define hw_atl_b0_caps_aqc100s hw_atl_b0_caps_aqc100</div><div class='ctx'> #define hw_atl_b0_caps_aqc107s hw_atl_b0_caps_aqc107</div><div class='ctx'> #define hw_atl_b0_caps_aqc108s hw_atl_b0_caps_aqc108</div><div class='ctx'> #define hw_atl_b0_caps_aqc109s hw_atl_b0_caps_aqc109</div><div class='del'>-</div><div class='del'>-#define hw_atl_b0_caps_aqc111s hw_atl_b0_caps_aqc108</div><div class='del'>-#define hw_atl_b0_caps_aqc112s hw_atl_b0_caps_aqc109</div><div class='add'>+#define hw_atl_b0_caps_aqc111s hw_atl_b0_caps_aqc111</div><div class='add'>+#define hw_atl_b0_caps_aqc112s hw_atl_b0_caps_aqc112</div><div class='ctx'> </div><div class='ctx'> extern const struct aq_hw_ops hw_atl_ops_b0;</div><div class='ctx'> </div><div class='ctx'> #define hw_atl_ops_b1 hw_atl_ops_b0</div><div class='ctx'> </div><div class='add'>+int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self,</div><div class='add'>+			      struct aq_rss_parameters *rss_params);</div><div class='add'>+int hw_atl_b0_hw_offload_set(struct aq_hw_s *self,</div><div class='add'>+			     struct aq_nic_cfg_s *aq_nic_cfg);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_ring_tx_start(struct aq_hw_s *self, struct aq_ring_s *ring);</div><div class='add'>+int hw_atl_b0_hw_ring_rx_start(struct aq_hw_s *self, struct aq_ring_s *ring);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_ring_rx_init(struct aq_hw_s *self, struct aq_ring_s *aq_ring,</div><div class='add'>+			      struct aq_ring_param_s *aq_ring_param);</div><div class='add'>+int hw_atl_b0_hw_ring_rx_fill(struct aq_hw_s *self, struct aq_ring_s *ring,</div><div class='add'>+			      unsigned int sw_tail_old);</div><div class='add'>+int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, struct aq_ring_s *ring);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_ring_tx_init(struct aq_hw_s *self, struct aq_ring_s *aq_ring,</div><div class='add'>+			      struct aq_ring_param_s *aq_ring_param);</div><div class='add'>+int hw_atl_b0_hw_ring_tx_xmit(struct aq_hw_s *self, struct aq_ring_s *ring,</div><div class='add'>+			      unsigned int frags);</div><div class='add'>+int hw_atl_b0_hw_ring_tx_head_update(struct aq_hw_s *self,</div><div class='add'>+				     struct aq_ring_s *ring);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_ring_tx_stop(struct aq_hw_s *self, struct aq_ring_s *ring);</div><div class='add'>+int hw_atl_b0_hw_ring_rx_stop(struct aq_hw_s *self, struct aq_ring_s *ring);</div><div class='add'>+</div><div class='add'>+void hw_atl_b0_hw_init_rx_rss_ctrl1(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_mac_addr_set(struct aq_hw_s *self, const u8 *mac_addr);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_set_fc(struct aq_hw_s *self, u32 fc, u32 tc);</div><div class='add'>+int hw_atl_b0_set_loopback(struct aq_hw_s *self, u32 mode, bool enable);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_start(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_irq_enable(struct aq_hw_s *self, u64 mask);</div><div class='add'>+int hw_atl_b0_hw_irq_disable(struct aq_hw_s *self, u64 mask);</div><div class='add'>+int hw_atl_b0_hw_irq_read(struct aq_hw_s *self, u64 *mask);</div><div class='add'>+</div><div class='add'>+int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self,</div><div class='add'>+				   unsigned int packet_filter);</div><div class='add'>+</div><div class='ctx'> #endif /* HW_ATL_B0_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h<br/>index ea98a08d7820..cf460d61a45e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation. All rights reserved</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_b0_internal.h: Definition of Atlantic B0 chip specific</div><div class='hunk'>@@ -67,15 +64,18 @@</div><div class='ctx'> #define HW_ATL_B0_MPI_SPEED_MSK         0xFFFFU</div><div class='ctx'> #define HW_ATL_B0_MPI_SPEED_SHIFT       16U</div><div class='ctx'> </div><div class='del'>-#define HW_ATL_B0_TXBUF_MAX  160U</div><div class='del'>-#define HW_ATL_B0_RXBUF_MAX  320U</div><div class='add'>+#define HW_ATL_B0_TXBUF_MAX              160U</div><div class='add'>+#define HW_ATL_B0_PTP_TXBUF_SIZE           8U</div><div class='add'>+</div><div class='add'>+#define HW_ATL_B0_RXBUF_MAX              320U</div><div class='add'>+#define HW_ATL_B0_PTP_RXBUF_SIZE          16U</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_B0_RSS_REDIRECTION_MAX 64U</div><div class='ctx'> #define HW_ATL_B0_RSS_REDIRECTION_BITS 3U</div><div class='ctx'> #define HW_ATL_B0_RSS_HASHKEY_BITS 320U</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_B0_TCRSS_4_8  1</div><div class='del'>-#define HW_ATL_B0_TC_MAX 1U</div><div class='add'>+#define HW_ATL_B0_TC_MAX 8U</div><div class='ctx'> #define HW_ATL_B0_RSS_MAX 8U</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_B0_LRO_RXD_MAX 16U</div><div class='hunk'>@@ -110,10 +110,17 @@</div><div class='ctx'> #define HW_ATL_B0_RXD_NCEA0 (0x1)</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT_RSSTYPE (0x0000000F)</div><div class='add'>+#define HW_ATL_B0_RXD_WB_STAT_RSSTYPE_SHIFT (0x0)</div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT_PKTTYPE (0x00000FF0)</div><div class='add'>+#define HW_ATL_B0_RXD_WB_STAT_PKTTYPE_SHIFT (0x4)</div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT_RXCTRL  (0x00180000)</div><div class='add'>+#define HW_ATL_B0_RXD_WB_STAT_RXCTRL_SHIFT (0x13)</div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT_SPLHDR  (0x00200000)</div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT_HDRLEN  (0xFFC00000)</div><div class='add'>+#define HW_ATL_B0_RXD_WB_STAT_HDRLEN_SHIFT (0x16)</div><div class='add'>+</div><div class='add'>+#define HW_ATL_B0_RXD_WB_PKTTYPE_VLAN          BIT(5)</div><div class='add'>+#define HW_ATL_B0_RXD_WB_PKTTYPE_VLAN_DOUBLE   BIT(6)</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT2_DD      (0x0001)</div><div class='ctx'> #define HW_ATL_B0_RXD_WB_STAT2_EOP     (0x0002)</div><div class='hunk'>@@ -144,6 +151,10 @@</div><div class='ctx'> #define HW_ATL_B0_MAX_RXD 8184U</div><div class='ctx'> #define HW_ATL_B0_MAX_TXD 8184U</div><div class='ctx'> </div><div class='add'>+#define HW_ATL_RSS_DISABLED 0x00000000U</div><div class='add'>+#define HW_ATL_RSS_ENABLED_8TCS_2INDEX_BITS 0xA2222222U</div><div class='add'>+#define HW_ATL_RSS_ENABLED_4TCS_3INDEX_BITS 0x80003333U</div><div class='add'>+</div><div class='ctx'> /* HW layer capabilities */</div><div class='ctx'> </div><div class='ctx'> #endif /* HW_ATL_B0_INTERNAL_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c<br/>index eaab25cd08b3..d07af1271d59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_llh.c: Definitions of bitfield and register access functions for</div><div class='hunk'>@@ -15,6 +13,93 @@</div><div class='ctx'> #include "hw_atl_llh_internal.h"</div><div class='ctx'> #include "../aq_hw_utils.h"</div><div class='ctx'> </div><div class='add'>+void hw_atl_ts_reset_set(struct aq_hw_s *aq_hw, u32 val)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TS_RESET_ADR,</div><div class='add'>+			    HW_ATL_TS_RESET_MSK,</div><div class='add'>+			    HW_ATL_TS_RESET_SHIFT,</div><div class='add'>+			    val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_ts_power_down_set(struct aq_hw_s *aq_hw, u32 val)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TS_POWER_DOWN_ADR,</div><div class='add'>+			    HW_ATL_TS_POWER_DOWN_MSK,</div><div class='add'>+			    HW_ATL_TS_POWER_DOWN_SHIFT,</div><div class='add'>+			    val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_ts_power_down_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_TS_POWER_DOWN_ADR,</div><div class='add'>+				  HW_ATL_TS_POWER_DOWN_MSK,</div><div class='add'>+				  HW_ATL_TS_POWER_DOWN_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_ts_ready_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_TS_READY_ADR,</div><div class='add'>+				  HW_ATL_TS_READY_MSK,</div><div class='add'>+				  HW_ATL_TS_READY_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_ts_ready_latch_high_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_TS_READY_LATCH_HIGH_ADR,</div><div class='add'>+				  HW_ATL_TS_READY_LATCH_HIGH_MSK,</div><div class='add'>+				  HW_ATL_TS_READY_LATCH_HIGH_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_ts_data_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_TS_DATA_OUT_ADR,</div><div class='add'>+				  HW_ATL_TS_DATA_OUT_MSK,</div><div class='add'>+				  HW_ATL_TS_DATA_OUT_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_smb0_bus_busy_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_SMB0_BUS_BUSY_ADR,</div><div class='add'>+				HW_ATL_SMB0_BUS_BUSY_MSK,</div><div class='add'>+				HW_ATL_SMB0_BUS_BUSY_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_smb0_byte_transfer_complete_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_ADR,</div><div class='add'>+				HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_MSK,</div><div class='add'>+				HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_smb0_receive_acknowledged_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_SMB0_RX_ACKNOWLEDGED_ADR,</div><div class='add'>+				HW_ATL_SMB0_RX_ACKNOWLEDGED_MSK,</div><div class='add'>+				HW_ATL_SMB0_RX_ACKNOWLEDGED_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_smb0_repeated_start_detect_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_SMB0_REPEATED_START_DETECT_ADR,</div><div class='add'>+				HW_ATL_SMB0_REPEATED_START_DETECT_MSK,</div><div class='add'>+				HW_ATL_SMB0_REPEATED_START_DETECT_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_smb0_rx_data_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_SMB0_RECEIVED_DATA_ADR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_smb0_tx_data_set(struct aq_hw_s *aq_hw, u32 data)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_write_reg(aq_hw, HW_ATL_SMB0_TRANSMITTED_DATA_ADR, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_smb0_provisioning2_set(struct aq_hw_s *aq_hw, u32 data)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_write_reg(aq_hw, HW_ATL_SMB0_PROVISIONING2_ADR, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* global */</div><div class='ctx'> void hw_atl_reg_glb_cpu_sem_set(struct aq_hw_s *aq_hw, u32 glb_cpu_sem,</div><div class='ctx'> 				u32 semaphore)</div><div class='hunk'>@@ -566,6 +651,13 @@ void hw_atl_rpb_dma_sys_lbk_set(struct aq_hw_s *aq_hw, u32 dma_sys_lbk)</div><div class='ctx'> 			    HW_ATL_RPB_DMA_SYS_LBK_SHIFT, dma_sys_lbk);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hw_atl_rpb_dma_net_lbk_set(struct aq_hw_s *aq_hw, u32 dma_net_lbk)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_RPB_DMA_NET_LBK_ADR,</div><div class='add'>+			    HW_ATL_RPB_DMA_NET_LBK_MSK,</div><div class='add'>+			    HW_ATL_RPB_DMA_NET_LBK_SHIFT, dma_net_lbk);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_rpb_rpf_rx_traf_class_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					   u32 rx_traf_class_mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -575,6 +667,13 @@ void hw_atl_rpb_rpf_rx_traf_class_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			    rx_traf_class_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 hw_atl_rpb_rpf_rx_traf_class_mode_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_RPB_RPF_RX_TC_MODE_ADR,</div><div class='add'>+			HW_ATL_RPB_RPF_RX_TC_MODE_MSK,</div><div class='add'>+			HW_ATL_RPB_RPF_RX_TC_MODE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_rpb_rx_buff_en_set(struct aq_hw_s *aq_hw, u32 rx_buff_en)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_RPB_RX_BUF_EN_ADR,</div><div class='hunk'>@@ -609,12 +708,25 @@ void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw, u32 rx_flow_ctl_mode</div><div class='ctx'> 			    HW_ATL_RPB_RX_FC_MODE_SHIFT, rx_flow_ctl_mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hw_atl_rdm_rx_dma_desc_cache_init_set(struct aq_hw_s *aq_hw, u32 init)</div><div class='add'>+void hw_atl_rdm_rx_dma_desc_cache_init_tgl(struct aq_hw_s *aq_hw)</div><div class='ctx'> {</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = aq_hw_read_reg_bit(aq_hw, HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR,</div><div class='add'>+				 HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK,</div><div class='add'>+				 HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT);</div><div class='add'>+</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_ADR,</div><div class='ctx'> 			    HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_MSK,</div><div class='ctx'> 			    HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_SHIFT,</div><div class='del'>-			    init);</div><div class='add'>+			    val ^ 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_rdm_rx_dma_desc_cache_init_done_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, RDM_RX_DMA_DESC_CACHE_INIT_DONE_ADR,</div><div class='add'>+				  RDM_RX_DMA_DESC_CACHE_INIT_DONE_MSK,</div><div class='add'>+				  RDM_RX_DMA_DESC_CACHE_INIT_DONE_SHIFT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_rpb_rx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='hunk'>@@ -626,8 +738,8 @@ void hw_atl_rpb_rx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			    rx_pkt_buff_size_per_tc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hw_atl_rpb_rx_xoff_en_per_tc_set(struct aq_hw_s *aq_hw, u32 rx_xoff_en_per_tc,</div><div class='del'>-				      u32 buffer)</div><div class='add'>+void hw_atl_rpb_rx_xoff_en_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 rx_xoff_en_per_tc, u32 buffer)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_RPB_RXBXOFF_EN_ADR(buffer),</div><div class='ctx'> 			    HW_ATL_RPB_RXBXOFF_EN_MSK,</div><div class='hunk'>@@ -669,6 +781,13 @@ void hw_atl_rpfl2multicast_flr_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			    HW_ATL_RPFL2MC_ENF_SHIFT, l2multicast_flr_en);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 hw_atl_rpfl2promiscuous_mode_en_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_RPFL2PROMIS_MODE_ADR,</div><div class='add'>+				  HW_ATL_RPFL2PROMIS_MODE_MSK,</div><div class='add'>+				  HW_ATL_RPFL2PROMIS_MODE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_rpfl2promiscuous_mode_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					 u32 l2promiscuous_mode_en)</div><div class='ctx'> {</div><div class='hunk'>@@ -723,7 +842,7 @@ void hw_atl_rpfl2_accept_all_mc_packets_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_rpf_rpb_user_priority_tc_map_set(struct aq_hw_s *aq_hw,</div><div class='del'>-					     u32 user_priority_tc_map, u32 tc)</div><div class='add'>+					     u32 user_priority, u32 tc)</div><div class='ctx'> {</div><div class='ctx'> /* register address for bitfield rx_tc_up{t}[2:0] */</div><div class='ctx'> 	static u32 rpf_rpb_rx_tc_upt_adr[8] = {</div><div class='hunk'>@@ -742,10 +861,9 @@ void hw_atl_rpf_rpb_user_priority_tc_map_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			0U, 4U, 8U, 12U, 16U, 20U, 24U, 28U</div><div class='ctx'> 		};</div><div class='ctx'> </div><div class='del'>-	aq_hw_write_reg_bit(aq_hw, rpf_rpb_rx_tc_upt_adr[tc],</div><div class='del'>-			    rpf_rpb_rx_tc_upt_msk[tc],</div><div class='del'>-			    rpf_rpb_rx_tc_upt_shft[tc],</div><div class='del'>-			    user_priority_tc_map);</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, rpf_rpb_rx_tc_upt_adr[user_priority],</div><div class='add'>+			    rpf_rpb_rx_tc_upt_msk[user_priority],</div><div class='add'>+			    rpf_rpb_rx_tc_upt_shft[user_priority], tc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_rpf_rss_key_addr_set(struct aq_hw_s *aq_hw, u32 rss_key_addr)</div><div class='hunk'>@@ -843,6 +961,13 @@ void hw_atl_rpf_vlan_prom_mode_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			    vlan_prom_mode_en);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 hw_atl_rpf_vlan_prom_mode_en_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_RPF_VL_PROMIS_MODE_ADR,</div><div class='add'>+				  HW_ATL_RPF_VL_PROMIS_MODE_MSK,</div><div class='add'>+				  HW_ATL_RPF_VL_PROMIS_MODE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_rpf_vlan_accept_untagged_packets_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 						 u32 vlan_acc_untagged_packets)</div><div class='ctx'> {</div><div class='hunk'>@@ -1007,6 +1132,22 @@ void hw_atl_rpo_rx_desc_vlan_stripping_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			    rx_desc_vlan_stripping);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hw_atl_rpo_outer_vlan_tag_mode_set(void *context,</div><div class='add'>+					u32 outervlantagmode)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(context, HW_ATL_RPO_OUTER_VL_INS_MODE_ADR,</div><div class='add'>+			    HW_ATL_RPO_OUTER_VL_INS_MODE_MSK,</div><div class='add'>+			    HW_ATL_RPO_OUTER_VL_INS_MODE_SHIFT,</div><div class='add'>+			    outervlantagmode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_rpo_outer_vlan_tag_mode_get(void *context)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(context, HW_ATL_RPO_OUTER_VL_INS_MODE_ADR,</div><div class='add'>+				  HW_ATL_RPO_OUTER_VL_INS_MODE_MSK,</div><div class='add'>+				  HW_ATL_RPO_OUTER_VL_INS_MODE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_rpo_tcp_udp_crc_offload_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					   u32 tcp_udp_crc_offload_en)</div><div class='ctx'> {</div><div class='hunk'>@@ -1264,7 +1405,14 @@ void hw_atl_tpb_tx_buff_en_set(struct aq_hw_s *aq_hw, u32 tx_buff_en)</div><div class='ctx'> 			    HW_ATL_TPB_TX_BUF_EN_SHIFT, tx_buff_en);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void hw_atl_rpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+u32 hw_atl_tpb_tps_tx_tc_mode_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_TPB_TX_TC_MODE_ADDR,</div><div class='add'>+			HW_ATL_TPB_TX_TC_MODE_MSK,</div><div class='add'>+			HW_ATL_TPB_TX_TC_MODE_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_tpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 				   u32 tx_traf_class_mode)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPB_TX_TC_MODE_ADDR,</div><div class='hunk'>@@ -1301,7 +1449,26 @@ void hw_atl_tpb_tx_dma_sys_lbk_en_set(struct aq_hw_s *aq_hw, u32 tx_dma_sys_lbk_</div><div class='ctx'> 			    tx_dma_sys_lbk_en);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hw_atl_tpb_tx_dma_net_lbk_en_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 tx_dma_net_lbk_en)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPB_DMA_NET_LBK_ADR,</div><div class='add'>+			    HW_ATL_TPB_DMA_NET_LBK_MSK,</div><div class='add'>+			    HW_ATL_TPB_DMA_NET_LBK_SHIFT,</div><div class='add'>+			    tx_dma_net_lbk_en);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_tpb_tx_tx_clk_gate_en_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 tx_clk_gate_en)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPB_TX_CLK_GATE_EN_ADR,</div><div class='add'>+			    HW_ATL_TPB_TX_CLK_GATE_EN_MSK,</div><div class='add'>+			    HW_ATL_TPB_TX_CLK_GATE_EN_SHIFT,</div><div class='add'>+			    tx_clk_gate_en);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_tpb_tx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='add'>+</div><div class='ctx'> 					    u32 tx_pkt_buff_size_per_tc, u32 buffer)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPB_TXBBUF_SIZE_ADR(buffer),</div><div class='hunk'>@@ -1384,8 +1551,8 @@ void hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='del'>-						   u32 max_credit,</div><div class='del'>-						   u32 tc)</div><div class='add'>+						   const u32 tc,</div><div class='add'>+						   const u32 max_credit)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_TCTCREDIT_MAX_ADR(tc),</div><div class='ctx'> 			    HW_ATL_TPS_DESC_TCTCREDIT_MAX_MSK,</div><div class='hunk'>@@ -1394,13 +1561,13 @@ void hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(struct aq_hw_s *aq_hw,</div><div class='del'>-					       u32 tx_pkt_shed_desc_tc_weight,</div><div class='del'>-					       u32 tc)</div><div class='add'>+					       const u32 tc,</div><div class='add'>+					       const u32 weight)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_TCTWEIGHT_ADR(tc),</div><div class='ctx'> 			    HW_ATL_TPS_DESC_TCTWEIGHT_MSK,</div><div class='ctx'> 			    HW_ATL_TPS_DESC_TCTWEIGHT_SHIFT,</div><div class='del'>-			    tx_pkt_shed_desc_tc_weight);</div><div class='add'>+			    weight);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='hunk'>@@ -1413,8 +1580,8 @@ void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='del'>-						   u32 max_credit,</div><div class='del'>-						   u32 tc)</div><div class='add'>+						   const u32 tc,</div><div class='add'>+						   const u32 max_credit)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DATA_TCTCREDIT_MAX_ADR(tc),</div><div class='ctx'> 			    HW_ATL_TPS_DATA_TCTCREDIT_MAX_MSK,</div><div class='hunk'>@@ -1423,13 +1590,49 @@ void hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,</div><div class='del'>-					       u32 tx_pkt_shed_tc_data_weight,</div><div class='del'>-					       u32 tc)</div><div class='add'>+					       const u32 tc,</div><div class='add'>+					       const u32 weight)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DATA_TCTWEIGHT_ADR(tc),</div><div class='ctx'> 			    HW_ATL_TPS_DATA_TCTWEIGHT_MSK,</div><div class='ctx'> 			    HW_ATL_TPS_DATA_TCTWEIGHT_SHIFT,</div><div class='del'>-			    tx_pkt_shed_tc_data_weight);</div><div class='add'>+			    weight);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_tps_tx_desc_rate_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      const u32 rate_mode)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_TX_DESC_RATE_MODE_ADR,</div><div class='add'>+			    HW_ATL_TPS_TX_DESC_RATE_MODE_MSK,</div><div class='add'>+			    HW_ATL_TPS_TX_DESC_RATE_MODE_SHIFT,</div><div class='add'>+			    rate_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_tps_tx_desc_rate_en_set(struct aq_hw_s *aq_hw, const u32 desc,</div><div class='add'>+				    const u32 enable)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_RATE_EN_ADR(desc),</div><div class='add'>+			    HW_ATL_TPS_DESC_RATE_EN_MSK,</div><div class='add'>+			    HW_ATL_TPS_DESC_RATE_EN_SHIFT,</div><div class='add'>+			    enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_tps_tx_desc_rate_x_set(struct aq_hw_s *aq_hw, const u32 desc,</div><div class='add'>+				   const u32 rate_int)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_RATE_X_ADR(desc),</div><div class='add'>+			    HW_ATL_TPS_DESC_RATE_X_MSK,</div><div class='add'>+			    HW_ATL_TPS_DESC_RATE_X_SHIFT,</div><div class='add'>+			    rate_int);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_tps_tx_desc_rate_y_set(struct aq_hw_s *aq_hw, const u32 desc,</div><div class='add'>+				   const u32 rate_frac)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_TPS_DESC_RATE_Y_ADR(desc),</div><div class='add'>+			    HW_ATL_TPS_DESC_RATE_Y_MSK,</div><div class='add'>+			    HW_ATL_TPS_DESC_RATE_Y_SHIFT,</div><div class='add'>+			    rate_frac);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* tx */</div><div class='hunk'>@@ -1500,6 +1703,20 @@ void hw_atl_reg_glb_cpu_scratch_scp_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 			glb_cpu_scratch_scp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void hw_atl_pcs_ptp_clock_read_enable(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 ptp_clock_read_enable)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_ADR,</div><div class='add'>+			    HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_MSK,</div><div class='add'>+			    HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_SHIFT,</div><div class='add'>+			    ptp_clock_read_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_pcs_ptp_clock_get(struct aq_hw_s *aq_hw, u32 index)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_PCS_PTP_TS_VAL_ADDR(index));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void hw_atl_mcp_up_force_intr_set(struct aq_hw_s *aq_hw, u32 up_force_intr)</div><div class='ctx'> {</div><div class='ctx'> 	aq_hw_write_reg_bit(aq_hw, HW_ATL_MCP_UP_FORCE_INTERRUPT_ADR,</div><div class='hunk'>@@ -1571,7 +1788,7 @@ void hw_atl_rpfl3l4_ipv6_src_addr_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='ctx'> 	for (i = 0; i &lt; 4; ++i)</div><div class='ctx'> 		aq_hw_write_reg(aq_hw,</div><div class='ctx'> 				HW_ATL_RPF_L3_SRCA_ADR(location + i),</div><div class='del'>-				ipv6_src[i]);</div><div class='add'>+				ipv6_src[3 - i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_rpfl3l4_ipv6_dest_addr_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='hunk'>@@ -1582,7 +1799,7 @@ void hw_atl_rpfl3l4_ipv6_dest_addr_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='ctx'> 	for (i = 0; i &lt; 4; ++i)</div><div class='ctx'> 		aq_hw_write_reg(aq_hw,</div><div class='ctx'> 				HW_ATL_RPF_L3_DSTA_ADR(location + i),</div><div class='del'>-				ipv6_dest[i]);</div><div class='add'>+				ipv6_dest[3 - i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 hw_atl_sem_ram_get(struct aq_hw_s *self)</div><div class='hunk'>@@ -1590,6 +1807,21 @@ u32 hw_atl_sem_ram_get(struct aq_hw_s *self)</div><div class='ctx'> 	return hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_RAM);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+u32 hw_atl_sem_mdio_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_MDIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_sem_reset1_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_RESET1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_sem_reset2_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_RESET2);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> u32 hw_atl_scrpad_get(struct aq_hw_s *aq_hw, u32 scratch_scp)</div><div class='ctx'> {</div><div class='ctx'> 	return aq_hw_read_reg(aq_hw,</div><div class='hunk'>@@ -1605,3 +1837,60 @@ u32 hw_atl_scrpad25_get(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	return hw_atl_scrpad_get(self, 0x18);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+void hw_atl_glb_mdio_iface1_set(struct aq_hw_s *aq_hw, u32 value)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(1), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_glb_mdio_iface1_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_glb_mdio_iface2_set(struct aq_hw_s *aq_hw, u32 value)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(2), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_glb_mdio_iface2_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_glb_mdio_iface3_set(struct aq_hw_s *aq_hw, u32 value)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(3), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_glb_mdio_iface3_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_glb_mdio_iface4_set(struct aq_hw_s *aq_hw, u32 value)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(4), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_glb_mdio_iface4_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl_glb_mdio_iface5_set(struct aq_hw_s *aq_hw, u32 value)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(5), value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_glb_mdio_iface5_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL_GLB_MDIO_IFACE_N_ADR(5));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl_mdio_busy_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL_MDIO_BUSY_ADR,</div><div class='add'>+				  HW_ATL_MDIO_BUSY_MSK,</div><div class='add'>+				  HW_ATL_MDIO_BUSY_SHIFT);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h<br/>index 2eb44e1cff70..5fd506acacb5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_llh.h: Declarations of bitfield and register access functions for</div><div class='hunk'>@@ -18,6 +16,45 @@</div><div class='ctx'> </div><div class='ctx'> struct aq_hw_s;</div><div class='ctx'> </div><div class='add'>+/* set temperature sense reset */</div><div class='add'>+void hw_atl_ts_reset_set(struct aq_hw_s *aq_hw, u32 val);</div><div class='add'>+</div><div class='add'>+/* set temperature sense power down */</div><div class='add'>+void hw_atl_ts_power_down_set(struct aq_hw_s *aq_hw, u32 val);</div><div class='add'>+</div><div class='add'>+/* get temperature sense power down */</div><div class='add'>+u32 hw_atl_ts_power_down_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* get temperature sense ready */</div><div class='add'>+u32 hw_atl_ts_ready_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* get temperature sense ready latch high */</div><div class='add'>+u32 hw_atl_ts_ready_latch_high_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* get temperature sense data */</div><div class='add'>+u32 hw_atl_ts_data_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 bus busy */</div><div class='add'>+u32 hw_atl_smb0_bus_busy_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 byte transfer complete */</div><div class='add'>+u32 hw_atl_smb0_byte_transfer_complete_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 receive acknowledged */</div><div class='add'>+u32 hw_atl_smb0_receive_acknowledged_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 set transmitted data (only leftmost byte of data valid) */</div><div class='add'>+void hw_atl_smb0_tx_data_set(struct aq_hw_s *aq_hw, u32 data);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 provisioning2 command register */</div><div class='add'>+void hw_atl_smb0_provisioning2_set(struct aq_hw_s *aq_hw, u32 data);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 repeated start detect */</div><div class='add'>+u32 hw_atl_smb0_repeated_start_detect_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* SMBUS0 received data register */</div><div class='add'>+u32 hw_atl_smb0_rx_data_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='ctx'> /* global */</div><div class='ctx'> </div><div class='ctx'> /* set global microprocessor semaphore */</div><div class='hunk'>@@ -291,10 +328,16 @@ void hw_atl_reg_glb_cpu_scratch_scp_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> /* set dma system loopback */</div><div class='ctx'> void hw_atl_rpb_dma_sys_lbk_set(struct aq_hw_s *aq_hw, u32 dma_sys_lbk);</div><div class='ctx'> </div><div class='add'>+/* set dma network loopback */</div><div class='add'>+void hw_atl_rpb_dma_net_lbk_set(struct aq_hw_s *aq_hw, u32 dma_net_lbk);</div><div class='add'>+</div><div class='ctx'> /* set rx traffic class mode */</div><div class='ctx'> void hw_atl_rpb_rpf_rx_traf_class_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					   u32 rx_traf_class_mode);</div><div class='ctx'> </div><div class='add'>+/* get rx traffic class mode */</div><div class='add'>+u32 hw_atl_rpb_rpf_rx_traf_class_mode_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='ctx'> /* set rx buffer enable */</div><div class='ctx'> void hw_atl_rpb_rx_buff_en_set(struct aq_hw_s *aq_hw, u32 rx_buff_en);</div><div class='ctx'> </div><div class='hunk'>@@ -309,18 +352,23 @@ void hw_atl_rpb_rx_buff_lo_threshold_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					 u32 buffer);</div><div class='ctx'> </div><div class='ctx'> /* set rx flow control mode */</div><div class='del'>-void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw, u32 rx_flow_ctl_mode);</div><div class='add'>+void hw_atl_rpb_rx_flow_ctl_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				     u32 rx_flow_ctl_mode);</div><div class='ctx'> </div><div class='ctx'> /* set rx packet buffer size (per tc) */</div><div class='ctx'> void hw_atl_rpb_rx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					    u32 rx_pkt_buff_size_per_tc,</div><div class='ctx'> 					    u32 buffer);</div><div class='ctx'> </div><div class='del'>-/* set rdm rx dma descriptor cache init */</div><div class='del'>-void hw_atl_rdm_rx_dma_desc_cache_init_set(struct aq_hw_s *aq_hw, u32 init);</div><div class='add'>+/* toggle rdm rx dma descriptor cache init */</div><div class='add'>+void hw_atl_rdm_rx_dma_desc_cache_init_tgl(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* get rdm rx dma descriptor cache init done */</div><div class='add'>+u32 hw_atl_rdm_rx_dma_desc_cache_init_done_get(struct aq_hw_s *aq_hw);</div><div class='ctx'> </div><div class='ctx'> /* set rx xoff enable (per tc) */</div><div class='del'>-void hw_atl_rpb_rx_xoff_en_per_tc_set(struct aq_hw_s *aq_hw, u32 rx_xoff_en_per_tc,</div><div class='add'>+void hw_atl_rpb_rx_xoff_en_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 rx_xoff_en_per_tc,</div><div class='ctx'> 				      u32 buffer);</div><div class='ctx'> </div><div class='ctx'> /* rpf */</div><div class='hunk'>@@ -341,6 +389,9 @@ void hw_atl_rpfl2multicast_flr_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 				      u32 l2multicast_flr_en,</div><div class='ctx'> 				      u32 filter);</div><div class='ctx'> </div><div class='add'>+/* get l2 promiscuous mode enable */</div><div class='add'>+u32 hw_atl_rpfl2promiscuous_mode_en_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='ctx'> /* set l2 promiscuous mode enable */</div><div class='ctx'> void hw_atl_rpfl2promiscuous_mode_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					 u32 l2promiscuous_mode_en);</div><div class='hunk'>@@ -412,6 +463,9 @@ void hw_atl_rpf_vlan_outer_etht_set(struct aq_hw_s *aq_hw, u32 vlan_outer_etht);</div><div class='ctx'> void hw_atl_rpf_vlan_prom_mode_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 				      u32 vlan_prom_mode_en);</div><div class='ctx'> </div><div class='add'>+/* Get VLAN promiscuous mode enable */</div><div class='add'>+u32 hw_atl_rpf_vlan_prom_mode_en_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='ctx'> /* Set VLAN untagged action */</div><div class='ctx'> void hw_atl_rpf_vlan_untagged_act_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 				      u32 vlan_untagged_act);</div><div class='hunk'>@@ -491,6 +545,11 @@ void hw_atl_rpo_rx_desc_vlan_stripping_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					   u32 rx_desc_vlan_stripping,</div><div class='ctx'> 					   u32 descriptor);</div><div class='ctx'> </div><div class='add'>+void hw_atl_rpo_outer_vlan_tag_mode_set(void *context,</div><div class='add'>+					u32 outervlantagmode);</div><div class='add'>+</div><div class='add'>+u32 hw_atl_rpo_outer_vlan_tag_mode_get(void *context);</div><div class='add'>+</div><div class='ctx'> /* set tcp/udp checksum offload enable */</div><div class='ctx'> void hw_atl_rpo_tcp_udp_crc_offload_en_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 					   u32 tcp_udp_crc_offload_en);</div><div class='hunk'>@@ -597,9 +656,12 @@ void hw_atl_thm_lso_tcp_flag_of_middle_pkt_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> /* tpb */</div><div class='ctx'> </div><div class='ctx'> /* set TX Traffic Class Mode */</div><div class='del'>-void hw_atl_rpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+void hw_atl_tpb_tps_tx_tc_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> 				   u32 tx_traf_class_mode);</div><div class='ctx'> </div><div class='add'>+/* get TX Traffic Class Mode */</div><div class='add'>+u32 hw_atl_tpb_tps_tx_tc_mode_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='ctx'> /* set tx buffer enable */</div><div class='ctx'> void hw_atl_tpb_tx_buff_en_set(struct aq_hw_s *aq_hw, u32 tx_buff_en);</div><div class='ctx'> </div><div class='hunk'>@@ -616,9 +678,18 @@ void hw_atl_tpb_tx_buff_lo_threshold_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> /* set tx dma system loopback enable */</div><div class='ctx'> void hw_atl_tpb_tx_dma_sys_lbk_en_set(struct aq_hw_s *aq_hw, u32 tx_dma_sys_lbk_en);</div><div class='ctx'> </div><div class='add'>+/* set tx dma network loopback enable */</div><div class='add'>+void hw_atl_tpb_tx_dma_net_lbk_en_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 tx_dma_net_lbk_en);</div><div class='add'>+</div><div class='add'>+/* set tx clock gating enable */</div><div class='add'>+void hw_atl_tpb_tx_tx_clk_gate_en_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 tx_clk_gate_en);</div><div class='add'>+</div><div class='ctx'> /* set tx packet buffer size (per tc) */</div><div class='ctx'> void hw_atl_tpb_tx_pkt_buff_size_per_tc_set(struct aq_hw_s *aq_hw,</div><div class='del'>-					    u32 tx_pkt_buff_size_per_tc, u32 buffer);</div><div class='add'>+					    u32 tx_pkt_buff_size_per_tc,</div><div class='add'>+					    u32 buffer);</div><div class='ctx'> </div><div class='ctx'> /* set tx path pad insert enable */</div><div class='ctx'> void hw_atl_tpb_tx_path_scp_ins_en_set(struct aq_hw_s *aq_hw, u32 tx_path_scp_ins_en);</div><div class='hunk'>@@ -657,13 +728,13 @@ void hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> </div><div class='ctx'> /* set tx packet scheduler descriptor tc max credit */</div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='del'>-						   u32 max_credit,</div><div class='del'>-					    u32 tc);</div><div class='add'>+						   const u32 tc,</div><div class='add'>+						   const u32 max_credit);</div><div class='ctx'> </div><div class='ctx'> /* set tx packet scheduler descriptor tc weight */</div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(struct aq_hw_s *aq_hw,</div><div class='del'>-					       u32 tx_pkt_shed_desc_tc_weight,</div><div class='del'>-					u32 tc);</div><div class='add'>+					       const u32 tc,</div><div class='add'>+					       const u32 weight);</div><div class='ctx'> </div><div class='ctx'> /* set tx packet scheduler descriptor vm arbitration mode */</div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='hunk'>@@ -671,13 +742,29 @@ void hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='ctx'> </div><div class='ctx'> /* set tx packet scheduler tc data max credit */</div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='del'>-						   u32 max_credit,</div><div class='del'>-					    u32 tc);</div><div class='add'>+						   const u32 tc,</div><div class='add'>+						   const u32 max_credit);</div><div class='ctx'> </div><div class='ctx'> /* set tx packet scheduler tc data weight */</div><div class='ctx'> void hw_atl_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,</div><div class='del'>-					       u32 tx_pkt_shed_tc_data_weight,</div><div class='del'>-					u32 tc);</div><div class='add'>+					       const u32 tc,</div><div class='add'>+					       const u32 weight);</div><div class='add'>+</div><div class='add'>+/* set tx descriptor rate mode */</div><div class='add'>+void hw_atl_tps_tx_desc_rate_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+				      const u32 rate_mode);</div><div class='add'>+</div><div class='add'>+/* set tx packet scheduler descriptor rate enable */</div><div class='add'>+void hw_atl_tps_tx_desc_rate_en_set(struct aq_hw_s *aq_hw, const u32 desc,</div><div class='add'>+				    const u32 enable);</div><div class='add'>+</div><div class='add'>+/* set tx packet scheduler descriptor rate integral value */</div><div class='add'>+void hw_atl_tps_tx_desc_rate_x_set(struct aq_hw_s *aq_hw, const u32 desc,</div><div class='add'>+				   const u32 rate_int);</div><div class='add'>+</div><div class='add'>+/* set tx packet scheduler descriptor rate fractional value */</div><div class='add'>+void hw_atl_tps_tx_desc_rate_y_set(struct aq_hw_s *aq_hw, const u32 desc,</div><div class='add'>+				   const u32 rate_frac);</div><div class='ctx'> </div><div class='ctx'> /* tx */</div><div class='ctx'> </div><div class='hunk'>@@ -710,6 +797,12 @@ void hw_atl_msm_reg_wr_strobe_set(struct aq_hw_s *aq_hw, u32 reg_wr_strobe);</div><div class='ctx'> /* set pci register reset disable */</div><div class='ctx'> void hw_atl_pci_pci_reg_res_dis_set(struct aq_hw_s *aq_hw, u32 pci_reg_res_dis);</div><div class='ctx'> </div><div class='add'>+/* pcs */</div><div class='add'>+void hw_atl_pcs_ptp_clock_read_enable(struct aq_hw_s *aq_hw,</div><div class='add'>+				      u32 ptp_clock_read_enable);</div><div class='add'>+</div><div class='add'>+u32 hw_atl_pcs_ptp_clock_get(struct aq_hw_s *aq_hw, u32 index);</div><div class='add'>+</div><div class='ctx'> /* set uP Force Interrupt */</div><div class='ctx'> void hw_atl_mcp_up_force_intr_set(struct aq_hw_s *aq_hw, u32 up_force_intr);</div><div class='ctx'> </div><div class='hunk'>@@ -747,9 +840,47 @@ void hw_atl_rpfl3l4_ipv6_src_addr_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='ctx'> void hw_atl_rpfl3l4_ipv6_dest_addr_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='ctx'> 				       u32 *ipv6_dest);</div><div class='ctx'> </div><div class='add'>+/* set Global MDIO Interface 1 */</div><div class='add'>+void hw_atl_glb_mdio_iface1_set(struct aq_hw_s *hw, u32 value);</div><div class='add'>+</div><div class='add'>+/* get Global MDIO Interface 1 */</div><div class='add'>+u32 hw_atl_glb_mdio_iface1_get(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+/* set Global MDIO Interface 2 */</div><div class='add'>+void hw_atl_glb_mdio_iface2_set(struct aq_hw_s *hw, u32 value);</div><div class='add'>+</div><div class='add'>+/* get Global MDIO Interface 2 */</div><div class='add'>+u32 hw_atl_glb_mdio_iface2_get(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+/* set Global MDIO Interface 3 */</div><div class='add'>+void hw_atl_glb_mdio_iface3_set(struct aq_hw_s *hw, u32 value);</div><div class='add'>+</div><div class='add'>+/* get Global MDIO Interface 3 */</div><div class='add'>+u32 hw_atl_glb_mdio_iface3_get(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+/* set Global MDIO Interface 4 */</div><div class='add'>+void hw_atl_glb_mdio_iface4_set(struct aq_hw_s *hw, u32 value);</div><div class='add'>+</div><div class='add'>+/* get Global MDIO Interface 4 */</div><div class='add'>+u32 hw_atl_glb_mdio_iface4_get(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+/* set Global MDIO Interface 5 */</div><div class='add'>+void hw_atl_glb_mdio_iface5_set(struct aq_hw_s *hw, u32 value);</div><div class='add'>+</div><div class='add'>+/* get Global MDIO Interface 5 */</div><div class='add'>+u32 hw_atl_glb_mdio_iface5_get(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+u32 hw_atl_mdio_busy_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='ctx'> /* get global microprocessor ram semaphore */</div><div class='ctx'> u32 hw_atl_sem_ram_get(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='add'>+/* get global microprocessor mdio semaphore */</div><div class='add'>+u32 hw_atl_sem_mdio_get(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+u32 hw_atl_sem_reset1_get(struct aq_hw_s *self);</div><div class='add'>+u32 hw_atl_sem_reset2_get(struct aq_hw_s *self);</div><div class='add'>+</div><div class='ctx'> /* get global microprocessor scratch pad register */</div><div class='ctx'> u32 hw_atl_scrpad_get(struct aq_hw_s *aq_hw, u32 scratch_scp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h<br/>index b64140924a02..fce30d90b6cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh_internal.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_llh_internal.h: Preprocessor definitions</div><div class='hunk'>@@ -14,6 +12,68 @@</div><div class='ctx'> #ifndef HW_ATL_LLH_INTERNAL_H</div><div class='ctx'> #define HW_ATL_LLH_INTERNAL_H</div><div class='ctx'> </div><div class='add'>+/* COM Temperature Sense Reset Bitfield Definitions */</div><div class='add'>+#define HW_ATL_TS_RESET_ADR 0x00003100</div><div class='add'>+#define HW_ATL_TS_RESET_MSK 0x00000004</div><div class='add'>+#define HW_ATL_TS_RESET_SHIFT 2</div><div class='add'>+#define HW_ATL_TS_RESET_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* COM Temperature Sense Power Down Bitfield Definitions */</div><div class='add'>+#define HW_ATL_TS_POWER_DOWN_ADR 0x00003100</div><div class='add'>+#define HW_ATL_TS_POWER_DOWN_MSK 0x00000001</div><div class='add'>+#define HW_ATL_TS_POWER_DOWN_SHIFT 0</div><div class='add'>+#define HW_ATL_TS_POWER_DOWN_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* COM Temperature Sense Ready Bitfield Definitions */</div><div class='add'>+#define HW_ATL_TS_READY_ADR 0x00003120</div><div class='add'>+#define HW_ATL_TS_READY_MSK 0x80000000</div><div class='add'>+#define HW_ATL_TS_READY_SHIFT 31</div><div class='add'>+#define HW_ATL_TS_READY_WIDTH 1</div><div class='add'>+</div><div class='add'>+/*  COM Temperature Sense Ready Latch High Bitfield Definitions */</div><div class='add'>+#define HW_ATL_TS_READY_LATCH_HIGH_ADR 0x00003120</div><div class='add'>+#define HW_ATL_TS_READY_LATCH_HIGH_MSK 0x40000000</div><div class='add'>+#define HW_ATL_TS_READY_LATCH_HIGH_SHIFT 30</div><div class='add'>+#define HW_ATL_TS_READY_LATCH_HIGH_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* COM Temperature Sense Data Out [B:0] Bitfield Definitions */</div><div class='add'>+#define HW_ATL_TS_DATA_OUT_ADR 0x00003120</div><div class='add'>+#define HW_ATL_TS_DATA_OUT_MSK 0x00000FFF</div><div class='add'>+#define HW_ATL_TS_DATA_OUT_SHIFT 0</div><div class='add'>+#define HW_ATL_TS_DATA_OUT_WIDTH 12</div><div class='add'>+</div><div class='add'>+/* SMBUS0 Received Data register */</div><div class='add'>+#define HW_ATL_SMB0_RECEIVED_DATA_ADR 0x00000748</div><div class='add'>+/* SMBUS0 Transmitted Data register */</div><div class='add'>+#define HW_ATL_SMB0_TRANSMITTED_DATA_ADR 0x00000608</div><div class='add'>+</div><div class='add'>+/* SMBUS0 Global Provisioning 2 register */</div><div class='add'>+#define HW_ATL_SMB0_PROVISIONING2_ADR 0x00000604</div><div class='add'>+</div><div class='add'>+/* SMBUS0 Bus Busy Bitfield Definitions */</div><div class='add'>+#define HW_ATL_SMB0_BUS_BUSY_ADR 0x00000744</div><div class='add'>+#define HW_ATL_SMB0_BUS_BUSY_MSK 0x00000080</div><div class='add'>+#define HW_ATL_SMB0_BUS_BUSY_SHIFT 7</div><div class='add'>+#define HW_ATL_SMB0_BUS_BUSY_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* SMBUS0 Byte Transfer Complete Bitfield Definitions */</div><div class='add'>+#define HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_ADR 0x00000744</div><div class='add'>+#define HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_MSK 0x00000002</div><div class='add'>+#define HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_SHIFT 1</div><div class='add'>+#define HW_ATL_SMB0_BYTE_TRANSFER_COMPLETE_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* SMBUS0 Receive Acknowledge Bitfield Definitions */</div><div class='add'>+#define HW_ATL_SMB0_RX_ACKNOWLEDGED_ADR 0x00000744</div><div class='add'>+#define HW_ATL_SMB0_RX_ACKNOWLEDGED_MSK 0x00000100</div><div class='add'>+#define HW_ATL_SMB0_RX_ACKNOWLEDGED_SHIFT 8</div><div class='add'>+#define HW_ATL_SMB0_RX_ACKNOWLEDGED_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* SMBUS0 Repeated Start Detect Bitfield Definitions */</div><div class='add'>+#define HW_ATL_SMB0_REPEATED_START_DETECT_ADR 0x00000744</div><div class='add'>+#define HW_ATL_SMB0_REPEATED_START_DETECT_MSK 0x00000004</div><div class='add'>+#define HW_ATL_SMB0_REPEATED_START_DETECT_SHIFT 2</div><div class='add'>+#define HW_ATL_SMB0_REPEATED_START_DETECT_WIDTH 1</div><div class='add'>+</div><div class='ctx'> /* global microprocessor semaphore  definitions</div><div class='ctx'>  * base address: 0x000003a0</div><div class='ctx'>  * parameter: semaphore {s} | stride size 0x4 | range [0, 15]</div><div class='hunk'>@@ -321,6 +381,25 @@</div><div class='ctx'> /* default value of bitfield rdm_desc_init_i */</div><div class='ctx'> #define HW_ATL_RDM_RX_DMA_DESC_CACHE_INIT_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* rdm_desc_init_done_i bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield rdm_desc_init_done_i.</div><div class='add'>+ * port="pif_rdm_desc_init_done_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield rdm_desc_init_done_i */</div><div class='add'>+#define RDM_RX_DMA_DESC_CACHE_INIT_DONE_ADR 0x00005a10</div><div class='add'>+/* bitmask for bitfield rdm_desc_init_done_i */</div><div class='add'>+#define RDM_RX_DMA_DESC_CACHE_INIT_DONE_MSK 0x00000001U</div><div class='add'>+/* inverted bitmask for bitfield rdm_desc_init_done_i */</div><div class='add'>+#define RDM_RX_DMA_DESC_CACHE_INIT_DONE_MSKN 0xfffffffe</div><div class='add'>+/* lower bit position of bitfield  rdm_desc_init_done_i */</div><div class='add'>+#define RDM_RX_DMA_DESC_CACHE_INIT_DONE_SHIFT 0U</div><div class='add'>+/* width of bitfield rdm_desc_init_done_i */</div><div class='add'>+#define RDM_RX_DMA_DESC_CACHE_INIT_DONE_WIDTH 1</div><div class='add'>+/* default value of bitfield rdm_desc_init_done_i */</div><div class='add'>+#define RDM_RX_DMA_DESC_CACHE_INIT_DONE_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> /* rx int_desc_wrb_en bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "int_desc_wrb_en".</div><div class='ctx'>  * port="pif_rdm_int_desc_wrb_en_i"</div><div class='hunk'>@@ -538,6 +617,24 @@</div><div class='ctx'> /* default value of bitfield dma_sys_loopback */</div><div class='ctx'> #define HW_ATL_RPB_DMA_SYS_LBK_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* rx dma_net_loopback bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "dma_net_loopback".</div><div class='add'>+ * port="pif_rpb_dma_net_lbk_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_RPB_DMA_NET_LBK_ADR 0x00005000</div><div class='add'>+/* bitmask for bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_RPB_DMA_NET_LBK_MSK 0x00000010</div><div class='add'>+/* inverted bitmask for bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_RPB_DMA_NET_LBK_MSKN 0xffffffef</div><div class='add'>+/* lower bit position of bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_RPB_DMA_NET_LBK_SHIFT 4</div><div class='add'>+/* width of bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_RPB_DMA_NET_LBK_WIDTH 1</div><div class='add'>+/* default value of bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_RPB_DMA_NET_LBK_DEFAULT 0x0</div><div class='add'>+</div><div class='ctx'> /* rx rx_tc_mode bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "rx_tc_mode".</div><div class='ctx'>  * port="pif_rpb_rx_tc_mode_i,pif_rpf_rx_tc_mode_i"</div><div class='hunk'>@@ -1292,6 +1389,52 @@</div><div class='ctx'> /* default value of bitfield et_val{f}[f:0] */</div><div class='ctx'> #define HW_ATL_RPF_ET_VALF_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* RX l3_l4_en{F} Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "l3_l4_en{F}".</div><div class='add'>+ * Parameter: filter {F} | stride size 0x4 | range [0, 7]</div><div class='add'>+ * PORT="pif_rpf_l3_l4_en_i[0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HW_ATL_RPF_L3_REG_CTRL_ADR(filter) (0x00005380 + (filter) * 0x4)</div><div class='add'>+</div><div class='add'>+/* RX rpf_l3_sa{D}[1F:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "l3_sa{D}[1F:0]".</div><div class='add'>+ * Parameter: location {D} | stride size 0x4 | range [0, 7]</div><div class='add'>+ * PORT="pif_rpf_l3_sa0_i[31:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield pif_rpf_l3_sa0_i[31:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_SRCA_ADR(filter) (0x000053B0 + (filter) * 0x4)</div><div class='add'>+/* Bitmask for bitfield l3_sa0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_SRCA_MSK 0xFFFFFFFFu</div><div class='add'>+/* Inverted bitmask for bitfield l3_sa0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_SRCA_MSKN 0xFFFFFFFFu</div><div class='add'>+/* Lower bit position of bitfield l3_sa0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_SRCA_SHIFT 0</div><div class='add'>+/* Width of bitfield l3_sa0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_SRCA_WIDTH 32</div><div class='add'>+/* Default value of bitfield l3_sa0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_SRCA_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* RX rpf_l3_da{D}[1F:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "l3_da{D}[1F:0]".</div><div class='add'>+ * Parameter: location {D} | stride size 0x4 | range [0, 7]</div><div class='add'>+ * PORT="pif_rpf_l3_da0_i[31:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+ /* Register address for bitfield pif_rpf_l3_da0_i[31:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_DSTA_ADR(filter) (0x000053D0 + (filter) * 0x4)</div><div class='add'>+/* Bitmask for bitfield l3_da0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_DSTA_MSK 0xFFFFFFFFu</div><div class='add'>+/* Inverted bitmask for bitfield l3_da0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_DSTA_MSKN 0xFFFFFFFFu</div><div class='add'>+/* Lower bit position of bitfield l3_da0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_DSTA_SHIFT 0</div><div class='add'>+/* Width of bitfield l3_da0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_DSTA_WIDTH 32</div><div class='add'>+/* Default value of bitfield l3_da0[1F:0] */</div><div class='add'>+#define HW_ATL_RPF_L3_DSTA_DEFAULT 0x0</div><div class='add'>+</div><div class='ctx'> /* RX l4_sp{D}[F:0] Bitfield Definitions</div><div class='ctx'>  * Preprocessor definitions for the bitfield "l4_sp{D}[F:0]".</div><div class='ctx'>  * Parameter: srcport {D} | stride size 0x4 | range [0, 7]</div><div class='hunk'>@@ -1386,6 +1529,24 @@</div><div class='ctx'> /* default value of bitfield l4_chk_en */</div><div class='ctx'> #define HW_ATL_RPOL4CHK_EN_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* RX outer_vl_ins_mode Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "outer_vl_ins_mode".</div><div class='add'>+ * PORT="pif_rpo_outer_vl_mode_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield outer_vl_ins_mode */</div><div class='add'>+#define HW_ATL_RPO_OUTER_VL_INS_MODE_ADR 0x00005580</div><div class='add'>+/* Bitmask for bitfield outer_vl_ins_mode */</div><div class='add'>+#define HW_ATL_RPO_OUTER_VL_INS_MODE_MSK 0x00000004</div><div class='add'>+/* Inverted bitmask for bitfield outer_vl_ins_mode */</div><div class='add'>+#define HW_ATL_RPO_OUTER_VL_INS_MODE_MSKN 0xFFFFFFFB</div><div class='add'>+/* Lower bit position of bitfield outer_vl_ins_mode */</div><div class='add'>+#define HW_ATL_RPO_OUTER_VL_INS_MODE_SHIFT 2</div><div class='add'>+/* Width of bitfield outer_vl_ins_mode */</div><div class='add'>+#define HW_ATL_RPO_OUTER_VL_INS_MODE_WIDTH 1</div><div class='add'>+/* Default value of bitfield outer_vl_ins_mode */</div><div class='add'>+#define HW_ATL_RPO_OUTER_VL_INS_MODE_DEFAULT 0x0</div><div class='add'>+</div><div class='ctx'> /* rx reg_res_dsbl bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "reg_res_dsbl".</div><div class='ctx'>  * port="pif_rx_reg_res_dsbl_i"</div><div class='hunk'>@@ -1940,6 +2101,42 @@</div><div class='ctx'> /* default value of bitfield lso_tcp_flag_mid[b:0] */</div><div class='ctx'> #define HW_ATL_THM_LSO_TCP_FLAG_MID_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* tx tx_tc_mode bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "tx_tc_mode".</div><div class='add'>+ * port="pif_tpb_tx_tc_mode_i,pif_tps_tx_tc_mode_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield tx_tc_mode */</div><div class='add'>+#define HW_ATL_TPB_TX_TC_MODE_ADDR 0x00007900</div><div class='add'>+/* bitmask for bitfield tx_tc_mode */</div><div class='add'>+#define HW_ATL_TPB_TX_TC_MODE_MSK 0x00000100</div><div class='add'>+/* inverted bitmask for bitfield tx_tc_mode */</div><div class='add'>+#define HW_ATL_TPB_TX_TC_MODE_MSKN 0xFFFFFEFF</div><div class='add'>+/* lower bit position of bitfield tx_tc_mode */</div><div class='add'>+#define HW_ATL_TPB_TX_TC_MODE_SHIFT 8</div><div class='add'>+/* width of bitfield tx_tc_mode */</div><div class='add'>+#define HW_ATL_TPB_TX_TC_MODE_WIDTH 1</div><div class='add'>+/* default value of bitfield tx_tc_mode */</div><div class='add'>+#define HW_ATL_TPB_TX_TC_MODE_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx tx_desc_rate_mode bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "tx_desc_rate_mode".</div><div class='add'>+ * port="pif_tps_desc_rate_mode_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield tx_desc_rate_mode */</div><div class='add'>+#define HW_ATL_TPS_TX_DESC_RATE_MODE_ADR 0x00007900</div><div class='add'>+/* bitmask for bitfield tx_desc_rate_mode */</div><div class='add'>+#define HW_ATL_TPS_TX_DESC_RATE_MODE_MSK 0x00000080</div><div class='add'>+/* inverted bitmask for bitfield tx_desc_rate_mode */</div><div class='add'>+#define HW_ATL_TPS_TX_DESC_RATE_MODE_MSKN 0xFFFFFF7F</div><div class='add'>+/* lower bit position of bitfield tx_desc_rate_mode */</div><div class='add'>+#define HW_ATL_TPS_TX_DESC_RATE_MODE_SHIFT 7</div><div class='add'>+/* width of bitfield tx_desc_rate_mode */</div><div class='add'>+#define HW_ATL_TPS_TX_DESC_RATE_MODE_WIDTH 1</div><div class='add'>+/* default value of bitfield tx_desc_rate_mode */</div><div class='add'>+#define HW_ATL_TPS_TX_DESC_RATE_MODE_DEFAULT 0x0</div><div class='add'>+</div><div class='ctx'> /* tx tx_buf_en bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "tx_buf_en".</div><div class='ctx'>  * port="pif_tpb_tx_buf_en_i"</div><div class='hunk'>@@ -1958,19 +2155,6 @@</div><div class='ctx'> /* default value of bitfield tx_buf_en */</div><div class='ctx'> #define HW_ATL_TPB_TX_BUF_EN_DEFAULT 0x0</div><div class='ctx'> </div><div class='del'>-/* register address for bitfield tx_tc_mode */</div><div class='del'>-#define HW_ATL_TPB_TX_TC_MODE_ADDR 0x00007900</div><div class='del'>-/* bitmask for bitfield tx_tc_mode */</div><div class='del'>-#define HW_ATL_TPB_TX_TC_MODE_MSK 0x00000100</div><div class='del'>-/* inverted bitmask for bitfield tx_tc_mode */</div><div class='del'>-#define HW_ATL_TPB_TX_TC_MODE_MSKN 0xFFFFFEFF</div><div class='del'>-/* lower bit position of bitfield tx_tc_mode */</div><div class='del'>-#define HW_ATL_TPB_TX_TC_MODE_SHIFT 8</div><div class='del'>-/* width of bitfield tx_tc_mode */</div><div class='del'>-#define HW_ATL_TPB_TX_TC_MODE_WIDTH 1</div><div class='del'>-/* default value of bitfield tx_tc_mode */</div><div class='del'>-#define HW_ATL_TPB_TX_TC_MODE_DEFAULT 0x0</div><div class='del'>-</div><div class='ctx'> /* tx tx{b}_hi_thresh[c:0] bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "tx{b}_hi_thresh[c:0]".</div><div class='ctx'>  * parameter: buffer {b} | stride size 0x10 | range [0, 7]</div><div class='hunk'>@@ -2027,6 +2211,24 @@</div><div class='ctx'> /* default value of bitfield dma_sys_loopback */</div><div class='ctx'> #define HW_ATL_TPB_DMA_SYS_LBK_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* tx dma_net_loopback bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "dma_net_loopback".</div><div class='add'>+ * port="pif_tpb_dma_net_lbk_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_TPB_DMA_NET_LBK_ADR 0x00007000</div><div class='add'>+/* bitmask for bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_TPB_DMA_NET_LBK_MSK 0x00000010</div><div class='add'>+/* inverted bitmask for bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_TPB_DMA_NET_LBK_MSKN 0xffffffef</div><div class='add'>+/* lower bit position of bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_TPB_DMA_NET_LBK_SHIFT 4</div><div class='add'>+/* width of bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_TPB_DMA_NET_LBK_WIDTH 1</div><div class='add'>+/* default value of bitfield dma_net_loopback */</div><div class='add'>+#define HW_ATL_TPB_DMA_NET_LBK_DEFAULT 0x0</div><div class='add'>+</div><div class='ctx'> /* tx tx{b}_buf_size[7:0] bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "tx{b}_buf_size[7:0]".</div><div class='ctx'>  * parameter: buffer {b} | stride size 0x10 | range [0, 7]</div><div class='hunk'>@@ -2064,6 +2266,24 @@</div><div class='ctx'> /* default value of bitfield tx_scp_ins_en */</div><div class='ctx'> #define HW_ATL_TPB_TX_SCP_INS_EN_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* tx tx_clk_gate_en bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "tx_clk_gate_en".</div><div class='add'>+ * port="pif_tpb_clk_gate_en_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield tx_clk_gate_en */</div><div class='add'>+#define HW_ATL_TPB_TX_CLK_GATE_EN_ADR 0x00007900</div><div class='add'>+/* bitmask for bitfield tx_clk_gate_en */</div><div class='add'>+#define HW_ATL_TPB_TX_CLK_GATE_EN_MSK 0x00000010</div><div class='add'>+/* inverted bitmask for bitfield tx_clk_gate_en */</div><div class='add'>+#define HW_ATL_TPB_TX_CLK_GATE_EN_MSKN 0xffffffef</div><div class='add'>+/* lower bit position of bitfield tx_clk_gate_en */</div><div class='add'>+#define HW_ATL_TPB_TX_CLK_GATE_EN_SHIFT 4</div><div class='add'>+/* width of bitfield tx_clk_gate_en */</div><div class='add'>+#define HW_ATL_TPB_TX_CLK_GATE_EN_WIDTH 1</div><div class='add'>+/* default value of bitfield tx_clk_gate_en */</div><div class='add'>+#define HW_ATL_TPB_TX_CLK_GATE_EN_DEFAULT 0x1</div><div class='add'>+</div><div class='ctx'> /* tx ipv4_chk_en bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "ipv4_chk_en".</div><div class='ctx'>  * port="pif_tpo_ipv4_chk_en_i"</div><div class='hunk'>@@ -2136,6 +2356,58 @@</div><div class='ctx'> /* default value of bitfield data_tc_arb_mode */</div><div class='ctx'> #define HW_ATL_TPS_DATA_TC_ARB_MODE_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* tx desc{r}_rate_en bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "desc{r}_rate_en".</div><div class='add'>+ * port="pif_tps_desc_rate_en_i[0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield desc{r}_rate_en */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_EN_ADR(desc) (0x00007408 + (desc) * 0x10)</div><div class='add'>+/* bitmask for bitfield desc{r}_rate_en */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_EN_MSK 0x80000000</div><div class='add'>+/* inverted bitmask for bitfield desc{r}_rate_en */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_EN_MSKN 0x7FFFFFFF</div><div class='add'>+/* lower bit position of bitfield desc{r}_rate_en */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_EN_SHIFT 31</div><div class='add'>+/* width of bitfield desc{r}_rate_en */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_EN_WIDTH 1</div><div class='add'>+/* default value of bitfield desc{r}_rate_en */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_EN_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx desc{r}_rate_x bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "desc{r}_rate_x".</div><div class='add'>+ * port="pif_tps_desc0_rate_x"</div><div class='add'>+ */</div><div class='add'>+/* register address for bitfield desc{r}_rate_x */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_X_ADR(desc) (0x00007408 + (desc) * 0x10)</div><div class='add'>+/* bitmask for bitfield desc{r}_rate_x */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_X_MSK 0x03FF0000</div><div class='add'>+/* inverted bitmask for bitfield desc{r}_rate_x */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_X_MSKN 0xFC00FFFF</div><div class='add'>+/* lower bit position of bitfield desc{r}_rate_x */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_X_SHIFT 16</div><div class='add'>+/* width of bitfield desc{r}_rate_x */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_X_WIDTH 10</div><div class='add'>+/* default value of bitfield desc{r}_rate_x */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_X_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx desc{r}_rate_y bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "desc{r}_rate_y".</div><div class='add'>+ * port="pif_tps_desc0_rate_y"</div><div class='add'>+ */</div><div class='add'>+/* register address for bitfield desc{r}_rate_y */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_Y_ADR(desc) (0x00007408 + (desc) * 0x10)</div><div class='add'>+/* bitmask for bitfield desc{r}_rate_y */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_Y_MSK 0x00003FFF</div><div class='add'>+/* inverted bitmask for bitfield desc{r}_rate_y */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_Y_MSKN 0xFFFFC000</div><div class='add'>+/* lower bit position of bitfield desc{r}_rate_y */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_Y_SHIFT 0</div><div class='add'>+/* width of bitfield desc{r}_rate_y */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_Y_WIDTH 14</div><div class='add'>+/* default value of bitfield desc{r}_rate_y */</div><div class='add'>+#define HW_ATL_TPS_DESC_RATE_Y_DEFAULT 0x0</div><div class='add'>+</div><div class='ctx'> /* tx desc_rate_ta_rst bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "desc_rate_ta_rst".</div><div class='ctx'>  * port="pif_tps_desc_rate_ta_rst_i"</div><div class='hunk'>@@ -2406,6 +2678,22 @@</div><div class='ctx'> /* default value of bitfield register write strobe */</div><div class='ctx'> #define HW_ATL_MSM_REG_WR_STROBE_DEFAULT 0x0</div><div class='ctx'> </div><div class='add'>+/* register address for bitfield PTP Digital Clock Read Enable */</div><div class='add'>+#define HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_ADR 0x00004628</div><div class='add'>+/* bitmask for bitfield PTP Digital Clock Read Enable */</div><div class='add'>+#define HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_MSK 0x00000010</div><div class='add'>+/* inverted bitmask for bitfield PTP Digital Clock Read Enable */</div><div class='add'>+#define HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_MSKN 0xFFFFFFEF</div><div class='add'>+/* lower bit position of bitfield PTP Digital Clock Read Enable */</div><div class='add'>+#define HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_SHIFT 4</div><div class='add'>+/* width of bitfield PTP Digital Clock Read Enable */</div><div class='add'>+#define HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_WIDTH 1</div><div class='add'>+/* default value of bitfield PTP Digital Clock Read Enable */</div><div class='add'>+#define HW_ATL_PCS_PTP_CLOCK_READ_ENABLE_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* register address for ptp counter reading */</div><div class='add'>+#define HW_ATL_PCS_PTP_TS_VAL_ADDR(index) (0x00004900 + (index) * 0x4)</div><div class='add'>+</div><div class='ctx'> /* mif soft reset bitfield definitions</div><div class='ctx'>  * preprocessor definitions for the bitfield "soft reset".</div><div class='ctx'>  * port="pif_glb_res_i"</div><div class='hunk'>@@ -2498,50 +2786,125 @@</div><div class='ctx'> /* default value of bitfield uP Force Interrupt */</div><div class='ctx'> #define HW_ATL_MCP_UP_FORCE_INTERRUPT_DEFAULT 0x0</div><div class='ctx'> </div><div class='del'>-#define HW_ATL_RX_CTRL_ADDR_BEGIN_FL3L4   0x00005380</div><div class='del'>-#define HW_ATL_RX_SRCA_ADDR_BEGIN_FL3L4   0x000053B0</div><div class='del'>-#define HW_ATL_RX_DESTA_ADDR_BEGIN_FL3L4  0x000053D0</div><div class='del'>-</div><div class='del'>-#define HW_ATL_RPF_L3_REG_CTRL_ADR(location) (0x00005380 + (location) * 0x4)</div><div class='del'>-</div><div class='del'>-/* RX rpf_l3_sa{D}[1F:0] Bitfield Definitions</div><div class='del'>- * Preprocessor definitions for the bitfield "l3_sa{D}[1F:0]".</div><div class='del'>- * Parameter: location {D} | stride size 0x4 | range [0, 7]</div><div class='del'>- * PORT="pif_rpf_l3_sa0_i[31:0]"</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Register address for bitfield pif_rpf_l3_sa0_i[31:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_SRCA_ADR(location) (0x000053B0 + (location) * 0x4)</div><div class='del'>-/* Bitmask for bitfield l3_sa0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_SRCA_MSK 0xFFFFFFFFu</div><div class='del'>-/* Inverted bitmask for bitfield l3_sa0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_SRCA_MSKN 0xFFFFFFFFu</div><div class='del'>-/* Lower bit position of bitfield l3_sa0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_SRCA_SHIFT 0</div><div class='del'>-/* Width of bitfield l3_sa0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_SRCA_WIDTH 32</div><div class='del'>-/* Default value of bitfield l3_sa0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_SRCA_DEFAULT 0x0</div><div class='del'>-</div><div class='del'>-/* RX rpf_l3_da{D}[1F:0] Bitfield Definitions</div><div class='del'>- * Preprocessor definitions for the bitfield "l3_da{D}[1F:0]".</div><div class='del'>- * Parameter: location {D} | stride size 0x4 | range [0, 7]</div><div class='del'>- * PORT="pif_rpf_l3_da0_i[31:0]"</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>- /* Register address for bitfield pif_rpf_l3_da0_i[31:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_DSTA_ADR(location) (0x000053B0 + (location) * 0x4)</div><div class='del'>-/* Bitmask for bitfield l3_da0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_DSTA_MSK 0xFFFFFFFFu</div><div class='del'>-/* Inverted bitmask for bitfield l3_da0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_DSTA_MSKN 0xFFFFFFFFu</div><div class='del'>-/* Lower bit position of bitfield l3_da0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_DSTA_SHIFT 0</div><div class='del'>-/* Width of bitfield l3_da0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_DSTA_WIDTH 32</div><div class='del'>-/* Default value of bitfield l3_da0[1F:0] */</div><div class='del'>-#define HW_ATL_RPF_L3_DSTA_DEFAULT 0x0</div><div class='del'>-</div><div class='add'>+/* Preprocessor definitions for Global MDIO Interfaces</div><div class='add'>+ * Address: 0x00000280 + 0x4 * Number of interface</div><div class='add'>+ */</div><div class='add'>+#define HW_ATL_GLB_MDIO_IFACE_ADDR_BEGIN   0x00000280u</div><div class='add'>+</div><div class='add'>+#define HW_ATL_GLB_MDIO_IFACE_N_ADR(number) \</div><div class='add'>+	(HW_ATL_GLB_MDIO_IFACE_ADDR_BEGIN + (((number) - 1) * 0x4))</div><div class='add'>+</div><div class='add'>+/* MIF MDIO Busy Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "MDIO Busy".</div><div class='add'>+ * PORT="mdio_pif_busy_o"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield MDIO Busy */</div><div class='add'>+#define HW_ATL_MDIO_BUSY_ADR 0x00000284</div><div class='add'>+/* Bitmask for bitfield MDIO Busy */</div><div class='add'>+#define HW_ATL_MDIO_BUSY_MSK 0x80000000</div><div class='add'>+/* Inverted bitmask for bitfield MDIO Busy */</div><div class='add'>+#define HW_ATL_MDIO_BUSY_MSKN 0x7FFFFFFF</div><div class='add'>+/* Lower bit position of bitfield MDIO Busy */</div><div class='add'>+#define HW_ATL_MDIO_BUSY_SHIFT 31</div><div class='add'>+/* Width of bitfield MDIO Busy */</div><div class='add'>+#define HW_ATL_MDIO_BUSY_WIDTH 1</div><div class='add'>+</div><div class='add'>+/* MIF MDIO Execute Operation Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "MDIO Execute Operation".</div><div class='add'>+ * PORT="pif_mdio_op_start_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield MDIO Execute Operation */</div><div class='add'>+#define HW_ATL_MDIO_EXECUTE_OPERATION_ADR 0x00000284</div><div class='add'>+/* Bitmask for bitfield MDIO Execute Operation */</div><div class='add'>+#define HW_ATL_MDIO_EXECUTE_OPERATION_MSK 0x00008000</div><div class='add'>+/* Inverted bitmask for bitfield MDIO Execute Operation */</div><div class='add'>+#define HW_ATL_MDIO_EXECUTE_OPERATION_MSKN 0xFFFF7FFF</div><div class='add'>+/* Lower bit position of bitfield MDIO Execute Operation */</div><div class='add'>+#define HW_ATL_MDIO_EXECUTE_OPERATION_SHIFT 15</div><div class='add'>+/* Width of bitfield MDIO Execute Operation */</div><div class='add'>+#define HW_ATL_MDIO_EXECUTE_OPERATION_WIDTH 1</div><div class='add'>+/* Default value of bitfield MDIO Execute Operation */</div><div class='add'>+#define HW_ATL_MDIO_EXECUTE_OPERATION_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* MIF Op Mode [1:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "Op Mode [1:0]".</div><div class='add'>+ * PORT="pif_mdio_mode_i[1:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield Op Mode [1:0] */</div><div class='add'>+#define HW_ATL_MDIO_OP_MODE_ADR 0x00000284</div><div class='add'>+/* Bitmask for bitfield Op Mode [1:0] */</div><div class='add'>+#define HW_ATL_MDIO_OP_MODE_MSK 0x00003000</div><div class='add'>+/* Inverted bitmask for bitfield Op Mode [1:0] */</div><div class='add'>+#define HW_ATL_MDIO_OP_MODE_MSKN 0xFFFFCFFF</div><div class='add'>+/* Lower bit position of bitfield Op Mode [1:0] */</div><div class='add'>+#define HW_ATL_MDIO_OP_MODE_SHIFT 12</div><div class='add'>+/* Width of bitfield Op Mode [1:0] */</div><div class='add'>+#define HW_ATL_MDIO_OP_MODE_WIDTH 2</div><div class='add'>+/* Default value of bitfield Op Mode [1:0] */</div><div class='add'>+#define HW_ATL_MDIO_OP_MODE_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* MIF PHY address Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "PHY address".</div><div class='add'>+ * PORT="pif_mdio_phy_addr_i[9:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield PHY address */</div><div class='add'>+#define HW_ATL_MDIO_PHY_ADDRESS_ADR 0x00000284</div><div class='add'>+/* Bitmask for bitfield PHY address */</div><div class='add'>+#define HW_ATL_MDIO_PHY_ADDRESS_MSK 0x000003FF</div><div class='add'>+/* Inverted bitmask for bitfield PHY address */</div><div class='add'>+#define HW_ATL_MDIO_PHY_ADDRESS_MSKN 0xFFFFFC00</div><div class='add'>+/* Lower bit position of bitfield PHY address */</div><div class='add'>+#define HW_ATL_MDIO_PHY_ADDRESS_SHIFT 0</div><div class='add'>+/* Width of bitfield PHY address */</div><div class='add'>+#define HW_ATL_MDIO_PHY_ADDRESS_WIDTH 10</div><div class='add'>+/* Default value of bitfield PHY address */</div><div class='add'>+#define HW_ATL_MDIO_PHY_ADDRESS_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* MIF MDIO WriteData [F:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "MDIO WriteData [F:0]".</div><div class='add'>+ * PORT="pif_mdio_wdata_i[15:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield MDIO WriteData [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_WRITE_DATA_ADR 0x00000288</div><div class='add'>+/* Bitmask for bitfield MDIO WriteData [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_WRITE_DATA_MSK 0x0000FFFF</div><div class='add'>+/* Inverted bitmask for bitfield MDIO WriteData [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_WRITE_DATA_MSKN 0xFFFF0000</div><div class='add'>+/* Lower bit position of bitfield MDIO WriteData [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_WRITE_DATA_SHIFT 0</div><div class='add'>+/* Width of bitfield MDIO WriteData [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_WRITE_DATA_WIDTH 16</div><div class='add'>+/* Default value of bitfield MDIO WriteData [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_WRITE_DATA_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* MIF MDIO Address [F:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "MDIO Address [F:0]".</div><div class='add'>+ * PORT="pif_mdio_addr_i[15:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield MDIO Address [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_ADDRESS_ADR 0x0000028C</div><div class='add'>+/* Bitmask for bitfield MDIO Address [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_ADDRESS_MSK 0x0000FFFF</div><div class='add'>+/* Inverted bitmask for bitfield MDIO Address [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_ADDRESS_MSKN 0xFFFF0000</div><div class='add'>+/* Lower bit position of bitfield MDIO Address [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_ADDRESS_SHIFT 0</div><div class='add'>+/* Width of bitfield MDIO Address [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_ADDRESS_WIDTH 16</div><div class='add'>+/* Default value of bitfield MDIO Address [F:0] */</div><div class='add'>+#define HW_ATL_MDIO_ADDRESS_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+#define HW_ATL_MIF_RESET_TIMEOUT_ADR 0x00000348</div><div class='add'>+</div><div class='add'>+#define HW_ATL_FW_SM_MDIO       0x0U</div><div class='ctx'> #define HW_ATL_FW_SM_RAM        0x2U</div><div class='add'>+#define HW_ATL_FW_SM_RESET1     0x3U</div><div class='add'>+#define HW_ATL_FW_SM_RESET2     0x4U</div><div class='ctx'> </div><div class='ctx'> #endif /* HW_ATL_LLH_INTERNAL_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c<br/>index 1208f7ecdd76..7e88d7234b14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_utils.c: Definition of common functions for Atlantic hardware</div><div class='hunk'>@@ -25,6 +23,7 @@</div><div class='ctx'> #define HW_ATL_MIF_ADDR         0x0208U</div><div class='ctx'> #define HW_ATL_MIF_VAL          0x020CU</div><div class='ctx'> </div><div class='add'>+#define HW_ATL_MPI_RPC_ADDR     0x0334U</div><div class='ctx'> #define HW_ATL_RPC_CONTROL_ADR  0x0338U</div><div class='ctx'> #define HW_ATL_RPC_STATE_ADR    0x033CU</div><div class='ctx'> </div><div class='hunk'>@@ -47,41 +46,40 @@</div><div class='ctx'> #define HW_ATL_FW_VER_1X 0x01050006U</div><div class='ctx'> #define HW_ATL_FW_VER_2X 0x02000000U</div><div class='ctx'> #define HW_ATL_FW_VER_3X 0x03000000U</div><div class='add'>+#define HW_ATL_FW_VER_4X 0x04000000U</div><div class='ctx'> </div><div class='ctx'> #define FORCE_FLASHLESS 0</div><div class='ctx'> </div><div class='del'>-static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);</div><div class='add'>+enum mcp_area {</div><div class='add'>+	MCP_AREA_CONFIG = 0x80000000,</div><div class='add'>+	MCP_AREA_SETTINGS = 0x20000000,</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,</div><div class='ctx'> 				      enum hal_atl_utils_fw_state_e state);</div><div class='del'>-</div><div class='ctx'> static u32 hw_atl_utils_get_mpi_mbox_tid(struct aq_hw_s *self);</div><div class='ctx'> static u32 hw_atl_utils_mpi_get_state(struct aq_hw_s *self);</div><div class='ctx'> static u32 hw_atl_utils_mif_cmd_get(struct aq_hw_s *self);</div><div class='ctx'> static u32 hw_atl_utils_mif_addr_get(struct aq_hw_s *self);</div><div class='ctx'> static u32 hw_atl_utils_rpc_state_get(struct aq_hw_s *self);</div><div class='add'>+static u32 aq_fw1x_rpc_get(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_soft_reset(self);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='ctx'> 	hw_atl_utils_hw_chip_features_init(self,</div><div class='ctx'> 					   &amp;self-&gt;chip_features);</div><div class='ctx'> </div><div class='del'>-	hw_atl_utils_get_fw_version(self, &amp;self-&gt;fw_ver_actual);</div><div class='add'>+	self-&gt;fw_ver_actual = hw_atl_utils_get_fw_version(self);</div><div class='ctx'> </div><div class='del'>-	if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,</div><div class='del'>-				   self-&gt;fw_ver_actual) == 0) {</div><div class='add'>+	if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X, self-&gt;fw_ver_actual)) {</div><div class='ctx'> 		*fw_ops = &amp;aq_fw_1x_ops;</div><div class='del'>-	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X,</div><div class='del'>-					  self-&gt;fw_ver_actual) == 0) {</div><div class='add'>+	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_2X, self-&gt;fw_ver_actual)) {</div><div class='add'>+		*fw_ops = &amp;aq_fw_2x_ops;</div><div class='add'>+	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X, self-&gt;fw_ver_actual)) {</div><div class='ctx'> 		*fw_ops = &amp;aq_fw_2x_ops;</div><div class='del'>-	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_3X,</div><div class='del'>-					  self-&gt;fw_ver_actual) == 0) {</div><div class='add'>+	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_4X, self-&gt;fw_ver_actual)) {</div><div class='ctx'> 		*fw_ops = &amp;aq_fw_2x_ops;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		aq_pr_err("Bad FW version detected: %x\n",</div><div class='hunk'>@@ -90,6 +88,7 @@ int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)</div><div class='ctx'> 	}</div><div class='ctx'> 	self-&gt;aq_fw_ops = *fw_ops;</div><div class='ctx'> 	err = self-&gt;aq_fw_ops-&gt;init(self);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +217,7 @@ static int hw_atl_utils_soft_reset_rbl(struct aq_hw_s *self)</div><div class='ctx'> </div><div class='ctx'> 	if (rbl_status == 0xF1A7) {</div><div class='ctx'> 		aq_pr_err("No FW detected. Dynamic FW load not implemented\n");</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (k = 0; k &lt; 1000; k++) {</div><div class='hunk'>@@ -240,9 +239,10 @@ static int hw_atl_utils_soft_reset_rbl(struct aq_hw_s *self)</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_soft_reset(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	int k;</div><div class='add'>+	int ver = hw_atl_utils_get_fw_version(self);</div><div class='ctx'> 	u32 boot_exit_code = 0;</div><div class='ctx'> 	u32 val;</div><div class='add'>+	int k;</div><div class='ctx'> </div><div class='ctx'> 	for (k = 0; k &lt; 1000; ++k) {</div><div class='ctx'> 		u32 flb_status = aq_hw_read_reg(self,</div><div class='hunk'>@@ -260,14 +260,12 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)</div><div class='ctx'> </div><div class='ctx'> 	self-&gt;rbl_enabled = (boot_exit_code != 0);</div><div class='ctx'> </div><div class='del'>-	/* FW 1.x may bootup in an invalid POWER state (WOL feature).</div><div class='del'>-	 * We should work around this by forcing its state back to DEINIT</div><div class='del'>-	 */</div><div class='del'>-	if (!hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,</div><div class='del'>-				    aq_hw_read_reg(self,</div><div class='del'>-						   HW_ATL_MPI_FW_VERSION))) {</div><div class='add'>+	if (hw_atl_utils_ver_match(HW_ATL_FW_VER_1X, ver)) {</div><div class='ctx'> 		int err = 0;</div><div class='ctx'> </div><div class='add'>+		/* FW 1.x may bootup in an invalid POWER state (WOL feature).</div><div class='add'>+		 * We should work around this by forcing its state back to DEINIT</div><div class='add'>+		 */</div><div class='ctx'> 		hw_atl_utils_mpi_set_state(self, MPI_DEINIT);</div><div class='ctx'> 		err = readx_poll_timeout_atomic(hw_atl_utils_mpi_get_state,</div><div class='ctx'> 						self, val,</div><div class='hunk'>@@ -276,6 +274,27 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)</div><div class='ctx'> 						10, 10000U);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='add'>+	} else if (hw_atl_utils_ver_match(HW_ATL_FW_VER_4X, ver)) {</div><div class='add'>+		u64 sem_timeout = aq_hw_read_reg(self, HW_ATL_MIF_RESET_TIMEOUT_ADR);</div><div class='add'>+</div><div class='add'>+		/* Acquire 2 semaphores before issuing reset for FW 4.x */</div><div class='add'>+		if (sem_timeout &gt; 3000)</div><div class='add'>+			sem_timeout = 3000;</div><div class='add'>+		sem_timeout = sem_timeout * 1000;</div><div class='add'>+</div><div class='add'>+		if (sem_timeout != 0) {</div><div class='add'>+			int err;</div><div class='add'>+</div><div class='add'>+			err = readx_poll_timeout_atomic(hw_atl_sem_reset1_get, self, val,</div><div class='add'>+							val == 1U, 1U, sem_timeout);</div><div class='add'>+			if (err)</div><div class='add'>+				aq_pr_err("reset sema1 timeout");</div><div class='add'>+</div><div class='add'>+			err = readx_poll_timeout_atomic(hw_atl_sem_reset2_get, self, val,</div><div class='add'>+							val == 1U, 1U, sem_timeout);</div><div class='add'>+			if (err)</div><div class='add'>+				aq_pr_err("reset sema2 timeout");</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;rbl_enabled)</div><div class='hunk'>@@ -310,7 +329,7 @@ int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a,</div><div class='ctx'> 	for (++cnt; --cnt &amp;&amp; !err;) {</div><div class='ctx'> 		aq_hw_write_reg(self, HW_ATL_MIF_CMD, 0x00008000U);</div><div class='ctx'> </div><div class='del'>-		if (IS_CHIP_FEATURE(REVISION_B1))</div><div class='add'>+		if (ATL_HW_IS_CHIP_FEATURE(self, REVISION_B1))</div><div class='ctx'> 			err = readx_poll_timeout_atomic(hw_atl_utils_mif_addr_get,</div><div class='ctx'> 							self, val, val != a,</div><div class='ctx'> 							1U, 1000U);</div><div class='hunk'>@@ -330,68 +349,125 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_utils_fw_upload_dwords(struct aq_hw_s *self, u32 a, u32 *p,</div><div class='del'>-					 u32 cnt)</div><div class='add'>+static int hw_atl_utils_write_b1_mbox(struct aq_hw_s *self, u32 addr,</div><div class='add'>+				      u32 *p, u32 cnt, enum mcp_area area)</div><div class='ctx'> {</div><div class='del'>-	u32 val;</div><div class='add'>+	u32 data_offset = 0;</div><div class='add'>+	u32 offset = addr;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	bool is_locked;</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='del'>-	is_locked = hw_atl_sem_ram_get(self);</div><div class='del'>-	if (!is_locked) {</div><div class='del'>-		err = -ETIME;</div><div class='del'>-		goto err_exit;</div><div class='add'>+	switch (area) {</div><div class='add'>+	case MCP_AREA_CONFIG:</div><div class='add'>+		offset -= self-&gt;rpc_addr;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case MCP_AREA_SETTINGS:</div><div class='add'>+		offset -= self-&gt;settings_addr;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='del'>-	if (IS_CHIP_FEATURE(REVISION_B1)) {</div><div class='del'>-		u32 offset = 0;</div><div class='ctx'> </div><div class='del'>-		for (; offset &lt; cnt; ++offset) {</div><div class='del'>-			aq_hw_write_reg(self, 0x328, p[offset]);</div><div class='del'>-			aq_hw_write_reg(self, 0x32C,</div><div class='del'>-					(0x80000000 | (0xFFFF &amp; (offset * 4))));</div><div class='del'>-			hw_atl_mcp_up_force_intr_set(self, 1);</div><div class='del'>-			/* 1000 times by 10us = 10ms */</div><div class='del'>-			err = readx_poll_timeout_atomic(hw_atl_scrpad12_get,</div><div class='del'>-							self, val,</div><div class='del'>-							(val &amp; 0xF0000000) ==</div><div class='del'>-							 0x80000000,</div><div class='del'>-							10U, 10000U);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		u32 offset = 0;</div><div class='add'>+	offset = offset / sizeof(u32);</div><div class='ctx'> </div><div class='del'>-		aq_hw_write_reg(self, 0x208, a);</div><div class='add'>+	for (; data_offset &lt; cnt; ++data_offset, ++offset) {</div><div class='add'>+		aq_hw_write_reg(self, 0x328, p[data_offset]);</div><div class='add'>+		aq_hw_write_reg(self, 0x32C,</div><div class='add'>+				(area | (0xFFFF &amp; (offset * 4))));</div><div class='add'>+		hw_atl_mcp_up_force_intr_set(self, 1);</div><div class='add'>+		/* 1000 times by 10us = 10ms */</div><div class='add'>+		err = readx_poll_timeout_atomic(hw_atl_scrpad12_get,</div><div class='add'>+						self, val,</div><div class='add'>+						(val &amp; 0xF0000000) !=</div><div class='add'>+						area,</div><div class='add'>+						10U, 10000U);</div><div class='ctx'> </div><div class='del'>-		for (; offset &lt; cnt; ++offset) {</div><div class='del'>-			aq_hw_write_reg(self, 0x20C, p[offset]);</div><div class='del'>-			aq_hw_write_reg(self, 0x200, 0xC000);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-			err = readx_poll_timeout_atomic(hw_atl_utils_mif_cmd_get,</div><div class='del'>-							self, val,</div><div class='del'>-							(val &amp; 0x100) == 0,</div><div class='del'>-							1000U, 10000U);</div><div class='del'>-		}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_utils_write_b0_mbox(struct aq_hw_s *self, u32 addr,</div><div class='add'>+				      u32 *p, u32 cnt)</div><div class='add'>+{</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	aq_hw_write_reg(self, 0x208, addr);</div><div class='add'>+</div><div class='add'>+	for (; offset &lt; cnt; ++offset) {</div><div class='add'>+		aq_hw_write_reg(self, 0x20C, p[offset]);</div><div class='add'>+		aq_hw_write_reg(self, 0x200, 0xC000);</div><div class='add'>+</div><div class='add'>+		err = readx_poll_timeout_atomic(hw_atl_utils_mif_cmd_get,</div><div class='add'>+						self, val,</div><div class='add'>+						(val &amp; 0x100) == 0U,</div><div class='add'>+						10U, 10000U);</div><div class='add'>+</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl_utils_fw_upload_dwords(struct aq_hw_s *self, u32 addr, u32 *p,</div><div class='add'>+					 u32 cnt, enum mcp_area area)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl_sem_ram_get, self,</div><div class='add'>+					val, val == 1U,</div><div class='add'>+					10U, 100000U);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	if (ATL_HW_IS_CHIP_FEATURE(self, REVISION_B1))</div><div class='add'>+		err = hw_atl_utils_write_b1_mbox(self, addr, p, cnt, area);</div><div class='add'>+	else</div><div class='add'>+		err = hw_atl_utils_write_b0_mbox(self, addr, p, cnt);</div><div class='add'>+</div><div class='ctx'> 	hw_atl_reg_glb_cpu_sem_set(self, 1U, HW_ATL_FW_SM_RAM);</div><div class='ctx'> </div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	err = aq_hw_err_from_flags(self);</div><div class='add'>+</div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual)</div><div class='add'>+int hw_atl_write_fwcfg_dwords(struct aq_hw_s *self, u32 *p, u32 cnt)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_utils_fw_upload_dwords(self, self-&gt;rpc_addr, p,</div><div class='add'>+					     cnt, MCP_AREA_CONFIG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hw_atl_write_fwsettings_dwords(struct aq_hw_s *self, u32 offset, u32 *p,</div><div class='add'>+				   u32 cnt)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_utils_fw_upload_dwords(self, self-&gt;settings_addr + offset,</div><div class='add'>+					     p, cnt, MCP_AREA_SETTINGS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	const u32 dw_major_mask = 0xff000000U;</div><div class='ctx'> 	const u32 dw_minor_mask = 0x00ffffffU;</div><div class='add'>+	bool ver_match;</div><div class='ctx'> </div><div class='del'>-	err = (dw_major_mask &amp; (ver_expected ^ ver_actual)) ? -EOPNOTSUPP : 0;</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	ver_match = (dw_major_mask &amp; (ver_expected ^ ver_actual)) ? false : true;</div><div class='add'>+	if (!ver_match)</div><div class='ctx'> 		goto err_exit;</div><div class='del'>-	err = ((dw_minor_mask &amp; ver_expected) &gt; (dw_minor_mask &amp; ver_actual)) ?</div><div class='del'>-		-EOPNOTSUPP : 0;</div><div class='add'>+	ver_match = ((dw_minor_mask &amp; ver_expected) &gt; (dw_minor_mask &amp; ver_actual)) ?</div><div class='add'>+		false : true;</div><div class='add'>+</div><div class='ctx'> err_exit:</div><div class='del'>-	return err;</div><div class='add'>+	return ver_match;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hw_atl_utils_init_ucp(struct aq_hw_s *self,</div><div class='hunk'>@@ -416,6 +492,10 @@ static int hw_atl_utils_init_ucp(struct aq_hw_s *self,</div><div class='ctx'> 					self, self-&gt;mbox_addr,</div><div class='ctx'> 					self-&gt;mbox_addr != 0U,</div><div class='ctx'> 					1000U, 10000U);</div><div class='add'>+	err = readx_poll_timeout_atomic(aq_fw1x_rpc_get, self,</div><div class='add'>+					self-&gt;rpc_addr,</div><div class='add'>+					self-&gt;rpc_addr != 0U,</div><div class='add'>+					1000U, 100000U);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -434,17 +514,16 @@ struct aq_hw_atl_utils_fw_rpc_tid_s {</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct aq_hw_atl_utils_fw_rpc_tid_s sw;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!IS_CHIP_FEATURE(MIPS)) {</div><div class='add'>+	if (!ATL_HW_IS_CHIP_FEATURE(self, MIPS)) {</div><div class='ctx'> 		err = -1;</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> 	}</div><div class='del'>-	err = hw_atl_utils_fw_upload_dwords(self, self-&gt;rpc_addr,</div><div class='del'>-					    (u32 *)(void *)&amp;self-&gt;rpc,</div><div class='del'>-					    (rpc_size + sizeof(u32) -</div><div class='del'>-					     sizeof(u8)) / sizeof(u32));</div><div class='add'>+	err = hw_atl_write_fwcfg_dwords(self, (u32 *)(void *)&amp;self-&gt;rpc,</div><div class='add'>+					(rpc_size + sizeof(u32) -</div><div class='add'>+					 sizeof(u8)) / sizeof(u32));</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -459,9 +538,9 @@ err_exit:</div><div class='ctx'> int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,</div><div class='ctx'> 			     struct hw_atl_utils_fw_rpc **rpc)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct aq_hw_atl_utils_fw_rpc_tid_s sw;</div><div class='ctx'> 	struct aq_hw_atl_utils_fw_rpc_tid_s fw;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		sw.val = aq_hw_read_reg(self, HW_ATL_RPC_CONTROL_ADR);</div><div class='hunk'>@@ -472,8 +551,19 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,</div><div class='ctx'> 						self, fw.val,</div><div class='ctx'> 						sw.tid == fw.tid,</div><div class='ctx'> 						1000U, 100000U);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+</div><div class='add'>+		err = aq_hw_err_from_flags(self);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='ctx'> </div><div class='ctx'> 		if (fw.len == 0xFFFFU) {</div><div class='add'>+			if (sw.len &gt; sizeof(self-&gt;rpc)) {</div><div class='add'>+				printk(KERN_INFO "Invalid sw len: %x\n", sw.len);</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_exit;</div><div class='add'>+			}</div><div class='ctx'> 			err = hw_atl_utils_fw_rpc_call(self, sw.len);</div><div class='ctx'> 			if (err &lt; 0)</div><div class='ctx'> 				goto err_exit;</div><div class='hunk'>@@ -482,6 +572,11 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> 	if (rpc) {</div><div class='ctx'> 		if (fw.len) {</div><div class='add'>+			if (fw.len &gt; sizeof(self-&gt;rpc)) {</div><div class='add'>+				printk(KERN_INFO "Invalid fw len: %x\n", fw.len);</div><div class='add'>+				err = -EINVAL;</div><div class='add'>+				goto err_exit;</div><div class='add'>+			}</div><div class='ctx'> 			err =</div><div class='ctx'> 			hw_atl_utils_fw_downld_dwords(self,</div><div class='ctx'> 						      self-&gt;rpc_addr,</div><div class='hunk'>@@ -538,7 +633,7 @@ void hw_atl_utils_mpi_read_stats(struct aq_hw_s *self,</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	if (IS_CHIP_FEATURE(REVISION_A0)) {</div><div class='add'>+	if (ATL_HW_IS_CHIP_FEATURE(self, REVISION_A0)) {</div><div class='ctx'> 		unsigned int mtu = self-&gt;aq_nic_cfg ?</div><div class='ctx'> 					self-&gt;aq_nic_cfg-&gt;mtu : 1514U;</div><div class='ctx'> 		pmbox-&gt;stats.ubrc = pmbox-&gt;stats.uprc * mtu;</div><div class='hunk'>@@ -565,10 +660,10 @@ static int hw_atl_utils_mpi_set_speed(struct aq_hw_s *self, u32 speed)</div><div class='ctx'> static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,</div><div class='ctx'> 				      enum hal_atl_utils_fw_state_e state)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	u32 transaction_id = 0;</div><div class='del'>-	struct hw_atl_utils_mbox_header mbox;</div><div class='ctx'> 	u32 val = aq_hw_read_reg(self, HW_ATL_MPI_CONTROL_ADR);</div><div class='add'>+	struct hw_atl_utils_mbox_header mbox;</div><div class='add'>+	u32 transaction_id = 0;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (state == MPI_RESET) {</div><div class='ctx'> 		hw_atl_utils_mpi_read_mbox(self, &amp;mbox);</div><div class='hunk'>@@ -596,20 +691,24 @@ static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,</div><div class='ctx'> 	val |= state &amp; HW_ATL_MPI_STATE_MSK;</div><div class='ctx'> </div><div class='ctx'> 	aq_hw_write_reg(self, HW_ATL_MPI_CONTROL_ADR, val);</div><div class='add'>+</div><div class='ctx'> err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	u32 cp0x036C = hw_atl_utils_mpi_get_state(self);</div><div class='del'>-	u32 link_speed_mask = cp0x036C &gt;&gt; HW_ATL_MPI_SPEED_SHIFT;</div><div class='ctx'> 	struct aq_hw_link_status_s *link_status = &amp;self-&gt;aq_link_status;</div><div class='add'>+	u32 mpi_state;</div><div class='add'>+	u32 speed;</div><div class='add'>+</div><div class='add'>+	mpi_state = hw_atl_utils_mpi_get_state(self);</div><div class='add'>+	speed = mpi_state &gt;&gt; HW_ATL_MPI_SPEED_SHIFT;</div><div class='ctx'> </div><div class='del'>-	if (!link_speed_mask) {</div><div class='add'>+	if (!speed) {</div><div class='ctx'> 		link_status-&gt;mbps = 0U;</div><div class='ctx'> 	} else {</div><div class='del'>-		switch (link_speed_mask) {</div><div class='add'>+		switch (speed) {</div><div class='ctx'> 		case HAL_ATLANTIC_RATE_10G:</div><div class='ctx'> 			link_status-&gt;mbps = 10000U;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -619,7 +718,7 @@ int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self)</div><div class='ctx'> 			link_status-&gt;mbps = 5000U;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		case HAL_ATLANTIC_RATE_2GS:</div><div class='add'>+		case HAL_ATLANTIC_RATE_2G5:</div><div class='ctx'> 			link_status-&gt;mbps = 2500U;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -635,6 +734,7 @@ int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self)</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	link_status-&gt;full_duplex = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -642,14 +742,15 @@ int hw_atl_utils_mpi_get_link_status(struct aq_hw_s *self)</div><div class='ctx'> int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self,</div><div class='ctx'> 				   u8 *mac)</div><div class='ctx'> {</div><div class='add'>+	u32 mac_addr[2];</div><div class='add'>+	u32 efuse_addr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 h = 0U;</div><div class='ctx'> 	u32 l = 0U;</div><div class='del'>-	u32 mac_addr[2];</div><div class='ctx'> </div><div class='ctx'> 	if (!aq_hw_read_reg(self, HW_ATL_UCP_0X370_REG)) {</div><div class='del'>-		unsigned int rnd = 0;</div><div class='ctx'> 		unsigned int ucp_0x370 = 0;</div><div class='add'>+		unsigned int rnd = 0;</div><div class='ctx'> </div><div class='ctx'> 		get_random_bytes(&amp;rnd, sizeof(unsigned int));</div><div class='ctx'> </div><div class='hunk'>@@ -657,11 +758,10 @@ int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self,</div><div class='ctx'> 		aq_hw_write_reg(self, HW_ATL_UCP_0X370_REG, ucp_0x370);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_fw_downld_dwords(self,</div><div class='del'>-					    aq_hw_read_reg(self, 0x00000374U) +</div><div class='del'>-					    (40U * 4U),</div><div class='del'>-					    mac_addr,</div><div class='del'>-					    ARRAY_SIZE(mac_addr));</div><div class='add'>+	efuse_addr = aq_hw_read_reg(self, 0x00000374U);</div><div class='add'>+</div><div class='add'>+	err = hw_atl_utils_fw_downld_dwords(self, efuse_addr + (40U * 4U),</div><div class='add'>+					    mac_addr, ARRAY_SIZE(mac_addr));</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		mac_addr[0] = 0U;</div><div class='ctx'> 		mac_addr[1] = 0U;</div><div class='hunk'>@@ -723,31 +823,34 @@ unsigned int hw_atl_utils_mbps_2_speed_index(unsigned int mbps)</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void hw_atl_utils_hw_chip_features_init(struct aq_hw_s *self, u32 *p)</div><div class='ctx'> {</div><div class='del'>-	u32 chip_features = 0U;</div><div class='ctx'> 	u32 val = hw_atl_reg_glb_mif_id_get(self);</div><div class='ctx'> 	u32 mif_rev = val &amp; 0xFFU;</div><div class='add'>+	u32 chip_features = 0U;</div><div class='add'>+</div><div class='add'>+	chip_features |= ATL_HW_CHIP_ATLANTIC;</div><div class='ctx'> </div><div class='ctx'> 	if ((0xFU &amp; mif_rev) == 1U) {</div><div class='del'>-		chip_features |= HAL_ATLANTIC_UTILS_CHIP_REVISION_A0 |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_MPI_AQ |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_MIPS;</div><div class='add'>+		chip_features |= ATL_HW_CHIP_REVISION_A0 |</div><div class='add'>+			ATL_HW_CHIP_MPI_AQ |</div><div class='add'>+			ATL_HW_CHIP_MIPS;</div><div class='ctx'> 	} else if ((0xFU &amp; mif_rev) == 2U) {</div><div class='del'>-		chip_features |= HAL_ATLANTIC_UTILS_CHIP_REVISION_B0 |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_MPI_AQ |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_MIPS |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_TPO2 |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_RPF2;</div><div class='add'>+		chip_features |= ATL_HW_CHIP_REVISION_B0 |</div><div class='add'>+			ATL_HW_CHIP_MPI_AQ |</div><div class='add'>+			ATL_HW_CHIP_MIPS |</div><div class='add'>+			ATL_HW_CHIP_TPO2 |</div><div class='add'>+			ATL_HW_CHIP_RPF2;</div><div class='ctx'> 	} else if ((0xFU &amp; mif_rev) == 0xAU) {</div><div class='del'>-		chip_features |= HAL_ATLANTIC_UTILS_CHIP_REVISION_B1 |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_MPI_AQ |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_MIPS |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_TPO2 |</div><div class='del'>-			HAL_ATLANTIC_UTILS_CHIP_RPF2;</div><div class='add'>+		chip_features |= ATL_HW_CHIP_REVISION_B1 |</div><div class='add'>+			ATL_HW_CHIP_MPI_AQ |</div><div class='add'>+			ATL_HW_CHIP_MIPS |</div><div class='add'>+			ATL_HW_CHIP_TPO2 |</div><div class='add'>+			ATL_HW_CHIP_RPF2;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	*p = chip_features;</div><div class='hunk'>@@ -757,18 +860,27 @@ static int hw_atl_fw1x_deinit(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	hw_atl_utils_mpi_set_speed(self, 0);</div><div class='ctx'> 	hw_atl_utils_mpi_set_state(self, MPI_DEINIT);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_update_stats(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	struct hw_atl_utils_mbox mbox;</div><div class='ctx'> 	struct aq_stats_s *cs = &amp;self-&gt;curr_stats;</div><div class='add'>+	struct aq_stats_s curr_stats = *cs;</div><div class='add'>+	struct hw_atl_utils_mbox mbox;</div><div class='add'>+	bool corrupted_stats = false;</div><div class='ctx'> </div><div class='ctx'> 	hw_atl_utils_mpi_read_stats(self, &amp;mbox);</div><div class='ctx'> </div><div class='del'>-#define AQ_SDELTA(_N_) (self-&gt;curr_stats._N_ += \</div><div class='del'>-			mbox.stats._N_ - self-&gt;last_stats._N_)</div><div class='add'>+#define AQ_SDELTA(_N_)  \</div><div class='add'>+do { \</div><div class='add'>+	if (!corrupted_stats &amp;&amp; \</div><div class='add'>+	    ((s64)(mbox.stats._N_ - self-&gt;last_stats._N_)) &gt;= 0) \</div><div class='add'>+		curr_stats._N_ += mbox.stats._N_ - self-&gt;last_stats._N_; \</div><div class='add'>+	else \</div><div class='add'>+		corrupted_stats = true; \</div><div class='add'>+} while (0)</div><div class='ctx'> </div><div class='ctx'> 	if (self-&gt;aq_link_status.mbps) {</div><div class='ctx'> 		AQ_SDELTA(uprc);</div><div class='hunk'>@@ -788,6 +900,9 @@ int hw_atl_utils_update_stats(struct aq_hw_s *self)</div><div class='ctx'> 		AQ_SDELTA(bbrc);</div><div class='ctx'> 		AQ_SDELTA(bbtc);</div><div class='ctx'> 		AQ_SDELTA(dpc);</div><div class='add'>+</div><div class='add'>+		if (!corrupted_stats)</div><div class='add'>+			*cs = curr_stats;</div><div class='ctx'> 	}</div><div class='ctx'> #undef AQ_SDELTA</div><div class='ctx'> </div><div class='hunk'>@@ -840,16 +955,17 @@ int hw_atl_utils_hw_get_regs(struct aq_hw_s *self,</div><div class='ctx'> 	for (i = 0; i &lt; aq_hw_caps-&gt;mac_regs_count; i++)</div><div class='ctx'> 		regs_buff[i] = aq_hw_read_reg(self,</div><div class='ctx'> 					      hw_atl_utils_hw_mac_regs[i]);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version)</div><div class='add'>+u32 hw_atl_utils_get_fw_version(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	*fw_version = aq_hw_read_reg(self, 0x18U);</div><div class='del'>-	return 0;</div><div class='add'>+	return aq_hw_read_reg(self, HW_ATL_MPI_FW_VERSION);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_fw1x_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac)</div><div class='add'>+static int aq_fw1x_set_wake_magic(struct aq_hw_s *self, bool wol_enabled,</div><div class='add'>+				  const u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_atl_utils_fw_rpc *prpc = NULL;</div><div class='ctx'> 	unsigned int rpc_size = 0U;</div><div class='hunk'>@@ -862,22 +978,26 @@ static int aq_fw1x_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac)</div><div class='ctx'> 	memset(prpc, 0, sizeof(*prpc));</div><div class='ctx'> </div><div class='ctx'> 	if (wol_enabled) {</div><div class='del'>-		rpc_size = sizeof(prpc-&gt;msg_id) + sizeof(prpc-&gt;msg_wol);</div><div class='add'>+		rpc_size = offsetof(struct hw_atl_utils_fw_rpc, msg_wol_add) +</div><div class='add'>+			   sizeof(prpc-&gt;msg_wol_add);</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 		prpc-&gt;msg_id = HAL_ATLANTIC_UTILS_FW_MSG_WOL_ADD;</div><div class='del'>-		prpc-&gt;msg_wol.priority =</div><div class='add'>+		prpc-&gt;msg_wol_add.priority =</div><div class='ctx'> 				HAL_ATLANTIC_UTILS_FW_MSG_WOL_PRIOR;</div><div class='del'>-		prpc-&gt;msg_wol.pattern_id =</div><div class='add'>+		prpc-&gt;msg_wol_add.pattern_id =</div><div class='ctx'> 				HAL_ATLANTIC_UTILS_FW_MSG_WOL_PATTERN;</div><div class='del'>-		prpc-&gt;msg_wol.wol_packet_type =</div><div class='add'>+		prpc-&gt;msg_wol_add.packet_type =</div><div class='ctx'> 				HAL_ATLANTIC_UTILS_FW_MSG_WOL_MAG_PKT;</div><div class='ctx'> </div><div class='del'>-		ether_addr_copy((u8 *)&amp;prpc-&gt;msg_wol.wol_pattern, mac);</div><div class='add'>+		ether_addr_copy((u8 *)&amp;prpc-&gt;msg_wol_add.magic_packet_pattern,</div><div class='add'>+				mac);</div><div class='ctx'> 	} else {</div><div class='del'>-		rpc_size = sizeof(prpc-&gt;msg_id) + sizeof(prpc-&gt;msg_del_id);</div><div class='add'>+		rpc_size = sizeof(prpc-&gt;msg_wol_remove) +</div><div class='add'>+			   offsetof(struct hw_atl_utils_fw_rpc, msg_wol_remove);</div><div class='ctx'> </div><div class='ctx'> 		prpc-&gt;msg_id = HAL_ATLANTIC_UTILS_FW_MSG_WOL_DEL;</div><div class='del'>-		prpc-&gt;msg_wol.pattern_id =</div><div class='add'>+		prpc-&gt;msg_wol_add.pattern_id =</div><div class='ctx'> 				HAL_ATLANTIC_UTILS_FW_MSG_WOL_PATTERN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -888,14 +1008,14 @@ err_exit:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_fw1x_set_power(struct aq_hw_s *self, unsigned int power_state,</div><div class='del'>-			     u8 *mac)</div><div class='add'>+			     const u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_atl_utils_fw_rpc *prpc = NULL;</div><div class='ctx'> 	unsigned int rpc_size = 0U;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg-&gt;wol &amp; AQ_NIC_WOL_ENABLED) {</div><div class='del'>-		err = aq_fw1x_set_wol(self, 1, mac);</div><div class='add'>+	if (self-&gt;aq_nic_cfg-&gt;wol &amp; WAKE_MAGIC) {</div><div class='add'>+		err = aq_fw1x_set_wake_magic(self, 1, mac);</div><div class='ctx'> </div><div class='ctx'> 		if (err &lt; 0)</div><div class='ctx'> 			goto err_exit;</div><div class='hunk'>@@ -953,6 +1073,11 @@ static u32 hw_atl_utils_rpc_state_get(struct aq_hw_s *self)</div><div class='ctx'> 	return aq_hw_read_reg(self, HW_ATL_RPC_STATE_ADR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 aq_fw1x_rpc_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(self, HW_ATL_MPI_RPC_ADDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct aq_fw_ops aq_fw_1x_ops = {</div><div class='ctx'> 	.init = hw_atl_utils_mpi_create,</div><div class='ctx'> 	.deinit = hw_atl_fw1x_deinit,</div><div class='hunk'>@@ -962,9 +1087,13 @@ const struct aq_fw_ops aq_fw_1x_ops = {</div><div class='ctx'> 	.set_state = hw_atl_utils_mpi_set_state,</div><div class='ctx'> 	.update_link_status = hw_atl_utils_mpi_get_link_status,</div><div class='ctx'> 	.update_stats = hw_atl_utils_update_stats,</div><div class='add'>+	.get_mac_temp = NULL,</div><div class='ctx'> 	.get_phy_temp = NULL,</div><div class='ctx'> 	.set_power = aq_fw1x_set_power,</div><div class='ctx'> 	.set_eee_rate = NULL,</div><div class='ctx'> 	.get_eee_rate = NULL,</div><div class='ctx'> 	.set_flow_control = NULL,</div><div class='add'>+	.send_fw_request = NULL,</div><div class='add'>+	.enable_ptp = NULL,</div><div class='add'>+	.led_control = NULL,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h<br/>index 48278e333462..f6b990b7f5b4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_utils.h: Declaration of common functions for Atlantic hardware</div><div class='hunk'>@@ -44,7 +42,15 @@ struct __packed hw_atl_rxd_wb_s {</div><div class='ctx'> 	u16 status;</div><div class='ctx'> 	u16 pkt_len;</div><div class='ctx'> 	u16 next_desc_ptr;</div><div class='del'>-	u16 vlan;</div><div class='add'>+	__le16 vlan;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Hardware rx HW TIMESTAMP writeback */</div><div class='add'>+struct __packed hw_atl_rxd_hwts_wb_s {</div><div class='add'>+	u32 sec_hw;</div><div class='add'>+	u32 ns;</div><div class='add'>+	u32 sec_lw0;</div><div class='add'>+	u32 sec_lw1;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed hw_atl_stats_s {</div><div class='hunk'>@@ -65,104 +71,41 @@ struct __packed hw_atl_stats_s {</div><div class='ctx'> 	u32 dpc;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-union __packed ip_addr {</div><div class='del'>-	struct {</div><div class='del'>-		u8 addr[16];</div><div class='del'>-	} v6;</div><div class='del'>-	struct {</div><div class='del'>-		u8 padding[12];</div><div class='del'>-		u8 addr[4];</div><div class='del'>-	} v4;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct __packed hw_atl_utils_fw_rpc {</div><div class='del'>-	u32 msg_id;</div><div class='del'>-</div><div class='add'>+struct __packed drv_msg_enable_wakeup {</div><div class='ctx'> 	union {</div><div class='del'>-		struct {</div><div class='del'>-			u32 pong;</div><div class='del'>-		} msg_ping;</div><div class='add'>+		u32 pattern_mask;</div><div class='ctx'> </div><div class='ctx'> 		struct {</div><div class='del'>-			u8 mac_addr[6];</div><div class='del'>-			u32 ip_addr_cnt;</div><div class='add'>+			u32 reason_arp_v4_pkt : 1;</div><div class='add'>+			u32 reason_ipv4_ping_pkt : 1;</div><div class='add'>+			u32 reason_ipv6_ns_pkt : 1;</div><div class='add'>+			u32 reason_ipv6_ping_pkt : 1;</div><div class='add'>+			u32 reason_link_up : 1;</div><div class='add'>+			u32 reason_link_down : 1;</div><div class='add'>+			u32 reason_maximum : 1;</div><div class='add'>+		};</div><div class='add'>+	};</div><div class='ctx'> </div><div class='del'>-			struct {</div><div class='del'>-				union ip_addr addr;</div><div class='del'>-				union ip_addr mask;</div><div class='del'>-			} ip[1];</div><div class='del'>-		} msg_arp;</div><div class='add'>+	union {</div><div class='add'>+		u32 offload_mask;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		struct {</div><div class='del'>-			u32 len;</div><div class='del'>-			u8 packet[1514U];</div><div class='del'>-		} msg_inject;</div><div class='add'>+struct __packed magic_packet_pattern_s {</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		struct {</div><div class='del'>-			u32 priority;</div><div class='del'>-			u32 wol_packet_type;</div><div class='del'>-			u32 pattern_id;</div><div class='del'>-			u32 next_wol_pattern_offset;</div><div class='del'>-</div><div class='del'>-			union {</div><div class='del'>-				struct {</div><div class='del'>-					u32 flags;</div><div class='del'>-					u8 ipv4_source_address[4];</div><div class='del'>-					u8 ipv4_dest_address[4];</div><div class='del'>-					u16 tcp_source_port_number;</div><div class='del'>-					u16 tcp_dest_port_number;</div><div class='del'>-				} ipv4_tcp_syn_parameters;</div><div class='del'>-</div><div class='del'>-				struct {</div><div class='del'>-					u32 flags;</div><div class='del'>-					u8 ipv6_source_address[16];</div><div class='del'>-					u8 ipv6_dest_address[16];</div><div class='del'>-					u16 tcp_source_port_number;</div><div class='del'>-					u16 tcp_dest_port_number;</div><div class='del'>-				} ipv6_tcp_syn_parameters;</div><div class='del'>-</div><div class='del'>-				struct {</div><div class='del'>-					u32 flags;</div><div class='del'>-				} eapol_request_id_message_parameters;</div><div class='del'>-</div><div class='del'>-				struct {</div><div class='del'>-					u32 flags;</div><div class='del'>-					u32 mask_offset;</div><div class='del'>-					u32 mask_size;</div><div class='del'>-					u32 pattern_offset;</div><div class='del'>-					u32 pattern_size;</div><div class='del'>-				} wol_bit_map_pattern;</div><div class='del'>-</div><div class='del'>-				struct {</div><div class='del'>-					u8 mac_addr[ETH_ALEN];</div><div class='del'>-				} wol_magic_packet_patter;</div><div class='del'>-			} wol_pattern;</div><div class='del'>-		} msg_wol;</div><div class='add'>+struct __packed drv_msg_wol_add {</div><div class='add'>+	u32 priority;</div><div class='add'>+	u32 packet_type;</div><div class='add'>+	u32 pattern_id;</div><div class='add'>+	u32 next_pattern_offset;</div><div class='ctx'> </div><div class='del'>-		struct {</div><div class='del'>-			union {</div><div class='del'>-				u32 pattern_mask;</div><div class='del'>-</div><div class='del'>-				struct {</div><div class='del'>-					u32 reason_arp_v4_pkt : 1;</div><div class='del'>-					u32 reason_ipv4_ping_pkt : 1;</div><div class='del'>-					u32 reason_ipv6_ns_pkt : 1;</div><div class='del'>-					u32 reason_ipv6_ping_pkt : 1;</div><div class='del'>-					u32 reason_link_up : 1;</div><div class='del'>-					u32 reason_link_down : 1;</div><div class='del'>-					u32 reason_maximum : 1;</div><div class='del'>-				};</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			union {</div><div class='del'>-				u32 offload_mask;</div><div class='del'>-			};</div><div class='del'>-		} msg_enable_wakeup;</div><div class='add'>+	struct magic_packet_pattern_s magic_packet_pattern;</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-		struct {</div><div class='del'>-			u32 id;</div><div class='del'>-		} msg_del_id;</div><div class='del'>-	};</div><div class='add'>+struct __packed drv_msg_wol_remove {</div><div class='add'>+	u32 id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed hw_atl_utils_mbox_header {</div><div class='hunk'>@@ -171,43 +114,89 @@ struct __packed hw_atl_utils_mbox_header {</div><div class='ctx'> 	u32 error;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct __packed hw_aq_info {</div><div class='add'>+struct __packed hw_atl_ptp_offset {</div><div class='add'>+	u16 ingress_100;</div><div class='add'>+	u16 egress_100;</div><div class='add'>+	u16 ingress_1000;</div><div class='add'>+	u16 egress_1000;</div><div class='add'>+	u16 ingress_2500;</div><div class='add'>+	u16 egress_2500;</div><div class='add'>+	u16 ingress_5000;</div><div class='add'>+	u16 egress_5000;</div><div class='add'>+	u16 ingress_10000;</div><div class='add'>+	u16 egress_10000;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed hw_atl_cable_diag {</div><div class='add'>+	u8 fault;</div><div class='add'>+	u8 distance;</div><div class='add'>+	u8 far_distance;</div><div class='add'>+	u8 reserved;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum gpio_pin_function {</div><div class='add'>+	GPIO_PIN_FUNCTION_NC,</div><div class='add'>+	GPIO_PIN_FUNCTION_VAUX_ENABLE,</div><div class='add'>+	GPIO_PIN_FUNCTION_EFUSE_BURN_ENABLE,</div><div class='add'>+	GPIO_PIN_FUNCTION_SFP_PLUS_DETECT,</div><div class='add'>+	GPIO_PIN_FUNCTION_TX_DISABLE,</div><div class='add'>+	GPIO_PIN_FUNCTION_RATE_SEL_0,</div><div class='add'>+	GPIO_PIN_FUNCTION_RATE_SEL_1,</div><div class='add'>+	GPIO_PIN_FUNCTION_TX_FAULT,</div><div class='add'>+	GPIO_PIN_FUNCTION_PTP0,</div><div class='add'>+	GPIO_PIN_FUNCTION_PTP1,</div><div class='add'>+	GPIO_PIN_FUNCTION_PTP2,</div><div class='add'>+	GPIO_PIN_FUNCTION_SIZE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed hw_atl_info {</div><div class='ctx'> 	u8 reserved[6];</div><div class='ctx'> 	u16 phy_fault_code;</div><div class='ctx'> 	u16 phy_temperature;</div><div class='ctx'> 	u8 cable_len;</div><div class='ctx'> 	u8 reserved1;</div><div class='del'>-	u32 cable_diag_data[4];</div><div class='del'>-	u8 reserved2[32];</div><div class='add'>+	struct hw_atl_cable_diag cable_diag_data[4];</div><div class='add'>+	struct hw_atl_ptp_offset ptp_offset;</div><div class='add'>+	u8 reserved2[12];</div><div class='ctx'> 	u32 caps_lo;</div><div class='ctx'> 	u32 caps_hi;</div><div class='add'>+	u32 reserved_datapath;</div><div class='add'>+	u32 reserved3[7];</div><div class='add'>+	u32 reserved_simpleresp[3];</div><div class='add'>+	u32 reserved_linkstat[7];</div><div class='add'>+	u32 reserved_wakes_count;</div><div class='add'>+	u32 reserved_eee_stat[12];</div><div class='add'>+	u32 tx_stuck_cnt;</div><div class='add'>+	u32 setting_address;</div><div class='add'>+	u32 setting_length;</div><div class='add'>+	u32 caps_ex;</div><div class='add'>+	enum gpio_pin_function gpio_pin[3];</div><div class='add'>+	u32 pcie_aer_dump[18];</div><div class='add'>+	u16 snr_margin[4];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed hw_atl_utils_mbox {</div><div class='ctx'> 	struct hw_atl_utils_mbox_header header;</div><div class='ctx'> 	struct hw_atl_stats_s stats;</div><div class='del'>-	struct hw_aq_info info;</div><div class='add'>+	struct hw_atl_info info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* fw2x */</div><div class='del'>-typedef u32	fw_offset_t;</div><div class='del'>-</div><div class='ctx'> struct __packed offload_ip_info {</div><div class='ctx'> 	u8 v4_local_addr_count;</div><div class='ctx'> 	u8 v4_addr_count;</div><div class='ctx'> 	u8 v6_local_addr_count;</div><div class='ctx'> 	u8 v6_addr_count;</div><div class='del'>-	fw_offset_t v4_addr;</div><div class='del'>-	fw_offset_t v4_prefix;</div><div class='del'>-	fw_offset_t v6_addr;</div><div class='del'>-	fw_offset_t v6_prefix;</div><div class='add'>+	u32 v4_addr;</div><div class='add'>+	u32 v4_prefix;</div><div class='add'>+	u32 v6_addr;</div><div class='add'>+	u32 v6_prefix;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed offload_port_info {</div><div class='ctx'> 	u16 udp_port_count;</div><div class='ctx'> 	u16 tcp_port_count;</div><div class='del'>-	fw_offset_t udp_port;</div><div class='del'>-	fw_offset_t tcp_port;</div><div class='add'>+	u32 udp_port;</div><div class='add'>+	u32 tcp_port;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed offload_ka_info {</div><div class='hunk'>@@ -215,15 +204,15 @@ struct __packed offload_ka_info {</div><div class='ctx'> 	u16 v6_ka_count;</div><div class='ctx'> 	u32 retry_count;</div><div class='ctx'> 	u32 retry_interval;</div><div class='del'>-	fw_offset_t v4_ka;</div><div class='del'>-	fw_offset_t v6_ka;</div><div class='add'>+	u32 v4_ka;</div><div class='add'>+	u32 v6_ka;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed offload_rr_info {</div><div class='ctx'> 	u32 rr_count;</div><div class='ctx'> 	u32 rr_buf_len;</div><div class='del'>-	fw_offset_t rr_id_x;</div><div class='del'>-	fw_offset_t rr_buf;</div><div class='add'>+	u32 rr_id_x;</div><div class='add'>+	u32 rr_buf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct __packed offload_info {</div><div class='hunk'>@@ -237,12 +226,131 @@ struct __packed offload_info {</div><div class='ctx'> 	struct offload_port_info ports;</div><div class='ctx'> 	struct offload_ka_info kas;</div><div class='ctx'> 	struct offload_rr_info rrs;</div><div class='del'>-	u8 buf[0];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed hw_atl_utils_fw_rpc {</div><div class='add'>+	u32 msg_id;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		/* fw1x structures */</div><div class='add'>+		struct drv_msg_wol_add msg_wol_add;</div><div class='add'>+		struct drv_msg_wol_remove msg_wol_remove;</div><div class='add'>+		struct drv_msg_enable_wakeup msg_enable_wakeup;</div><div class='add'>+		/* fw2x structures */</div><div class='add'>+		struct offload_info fw2x_offloads;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Mailbox FW Request interface */</div><div class='add'>+struct __packed hw_fw_request_ptp_gpio_ctrl {</div><div class='add'>+	u32 index;</div><div class='add'>+	u32 period;</div><div class='add'>+	u64 start;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed hw_fw_request_ptp_adj_freq {</div><div class='add'>+	u32 ns_mac;</div><div class='add'>+	u32 fns_mac;</div><div class='add'>+	u32 ns_phy;</div><div class='add'>+	u32 fns_phy;</div><div class='add'>+	u32 mac_ns_adj;</div><div class='add'>+	u32 mac_fns_adj;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed hw_fw_request_ptp_adj_clock {</div><div class='add'>+	u32 ns;</div><div class='add'>+	u32 sec;</div><div class='add'>+	int sign;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HW_AQ_FW_REQUEST_PTP_GPIO_CTRL	         0x11</div><div class='add'>+#define HW_AQ_FW_REQUEST_PTP_ADJ_FREQ	         0x12</div><div class='add'>+#define HW_AQ_FW_REQUEST_PTP_ADJ_CLOCK	         0x13</div><div class='add'>+</div><div class='add'>+struct __packed hw_fw_request_iface {</div><div class='add'>+	u32 msg_id;</div><div class='add'>+	union {</div><div class='add'>+		/* PTP FW Request */</div><div class='add'>+		struct hw_fw_request_ptp_gpio_ctrl ptp_gpio_ctrl;</div><div class='add'>+		struct hw_fw_request_ptp_adj_freq ptp_adj_freq;</div><div class='add'>+		struct hw_fw_request_ptp_adj_clock ptp_adj_clock;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed hw_atl_utils_settings {</div><div class='add'>+	u32 mtu;</div><div class='add'>+	u32 downshift_retry_count;</div><div class='add'>+	u32 link_pause_frame_quanta_100m;</div><div class='add'>+	u32 link_pause_frame_threshold_100m;</div><div class='add'>+	u32 link_pause_frame_quanta_1g;</div><div class='add'>+	u32 link_pause_frame_threshold_1g;</div><div class='add'>+	u32 link_pause_frame_quanta_2p5g;</div><div class='add'>+	u32 link_pause_frame_threshold_2p5g;</div><div class='add'>+	u32 link_pause_frame_quanta_5g;</div><div class='add'>+	u32 link_pause_frame_threshold_5g;</div><div class='add'>+	u32 link_pause_frame_quanta_10g;</div><div class='add'>+	u32 link_pause_frame_threshold_10g;</div><div class='add'>+	u32 pfc_quanta_class_0;</div><div class='add'>+	u32 pfc_threshold_class_0;</div><div class='add'>+	u32 pfc_quanta_class_1;</div><div class='add'>+	u32 pfc_threshold_class_1;</div><div class='add'>+	u32 pfc_quanta_class_2;</div><div class='add'>+	u32 pfc_threshold_class_2;</div><div class='add'>+	u32 pfc_quanta_class_3;</div><div class='add'>+	u32 pfc_threshold_class_3;</div><div class='add'>+	u32 pfc_quanta_class_4;</div><div class='add'>+	u32 pfc_threshold_class_4;</div><div class='add'>+	u32 pfc_quanta_class_5;</div><div class='add'>+	u32 pfc_threshold_class_5;</div><div class='add'>+	u32 pfc_quanta_class_6;</div><div class='add'>+	u32 pfc_threshold_class_6;</div><div class='add'>+	u32 pfc_quanta_class_7;</div><div class='add'>+	u32 pfc_threshold_class_7;</div><div class='add'>+	u32 eee_link_down_timeout;</div><div class='add'>+	u32 eee_link_up_timeout;</div><div class='add'>+	u32 eee_max_link_drops;</div><div class='add'>+	u32 eee_rates_mask;</div><div class='add'>+	u32 wake_timer;</div><div class='add'>+	u32 thermal_shutdown_off_temp;</div><div class='add'>+	u32 thermal_shutdown_warning_temp;</div><div class='add'>+	u32 thermal_shutdown_cold_temp;</div><div class='add'>+	u32 msm_options;</div><div class='add'>+	u32 dac_cable_serdes_modes;</div><div class='add'>+	u32 media_detect;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum macsec_msg_type {</div><div class='add'>+	macsec_cfg_msg = 0,</div><div class='add'>+	macsec_add_rx_sc_msg,</div><div class='add'>+	macsec_add_tx_sc_msg,</div><div class='add'>+	macsec_add_rx_sa_msg,</div><div class='add'>+	macsec_add_tx_sa_msg,</div><div class='add'>+	macsec_get_stats_msg,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed macsec_cfg_request {</div><div class='add'>+	u32 enabled;</div><div class='add'>+	u32 egress_threshold;</div><div class='add'>+	u32 ingress_threshold;</div><div class='add'>+	u32 interrupts_enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed macsec_msg_fw_request {</div><div class='add'>+	u32 msg_id; /* not used */</div><div class='add'>+	u32 msg_type;</div><div class='add'>+	struct macsec_cfg_request cfg;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed macsec_msg_fw_response {</div><div class='add'>+	u32 result;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum hw_atl_rx_action_with_traffic {</div><div class='ctx'> 	HW_ATL_RX_DISCARD,</div><div class='ctx'> 	HW_ATL_RX_HOST,</div><div class='add'>+	HW_ATL_RX_MNGMNT,</div><div class='add'>+	HW_ATL_RX_HOST_AND_MNGMNT,</div><div class='add'>+	HW_ATL_RX_WOL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct aq_rx_filter_vlan {</div><div class='hunk'>@@ -252,6 +360,8 @@ struct aq_rx_filter_vlan {</div><div class='ctx'> 	u8 queue;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define HW_ATL_VLAN_MAX_FILTERS         16U</div><div class='add'>+</div><div class='ctx'> struct aq_rx_filter_l2 {</div><div class='ctx'> 	s8 queue;</div><div class='ctx'> 	u8 location;</div><div class='hunk'>@@ -298,17 +408,6 @@ enum hw_atl_rx_ctrl_registers_l3l4 {</div><div class='ctx'> #define HW_ATL_GET_REG_LOCATION_FL3L4(location) \</div><div class='ctx'> 	((location) - AQ_RX_FIRST_LOC_FL3L4)</div><div class='ctx'> </div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_MIPS         0x00000001U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_TPO2         0x00000002U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_RPF2         0x00000004U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_MPI_AQ       0x00000010U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_REVISION_A0  0x01000000U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_REVISION_B0  0x02000000U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_CHIP_REVISION_B1  0x04000000U</div><div class='del'>-</div><div class='del'>-#define IS_CHIP_FEATURE(_F_) (HAL_ATLANTIC_UTILS_CHIP_##_F_ &amp; \</div><div class='del'>-	self-&gt;chip_features)</div><div class='del'>-</div><div class='ctx'> enum hal_atl_utils_fw_state_e {</div><div class='ctx'> 	MPI_DEINIT = 0,</div><div class='ctx'> 	MPI_RESET = 1,</div><div class='hunk'>@@ -319,25 +418,17 @@ enum hal_atl_utils_fw_state_e {</div><div class='ctx'> #define HAL_ATLANTIC_RATE_10G        BIT(0)</div><div class='ctx'> #define HAL_ATLANTIC_RATE_5G         BIT(1)</div><div class='ctx'> #define HAL_ATLANTIC_RATE_5GSR       BIT(2)</div><div class='del'>-#define HAL_ATLANTIC_RATE_2GS        BIT(3)</div><div class='add'>+#define HAL_ATLANTIC_RATE_2G5        BIT(3)</div><div class='ctx'> #define HAL_ATLANTIC_RATE_1G         BIT(4)</div><div class='ctx'> #define HAL_ATLANTIC_RATE_100M       BIT(5)</div><div class='ctx'> #define HAL_ATLANTIC_RATE_INVALID    BIT(6)</div><div class='ctx'> </div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_PING          0x1U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_ARP           0x2U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_INJECT        0x3U</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW_MSG_WOL_ADD       0x4U</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW_MSG_WOL_PRIOR     0x10000000U</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW_MSG_WOL_PATTERN   0x1U</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW_MSG_WOL_MAG_PKT   0x2U</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW_MSG_WOL_DEL       0x5U</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW_MSG_ENABLE_WAKEUP 0x6U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_MSM_PFC       0x7U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_PROVISIONING  0x8U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_OFFLOAD_ADD   0x9U</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_OFFLOAD_DEL   0xAU</div><div class='del'>-#define HAL_ATLANTIC_UTILS_FW_MSG_CABLE_DIAG    0xDU</div><div class='ctx'> </div><div class='ctx'> enum hw_atl_fw2x_rate {</div><div class='ctx'> 	FW2X_RATE_100M    = 0x20,</div><div class='hunk'>@@ -347,91 +438,144 @@ enum hw_atl_fw2x_rate {</div><div class='ctx'> 	FW2X_RATE_10G     = 0x800,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* 0x370</div><div class='add'>+ * Link capabilities resolution register</div><div class='add'>+ */</div><div class='ctx'> enum hw_atl_fw2x_caps_lo {</div><div class='del'>-	CAPS_LO_10BASET_HD = 0x00,</div><div class='add'>+	CAPS_LO_10BASET_HD        = 0,</div><div class='ctx'> 	CAPS_LO_10BASET_FD,</div><div class='ctx'> 	CAPS_LO_100BASETX_HD,</div><div class='ctx'> 	CAPS_LO_100BASET4_HD,</div><div class='ctx'> 	CAPS_LO_100BASET2_HD,</div><div class='del'>-	CAPS_LO_100BASETX_FD,</div><div class='add'>+	CAPS_LO_100BASETX_FD      = 5,</div><div class='ctx'> 	CAPS_LO_100BASET2_FD,</div><div class='ctx'> 	CAPS_LO_1000BASET_HD,</div><div class='ctx'> 	CAPS_LO_1000BASET_FD,</div><div class='ctx'> 	CAPS_LO_2P5GBASET_FD,</div><div class='del'>-	CAPS_LO_5GBASET_FD,</div><div class='add'>+	CAPS_LO_5GBASET_FD        = 10,</div><div class='ctx'> 	CAPS_LO_10GBASET_FD,</div><div class='add'>+	CAPS_LO_AUTONEG,</div><div class='add'>+	CAPS_LO_SMBUS_READ,</div><div class='add'>+	CAPS_LO_SMBUS_WRITE,</div><div class='add'>+	CAPS_LO_MACSEC            = 15,</div><div class='add'>+	CAPS_LO_RESERVED1,</div><div class='add'>+	CAPS_LO_WAKE_ON_LINK_FORCED,</div><div class='add'>+	CAPS_LO_HIGH_TEMP_WARNING = 29,</div><div class='add'>+	CAPS_LO_DRIVER_SCRATCHPAD = 30,</div><div class='add'>+	CAPS_LO_GLOBAL_FAULT      = 31</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* 0x374</div><div class='add'>+ * Status register</div><div class='add'>+ */</div><div class='ctx'> enum hw_atl_fw2x_caps_hi {</div><div class='del'>-	CAPS_HI_RESERVED1 = 0x00,</div><div class='add'>+	CAPS_HI_TPO2EN            = 0,</div><div class='ctx'> 	CAPS_HI_10BASET_EEE,</div><div class='ctx'> 	CAPS_HI_RESERVED2,</div><div class='ctx'> 	CAPS_HI_PAUSE,</div><div class='ctx'> 	CAPS_HI_ASYMMETRIC_PAUSE,</div><div class='del'>-	CAPS_HI_100BASETX_EEE,</div><div class='del'>-	CAPS_HI_RESERVED3,</div><div class='del'>-	CAPS_HI_RESERVED4,</div><div class='add'>+	CAPS_HI_100BASETX_EEE     = 5,</div><div class='add'>+	CAPS_HI_PHY_BUF_SEND,</div><div class='add'>+	CAPS_HI_PHY_BUF_RECV,</div><div class='ctx'> 	CAPS_HI_1000BASET_FD_EEE,</div><div class='ctx'> 	CAPS_HI_2P5GBASET_FD_EEE,</div><div class='del'>-	CAPS_HI_5GBASET_FD_EEE,</div><div class='add'>+	CAPS_HI_5GBASET_FD_EEE    = 10,</div><div class='ctx'> 	CAPS_HI_10GBASET_FD_EEE,</div><div class='del'>-	CAPS_HI_RESERVED5,</div><div class='del'>-	CAPS_HI_RESERVED6,</div><div class='del'>-	CAPS_HI_RESERVED7,</div><div class='del'>-	CAPS_HI_RESERVED8,</div><div class='del'>-	CAPS_HI_RESERVED9,</div><div class='add'>+	CAPS_HI_FW_REQUEST,</div><div class='add'>+	CAPS_HI_PHY_LOG,</div><div class='add'>+	CAPS_HI_EEE_AUTO_DISABLE_SETTINGS,</div><div class='add'>+	CAPS_HI_PFC               = 15,</div><div class='add'>+	CAPS_HI_WAKE_ON_LINK,</div><div class='ctx'> 	CAPS_HI_CABLE_DIAG,</div><div class='ctx'> 	CAPS_HI_TEMPERATURE,</div><div class='ctx'> 	CAPS_HI_DOWNSHIFT,</div><div class='del'>-	CAPS_HI_PTP_AVB_EN,</div><div class='del'>-	CAPS_HI_MEDIA_DETECT,</div><div class='add'>+	CAPS_HI_PTP_AVB_EN_FW2X   = 20,</div><div class='add'>+	CAPS_HI_THERMAL_SHUTDOWN,</div><div class='ctx'> 	CAPS_HI_LINK_DROP,</div><div class='ctx'> 	CAPS_HI_SLEEP_PROXY,</div><div class='ctx'> 	CAPS_HI_WOL,</div><div class='del'>-	CAPS_HI_MAC_STOP,</div><div class='add'>+	CAPS_HI_MAC_STOP          = 25,</div><div class='ctx'> 	CAPS_HI_EXT_LOOPBACK,</div><div class='ctx'> 	CAPS_HI_INT_LOOPBACK,</div><div class='ctx'> 	CAPS_HI_EFUSE_AGENT,</div><div class='ctx'> 	CAPS_HI_WOL_TIMER,</div><div class='del'>-	CAPS_HI_STATISTICS,</div><div class='add'>+	CAPS_HI_STATISTICS        = 30,</div><div class='ctx'> 	CAPS_HI_TRANSACTION_ID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* 0x36C</div><div class='add'>+ * Control register</div><div class='add'>+ */</div><div class='ctx'> enum hw_atl_fw2x_ctrl {</div><div class='del'>-	CTRL_RESERVED1 = 0x00,</div><div class='add'>+	CTRL_RESERVED1            = 0,</div><div class='ctx'> 	CTRL_RESERVED2,</div><div class='ctx'> 	CTRL_RESERVED3,</div><div class='ctx'> 	CTRL_PAUSE,</div><div class='ctx'> 	CTRL_ASYMMETRIC_PAUSE,</div><div class='del'>-	CTRL_RESERVED4,</div><div class='add'>+	CTRL_RESERVED4            = 5,</div><div class='ctx'> 	CTRL_RESERVED5,</div><div class='ctx'> 	CTRL_RESERVED6,</div><div class='ctx'> 	CTRL_1GBASET_FD_EEE,</div><div class='ctx'> 	CTRL_2P5GBASET_FD_EEE,</div><div class='del'>-	CTRL_5GBASET_FD_EEE,</div><div class='add'>+	CTRL_5GBASET_FD_EEE       = 10,</div><div class='ctx'> 	CTRL_10GBASET_FD_EEE,</div><div class='ctx'> 	CTRL_THERMAL_SHUTDOWN,</div><div class='ctx'> 	CTRL_PHY_LOGS,</div><div class='ctx'> 	CTRL_EEE_AUTO_DISABLE,</div><div class='del'>-	CTRL_PFC,</div><div class='add'>+	CTRL_PFC                  = 15,</div><div class='ctx'> 	CTRL_WAKE_ON_LINK,</div><div class='ctx'> 	CTRL_CABLE_DIAG,</div><div class='ctx'> 	CTRL_TEMPERATURE,</div><div class='ctx'> 	CTRL_DOWNSHIFT,</div><div class='del'>-	CTRL_PTP_AVB,</div><div class='add'>+	CTRL_PTP_AVB              = 20,</div><div class='ctx'> 	CTRL_RESERVED7,</div><div class='ctx'> 	CTRL_LINK_DROP,</div><div class='ctx'> 	CTRL_SLEEP_PROXY,</div><div class='ctx'> 	CTRL_WOL,</div><div class='del'>-	CTRL_MAC_STOP,</div><div class='add'>+	CTRL_MAC_STOP             = 25,</div><div class='ctx'> 	CTRL_EXT_LOOPBACK,</div><div class='ctx'> 	CTRL_INT_LOOPBACK,</div><div class='ctx'> 	CTRL_RESERVED8,</div><div class='ctx'> 	CTRL_WOL_TIMER,</div><div class='del'>-	CTRL_STATISTICS,</div><div class='add'>+	CTRL_STATISTICS           = 30,</div><div class='ctx'> 	CTRL_FORCE_RECONNECT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum hw_atl_caps_ex {</div><div class='add'>+	CAPS_EX_LED_CONTROL       =  0,</div><div class='add'>+	CAPS_EX_LED0_MODE_LO,</div><div class='add'>+	CAPS_EX_LED0_MODE_HI,</div><div class='add'>+	CAPS_EX_LED1_MODE_LO,</div><div class='add'>+	CAPS_EX_LED1_MODE_HI,</div><div class='add'>+	CAPS_EX_LED2_MODE_LO      =  5,</div><div class='add'>+	CAPS_EX_LED2_MODE_HI,</div><div class='add'>+	CAPS_EX_RESERVED07,</div><div class='add'>+	CAPS_EX_RESERVED08,</div><div class='add'>+	CAPS_EX_RESERVED09,</div><div class='add'>+	CAPS_EX_RESERVED10        = 10,</div><div class='add'>+	CAPS_EX_RESERVED11,</div><div class='add'>+	CAPS_EX_RESERVED12,</div><div class='add'>+	CAPS_EX_RESERVED13,</div><div class='add'>+	CAPS_EX_RESERVED14,</div><div class='add'>+	CAPS_EX_RESERVED15        = 15,</div><div class='add'>+	CAPS_EX_PHY_PTP_EN,</div><div class='add'>+	CAPS_EX_MAC_PTP_EN,</div><div class='add'>+	CAPS_EX_EXT_CLK_EN,</div><div class='add'>+	CAPS_EX_SCHED_DMA_EN,</div><div class='add'>+	CAPS_EX_PTP_GPIO_EN       = 20,</div><div class='add'>+	CAPS_EX_UPDATE_SETTINGS,</div><div class='add'>+	CAPS_EX_PHY_CTRL_TS_PIN,</div><div class='add'>+	CAPS_EX_SNR_OPERATING_MARGIN,</div><div class='add'>+	CAPS_EX_RESERVED24,</div><div class='add'>+	CAPS_EX_RESERVED25        = 25,</div><div class='add'>+	CAPS_EX_RESERVED26,</div><div class='add'>+	CAPS_EX_RESERVED27,</div><div class='add'>+	CAPS_EX_RESERVED28,</div><div class='add'>+	CAPS_EX_RESERVED29,</div><div class='add'>+	CAPS_EX_RESERVED30        = 30,</div><div class='add'>+	CAPS_EX_RESERVED31</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct aq_hw_s;</div><div class='ctx'> struct aq_fw_ops;</div><div class='ctx'> struct aq_hw_caps_s;</div><div class='hunk'>@@ -469,7 +613,7 @@ int hw_atl_utils_hw_set_power(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_hw_deinit(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='del'>-int hw_atl_utils_get_fw_version(struct aq_hw_s *self, u32 *fw_version);</div><div class='add'>+u32 hw_atl_utils_get_fw_version(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_update_stats(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='hunk'>@@ -478,6 +622,11 @@ struct aq_stats_s *hw_atl_utils_get_hw_stats(struct aq_hw_s *self);</div><div class='ctx'> int hw_atl_utils_fw_downld_dwords(struct aq_hw_s *self, u32 a,</div><div class='ctx'> 				  u32 *p, u32 cnt);</div><div class='ctx'> </div><div class='add'>+int hw_atl_write_fwcfg_dwords(struct aq_hw_s *self, u32 *p, u32 cnt);</div><div class='add'>+</div><div class='add'>+int hw_atl_write_fwsettings_dwords(struct aq_hw_s *self, u32 offset, u32 *p,</div><div class='add'>+				   u32 cnt);</div><div class='add'>+</div><div class='ctx'> int hw_atl_utils_fw_set_wol(struct aq_hw_s *self, bool wol_enabled, u8 *mac);</div><div class='ctx'> </div><div class='ctx'> int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size);</div><div class='hunk'>@@ -485,6 +634,8 @@ int hw_atl_utils_fw_rpc_call(struct aq_hw_s *self, unsigned int rpc_size);</div><div class='ctx'> int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,</div><div class='ctx'> 			     struct hw_atl_utils_fw_rpc **rpc);</div><div class='ctx'> </div><div class='add'>+bool hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);</div><div class='add'>+</div><div class='ctx'> extern const struct aq_fw_ops aq_fw_1x_ops;</div><div class='ctx'> extern const struct aq_fw_ops aq_fw_2x_ops;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c<br/>index fbc9d6ac841f..4d4cfbc91e19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c</a></div><div class='hunk'>@@ -1,10 +1,8 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='add'>+ * Copyright (C) 2014-2019 aQuantia Corporation</div><div class='add'>+ * Copyright (C) 2019-2020 Marvell International Ltd.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /* File hw_atl_utils_fw2x.c: Definition of firmware 2.x functions for</div><div class='hunk'>@@ -20,26 +18,37 @@</div><div class='ctx'> #include "hw_atl_utils.h"</div><div class='ctx'> #include "hw_atl_llh.h"</div><div class='ctx'> </div><div class='del'>-#define HW_ATL_FW2X_MPI_RPC_ADDR        0x334</div><div class='add'>+#define HW_ATL_FW2X_MPI_LED_ADDR         0x31c</div><div class='add'>+#define HW_ATL_FW2X_MPI_RPC_ADDR         0x334</div><div class='ctx'> </div><div class='del'>-#define HW_ATL_FW2X_MPI_MBOX_ADDR       0x360</div><div class='del'>-#define HW_ATL_FW2X_MPI_EFUSE_ADDR	0x364</div><div class='del'>-#define HW_ATL_FW2X_MPI_CONTROL_ADDR	0x368</div><div class='del'>-#define HW_ATL_FW2X_MPI_CONTROL2_ADDR	0x36C</div><div class='del'>-#define HW_ATL_FW2X_MPI_STATE_ADDR	0x370</div><div class='del'>-#define HW_ATL_FW2X_MPI_STATE2_ADDR     0x374</div><div class='add'>+#define HW_ATL_FW2X_MPI_MBOX_ADDR        0x360</div><div class='add'>+#define HW_ATL_FW2X_MPI_EFUSE_ADDR       0x364</div><div class='add'>+#define HW_ATL_FW2X_MPI_CONTROL_ADDR     0x368</div><div class='add'>+#define HW_ATL_FW2X_MPI_CONTROL2_ADDR    0x36C</div><div class='add'>+#define HW_ATL_FW2X_MPI_STATE_ADDR       0x370</div><div class='add'>+#define HW_ATL_FW2X_MPI_STATE2_ADDR      0x374</div><div class='add'>+</div><div class='add'>+#define HW_ATL_FW3X_EXT_CONTROL_ADDR     0x378</div><div class='add'>+#define HW_ATL_FW3X_EXT_STATE_ADDR       0x37c</div><div class='add'>+</div><div class='add'>+#define HW_ATL_FW3X_PTP_ADJ_LSW_ADDR	 0x50a0</div><div class='add'>+#define HW_ATL_FW3X_PTP_ADJ_MSW_ADDR	 0x50a4</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_FW2X_CAP_PAUSE            BIT(CAPS_HI_PAUSE)</div><div class='ctx'> #define HW_ATL_FW2X_CAP_ASYM_PAUSE       BIT(CAPS_HI_ASYMMETRIC_PAUSE)</div><div class='ctx'> #define HW_ATL_FW2X_CAP_SLEEP_PROXY      BIT(CAPS_HI_SLEEP_PROXY)</div><div class='ctx'> #define HW_ATL_FW2X_CAP_WOL              BIT(CAPS_HI_WOL)</div><div class='ctx'> </div><div class='add'>+#define HW_ATL_FW2X_CTRL_WAKE_ON_LINK     BIT(CTRL_WAKE_ON_LINK)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_SLEEP_PROXY      BIT(CTRL_SLEEP_PROXY)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_WOL              BIT(CTRL_WOL)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_LINK_DROP        BIT(CTRL_LINK_DROP)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_PAUSE            BIT(CTRL_PAUSE)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_TEMPERATURE      BIT(CTRL_TEMPERATURE)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE BIT(CTRL_ASYMMETRIC_PAUSE)</div><div class='add'>+#define HW_ATL_FW2X_CTRL_INT_LOOPBACK     BIT(CTRL_INT_LOOPBACK)</div><div class='add'>+#define HW_ATL_FW2X_CTRL_EXT_LOOPBACK     BIT(CTRL_EXT_LOOPBACK)</div><div class='add'>+#define HW_ATL_FW2X_CTRL_DOWNSHIFT        BIT(CTRL_DOWNSHIFT)</div><div class='ctx'> #define HW_ATL_FW2X_CTRL_FORCE_RECONNECT  BIT(CTRL_FORCE_RECONNECT)</div><div class='ctx'> </div><div class='ctx'> #define HW_ATL_FW2X_CAP_EEE_1G_MASK      BIT(CAPS_HI_1000BASET_FD_EEE)</div><div class='hunk'>@@ -47,9 +56,14 @@</div><div class='ctx'> #define HW_ATL_FW2X_CAP_EEE_5G_MASK      BIT(CAPS_HI_5GBASET_FD_EEE)</div><div class='ctx'> #define HW_ATL_FW2X_CAP_EEE_10G_MASK     BIT(CAPS_HI_10GBASET_FD_EEE)</div><div class='ctx'> </div><div class='add'>+#define HW_ATL_FW2X_CAP_MACSEC           BIT(CAPS_LO_MACSEC)</div><div class='add'>+</div><div class='ctx'> #define HAL_ATLANTIC_WOL_FILTERS_COUNT   8</div><div class='ctx'> #define HAL_ATLANTIC_UTILS_FW2X_MSG_WOL  0x0E</div><div class='ctx'> </div><div class='add'>+#define HW_ATL_FW_VER_LED                0x03010026U</div><div class='add'>+#define HW_ATL_FW_VER_MEDIA_CONTROL      0x0301005aU</div><div class='add'>+</div><div class='ctx'> struct __packed fw2x_msg_wol_pattern {</div><div class='ctx'> 	u8 mask[16];</div><div class='ctx'> 	u32 crc;</div><div class='hunk'>@@ -74,6 +88,8 @@ static int aq_fw2x_set_state(struct aq_hw_s *self,</div><div class='ctx'> </div><div class='ctx'> static u32 aq_fw2x_mbox_get(struct aq_hw_s *self);</div><div class='ctx'> static u32 aq_fw2x_rpc_get(struct aq_hw_s *self);</div><div class='add'>+static int aq_fw2x_settings_get(struct aq_hw_s *self, u32 *addr);</div><div class='add'>+static u32 aq_fw2x_state_get(struct aq_hw_s *self);</div><div class='ctx'> static u32 aq_fw2x_state2_get(struct aq_hw_s *self);</div><div class='ctx'> </div><div class='ctx'> static int aq_fw2x_init(struct aq_hw_s *self)</div><div class='hunk'>@@ -91,6 +107,8 @@ static int aq_fw2x_init(struct aq_hw_s *self)</div><div class='ctx'> 					self-&gt;rpc_addr != 0U,</div><div class='ctx'> 					1000U, 100000U);</div><div class='ctx'> </div><div class='add'>+	err = aq_fw2x_settings_get(self, &amp;self-&gt;settings_addr);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,10 +132,7 @@ static enum hw_atl_fw2x_rate link_speed_mask_2fw2x_ratemask(u32 speed)</div><div class='ctx'> 	if (speed &amp; AQ_NIC_RATE_5G)</div><div class='ctx'> 		rate |= FW2X_RATE_5G;</div><div class='ctx'> </div><div class='del'>-	if (speed &amp; AQ_NIC_RATE_5GSR)</div><div class='del'>-		rate |= FW2X_RATE_5G;</div><div class='del'>-</div><div class='del'>-	if (speed &amp; AQ_NIC_RATE_2GS)</div><div class='add'>+	if (speed &amp; AQ_NIC_RATE_2G5)</div><div class='ctx'> 		rate |= FW2X_RATE_2G5;</div><div class='ctx'> </div><div class='ctx'> 	if (speed &amp; AQ_NIC_RATE_1G)</div><div class='hunk'>@@ -138,7 +153,7 @@ static u32 fw2x_to_eee_mask(u32 speed)</div><div class='ctx'> 	if (speed &amp; HW_ATL_FW2X_CAP_EEE_5G_MASK)</div><div class='ctx'> 		rate |= AQ_NIC_RATE_EEE_5G;</div><div class='ctx'> 	if (speed &amp; HW_ATL_FW2X_CAP_EEE_2G5_MASK)</div><div class='del'>-		rate |= AQ_NIC_RATE_EEE_2GS;</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_2G5;</div><div class='ctx'> 	if (speed &amp; HW_ATL_FW2X_CAP_EEE_1G_MASK)</div><div class='ctx'> 		rate |= AQ_NIC_RATE_EEE_1G;</div><div class='ctx'> </div><div class='hunk'>@@ -153,7 +168,7 @@ static u32 eee_mask_to_fw2x(u32 speed)</div><div class='ctx'> 		rate |= HW_ATL_FW2X_CAP_EEE_10G_MASK;</div><div class='ctx'> 	if (speed &amp; AQ_NIC_RATE_EEE_5G)</div><div class='ctx'> 		rate |= HW_ATL_FW2X_CAP_EEE_5G_MASK;</div><div class='del'>-	if (speed &amp; AQ_NIC_RATE_EEE_2GS)</div><div class='add'>+	if (speed &amp; AQ_NIC_RATE_EEE_2G5)</div><div class='ctx'> 		rate |= HW_ATL_FW2X_CAP_EEE_2G5_MASK;</div><div class='ctx'> 	if (speed &amp; AQ_NIC_RATE_EEE_1G)</div><div class='ctx'> 		rate |= HW_ATL_FW2X_CAP_EEE_1G_MASK;</div><div class='hunk'>@@ -170,17 +185,26 @@ static int aq_fw2x_set_link_speed(struct aq_hw_s *self, u32 speed)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void aq_fw2x_set_mpi_flow_control(struct aq_hw_s *self, u32 *mpi_state)</div><div class='add'>+static void aq_fw2x_upd_flow_control_bits(struct aq_hw_s *self,</div><div class='add'>+					  u32 *mpi_state, u32 fc)</div><div class='ctx'> {</div><div class='del'>-	if (self-&gt;aq_nic_cfg-&gt;flow_control &amp; AQ_NIC_FC_RX)</div><div class='del'>-		*mpi_state |= BIT(CAPS_HI_PAUSE);</div><div class='del'>-	else</div><div class='del'>-		*mpi_state &amp;= ~BIT(CAPS_HI_PAUSE);</div><div class='add'>+	*mpi_state &amp;= ~(HW_ATL_FW2X_CTRL_PAUSE |</div><div class='add'>+			HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE);</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg-&gt;flow_control &amp; AQ_NIC_FC_TX)</div><div class='del'>-		*mpi_state |= BIT(CAPS_HI_ASYMMETRIC_PAUSE);</div><div class='del'>-	else</div><div class='del'>-		*mpi_state &amp;= ~BIT(CAPS_HI_ASYMMETRIC_PAUSE);</div><div class='add'>+	switch (fc) {</div><div class='add'>+	/* There is not explicit mode of RX only pause frames,</div><div class='add'>+	 * thus, we join this mode with FC full.</div><div class='add'>+	 * FC full is either Rx, either Tx, or both.</div><div class='add'>+	 */</div><div class='add'>+	case AQ_NIC_FC_FULL:</div><div class='add'>+	case AQ_NIC_FC_RX:</div><div class='add'>+		*mpi_state |= HW_ATL_FW2X_CTRL_PAUSE |</div><div class='add'>+			      HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_NIC_FC_TX:</div><div class='add'>+		*mpi_state |= HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void aq_fw2x_upd_eee_rate_bits(struct aq_hw_s *self, u32 *mpi_opts,</div><div class='hunk'>@@ -204,7 +228,8 @@ static int aq_fw2x_set_state(struct aq_hw_s *self,</div><div class='ctx'> 	case MPI_INIT:</div><div class='ctx'> 		mpi_state &amp;= ~BIT(CAPS_HI_LINK_DROP);</div><div class='ctx'> 		aq_fw2x_upd_eee_rate_bits(self, &amp;mpi_state, cfg-&gt;eee_speeds);</div><div class='del'>-		aq_fw2x_set_mpi_flow_control(self, &amp;mpi_state);</div><div class='add'>+		aq_fw2x_upd_flow_control_bits(self, &amp;mpi_state,</div><div class='add'>+					      self-&gt;aq_nic_cfg-&gt;fc.req);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case MPI_DEINIT:</div><div class='ctx'> 		mpi_state |= BIT(CAPS_HI_LINK_DROP);</div><div class='hunk'>@@ -215,15 +240,20 @@ static int aq_fw2x_set_state(struct aq_hw_s *self,</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_state);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_fw2x_update_link_status(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	u32 mpi_state = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR);</div><div class='del'>-	u32 speed = mpi_state &amp; (FW2X_RATE_100M | FW2X_RATE_1G |</div><div class='del'>-				 FW2X_RATE_2G5 | FW2X_RATE_5G | FW2X_RATE_10G);</div><div class='ctx'> 	struct aq_hw_link_status_s *link_status = &amp;self-&gt;aq_link_status;</div><div class='add'>+	u32 mpi_state;</div><div class='add'>+	u32 speed;</div><div class='add'>+</div><div class='add'>+	mpi_state = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR);</div><div class='add'>+	speed = mpi_state &amp; (FW2X_RATE_100M | FW2X_RATE_1G |</div><div class='add'>+			     FW2X_RATE_2G5 | FW2X_RATE_5G |</div><div class='add'>+			     FW2X_RATE_10G);</div><div class='ctx'> </div><div class='ctx'> 	if (speed) {</div><div class='ctx'> 		if (speed &amp; FW2X_RATE_10G)</div><div class='hunk'>@@ -241,17 +271,16 @@ static int aq_fw2x_update_link_status(struct aq_hw_s *self)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		link_status-&gt;mbps = 0;</div><div class='ctx'> 	}</div><div class='add'>+	link_status-&gt;full_duplex = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='del'>-	u32 h = 0U;</div><div class='del'>-	u32 l = 0U;</div><div class='del'>-	u32 mac_addr[2] = { 0 };</div><div class='ctx'> 	u32 efuse_addr = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_EFUSE_ADDR);</div><div class='add'>+	u32 mac_addr[2] = { 0 };</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (efuse_addr != 0) {</div><div class='ctx'> 		err = hw_atl_utils_fw_downld_dwords(self,</div><div class='hunk'>@@ -266,34 +295,15 @@ static int aq_fw2x_get_mac_permanent(struct aq_hw_s *self, u8 *mac)</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(mac, (u8 *)mac_addr);</div><div class='ctx'> </div><div class='del'>-	if ((mac[0] &amp; 0x01U) || ((mac[0] | mac[1] | mac[2]) == 0x00U)) {</div><div class='del'>-		unsigned int rnd = 0;</div><div class='del'>-</div><div class='del'>-		get_random_bytes(&amp;rnd, sizeof(unsigned int));</div><div class='del'>-</div><div class='del'>-		l = 0xE3000000U | (0xFFFFU &amp; rnd) | (0x00 &lt;&lt; 16);</div><div class='del'>-		h = 0x8001300EU;</div><div class='del'>-</div><div class='del'>-		mac[5] = (u8)(0xFFU &amp; l);</div><div class='del'>-		l &gt;&gt;= 8;</div><div class='del'>-		mac[4] = (u8)(0xFFU &amp; l);</div><div class='del'>-		l &gt;&gt;= 8;</div><div class='del'>-		mac[3] = (u8)(0xFFU &amp; l);</div><div class='del'>-		l &gt;&gt;= 8;</div><div class='del'>-		mac[2] = (u8)(0xFFU &amp; l);</div><div class='del'>-		mac[1] = (u8)(0xFFU &amp; h);</div><div class='del'>-		h &gt;&gt;= 8;</div><div class='del'>-		mac[0] = (u8)(0xFFU &amp; h);</div><div class='del'>-	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_fw2x_update_stats(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	u32 mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='ctx'> 	u32 orig_stats_val = mpi_opts &amp; BIT(CAPS_HI_STATISTICS);</div><div class='ctx'> 	u32 stats_val;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Toggle statistics bit for FW to update */</div><div class='ctx'> 	mpi_opts = mpi_opts ^ BIT(CAPS_HI_STATISTICS);</div><div class='hunk'>@@ -320,9 +330,9 @@ static int aq_fw2x_get_phy_temp(struct aq_hw_s *self, int *temp)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	phy_temp_offset = self-&gt;mbox_addr +</div><div class='del'>-			  offsetof(struct hw_atl_utils_mbox, info) +</div><div class='del'>-			  offsetof(struct hw_aq_info, phy_temperature);</div><div class='add'>+	phy_temp_offset = self-&gt;mbox_addr + offsetof(struct hw_atl_utils_mbox,</div><div class='add'>+						     info.phy_temperature);</div><div class='add'>+</div><div class='ctx'> 	/* Toggle statistics bit for FW to 0x36C.18 (CTRL_TEMPERATURE) */</div><div class='ctx'> 	mpi_opts = mpi_opts ^ HW_ATL_FW2X_CTRL_TEMPERATURE;</div><div class='ctx'> 	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='hunk'>@@ -340,109 +350,130 @@ static int aq_fw2x_get_phy_temp(struct aq_hw_s *self, int *temp)</div><div class='ctx'> 	/* Convert PHY temperature from 1/256 degree Celsius</div><div class='ctx'> 	 * to 1/1000 degree Celsius.</div><div class='ctx'> 	 */</div><div class='del'>-	*temp = temp_res  * 1000 / 256;</div><div class='add'>+	*temp = (int16_t)(temp_res &amp; 0xFFFF) * 1000 / 256;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_fw2x_set_sleep_proxy(struct aq_hw_s *self, u8 *mac)</div><div class='add'>+static int aq_fw2x_set_wol(struct aq_hw_s *self, const u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	struct hw_atl_utils_fw_rpc *rpc = NULL;</div><div class='del'>-	struct offload_info *cfg = NULL;</div><div class='del'>-	unsigned int rpc_size = 0U;</div><div class='del'>-	u32 mpi_opts;</div><div class='add'>+	struct offload_info *info = NULL;</div><div class='add'>+	u32 wol_bits = 0;</div><div class='add'>+	u32 rpc_size;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	rpc_size = sizeof(rpc-&gt;msg_id) + sizeof(*cfg);</div><div class='add'>+	if (self-&gt;aq_nic_cfg-&gt;wol &amp; WAKE_PHY) {</div><div class='add'>+		aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR,</div><div class='add'>+				HW_ATL_FW2X_CTRL_LINK_DROP);</div><div class='add'>+		readx_poll_timeout_atomic(aq_fw2x_state2_get, self, val,</div><div class='add'>+					  (val &amp;</div><div class='add'>+					   HW_ATL_FW2X_CTRL_LINK_DROP) != 0,</div><div class='add'>+					  1000, 100000);</div><div class='add'>+		wol_bits |= HW_ATL_FW2X_CTRL_WAKE_ON_LINK;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_fw_rpc_wait(self, &amp;rpc);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err_exit;</div><div class='add'>+	if (self-&gt;aq_nic_cfg-&gt;wol &amp; WAKE_MAGIC) {</div><div class='add'>+		wol_bits |= HW_ATL_FW2X_CTRL_SLEEP_PROXY |</div><div class='add'>+			    HW_ATL_FW2X_CTRL_WOL;</div><div class='ctx'> </div><div class='del'>-	memset(rpc, 0, rpc_size);</div><div class='del'>-	cfg = (struct offload_info *)(&amp;rpc-&gt;msg_id + 1);</div><div class='add'>+		err = hw_atl_utils_fw_rpc_wait(self, &amp;rpc);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='ctx'> </div><div class='del'>-	memcpy(cfg-&gt;mac_addr, mac, ETH_ALEN);</div><div class='del'>-	cfg-&gt;len = sizeof(*cfg);</div><div class='add'>+		rpc_size = sizeof(*info) +</div><div class='add'>+			   offsetof(struct hw_atl_utils_fw_rpc, fw2x_offloads);</div><div class='add'>+		memset(rpc, 0, rpc_size);</div><div class='add'>+		info = &amp;rpc-&gt;fw2x_offloads;</div><div class='add'>+		memcpy(info-&gt;mac_addr, mac, ETH_ALEN);</div><div class='add'>+		info-&gt;len = sizeof(*info);</div><div class='ctx'> </div><div class='del'>-	/* Clear bit 0x36C.23 and 0x36C.22 */</div><div class='del'>-	mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='del'>-	mpi_opts &amp;= ~HW_ATL_FW2X_CTRL_SLEEP_PROXY;</div><div class='del'>-	mpi_opts &amp;= ~HW_ATL_FW2X_CTRL_LINK_DROP;</div><div class='add'>+		err = hw_atl_utils_fw_rpc_call(self, rpc_size);</div><div class='add'>+		if (err &lt; 0)</div><div class='add'>+			goto err_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, wol_bits);</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_fw_rpc_call(self, rpc_size);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err_exit;</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Set bit 0x36C.23 */</div><div class='del'>-	mpi_opts |= HW_ATL_FW2X_CTRL_SLEEP_PROXY;</div><div class='del'>-	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+static int aq_fw2x_set_power(struct aq_hw_s *self, unsigned int power_state,</div><div class='add'>+			     const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='del'>-	err = readx_poll_timeout_atomic(aq_fw2x_state2_get,</div><div class='del'>-					self, val,</div><div class='del'>-					val &amp; HW_ATL_FW2X_CTRL_SLEEP_PROXY,</div><div class='del'>-					1U, 10000U);</div><div class='add'>+	if (self-&gt;aq_nic_cfg-&gt;wol)</div><div class='add'>+		err = aq_fw2x_set_wol(self, mac);</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_fw2x_set_wol_params(struct aq_hw_s *self, u8 *mac)</div><div class='add'>+static int aq_fw2x_send_fw_request(struct aq_hw_s *self,</div><div class='add'>+				   const struct hw_fw_request_iface *fw_req,</div><div class='add'>+				   size_t size)</div><div class='ctx'> {</div><div class='del'>-	struct hw_atl_utils_fw_rpc *rpc = NULL;</div><div class='del'>-	struct fw2x_msg_wol *msg = NULL;</div><div class='del'>-	u32 mpi_opts;</div><div class='add'>+	u32 ctrl2, orig_ctrl2;</div><div class='add'>+	u32 dword_cnt;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_fw_rpc_wait(self, &amp;rpc);</div><div class='add'>+	/* Write data to drvIface Mailbox */</div><div class='add'>+	dword_cnt = size / sizeof(u32);</div><div class='add'>+	if (size % sizeof(u32))</div><div class='add'>+		dword_cnt++;</div><div class='add'>+	err = hw_atl_write_fwcfg_dwords(self, (void *)fw_req, dword_cnt);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	msg = (struct fw2x_msg_wol *)rpc;</div><div class='del'>-</div><div class='del'>-	msg-&gt;msg_id = HAL_ATLANTIC_UTILS_FW2X_MSG_WOL;</div><div class='del'>-	msg-&gt;magic_packet_enabled = true;</div><div class='del'>-	memcpy(msg-&gt;hw_addr, mac, ETH_ALEN);</div><div class='add'>+	/* Toggle statistics bit for FW to update */</div><div class='add'>+	ctrl2 = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='add'>+	orig_ctrl2 = ctrl2 &amp; BIT(CAPS_HI_FW_REQUEST);</div><div class='add'>+	ctrl2 = ctrl2 ^ BIT(CAPS_HI_FW_REQUEST);</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, ctrl2);</div><div class='ctx'> </div><div class='del'>-	mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='del'>-	mpi_opts &amp;= ~(HW_ATL_FW2X_CTRL_SLEEP_PROXY | HW_ATL_FW2X_CTRL_WOL);</div><div class='add'>+	/* Wait FW to report back */</div><div class='add'>+	err = readx_poll_timeout_atomic(aq_fw2x_state2_get, self, val,</div><div class='add'>+					orig_ctrl2 != (val &amp;</div><div class='add'>+						       BIT(CAPS_HI_FW_REQUEST)),</div><div class='add'>+					1U, 10000U);</div><div class='ctx'> </div><div class='del'>-	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_fw_rpc_call(self, sizeof(*msg));</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		goto err_exit;</div><div class='add'>+static void aq_fw3x_enable_ptp(struct aq_hw_s *self, int enable)</div><div class='add'>+{</div><div class='add'>+	u32 ptp_opts = aq_hw_read_reg(self, HW_ATL_FW3X_EXT_STATE_ADDR);</div><div class='add'>+	u32 all_ptp_features = BIT(CAPS_EX_PHY_PTP_EN) |</div><div class='add'>+						   BIT(CAPS_EX_PTP_GPIO_EN);</div><div class='ctx'> </div><div class='del'>-	/* Set bit 0x36C.24 */</div><div class='del'>-	mpi_opts |= HW_ATL_FW2X_CTRL_WOL;</div><div class='del'>-	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+	if (enable)</div><div class='add'>+		ptp_opts |= all_ptp_features;</div><div class='add'>+	else</div><div class='add'>+		ptp_opts &amp;= ~all_ptp_features;</div><div class='ctx'> </div><div class='del'>-	err = readx_poll_timeout_atomic(aq_fw2x_state2_get,</div><div class='del'>-					self, val, val &amp; HW_ATL_FW2X_CTRL_WOL,</div><div class='del'>-					1U, 10000U);</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW3X_EXT_CONTROL_ADDR, ptp_opts);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='del'>-	return err;</div><div class='add'>+static void aq_fw3x_adjust_ptp(struct aq_hw_s *self, uint64_t adj)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW3X_PTP_ADJ_LSW_ADDR,</div><div class='add'>+			(adj &gt;&gt;  0) &amp; 0xffffffff);</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW3X_PTP_ADJ_MSW_ADDR,</div><div class='add'>+			(adj &gt;&gt; 32) &amp; 0xffffffff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int aq_fw2x_set_power(struct aq_hw_s *self, unsigned int power_state,</div><div class='del'>-			     u8 *mac)</div><div class='add'>+static int aq_fw2x_led_control(struct aq_hw_s *self, u32 mode)</div><div class='ctx'> {</div><div class='del'>-	int err = 0;</div><div class='add'>+	if (self-&gt;fw_ver_actual &lt; HW_ATL_FW_VER_LED)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (self-&gt;aq_nic_cfg-&gt;wol &amp; AQ_NIC_WOL_ENABLED) {</div><div class='del'>-		err = aq_fw2x_set_sleep_proxy(self, mac);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto err_exit;</div><div class='del'>-		err = aq_fw2x_set_wol_params(self, mac);</div><div class='del'>-	}</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_LED_ADDR, mode);</div><div class='ctx'> </div><div class='del'>-err_exit:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int aq_fw2x_set_eee_rate(struct aq_hw_s *self, u32 speed)</div><div class='hunk'>@@ -462,11 +493,12 @@ static int aq_fw2x_get_eee_rate(struct aq_hw_s *self, u32 *rate,</div><div class='ctx'> 	u32 mpi_state;</div><div class='ctx'> 	u32 caps_hi;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	u32 addr = self-&gt;mbox_addr + offsetof(struct hw_atl_utils_mbox, info) +</div><div class='del'>-		   offsetof(struct hw_aq_info, caps_hi);</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	offset = self-&gt;mbox_addr + offsetof(struct hw_atl_utils_mbox,</div><div class='add'>+					    info.caps_hi);</div><div class='ctx'> </div><div class='del'>-	err = hw_atl_utils_fw_downld_dwords(self, addr, &amp;caps_hi,</div><div class='del'>-					    sizeof(caps_hi) / sizeof(u32));</div><div class='add'>+	err = hw_atl_utils_fw_downld_dwords(self, offset, &amp;caps_hi, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -494,7 +526,8 @@ static int aq_fw2x_set_flow_control(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mpi_state = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='ctx'> </div><div class='del'>-	aq_fw2x_set_mpi_flow_control(self, &amp;mpi_state);</div><div class='add'>+	aq_fw2x_upd_flow_control_bits(self, &amp;mpi_state,</div><div class='add'>+				      self-&gt;aq_nic_cfg-&gt;fc.req);</div><div class='ctx'> </div><div class='ctx'> 	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_state);</div><div class='ctx'> </div><div class='hunk'>@@ -504,17 +537,41 @@ static int aq_fw2x_set_flow_control(struct aq_hw_s *self)</div><div class='ctx'> static u32 aq_fw2x_get_flow_control(struct aq_hw_s *self, u32 *fcmode)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mpi_state = aq_fw2x_state2_get(self);</div><div class='add'>+	*fcmode = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (mpi_state &amp; HW_ATL_FW2X_CAP_PAUSE)</div><div class='del'>-		if (mpi_state &amp; HW_ATL_FW2X_CAP_ASYM_PAUSE)</div><div class='del'>-			*fcmode = AQ_NIC_FC_RX;</div><div class='add'>+		*fcmode |= AQ_NIC_FC_RX;</div><div class='add'>+</div><div class='add'>+	if (mpi_state &amp; HW_ATL_FW2X_CAP_ASYM_PAUSE)</div><div class='add'>+		*fcmode |= AQ_NIC_FC_TX;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_fw2x_set_phyloopback(struct aq_hw_s *self, u32 mode, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 mpi_opts;</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case AQ_HW_LOOPBACK_PHYINT_SYS:</div><div class='add'>+		mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='add'>+		if (enable)</div><div class='add'>+			mpi_opts |= HW_ATL_FW2X_CTRL_INT_LOOPBACK;</div><div class='ctx'> 		else</div><div class='del'>-			*fcmode = AQ_NIC_FC_RX | AQ_NIC_FC_TX;</div><div class='del'>-	else</div><div class='del'>-		if (mpi_state &amp; HW_ATL_FW2X_CAP_ASYM_PAUSE)</div><div class='del'>-			*fcmode = AQ_NIC_FC_TX;</div><div class='add'>+			mpi_opts &amp;= ~HW_ATL_FW2X_CTRL_INT_LOOPBACK;</div><div class='add'>+		aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+		break;</div><div class='add'>+	case AQ_HW_LOOPBACK_PHYEXT_SYS:</div><div class='add'>+		mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='add'>+		if (enable)</div><div class='add'>+			mpi_opts |= HW_ATL_FW2X_CTRL_EXT_LOOPBACK;</div><div class='ctx'> 		else</div><div class='del'>-			*fcmode = 0;</div><div class='add'>+			mpi_opts &amp;= ~HW_ATL_FW2X_CTRL_EXT_LOOPBACK;</div><div class='add'>+		aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -529,25 +586,147 @@ static u32 aq_fw2x_rpc_get(struct aq_hw_s *self)</div><div class='ctx'> 	return aq_hw_read_reg(self, HW_ATL_FW2X_MPI_RPC_ADDR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aq_fw2x_settings_get(struct aq_hw_s *self, u32 *addr)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	offset = self-&gt;mbox_addr + offsetof(struct hw_atl_utils_mbox,</div><div class='add'>+					    info.setting_address);</div><div class='add'>+</div><div class='add'>+	err = hw_atl_utils_fw_downld_dwords(self, offset, addr, 1);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 aq_fw2x_state_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE_ADDR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static u32 aq_fw2x_state2_get(struct aq_hw_s *self)</div><div class='ctx'> {</div><div class='ctx'> 	return aq_hw_read_reg(self, HW_ATL_FW2X_MPI_STATE2_ADDR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int aq_fw2x_set_downshift(struct aq_hw_s *self, u32 counter)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 mpi_opts;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	offset = offsetof(struct hw_atl_utils_settings, downshift_retry_count);</div><div class='add'>+	err = hw_atl_write_fwsettings_dwords(self, offset, &amp;counter, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mpi_opts = aq_hw_read_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR);</div><div class='add'>+	if (counter)</div><div class='add'>+		mpi_opts |= HW_ATL_FW2X_CTRL_DOWNSHIFT;</div><div class='add'>+	else</div><div class='add'>+		mpi_opts &amp;= ~HW_ATL_FW2X_CTRL_DOWNSHIFT;</div><div class='add'>+	aq_hw_write_reg(self, HW_ATL_FW2X_MPI_CONTROL2_ADDR, mpi_opts);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_fw2x_set_media_detect(struct aq_hw_s *self, bool on)</div><div class='add'>+{</div><div class='add'>+	u32 enable;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	if (self-&gt;fw_ver_actual &lt; HW_ATL_FW_VER_MEDIA_CONTROL)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	offset = offsetof(struct hw_atl_utils_settings, media_detect);</div><div class='add'>+	enable = on;</div><div class='add'>+</div><div class='add'>+	return hw_atl_write_fwsettings_dwords(self, offset, &amp;enable, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 aq_fw2x_get_link_capabilities(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	offset = self-&gt;mbox_addr +</div><div class='add'>+		 offsetof(struct hw_atl_utils_mbox, info.caps_lo);</div><div class='add'>+</div><div class='add'>+	err = hw_atl_utils_fw_downld_dwords(self, offset, &amp;val, 1);</div><div class='add'>+</div><div class='add'>+	if (err)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_fw2x_send_macsec_req(struct aq_hw_s *hw,</div><div class='add'>+				   struct macsec_msg_fw_request *req,</div><div class='add'>+				   struct macsec_msg_fw_response *response)</div><div class='add'>+{</div><div class='add'>+	u32 low_status, low_req = 0;</div><div class='add'>+	u32 dword_cnt;</div><div class='add'>+	u32 caps_lo;</div><div class='add'>+	u32 offset;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!req || !response)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	caps_lo = aq_fw2x_get_link_capabilities(hw);</div><div class='add'>+	if (!(caps_lo &amp; BIT(CAPS_LO_MACSEC)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Write macsec request to cfg memory */</div><div class='add'>+	dword_cnt = (sizeof(*req) + sizeof(u32) - 1) / sizeof(u32);</div><div class='add'>+	err = hw_atl_write_fwcfg_dwords(hw, (void *)req, dword_cnt);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Toggle 0x368.CAPS_LO_MACSEC bit */</div><div class='add'>+	low_req = aq_hw_read_reg(hw, HW_ATL_FW2X_MPI_CONTROL_ADDR);</div><div class='add'>+	low_req ^= HW_ATL_FW2X_CAP_MACSEC;</div><div class='add'>+	aq_hw_write_reg(hw, HW_ATL_FW2X_MPI_CONTROL_ADDR, low_req);</div><div class='add'>+</div><div class='add'>+	/* Wait FW to report back */</div><div class='add'>+	err = readx_poll_timeout_atomic(aq_fw2x_state_get, hw, low_status,</div><div class='add'>+		low_req != (low_status &amp; BIT(CAPS_LO_MACSEC)), 1U, 10000U);</div><div class='add'>+	if (err)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	/* Read status of write operation */</div><div class='add'>+	offset = hw-&gt;rpc_addr + sizeof(u32);</div><div class='add'>+	err = hw_atl_utils_fw_downld_dwords(hw, offset, (u32 *)(void *)response,</div><div class='add'>+					    sizeof(*response) / sizeof(u32));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct aq_fw_ops aq_fw_2x_ops = {</div><div class='del'>-	.init = aq_fw2x_init,</div><div class='del'>-	.deinit = aq_fw2x_deinit,</div><div class='del'>-	.reset = NULL,</div><div class='del'>-	.renegotiate = aq_fw2x_renegotiate,</div><div class='del'>-	.get_mac_permanent = aq_fw2x_get_mac_permanent,</div><div class='del'>-	.set_link_speed = aq_fw2x_set_link_speed,</div><div class='del'>-	.set_state = aq_fw2x_set_state,</div><div class='add'>+	.init               = aq_fw2x_init,</div><div class='add'>+	.deinit             = aq_fw2x_deinit,</div><div class='add'>+	.reset              = NULL,</div><div class='add'>+	.renegotiate        = aq_fw2x_renegotiate,</div><div class='add'>+	.get_mac_permanent  = aq_fw2x_get_mac_permanent,</div><div class='add'>+	.set_link_speed     = aq_fw2x_set_link_speed,</div><div class='add'>+	.set_state          = aq_fw2x_set_state,</div><div class='ctx'> 	.update_link_status = aq_fw2x_update_link_status,</div><div class='del'>-	.update_stats = aq_fw2x_update_stats,</div><div class='del'>-	.get_phy_temp = aq_fw2x_get_phy_temp,</div><div class='del'>-	.set_power = aq_fw2x_set_power,</div><div class='del'>-	.set_eee_rate = aq_fw2x_set_eee_rate,</div><div class='del'>-	.get_eee_rate = aq_fw2x_get_eee_rate,</div><div class='del'>-	.set_flow_control = aq_fw2x_set_flow_control,</div><div class='del'>-	.get_flow_control = aq_fw2x_get_flow_control</div><div class='add'>+	.update_stats       = aq_fw2x_update_stats,</div><div class='add'>+	.get_mac_temp       = NULL,</div><div class='add'>+	.get_phy_temp       = aq_fw2x_get_phy_temp,</div><div class='add'>+	.set_power          = aq_fw2x_set_power,</div><div class='add'>+	.set_eee_rate       = aq_fw2x_set_eee_rate,</div><div class='add'>+	.get_eee_rate       = aq_fw2x_get_eee_rate,</div><div class='add'>+	.set_flow_control   = aq_fw2x_set_flow_control,</div><div class='add'>+	.get_flow_control   = aq_fw2x_get_flow_control,</div><div class='add'>+	.send_fw_request    = aq_fw2x_send_fw_request,</div><div class='add'>+	.enable_ptp         = aq_fw3x_enable_ptp,</div><div class='add'>+	.led_control        = aq_fw2x_led_control,</div><div class='add'>+	.set_phyloopback    = aq_fw2x_set_phyloopback,</div><div class='add'>+	.set_downshift      = aq_fw2x_set_downshift,</div><div class='add'>+	.set_media_detect   = aq_fw2x_set_media_detect,</div><div class='add'>+	.adjust_ptp         = aq_fw3x_adjust_ptp,</div><div class='add'>+	.get_link_capabilities = aq_fw2x_get_link_capabilities,</div><div class='add'>+	.send_macsec_req    = aq_fw2x_send_macsec_req,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c<br/>new file mode 100644<br/>index 000000000000..0ce9caae8799<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c</a></div><div class='hunk'>@@ -0,0 +1,863 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='add'>+#include "aq_ring.h"</div><div class='add'>+#include "aq_nic.h"</div><div class='add'>+#include "hw_atl/hw_atl_b0.h"</div><div class='add'>+#include "hw_atl/hw_atl_utils.h"</div><div class='add'>+#include "hw_atl/hw_atl_llh.h"</div><div class='add'>+#include "hw_atl/hw_atl_llh_internal.h"</div><div class='add'>+#include "hw_atl2_utils.h"</div><div class='add'>+#include "hw_atl2_llh.h"</div><div class='add'>+#include "hw_atl2_internal.h"</div><div class='add'>+#include "hw_atl2_llh_internal.h"</div><div class='add'>+</div><div class='add'>+static int hw_atl2_act_rslvr_table_set(struct aq_hw_s *self, u8 location,</div><div class='add'>+				       u32 tag, u32 mask, u32 action);</div><div class='add'>+</div><div class='add'>+#define DEFAULT_BOARD_BASIC_CAPABILITIES \</div><div class='add'>+	.is_64_dma = true,		  \</div><div class='add'>+	.op64bit = true,		  \</div><div class='add'>+	.msix_irqs = 8U,		  \</div><div class='add'>+	.irq_mask = ~0U,		  \</div><div class='add'>+	.vecs = HW_ATL2_RSS_MAX,	  \</div><div class='add'>+	.tcs_max = HW_ATL2_TC_MAX,	  \</div><div class='add'>+	.rxd_alignment = 1U,		  \</div><div class='add'>+	.rxd_size = HW_ATL2_RXD_SIZE,   \</div><div class='add'>+	.rxds_max = HW_ATL2_MAX_RXD,    \</div><div class='add'>+	.rxds_min = HW_ATL2_MIN_RXD,    \</div><div class='add'>+	.txd_alignment = 1U,		  \</div><div class='add'>+	.txd_size = HW_ATL2_TXD_SIZE,   \</div><div class='add'>+	.txds_max = HW_ATL2_MAX_TXD,    \</div><div class='add'>+	.txds_min = HW_ATL2_MIN_TXD,    \</div><div class='add'>+	.txhwb_alignment = 4096U,	  \</div><div class='add'>+	.tx_rings = HW_ATL2_TX_RINGS,   \</div><div class='add'>+	.rx_rings = HW_ATL2_RX_RINGS,   \</div><div class='add'>+	.hw_features = NETIF_F_HW_CSUM |  \</div><div class='add'>+			NETIF_F_RXCSUM |  \</div><div class='add'>+			NETIF_F_RXHASH |  \</div><div class='add'>+			NETIF_F_SG |      \</div><div class='add'>+			NETIF_F_TSO |     \</div><div class='add'>+			NETIF_F_TSO6 |    \</div><div class='add'>+			NETIF_F_LRO |     \</div><div class='add'>+			NETIF_F_NTUPLE |  \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_FILTER | \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_RX |     \</div><div class='add'>+			NETIF_F_HW_VLAN_CTAG_TX |     \</div><div class='add'>+			NETIF_F_GSO_UDP_L4      |     \</div><div class='add'>+			NETIF_F_GSO_PARTIAL     |     \</div><div class='add'>+			NETIF_F_HW_TC,                \</div><div class='add'>+	.hw_priv_flags = IFF_UNICAST_FLT, \</div><div class='add'>+	.flow_control = true,		  \</div><div class='add'>+	.mtu = HW_ATL2_MTU_JUMBO,	  \</div><div class='add'>+	.mac_regs_count = 72,		  \</div><div class='add'>+	.hw_alive_check_addr = 0x10U,     \</div><div class='add'>+	.priv_data_len = sizeof(struct hw_atl2_priv)</div><div class='add'>+</div><div class='add'>+const struct aq_hw_caps_s hw_atl2_caps_aqc113 = {</div><div class='add'>+	DEFAULT_BOARD_BASIC_CAPABILITIES,</div><div class='add'>+	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_10G |</div><div class='add'>+			  AQ_NIC_RATE_5G  |</div><div class='add'>+			  AQ_NIC_RATE_2G5 |</div><div class='add'>+			  AQ_NIC_RATE_1G  |</div><div class='add'>+			  AQ_NIC_RATE_100M      |</div><div class='add'>+			  AQ_NIC_RATE_10M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct aq_hw_caps_s hw_atl2_caps_aqc115c = {</div><div class='add'>+	DEFAULT_BOARD_BASIC_CAPABILITIES,</div><div class='add'>+	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_2G5 |</div><div class='add'>+			  AQ_NIC_RATE_1G  |</div><div class='add'>+			  AQ_NIC_RATE_100M      |</div><div class='add'>+			  AQ_NIC_RATE_10M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct aq_hw_caps_s hw_atl2_caps_aqc116c = {</div><div class='add'>+	DEFAULT_BOARD_BASIC_CAPABILITIES,</div><div class='add'>+	.media_type = AQ_HW_MEDIA_TYPE_TP,</div><div class='add'>+	.link_speed_msk = AQ_NIC_RATE_1G  |</div><div class='add'>+			  AQ_NIC_RATE_100M      |</div><div class='add'>+			  AQ_NIC_RATE_10M,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static u32 hw_atl2_sem_act_rslvr_get(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_reg_glb_cpu_sem_get(self, HW_ATL2_FW_SM_ACT_RSLVR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_reset(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hw_atl2_utils_soft_reset(self);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memset(priv, 0, sizeof(*priv));</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;set_state(self, MPI_RESET);</div><div class='add'>+</div><div class='add'>+	err = aq_hw_err_from_flags(self);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_queue_to_tc_map_set(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	unsigned int tcs, q_per_tc;</div><div class='add'>+	unsigned int tc, q;</div><div class='add'>+	u32 rx_map = 0;</div><div class='add'>+	u32 tx_map = 0;</div><div class='add'>+</div><div class='add'>+	hw_atl2_tpb_tx_tc_q_rand_map_en_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	switch (cfg-&gt;tc_mode) {</div><div class='add'>+	case AQ_TC_MODE_8TCS:</div><div class='add'>+		tcs = 8;</div><div class='add'>+		q_per_tc = 4;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_TC_MODE_4TCS:</div><div class='add'>+		tcs = 4;</div><div class='add'>+		q_per_tc = 8;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (tc = 0; tc != tcs; tc++) {</div><div class='add'>+		unsigned int tc_q_offset = tc * q_per_tc;</div><div class='add'>+</div><div class='add'>+		for (q = tc_q_offset; q != tc_q_offset + q_per_tc; q++) {</div><div class='add'>+			rx_map |= tc &lt;&lt; HW_ATL2_RX_Q_TC_MAP_SHIFT(q);</div><div class='add'>+			if (HW_ATL2_RX_Q_TC_MAP_ADR(q) !=</div><div class='add'>+			    HW_ATL2_RX_Q_TC_MAP_ADR(q + 1)) {</div><div class='add'>+				aq_hw_write_reg(self,</div><div class='add'>+						HW_ATL2_RX_Q_TC_MAP_ADR(q),</div><div class='add'>+						rx_map);</div><div class='add'>+				rx_map = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tx_map |= tc &lt;&lt; HW_ATL2_TX_Q_TC_MAP_SHIFT(q);</div><div class='add'>+			if (HW_ATL2_TX_Q_TC_MAP_ADR(q) !=</div><div class='add'>+			    HW_ATL2_TX_Q_TC_MAP_ADR(q + 1)) {</div><div class='add'>+				aq_hw_write_reg(self,</div><div class='add'>+						HW_ATL2_TX_Q_TC_MAP_ADR(q),</div><div class='add'>+						tx_map);</div><div class='add'>+				tx_map = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_qos_set(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	u32 tx_buff_size = HW_ATL2_TXBUF_MAX;</div><div class='add'>+	u32 rx_buff_size = HW_ATL2_RXBUF_MAX;</div><div class='add'>+	unsigned int prio = 0U;</div><div class='add'>+	u32 tc = 0U;</div><div class='add'>+</div><div class='add'>+	/* TPS Descriptor rate init */</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_rate_curr_time_res_set(self, 0x0U);</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_rate_lim_set(self, 0xA);</div><div class='add'>+</div><div class='add'>+	/* TPS VM init */</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_vm_arb_mode_set(self, 0U);</div><div class='add'>+</div><div class='add'>+	tx_buff_size /= cfg-&gt;tcs;</div><div class='add'>+	rx_buff_size /= cfg-&gt;tcs;</div><div class='add'>+	for (tc = 0; tc &lt; cfg-&gt;tcs; tc++) {</div><div class='add'>+		u32 threshold = 0U;</div><div class='add'>+</div><div class='add'>+		/* Tx buf size TC0 */</div><div class='add'>+		hw_atl_tpb_tx_pkt_buff_size_per_tc_set(self, tx_buff_size, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (tx_buff_size * (1024 / 32U) * 66U) / 100U;</div><div class='add'>+		hw_atl_tpb_tx_buff_hi_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (tx_buff_size * (1024 / 32U) * 50U) / 100U;</div><div class='add'>+		hw_atl_tpb_tx_buff_lo_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		/* QoS Rx buf size per TC */</div><div class='add'>+		hw_atl_rpb_rx_pkt_buff_size_per_tc_set(self, rx_buff_size, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (rx_buff_size * (1024U / 32U) * 66U) / 100U;</div><div class='add'>+		hw_atl_rpb_rx_buff_hi_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		threshold = (rx_buff_size * (1024U / 32U) * 50U) / 100U;</div><div class='add'>+		hw_atl_rpb_rx_buff_lo_threshold_per_tc_set(self, threshold, tc);</div><div class='add'>+</div><div class='add'>+		hw_atl_b0_set_fc(self, self-&gt;aq_nic_cfg-&gt;fc.req, tc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* QoS 802.1p priority -&gt; TC mapping */</div><div class='add'>+	for (prio = 0; prio &lt; 8; ++prio)</div><div class='add'>+		hw_atl_rpf_rpb_user_priority_tc_map_set(self, prio,</div><div class='add'>+							cfg-&gt;prio_tc_map[prio]);</div><div class='add'>+</div><div class='add'>+	/* ATL2 Apply ring to TC mapping */</div><div class='add'>+	hw_atl2_hw_queue_to_tc_map_set(self);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_rss_set(struct aq_hw_s *self,</div><div class='add'>+			      struct aq_rss_parameters *rss_params)</div><div class='add'>+{</div><div class='add'>+	u8 *indirection_table = rss_params-&gt;indirection_table;</div><div class='add'>+	const u32 num_tcs = aq_hw_num_tcs(self);</div><div class='add'>+	u32 rpf_redir2_enable;</div><div class='add'>+	int tc;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rpf_redir2_enable = num_tcs &gt; 4 ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	hw_atl2_rpf_redirection_table2_select_set(self, rpf_redir2_enable);</div><div class='add'>+</div><div class='add'>+	for (i = HW_ATL2_RSS_REDIRECTION_MAX; i--;) {</div><div class='add'>+		for (tc = 0; tc != num_tcs; tc++) {</div><div class='add'>+			hw_atl2_new_rpf_rss_redir_set(self, tc, i,</div><div class='add'>+						      tc *</div><div class='add'>+						      aq_hw_q_per_tc(self) +</div><div class='add'>+						      indirection_table[i]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_init_tx_tc_rate_limit(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	static const u32 max_weight = BIT(HW_ATL2_TPS_DATA_TCTWEIGHT_WIDTH) - 1;</div><div class='add'>+	/* Scale factor is based on the number of bits in fractional portion */</div><div class='add'>+	static const u32 scale = BIT(HW_ATL_TPS_DESC_RATE_Y_WIDTH);</div><div class='add'>+	static const u32 frac_msk = HW_ATL_TPS_DESC_RATE_Y_MSK &gt;&gt;</div><div class='add'>+				    HW_ATL_TPS_DESC_RATE_Y_SHIFT;</div><div class='add'>+	const u32 link_speed = self-&gt;aq_link_status.mbps;</div><div class='add'>+	struct aq_nic_cfg_s *nic_cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	unsigned long num_min_rated_tcs = 0;</div><div class='add'>+	u32 tc_weight[AQ_CFG_TCS_MAX];</div><div class='add'>+	u32 fixed_max_credit_4b;</div><div class='add'>+	u32 fixed_max_credit;</div><div class='add'>+	u8 min_rate_msk = 0;</div><div class='add'>+	u32 sum_weight = 0;</div><div class='add'>+	int tc;</div><div class='add'>+</div><div class='add'>+	/* By default max_credit is based upon MTU (in unit of 64b) */</div><div class='add'>+	fixed_max_credit = nic_cfg-&gt;aq_hw_caps-&gt;mtu / 64;</div><div class='add'>+	/* in unit of 4b */</div><div class='add'>+	fixed_max_credit_4b = nic_cfg-&gt;aq_hw_caps-&gt;mtu / 4;</div><div class='add'>+</div><div class='add'>+	if (link_speed) {</div><div class='add'>+		min_rate_msk = nic_cfg-&gt;tc_min_rate_msk &amp;</div><div class='add'>+			       (BIT(nic_cfg-&gt;tcs) - 1);</div><div class='add'>+		num_min_rated_tcs = hweight8(min_rate_msk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First, calculate weights where min_rate is specified */</div><div class='add'>+	if (num_min_rated_tcs) {</div><div class='add'>+		for (tc = 0; tc != nic_cfg-&gt;tcs; tc++) {</div><div class='add'>+			if (!nic_cfg-&gt;tc_min_rate[tc]) {</div><div class='add'>+				tc_weight[tc] = 0;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tc_weight[tc] = (-1L + link_speed +</div><div class='add'>+					 nic_cfg-&gt;tc_min_rate[tc] *</div><div class='add'>+					 max_weight) /</div><div class='add'>+					link_speed;</div><div class='add'>+			tc_weight[tc] = min(tc_weight[tc], max_weight);</div><div class='add'>+			sum_weight += tc_weight[tc];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* WSP, if min_rate is set for at least one TC.</div><div class='add'>+	 * RR otherwise.</div><div class='add'>+	 */</div><div class='add'>+	hw_atl2_tps_tx_pkt_shed_data_arb_mode_set(self, min_rate_msk ? 1U : 0U);</div><div class='add'>+	/* Data TC Arbiter takes precedence over Descriptor TC Arbiter,</div><div class='add'>+	 * leave Descriptor TC Arbiter as RR.</div><div class='add'>+	 */</div><div class='add'>+	hw_atl_tps_tx_pkt_shed_desc_tc_arb_mode_set(self, 0U);</div><div class='add'>+</div><div class='add'>+	hw_atl_tps_tx_desc_rate_mode_set(self, nic_cfg-&gt;is_qos ? 1U : 0U);</div><div class='add'>+</div><div class='add'>+	for (tc = 0; tc != nic_cfg-&gt;tcs; tc++) {</div><div class='add'>+		const u32 en = (nic_cfg-&gt;tc_max_rate[tc] != 0) ? 1U : 0U;</div><div class='add'>+		const u32 desc = AQ_NIC_CFG_TCVEC2RING(nic_cfg, tc, 0);</div><div class='add'>+		u32 weight, max_credit;</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_desc_tc_max_credit_set(self, tc,</div><div class='add'>+							      fixed_max_credit);</div><div class='add'>+		hw_atl_tps_tx_pkt_shed_desc_tc_weight_set(self, tc, 0x1E);</div><div class='add'>+</div><div class='add'>+		if (num_min_rated_tcs) {</div><div class='add'>+			weight = tc_weight[tc];</div><div class='add'>+</div><div class='add'>+			if (!weight &amp;&amp; sum_weight &lt; max_weight)</div><div class='add'>+				weight = (max_weight - sum_weight) /</div><div class='add'>+					 (nic_cfg-&gt;tcs - num_min_rated_tcs);</div><div class='add'>+			else if (!weight)</div><div class='add'>+				weight = 0x640;</div><div class='add'>+</div><div class='add'>+			max_credit = max(2 * weight, fixed_max_credit_4b);</div><div class='add'>+		} else {</div><div class='add'>+			weight = 0x640;</div><div class='add'>+			max_credit = 0xFFF0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		hw_atl2_tps_tx_pkt_shed_tc_data_weight_set(self, tc, weight);</div><div class='add'>+		hw_atl2_tps_tx_pkt_shed_tc_data_max_credit_set(self, tc,</div><div class='add'>+							       max_credit);</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_desc_rate_en_set(self, desc, en);</div><div class='add'>+</div><div class='add'>+		if (en) {</div><div class='add'>+			/* Nominal rate is always 10G */</div><div class='add'>+			const u32 rate = 10000U * scale /</div><div class='add'>+					 nic_cfg-&gt;tc_max_rate[tc];</div><div class='add'>+			const u32 rate_int = rate &gt;&gt;</div><div class='add'>+					     HW_ATL_TPS_DESC_RATE_Y_WIDTH;</div><div class='add'>+			const u32 rate_frac = rate &amp; frac_msk;</div><div class='add'>+</div><div class='add'>+			hw_atl_tps_tx_desc_rate_x_set(self, desc, rate_int);</div><div class='add'>+			hw_atl_tps_tx_desc_rate_y_set(self, desc, rate_frac);</div><div class='add'>+		} else {</div><div class='add'>+			/* A value of 1 indicates the queue is not</div><div class='add'>+			 * rate controlled.</div><div class='add'>+			 */</div><div class='add'>+			hw_atl_tps_tx_desc_rate_x_set(self, desc, 1U);</div><div class='add'>+			hw_atl_tps_tx_desc_rate_y_set(self, desc, 0U);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (tc = nic_cfg-&gt;tcs; tc != AQ_CFG_TCS_MAX; tc++) {</div><div class='add'>+		const u32 desc = AQ_NIC_CFG_TCVEC2RING(nic_cfg, tc, 0);</div><div class='add'>+</div><div class='add'>+		hw_atl_tps_tx_desc_rate_en_set(self, desc, 0U);</div><div class='add'>+		hw_atl_tps_tx_desc_rate_x_set(self, desc, 1U);</div><div class='add'>+		hw_atl_tps_tx_desc_rate_y_set(self, desc, 0U);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_init_tx_path(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *nic_cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+</div><div class='add'>+	/* Tx TC/RSS number config */</div><div class='add'>+	hw_atl_tpb_tps_tx_tc_mode_set(self, nic_cfg-&gt;tc_mode);</div><div class='add'>+</div><div class='add'>+	hw_atl_thm_lso_tcp_flag_of_first_pkt_set(self, 0x0FF6U);</div><div class='add'>+	hw_atl_thm_lso_tcp_flag_of_middle_pkt_set(self, 0x0FF6U);</div><div class='add'>+	hw_atl_thm_lso_tcp_flag_of_last_pkt_set(self, 0x0F7FU);</div><div class='add'>+</div><div class='add'>+	/* Tx interrupts */</div><div class='add'>+	hw_atl_tdm_tx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	/* misc */</div><div class='add'>+	hw_atl_tdm_tx_dca_en_set(self, 0U);</div><div class='add'>+	hw_atl_tdm_tx_dca_mode_set(self, 0U);</div><div class='add'>+</div><div class='add'>+	hw_atl_tpb_tx_path_scp_ins_en_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	hw_atl2_tpb_tx_buf_clk_gate_en_set(self, 0U);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_atl2_hw_init_new_rx_filters(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	u8 *prio_tc_map = self-&gt;aq_nic_cfg-&gt;prio_tc_map;</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	u16 action;</div><div class='add'>+	u8 index;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Action Resolver Table (ART) is used by RPF to decide which action</div><div class='add'>+	 * to take with a packet based upon input tag and tag mask, where:</div><div class='add'>+	 *  - input tag is a combination of 3-bit VLan Prio (PTP) and</div><div class='add'>+	 *    29-bit concatenation of all tags from filter block;</div><div class='add'>+	 *  - tag mask is a mask used for matching against input tag.</div><div class='add'>+	 * The input_tag is compared with the all the Requested_tags in the</div><div class='add'>+	 * Record table to find a match. Action field of the selected matched</div><div class='add'>+	 * REC entry is used for further processing. If multiple entries match,</div><div class='add'>+	 * the lowest REC entry, Action field will be selected.</div><div class='add'>+	 */</div><div class='add'>+	hw_atl2_rpf_act_rslvr_section_en_set(self, 0xFFFF);</div><div class='add'>+	hw_atl2_rpfl2_uc_flr_tag_set(self, HW_ATL2_RPF_TAG_BASE_UC,</div><div class='add'>+				     HW_ATL2_MAC_UC);</div><div class='add'>+	hw_atl2_rpfl2_bc_flr_tag_set(self, HW_ATL2_RPF_TAG_BASE_UC);</div><div class='add'>+</div><div class='add'>+	/* FW reserves the beginning of ART, thus all driver entries must</div><div class='add'>+	 * start from the offset specified in FW caps.</div><div class='add'>+	 */</div><div class='add'>+	index = priv-&gt;art_base_index + HW_ATL2_RPF_L2_PROMISC_OFF_INDEX;</div><div class='add'>+	hw_atl2_act_rslvr_table_set(self, index, 0,</div><div class='add'>+				    HW_ATL2_RPF_TAG_UC_MASK |</div><div class='add'>+					HW_ATL2_RPF_TAG_ALLMC_MASK,</div><div class='add'>+				    HW_ATL2_ACTION_DROP);</div><div class='add'>+</div><div class='add'>+	index = priv-&gt;art_base_index + HW_ATL2_RPF_VLAN_PROMISC_OFF_INDEX;</div><div class='add'>+	hw_atl2_act_rslvr_table_set(self, index, 0,</div><div class='add'>+				    HW_ATL2_RPF_TAG_VLAN_MASK |</div><div class='add'>+					HW_ATL2_RPF_TAG_UNTAG_MASK,</div><div class='add'>+				    HW_ATL2_ACTION_DROP);</div><div class='add'>+</div><div class='add'>+	/* Configure ART to map given VLan Prio (PCP) to the TC index for</div><div class='add'>+	 * RSS redirection table.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 8; i++) {</div><div class='add'>+		action = HW_ATL2_ACTION_ASSIGN_TC(prio_tc_map[i]);</div><div class='add'>+</div><div class='add'>+		index = priv-&gt;art_base_index + HW_ATL2_RPF_PCP_TO_TC_INDEX + i;</div><div class='add'>+		hw_atl2_act_rslvr_table_set(self, index,</div><div class='add'>+					    i &lt;&lt; HW_ATL2_RPF_TAG_PCP_OFFSET,</div><div class='add'>+					    HW_ATL2_RPF_TAG_PCP_MASK, action);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_atl2_hw_new_rx_filter_vlan_promisc(struct aq_hw_s *self,</div><div class='add'>+						  bool promisc)</div><div class='add'>+{</div><div class='add'>+	u16 off_action = (!promisc &amp;&amp;</div><div class='add'>+			  !hw_atl_rpfl2promiscuous_mode_en_get(self)) ?</div><div class='add'>+				HW_ATL2_ACTION_DROP : HW_ATL2_ACTION_DISABLE;</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	u8 index;</div><div class='add'>+</div><div class='add'>+	index = priv-&gt;art_base_index + HW_ATL2_RPF_VLAN_PROMISC_OFF_INDEX;</div><div class='add'>+	hw_atl2_act_rslvr_table_set(self, index, 0,</div><div class='add'>+				    HW_ATL2_RPF_TAG_VLAN_MASK |</div><div class='add'>+				    HW_ATL2_RPF_TAG_UNTAG_MASK, off_action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hw_atl2_hw_new_rx_filter_promisc(struct aq_hw_s *self, bool promisc)</div><div class='add'>+{</div><div class='add'>+	u16 off_action = promisc ? HW_ATL2_ACTION_DISABLE : HW_ATL2_ACTION_DROP;</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	bool vlan_promisc_enable;</div><div class='add'>+	u8 index;</div><div class='add'>+</div><div class='add'>+	index = priv-&gt;art_base_index + HW_ATL2_RPF_L2_PROMISC_OFF_INDEX;</div><div class='add'>+	hw_atl2_act_rslvr_table_set(self, index, 0,</div><div class='add'>+				    HW_ATL2_RPF_TAG_UC_MASK |</div><div class='add'>+				    HW_ATL2_RPF_TAG_ALLMC_MASK,</div><div class='add'>+				    off_action);</div><div class='add'>+</div><div class='add'>+	/* turn VLAN promisc mode too */</div><div class='add'>+	vlan_promisc_enable = hw_atl_rpf_vlan_prom_mode_en_get(self);</div><div class='add'>+	hw_atl2_hw_new_rx_filter_vlan_promisc(self, promisc |</div><div class='add'>+					      vlan_promisc_enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_act_rslvr_table_set(struct aq_hw_s *self, u8 location,</div><div class='add'>+				       u32 tag, u32 mask, u32 action)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl2_sem_act_rslvr_get,</div><div class='add'>+					self, val, val == 1,</div><div class='add'>+					1, 10000U);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	hw_atl2_rpf_act_rslvr_record_set(self, location, tag, mask,</div><div class='add'>+					 action);</div><div class='add'>+</div><div class='add'>+	hw_atl_reg_glb_cpu_sem_set(self, 1, HW_ATL2_FW_SM_ACT_RSLVR);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_init_rx_path(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Rx TC/RSS number config */</div><div class='add'>+	hw_atl_rpb_rpf_rx_traf_class_mode_set(self, cfg-&gt;tc_mode);</div><div class='add'>+</div><div class='add'>+	/* Rx flow control */</div><div class='add'>+	hw_atl_rpb_rx_flow_ctl_mode_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	hw_atl2_rpf_rss_hash_type_set(self, HW_ATL2_RPF_RSS_HASH_TYPE_ALL);</div><div class='add'>+</div><div class='add'>+	/* RSS Ring selection */</div><div class='add'>+	hw_atl_b0_hw_init_rx_rss_ctrl1(self);</div><div class='add'>+</div><div class='add'>+	/* Multicast filters */</div><div class='add'>+	for (i = HW_ATL2_MAC_MAX; i--;) {</div><div class='add'>+		hw_atl_rpfl2_uc_flr_en_set(self, (i == 0U) ? 1U : 0U, i);</div><div class='add'>+		hw_atl_rpfl2unicast_flr_act_set(self, 1U, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_atl_reg_rx_flr_mcst_flr_msk_set(self, 0x00000000U);</div><div class='add'>+	hw_atl_reg_rx_flr_mcst_flr_set(self, HW_ATL_MCAST_FLT_ANY_TO_HOST, 0U);</div><div class='add'>+</div><div class='add'>+	/* Vlan filters */</div><div class='add'>+	hw_atl_rpf_vlan_outer_etht_set(self, ETH_P_8021AD);</div><div class='add'>+	hw_atl_rpf_vlan_inner_etht_set(self, ETH_P_8021Q);</div><div class='add'>+</div><div class='add'>+	hw_atl_rpf_vlan_prom_mode_en_set(self, 1);</div><div class='add'>+</div><div class='add'>+	/* Always accept untagged packets */</div><div class='add'>+	hw_atl_rpf_vlan_accept_untagged_packets_set(self, 1U);</div><div class='add'>+	hw_atl_rpf_vlan_untagged_act_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	hw_atl2_hw_init_new_rx_filters(self);</div><div class='add'>+</div><div class='add'>+	/* Rx Interrupts */</div><div class='add'>+	hw_atl_rdm_rx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	hw_atl_rpfl2broadcast_flr_act_set(self, 1U);</div><div class='add'>+	hw_atl_rpfl2broadcast_count_threshold_set(self, 0xFFFFU &amp; (~0U / 256U));</div><div class='add'>+</div><div class='add'>+	hw_atl_rdm_rx_dca_en_set(self, 0U);</div><div class='add'>+	hw_atl_rdm_rx_dca_mode_set(self, 0U);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_init(struct aq_hw_s *self, const u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	static u32 aq_hw_atl2_igcr_table_[4][2] = {</div><div class='add'>+		[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },</div><div class='add'>+		[AQ_HW_IRQ_INTX]    = { 0x20000080U, 0x20000080U },</div><div class='add'>+		[AQ_HW_IRQ_MSI]     = { 0x20000021U, 0x20000025U },</div><div class='add'>+		[AQ_HW_IRQ_MSIX]    = { 0x20000022U, 0x20000026U },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	struct aq_nic_cfg_s *aq_nic_cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	u8 base_index, count;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hw_atl2_utils_get_action_resolve_table_caps(self, &amp;base_index,</div><div class='add'>+							  &amp;count);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	priv-&gt;art_base_index = 8 * base_index;</div><div class='add'>+</div><div class='add'>+	hw_atl2_init_launchtime(self);</div><div class='add'>+</div><div class='add'>+	hw_atl2_hw_init_tx_path(self);</div><div class='add'>+	hw_atl2_hw_init_rx_path(self);</div><div class='add'>+</div><div class='add'>+	hw_atl_b0_hw_mac_addr_set(self, mac_addr);</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;set_link_speed(self, aq_nic_cfg-&gt;link_speed_msk);</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;set_state(self, MPI_INIT);</div><div class='add'>+</div><div class='add'>+	hw_atl2_hw_qos_set(self);</div><div class='add'>+	hw_atl2_hw_rss_set(self, &amp;aq_nic_cfg-&gt;aq_rss);</div><div class='add'>+	hw_atl_b0_hw_rss_hash_set(self, &amp;aq_nic_cfg-&gt;aq_rss);</div><div class='add'>+</div><div class='add'>+	hw_atl2_rpf_new_enable_set(self, 1);</div><div class='add'>+</div><div class='add'>+	/* Reset link status and read out initial hardware counters */</div><div class='add'>+	self-&gt;aq_link_status.mbps = 0;</div><div class='add'>+	self-&gt;aq_fw_ops-&gt;update_stats(self);</div><div class='add'>+</div><div class='add'>+	err = aq_hw_err_from_flags(self);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto err_exit;</div><div class='add'>+</div><div class='add'>+	/* Interrupts */</div><div class='add'>+	hw_atl_reg_irq_glb_ctl_set(self,</div><div class='add'>+				   aq_hw_atl2_igcr_table_[aq_nic_cfg-&gt;irq_type]</div><div class='add'>+						 [(aq_nic_cfg-&gt;vecs &gt; 1U) ?</div><div class='add'>+						  1 : 0]);</div><div class='add'>+</div><div class='add'>+	hw_atl_itr_irq_auto_masklsw_set(self, aq_nic_cfg-&gt;aq_hw_caps-&gt;irq_mask);</div><div class='add'>+</div><div class='add'>+	/* Interrupts */</div><div class='add'>+	hw_atl_reg_gen_irq_map_set(self,</div><div class='add'>+				   ((HW_ATL2_ERR_INT &lt;&lt; 0x18) |</div><div class='add'>+				    (1U &lt;&lt; 0x1F)) |</div><div class='add'>+				   ((HW_ATL2_ERR_INT &lt;&lt; 0x10) |</div><div class='add'>+				    (1U &lt;&lt; 0x17)), 0U);</div><div class='add'>+</div><div class='add'>+	hw_atl_b0_hw_offload_set(self, aq_nic_cfg);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_ring_rx_init(struct aq_hw_s *self,</div><div class='add'>+				   struct aq_ring_s *aq_ring,</div><div class='add'>+				   struct aq_ring_param_s *aq_ring_param)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_b0_hw_ring_rx_init(self, aq_ring, aq_ring_param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_ring_tx_init(struct aq_hw_s *self,</div><div class='add'>+				   struct aq_ring_s *aq_ring,</div><div class='add'>+				   struct aq_ring_param_s *aq_ring_param)</div><div class='add'>+{</div><div class='add'>+	return hw_atl_b0_hw_ring_tx_init(self, aq_ring, aq_ring_param);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define IS_FILTER_ENABLED(_F_) ((packet_filter &amp; (_F_)) ? 1U : 0U)</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_packet_filter_set(struct aq_hw_s *self,</div><div class='add'>+					unsigned int packet_filter)</div><div class='add'>+{</div><div class='add'>+	hw_atl2_hw_new_rx_filter_promisc(self, IS_FILTER_ENABLED(IFF_PROMISC));</div><div class='add'>+</div><div class='add'>+	return hw_atl_b0_hw_packet_filter_set(self, packet_filter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#undef IS_FILTER_ENABLED</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_multicast_list_set(struct aq_hw_s *self,</div><div class='add'>+					 u8 ar_mac</div><div class='add'>+					 [AQ_HW_MULTICAST_ADDRESS_MAX]</div><div class='add'>+					 [ETH_ALEN],</div><div class='add'>+					 u32 count)</div><div class='add'>+{</div><div class='add'>+	struct aq_nic_cfg_s *cfg = self-&gt;aq_nic_cfg;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (count &gt; (HW_ATL2_MAC_MAX - HW_ATL2_MAC_MIN)) {</div><div class='add'>+		err = -EBADRQC;</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+	for (cfg-&gt;mc_list_count = 0U;</div><div class='add'>+			cfg-&gt;mc_list_count &lt; count;</div><div class='add'>+			++cfg-&gt;mc_list_count) {</div><div class='add'>+		u32 i = cfg-&gt;mc_list_count;</div><div class='add'>+		u32 h = (ar_mac[i][0] &lt;&lt; 8) | (ar_mac[i][1]);</div><div class='add'>+		u32 l = (ar_mac[i][2] &lt;&lt; 24) | (ar_mac[i][3] &lt;&lt; 16) |</div><div class='add'>+					(ar_mac[i][4] &lt;&lt; 8) | ar_mac[i][5];</div><div class='add'>+</div><div class='add'>+		hw_atl_rpfl2_uc_flr_en_set(self, 0U, HW_ATL2_MAC_MIN + i);</div><div class='add'>+</div><div class='add'>+		hw_atl_rpfl2unicast_dest_addresslsw_set(self, l,</div><div class='add'>+							HW_ATL2_MAC_MIN + i);</div><div class='add'>+</div><div class='add'>+		hw_atl_rpfl2unicast_dest_addressmsw_set(self, h,</div><div class='add'>+							HW_ATL2_MAC_MIN + i);</div><div class='add'>+</div><div class='add'>+		hw_atl2_rpfl2_uc_flr_tag_set(self, 1, HW_ATL2_MAC_MIN + i);</div><div class='add'>+</div><div class='add'>+		hw_atl_rpfl2_uc_flr_en_set(self, (cfg-&gt;is_mc_list_enabled),</div><div class='add'>+					   HW_ATL2_MAC_MIN + i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = aq_hw_err_from_flags(self);</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_interrupt_moderation_set(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = 0U;</div><div class='add'>+	u32 itr_tx = 2U;</div><div class='add'>+	u32 itr_rx = 2U;</div><div class='add'>+</div><div class='add'>+	switch (self-&gt;aq_nic_cfg-&gt;itr) {</div><div class='add'>+	case  AQ_CFG_INTERRUPT_MODERATION_ON:</div><div class='add'>+	case  AQ_CFG_INTERRUPT_MODERATION_AUTO:</div><div class='add'>+		hw_atl_tdm_tx_desc_wr_wb_irq_en_set(self, 0U);</div><div class='add'>+		hw_atl_tdm_tdm_intr_moder_en_set(self, 1U);</div><div class='add'>+		hw_atl_rdm_rx_desc_wr_wb_irq_en_set(self, 0U);</div><div class='add'>+		hw_atl_rdm_rdm_intr_moder_en_set(self, 1U);</div><div class='add'>+</div><div class='add'>+		if (self-&gt;aq_nic_cfg-&gt;itr == AQ_CFG_INTERRUPT_MODERATION_ON) {</div><div class='add'>+			/* HW timers are in 2us units */</div><div class='add'>+			int tx_max_timer = self-&gt;aq_nic_cfg-&gt;tx_itr / 2;</div><div class='add'>+			int tx_min_timer = tx_max_timer / 2;</div><div class='add'>+</div><div class='add'>+			int rx_max_timer = self-&gt;aq_nic_cfg-&gt;rx_itr / 2;</div><div class='add'>+			int rx_min_timer = rx_max_timer / 2;</div><div class='add'>+</div><div class='add'>+			tx_max_timer = min(HW_ATL2_INTR_MODER_MAX,</div><div class='add'>+					   tx_max_timer);</div><div class='add'>+			tx_min_timer = min(HW_ATL2_INTR_MODER_MIN,</div><div class='add'>+					   tx_min_timer);</div><div class='add'>+			rx_max_timer = min(HW_ATL2_INTR_MODER_MAX,</div><div class='add'>+					   rx_max_timer);</div><div class='add'>+			rx_min_timer = min(HW_ATL2_INTR_MODER_MIN,</div><div class='add'>+					   rx_min_timer);</div><div class='add'>+</div><div class='add'>+			itr_tx |= tx_min_timer &lt;&lt; 0x8U;</div><div class='add'>+			itr_tx |= tx_max_timer &lt;&lt; 0x10U;</div><div class='add'>+			itr_rx |= rx_min_timer &lt;&lt; 0x8U;</div><div class='add'>+			itr_rx |= rx_max_timer &lt;&lt; 0x10U;</div><div class='add'>+		} else {</div><div class='add'>+			static unsigned int hw_atl2_timers_table_tx_[][2] = {</div><div class='add'>+				{0xfU, 0xffU}, /* 10Gbit */</div><div class='add'>+				{0xfU, 0x1ffU}, /* 5Gbit */</div><div class='add'>+				{0xfU, 0x1ffU}, /* 5Gbit 5GS */</div><div class='add'>+				{0xfU, 0x1ffU}, /* 2.5Gbit */</div><div class='add'>+				{0xfU, 0x1ffU}, /* 1Gbit */</div><div class='add'>+				{0xfU, 0x1ffU}, /* 100Mbit */</div><div class='add'>+			};</div><div class='add'>+			static unsigned int hw_atl2_timers_table_rx_[][2] = {</div><div class='add'>+				{0x6U, 0x38U},/* 10Gbit */</div><div class='add'>+				{0xCU, 0x70U},/* 5Gbit */</div><div class='add'>+				{0xCU, 0x70U},/* 5Gbit 5GS */</div><div class='add'>+				{0x18U, 0xE0U},/* 2.5Gbit */</div><div class='add'>+				{0x30U, 0x80U},/* 1Gbit */</div><div class='add'>+				{0x4U, 0x50U},/* 100Mbit */</div><div class='add'>+			};</div><div class='add'>+			unsigned int mbps = self-&gt;aq_link_status.mbps;</div><div class='add'>+			unsigned int speed_index;</div><div class='add'>+</div><div class='add'>+			speed_index = hw_atl_utils_mbps_2_speed_index(mbps);</div><div class='add'>+</div><div class='add'>+			/* Update user visible ITR settings */</div><div class='add'>+			self-&gt;aq_nic_cfg-&gt;tx_itr = hw_atl2_timers_table_tx_</div><div class='add'>+							[speed_index][1] * 2;</div><div class='add'>+			self-&gt;aq_nic_cfg-&gt;rx_itr = hw_atl2_timers_table_rx_</div><div class='add'>+							[speed_index][1] * 2;</div><div class='add'>+</div><div class='add'>+			itr_tx |= hw_atl2_timers_table_tx_</div><div class='add'>+						[speed_index][0] &lt;&lt; 0x8U;</div><div class='add'>+			itr_tx |= hw_atl2_timers_table_tx_</div><div class='add'>+						[speed_index][1] &lt;&lt; 0x10U;</div><div class='add'>+</div><div class='add'>+			itr_rx |= hw_atl2_timers_table_rx_</div><div class='add'>+						[speed_index][0] &lt;&lt; 0x8U;</div><div class='add'>+			itr_rx |= hw_atl2_timers_table_rx_</div><div class='add'>+						[speed_index][1] &lt;&lt; 0x10U;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case AQ_CFG_INTERRUPT_MODERATION_OFF:</div><div class='add'>+		hw_atl_tdm_tx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='add'>+		hw_atl_tdm_tdm_intr_moder_en_set(self, 0U);</div><div class='add'>+		hw_atl_rdm_rx_desc_wr_wb_irq_en_set(self, 1U);</div><div class='add'>+		hw_atl_rdm_rdm_intr_moder_en_set(self, 0U);</div><div class='add'>+		itr_tx = 0U;</div><div class='add'>+		itr_rx = 0U;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = HW_ATL2_RINGS_MAX; i--;) {</div><div class='add'>+		hw_atl2_reg_tx_intr_moder_ctrl_set(self, itr_tx, i);</div><div class='add'>+		hw_atl_reg_rx_intr_moder_ctrl_set(self, itr_rx, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_stop(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	hw_atl_b0_hw_irq_disable(self, HW_ATL2_INT_MASK);</div><div class='add'>+</div><div class='add'>+	return aq_hw_invalidate_descriptor_cache(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct aq_stats_s *hw_atl2_utils_get_hw_stats(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	return &amp;self-&gt;curr_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_vlan_set(struct aq_hw_s *self,</div><div class='add'>+			       struct aq_rx_filter_vlan *aq_vlans)</div><div class='add'>+{</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	u32 queue;</div><div class='add'>+	u8 index;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	hw_atl_rpf_vlan_prom_mode_en_set(self, 1U);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; HW_ATL_VLAN_MAX_FILTERS; i++) {</div><div class='add'>+		queue = HW_ATL2_ACTION_ASSIGN_QUEUE(aq_vlans[i].queue);</div><div class='add'>+</div><div class='add'>+		hw_atl_rpf_vlan_flr_en_set(self, 0U, i);</div><div class='add'>+		hw_atl_rpf_vlan_rxq_en_flr_set(self, 0U, i);</div><div class='add'>+		index = priv-&gt;art_base_index + HW_ATL2_RPF_VLAN_USER_INDEX + i;</div><div class='add'>+		hw_atl2_act_rslvr_table_set(self, index, 0, 0,</div><div class='add'>+					    HW_ATL2_ACTION_DISABLE);</div><div class='add'>+		if (aq_vlans[i].enable) {</div><div class='add'>+			hw_atl_rpf_vlan_id_flr_set(self,</div><div class='add'>+						   aq_vlans[i].vlan_id, i);</div><div class='add'>+			hw_atl_rpf_vlan_flr_act_set(self, 1U, i);</div><div class='add'>+			hw_atl_rpf_vlan_flr_en_set(self, 1U, i);</div><div class='add'>+</div><div class='add'>+			if (aq_vlans[i].queue != 0xFF) {</div><div class='add'>+				hw_atl_rpf_vlan_rxq_flr_set(self,</div><div class='add'>+							    aq_vlans[i].queue,</div><div class='add'>+							    i);</div><div class='add'>+				hw_atl_rpf_vlan_rxq_en_flr_set(self, 1U, i);</div><div class='add'>+</div><div class='add'>+				hw_atl2_rpf_vlan_flr_tag_set(self, i + 2, i);</div><div class='add'>+</div><div class='add'>+				index = priv-&gt;art_base_index +</div><div class='add'>+					HW_ATL2_RPF_VLAN_USER_INDEX + i;</div><div class='add'>+				hw_atl2_act_rslvr_table_set(self, index,</div><div class='add'>+					(i + 2) &lt;&lt; HW_ATL2_RPF_TAG_VLAN_OFFSET,</div><div class='add'>+					HW_ATL2_RPF_TAG_VLAN_MASK, queue);</div><div class='add'>+			} else {</div><div class='add'>+				hw_atl2_rpf_vlan_flr_tag_set(self, 1, i);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int hw_atl2_hw_vlan_ctrl(struct aq_hw_s *self, bool enable)</div><div class='add'>+{</div><div class='add'>+	/* set promisc in case of disabing the vlan filter */</div><div class='add'>+	hw_atl_rpf_vlan_prom_mode_en_set(self, !enable);</div><div class='add'>+	hw_atl2_hw_new_rx_filter_vlan_promisc(self, !enable);</div><div class='add'>+</div><div class='add'>+	return aq_hw_err_from_flags(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct aq_hw_ops hw_atl2_ops = {</div><div class='add'>+	.hw_soft_reset        = hw_atl2_utils_soft_reset,</div><div class='add'>+	.hw_prepare           = hw_atl2_utils_initfw,</div><div class='add'>+	.hw_set_mac_address   = hw_atl_b0_hw_mac_addr_set,</div><div class='add'>+	.hw_init              = hw_atl2_hw_init,</div><div class='add'>+	.hw_reset             = hw_atl2_hw_reset,</div><div class='add'>+	.hw_start             = hw_atl_b0_hw_start,</div><div class='add'>+	.hw_ring_tx_start     = hw_atl_b0_hw_ring_tx_start,</div><div class='add'>+	.hw_ring_tx_stop      = hw_atl_b0_hw_ring_tx_stop,</div><div class='add'>+	.hw_ring_rx_start     = hw_atl_b0_hw_ring_rx_start,</div><div class='add'>+	.hw_ring_rx_stop      = hw_atl_b0_hw_ring_rx_stop,</div><div class='add'>+	.hw_stop              = hw_atl2_hw_stop,</div><div class='add'>+</div><div class='add'>+	.hw_ring_tx_xmit         = hw_atl_b0_hw_ring_tx_xmit,</div><div class='add'>+	.hw_ring_tx_head_update  = hw_atl_b0_hw_ring_tx_head_update,</div><div class='add'>+</div><div class='add'>+	.hw_ring_rx_receive      = hw_atl_b0_hw_ring_rx_receive,</div><div class='add'>+	.hw_ring_rx_fill         = hw_atl_b0_hw_ring_rx_fill,</div><div class='add'>+</div><div class='add'>+	.hw_irq_enable           = hw_atl_b0_hw_irq_enable,</div><div class='add'>+	.hw_irq_disable          = hw_atl_b0_hw_irq_disable,</div><div class='add'>+	.hw_irq_read             = hw_atl_b0_hw_irq_read,</div><div class='add'>+</div><div class='add'>+	.hw_ring_rx_init             = hw_atl2_hw_ring_rx_init,</div><div class='add'>+	.hw_ring_tx_init             = hw_atl2_hw_ring_tx_init,</div><div class='add'>+	.hw_packet_filter_set        = hw_atl2_hw_packet_filter_set,</div><div class='add'>+	.hw_filter_vlan_set          = hw_atl2_hw_vlan_set,</div><div class='add'>+	.hw_filter_vlan_ctrl         = hw_atl2_hw_vlan_ctrl,</div><div class='add'>+	.hw_multicast_list_set       = hw_atl2_hw_multicast_list_set,</div><div class='add'>+	.hw_interrupt_moderation_set = hw_atl2_hw_interrupt_moderation_set,</div><div class='add'>+	.hw_rss_set                  = hw_atl2_hw_rss_set,</div><div class='add'>+	.hw_rss_hash_set             = hw_atl_b0_hw_rss_hash_set,</div><div class='add'>+	.hw_tc_rate_limit_set        = hw_atl2_hw_init_tx_tc_rate_limit,</div><div class='add'>+	.hw_get_hw_stats             = hw_atl2_utils_get_hw_stats,</div><div class='add'>+	.hw_get_fw_version           = hw_atl2_utils_get_fw_version,</div><div class='add'>+	.hw_set_offload              = hw_atl_b0_hw_offload_set,</div><div class='add'>+	.hw_set_loopback             = hw_atl_b0_set_loopback,</div><div class='add'>+	.hw_set_fc                   = hw_atl_b0_set_fc,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h<br/>new file mode 100644<br/>index 000000000000..346f0dc9912e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.h</a></div><div class='hunk'>@@ -0,0 +1,16 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HW_ATL2_H</div><div class='add'>+#define HW_ATL2_H</div><div class='add'>+</div><div class='add'>+#include "aq_common.h"</div><div class='add'>+</div><div class='add'>+extern const struct aq_hw_caps_s hw_atl2_caps_aqc113;</div><div class='add'>+extern const struct aq_hw_caps_s hw_atl2_caps_aqc115c;</div><div class='add'>+extern const struct aq_hw_caps_s hw_atl2_caps_aqc116c;</div><div class='add'>+extern const struct aq_hw_ops hw_atl2_ops;</div><div class='add'>+</div><div class='add'>+#endif /* HW_ATL2_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h<br/>new file mode 100644<br/>index 000000000000..5a89bb8722f9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_internal.h</a></div><div class='hunk'>@@ -0,0 +1,127 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HW_ATL2_INTERNAL_H</div><div class='add'>+#define HW_ATL2_INTERNAL_H</div><div class='add'>+</div><div class='add'>+#include "hw_atl2_utils.h"</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_MTU_JUMBO  16352U</div><div class='add'>+#define HW_ATL2_MTU        1514U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_TX_RINGS 4U</div><div class='add'>+#define HW_ATL2_RX_RINGS 4U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_RINGS_MAX 32U</div><div class='add'>+#define HW_ATL2_TXD_SIZE       (16U)</div><div class='add'>+#define HW_ATL2_RXD_SIZE       (16U)</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_MAC_UC   0U</div><div class='add'>+#define HW_ATL2_MAC_MIN  1U</div><div class='add'>+#define HW_ATL2_MAC_MAX  38U</div><div class='add'>+</div><div class='add'>+/* interrupts */</div><div class='add'>+#define HW_ATL2_ERR_INT 8U</div><div class='add'>+#define HW_ATL2_INT_MASK  (0xFFFFFFFFU)</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_TXBUF_MAX              128U</div><div class='add'>+#define HW_ATL2_RXBUF_MAX              192U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_RSS_REDIRECTION_MAX 64U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_TC_MAX 8U</div><div class='add'>+#define HW_ATL2_RSS_MAX 8U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_INTR_MODER_MAX  0x1FF</div><div class='add'>+#define HW_ATL2_INTR_MODER_MIN  0xFF</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_MIN_RXD \</div><div class='add'>+	(ALIGN(AQ_CFG_SKB_FRAGS_MAX + 1U, AQ_HW_RXD_MULTIPLE))</div><div class='add'>+#define HW_ATL2_MIN_TXD \</div><div class='add'>+	(ALIGN(AQ_CFG_SKB_FRAGS_MAX + 1U, AQ_HW_TXD_MULTIPLE))</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_MAX_RXD 8184U</div><div class='add'>+#define HW_ATL2_MAX_TXD 8184U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_FW_SM_ACT_RSLVR  0x3U</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_RPF_TAG_UC_OFFSET      0x0</div><div class='add'>+#define HW_ATL2_RPF_TAG_ALLMC_OFFSET   0x6</div><div class='add'>+#define HW_ATL2_RPF_TAG_ET_OFFSET      0x7</div><div class='add'>+#define HW_ATL2_RPF_TAG_VLAN_OFFSET    0xA</div><div class='add'>+#define HW_ATL2_RPF_TAG_UNTAG_OFFSET   0xE</div><div class='add'>+#define HW_ATL2_RPF_TAG_L3_V4_OFFSET   0xF</div><div class='add'>+#define HW_ATL2_RPF_TAG_L3_V6_OFFSET   0x12</div><div class='add'>+#define HW_ATL2_RPF_TAG_L4_OFFSET      0x15</div><div class='add'>+#define HW_ATL2_RPF_TAG_L4_FLEX_OFFSET 0x18</div><div class='add'>+#define HW_ATL2_RPF_TAG_FLEX_OFFSET    0x1B</div><div class='add'>+#define HW_ATL2_RPF_TAG_PCP_OFFSET     0x1D</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_RPF_TAG_UC_MASK    (0x0000003F &lt;&lt; HW_ATL2_RPF_TAG_UC_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_ALLMC_MASK (0x00000001 &lt;&lt; HW_ATL2_RPF_TAG_ALLMC_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_UNTAG_MASK (0x00000001 &lt;&lt; HW_ATL2_RPF_TAG_UNTAG_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_VLAN_MASK  (0x0000000F &lt;&lt; HW_ATL2_RPF_TAG_VLAN_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_ET_MASK    (0x00000007 &lt;&lt; HW_ATL2_RPF_TAG_ET_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_L3_V4_MASK (0x00000007 &lt;&lt; HW_ATL2_RPF_TAG_L3_V4_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_L3_V6_MASK (0x00000007 &lt;&lt; HW_ATL2_RPF_TAG_L3_V6_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_L4_MASK    (0x00000007 &lt;&lt; HW_ATL2_RPF_TAG_L4_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_PCP_MASK   (0x00000007 &lt;&lt; HW_ATL2_RPF_TAG_PCP_OFFSET)</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_RPF_TAG_BASE_UC    BIT(HW_ATL2_RPF_TAG_UC_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_BASE_ALLMC BIT(HW_ATL2_RPF_TAG_ALLMC_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_BASE_UNTAG BIT(HW_ATL2_RPF_TAG_UNTAG_OFFSET)</div><div class='add'>+#define HW_ATL2_RPF_TAG_BASE_VLAN  BIT(HW_ATL2_RPF_TAG_VLAN_OFFSET)</div><div class='add'>+</div><div class='add'>+enum HW_ATL2_RPF_ART_INDEX {</div><div class='add'>+	HW_ATL2_RPF_L2_PROMISC_OFF_INDEX,</div><div class='add'>+	HW_ATL2_RPF_VLAN_PROMISC_OFF_INDEX,</div><div class='add'>+	HW_ATL2_RPF_L3L4_USER_INDEX	= 8,</div><div class='add'>+	HW_ATL2_RPF_ET_PCP_USER_INDEX	= HW_ATL2_RPF_L3L4_USER_INDEX + 16,</div><div class='add'>+	HW_ATL2_RPF_VLAN_USER_INDEX	= HW_ATL2_RPF_ET_PCP_USER_INDEX + 16,</div><div class='add'>+	HW_ATL2_RPF_PCP_TO_TC_INDEX	= HW_ATL2_RPF_VLAN_USER_INDEX +</div><div class='add'>+					  HW_ATL_VLAN_MAX_FILTERS,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_ACTION(ACTION, RSS, INDEX, VALID) \</div><div class='add'>+	((((ACTION) &amp; 0x3U) &lt;&lt; 8) | \</div><div class='add'>+	(((RSS) &amp; 0x1U) &lt;&lt; 7) | \</div><div class='add'>+	(((INDEX) &amp; 0x3FU) &lt;&lt; 2) | \</div><div class='add'>+	(((VALID) &amp; 0x1U) &lt;&lt; 0))</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_ACTION_DROP HW_ATL2_ACTION(0, 0, 0, 1)</div><div class='add'>+#define HW_ATL2_ACTION_DISABLE HW_ATL2_ACTION(0, 0, 0, 0)</div><div class='add'>+#define HW_ATL2_ACTION_ASSIGN_QUEUE(QUEUE) HW_ATL2_ACTION(1, 0, (QUEUE), 1)</div><div class='add'>+#define HW_ATL2_ACTION_ASSIGN_TC(TC) HW_ATL2_ACTION(1, 1, (TC), 1)</div><div class='add'>+</div><div class='add'>+enum HW_ATL2_RPF_RSS_HASH_TYPE {</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_NONE = 0,</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV4 = BIT(0),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV4_TCP = BIT(1),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV4_UDP = BIT(2),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV6 = BIT(3),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_TCP = BIT(4),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_UDP = BIT(5),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_EX = BIT(6),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_EX_TCP = BIT(7),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_EX_UDP = BIT(8),</div><div class='add'>+	HW_ATL2_RPF_RSS_HASH_TYPE_ALL = HW_ATL2_RPF_RSS_HASH_TYPE_IPV4 |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV4_TCP |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV4_UDP |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV6 |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_TCP |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_UDP |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_EX |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_EX_TCP |</div><div class='add'>+					HW_ATL2_RPF_RSS_HASH_TYPE_IPV6_EX_UDP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HW_ATL_MCAST_FLT_ANY_TO_HOST 0x00010FFFU</div><div class='add'>+</div><div class='add'>+struct hw_atl2_priv {</div><div class='add'>+	struct statistics_s last_stats;</div><div class='add'>+	unsigned int art_base_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* HW_ATL2_INTERNAL_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c<br/>new file mode 100644<br/>index 000000000000..cd954b11d24a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.c</a></div><div class='hunk'>@@ -0,0 +1,234 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "hw_atl2_llh.h"</div><div class='add'>+#include "hw_atl2_llh_internal.h"</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpf_redirection_table2_select_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					       u32 select)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_ADR,</div><div class='add'>+			    HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_MSK,</div><div class='add'>+			    HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_SHIFT, select);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpf_rss_hash_type_set(struct aq_hw_s *aq_hw, u32 rss_hash_type)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_ADR,</div><div class='add'>+			    HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_MSK,</div><div class='add'>+			    HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_SHIFT,</div><div class='add'>+			    rss_hash_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* rpf */</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpf_new_enable_set(struct aq_hw_s *aq_hw, u32 enable)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_NEW_EN_ADR,</div><div class='add'>+			    HW_ATL2_RPF_NEW_EN_MSK,</div><div class='add'>+			    HW_ATL2_RPF_NEW_EN_SHIFT,</div><div class='add'>+			    enable);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpfl2_uc_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag, u32 filter)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPFL2UC_TAG_ADR(filter),</div><div class='add'>+			    HW_ATL2_RPFL2UC_TAG_MSK,</div><div class='add'>+			    HW_ATL2_RPFL2UC_TAG_SHIFT,</div><div class='add'>+			    tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpfl2_bc_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_L2_BC_TAG_ADR,</div><div class='add'>+			    HW_ATL2_RPF_L2_BC_TAG_MSK,</div><div class='add'>+			    HW_ATL2_RPF_L2_BC_TAG_SHIFT,</div><div class='add'>+			    tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_new_rpf_rss_redir_set(struct aq_hw_s *aq_hw, u32 tc, u32 index,</div><div class='add'>+				   u32 queue)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_RSS_REDIR_ADR(tc, index),</div><div class='add'>+			    HW_ATL2_RPF_RSS_REDIR_MSK(tc),</div><div class='add'>+			    HW_ATL2_RPF_RSS_REDIR_SHIFT(tc),</div><div class='add'>+			    queue);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpf_vlan_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag, u32 filter)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_VL_TAG_ADR(filter),</div><div class='add'>+			    HW_ATL2_RPF_VL_TAG_MSK,</div><div class='add'>+			    HW_ATL2_RPF_VL_TAG_SHIFT,</div><div class='add'>+			    tag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TX */</div><div class='add'>+</div><div class='add'>+void hw_atl2_tpb_tx_tc_q_rand_map_en_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					 const u32 tc_q_rand_map_en)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_ADR,</div><div class='add'>+			    HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_MSK,</div><div class='add'>+			    HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_SHIFT,</div><div class='add'>+			    tc_q_rand_map_en);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_tpb_tx_buf_clk_gate_en_set(struct aq_hw_s *aq_hw, u32 clk_gate_en)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_ADR,</div><div class='add'>+			    HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_MSK,</div><div class='add'>+			    HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_SHIFT,</div><div class='add'>+			    clk_gate_en);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_reg_tx_intr_moder_ctrl_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					u32 tx_intr_moderation_ctl,</div><div class='add'>+					u32 queue)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw, HW_ATL2_TX_INTR_MODERATION_CTL_ADR(queue),</div><div class='add'>+			tx_intr_moderation_ctl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_tps_tx_pkt_shed_data_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					       const u32 data_arb_mode)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPS_DATA_TC_ARB_MODE_ADR,</div><div class='add'>+			    HW_ATL2_TPS_DATA_TC_ARB_MODE_MSK,</div><div class='add'>+			    HW_ATL2_TPS_DATA_TC_ARB_MODE_SHIFT,</div><div class='add'>+			    data_arb_mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='add'>+						    const u32 tc,</div><div class='add'>+						    const u32 max_credit)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPS_DATA_TCTCREDIT_MAX_ADR(tc),</div><div class='add'>+			    HW_ATL2_TPS_DATA_TCTCREDIT_MAX_MSK,</div><div class='add'>+			    HW_ATL2_TPS_DATA_TCTCREDIT_MAX_SHIFT,</div><div class='add'>+			    max_credit);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,</div><div class='add'>+						const u32 tc,</div><div class='add'>+						const u32 weight)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_TPS_DATA_TCTWEIGHT_ADR(tc),</div><div class='add'>+			    HW_ATL2_TPS_DATA_TCTWEIGHT_MSK,</div><div class='add'>+			    HW_ATL2_TPS_DATA_TCTWEIGHT_SHIFT,</div><div class='add'>+			    weight);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_get_hw_version(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL2_FPGA_VER_ADR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_init_launchtime(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	u32 hw_ver = hw_atl2_get_hw_version(aq_hw);</div><div class='add'>+</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_LT_CTRL_ADR,</div><div class='add'>+			    HW_ATL2_LT_CTRL_CLK_RATIO_MSK,</div><div class='add'>+			    HW_ATL2_LT_CTRL_CLK_RATIO_SHIFT,</div><div class='add'>+			    hw_ver  &lt; HW_ATL2_FPGA_VER_U32(1, 0, 0, 0) ?</div><div class='add'>+			    HW_ATL2_LT_CTRL_CLK_RATIO_FULL_SPEED :</div><div class='add'>+			    hw_ver &gt;= HW_ATL2_FPGA_VER_U32(1, 0, 85, 2) ?</div><div class='add'>+			    HW_ATL2_LT_CTRL_CLK_RATIO_HALF_SPEED :</div><div class='add'>+			    HW_ATL2_LT_CTRL_CLK_RATIO_QUATER_SPEED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* set action resolver record */</div><div class='add'>+void hw_atl2_rpf_act_rslvr_record_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='add'>+				      u32 tag, u32 mask, u32 action)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg(aq_hw,</div><div class='add'>+			HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_ADR(location),</div><div class='add'>+			tag);</div><div class='add'>+	aq_hw_write_reg(aq_hw,</div><div class='add'>+			HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_ADR(location),</div><div class='add'>+			mask);</div><div class='add'>+	aq_hw_write_reg(aq_hw,</div><div class='add'>+			HW_ATL2_RPF_ACT_RSLVR_ACTN_ADR(location),</div><div class='add'>+			action);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_rpf_act_rslvr_section_en_set(struct aq_hw_s *aq_hw, u32 sections)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_RPF_REC_TAB_EN_ADR,</div><div class='add'>+			    HW_ATL2_RPF_REC_TAB_EN_MSK,</div><div class='add'>+			    HW_ATL2_RPF_REC_TAB_EN_SHIFT,</div><div class='add'>+			    sections);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_mif_shared_buf_get(struct aq_hw_s *aq_hw, int offset, u32 *data,</div><div class='add'>+				int len)</div><div class='add'>+{</div><div class='add'>+	int j = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; offset + len; i++, j++)</div><div class='add'>+		data[j] = aq_hw_read_reg(aq_hw,</div><div class='add'>+					 HW_ATL2_MIF_SHARED_BUFFER_IN_ADR(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_mif_shared_buf_write(struct aq_hw_s *aq_hw, int offset, u32 *data,</div><div class='add'>+				  int len)</div><div class='add'>+{</div><div class='add'>+	int j = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; offset + len; i++, j++)</div><div class='add'>+		aq_hw_write_reg(aq_hw, HW_ATL2_MIF_SHARED_BUFFER_IN_ADR(i),</div><div class='add'>+				data[j]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_mif_shared_buf_read(struct aq_hw_s *aq_hw, int offset, u32 *data,</div><div class='add'>+				 int len)</div><div class='add'>+{</div><div class='add'>+	int j = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = offset; i &lt; offset + len; i++, j++)</div><div class='add'>+		data[j] = aq_hw_read_reg(aq_hw,</div><div class='add'>+					 HW_ATL2_MIF_SHARED_BUFFER_OUT_ADR(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_mif_host_finished_write_set(struct aq_hw_s *aq_hw, u32 finish)</div><div class='add'>+{</div><div class='add'>+	aq_hw_write_reg_bit(aq_hw, HW_ATL2_MIF_HOST_FINISHED_WRITE_ADR,</div><div class='add'>+			    HW_ATL2_MIF_HOST_FINISHED_WRITE_MSK,</div><div class='add'>+			    HW_ATL2_MIF_HOST_FINISHED_WRITE_SHIFT,</div><div class='add'>+			    finish);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_mif_mcp_finished_read_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg_bit(aq_hw, HW_ATL2_MIF_MCP_FINISHED_READ_ADR,</div><div class='add'>+				  HW_ATL2_MIF_MCP_FINISHED_READ_MSK,</div><div class='add'>+				  HW_ATL2_MIF_MCP_FINISHED_READ_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_mif_mcp_boot_reg_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL2_MIF_BOOT_REG_ADR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_mif_mcp_boot_reg_set(struct aq_hw_s *aq_hw, u32 val)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_write_reg(aq_hw, HW_ATL2_MIF_BOOT_REG_ADR, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_mif_host_req_int_get(struct aq_hw_s *aq_hw)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_read_reg(aq_hw, HW_ATL2_MCP_HOST_REQ_INT_ADR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void hw_atl2_mif_host_req_int_clr(struct aq_hw_s *aq_hw, u32 val)</div><div class='add'>+{</div><div class='add'>+	return aq_hw_write_reg(aq_hw, HW_ATL2_MCP_HOST_REQ_INT_CLR_ADR,</div><div class='add'>+			       val);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h<br/>new file mode 100644<br/>index 000000000000..98c7a4621297<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh.h</a></div><div class='hunk'>@@ -0,0 +1,102 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HW_ATL2_LLH_H</div><div class='add'>+#define HW_ATL2_LLH_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+struct aq_hw_s;</div><div class='add'>+</div><div class='add'>+/* Set TX Interrupt Moderation Control Register */</div><div class='add'>+void hw_atl2_reg_tx_intr_moder_ctrl_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					u32 tx_intr_moderation_ctl,</div><div class='add'>+					u32 queue);</div><div class='add'>+</div><div class='add'>+/* Set Redirection Table 2 Select */</div><div class='add'>+void hw_atl2_rpf_redirection_table2_select_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					       u32 select);</div><div class='add'>+</div><div class='add'>+/** Set RSS HASH type */</div><div class='add'>+void hw_atl2_rpf_rss_hash_type_set(struct aq_hw_s *aq_hw, u32 rss_hash_type);</div><div class='add'>+</div><div class='add'>+/* set new RPF enable */</div><div class='add'>+void hw_atl2_rpf_new_enable_set(struct aq_hw_s *aq_hw, u32 enable);</div><div class='add'>+</div><div class='add'>+/* set l2 unicast filter tag */</div><div class='add'>+void hw_atl2_rpfl2_uc_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag, u32 filter);</div><div class='add'>+</div><div class='add'>+/* set l2 broadcast filter tag */</div><div class='add'>+void hw_atl2_rpfl2_bc_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag);</div><div class='add'>+</div><div class='add'>+/* set new rss redirection table */</div><div class='add'>+void hw_atl2_new_rpf_rss_redir_set(struct aq_hw_s *aq_hw, u32 tc, u32 index,</div><div class='add'>+				   u32 queue);</div><div class='add'>+</div><div class='add'>+/* Set VLAN filter tag */</div><div class='add'>+void hw_atl2_rpf_vlan_flr_tag_set(struct aq_hw_s *aq_hw, u32 tag, u32 filter);</div><div class='add'>+</div><div class='add'>+/* set tx random TC-queue mapping enable bit */</div><div class='add'>+void hw_atl2_tpb_tx_tc_q_rand_map_en_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					 const u32 tc_q_rand_map_en);</div><div class='add'>+</div><div class='add'>+/* set tx buffer clock gate enable */</div><div class='add'>+void hw_atl2_tpb_tx_buf_clk_gate_en_set(struct aq_hw_s *aq_hw, u32 clk_gate_en);</div><div class='add'>+</div><div class='add'>+void hw_atl2_tps_tx_pkt_shed_data_arb_mode_set(struct aq_hw_s *aq_hw,</div><div class='add'>+					       const u32 data_arb_mode);</div><div class='add'>+</div><div class='add'>+/* set tx packet scheduler tc data max credit */</div><div class='add'>+void hw_atl2_tps_tx_pkt_shed_tc_data_max_credit_set(struct aq_hw_s *aq_hw,</div><div class='add'>+						    const u32 tc,</div><div class='add'>+						    const u32 max_credit);</div><div class='add'>+</div><div class='add'>+/* set tx packet scheduler tc data weight */</div><div class='add'>+void hw_atl2_tps_tx_pkt_shed_tc_data_weight_set(struct aq_hw_s *aq_hw,</div><div class='add'>+						const u32 tc,</div><div class='add'>+						const u32 weight);</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_get_hw_version(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+void hw_atl2_init_launchtime(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* set action resolver record */</div><div class='add'>+void hw_atl2_rpf_act_rslvr_record_set(struct aq_hw_s *aq_hw, u8 location,</div><div class='add'>+				      u32 tag, u32 mask, u32 action);</div><div class='add'>+</div><div class='add'>+/* set enable action resolver section */</div><div class='add'>+void hw_atl2_rpf_act_rslvr_section_en_set(struct aq_hw_s *aq_hw, u32 sections);</div><div class='add'>+</div><div class='add'>+/* get data from firmware shared input buffer */</div><div class='add'>+void hw_atl2_mif_shared_buf_get(struct aq_hw_s *aq_hw, int offset, u32 *data,</div><div class='add'>+				int len);</div><div class='add'>+</div><div class='add'>+/* set data into firmware shared input buffer */</div><div class='add'>+void hw_atl2_mif_shared_buf_write(struct aq_hw_s *aq_hw, int offset, u32 *data,</div><div class='add'>+				  int len);</div><div class='add'>+</div><div class='add'>+/* get data from firmware shared output buffer */</div><div class='add'>+void hw_atl2_mif_shared_buf_read(struct aq_hw_s *aq_hw, int offset, u32 *data,</div><div class='add'>+				 int len);</div><div class='add'>+</div><div class='add'>+/* set host finished write shared buffer indication */</div><div class='add'>+void hw_atl2_mif_host_finished_write_set(struct aq_hw_s *aq_hw, u32 finish);</div><div class='add'>+</div><div class='add'>+/* get mcp finished read shared buffer indication */</div><div class='add'>+u32 hw_atl2_mif_mcp_finished_read_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* get mcp boot register */</div><div class='add'>+u32 hw_atl2_mif_mcp_boot_reg_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* set mcp boot register */</div><div class='add'>+void hw_atl2_mif_mcp_boot_reg_set(struct aq_hw_s *aq_hw, u32 val);</div><div class='add'>+</div><div class='add'>+/* get host interrupt request */</div><div class='add'>+u32 hw_atl2_mif_host_req_int_get(struct aq_hw_s *aq_hw);</div><div class='add'>+</div><div class='add'>+/* clear host interrupt request */</div><div class='add'>+void hw_atl2_mif_host_req_int_clr(struct aq_hw_s *aq_hw, u32 val);</div><div class='add'>+</div><div class='add'>+#endif /* HW_ATL2_LLH_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h<br/>new file mode 100644<br/>index 000000000000..e34c5cda061e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_llh_internal.h</a></div><div class='hunk'>@@ -0,0 +1,391 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HW_ATL2_LLH_INTERNAL_H</div><div class='add'>+#define HW_ATL2_LLH_INTERNAL_H</div><div class='add'>+</div><div class='add'>+/* RX pif_rpf_redir_2_en_i Bitfield Definitions</div><div class='add'>+ * PORT="pif_rpf_redir_2_en_i"</div><div class='add'>+ */</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_ADR 0x000054C8</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_MSK 0x00001000</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_MSKN 0xFFFFEFFF</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_SHIFT 12</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_WIDTH 1</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_REDIR2_ENI_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* RX pif_rpf_rss_hash_type_i Bitfield Definitions</div><div class='add'>+ */</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_ADR 0x000054C8</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_MSK 0x000001FF</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_MSKN 0xFFFFFE00</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_SHIFT 0</div><div class='add'>+#define HW_ATL2_RPF_PIF_RPF_RSS_HASH_TYPEI_WIDTH 9</div><div class='add'>+</div><div class='add'>+/* rx rpf_new_rpf_en bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "rpf_new_rpf_en_i".</div><div class='add'>+ * port="pif_rpf_new_rpf_en_i</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield rpf_new_rpf_en */</div><div class='add'>+#define HW_ATL2_RPF_NEW_EN_ADR 0x00005104</div><div class='add'>+/* bitmask for bitfield rpf_new_rpf_en */</div><div class='add'>+#define HW_ATL2_RPF_NEW_EN_MSK 0x00000800</div><div class='add'>+/* inverted bitmask for bitfield rpf_new_rpf_en */</div><div class='add'>+#define HW_ATL2_RPF_NEW_EN_MSKN 0xfffff7ff</div><div class='add'>+/* lower bit position of bitfield rpf_new_rpf_en */</div><div class='add'>+#define HW_ATL2_RPF_NEW_EN_SHIFT 11</div><div class='add'>+/* width of bitfield rpf_new_rpf_en */</div><div class='add'>+#define HW_ATL2_RPF_NEW_EN_WIDTH 1</div><div class='add'>+/* default value of bitfield rpf_new_rpf_en */</div><div class='add'>+#define HW_ATL2_RPF_NEW_EN_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* rx l2_uc_req_tag0{f}[5:0] bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "l2_uc_req_tag0{f}[7:0]".</div><div class='add'>+ * parameter: filter {f} | stride size 0x8 | range [0, 37]</div><div class='add'>+ * port="pif_rpf_l2_uc_req_tag0[5:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield l2_uc_req_tag0{f}[2:0] */</div><div class='add'>+#define HW_ATL2_RPFL2UC_TAG_ADR(filter) (0x00005114 + (filter) * 0x8)</div><div class='add'>+/* bitmask for bitfield l2_uc_req_tag0{f}[2:0] */</div><div class='add'>+#define HW_ATL2_RPFL2UC_TAG_MSK 0x0FC00000</div><div class='add'>+/* inverted bitmask for bitfield l2_uc_req_tag0{f}[2:0] */</div><div class='add'>+#define HW_ATL2_RPFL2UC_TAG_MSKN 0xF03FFFFF</div><div class='add'>+/* lower bit position of bitfield l2_uc_req_tag0{f}[2:0] */</div><div class='add'>+#define HW_ATL2_RPFL2UC_TAG_SHIFT 22</div><div class='add'>+/* width of bitfield l2_uc_req_tag0{f}[2:0] */</div><div class='add'>+#define HW_ATL2_RPFL2UC_TAG_WIDTH 6</div><div class='add'>+/* default value of bitfield l2_uc_req_tag0{f}[2:0] */</div><div class='add'>+#define HW_ATL2_RPFL2UC_TAG_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* rpf_l2_bc_req_tag[5:0] bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "rpf_l2_bc_req_tag[5:0]".</div><div class='add'>+ * port="pifrpf_l2_bc_req_tag_i[5:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield rpf_l2_bc_req_tag */</div><div class='add'>+#define HW_ATL2_RPF_L2_BC_TAG_ADR 0x000050F0</div><div class='add'>+/* bitmask for bitfield rpf_l2_bc_req_tag */</div><div class='add'>+#define HW_ATL2_RPF_L2_BC_TAG_MSK 0x0000003F</div><div class='add'>+/* inverted bitmask for bitfield rpf_l2_bc_req_tag */</div><div class='add'>+#define HW_ATL2_RPF_L2_BC_TAG_MSKN 0xffffffc0</div><div class='add'>+/* lower bit position of bitfield rpf_l2_bc_req_tag */</div><div class='add'>+#define HW_ATL2_RPF_L2_BC_TAG_SHIFT 0</div><div class='add'>+/* width of bitfield rpf_l2_bc_req_tag */</div><div class='add'>+#define HW_ATL2_RPF_L2_BC_TAG_WIDTH 6</div><div class='add'>+/* default value of bitfield rpf_l2_bc_req_tag */</div><div class='add'>+#define HW_ATL2_RPF_L2_BC_TAG_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* rx rpf_rss_red1_data_[4:0] bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "rpf_rss_red1_data[4:0]".</div><div class='add'>+ * port="pif_rpf_rss_red1_data_i[4:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield rpf_rss_red1_data[4:0] */</div><div class='add'>+#define HW_ATL2_RPF_RSS_REDIR_ADR(TC, INDEX) (0x00006200 + \</div><div class='add'>+					(0x100 * !!((TC) &gt; 3)) + (INDEX) * 4)</div><div class='add'>+/* bitmask for bitfield rpf_rss_red1_data[4:0] */</div><div class='add'>+#define HW_ATL2_RPF_RSS_REDIR_MSK(TC)  (0x00000001F &lt;&lt; (5 * ((TC) % 4)))</div><div class='add'>+/* lower bit position of bitfield rpf_rss_red1_data[4:0] */</div><div class='add'>+#define HW_ATL2_RPF_RSS_REDIR_SHIFT(TC) (5 * ((TC) % 4))</div><div class='add'>+/* width of bitfield rpf_rss_red1_data[4:0] */</div><div class='add'>+#define HW_ATL2_RPF_RSS_REDIR_WIDTH 5</div><div class='add'>+/* default value of bitfield rpf_rss_red1_data[4:0] */</div><div class='add'>+#define HW_ATL2_RPF_RSS_REDIR_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* rx vlan_req_tag0{f}[3:0] bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "vlan_req_tag0{f}[3:0]".</div><div class='add'>+ * parameter: filter {f} | stride size 0x4 | range [0, 15]</div><div class='add'>+ * port="pif_rpf_vlan_req_tag0[3:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield vlan_req_tag0{f}[3:0] */</div><div class='add'>+#define HW_ATL2_RPF_VL_TAG_ADR(filter) (0x00005290 + (filter) * 0x4)</div><div class='add'>+/* bitmask for bitfield vlan_req_tag0{f}[3:0] */</div><div class='add'>+#define HW_ATL2_RPF_VL_TAG_MSK 0x0000F000</div><div class='add'>+/* inverted bitmask for bitfield vlan_req_tag0{f}[3:0] */</div><div class='add'>+#define HW_ATL2_RPF_VL_TAG_MSKN 0xFFFF0FFF</div><div class='add'>+/* lower bit position of bitfield vlan_req_tag0{f}[3:0] */</div><div class='add'>+#define HW_ATL2_RPF_VL_TAG_SHIFT 12</div><div class='add'>+/* width of bitfield vlan_req_tag0{f}[3:0] */</div><div class='add'>+#define HW_ATL2_RPF_VL_TAG_WIDTH 4</div><div class='add'>+/* default value of bitfield vlan_req_tag0{f}[3:0] */</div><div class='add'>+#define HW_ATL2_RPF_VL_TAG_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* RX rx_q{Q}_tc_map[2:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "rx_q{Q}_tc_map[2:0]".</div><div class='add'>+ * Parameter: Queue {Q} | bit-level stride | range [0, 31]</div><div class='add'>+ * PORT="pif_rx_q0_tc_map_i[2:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield rx_q{Q}_tc_map[2:0] */</div><div class='add'>+#define HW_ATL2_RX_Q_TC_MAP_ADR(queue) \</div><div class='add'>+	(((queue) &lt; 32) ? 0x00005900 + ((queue) / 8) * 4 : 0)</div><div class='add'>+/* Lower bit position of bitfield rx_q{Q}_tc_map[2:0] */</div><div class='add'>+#define HW_ATL2_RX_Q_TC_MAP_SHIFT(queue) \</div><div class='add'>+	(((queue) &lt; 32) ? ((queue) * 4) % 32 : 0)</div><div class='add'>+/* Width of bitfield rx_q{Q}_tc_map[2:0] */</div><div class='add'>+#define HW_ATL2_RX_Q_TC_MAP_WIDTH 3</div><div class='add'>+/* Default value of bitfield rx_q{Q}_tc_map[2:0] */</div><div class='add'>+#define HW_ATL2_RX_Q_TC_MAP_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx tx_tc_q_rand_map_en bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "tx_tc_q_rand_map_en".</div><div class='add'>+ * port="pif_tpb_tx_tc_q_rand_map_en_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield tx_tc_q_rand_map_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_ADR 0x00007900</div><div class='add'>+/* bitmask for bitfield tx_tc_q_rand_map_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_MSK 0x00000200</div><div class='add'>+/* inverted bitmask for bitfield tx_tc_q_rand_map_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_MSKN 0xFFFFFDFF</div><div class='add'>+/* lower bit position of bitfield tx_tc_q_rand_map_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_SHIFT 9</div><div class='add'>+/* width of bitfield tx_tc_q_rand_map_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_WIDTH 1</div><div class='add'>+/* default value of bitfield tx_tc_q_rand_map_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_TC_Q_RAND_MAP_EN_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx tx_buffer_clk_gate_en bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "tx_buffer_clk_gate_en".</div><div class='add'>+ * port="pif_tpb_tx_buffer_clk_gate_en_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield tx_buffer_clk_gate_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_ADR 0x00007900</div><div class='add'>+/* bitmask for bitfield tx_buffer_clk_gate_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_MSK 0x00000020</div><div class='add'>+/* inverted bitmask for bitfield tx_buffer_clk_gate_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_MSKN 0xffffffdf</div><div class='add'>+/* lower bit position of bitfield tx_buffer_clk_gate_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_SHIFT 5</div><div class='add'>+/* width of bitfield tx_buffer_clk_gate_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_WIDTH 1</div><div class='add'>+/* default value of bitfield tx_buffer_clk_gate_en */</div><div class='add'>+#define HW_ATL2_TPB_TX_BUF_CLK_GATE_EN_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx tx_q_tc_map{q} bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "tx_q_tc_map{q}".</div><div class='add'>+ * parameter: queue {q} | bit-level stride | range [0, 31]</div><div class='add'>+ * port="pif_tpb_tx_q_tc_map0_i[2:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield tx_q_tc_map{q} */</div><div class='add'>+#define HW_ATL2_TX_Q_TC_MAP_ADR(queue) \</div><div class='add'>+	(((queue) &lt; 32) ? 0x0000799C + ((queue) / 4) * 4 : 0)</div><div class='add'>+/* lower bit position of bitfield tx_q_tc_map{q} */</div><div class='add'>+#define HW_ATL2_TX_Q_TC_MAP_SHIFT(queue) \</div><div class='add'>+	(((queue) &lt; 32) ? ((queue) * 8) % 32 : 0)</div><div class='add'>+/* width of bitfield tx_q_tc_map{q} */</div><div class='add'>+#define HW_ATL2_TX_Q_TC_MAP_WIDTH 3</div><div class='add'>+/* default value of bitfield tx_q_tc_map{q} */</div><div class='add'>+#define HW_ATL2_TX_Q_TC_MAP_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx data_tc_arb_mode bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "data_tc_arb_mode".</div><div class='add'>+ * port="pif_tps_data_tc_arb_mode_i"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield data_tc_arb_mode */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TC_ARB_MODE_ADR 0x00007100</div><div class='add'>+/* bitmask for bitfield data_tc_arb_mode */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TC_ARB_MODE_MSK 0x00000003</div><div class='add'>+/* inverted bitmask for bitfield data_tc_arb_mode */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TC_ARB_MODE_MSKN 0xfffffffc</div><div class='add'>+/* lower bit position of bitfield data_tc_arb_mode */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TC_ARB_MODE_SHIFT 0</div><div class='add'>+/* width of bitfield data_tc_arb_mode */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TC_ARB_MODE_WIDTH 2</div><div class='add'>+/* default value of bitfield data_tc_arb_mode */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TC_ARB_MODE_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx data_tc{t}_credit_max[f:0] bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "data_tc{t}_credit_max[f:0]".</div><div class='add'>+ * parameter: tc {t} | stride size 0x4 | range [0, 7]</div><div class='add'>+ * port="pif_tps_data_tc0_credit_max_i[15:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield data_tc{t}_credit_max[f:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTCREDIT_MAX_ADR(tc) (0x00007110 + (tc) * 0x4)</div><div class='add'>+/* bitmask for bitfield data_tc{t}_credit_max[f:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTCREDIT_MAX_MSK 0xffff0000</div><div class='add'>+/* inverted bitmask for bitfield data_tc{t}_credit_max[f:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTCREDIT_MAX_MSKN 0x0000ffff</div><div class='add'>+/* lower bit position of bitfield data_tc{t}_credit_max[f:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTCREDIT_MAX_SHIFT 16</div><div class='add'>+/* width of bitfield data_tc{t}_credit_max[f:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTCREDIT_MAX_WIDTH 16</div><div class='add'>+/* default value of bitfield data_tc{t}_credit_max[f:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTCREDIT_MAX_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx data_tc{t}_weight[e:0] bitfield definitions</div><div class='add'>+ * preprocessor definitions for the bitfield "data_tc{t}_weight[e:0]".</div><div class='add'>+ * parameter: tc {t} | stride size 0x4 | range [0, 7]</div><div class='add'>+ * port="pif_tps_data_tc0_weight_i[14:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* register address for bitfield data_tc{t}_weight[e:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTWEIGHT_ADR(tc) (0x00007110 + (tc) * 0x4)</div><div class='add'>+/* bitmask for bitfield data_tc{t}_weight[e:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTWEIGHT_MSK 0x00007fff</div><div class='add'>+/* inverted bitmask for bitfield data_tc{t}_weight[e:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTWEIGHT_MSKN 0xffff8000</div><div class='add'>+/* lower bit position of bitfield data_tc{t}_weight[e:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTWEIGHT_SHIFT 0</div><div class='add'>+/* width of bitfield data_tc{t}_weight[e:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTWEIGHT_WIDTH 15</div><div class='add'>+/* default value of bitfield data_tc{t}_weight[e:0] */</div><div class='add'>+#define HW_ATL2_TPS_DATA_TCTWEIGHT_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* tx interrupt moderation control register definitions</div><div class='add'>+ * Preprocessor definitions for TX Interrupt Moderation Control Register</div><div class='add'>+ * Base Address: 0x00007c28</div><div class='add'>+ * Parameter: queue {Q} | stride size 0x4 | range [0, 31]</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_TX_INTR_MODERATION_CTL_ADR(queue) (0x00007c28u + (queue) * 0x40)</div><div class='add'>+</div><div class='add'>+/* Launch time control register */</div><div class='add'>+#define HW_ATL2_LT_CTRL_ADR 0x00007a1c</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_LT_CTRL_AVB_LEN_CMP_TRSHLD_MSK 0xFFFF0000</div><div class='add'>+#define HW_ATL2_LT_CTRL_AVB_LEN_CMP_TRSHLD_SHIFT 16</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_LT_CTRL_CLK_RATIO_MSK 0x0000FF00</div><div class='add'>+#define HW_ATL2_LT_CTRL_CLK_RATIO_SHIFT 8</div><div class='add'>+#define HW_ATL2_LT_CTRL_CLK_RATIO_QUATER_SPEED 4</div><div class='add'>+#define HW_ATL2_LT_CTRL_CLK_RATIO_HALF_SPEED 2</div><div class='add'>+#define HW_ATL2_LT_CTRL_CLK_RATIO_FULL_SPEED 1</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_LT_CTRL_25G_MODE_SUPPORT_MSK 0x00000008</div><div class='add'>+#define HW_ATL2_LT_CTRL_25G_MODE_SUPPORT_SHIFT 3</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_LT_CTRL_LINK_SPEED_MSK 0x00000007</div><div class='add'>+#define HW_ATL2_LT_CTRL_LINK_SPEED_SHIFT 0</div><div class='add'>+</div><div class='add'>+/* FPGA VER register */</div><div class='add'>+#define HW_ATL2_FPGA_VER_ADR 0x000000f4</div><div class='add'>+#define HW_ATL2_FPGA_VER_U32(mj, mi, bl, rv) \</div><div class='add'>+	((((mj) &amp; 0xff) &lt;&lt; 24) | \</div><div class='add'>+	 (((mi) &amp; 0xff) &lt;&lt; 16) | \</div><div class='add'>+	 (((bl) &amp; 0xff) &lt;&lt; 8) | \</div><div class='add'>+	 (((rv) &amp; 0xff) &lt;&lt; 0))</div><div class='add'>+</div><div class='add'>+/* ahb_mem_addr{f}[31:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "ahb_mem_addr{f}[31:0]".</div><div class='add'>+ * Parameter: filter {f} | stride size 0x10 | range [0, 127]</div><div class='add'>+ * PORT="ahb_mem_addr{f}[31:0]"</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_ADR(filter) \</div><div class='add'>+	(0x00014000u + (filter) * 0x10)</div><div class='add'>+/* Bitmask for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_MSK 0xFFFFFFFFu</div><div class='add'>+/* Inverted bitmask for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_MSKN 0x00000000u</div><div class='add'>+/* Lower bit position of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_SHIFT 0</div><div class='add'>+/* Width of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_WIDTH 31</div><div class='add'>+/* Default value of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_REQ_TAG_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_ADR(filter) \</div><div class='add'>+	(0x00014004u + (filter) * 0x10)</div><div class='add'>+/* Bitmask for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_MSK 0xFFFFFFFFu</div><div class='add'>+/* Inverted bitmask for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_MSKN 0x00000000u</div><div class='add'>+/* Lower bit position of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_SHIFT 0</div><div class='add'>+/* Width of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_WIDTH 31</div><div class='add'>+/* Default value of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_TAG_MASK_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_ACTN_ADR(filter) \</div><div class='add'>+	(0x00014008u + (filter) * 0x10)</div><div class='add'>+/* Bitmask for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_ACTN_MSK 0x000007FFu</div><div class='add'>+/* Inverted bitmask for bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_ACTN_MSKN 0xFFFFF800u</div><div class='add'>+/* Lower bit position of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_ACTN_SHIFT 0</div><div class='add'>+/* Width of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_ACTN_WIDTH 10</div><div class='add'>+/* Default value of bitfield ahb_mem_addr{f}[31:0] */</div><div class='add'>+#define HW_ATL2_RPF_ACT_RSLVR_ACTN_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* rpf_rec_tab_en[15:0] Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "rpf_rec_tab_en[15:0]".</div><div class='add'>+ * PORT="pif_rpf_rec_tab_en[15:0]"</div><div class='add'>+ */</div><div class='add'>+/* Register address for bitfield rpf_rec_tab_en[15:0] */</div><div class='add'>+#define HW_ATL2_RPF_REC_TAB_EN_ADR 0x00006ff0u</div><div class='add'>+/* Bitmask for bitfield rpf_rec_tab_en[15:0] */</div><div class='add'>+#define HW_ATL2_RPF_REC_TAB_EN_MSK 0x0000FFFFu</div><div class='add'>+/* Inverted bitmask for bitfield rpf_rec_tab_en[15:0] */</div><div class='add'>+#define HW_ATL2_RPF_REC_TAB_EN_MSKN 0xFFFF0000u</div><div class='add'>+/* Lower bit position of bitfield rpf_rec_tab_en[15:0] */</div><div class='add'>+#define HW_ATL2_RPF_REC_TAB_EN_SHIFT 0</div><div class='add'>+/* Width of bitfield rpf_rec_tab_en[15:0] */</div><div class='add'>+#define HW_ATL2_RPF_REC_TAB_EN_WIDTH 16</div><div class='add'>+/* Default value of bitfield rpf_rec_tab_en[15:0] */</div><div class='add'>+#define HW_ATL2_RPF_REC_TAB_EN_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* Register address for firmware shared input buffer */</div><div class='add'>+#define HW_ATL2_MIF_SHARED_BUFFER_IN_ADR(dword) (0x00012000U + (dword) * 0x4U)</div><div class='add'>+/* Register address for firmware shared output buffer */</div><div class='add'>+#define HW_ATL2_MIF_SHARED_BUFFER_OUT_ADR(dword) (0x00013000U + (dword) * 0x4U)</div><div class='add'>+</div><div class='add'>+/* pif_host_finished_buf_wr_i Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "pif_host_finished_buf_wr_i".</div><div class='add'>+ * PORT="pif_host_finished_buf_wr_i"</div><div class='add'>+ */</div><div class='add'>+/* Register address for bitfield rpif_host_finished_buf_wr_i */</div><div class='add'>+#define HW_ATL2_MIF_HOST_FINISHED_WRITE_ADR 0x00000e00u</div><div class='add'>+/* Bitmask for bitfield pif_host_finished_buf_wr_i */</div><div class='add'>+#define HW_ATL2_MIF_HOST_FINISHED_WRITE_MSK 0x00000001u</div><div class='add'>+/* Inverted bitmask for bitfield pif_host_finished_buf_wr_i */</div><div class='add'>+#define HW_ATL2_MIF_HOST_FINISHED_WRITE_MSKN 0xFFFFFFFEu</div><div class='add'>+/* Lower bit position of bitfield pif_host_finished_buf_wr_i */</div><div class='add'>+#define HW_ATL2_MIF_HOST_FINISHED_WRITE_SHIFT 0</div><div class='add'>+/* Width of bitfield pif_host_finished_buf_wr_i */</div><div class='add'>+#define HW_ATL2_MIF_HOST_FINISHED_WRITE_WIDTH 1</div><div class='add'>+/* Default value of bitfield pif_host_finished_buf_wr_i */</div><div class='add'>+#define HW_ATL2_MIF_HOST_FINISHED_WRITE_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* pif_mcp_finished_buf_rd_i Bitfield Definitions</div><div class='add'>+ * Preprocessor definitions for the bitfield "pif_mcp_finished_buf_rd_i".</div><div class='add'>+ * PORT="pif_mcp_finished_buf_rd_i"</div><div class='add'>+ */</div><div class='add'>+/* Register address for bitfield pif_mcp_finished_buf_rd_i */</div><div class='add'>+#define HW_ATL2_MIF_MCP_FINISHED_READ_ADR 0x00000e04u</div><div class='add'>+/* Bitmask for bitfield pif_mcp_finished_buf_rd_i */</div><div class='add'>+#define HW_ATL2_MIF_MCP_FINISHED_READ_MSK 0x00000001u</div><div class='add'>+/* Inverted bitmask for bitfield pif_mcp_finished_buf_rd_i */</div><div class='add'>+#define HW_ATL2_MIF_MCP_FINISHED_READ_MSKN 0xFFFFFFFEu</div><div class='add'>+/* Lower bit position of bitfield pif_mcp_finished_buf_rd_i */</div><div class='add'>+#define HW_ATL2_MIF_MCP_FINISHED_READ_SHIFT 0</div><div class='add'>+/* Width of bitfield pif_mcp_finished_buf_rd_i */</div><div class='add'>+#define HW_ATL2_MIF_MCP_FINISHED_READ_WIDTH 1</div><div class='add'>+/* Default value of bitfield pif_mcp_finished_buf_rd_i */</div><div class='add'>+#define HW_ATL2_MIF_MCP_FINISHED_READ_DEFAULT 0x0</div><div class='add'>+</div><div class='add'>+/* Register address for bitfield pif_mcp_boot_reg */</div><div class='add'>+#define HW_ATL2_MIF_BOOT_REG_ADR 0x00003040u</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_MCP_HOST_REQ_INT_READY BIT(0)</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_MCP_HOST_REQ_INT_ADR 0x00000F00u</div><div class='add'>+#define HW_ATL2_MCP_HOST_REQ_INT_SET_ADR 0x00000F04u</div><div class='add'>+#define HW_ATL2_MCP_HOST_REQ_INT_CLR_ADR 0x00000F08u</div><div class='add'>+</div><div class='add'>+#endif /* HW_ATL2_LLH_INTERNAL_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c<br/>new file mode 100644<br/>index 000000000000..0fe6257d9c08<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.c</a></div><div class='hunk'>@@ -0,0 +1,130 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='add'>+#include "hw_atl/hw_atl_utils.h"</div><div class='add'>+#include "hw_atl2_utils.h"</div><div class='add'>+#include "hw_atl2_llh.h"</div><div class='add'>+#include "hw_atl2_llh_internal.h"</div><div class='add'>+</div><div class='add'>+#define HW_ATL2_FW_VER_1X          0x01000000U</div><div class='add'>+</div><div class='add'>+#define AQ_A2_BOOT_STARTED         BIT(0x18)</div><div class='add'>+#define AQ_A2_CRASH_INIT           BIT(0x1B)</div><div class='add'>+#define AQ_A2_BOOT_CODE_FAILED     BIT(0x1C)</div><div class='add'>+#define AQ_A2_FW_INIT_FAILED       BIT(0x1D)</div><div class='add'>+#define AQ_A2_FW_INIT_COMP_SUCCESS BIT(0x1F)</div><div class='add'>+</div><div class='add'>+#define AQ_A2_FW_BOOT_FAILED_MASK (AQ_A2_CRASH_INIT | \</div><div class='add'>+				   AQ_A2_BOOT_CODE_FAILED | \</div><div class='add'>+				   AQ_A2_FW_INIT_FAILED)</div><div class='add'>+#define AQ_A2_FW_BOOT_COMPLETE_MASK (AQ_A2_FW_BOOT_FAILED_MASK | \</div><div class='add'>+				     AQ_A2_FW_INIT_COMP_SUCCESS)</div><div class='add'>+</div><div class='add'>+#define AQ_A2_FW_BOOT_REQ_REBOOT        BIT(0x0)</div><div class='add'>+#define AQ_A2_FW_BOOT_REQ_HOST_BOOT     BIT(0x8)</div><div class='add'>+#define AQ_A2_FW_BOOT_REQ_MAC_FAST_BOOT BIT(0xA)</div><div class='add'>+#define AQ_A2_FW_BOOT_REQ_PHY_FAST_BOOT BIT(0xB)</div><div class='add'>+</div><div class='add'>+int hw_atl2_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	self-&gt;fw_ver_actual = hw_atl2_utils_get_fw_version(self);</div><div class='add'>+</div><div class='add'>+	if (hw_atl_utils_ver_match(HW_ATL2_FW_VER_1X, self-&gt;fw_ver_actual)) {</div><div class='add'>+		*fw_ops = &amp;aq_a2_fw_ops;</div><div class='add'>+	} else {</div><div class='add'>+		aq_pr_err("Bad FW version detected: %x, but continue\n",</div><div class='add'>+			  self-&gt;fw_ver_actual);</div><div class='add'>+		*fw_ops = &amp;aq_a2_fw_ops;</div><div class='add'>+	}</div><div class='add'>+	aq_pr_trace("Detect ATL2FW %x\n", self-&gt;fw_ver_actual);</div><div class='add'>+	self-&gt;aq_fw_ops = *fw_ops;</div><div class='add'>+	err = self-&gt;aq_fw_ops-&gt;init(self);</div><div class='add'>+</div><div class='add'>+	self-&gt;chip_features |= ATL_HW_CHIP_ANTIGUA;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool hw_atl2_mcp_boot_complete(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	u32 rbl_status;</div><div class='add'>+</div><div class='add'>+	rbl_status = hw_atl2_mif_mcp_boot_reg_get(self);</div><div class='add'>+	if (rbl_status &amp; AQ_A2_FW_BOOT_COMPLETE_MASK)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	/* Host boot requested */</div><div class='add'>+	if (hw_atl2_mif_host_req_int_get(self) &amp; HW_ATL2_MCP_HOST_REQ_INT_READY)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hw_atl2_utils_soft_reset(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	bool rbl_complete = false;</div><div class='add'>+	u32 rbl_status = 0;</div><div class='add'>+	u32 rbl_request;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl2_mif_host_req_int_clr(self, 0x01);</div><div class='add'>+	rbl_request = AQ_A2_FW_BOOT_REQ_REBOOT;</div><div class='add'>+#ifdef AQ_CFG_FAST_START</div><div class='add'>+	rbl_request |= AQ_A2_FW_BOOT_REQ_MAC_FAST_BOOT;</div><div class='add'>+#endif</div><div class='add'>+	hw_atl2_mif_mcp_boot_reg_set(self, rbl_request);</div><div class='add'>+</div><div class='add'>+	/* Wait for RBL boot */</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl2_mif_mcp_boot_reg_get, self,</div><div class='add'>+				rbl_status,</div><div class='add'>+				((rbl_status &amp; AQ_A2_BOOT_STARTED) &amp;&amp;</div><div class='add'>+				 (rbl_status != 0xFFFFFFFFu)),</div><div class='add'>+				10, 200000);</div><div class='add'>+	if (err) {</div><div class='add'>+		aq_pr_err("Boot code hanged");</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl2_mcp_boot_complete, self,</div><div class='add'>+					rbl_complete,</div><div class='add'>+					rbl_complete,</div><div class='add'>+					10, 2000000);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		aq_pr_err("FW Restart timed out");</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rbl_status = hw_atl2_mif_mcp_boot_reg_get(self);</div><div class='add'>+</div><div class='add'>+	if (rbl_status &amp; AQ_A2_FW_BOOT_FAILED_MASK) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		aq_pr_err("FW Restart failed");</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw_atl2_mif_host_req_int_get(self) &amp;</div><div class='add'>+	    HW_ATL2_MCP_HOST_REQ_INT_READY) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		aq_pr_err("No FW detected. Dynamic FW load not implemented");</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_fw_ops) {</div><div class='add'>+		err = self-&gt;aq_fw_ops-&gt;init(self);</div><div class='add'>+		if (err) {</div><div class='add'>+			aq_pr_err("FW Init failed");</div><div class='add'>+			goto err_exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err_exit:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h<br/>new file mode 100644<br/>index 000000000000..6bad64c77b87<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h</a></div><div class='hunk'>@@ -0,0 +1,636 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef HW_ATL2_UTILS_H</div><div class='add'>+#define HW_ATL2_UTILS_H</div><div class='add'>+</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+</div><div class='add'>+/* F W    A P I */</div><div class='add'>+</div><div class='add'>+struct link_options_s {</div><div class='add'>+	u8 link_up:1;</div><div class='add'>+	u8 link_renegotiate:1;</div><div class='add'>+	u8 minimal_link_speed:1;</div><div class='add'>+	u8 internal_loopback:1;</div><div class='add'>+	u8 external_loopback:1;</div><div class='add'>+	u8 rate_10M_hd:1;</div><div class='add'>+	u8 rate_100M_hd:1;</div><div class='add'>+	u8 rate_1G_hd:1;</div><div class='add'>+</div><div class='add'>+	u8 rate_10M:1;</div><div class='add'>+	u8 rate_100M:1;</div><div class='add'>+	u8 rate_1G:1;</div><div class='add'>+	u8 rate_2P5G:1;</div><div class='add'>+	u8 rate_N2P5G:1;</div><div class='add'>+	u8 rate_5G:1;</div><div class='add'>+	u8 rate_N5G:1;</div><div class='add'>+	u8 rate_10G:1;</div><div class='add'>+</div><div class='add'>+	u8 eee_100M:1;</div><div class='add'>+	u8 eee_1G:1;</div><div class='add'>+	u8 eee_2P5G:1;</div><div class='add'>+	u8 eee_5G:1;</div><div class='add'>+	u8 eee_10G:1;</div><div class='add'>+	u8 rsvd3:3;</div><div class='add'>+</div><div class='add'>+	u8 pause_rx:1;</div><div class='add'>+	u8 pause_tx:1;</div><div class='add'>+	u8 rsvd4:1;</div><div class='add'>+	u8 downshift:1;</div><div class='add'>+	u8 downshift_retry:4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct link_control_s {</div><div class='add'>+	u8 mode:4;</div><div class='add'>+	u8 disable_crc_corruption:1;</div><div class='add'>+	u8 discard_short_frames:1;</div><div class='add'>+	u8 flow_control_mode:1;</div><div class='add'>+	u8 disable_length_check:1;</div><div class='add'>+</div><div class='add'>+	u8 discard_errored_frames:1;</div><div class='add'>+	u8 control_frame_enable:1;</div><div class='add'>+	u8 enable_tx_padding:1;</div><div class='add'>+	u8 enable_crc_forwarding:1;</div><div class='add'>+	u8 enable_frame_padding_removal_rx: 1;</div><div class='add'>+	u8 promiscuous_mode: 1;</div><div class='add'>+	u8 rsvd:2;</div><div class='add'>+</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct thermal_shutdown_s {</div><div class='add'>+	u8 enable:1;</div><div class='add'>+	u8 warning_enable:1;</div><div class='add'>+	u8 rsvd:6;</div><div class='add'>+</div><div class='add'>+	u8 shutdown_temperature;</div><div class='add'>+	u8 cold_temperature;</div><div class='add'>+	u8 warning_temperature;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mac_address_s {</div><div class='add'>+	u8 mac_address[6];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mac_address_aligned_s {</div><div class='add'>+	struct mac_address_s aligned;</div><div class='add'>+	u16 rsvd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sleep_proxy_s {</div><div class='add'>+	struct wake_on_lan_s {</div><div class='add'>+		u8 wake_on_magic_packet:1;</div><div class='add'>+		u8 wake_on_pattern:1;</div><div class='add'>+		u8 wake_on_link_up:1;</div><div class='add'>+		u8 wake_on_link_down:1;</div><div class='add'>+		u8 wake_on_ping:1;</div><div class='add'>+		u8 wake_on_timer:1;</div><div class='add'>+		u8 rsvd:2;</div><div class='add'>+</div><div class='add'>+		u8 rsvd2;</div><div class='add'>+		u16 rsvd3;</div><div class='add'>+</div><div class='add'>+		u32 link_up_timeout;</div><div class='add'>+		u32 link_down_timeout;</div><div class='add'>+		u32 timer;</div><div class='add'>+	} wake_on_lan;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 mask[4];</div><div class='add'>+		u32 crc32;</div><div class='add'>+	} wake_up_pattern[8];</div><div class='add'>+</div><div class='add'>+	struct __packed {</div><div class='add'>+		u8 arp_responder:1;</div><div class='add'>+		u8 echo_responder:1;</div><div class='add'>+		u8 igmp_client:1;</div><div class='add'>+		u8 echo_truncate:1;</div><div class='add'>+		u8 address_guard:1;</div><div class='add'>+		u8 ignore_fragmented:1;</div><div class='add'>+		u8 rsvd:2;</div><div class='add'>+</div><div class='add'>+		u16 echo_max_len;</div><div class='add'>+		u8 rsvd2;</div><div class='add'>+	} ipv4_offload;</div><div class='add'>+</div><div class='add'>+	u32 ipv4_offload_addr[8];</div><div class='add'>+	u32 reserved[8];</div><div class='add'>+</div><div class='add'>+	struct __packed {</div><div class='add'>+		u8 ns_responder:1;</div><div class='add'>+		u8 echo_responder:1;</div><div class='add'>+		u8 mld_client:1;</div><div class='add'>+		u8 echo_truncate:1;</div><div class='add'>+		u8 address_guard:1;</div><div class='add'>+		u8 rsvd:3;</div><div class='add'>+</div><div class='add'>+		u16 echo_max_len;</div><div class='add'>+		u8 rsvd2;</div><div class='add'>+	} ipv6_offload;</div><div class='add'>+</div><div class='add'>+	u32 ipv6_offload_addr[16][4];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u16 port[16];</div><div class='add'>+	} tcp_port_offload;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u16 port[16];</div><div class='add'>+	} udp_port_offload;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 retry_count;</div><div class='add'>+		u32 retry_interval;</div><div class='add'>+	} ka4_offload;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 timeout;</div><div class='add'>+		u16 local_port;</div><div class='add'>+		u16 remote_port;</div><div class='add'>+		u8 remote_mac_addr[6];</div><div class='add'>+		u16 rsvd;</div><div class='add'>+		u32 rsvd2;</div><div class='add'>+		u32 rsvd3;</div><div class='add'>+		u16 rsvd4;</div><div class='add'>+		u16 win_size;</div><div class='add'>+		u32 seq_num;</div><div class='add'>+		u32 ack_num;</div><div class='add'>+		u32 local_ip;</div><div class='add'>+		u32 remote_ip;</div><div class='add'>+	} ka4_connection[16];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 retry_count;</div><div class='add'>+		u32 retry_interval;</div><div class='add'>+	} ka6_offload;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 timeout;</div><div class='add'>+		u16 local_port;</div><div class='add'>+		u16 remote_port;</div><div class='add'>+		u8 remote_mac_addr[6];</div><div class='add'>+		u16 rsvd;</div><div class='add'>+		u32 rsvd2;</div><div class='add'>+		u32 rsvd3;</div><div class='add'>+		u16 rsvd4;</div><div class='add'>+		u16 win_size;</div><div class='add'>+		u32 seq_num;</div><div class='add'>+		u32 ack_num;</div><div class='add'>+		u32 local_ip[4];</div><div class='add'>+		u32 remote_ip[4];</div><div class='add'>+	} ka6_connection[16];</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u32 rr_count;</div><div class='add'>+		u32 rr_buf_len;</div><div class='add'>+		u32 idx_offset;</div><div class='add'>+		u32 rr__offset;</div><div class='add'>+	} mdns_offload;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct pause_quanta_s {</div><div class='add'>+	u16 quanta_10M;</div><div class='add'>+	u16 threshold_10M;</div><div class='add'>+	u16 quanta_100M;</div><div class='add'>+	u16 threshold_100M;</div><div class='add'>+	u16 quanta_1G;</div><div class='add'>+	u16 threshold_1G;</div><div class='add'>+	u16 quanta_2P5G;</div><div class='add'>+	u16 threshold_2P5G;</div><div class='add'>+	u16 quanta_5G;</div><div class='add'>+	u16 threshold_5G;</div><div class='add'>+	u16 quanta_10G;</div><div class='add'>+	u16 threshold_10G;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct data_buffer_status_s {</div><div class='add'>+	u32 data_offset;</div><div class='add'>+	u32 data_length;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device_caps_s {</div><div class='add'>+	u8 finite_flashless:1;</div><div class='add'>+	u8 cable_diag:1;</div><div class='add'>+	u8 ncsi:1;</div><div class='add'>+	u8 avb:1;</div><div class='add'>+	u8 rsvd:4;</div><div class='add'>+</div><div class='add'>+	u8 rsvd2;</div><div class='add'>+	u16 rsvd3;</div><div class='add'>+	u32 rsvd4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct version_s {</div><div class='add'>+	struct bundle_version_t {</div><div class='add'>+		u8 major;</div><div class='add'>+		u8 minor;</div><div class='add'>+		u16 build;</div><div class='add'>+	} bundle;</div><div class='add'>+	struct mac_version_t {</div><div class='add'>+		u8 major;</div><div class='add'>+		u8 minor;</div><div class='add'>+		u16 build;</div><div class='add'>+	} mac;</div><div class='add'>+	struct phy_version_t {</div><div class='add'>+		u8 major;</div><div class='add'>+		u8 minor;</div><div class='add'>+		u16 build;</div><div class='add'>+	} phy;</div><div class='add'>+	u32 drv_iface_ver:4;</div><div class='add'>+	u32 rsvd:28;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct link_status_s {</div><div class='add'>+	u8 link_state:4;</div><div class='add'>+	u8 link_rate:4;</div><div class='add'>+</div><div class='add'>+	u8 pause_tx:1;</div><div class='add'>+	u8 pause_rx:1;</div><div class='add'>+	u8 eee:1;</div><div class='add'>+	u8 duplex:1;</div><div class='add'>+	u8 rsvd:4;</div><div class='add'>+</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct wol_status_s {</div><div class='add'>+	u8 wake_count;</div><div class='add'>+	u8 wake_reason;</div><div class='add'>+</div><div class='add'>+	u16 wake_up_packet_length :12;</div><div class='add'>+	u16 wake_up_pattern_number :3;</div><div class='add'>+	u16 rsvd:1;</div><div class='add'>+</div><div class='add'>+	u32 wake_up_packet[379];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mac_health_monitor_s {</div><div class='add'>+	u8 mac_ready:1;</div><div class='add'>+	u8 mac_fault:1;</div><div class='add'>+	u8 mac_flashless_finished:1;</div><div class='add'>+	u8 rsvd:5;</div><div class='add'>+</div><div class='add'>+	u8 mac_temperature;</div><div class='add'>+	u16 mac_heart_beat;</div><div class='add'>+	u16 mac_fault_code;</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct phy_health_monitor_s {</div><div class='add'>+	u8 phy_ready:1;</div><div class='add'>+	u8 phy_fault:1;</div><div class='add'>+	u8 phy_hot_warning:1;</div><div class='add'>+	u8 rsvd:5;</div><div class='add'>+</div><div class='add'>+	u8 phy_temperature;</div><div class='add'>+	u16 phy_heart_beat;</div><div class='add'>+	u16 phy_fault_code;</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct device_link_caps_s {</div><div class='add'>+	u8 rsvd:3;</div><div class='add'>+	u8 internal_loopback:1;</div><div class='add'>+	u8 external_loopback:1;</div><div class='add'>+	u8 rate_10M_hd:1;</div><div class='add'>+	u8 rate_100M_hd:1;</div><div class='add'>+	u8 rate_1G_hd:1;</div><div class='add'>+</div><div class='add'>+	u8 rate_10M:1;</div><div class='add'>+	u8 rate_100M:1;</div><div class='add'>+	u8 rate_1G:1;</div><div class='add'>+	u8 rate_2P5G:1;</div><div class='add'>+	u8 rate_N2P5G:1;</div><div class='add'>+	u8 rate_5G:1;</div><div class='add'>+	u8 rate_N5G:1;</div><div class='add'>+	u8 rate_10G:1;</div><div class='add'>+</div><div class='add'>+	u8 rsvd3:1;</div><div class='add'>+	u8 eee_100M:1;</div><div class='add'>+	u8 eee_1G:1;</div><div class='add'>+	u8 eee_2P5G:1;</div><div class='add'>+	u8 rsvd4:1;</div><div class='add'>+	u8 eee_5G:1;</div><div class='add'>+	u8 rsvd5:1;</div><div class='add'>+	u8 eee_10G:1;</div><div class='add'>+</div><div class='add'>+	u8 pause_rx:1;</div><div class='add'>+	u8 pause_tx:1;</div><div class='add'>+	u8 pfc:1;</div><div class='add'>+	u8 downshift:1;</div><div class='add'>+	u8 downshift_retry:4;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sleep_proxy_caps_s {</div><div class='add'>+	u8 ipv4_offload:1;</div><div class='add'>+	u8 ipv6_offload:1;</div><div class='add'>+	u8 tcp_port_offload:1;</div><div class='add'>+	u8 udp_port_offload:1;</div><div class='add'>+	u8 ka4_offload:1;</div><div class='add'>+	u8 ka6_offload:1;</div><div class='add'>+	u8 mdns_offload:1;</div><div class='add'>+	u8 wake_on_ping:1;</div><div class='add'>+</div><div class='add'>+	u8 wake_on_magic_packet:1;</div><div class='add'>+	u8 wake_on_pattern:1;</div><div class='add'>+	u8 wake_on_timer:1;</div><div class='add'>+	u8 wake_on_link:1;</div><div class='add'>+	u8 wake_patterns_count:4;</div><div class='add'>+</div><div class='add'>+	u8 ipv4_count;</div><div class='add'>+	u8 ipv6_count;</div><div class='add'>+</div><div class='add'>+	u8 tcp_port_offload_count;</div><div class='add'>+	u8 udp_port_offload_count;</div><div class='add'>+</div><div class='add'>+	u8 tcp4_ka_count;</div><div class='add'>+	u8 tcp6_ka_count;</div><div class='add'>+</div><div class='add'>+	u8 igmp_offload:1;</div><div class='add'>+	u8 mld_offload:1;</div><div class='add'>+	u8 rsvd:6;</div><div class='add'>+</div><div class='add'>+	u8 rsvd2;</div><div class='add'>+	u16 rsvd3;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct lkp_link_caps_s {</div><div class='add'>+	u8 rsvd:5;</div><div class='add'>+	u8 rate_10M_hd:1;</div><div class='add'>+	u8 rate_100M_hd:1;</div><div class='add'>+	u8 rate_1G_hd:1;</div><div class='add'>+</div><div class='add'>+	u8 rate_10M:1;</div><div class='add'>+	u8 rate_100M:1;</div><div class='add'>+	u8 rate_1G:1;</div><div class='add'>+	u8 rate_2P5G:1;</div><div class='add'>+	u8 rate_N2P5G:1;</div><div class='add'>+	u8 rate_5G:1;</div><div class='add'>+	u8 rate_N5G:1;</div><div class='add'>+	u8 rate_10G:1;</div><div class='add'>+</div><div class='add'>+	u8 rsvd2:1;</div><div class='add'>+	u8 eee_100M:1;</div><div class='add'>+	u8 eee_1G:1;</div><div class='add'>+	u8 eee_2P5G:1;</div><div class='add'>+	u8 rsvd3:1;</div><div class='add'>+	u8 eee_5G:1;</div><div class='add'>+	u8 rsvd4:1;</div><div class='add'>+	u8 eee_10G:1;</div><div class='add'>+</div><div class='add'>+	u8 pause_rx:1;</div><div class='add'>+	u8 pause_tx:1;</div><div class='add'>+	u8 rsvd5:6;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct core_dump_s {</div><div class='add'>+	u32 reg0;</div><div class='add'>+	u32 reg1;</div><div class='add'>+	u32 reg2;</div><div class='add'>+</div><div class='add'>+	u32 hi;</div><div class='add'>+	u32 lo;</div><div class='add'>+</div><div class='add'>+	u32 regs[32];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct trace_s {</div><div class='add'>+	u32 sync_counter;</div><div class='add'>+	u32 mem_buffer[0x1ff];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cable_diag_control_s {</div><div class='add'>+	u8 toggle :1;</div><div class='add'>+	u8 rsvd:7;</div><div class='add'>+</div><div class='add'>+	u8 wait_timeout_sec;</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cable_diag_lane_data_s {</div><div class='add'>+	u8 result_code;</div><div class='add'>+	u8 dist;</div><div class='add'>+	u8 far_dist;</div><div class='add'>+	u8 rsvd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cable_diag_status_s {</div><div class='add'>+	struct cable_diag_lane_data_s lane_data[4];</div><div class='add'>+	u8 transact_id;</div><div class='add'>+	u8 status:4;</div><div class='add'>+	u8 rsvd:4;</div><div class='add'>+	u16 rsvd2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct statistics_a0_s {</div><div class='add'>+	struct {</div><div class='add'>+		u32 link_up;</div><div class='add'>+		u32 link_down;</div><div class='add'>+	} link;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u64 tx_unicast_octets;</div><div class='add'>+		u64 tx_multicast_octets;</div><div class='add'>+		u64 tx_broadcast_octets;</div><div class='add'>+		u64 rx_unicast_octets;</div><div class='add'>+		u64 rx_multicast_octets;</div><div class='add'>+		u64 rx_broadcast_octets;</div><div class='add'>+</div><div class='add'>+		u32 tx_unicast_frames;</div><div class='add'>+		u32 tx_multicast_frames;</div><div class='add'>+		u32 tx_broadcast_frames;</div><div class='add'>+		u32 tx_errors;</div><div class='add'>+</div><div class='add'>+		u32 rx_unicast_frames;</div><div class='add'>+		u32 rx_multicast_frames;</div><div class='add'>+		u32 rx_broadcast_frames;</div><div class='add'>+		u32 rx_dropped_frames;</div><div class='add'>+		u32 rx_error_frames;</div><div class='add'>+</div><div class='add'>+		u32 tx_good_frames;</div><div class='add'>+		u32 rx_good_frames;</div><div class='add'>+		u32 reserve_fw_gap;</div><div class='add'>+	} msm;</div><div class='add'>+	u32 main_loop_cycles;</div><div class='add'>+	u32 reserve_fw_gap;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed statistics_b0_s {</div><div class='add'>+	u64 rx_good_octets;</div><div class='add'>+	u64 rx_pause_frames;</div><div class='add'>+	u64 rx_good_frames;</div><div class='add'>+	u64 rx_errors;</div><div class='add'>+	u64 rx_unicast_frames;</div><div class='add'>+	u64 rx_multicast_frames;</div><div class='add'>+	u64 rx_broadcast_frames;</div><div class='add'>+</div><div class='add'>+	u64 tx_good_octets;</div><div class='add'>+	u64 tx_pause_frames;</div><div class='add'>+	u64 tx_good_frames;</div><div class='add'>+	u64 tx_errors;</div><div class='add'>+	u64 tx_unicast_frames;</div><div class='add'>+	u64 tx_multicast_frames;</div><div class='add'>+	u64 tx_broadcast_frames;</div><div class='add'>+</div><div class='add'>+	u32 main_loop_cycles;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed statistics_s {</div><div class='add'>+	union __packed {</div><div class='add'>+		struct statistics_a0_s a0;</div><div class='add'>+		struct statistics_b0_s b0;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct filter_caps_s {</div><div class='add'>+	u8 l2_filters_base_index:6;</div><div class='add'>+	u8 flexible_filter_mask:2;</div><div class='add'>+	u8 l2_filter_count;</div><div class='add'>+	u8 ethertype_filter_base_index;</div><div class='add'>+	u8 ethertype_filter_count;</div><div class='add'>+</div><div class='add'>+	u8 vlan_filter_base_index;</div><div class='add'>+	u8 vlan_filter_count;</div><div class='add'>+	u8 l3_ip4_filter_base_index:4;</div><div class='add'>+	u8 l3_ip4_filter_count:4;</div><div class='add'>+	u8 l3_ip6_filter_base_index:4;</div><div class='add'>+	u8 l3_ip6_filter_count:4;</div><div class='add'>+</div><div class='add'>+	u8 l4_filter_base_index:4;</div><div class='add'>+	u8 l4_filter_count:4;</div><div class='add'>+	u8 l4_flex_filter_base_index:4;</div><div class='add'>+	u8 l4_flex_filter_count:4;</div><div class='add'>+	u8 rslv_tbl_base_index;</div><div class='add'>+	u8 rslv_tbl_count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct request_policy_s {</div><div class='add'>+	struct {</div><div class='add'>+		u8 all:1;</div><div class='add'>+		u8 mcast:1;</div><div class='add'>+		u8 rx_queue_tc_index:5;</div><div class='add'>+		u8 queue_or_tc:1;</div><div class='add'>+	} promisc;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 accept:1;</div><div class='add'>+		u8 rsvd:1;</div><div class='add'>+		u8 rx_queue_tc_index:5;</div><div class='add'>+		u8 queue_or_tc:1;</div><div class='add'>+	} bcast;</div><div class='add'>+</div><div class='add'>+	struct {</div><div class='add'>+		u8 accept:1;</div><div class='add'>+		u8 rsvd:1;</div><div class='add'>+		u8 rx_queue_tc_index:5;</div><div class='add'>+		u8 queue_or_tc:1;</div><div class='add'>+	} mcast;</div><div class='add'>+</div><div class='add'>+	u8 rsvd:8;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fw_interface_in {</div><div class='add'>+	u32 mtu;</div><div class='add'>+	u32 rsvd1;</div><div class='add'>+	struct mac_address_aligned_s mac_address;</div><div class='add'>+	struct link_control_s link_control;</div><div class='add'>+	u32 rsvd2;</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+	u32 rsvd3;</div><div class='add'>+	struct thermal_shutdown_s thermal_shutdown;</div><div class='add'>+	u32 rsvd4;</div><div class='add'>+	struct sleep_proxy_s sleep_proxy;</div><div class='add'>+	u32 rsvd5;</div><div class='add'>+	struct pause_quanta_s pause_quanta[8];</div><div class='add'>+	struct cable_diag_control_s cable_diag_control;</div><div class='add'>+	u32 rsvd6;</div><div class='add'>+	struct data_buffer_status_s data_buffer_status;</div><div class='add'>+	u32 rsvd7;</div><div class='add'>+	struct request_policy_s request_policy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct transaction_counter_s {</div><div class='add'>+	u16 transaction_cnt_a;</div><div class='add'>+	u16 transaction_cnt_b;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct management_status_s {</div><div class='add'>+	struct mac_address_s mac_address;</div><div class='add'>+	u16 vlan;</div><div class='add'>+</div><div class='add'>+	struct{</div><div class='add'>+		u32 enable : 1;</div><div class='add'>+		u32 rsvd:31;</div><div class='add'>+	} flags;</div><div class='add'>+</div><div class='add'>+	u32 rsvd1;</div><div class='add'>+	u32 rsvd2;</div><div class='add'>+	u32 rsvd3;</div><div class='add'>+	u32 rsvd4;</div><div class='add'>+	u32 rsvd5;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct __packed fw_interface_out {</div><div class='add'>+	struct transaction_counter_s transaction_id;</div><div class='add'>+	struct version_s version;</div><div class='add'>+	struct link_status_s link_status;</div><div class='add'>+	struct wol_status_s wol_status;</div><div class='add'>+	u32 rsvd;</div><div class='add'>+	u32 rsvd2;</div><div class='add'>+	struct mac_health_monitor_s mac_health_monitor;</div><div class='add'>+	u32 rsvd3;</div><div class='add'>+	u32 rsvd4;</div><div class='add'>+	struct phy_health_monitor_s phy_health_monitor;</div><div class='add'>+	u32 rsvd5;</div><div class='add'>+	u32 rsvd6;</div><div class='add'>+	struct cable_diag_status_s cable_diag_status;</div><div class='add'>+	u32 rsvd7;</div><div class='add'>+	struct device_link_caps_s device_link_caps;</div><div class='add'>+	u32 rsvd8;</div><div class='add'>+	struct sleep_proxy_caps_s sleep_proxy_caps;</div><div class='add'>+	u32 rsvd9;</div><div class='add'>+	struct lkp_link_caps_s lkp_link_caps;</div><div class='add'>+	u32 rsvd10;</div><div class='add'>+	struct core_dump_s core_dump;</div><div class='add'>+	u32 rsvd11;</div><div class='add'>+	struct statistics_s stats;</div><div class='add'>+	struct filter_caps_s filter_caps;</div><div class='add'>+	struct device_caps_s device_caps;</div><div class='add'>+	u32 rsvd13;</div><div class='add'>+	struct management_status_s management_status;</div><div class='add'>+	u32 reserve[21];</div><div class='add'>+	struct trace_s trace;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_INVALID 0</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_10M     1</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_100M    2</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_1G      3</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_2G5     4</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_5G      5</div><div class='add'>+#define  AQ_A2_FW_LINK_RATE_10G     6</div><div class='add'>+</div><div class='add'>+#define  AQ_HOST_MODE_INVALID      0U</div><div class='add'>+#define  AQ_HOST_MODE_ACTIVE       1U</div><div class='add'>+#define  AQ_HOST_MODE_SLEEP_PROXY  2U</div><div class='add'>+#define  AQ_HOST_MODE_LOW_POWER    3U</div><div class='add'>+#define  AQ_HOST_MODE_SHUTDOWN     4U</div><div class='add'>+</div><div class='add'>+#define  AQ_A2_FW_INTERFACE_A0     0</div><div class='add'>+#define  AQ_A2_FW_INTERFACE_B0     1</div><div class='add'>+</div><div class='add'>+int hw_atl2_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops);</div><div class='add'>+</div><div class='add'>+int hw_atl2_utils_soft_reset(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_utils_get_fw_version(struct aq_hw_s *self);</div><div class='add'>+</div><div class='add'>+int hw_atl2_utils_get_action_resolve_table_caps(struct aq_hw_s *self,</div><div class='add'>+						u8 *base_index, u8 *count);</div><div class='add'>+</div><div class='add'>+extern const struct aq_fw_ops aq_a2_fw_ops;</div><div class='add'>+</div><div class='add'>+#endif /* HW_ATL2_UTILS_H */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c<br/>new file mode 100644<br/>index 000000000000..7370e3f76b62<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c</a></div><div class='hunk'>@@ -0,0 +1,655 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+#include "aq_hw_utils.h"</div><div class='add'>+#include "aq_nic.h"</div><div class='add'>+#include "hw_atl/hw_atl_llh.h"</div><div class='add'>+#include "hw_atl2_utils.h"</div><div class='add'>+#include "hw_atl2_llh.h"</div><div class='add'>+#include "hw_atl2_internal.h"</div><div class='add'>+</div><div class='add'>+#define AQ_A2_FW_READ_TRY_MAX 1000</div><div class='add'>+</div><div class='add'>+#define hw_atl2_shared_buffer_write(HW, ITEM, VARIABLE) \</div><div class='add'>+{\</div><div class='add'>+	BUILD_BUG_ON_MSG((offsetof(struct fw_interface_in, ITEM) % \</div><div class='add'>+			 sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned write " # ITEM);\</div><div class='add'>+	BUILD_BUG_ON_MSG((sizeof(VARIABLE) %  sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned write length " # ITEM);\</div><div class='add'>+	hw_atl2_mif_shared_buf_write(HW,\</div><div class='add'>+		(offsetof(struct fw_interface_in, ITEM) / sizeof(u32)),\</div><div class='add'>+		(u32 *)&amp;(VARIABLE), sizeof(VARIABLE) / sizeof(u32));\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define hw_atl2_shared_buffer_get(HW, ITEM, VARIABLE) \</div><div class='add'>+{\</div><div class='add'>+	BUILD_BUG_ON_MSG((offsetof(struct fw_interface_in, ITEM) % \</div><div class='add'>+			 sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned get " # ITEM);\</div><div class='add'>+	BUILD_BUG_ON_MSG((sizeof(VARIABLE) %  sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned get length " # ITEM);\</div><div class='add'>+	hw_atl2_mif_shared_buf_get(HW, \</div><div class='add'>+		(offsetof(struct fw_interface_in, ITEM) / sizeof(u32)),\</div><div class='add'>+		(u32 *)&amp;(VARIABLE), \</div><div class='add'>+		sizeof(VARIABLE) / sizeof(u32));\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This should never be used on non atomic fields,</div><div class='add'>+ * treat any &gt; u32 read as non atomic.</div><div class='add'>+ */</div><div class='add'>+#define hw_atl2_shared_buffer_read(HW, ITEM, VARIABLE) \</div><div class='add'>+{\</div><div class='add'>+	BUILD_BUG_ON_MSG((offsetof(struct fw_interface_out, ITEM) % \</div><div class='add'>+			 sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned read " # ITEM);\</div><div class='add'>+	BUILD_BUG_ON_MSG((sizeof(VARIABLE) %  sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned read length " # ITEM);\</div><div class='add'>+	BUILD_BUG_ON_MSG(sizeof(VARIABLE) &gt; sizeof(u32),\</div><div class='add'>+			 "Non atomic read " # ITEM);\</div><div class='add'>+	hw_atl2_mif_shared_buf_read(HW, \</div><div class='add'>+		(offsetof(struct fw_interface_out, ITEM) / sizeof(u32)),\</div><div class='add'>+		(u32 *)&amp;(VARIABLE), sizeof(VARIABLE) / sizeof(u32));\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define hw_atl2_shared_buffer_read_safe(HW, ITEM, DATA) \</div><div class='add'>+({\</div><div class='add'>+	BUILD_BUG_ON_MSG((offsetof(struct fw_interface_out, ITEM) % \</div><div class='add'>+			 sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned read_safe " # ITEM);\</div><div class='add'>+	BUILD_BUG_ON_MSG((sizeof(((struct fw_interface_out *)0)-&gt;ITEM) % \</div><div class='add'>+			 sizeof(u32)) != 0,\</div><div class='add'>+			 "Unaligned read_safe length " # ITEM);\</div><div class='add'>+	hw_atl2_shared_buffer_read_block((HW), \</div><div class='add'>+		(offsetof(struct fw_interface_out, ITEM) / sizeof(u32)),\</div><div class='add'>+		sizeof(((struct fw_interface_out *)0)-&gt;ITEM) / sizeof(u32),\</div><div class='add'>+		(DATA));\</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+static int hw_atl2_shared_buffer_read_block(struct aq_hw_s *self,</div><div class='add'>+					    u32 offset, u32 dwords, void *data)</div><div class='add'>+{</div><div class='add'>+	struct transaction_counter_s tid1, tid2;</div><div class='add'>+	int cnt = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		do {</div><div class='add'>+			hw_atl2_shared_buffer_read(self, transaction_id, tid1);</div><div class='add'>+			cnt++;</div><div class='add'>+			if (cnt &gt; AQ_A2_FW_READ_TRY_MAX)</div><div class='add'>+				return -ETIME;</div><div class='add'>+			if (tid1.transaction_cnt_a != tid1.transaction_cnt_b)</div><div class='add'>+				mdelay(1);</div><div class='add'>+		} while (tid1.transaction_cnt_a != tid1.transaction_cnt_b);</div><div class='add'>+</div><div class='add'>+		hw_atl2_mif_shared_buf_read(self, offset, (u32 *)data, dwords);</div><div class='add'>+</div><div class='add'>+		hw_atl2_shared_buffer_read(self, transaction_id, tid2);</div><div class='add'>+</div><div class='add'>+		cnt++;</div><div class='add'>+		if (cnt &gt; AQ_A2_FW_READ_TRY_MAX)</div><div class='add'>+			return -ETIME;</div><div class='add'>+	} while (tid2.transaction_cnt_a != tid2.transaction_cnt_b ||</div><div class='add'>+		 tid1.transaction_cnt_a != tid2.transaction_cnt_a);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int hw_atl2_shared_buffer_finish_ack(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl2_mif_host_finished_write_set(self, 1U);</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl2_mif_mcp_finished_read_get,</div><div class='add'>+					self, val, val == 0U,</div><div class='add'>+					100, 100000U);</div><div class='add'>+	WARN(err, "hw_atl2_shared_buffer_finish_ack");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_init(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct link_control_s link_control;</div><div class='add'>+	u32 mtu;</div><div class='add'>+	u32 val;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_control, link_control);</div><div class='add'>+	link_control.mode = AQ_HOST_MODE_ACTIVE;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_control, link_control);</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, mtu, mtu);</div><div class='add'>+	mtu = HW_ATL2_MTU_JUMBO;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, mtu, mtu);</div><div class='add'>+</div><div class='add'>+	hw_atl2_mif_host_finished_write_set(self, 1U);</div><div class='add'>+	err = readx_poll_timeout_atomic(hw_atl2_mif_mcp_finished_read_get,</div><div class='add'>+					self, val, val == 0U,</div><div class='add'>+					100, 5000000U);</div><div class='add'>+	WARN(err, "hw_atl2_shared_buffer_finish_ack");</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_deinit(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct link_control_s link_control;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_control, link_control);</div><div class='add'>+	link_control.mode = AQ_HOST_MODE_SHUTDOWN;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_control, link_control);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void a2_link_speed_mask2fw(u32 speed,</div><div class='add'>+				  struct link_options_s *link_options)</div><div class='add'>+{</div><div class='add'>+	link_options-&gt;rate_10G = !!(speed &amp; AQ_NIC_RATE_10G);</div><div class='add'>+	link_options-&gt;rate_5G = !!(speed &amp; AQ_NIC_RATE_5G);</div><div class='add'>+	link_options-&gt;rate_N5G = link_options-&gt;rate_5G;</div><div class='add'>+	link_options-&gt;rate_2P5G = !!(speed &amp; AQ_NIC_RATE_2G5);</div><div class='add'>+	link_options-&gt;rate_N2P5G = link_options-&gt;rate_2P5G;</div><div class='add'>+	link_options-&gt;rate_1G = !!(speed &amp; AQ_NIC_RATE_1G);</div><div class='add'>+	link_options-&gt;rate_100M = !!(speed &amp; AQ_NIC_RATE_100M);</div><div class='add'>+	link_options-&gt;rate_10M = !!(speed &amp; AQ_NIC_RATE_10M);</div><div class='add'>+</div><div class='add'>+	link_options-&gt;rate_1G_hd = !!(speed &amp; AQ_NIC_RATE_1G_HALF);</div><div class='add'>+	link_options-&gt;rate_100M_hd = !!(speed &amp; AQ_NIC_RATE_100M_HALF);</div><div class='add'>+	link_options-&gt;rate_10M_hd = !!(speed &amp; AQ_NIC_RATE_10M_HALF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 a2_fw_dev_to_eee_mask(struct device_link_caps_s *device_link_caps)</div><div class='add'>+{</div><div class='add'>+	u32 rate = 0;</div><div class='add'>+</div><div class='add'>+	if (device_link_caps-&gt;eee_10G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_10G;</div><div class='add'>+	if (device_link_caps-&gt;eee_5G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_5G;</div><div class='add'>+	if (device_link_caps-&gt;eee_2P5G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_2G5;</div><div class='add'>+	if (device_link_caps-&gt;eee_1G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_1G;</div><div class='add'>+	if (device_link_caps-&gt;eee_100M)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_100M;</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 a2_fw_lkp_to_mask(struct lkp_link_caps_s *lkp_link_caps)</div><div class='add'>+{</div><div class='add'>+	u32 rate = 0;</div><div class='add'>+</div><div class='add'>+	if (lkp_link_caps-&gt;rate_10G)</div><div class='add'>+		rate |= AQ_NIC_RATE_10G;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_5G)</div><div class='add'>+		rate |= AQ_NIC_RATE_5G;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_2P5G)</div><div class='add'>+		rate |= AQ_NIC_RATE_2G5;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_1G)</div><div class='add'>+		rate |= AQ_NIC_RATE_1G;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_1G_hd)</div><div class='add'>+		rate |= AQ_NIC_RATE_1G_HALF;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_100M)</div><div class='add'>+		rate |= AQ_NIC_RATE_100M;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_100M_hd)</div><div class='add'>+		rate |= AQ_NIC_RATE_100M_HALF;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_10M)</div><div class='add'>+		rate |= AQ_NIC_RATE_10M;</div><div class='add'>+	if (lkp_link_caps-&gt;rate_10M_hd)</div><div class='add'>+		rate |= AQ_NIC_RATE_10M_HALF;</div><div class='add'>+</div><div class='add'>+	if (lkp_link_caps-&gt;eee_10G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_10G;</div><div class='add'>+	if (lkp_link_caps-&gt;eee_5G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_5G;</div><div class='add'>+	if (lkp_link_caps-&gt;eee_2P5G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_2G5;</div><div class='add'>+	if (lkp_link_caps-&gt;eee_1G)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_1G;</div><div class='add'>+	if (lkp_link_caps-&gt;eee_100M)</div><div class='add'>+		rate |= AQ_NIC_RATE_EEE_100M;</div><div class='add'>+</div><div class='add'>+	return rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_link_speed(struct aq_hw_s *self, u32 speed)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+	link_options.link_up = 1U;</div><div class='add'>+	a2_link_speed_mask2fw(speed, &amp;link_options);</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_a2_fw_set_mpi_flow_control(struct aq_hw_s *self,</div><div class='add'>+					  struct link_options_s *link_options)</div><div class='add'>+{</div><div class='add'>+	u32 flow_control = self-&gt;aq_nic_cfg-&gt;fc.req;</div><div class='add'>+</div><div class='add'>+	link_options-&gt;pause_rx = !!(flow_control &amp; AQ_NIC_FC_RX);</div><div class='add'>+	link_options-&gt;pause_tx = !!(flow_control &amp; AQ_NIC_FC_TX);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_a2_fw_upd_eee_rate_bits(struct aq_hw_s *self,</div><div class='add'>+				       struct link_options_s *link_options,</div><div class='add'>+				       u32 eee_speeds)</div><div class='add'>+{</div><div class='add'>+	link_options-&gt;eee_10G =  !!(eee_speeds &amp; AQ_NIC_RATE_EEE_10G);</div><div class='add'>+	link_options-&gt;eee_5G = !!(eee_speeds &amp; AQ_NIC_RATE_EEE_5G);</div><div class='add'>+	link_options-&gt;eee_2P5G = !!(eee_speeds &amp; AQ_NIC_RATE_EEE_2G5);</div><div class='add'>+	link_options-&gt;eee_1G = !!(eee_speeds &amp; AQ_NIC_RATE_EEE_1G);</div><div class='add'>+	link_options-&gt;eee_100M = !!(eee_speeds &amp; AQ_NIC_RATE_EEE_100M);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_state(struct aq_hw_s *self,</div><div class='add'>+			      enum hal_atl_utils_fw_state_e state)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case MPI_INIT:</div><div class='add'>+		link_options.link_up = 1U;</div><div class='add'>+		aq_a2_fw_upd_eee_rate_bits(self, &amp;link_options,</div><div class='add'>+					   self-&gt;aq_nic_cfg-&gt;eee_speeds);</div><div class='add'>+		aq_a2_fw_set_mpi_flow_control(self, &amp;link_options);</div><div class='add'>+		break;</div><div class='add'>+	case MPI_DEINIT:</div><div class='add'>+		link_options.link_up = 0U;</div><div class='add'>+		break;</div><div class='add'>+	case MPI_RESET:</div><div class='add'>+	case MPI_POWER:</div><div class='add'>+		/* No actions */</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_update_link_status(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct lkp_link_caps_s lkp_link_caps;</div><div class='add'>+	struct link_status_s link_status;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_read(self, link_status, link_status);</div><div class='add'>+</div><div class='add'>+	switch (link_status.link_rate) {</div><div class='add'>+	case AQ_A2_FW_LINK_RATE_10G:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 10000;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_A2_FW_LINK_RATE_5G:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 5000;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_A2_FW_LINK_RATE_2G5:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 2500;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_A2_FW_LINK_RATE_1G:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 1000;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_A2_FW_LINK_RATE_100M:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 100;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_A2_FW_LINK_RATE_10M:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		self-&gt;aq_link_status.mbps = 0;</div><div class='add'>+	}</div><div class='add'>+	self-&gt;aq_link_status.full_duplex = link_status.duplex;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_read(self, lkp_link_caps, lkp_link_caps);</div><div class='add'>+</div><div class='add'>+	self-&gt;aq_link_status.lp_link_speed_msk =</div><div class='add'>+				 a2_fw_lkp_to_mask(&amp;lkp_link_caps);</div><div class='add'>+	self-&gt;aq_link_status.lp_flow_control =</div><div class='add'>+				((lkp_link_caps.pause_rx) ? AQ_NIC_FC_RX : 0) |</div><div class='add'>+				((lkp_link_caps.pause_tx) ? AQ_NIC_FC_TX : 0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_get_mac_permanent(struct aq_hw_s *self, u8 *mac)</div><div class='add'>+{</div><div class='add'>+	struct mac_address_aligned_s mac_address;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, mac_address, mac_address);</div><div class='add'>+	ether_addr_copy(mac, (u8 *)mac_address.aligned.mac_address);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_a2_fill_a0_stats(struct aq_hw_s *self,</div><div class='add'>+				struct statistics_s *stats)</div><div class='add'>+{</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	struct aq_stats_s *cs = &amp;self-&gt;curr_stats;</div><div class='add'>+	struct aq_stats_s curr_stats = *cs;</div><div class='add'>+	bool corrupted_stats = false;</div><div class='add'>+</div><div class='add'>+#define AQ_SDELTA(_N, _F)  \</div><div class='add'>+do { \</div><div class='add'>+	if (!corrupted_stats &amp;&amp; \</div><div class='add'>+	    ((s64)(stats-&gt;a0.msm._F - priv-&gt;last_stats.a0.msm._F)) &gt;= 0) \</div><div class='add'>+		curr_stats._N += stats-&gt;a0.msm._F - priv-&gt;last_stats.a0.msm._F;\</div><div class='add'>+	else \</div><div class='add'>+		corrupted_stats = true; \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_link_status.mbps) {</div><div class='add'>+		AQ_SDELTA(uprc, rx_unicast_frames);</div><div class='add'>+		AQ_SDELTA(mprc, rx_multicast_frames);</div><div class='add'>+		AQ_SDELTA(bprc, rx_broadcast_frames);</div><div class='add'>+		AQ_SDELTA(erpr, rx_error_frames);</div><div class='add'>+</div><div class='add'>+		AQ_SDELTA(uptc, tx_unicast_frames);</div><div class='add'>+		AQ_SDELTA(mptc, tx_multicast_frames);</div><div class='add'>+		AQ_SDELTA(bptc, tx_broadcast_frames);</div><div class='add'>+		AQ_SDELTA(erpt, tx_errors);</div><div class='add'>+</div><div class='add'>+		AQ_SDELTA(ubrc, rx_unicast_octets);</div><div class='add'>+		AQ_SDELTA(ubtc, tx_unicast_octets);</div><div class='add'>+		AQ_SDELTA(mbrc, rx_multicast_octets);</div><div class='add'>+		AQ_SDELTA(mbtc, tx_multicast_octets);</div><div class='add'>+		AQ_SDELTA(bbrc, rx_broadcast_octets);</div><div class='add'>+		AQ_SDELTA(bbtc, tx_broadcast_octets);</div><div class='add'>+</div><div class='add'>+		if (!corrupted_stats)</div><div class='add'>+			*cs = curr_stats;</div><div class='add'>+	}</div><div class='add'>+#undef AQ_SDELTA</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_a2_fill_b0_stats(struct aq_hw_s *self,</div><div class='add'>+				struct statistics_s *stats)</div><div class='add'>+{</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	struct aq_stats_s *cs = &amp;self-&gt;curr_stats;</div><div class='add'>+	struct aq_stats_s curr_stats = *cs;</div><div class='add'>+	bool corrupted_stats = false;</div><div class='add'>+</div><div class='add'>+#define AQ_SDELTA(_N, _F)  \</div><div class='add'>+do { \</div><div class='add'>+	if (!corrupted_stats &amp;&amp; \</div><div class='add'>+	    ((s64)(stats-&gt;b0._F - priv-&gt;last_stats.b0._F)) &gt;= 0) \</div><div class='add'>+		curr_stats._N += stats-&gt;b0._F - priv-&gt;last_stats.b0._F; \</div><div class='add'>+	else \</div><div class='add'>+		corrupted_stats = true; \</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+	if (self-&gt;aq_link_status.mbps) {</div><div class='add'>+		AQ_SDELTA(uprc, rx_unicast_frames);</div><div class='add'>+		AQ_SDELTA(mprc, rx_multicast_frames);</div><div class='add'>+		AQ_SDELTA(bprc, rx_broadcast_frames);</div><div class='add'>+		AQ_SDELTA(erpr, rx_errors);</div><div class='add'>+		AQ_SDELTA(brc, rx_good_octets);</div><div class='add'>+</div><div class='add'>+		AQ_SDELTA(uptc, tx_unicast_frames);</div><div class='add'>+		AQ_SDELTA(mptc, tx_multicast_frames);</div><div class='add'>+		AQ_SDELTA(bptc, tx_broadcast_frames);</div><div class='add'>+		AQ_SDELTA(erpt, tx_errors);</div><div class='add'>+		AQ_SDELTA(btc, tx_good_octets);</div><div class='add'>+</div><div class='add'>+		if (!corrupted_stats)</div><div class='add'>+			*cs = curr_stats;</div><div class='add'>+	}</div><div class='add'>+#undef AQ_SDELTA</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_update_stats(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct aq_stats_s *cs = &amp;self-&gt;curr_stats;</div><div class='add'>+	struct hw_atl2_priv *priv = self-&gt;priv;</div><div class='add'>+	struct statistics_s stats;</div><div class='add'>+	struct version_s version;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hw_atl2_shared_buffer_read_safe(self, version, &amp;version);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = hw_atl2_shared_buffer_read_safe(self, stats, &amp;stats);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (version.drv_iface_ver == AQ_A2_FW_INTERFACE_A0)</div><div class='add'>+		aq_a2_fill_a0_stats(self, &amp;stats);</div><div class='add'>+	else</div><div class='add'>+		aq_a2_fill_b0_stats(self, &amp;stats);</div><div class='add'>+</div><div class='add'>+	cs-&gt;dma_pkt_rc = hw_atl_stats_rx_dma_good_pkt_counter_get(self);</div><div class='add'>+	cs-&gt;dma_pkt_tc = hw_atl_stats_tx_dma_good_pkt_counter_get(self);</div><div class='add'>+	cs-&gt;dma_oct_rc = hw_atl_stats_rx_dma_good_octet_counter_get(self);</div><div class='add'>+	cs-&gt;dma_oct_tc = hw_atl_stats_tx_dma_good_octet_counter_get(self);</div><div class='add'>+	cs-&gt;dpc = hw_atl_rpb_rx_dma_drop_pkt_cnt_get(self);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;priv-&gt;last_stats, &amp;stats, sizeof(stats));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_get_phy_temp(struct aq_hw_s *self, int *temp)</div><div class='add'>+{</div><div class='add'>+	struct phy_health_monitor_s phy_health_monitor;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_read_safe(self, phy_health_monitor,</div><div class='add'>+					&amp;phy_health_monitor);</div><div class='add'>+</div><div class='add'>+	*temp = (int8_t)phy_health_monitor.phy_temperature * 1000;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_get_mac_temp(struct aq_hw_s *self, int *temp)</div><div class='add'>+{</div><div class='add'>+	/* There's only one temperature sensor on A2, use it for</div><div class='add'>+	 * both MAC and PHY.</div><div class='add'>+	 */</div><div class='add'>+	return aq_a2_fw_get_phy_temp(self, temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_wol_params(struct aq_hw_s *self, const u8 *mac, u32 wol)</div><div class='add'>+{</div><div class='add'>+	struct mac_address_aligned_s mac_address;</div><div class='add'>+	struct link_control_s link_control;</div><div class='add'>+	struct wake_on_lan_s wake_on_lan;</div><div class='add'>+</div><div class='add'>+	memcpy(mac_address.aligned.mac_address, mac, ETH_ALEN);</div><div class='add'>+	hw_atl2_shared_buffer_write(self, mac_address, mac_address);</div><div class='add'>+</div><div class='add'>+	memset(&amp;wake_on_lan, 0, sizeof(wake_on_lan));</div><div class='add'>+</div><div class='add'>+	if (wol &amp; WAKE_MAGIC)</div><div class='add'>+		wake_on_lan.wake_on_magic_packet = 1U;</div><div class='add'>+</div><div class='add'>+	if (wol &amp; (WAKE_PHY | AQ_FW_WAKE_ON_LINK_RTPM))</div><div class='add'>+		wake_on_lan.wake_on_link_up = 1U;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_write(self, sleep_proxy, wake_on_lan);</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_control, link_control);</div><div class='add'>+	link_control.mode = AQ_HOST_MODE_SLEEP_PROXY;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_control, link_control);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_power(struct aq_hw_s *self, unsigned int power_state,</div><div class='add'>+			      const u8 *mac)</div><div class='add'>+{</div><div class='add'>+	u32 wol = self-&gt;aq_nic_cfg-&gt;wol;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (wol)</div><div class='add'>+		err = aq_a2_fw_set_wol_params(self, mac, wol);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_eee_rate(struct aq_hw_s *self, u32 speed)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	aq_a2_fw_upd_eee_rate_bits(self, &amp;link_options, speed);</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_get_eee_rate(struct aq_hw_s *self, u32 *rate,</div><div class='add'>+				 u32 *supported_rates)</div><div class='add'>+{</div><div class='add'>+	struct device_link_caps_s device_link_caps;</div><div class='add'>+	struct lkp_link_caps_s lkp_link_caps;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_read(self, device_link_caps, device_link_caps);</div><div class='add'>+	hw_atl2_shared_buffer_read(self, lkp_link_caps, lkp_link_caps);</div><div class='add'>+</div><div class='add'>+	*supported_rates = a2_fw_dev_to_eee_mask(&amp;device_link_caps);</div><div class='add'>+	*rate = a2_fw_lkp_to_mask(&amp;lkp_link_caps);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_renegotiate(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+	link_options.link_renegotiate = 1U;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	err = hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+</div><div class='add'>+	/* We should put renegotiate status back to zero</div><div class='add'>+	 * after command completes</div><div class='add'>+	 */</div><div class='add'>+	link_options.link_renegotiate = 0U;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_flow_control(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	aq_a2_fw_set_mpi_flow_control(self, &amp;link_options);</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 aq_a2_fw_get_flow_control(struct aq_hw_s *self, u32 *fcmode)</div><div class='add'>+{</div><div class='add'>+	struct link_status_s link_status;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_read(self, link_status, link_status);</div><div class='add'>+</div><div class='add'>+	*fcmode = ((link_status.pause_rx) ? AQ_NIC_FC_RX : 0) |</div><div class='add'>+		  ((link_status.pause_tx) ? AQ_NIC_FC_TX : 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_phyloopback(struct aq_hw_s *self, u32 mode, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case AQ_HW_LOOPBACK_PHYINT_SYS:</div><div class='add'>+		link_options.internal_loopback = enable;</div><div class='add'>+		break;</div><div class='add'>+	case AQ_HW_LOOPBACK_PHYEXT_SYS:</div><div class='add'>+		link_options.external_loopback = enable;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 hw_atl2_utils_get_fw_version(struct aq_hw_s *self)</div><div class='add'>+{</div><div class='add'>+	struct version_s version;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_read_safe(self, version, &amp;version);</div><div class='add'>+</div><div class='add'>+	/* A2 FW version is stored in reverse order */</div><div class='add'>+	return version.bundle.major &lt;&lt; 24 |</div><div class='add'>+	       version.bundle.minor &lt;&lt; 16 |</div><div class='add'>+	       version.bundle.build;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hw_atl2_utils_get_action_resolve_table_caps(struct aq_hw_s *self,</div><div class='add'>+						u8 *base_index, u8 *count)</div><div class='add'>+{</div><div class='add'>+	struct filter_caps_s filter_caps;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = hw_atl2_shared_buffer_read_safe(self, filter_caps, &amp;filter_caps);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	*base_index = filter_caps.rslv_tbl_base_index;</div><div class='add'>+	*count = filter_caps.rslv_tbl_count;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_a2_fw_set_downshift(struct aq_hw_s *self, u32 counter)</div><div class='add'>+{</div><div class='add'>+	struct link_options_s link_options;</div><div class='add'>+</div><div class='add'>+	hw_atl2_shared_buffer_get(self, link_options, link_options);</div><div class='add'>+	link_options.downshift = !!counter;</div><div class='add'>+	link_options.downshift_retry = counter;</div><div class='add'>+	hw_atl2_shared_buffer_write(self, link_options, link_options);</div><div class='add'>+</div><div class='add'>+	return hw_atl2_shared_buffer_finish_ack(self);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct aq_fw_ops aq_a2_fw_ops = {</div><div class='add'>+	.init               = aq_a2_fw_init,</div><div class='add'>+	.deinit             = aq_a2_fw_deinit,</div><div class='add'>+	.reset              = NULL,</div><div class='add'>+	.renegotiate        = aq_a2_fw_renegotiate,</div><div class='add'>+	.get_mac_permanent  = aq_a2_fw_get_mac_permanent,</div><div class='add'>+	.set_link_speed     = aq_a2_fw_set_link_speed,</div><div class='add'>+	.set_state          = aq_a2_fw_set_state,</div><div class='add'>+	.update_link_status = aq_a2_fw_update_link_status,</div><div class='add'>+	.update_stats       = aq_a2_fw_update_stats,</div><div class='add'>+	.set_power          = aq_a2_fw_set_power,</div><div class='add'>+	.get_mac_temp       = aq_a2_fw_get_mac_temp,</div><div class='add'>+	.get_phy_temp       = aq_a2_fw_get_phy_temp,</div><div class='add'>+	.set_eee_rate       = aq_a2_fw_set_eee_rate,</div><div class='add'>+	.get_eee_rate       = aq_a2_fw_get_eee_rate,</div><div class='add'>+	.set_flow_control   = aq_a2_fw_set_flow_control,</div><div class='add'>+	.get_flow_control   = aq_a2_fw_get_flow_control,</div><div class='add'>+	.set_phyloopback    = aq_a2_fw_set_phyloopback,</div><div class='add'>+	.set_downshift      = aq_a2_fw_set_downshift,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h b/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h<br/>new file mode 100644<br/>index 000000000000..71d08ea80b54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Egress_registers.h</a></div><div class='hunk'>@@ -0,0 +1,73 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef MSS_EGRESS_REGS_HEADER</div><div class='add'>+#define MSS_EGRESS_REGS_HEADER</div><div class='add'>+</div><div class='add'>+#define MSS_EGRESS_CTL_REGISTER_ADDR 0x00005002</div><div class='add'>+#define MSS_EGRESS_SA_EXPIRED_STATUS_REGISTER_ADDR 0x00005060</div><div class='add'>+#define MSS_EGRESS_SA_THRESHOLD_EXPIRED_STATUS_REGISTER_ADDR 0x00005062</div><div class='add'>+#define MSS_EGRESS_LUT_ADDR_CTL_REGISTER_ADDR 0x00005080</div><div class='add'>+#define MSS_EGRESS_LUT_CTL_REGISTER_ADDR 0x00005081</div><div class='add'>+#define MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR 0x000050A0</div><div class='add'>+</div><div class='add'>+struct mss_egress_ctl_register {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int soft_reset : 1;</div><div class='add'>+			unsigned int drop_kay_packet : 1;</div><div class='add'>+			unsigned int drop_egprc_lut_miss : 1;</div><div class='add'>+			unsigned int gcm_start : 1;</div><div class='add'>+			unsigned int gcm_test_mode : 1;</div><div class='add'>+			unsigned int unmatched_use_sc_0 : 1;</div><div class='add'>+			unsigned int drop_invalid_sa_sc_packets : 1;</div><div class='add'>+			unsigned int reserved0 : 1;</div><div class='add'>+			/* Should always be set to 0. */</div><div class='add'>+			unsigned int external_classification_enable : 1;</div><div class='add'>+			unsigned int icv_lsb_8bytes_enable : 1;</div><div class='add'>+			unsigned int high_prio : 1;</div><div class='add'>+			unsigned int clear_counter : 1;</div><div class='add'>+			unsigned int clear_global_time : 1;</div><div class='add'>+			unsigned int ethertype_explicit_sectag_lsb : 3;</div><div class='add'>+		} bits_0;</div><div class='add'>+		unsigned short word_0;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int ethertype_explicit_sectag_msb : 13;</div><div class='add'>+			unsigned int reserved0 : 3;</div><div class='add'>+		} bits_1;</div><div class='add'>+		unsigned short word_1;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mss_egress_lut_addr_ctl_register {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int lut_addr : 9;</div><div class='add'>+			unsigned int reserved0 : 3;</div><div class='add'>+			/* 0x0 : Egress MAC Control FIlter (CTLF) LUT</div><div class='add'>+			 * 0x1 : Egress Classification LUT</div><div class='add'>+			 * 0x2 : Egress SC/SA LUT</div><div class='add'>+			 * 0x3 : Egress SMIB</div><div class='add'>+			 */</div><div class='add'>+			unsigned int lut_select : 4;</div><div class='add'>+		} bits_0;</div><div class='add'>+		unsigned short word_0;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mss_egress_lut_ctl_register {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int reserved0 : 14;</div><div class='add'>+			unsigned int lut_read : 1;</div><div class='add'>+			unsigned int lut_write : 1;</div><div class='add'>+		} bits_0;</div><div class='add'>+		unsigned short word_0;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MSS_EGRESS_REGS_HEADER */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h b/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h<br/>new file mode 100644<br/>index 000000000000..d4c00d9a0fc6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/macsec/MSS_Ingress_registers.h</a></div><div class='hunk'>@@ -0,0 +1,77 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef MSS_INGRESS_REGS_HEADER</div><div class='add'>+#define MSS_INGRESS_REGS_HEADER</div><div class='add'>+</div><div class='add'>+#define MSS_INGRESS_CTL_REGISTER_ADDR 0x0000800E</div><div class='add'>+#define MSS_INGRESS_LUT_ADDR_CTL_REGISTER_ADDR 0x00008080</div><div class='add'>+#define MSS_INGRESS_LUT_CTL_REGISTER_ADDR 0x00008081</div><div class='add'>+#define MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR 0x000080A0</div><div class='add'>+</div><div class='add'>+struct mss_ingress_ctl_register {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int soft_reset : 1;</div><div class='add'>+			unsigned int operation_point_to_point : 1;</div><div class='add'>+			unsigned int create_sci : 1;</div><div class='add'>+			/* Unused  */</div><div class='add'>+			unsigned int mask_short_length_error : 1;</div><div class='add'>+			unsigned int drop_kay_packet : 1;</div><div class='add'>+			unsigned int drop_igprc_miss : 1;</div><div class='add'>+			/* Unused  */</div><div class='add'>+			unsigned int check_icv : 1;</div><div class='add'>+			unsigned int clear_global_time : 1;</div><div class='add'>+			unsigned int clear_count : 1;</div><div class='add'>+			unsigned int high_prio : 1;</div><div class='add'>+			unsigned int remove_sectag : 1;</div><div class='add'>+			unsigned int global_validate_frames : 2;</div><div class='add'>+			unsigned int icv_lsb_8bytes_enabled : 1;</div><div class='add'>+			unsigned int reserved0 : 2;</div><div class='add'>+		} bits_0;</div><div class='add'>+		unsigned short word_0;</div><div class='add'>+	};</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int reserved0 : 16;</div><div class='add'>+		} bits_1;</div><div class='add'>+		unsigned short word_1;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mss_ingress_lut_addr_ctl_register {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int lut_addr : 9;</div><div class='add'>+			unsigned int reserved0 : 3;</div><div class='add'>+			/* 0x0 : Ingress Pre-Security MAC Control FIlter</div><div class='add'>+			 *       (IGPRCTLF) LUT</div><div class='add'>+			 * 0x1 : Ingress Pre-Security Classification LUT (IGPRC)</div><div class='add'>+			 * 0x2 : Ingress Packet Format (IGPFMT) SAKey LUT</div><div class='add'>+			 * 0x3 : Ingress Packet Format (IGPFMT) SC/SA LUT</div><div class='add'>+			 * 0x4 : Ingress Post-Security Classification LUT</div><div class='add'>+			 *       (IGPOC)</div><div class='add'>+			 * 0x5 : Ingress Post-Security MAC Control Filter</div><div class='add'>+			 *       (IGPOCTLF) LUT</div><div class='add'>+			 * 0x6 : Ingress MIB (IGMIB)</div><div class='add'>+			 */</div><div class='add'>+			unsigned int lut_select : 4;</div><div class='add'>+		} bits_0;</div><div class='add'>+		unsigned short word_0;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct mss_ingress_lut_ctl_register {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			unsigned int reserved0 : 14;</div><div class='add'>+			unsigned int lut_read : 1;</div><div class='add'>+			unsigned int lut_write : 1;</div><div class='add'>+		} bits_0;</div><div class='add'>+		unsigned short word_0;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* MSS_INGRESS_REGS_HEADER */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c b/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c<br/>new file mode 100644<br/>index 000000000000..431924959520<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.c</a></div><div class='hunk'>@@ -0,0 +1,2477 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "macsec_api.h"</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include "MSS_Ingress_registers.h"</div><div class='add'>+#include "MSS_Egress_registers.h"</div><div class='add'>+#include "aq_phy.h"</div><div class='add'>+</div><div class='add'>+#define AQ_API_CALL_SAFE(func, ...)                                            \</div><div class='add'>+({                                                                             \</div><div class='add'>+	int ret;                                                               \</div><div class='add'>+	do {                                                                   \</div><div class='add'>+		ret = aq_mss_mdio_sem_get(hw);                                 \</div><div class='add'>+		if (unlikely(ret))                                             \</div><div class='add'>+			break;                                                 \</div><div class='add'>+									       \</div><div class='add'>+		ret = func(__VA_ARGS__);                                       \</div><div class='add'>+									       \</div><div class='add'>+		aq_mss_mdio_sem_put(hw);                                       \</div><div class='add'>+	} while (0);                                                           \</div><div class='add'>+	ret;                                                                   \</div><div class='add'>+})</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *                               MDIO wrappers</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+static int aq_mss_mdio_sem_get(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	return readx_poll_timeout_atomic(hw_atl_sem_mdio_get, hw, val,</div><div class='add'>+					 val == 1U, 10U, 100000U);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void aq_mss_mdio_sem_put(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	hw_atl_reg_glb_cpu_sem_set(hw, 1U, HW_ATL_FW_SM_MDIO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mss_mdio_read(struct aq_hw_s *hw, u16 mmd, u16 addr, u16 *data)</div><div class='add'>+{</div><div class='add'>+	*data = aq_mdio_read_word(hw, mmd, addr);</div><div class='add'>+	return (*data != 0xffff) ? 0 : -ETIME;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int aq_mss_mdio_write(struct aq_hw_s *hw, u16 mmd, u16 addr, u16 data)</div><div class='add'>+{</div><div class='add'>+	aq_mdio_write_word(hw, mmd, addr, data);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*******************************************************************************</div><div class='add'>+ *                          MACSEC config and status</div><div class='add'>+ ******************************************************************************/</div><div class='add'>+</div><div class='add'>+static int set_raw_ingress_record(struct aq_hw_s *hw, u16 *packed_record,</div><div class='add'>+				  u8 num_words, u8 table_id,</div><div class='add'>+				  u16 table_index)</div><div class='add'>+{</div><div class='add'>+	struct mss_ingress_lut_addr_ctl_register lut_sel_reg;</div><div class='add'>+	struct mss_ingress_lut_ctl_register lut_op_reg;</div><div class='add'>+</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* NOTE: MSS registers must always be read/written as adjacent pairs.</div><div class='add'>+	 * For instance, to write either or both 1E.80A0 and 80A1, we have to:</div><div class='add'>+	 * 1. Write 1E.80A0 first</div><div class='add'>+	 * 2. Then write 1E.80A1</div><div class='add'>+	 *</div><div class='add'>+	 * For HHD devices: These writes need to be performed consecutively, and</div><div class='add'>+	 * to ensure this we use the PIF mailbox to delegate the reads/writes to</div><div class='add'>+	 * the FW.</div><div class='add'>+	 *</div><div class='add'>+	 * For EUR devices: Not need to use the PIF mailbox; it is safe to</div><div class='add'>+	 * write to the registers directly.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* Write the packed record words to the data buffer registers. */</div><div class='add'>+	for (i = 0; i &lt; num_words; i += 2) {</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR + i,</div><div class='add'>+				  packed_record[i]);</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR + i +</div><div class='add'>+					  1,</div><div class='add'>+				  packed_record[i + 1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear out the unused data buffer registers. */</div><div class='add'>+	for (i = num_words; i &lt; 24; i += 2) {</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR + i,</div><div class='add'>+				  0);</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+			MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR + i + 1, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Select the table and row index to write to */</div><div class='add'>+	lut_sel_reg.bits_0.lut_select = table_id;</div><div class='add'>+	lut_sel_reg.bits_0.lut_addr = table_index;</div><div class='add'>+</div><div class='add'>+	lut_op_reg.bits_0.lut_read = 0;</div><div class='add'>+	lut_op_reg.bits_0.lut_write = 1;</div><div class='add'>+</div><div class='add'>+	aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+			  MSS_INGRESS_LUT_ADDR_CTL_REGISTER_ADDR,</div><div class='add'>+			  lut_sel_reg.word_0);</div><div class='add'>+	aq_mss_mdio_write(hw, MDIO_MMD_VEND1, MSS_INGRESS_LUT_CTL_REGISTER_ADDR,</div><div class='add'>+			  lut_op_reg.word_0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*! Read the specified Ingress LUT table row.</div><div class='add'>+ *  packed_record - [OUT] The table row data (raw).</div><div class='add'>+ */</div><div class='add'>+static int get_raw_ingress_record(struct aq_hw_s *hw, u16 *packed_record,</div><div class='add'>+				  u8 num_words, u8 table_id,</div><div class='add'>+				  u16 table_index)</div><div class='add'>+{</div><div class='add'>+	struct mss_ingress_lut_addr_ctl_register lut_sel_reg;</div><div class='add'>+	struct mss_ingress_lut_ctl_register lut_op_reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Select the table and row index to read */</div><div class='add'>+	lut_sel_reg.bits_0.lut_select = table_id;</div><div class='add'>+	lut_sel_reg.bits_0.lut_addr = table_index;</div><div class='add'>+</div><div class='add'>+	lut_op_reg.bits_0.lut_read = 1;</div><div class='add'>+	lut_op_reg.bits_0.lut_write = 0;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_LUT_ADDR_CTL_REGISTER_ADDR,</div><div class='add'>+				lut_sel_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_LUT_CTL_REGISTER_ADDR,</div><div class='add'>+				lut_op_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * num_words);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_words; i += 2) {</div><div class='add'>+		ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+				       MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR +</div><div class='add'>+					       i,</div><div class='add'>+				       &amp;packed_record[i]);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+		ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+				       MSS_INGRESS_LUT_DATA_CTL_REGISTER_ADDR +</div><div class='add'>+					       i + 1,</div><div class='add'>+				       &amp;packed_record[i + 1]);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*! Write packed_record to the specified Egress LUT table row. */</div><div class='add'>+static int set_raw_egress_record(struct aq_hw_s *hw, u16 *packed_record,</div><div class='add'>+				 u8 num_words, u8 table_id,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	struct mss_egress_lut_addr_ctl_register lut_sel_reg;</div><div class='add'>+	struct mss_egress_lut_ctl_register lut_op_reg;</div><div class='add'>+</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Write the packed record words to the data buffer registers. */</div><div class='add'>+	for (i = 0; i &lt; num_words; i += 2) {</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR + i,</div><div class='add'>+				  packed_record[i]);</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR + i + 1,</div><div class='add'>+				  packed_record[i + 1]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear out the unused data buffer registers. */</div><div class='add'>+	for (i = num_words; i &lt; 28; i += 2) {</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR + i, 0);</div><div class='add'>+		aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				  MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR + i + 1,</div><div class='add'>+				  0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Select the table and row index to write to */</div><div class='add'>+	lut_sel_reg.bits_0.lut_select = table_id;</div><div class='add'>+	lut_sel_reg.bits_0.lut_addr = table_index;</div><div class='add'>+</div><div class='add'>+	lut_op_reg.bits_0.lut_read = 0;</div><div class='add'>+	lut_op_reg.bits_0.lut_write = 1;</div><div class='add'>+</div><div class='add'>+	aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+			  MSS_EGRESS_LUT_ADDR_CTL_REGISTER_ADDR,</div><div class='add'>+			  lut_sel_reg.word_0);</div><div class='add'>+	aq_mss_mdio_write(hw, MDIO_MMD_VEND1, MSS_EGRESS_LUT_CTL_REGISTER_ADDR,</div><div class='add'>+			  lut_op_reg.word_0);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_raw_egress_record(struct aq_hw_s *hw, u16 *packed_record,</div><div class='add'>+				 u8 num_words, u8 table_id,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	struct mss_egress_lut_addr_ctl_register lut_sel_reg;</div><div class='add'>+	struct mss_egress_lut_ctl_register lut_op_reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Select the table and row index to read */</div><div class='add'>+	lut_sel_reg.bits_0.lut_select = table_id;</div><div class='add'>+	lut_sel_reg.bits_0.lut_addr = table_index;</div><div class='add'>+</div><div class='add'>+	lut_op_reg.bits_0.lut_read = 1;</div><div class='add'>+	lut_op_reg.bits_0.lut_write = 0;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_LUT_ADDR_CTL_REGISTER_ADDR,</div><div class='add'>+				lut_sel_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_LUT_CTL_REGISTER_ADDR,</div><div class='add'>+				lut_op_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * num_words);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_words; i += 2) {</div><div class='add'>+		ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+				       MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR +</div><div class='add'>+					       i,</div><div class='add'>+				       &amp;packed_record[i]);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+		ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+				       MSS_EGRESS_LUT_DATA_CTL_REGISTER_ADDR +</div><div class='add'>+					       i + 1,</div><div class='add'>+				       &amp;packed_record[i + 1]);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+set_ingress_prectlf_record(struct aq_hw_s *hw,</div><div class='add'>+			   const struct aq_mss_ingress_prectlf_record *rec,</div><div class='add'>+			   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[6];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPRECTLFRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 6);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;sa_da[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;sa_da[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+	packed_record[2] = rec-&gt;sa_da[1] &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = rec-&gt;eth_type &amp; 0xFFFF;</div><div class='add'>+	packed_record[4] = rec-&gt;match_mask &amp; 0xFFFF;</div><div class='add'>+	packed_record[5] = rec-&gt;match_type &amp; 0xF;</div><div class='add'>+	packed_record[5] |= (rec-&gt;action &amp; 0x1) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	return set_raw_ingress_record(hw, packed_record, 6, 0,</div><div class='add'>+				      ROWOFFSET_INGRESSPRECTLFRECORD +</div><div class='add'>+					      table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_prectlf_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_prectlf_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_ingress_prectlf_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ingress_prectlf_record(struct aq_hw_s *hw,</div><div class='add'>+				      struct aq_mss_ingress_prectlf_record *rec,</div><div class='add'>+				      u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[6];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPRECTLFRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the row that we want to read is odd, first read the previous even</div><div class='add'>+	 * row, throw that value away, and finally read the desired row.</div><div class='add'>+	 * This is a workaround for EUR devices that allows us to read</div><div class='add'>+	 * odd-numbered rows.  For HHD devices: this workaround will not work,</div><div class='add'>+	 * so don't bother; odd-numbered rows are not readable.</div><div class='add'>+	 */</div><div class='add'>+	if ((table_index % 2) &gt; 0) {</div><div class='add'>+		ret = get_raw_ingress_record(hw, packed_record, 6, 0,</div><div class='add'>+					     ROWOFFSET_INGRESSPRECTLFRECORD +</div><div class='add'>+						     table_index - 1);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 6, 0,</div><div class='add'>+				     ROWOFFSET_INGRESSPRECTLFRECORD +</div><div class='add'>+					     table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_da[0] = packed_record[0];</div><div class='add'>+	rec-&gt;sa_da[0] |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_da[1] = packed_record[2];</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type = packed_record[3];</div><div class='add'>+</div><div class='add'>+	rec-&gt;match_mask = packed_record[4];</div><div class='add'>+</div><div class='add'>+	rec-&gt;match_type = packed_record[5] &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;action = (packed_record[5] &gt;&gt; 4) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_prectlf_record(struct aq_hw_s *hw,</div><div class='add'>+				      struct aq_mss_ingress_prectlf_record *rec,</div><div class='add'>+				      u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_prectlf_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+set_ingress_preclass_record(struct aq_hw_s *hw,</div><div class='add'>+			    const struct aq_mss_ingress_preclass_record *rec,</div><div class='add'>+			    u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[20];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPRECLASSRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 20);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;sci[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;sci[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;sci[1] &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;sci[1] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;tci &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;encr_offset &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[5] = rec-&gt;eth_type &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[6] = rec-&gt;snap[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[7] = (rec-&gt;snap[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[8] = rec-&gt;snap[1] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[8] |= (rec-&gt;llc &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[9] = (rec-&gt;llc &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[10] = rec-&gt;mac_sa[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[11] = (rec-&gt;mac_sa[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[12] = rec-&gt;mac_sa[1] &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[13] = rec-&gt;mac_da[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[14] = (rec-&gt;mac_da[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[15] = rec-&gt;mac_da[1] &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[16] = rec-&gt;lpbk_packet &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[16] |= (rec-&gt;an_mask &amp; 0x3) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[16] |= (rec-&gt;tci_mask &amp; 0x3F) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[16] |= (rec-&gt;sci_mask &amp; 0x7F) &lt;&lt; 9;</div><div class='add'>+	packed_record[17] = (rec-&gt;sci_mask &gt;&gt; 7) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[17] |= (rec-&gt;eth_type_mask &amp; 0x3) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[17] |= (rec-&gt;snap_mask &amp; 0x1F) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[17] |= (rec-&gt;llc_mask &amp; 0x7) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[17] |= (rec-&gt;_802_2_encapsulate &amp; 0x1) &lt;&lt; 11;</div><div class='add'>+</div><div class='add'>+	packed_record[17] |= (rec-&gt;sa_mask &amp; 0xF) &lt;&lt; 12;</div><div class='add'>+	packed_record[18] = (rec-&gt;sa_mask &gt;&gt; 4) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	packed_record[18] |= (rec-&gt;da_mask &amp; 0x3F) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[18] |= (rec-&gt;lpbk_mask &amp; 0x1) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[18] |= (rec-&gt;sc_idx &amp; 0x1F) &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+	packed_record[18] |= (rec-&gt;proc_dest &amp; 0x1) &lt;&lt; 14;</div><div class='add'>+</div><div class='add'>+	packed_record[18] |= (rec-&gt;action &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+	packed_record[19] = (rec-&gt;action &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[19] |= (rec-&gt;ctrl_unctrl &amp; 0x1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[19] |= (rec-&gt;sci_from_table &amp; 0x1) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[19] |= (rec-&gt;reserved &amp; 0xF) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[19] |= (rec-&gt;valid &amp; 0x1) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	return set_raw_ingress_record(hw, packed_record, 20, 1,</div><div class='add'>+				      ROWOFFSET_INGRESSPRECLASSRECORD +</div><div class='add'>+					      table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_preclass_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_preclass_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	int err = AQ_API_CALL_SAFE(set_ingress_preclass_record, hw, rec,</div><div class='add'>+				   table_index);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(err, "%s failed with %d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_ingress_preclass_record(struct aq_hw_s *hw,</div><div class='add'>+			    struct aq_mss_ingress_preclass_record *rec,</div><div class='add'>+			    u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[20];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPRECLASSRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the row that we want to read is odd, first read the previous even</div><div class='add'>+	 * row, throw that value away, and finally read the desired row.</div><div class='add'>+	 */</div><div class='add'>+	if ((table_index % 2) &gt; 0) {</div><div class='add'>+		ret = get_raw_ingress_record(hw, packed_record, 20, 1,</div><div class='add'>+					     ROWOFFSET_INGRESSPRECLASSRECORD +</div><div class='add'>+						     table_index - 1);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 20, 1,</div><div class='add'>+				     ROWOFFSET_INGRESSPRECLASSRECORD +</div><div class='add'>+					     table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci[0] = packed_record[0];</div><div class='add'>+	rec-&gt;sci[0] |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci[1] = packed_record[2];</div><div class='add'>+	rec-&gt;sci[1] |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci = packed_record[4] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;encr_offset = (packed_record[4] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type = packed_record[5];</div><div class='add'>+</div><div class='add'>+	rec-&gt;snap[0] = packed_record[6];</div><div class='add'>+	rec-&gt;snap[0] |= packed_record[7] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;snap[1] = packed_record[8] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;llc = (packed_record[8] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;llc |= packed_record[9] &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_sa[0] = packed_record[10];</div><div class='add'>+	rec-&gt;mac_sa[0] |= packed_record[11] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_sa[1] = packed_record[12];</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_da[0] = packed_record[13];</div><div class='add'>+	rec-&gt;mac_da[0] |= packed_record[14] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_da[1] = packed_record[15];</div><div class='add'>+</div><div class='add'>+	rec-&gt;lpbk_packet = packed_record[16] &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;an_mask = (packed_record[16] &gt;&gt; 1) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci_mask = (packed_record[16] &gt;&gt; 3) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci_mask = (packed_record[16] &gt;&gt; 9) &amp; 0x7F;</div><div class='add'>+	rec-&gt;sci_mask |= (packed_record[17] &amp; 0x1) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type_mask = (packed_record[17] &gt;&gt; 1) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;snap_mask = (packed_record[17] &gt;&gt; 3) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;llc_mask = (packed_record[17] &gt;&gt; 8) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	rec-&gt;_802_2_encapsulate = (packed_record[17] &gt;&gt; 11) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_mask = (packed_record[17] &gt;&gt; 12) &amp; 0xF;</div><div class='add'>+	rec-&gt;sa_mask |= (packed_record[18] &amp; 0x3) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	rec-&gt;da_mask = (packed_record[18] &gt;&gt; 2) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;lpbk_mask = (packed_record[18] &gt;&gt; 8) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sc_idx = (packed_record[18] &gt;&gt; 9) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;proc_dest = (packed_record[18] &gt;&gt; 14) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;action = (packed_record[18] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+	rec-&gt;action |= (packed_record[19] &amp; 0x1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;ctrl_unctrl = (packed_record[19] &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci_from_table = (packed_record[19] &gt;&gt; 2) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;reserved = (packed_record[19] &gt;&gt; 3) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[19] &gt;&gt; 7) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_preclass_record(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_preclass_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_preclass_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ingress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				 const struct aq_mss_ingress_sc_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSSCRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 8);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;stop_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;stop_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;start_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;start_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;validate_frames &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;replay_protect &amp; 0x1) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;anti_replay_window &amp; 0x1FFF) &lt;&lt; 3;</div><div class='add'>+	packed_record[5] = (rec-&gt;anti_replay_window &gt;&gt; 13) &amp; 0xFFFF;</div><div class='add'>+	packed_record[6] = (rec-&gt;anti_replay_window &gt;&gt; 29) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;receiving &amp; 0x1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;fresh &amp; 0x1) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;an_rol &amp; 0x1) &lt;&lt; 5;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;reserved &amp; 0x3FF) &lt;&lt; 6;</div><div class='add'>+	packed_record[7] = (rec-&gt;reserved &gt;&gt; 10) &amp; 0x7FFF;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;valid &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+</div><div class='add'>+	return set_raw_ingress_record(hw, packed_record, 8, 3,</div><div class='add'>+				      ROWOFFSET_INGRESSSCRECORD + table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				 const struct aq_mss_ingress_sc_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	int err = AQ_API_CALL_SAFE(set_ingress_sc_record, hw, rec, table_index);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(err, "%s failed with %d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ingress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				 struct aq_mss_ingress_sc_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSSCRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 8, 3,</div><div class='add'>+				     ROWOFFSET_INGRESSSCRECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;stop_time = packed_record[0];</div><div class='add'>+	rec-&gt;stop_time |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;start_time = packed_record[2];</div><div class='add'>+	rec-&gt;start_time |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;validate_frames = packed_record[4] &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;replay_protect = (packed_record[4] &gt;&gt; 2) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;anti_replay_window = (packed_record[4] &gt;&gt; 3) &amp; 0x1FFF;</div><div class='add'>+	rec-&gt;anti_replay_window |= packed_record[5] &lt;&lt; 13;</div><div class='add'>+	rec-&gt;anti_replay_window |= (packed_record[6] &amp; 0x7) &lt;&lt; 29;</div><div class='add'>+</div><div class='add'>+	rec-&gt;receiving = (packed_record[6] &gt;&gt; 3) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;fresh = (packed_record[6] &gt;&gt; 4) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;an_rol = (packed_record[6] &gt;&gt; 5) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;reserved = (packed_record[6] &gt;&gt; 6) &amp; 0x3FF;</div><div class='add'>+	rec-&gt;reserved |= (packed_record[7] &amp; 0x7FFF) &lt;&lt; 10;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[7] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				 struct aq_mss_ingress_sc_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_sc_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ingress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				 const struct aq_mss_ingress_sa_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSSARECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 8);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;stop_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;stop_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;start_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;start_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;next_pn &amp; 0xFFFF;</div><div class='add'>+	packed_record[5] = (rec-&gt;next_pn &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[6] = rec-&gt;sat_nextpn &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;in_use &amp; 0x1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;fresh &amp; 0x1) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;reserved &amp; 0x1FFF) &lt;&lt; 3;</div><div class='add'>+	packed_record[7] = (rec-&gt;reserved &gt;&gt; 13) &amp; 0x7FFF;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;valid &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+</div><div class='add'>+	return set_raw_ingress_record(hw, packed_record, 8, 3,</div><div class='add'>+				      ROWOFFSET_INGRESSSARECORD + table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				 const struct aq_mss_ingress_sa_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	int err = AQ_API_CALL_SAFE(set_ingress_sa_record, hw, rec, table_index);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(err, "%s failed with %d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ingress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				 struct aq_mss_ingress_sa_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSSARECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 8, 3,</div><div class='add'>+				     ROWOFFSET_INGRESSSARECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;stop_time = packed_record[0];</div><div class='add'>+	rec-&gt;stop_time |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;start_time = packed_record[2];</div><div class='add'>+	rec-&gt;start_time |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;next_pn = packed_record[4];</div><div class='add'>+	rec-&gt;next_pn |= packed_record[5] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sat_nextpn = packed_record[6] &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;in_use = (packed_record[6] &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;fresh = (packed_record[6] &gt;&gt; 2) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;reserved = (packed_record[6] &gt;&gt; 3) &amp; 0x1FFF;</div><div class='add'>+	rec-&gt;reserved |= (packed_record[7] &amp; 0x7FFF) &lt;&lt; 13;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[7] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				 struct aq_mss_ingress_sa_record *rec,</div><div class='add'>+				 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_sa_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+set_ingress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+			 const struct aq_mss_ingress_sakey_record *rec,</div><div class='add'>+			 u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[18];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSSAKEYRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 18);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;key[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;key[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;key[1] &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;key[1] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;key[2] &amp; 0xFFFF;</div><div class='add'>+	packed_record[5] = (rec-&gt;key[2] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[6] = rec-&gt;key[3] &amp; 0xFFFF;</div><div class='add'>+	packed_record[7] = (rec-&gt;key[3] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[8] = rec-&gt;key[4] &amp; 0xFFFF;</div><div class='add'>+	packed_record[9] = (rec-&gt;key[4] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[10] = rec-&gt;key[5] &amp; 0xFFFF;</div><div class='add'>+	packed_record[11] = (rec-&gt;key[5] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[12] = rec-&gt;key[6] &amp; 0xFFFF;</div><div class='add'>+	packed_record[13] = (rec-&gt;key[6] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[14] = rec-&gt;key[7] &amp; 0xFFFF;</div><div class='add'>+	packed_record[15] = (rec-&gt;key[7] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[16] = rec-&gt;key_len &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	ret = set_raw_ingress_record(hw, packed_record, 18, 2,</div><div class='add'>+				     ROWOFFSET_INGRESSSAKEYRECORD +</div><div class='add'>+				     table_index);</div><div class='add'>+</div><div class='add'>+	memzero_explicit(packed_record, sizeof(packed_record));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_sakey_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	int err = AQ_API_CALL_SAFE(set_ingress_sakey_record, hw, rec,</div><div class='add'>+				   table_index);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(err, "%s failed with %d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ingress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				    struct aq_mss_ingress_sakey_record *rec,</div><div class='add'>+				    u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[18];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSSAKEYRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 18, 2,</div><div class='add'>+				     ROWOFFSET_INGRESSSAKEYRECORD +</div><div class='add'>+					     table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[0] = packed_record[0];</div><div class='add'>+	rec-&gt;key[0] |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[1] = packed_record[2];</div><div class='add'>+	rec-&gt;key[1] |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[2] = packed_record[4];</div><div class='add'>+	rec-&gt;key[2] |= packed_record[5] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[3] = packed_record[6];</div><div class='add'>+	rec-&gt;key[3] |= packed_record[7] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[4] = packed_record[8];</div><div class='add'>+	rec-&gt;key[4] |= packed_record[9] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[5] = packed_record[10];</div><div class='add'>+	rec-&gt;key[5] |= packed_record[11] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[6] = packed_record[12];</div><div class='add'>+	rec-&gt;key[6] |= packed_record[13] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[7] = packed_record[14];</div><div class='add'>+	rec-&gt;key[7] |= packed_record[15] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key_len = packed_record[16] &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				    struct aq_mss_ingress_sakey_record *rec,</div><div class='add'>+				    u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_sakey_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+set_ingress_postclass_record(struct aq_hw_s *hw,</div><div class='add'>+			     const struct aq_mss_ingress_postclass_record *rec,</div><div class='add'>+			     u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPOSTCLASSRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 8);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;byte0 &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[0] |= (rec-&gt;byte1 &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[1] = rec-&gt;byte2 &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[1] |= (rec-&gt;byte3 &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;eth_type &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[3] = rec-&gt;eth_type_valid &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[3] |= (rec-&gt;vlan_id &amp; 0xFFF) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[3] |= (rec-&gt;vlan_up &amp; 0x7) &lt;&lt; 13;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;vlan_valid &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;sai &amp; 0x1F) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;sai_hit &amp; 0x1) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;eth_type_mask &amp; 0xF) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;byte3_location &amp; 0x1F) &lt;&lt; 11;</div><div class='add'>+	packed_record[5] = (rec-&gt;byte3_location &gt;&gt; 5) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;byte3_mask &amp; 0x3) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;byte2_location &amp; 0x3F) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;byte2_mask &amp; 0x3) &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;byte1_location &amp; 0x1F) &lt;&lt; 11;</div><div class='add'>+	packed_record[6] = (rec-&gt;byte1_location &gt;&gt; 5) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;byte1_mask &amp; 0x3) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;byte0_location &amp; 0x3F) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;byte0_mask &amp; 0x3) &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;eth_type_valid_mask &amp; 0x3) &lt;&lt; 11;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;vlan_id_mask &amp; 0x7) &lt;&lt; 13;</div><div class='add'>+	packed_record[7] = (rec-&gt;vlan_id_mask &gt;&gt; 3) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;vlan_up_mask &amp; 0x3) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;vlan_valid_mask &amp; 0x3) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;sai_mask &amp; 0x3) &lt;&lt; 5;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;sai_hit_mask &amp; 0x3) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;firstlevel_actions &amp; 0x1) &lt;&lt; 9;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;secondlevel_actions &amp; 0x1) &lt;&lt; 10;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;reserved &amp; 0xF) &lt;&lt; 11;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;valid &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+</div><div class='add'>+	return set_raw_ingress_record(hw, packed_record, 8, 4,</div><div class='add'>+				      ROWOFFSET_INGRESSPOSTCLASSRECORD +</div><div class='add'>+					      table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_postclass_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_postclass_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_ingress_postclass_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_ingress_postclass_record(struct aq_hw_s *hw,</div><div class='add'>+			     struct aq_mss_ingress_postclass_record *rec,</div><div class='add'>+			     u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPOSTCLASSRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the row that we want to read is odd, first read the previous even</div><div class='add'>+	 * row, throw that value away, and finally read the desired row.</div><div class='add'>+	 */</div><div class='add'>+	if ((table_index % 2) &gt; 0) {</div><div class='add'>+		ret = get_raw_ingress_record(hw, packed_record, 8, 4,</div><div class='add'>+					     ROWOFFSET_INGRESSPOSTCLASSRECORD +</div><div class='add'>+						     table_index - 1);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 8, 4,</div><div class='add'>+				     ROWOFFSET_INGRESSPOSTCLASSRECORD +</div><div class='add'>+					     table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte0 = packed_record[0] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte1 = (packed_record[0] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte2 = packed_record[1] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte3 = (packed_record[1] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type = packed_record[2];</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type_valid = packed_record[3] &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_id = (packed_record[3] &gt;&gt; 1) &amp; 0xFFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_up = (packed_record[3] &gt;&gt; 13) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_valid = packed_record[4] &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sai = (packed_record[4] &gt;&gt; 1) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sai_hit = (packed_record[4] &gt;&gt; 6) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type_mask = (packed_record[4] &gt;&gt; 7) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte3_location = (packed_record[4] &gt;&gt; 11) &amp; 0x1F;</div><div class='add'>+	rec-&gt;byte3_location |= (packed_record[5] &amp; 0x1) &lt;&lt; 5;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte3_mask = (packed_record[5] &gt;&gt; 1) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte2_location = (packed_record[5] &gt;&gt; 3) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte2_mask = (packed_record[5] &gt;&gt; 9) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte1_location = (packed_record[5] &gt;&gt; 11) &amp; 0x1F;</div><div class='add'>+	rec-&gt;byte1_location |= (packed_record[6] &amp; 0x1) &lt;&lt; 5;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte1_mask = (packed_record[6] &gt;&gt; 1) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte0_location = (packed_record[6] &gt;&gt; 3) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte0_mask = (packed_record[6] &gt;&gt; 9) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type_valid_mask = (packed_record[6] &gt;&gt; 11) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_id_mask = (packed_record[6] &gt;&gt; 13) &amp; 0x7;</div><div class='add'>+	rec-&gt;vlan_id_mask |= (packed_record[7] &amp; 0x1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_up_mask = (packed_record[7] &gt;&gt; 1) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_valid_mask = (packed_record[7] &gt;&gt; 3) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sai_mask = (packed_record[7] &gt;&gt; 5) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sai_hit_mask = (packed_record[7] &gt;&gt; 7) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;firstlevel_actions = (packed_record[7] &gt;&gt; 9) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;secondlevel_actions = (packed_record[7] &gt;&gt; 10) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;reserved = (packed_record[7] &gt;&gt; 11) &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[7] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_postclass_record(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_postclass_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_postclass_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+set_ingress_postctlf_record(struct aq_hw_s *hw,</div><div class='add'>+			    const struct aq_mss_ingress_postctlf_record *rec,</div><div class='add'>+			    u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[6];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPOSTCTLFRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 6);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;sa_da[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;sa_da[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;sa_da[1] &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[3] = rec-&gt;eth_type &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;match_mask &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[5] = rec-&gt;match_type &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;action &amp; 0x1) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	return set_raw_ingress_record(hw, packed_record, 6, 5,</div><div class='add'>+				      ROWOFFSET_INGRESSPOSTCTLFRECORD +</div><div class='add'>+					      table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_ingress_postctlf_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_postctlf_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_ingress_postctlf_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_ingress_postctlf_record(struct aq_hw_s *hw,</div><div class='add'>+			    struct aq_mss_ingress_postctlf_record *rec,</div><div class='add'>+			    u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[6];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_INGRESSPOSTCTLFRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the row that we want to read is odd, first read the previous even</div><div class='add'>+	 * row, throw that value away, and finally read the desired row.</div><div class='add'>+	 */</div><div class='add'>+	if ((table_index % 2) &gt; 0) {</div><div class='add'>+		ret = get_raw_ingress_record(hw, packed_record, 6, 5,</div><div class='add'>+					     ROWOFFSET_INGRESSPOSTCTLFRECORD +</div><div class='add'>+						     table_index - 1);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 6, 5,</div><div class='add'>+				     ROWOFFSET_INGRESSPOSTCTLFRECORD +</div><div class='add'>+					     table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_da[0] = packed_record[0];</div><div class='add'>+	rec-&gt;sa_da[0] |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_da[1] = packed_record[2];</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type = packed_record[3];</div><div class='add'>+</div><div class='add'>+	rec-&gt;match_mask = packed_record[4];</div><div class='add'>+</div><div class='add'>+	rec-&gt;match_type = packed_record[5] &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;action = (packed_record[5] &gt;&gt; 4) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_postctlf_record(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_postctlf_record *rec,</div><div class='add'>+	u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_postctlf_record, hw, rec,</div><div class='add'>+				table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_ctlf_record(struct aq_hw_s *hw,</div><div class='add'>+				  const struct aq_mss_egress_ctlf_record *rec,</div><div class='add'>+				  u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[6];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSCTLFRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 6);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;sa_da[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;sa_da[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;sa_da[1] &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[3] = rec-&gt;eth_type &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;match_mask &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[5] = rec-&gt;match_type &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;action &amp; 0x1) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	return set_raw_egress_record(hw, packed_record, 6, 0,</div><div class='add'>+				     ROWOFFSET_EGRESSCTLFRECORD + table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_ctlf_record(struct aq_hw_s *hw,</div><div class='add'>+				  const struct aq_mss_egress_ctlf_record *rec,</div><div class='add'>+				  u16 table_index)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_egress_ctlf_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_ctlf_record(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_ctlf_record *rec,</div><div class='add'>+				  u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[6];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSCTLFRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the row that we want to read is odd, first read the previous even</div><div class='add'>+	 * row, throw that value away, and finally read the desired row.</div><div class='add'>+	 */</div><div class='add'>+	if ((table_index % 2) &gt; 0) {</div><div class='add'>+		ret = get_raw_egress_record(hw, packed_record, 6, 0,</div><div class='add'>+					    ROWOFFSET_EGRESSCTLFRECORD +</div><div class='add'>+						    table_index - 1);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 6, 0,</div><div class='add'>+				    ROWOFFSET_EGRESSCTLFRECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_da[0] = packed_record[0];</div><div class='add'>+	rec-&gt;sa_da[0] |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_da[1] = packed_record[2];</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type = packed_record[3];</div><div class='add'>+</div><div class='add'>+	rec-&gt;match_mask = packed_record[4];</div><div class='add'>+</div><div class='add'>+	rec-&gt;match_type = packed_record[5] &amp; 0xF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;action = (packed_record[5] &gt;&gt; 4) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_ctlf_record(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_ctlf_record *rec,</div><div class='add'>+				  u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_ctlf_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_class_record(struct aq_hw_s *hw,</div><div class='add'>+				   const struct aq_mss_egress_class_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[28];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSCLASSRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 28);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;vlan_id &amp; 0xFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[0] |= (rec-&gt;vlan_up &amp; 0x7) &lt;&lt; 12;</div><div class='add'>+</div><div class='add'>+	packed_record[0] |= (rec-&gt;vlan_valid &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+</div><div class='add'>+	packed_record[1] = rec-&gt;byte3 &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[1] |= (rec-&gt;byte2 &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;byte1 &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] |= (rec-&gt;byte0 &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[3] = rec-&gt;tci &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[3] |= (rec-&gt;sci[0] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[4] = (rec-&gt;sci[0] &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+	packed_record[5] = (rec-&gt;sci[0] &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;sci[1] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[6] = (rec-&gt;sci[1] &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+	packed_record[7] = (rec-&gt;sci[1] &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[7] |= (rec-&gt;eth_type &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[8] = (rec-&gt;eth_type &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[8] |= (rec-&gt;snap[0] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[9] = (rec-&gt;snap[0] &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+	packed_record[10] = (rec-&gt;snap[0] &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[10] |= (rec-&gt;snap[1] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[11] = rec-&gt;llc &amp; 0xFFFF;</div><div class='add'>+	packed_record[12] = (rec-&gt;llc &gt;&gt; 16) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[12] |= (rec-&gt;mac_sa[0] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[13] = (rec-&gt;mac_sa[0] &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+	packed_record[14] = (rec-&gt;mac_sa[0] &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[14] |= (rec-&gt;mac_sa[1] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[15] = (rec-&gt;mac_sa[1] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[15] |= (rec-&gt;mac_da[0] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[16] = (rec-&gt;mac_da[0] &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+	packed_record[17] = (rec-&gt;mac_da[0] &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[17] |= (rec-&gt;mac_da[1] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[18] = (rec-&gt;mac_da[1] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[18] |= (rec-&gt;pn &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+	packed_record[19] = (rec-&gt;pn &gt;&gt; 8) &amp; 0xFFFF;</div><div class='add'>+	packed_record[20] = (rec-&gt;pn &gt;&gt; 24) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[20] |= (rec-&gt;byte3_location &amp; 0x3F) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[20] |= (rec-&gt;byte3_mask &amp; 0x1) &lt;&lt; 14;</div><div class='add'>+</div><div class='add'>+	packed_record[20] |= (rec-&gt;byte2_location &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+	packed_record[21] = (rec-&gt;byte2_location &gt;&gt; 1) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	packed_record[21] |= (rec-&gt;byte2_mask &amp; 0x1) &lt;&lt; 5;</div><div class='add'>+</div><div class='add'>+	packed_record[21] |= (rec-&gt;byte1_location &amp; 0x3F) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	packed_record[21] |= (rec-&gt;byte1_mask &amp; 0x1) &lt;&lt; 12;</div><div class='add'>+</div><div class='add'>+	packed_record[21] |= (rec-&gt;byte0_location &amp; 0x7) &lt;&lt; 13;</div><div class='add'>+	packed_record[22] = (rec-&gt;byte0_location &gt;&gt; 3) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	packed_record[22] |= (rec-&gt;byte0_mask &amp; 0x1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[22] |= (rec-&gt;vlan_id_mask &amp; 0x3) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	packed_record[22] |= (rec-&gt;vlan_up_mask &amp; 0x1) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	packed_record[22] |= (rec-&gt;vlan_valid_mask &amp; 0x1) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	packed_record[22] |= (rec-&gt;tci_mask &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[23] = rec-&gt;sci_mask &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	packed_record[23] |= (rec-&gt;eth_type_mask &amp; 0x3) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[23] |= (rec-&gt;snap_mask &amp; 0x1F) &lt;&lt; 10;</div><div class='add'>+</div><div class='add'>+	packed_record[23] |= (rec-&gt;llc_mask &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+	packed_record[24] = (rec-&gt;llc_mask &gt;&gt; 1) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	packed_record[24] |= (rec-&gt;sa_mask &amp; 0x3F) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[24] |= (rec-&gt;da_mask &amp; 0x3F) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	packed_record[24] |= (rec-&gt;pn_mask &amp; 0x3) &lt;&lt; 14;</div><div class='add'>+	packed_record[25] = (rec-&gt;pn_mask &gt;&gt; 2) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;eight02dot2 &amp; 0x1) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;tci_sc &amp; 0x1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;tci_87543 &amp; 0x1) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;exp_sectag_en &amp; 0x1) &lt;&lt; 5;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;sc_idx &amp; 0x1F) &lt;&lt; 6;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;sc_sa &amp; 0x3) &lt;&lt; 11;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;debug &amp; 0x1) &lt;&lt; 13;</div><div class='add'>+</div><div class='add'>+	packed_record[25] |= (rec-&gt;action &amp; 0x3) &lt;&lt; 14;</div><div class='add'>+</div><div class='add'>+	packed_record[26] = (rec-&gt;valid &amp; 0x1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	return set_raw_egress_record(hw, packed_record, 28, 1,</div><div class='add'>+				     ROWOFFSET_EGRESSCLASSRECORD + table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_class_record(struct aq_hw_s *hw,</div><div class='add'>+				   const struct aq_mss_egress_class_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_egress_class_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_class_record(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_egress_class_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[28];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSCLASSRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* If the row that we want to read is odd, first read the previous even</div><div class='add'>+	 * row, throw that value away, and finally read the desired row.</div><div class='add'>+	 */</div><div class='add'>+	if ((table_index % 2) &gt; 0) {</div><div class='add'>+		ret = get_raw_egress_record(hw, packed_record, 28, 1,</div><div class='add'>+					    ROWOFFSET_EGRESSCLASSRECORD +</div><div class='add'>+						    table_index - 1);</div><div class='add'>+		if (unlikely(ret))</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 28, 1,</div><div class='add'>+				    ROWOFFSET_EGRESSCLASSRECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_id = packed_record[0] &amp; 0xFFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_up = (packed_record[0] &gt;&gt; 12) &amp; 0x7;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_valid = (packed_record[0] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte3 = packed_record[1] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte2 = (packed_record[1] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte1 = packed_record[2] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte0 = (packed_record[2] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci = packed_record[3] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci[0] = (packed_record[3] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;sci[0] |= packed_record[4] &lt;&lt; 8;</div><div class='add'>+	rec-&gt;sci[0] |= (packed_record[5] &amp; 0xFF) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci[1] = (packed_record[5] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;sci[1] |= packed_record[6] &lt;&lt; 8;</div><div class='add'>+	rec-&gt;sci[1] |= (packed_record[7] &amp; 0xFF) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type = (packed_record[7] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;eth_type |= (packed_record[8] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	rec-&gt;snap[0] = (packed_record[8] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;snap[0] |= packed_record[9] &lt;&lt; 8;</div><div class='add'>+	rec-&gt;snap[0] |= (packed_record[10] &amp; 0xFF) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	rec-&gt;snap[1] = (packed_record[10] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;llc = packed_record[11];</div><div class='add'>+	rec-&gt;llc |= (packed_record[12] &amp; 0xFF) &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_sa[0] = (packed_record[12] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;mac_sa[0] |= packed_record[13] &lt;&lt; 8;</div><div class='add'>+	rec-&gt;mac_sa[0] |= (packed_record[14] &amp; 0xFF) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_sa[1] = (packed_record[14] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;mac_sa[1] |= (packed_record[15] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_da[0] = (packed_record[15] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;mac_da[0] |= packed_record[16] &lt;&lt; 8;</div><div class='add'>+	rec-&gt;mac_da[0] |= (packed_record[17] &amp; 0xFF) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	rec-&gt;mac_da[1] = (packed_record[17] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;mac_da[1] |= (packed_record[18] &amp; 0xFF) &lt;&lt; 8;</div><div class='add'>+</div><div class='add'>+	rec-&gt;pn = (packed_record[18] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+	rec-&gt;pn |= packed_record[19] &lt;&lt; 8;</div><div class='add'>+	rec-&gt;pn |= (packed_record[20] &amp; 0xFF) &lt;&lt; 24;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte3_location = (packed_record[20] &gt;&gt; 8) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte3_mask = (packed_record[20] &gt;&gt; 14) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte2_location = (packed_record[20] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+	rec-&gt;byte2_location |= (packed_record[21] &amp; 0x1F) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte2_mask = (packed_record[21] &gt;&gt; 5) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte1_location = (packed_record[21] &gt;&gt; 6) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte1_mask = (packed_record[21] &gt;&gt; 12) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte0_location = (packed_record[21] &gt;&gt; 13) &amp; 0x7;</div><div class='add'>+	rec-&gt;byte0_location |= (packed_record[22] &amp; 0x7) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;byte0_mask = (packed_record[22] &gt;&gt; 3) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_id_mask = (packed_record[22] &gt;&gt; 4) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_up_mask = (packed_record[22] &gt;&gt; 6) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;vlan_valid_mask = (packed_record[22] &gt;&gt; 7) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci_mask = (packed_record[22] &gt;&gt; 8) &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sci_mask = packed_record[23] &amp; 0xFF;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eth_type_mask = (packed_record[23] &gt;&gt; 8) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;snap_mask = (packed_record[23] &gt;&gt; 10) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;llc_mask = (packed_record[23] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+	rec-&gt;llc_mask |= (packed_record[24] &amp; 0x3) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sa_mask = (packed_record[24] &gt;&gt; 2) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;da_mask = (packed_record[24] &gt;&gt; 8) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;pn_mask = (packed_record[24] &gt;&gt; 14) &amp; 0x3;</div><div class='add'>+	rec-&gt;pn_mask |= (packed_record[25] &amp; 0x3) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	rec-&gt;eight02dot2 = (packed_record[25] &gt;&gt; 2) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci_sc = (packed_record[25] &gt;&gt; 3) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci_87543 = (packed_record[25] &gt;&gt; 4) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;exp_sectag_en = (packed_record[25] &gt;&gt; 5) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sc_idx = (packed_record[25] &gt;&gt; 6) &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sc_sa = (packed_record[25] &gt;&gt; 11) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;debug = (packed_record[25] &gt;&gt; 13) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;action = (packed_record[25] &gt;&gt; 14) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[26] &gt;&gt; 3) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_class_record(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_egress_class_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_class_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				const struct aq_mss_egress_sc_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSSCRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 8);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;start_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;start_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;stop_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;stop_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;curr_an &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;an_roll &amp; 0x1) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;tci &amp; 0x3F) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[4] |= (rec-&gt;enc_off &amp; 0x7F) &lt;&lt; 9;</div><div class='add'>+	packed_record[5] = (rec-&gt;enc_off &gt;&gt; 7) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;protect &amp; 0x1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;recv &amp; 0x1) &lt;&lt; 2;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;fresh &amp; 0x1) &lt;&lt; 3;</div><div class='add'>+</div><div class='add'>+	packed_record[5] |= (rec-&gt;sak_len &amp; 0x3) &lt;&lt; 4;</div><div class='add'>+</div><div class='add'>+	packed_record[7] = (rec-&gt;valid &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+</div><div class='add'>+	return set_raw_egress_record(hw, packed_record, 8, 2,</div><div class='add'>+				     ROWOFFSET_EGRESSSCRECORD + table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				const struct aq_mss_egress_sc_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_egress_sc_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				struct aq_mss_egress_sc_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSSCRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 8, 2,</div><div class='add'>+				    ROWOFFSET_EGRESSSCRECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;start_time = packed_record[0];</div><div class='add'>+	rec-&gt;start_time |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;stop_time = packed_record[2];</div><div class='add'>+	rec-&gt;stop_time |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;curr_an = packed_record[4] &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;an_roll = (packed_record[4] &gt;&gt; 2) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;tci = (packed_record[4] &gt;&gt; 3) &amp; 0x3F;</div><div class='add'>+</div><div class='add'>+	rec-&gt;enc_off = (packed_record[4] &gt;&gt; 9) &amp; 0x7F;</div><div class='add'>+	rec-&gt;enc_off |= (packed_record[5] &amp; 0x1) &lt;&lt; 7;</div><div class='add'>+</div><div class='add'>+	rec-&gt;protect = (packed_record[5] &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;recv = (packed_record[5] &gt;&gt; 2) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;fresh = (packed_record[5] &gt;&gt; 3) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sak_len = (packed_record[5] &gt;&gt; 4) &amp; 0x3;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[7] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				struct aq_mss_egress_sc_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sc_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				const struct aq_mss_egress_sa_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSSARECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 8);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;start_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;start_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;stop_time &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;stop_time &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;next_pn &amp; 0xFFFF;</div><div class='add'>+	packed_record[5] = (rec-&gt;next_pn &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[6] = rec-&gt;sat_pn &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	packed_record[6] |= (rec-&gt;fresh &amp; 0x1) &lt;&lt; 1;</div><div class='add'>+</div><div class='add'>+	packed_record[7] = (rec-&gt;valid &amp; 0x1) &lt;&lt; 15;</div><div class='add'>+</div><div class='add'>+	return set_raw_egress_record(hw, packed_record, 8, 2,</div><div class='add'>+				     ROWOFFSET_EGRESSSARECORD + table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				const struct aq_mss_egress_sa_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	int err = AQ_API_CALL_SAFE(set_egress_sa_record, hw, rec, table_index);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(err, "%s failed with %d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				struct aq_mss_egress_sa_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[8];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSSARECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 8, 2,</div><div class='add'>+				    ROWOFFSET_EGRESSSARECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;start_time = packed_record[0];</div><div class='add'>+	rec-&gt;start_time |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;stop_time = packed_record[2];</div><div class='add'>+	rec-&gt;stop_time |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;next_pn = packed_record[4];</div><div class='add'>+	rec-&gt;next_pn |= packed_record[5] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;sat_pn = packed_record[6] &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;fresh = (packed_record[6] &gt;&gt; 1) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	rec-&gt;valid = (packed_record[7] &gt;&gt; 15) &amp; 0x1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				struct aq_mss_egress_sa_record *rec,</div><div class='add'>+				u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sa_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				   const struct aq_mss_egress_sakey_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[16];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSSAKEYRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	memset(packed_record, 0, sizeof(u16) * 16);</div><div class='add'>+</div><div class='add'>+	packed_record[0] = rec-&gt;key[0] &amp; 0xFFFF;</div><div class='add'>+	packed_record[1] = (rec-&gt;key[0] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[2] = rec-&gt;key[1] &amp; 0xFFFF;</div><div class='add'>+	packed_record[3] = (rec-&gt;key[1] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[4] = rec-&gt;key[2] &amp; 0xFFFF;</div><div class='add'>+	packed_record[5] = (rec-&gt;key[2] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[6] = rec-&gt;key[3] &amp; 0xFFFF;</div><div class='add'>+	packed_record[7] = (rec-&gt;key[3] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[8] = rec-&gt;key[4] &amp; 0xFFFF;</div><div class='add'>+	packed_record[9] = (rec-&gt;key[4] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[10] = rec-&gt;key[5] &amp; 0xFFFF;</div><div class='add'>+	packed_record[11] = (rec-&gt;key[5] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[12] = rec-&gt;key[6] &amp; 0xFFFF;</div><div class='add'>+	packed_record[13] = (rec-&gt;key[6] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	packed_record[14] = rec-&gt;key[7] &amp; 0xFFFF;</div><div class='add'>+	packed_record[15] = (rec-&gt;key[7] &gt;&gt; 16) &amp; 0xFFFF;</div><div class='add'>+</div><div class='add'>+	ret = set_raw_egress_record(hw, packed_record, 8, 2,</div><div class='add'>+				    ROWOFFSET_EGRESSSAKEYRECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		goto clear_key;</div><div class='add'>+	ret = set_raw_egress_record(hw, packed_record + 8, 8, 2,</div><div class='add'>+				    ROWOFFSET_EGRESSSAKEYRECORD + table_index -</div><div class='add'>+					    32);</div><div class='add'>+</div><div class='add'>+clear_key:</div><div class='add'>+	memzero_explicit(packed_record, sizeof(packed_record));</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				   const struct aq_mss_egress_sakey_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	int err = AQ_API_CALL_SAFE(set_egress_sakey_record, hw, rec,</div><div class='add'>+				   table_index);</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(err, "%s failed with %d\n", __func__, err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_egress_sakey_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[16];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (table_index &gt;= NUMROWS_EGRESSSAKEYRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 8, 2,</div><div class='add'>+				    ROWOFFSET_EGRESSSAKEYRECORD + table_index);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record + 8, 8, 2,</div><div class='add'>+				    ROWOFFSET_EGRESSSAKEYRECORD + table_index -</div><div class='add'>+					    32);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[0] = packed_record[0];</div><div class='add'>+	rec-&gt;key[0] |= packed_record[1] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[1] = packed_record[2];</div><div class='add'>+	rec-&gt;key[1] |= packed_record[3] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[2] = packed_record[4];</div><div class='add'>+	rec-&gt;key[2] |= packed_record[5] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[3] = packed_record[6];</div><div class='add'>+	rec-&gt;key[3] |= packed_record[7] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[4] = packed_record[8];</div><div class='add'>+	rec-&gt;key[4] |= packed_record[9] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[5] = packed_record[10];</div><div class='add'>+	rec-&gt;key[5] |= packed_record[11] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[6] = packed_record[12];</div><div class='add'>+	rec-&gt;key[6] |= packed_record[13] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	rec-&gt;key[7] = packed_record[14];</div><div class='add'>+	rec-&gt;key[7] |= packed_record[15] &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_egress_sakey_record *rec,</div><div class='add'>+				   u16 table_index)</div><div class='add'>+{</div><div class='add'>+	memset(rec, 0, sizeof(*rec));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sakey_record, hw, rec, table_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sc_counters(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_sc_counters *counters,</div><div class='add'>+				  u16 sc_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (sc_index &gt;= NUMROWS_EGRESSSCRECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sc_index * 8 + 4);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sc_protected_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sc_protected_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sc_index * 8 + 5);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sc_encrypted_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sc_encrypted_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sc_index * 8 + 6);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sc_protected_octets[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sc_protected_octets[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sc_index * 8 + 7);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sc_encrypted_octets[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sc_encrypted_octets[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sc_counters(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_sc_counters *counters,</div><div class='add'>+				  u16 sc_index)</div><div class='add'>+{</div><div class='add'>+	memset(counters, 0, sizeof(*counters));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sc_counters, hw, counters, sc_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sa_counters(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_sa_counters *counters,</div><div class='add'>+				  u16 sa_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (sa_index &gt;= NUMROWS_EGRESSSARECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sa_index * 8 + 0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sa_hit_drop_redirect[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sa_hit_drop_redirect[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sa_index * 8 + 1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sa_protected2_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sa_protected2_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sa_index * 8 + 2);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sa_protected_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sa_protected_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, sa_index * 8 + 3);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;sa_encrypted_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;sa_encrypted_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sa_counters(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_sa_counters *counters,</div><div class='add'>+				  u16 sa_index)</div><div class='add'>+{</div><div class='add'>+	memset(counters, 0, sizeof(*counters));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sa_counters, hw, counters, sa_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_egress_common_counters(struct aq_hw_s *hw,</div><div class='add'>+			   struct aq_mss_egress_common_counters *counters)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, 256 + 0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ctl_pkt[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ctl_pkt[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, 256 + 1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unknown_sa_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unknown_sa_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, 256 + 2);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;untagged_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;untagged_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, 256 + 3);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;too_long[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;too_long[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, 256 + 4);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ecc_error_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ecc_error_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_egress_record(hw, packed_record, 4, 3, 256 + 5);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unctrl_hit_drop_redir[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unctrl_hit_drop_redir[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_common_counters(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_egress_common_counters *counters)</div><div class='add'>+{</div><div class='add'>+	memset(counters, 0, sizeof(*counters));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_common_counters, hw, counters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clear_egress_counters(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	struct mss_egress_ctl_register ctl_reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctl_reg, 0, sizeof(ctl_reg));</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1, MSS_EGRESS_CTL_REGISTER_ADDR,</div><div class='add'>+			       &amp;ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+			       MSS_EGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+			       &amp;ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Toggle the Egress MIB clear bit 0-&gt;1-&gt;0 */</div><div class='add'>+	ctl_reg.bits_0.clear_counter = 0;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_CTL_REGISTER_ADDR, ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+				ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctl_reg.bits_0.clear_counter = 1;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_CTL_REGISTER_ADDR, ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+				ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctl_reg.bits_0.clear_counter = 0;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_CTL_REGISTER_ADDR, ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+				ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_clear_egress_counters(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(clear_egress_counters, hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_ingress_sa_counters(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_ingress_sa_counters *counters,</div><div class='add'>+				   u16 sa_index)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (sa_index &gt;= NUMROWS_INGRESSSARECORD)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;untagged_hit_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;untagged_hit_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ctrl_hit_drop_redir_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ctrl_hit_drop_redir_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 2);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;not_using_sa[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;not_using_sa[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 3);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unused_sa[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unused_sa[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 4);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;not_valid_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;not_valid_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 5);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;invalid_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;invalid_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 6);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ok_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ok_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 7);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;late_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;late_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 8);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;delayed_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;delayed_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 9);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unchecked_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unchecked_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 10);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;validated_octets[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;validated_octets[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6,</div><div class='add'>+				     sa_index * 12 + 11);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;decrypted_octets[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;decrypted_octets[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_sa_counters(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_ingress_sa_counters *counters,</div><div class='add'>+				   u16 sa_index)</div><div class='add'>+{</div><div class='add'>+	memset(counters, 0, sizeof(*counters));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_sa_counters, hw, counters,</div><div class='add'>+				sa_index);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+get_ingress_common_counters(struct aq_hw_s *hw,</div><div class='add'>+			    struct aq_mss_ingress_common_counters *counters)</div><div class='add'>+{</div><div class='add'>+	u16 packed_record[4];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ctl_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ctl_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;tagged_miss_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;tagged_miss_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 2);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;untagged_miss_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;untagged_miss_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 3);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;notag_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;notag_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 4);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;untagged_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;untagged_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 5);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;bad_tag_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;bad_tag_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 6);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;no_sci_pkts[0] = packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;no_sci_pkts[1] = packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 7);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unknown_sci_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unknown_sci_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 8);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ctrl_prt_pass_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ctrl_prt_pass_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 9);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unctrl_prt_pass_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unctrl_prt_pass_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 10);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ctrl_prt_fail_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ctrl_prt_fail_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 11);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unctrl_prt_fail_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unctrl_prt_fail_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 12);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;too_long_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;too_long_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 13);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;igpoc_ctl_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;igpoc_ctl_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 14);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;ecc_error_pkts[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;ecc_error_pkts[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	ret = get_raw_ingress_record(hw, packed_record, 4, 6, 385 + 15);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	counters-&gt;unctrl_hit_drop_redir[0] =</div><div class='add'>+		packed_record[0] | (packed_record[1] &lt;&lt; 16);</div><div class='add'>+	counters-&gt;unctrl_hit_drop_redir[1] =</div><div class='add'>+		packed_record[2] | (packed_record[3] &lt;&lt; 16);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_ingress_common_counters(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_common_counters *counters)</div><div class='add'>+{</div><div class='add'>+	memset(counters, 0, sizeof(*counters));</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_ingress_common_counters, hw, counters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int clear_ingress_counters(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	struct mss_ingress_ctl_register ctl_reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(&amp;ctl_reg, 0, sizeof(ctl_reg));</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+			       MSS_INGRESS_CTL_REGISTER_ADDR, &amp;ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+			       MSS_INGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+			       &amp;ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Toggle the Ingress MIB clear bit 0-&gt;1-&gt;0 */</div><div class='add'>+	ctl_reg.bits_0.clear_count = 0;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_CTL_REGISTER_ADDR, ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+				ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctl_reg.bits_0.clear_count = 1;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_CTL_REGISTER_ADDR, ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+				ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ctl_reg.bits_0.clear_count = 0;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_CTL_REGISTER_ADDR, ctl_reg.word_0);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_INGRESS_CTL_REGISTER_ADDR + 4,</div><div class='add'>+				ctl_reg.word_1);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_clear_ingress_counters(struct aq_hw_s *hw)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(clear_ingress_counters, hw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sa_expired(struct aq_hw_s *hw, u32 *expired)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+			       MSS_EGRESS_SA_EXPIRED_STATUS_REGISTER_ADDR,</div><div class='add'>+			       &amp;val);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*expired = val;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+			       MSS_EGRESS_SA_EXPIRED_STATUS_REGISTER_ADDR + 1,</div><div class='add'>+			       &amp;val);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*expired |= val &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sa_expired(struct aq_hw_s *hw, u32 *expired)</div><div class='add'>+{</div><div class='add'>+	*expired = 0;</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sa_expired, hw, expired);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_egress_sa_threshold_expired(struct aq_hw_s *hw,</div><div class='add'>+					   u32 *expired)</div><div class='add'>+{</div><div class='add'>+	u16 val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+		MSS_EGRESS_SA_THRESHOLD_EXPIRED_STATUS_REGISTER_ADDR, &amp;val);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*expired = val;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_read(hw, MDIO_MMD_VEND1,</div><div class='add'>+		MSS_EGRESS_SA_THRESHOLD_EXPIRED_STATUS_REGISTER_ADDR + 1, &amp;val);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	*expired |= val &lt;&lt; 16;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_get_egress_sa_threshold_expired(struct aq_hw_s *hw,</div><div class='add'>+					   u32 *expired)</div><div class='add'>+{</div><div class='add'>+	*expired = 0;</div><div class='add'>+</div><div class='add'>+	return AQ_API_CALL_SAFE(get_egress_sa_threshold_expired, hw, expired);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_sa_expired(struct aq_hw_s *hw, u32 expired)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_SA_EXPIRED_STATUS_REGISTER_ADDR,</div><div class='add'>+				expired &amp; 0xFFFF);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+				MSS_EGRESS_SA_EXPIRED_STATUS_REGISTER_ADDR + 1,</div><div class='add'>+				expired &gt;&gt; 16);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_sa_expired(struct aq_hw_s *hw, u32 expired)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_egress_sa_expired, hw, expired);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_egress_sa_threshold_expired(struct aq_hw_s *hw, u32 expired)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+		MSS_EGRESS_SA_THRESHOLD_EXPIRED_STATUS_REGISTER_ADDR,</div><div class='add'>+		expired &amp; 0xFFFF);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = aq_mss_mdio_write(hw, MDIO_MMD_VEND1,</div><div class='add'>+		MSS_EGRESS_SA_THRESHOLD_EXPIRED_STATUS_REGISTER_ADDR + 1,</div><div class='add'>+		expired &gt;&gt; 16);</div><div class='add'>+	if (unlikely(ret))</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int aq_mss_set_egress_sa_threshold_expired(struct aq_hw_s *hw, u32 expired)</div><div class='add'>+{</div><div class='add'>+	return AQ_API_CALL_SAFE(set_egress_sa_threshold_expired, hw, expired);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h b/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h<br/>new file mode 100644<br/>index 000000000000..ff03cc462a37<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/macsec/macsec_api.h</a></div><div class='hunk'>@@ -0,0 +1,323 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __MACSEC_API_H__</div><div class='add'>+#define __MACSEC_API_H__</div><div class='add'>+</div><div class='add'>+#include "aq_hw.h"</div><div class='add'>+#include "macsec_struct.h"</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSPRECTLFRECORD 24</div><div class='add'>+#define ROWOFFSET_INGRESSPRECTLFRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSPRECLASSRECORD 48</div><div class='add'>+#define ROWOFFSET_INGRESSPRECLASSRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSPOSTCLASSRECORD 48</div><div class='add'>+#define ROWOFFSET_INGRESSPOSTCLASSRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSSCRECORD 32</div><div class='add'>+#define ROWOFFSET_INGRESSSCRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSSARECORD 32</div><div class='add'>+#define ROWOFFSET_INGRESSSARECORD 32</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSSAKEYRECORD 32</div><div class='add'>+#define ROWOFFSET_INGRESSSAKEYRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_INGRESSPOSTCTLFRECORD 24</div><div class='add'>+#define ROWOFFSET_INGRESSPOSTCTLFRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_EGRESSCTLFRECORD 24</div><div class='add'>+#define ROWOFFSET_EGRESSCTLFRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_EGRESSCLASSRECORD 48</div><div class='add'>+#define ROWOFFSET_EGRESSCLASSRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_EGRESSSCRECORD 32</div><div class='add'>+#define ROWOFFSET_EGRESSSCRECORD 0</div><div class='add'>+</div><div class='add'>+#define NUMROWS_EGRESSSARECORD 32</div><div class='add'>+#define ROWOFFSET_EGRESSSARECORD 32</div><div class='add'>+</div><div class='add'>+#define NUMROWS_EGRESSSAKEYRECORD 32</div><div class='add'>+#define ROWOFFSET_EGRESSSAKEYRECORD 96</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Egress CTL</div><div class='add'>+ *   Filter table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 23).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_ctlf_record(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_ctlf_record *rec,</div><div class='add'>+				  u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Egress CTL Filter table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 23).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_egress_ctlf_record(struct aq_hw_s *hw,</div><div class='add'>+				  const struct aq_mss_egress_ctlf_record *rec,</div><div class='add'>+				  u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Egress</div><div class='add'>+ *   Packet Classifier table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 47).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_class_record(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_egress_class_record *rec,</div><div class='add'>+				   u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Egress Packet Classifier table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write (max 47).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_egress_class_record(struct aq_hw_s *hw,</div><div class='add'>+				   const struct aq_mss_egress_class_record *rec,</div><div class='add'>+				   u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Egress SC</div><div class='add'>+ *   Lookup table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				struct aq_mss_egress_sc_record *rec,</div><div class='add'>+				u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Egress SC Lookup table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_egress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				const struct aq_mss_egress_sc_record *rec,</div><div class='add'>+				u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Egress SA</div><div class='add'>+ *   Lookup table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				struct aq_mss_egress_sa_record *rec,</div><div class='add'>+				u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Egress SA Lookup table.</div><div class='add'>+ *  rec  - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_egress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				const struct aq_mss_egress_sa_record *rec,</div><div class='add'>+				u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Egress SA</div><div class='add'>+ *   Key Lookup table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_egress_sakey_record *rec,</div><div class='add'>+				   u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Egress SA Key Lookup table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_egress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				   const struct aq_mss_egress_sakey_record *rec,</div><div class='add'>+				   u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress</div><div class='add'>+ *   Pre-MACSec CTL Filter table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 23).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_prectlf_record(struct aq_hw_s *hw,</div><div class='add'>+				      struct aq_mss_ingress_prectlf_record *rec,</div><div class='add'>+				      u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress Pre-MACSec CTL Filter table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 23).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_prectlf_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_prectlf_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress</div><div class='add'>+ *   Pre-MACSec Packet Classifier table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 47).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_preclass_record(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_preclass_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress Pre-MACSec Packet Classifier table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 47).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_preclass_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_preclass_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress SC</div><div class='add'>+ *   Lookup table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				 struct aq_mss_ingress_sc_record *rec,</div><div class='add'>+				 u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress SC Lookup table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_sc_record(struct aq_hw_s *hw,</div><div class='add'>+				 const struct aq_mss_ingress_sc_record *rec,</div><div class='add'>+				 u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress SA</div><div class='add'>+ *   Lookup table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				 struct aq_mss_ingress_sa_record *rec,</div><div class='add'>+				 u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress SA Lookup table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_sa_record(struct aq_hw_s *hw,</div><div class='add'>+				 const struct aq_mss_ingress_sa_record *rec,</div><div class='add'>+				 u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress SA</div><div class='add'>+ *   Key Lookup table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+				    struct aq_mss_ingress_sakey_record *rec,</div><div class='add'>+				    u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress SA Key Lookup table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_sakey_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_sakey_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress</div><div class='add'>+ *   Post-MACSec Packet Classifier table, and unpack it into the</div><div class='add'>+ *   fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 48).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_postclass_record(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_postclass_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress Post-MACSec Packet Classifier table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 48).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_postclass_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_postclass_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the raw table data from the specified row of the Ingress</div><div class='add'>+ *   Post-MACSec CTL Filter table, and unpack it into the fields of rec.</div><div class='add'>+ *  rec - [OUT] The raw table row data will be unpacked into the fields of rec.</div><div class='add'>+ *  table_index - The table row to read (max 23).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_postctlf_record(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_postctlf_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Pack the fields of rec, and write the packed data into the</div><div class='add'>+ *   specified row of the Ingress Post-MACSec CTL Filter table.</div><div class='add'>+ *  rec - [IN] The bitfield values to write to the table row.</div><div class='add'>+ *  table_index - The table row to write(max 23).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_set_ingress_postctlf_record(struct aq_hw_s *hw,</div><div class='add'>+	const struct aq_mss_ingress_postctlf_record *rec,</div><div class='add'>+	u16 table_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the counters for the specified SC, and unpack them into the</div><div class='add'>+ *   fields of counters.</div><div class='add'>+ *  counters - [OUT] The raw table row data will be unpacked here.</div><div class='add'>+ *  sc_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_sc_counters(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_sc_counters *counters,</div><div class='add'>+				  u16 sc_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the counters for the specified SA, and unpack them into the</div><div class='add'>+ *   fields of counters.</div><div class='add'>+ *  counters - [OUT] The raw table row data will be unpacked here.</div><div class='add'>+ *  sa_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_sa_counters(struct aq_hw_s *hw,</div><div class='add'>+				  struct aq_mss_egress_sa_counters *counters,</div><div class='add'>+				  u16 sa_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the counters for the common egress counters, and unpack them</div><div class='add'>+ *   into the fields of counters.</div><div class='add'>+ *  counters - [OUT] The raw table row data will be unpacked here.</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_egress_common_counters(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_egress_common_counters *counters);</div><div class='add'>+</div><div class='add'>+/*!  Clear all Egress counters to 0.*/</div><div class='add'>+int aq_mss_clear_egress_counters(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+/*!  Read the counters for the specified SA, and unpack them into the</div><div class='add'>+ *   fields of counters.</div><div class='add'>+ *  counters - [OUT] The raw table row data will be unpacked here.</div><div class='add'>+ *  sa_index - The table row to read (max 31).</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_sa_counters(struct aq_hw_s *hw,</div><div class='add'>+				   struct aq_mss_ingress_sa_counters *counters,</div><div class='add'>+				   u16 sa_index);</div><div class='add'>+</div><div class='add'>+/*!  Read the counters for the common ingress counters, and unpack them</div><div class='add'>+ *   into the fields of counters.</div><div class='add'>+ *  counters - [OUT] The raw table row data will be unpacked here.</div><div class='add'>+ */</div><div class='add'>+int aq_mss_get_ingress_common_counters(struct aq_hw_s *hw,</div><div class='add'>+	struct aq_mss_ingress_common_counters *counters);</div><div class='add'>+</div><div class='add'>+/*!  Clear all Ingress counters to 0. */</div><div class='add'>+int aq_mss_clear_ingress_counters(struct aq_hw_s *hw);</div><div class='add'>+</div><div class='add'>+/*!  Get Egress SA expired. */</div><div class='add'>+int aq_mss_get_egress_sa_expired(struct aq_hw_s *hw, u32 *expired);</div><div class='add'>+/*!  Get Egress SA threshold expired. */</div><div class='add'>+int aq_mss_get_egress_sa_threshold_expired(struct aq_hw_s *hw,</div><div class='add'>+					   u32 *expired);</div><div class='add'>+/*!  Set Egress SA expired. */</div><div class='add'>+int aq_mss_set_egress_sa_expired(struct aq_hw_s *hw, u32 expired);</div><div class='add'>+/*!  Set Egress SA threshold expired. */</div><div class='add'>+int aq_mss_set_egress_sa_threshold_expired(struct aq_hw_s *hw,</div><div class='add'>+					   u32 expired);</div><div class='add'>+</div><div class='add'>+#endif /* __MACSEC_API_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h b/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h<br/>new file mode 100644<br/>index 000000000000..c2fda80fe1cc<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/aquantia/atlantic/macsec/macsec_struct.h</a></div><div class='hunk'>@@ -0,0 +1,914 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Atlantic Network Driver</div><div class='add'>+ * Copyright (C) 2020 Marvell International Ltd.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _MACSEC_STRUCT_H_</div><div class='add'>+#define _MACSEC_STRUCT_H_</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Egress CTL Filter</div><div class='add'>+ *  table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_egress_ctlf_record {</div><div class='add'>+	/*! This is used to store the 48 bit value used to compare SA, DA or</div><div class='add'>+	 *  halfDA+half SA value.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_da[2];</div><div class='add'>+	/*! This is used to store the 16 bit ethertype value used for</div><div class='add'>+	 *  comparison.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type;</div><div class='add'>+	/*! The match mask is per-nibble. 0 means don't care, i.e. every value</div><div class='add'>+	 *  will match successfully. The total data is 64 bit, i.e. 16 nibbles</div><div class='add'>+	 *  masks.</div><div class='add'>+	 */</div><div class='add'>+	u32 match_mask;</div><div class='add'>+	/*! 0: No compare, i.e. This entry is not used</div><div class='add'>+	 *  1: compare DA only</div><div class='add'>+	 *  2: compare SA only</div><div class='add'>+	 *  3: compare half DA + half SA</div><div class='add'>+	 *  4: compare ether type only</div><div class='add'>+	 *  5: compare DA + ethertype</div><div class='add'>+	 *  6: compare SA + ethertype</div><div class='add'>+	 *  7: compare DA+ range.</div><div class='add'>+	 */</div><div class='add'>+	u32 match_type;</div><div class='add'>+	/*! 0: Bypass the remaining modules if matched.</div><div class='add'>+	 *  1: Forward to next module for more classifications.</div><div class='add'>+	 */</div><div class='add'>+	u32 action;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Egress Packet</div><div class='add'>+ *  Classifier table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_egress_class_record {</div><div class='add'>+	/*! VLAN ID field. */</div><div class='add'>+	u32 vlan_id;</div><div class='add'>+	/*! VLAN UP field. */</div><div class='add'>+	u32 vlan_up;</div><div class='add'>+	/*! VLAN Present in the Packet. */</div><div class='add'>+	u32 vlan_valid;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 3. */</div><div class='add'>+	u32 byte3;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 2. */</div><div class='add'>+	u32 byte2;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 1. */</div><div class='add'>+	u32 byte1;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 0. */</div><div class='add'>+	u32 byte0;</div><div class='add'>+	/*! The 8 bit TCI field used to compare with extracted value. */</div><div class='add'>+	u32 tci;</div><div class='add'>+	/*! The 64 bit SCI field in the SecTAG. */</div><div class='add'>+	u32 sci[2];</div><div class='add'>+	/*! The 16 bit Ethertype (in the clear) field used to compare with</div><div class='add'>+	 *  extracted value.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type;</div><div class='add'>+	/*! This is to specify the 40bit SNAP header if the SNAP header's mask</div><div class='add'>+	 *  is enabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 snap[2];</div><div class='add'>+	/*! This is to specify the 24bit LLC header if the LLC header's mask is</div><div class='add'>+	 *  enabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 llc;</div><div class='add'>+	/*! The 48 bit MAC_SA field used to compare with extracted value. */</div><div class='add'>+	u32 mac_sa[2];</div><div class='add'>+	/*! The 48 bit MAC_DA field used to compare with extracted value. */</div><div class='add'>+	u32 mac_da[2];</div><div class='add'>+	/*! The 32 bit Packet number used to compare with extracted value. */</div><div class='add'>+	u32 pn;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte3_location;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted byte pointed by byte 3 location.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte3_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte2_location;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted byte pointed by byte 2 location.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte2_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte1_location;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted byte pointed by byte 1 location.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte1_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte0_location;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted byte pointed by byte 0 location.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte0_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted VLAN ID field.</div><div class='add'>+	 */</div><div class='add'>+	u32 vlan_id_mask;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted VLAN UP field.</div><div class='add'>+	 */</div><div class='add'>+	u32 vlan_up_mask;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of extracted VLAN Valid field.</div><div class='add'>+	 */</div><div class='add'>+	u32 vlan_valid_mask;</div><div class='add'>+	/*! This is bit mask to enable comparison the 8 bit TCI field,</div><div class='add'>+	 *  including the AN field.</div><div class='add'>+	 *  For explicit SECTAG, AN is hardware controlled. For sending</div><div class='add'>+	 *  packet w/ explicit SECTAG, rest of the TCI fields are directly</div><div class='add'>+	 *  from the SECTAG.</div><div class='add'>+	 */</div><div class='add'>+	u32 tci_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of SCI</div><div class='add'>+	 *  Note: If this field is not 0, this means the input packet's</div><div class='add'>+	 *  SECTAG is explicitly tagged and MACSEC module will only update</div><div class='add'>+	 *  the MSDU.</div><div class='add'>+	 *  PN number is hardware controlled.</div><div class='add'>+	 */</div><div class='add'>+	u32 sci_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of Ethertype.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care and no SNAP header exist.</div><div class='add'>+	 *  1: compare the SNAP header.</div><div class='add'>+	 *  If this bit is set to 1, the extracted filed will assume the</div><div class='add'>+	 *  SNAP header exist as encapsulated in 802.3 (RFC 1042). I.E. the</div><div class='add'>+	 *  next 5 bytes after the LLC header is SNAP header.</div><div class='add'>+	 */</div><div class='add'>+	u32 snap_mask;</div><div class='add'>+	/*! 0: don't care and no LLC header exist.</div><div class='add'>+	 *  1: compare the LLC header.</div><div class='add'>+	 *  If this bit is set to 1, the extracted filed will assume the</div><div class='add'>+	 *  LLC header exist as encapsulated in 802.3 (RFC 1042). I.E. the</div><div class='add'>+	 *  next three bytes after the 802.3MAC header is LLC header.</div><div class='add'>+	 */</div><div class='add'>+	u32 llc_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of MAC_SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of MAC_DA.</div><div class='add'>+	 */</div><div class='add'>+	u32 da_mask;</div><div class='add'>+	/*! Mask is per-byte. */</div><div class='add'>+	u32 pn_mask;</div><div class='add'>+	/*! Reserved. This bit should be always 0. */</div><div class='add'>+	u32 eight02dot2;</div><div class='add'>+	/*! 1: For explicit sectag case use TCI_SC from table</div><div class='add'>+	 *  0: use TCI_SC from explicit sectag.</div><div class='add'>+	 */</div><div class='add'>+	u32 tci_sc;</div><div class='add'>+	/*! 1: For explicit sectag case,use TCI_V,ES,SCB,E,C from table</div><div class='add'>+	 *  0: use TCI_V,ES,SCB,E,C from explicit sectag.</div><div class='add'>+	 */</div><div class='add'>+	u32 tci_87543;</div><div class='add'>+	/*! 1: indicates that incoming packet has explicit sectag. */</div><div class='add'>+	u32 exp_sectag_en;</div><div class='add'>+	/*! If packet matches and tagged as controlled-packet, this SC/SA</div><div class='add'>+	 *  index is used for later SC and SA table lookup.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_idx;</div><div class='add'>+	/*! This field is used to specify how many SA entries are</div><div class='add'>+	 *  associated with 1 SC entry.</div><div class='add'>+	 *  2'b00: 1 SC has 4 SA.</div><div class='add'>+	 *  SC index is equivalent to {SC_Index[4:2], 1'b0}.</div><div class='add'>+	 *  SA index is equivalent to {SC_Index[4:2], SC entry's current AN[1:0]</div><div class='add'>+	 *  2'b10: 1 SC has 2 SA.</div><div class='add'>+	 *  SC index is equivalent to SC_Index[4:1]</div><div class='add'>+	 *  SA index is equivalent to {SC_Index[4:1], SC entry's current AN[0]}</div><div class='add'>+	 *  2'b11: 1 SC has 1 SA. No SC entry exists for the specific SA.</div><div class='add'>+	 *  SA index is equivalent to SC_Index[4:0]</div><div class='add'>+	 *  Note: if specified as 2'b11, hardware AN roll over is not</div><div class='add'>+	 *  supported.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_sa;</div><div class='add'>+	/*! 0: the packets will be sent to MAC FIFO</div><div class='add'>+	 *  1: The packets will be sent to Debug/Loopback FIFO.</div><div class='add'>+	 *  If the above's action is drop, this bit has no meaning.</div><div class='add'>+	 */</div><div class='add'>+	u32 debug;</div><div class='add'>+	/*! 0: forward to remaining modules</div><div class='add'>+	 *  1: bypass the next encryption modules. This packet is considered</div><div class='add'>+	 *     un-control packet.</div><div class='add'>+	 *  2: drop</div><div class='add'>+	 *  3: Reserved.</div><div class='add'>+	 */</div><div class='add'>+	u32 action;</div><div class='add'>+	/*! 0: Not valid entry. This entry is not used</div><div class='add'>+	 *  1: valid entry.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Egress SC Lookup table. */</div><div class='add'>+struct aq_mss_egress_sc_record {</div><div class='add'>+	/*! This is to specify when the SC was first used. Set by HW. */</div><div class='add'>+	u32 start_time;</div><div class='add'>+	/*! This is to specify when the SC was last used. Set by HW. */</div><div class='add'>+	u32 stop_time;</div><div class='add'>+	/*! This is to specify which of the SA entries are used by current HW.</div><div class='add'>+	 *  Note: This value need to be set by SW after reset.  It will be</div><div class='add'>+	 *  automatically updated by HW, if AN roll over is enabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 curr_an;</div><div class='add'>+	/*! 0: Clear the SA Valid Bit after PN expiry.</div><div class='add'>+	 *  1: Do not Clear the SA Valid bit after PN expiry of the current SA.</div><div class='add'>+	 *  When the Enable AN roll over is set, S/W does not need to</div><div class='add'>+	 *  program the new SA's and the H/W will automatically roll over</div><div class='add'>+	 *  between the SA's without session expiry.</div><div class='add'>+	 *  For normal operation, Enable AN Roll over will be set to '0'</div><div class='add'>+	 *  and in which case, the SW needs to program the new SA values</div><div class='add'>+	 *  after the current PN expires.</div><div class='add'>+	 */</div><div class='add'>+	u32 an_roll;</div><div class='add'>+	/*! This is the TCI field used if packet is not explicitly tagged. */</div><div class='add'>+	u32 tci;</div><div class='add'>+	/*! This value indicates the offset where the decryption will start.</div><div class='add'>+	 *  [[Values of 0, 4, 8-50].</div><div class='add'>+	 */</div><div class='add'>+	u32 enc_off;</div><div class='add'>+	/*! 0: Do not protect frames, all the packets will be forwarded</div><div class='add'>+	 *     unchanged. MIB counter (OutPktsUntagged) will be updated.</div><div class='add'>+	 *  1: Protect.</div><div class='add'>+	 */</div><div class='add'>+	u32 protect;</div><div class='add'>+	/*! 0: when none of the SA related to SC has inUse set.</div><div class='add'>+	 *  1: when either of the SA related to the SC has inUse set.</div><div class='add'>+	 *  This bit is set by HW.</div><div class='add'>+	 */</div><div class='add'>+	u32 recv;</div><div class='add'>+	/*! 0: H/W Clears this bit on the first use.</div><div class='add'>+	 *  1: SW updates this entry, when programming the SC Table.</div><div class='add'>+	 */</div><div class='add'>+	u32 fresh;</div><div class='add'>+	/*! AES Key size</div><div class='add'>+	 *  00 - 128bits</div><div class='add'>+	 *  01 - 192bits</div><div class='add'>+	 *  10 - 256bits</div><div class='add'>+	 *  11 - Reserved.</div><div class='add'>+	 */</div><div class='add'>+	u32 sak_len;</div><div class='add'>+	/*! 0: Invalid SC</div><div class='add'>+	 *  1: Valid SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Egress SA Lookup table. */</div><div class='add'>+struct aq_mss_egress_sa_record {</div><div class='add'>+	/*! This is to specify when the SC was first used. Set by HW. */</div><div class='add'>+	u32 start_time;</div><div class='add'>+	/*! This is to specify when the SC was last used. Set by HW. */</div><div class='add'>+	u32 stop_time;</div><div class='add'>+	/*! This is set by SW and updated by HW to store the Next PN number</div><div class='add'>+	 *  used for encryption.</div><div class='add'>+	 */</div><div class='add'>+	u32 next_pn;</div><div class='add'>+	/*! The Next_PN number is going to wrapped around from 0xFFFF_FFFF</div><div class='add'>+	 *  to 0. set by HW.</div><div class='add'>+	 */</div><div class='add'>+	u32 sat_pn;</div><div class='add'>+	/*! 0: This SA is in use.</div><div class='add'>+	 *  1: This SA is Fresh and set by SW.</div><div class='add'>+	 */</div><div class='add'>+	u32 fresh;</div><div class='add'>+	/*! 0: Invalid SA</div><div class='add'>+	 *  1: Valid SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Egress SA Key</div><div class='add'>+ *  Lookup table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_egress_sakey_record {</div><div class='add'>+	/*! Key for AES-GCM processing. */</div><div class='add'>+	u32 key[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress Pre-MACSec</div><div class='add'>+ *  CTL Filter table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_prectlf_record {</div><div class='add'>+	/*! This is used to store the 48 bit value used to compare SA, DA</div><div class='add'>+	 *  or halfDA+half SA value.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_da[2];</div><div class='add'>+	/*! This is used to store the 16 bit ethertype value used for</div><div class='add'>+	 *  comparison.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type;</div><div class='add'>+	/*! The match mask is per-nibble. 0 means don't care, i.e. every</div><div class='add'>+	 *  value will match successfully. The total data is 64 bit, i.e.</div><div class='add'>+	 *  16 nibbles masks.</div><div class='add'>+	 */</div><div class='add'>+	u32 match_mask;</div><div class='add'>+	/*! 0: No compare, i.e. This entry is not used</div><div class='add'>+	 *  1: compare DA only</div><div class='add'>+	 *  2: compare SA only</div><div class='add'>+	 *  3: compare half DA + half SA</div><div class='add'>+	 *  4: compare ether type only</div><div class='add'>+	 *  5: compare DA + ethertype</div><div class='add'>+	 *  6: compare SA + ethertype</div><div class='add'>+	 *  7: compare DA+ range.</div><div class='add'>+	 */</div><div class='add'>+	u32 match_type;</div><div class='add'>+	/*! 0: Bypass the remaining modules if matched.</div><div class='add'>+	 *  1: Forward to next module for more classifications.</div><div class='add'>+	 */</div><div class='add'>+	u32 action;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress Pre-MACSec</div><div class='add'>+ *  Packet Classifier table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_preclass_record {</div><div class='add'>+	/*! The 64 bit SCI field used to compare with extracted value.</div><div class='add'>+	 *  Should have SCI value in case TCI[SCI_SEND] == 0. This will be</div><div class='add'>+	 *  used for ICV calculation.</div><div class='add'>+	 */</div><div class='add'>+	u32 sci[2];</div><div class='add'>+	/*! The 8 bit TCI field used to compare with extracted value. */</div><div class='add'>+	u32 tci;</div><div class='add'>+	/*! 8 bit encryption offset. */</div><div class='add'>+	u32 encr_offset;</div><div class='add'>+	/*! The 16 bit Ethertype (in the clear) field used to compare with</div><div class='add'>+	 *  extracted value.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type;</div><div class='add'>+	/*! This is to specify the 40bit SNAP header if the SNAP header's</div><div class='add'>+	 *  mask is enabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 snap[2];</div><div class='add'>+	/*! This is to specify the 24bit LLC header if the LLC header's</div><div class='add'>+	 *  mask is enabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 llc;</div><div class='add'>+	/*! The 48 bit MAC_SA field used to compare with extracted value. */</div><div class='add'>+	u32 mac_sa[2];</div><div class='add'>+	/*! The 48 bit MAC_DA field used to compare with extracted value. */</div><div class='add'>+	u32 mac_da[2];</div><div class='add'>+	/*! 0: this is to compare with non-LPBK packet</div><div class='add'>+	 *  1: this is to compare with LPBK packet.</div><div class='add'>+	 *  This value is used to compare with a controlled-tag which goes</div><div class='add'>+	 *  with the packet when looped back from Egress port.</div><div class='add'>+	 */</div><div class='add'>+	u32 lpbk_packet;</div><div class='add'>+	/*! The value of this bit mask will affects how the SC index and SA</div><div class='add'>+	 *  index created.</div><div class='add'>+	 *  2'b00: 1 SC has 4 SA.</div><div class='add'>+	 *    SC index is equivalent to {SC_Index[4:2], 1'b0}.</div><div class='add'>+	 *    SA index is equivalent to {SC_Index[4:2], SECTAG's AN[1:0]}</div><div class='add'>+	 *    Here AN bits are not compared.</div><div class='add'>+	 *  2'b10: 1 SC has 2 SA.</div><div class='add'>+	 *    SC index is equivalent to SC_Index[4:1]</div><div class='add'>+	 *    SA index is equivalent to {SC_Index[4:1], SECTAG's AN[0]}</div><div class='add'>+	 *    Compare AN[1] field only</div><div class='add'>+	 *  2'b11: 1 SC has 1 SA. No SC entry exists for the specific SA.</div><div class='add'>+	 *    SA index is equivalent to SC_Index[4:0]</div><div class='add'>+	 *    AN[1:0] bits are compared.</div><div class='add'>+	 *    NOTE: This design is to supports different usage of AN. User</div><div class='add'>+	 *    can either ping-pong buffer 2 SA by using only the AN[0] bit.</div><div class='add'>+	 *    Or use 4 SA per SC by use AN[1:0] bits. Or even treat each SA</div><div class='add'>+	 *    as independent. i.e. AN[1:0] is just another matching pointer</div><div class='add'>+	 *    to select SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 an_mask;</div><div class='add'>+	/*! This is bit mask to enable comparison the upper 6 bits TCI</div><div class='add'>+	 *  field, which does not include the AN field.</div><div class='add'>+	 *  0: don't compare</div><div class='add'>+	 *  1: enable comparison of the bits.</div><div class='add'>+	 */</div><div class='add'>+	u32 tci_mask;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable comparison of SCI.</div><div class='add'>+	 */</div><div class='add'>+	u32 sci_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of Ethertype.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care and no SNAP header exist.</div><div class='add'>+	 *  1: compare the SNAP header.</div><div class='add'>+	 *  If this bit is set to 1, the extracted filed will assume the</div><div class='add'>+	 *  SNAP header exist as encapsulated in 802.3 (RFC 1042). I.E. the</div><div class='add'>+	 *  next 5 bytes after the LLC header is SNAP header.</div><div class='add'>+	 */</div><div class='add'>+	u32 snap_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care and no LLC header exist.</div><div class='add'>+	 *  1: compare the LLC header.</div><div class='add'>+	 *  If this bit is set to 1, the extracted filed will assume the</div><div class='add'>+	 *  LLC header exist as encapsulated in 802.3 (RFC 1042). I.E. the</div><div class='add'>+	 *  next three bytes after the 802.3MAC header is LLC header.</div><div class='add'>+	 */</div><div class='add'>+	u32 llc_mask;</div><div class='add'>+	/*! Reserved. This bit should be always 0. */</div><div class='add'>+	u32 _802_2_encapsulate;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of MAC_SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_mask;</div><div class='add'>+	/*! Mask is per-byte.</div><div class='add'>+	 *  0: don't care</div><div class='add'>+	 *  1: enable comparison of MAC_DA.</div><div class='add'>+	 */</div><div class='add'>+	u32 da_mask;</div><div class='add'>+	/*! 0: don't care</div><div class='add'>+	 *  1: enable checking if this is loopback packet or not.</div><div class='add'>+	 */</div><div class='add'>+	u32 lpbk_mask;</div><div class='add'>+	/*! If packet matches and tagged as controlled-packet. This SC/SA</div><div class='add'>+	 *  index is used for later SC and SA table lookup.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_idx;</div><div class='add'>+	/*! 0: the packets will be sent to MAC FIFO</div><div class='add'>+	 *  1: The packets will be sent to Debug/Loopback FIFO.</div><div class='add'>+	 *  If the above's action is drop. This bit has no meaning.</div><div class='add'>+	 */</div><div class='add'>+	u32 proc_dest;</div><div class='add'>+	/*! 0: Process: Forward to next two modules for 802.1AE decryption.</div><div class='add'>+	 *  1: Process but keep SECTAG: Forward to next two modules for</div><div class='add'>+	 *     802.1AE decryption but keep the MACSEC header with added error</div><div class='add'>+	 *     code information. ICV will be stripped for all control packets.</div><div class='add'>+	 *  2: Bypass: Bypass the next two decryption modules but processed</div><div class='add'>+	 *     by post-classification.</div><div class='add'>+	 *  3: Drop: drop this packet and update counts accordingly.</div><div class='add'>+	 */</div><div class='add'>+	u32 action;</div><div class='add'>+	/*! 0: This is a controlled-port packet if matched.</div><div class='add'>+	 *  1: This is an uncontrolled-port packet if matched.</div><div class='add'>+	 */</div><div class='add'>+	u32 ctrl_unctrl;</div><div class='add'>+	/*! Use the SCI value from the Table if 'SC' bit of the input</div><div class='add'>+	 *  packet is not present.</div><div class='add'>+	 */</div><div class='add'>+	u32 sci_from_table;</div><div class='add'>+	/*! Reserved. */</div><div class='add'>+	u32 reserved;</div><div class='add'>+	/*! 0: Not valid entry. This entry is not used</div><div class='add'>+	 *  1: valid entry.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress SC Lookup table. */</div><div class='add'>+struct aq_mss_ingress_sc_record {</div><div class='add'>+	/*! This is to specify when the SC was first used. Set by HW. */</div><div class='add'>+	u32 stop_time;</div><div class='add'>+	/*! This is to specify when the SC was first used. Set by HW. */</div><div class='add'>+	u32 start_time;</div><div class='add'>+	/*! 0: Strict</div><div class='add'>+	 *  1: Check</div><div class='add'>+	 *  2: Disabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 validate_frames;</div><div class='add'>+	/*! 1: Replay control enabled.</div><div class='add'>+	 *  0: replay control disabled.</div><div class='add'>+	 */</div><div class='add'>+	u32 replay_protect;</div><div class='add'>+	/*! This is to specify the window range for anti-replay. Default is 0.</div><div class='add'>+	 *  0: is strict order enforcement.</div><div class='add'>+	 */</div><div class='add'>+	u32 anti_replay_window;</div><div class='add'>+	/*! 0: when none of the SA related to SC has inUse set.</div><div class='add'>+	 *  1: when either of the SA related to the SC has inUse set.</div><div class='add'>+	 *  This bit is set by HW.</div><div class='add'>+	 */</div><div class='add'>+	u32 receiving;</div><div class='add'>+	/*! 0: when hardware processed the SC for the first time, it clears</div><div class='add'>+	 *     this bit</div><div class='add'>+	 *  1: This bit is set by SW, when it sets up the SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 fresh;</div><div class='add'>+	/*! 0: The AN number will not automatically roll over if Next_PN is</div><div class='add'>+	 *     saturated.</div><div class='add'>+	 *  1: The AN number will automatically roll over if Next_PN is</div><div class='add'>+	 *     saturated.</div><div class='add'>+	 *  Rollover is valid only after expiry. Normal roll over between</div><div class='add'>+	 *  SA's should be normal process.</div><div class='add'>+	 */</div><div class='add'>+	u32 an_rol;</div><div class='add'>+	/*! Reserved. */</div><div class='add'>+	u32 reserved;</div><div class='add'>+	/*! 0: Invalid SC</div><div class='add'>+	 *  1: Valid SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress SA Lookup table. */</div><div class='add'>+struct aq_mss_ingress_sa_record {</div><div class='add'>+	/*! This is to specify when the SC was first used. Set by HW. */</div><div class='add'>+	u32 stop_time;</div><div class='add'>+	/*! This is to specify when the SC was first used. Set by HW. */</div><div class='add'>+	u32 start_time;</div><div class='add'>+	/*! This is updated by HW to store the expected NextPN number for</div><div class='add'>+	 *  anti-replay.</div><div class='add'>+	 */</div><div class='add'>+	u32 next_pn;</div><div class='add'>+	/*! The Next_PN number is going to wrapped around from 0XFFFF_FFFF</div><div class='add'>+	 *  to 0. set by HW.</div><div class='add'>+	 */</div><div class='add'>+	u32 sat_nextpn;</div><div class='add'>+	/*! 0: This SA is not yet used.</div><div class='add'>+	 *  1: This SA is inUse.</div><div class='add'>+	 */</div><div class='add'>+	u32 in_use;</div><div class='add'>+	/*! 0: when hardware processed the SC for the first time, it clears</div><div class='add'>+	 *     this timer</div><div class='add'>+	 *  1: This bit is set by SW, when it sets up the SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 fresh;</div><div class='add'>+	/*! Reserved. */</div><div class='add'>+	u32 reserved;</div><div class='add'>+	/*! 0: Invalid SA.</div><div class='add'>+	 *  1: Valid SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress SA Key</div><div class='add'>+ *  Lookup table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_sakey_record {</div><div class='add'>+	/*! Key for AES-GCM processing. */</div><div class='add'>+	u32 key[8];</div><div class='add'>+	/*! AES key size</div><div class='add'>+	 *  00 - 128bits</div><div class='add'>+	 *  01 - 192bits</div><div class='add'>+	 *  10 - 256bits</div><div class='add'>+	 *  11 - reserved.</div><div class='add'>+	 */</div><div class='add'>+	u32 key_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress Post-</div><div class='add'>+ *  MACSec Packet Classifier table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_postclass_record {</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 0. */</div><div class='add'>+	u32 byte0;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 1. */</div><div class='add'>+	u32 byte1;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 2. */</div><div class='add'>+	u32 byte2;</div><div class='add'>+	/*! The 8 bit value used to compare with extracted value for byte 3. */</div><div class='add'>+	u32 byte3;</div><div class='add'>+	/*! Ethertype in the packet. */</div><div class='add'>+	u32 eth_type;</div><div class='add'>+	/*! Ether Type value &gt; 1500 (0x5dc). */</div><div class='add'>+	u32 eth_type_valid;</div><div class='add'>+	/*! VLAN ID after parsing. */</div><div class='add'>+	u32 vlan_id;</div><div class='add'>+	/*! VLAN priority after parsing. */</div><div class='add'>+	u32 vlan_up;</div><div class='add'>+	/*! Valid VLAN coding. */</div><div class='add'>+	u32 vlan_valid;</div><div class='add'>+	/*! SA index. */</div><div class='add'>+	u32 sai;</div><div class='add'>+	/*! SAI hit, i.e. controlled packet. */</div><div class='add'>+	u32 sai_hit;</div><div class='add'>+	/*! Mask for payload ethertype field. */</div><div class='add'>+	u32 eth_type_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte3_location;</div><div class='add'>+	/*! Mask for Byte Offset 3. */</div><div class='add'>+	u32 byte3_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte2_location;</div><div class='add'>+	/*! Mask for Byte Offset 2. */</div><div class='add'>+	u32 byte2_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte1_location;</div><div class='add'>+	/*! Mask for Byte Offset 1. */</div><div class='add'>+	u32 byte1_mask;</div><div class='add'>+	/*! 0~63: byte location used extracted by packets comparator, which</div><div class='add'>+	 *  can be anything from the first 64 bytes of the MAC packets.</div><div class='add'>+	 *  This byte location counted from MAC' DA address. i.e. set to 0</div><div class='add'>+	 *  will point to byte 0 of DA address.</div><div class='add'>+	 */</div><div class='add'>+	u32 byte0_location;</div><div class='add'>+	/*! Mask for Byte Offset 0. */</div><div class='add'>+	u32 byte0_mask;</div><div class='add'>+	/*! Mask for Ethertype valid field. Indicates 802.3 vs. Other. */</div><div class='add'>+	u32 eth_type_valid_mask;</div><div class='add'>+	/*! Mask for VLAN ID field. */</div><div class='add'>+	u32 vlan_id_mask;</div><div class='add'>+	/*! Mask for VLAN UP field. */</div><div class='add'>+	u32 vlan_up_mask;</div><div class='add'>+	/*! Mask for VLAN valid field. */</div><div class='add'>+	u32 vlan_valid_mask;</div><div class='add'>+	/*! Mask for SAI. */</div><div class='add'>+	u32 sai_mask;</div><div class='add'>+	/*! Mask for SAI_HIT. */</div><div class='add'>+	u32 sai_hit_mask;</div><div class='add'>+	/*! Action if only first level matches and second level does not.</div><div class='add'>+	 *  0: pass</div><div class='add'>+	 *  1: drop (fail).</div><div class='add'>+	 */</div><div class='add'>+	u32 firstlevel_actions;</div><div class='add'>+	/*! Action if both first and second level matched.</div><div class='add'>+	 *  0: pass</div><div class='add'>+	 *  1: drop (fail).</div><div class='add'>+	 */</div><div class='add'>+	u32 secondlevel_actions;</div><div class='add'>+	/*! Reserved. */</div><div class='add'>+	u32 reserved;</div><div class='add'>+	/*! 0: Not valid entry. This entry is not used</div><div class='add'>+	 *  1: valid entry.</div><div class='add'>+	 */</div><div class='add'>+	u32 valid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the bitfields of a single row in the Ingress Post-</div><div class='add'>+ *  MACSec CTL Filter table.</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_postctlf_record {</div><div class='add'>+	/*! This is used to store the 48 bit value used to compare SA, DA</div><div class='add'>+	 *  or halfDA+half SA value.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_da[2];</div><div class='add'>+	/*! This is used to store the 16 bit ethertype value used for</div><div class='add'>+	 *  comparison.</div><div class='add'>+	 */</div><div class='add'>+	u32 eth_type;</div><div class='add'>+	/*! The match mask is per-nibble. 0 means don't care, i.e. every</div><div class='add'>+	 *  value will match successfully. The total data is 64 bit, i.e.</div><div class='add'>+	 *  16 nibbles masks.</div><div class='add'>+	 */</div><div class='add'>+	u32 match_mask;</div><div class='add'>+	/*! 0: No compare, i.e. This entry is not used</div><div class='add'>+	 *  1: compare DA only</div><div class='add'>+	 *  2: compare SA only</div><div class='add'>+	 *  3: compare half DA + half SA</div><div class='add'>+	 *  4: compare ether type only</div><div class='add'>+	 *  5: compare DA + ethertype</div><div class='add'>+	 *  6: compare SA + ethertype</div><div class='add'>+	 *  7: compare DA+ range.</div><div class='add'>+	 */</div><div class='add'>+	u32 match_type;</div><div class='add'>+	/*! 0: Bypass the remaining modules if matched.</div><div class='add'>+	 *  1: Forward to next module for more classifications.</div><div class='add'>+	 */</div><div class='add'>+	u32 action;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the Egress MIB counters for a single SC. Counters are</div><div class='add'>+ *  64 bits, lower 32 bits in field[0].</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_egress_sc_counters {</div><div class='add'>+	/*! The number of integrity protected but not encrypted packets</div><div class='add'>+	 *  for this transmitting SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_protected_pkts[2];</div><div class='add'>+	/*! The number of integrity protected and encrypted packets for</div><div class='add'>+	 *  this transmitting SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_encrypted_pkts[2];</div><div class='add'>+	/*! The number of plain text octets that are integrity protected</div><div class='add'>+	 *  but not encrypted on the transmitting SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_protected_octets[2];</div><div class='add'>+	/*! The number of plain text octets that are integrity protected</div><div class='add'>+	 *  and encrypted on the transmitting SC.</div><div class='add'>+	 */</div><div class='add'>+	u32 sc_encrypted_octets[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the Egress MIB counters for a single SA. Counters are</div><div class='add'>+ *  64 bits, lower 32 bits in field[0].</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_egress_sa_counters {</div><div class='add'>+	/*! The number of dropped packets for this transmitting SA. */</div><div class='add'>+	u32 sa_hit_drop_redirect[2];</div><div class='add'>+	/*! TODO */</div><div class='add'>+	u32 sa_protected2_pkts[2];</div><div class='add'>+	/*! The number of integrity protected but not encrypted packets</div><div class='add'>+	 *  for this transmitting SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_protected_pkts[2];</div><div class='add'>+	/*! The number of integrity protected and encrypted packets for</div><div class='add'>+	 *  this transmitting SA.</div><div class='add'>+	 */</div><div class='add'>+	u32 sa_encrypted_pkts[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the common Egress MIB counters; the counter not</div><div class='add'>+ *  associated with a particular SC/SA. Counters are 64 bits, lower 32</div><div class='add'>+ *  bits in field[0].</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_egress_common_counters {</div><div class='add'>+	/*! The number of transmitted packets classified as MAC_CTL packets. */</div><div class='add'>+	u32 ctl_pkt[2];</div><div class='add'>+	/*! The number of transmitted packets that did not match any rows</div><div class='add'>+	 *  in the Egress Packet Classifier table.</div><div class='add'>+	 */</div><div class='add'>+	u32 unknown_sa_pkts[2];</div><div class='add'>+	/*! The number of transmitted packets where the SC table entry has</div><div class='add'>+	 *  protect=0 (so packets are forwarded unchanged).</div><div class='add'>+	 */</div><div class='add'>+	u32 untagged_pkts[2];</div><div class='add'>+	/*! The number of transmitted packets discarded because the packet</div><div class='add'>+	 *  length is greater than the ifMtu of the Common Port interface.</div><div class='add'>+	 */</div><div class='add'>+	u32 too_long[2];</div><div class='add'>+	/*! The number of transmitted packets for which table memory was</div><div class='add'>+	 *  affected by an ECC error during processing.</div><div class='add'>+	 */</div><div class='add'>+	u32 ecc_error_pkts[2];</div><div class='add'>+	/*! The number of transmitted packets for where the matched row in</div><div class='add'>+	 *  the Egress Packet Classifier table has action=drop.</div><div class='add'>+	 */</div><div class='add'>+	u32 unctrl_hit_drop_redir[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the Ingress MIB counters for a single SA. Counters are</div><div class='add'>+ *  64 bits, lower 32 bits in field[0].</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_sa_counters {</div><div class='add'>+	/*! For this SA, the number of received packets without a SecTAG. */</div><div class='add'>+	u32 untagged_hit_pkts[2];</div><div class='add'>+	/*! For this SA, the number of received packets that were dropped. */</div><div class='add'>+	u32 ctrl_hit_drop_redir_pkts[2];</div><div class='add'>+	/*! For this SA which is not currently in use, the number of</div><div class='add'>+	 *  received packets that have been discarded, and have either the</div><div class='add'>+	 *  packets encrypted or the matched row in the Ingress SC Lookup</div><div class='add'>+	 *  table has validate_frames=Strict.</div><div class='add'>+	 */</div><div class='add'>+	u32 not_using_sa[2];</div><div class='add'>+	/*! For this SA which is not currently in use, the number of</div><div class='add'>+	 *  received, unencrypted, packets with the matched row in the</div><div class='add'>+	 *  Ingress SC Lookup table has validate_frames!=Strict.</div><div class='add'>+	 */</div><div class='add'>+	u32 unused_sa[2];</div><div class='add'>+	/*! For this SA, the number discarded packets with the condition</div><div class='add'>+	 *  that the packets are not valid and one of the following</div><div class='add'>+	 *  conditions are true: either the matched row in the Ingress SC</div><div class='add'>+	 *  Lookup table has validate_frames=Strict or the packets</div><div class='add'>+	 *  encrypted.</div><div class='add'>+	 */</div><div class='add'>+	u32 not_valid_pkts[2];</div><div class='add'>+	/*! For this SA, the number of packets with the condition that the</div><div class='add'>+	 *  packets are not valid and the matched row in the Ingress SC</div><div class='add'>+	 *  Lookup table has validate_frames=Check.</div><div class='add'>+	 */</div><div class='add'>+	u32 invalid_pkts[2];</div><div class='add'>+	/*! For this SA, the number of validated packets. */</div><div class='add'>+	u32 ok_pkts[2];</div><div class='add'>+	/*! For this SC, the number of received packets that have been</div><div class='add'>+	 *  discarded with the condition: the matched row in the Ingress</div><div class='add'>+	 *  SC Lookup table has replay_protect=1 and the PN of the packet</div><div class='add'>+	 *  is lower than the lower bound replay check PN.</div><div class='add'>+	 */</div><div class='add'>+	u32 late_pkts[2];</div><div class='add'>+	/*! For this SA, the number of packets with the condition that the</div><div class='add'>+	 *  PN of the packets is lower than the lower bound replay</div><div class='add'>+	 *  protection PN.</div><div class='add'>+	 */</div><div class='add'>+	u32 delayed_pkts[2];</div><div class='add'>+	/*! For this SC, the number of packets with the following condition:</div><div class='add'>+	 *  - the matched row in the Ingress SC Lookup table has</div><div class='add'>+	 *    replay_protect=0 or</div><div class='add'>+	 *  - the matched row in the Ingress SC Lookup table has</div><div class='add'>+	 *    replay_protect=1 and the packet is not encrypted and the</div><div class='add'>+	 *    integrity check has failed or</div><div class='add'>+	 *  - the matched row in the Ingress SC Lookup table has</div><div class='add'>+	 *    replay_protect=1 and the packet is encrypted and integrity</div><div class='add'>+	 *    check has failed.</div><div class='add'>+	 */</div><div class='add'>+	u32 unchecked_pkts[2];</div><div class='add'>+	/*! The number of octets of plaintext recovered from received</div><div class='add'>+	 *  packets that were integrity protected but not encrypted.</div><div class='add'>+	 */</div><div class='add'>+	u32 validated_octets[2];</div><div class='add'>+	/*! The number of octets of plaintext recovered from received</div><div class='add'>+	 *  packets that were integrity protected and encrypted.</div><div class='add'>+	 */</div><div class='add'>+	u32 decrypted_octets[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*! Represents the common Ingress MIB counters; the counter not</div><div class='add'>+ *  associated with a particular SA. Counters are 64 bits, lower 32</div><div class='add'>+ *  bits in field[0].</div><div class='add'>+ */</div><div class='add'>+struct aq_mss_ingress_common_counters {</div><div class='add'>+	/*! The number of received packets classified as MAC_CTL packets. */</div><div class='add'>+	u32 ctl_pkts[2];</div><div class='add'>+	/*! The number of received packets with the MAC security tag</div><div class='add'>+	 *  (SecTAG), not matching any rows in the Ingress Pre-MACSec</div><div class='add'>+	 *  Packet Classifier table.</div><div class='add'>+	 */</div><div class='add'>+	u32 tagged_miss_pkts[2];</div><div class='add'>+	/*! The number of received packets without the MAC security tag</div><div class='add'>+	 *  (SecTAG), not matching any rows in the Ingress Pre-MACSec</div><div class='add'>+	 *  Packet Classifier table.</div><div class='add'>+	 */</div><div class='add'>+	u32 untagged_miss_pkts[2];</div><div class='add'>+	/*! The number of received packets discarded without the MAC</div><div class='add'>+	 *  security tag (SecTAG) and with the matched row in the Ingress</div><div class='add'>+	 *  SC Lookup table having validate_frames=Strict.</div><div class='add'>+	 */</div><div class='add'>+	u32 notag_pkts[2];</div><div class='add'>+	/*! The number of received packets without the MAC security tag</div><div class='add'>+	 *  (SecTAG) and with the matched row in the Ingress SC Lookup</div><div class='add'>+	 *  table having validate_frames!=Strict.</div><div class='add'>+	 */</div><div class='add'>+	u32 untagged_pkts[2];</div><div class='add'>+	/*! The number of received packets discarded with an invalid</div><div class='add'>+	 *  SecTAG or a zero value PN or an invalid ICV.</div><div class='add'>+	 */</div><div class='add'>+	u32 bad_tag_pkts[2];</div><div class='add'>+	/*! The number of received packets discarded with unknown SCI</div><div class='add'>+	 *  information with the condition:</div><div class='add'>+	 *  the matched row in the Ingress SC Lookup table has</div><div class='add'>+	 *  validate_frames=Strict or the C bit in the SecTAG is set.</div><div class='add'>+	 */</div><div class='add'>+	u32 no_sci_pkts[2];</div><div class='add'>+	/*! The number of received packets with unknown SCI with the condition:</div><div class='add'>+	 *  The matched row in the Ingress SC Lookup table has</div><div class='add'>+	 *  validate_frames!=Strict and the C bit in the SecTAG is not set.</div><div class='add'>+	 */</div><div class='add'>+	u32 unknown_sci_pkts[2];</div><div class='add'>+	/*! The number of received packets by the controlled port service</div><div class='add'>+	 *  that passed the Ingress Post-MACSec Packet Classifier table</div><div class='add'>+	 *  check.</div><div class='add'>+	 */</div><div class='add'>+	u32 ctrl_prt_pass_pkts[2];</div><div class='add'>+	/*! The number of received packets by the uncontrolled port</div><div class='add'>+	 *  service that passed the Ingress Post-MACSec Packet Classifier</div><div class='add'>+	 *  table check.</div><div class='add'>+	 */</div><div class='add'>+	u32 unctrl_prt_pass_pkts[2];</div><div class='add'>+	/*! The number of received packets by the controlled port service</div><div class='add'>+	 *  that failed the Ingress Post-MACSec Packet Classifier table</div><div class='add'>+	 *  check.</div><div class='add'>+	 */</div><div class='add'>+	u32 ctrl_prt_fail_pkts[2];</div><div class='add'>+	/*! The number of received packets by the uncontrolled port</div><div class='add'>+	 *  service that failed the Ingress Post-MACSec Packet Classifier</div><div class='add'>+	 *  table check.</div><div class='add'>+	 */</div><div class='add'>+	u32 unctrl_prt_fail_pkts[2];</div><div class='add'>+	/*! The number of received packets discarded because the packet</div><div class='add'>+	 *  length is greater than the ifMtu of the Common Port interface.</div><div class='add'>+	 */</div><div class='add'>+	u32 too_long_pkts[2];</div><div class='add'>+	/*! The number of received packets classified as MAC_CTL by the</div><div class='add'>+	 *  Ingress Post-MACSec CTL Filter table.</div><div class='add'>+	 */</div><div class='add'>+	u32 igpoc_ctl_pkts[2];</div><div class='add'>+	/*! The number of received packets for which table memory was</div><div class='add'>+	 *  affected by an ECC error during processing.</div><div class='add'>+	 */</div><div class='add'>+	u32 ecc_error_pkts[2];</div><div class='add'>+	/*! The number of received packets by the uncontrolled port</div><div class='add'>+	 *  service that were dropped.</div><div class='add'>+	 */</div><div class='add'>+	u32 unctrl_hit_drop_redir[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/aquantia/atlantic/ver.h b/drivers/net/ethernet/aquantia/atlantic/ver.h<br/>deleted file mode 100644<br/>index b48260114da3..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aquantia/atlantic/ver.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aquantia/atlantic/ver.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * aQuantia Corporation Network Driver</div><div class='del'>- * Copyright (C) 2014-2017 aQuantia Corporation. All rights reserved</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms and conditions of the GNU General Public License,</div><div class='del'>- * version 2, as published by the Free Software Foundation.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef VER_H</div><div class='del'>-#define VER_H</div><div class='del'>-</div><div class='del'>-#define NIC_MAJOR_DRIVER_VERSION           2</div><div class='del'>-#define NIC_MINOR_DRIVER_VERSION           0</div><div class='del'>-#define NIC_BUILD_DRIVER_VERSION           4</div><div class='del'>-#define NIC_REVISION_DRIVER_VERSION        0</div><div class='del'>-</div><div class='del'>-#define AQ_CFG_DRV_VERSION_SUFFIX "-kern"</div><div class='del'>-</div><div class='del'>-#endif /* VER_H */</div><div class='head'>diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig<br/>index 45c663d8b9aa..0d400a7d8d91 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/arc/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config NET_VENDOR_ARC</div><div class='ctx'> 	bool "ARC devices"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -21,23 +21,14 @@ config ARC_EMAC_CORE</div><div class='ctx'> 	depends on ARC || ARCH_ROCKCHIP || COMPILE_TEST</div><div class='ctx'> 	select MII</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-</div><div class='del'>-config ARC_EMAC</div><div class='del'>-	tristate "ARC EMAC support"</div><div class='del'>-	select ARC_EMAC_CORE</div><div class='del'>-	depends on OF_IRQ &amp;&amp; OF_NET</div><div class='del'>-	depends on ARC || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='del'>-	  On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x</div><div class='del'>-	  non-standard on-chip ethernet device ARC EMAC 10/100 is used.</div><div class='del'>-	  Say Y here if you have such a board.  If unsure, say N.</div><div class='add'>+	select CRC32</div><div class='ctx'> </div><div class='ctx'> config EMAC_ROCKCHIP</div><div class='ctx'> 	tristate "Rockchip EMAC support"</div><div class='ctx'> 	select ARC_EMAC_CORE</div><div class='del'>-	depends on OF_IRQ &amp;&amp; OF_NET &amp;&amp; REGULATOR</div><div class='add'>+	depends on OF_IRQ &amp;&amp; REGULATOR</div><div class='ctx'> 	depends on ARCH_ROCKCHIP || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers.</div><div class='ctx'> 	  This selects Rockchip SoC glue layer support for the</div><div class='ctx'> 	  emac device driver. This driver is used for RK3036/RK3066/RK3188</div><div class='head'>diff --git a/drivers/net/ethernet/arc/Makefile b/drivers/net/ethernet/arc/Makefile<br/>index d63ada577c8e..23586eefec44 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/arc/Makefile</a></div><div class='hunk'>@@ -5,5 +5,4 @@</div><div class='ctx'> </div><div class='ctx'> arc_emac-objs := emac_main.o emac_mdio.o</div><div class='ctx'> obj-$(CONFIG_ARC_EMAC_CORE) += arc_emac.o</div><div class='del'>-obj-$(CONFIG_ARC_EMAC) += emac_arc.o</div><div class='ctx'> obj-$(CONFIG_EMAC_ROCKCHIP) += emac_rockchip.o</div><div class='head'>diff --git a/drivers/net/ethernet/arc/emac.h b/drivers/net/ethernet/arc/emac.h<br/>index d9efbc8d783b..0e244f0e25fd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/arc/emac.h</a></div><div class='hunk'>@@ -130,7 +130,6 @@ struct arc_emac_mdio_bus_data {</div><div class='ctx'>  */</div><div class='ctx'> struct arc_emac_priv {</div><div class='ctx'> 	const char *drv_name;</div><div class='del'>-	const char *drv_version;</div><div class='ctx'> 	void (*set_mac_speed)(void *priv, unsigned int speed);</div><div class='ctx'> </div><div class='ctx'> 	/* Devices */</div><div class='hunk'>@@ -221,6 +220,6 @@ static inline void arc_reg_clr(struct arc_emac_priv *priv, int reg, int mask)</div><div class='ctx'> int arc_mdio_probe(struct arc_emac_priv *priv);</div><div class='ctx'> int arc_mdio_remove(struct arc_emac_priv *priv);</div><div class='ctx'> int arc_emac_probe(struct net_device *ndev, int interface);</div><div class='del'>-int arc_emac_remove(struct net_device *ndev);</div><div class='add'>+void arc_emac_remove(struct net_device *ndev);</div><div class='ctx'> </div><div class='ctx'> #endif /* ARC_EMAC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/arc/emac_arc.c b/drivers/net/ethernet/arc/emac_arc.c<br/>deleted file mode 100644<br/>index 78e52d217e56..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_arc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_arc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/**</div><div class='del'>- * emac_arc.c - ARC EMAC specific glue layer</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2014 Romain Perier</div><div class='del'>- *</div><div class='del'>- * Romain Perier  &lt;romain.perier@gmail.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-</div><div class='del'>-#include "emac.h"</div><div class='del'>-</div><div class='del'>-#define DRV_NAME    "emac_arc"</div><div class='del'>-#define DRV_VERSION "1.0"</div><div class='del'>-</div><div class='del'>-static int emac_arc_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = &amp;pdev-&gt;dev;</div><div class='del'>-	struct net_device *ndev;</div><div class='del'>-	struct arc_emac_priv *priv;</div><div class='del'>-	int interface, err;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;of_node)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	ndev = alloc_etherdev(sizeof(struct arc_emac_priv));</div><div class='del'>-	if (!ndev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	platform_set_drvdata(pdev, ndev);</div><div class='del'>-	SET_NETDEV_DEV(ndev, dev);</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(ndev);</div><div class='del'>-	priv-&gt;drv_name = DRV_NAME;</div><div class='del'>-	priv-&gt;drv_version = DRV_VERSION;</div><div class='del'>-</div><div class='del'>-	interface = of_get_phy_mode(dev-&gt;of_node);</div><div class='del'>-	if (interface &lt; 0)</div><div class='del'>-		interface = PHY_INTERFACE_MODE_MII;</div><div class='del'>-</div><div class='del'>-	priv-&gt;clk = devm_clk_get(dev, "hclk");</div><div class='del'>-	if (IS_ERR(priv-&gt;clk)) {</div><div class='del'>-		dev_err(dev, "failed to retrieve host clock from device tree\n");</div><div class='del'>-		err = -EINVAL;</div><div class='del'>-		goto out_netdev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = arc_emac_probe(ndev, interface);</div><div class='del'>-out_netdev:</div><div class='del'>-	if (err)</div><div class='del'>-		free_netdev(ndev);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int emac_arc_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = arc_emac_remove(ndev);</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct of_device_id emac_arc_dt_ids[] = {</div><div class='del'>-	{ .compatible = "snps,arc-emac" },</div><div class='del'>-	{ /* Sentinel */ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, emac_arc_dt_ids);</div><div class='del'>-</div><div class='del'>-static struct platform_driver emac_arc_driver = {</div><div class='del'>-	.probe = emac_arc_probe,</div><div class='del'>-	.remove = emac_arc_remove,</div><div class='del'>-	.driver = {</div><div class='del'>-		.name = DRV_NAME,</div><div class='del'>-		.of_match_table  = emac_arc_dt_ids,</div><div class='del'>-	},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver(emac_arc_driver);</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("Romain Perier &lt;romain.perier@gmail.com&gt;");</div><div class='del'>-MODULE_DESCRIPTION("ARC EMAC platform driver");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c<br/>index 13a1d99b29c6..8283aeee35fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/arc/emac_main.c</a></div><div class='hunk'>@@ -1,10 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2004-2013 Synopsys, Inc. (www.synopsys.com)</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * Driver for the ARC EMAC 10100 (hardware revision 5)</div><div class='ctx'>  *</div><div class='ctx'>  * Contributors:</div><div class='hunk'>@@ -18,11 +15,11 @@</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/of_irq.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "emac.h"</div><div class='ctx'> </div><div class='hunk'>@@ -94,8 +91,7 @@ static void arc_emac_get_drvinfo(struct net_device *ndev,</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, priv-&gt;drv_name, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, priv-&gt;drv_version, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, priv-&gt;drv_name, sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops arc_emac_ethtool_ops = {</div><div class='hunk'>@@ -115,6 +111,7 @@ static void arc_emac_tx_clean(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TX_BD_NUM; i++) {</div><div class='hunk'>@@ -144,7 +141,7 @@ static void arc_emac_tx_clean(struct net_device *ndev)</div><div class='ctx'> 			stats-&gt;tx_bytes += skb-&gt;len;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dma_unmap_single(&amp;ndev-&gt;dev, dma_unmap_addr(tx_buff, addr),</div><div class='add'>+		dma_unmap_single(dev, dma_unmap_addr(tx_buff, addr),</div><div class='ctx'> 				 dma_unmap_len(tx_buff, len), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		/* return the sk_buff to system */</div><div class='hunk'>@@ -178,6 +175,7 @@ static void arc_emac_tx_clean(struct net_device *ndev)</div><div class='ctx'> static int arc_emac_rx(struct net_device *ndev, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='ctx'> 	unsigned int work_done;</div><div class='ctx'> </div><div class='ctx'> 	for (work_done = 0; work_done &lt; budget; work_done++) {</div><div class='hunk'>@@ -227,9 +225,9 @@ static int arc_emac_rx(struct net_device *ndev, int budget)</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_single(&amp;ndev-&gt;dev, (void *)skb-&gt;data,</div><div class='add'>+		addr = dma_map_single(dev, (void *)skb-&gt;data,</div><div class='ctx'> 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(&amp;ndev-&gt;dev, addr)) {</div><div class='add'>+		if (dma_mapping_error(dev, addr)) {</div><div class='ctx'> 			if (net_ratelimit())</div><div class='ctx'> 				netdev_err(ndev, "cannot map dma buffer\n");</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='hunk'>@@ -241,7 +239,7 @@ static int arc_emac_rx(struct net_device *ndev, int budget)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* unmap previosly mapped skb */</div><div class='del'>-		dma_unmap_single(&amp;ndev-&gt;dev, dma_unmap_addr(rx_buff, addr),</div><div class='add'>+		dma_unmap_single(dev, dma_unmap_addr(rx_buff, addr),</div><div class='ctx'> 				 dma_unmap_len(rx_buff, len), DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		pktlen = info &amp; LEN_MASK;</div><div class='hunk'>@@ -427,6 +425,7 @@ static int arc_emac_open(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	struct phy_device *phy_dev = ndev-&gt;phydev;</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	phy_dev-&gt;autoneg = AUTONEG_ENABLE;</div><div class='hunk'>@@ -449,9 +448,9 @@ static int arc_emac_open(struct net_device *ndev)</div><div class='ctx'> 		if (unlikely(!rx_buff-&gt;skb))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_single(&amp;ndev-&gt;dev, (void *)rx_buff-&gt;skb-&gt;data,</div><div class='add'>+		addr = dma_map_single(dev, (void *)rx_buff-&gt;skb-&gt;data,</div><div class='ctx'> 				      EMAC_BUFFER_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(&amp;ndev-&gt;dev, addr)) {</div><div class='add'>+		if (dma_mapping_error(dev, addr)) {</div><div class='ctx'> 			netdev_err(ndev, "cannot dma map\n");</div><div class='ctx'> 			dev_kfree_skb(rx_buff-&gt;skb);</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -552,6 +551,7 @@ static void arc_emac_set_rx_mode(struct net_device *ndev)</div><div class='ctx'> static void arc_free_tx_queue(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TX_BD_NUM; i++) {</div><div class='hunk'>@@ -559,7 +559,7 @@ static void arc_free_tx_queue(struct net_device *ndev)</div><div class='ctx'> 		struct buffer_state *tx_buff = &amp;priv-&gt;tx_buff[i];</div><div class='ctx'> </div><div class='ctx'> 		if (tx_buff-&gt;skb) {</div><div class='del'>-			dma_unmap_single(&amp;ndev-&gt;dev,</div><div class='add'>+			dma_unmap_single(dev,</div><div class='ctx'> 					 dma_unmap_addr(tx_buff, addr),</div><div class='ctx'> 					 dma_unmap_len(tx_buff, len),</div><div class='ctx'> 					 DMA_TO_DEVICE);</div><div class='hunk'>@@ -583,6 +583,7 @@ static void arc_free_tx_queue(struct net_device *ndev)</div><div class='ctx'> static void arc_free_rx_queue(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; RX_BD_NUM; i++) {</div><div class='hunk'>@@ -590,7 +591,7 @@ static void arc_free_rx_queue(struct net_device *ndev)</div><div class='ctx'> 		struct buffer_state *rx_buff = &amp;priv-&gt;rx_buff[i];</div><div class='ctx'> </div><div class='ctx'> 		if (rx_buff-&gt;skb) {</div><div class='del'>-			dma_unmap_single(&amp;ndev-&gt;dev,</div><div class='add'>+			dma_unmap_single(dev,</div><div class='ctx'> 					 dma_unmap_addr(rx_buff, addr),</div><div class='ctx'> 					 dma_unmap_len(rx_buff, len),</div><div class='ctx'> 					 DMA_FROM_DEVICE);</div><div class='hunk'>@@ -677,12 +678,13 @@ static struct net_device_stats *arc_emac_stats(struct net_device *ndev)</div><div class='ctx'>  *</div><div class='ctx'>  * This function is invoked from upper layers to initiate transmission.</div><div class='ctx'>  */</div><div class='del'>-static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+static netdev_tx_t arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	unsigned int len, *txbd_curr = &amp;priv-&gt;txbd_curr;</div><div class='ctx'> 	struct net_device_stats *stats = &amp;ndev-&gt;stats;</div><div class='ctx'> 	__le32 *info = &amp;priv-&gt;txbd[*txbd_curr].info;</div><div class='add'>+	struct device *dev = ndev-&gt;dev.parent;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_padto(skb, ETH_ZLEN))</div><div class='hunk'>@@ -696,10 +698,9 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	addr = dma_map_single(&amp;ndev-&gt;dev, (void *)skb-&gt;data, len,</div><div class='del'>-			      DMA_TO_DEVICE);</div><div class='add'>+	addr = dma_map_single(dev, (void *)skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dma_mapping_error(&amp;ndev-&gt;dev, addr))) {</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='ctx'> 		stats-&gt;tx_dropped++;</div><div class='ctx'> 		stats-&gt;tx_errors++;</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -777,25 +778,13 @@ static int arc_emac_set_address(struct net_device *ndev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(ndev-&gt;dev_addr, addr-&gt;sa_data, ndev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(ndev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	arc_emac_set_address_internal(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int arc_emac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!dev-&gt;phydev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return phy_mii_ioctl(dev-&gt;phydev, rq, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  * arc_emac_restart - Restart EMAC</div><div class='ctx'>  * @ndev:	Pointer to net_device structure.</div><div class='hunk'>@@ -860,7 +849,7 @@ static const struct net_device_ops arc_emac_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address	= arc_emac_set_address,</div><div class='ctx'> 	.ndo_get_stats		= arc_emac_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= arc_emac_set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= arc_emac_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl_running,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= arc_emac_poll_controller,</div><div class='ctx'> #endif</div><div class='hunk'>@@ -873,7 +862,6 @@ int arc_emac_probe(struct net_device *ndev, int interface)</div><div class='ctx'> 	struct device_node *phy_node;</div><div class='ctx'> 	struct phy_device *phydev = NULL;</div><div class='ctx'> 	struct arc_emac_priv *priv;</div><div class='del'>-	const char *mac_addr;</div><div class='ctx'> 	unsigned int id, clock_frequency, irq;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -958,11 +946,8 @@ int arc_emac_probe(struct net_device *ndev, int interface)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get MAC address from device tree */</div><div class='del'>-	mac_addr = of_get_mac_address(dev-&gt;of_node);</div><div class='del'>-</div><div class='del'>-	if (!IS_ERR(mac_addr))</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='del'>-	else</div><div class='add'>+	err = of_get_ethdev_address(dev-&gt;of_node, ndev);</div><div class='add'>+	if (err)</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='ctx'> </div><div class='ctx'> 	arc_emac_set_address_internal(ndev);</div><div class='hunk'>@@ -1001,7 +986,8 @@ int arc_emac_probe(struct net_device *ndev, int interface)</div><div class='ctx'> 	dev_info(dev, "connected to %s phy with id 0x%x\n",</div><div class='ctx'> 		 phydev-&gt;drv-&gt;name, phydev-&gt;phy_id);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, arc_emac_poll, ARC_EMAC_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;priv-&gt;napi, arc_emac_poll,</div><div class='add'>+			      ARC_EMAC_NAPI_WEIGHT);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(ndev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1027,7 +1013,7 @@ out_put_node:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(arc_emac_probe);</div><div class='ctx'> </div><div class='del'>-int arc_emac_remove(struct net_device *ndev)</div><div class='add'>+void arc_emac_remove(struct net_device *ndev)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -1038,8 +1024,6 @@ int arc_emac_remove(struct net_device *ndev)</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ERR(priv-&gt;clk))</div><div class='ctx'> 		clk_disable_unprepare(priv-&gt;clk);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(arc_emac_remove);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/arc/emac_mdio.c b/drivers/net/ethernet/arc/emac_mdio.c<br/>index 0187dbf3b87d..078b1a72c161 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_mdio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_mdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/arc/emac_mdio.c</a></div><div class='hunk'>@@ -132,6 +132,8 @@ int arc_mdio_probe(struct arc_emac_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct arc_emac_mdio_bus_data *data = &amp;priv-&gt;bus_data;</div><div class='ctx'> 	struct device_node *np = priv-&gt;dev-&gt;of_node;</div><div class='add'>+	const char *name = "Synopsys MII Bus";</div><div class='add'>+	struct device_node *mdio_node;</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> 	int error;</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +144,7 @@ int arc_mdio_probe(struct arc_emac_priv *priv)</div><div class='ctx'> 	priv-&gt;bus = bus;</div><div class='ctx'> 	bus-&gt;priv = priv;</div><div class='ctx'> 	bus-&gt;parent = priv-&gt;dev;</div><div class='del'>-	bus-&gt;name = "Synopsys MII Bus";</div><div class='add'>+	bus-&gt;name = name;</div><div class='ctx'> 	bus-&gt;read = &amp;arc_mdio_read;</div><div class='ctx'> 	bus-&gt;write = &amp;arc_mdio_write;</div><div class='ctx'> 	bus-&gt;reset = &amp;arc_mdio_reset;</div><div class='hunk'>@@ -151,9 +153,9 @@ int arc_mdio_probe(struct arc_emac_priv *priv)</div><div class='ctx'> 	data-&gt;reset_gpio = devm_gpiod_get_optional(priv-&gt;dev, "phy-reset",</div><div class='ctx'> 						   GPIOD_OUT_LOW);</div><div class='ctx'> 	if (IS_ERR(data-&gt;reset_gpio)) {</div><div class='del'>-		error = PTR_ERR(data-&gt;reset_gpio);</div><div class='del'>-		dev_err(priv-&gt;dev, "Failed to request gpio: %d\n", error);</div><div class='del'>-		return error;</div><div class='add'>+		mdiobus_free(bus);</div><div class='add'>+		return dev_err_probe(priv-&gt;dev, PTR_ERR(data-&gt;reset_gpio),</div><div class='add'>+				     "Failed to request gpio\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	of_property_read_u32(np, "phy-reset-duration", &amp;data-&gt;msec);</div><div class='hunk'>@@ -163,11 +165,17 @@ int arc_mdio_probe(struct arc_emac_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%s", bus-&gt;name);</div><div class='ctx'> </div><div class='del'>-	error = of_mdiobus_register(bus, priv-&gt;dev-&gt;of_node);</div><div class='add'>+	/* Backwards compatibility for EMAC nodes without MDIO subnode. */</div><div class='add'>+	mdio_node = of_get_child_by_name(np, "mdio");</div><div class='add'>+	if (!mdio_node)</div><div class='add'>+		mdio_node = of_node_get(np);</div><div class='add'>+</div><div class='add'>+	error = of_mdiobus_register(bus, mdio_node);</div><div class='add'>+	of_node_put(mdio_node);</div><div class='ctx'> 	if (error) {</div><div class='del'>-		dev_err(priv-&gt;dev, "cannot register MDIO bus %s\n", bus-&gt;name);</div><div class='ctx'> 		mdiobus_free(bus);</div><div class='del'>-		return error;</div><div class='add'>+		return dev_err_probe(priv-&gt;dev, error,</div><div class='add'>+				     "cannot register MDIO bus %s\n", name);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c<br/>index 42d2e1b02c44..780e70ea1c22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_rockchip.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/arc/emac_rockchip.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/arc/emac_rockchip.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/arc/emac_rockchip.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> // SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * emac-rockchip.c - Rockchip EMAC specific glue layer</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2014 Romain Perier &lt;romain.perier@gmail.com&gt;</div><div class='hunk'>@@ -16,7 +16,6 @@</div><div class='ctx'> #include "emac.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME        "rockchip_emac"</div><div class='del'>-#define DRV_VERSION     "1.1"</div><div class='ctx'> </div><div class='ctx'> struct emac_rockchip_soc_data {</div><div class='ctx'> 	unsigned int grf_offset;</div><div class='hunk'>@@ -97,8 +96,9 @@ static int emac_rockchip_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct rockchip_priv_data *priv;</div><div class='ctx'> 	const struct of_device_id *match;</div><div class='add'>+	phy_interface_t interface;</div><div class='ctx'> 	u32 data;</div><div class='del'>-	int err, interface;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev-&gt;dev.of_node)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -111,10 +111,11 @@ static int emac_rockchip_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(ndev);</div><div class='ctx'> 	priv-&gt;emac.drv_name = DRV_NAME;</div><div class='del'>-	priv-&gt;emac.drv_version = DRV_VERSION;</div><div class='ctx'> 	priv-&gt;emac.set_mac_speed = emac_rockchip_set_mac_speed;</div><div class='ctx'> </div><div class='del'>-	interface = of_get_phy_mode(dev-&gt;of_node);</div><div class='add'>+	err = of_get_phy_mode(dev-&gt;of_node, &amp;interface);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_netdev;</div><div class='ctx'> </div><div class='ctx'> 	/* RK3036/RK3066/RK3188 SoCs only support RMII */</div><div class='ctx'> 	if (interface != PHY_INTERFACE_MODE_RMII) {</div><div class='hunk'>@@ -243,21 +244,22 @@ out_netdev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int emac_rockchip_remove(struct platform_device *pdev)</div><div class='add'>+static void emac_rockchip_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct rockchip_priv_data *priv = netdev_priv(ndev);</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='del'>-	err = arc_emac_remove(ndev);</div><div class='add'>+	arc_emac_remove(ndev);</div><div class='ctx'> </div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;refclk);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;regulator)</div><div class='ctx'> 		regulator_disable(priv-&gt;regulator);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;soc_data-&gt;need_div_macclk)</div><div class='add'>+		clk_disable_unprepare(priv-&gt;macclk);</div><div class='add'>+</div><div class='ctx'> 	free_netdev(ndev);</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver emac_rockchip_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/asix/Kconfig b/drivers/net/ethernet/asix/Kconfig<br/>new file mode 100644<br/>index 000000000000..eed02453314c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,35 @@</div><div class='add'>+#</div><div class='add'>+# Asix network device configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config NET_VENDOR_ASIX</div><div class='add'>+	bool "Asix devices"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  If you have a network (Ethernet, non-USB, not NE2000 compatible)</div><div class='add'>+	  interface based on a chip from ASIX, say Y.</div><div class='add'>+</div><div class='add'>+if NET_VENDOR_ASIX</div><div class='add'>+</div><div class='add'>+config SPI_AX88796C</div><div class='add'>+	tristate "Asix AX88796C-SPI support"</div><div class='add'>+	select PHYLIB</div><div class='add'>+	depends on SPI</div><div class='add'>+	depends on GPIOLIB</div><div class='add'>+	help</div><div class='add'>+	  Say Y here if you intend to use ASIX AX88796C attached in SPI mode.</div><div class='add'>+</div><div class='add'>+config SPI_AX88796C_COMPRESSION</div><div class='add'>+	bool "SPI transfer compression"</div><div class='add'>+	default n</div><div class='add'>+	depends on SPI_AX88796C</div><div class='add'>+	help</div><div class='add'>+	  Say Y here to enable SPI transfer compression. It saves up</div><div class='add'>+	  to 24 dummy cycles during each transfer which may noticeably</div><div class='add'>+	  speed up short transfers. This sets the default value that is</div><div class='add'>+	  inherited by network interfaces during probe. It can be</div><div class='add'>+	  changed at run time via spi-compression ethtool tunable.</div><div class='add'>+</div><div class='add'>+	  If unsure say N.</div><div class='add'>+</div><div class='add'>+endif # NET_VENDOR_ASIX</div><div class='head'>diff --git a/drivers/net/ethernet/asix/Makefile b/drivers/net/ethernet/asix/Makefile<br/>new file mode 100644<br/>index 000000000000..0bfbbb042634<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+#</div><div class='add'>+# Makefile for the Asix network device drivers.</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_SPI_AX88796C) += ax88796c.o</div><div class='add'>+ax88796c-y := ax88796c_main.o ax88796c_ioctl.o ax88796c_spi.o</div><div class='head'>diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.c b/drivers/net/ethernet/asix/ax88796c_ioctl.c<br/>new file mode 100644<br/>index 000000000000..7d2fe2e5af92<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/ax88796c_ioctl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/ax88796c_ioctl.c</a></div><div class='hunk'>@@ -0,0 +1,239 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010 ASIX Electronics Corporation</div><div class='add'>+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * ASIX AX88796C SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	"ax88796c: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ax88796c_main.h"</div><div class='add'>+#include "ax88796c_ioctl.h"</div><div class='add'>+</div><div class='add'>+static const char ax88796c_priv_flag_names[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"SPICompression",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ax88796c_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	/* Inherit standard device info */</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ax88796c_get_msglevel(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	return ax_local-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_set_msglevel(struct net_device *ndev, u32 level)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;msg_enable = level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ax88796c_get_pauseparam(struct net_device *ndev, struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	pause-&gt;tx_pause = !!(ax_local-&gt;flowctrl &amp; AX_FC_TX);</div><div class='add'>+	pause-&gt;rx_pause = !!(ax_local-&gt;flowctrl &amp; AX_FC_RX);</div><div class='add'>+	pause-&gt;autoneg = (ax_local-&gt;flowctrl &amp; AX_FC_ANEG) ?</div><div class='add'>+		AUTONEG_ENABLE :</div><div class='add'>+		AUTONEG_DISABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ax88796c_set_pauseparam(struct net_device *ndev, struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	int fc;</div><div class='add'>+</div><div class='add'>+	/* The following logic comes from phylink_ethtool_set_pauseparam() */</div><div class='add'>+	fc = pause-&gt;tx_pause ? AX_FC_TX : 0;</div><div class='add'>+	fc |= pause-&gt;rx_pause ? AX_FC_RX : 0;</div><div class='add'>+	fc |= pause-&gt;autoneg ? AX_FC_ANEG : 0;</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;flowctrl = fc;</div><div class='add'>+</div><div class='add'>+	if (pause-&gt;autoneg) {</div><div class='add'>+		phy_set_asym_pause(ax_local-&gt;phydev, pause-&gt;tx_pause,</div><div class='add'>+				   pause-&gt;rx_pause);</div><div class='add'>+	} else {</div><div class='add'>+		int maccr = 0;</div><div class='add'>+</div><div class='add'>+		phy_set_asym_pause(ax_local-&gt;phydev, 0, 0);</div><div class='add'>+		maccr |= (ax_local-&gt;flowctrl &amp; AX_FC_RX) ? MACCR_RXFC_ENABLE : 0;</div><div class='add'>+		maccr |= (ax_local-&gt;flowctrl &amp; AX_FC_TX) ? MACCR_TXFC_ENABLE : 0;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+		maccr |= AX_READ(&amp;ax_local-&gt;ax_spi, P0_MACCR) &amp;</div><div class='add'>+			~(MACCR_TXFC_ENABLE | MACCR_RXFC_ENABLE);</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, maccr, P0_MACCR);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_get_regs_len(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return AX88796C_REGDUMP_LEN + AX88796C_PHY_REGDUMP_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ax88796c_get_regs(struct net_device *ndev, struct ethtool_regs *regs, void *_p)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	int offset, i;</div><div class='add'>+	u16 *p = _p;</div><div class='add'>+</div><div class='add'>+	memset(p, 0, ax88796c_get_regs_len(ndev));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	for (offset = 0; offset &lt; AX88796C_REGDUMP_LEN; offset += 2) {</div><div class='add'>+		if (!test_bit(offset / 2, ax88796c_no_regs_mask))</div><div class='add'>+			*p = AX_READ(&amp;ax_local-&gt;ax_spi, offset);</div><div class='add'>+		p++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AX88796C_PHY_REGDUMP_LEN / 2; i++) {</div><div class='add'>+		*p = phy_read(ax_local-&gt;phydev, i);</div><div class='add'>+		p++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ax88796c_get_strings(struct net_device *ndev, u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		memcpy(data, ax88796c_priv_flag_names,</div><div class='add'>+		       sizeof(ax88796c_priv_flag_names));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ax88796c_get_sset_count(struct net_device *ndev, int stringset)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_PRIV_FLAGS:</div><div class='add'>+		ret = ARRAY_SIZE(ax88796c_priv_flag_names);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_set_priv_flags(struct net_device *ndev, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	if (flags &amp; ~AX_PRIV_FLAGS_MASK)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if ((ax_local-&gt;priv_flags ^ flags) &amp; AX_CAP_COMP)</div><div class='add'>+		if (netif_running(ndev))</div><div class='add'>+			return -EBUSY;</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;priv_flags = flags;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ax88796c_get_priv_flags(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	return ax_local-&gt;priv_flags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int ax88796c_mdio_read(struct mii_bus *mdiobus, int phy_id, int loc)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = mdiobus-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, MDIOCR_RADDR(loc)</div><div class='add'>+			| MDIOCR_FADDR(phy_id) | MDIOCR_READ, P2_MDIOCR);</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(AX_READ, ret,</div><div class='add'>+				(ret != 0),</div><div class='add'>+				0, jiffies_to_usecs(HZ / 100), false,</div><div class='add'>+				&amp;ax_local-&gt;ax_spi, P2_MDIOCR);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = AX_READ(&amp;ax_local-&gt;ax_spi, P2_MDIODR);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+ax88796c_mdio_write(struct mii_bus *mdiobus, int phy_id, int loc, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = mdiobus-&gt;priv;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, val, P2_MDIODR);</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+		 MDIOCR_RADDR(loc) | MDIOCR_FADDR(phy_id)</div><div class='add'>+		 | MDIOCR_WRITE, P2_MDIOCR);</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(AX_READ, ret,</div><div class='add'>+				((ret &amp; MDIOCR_VALID) != 0), 0,</div><div class='add'>+				jiffies_to_usecs(HZ / 100), false,</div><div class='add'>+				&amp;ax_local-&gt;ax_spi, P2_MDIOCR);</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops ax88796c_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= ax88796c_get_drvinfo,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_msglevel		= ax88796c_get_msglevel,</div><div class='add'>+	.set_msglevel		= ax88796c_set_msglevel,</div><div class='add'>+	.get_link_ksettings	= phy_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings	= phy_ethtool_set_link_ksettings,</div><div class='add'>+	.nway_reset		= phy_ethtool_nway_reset,</div><div class='add'>+	.get_pauseparam		= ax88796c_get_pauseparam,</div><div class='add'>+	.set_pauseparam		= ax88796c_set_pauseparam,</div><div class='add'>+	.get_regs_len		= ax88796c_get_regs_len,</div><div class='add'>+	.get_regs		= ax88796c_get_regs,</div><div class='add'>+	.get_strings		= ax88796c_get_strings,</div><div class='add'>+	.get_sset_count		= ax88796c_get_sset_count,</div><div class='add'>+	.get_priv_flags		= ax88796c_get_priv_flags,</div><div class='add'>+	.set_priv_flags		= ax88796c_set_priv_flags,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int ax88796c_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = phy_mii_ioctl(ndev-&gt;phydev, ifr, cmd);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/asix/ax88796c_ioctl.h b/drivers/net/ethernet/asix/ax88796c_ioctl.h<br/>new file mode 100644<br/>index 000000000000..34d2a7dcc5ef<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/ax88796c_ioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/ax88796c_ioctl.h</a></div><div class='hunk'>@@ -0,0 +1,26 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010 ASIX Electronics Corporation</div><div class='add'>+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * ASIX AX88796C SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AX88796C_IOCTL_H</div><div class='add'>+#define _AX88796C_IOCTL_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ax88796c_main.h"</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_ops ax88796c_ethtool_ops;</div><div class='add'>+</div><div class='add'>+bool ax88796c_check_power(const struct ax88796c_device *ax_local);</div><div class='add'>+bool ax88796c_check_power_and_wake(struct ax88796c_device *ax_local);</div><div class='add'>+void ax88796c_set_power_saving(struct ax88796c_device *ax_local, u8 ps_level);</div><div class='add'>+int ax88796c_mdio_read(struct mii_bus *mdiobus, int phy_id, int loc);</div><div class='add'>+int ax88796c_mdio_write(struct mii_bus *mdiobus, int phy_id, int loc, u16 val);</div><div class='add'>+int ax88796c_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c<br/>new file mode 100644<br/>index 000000000000..11e8996b33d7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/ax88796c_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/ax88796c_main.c</a></div><div class='hunk'>@@ -0,0 +1,1166 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010 ASIX Electronics Corporation</div><div class='add'>+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * ASIX AX88796C SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	"ax88796c: " fmt</div><div class='add'>+</div><div class='add'>+#include "ax88796c_main.h"</div><div class='add'>+#include "ax88796c_ioctl.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/lockdep.h&gt;</div><div class='add'>+#include &lt;linux/mdio.h&gt;</div><div class='add'>+#include &lt;linux/minmax.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+static int comp = IS_ENABLED(CONFIG_SPI_AX88796C_COMPRESSION);</div><div class='add'>+static int msg_enable = NETIF_MSG_PROBE |</div><div class='add'>+			NETIF_MSG_LINK |</div><div class='add'>+			NETIF_MSG_RX_ERR |</div><div class='add'>+			NETIF_MSG_TX_ERR;</div><div class='add'>+</div><div class='add'>+static const char *no_regs_list = "80018001,e1918001,8001a001,fc0d0000";</div><div class='add'>+unsigned long ax88796c_no_regs_mask[AX88796C_REGDUMP_LEN / (sizeof(unsigned long) * 8)];</div><div class='add'>+</div><div class='add'>+module_param(msg_enable, int, 0444);</div><div class='add'>+MODULE_PARM_DESC(msg_enable, "Message mask (see linux/netdevice.h for bitmap)");</div><div class='add'>+</div><div class='add'>+static int ax88796c_soft_reset(struct ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	u16 temp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, PSR_RESET, P0_PSR);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, PSR_RESET_CLR, P0_PSR);</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(AX_READ, ret,</div><div class='add'>+				(ret &amp; PSR_DEV_READY),</div><div class='add'>+				0, jiffies_to_usecs(160 * HZ / 1000), false,</div><div class='add'>+				&amp;ax_local-&gt;ax_spi, P0_PSR);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	temp = AX_READ(&amp;ax_local-&gt;ax_spi, P4_SPICR);</div><div class='add'>+	if (ax_local-&gt;priv_flags &amp; AX_CAP_COMP) {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+			 (temp | SPICR_RCEN | SPICR_QCEN), P4_SPICR);</div><div class='add'>+		ax_local-&gt;ax_spi.comp = 1;</div><div class='add'>+	} else {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+			 (temp &amp; ~(SPICR_RCEN | SPICR_QCEN)), P4_SPICR);</div><div class='add'>+		ax_local-&gt;ax_spi.comp = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_reload_eeprom(struct ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, EECR_RELOAD, P3_EECR);</div><div class='add'>+</div><div class='add'>+	ret = read_poll_timeout(AX_READ, ret,</div><div class='add'>+				(ret &amp; PSR_DEV_READY),</div><div class='add'>+				0, jiffies_to_usecs(2 * HZ / 1000), false,</div><div class='add'>+				&amp;ax_local-&gt;ax_spi, P0_PSR);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;ax_local-&gt;spi-&gt;dev,</div><div class='add'>+			"timeout waiting for reload eeprom\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_set_hw_multicast(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	int mc_count = netdev_mc_count(ndev);</div><div class='add'>+	u16 rx_ctl = RXCR_AB;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	memset(ax_local-&gt;multi_filter, 0, AX_MCAST_FILTER_SIZE);</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		rx_ctl |= RXCR_PRO;</div><div class='add'>+</div><div class='add'>+	} else if (ndev-&gt;flags &amp; IFF_ALLMULTI || mc_count &gt; AX_MAX_MCAST) {</div><div class='add'>+		rx_ctl |= RXCR_AMALL;</div><div class='add'>+</div><div class='add'>+	} else if (mc_count == 0) {</div><div class='add'>+		/* just broadcast and directed */</div><div class='add'>+	} else {</div><div class='add'>+		u32 crc_bits;</div><div class='add'>+		int i;</div><div class='add'>+		struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+		netdev_for_each_mc_addr(ha, ndev) {</div><div class='add'>+			crc_bits = ether_crc(ETH_ALEN, ha-&gt;addr);</div><div class='add'>+			ax_local-&gt;multi_filter[crc_bits &gt;&gt; 29] |=</div><div class='add'>+						(1 &lt;&lt; ((crc_bits &gt;&gt; 26) &amp; 7));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; 4; i++) {</div><div class='add'>+			AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+				 ((ax_local-&gt;multi_filter[i * 2 + 1] &lt;&lt; 8) |</div><div class='add'>+				  ax_local-&gt;multi_filter[i * 2]), P3_MFAR(i));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, rx_ctl, P2_RXCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_set_mac_addr(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, ((u16)(ndev-&gt;dev_addr[4] &lt;&lt; 8) |</div><div class='add'>+			(u16)ndev-&gt;dev_addr[5]), P3_MACASR0);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, ((u16)(ndev-&gt;dev_addr[2] &lt;&lt; 8) |</div><div class='add'>+			(u16)ndev-&gt;dev_addr[3]), P3_MACASR1);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, ((u16)(ndev-&gt;dev_addr[0] &lt;&lt; 8) |</div><div class='add'>+			(u16)ndev-&gt;dev_addr[1]), P3_MACASR2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_load_mac_addr(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u16 temp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	/* Try the device tree first */</div><div class='add'>+	if (!platform_get_ethdev_address(&amp;ax_local-&gt;spi-&gt;dev, ndev) &amp;&amp;</div><div class='add'>+	    is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='add'>+		if (netif_msg_probe(ax_local))</div><div class='add'>+			dev_info(&amp;ax_local-&gt;spi-&gt;dev,</div><div class='add'>+				 "MAC address read from device tree\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Read the MAC address from AX88796C */</div><div class='add'>+	temp = AX_READ(&amp;ax_local-&gt;ax_spi, P3_MACASR0);</div><div class='add'>+	addr[5] = (u8)temp;</div><div class='add'>+	addr[4] = (u8)(temp &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	temp = AX_READ(&amp;ax_local-&gt;ax_spi, P3_MACASR1);</div><div class='add'>+	addr[3] = (u8)temp;</div><div class='add'>+	addr[2] = (u8)(temp &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	temp = AX_READ(&amp;ax_local-&gt;ax_spi, P3_MACASR2);</div><div class='add'>+	addr[1] = (u8)temp;</div><div class='add'>+	addr[0] = (u8)(temp &gt;&gt; 8);</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(addr)) {</div><div class='add'>+		eth_hw_addr_set(ndev, addr);</div><div class='add'>+		if (netif_msg_probe(ax_local))</div><div class='add'>+			dev_info(&amp;ax_local-&gt;spi-&gt;dev,</div><div class='add'>+				 "MAC address read from ASIX chip\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Use random address if none found */</div><div class='add'>+	if (netif_msg_probe(ax_local))</div><div class='add'>+		dev_info(&amp;ax_local-&gt;spi-&gt;dev, "Use random MAC address\n");</div><div class='add'>+	eth_hw_addr_random(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_proc_tx_hdr(struct tx_pkt_info *info, u8 ip_summed)</div><div class='add'>+{</div><div class='add'>+	u16 pkt_len_bar = (~info-&gt;pkt_len &amp; TX_HDR_SOP_PKTLENBAR);</div><div class='add'>+</div><div class='add'>+	/* Prepare SOP header */</div><div class='add'>+	info-&gt;sop.flags_len = info-&gt;pkt_len |</div><div class='add'>+		((ip_summed == CHECKSUM_NONE) ||</div><div class='add'>+		 (ip_summed == CHECKSUM_UNNECESSARY) ? TX_HDR_SOP_DICF : 0);</div><div class='add'>+</div><div class='add'>+	info-&gt;sop.seq_lenbar = ((info-&gt;seq_num &lt;&lt; 11) &amp; TX_HDR_SOP_SEQNUM)</div><div class='add'>+				| pkt_len_bar;</div><div class='add'>+	cpu_to_be16s(&amp;info-&gt;sop.flags_len);</div><div class='add'>+	cpu_to_be16s(&amp;info-&gt;sop.seq_lenbar);</div><div class='add'>+</div><div class='add'>+	/* Prepare Segment header */</div><div class='add'>+	info-&gt;seg.flags_seqnum_seglen = TX_HDR_SEG_FS | TX_HDR_SEG_LS</div><div class='add'>+						| info-&gt;pkt_len;</div><div class='add'>+</div><div class='add'>+	info-&gt;seg.eo_so_seglenbar = pkt_len_bar;</div><div class='add'>+</div><div class='add'>+	cpu_to_be16s(&amp;info-&gt;seg.flags_seqnum_seglen);</div><div class='add'>+	cpu_to_be16s(&amp;info-&gt;seg.eo_so_seglenbar);</div><div class='add'>+</div><div class='add'>+	/* Prepare EOP header */</div><div class='add'>+	info-&gt;eop.seq_len = ((info-&gt;seq_num &lt;&lt; 11) &amp;</div><div class='add'>+			     TX_HDR_EOP_SEQNUM) | info-&gt;pkt_len;</div><div class='add'>+	info-&gt;eop.seqbar_lenbar = ((~info-&gt;seq_num &lt;&lt; 11) &amp;</div><div class='add'>+				   TX_HDR_EOP_SEQNUMBAR) | pkt_len_bar;</div><div class='add'>+</div><div class='add'>+	cpu_to_be16s(&amp;info-&gt;eop.seq_len);</div><div class='add'>+	cpu_to_be16s(&amp;info-&gt;eop.seqbar_lenbar);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ax88796c_check_free_pages(struct ax88796c_device *ax_local, u8 need_pages)</div><div class='add'>+{</div><div class='add'>+	u8 free_pages;</div><div class='add'>+	u16 tmp;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	free_pages = AX_READ(&amp;ax_local-&gt;ax_spi, P0_TFBFCR) &amp; TX_FREEBUF_MASK;</div><div class='add'>+	if (free_pages &lt; need_pages) {</div><div class='add'>+		/* schedule free page interrupt */</div><div class='add'>+		tmp = AX_READ(&amp;ax_local-&gt;ax_spi, P0_TFBFCR)</div><div class='add'>+				&amp; TFBFCR_SCHE_FREE_PAGE;</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, tmp | TFBFCR_TX_PAGE_SET |</div><div class='add'>+				TFBFCR_SET_FREE_PAGE(need_pages),</div><div class='add'>+				P0_TFBFCR);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *</div><div class='add'>+ax88796c_tx_fixup(struct net_device *ndev, struct sk_buff_head *q)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	u8 spi_len = ax_local-&gt;ax_spi.comp ? 1 : 4;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct tx_pkt_info info;</div><div class='add'>+	struct skb_data *entry;</div><div class='add'>+	u16 pkt_len;</div><div class='add'>+	u8 padlen, seq_num;</div><div class='add'>+	u8 need_pages;</div><div class='add'>+	int headroom;</div><div class='add'>+	int tailroom;</div><div class='add'>+</div><div class='add'>+	if (skb_queue_empty(q))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb = skb_peek(q);</div><div class='add'>+	pkt_len = skb-&gt;len;</div><div class='add'>+	need_pages = (pkt_len + TX_OVERHEAD + 127) &gt;&gt; 7;</div><div class='add'>+	if (ax88796c_check_free_pages(ax_local, need_pages) != 0)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	headroom = skb_headroom(skb);</div><div class='add'>+	tailroom = skb_tailroom(skb);</div><div class='add'>+	padlen = round_up(pkt_len, 4) - pkt_len;</div><div class='add'>+	seq_num = ++ax_local-&gt;seq_num &amp; 0x1F;</div><div class='add'>+</div><div class='add'>+	info.pkt_len = pkt_len;</div><div class='add'>+</div><div class='add'>+	if (skb_cloned(skb) ||</div><div class='add'>+	    (headroom &lt; (TX_OVERHEAD + spi_len)) ||</div><div class='add'>+	    (tailroom &lt; (padlen + TX_EOP_SIZE))) {</div><div class='add'>+		size_t h = max((TX_OVERHEAD + spi_len) - headroom, 0);</div><div class='add'>+		size_t t = max((padlen + TX_EOP_SIZE) - tailroom, 0);</div><div class='add'>+</div><div class='add'>+		if (pskb_expand_head(skb, h, t, GFP_KERNEL))</div><div class='add'>+			return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	info.seq_num = seq_num;</div><div class='add'>+	ax88796c_proc_tx_hdr(&amp;info, skb-&gt;ip_summed);</div><div class='add'>+</div><div class='add'>+	/* SOP and SEG header */</div><div class='add'>+	memcpy(skb_push(skb, TX_OVERHEAD), &amp;info.tx_overhead, TX_OVERHEAD);</div><div class='add'>+</div><div class='add'>+	/* Write SPI TXQ header */</div><div class='add'>+	memcpy(skb_push(skb, spi_len), ax88796c_tx_cmd_buf, spi_len);</div><div class='add'>+</div><div class='add'>+	/* Make 32-bit alignment */</div><div class='add'>+	skb_put(skb, padlen);</div><div class='add'>+</div><div class='add'>+	/* EOP header */</div><div class='add'>+	skb_put_data(skb, &amp;info.eop, TX_EOP_SIZE);</div><div class='add'>+</div><div class='add'>+	skb_unlink(skb, q);</div><div class='add'>+</div><div class='add'>+	entry = (struct skb_data *)skb-&gt;cb;</div><div class='add'>+	memset(entry, 0, sizeof(*entry));</div><div class='add'>+	entry-&gt;len = pkt_len;</div><div class='add'>+</div><div class='add'>+	if (netif_msg_pktdata(ax_local)) {</div><div class='add'>+		char pfx[IFNAMSIZ + 7];</div><div class='add'>+</div><div class='add'>+		snprintf(pfx, sizeof(pfx), "%s:     ", ndev-&gt;name);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "TX packet len %d, total len %d, seq %d\n",</div><div class='add'>+			    pkt_len, skb-&gt;len, seq_num);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "  SPI Header:\n");</div><div class='add'>+		print_hex_dump(KERN_INFO, pfx, DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			       skb-&gt;data, 4, 0);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "  TX SOP:\n");</div><div class='add'>+		print_hex_dump(KERN_INFO, pfx, DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			       skb-&gt;data + 4, TX_OVERHEAD, 0);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "  TX packet:\n");</div><div class='add'>+		print_hex_dump(KERN_INFO, pfx, DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			       skb-&gt;data + 4 + TX_OVERHEAD,</div><div class='add'>+			       skb-&gt;len - TX_EOP_SIZE - 4 - TX_OVERHEAD, 0);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "  TX EOP:\n");</div><div class='add'>+		print_hex_dump(KERN_INFO, pfx, DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			       skb-&gt;data + skb-&gt;len - 4, 4, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_pcpu_stats *stats;</div><div class='add'>+	struct sk_buff *tx_skb;</div><div class='add'>+	struct skb_data *entry;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	stats = this_cpu_ptr(ax_local-&gt;stats);</div><div class='add'>+	tx_skb = ax88796c_tx_fixup(ax_local-&gt;ndev, &amp;ax_local-&gt;tx_wait_q);</div><div class='add'>+</div><div class='add'>+	if (!tx_skb) {</div><div class='add'>+		this_cpu_inc(ax_local-&gt;stats-&gt;tx_dropped);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	entry = (struct skb_data *)tx_skb-&gt;cb;</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+		 (TSNR_TXB_START | TSNR_PKT_CNT(1)), P0_TSNR);</div><div class='add'>+</div><div class='add'>+	axspi_write_txq(&amp;ax_local-&gt;ax_spi, tx_skb-&gt;data, tx_skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (((AX_READ(&amp;ax_local-&gt;ax_spi, P0_TSNR) &amp; TXNR_TXB_IDLE) == 0) ||</div><div class='add'>+	    ((ISR_TXERR &amp; AX_READ(&amp;ax_local-&gt;ax_spi, P0_ISR)) != 0)) {</div><div class='add'>+		/* Ack tx error int */</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, ISR_TXERR, P0_ISR);</div><div class='add'>+</div><div class='add'>+		this_cpu_inc(ax_local-&gt;stats-&gt;tx_dropped);</div><div class='add'>+</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netif_err(ax_local, tx_err, ax_local-&gt;ndev,</div><div class='add'>+				  "TX FIFO error, re-initialize the TX bridge\n");</div><div class='add'>+</div><div class='add'>+		/* Reinitial tx bridge */</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, TXNR_TXB_REINIT |</div><div class='add'>+			AX_READ(&amp;ax_local-&gt;ax_spi, P0_TSNR), P0_TSNR);</div><div class='add'>+		ax_local-&gt;seq_num = 0;</div><div class='add'>+	} else {</div><div class='add'>+		flags = u64_stats_update_begin_irqsave(&amp;stats-&gt;syncp);</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;tx_packets);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;tx_bytes, entry-&gt;len);</div><div class='add'>+		u64_stats_update_end_irqrestore(&amp;stats-&gt;syncp, flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry-&gt;state = tx_done;</div><div class='add'>+	dev_kfree_skb(tx_skb);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t</div><div class='add'>+ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;ax_local-&gt;tx_wait_q, skb);</div><div class='add'>+	if (skb_queue_len(&amp;ax_local-&gt;tx_wait_q) &gt; TX_QUEUE_HIGH_WATER)</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	set_bit(EVENT_TX, &amp;ax_local-&gt;flags);</div><div class='add'>+	schedule_work(&amp;ax_local-&gt;ax_work);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ax88796c_skb_return(struct ax88796c_device *ax_local,</div><div class='add'>+		    struct sk_buff *skb, struct rx_header *rxhdr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ax_local-&gt;ndev;</div><div class='add'>+	struct ax88796c_pcpu_stats *stats;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	stats = this_cpu_ptr(ax_local-&gt;stats);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (!(ndev-&gt;features &amp; NETIF_F_RXCSUM))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* checksum error bit is set */</div><div class='add'>+		if ((rxhdr-&gt;flags &amp; RX_HDR3_L3_ERR) ||</div><div class='add'>+		    (rxhdr-&gt;flags &amp; RX_HDR3_L4_ERR))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Other types may be indicated by more than one bit. */</div><div class='add'>+		if ((rxhdr-&gt;flags &amp; RX_HDR3_L4_TYPE_TCP) ||</div><div class='add'>+		    (rxhdr-&gt;flags &amp; RX_HDR3_L4_TYPE_UDP))</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+	} while (0);</div><div class='add'>+</div><div class='add'>+	flags = u64_stats_update_begin_irqsave(&amp;stats-&gt;syncp);</div><div class='add'>+	u64_stats_inc(&amp;stats-&gt;rx_packets);</div><div class='add'>+	u64_stats_add(&amp;stats-&gt;rx_bytes, skb-&gt;len);</div><div class='add'>+	u64_stats_update_end_irqrestore(&amp;stats-&gt;syncp, flags);</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = ndev;</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, ax_local-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	netif_info(ax_local, rx_status, ndev, "&lt; rx, len %zu, type 0x%x\n",</div><div class='add'>+		   skb-&gt;len + sizeof(struct ethhdr), skb-&gt;protocol);</div><div class='add'>+</div><div class='add'>+	status = netif_rx(skb);</div><div class='add'>+	if (status != NET_RX_SUCCESS &amp;&amp; net_ratelimit())</div><div class='add'>+		netif_info(ax_local, rx_err, ndev,</div><div class='add'>+			   "netif_rx status %d\n", status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+ax88796c_rx_fixup(struct ax88796c_device *ax_local, struct sk_buff *rx_skb)</div><div class='add'>+{</div><div class='add'>+	struct rx_header *rxhdr = (struct rx_header *)rx_skb-&gt;data;</div><div class='add'>+	struct net_device *ndev = ax_local-&gt;ndev;</div><div class='add'>+	u16 len;</div><div class='add'>+</div><div class='add'>+	be16_to_cpus(&amp;rxhdr-&gt;flags_len);</div><div class='add'>+	be16_to_cpus(&amp;rxhdr-&gt;seq_lenbar);</div><div class='add'>+	be16_to_cpus(&amp;rxhdr-&gt;flags);</div><div class='add'>+</div><div class='add'>+	if ((rxhdr-&gt;flags_len &amp; RX_HDR1_PKT_LEN) !=</div><div class='add'>+			 (~rxhdr-&gt;seq_lenbar &amp; 0x7FF)) {</div><div class='add'>+		netif_err(ax_local, rx_err, ndev, "Header error\n");</div><div class='add'>+</div><div class='add'>+		this_cpu_inc(ax_local-&gt;stats-&gt;rx_frame_errors);</div><div class='add'>+		kfree_skb(rx_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((rxhdr-&gt;flags_len &amp; RX_HDR1_MII_ERR) ||</div><div class='add'>+	    (rxhdr-&gt;flags_len &amp; RX_HDR1_CRC_ERR)) {</div><div class='add'>+		netif_err(ax_local, rx_err, ndev, "CRC or MII error\n");</div><div class='add'>+</div><div class='add'>+		this_cpu_inc(ax_local-&gt;stats-&gt;rx_crc_errors);</div><div class='add'>+		kfree_skb(rx_skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = rxhdr-&gt;flags_len &amp; RX_HDR1_PKT_LEN;</div><div class='add'>+	if (netif_msg_pktdata(ax_local)) {</div><div class='add'>+		char pfx[IFNAMSIZ + 7];</div><div class='add'>+</div><div class='add'>+		snprintf(pfx, sizeof(pfx), "%s:     ", ndev-&gt;name);</div><div class='add'>+		netdev_info(ndev, "RX data, total len %d, packet len %d\n",</div><div class='add'>+			    rx_skb-&gt;len, len);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "  Dump RX packet header:");</div><div class='add'>+		print_hex_dump(KERN_INFO, pfx, DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			       rx_skb-&gt;data, sizeof(*rxhdr), 0);</div><div class='add'>+</div><div class='add'>+		netdev_info(ndev, "  Dump RX packet:");</div><div class='add'>+		print_hex_dump(KERN_INFO, pfx, DUMP_PREFIX_OFFSET, 16, 1,</div><div class='add'>+			       rx_skb-&gt;data + sizeof(*rxhdr), len, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_pull(rx_skb, sizeof(*rxhdr));</div><div class='add'>+	pskb_trim(rx_skb, len);</div><div class='add'>+</div><div class='add'>+	ax88796c_skb_return(ax_local, rx_skb, rxhdr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_receive(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	struct skb_data *entry;</div><div class='add'>+	u16 w_count, pkt_len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 pkt_cnt;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	/* check rx packet and total word count */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, AX_READ(&amp;ax_local-&gt;ax_spi, P0_RTWCR)</div><div class='add'>+		  | RTWCR_RX_LATCH, P0_RTWCR);</div><div class='add'>+</div><div class='add'>+	pkt_cnt = AX_READ(&amp;ax_local-&gt;ax_spi, P0_RXBCR2) &amp; RXBCR2_PKT_MASK;</div><div class='add'>+	if (!pkt_cnt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	pkt_len = AX_READ(&amp;ax_local-&gt;ax_spi, P0_RCPHR) &amp; 0x7FF;</div><div class='add'>+</div><div class='add'>+	w_count = round_up(pkt_len + 6, 4) &gt;&gt; 1;</div><div class='add'>+</div><div class='add'>+	skb = netdev_alloc_skb(ndev, w_count * 2);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, RXBCR1_RXB_DISCARD, P0_RXBCR1);</div><div class='add'>+		this_cpu_inc(ax_local-&gt;stats-&gt;rx_dropped);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	entry = (struct skb_data *)skb-&gt;cb;</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, RXBCR1_RXB_START | w_count, P0_RXBCR1);</div><div class='add'>+</div><div class='add'>+	axspi_read_rxq(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+		       skb_put(skb, w_count * 2), skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Check if rx bridge is idle */</div><div class='add'>+	if ((AX_READ(&amp;ax_local-&gt;ax_spi, P0_RXBCR2) &amp; RXBCR2_RXB_IDLE) == 0) {</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netif_err(ax_local, rx_err, ndev,</div><div class='add'>+				  "Rx Bridge is not idle\n");</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, RXBCR2_RXB_REINIT, P0_RXBCR2);</div><div class='add'>+</div><div class='add'>+		entry-&gt;state = rx_err;</div><div class='add'>+	} else {</div><div class='add'>+		entry-&gt;state = rx_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, ISR_RXPKT, P0_ISR);</div><div class='add'>+</div><div class='add'>+	ax88796c_rx_fixup(ax_local, skb);</div><div class='add'>+</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_process_isr(struct ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ax_local-&gt;ndev;</div><div class='add'>+	int todo = 0;</div><div class='add'>+	u16 isr;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	isr = AX_READ(&amp;ax_local-&gt;ax_spi, P0_ISR);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, isr, P0_ISR);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ax_local, intr, ndev, "  ISR 0x%04x\n", isr);</div><div class='add'>+</div><div class='add'>+	if (isr &amp; ISR_TXERR) {</div><div class='add'>+		netif_dbg(ax_local, intr, ndev, "  TXERR interrupt\n");</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, TXNR_TXB_REINIT, P0_TSNR);</div><div class='add'>+		ax_local-&gt;seq_num = 0x1f;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (isr &amp; ISR_TXPAGES) {</div><div class='add'>+		netif_dbg(ax_local, intr, ndev, "  TXPAGES interrupt\n");</div><div class='add'>+		set_bit(EVENT_TX, &amp;ax_local-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (isr &amp; ISR_LINK) {</div><div class='add'>+		netif_dbg(ax_local, intr, ndev, "  Link change interrupt\n");</div><div class='add'>+		phy_mac_interrupt(ax_local-&gt;ndev-&gt;phydev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (isr &amp; ISR_RXPKT) {</div><div class='add'>+		netif_dbg(ax_local, intr, ndev, "  RX interrupt\n");</div><div class='add'>+		todo = ax88796c_receive(ax_local-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return todo;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ax88796c_interrupt(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+</div><div class='add'>+	ndev = dev_instance;</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		pr_err("irq %d for unknown device.\n", irq);</div><div class='add'>+		return IRQ_RETVAL(0);</div><div class='add'>+	}</div><div class='add'>+	ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	disable_irq_nosync(irq);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ax_local, intr, ndev, "Interrupt occurred\n");</div><div class='add'>+</div><div class='add'>+	set_bit(EVENT_INTR, &amp;ax_local-&gt;flags);</div><div class='add'>+	schedule_work(&amp;ax_local-&gt;ax_work);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local =</div><div class='add'>+			container_of(work, struct ax88796c_device, ax_work);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	if (test_bit(EVENT_SET_MULTI, &amp;ax_local-&gt;flags)) {</div><div class='add'>+		ax88796c_set_hw_multicast(ax_local-&gt;ndev);</div><div class='add'>+		clear_bit(EVENT_SET_MULTI, &amp;ax_local-&gt;flags);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(EVENT_INTR, &amp;ax_local-&gt;flags)) {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, IMR_MASKALL, P0_IMR);</div><div class='add'>+</div><div class='add'>+		while (ax88796c_process_isr(ax_local))</div><div class='add'>+			/* nothing */;</div><div class='add'>+</div><div class='add'>+		clear_bit(EVENT_INTR, &amp;ax_local-&gt;flags);</div><div class='add'>+</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, IMR_DEFAULT, P0_IMR);</div><div class='add'>+</div><div class='add'>+		enable_irq(ax_local-&gt;ndev-&gt;irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(EVENT_TX, &amp;ax_local-&gt;flags)) {</div><div class='add'>+		while (skb_queue_len(&amp;ax_local-&gt;tx_wait_q)) {</div><div class='add'>+			if (!ax88796c_hard_xmit(ax_local))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		clear_bit(EVENT_TX, &amp;ax_local-&gt;flags);</div><div class='add'>+</div><div class='add'>+		if (netif_queue_stopped(ax_local-&gt;ndev) &amp;&amp;</div><div class='add'>+		    (skb_queue_len(&amp;ax_local-&gt;tx_wait_q) &lt; TX_QUEUE_LOW_WATER))</div><div class='add'>+			netif_wake_queue(ax_local-&gt;ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_get_stats64(struct net_device *ndev,</div><div class='add'>+				 struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	u32 rx_frame_errors = 0, rx_crc_errors = 0;</div><div class='add'>+	u32 rx_dropped = 0, tx_dropped = 0;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	int cpu;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(cpu) {</div><div class='add'>+		struct ax88796c_pcpu_stats *s;</div><div class='add'>+		u64 rx_packets, rx_bytes;</div><div class='add'>+		u64 tx_packets, tx_bytes;</div><div class='add'>+</div><div class='add'>+		s = per_cpu_ptr(ax_local-&gt;stats, cpu);</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;s-&gt;syncp);</div><div class='add'>+			rx_packets = u64_stats_read(&amp;s-&gt;rx_packets);</div><div class='add'>+			rx_bytes   = u64_stats_read(&amp;s-&gt;rx_bytes);</div><div class='add'>+			tx_packets = u64_stats_read(&amp;s-&gt;tx_packets);</div><div class='add'>+			tx_bytes   = u64_stats_read(&amp;s-&gt;tx_bytes);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;s-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_packets += rx_packets;</div><div class='add'>+		stats-&gt;rx_bytes   += rx_bytes;</div><div class='add'>+		stats-&gt;tx_packets += tx_packets;</div><div class='add'>+		stats-&gt;tx_bytes   += tx_bytes;</div><div class='add'>+</div><div class='add'>+		rx_dropped      += s-&gt;rx_dropped;</div><div class='add'>+		tx_dropped      += s-&gt;tx_dropped;</div><div class='add'>+		rx_frame_errors += s-&gt;rx_frame_errors;</div><div class='add'>+		rx_crc_errors   += s-&gt;rx_crc_errors;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_dropped = rx_dropped;</div><div class='add'>+	stats-&gt;tx_dropped = tx_dropped;</div><div class='add'>+	stats-&gt;rx_frame_errors = rx_frame_errors;</div><div class='add'>+	stats-&gt;rx_crc_errors = rx_crc_errors;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_set_mac(struct  ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	u16 maccr;</div><div class='add'>+</div><div class='add'>+	maccr = (ax_local-&gt;link) ? MACCR_RXEN : 0;</div><div class='add'>+</div><div class='add'>+	switch (ax_local-&gt;speed) {</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		maccr |= MACCR_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10:</div><div class='add'>+	case SPEED_UNKNOWN:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ax_local-&gt;duplex) {</div><div class='add'>+	case DUPLEX_FULL:</div><div class='add'>+		maccr |= MACCR_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case DUPLEX_HALF:</div><div class='add'>+	case DUPLEX_UNKNOWN:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ax_local-&gt;flowctrl &amp; AX_FC_ANEG &amp;&amp;</div><div class='add'>+	    ax_local-&gt;phydev-&gt;autoneg) {</div><div class='add'>+		maccr |= ax_local-&gt;pause ? MACCR_RXFC_ENABLE : 0;</div><div class='add'>+		maccr |= !ax_local-&gt;pause != !ax_local-&gt;asym_pause ?</div><div class='add'>+			MACCR_TXFC_ENABLE : 0;</div><div class='add'>+	} else {</div><div class='add'>+		maccr |= (ax_local-&gt;flowctrl &amp; AX_FC_RX) ? MACCR_RXFC_ENABLE : 0;</div><div class='add'>+		maccr |= (ax_local-&gt;flowctrl &amp; AX_FC_TX) ? MACCR_TXFC_ENABLE : 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	maccr |= AX_READ(&amp;ax_local-&gt;ax_spi, P0_MACCR) &amp;</div><div class='add'>+		~(MACCR_DUPLEX_FULL | MACCR_SPEED_100 |</div><div class='add'>+		  MACCR_TXFC_ENABLE | MACCR_RXFC_ENABLE);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, maccr, P0_MACCR);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_handle_link_change(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	struct phy_device *phydev = ndev-&gt;phydev;</div><div class='add'>+	bool update = false;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link &amp;&amp; (ax_local-&gt;speed != phydev-&gt;speed ||</div><div class='add'>+			     ax_local-&gt;duplex != phydev-&gt;duplex ||</div><div class='add'>+			     ax_local-&gt;pause != phydev-&gt;pause ||</div><div class='add'>+			     ax_local-&gt;asym_pause != phydev-&gt;asym_pause)) {</div><div class='add'>+		ax_local-&gt;speed = phydev-&gt;speed;</div><div class='add'>+		ax_local-&gt;duplex = phydev-&gt;duplex;</div><div class='add'>+		ax_local-&gt;pause = phydev-&gt;pause;</div><div class='add'>+		ax_local-&gt;asym_pause = phydev-&gt;asym_pause;</div><div class='add'>+		update = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link != ax_local-&gt;link) {</div><div class='add'>+		if (!phydev-&gt;link) {</div><div class='add'>+			ax_local-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+			ax_local-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ax_local-&gt;link = phydev-&gt;link;</div><div class='add'>+		update = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (update)</div><div class='add'>+		ax88796c_set_mac(ax_local);</div><div class='add'>+</div><div class='add'>+	if (net_ratelimit())</div><div class='add'>+		phy_print_status(ndev-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_set_csums(struct ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ax_local-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	lockdep_assert_held(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;features &amp; NETIF_F_RXCSUM) {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, COERCR0_DEFAULT, P4_COERCR0);</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, COERCR1_DEFAULT, P4_COERCR1);</div><div class='add'>+	} else {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, 0, P4_COERCR0);</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, 0, P4_COERCR1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;features &amp; NETIF_F_HW_CSUM) {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, COETCR0_DEFAULT, P4_COETCR0);</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, COETCR1_TXPPPE, P4_COETCR1);</div><div class='add'>+	} else {</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, 0, P4_COETCR0);</div><div class='add'>+		AX_WRITE(&amp;ax_local-&gt;ax_spi, 0, P4_COETCR1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ax88796c_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	unsigned long irq_flag = 0;</div><div class='add'>+	int fc = AX_FC_NONE;</div><div class='add'>+	int ret;</div><div class='add'>+	u16 t;</div><div class='add'>+</div><div class='add'>+	ret = request_irq(ndev-&gt;irq, ax88796c_interrupt,</div><div class='add'>+			  irq_flag, ndev-&gt;name, ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(ndev, "unable to get IRQ %d (errno=%d).\n",</div><div class='add'>+			   ndev-&gt;irq, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	ret = ax88796c_soft_reset(ax_local);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+		mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+	ax_local-&gt;seq_num = 0x1f;</div><div class='add'>+</div><div class='add'>+	ax88796c_set_mac_addr(ndev);</div><div class='add'>+	ax88796c_set_csums(ax_local);</div><div class='add'>+</div><div class='add'>+	/* Disable stuffing packet */</div><div class='add'>+	t = AX_READ(&amp;ax_local-&gt;ax_spi, P1_RXBSPCR);</div><div class='add'>+	t &amp;= ~RXBSPCR_STUF_ENABLE;</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, t, P1_RXBSPCR);</div><div class='add'>+</div><div class='add'>+	/* Enable RX packet process */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, RPPER_RXEN, P1_RPPER);</div><div class='add'>+</div><div class='add'>+	t = AX_READ(&amp;ax_local-&gt;ax_spi, P0_FER);</div><div class='add'>+	t |= FER_RXEN | FER_TXEN | FER_BSWAP | FER_IRQ_PULL;</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, t, P0_FER);</div><div class='add'>+</div><div class='add'>+	/* Setup LED mode */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+		 (LCR_LED0_EN | LCR_LED0_DUPLEX | LCR_LED1_EN |</div><div class='add'>+		 LCR_LED1_100MODE), P2_LCR0);</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi,</div><div class='add'>+		 (AX_READ(&amp;ax_local-&gt;ax_spi, P2_LCR1) &amp; LCR_LED2_MASK) |</div><div class='add'>+		 LCR_LED2_EN | LCR_LED2_LINK, P2_LCR1);</div><div class='add'>+</div><div class='add'>+	/* Disable PHY auto-polling */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, PCR_PHYID(AX88796C_PHY_ID), P2_PCR);</div><div class='add'>+</div><div class='add'>+	/* Enable MAC interrupts */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, IMR_DEFAULT, P0_IMR);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	/* Setup flow-control configuration */</div><div class='add'>+	phy_support_asym_pause(ax_local-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+			      ax_local-&gt;phydev-&gt;advertising) ||</div><div class='add'>+	    linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+			      ax_local-&gt;phydev-&gt;advertising))</div><div class='add'>+		fc |= AX_FC_ANEG;</div><div class='add'>+</div><div class='add'>+	fc |= linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+				ax_local-&gt;phydev-&gt;advertising) ? AX_FC_RX : 0;</div><div class='add'>+	fc |= (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+				 ax_local-&gt;phydev-&gt;advertising) !=</div><div class='add'>+	       linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+				 ax_local-&gt;phydev-&gt;advertising)) ? AX_FC_TX : 0;</div><div class='add'>+	ax_local-&gt;flowctrl = fc;</div><div class='add'>+</div><div class='add'>+	phy_start(ax_local-&gt;ndev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(ndev);</div><div class='add'>+</div><div class='add'>+	spi_message_init(&amp;ax_local-&gt;ax_spi.rx_msg);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ax88796c_close(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	phy_stop(ndev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	/* We lock the mutex early not only to protect the device</div><div class='add'>+	 * against concurrent access, but also avoid waking up the</div><div class='add'>+	 * queue in ax88796c_work(). phy_stop() needs to be called</div><div class='add'>+	 * before because it locks the mutex to access SPI.</div><div class='add'>+	 */</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	/* No more work can be scheduled now. Make any pending work,</div><div class='add'>+	 * including one already waiting for the mutex to be unlocked,</div><div class='add'>+	 * NOP.</div><div class='add'>+	 */</div><div class='add'>+	netif_dbg(ax_local, ifdown, ndev, "clearing bits\n");</div><div class='add'>+	clear_bit(EVENT_SET_MULTI, &amp;ax_local-&gt;flags);</div><div class='add'>+	clear_bit(EVENT_INTR, &amp;ax_local-&gt;flags);</div><div class='add'>+	clear_bit(EVENT_TX, &amp;ax_local-&gt;flags);</div><div class='add'>+</div><div class='add'>+	/* Disable MAC interrupts */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, IMR_MASKALL, P0_IMR);</div><div class='add'>+	__skb_queue_purge(&amp;ax_local-&gt;tx_wait_q);</div><div class='add'>+	ax88796c_soft_reset(ax_local);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;ax_local-&gt;ax_work);</div><div class='add'>+</div><div class='add'>+	free_irq(ndev-&gt;irq, ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+ax88796c_set_features(struct net_device *ndev, netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = to_ax88796c_device(ndev);</div><div class='add'>+	netdev_features_t changed = features ^ ndev-&gt;features;</div><div class='add'>+</div><div class='add'>+	if (!(changed &amp; (NETIF_F_RXCSUM | NETIF_F_HW_CSUM)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ndev-&gt;features = features;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; (NETIF_F_RXCSUM | NETIF_F_HW_CSUM))</div><div class='add'>+		ax88796c_set_csums(ax_local);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops ax88796c_netdev_ops = {</div><div class='add'>+	.ndo_open		= ax88796c_open,</div><div class='add'>+	.ndo_stop		= ax88796c_close,</div><div class='add'>+	.ndo_start_xmit		= ax88796c_start_xmit,</div><div class='add'>+	.ndo_get_stats64	= ax88796c_get_stats64,</div><div class='add'>+	.ndo_eth_ioctl		= ax88796c_ioctl,</div><div class='add'>+	.ndo_set_mac_address	= eth_mac_addr,</div><div class='add'>+	.ndo_set_features	= ax88796c_set_features,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ax88796c_hard_reset(struct ax88796c_device *ax_local)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = (struct device *)&amp;ax_local-&gt;spi-&gt;dev;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='add'>+</div><div class='add'>+	/* reset info */</div><div class='add'>+	reset_gpio = gpiod_get(dev, "reset", 0);</div><div class='add'>+	if (IS_ERR(reset_gpio)) {</div><div class='add'>+		dev_err(dev, "Could not get 'reset' GPIO: %ld", PTR_ERR(reset_gpio));</div><div class='add'>+		return PTR_ERR(reset_gpio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set reset */</div><div class='add'>+	gpiod_direction_output(reset_gpio, 1);</div><div class='add'>+	msleep(100);</div><div class='add'>+	gpiod_direction_output(reset_gpio, 0);</div><div class='add'>+	gpiod_put(reset_gpio);</div><div class='add'>+	msleep(20);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ax88796c_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	char phy_id[MII_BUS_ID_SIZE + 3];</div><div class='add'>+	struct ax88796c_device *ax_local;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	u16 temp;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ndev = devm_alloc_etherdev(&amp;spi-&gt;dev, sizeof(*ax_local));</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;spi-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ax_local = to_ax88796c_device(ndev);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;spi-&gt;dev, ax_local);</div><div class='add'>+	ax_local-&gt;spi = spi;</div><div class='add'>+	ax_local-&gt;ax_spi.spi = spi;</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;stats =</div><div class='add'>+		devm_netdev_alloc_pcpu_stats(&amp;spi-&gt;dev,</div><div class='add'>+					     struct ax88796c_pcpu_stats);</div><div class='add'>+	if (!ax_local-&gt;stats)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;ndev = ndev;</div><div class='add'>+	ax_local-&gt;priv_flags |= comp ? AX_CAP_COMP : 0;</div><div class='add'>+	ax_local-&gt;msg_enable = msg_enable;</div><div class='add'>+	mutex_init(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;mdiobus = devm_mdiobus_alloc(&amp;spi-&gt;dev);</div><div class='add'>+	if (!ax_local-&gt;mdiobus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ax_local-&gt;mdiobus-&gt;priv = ax_local;</div><div class='add'>+	ax_local-&gt;mdiobus-&gt;read = ax88796c_mdio_read;</div><div class='add'>+	ax_local-&gt;mdiobus-&gt;write = ax88796c_mdio_write;</div><div class='add'>+	ax_local-&gt;mdiobus-&gt;name = "ax88976c-mdiobus";</div><div class='add'>+	ax_local-&gt;mdiobus-&gt;phy_mask = (u32)~BIT(AX88796C_PHY_ID);</div><div class='add'>+	ax_local-&gt;mdiobus-&gt;parent = &amp;spi-&gt;dev;</div><div class='add'>+</div><div class='add'>+	snprintf(ax_local-&gt;mdiobus-&gt;id, MII_BUS_ID_SIZE,</div><div class='add'>+		 "ax88796c-%s.%u", dev_name(&amp;spi-&gt;dev), spi_get_chipselect(spi, 0));</div><div class='add'>+</div><div class='add'>+	ret = devm_mdiobus_register(&amp;spi-&gt;dev, ax_local-&gt;mdiobus);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Could not register MDIO bus\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_msg_probe(ax_local)) {</div><div class='add'>+		dev_info(&amp;spi-&gt;dev, "AX88796C-SPI Configuration:\n");</div><div class='add'>+		dev_info(&amp;spi-&gt;dev, "    Compression : %s\n",</div><div class='add'>+			 ax_local-&gt;priv_flags &amp; AX_CAP_COMP ? "ON" : "OFF");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = spi-&gt;irq;</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;ax88796c_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;ax88796c_ethtool_ops;</div><div class='add'>+	ndev-&gt;hw_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;</div><div class='add'>+	ndev-&gt;features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;</div><div class='add'>+	ndev-&gt;needed_headroom = TX_OVERHEAD;</div><div class='add'>+	ndev-&gt;needed_tailroom = TX_EOP_SIZE;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	/* ax88796c gpio reset */</div><div class='add'>+	ax88796c_hard_reset(ax_local);</div><div class='add'>+</div><div class='add'>+	/* Reset AX88796C */</div><div class='add'>+	ret = ax88796c_soft_reset(ax_local);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	/* Check board revision */</div><div class='add'>+	temp = AX_READ(&amp;ax_local-&gt;ax_spi, P2_CRIR);</div><div class='add'>+	if ((temp &amp; 0xF) != 0x0) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "spi read failed: %d\n", temp);</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/*Reload EEPROM*/</div><div class='add'>+	ax88796c_reload_eeprom(ax_local);</div><div class='add'>+</div><div class='add'>+	ax88796c_load_mac_addr(ndev);</div><div class='add'>+</div><div class='add'>+	if (netif_msg_probe(ax_local))</div><div class='add'>+		dev_info(&amp;spi-&gt;dev,</div><div class='add'>+			 "irq %d, MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",</div><div class='add'>+			 ndev-&gt;irq,</div><div class='add'>+			 ndev-&gt;dev_addr[0], ndev-&gt;dev_addr[1],</div><div class='add'>+			 ndev-&gt;dev_addr[2], ndev-&gt;dev_addr[3],</div><div class='add'>+			 ndev-&gt;dev_addr[4], ndev-&gt;dev_addr[5]);</div><div class='add'>+</div><div class='add'>+	/* Disable power saving */</div><div class='add'>+	AX_WRITE(&amp;ax_local-&gt;ax_spi, (AX_READ(&amp;ax_local-&gt;ax_spi, P0_PSCR)</div><div class='add'>+				     &amp; PSCR_PS_MASK) | PSCR_PS_D0, P0_PSCR);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;ax_local-&gt;spi_lock);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;ax_local-&gt;ax_work, ax88796c_work);</div><div class='add'>+</div><div class='add'>+	skb_queue_head_init(&amp;ax_local-&gt;tx_wait_q);</div><div class='add'>+</div><div class='add'>+	snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,</div><div class='add'>+		 ax_local-&gt;mdiobus-&gt;id, AX88796C_PHY_ID);</div><div class='add'>+	ax_local-&gt;phydev = phy_connect(ax_local-&gt;ndev, phy_id,</div><div class='add'>+				       ax88796c_handle_link_change,</div><div class='add'>+				       PHY_INTERFACE_MODE_MII);</div><div class='add'>+	if (IS_ERR(ax_local-&gt;phydev)) {</div><div class='add'>+		ret = PTR_ERR(ax_local-&gt;phydev);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	ax_local-&gt;phydev-&gt;irq = PHY_POLL;</div><div class='add'>+</div><div class='add'>+	ret = devm_register_netdev(&amp;spi-&gt;dev, ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "failed to register a network device\n");</div><div class='add'>+		goto err_phy_dis;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_info(ax_local, probe, ndev, "%s %s registered\n",</div><div class='add'>+		   dev_driver_string(&amp;spi-&gt;dev),</div><div class='add'>+		   dev_name(&amp;spi-&gt;dev));</div><div class='add'>+	phy_attached_info(ax_local-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_phy_dis:</div><div class='add'>+	phy_disconnect(ax_local-&gt;phydev);</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ax88796c_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct ax88796c_device *ax_local = dev_get_drvdata(&amp;spi-&gt;dev);</div><div class='add'>+	struct net_device *ndev = ax_local-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	phy_disconnect(ndev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	netif_info(ax_local, probe, ndev, "removing network device %s %s\n",</div><div class='add'>+		   dev_driver_string(&amp;spi-&gt;dev),</div><div class='add'>+		   dev_name(&amp;spi-&gt;dev));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_OF</div><div class='add'>+static const struct of_device_id ax88796c_dt_ids[] = {</div><div class='add'>+	{ .compatible = "asix,ax88796c" },</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ax88796c_dt_ids);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id asix_id[] = {</div><div class='add'>+	{ "ax88796c", 0 },</div><div class='add'>+	{ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(spi, asix_id);</div><div class='add'>+</div><div class='add'>+static struct spi_driver ax88796c_spi_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = DRV_NAME,</div><div class='add'>+		.of_match_table = of_match_ptr(ax88796c_dt_ids),</div><div class='add'>+	},</div><div class='add'>+	.probe = ax88796c_probe,</div><div class='add'>+	.remove = ax88796c_remove,</div><div class='add'>+	.id_table = asix_id,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static __init int ax88796c_spi_init(void)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bitmap_zero(ax88796c_no_regs_mask, AX88796C_REGDUMP_LEN);</div><div class='add'>+	ret = bitmap_parse(no_regs_list, 35,</div><div class='add'>+			   ax88796c_no_regs_mask, AX88796C_REGDUMP_LEN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		bitmap_fill(ax88796c_no_regs_mask, AX88796C_REGDUMP_LEN);</div><div class='add'>+		pr_err("Invalid bitmap description, masking all registers\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return spi_register_driver(&amp;ax88796c_spi_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static __exit void ax88796c_spi_exit(void)</div><div class='add'>+{</div><div class='add'>+	spi_unregister_driver(&amp;ax88796c_spi_driver);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ax88796c_spi_init);</div><div class='add'>+module_exit(ax88796c_spi_exit);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Łukasz Stelmach &lt;l.stelmach@samsung.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("ASIX AX88796C SPI Ethernet driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/asix/ax88796c_main.h b/drivers/net/ethernet/asix/ax88796c_main.h<br/>new file mode 100644<br/>index 000000000000..68a09edecab8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/ax88796c_main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/ax88796c_main.h</a></div><div class='hunk'>@@ -0,0 +1,570 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010 ASIX Electronics Corporation</div><div class='add'>+ * Copyright (c) 2020 Samsung Electronics</div><div class='add'>+ *</div><div class='add'>+ * ASIX AX88796C SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AX88796C_MAIN_H</div><div class='add'>+#define _AX88796C_MAIN_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ax88796c_spi.h"</div><div class='add'>+</div><div class='add'>+/* These identify the driver base version and may not be removed. */</div><div class='add'>+#define DRV_NAME	"ax88796c"</div><div class='add'>+#define ADP_NAME	"ASIX AX88796C SPI Ethernet Adapter"</div><div class='add'>+</div><div class='add'>+#define TX_QUEUE_HIGH_WATER		45	/* Tx queue high water mark */</div><div class='add'>+#define TX_QUEUE_LOW_WATER		20	/* Tx queue low water mark */</div><div class='add'>+</div><div class='add'>+#define AX88796C_REGDUMP_LEN		256</div><div class='add'>+#define AX88796C_PHY_REGDUMP_LEN	14</div><div class='add'>+#define AX88796C_PHY_ID			0x10</div><div class='add'>+</div><div class='add'>+#define TX_OVERHEAD     sizeof_field(struct tx_pkt_info, tx_overhead)</div><div class='add'>+#define TX_EOP_SIZE			4</div><div class='add'>+</div><div class='add'>+#define AX_MCAST_FILTER_SIZE		8</div><div class='add'>+#define AX_MAX_MCAST			64</div><div class='add'>+#define AX_MAX_CLK                      80000000</div><div class='add'>+#define TX_HDR_SOP_DICF			0x8000</div><div class='add'>+#define TX_HDR_SOP_CPHI			0x4000</div><div class='add'>+#define TX_HDR_SOP_INT			0x2000</div><div class='add'>+#define TX_HDR_SOP_MDEQ			0x1000</div><div class='add'>+#define TX_HDR_SOP_PKTLEN		0x07FF</div><div class='add'>+#define TX_HDR_SOP_SEQNUM		0xF800</div><div class='add'>+#define TX_HDR_SOP_PKTLENBAR		0x07FF</div><div class='add'>+</div><div class='add'>+#define TX_HDR_SEG_FS			0x8000</div><div class='add'>+#define TX_HDR_SEG_LS			0x4000</div><div class='add'>+#define TX_HDR_SEG_SEGNUM		0x3800</div><div class='add'>+#define TX_HDR_SEG_SEGLEN		0x0700</div><div class='add'>+#define TX_HDR_SEG_EOFST		0xC000</div><div class='add'>+#define TX_HDR_SEG_SOFST		0x3800</div><div class='add'>+#define TX_HDR_SEG_SEGLENBAR		0x07FF</div><div class='add'>+</div><div class='add'>+#define TX_HDR_EOP_SEQNUM		0xF800</div><div class='add'>+#define TX_HDR_EOP_PKTLEN		0x07FF</div><div class='add'>+#define TX_HDR_EOP_SEQNUMBAR		0xF800</div><div class='add'>+#define TX_HDR_EOP_PKTLENBAR		0x07FF</div><div class='add'>+</div><div class='add'>+/* Rx header fields mask */</div><div class='add'>+#define RX_HDR1_MCBC			0x8000</div><div class='add'>+#define RX_HDR1_STUFF_PKT		0x4000</div><div class='add'>+#define RX_HDR1_MII_ERR			0x2000</div><div class='add'>+#define RX_HDR1_CRC_ERR			0x1000</div><div class='add'>+#define RX_HDR1_PKT_LEN			0x07FF</div><div class='add'>+</div><div class='add'>+#define RX_HDR2_SEQ_NUM			0xF800</div><div class='add'>+#define RX_HDR2_PKT_LEN_BAR		0x7FFF</div><div class='add'>+</div><div class='add'>+#define RX_HDR3_PE			0x8000</div><div class='add'>+#define RX_HDR3_L3_TYPE_IPV4V6		0x6000</div><div class='add'>+#define RX_HDR3_L3_TYPE_IP		0x4000</div><div class='add'>+#define RX_HDR3_L3_TYPE_IPV6		0x2000</div><div class='add'>+#define RX_HDR3_L4_TYPE_ICMPV6		0x1400</div><div class='add'>+#define RX_HDR3_L4_TYPE_TCP		0x1000</div><div class='add'>+#define RX_HDR3_L4_TYPE_IGMP		0x0c00</div><div class='add'>+#define RX_HDR3_L4_TYPE_ICMP		0x0800</div><div class='add'>+#define RX_HDR3_L4_TYPE_UDP		0x0400</div><div class='add'>+#define RX_HDR3_L3_ERR			0x0200</div><div class='add'>+#define RX_HDR3_L4_ERR			0x0100</div><div class='add'>+#define RX_HDR3_PRIORITY(x)		((x) &lt;&lt; 4)</div><div class='add'>+#define RX_HDR3_STRIP			0x0008</div><div class='add'>+#define RX_HDR3_VLAN_ID			0x0007</div><div class='add'>+</div><div class='add'>+struct ax88796c_pcpu_stats {</div><div class='add'>+	u64_stats_t rx_packets;</div><div class='add'>+	u64_stats_t rx_bytes;</div><div class='add'>+	u64_stats_t tx_packets;</div><div class='add'>+	u64_stats_t tx_bytes;</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+	u32 rx_dropped;</div><div class='add'>+	u32 tx_dropped;</div><div class='add'>+	u32 rx_frame_errors;</div><div class='add'>+	u32 rx_crc_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ax88796c_device {</div><div class='add'>+	struct spi_device	*spi;</div><div class='add'>+	struct net_device	*ndev;</div><div class='add'>+	struct ax88796c_pcpu_stats __percpu *stats;</div><div class='add'>+</div><div class='add'>+	struct work_struct	ax_work;</div><div class='add'>+</div><div class='add'>+	struct mutex		spi_lock; /* device access */</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head	tx_wait_q;</div><div class='add'>+</div><div class='add'>+	struct axspi_data	ax_spi;</div><div class='add'>+</div><div class='add'>+	struct mii_bus		*mdiobus;</div><div class='add'>+	struct phy_device	*phydev;</div><div class='add'>+</div><div class='add'>+	int			msg_enable;</div><div class='add'>+</div><div class='add'>+	u16			seq_num;</div><div class='add'>+</div><div class='add'>+	u8			multi_filter[AX_MCAST_FILTER_SIZE];</div><div class='add'>+</div><div class='add'>+	int			link;</div><div class='add'>+	int			speed;</div><div class='add'>+	int			duplex;</div><div class='add'>+	int			pause;</div><div class='add'>+	int			asym_pause;</div><div class='add'>+	int			flowctrl;</div><div class='add'>+		#define AX_FC_NONE		0</div><div class='add'>+		#define AX_FC_RX		BIT(0)</div><div class='add'>+		#define AX_FC_TX		BIT(1)</div><div class='add'>+		#define AX_FC_ANEG		BIT(2)</div><div class='add'>+</div><div class='add'>+	u32			priv_flags;</div><div class='add'>+		#define AX_CAP_COMP		BIT(0)</div><div class='add'>+		#define AX_PRIV_FLAGS_MASK	(AX_CAP_COMP)</div><div class='add'>+</div><div class='add'>+	unsigned long		flags;</div><div class='add'>+		#define EVENT_INTR		0</div><div class='add'>+		#define EVENT_TX		1</div><div class='add'>+		#define EVENT_SET_MULTI		2</div><div class='add'>+</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define to_ax88796c_device(ndev) ((struct ax88796c_device *)netdev_priv(ndev))</div><div class='add'>+</div><div class='add'>+enum skb_state {</div><div class='add'>+	illegal = 0,</div><div class='add'>+	tx_done,</div><div class='add'>+	rx_done,</div><div class='add'>+	rx_err,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct skb_data {</div><div class='add'>+	enum skb_state state;</div><div class='add'>+	size_t len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* A88796C register definition */</div><div class='add'>+	/* Definition of PAGE0 */</div><div class='add'>+#define P0_PSR		(0x00)</div><div class='add'>+	#define PSR_DEV_READY		BIT(7)</div><div class='add'>+	#define PSR_RESET		(0 &lt;&lt; 15)</div><div class='add'>+	#define PSR_RESET_CLR		BIT(15)</div><div class='add'>+#define P0_BOR		(0x02)</div><div class='add'>+#define P0_FER		(0x04)</div><div class='add'>+	#define FER_IPALM		BIT(0)</div><div class='add'>+	#define FER_DCRC		BIT(1)</div><div class='add'>+	#define FER_RH3M		BIT(2)</div><div class='add'>+	#define FER_HEADERSWAP		BIT(7)</div><div class='add'>+	#define FER_WSWAP		BIT(8)</div><div class='add'>+	#define FER_BSWAP		BIT(9)</div><div class='add'>+	#define FER_INTHI		BIT(10)</div><div class='add'>+	#define FER_INTLO		(0 &lt;&lt; 10)</div><div class='add'>+	#define FER_IRQ_PULL		BIT(11)</div><div class='add'>+	#define FER_RXEN		BIT(14)</div><div class='add'>+	#define FER_TXEN		BIT(15)</div><div class='add'>+#define P0_ISR		(0x06)</div><div class='add'>+	#define ISR_RXPKT		BIT(0)</div><div class='add'>+	#define ISR_MDQ			BIT(4)</div><div class='add'>+	#define ISR_TXT			BIT(5)</div><div class='add'>+	#define ISR_TXPAGES		BIT(6)</div><div class='add'>+	#define ISR_TXERR		BIT(8)</div><div class='add'>+	#define ISR_LINK		BIT(9)</div><div class='add'>+#define P0_IMR		(0x08)</div><div class='add'>+	#define IMR_RXPKT		BIT(0)</div><div class='add'>+	#define IMR_MDQ			BIT(4)</div><div class='add'>+	#define IMR_TXT			BIT(5)</div><div class='add'>+	#define IMR_TXPAGES		BIT(6)</div><div class='add'>+	#define IMR_TXERR		BIT(8)</div><div class='add'>+	#define IMR_LINK		BIT(9)</div><div class='add'>+	#define IMR_MASKALL		(0xFFFF)</div><div class='add'>+	#define IMR_DEFAULT		(IMR_TXERR)</div><div class='add'>+#define P0_WFCR		(0x0A)</div><div class='add'>+	#define WFCR_PMEIND		BIT(0) /* PME indication */</div><div class='add'>+	#define WFCR_PMETYPE		BIT(1) /* PME I/O type */</div><div class='add'>+	#define WFCR_PMEPOL		BIT(2) /* PME polarity */</div><div class='add'>+	#define WFCR_PMERST		BIT(3) /* Reset PME */</div><div class='add'>+	#define WFCR_SLEEP		BIT(4) /* Enable sleep mode */</div><div class='add'>+	#define WFCR_WAKEUP		BIT(5) /* Enable wakeup mode */</div><div class='add'>+	#define WFCR_WAITEVENT		BIT(6) /* Reserved */</div><div class='add'>+	#define WFCR_CLRWAKE		BIT(7) /* Clear wakeup */</div><div class='add'>+	#define WFCR_LINKCH		BIT(8) /* Enable link change */</div><div class='add'>+	#define WFCR_MAGICP		BIT(9) /* Enable magic packet */</div><div class='add'>+	#define WFCR_WAKEF		BIT(10) /* Enable wakeup frame */</div><div class='add'>+	#define WFCR_PMEEN		BIT(11) /* Enable PME pin */</div><div class='add'>+	#define WFCR_LINKCHS		BIT(12) /* Link change status */</div><div class='add'>+	#define WFCR_MAGICPS		BIT(13) /* Magic packet status */</div><div class='add'>+	#define WFCR_WAKEFS		BIT(14) /* Wakeup frame status */</div><div class='add'>+	#define WFCR_PMES		BIT(15) /* PME pin status */</div><div class='add'>+#define P0_PSCR		(0x0C)</div><div class='add'>+	#define PSCR_PS_MASK		(0xFFF0)</div><div class='add'>+	#define PSCR_PS_D0		(0)</div><div class='add'>+	#define PSCR_PS_D1		BIT(0)</div><div class='add'>+	#define PSCR_PS_D2		BIT(1)</div><div class='add'>+	#define PSCR_FPS		BIT(3) /* Enable fiber mode PS */</div><div class='add'>+	#define PSCR_SWPS		BIT(4) /* Enable software */</div><div class='add'>+						 /* PS control */</div><div class='add'>+	#define PSCR_WOLPS		BIT(5) /* Enable WOL PS */</div><div class='add'>+	#define PSCR_SWWOL		BIT(6) /* Enable software select */</div><div class='add'>+						 /* WOL PS */</div><div class='add'>+	#define PSCR_PHYOSC		BIT(7) /* Internal PHY OSC control */</div><div class='add'>+	#define PSCR_FOFEF		BIT(8) /* Force PHY generate FEF */</div><div class='add'>+	#define PSCR_FOF		BIT(9) /* Force PHY in fiber mode */</div><div class='add'>+	#define PSCR_PHYPD		BIT(10) /* PHY power down. */</div><div class='add'>+						  /* Active high */</div><div class='add'>+	#define PSCR_PHYRST		BIT(11) /* PHY reset signal. */</div><div class='add'>+						  /* Active low */</div><div class='add'>+	#define PSCR_PHYCSIL		BIT(12) /* PHY cable energy detect */</div><div class='add'>+	#define PSCR_PHYCOFF		BIT(13) /* PHY cable off */</div><div class='add'>+	#define PSCR_PHYLINK		BIT(14) /* PHY link status */</div><div class='add'>+	#define PSCR_EEPOK		BIT(15) /* EEPROM load complete */</div><div class='add'>+#define P0_MACCR	(0x0E)</div><div class='add'>+	#define MACCR_RXEN		BIT(0) /* Enable RX */</div><div class='add'>+	#define MACCR_DUPLEX_FULL	BIT(1) /* 1: Full, 0: Half */</div><div class='add'>+	#define MACCR_SPEED_100		BIT(2) /* 1: 100Mbps, 0: 10Mbps */</div><div class='add'>+	#define MACCR_RXFC_ENABLE	BIT(3)</div><div class='add'>+	#define MACCR_RXFC_MASK		0xFFF7</div><div class='add'>+	#define MACCR_TXFC_ENABLE	BIT(4)</div><div class='add'>+	#define MACCR_TXFC_MASK		0xFFEF</div><div class='add'>+	#define MACCR_PSI		BIT(6) /* Software Cable-Off */</div><div class='add'>+					       /* Power Saving Interrupt */</div><div class='add'>+	#define MACCR_PF		BIT(7)</div><div class='add'>+	#define MACCR_PMM_BITS		8</div><div class='add'>+	#define MACCR_PMM_MASK		(0x1F00)</div><div class='add'>+	#define MACCR_PMM_RESET		BIT(8)</div><div class='add'>+	#define MACCR_PMM_WAIT		(2 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_READY		(3 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_D1		(4 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_D2		(5 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_WAKE		(7 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_D1_WAKE	(8 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_D2_WAKE	(9 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_SLEEP		(10 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_PHY_RESET	(11 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_SOFT_D1	(16 &lt;&lt; 8)</div><div class='add'>+	#define MACCR_PMM_SOFT_D2	(17 &lt;&lt; 8)</div><div class='add'>+#define P0_TFBFCR	(0x10)</div><div class='add'>+	#define TFBFCR_SCHE_FREE_PAGE	0xE07F</div><div class='add'>+	#define TFBFCR_FREE_PAGE_BITS	0x07</div><div class='add'>+	#define TFBFCR_FREE_PAGE_LATCH	BIT(6)</div><div class='add'>+	#define TFBFCR_SET_FREE_PAGE(x)	(((x) &amp; 0x3F) &lt;&lt; TFBFCR_FREE_PAGE_BITS)</div><div class='add'>+	#define TFBFCR_TX_PAGE_SET	BIT(13)</div><div class='add'>+	#define TFBFCR_MANU_ENTX	BIT(15)</div><div class='add'>+	#define TX_FREEBUF_MASK		0x003F</div><div class='add'>+	#define TX_DPTSTART		0x4000</div><div class='add'>+</div><div class='add'>+#define P0_TSNR		(0x12)</div><div class='add'>+	#define TXNR_TXB_ERR		BIT(5)</div><div class='add'>+	#define TXNR_TXB_IDLE		BIT(6)</div><div class='add'>+	#define TSNR_PKT_CNT(x)		(((x) &amp; 0x3F) &lt;&lt; 8)</div><div class='add'>+	#define TXNR_TXB_REINIT		BIT(14)</div><div class='add'>+	#define TSNR_TXB_START		BIT(15)</div><div class='add'>+#define P0_RTDPR	(0x14)</div><div class='add'>+#define P0_RXBCR1	(0x16)</div><div class='add'>+	#define RXBCR1_RXB_DISCARD	BIT(14)</div><div class='add'>+	#define RXBCR1_RXB_START	BIT(15)</div><div class='add'>+#define P0_RXBCR2	(0x18)</div><div class='add'>+	#define RXBCR2_PKT_MASK		(0xFF)</div><div class='add'>+	#define RXBCR2_RXPC_MASK	(0x7F)</div><div class='add'>+	#define RXBCR2_RXB_READY	BIT(13)</div><div class='add'>+	#define RXBCR2_RXB_IDLE		BIT(14)</div><div class='add'>+	#define RXBCR2_RXB_REINIT	BIT(15)</div><div class='add'>+#define P0_RTWCR	(0x1A)</div><div class='add'>+	#define RTWCR_RXWC_MASK		(0x3FFF)</div><div class='add'>+	#define RTWCR_RX_LATCH		BIT(15)</div><div class='add'>+#define P0_RCPHR	(0x1C)</div><div class='add'>+</div><div class='add'>+	/* Definition of PAGE1 */</div><div class='add'>+#define P1_RPPER	(0x22)</div><div class='add'>+	#define RPPER_RXEN		BIT(0)</div><div class='add'>+#define P1_MRCR		(0x28)</div><div class='add'>+#define P1_MDR		(0x2A)</div><div class='add'>+#define P1_RMPR		(0x2C)</div><div class='add'>+#define P1_TMPR		(0x2E)</div><div class='add'>+#define P1_RXBSPCR	(0x30)</div><div class='add'>+	#define RXBSPCR_STUF_WORD_CNT(x)	(((x) &amp; 0x7000) &gt;&gt; 12)</div><div class='add'>+	#define RXBSPCR_STUF_ENABLE		BIT(15)</div><div class='add'>+#define P1_MCR		(0x32)</div><div class='add'>+	#define MCR_SBP			BIT(8)</div><div class='add'>+	#define MCR_SM			BIT(9)</div><div class='add'>+	#define MCR_CRCENLAN		BIT(11)</div><div class='add'>+	#define MCR_STP			BIT(12)</div><div class='add'>+	/* Definition of PAGE2 */</div><div class='add'>+#define P2_CIR		(0x42)</div><div class='add'>+#define P2_PCR		(0x44)</div><div class='add'>+	#define PCR_POLL_EN		BIT(0)</div><div class='add'>+	#define PCR_POLL_FLOWCTRL	BIT(1)</div><div class='add'>+	#define PCR_POLL_BMCR		BIT(2)</div><div class='add'>+	#define PCR_PHYID(x)		((x) &lt;&lt; 8)</div><div class='add'>+#define P2_PHYSR	(0x46)</div><div class='add'>+#define P2_MDIODR	(0x48)</div><div class='add'>+#define P2_MDIOCR	(0x4A)</div><div class='add'>+	#define MDIOCR_RADDR(x)		((x) &amp; 0x1F)</div><div class='add'>+	#define MDIOCR_FADDR(x)		(((x) &amp; 0x1F) &lt;&lt; 8)</div><div class='add'>+	#define MDIOCR_VALID		BIT(13)</div><div class='add'>+	#define MDIOCR_READ		BIT(14)</div><div class='add'>+	#define MDIOCR_WRITE		BIT(15)</div><div class='add'>+#define P2_LCR0		(0x4C)</div><div class='add'>+	#define LCR_LED0_EN		BIT(0)</div><div class='add'>+	#define LCR_LED0_100MODE	BIT(1)</div><div class='add'>+	#define LCR_LED0_DUPLEX		BIT(2)</div><div class='add'>+	#define LCR_LED0_LINK		BIT(3)</div><div class='add'>+	#define LCR_LED0_ACT		BIT(4)</div><div class='add'>+	#define LCR_LED0_COL		BIT(5)</div><div class='add'>+	#define LCR_LED0_10MODE		BIT(6)</div><div class='add'>+	#define LCR_LED0_DUPCOL		BIT(7)</div><div class='add'>+	#define LCR_LED1_EN		BIT(8)</div><div class='add'>+	#define LCR_LED1_100MODE	BIT(9)</div><div class='add'>+	#define LCR_LED1_DUPLEX		BIT(10)</div><div class='add'>+	#define LCR_LED1_LINK		BIT(11)</div><div class='add'>+	#define LCR_LED1_ACT		BIT(12)</div><div class='add'>+	#define LCR_LED1_COL		BIT(13)</div><div class='add'>+	#define LCR_LED1_10MODE		BIT(14)</div><div class='add'>+	#define LCR_LED1_DUPCOL		BIT(15)</div><div class='add'>+#define P2_LCR1		(0x4E)</div><div class='add'>+	#define LCR_LED2_MASK		(0xFF00)</div><div class='add'>+	#define LCR_LED2_EN		BIT(0)</div><div class='add'>+	#define LCR_LED2_100MODE	BIT(1)</div><div class='add'>+	#define LCR_LED2_DUPLEX		BIT(2)</div><div class='add'>+	#define LCR_LED2_LINK		BIT(3)</div><div class='add'>+	#define LCR_LED2_ACT		BIT(4)</div><div class='add'>+	#define LCR_LED2_COL		BIT(5)</div><div class='add'>+	#define LCR_LED2_10MODE		BIT(6)</div><div class='add'>+	#define LCR_LED2_DUPCOL		BIT(7)</div><div class='add'>+#define P2_IPGCR	(0x50)</div><div class='add'>+#define P2_CRIR		(0x52)</div><div class='add'>+#define P2_FLHWCR	(0x54)</div><div class='add'>+#define P2_RXCR		(0x56)</div><div class='add'>+	#define RXCR_PRO		BIT(0)</div><div class='add'>+	#define RXCR_AMALL		BIT(1)</div><div class='add'>+	#define RXCR_SEP		BIT(2)</div><div class='add'>+	#define RXCR_AB			BIT(3)</div><div class='add'>+	#define RXCR_AM			BIT(4)</div><div class='add'>+	#define RXCR_AP			BIT(5)</div><div class='add'>+	#define RXCR_ARP		BIT(6)</div><div class='add'>+#define P2_JLCR		(0x58)</div><div class='add'>+#define P2_MPLR		(0x5C)</div><div class='add'>+</div><div class='add'>+	/* Definition of PAGE3 */</div><div class='add'>+#define P3_MACASR0	(0x62)</div><div class='add'>+	#define P3_MACASR(x)		(P3_MACASR0 + 2 * (x))</div><div class='add'>+	#define MACASR_LOWBYTE_MASK	0x00FF</div><div class='add'>+	#define MACASR_HIGH_BITS	0x08</div><div class='add'>+#define P3_MACASR1	(0x64)</div><div class='add'>+#define P3_MACASR2	(0x66)</div><div class='add'>+#define P3_MFAR01	(0x68)</div><div class='add'>+#define P3_MFAR_BASE	(0x68)</div><div class='add'>+	#define P3_MFAR(x)		(P3_MFAR_BASE + 2 * (x))</div><div class='add'>+</div><div class='add'>+#define P3_MFAR23	(0x6A)</div><div class='add'>+#define P3_MFAR45	(0x6C)</div><div class='add'>+#define P3_MFAR67	(0x6E)</div><div class='add'>+#define P3_VID0FR	(0x70)</div><div class='add'>+#define P3_VID1FR	(0x72)</div><div class='add'>+#define P3_EECSR	(0x74)</div><div class='add'>+#define P3_EEDR		(0x76)</div><div class='add'>+#define P3_EECR		(0x78)</div><div class='add'>+	#define EECR_ADDR_MASK		(0x00FF)</div><div class='add'>+	#define EECR_READ_ACT		BIT(8)</div><div class='add'>+	#define EECR_WRITE_ACT		BIT(9)</div><div class='add'>+	#define EECR_WRITE_DISABLE	BIT(10)</div><div class='add'>+	#define EECR_WRITE_ENABLE	BIT(11)</div><div class='add'>+	#define EECR_EE_READY		BIT(13)</div><div class='add'>+	#define EECR_RELOAD		BIT(14)</div><div class='add'>+	#define EECR_RESET		BIT(15)</div><div class='add'>+#define P3_TPCR		(0x7A)</div><div class='add'>+	#define TPCR_PATT_MASK		(0xFF)</div><div class='add'>+	#define TPCR_RAND_PKT_EN	BIT(14)</div><div class='add'>+	#define TPCR_FIXED_PKT_EN	BIT(15)</div><div class='add'>+#define P3_TPLR		(0x7C)</div><div class='add'>+	/* Definition of PAGE4 */</div><div class='add'>+#define P4_SPICR	(0x8A)</div><div class='add'>+	#define SPICR_RCEN		BIT(0)</div><div class='add'>+	#define SPICR_QCEN		BIT(1)</div><div class='add'>+	#define SPICR_RBRE		BIT(3)</div><div class='add'>+	#define SPICR_PMM		BIT(4)</div><div class='add'>+	#define SPICR_LOOPBACK		BIT(8)</div><div class='add'>+	#define SPICR_CORE_RES_CLR	BIT(10)</div><div class='add'>+	#define SPICR_SPI_RES_CLR	BIT(11)</div><div class='add'>+#define P4_SPIISMR	(0x8C)</div><div class='add'>+</div><div class='add'>+#define P4_COERCR0	(0x92)</div><div class='add'>+	#define COERCR0_RXIPCE		BIT(0)</div><div class='add'>+	#define COERCR0_RXIPVE		BIT(1)</div><div class='add'>+	#define COERCR0_RXV6PE		BIT(2)</div><div class='add'>+	#define COERCR0_RXTCPE		BIT(3)</div><div class='add'>+	#define COERCR0_RXUDPE		BIT(4)</div><div class='add'>+	#define COERCR0_RXICMP		BIT(5)</div><div class='add'>+	#define COERCR0_RXIGMP		BIT(6)</div><div class='add'>+	#define COERCR0_RXICV6		BIT(7)</div><div class='add'>+</div><div class='add'>+	#define COERCR0_RXTCPV6		BIT(8)</div><div class='add'>+	#define COERCR0_RXUDPV6		BIT(9)</div><div class='add'>+	#define COERCR0_RXICMV6		BIT(10)</div><div class='add'>+	#define COERCR0_RXIGMV6		BIT(11)</div><div class='add'>+	#define COERCR0_RXICV6V6	BIT(12)</div><div class='add'>+</div><div class='add'>+	#define COERCR0_DEFAULT		(COERCR0_RXIPCE | COERCR0_RXV6PE | \</div><div class='add'>+					 COERCR0_RXTCPE | COERCR0_RXUDPE | \</div><div class='add'>+					 COERCR0_RXTCPV6 | COERCR0_RXUDPV6)</div><div class='add'>+#define P4_COERCR1	(0x94)</div><div class='add'>+	#define COERCR1_IPCEDP		BIT(0)</div><div class='add'>+	#define COERCR1_IPVEDP		BIT(1)</div><div class='add'>+	#define COERCR1_V6VEDP		BIT(2)</div><div class='add'>+	#define COERCR1_TCPEDP		BIT(3)</div><div class='add'>+	#define COERCR1_UDPEDP		BIT(4)</div><div class='add'>+	#define COERCR1_ICMPDP		BIT(5)</div><div class='add'>+	#define COERCR1_IGMPDP		BIT(6)</div><div class='add'>+	#define COERCR1_ICV6DP		BIT(7)</div><div class='add'>+	#define COERCR1_RX64TE		BIT(8)</div><div class='add'>+	#define COERCR1_RXPPPE		BIT(9)</div><div class='add'>+	#define COERCR1_TCP6DP		BIT(10)</div><div class='add'>+	#define COERCR1_UDP6DP		BIT(11)</div><div class='add'>+	#define COERCR1_IC6DP		BIT(12)</div><div class='add'>+	#define COERCR1_IG6DP		BIT(13)</div><div class='add'>+	#define COERCR1_ICV66DP		BIT(14)</div><div class='add'>+	#define COERCR1_RPCE		BIT(15)</div><div class='add'>+</div><div class='add'>+	#define COERCR1_DEFAULT		(COERCR1_RXPPPE)</div><div class='add'>+</div><div class='add'>+#define P4_COETCR0	(0x96)</div><div class='add'>+	#define COETCR0_TXIP		BIT(0)</div><div class='add'>+	#define COETCR0_TXTCP		BIT(1)</div><div class='add'>+	#define COETCR0_TXUDP		BIT(2)</div><div class='add'>+	#define COETCR0_TXICMP		BIT(3)</div><div class='add'>+	#define COETCR0_TXIGMP		BIT(4)</div><div class='add'>+	#define COETCR0_TXICV6		BIT(5)</div><div class='add'>+	#define COETCR0_TXTCPV6		BIT(8)</div><div class='add'>+	#define COETCR0_TXUDPV6		BIT(9)</div><div class='add'>+	#define COETCR0_TXICMV6		BIT(10)</div><div class='add'>+	#define COETCR0_TXIGMV6		BIT(11)</div><div class='add'>+	#define COETCR0_TXICV6V6	BIT(12)</div><div class='add'>+</div><div class='add'>+	#define COETCR0_DEFAULT		(COETCR0_TXIP | COETCR0_TXTCP | \</div><div class='add'>+					 COETCR0_TXUDP | COETCR0_TXTCPV6 | \</div><div class='add'>+					 COETCR0_TXUDPV6)</div><div class='add'>+#define P4_COETCR1	(0x98)</div><div class='add'>+	#define COETCR1_TX64TE		BIT(0)</div><div class='add'>+	#define COETCR1_TXPPPE		BIT(1)</div><div class='add'>+</div><div class='add'>+#define P4_COECEDR	(0x9A)</div><div class='add'>+#define P4_L2CECR	(0x9C)</div><div class='add'>+</div><div class='add'>+	/* Definition of PAGE5 */</div><div class='add'>+#define P5_WFTR		(0xA2)</div><div class='add'>+	#define WFTR_2MS		(0x01)</div><div class='add'>+	#define WFTR_4MS		(0x02)</div><div class='add'>+	#define WFTR_8MS		(0x03)</div><div class='add'>+	#define WFTR_16MS		(0x04)</div><div class='add'>+	#define WFTR_32MS		(0x05)</div><div class='add'>+	#define WFTR_64MS		(0x06)</div><div class='add'>+	#define WFTR_128MS		(0x07)</div><div class='add'>+	#define WFTR_256MS		(0x08)</div><div class='add'>+	#define WFTR_512MS		(0x09)</div><div class='add'>+	#define WFTR_1024MS		(0x0A)</div><div class='add'>+	#define WFTR_2048MS		(0x0B)</div><div class='add'>+	#define WFTR_4096MS		(0x0C)</div><div class='add'>+	#define WFTR_8192MS		(0x0D)</div><div class='add'>+	#define WFTR_16384MS		(0x0E)</div><div class='add'>+	#define WFTR_32768MS		(0x0F)</div><div class='add'>+#define P5_WFCCR	(0xA4)</div><div class='add'>+#define P5_WFCR03	(0xA6)</div><div class='add'>+	#define WFCR03_F0_EN		BIT(0)</div><div class='add'>+	#define WFCR03_F1_EN		BIT(4)</div><div class='add'>+	#define WFCR03_F2_EN		BIT(8)</div><div class='add'>+	#define WFCR03_F3_EN		BIT(12)</div><div class='add'>+#define P5_WFCR47	(0xA8)</div><div class='add'>+	#define WFCR47_F4_EN		BIT(0)</div><div class='add'>+	#define WFCR47_F5_EN		BIT(4)</div><div class='add'>+	#define WFCR47_F6_EN		BIT(8)</div><div class='add'>+	#define WFCR47_F7_EN		BIT(12)</div><div class='add'>+#define P5_WF0BMR0	(0xAA)</div><div class='add'>+#define P5_WF0BMR1	(0xAC)</div><div class='add'>+#define P5_WF0CR	(0xAE)</div><div class='add'>+#define P5_WF0OBR	(0xB0)</div><div class='add'>+#define P5_WF1BMR0	(0xB2)</div><div class='add'>+#define P5_WF1BMR1	(0xB4)</div><div class='add'>+#define P5_WF1CR	(0xB6)</div><div class='add'>+#define P5_WF1OBR	(0xB8)</div><div class='add'>+#define P5_WF2BMR0	(0xBA)</div><div class='add'>+#define P5_WF2BMR1	(0xBC)</div><div class='add'>+</div><div class='add'>+	/* Definition of PAGE6 */</div><div class='add'>+#define P6_WF2CR	(0xC2)</div><div class='add'>+#define P6_WF2OBR	(0xC4)</div><div class='add'>+#define P6_WF3BMR0	(0xC6)</div><div class='add'>+#define P6_WF3BMR1	(0xC8)</div><div class='add'>+#define P6_WF3CR	(0xCA)</div><div class='add'>+#define P6_WF3OBR	(0xCC)</div><div class='add'>+#define P6_WF4BMR0	(0xCE)</div><div class='add'>+#define P6_WF4BMR1	(0xD0)</div><div class='add'>+#define P6_WF4CR	(0xD2)</div><div class='add'>+#define P6_WF4OBR	(0xD4)</div><div class='add'>+#define P6_WF5BMR0	(0xD6)</div><div class='add'>+#define P6_WF5BMR1	(0xD8)</div><div class='add'>+#define P6_WF5CR	(0xDA)</div><div class='add'>+#define P6_WF5OBR	(0xDC)</div><div class='add'>+</div><div class='add'>+/* Definition of PAGE7 */</div><div class='add'>+#define P7_WF6BMR0	(0xE2)</div><div class='add'>+#define P7_WF6BMR1	(0xE4)</div><div class='add'>+#define P7_WF6CR	(0xE6)</div><div class='add'>+#define P7_WF6OBR	(0xE8)</div><div class='add'>+#define P7_WF7BMR0	(0xEA)</div><div class='add'>+#define P7_WF7BMR1	(0xEC)</div><div class='add'>+#define P7_WF7CR	(0xEE)</div><div class='add'>+#define P7_WF7OBR	(0xF0)</div><div class='add'>+#define P7_WFR01	(0xF2)</div><div class='add'>+#define P7_WFR23	(0xF4)</div><div class='add'>+#define P7_WFR45	(0xF6)</div><div class='add'>+#define P7_WFR67	(0xF8)</div><div class='add'>+#define P7_WFPC0	(0xFA)</div><div class='add'>+#define P7_WFPC1	(0xFC)</div><div class='add'>+</div><div class='add'>+/* Tx headers structure */</div><div class='add'>+struct tx_sop_header {</div><div class='add'>+	/* bit 15-11: flags, bit 10-0: packet length */</div><div class='add'>+	u16 flags_len;</div><div class='add'>+	/* bit 15-11: sequence number, bit 11-0: packet length bar */</div><div class='add'>+	u16 seq_lenbar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx_segment_header {</div><div class='add'>+	/* bit 15-14: flags, bit 13-11: segment number */</div><div class='add'>+	/* bit 10-0: segment length */</div><div class='add'>+	u16 flags_seqnum_seglen;</div><div class='add'>+	/* bit 15-14: end offset, bit 13-11: start offset */</div><div class='add'>+	/* bit 10-0: segment length bar */</div><div class='add'>+	u16 eo_so_seglenbar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx_eop_header {</div><div class='add'>+	/* bit 15-11: sequence number, bit 10-0: packet length */</div><div class='add'>+	u16 seq_len;</div><div class='add'>+	/* bit 15-11: sequence number bar, bit 10-0: packet length bar */</div><div class='add'>+	u16 seqbar_lenbar;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx_pkt_info {</div><div class='add'>+	struct_group(tx_overhead,</div><div class='add'>+		struct tx_sop_header sop;</div><div class='add'>+		struct tx_segment_header seg;</div><div class='add'>+	);</div><div class='add'>+	struct tx_eop_header eop;</div><div class='add'>+	u16 pkt_len;</div><div class='add'>+	u16 seq_num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Rx headers structure */</div><div class='add'>+struct rx_header {</div><div class='add'>+	u16 flags_len;</div><div class='add'>+	u16 seq_lenbar;</div><div class='add'>+	u16 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern unsigned long ax88796c_no_regs_mask[];</div><div class='add'>+</div><div class='add'>+#endif /* #ifndef _AX88796C_MAIN_H */</div><div class='head'>diff --git a/drivers/net/ethernet/asix/ax88796c_spi.c b/drivers/net/ethernet/asix/ax88796c_spi.c<br/>new file mode 100644<br/>index 000000000000..0710e716d682<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/ax88796c_spi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/ax88796c_spi.c</a></div><div class='hunk'>@@ -0,0 +1,115 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010 ASIX Electronics Corporation</div><div class='add'>+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * ASIX AX88796C SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt)	"ax88796c: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "ax88796c_spi.h"</div><div class='add'>+</div><div class='add'>+const u8 ax88796c_rx_cmd_buf[5] = {AX_SPICMD_READ_RXQ, 0xFF, 0xFF, 0xFF, 0xFF};</div><div class='add'>+const u8 ax88796c_tx_cmd_buf[4] = {AX_SPICMD_WRITE_TXQ, 0xFF, 0xFF, 0xFF};</div><div class='add'>+</div><div class='add'>+/* driver bus management functions */</div><div class='add'>+int axspi_wakeup(struct axspi_data *ax_spi)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ax_spi-&gt;cmd_buf[0] = AX_SPICMD_EXIT_PWD;	/* OP */</div><div class='add'>+	ret = spi_write(ax_spi-&gt;spi, ax_spi-&gt;cmd_buf, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;ax_spi-&gt;spi-&gt;dev, "%s() failed: ret = %d\n", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* OP */</div><div class='add'>+	ax_spi-&gt;cmd_buf[0] = AX_SPICMD_READ_STATUS;</div><div class='add'>+	ret = spi_write_then_read(ax_spi-&gt;spi, ax_spi-&gt;cmd_buf, 1, (u8 *)status, 3);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;ax_spi-&gt;spi-&gt;dev, "%s() failed: ret = %d\n", __func__, ret);</div><div class='add'>+	else</div><div class='add'>+		le16_to_cpus(&amp;status-&gt;isr);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	struct spi_transfer *xfer = ax_spi-&gt;spi_rx_xfer;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memcpy(ax_spi-&gt;cmd_buf, ax88796c_rx_cmd_buf, 5);</div><div class='add'>+</div><div class='add'>+	xfer-&gt;tx_buf = ax_spi-&gt;cmd_buf;</div><div class='add'>+	xfer-&gt;rx_buf = NULL;</div><div class='add'>+	xfer-&gt;len = ax_spi-&gt;comp ? 2 : 5;</div><div class='add'>+	xfer-&gt;bits_per_word = 8;</div><div class='add'>+	spi_message_add_tail(xfer, &amp;ax_spi-&gt;rx_msg);</div><div class='add'>+</div><div class='add'>+	xfer++;</div><div class='add'>+	xfer-&gt;rx_buf = data;</div><div class='add'>+	xfer-&gt;tx_buf = NULL;</div><div class='add'>+	xfer-&gt;len = len;</div><div class='add'>+	xfer-&gt;bits_per_word = 8;</div><div class='add'>+	spi_message_add_tail(xfer, &amp;ax_spi-&gt;rx_msg);</div><div class='add'>+	ret = spi_sync(ax_spi-&gt;spi, &amp;ax_spi-&gt;rx_msg);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;ax_spi-&gt;spi-&gt;dev, "%s() failed: ret = %d\n", __func__, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int axspi_write_txq(const struct axspi_data *ax_spi, void *data, int len)</div><div class='add'>+{</div><div class='add'>+	return spi_write(ax_spi-&gt;spi, data, len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+	int len = ax_spi-&gt;comp ? 3 : 4;</div><div class='add'>+</div><div class='add'>+	ax_spi-&gt;cmd_buf[0] = 0x03;	/* OP code read register */</div><div class='add'>+	ax_spi-&gt;cmd_buf[1] = reg;	/* register address */</div><div class='add'>+	ax_spi-&gt;cmd_buf[2] = 0xFF;	/* dumy cycle */</div><div class='add'>+	ax_spi-&gt;cmd_buf[3] = 0xFF;	/* dumy cycle */</div><div class='add'>+	ret = spi_write_then_read(ax_spi-&gt;spi,</div><div class='add'>+				  ax_spi-&gt;cmd_buf, len,</div><div class='add'>+				  ax_spi-&gt;rx_buf, 2);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;ax_spi-&gt;spi-&gt;dev,</div><div class='add'>+			"%s() failed: ret = %d\n", __func__, ret);</div><div class='add'>+		return 0xFFFF;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	le16_to_cpus((u16 *)ax_spi-&gt;rx_buf);</div><div class='add'>+</div><div class='add'>+	return *(u16 *)ax_spi-&gt;rx_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	memset(ax_spi-&gt;cmd_buf, 0, sizeof(ax_spi-&gt;cmd_buf));</div><div class='add'>+	ax_spi-&gt;cmd_buf[0] = AX_SPICMD_WRITE_REG;	/* OP code read register */</div><div class='add'>+	ax_spi-&gt;cmd_buf[1] = reg;			/* register address */</div><div class='add'>+	ax_spi-&gt;cmd_buf[2] = value;</div><div class='add'>+	ax_spi-&gt;cmd_buf[3] = value &gt;&gt; 8;</div><div class='add'>+</div><div class='add'>+	ret = spi_write(ax_spi-&gt;spi, ax_spi-&gt;cmd_buf, 4);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;ax_spi-&gt;spi-&gt;dev, "%s() failed: ret = %d\n", __func__, ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/ethernet/asix/ax88796c_spi.h b/drivers/net/ethernet/asix/ax88796c_spi.h<br/>new file mode 100644<br/>index 000000000000..5bcf91f603fb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/asix/ax88796c_spi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/asix/ax88796c_spi.h</a></div><div class='hunk'>@@ -0,0 +1,69 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2010 ASIX Electronics Corporation</div><div class='add'>+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.</div><div class='add'>+ *</div><div class='add'>+ * ASIX AX88796C SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _AX88796C_SPI_H</div><div class='add'>+#define _AX88796C_SPI_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* Definition of SPI command */</div><div class='add'>+#define AX_SPICMD_WRITE_TXQ		0x02</div><div class='add'>+#define AX_SPICMD_READ_REG		0x03</div><div class='add'>+#define AX_SPICMD_READ_STATUS		0x05</div><div class='add'>+#define AX_SPICMD_READ_RXQ		0x0B</div><div class='add'>+#define AX_SPICMD_BIDIR_WRQ		0xB2</div><div class='add'>+#define AX_SPICMD_WRITE_REG		0xD8</div><div class='add'>+#define AX_SPICMD_EXIT_PWD		0xAB</div><div class='add'>+</div><div class='add'>+extern const u8 ax88796c_rx_cmd_buf[];</div><div class='add'>+extern const u8 ax88796c_tx_cmd_buf[];</div><div class='add'>+</div><div class='add'>+struct axspi_data {</div><div class='add'>+	struct spi_device	*spi;</div><div class='add'>+	struct spi_message	rx_msg;</div><div class='add'>+	struct spi_transfer	spi_rx_xfer[2];</div><div class='add'>+	u8			cmd_buf[6];</div><div class='add'>+	u8			rx_buf[6];</div><div class='add'>+	u8			comp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct spi_status {</div><div class='add'>+	u16 isr;</div><div class='add'>+	u8 status;</div><div class='add'>+#	define AX_STATUS_READY		0x80</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int axspi_read_rxq(struct axspi_data *ax_spi, void *data, int len);</div><div class='add'>+int axspi_write_txq(const struct axspi_data *ax_spi, void *data, int len);</div><div class='add'>+u16 axspi_read_reg(struct axspi_data *ax_spi, u8 reg);</div><div class='add'>+int axspi_write_reg(struct axspi_data *ax_spi, u8 reg, u16 value);</div><div class='add'>+int axspi_read_status(struct axspi_data *ax_spi, struct spi_status *status);</div><div class='add'>+int axspi_wakeup(struct axspi_data *ax_spi);</div><div class='add'>+</div><div class='add'>+static inline u16 AX_READ(struct axspi_data *ax_spi, u8 offset)</div><div class='add'>+{</div><div class='add'>+	return axspi_read_reg(ax_spi, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int AX_WRITE(struct axspi_data *ax_spi, u16 value, u8 offset)</div><div class='add'>+{</div><div class='add'>+	return axspi_write_reg(ax_spi, offset, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int AX_READ_STATUS(struct axspi_data *ax_spi,</div><div class='add'>+				 struct spi_status *status)</div><div class='add'>+{</div><div class='add'>+	return axspi_read_status(ax_spi, status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int AX_WAKEUP(struct axspi_data *ax_spi)</div><div class='add'>+{</div><div class='add'>+	return axspi_wakeup(ax_spi);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig<br/>index 953ff1f9ac70..bec5cdf8d1da 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/Kconfig</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'> config NET_VENDOR_ATHEROS</div><div class='ctx'> 	bool "Atheros devices"</div><div class='ctx'> 	default y</div><div class='del'>-	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	depends on PCI || ATH79 || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -17,12 +17,21 @@ config NET_VENDOR_ATHEROS</div><div class='ctx'> </div><div class='ctx'> if NET_VENDOR_ATHEROS</div><div class='ctx'> </div><div class='add'>+config AG71XX</div><div class='add'>+	tristate "Atheros AR7XXX/AR9XXX built-in ethernet mac support"</div><div class='add'>+	depends on ATH79 || COMPILE_TEST</div><div class='add'>+	select PHYLINK</div><div class='add'>+	imply NET_SELFTESTS</div><div class='add'>+	help</div><div class='add'>+	  If you wish to compile a kernel for AR7XXX/91XXX and enable</div><div class='add'>+	  ethernet support, then you should always answer Y to this.</div><div class='add'>+</div><div class='ctx'> config ATL2</div><div class='ctx'> 	tristate "Atheros L2 Fast Ethernet support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Atheros L2 fast ethernet adapter.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='hunk'>@@ -33,7 +42,7 @@ config ATL1</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Atheros/Attansic L1 gigabit ethernet</div><div class='ctx'> 	  adapter.</div><div class='ctx'> </div><div class='hunk'>@@ -45,7 +54,7 @@ config ATL1E</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Atheros L1E gigabit ethernet adapter.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='hunk'>@@ -56,7 +65,7 @@ config ATL1C</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Atheros L1C gigabit ethernet adapter.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/Makefile b/drivers/net/ethernet/atheros/Makefile<br/>index aa3d394b87e6..aca696cb6425 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/Makefile</a></div><div class='hunk'>@@ -3,6 +3,7 @@</div><div class='ctx'> # Makefile for the Atheros network device drivers.</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+obj-$(CONFIG_AG71XX) += ag71xx.o</div><div class='ctx'> obj-$(CONFIG_ATL1) += atlx/</div><div class='ctx'> obj-$(CONFIG_ATL2) += atlx/</div><div class='ctx'> obj-$(CONFIG_ATL1E) += atl1e/</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c<br/>new file mode 100644<br/>index 000000000000..cbc730c7cff2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/ag71xx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/ag71xx.c</a></div><div class='hunk'>@@ -0,0 +1,2035 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*  Atheros AR71xx built-in ethernet mac driver</div><div class='add'>+ *</div><div class='add'>+ *  Copyright (C) 2019 Oleksij Rempel &lt;o.rempel@pengutronix.de&gt;</div><div class='add'>+ *</div><div class='add'>+ *  List of authors contributed to this driver before mainlining:</div><div class='add'>+ *  Alexander Couzens &lt;lynxis@fe80.eu&gt;</div><div class='add'>+ *  Christian Lamparter &lt;chunkeey@gmail.com&gt;</div><div class='add'>+ *  Chuanhong Guo &lt;gch981213@gmail.com&gt;</div><div class='add'>+ *  Daniel F. Dickinson &lt;cshored@thecshore.com&gt;</div><div class='add'>+ *  David Bauer &lt;mail@david-bauer.net&gt;</div><div class='add'>+ *  Felix Fietkau &lt;nbd@nbd.name&gt;</div><div class='add'>+ *  Gabor Juhos &lt;juhosg@freemail.hu&gt;</div><div class='add'>+ *  Hauke Mehrtens &lt;hauke@hauke-m.de&gt;</div><div class='add'>+ *  Johann Neuhauser &lt;johann@it-neuhauser.de&gt;</div><div class='add'>+ *  John Crispin &lt;john@phrozen.org&gt;</div><div class='add'>+ *  Jo-Philipp Wich &lt;jo@mein.io&gt;</div><div class='add'>+ *  Koen Vandeputte &lt;koen.vandeputte@ncentric.com&gt;</div><div class='add'>+ *  Lucian Cristian &lt;lucian.cristian@gmail.com&gt;</div><div class='add'>+ *  Matt Merhar &lt;mattmerhar@protonmail.com&gt;</div><div class='add'>+ *  Milan Krstic &lt;milan.krstic@gmail.com&gt;</div><div class='add'>+ *  Petr Štetiar &lt;ynezz@true.cz&gt;</div><div class='add'>+ *  Rosen Penev &lt;rosenp@gmail.com&gt;</div><div class='add'>+ *  Stephen Walker &lt;stephendwalker+github@gmail.com&gt;</div><div class='add'>+ *  Vittorio Gambaletta &lt;openwrt@vittgam.net&gt;</div><div class='add'>+ *  Weijie Gao &lt;hackpascal@gmail.com&gt;</div><div class='add'>+ *  Imre Kaloz &lt;kaloz@openwrt.org&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/mfd/syscon.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;net/selftests.h&gt;</div><div class='add'>+</div><div class='add'>+/* For our NAPI weight bigger does *NOT* mean better - it means more</div><div class='add'>+ * D-cache misses and lots more wasted cycles than we'll ever</div><div class='add'>+ * possibly gain from saving instructions.</div><div class='add'>+ */</div><div class='add'>+#define AG71XX_NAPI_WEIGHT	32</div><div class='add'>+#define AG71XX_OOM_REFILL	(1 + HZ / 10)</div><div class='add'>+</div><div class='add'>+#define AG71XX_INT_ERR	(AG71XX_INT_RX_BE | AG71XX_INT_TX_BE)</div><div class='add'>+#define AG71XX_INT_TX	(AG71XX_INT_TX_PS)</div><div class='add'>+#define AG71XX_INT_RX	(AG71XX_INT_RX_PR | AG71XX_INT_RX_OF)</div><div class='add'>+</div><div class='add'>+#define AG71XX_INT_POLL	(AG71XX_INT_RX | AG71XX_INT_TX)</div><div class='add'>+#define AG71XX_INT_INIT	(AG71XX_INT_ERR | AG71XX_INT_POLL)</div><div class='add'>+</div><div class='add'>+#define AG71XX_TX_MTU_LEN	1540</div><div class='add'>+</div><div class='add'>+#define AG71XX_TX_RING_SPLIT		512</div><div class='add'>+#define AG71XX_TX_RING_DS_PER_PKT	DIV_ROUND_UP(AG71XX_TX_MTU_LEN, \</div><div class='add'>+						     AG71XX_TX_RING_SPLIT)</div><div class='add'>+#define AG71XX_TX_RING_SIZE_DEFAULT	128</div><div class='add'>+#define AG71XX_RX_RING_SIZE_DEFAULT	256</div><div class='add'>+</div><div class='add'>+#define AG71XX_MDIO_RETRY	1000</div><div class='add'>+#define AG71XX_MDIO_DELAY	5</div><div class='add'>+#define AG71XX_MDIO_MAX_CLK	5000000</div><div class='add'>+</div><div class='add'>+/* Register offsets */</div><div class='add'>+#define AG71XX_REG_MAC_CFG1	0x0000</div><div class='add'>+#define MAC_CFG1_TXE		BIT(0)	/* Tx Enable */</div><div class='add'>+#define MAC_CFG1_STX		BIT(1)	/* Synchronize Tx Enable */</div><div class='add'>+#define MAC_CFG1_RXE		BIT(2)	/* Rx Enable */</div><div class='add'>+#define MAC_CFG1_SRX		BIT(3)	/* Synchronize Rx Enable */</div><div class='add'>+#define MAC_CFG1_TFC		BIT(4)	/* Tx Flow Control Enable */</div><div class='add'>+#define MAC_CFG1_RFC		BIT(5)	/* Rx Flow Control Enable */</div><div class='add'>+#define MAC_CFG1_SR		BIT(31)	/* Soft Reset */</div><div class='add'>+#define MAC_CFG1_INIT	(MAC_CFG1_RXE | MAC_CFG1_TXE | \</div><div class='add'>+			 MAC_CFG1_SRX | MAC_CFG1_STX)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MAC_CFG2	0x0004</div><div class='add'>+#define MAC_CFG2_FDX		BIT(0)</div><div class='add'>+#define MAC_CFG2_PAD_CRC_EN	BIT(2)</div><div class='add'>+#define MAC_CFG2_LEN_CHECK	BIT(4)</div><div class='add'>+#define MAC_CFG2_IF_1000	BIT(9)</div><div class='add'>+#define MAC_CFG2_IF_10_100	BIT(8)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MAC_MFL	0x0010</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MII_CFG	0x0020</div><div class='add'>+#define MII_CFG_CLK_DIV_4	0</div><div class='add'>+#define MII_CFG_CLK_DIV_6	2</div><div class='add'>+#define MII_CFG_CLK_DIV_8	3</div><div class='add'>+#define MII_CFG_CLK_DIV_10	4</div><div class='add'>+#define MII_CFG_CLK_DIV_14	5</div><div class='add'>+#define MII_CFG_CLK_DIV_20	6</div><div class='add'>+#define MII_CFG_CLK_DIV_28	7</div><div class='add'>+#define MII_CFG_CLK_DIV_34	8</div><div class='add'>+#define MII_CFG_CLK_DIV_42	9</div><div class='add'>+#define MII_CFG_CLK_DIV_50	10</div><div class='add'>+#define MII_CFG_CLK_DIV_58	11</div><div class='add'>+#define MII_CFG_CLK_DIV_66	12</div><div class='add'>+#define MII_CFG_CLK_DIV_74	13</div><div class='add'>+#define MII_CFG_CLK_DIV_82	14</div><div class='add'>+#define MII_CFG_CLK_DIV_98	15</div><div class='add'>+#define MII_CFG_RESET		BIT(31)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MII_CMD	0x0024</div><div class='add'>+#define MII_CMD_READ		BIT(0)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MII_ADDR	0x0028</div><div class='add'>+#define MII_ADDR_SHIFT		8</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MII_CTRL	0x002c</div><div class='add'>+#define AG71XX_REG_MII_STATUS	0x0030</div><div class='add'>+#define AG71XX_REG_MII_IND	0x0034</div><div class='add'>+#define MII_IND_BUSY		BIT(0)</div><div class='add'>+#define MII_IND_INVALID		BIT(2)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MAC_IFCTL	0x0038</div><div class='add'>+#define MAC_IFCTL_SPEED		BIT(16)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_MAC_ADDR1	0x0040</div><div class='add'>+#define AG71XX_REG_MAC_ADDR2	0x0044</div><div class='add'>+#define AG71XX_REG_FIFO_CFG0	0x0048</div><div class='add'>+#define FIFO_CFG0_WTM		BIT(0)	/* Watermark Module */</div><div class='add'>+#define FIFO_CFG0_RXS		BIT(1)	/* Rx System Module */</div><div class='add'>+#define FIFO_CFG0_RXF		BIT(2)	/* Rx Fabric Module */</div><div class='add'>+#define FIFO_CFG0_TXS		BIT(3)	/* Tx System Module */</div><div class='add'>+#define FIFO_CFG0_TXF		BIT(4)	/* Tx Fabric Module */</div><div class='add'>+#define FIFO_CFG0_ALL	(FIFO_CFG0_WTM | FIFO_CFG0_RXS | FIFO_CFG0_RXF \</div><div class='add'>+			| FIFO_CFG0_TXS | FIFO_CFG0_TXF)</div><div class='add'>+#define FIFO_CFG0_INIT	(FIFO_CFG0_ALL &lt;&lt; FIFO_CFG0_ENABLE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define FIFO_CFG0_ENABLE_SHIFT	8</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_FIFO_CFG1	0x004c</div><div class='add'>+#define AG71XX_REG_FIFO_CFG2	0x0050</div><div class='add'>+#define AG71XX_REG_FIFO_CFG3	0x0054</div><div class='add'>+#define AG71XX_REG_FIFO_CFG4	0x0058</div><div class='add'>+#define FIFO_CFG4_DE		BIT(0)	/* Drop Event */</div><div class='add'>+#define FIFO_CFG4_DV		BIT(1)	/* RX_DV Event */</div><div class='add'>+#define FIFO_CFG4_FC		BIT(2)	/* False Carrier */</div><div class='add'>+#define FIFO_CFG4_CE		BIT(3)	/* Code Error */</div><div class='add'>+#define FIFO_CFG4_CR		BIT(4)	/* CRC error */</div><div class='add'>+#define FIFO_CFG4_LM		BIT(5)	/* Length Mismatch */</div><div class='add'>+#define FIFO_CFG4_LO		BIT(6)	/* Length out of range */</div><div class='add'>+#define FIFO_CFG4_OK		BIT(7)	/* Packet is OK */</div><div class='add'>+#define FIFO_CFG4_MC		BIT(8)	/* Multicast Packet */</div><div class='add'>+#define FIFO_CFG4_BC		BIT(9)	/* Broadcast Packet */</div><div class='add'>+#define FIFO_CFG4_DR		BIT(10)	/* Dribble */</div><div class='add'>+#define FIFO_CFG4_CF		BIT(11)	/* Control Frame */</div><div class='add'>+#define FIFO_CFG4_PF		BIT(12)	/* Pause Frame */</div><div class='add'>+#define FIFO_CFG4_UO		BIT(13)	/* Unsupported Opcode */</div><div class='add'>+#define FIFO_CFG4_VT		BIT(14)	/* VLAN tag detected */</div><div class='add'>+#define FIFO_CFG4_LE		BIT(15)	/* Long Event */</div><div class='add'>+#define FIFO_CFG4_FT		BIT(16)	/* Frame Truncated */</div><div class='add'>+#define FIFO_CFG4_UC		BIT(17)	/* Unicast Packet */</div><div class='add'>+#define FIFO_CFG4_INIT	(FIFO_CFG4_DE | FIFO_CFG4_DV | FIFO_CFG4_FC | \</div><div class='add'>+			 FIFO_CFG4_CE | FIFO_CFG4_CR | FIFO_CFG4_LM | \</div><div class='add'>+			 FIFO_CFG4_LO | FIFO_CFG4_OK | FIFO_CFG4_MC | \</div><div class='add'>+			 FIFO_CFG4_BC | FIFO_CFG4_DR | FIFO_CFG4_LE | \</div><div class='add'>+			 FIFO_CFG4_CF | FIFO_CFG4_PF | FIFO_CFG4_UO | \</div><div class='add'>+			 FIFO_CFG4_VT)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_FIFO_CFG5	0x005c</div><div class='add'>+#define FIFO_CFG5_DE		BIT(0)	/* Drop Event */</div><div class='add'>+#define FIFO_CFG5_DV		BIT(1)	/* RX_DV Event */</div><div class='add'>+#define FIFO_CFG5_FC		BIT(2)	/* False Carrier */</div><div class='add'>+#define FIFO_CFG5_CE		BIT(3)	/* Code Error */</div><div class='add'>+#define FIFO_CFG5_CR		BIT(4)  /* CRC error */</div><div class='add'>+#define FIFO_CFG5_LM		BIT(5)	/* Length Mismatch */</div><div class='add'>+#define FIFO_CFG5_LO		BIT(6)	/* Length Out of Range */</div><div class='add'>+#define FIFO_CFG5_OK		BIT(7)	/* Packet is OK */</div><div class='add'>+#define FIFO_CFG5_MC		BIT(8)	/* Multicast Packet */</div><div class='add'>+#define FIFO_CFG5_BC		BIT(9)	/* Broadcast Packet */</div><div class='add'>+#define FIFO_CFG5_DR		BIT(10)	/* Dribble */</div><div class='add'>+#define FIFO_CFG5_CF		BIT(11)	/* Control Frame */</div><div class='add'>+#define FIFO_CFG5_PF		BIT(12)	/* Pause Frame */</div><div class='add'>+#define FIFO_CFG5_UO		BIT(13)	/* Unsupported Opcode */</div><div class='add'>+#define FIFO_CFG5_VT		BIT(14)	/* VLAN tag detected */</div><div class='add'>+#define FIFO_CFG5_LE		BIT(15)	/* Long Event */</div><div class='add'>+#define FIFO_CFG5_FT		BIT(16)	/* Frame Truncated */</div><div class='add'>+#define FIFO_CFG5_UC		BIT(17)	/* Unicast Packet */</div><div class='add'>+#define FIFO_CFG5_SF		BIT(18)	/* Short Frame */</div><div class='add'>+#define FIFO_CFG5_BM		BIT(19)	/* Byte Mode */</div><div class='add'>+#define FIFO_CFG5_INIT	(FIFO_CFG5_DE | FIFO_CFG5_DV | FIFO_CFG5_FC | \</div><div class='add'>+			 FIFO_CFG5_CE | FIFO_CFG5_LM | FIFO_CFG5_LO | \</div><div class='add'>+			 FIFO_CFG5_OK | FIFO_CFG5_MC | FIFO_CFG5_BC | \</div><div class='add'>+			 FIFO_CFG5_DR | FIFO_CFG5_CF | FIFO_CFG5_UO | \</div><div class='add'>+			 FIFO_CFG5_VT | FIFO_CFG5_LE | FIFO_CFG5_FT | \</div><div class='add'>+			 FIFO_CFG5_UC | FIFO_CFG5_SF)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_TX_CTRL	0x0180</div><div class='add'>+#define TX_CTRL_TXE		BIT(0)	/* Tx Enable */</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_TX_DESC	0x0184</div><div class='add'>+#define AG71XX_REG_TX_STATUS	0x0188</div><div class='add'>+#define TX_STATUS_PS		BIT(0)	/* Packet Sent */</div><div class='add'>+#define TX_STATUS_UR		BIT(1)	/* Tx Underrun */</div><div class='add'>+#define TX_STATUS_BE		BIT(3)	/* Bus Error */</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_RX_CTRL	0x018c</div><div class='add'>+#define RX_CTRL_RXE		BIT(0)	/* Rx Enable */</div><div class='add'>+</div><div class='add'>+#define AG71XX_DMA_RETRY	10</div><div class='add'>+#define AG71XX_DMA_DELAY	1</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_RX_DESC	0x0190</div><div class='add'>+#define AG71XX_REG_RX_STATUS	0x0194</div><div class='add'>+#define RX_STATUS_PR		BIT(0)	/* Packet Received */</div><div class='add'>+#define RX_STATUS_OF		BIT(2)	/* Rx Overflow */</div><div class='add'>+#define RX_STATUS_BE		BIT(3)	/* Bus Error */</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_INT_ENABLE	0x0198</div><div class='add'>+#define AG71XX_REG_INT_STATUS	0x019c</div><div class='add'>+#define AG71XX_INT_TX_PS	BIT(0)</div><div class='add'>+#define AG71XX_INT_TX_UR	BIT(1)</div><div class='add'>+#define AG71XX_INT_TX_BE	BIT(3)</div><div class='add'>+#define AG71XX_INT_RX_PR	BIT(4)</div><div class='add'>+#define AG71XX_INT_RX_OF	BIT(6)</div><div class='add'>+#define AG71XX_INT_RX_BE	BIT(7)</div><div class='add'>+</div><div class='add'>+#define AG71XX_REG_FIFO_DEPTH	0x01a8</div><div class='add'>+#define AG71XX_REG_RX_SM	0x01b0</div><div class='add'>+#define AG71XX_REG_TX_SM	0x01b4</div><div class='add'>+</div><div class='add'>+#define AG71XX_DEFAULT_MSG_ENABLE	\</div><div class='add'>+	(NETIF_MSG_DRV			\</div><div class='add'>+	| NETIF_MSG_PROBE		\</div><div class='add'>+	| NETIF_MSG_LINK		\</div><div class='add'>+	| NETIF_MSG_TIMER		\</div><div class='add'>+	| NETIF_MSG_IFDOWN		\</div><div class='add'>+	| NETIF_MSG_IFUP		\</div><div class='add'>+	| NETIF_MSG_RX_ERR		\</div><div class='add'>+	| NETIF_MSG_TX_ERR)</div><div class='add'>+</div><div class='add'>+struct ag71xx_statistic {</div><div class='add'>+	unsigned short offset;</div><div class='add'>+	u32 mask;</div><div class='add'>+	const char name[ETH_GSTRING_LEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_statistic ag71xx_statistics[] = {</div><div class='add'>+	{ 0x0080, GENMASK(17, 0), "Tx/Rx 64 Byte", },</div><div class='add'>+	{ 0x0084, GENMASK(17, 0), "Tx/Rx 65-127 Byte", },</div><div class='add'>+	{ 0x0088, GENMASK(17, 0), "Tx/Rx 128-255 Byte", },</div><div class='add'>+	{ 0x008C, GENMASK(17, 0), "Tx/Rx 256-511 Byte", },</div><div class='add'>+	{ 0x0090, GENMASK(17, 0), "Tx/Rx 512-1023 Byte", },</div><div class='add'>+	{ 0x0094, GENMASK(17, 0), "Tx/Rx 1024-1518 Byte", },</div><div class='add'>+	{ 0x0098, GENMASK(17, 0), "Tx/Rx 1519-1522 Byte VLAN", },</div><div class='add'>+	{ 0x009C, GENMASK(23, 0), "Rx Byte", },</div><div class='add'>+	{ 0x00A0, GENMASK(17, 0), "Rx Packet", },</div><div class='add'>+	{ 0x00A4, GENMASK(11, 0), "Rx FCS Error", },</div><div class='add'>+	{ 0x00A8, GENMASK(17, 0), "Rx Multicast Packet", },</div><div class='add'>+	{ 0x00AC, GENMASK(21, 0), "Rx Broadcast Packet", },</div><div class='add'>+	{ 0x00B0, GENMASK(17, 0), "Rx Control Frame Packet", },</div><div class='add'>+	{ 0x00B4, GENMASK(11, 0), "Rx Pause Frame Packet", },</div><div class='add'>+	{ 0x00B8, GENMASK(11, 0), "Rx Unknown OPCode Packet", },</div><div class='add'>+	{ 0x00BC, GENMASK(11, 0), "Rx Alignment Error", },</div><div class='add'>+	{ 0x00C0, GENMASK(15, 0), "Rx Frame Length Error", },</div><div class='add'>+	{ 0x00C4, GENMASK(11, 0), "Rx Code Error", },</div><div class='add'>+	{ 0x00C8, GENMASK(11, 0), "Rx Carrier Sense Error", },</div><div class='add'>+	{ 0x00CC, GENMASK(11, 0), "Rx Undersize Packet", },</div><div class='add'>+	{ 0x00D0, GENMASK(11, 0), "Rx Oversize Packet", },</div><div class='add'>+	{ 0x00D4, GENMASK(11, 0), "Rx Fragments", },</div><div class='add'>+	{ 0x00D8, GENMASK(11, 0), "Rx Jabber", },</div><div class='add'>+	{ 0x00DC, GENMASK(11, 0), "Rx Dropped Packet", },</div><div class='add'>+	{ 0x00E0, GENMASK(23, 0), "Tx Byte", },</div><div class='add'>+	{ 0x00E4, GENMASK(17, 0), "Tx Packet", },</div><div class='add'>+	{ 0x00E8, GENMASK(17, 0), "Tx Multicast Packet", },</div><div class='add'>+	{ 0x00EC, GENMASK(17, 0), "Tx Broadcast Packet", },</div><div class='add'>+	{ 0x00F0, GENMASK(11, 0), "Tx Pause Control Frame", },</div><div class='add'>+	{ 0x00F4, GENMASK(11, 0), "Tx Deferral Packet", },</div><div class='add'>+	{ 0x00F8, GENMASK(11, 0), "Tx Excessive Deferral Packet", },</div><div class='add'>+	{ 0x00FC, GENMASK(11, 0), "Tx Single Collision Packet", },</div><div class='add'>+	{ 0x0100, GENMASK(11, 0), "Tx Multiple Collision", },</div><div class='add'>+	{ 0x0104, GENMASK(11, 0), "Tx Late Collision Packet", },</div><div class='add'>+	{ 0x0108, GENMASK(11, 0), "Tx Excessive Collision Packet", },</div><div class='add'>+	{ 0x010C, GENMASK(12, 0), "Tx Total Collision", },</div><div class='add'>+	{ 0x0110, GENMASK(11, 0), "Tx Pause Frames Honored", },</div><div class='add'>+	{ 0x0114, GENMASK(11, 0), "Tx Drop Frame", },</div><div class='add'>+	{ 0x0118, GENMASK(11, 0), "Tx Jabber Frame", },</div><div class='add'>+	{ 0x011C, GENMASK(11, 0), "Tx FCS Error", },</div><div class='add'>+	{ 0x0120, GENMASK(11, 0), "Tx Control Frame", },</div><div class='add'>+	{ 0x0124, GENMASK(11, 0), "Tx Oversize Frame", },</div><div class='add'>+	{ 0x0128, GENMASK(11, 0), "Tx Undersize Frame", },</div><div class='add'>+	{ 0x012C, GENMASK(11, 0), "Tx Fragment", },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DESC_EMPTY		BIT(31)</div><div class='add'>+#define DESC_MORE		BIT(24)</div><div class='add'>+#define DESC_PKTLEN_M		0xfff</div><div class='add'>+struct ag71xx_desc {</div><div class='add'>+	u32 data;</div><div class='add'>+	u32 ctrl;</div><div class='add'>+	u32 next;</div><div class='add'>+	u32 pad;</div><div class='add'>+} __aligned(4);</div><div class='add'>+</div><div class='add'>+#define AG71XX_DESC_SIZE	roundup(sizeof(struct ag71xx_desc), \</div><div class='add'>+					L1_CACHE_BYTES)</div><div class='add'>+</div><div class='add'>+struct ag71xx_buf {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			struct sk_buff *skb;</div><div class='add'>+			unsigned int len;</div><div class='add'>+		} tx;</div><div class='add'>+		struct {</div><div class='add'>+			dma_addr_t dma_addr;</div><div class='add'>+			void *rx_buf;</div><div class='add'>+		} rx;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ag71xx_ring {</div><div class='add'>+	/* "Hot" fields in the data path. */</div><div class='add'>+	unsigned int curr;</div><div class='add'>+	unsigned int dirty;</div><div class='add'>+</div><div class='add'>+	/* "Cold" fields - not used in the data path. */</div><div class='add'>+	struct ag71xx_buf *buf;</div><div class='add'>+	u16 order;</div><div class='add'>+	u16 desc_split;</div><div class='add'>+	dma_addr_t descs_dma;</div><div class='add'>+	u8 *descs_cpu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum ag71xx_type {</div><div class='add'>+	AR7100,</div><div class='add'>+	AR7240,</div><div class='add'>+	AR9130,</div><div class='add'>+	AR9330,</div><div class='add'>+	AR9340,</div><div class='add'>+	QCA9530,</div><div class='add'>+	QCA9550,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ag71xx_dcfg {</div><div class='add'>+	u32 max_frame_len;</div><div class='add'>+	const u32 *fifodata;</div><div class='add'>+	u16 desc_pktlen_mask;</div><div class='add'>+	bool tx_hang_workaround;</div><div class='add'>+	enum ag71xx_type type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ag71xx {</div><div class='add'>+	/* Critical data related to the per-packet data path are clustered</div><div class='add'>+	 * early in this structure to help improve the D-cache footprint.</div><div class='add'>+	 */</div><div class='add'>+	struct ag71xx_ring rx_ring ____cacheline_aligned;</div><div class='add'>+	struct ag71xx_ring tx_ring ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+	u16 rx_buf_size;</div><div class='add'>+	u8 rx_buf_offset;</div><div class='add'>+</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	u32 msg_enable;</div><div class='add'>+	const struct ag71xx_dcfg *dcfg;</div><div class='add'>+</div><div class='add'>+	/* From this point onwards we're not looking at per-packet fields. */</div><div class='add'>+	void __iomem *mac_base;</div><div class='add'>+</div><div class='add'>+	struct ag71xx_desc *stop_desc;</div><div class='add'>+	dma_addr_t stop_desc_dma;</div><div class='add'>+</div><div class='add'>+	phy_interface_t phy_if_mode;</div><div class='add'>+	struct phylink *phylink;</div><div class='add'>+	struct phylink_config phylink_config;</div><div class='add'>+</div><div class='add'>+	struct delayed_work restart_work;</div><div class='add'>+	struct timer_list oom_timer;</div><div class='add'>+</div><div class='add'>+	struct reset_control *mac_reset;</div><div class='add'>+</div><div class='add'>+	u32 fifodata[3];</div><div class='add'>+	int mac_idx;</div><div class='add'>+</div><div class='add'>+	struct clk *clk_mdio;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ag71xx_desc_empty(struct ag71xx_desc *desc)</div><div class='add'>+{</div><div class='add'>+	return (desc-&gt;ctrl &amp; DESC_EMPTY) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct ag71xx_desc *ag71xx_ring_desc(struct ag71xx_ring *ring, int idx)</div><div class='add'>+{</div><div class='add'>+	return (struct ag71xx_desc *)&amp;ring-&gt;descs_cpu[idx * AG71XX_DESC_SIZE];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_ring_size_order(int size)</div><div class='add'>+{</div><div class='add'>+	return fls(size - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ag71xx_is(struct ag71xx *ag, enum ag71xx_type type)</div><div class='add'>+{</div><div class='add'>+	return ag-&gt;dcfg-&gt;type == type;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_wr(struct ag71xx *ag, unsigned int reg, u32 value)</div><div class='add'>+{</div><div class='add'>+	iowrite32(value, ag-&gt;mac_base + reg);</div><div class='add'>+	/* flush write */</div><div class='add'>+	(void)ioread32(ag-&gt;mac_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 ag71xx_rr(struct ag71xx *ag, unsigned int reg)</div><div class='add'>+{</div><div class='add'>+	return ioread32(ag-&gt;mac_base + reg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_sb(struct ag71xx *ag, unsigned int reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r;</div><div class='add'>+</div><div class='add'>+	r = ag-&gt;mac_base + reg;</div><div class='add'>+	iowrite32(ioread32(r) | mask, r);</div><div class='add'>+	/* flush write */</div><div class='add'>+	(void)ioread32(r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_cb(struct ag71xx *ag, unsigned int reg, u32 mask)</div><div class='add'>+{</div><div class='add'>+	void __iomem *r;</div><div class='add'>+</div><div class='add'>+	r = ag-&gt;mac_base + reg;</div><div class='add'>+	iowrite32(ioread32(r) &amp; ~mask, r);</div><div class='add'>+	/* flush write */</div><div class='add'>+	(void)ioread32(r);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_int_enable(struct ag71xx *ag, u32 ints)</div><div class='add'>+{</div><div class='add'>+	ag71xx_sb(ag, AG71XX_REG_INT_ENABLE, ints);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_int_disable(struct ag71xx *ag, u32 ints)</div><div class='add'>+{</div><div class='add'>+	ag71xx_cb(ag, AG71XX_REG_INT_ENABLE, ints);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return phylink_mii_ioctl(ag-&gt;phylink, ifr, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_get_drvinfo(struct net_device *ndev,</div><div class='add'>+			       struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	strscpy(info-&gt;driver, "ag71xx", sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, of_node_full_name(ag-&gt;pdev-&gt;dev.of_node),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_get_link_ksettings(struct net_device *ndev,</div><div class='add'>+				   struct ethtool_link_ksettings *kset)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_get(ag-&gt;phylink, kset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_set_link_ksettings(struct net_device *ndev,</div><div class='add'>+				   const struct ethtool_link_ksettings *kset)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_set(ag-&gt;phylink, kset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_ethtool_nway_reset(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_nway_reset(ag-&gt;phylink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_ethtool_get_pauseparam(struct net_device *ndev,</div><div class='add'>+					  struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	phylink_ethtool_get_pauseparam(ag-&gt;phylink, pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_ethtool_set_pauseparam(struct net_device *ndev,</div><div class='add'>+					 struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_set_pauseparam(ag-&gt;phylink, pause);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_ethtool_get_strings(struct net_device *netdev, u32 sset,</div><div class='add'>+				       u8 *data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(ag71xx_statistics); i++)</div><div class='add'>+			ethtool_puts(&amp;data, ag71xx_statistics[i].name);</div><div class='add'>+		break;</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		net_selftest_get_strings(data);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_ethtool_get_stats(struct net_device *ndev,</div><div class='add'>+				     struct ethtool_stats *stats, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ag71xx_statistics); i++)</div><div class='add'>+		*data++ = ag71xx_rr(ag, ag71xx_statistics[i].offset)</div><div class='add'>+				&amp; ag71xx_statistics[i].mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_ethtool_get_sset_count(struct net_device *ndev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return ARRAY_SIZE(ag71xx_statistics);</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		return net_selftest_get_count();</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops ag71xx_ethtool_ops = {</div><div class='add'>+	.get_drvinfo			= ag71xx_get_drvinfo,</div><div class='add'>+	.get_link			= ethtool_op_get_link,</div><div class='add'>+	.get_ts_info			= ethtool_op_get_ts_info,</div><div class='add'>+	.get_link_ksettings		= ag71xx_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings		= ag71xx_set_link_ksettings,</div><div class='add'>+	.nway_reset			= ag71xx_ethtool_nway_reset,</div><div class='add'>+	.get_pauseparam			= ag71xx_ethtool_get_pauseparam,</div><div class='add'>+	.set_pauseparam			= ag71xx_ethtool_set_pauseparam,</div><div class='add'>+	.get_strings			= ag71xx_ethtool_get_strings,</div><div class='add'>+	.get_ethtool_stats		= ag71xx_ethtool_get_stats,</div><div class='add'>+	.get_sset_count			= ag71xx_ethtool_get_sset_count,</div><div class='add'>+	.self_test			= net_selftest,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ag71xx_mdio_wait_busy(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AG71XX_MDIO_RETRY; i++) {</div><div class='add'>+		u32 busy;</div><div class='add'>+</div><div class='add'>+		udelay(AG71XX_MDIO_DELAY);</div><div class='add'>+</div><div class='add'>+		busy = ag71xx_rr(ag, AG71XX_REG_MII_IND);</div><div class='add'>+		if (!busy)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		udelay(AG71XX_MDIO_DELAY);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_err(ag, link, ndev, "MDIO operation timed out\n");</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_mdio_mii_read(struct mii_bus *bus, int addr, int reg)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = bus-&gt;priv;</div><div class='add'>+	int err, val;</div><div class='add'>+</div><div class='add'>+	err = ag71xx_mdio_wait_busy(ag);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_ADDR,</div><div class='add'>+		  ((addr &amp; 0x1f) &lt;&lt; MII_ADDR_SHIFT) | (reg &amp; 0xff));</div><div class='add'>+	/* enable read mode */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_CMD, MII_CMD_READ);</div><div class='add'>+</div><div class='add'>+	err = ag71xx_mdio_wait_busy(ag);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	val = ag71xx_rr(ag, AG71XX_REG_MII_STATUS);</div><div class='add'>+	/* disable read mode */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_CMD, 0);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, link, ag-&gt;ndev, "mii_read: addr=%04x, reg=%04x, value=%04x\n",</div><div class='add'>+		  addr, reg, val);</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_mdio_mii_write(struct mii_bus *bus, int addr, int reg,</div><div class='add'>+				 u16 val)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, link, ag-&gt;ndev, "mii_write: addr=%04x, reg=%04x, value=%04x\n",</div><div class='add'>+		  addr, reg, val);</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_ADDR,</div><div class='add'>+		  ((addr &amp; 0x1f) &lt;&lt; MII_ADDR_SHIFT) | (reg &amp; 0xff));</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_CTRL, val);</div><div class='add'>+</div><div class='add'>+	return ag71xx_mdio_wait_busy(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u32 ar71xx_mdio_div_table[] = {</div><div class='add'>+	4, 4, 6, 8, 10, 14, 20, 28,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ar7240_mdio_div_table[] = {</div><div class='add'>+	2, 2, 4, 6, 8, 12, 18, 26, 32, 40, 48, 56, 62, 70, 78, 96,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ar933x_mdio_div_table[] = {</div><div class='add'>+	4, 4, 6, 8, 10, 14, 20, 28, 34, 42, 50, 58, 66, 74, 82, 98,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ag71xx_mdio_get_divider(struct ag71xx *ag, u32 *div)</div><div class='add'>+{</div><div class='add'>+	unsigned long ref_clock;</div><div class='add'>+	const u32 *table;</div><div class='add'>+	int ndivs, i;</div><div class='add'>+</div><div class='add'>+	ref_clock = clk_get_rate(ag-&gt;clk_mdio);</div><div class='add'>+	if (!ref_clock)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ag71xx_is(ag, AR9330) || ag71xx_is(ag, AR9340)) {</div><div class='add'>+		table = ar933x_mdio_div_table;</div><div class='add'>+		ndivs = ARRAY_SIZE(ar933x_mdio_div_table);</div><div class='add'>+	} else if (ag71xx_is(ag, AR7240)) {</div><div class='add'>+		table = ar7240_mdio_div_table;</div><div class='add'>+		ndivs = ARRAY_SIZE(ar7240_mdio_div_table);</div><div class='add'>+	} else {</div><div class='add'>+		table = ar71xx_mdio_div_table;</div><div class='add'>+		ndivs = ARRAY_SIZE(ar71xx_mdio_div_table);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ndivs; i++) {</div><div class='add'>+		unsigned long t;</div><div class='add'>+</div><div class='add'>+		t = ref_clock / table[i];</div><div class='add'>+		if (t &lt;= AG71XX_MDIO_MAX_CLK) {</div><div class='add'>+			*div = i;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_mdio_reset(struct mii_bus *bus)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = bus-&gt;priv;</div><div class='add'>+	int err;</div><div class='add'>+	u32 t;</div><div class='add'>+</div><div class='add'>+	err = ag71xx_mdio_get_divider(ag, &amp;t);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_CFG, t | MII_CFG_RESET);</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_CFG, t);</div><div class='add'>+	usleep_range(100, 200);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_mdio_probe(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;ag-&gt;pdev-&gt;dev;</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	struct reset_control *mdio_reset;</div><div class='add'>+	static struct mii_bus *mii_bus;</div><div class='add'>+	struct device_node *np, *mnp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	np = dev-&gt;of_node;</div><div class='add'>+</div><div class='add'>+	ag-&gt;clk_mdio = devm_clk_get_enabled(dev, "mdio");</div><div class='add'>+	if (IS_ERR(ag-&gt;clk_mdio)) {</div><div class='add'>+		netif_err(ag, probe, ndev, "Failed to get mdio clk.\n");</div><div class='add'>+		return PTR_ERR(ag-&gt;clk_mdio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mii_bus = devm_mdiobus_alloc(dev);</div><div class='add'>+	if (!mii_bus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mdio_reset = devm_reset_control_get_exclusive(dev, "mdio");</div><div class='add'>+	if (IS_ERR(mdio_reset)) {</div><div class='add'>+		netif_err(ag, probe, ndev, "Failed to get reset mdio.\n");</div><div class='add'>+		return PTR_ERR(mdio_reset);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mii_bus-&gt;name = "ag71xx_mdio";</div><div class='add'>+	mii_bus-&gt;read = ag71xx_mdio_mii_read;</div><div class='add'>+	mii_bus-&gt;write = ag71xx_mdio_mii_write;</div><div class='add'>+	mii_bus-&gt;reset = ag71xx_mdio_reset;</div><div class='add'>+	mii_bus-&gt;priv = ag;</div><div class='add'>+	mii_bus-&gt;parent = dev;</div><div class='add'>+	snprintf(mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s.%d", np-&gt;name, ag-&gt;mac_idx);</div><div class='add'>+</div><div class='add'>+	reset_control_assert(mdio_reset);</div><div class='add'>+	msleep(100);</div><div class='add'>+	reset_control_deassert(mdio_reset);</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	mnp = of_get_child_by_name(np, "mdio");</div><div class='add'>+	err = devm_of_mdiobus_register(dev, mii_bus, mnp);</div><div class='add'>+	of_node_put(mnp);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_hw_stop(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	/* disable all interrupts and stop the rx/tx engine */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ag71xx_check_dma_stuck(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	unsigned long timestamp;</div><div class='add'>+	u32 rx_sm, tx_sm, rx_fd;</div><div class='add'>+</div><div class='add'>+	timestamp = READ_ONCE(netdev_get_tx_queue(ag-&gt;ndev, 0)-&gt;trans_start);</div><div class='add'>+	if (likely(time_before(jiffies, timestamp + HZ / 10)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!netif_carrier_ok(ag-&gt;ndev))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	rx_sm = ag71xx_rr(ag, AG71XX_REG_RX_SM);</div><div class='add'>+	if ((rx_sm &amp; 0x7) == 0x3 &amp;&amp; ((rx_sm &gt;&gt; 4) &amp; 0x7) == 0x6)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	tx_sm = ag71xx_rr(ag, AG71XX_REG_TX_SM);</div><div class='add'>+	rx_fd = ag71xx_rr(ag, AG71XX_REG_FIFO_DEPTH);</div><div class='add'>+	if (((tx_sm &gt;&gt; 4) &amp; 0x7) == 0 &amp;&amp; ((rx_sm &amp; 0x7) == 0) &amp;&amp;</div><div class='add'>+	    ((rx_sm &gt;&gt; 4) &amp; 0x7) == 0 &amp;&amp; rx_fd == 0)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_tx_packets(struct ag71xx *ag, bool flush, int budget)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;tx_ring;</div><div class='add'>+	int sent = 0, bytes_compl = 0, n = 0;</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	int ring_mask, ring_size;</div><div class='add'>+	bool dma_stuck = false;</div><div class='add'>+</div><div class='add'>+	ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	ring_size = BIT(ring-&gt;order);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, tx_queued, ndev, "processing TX ring\n");</div><div class='add'>+</div><div class='add'>+	while (ring-&gt;dirty + n != ring-&gt;curr) {</div><div class='add'>+		struct ag71xx_desc *desc;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		i = (ring-&gt;dirty + n) &amp; ring_mask;</div><div class='add'>+		desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+		skb = ring-&gt;buf[i].tx.skb;</div><div class='add'>+</div><div class='add'>+		if (!flush &amp;&amp; !ag71xx_desc_empty(desc)) {</div><div class='add'>+			if (ag-&gt;dcfg-&gt;tx_hang_workaround &amp;&amp;</div><div class='add'>+			    ag71xx_check_dma_stuck(ag)) {</div><div class='add'>+				schedule_delayed_work(&amp;ag-&gt;restart_work,</div><div class='add'>+						      HZ / 2);</div><div class='add'>+				dma_stuck = true;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (flush)</div><div class='add'>+			desc-&gt;ctrl |= DESC_EMPTY;</div><div class='add'>+</div><div class='add'>+		n++;</div><div class='add'>+		if (!skb)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		napi_consume_skb(skb, budget);</div><div class='add'>+		ring-&gt;buf[i].tx.skb = NULL;</div><div class='add'>+</div><div class='add'>+		bytes_compl += ring-&gt;buf[i].tx.len;</div><div class='add'>+</div><div class='add'>+		sent++;</div><div class='add'>+		ring-&gt;dirty += n;</div><div class='add'>+</div><div class='add'>+		while (n &gt; 0) {</div><div class='add'>+			ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);</div><div class='add'>+			n--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, tx_done, ndev, "%d packets sent out\n", sent);</div><div class='add'>+</div><div class='add'>+	if (!sent)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ag-&gt;ndev-&gt;stats.tx_bytes += bytes_compl;</div><div class='add'>+	ag-&gt;ndev-&gt;stats.tx_packets += sent;</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(ag-&gt;ndev, sent, bytes_compl);</div><div class='add'>+	if ((ring-&gt;curr - ring-&gt;dirty) &lt; (ring_size * 3) / 4)</div><div class='add'>+		netif_wake_queue(ag-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	if (!dma_stuck)</div><div class='add'>+		cancel_delayed_work(&amp;ag-&gt;restart_work);</div><div class='add'>+</div><div class='add'>+	return sent;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_dma_wait_stop(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; AG71XX_DMA_RETRY; i++) {</div><div class='add'>+		u32 rx, tx;</div><div class='add'>+</div><div class='add'>+		mdelay(AG71XX_DMA_DELAY);</div><div class='add'>+</div><div class='add'>+		rx = ag71xx_rr(ag, AG71XX_REG_RX_CTRL) &amp; RX_CTRL_RXE;</div><div class='add'>+		tx = ag71xx_rr(ag, AG71XX_REG_TX_CTRL) &amp; TX_CTRL_TXE;</div><div class='add'>+		if (!rx &amp;&amp; !tx)</div><div class='add'>+			return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_err(ag, hw, ndev, "DMA stop operation timed out\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_dma_reset(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* stop RX and TX */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);</div><div class='add'>+</div><div class='add'>+	/* give the hardware some time to really stop all rx/tx activity</div><div class='add'>+	 * clearing the descriptors too early causes random memory corruption</div><div class='add'>+	 */</div><div class='add'>+	ag71xx_dma_wait_stop(ag);</div><div class='add'>+</div><div class='add'>+	/* clear descriptor addresses */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag-&gt;stop_desc_dma);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag-&gt;stop_desc_dma);</div><div class='add'>+</div><div class='add'>+	/* clear pending RX/TX interrupts */</div><div class='add'>+	for (i = 0; i &lt; 256; i++) {</div><div class='add'>+		ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);</div><div class='add'>+		ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* clear pending errors */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE | RX_STATUS_OF);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE | TX_STATUS_UR);</div><div class='add'>+</div><div class='add'>+	val = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);</div><div class='add'>+	if (val)</div><div class='add'>+		netif_err(ag, hw, ndev, "unable to clear DMA Rx status: %08x\n",</div><div class='add'>+			  val);</div><div class='add'>+</div><div class='add'>+	val = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);</div><div class='add'>+</div><div class='add'>+	/* mask out reserved bits */</div><div class='add'>+	val &amp;= ~0xff000000;</div><div class='add'>+</div><div class='add'>+	if (val)</div><div class='add'>+		netif_err(ag, hw, ndev, "unable to clear DMA Tx status: %08x\n",</div><div class='add'>+			  val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_hw_setup(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	u32 init = MAC_CFG1_INIT;</div><div class='add'>+</div><div class='add'>+	/* setup MAC configuration registers */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, init);</div><div class='add'>+</div><div class='add'>+	ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,</div><div class='add'>+		  MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);</div><div class='add'>+</div><div class='add'>+	/* setup max frame length to zero */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL, 0);</div><div class='add'>+</div><div class='add'>+	/* setup FIFO configuration registers */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, ag-&gt;fifodata[0]);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, ag-&gt;fifodata[1]);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int ag71xx_max_frame_len(unsigned int mtu)</div><div class='add'>+{</div><div class='add'>+	return ETH_HLEN + VLAN_HLEN + mtu + ETH_FCS_LEN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_hw_set_macaddr(struct ag71xx *ag, const unsigned char *mac)</div><div class='add'>+{</div><div class='add'>+	u32 t;</div><div class='add'>+</div><div class='add'>+	t = (((u32)mac[5]) &lt;&lt; 24) | (((u32)mac[4]) &lt;&lt; 16)</div><div class='add'>+	  | (((u32)mac[3]) &lt;&lt; 8) | ((u32)mac[2]);</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);</div><div class='add'>+</div><div class='add'>+	t = (((u32)mac[1]) &lt;&lt; 24) | (((u32)mac[0]) &lt;&lt; 16);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_fast_reset(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = ag-&gt;ndev;</div><div class='add'>+	u32 rx_ds;</div><div class='add'>+	u32 mii_reg;</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_stop(ag);</div><div class='add'>+</div><div class='add'>+	mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);</div><div class='add'>+	rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);</div><div class='add'>+</div><div class='add'>+	ag71xx_tx_packets(ag, true, 0);</div><div class='add'>+</div><div class='add'>+	reset_control_assert(ag-&gt;mac_reset);</div><div class='add'>+	usleep_range(10, 20);</div><div class='add'>+	reset_control_deassert(ag-&gt;mac_reset);</div><div class='add'>+	usleep_range(10, 20);</div><div class='add'>+</div><div class='add'>+	ag71xx_dma_reset(ag);</div><div class='add'>+	ag71xx_hw_setup(ag);</div><div class='add'>+	ag-&gt;tx_ring.curr = 0;</div><div class='add'>+	ag-&gt;tx_ring.dirty = 0;</div><div class='add'>+	netdev_reset_queue(ag-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	/* setup max frame length */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL,</div><div class='add'>+		  ag71xx_max_frame_len(ag-&gt;ndev-&gt;mtu));</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_DESC, rx_ds);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag-&gt;tx_ring.descs_dma);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MII_CFG, mii_reg);</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_set_macaddr(ag, dev-&gt;dev_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_hw_start(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	/* start RX engine */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);</div><div class='add'>+</div><div class='add'>+	/* enable interrupts */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, AG71XX_INT_INIT);</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(ag-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			      const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(to_net_dev(config-&gt;dev));</div><div class='add'>+</div><div class='add'>+	if (phylink_autoneg_inband(mode))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!ag71xx_is(ag, AR7100) &amp;&amp; !ag71xx_is(ag, AR9130))</div><div class='add'>+		ag71xx_fast_reset(ag);</div><div class='add'>+</div><div class='add'>+	if (ag-&gt;tx_ring.desc_split) {</div><div class='add'>+		ag-&gt;fifodata[2] &amp;= 0xffff;</div><div class='add'>+		ag-&gt;fifodata[2] |= ((2048 - ag-&gt;tx_ring.desc_split) / 4) &lt;&lt; 16;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, ag-&gt;fifodata[2]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_mac_link_down(struct phylink_config *config,</div><div class='add'>+				 unsigned int mode, phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(to_net_dev(config-&gt;dev));</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_stop(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_mac_link_up(struct phylink_config *config,</div><div class='add'>+			       struct phy_device *phy,</div><div class='add'>+			       unsigned int mode, phy_interface_t interface,</div><div class='add'>+			       int speed, int duplex,</div><div class='add'>+			       bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(to_net_dev(config-&gt;dev));</div><div class='add'>+	u32 cfg1, cfg2;</div><div class='add'>+	u32 ifctl;</div><div class='add'>+	u32 fifo5;</div><div class='add'>+</div><div class='add'>+	cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);</div><div class='add'>+	cfg2 &amp;= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);</div><div class='add'>+	cfg2 |= duplex ? MAC_CFG2_FDX : 0;</div><div class='add'>+</div><div class='add'>+	ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);</div><div class='add'>+	ifctl &amp;= ~(MAC_IFCTL_SPEED);</div><div class='add'>+</div><div class='add'>+	fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);</div><div class='add'>+	fifo5 &amp;= ~FIFO_CFG5_BM;</div><div class='add'>+</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		cfg2 |= MAC_CFG2_IF_1000;</div><div class='add'>+		fifo5 |= FIFO_CFG5_BM;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		cfg2 |= MAC_CFG2_IF_10_100;</div><div class='add'>+		ifctl |= MAC_IFCTL_SPEED;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		cfg2 |= MAC_CFG2_IF_10_100;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);</div><div class='add'>+</div><div class='add'>+	cfg1 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG1);</div><div class='add'>+	cfg1 &amp;= ~(MAC_CFG1_TFC | MAC_CFG1_RFC);</div><div class='add'>+	if (tx_pause)</div><div class='add'>+		cfg1 |= MAC_CFG1_TFC;</div><div class='add'>+</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		cfg1 |= MAC_CFG1_RFC;</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, cfg1);</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_start(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops ag71xx_phylink_mac_ops = {</div><div class='add'>+	.mac_config = ag71xx_mac_config,</div><div class='add'>+	.mac_link_down = ag71xx_mac_link_down,</div><div class='add'>+	.mac_link_up = ag71xx_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ag71xx_phylink_setup(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct phylink *phylink;</div><div class='add'>+</div><div class='add'>+	ag-&gt;phylink_config.dev = &amp;ag-&gt;ndev-&gt;dev;</div><div class='add'>+	ag-&gt;phylink_config.type = PHYLINK_NETDEV;</div><div class='add'>+	ag-&gt;phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100 | MAC_1000FD;</div><div class='add'>+</div><div class='add'>+	if ((ag71xx_is(ag, AR9330) &amp;&amp; ag-&gt;mac_idx == 0) ||</div><div class='add'>+	    ag71xx_is(ag, AR9340) ||</div><div class='add'>+	    ag71xx_is(ag, QCA9530) ||</div><div class='add'>+	    (ag71xx_is(ag, QCA9550) &amp;&amp; ag-&gt;mac_idx == 1))</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_MII,</div><div class='add'>+			  ag-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if ((ag71xx_is(ag, AR9330) &amp;&amp; ag-&gt;mac_idx == 1) ||</div><div class='add'>+	    (ag71xx_is(ag, AR9340) &amp;&amp; ag-&gt;mac_idx == 1) ||</div><div class='add'>+	    (ag71xx_is(ag, QCA9530) &amp;&amp; ag-&gt;mac_idx == 1))</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  ag-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if (ag71xx_is(ag, QCA9550) &amp;&amp; ag-&gt;mac_idx == 0)</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+			  ag-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if (ag71xx_is(ag, AR9340) &amp;&amp; ag-&gt;mac_idx == 0)</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+			  ag-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	if ((ag71xx_is(ag, AR9340) &amp;&amp; ag-&gt;mac_idx == 0) ||</div><div class='add'>+	    (ag71xx_is(ag, QCA9550) &amp;&amp; ag-&gt;mac_idx == 1))</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_RGMII,</div><div class='add'>+			  ag-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	phylink = phylink_create(&amp;ag-&gt;phylink_config, ag-&gt;pdev-&gt;dev.fwnode,</div><div class='add'>+				 ag-&gt;phy_if_mode, &amp;ag71xx_phylink_mac_ops);</div><div class='add'>+	if (IS_ERR(phylink))</div><div class='add'>+		return PTR_ERR(phylink);</div><div class='add'>+</div><div class='add'>+	ag-&gt;phylink = phylink;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_ring_tx_clean(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;tx_ring;</div><div class='add'>+	int ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	u32 bytes_compl = 0, pkts_compl = 0;</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	while (ring-&gt;curr != ring-&gt;dirty) {</div><div class='add'>+		struct ag71xx_desc *desc;</div><div class='add'>+		u32 i = ring-&gt;dirty &amp; ring_mask;</div><div class='add'>+</div><div class='add'>+		desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+		if (!ag71xx_desc_empty(desc)) {</div><div class='add'>+			desc-&gt;ctrl = 0;</div><div class='add'>+			ndev-&gt;stats.tx_errors++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (ring-&gt;buf[i].tx.skb) {</div><div class='add'>+			bytes_compl += ring-&gt;buf[i].tx.len;</div><div class='add'>+			pkts_compl++;</div><div class='add'>+			dev_kfree_skb_any(ring-&gt;buf[i].tx.skb);</div><div class='add'>+		}</div><div class='add'>+		ring-&gt;buf[i].tx.skb = NULL;</div><div class='add'>+		ring-&gt;dirty++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flush descriptors */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(ndev, pkts_compl, bytes_compl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_ring_tx_init(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;tx_ring;</div><div class='add'>+	int ring_size = BIT(ring-&gt;order);</div><div class='add'>+	int ring_mask = ring_size - 1;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring_size; i++) {</div><div class='add'>+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+</div><div class='add'>+		desc-&gt;next = (u32)(ring-&gt;descs_dma +</div><div class='add'>+			AG71XX_DESC_SIZE * ((i + 1) &amp; ring_mask));</div><div class='add'>+</div><div class='add'>+		desc-&gt;ctrl = DESC_EMPTY;</div><div class='add'>+		ring-&gt;buf[i].tx.skb = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flush descriptors */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	ring-&gt;curr = 0;</div><div class='add'>+	ring-&gt;dirty = 0;</div><div class='add'>+	netdev_reset_queue(ag-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_ring_rx_clean(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;rx_ring;</div><div class='add'>+	int ring_size = BIT(ring-&gt;order);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!ring-&gt;buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring_size; i++)</div><div class='add'>+		if (ring-&gt;buf[i].rx.rx_buf) {</div><div class='add'>+			dma_unmap_single(&amp;ag-&gt;pdev-&gt;dev,</div><div class='add'>+					 ring-&gt;buf[i].rx.dma_addr,</div><div class='add'>+					 ag-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='add'>+			skb_free_frag(ring-&gt;buf[i].rx.rx_buf);</div><div class='add'>+		}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_buffer_size(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	return ag-&gt;rx_buf_size +</div><div class='add'>+	       SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,</div><div class='add'>+			       int offset,</div><div class='add'>+			       void *(*alloc)(unsigned int size))</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;rx_ring;</div><div class='add'>+	struct ag71xx_desc *desc;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	desc = ag71xx_ring_desc(ring, buf - &amp;ring-&gt;buf[0]);</div><div class='add'>+</div><div class='add'>+	data = alloc(ag71xx_buffer_size(ag));</div><div class='add'>+	if (!data)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	buf-&gt;rx.rx_buf = data;</div><div class='add'>+	buf-&gt;rx.dma_addr = dma_map_single(&amp;ag-&gt;pdev-&gt;dev, data, ag-&gt;rx_buf_size,</div><div class='add'>+					  DMA_FROM_DEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;ag-&gt;pdev-&gt;dev, buf-&gt;rx.dma_addr)) {</div><div class='add'>+		skb_free_frag(data);</div><div class='add'>+		buf-&gt;rx.rx_buf = NULL;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	desc-&gt;data = (u32)buf-&gt;rx.dma_addr + offset;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_ring_rx_init(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;rx_ring;</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	int ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	int ring_size = BIT(ring-&gt;order);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = 0;</div><div class='add'>+	for (i = 0; i &lt; ring_size; i++) {</div><div class='add'>+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+</div><div class='add'>+		desc-&gt;next = (u32)(ring-&gt;descs_dma +</div><div class='add'>+			AG71XX_DESC_SIZE * ((i + 1) &amp; ring_mask));</div><div class='add'>+</div><div class='add'>+		netif_dbg(ag, rx_status, ndev, "RX desc at %p, next is %08x\n",</div><div class='add'>+			  desc, desc-&gt;next);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ring_size; i++) {</div><div class='add'>+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+</div><div class='add'>+		if (!ag71xx_fill_rx_buf(ag, &amp;ring-&gt;buf[i], ag-&gt;rx_buf_offset,</div><div class='add'>+					netdev_alloc_frag)) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc-&gt;ctrl = DESC_EMPTY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flush descriptors */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	ring-&gt;curr = 0;</div><div class='add'>+	ring-&gt;dirty = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_ring_rx_refill(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *ring = &amp;ag-&gt;rx_ring;</div><div class='add'>+	int ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	int offset = ag-&gt;rx_buf_offset;</div><div class='add'>+	unsigned int count;</div><div class='add'>+</div><div class='add'>+	count = 0;</div><div class='add'>+	for (; ring-&gt;curr - ring-&gt;dirty &gt; 0; ring-&gt;dirty++) {</div><div class='add'>+		struct ag71xx_desc *desc;</div><div class='add'>+		unsigned int i;</div><div class='add'>+</div><div class='add'>+		i = ring-&gt;dirty &amp; ring_mask;</div><div class='add'>+		desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+</div><div class='add'>+		if (!ring-&gt;buf[i].rx.rx_buf &amp;&amp;</div><div class='add'>+		    !ag71xx_fill_rx_buf(ag, &amp;ring-&gt;buf[i], offset,</div><div class='add'>+					napi_alloc_frag))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		desc-&gt;ctrl = DESC_EMPTY;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* flush descriptors */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, rx_status, ag-&gt;ndev, "%u rx descriptors refilled\n",</div><div class='add'>+		  count);</div><div class='add'>+</div><div class='add'>+	return count;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_rings_init(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *tx = &amp;ag-&gt;tx_ring;</div><div class='add'>+	struct ag71xx_ring *rx = &amp;ag-&gt;rx_ring;</div><div class='add'>+	int ring_size, tx_size;</div><div class='add'>+</div><div class='add'>+	ring_size = BIT(tx-&gt;order) + BIT(rx-&gt;order);</div><div class='add'>+	tx_size = BIT(tx-&gt;order);</div><div class='add'>+</div><div class='add'>+	tx-&gt;buf = kcalloc(ring_size, sizeof(*tx-&gt;buf), GFP_KERNEL);</div><div class='add'>+	if (!tx-&gt;buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tx-&gt;descs_cpu = dma_alloc_coherent(&amp;ag-&gt;pdev-&gt;dev,</div><div class='add'>+					   ring_size * AG71XX_DESC_SIZE,</div><div class='add'>+					   &amp;tx-&gt;descs_dma, GFP_KERNEL);</div><div class='add'>+	if (!tx-&gt;descs_cpu) {</div><div class='add'>+		kfree(tx-&gt;buf);</div><div class='add'>+		tx-&gt;buf = NULL;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx-&gt;buf = &amp;tx-&gt;buf[tx_size];</div><div class='add'>+	rx-&gt;descs_cpu = ((void *)tx-&gt;descs_cpu) + tx_size * AG71XX_DESC_SIZE;</div><div class='add'>+	rx-&gt;descs_dma = tx-&gt;descs_dma + tx_size * AG71XX_DESC_SIZE;</div><div class='add'>+</div><div class='add'>+	ag71xx_ring_tx_init(ag);</div><div class='add'>+	return ag71xx_ring_rx_init(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_rings_free(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx_ring *tx = &amp;ag-&gt;tx_ring;</div><div class='add'>+	struct ag71xx_ring *rx = &amp;ag-&gt;rx_ring;</div><div class='add'>+	int ring_size;</div><div class='add'>+</div><div class='add'>+	ring_size = BIT(tx-&gt;order) + BIT(rx-&gt;order);</div><div class='add'>+</div><div class='add'>+	if (tx-&gt;descs_cpu)</div><div class='add'>+		dma_free_coherent(&amp;ag-&gt;pdev-&gt;dev, ring_size * AG71XX_DESC_SIZE,</div><div class='add'>+				  tx-&gt;descs_cpu, tx-&gt;descs_dma);</div><div class='add'>+</div><div class='add'>+	kfree(tx-&gt;buf);</div><div class='add'>+</div><div class='add'>+	tx-&gt;descs_cpu = NULL;</div><div class='add'>+	rx-&gt;descs_cpu = NULL;</div><div class='add'>+	tx-&gt;buf = NULL;</div><div class='add'>+	rx-&gt;buf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_rings_cleanup(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	ag71xx_ring_rx_clean(ag);</div><div class='add'>+	ag71xx_ring_tx_clean(ag);</div><div class='add'>+	ag71xx_rings_free(ag);</div><div class='add'>+</div><div class='add'>+	netdev_reset_queue(ag-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_hw_init(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	ag71xx_hw_stop(ag);</div><div class='add'>+</div><div class='add'>+	ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);</div><div class='add'>+	usleep_range(20, 30);</div><div class='add'>+</div><div class='add'>+	reset_control_assert(ag-&gt;mac_reset);</div><div class='add'>+	msleep(100);</div><div class='add'>+	reset_control_deassert(ag-&gt;mac_reset);</div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_setup(ag);</div><div class='add'>+</div><div class='add'>+	ag71xx_dma_reset(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_hw_enable(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = ag71xx_rings_init(ag);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	napi_enable(&amp;ag-&gt;napi);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag-&gt;tx_ring.descs_dma);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag-&gt;rx_ring.descs_dma);</div><div class='add'>+	netif_start_queue(ag-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_hw_disable(struct ag71xx *ag)</div><div class='add'>+{</div><div class='add'>+	netif_stop_queue(ag-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_stop(ag);</div><div class='add'>+	ag71xx_dma_reset(ag);</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;ag-&gt;napi);</div><div class='add'>+	timer_delete_sync(&amp;ag-&gt;oom_timer);</div><div class='add'>+</div><div class='add'>+	ag71xx_rings_cleanup(ag);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+	unsigned int max_frame_len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = phylink_of_phy_connect(ag-&gt;phylink, ag-&gt;pdev-&gt;dev.of_node, 0);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netif_err(ag, link, ndev, "phylink_of_phy_connect filed with err: %i\n",</div><div class='add'>+			  ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	max_frame_len = ag71xx_max_frame_len(ndev-&gt;mtu);</div><div class='add'>+	ag-&gt;rx_buf_size =</div><div class='add'>+		SKB_DATA_ALIGN(max_frame_len + NET_SKB_PAD + NET_IP_ALIGN);</div><div class='add'>+</div><div class='add'>+	/* setup max frame length */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL, max_frame_len);</div><div class='add'>+	ag71xx_hw_set_macaddr(ag, ndev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	ret = ag71xx_hw_enable(ag);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	phylink_start(ag-&gt;phylink);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	ag71xx_rings_cleanup(ag);</div><div class='add'>+	phylink_disconnect_phy(ag-&gt;phylink);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	phylink_stop(ag-&gt;phylink);</div><div class='add'>+	phylink_disconnect_phy(ag-&gt;phylink);</div><div class='add'>+	ag71xx_hw_disable(ag);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_fill_dma_desc(struct ag71xx_ring *ring, u32 addr, int len)</div><div class='add'>+{</div><div class='add'>+	int i, ring_mask, ndesc, split;</div><div class='add'>+	struct ag71xx_desc *desc;</div><div class='add'>+</div><div class='add'>+	ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	ndesc = 0;</div><div class='add'>+	split = ring-&gt;desc_split;</div><div class='add'>+</div><div class='add'>+	if (!split)</div><div class='add'>+		split = len;</div><div class='add'>+</div><div class='add'>+	while (len &gt; 0) {</div><div class='add'>+		unsigned int cur_len = len;</div><div class='add'>+</div><div class='add'>+		i = (ring-&gt;curr + ndesc) &amp; ring_mask;</div><div class='add'>+		desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+</div><div class='add'>+		if (!ag71xx_desc_empty(desc))</div><div class='add'>+			return -1;</div><div class='add'>+</div><div class='add'>+		if (cur_len &gt; split) {</div><div class='add'>+			cur_len = split;</div><div class='add'>+</div><div class='add'>+			/*  TX will hang if DMA transfers &lt;= 4 bytes,</div><div class='add'>+			 * make sure next segment is more than 4 bytes long.</div><div class='add'>+			 */</div><div class='add'>+			if (len &lt;= split + 4)</div><div class='add'>+				cur_len -= 4;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc-&gt;data = addr;</div><div class='add'>+		addr += cur_len;</div><div class='add'>+		len -= cur_len;</div><div class='add'>+</div><div class='add'>+		if (len &gt; 0)</div><div class='add'>+			cur_len |= DESC_MORE;</div><div class='add'>+</div><div class='add'>+		/* prevent early tx attempt of this descriptor */</div><div class='add'>+		if (!ndesc)</div><div class='add'>+			cur_len |= DESC_EMPTY;</div><div class='add'>+</div><div class='add'>+		desc-&gt;ctrl = cur_len;</div><div class='add'>+		ndesc++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ndesc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,</div><div class='add'>+					  struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	int i, n, ring_min, ring_mask, ring_size;</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+	struct ag71xx_ring *ring;</div><div class='add'>+	struct ag71xx_desc *desc;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	ring = &amp;ag-&gt;tx_ring;</div><div class='add'>+	ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	ring_size = BIT(ring-&gt;order);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;len &lt;= 4) {</div><div class='add'>+		netif_dbg(ag, tx_err, ndev, "packet len is too small\n");</div><div class='add'>+		goto err_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_addr = dma_map_single(&amp;ag-&gt;pdev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				  DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;ag-&gt;pdev-&gt;dev, dma_addr)) {</div><div class='add'>+		netif_dbg(ag, tx_err, ndev, "DMA mapping error\n");</div><div class='add'>+		goto err_drop;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = ring-&gt;curr &amp; ring_mask;</div><div class='add'>+	desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+</div><div class='add'>+	/* setup descriptor fields */</div><div class='add'>+	n = ag71xx_fill_dma_desc(ring, (u32)dma_addr,</div><div class='add'>+				 skb-&gt;len &amp; ag-&gt;dcfg-&gt;desc_pktlen_mask);</div><div class='add'>+	if (n &lt; 0)</div><div class='add'>+		goto err_drop_unmap;</div><div class='add'>+</div><div class='add'>+	i = (ring-&gt;curr + n - 1) &amp; ring_mask;</div><div class='add'>+	ring-&gt;buf[i].tx.len = skb-&gt;len;</div><div class='add'>+	ring-&gt;buf[i].tx.skb = skb;</div><div class='add'>+</div><div class='add'>+	netdev_sent_queue(ndev, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+	desc-&gt;ctrl &amp;= ~DESC_EMPTY;</div><div class='add'>+	ring-&gt;curr += n;</div><div class='add'>+</div><div class='add'>+	/* flush descriptor */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	ring_min = 2;</div><div class='add'>+	if (ring-&gt;desc_split)</div><div class='add'>+		ring_min *= AG71XX_TX_RING_DS_PER_PKT;</div><div class='add'>+</div><div class='add'>+	if (ring-&gt;curr - ring-&gt;dirty &gt;= ring_size - ring_min) {</div><div class='add'>+		netif_dbg(ag, tx_err, ndev, "tx queue full\n");</div><div class='add'>+		netif_stop_queue(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, tx_queued, ndev, "packet injected into TX queue\n");</div><div class='add'>+</div><div class='add'>+	/* enable TX engine */</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+err_drop_unmap:</div><div class='add'>+	dma_unmap_single(&amp;ag-&gt;pdev-&gt;dev, dma_addr, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+err_drop:</div><div class='add'>+	ndev-&gt;stats.tx_dropped++;</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_oom_timer_handler(struct timer_list *t)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = timer_container_of(ag, t, oom_timer);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;ag-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_tx_timeout(struct net_device *ndev, unsigned int txqueue)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	netif_err(ag, tx_err, ndev, "tx timeout\n");</div><div class='add'>+</div><div class='add'>+	schedule_delayed_work(&amp;ag-&gt;restart_work, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ag71xx_restart_work_func(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = container_of(work, struct ag71xx,</div><div class='add'>+					 restart_work.work);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	ag71xx_hw_disable(ag);</div><div class='add'>+	ag71xx_hw_enable(ag);</div><div class='add'>+</div><div class='add'>+	phylink_stop(ag-&gt;phylink);</div><div class='add'>+	phylink_start(ag-&gt;phylink);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_rx_packets(struct ag71xx *ag, int limit)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	int ring_mask, ring_size, done = 0;</div><div class='add'>+	unsigned int pktlen_mask, offset;</div><div class='add'>+	struct ag71xx_ring *ring;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	LIST_HEAD(rx_list);</div><div class='add'>+</div><div class='add'>+	ring = &amp;ag-&gt;rx_ring;</div><div class='add'>+	pktlen_mask = ag-&gt;dcfg-&gt;desc_pktlen_mask;</div><div class='add'>+	offset = ag-&gt;rx_buf_offset;</div><div class='add'>+	ring_mask = BIT(ring-&gt;order) - 1;</div><div class='add'>+	ring_size = BIT(ring-&gt;order);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, rx_status, ndev, "rx packets, limit=%d, curr=%u, dirty=%u\n",</div><div class='add'>+		  limit, ring-&gt;curr, ring-&gt;dirty);</div><div class='add'>+</div><div class='add'>+	while (done &lt; limit) {</div><div class='add'>+		unsigned int i = ring-&gt;curr &amp; ring_mask;</div><div class='add'>+		struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);</div><div class='add'>+		int pktlen;</div><div class='add'>+</div><div class='add'>+		if (ag71xx_desc_empty(desc))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if ((ring-&gt;dirty + ring_size) == ring-&gt;curr) {</div><div class='add'>+			WARN_ONCE(1, "RX out of ring");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);</div><div class='add'>+</div><div class='add'>+		pktlen = desc-&gt;ctrl &amp; pktlen_mask;</div><div class='add'>+		pktlen -= ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(&amp;ag-&gt;pdev-&gt;dev, ring-&gt;buf[i].rx.dma_addr,</div><div class='add'>+				 ag-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		ndev-&gt;stats.rx_packets++;</div><div class='add'>+		ndev-&gt;stats.rx_bytes += pktlen;</div><div class='add'>+</div><div class='add'>+		skb = napi_build_skb(ring-&gt;buf[i].rx.rx_buf, ag71xx_buffer_size(ag));</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ndev-&gt;stats.rx_errors++;</div><div class='add'>+			skb_free_frag(ring-&gt;buf[i].rx.rx_buf);</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_reserve(skb, offset);</div><div class='add'>+		skb_put(skb, pktlen);</div><div class='add'>+</div><div class='add'>+		skb-&gt;dev = ndev;</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_NONE;</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, ndev);</div><div class='add'>+		list_add_tail(&amp;skb-&gt;list, &amp;rx_list);</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+		ring-&gt;buf[i].rx.rx_buf = NULL;</div><div class='add'>+		done++;</div><div class='add'>+</div><div class='add'>+		ring-&gt;curr++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ag71xx_ring_rx_refill(ag);</div><div class='add'>+</div><div class='add'>+	netif_receive_skb_list(&amp;rx_list);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, rx_status, ndev, "rx finish, curr=%u, dirty=%u, done=%d\n",</div><div class='add'>+		  ring-&gt;curr, ring-&gt;dirty, done);</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_poll(struct napi_struct *napi, int limit)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = container_of(napi, struct ag71xx, napi);</div><div class='add'>+	struct ag71xx_ring *rx_ring = &amp;ag-&gt;rx_ring;</div><div class='add'>+	int rx_ring_size = BIT(rx_ring-&gt;order);</div><div class='add'>+	struct net_device *ndev = ag-&gt;ndev;</div><div class='add'>+	int tx_done, rx_done;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	tx_done = ag71xx_tx_packets(ag, false, limit);</div><div class='add'>+</div><div class='add'>+	netif_dbg(ag, rx_status, ndev, "processing RX ring\n");</div><div class='add'>+	rx_done = ag71xx_rx_packets(ag, limit);</div><div class='add'>+</div><div class='add'>+	if (!rx_ring-&gt;buf[rx_ring-&gt;dirty % rx_ring_size].rx.rx_buf)</div><div class='add'>+		goto oom;</div><div class='add'>+</div><div class='add'>+	status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);</div><div class='add'>+	if (unlikely(status &amp; RX_STATUS_OF)) {</div><div class='add'>+		ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_OF);</div><div class='add'>+		ndev-&gt;stats.rx_fifo_errors++;</div><div class='add'>+</div><div class='add'>+		/* restart RX */</div><div class='add'>+		ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx_done &lt; limit) {</div><div class='add'>+		if (status &amp; RX_STATUS_PR)</div><div class='add'>+			goto more;</div><div class='add'>+</div><div class='add'>+		status = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);</div><div class='add'>+		if (status &amp; TX_STATUS_PS)</div><div class='add'>+			goto more;</div><div class='add'>+</div><div class='add'>+		netif_dbg(ag, rx_status, ndev, "disable polling mode, rx=%d, tx=%d,limit=%d\n",</div><div class='add'>+			  rx_done, tx_done, limit);</div><div class='add'>+</div><div class='add'>+		napi_complete(napi);</div><div class='add'>+</div><div class='add'>+		/* enable interrupts */</div><div class='add'>+		ag71xx_int_enable(ag, AG71XX_INT_POLL);</div><div class='add'>+		return rx_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+more:</div><div class='add'>+	netif_dbg(ag, rx_status, ndev, "stay in polling mode, rx=%d, tx=%d, limit=%d\n",</div><div class='add'>+		  rx_done, tx_done, limit);</div><div class='add'>+	return limit;</div><div class='add'>+</div><div class='add'>+oom:</div><div class='add'>+	netif_err(ag, rx_err, ndev, "out of memory\n");</div><div class='add'>+</div><div class='add'>+	mod_timer(&amp;ag-&gt;oom_timer, jiffies + AG71XX_OOM_REFILL);</div><div class='add'>+	napi_complete(napi);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = dev_id;</div><div class='add'>+	struct ag71xx *ag;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	ag = netdev_priv(ndev);</div><div class='add'>+	status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!status))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (unlikely(status &amp; AG71XX_INT_ERR)) {</div><div class='add'>+		if (status &amp; AG71XX_INT_TX_BE) {</div><div class='add'>+			ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE);</div><div class='add'>+			netif_err(ag, intr, ndev, "TX BUS error\n");</div><div class='add'>+		}</div><div class='add'>+		if (status &amp; AG71XX_INT_RX_BE) {</div><div class='add'>+			ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE);</div><div class='add'>+			netif_err(ag, intr, ndev, "RX BUS error\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(status &amp; AG71XX_INT_POLL)) {</div><div class='add'>+		ag71xx_int_disable(ag, AG71XX_INT_POLL);</div><div class='add'>+		netif_dbg(ag, intr, ndev, "enable polling mode\n");</div><div class='add'>+		napi_schedule(&amp;ag-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ag71xx_change_mtu(struct net_device *ndev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct ag71xx *ag = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(ndev-&gt;mtu, new_mtu);</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_MFL,</div><div class='add'>+		  ag71xx_max_frame_len(ndev-&gt;mtu));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops ag71xx_netdev_ops = {</div><div class='add'>+	.ndo_open		= ag71xx_open,</div><div class='add'>+	.ndo_stop		= ag71xx_stop,</div><div class='add'>+	.ndo_start_xmit		= ag71xx_hard_start_xmit,</div><div class='add'>+	.ndo_eth_ioctl		= ag71xx_do_ioctl,</div><div class='add'>+	.ndo_tx_timeout		= ag71xx_tx_timeout,</div><div class='add'>+	.ndo_change_mtu		= ag71xx_change_mtu,</div><div class='add'>+	.ndo_set_mac_address	= eth_mac_addr,</div><div class='add'>+	.ndo_validate_addr	= eth_validate_addr,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ar71xx_addr_ar7100[] = {</div><div class='add'>+	0x19000000, 0x1a000000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int ag71xx_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	const struct ag71xx_dcfg *dcfg;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct resource *res;</div><div class='add'>+	struct clk *clk_eth;</div><div class='add'>+	int tx_size, err, i;</div><div class='add'>+	struct ag71xx *ag;</div><div class='add'>+</div><div class='add'>+	if (!np)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	ndev = devm_alloc_etherdev(&amp;pdev-&gt;dev, sizeof(*ag));</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!res)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	dcfg = of_device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!dcfg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ag = netdev_priv(ndev);</div><div class='add'>+	ag-&gt;mac_idx = -1;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(ar71xx_addr_ar7100); i++) {</div><div class='add'>+		if (ar71xx_addr_ar7100[i] == res-&gt;start)</div><div class='add'>+			ag-&gt;mac_idx = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ag-&gt;mac_idx &lt; 0) {</div><div class='add'>+		netif_err(ag, probe, ndev, "unknown mac idx\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_eth = devm_clk_get_enabled(&amp;pdev-&gt;dev, "eth");</div><div class='add'>+	if (IS_ERR(clk_eth))</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(clk_eth),</div><div class='add'>+				     "Failed to get eth clk.");</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	ag-&gt;pdev = pdev;</div><div class='add'>+	ag-&gt;ndev = ndev;</div><div class='add'>+	ag-&gt;dcfg = dcfg;</div><div class='add'>+	ag-&gt;msg_enable = netif_msg_init(-1, AG71XX_DEFAULT_MSG_ENABLE);</div><div class='add'>+	memcpy(ag-&gt;fifodata, dcfg-&gt;fifodata, sizeof(ag-&gt;fifodata));</div><div class='add'>+</div><div class='add'>+	ag-&gt;mac_reset = devm_reset_control_get(&amp;pdev-&gt;dev, "mac");</div><div class='add'>+	if (IS_ERR(ag-&gt;mac_reset))</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(ag-&gt;mac_reset),</div><div class='add'>+				     "missing mac reset");</div><div class='add'>+</div><div class='add'>+	ag-&gt;mac_base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	if (IS_ERR(ag-&gt;mac_base))</div><div class='add'>+		return PTR_ERR(ag-&gt;mac_base);</div><div class='add'>+</div><div class='add'>+	/* ensure that HW is in manual polling mode before interrupts are</div><div class='add'>+	 * activated. Otherwise ag71xx_interrupt might call napi_schedule</div><div class='add'>+	 * before it is initialized by netif_napi_add.</div><div class='add'>+	 */</div><div class='add'>+	ag71xx_int_disable(ag, AG71XX_INT_POLL);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	err = devm_request_irq(&amp;pdev-&gt;dev, ndev-&gt;irq, ag71xx_interrupt,</div><div class='add'>+			       0x0, dev_name(&amp;pdev-&gt;dev), ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netif_err(ag, probe, ndev, "unable to request IRQ %d\n",</div><div class='add'>+			  ndev-&gt;irq);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;ag71xx_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;ag71xx_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	INIT_DELAYED_WORK(&amp;ag-&gt;restart_work, ag71xx_restart_work_func);</div><div class='add'>+	timer_setup(&amp;ag-&gt;oom_timer, ag71xx_oom_timer_handler, 0);</div><div class='add'>+</div><div class='add'>+	tx_size = AG71XX_TX_RING_SIZE_DEFAULT;</div><div class='add'>+	ag-&gt;rx_ring.order = ag71xx_ring_size_order(AG71XX_RX_RING_SIZE_DEFAULT);</div><div class='add'>+</div><div class='add'>+	ndev-&gt;min_mtu = 68;</div><div class='add'>+	ndev-&gt;max_mtu = dcfg-&gt;max_frame_len - ag71xx_max_frame_len(0);</div><div class='add'>+</div><div class='add'>+	ag-&gt;rx_buf_offset = NET_SKB_PAD;</div><div class='add'>+	if (!ag71xx_is(ag, AR7100) &amp;&amp; !ag71xx_is(ag, AR9130))</div><div class='add'>+		ag-&gt;rx_buf_offset += NET_IP_ALIGN;</div><div class='add'>+</div><div class='add'>+	if (ag71xx_is(ag, AR7100)) {</div><div class='add'>+		ag-&gt;tx_ring.desc_split = AG71XX_TX_RING_SPLIT;</div><div class='add'>+		tx_size *= AG71XX_TX_RING_DS_PER_PKT;</div><div class='add'>+	}</div><div class='add'>+	ag-&gt;tx_ring.order = ag71xx_ring_size_order(tx_size);</div><div class='add'>+</div><div class='add'>+	ag-&gt;stop_desc = dmam_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					    sizeof(struct ag71xx_desc),</div><div class='add'>+					    &amp;ag-&gt;stop_desc_dma, GFP_KERNEL);</div><div class='add'>+	if (!ag-&gt;stop_desc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ag-&gt;stop_desc-&gt;data = 0;</div><div class='add'>+	ag-&gt;stop_desc-&gt;ctrl = 0;</div><div class='add'>+	ag-&gt;stop_desc-&gt;next = (u32)ag-&gt;stop_desc_dma;</div><div class='add'>+</div><div class='add'>+	err = of_get_ethdev_address(np, ndev);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='add'>+		return err;</div><div class='add'>+	if (err) {</div><div class='add'>+		netif_err(ag, probe, ndev, "invalid MAC address, using random address\n");</div><div class='add'>+		eth_hw_addr_random(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = of_get_phy_mode(np, &amp;ag-&gt;phy_if_mode);</div><div class='add'>+	if (err) {</div><div class='add'>+		netif_err(ag, probe, ndev, "missing phy-mode property in DT\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;ag-&gt;napi, ag71xx_poll,</div><div class='add'>+			      AG71XX_NAPI_WEIGHT);</div><div class='add'>+</div><div class='add'>+	ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, 0);</div><div class='add'>+</div><div class='add'>+	ag71xx_hw_init(ag);</div><div class='add'>+</div><div class='add'>+	err = ag71xx_mdio_probe(ag);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = ag71xx_phylink_setup(ag);</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, err,</div><div class='add'>+				     "failed to setup phylink");</div><div class='add'>+</div><div class='add'>+	err = devm_register_netdev(&amp;pdev-&gt;dev, ndev);</div><div class='add'>+	if (err) {</div><div class='add'>+		netif_err(ag, probe, ndev, "unable to register net device\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_info(ag, probe, ndev, "Atheros AG71xx at 0x%08lx, irq %d, mode:%s\n",</div><div class='add'>+		   (unsigned long)ag-&gt;mac_base, ndev-&gt;irq,</div><div class='add'>+		   phy_modes(ag-&gt;phy_if_mode));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u32 ar71xx_fifo_ar7100[] = {</div><div class='add'>+	0x0fff0000, 0x00001fff, 0x00780fff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ar71xx_fifo_ar9130[] = {</div><div class='add'>+	0x0fff0000, 0x00001fff, 0x008001ff,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 ar71xx_fifo_ar9330[] = {</div><div class='add'>+	0x0010ffff, 0x015500aa, 0x01f00140,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_ar7100 = {</div><div class='add'>+	.type = AR7100,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar7100,</div><div class='add'>+	.max_frame_len = 1540,</div><div class='add'>+	.desc_pktlen_mask = SZ_4K - 1,</div><div class='add'>+	.tx_hang_workaround = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_ar7240 = {</div><div class='add'>+	.type = AR7240,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar7100,</div><div class='add'>+	.max_frame_len = 1540,</div><div class='add'>+	.desc_pktlen_mask = SZ_4K - 1,</div><div class='add'>+	.tx_hang_workaround = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_ar9130 = {</div><div class='add'>+	.type = AR9130,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar9130,</div><div class='add'>+	.max_frame_len = 1540,</div><div class='add'>+	.desc_pktlen_mask = SZ_4K - 1,</div><div class='add'>+	.tx_hang_workaround = false,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_ar9330 = {</div><div class='add'>+	.type = AR9330,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar9330,</div><div class='add'>+	.max_frame_len = 1540,</div><div class='add'>+	.desc_pktlen_mask = SZ_4K - 1,</div><div class='add'>+	.tx_hang_workaround = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_ar9340 = {</div><div class='add'>+	.type = AR9340,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar9330,</div><div class='add'>+	.max_frame_len = SZ_16K - 1,</div><div class='add'>+	.desc_pktlen_mask = SZ_16K - 1,</div><div class='add'>+	.tx_hang_workaround = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_qca9530 = {</div><div class='add'>+	.type = QCA9530,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar9330,</div><div class='add'>+	.max_frame_len = SZ_16K - 1,</div><div class='add'>+	.desc_pktlen_mask = SZ_16K - 1,</div><div class='add'>+	.tx_hang_workaround = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct ag71xx_dcfg ag71xx_dcfg_qca9550 = {</div><div class='add'>+	.type = QCA9550,</div><div class='add'>+	.fifodata = ar71xx_fifo_ar9330,</div><div class='add'>+	.max_frame_len = 1540,</div><div class='add'>+	.desc_pktlen_mask = SZ_16K - 1,</div><div class='add'>+	.tx_hang_workaround = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct of_device_id ag71xx_match[] = {</div><div class='add'>+	{ .compatible = "qca,ar7100-eth", .data = &amp;ag71xx_dcfg_ar7100 },</div><div class='add'>+	{ .compatible = "qca,ar7240-eth", .data = &amp;ag71xx_dcfg_ar7240 },</div><div class='add'>+	{ .compatible = "qca,ar7241-eth", .data = &amp;ag71xx_dcfg_ar7240 },</div><div class='add'>+	{ .compatible = "qca,ar7242-eth", .data = &amp;ag71xx_dcfg_ar7240 },</div><div class='add'>+	{ .compatible = "qca,ar9130-eth", .data = &amp;ag71xx_dcfg_ar9130 },</div><div class='add'>+	{ .compatible = "qca,ar9330-eth", .data = &amp;ag71xx_dcfg_ar9330 },</div><div class='add'>+	{ .compatible = "qca,ar9340-eth", .data = &amp;ag71xx_dcfg_ar9340 },</div><div class='add'>+	{ .compatible = "qca,qca9530-eth", .data = &amp;ag71xx_dcfg_qca9530 },</div><div class='add'>+	{ .compatible = "qca,qca9550-eth", .data = &amp;ag71xx_dcfg_qca9550 },</div><div class='add'>+	{ .compatible = "qca,qca9560-eth", .data = &amp;ag71xx_dcfg_qca9550 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ag71xx_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver ag71xx_driver = {</div><div class='add'>+	.probe		= ag71xx_probe,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name	= "ag71xx",</div><div class='add'>+		.of_match_table = ag71xx_match,</div><div class='add'>+	}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+module_platform_driver(ag71xx_driver);</div><div class='add'>+MODULE_DESCRIPTION("Atheros AR71xx built-in ethernet mac driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h<br/>index 9d0e74f6b089..693006c5a498 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/alx/alx.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/alx/alx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/alx/alx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/alx/alx.h</a></div><div class='hunk'>@@ -137,6 +137,8 @@ struct alx_priv {</div><div class='ctx'> </div><div class='ctx'> 	/* protects hw.stats */</div><div class='ctx'> 	spinlock_t stats_lock;</div><div class='add'>+</div><div class='add'>+	struct mutex mtx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> extern const struct ethtool_ops alx_ethtool_ops;</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/alx/ethtool.c b/drivers/net/ethernet/atheros/alx/ethtool.c<br/>index 2f4eabf652e8..7f6b69a52367 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/alx/ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/alx/ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/alx/ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/alx/ethtool.c</a></div><div class='hunk'>@@ -163,8 +163,10 @@ static int alx_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 	cmd-&gt;base.speed = hw-&gt;link_speed;</div><div class='ctx'> 	cmd-&gt;base.duplex = hw-&gt;duplex;</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	ethtool_convert_legacy_u32_to_link_mode(cmd-&gt;link_modes.supported,</div><div class='ctx'> 						supported);</div><div class='hunk'>@@ -181,8 +183,7 @@ static int alx_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 	struct alx_hw *hw = &amp;alx-&gt;hw;</div><div class='ctx'> 	u32 adv_cfg;</div><div class='ctx'> 	u32 advertising;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ethtool_convert_link_mode_to_legacy_u32(&amp;advertising,</div><div class='ctx'> 						cmd-&gt;link_modes.advertising);</div><div class='hunk'>@@ -200,7 +201,12 @@ static int alx_set_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;adv_cfg = adv_cfg;</div><div class='del'>-	return alx_setup_speed_duplex(hw, adv_cfg, hw-&gt;flowctrl);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='add'>+	ret = alx_setup_speed_duplex(hw, adv_cfg, hw-&gt;flowctrl);</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alx_get_pauseparam(struct net_device *netdev,</div><div class='hunk'>@@ -209,10 +215,12 @@ static void alx_get_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	struct alx_priv *alx = netdev_priv(netdev);</div><div class='ctx'> 	struct alx_hw *hw = &amp;alx-&gt;hw;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 	pause-&gt;autoneg = !!(hw-&gt;flowctrl &amp; ALX_FC_ANEG &amp;&amp;</div><div class='ctx'> 			    hw-&gt;adv_cfg &amp; ADVERTISED_Autoneg);</div><div class='ctx'> 	pause-&gt;tx_pause = !!(hw-&gt;flowctrl &amp; ALX_FC_TX);</div><div class='ctx'> 	pause-&gt;rx_pause = !!(hw-&gt;flowctrl &amp; ALX_FC_RX);</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -232,7 +240,7 @@ static int alx_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	if (pause-&gt;autoneg)</div><div class='ctx'> 		fc |= ALX_FC_ANEG;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	/* restart auto-neg for auto-mode */</div><div class='ctx'> 	if (hw-&gt;adv_cfg &amp; ADVERTISED_Autoneg) {</div><div class='hunk'>@@ -245,8 +253,10 @@ static int alx_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> 	if (reconfig_phy) {</div><div class='ctx'> 		err = alx_setup_speed_duplex(hw, hw-&gt;adv_cfg, fc);</div><div class='del'>-		if (err)</div><div class='add'>+		if (err) {</div><div class='add'>+			mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> 			return err;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* flow control on mac */</div><div class='hunk'>@@ -254,6 +264,7 @@ static int alx_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> 		alx_cfg_mac_flowcontrol(hw, fc);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;flowctrl = fc;</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -281,9 +292,8 @@ static void alx_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 	spin_lock(&amp;alx-&gt;stats_lock);</div><div class='ctx'> </div><div class='ctx'> 	alx_update_hw_stats(hw);</div><div class='del'>-	BUILD_BUG_ON(sizeof(hw-&gt;stats) - offsetof(struct alx_hw_stats, rx_ok) &lt;</div><div class='del'>-		     ALX_NUM_STATS * sizeof(u64));</div><div class='del'>-	memcpy(data, &amp;hw-&gt;stats.rx_ok, ALX_NUM_STATS * sizeof(u64));</div><div class='add'>+	BUILD_BUG_ON(sizeof(hw-&gt;stats) != ALX_NUM_STATS * sizeof(u64));</div><div class='add'>+	memcpy(data, &amp;hw-&gt;stats, sizeof(hw-&gt;stats));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock(&amp;alx-&gt;stats_lock);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c<br/>index e3538ba7d0e7..ad6d6abd885f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/alx/main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/alx/main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/alx/main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/alx/main.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2013 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='add'>+ * Copyright (c) 2013, 2021 Johannes Berg &lt;johannes@sipsolutions.net&gt;</div><div class='ctx'>  *</div><div class='ctx'>  *  This file is free software: you may copy, redistribute and/or modify it</div><div class='ctx'>  *  under the terms of the GNU General Public License as published by the</div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/mdio.h&gt;</div><div class='del'>-#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -607,7 +606,7 @@ static int alx_set_mac_address(struct net_device *netdev, void *data)</div><div class='ctx'> 	if (netdev-&gt;addr_assign_type &amp; NET_ADDR_RANDOM)</div><div class='ctx'> 		netdev-&gt;addr_assign_type ^= NET_ADDR_RANDOM;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	memcpy(hw-&gt;mac_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='ctx'> 	alx_set_macaddr(hw, hw-&gt;mac_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -752,7 +751,7 @@ static int alx_alloc_napis(struct alx_priv *alx)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;alx = alx;</div><div class='del'>-		netif_napi_add(alx-&gt;dev, &amp;np-&gt;napi, alx_poll, 64);</div><div class='add'>+		netif_napi_add(alx-&gt;dev, &amp;np-&gt;napi, alx_poll);</div><div class='ctx'> 		alx-&gt;qnapi[i] = np;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -902,7 +901,7 @@ static int alx_init_intr(struct alx_priv *alx)</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_alloc_irq_vectors(alx-&gt;hw.pdev, 1, 1,</div><div class='del'>-			PCI_IRQ_MSI | PCI_IRQ_LEGACY);</div><div class='add'>+			PCI_IRQ_MSI | PCI_IRQ_INTX);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1091,8 +1090,9 @@ static int alx_init_sw(struct alx_priv *alx)</div><div class='ctx'> 		      ALX_MAC_CTRL_RXFC_EN |</div><div class='ctx'> 		      ALX_MAC_CTRL_TXFC_EN |</div><div class='ctx'> 		      7 &lt;&lt; ALX_MAC_CTRL_PRMBLEN_SHIFT;</div><div class='add'>+	mutex_init(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1122,6 +1122,8 @@ static void alx_halt(struct alx_priv *alx)</div><div class='ctx'> {</div><div class='ctx'> 	struct alx_hw *hw = &amp;alx-&gt;hw;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	alx_netif_stop(alx);</div><div class='ctx'> 	hw-&gt;link_speed = SPEED_UNKNOWN;</div><div class='ctx'> 	hw-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='hunk'>@@ -1147,6 +1149,8 @@ static void alx_configure(struct alx_priv *alx)</div><div class='ctx'> </div><div class='ctx'> static void alx_activate(struct alx_priv *alx)</div><div class='ctx'> {</div><div class='add'>+	lockdep_assert_held(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	/* hardware setting lost, restore it */</div><div class='ctx'> 	alx_reinit_rings(alx);</div><div class='ctx'> 	alx_configure(alx);</div><div class='hunk'>@@ -1161,7 +1165,7 @@ static void alx_activate(struct alx_priv *alx)</div><div class='ctx'> </div><div class='ctx'> static void alx_reinit(struct alx_priv *alx)</div><div class='ctx'> {</div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	lockdep_assert_held(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	alx_halt(alx);</div><div class='ctx'> 	alx_activate(alx);</div><div class='hunk'>@@ -1172,12 +1176,15 @@ static int alx_change_mtu(struct net_device *netdev, int mtu)</div><div class='ctx'> 	struct alx_priv *alx = netdev_priv(netdev);</div><div class='ctx'> 	int max_frame = ALX_MAX_FRAME_LEN(mtu);</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, mtu);</div><div class='ctx'> 	alx-&gt;hw.mtu = mtu;</div><div class='ctx'> 	alx-&gt;rxbuf_size = max(max_frame, ALX_DEF_RXBUF_SIZE);</div><div class='ctx'> 	netdev_update_features(netdev);</div><div class='del'>-	if (netif_running(netdev))</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 		alx_reinit(alx);</div><div class='add'>+		mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1249,8 +1256,14 @@ out_disable_adv_intr:</div><div class='ctx'> </div><div class='ctx'> static void __alx_stop(struct alx_priv *alx)</div><div class='ctx'> {</div><div class='del'>-	alx_halt(alx);</div><div class='add'>+	lockdep_assert_held(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	alx_free_irq(alx);</div><div class='add'>+</div><div class='add'>+	cancel_work_sync(&amp;alx-&gt;link_check_wk);</div><div class='add'>+	cancel_work_sync(&amp;alx-&gt;reset_wk);</div><div class='add'>+</div><div class='add'>+	alx_halt(alx);</div><div class='ctx'> 	alx_free_rings(alx);</div><div class='ctx'> 	alx_free_napis(alx);</div><div class='ctx'> }</div><div class='hunk'>@@ -1280,6 +1293,8 @@ static void alx_check_link(struct alx_priv *alx)</div><div class='ctx'> 	int old_speed;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	lockdep_assert_held(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	/* clear PHY internal interrupt status, otherwise the main</div><div class='ctx'> 	 * interrupt status will be asserted forever</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1334,12 +1349,24 @@ reset:</div><div class='ctx'> </div><div class='ctx'> static int alx_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	return __alx_open(netdev_priv(netdev), false);</div><div class='add'>+	struct alx_priv *alx = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='add'>+	ret = __alx_open(alx, false);</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alx_stop(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	__alx_stop(netdev_priv(netdev));</div><div class='add'>+	struct alx_priv *alx = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='add'>+	__alx_stop(alx);</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1349,18 +1376,18 @@ static void alx_link_check(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	alx = container_of(work, struct alx_priv, link_check_wk);</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 	alx_check_link(alx);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void alx_reset(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct alx_priv *alx = container_of(work, struct alx_priv, reset_wk);</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 	alx_reinit(alx);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alx_tpd_req(struct sk_buff *skb)</div><div class='hunk'>@@ -1416,10 +1443,7 @@ static int alx_tso(struct sk_buff *skb, struct alx_txd *first)</div><div class='ctx'> 							 0, IPPROTO_TCP, 0);</div><div class='ctx'> 		first-&gt;word1 |= 1 &lt;&lt; TPD_IPV4_SHIFT;</div><div class='ctx'> 	} else if (skb_is_gso_v6(skb)) {</div><div class='del'>-		ipv6_hdr(skb)-&gt;payload_len = 0;</div><div class='del'>-		tcp_hdr(skb)-&gt;check = ~csum_ipv6_magic(&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='del'>-						       &amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='del'>-						       0, IPPROTO_TCP, 0);</div><div class='add'>+		tcp_v6_gso_csum_prep(skb);</div><div class='ctx'> 		/* LSOv2: the first TPD only provides the packet length */</div><div class='ctx'> 		first-&gt;adrl.l.pkt_len = skb-&gt;len;</div><div class='ctx'> 		first-&gt;word1 |= 1 &lt;&lt; TPD_LSO_V2_SHIFT;</div><div class='hunk'>@@ -1465,9 +1489,7 @@ static int alx_map_tx_skb(struct alx_tx_queue *txq, struct sk_buff *skb)</div><div class='ctx'> 	tpd-&gt;len = cpu_to_le16(maplen);</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0; f &lt; skb_shinfo(skb)-&gt;nr_frags; f++) {</div><div class='del'>-		struct skb_frag_struct *frag;</div><div class='del'>-</div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='ctx'> </div><div class='ctx'> 		if (++txq-&gt;write_idx == txq-&gt;count)</div><div class='ctx'> 			txq-&gt;write_idx = 0;</div><div class='hunk'>@@ -1555,7 +1577,7 @@ static netdev_tx_t alx_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	return alx_start_xmit_ring(skb, alx_tx_queue_mapping(alx, skb));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void alx_tx_timeout(struct net_device *dev)</div><div class='add'>+static void alx_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct alx_priv *alx = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1681,7 +1703,7 @@ static const struct net_device_ops alx_netdev_ops = {</div><div class='ctx'> 	.ndo_validate_addr      = eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address    = alx_set_mac_address,</div><div class='ctx'> 	.ndo_change_mtu         = alx_change_mtu,</div><div class='del'>-	.ndo_do_ioctl           = alx_ioctl,</div><div class='add'>+	.ndo_eth_ioctl           = alx_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout         = alx_tx_timeout,</div><div class='ctx'> 	.ndo_fix_features	= alx_fix_features,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -1722,7 +1744,6 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_pci_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_enable_pcie_error_reporting(pdev);</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!pdev-&gt;pm_cap) {</div><div class='hunk'>@@ -1772,6 +1793,8 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	alx_reset_pcie(hw);</div><div class='ctx'> </div><div class='ctx'> 	phy_configured = alx_phy_configured(hw);</div><div class='hunk'>@@ -1782,7 +1805,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	err = alx_reset_mac(hw);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "MAC Reset failed, error = %d\n", err);</div><div class='del'>-		goto out_unmap;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* setup link to put it in a known good starting state */</div><div class='hunk'>@@ -1792,7 +1815,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 				"failed to configure PHY speed/duplex (err=%d)\n",</div><div class='ctx'> 				err);</div><div class='del'>-			goto out_unmap;</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1810,7 +1833,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memcpy(hw-&gt;mac_addr, hw-&gt;perm_addr, ETH_ALEN);</div><div class='del'>-	memcpy(netdev-&gt;dev_addr, hw-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(netdev, hw-&gt;mac_addr);</div><div class='ctx'> 	memcpy(netdev-&gt;perm_addr, hw-&gt;perm_addr, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;mdio.prtad = 0;</div><div class='hunk'>@@ -1825,9 +1848,11 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (!alx_get_phy_info(hw)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to identify PHY\n");</div><div class='ctx'> 		err = -EIO;</div><div class='del'>-		goto out_unmap;</div><div class='add'>+		goto out_unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	INIT_WORK(&amp;alx-&gt;link_check_wk, alx_link_check);</div><div class='ctx'> 	INIT_WORK(&amp;alx-&gt;reset_wk, alx_reset);</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='hunk'>@@ -1844,6 +1869,8 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> out_unmap:</div><div class='ctx'> 	iounmap(hw-&gt;hw_addr);</div><div class='ctx'> out_free_netdev:</div><div class='hunk'>@@ -1860,9 +1887,6 @@ static void alx_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct alx_priv *alx = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct alx_hw *hw = &amp;alx-&gt;hw;</div><div class='ctx'> </div><div class='del'>-	cancel_work_sync(&amp;alx-&gt;link_check_wk);</div><div class='del'>-	cancel_work_sync(&amp;alx-&gt;reset_wk);</div><div class='del'>-</div><div class='ctx'> 	/* restore permanent mac address */</div><div class='ctx'> 	alx_set_macaddr(hw, hw-&gt;perm_addr);</div><div class='ctx'> </div><div class='hunk'>@@ -1870,51 +1894,59 @@ static void alx_remove(struct pci_dev *pdev)</div><div class='ctx'> 	iounmap(hw-&gt;hw_addr);</div><div class='ctx'> 	pci_release_mem_regions(pdev);</div><div class='ctx'> </div><div class='del'>-	pci_disable_pcie_error_reporting(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='add'>+	mutex_destroy(&amp;alx-&gt;mtx);</div><div class='add'>+</div><div class='ctx'> 	free_netdev(alx-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int alx_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct alx_priv *alx = pci_get_drvdata(pdev);</div><div class='add'>+	struct alx_priv *alx = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(alx-&gt;dev))</div><div class='ctx'> 		return 0;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='ctx'> 	netif_device_detach(alx-&gt;dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 	__alx_stop(alx);</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int alx_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct alx_priv *alx = pci_get_drvdata(pdev);</div><div class='add'>+	struct alx_priv *alx = dev_get_drvdata(dev);</div><div class='ctx'> 	struct alx_hw *hw = &amp;alx-&gt;hw;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> 	alx_reset_phy(hw);</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(alx-&gt;dev))</div><div class='del'>-		return 0;</div><div class='del'>-	netif_device_attach(alx-&gt;dev);</div><div class='add'>+	if (!netif_running(alx-&gt;dev)) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='ctx'> 	err = __alx_open(alx, true);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	if (err)</div><div class='add'>+		goto unlock;</div><div class='ctx'> </div><div class='add'>+	netif_device_attach(alx-&gt;dev);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='add'>+	rtnl_unlock();</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);</div><div class='del'>-#define ALX_PM_OPS      (&amp;alx_pm_ops)</div><div class='del'>-#else</div><div class='del'>-#define ALX_PM_OPS      NULL</div><div class='del'>-#endif</div><div class='del'>-</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);</div><div class='ctx'> </div><div class='ctx'> static pci_ers_result_t alx_pci_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 					       pci_channel_state_t state)</div><div class='hunk'>@@ -1925,7 +1957,7 @@ static pci_ers_result_t alx_pci_error_detected(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "pci error detected\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		netif_device_detach(netdev);</div><div class='hunk'>@@ -1937,7 +1969,7 @@ static pci_ers_result_t alx_pci_error_detected(struct pci_dev *pdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1950,7 +1982,7 @@ static pci_ers_result_t alx_pci_error_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "pci error slot reset\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(pdev)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Failed to re-enable PCI device after reset\n");</div><div class='hunk'>@@ -1963,7 +1995,7 @@ static pci_ers_result_t alx_pci_error_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	if (!alx_reset_mac(hw))</div><div class='ctx'> 		rc = PCI_ERS_RESULT_RECOVERED;</div><div class='ctx'> out:</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1975,14 +2007,14 @@ static void alx_pci_error_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev, "pci error resume\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	mutex_lock(&amp;alx-&gt;mtx);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		alx_activate(alx);</div><div class='ctx'> 		netif_device_attach(netdev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	mutex_unlock(&amp;alx-&gt;mtx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_error_handlers alx_err_handlers = {</div><div class='hunk'>@@ -2013,13 +2045,13 @@ static struct pci_driver alx_driver = {</div><div class='ctx'> 	.probe       = alx_probe,</div><div class='ctx'> 	.remove      = alx_remove,</div><div class='ctx'> 	.err_handler = &amp;alx_err_handlers,</div><div class='del'>-	.driver.pm   = ALX_PM_OPS,</div><div class='add'>+	.driver.pm   = pm_sleep_ptr(&amp;alx_pm_ops),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_pci_driver(alx_driver);</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, alx_pci_tbl);</div><div class='ctx'> MODULE_AUTHOR("Johannes Berg &lt;johannes@sipsolutions.net&gt;");</div><div class='del'>-MODULE_AUTHOR("Qualcomm Corporation, &lt;nic-devel@qualcomm.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Qualcomm Corporation");</div><div class='ctx'> MODULE_DESCRIPTION(</div><div class='ctx'> 	"Qualcomm Atheros(R) AR816x/AR817x PCI-E Ethernet Network Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h<br/>index 60b2febd7315..63ba64dbb731 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1c/atl1c.h</a></div><div class='hunk'>@@ -63,7 +63,7 @@</div><div class='ctx'> </div><div class='ctx'> #define AT_MAX_RECEIVE_QUEUE    4</div><div class='ctx'> #define AT_DEF_RECEIVE_QUEUE	1</div><div class='del'>-#define AT_MAX_TRANSMIT_QUEUE	2</div><div class='add'>+#define AT_MAX_TRANSMIT_QUEUE  4</div><div class='ctx'> </div><div class='ctx'> #define AT_DMA_HI_ADDR_MASK     0xffffffff00000000ULL</div><div class='ctx'> #define AT_DMA_LO_ADDR_MASK     0x00000000ffffffffULL</div><div class='hunk'>@@ -241,6 +241,8 @@ struct atl1c_tpd_ext_desc {</div><div class='ctx'> #define RRS_PACKET_PROT_IS_IPV6_ONLY(word) \</div><div class='ctx'> 	((((word) &gt;&gt; RRS_PROT_ID_SHIFT) &amp; RRS_PROT_ID_MASK) == 6)</div><div class='ctx'> </div><div class='add'>+#define RRS_MT_PROT_ID_TCPUDP	BIT(19)</div><div class='add'>+</div><div class='ctx'> struct atl1c_recv_ret_status {</div><div class='ctx'> 	__le32  word0;</div><div class='ctx'> 	__le32	rss_hash;</div><div class='hunk'>@@ -289,11 +291,7 @@ enum atl1c_nic_type {</div><div class='ctx'> 	athr_l2c_b2,</div><div class='ctx'> 	athr_l1d,</div><div class='ctx'> 	athr_l1d_2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum atl1c_trans_queue {</div><div class='del'>-	atl1c_trans_normal = 0,</div><div class='del'>-	atl1c_trans_high = 1</div><div class='add'>+	athr_mt,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct atl1c_hw_stats {</div><div class='hunk'>@@ -367,6 +365,7 @@ struct atl1c_hw {</div><div class='ctx'> 	u16 phy_id1;</div><div class='ctx'> 	u16 phy_id2;</div><div class='ctx'> </div><div class='add'>+	spinlock_t intr_mask_lock;	/* protect the intr_mask */</div><div class='ctx'> 	u32 intr_mask;</div><div class='ctx'> </div><div class='ctx'> 	u8 preamble_len;</div><div class='hunk'>@@ -471,13 +470,16 @@ struct atl1c_buffer {</div><div class='ctx'> </div><div class='ctx'> /* transimit packet descriptor (tpd) ring */</div><div class='ctx'> struct atl1c_tpd_ring {</div><div class='add'>+	struct atl1c_adapter *adapter;</div><div class='ctx'> 	void *desc;		/* descriptor ring virtual address */</div><div class='ctx'> 	dma_addr_t dma;		/* descriptor ring physical address */</div><div class='add'>+	u16 num;</div><div class='ctx'> 	u16 size;		/* descriptor ring length in bytes */</div><div class='ctx'> 	u16 count;		/* number of descriptors in the ring */</div><div class='ctx'> 	u16 next_to_use;</div><div class='ctx'> 	atomic_t next_to_clean;</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='add'>+	struct napi_struct napi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* receive free descriptor (rfd) ring */</div><div class='hunk'>@@ -493,26 +495,27 @@ struct atl1c_rfd_ring {</div><div class='ctx'> </div><div class='ctx'> /* receive return descriptor (rrd) ring */</div><div class='ctx'> struct atl1c_rrd_ring {</div><div class='add'>+	struct atl1c_adapter *adapter;</div><div class='ctx'> 	void *desc;		/* descriptor ring virtual address */</div><div class='ctx'> 	dma_addr_t dma;		/* descriptor ring physical address */</div><div class='add'>+	u16 num;</div><div class='ctx'> 	u16 size;		/* descriptor ring length in bytes */</div><div class='ctx'> 	u16 count;		/* number of descriptors in the ring */</div><div class='ctx'> 	u16 next_to_use;</div><div class='ctx'> 	u16 next_to_clean;</div><div class='add'>+	struct napi_struct napi;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* board specific private data structure */</div><div class='ctx'> struct atl1c_adapter {</div><div class='ctx'> 	struct net_device   *netdev;</div><div class='ctx'> 	struct pci_dev      *pdev;</div><div class='del'>-	struct napi_struct  napi;</div><div class='del'>-	struct page         *rx_page;</div><div class='del'>-	unsigned int	    rx_page_offset;</div><div class='del'>-	unsigned int	    rx_frag_size;</div><div class='ctx'> 	struct atl1c_hw        hw;</div><div class='ctx'> 	struct atl1c_hw_stats  hw_stats;</div><div class='ctx'> 	struct mii_if_info  mii;    /* MII interface info */</div><div class='ctx'> 	u16 rx_buffer_len;</div><div class='add'>+	unsigned int tx_queue_count;</div><div class='add'>+	unsigned int rx_queue_count;</div><div class='ctx'> </div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> #define __AT_TESTING        0x0001</div><div class='hunk'>@@ -538,8 +541,8 @@ struct atl1c_adapter {</div><div class='ctx'> 	/* All Descriptor memory */</div><div class='ctx'> 	struct atl1c_ring_header ring_header;</div><div class='ctx'> 	struct atl1c_tpd_ring tpd_ring[AT_MAX_TRANSMIT_QUEUE];</div><div class='del'>-	struct atl1c_rfd_ring rfd_ring;</div><div class='del'>-	struct atl1c_rrd_ring rrd_ring;</div><div class='add'>+	struct atl1c_rfd_ring rfd_ring[AT_MAX_RECEIVE_QUEUE];</div><div class='add'>+	struct atl1c_rrd_ring rrd_ring[AT_MAX_RECEIVE_QUEUE];</div><div class='ctx'> 	u32 bd_number;     /* board number;*/</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -583,7 +586,6 @@ struct atl1c_adapter {</div><div class='ctx'> 		readl(((a)-&gt;hw_addr + reg) + ((offset) &lt;&lt; 2)))</div><div class='ctx'> </div><div class='ctx'> extern char atl1c_driver_name[];</div><div class='del'>-extern char atl1c_driver_version[];</div><div class='ctx'> </div><div class='ctx'> void atl1c_reinit_locked(struct atl1c_adapter *adapter);</div><div class='ctx'> s32 atl1c_reset_hw(struct atl1c_hw *hw);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c<br/>index b5a70a36fa04..0bce122c68f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c</a></div><div class='hunk'>@@ -220,10 +220,8 @@ static void atl1c_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver,  atl1c_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, atl1c_driver_version,</div><div class='del'>-		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(drvinfo-&gt;driver,  atl1c_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c<br/>index 140358dcf61e..f19370c33444 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1c/atl1c_hw.c</a></div><div class='hunk'>@@ -594,6 +594,11 @@ int atl1c_phy_init(struct atl1c_hw *hw)</div><div class='ctx'> 	int ret_val;</div><div class='ctx'> 	u16 mii_bmcr_data = BMCR_RESET;</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;nic_type == athr_mt) {</div><div class='add'>+		hw-&gt;phy_configured = true;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if ((atl1c_read_phy_reg(hw, MII_PHYSID1, &amp;hw-&gt;phy_id1) != 0) ||</div><div class='ctx'> 		(atl1c_read_phy_reg(hw, MII_PHYSID2, &amp;hw-&gt;phy_id2) != 0)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Error get phy ID\n");</div><div class='hunk'>@@ -636,6 +641,23 @@ int atl1c_phy_init(struct atl1c_hw *hw)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool atl1c_get_link_status(struct atl1c_hw *hw)</div><div class='add'>+{</div><div class='add'>+	u16 phy_data;</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;nic_type == athr_mt) {</div><div class='add'>+		u32 spd;</div><div class='add'>+</div><div class='add'>+		AT_READ_REG(hw, REG_MT_SPEED, &amp;spd);</div><div class='add'>+		return !!spd;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MII_BMSR must be read twice */</div><div class='add'>+	atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	return !!(phy_data &amp; BMSR_LSTATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Detects the current speed and duplex settings of the hardware.</div><div class='ctx'>  *</div><div class='hunk'>@@ -648,6 +670,15 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u16 phy_data;</div><div class='ctx'> </div><div class='add'>+	if (hw-&gt;nic_type == athr_mt) {</div><div class='add'>+		u32 spd;</div><div class='add'>+</div><div class='add'>+		AT_READ_REG(hw, REG_MT_SPEED, &amp;spd);</div><div class='add'>+		*speed = spd;</div><div class='add'>+		*duplex = FULL_DUPLEX;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Read   PHY Specific Status Register (17) */</div><div class='ctx'> 	err = atl1c_read_phy_reg(hw, MII_GIGA_PSSR, &amp;phy_data);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -686,15 +717,12 @@ int atl1c_phy_to_ps_link(struct atl1c_hw *hw)</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u16 autoneg_advertised = ADVERTISED_10baseT_Half;</div><div class='ctx'> 	u16 save_autoneg_advertised;</div><div class='del'>-	u16 phy_data;</div><div class='ctx'> 	u16 mii_lpa_data;</div><div class='ctx'> 	u16 speed = SPEED_0;</div><div class='ctx'> 	u16 duplex = FULL_DUPLEX;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='del'>-	atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='del'>-	if (phy_data &amp; BMSR_LSTATUS) {</div><div class='add'>+	if (atl1c_get_link_status(hw)) {</div><div class='ctx'> 		atl1c_read_phy_reg(hw, MII_LPA, &amp;mii_lpa_data);</div><div class='ctx'> 		if (mii_lpa_data &amp; LPA_10FULL)</div><div class='ctx'> 			autoneg_advertised = ADVERTISED_10baseT_Full;</div><div class='hunk'>@@ -717,9 +745,7 @@ int atl1c_phy_to_ps_link(struct atl1c_hw *hw)</div><div class='ctx'> 		if (mii_lpa_data) {</div><div class='ctx'> 			for (i = 0; i &lt; AT_SUSPEND_LINK_TIMEOUT; i++) {</div><div class='ctx'> 				mdelay(100);</div><div class='del'>-				atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='del'>-				atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='del'>-				if (phy_data &amp; BMSR_LSTATUS) {</div><div class='add'>+				if (atl1c_get_link_status(hw)) {</div><div class='ctx'> 					if (atl1c_get_speed_and_duplex(hw, &amp;speed,</div><div class='ctx'> 									&amp;duplex) != 0)</div><div class='ctx'> 						dev_dbg(&amp;pdev-&gt;dev,</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h<br/>index ce1a123dce2c..c567c920628f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1c/atl1c_hw.h</a></div><div class='hunk'>@@ -26,6 +26,7 @@ void atl1c_phy_disable(struct atl1c_hw *hw);</div><div class='ctx'> void atl1c_hw_set_mac_addr(struct atl1c_hw *hw, u8 *mac_addr);</div><div class='ctx'> int atl1c_phy_reset(struct atl1c_hw *hw);</div><div class='ctx'> int atl1c_read_mac_addr(struct atl1c_hw *hw);</div><div class='add'>+bool atl1c_get_link_status(struct atl1c_hw *hw);</div><div class='ctx'> int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex);</div><div class='ctx'> u32 atl1c_hash_mc_addr(struct atl1c_hw *hw, u8 *mc_addr);</div><div class='ctx'> void atl1c_hash_set(struct atl1c_hw *hw, u32 hash_value);</div><div class='hunk'>@@ -527,15 +528,24 @@ void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> #define REG_RX_BASE_ADDR_HI		0x1540</div><div class='ctx'> #define REG_TX_BASE_ADDR_HI		0x1544</div><div class='ctx'> #define REG_RFD0_HEAD_ADDR_LO		0x1550</div><div class='add'>+#define REG_RFD1_HEAD_ADDR_LO          0x1554</div><div class='add'>+#define REG_RFD2_HEAD_ADDR_LO          0x1558</div><div class='add'>+#define REG_RFD3_HEAD_ADDR_LO          0x155C</div><div class='ctx'> #define REG_RFD_RING_SIZE		0x1560</div><div class='ctx'> #define RFD_RING_SIZE_MASK		0x0FFF</div><div class='ctx'> #define REG_RX_BUF_SIZE			0x1564</div><div class='ctx'> #define RX_BUF_SIZE_MASK		0xFFFF</div><div class='ctx'> #define REG_RRD0_HEAD_ADDR_LO		0x1568</div><div class='add'>+#define REG_RRD1_HEAD_ADDR_LO          0x156C</div><div class='add'>+#define REG_RRD2_HEAD_ADDR_LO          0x1570</div><div class='add'>+#define REG_RRD3_HEAD_ADDR_LO          0x1574</div><div class='ctx'> #define REG_RRD_RING_SIZE		0x1578</div><div class='ctx'> #define RRD_RING_SIZE_MASK		0x0FFF</div><div class='ctx'> #define REG_TPD_PRI1_ADDR_LO		0x157C</div><div class='ctx'> #define REG_TPD_PRI0_ADDR_LO		0x1580</div><div class='add'>+#define REG_TPD_PRI2_ADDR_LO           0x1F10</div><div class='add'>+#define REG_TPD_PRI3_ADDR_LO           0x1F14</div><div class='add'>+</div><div class='ctx'> #define REG_TPD_RING_SIZE		0x1584</div><div class='ctx'> #define TPD_RING_SIZE_MASK		0xFFFF</div><div class='ctx'> </div><div class='hunk'>@@ -654,15 +664,26 @@ void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> /* Mail box */</div><div class='ctx'> #define MB_RFDX_PROD_IDX_MASK		0xFFFF</div><div class='ctx'> #define REG_MB_RFD0_PROD_IDX		0x15E0</div><div class='add'>+#define REG_MB_RFD1_PROD_IDX           0x15E4</div><div class='add'>+#define REG_MB_RFD2_PROD_IDX           0x15E8</div><div class='add'>+#define REG_MB_RFD3_PROD_IDX           0x15EC</div><div class='ctx'> </div><div class='ctx'> #define REG_TPD_PRI1_PIDX               0x15F0	/* 16bit,hi-tpd producer idx */</div><div class='ctx'> #define REG_TPD_PRI0_PIDX		0x15F2	/* 16bit,lo-tpd producer idx */</div><div class='ctx'> #define REG_TPD_PRI1_CIDX		0x15F4	/* 16bit,hi-tpd consumer idx */</div><div class='ctx'> #define REG_TPD_PRI0_CIDX		0x15F6	/* 16bit,lo-tpd consumer idx */</div><div class='add'>+#define REG_TPD_PRI3_PIDX              0x1F18</div><div class='add'>+#define REG_TPD_PRI2_PIDX              0x1F1A</div><div class='add'>+#define REG_TPD_PRI3_CIDX              0x1F1C</div><div class='add'>+#define REG_TPD_PRI2_CIDX              0x1F1E</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define REG_MB_RFD01_CONS_IDX		0x15F8</div><div class='ctx'> #define MB_RFD0_CONS_IDX_MASK		0x0000FFFF</div><div class='ctx'> #define MB_RFD1_CONS_IDX_MASK		0xFFFF0000</div><div class='add'>+#define REG_MB_RFD23_CONS_IDX          0x15FC</div><div class='add'>+#define MB_RFD2_CONS_IDX_MASK          0x0000FFFF</div><div class='add'>+#define MB_RFD3_CONS_IDX_MASK          0xFFFF0000</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Status Register */</div><div class='ctx'> #define REG_ISR    			0x1600</div><div class='hunk'>@@ -686,7 +707,7 @@ void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> /* GPHY low power state interrupt */</div><div class='ctx'> #define ISR_GPHY_LPW           		0x00002000</div><div class='ctx'> #define ISR_TXQ_TO_RST			0x00004000</div><div class='del'>-#define ISR_TX_PKT			0x00008000</div><div class='add'>+#define ISR_TX_PKT_0                   0x00008000</div><div class='ctx'> #define ISR_RX_PKT_0			0x00010000</div><div class='ctx'> #define ISR_RX_PKT_1			0x00020000</div><div class='ctx'> #define ISR_RX_PKT_2			0x00040000</div><div class='hunk'>@@ -698,6 +719,9 @@ void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> #define ISR_NFERR_DETECTED		0x01000000</div><div class='ctx'> #define ISR_CERR_DETECTED		0x02000000</div><div class='ctx'> #define ISR_PHY_LINKDOWN		0x04000000</div><div class='add'>+#define ISR_TX_PKT_1                   0x10000000</div><div class='add'>+#define ISR_TX_PKT_2                   0x20000000</div><div class='add'>+#define ISR_TX_PKT_3                   0x40000000</div><div class='ctx'> #define ISR_DIS_INT			0x80000000</div><div class='ctx'> </div><div class='ctx'> /* Interrupt Mask Register */</div><div class='hunk'>@@ -712,11 +736,15 @@ void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> 		ISR_TXQ_TO_RST  |\</div><div class='ctx'> 		ISR_DMAW_TO_RST	|\</div><div class='ctx'> 		ISR_GPHY	|\</div><div class='del'>-		ISR_TX_PKT	|\</div><div class='del'>-		ISR_RX_PKT_0	|\</div><div class='ctx'> 		ISR_GPHY_LPW    |\</div><div class='ctx'> 		ISR_PHY_LINKDOWN)</div><div class='ctx'> </div><div class='add'>+#define ISR_TX_PKT     (			\</div><div class='add'>+	ISR_TX_PKT_0    |			\</div><div class='add'>+	ISR_TX_PKT_1    |			\</div><div class='add'>+	ISR_TX_PKT_2    |			\</div><div class='add'>+	ISR_TX_PKT_3)</div><div class='add'>+</div><div class='ctx'> #define ISR_RX_PKT 	(\</div><div class='ctx'> 	ISR_RX_PKT_0    |\</div><div class='ctx'> 	ISR_RX_PKT_1    |\</div><div class='hunk'>@@ -764,6 +792,14 @@ void atl1c_post_phy_linkchg(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> #define REG_DEBUG_DATA0 		0x1900</div><div class='ctx'> #define REG_DEBUG_DATA1 		0x1904</div><div class='ctx'> </div><div class='add'>+#define REG_MT_MAGIC			0x1F00</div><div class='add'>+#define REG_MT_MODE			0x1F04</div><div class='add'>+#define REG_MT_SPEED			0x1F08</div><div class='add'>+#define REG_MT_VERSION			0x1F0C</div><div class='add'>+</div><div class='add'>+#define MT_MAGIC			0xaabb1234</div><div class='add'>+#define MT_MODE_4Q			BIT(0)</div><div class='add'>+</div><div class='ctx'> #define L1D_MPW_PHYID1			0xD01C  /* V7 */</div><div class='ctx'> #define L1D_MPW_PHYID2			0xD01D  /* V1-V6 */</div><div class='ctx'> #define L1D_MPW_PHYID3			0xD01E  /* V8 */</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c<br/>index 25bf085324b8..7efa3fc257b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1c/atl1c_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1c/atl1c_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1c/atl1c_main.c</a></div><div class='hunk'>@@ -8,9 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "atl1c.h"</div><div class='ctx'> </div><div class='del'>-#define ATL1C_DRV_VERSION "1.0.1.1-NAPI"</div><div class='ctx'> char atl1c_driver_name[] = "atl1c";</div><div class='del'>-char atl1c_driver_version[] = ATL1C_DRV_VERSION;</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * atl1c_pci_tbl - PCI Device ID Table</div><div class='hunk'>@@ -34,23 +32,55 @@ static const struct pci_device_id atl1c_pci_tbl[] = {</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jie Yang");</div><div class='del'>-MODULE_AUTHOR("Qualcomm Atheros Inc., &lt;nic-devel@qualcomm.com&gt;");</div><div class='add'>+MODULE_AUTHOR("Qualcomm Atheros Inc.");</div><div class='ctx'> MODULE_DESCRIPTION("Qualcomm Atheros 100/1000M Ethernet Network Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(ATL1C_DRV_VERSION);</div><div class='add'>+</div><div class='add'>+struct atl1c_qregs {</div><div class='add'>+	u16 tpd_addr_lo;</div><div class='add'>+	u16 tpd_prod;</div><div class='add'>+	u16 tpd_cons;</div><div class='add'>+	u16 rfd_addr_lo;</div><div class='add'>+	u16 rrd_addr_lo;</div><div class='add'>+	u16 rfd_prod;</div><div class='add'>+	u32 tx_isr;</div><div class='add'>+	u32 rx_isr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct atl1c_qregs atl1c_qregs[AT_MAX_TRANSMIT_QUEUE] = {</div><div class='add'>+	{</div><div class='add'>+		REG_TPD_PRI0_ADDR_LO, REG_TPD_PRI0_PIDX, REG_TPD_PRI0_CIDX,</div><div class='add'>+		REG_RFD0_HEAD_ADDR_LO, REG_RRD0_HEAD_ADDR_LO,</div><div class='add'>+		REG_MB_RFD0_PROD_IDX, ISR_TX_PKT_0, ISR_RX_PKT_0</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		REG_TPD_PRI1_ADDR_LO, REG_TPD_PRI1_PIDX, REG_TPD_PRI1_CIDX,</div><div class='add'>+		REG_RFD1_HEAD_ADDR_LO, REG_RRD1_HEAD_ADDR_LO,</div><div class='add'>+		REG_MB_RFD1_PROD_IDX, ISR_TX_PKT_1, ISR_RX_PKT_1</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		REG_TPD_PRI2_ADDR_LO, REG_TPD_PRI2_PIDX, REG_TPD_PRI2_CIDX,</div><div class='add'>+		REG_RFD2_HEAD_ADDR_LO, REG_RRD2_HEAD_ADDR_LO,</div><div class='add'>+		REG_MB_RFD2_PROD_IDX, ISR_TX_PKT_2, ISR_RX_PKT_2</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		REG_TPD_PRI3_ADDR_LO, REG_TPD_PRI3_PIDX, REG_TPD_PRI3_CIDX,</div><div class='add'>+		REG_RFD3_HEAD_ADDR_LO, REG_RRD3_HEAD_ADDR_LO,</div><div class='add'>+		REG_MB_RFD3_PROD_IDX, ISR_TX_PKT_3, ISR_RX_PKT_3</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int atl1c_stop_mac(struct atl1c_hw *hw);</div><div class='ctx'> static void atl1c_disable_l0s_l1(struct atl1c_hw *hw);</div><div class='ctx'> static void atl1c_set_aspm(struct atl1c_hw *hw, u16 link_speed);</div><div class='ctx'> static void atl1c_start_mac(struct atl1c_adapter *adapter);</div><div class='del'>-static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter,</div><div class='del'>-		   int *work_done, int work_to_do);</div><div class='ctx'> static int atl1c_up(struct atl1c_adapter *adapter);</div><div class='ctx'> static void atl1c_down(struct atl1c_adapter *adapter);</div><div class='ctx'> static int atl1c_reset_mac(struct atl1c_hw *hw);</div><div class='ctx'> static void atl1c_reset_dma_ring(struct atl1c_adapter *adapter);</div><div class='ctx'> static int atl1c_configure(struct atl1c_adapter *adapter);</div><div class='del'>-static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter);</div><div class='add'>+static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, u32 queue,</div><div class='add'>+				 bool napi_mode);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static const u32 atl1c_default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE |</div><div class='hunk'>@@ -177,16 +207,6 @@ static inline void atl1c_irq_disable(struct atl1c_adapter *adapter)</div><div class='ctx'> 	synchronize_irq(adapter-&gt;pdev-&gt;irq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * atl1c_irq_reset - reset interrupt confiure on the NIC</div><div class='del'>- * @adapter: board private structure</div><div class='del'>- */</div><div class='del'>-static inline void atl1c_irq_reset(struct atl1c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	atomic_set(&amp;adapter-&gt;irq_sem, 1);</div><div class='del'>-	atl1c_irq_enable(adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * atl1c_wait_until_idle - wait up to AT_HW_MAX_IDLE_DELAY reads</div><div class='ctx'>  * of the idle status register until the device is actually idle</div><div class='hunk'>@@ -207,12 +227,12 @@ static u32 atl1c_wait_until_idle(struct atl1c_hw *hw, u32 modu_ctrl)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl1c_phy_config - Timer Call-back</div><div class='del'>- * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ * @t: timer list containing pointer to netdev cast into an unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static void atl1c_phy_config(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_adapter *adapter = from_timer(adapter, t,</div><div class='del'>-						   phy_config_timer);</div><div class='add'>+	struct atl1c_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							   phy_config_timer);</div><div class='ctx'> 	struct atl1c_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -223,7 +243,6 @@ static void atl1c_phy_config(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> void atl1c_reinit_locked(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(in_interrupt());</div><div class='ctx'> 	atl1c_down(adapter);</div><div class='ctx'> 	atl1c_up(adapter);</div><div class='ctx'> 	clear_bit(__AT_RESETTING, &amp;adapter-&gt;flags);</div><div class='hunk'>@@ -236,15 +255,14 @@ static void atl1c_check_link_status(struct atl1c_adapter *adapter)</div><div class='ctx'> 	struct pci_dev    *pdev   = adapter-&gt;pdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u16 speed, duplex, phy_data;</div><div class='add'>+	u16 speed, duplex;</div><div class='add'>+	bool link;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;adapter-&gt;mdio_lock, flags);</div><div class='del'>-	/* MII_BMSR must read twise */</div><div class='del'>-	atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='del'>-	atl1c_read_phy_reg(hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	link = atl1c_get_link_status(hw);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;adapter-&gt;mdio_lock, flags);</div><div class='ctx'> </div><div class='del'>-	if ((phy_data &amp; BMSR_LSTATUS) == 0) {</div><div class='add'>+	if (!link) {</div><div class='ctx'> 		/* link down */</div><div class='ctx'> 		netif_carrier_off(netdev);</div><div class='ctx'> 		hw-&gt;hibernate = true;</div><div class='hunk'>@@ -288,16 +306,13 @@ static void atl1c_link_chg_event(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	struct pci_dev    *pdev   = adapter-&gt;pdev;</div><div class='del'>-	u16 phy_data;</div><div class='del'>-	u16 link_up;</div><div class='add'>+	bool link;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;adapter-&gt;mdio_lock);</div><div class='del'>-	atl1c_read_phy_reg(&amp;adapter-&gt;hw, MII_BMSR, &amp;phy_data);</div><div class='del'>-	atl1c_read_phy_reg(&amp;adapter-&gt;hw, MII_BMSR, &amp;phy_data);</div><div class='add'>+	link = atl1c_get_link_status(&amp;adapter-&gt;hw);</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;mdio_lock);</div><div class='del'>-	link_up = phy_data &amp; BMSR_LSTATUS;</div><div class='ctx'> 	/* notify upper layer link down ASAP */</div><div class='del'>-	if (!link_up) {</div><div class='add'>+	if (!link) {</div><div class='ctx'> 		if (netif_carrier_ok(netdev)) {</div><div class='ctx'> 			/* old link state: Up */</div><div class='ctx'> 			netif_carrier_off(netdev);</div><div class='hunk'>@@ -342,15 +357,16 @@ static void atl1c_common_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void atl1c_del_timer(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl1c_tx_timeout - Respond to a Tx Hang</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='add'>+ * @txqueue: index of hanging tx queue</div><div class='ctx'>  */</div><div class='del'>-static void atl1c_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void atl1c_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -439,7 +455,7 @@ static void atl1c_restore_vlan(struct atl1c_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atl1c_set_mac - Change the Ethernet Address of the NIC</div><div class='add'>+ * atl1c_set_mac_addr - Change the Ethernet Address of the NIC</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @p: pointer to an address structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -456,7 +472,7 @@ static int atl1c_set_mac_addr(struct net_device *netdev, void *p)</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	memcpy(adapter-&gt;hw.mac_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	atl1c_hw_set_mac_addr(&amp;adapter-&gt;hw, adapter-&gt;hw.mac_addr);</div><div class='hunk'>@@ -467,20 +483,18 @@ static int atl1c_set_mac_addr(struct net_device *netdev, void *p)</div><div class='ctx'> static void atl1c_set_rxbufsize(struct atl1c_adapter *adapter,</div><div class='ctx'> 				struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	unsigned int head_size;</div><div class='ctx'> 	int mtu = dev-&gt;mtu;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;rx_buffer_len = mtu &gt; AT_RX_BUF_SIZE ?</div><div class='ctx'> 		roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE;</div><div class='del'>-</div><div class='del'>-	head_size = SKB_DATA_ALIGN(adapter-&gt;rx_buffer_len + NET_SKB_PAD) +</div><div class='del'>-		    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='del'>-	adapter-&gt;rx_frag_size = roundup_pow_of_two(head_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_features_t atl1c_fix_features(struct net_device *netdev,</div><div class='ctx'> 	netdev_features_t features)</div><div class='ctx'> {</div><div class='add'>+	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct atl1c_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Since there is no support for separate rx/tx vlan accel</div><div class='ctx'> 	 * enable/disable make sure tx flag is always in same state as rx.</div><div class='hunk'>@@ -490,8 +504,10 @@ static netdev_features_t atl1c_fix_features(struct net_device *netdev,</div><div class='ctx'> 	else</div><div class='ctx'> 		features &amp;= ~NETIF_F_HW_VLAN_CTAG_TX;</div><div class='ctx'> </div><div class='del'>-	if (netdev-&gt;mtu &gt; MAX_TSO_FRAME_SIZE)</div><div class='del'>-		features &amp;= ~(NETIF_F_TSO | NETIF_F_TSO6);</div><div class='add'>+	if (hw-&gt;nic_type != athr_mt) {</div><div class='add'>+		if (netdev-&gt;mtu &gt; MAX_TSO_FRAME_SIZE)</div><div class='add'>+			features &amp;= ~(NETIF_F_TSO | NETIF_F_TSO6);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='hunk'>@@ -518,9 +534,12 @@ static void atl1c_set_max_mtu(struct net_device *netdev)</div><div class='ctx'> 	case athr_l1d:</div><div class='ctx'> 	case athr_l1d_2:</div><div class='ctx'> 		netdev-&gt;max_mtu = MAX_JUMBO_FRAME_SIZE -</div><div class='del'>-				  (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);</div><div class='add'>+			(ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);</div><div class='ctx'> 		break;</div><div class='del'>-	/* The 10/100 devices don't support jumbo packets, max_mtu 1500 */</div><div class='add'>+	case athr_mt:</div><div class='add'>+		netdev-&gt;max_mtu = 9500;</div><div class='add'>+		break;</div><div class='add'>+		/* The 10/100 devices don't support jumbo packets, max_mtu 1500 */</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev-&gt;max_mtu = ETH_DATA_LEN;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -542,7 +561,7 @@ static int atl1c_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		while (test_and_set_bit(__AT_RESETTING, &amp;adapter-&gt;flags))</div><div class='ctx'> 			msleep(1);</div><div class='del'>-		netdev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 		adapter-&gt;hw.max_frame_size = new_mtu;</div><div class='ctx'> 		atl1c_set_rxbufsize(adapter, netdev);</div><div class='ctx'> 		atl1c_down(adapter);</div><div class='hunk'>@@ -645,29 +664,26 @@ static int atl1c_alloc_queues(struct atl1c_adapter *adapter)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl1c_set_mac_type(struct atl1c_hw *hw)</div><div class='add'>+static enum atl1c_nic_type atl1c_get_mac_type(struct pci_dev *pdev,</div><div class='add'>+					      u8 __iomem *hw_addr)</div><div class='ctx'> {</div><div class='del'>-	switch (hw-&gt;device_id) {</div><div class='add'>+	switch (pdev-&gt;device) {</div><div class='ctx'> 	case PCI_DEVICE_ID_ATTANSIC_L2C:</div><div class='del'>-		hw-&gt;nic_type = athr_l2c;</div><div class='del'>-		break;</div><div class='add'>+		return athr_l2c;</div><div class='ctx'> 	case PCI_DEVICE_ID_ATTANSIC_L1C:</div><div class='del'>-		hw-&gt;nic_type = athr_l1c;</div><div class='del'>-		break;</div><div class='add'>+		return athr_l1c;</div><div class='ctx'> 	case PCI_DEVICE_ID_ATHEROS_L2C_B:</div><div class='del'>-		hw-&gt;nic_type = athr_l2c_b;</div><div class='del'>-		break;</div><div class='add'>+		return athr_l2c_b;</div><div class='ctx'> 	case PCI_DEVICE_ID_ATHEROS_L2C_B2:</div><div class='del'>-		hw-&gt;nic_type = athr_l2c_b2;</div><div class='del'>-		break;</div><div class='add'>+		return athr_l2c_b2;</div><div class='ctx'> 	case PCI_DEVICE_ID_ATHEROS_L1D:</div><div class='del'>-		hw-&gt;nic_type = athr_l1d;</div><div class='del'>-		break;</div><div class='add'>+		return athr_l1d;</div><div class='ctx'> 	case PCI_DEVICE_ID_ATHEROS_L1D_2_0:</div><div class='del'>-		hw-&gt;nic_type = athr_l1d_2;</div><div class='del'>-		break;</div><div class='add'>+		if (readl(hw_addr + REG_MT_MAGIC) == MT_MAGIC)</div><div class='add'>+			return athr_mt;</div><div class='add'>+		return athr_l1d_2;</div><div class='ctx'> 	default:</div><div class='del'>-		break;</div><div class='add'>+		return athr_l1c;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -675,7 +691,6 @@ static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)</div><div class='ctx'> {</div><div class='ctx'> 	u32 link_ctrl_data;</div><div class='ctx'> </div><div class='del'>-	atl1c_set_mac_type(hw);</div><div class='ctx'> 	AT_READ_REG(hw, REG_LINK_CTRL, &amp;link_ctrl_data);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;ctrl_flags = ATL1C_INTR_MODRT_ENABLE  |</div><div class='hunk'>@@ -766,14 +781,14 @@ static int atl1c_sw_init(struct atl1c_adapter *adapter)</div><div class='ctx'> 	struct atl1c_hw *hw   = &amp;adapter-&gt;hw;</div><div class='ctx'> 	struct pci_dev	*pdev = adapter-&gt;pdev;</div><div class='ctx'> 	u32 revision;</div><div class='del'>-</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;wol = 0;</div><div class='ctx'> 	device_set_wakeup_enable(&amp;pdev-&gt;dev, false);</div><div class='ctx'> 	adapter-&gt;link_speed = SPEED_0;</div><div class='ctx'> 	adapter-&gt;link_duplex = FULL_DUPLEX;</div><div class='ctx'> 	adapter-&gt;tpd_ring[0].count = 1024;</div><div class='del'>-	adapter-&gt;rfd_ring.count = 512;</div><div class='add'>+	adapter-&gt;rfd_ring[0].count = 512;</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;vendor_id = pdev-&gt;vendor;</div><div class='ctx'> 	hw-&gt;device_id = pdev-&gt;device;</div><div class='hunk'>@@ -791,6 +806,10 @@ static int atl1c_sw_init(struct atl1c_adapter *adapter)</div><div class='ctx'> 	atl1c_patch_assign(hw);</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;intr_mask = IMR_NORMAL_MASK;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; ++i)</div><div class='add'>+		hw-&gt;intr_mask |= atl1c_qregs[i].tx_isr;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i)</div><div class='add'>+		hw-&gt;intr_mask |= atl1c_qregs[i].rx_isr;</div><div class='ctx'> 	hw-&gt;phy_configured = false;</div><div class='ctx'> 	hw-&gt;preamble_len = 7;</div><div class='ctx'> 	hw-&gt;max_frame_size = adapter-&gt;netdev-&gt;mtu;</div><div class='hunk'>@@ -816,32 +835,34 @@ static int atl1c_sw_init(struct atl1c_adapter *adapter)</div><div class='ctx'> 	atl1c_set_rxbufsize(adapter, adapter-&gt;netdev);</div><div class='ctx'> 	atomic_set(&amp;adapter-&gt;irq_sem, 1);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;mdio_lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;hw.intr_mask_lock);</div><div class='ctx'> 	set_bit(__AT_DOWN, &amp;adapter-&gt;flags);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void atl1c_clean_buffer(struct pci_dev *pdev,</div><div class='del'>-				struct atl1c_buffer *buffer_info)</div><div class='add'>+				      struct atl1c_buffer *buffer_info,</div><div class='add'>+				      int budget)</div><div class='ctx'> {</div><div class='ctx'> 	u16 pci_driection;</div><div class='ctx'> 	if (buffer_info-&gt;flags &amp; ATL1C_BUFFER_FREE)</div><div class='ctx'> 		return;</div><div class='ctx'> 	if (buffer_info-&gt;dma) {</div><div class='ctx'> 		if (buffer_info-&gt;flags &amp; ATL1C_PCIMAP_FROMDEVICE)</div><div class='del'>-			pci_driection = PCI_DMA_FROMDEVICE;</div><div class='add'>+			pci_driection = DMA_FROM_DEVICE;</div><div class='ctx'> 		else</div><div class='del'>-			pci_driection = PCI_DMA_TODEVICE;</div><div class='add'>+			pci_driection = DMA_TO_DEVICE;</div><div class='ctx'> </div><div class='ctx'> 		if (buffer_info-&gt;flags &amp; ATL1C_PCIMAP_SINGLE)</div><div class='del'>-			pci_unmap_single(pdev, buffer_info-&gt;dma,</div><div class='del'>-					buffer_info-&gt;length, pci_driection);</div><div class='add'>+			dma_unmap_single(&amp;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+					 buffer_info-&gt;length, pci_driection);</div><div class='ctx'> 		else if (buffer_info-&gt;flags &amp; ATL1C_PCIMAP_PAGE)</div><div class='del'>-			pci_unmap_page(pdev, buffer_info-&gt;dma,</div><div class='del'>-					buffer_info-&gt;length, pci_driection);</div><div class='add'>+			dma_unmap_page(&amp;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+				       buffer_info-&gt;length, pci_driection);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (buffer_info-&gt;skb)</div><div class='del'>-		dev_consume_skb_any(buffer_info-&gt;skb);</div><div class='add'>+		napi_consume_skb(buffer_info-&gt;skb, budget);</div><div class='ctx'> 	buffer_info-&gt;dma = 0;</div><div class='ctx'> 	buffer_info-&gt;skb = NULL;</div><div class='ctx'> 	ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);</div><div class='hunk'>@@ -849,11 +870,12 @@ static inline void atl1c_clean_buffer(struct pci_dev *pdev,</div><div class='ctx'> /**</div><div class='ctx'>  * atl1c_clean_tx_ring - Free Tx-skb</div><div class='ctx'>  * @adapter: board private structure</div><div class='add'>+ * @queue: idx of transmit queue</div><div class='ctx'>  */</div><div class='ctx'> static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,</div><div class='del'>-				enum atl1c_trans_queue type)</div><div class='add'>+				u32 queue)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[type];</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[queue];</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	u16 index, ring_count;</div><div class='hunk'>@@ -861,10 +883,10 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,</div><div class='ctx'> 	ring_count = tpd_ring-&gt;count;</div><div class='ctx'> 	for (index = 0; index &lt; ring_count; index++) {</div><div class='ctx'> 		buffer_info = &amp;tpd_ring-&gt;buffer_info[index];</div><div class='del'>-		atl1c_clean_buffer(pdev, buffer_info);</div><div class='add'>+		atl1c_clean_buffer(pdev, buffer_info, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_reset_queue(adapter-&gt;netdev);</div><div class='add'>+	netdev_tx_reset_queue(netdev_get_tx_queue(adapter-&gt;netdev, queue));</div><div class='ctx'> </div><div class='ctx'> 	/* Zero out Tx-buffers */</div><div class='ctx'> 	memset(tpd_ring-&gt;desc, 0, sizeof(struct atl1c_tpd_desc) *</div><div class='hunk'>@@ -876,18 +898,19 @@ static void atl1c_clean_tx_ring(struct atl1c_adapter *adapter,</div><div class='ctx'> /**</div><div class='ctx'>  * atl1c_clean_rx_ring - Free rx-reservation skbs</div><div class='ctx'>  * @adapter: board private structure</div><div class='add'>+ * @queue: idx of transmit queue</div><div class='ctx'>  */</div><div class='del'>-static void atl1c_clean_rx_ring(struct atl1c_adapter *adapter)</div><div class='add'>+static void atl1c_clean_rx_ring(struct atl1c_adapter *adapter, u32 queue)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring;</div><div class='del'>-	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring;</div><div class='add'>+	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring[queue];</div><div class='add'>+	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring[queue];</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; rfd_ring-&gt;count; j++) {</div><div class='ctx'> 		buffer_info = &amp;rfd_ring-&gt;buffer_info[j];</div><div class='del'>-		atl1c_clean_buffer(pdev, buffer_info);</div><div class='add'>+		atl1c_clean_buffer(pdev, buffer_info, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* zero out the descriptor ring */</div><div class='ctx'> 	memset(rfd_ring-&gt;desc, 0, rfd_ring-&gt;size);</div><div class='hunk'>@@ -903,26 +926,28 @@ static void atl1c_clean_rx_ring(struct atl1c_adapter *adapter)</div><div class='ctx'> static void atl1c_init_ring_ptrs(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_tpd_ring *tpd_ring = adapter-&gt;tpd_ring;</div><div class='del'>-	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring;</div><div class='del'>-	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring;</div><div class='add'>+	struct atl1c_rfd_ring *rfd_ring = adapter-&gt;rfd_ring;</div><div class='add'>+	struct atl1c_rrd_ring *rrd_ring = adapter-&gt;rrd_ring;</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='ctx'> 	int i, j;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; AT_MAX_TRANSMIT_QUEUE; i++) {</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; i++) {</div><div class='ctx'> 		tpd_ring[i].next_to_use = 0;</div><div class='ctx'> 		atomic_set(&amp;tpd_ring[i].next_to_clean, 0);</div><div class='ctx'> 		buffer_info = tpd_ring[i].buffer_info;</div><div class='ctx'> 		for (j = 0; j &lt; tpd_ring-&gt;count; j++)</div><div class='ctx'> 			ATL1C_SET_BUFFER_STATE(&amp;buffer_info[i],</div><div class='del'>-					ATL1C_BUFFER_FREE);</div><div class='del'>-	}</div><div class='del'>-	rfd_ring-&gt;next_to_use = 0;</div><div class='del'>-	rfd_ring-&gt;next_to_clean = 0;</div><div class='del'>-	rrd_ring-&gt;next_to_use = 0;</div><div class='del'>-	rrd_ring-&gt;next_to_clean = 0;</div><div class='del'>-	for (j = 0; j &lt; rfd_ring-&gt;count; j++) {</div><div class='del'>-		buffer_info = &amp;rfd_ring-&gt;buffer_info[j];</div><div class='del'>-		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);</div><div class='add'>+					       ATL1C_BUFFER_FREE);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; i++) {</div><div class='add'>+		rfd_ring[i].next_to_use = 0;</div><div class='add'>+		rfd_ring[i].next_to_clean = 0;</div><div class='add'>+		rrd_ring[i].next_to_use = 0;</div><div class='add'>+		rrd_ring[i].next_to_clean = 0;</div><div class='add'>+		for (j = 0; j &lt; rfd_ring[i].count; j++) {</div><div class='add'>+			buffer_info = &amp;rfd_ring[i].buffer_info[j];</div><div class='add'>+			ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -936,25 +961,21 @@ static void atl1c_free_ring_resources(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(pdev, adapter-&gt;ring_header.size,</div><div class='del'>-					adapter-&gt;ring_header.desc,</div><div class='del'>-					adapter-&gt;ring_header.dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, adapter-&gt;ring_header.size,</div><div class='add'>+			  adapter-&gt;ring_header.desc, adapter-&gt;ring_header.dma);</div><div class='ctx'> 	adapter-&gt;ring_header.desc = NULL;</div><div class='ctx'> </div><div class='ctx'> 	/* Note: just free tdp_ring.buffer_info,</div><div class='del'>-	*  it contain rfd_ring.buffer_info, do not double free */</div><div class='add'>+	 * it contain rfd_ring.buffer_info, do not double free</div><div class='add'>+	 */</div><div class='ctx'> 	if (adapter-&gt;tpd_ring[0].buffer_info) {</div><div class='ctx'> 		kfree(adapter-&gt;tpd_ring[0].buffer_info);</div><div class='ctx'> 		adapter-&gt;tpd_ring[0].buffer_info = NULL;</div><div class='ctx'> 	}</div><div class='del'>-	if (adapter-&gt;rx_page) {</div><div class='del'>-		put_page(adapter-&gt;rx_page);</div><div class='del'>-		adapter-&gt;rx_page = NULL;</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atl1c_setup_mem_resources - allocate Tx / RX descriptor resources</div><div class='add'>+ * atl1c_setup_ring_resources - allocate Tx / RX descriptor resources</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success, negative on failure</div><div class='hunk'>@@ -963,47 +984,56 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	struct atl1c_tpd_ring *tpd_ring = adapter-&gt;tpd_ring;</div><div class='del'>-	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring;</div><div class='del'>-	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring;</div><div class='add'>+	struct atl1c_rfd_ring *rfd_ring = adapter-&gt;rfd_ring;</div><div class='add'>+	struct atl1c_rrd_ring *rrd_ring = adapter-&gt;rrd_ring;</div><div class='ctx'> 	struct atl1c_ring_header *ring_header = &amp;adapter-&gt;ring_header;</div><div class='add'>+	int tqc = adapter-&gt;tx_queue_count;</div><div class='add'>+	int rqc = adapter-&gt;rx_queue_count;</div><div class='ctx'> 	int size;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int count = 0;</div><div class='del'>-	int rx_desc_count = 0;</div><div class='ctx'> 	u32 offset = 0;</div><div class='ctx'> </div><div class='del'>-	rrd_ring-&gt;count = rfd_ring-&gt;count;</div><div class='del'>-	for (i = 1; i &lt; AT_MAX_TRANSMIT_QUEUE; i++)</div><div class='add'>+	/* Even though only one tpd queue is actually used, the "high"</div><div class='add'>+	 * priority tpd queue also gets initialized</div><div class='add'>+	 */</div><div class='add'>+	if (tqc == 1)</div><div class='add'>+		tqc = 2;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; tqc; i++)</div><div class='ctx'> 		tpd_ring[i].count = tpd_ring[0].count;</div><div class='ctx'> </div><div class='del'>-	/* 2 tpd queue, one high priority queue,</div><div class='del'>-	 * another normal priority queue */</div><div class='del'>-	size = sizeof(struct atl1c_buffer) * (tpd_ring-&gt;count * 2 +</div><div class='del'>-		rfd_ring-&gt;count);</div><div class='add'>+	size = sizeof(struct atl1c_buffer) * (tpd_ring-&gt;count * tqc +</div><div class='add'>+					      rfd_ring-&gt;count * rqc);</div><div class='ctx'> 	tpd_ring-&gt;buffer_info = kzalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!tpd_ring-&gt;buffer_info))</div><div class='ctx'> 		goto err_nomem;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; AT_MAX_TRANSMIT_QUEUE; i++) {</div><div class='del'>-		tpd_ring[i].buffer_info =</div><div class='del'>-			(tpd_ring-&gt;buffer_info + count);</div><div class='add'>+	for (i = 0; i &lt; tqc; i++) {</div><div class='add'>+		tpd_ring[i].adapter = adapter;</div><div class='add'>+		tpd_ring[i].num = i;</div><div class='add'>+		tpd_ring[i].buffer_info = (tpd_ring-&gt;buffer_info + count);</div><div class='ctx'> 		count += tpd_ring[i].count;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rfd_ring-&gt;buffer_info =</div><div class='del'>-		(tpd_ring-&gt;buffer_info + count);</div><div class='del'>-	count += rfd_ring-&gt;count;</div><div class='del'>-	rx_desc_count += rfd_ring-&gt;count;</div><div class='add'>+	for (i = 0; i &lt; rqc; i++) {</div><div class='add'>+		rrd_ring[i].adapter = adapter;</div><div class='add'>+		rrd_ring[i].num = i;</div><div class='add'>+		rrd_ring[i].count = rfd_ring[0].count;</div><div class='add'>+		rfd_ring[i].count = rfd_ring[0].count;</div><div class='add'>+		rfd_ring[i].buffer_info = (tpd_ring-&gt;buffer_info + count);</div><div class='add'>+		count += rfd_ring-&gt;count;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * real ring DMA buffer</div><div class='ctx'> 	 * each ring/block may need up to 8 bytes for alignment, hence the</div><div class='ctx'> 	 * additional bytes tacked onto the end.</div><div class='ctx'> 	 */</div><div class='del'>-	ring_header-&gt;size = size =</div><div class='del'>-		sizeof(struct atl1c_tpd_desc) * tpd_ring-&gt;count * 2 +</div><div class='del'>-		sizeof(struct atl1c_rx_free_desc) * rx_desc_count +</div><div class='del'>-		sizeof(struct atl1c_recv_ret_status) * rx_desc_count +</div><div class='add'>+	ring_header-&gt;size =</div><div class='add'>+		sizeof(struct atl1c_tpd_desc) * tpd_ring-&gt;count * tqc +</div><div class='add'>+		sizeof(struct atl1c_rx_free_desc) * rfd_ring-&gt;count * rqc +</div><div class='add'>+		sizeof(struct atl1c_recv_ret_status) * rfd_ring-&gt;count * rqc +</div><div class='ctx'> 		8 * 4;</div><div class='ctx'> </div><div class='ctx'> 	ring_header-&gt;desc = dma_alloc_coherent(&amp;pdev-&gt;dev, ring_header-&gt;size,</div><div class='hunk'>@@ -1016,25 +1046,28 @@ static int atl1c_setup_ring_resources(struct atl1c_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	tpd_ring[0].dma = roundup(ring_header-&gt;dma, 8);</div><div class='ctx'> 	offset = tpd_ring[0].dma - ring_header-&gt;dma;</div><div class='del'>-	for (i = 0; i &lt; AT_MAX_TRANSMIT_QUEUE; i++) {</div><div class='add'>+	for (i = 0; i &lt; tqc; i++) {</div><div class='ctx'> 		tpd_ring[i].dma = ring_header-&gt;dma + offset;</div><div class='del'>-		tpd_ring[i].desc = (u8 *) ring_header-&gt;desc + offset;</div><div class='add'>+		tpd_ring[i].desc = (u8 *)ring_header-&gt;desc + offset;</div><div class='ctx'> 		tpd_ring[i].size =</div><div class='ctx'> 			sizeof(struct atl1c_tpd_desc) * tpd_ring[i].count;</div><div class='ctx'> 		offset += roundup(tpd_ring[i].size, 8);</div><div class='ctx'> 	}</div><div class='del'>-	/* init RFD ring */</div><div class='del'>-	rfd_ring-&gt;dma = ring_header-&gt;dma + offset;</div><div class='del'>-	rfd_ring-&gt;desc = (u8 *) ring_header-&gt;desc + offset;</div><div class='del'>-	rfd_ring-&gt;size = sizeof(struct atl1c_rx_free_desc) * rfd_ring-&gt;count;</div><div class='del'>-	offset += roundup(rfd_ring-&gt;size, 8);</div><div class='add'>+	for (i = 0; i &lt; rqc; i++) {</div><div class='add'>+		/* init RFD ring */</div><div class='add'>+		rfd_ring[i].dma = ring_header-&gt;dma + offset;</div><div class='add'>+		rfd_ring[i].desc = (u8 *)ring_header-&gt;desc + offset;</div><div class='add'>+		rfd_ring[i].size = sizeof(struct atl1c_rx_free_desc) *</div><div class='add'>+			rfd_ring[i].count;</div><div class='add'>+		offset += roundup(rfd_ring[i].size, 8);</div><div class='ctx'> </div><div class='del'>-	/* init RRD ring */</div><div class='del'>-	rrd_ring-&gt;dma = ring_header-&gt;dma + offset;</div><div class='del'>-	rrd_ring-&gt;desc = (u8 *) ring_header-&gt;desc + offset;</div><div class='del'>-	rrd_ring-&gt;size = sizeof(struct atl1c_recv_ret_status) *</div><div class='del'>-		rrd_ring-&gt;count;</div><div class='del'>-	offset += roundup(rrd_ring-&gt;size, 8);</div><div class='add'>+		/* init RRD ring */</div><div class='add'>+		rrd_ring[i].dma = ring_header-&gt;dma + offset;</div><div class='add'>+		rrd_ring[i].desc = (u8 *)ring_header-&gt;desc + offset;</div><div class='add'>+		rrd_ring[i].size = sizeof(struct atl1c_recv_ret_status) *</div><div class='add'>+			rrd_ring[i].count;</div><div class='add'>+		offset += roundup(rrd_ring[i].size, 8);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1046,31 +1079,34 @@ err_nomem:</div><div class='ctx'> static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_hw *hw = &amp;adapter-&gt;hw;</div><div class='del'>-	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring;</div><div class='del'>-	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring;</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = (struct atl1c_tpd_ring *)</div><div class='del'>-				adapter-&gt;tpd_ring;</div><div class='add'>+	struct atl1c_rfd_ring *rfd_ring = adapter-&gt;rfd_ring;</div><div class='add'>+	struct atl1c_rrd_ring *rrd_ring = adapter-&gt;rrd_ring;</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring = adapter-&gt;tpd_ring;</div><div class='add'>+	int i;</div><div class='add'>+	int tx_queue_count = adapter-&gt;tx_queue_count;</div><div class='add'>+</div><div class='add'>+	if (tx_queue_count == 1)</div><div class='add'>+		tx_queue_count = 2;</div><div class='ctx'> </div><div class='ctx'> 	/* TPD */</div><div class='ctx'> 	AT_WRITE_REG(hw, REG_TX_BASE_ADDR_HI,</div><div class='del'>-			(u32)((tpd_ring[atl1c_trans_normal].dma &amp;</div><div class='del'>-				AT_DMA_HI_ADDR_MASK) &gt;&gt; 32));</div><div class='add'>+		     (u32)((tpd_ring[0].dma &amp; AT_DMA_HI_ADDR_MASK) &gt;&gt; 32));</div><div class='ctx'> 	/* just enable normal priority TX queue */</div><div class='del'>-	AT_WRITE_REG(hw, REG_TPD_PRI0_ADDR_LO,</div><div class='del'>-			(u32)(tpd_ring[atl1c_trans_normal].dma &amp;</div><div class='del'>-				AT_DMA_LO_ADDR_MASK));</div><div class='del'>-	AT_WRITE_REG(hw, REG_TPD_PRI1_ADDR_LO,</div><div class='del'>-			(u32)(tpd_ring[atl1c_trans_high].dma &amp;</div><div class='del'>-				AT_DMA_LO_ADDR_MASK));</div><div class='add'>+	for (i = 0; i &lt; tx_queue_count; i++) {</div><div class='add'>+		AT_WRITE_REG(hw, atl1c_qregs[i].tpd_addr_lo,</div><div class='add'>+			     (u32)(tpd_ring[i].dma &amp; AT_DMA_LO_ADDR_MASK));</div><div class='add'>+	}</div><div class='ctx'> 	AT_WRITE_REG(hw, REG_TPD_RING_SIZE,</div><div class='ctx'> 			(u32)(tpd_ring[0].count &amp; TPD_RING_SIZE_MASK));</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* RFD */</div><div class='ctx'> 	AT_WRITE_REG(hw, REG_RX_BASE_ADDR_HI,</div><div class='del'>-			(u32)((rfd_ring-&gt;dma &amp; AT_DMA_HI_ADDR_MASK) &gt;&gt; 32));</div><div class='del'>-	AT_WRITE_REG(hw, REG_RFD0_HEAD_ADDR_LO,</div><div class='del'>-			(u32)(rfd_ring-&gt;dma &amp; AT_DMA_LO_ADDR_MASK));</div><div class='add'>+		     (u32)((rfd_ring-&gt;dma &amp; AT_DMA_HI_ADDR_MASK) &gt;&gt; 32));</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; i++) {</div><div class='add'>+		AT_WRITE_REG(hw, atl1c_qregs[i].rfd_addr_lo,</div><div class='add'>+			     (u32)(rfd_ring[i].dma &amp; AT_DMA_LO_ADDR_MASK));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	AT_WRITE_REG(hw, REG_RFD_RING_SIZE,</div><div class='ctx'> 			rfd_ring-&gt;count &amp; RFD_RING_SIZE_MASK);</div><div class='hunk'>@@ -1078,8 +1114,10 @@ static void atl1c_configure_des_ring(struct atl1c_adapter *adapter)</div><div class='ctx'> 			adapter-&gt;rx_buffer_len &amp; RX_BUF_SIZE_MASK);</div><div class='ctx'> </div><div class='ctx'> 	/* RRD */</div><div class='del'>-	AT_WRITE_REG(hw, REG_RRD0_HEAD_ADDR_LO,</div><div class='del'>-			(u32)(rrd_ring-&gt;dma &amp; AT_DMA_LO_ADDR_MASK));</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; i++) {</div><div class='add'>+		AT_WRITE_REG(hw, atl1c_qregs[i].rrd_addr_lo,</div><div class='add'>+			     (u32)(rrd_ring[i].dma &amp; AT_DMA_LO_ADDR_MASK));</div><div class='add'>+	}</div><div class='ctx'> 	AT_WRITE_REG(hw, REG_RRD_RING_SIZE,</div><div class='ctx'> 			(rrd_ring-&gt;count &amp; RRD_RING_SIZE_MASK));</div><div class='ctx'> </div><div class='hunk'>@@ -1189,7 +1227,7 @@ static void atl1c_start_mac(struct atl1c_adapter *adapter)</div><div class='ctx'> 	struct atl1c_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 mac, txq, rxq;</div><div class='ctx'> </div><div class='del'>-	hw-&gt;mac_duplex = adapter-&gt;link_duplex == FULL_DUPLEX ? true : false;</div><div class='add'>+	hw-&gt;mac_duplex = adapter-&gt;link_duplex == FULL_DUPLEX;</div><div class='ctx'> 	hw-&gt;mac_speed = adapter-&gt;link_speed == SPEED_1000 ?</div><div class='ctx'> 		atl1c_mac_speed_1000 : atl1c_mac_speed_10_100;</div><div class='ctx'> </div><div class='hunk'>@@ -1360,7 +1398,7 @@ static void atl1c_set_aspm(struct atl1c_hw *hw, u16 link_speed)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atl1c_configure - Configure Transmit&amp;Receive Unit after Reset</div><div class='add'>+ * atl1c_configure_mac - Configure Transmit&amp;Receive Unit after Reset</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Configure the Tx /Rx unit of the MAC after a reset.</div><div class='hunk'>@@ -1432,14 +1470,28 @@ static int atl1c_configure(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	int num;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;hw.nic_type == athr_mt) {</div><div class='add'>+		u32 mode;</div><div class='add'>+</div><div class='add'>+		AT_READ_REG(&amp;adapter-&gt;hw, REG_MT_MODE, &amp;mode);</div><div class='add'>+		if (adapter-&gt;rx_queue_count == 4)</div><div class='add'>+			mode |= MT_MODE_4Q;</div><div class='add'>+		else</div><div class='add'>+			mode &amp;= ~MT_MODE_4Q;</div><div class='add'>+		AT_WRITE_REG(&amp;adapter-&gt;hw, REG_MT_MODE, mode);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	atl1c_init_ring_ptrs(adapter);</div><div class='ctx'> 	atl1c_set_multi(netdev);</div><div class='ctx'> 	atl1c_restore_vlan(adapter);</div><div class='ctx'> </div><div class='del'>-	num = atl1c_alloc_rx_buffer(adapter);</div><div class='del'>-	if (unlikely(num == 0))</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i) {</div><div class='add'>+		num = atl1c_alloc_rx_buffer(adapter, i, false);</div><div class='add'>+		if (unlikely(num == 0))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (atl1c_configure_mac(adapter))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -1533,20 +1585,22 @@ static inline void atl1c_clear_phy_int(struct atl1c_adapter *adapter)</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;mdio_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,</div><div class='del'>-				enum atl1c_trans_queue type)</div><div class='add'>+static int atl1c_clean_tx(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[type];</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring =</div><div class='add'>+		container_of(napi, struct atl1c_tpd_ring, napi);</div><div class='add'>+	struct atl1c_adapter *adapter = tpd_ring-&gt;adapter;</div><div class='add'>+	struct netdev_queue *txq =</div><div class='add'>+		netdev_get_tx_queue(napi-&gt;dev, tpd_ring-&gt;num);</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	u16 next_to_clean = atomic_read(&amp;tpd_ring-&gt;next_to_clean);</div><div class='ctx'> 	u16 hw_next_to_clean;</div><div class='del'>-	u16 reg;</div><div class='ctx'> 	unsigned int total_bytes = 0, total_packets = 0;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	reg = type == atl1c_trans_high ? REG_TPD_PRI1_CIDX : REG_TPD_PRI0_CIDX;</div><div class='del'>-</div><div class='del'>-	AT_READ_REGW(&amp;adapter-&gt;hw, reg, &amp;hw_next_to_clean);</div><div class='add'>+	AT_READ_REGW(&amp;adapter-&gt;hw, atl1c_qregs[tpd_ring-&gt;num].tpd_cons,</div><div class='add'>+		     &amp;hw_next_to_clean);</div><div class='ctx'> </div><div class='ctx'> 	while (next_to_clean != hw_next_to_clean) {</div><div class='ctx'> 		buffer_info = &amp;tpd_ring-&gt;buffer_info[next_to_clean];</div><div class='hunk'>@@ -1554,20 +1608,58 @@ static bool atl1c_clean_tx_irq(struct atl1c_adapter *adapter,</div><div class='ctx'> 			total_bytes += buffer_info-&gt;skb-&gt;len;</div><div class='ctx'> 			total_packets++;</div><div class='ctx'> 		}</div><div class='del'>-		atl1c_clean_buffer(pdev, buffer_info);</div><div class='add'>+		atl1c_clean_buffer(pdev, buffer_info, budget);</div><div class='ctx'> 		if (++next_to_clean == tpd_ring-&gt;count)</div><div class='ctx'> 			next_to_clean = 0;</div><div class='ctx'> 		atomic_set(&amp;tpd_ring-&gt;next_to_clean, next_to_clean);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_completed_queue(adapter-&gt;netdev, total_packets, total_bytes);</div><div class='add'>+	netdev_tx_completed_queue(txq, total_packets, total_bytes);</div><div class='ctx'> </div><div class='del'>-	if (netif_queue_stopped(adapter-&gt;netdev) &amp;&amp;</div><div class='del'>-			netif_carrier_ok(adapter-&gt;netdev)) {</div><div class='del'>-		netif_wake_queue(adapter-&gt;netdev);</div><div class='add'>+	if (netif_tx_queue_stopped(txq) &amp;&amp; netif_carrier_ok(adapter-&gt;netdev))</div><div class='add'>+		netif_tx_wake_queue(txq);</div><div class='add'>+</div><div class='add'>+	if (total_packets &lt; budget) {</div><div class='add'>+		napi_complete_done(napi, total_packets);</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;hw.intr_mask_lock, flags);</div><div class='add'>+		adapter-&gt;hw.intr_mask |= atl1c_qregs[tpd_ring-&gt;num].tx_isr;</div><div class='add'>+		AT_WRITE_REG(&amp;adapter-&gt;hw, REG_IMR, adapter-&gt;hw.intr_mask);</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;hw.intr_mask_lock, flags);</div><div class='add'>+		return total_packets;</div><div class='ctx'> 	}</div><div class='add'>+	return budget;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void atl1c_intr_rx_tx(struct atl1c_adapter *adapter, u32 status)</div><div class='add'>+{</div><div class='add'>+	struct atl1c_hw *hw = &amp;adapter-&gt;hw;</div><div class='add'>+	u32 intr_mask;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	return true;</div><div class='add'>+	spin_lock(&amp;hw-&gt;intr_mask_lock);</div><div class='add'>+	intr_mask = hw-&gt;intr_mask;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i) {</div><div class='add'>+		if (!(status &amp; atl1c_qregs[i].rx_isr))</div><div class='add'>+			continue;</div><div class='add'>+		if (napi_schedule_prep(&amp;adapter-&gt;rrd_ring[i].napi)) {</div><div class='add'>+			intr_mask &amp;= ~atl1c_qregs[i].rx_isr;</div><div class='add'>+			__napi_schedule(&amp;adapter-&gt;rrd_ring[i].napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; ++i) {</div><div class='add'>+		if (!(status &amp; atl1c_qregs[i].tx_isr))</div><div class='add'>+			continue;</div><div class='add'>+		if (napi_schedule_prep(&amp;adapter-&gt;tpd_ring[i].napi)) {</div><div class='add'>+			intr_mask &amp;= ~atl1c_qregs[i].tx_isr;</div><div class='add'>+			__napi_schedule(&amp;adapter-&gt;tpd_ring[i].napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hw-&gt;intr_mask != intr_mask) {</div><div class='add'>+		hw-&gt;intr_mask = intr_mask;</div><div class='add'>+		AT_WRITE_REG(hw, REG_IMR, hw-&gt;intr_mask);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;hw-&gt;intr_mask_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -1600,15 +1692,8 @@ static irqreturn_t atl1c_intr(int irq, void *data)</div><div class='ctx'> 			atl1c_clear_phy_int(adapter);</div><div class='ctx'> 		/* Ack ISR */</div><div class='ctx'> 		AT_WRITE_REG(hw, REG_ISR, status | ISR_DIS_INT);</div><div class='del'>-		if (status &amp; ISR_RX_PKT) {</div><div class='del'>-			if (likely(napi_schedule_prep(&amp;adapter-&gt;napi))) {</div><div class='del'>-				hw-&gt;intr_mask &amp;= ~ISR_RX_PKT;</div><div class='del'>-				AT_WRITE_REG(hw, REG_IMR, hw-&gt;intr_mask);</div><div class='del'>-				__napi_schedule(&amp;adapter-&gt;napi);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (status &amp; ISR_TX_PKT)</div><div class='del'>-			atl1c_clean_tx_irq(adapter, atl1c_trans_normal);</div><div class='add'>+		if (status &amp; (ISR_RX_PKT | ISR_TX_PKT))</div><div class='add'>+			atl1c_intr_rx_tx(adapter, status);</div><div class='ctx'> </div><div class='ctx'> 		handled = IRQ_HANDLED;</div><div class='ctx'> 		/* check if PCIE PHY Link down */</div><div class='hunk'>@@ -1645,6 +1730,11 @@ static irqreturn_t atl1c_intr(int irq, void *data)</div><div class='ctx'> static inline void atl1c_rx_checksum(struct atl1c_adapter *adapter,</div><div class='ctx'> 		  struct sk_buff *skb, struct atl1c_recv_ret_status *prrs)</div><div class='ctx'> {</div><div class='add'>+	if (adapter-&gt;hw.nic_type == athr_mt) {</div><div class='add'>+		if (prrs-&gt;word3 &amp; RRS_MT_PROT_ID_TCPUDP)</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The pid field in RRS in not correct sometimes, so we</div><div class='ctx'> 	 * cannot figure out if the packet is fragmented or not,</div><div class='hunk'>@@ -1653,39 +1743,11 @@ static inline void atl1c_rx_checksum(struct atl1c_adapter *adapter,</div><div class='ctx'> 	skb_checksum_none_assert(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *atl1c_alloc_skb(struct atl1c_adapter *adapter)</div><div class='add'>+static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter, u32 queue,</div><div class='add'>+				 bool napi_mode)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct page *page;</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;rx_frag_size &gt; PAGE_SIZE)</div><div class='del'>-		return netdev_alloc_skb(adapter-&gt;netdev,</div><div class='del'>-					adapter-&gt;rx_buffer_len);</div><div class='del'>-</div><div class='del'>-	page = adapter-&gt;rx_page;</div><div class='del'>-	if (!page) {</div><div class='del'>-		adapter-&gt;rx_page = page = alloc_page(GFP_ATOMIC);</div><div class='del'>-		if (unlikely(!page))</div><div class='del'>-			return NULL;</div><div class='del'>-		adapter-&gt;rx_page_offset = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb = build_skb(page_address(page) + adapter-&gt;rx_page_offset,</div><div class='del'>-			adapter-&gt;rx_frag_size);</div><div class='del'>-	if (likely(skb)) {</div><div class='del'>-		skb_reserve(skb, NET_SKB_PAD);</div><div class='del'>-		adapter-&gt;rx_page_offset += adapter-&gt;rx_frag_size;</div><div class='del'>-		if (adapter-&gt;rx_page_offset &gt;= PAGE_SIZE)</div><div class='del'>-			adapter-&gt;rx_page = NULL;</div><div class='del'>-		else</div><div class='del'>-			get_page(page);</div><div class='del'>-	}</div><div class='del'>-	return skb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring;</div><div class='add'>+	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring[queue];</div><div class='add'>+	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring[queue];</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	struct atl1c_buffer *buffer_info, *next_info;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1704,13 +1766,27 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter)</div><div class='ctx'> 	while (next_info-&gt;flags &amp; ATL1C_BUFFER_FREE) {</div><div class='ctx'> 		rfd_desc = ATL1C_RFD_DESC(rfd_ring, rfd_next_to_use);</div><div class='ctx'> </div><div class='del'>-		skb = atl1c_alloc_skb(adapter);</div><div class='add'>+		/* When DMA RX address is set to something like</div><div class='add'>+		 * 0x....fc0, it will be very likely to cause DMA</div><div class='add'>+		 * RFD overflow issue.</div><div class='add'>+		 *</div><div class='add'>+		 * To work around it, we apply rx skb with 64 bytes</div><div class='add'>+		 * longer space, and offset the address whenever</div><div class='add'>+		 * 0x....fc0 is detected.</div><div class='add'>+		 */</div><div class='add'>+		if (likely(napi_mode))</div><div class='add'>+			skb = napi_alloc_skb(&amp;rrd_ring-&gt;napi, adapter-&gt;rx_buffer_len + 64);</div><div class='add'>+		else</div><div class='add'>+			skb = netdev_alloc_skb(adapter-&gt;netdev, adapter-&gt;rx_buffer_len + 64);</div><div class='ctx'> 		if (unlikely(!skb)) {</div><div class='ctx'> 			if (netif_msg_rx_err(adapter))</div><div class='ctx'> 				dev_warn(&amp;pdev-&gt;dev, "alloc rx buffer failed\n");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		if (((unsigned long)skb-&gt;data &amp; 0xfff) == 0xfc0)</div><div class='add'>+			skb_reserve(skb, 64);</div><div class='add'>+</div><div class='ctx'> 		/*</div><div class='ctx'> 		 * Make buffer alignment 2 beyond a 16 byte boundary</div><div class='ctx'> 		 * this will result in a 16 byte aligned IP header after</div><div class='hunk'>@@ -1720,15 +1796,14 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter)</div><div class='ctx'> 		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);</div><div class='ctx'> 		buffer_info-&gt;skb = skb;</div><div class='ctx'> 		buffer_info-&gt;length = adapter-&gt;rx_buffer_len;</div><div class='del'>-		mapping = pci_map_single(pdev, vir_addr,</div><div class='del'>-						buffer_info-&gt;length,</div><div class='del'>-						PCI_DMA_FROMDEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(pdev, mapping))) {</div><div class='add'>+		mapping = dma_map_single(&amp;pdev-&gt;dev, vir_addr,</div><div class='add'>+					 buffer_info-&gt;length, DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;pdev-&gt;dev, mapping))) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			buffer_info-&gt;skb = NULL;</div><div class='ctx'> 			buffer_info-&gt;length = 0;</div><div class='ctx'> 			ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_FREE);</div><div class='del'>-			netif_warn(adapter, rx_err, adapter-&gt;netdev, "RX pci_map_single failed");</div><div class='add'>+			netif_warn(adapter, rx_err, adapter-&gt;netdev, "RX dma_map_single failed");</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		buffer_info-&gt;dma = mapping;</div><div class='hunk'>@@ -1747,8 +1822,8 @@ static int atl1c_alloc_rx_buffer(struct atl1c_adapter *adapter)</div><div class='ctx'> 		/* TODO: update mailbox here */</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		rfd_ring-&gt;next_to_use = rfd_next_to_use;</div><div class='del'>-		AT_WRITE_REG(&amp;adapter-&gt;hw, REG_MB_RFD0_PROD_IDX,</div><div class='del'>-			rfd_ring-&gt;next_to_use &amp; MB_RFDX_PROD_IDX_MASK);</div><div class='add'>+		AT_WRITE_REG(&amp;adapter-&gt;hw, atl1c_qregs[queue].rfd_prod,</div><div class='add'>+			     rfd_ring-&gt;next_to_use &amp; MB_RFDX_PROD_IDX_MASK);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return num_alloc;</div><div class='hunk'>@@ -1786,22 +1861,33 @@ static void atl1c_clean_rfd(struct atl1c_rfd_ring *rfd_ring,</div><div class='ctx'> 	rfd_ring-&gt;next_to_clean = rfd_index;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl1c_clean_rx_irq(struct atl1c_adapter *adapter,</div><div class='del'>-		   int *work_done, int work_to_do)</div><div class='add'>+/**</div><div class='add'>+ * atl1c_clean_rx - NAPI Rx polling callback</div><div class='add'>+ * @napi: napi info</div><div class='add'>+ * @budget: limit of packets to clean</div><div class='add'>+ */</div><div class='add'>+static int atl1c_clean_rx(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='add'>+	struct atl1c_rrd_ring *rrd_ring =</div><div class='add'>+		container_of(napi, struct atl1c_rrd_ring, napi);</div><div class='add'>+	struct atl1c_adapter *adapter = rrd_ring-&gt;adapter;</div><div class='ctx'> 	u16 rfd_num, rfd_index;</div><div class='del'>-	u16 count = 0;</div><div class='ctx'> 	u16 length;</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	struct net_device *netdev  = adapter-&gt;netdev;</div><div class='del'>-	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring;</div><div class='del'>-	struct atl1c_rrd_ring *rrd_ring = &amp;adapter-&gt;rrd_ring;</div><div class='add'>+	struct atl1c_rfd_ring *rfd_ring = &amp;adapter-&gt;rfd_ring[rrd_ring-&gt;num];</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct atl1c_recv_ret_status *rrs;</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='add'>+	int work_done = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* Keep link state information with original netdev */</div><div class='add'>+	if (!netif_carrier_ok(adapter-&gt;netdev))</div><div class='add'>+		goto quit_polling;</div><div class='ctx'> </div><div class='ctx'> 	while (1) {</div><div class='del'>-		if (*work_done &gt;= work_to_do)</div><div class='add'>+		if (work_done &gt;= budget)</div><div class='ctx'> 			break;</div><div class='ctx'> 		rrs = ATL1C_RRD_DESC(rrd_ring, rrd_ring-&gt;next_to_clean);</div><div class='ctx'> 		if (likely(RRS_RXD_IS_VALID(rrs-&gt;word3))) {</div><div class='hunk'>@@ -1834,8 +1920,8 @@ rrs_checked:</div><div class='ctx'> 			rfd_index = (rrs-&gt;word0 &gt;&gt; RRS_RX_RFD_INDEX_SHIFT) &amp;</div><div class='ctx'> 					RRS_RX_RFD_INDEX_MASK;</div><div class='ctx'> 			buffer_info = &amp;rfd_ring-&gt;buffer_info[rfd_index];</div><div class='del'>-			pci_unmap_single(pdev, buffer_info-&gt;dma,</div><div class='del'>-				buffer_info-&gt;length, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+					 buffer_info-&gt;length, DMA_FROM_DEVICE);</div><div class='ctx'> 			skb = buffer_info-&gt;skb;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* TODO */</div><div class='hunk'>@@ -1855,35 +1941,20 @@ rrs_checked:</div><div class='ctx'> 			vlan = le16_to_cpu(vlan);</div><div class='ctx'> 			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan);</div><div class='ctx'> 		}</div><div class='del'>-		netif_receive_skb(skb);</div><div class='add'>+		napi_gro_receive(napi, skb);</div><div class='ctx'> </div><div class='del'>-		(*work_done)++;</div><div class='del'>-		count++;</div><div class='add'>+		work_done++;</div><div class='ctx'> 	}</div><div class='del'>-	if (count)</div><div class='del'>-		atl1c_alloc_rx_buffer(adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * atl1c_clean - NAPI Rx polling callback</div><div class='del'>- */</div><div class='del'>-static int atl1c_clean(struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct atl1c_adapter *adapter =</div><div class='del'>-			container_of(napi, struct atl1c_adapter, napi);</div><div class='del'>-	int work_done = 0;</div><div class='del'>-</div><div class='del'>-	/* Keep link state information with original netdev */</div><div class='del'>-	if (!netif_carrier_ok(adapter-&gt;netdev))</div><div class='del'>-		goto quit_polling;</div><div class='del'>-	/* just enable one RXQ */</div><div class='del'>-	atl1c_clean_rx_irq(adapter, &amp;work_done, budget);</div><div class='add'>+	if (work_done)</div><div class='add'>+		atl1c_alloc_rx_buffer(adapter, rrd_ring-&gt;num, true);</div><div class='ctx'> </div><div class='ctx'> 	if (work_done &lt; budget) {</div><div class='ctx'> quit_polling:</div><div class='ctx'> 		napi_complete_done(napi, work_done);</div><div class='del'>-		adapter-&gt;hw.intr_mask |= ISR_RX_PKT;</div><div class='add'>+		spin_lock_irqsave(&amp;adapter-&gt;hw.intr_mask_lock, flags);</div><div class='add'>+		adapter-&gt;hw.intr_mask |= atl1c_qregs[rrd_ring-&gt;num].rx_isr;</div><div class='ctx'> 		AT_WRITE_REG(&amp;adapter-&gt;hw, REG_IMR, adapter-&gt;hw.intr_mask);</div><div class='add'>+		spin_unlock_irqrestore(&amp;adapter-&gt;hw.intr_mask_lock, flags);</div><div class='ctx'> 	}</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='hunk'>@@ -1905,9 +1976,9 @@ static void atl1c_netpoll(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static inline u16 atl1c_tpd_avail(struct atl1c_adapter *adapter, enum atl1c_trans_queue type)</div><div class='add'>+static inline u16 atl1c_tpd_avail(struct atl1c_adapter *adapter, u32 queue)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[type];</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[queue];</div><div class='ctx'> 	u16 next_to_use = 0;</div><div class='ctx'> 	u16 next_to_clean = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1925,9 +1996,9 @@ static inline u16 atl1c_tpd_avail(struct atl1c_adapter *adapter, enum atl1c_tran</div><div class='ctx'>  * there is enough tpd to use</div><div class='ctx'>  */</div><div class='ctx'> static struct atl1c_tpd_desc *atl1c_get_tpd(struct atl1c_adapter *adapter,</div><div class='del'>-	enum atl1c_trans_queue type)</div><div class='add'>+					    u32 queue)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[type];</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[queue];</div><div class='ctx'> 	struct atl1c_tpd_desc *tpd_desc;</div><div class='ctx'> 	u16 next_to_use = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1957,7 +2028,7 @@ static u16 atl1c_cal_tpd_req(const struct sk_buff *skb)</div><div class='ctx'> 	tpd_req = skb_shinfo(skb)-&gt;nr_frags + 1;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='del'>-		proto_hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		proto_hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 		if (proto_hdr_len &lt; skb_headlen(skb))</div><div class='ctx'> 			tpd_req++;</div><div class='ctx'> 		if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_TCPV6)</div><div class='hunk'>@@ -1969,7 +2040,7 @@ static u16 atl1c_cal_tpd_req(const struct sk_buff *skb)</div><div class='ctx'> static int atl1c_tso_csum(struct atl1c_adapter *adapter,</div><div class='ctx'> 			  struct sk_buff *skb,</div><div class='ctx'> 			  struct atl1c_tpd_desc **tpd,</div><div class='del'>-			  enum atl1c_trans_queue type)</div><div class='add'>+			  u32 queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='ctx'> 	unsigned short offload_type;</div><div class='hunk'>@@ -1989,10 +2060,13 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,</div><div class='ctx'> 			real_len = (((unsigned char *)ip_hdr(skb) - skb-&gt;data)</div><div class='ctx'> 					+ ntohs(ip_hdr(skb)-&gt;tot_len));</div><div class='ctx'> </div><div class='del'>-			if (real_len &lt; skb-&gt;len)</div><div class='del'>-				pskb_trim(skb, real_len);</div><div class='add'>+			if (real_len &lt; skb-&gt;len) {</div><div class='add'>+				err = pskb_trim(skb, real_len);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));</div><div class='add'>+			hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 			if (unlikely(skb-&gt;len == hdr_len)) {</div><div class='ctx'> 				/* only xsum need */</div><div class='ctx'> 				if (netif_msg_tx_queued(adapter))</div><div class='hunk'>@@ -2014,10 +2088,10 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,</div><div class='ctx'> 				*(struct atl1c_tpd_ext_desc **)(tpd);</div><div class='ctx'> </div><div class='ctx'> 			memset(etpd, 0, sizeof(struct atl1c_tpd_ext_desc));</div><div class='del'>-			*tpd = atl1c_get_tpd(adapter, type);</div><div class='add'>+			*tpd = atl1c_get_tpd(adapter, queue);</div><div class='ctx'> 			ipv6_hdr(skb)-&gt;payload_len = 0;</div><div class='ctx'> 			/* check payload == 0 byte ? */</div><div class='del'>-			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));</div><div class='add'>+			hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 			if (unlikely(skb-&gt;len == hdr_len)) {</div><div class='ctx'> 				/* only xsum need */</div><div class='ctx'> 				if (netif_msg_tx_queued(adapter))</div><div class='hunk'>@@ -2025,10 +2099,8 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,</div><div class='ctx'> 						"IPV6 tso with zero data??\n");</div><div class='ctx'> 				goto check_sum;</div><div class='ctx'> 			} else</div><div class='del'>-				tcp_hdr(skb)-&gt;check = ~csum_ipv6_magic(</div><div class='del'>-						&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='del'>-						&amp;ipv6_hdr(skb)-&gt;daddr,</div><div class='del'>-						0, IPPROTO_TCP, 0);</div><div class='add'>+				tcp_v6_gso_csum_prep(skb);</div><div class='add'>+</div><div class='ctx'> 			etpd-&gt;word1 |= 1 &lt;&lt; TPD_LSO_EN_SHIFT;</div><div class='ctx'> 			etpd-&gt;word1 |= 1 &lt;&lt; TPD_LSO_VER_SHIFT;</div><div class='ctx'> 			etpd-&gt;pkt_len = cpu_to_le32(skb-&gt;len);</div><div class='hunk'>@@ -2068,9 +2140,9 @@ check_sum:</div><div class='ctx'> </div><div class='ctx'> static void atl1c_tx_rollback(struct atl1c_adapter *adpt,</div><div class='ctx'> 			      struct atl1c_tpd_desc *first_tpd,</div><div class='del'>-			      enum atl1c_trans_queue type)</div><div class='add'>+			      u32 queue)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = &amp;adpt-&gt;tpd_ring[type];</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring = &amp;adpt-&gt;tpd_ring[queue];</div><div class='ctx'> 	struct atl1c_buffer *buffer_info;</div><div class='ctx'> 	struct atl1c_tpd_desc *tpd;</div><div class='ctx'> 	u16 first_index, index;</div><div class='hunk'>@@ -2080,7 +2152,7 @@ static void atl1c_tx_rollback(struct atl1c_adapter *adpt,</div><div class='ctx'> 	while (index != tpd_ring-&gt;next_to_use) {</div><div class='ctx'> 		tpd = ATL1C_TPD_DESC(tpd_ring, index);</div><div class='ctx'> 		buffer_info = &amp;tpd_ring-&gt;buffer_info[index];</div><div class='del'>-		atl1c_clean_buffer(adpt-&gt;pdev, buffer_info);</div><div class='add'>+		atl1c_clean_buffer(adpt-&gt;pdev, buffer_info, 0);</div><div class='ctx'> 		memset(tpd, 0, sizeof(struct atl1c_tpd_desc));</div><div class='ctx'> 		if (++index == tpd_ring-&gt;count)</div><div class='ctx'> 			index = 0;</div><div class='hunk'>@@ -2089,8 +2161,8 @@ static void atl1c_tx_rollback(struct atl1c_adapter *adpt,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atl1c_tx_map(struct atl1c_adapter *adapter,</div><div class='del'>-		      struct sk_buff *skb, struct atl1c_tpd_desc *tpd,</div><div class='del'>-			enum atl1c_trans_queue type)</div><div class='add'>+			struct sk_buff *skb, struct atl1c_tpd_desc *tpd,</div><div class='add'>+			u32 queue)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_tpd_desc *use_tpd = NULL;</div><div class='ctx'> 	struct atl1c_buffer *buffer_info = NULL;</div><div class='hunk'>@@ -2106,15 +2178,16 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter,</div><div class='ctx'> 	tso = (tpd-&gt;word1 &gt;&gt; TPD_LSO_EN_SHIFT) &amp; TPD_LSO_EN_MASK;</div><div class='ctx'> 	if (tso) {</div><div class='ctx'> 		/* TSO */</div><div class='del'>-		map_len = hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		hdr_len = skb_tcp_all_headers(skb);</div><div class='add'>+		map_len = hdr_len;</div><div class='ctx'> 		use_tpd = tpd;</div><div class='ctx'> </div><div class='ctx'> 		buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);</div><div class='ctx'> 		buffer_info-&gt;length = map_len;</div><div class='del'>-		buffer_info-&gt;dma = pci_map_single(adapter-&gt;pdev,</div><div class='del'>-					skb-&gt;data, hdr_len, PCI_DMA_TODEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(adapter-&gt;pdev,</div><div class='del'>-						   buffer_info-&gt;dma)))</div><div class='add'>+		buffer_info-&gt;dma = dma_map_single(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						  skb-&gt;data, hdr_len,</div><div class='add'>+						  DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, buffer_info-&gt;dma)))</div><div class='ctx'> 			goto err_dma;</div><div class='ctx'> 		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);</div><div class='ctx'> 		ATL1C_SET_PCIMAP_TYPE(buffer_info, ATL1C_PCIMAP_SINGLE,</div><div class='hunk'>@@ -2130,16 +2203,16 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter,</div><div class='ctx'> 		if (mapped_len == 0)</div><div class='ctx'> 			use_tpd = tpd;</div><div class='ctx'> 		else {</div><div class='del'>-			use_tpd = atl1c_get_tpd(adapter, type);</div><div class='add'>+			use_tpd = atl1c_get_tpd(adapter, queue);</div><div class='ctx'> 			memcpy(use_tpd, tpd, sizeof(struct atl1c_tpd_desc));</div><div class='ctx'> 		}</div><div class='ctx'> 		buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);</div><div class='ctx'> 		buffer_info-&gt;length = buf_len - mapped_len;</div><div class='ctx'> 		buffer_info-&gt;dma =</div><div class='del'>-			pci_map_single(adapter-&gt;pdev, skb-&gt;data + mapped_len,</div><div class='del'>-					buffer_info-&gt;length, PCI_DMA_TODEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(adapter-&gt;pdev,</div><div class='del'>-						   buffer_info-&gt;dma)))</div><div class='add'>+			dma_map_single(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				       skb-&gt;data + mapped_len,</div><div class='add'>+				       buffer_info-&gt;length, DMA_TO_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, buffer_info-&gt;dma)))</div><div class='ctx'> 			goto err_dma;</div><div class='ctx'> </div><div class='ctx'> 		ATL1C_SET_BUFFER_STATE(buffer_info, ATL1C_BUFFER_BUSY);</div><div class='hunk'>@@ -2150,11 +2223,9 @@ static int atl1c_tx_map(struct atl1c_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0; f &lt; nr_frags; f++) {</div><div class='del'>-		struct skb_frag_struct *frag;</div><div class='del'>-</div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='ctx'> </div><div class='del'>-		use_tpd = atl1c_get_tpd(adapter, type);</div><div class='add'>+		use_tpd = atl1c_get_tpd(adapter, queue);</div><div class='ctx'> 		memcpy(use_tpd, tpd, sizeof(struct atl1c_tpd_desc));</div><div class='ctx'> </div><div class='ctx'> 		buffer_info = atl1c_get_tx_buffer(adapter, use_tpd);</div><div class='hunk'>@@ -2187,23 +2258,22 @@ err_dma:</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl1c_tx_queue(struct atl1c_adapter *adapter, struct sk_buff *skb,</div><div class='del'>-			   struct atl1c_tpd_desc *tpd, enum atl1c_trans_queue type)</div><div class='add'>+static void atl1c_tx_queue(struct atl1c_adapter *adapter, u32 queue)</div><div class='ctx'> {</div><div class='del'>-	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[type];</div><div class='del'>-	u16 reg;</div><div class='add'>+	struct atl1c_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring[queue];</div><div class='ctx'> </div><div class='del'>-	reg = type == atl1c_trans_high ? REG_TPD_PRI1_PIDX : REG_TPD_PRI0_PIDX;</div><div class='del'>-	AT_WRITE_REGW(&amp;adapter-&gt;hw, reg, tpd_ring-&gt;next_to_use);</div><div class='add'>+	AT_WRITE_REGW(&amp;adapter-&gt;hw, atl1c_qregs[queue].tpd_prod,</div><div class='add'>+		      tpd_ring-&gt;next_to_use);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 					  struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	u16 tpd_req = 1;</div><div class='add'>+	u32 queue = skb_get_queue_mapping(skb);</div><div class='add'>+	struct netdev_queue *txq = netdev_get_tx_queue(netdev, queue);</div><div class='ctx'> 	struct atl1c_tpd_desc *tpd;</div><div class='del'>-	enum atl1c_trans_queue type = atl1c_trans_normal;</div><div class='add'>+	u16 tpd_req;</div><div class='ctx'> </div><div class='ctx'> 	if (test_bit(__AT_DOWN, &amp;adapter-&gt;flags)) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -2212,16 +2282,18 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	tpd_req = atl1c_cal_tpd_req(skb);</div><div class='ctx'> </div><div class='del'>-	if (atl1c_tpd_avail(adapter, type) &lt; tpd_req) {</div><div class='add'>+	if (atl1c_tpd_avail(adapter, queue) &lt; tpd_req) {</div><div class='ctx'> 		/* no enough descriptor, just stop queue */</div><div class='del'>-		netif_stop_queue(netdev);</div><div class='add'>+		atl1c_tx_queue(adapter, queue);</div><div class='add'>+		netif_tx_stop_queue(txq);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tpd = atl1c_get_tpd(adapter, type);</div><div class='add'>+	tpd = atl1c_get_tpd(adapter, queue);</div><div class='ctx'> </div><div class='ctx'> 	/* do TSO and check sum */</div><div class='del'>-	if (atl1c_tso_csum(adapter, skb, &amp;tpd, type) != 0) {</div><div class='add'>+	if (atl1c_tso_csum(adapter, skb, &amp;tpd, queue) != 0) {</div><div class='add'>+		atl1c_tx_queue(adapter, queue);</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2239,15 +2311,17 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	if (skb_network_offset(skb) != ETH_HLEN)</div><div class='ctx'> 		tpd-&gt;word1 |= 1 &lt;&lt; TPD_ETH_TYPE_SHIFT; /* Ethernet frame */</div><div class='ctx'> </div><div class='del'>-	if (atl1c_tx_map(adapter, skb, tpd, type) &lt; 0) {</div><div class='add'>+	if (atl1c_tx_map(adapter, skb, tpd, queue) &lt; 0) {</div><div class='ctx'> 		netif_info(adapter, tx_done, adapter-&gt;netdev,</div><div class='ctx'> 			   "tx-skb dropped due to dma error\n");</div><div class='ctx'> 		/* roll back tpd/buffer */</div><div class='del'>-		atl1c_tx_rollback(adapter, tpd, type);</div><div class='add'>+		atl1c_tx_rollback(adapter, tpd, queue);</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		netdev_sent_queue(adapter-&gt;netdev, skb-&gt;len);</div><div class='del'>-		atl1c_tx_queue(adapter, skb, tpd, type);</div><div class='add'>+		bool more = netdev_xmit_more();</div><div class='add'>+</div><div class='add'>+		if (__netdev_tx_sent_queue(txq, skb-&gt;len, more))</div><div class='add'>+			atl1c_tx_queue(adapter, queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='hunk'>@@ -2301,16 +2375,19 @@ static int atl1c_request_irq(struct atl1c_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void atl1c_reset_dma_ring(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='add'>+	int i;</div><div class='ctx'> 	/* release tx-pending skbs and reset tx/rx ring index */</div><div class='del'>-	atl1c_clean_tx_ring(adapter, atl1c_trans_normal);</div><div class='del'>-	atl1c_clean_tx_ring(adapter, atl1c_trans_high);</div><div class='del'>-	atl1c_clean_rx_ring(adapter);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; ++i)</div><div class='add'>+		atl1c_clean_tx_ring(adapter, i);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i)</div><div class='add'>+		atl1c_clean_rx_ring(adapter, i);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atl1c_up(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2324,19 +2401,24 @@ static int atl1c_up(struct atl1c_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	atl1c_check_link_status(adapter);</div><div class='ctx'> 	clear_bit(__AT_DOWN, &amp;adapter-&gt;flags);</div><div class='del'>-	napi_enable(&amp;adapter-&gt;napi);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; ++i)</div><div class='add'>+		napi_enable(&amp;adapter-&gt;tpd_ring[i].napi);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i)</div><div class='add'>+		napi_enable(&amp;adapter-&gt;rrd_ring[i].napi);</div><div class='ctx'> 	atl1c_irq_enable(adapter);</div><div class='ctx'> 	netif_start_queue(netdev);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='ctx'> err_up:</div><div class='del'>-	atl1c_clean_rx_ring(adapter);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i)</div><div class='add'>+		atl1c_clean_rx_ring(adapter, i);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atl1c_down(struct atl1c_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	atl1c_del_timer(adapter);</div><div class='ctx'> 	adapter-&gt;work_event = 0; /* clear all event */</div><div class='hunk'>@@ -2344,7 +2426,10 @@ static void atl1c_down(struct atl1c_adapter *adapter)</div><div class='ctx'> 	 * reschedule our watchdog timer */</div><div class='ctx'> 	set_bit(__AT_DOWN, &amp;adapter-&gt;flags);</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='del'>-	napi_disable(&amp;adapter-&gt;napi);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; ++i)</div><div class='add'>+		napi_disable(&amp;adapter-&gt;tpd_ring[i].napi);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i)</div><div class='add'>+		napi_disable(&amp;adapter-&gt;rrd_ring[i].napi);</div><div class='ctx'> 	atl1c_irq_disable(adapter);</div><div class='ctx'> 	atl1c_free_irq(adapter);</div><div class='ctx'> 	/* disable ASPM if device inactive */</div><div class='hunk'>@@ -2422,8 +2507,7 @@ static int atl1c_close(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> static int atl1c_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct atl1c_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 wufc = adapter-&gt;wol;</div><div class='hunk'>@@ -2437,7 +2521,7 @@ static int atl1c_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (wufc)</div><div class='ctx'> 		if (atl1c_phy_to_ps_link(hw) != 0)</div><div class='del'>-			dev_dbg(&amp;pdev-&gt;dev, "phy power saving failed");</div><div class='add'>+			dev_dbg(dev, "phy power saving failed");</div><div class='ctx'> </div><div class='ctx'> 	atl1c_power_saving(hw, wufc);</div><div class='ctx'> </div><div class='hunk'>@@ -2447,8 +2531,7 @@ static int atl1c_suspend(struct device *dev)</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int atl1c_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atl1c_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	AT_WRITE_REG(&amp;adapter-&gt;hw, REG_WOL_CTRL, 0);</div><div class='hunk'>@@ -2458,12 +2541,6 @@ static int atl1c_resume(struct device *dev)</div><div class='ctx'> 	atl1c_reset_mac(&amp;adapter-&gt;hw);</div><div class='ctx'> 	atl1c_phy_init(&amp;adapter-&gt;hw);</div><div class='ctx'> </div><div class='del'>-#if 0</div><div class='del'>-	AT_READ_REG(&amp;adapter-&gt;hw, REG_PM_CTRLSTAT, &amp;pm_data);</div><div class='del'>-	pm_data &amp;= ~PM_CTRLSTAT_PME_EN;</div><div class='del'>-	AT_WRITE_REG(&amp;adapter-&gt;hw, REG_PM_CTRLSTAT, pm_data);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	netif_device_attach(netdev);</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='ctx'> 		atl1c_up(adapter);</div><div class='hunk'>@@ -2492,7 +2569,7 @@ static const struct net_device_ops atl1c_netdev_ops = {</div><div class='ctx'> 	.ndo_change_mtu		= atl1c_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= atl1c_fix_features,</div><div class='ctx'> 	.ndo_set_features	= atl1c_set_features,</div><div class='del'>-	.ndo_do_ioctl		= atl1c_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= atl1c_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= atl1c_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats		= atl1c_get_stats,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -2537,15 +2614,16 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct atl1c_adapter *adapter;</div><div class='ctx'> 	static int cards_found;</div><div class='del'>-</div><div class='add'>+	u8 __iomem *hw_addr;</div><div class='add'>+	enum atl1c_nic_type nic_type;</div><div class='add'>+	u32 queue_count = 1;</div><div class='ctx'> 	int err = 0;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* enable device (incl. PCI PM wakeup and hotplug setup) */</div><div class='ctx'> 	err = pci_enable_device_mem(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, err, "cannot enable PCI device\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The atl1c chip can DMA to 64-bit addresses, but it uses a single</div><div class='hunk'>@@ -2557,8 +2635,8 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 * various kernel subsystems to support the mechanics required by a</div><div class='ctx'> 	 * fixed-high-32-bit system.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||</div><div class='del'>-	    (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration,aborting\n");</div><div class='ctx'> 		goto err_dma;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2571,7 +2649,18 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='del'>-	netdev = alloc_etherdev(sizeof(struct atl1c_adapter));</div><div class='add'>+	hw_addr = pci_ioremap_bar(pdev, 0);</div><div class='add'>+	if (!hw_addr) {</div><div class='add'>+		err = -EIO;</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "cannot map device registers\n");</div><div class='add'>+		goto err_ioremap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	nic_type = atl1c_get_mac_type(pdev, hw_addr);</div><div class='add'>+	if (nic_type == athr_mt)</div><div class='add'>+		queue_count = 4;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_etherdev_mq(sizeof(struct atl1c_adapter), queue_count);</div><div class='ctx'> 	if (netdev == NULL) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_alloc_etherdev;</div><div class='hunk'>@@ -2587,13 +2676,11 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	adapter-&gt;netdev = netdev;</div><div class='ctx'> 	adapter-&gt;pdev = pdev;</div><div class='ctx'> 	adapter-&gt;hw.adapter = adapter;</div><div class='add'>+	adapter-&gt;hw.nic_type = nic_type;</div><div class='ctx'> 	adapter-&gt;msg_enable = netif_msg_init(-1, atl1c_default_msg);</div><div class='del'>-	adapter-&gt;hw.hw_addr = ioremap(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));</div><div class='del'>-	if (!adapter-&gt;hw.hw_addr) {</div><div class='del'>-		err = -EIO;</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot map device registers\n");</div><div class='del'>-		goto err_ioremap;</div><div class='del'>-	}</div><div class='add'>+	adapter-&gt;hw.hw_addr = hw_addr;</div><div class='add'>+	adapter-&gt;tx_queue_count = queue_count;</div><div class='add'>+	adapter-&gt;rx_queue_count = queue_count;</div><div class='ctx'> </div><div class='ctx'> 	/* init mii data */</div><div class='ctx'> 	adapter-&gt;mii.dev = netdev;</div><div class='hunk'>@@ -2601,7 +2688,13 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	adapter-&gt;mii.mdio_write = atl1c_mdio_write;</div><div class='ctx'> 	adapter-&gt;mii.phy_id_mask = 0x1f;</div><div class='ctx'> 	adapter-&gt;mii.reg_num_mask = MDIO_CTRL_REG_MASK;</div><div class='del'>-	netif_napi_add(netdev, &amp;adapter-&gt;napi, atl1c_clean, 64);</div><div class='add'>+	netif_threaded_enable(netdev);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rx_queue_count; ++i)</div><div class='add'>+		netif_napi_add(netdev, &amp;adapter-&gt;rrd_ring[i].napi,</div><div class='add'>+			       atl1c_clean_rx);</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;tx_queue_count; ++i)</div><div class='add'>+		netif_napi_add_tx(netdev, &amp;adapter-&gt;tpd_ring[i].napi,</div><div class='add'>+				  atl1c_clean_tx);</div><div class='ctx'> 	timer_setup(&amp;adapter-&gt;phy_config_timer, atl1c_phy_config, 0);</div><div class='ctx'> 	/* setup the private structure */</div><div class='ctx'> 	err = atl1c_sw_init(adapter);</div><div class='hunk'>@@ -2634,7 +2727,7 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		/* got a random MAC address, set NET_ADDR_RANDOM to netdev */</div><div class='ctx'> 		netdev-&gt;addr_assign_type = NET_ADDR_RANDOM;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(netdev-&gt;dev_addr, adapter-&gt;hw.mac_addr, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, adapter-&gt;hw.mac_addr);</div><div class='ctx'> 	if (netif_msg_probe(adapter))</div><div class='ctx'> 		dev_dbg(&amp;pdev-&gt;dev, "mac address : %pM\n",</div><div class='ctx'> 			adapter-&gt;hw.mac_addr);</div><div class='hunk'>@@ -2648,19 +2741,17 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_register;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netif_msg_probe(adapter))</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "version %s\n", ATL1C_DRV_VERSION);</div><div class='ctx'> 	cards_found++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_reset:</div><div class='ctx'> err_register:</div><div class='ctx'> err_sw_init:</div><div class='del'>-	iounmap(adapter-&gt;hw.hw_addr);</div><div class='ctx'> err_init_netdev:</div><div class='del'>-err_ioremap:</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> err_alloc_etherdev:</div><div class='add'>+	iounmap(hw_addr);</div><div class='add'>+err_ioremap:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> err_pci_reg:</div><div class='ctx'> err_dma:</div><div class='hunk'>@@ -2718,7 +2809,7 @@ static pci_ers_result_t atl1c_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	/* Request a slot slot reset. */</div><div class='add'>+	/* Request a slot reset. */</div><div class='ctx'> 	return PCI_ERS_RESULT_NEED_RESET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h<br/>index e9893da50995..9fcad783c939 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1e/atl1e.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1e/atl1e.h</a></div><div class='hunk'>@@ -482,7 +482,6 @@ struct atl1e_adapter {</div><div class='ctx'> 		readl(((a)-&gt;hw_addr + reg) + ((offset) &lt;&lt; 2)))</div><div class='ctx'> </div><div class='ctx'> extern char atl1e_driver_name[];</div><div class='del'>-extern char atl1e_driver_version[];</div><div class='ctx'> </div><div class='ctx'> void atl1e_check_options(struct atl1e_adapter *adapter);</div><div class='ctx'> int atl1e_up(struct atl1e_adapter *adapter);</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c<br/>index c6b9e7ea8e38..68f1832a198d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c</a></div><div class='hunk'>@@ -306,11 +306,9 @@ static void atl1e_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1e_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver,  atl1e_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, atl1e_driver_version,</div><div class='del'>-		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "L1e", sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(drvinfo-&gt;driver,  atl1e_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;fw_version, "L1e", sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c<br/>index 7f14e010bfeb..40290028580b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atl1e/atl1e_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atl1e/atl1e_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atl1e/atl1e_main.c</a></div><div class='hunk'>@@ -8,10 +8,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "atl1e.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_VERSION "1.0.0.7-NAPI"</div><div class='del'>-</div><div class='ctx'> char atl1e_driver_name[] = "ATL1E";</div><div class='del'>-char atl1e_driver_version[] = DRV_VERSION;</div><div class='ctx'> #define PCI_DEVICE_ID_ATTANSIC_L1E      0x1026</div><div class='ctx'> /*</div><div class='ctx'>  * atl1e_pci_tbl - PCI Device ID Table</div><div class='hunk'>@@ -33,7 +30,6 @@ MODULE_DEVICE_TABLE(pci, atl1e_pci_tbl);</div><div class='ctx'> MODULE_AUTHOR("Atheros Corporation, &lt;xiong.huang@atheros.com&gt;, Jie Yang &lt;jie.yang@atheros.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -115,12 +111,12 @@ static inline void atl1e_irq_reset(struct atl1e_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl1e_phy_config - Timer Call-back</div><div class='del'>- * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ * @t: timer list containing pointer to netdev cast into an unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static void atl1e_phy_config(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct atl1e_adapter *adapter = from_timer(adapter, t,</div><div class='del'>-						   phy_config_timer);</div><div class='add'>+	struct atl1e_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							   phy_config_timer);</div><div class='ctx'> 	struct atl1e_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -131,8 +127,6 @@ static void atl1e_phy_config(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> void atl1e_reinit_locked(struct atl1e_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-</div><div class='del'>-	WARN_ON(in_interrupt());</div><div class='ctx'> 	while (test_and_set_bit(__AT_RESETTING, &amp;adapter-&gt;flags))</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	atl1e_down(adapter);</div><div class='hunk'>@@ -200,7 +194,7 @@ static int atl1e_check_link(struct atl1e_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl1e_link_chg_task - deal with link change event Out of interrupt context</div><div class='del'>- * @netdev: network interface device structure</div><div class='add'>+ * @work: work struct with driver info</div><div class='ctx'>  */</div><div class='ctx'> static void atl1e_link_chg_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -238,7 +232,7 @@ static void atl1e_link_chg_event(struct atl1e_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> static void atl1e_del_timer(struct atl1e_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atl1e_cancel_work(struct atl1e_adapter *adapter)</div><div class='hunk'>@@ -250,8 +244,9 @@ static void atl1e_cancel_work(struct atl1e_adapter *adapter)</div><div class='ctx'> /**</div><div class='ctx'>  * atl1e_tx_timeout - Respond to a Tx Hang</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='add'>+ * @txqueue: the index of the hanging queue</div><div class='ctx'>  */</div><div class='del'>-static void atl1e_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void atl1e_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1e_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -362,7 +357,7 @@ static void atl1e_restore_vlan(struct atl1e_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atl1e_set_mac - Change the Ethernet Address of the NIC</div><div class='add'>+ * atl1e_set_mac_addr - Change the Ethernet Address of the NIC</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  * @p: pointer to an address structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -379,7 +374,7 @@ static int atl1e_set_mac_addr(struct net_device *netdev, void *p)</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	memcpy(adapter-&gt;hw.mac_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	atl1e_hw_set_mac_addr(&amp;adapter-&gt;hw);</div><div class='hunk'>@@ -433,7 +428,7 @@ static int atl1e_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		while (test_and_set_bit(__AT_RESETTING, &amp;adapter-&gt;flags))</div><div class='ctx'> 			msleep(1);</div><div class='del'>-		netdev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 		adapter-&gt;hw.max_frame_size = new_mtu;</div><div class='ctx'> 		adapter-&gt;hw.rx_jumbo_th = (max_frame + 7) &gt;&gt; 3;</div><div class='ctx'> 		atl1e_down(adapter);</div><div class='hunk'>@@ -658,11 +653,13 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)</div><div class='ctx'> 		tx_buffer = &amp;tx_ring-&gt;tx_buffer[index];</div><div class='ctx'> 		if (tx_buffer-&gt;dma) {</div><div class='ctx'> 			if (tx_buffer-&gt;flags &amp; ATL1E_TX_PCIMAP_SINGLE)</div><div class='del'>-				pci_unmap_single(pdev, tx_buffer-&gt;dma,</div><div class='del'>-					tx_buffer-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(&amp;pdev-&gt;dev, tx_buffer-&gt;dma,</div><div class='add'>+						 tx_buffer-&gt;length,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			else if (tx_buffer-&gt;flags &amp; ATL1E_TX_PCIMAP_PAGE)</div><div class='del'>-				pci_unmap_page(pdev, tx_buffer-&gt;dma,</div><div class='del'>-					tx_buffer-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_page(&amp;pdev-&gt;dev, tx_buffer-&gt;dma,</div><div class='add'>+					       tx_buffer-&gt;length,</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 			tx_buffer-&gt;dma = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -778,8 +775,8 @@ static void atl1e_free_ring_resources(struct atl1e_adapter *adapter)</div><div class='ctx'> 	atl1e_clean_rx_ring(adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;ring_vir_addr) {</div><div class='del'>-		pci_free_consistent(pdev, adapter-&gt;ring_size,</div><div class='del'>-				adapter-&gt;ring_vir_addr, adapter-&gt;ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, adapter-&gt;ring_size,</div><div class='add'>+				  adapter-&gt;ring_vir_addr, adapter-&gt;ring_dma);</div><div class='ctx'> 		adapter-&gt;ring_vir_addr = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -790,7 +787,7 @@ static void atl1e_free_ring_resources(struct atl1e_adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atl1e_setup_mem_resources - allocate Tx / RX descriptor resources</div><div class='add'>+ * atl1e_setup_ring_resources - allocate Tx / RX descriptor resources</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success, negative on failure</div><div class='hunk'>@@ -814,11 +811,12 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)</div><div class='ctx'> 	/* real ring DMA buffer */</div><div class='ctx'> </div><div class='ctx'> 	size = adapter-&gt;ring_size;</div><div class='del'>-	adapter-&gt;ring_vir_addr = pci_zalloc_consistent(pdev, adapter-&gt;ring_size,</div><div class='del'>-						       &amp;adapter-&gt;ring_dma);</div><div class='add'>+	adapter-&gt;ring_vir_addr = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+						    adapter-&gt;ring_size,</div><div class='add'>+						    &amp;adapter-&gt;ring_dma, GFP_KERNEL);</div><div class='ctx'> 	if (adapter-&gt;ring_vir_addr == NULL) {</div><div class='ctx'> 		netdev_err(adapter-&gt;netdev,</div><div class='del'>-			   "pci_alloc_consistent failed, size = D%d\n", size);</div><div class='add'>+			   "dma_alloc_coherent failed, size = D%d\n", size);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -868,14 +866,17 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter)</div><div class='ctx'> 		netdev_err(adapter-&gt;netdev, "offset(%d) &gt; ring size(%d) !!\n",</div><div class='ctx'> 			   offset, adapter-&gt;ring_size);</div><div class='ctx'> 		err = -1;</div><div class='del'>-		goto failed;</div><div class='add'>+		goto free_buffer;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+free_buffer:</div><div class='add'>+	kfree(tx_ring-&gt;tx_buffer);</div><div class='add'>+	tx_ring-&gt;tx_buffer = NULL;</div><div class='ctx'> failed:</div><div class='ctx'> 	if (adapter-&gt;ring_vir_addr != NULL) {</div><div class='del'>-		pci_free_consistent(pdev, adapter-&gt;ring_size,</div><div class='del'>-				adapter-&gt;ring_vir_addr, adapter-&gt;ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, adapter-&gt;ring_size,</div><div class='add'>+				  adapter-&gt;ring_vir_addr, adapter-&gt;ring_dma);</div><div class='ctx'> 		adapter-&gt;ring_vir_addr = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1237,11 +1238,15 @@ static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)</div><div class='ctx'> 		tx_buffer = &amp;tx_ring-&gt;tx_buffer[next_to_clean];</div><div class='ctx'> 		if (tx_buffer-&gt;dma) {</div><div class='ctx'> 			if (tx_buffer-&gt;flags &amp; ATL1E_TX_PCIMAP_SINGLE)</div><div class='del'>-				pci_unmap_single(adapter-&gt;pdev, tx_buffer-&gt;dma,</div><div class='del'>-					tx_buffer-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						 tx_buffer-&gt;dma,</div><div class='add'>+						 tx_buffer-&gt;length,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			else if (tx_buffer-&gt;flags &amp; ATL1E_TX_PCIMAP_PAGE)</div><div class='del'>-				pci_unmap_page(adapter-&gt;pdev, tx_buffer-&gt;dma,</div><div class='del'>-					tx_buffer-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_page(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+					       tx_buffer-&gt;dma,</div><div class='add'>+					       tx_buffer-&gt;length,</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 			tx_buffer-&gt;dma = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1499,6 +1504,8 @@ fatal_err:</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl1e_clean - NAPI Rx polling callback</div><div class='add'>+ * @napi: napi info</div><div class='add'>+ * @budget: number of packets to clean</div><div class='ctx'>  */</div><div class='ctx'> static int atl1e_clean(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='hunk'>@@ -1605,8 +1612,7 @@ static u16 atl1e_cal_tdp_req(const struct sk_buff *skb)</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IP) ||</div><div class='ctx'> 		   (skb_shinfo(skb)-&gt;gso_type == SKB_GSO_TCPV6)) {</div><div class='del'>-			proto_hdr_len = skb_transport_offset(skb) +</div><div class='del'>-					tcp_hdrlen(skb);</div><div class='add'>+			proto_hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 			if (proto_hdr_len &lt; skb_headlen(skb)) {</div><div class='ctx'> 				tpd_req += ((skb_headlen(skb) - proto_hdr_len +</div><div class='ctx'> 					   MAX_TX_BUF_LEN - 1) &gt;&gt;</div><div class='hunk'>@@ -1638,10 +1644,13 @@ static int atl1e_tso_csum(struct atl1e_adapter *adapter,</div><div class='ctx'> 			real_len = (((unsigned char *)ip_hdr(skb) - skb-&gt;data)</div><div class='ctx'> 					+ ntohs(ip_hdr(skb)-&gt;tot_len));</div><div class='ctx'> </div><div class='del'>-			if (real_len &lt; skb-&gt;len)</div><div class='del'>-				pskb_trim(skb, real_len);</div><div class='add'>+			if (real_len &lt; skb-&gt;len) {</div><div class='add'>+				err = pskb_trim(skb, real_len);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));</div><div class='add'>+			hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 			if (unlikely(skb-&gt;len == hdr_len)) {</div><div class='ctx'> 				/* only xsum need */</div><div class='ctx'> 				netdev_warn(adapter-&gt;netdev,</div><div class='hunk'>@@ -1709,13 +1718,15 @@ static int atl1e_tx_map(struct atl1e_adapter *adapter,</div><div class='ctx'> 	segment = (tpd-&gt;word3 &gt;&gt; TPD_SEGMENT_EN_SHIFT) &amp; TPD_SEGMENT_EN_MASK;</div><div class='ctx'> 	if (segment) {</div><div class='ctx'> 		/* TSO */</div><div class='del'>-		map_len = hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		hdr_len = skb_tcp_all_headers(skb);</div><div class='add'>+		map_len = hdr_len;</div><div class='ctx'> 		use_tpd = tpd;</div><div class='ctx'> </div><div class='ctx'> 		tx_buffer = atl1e_get_tx_buffer(adapter, use_tpd);</div><div class='ctx'> 		tx_buffer-&gt;length = map_len;</div><div class='del'>-		tx_buffer-&gt;dma = pci_map_single(adapter-&gt;pdev,</div><div class='del'>-					skb-&gt;data, hdr_len, PCI_DMA_TODEVICE);</div><div class='add'>+		tx_buffer-&gt;dma = dma_map_single(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						skb-&gt;data, hdr_len,</div><div class='add'>+						DMA_TO_DEVICE);</div><div class='ctx'> 		if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, tx_buffer-&gt;dma))</div><div class='ctx'> 			return -ENOSPC;</div><div class='ctx'> </div><div class='hunk'>@@ -1743,8 +1754,9 @@ static int atl1e_tx_map(struct atl1e_adapter *adapter,</div><div class='ctx'> 			((buf_len - mapped_len) &gt;= MAX_TX_BUF_LEN) ?</div><div class='ctx'> 			MAX_TX_BUF_LEN : (buf_len - mapped_len);</div><div class='ctx'> 		tx_buffer-&gt;dma =</div><div class='del'>-			pci_map_single(adapter-&gt;pdev, skb-&gt;data + mapped_len,</div><div class='del'>-					map_len, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_map_single(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				       skb-&gt;data + mapped_len, map_len,</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, tx_buffer-&gt;dma)) {</div><div class='ctx'> 			/* We need to unwind the mappings we've done */</div><div class='hunk'>@@ -1753,8 +1765,10 @@ static int atl1e_tx_map(struct atl1e_adapter *adapter,</div><div class='ctx'> 			while (adapter-&gt;tx_ring.next_to_use != ring_end) {</div><div class='ctx'> 				tpd = atl1e_get_tpd(adapter);</div><div class='ctx'> 				tx_buffer = atl1e_get_tx_buffer(adapter, tpd);</div><div class='del'>-				pci_unmap_single(adapter-&gt;pdev, tx_buffer-&gt;dma,</div><div class='del'>-						 tx_buffer-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						 tx_buffer-&gt;dma,</div><div class='add'>+						 tx_buffer-&gt;length,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			}</div><div class='ctx'> 			/* Reset the tx rings next pointer */</div><div class='ctx'> 			adapter-&gt;tx_ring.next_to_use = ring_start;</div><div class='hunk'>@@ -1770,11 +1784,10 @@ static int atl1e_tx_map(struct atl1e_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0; f &lt; nr_frags; f++) {</div><div class='del'>-		const struct skb_frag_struct *frag;</div><div class='add'>+		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='ctx'> 		u16 i;</div><div class='ctx'> 		u16 seg_num;</div><div class='ctx'> </div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='ctx'> 		buf_len = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		seg_num = (buf_len + MAX_TX_BUF_LEN - 1) / MAX_TX_BUF_LEN;</div><div class='hunk'>@@ -2240,7 +2253,7 @@ static const struct net_device_ops atl1e_netdev_ops = {</div><div class='ctx'> 	.ndo_fix_features	= atl1e_fix_features,</div><div class='ctx'> 	.ndo_set_features	= atl1e_set_features,</div><div class='ctx'> 	.ndo_change_mtu		= atl1e_change_mtu,</div><div class='del'>-	.ndo_do_ioctl		= atl1e_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= atl1e_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= atl1e_tx_timeout,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= atl1e_netpoll,</div><div class='hunk'>@@ -2290,10 +2303,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, err, "cannot enable PCI device\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The atl1e chip can DMA to 64-bit addresses, but it uses a single</div><div class='hunk'>@@ -2305,8 +2316,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 * various kernel subsystems to support the mechanics required by a</div><div class='ctx'> 	 * fixed-high-32-bit system.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||</div><div class='del'>-	    (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "No usable DMA configuration,aborting\n");</div><div class='ctx'> 		goto err_dma;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2349,7 +2360,7 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	adapter-&gt;mii.phy_id_mask = 0x1f;</div><div class='ctx'> 	adapter-&gt;mii.reg_num_mask = MDIO_REG_ADDR_MASK;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(netdev, &amp;adapter-&gt;napi, atl1e_clean, 64);</div><div class='add'>+	netif_napi_add(netdev, &amp;adapter-&gt;napi, atl1e_clean);</div><div class='ctx'> </div><div class='ctx'> 	timer_setup(&amp;adapter-&gt;phy_config_timer, atl1e_phy_config, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -2385,12 +2396,12 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_eeprom;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, adapter-&gt;hw.mac_addr, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, adapter-&gt;hw.mac_addr);</div><div class='ctx'> 	netdev_dbg(netdev, "mac address : %pM\n", adapter-&gt;hw.mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;reset_task, atl1e_reset_task);</div><div class='ctx'> 	INIT_WORK(&amp;adapter-&gt;link_chg_task, atl1e_link_chg_task);</div><div class='del'>-	netif_set_gso_max_size(netdev, MAX_TSO_SEG_SIZE);</div><div class='add'>+	netif_set_tso_max_size(netdev, MAX_TSO_SEG_SIZE);</div><div class='ctx'> 	err = register_netdev(netdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		netdev_err(netdev, "register netdevice failed\n");</div><div class='hunk'>@@ -2477,7 +2488,7 @@ atl1e_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)</div><div class='ctx'> </div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='del'>-	/* Request a slot slot reset. */</div><div class='add'>+	/* Request a slot reset. */</div><div class='ctx'> 	return PCI_ERS_RESULT_NEED_RESET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c<br/>index 7c767ce9aafa..98a4d089270e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atlx/atl1.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atlx/atl1.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atlx/atl1.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atlx/atl1.c</a></div><div class='hunk'>@@ -65,12 +65,10 @@</div><div class='ctx'> </div><div class='ctx'> #include "atl1.h"</div><div class='ctx'> </div><div class='del'>-#define ATLX_DRIVER_VERSION "2.1.3"</div><div class='ctx'> MODULE_AUTHOR("Xiong Huang &lt;xiong.huang@atheros.com&gt;, "</div><div class='ctx'> 	      "Chris Snook &lt;csnook@redhat.com&gt;, "</div><div class='ctx'> 	      "Jay Cliburn &lt;jcliburn@gmail.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(ATLX_DRIVER_VERSION);</div><div class='ctx'> </div><div class='ctx'> /* Temporary hack for merging atl1 and atl2 */</div><div class='ctx'> #include "atlx.c"</div><div class='hunk'>@@ -1013,7 +1011,7 @@ static int atl1_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atl1_setup_mem_resources - allocate Tx / RX descriptor resources</div><div class='add'>+ * atl1_setup_ring_resources - allocate Tx / RX descriptor resources</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Return 0 on success, negative on failure</div><div class='hunk'>@@ -1044,7 +1042,7 @@ static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)</div><div class='ctx'> 	 * each ring/block may need up to 8 bytes for alignment, hence the</div><div class='ctx'> 	 * additional 40 bytes tacked onto the end.</div><div class='ctx'> 	 */</div><div class='del'>-	ring_header-&gt;size = size =</div><div class='add'>+	ring_header-&gt;size =</div><div class='ctx'> 		sizeof(struct tx_packet_desc) * tpd_ring-&gt;count</div><div class='ctx'> 		+ sizeof(struct rx_free_desc) * rfd_ring-&gt;count</div><div class='ctx'> 		+ sizeof(struct rx_return_desc) * rrd_ring-&gt;count</div><div class='hunk'>@@ -1052,16 +1050,14 @@ static s32 atl1_setup_ring_resources(struct atl1_adapter *adapter)</div><div class='ctx'> 		+ sizeof(struct stats_msg_block)</div><div class='ctx'> 		+ 40;</div><div class='ctx'> </div><div class='del'>-	ring_header-&gt;desc = pci_alloc_consistent(pdev, ring_header-&gt;size,</div><div class='del'>-		&amp;ring_header-&gt;dma);</div><div class='add'>+	ring_header-&gt;desc = dma_alloc_coherent(&amp;pdev-&gt;dev, ring_header-&gt;size,</div><div class='add'>+					       &amp;ring_header-&gt;dma, GFP_KERNEL);</div><div class='ctx'> 	if (unlikely(!ring_header-&gt;desc)) {</div><div class='ctx'> 		if (netif_msg_drv(adapter))</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "pci_alloc_consistent failed\n");</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "dma_alloc_coherent failed\n");</div><div class='ctx'> 		goto err_nomem;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(ring_header-&gt;desc, 0, ring_header-&gt;size);</div><div class='del'>-</div><div class='ctx'> 	/* init TPD ring */</div><div class='ctx'> 	tpd_ring-&gt;dma = ring_header-&gt;dma;</div><div class='ctx'> 	offset = (tpd_ring-&gt;dma &amp; 0x7) ? (8 - (ring_header-&gt;dma &amp; 0x7)) : 0;</div><div class='hunk'>@@ -1140,8 +1136,8 @@ static void atl1_clean_rx_ring(struct atl1_adapter *adapter)</div><div class='ctx'> 	for (i = 0; i &lt; rfd_ring-&gt;count; i++) {</div><div class='ctx'> 		buffer_info = &amp;rfd_ring-&gt;buffer_info[i];</div><div class='ctx'> 		if (buffer_info-&gt;dma) {</div><div class='del'>-			pci_unmap_page(pdev, buffer_info-&gt;dma,</div><div class='del'>-				buffer_info-&gt;length, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_page(&amp;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+				       buffer_info-&gt;length, DMA_FROM_DEVICE);</div><div class='ctx'> 			buffer_info-&gt;dma = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (buffer_info-&gt;skb) {</div><div class='hunk'>@@ -1179,8 +1175,8 @@ static void atl1_clean_tx_ring(struct atl1_adapter *adapter)</div><div class='ctx'> 	for (i = 0; i &lt; tpd_ring-&gt;count; i++) {</div><div class='ctx'> 		buffer_info = &amp;tpd_ring-&gt;buffer_info[i];</div><div class='ctx'> 		if (buffer_info-&gt;dma) {</div><div class='del'>-			pci_unmap_page(pdev, buffer_info-&gt;dma,</div><div class='del'>-				buffer_info-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_page(&amp;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+				       buffer_info-&gt;length, DMA_TO_DEVICE);</div><div class='ctx'> 			buffer_info-&gt;dma = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1221,8 +1217,8 @@ static void atl1_free_ring_resources(struct atl1_adapter *adapter)</div><div class='ctx'> 	atl1_clean_rx_ring(adapter);</div><div class='ctx'> </div><div class='ctx'> 	kfree(tpd_ring-&gt;buffer_info);</div><div class='del'>-	pci_free_consistent(pdev, ring_header-&gt;size, ring_header-&gt;desc,</div><div class='del'>-		ring_header-&gt;dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, ring_header-&gt;size, ring_header-&gt;desc,</div><div class='add'>+			  ring_header-&gt;dma);</div><div class='ctx'> </div><div class='ctx'> 	tpd_ring-&gt;buffer_info = NULL;</div><div class='ctx'> 	tpd_ring-&gt;desc = NULL;</div><div class='hunk'>@@ -1865,14 +1861,21 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		buffer_info-&gt;alloced = 1;</div><div class='del'>-		buffer_info-&gt;skb = skb;</div><div class='del'>-		buffer_info-&gt;length = (u16) adapter-&gt;rx_buffer_len;</div><div class='ctx'> 		page = virt_to_page(skb-&gt;data);</div><div class='ctx'> 		offset = offset_in_page(skb-&gt;data);</div><div class='del'>-		buffer_info-&gt;dma = pci_map_page(pdev, page, offset,</div><div class='add'>+		buffer_info-&gt;dma = dma_map_page(&amp;pdev-&gt;dev, page, offset,</div><div class='ctx'> 						adapter-&gt;rx_buffer_len,</div><div class='del'>-						PCI_DMA_FROMDEVICE);</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;pdev-&gt;dev, buffer_info-&gt;dma)) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			adapter-&gt;soft_stats.rx_dropped++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		buffer_info-&gt;alloced = 1;</div><div class='add'>+		buffer_info-&gt;skb = skb;</div><div class='add'>+		buffer_info-&gt;length = (u16)adapter-&gt;rx_buffer_len;</div><div class='add'>+</div><div class='ctx'> 		rfd_desc-&gt;buffer_addr = cpu_to_le64(buffer_info-&gt;dma);</div><div class='ctx'> 		rfd_desc-&gt;buf_len = cpu_to_le16(adapter-&gt;rx_buffer_len);</div><div class='ctx'> 		rfd_desc-&gt;coalese = 0;</div><div class='hunk'>@@ -1996,8 +1999,8 @@ rrd_ok:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Good Receive */</div><div class='del'>-		pci_unmap_page(adapter-&gt;pdev, buffer_info-&gt;dma,</div><div class='del'>-			       buffer_info-&gt;length, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_page(&amp;adapter-&gt;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+			       buffer_info-&gt;length, DMA_FROM_DEVICE);</div><div class='ctx'> 		buffer_info-&gt;dma = 0;</div><div class='ctx'> 		skb = buffer_info-&gt;skb;</div><div class='ctx'> 		length = le16_to_cpu(rrd-&gt;xsz.xsum_sz.pkt_size);</div><div class='hunk'>@@ -2066,8 +2069,8 @@ static int atl1_intr_tx(struct atl1_adapter *adapter)</div><div class='ctx'> 	while (cmb_tpd_next_to_clean != sw_tpd_next_to_clean) {</div><div class='ctx'> 		buffer_info = &amp;tpd_ring-&gt;buffer_info[sw_tpd_next_to_clean];</div><div class='ctx'> 		if (buffer_info-&gt;dma) {</div><div class='del'>-			pci_unmap_page(adapter-&gt;pdev, buffer_info-&gt;dma,</div><div class='del'>-				       buffer_info-&gt;length, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_page(&amp;adapter-&gt;pdev-&gt;dev, buffer_info-&gt;dma,</div><div class='add'>+				       buffer_info-&gt;length, DMA_TO_DEVICE);</div><div class='ctx'> 			buffer_info-&gt;dma = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2117,9 +2120,12 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 			real_len = (((unsigned char *)iph - skb-&gt;data) +</div><div class='ctx'> 				ntohs(iph-&gt;tot_len));</div><div class='del'>-			if (real_len &lt; skb-&gt;len)</div><div class='del'>-				pskb_trim(skb, real_len);</div><div class='del'>-			hdr_len = (skb_transport_offset(skb) + tcp_hdrlen(skb));</div><div class='add'>+			if (real_len &lt; skb-&gt;len) {</div><div class='add'>+				err = pskb_trim(skb, real_len);</div><div class='add'>+				if (err)</div><div class='add'>+					return err;</div><div class='add'>+			}</div><div class='add'>+			hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 			if (skb-&gt;len == hdr_len) {</div><div class='ctx'> 				iph-&gt;check = 0;</div><div class='ctx'> 				tcp_hdr(skb)-&gt;check =</div><div class='hunk'>@@ -2184,8 +2190,8 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='del'>-	struct tx_packet_desc *ptpd)</div><div class='add'>+static bool atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='add'>+			struct tx_packet_desc *ptpd)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1_tpd_ring *tpd_ring = &amp;adapter-&gt;tpd_ring;</div><div class='ctx'> 	struct atl1_buffer *buffer_info;</div><div class='hunk'>@@ -2195,6 +2201,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	unsigned int nr_frags;</div><div class='ctx'> 	unsigned int f;</div><div class='ctx'> 	int retval;</div><div class='add'>+	u16 first_mapped;</div><div class='ctx'> 	u16 next_to_use;</div><div class='ctx'> 	u16 data_len;</div><div class='ctx'> 	u8 hdr_len;</div><div class='hunk'>@@ -2202,6 +2209,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	buf_len -= skb-&gt;data_len;</div><div class='ctx'> 	nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	next_to_use = atomic_read(&amp;tpd_ring-&gt;next_to_use);</div><div class='add'>+	first_mapped = next_to_use;</div><div class='ctx'> 	buffer_info = &amp;tpd_ring-&gt;buffer_info[next_to_use];</div><div class='ctx'> 	BUG_ON(buffer_info-&gt;skb);</div><div class='ctx'> 	/* put skb in last TPD */</div><div class='hunk'>@@ -2210,13 +2218,15 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	retval = (ptpd-&gt;word3 &gt;&gt; TPD_SEGMENT_EN_SHIFT) &amp; TPD_SEGMENT_EN_MASK;</div><div class='ctx'> 	if (retval) {</div><div class='ctx'> 		/* TSO */</div><div class='del'>-		hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 		buffer_info-&gt;length = hdr_len;</div><div class='ctx'> 		page = virt_to_page(skb-&gt;data);</div><div class='ctx'> 		offset = offset_in_page(skb-&gt;data);</div><div class='del'>-		buffer_info-&gt;dma = pci_map_page(adapter-&gt;pdev, page,</div><div class='add'>+		buffer_info-&gt;dma = dma_map_page(&amp;adapter-&gt;pdev-&gt;dev, page,</div><div class='ctx'> 						offset, hdr_len,</div><div class='del'>-						PCI_DMA_TODEVICE);</div><div class='add'>+						DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, buffer_info-&gt;dma))</div><div class='add'>+			goto dma_err;</div><div class='ctx'> </div><div class='ctx'> 		if (++next_to_use == tpd_ring-&gt;count)</div><div class='ctx'> 			next_to_use = 0;</div><div class='hunk'>@@ -2239,9 +2249,13 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 					(hdr_len + i * ATL1_MAX_TX_BUF_LEN));</div><div class='ctx'> 				offset = offset_in_page(skb-&gt;data +</div><div class='ctx'> 					(hdr_len + i * ATL1_MAX_TX_BUF_LEN));</div><div class='del'>-				buffer_info-&gt;dma = pci_map_page(adapter-&gt;pdev,</div><div class='del'>-					page, offset, buffer_info-&gt;length,</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='add'>+				buffer_info-&gt;dma = dma_map_page(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+								page, offset,</div><div class='add'>+								buffer_info-&gt;length,</div><div class='add'>+								DMA_TO_DEVICE);</div><div class='add'>+				if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+						      buffer_info-&gt;dma))</div><div class='add'>+					goto dma_err;</div><div class='ctx'> 				if (++next_to_use == tpd_ring-&gt;count)</div><div class='ctx'> 					next_to_use = 0;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -2251,17 +2265,19 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 		buffer_info-&gt;length = buf_len;</div><div class='ctx'> 		page = virt_to_page(skb-&gt;data);</div><div class='ctx'> 		offset = offset_in_page(skb-&gt;data);</div><div class='del'>-		buffer_info-&gt;dma = pci_map_page(adapter-&gt;pdev, page,</div><div class='del'>-			offset, buf_len, PCI_DMA_TODEVICE);</div><div class='add'>+		buffer_info-&gt;dma = dma_map_page(&amp;adapter-&gt;pdev-&gt;dev, page,</div><div class='add'>+						offset, buf_len,</div><div class='add'>+						DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, buffer_info-&gt;dma))</div><div class='add'>+			goto dma_err;</div><div class='ctx'> 		if (++next_to_use == tpd_ring-&gt;count)</div><div class='ctx'> 			next_to_use = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (f = 0; f &lt; nr_frags; f++) {</div><div class='del'>-		const struct skb_frag_struct *frag;</div><div class='add'>+		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='ctx'> 		u16 i, nseg;</div><div class='ctx'> </div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[f];</div><div class='ctx'> 		buf_len = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		nseg = (buf_len + ATL1_MAX_TX_BUF_LEN - 1) /</div><div class='hunk'>@@ -2277,6 +2293,9 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 			buffer_info-&gt;dma = skb_frag_dma_map(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 				frag, i * ATL1_MAX_TX_BUF_LEN,</div><div class='ctx'> 				buffer_info-&gt;length, DMA_TO_DEVICE);</div><div class='add'>+			if (dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+					      buffer_info-&gt;dma))</div><div class='add'>+				goto dma_err;</div><div class='ctx'> </div><div class='ctx'> 			if (++next_to_use == tpd_ring-&gt;count)</div><div class='ctx'> 				next_to_use = 0;</div><div class='hunk'>@@ -2285,6 +2304,22 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* last tpd's buffer-info */</div><div class='ctx'> 	buffer_info-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+ dma_err:</div><div class='add'>+	while (first_mapped != next_to_use) {</div><div class='add'>+		buffer_info = &amp;tpd_ring-&gt;buffer_info[first_mapped];</div><div class='add'>+		dma_unmap_page(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			       buffer_info-&gt;dma,</div><div class='add'>+			       buffer_info-&gt;length,</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='add'>+		buffer_info-&gt;dma = 0;</div><div class='add'>+</div><div class='add'>+		if (++first_mapped == tpd_ring-&gt;count)</div><div class='add'>+			first_mapped = 0;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,</div><div class='hunk'>@@ -2355,10 +2390,8 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(skb-&gt;len &lt;= 0)) {</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(skb-&gt;len &lt;= 0))</div><div class='add'>+		goto drop_packet;</div><div class='ctx'> </div><div class='ctx'> 	nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	for (f = 0; f &lt; nr_frags; f++) {</div><div class='hunk'>@@ -2370,12 +2403,10 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 	if (mss) {</div><div class='ctx'> 		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-			proto_hdr_len = (skb_transport_offset(skb) +</div><div class='del'>-					 tcp_hdrlen(skb));</div><div class='del'>-			if (unlikely(proto_hdr_len &gt; len)) {</div><div class='del'>-				dev_kfree_skb_any(skb);</div><div class='del'>-				return NETDEV_TX_OK;</div><div class='del'>-			}</div><div class='add'>+			proto_hdr_len = skb_tcp_all_headers(skb);</div><div class='add'>+			if (unlikely(proto_hdr_len &gt; len))</div><div class='add'>+				goto drop_packet;</div><div class='add'>+</div><div class='ctx'> 			/* need additional TPD ? */</div><div class='ctx'> 			if (proto_hdr_len != len)</div><div class='ctx'> 				count += (len - proto_hdr_len +</div><div class='hunk'>@@ -2407,23 +2438,26 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tso = atl1_tso(adapter, skb, ptpd);</div><div class='del'>-	if (tso &lt; 0) {</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='add'>+	if (tso &lt; 0)</div><div class='add'>+		goto drop_packet;</div><div class='ctx'> </div><div class='ctx'> 	if (!tso) {</div><div class='ctx'> 		ret_val = atl1_tx_csum(adapter, skb, ptpd);</div><div class='del'>-		if (ret_val &lt; 0) {</div><div class='del'>-			dev_kfree_skb_any(skb);</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='add'>+		if (ret_val &lt; 0)</div><div class='add'>+			goto drop_packet;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	atl1_tx_map(adapter, skb, ptpd);</div><div class='add'>+	if (!atl1_tx_map(adapter, skb, ptpd))</div><div class='add'>+		goto drop_packet;</div><div class='add'>+</div><div class='ctx'> 	atl1_tx_queue(adapter, count, ptpd);</div><div class='ctx'> 	atl1_update_mailbox(adapter);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+drop_packet:</div><div class='add'>+	adapter-&gt;soft_stats.tx_errors++;</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atl1_rings_clean(struct napi_struct *napi, int budget)</div><div class='hunk'>@@ -2447,7 +2481,7 @@ static int atl1_rings_clean(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter)</div><div class='ctx'> {</div><div class='del'>-	if (!napi_schedule_prep(&amp;adapter-&gt;napi))</div><div class='add'>+	if (!napi_schedule(&amp;adapter-&gt;napi))</div><div class='ctx'> 		/* It is possible in case even the RX/TX ints are disabled via IMR</div><div class='ctx'> 		 * register the ISR bits are set anyway (but do not produce IRQ).</div><div class='ctx'> 		 * To handle such situation the napi functions used to check is</div><div class='hunk'>@@ -2455,8 +2489,6 @@ static inline int atl1_sched_rings_clean(struct atl1_adapter* adapter)</div><div class='ctx'> 		 */</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	__napi_schedule(&amp;adapter-&gt;napi);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Disable RX/TX ints via IMR register if it is</div><div class='ctx'> 	 * allowed. NAPI handler must reenable them in same</div><div class='hunk'>@@ -2555,12 +2587,12 @@ static irqreturn_t atl1_intr(int irq, void *data)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl1_phy_config - Timer Call-back</div><div class='del'>- * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ * @t: timer_list containing pointer to netdev cast into an unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static void atl1_phy_config(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct atl1_adapter *adapter = from_timer(adapter, t,</div><div class='del'>-						  phy_config_timer);</div><div class='add'>+	struct atl1_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							  phy_config_timer);</div><div class='ctx'> 	struct atl1_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2644,7 +2676,7 @@ static void atl1_down(struct atl1_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	napi_disable(&amp;adapter-&gt;napi);</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='ctx'> 	adapter-&gt;phy_timer_pending = false;</div><div class='ctx'> </div><div class='ctx'> 	atlx_irq_disable(adapter);</div><div class='hunk'>@@ -2690,7 +2722,7 @@ static int atl1_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	adapter-&gt;rx_buffer_len = (max_frame + 7) &amp; ~7;</div><div class='ctx'> 	adapter-&gt;hw.rx_jumbo_th = adapter-&gt;rx_buffer_len / 8;</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 	if (netif_running(netdev)) {</div><div class='ctx'> 		atl1_down(adapter);</div><div class='ctx'> 		atl1_up(adapter);</div><div class='hunk'>@@ -2756,8 +2788,7 @@ static int atl1_close(struct net_device *netdev)</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int atl1_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atl1_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct atl1_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	u32 ctrl = 0;</div><div class='hunk'>@@ -2782,7 +2813,7 @@ static int atl1_suspend(struct device *dev)</div><div class='ctx'> 		val = atl1_get_speed_and_duplex(hw, &amp;speed, &amp;duplex);</div><div class='ctx'> 		if (val) {</div><div class='ctx'> 			if (netif_msg_ifdown(adapter))</div><div class='del'>-				dev_printk(KERN_DEBUG, &amp;pdev-&gt;dev,</div><div class='add'>+				dev_printk(KERN_DEBUG, dev,</div><div class='ctx'> 					"error getting speed/duplex\n");</div><div class='ctx'> 			goto disable_wol;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -2839,8 +2870,7 @@ static int atl1_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int atl1_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(dev);</div><div class='del'>-	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct atl1_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	iowrite32(0, adapter-&gt;hw.hw_addr + REG_WOL_CTRL);</div><div class='hunk'>@@ -2890,7 +2920,7 @@ static const struct net_device_ops atl1_netdev_ops = {</div><div class='ctx'> 	.ndo_change_mtu		= atl1_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= atlx_fix_features,</div><div class='ctx'> 	.ndo_set_features	= atlx_set_features,</div><div class='del'>-	.ndo_do_ioctl		= atlx_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= atlx_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= atlx_tx_timeout,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= atl1_poll_controller,</div><div class='hunk'>@@ -2929,7 +2959,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 * various kernel subsystems to support the mechanics required by a</div><div class='ctx'> 	 * fixed-high-32-bit system.</div><div class='ctx'> 	 */</div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+	err = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no usable DMA configuration\n");</div><div class='ctx'> 		goto err_dma;</div><div class='hunk'>@@ -2970,8 +3000,6 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* get device revision number */</div><div class='ctx'> 	adapter-&gt;hw.dev_rev = ioread16(adapter-&gt;hw.hw_addr +</div><div class='ctx'> 		(REG_MASTER_CTRL + 2));</div><div class='del'>-	if (netif_msg_probe(adapter))</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "version %s\n", ATLX_DRIVER_VERSION);</div><div class='ctx'> </div><div class='ctx'> 	/* set default ring resource counts */</div><div class='ctx'> 	adapter-&gt;rfd_ring.count = adapter-&gt;rrd_ring.count = ATL1_DEFAULT_RFD;</div><div class='hunk'>@@ -2985,7 +3013,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;atl1_netdev_ops;</div><div class='ctx'> 	netdev-&gt;watchdog_timeo = 5 * HZ;</div><div class='del'>-	netif_napi_add(netdev, &amp;adapter-&gt;napi, atl1_rings_clean, 64);</div><div class='add'>+	netif_napi_add(netdev, &amp;adapter-&gt;napi, atl1_rings_clean);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;ethtool_ops = &amp;atl1_ethtool_ops;</div><div class='ctx'> 	adapter-&gt;bd_number = cards_found;</div><div class='hunk'>@@ -3034,7 +3062,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		/* mark random mac */</div><div class='ctx'> 		netdev-&gt;addr_assign_type = NET_ADDR_RANDOM;</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(netdev-&gt;dev_addr, adapter-&gt;hw.mac_addr, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, adapter-&gt;hw.mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(netdev-&gt;dev_addr)) {</div><div class='ctx'> 		err = -EIO;</div><div class='hunk'>@@ -3348,10 +3376,8 @@ static void atl1_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, ATLX_DRIVER_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, ATLX_DRIVER_VERSION,</div><div class='del'>-		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(drvinfo-&gt;driver, ATLX_DRIVER_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3447,7 +3473,9 @@ static void atl1_get_regs(struct net_device *netdev, struct ethtool_regs *regs,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void atl1_get_ringparam(struct net_device *netdev,</div><div class='del'>-	struct ethtool_ringparam *ring)</div><div class='add'>+			       struct ethtool_ringparam *ring,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct atl1_tpd_ring *txdr = &amp;adapter-&gt;tpd_ring;</div><div class='hunk'>@@ -3460,7 +3488,9 @@ static void atl1_get_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int atl1_set_ringparam(struct net_device *netdev,</div><div class='del'>-	struct ethtool_ringparam *ring)</div><div class='add'>+			      struct ethtool_ringparam *ring,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl1_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct atl1_tpd_ring *tpdr = &amp;adapter-&gt;tpd_ring;</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c<br/>index 3a3fb5ce0fee..280e2f5f4aa5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atlx/atl2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atlx/atl2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atlx/atl2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atlx/atl2.c</a></div><div class='hunk'>@@ -36,18 +36,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "atl2.h"</div><div class='ctx'> </div><div class='del'>-#define ATL2_DRV_VERSION "2.2.3"</div><div class='del'>-</div><div class='ctx'> static const char atl2_driver_name[] = "atl2";</div><div class='del'>-static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";</div><div class='del'>-static const char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";</div><div class='del'>-static const char atl2_driver_version[] = ATL2_DRV_VERSION;</div><div class='ctx'> static const struct ethtool_ops atl2_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Atheros Corporation &lt;xiong.huang@atheros.com&gt;, Chris Snook &lt;csnook@redhat.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Atheros Fast Ethernet Network Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(ATL2_DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * atl2_pci_tbl - PCI Device ID Table</div><div class='hunk'>@@ -287,11 +281,10 @@ static s32 atl2_setup_ring_resources(struct atl2_adapter *adapter)</div><div class='ctx'> 		adapter-&gt;txs_ring_size * 4 + 7 +	/* dword align */</div><div class='ctx'> 		adapter-&gt;rxd_ring_size * 1536 + 127;	/* 128bytes align */</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;ring_vir_addr = pci_alloc_consistent(pdev, size,</div><div class='del'>-		&amp;adapter-&gt;ring_dma);</div><div class='add'>+	adapter-&gt;ring_vir_addr = dma_alloc_coherent(&amp;pdev-&gt;dev, size,</div><div class='add'>+						    &amp;adapter-&gt;ring_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!adapter-&gt;ring_vir_addr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	memset(adapter-&gt;ring_vir_addr, 0, adapter-&gt;ring_size);</div><div class='ctx'> </div><div class='ctx'> 	/* Init TXD Ring */</div><div class='ctx'> 	adapter-&gt;txd_dma = adapter-&gt;ring_dma ;</div><div class='hunk'>@@ -670,8 +663,8 @@ static int atl2_request_irq(struct atl2_adapter *adapter)</div><div class='ctx'> static void atl2_free_ring_resources(struct atl2_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = adapter-&gt;pdev;</div><div class='del'>-	pci_free_consistent(pdev, adapter-&gt;ring_size, adapter-&gt;ring_vir_addr,</div><div class='del'>-		adapter-&gt;ring_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, adapter-&gt;ring_size,</div><div class='add'>+			  adapter-&gt;ring_vir_addr, adapter-&gt;ring_dma);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -759,8 +752,8 @@ static void atl2_down(struct atl2_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	atl2_irq_disable(adapter);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='ctx'> 	clear_bit(0, &amp;adapter-&gt;cfg_phy);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='hunk'>@@ -912,7 +905,7 @@ static int atl2_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> </div><div class='ctx'> 	/* set MTU */</div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 	hw-&gt;max_frame_size = new_mtu;</div><div class='ctx'> 	ATL2_WRITE_REG(hw, REG_MTU, new_mtu + ETH_HLEN +</div><div class='ctx'> 		       VLAN_HLEN + ETH_FCS_LEN);</div><div class='hunk'>@@ -938,7 +931,7 @@ static int atl2_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	memcpy(adapter-&gt;hw.mac_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	atl2_set_mac_addr(&amp;adapter-&gt;hw);</div><div class='hunk'>@@ -1001,8 +994,9 @@ static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='ctx'> /**</div><div class='ctx'>  * atl2_tx_timeout - Respond to a Tx Hang</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='add'>+ * @txqueue: index of the hanging transmit queue</div><div class='ctx'>  */</div><div class='del'>-static void atl2_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void atl2_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1012,11 +1006,12 @@ static void atl2_tx_timeout(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl2_watchdog - Timer Call-back</div><div class='del'>- * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ * @t: timer list containing a pointer to netdev cast into an unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static void atl2_watchdog(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct atl2_adapter *adapter = from_timer(adapter, t, watchdog_timer);</div><div class='add'>+	struct atl2_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							  watchdog_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (!test_bit(__ATL2_DOWN, &amp;adapter-&gt;flags)) {</div><div class='ctx'> 		u32 drop_rxd, drop_rxs;</div><div class='hunk'>@@ -1037,12 +1032,12 @@ static void atl2_watchdog(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl2_phy_config - Timer Call-back</div><div class='del'>- * @data: pointer to netdev cast into an unsigned long</div><div class='add'>+ * @t: timer list containing a pointer to netdev cast into an unsigned long</div><div class='ctx'>  */</div><div class='ctx'> static void atl2_phy_config(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct atl2_adapter *adapter = from_timer(adapter, t,</div><div class='del'>-						  phy_config_timer);</div><div class='add'>+	struct atl2_adapter *adapter = timer_container_of(adapter, t,</div><div class='add'>+							  phy_config_timer);</div><div class='ctx'> 	struct atl2_hw *hw = &amp;adapter-&gt;hw;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1092,7 +1087,6 @@ err_up:</div><div class='ctx'> </div><div class='ctx'> static void atl2_reinit_locked(struct atl2_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	WARN_ON(in_interrupt());</div><div class='ctx'> 	while (test_and_set_bit(__ATL2_RESETTING, &amp;adapter-&gt;flags))</div><div class='ctx'> 		msleep(1);</div><div class='ctx'> 	atl2_down(adapter);</div><div class='hunk'>@@ -1242,6 +1236,7 @@ static int atl2_check_link(struct atl2_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * atl2_link_chg_task - deal with link change event Out of interrupt context</div><div class='add'>+ * @work: pointer to work struct with private info</div><div class='ctx'>  */</div><div class='ctx'> static void atl2_link_chg_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -1299,7 +1294,7 @@ static const struct net_device_ops atl2_netdev_ops = {</div><div class='ctx'> 	.ndo_change_mtu		= atl2_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= atl2_fix_features,</div><div class='ctx'> 	.ndo_set_features	= atl2_set_features,</div><div class='del'>-	.ndo_do_ioctl		= atl2_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= atl2_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= atl2_tx_timeout,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= atl2_poll_controller,</div><div class='hunk'>@@ -1335,8 +1330,8 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 * until the kernel has the proper infrastructure to support 64-bit DMA</div><div class='ctx'> 	 * on these devices.</div><div class='ctx'> 	 */</div><div class='del'>-	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) &amp;&amp;</div><div class='del'>-		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32)) &amp;&amp;</div><div class='add'>+	    dma_set_coherent_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='ctx'> 		printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n");</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_dma;</div><div class='hunk'>@@ -1383,7 +1378,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	netdev-&gt;watchdog_timeo = 5 * HZ;</div><div class='ctx'> 	netdev-&gt;min_mtu = 40;</div><div class='ctx'> 	netdev-&gt;max_mtu = ETH_DATA_LEN + VLAN_HLEN;</div><div class='del'>-	strncpy(netdev-&gt;name, pci_name(pdev), sizeof(netdev-&gt;name) - 1);</div><div class='add'>+	strscpy(netdev-&gt;name, pci_name(pdev), sizeof(netdev-&gt;name));</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;mem_start = mmio_start;</div><div class='ctx'> 	netdev-&gt;mem_end = mmio_start + mmio_len;</div><div class='hunk'>@@ -1411,7 +1406,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	/* copy the MAC address out of the EEPROM */</div><div class='ctx'> 	atl2_read_mac_addr(&amp;adapter-&gt;hw);</div><div class='del'>-	memcpy(netdev-&gt;dev_addr, adapter-&gt;hw.mac_addr, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, adapter-&gt;hw.mac_addr);</div><div class='ctx'> 	if (!is_valid_ether_addr(netdev-&gt;dev_addr)) {</div><div class='ctx'> 		err = -EIO;</div><div class='ctx'> 		goto err_eeprom;</div><div class='hunk'>@@ -1474,8 +1469,8 @@ static void atl2_remove(struct pci_dev *pdev)</div><div class='ctx'> 	 * explicitly disable watchdog tasks from being rescheduled  */</div><div class='ctx'> 	set_bit(__ATL2_DOWN, &amp;adapter-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='del'>-	del_timer_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;watchdog_timer);</div><div class='add'>+	timer_delete_sync(&amp;adapter-&gt;phy_config_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;adapter-&gt;reset_task);</div><div class='ctx'> 	cancel_work_sync(&amp;adapter-&gt;link_chg_task);</div><div class='ctx'> </div><div class='hunk'>@@ -1681,32 +1676,7 @@ static struct pci_driver atl2_driver = {</div><div class='ctx'> 	.shutdown = atl2_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * atl2_init_module - Driver Registration Routine</div><div class='del'>- *</div><div class='del'>- * atl2_init_module is the first routine called when the driver is</div><div class='del'>- * loaded. All it does is register with the PCI subsystem.</div><div class='del'>- */</div><div class='del'>-static int __init atl2_init_module(void)</div><div class='del'>-{</div><div class='del'>-	printk(KERN_INFO "%s - version %s\n", atl2_driver_string,</div><div class='del'>-		atl2_driver_version);</div><div class='del'>-	printk(KERN_INFO "%s\n", atl2_copyright);</div><div class='del'>-	return pci_register_driver(&amp;atl2_driver);</div><div class='del'>-}</div><div class='del'>-module_init(atl2_init_module);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * atl2_exit_module - Driver Exit Cleanup Routine</div><div class='del'>- *</div><div class='del'>- * atl2_exit_module is called just before the driver is removed</div><div class='del'>- * from memory.</div><div class='del'>- */</div><div class='del'>-static void __exit atl2_exit_module(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;atl2_driver);</div><div class='del'>-}</div><div class='del'>-module_exit(atl2_exit_module);</div><div class='add'>+module_pci_driver(atl2_driver);</div><div class='ctx'> </div><div class='ctx'> static void atl2_read_pci_cfg(struct atl2_hw *hw, u32 reg, u16 *value)</div><div class='ctx'> {</div><div class='hunk'>@@ -2011,11 +1981,9 @@ static void atl2_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct atl2_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver,  atl2_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, atl2_driver_version,</div><div class='del'>-		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "L2", sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(drvinfo-&gt;driver,  atl2_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;fw_version, "L2", sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2560,7 +2528,6 @@ static s32 atl2_write_phy_reg(struct atl2_hw *hw, u32 reg_addr, u16 phy_data)</div><div class='ctx'>  */</div><div class='ctx'> static s32 atl2_phy_setup_autoneg_adv(struct atl2_hw *hw)</div><div class='ctx'> {</div><div class='del'>-	s32 ret_val;</div><div class='ctx'> 	s16 mii_autoneg_adv_reg;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the MII Auto-Neg Advertisement Register (Address 4). */</div><div class='hunk'>@@ -2616,12 +2583,7 @@ static s32 atl2_phy_setup_autoneg_adv(struct atl2_hw *hw)</div><div class='ctx'> </div><div class='ctx'> 	hw-&gt;mii_autoneg_adv_reg = mii_autoneg_adv_reg;</div><div class='ctx'> </div><div class='del'>-	ret_val = atl2_write_phy_reg(hw, MII_ADVERTISE, mii_autoneg_adv_reg);</div><div class='del'>-</div><div class='del'>-	if (ret_val)</div><div class='del'>-		return ret_val;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return atl2_write_phy_reg(hw, MII_ADVERTISE, mii_autoneg_adv_reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c<br/>index 505a22c703f7..e8cfbf4ff1b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atlx/atlx.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/atheros/atlx/atlx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/atheros/atlx/atlx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/atheros/atlx/atlx.c</a></div><div class='hunk'>@@ -69,7 +69,7 @@ static int atlx_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	memcpy(adapter-&gt;hw.mac_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='ctx'> </div><div class='ctx'> 	atlx_set_mac_addr(&amp;adapter-&gt;hw);</div><div class='hunk'>@@ -183,7 +183,7 @@ static void atlx_clear_phy_int(struct atlx_adapter *adapter)</div><div class='ctx'>  * atlx_tx_timeout - Respond to a Tx Hang</div><div class='ctx'>  * @netdev: network interface device structure</div><div class='ctx'>  */</div><div class='del'>-static void atlx_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void atlx_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct atlx_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	/* Do the reset outside of interrupt context */</div><div class='head'>diff --git a/drivers/net/ethernet/aurora/Kconfig b/drivers/net/ethernet/aurora/Kconfig<br/>deleted file mode 100644<br/>index 9ee30ea90bfa..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aurora/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/Kconfig</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-config NET_VENDOR_AURORA</div><div class='del'>-	bool "Aurora VLSI devices"</div><div class='del'>-	default y</div><div class='del'>-	help</div><div class='del'>-	  If you have a network (Ethernet) device belonging to this class,</div><div class='del'>-	  say Y.</div><div class='del'>-</div><div class='del'>-	  Note that the answer to this question doesn't directly affect the</div><div class='del'>-	  kernel: saying N will just cause the configurator to skip all</div><div class='del'>-	  questions about Aurora devices. If you say Y, you will be asked</div><div class='del'>-	  for your specific device in the following questions.</div><div class='del'>-</div><div class='del'>-if NET_VENDOR_AURORA</div><div class='del'>-</div><div class='del'>-config AURORA_NB8800</div><div class='del'>-	tristate "Aurora AU-NB8800 support"</div><div class='del'>-	depends on HAS_DMA</div><div class='del'>-	select PHYLIB</div><div class='del'>-	help</div><div class='del'>-	 Support for the AU-NB8800 gigabit Ethernet controller.</div><div class='del'>-</div><div class='del'>-endif</div><div class='head'>diff --git a/drivers/net/ethernet/aurora/Makefile b/drivers/net/ethernet/aurora/Makefile<br/>deleted file mode 100644<br/>index f3d599867619..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aurora/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/Makefile</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-# SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-obj-$(CONFIG_AURORA_NB8800) += nb8800.o</div><div class='head'>diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c<br/>deleted file mode 100644<br/>index 3b3370a94a9c..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aurora/nb8800.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/nb8800.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1527 +0,0 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0-or-later</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2015 Mans Rullgard &lt;mans@mansr.com&gt;</div><div class='del'>- *</div><div class='del'>- * Mostly rewritten, based on driver from Sigma Designs.  Original</div><div class='del'>- * copyright notice below.</div><div class='del'>- *</div><div class='del'>- * Driver for tangox SMP864x/SMP865x/SMP867x/SMP868x builtin Ethernet Mac.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2005 Maxime Bizon &lt;mbizon@freebox.fr&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/ethtool.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/cache.h&gt;</div><div class='del'>-#include &lt;linux/jiffies.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/iopoll.h&gt;</div><div class='del'>-#include &lt;asm/barrier.h&gt;</div><div class='del'>-</div><div class='del'>-#include "nb8800.h"</div><div class='del'>-</div><div class='del'>-static void nb8800_tx_done(struct net_device *dev);</div><div class='del'>-static int nb8800_dma_stop(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static inline u8 nb8800_readb(struct nb8800_priv *priv, int reg)</div><div class='del'>-{</div><div class='del'>-	return readb_relaxed(priv-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u32 nb8800_readl(struct nb8800_priv *priv, int reg)</div><div class='del'>-{</div><div class='del'>-	return readl_relaxed(priv-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_writeb(struct nb8800_priv *priv, int reg, u8 val)</div><div class='del'>-{</div><div class='del'>-	writeb_relaxed(val, priv-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_writew(struct nb8800_priv *priv, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	writew_relaxed(val, priv-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_writel(struct nb8800_priv *priv, int reg, u32 val)</div><div class='del'>-{</div><div class='del'>-	writel_relaxed(val, priv-&gt;base + reg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_maskb(struct nb8800_priv *priv, int reg,</div><div class='del'>-				u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 old = nb8800_readb(priv, reg);</div><div class='del'>-	u32 new = (old &amp; ~mask) | (val &amp; mask);</div><div class='del'>-</div><div class='del'>-	if (new != old)</div><div class='del'>-		nb8800_writeb(priv, reg, new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_maskl(struct nb8800_priv *priv, int reg,</div><div class='del'>-				u32 mask, u32 val)</div><div class='del'>-{</div><div class='del'>-	u32 old = nb8800_readl(priv, reg);</div><div class='del'>-	u32 new = (old &amp; ~mask) | (val &amp; mask);</div><div class='del'>-</div><div class='del'>-	if (new != old)</div><div class='del'>-		nb8800_writel(priv, reg, new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_modb(struct nb8800_priv *priv, int reg, u8 bits,</div><div class='del'>-			       bool set)</div><div class='del'>-{</div><div class='del'>-	nb8800_maskb(priv, reg, bits, set ? bits : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_setb(struct nb8800_priv *priv, int reg, u8 bits)</div><div class='del'>-{</div><div class='del'>-	nb8800_maskb(priv, reg, bits, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_clearb(struct nb8800_priv *priv, int reg, u8 bits)</div><div class='del'>-{</div><div class='del'>-	nb8800_maskb(priv, reg, bits, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_modl(struct nb8800_priv *priv, int reg, u32 bits,</div><div class='del'>-			       bool set)</div><div class='del'>-{</div><div class='del'>-	nb8800_maskl(priv, reg, bits, set ? bits : 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_setl(struct nb8800_priv *priv, int reg, u32 bits)</div><div class='del'>-{</div><div class='del'>-	nb8800_maskl(priv, reg, bits, bits);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void nb8800_clearl(struct nb8800_priv *priv, int reg, u32 bits)</div><div class='del'>-{</div><div class='del'>-	nb8800_maskl(priv, reg, bits, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_mdio_wait(struct mii_bus *bus)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = bus-&gt;priv;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	return readl_poll_timeout_atomic(priv-&gt;base + NB8800_MDIO_CMD,</div><div class='del'>-					 val, !(val &amp; MDIO_CMD_GO), 1, 1000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_mdio_cmd(struct mii_bus *bus, u32 cmd)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = bus-&gt;priv;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nb8800_mdio_wait(bus);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	nb8800_writel(priv, NB8800_MDIO_CMD, cmd);</div><div class='del'>-	udelay(10);</div><div class='del'>-	nb8800_writel(priv, NB8800_MDIO_CMD, cmd | MDIO_CMD_GO);</div><div class='del'>-</div><div class='del'>-	return nb8800_mdio_wait(bus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_mdio_read(struct mii_bus *bus, int phy_id, int reg)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = bus-&gt;priv;</div><div class='del'>-	u32 val;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nb8800_mdio_cmd(bus, MDIO_CMD_ADDR(phy_id) | MDIO_CMD_REG(reg));</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	val = nb8800_readl(priv, NB8800_MDIO_STS);</div><div class='del'>-	if (val &amp; MDIO_STS_ERR)</div><div class='del'>-		return 0xffff;</div><div class='del'>-</div><div class='del'>-	return val &amp; 0xffff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 val)</div><div class='del'>-{</div><div class='del'>-	u32 cmd = MDIO_CMD_ADDR(phy_id) | MDIO_CMD_REG(reg) |</div><div class='del'>-		MDIO_CMD_DATA(val) | MDIO_CMD_WR;</div><div class='del'>-</div><div class='del'>-	return nb8800_mdio_cmd(bus, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_mac_tx(struct net_device *dev, bool enable)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	while (nb8800_readl(priv, NB8800_TXC_CR) &amp; TCR_EN)</div><div class='del'>-		cpu_relax();</div><div class='del'>-</div><div class='del'>-	nb8800_modb(priv, NB8800_TX_CTL1, TX_EN, enable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_mac_rx(struct net_device *dev, bool enable)</div><div class='del'>-{</div><div class='del'>-	nb8800_modb(netdev_priv(dev), NB8800_RX_CTL, RX_EN, enable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_mac_af(struct net_device *dev, bool enable)</div><div class='del'>-{</div><div class='del'>-	nb8800_modb(netdev_priv(dev), NB8800_RX_CTL, RX_AF_EN, enable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_start_rx(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	nb8800_setl(netdev_priv(dev), NB8800_RXC_CR, RCR_EN);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_alloc_rx(struct net_device *dev, unsigned int i, bool napi)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_rx_desc *rxd = &amp;priv-&gt;rx_descs[i];</div><div class='del'>-	struct nb8800_rx_buf *rxb = &amp;priv-&gt;rx_bufs[i];</div><div class='del'>-	int size = L1_CACHE_ALIGN(RX_BUF_SIZE);</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-	struct page *page;</div><div class='del'>-	unsigned long offset;</div><div class='del'>-	void *data;</div><div class='del'>-</div><div class='del'>-	data = napi ? napi_alloc_frag(size) : netdev_alloc_frag(size);</div><div class='del'>-	if (!data)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	page = virt_to_head_page(data);</div><div class='del'>-	offset = data - page_address(page);</div><div class='del'>-</div><div class='del'>-	dma_addr = dma_map_page(&amp;dev-&gt;dev, page, offset, RX_BUF_SIZE,</div><div class='del'>-				DMA_FROM_DEVICE);</div><div class='del'>-</div><div class='del'>-	if (dma_mapping_error(&amp;dev-&gt;dev, dma_addr)) {</div><div class='del'>-		skb_free_frag(data);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxb-&gt;page = page;</div><div class='del'>-	rxb-&gt;offset = offset;</div><div class='del'>-	rxd-&gt;desc.s_addr = dma_addr;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_receive(struct net_device *dev, unsigned int i,</div><div class='del'>-			   unsigned int len)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_rx_desc *rxd = &amp;priv-&gt;rx_descs[i];</div><div class='del'>-	struct page *page = priv-&gt;rx_bufs[i].page;</div><div class='del'>-	int offset = priv-&gt;rx_bufs[i].offset;</div><div class='del'>-	void *data = page_address(page) + offset;</div><div class='del'>-	dma_addr_t dma = rxd-&gt;desc.s_addr;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned int size;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	size = len &lt;= RX_COPYBREAK ? len : RX_COPYHDR;</div><div class='del'>-</div><div class='del'>-	skb = napi_alloc_skb(&amp;priv-&gt;napi, size);</div><div class='del'>-	if (!skb) {</div><div class='del'>-		netdev_err(dev, "rx skb allocation failed\n");</div><div class='del'>-		dev-&gt;stats.rx_dropped++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &lt;= RX_COPYBREAK) {</div><div class='del'>-		dma_sync_single_for_cpu(&amp;dev-&gt;dev, dma, len, DMA_FROM_DEVICE);</div><div class='del'>-		skb_put_data(skb, data, len);</div><div class='del'>-		dma_sync_single_for_device(&amp;dev-&gt;dev, dma, len,</div><div class='del'>-					   DMA_FROM_DEVICE);</div><div class='del'>-	} else {</div><div class='del'>-		err = nb8800_alloc_rx(dev, i, true);</div><div class='del'>-		if (err) {</div><div class='del'>-			netdev_err(dev, "rx buffer allocation failed\n");</div><div class='del'>-			dev-&gt;stats.rx_dropped++;</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dma_unmap_page(&amp;dev-&gt;dev, dma, RX_BUF_SIZE, DMA_FROM_DEVICE);</div><div class='del'>-		skb_put_data(skb, data, RX_COPYHDR);</div><div class='del'>-		skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags, page,</div><div class='del'>-				offset + RX_COPYHDR, len - RX_COPYHDR,</div><div class='del'>-				RX_BUF_SIZE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='del'>-	napi_gro_receive(&amp;priv-&gt;napi, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_rx_error(struct net_device *dev, u32 report)</div><div class='del'>-{</div><div class='del'>-	if (report &amp; RX_LENGTH_ERR)</div><div class='del'>-		dev-&gt;stats.rx_length_errors++;</div><div class='del'>-</div><div class='del'>-	if (report &amp; RX_FCS_ERR)</div><div class='del'>-		dev-&gt;stats.rx_crc_errors++;</div><div class='del'>-</div><div class='del'>-	if (report &amp; RX_FIFO_OVERRUN)</div><div class='del'>-		dev-&gt;stats.rx_fifo_errors++;</div><div class='del'>-</div><div class='del'>-	if (report &amp; RX_ALIGNMENT_ERROR)</div><div class='del'>-		dev-&gt;stats.rx_frame_errors++;</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.rx_errors++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_poll(struct napi_struct *napi, int budget)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = napi-&gt;dev;</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_rx_desc *rxd;</div><div class='del'>-	unsigned int last = priv-&gt;rx_eoc;</div><div class='del'>-	unsigned int next;</div><div class='del'>-	int work = 0;</div><div class='del'>-</div><div class='del'>-	nb8800_tx_done(dev);</div><div class='del'>-</div><div class='del'>-again:</div><div class='del'>-	do {</div><div class='del'>-		unsigned int len;</div><div class='del'>-</div><div class='del'>-		next = (last + 1) % RX_DESC_COUNT;</div><div class='del'>-</div><div class='del'>-		rxd = &amp;priv-&gt;rx_descs[next];</div><div class='del'>-</div><div class='del'>-		if (!rxd-&gt;report)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		len = RX_BYTES_TRANSFERRED(rxd-&gt;report);</div><div class='del'>-</div><div class='del'>-		if (IS_RX_ERROR(rxd-&gt;report))</div><div class='del'>-			nb8800_rx_error(dev, rxd-&gt;report);</div><div class='del'>-		else</div><div class='del'>-			nb8800_receive(dev, next, len);</div><div class='del'>-</div><div class='del'>-		dev-&gt;stats.rx_packets++;</div><div class='del'>-		dev-&gt;stats.rx_bytes += len;</div><div class='del'>-</div><div class='del'>-		if (rxd-&gt;report &amp; RX_MULTICAST_PKT)</div><div class='del'>-			dev-&gt;stats.multicast++;</div><div class='del'>-</div><div class='del'>-		rxd-&gt;report = 0;</div><div class='del'>-		last = next;</div><div class='del'>-		work++;</div><div class='del'>-	} while (work &lt; budget);</div><div class='del'>-</div><div class='del'>-	if (work) {</div><div class='del'>-		priv-&gt;rx_descs[last].desc.config |= DESC_EOC;</div><div class='del'>-		wmb();	/* ensure new EOC is written before clearing old */</div><div class='del'>-		priv-&gt;rx_descs[priv-&gt;rx_eoc].desc.config &amp;= ~DESC_EOC;</div><div class='del'>-		priv-&gt;rx_eoc = last;</div><div class='del'>-		nb8800_start_rx(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (work &lt; budget) {</div><div class='del'>-		nb8800_writel(priv, NB8800_RX_ITR, priv-&gt;rx_itr_irq);</div><div class='del'>-</div><div class='del'>-		/* If a packet arrived after we last checked but</div><div class='del'>-		 * before writing RX_ITR, the interrupt will be</div><div class='del'>-		 * delayed, so we retrieve it now.</div><div class='del'>-		 */</div><div class='del'>-		if (priv-&gt;rx_descs[next].report)</div><div class='del'>-			goto again;</div><div class='del'>-</div><div class='del'>-		napi_complete_done(napi, work);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return work;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __nb8800_tx_dma_start(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_tx_buf *txb;</div><div class='del'>-	u32 txc_cr;</div><div class='del'>-</div><div class='del'>-	txb = &amp;priv-&gt;tx_bufs[priv-&gt;tx_queue];</div><div class='del'>-	if (!txb-&gt;ready)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	txc_cr = nb8800_readl(priv, NB8800_TXC_CR);</div><div class='del'>-	if (txc_cr &amp; TCR_EN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	nb8800_writel(priv, NB8800_TX_DESC_ADDR, txb-&gt;dma_desc);</div><div class='del'>-	wmb();		/* ensure desc addr is written before starting DMA */</div><div class='del'>-	nb8800_writel(priv, NB8800_TXC_CR, txc_cr | TCR_EN);</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_queue = (priv-&gt;tx_queue + txb-&gt;chain_len) % TX_DESC_COUNT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_tx_dma_start(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-	__nb8800_tx_dma_start(dev);</div><div class='del'>-	spin_unlock_irq(&amp;priv-&gt;tx_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_tx_dma_start_irq(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;priv-&gt;tx_lock);</div><div class='del'>-	__nb8800_tx_dma_start(dev);</div><div class='del'>-	spin_unlock(&amp;priv-&gt;tx_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_tx_desc *txd;</div><div class='del'>-	struct nb8800_tx_buf *txb;</div><div class='del'>-	struct nb8800_dma_desc *desc;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-	unsigned int dma_len;</div><div class='del'>-	unsigned int align;</div><div class='del'>-	unsigned int next;</div><div class='del'>-	bool xmit_more;</div><div class='del'>-</div><div class='del'>-	if (atomic_read(&amp;priv-&gt;tx_free) &lt;= NB8800_DESC_LOW) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	align = (8 - (uintptr_t)skb-&gt;data) &amp; 7;</div><div class='del'>-</div><div class='del'>-	dma_len = skb-&gt;len - align;</div><div class='del'>-	dma_addr = dma_map_single(&amp;dev-&gt;dev, skb-&gt;data + align,</div><div class='del'>-				  dma_len, DMA_TO_DEVICE);</div><div class='del'>-</div><div class='del'>-	if (dma_mapping_error(&amp;dev-&gt;dev, dma_addr)) {</div><div class='del'>-		netdev_err(dev, "tx dma mapping error\n");</div><div class='del'>-		kfree_skb(skb);</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	xmit_more = netdev_xmit_more();</div><div class='del'>-	if (atomic_dec_return(&amp;priv-&gt;tx_free) &lt;= NB8800_DESC_LOW) {</div><div class='del'>-		netif_stop_queue(dev);</div><div class='del'>-		xmit_more = false;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	next = priv-&gt;tx_next;</div><div class='del'>-	txb = &amp;priv-&gt;tx_bufs[next];</div><div class='del'>-	txd = &amp;priv-&gt;tx_descs[next];</div><div class='del'>-	desc = &amp;txd-&gt;desc[0];</div><div class='del'>-</div><div class='del'>-	next = (next + 1) % TX_DESC_COUNT;</div><div class='del'>-</div><div class='del'>-	if (align) {</div><div class='del'>-		memcpy(txd-&gt;buf, skb-&gt;data, align);</div><div class='del'>-</div><div class='del'>-		desc-&gt;s_addr =</div><div class='del'>-			txb-&gt;dma_desc + offsetof(struct nb8800_tx_desc, buf);</div><div class='del'>-		desc-&gt;n_addr = txb-&gt;dma_desc + sizeof(txd-&gt;desc[0]);</div><div class='del'>-		desc-&gt;config = DESC_BTS(2) | DESC_DS | align;</div><div class='del'>-</div><div class='del'>-		desc++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	desc-&gt;s_addr = dma_addr;</div><div class='del'>-	desc-&gt;n_addr = priv-&gt;tx_bufs[next].dma_desc;</div><div class='del'>-	desc-&gt;config = DESC_BTS(2) | DESC_DS | DESC_EOF | dma_len;</div><div class='del'>-</div><div class='del'>-	if (!xmit_more)</div><div class='del'>-		desc-&gt;config |= DESC_EOC;</div><div class='del'>-</div><div class='del'>-	txb-&gt;skb = skb;</div><div class='del'>-	txb-&gt;dma_addr = dma_addr;</div><div class='del'>-	txb-&gt;dma_len = dma_len;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;tx_chain) {</div><div class='del'>-		txb-&gt;chain_len = 1;</div><div class='del'>-		priv-&gt;tx_chain = txb;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;tx_chain-&gt;chain_len++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netdev_sent_queue(dev, skb-&gt;len);</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_next = next;</div><div class='del'>-</div><div class='del'>-	if (!xmit_more) {</div><div class='del'>-		smp_wmb();</div><div class='del'>-		priv-&gt;tx_chain-&gt;ready = true;</div><div class='del'>-		priv-&gt;tx_chain = NULL;</div><div class='del'>-		nb8800_tx_dma_start(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_tx_error(struct net_device *dev, u32 report)</div><div class='del'>-{</div><div class='del'>-	if (report &amp; TX_LATE_COLLISION)</div><div class='del'>-		dev-&gt;stats.collisions++;</div><div class='del'>-</div><div class='del'>-	if (report &amp; TX_PACKET_DROPPED)</div><div class='del'>-		dev-&gt;stats.tx_dropped++;</div><div class='del'>-</div><div class='del'>-	if (report &amp; TX_FIFO_UNDERRUN)</div><div class='del'>-		dev-&gt;stats.tx_fifo_errors++;</div><div class='del'>-</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_tx_done(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned int limit = priv-&gt;tx_next;</div><div class='del'>-	unsigned int done = priv-&gt;tx_done;</div><div class='del'>-	unsigned int packets = 0;</div><div class='del'>-	unsigned int len = 0;</div><div class='del'>-</div><div class='del'>-	while (done != limit) {</div><div class='del'>-		struct nb8800_tx_desc *txd = &amp;priv-&gt;tx_descs[done];</div><div class='del'>-		struct nb8800_tx_buf *txb = &amp;priv-&gt;tx_bufs[done];</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-		if (!txd-&gt;report)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		skb = txb-&gt;skb;</div><div class='del'>-		len += skb-&gt;len;</div><div class='del'>-</div><div class='del'>-		dma_unmap_single(&amp;dev-&gt;dev, txb-&gt;dma_addr, txb-&gt;dma_len,</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-</div><div class='del'>-		if (IS_TX_ERROR(txd-&gt;report)) {</div><div class='del'>-			nb8800_tx_error(dev, txd-&gt;report);</div><div class='del'>-			kfree_skb(skb);</div><div class='del'>-		} else {</div><div class='del'>-			consume_skb(skb);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		dev-&gt;stats.tx_packets++;</div><div class='del'>-		dev-&gt;stats.tx_bytes += TX_BYTES_TRANSFERRED(txd-&gt;report);</div><div class='del'>-		dev-&gt;stats.collisions += TX_EARLY_COLLISIONS(txd-&gt;report);</div><div class='del'>-</div><div class='del'>-		txb-&gt;skb = NULL;</div><div class='del'>-		txb-&gt;ready = false;</div><div class='del'>-		txd-&gt;report = 0;</div><div class='del'>-</div><div class='del'>-		done = (done + 1) % TX_DESC_COUNT;</div><div class='del'>-		packets++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (packets) {</div><div class='del'>-		smp_mb__before_atomic();</div><div class='del'>-		atomic_add(packets, &amp;priv-&gt;tx_free);</div><div class='del'>-		netdev_completed_queue(dev, packets, len);</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-		priv-&gt;tx_done = done;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static irqreturn_t nb8800_irq(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = dev_id;</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	irqreturn_t ret = IRQ_NONE;</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	/* tx interrupt */</div><div class='del'>-	val = nb8800_readl(priv, NB8800_TXC_SR);</div><div class='del'>-	if (val) {</div><div class='del'>-		nb8800_writel(priv, NB8800_TXC_SR, val);</div><div class='del'>-</div><div class='del'>-		if (val &amp; TSR_DI)</div><div class='del'>-			nb8800_tx_dma_start_irq(dev);</div><div class='del'>-</div><div class='del'>-		if (val &amp; TSR_TI)</div><div class='del'>-			napi_schedule_irqoff(&amp;priv-&gt;napi);</div><div class='del'>-</div><div class='del'>-		if (unlikely(val &amp; TSR_DE))</div><div class='del'>-			netdev_err(dev, "TX DMA error\n");</div><div class='del'>-</div><div class='del'>-		/* should never happen with automatic status retrieval */</div><div class='del'>-		if (unlikely(val &amp; TSR_TO))</div><div class='del'>-			netdev_err(dev, "TX Status FIFO overflow\n");</div><div class='del'>-</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* rx interrupt */</div><div class='del'>-	val = nb8800_readl(priv, NB8800_RXC_SR);</div><div class='del'>-	if (val) {</div><div class='del'>-		nb8800_writel(priv, NB8800_RXC_SR, val);</div><div class='del'>-</div><div class='del'>-		if (likely(val &amp; (RSR_RI | RSR_DI))) {</div><div class='del'>-			nb8800_writel(priv, NB8800_RX_ITR, priv-&gt;rx_itr_poll);</div><div class='del'>-			napi_schedule_irqoff(&amp;priv-&gt;napi);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (unlikely(val &amp; RSR_DE))</div><div class='del'>-			netdev_err(dev, "RX DMA error\n");</div><div class='del'>-</div><div class='del'>-		/* should never happen with automatic status retrieval */</div><div class='del'>-		if (unlikely(val &amp; RSR_RO))</div><div class='del'>-			netdev_err(dev, "RX Status FIFO overflow\n");</div><div class='del'>-</div><div class='del'>-		ret = IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_mac_config(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	bool gigabit = priv-&gt;speed == SPEED_1000;</div><div class='del'>-	u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE;</div><div class='del'>-	u32 mac_mode = 0;</div><div class='del'>-	u32 slot_time;</div><div class='del'>-	u32 phy_clk;</div><div class='del'>-	u32 ict;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;duplex)</div><div class='del'>-		mac_mode |= HALF_DUPLEX;</div><div class='del'>-</div><div class='del'>-	if (gigabit) {</div><div class='del'>-		if (phy_interface_is_rgmii(dev-&gt;phydev))</div><div class='del'>-			mac_mode |= RGMII_MODE;</div><div class='del'>-</div><div class='del'>-		mac_mode |= GMAC_MODE;</div><div class='del'>-		phy_clk = 125000000;</div><div class='del'>-</div><div class='del'>-		/* Should be 512 but register is only 8 bits */</div><div class='del'>-		slot_time = 255;</div><div class='del'>-	} else {</div><div class='del'>-		phy_clk = 25000000;</div><div class='del'>-		slot_time = 128;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ict = DIV_ROUND_UP(phy_clk, clk_get_rate(priv-&gt;clk));</div><div class='del'>-</div><div class='del'>-	nb8800_writeb(priv, NB8800_IC_THRESHOLD, ict);</div><div class='del'>-	nb8800_writeb(priv, NB8800_SLOT_TIME, slot_time);</div><div class='del'>-	nb8800_maskb(priv, NB8800_MAC_MODE, mac_mode_mask, mac_mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_pause_config(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-	u32 rxcr;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;pause_aneg) {</div><div class='del'>-		if (!phydev || !phydev-&gt;link)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		priv-&gt;pause_rx = phydev-&gt;pause;</div><div class='del'>-		priv-&gt;pause_tx = phydev-&gt;pause ^ phydev-&gt;asym_pause;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nb8800_modb(priv, NB8800_RX_CTL, RX_PAUSE_EN, priv-&gt;pause_rx);</div><div class='del'>-</div><div class='del'>-	rxcr = nb8800_readl(priv, NB8800_RXC_CR);</div><div class='del'>-	if (!!(rxcr &amp; RCR_FL) == priv-&gt;pause_tx)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		napi_disable(&amp;priv-&gt;napi);</div><div class='del'>-		netif_tx_lock_bh(dev);</div><div class='del'>-		nb8800_dma_stop(dev);</div><div class='del'>-		nb8800_modl(priv, NB8800_RXC_CR, RCR_FL, priv-&gt;pause_tx);</div><div class='del'>-		nb8800_start_rx(dev);</div><div class='del'>-		netif_tx_unlock_bh(dev);</div><div class='del'>-		napi_enable(&amp;priv-&gt;napi);</div><div class='del'>-	} else {</div><div class='del'>-		nb8800_modl(priv, NB8800_RXC_CR, RCR_FL, priv-&gt;pause_tx);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_link_reconfigure(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-	int change = 0;</div><div class='del'>-</div><div class='del'>-	if (phydev-&gt;link) {</div><div class='del'>-		if (phydev-&gt;speed != priv-&gt;speed) {</div><div class='del'>-			priv-&gt;speed = phydev-&gt;speed;</div><div class='del'>-			change = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (phydev-&gt;duplex != priv-&gt;duplex) {</div><div class='del'>-			priv-&gt;duplex = phydev-&gt;duplex;</div><div class='del'>-			change = 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (change)</div><div class='del'>-			nb8800_mac_config(dev);</div><div class='del'>-</div><div class='del'>-		nb8800_pause_config(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (phydev-&gt;link != priv-&gt;link) {</div><div class='del'>-		priv-&gt;link = phydev-&gt;link;</div><div class='del'>-		change = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (change)</div><div class='del'>-		phy_print_status(phydev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_update_mac_addr(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		nb8800_writeb(priv, NB8800_SRC_ADDR(i), dev-&gt;dev_addr[i]);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-		nb8800_writeb(priv, NB8800_UC_ADDR(i), dev-&gt;dev_addr[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_set_mac_address(struct net_device *dev, void *addr)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr *sock = addr;</div><div class='del'>-</div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, sock-&gt;sa_data);</div><div class='del'>-	nb8800_update_mac_addr(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_mc_init(struct net_device *dev, int val)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	nb8800_writeb(priv, NB8800_MC_INIT, val);</div><div class='del'>-	readb_poll_timeout_atomic(priv-&gt;base + NB8800_MC_INIT, val, !val,</div><div class='del'>-				  1, 1000);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_set_rx_mode(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct netdev_hw_addr *ha;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;flags &amp; (IFF_PROMISC | IFF_ALLMULTI)) {</div><div class='del'>-		nb8800_mac_af(dev, false);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nb8800_mac_af(dev, true);</div><div class='del'>-	nb8800_mc_init(dev, 0);</div><div class='del'>-</div><div class='del'>-	netdev_for_each_mc_addr(ha, dev) {</div><div class='del'>-		for (i = 0; i &lt; ETH_ALEN; i++)</div><div class='del'>-			nb8800_writeb(priv, NB8800_MC_ADDR(i), ha-&gt;addr[i]);</div><div class='del'>-</div><div class='del'>-		nb8800_mc_init(dev, 0xff);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define RX_DESC_SIZE (RX_DESC_COUNT * sizeof(struct nb8800_rx_desc))</div><div class='del'>-#define TX_DESC_SIZE (TX_DESC_COUNT * sizeof(struct nb8800_tx_desc))</div><div class='del'>-</div><div class='del'>-static void nb8800_dma_free(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;rx_bufs) {</div><div class='del'>-		for (i = 0; i &lt; RX_DESC_COUNT; i++)</div><div class='del'>-			if (priv-&gt;rx_bufs[i].page)</div><div class='del'>-				put_page(priv-&gt;rx_bufs[i].page);</div><div class='del'>-</div><div class='del'>-		kfree(priv-&gt;rx_bufs);</div><div class='del'>-		priv-&gt;rx_bufs = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_bufs) {</div><div class='del'>-		for (i = 0; i &lt; TX_DESC_COUNT; i++)</div><div class='del'>-			kfree_skb(priv-&gt;tx_bufs[i].skb);</div><div class='del'>-</div><div class='del'>-		kfree(priv-&gt;tx_bufs);</div><div class='del'>-		priv-&gt;tx_bufs = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;rx_descs) {</div><div class='del'>-		dma_free_coherent(dev-&gt;dev.parent, RX_DESC_SIZE, priv-&gt;rx_descs,</div><div class='del'>-				  priv-&gt;rx_desc_dma);</div><div class='del'>-		priv-&gt;rx_descs = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_descs) {</div><div class='del'>-		dma_free_coherent(dev-&gt;dev.parent, TX_DESC_SIZE, priv-&gt;tx_descs,</div><div class='del'>-				  priv-&gt;tx_desc_dma);</div><div class='del'>-		priv-&gt;tx_descs = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_dma_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_rx_desc *rxd;</div><div class='del'>-	struct nb8800_tx_desc *txd;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; RX_DESC_COUNT; i++) {</div><div class='del'>-		dma_addr_t rx_dma = priv-&gt;rx_desc_dma + i * sizeof(*rxd);</div><div class='del'>-</div><div class='del'>-		rxd = &amp;priv-&gt;rx_descs[i];</div><div class='del'>-		rxd-&gt;desc.n_addr = rx_dma + sizeof(*rxd);</div><div class='del'>-		rxd-&gt;desc.r_addr =</div><div class='del'>-			rx_dma + offsetof(struct nb8800_rx_desc, report);</div><div class='del'>-		rxd-&gt;desc.config = priv-&gt;rx_dma_config;</div><div class='del'>-		rxd-&gt;report = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rxd-&gt;desc.n_addr = priv-&gt;rx_desc_dma;</div><div class='del'>-	rxd-&gt;desc.config |= DESC_EOC;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rx_eoc = RX_DESC_COUNT - 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; TX_DESC_COUNT; i++) {</div><div class='del'>-		struct nb8800_tx_buf *txb = &amp;priv-&gt;tx_bufs[i];</div><div class='del'>-		dma_addr_t r_dma = txb-&gt;dma_desc +</div><div class='del'>-			offsetof(struct nb8800_tx_desc, report);</div><div class='del'>-</div><div class='del'>-		txd = &amp;priv-&gt;tx_descs[i];</div><div class='del'>-		txd-&gt;desc[0].r_addr = r_dma;</div><div class='del'>-		txd-&gt;desc[1].r_addr = r_dma;</div><div class='del'>-		txd-&gt;report = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_next = 0;</div><div class='del'>-	priv-&gt;tx_queue = 0;</div><div class='del'>-	priv-&gt;tx_done = 0;</div><div class='del'>-	atomic_set(&amp;priv-&gt;tx_free, TX_DESC_COUNT);</div><div class='del'>-</div><div class='del'>-	nb8800_writel(priv, NB8800_RX_DESC_ADDR, priv-&gt;rx_desc_dma);</div><div class='del'>-</div><div class='del'>-	wmb();		/* ensure all setup is written before starting */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_dma_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned int n_rx = RX_DESC_COUNT;</div><div class='del'>-	unsigned int n_tx = TX_DESC_COUNT;</div><div class='del'>-	unsigned int i;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rx_descs = dma_alloc_coherent(dev-&gt;dev.parent, RX_DESC_SIZE,</div><div class='del'>-					    &amp;priv-&gt;rx_desc_dma, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;rx_descs)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rx_bufs = kcalloc(n_rx, sizeof(*priv-&gt;rx_bufs), GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;rx_bufs)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n_rx; i++) {</div><div class='del'>-		err = nb8800_alloc_rx(dev, i, false);</div><div class='del'>-		if (err)</div><div class='del'>-			goto err_out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_descs = dma_alloc_coherent(dev-&gt;dev.parent, TX_DESC_SIZE,</div><div class='del'>-					    &amp;priv-&gt;tx_desc_dma, GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;tx_descs)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	priv-&gt;tx_bufs = kcalloc(n_tx, sizeof(*priv-&gt;tx_bufs), GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;tx_bufs)</div><div class='del'>-		goto err_out;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n_tx; i++)</div><div class='del'>-		priv-&gt;tx_bufs[i].dma_desc =</div><div class='del'>-			priv-&gt;tx_desc_dma + i * sizeof(struct nb8800_tx_desc);</div><div class='del'>-</div><div class='del'>-	nb8800_dma_reset(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_out:</div><div class='del'>-	nb8800_dma_free(dev);</div><div class='del'>-</div><div class='del'>-	return -ENOMEM;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_dma_stop(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct nb8800_tx_buf *txb = &amp;priv-&gt;tx_bufs[0];</div><div class='del'>-	struct nb8800_tx_desc *txd = &amp;priv-&gt;tx_descs[0];</div><div class='del'>-	int retry = 5;</div><div class='del'>-	u32 txcr;</div><div class='del'>-	u32 rxcr;</div><div class='del'>-	int err;</div><div class='del'>-	unsigned int i;</div><div class='del'>-</div><div class='del'>-	/* wait for tx to finish */</div><div class='del'>-	err = readl_poll_timeout_atomic(priv-&gt;base + NB8800_TXC_CR, txcr,</div><div class='del'>-					!(txcr &amp; TCR_EN) &amp;&amp;</div><div class='del'>-					priv-&gt;tx_done == priv-&gt;tx_next,</div><div class='del'>-					1000, 1000000);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* The rx DMA only stops if it reaches the end of chain.</div><div class='del'>-	 * To make this happen, we set the EOC flag on all rx</div><div class='del'>-	 * descriptors, put the device in loopback mode, and send</div><div class='del'>-	 * a few dummy frames.  The interrupt handler will ignore</div><div class='del'>-	 * these since NAPI is disabled and no real frames are in</div><div class='del'>-	 * the tx queue.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; RX_DESC_COUNT; i++)</div><div class='del'>-		priv-&gt;rx_descs[i].desc.config |= DESC_EOC;</div><div class='del'>-</div><div class='del'>-	txd-&gt;desc[0].s_addr =</div><div class='del'>-		txb-&gt;dma_desc + offsetof(struct nb8800_tx_desc, buf);</div><div class='del'>-	txd-&gt;desc[0].config = DESC_BTS(2) | DESC_DS | DESC_EOF | DESC_EOC | 8;</div><div class='del'>-	memset(txd-&gt;buf, 0, sizeof(txd-&gt;buf));</div><div class='del'>-</div><div class='del'>-	nb8800_mac_af(dev, false);</div><div class='del'>-	nb8800_setb(priv, NB8800_MAC_MODE, LOOPBACK_EN);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		nb8800_writel(priv, NB8800_TX_DESC_ADDR, txb-&gt;dma_desc);</div><div class='del'>-		wmb();</div><div class='del'>-		nb8800_writel(priv, NB8800_TXC_CR, txcr | TCR_EN);</div><div class='del'>-</div><div class='del'>-		err = readl_poll_timeout_atomic(priv-&gt;base + NB8800_RXC_CR,</div><div class='del'>-						rxcr, !(rxcr &amp; RCR_EN),</div><div class='del'>-						1000, 100000);</div><div class='del'>-	} while (err &amp;&amp; --retry);</div><div class='del'>-</div><div class='del'>-	nb8800_mac_af(dev, true);</div><div class='del'>-	nb8800_clearb(priv, NB8800_MAC_MODE, LOOPBACK_EN);</div><div class='del'>-	nb8800_dma_reset(dev);</div><div class='del'>-</div><div class='del'>-	return retry ? 0 : -ETIMEDOUT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_pause_adv(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-</div><div class='del'>-	if (!phydev)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	phy_set_asym_pause(phydev, priv-&gt;pause_rx, priv-&gt;pause_tx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* clear any pending interrupts */</div><div class='del'>-	nb8800_writel(priv, NB8800_RXC_SR, 0xf);</div><div class='del'>-	nb8800_writel(priv, NB8800_TXC_SR, 0xf);</div><div class='del'>-</div><div class='del'>-	err = nb8800_dma_init(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	err = request_irq(dev-&gt;irq, nb8800_irq, 0, dev_name(&amp;dev-&gt;dev), dev);</div><div class='del'>-	if (err)</div><div class='del'>-		goto err_free_dma;</div><div class='del'>-</div><div class='del'>-	nb8800_mac_rx(dev, true);</div><div class='del'>-	nb8800_mac_tx(dev, true);</div><div class='del'>-</div><div class='del'>-	phydev = of_phy_connect(dev, priv-&gt;phy_node,</div><div class='del'>-				nb8800_link_reconfigure, 0,</div><div class='del'>-				priv-&gt;phy_mode);</div><div class='del'>-	if (!phydev) {</div><div class='del'>-		err = -ENODEV;</div><div class='del'>-		goto err_free_irq;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nb8800_pause_adv(dev);</div><div class='del'>-</div><div class='del'>-	netdev_reset_queue(dev);</div><div class='del'>-	napi_enable(&amp;priv-&gt;napi);</div><div class='del'>-	netif_start_queue(dev);</div><div class='del'>-</div><div class='del'>-	nb8800_start_rx(dev);</div><div class='del'>-	phy_start(phydev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_irq:</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-err_free_dma:</div><div class='del'>-	nb8800_dma_free(dev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_stop(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-</div><div class='del'>-	phy_stop(phydev);</div><div class='del'>-</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-	napi_disable(&amp;priv-&gt;napi);</div><div class='del'>-</div><div class='del'>-	nb8800_dma_stop(dev);</div><div class='del'>-	nb8800_mac_rx(dev, false);</div><div class='del'>-	nb8800_mac_tx(dev, false);</div><div class='del'>-</div><div class='del'>-	phy_disconnect(phydev);</div><div class='del'>-</div><div class='del'>-	free_irq(dev-&gt;irq, dev);</div><div class='del'>-</div><div class='del'>-	nb8800_dma_free(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	return phy_mii_ioctl(dev-&gt;phydev, rq, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops nb8800_netdev_ops = {</div><div class='del'>-	.ndo_open		= nb8800_open,</div><div class='del'>-	.ndo_stop		= nb8800_stop,</div><div class='del'>-	.ndo_start_xmit		= nb8800_xmit,</div><div class='del'>-	.ndo_set_mac_address	= nb8800_set_mac_address,</div><div class='del'>-	.ndo_set_rx_mode	= nb8800_set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= nb8800_ioctl,</div><div class='del'>-	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void nb8800_get_pauseparam(struct net_device *dev,</div><div class='del'>-				  struct ethtool_pauseparam *pp)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	pp-&gt;autoneg = priv-&gt;pause_aneg;</div><div class='del'>-	pp-&gt;rx_pause = priv-&gt;pause_rx;</div><div class='del'>-	pp-&gt;tx_pause = priv-&gt;pause_tx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_set_pauseparam(struct net_device *dev,</div><div class='del'>-				 struct ethtool_pauseparam *pp)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-</div><div class='del'>-	priv-&gt;pause_aneg = pp-&gt;autoneg;</div><div class='del'>-	priv-&gt;pause_rx = pp-&gt;rx_pause;</div><div class='del'>-	priv-&gt;pause_tx = pp-&gt;tx_pause;</div><div class='del'>-</div><div class='del'>-	nb8800_pause_adv(dev);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;pause_aneg)</div><div class='del'>-		nb8800_pause_config(dev);</div><div class='del'>-	else if (phydev)</div><div class='del'>-		phy_start_aneg(phydev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char nb8800_stats_names[][ETH_GSTRING_LEN] = {</div><div class='del'>-	"rx_bytes_ok",</div><div class='del'>-	"rx_frames_ok",</div><div class='del'>-	"rx_undersize_frames",</div><div class='del'>-	"rx_fragment_frames",</div><div class='del'>-	"rx_64_byte_frames",</div><div class='del'>-	"rx_127_byte_frames",</div><div class='del'>-	"rx_255_byte_frames",</div><div class='del'>-	"rx_511_byte_frames",</div><div class='del'>-	"rx_1023_byte_frames",</div><div class='del'>-	"rx_max_size_frames",</div><div class='del'>-	"rx_oversize_frames",</div><div class='del'>-	"rx_bad_fcs_frames",</div><div class='del'>-	"rx_broadcast_frames",</div><div class='del'>-	"rx_multicast_frames",</div><div class='del'>-	"rx_control_frames",</div><div class='del'>-	"rx_pause_frames",</div><div class='del'>-	"rx_unsup_control_frames",</div><div class='del'>-	"rx_align_error_frames",</div><div class='del'>-	"rx_overrun_frames",</div><div class='del'>-	"rx_jabber_frames",</div><div class='del'>-	"rx_bytes",</div><div class='del'>-	"rx_frames",</div><div class='del'>-</div><div class='del'>-	"tx_bytes_ok",</div><div class='del'>-	"tx_frames_ok",</div><div class='del'>-	"tx_64_byte_frames",</div><div class='del'>-	"tx_127_byte_frames",</div><div class='del'>-	"tx_255_byte_frames",</div><div class='del'>-	"tx_511_byte_frames",</div><div class='del'>-	"tx_1023_byte_frames",</div><div class='del'>-	"tx_max_size_frames",</div><div class='del'>-	"tx_oversize_frames",</div><div class='del'>-	"tx_broadcast_frames",</div><div class='del'>-	"tx_multicast_frames",</div><div class='del'>-	"tx_control_frames",</div><div class='del'>-	"tx_pause_frames",</div><div class='del'>-	"tx_underrun_frames",</div><div class='del'>-	"tx_single_collision_frames",</div><div class='del'>-	"tx_multi_collision_frames",</div><div class='del'>-	"tx_deferred_collision_frames",</div><div class='del'>-	"tx_late_collision_frames",</div><div class='del'>-	"tx_excessive_collision_frames",</div><div class='del'>-	"tx_bytes",</div><div class='del'>-	"tx_frames",</div><div class='del'>-	"tx_collisions",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define NB8800_NUM_STATS ARRAY_SIZE(nb8800_stats_names)</div><div class='del'>-</div><div class='del'>-static int nb8800_get_sset_count(struct net_device *dev, int sset)</div><div class='del'>-{</div><div class='del'>-	if (sset == ETH_SS_STATS)</div><div class='del'>-		return NB8800_NUM_STATS;</div><div class='del'>-</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_get_strings(struct net_device *dev, u32 sset, u8 *buf)</div><div class='del'>-{</div><div class='del'>-	if (sset == ETH_SS_STATS)</div><div class='del'>-		memcpy(buf, &amp;nb8800_stats_names, sizeof(nb8800_stats_names));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static u32 nb8800_read_stat(struct net_device *dev, int index)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	nb8800_writeb(priv, NB8800_STAT_INDEX, index);</div><div class='del'>-</div><div class='del'>-	return nb8800_readl(priv, NB8800_STAT_DATA);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void nb8800_get_ethtool_stats(struct net_device *dev,</div><div class='del'>-				     struct ethtool_stats *estats, u64 *st)</div><div class='del'>-{</div><div class='del'>-	unsigned int i;</div><div class='del'>-	u32 rx, tx;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NB8800_NUM_STATS / 2; i++) {</div><div class='del'>-		rx = nb8800_read_stat(dev, i);</div><div class='del'>-		tx = nb8800_read_stat(dev, i | 0x80);</div><div class='del'>-		st[i] = rx;</div><div class='del'>-		st[i + NB8800_NUM_STATS / 2] = tx;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct ethtool_ops nb8800_ethtool_ops = {</div><div class='del'>-	.nway_reset		= phy_ethtool_nway_reset,</div><div class='del'>-	.get_link		= ethtool_op_get_link,</div><div class='del'>-	.get_pauseparam		= nb8800_get_pauseparam,</div><div class='del'>-	.set_pauseparam		= nb8800_set_pauseparam,</div><div class='del'>-	.get_sset_count		= nb8800_get_sset_count,</div><div class='del'>-	.get_strings		= nb8800_get_strings,</div><div class='del'>-	.get_ethtool_stats	= nb8800_get_ethtool_stats,</div><div class='del'>-	.get_link_ksettings	= phy_ethtool_get_link_ksettings,</div><div class='del'>-	.set_link_ksettings	= phy_ethtool_set_link_ksettings,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int nb8800_hw_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	val = TX_RETRY_EN | TX_PAD_EN | TX_APPEND_FCS;</div><div class='del'>-	nb8800_writeb(priv, NB8800_TX_CTL1, val);</div><div class='del'>-</div><div class='del'>-	/* Collision retry count */</div><div class='del'>-	nb8800_writeb(priv, NB8800_TX_CTL2, 5);</div><div class='del'>-</div><div class='del'>-	val = RX_PAD_STRIP | RX_AF_EN;</div><div class='del'>-	nb8800_writeb(priv, NB8800_RX_CTL, val);</div><div class='del'>-</div><div class='del'>-	/* Chosen by fair dice roll */</div><div class='del'>-	nb8800_writeb(priv, NB8800_RANDOM_SEED, 4);</div><div class='del'>-</div><div class='del'>-	/* TX cycles per deferral period */</div><div class='del'>-	nb8800_writeb(priv, NB8800_TX_SDP, 12);</div><div class='del'>-</div><div class='del'>-	/* The following three threshold values have been</div><div class='del'>-	 * experimentally determined for good results.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* RX/TX FIFO threshold for partial empty (64-bit entries) */</div><div class='del'>-	nb8800_writeb(priv, NB8800_PE_THRESHOLD, 0);</div><div class='del'>-</div><div class='del'>-	/* RX/TX FIFO threshold for partial full (64-bit entries) */</div><div class='del'>-	nb8800_writeb(priv, NB8800_PF_THRESHOLD, 255);</div><div class='del'>-</div><div class='del'>-	/* Buffer size for transmit (64-bit entries) */</div><div class='del'>-	nb8800_writeb(priv, NB8800_TX_BUFSIZE, 64);</div><div class='del'>-</div><div class='del'>-	/* Configure tx DMA */</div><div class='del'>-</div><div class='del'>-	val = nb8800_readl(priv, NB8800_TXC_CR);</div><div class='del'>-	val &amp;= TCR_LE;		/* keep endian setting */</div><div class='del'>-	val |= TCR_DM;		/* DMA descriptor mode */</div><div class='del'>-	val |= TCR_RS;		/* automatically store tx status  */</div><div class='del'>-	val |= TCR_DIE;		/* interrupt on DMA chain completion */</div><div class='del'>-	val |= TCR_TFI(7);	/* interrupt after 7 frames transmitted */</div><div class='del'>-	val |= TCR_BTS(2);	/* 32-byte bus transaction size */</div><div class='del'>-	nb8800_writel(priv, NB8800_TXC_CR, val);</div><div class='del'>-</div><div class='del'>-	/* TX complete interrupt after 10 ms or 7 frames (see above) */</div><div class='del'>-	val = clk_get_rate(priv-&gt;clk) / 100;</div><div class='del'>-	nb8800_writel(priv, NB8800_TX_ITR, val);</div><div class='del'>-</div><div class='del'>-	/* Configure rx DMA */</div><div class='del'>-</div><div class='del'>-	val = nb8800_readl(priv, NB8800_RXC_CR);</div><div class='del'>-	val &amp;= RCR_LE;		/* keep endian setting */</div><div class='del'>-	val |= RCR_DM;		/* DMA descriptor mode */</div><div class='del'>-	val |= RCR_RS;		/* automatically store rx status */</div><div class='del'>-	val |= RCR_DIE;		/* interrupt at end of DMA chain */</div><div class='del'>-	val |= RCR_RFI(7);	/* interrupt after 7 frames received */</div><div class='del'>-	val |= RCR_BTS(2);	/* 32-byte bus transaction size */</div><div class='del'>-	nb8800_writel(priv, NB8800_RXC_CR, val);</div><div class='del'>-</div><div class='del'>-	/* The rx interrupt can fire before the DMA has completed</div><div class='del'>-	 * unless a small delay is added.  50 us is hopefully enough.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;rx_itr_irq = clk_get_rate(priv-&gt;clk) / 20000;</div><div class='del'>-</div><div class='del'>-	/* In NAPI poll mode we want to disable interrupts, but the</div><div class='del'>-	 * hardware does not permit this.  Delay 10 ms instead.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;rx_itr_poll = clk_get_rate(priv-&gt;clk) / 100;</div><div class='del'>-</div><div class='del'>-	nb8800_writel(priv, NB8800_RX_ITR, priv-&gt;rx_itr_irq);</div><div class='del'>-</div><div class='del'>-	priv-&gt;rx_dma_config = RX_BUF_SIZE | DESC_BTS(2) | DESC_DS | DESC_EOF;</div><div class='del'>-</div><div class='del'>-	/* Flow control settings */</div><div class='del'>-</div><div class='del'>-	/* Pause time of 0.1 ms */</div><div class='del'>-	val = 100000 / 512;</div><div class='del'>-	nb8800_writeb(priv, NB8800_PQ1, val &gt;&gt; 8);</div><div class='del'>-	nb8800_writeb(priv, NB8800_PQ2, val &amp; 0xff);</div><div class='del'>-</div><div class='del'>-	/* Auto-negotiate by default */</div><div class='del'>-	priv-&gt;pause_aneg = true;</div><div class='del'>-	priv-&gt;pause_rx = true;</div><div class='del'>-	priv-&gt;pause_tx = true;</div><div class='del'>-</div><div class='del'>-	nb8800_mc_init(dev, 0);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_tangox_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 pad_mode = PAD_MODE_MII;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;phy_mode) {</div><div class='del'>-	case PHY_INTERFACE_MODE_MII:</div><div class='del'>-	case PHY_INTERFACE_MODE_GMII:</div><div class='del'>-		pad_mode = PAD_MODE_MII;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII:</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='del'>-	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='del'>-		pad_mode = PAD_MODE_RGMII;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		dev_err(dev-&gt;dev.parent, "unsupported phy mode %s\n",</div><div class='del'>-			phy_modes(priv-&gt;phy_mode));</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	nb8800_writeb(priv, NB8800_TANGOX_PAD_MODE, pad_mode);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_tangox_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	int clk_div;</div><div class='del'>-</div><div class='del'>-	nb8800_writeb(priv, NB8800_TANGOX_RESET, 0);</div><div class='del'>-	usleep_range(1000, 10000);</div><div class='del'>-	nb8800_writeb(priv, NB8800_TANGOX_RESET, 1);</div><div class='del'>-</div><div class='del'>-	wmb();		/* ensure reset is cleared before proceeding */</div><div class='del'>-</div><div class='del'>-	clk_div = DIV_ROUND_UP(clk_get_rate(priv-&gt;clk), 2 * MAX_MDC_CLOCK);</div><div class='del'>-	nb8800_writew(priv, NB8800_TANGOX_MDIO_CLKDIV, clk_div);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nb8800_ops nb8800_tangox_ops = {</div><div class='del'>-	.init	= nb8800_tangox_init,</div><div class='del'>-	.reset	= nb8800_tangox_reset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int nb8800_tango4_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(dev);</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	err = nb8800_tangox_init(dev);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	/* On tango4 interrupt on DMA completion per frame works and gives</div><div class='del'>-	 * better performance despite generating more rx interrupts.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Disable unnecessary interrupt on rx completion */</div><div class='del'>-	nb8800_clearl(priv, NB8800_RXC_CR, RCR_RFI(7));</div><div class='del'>-</div><div class='del'>-	/* Request interrupt on descriptor DMA completion */</div><div class='del'>-	priv-&gt;rx_dma_config |= DESC_ID;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct nb8800_ops nb8800_tango4_ops = {</div><div class='del'>-	.init	= nb8800_tango4_init,</div><div class='del'>-	.reset	= nb8800_tangox_reset,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const struct of_device_id nb8800_dt_ids[] = {</div><div class='del'>-	{</div><div class='del'>-		.compatible = "aurora,nb8800",</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.compatible = "sigma,smp8642-ethernet",</div><div class='del'>-		.data = &amp;nb8800_tangox_ops,</div><div class='del'>-	},</div><div class='del'>-	{</div><div class='del'>-		.compatible = "sigma,smp8734-ethernet",</div><div class='del'>-		.data = &amp;nb8800_tango4_ops,</div><div class='del'>-	},</div><div class='del'>-	{ }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(of, nb8800_dt_ids);</div><div class='del'>-</div><div class='del'>-static int nb8800_probe(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	const struct of_device_id *match;</div><div class='del'>-	const struct nb8800_ops *ops = NULL;</div><div class='del'>-	struct nb8800_priv *priv;</div><div class='del'>-	struct resource *res;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct mii_bus *bus;</div><div class='del'>-	const unsigned char *mac;</div><div class='del'>-	void __iomem *base;</div><div class='del'>-	int irq;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	match = of_match_device(nb8800_dt_ids, &amp;pdev-&gt;dev);</div><div class='del'>-	if (match)</div><div class='del'>-		ops = match-&gt;data;</div><div class='del'>-</div><div class='del'>-	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (irq &lt;= 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "No IRQ\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	base = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='del'>-	if (IS_ERR(base))</div><div class='del'>-		return PTR_ERR(base);</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;pdev-&gt;dev, "AU-NB8800 Ethernet at %pa\n", &amp;res-&gt;start);</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(sizeof(*priv));</div><div class='del'>-	if (!dev)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	platform_set_drvdata(pdev, dev);</div><div class='del'>-	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(dev);</div><div class='del'>-	priv-&gt;base = base;</div><div class='del'>-</div><div class='del'>-	priv-&gt;phy_mode = of_get_phy_mode(pdev-&gt;dev.of_node);</div><div class='del'>-	if (priv-&gt;phy_mode &lt; 0)</div><div class='del'>-		priv-&gt;phy_mode = PHY_INTERFACE_MODE_RGMII;</div><div class='del'>-</div><div class='del'>-	priv-&gt;clk = devm_clk_get(&amp;pdev-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(priv-&gt;clk)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to get clock\n");</div><div class='del'>-		ret = PTR_ERR(priv-&gt;clk);</div><div class='del'>-		goto err_free_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_free_dev;</div><div class='del'>-</div><div class='del'>-	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;reset) {</div><div class='del'>-		ret = ops-&gt;reset(dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_disable_clk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bus = devm_mdiobus_alloc(&amp;pdev-&gt;dev);</div><div class='del'>-	if (!bus) {</div><div class='del'>-		ret = -ENOMEM;</div><div class='del'>-		goto err_disable_clk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bus-&gt;name = "nb8800-mii";</div><div class='del'>-	bus-&gt;read = nb8800_mdio_read;</div><div class='del'>-	bus-&gt;write = nb8800_mdio_write;</div><div class='del'>-	bus-&gt;parent = &amp;pdev-&gt;dev;</div><div class='del'>-	snprintf(bus-&gt;id, MII_BUS_ID_SIZE, "%lx.nb8800-mii",</div><div class='del'>-		 (unsigned long)res-&gt;start);</div><div class='del'>-	bus-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	ret = of_mdiobus_register(bus, pdev-&gt;dev.of_node);</div><div class='del'>-	if (ret) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to register MII bus\n");</div><div class='del'>-		goto err_disable_clk;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (of_phy_is_fixed_link(pdev-&gt;dev.of_node)) {</div><div class='del'>-		ret = of_phy_register_fixed_link(pdev-&gt;dev.of_node);</div><div class='del'>-		if (ret &lt; 0) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "bad fixed-link spec\n");</div><div class='del'>-			goto err_free_bus;</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;phy_node = of_node_get(pdev-&gt;dev.of_node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;phy_node)</div><div class='del'>-		priv-&gt;phy_node = of_parse_phandle(pdev-&gt;dev.of_node,</div><div class='del'>-						  "phy-handle", 0);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;phy_node) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "no PHY specified\n");</div><div class='del'>-		ret = -ENODEV;</div><div class='del'>-		goto err_free_bus;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;mii_bus = bus;</div><div class='del'>-</div><div class='del'>-	ret = nb8800_hw_init(dev);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto err_deregister_fixed_link;</div><div class='del'>-</div><div class='del'>-	if (ops &amp;&amp; ops-&gt;init) {</div><div class='del'>-		ret = ops-&gt;init(dev);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto err_deregister_fixed_link;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;netdev_ops = &amp;nb8800_netdev_ops;</div><div class='del'>-	dev-&gt;ethtool_ops = &amp;nb8800_ethtool_ops;</div><div class='del'>-	dev-&gt;flags |= IFF_MULTICAST;</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-</div><div class='del'>-	mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-	if (!IS_ERR(mac))</div><div class='del'>-		ether_addr_copy(dev-&gt;dev_addr, mac);</div><div class='del'>-</div><div class='del'>-	if (!is_valid_ether_addr(dev-&gt;dev_addr))</div><div class='del'>-		eth_hw_addr_random(dev);</div><div class='del'>-</div><div class='del'>-	nb8800_update_mac_addr(dev);</div><div class='del'>-</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	ret = register_netdev(dev);</div><div class='del'>-	if (ret) {</div><div class='del'>-		netdev_err(dev, "failed to register netdev\n");</div><div class='del'>-		goto err_free_dma;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, nb8800_poll, NAPI_POLL_WEIGHT);</div><div class='del'>-</div><div class='del'>-	netdev_info(dev, "MAC address %pM\n", dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-err_free_dma:</div><div class='del'>-	nb8800_dma_free(dev);</div><div class='del'>-err_deregister_fixed_link:</div><div class='del'>-	if (of_phy_is_fixed_link(pdev-&gt;dev.of_node))</div><div class='del'>-		of_phy_deregister_fixed_link(pdev-&gt;dev.of_node);</div><div class='del'>-err_free_bus:</div><div class='del'>-	of_node_put(priv-&gt;phy_node);</div><div class='del'>-	mdiobus_unregister(bus);</div><div class='del'>-err_disable_clk:</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk);</div><div class='del'>-err_free_dev:</div><div class='del'>-	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int nb8800_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='del'>-	struct nb8800_priv *priv = netdev_priv(ndev);</div><div class='del'>-</div><div class='del'>-	unregister_netdev(ndev);</div><div class='del'>-	if (of_phy_is_fixed_link(pdev-&gt;dev.of_node))</div><div class='del'>-		of_phy_deregister_fixed_link(pdev-&gt;dev.of_node);</div><div class='del'>-	of_node_put(priv-&gt;phy_node);</div><div class='del'>-</div><div class='del'>-	mdiobus_unregister(priv-&gt;mii_bus);</div><div class='del'>-</div><div class='del'>-	clk_disable_unprepare(priv-&gt;clk);</div><div class='del'>-</div><div class='del'>-	nb8800_dma_free(ndev);</div><div class='del'>-	free_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct platform_driver nb8800_driver = {</div><div class='del'>-	.driver = {</div><div class='del'>-		.name		= "nb8800",</div><div class='del'>-		.of_match_table	= nb8800_dt_ids,</div><div class='del'>-	},</div><div class='del'>-	.probe	= nb8800_probe,</div><div class='del'>-	.remove	= nb8800_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-module_platform_driver(nb8800_driver);</div><div class='del'>-</div><div class='del'>-MODULE_DESCRIPTION("Aurora AU-NB8800 Ethernet driver");</div><div class='del'>-MODULE_AUTHOR("Mans Rullgard &lt;mans@mansr.com&gt;");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/aurora/nb8800.h b/drivers/net/ethernet/aurora/nb8800.h<br/>deleted file mode 100644<br/>index aacc3cce2cc0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/aurora/nb8800.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/aurora/nb8800.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,316 +0,0 @@</div><div class='del'>-/* SPDX-License-Identifier: GPL-2.0 */</div><div class='del'>-#ifndef _NB8800_H_</div><div class='del'>-#define _NB8800_H_</div><div class='del'>-</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-</div><div class='del'>-#define RX_DESC_COUNT			256</div><div class='del'>-#define TX_DESC_COUNT			256</div><div class='del'>-</div><div class='del'>-#define NB8800_DESC_LOW			4</div><div class='del'>-</div><div class='del'>-#define RX_BUF_SIZE			1552</div><div class='del'>-</div><div class='del'>-#define RX_COPYBREAK			256</div><div class='del'>-#define RX_COPYHDR			128</div><div class='del'>-</div><div class='del'>-#define MAX_MDC_CLOCK			2500000</div><div class='del'>-</div><div class='del'>-/* Stargate Solutions SSN8800 core registers */</div><div class='del'>-#define NB8800_TX_CTL1			0x000</div><div class='del'>-#define TX_TPD				BIT(5)</div><div class='del'>-#define TX_APPEND_FCS			BIT(4)</div><div class='del'>-#define TX_PAD_EN			BIT(3)</div><div class='del'>-#define TX_RETRY_EN			BIT(2)</div><div class='del'>-#define TX_EN				BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_TX_CTL2			0x001</div><div class='del'>-</div><div class='del'>-#define NB8800_RX_CTL			0x004</div><div class='del'>-#define RX_BC_DISABLE			BIT(7)</div><div class='del'>-#define RX_RUNT				BIT(6)</div><div class='del'>-#define RX_AF_EN			BIT(5)</div><div class='del'>-#define RX_PAUSE_EN			BIT(3)</div><div class='del'>-#define RX_SEND_CRC			BIT(2)</div><div class='del'>-#define RX_PAD_STRIP			BIT(1)</div><div class='del'>-#define RX_EN				BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_RANDOM_SEED		0x008</div><div class='del'>-#define NB8800_TX_SDP			0x14</div><div class='del'>-#define NB8800_TX_TPDP1			0x18</div><div class='del'>-#define NB8800_TX_TPDP2			0x19</div><div class='del'>-#define NB8800_SLOT_TIME		0x1c</div><div class='del'>-</div><div class='del'>-#define NB8800_MDIO_CMD			0x020</div><div class='del'>-#define MDIO_CMD_GO			BIT(31)</div><div class='del'>-#define MDIO_CMD_WR			BIT(26)</div><div class='del'>-#define MDIO_CMD_ADDR(x)		((x) &lt;&lt; 21)</div><div class='del'>-#define MDIO_CMD_REG(x)			((x) &lt;&lt; 16)</div><div class='del'>-#define MDIO_CMD_DATA(x)		((x) &lt;&lt;	 0)</div><div class='del'>-</div><div class='del'>-#define NB8800_MDIO_STS			0x024</div><div class='del'>-#define MDIO_STS_ERR			BIT(31)</div><div class='del'>-</div><div class='del'>-#define NB8800_MC_ADDR(i)		(0x028 + (i))</div><div class='del'>-#define NB8800_MC_INIT			0x02e</div><div class='del'>-#define NB8800_UC_ADDR(i)		(0x03c + (i))</div><div class='del'>-</div><div class='del'>-#define NB8800_MAC_MODE			0x044</div><div class='del'>-#define RGMII_MODE			BIT(7)</div><div class='del'>-#define HALF_DUPLEX			BIT(4)</div><div class='del'>-#define BURST_EN			BIT(3)</div><div class='del'>-#define LOOPBACK_EN			BIT(2)</div><div class='del'>-#define GMAC_MODE			BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_IC_THRESHOLD		0x050</div><div class='del'>-#define NB8800_PE_THRESHOLD		0x051</div><div class='del'>-#define NB8800_PF_THRESHOLD		0x052</div><div class='del'>-#define NB8800_TX_BUFSIZE		0x054</div><div class='del'>-#define NB8800_FIFO_CTL			0x056</div><div class='del'>-#define NB8800_PQ1			0x060</div><div class='del'>-#define NB8800_PQ2			0x061</div><div class='del'>-#define NB8800_SRC_ADDR(i)		(0x06a + (i))</div><div class='del'>-#define NB8800_STAT_DATA		0x078</div><div class='del'>-#define NB8800_STAT_INDEX		0x07c</div><div class='del'>-#define NB8800_STAT_CLEAR		0x07d</div><div class='del'>-</div><div class='del'>-#define NB8800_SLEEP_MODE		0x07e</div><div class='del'>-#define SLEEP_MODE			BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_WAKEUP			0x07f</div><div class='del'>-#define WAKEUP				BIT(0)</div><div class='del'>-</div><div class='del'>-/* Aurora NB8800 host interface registers */</div><div class='del'>-#define NB8800_TXC_CR			0x100</div><div class='del'>-#define TCR_LK				BIT(12)</div><div class='del'>-#define TCR_DS				BIT(11)</div><div class='del'>-#define TCR_BTS(x)			(((x) &amp; 0x7) &lt;&lt; 8)</div><div class='del'>-#define TCR_DIE				BIT(7)</div><div class='del'>-#define TCR_TFI(x)			(((x) &amp; 0x7) &lt;&lt; 4)</div><div class='del'>-#define TCR_LE				BIT(3)</div><div class='del'>-#define TCR_RS				BIT(2)</div><div class='del'>-#define TCR_DM				BIT(1)</div><div class='del'>-#define TCR_EN				BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_TXC_SR			0x104</div><div class='del'>-#define TSR_DE				BIT(3)</div><div class='del'>-#define TSR_DI				BIT(2)</div><div class='del'>-#define TSR_TO				BIT(1)</div><div class='del'>-#define TSR_TI				BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_TX_SAR			0x108</div><div class='del'>-#define NB8800_TX_DESC_ADDR		0x10c</div><div class='del'>-</div><div class='del'>-#define NB8800_TX_REPORT_ADDR		0x110</div><div class='del'>-#define TX_BYTES_TRANSFERRED(x)		(((x) &gt;&gt; 16) &amp; 0xffff)</div><div class='del'>-#define TX_FIRST_DEFERRAL		BIT(7)</div><div class='del'>-#define TX_EARLY_COLLISIONS(x)		(((x) &gt;&gt; 3) &amp; 0xf)</div><div class='del'>-#define TX_LATE_COLLISION		BIT(2)</div><div class='del'>-#define TX_PACKET_DROPPED		BIT(1)</div><div class='del'>-#define TX_FIFO_UNDERRUN		BIT(0)</div><div class='del'>-#define IS_TX_ERROR(r)			((r) &amp; 0x07)</div><div class='del'>-</div><div class='del'>-#define NB8800_TX_FIFO_SR		0x114</div><div class='del'>-#define NB8800_TX_ITR			0x118</div><div class='del'>-</div><div class='del'>-#define NB8800_RXC_CR			0x200</div><div class='del'>-#define RCR_FL				BIT(13)</div><div class='del'>-#define RCR_LK				BIT(12)</div><div class='del'>-#define RCR_DS				BIT(11)</div><div class='del'>-#define RCR_BTS(x)			(((x) &amp; 7) &lt;&lt; 8)</div><div class='del'>-#define RCR_DIE				BIT(7)</div><div class='del'>-#define RCR_RFI(x)			(((x) &amp; 7) &lt;&lt; 4)</div><div class='del'>-#define RCR_LE				BIT(3)</div><div class='del'>-#define RCR_RS				BIT(2)</div><div class='del'>-#define RCR_DM				BIT(1)</div><div class='del'>-#define RCR_EN				BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_RXC_SR			0x204</div><div class='del'>-#define RSR_DE				BIT(3)</div><div class='del'>-#define RSR_DI				BIT(2)</div><div class='del'>-#define RSR_RO				BIT(1)</div><div class='del'>-#define RSR_RI				BIT(0)</div><div class='del'>-</div><div class='del'>-#define NB8800_RX_SAR			0x208</div><div class='del'>-#define NB8800_RX_DESC_ADDR		0x20c</div><div class='del'>-</div><div class='del'>-#define NB8800_RX_REPORT_ADDR		0x210</div><div class='del'>-#define RX_BYTES_TRANSFERRED(x)		(((x) &gt;&gt; 16) &amp; 0xFFFF)</div><div class='del'>-#define RX_MULTICAST_PKT		BIT(9)</div><div class='del'>-#define RX_BROADCAST_PKT		BIT(8)</div><div class='del'>-#define RX_LENGTH_ERR			BIT(7)</div><div class='del'>-#define RX_FCS_ERR			BIT(6)</div><div class='del'>-#define RX_RUNT_PKT			BIT(5)</div><div class='del'>-#define RX_FIFO_OVERRUN			BIT(4)</div><div class='del'>-#define RX_LATE_COLLISION		BIT(3)</div><div class='del'>-#define RX_ALIGNMENT_ERROR		BIT(2)</div><div class='del'>-#define RX_ERROR_MASK			0xfc</div><div class='del'>-#define IS_RX_ERROR(r)			((r) &amp; RX_ERROR_MASK)</div><div class='del'>-</div><div class='del'>-#define NB8800_RX_FIFO_SR		0x214</div><div class='del'>-#define NB8800_RX_ITR			0x218</div><div class='del'>-</div><div class='del'>-/* Sigma Designs SMP86xx additional registers */</div><div class='del'>-#define NB8800_TANGOX_PAD_MODE		0x400</div><div class='del'>-#define PAD_MODE_MASK			0x7</div><div class='del'>-#define PAD_MODE_MII			0x0</div><div class='del'>-#define PAD_MODE_RGMII			0x1</div><div class='del'>-#define PAD_MODE_GTX_CLK_INV		BIT(3)</div><div class='del'>-#define PAD_MODE_GTX_CLK_DELAY		BIT(4)</div><div class='del'>-</div><div class='del'>-#define NB8800_TANGOX_MDIO_CLKDIV	0x420</div><div class='del'>-#define NB8800_TANGOX_RESET		0x424</div><div class='del'>-</div><div class='del'>-/* Hardware DMA descriptor */</div><div class='del'>-struct nb8800_dma_desc {</div><div class='del'>-	u32				s_addr;	/* start address */</div><div class='del'>-	u32				n_addr;	/* next descriptor address */</div><div class='del'>-	u32				r_addr;	/* report address */</div><div class='del'>-	u32				config;</div><div class='del'>-} __aligned(8);</div><div class='del'>-</div><div class='del'>-#define DESC_ID				BIT(23)</div><div class='del'>-#define DESC_EOC			BIT(22)</div><div class='del'>-#define DESC_EOF			BIT(21)</div><div class='del'>-#define DESC_LK				BIT(20)</div><div class='del'>-#define DESC_DS				BIT(19)</div><div class='del'>-#define DESC_BTS(x)			(((x) &amp; 0x7) &lt;&lt; 16)</div><div class='del'>-</div><div class='del'>-/* DMA descriptor and associated data for rx.</div><div class='del'>- * Allocated from coherent memory.</div><div class='del'>- */</div><div class='del'>-struct nb8800_rx_desc {</div><div class='del'>-	/* DMA descriptor */</div><div class='del'>-	struct nb8800_dma_desc		desc;</div><div class='del'>-</div><div class='del'>-	/* Status report filled in by hardware */</div><div class='del'>-	u32				report;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Address of buffer on rx ring */</div><div class='del'>-struct nb8800_rx_buf {</div><div class='del'>-	struct page			*page;</div><div class='del'>-	unsigned long			offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* DMA descriptors and associated data for tx.</div><div class='del'>- * Allocated from coherent memory.</div><div class='del'>- */</div><div class='del'>-struct nb8800_tx_desc {</div><div class='del'>-	/* DMA descriptor.  The second descriptor is used if packet</div><div class='del'>-	 * data is unaligned.</div><div class='del'>-	 */</div><div class='del'>-	struct nb8800_dma_desc		desc[2];</div><div class='del'>-</div><div class='del'>-	/* Status report filled in by hardware */</div><div class='del'>-	u32				report;</div><div class='del'>-</div><div class='del'>-	/* Bounce buffer for initial unaligned part of packet */</div><div class='del'>-	u8				buf[8] __aligned(8);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Packet in tx queue */</div><div class='del'>-struct nb8800_tx_buf {</div><div class='del'>-	/* Currently queued skb */</div><div class='del'>-	struct sk_buff			*skb;</div><div class='del'>-</div><div class='del'>-	/* DMA address of the first descriptor */</div><div class='del'>-	dma_addr_t			dma_desc;</div><div class='del'>-</div><div class='del'>-	/* DMA address of packet data */</div><div class='del'>-	dma_addr_t			dma_addr;</div><div class='del'>-</div><div class='del'>-	/* Length of DMA mapping, less than skb-&gt;len if alignment</div><div class='del'>-	 * buffer is used.</div><div class='del'>-	 */</div><div class='del'>-	unsigned int			dma_len;</div><div class='del'>-</div><div class='del'>-	/* Number of packets in chain starting here */</div><div class='del'>-	unsigned int			chain_len;</div><div class='del'>-</div><div class='del'>-	/* Packet chain ready to be submitted to hardware */</div><div class='del'>-	bool				ready;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct nb8800_priv {</div><div class='del'>-	struct napi_struct		napi;</div><div class='del'>-</div><div class='del'>-	void __iomem			*base;</div><div class='del'>-</div><div class='del'>-	/* RX DMA descriptors */</div><div class='del'>-	struct nb8800_rx_desc		*rx_descs;</div><div class='del'>-</div><div class='del'>-	/* RX buffers referenced by DMA descriptors */</div><div class='del'>-	struct nb8800_rx_buf		*rx_bufs;</div><div class='del'>-</div><div class='del'>-	/* Current end of chain */</div><div class='del'>-	u32				rx_eoc;</div><div class='del'>-</div><div class='del'>-	/* Value for rx interrupt time register in NAPI interrupt mode */</div><div class='del'>-	u32				rx_itr_irq;</div><div class='del'>-</div><div class='del'>-	/* Value for rx interrupt time register in NAPI poll mode */</div><div class='del'>-	u32				rx_itr_poll;</div><div class='del'>-</div><div class='del'>-	/* Value for config field of rx DMA descriptors */</div><div class='del'>-	u32				rx_dma_config;</div><div class='del'>-</div><div class='del'>-	/* TX DMA descriptors */</div><div class='del'>-	struct nb8800_tx_desc		*tx_descs;</div><div class='del'>-</div><div class='del'>-	/* TX packet queue */</div><div class='del'>-	struct nb8800_tx_buf		*tx_bufs;</div><div class='del'>-</div><div class='del'>-	/* Number of free tx queue entries */</div><div class='del'>-	atomic_t			tx_free;</div><div class='del'>-</div><div class='del'>-	/* First free tx queue entry */</div><div class='del'>-	u32				tx_next;</div><div class='del'>-</div><div class='del'>-	/* Next buffer to transmit */</div><div class='del'>-	u32				tx_queue;</div><div class='del'>-</div><div class='del'>-	/* Start of current packet chain */</div><div class='del'>-	struct nb8800_tx_buf		*tx_chain;</div><div class='del'>-</div><div class='del'>-	/* Next buffer to reclaim */</div><div class='del'>-	u32				tx_done;</div><div class='del'>-</div><div class='del'>-	/* Lock for DMA activation */</div><div class='del'>-	spinlock_t			tx_lock;</div><div class='del'>-</div><div class='del'>-	struct mii_bus			*mii_bus;</div><div class='del'>-	struct device_node		*phy_node;</div><div class='del'>-</div><div class='del'>-	/* PHY connection type from DT */</div><div class='del'>-	int				phy_mode;</div><div class='del'>-</div><div class='del'>-	/* Current link status */</div><div class='del'>-	int				speed;</div><div class='del'>-	int				duplex;</div><div class='del'>-	int				link;</div><div class='del'>-</div><div class='del'>-	/* Pause settings */</div><div class='del'>-	bool				pause_aneg;</div><div class='del'>-	bool				pause_rx;</div><div class='del'>-	bool				pause_tx;</div><div class='del'>-</div><div class='del'>-	/* DMA base address of rx descriptors, see rx_descs above */</div><div class='del'>-	dma_addr_t			rx_desc_dma;</div><div class='del'>-</div><div class='del'>-	/* DMA base address of tx descriptors, see tx_descs above */</div><div class='del'>-	dma_addr_t			tx_desc_dma;</div><div class='del'>-</div><div class='del'>-	struct clk			*clk;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct nb8800_ops {</div><div class='del'>-	int				(*init)(struct net_device *dev);</div><div class='del'>-	int				(*reset)(struct net_device *dev);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _NB8800_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig<br/>index b123509d385f..666522d64775 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/Kconfig</a></div><div class='hunk'>@@ -8,14 +8,14 @@ config NET_VENDOR_BROADCOM</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on (SSB_POSSIBLE &amp;&amp; HAS_DMA) || PCI || BCM63XX || \</div><div class='ctx'> 		   SIBYTE_SB1xxx_SOC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) chipset belonging to this class,</div><div class='ctx'> 	  say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question does not directly affect</div><div class='del'>-	  the kernel: saying N will just case the configurator to skip all</div><div class='del'>-	  the questions regarding AMD chipsets. If you say Y, you will be asked</div><div class='del'>-	  for your specific chipset/driver in the following questions.</div><div class='add'>+	  the kernel: saying N will just cause the configurator to skip all</div><div class='add'>+	  the questions regarding Broadcom chipsets. If you say Y, you will</div><div class='add'>+	  be asked for your specific chipset/driver in the following questions.</div><div class='ctx'> </div><div class='ctx'> if NET_VENDOR_BROADCOM</div><div class='ctx'> </div><div class='hunk'>@@ -25,7 +25,8 @@ config B44</div><div class='ctx'> 	select SSB</div><div class='ctx'> 	select MII</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	select FIXED_PHY if BCM47XX</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) controller of this type, say Y</div><div class='ctx'> 	  or M here.</div><div class='ctx'> </div><div class='hunk'>@@ -51,6 +52,14 @@ config B44_PCI</div><div class='ctx'> 	depends on B44_PCI_AUTOSELECT &amp;&amp; B44_PCICORE_AUTOSELECT</div><div class='ctx'> 	default y</div><div class='ctx'> </div><div class='add'>+config BCM4908_ENET</div><div class='add'>+	tristate "Broadcom BCM4908 internal mac support"</div><div class='add'>+	depends on ARCH_BCMBCA || COMPILE_TEST</div><div class='add'>+	default y if ARCH_BCMBCA</div><div class='add'>+	help</div><div class='add'>+	  This driver supports Ethernet controller integrated into Broadcom</div><div class='add'>+	  BCM4908 family SoCs.</div><div class='add'>+</div><div class='ctx'> config BCM63XX_ENET</div><div class='ctx'> 	tristate "Broadcom 63xx internal mac support"</div><div class='ctx'> 	depends on BCM63XX</div><div class='hunk'>@@ -63,11 +72,13 @@ config BCM63XX_ENET</div><div class='ctx'> config BCMGENET</div><div class='ctx'> 	tristate "Broadcom GENET internal MAC support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='del'>-	select MII</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL || !ARCH_BCM2835</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select FIXED_PHY</div><div class='ctx'> 	select BCM7XXX_PHY</div><div class='ctx'> 	select MDIO_BCM_UNIMAC</div><div class='add'>+	select DIMLIB</div><div class='add'>+	select BROADCOM_PHY if ARCH_BCM2835</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports the built-in Ethernet MACs found in the</div><div class='ctx'> 	  Broadcom BCM7xxx Set Top Box family chipset.</div><div class='hunk'>@@ -77,7 +88,7 @@ config BNX2</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports QLogic bnx2 gigabit Ethernet cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -88,7 +99,7 @@ config CNIC</div><div class='ctx'> 	depends on PCI &amp;&amp; (IPV6 || IPV6=n)</div><div class='ctx'> 	select BNX2</div><div class='ctx'> 	select UIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports offload features of QLogic bnx2 gigabit</div><div class='ctx'> 	  Ethernet cards.</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +110,7 @@ config SB1250_MAC</div><div class='ctx'> 	tristate "SB1250 Gigabit Ethernet support"</div><div class='ctx'> 	depends on SIBYTE_SB1xxx_SOC</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Gigabit Ethernet interfaces based on the</div><div class='ctx'> 	  Broadcom SiByte family of System-On-a-Chip parts.  They include</div><div class='ctx'> 	  the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455</div><div class='hunk'>@@ -111,9 +122,10 @@ config SB1250_MAC</div><div class='ctx'> config TIGON3</div><div class='ctx'> 	tristate "Broadcom Tigon3 support"</div><div class='ctx'> 	depends on PCI</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Broadcom Tigon3 based gigabit Ethernet cards.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='hunk'>@@ -123,18 +135,18 @@ config TIGON3_HWMON</div><div class='ctx'> 	bool "Broadcom Tigon3 HWMON support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on TIGON3 &amp;&amp; HWMON &amp;&amp; !(TIGON3=y &amp;&amp; HWMON=m)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y if you want to expose the thermal sensor on Tigon3 devices.</div><div class='ctx'> </div><div class='ctx'> config BNX2X</div><div class='ctx'> 	tristate "Broadcom NetXtremeII 10Gb support"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select ZLIB_INFLATE</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select MDIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Broadcom NetXtremeII 10 gigabit Ethernet cards.</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='ctx'> 	  will be called bnx2x.  This is recommended.</div><div class='hunk'>@@ -143,7 +155,7 @@ config BNX2X_SRIOV</div><div class='ctx'> 	bool "Broadcom 578xx and 57712 SR-IOV support"</div><div class='ctx'> 	depends on BNX2X &amp;&amp; PCI_IOV</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This configuration parameter enables Single Root Input Output</div><div class='ctx'> 	  Virtualization support in the 578xx and 57712 products. This</div><div class='ctx'> 	  allows for virtual function acceleration in virtual environments.</div><div class='hunk'>@@ -162,7 +174,7 @@ config BGMAC_BCMA</div><div class='ctx'> 	select BGMAC</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select FIXED_PHY</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.</div><div class='ctx'> 	  They can be found on BCM47xx SoCs and provide gigabit ethernet.</div><div class='ctx'> 	  In case of using this driver on BCM4706 it's also requires to enable</div><div class='hunk'>@@ -171,12 +183,11 @@ config BGMAC_BCMA</div><div class='ctx'> config BGMAC_PLATFORM</div><div class='ctx'> 	tristate "Broadcom iProc GBit platform support"</div><div class='ctx'> 	depends on ARCH_BCM_IPROC || COMPILE_TEST</div><div class='del'>-	depends on OF</div><div class='ctx'> 	select BGMAC</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select FIXED_PHY</div><div class='ctx'> 	default ARCH_BCM_IPROC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the Broadcom iProc Gigabit Ethernet</div><div class='ctx'> 	  controller through the generic platform interface</div><div class='ctx'> </div><div class='hunk'>@@ -184,9 +195,9 @@ config SYSTEMPORT</div><div class='ctx'> 	tristate "Broadcom SYSTEMPORT internal MAC support"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	depends on NET_DSA || !NET_DSA</div><div class='del'>-	select MII</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select FIXED_PHY</div><div class='add'>+	select DIMLIB</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver supports the built-in Ethernet MACs found in the</div><div class='ctx'> 	  Broadcom BCM7xxx Set Top Box family chipset using an internal</div><div class='hunk'>@@ -195,10 +206,14 @@ config SYSTEMPORT</div><div class='ctx'> config BNXT</div><div class='ctx'> 	tristate "Broadcom NetXtreme-C/E support"</div><div class='ctx'> 	depends on PCI</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select NET_DEVLINK</div><div class='del'>-	---help---</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	select DIMLIB</div><div class='add'>+	select AUXILIARY_BUS</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Broadcom NetXtreme-C/E 10/25/40/50 gigabit</div><div class='ctx'> 	  Ethernet cards.  To compile this driver as a module, choose M here:</div><div class='ctx'> 	  the module will be called bnxt_en.  This is recommended.</div><div class='hunk'>@@ -207,7 +222,7 @@ config BNXT_SRIOV</div><div class='ctx'> 	bool "Broadcom NetXtreme-C/E SR-IOV support"</div><div class='ctx'> 	depends on BNXT &amp;&amp; PCI_IOV</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This configuration parameter enables Single Root Input Output</div><div class='ctx'> 	  Virtualization support in the NetXtreme-C/E products. This</div><div class='ctx'> 	  allows for virtual function acceleration in virtual environments.</div><div class='hunk'>@@ -216,7 +231,7 @@ config BNXT_FLOWER_OFFLOAD</div><div class='ctx'> 	bool "TC Flower offload support for NetXtreme-C/E"</div><div class='ctx'> 	depends on BNXT</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This configuration parameter enables TC Flower packet classifier</div><div class='ctx'> 	  offload for eswitch.  This option enables SR-IOV switchdev eswitch</div><div class='ctx'> 	  offload.</div><div class='hunk'>@@ -225,7 +240,7 @@ config BNXT_DCB</div><div class='ctx'> 	bool "Data Center Bridging (DCB) Support"</div><div class='ctx'> 	default n</div><div class='ctx'> 	depends on BNXT &amp;&amp; DCB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use Data Center Bridging (DCB) in the</div><div class='ctx'> 	  driver.</div><div class='ctx'> </div><div class='hunk'>@@ -235,8 +250,29 @@ config BNXT_HWMON</div><div class='ctx'> 	bool "Broadcom NetXtreme-C/E HWMON support"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on BNXT &amp;&amp; HWMON &amp;&amp; !(BNXT=y &amp;&amp; HWMON=m)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y if you want to expose the thermal sensor data on NetXtreme-C/E</div><div class='ctx'> 	  devices, via the hwmon sysfs interface.</div><div class='ctx'> </div><div class='add'>+config BNGE</div><div class='add'>+	tristate "Broadcom Ethernet device support"</div><div class='add'>+	depends on PCI</div><div class='add'>+	select NET_DEVLINK</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	help</div><div class='add'>+	  This driver supports Broadcom 50/100/200/400/800 gigabit Ethernet cards.</div><div class='add'>+	  The module will be called bng_en. To compile this driver as a module,</div><div class='add'>+	  choose M here.</div><div class='add'>+</div><div class='add'>+config BCMASP</div><div class='add'>+	tristate "Broadcom ASP 2.0 Ethernet support"</div><div class='add'>+	depends on ARCH_BRCMSTB || COMPILE_TEST</div><div class='add'>+	default ARCH_BRCMSTB</div><div class='add'>+	depends on OF</div><div class='add'>+	select PHYLIB</div><div class='add'>+	select MDIO_BCM_UNIMAC</div><div class='add'>+	help</div><div class='add'>+	  This configuration enables the Broadcom ASP 2.0 Ethernet controller</div><div class='add'>+	  driver which is present in Broadcom STB SoCs such as 72165.</div><div class='add'>+</div><div class='ctx'> endif # NET_VENDOR_BROADCOM</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/Makefile b/drivers/net/ethernet/broadcom/Makefile<br/>index 7046ad6d3d0e..10cc1c92ecfc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/Makefile</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_B44) += b44.o</div><div class='add'>+obj-$(CONFIG_BCM4908_ENET) += bcm4908_enet.o</div><div class='ctx'> obj-$(CONFIG_BCM63XX_ENET) += bcm63xx_enet.o</div><div class='ctx'> obj-$(CONFIG_BCMGENET) += genet/</div><div class='ctx'> obj-$(CONFIG_BNX2) += bnx2.o</div><div class='hunk'>@@ -16,3 +17,5 @@ obj-$(CONFIG_BGMAC_BCMA) += bgmac-bcma.o bgmac-bcma-mdio.o</div><div class='ctx'> obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o</div><div class='ctx'> obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o</div><div class='ctx'> obj-$(CONFIG_BNXT) += bnxt/</div><div class='add'>+obj-$(CONFIG_BCMASP) += asp2/</div><div class='add'>+obj-$(CONFIG_BNGE) += bnge/</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/asp2/Makefile b/drivers/net/ethernet/broadcom/asp2/Makefile<br/>new file mode 100644<br/>index 000000000000..e07550315f83<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/asp2/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/asp2/Makefile</a></div><div class='hunk'>@@ -0,0 +1,2 @@</div><div class='add'>+obj-$(CONFIG_BCMASP) += bcm-asp.o</div><div class='add'>+bcm-asp-objs := bcmasp.o bcmasp_intf.o bcmasp_ethtool.o</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c<br/>new file mode 100644<br/>index 000000000000..fd35f4b4dc50<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/asp2/bcmasp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/asp2/bcmasp.c</a></div><div class='hunk'>@@ -0,0 +1,1469 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * Broadcom STB ASP 2.0 Driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 Broadcom</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='add'>+#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bcmasp.h"</div><div class='add'>+#include "bcmasp_intf_defs.h"</div><div class='add'>+</div><div class='add'>+static void _intr2_mask_clear(struct bcmasp_priv *priv, u32 mask)</div><div class='add'>+{</div><div class='add'>+	intr2_core_wl(priv, mask, ASP_INTR2_MASK_CLEAR);</div><div class='add'>+	priv-&gt;irq_mask &amp;= ~mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _intr2_mask_set(struct bcmasp_priv *priv, u32 mask)</div><div class='add'>+{</div><div class='add'>+	intr2_core_wl(priv, mask, ASP_INTR2_MASK_SET);</div><div class='add'>+	priv-&gt;irq_mask |= mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_phy_irq(struct bcmasp_intf *intf, int en)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+</div><div class='add'>+	/* Only supported with internal phys */</div><div class='add'>+	if (!intf-&gt;internal_phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (en)</div><div class='add'>+		_intr2_mask_clear(priv, ASP_INTR2_PHY_EVENT(intf-&gt;channel));</div><div class='add'>+	else</div><div class='add'>+		_intr2_mask_set(priv, ASP_INTR2_PHY_EVENT(intf-&gt;channel));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_tx_irq(struct bcmasp_intf *intf, int en)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (en)</div><div class='add'>+		_intr2_mask_clear(priv, ASP_INTR2_TX_DESC(intf-&gt;channel));</div><div class='add'>+	else</div><div class='add'>+		_intr2_mask_set(priv, ASP_INTR2_TX_DESC(intf-&gt;channel));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bcmasp_enable_tx_irq);</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_rx_irq(struct bcmasp_intf *intf, int en)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (en)</div><div class='add'>+		_intr2_mask_clear(priv, ASP_INTR2_RX_ECH(intf-&gt;channel));</div><div class='add'>+	else</div><div class='add'>+		_intr2_mask_set(priv, ASP_INTR2_RX_ECH(intf-&gt;channel));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL_GPL(bcmasp_enable_rx_irq);</div><div class='add'>+</div><div class='add'>+static void bcmasp_intr2_mask_set_all(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	_intr2_mask_set(priv, 0xffffffff);</div><div class='add'>+	priv-&gt;irq_mask = 0xffffffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_intr2_clear_all(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	intr2_core_wl(priv, 0xffffffff, ASP_INTR2_CLEAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_intr2_handling(struct bcmasp_intf *intf, u32 status)</div><div class='add'>+{</div><div class='add'>+	if (status &amp; ASP_INTR2_RX_ECH(intf-&gt;channel)) {</div><div class='add'>+		if (likely(napi_schedule_prep(&amp;intf-&gt;rx_napi))) {</div><div class='add'>+			bcmasp_enable_rx_irq(intf, 0);</div><div class='add'>+			__napi_schedule_irqoff(&amp;intf-&gt;rx_napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; ASP_INTR2_TX_DESC(intf-&gt;channel)) {</div><div class='add'>+		if (likely(napi_schedule_prep(&amp;intf-&gt;tx_napi))) {</div><div class='add'>+			bcmasp_enable_tx_irq(intf, 0);</div><div class='add'>+			__napi_schedule_irqoff(&amp;intf-&gt;tx_napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; ASP_INTR2_PHY_EVENT(intf-&gt;channel))</div><div class='add'>+		phy_mac_interrupt(intf-&gt;ndev-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bcmasp_isr(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = data;</div><div class='add'>+	struct bcmasp_intf *intf;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	status = intr2_core_rl(priv, ASP_INTR2_STATUS) &amp;</div><div class='add'>+		~intr2_core_rl(priv, ASP_INTR2_MASK_STATUS);</div><div class='add'>+</div><div class='add'>+	intr2_core_wl(priv, status, ASP_INTR2_CLEAR);</div><div class='add'>+</div><div class='add'>+	if (unlikely(status == 0)) {</div><div class='add'>+		dev_warn(&amp;priv-&gt;pdev-&gt;dev, "l2 spurious interrupt\n");</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Handle intferfaces */</div><div class='add'>+	list_for_each_entry(intf, &amp;priv-&gt;intfs, list)</div><div class='add'>+		bcmasp_intr2_handling(intf, status);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_flush_rx_port(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	u32 mask;</div><div class='add'>+</div><div class='add'>+	switch (intf-&gt;port) {</div><div class='add'>+	case 0:</div><div class='add'>+		mask = ASP_CTRL_UMAC0_FLUSH_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 1:</div><div class='add'>+		mask = ASP_CTRL_UMAC1_FLUSH_MASK;</div><div class='add'>+		break;</div><div class='add'>+	case 2:</div><div class='add'>+		mask = ASP_CTRL_SPB_FLUSH_MASK;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		/* Not valid port */</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_ctrl_core_wl(priv, mask, ASP_RX_CTRL_FLUSH);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netfilt_hw_en_wake(struct bcmasp_priv *priv,</div><div class='add'>+				      struct bcmasp_net_filter *nfilt)</div><div class='add'>+{</div><div class='add'>+	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_OFFSET_L3_1(64),</div><div class='add'>+			  ASP_RX_FILTER_NET_OFFSET(nfilt-&gt;hw_index));</div><div class='add'>+</div><div class='add'>+	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_OFFSET_L2(32) |</div><div class='add'>+			  ASP_RX_FILTER_NET_OFFSET_L3_0(32) |</div><div class='add'>+			  ASP_RX_FILTER_NET_OFFSET_L3_1(96) |</div><div class='add'>+			  ASP_RX_FILTER_NET_OFFSET_L4(32),</div><div class='add'>+			  ASP_RX_FILTER_NET_OFFSET(nfilt-&gt;hw_index + 1));</div><div class='add'>+</div><div class='add'>+	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt-&gt;port + 8) |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L2_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L3_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L4_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L3_FRM(2) |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L4_FRM(2) |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_UMC(nfilt-&gt;port),</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG(nfilt-&gt;hw_index));</div><div class='add'>+</div><div class='add'>+	rx_filter_core_wl(priv, ASP_RX_FILTER_NET_CFG_CH(nfilt-&gt;port + 8) |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L2_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L3_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L4_EN |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L3_FRM(2) |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_L4_FRM(2) |</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG_UMC(nfilt-&gt;port),</div><div class='add'>+			  ASP_RX_FILTER_NET_CFG(nfilt-&gt;hw_index + 1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define MAX_WAKE_FILTER_SIZE		256</div><div class='add'>+enum asp_netfilt_reg_type {</div><div class='add'>+	ASP_NETFILT_MATCH = 0,</div><div class='add'>+	ASP_NETFILT_MASK,</div><div class='add'>+	ASP_NETFILT_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bcmasp_netfilt_get_reg_offset(struct bcmasp_priv *priv,</div><div class='add'>+					 struct bcmasp_net_filter *nfilt,</div><div class='add'>+					 enum asp_netfilt_reg_type reg_type,</div><div class='add'>+					 u32 offset)</div><div class='add'>+{</div><div class='add'>+	u32 block_index, filter_sel;</div><div class='add'>+</div><div class='add'>+	if (offset &lt; 32) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L2;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index;</div><div class='add'>+	} else if (offset &lt; 64) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L2;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index + 1;</div><div class='add'>+	} else if (offset &lt; 96) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L3_0;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index;</div><div class='add'>+	} else if (offset &lt; 128) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L3_0;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index + 1;</div><div class='add'>+	} else if (offset &lt; 160) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L3_1;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index;</div><div class='add'>+	} else if (offset &lt; 192) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L3_1;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index + 1;</div><div class='add'>+	} else if (offset &lt; 224) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L4;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index;</div><div class='add'>+	} else if (offset &lt; 256) {</div><div class='add'>+		block_index = ASP_RX_FILTER_NET_L4;</div><div class='add'>+		filter_sel = nfilt-&gt;hw_index + 1;</div><div class='add'>+	} else {</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (reg_type) {</div><div class='add'>+	case ASP_NETFILT_MATCH:</div><div class='add'>+		return ASP_RX_FILTER_NET_PAT(filter_sel, block_index,</div><div class='add'>+					     (offset % 32));</div><div class='add'>+	case ASP_NETFILT_MASK:</div><div class='add'>+		return ASP_RX_FILTER_NET_MASK(filter_sel, block_index,</div><div class='add'>+					      (offset % 32));</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netfilt_wr(struct bcmasp_priv *priv,</div><div class='add'>+			      struct bcmasp_net_filter *nfilt,</div><div class='add'>+			      enum asp_netfilt_reg_type reg_type,</div><div class='add'>+			      u32 val, u32 offset)</div><div class='add'>+{</div><div class='add'>+	int reg_offset;</div><div class='add'>+</div><div class='add'>+	/* HW only accepts 4 byte aligned writes */</div><div class='add'>+	if (!IS_ALIGNED(offset, 4) || offset &gt; MAX_WAKE_FILTER_SIZE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reg_offset = bcmasp_netfilt_get_reg_offset(priv, nfilt, reg_type,</div><div class='add'>+						   offset);</div><div class='add'>+</div><div class='add'>+	rx_filter_core_wl(priv, val, reg_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bcmasp_netfilt_rd(struct bcmasp_priv *priv,</div><div class='add'>+			     struct bcmasp_net_filter *nfilt,</div><div class='add'>+			     enum asp_netfilt_reg_type reg_type,</div><div class='add'>+			     u32 offset)</div><div class='add'>+{</div><div class='add'>+	int reg_offset;</div><div class='add'>+</div><div class='add'>+	/* HW only accepts 4 byte aligned writes */</div><div class='add'>+	if (!IS_ALIGNED(offset, 4) || offset &gt; MAX_WAKE_FILTER_SIZE)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	reg_offset = bcmasp_netfilt_get_reg_offset(priv, nfilt, reg_type,</div><div class='add'>+						   offset);</div><div class='add'>+</div><div class='add'>+	return rx_filter_core_rl(priv, reg_offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_netfilt_wr_m_wake(struct bcmasp_priv *priv,</div><div class='add'>+				    struct bcmasp_net_filter *nfilt,</div><div class='add'>+				    u32 offset, void *match, void *mask,</div><div class='add'>+				    size_t size)</div><div class='add'>+{</div><div class='add'>+	u32 shift, mask_val = 0, match_val = 0;</div><div class='add'>+	bool first_byte = true;</div><div class='add'>+</div><div class='add'>+	if ((offset + size) &gt; MAX_WAKE_FILTER_SIZE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	while (size--) {</div><div class='add'>+		/* The HW only accepts 4 byte aligned writes, so if we</div><div class='add'>+		 * begin unaligned or if remaining bytes less than 4,</div><div class='add'>+		 * we need to read then write to avoid losing current</div><div class='add'>+		 * register state</div><div class='add'>+		 */</div><div class='add'>+		if (first_byte &amp;&amp; (!IS_ALIGNED(offset, 4) || size &lt; 3)) {</div><div class='add'>+			match_val = bcmasp_netfilt_rd(priv, nfilt,</div><div class='add'>+						      ASP_NETFILT_MATCH,</div><div class='add'>+						      ALIGN_DOWN(offset, 4));</div><div class='add'>+			mask_val = bcmasp_netfilt_rd(priv, nfilt,</div><div class='add'>+						     ASP_NETFILT_MASK,</div><div class='add'>+						     ALIGN_DOWN(offset, 4));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		shift = (3 - (offset % 4)) * 8;</div><div class='add'>+		match_val &amp;= ~GENMASK(shift + 7, shift);</div><div class='add'>+		mask_val &amp;= ~GENMASK(shift + 7, shift);</div><div class='add'>+		match_val |= (u32)(*((u8 *)match) &lt;&lt; shift);</div><div class='add'>+		mask_val |= (u32)(*((u8 *)mask) &lt;&lt; shift);</div><div class='add'>+</div><div class='add'>+		/* If last byte or last byte of word, write to reg */</div><div class='add'>+		if (!size || ((offset % 4) == 3)) {</div><div class='add'>+			bcmasp_netfilt_wr(priv, nfilt, ASP_NETFILT_MATCH,</div><div class='add'>+					  match_val, ALIGN_DOWN(offset, 4));</div><div class='add'>+			bcmasp_netfilt_wr(priv, nfilt, ASP_NETFILT_MASK,</div><div class='add'>+					  mask_val, ALIGN_DOWN(offset, 4));</div><div class='add'>+			first_byte = true;</div><div class='add'>+		} else {</div><div class='add'>+			first_byte = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		offset++;</div><div class='add'>+		match++;</div><div class='add'>+		mask++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netfilt_reset_hw(struct bcmasp_priv *priv,</div><div class='add'>+				    struct bcmasp_net_filter *nfilt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_WAKE_FILTER_SIZE; i += 4) {</div><div class='add'>+		bcmasp_netfilt_wr(priv, nfilt, ASP_NETFILT_MATCH, 0, i);</div><div class='add'>+		bcmasp_netfilt_wr(priv, nfilt, ASP_NETFILT_MASK, 0, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netfilt_tcpip4_wr(struct bcmasp_priv *priv,</div><div class='add'>+				     struct bcmasp_net_filter *nfilt,</div><div class='add'>+				     struct ethtool_tcpip4_spec *match,</div><div class='add'>+				     struct ethtool_tcpip4_spec *mask,</div><div class='add'>+				     u32 offset)</div><div class='add'>+{</div><div class='add'>+	__be16 val_16, mask_16;</div><div class='add'>+</div><div class='add'>+	val_16 = htons(ETH_P_IP);</div><div class='add'>+	mask_16 = htons(0xFFFF);</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, (ETH_ALEN * 2) + offset,</div><div class='add'>+				 &amp;val_16, &amp;mask_16, sizeof(val_16));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 1,</div><div class='add'>+				 &amp;match-&gt;tos, &amp;mask-&gt;tos,</div><div class='add'>+				 sizeof(match-&gt;tos));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 12,</div><div class='add'>+				 &amp;match-&gt;ip4src, &amp;mask-&gt;ip4src,</div><div class='add'>+				 sizeof(match-&gt;ip4src));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 16,</div><div class='add'>+				 &amp;match-&gt;ip4dst, &amp;mask-&gt;ip4dst,</div><div class='add'>+				 sizeof(match-&gt;ip4dst));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 20,</div><div class='add'>+				 &amp;match-&gt;psrc, &amp;mask-&gt;psrc,</div><div class='add'>+				 sizeof(match-&gt;psrc));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 22,</div><div class='add'>+				 &amp;match-&gt;pdst, &amp;mask-&gt;pdst,</div><div class='add'>+				 sizeof(match-&gt;pdst));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netfilt_tcpip6_wr(struct bcmasp_priv *priv,</div><div class='add'>+				     struct bcmasp_net_filter *nfilt,</div><div class='add'>+				     struct ethtool_tcpip6_spec *match,</div><div class='add'>+				     struct ethtool_tcpip6_spec *mask,</div><div class='add'>+				     u32 offset)</div><div class='add'>+{</div><div class='add'>+	__be16 val_16, mask_16;</div><div class='add'>+</div><div class='add'>+	val_16 = htons(ETH_P_IPV6);</div><div class='add'>+	mask_16 = htons(0xFFFF);</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, (ETH_ALEN * 2) + offset,</div><div class='add'>+				 &amp;val_16, &amp;mask_16, sizeof(val_16));</div><div class='add'>+	val_16 = htons(match-&gt;tclass &lt;&lt; 4);</div><div class='add'>+	mask_16 = htons(mask-&gt;tclass &lt;&lt; 4);</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset,</div><div class='add'>+				 &amp;val_16, &amp;mask_16, sizeof(val_16));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 8,</div><div class='add'>+				 &amp;match-&gt;ip6src, &amp;mask-&gt;ip6src,</div><div class='add'>+				 sizeof(match-&gt;ip6src));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 24,</div><div class='add'>+				 &amp;match-&gt;ip6dst, &amp;mask-&gt;ip6dst,</div><div class='add'>+				 sizeof(match-&gt;ip6dst));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 40,</div><div class='add'>+				 &amp;match-&gt;psrc, &amp;mask-&gt;psrc,</div><div class='add'>+				 sizeof(match-&gt;psrc));</div><div class='add'>+	bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 42,</div><div class='add'>+				 &amp;match-&gt;pdst, &amp;mask-&gt;pdst,</div><div class='add'>+				 sizeof(match-&gt;pdst));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_netfilt_wr_to_hw(struct bcmasp_priv *priv,</div><div class='add'>+				   struct bcmasp_net_filter *nfilt)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;nfilt-&gt;fs;</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	__be16 val_16, mask_16;</div><div class='add'>+	u8 val_8, mask_8;</div><div class='add'>+</div><div class='add'>+	/* Currently only supports wake filters */</div><div class='add'>+	if (!nfilt-&gt;wake_filter)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	bcmasp_netfilt_reset_hw(priv, nfilt);</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_MAC_EXT) {</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, 0, &amp;fs-&gt;h_ext.h_dest,</div><div class='add'>+					 &amp;fs-&gt;m_ext.h_dest,</div><div class='add'>+					 sizeof(fs-&gt;h_ext.h_dest));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((fs-&gt;flow_type &amp; FLOW_EXT) &amp;&amp;</div><div class='add'>+	    (fs-&gt;m_ext.vlan_etype || fs-&gt;m_ext.vlan_tci)) {</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, (ETH_ALEN * 2),</div><div class='add'>+					 &amp;fs-&gt;h_ext.vlan_etype,</div><div class='add'>+					 &amp;fs-&gt;m_ext.vlan_etype,</div><div class='add'>+					 sizeof(fs-&gt;h_ext.vlan_etype));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ((ETH_ALEN * 2) + 2),</div><div class='add'>+					 &amp;fs-&gt;h_ext.vlan_tci,</div><div class='add'>+					 &amp;fs-&gt;m_ext.vlan_tci,</div><div class='add'>+					 sizeof(fs-&gt;h_ext.vlan_tci));</div><div class='add'>+		offset += VLAN_HLEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (fs-&gt;flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT)) {</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, 0,</div><div class='add'>+					 &amp;fs-&gt;h_u.ether_spec.h_dest,</div><div class='add'>+					 &amp;fs-&gt;m_u.ether_spec.h_dest,</div><div class='add'>+					 sizeof(fs-&gt;h_u.ether_spec.h_dest));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_ALEN,</div><div class='add'>+					 &amp;fs-&gt;h_u.ether_spec.h_source,</div><div class='add'>+					 &amp;fs-&gt;m_u.ether_spec.h_source,</div><div class='add'>+					 sizeof(fs-&gt;h_u.ether_spec.h_source));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, (ETH_ALEN * 2) + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.ether_spec.h_proto,</div><div class='add'>+					 &amp;fs-&gt;m_u.ether_spec.h_proto,</div><div class='add'>+					 sizeof(fs-&gt;h_u.ether_spec.h_proto));</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case IP_USER_FLOW:</div><div class='add'>+		val_16 = htons(ETH_P_IP);</div><div class='add'>+		mask_16 = htons(0xFFFF);</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, (ETH_ALEN * 2) + offset,</div><div class='add'>+					 &amp;val_16, &amp;mask_16, sizeof(val_16));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 1,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.tos,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.tos,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.tos));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 9,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.proto,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.proto,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.proto));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 12,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.ip4src,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.ip4src,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.ip4src));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 16,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.ip4dst,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.ip4dst,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.ip4dst));</div><div class='add'>+		if (!fs-&gt;m_u.usr_ip4_spec.l4_4_bytes)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Only supports 20 byte IPv4 header */</div><div class='add'>+		val_8 = 0x45;</div><div class='add'>+		mask_8 = 0xFF;</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset,</div><div class='add'>+					 &amp;val_8, &amp;mask_8, sizeof(val_8));</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt,</div><div class='add'>+					 ETH_HLEN + 20 + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.l4_4_bytes,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.l4_4_bytes,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.l4_4_bytes)</div><div class='add'>+					 );</div><div class='add'>+		break;</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+		val_8 = IPPROTO_TCP;</div><div class='add'>+		mask_8 = 0xFF;</div><div class='add'>+		bcmasp_netfilt_tcpip4_wr(priv, nfilt, &amp;fs-&gt;h_u.tcp_ip4_spec,</div><div class='add'>+					 &amp;fs-&gt;m_u.tcp_ip4_spec, offset);</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 9,</div><div class='add'>+					 &amp;val_8, &amp;mask_8, sizeof(val_8));</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+		val_8 = IPPROTO_UDP;</div><div class='add'>+		mask_8 = 0xFF;</div><div class='add'>+		bcmasp_netfilt_tcpip4_wr(priv, nfilt, &amp;fs-&gt;h_u.udp_ip4_spec,</div><div class='add'>+					 &amp;fs-&gt;m_u.udp_ip4_spec, offset);</div><div class='add'>+</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 9,</div><div class='add'>+					 &amp;val_8, &amp;mask_8, sizeof(val_8));</div><div class='add'>+		break;</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+		val_8 = IPPROTO_TCP;</div><div class='add'>+		mask_8 = 0xFF;</div><div class='add'>+		bcmasp_netfilt_tcpip6_wr(priv, nfilt, &amp;fs-&gt;h_u.tcp_ip6_spec,</div><div class='add'>+					 &amp;fs-&gt;m_u.tcp_ip6_spec, offset);</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 6,</div><div class='add'>+					 &amp;val_8, &amp;mask_8, sizeof(val_8));</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		val_8 = IPPROTO_UDP;</div><div class='add'>+		mask_8 = 0xFF;</div><div class='add'>+		bcmasp_netfilt_tcpip6_wr(priv, nfilt, &amp;fs-&gt;h_u.udp_ip6_spec,</div><div class='add'>+					 &amp;fs-&gt;m_u.udp_ip6_spec, offset);</div><div class='add'>+		bcmasp_netfilt_wr_m_wake(priv, nfilt, ETH_HLEN + offset + 6,</div><div class='add'>+					 &amp;val_8, &amp;mask_8, sizeof(val_8));</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcmasp_netfilt_hw_en_wake(priv, nfilt);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_netfilt_suspend(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	bool write = false;</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	/* Write all filters to HW */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_net_filters; i++) {</div><div class='add'>+		/* If the filter does not match the port, skip programming. */</div><div class='add'>+		if (!priv-&gt;net_filters[i].claimed ||</div><div class='add'>+		    priv-&gt;net_filters[i].port != intf-&gt;port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (i &gt; 0 &amp;&amp; (i % 2) &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i].wake_filter &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i - 1].wake_filter)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ret = bcmasp_netfilt_wr_to_hw(priv, &amp;priv-&gt;net_filters[i]);</div><div class='add'>+		if (!ret)</div><div class='add'>+			write = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Successfully programmed at least one wake filter</div><div class='add'>+	 * so enable top level wake config</div><div class='add'>+	 */</div><div class='add'>+	if (write)</div><div class='add'>+		rx_filter_core_wl(priv, (ASP_RX_FILTER_OPUT_EN |</div><div class='add'>+				  ASP_RX_FILTER_LNR_MD |</div><div class='add'>+				  ASP_RX_FILTER_GEN_WK_EN |</div><div class='add'>+				  ASP_RX_FILTER_NT_FLT_EN),</div><div class='add'>+				  ASP_RX_FILTER_BLK_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,</div><div class='add'>+				  u32 *rule_cnt)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	int j = 0, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_net_filters; i++) {</div><div class='add'>+		if (!priv-&gt;net_filters[i].claimed ||</div><div class='add'>+		    priv-&gt;net_filters[i].port != intf-&gt;port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (i &gt; 0 &amp;&amp; (i % 2) &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i].wake_filter &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i - 1].wake_filter)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (j == *rule_cnt)</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+		rule_locs[j++] = priv-&gt;net_filters[i].fs.location;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*rule_cnt = j;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcmasp_netfilt_get_active(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	int cnt = 0, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_net_filters; i++) {</div><div class='add'>+		if (!priv-&gt;net_filters[i].claimed ||</div><div class='add'>+		    priv-&gt;net_filters[i].port != intf-&gt;port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Skip over a wake filter pair */</div><div class='add'>+		if (i &gt; 0 &amp;&amp; (i % 2) &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i].wake_filter &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i - 1].wake_filter)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cnt++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return cnt;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bcmasp_netfilt_check_dup(struct bcmasp_intf *intf,</div><div class='add'>+			      struct ethtool_rx_flow_spec *fs)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	struct ethtool_rx_flow_spec *cur;</div><div class='add'>+	size_t fs_size = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_net_filters; i++) {</div><div class='add'>+		if (!priv-&gt;net_filters[i].claimed ||</div><div class='add'>+		    priv-&gt;net_filters[i].port != intf-&gt;port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cur = &amp;priv-&gt;net_filters[i].fs;</div><div class='add'>+</div><div class='add'>+		if (cur-&gt;flow_type != fs-&gt;flow_type ||</div><div class='add'>+		    cur-&gt;ring_cookie != fs-&gt;ring_cookie)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (fs-&gt;flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT)) {</div><div class='add'>+		case ETHER_FLOW:</div><div class='add'>+			fs_size = sizeof(struct ethhdr);</div><div class='add'>+			break;</div><div class='add'>+		case IP_USER_FLOW:</div><div class='add'>+			fs_size = sizeof(struct ethtool_usrip4_spec);</div><div class='add'>+			break;</div><div class='add'>+		case TCP_V6_FLOW:</div><div class='add'>+		case UDP_V6_FLOW:</div><div class='add'>+			fs_size = sizeof(struct ethtool_tcpip6_spec);</div><div class='add'>+			break;</div><div class='add'>+		case TCP_V4_FLOW:</div><div class='add'>+		case UDP_V4_FLOW:</div><div class='add'>+			fs_size = sizeof(struct ethtool_tcpip4_spec);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (memcmp(&amp;cur-&gt;h_u, &amp;fs-&gt;h_u, fs_size) ||</div><div class='add'>+		    memcmp(&amp;cur-&gt;m_u, &amp;fs-&gt;m_u, fs_size))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (cur-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+			if (cur-&gt;h_ext.vlan_etype != fs-&gt;h_ext.vlan_etype ||</div><div class='add'>+			    cur-&gt;m_ext.vlan_etype != fs-&gt;m_ext.vlan_etype ||</div><div class='add'>+			    cur-&gt;h_ext.vlan_tci != fs-&gt;h_ext.vlan_tci ||</div><div class='add'>+			    cur-&gt;m_ext.vlan_tci != fs-&gt;m_ext.vlan_tci ||</div><div class='add'>+			    cur-&gt;h_ext.data[0] != fs-&gt;h_ext.data[0])</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		if (cur-&gt;flow_type &amp; FLOW_MAC_EXT) {</div><div class='add'>+			if (memcmp(&amp;cur-&gt;h_ext.h_dest,</div><div class='add'>+				   &amp;fs-&gt;h_ext.h_dest, ETH_ALEN) ||</div><div class='add'>+			    memcmp(&amp;cur-&gt;m_ext.h_dest,</div><div class='add'>+				   &amp;fs-&gt;m_ext.h_dest, ETH_ALEN))</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* If no network filter found, return open filter.</div><div class='add'>+ * If no more open filters return NULL</div><div class='add'>+ */</div><div class='add'>+struct bcmasp_net_filter *bcmasp_netfilt_get_init(struct bcmasp_intf *intf,</div><div class='add'>+						  u32 loc, bool wake_filter,</div><div class='add'>+						  bool init)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_net_filter *nfilter = NULL;</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	int i, open_index = -1;</div><div class='add'>+</div><div class='add'>+	/* Check whether we exceed the filter table capacity */</div><div class='add'>+	if (loc != RX_CLS_LOC_ANY &amp;&amp; loc &gt;= priv-&gt;num_net_filters)</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	/* If the filter location is busy (already claimed) and we are initializing</div><div class='add'>+	 * the filter (insertion), return a busy error code.</div><div class='add'>+	 */</div><div class='add'>+	if (loc != RX_CLS_LOC_ANY &amp;&amp; init &amp;&amp; priv-&gt;net_filters[loc].claimed)</div><div class='add'>+		return ERR_PTR(-EBUSY);</div><div class='add'>+</div><div class='add'>+	/* We need two filters for wake-up, so we cannot use an odd filter */</div><div class='add'>+	if (wake_filter &amp;&amp; loc != RX_CLS_LOC_ANY &amp;&amp; (loc % 2))</div><div class='add'>+		return ERR_PTR(-EINVAL);</div><div class='add'>+</div><div class='add'>+	/* Initialize the loop index based on the desired location or from 0 */</div><div class='add'>+	i = loc == RX_CLS_LOC_ANY ? 0 : loc;</div><div class='add'>+</div><div class='add'>+	for ( ; i &lt; priv-&gt;num_net_filters; i++) {</div><div class='add'>+		/* Found matching network filter */</div><div class='add'>+		if (!init &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i].claimed &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i].hw_index == i &amp;&amp;</div><div class='add'>+		    priv-&gt;net_filters[i].port == intf-&gt;port)</div><div class='add'>+			return &amp;priv-&gt;net_filters[i];</div><div class='add'>+</div><div class='add'>+		/* If we don't need a new filter or new filter already found */</div><div class='add'>+		if (!init || open_index &gt;= 0)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Wake filter conslidates two filters to cover more bytes</div><div class='add'>+		 * Wake filter is open if...</div><div class='add'>+		 * 1. It is an even filter</div><div class='add'>+		 * 2. The current and next filter is not claimed</div><div class='add'>+		 */</div><div class='add'>+		if (wake_filter &amp;&amp; !(i % 2) &amp;&amp; !priv-&gt;net_filters[i].claimed &amp;&amp;</div><div class='add'>+		    !priv-&gt;net_filters[i + 1].claimed)</div><div class='add'>+			open_index = i;</div><div class='add'>+		else if (!priv-&gt;net_filters[i].claimed)</div><div class='add'>+			open_index = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (open_index &gt;= 0) {</div><div class='add'>+		nfilter = &amp;priv-&gt;net_filters[open_index];</div><div class='add'>+		nfilter-&gt;claimed = true;</div><div class='add'>+		nfilter-&gt;port = intf-&gt;port;</div><div class='add'>+		nfilter-&gt;hw_index = open_index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (wake_filter &amp;&amp; open_index &gt;= 0) {</div><div class='add'>+		/* Claim next filter */</div><div class='add'>+		priv-&gt;net_filters[open_index + 1].claimed = true;</div><div class='add'>+		priv-&gt;net_filters[open_index + 1].wake_filter = true;</div><div class='add'>+		nfilter-&gt;wake_filter = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nfilter ? nfilter : ERR_PTR(-EINVAL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_netfilt_release(struct bcmasp_intf *intf,</div><div class='add'>+			    struct bcmasp_net_filter *nfilt)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (nfilt-&gt;wake_filter) {</div><div class='add'>+		memset(&amp;priv-&gt;net_filters[nfilt-&gt;hw_index + 1], 0,</div><div class='add'>+		       sizeof(struct bcmasp_net_filter));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(nfilt, 0, sizeof(struct bcmasp_net_filter));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_addr_to_uint(unsigned char *addr, u32 *high, u32 *low)</div><div class='add'>+{</div><div class='add'>+	*high = (u32)(addr[0] &lt;&lt; 8 | addr[1]);</div><div class='add'>+	*low = (u32)(addr[2] &lt;&lt; 24 | addr[3] &lt;&lt; 16 | addr[4] &lt;&lt; 8 |</div><div class='add'>+		     addr[5]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_set_mda_filter(struct bcmasp_intf *intf,</div><div class='add'>+				  const unsigned char *addr,</div><div class='add'>+				  unsigned char *mask,</div><div class='add'>+				  unsigned int i)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	u32 addr_h, addr_l, mask_h, mask_l;</div><div class='add'>+</div><div class='add'>+	/* Set local copy */</div><div class='add'>+	ether_addr_copy(priv-&gt;mda_filters[i].mask, mask);</div><div class='add'>+	ether_addr_copy(priv-&gt;mda_filters[i].addr, addr);</div><div class='add'>+</div><div class='add'>+	/* Write to HW */</div><div class='add'>+	bcmasp_addr_to_uint(priv-&gt;mda_filters[i].mask, &amp;mask_h, &amp;mask_l);</div><div class='add'>+	bcmasp_addr_to_uint(priv-&gt;mda_filters[i].addr, &amp;addr_h, &amp;addr_l);</div><div class='add'>+	rx_filter_core_wl(priv, addr_h, ASP_RX_FILTER_MDA_PAT_H(i));</div><div class='add'>+	rx_filter_core_wl(priv, addr_l, ASP_RX_FILTER_MDA_PAT_L(i));</div><div class='add'>+	rx_filter_core_wl(priv, mask_h, ASP_RX_FILTER_MDA_MSK_H(i));</div><div class='add'>+	rx_filter_core_wl(priv, mask_l, ASP_RX_FILTER_MDA_MSK_L(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_en_mda_filter(struct bcmasp_intf *intf, bool en,</div><div class='add'>+				 unsigned int i)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;mda_filters[i].en == en)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	priv-&gt;mda_filters[i].en = en;</div><div class='add'>+	priv-&gt;mda_filters[i].port = intf-&gt;port;</div><div class='add'>+</div><div class='add'>+	rx_filter_core_wl(priv, ((intf-&gt;channel + priv-&gt;tx_chan_offset) |</div><div class='add'>+			  (en &lt;&lt; ASP_RX_FILTER_MDA_CFG_EN_SHIFT) |</div><div class='add'>+			  ASP_RX_FILTER_MDA_CFG_UMC_SEL(intf-&gt;port)),</div><div class='add'>+			  ASP_RX_FILTER_MDA_CFG(i));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* There are 32 MDA filters shared between all ports, we reserve 4 filters per</div><div class='add'>+ * port for the following.</div><div class='add'>+ * - Promisc: Filter to allow all packets when promisc is enabled</div><div class='add'>+ * - All Multicast</div><div class='add'>+ * - Broadcast</div><div class='add'>+ * - Own address</div><div class='add'>+ *</div><div class='add'>+ * The reserved filters are identified as so.</div><div class='add'>+ * - Promisc: (index * 4) + 0</div><div class='add'>+ * - All Multicast: (index * 4) + 1</div><div class='add'>+ * - Broadcast: (index * 4) + 2</div><div class='add'>+ * - Own address: (index * 4) + 3</div><div class='add'>+ */</div><div class='add'>+enum asp_rx_filter_id {</div><div class='add'>+	ASP_RX_FILTER_MDA_PROMISC = 0,</div><div class='add'>+	ASP_RX_FILTER_MDA_ALLMULTI,</div><div class='add'>+	ASP_RX_FILTER_MDA_BROADCAST,</div><div class='add'>+	ASP_RX_FILTER_MDA_OWN_ADDR,</div><div class='add'>+	ASP_RX_FILTER_MDA_RES_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ASP_RX_FILT_MDA(intf, name)	(((intf)-&gt;index * \</div><div class='add'>+					  ASP_RX_FILTER_MDA_RES_MAX) \</div><div class='add'>+					 + ASP_RX_FILTER_MDA_##name)</div><div class='add'>+</div><div class='add'>+static int bcmasp_total_res_mda_cnt(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return list_count_nodes(&amp;priv-&gt;intfs) * ASP_RX_FILTER_MDA_RES_MAX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_set_promisc(struct bcmasp_intf *intf, bool en)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = ASP_RX_FILT_MDA(intf, PROMISC);</div><div class='add'>+	unsigned char promisc[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	eth_zero_addr(promisc);</div><div class='add'>+	/* Set mask to 00:00:00:00:00:00 to match all packets */</div><div class='add'>+	bcmasp_set_mda_filter(intf, promisc, promisc, i);</div><div class='add'>+	bcmasp_en_mda_filter(intf, en, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_set_allmulti(struct bcmasp_intf *intf, bool en)</div><div class='add'>+{</div><div class='add'>+	unsigned char allmulti[] = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00};</div><div class='add'>+	unsigned int i = ASP_RX_FILT_MDA(intf, ALLMULTI);</div><div class='add'>+</div><div class='add'>+	/* Set mask to 01:00:00:00:00:00 to match all multicast */</div><div class='add'>+	bcmasp_set_mda_filter(intf, allmulti, allmulti, i);</div><div class='add'>+	bcmasp_en_mda_filter(intf, en, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_set_broad(struct bcmasp_intf *intf, bool en)</div><div class='add'>+{</div><div class='add'>+	unsigned int i = ASP_RX_FILT_MDA(intf, BROADCAST);</div><div class='add'>+	unsigned char addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(addr);</div><div class='add'>+	bcmasp_set_mda_filter(intf, addr, addr, i);</div><div class='add'>+	bcmasp_en_mda_filter(intf, en, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_set_oaddr(struct bcmasp_intf *intf, const unsigned char *addr,</div><div class='add'>+		      bool en)</div><div class='add'>+{</div><div class='add'>+	unsigned char mask[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='add'>+	unsigned int i = ASP_RX_FILT_MDA(intf, OWN_ADDR);</div><div class='add'>+</div><div class='add'>+	bcmasp_set_mda_filter(intf, addr, mask, i);</div><div class='add'>+	bcmasp_en_mda_filter(intf, en, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_disable_all_filters(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int res_count;</div><div class='add'>+</div><div class='add'>+	res_count = bcmasp_total_res_mda_cnt(intf-&gt;parent);</div><div class='add'>+</div><div class='add'>+	/* Disable all filters held by this port */</div><div class='add'>+	for (i = res_count; i &lt; priv-&gt;num_mda_filters; i++) {</div><div class='add'>+		if (priv-&gt;mda_filters[i].en &amp;&amp;</div><div class='add'>+		    priv-&gt;mda_filters[i].port == intf-&gt;port)</div><div class='add'>+			bcmasp_en_mda_filter(intf, 0, i);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_combine_set_filter(struct bcmasp_intf *intf,</div><div class='add'>+				     unsigned char *addr, unsigned char *mask,</div><div class='add'>+				     int i)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	u64 addr1, addr2, mask1, mask2, mask3;</div><div class='add'>+</div><div class='add'>+	/* Switch to u64 to help with the calculations */</div><div class='add'>+	addr1 = ether_addr_to_u64(priv-&gt;mda_filters[i].addr);</div><div class='add'>+	mask1 = ether_addr_to_u64(priv-&gt;mda_filters[i].mask);</div><div class='add'>+	addr2 = ether_addr_to_u64(addr);</div><div class='add'>+	mask2 = ether_addr_to_u64(mask);</div><div class='add'>+</div><div class='add'>+	/* Check if one filter resides within the other */</div><div class='add'>+	mask3 = mask1 &amp; mask2;</div><div class='add'>+	if (mask3 == mask1 &amp;&amp; ((addr1 &amp; mask1) == (addr2 &amp; mask1))) {</div><div class='add'>+		/* Filter 2 resides within filter 1, so everything is good */</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (mask3 == mask2 &amp;&amp; ((addr1 &amp; mask2) == (addr2 &amp; mask2))) {</div><div class='add'>+		/* Filter 1 resides within filter 2, so swap filters */</div><div class='add'>+		bcmasp_set_mda_filter(intf, addr, mask, i);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Unable to combine */</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcmasp_set_en_mda_filter(struct bcmasp_intf *intf, unsigned char *addr,</div><div class='add'>+			     unsigned char *mask)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	int ret, res_count;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	res_count = bcmasp_total_res_mda_cnt(intf-&gt;parent);</div><div class='add'>+</div><div class='add'>+	for (i = res_count; i &lt; priv-&gt;num_mda_filters; i++) {</div><div class='add'>+		/* If filter not enabled or belongs to another port skip */</div><div class='add'>+		if (!priv-&gt;mda_filters[i].en ||</div><div class='add'>+		    priv-&gt;mda_filters[i].port != intf-&gt;port)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* Attempt to combine filters */</div><div class='add'>+		ret = bcmasp_combine_set_filter(intf, addr, mask, i);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			intf-&gt;mib.filters_combine_cnt++;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Create new filter if possible */</div><div class='add'>+	for (i = res_count; i &lt; priv-&gt;num_mda_filters; i++) {</div><div class='add'>+		if (priv-&gt;mda_filters[i].en)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bcmasp_set_mda_filter(intf, addr, mask, i);</div><div class='add'>+		bcmasp_en_mda_filter(intf, 1, i);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* No room for new filter */</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_core_init_filters(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	/* Disable all filters and reset software view since the HW</div><div class='add'>+	 * can lose context while in deep sleep suspend states</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_mda_filters; i++) {</div><div class='add'>+		rx_filter_core_wl(priv, 0x0, ASP_RX_FILTER_MDA_CFG(i));</div><div class='add'>+		priv-&gt;mda_filters[i].en = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_net_filters; i++)</div><div class='add'>+		rx_filter_core_wl(priv, 0x0, ASP_RX_FILTER_NET_CFG(i));</div><div class='add'>+</div><div class='add'>+	/* Top level filter enable bit should be enabled at all times, set</div><div class='add'>+	 * GEN_WAKE_CLEAR to clear the network filter wake-up which would</div><div class='add'>+	 * otherwise be sticky</div><div class='add'>+	 */</div><div class='add'>+	rx_filter_core_wl(priv, (ASP_RX_FILTER_OPUT_EN |</div><div class='add'>+			  ASP_RX_FILTER_MDA_EN |</div><div class='add'>+			  ASP_RX_FILTER_GEN_WK_CLR |</div><div class='add'>+			  ASP_RX_FILTER_NT_FLT_EN),</div><div class='add'>+			  ASP_RX_FILTER_BLK_CTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ASP core initialization */</div><div class='add'>+static void bcmasp_core_init(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	rx_edpkt_core_wl(priv, 0x1b, ASP_EDPKT_BURST_BUF_PSCAL_TOUT);</div><div class='add'>+	rx_edpkt_core_wl(priv, 0x3e8, ASP_EDPKT_BURST_BUF_WRITE_TOUT);</div><div class='add'>+</div><div class='add'>+	rx_edpkt_core_wl(priv, ASP_EDPKT_ENABLE_EN, ASP_EDPKT_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* Disable and clear both UniMAC's wake-up interrupts to avoid</div><div class='add'>+	 * sticky interrupts.</div><div class='add'>+	 */</div><div class='add'>+	_intr2_mask_set(priv, ASP_INTR2_UMC0_WAKE | ASP_INTR2_UMC1_WAKE);</div><div class='add'>+	intr2_core_wl(priv, ASP_INTR2_UMC0_WAKE | ASP_INTR2_UMC1_WAKE,</div><div class='add'>+		      ASP_INTR2_CLEAR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_core_clock_select_many(struct bcmasp_priv *priv, bool slow)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = ctrl2_core_rl(priv, ASP_CTRL2_CORE_CLOCK_SELECT);</div><div class='add'>+	if (slow)</div><div class='add'>+		reg &amp;= ~ASP_CTRL2_CORE_CLOCK_SELECT_MAIN;</div><div class='add'>+	else</div><div class='add'>+		reg |= ASP_CTRL2_CORE_CLOCK_SELECT_MAIN;</div><div class='add'>+	ctrl2_core_wl(priv, reg, ASP_CTRL2_CORE_CLOCK_SELECT);</div><div class='add'>+</div><div class='add'>+	reg = ctrl2_core_rl(priv, ASP_CTRL2_CPU_CLOCK_SELECT);</div><div class='add'>+	if (slow)</div><div class='add'>+		reg &amp;= ~ASP_CTRL2_CPU_CLOCK_SELECT_MAIN;</div><div class='add'>+	else</div><div class='add'>+		reg |= ASP_CTRL2_CPU_CLOCK_SELECT_MAIN;</div><div class='add'>+	ctrl2_core_wl(priv, reg, ASP_CTRL2_CPU_CLOCK_SELECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_core_clock_select_one(struct bcmasp_priv *priv, bool slow)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = ctrl_core_rl(priv, ASP_CTRL_CORE_CLOCK_SELECT);</div><div class='add'>+	if (slow)</div><div class='add'>+		reg &amp;= ~ASP_CTRL_CORE_CLOCK_SELECT_MAIN;</div><div class='add'>+	else</div><div class='add'>+		reg |= ASP_CTRL_CORE_CLOCK_SELECT_MAIN;</div><div class='add'>+	ctrl_core_wl(priv, reg, ASP_CTRL_CORE_CLOCK_SELECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_core_clock_select_one_ctrl2(struct bcmasp_priv *priv, bool slow)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = ctrl2_core_rl(priv, ASP_CTRL2_CORE_CLOCK_SELECT);</div><div class='add'>+	if (slow)</div><div class='add'>+		reg &amp;= ~ASP_CTRL2_CORE_CLOCK_SELECT_MAIN;</div><div class='add'>+	else</div><div class='add'>+		reg |= ASP_CTRL2_CORE_CLOCK_SELECT_MAIN;</div><div class='add'>+	ctrl2_core_wl(priv, reg, ASP_CTRL2_CORE_CLOCK_SELECT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_core_clock_set_ll(struct bcmasp_priv *priv, u32 clr, u32 set)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = ctrl_core_rl(priv, ASP_CTRL_CLOCK_CTRL);</div><div class='add'>+	reg &amp;= ~clr;</div><div class='add'>+	reg |= set;</div><div class='add'>+	ctrl_core_wl(priv, reg, ASP_CTRL_CLOCK_CTRL);</div><div class='add'>+</div><div class='add'>+	reg = ctrl_core_rl(priv, ASP_CTRL_SCRATCH_0);</div><div class='add'>+	reg &amp;= ~clr;</div><div class='add'>+	reg |= set;</div><div class='add'>+	ctrl_core_wl(priv, reg, ASP_CTRL_SCRATCH_0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_core_clock_set(struct bcmasp_priv *priv, u32 clr, u32 set)</div><div class='add'>+{</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;clk_lock, flags);</div><div class='add'>+	bcmasp_core_clock_set_ll(priv, clr, set);</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;clk_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_core_clock_set_intf(struct bcmasp_intf *intf, bool en)</div><div class='add'>+{</div><div class='add'>+	u32 intf_mask = ASP_CTRL_CLOCK_CTRL_ASP_RGMII_DIS(intf-&gt;port);</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	/* When enabling an interface, if the RX or TX clocks were not enabled,</div><div class='add'>+	 * enable them. Conversely, while disabling an interface, if this is</div><div class='add'>+	 * the last one enabled, we can turn off the shared RX and TX clocks as</div><div class='add'>+	 * well. We control enable bits which is why we test for equality on</div><div class='add'>+	 * the RGMII clock bit mask.</div><div class='add'>+	 */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;clk_lock, flags);</div><div class='add'>+	if (en) {</div><div class='add'>+		intf_mask |= ASP_CTRL_CLOCK_CTRL_ASP_TX_DISABLE |</div><div class='add'>+			     ASP_CTRL_CLOCK_CTRL_ASP_RX_DISABLE;</div><div class='add'>+		bcmasp_core_clock_set_ll(priv, intf_mask, 0);</div><div class='add'>+	} else {</div><div class='add'>+		reg = ctrl_core_rl(priv, ASP_CTRL_SCRATCH_0) | intf_mask;</div><div class='add'>+		if ((reg &amp; ASP_CTRL_CLOCK_CTRL_ASP_RGMII_MASK) ==</div><div class='add'>+		    ASP_CTRL_CLOCK_CTRL_ASP_RGMII_MASK)</div><div class='add'>+			intf_mask |= ASP_CTRL_CLOCK_CTRL_ASP_TX_DISABLE |</div><div class='add'>+				     ASP_CTRL_CLOCK_CTRL_ASP_RX_DISABLE;</div><div class='add'>+		bcmasp_core_clock_set_ll(priv, 0, intf_mask);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;clk_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bcmasp_isr_wol(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = data;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	/* No L3 IRQ, so we good */</div><div class='add'>+	if (priv-&gt;wol_irq &lt;= 0)</div><div class='add'>+		goto irq_handled;</div><div class='add'>+</div><div class='add'>+	status = wakeup_intr2_core_rl(priv, ASP_WAKEUP_INTR2_STATUS) &amp;</div><div class='add'>+		~wakeup_intr2_core_rl(priv, ASP_WAKEUP_INTR2_MASK_STATUS);</div><div class='add'>+	wakeup_intr2_core_wl(priv, status, ASP_WAKEUP_INTR2_CLEAR);</div><div class='add'>+</div><div class='add'>+irq_handled:</div><div class='add'>+	pm_wakeup_event(&amp;priv-&gt;pdev-&gt;dev, 0);</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_get_and_request_irq(struct bcmasp_priv *priv, int i)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = priv-&gt;pdev;</div><div class='add'>+	int irq, ret;</div><div class='add'>+</div><div class='add'>+	irq = platform_get_irq_optional(pdev, i);</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(&amp;pdev-&gt;dev, irq, bcmasp_isr_wol, 0,</div><div class='add'>+			       pdev-&gt;name, priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return irq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_init_wol(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct platform_device *pdev = priv-&gt;pdev;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	int irq;</div><div class='add'>+</div><div class='add'>+	irq = bcmasp_get_and_request_irq(priv, 1);</div><div class='add'>+	if (irq &lt; 0) {</div><div class='add'>+		dev_warn(dev, "Failed to init WoL irq: %d\n", irq);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;wol_irq = irq;</div><div class='add'>+	priv-&gt;wol_irq_enabled_mask = 0;</div><div class='add'>+	device_set_wakeup_capable(&amp;pdev-&gt;dev, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_wol(struct bcmasp_intf *intf, bool en)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	struct device *dev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	if (en) {</div><div class='add'>+		if (priv-&gt;wol_irq_enabled_mask) {</div><div class='add'>+			set_bit(intf-&gt;port, &amp;priv-&gt;wol_irq_enabled_mask);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* First enable */</div><div class='add'>+		set_bit(intf-&gt;port, &amp;priv-&gt;wol_irq_enabled_mask);</div><div class='add'>+		enable_irq_wake(priv-&gt;wol_irq);</div><div class='add'>+		device_set_wakeup_enable(dev, 1);</div><div class='add'>+	} else {</div><div class='add'>+		if (!priv-&gt;wol_irq_enabled_mask)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		clear_bit(intf-&gt;port, &amp;priv-&gt;wol_irq_enabled_mask);</div><div class='add'>+		if (priv-&gt;wol_irq_enabled_mask)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* Last disable */</div><div class='add'>+		disable_irq_wake(priv-&gt;wol_irq);</div><div class='add'>+		device_set_wakeup_enable(dev, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_wol_irq_destroy(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	if (priv-&gt;wol_irq &gt; 0)</div><div class='add'>+		free_irq(priv-&gt;wol_irq, priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_eee_fixup(struct bcmasp_intf *intf, bool en)</div><div class='add'>+{</div><div class='add'>+	u32 reg, phy_lpi_overwrite;</div><div class='add'>+</div><div class='add'>+	reg = rx_edpkt_core_rl(intf-&gt;parent, ASP_EDPKT_SPARE_REG);</div><div class='add'>+	phy_lpi_overwrite = intf-&gt;internal_phy ? ASP_EDPKT_SPARE_REG_EPHY_LPI :</div><div class='add'>+			    ASP_EDPKT_SPARE_REG_GPHY_LPI;</div><div class='add'>+</div><div class='add'>+	if (en)</div><div class='add'>+		reg |= phy_lpi_overwrite;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~phy_lpi_overwrite;</div><div class='add'>+</div><div class='add'>+	rx_edpkt_core_wl(intf-&gt;parent, reg, ASP_EDPKT_SPARE_REG);</div><div class='add'>+</div><div class='add'>+	usleep_range(50, 100);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bcmasp_plat_data v21_plat_data = {</div><div class='add'>+	.core_clock_select = bcmasp_core_clock_select_one,</div><div class='add'>+	.num_mda_filters = 32,</div><div class='add'>+	.num_net_filters = 32,</div><div class='add'>+	.tx_chan_offset = 8,</div><div class='add'>+	.rx_ctrl_offset = 0x0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmasp_plat_data v22_plat_data = {</div><div class='add'>+	.core_clock_select = bcmasp_core_clock_select_many,</div><div class='add'>+	.eee_fixup = bcmasp_eee_fixup,</div><div class='add'>+	.num_mda_filters = 32,</div><div class='add'>+	.num_net_filters = 32,</div><div class='add'>+	.tx_chan_offset = 8,</div><div class='add'>+	.rx_ctrl_offset = 0x0,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmasp_plat_data v30_plat_data = {</div><div class='add'>+	.core_clock_select = bcmasp_core_clock_select_one_ctrl2,</div><div class='add'>+	.num_mda_filters = 20,</div><div class='add'>+	.num_net_filters = 16,</div><div class='add'>+	.tx_chan_offset = 0,</div><div class='add'>+	.rx_ctrl_offset = 0x10000,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bcmasp_set_pdata(struct bcmasp_priv *priv, const struct bcmasp_plat_data *pdata)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;core_clock_select = pdata-&gt;core_clock_select;</div><div class='add'>+	priv-&gt;eee_fixup = pdata-&gt;eee_fixup;</div><div class='add'>+	priv-&gt;num_mda_filters = pdata-&gt;num_mda_filters;</div><div class='add'>+	priv-&gt;num_net_filters = pdata-&gt;num_net_filters;</div><div class='add'>+	priv-&gt;tx_chan_offset = pdata-&gt;tx_chan_offset;</div><div class='add'>+	priv-&gt;rx_ctrl_offset = pdata-&gt;rx_ctrl_offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id bcmasp_of_match[] = {</div><div class='add'>+	{ .compatible = "brcm,asp-v2.1", .data = &amp;v21_plat_data },</div><div class='add'>+	{ .compatible = "brcm,asp-v2.2", .data = &amp;v22_plat_data },</div><div class='add'>+	{ .compatible = "brcm,asp-v3.0", .data = &amp;v30_plat_data },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, bcmasp_of_match);</div><div class='add'>+</div><div class='add'>+static const struct of_device_id bcmasp_mdio_of_match[] = {</div><div class='add'>+	{ .compatible = "brcm,asp-v2.1-mdio", },</div><div class='add'>+	{ .compatible = "brcm,asp-v2.2-mdio", },</div><div class='add'>+	{ .compatible = "brcm,asp-v3.0-mdio", },</div><div class='add'>+	{ /* sentinel */ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, bcmasp_mdio_of_match);</div><div class='add'>+</div><div class='add'>+static void bcmasp_remove_intfs(struct bcmasp_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(intf, n, &amp;priv-&gt;intfs, list) {</div><div class='add'>+		list_del(&amp;intf-&gt;list);</div><div class='add'>+		bcmasp_interface_destroy(intf);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	const struct bcmasp_plat_data *pdata;</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct device_node *ports_node;</div><div class='add'>+	struct bcmasp_priv *priv;</div><div class='add'>+	struct bcmasp_intf *intf;</div><div class='add'>+	int ret = 0, count = 0;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);</div><div class='add'>+	if (!priv)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;irq = platform_get_irq(pdev, 0);</div><div class='add'>+	if (priv-&gt;irq &lt;= 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;clk = devm_clk_get_optional_enabled(dev, "sw_asp");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(priv-&gt;clk),</div><div class='add'>+				     "failed to request clock\n");</div><div class='add'>+</div><div class='add'>+	/* Base from parent node */</div><div class='add'>+	priv-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(priv-&gt;base))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(priv-&gt;base), "failed to iomap\n");</div><div class='add'>+</div><div class='add'>+	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(40));</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(dev, ret, "unable to set DMA mask: %d\n", ret);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(&amp;pdev-&gt;dev, priv);</div><div class='add'>+	priv-&gt;pdev = pdev;</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;mda_lock);</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;clk_lock);</div><div class='add'>+	mutex_init(&amp;priv-&gt;wol_lock);</div><div class='add'>+	mutex_init(&amp;priv-&gt;net_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;intfs);</div><div class='add'>+</div><div class='add'>+	pdata = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (!pdata)</div><div class='add'>+		return dev_err_probe(dev, -EINVAL, "unable to find platform data\n");</div><div class='add'>+</div><div class='add'>+	bcmasp_set_pdata(priv, pdata);</div><div class='add'>+</div><div class='add'>+	/* Enable all clocks to ensure successful probing */</div><div class='add'>+	bcmasp_core_clock_set(priv, ASP_CTRL_CLOCK_CTRL_ASP_ALL_DISABLE, 0);</div><div class='add'>+</div><div class='add'>+	/* Switch to the main clock */</div><div class='add'>+	priv-&gt;core_clock_select(priv, false);</div><div class='add'>+</div><div class='add'>+	bcmasp_intr2_mask_set_all(priv);</div><div class='add'>+	bcmasp_intr2_clear_all(priv);</div><div class='add'>+</div><div class='add'>+	ret = devm_request_irq(&amp;pdev-&gt;dev, priv-&gt;irq, bcmasp_isr, 0,</div><div class='add'>+			       pdev-&gt;name, priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(dev, ret, "failed to request ASP interrupt: %d", ret);</div><div class='add'>+</div><div class='add'>+	/* Register mdio child nodes */</div><div class='add'>+	of_platform_populate(dev-&gt;of_node, bcmasp_mdio_of_match, NULL, dev);</div><div class='add'>+</div><div class='add'>+	/* ASP specific initialization, Needs to be done regardless of</div><div class='add'>+	 * how many interfaces come up.</div><div class='add'>+	 */</div><div class='add'>+	bcmasp_core_init(priv);</div><div class='add'>+</div><div class='add'>+	priv-&gt;mda_filters = devm_kcalloc(dev, priv-&gt;num_mda_filters,</div><div class='add'>+					 sizeof(*priv-&gt;mda_filters), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;mda_filters)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	priv-&gt;net_filters = devm_kcalloc(dev, priv-&gt;num_net_filters,</div><div class='add'>+					 sizeof(*priv-&gt;net_filters), GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;net_filters)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bcmasp_core_init_filters(priv);</div><div class='add'>+</div><div class='add'>+	ports_node = of_find_node_by_name(dev-&gt;of_node, "ethernet-ports");</div><div class='add'>+	if (!ports_node) {</div><div class='add'>+		dev_warn(dev, "No ports found\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	for_each_available_child_of_node_scoped(ports_node, intf_node) {</div><div class='add'>+		intf = bcmasp_interface_create(priv, intf_node, i);</div><div class='add'>+		if (!intf) {</div><div class='add'>+			dev_err(dev, "Cannot create eth interface %d\n", i);</div><div class='add'>+			bcmasp_remove_intfs(priv);</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto of_put_exit;</div><div class='add'>+		}</div><div class='add'>+		list_add_tail(&amp;intf-&gt;list, &amp;priv-&gt;intfs);</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check and enable WoL */</div><div class='add'>+	bcmasp_init_wol(priv);</div><div class='add'>+</div><div class='add'>+	/* Drop the clock reference count now and let ndo_open()/ndo_close()</div><div class='add'>+	 * manage it for us from now on.</div><div class='add'>+	 */</div><div class='add'>+	bcmasp_core_clock_set(priv, 0, ASP_CTRL_CLOCK_CTRL_ASP_ALL_DISABLE);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	/* Now do the registration of the network ports which will take care</div><div class='add'>+	 * of managing the clock properly.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_entry(intf, &amp;priv-&gt;intfs, list) {</div><div class='add'>+		ret = register_netdev(intf-&gt;ndev);</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(intf-&gt;ndev,</div><div class='add'>+				   "failed to register net_device: %d\n", ret);</div><div class='add'>+			bcmasp_wol_irq_destroy(priv);</div><div class='add'>+			bcmasp_remove_intfs(priv);</div><div class='add'>+			goto of_put_exit;</div><div class='add'>+		}</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "Initialized %d port(s)\n", count);</div><div class='add'>+</div><div class='add'>+of_put_exit:</div><div class='add'>+	of_node_put(ports_node);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+	if (!priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bcmasp_wol_irq_destroy(priv);</div><div class='add'>+	bcmasp_remove_intfs(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	bcmasp_remove(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused bcmasp_suspend(struct device *d)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = dev_get_drvdata(d);</div><div class='add'>+	struct bcmasp_intf *intf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(intf, &amp;priv-&gt;intfs, list) {</div><div class='add'>+		ret = bcmasp_interface_suspend(intf);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Whether Wake-on-LAN is enabled or not, we can always disable</div><div class='add'>+	 * the shared TX clock</div><div class='add'>+	 */</div><div class='add'>+	bcmasp_core_clock_set(priv, 0, ASP_CTRL_CLOCK_CTRL_ASP_TX_DISABLE);</div><div class='add'>+</div><div class='add'>+	priv-&gt;core_clock_select(priv, true);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __maybe_unused bcmasp_resume(struct device *d)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_priv *priv = dev_get_drvdata(d);</div><div class='add'>+	struct bcmasp_intf *intf;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Switch to the main clock domain */</div><div class='add'>+	priv-&gt;core_clock_select(priv, false);</div><div class='add'>+</div><div class='add'>+	/* Re-enable all clocks for re-initialization */</div><div class='add'>+	bcmasp_core_clock_set(priv, ASP_CTRL_CLOCK_CTRL_ASP_ALL_DISABLE, 0);</div><div class='add'>+</div><div class='add'>+	bcmasp_core_init(priv);</div><div class='add'>+	bcmasp_core_init_filters(priv);</div><div class='add'>+</div><div class='add'>+	/* And disable them to let the network devices take care of them */</div><div class='add'>+	bcmasp_core_clock_set(priv, 0, ASP_CTRL_CLOCK_CTRL_ASP_ALL_DISABLE);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(intf, &amp;priv-&gt;intfs, list) {</div><div class='add'>+		ret = bcmasp_interface_resume(intf);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(bcmasp_pm_ops,</div><div class='add'>+			 bcmasp_suspend, bcmasp_resume);</div><div class='add'>+</div><div class='add'>+static struct platform_driver bcmasp_driver = {</div><div class='add'>+	.probe = bcmasp_probe,</div><div class='add'>+	.remove = bcmasp_remove,</div><div class='add'>+	.shutdown = bcmasp_shutdown,</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "brcm,asp-v2",</div><div class='add'>+		.of_match_table = bcmasp_of_match,</div><div class='add'>+		.pm = &amp;bcmasp_pm_ops,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+module_platform_driver(bcmasp_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Broadcom ASP 2.0 Ethernet controller driver");</div><div class='add'>+MODULE_ALIAS("platform:brcm,asp-v2");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.h b/drivers/net/ethernet/broadcom/asp2/bcmasp.h<br/>new file mode 100644<br/>index 000000000000..74adfdb50e11<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/asp2/bcmasp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/asp2/bcmasp.h</a></div><div class='hunk'>@@ -0,0 +1,600 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __BCMASP_H</div><div class='add'>+#define __BCMASP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-hi-lo.h&gt;</div><div class='add'>+#include &lt;uapi/linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#define ASP_INTR2_OFFSET			0x1000</div><div class='add'>+#define  ASP_INTR2_STATUS			0x0</div><div class='add'>+#define  ASP_INTR2_SET				0x4</div><div class='add'>+#define  ASP_INTR2_CLEAR			0x8</div><div class='add'>+#define  ASP_INTR2_MASK_STATUS			0xc</div><div class='add'>+#define  ASP_INTR2_MASK_SET			0x10</div><div class='add'>+#define  ASP_INTR2_MASK_CLEAR			0x14</div><div class='add'>+</div><div class='add'>+#define ASP_INTR2_RX_ECH(intr)			BIT(intr)</div><div class='add'>+#define ASP_INTR2_TX_DESC(intr)			BIT((intr) + 14)</div><div class='add'>+#define ASP_INTR2_UMC0_WAKE			BIT(22)</div><div class='add'>+#define ASP_INTR2_UMC1_WAKE			BIT(28)</div><div class='add'>+#define ASP_INTR2_PHY_EVENT(intr)		((intr) ? BIT(30) | BIT(31) : \</div><div class='add'>+						BIT(24) | BIT(25))</div><div class='add'>+</div><div class='add'>+#define ASP_WAKEUP_INTR2_OFFSET			0x1200</div><div class='add'>+#define  ASP_WAKEUP_INTR2_STATUS		0x0</div><div class='add'>+#define  ASP_WAKEUP_INTR2_SET			0x4</div><div class='add'>+#define  ASP_WAKEUP_INTR2_CLEAR			0x8</div><div class='add'>+#define  ASP_WAKEUP_INTR2_MASK_STATUS		0xc</div><div class='add'>+#define  ASP_WAKEUP_INTR2_MASK_SET		0x10</div><div class='add'>+#define  ASP_WAKEUP_INTR2_MASK_CLEAR		0x14</div><div class='add'>+#define ASP_WAKEUP_INTR2_MPD_0			BIT(0)</div><div class='add'>+#define ASP_WAKEUP_INTR2_MPD_1			BIT(1)</div><div class='add'>+#define ASP_WAKEUP_INTR2_FILT_0			BIT(2)</div><div class='add'>+#define ASP_WAKEUP_INTR2_FILT_1			BIT(3)</div><div class='add'>+#define ASP_WAKEUP_INTR2_FW			BIT(4)</div><div class='add'>+</div><div class='add'>+#define ASP_CTRL2_OFFSET			0x2000</div><div class='add'>+#define  ASP_CTRL2_CORE_CLOCK_SELECT		0x0</div><div class='add'>+#define   ASP_CTRL2_CORE_CLOCK_SELECT_MAIN	BIT(0)</div><div class='add'>+#define  ASP_CTRL2_CPU_CLOCK_SELECT		0x4</div><div class='add'>+#define   ASP_CTRL2_CPU_CLOCK_SELECT_MAIN	BIT(0)</div><div class='add'>+</div><div class='add'>+#define ASP_TX_ANALYTICS_OFFSET			0x4c000</div><div class='add'>+#define  ASP_TX_ANALYTICS_CTRL			0x0</div><div class='add'>+</div><div class='add'>+#define ASP_RX_ANALYTICS_OFFSET			0x98000</div><div class='add'>+#define  ASP_RX_ANALYTICS_CTRL			0x0</div><div class='add'>+</div><div class='add'>+#define ASP_RX_CTRL_OFFSET			0x9f000</div><div class='add'>+#define ASP_RX_CTRL_UMAC_0_FRAME_COUNT		0x8</div><div class='add'>+#define ASP_RX_CTRL_UMAC_1_FRAME_COUNT		0xc</div><div class='add'>+#define ASP_RX_CTRL_FB_0_FRAME_COUNT		0x14</div><div class='add'>+#define ASP_RX_CTRL_FB_1_FRAME_COUNT		0x18</div><div class='add'>+#define ASP_RX_CTRL_FB_8_FRAME_COUNT		0x1c</div><div class='add'>+#define ASP_RX_CTRL_FB_9_FRAME_COUNT		0x20</div><div class='add'>+#define ASP_RX_CTRL_FB_10_FRAME_COUNT		0x24</div><div class='add'>+#define ASP_RX_CTRL_FB_OUT_FRAME_COUNT		0x28</div><div class='add'>+#define ASP_RX_CTRL_FB_FILT_OUT_FRAME_COUNT	0x2c</div><div class='add'>+#define ASP_RX_CTRL_FLUSH			0x30</div><div class='add'>+#define  ASP_CTRL_UMAC0_FLUSH_MASK             (BIT(0) | BIT(12))</div><div class='add'>+#define  ASP_CTRL_UMAC1_FLUSH_MASK             (BIT(1) | BIT(13))</div><div class='add'>+#define  ASP_CTRL_SPB_FLUSH_MASK               (BIT(8) | BIT(20))</div><div class='add'>+#define ASP_RX_CTRL_FB_RX_FIFO_DEPTH		0x38</div><div class='add'>+</div><div class='add'>+#define ASP_RX_FILTER_OFFSET			0x80000</div><div class='add'>+#define  ASP_RX_FILTER_BLK_CTRL			0x0</div><div class='add'>+#define   ASP_RX_FILTER_OPUT_EN			BIT(0)</div><div class='add'>+#define   ASP_RX_FILTER_MDA_EN			BIT(1)</div><div class='add'>+#define   ASP_RX_FILTER_LNR_MD			BIT(2)</div><div class='add'>+#define   ASP_RX_FILTER_GEN_WK_EN		BIT(3)</div><div class='add'>+#define   ASP_RX_FILTER_GEN_WK_CLR		BIT(4)</div><div class='add'>+#define   ASP_RX_FILTER_NT_FLT_EN		BIT(5)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_CFG(sel)		(((sel) * 0x14) + 0x100)</div><div class='add'>+#define   ASP_RX_FILTER_MDA_CFG_EN_SHIFT	8</div><div class='add'>+#define   ASP_RX_FILTER_MDA_CFG_UMC_SEL(sel)	((sel) &gt; 1 ? BIT(17) : \</div><div class='add'>+						 BIT((sel) + 9))</div><div class='add'>+#define  ASP_RX_FILTER_MDA_PAT_H(sel)		(((sel) * 0x14) + 0x104)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_PAT_L(sel)		(((sel) * 0x14) + 0x108)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_MSK_H(sel)		(((sel) * 0x14) + 0x10c)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_MSK_L(sel)		(((sel) * 0x14) + 0x110)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_CFG(sel)		(((sel) * 0x14) + 0x100)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_PAT_H(sel)		(((sel) * 0x14) + 0x104)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_PAT_L(sel)		(((sel) * 0x14) + 0x108)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_MSK_H(sel)		(((sel) * 0x14) + 0x10c)</div><div class='add'>+#define  ASP_RX_FILTER_MDA_MSK_L(sel)		(((sel) * 0x14) + 0x110)</div><div class='add'>+#define  ASP_RX_FILTER_NET_CFG(sel)		(((sel) * 0xa04) + 0x400)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_CH(sel)		((sel) &lt;&lt; 0)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_EN		BIT(9)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_L2_EN		BIT(10)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_L3_EN		BIT(11)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_L4_EN		BIT(12)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_L3_FRM(sel)	((sel) &lt;&lt; 13)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_L4_FRM(sel)	((sel) &lt;&lt; 15)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_UMC(sel)	BIT((sel) + 19)</div><div class='add'>+#define   ASP_RX_FILTER_NET_CFG_DMA_EN		BIT(27)</div><div class='add'>+</div><div class='add'>+#define  ASP_RX_FILTER_NET_OFFSET_MAX		32</div><div class='add'>+#define  ASP_RX_FILTER_NET_PAT(sel, block, off) \</div><div class='add'>+		(((sel) * 0xa04) + ((block) * 0x200) + (off) + 0x600)</div><div class='add'>+#define  ASP_RX_FILTER_NET_MASK(sel, block, off) \</div><div class='add'>+		(((sel) * 0xa04) + ((block) * 0x200) + (off) + 0x700)</div><div class='add'>+</div><div class='add'>+#define  ASP_RX_FILTER_NET_OFFSET(sel)		(((sel) * 0xa04) + 0xe00)</div><div class='add'>+#define   ASP_RX_FILTER_NET_OFFSET_L2(val)	((val) &lt;&lt; 0)</div><div class='add'>+#define   ASP_RX_FILTER_NET_OFFSET_L3_0(val)	((val) &lt;&lt; 8)</div><div class='add'>+#define   ASP_RX_FILTER_NET_OFFSET_L3_1(val)	((val) &lt;&lt; 16)</div><div class='add'>+#define   ASP_RX_FILTER_NET_OFFSET_L4(val)	((val) &lt;&lt; 24)</div><div class='add'>+</div><div class='add'>+enum asp_rx_net_filter_block {</div><div class='add'>+	ASP_RX_FILTER_NET_L2 = 0,</div><div class='add'>+	ASP_RX_FILTER_NET_L3_0,</div><div class='add'>+	ASP_RX_FILTER_NET_L3_1,</div><div class='add'>+	ASP_RX_FILTER_NET_L4,</div><div class='add'>+	ASP_RX_FILTER_NET_BLOCK_MAX</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ASP_EDPKT_OFFSET			0x9c000</div><div class='add'>+#define  ASP_EDPKT_ENABLE			0x4</div><div class='add'>+#define   ASP_EDPKT_ENABLE_EN			BIT(0)</div><div class='add'>+#define  ASP_EDPKT_HDR_CFG			0xc</div><div class='add'>+#define   ASP_EDPKT_HDR_SZ_SHIFT		2</div><div class='add'>+#define   ASP_EDPKT_HDR_SZ_32			0</div><div class='add'>+#define   ASP_EDPKT_HDR_SZ_64			1</div><div class='add'>+#define   ASP_EDPKT_HDR_SZ_96			2</div><div class='add'>+#define   ASP_EDPKT_HDR_SZ_128			3</div><div class='add'>+#define ASP_EDPKT_BURST_BUF_PSCAL_TOUT		0x10</div><div class='add'>+#define ASP_EDPKT_BURST_BUF_WRITE_TOUT		0x14</div><div class='add'>+#define ASP_EDPKT_BURST_BUF_READ_TOUT		0x18</div><div class='add'>+#define ASP_EDPKT_RX_TS_COUNTER			0x38</div><div class='add'>+#define  ASP_EDPKT_ENDI				0x48</div><div class='add'>+#define   ASP_EDPKT_ENDI_DESC_SHIFT		8</div><div class='add'>+#define   ASP_EDPKT_ENDI_NO_BT_SWP		0</div><div class='add'>+#define   ASP_EDPKT_ENDI_BT_SWP_WD		1</div><div class='add'>+#define ASP_EDPKT_RX_PKT_CNT			0x138</div><div class='add'>+#define ASP_EDPKT_HDR_EXTR_CNT			0x13c</div><div class='add'>+#define ASP_EDPKT_HDR_OUT_CNT			0x140</div><div class='add'>+#define ASP_EDPKT_SPARE_REG			0x174</div><div class='add'>+#define  ASP_EDPKT_SPARE_REG_EPHY_LPI		BIT(4)</div><div class='add'>+#define  ASP_EDPKT_SPARE_REG_GPHY_LPI		BIT(3)</div><div class='add'>+</div><div class='add'>+#define ASP_CTRL_OFFSET				0x101000</div><div class='add'>+#define  ASP_CTRL_ASP_SW_INIT			0x04</div><div class='add'>+#define   ASP_CTRL_ASP_SW_INIT_ACPUSS_CORE	BIT(0)</div><div class='add'>+#define   ASP_CTRL_ASP_SW_INIT_ASP_TX		BIT(1)</div><div class='add'>+#define   ASP_CTRL_ASP_SW_INIT_AS_RX		BIT(2)</div><div class='add'>+#define   ASP_CTRL_ASP_SW_INIT_ASP_RGMII_UMAC0	BIT(3)</div><div class='add'>+#define   ASP_CTRL_ASP_SW_INIT_ASP_RGMII_UMAC1	BIT(4)</div><div class='add'>+#define   ASP_CTRL_ASP_SW_INIT_ASP_XMEMIF	BIT(5)</div><div class='add'>+#define  ASP_CTRL_CLOCK_CTRL			0x04</div><div class='add'>+#define   ASP_CTRL_CLOCK_CTRL_ASP_TX_DISABLE	BIT(0)</div><div class='add'>+#define   ASP_CTRL_CLOCK_CTRL_ASP_RX_DISABLE	BIT(1)</div><div class='add'>+#define   ASP_CTRL_CLOCK_CTRL_ASP_RGMII_SHIFT	2</div><div class='add'>+#define   ASP_CTRL_CLOCK_CTRL_ASP_RGMII_MASK	(0x7 &lt;&lt; ASP_CTRL_CLOCK_CTRL_ASP_RGMII_SHIFT)</div><div class='add'>+#define   ASP_CTRL_CLOCK_CTRL_ASP_RGMII_DIS(x)	BIT(ASP_CTRL_CLOCK_CTRL_ASP_RGMII_SHIFT + (x))</div><div class='add'>+#define   ASP_CTRL_CLOCK_CTRL_ASP_ALL_DISABLE	GENMASK(4, 0)</div><div class='add'>+#define  ASP_CTRL_CORE_CLOCK_SELECT		0x08</div><div class='add'>+#define   ASP_CTRL_CORE_CLOCK_SELECT_MAIN	BIT(0)</div><div class='add'>+#define  ASP_CTRL_SCRATCH_0			0x0c</div><div class='add'>+</div><div class='add'>+struct bcmasp_tx_cb {</div><div class='add'>+	struct sk_buff		*skb;</div><div class='add'>+	unsigned int		bytes_sent;</div><div class='add'>+	bool			last;</div><div class='add'>+</div><div class='add'>+	DEFINE_DMA_UNMAP_ADDR(dma_addr);</div><div class='add'>+	DEFINE_DMA_UNMAP_LEN(dma_len);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_res {</div><div class='add'>+	/* Per interface resources */</div><div class='add'>+	/* Port */</div><div class='add'>+	void __iomem		*umac;</div><div class='add'>+	void __iomem		*umac2fb;</div><div class='add'>+	void __iomem		*rgmii;</div><div class='add'>+</div><div class='add'>+	/* TX slowpath/configuration */</div><div class='add'>+	void __iomem		*tx_spb_ctrl;</div><div class='add'>+	void __iomem		*tx_spb_top;</div><div class='add'>+	void __iomem		*tx_epkt_core;</div><div class='add'>+	void __iomem		*tx_pause_ctrl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DESC_ADDR(x)		((x) &amp; GENMASK_ULL(39, 0))</div><div class='add'>+#define DESC_FLAGS(x)		((x) &amp; GENMASK_ULL(63, 40))</div><div class='add'>+</div><div class='add'>+struct bcmasp_desc {</div><div class='add'>+	u64		buf;</div><div class='add'>+	#define DESC_CHKSUM	BIT_ULL(40)</div><div class='add'>+	#define DESC_CRC_ERR	BIT_ULL(41)</div><div class='add'>+	#define DESC_RX_SYM_ERR	BIT_ULL(42)</div><div class='add'>+	#define DESC_NO_OCT_ALN BIT_ULL(43)</div><div class='add'>+	#define DESC_PKT_TRUC	BIT_ULL(44)</div><div class='add'>+	/*  39:0 (TX/RX) bits 0-39 of buf addr</div><div class='add'>+	 *    40 (RX) checksum</div><div class='add'>+	 *    41 (RX) crc_error</div><div class='add'>+	 *    42 (RX) rx_symbol_error</div><div class='add'>+	 *    43 (RX) non_octet_aligned</div><div class='add'>+	 *    44 (RX) pkt_truncated</div><div class='add'>+	 *    45 Reserved</div><div class='add'>+	 * 56:46 (RX) mac_filter_id</div><div class='add'>+	 * 60:57 (RX) rx_port_num (0-unicmac0, 1-unimac1)</div><div class='add'>+	 *    61 Reserved</div><div class='add'>+	 * 63:62 (TX) forward CRC, overwrite CRC</div><div class='add'>+	 */</div><div class='add'>+	u32		size;</div><div class='add'>+	u32		flags;</div><div class='add'>+	#define DESC_INT_EN     BIT(0)</div><div class='add'>+	#define DESC_SOF	BIT(1)</div><div class='add'>+	#define DESC_EOF	BIT(2)</div><div class='add'>+	#define DESC_EPKT_CMD   BIT(3)</div><div class='add'>+	#define DESC_SCRAM_ST   BIT(8)</div><div class='add'>+	#define DESC_SCRAM_END  BIT(9)</div><div class='add'>+	#define DESC_PCPP       BIT(10)</div><div class='add'>+	#define DESC_PPPP       BIT(11)</div><div class='add'>+	/*     0 (TX) tx_int_en</div><div class='add'>+	 *     1 (TX/RX) SOF</div><div class='add'>+	 *     2 (TX/RX) EOF</div><div class='add'>+	 *     3 (TX) epkt_command</div><div class='add'>+	 *   6:4 (TX) PA</div><div class='add'>+	 *     7 (TX) pause at desc end</div><div class='add'>+	 *     8 (TX) scram_start</div><div class='add'>+	 *     9 (TX) scram_end</div><div class='add'>+	 *    10 (TX) PCPP</div><div class='add'>+	 *    11 (TX) PPPP</div><div class='add'>+	 * 14:12 Reserved</div><div class='add'>+	 *    15 (TX) pid ch Valid</div><div class='add'>+	 * 19:16 (TX) data_pkt_type</div><div class='add'>+	 * 32:20 (TX) pid_channel (RX) nw_filter_id</div><div class='add'>+	 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_intf;</div><div class='add'>+</div><div class='add'>+struct bcmasp_intf_stats64 {</div><div class='add'>+	/* Rx Stats */</div><div class='add'>+	u64_stats_t	rx_packets;</div><div class='add'>+	u64_stats_t	rx_bytes;</div><div class='add'>+	u64_stats_t	rx_errors;</div><div class='add'>+	u64_stats_t	rx_dropped;</div><div class='add'>+	u64_stats_t	rx_crc_errs;</div><div class='add'>+	u64_stats_t	rx_sym_errs;</div><div class='add'>+</div><div class='add'>+	/* Tx Stats*/</div><div class='add'>+	u64_stats_t	tx_packets;</div><div class='add'>+	u64_stats_t	tx_bytes;</div><div class='add'>+</div><div class='add'>+	struct u64_stats_sync		syncp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_mib_counters {</div><div class='add'>+	u32	edpkt_ts;</div><div class='add'>+	u32	edpkt_rx_pkt_cnt;</div><div class='add'>+	u32	edpkt_hdr_ext_cnt;</div><div class='add'>+	u32	edpkt_hdr_out_cnt;</div><div class='add'>+	u32	umac_frm_cnt;</div><div class='add'>+	u32	fb_frm_cnt;</div><div class='add'>+	u32	fb_rx_fifo_depth;</div><div class='add'>+	u32	fb_out_frm_cnt;</div><div class='add'>+	u32	fb_filt_out_frm_cnt;</div><div class='add'>+	u32	alloc_rx_skb_failed;</div><div class='add'>+	u32	tx_dma_failed;</div><div class='add'>+	u32	mc_filters_full_cnt;</div><div class='add'>+	u32	uc_filters_full_cnt;</div><div class='add'>+	u32	filters_combine_cnt;</div><div class='add'>+	u32	promisc_filters_cnt;</div><div class='add'>+	u32	tx_realloc_offload_failed;</div><div class='add'>+	u32	tx_timeout_cnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_intf_ops {</div><div class='add'>+	unsigned long (*rx_desc_read)(struct bcmasp_intf *intf);</div><div class='add'>+	void (*rx_buffer_write)(struct bcmasp_intf *intf, dma_addr_t addr);</div><div class='add'>+	void (*rx_desc_write)(struct bcmasp_intf *intf, dma_addr_t addr);</div><div class='add'>+	unsigned long (*tx_read)(struct bcmasp_intf *intf);</div><div class='add'>+	void (*tx_write)(struct bcmasp_intf *intf, dma_addr_t addr);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_priv;</div><div class='add'>+</div><div class='add'>+struct bcmasp_intf {</div><div class='add'>+	struct list_head		list;</div><div class='add'>+	struct net_device		*ndev;</div><div class='add'>+	struct bcmasp_priv		*parent;</div><div class='add'>+</div><div class='add'>+	/* ASP Ch */</div><div class='add'>+	int				channel;</div><div class='add'>+	int				port;</div><div class='add'>+	const struct bcmasp_intf_ops	*ops;</div><div class='add'>+</div><div class='add'>+	/* Used for splitting shared resources */</div><div class='add'>+	int				index;</div><div class='add'>+</div><div class='add'>+	struct napi_struct		tx_napi;</div><div class='add'>+	/* TX ring, starts on a new cacheline boundary */</div><div class='add'>+	void __iomem			*tx_spb_dma;</div><div class='add'>+	int				tx_spb_index;</div><div class='add'>+	int				tx_spb_clean_index;</div><div class='add'>+	struct bcmasp_desc		*tx_spb_cpu;</div><div class='add'>+	dma_addr_t			tx_spb_dma_addr;</div><div class='add'>+	dma_addr_t			tx_spb_dma_valid;</div><div class='add'>+	dma_addr_t			tx_spb_dma_read;</div><div class='add'>+	struct bcmasp_tx_cb		*tx_cbs;</div><div class='add'>+</div><div class='add'>+	/* RX ring, starts on a new cacheline boundary */</div><div class='add'>+	void __iomem			*rx_edpkt_cfg;</div><div class='add'>+	void __iomem			*rx_edpkt_dma;</div><div class='add'>+	int				rx_edpkt_index;</div><div class='add'>+	int				rx_buf_order;</div><div class='add'>+	struct bcmasp_desc		*rx_edpkt_cpu;</div><div class='add'>+	dma_addr_t			rx_edpkt_dma_addr;</div><div class='add'>+	dma_addr_t			rx_edpkt_dma_read;</div><div class='add'>+	dma_addr_t			rx_edpkt_dma_valid;</div><div class='add'>+</div><div class='add'>+	/* RX buffer prefetcher ring*/</div><div class='add'>+	void				*rx_ring_cpu;</div><div class='add'>+	dma_addr_t			rx_ring_dma;</div><div class='add'>+	dma_addr_t			rx_ring_dma_valid;</div><div class='add'>+	struct napi_struct		rx_napi;</div><div class='add'>+</div><div class='add'>+	struct bcmasp_res		res;</div><div class='add'>+	unsigned int			crc_fwd;</div><div class='add'>+</div><div class='add'>+	/* PHY device */</div><div class='add'>+	struct device_node		*phy_dn;</div><div class='add'>+	struct device_node		*ndev_dn;</div><div class='add'>+	phy_interface_t			phy_interface;</div><div class='add'>+	bool				internal_phy;</div><div class='add'>+	int				old_pause;</div><div class='add'>+	int				old_link;</div><div class='add'>+	int				old_duplex;</div><div class='add'>+</div><div class='add'>+	u32				msg_enable;</div><div class='add'>+</div><div class='add'>+	/* Statistics */</div><div class='add'>+	struct bcmasp_intf_stats64	stats64;</div><div class='add'>+	struct bcmasp_mib_counters	mib;</div><div class='add'>+</div><div class='add'>+	u32				wolopts;</div><div class='add'>+	u8				sopass[SOPASS_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_NET_FILTERS				32</div><div class='add'>+struct bcmasp_net_filter {</div><div class='add'>+	struct ethtool_rx_flow_spec	fs;</div><div class='add'>+</div><div class='add'>+	bool				claimed;</div><div class='add'>+	bool				wake_filter;</div><div class='add'>+</div><div class='add'>+	int				port;</div><div class='add'>+	unsigned int			hw_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_MDA_FILTERS				32</div><div class='add'>+struct bcmasp_mda_filter {</div><div class='add'>+	/* Current owner of this filter */</div><div class='add'>+	int		port;</div><div class='add'>+	bool		en;</div><div class='add'>+	u8		addr[ETH_ALEN];</div><div class='add'>+	u8		mask[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_plat_data {</div><div class='add'>+	void (*core_clock_select)(struct bcmasp_priv *priv, bool slow);</div><div class='add'>+	void (*eee_fixup)(struct bcmasp_intf *priv, bool en);</div><div class='add'>+	unsigned int num_mda_filters;</div><div class='add'>+	unsigned int num_net_filters;</div><div class='add'>+	unsigned int tx_chan_offset;</div><div class='add'>+	unsigned int rx_ctrl_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_priv {</div><div class='add'>+	struct platform_device		*pdev;</div><div class='add'>+	struct clk			*clk;</div><div class='add'>+</div><div class='add'>+	int				irq;</div><div class='add'>+	u32				irq_mask;</div><div class='add'>+</div><div class='add'>+	/* Used if shared wol irq */</div><div class='add'>+	struct mutex			wol_lock;</div><div class='add'>+	int				wol_irq;</div><div class='add'>+	unsigned long			wol_irq_enabled_mask;</div><div class='add'>+</div><div class='add'>+	void (*core_clock_select)(struct bcmasp_priv *priv, bool slow);</div><div class='add'>+	void (*eee_fixup)(struct bcmasp_intf *intf, bool en);</div><div class='add'>+	unsigned int			num_mda_filters;</div><div class='add'>+	unsigned int			num_net_filters;</div><div class='add'>+	unsigned int			tx_chan_offset;</div><div class='add'>+	unsigned int			rx_ctrl_offset;</div><div class='add'>+</div><div class='add'>+	void __iomem			*base;</div><div class='add'>+</div><div class='add'>+	struct list_head		intfs;</div><div class='add'>+</div><div class='add'>+	struct bcmasp_mda_filter	*mda_filters;</div><div class='add'>+</div><div class='add'>+	/* MAC destination address filters lock */</div><div class='add'>+	spinlock_t			mda_lock;</div><div class='add'>+</div><div class='add'>+	/* Protects accesses to ASP_CTRL_CLOCK_CTRL */</div><div class='add'>+	spinlock_t			clk_lock;</div><div class='add'>+</div><div class='add'>+	struct bcmasp_net_filter	*net_filters;</div><div class='add'>+</div><div class='add'>+	/* Network filter lock */</div><div class='add'>+	struct mutex			net_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline unsigned long bcmasp_intf_rx_desc_read(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	return intf-&gt;ops-&gt;rx_desc_read(intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bcmasp_intf_rx_buffer_write(struct bcmasp_intf *intf,</div><div class='add'>+					       dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	intf-&gt;ops-&gt;rx_buffer_write(intf, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bcmasp_intf_rx_desc_write(struct bcmasp_intf *intf,</div><div class='add'>+					     dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	intf-&gt;ops-&gt;rx_desc_write(intf, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned long bcmasp_intf_tx_read(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	return intf-&gt;ops-&gt;tx_read(intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bcmasp_intf_tx_write(struct bcmasp_intf *intf,</div><div class='add'>+					dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	intf-&gt;ops-&gt;tx_write(intf, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define __BCMASP_IO_MACRO(name, m)					\</div><div class='add'>+static inline u32 name##_rl(struct bcmasp_intf *intf, u32 off)		\</div><div class='add'>+{									\</div><div class='add'>+	u32 reg = readl_relaxed(intf-&gt;m + off);				\</div><div class='add'>+	return reg;							\</div><div class='add'>+}									\</div><div class='add'>+static inline void name##_wl(struct bcmasp_intf *intf, u32 val, u32 off)\</div><div class='add'>+{									\</div><div class='add'>+	writel_relaxed(val, intf-&gt;m + off);				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BCMASP_IO_MACRO(name)		__BCMASP_IO_MACRO(name, res.name)</div><div class='add'>+#define BCMASP_FP_IO_MACRO(name)	__BCMASP_IO_MACRO(name, name)</div><div class='add'>+</div><div class='add'>+BCMASP_IO_MACRO(umac);</div><div class='add'>+BCMASP_IO_MACRO(umac2fb);</div><div class='add'>+BCMASP_IO_MACRO(rgmii);</div><div class='add'>+BCMASP_FP_IO_MACRO(tx_spb_dma);</div><div class='add'>+BCMASP_IO_MACRO(tx_spb_ctrl);</div><div class='add'>+BCMASP_IO_MACRO(tx_spb_top);</div><div class='add'>+BCMASP_IO_MACRO(tx_epkt_core);</div><div class='add'>+BCMASP_IO_MACRO(tx_pause_ctrl);</div><div class='add'>+BCMASP_FP_IO_MACRO(rx_edpkt_dma);</div><div class='add'>+BCMASP_FP_IO_MACRO(rx_edpkt_cfg);</div><div class='add'>+</div><div class='add'>+#define __BCMASP_FP_IO_MACRO_Q(name, m)					\</div><div class='add'>+static inline u64 name##_rq(struct bcmasp_intf *intf, u32 off)		\</div><div class='add'>+{									\</div><div class='add'>+	u64 reg = readq_relaxed(intf-&gt;m + off);				\</div><div class='add'>+	return reg;							\</div><div class='add'>+}									\</div><div class='add'>+static inline void name##_wq(struct bcmasp_intf *intf, u64 val, u32 off)\</div><div class='add'>+{									\</div><div class='add'>+	writeq_relaxed(val, intf-&gt;m + off);				\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BCMASP_FP_IO_MACRO_Q(name)	__BCMASP_FP_IO_MACRO_Q(name, name)</div><div class='add'>+</div><div class='add'>+BCMASP_FP_IO_MACRO_Q(tx_spb_dma);</div><div class='add'>+BCMASP_FP_IO_MACRO_Q(rx_edpkt_dma);</div><div class='add'>+BCMASP_FP_IO_MACRO_Q(rx_edpkt_cfg);</div><div class='add'>+</div><div class='add'>+#define PKT_OFFLOAD_NOP			(0 &lt;&lt; 28)</div><div class='add'>+#define PKT_OFFLOAD_HDR_OP		(1 &lt;&lt; 28)</div><div class='add'>+#define  PKT_OFFLOAD_HDR_WRBACK		BIT(19)</div><div class='add'>+#define  PKT_OFFLOAD_HDR_COUNT(x)	((x) &lt;&lt; 16)</div><div class='add'>+#define  PKT_OFFLOAD_HDR_SIZE_1(x)	((x) &lt;&lt; 4)</div><div class='add'>+#define  PKT_OFFLOAD_HDR_SIZE_2(x)	(x)</div><div class='add'>+#define  PKT_OFFLOAD_HDR2_SIZE_2(x)	((x) &lt;&lt; 24)</div><div class='add'>+#define  PKT_OFFLOAD_HDR2_SIZE_3(x)	((x) &lt;&lt; 12)</div><div class='add'>+#define  PKT_OFFLOAD_HDR2_SIZE_4(x)	(x)</div><div class='add'>+#define PKT_OFFLOAD_EPKT_OP		(2 &lt;&lt; 28)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_WRBACK	BIT(23)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_IP(x)		((x) &lt;&lt; 21)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_TP(x)		((x) &lt;&lt; 19)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_LEN(x)	((x) &lt;&lt; 16)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_CSUM_L4	BIT(15)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_CSUM_L3	BIT(14)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_ID(x)		((x) &lt;&lt; 12)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_SEQ(x)	((x) &lt;&lt; 10)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_TS(x)		((x) &lt;&lt; 8)</div><div class='add'>+#define  PKT_OFFLOAD_EPKT_BLOC(x)	(x)</div><div class='add'>+#define PKT_OFFLOAD_END_OP		(7 &lt;&lt; 28)</div><div class='add'>+</div><div class='add'>+struct bcmasp_pkt_offload {</div><div class='add'>+	__be32		nop;</div><div class='add'>+	__be32		header;</div><div class='add'>+	__be32		header2;</div><div class='add'>+	__be32		epkt;</div><div class='add'>+	__be32		end;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BCMASP_CORE_IO_MACRO(name, offset)				\</div><div class='add'>+static inline u32 name##_core_rl(struct bcmasp_priv *priv,		\</div><div class='add'>+				 u32 off)				\</div><div class='add'>+{									\</div><div class='add'>+	u32 reg = readl_relaxed(priv-&gt;base + (offset) + off);		\</div><div class='add'>+	return reg;							\</div><div class='add'>+}									\</div><div class='add'>+static inline void name##_core_wl(struct bcmasp_priv *priv,		\</div><div class='add'>+				  u32 val, u32 off)			\</div><div class='add'>+{									\</div><div class='add'>+	writel_relaxed(val, priv-&gt;base + (offset) + off);		\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BCMASP_CORE_IO_MACRO(intr2, ASP_INTR2_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(wakeup_intr2, ASP_WAKEUP_INTR2_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(tx_analytics, ASP_TX_ANALYTICS_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(rx_analytics, ASP_RX_ANALYTICS_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(rx_filter, ASP_RX_FILTER_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(rx_edpkt, ASP_EDPKT_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(ctrl, ASP_CTRL_OFFSET);</div><div class='add'>+BCMASP_CORE_IO_MACRO(ctrl2, ASP_CTRL2_OFFSET);</div><div class='add'>+</div><div class='add'>+#define BCMASP_CORE_IO_MACRO_OFFSET(name, offset)			\</div><div class='add'>+static inline u32 name##_core_rl(struct bcmasp_priv *priv,		\</div><div class='add'>+				 u32 off)				\</div><div class='add'>+{									\</div><div class='add'>+	u32 reg = readl_relaxed(priv-&gt;base + priv-&gt;name##_offset +	\</div><div class='add'>+				(offset) + off);			\</div><div class='add'>+	return reg;							\</div><div class='add'>+}									\</div><div class='add'>+static inline void name##_core_wl(struct bcmasp_priv *priv,		\</div><div class='add'>+				  u32 val, u32 off)			\</div><div class='add'>+{									\</div><div class='add'>+	writel_relaxed(val, priv-&gt;base + priv-&gt;name##_offset +		\</div><div class='add'>+		       (offset) + off);					\</div><div class='add'>+}</div><div class='add'>+BCMASP_CORE_IO_MACRO_OFFSET(rx_ctrl, ASP_RX_CTRL_OFFSET);</div><div class='add'>+</div><div class='add'>+struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,</div><div class='add'>+					    struct device_node *ndev_dn, int i);</div><div class='add'>+</div><div class='add'>+void bcmasp_interface_destroy(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_tx_irq(struct bcmasp_intf *intf, int en);</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_rx_irq(struct bcmasp_intf *intf, int en);</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_phy_irq(struct bcmasp_intf *intf, int en);</div><div class='add'>+</div><div class='add'>+void bcmasp_flush_rx_port(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_ops bcmasp_ethtool_ops;</div><div class='add'>+</div><div class='add'>+int bcmasp_interface_suspend(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+int bcmasp_interface_resume(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+void bcmasp_set_promisc(struct bcmasp_intf *intf, bool en);</div><div class='add'>+</div><div class='add'>+void bcmasp_set_allmulti(struct bcmasp_intf *intf, bool en);</div><div class='add'>+</div><div class='add'>+void bcmasp_set_broad(struct bcmasp_intf *intf, bool en);</div><div class='add'>+</div><div class='add'>+void bcmasp_set_oaddr(struct bcmasp_intf *intf, const unsigned char *addr,</div><div class='add'>+		      bool en);</div><div class='add'>+</div><div class='add'>+int bcmasp_set_en_mda_filter(struct bcmasp_intf *intf, unsigned char *addr,</div><div class='add'>+			     unsigned char *mask);</div><div class='add'>+</div><div class='add'>+void bcmasp_disable_all_filters(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+void bcmasp_core_clock_set_intf(struct bcmasp_intf *intf, bool en);</div><div class='add'>+</div><div class='add'>+struct bcmasp_net_filter *bcmasp_netfilt_get_init(struct bcmasp_intf *intf,</div><div class='add'>+						  u32 loc, bool wake_filter,</div><div class='add'>+						  bool init);</div><div class='add'>+</div><div class='add'>+bool bcmasp_netfilt_check_dup(struct bcmasp_intf *intf,</div><div class='add'>+			      struct ethtool_rx_flow_spec *fs);</div><div class='add'>+</div><div class='add'>+void bcmasp_netfilt_release(struct bcmasp_intf *intf,</div><div class='add'>+			    struct bcmasp_net_filter *nfilt);</div><div class='add'>+</div><div class='add'>+int bcmasp_netfilt_get_active(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+int bcmasp_netfilt_get_all_active(struct bcmasp_intf *intf, u32 *rule_locs,</div><div class='add'>+				  u32 *rule_cnt);</div><div class='add'>+</div><div class='add'>+void bcmasp_netfilt_suspend(struct bcmasp_intf *intf);</div><div class='add'>+</div><div class='add'>+void bcmasp_enable_wol(struct bcmasp_intf *intf, bool en);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c<br/>new file mode 100644<br/>index 000000000000..dd80ccfca19d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,464 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#define pr_fmt(fmt)				"bcmasp_ethtool: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bcmasp.h"</div><div class='add'>+#include "bcmasp_intf_defs.h"</div><div class='add'>+</div><div class='add'>+enum bcmasp_stat_type {</div><div class='add'>+	BCMASP_STAT_RX_CTRL,</div><div class='add'>+	BCMASP_STAT_RX_CTRL_PER_INTF,</div><div class='add'>+	BCMASP_STAT_SOFT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmasp_stats {</div><div class='add'>+	char stat_string[ETH_GSTRING_LEN];</div><div class='add'>+	enum bcmasp_stat_type type;</div><div class='add'>+	u32 reg_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define STAT_BCMASP_SOFT_MIB(str) { \</div><div class='add'>+	.stat_string = str, \</div><div class='add'>+	.type = BCMASP_STAT_SOFT, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define STAT_BCMASP_OFFSET(str, _type, offset) { \</div><div class='add'>+	.stat_string = str, \</div><div class='add'>+	.type = _type, \</div><div class='add'>+	.reg_offset = offset, \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define STAT_BCMASP_RX_CTRL(str, offset) \</div><div class='add'>+	STAT_BCMASP_OFFSET(str, BCMASP_STAT_RX_CTRL, offset)</div><div class='add'>+#define STAT_BCMASP_RX_CTRL_PER_INTF(str, offset) \</div><div class='add'>+	STAT_BCMASP_OFFSET(str, BCMASP_STAT_RX_CTRL_PER_INTF, offset)</div><div class='add'>+</div><div class='add'>+/* Must match the order of struct bcmasp_mib_counters */</div><div class='add'>+static const struct bcmasp_stats bcmasp_gstrings_stats[] = {</div><div class='add'>+	/* ASP RX control */</div><div class='add'>+	STAT_BCMASP_RX_CTRL_PER_INTF("Frames From Unimac",</div><div class='add'>+				     ASP_RX_CTRL_UMAC_0_FRAME_COUNT),</div><div class='add'>+	STAT_BCMASP_RX_CTRL_PER_INTF("Frames From Port",</div><div class='add'>+				     ASP_RX_CTRL_FB_0_FRAME_COUNT),</div><div class='add'>+	STAT_BCMASP_RX_CTRL_PER_INTF("RX Buffer FIFO Depth",</div><div class='add'>+				     ASP_RX_CTRL_FB_RX_FIFO_DEPTH),</div><div class='add'>+	STAT_BCMASP_RX_CTRL("Frames Out(Buffer)",</div><div class='add'>+			    ASP_RX_CTRL_FB_OUT_FRAME_COUNT),</div><div class='add'>+	STAT_BCMASP_RX_CTRL("Frames Out(Filters)",</div><div class='add'>+			    ASP_RX_CTRL_FB_FILT_OUT_FRAME_COUNT),</div><div class='add'>+	/* Software maintained statistics */</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("RX SKB Alloc Failed"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("TX DMA Failed"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("Multicast Filters Full"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("Unicast Filters Full"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("MDA Filters Combined"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("Promisc Filter Set"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("TX Realloc For Offload Failed"),</div><div class='add'>+	STAT_BCMASP_SOFT_MIB("Tx Timeout Count"),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BCMASP_STATS_LEN	ARRAY_SIZE(bcmasp_gstrings_stats)</div><div class='add'>+</div><div class='add'>+static int bcmasp_get_sset_count(struct net_device *dev, int string_set)</div><div class='add'>+{</div><div class='add'>+	switch (string_set) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return BCMASP_STATS_LEN;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_strings(struct net_device *dev, u32 stringset,</div><div class='add'>+			       u8 *data)</div><div class='add'>+{</div><div class='add'>+	const char *str;</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		for (i = 0; i &lt; BCMASP_STATS_LEN; i++) {</div><div class='add'>+			str = bcmasp_gstrings_stats[i].stat_string;</div><div class='add'>+			ethtool_puts(&amp;data, str);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_update_mib_counters(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	unsigned int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BCMASP_STATS_LEN; i++) {</div><div class='add'>+		const struct bcmasp_stats *s;</div><div class='add'>+		u32 offset, val;</div><div class='add'>+		char *p;</div><div class='add'>+</div><div class='add'>+		s = &amp;bcmasp_gstrings_stats[i];</div><div class='add'>+		offset = s-&gt;reg_offset;</div><div class='add'>+		switch (s-&gt;type) {</div><div class='add'>+		case BCMASP_STAT_SOFT:</div><div class='add'>+			continue;</div><div class='add'>+		case BCMASP_STAT_RX_CTRL:</div><div class='add'>+			val = rx_ctrl_core_rl(intf-&gt;parent, offset);</div><div class='add'>+			break;</div><div class='add'>+		case BCMASP_STAT_RX_CTRL_PER_INTF:</div><div class='add'>+			offset += sizeof(u32) * intf-&gt;port;</div><div class='add'>+			val = rx_ctrl_core_rl(intf-&gt;parent, offset);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		p = (char *)(&amp;intf-&gt;mib) + (i * sizeof(u32));</div><div class='add'>+		put_unaligned(val, (u32 *)p);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_ethtool_stats(struct net_device *dev,</div><div class='add'>+				     struct ethtool_stats *stats,</div><div class='add'>+				     u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	unsigned int i;</div><div class='add'>+	char *p;</div><div class='add'>+</div><div class='add'>+	if (netif_running(dev))</div><div class='add'>+		bcmasp_update_mib_counters(intf);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BCMASP_STATS_LEN; i++) {</div><div class='add'>+		p = (char *)(&amp;intf-&gt;mib) + (i * sizeof(u32));</div><div class='add'>+		data[i] = *(u32 *)p;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_drvinfo(struct net_device *dev,</div><div class='add'>+			       struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	strscpy(info-&gt;driver, "bcmasp", sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(dev-&gt;dev.parent),</div><div class='add'>+		sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bcmasp_get_msglevel(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return intf-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_set_msglevel(struct net_device *dev, u32 level)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	intf-&gt;msg_enable = level;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BCMASP_SUPPORTED_WAKE   (WAKE_MAGIC | WAKE_MAGICSECURE | WAKE_FILTER)</div><div class='add'>+static void bcmasp_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	u32 phy_wolopts = 0;</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;phydev) {</div><div class='add'>+		phy_ethtool_get_wol(dev-&gt;phydev, wol);</div><div class='add'>+		phy_wolopts = wol-&gt;wolopts;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* MAC is not wake-up capable, return what the PHY does */</div><div class='add'>+	if (!device_can_wakeup(kdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Overlay MAC capabilities with that of the PHY queried before */</div><div class='add'>+	wol-&gt;supported |= BCMASP_SUPPORTED_WAKE;</div><div class='add'>+	wol-&gt;wolopts |= intf-&gt;wolopts;</div><div class='add'>+</div><div class='add'>+	/* Return the PHY configured magic password */</div><div class='add'>+	if (phy_wolopts &amp; WAKE_MAGICSECURE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memset(wol-&gt;sopass, 0, sizeof(wol-&gt;sopass));</div><div class='add'>+</div><div class='add'>+	/* Otherwise the MAC one */</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGICSECURE)</div><div class='add'>+		memcpy(wol-&gt;sopass, intf-&gt;sopass, sizeof(intf-&gt;sopass));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct bcmasp_priv *priv = intf-&gt;parent;</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	/* Try Wake-on-LAN from the PHY first */</div><div class='add'>+	if (dev-&gt;phydev) {</div><div class='add'>+		ret = phy_ethtool_set_wol(dev-&gt;phydev, wol);</div><div class='add'>+		if (ret != -EOPNOTSUPP &amp;&amp; wol-&gt;wolopts)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!device_can_wakeup(kdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~BCMASP_SUPPORTED_WAKE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Interface Specific */</div><div class='add'>+	intf-&gt;wolopts = wol-&gt;wolopts;</div><div class='add'>+	if (intf-&gt;wolopts &amp; WAKE_MAGICSECURE)</div><div class='add'>+		memcpy(intf-&gt;sopass, wol-&gt;sopass, sizeof(wol-&gt;sopass));</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;wol_lock);</div><div class='add'>+	bcmasp_enable_wol(intf, !!intf-&gt;wolopts);</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;wol_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_flow_insert(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct bcmasp_net_filter *nfilter;</div><div class='add'>+	u32 loc = cmd-&gt;fs.location;</div><div class='add'>+	bool wake = false;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.ring_cookie == RX_CLS_FLOW_WAKE)</div><div class='add'>+		wake = true;</div><div class='add'>+</div><div class='add'>+	/* Currently only supports WAKE filters */</div><div class='add'>+	if (!wake)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;fs.flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT)) {</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+	case IP_USER_FLOW:</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if filter already exists */</div><div class='add'>+	if (bcmasp_netfilt_check_dup(intf, &amp;cmd-&gt;fs))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	nfilter = bcmasp_netfilt_get_init(intf, loc, wake, true);</div><div class='add'>+	if (IS_ERR(nfilter))</div><div class='add'>+		return PTR_ERR(nfilter);</div><div class='add'>+</div><div class='add'>+	/* Return the location where we did insert the filter */</div><div class='add'>+	cmd-&gt;fs.location = nfilter-&gt;hw_index;</div><div class='add'>+	memcpy(&amp;nfilter-&gt;fs, &amp;cmd-&gt;fs, sizeof(struct ethtool_rx_flow_spec));</div><div class='add'>+</div><div class='add'>+	/* Since we only support wake filters, defer register programming till</div><div class='add'>+	 * suspend time.</div><div class='add'>+	 */</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_flow_delete(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct bcmasp_net_filter *nfilter;</div><div class='add'>+</div><div class='add'>+	nfilter = bcmasp_netfilt_get_init(intf, cmd-&gt;fs.location, false, false);</div><div class='add'>+	if (IS_ERR(nfilter))</div><div class='add'>+		return PTR_ERR(nfilter);</div><div class='add'>+</div><div class='add'>+	bcmasp_netfilt_release(intf, nfilter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_flow_get(struct bcmasp_intf *intf, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_net_filter *nfilter;</div><div class='add'>+</div><div class='add'>+	nfilter = bcmasp_netfilt_get_init(intf, cmd-&gt;fs.location, false, false);</div><div class='add'>+	if (IS_ERR(nfilter))</div><div class='add'>+		return PTR_ERR(nfilter);</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;cmd-&gt;fs, &amp;nfilter-&gt;fs, sizeof(nfilter-&gt;fs));</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data = intf-&gt;parent-&gt;num_net_filters;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intf-&gt;parent-&gt;net_lock);</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		ret = bcmasp_flow_insert(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		ret = bcmasp_flow_delete(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intf-&gt;parent-&gt;net_lock);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='add'>+			    u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;intf-&gt;parent-&gt;net_lock);</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		cmd-&gt;rule_cnt = bcmasp_netfilt_get_active(intf);</div><div class='add'>+		/* We support specifying rule locations */</div><div class='add'>+		cmd-&gt;data |= RX_CLS_LOC_SPECIAL;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		err = bcmasp_flow_get(intf, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		err = bcmasp_netfilt_get_all_active(intf, rule_locs, &amp;cmd-&gt;rule_cnt);</div><div class='add'>+		cmd-&gt;data = intf-&gt;parent-&gt;num_net_filters;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;intf-&gt;parent-&gt;net_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_get_eee(struct net_device *dev, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;phydev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return phy_ethtool_get_eee(dev-&gt;phydev, e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_set_eee(struct net_device *dev, struct ethtool_keee *e)</div><div class='add'>+{</div><div class='add'>+	if (!dev-&gt;phydev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	return phy_ethtool_set_eee(dev-&gt;phydev, e);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_eth_mac_stats(struct net_device *dev,</div><div class='add'>+				     struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK = umac_rl(intf, UMC_GTPOK);</div><div class='add'>+	mac_stats-&gt;SingleCollisionFrames = umac_rl(intf, UMC_GTSCL);</div><div class='add'>+	mac_stats-&gt;MultipleCollisionFrames = umac_rl(intf, UMC_GTMCL);</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK = umac_rl(intf, UMC_GRPOK);</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors = umac_rl(intf, UMC_GRFCS);</div><div class='add'>+	mac_stats-&gt;AlignmentErrors = umac_rl(intf, UMC_GRALN);</div><div class='add'>+	mac_stats-&gt;OctetsTransmittedOK = umac_rl(intf, UMC_GTBYT);</div><div class='add'>+	mac_stats-&gt;FramesWithDeferredXmissions = umac_rl(intf, UMC_GTDRF);</div><div class='add'>+	mac_stats-&gt;LateCollisions = umac_rl(intf, UMC_GTLCL);</div><div class='add'>+	mac_stats-&gt;FramesAbortedDueToXSColls = umac_rl(intf, UMC_GTXCL);</div><div class='add'>+	mac_stats-&gt;OctetsReceivedOK = umac_rl(intf, UMC_GRBYT);</div><div class='add'>+	mac_stats-&gt;MulticastFramesXmittedOK = umac_rl(intf, UMC_GTMCA);</div><div class='add'>+	mac_stats-&gt;BroadcastFramesXmittedOK = umac_rl(intf, UMC_GTBCA);</div><div class='add'>+	mac_stats-&gt;FramesWithExcessiveDeferral = umac_rl(intf, UMC_GTEDF);</div><div class='add'>+	mac_stats-&gt;MulticastFramesReceivedOK = umac_rl(intf, UMC_GRMCA);</div><div class='add'>+	mac_stats-&gt;BroadcastFramesReceivedOK = umac_rl(intf, UMC_GRBCA);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range bcmasp_rmon_ranges[] = {</div><div class='add'>+	{    0,   64},</div><div class='add'>+	{   65,  127},</div><div class='add'>+	{  128,  255},</div><div class='add'>+	{  256,  511},</div><div class='add'>+	{  512, 1023},</div><div class='add'>+	{ 1024, 1518},</div><div class='add'>+	{ 1519, 1522},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_rmon_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				  const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	*ranges = bcmasp_rmon_ranges;</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;undersize_pkts = umac_rl(intf, UMC_RRUND);</div><div class='add'>+	rmon_stats-&gt;oversize_pkts = umac_rl(intf, UMC_GROVR);</div><div class='add'>+	rmon_stats-&gt;fragments = umac_rl(intf, UMC_RRFRG);</div><div class='add'>+	rmon_stats-&gt;jabbers = umac_rl(intf, UMC_GRJBR);</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;hist[0] = umac_rl(intf, UMC_GR64);</div><div class='add'>+	rmon_stats-&gt;hist[1] = umac_rl(intf, UMC_GR127);</div><div class='add'>+	rmon_stats-&gt;hist[2] = umac_rl(intf, UMC_GR255);</div><div class='add'>+	rmon_stats-&gt;hist[3] = umac_rl(intf, UMC_GR511);</div><div class='add'>+	rmon_stats-&gt;hist[4] = umac_rl(intf, UMC_GR1023);</div><div class='add'>+	rmon_stats-&gt;hist[5] = umac_rl(intf, UMC_GR1518);</div><div class='add'>+	rmon_stats-&gt;hist[6] = umac_rl(intf, UMC_GRMGV);</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;hist_tx[0] = umac_rl(intf, UMC_TR64);</div><div class='add'>+	rmon_stats-&gt;hist_tx[1] = umac_rl(intf, UMC_TR127);</div><div class='add'>+	rmon_stats-&gt;hist_tx[2] = umac_rl(intf, UMC_TR255);</div><div class='add'>+	rmon_stats-&gt;hist_tx[3] = umac_rl(intf, UMC_TR511);</div><div class='add'>+	rmon_stats-&gt;hist_tx[4] = umac_rl(intf, UMC_TR1023);</div><div class='add'>+	rmon_stats-&gt;hist_tx[5] = umac_rl(intf, UMC_TR1518);</div><div class='add'>+	rmon_stats-&gt;hist_tx[6] = umac_rl(intf, UMC_TRMGV);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_eth_ctrl_stats(struct net_device *dev,</div><div class='add'>+				      struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesTransmitted = umac_rl(intf, UMC_GTXCF);</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesReceived = umac_rl(intf, UMC_GRXCF);</div><div class='add'>+	ctrl_stats-&gt;UnsupportedOpcodesReceived = umac_rl(intf, UMC_GRXUO);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops bcmasp_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= bcmasp_get_drvinfo,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_link_ksettings	= phy_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings	= phy_ethtool_set_link_ksettings,</div><div class='add'>+	.get_msglevel		= bcmasp_get_msglevel,</div><div class='add'>+	.set_msglevel		= bcmasp_set_msglevel,</div><div class='add'>+	.get_wol		= bcmasp_get_wol,</div><div class='add'>+	.set_wol		= bcmasp_set_wol,</div><div class='add'>+	.get_rxnfc		= bcmasp_get_rxnfc,</div><div class='add'>+	.set_rxnfc		= bcmasp_set_rxnfc,</div><div class='add'>+	.set_eee		= bcmasp_set_eee,</div><div class='add'>+	.get_eee		= bcmasp_get_eee,</div><div class='add'>+	.get_eth_mac_stats	= bcmasp_get_eth_mac_stats,</div><div class='add'>+	.get_rmon_stats		= bcmasp_get_rmon_stats,</div><div class='add'>+	.get_eth_ctrl_stats	= bcmasp_get_eth_ctrl_stats,</div><div class='add'>+	.get_strings		= bcmasp_get_strings,</div><div class='add'>+	.get_ethtool_stats	= bcmasp_get_ethtool_stats,</div><div class='add'>+	.get_sset_count		= bcmasp_get_sset_count,</div><div class='add'>+	.get_ts_info		= ethtool_op_get_ts_info,</div><div class='add'>+	.nway_reset		= phy_ethtool_nway_reset,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c<br/>new file mode 100644<br/>index 000000000000..b9973956c480<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c</a></div><div class='hunk'>@@ -0,0 +1,1423 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#define pr_fmt(fmt)			"bcmasp_intf: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/brcmphy.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phy_fixed.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bcmasp.h"</div><div class='add'>+#include "bcmasp_intf_defs.h"</div><div class='add'>+</div><div class='add'>+static int incr_ring(int index, int ring_count)</div><div class='add'>+{</div><div class='add'>+	index++;</div><div class='add'>+	if (index == ring_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Points to last byte of descriptor */</div><div class='add'>+static dma_addr_t incr_last_byte(dma_addr_t addr, dma_addr_t beg,</div><div class='add'>+				 int ring_count)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t end = beg + (ring_count * DESC_SIZE);</div><div class='add'>+</div><div class='add'>+	addr += DESC_SIZE;</div><div class='add'>+	if (addr &gt; end)</div><div class='add'>+		return beg + DESC_SIZE - 1;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Points to first byte of descriptor */</div><div class='add'>+static dma_addr_t incr_first_byte(dma_addr_t addr, dma_addr_t beg,</div><div class='add'>+				  int ring_count)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t end = beg + (ring_count * DESC_SIZE);</div><div class='add'>+</div><div class='add'>+	addr += DESC_SIZE;</div><div class='add'>+	if (addr &gt;= end)</div><div class='add'>+		return beg;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_enable_tx(struct bcmasp_intf *intf, int en)</div><div class='add'>+{</div><div class='add'>+	if (en) {</div><div class='add'>+		tx_spb_ctrl_wl(intf, TX_SPB_CTRL_ENABLE_EN, TX_SPB_CTRL_ENABLE);</div><div class='add'>+		tx_epkt_core_wl(intf, (TX_EPKT_C_CFG_MISC_EN |</div><div class='add'>+				TX_EPKT_C_CFG_MISC_PT |</div><div class='add'>+				(intf-&gt;port &lt;&lt; TX_EPKT_C_CFG_MISC_PS_SHIFT)),</div><div class='add'>+				TX_EPKT_C_CFG_MISC);</div><div class='add'>+	} else {</div><div class='add'>+		tx_spb_ctrl_wl(intf, 0x0, TX_SPB_CTRL_ENABLE);</div><div class='add'>+		tx_epkt_core_wl(intf, 0x0, TX_EPKT_C_CFG_MISC);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_enable_rx(struct bcmasp_intf *intf, int en)</div><div class='add'>+{</div><div class='add'>+	if (en)</div><div class='add'>+		rx_edpkt_cfg_wl(intf, RX_EDPKT_CFG_ENABLE_EN,</div><div class='add'>+				RX_EDPKT_CFG_ENABLE);</div><div class='add'>+	else</div><div class='add'>+		rx_edpkt_cfg_wl(intf, 0x0, RX_EDPKT_CFG_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_set_rx_mode(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	unsigned char mask[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;intf-&gt;parent-&gt;mda_lock);</div><div class='add'>+</div><div class='add'>+	bcmasp_disable_all_filters(intf);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+		goto set_promisc;</div><div class='add'>+</div><div class='add'>+	bcmasp_set_promisc(intf, 0);</div><div class='add'>+</div><div class='add'>+	bcmasp_set_broad(intf, 1);</div><div class='add'>+</div><div class='add'>+	bcmasp_set_oaddr(intf, dev-&gt;dev_addr, 1);</div><div class='add'>+</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		bcmasp_set_allmulti(intf, 1);</div><div class='add'>+	} else {</div><div class='add'>+		bcmasp_set_allmulti(intf, 0);</div><div class='add'>+</div><div class='add'>+		netdev_for_each_mc_addr(ha, dev) {</div><div class='add'>+			ret = bcmasp_set_en_mda_filter(intf, ha-&gt;addr, mask);</div><div class='add'>+			if (ret) {</div><div class='add'>+				intf-&gt;mib.mc_filters_full_cnt++;</div><div class='add'>+				goto set_promisc;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_for_each_uc_addr(ha, dev) {</div><div class='add'>+		ret = bcmasp_set_en_mda_filter(intf, ha-&gt;addr, mask);</div><div class='add'>+		if (ret) {</div><div class='add'>+			intf-&gt;mib.uc_filters_full_cnt++;</div><div class='add'>+			goto set_promisc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;intf-&gt;parent-&gt;mda_lock);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+set_promisc:</div><div class='add'>+	bcmasp_set_promisc(intf, 1);</div><div class='add'>+	intf-&gt;mib.promisc_filters_cnt++;</div><div class='add'>+</div><div class='add'>+	/* disable all filters used by this port */</div><div class='add'>+	bcmasp_disable_all_filters(intf);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;intf-&gt;parent-&gt;mda_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_clean_txcb(struct bcmasp_intf *intf, int index)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_tx_cb *txcb = &amp;intf-&gt;tx_cbs[index];</div><div class='add'>+</div><div class='add'>+	txcb-&gt;skb = NULL;</div><div class='add'>+	dma_unmap_addr_set(txcb, dma_addr, 0);</div><div class='add'>+	dma_unmap_len_set(txcb, dma_len, 0);</div><div class='add'>+	txcb-&gt;last = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tx_spb_ring_full(struct bcmasp_intf *intf, int cnt)</div><div class='add'>+{</div><div class='add'>+	int next_index, i;</div><div class='add'>+</div><div class='add'>+	/* Check if we have enough room for cnt descriptors */</div><div class='add'>+	for (i = 0; i &lt; cnt; i++) {</div><div class='add'>+		next_index = incr_ring(intf-&gt;tx_spb_index, DESC_RING_COUNT);</div><div class='add'>+		if (next_index == intf-&gt;tx_spb_clean_index)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *bcmasp_csum_offload(struct net_device *dev,</div><div class='add'>+					   struct sk_buff *skb,</div><div class='add'>+					   bool *csum_hw)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	u32 header = 0, header2 = 0, epkt = 0;</div><div class='add'>+	struct bcmasp_pkt_offload *offload;</div><div class='add'>+	unsigned int header_cnt = 0;</div><div class='add'>+	u8 ip_proto;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;ip_summed != CHECKSUM_PARTIAL)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	ret = skb_cow_head(skb, sizeof(*offload));</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		intf-&gt;mib.tx_realloc_offload_failed++;</div><div class='add'>+		goto help;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (skb-&gt;protocol) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		header |= PKT_OFFLOAD_HDR_SIZE_2((ip_hdrlen(skb) &gt;&gt; 8) &amp; 0xf);</div><div class='add'>+		header2 |= PKT_OFFLOAD_HDR2_SIZE_2(ip_hdrlen(skb) &amp; 0xff);</div><div class='add'>+		epkt |= PKT_OFFLOAD_EPKT_IP(0);</div><div class='add'>+		ip_proto = ip_hdr(skb)-&gt;protocol;</div><div class='add'>+		header_cnt += 2;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		header |= PKT_OFFLOAD_HDR_SIZE_2((IP6_HLEN &gt;&gt; 8) &amp; 0xf);</div><div class='add'>+		header2 |= PKT_OFFLOAD_HDR2_SIZE_2(IP6_HLEN &amp; 0xff);</div><div class='add'>+		epkt |= PKT_OFFLOAD_EPKT_IP(1);</div><div class='add'>+		ip_proto = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='add'>+		header_cnt += 2;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto help;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (ip_proto) {</div><div class='add'>+	case IPPROTO_TCP:</div><div class='add'>+		header2 |= PKT_OFFLOAD_HDR2_SIZE_3(tcp_hdrlen(skb));</div><div class='add'>+		epkt |= PKT_OFFLOAD_EPKT_TP(0) | PKT_OFFLOAD_EPKT_CSUM_L4;</div><div class='add'>+		header_cnt++;</div><div class='add'>+		break;</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+		header2 |= PKT_OFFLOAD_HDR2_SIZE_3(UDP_HLEN);</div><div class='add'>+		epkt |= PKT_OFFLOAD_EPKT_TP(1) | PKT_OFFLOAD_EPKT_CSUM_L4;</div><div class='add'>+		header_cnt++;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto help;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	offload = (struct bcmasp_pkt_offload *)skb_push(skb, sizeof(*offload));</div><div class='add'>+</div><div class='add'>+	header |= PKT_OFFLOAD_HDR_OP | PKT_OFFLOAD_HDR_COUNT(header_cnt) |</div><div class='add'>+		  PKT_OFFLOAD_HDR_SIZE_1(ETH_HLEN);</div><div class='add'>+	epkt |= PKT_OFFLOAD_EPKT_OP;</div><div class='add'>+</div><div class='add'>+	offload-&gt;nop = htonl(PKT_OFFLOAD_NOP);</div><div class='add'>+	offload-&gt;header = htonl(header);</div><div class='add'>+	offload-&gt;header2 = htonl(header2);</div><div class='add'>+	offload-&gt;epkt = htonl(epkt);</div><div class='add'>+	offload-&gt;end = htonl(PKT_OFFLOAD_END_OP);</div><div class='add'>+	*csum_hw = true;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+</div><div class='add'>+help:</div><div class='add'>+	skb_checksum_help(skb);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long bcmasp_rx_edpkt_dma_rq(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	return rx_edpkt_dma_rq(intf, RX_EDPKT_DMA_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_rx_edpkt_cfg_wq(struct bcmasp_intf *intf, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	rx_edpkt_cfg_wq(intf, addr, RX_EDPKT_RING_BUFFER_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_rx_edpkt_dma_wq(struct bcmasp_intf *intf, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	rx_edpkt_dma_wq(intf, addr, RX_EDPKT_DMA_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long bcmasp_tx_spb_dma_rq(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	return tx_spb_dma_rq(intf, TX_SPB_DMA_READ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_tx_spb_dma_wq(struct bcmasp_intf *intf, dma_addr_t addr)</div><div class='add'>+{</div><div class='add'>+	tx_spb_dma_wq(intf, addr, TX_SPB_DMA_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct bcmasp_intf_ops bcmasp_intf_ops = {</div><div class='add'>+	.rx_desc_read = bcmasp_rx_edpkt_dma_rq,</div><div class='add'>+	.rx_buffer_write = bcmasp_rx_edpkt_cfg_wq,</div><div class='add'>+	.rx_desc_write = bcmasp_rx_edpkt_dma_wq,</div><div class='add'>+	.tx_read = bcmasp_tx_spb_dma_rq,</div><div class='add'>+	.tx_write = bcmasp_tx_spb_dma_wq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static netdev_tx_t bcmasp_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	unsigned int total_bytes, size;</div><div class='add'>+	int spb_index, nr_frags, i, j;</div><div class='add'>+	struct bcmasp_tx_cb *txcb;</div><div class='add'>+	dma_addr_t mapping, valid;</div><div class='add'>+	struct bcmasp_desc *desc;</div><div class='add'>+	bool csum_hw = false;</div><div class='add'>+	struct device *kdev;</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+	kdev = &amp;intf-&gt;parent-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	if (tx_spb_ring_full(intf, nr_frags + 1)) {</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+		if (net_ratelimit())</div><div class='add'>+			netdev_err(dev, "Tx Ring Full!\n");</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Save skb len before adding csum offload header */</div><div class='add'>+	total_bytes = skb-&gt;len;</div><div class='add'>+	skb = bcmasp_csum_offload(dev, skb, &amp;csum_hw);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+	spb_index = intf-&gt;tx_spb_index;</div><div class='add'>+	valid = intf-&gt;tx_spb_dma_valid;</div><div class='add'>+	for (i = 0; i &lt;= nr_frags; i++) {</div><div class='add'>+		if (!i) {</div><div class='add'>+			size = skb_headlen(skb);</div><div class='add'>+			if (!nr_frags &amp;&amp; size &lt; (ETH_ZLEN + ETH_FCS_LEN)) {</div><div class='add'>+				if (skb_put_padto(skb, ETH_ZLEN + ETH_FCS_LEN))</div><div class='add'>+					return NETDEV_TX_OK;</div><div class='add'>+				size = skb-&gt;len;</div><div class='add'>+			}</div><div class='add'>+			mapping = dma_map_single(kdev, skb-&gt;data, size,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='add'>+		} else {</div><div class='add'>+			frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='add'>+			size = skb_frag_size(frag);</div><div class='add'>+			mapping = skb_frag_dma_map(kdev, frag, 0, size,</div><div class='add'>+						   DMA_TO_DEVICE);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dma_mapping_error(kdev, mapping)) {</div><div class='add'>+			intf-&gt;mib.tx_dma_failed++;</div><div class='add'>+			spb_index = intf-&gt;tx_spb_index;</div><div class='add'>+			for (j = 0; j &lt; i; j++) {</div><div class='add'>+				bcmasp_clean_txcb(intf, spb_index);</div><div class='add'>+				spb_index = incr_ring(spb_index,</div><div class='add'>+						      DESC_RING_COUNT);</div><div class='add'>+			}</div><div class='add'>+			/* Rewind so we do not have a hole */</div><div class='add'>+			spb_index = intf-&gt;tx_spb_index;</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return NETDEV_TX_OK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		txcb = &amp;intf-&gt;tx_cbs[spb_index];</div><div class='add'>+		desc = &amp;intf-&gt;tx_spb_cpu[spb_index];</div><div class='add'>+		memset(desc, 0, sizeof(*desc));</div><div class='add'>+		txcb-&gt;skb = skb;</div><div class='add'>+		txcb-&gt;bytes_sent = total_bytes;</div><div class='add'>+		dma_unmap_addr_set(txcb, dma_addr, mapping);</div><div class='add'>+		dma_unmap_len_set(txcb, dma_len, size);</div><div class='add'>+		if (!i) {</div><div class='add'>+			desc-&gt;flags |= DESC_SOF;</div><div class='add'>+			if (csum_hw)</div><div class='add'>+				desc-&gt;flags |= DESC_EPKT_CMD;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i == nr_frags) {</div><div class='add'>+			desc-&gt;flags |= DESC_EOF;</div><div class='add'>+			txcb-&gt;last = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc-&gt;buf = mapping;</div><div class='add'>+		desc-&gt;size = size;</div><div class='add'>+		desc-&gt;flags |= DESC_INT_EN;</div><div class='add'>+</div><div class='add'>+		netif_dbg(intf, tx_queued, dev,</div><div class='add'>+			  "%s dma_buf=%pad dma_len=0x%x flags=0x%x index=0x%x\n",</div><div class='add'>+			  __func__, &amp;mapping, desc-&gt;size, desc-&gt;flags,</div><div class='add'>+			  spb_index);</div><div class='add'>+</div><div class='add'>+		spb_index = incr_ring(spb_index, DESC_RING_COUNT);</div><div class='add'>+		valid = incr_last_byte(valid, intf-&gt;tx_spb_dma_addr,</div><div class='add'>+				       DESC_RING_COUNT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure all descriptors have been written to DRAM for the</div><div class='add'>+	 * hardware to see up-to-date contents.</div><div class='add'>+	 */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	intf-&gt;tx_spb_index = spb_index;</div><div class='add'>+	intf-&gt;tx_spb_dma_valid = valid;</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+	bcmasp_intf_tx_write(intf, intf-&gt;tx_spb_dma_valid);</div><div class='add'>+</div><div class='add'>+	if (tx_spb_ring_full(intf, MAX_SKB_FRAGS + 1))</div><div class='add'>+		netif_stop_queue(dev);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netif_start(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	bcmasp_set_rx_mode(dev);</div><div class='add'>+	napi_enable(&amp;intf-&gt;tx_napi);</div><div class='add'>+	napi_enable(&amp;intf-&gt;rx_napi);</div><div class='add'>+</div><div class='add'>+	bcmasp_enable_rx_irq(intf, 1);</div><div class='add'>+	bcmasp_enable_tx_irq(intf, 1);</div><div class='add'>+	bcmasp_enable_phy_irq(intf, 1);</div><div class='add'>+</div><div class='add'>+	phy_start(dev-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void umac_reset(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	umac_wl(intf, 0x0, UMC_CMD);</div><div class='add'>+	umac_wl(intf, UMC_CMD_SW_RESET, UMC_CMD);</div><div class='add'>+	usleep_range(10, 100);</div><div class='add'>+	/* We hold the umac in reset and bring it out of</div><div class='add'>+	 * reset when phy link is up.</div><div class='add'>+	 */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void umac_set_hw_addr(struct bcmasp_intf *intf,</div><div class='add'>+			     const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	u32 mac0 = (addr[0] &lt;&lt; 24) | (addr[1] &lt;&lt; 16) | (addr[2] &lt;&lt; 8) |</div><div class='add'>+		    addr[3];</div><div class='add'>+	u32 mac1 = (addr[4] &lt;&lt; 8) | addr[5];</div><div class='add'>+</div><div class='add'>+	umac_wl(intf, mac0, UMC_MAC0);</div><div class='add'>+	umac_wl(intf, mac1, UMC_MAC1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void umac_enable_set(struct bcmasp_intf *intf, u32 mask,</div><div class='add'>+			    unsigned int enable)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = umac_rl(intf, UMC_CMD);</div><div class='add'>+	if (reg &amp; UMC_CMD_SW_RESET)</div><div class='add'>+		return;</div><div class='add'>+	if (enable)</div><div class='add'>+		reg |= mask;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~mask;</div><div class='add'>+	umac_wl(intf, reg, UMC_CMD);</div><div class='add'>+</div><div class='add'>+	/* UniMAC stops on a packet boundary, wait for a full-sized packet</div><div class='add'>+	 * to be processed (1 msec).</div><div class='add'>+	 */</div><div class='add'>+	if (enable == 0)</div><div class='add'>+		usleep_range(1000, 2000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void umac_init(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	umac_wl(intf, 0x800, UMC_FRM_LEN);</div><div class='add'>+	umac_wl(intf, 0xffff, UMC_PAUSE_CNTRL);</div><div class='add'>+	umac_wl(intf, 0x800, UMC_RX_MAX_PKT_SZ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_tx_reclaim(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf_stats64 *stats = &amp;intf-&gt;stats64;</div><div class='add'>+	struct device *kdev = &amp;intf-&gt;parent-&gt;pdev-&gt;dev;</div><div class='add'>+	unsigned long read, released = 0;</div><div class='add'>+	struct bcmasp_tx_cb *txcb;</div><div class='add'>+	struct bcmasp_desc *desc;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+</div><div class='add'>+	read = bcmasp_intf_tx_read(intf);</div><div class='add'>+	while (intf-&gt;tx_spb_dma_read != read) {</div><div class='add'>+		txcb = &amp;intf-&gt;tx_cbs[intf-&gt;tx_spb_clean_index];</div><div class='add'>+		mapping = dma_unmap_addr(txcb, dma_addr);</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(kdev, mapping,</div><div class='add'>+				 dma_unmap_len(txcb, dma_len),</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (txcb-&gt;last) {</div><div class='add'>+			dev_consume_skb_any(txcb-&gt;skb);</div><div class='add'>+</div><div class='add'>+			u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+			u64_stats_inc(&amp;stats-&gt;tx_packets);</div><div class='add'>+			u64_stats_add(&amp;stats-&gt;tx_bytes, txcb-&gt;bytes_sent);</div><div class='add'>+			u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		desc = &amp;intf-&gt;tx_spb_cpu[intf-&gt;tx_spb_clean_index];</div><div class='add'>+</div><div class='add'>+		netif_dbg(intf, tx_done, intf-&gt;ndev,</div><div class='add'>+			  "%s dma_buf=%pad dma_len=0x%x flags=0x%x c_index=0x%x\n",</div><div class='add'>+			  __func__, &amp;mapping, desc-&gt;size, desc-&gt;flags,</div><div class='add'>+			  intf-&gt;tx_spb_clean_index);</div><div class='add'>+</div><div class='add'>+		bcmasp_clean_txcb(intf, intf-&gt;tx_spb_clean_index);</div><div class='add'>+		released++;</div><div class='add'>+</div><div class='add'>+		intf-&gt;tx_spb_clean_index = incr_ring(intf-&gt;tx_spb_clean_index,</div><div class='add'>+						     DESC_RING_COUNT);</div><div class='add'>+		intf-&gt;tx_spb_dma_read = incr_first_byte(intf-&gt;tx_spb_dma_read,</div><div class='add'>+							intf-&gt;tx_spb_dma_addr,</div><div class='add'>+							DESC_RING_COUNT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return released;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_tx_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf =</div><div class='add'>+		container_of(napi, struct bcmasp_intf, tx_napi);</div><div class='add'>+	int released = 0;</div><div class='add'>+</div><div class='add'>+	released = bcmasp_tx_reclaim(intf);</div><div class='add'>+</div><div class='add'>+	napi_complete(&amp;intf-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	bcmasp_enable_tx_irq(intf, 1);</div><div class='add'>+</div><div class='add'>+	if (released)</div><div class='add'>+		netif_wake_queue(intf-&gt;ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_rx_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf =</div><div class='add'>+		container_of(napi, struct bcmasp_intf, rx_napi);</div><div class='add'>+	struct bcmasp_intf_stats64 *stats = &amp;intf-&gt;stats64;</div><div class='add'>+	struct device *kdev = &amp;intf-&gt;parent-&gt;pdev-&gt;dev;</div><div class='add'>+	unsigned long processed = 0;</div><div class='add'>+	struct bcmasp_desc *desc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	dma_addr_t valid;</div><div class='add'>+	void *data;</div><div class='add'>+	u64 flags;</div><div class='add'>+	u32 len;</div><div class='add'>+</div><div class='add'>+	valid = bcmasp_intf_rx_desc_read(intf) + 1;</div><div class='add'>+	if (valid == intf-&gt;rx_edpkt_dma_addr + DESC_RING_SIZE)</div><div class='add'>+		valid = intf-&gt;rx_edpkt_dma_addr;</div><div class='add'>+</div><div class='add'>+	while ((processed &lt; budget) &amp;&amp; (valid != intf-&gt;rx_edpkt_dma_read)) {</div><div class='add'>+		desc = &amp;intf-&gt;rx_edpkt_cpu[intf-&gt;rx_edpkt_index];</div><div class='add'>+</div><div class='add'>+		/* Ensure that descriptor has been fully written to DRAM by</div><div class='add'>+		 * hardware before reading by the CPU</div><div class='add'>+		 */</div><div class='add'>+		rmb();</div><div class='add'>+</div><div class='add'>+		/* Calculate virt addr by offsetting from physical addr */</div><div class='add'>+		data = intf-&gt;rx_ring_cpu +</div><div class='add'>+			(DESC_ADDR(desc-&gt;buf) - intf-&gt;rx_ring_dma);</div><div class='add'>+</div><div class='add'>+		flags = DESC_FLAGS(desc-&gt;buf);</div><div class='add'>+		if (unlikely(flags &amp; (DESC_CRC_ERR | DESC_RX_SYM_ERR))) {</div><div class='add'>+			if (net_ratelimit()) {</div><div class='add'>+				netif_err(intf, rx_status, intf-&gt;ndev,</div><div class='add'>+					  "flags=0x%llx\n", flags);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+			if (flags &amp; DESC_CRC_ERR)</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;rx_crc_errs);</div><div class='add'>+			if (flags &amp; DESC_RX_SYM_ERR)</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;rx_sym_errs);</div><div class='add'>+			u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='add'>+</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_cpu(kdev, DESC_ADDR(desc-&gt;buf), desc-&gt;size,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		len = desc-&gt;size;</div><div class='add'>+</div><div class='add'>+		skb = napi_alloc_skb(napi, len);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+			u64_stats_inc(&amp;stats-&gt;rx_dropped);</div><div class='add'>+			u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='add'>+			intf-&gt;mib.alloc_rx_skb_failed++;</div><div class='add'>+</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_put(skb, len);</div><div class='add'>+		memcpy(skb-&gt;data, data, len);</div><div class='add'>+</div><div class='add'>+		skb_pull(skb, 2);</div><div class='add'>+		len -= 2;</div><div class='add'>+		if (likely(intf-&gt;crc_fwd)) {</div><div class='add'>+			skb_trim(skb, len - ETH_FCS_LEN);</div><div class='add'>+			len -= ETH_FCS_LEN;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((intf-&gt;ndev-&gt;features &amp; NETIF_F_RXCSUM) &amp;&amp;</div><div class='add'>+		    (desc-&gt;buf &amp; DESC_CHKSUM))</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, intf-&gt;ndev);</div><div class='add'>+</div><div class='add'>+		napi_gro_receive(napi, skb);</div><div class='add'>+</div><div class='add'>+		u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;rx_packets);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;rx_bytes, len);</div><div class='add'>+		u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='add'>+</div><div class='add'>+next:</div><div class='add'>+		bcmasp_intf_rx_buffer_write(intf, (DESC_ADDR(desc-&gt;buf) +</div><div class='add'>+					    desc-&gt;size));</div><div class='add'>+</div><div class='add'>+		processed++;</div><div class='add'>+		intf-&gt;rx_edpkt_dma_read =</div><div class='add'>+			incr_first_byte(intf-&gt;rx_edpkt_dma_read,</div><div class='add'>+					intf-&gt;rx_edpkt_dma_addr,</div><div class='add'>+					DESC_RING_COUNT);</div><div class='add'>+		intf-&gt;rx_edpkt_index = incr_ring(intf-&gt;rx_edpkt_index,</div><div class='add'>+						 DESC_RING_COUNT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcmasp_intf_rx_desc_write(intf, intf-&gt;rx_edpkt_dma_read);</div><div class='add'>+</div><div class='add'>+	if (processed &lt; budget &amp;&amp; napi_complete_done(&amp;intf-&gt;rx_napi, processed))</div><div class='add'>+		bcmasp_enable_rx_irq(intf, 1);</div><div class='add'>+</div><div class='add'>+	return processed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_adj_link(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+	u32 cmd_bits = 0, reg;</div><div class='add'>+	int changed = 0;</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;old_link != phydev-&gt;link) {</div><div class='add'>+		changed = 1;</div><div class='add'>+		intf-&gt;old_link = phydev-&gt;link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;old_duplex != phydev-&gt;duplex) {</div><div class='add'>+		changed = 1;</div><div class='add'>+		intf-&gt;old_duplex = phydev-&gt;duplex;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (phydev-&gt;speed) {</div><div class='add'>+	case SPEED_2500:</div><div class='add'>+		cmd_bits = UMC_CMD_SPEED_2500;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		cmd_bits = UMC_CMD_SPEED_1000;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		cmd_bits = UMC_CMD_SPEED_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_10:</div><div class='add'>+		cmd_bits = UMC_CMD_SPEED_10;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	cmd_bits &lt;&lt;= UMC_CMD_SPEED_SHIFT;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;duplex == DUPLEX_HALF)</div><div class='add'>+		cmd_bits |= UMC_CMD_HD_EN;</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;old_pause != phydev-&gt;pause) {</div><div class='add'>+		changed = 1;</div><div class='add'>+		intf-&gt;old_pause = phydev-&gt;pause;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!phydev-&gt;pause)</div><div class='add'>+		cmd_bits |= UMC_CMD_RX_PAUSE_IGNORE | UMC_CMD_TX_PAUSE_IGNORE;</div><div class='add'>+</div><div class='add'>+	if (!changed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link) {</div><div class='add'>+		reg = umac_rl(intf, UMC_CMD);</div><div class='add'>+		reg &amp;= ~((UMC_CMD_SPEED_MASK &lt;&lt; UMC_CMD_SPEED_SHIFT) |</div><div class='add'>+			UMC_CMD_HD_EN | UMC_CMD_RX_PAUSE_IGNORE |</div><div class='add'>+			UMC_CMD_TX_PAUSE_IGNORE);</div><div class='add'>+		reg |= cmd_bits;</div><div class='add'>+		if (reg &amp; UMC_CMD_SW_RESET) {</div><div class='add'>+			reg &amp;= ~UMC_CMD_SW_RESET;</div><div class='add'>+			umac_wl(intf, reg, UMC_CMD);</div><div class='add'>+			udelay(2);</div><div class='add'>+			reg |= UMC_CMD_TX_EN | UMC_CMD_RX_EN | UMC_CMD_PROMISC;</div><div class='add'>+		}</div><div class='add'>+		umac_wl(intf, reg, UMC_CMD);</div><div class='add'>+</div><div class='add'>+		umac_wl(intf, phydev-&gt;eee_cfg.tx_lpi_timer, UMC_EEE_LPI_TIMER);</div><div class='add'>+		reg = umac_rl(intf, UMC_EEE_CTRL);</div><div class='add'>+		if (phydev-&gt;enable_tx_lpi)</div><div class='add'>+			reg |= EEE_EN;</div><div class='add'>+		else</div><div class='add'>+			reg &amp;= ~EEE_EN;</div><div class='add'>+		umac_wl(intf, reg, UMC_EEE_CTRL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = rgmii_rl(intf, RGMII_OOB_CNTRL);</div><div class='add'>+	if (phydev-&gt;link)</div><div class='add'>+		reg |= RGMII_LINK;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~RGMII_LINK;</div><div class='add'>+	rgmii_wl(intf, reg, RGMII_OOB_CNTRL);</div><div class='add'>+</div><div class='add'>+	if (changed)</div><div class='add'>+		phy_print_status(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_alloc_buffers(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct device *kdev = &amp;intf-&gt;parent-&gt;pdev-&gt;dev;</div><div class='add'>+	struct page *buffer_pg;</div><div class='add'>+</div><div class='add'>+	/* Alloc RX */</div><div class='add'>+	intf-&gt;rx_buf_order = get_order(RING_BUFFER_SIZE);</div><div class='add'>+	buffer_pg = alloc_pages(GFP_KERNEL, intf-&gt;rx_buf_order);</div><div class='add'>+	if (!buffer_pg)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	intf-&gt;rx_ring_cpu = page_to_virt(buffer_pg);</div><div class='add'>+	intf-&gt;rx_ring_dma = dma_map_page(kdev, buffer_pg, 0, RING_BUFFER_SIZE,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='add'>+	if (dma_mapping_error(kdev, intf-&gt;rx_ring_dma))</div><div class='add'>+		goto free_rx_buffer;</div><div class='add'>+</div><div class='add'>+	intf-&gt;rx_edpkt_cpu = dma_alloc_coherent(kdev, DESC_RING_SIZE,</div><div class='add'>+						&amp;intf-&gt;rx_edpkt_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!intf-&gt;rx_edpkt_cpu)</div><div class='add'>+		goto free_rx_buffer_dma;</div><div class='add'>+</div><div class='add'>+	/* Alloc TX */</div><div class='add'>+	intf-&gt;tx_spb_cpu = dma_alloc_coherent(kdev, DESC_RING_SIZE,</div><div class='add'>+					      &amp;intf-&gt;tx_spb_dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!intf-&gt;tx_spb_cpu)</div><div class='add'>+		goto free_rx_edpkt_dma;</div><div class='add'>+</div><div class='add'>+	intf-&gt;tx_cbs = kcalloc(DESC_RING_COUNT, sizeof(struct bcmasp_tx_cb),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!intf-&gt;tx_cbs)</div><div class='add'>+		goto free_tx_spb_dma;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_tx_spb_dma:</div><div class='add'>+	dma_free_coherent(kdev, DESC_RING_SIZE, intf-&gt;tx_spb_cpu,</div><div class='add'>+			  intf-&gt;tx_spb_dma_addr);</div><div class='add'>+free_rx_edpkt_dma:</div><div class='add'>+	dma_free_coherent(kdev, DESC_RING_SIZE, intf-&gt;rx_edpkt_cpu,</div><div class='add'>+			  intf-&gt;rx_edpkt_dma_addr);</div><div class='add'>+free_rx_buffer_dma:</div><div class='add'>+	dma_unmap_page(kdev, intf-&gt;rx_ring_dma, RING_BUFFER_SIZE,</div><div class='add'>+		       DMA_FROM_DEVICE);</div><div class='add'>+free_rx_buffer:</div><div class='add'>+	__free_pages(buffer_pg, intf-&gt;rx_buf_order);</div><div class='add'>+</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_reclaim_free_buffers(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct device *kdev = &amp;intf-&gt;parent-&gt;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* RX buffers */</div><div class='add'>+	dma_free_coherent(kdev, DESC_RING_SIZE, intf-&gt;rx_edpkt_cpu,</div><div class='add'>+			  intf-&gt;rx_edpkt_dma_addr);</div><div class='add'>+	dma_unmap_page(kdev, intf-&gt;rx_ring_dma, RING_BUFFER_SIZE,</div><div class='add'>+		       DMA_FROM_DEVICE);</div><div class='add'>+	__free_pages(virt_to_page(intf-&gt;rx_ring_cpu), intf-&gt;rx_buf_order);</div><div class='add'>+</div><div class='add'>+	/* TX buffers */</div><div class='add'>+	dma_free_coherent(kdev, DESC_RING_SIZE, intf-&gt;tx_spb_cpu,</div><div class='add'>+			  intf-&gt;tx_spb_dma_addr);</div><div class='add'>+	kfree(intf-&gt;tx_cbs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_init_rx(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	/* Restart from index 0 */</div><div class='add'>+	intf-&gt;rx_ring_dma_valid = intf-&gt;rx_ring_dma + RING_BUFFER_SIZE - 1;</div><div class='add'>+	intf-&gt;rx_edpkt_dma_valid = intf-&gt;rx_edpkt_dma_addr + (DESC_RING_SIZE - 1);</div><div class='add'>+	intf-&gt;rx_edpkt_dma_read = intf-&gt;rx_edpkt_dma_addr;</div><div class='add'>+	intf-&gt;rx_edpkt_index = 0;</div><div class='add'>+</div><div class='add'>+	/* Make sure channels are disabled */</div><div class='add'>+	rx_edpkt_cfg_wl(intf, 0x0, RX_EDPKT_CFG_ENABLE);</div><div class='add'>+</div><div class='add'>+	/* Rx SPB */</div><div class='add'>+	rx_edpkt_cfg_wq(intf, intf-&gt;rx_ring_dma, RX_EDPKT_RING_BUFFER_READ);</div><div class='add'>+	rx_edpkt_cfg_wq(intf, intf-&gt;rx_ring_dma, RX_EDPKT_RING_BUFFER_WRITE);</div><div class='add'>+	rx_edpkt_cfg_wq(intf, intf-&gt;rx_ring_dma, RX_EDPKT_RING_BUFFER_BASE);</div><div class='add'>+	rx_edpkt_cfg_wq(intf, intf-&gt;rx_ring_dma_valid,</div><div class='add'>+			RX_EDPKT_RING_BUFFER_END);</div><div class='add'>+	rx_edpkt_cfg_wq(intf, intf-&gt;rx_ring_dma_valid,</div><div class='add'>+			RX_EDPKT_RING_BUFFER_VALID);</div><div class='add'>+</div><div class='add'>+	/* EDPKT */</div><div class='add'>+	rx_edpkt_cfg_wl(intf, (RX_EDPKT_CFG_CFG0_RBUF_4K &lt;&lt;</div><div class='add'>+			RX_EDPKT_CFG_CFG0_DBUF_SHIFT) |</div><div class='add'>+		       (RX_EDPKT_CFG_CFG0_64_ALN &lt;&lt;</div><div class='add'>+			RX_EDPKT_CFG_CFG0_BALN_SHIFT) |</div><div class='add'>+		       (RX_EDPKT_CFG_CFG0_EFRM_STUF),</div><div class='add'>+			RX_EDPKT_CFG_CFG0);</div><div class='add'>+	rx_edpkt_dma_wq(intf, intf-&gt;rx_edpkt_dma_addr, RX_EDPKT_DMA_WRITE);</div><div class='add'>+	rx_edpkt_dma_wq(intf, intf-&gt;rx_edpkt_dma_addr, RX_EDPKT_DMA_READ);</div><div class='add'>+	rx_edpkt_dma_wq(intf, intf-&gt;rx_edpkt_dma_addr, RX_EDPKT_DMA_BASE);</div><div class='add'>+	rx_edpkt_dma_wq(intf, intf-&gt;rx_edpkt_dma_valid, RX_EDPKT_DMA_END);</div><div class='add'>+	rx_edpkt_dma_wq(intf, intf-&gt;rx_edpkt_dma_valid, RX_EDPKT_DMA_VALID);</div><div class='add'>+</div><div class='add'>+	umac2fb_wl(intf, UMAC2FB_CFG_DEFAULT_EN | ((intf-&gt;channel + 11) &lt;&lt;</div><div class='add'>+		   UMAC2FB_CFG_CHID_SHIFT) | (0xd &lt;&lt; UMAC2FB_CFG_OK_SEND_SHIFT),</div><div class='add'>+		   UMAC2FB_CFG);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+static void bcmasp_init_tx(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	/* Restart from index 0 */</div><div class='add'>+	intf-&gt;tx_spb_dma_valid = intf-&gt;tx_spb_dma_addr + DESC_RING_SIZE - 1;</div><div class='add'>+	intf-&gt;tx_spb_dma_read = intf-&gt;tx_spb_dma_addr;</div><div class='add'>+	intf-&gt;tx_spb_index = 0;</div><div class='add'>+	intf-&gt;tx_spb_clean_index = 0;</div><div class='add'>+	memset(intf-&gt;tx_cbs, 0, sizeof(struct bcmasp_tx_cb) * DESC_RING_COUNT);</div><div class='add'>+</div><div class='add'>+	/* Make sure channels are disabled */</div><div class='add'>+	tx_spb_ctrl_wl(intf, 0x0, TX_SPB_CTRL_ENABLE);</div><div class='add'>+	tx_epkt_core_wl(intf, 0x0, TX_EPKT_C_CFG_MISC);</div><div class='add'>+</div><div class='add'>+	/* Tx SPB */</div><div class='add'>+	tx_spb_ctrl_wl(intf, ((intf-&gt;channel + 8) &lt;&lt; TX_SPB_CTRL_XF_BID_SHIFT),</div><div class='add'>+		       TX_SPB_CTRL_XF_CTRL2);</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;parent-&gt;tx_chan_offset)</div><div class='add'>+		tx_pause_ctrl_wl(intf, (1 &lt;&lt; (intf-&gt;channel + 8)), TX_PAUSE_MAP_VECTOR);</div><div class='add'>+	tx_spb_top_wl(intf, 0x1e, TX_SPB_TOP_BLKOUT);</div><div class='add'>+</div><div class='add'>+	tx_spb_dma_wq(intf, intf-&gt;tx_spb_dma_addr, TX_SPB_DMA_READ);</div><div class='add'>+	tx_spb_dma_wq(intf, intf-&gt;tx_spb_dma_addr, TX_SPB_DMA_BASE);</div><div class='add'>+	tx_spb_dma_wq(intf, intf-&gt;tx_spb_dma_valid, TX_SPB_DMA_END);</div><div class='add'>+	tx_spb_dma_wq(intf, intf-&gt;tx_spb_dma_valid, TX_SPB_DMA_VALID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_ephy_enable_set(struct bcmasp_intf *intf, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 mask = RGMII_EPHY_CFG_IDDQ_BIAS | RGMII_EPHY_CFG_EXT_PWRDOWN |</div><div class='add'>+		   RGMII_EPHY_CFG_IDDQ_GLOBAL;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = rgmii_rl(intf, RGMII_EPHY_CNTRL);</div><div class='add'>+	if (enable) {</div><div class='add'>+		reg &amp;= ~RGMII_EPHY_CK25_DIS;</div><div class='add'>+		rgmii_wl(intf, reg, RGMII_EPHY_CNTRL);</div><div class='add'>+		mdelay(1);</div><div class='add'>+</div><div class='add'>+		reg &amp;= ~mask;</div><div class='add'>+		reg |= RGMII_EPHY_RESET;</div><div class='add'>+		rgmii_wl(intf, reg, RGMII_EPHY_CNTRL);</div><div class='add'>+		mdelay(1);</div><div class='add'>+</div><div class='add'>+		reg &amp;= ~RGMII_EPHY_RESET;</div><div class='add'>+	} else {</div><div class='add'>+		reg |= mask | RGMII_EPHY_RESET;</div><div class='add'>+		rgmii_wl(intf, reg, RGMII_EPHY_CNTRL);</div><div class='add'>+		mdelay(1);</div><div class='add'>+		reg |= RGMII_EPHY_CK25_DIS;</div><div class='add'>+	}</div><div class='add'>+	rgmii_wl(intf, reg, RGMII_EPHY_CNTRL);</div><div class='add'>+	mdelay(1);</div><div class='add'>+</div><div class='add'>+	/* Set or clear the LED control override to avoid lighting up LEDs</div><div class='add'>+	 * while the EPHY is powered off and drawing unnecessary current.</div><div class='add'>+	 */</div><div class='add'>+	reg = rgmii_rl(intf, RGMII_SYS_LED_CNTRL);</div><div class='add'>+	if (enable)</div><div class='add'>+		reg &amp;= ~RGMII_SYS_LED_CNTRL_LINK_OVRD;</div><div class='add'>+	else</div><div class='add'>+		reg |= RGMII_SYS_LED_CNTRL_LINK_OVRD;</div><div class='add'>+	rgmii_wl(intf, reg, RGMII_SYS_LED_CNTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_rgmii_mode_en_set(struct bcmasp_intf *intf, bool enable)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = rgmii_rl(intf, RGMII_OOB_CNTRL);</div><div class='add'>+	reg &amp;= ~RGMII_OOB_DIS;</div><div class='add'>+	if (enable)</div><div class='add'>+		reg |= RGMII_MODE_EN;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~RGMII_MODE_EN;</div><div class='add'>+	rgmii_wl(intf, reg, RGMII_OOB_CNTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_netif_deinit(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	u32 reg, timeout = 1000;</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;intf-&gt;tx_napi);</div><div class='add'>+</div><div class='add'>+	bcmasp_enable_tx(intf, 0);</div><div class='add'>+</div><div class='add'>+	/* Flush any TX packets in the pipe */</div><div class='add'>+	tx_spb_dma_wl(intf, TX_SPB_DMA_FIFO_FLUSH, TX_SPB_DMA_FIFO_CTRL);</div><div class='add'>+	do {</div><div class='add'>+		reg = tx_spb_dma_rl(intf, TX_SPB_DMA_FIFO_STATUS);</div><div class='add'>+		if (!(reg &amp; TX_SPB_DMA_FIFO_FLUSH))</div><div class='add'>+			break;</div><div class='add'>+		usleep_range(1000, 2000);</div><div class='add'>+	} while (timeout-- &gt; 0);</div><div class='add'>+	tx_spb_dma_wl(intf, 0x0, TX_SPB_DMA_FIFO_CTRL);</div><div class='add'>+</div><div class='add'>+	bcmasp_tx_reclaim(intf);</div><div class='add'>+</div><div class='add'>+	umac_enable_set(intf, UMC_CMD_TX_EN, 0);</div><div class='add'>+</div><div class='add'>+	phy_stop(dev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	umac_enable_set(intf, UMC_CMD_RX_EN, 0);</div><div class='add'>+</div><div class='add'>+	bcmasp_flush_rx_port(intf);</div><div class='add'>+	usleep_range(1000, 2000);</div><div class='add'>+	bcmasp_enable_rx(intf, 0);</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;intf-&gt;rx_napi);</div><div class='add'>+</div><div class='add'>+	/* Disable interrupts */</div><div class='add'>+	bcmasp_enable_tx_irq(intf, 0);</div><div class='add'>+	bcmasp_enable_rx_irq(intf, 0);</div><div class='add'>+	bcmasp_enable_phy_irq(intf, 0);</div><div class='add'>+</div><div class='add'>+	netif_napi_del(&amp;intf-&gt;tx_napi);</div><div class='add'>+	netif_napi_del(&amp;intf-&gt;rx_napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	netif_dbg(intf, ifdown, dev, "bcmasp stop\n");</div><div class='add'>+</div><div class='add'>+	/* Stop tx from updating HW */</div><div class='add'>+	netif_tx_disable(dev);</div><div class='add'>+</div><div class='add'>+	bcmasp_netif_deinit(dev);</div><div class='add'>+</div><div class='add'>+	bcmasp_reclaim_free_buffers(intf);</div><div class='add'>+</div><div class='add'>+	phy_disconnect(dev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	/* Disable internal EPHY or external PHY */</div><div class='add'>+	if (intf-&gt;internal_phy)</div><div class='add'>+		bcmasp_ephy_enable_set(intf, false);</div><div class='add'>+	else</div><div class='add'>+		bcmasp_rgmii_mode_en_set(intf, false);</div><div class='add'>+</div><div class='add'>+	/* Disable the interface clocks */</div><div class='add'>+	bcmasp_core_clock_set_intf(intf, false);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(intf-&gt;parent-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_configure_port(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	u32 reg, id_mode_dis = 0;</div><div class='add'>+</div><div class='add'>+	reg = rgmii_rl(intf, RGMII_PORT_CNTRL);</div><div class='add'>+	reg &amp;= ~RGMII_PORT_MODE_MASK;</div><div class='add'>+</div><div class='add'>+	switch (intf-&gt;phy_interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+		/* RGMII_NO_ID: TXC transitions at the same time as TXD</div><div class='add'>+		 *		(requires PCB or receiver-side delay)</div><div class='add'>+		 * RGMII:	Add 2ns delay on TXC (90 degree shift)</div><div class='add'>+		 *</div><div class='add'>+		 * ID is implicitly disabled for 100Mbps (RG)MII operation.</div><div class='add'>+		 */</div><div class='add'>+		id_mode_dis = RGMII_ID_MODE_DIS;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		reg |= RGMII_PORT_MODE_EXT_GPHY;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_MII:</div><div class='add'>+		reg |= RGMII_PORT_MODE_EXT_EPHY;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;internal_phy)</div><div class='add'>+		reg |= RGMII_PORT_MODE_EPHY;</div><div class='add'>+</div><div class='add'>+	rgmii_wl(intf, reg, RGMII_PORT_CNTRL);</div><div class='add'>+</div><div class='add'>+	reg = rgmii_rl(intf, RGMII_OOB_CNTRL);</div><div class='add'>+	reg &amp;= ~RGMII_ID_MODE_DIS;</div><div class='add'>+	reg |= id_mode_dis;</div><div class='add'>+	rgmii_wl(intf, reg, RGMII_OOB_CNTRL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_netif_init(struct net_device *dev, bool phy_connect)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	phy_interface_t phy_iface = intf-&gt;phy_interface;</div><div class='add'>+	u32 phy_flags = PHY_BRCM_AUTO_PWRDWN_ENABLE |</div><div class='add'>+			PHY_BRCM_DIS_TXCRXC_NOENRGY |</div><div class='add'>+			PHY_BRCM_IDDQ_SUSPEND;</div><div class='add'>+	struct phy_device *phydev = NULL;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Always enable interface clocks */</div><div class='add'>+	bcmasp_core_clock_set_intf(intf, true);</div><div class='add'>+</div><div class='add'>+	/* Enable internal PHY or external PHY before any MAC activity */</div><div class='add'>+	if (intf-&gt;internal_phy)</div><div class='add'>+		bcmasp_ephy_enable_set(intf, true);</div><div class='add'>+	else</div><div class='add'>+		bcmasp_rgmii_mode_en_set(intf, true);</div><div class='add'>+	bcmasp_configure_port(intf);</div><div class='add'>+</div><div class='add'>+	/* This is an ugly quirk but we have not been correctly</div><div class='add'>+	 * interpreting the phy_interface values and we have done that</div><div class='add'>+	 * across different drivers, so at least we are consistent in</div><div class='add'>+	 * our mistakes.</div><div class='add'>+	 *</div><div class='add'>+	 * When the Generic PHY driver is in use either the PHY has</div><div class='add'>+	 * been strapped or programmed correctly by the boot loader so</div><div class='add'>+	 * we should stick to our incorrect interpretation since we</div><div class='add'>+	 * have validated it.</div><div class='add'>+	 *</div><div class='add'>+	 * Now when a dedicated PHY driver is in use, we need to</div><div class='add'>+	 * reverse the meaning of the phy_interface_mode values to</div><div class='add'>+	 * something that the PHY driver will interpret and act on such</div><div class='add'>+	 * that we have two mistakes canceling themselves so to speak.</div><div class='add'>+	 * We only do this for the two modes that GENET driver</div><div class='add'>+	 * officially supports on Broadcom STB chips:</div><div class='add'>+	 * PHY_INTERFACE_MODE_RGMII and PHY_INTERFACE_MODE_RGMII_TXID.</div><div class='add'>+	 * Other modes are not *officially* supported with the boot</div><div class='add'>+	 * loader and the scripted environment generating Device Tree</div><div class='add'>+	 * blobs for those platforms.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that internal PHY and fixed-link configurations are not</div><div class='add'>+	 * affected because they use different phy_interface_t values</div><div class='add'>+	 * or the Generic PHY driver.</div><div class='add'>+	 */</div><div class='add'>+	switch (phy_iface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+		phy_iface = PHY_INTERFACE_MODE_RGMII_ID;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		phy_iface = PHY_INTERFACE_MODE_RGMII_RXID;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (phy_connect) {</div><div class='add'>+		phydev = of_phy_connect(dev, intf-&gt;phy_dn,</div><div class='add'>+					bcmasp_adj_link, phy_flags,</div><div class='add'>+					phy_iface);</div><div class='add'>+		if (!phydev) {</div><div class='add'>+			ret = -ENODEV;</div><div class='add'>+			netdev_err(dev, "could not attach to PHY\n");</div><div class='add'>+			goto err_phy_disable;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (intf-&gt;internal_phy)</div><div class='add'>+			dev-&gt;phydev-&gt;irq = PHY_MAC_INTERRUPT;</div><div class='add'>+</div><div class='add'>+		/* Indicate that the MAC is responsible for PHY PM */</div><div class='add'>+		phydev-&gt;mac_managed_pm = true;</div><div class='add'>+</div><div class='add'>+		/* Set phylib's copy of the LPI timer */</div><div class='add'>+		phydev-&gt;eee_cfg.tx_lpi_timer = umac_rl(intf, UMC_EEE_LPI_TIMER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	umac_reset(intf);</div><div class='add'>+</div><div class='add'>+	umac_init(intf);</div><div class='add'>+</div><div class='add'>+	umac_set_hw_addr(intf, dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	intf-&gt;old_duplex = -1;</div><div class='add'>+	intf-&gt;old_link = -1;</div><div class='add'>+	intf-&gt;old_pause = -1;</div><div class='add'>+</div><div class='add'>+	bcmasp_init_tx(intf);</div><div class='add'>+	netif_napi_add_tx(intf-&gt;ndev, &amp;intf-&gt;tx_napi, bcmasp_tx_poll);</div><div class='add'>+	bcmasp_enable_tx(intf, 1);</div><div class='add'>+</div><div class='add'>+	bcmasp_init_rx(intf);</div><div class='add'>+	netif_napi_add(intf-&gt;ndev, &amp;intf-&gt;rx_napi, bcmasp_rx_poll);</div><div class='add'>+	bcmasp_enable_rx(intf, 1);</div><div class='add'>+</div><div class='add'>+	intf-&gt;crc_fwd = !!(umac_rl(intf, UMC_CMD) &amp; UMC_CMD_CRC_FWD);</div><div class='add'>+</div><div class='add'>+	bcmasp_netif_start(dev);</div><div class='add'>+</div><div class='add'>+	netif_start_queue(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_phy_disable:</div><div class='add'>+	if (intf-&gt;internal_phy)</div><div class='add'>+		bcmasp_ephy_enable_set(intf, false);</div><div class='add'>+	else</div><div class='add'>+		bcmasp_rgmii_mode_en_set(intf, false);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	netif_dbg(intf, ifup, dev, "bcmasp open\n");</div><div class='add'>+</div><div class='add'>+	ret = bcmasp_alloc_buffers(intf);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(intf-&gt;parent-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+</div><div class='add'>+	ret = bcmasp_netif_init(dev, true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		clk_disable_unprepare(intf-&gt;parent-&gt;clk);</div><div class='add'>+		goto err_free_mem;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+err_free_mem:</div><div class='add'>+	bcmasp_reclaim_free_buffers(intf);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	netif_dbg(intf, tx_err, dev, "transmit timeout!\n");</div><div class='add'>+	intf-&gt;mib.tx_timeout_cnt++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmasp_get_phys_port_name(struct net_device *dev,</div><div class='add'>+				     char *name, size_t len)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (snprintf(name, len, "p%d", intf-&gt;port) &gt;= len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_get_stats64(struct net_device *dev,</div><div class='add'>+			       struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct bcmasp_intf *intf = netdev_priv(dev);</div><div class='add'>+	struct bcmasp_intf_stats64 *lstats;</div><div class='add'>+	unsigned int start;</div><div class='add'>+</div><div class='add'>+	lstats = &amp;intf-&gt;stats64;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;lstats-&gt;syncp);</div><div class='add'>+		stats-&gt;rx_packets = u64_stats_read(&amp;lstats-&gt;rx_packets);</div><div class='add'>+		stats-&gt;rx_bytes = u64_stats_read(&amp;lstats-&gt;rx_bytes);</div><div class='add'>+		stats-&gt;rx_dropped = u64_stats_read(&amp;lstats-&gt;rx_dropped);</div><div class='add'>+		stats-&gt;rx_crc_errors = u64_stats_read(&amp;lstats-&gt;rx_crc_errs);</div><div class='add'>+		stats-&gt;rx_frame_errors = u64_stats_read(&amp;lstats-&gt;rx_sym_errs);</div><div class='add'>+		stats-&gt;rx_errors = stats-&gt;rx_crc_errors + stats-&gt;rx_frame_errors;</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_packets = u64_stats_read(&amp;lstats-&gt;tx_packets);</div><div class='add'>+		stats-&gt;tx_bytes = u64_stats_read(&amp;lstats-&gt;tx_bytes);</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;lstats-&gt;syncp, start));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops bcmasp_netdev_ops = {</div><div class='add'>+	.ndo_open		= bcmasp_open,</div><div class='add'>+	.ndo_stop		= bcmasp_stop,</div><div class='add'>+	.ndo_start_xmit		= bcmasp_xmit,</div><div class='add'>+	.ndo_tx_timeout		= bcmasp_tx_timeout,</div><div class='add'>+	.ndo_set_rx_mode	= bcmasp_set_rx_mode,</div><div class='add'>+	.ndo_get_phys_port_name	= bcmasp_get_phys_port_name,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl_running,</div><div class='add'>+	.ndo_set_mac_address	= eth_mac_addr,</div><div class='add'>+	.ndo_get_stats64	= bcmasp_get_stats64,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bcmasp_map_res(struct bcmasp_priv *priv, struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	/* Per port */</div><div class='add'>+	intf-&gt;res.umac = priv-&gt;base + UMC_OFFSET(intf);</div><div class='add'>+	intf-&gt;res.umac2fb = priv-&gt;base + (UMAC2FB_OFFSET + priv-&gt;rx_ctrl_offset +</div><div class='add'>+					  (intf-&gt;port * 0x4));</div><div class='add'>+	intf-&gt;res.rgmii = priv-&gt;base + RGMII_OFFSET(intf);</div><div class='add'>+</div><div class='add'>+	/* Per ch */</div><div class='add'>+	intf-&gt;tx_spb_dma = priv-&gt;base + TX_SPB_DMA_OFFSET(intf);</div><div class='add'>+	intf-&gt;res.tx_spb_ctrl = priv-&gt;base + TX_SPB_CTRL_OFFSET(intf);</div><div class='add'>+	intf-&gt;res.tx_spb_top = priv-&gt;base + TX_SPB_TOP_OFFSET(intf);</div><div class='add'>+	intf-&gt;res.tx_epkt_core = priv-&gt;base + TX_EPKT_C_OFFSET(intf);</div><div class='add'>+	intf-&gt;res.tx_pause_ctrl = priv-&gt;base + TX_PAUSE_CTRL_OFFSET(intf);</div><div class='add'>+</div><div class='add'>+	intf-&gt;rx_edpkt_dma = priv-&gt;base + RX_EDPKT_DMA_OFFSET(intf);</div><div class='add'>+	intf-&gt;rx_edpkt_cfg = priv-&gt;base + RX_EDPKT_CFG_OFFSET(intf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bcmasp_intf *bcmasp_interface_create(struct bcmasp_priv *priv,</div><div class='add'>+					    struct device_node *ndev_dn, int i)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	struct bcmasp_intf *intf;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	int ch, port, ret;</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(ndev_dn, "reg", &amp;port)) {</div><div class='add'>+		dev_warn(dev, "%s: invalid port number\n", ndev_dn-&gt;name);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (of_property_read_u32(ndev_dn, "brcm,channel", &amp;ch)) {</div><div class='add'>+		dev_warn(dev, "%s: invalid ch number\n", ndev_dn-&gt;name);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ndev = alloc_etherdev(sizeof(struct bcmasp_intf));</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		dev_warn(dev, "%s: unable to alloc ndev\n", ndev_dn-&gt;name);</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+	intf = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	intf-&gt;parent = priv;</div><div class='add'>+	intf-&gt;ndev = ndev;</div><div class='add'>+	intf-&gt;channel = ch;</div><div class='add'>+	intf-&gt;port = port;</div><div class='add'>+	intf-&gt;ndev_dn = ndev_dn;</div><div class='add'>+	intf-&gt;index = i;</div><div class='add'>+</div><div class='add'>+	ret = of_get_phy_mode(ndev_dn, &amp;intf-&gt;phy_interface);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(dev, "invalid PHY mode property\n");</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;phy_interface == PHY_INTERFACE_MODE_INTERNAL)</div><div class='add'>+		intf-&gt;internal_phy = true;</div><div class='add'>+</div><div class='add'>+	intf-&gt;phy_dn = of_parse_phandle(ndev_dn, "phy-handle", 0);</div><div class='add'>+	if (!intf-&gt;phy_dn &amp;&amp; of_phy_is_fixed_link(ndev_dn)) {</div><div class='add'>+		ret = of_phy_register_fixed_link(ndev_dn);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_warn(dev, "%s: failed to register fixed PHY\n",</div><div class='add'>+				 ndev_dn-&gt;name);</div><div class='add'>+			goto err_free_netdev;</div><div class='add'>+		}</div><div class='add'>+		intf-&gt;phy_dn = ndev_dn;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Map resource */</div><div class='add'>+	bcmasp_map_res(priv, intf);</div><div class='add'>+</div><div class='add'>+	if ((!phy_interface_mode_is_rgmii(intf-&gt;phy_interface) &amp;&amp;</div><div class='add'>+	     intf-&gt;phy_interface != PHY_INTERFACE_MODE_MII &amp;&amp;</div><div class='add'>+	     intf-&gt;phy_interface != PHY_INTERFACE_MODE_INTERNAL) ||</div><div class='add'>+	    (intf-&gt;port != 1 &amp;&amp; intf-&gt;internal_phy)) {</div><div class='add'>+		netdev_err(intf-&gt;ndev, "invalid PHY mode: %s for port %d\n",</div><div class='add'>+			   phy_modes(intf-&gt;phy_interface), intf-&gt;port);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = of_get_ethdev_address(ndev_dn, ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_warn(ndev, "using random Ethernet MAC\n");</div><div class='add'>+		eth_hw_addr_random(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, dev);</div><div class='add'>+	intf-&gt;ops = &amp;bcmasp_intf_ops;</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;bcmasp_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;bcmasp_ethtool_ops;</div><div class='add'>+	intf-&gt;msg_enable = netif_msg_init(-1, NETIF_MSG_DRV |</div><div class='add'>+					  NETIF_MSG_PROBE |</div><div class='add'>+					  NETIF_MSG_LINK);</div><div class='add'>+	ndev-&gt;features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |</div><div class='add'>+			  NETIF_F_RXCSUM;</div><div class='add'>+	ndev-&gt;hw_features |= ndev-&gt;features;</div><div class='add'>+	ndev-&gt;needed_headroom += sizeof(struct bcmasp_pkt_offload);</div><div class='add'>+</div><div class='add'>+	netdev_sw_irq_coalesce_default_on(ndev);</div><div class='add'>+</div><div class='add'>+	return intf;</div><div class='add'>+</div><div class='add'>+err_free_netdev:</div><div class='add'>+	free_netdev(ndev);</div><div class='add'>+err:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bcmasp_interface_destroy(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	if (intf-&gt;ndev-&gt;reg_state == NETREG_REGISTERED)</div><div class='add'>+		unregister_netdev(intf-&gt;ndev);</div><div class='add'>+	if (of_phy_is_fixed_link(intf-&gt;ndev_dn))</div><div class='add'>+		of_phy_deregister_fixed_link(intf-&gt;ndev_dn);</div><div class='add'>+	free_netdev(intf-&gt;ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_suspend_to_wol(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = intf-&gt;ndev;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	reg = umac_rl(intf, UMC_MPD_CTRL);</div><div class='add'>+	if (intf-&gt;wolopts &amp; (WAKE_MAGIC | WAKE_MAGICSECURE))</div><div class='add'>+		reg |= UMC_MPD_CTRL_MPD_EN;</div><div class='add'>+	reg &amp;= ~UMC_MPD_CTRL_PSW_EN;</div><div class='add'>+	if (intf-&gt;wolopts &amp; WAKE_MAGICSECURE) {</div><div class='add'>+		/* Program the SecureOn password */</div><div class='add'>+		umac_wl(intf, get_unaligned_be16(&amp;intf-&gt;sopass[0]),</div><div class='add'>+			UMC_PSW_MS);</div><div class='add'>+		umac_wl(intf, get_unaligned_be32(&amp;intf-&gt;sopass[2]),</div><div class='add'>+			UMC_PSW_LS);</div><div class='add'>+		reg |= UMC_MPD_CTRL_PSW_EN;</div><div class='add'>+	}</div><div class='add'>+	umac_wl(intf, reg, UMC_MPD_CTRL);</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;wolopts &amp; WAKE_FILTER)</div><div class='add'>+		bcmasp_netfilt_suspend(intf);</div><div class='add'>+</div><div class='add'>+	/* Bring UniMAC out of reset if needed and enable RX */</div><div class='add'>+	reg = umac_rl(intf, UMC_CMD);</div><div class='add'>+	if (reg &amp; UMC_CMD_SW_RESET)</div><div class='add'>+		reg &amp;= ~UMC_CMD_SW_RESET;</div><div class='add'>+</div><div class='add'>+	reg |= UMC_CMD_RX_EN | UMC_CMD_PROMISC;</div><div class='add'>+	umac_wl(intf, reg, UMC_CMD);</div><div class='add'>+</div><div class='add'>+	umac_enable_set(intf, UMC_CMD_RX_EN, 1);</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;parent-&gt;wol_irq &gt; 0) {</div><div class='add'>+		wakeup_intr2_core_wl(intf-&gt;parent, 0xffffffff,</div><div class='add'>+				     ASP_WAKEUP_INTR2_MASK_CLEAR);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;phydev &amp;&amp; ndev-&gt;phydev-&gt;eee_cfg.eee_enabled &amp;&amp;</div><div class='add'>+	    intf-&gt;parent-&gt;eee_fixup)</div><div class='add'>+		intf-&gt;parent-&gt;eee_fixup(intf, true);</div><div class='add'>+</div><div class='add'>+	netif_dbg(intf, wol, ndev, "entered WOL mode\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcmasp_interface_suspend(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct device *kdev = &amp;intf-&gt;parent-&gt;pdev-&gt;dev;</div><div class='add'>+	struct net_device *dev = intf-&gt;ndev;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	netif_device_detach(dev);</div><div class='add'>+</div><div class='add'>+	bcmasp_netif_deinit(dev);</div><div class='add'>+</div><div class='add'>+	if (!intf-&gt;wolopts) {</div><div class='add'>+		if (intf-&gt;internal_phy)</div><div class='add'>+			bcmasp_ephy_enable_set(intf, false);</div><div class='add'>+		else</div><div class='add'>+			bcmasp_rgmii_mode_en_set(intf, false);</div><div class='add'>+</div><div class='add'>+		/* If Wake-on-LAN is disabled, we can safely</div><div class='add'>+		 * disable the network interface clocks.</div><div class='add'>+		 */</div><div class='add'>+		bcmasp_core_clock_set_intf(intf, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(kdev) &amp;&amp; intf-&gt;wolopts)</div><div class='add'>+		bcmasp_suspend_to_wol(intf);</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(intf-&gt;parent-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmasp_resume_from_wol(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;ndev-&gt;phydev &amp;&amp; intf-&gt;ndev-&gt;phydev-&gt;eee_cfg.eee_enabled &amp;&amp;</div><div class='add'>+	    intf-&gt;parent-&gt;eee_fixup)</div><div class='add'>+		intf-&gt;parent-&gt;eee_fixup(intf, false);</div><div class='add'>+</div><div class='add'>+	reg = umac_rl(intf, UMC_MPD_CTRL);</div><div class='add'>+	reg &amp;= ~UMC_MPD_CTRL_MPD_EN;</div><div class='add'>+	umac_wl(intf, reg, UMC_MPD_CTRL);</div><div class='add'>+</div><div class='add'>+	if (intf-&gt;parent-&gt;wol_irq &gt; 0) {</div><div class='add'>+		wakeup_intr2_core_wl(intf-&gt;parent, 0xffffffff,</div><div class='add'>+				     ASP_WAKEUP_INTR2_MASK_SET);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bcmasp_interface_resume(struct bcmasp_intf *intf)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = intf-&gt;ndev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(intf-&gt;parent-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = bcmasp_netif_init(dev, false);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	bcmasp_resume_from_wol(intf);</div><div class='add'>+</div><div class='add'>+	netif_device_attach(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	clk_disable_unprepare(intf-&gt;parent-&gt;clk);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h<br/>new file mode 100644<br/>index 000000000000..af7418348e81<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h</a></div><div class='hunk'>@@ -0,0 +1,256 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+#ifndef __BCMASP_INTF_DEFS_H</div><div class='add'>+#define __BCMASP_INTF_DEFS_H</div><div class='add'>+</div><div class='add'>+#define UMC_OFFSET(intf)		\</div><div class='add'>+	((((intf)-&gt;port) * 0x800) + 0xc000)</div><div class='add'>+#define  UMC_CMD			0x008</div><div class='add'>+#define   UMC_CMD_TX_EN			BIT(0)</div><div class='add'>+#define   UMC_CMD_RX_EN			BIT(1)</div><div class='add'>+#define   UMC_CMD_SPEED_SHIFT		0x2</div><div class='add'>+#define    UMC_CMD_SPEED_MASK		0x3</div><div class='add'>+#define    UMC_CMD_SPEED_10		0x0</div><div class='add'>+#define    UMC_CMD_SPEED_100		0x1</div><div class='add'>+#define    UMC_CMD_SPEED_1000		0x2</div><div class='add'>+#define    UMC_CMD_SPEED_2500		0x3</div><div class='add'>+#define   UMC_CMD_PROMISC		BIT(4)</div><div class='add'>+#define   UMC_CMD_PAD_EN		BIT(5)</div><div class='add'>+#define   UMC_CMD_CRC_FWD		BIT(6)</div><div class='add'>+#define   UMC_CMD_PAUSE_FWD		BIT(7)</div><div class='add'>+#define   UMC_CMD_RX_PAUSE_IGNORE	BIT(8)</div><div class='add'>+#define   UMC_CMD_TX_ADDR_INS		BIT(9)</div><div class='add'>+#define   UMC_CMD_HD_EN			BIT(10)</div><div class='add'>+#define   UMC_CMD_SW_RESET		BIT(13)</div><div class='add'>+#define   UMC_CMD_LCL_LOOP_EN		BIT(15)</div><div class='add'>+#define   UMC_CMD_AUTO_CONFIG		BIT(22)</div><div class='add'>+#define   UMC_CMD_CNTL_FRM_EN		BIT(23)</div><div class='add'>+#define   UMC_CMD_NO_LEN_CHK		BIT(24)</div><div class='add'>+#define   UMC_CMD_RMT_LOOP_EN		BIT(25)</div><div class='add'>+#define   UMC_CMD_PRBL_EN		BIT(27)</div><div class='add'>+#define   UMC_CMD_TX_PAUSE_IGNORE	BIT(28)</div><div class='add'>+#define   UMC_CMD_TX_RX_EN		BIT(29)</div><div class='add'>+#define   UMC_CMD_RUNT_FILTER_DIS	BIT(30)</div><div class='add'>+#define  UMC_MAC0			0x0c</div><div class='add'>+#define  UMC_MAC1			0x10</div><div class='add'>+#define  UMC_FRM_LEN			0x14</div><div class='add'>+#define  UMC_EEE_CTRL			0x64</div><div class='add'>+#define   EN_LPI_RX_PAUSE		BIT(0)</div><div class='add'>+#define   EN_LPI_TX_PFC			BIT(1)</div><div class='add'>+#define   EN_LPI_TX_PAUSE		BIT(2)</div><div class='add'>+#define   EEE_EN			BIT(3)</div><div class='add'>+#define   RX_FIFO_CHECK			BIT(4)</div><div class='add'>+#define   EEE_TX_CLK_DIS		BIT(5)</div><div class='add'>+#define   DIS_EEE_10M			BIT(6)</div><div class='add'>+#define   LP_IDLE_PREDICTION_MODE	BIT(7)</div><div class='add'>+#define  UMC_EEE_LPI_TIMER		0x68</div><div class='add'>+#define  UMC_PAUSE_CNTRL		0x330</div><div class='add'>+#define  UMC_TX_FLUSH			0x334</div><div class='add'>+#define  UMC_GR64			0x400</div><div class='add'>+#define  UMC_GR127			0x404</div><div class='add'>+#define  UMC_GR255			0x408</div><div class='add'>+#define  UMC_GR511			0x40c</div><div class='add'>+#define  UMC_GR1023			0x410</div><div class='add'>+#define  UMC_GR1518			0x414</div><div class='add'>+#define  UMC_GRMGV			0x418</div><div class='add'>+#define  UMC_GR2047			0x41c</div><div class='add'>+#define  UMC_GR4095			0x420</div><div class='add'>+#define  UMC_GR9216			0x424</div><div class='add'>+#define  UMC_GRPKT			0x428</div><div class='add'>+#define  UMC_GRBYT			0x42c</div><div class='add'>+#define  UMC_GRMCA			0x430</div><div class='add'>+#define  UMC_GRBCA			0x434</div><div class='add'>+#define  UMC_GRFCS			0x438</div><div class='add'>+#define  UMC_GRXCF			0x43c</div><div class='add'>+#define  UMC_GRXPF			0x440</div><div class='add'>+#define  UMC_GRXUO			0x444</div><div class='add'>+#define  UMC_GRALN			0x448</div><div class='add'>+#define  UMC_GRFLR			0x44c</div><div class='add'>+#define  UMC_GRCDE			0x450</div><div class='add'>+#define  UMC_GRFCR			0x454</div><div class='add'>+#define  UMC_GROVR			0x458</div><div class='add'>+#define  UMC_GRJBR			0x45c</div><div class='add'>+#define  UMC_GRMTUE			0x460</div><div class='add'>+#define  UMC_GRPOK			0x464</div><div class='add'>+#define  UMC_GRUC			0x468</div><div class='add'>+#define  UMC_GRPPP			0x46c</div><div class='add'>+#define  UMC_GRMCRC			0x470</div><div class='add'>+#define  UMC_TR64			0x480</div><div class='add'>+#define  UMC_TR127			0x484</div><div class='add'>+#define  UMC_TR255			0x488</div><div class='add'>+#define  UMC_TR511			0x48c</div><div class='add'>+#define  UMC_TR1023			0x490</div><div class='add'>+#define  UMC_TR1518			0x494</div><div class='add'>+#define  UMC_TRMGV			0x498</div><div class='add'>+#define  UMC_TR2047			0x49c</div><div class='add'>+#define  UMC_TR4095			0x4a0</div><div class='add'>+#define  UMC_TR9216			0x4a4</div><div class='add'>+#define  UMC_GTPKT			0x4a8</div><div class='add'>+#define  UMC_GTMCA			0x4ac</div><div class='add'>+#define  UMC_GTBCA			0x4b0</div><div class='add'>+#define  UMC_GTXPF			0x4b4</div><div class='add'>+#define  UMC_GTXCF			0x4b8</div><div class='add'>+#define  UMC_GTFCS			0x4bc</div><div class='add'>+#define  UMC_GTOVR			0x4c0</div><div class='add'>+#define  UMC_GTDRF			0x4c4</div><div class='add'>+#define  UMC_GTEDF			0x4c8</div><div class='add'>+#define  UMC_GTSCL			0x4cc</div><div class='add'>+#define  UMC_GTMCL			0x4d0</div><div class='add'>+#define  UMC_GTLCL			0x4d4</div><div class='add'>+#define  UMC_GTXCL			0x4d8</div><div class='add'>+#define  UMC_GTFRG			0x4dc</div><div class='add'>+#define  UMC_GTNCL			0x4e0</div><div class='add'>+#define  UMC_GTJBR			0x4e4</div><div class='add'>+#define  UMC_GTBYT			0x4e8</div><div class='add'>+#define  UMC_GTPOK			0x4ec</div><div class='add'>+#define  UMC_GTUC			0x4f0</div><div class='add'>+#define  UMC_RRPKT			0x500</div><div class='add'>+#define  UMC_RRUND			0x504</div><div class='add'>+#define  UMC_RRFRG			0x508</div><div class='add'>+#define  UMC_RRBYT			0x50c</div><div class='add'>+#define  UMC_MIB_CNTRL			0x580</div><div class='add'>+#define   UMC_MIB_CNTRL_RX_CNT_RST	BIT(0)</div><div class='add'>+#define   UMC_MIB_CNTRL_RUNT_CNT_RST	BIT(1)</div><div class='add'>+#define   UMC_MIB_CNTRL_TX_CNT_RST	BIT(2)</div><div class='add'>+#define  UMC_RX_MAX_PKT_SZ		0x608</div><div class='add'>+#define  UMC_MPD_CTRL			0x620</div><div class='add'>+#define   UMC_MPD_CTRL_MPD_EN		BIT(0)</div><div class='add'>+#define   UMC_MPD_CTRL_PSW_EN		BIT(27)</div><div class='add'>+#define  UMC_PSW_MS			0x624</div><div class='add'>+#define  UMC_PSW_LS			0x628</div><div class='add'>+</div><div class='add'>+#define UMAC2FB_OFFSET			0x9f044</div><div class='add'>+#define  UMAC2FB_CFG			0x0</div><div class='add'>+#define   UMAC2FB_CFG_OPUT_EN		BIT(0)</div><div class='add'>+#define   UMAC2FB_CFG_VLAN_EN		BIT(1)</div><div class='add'>+#define   UMAC2FB_CFG_SNAP_EN		BIT(2)</div><div class='add'>+#define   UMAC2FB_CFG_BCM_TG_EN		BIT(3)</div><div class='add'>+#define   UMAC2FB_CFG_IPUT_EN		BIT(4)</div><div class='add'>+#define   UMAC2FB_CFG_CHID_SHIFT	8</div><div class='add'>+#define   UMAC2FB_CFG_OK_SEND_SHIFT	24</div><div class='add'>+#define   UMAC2FB_CFG_DEFAULT_EN	\</div><div class='add'>+		(UMAC2FB_CFG_OPUT_EN | UMAC2FB_CFG_VLAN_EN \</div><div class='add'>+		| UMAC2FB_CFG_SNAP_EN | UMAC2FB_CFG_IPUT_EN)</div><div class='add'>+</div><div class='add'>+#define RGMII_OFFSET(intf)	\</div><div class='add'>+	((((intf)-&gt;port) * 0x100) + 0xd000)</div><div class='add'>+#define  RGMII_EPHY_CNTRL		0x00</div><div class='add'>+#define    RGMII_EPHY_CFG_IDDQ_BIAS	BIT(0)</div><div class='add'>+#define    RGMII_EPHY_CFG_EXT_PWRDOWN	BIT(1)</div><div class='add'>+#define    RGMII_EPHY_CFG_FORCE_DLL_EN	BIT(2)</div><div class='add'>+#define    RGMII_EPHY_CFG_IDDQ_GLOBAL	BIT(3)</div><div class='add'>+#define    RGMII_EPHY_CK25_DIS		BIT(4)</div><div class='add'>+#define    RGMII_EPHY_RESET		BIT(7)</div><div class='add'>+#define  RGMII_OOB_CNTRL		0x0c</div><div class='add'>+#define   RGMII_LINK			BIT(4)</div><div class='add'>+#define   RGMII_OOB_DIS			BIT(5)</div><div class='add'>+#define   RGMII_MODE_EN			BIT(6)</div><div class='add'>+#define   RGMII_ID_MODE_DIS		BIT(16)</div><div class='add'>+</div><div class='add'>+#define RGMII_PORT_CNTRL		0x60</div><div class='add'>+#define   RGMII_PORT_MODE_EPHY		0</div><div class='add'>+#define   RGMII_PORT_MODE_GPHY		1</div><div class='add'>+#define   RGMII_PORT_MODE_EXT_EPHY	2</div><div class='add'>+#define   RGMII_PORT_MODE_EXT_GPHY	3</div><div class='add'>+#define   RGMII_PORT_MODE_EXT_RVMII	4</div><div class='add'>+#define   RGMII_PORT_MODE_MASK		GENMASK(2, 0)</div><div class='add'>+</div><div class='add'>+#define RGMII_SYS_LED_CNTRL		0x74</div><div class='add'>+#define  RGMII_SYS_LED_CNTRL_LINK_OVRD	BIT(15)</div><div class='add'>+</div><div class='add'>+#define TX_SPB_DMA_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x30) + 0x48180)</div><div class='add'>+#define  TX_SPB_DMA_READ		0x00</div><div class='add'>+#define  TX_SPB_DMA_BASE		0x08</div><div class='add'>+#define  TX_SPB_DMA_END			0x10</div><div class='add'>+#define  TX_SPB_DMA_VALID		0x18</div><div class='add'>+#define  TX_SPB_DMA_FIFO_CTRL		0x20</div><div class='add'>+#define   TX_SPB_DMA_FIFO_FLUSH		BIT(0)</div><div class='add'>+#define  TX_SPB_DMA_FIFO_STATUS		0x24</div><div class='add'>+</div><div class='add'>+#define TX_SPB_CTRL_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x68) + 0x49340)</div><div class='add'>+#define  TX_SPB_CTRL_ENABLE		0x0</div><div class='add'>+#define   TX_SPB_CTRL_ENABLE_EN		BIT(0)</div><div class='add'>+#define  TX_SPB_CTRL_XF_CTRL2		0x20</div><div class='add'>+#define   TX_SPB_CTRL_XF_BID_SHIFT	16</div><div class='add'>+</div><div class='add'>+#define TX_SPB_TOP_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x1c) + 0x4a0e0)</div><div class='add'>+#define TX_SPB_TOP_BLKOUT		0x0</div><div class='add'>+#define TX_SPB_TOP_SPRE_BW_CTRL		0x4</div><div class='add'>+</div><div class='add'>+#define TX_EPKT_C_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x120) + 0x40900)</div><div class='add'>+#define  TX_EPKT_C_CFG_MISC		0x0</div><div class='add'>+#define   TX_EPKT_C_CFG_MISC_EN		BIT(0)</div><div class='add'>+#define   TX_EPKT_C_CFG_MISC_PT		BIT(1)</div><div class='add'>+#define   TX_EPKT_C_CFG_MISC_PS_SHIFT	14</div><div class='add'>+#define   TX_EPKT_C_CFG_MISC_FD_SHIFT	20</div><div class='add'>+</div><div class='add'>+#define TX_PAUSE_CTRL_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel * 0xc) + 0x49a20))</div><div class='add'>+#define  TX_PAUSE_MAP_VECTOR		0x8</div><div class='add'>+</div><div class='add'>+#define RX_EDPKT_DMA_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x38) + 0x9ca00)</div><div class='add'>+#define  RX_EDPKT_DMA_WRITE		0x00</div><div class='add'>+#define  RX_EDPKT_DMA_READ		0x08</div><div class='add'>+#define  RX_EDPKT_DMA_BASE		0x10</div><div class='add'>+#define  RX_EDPKT_DMA_END		0x18</div><div class='add'>+#define  RX_EDPKT_DMA_VALID		0x20</div><div class='add'>+#define  RX_EDPKT_DMA_FULLNESS		0x28</div><div class='add'>+#define  RX_EDPKT_DMA_MIN_THRES		0x2c</div><div class='add'>+#define  RX_EDPKT_DMA_CH_XONOFF		0x30</div><div class='add'>+</div><div class='add'>+#define RX_EDPKT_CFG_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x70) + 0x9c600)</div><div class='add'>+#define  RX_EDPKT_CFG_CFG0		0x0</div><div class='add'>+#define   RX_EDPKT_CFG_CFG0_DBUF_SHIFT	9</div><div class='add'>+#define    RX_EDPKT_CFG_CFG0_RBUF	0x0</div><div class='add'>+#define    RX_EDPKT_CFG_CFG0_RBUF_4K	0x1</div><div class='add'>+#define    RX_EDPKT_CFG_CFG0_BUF_4K	0x2</div><div class='add'>+/* EFRM STUFF, 0 = no byte stuff, 1 = two byte stuff */</div><div class='add'>+#define   RX_EDPKT_CFG_CFG0_EFRM_STUF	BIT(11)</div><div class='add'>+#define   RX_EDPKT_CFG_CFG0_BALN_SHIFT	12</div><div class='add'>+#define    RX_EDPKT_CFG_CFG0_NO_ALN	0</div><div class='add'>+#define    RX_EDPKT_CFG_CFG0_4_ALN	2</div><div class='add'>+#define    RX_EDPKT_CFG_CFG0_64_ALN	6</div><div class='add'>+#define  RX_EDPKT_RING_BUFFER_WRITE	0x38</div><div class='add'>+#define  RX_EDPKT_RING_BUFFER_READ	0x40</div><div class='add'>+#define  RX_EDPKT_RING_BUFFER_BASE	0x48</div><div class='add'>+#define  RX_EDPKT_RING_BUFFER_END	0x50</div><div class='add'>+#define  RX_EDPKT_RING_BUFFER_VALID	0x58</div><div class='add'>+#define  RX_EDPKT_CFG_ENABLE		0x6c</div><div class='add'>+#define   RX_EDPKT_CFG_ENABLE_EN	BIT(0)</div><div class='add'>+</div><div class='add'>+#define RX_SPB_DMA_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel) * 0x30) + 0xa0000)</div><div class='add'>+#define  RX_SPB_DMA_READ		0x00</div><div class='add'>+#define  RX_SPB_DMA_BASE		0x08</div><div class='add'>+#define  RX_SPB_DMA_END			0x10</div><div class='add'>+#define  RX_SPB_DMA_VALID		0x18</div><div class='add'>+#define  RX_SPB_DMA_FIFO_CTRL		0x20</div><div class='add'>+#define   RX_SPB_DMA_FIFO_FLUSH		BIT(0)</div><div class='add'>+#define  RX_SPB_DMA_FIFO_STATUS		0x24</div><div class='add'>+</div><div class='add'>+#define RX_SPB_CTRL_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel - 6) * 0x68) + 0xa1000)</div><div class='add'>+#define  RX_SPB_CTRL_ENABLE		0x00</div><div class='add'>+#define   RX_SPB_CTRL_ENABLE_EN		BIT(0)</div><div class='add'>+</div><div class='add'>+#define RX_PAUSE_CTRL_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel - 6) * 0x4) + 0xa1138)</div><div class='add'>+#define  RX_PAUSE_MAP_VECTOR		0x00</div><div class='add'>+</div><div class='add'>+#define RX_SPB_TOP_CTRL_OFFSET(intf) \</div><div class='add'>+	((((intf)-&gt;channel - 6) * 0x14) + 0xa2000)</div><div class='add'>+#define  RX_SPB_TOP_BLKOUT		0x00</div><div class='add'>+</div><div class='add'>+#define NUM_4K_BUFFERS			32</div><div class='add'>+#define RING_BUFFER_SIZE		(PAGE_SIZE * NUM_4K_BUFFERS)</div><div class='add'>+</div><div class='add'>+#define DESC_RING_COUNT			(64 * NUM_4K_BUFFERS)</div><div class='add'>+#define DESC_SIZE			16</div><div class='add'>+#define DESC_RING_SIZE			(DESC_RING_COUNT * DESC_SIZE)</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c<br/>index 97ab0dd25552..888f28f11406 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/b44.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/b44.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/b44.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/b44.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/ssb/ssb.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/phy_fixed.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='hunk'>@@ -40,7 +41,6 @@</div><div class='ctx'> #include "b44.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"b44"</div><div class='del'>-#define DRV_MODULE_VERSION	"2.0"</div><div class='ctx'> #define DRV_DESCRIPTION		"Broadcom 44xx/47xx 10/100 PCI ethernet driver"</div><div class='ctx'> </div><div class='ctx'> #define B44_DEF_MSG_ENABLE	  \</div><div class='hunk'>@@ -97,7 +97,6 @@</div><div class='ctx'> MODULE_AUTHOR("Felix Fietkau, Florian Schirmer, Pekka Pietikainen, David S. Miller");</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> </div><div class='ctx'> static int b44_debug = -1;	/* -1 == use B44_DEF_MSG_ENABLE as value */</div><div class='ctx'> module_param(b44_debug, int, 0);</div><div class='hunk'>@@ -198,29 +197,8 @@ static int b44_wait_bit(struct b44 *bp, unsigned long reg,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void __b44_cam_read(struct b44 *bp, unsigned char *data, int index)</div><div class='del'>-{</div><div class='del'>-	u32 val;</div><div class='del'>-</div><div class='del'>-	bw32(bp, B44_CAM_CTRL, (CAM_CTRL_READ |</div><div class='del'>-			    (index &lt;&lt; CAM_CTRL_INDEX_SHIFT)));</div><div class='del'>-</div><div class='del'>-	b44_wait_bit(bp, B44_CAM_CTRL, CAM_CTRL_BUSY, 100, 1);</div><div class='del'>-</div><div class='del'>-	val = br32(bp, B44_CAM_DATA_LO);</div><div class='del'>-</div><div class='del'>-	data[2] = (val &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-	data[3] = (val &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	data[4] = (val &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	data[5] = (val &gt;&gt; 0) &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-	val = br32(bp, B44_CAM_DATA_HI);</div><div class='del'>-</div><div class='del'>-	data[0] = (val &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	data[1] = (val &gt;&gt; 0) &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)</div><div class='add'>+static inline void __b44_cam_write(struct b44 *bp,</div><div class='add'>+				   const unsigned char *data, int index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -511,9 +489,6 @@ static void b44_stats_update(struct b44 *bp)</div><div class='ctx'> 		*val++ += br32(bp, reg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Pad */</div><div class='del'>-	reg += 8*4UL;</div><div class='del'>-</div><div class='ctx'> 	for (reg = B44_RX_GOOD_O; reg &lt;= B44_RX_NPAUSE; reg += 4UL) {</div><div class='ctx'> 		*val++ += br32(bp, reg);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -601,7 +576,7 @@ static void b44_check_phy(struct b44 *bp)</div><div class='ctx'> </div><div class='ctx'> static void b44_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct b44 *bp = from_timer(bp, t, timer);</div><div class='add'>+	struct b44 *bp = timer_container_of(bp, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -951,7 +926,7 @@ irq_ack:</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void b44_tx_timeout(struct net_device *dev)</div><div class='add'>+static void b44_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1068,13 +1043,13 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		/* We'll just catch it later when the</div><div class='ctx'> 		 * device is up'd.</div><div class='ctx'> 		 */</div><div class='del'>-		dev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> 	b44_halt(bp);</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	b44_init_rings(bp);</div><div class='ctx'> 	b44_init_hw(bp, B44_FULL_RESET);</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='hunk'>@@ -1205,7 +1180,7 @@ static int b44_alloc_consistent(struct b44 *bp, gfp_t gfp)</div><div class='ctx'> 	bp-&gt;rx_ring = dma_alloc_coherent(bp-&gt;sdev-&gt;dma_dev, size,</div><div class='ctx'> 					 &amp;bp-&gt;rx_ring_dma, gfp);</div><div class='ctx'> 	if (!bp-&gt;rx_ring) {</div><div class='del'>-		/* Allocation may have failed due to pci_alloc_consistent</div><div class='add'>+		/* Allocation may have failed due to dma_alloc_coherent</div><div class='ctx'> 		   insisting on use of GFP_DMA, which is more restrictive</div><div class='ctx'> 		   than necessary...  */</div><div class='ctx'> 		struct dma_desc *rx_ring;</div><div class='hunk'>@@ -1388,7 +1363,7 @@ static int b44_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1512,15 +1487,18 @@ static void bwfilter_table(struct b44 *bp, u8 *pp, u32 bytes, u32 table_offset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)</div><div class='add'>+static int b44_magic_pattern(const u8 *macaddr, u8 *ppattern, u8 *pmask,</div><div class='add'>+			     int offset)</div><div class='ctx'> {</div><div class='ctx'> 	int magicsync = 6;</div><div class='ctx'> 	int k, j, len = offset;</div><div class='ctx'> 	int ethaddr_bytes = ETH_ALEN;</div><div class='ctx'> </div><div class='ctx'> 	memset(ppattern + offset, 0xff, magicsync);</div><div class='del'>-	for (j = 0; j &lt; magicsync; j++)</div><div class='del'>-		set_bit(len++, (unsigned long *) pmask);</div><div class='add'>+	for (j = 0; j &lt; magicsync; j++) {</div><div class='add'>+		pmask[len &gt;&gt; 3] |= BIT(len &amp; 7);</div><div class='add'>+		len++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for (j = 0; j &lt; B44_MAX_PATTERNS; j++) {</div><div class='ctx'> 		if ((B44_PATTERN_SIZE - len) &gt;= ETH_ALEN)</div><div class='hunk'>@@ -1532,7 +1510,8 @@ static int b44_magic_pattern(u8 *macaddr, u8 *ppattern, u8 *pmask, int offset)</div><div class='ctx'> 		for (k = 0; k&lt; ethaddr_bytes; k++) {</div><div class='ctx'> 			ppattern[offset + magicsync +</div><div class='ctx'> 				(j * ETH_ALEN) + k] = macaddr[k];</div><div class='del'>-			set_bit(len++, (unsigned long *) pmask);</div><div class='add'>+			pmask[len &gt;&gt; 3] |= BIT(len &amp; 7);</div><div class='add'>+			len++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return len - 1;</div><div class='hunk'>@@ -1558,8 +1537,8 @@ static void b44_setup_pseudo_magicp(struct b44 *bp)</div><div class='ctx'> 	plen0 = b44_magic_pattern(bp-&gt;dev-&gt;dev_addr, pwol_pattern, pwol_mask,</div><div class='ctx'> 				  B44_ETHIPV4UDP_HLEN);</div><div class='ctx'> </div><div class='del'>-   	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE, B44_PATTERN_BASE);</div><div class='del'>-   	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE, B44_PMASK_BASE);</div><div class='add'>+	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE, B44_PATTERN_BASE);</div><div class='add'>+	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE, B44_PMASK_BASE);</div><div class='ctx'> </div><div class='ctx'> 	/* Raw ethernet II magic packet pattern - pattern 1 */</div><div class='ctx'> 	memset(pwol_pattern, 0, B44_PATTERN_SIZE);</div><div class='hunk'>@@ -1567,9 +1546,9 @@ static void b44_setup_pseudo_magicp(struct b44 *bp)</div><div class='ctx'> 	plen1 = b44_magic_pattern(bp-&gt;dev-&gt;dev_addr, pwol_pattern, pwol_mask,</div><div class='ctx'> 				  ETH_HLEN);</div><div class='ctx'> </div><div class='del'>-   	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,</div><div class='add'>+	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,</div><div class='ctx'> 		       B44_PATTERN_BASE + B44_PATTERN_SIZE);</div><div class='del'>-  	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,</div><div class='add'>+	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,</div><div class='ctx'> 		       B44_PMASK_BASE + B44_PMASK_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Ipv6 magic packet pattern - pattern 2 */</div><div class='hunk'>@@ -1578,9 +1557,9 @@ static void b44_setup_pseudo_magicp(struct b44 *bp)</div><div class='ctx'> 	plen2 = b44_magic_pattern(bp-&gt;dev-&gt;dev_addr, pwol_pattern, pwol_mask,</div><div class='ctx'> 				  B44_ETHIPV6UDP_HLEN);</div><div class='ctx'> </div><div class='del'>-   	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,</div><div class='add'>+	bwfilter_table(bp, pwol_pattern, B44_PATTERN_SIZE,</div><div class='ctx'> 		       B44_PATTERN_BASE + B44_PATTERN_SIZE + B44_PATTERN_SIZE);</div><div class='del'>-  	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,</div><div class='add'>+	bwfilter_table(bp, pwol_mask, B44_PMASK_SIZE,</div><div class='ctx'> 		       B44_PMASK_BASE + B44_PMASK_SIZE + B44_PMASK_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	kfree(pwol_pattern);</div><div class='hunk'>@@ -1633,9 +1612,9 @@ static void b44_setup_wol(struct b44 *bp)</div><div class='ctx'> 		val = br32(bp, B44_DEVCTRL);</div><div class='ctx'> 		bw32(bp, B44_DEVCTRL, val | DEVCTRL_MPM | DEVCTRL_PFE);</div><div class='ctx'> </div><div class='del'>- 	} else {</div><div class='del'>- 		b44_setup_pseudo_magicp(bp);</div><div class='del'>- 	}</div><div class='add'>+	} else {</div><div class='add'>+		b44_setup_pseudo_magicp(bp);</div><div class='add'>+	}</div><div class='ctx'> 	b44_setup_wol_pci(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1650,7 +1629,7 @@ static int b44_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	napi_disable(&amp;bp-&gt;napi);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1680,7 +1659,7 @@ static void b44_get_stats64(struct net_device *dev,</div><div class='ctx'> 	unsigned int start;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;hwstat-&gt;syncp);</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;hwstat-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 		/* Convert HW stats into rtnl_link_stats64 stats. */</div><div class='ctx'> 		nstat-&gt;rx_packets = hwstat-&gt;rx_pkts;</div><div class='hunk'>@@ -1714,7 +1693,7 @@ static void b44_get_stats64(struct net_device *dev,</div><div class='ctx'> 		/* Carrier lost counter seems to be broken for some devices */</div><div class='ctx'> 		nstat-&gt;tx_carrier_errors = hwstat-&gt;tx_carrier_lost;</div><div class='ctx'> #endif</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;hwstat-&gt;syncp, start));</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;hwstat-&gt;syncp, start));</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1759,7 +1738,7 @@ static void __b44_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 			__b44_cam_write(bp, zero, i);</div><div class='ctx'> </div><div class='ctx'> 		bw32(bp, B44_RXCONFIG, val);</div><div class='del'>-        	val = br32(bp, B44_CAM_CTRL);</div><div class='add'>+		val = br32(bp, B44_CAM_CTRL);</div><div class='ctx'> 	        bw32(bp, B44_CAM_CTRL, val | CAM_CTRL_ENABLE);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1790,14 +1769,13 @@ static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *inf</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> 	struct ssb_bus *bus = bp-&gt;sdev-&gt;bus;</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> 	switch (bus-&gt;bustype) {</div><div class='ctx'> 	case SSB_BUSTYPE_PCI:</div><div class='del'>-		strlcpy(info-&gt;bus_info, pci_name(bus-&gt;host_pci), sizeof(info-&gt;bus_info));</div><div class='add'>+		strscpy(info-&gt;bus_info, pci_name(bus-&gt;host_pci), sizeof(info-&gt;bus_info));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SSB_BUSTYPE_SSB:</div><div class='del'>-		strlcpy(info-&gt;bus_info, "SSB", sizeof(info-&gt;bus_info));</div><div class='add'>+		strscpy(info-&gt;bus_info, "SSB", sizeof(info-&gt;bus_info));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SSB_BUSTYPE_PCMCIA:</div><div class='ctx'> 	case SSB_BUSTYPE_SDIO:</div><div class='hunk'>@@ -1816,11 +1794,9 @@ static int b44_nway_reset(struct net_device *dev)</div><div class='ctx'> 	b44_readphy(bp, MII_BMCR, &amp;bmcr);</div><div class='ctx'> 	b44_readphy(bp, MII_BMCR, &amp;bmcr);</div><div class='ctx'> 	r = -EINVAL;</div><div class='del'>-	if (bmcr &amp; BMCR_ANENABLE) {</div><div class='del'>-		b44_writephy(bp, MII_BMCR,</div><div class='del'>-			     bmcr | BMCR_ANRESTART);</div><div class='del'>-		r = 0;</div><div class='del'>-	}</div><div class='add'>+	if (bmcr &amp; BMCR_ANENABLE)</div><div class='add'>+		r = b44_writephy(bp, MII_BMCR,</div><div class='add'>+				 bmcr | BMCR_ANRESTART);</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return r;</div><div class='hunk'>@@ -1962,7 +1938,9 @@ static int b44_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b44_get_ringparam(struct net_device *dev,</div><div class='del'>-			      struct ethtool_ringparam *ering)</div><div class='add'>+			      struct ethtool_ringparam *ering,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1973,7 +1951,9 @@ static void b44_get_ringparam(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int b44_set_ringparam(struct net_device *dev,</div><div class='del'>-			     struct ethtool_ringparam *ering)</div><div class='add'>+			     struct ethtool_ringparam *ering,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2030,12 +2010,14 @@ static int b44_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 		bp-&gt;flags |= B44_FLAG_TX_PAUSE;</div><div class='ctx'> 	else</div><div class='ctx'> 		bp-&gt;flags &amp;= ~B44_FLAG_TX_PAUSE;</div><div class='del'>-	if (bp-&gt;flags &amp; B44_FLAG_PAUSE_AUTO) {</div><div class='del'>-		b44_halt(bp);</div><div class='del'>-		b44_init_rings(bp);</div><div class='del'>-		b44_init_hw(bp, B44_FULL_RESET);</div><div class='del'>-	} else {</div><div class='del'>-		__b44_set_flow_ctrl(bp, bp-&gt;flags);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		if (bp-&gt;flags &amp; B44_FLAG_PAUSE_AUTO) {</div><div class='add'>+			b44_halt(bp);</div><div class='add'>+			b44_init_rings(bp);</div><div class='add'>+			b44_init_hw(bp, B44_FULL_RESET);</div><div class='add'>+		} else {</div><div class='add'>+			__b44_set_flow_ctrl(bp, bp-&gt;flags);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2079,12 +2061,12 @@ static void b44_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 	do {</div><div class='ctx'> 		data_src = &amp;hwstat-&gt;tx_good_octets;</div><div class='ctx'> 		data_dst = data;</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;hwstat-&gt;syncp);</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;hwstat-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(b44_gstrings); i++)</div><div class='ctx'> 			*data_dst++ = *data_src++;</div><div class='ctx'> </div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;hwstat-&gt;syncp, start));</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;hwstat-&gt;syncp, start));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void b44_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='hunk'>@@ -2174,7 +2156,7 @@ static int b44_get_invariants(struct b44 *bp)</div><div class='ctx'> 	 * valid PHY address. */</div><div class='ctx'> 	bp-&gt;phy_addr &amp;= 0x1F;</div><div class='ctx'> </div><div class='del'>-	memcpy(bp-&gt;dev-&gt;dev_addr, addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(bp-&gt;dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(&amp;bp-&gt;dev-&gt;dev_addr[0])){</div><div class='ctx'> 		pr_err("Invalid MAC address found in EEPROM\n");</div><div class='hunk'>@@ -2201,7 +2183,7 @@ static const struct net_device_ops b44_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode	= b44_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= b44_set_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= b44_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= b44_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= b44_tx_timeout,</div><div class='ctx'> 	.ndo_change_mtu		= b44_change_mtu,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -2213,12 +2195,12 @@ static void b44_adjust_link(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct b44 *bp = netdev_priv(dev);</div><div class='ctx'> 	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-	bool status_changed = 0;</div><div class='add'>+	bool status_changed = false;</div><div class='ctx'> </div><div class='ctx'> 	BUG_ON(!phydev);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;old_link != phydev-&gt;link) {</div><div class='del'>-		status_changed = 1;</div><div class='add'>+		status_changed = true;</div><div class='ctx'> 		bp-&gt;old_link = phydev-&gt;link;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2226,11 +2208,11 @@ static void b44_adjust_link(struct net_device *dev)</div><div class='ctx'> 	if (phydev-&gt;link) {</div><div class='ctx'> 		if ((phydev-&gt;duplex == DUPLEX_HALF) &amp;&amp;</div><div class='ctx'> 		    (bp-&gt;flags &amp; B44_FLAG_FULL_DUPLEX)) {</div><div class='del'>-			status_changed = 1;</div><div class='add'>+			status_changed = true;</div><div class='ctx'> 			bp-&gt;flags &amp;= ~B44_FLAG_FULL_DUPLEX;</div><div class='ctx'> 		} else if ((phydev-&gt;duplex == DUPLEX_FULL) &amp;&amp;</div><div class='ctx'> 			   !(bp-&gt;flags &amp; B44_FLAG_FULL_DUPLEX)) {</div><div class='del'>-			status_changed = 1;</div><div class='add'>+			status_changed = true;</div><div class='ctx'> 			bp-&gt;flags |= B44_FLAG_FULL_DUPLEX;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2252,7 +2234,6 @@ static int b44_register_phy_one(struct b44 *bp)</div><div class='ctx'> 	struct mii_bus *mii_bus;</div><div class='ctx'> 	struct ssb_device *sdev = bp-&gt;sdev;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	char bus_id[MII_BUS_ID_SIZE + 3];</div><div class='ctx'> 	struct ssb_sprom *sprom = &amp;sdev-&gt;bus-&gt;sprom;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2279,27 +2260,26 @@ static int b44_register_phy_one(struct b44 *bp)</div><div class='ctx'> 		goto err_out_mdiobus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!mdiobus_is_registered_device(bp-&gt;mii_bus, bp-&gt;phy_addr) &amp;&amp;</div><div class='del'>-	    (sprom-&gt;boardflags_lo &amp; (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {</div><div class='del'>-</div><div class='add'>+	phydev = mdiobus_get_phy(bp-&gt;mii_bus, bp-&gt;phy_addr);</div><div class='add'>+	if (!phydev &amp;&amp;</div><div class='add'>+	    sprom-&gt;boardflags_lo &amp; (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM)) {</div><div class='ctx'> 		dev_info(sdev-&gt;dev,</div><div class='ctx'> 			 "could not find PHY at %i, use fixed one\n",</div><div class='ctx'> 			 bp-&gt;phy_addr);</div><div class='ctx'> </div><div class='del'>-		bp-&gt;phy_addr = 0;</div><div class='del'>-		snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, "fixed-0",</div><div class='del'>-			 bp-&gt;phy_addr);</div><div class='del'>-	} else {</div><div class='del'>-		snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, mii_bus-&gt;id,</div><div class='del'>-			 bp-&gt;phy_addr);</div><div class='add'>+		phydev = fixed_phy_register_100fd();</div><div class='add'>+		if (!IS_ERR(phydev))</div><div class='add'>+			bp-&gt;phy_addr = phydev-&gt;mdio.addr;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	phydev = phy_connect(bp-&gt;dev, bus_id, &amp;b44_adjust_link,</div><div class='del'>-			     PHY_INTERFACE_MODE_MII);</div><div class='del'>-	if (IS_ERR(phydev)) {</div><div class='add'>+	if (IS_ERR_OR_NULL(phydev))</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+	else</div><div class='add'>+		err = phy_connect_direct(bp-&gt;dev, phydev, &amp;b44_adjust_link,</div><div class='add'>+					 PHY_INTERFACE_MODE_MII);</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(sdev-&gt;dev, "could not attach PHY at %i\n",</div><div class='ctx'> 			bp-&gt;phy_addr);</div><div class='del'>-		err = PTR_ERR(phydev);</div><div class='ctx'> 		goto err_out_mdiobus_unregister;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2312,7 +2292,6 @@ static int b44_register_phy_one(struct b44 *bp)</div><div class='ctx'> 	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;old_link = 0;</div><div class='del'>-	bp-&gt;phy_addr = phydev-&gt;mdio.addr;</div><div class='ctx'> </div><div class='ctx'> 	phy_attached_info(phydev);</div><div class='ctx'> </div><div class='hunk'>@@ -2330,10 +2309,15 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> static void b44_unregister_phy_one(struct b44 *bp)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = bp-&gt;dev;</div><div class='ctx'> 	struct mii_bus *mii_bus = bp-&gt;mii_bus;</div><div class='add'>+	struct net_device *dev = bp-&gt;dev;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+</div><div class='add'>+	phydev = dev-&gt;phydev;</div><div class='ctx'> </div><div class='del'>-	phy_disconnect(dev-&gt;phydev);</div><div class='add'>+	phy_disconnect(phydev);</div><div class='add'>+	if (phy_is_pseudo_fixed_link(phydev))</div><div class='add'>+		fixed_phy_unregister(phydev);</div><div class='ctx'> 	mdiobus_unregister(mii_bus);</div><div class='ctx'> 	mdiobus_free(mii_bus);</div><div class='ctx'> }</div><div class='hunk'>@@ -2347,8 +2331,6 @@ static int b44_init_one(struct ssb_device *sdev,</div><div class='ctx'> </div><div class='ctx'> 	instance++;</div><div class='ctx'> </div><div class='del'>-	pr_info_once("%s version %s\n", DRV_DESCRIPTION, DRV_MODULE_VERSION);</div><div class='del'>-</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*bp));</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -2374,7 +2356,7 @@ static int b44_init_one(struct ssb_device *sdev,</div><div class='ctx'> 	bp-&gt;tx_pending = B44_DEF_TX_RING_PENDING;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;b44_netdev_ops;</div><div class='del'>-	netif_napi_add(dev, &amp;bp-&gt;napi, b44_poll, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;bp-&gt;napi, b44_poll);</div><div class='ctx'> 	dev-&gt;watchdog_timeo = B44_TX_TIMEOUT;</div><div class='ctx'> 	dev-&gt;min_mtu = B44_MIN_MTU;</div><div class='ctx'> 	dev-&gt;max_mtu = B44_MAX_MTU;</div><div class='hunk'>@@ -2388,7 +2370,8 @@ static int b44_init_one(struct ssb_device *sdev,</div><div class='ctx'> 		goto err_out_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dma_set_mask_and_coherent(sdev-&gt;dma_dev, DMA_BIT_MASK(30))) {</div><div class='add'>+	err = dma_set_mask_and_coherent(sdev-&gt;dma_dev, DMA_BIT_MASK(30));</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(sdev-&gt;dev,</div><div class='ctx'> 			"Required 30BIT DMA mask unsupported by the system\n");</div><div class='ctx'> 		goto err_out_powerdown;</div><div class='hunk'>@@ -2493,7 +2476,7 @@ static int b44_suspend(struct ssb_device *sdev, pm_message_t state)</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -2590,7 +2573,7 @@ static int __init b44_init(void)</div><div class='ctx'> 	unsigned int dma_desc_align_size = dma_get_cache_alignment();</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	/* Setup paramaters for syncing RX/TX DMA descriptors */</div><div class='add'>+	/* Setup parameters for syncing RX/TX DMA descriptors */</div><div class='ctx'> 	dma_desc_sync_size = max_t(unsigned int, dma_desc_align_size, sizeof(struct dma_desc));</div><div class='ctx'> </div><div class='ctx'> 	err = b44_pci_init();</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c<br/>new file mode 100644<br/>index 000000000000..203e8d0dd04b<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcm4908_enet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bcm4908_enet.c</a></div><div class='hunk'>@@ -0,0 +1,798 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (C) 2021 Rafał Miłecki &lt;rafal@milecki.pl&gt;</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bcm4908_enet.h"</div><div class='add'>+#include "unimac.h"</div><div class='add'>+</div><div class='add'>+#define ENET_DMA_CH_RX_CFG			ENET_DMA_CH0_CFG</div><div class='add'>+#define ENET_DMA_CH_TX_CFG			ENET_DMA_CH1_CFG</div><div class='add'>+#define ENET_DMA_CH_RX_STATE_RAM		ENET_DMA_CH0_STATE_RAM</div><div class='add'>+#define ENET_DMA_CH_TX_STATE_RAM		ENET_DMA_CH1_STATE_RAM</div><div class='add'>+</div><div class='add'>+#define ENET_TX_BDS_NUM				200</div><div class='add'>+#define ENET_RX_BDS_NUM				200</div><div class='add'>+#define ENET_RX_BDS_NUM_MAX			8192</div><div class='add'>+</div><div class='add'>+#define ENET_DMA_INT_DEFAULTS			(ENET_DMA_CH_CFG_INT_DONE | \</div><div class='add'>+						 ENET_DMA_CH_CFG_INT_NO_DESC | \</div><div class='add'>+						 ENET_DMA_CH_CFG_INT_BUFF_DONE)</div><div class='add'>+#define ENET_DMA_MAX_BURST_LEN			8 /* in 64 bit words */</div><div class='add'>+</div><div class='add'>+#define ENET_MTU_MAX				ETH_DATA_LEN /* Is it possible to support 2044? */</div><div class='add'>+#define BRCM_MAX_TAG_LEN			6</div><div class='add'>+#define ENET_MAX_ETH_OVERHEAD			(ETH_HLEN + BRCM_MAX_TAG_LEN + VLAN_HLEN + \</div><div class='add'>+						 ETH_FCS_LEN + 4) /* 32 */</div><div class='add'>+</div><div class='add'>+#define ENET_RX_SKB_BUF_SIZE			(NET_SKB_PAD + NET_IP_ALIGN + \</div><div class='add'>+						 ETH_HLEN + BRCM_MAX_TAG_LEN + VLAN_HLEN + \</div><div class='add'>+						 ENET_MTU_MAX + ETH_FCS_LEN + 4)</div><div class='add'>+#define ENET_RX_SKB_BUF_ALLOC_SIZE		(SKB_DATA_ALIGN(ENET_RX_SKB_BUF_SIZE) + \</div><div class='add'>+						 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='add'>+#define ENET_RX_BUF_DMA_OFFSET			(NET_SKB_PAD + NET_IP_ALIGN)</div><div class='add'>+#define ENET_RX_BUF_DMA_SIZE			(ENET_RX_SKB_BUF_SIZE - ENET_RX_BUF_DMA_OFFSET)</div><div class='add'>+</div><div class='add'>+struct bcm4908_enet_dma_ring_bd {</div><div class='add'>+	__le32 ctl;</div><div class='add'>+	__le32 addr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct bcm4908_enet_dma_ring_slot {</div><div class='add'>+	union {</div><div class='add'>+		void *buf;			/* RX */</div><div class='add'>+		struct sk_buff *skb;		/* TX */</div><div class='add'>+	};</div><div class='add'>+	unsigned int len;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcm4908_enet_dma_ring {</div><div class='add'>+	int is_tx;</div><div class='add'>+	int read_idx;</div><div class='add'>+	int write_idx;</div><div class='add'>+	int length;</div><div class='add'>+	u16 cfg_block;</div><div class='add'>+	u16 st_ram_block;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		void *cpu_addr;</div><div class='add'>+		struct bcm4908_enet_dma_ring_bd *buf_desc;</div><div class='add'>+	};</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+</div><div class='add'>+	struct bcm4908_enet_dma_ring_slot *slots;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcm4908_enet {</div><div class='add'>+	struct device *dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	void __iomem *base;</div><div class='add'>+	int irq_tx;</div><div class='add'>+</div><div class='add'>+	struct bcm4908_enet_dma_ring tx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring rx_ring;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/***</div><div class='add'>+ * R/W ops</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static u32 enet_read(struct bcm4908_enet *enet, u16 offset)</div><div class='add'>+{</div><div class='add'>+	return readl(enet-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enet_write(struct bcm4908_enet *enet, u16 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	writel(value, enet-&gt;base + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enet_maskset(struct bcm4908_enet *enet, u16 offset, u32 mask, u32 set)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	WARN_ON(set &amp; ~mask);</div><div class='add'>+</div><div class='add'>+	val = enet_read(enet, offset);</div><div class='add'>+	val = (val &amp; ~mask) | (set &amp; mask);</div><div class='add'>+	enet_write(enet, offset, val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enet_set(struct bcm4908_enet *enet, u16 offset, u32 set)</div><div class='add'>+{</div><div class='add'>+	enet_maskset(enet, offset, set, set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 enet_umac_read(struct bcm4908_enet *enet, u16 offset)</div><div class='add'>+{</div><div class='add'>+	return enet_read(enet, ENET_UNIMAC + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enet_umac_write(struct bcm4908_enet *enet, u16 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	enet_write(enet, ENET_UNIMAC + offset, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enet_umac_set(struct bcm4908_enet *enet, u16 offset, u32 set)</div><div class='add'>+{</div><div class='add'>+	enet_set(enet, ENET_UNIMAC + offset, set);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***</div><div class='add'>+ * Helpers</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_set_mtu(struct bcm4908_enet *enet, int mtu)</div><div class='add'>+{</div><div class='add'>+	enet_umac_write(enet, UMAC_MAX_FRAME_LEN, mtu + ENET_MAX_ETH_OVERHEAD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***</div><div class='add'>+ * DMA ring ops</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_ring_intrs_on(struct bcm4908_enet *enet,</div><div class='add'>+					   struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG_INT_MASK, ENET_DMA_INT_DEFAULTS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_ring_intrs_off(struct bcm4908_enet *enet,</div><div class='add'>+					    struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG_INT_MASK, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_ring_intrs_ack(struct bcm4908_enet *enet,</div><div class='add'>+					    struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG_INT_STAT, ENET_DMA_INT_DEFAULTS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***</div><div class='add'>+ * DMA</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static int bcm4908_dma_alloc_buf_descs(struct bcm4908_enet *enet,</div><div class='add'>+				       struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	int size = ring-&gt;length * sizeof(struct bcm4908_enet_dma_ring_bd);</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+</div><div class='add'>+	ring-&gt;cpu_addr = dma_alloc_coherent(dev, size, &amp;ring-&gt;dma_addr, GFP_KERNEL);</div><div class='add'>+	if (!ring-&gt;cpu_addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (((uintptr_t)ring-&gt;cpu_addr) &amp; (0x40 - 1)) {</div><div class='add'>+		dev_err(dev, "Invalid DMA ring alignment\n");</div><div class='add'>+		goto err_free_buf_descs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ring-&gt;slots = kcalloc(ring-&gt;length, sizeof(*ring-&gt;slots), GFP_KERNEL);</div><div class='add'>+	if (!ring-&gt;slots)</div><div class='add'>+		goto err_free_buf_descs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_buf_descs:</div><div class='add'>+	dma_free_coherent(dev, size, ring-&gt;cpu_addr, ring-&gt;dma_addr);</div><div class='add'>+	ring-&gt;cpu_addr = NULL;</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_free(struct bcm4908_enet *enet)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *tx_ring = &amp;enet-&gt;tx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = &amp;enet-&gt;rx_ring;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	int size;</div><div class='add'>+</div><div class='add'>+	size = rx_ring-&gt;length * sizeof(struct bcm4908_enet_dma_ring_bd);</div><div class='add'>+	if (rx_ring-&gt;cpu_addr)</div><div class='add'>+		dma_free_coherent(dev, size, rx_ring-&gt;cpu_addr, rx_ring-&gt;dma_addr);</div><div class='add'>+	kfree(rx_ring-&gt;slots);</div><div class='add'>+</div><div class='add'>+	size = tx_ring-&gt;length * sizeof(struct bcm4908_enet_dma_ring_bd);</div><div class='add'>+	if (tx_ring-&gt;cpu_addr)</div><div class='add'>+		dma_free_coherent(dev, size, tx_ring-&gt;cpu_addr, tx_ring-&gt;dma_addr);</div><div class='add'>+	kfree(tx_ring-&gt;slots);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_dma_alloc(struct bcm4908_enet *enet)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *tx_ring = &amp;enet-&gt;tx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = &amp;enet-&gt;rx_ring;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tx_ring-&gt;length = ENET_TX_BDS_NUM;</div><div class='add'>+	tx_ring-&gt;is_tx = 1;</div><div class='add'>+	tx_ring-&gt;cfg_block = ENET_DMA_CH_TX_CFG;</div><div class='add'>+	tx_ring-&gt;st_ram_block = ENET_DMA_CH_TX_STATE_RAM;</div><div class='add'>+	err = bcm4908_dma_alloc_buf_descs(enet, tx_ring);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to alloc TX buf descriptors: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_ring-&gt;length = ENET_RX_BDS_NUM;</div><div class='add'>+	rx_ring-&gt;is_tx = 0;</div><div class='add'>+	rx_ring-&gt;cfg_block = ENET_DMA_CH_RX_CFG;</div><div class='add'>+	rx_ring-&gt;st_ram_block = ENET_DMA_CH_RX_STATE_RAM;</div><div class='add'>+	err = bcm4908_dma_alloc_buf_descs(enet, rx_ring);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to alloc RX buf descriptors: %d\n", err);</div><div class='add'>+		bcm4908_enet_dma_free(enet);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_reset(struct bcm4908_enet *enet)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *rings[] = { &amp;enet-&gt;rx_ring, &amp;enet-&gt;tx_ring };</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Disable the DMA controller and channel */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rings); i++)</div><div class='add'>+		enet_write(enet, rings[i]-&gt;cfg_block + ENET_DMA_CH_CFG, 0);</div><div class='add'>+	enet_maskset(enet, ENET_DMA_CONTROLLER_CFG, ENET_DMA_CTRL_CFG_MASTER_EN, 0);</div><div class='add'>+</div><div class='add'>+	/* Reset channels state */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(rings); i++) {</div><div class='add'>+		struct bcm4908_enet_dma_ring *ring = rings[i];</div><div class='add'>+</div><div class='add'>+		enet_write(enet, ring-&gt;st_ram_block + ENET_DMA_CH_STATE_RAM_BASE_DESC_PTR, 0);</div><div class='add'>+		enet_write(enet, ring-&gt;st_ram_block + ENET_DMA_CH_STATE_RAM_STATE_DATA, 0);</div><div class='add'>+		enet_write(enet, ring-&gt;st_ram_block + ENET_DMA_CH_STATE_RAM_DESC_LEN_STATUS, 0);</div><div class='add'>+		enet_write(enet, ring-&gt;st_ram_block + ENET_DMA_CH_STATE_RAM_DESC_BASE_BUFPTR, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_dma_alloc_rx_buf(struct bcm4908_enet *enet, unsigned int idx)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring_bd *buf_desc = &amp;enet-&gt;rx_ring.buf_desc[idx];</div><div class='add'>+	struct bcm4908_enet_dma_ring_slot *slot = &amp;enet-&gt;rx_ring.slots[idx];</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	u32 tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	slot-&gt;buf = napi_alloc_frag(ENET_RX_SKB_BUF_ALLOC_SIZE);</div><div class='add'>+	if (!slot-&gt;buf)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	slot-&gt;dma_addr = dma_map_single(dev, slot-&gt;buf + ENET_RX_BUF_DMA_OFFSET,</div><div class='add'>+					ENET_RX_BUF_DMA_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+	err = dma_mapping_error(dev, slot-&gt;dma_addr);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to map DMA buffer: %d\n", err);</div><div class='add'>+		skb_free_frag(slot-&gt;buf);</div><div class='add'>+		slot-&gt;buf = NULL;</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tmp = ENET_RX_BUF_DMA_SIZE &lt;&lt; DMA_CTL_LEN_DESC_BUFLENGTH_SHIFT;</div><div class='add'>+	tmp |= DMA_CTL_STATUS_OWN;</div><div class='add'>+	if (idx == enet-&gt;rx_ring.length - 1)</div><div class='add'>+		tmp |= DMA_CTL_STATUS_WRAP;</div><div class='add'>+	buf_desc-&gt;ctl = cpu_to_le32(tmp);</div><div class='add'>+	buf_desc-&gt;addr = cpu_to_le32(slot-&gt;dma_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_ring_init(struct bcm4908_enet *enet,</div><div class='add'>+				       struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	int reset_channel = 0; /* We support only 1 main channel (with TX and RX) */</div><div class='add'>+	int reset_subch = ring-&gt;is_tx ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/* Reset the DMA channel */</div><div class='add'>+	enet_write(enet, ENET_DMA_CTRL_CHANNEL_RESET, BIT(reset_channel * 2 + reset_subch));</div><div class='add'>+	enet_write(enet, ENET_DMA_CTRL_CHANNEL_RESET, 0);</div><div class='add'>+</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG, 0);</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG_MAX_BURST, ENET_DMA_MAX_BURST_LEN);</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG_INT_MASK, 0);</div><div class='add'>+</div><div class='add'>+	enet_write(enet, ring-&gt;st_ram_block + ENET_DMA_CH_STATE_RAM_BASE_DESC_PTR,</div><div class='add'>+		   (uint32_t)ring-&gt;dma_addr);</div><div class='add'>+</div><div class='add'>+	ring-&gt;read_idx = 0;</div><div class='add'>+	ring-&gt;write_idx = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_uninit(struct bcm4908_enet *enet)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = &amp;enet-&gt;rx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring_slot *slot;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = rx_ring-&gt;length - 1; i &gt;= 0; i--) {</div><div class='add'>+		slot = &amp;rx_ring-&gt;slots[i];</div><div class='add'>+		if (!slot-&gt;buf)</div><div class='add'>+			continue;</div><div class='add'>+		dma_unmap_single(dev, slot-&gt;dma_addr, slot-&gt;len, DMA_FROM_DEVICE);</div><div class='add'>+		skb_free_frag(slot-&gt;buf);</div><div class='add'>+		slot-&gt;buf = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_dma_init(struct bcm4908_enet *enet)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = &amp;enet-&gt;rx_ring;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_ring-&gt;length; i++) {</div><div class='add'>+		err = bcm4908_enet_dma_alloc_rx_buf(enet, i);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "Failed to alloc RX buffer: %d\n", err);</div><div class='add'>+			bcm4908_enet_dma_uninit(enet);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_dma_ring_init(enet, &amp;enet-&gt;tx_ring);</div><div class='add'>+	bcm4908_enet_dma_ring_init(enet, &amp;enet-&gt;rx_ring);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_tx_ring_enable(struct bcm4908_enet *enet,</div><div class='add'>+					    struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG, ENET_DMA_CH_CFG_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_tx_ring_disable(struct bcm4908_enet *enet,</div><div class='add'>+					     struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	enet_write(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_rx_ring_enable(struct bcm4908_enet *enet,</div><div class='add'>+					    struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	enet_set(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG, ENET_DMA_CH_CFG_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_dma_rx_ring_disable(struct bcm4908_enet *enet,</div><div class='add'>+					     struct bcm4908_enet_dma_ring *ring)</div><div class='add'>+{</div><div class='add'>+	unsigned long deadline;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	enet_maskset(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG, ENET_DMA_CH_CFG_ENABLE, 0);</div><div class='add'>+</div><div class='add'>+	deadline = jiffies + usecs_to_jiffies(2000);</div><div class='add'>+	do {</div><div class='add'>+		tmp = enet_read(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG);</div><div class='add'>+		if (!(tmp &amp; ENET_DMA_CH_CFG_ENABLE))</div><div class='add'>+			return;</div><div class='add'>+		enet_maskset(enet, ring-&gt;cfg_block + ENET_DMA_CH_CFG, ENET_DMA_CH_CFG_ENABLE, 0);</div><div class='add'>+		usleep_range(10, 30);</div><div class='add'>+	} while (!time_after_eq(jiffies, deadline));</div><div class='add'>+</div><div class='add'>+	dev_warn(enet-&gt;dev, "Timeout waiting for DMA TX stop\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/***</div><div class='add'>+ * Ethernet driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_gmac_init(struct bcm4908_enet *enet)</div><div class='add'>+{</div><div class='add'>+	u32 cmd;</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_set_mtu(enet, enet-&gt;netdev-&gt;mtu);</div><div class='add'>+</div><div class='add'>+	cmd = enet_umac_read(enet, UMAC_CMD);</div><div class='add'>+	enet_umac_write(enet, UMAC_CMD, cmd | CMD_SW_RESET);</div><div class='add'>+	enet_umac_write(enet, UMAC_CMD, cmd &amp; ~CMD_SW_RESET);</div><div class='add'>+</div><div class='add'>+	enet_set(enet, ENET_FLUSH, ENET_FLUSH_RXFIFO_FLUSH | ENET_FLUSH_TXFIFO_FLUSH);</div><div class='add'>+	enet_maskset(enet, ENET_FLUSH, ENET_FLUSH_RXFIFO_FLUSH | ENET_FLUSH_TXFIFO_FLUSH, 0);</div><div class='add'>+</div><div class='add'>+	enet_set(enet, ENET_MIB_CTRL, ENET_MIB_CTRL_CLR_MIB);</div><div class='add'>+	enet_maskset(enet, ENET_MIB_CTRL, ENET_MIB_CTRL_CLR_MIB, 0);</div><div class='add'>+</div><div class='add'>+	cmd = enet_umac_read(enet, UMAC_CMD);</div><div class='add'>+	cmd &amp;= ~(CMD_SPEED_MASK &lt;&lt; CMD_SPEED_SHIFT);</div><div class='add'>+	cmd &amp;= ~CMD_TX_EN;</div><div class='add'>+	cmd &amp;= ~CMD_RX_EN;</div><div class='add'>+	cmd |= CMD_SPEED_1000 &lt;&lt; CMD_SPEED_SHIFT;</div><div class='add'>+	enet_umac_write(enet, UMAC_CMD, cmd);</div><div class='add'>+</div><div class='add'>+	enet_maskset(enet, ENET_GMAC_STATUS,</div><div class='add'>+		     ENET_GMAC_STATUS_ETH_SPEED_MASK |</div><div class='add'>+		     ENET_GMAC_STATUS_HD |</div><div class='add'>+		     ENET_GMAC_STATUS_AUTO_CFG_EN |</div><div class='add'>+		     ENET_GMAC_STATUS_LINK_UP,</div><div class='add'>+		     ENET_GMAC_STATUS_ETH_SPEED_1000 |</div><div class='add'>+		     ENET_GMAC_STATUS_AUTO_CFG_EN |</div><div class='add'>+		     ENET_GMAC_STATUS_LINK_UP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bcm4908_enet_irq_handler(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet *enet = dev_id;</div><div class='add'>+	struct bcm4908_enet_dma_ring *ring;</div><div class='add'>+</div><div class='add'>+	ring = (irq == enet-&gt;irq_tx) ? &amp;enet-&gt;tx_ring : &amp;enet-&gt;rx_ring;</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_dma_ring_intrs_off(enet, ring);</div><div class='add'>+	bcm4908_enet_dma_ring_intrs_ack(enet, ring);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;ring-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet *enet = netdev_priv(netdev);</div><div class='add'>+	struct bcm4908_enet_dma_ring *tx_ring = &amp;enet-&gt;tx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = &amp;enet-&gt;rx_ring;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = request_irq(netdev-&gt;irq, bcm4908_enet_irq_handler, 0, "enet", enet);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to request IRQ %d: %d\n", netdev-&gt;irq, err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enet-&gt;irq_tx &gt; 0) {</div><div class='add'>+		err = request_irq(enet-&gt;irq_tx, bcm4908_enet_irq_handler, 0,</div><div class='add'>+				  "tx", enet);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "Failed to request IRQ %d: %d\n",</div><div class='add'>+				enet-&gt;irq_tx, err);</div><div class='add'>+			free_irq(netdev-&gt;irq, enet);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_gmac_init(enet);</div><div class='add'>+	bcm4908_enet_dma_reset(enet);</div><div class='add'>+	bcm4908_enet_dma_init(enet);</div><div class='add'>+</div><div class='add'>+	enet_umac_set(enet, UMAC_CMD, CMD_TX_EN | CMD_RX_EN);</div><div class='add'>+</div><div class='add'>+	enet_set(enet, ENET_DMA_CONTROLLER_CFG, ENET_DMA_CTRL_CFG_MASTER_EN);</div><div class='add'>+	enet_maskset(enet, ENET_DMA_CONTROLLER_CFG, ENET_DMA_CTRL_CFG_FLOWC_CH1_EN, 0);</div><div class='add'>+</div><div class='add'>+	if (enet-&gt;irq_tx &gt; 0) {</div><div class='add'>+		napi_enable(&amp;tx_ring-&gt;napi);</div><div class='add'>+		bcm4908_enet_dma_ring_intrs_ack(enet, tx_ring);</div><div class='add'>+		bcm4908_enet_dma_ring_intrs_on(enet, tx_ring);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_dma_rx_ring_enable(enet, rx_ring);</div><div class='add'>+	napi_enable(&amp;rx_ring-&gt;napi);</div><div class='add'>+	netif_carrier_on(netdev);</div><div class='add'>+	netif_start_queue(netdev);</div><div class='add'>+	bcm4908_enet_dma_ring_intrs_ack(enet, rx_ring);</div><div class='add'>+	bcm4908_enet_dma_ring_intrs_on(enet, rx_ring);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet *enet = netdev_priv(netdev);</div><div class='add'>+	struct bcm4908_enet_dma_ring *tx_ring = &amp;enet-&gt;tx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = &amp;enet-&gt;rx_ring;</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(netdev);</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+	napi_disable(&amp;rx_ring-&gt;napi);</div><div class='add'>+	napi_disable(&amp;tx_ring-&gt;napi);</div><div class='add'>+	netdev_reset_queue(netdev);</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_dma_rx_ring_disable(enet, &amp;enet-&gt;rx_ring);</div><div class='add'>+	bcm4908_enet_dma_tx_ring_disable(enet, &amp;enet-&gt;tx_ring);</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_dma_uninit(enet);</div><div class='add'>+</div><div class='add'>+	free_irq(enet-&gt;irq_tx, enet);</div><div class='add'>+	free_irq(enet-&gt;netdev-&gt;irq, enet);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t bcm4908_enet_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet *enet = netdev_priv(netdev);</div><div class='add'>+	struct bcm4908_enet_dma_ring *ring = &amp;enet-&gt;tx_ring;</div><div class='add'>+	struct bcm4908_enet_dma_ring_slot *slot;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	struct bcm4908_enet_dma_ring_bd *buf_desc;</div><div class='add'>+	int free_buf_descs;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	/* Free transmitted skbs */</div><div class='add'>+	if (enet-&gt;irq_tx &lt; 0 &amp;&amp;</div><div class='add'>+	    !(le32_to_cpu(ring-&gt;buf_desc[ring-&gt;read_idx].ctl) &amp; DMA_CTL_STATUS_OWN))</div><div class='add'>+		napi_schedule(&amp;enet-&gt;tx_ring.napi);</div><div class='add'>+</div><div class='add'>+	/* Don't use the last empty buf descriptor */</div><div class='add'>+	if (ring-&gt;read_idx &lt;= ring-&gt;write_idx)</div><div class='add'>+		free_buf_descs = ring-&gt;read_idx - ring-&gt;write_idx + ring-&gt;length;</div><div class='add'>+	else</div><div class='add'>+		free_buf_descs = ring-&gt;read_idx - ring-&gt;write_idx;</div><div class='add'>+	if (free_buf_descs &lt; 2) {</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hardware removes OWN bit after sending data */</div><div class='add'>+	buf_desc = &amp;ring-&gt;buf_desc[ring-&gt;write_idx];</div><div class='add'>+	if (unlikely(le32_to_cpu(buf_desc-&gt;ctl) &amp; DMA_CTL_STATUS_OWN)) {</div><div class='add'>+		netif_stop_queue(netdev);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	slot = &amp;ring-&gt;slots[ring-&gt;write_idx];</div><div class='add'>+	slot-&gt;skb = skb;</div><div class='add'>+	slot-&gt;len = skb-&gt;len;</div><div class='add'>+	slot-&gt;dma_addr = dma_map_single(dev, skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, slot-&gt;dma_addr)))</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	tmp = skb-&gt;len &lt;&lt; DMA_CTL_LEN_DESC_BUFLENGTH_SHIFT;</div><div class='add'>+	tmp |= DMA_CTL_STATUS_OWN;</div><div class='add'>+	tmp |= DMA_CTL_STATUS_SOP;</div><div class='add'>+	tmp |= DMA_CTL_STATUS_EOP;</div><div class='add'>+	tmp |= DMA_CTL_STATUS_APPEND_CRC;</div><div class='add'>+	if (ring-&gt;write_idx + 1 == ring-&gt;length - 1)</div><div class='add'>+		tmp |= DMA_CTL_STATUS_WRAP;</div><div class='add'>+</div><div class='add'>+	netdev_sent_queue(enet-&gt;netdev, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	buf_desc-&gt;addr = cpu_to_le32((uint32_t)slot-&gt;dma_addr);</div><div class='add'>+	buf_desc-&gt;ctl = cpu_to_le32(tmp);</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_dma_tx_ring_enable(enet, &amp;enet-&gt;tx_ring);</div><div class='add'>+</div><div class='add'>+	if (++ring-&gt;write_idx == ring-&gt;length - 1)</div><div class='add'>+		ring-&gt;write_idx = 0;</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_poll_rx(struct napi_struct *napi, int weight)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *rx_ring = container_of(napi, struct bcm4908_enet_dma_ring, napi);</div><div class='add'>+	struct bcm4908_enet *enet = container_of(rx_ring, struct bcm4908_enet, rx_ring);</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	int handled = 0;</div><div class='add'>+</div><div class='add'>+	while (handled &lt; weight) {</div><div class='add'>+		struct bcm4908_enet_dma_ring_bd *buf_desc;</div><div class='add'>+		struct bcm4908_enet_dma_ring_slot slot;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u32 ctl;</div><div class='add'>+		int len;</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		buf_desc = &amp;enet-&gt;rx_ring.buf_desc[enet-&gt;rx_ring.read_idx];</div><div class='add'>+		ctl = le32_to_cpu(buf_desc-&gt;ctl);</div><div class='add'>+		if (ctl &amp; DMA_CTL_STATUS_OWN)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		slot = enet-&gt;rx_ring.slots[enet-&gt;rx_ring.read_idx];</div><div class='add'>+</div><div class='add'>+		/* Provide new buffer before unpinning the old one */</div><div class='add'>+		err = bcm4908_enet_dma_alloc_rx_buf(enet, enet-&gt;rx_ring.read_idx);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (++enet-&gt;rx_ring.read_idx == enet-&gt;rx_ring.length)</div><div class='add'>+			enet-&gt;rx_ring.read_idx = 0;</div><div class='add'>+</div><div class='add'>+		len = (ctl &amp; DMA_CTL_LEN_DESC_BUFLENGTH) &gt;&gt; DMA_CTL_LEN_DESC_BUFLENGTH_SHIFT;</div><div class='add'>+</div><div class='add'>+		if (len &lt; ETH_ZLEN ||</div><div class='add'>+		    (ctl &amp; (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) != (DMA_CTL_STATUS_SOP | DMA_CTL_STATUS_EOP)) {</div><div class='add'>+			skb_free_frag(slot.buf);</div><div class='add'>+			enet-&gt;netdev-&gt;stats.rx_dropped++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(dev, slot.dma_addr, ENET_RX_BUF_DMA_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+		skb = build_skb(slot.buf, ENET_RX_SKB_BUF_ALLOC_SIZE);</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			skb_free_frag(slot.buf);</div><div class='add'>+			enet-&gt;netdev-&gt;stats.rx_dropped++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		skb_reserve(skb, ENET_RX_BUF_DMA_OFFSET);</div><div class='add'>+		skb_put(skb, len - ETH_FCS_LEN);</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, enet-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		netif_receive_skb(skb);</div><div class='add'>+</div><div class='add'>+		enet-&gt;netdev-&gt;stats.rx_packets++;</div><div class='add'>+		enet-&gt;netdev-&gt;stats.rx_bytes += len;</div><div class='add'>+</div><div class='add'>+		handled++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (handled &lt; weight) {</div><div class='add'>+		napi_complete_done(napi, handled);</div><div class='add'>+		bcm4908_enet_dma_ring_intrs_on(enet, rx_ring);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hardware could disable ring if it run out of descriptors */</div><div class='add'>+	bcm4908_enet_dma_rx_ring_enable(enet, &amp;enet-&gt;rx_ring);</div><div class='add'>+</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_poll_tx(struct napi_struct *napi, int weight)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet_dma_ring *tx_ring = container_of(napi, struct bcm4908_enet_dma_ring, napi);</div><div class='add'>+	struct bcm4908_enet *enet = container_of(tx_ring, struct bcm4908_enet, tx_ring);</div><div class='add'>+	struct bcm4908_enet_dma_ring_bd *buf_desc;</div><div class='add'>+	struct bcm4908_enet_dma_ring_slot *slot;</div><div class='add'>+	struct device *dev = enet-&gt;dev;</div><div class='add'>+	unsigned int bytes = 0;</div><div class='add'>+	int handled = 0;</div><div class='add'>+</div><div class='add'>+	while (handled &lt; weight &amp;&amp; tx_ring-&gt;read_idx != tx_ring-&gt;write_idx) {</div><div class='add'>+		buf_desc = &amp;tx_ring-&gt;buf_desc[tx_ring-&gt;read_idx];</div><div class='add'>+		if (le32_to_cpu(buf_desc-&gt;ctl) &amp; DMA_CTL_STATUS_OWN)</div><div class='add'>+			break;</div><div class='add'>+		slot = &amp;tx_ring-&gt;slots[tx_ring-&gt;read_idx];</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(dev, slot-&gt;dma_addr, slot-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+		dev_kfree_skb(slot-&gt;skb);</div><div class='add'>+</div><div class='add'>+		handled++;</div><div class='add'>+		bytes += slot-&gt;len;</div><div class='add'>+</div><div class='add'>+		if (++tx_ring-&gt;read_idx == tx_ring-&gt;length)</div><div class='add'>+			tx_ring-&gt;read_idx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_completed_queue(enet-&gt;netdev, handled, bytes);</div><div class='add'>+	enet-&gt;netdev-&gt;stats.tx_packets += handled;</div><div class='add'>+	enet-&gt;netdev-&gt;stats.tx_bytes += bytes;</div><div class='add'>+</div><div class='add'>+	if (handled &lt; weight) {</div><div class='add'>+		napi_complete_done(napi, handled);</div><div class='add'>+		bcm4908_enet_dma_ring_intrs_on(enet, tx_ring);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (netif_queue_stopped(enet-&gt;netdev))</div><div class='add'>+		netif_wake_queue(enet-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	return handled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet *enet = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	bcm4908_enet_set_mtu(enet, new_mtu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops bcm4908_enet_netdev_ops = {</div><div class='add'>+	.ndo_open = bcm4908_enet_open,</div><div class='add'>+	.ndo_stop = bcm4908_enet_stop,</div><div class='add'>+	.ndo_start_xmit = bcm4908_enet_start_xmit,</div><div class='add'>+	.ndo_set_mac_address = eth_mac_addr,</div><div class='add'>+	.ndo_change_mtu = bcm4908_enet_change_mtu,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bcm4908_enet_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct bcm4908_enet *enet;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	netdev = devm_alloc_etherdev(dev, sizeof(*enet));</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	enet = netdev_priv(netdev);</div><div class='add'>+	enet-&gt;dev = dev;</div><div class='add'>+	enet-&gt;netdev = netdev;</div><div class='add'>+</div><div class='add'>+	enet-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='add'>+	if (IS_ERR(enet-&gt;base)) {</div><div class='add'>+		dev_err(dev, "Failed to map registers: %ld\n", PTR_ERR(enet-&gt;base));</div><div class='add'>+		return PTR_ERR(enet-&gt;base);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev-&gt;irq = platform_get_irq_byname(pdev, "rx");</div><div class='add'>+	if (netdev-&gt;irq &lt; 0)</div><div class='add'>+		return netdev-&gt;irq;</div><div class='add'>+</div><div class='add'>+	enet-&gt;irq_tx = platform_get_irq_byname(pdev, "tx");</div><div class='add'>+</div><div class='add'>+	err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = bcm4908_enet_dma_alloc(enet);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+	err = of_get_ethdev_address(dev-&gt;of_node, netdev);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='add'>+		goto err_dma_free;</div><div class='add'>+	if (err)</div><div class='add'>+		eth_hw_addr_random(netdev);</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;bcm4908_enet_netdev_ops;</div><div class='add'>+	netdev-&gt;min_mtu = ETH_ZLEN;</div><div class='add'>+	netdev-&gt;mtu = ETH_DATA_LEN;</div><div class='add'>+	netdev-&gt;max_mtu = ENET_MTU_MAX;</div><div class='add'>+	netif_napi_add_tx(netdev, &amp;enet-&gt;tx_ring.napi, bcm4908_enet_poll_tx);</div><div class='add'>+	netif_napi_add(netdev, &amp;enet-&gt;rx_ring.napi, bcm4908_enet_poll_rx);</div><div class='add'>+</div><div class='add'>+	err = register_netdev(netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_dma_free;</div><div class='add'>+</div><div class='add'>+	platform_set_drvdata(pdev, enet);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dma_free:</div><div class='add'>+	bcm4908_enet_dma_free(enet);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcm4908_enet_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bcm4908_enet *enet = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(enet-&gt;netdev);</div><div class='add'>+	netif_napi_del(&amp;enet-&gt;rx_ring.napi);</div><div class='add'>+	netif_napi_del(&amp;enet-&gt;tx_ring.napi);</div><div class='add'>+	bcm4908_enet_dma_free(enet);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id bcm4908_enet_of_match[] = {</div><div class='add'>+	{ .compatible = "brcm,bcm4908-enet"},</div><div class='add'>+	{},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct platform_driver bcm4908_enet_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = "bcm4908_enet",</div><div class='add'>+		.of_match_table = bcm4908_enet_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe	= bcm4908_enet_probe,</div><div class='add'>+	.remove = bcm4908_enet_remove,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(bcm4908_enet_driver);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Broadcom BCM4908 Gigabit Ethernet driver");</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DEVICE_TABLE(of, bcm4908_enet_of_match);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.h b/drivers/net/ethernet/broadcom/bcm4908_enet.h<br/>new file mode 100644<br/>index 000000000000..8a3ede2da537<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcm4908_enet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bcm4908_enet.h</a></div><div class='hunk'>@@ -0,0 +1,96 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef __BCM4908_ENET_H</div><div class='add'>+#define __BCM4908_ENET_H</div><div class='add'>+</div><div class='add'>+#define ENET_CONTROL					0x000</div><div class='add'>+#define ENET_MIB_CTRL					0x004</div><div class='add'>+#define  ENET_MIB_CTRL_CLR_MIB				0x00000001</div><div class='add'>+#define ENET_RX_ERR_MASK				0x008</div><div class='add'>+#define ENET_MIB_MAX_PKT_SIZE				0x00C</div><div class='add'>+#define  ENET_MIB_MAX_PKT_SIZE_VAL			0x00003fff</div><div class='add'>+#define ENET_DIAG_OUT					0x01c</div><div class='add'>+#define ENET_ENABLE_DROP_PKT				0x020</div><div class='add'>+#define ENET_IRQ_ENABLE					0x024</div><div class='add'>+#define  ENET_IRQ_ENABLE_OVFL				0x00000001</div><div class='add'>+#define ENET_GMAC_STATUS				0x028</div><div class='add'>+#define  ENET_GMAC_STATUS_ETH_SPEED_MASK		0x00000003</div><div class='add'>+#define  ENET_GMAC_STATUS_ETH_SPEED_10			0x00000000</div><div class='add'>+#define  ENET_GMAC_STATUS_ETH_SPEED_100			0x00000001</div><div class='add'>+#define  ENET_GMAC_STATUS_ETH_SPEED_1000		0x00000002</div><div class='add'>+#define  ENET_GMAC_STATUS_HD				0x00000004</div><div class='add'>+#define  ENET_GMAC_STATUS_AUTO_CFG_EN			0x00000008</div><div class='add'>+#define  ENET_GMAC_STATUS_LINK_UP			0x00000010</div><div class='add'>+#define ENET_IRQ_STATUS					0x02c</div><div class='add'>+#define  ENET_IRQ_STATUS_OVFL				0x00000001</div><div class='add'>+#define ENET_OVERFLOW_COUNTER				0x030</div><div class='add'>+#define ENET_FLUSH					0x034</div><div class='add'>+#define  ENET_FLUSH_RXFIFO_FLUSH			0x00000001</div><div class='add'>+#define  ENET_FLUSH_TXFIFO_FLUSH			0x00000002</div><div class='add'>+#define ENET_RSV_SELECT					0x038</div><div class='add'>+#define ENET_BP_FORCE					0x03c</div><div class='add'>+#define  ENET_BP_FORCE_FORCE				0x00000001</div><div class='add'>+#define ENET_DMA_RX_OK_TO_SEND_COUNT			0x040</div><div class='add'>+#define  ENET_DMA_RX_OK_TO_SEND_COUNT_VAL		0x0000000f</div><div class='add'>+#define ENET_TX_CRC_CTRL				0x044</div><div class='add'>+#define ENET_MIB					0x200</div><div class='add'>+#define ENET_UNIMAC					0x400</div><div class='add'>+#define ENET_DMA					0x800</div><div class='add'>+#define ENET_DMA_CONTROLLER_CFG				0x800</div><div class='add'>+#define  ENET_DMA_CTRL_CFG_MASTER_EN			0x00000001</div><div class='add'>+#define  ENET_DMA_CTRL_CFG_FLOWC_CH1_EN			0x00000002</div><div class='add'>+#define  ENET_DMA_CTRL_CFG_FLOWC_CH3_EN			0x00000004</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH1_THRESH_LO			0x804</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH1_THRESH_HI			0x808</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH1_ALLOC			0x80c</div><div class='add'>+#define  ENET_DMA_FLOWCTL_CH1_ALLOC_FORCE		0x80000000</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH3_THRESH_LO			0x810</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH3_THRESH_HI			0x814</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH3_ALLOC			0x818</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH5_THRESH_LO			0x81C</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH5_THRESH_HI			0x820</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH5_ALLOC			0x824</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH7_THRESH_LO			0x828</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH7_THRESH_HI			0x82C</div><div class='add'>+#define ENET_DMA_FLOWCTL_CH7_ALLOC			0x830</div><div class='add'>+#define ENET_DMA_CTRL_CHANNEL_RESET			0x834</div><div class='add'>+#define ENET_DMA_CTRL_CHANNEL_DEBUG			0x838</div><div class='add'>+#define ENET_DMA_CTRL_GLOBAL_INTERRUPT_STATUS		0x840</div><div class='add'>+#define ENET_DMA_CTRL_GLOBAL_INTERRUPT_MASK		0x844</div><div class='add'>+#define ENET_DMA_CH0_CFG				0xa00		/* RX */</div><div class='add'>+#define ENET_DMA_CH1_CFG				0xa10		/* TX */</div><div class='add'>+#define ENET_DMA_CH0_STATE_RAM				0xc00		/* RX */</div><div class='add'>+#define ENET_DMA_CH1_STATE_RAM				0xc10		/* TX */</div><div class='add'>+</div><div class='add'>+#define ENET_DMA_CH_CFG					0x00		/* assorted configuration */</div><div class='add'>+#define  ENET_DMA_CH_CFG_ENABLE				0x00000001	/* set to enable channel */</div><div class='add'>+#define  ENET_DMA_CH_CFG_PKT_HALT			0x00000002	/* idle after an EOP flag is detected */</div><div class='add'>+#define  ENET_DMA_CH_CFG_BURST_HALT			0x00000004	/* idle after finish current memory burst */</div><div class='add'>+#define ENET_DMA_CH_CFG_INT_STAT			0x04		/* interrupts control and status */</div><div class='add'>+#define ENET_DMA_CH_CFG_INT_MASK			0x08		/* interrupts mask */</div><div class='add'>+#define  ENET_DMA_CH_CFG_INT_BUFF_DONE			0x00000001	/* buffer done */</div><div class='add'>+#define  ENET_DMA_CH_CFG_INT_DONE			0x00000002	/* packet xfer complete */</div><div class='add'>+#define  ENET_DMA_CH_CFG_INT_NO_DESC			0x00000004	/* no valid descriptors */</div><div class='add'>+#define  ENET_DMA_CH_CFG_INT_RX_ERROR			0x00000008	/* rxdma detect client protocol error */</div><div class='add'>+#define ENET_DMA_CH_CFG_MAX_BURST			0x0c		/* max burst length permitted */</div><div class='add'>+#define  ENET_DMA_CH_CFG_MAX_BURST_DESCSIZE_SEL		0x00040000	/* DMA Descriptor Size Selection */</div><div class='add'>+#define ENET_DMA_CH_CFG_SIZE				0x10</div><div class='add'>+</div><div class='add'>+#define ENET_DMA_CH_STATE_RAM_BASE_DESC_PTR		0x00		/* descriptor ring start address */</div><div class='add'>+#define ENET_DMA_CH_STATE_RAM_STATE_DATA		0x04		/* state/bytes done/ring offset */</div><div class='add'>+#define ENET_DMA_CH_STATE_RAM_DESC_LEN_STATUS		0x08		/* buffer descriptor status and len */</div><div class='add'>+#define ENET_DMA_CH_STATE_RAM_DESC_BASE_BUFPTR		0x0c		/* buffer descrpitor current processing */</div><div class='add'>+#define ENET_DMA_CH_STATE_RAM_SIZE			0x10</div><div class='add'>+</div><div class='add'>+#define DMA_CTL_STATUS_APPEND_CRC			0x00000100</div><div class='add'>+#define DMA_CTL_STATUS_APPEND_BRCM_TAG			0x00000200</div><div class='add'>+#define DMA_CTL_STATUS_PRIO				0x00000C00  /* Prio for Tx */</div><div class='add'>+#define DMA_CTL_STATUS_WRAP				0x00001000  /* */</div><div class='add'>+#define DMA_CTL_STATUS_SOP				0x00002000  /* first buffer in packet */</div><div class='add'>+#define DMA_CTL_STATUS_EOP				0x00004000  /* last buffer in packet */</div><div class='add'>+#define DMA_CTL_STATUS_OWN				0x00008000  /* cleared by DMA, set by SW */</div><div class='add'>+#define DMA_CTL_LEN_DESC_BUFLENGTH			0x0fff0000</div><div class='add'>+#define DMA_CTL_LEN_DESC_BUFLENGTH_SHIFT		16</div><div class='add'>+#define DMA_CTL_LEN_DESC_MULTICAST			0x40000000</div><div class='add'>+#define DMA_CTL_LEN_DESC_USEFPM				0x80000000</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c<br/>index 85e610210477..92204fea1f08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcm63xx_enet.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcm63xx_enet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bcm63xx_enet.c</a></div><div class='hunk'>@@ -22,7 +22,6 @@</div><div class='ctx'> #include "bcm63xx_enet.h"</div><div class='ctx'> </div><div class='ctx'> static char bcm_enet_driver_name[] = "bcm63xx_enet";</div><div class='del'>-static char bcm_enet_driver_version[] = "1.0";</div><div class='ctx'> </div><div class='ctx'> static int copybreak __read_mostly = 128;</div><div class='ctx'> module_param(copybreak, int, 0);</div><div class='hunk'>@@ -221,7 +220,7 @@ static void bcm_enet_mdio_write_mii(struct net_device *dev, int mii_id,</div><div class='ctx'> /*</div><div class='ctx'>  * refill rx queue</div><div class='ctx'>  */</div><div class='del'>-static int bcm_enet_refill_rx(struct net_device *dev)</div><div class='add'>+static int bcm_enet_refill_rx(struct net_device *dev, bool napi_mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> </div><div class='hunk'>@@ -229,26 +228,29 @@ static int bcm_enet_refill_rx(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	while (priv-&gt;rx_desc_count &lt; priv-&gt;rx_ring_size) {</div><div class='ctx'> 		struct bcm_enet_desc *desc;</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		dma_addr_t p;</div><div class='ctx'> 		int desc_idx;</div><div class='ctx'> 		u32 len_stat;</div><div class='ctx'> </div><div class='ctx'> 		desc_idx = priv-&gt;rx_dirty_desc;</div><div class='ctx'> 		desc = &amp;priv-&gt;rx_desc_cpu[desc_idx];</div><div class='ctx'> </div><div class='del'>-		if (!priv-&gt;rx_skb[desc_idx]) {</div><div class='del'>-			skb = netdev_alloc_skb(dev, priv-&gt;rx_skb_size);</div><div class='del'>-			if (!skb)</div><div class='add'>+		if (!priv-&gt;rx_buf[desc_idx]) {</div><div class='add'>+			void *buf;</div><div class='add'>+</div><div class='add'>+			if (likely(napi_mode))</div><div class='add'>+				buf = napi_alloc_frag(priv-&gt;rx_frag_size);</div><div class='add'>+			else</div><div class='add'>+				buf = netdev_alloc_frag(priv-&gt;rx_frag_size);</div><div class='add'>+			if (unlikely(!buf))</div><div class='ctx'> 				break;</div><div class='del'>-			priv-&gt;rx_skb[desc_idx] = skb;</div><div class='del'>-			p = dma_map_single(&amp;priv-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='del'>-					   priv-&gt;rx_skb_size,</div><div class='del'>-					   DMA_FROM_DEVICE);</div><div class='del'>-			desc-&gt;address = p;</div><div class='add'>+			priv-&gt;rx_buf[desc_idx] = buf;</div><div class='add'>+			desc-&gt;address = dma_map_single(&amp;priv-&gt;pdev-&gt;dev,</div><div class='add'>+						       buf + priv-&gt;rx_buf_offset,</div><div class='add'>+						       priv-&gt;rx_buf_size,</div><div class='add'>+						       DMA_FROM_DEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		len_stat = priv-&gt;rx_skb_size &lt;&lt; DMADESC_LENGTH_SHIFT;</div><div class='add'>+		len_stat = priv-&gt;rx_buf_size &lt;&lt; DMADESC_LENGTH_SHIFT;</div><div class='ctx'> 		len_stat |= DMADESC_OWNER_MASK;</div><div class='ctx'> 		if (priv-&gt;rx_dirty_desc == priv-&gt;rx_ring_size - 1) {</div><div class='ctx'> 			len_stat |= (DMADESC_WRAP_MASK &gt;&gt; priv-&gt;dma_desc_shift);</div><div class='hunk'>@@ -284,11 +286,11 @@ static int bcm_enet_refill_rx(struct net_device *dev)</div><div class='ctx'>  */</div><div class='ctx'> static void bcm_enet_refill_rx_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bcm_enet_priv *priv = from_timer(priv, t, rx_timeout);</div><div class='add'>+	struct bcm_enet_priv *priv = timer_container_of(priv, t, rx_timeout);</div><div class='ctx'> 	struct net_device *dev = priv-&gt;net_dev;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;priv-&gt;rx_lock);</div><div class='del'>-	bcm_enet_refill_rx(dev);</div><div class='add'>+	bcm_enet_refill_rx(dev, false);</div><div class='ctx'> 	spin_unlock(&amp;priv-&gt;rx_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -298,10 +300,12 @@ static void bcm_enet_refill_rx_timer(struct timer_list *t)</div><div class='ctx'> static int bcm_enet_receive_queue(struct net_device *dev, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='add'>+	struct list_head rx_list;</div><div class='ctx'> 	struct device *kdev;</div><div class='ctx'> 	int processed;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='add'>+	INIT_LIST_HEAD(&amp;rx_list);</div><div class='ctx'> 	kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	processed = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -316,6 +320,7 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)</div><div class='ctx'> 		int desc_idx;</div><div class='ctx'> 		u32 len_stat;</div><div class='ctx'> 		unsigned int len;</div><div class='add'>+		void *buf;</div><div class='ctx'> </div><div class='ctx'> 		desc_idx = priv-&gt;rx_curr_desc;</div><div class='ctx'> 		desc = &amp;priv-&gt;rx_desc_cpu[desc_idx];</div><div class='hunk'>@@ -334,7 +339,6 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)</div><div class='ctx'> 		priv-&gt;rx_curr_desc++;</div><div class='ctx'> 		if (priv-&gt;rx_curr_desc == priv-&gt;rx_ring_size)</div><div class='ctx'> 			priv-&gt;rx_curr_desc = 0;</div><div class='del'>-		priv-&gt;rx_desc_count--;</div><div class='ctx'> </div><div class='ctx'> 		/* if the packet does not have start of packet _and_</div><div class='ctx'> 		 * end of packet flag set, then just recycle it */</div><div class='hunk'>@@ -361,16 +365,14 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* valid packet */</div><div class='del'>-		skb = priv-&gt;rx_skb[desc_idx];</div><div class='add'>+		buf = priv-&gt;rx_buf[desc_idx];</div><div class='ctx'> 		len = (len_stat &amp; DMADESC_LENGTH_MASK) &gt;&gt; DMADESC_LENGTH_SHIFT;</div><div class='ctx'> 		/* don't include FCS */</div><div class='ctx'> 		len -= 4;</div><div class='ctx'> </div><div class='ctx'> 		if (len &lt; copybreak) {</div><div class='del'>-			struct sk_buff *nskb;</div><div class='del'>-</div><div class='del'>-			nskb = napi_alloc_skb(&amp;priv-&gt;napi, len);</div><div class='del'>-			if (!nskb) {</div><div class='add'>+			skb = napi_alloc_skb(&amp;priv-&gt;napi, len);</div><div class='add'>+			if (unlikely(!skb)) {</div><div class='ctx'> 				/* forget packet, just rearm desc */</div><div class='ctx'> 				dev-&gt;stats.rx_dropped++;</div><div class='ctx'> 				continue;</div><div class='hunk'>@@ -378,26 +380,36 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)</div><div class='ctx'> </div><div class='ctx'> 			dma_sync_single_for_cpu(kdev, desc-&gt;address,</div><div class='ctx'> 						len, DMA_FROM_DEVICE);</div><div class='del'>-			memcpy(nskb-&gt;data, skb-&gt;data, len);</div><div class='add'>+			memcpy(skb-&gt;data, buf + priv-&gt;rx_buf_offset, len);</div><div class='ctx'> 			dma_sync_single_for_device(kdev, desc-&gt;address,</div><div class='ctx'> 						   len, DMA_FROM_DEVICE);</div><div class='del'>-			skb = nskb;</div><div class='ctx'> 		} else {</div><div class='del'>-			dma_unmap_single(&amp;priv-&gt;pdev-&gt;dev, desc-&gt;address,</div><div class='del'>-					 priv-&gt;rx_skb_size, DMA_FROM_DEVICE);</div><div class='del'>-			priv-&gt;rx_skb[desc_idx] = NULL;</div><div class='add'>+			dma_unmap_single(kdev, desc-&gt;address,</div><div class='add'>+					 priv-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='add'>+			priv-&gt;rx_buf[desc_idx] = NULL;</div><div class='add'>+</div><div class='add'>+			skb = napi_build_skb(buf, priv-&gt;rx_frag_size);</div><div class='add'>+			if (unlikely(!skb)) {</div><div class='add'>+				skb_free_frag(buf);</div><div class='add'>+				dev-&gt;stats.rx_dropped++;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			skb_reserve(skb, priv-&gt;rx_buf_offset);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		skb_put(skb, len);</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> 		dev-&gt;stats.rx_packets++;</div><div class='ctx'> 		dev-&gt;stats.rx_bytes += len;</div><div class='del'>-		netif_receive_skb(skb);</div><div class='add'>+		list_add_tail(&amp;skb-&gt;list, &amp;rx_list);</div><div class='ctx'> </div><div class='del'>-	} while (--budget &gt; 0);</div><div class='add'>+	} while (processed &lt; budget);</div><div class='add'>+</div><div class='add'>+	netif_receive_skb_list(&amp;rx_list);</div><div class='add'>+	priv-&gt;rx_desc_count -= processed;</div><div class='ctx'> </div><div class='ctx'> 	if (processed || !priv-&gt;rx_desc_count) {</div><div class='del'>-		bcm_enet_refill_rx(dev);</div><div class='add'>+		bcm_enet_refill_rx(dev, true);</div><div class='ctx'> </div><div class='ctx'> 		/* kick rx dma */</div><div class='ctx'> 		enet_dmac_writel(priv, priv-&gt;dma_chan_en_mask,</div><div class='hunk'>@@ -411,12 +423,14 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)</div><div class='ctx'> /*</div><div class='ctx'>  * try to or force reclaim of transmitted buffers</div><div class='ctx'>  */</div><div class='del'>-static int bcm_enet_tx_reclaim(struct net_device *dev, int force)</div><div class='add'>+static int bcm_enet_tx_reclaim(struct net_device *dev, int force, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='add'>+	unsigned int bytes;</div><div class='ctx'> 	int released;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='add'>+	bytes = 0;</div><div class='ctx'> 	released = 0;</div><div class='ctx'> </div><div class='ctx'> 	while (priv-&gt;tx_desc_count &lt; priv-&gt;tx_ring_size) {</div><div class='hunk'>@@ -453,10 +467,13 @@ static int bcm_enet_tx_reclaim(struct net_device *dev, int force)</div><div class='ctx'> 		if (desc-&gt;len_stat &amp; DMADESC_UNDER_MASK)</div><div class='ctx'> 			dev-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		bytes += skb-&gt;len;</div><div class='add'>+		napi_consume_skb(skb, budget);</div><div class='ctx'> 		released++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_completed_queue(dev, released, bytes);</div><div class='add'>+</div><div class='ctx'> 	if (netif_queue_stopped(dev) &amp;&amp; released)</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -482,7 +499,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			 ENETDMAC_IR, priv-&gt;tx_chan);</div><div class='ctx'> </div><div class='ctx'> 	/* reclaim sent skb */</div><div class='del'>-	bcm_enet_tx_reclaim(dev, 0);</div><div class='add'>+	bcm_enet_tx_reclaim(dev, 0, budget);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;priv-&gt;rx_lock);</div><div class='ctx'> 	rx_work_done = bcm_enet_receive_queue(dev, budget);</div><div class='hunk'>@@ -623,8 +640,11 @@ bcm_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	desc-&gt;len_stat = len_stat;</div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='add'>+	netdev_sent_queue(dev, skb-&gt;len);</div><div class='add'>+</div><div class='ctx'> 	/* kick tx dma */</div><div class='del'>-	enet_dmac_writel(priv, priv-&gt;dma_chan_en_mask,</div><div class='add'>+	if (!netdev_xmit_more() || !priv-&gt;tx_desc_count)</div><div class='add'>+		enet_dmac_writel(priv, priv-&gt;dma_chan_en_mask,</div><div class='ctx'> 				 ENETDMAC_CHANCFG, priv-&gt;tx_chan);</div><div class='ctx'> </div><div class='ctx'> 	/* stop queue if no more desc available */</div><div class='hunk'>@@ -650,7 +670,7 @@ static int bcm_enet_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	/* use perfect match register 0 to store my mac address */</div><div class='ctx'> 	val = (dev-&gt;dev_addr[2] &lt;&lt; 24) | (dev-&gt;dev_addr[3] &lt;&lt; 16) |</div><div class='hunk'>@@ -846,6 +866,24 @@ static void bcm_enet_adjust_link(struct net_device *dev)</div><div class='ctx'> 		priv-&gt;pause_tx ? "tx" : "off");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bcm_enet_free_rx_buf_ring(struct device *kdev, struct bcm_enet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;rx_ring_size; i++) {</div><div class='add'>+		struct bcm_enet_desc *desc;</div><div class='add'>+</div><div class='add'>+		if (!priv-&gt;rx_buf[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		desc = &amp;priv-&gt;rx_desc_cpu[i];</div><div class='add'>+		dma_unmap_single(kdev, desc-&gt;address, priv-&gt;rx_buf_size,</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='add'>+		skb_free_frag(priv-&gt;rx_buf[i]);</div><div class='add'>+	}</div><div class='add'>+	kfree(priv-&gt;rx_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * open callback, allocate dma rings &amp; buffers and start rx operation</div><div class='ctx'>  */</div><div class='hunk'>@@ -955,10 +993,10 @@ static int bcm_enet_open(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;tx_curr_desc = 0;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='del'>-	/* init &amp; fill rx ring with skbs */</div><div class='del'>-	priv-&gt;rx_skb = kcalloc(priv-&gt;rx_ring_size, sizeof(struct sk_buff *),</div><div class='add'>+	/* init &amp; fill rx ring with buffers */</div><div class='add'>+	priv-&gt;rx_buf = kcalloc(priv-&gt;rx_ring_size, sizeof(void *),</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;rx_skb) {</div><div class='add'>+	if (!priv-&gt;rx_buf) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_free_tx_skb;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -975,8 +1013,8 @@ static int bcm_enet_open(struct net_device *dev)</div><div class='ctx'> 		enet_dmac_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,</div><div class='ctx'> 				ENETDMAC_BUFALLOC, priv-&gt;rx_chan);</div><div class='ctx'> </div><div class='del'>-	if (bcm_enet_refill_rx(dev)) {</div><div class='del'>-		dev_err(kdev, "cannot allocate rx skb queue\n");</div><div class='add'>+	if (bcm_enet_refill_rx(dev, false)) {</div><div class='add'>+		dev_err(kdev, "cannot allocate rx buffer queue\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1070,18 +1108,7 @@ static int bcm_enet_open(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;rx_ring_size; i++) {</div><div class='del'>-		struct bcm_enet_desc *desc;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;rx_skb[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		desc = &amp;priv-&gt;rx_desc_cpu[i];</div><div class='del'>-		dma_unmap_single(kdev, desc-&gt;address, priv-&gt;rx_skb_size,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='del'>-		kfree_skb(priv-&gt;rx_skb[i]);</div><div class='del'>-	}</div><div class='del'>-	kfree(priv-&gt;rx_skb);</div><div class='add'>+	bcm_enet_free_rx_buf_ring(kdev, priv);</div><div class='ctx'> </div><div class='ctx'> out_free_tx_skb:</div><div class='ctx'> 	kfree(priv-&gt;tx_skb);</div><div class='hunk'>@@ -1160,7 +1187,6 @@ static int bcm_enet_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	struct device *kdev;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='hunk'>@@ -1169,7 +1195,7 @@ static int bcm_enet_stop(struct net_device *dev)</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> 	if (priv-&gt;has_phy)</div><div class='ctx'> 		phy_stop(dev-&gt;phydev);</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;rx_timeout);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;rx_timeout);</div><div class='ctx'> </div><div class='ctx'> 	/* mask all interrupts */</div><div class='ctx'> 	enet_writel(priv, 0, ENET_IRMASK_REG);</div><div class='hunk'>@@ -1185,23 +1211,12 @@ static int bcm_enet_stop(struct net_device *dev)</div><div class='ctx'> 	bcm_enet_disable_mac(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* force reclaim of all tx buffers */</div><div class='del'>-	bcm_enet_tx_reclaim(dev, 1);</div><div class='add'>+	bcm_enet_tx_reclaim(dev, 1, 0);</div><div class='ctx'> </div><div class='del'>-	/* free the rx skb ring */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;rx_ring_size; i++) {</div><div class='del'>-		struct bcm_enet_desc *desc;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;rx_skb[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		desc = &amp;priv-&gt;rx_desc_cpu[i];</div><div class='del'>-		dma_unmap_single(kdev, desc-&gt;address, priv-&gt;rx_skb_size,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='del'>-		kfree_skb(priv-&gt;rx_skb[i]);</div><div class='del'>-	}</div><div class='add'>+	/* free the rx buffer ring */</div><div class='add'>+	bcm_enet_free_rx_buf_ring(kdev, priv);</div><div class='ctx'> </div><div class='ctx'> 	/* free remaining allocated memory */</div><div class='del'>-	kfree(priv-&gt;rx_skb);</div><div class='ctx'> 	kfree(priv-&gt;tx_skb);</div><div class='ctx'> 	dma_free_coherent(kdev, priv-&gt;rx_desc_alloc_size,</div><div class='ctx'> 			  priv-&gt;rx_desc_cpu, priv-&gt;rx_desc_dma);</div><div class='hunk'>@@ -1215,6 +1230,9 @@ static int bcm_enet_stop(struct net_device *dev)</div><div class='ctx'> 	if (priv-&gt;has_phy)</div><div class='ctx'> 		phy_disconnect(dev-&gt;phydev);</div><div class='ctx'> </div><div class='add'>+	/* reset BQL after forced tx reclaim to prevent kernel panic */</div><div class='add'>+	netdev_reset_queue(dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1303,11 +1321,8 @@ static const u32 unused_mib_regs[] = {</div><div class='ctx'> static void bcm_enet_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 				 struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(drvinfo-&gt;driver, bcm_enet_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, bcm_enet_driver_version,</div><div class='del'>-		sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, "N/A", sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, "bcm63xx", sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+	strscpy(drvinfo-&gt;driver, bcm_enet_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, "bcm63xx", sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_enet_get_sset_count(struct net_device *netdev,</div><div class='hunk'>@@ -1324,14 +1339,14 @@ static int bcm_enet_get_sset_count(struct net_device *netdev,</div><div class='ctx'> static void bcm_enet_get_strings(struct net_device *netdev,</div><div class='ctx'> 				 u32 stringset, u8 *data)</div><div class='ctx'> {</div><div class='add'>+	const char *str;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='ctx'> 		for (i = 0; i &lt; BCM_ENET_STATS_LEN; i++) {</div><div class='del'>-			memcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-			       bcm_enet_gstrings_stats[i].stat_string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='add'>+			str = bcm_enet_gstrings_stats[i].stat_string;</div><div class='add'>+			ethtool_puts(&amp;data, str);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1482,8 +1497,11 @@ static int bcm_enet_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_enet_get_ringparam(struct net_device *dev,</div><div class='del'>-				   struct ethtool_ringparam *ering)</div><div class='add'>+static void</div><div class='add'>+bcm_enet_get_ringparam(struct net_device *dev,</div><div class='add'>+		       struct ethtool_ringparam *ering,</div><div class='add'>+		       struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> </div><div class='hunk'>@@ -1497,7 +1515,9 @@ static void bcm_enet_get_ringparam(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_enet_set_ringparam(struct net_device *dev,</div><div class='del'>-				  struct ethtool_ringparam *ering)</div><div class='add'>+				  struct ethtool_ringparam *ering,</div><div class='add'>+				  struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	int was_running;</div><div class='hunk'>@@ -1626,10 +1646,13 @@ static int bcm_enet_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	 * align rx buffer size to dma burst len, account FCS since</div><div class='ctx'> 	 * it's appended</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;rx_skb_size = ALIGN(actual_mtu + ETH_FCS_LEN,</div><div class='add'>+	priv-&gt;rx_buf_size = ALIGN(actual_mtu + ETH_FCS_LEN,</div><div class='ctx'> 				  priv-&gt;dma_maxburst * 4);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	priv-&gt;rx_frag_size = SKB_DATA_ALIGN(priv-&gt;rx_buf_offset + priv-&gt;rx_buf_size) +</div><div class='add'>+					    SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1681,7 +1704,7 @@ static const struct net_device_ops bcm_enet_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= bcm_enet_start_xmit,</div><div class='ctx'> 	.ndo_set_mac_address	= bcm_enet_set_mac_address,</div><div class='ctx'> 	.ndo_set_rx_mode	= bcm_enet_set_multicast_list,</div><div class='del'>-	.ndo_do_ioctl		= bcm_enet_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= bcm_enet_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= bcm_enet_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1693,20 +1716,19 @@ static int bcm_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct bcm63xx_enet_platform_data *pd;</div><div class='del'>-	struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;</div><div class='add'>+	int irq, irq_rx, irq_tx;</div><div class='ctx'> 	struct mii_bus *bus;</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!bcm_enet_shared_base[0])</div><div class='ctx'> 		return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='del'>-	res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);</div><div class='del'>-	res_irq_tx = platform_get_resource(pdev, IORESOURCE_IRQ, 2);</div><div class='del'>-	if (!res_irq || !res_irq_rx || !res_irq_tx)</div><div class='add'>+	irq = platform_get_irq(pdev, 0);</div><div class='add'>+	irq_rx = platform_get_irq(pdev, 1);</div><div class='add'>+	irq_tx = platform_get_irq(pdev, 2);</div><div class='add'>+	if (irq &lt; 0 || irq_rx &lt; 0 || irq_tx &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*priv));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1714,21 +1736,21 @@ static int bcm_enet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;enet_is_sw = false;</div><div class='ctx'> 	priv-&gt;dma_maxburst = BCMENET_DMA_MAXBURST;</div><div class='add'>+	priv-&gt;rx_buf_offset = NET_SKB_PAD;</div><div class='ctx'> </div><div class='ctx'> 	ret = bcm_enet_change_mtu(dev, dev-&gt;mtu);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	priv-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, res_mem);</div><div class='add'>+	priv-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;base)) {</div><div class='ctx'> 		ret = PTR_ERR(priv-&gt;base);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dev-&gt;irq = priv-&gt;irq = res_irq-&gt;start;</div><div class='del'>-	priv-&gt;irq_rx = res_irq_rx-&gt;start;</div><div class='del'>-	priv-&gt;irq_tx = res_irq_tx-&gt;start;</div><div class='add'>+	dev-&gt;irq = priv-&gt;irq = irq;</div><div class='add'>+	priv-&gt;irq_rx = irq_rx;</div><div class='add'>+	priv-&gt;irq_tx = irq_tx;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;mac_clk = devm_clk_get(&amp;pdev-&gt;dev, "enet");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;mac_clk)) {</div><div class='hunk'>@@ -1745,7 +1767,7 @@ static int bcm_enet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pd = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (pd) {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, pd-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, pd-&gt;mac_addr);</div><div class='ctx'> 		priv-&gt;has_phy = pd-&gt;has_phy;</div><div class='ctx'> 		priv-&gt;phy_id = pd-&gt;phy_id;</div><div class='ctx'> 		priv-&gt;has_phy_interrupt = pd-&gt;has_phy_interrupt;</div><div class='hunk'>@@ -1837,7 +1859,7 @@ static int bcm_enet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* register netdevice */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;bcm_enet_ops;</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, bcm_enet_poll, 16);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;priv-&gt;napi, bcm_enet_poll, 16);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;bcm_enet_ethtool_ops;</div><div class='ctx'> 	/* MTU range: 46 - 2028 */</div><div class='hunk'>@@ -1880,7 +1902,7 @@ out:</div><div class='ctx'> /*</div><div class='ctx'>  * exit func, stops hardware and unregisters netdevice</div><div class='ctx'>  */</div><div class='del'>-static int bcm_enet_remove(struct platform_device *pdev)</div><div class='add'>+static void bcm_enet_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -1910,15 +1932,13 @@ static int bcm_enet_remove(struct platform_device *pdev)</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;mac_clk);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct platform_driver bcm63xx_enet_driver = {</div><div class='add'>+static struct platform_driver bcm63xx_enet_driver = {</div><div class='ctx'> 	.probe	= bcm_enet_probe,</div><div class='del'>-	.remove	= bcm_enet_remove,</div><div class='add'>+	.remove = bcm_enet_remove,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "bcm63xx_enet",</div><div class='del'>-		.owner  = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1981,7 +2001,7 @@ static inline int bcm_enet_port_is_rgmii(int portid)</div><div class='ctx'>  */</div><div class='ctx'> static void swphy_poll_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bcm_enet_priv *priv = from_timer(priv, t, swphy_poll);</div><div class='add'>+	struct bcm_enet_priv *priv = timer_container_of(priv, t, swphy_poll);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_ports; i++) {</div><div class='hunk'>@@ -2132,7 +2152,7 @@ static int bcm_enetsw_open(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;tx_skb = kcalloc(priv-&gt;tx_ring_size, sizeof(struct sk_buff *),</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	if (!priv-&gt;tx_skb) {</div><div class='del'>-		dev_err(kdev, "cannot allocate rx skb queue\n");</div><div class='add'>+		dev_err(kdev, "cannot allocate tx skb queue\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_free_tx_ring;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2142,11 +2162,11 @@ static int bcm_enetsw_open(struct net_device *dev)</div><div class='ctx'> 	priv-&gt;tx_curr_desc = 0;</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='del'>-	/* init &amp; fill rx ring with skbs */</div><div class='del'>-	priv-&gt;rx_skb = kcalloc(priv-&gt;rx_ring_size, sizeof(struct sk_buff *),</div><div class='add'>+	/* init &amp; fill rx ring with buffers */</div><div class='add'>+	priv-&gt;rx_buf = kcalloc(priv-&gt;rx_ring_size, sizeof(void *),</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;rx_skb) {</div><div class='del'>-		dev_err(kdev, "cannot allocate rx skb queue\n");</div><div class='add'>+	if (!priv-&gt;rx_buf) {</div><div class='add'>+		dev_err(kdev, "cannot allocate rx buffer queue\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out_free_tx_skb;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2193,8 +2213,8 @@ static int bcm_enetsw_open(struct net_device *dev)</div><div class='ctx'> 	enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,</div><div class='ctx'> 			ENETDMA_BUFALLOC_REG(priv-&gt;rx_chan));</div><div class='ctx'> </div><div class='del'>-	if (bcm_enet_refill_rx(dev)) {</div><div class='del'>-		dev_err(kdev, "cannot allocate rx skb queue\n");</div><div class='add'>+	if (bcm_enet_refill_rx(dev, false)) {</div><div class='add'>+		dev_err(kdev, "cannot allocate rx buffer queue\n");</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2293,18 +2313,7 @@ static int bcm_enetsw_open(struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;rx_ring_size; i++) {</div><div class='del'>-		struct bcm_enet_desc *desc;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;rx_skb[i])</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		desc = &amp;priv-&gt;rx_desc_cpu[i];</div><div class='del'>-		dma_unmap_single(kdev, desc-&gt;address, priv-&gt;rx_skb_size,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='del'>-		kfree_skb(priv-&gt;rx_skb[i]);</div><div class='del'>-	}</div><div class='del'>-	kfree(priv-&gt;rx_skb);</div><div class='add'>+	bcm_enet_free_rx_buf_ring(kdev, priv);</div><div class='ctx'> </div><div class='ctx'> out_free_tx_skb:</div><div class='ctx'> 	kfree(priv-&gt;tx_skb);</div><div class='hunk'>@@ -2333,15 +2342,14 @@ static int bcm_enetsw_stop(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	struct device *kdev;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;priv-&gt;swphy_poll);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;swphy_poll);</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='del'>-	del_timer_sync(&amp;priv-&gt;rx_timeout);</div><div class='add'>+	timer_delete_sync(&amp;priv-&gt;rx_timeout);</div><div class='ctx'> </div><div class='ctx'> 	/* mask all interrupts */</div><div class='ctx'> 	enet_dmac_writel(priv, 0, ENETDMAC_IRMASK, priv-&gt;rx_chan);</div><div class='hunk'>@@ -2352,23 +2360,12 @@ static int bcm_enetsw_stop(struct net_device *dev)</div><div class='ctx'> 	bcm_enet_disable_dma(priv, priv-&gt;rx_chan);</div><div class='ctx'> </div><div class='ctx'> 	/* force reclaim of all tx buffers */</div><div class='del'>-	bcm_enet_tx_reclaim(dev, 1);</div><div class='del'>-</div><div class='del'>-	/* free the rx skb ring */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;rx_ring_size; i++) {</div><div class='del'>-		struct bcm_enet_desc *desc;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;rx_skb[i])</div><div class='del'>-			continue;</div><div class='add'>+	bcm_enet_tx_reclaim(dev, 1, 0);</div><div class='ctx'> </div><div class='del'>-		desc = &amp;priv-&gt;rx_desc_cpu[i];</div><div class='del'>-		dma_unmap_single(kdev, desc-&gt;address, priv-&gt;rx_skb_size,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='del'>-		kfree_skb(priv-&gt;rx_skb[i]);</div><div class='del'>-	}</div><div class='add'>+	/* free the rx buffer ring */</div><div class='add'>+	bcm_enet_free_rx_buf_ring(kdev, priv);</div><div class='ctx'> </div><div class='ctx'> 	/* free remaining allocated memory */</div><div class='del'>-	kfree(priv-&gt;rx_skb);</div><div class='ctx'> 	kfree(priv-&gt;tx_skb);</div><div class='ctx'> 	dma_free_coherent(kdev, priv-&gt;rx_desc_alloc_size,</div><div class='ctx'> 			  priv-&gt;rx_desc_cpu, priv-&gt;rx_desc_dma);</div><div class='hunk'>@@ -2378,6 +2375,9 @@ static int bcm_enetsw_stop(struct net_device *dev)</div><div class='ctx'> 		free_irq(priv-&gt;irq_tx, dev);</div><div class='ctx'> 	free_irq(priv-&gt;irq_rx, dev);</div><div class='ctx'> </div><div class='add'>+	/* reset BQL after forced tx reclaim to prevent kernel panic */</div><div class='add'>+	netdev_reset_queue(dev);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2449,7 +2449,7 @@ static const struct net_device_ops bcm_enetsw_ops = {</div><div class='ctx'> 	.ndo_stop		= bcm_enetsw_stop,</div><div class='ctx'> 	.ndo_start_xmit		= bcm_enet_start_xmit,</div><div class='ctx'> 	.ndo_change_mtu		= bcm_enet_change_mtu,</div><div class='del'>-	.ndo_do_ioctl		= bcm_enetsw_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= bcm_enetsw_ioctl,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -2503,14 +2503,14 @@ static const struct bcm_enet_stats bcm_enetsw_gstrings_stats[] = {</div><div class='ctx'> static void bcm_enetsw_get_strings(struct net_device *netdev,</div><div class='ctx'> 				   u32 stringset, u8 *data)</div><div class='ctx'> {</div><div class='add'>+	const char *str;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='ctx'> 		for (i = 0; i &lt; BCM_ENETSW_STATS_LEN; i++) {</div><div class='del'>-			memcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-			       bcm_enetsw_gstrings_stats[i].stat_string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='add'>+			str = bcm_enetsw_gstrings_stats[i].stat_string;</div><div class='add'>+			ethtool_puts(&amp;data, str);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2530,10 +2530,8 @@ static int bcm_enetsw_get_sset_count(struct net_device *netdev,</div><div class='ctx'> static void bcm_enetsw_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 				   struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	strncpy(drvinfo-&gt;driver, bcm_enet_driver_name, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;version, bcm_enet_driver_version, 32);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, "N/A", 32);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, "bcm63xx", 32);</div><div class='add'>+	strscpy(drvinfo-&gt;driver, bcm_enet_driver_name, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, "bcm63xx", sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_enetsw_get_ethtool_stats(struct net_device *netdev,</div><div class='hunk'>@@ -2584,8 +2582,11 @@ static void bcm_enetsw_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_enetsw_get_ringparam(struct net_device *dev,</div><div class='del'>-				     struct ethtool_ringparam *ering)</div><div class='add'>+static void</div><div class='add'>+bcm_enetsw_get_ringparam(struct net_device *dev,</div><div class='add'>+			 struct ethtool_ringparam *ering,</div><div class='add'>+			 struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> </div><div class='hunk'>@@ -2600,8 +2601,11 @@ static void bcm_enetsw_get_ringparam(struct net_device *dev,</div><div class='ctx'> 	ering-&gt;tx_pending = priv-&gt;tx_ring_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_enetsw_set_ringparam(struct net_device *dev,</div><div class='del'>-				    struct ethtool_ringparam *ering)</div><div class='add'>+static int</div><div class='add'>+bcm_enetsw_set_ringparam(struct net_device *dev,</div><div class='add'>+			 struct ethtool_ringparam *ering,</div><div class='add'>+			 struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	int was_running;</div><div class='hunk'>@@ -2654,12 +2658,10 @@ static int bcm_enetsw_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!res_mem || irq_rx &lt; 0)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ret = 0;</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*priv));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='del'>-	memset(priv, 0, sizeof(*priv));</div><div class='ctx'> </div><div class='ctx'> 	/* initialize default and fetch platform data */</div><div class='ctx'> 	priv-&gt;enet_is_sw = true;</div><div class='hunk'>@@ -2668,10 +2670,11 @@ static int bcm_enetsw_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;rx_ring_size = BCMENET_DEF_RX_DESC;</div><div class='ctx'> 	priv-&gt;tx_ring_size = BCMENET_DEF_TX_DESC;</div><div class='ctx'> 	priv-&gt;dma_maxburst = BCMENETSW_DMA_MAXBURST;</div><div class='add'>+	priv-&gt;rx_buf_offset = NET_SKB_PAD + NET_IP_ALIGN;</div><div class='ctx'> </div><div class='ctx'> 	pd = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (pd) {</div><div class='del'>-		memcpy(dev-&gt;dev_addr, pd-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(dev, pd-&gt;mac_addr);</div><div class='ctx'> 		memcpy(priv-&gt;used_ports, pd-&gt;used_ports,</div><div class='ctx'> 		       sizeof(pd-&gt;used_ports));</div><div class='ctx'> 		priv-&gt;num_ports = pd-&gt;num_ports;</div><div class='hunk'>@@ -2709,7 +2712,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* register netdevice */</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;bcm_enetsw_ops;</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, bcm_enet_poll, 16);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;priv-&gt;napi, bcm_enet_poll, 16);</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;bcm_enetsw_ethtool_ops;</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2735,7 +2738,7 @@ out:</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /* exit func, stops hardware and unregisters netdevice */</div><div class='del'>-static int bcm_enetsw_remove(struct platform_device *pdev)</div><div class='add'>+static void bcm_enetsw_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_enet_priv *priv;</div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -2748,30 +2751,26 @@ static int bcm_enetsw_remove(struct platform_device *pdev)</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;mac_clk);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-struct platform_driver bcm63xx_enetsw_driver = {</div><div class='add'>+static struct platform_driver bcm63xx_enetsw_driver = {</div><div class='ctx'> 	.probe	= bcm_enetsw_probe,</div><div class='del'>-	.remove	= bcm_enetsw_remove,</div><div class='add'>+	.remove = bcm_enetsw_remove,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "bcm63xx_enetsw",</div><div class='del'>-		.owner  = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* reserve &amp; remap memory space shared between all macs */</div><div class='ctx'> static int bcm_enet_shared_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	void __iomem *p[3];</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(bcm_enet_shared_base, 0, sizeof(bcm_enet_shared_base));</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++) {</div><div class='del'>-		res = platform_get_resource(pdev, IORESOURCE_MEM, i);</div><div class='del'>-		p[i] = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+		p[i] = devm_platform_ioremap_resource(pdev, i);</div><div class='ctx'> 		if (IS_ERR(p[i]))</div><div class='ctx'> 			return PTR_ERR(p[i]);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2781,20 +2780,13 @@ static int bcm_enet_shared_probe(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_enet_shared_remove(struct platform_device *pdev)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* this "shared" driver is needed because both macs share a single</div><div class='ctx'>  * address space</div><div class='ctx'>  */</div><div class='ctx'> struct platform_driver bcm63xx_enet_shared_driver = {</div><div class='ctx'> 	.probe	= bcm_enet_shared_probe,</div><div class='del'>-	.remove	= bcm_enet_shared_remove,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "bcm63xx_enet_shared",</div><div class='del'>-		.owner  = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h<br/>index 1d3c917eb830..78f1830fb3cb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcm63xx_enet.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcm63xx_enet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcm63xx_enet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bcm63xx_enet.h</a></div><div class='hunk'>@@ -230,11 +230,17 @@ struct bcm_enet_priv {</div><div class='ctx'> 	/* next dirty rx descriptor to refill */</div><div class='ctx'> 	int rx_dirty_desc;</div><div class='ctx'> </div><div class='del'>-	/* size of allocated rx skbs */</div><div class='del'>-	unsigned int rx_skb_size;</div><div class='add'>+	/* size of allocated rx buffers */</div><div class='add'>+	unsigned int rx_buf_size;</div><div class='ctx'> </div><div class='del'>-	/* list of skb given to hw for rx */</div><div class='del'>-	struct sk_buff **rx_skb;</div><div class='add'>+	/* allocated rx buffer offset */</div><div class='add'>+	unsigned int rx_buf_offset;</div><div class='add'>+</div><div class='add'>+	/* size of allocated rx frag */</div><div class='add'>+	unsigned int rx_frag_size;</div><div class='add'>+</div><div class='add'>+	/* list of buffer given to hw for rx */</div><div class='add'>+	void **rx_buf;</div><div class='ctx'> </div><div class='ctx'> 	/* used when rx skb allocation failed, so we defer rx queue</div><div class='ctx'> 	 * refill */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c<br/>index c623896e3ccb..bc4e1f3b3752 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcmsysport.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcmsysport.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcmsysport.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bcmsysport.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Broadcom BCM7xxx System Port Ethernet MAC driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2014 Broadcom Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='hunk'>@@ -15,6 +12,7 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/dsa/brcm.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='hunk'>@@ -23,35 +21,12 @@</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/phy_fixed.h&gt;</div><div class='ctx'> #include &lt;net/dsa.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bcmsysport.h"</div><div class='ctx'> </div><div class='del'>-/* I/O accessors register helpers */</div><div class='del'>-#define BCM_SYSPORT_IO_MACRO(name, offset) \</div><div class='del'>-static inline u32 name##_readl(struct bcm_sysport_priv *priv, u32 off)	\</div><div class='del'>-{									\</div><div class='del'>-	u32 reg = readl_relaxed(priv-&gt;base + offset + off);		\</div><div class='del'>-	return reg;							\</div><div class='del'>-}									\</div><div class='del'>-static inline void name##_writel(struct bcm_sysport_priv *priv,		\</div><div class='del'>-				  u32 val, u32 off)			\</div><div class='del'>-{									\</div><div class='del'>-	writel_relaxed(val, priv-&gt;base + offset + off);			\</div><div class='del'>-}									\</div><div class='del'>-</div><div class='del'>-BCM_SYSPORT_IO_MACRO(intrl2_0, SYS_PORT_INTRL2_0_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(intrl2_1, SYS_PORT_INTRL2_1_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(umac, SYS_PORT_UMAC_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(gib, SYS_PORT_GIB_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(tdma, SYS_PORT_TDMA_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(rxchk, SYS_PORT_RXCHK_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(txchk, SYS_PORT_TXCHK_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(rbuf, SYS_PORT_RBUF_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(tbuf, SYS_PORT_TBUF_OFFSET);</div><div class='del'>-BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET);</div><div class='del'>-</div><div class='ctx'> /* On SYSTEMPORT Lite, any register after RDMA_STATUS has the exact</div><div class='ctx'>  * same layout, except it has been moved by 4 bytes up, *sigh*</div><div class='ctx'>  */</div><div class='hunk'>@@ -163,19 +138,37 @@ static void bcm_sysport_set_tx_csum(struct net_device *dev,</div><div class='ctx'> 	/* Hardware transmit checksum requires us to enable the Transmit status</div><div class='ctx'> 	 * block prepended to the packet contents</div><div class='ctx'> 	 */</div><div class='del'>-	priv-&gt;tsb_en = !!(wanted &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM));</div><div class='add'>+	priv-&gt;tsb_en = !!(wanted &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='add'>+				    NETIF_F_HW_VLAN_CTAG_TX));</div><div class='ctx'> 	reg = tdma_readl(priv, TDMA_CONTROL);</div><div class='ctx'> 	if (priv-&gt;tsb_en)</div><div class='ctx'> 		reg |= tdma_control_bit(priv, TSB_EN);</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~tdma_control_bit(priv, TSB_EN);</div><div class='add'>+	/* Indicating that software inserts Broadcom tags is needed for the TX</div><div class='add'>+	 * checksum to be computed correctly when using VLAN HW acceleration,</div><div class='add'>+	 * else it has no effect, so it can always be turned on.</div><div class='add'>+	 */</div><div class='add'>+	if (netdev_uses_dsa(dev))</div><div class='add'>+		reg |= tdma_control_bit(priv, SW_BRCM_TAG);</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~tdma_control_bit(priv, SW_BRCM_TAG);</div><div class='ctx'> 	tdma_writel(priv, reg, TDMA_CONTROL);</div><div class='add'>+</div><div class='add'>+	/* Default TPID is ETH_P_8021AD, change to ETH_P_8021Q */</div><div class='add'>+	if (wanted &amp; NETIF_F_HW_VLAN_CTAG_TX)</div><div class='add'>+		tdma_writel(priv, ETH_P_8021Q, TDMA_TPID);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_sysport_set_features(struct net_device *dev,</div><div class='ctx'> 				    netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Read CRC forward */</div><div class='ctx'> 	if (!priv-&gt;is_lite)</div><div class='hunk'>@@ -187,6 +180,8 @@ static int bcm_sysport_set_features(struct net_device *dev,</div><div class='ctx'> 	bcm_sysport_set_rx_csum(dev, features);</div><div class='ctx'> 	bcm_sysport_set_tx_csum(dev, features);</div><div class='ctx'> </div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -276,6 +271,8 @@ static const struct bcm_sysport_stats bcm_sysport_gstrings_stats[] = {</div><div class='ctx'> 	/* RBUF misc statistics */</div><div class='ctx'> 	STAT_RBUF("rbuf_ovflow_cnt", mib.rbuf_ovflow_cnt, RBUF_OVFL_DISC_CNTR),</div><div class='ctx'> 	STAT_RBUF("rbuf_err_cnt", mib.rbuf_err_cnt, RBUF_ERR_PKT_CNTR),</div><div class='add'>+	/* RDMA misc statistics */</div><div class='add'>+	STAT_RDMA("rdma_ovflow_cnt", mib.rdma_ovflow_cnt, RDMA_OVFL_DISC_CNTR),</div><div class='ctx'> 	STAT_MIB_SOFT("alloc_rx_buff_failed", mib.alloc_rx_buff_failed),</div><div class='ctx'> 	STAT_MIB_SOFT("rx_dma_failed", mib.rx_dma_failed),</div><div class='ctx'> 	STAT_MIB_SOFT("tx_dma_failed", mib.tx_dma_failed),</div><div class='hunk'>@@ -289,9 +286,8 @@ static const struct bcm_sysport_stats bcm_sysport_gstrings_stats[] = {</div><div class='ctx'> static void bcm_sysport_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, "0.1", sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, "platform", sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, "platform", sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 bcm_sysport_get_msglvl(struct net_device *dev)</div><div class='hunk'>@@ -315,6 +311,7 @@ static inline bool bcm_sysport_lite_stat_valid(enum bcm_sysport_stat_type type)</div><div class='ctx'> 	case BCM_SYSPORT_STAT_NETDEV64:</div><div class='ctx'> 	case BCM_SYSPORT_STAT_RXCHK:</div><div class='ctx'> 	case BCM_SYSPORT_STAT_RBUF:</div><div class='add'>+	case BCM_SYSPORT_STAT_RDMA:</div><div class='ctx'> 	case BCM_SYSPORT_STAT_SOFT:</div><div class='ctx'> 		return true;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -349,32 +346,22 @@ static void bcm_sysport_get_strings(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	const struct bcm_sysport_stats *s;</div><div class='del'>-	char buf[128];</div><div class='del'>-	int i, j;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0, j = 0; i &lt; BCM_SYSPORT_STATS_LEN; i++) {</div><div class='add'>+		for (i = 0; i &lt; BCM_SYSPORT_STATS_LEN; i++) {</div><div class='ctx'> 			s = &amp;bcm_sysport_gstrings_stats[i];</div><div class='ctx'> 			if (priv-&gt;is_lite &amp;&amp;</div><div class='ctx'> 			    !bcm_sysport_lite_stat_valid(s-&gt;type))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='del'>-			memcpy(data + j * ETH_GSTRING_LEN, s-&gt;stat_string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			j++;</div><div class='add'>+			ethtool_puts(&amp;data, s-&gt;stat_string);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; dev-&gt;num_tx_queues; i++) {</div><div class='del'>-			snprintf(buf, sizeof(buf), "txq%d_packets", i);</div><div class='del'>-			memcpy(data + j * ETH_GSTRING_LEN, buf,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			j++;</div><div class='del'>-</div><div class='del'>-			snprintf(buf, sizeof(buf), "txq%d_bytes", i);</div><div class='del'>-			memcpy(data + j * ETH_GSTRING_LEN, buf,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='del'>-			j++;</div><div class='add'>+			ethtool_sprintf(&amp;data, "txq%d_packets", i);</div><div class='add'>+			ethtool_sprintf(&amp;data, "txq%d_bytes", i);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -418,6 +405,14 @@ static void bcm_sysport_update_mib_counters(struct bcm_sysport_priv *priv)</div><div class='ctx'> 			if (val == ~0)</div><div class='ctx'> 				rbuf_writel(priv, 0, s-&gt;reg_offset);</div><div class='ctx'> 			break;</div><div class='add'>+		case BCM_SYSPORT_STAT_RDMA:</div><div class='add'>+			if (!priv-&gt;is_lite)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			val = rdma_readl(priv, s-&gt;reg_offset);</div><div class='add'>+			if (val == ~0)</div><div class='add'>+				rdma_writel(priv, 0, s-&gt;reg_offset);</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		j += s-&gt;stat_sizeof;</div><div class='hunk'>@@ -439,10 +434,10 @@ static void bcm_sysport_update_tx_stats(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	for (q = 0; q &lt; priv-&gt;netdev-&gt;num_tx_queues; q++) {</div><div class='ctx'> 		ring = &amp;priv-&gt;tx_rings[q];</div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;priv-&gt;syncp);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;priv-&gt;syncp);</div><div class='ctx'> 			bytes = ring-&gt;bytes;</div><div class='ctx'> 			packets = ring-&gt;packets;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;priv-&gt;syncp, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;priv-&gt;syncp, start));</div><div class='ctx'> </div><div class='ctx'> 		*tx_bytes += bytes;</div><div class='ctx'> 		*tx_packets += packets;</div><div class='hunk'>@@ -486,9 +481,9 @@ static void bcm_sysport_get_stats(struct net_device *dev,</div><div class='ctx'> 		if (s-&gt;stat_sizeof == sizeof(u64) &amp;&amp;</div><div class='ctx'> 		    s-&gt;type == BCM_SYSPORT_STAT_NETDEV64) {</div><div class='ctx'> 			do {</div><div class='del'>-				start = u64_stats_fetch_begin_irq(syncp);</div><div class='add'>+				start = u64_stats_fetch_begin(syncp);</div><div class='ctx'> 				data[i] = *(u64 *)p;</div><div class='del'>-			} while (u64_stats_fetch_retry_irq(syncp, start));</div><div class='add'>+			} while (u64_stats_fetch_retry(syncp, start));</div><div class='ctx'> 		} else</div><div class='ctx'> 			data[i] = *(u32 *)p;</div><div class='ctx'> 		j++;</div><div class='hunk'>@@ -589,7 +584,9 @@ static void bcm_sysport_set_tx_coalesce(struct bcm_sysport_tx_ring *ring,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_sysport_get_coalesce(struct net_device *dev,</div><div class='del'>-				    struct ethtool_coalesce *ec)</div><div class='add'>+				    struct ethtool_coalesce *ec,</div><div class='add'>+				    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -609,10 +606,12 @@ static int bcm_sysport_get_coalesce(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_sysport_set_coalesce(struct net_device *dev,</div><div class='del'>-				    struct ethtool_coalesce *ec)</div><div class='add'>+				    struct ethtool_coalesce *ec,</div><div class='add'>+				    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct net_dim_cq_moder moder;</div><div class='add'>+	struct dim_cq_moder moder;</div><div class='ctx'> 	u32 usecs, pkts;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -627,8 +626,7 @@ static int bcm_sysport_set_coalesce(struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if ((ec-&gt;tx_coalesce_usecs == 0 &amp;&amp; ec-&gt;tx_max_coalesced_frames == 0) ||</div><div class='del'>-	    (ec-&gt;rx_coalesce_usecs == 0 &amp;&amp; ec-&gt;rx_max_coalesced_frames == 0) ||</div><div class='del'>-	    ec-&gt;use_adaptive_tx_coalesce)</div><div class='add'>+	    (ec-&gt;rx_coalesce_usecs == 0 &amp;&amp; ec-&gt;rx_max_coalesced_frames == 0))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_tx_queues; i++)</div><div class='hunk'>@@ -669,7 +667,8 @@ static struct sk_buff *bcm_sysport_rx_refill(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new SKB for a new packet */</div><div class='del'>-	skb = netdev_alloc_skb(priv-&gt;netdev, RX_BUF_LENGTH);</div><div class='add'>+	skb = __netdev_alloc_skb(priv-&gt;netdev, RX_BUF_LENGTH,</div><div class='add'>+				 GFP_ATOMIC | __GFP_NOWARN);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		priv-&gt;mib.alloc_rx_buff_failed++;</div><div class='ctx'> 		netif_err(priv, rx_err, ndev, "SKB alloc failed\n");</div><div class='hunk'>@@ -711,8 +710,7 @@ static int bcm_sysport_alloc_rx_bufs(struct bcm_sysport_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_rx_bds; i++) {</div><div class='ctx'> 		cb = &amp;priv-&gt;rx_cbs[i];</div><div class='ctx'> 		skb = bcm_sysport_rx_refill(priv, cb);</div><div class='del'>-		if (skb)</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> 		if (!cb-&gt;skb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -995,7 +993,7 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_priv *priv =</div><div class='ctx'> 		container_of(napi, struct bcm_sysport_priv, napi);</div><div class='del'>-	struct net_dim_sample dim_sample;</div><div class='add'>+	struct dim_sample dim_sample = {};</div><div class='ctx'> 	unsigned int work_done = 0;</div><div class='ctx'> </div><div class='ctx'> 	work_done = bcm_sysport_desc_rx(priv, budget);</div><div class='hunk'>@@ -1019,9 +1017,9 @@ static int bcm_sysport_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;dim.use_dim) {</div><div class='del'>-		net_dim_sample(priv-&gt;dim.event_ctr, priv-&gt;dim.packets,</div><div class='del'>-			       priv-&gt;dim.bytes, &amp;dim_sample);</div><div class='del'>-		net_dim(&amp;priv-&gt;dim.dim, dim_sample);</div><div class='add'>+		dim_update_sample(priv-&gt;dim.event_ctr, priv-&gt;dim.packets,</div><div class='add'>+				  priv-&gt;dim.bytes, &amp;dim_sample);</div><div class='add'>+		net_dim(&amp;priv-&gt;dim.dim, &amp;dim_sample);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='hunk'>@@ -1090,16 +1088,16 @@ static void bcm_sysport_resume_from_wol(struct bcm_sysport_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static void bcm_sysport_dim_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct net_dim *dim = container_of(work, struct net_dim, work);</div><div class='add'>+	struct dim *dim = container_of(work, struct dim, work);</div><div class='ctx'> 	struct bcm_sysport_net_dim *ndim =</div><div class='ctx'> 			container_of(dim, struct bcm_sysport_net_dim, dim);</div><div class='ctx'> 	struct bcm_sysport_priv *priv =</div><div class='ctx'> 			container_of(ndim, struct bcm_sysport_priv, dim);</div><div class='del'>-	struct net_dim_cq_moder cur_profile =</div><div class='del'>-			net_dim_get_rx_moderation(dim-&gt;mode, dim-&gt;profile_ix);</div><div class='add'>+	struct dim_cq_moder cur_profile = net_dim_get_rx_moderation(dim-&gt;mode,</div><div class='add'>+								    dim-&gt;profile_ix);</div><div class='ctx'> </div><div class='ctx'> 	bcm_sysport_set_rx_coalesce(priv, cur_profile.usec, cur_profile.pkts);</div><div class='del'>-	dim-&gt;state = NET_DIM_START_MEASURE;</div><div class='add'>+	dim-&gt;state = DIM_START_MEASURE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* RX and misc interrupt routine */</div><div class='hunk'>@@ -1241,6 +1239,11 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb,</div><div class='ctx'> 	/* Zero-out TSB by default */</div><div class='ctx'> 	memset(tsb, 0, sizeof(*tsb));</div><div class='ctx'> </div><div class='add'>+	if (skb_vlan_tag_present(skb)) {</div><div class='add'>+		tsb-&gt;pcp_dei_vid = skb_vlan_tag_get_prio(skb) &amp; PCP_DEI_MASK;</div><div class='add'>+		tsb-&gt;pcp_dei_vid |= (u32)skb_vlan_tag_get_id(skb) &lt;&lt; VID_SHIFT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='ctx'> 		ip_ver = skb-&gt;protocol;</div><div class='ctx'> 		switch (ip_ver) {</div><div class='hunk'>@@ -1256,6 +1259,9 @@ static struct sk_buff *bcm_sysport_insert_tsb(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		/* Get the checksum offset and the L4 (transport) offset */</div><div class='ctx'> 		csum_start = skb_checksum_start_offset(skb) - sizeof(*tsb);</div><div class='add'>+		/* Account for the HW inserted VLAN tag */</div><div class='add'>+		if (skb_vlan_tag_present(skb))</div><div class='add'>+			csum_start += VLAN_HLEN;</div><div class='ctx'> 		csum_info = (csum_start + skb-&gt;csum_offset) &amp; L4_CSUM_PTR_MASK;</div><div class='ctx'> 		csum_info |= (csum_start &lt;&lt; L4_PTR_SHIFT);</div><div class='ctx'> </div><div class='hunk'>@@ -1280,11 +1286,11 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring;</div><div class='add'>+	unsigned long flags, desc_flags;</div><div class='ctx'> 	struct bcm_sysport_cb *cb;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	u32 len_status, addr_lo;</div><div class='ctx'> 	unsigned int skb_len;</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	u16 queue;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -1319,6 +1325,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 		netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n",</div><div class='ctx'> 			  skb-&gt;data, skb_len);</div><div class='ctx'> 		ret = NETDEV_TX_OK;</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1335,6 +1342,8 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 		       DESC_STATUS_SHIFT;</div><div class='ctx'> 	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 		len_status |= (DESC_L4_CSUM &lt;&lt; DESC_STATUS_SHIFT);</div><div class='add'>+	if (skb_vlan_tag_present(skb))</div><div class='add'>+		len_status |= (TX_STATUS_VLAN_VID_TSB &lt;&lt; DESC_STATUS_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;curr_desc++;</div><div class='ctx'> 	if (ring-&gt;curr_desc == ring-&gt;size)</div><div class='hunk'>@@ -1342,8 +1351,10 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,</div><div class='ctx'> 	ring-&gt;desc_count--;</div><div class='ctx'> </div><div class='ctx'> 	/* Ports are latched, so write upper address first */</div><div class='add'>+	spin_lock_irqsave(&amp;priv-&gt;desc_lock, desc_flags);</div><div class='ctx'> 	tdma_writel(priv, len_status, TDMA_WRITE_PORT_HI(ring-&gt;index));</div><div class='ctx'> 	tdma_writel(priv, addr_lo, TDMA_WRITE_PORT_LO(ring-&gt;index));</div><div class='add'>+	spin_unlock_irqrestore(&amp;priv-&gt;desc_lock, desc_flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Check ring space and update SW control flow */</div><div class='ctx'> 	if (ring-&gt;desc_count == 0)</div><div class='hunk'>@@ -1358,7 +1369,7 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcm_sysport_tx_timeout(struct net_device *dev)</div><div class='add'>+static void bcm_sysport_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	netdev_warn(dev, "transmit timeout!\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1440,7 +1451,7 @@ static void bcm_sysport_init_dim(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	struct bcm_sysport_net_dim *dim = &amp;priv-&gt;dim;</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;dim-&gt;dim.work, cb);</div><div class='del'>-	dim-&gt;dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='add'>+	dim-&gt;dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='ctx'> 	dim-&gt;event_ctr = 0;</div><div class='ctx'> 	dim-&gt;packets = 0;</div><div class='ctx'> 	dim-&gt;bytes = 0;</div><div class='hunk'>@@ -1449,7 +1460,7 @@ static void bcm_sysport_init_dim(struct bcm_sysport_priv *priv,</div><div class='ctx'> static void bcm_sysport_init_rx_coalesce(struct bcm_sysport_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcm_sysport_net_dim *dim = &amp;priv-&gt;dim;</div><div class='del'>-	struct net_dim_cq_moder moder;</div><div class='add'>+	struct dim_cq_moder moder;</div><div class='ctx'> 	u32 usecs, pkts;</div><div class='ctx'> </div><div class='ctx'> 	usecs = priv-&gt;rx_coalesce_usecs;</div><div class='hunk'>@@ -1484,7 +1495,7 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	/* Initialize SW view of the ring */</div><div class='ctx'> 	spin_lock_init(&amp;ring-&gt;lock);</div><div class='ctx'> 	ring-&gt;priv = priv;</div><div class='del'>-	netif_tx_napi_add(priv-&gt;netdev, &amp;ring-&gt;napi, bcm_sysport_tx_poll, 64);</div><div class='add'>+	netif_napi_add_tx(priv-&gt;netdev, &amp;ring-&gt;napi, bcm_sysport_tx_poll);</div><div class='ctx'> 	ring-&gt;index = index;</div><div class='ctx'> 	ring-&gt;size = size;</div><div class='ctx'> 	ring-&gt;clean_index = 0;</div><div class='hunk'>@@ -1508,7 +1519,13 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv,</div><div class='ctx'> 		reg |= RING_IGNORE_STATUS;</div><div class='ctx'> 	}</div><div class='ctx'> 	tdma_writel(priv, reg, TDMA_DESC_RING_MAPPING(index));</div><div class='del'>-	tdma_writel(priv, 0, TDMA_DESC_RING_PCP_DEI_VID(index));</div><div class='add'>+	reg = 0;</div><div class='add'>+	/* Adjust the packet size calculations if SYSTEMPORT is responsible</div><div class='add'>+	 * for HW insertion of VLAN tags</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;netdev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_TX)</div><div class='add'>+		reg = VLAN_HLEN &lt;&lt; RING_PKT_SIZE_ADJ_SHIFT;</div><div class='add'>+	tdma_writel(priv, reg, TDMA_DESC_RING_PCP_DEI_VID(index));</div><div class='ctx'> </div><div class='ctx'> 	/* Enable ACB algorithm 2 */</div><div class='ctx'> 	reg = tdma_readl(priv, TDMA_CONTROL);</div><div class='hunk'>@@ -1781,7 +1798,7 @@ static inline void umac_reset(struct bcm_sysport_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void umac_set_hw_addr(struct bcm_sysport_priv *priv,</div><div class='del'>-			     unsigned char *addr)</div><div class='add'>+			     const unsigned char *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mac0 = (addr[0] &lt;&lt; 24) | (addr[1] &lt;&lt; 16) | (addr[2] &lt;&lt; 8) |</div><div class='ctx'> 		    addr[3];</div><div class='hunk'>@@ -1813,7 +1830,7 @@ static int bcm_sysport_change_mac(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	/* interface is disabled, changes to MAC will be reflected on next</div><div class='ctx'> 	 * open call</div><div class='hunk'>@@ -1839,10 +1856,10 @@ static void bcm_sysport_get_stats64(struct net_device *dev,</div><div class='ctx'> 				    &amp;stats-&gt;tx_packets);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		start = u64_stats_fetch_begin_irq(&amp;priv-&gt;syncp);</div><div class='add'>+		start = u64_stats_fetch_begin(&amp;priv-&gt;syncp);</div><div class='ctx'> 		stats-&gt;rx_packets = stats64-&gt;rx_packets;</div><div class='ctx'> 		stats-&gt;rx_bytes = stats64-&gt;rx_bytes;</div><div class='del'>-	} while (u64_stats_fetch_retry_irq(&amp;priv-&gt;syncp, start));</div><div class='add'>+	} while (u64_stats_fetch_retry(&amp;priv-&gt;syncp, start));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcm_sysport_netif_start(struct net_device *dev)</div><div class='hunk'>@@ -1916,6 +1933,12 @@ static int bcm_sysport_open(struct net_device *dev)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(dev, "could not enable priv clock\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Reset UniMAC */</div><div class='ctx'> 	umac_reset(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -1946,9 +1969,13 @@ static int bcm_sysport_open(struct net_device *dev)</div><div class='ctx'> 				0, priv-&gt;phy_interface);</div><div class='ctx'> 	if (!phydev) {</div><div class='ctx'> 		netdev_err(dev, "could not attach to PHY\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		ret = -ENODEV;</div><div class='add'>+		goto out_clk_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Indicate that the MAC is responsible for PHY PM */</div><div class='add'>+	phydev-&gt;mac_managed_pm = true;</div><div class='add'>+</div><div class='ctx'> 	/* Reset house keeping link status */</div><div class='ctx'> 	priv-&gt;old_duplex = -1;</div><div class='ctx'> 	priv-&gt;old_link = -1;</div><div class='hunk'>@@ -1973,6 +2000,7 @@ static int bcm_sysport_open(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize both hardware and software ring */</div><div class='add'>+	spin_lock_init(&amp;priv-&gt;desc_lock);</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_tx_queues; i++) {</div><div class='ctx'> 		ret = bcm_sysport_init_tx_ring(priv, i);</div><div class='ctx'> 		if (ret) {</div><div class='hunk'>@@ -2024,6 +2052,8 @@ out_free_irq0:</div><div class='ctx'> 	free_irq(priv-&gt;irq0, dev);</div><div class='ctx'> out_phy_disconnect:</div><div class='ctx'> 	phy_disconnect(phydev);</div><div class='add'>+out_clk_disable:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2082,6 +2112,8 @@ static int bcm_sysport_stop(struct net_device *dev)</div><div class='ctx'> 	/* Disconnect from PHY */</div><div class='ctx'> 	phy_disconnect(dev-&gt;phydev);</div><div class='ctx'> </div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2133,13 +2165,9 @@ static int bcm_sysport_rule_set(struct bcm_sysport_priv *priv,</div><div class='ctx'> 	if (nfc-&gt;fs.ring_cookie != RX_CLS_FLOW_WAKE)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* All filters are already in use, we cannot match more rules */</div><div class='del'>-	if (bitmap_weight(priv-&gt;filters, RXCHK_BRCM_TAG_MAX) ==</div><div class='del'>-	    RXCHK_BRCM_TAG_MAX)</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-</div><div class='ctx'> 	index = find_first_zero_bit(priv-&gt;filters, RXCHK_BRCM_TAG_MAX);</div><div class='del'>-	if (index &gt; RXCHK_BRCM_TAG_MAX)</div><div class='add'>+	if (index &gt;= RXCHK_BRCM_TAG_MAX)</div><div class='add'>+		/* All filters are already in use, we cannot match more rules */</div><div class='ctx'> 		return -ENOSPC;</div><div class='ctx'> </div><div class='ctx'> 	/* Location is the classification ID, and index is the position</div><div class='hunk'>@@ -2214,6 +2242,9 @@ static int bcm_sysport_set_rxnfc(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops bcm_sysport_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,</div><div class='ctx'> 	.get_drvinfo		= bcm_sysport_get_drvinfo,</div><div class='ctx'> 	.get_msglevel		= bcm_sysport_get_msglvl,</div><div class='ctx'> 	.set_msglevel		= bcm_sysport_set_msglvl,</div><div class='hunk'>@@ -2268,33 +2299,22 @@ static const struct net_device_ops bcm_sysport_netdev_ops = {</div><div class='ctx'> 	.ndo_select_queue	= bcm_sysport_select_queue,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int bcm_sysport_map_queues(struct notifier_block *nb,</div><div class='del'>-				  struct dsa_notifier_register_info *info)</div><div class='add'>+static int bcm_sysport_map_queues(struct net_device *dev,</div><div class='add'>+				  struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_port_from_netdev(slave_dev);</div><div class='add'>+	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring;</div><div class='del'>-	struct bcm_sysport_priv *priv;</div><div class='del'>-	struct net_device *slave_dev;</div><div class='ctx'> 	unsigned int num_tx_queues;</div><div class='ctx'> 	unsigned int q, qp, port;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	priv = container_of(nb, struct bcm_sysport_priv, dsa_notifier);</div><div class='del'>-	if (priv-&gt;netdev != info-&gt;master)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dev = info-&gt;master;</div><div class='ctx'> </div><div class='ctx'> 	/* We can't be setting up queue inspection for non directly attached</div><div class='ctx'> 	 * switches</div><div class='ctx'> 	 */</div><div class='del'>-	if (info-&gt;switch_number)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;netdev_ops != &amp;bcm_sysport_netdev_ops)</div><div class='add'>+	if (dp-&gt;ds-&gt;index)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	port = info-&gt;port_number;</div><div class='del'>-	slave_dev = info-&gt;info.dev;</div><div class='add'>+	port = dp-&gt;index;</div><div class='ctx'> </div><div class='ctx'> 	/* On SYSTEMPORT Lite we have twice as less queues, so we cannot do a</div><div class='ctx'> 	 * 1:1 mapping, we can only do a 2:1 mapping. By reducing the number of</div><div class='hunk'>@@ -2327,34 +2347,23 @@ static int bcm_sysport_map_queues(struct notifier_block *nb,</div><div class='ctx'> 		ring-&gt;switch_queue = qp;</div><div class='ctx'> 		ring-&gt;switch_port = port;</div><div class='ctx'> 		ring-&gt;inspect = true;</div><div class='del'>-		priv-&gt;ring_map[q + port * num_tx_queues] = ring;</div><div class='add'>+		priv-&gt;ring_map[qp + port * num_tx_queues] = ring;</div><div class='ctx'> 		qp++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_sysport_unmap_queues(struct notifier_block *nb,</div><div class='del'>-				    struct dsa_notifier_register_info *info)</div><div class='add'>+static int bcm_sysport_unmap_queues(struct net_device *dev,</div><div class='add'>+				    struct net_device *slave_dev)</div><div class='ctx'> {</div><div class='add'>+	struct dsa_port *dp = dsa_port_from_netdev(slave_dev);</div><div class='add'>+	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring;</div><div class='del'>-	struct bcm_sysport_priv *priv;</div><div class='del'>-	struct net_device *slave_dev;</div><div class='ctx'> 	unsigned int num_tx_queues;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	unsigned int q, port;</div><div class='del'>-</div><div class='del'>-	priv = container_of(nb, struct bcm_sysport_priv, dsa_notifier);</div><div class='del'>-	if (priv-&gt;netdev != info-&gt;master)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	dev = info-&gt;master;</div><div class='del'>-</div><div class='del'>-	if (dev-&gt;netdev_ops != &amp;bcm_sysport_netdev_ops)</div><div class='del'>-		return 0;</div><div class='add'>+	unsigned int q, qp, port;</div><div class='ctx'> </div><div class='del'>-	port = info-&gt;port_number;</div><div class='del'>-	slave_dev = info-&gt;info.dev;</div><div class='add'>+	port = dp-&gt;index;</div><div class='ctx'> </div><div class='ctx'> 	num_tx_queues = slave_dev-&gt;real_num_tx_queues;</div><div class='ctx'> </div><div class='hunk'>@@ -2368,23 +2377,37 @@ static int bcm_sysport_unmap_queues(struct notifier_block *nb,</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		ring-&gt;inspect = false;</div><div class='del'>-		priv-&gt;ring_map[q + port * num_tx_queues] = NULL;</div><div class='add'>+		qp = ring-&gt;switch_queue;</div><div class='add'>+		priv-&gt;ring_map[qp + port * num_tx_queues] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_sysport_dsa_notifier(struct notifier_block *nb,</div><div class='del'>-				    unsigned long event, void *ptr)</div><div class='add'>+static int bcm_sysport_netdevice_event(struct notifier_block *nb,</div><div class='add'>+				       unsigned long event, void *ptr)</div><div class='ctx'> {</div><div class='del'>-	int ret = NOTIFY_DONE;</div><div class='add'>+	struct net_device *dev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct netdev_notifier_changeupper_info *info = ptr;</div><div class='add'>+	struct bcm_sysport_priv *priv;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	priv = container_of(nb, struct bcm_sysport_priv, netdev_notifier);</div><div class='add'>+	if (priv-&gt;netdev != dev)</div><div class='add'>+		return NOTIFY_DONE;</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='del'>-	case DSA_PORT_REGISTER:</div><div class='del'>-		ret = bcm_sysport_map_queues(nb, ptr);</div><div class='del'>-		break;</div><div class='del'>-	case DSA_PORT_UNREGISTER:</div><div class='del'>-		ret = bcm_sysport_unmap_queues(nb, ptr);</div><div class='add'>+	case NETDEV_CHANGEUPPER:</div><div class='add'>+		if (dev-&gt;netdev_ops != &amp;bcm_sysport_netdev_ops)</div><div class='add'>+			return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+		if (!dsa_user_dev_check(info-&gt;upper_dev))</div><div class='add'>+			return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;linking)</div><div class='add'>+			ret = bcm_sysport_map_queues(dev, info-&gt;upper_dev);</div><div class='add'>+		else</div><div class='add'>+			ret = bcm_sysport_unmap_queues(dev, info-&gt;upper_dev);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2422,17 +2445,22 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct bcm_sysport_priv *priv;</div><div class='ctx'> 	struct device_node *dn;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	const void *macaddr;</div><div class='del'>-	struct resource *r;</div><div class='ctx'> 	u32 txq, rxq;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	dn = pdev-&gt;dev.of_node;</div><div class='del'>-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	of_id = of_match_node(bcm_sysport_of_match, dn);</div><div class='ctx'> 	if (!of_id || !of_id-&gt;data)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(40));</div><div class='add'>+	if (ret)</div><div class='add'>+		ret = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "unable to set DMA mask: %d\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Fairly quickly we need to know the type of adapter we have */</div><div class='ctx'> 	params = of_id-&gt;data;</div><div class='ctx'> </div><div class='hunk'>@@ -2453,12 +2481,20 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Initialize private members */</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	priv-&gt;clk = devm_clk_get_optional(&amp;pdev-&gt;dev, "sw_sysport");</div><div class='add'>+	if (IS_ERR(priv-&gt;clk)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;clk);</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Allocate number of TX rings */</div><div class='ctx'> 	priv-&gt;tx_rings = devm_kcalloc(&amp;pdev-&gt;dev, txq,</div><div class='ctx'> 				      sizeof(struct bcm_sysport_tx_ring),</div><div class='ctx'> 				      GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;tx_rings)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!priv-&gt;tx_rings) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto err_free_netdev;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;is_lite = params-&gt;is_lite;</div><div class='ctx'> 	priv-&gt;num_rx_desc_words = params-&gt;num_rx_desc_words;</div><div class='hunk'>@@ -2466,17 +2502,16 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;irq0 = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (!priv-&gt;is_lite) {</div><div class='ctx'> 		priv-&gt;irq1 = platform_get_irq(pdev, 1);</div><div class='del'>-		priv-&gt;wol_irq = platform_get_irq(pdev, 2);</div><div class='add'>+		priv-&gt;wol_irq = platform_get_irq_optional(pdev, 2);</div><div class='ctx'> 	} else {</div><div class='del'>-		priv-&gt;wol_irq = platform_get_irq(pdev, 1);</div><div class='add'>+		priv-&gt;wol_irq = platform_get_irq_optional(pdev, 1);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (priv-&gt;irq0 &lt;= 0 || (priv-&gt;irq1 &lt;= 0 &amp;&amp; !priv-&gt;is_lite)) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "invalid interrupts\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto err_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='add'>+	priv-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;base)) {</div><div class='ctx'> 		ret = PTR_ERR(priv-&gt;base);</div><div class='ctx'> 		goto err_free_netdev;</div><div class='hunk'>@@ -2485,9 +2520,9 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;netdev = dev;</div><div class='ctx'> 	priv-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;phy_interface = of_get_phy_mode(dn);</div><div class='add'>+	ret = of_get_phy_mode(dn, &amp;priv-&gt;phy_interface);</div><div class='ctx'> 	/* Default to GMII interface mode */</div><div class='del'>-	if (priv-&gt;phy_interface &lt; 0)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		priv-&gt;phy_interface = PHY_INTERFACE_MODE_GMII;</div><div class='ctx'> </div><div class='ctx'> 	/* In the case of a fixed PHY, the DT node associated</div><div class='hunk'>@@ -2504,24 +2539,24 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize netdevice members */</div><div class='del'>-	macaddr = of_get_mac_address(dn);</div><div class='del'>-	if (IS_ERR(macaddr)) {</div><div class='add'>+	ret = of_get_ethdev_address(dn, dev);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "using random Ethernet MAC\n");</div><div class='ctx'> 		eth_hw_addr_random(dev);</div><div class='del'>-	} else {</div><div class='del'>-		ether_addr_copy(dev-&gt;dev_addr, macaddr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, dev);</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;bcm_sysport_ethtool_ops;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;bcm_sysport_netdev_ops;</div><div class='del'>-	netif_napi_add(dev, &amp;priv-&gt;napi, bcm_sysport_poll, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;priv-&gt;napi, bcm_sysport_poll);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;features |= NETIF_F_RXCSUM | NETIF_F_HIGHDMA |</div><div class='del'>-			 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;</div><div class='add'>+			 NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='add'>+			 NETIF_F_HW_VLAN_CTAG_TX;</div><div class='ctx'> 	dev-&gt;hw_features |= dev-&gt;features;</div><div class='ctx'> 	dev-&gt;vlan_features |= dev-&gt;features;</div><div class='add'>+	dev-&gt;max_mtu = UMAC_MAX_MTU_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	/* Request the WOL interrupt and advertise suspend if available */</div><div class='ctx'> 	priv-&gt;wol_irq_disabled = 1;</div><div class='hunk'>@@ -2530,6 +2565,12 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		device_set_wakeup_capable(&amp;pdev-&gt;dev, 1);</div><div class='ctx'> </div><div class='add'>+	priv-&gt;wol_clk = devm_clk_get_optional(&amp;pdev-&gt;dev, "sw_sysportwol");</div><div class='add'>+	if (IS_ERR(priv-&gt;wol_clk)) {</div><div class='add'>+		ret = PTR_ERR(priv-&gt;wol_clk);</div><div class='add'>+		goto err_deregister_fixed_link;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Set the needed headroom once and for all */</div><div class='ctx'> 	BUILD_BUG_ON(sizeof(struct bcm_tsb) != 8);</div><div class='ctx'> 	dev-&gt;needed_headroom += sizeof(struct bcm_tsb);</div><div class='hunk'>@@ -2540,9 +2581,9 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;rx_max_coalesced_frames = 1;</div><div class='ctx'> 	u64_stats_init(&amp;priv-&gt;syncp);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;dsa_notifier.notifier_call = bcm_sysport_dsa_notifier;</div><div class='add'>+	priv-&gt;netdev_notifier.notifier_call = bcm_sysport_netdevice_event;</div><div class='ctx'> </div><div class='del'>-	ret = register_dsa_notifier(&amp;priv-&gt;dsa_notifier);</div><div class='add'>+	ret = register_netdevice_notifier(&amp;priv-&gt;netdev_notifier);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "failed to register DSA notifier\n");</div><div class='ctx'> 		goto err_deregister_fixed_link;</div><div class='hunk'>@@ -2554,6 +2595,12 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_deregister_notifier;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "could not enable priv clock\n");</div><div class='add'>+		goto err_deregister_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;rev = topctrl_readl(priv, REV_CNTL) &amp; REV_MASK;</div><div class='ctx'> 	dev_info(&amp;pdev-&gt;dev,</div><div class='ctx'> 		 "Broadcom SYSTEMPORT%s " REV_FMT</div><div class='hunk'>@@ -2562,10 +2609,14 @@ static int bcm_sysport_probe(struct platform_device *pdev)</div><div class='ctx'> 		 (priv-&gt;rev &gt;&gt; 8) &amp; 0xff, priv-&gt;rev &amp; 0xff,</div><div class='ctx'> 		 priv-&gt;irq0, priv-&gt;irq1, txq, rxq);</div><div class='ctx'> </div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_deregister_netdev:</div><div class='add'>+	unregister_netdev(dev);</div><div class='ctx'> err_deregister_notifier:</div><div class='del'>-	unregister_dsa_notifier(&amp;priv-&gt;dsa_notifier);</div><div class='add'>+	unregister_netdevice_notifier(&amp;priv-&gt;netdev_notifier);</div><div class='ctx'> err_deregister_fixed_link:</div><div class='ctx'> 	if (of_phy_is_fixed_link(dn))</div><div class='ctx'> 		of_phy_deregister_fixed_link(dn);</div><div class='hunk'>@@ -2574,7 +2625,7 @@ err_free_netdev:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcm_sysport_remove(struct platform_device *pdev)</div><div class='add'>+static void bcm_sysport_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_get_drvdata(&amp;pdev-&gt;dev);</div><div class='ctx'> 	struct bcm_sysport_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -2583,14 +2634,12 @@ static int bcm_sysport_remove(struct platform_device *pdev)</div><div class='ctx'> 	/* Not much to do, ndo_close has been called</div><div class='ctx'> 	 * and we use managed allocations</div><div class='ctx'> 	 */</div><div class='del'>-	unregister_dsa_notifier(&amp;priv-&gt;dsa_notifier);</div><div class='add'>+	unregister_netdevice_notifier(&amp;priv-&gt;netdev_notifier);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	if (of_phy_is_fixed_link(dn))</div><div class='ctx'> 		of_phy_deregister_fixed_link(dn);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, NULL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcm_sysport_suspend_to_wol(struct bcm_sysport_priv *priv)</div><div class='hunk'>@@ -2715,8 +2764,12 @@ static int __maybe_unused bcm_sysport_suspend(struct device *d)</div><div class='ctx'> 	bcm_sysport_fini_rx_ring(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Get prepared for Wake-on-LAN */</div><div class='del'>-	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts)</div><div class='add'>+	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts) {</div><div class='add'>+		clk_prepare_enable(priv-&gt;wol_clk);</div><div class='ctx'> 		ret = bcm_sysport_suspend_to_wol(priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -2731,8 +2784,20 @@ static int __maybe_unused bcm_sysport_resume(struct device *d)</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(dev, "could not enable priv clock\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;wolopts)</div><div class='add'>+		clk_disable_unprepare(priv-&gt;wol_clk);</div><div class='add'>+</div><div class='ctx'> 	umac_reset(priv);</div><div class='ctx'> </div><div class='add'>+	/* Disable the UniMAC RX/TX */</div><div class='add'>+	umac_enable_set(priv, CMD_RX_EN | CMD_TX_EN, 0);</div><div class='add'>+</div><div class='ctx'> 	/* We may have been suspended and never received a WOL event that</div><div class='ctx'> 	 * would turn off MPD detection, take care of that now</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2807,6 +2872,7 @@ out_free_rx_ring:</div><div class='ctx'> out_free_tx_rings:</div><div class='ctx'> 	for (i = 0; i &lt; dev-&gt;num_tx_queues; i++)</div><div class='ctx'> 		bcm_sysport_fini_tx_ring(priv, i);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2815,7 +2881,7 @@ static SIMPLE_DEV_PM_OPS(bcm_sysport_pm_ops,</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver bcm_sysport_driver = {</div><div class='ctx'> 	.probe	= bcm_sysport_probe,</div><div class='del'>-	.remove	= bcm_sysport_remove,</div><div class='add'>+	.remove = bcm_sysport_remove,</div><div class='ctx'> 	.driver =  {</div><div class='ctx'> 		.name = "brcm-systemport",</div><div class='ctx'> 		.of_match_table = bcm_sysport_of_match,</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h<br/>index 6f3141c86436..a34296f989f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcmsysport.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bcmsysport.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bcmsysport.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bcmsysport.h</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Broadcom BCM7xxx System Port Ethernet MAC driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2014 Broadcom Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __BCM_SYSPORT_H</div><div class='hunk'>@@ -14,7 +11,9 @@</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='del'>-#include &lt;linux/net_dim.h&gt;</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='add'>+</div><div class='add'>+#include "unimac.h"</div><div class='ctx'> </div><div class='ctx'> /* Receive/transmit descriptor format */</div><div class='ctx'> #define DESC_ADDR_HI_STATUS_LEN	0x00</div><div class='hunk'>@@ -216,39 +215,6 @@ struct bcm_rsb {</div><div class='ctx'> /* UniMAC offset and defines */</div><div class='ctx'> #define SYS_PORT_UMAC_OFFSET		0x800</div><div class='ctx'> </div><div class='del'>-#define UMAC_CMD			0x008</div><div class='del'>-#define  CMD_TX_EN			(1 &lt;&lt; 0)</div><div class='del'>-#define  CMD_RX_EN			(1 &lt;&lt; 1)</div><div class='del'>-#define  CMD_SPEED_SHIFT		2</div><div class='del'>-#define  CMD_SPEED_10			0</div><div class='del'>-#define  CMD_SPEED_100			1</div><div class='del'>-#define  CMD_SPEED_1000			2</div><div class='del'>-#define  CMD_SPEED_2500			3</div><div class='del'>-#define  CMD_SPEED_MASK			3</div><div class='del'>-#define  CMD_PROMISC			(1 &lt;&lt; 4)</div><div class='del'>-#define  CMD_PAD_EN			(1 &lt;&lt; 5)</div><div class='del'>-#define  CMD_CRC_FWD			(1 &lt;&lt; 6)</div><div class='del'>-#define  CMD_PAUSE_FWD			(1 &lt;&lt; 7)</div><div class='del'>-#define  CMD_RX_PAUSE_IGNORE		(1 &lt;&lt; 8)</div><div class='del'>-#define  CMD_TX_ADDR_INS		(1 &lt;&lt; 9)</div><div class='del'>-#define  CMD_HD_EN			(1 &lt;&lt; 10)</div><div class='del'>-#define  CMD_SW_RESET			(1 &lt;&lt; 13)</div><div class='del'>-#define  CMD_LCL_LOOP_EN		(1 &lt;&lt; 15)</div><div class='del'>-#define  CMD_AUTO_CONFIG		(1 &lt;&lt; 22)</div><div class='del'>-#define  CMD_CNTL_FRM_EN		(1 &lt;&lt; 23)</div><div class='del'>-#define  CMD_NO_LEN_CHK			(1 &lt;&lt; 24)</div><div class='del'>-#define  CMD_RMT_LOOP_EN		(1 &lt;&lt; 25)</div><div class='del'>-#define  CMD_PRBL_EN			(1 &lt;&lt; 27)</div><div class='del'>-#define  CMD_TX_PAUSE_IGNORE		(1 &lt;&lt; 28)</div><div class='del'>-#define  CMD_TX_RX_EN			(1 &lt;&lt; 29)</div><div class='del'>-#define  CMD_RUNT_FILTER_DIS		(1 &lt;&lt; 30)</div><div class='del'>-</div><div class='del'>-#define UMAC_MAC0			0x00c</div><div class='del'>-#define UMAC_MAC1			0x010</div><div class='del'>-#define UMAC_MAX_FRAME_LEN		0x014</div><div class='del'>-</div><div class='del'>-#define UMAC_TX_FLUSH			0x334</div><div class='del'>-</div><div class='ctx'> #define UMAC_MIB_START			0x400</div><div class='ctx'> </div><div class='ctx'> /* There is a 0xC gap between the end of RX and beginning of TX stats and then</div><div class='hunk'>@@ -324,6 +290,7 @@ struct bcm_rsb {</div><div class='ctx'> </div><div class='ctx'> #define RDMA_WRITE_PTR_HI		0x1010</div><div class='ctx'> #define RDMA_WRITE_PTR_LO		0x1014</div><div class='add'>+#define RDMA_OVFL_DISC_CNTR		0x1018</div><div class='ctx'> #define RDMA_PROD_INDEX			0x1018</div><div class='ctx'> #define  RDMA_PROD_INDEX_MASK		0xffff</div><div class='ctx'> </div><div class='hunk'>@@ -518,7 +485,7 @@ struct bcm_rsb {</div><div class='ctx'> </div><div class='ctx'> /* Number of Receive hardware descriptor words */</div><div class='ctx'> #define SP_NUM_HW_RX_DESC_WORDS		1024</div><div class='del'>-#define SP_LT_NUM_HW_RX_DESC_WORDS	256</div><div class='add'>+#define SP_LT_NUM_HW_RX_DESC_WORDS	512</div><div class='ctx'> </div><div class='ctx'> /* Internal linked-list RAM size */</div><div class='ctx'> #define SP_NUM_TX_DESC			1536</div><div class='hunk'>@@ -599,6 +566,7 @@ struct bcm_sysport_mib {</div><div class='ctx'> 	u32 rxchk_other_pkt_disc;</div><div class='ctx'> 	u32 rbuf_ovflow_cnt;</div><div class='ctx'> 	u32 rbuf_err_cnt;</div><div class='add'>+	u32 rdma_ovflow_cnt;</div><div class='ctx'> 	u32 alloc_rx_buff_failed;</div><div class='ctx'> 	u32 rx_dma_failed;</div><div class='ctx'> 	u32 tx_dma_failed;</div><div class='hunk'>@@ -615,6 +583,7 @@ enum bcm_sysport_stat_type {</div><div class='ctx'> 	BCM_SYSPORT_STAT_RUNT,</div><div class='ctx'> 	BCM_SYSPORT_STAT_RXCHK,</div><div class='ctx'> 	BCM_SYSPORT_STAT_RBUF,</div><div class='add'>+	BCM_SYSPORT_STAT_RDMA,</div><div class='ctx'> 	BCM_SYSPORT_STAT_SOFT,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -661,6 +630,14 @@ enum bcm_sysport_stat_type {</div><div class='ctx'> 	.reg_offset = ofs, \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define STAT_RDMA(str, m, ofs) { \</div><div class='add'>+	.stat_string = str, \</div><div class='add'>+	.stat_sizeof = sizeof(((struct bcm_sysport_priv *)0)-&gt;m), \</div><div class='add'>+	.stat_offset = offsetof(struct bcm_sysport_priv, m), \</div><div class='add'>+	.type = BCM_SYSPORT_STAT_RDMA, \</div><div class='add'>+	.reg_offset = ofs, \</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* TX bytes and packets */</div><div class='ctx'> #define NUM_SYSPORT_TXQ_STAT	2</div><div class='ctx'> </div><div class='hunk'>@@ -705,7 +682,7 @@ struct bcm_sysport_net_dim {</div><div class='ctx'> 	u16			event_ctr;</div><div class='ctx'> 	unsigned long		packets;</div><div class='ctx'> 	unsigned long		bytes;</div><div class='del'>-	struct net_dim		dim;</div><div class='add'>+	struct dim		dim;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Software view of the TX ring */</div><div class='hunk'>@@ -745,6 +722,7 @@ struct bcm_sysport_priv {</div><div class='ctx'> 	int			wol_irq;</div><div class='ctx'> </div><div class='ctx'> 	/* Transmit rings */</div><div class='add'>+	spinlock_t		desc_lock;</div><div class='ctx'> 	struct bcm_sysport_tx_ring *tx_rings;</div><div class='ctx'> </div><div class='ctx'> 	/* Receive queue */</div><div class='hunk'>@@ -773,6 +751,8 @@ struct bcm_sysport_priv {</div><div class='ctx'> 	u32			wolopts;</div><div class='ctx'> 	u8			sopass[SOPASS_MAX];</div><div class='ctx'> 	unsigned int		wol_irq_disabled:1;</div><div class='add'>+	struct clk		*clk;</div><div class='add'>+	struct clk		*wol_clk;</div><div class='ctx'> </div><div class='ctx'> 	/* MIB related fields */</div><div class='ctx'> 	struct bcm_sysport_mib	mib;</div><div class='hunk'>@@ -788,9 +768,32 @@ struct bcm_sysport_priv {</div><div class='ctx'> 	struct u64_stats_sync	syncp;</div><div class='ctx'> </div><div class='ctx'> 	/* map information between switch port queues and local queues */</div><div class='del'>-	struct notifier_block	dsa_notifier;</div><div class='add'>+	struct notifier_block	netdev_notifier;</div><div class='ctx'> 	unsigned int		per_port_num_tx_queues;</div><div class='ctx'> 	struct bcm_sysport_tx_ring *ring_map[DSA_MAX_PORTS * 8];</div><div class='ctx'> </div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+/* I/O accessors register helpers */</div><div class='add'>+#define BCM_SYSPORT_IO_MACRO(name, offset) \</div><div class='add'>+static inline u32 name##_readl(struct bcm_sysport_priv *priv, u32 off)	\</div><div class='add'>+{									\</div><div class='add'>+	u32 reg = readl_relaxed(priv-&gt;base + (offset) + off);		\</div><div class='add'>+	return reg;							\</div><div class='add'>+}									\</div><div class='add'>+static inline void name##_writel(struct bcm_sysport_priv *priv,		\</div><div class='add'>+				  u32 val, u32 off)			\</div><div class='add'>+{									\</div><div class='add'>+	writel_relaxed(val, priv-&gt;base + (offset) + off);		\</div><div class='add'>+}									\</div><div class='add'>+</div><div class='add'>+BCM_SYSPORT_IO_MACRO(intrl2_0, SYS_PORT_INTRL2_0_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(intrl2_1, SYS_PORT_INTRL2_1_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(umac, SYS_PORT_UMAC_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(gib, SYS_PORT_GIB_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(tdma, SYS_PORT_TDMA_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(rxchk, SYS_PORT_RXCHK_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(rbuf, SYS_PORT_RBUF_OFFSET);</div><div class='add'>+BCM_SYSPORT_IO_MACRO(topctrl, SYS_PORT_TOPCTRL_OFFSET);</div><div class='add'>+</div><div class='ctx'> #endif /* __BCM_SYSPORT_H */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c b/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c<br/>index 6ce80cbcb48e..50b8e97a811d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;linux/brcmphy.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include "bgmac.h"</div><div class='ctx'> </div><div class='ctx'> static bool bcma_mdio_wait_value(struct bcma_device *core, u16 reg, u32 mask,</div><div class='hunk'>@@ -211,6 +212,7 @@ struct mii_bus *bcma_mdio_mii_register(struct bgmac *bgmac)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcma_device *core = bgmac-&gt;bcma.core;</div><div class='ctx'> 	struct mii_bus *mii_bus;</div><div class='add'>+	struct device_node *np;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mii_bus = mdiobus_alloc();</div><div class='hunk'>@@ -229,7 +231,10 @@ struct mii_bus *bcma_mdio_mii_register(struct bgmac *bgmac)</div><div class='ctx'> 	mii_bus-&gt;parent = &amp;core-&gt;dev;</div><div class='ctx'> 	mii_bus-&gt;phy_mask = ~(1 &lt;&lt; bgmac-&gt;phyaddr);</div><div class='ctx'> </div><div class='del'>-	err = mdiobus_register(mii_bus);</div><div class='add'>+	np = of_get_child_by_name(core-&gt;dev.of_node, "mdio");</div><div class='add'>+</div><div class='add'>+	err = of_mdiobus_register(mii_bus, np);</div><div class='add'>+	of_node_put(np);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;core-&gt;dev, "Registration of mii bus failed\n");</div><div class='ctx'> 		goto err_free_bus;</div><div class='hunk'>@@ -255,4 +260,5 @@ void bcma_mdio_mii_unregister(struct mii_bus *mii_bus)</div><div class='ctx'> EXPORT_SYMBOL_GPL(bcma_mdio_mii_unregister);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Rafał Miłecki");</div><div class='add'>+MODULE_DESCRIPTION("Broadcom iProc GBit BCMA MDIO helpers");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c<br/>index 34d18302b1a3..36f9bad28e6a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac-bcma.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac-bcma.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac-bcma.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bgmac-bcma.c</a></div><div class='hunk'>@@ -11,6 +11,7 @@</div><div class='ctx'> #include &lt;linux/bcma/bcma.h&gt;</div><div class='ctx'> #include &lt;linux/brcmphy.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include "bgmac.h"</div><div class='ctx'> </div><div class='hunk'>@@ -86,17 +87,28 @@ static int bcma_phy_connect(struct bgmac *bgmac)</div><div class='ctx'> 	struct phy_device *phy_dev;</div><div class='ctx'> 	char bus_id[MII_BUS_ID_SIZE + 3];</div><div class='ctx'> </div><div class='add'>+	/* DT info should be the most accurate */</div><div class='add'>+	phy_dev = of_phy_get_and_connect(bgmac-&gt;net_dev, bgmac-&gt;dev-&gt;of_node,</div><div class='add'>+					 bgmac_adjust_link);</div><div class='add'>+	if (phy_dev)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	/* Connect to the PHY */</div><div class='del'>-	snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, bgmac-&gt;mii_bus-&gt;id,</div><div class='del'>-		 bgmac-&gt;phyaddr);</div><div class='del'>-	phy_dev = phy_connect(bgmac-&gt;net_dev, bus_id, bgmac_adjust_link,</div><div class='del'>-			      PHY_INTERFACE_MODE_MII);</div><div class='del'>-	if (IS_ERR(phy_dev)) {</div><div class='del'>-		dev_err(bgmac-&gt;dev, "PHY connection failed\n");</div><div class='del'>-		return PTR_ERR(phy_dev);</div><div class='add'>+	if (bgmac-&gt;mii_bus &amp;&amp; bgmac-&gt;phyaddr != BGMAC_PHY_NOREGS) {</div><div class='add'>+		snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, bgmac-&gt;mii_bus-&gt;id,</div><div class='add'>+			 bgmac-&gt;phyaddr);</div><div class='add'>+		phy_dev = phy_connect(bgmac-&gt;net_dev, bus_id, bgmac_adjust_link,</div><div class='add'>+				      PHY_INTERFACE_MODE_MII);</div><div class='add'>+		if (IS_ERR(phy_dev)) {</div><div class='add'>+			dev_err(bgmac-&gt;dev, "PHY connection failed\n");</div><div class='add'>+			return PTR_ERR(phy_dev);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* Assume a fixed link to the switch port */</div><div class='add'>+	return bgmac_phy_connect_direct(bgmac);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct bcma_device_id bgmac_bcma_tbl[] = {</div><div class='hunk'>@@ -115,7 +127,7 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> 	struct ssb_sprom *sprom = &amp;core-&gt;bus-&gt;sprom;</div><div class='ctx'> 	struct mii_bus *mii_bus;</div><div class='ctx'> 	struct bgmac *bgmac;</div><div class='del'>-	const u8 *mac = NULL;</div><div class='add'>+	const u8 *mac;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	bgmac = bgmac_alloc(&amp;core-&gt;dev);</div><div class='hunk'>@@ -128,11 +140,12 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> </div><div class='ctx'> 	bcma_set_drvdata(core, bgmac);</div><div class='ctx'> </div><div class='del'>-	if (bgmac-&gt;dev-&gt;of_node)</div><div class='del'>-		mac = of_get_mac_address(bgmac-&gt;dev-&gt;of_node);</div><div class='add'>+	err = of_get_ethdev_address(bgmac-&gt;dev-&gt;of_node, bgmac-&gt;net_dev);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* If no MAC address assigned via device tree, check SPROM */</div><div class='del'>-	if (IS_ERR_OR_NULL(mac)) {</div><div class='add'>+	if (err) {</div><div class='ctx'> 		switch (core-&gt;core_unit) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			mac = sprom-&gt;et0mac;</div><div class='hunk'>@@ -149,10 +162,9 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> 			err = -ENOTSUPP;</div><div class='ctx'> 			goto err;</div><div class='ctx'> 		}</div><div class='add'>+		eth_hw_addr_set(bgmac-&gt;net_dev, mac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(bgmac-&gt;net_dev-&gt;dev_addr, mac);</div><div class='del'>-</div><div class='ctx'> 	/* On BCM4706 we need common core to access PHY */</div><div class='ctx'> 	if (core-&gt;id.id == BCMA_CORE_4706_MAC_GBIT &amp;&amp;</div><div class='ctx'> 	    !core-&gt;bus-&gt;drv_gmac_cmn.core) {</div><div class='hunk'>@@ -217,7 +229,7 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> 	/* BCM 471X/535X family */</div><div class='ctx'> 	case BCMA_CHIP_ID_BCM4716:</div><div class='ctx'> 		bgmac-&gt;feature_flags |= BGMAC_FEAT_CLKCTLST;</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BCMA_CHIP_ID_BCM47162:</div><div class='ctx'> 		bgmac-&gt;feature_flags |= BGMAC_FEAT_FLW_CTRL2;</div><div class='ctx'> 		bgmac-&gt;feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;</div><div class='hunk'>@@ -228,12 +240,12 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> 		bgmac-&gt;feature_flags |= BGMAC_FEAT_CLKCTLST;</div><div class='ctx'> 		bgmac-&gt;feature_flags |= BGMAC_FEAT_FLW_CTRL1;</div><div class='ctx'> 		bgmac-&gt;feature_flags |= BGMAC_FEAT_SW_TYPE_PHY;</div><div class='del'>-		if (ci-&gt;pkg == BCMA_PKG_ID_BCM47188 ||</div><div class='del'>-		    ci-&gt;pkg == BCMA_PKG_ID_BCM47186) {</div><div class='add'>+		if ((ci-&gt;id == BCMA_CHIP_ID_BCM5357 &amp;&amp; ci-&gt;pkg == BCMA_PKG_ID_BCM47186) ||</div><div class='add'>+		    (ci-&gt;id == BCMA_CHIP_ID_BCM53572 &amp;&amp; ci-&gt;pkg == BCMA_PKG_ID_BCM47188)) {</div><div class='ctx'> 			bgmac-&gt;feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII;</div><div class='ctx'> 			bgmac-&gt;feature_flags |= BGMAC_FEAT_IOST_ATTACHED;</div><div class='ctx'> 		}</div><div class='del'>-		if (ci-&gt;pkg == BCMA_PKG_ID_BCM5358)</div><div class='add'>+		if (ci-&gt;id == BCMA_CHIP_ID_BCM5357 &amp;&amp; ci-&gt;pkg == BCMA_PKG_ID_BCM5358)</div><div class='ctx'> 			bgmac-&gt;feature_flags |= BGMAC_FEAT_SW_TYPE_EPHYRMII;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BCMA_CHIP_ID_BCM53573:</div><div class='hunk'>@@ -297,10 +309,7 @@ static int bgmac_probe(struct bcma_device *core)</div><div class='ctx'> 	bgmac-&gt;cco_ctl_maskset = bcma_bgmac_cco_ctl_maskset;</div><div class='ctx'> 	bgmac-&gt;get_bus_clock = bcma_bgmac_get_bus_clock;</div><div class='ctx'> 	bgmac-&gt;cmn_maskset32 = bcma_bgmac_cmn_maskset32;</div><div class='del'>-	if (bgmac-&gt;mii_bus)</div><div class='del'>-		bgmac-&gt;phy_connect = bcma_phy_connect;</div><div class='del'>-	else</div><div class='del'>-		bgmac-&gt;phy_connect = bgmac_phy_connect_direct;</div><div class='add'>+	bgmac-&gt;phy_connect = bcma_phy_connect;</div><div class='ctx'> </div><div class='ctx'> 	err = bgmac_enet_probe(bgmac);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -323,7 +332,6 @@ static void bgmac_remove(struct bcma_device *core)</div><div class='ctx'> 	bcma_mdio_mii_unregister(bgmac-&gt;mii_bus);</div><div class='ctx'> 	bgmac_enet_remove(bgmac);</div><div class='ctx'> 	bcma_set_drvdata(core, NULL);</div><div class='del'>-	kfree(bgmac);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct bcma_driver bgmac_bcma_driver = {</div><div class='hunk'>@@ -354,4 +362,5 @@ module_init(bgmac_init)</div><div class='ctx'> module_exit(bgmac_exit)</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Rafał Miłecki");</div><div class='add'>+MODULE_DESCRIPTION("Broadcom iProc GBit BCMA interface driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c<br/>index 6dc0dd91ad11..4e266ce41180 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac-platform.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac-platform.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac-platform.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bgmac-platform.c</a></div><div class='hunk'>@@ -131,7 +131,7 @@ static void bgmac_nicpm_speed_set(struct net_device *net_dev)</div><div class='ctx'> 	switch (bgmac-&gt;net_dev-&gt;phydev-&gt;speed) {</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(net_dev, "Unsupported speed. Defaulting to 1000Mb\n");</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SPEED_1000:</div><div class='ctx'> 		val |= NICPM_IOMUX_CTRL_SPD_1000M &lt;&lt; NICPM_IOMUX_CTRL_SPD_SHIFT;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -171,9 +171,10 @@ static int platform_phy_connect(struct bgmac *bgmac)</div><div class='ctx'> static int bgmac_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct device_node *phy_node;</div><div class='ctx'> 	struct bgmac *bgmac;</div><div class='ctx'> 	struct resource *regs;</div><div class='del'>-	const u8 *mac_addr;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	bgmac = bgmac_alloc(&amp;pdev-&gt;dev);</div><div class='ctx'> 	if (!bgmac)</div><div class='hunk'>@@ -192,28 +193,24 @@ static int bgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	bgmac-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	bgmac-&gt;dma_dev = &amp;pdev-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (!IS_ERR(mac_addr))</div><div class='del'>-		ether_addr_copy(bgmac-&gt;net_dev-&gt;dev_addr, mac_addr);</div><div class='del'>-	else</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "MAC address not present in device tree\n");</div><div class='add'>+	ret = of_get_ethdev_address(np, bgmac-&gt;net_dev);</div><div class='add'>+	if (ret == -EPROBE_DEFER)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+			 "MAC address not present in device tree\n");</div><div class='ctx'> </div><div class='ctx'> 	bgmac-&gt;irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (bgmac-&gt;irq &lt; 0) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Unable to obtain IRQ\n");</div><div class='add'>+	if (bgmac-&gt;irq &lt; 0)</div><div class='ctx'> 		return bgmac-&gt;irq;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "amac_base");</div><div class='del'>-	if (!regs) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Unable to obtain base resource\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bgmac-&gt;plat.base = devm_ioremap_resource(&amp;pdev-&gt;dev, regs);</div><div class='add'>+	bgmac-&gt;plat.base =</div><div class='add'>+		devm_platform_ioremap_resource_byname(pdev, "amac_base");</div><div class='ctx'> 	if (IS_ERR(bgmac-&gt;plat.base))</div><div class='ctx'> 		return PTR_ERR(bgmac-&gt;plat.base);</div><div class='ctx'> </div><div class='add'>+	/* The idm_base resource is optional for some platforms */</div><div class='ctx'> 	regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "idm_base");</div><div class='ctx'> 	if (regs) {</div><div class='ctx'> 		bgmac-&gt;plat.idm_base = devm_ioremap_resource(&amp;pdev-&gt;dev, regs);</div><div class='hunk'>@@ -222,6 +219,7 @@ static int bgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 		bgmac-&gt;feature_flags &amp;= ~BGMAC_FEAT_IDM_MASK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* The nicpm_base resource is optional for some platforms */</div><div class='ctx'> 	regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nicpm_base");</div><div class='ctx'> 	if (regs) {</div><div class='ctx'> 		bgmac-&gt;plat.nicpm_base = devm_ioremap_resource(&amp;pdev-&gt;dev,</div><div class='hunk'>@@ -239,7 +237,9 @@ static int bgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	bgmac-&gt;cco_ctl_maskset = platform_bgmac_cco_ctl_maskset;</div><div class='ctx'> 	bgmac-&gt;get_bus_clock = platform_bgmac_get_bus_clock;</div><div class='ctx'> 	bgmac-&gt;cmn_maskset32 = platform_bgmac_cmn_maskset32;</div><div class='del'>-	if (of_parse_phandle(np, "phy-handle", 0)) {</div><div class='add'>+	phy_node = of_parse_phandle(np, "phy-handle", 0);</div><div class='add'>+	if (phy_node) {</div><div class='add'>+		of_node_put(phy_node);</div><div class='ctx'> 		bgmac-&gt;phy_connect = platform_phy_connect;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bgmac-&gt;phy_connect = bgmac_phy_connect_direct;</div><div class='hunk'>@@ -249,13 +249,11 @@ static int bgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	return bgmac_enet_probe(bgmac);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bgmac_remove(struct platform_device *pdev)</div><div class='add'>+static void bgmac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bgmac *bgmac = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	bgmac_enet_remove(bgmac);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -303,4 +301,5 @@ static struct platform_driver bgmac_enet_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(bgmac_enet_driver);</div><div class='add'>+MODULE_DESCRIPTION("Broadcom iProc GBit platform interface driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c<br/>index 4632dd5dbad1..3e9c57196a39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bgmac.c</a></div><div class='hunk'>@@ -172,7 +172,7 @@ static netdev_tx_t bgmac_dma_tx_add(struct bgmac *bgmac,</div><div class='ctx'> 	flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; nr_frags; i++) {</div><div class='del'>-		struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 		int len = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		index = (index + 1) % BGMAC_TX_RING_SLOTS;</div><div class='hunk'>@@ -189,8 +189,8 @@ static netdev_tx_t bgmac_dma_tx_add(struct bgmac *bgmac,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	slot-&gt;skb = skb;</div><div class='del'>-	ring-&gt;end += nr_frags + 1;</div><div class='ctx'> 	netdev_sent_queue(net_dev, skb-&gt;len);</div><div class='add'>+	ring-&gt;end += nr_frags + 1;</div><div class='ctx'> </div><div class='ctx'> 	wmb();</div><div class='ctx'> </div><div class='hunk'>@@ -746,36 +746,36 @@ error:</div><div class='ctx'> /* TODO: can we just drop @force? Can we don't reset MAC at all if there is</div><div class='ctx'>  * nothing to change? Try if after stabilizng driver.</div><div class='ctx'>  */</div><div class='del'>-static void bgmac_cmdcfg_maskset(struct bgmac *bgmac, u32 mask, u32 set,</div><div class='del'>-				 bool force)</div><div class='add'>+static void bgmac_umac_cmd_maskset(struct bgmac *bgmac, u32 mask, u32 set,</div><div class='add'>+				   bool force)</div><div class='ctx'> {</div><div class='del'>-	u32 cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);</div><div class='add'>+	u32 cmdcfg = bgmac_umac_read(bgmac, UMAC_CMD);</div><div class='ctx'> 	u32 new_val = (cmdcfg &amp; mask) | set;</div><div class='ctx'> 	u32 cmdcfg_sr;</div><div class='ctx'> </div><div class='ctx'> 	if (bgmac-&gt;feature_flags &amp; BGMAC_FEAT_CMDCFG_SR_REV4)</div><div class='del'>-		cmdcfg_sr = BGMAC_CMDCFG_SR_REV4;</div><div class='add'>+		cmdcfg_sr = CMD_SW_RESET;</div><div class='ctx'> 	else</div><div class='del'>-		cmdcfg_sr = BGMAC_CMDCFG_SR_REV0;</div><div class='add'>+		cmdcfg_sr = CMD_SW_RESET_OLD;</div><div class='ctx'> </div><div class='del'>-	bgmac_set(bgmac, BGMAC_CMDCFG, cmdcfg_sr);</div><div class='add'>+	bgmac_umac_maskset(bgmac, UMAC_CMD, ~0, cmdcfg_sr);</div><div class='ctx'> 	udelay(2);</div><div class='ctx'> </div><div class='ctx'> 	if (new_val != cmdcfg || force)</div><div class='del'>-		bgmac_write(bgmac, BGMAC_CMDCFG, new_val);</div><div class='add'>+		bgmac_umac_write(bgmac, UMAC_CMD, new_val);</div><div class='ctx'> </div><div class='del'>-	bgmac_mask(bgmac, BGMAC_CMDCFG, ~cmdcfg_sr);</div><div class='add'>+	bgmac_umac_maskset(bgmac, UMAC_CMD, ~cmdcfg_sr, 0);</div><div class='ctx'> 	udelay(2);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bgmac_write_mac_address(struct bgmac *bgmac, u8 *addr)</div><div class='add'>+static void bgmac_write_mac_address(struct bgmac *bgmac, const u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	tmp = (addr[0] &lt;&lt; 24) | (addr[1] &lt;&lt; 16) | (addr[2] &lt;&lt; 8) | addr[3];</div><div class='del'>-	bgmac_write(bgmac, BGMAC_MACADDR_HIGH, tmp);</div><div class='add'>+	bgmac_umac_write(bgmac, UMAC_MAC0, tmp);</div><div class='ctx'> 	tmp = (addr[4] &lt;&lt; 8) | addr[5];</div><div class='del'>-	bgmac_write(bgmac, BGMAC_MACADDR_LOW, tmp);</div><div class='add'>+	bgmac_umac_write(bgmac, UMAC_MAC1, tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bgmac_set_rx_mode(struct net_device *net_dev)</div><div class='hunk'>@@ -783,9 +783,9 @@ static void bgmac_set_rx_mode(struct net_device *net_dev)</div><div class='ctx'> 	struct bgmac *bgmac = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	if (net_dev-&gt;flags &amp; IFF_PROMISC)</div><div class='del'>-		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_PROM, true);</div><div class='add'>+		bgmac_umac_cmd_maskset(bgmac, ~0, CMD_PROMISC, true);</div><div class='ctx'> 	else</div><div class='del'>-		bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_PROM, 0, true);</div><div class='add'>+		bgmac_umac_cmd_maskset(bgmac, ~CMD_PROMISC, 0, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #if 0 /* We don't use that regs yet */</div><div class='hunk'>@@ -825,21 +825,21 @@ static void bgmac_clear_mib(struct bgmac *bgmac)</div><div class='ctx'> /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_speed */</div><div class='ctx'> static void bgmac_mac_speed(struct bgmac *bgmac)</div><div class='ctx'> {</div><div class='del'>-	u32 mask = ~(BGMAC_CMDCFG_ES_MASK | BGMAC_CMDCFG_HD);</div><div class='add'>+	u32 mask = ~(CMD_SPEED_MASK &lt;&lt; CMD_SPEED_SHIFT | CMD_HD_EN);</div><div class='ctx'> 	u32 set = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (bgmac-&gt;mac_speed) {</div><div class='ctx'> 	case SPEED_10:</div><div class='del'>-		set |= BGMAC_CMDCFG_ES_10;</div><div class='add'>+		set |= CMD_SPEED_10 &lt;&lt; CMD_SPEED_SHIFT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_100:</div><div class='del'>-		set |= BGMAC_CMDCFG_ES_100;</div><div class='add'>+		set |= CMD_SPEED_100 &lt;&lt; CMD_SPEED_SHIFT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_1000:</div><div class='del'>-		set |= BGMAC_CMDCFG_ES_1000;</div><div class='add'>+		set |= CMD_SPEED_1000 &lt;&lt; CMD_SPEED_SHIFT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_2500:</div><div class='del'>-		set |= BGMAC_CMDCFG_ES_2500;</div><div class='add'>+		set |= CMD_SPEED_2500 &lt;&lt; CMD_SPEED_SHIFT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(bgmac-&gt;dev, "Unsupported speed: %d\n",</div><div class='hunk'>@@ -847,9 +847,9 @@ static void bgmac_mac_speed(struct bgmac *bgmac)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bgmac-&gt;mac_duplex == DUPLEX_HALF)</div><div class='del'>-		set |= BGMAC_CMDCFG_HD;</div><div class='add'>+		set |= CMD_HD_EN;</div><div class='ctx'> </div><div class='del'>-	bgmac_cmdcfg_maskset(bgmac, mask, set, true);</div><div class='add'>+	bgmac_umac_cmd_maskset(bgmac, mask, set, true);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bgmac_miiconfig(struct bgmac *bgmac)</div><div class='hunk'>@@ -890,13 +890,13 @@ static void bgmac_chip_reset_idm_config(struct bgmac *bgmac)</div><div class='ctx'> </div><div class='ctx'> 		if (iost &amp; BGMAC_BCMA_IOST_ATTACHED) {</div><div class='ctx'> 			flags = BGMAC_BCMA_IOCTL_SW_CLKEN;</div><div class='del'>-			if (!bgmac-&gt;has_robosw)</div><div class='add'>+			if (bgmac-&gt;in_init || !bgmac-&gt;has_robosw)</div><div class='ctx'> 				flags |= BGMAC_BCMA_IOCTL_SW_RESET;</div><div class='ctx'> 		}</div><div class='ctx'> 		bgmac_clk_enable(bgmac, flags);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (iost &amp; BGMAC_BCMA_IOST_ATTACHED &amp;&amp; !bgmac-&gt;has_robosw)</div><div class='add'>+	if (iost &amp; BGMAC_BCMA_IOST_ATTACHED &amp;&amp; (bgmac-&gt;in_init || !bgmac-&gt;has_robosw))</div><div class='ctx'> 		bgmac_idm_write(bgmac, BCMA_IOCTL,</div><div class='ctx'> 				bgmac_idm_read(bgmac, BCMA_IOCTL) &amp;</div><div class='ctx'> 				~BGMAC_BCMA_IOCTL_SW_RESET);</div><div class='hunk'>@@ -917,7 +917,7 @@ static void bgmac_chip_reset(struct bgmac *bgmac)</div><div class='ctx'> 		for (i = 0; i &lt; BGMAC_MAX_TX_RINGS; i++)</div><div class='ctx'> 			bgmac_dma_tx_reset(bgmac, &amp;bgmac-&gt;tx_ring[i]);</div><div class='ctx'> </div><div class='del'>-		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_ML, false);</div><div class='add'>+		bgmac_umac_cmd_maskset(bgmac, ~0, CMD_LCL_LOOP_EN, false);</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; BGMAC_MAX_RX_RINGS; i++)</div><div class='hunk'>@@ -986,34 +986,34 @@ static void bgmac_chip_reset(struct bgmac *bgmac)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/gmac_reset</div><div class='del'>-	 * Specs don't say about using BGMAC_CMDCFG_SR, but in this routine</div><div class='del'>-	 * BGMAC_CMDCFG is read _after_ putting chip in a reset. So it has to</div><div class='add'>+	 * Specs don't say about using UMAC_CMD_SR, but in this routine</div><div class='add'>+	 * UMAC_CMD is read _after_ putting chip in a reset. So it has to</div><div class='ctx'> 	 * be keps until taking MAC out of the reset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (bgmac-&gt;feature_flags &amp; BGMAC_FEAT_CMDCFG_SR_REV4)</div><div class='del'>-		cmdcfg_sr = BGMAC_CMDCFG_SR_REV4;</div><div class='add'>+		cmdcfg_sr = CMD_SW_RESET;</div><div class='ctx'> 	else</div><div class='del'>-		cmdcfg_sr = BGMAC_CMDCFG_SR_REV0;</div><div class='del'>-</div><div class='del'>-	bgmac_cmdcfg_maskset(bgmac,</div><div class='del'>-			     ~(BGMAC_CMDCFG_TE |</div><div class='del'>-			       BGMAC_CMDCFG_RE |</div><div class='del'>-			       BGMAC_CMDCFG_RPI |</div><div class='del'>-			       BGMAC_CMDCFG_TAI |</div><div class='del'>-			       BGMAC_CMDCFG_HD |</div><div class='del'>-			       BGMAC_CMDCFG_ML |</div><div class='del'>-			       BGMAC_CMDCFG_CFE |</div><div class='del'>-			       BGMAC_CMDCFG_RL |</div><div class='del'>-			       BGMAC_CMDCFG_RED |</div><div class='del'>-			       BGMAC_CMDCFG_PE |</div><div class='del'>-			       BGMAC_CMDCFG_TPI |</div><div class='del'>-			       BGMAC_CMDCFG_PAD_EN |</div><div class='del'>-			       BGMAC_CMDCFG_PF),</div><div class='del'>-			     BGMAC_CMDCFG_PROM |</div><div class='del'>-			     BGMAC_CMDCFG_NLC |</div><div class='del'>-			     BGMAC_CMDCFG_CFE |</div><div class='del'>-			     cmdcfg_sr,</div><div class='del'>-			     false);</div><div class='add'>+		cmdcfg_sr = CMD_SW_RESET_OLD;</div><div class='add'>+</div><div class='add'>+	bgmac_umac_cmd_maskset(bgmac,</div><div class='add'>+			       ~(CMD_TX_EN |</div><div class='add'>+				 CMD_RX_EN |</div><div class='add'>+				 CMD_RX_PAUSE_IGNORE |</div><div class='add'>+				 CMD_TX_ADDR_INS |</div><div class='add'>+				 CMD_HD_EN |</div><div class='add'>+				 CMD_LCL_LOOP_EN |</div><div class='add'>+				 CMD_CNTL_FRM_EN |</div><div class='add'>+				 CMD_RMT_LOOP_EN |</div><div class='add'>+				 CMD_RX_ERR_DISC |</div><div class='add'>+				 CMD_PRBL_EN |</div><div class='add'>+				 CMD_TX_PAUSE_IGNORE |</div><div class='add'>+				 CMD_PAD_EN |</div><div class='add'>+				 CMD_PAUSE_FWD),</div><div class='add'>+			       CMD_PROMISC |</div><div class='add'>+			       CMD_NO_LEN_CHK |</div><div class='add'>+			       CMD_CNTL_FRM_EN |</div><div class='add'>+			       cmdcfg_sr,</div><div class='add'>+			       false);</div><div class='ctx'> 	bgmac-&gt;mac_speed = SPEED_UNKNOWN;</div><div class='ctx'> 	bgmac-&gt;mac_duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> </div><div class='hunk'>@@ -1049,16 +1049,16 @@ static void bgmac_enable(struct bgmac *bgmac)</div><div class='ctx'> 	u32 mode;</div><div class='ctx'> </div><div class='ctx'> 	if (bgmac-&gt;feature_flags &amp; BGMAC_FEAT_CMDCFG_SR_REV4)</div><div class='del'>-		cmdcfg_sr = BGMAC_CMDCFG_SR_REV4;</div><div class='add'>+		cmdcfg_sr = CMD_SW_RESET;</div><div class='ctx'> 	else</div><div class='del'>-		cmdcfg_sr = BGMAC_CMDCFG_SR_REV0;</div><div class='add'>+		cmdcfg_sr = CMD_SW_RESET_OLD;</div><div class='ctx'> </div><div class='del'>-	cmdcfg = bgmac_read(bgmac, BGMAC_CMDCFG);</div><div class='del'>-	bgmac_cmdcfg_maskset(bgmac, ~(BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE),</div><div class='del'>-			     cmdcfg_sr, true);</div><div class='add'>+	cmdcfg = bgmac_umac_read(bgmac, UMAC_CMD);</div><div class='add'>+	bgmac_umac_cmd_maskset(bgmac, ~(CMD_TX_EN | CMD_RX_EN),</div><div class='add'>+			       cmdcfg_sr, true);</div><div class='ctx'> 	udelay(2);</div><div class='del'>-	cmdcfg |= BGMAC_CMDCFG_TE | BGMAC_CMDCFG_RE;</div><div class='del'>-	bgmac_write(bgmac, BGMAC_CMDCFG, cmdcfg);</div><div class='add'>+	cmdcfg |= CMD_TX_EN | CMD_RX_EN;</div><div class='add'>+	bgmac_umac_write(bgmac, UMAC_CMD, cmdcfg);</div><div class='ctx'> </div><div class='ctx'> 	mode = (bgmac_read(bgmac, BGMAC_DEV_STATUS) &amp; BGMAC_DS_MM_MASK) &gt;&gt;</div><div class='ctx'> 		BGMAC_DS_MM_SHIFT;</div><div class='hunk'>@@ -1078,7 +1078,7 @@ static void bgmac_enable(struct bgmac *bgmac)</div><div class='ctx'> 			fl_ctl = 0x03cb04cb;</div><div class='ctx'> </div><div class='ctx'> 		bgmac_write(bgmac, BGMAC_FLOW_CTL_THRESH, fl_ctl);</div><div class='del'>-		bgmac_write(bgmac, BGMAC_PAUSE_CTL, 0x27fff);</div><div class='add'>+		bgmac_umac_write(bgmac, UMAC_PAUSE_CTRL, 0x27fff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bgmac-&gt;feature_flags &amp; BGMAC_FEAT_SET_RXQ_CLK) {</div><div class='hunk'>@@ -1105,18 +1105,18 @@ static void bgmac_chip_init(struct bgmac *bgmac)</div><div class='ctx'> 	bgmac_write(bgmac, BGMAC_INT_RECV_LAZY, 1 &lt;&lt; BGMAC_IRL_FC_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable 802.3x tx flow control (honor received PAUSE frames) */</div><div class='del'>-	bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_RPI, 0, true);</div><div class='add'>+	bgmac_umac_cmd_maskset(bgmac, ~CMD_RX_PAUSE_IGNORE, 0, true);</div><div class='ctx'> </div><div class='ctx'> 	bgmac_set_rx_mode(bgmac-&gt;net_dev);</div><div class='ctx'> </div><div class='ctx'> 	bgmac_write_mac_address(bgmac, bgmac-&gt;net_dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (bgmac-&gt;loopback)</div><div class='del'>-		bgmac_cmdcfg_maskset(bgmac, ~0, BGMAC_CMDCFG_ML, false);</div><div class='add'>+		bgmac_umac_cmd_maskset(bgmac, ~0, CMD_LCL_LOOP_EN, false);</div><div class='ctx'> 	else</div><div class='del'>-		bgmac_cmdcfg_maskset(bgmac, ~BGMAC_CMDCFG_ML, 0, false);</div><div class='add'>+		bgmac_umac_cmd_maskset(bgmac, ~CMD_LCL_LOOP_EN, 0, false);</div><div class='ctx'> </div><div class='del'>-	bgmac_write(bgmac, BGMAC_RXMAX_LENGTH, 32 + ETHER_MAX_LEN);</div><div class='add'>+	bgmac_umac_write(bgmac, UMAC_MAX_FRAME_LEN, 32 + ETHER_MAX_LEN);</div><div class='ctx'> </div><div class='ctx'> 	bgmac_chip_intrs_on(bgmac);</div><div class='ctx'> </div><div class='hunk'>@@ -1241,19 +1241,19 @@ static int bgmac_set_mac_address(struct net_device *net_dev, void *addr)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(net_dev-&gt;dev_addr, sa-&gt;sa_data);</div><div class='add'>+	eth_hw_addr_set(net_dev, sa-&gt;sa_data);</div><div class='ctx'> 	bgmac_write_mac_address(bgmac, net_dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	eth_commit_mac_addr_change(net_dev, addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)</div><div class='add'>+static int bgmac_change_mtu(struct net_device *net_dev, int mtu)</div><div class='ctx'> {</div><div class='del'>-	if (!netif_running(net_dev))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	struct bgmac *bgmac = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='del'>-	return phy_mii_ioctl(net_dev-&gt;phydev, ifr, cmd);</div><div class='add'>+	bgmac_umac_write(bgmac, UMAC_MAX_FRAME_LEN, 32 + mtu);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops bgmac_netdev_ops = {</div><div class='hunk'>@@ -1263,7 +1263,8 @@ static const struct net_device_ops bgmac_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode	= bgmac_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= bgmac_set_mac_address,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl           = bgmac_ioctl,</div><div class='add'>+	.ndo_eth_ioctl           = phy_do_ioctl_running,</div><div class='add'>+	.ndo_change_mtu		= bgmac_change_mtu,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**************************************************</div><div class='hunk'>@@ -1366,8 +1367,7 @@ static void bgmac_get_strings(struct net_device *dev, u32 stringset,</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BGMAC_STATS_LEN; i++)</div><div class='del'>-		strlcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-			bgmac_get_strings_stats[i].name, ETH_GSTRING_LEN);</div><div class='add'>+		ethtool_puts(&amp;data, bgmac_get_strings_stats[i].name);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bgmac_get_ethtool_stats(struct net_device *dev,</div><div class='hunk'>@@ -1394,8 +1394,8 @@ static void bgmac_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> static void bgmac_get_drvinfo(struct net_device *net_dev,</div><div class='ctx'> 			      struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;bus_info, "AXI", sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, KBUILD_MODNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, "AXI", sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops bgmac_ethtool_ops = {</div><div class='hunk'>@@ -1446,10 +1446,10 @@ int bgmac_phy_connect_direct(struct bgmac *bgmac)</div><div class='ctx'> 	struct phy_device *phy_dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	phy_dev = fixed_phy_register(PHY_POLL, &amp;fphy_status, NULL);</div><div class='del'>-	if (!phy_dev || IS_ERR(phy_dev)) {</div><div class='add'>+	phy_dev = fixed_phy_register(&amp;fphy_status, NULL);</div><div class='add'>+	if (IS_ERR(phy_dev)) {</div><div class='ctx'> 		dev_err(bgmac-&gt;dev, "Failed to register fixed PHY device\n");</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return PTR_ERR(phy_dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = phy_connect_direct(bgmac-&gt;net_dev, phy_dev, bgmac_adjust_link,</div><div class='hunk'>@@ -1489,7 +1489,7 @@ int bgmac_enet_probe(struct bgmac *bgmac)</div><div class='ctx'> 	struct net_device *net_dev = bgmac-&gt;net_dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	bgmac_chip_intrs_off(bgmac);</div><div class='add'>+	bgmac-&gt;in_init = true;</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;irq = bgmac-&gt;irq;</div><div class='ctx'> 	SET_NETDEV_DEV(net_dev, bgmac-&gt;dev);</div><div class='hunk'>@@ -1508,6 +1508,8 @@ int bgmac_enet_probe(struct bgmac *bgmac)</div><div class='ctx'> 	 */</div><div class='ctx'> 	bgmac_clk_enable(bgmac, 0);</div><div class='ctx'> </div><div class='add'>+	bgmac_chip_intrs_off(bgmac);</div><div class='add'>+</div><div class='ctx'> 	/* This seems to be fixing IRQ by assigning OOB #6 to the core */</div><div class='ctx'> 	if (!(bgmac-&gt;feature_flags &amp; BGMAC_FEAT_IDM_MASK)) {</div><div class='ctx'> 		if (bgmac-&gt;feature_flags &amp; BGMAC_FEAT_IRQ_ID_OOB_6)</div><div class='hunk'>@@ -1526,7 +1528,7 @@ int bgmac_enet_probe(struct bgmac *bgmac)</div><div class='ctx'> 	if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0)</div><div class='ctx'> 		bgmac-&gt;int_mask &amp;= ~BGMAC_IS_TX_MASK;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(net_dev, &amp;bgmac-&gt;napi, bgmac_poll, BGMAC_WEIGHT);</div><div class='add'>+	netif_napi_add(net_dev, &amp;bgmac-&gt;napi, bgmac_poll);</div><div class='ctx'> </div><div class='ctx'> 	err = bgmac_phy_connect(bgmac);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1538,6 +1540,11 @@ int bgmac_enet_probe(struct bgmac *bgmac)</div><div class='ctx'> 	net_dev-&gt;hw_features = net_dev-&gt;features;</div><div class='ctx'> 	net_dev-&gt;vlan_features = net_dev-&gt;features;</div><div class='ctx'> </div><div class='add'>+	/* Omit FCS from max MTU size */</div><div class='add'>+	net_dev-&gt;max_mtu = BGMAC_RX_MAX_FRAME_SIZE - ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+	bgmac-&gt;in_init = false;</div><div class='add'>+</div><div class='ctx'> 	err = register_netdev(bgmac-&gt;net_dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(bgmac-&gt;dev, "Cannot register net device\n");</div><div class='hunk'>@@ -1564,7 +1571,6 @@ void bgmac_enet_remove(struct bgmac *bgmac)</div><div class='ctx'> 	phy_disconnect(bgmac-&gt;net_dev-&gt;phydev);</div><div class='ctx'> 	netif_napi_del(&amp;bgmac-&gt;napi);</div><div class='ctx'> 	bgmac_dma_free(bgmac);</div><div class='del'>-	free_netdev(bgmac-&gt;net_dev);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL_GPL(bgmac_enet_remove);</div><div class='ctx'> </div><div class='hunk'>@@ -1619,4 +1625,5 @@ int bgmac_enet_resume(struct bgmac *bgmac)</div><div class='ctx'> EXPORT_SYMBOL_GPL(bgmac_enet_resume);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Rafał Miłecki");</div><div class='add'>+MODULE_DESCRIPTION("Broadcom iProc GBit driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h<br/>index 40d02fec2747..6fee9a41839c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bgmac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bgmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bgmac.h</a></div><div class='hunk'>@@ -4,6 +4,8 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> </div><div class='add'>+#include "unimac.h"</div><div class='add'>+</div><div class='ctx'> #define BGMAC_DEV_CTL				0x000</div><div class='ctx'> #define  BGMAC_DC_TSM				0x00000002</div><div class='ctx'> #define  BGMAC_DC_CFCO				0x00000004</div><div class='hunk'>@@ -169,47 +171,7 @@</div><div class='ctx'> #define BGMAC_RX_NONPAUSE_PKTS			0x420</div><div class='ctx'> #define BGMAC_RX_SACHANGES			0x424</div><div class='ctx'> #define BGMAC_RX_UNI_PKTS			0x428</div><div class='del'>-#define BGMAC_UNIMAC_VERSION			0x800</div><div class='del'>-#define BGMAC_HDBKP_CTL				0x804</div><div class='del'>-#define BGMAC_CMDCFG				0x808		/* Configuration */</div><div class='del'>-#define  BGMAC_CMDCFG_TE			0x00000001	/* Set to activate TX */</div><div class='del'>-#define  BGMAC_CMDCFG_RE			0x00000002	/* Set to activate RX */</div><div class='del'>-#define  BGMAC_CMDCFG_ES_MASK			0x0000000c	/* Ethernet speed see gmac_speed */</div><div class='del'>-#define   BGMAC_CMDCFG_ES_10			0x00000000</div><div class='del'>-#define   BGMAC_CMDCFG_ES_100			0x00000004</div><div class='del'>-#define   BGMAC_CMDCFG_ES_1000			0x00000008</div><div class='del'>-#define   BGMAC_CMDCFG_ES_2500			0x0000000C</div><div class='del'>-#define  BGMAC_CMDCFG_PROM			0x00000010	/* Set to activate promiscuous mode */</div><div class='del'>-#define  BGMAC_CMDCFG_PAD_EN			0x00000020</div><div class='del'>-#define  BGMAC_CMDCFG_CF			0x00000040</div><div class='del'>-#define  BGMAC_CMDCFG_PF			0x00000080</div><div class='del'>-#define  BGMAC_CMDCFG_RPI			0x00000100	/* Unset to enable 802.3x tx flow control */</div><div class='del'>-#define  BGMAC_CMDCFG_TAI			0x00000200</div><div class='del'>-#define  BGMAC_CMDCFG_HD			0x00000400	/* Set if in half duplex mode */</div><div class='del'>-#define  BGMAC_CMDCFG_HD_SHIFT			10</div><div class='del'>-#define  BGMAC_CMDCFG_SR_REV0			0x00000800	/* Set to reset mode, for core rev 0-3 */</div><div class='del'>-#define  BGMAC_CMDCFG_SR_REV4			0x00002000	/* Set to reset mode, for core rev &gt;= 4 */</div><div class='del'>-#define  BGMAC_CMDCFG_ML			0x00008000	/* Set to activate mac loopback mode */</div><div class='del'>-#define  BGMAC_CMDCFG_AE			0x00400000</div><div class='del'>-#define  BGMAC_CMDCFG_CFE			0x00800000</div><div class='del'>-#define  BGMAC_CMDCFG_NLC			0x01000000</div><div class='del'>-#define  BGMAC_CMDCFG_RL			0x02000000</div><div class='del'>-#define  BGMAC_CMDCFG_RED			0x04000000</div><div class='del'>-#define  BGMAC_CMDCFG_PE			0x08000000</div><div class='del'>-#define  BGMAC_CMDCFG_TPI			0x10000000</div><div class='del'>-#define  BGMAC_CMDCFG_AT			0x20000000</div><div class='del'>-#define BGMAC_MACADDR_HIGH			0x80c		/* High 4 octets of own mac address */</div><div class='del'>-#define BGMAC_MACADDR_LOW			0x810		/* Low 2 octets of own mac address */</div><div class='del'>-#define BGMAC_RXMAX_LENGTH			0x814		/* Max receive frame length with vlan tag */</div><div class='del'>-#define BGMAC_PAUSEQUANTA			0x818</div><div class='del'>-#define BGMAC_MAC_MODE				0x844</div><div class='del'>-#define BGMAC_OUTERTAG				0x848</div><div class='del'>-#define BGMAC_INNERTAG				0x84c</div><div class='del'>-#define BGMAC_TXIPG				0x85c</div><div class='del'>-#define BGMAC_PAUSE_CTL				0xb30</div><div class='del'>-#define BGMAC_TX_FLUSH				0xb34</div><div class='del'>-#define BGMAC_RX_STATUS				0xb38</div><div class='del'>-#define BGMAC_TX_STATUS				0xb3c</div><div class='add'>+#define BGMAC_UNIMAC				0x800</div><div class='ctx'> </div><div class='ctx'> /* BCMA GMAC core specific IO Control (BCMA_IOCTL) flags */</div><div class='ctx'> #define BGMAC_BCMA_IOCTL_SW_CLKEN		0x00000004	/* PHY Clock Enable */</div><div class='hunk'>@@ -351,7 +313,7 @@</div><div class='ctx'> #define BGMAC_DESC_CTL0_IOC			0x20000000	/* IRQ on complete */</div><div class='ctx'> #define BGMAC_DESC_CTL0_EOF			0x40000000	/* End of frame */</div><div class='ctx'> #define BGMAC_DESC_CTL0_SOF			0x80000000	/* Start of frame */</div><div class='del'>-#define BGMAC_DESC_CTL1_LEN			0x00001FFF</div><div class='add'>+#define BGMAC_DESC_CTL1_LEN			0x00003FFF</div><div class='ctx'> </div><div class='ctx'> #define BGMAC_PHY_NOREGS			BRCM_PSEUDO_PHY_ADDR</div><div class='ctx'> #define BGMAC_PHY_MASK				0x1F</div><div class='hunk'>@@ -366,7 +328,7 @@</div><div class='ctx'> #define BGMAC_RX_FRAME_OFFSET			30		/* There are 2 unused bytes between header and real data */</div><div class='ctx'> #define BGMAC_RX_BUF_OFFSET			(NET_SKB_PAD + NET_IP_ALIGN - \</div><div class='ctx'> 						 BGMAC_RX_FRAME_OFFSET)</div><div class='del'>-#define BGMAC_RX_MAX_FRAME_SIZE			1536		/* Copied from b44/tg3 */</div><div class='add'>+#define BGMAC_RX_MAX_FRAME_SIZE			1536</div><div class='ctx'> #define BGMAC_RX_BUF_SIZE			(BGMAC_RX_FRAME_OFFSET + BGMAC_RX_MAX_FRAME_SIZE)</div><div class='ctx'> #define BGMAC_RX_ALLOC_SIZE			(SKB_DATA_ALIGN(BGMAC_RX_BUF_SIZE + BGMAC_RX_BUF_OFFSET) + \</div><div class='ctx'> 						 SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='hunk'>@@ -401,8 +363,6 @@</div><div class='ctx'> #define BGMAC_CHIPCTL_7_IF_TYPE_MII		0x00000040</div><div class='ctx'> #define BGMAC_CHIPCTL_7_IF_TYPE_RGMII		0x00000080</div><div class='ctx'> </div><div class='del'>-#define BGMAC_WEIGHT	64</div><div class='del'>-</div><div class='ctx'> #define ETHER_MAX_LEN	(ETH_FRAME_LEN + ETH_FCS_LEN)</div><div class='ctx'> </div><div class='ctx'> /* Feature Flags */</div><div class='hunk'>@@ -511,6 +471,8 @@ struct bgmac {</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	u32 int_mask;</div><div class='ctx'> </div><div class='add'>+	bool in_init;</div><div class='add'>+</div><div class='ctx'> 	/* Current MAC state */</div><div class='ctx'> 	int mac_speed;</div><div class='ctx'> 	int mac_duplex;</div><div class='hunk'>@@ -555,6 +517,16 @@ static inline void bgmac_write(struct bgmac *bgmac, u16 offset, u32 value)</div><div class='ctx'> 	bgmac-&gt;write(bgmac, offset, value);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline u32 bgmac_umac_read(struct bgmac *bgmac, u16 offset)</div><div class='add'>+{</div><div class='add'>+	return bgmac_read(bgmac, BGMAC_UNIMAC + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bgmac_umac_write(struct bgmac *bgmac, u16 offset, u32 value)</div><div class='add'>+{</div><div class='add'>+	bgmac_write(bgmac, BGMAC_UNIMAC + offset, value);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 bgmac_idm_read(struct bgmac *bgmac, u16 offset)</div><div class='ctx'> {</div><div class='ctx'> 	return bgmac-&gt;idm_read(bgmac, offset);</div><div class='hunk'>@@ -608,6 +580,11 @@ static inline void bgmac_set(struct bgmac *bgmac, u16 offset, u32 set)</div><div class='ctx'> 	bgmac_maskset(bgmac, offset, ~0, set);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void bgmac_umac_maskset(struct bgmac *bgmac, u16 offset, u32 mask, u32 set)</div><div class='add'>+{</div><div class='add'>+	bgmac_maskset(bgmac, BGMAC_UNIMAC + offset, mask, set);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline int bgmac_phy_connect(struct bgmac *bgmac)</div><div class='ctx'> {</div><div class='ctx'> 	return bgmac-&gt;phy_connect(bgmac);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/Makefile b/drivers/net/ethernet/broadcom/bnge/Makefile<br/>new file mode 100644<br/>index 000000000000..ea6596854e5c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/Makefile</a></div><div class='hunk'>@@ -0,0 +1,13 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_BNGE) += bng_en.o</div><div class='add'>+</div><div class='add'>+bng_en-y := bnge_core.o \</div><div class='add'>+	    bnge_devlink.o \</div><div class='add'>+	    bnge_hwrm.o \</div><div class='add'>+	    bnge_hwrm_lib.o \</div><div class='add'>+	    bnge_rmem.o \</div><div class='add'>+	    bnge_resc.o \</div><div class='add'>+	    bnge_netdev.o \</div><div class='add'>+	    bnge_ethtool.o \</div><div class='add'>+	    bnge_auxr.o</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge.h b/drivers/net/ethernet/broadcom/bnge/bnge.h<br/>new file mode 100644<br/>index 000000000000..411744894349<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge.h</a></div><div class='hunk'>@@ -0,0 +1,255 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_H_</div><div class='add'>+#define _BNGE_H_</div><div class='add'>+</div><div class='add'>+#define DRV_NAME	"bng_en"</div><div class='add'>+#define DRV_SUMMARY	"Broadcom 800G Ethernet Linux Driver"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+#include "bnge_rmem.h"</div><div class='add'>+#include "bnge_resc.h"</div><div class='add'>+#include "bnge_auxr.h"</div><div class='add'>+</div><div class='add'>+#define DRV_VER_MAJ	1</div><div class='add'>+#define DRV_VER_MIN	15</div><div class='add'>+#define DRV_VER_UPD	1</div><div class='add'>+</div><div class='add'>+extern char bnge_driver_name[];</div><div class='add'>+</div><div class='add'>+enum board_idx {</div><div class='add'>+	BCM57708,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_auxr_priv {</div><div class='add'>+	struct auxiliary_device aux_dev;</div><div class='add'>+	struct bnge_auxr_dev *auxr_dev;</div><div class='add'>+	int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_pf_info {</div><div class='add'>+	u16	fw_fid;</div><div class='add'>+	u16	port_id;</div><div class='add'>+	u8	mac_addr[ETH_ALEN];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INVALID_HW_RING_ID      ((u16)-1)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BNGE_FW_CAP_SHORT_CMD				= BIT_ULL(0),</div><div class='add'>+	BNGE_FW_CAP_LLDP_AGENT				= BIT_ULL(1),</div><div class='add'>+	BNGE_FW_CAP_DCBX_AGENT				= BIT_ULL(2),</div><div class='add'>+	BNGE_FW_CAP_IF_CHANGE				= BIT_ULL(3),</div><div class='add'>+	BNGE_FW_CAP_KONG_MB_CHNL			= BIT_ULL(4),</div><div class='add'>+	BNGE_FW_CAP_ERROR_RECOVERY			= BIT_ULL(5),</div><div class='add'>+	BNGE_FW_CAP_PKG_VER				= BIT_ULL(6),</div><div class='add'>+	BNGE_FW_CAP_CFA_ADV_FLOW			= BIT_ULL(7),</div><div class='add'>+	BNGE_FW_CAP_CFA_RFS_RING_TBL_IDX_V2		= BIT_ULL(8),</div><div class='add'>+	BNGE_FW_CAP_PCIE_STATS_SUPPORTED		= BIT_ULL(9),</div><div class='add'>+	BNGE_FW_CAP_EXT_STATS_SUPPORTED			= BIT_ULL(10),</div><div class='add'>+	BNGE_FW_CAP_ERR_RECOVER_RELOAD			= BIT_ULL(11),</div><div class='add'>+	BNGE_FW_CAP_HOT_RESET				= BIT_ULL(12),</div><div class='add'>+	BNGE_FW_CAP_RX_ALL_PKT_TS			= BIT_ULL(13),</div><div class='add'>+	BNGE_FW_CAP_VLAN_RX_STRIP			= BIT_ULL(14),</div><div class='add'>+	BNGE_FW_CAP_VLAN_TX_INSERT			= BIT_ULL(15),</div><div class='add'>+	BNGE_FW_CAP_EXT_HW_STATS_SUPPORTED		= BIT_ULL(16),</div><div class='add'>+	BNGE_FW_CAP_LIVEPATCH				= BIT_ULL(17),</div><div class='add'>+	BNGE_FW_CAP_HOT_RESET_IF			= BIT_ULL(18),</div><div class='add'>+	BNGE_FW_CAP_RING_MONITOR			= BIT_ULL(19),</div><div class='add'>+	BNGE_FW_CAP_DBG_QCAPS				= BIT_ULL(20),</div><div class='add'>+	BNGE_FW_CAP_THRESHOLD_TEMP_SUPPORTED		= BIT_ULL(21),</div><div class='add'>+	BNGE_FW_CAP_DFLT_VLAN_TPID_PCP			= BIT_ULL(22),</div><div class='add'>+	BNGE_FW_CAP_VNIC_TUNNEL_TPA			= BIT_ULL(23),</div><div class='add'>+	BNGE_FW_CAP_CFA_NTUPLE_RX_EXT_IP_PROTO		= BIT_ULL(24),</div><div class='add'>+	BNGE_FW_CAP_CFA_RFS_RING_TBL_IDX_V3		= BIT_ULL(25),</div><div class='add'>+	BNGE_FW_CAP_VNIC_RE_FLUSH			= BIT_ULL(26),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BNGE_EN_ROCE_V1					= BIT_ULL(0),</div><div class='add'>+	BNGE_EN_ROCE_V2					= BIT_ULL(1),</div><div class='add'>+	BNGE_EN_STRIP_VLAN				= BIT_ULL(2),</div><div class='add'>+	BNGE_EN_SHARED_CHNL				= BIT_ULL(3),</div><div class='add'>+	BNGE_EN_UDP_GSO_SUPP				= BIT_ULL(4),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_EN_ROCE		(BNGE_EN_ROCE_V1 | BNGE_EN_ROCE_V2)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BNGE_RSS_CAP_RSS_HASH_TYPE_DELTA		= BIT(0),</div><div class='add'>+	BNGE_RSS_CAP_UDP_RSS_CAP			= BIT(1),</div><div class='add'>+	BNGE_RSS_CAP_NEW_RSS_CAP			= BIT(2),</div><div class='add'>+	BNGE_RSS_CAP_RSS_TCAM				= BIT(3),</div><div class='add'>+	BNGE_RSS_CAP_AH_V4_RSS_CAP			= BIT(4),</div><div class='add'>+	BNGE_RSS_CAP_AH_V6_RSS_CAP			= BIT(5),</div><div class='add'>+	BNGE_RSS_CAP_ESP_V4_RSS_CAP			= BIT(6),</div><div class='add'>+	BNGE_RSS_CAP_ESP_V6_RSS_CAP			= BIT(7),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_MAX_QUEUE		8</div><div class='add'>+struct bnge_queue_info {</div><div class='add'>+	u8      queue_id;</div><div class='add'>+	u8      queue_profile;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_dev {</div><div class='add'>+	struct device	*dev;</div><div class='add'>+	struct pci_dev	*pdev;</div><div class='add'>+	struct net_device	*netdev;</div><div class='add'>+	u64	dsn;</div><div class='add'>+#define BNGE_VPD_FLD_LEN	32</div><div class='add'>+	char		board_partno[BNGE_VPD_FLD_LEN];</div><div class='add'>+	char		board_serialno[BNGE_VPD_FLD_LEN];</div><div class='add'>+</div><div class='add'>+	void __iomem	*bar0;</div><div class='add'>+	void __iomem	*bar1;</div><div class='add'>+</div><div class='add'>+	u16		chip_num;</div><div class='add'>+	u8		chip_rev;</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	/* ensure atomic 64-bit doorbell writes on 32-bit systems. */</div><div class='add'>+	spinlock_t	db_lock;</div><div class='add'>+#endif</div><div class='add'>+	int		db_offset; /* db_offset within db_size */</div><div class='add'>+	int		db_size;</div><div class='add'>+</div><div class='add'>+	/* HWRM members */</div><div class='add'>+	u16			hwrm_cmd_seq;</div><div class='add'>+	u16			hwrm_cmd_kong_seq;</div><div class='add'>+	struct dma_pool		*hwrm_dma_pool;</div><div class='add'>+	struct hlist_head	hwrm_pending_list;</div><div class='add'>+	u16			hwrm_max_req_len;</div><div class='add'>+	u16			hwrm_max_ext_req_len;</div><div class='add'>+	unsigned int		hwrm_cmd_timeout;</div><div class='add'>+	unsigned int		hwrm_cmd_max_timeout;</div><div class='add'>+	struct mutex		hwrm_cmd_lock;	/* serialize hwrm messages */</div><div class='add'>+</div><div class='add'>+	struct hwrm_ver_get_output	ver_resp;</div><div class='add'>+#define FW_VER_STR_LEN		32</div><div class='add'>+	char			fw_ver_str[FW_VER_STR_LEN];</div><div class='add'>+	char			hwrm_ver_supp[FW_VER_STR_LEN];</div><div class='add'>+	char			nvm_cfg_ver[FW_VER_STR_LEN];</div><div class='add'>+	u64			fw_ver_code;</div><div class='add'>+#define BNGE_FW_VER_CODE(maj, min, bld, rsv)			\</div><div class='add'>+	((u64)(maj) &lt;&lt; 48 | (u64)(min) &lt;&lt; 32 | (u64)(bld) &lt;&lt; 16 | (rsv))</div><div class='add'>+</div><div class='add'>+	struct bnge_pf_info	pf;</div><div class='add'>+</div><div class='add'>+	unsigned long           state;</div><div class='add'>+#define BNGE_STATE_DRV_REGISTERED      0</div><div class='add'>+#define BNGE_STATE_OPEN			1</div><div class='add'>+</div><div class='add'>+	u64			fw_cap;</div><div class='add'>+</div><div class='add'>+	/* Backing stores */</div><div class='add'>+	struct bnge_ctx_mem_info	*ctx;</div><div class='add'>+</div><div class='add'>+	u64			flags;</div><div class='add'>+</div><div class='add'>+	struct bnge_hw_resc	hw_resc;</div><div class='add'>+</div><div class='add'>+	u16			tso_max_segs;</div><div class='add'>+</div><div class='add'>+	int			max_fltr;</div><div class='add'>+#define BNGE_L2_FLTR_MAX_FLTR	1024</div><div class='add'>+</div><div class='add'>+	u32			*rss_indir_tbl;</div><div class='add'>+#define BNGE_RSS_TABLE_ENTRIES	64</div><div class='add'>+#define BNGE_RSS_TABLE_SIZE		(BNGE_RSS_TABLE_ENTRIES * 4)</div><div class='add'>+#define BNGE_RSS_TABLE_MAX_TBL	8</div><div class='add'>+#define BNGE_MAX_RSS_TABLE_SIZE				\</div><div class='add'>+	(BNGE_RSS_TABLE_SIZE * BNGE_RSS_TABLE_MAX_TBL)</div><div class='add'>+#define BNGE_MAX_RSS_TABLE_ENTRIES				\</div><div class='add'>+	(BNGE_RSS_TABLE_ENTRIES * BNGE_RSS_TABLE_MAX_TBL)</div><div class='add'>+	u16			rss_indir_tbl_entries;</div><div class='add'>+</div><div class='add'>+	u32			rss_cap;</div><div class='add'>+	u32			rss_hash_cfg;</div><div class='add'>+</div><div class='add'>+	u16			rx_nr_rings;</div><div class='add'>+	u16			tx_nr_rings;</div><div class='add'>+	u16			tx_nr_rings_per_tc;</div><div class='add'>+	/* Number of NQs */</div><div class='add'>+	u16			nq_nr_rings;</div><div class='add'>+</div><div class='add'>+	/* Aux device resources */</div><div class='add'>+	u16			aux_num_msix;</div><div class='add'>+	u16			aux_num_stat_ctxs;</div><div class='add'>+</div><div class='add'>+	u16			max_mtu;</div><div class='add'>+#define BNGE_MAX_MTU		9500</div><div class='add'>+</div><div class='add'>+	u16			hw_ring_stats_size;</div><div class='add'>+#define BNGE_NUM_RX_RING_STATS			8</div><div class='add'>+#define BNGE_NUM_TX_RING_STATS			8</div><div class='add'>+#define BNGE_NUM_TPA_RING_STATS			6</div><div class='add'>+#define BNGE_RING_STATS_SIZE					\</div><div class='add'>+	((BNGE_NUM_RX_RING_STATS + BNGE_NUM_TX_RING_STATS +	\</div><div class='add'>+	  BNGE_NUM_TPA_RING_STATS) * 8)</div><div class='add'>+</div><div class='add'>+	u16			max_tpa_v2;</div><div class='add'>+#define BNGE_SUPPORTS_TPA(bd)	((bd)-&gt;max_tpa_v2)</div><div class='add'>+</div><div class='add'>+	u8                      num_tc;</div><div class='add'>+	u8			max_tc;</div><div class='add'>+	u8			max_lltc;	/* lossless TCs */</div><div class='add'>+	struct bnge_queue_info	q_info[BNGE_MAX_QUEUE];</div><div class='add'>+	u8			tc_to_qidx[BNGE_MAX_QUEUE];</div><div class='add'>+	u8			q_ids[BNGE_MAX_QUEUE];</div><div class='add'>+	u8			max_q;</div><div class='add'>+	u8			port_count;</div><div class='add'>+</div><div class='add'>+	struct bnge_irq		*irq_tbl;</div><div class='add'>+	u16			irqs_acquired;</div><div class='add'>+</div><div class='add'>+	struct bnge_auxr_priv	*aux_priv;</div><div class='add'>+	struct bnge_auxr_dev	*auxr_dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool bnge_is_roce_en(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;flags &amp; BNGE_EN_ROCE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bnge_is_agg_reqd(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	if (bd-&gt;netdev) {</div><div class='add'>+		struct bnge_net *bn = netdev_priv(bd-&gt;netdev);</div><div class='add'>+</div><div class='add'>+		if (bn-&gt;priv_flags &amp; BNGE_NET_EN_TPA ||</div><div class='add'>+		    bn-&gt;priv_flags &amp; BNGE_NET_EN_JUMBO)</div><div class='add'>+			return true;</div><div class='add'>+		else</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bnge_writeq(struct bnge_dev *bd, u64 val,</div><div class='add'>+			       void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	spin_lock(&amp;bd-&gt;db_lock);</div><div class='add'>+	lo_hi_writeq(val, addr);</div><div class='add'>+	spin_unlock(&amp;bd-&gt;db_lock);</div><div class='add'>+#else</div><div class='add'>+	writeq(val, addr);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For TX and RX ring doorbells */</div><div class='add'>+static inline void bnge_db_write(struct bnge_dev *bd, struct bnge_db_info *db,</div><div class='add'>+				 u32 idx)</div><div class='add'>+{</div><div class='add'>+	bnge_writeq(bd, db-&gt;db_key64 | DB_RING_IDX(db, idx),</div><div class='add'>+		    db-&gt;doorbell);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bnge_aux_registered(struct bnge_dev *bd);</div><div class='add'>+u16 bnge_aux_get_msix(struct bnge_dev *bd);</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c b/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c<br/>new file mode 100644<br/>index 000000000000..d64592b64e17<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_auxr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_auxr.c</a></div><div class='hunk'>@@ -0,0 +1,258 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_hwrm.h"</div><div class='add'>+#include "bnge_auxr.h"</div><div class='add'>+</div><div class='add'>+static DEFINE_IDA(bnge_aux_dev_ids);</div><div class='add'>+</div><div class='add'>+static void bnge_fill_msix_vecs(struct bnge_dev *bd,</div><div class='add'>+				struct bnge_msix_info *info)</div><div class='add'>+{</div><div class='add'>+	struct bnge_auxr_dev *auxr_dev = bd-&gt;auxr_dev;</div><div class='add'>+	int num_msix, i;</div><div class='add'>+</div><div class='add'>+	if (!auxr_dev-&gt;auxr_info-&gt;msix_requested) {</div><div class='add'>+		dev_warn(bd-&gt;dev, "Requested MSI-X vectors not allocated\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	num_msix = auxr_dev-&gt;auxr_info-&gt;msix_requested;</div><div class='add'>+	for (i = 0; i &lt; num_msix; i++) {</div><div class='add'>+		info[i].vector = bd-&gt;irq_tbl[i].vector;</div><div class='add'>+		info[i].db_offset = bd-&gt;db_offset;</div><div class='add'>+		info[i].ring_idx = i;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_register_dev(struct bnge_auxr_dev *auxr_dev,</div><div class='add'>+		      void *handle)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = pci_get_drvdata(auxr_dev-&gt;pdev);</div><div class='add'>+	struct bnge_auxr_info *auxr_info;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	netdev_lock(bd-&gt;netdev);</div><div class='add'>+	mutex_lock(&amp;auxr_dev-&gt;auxr_dev_lock);</div><div class='add'>+	if (!bd-&gt;irq_tbl) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bnge_aux_has_enough_resources(bd)) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	auxr_info = auxr_dev-&gt;auxr_info;</div><div class='add'>+	auxr_info-&gt;handle = handle;</div><div class='add'>+</div><div class='add'>+	auxr_info-&gt;msix_requested = bd-&gt;aux_num_msix;</div><div class='add'>+</div><div class='add'>+	bnge_fill_msix_vecs(bd, bd-&gt;auxr_dev-&gt;msix_info);</div><div class='add'>+	auxr_dev-&gt;flags |= BNGE_ARDEV_MSIX_ALLOC;</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;auxr_dev-&gt;auxr_dev_lock);</div><div class='add'>+	netdev_unlock(bd-&gt;netdev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bnge_register_dev);</div><div class='add'>+</div><div class='add'>+void bnge_unregister_dev(struct bnge_auxr_dev *auxr_dev)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = pci_get_drvdata(auxr_dev-&gt;pdev);</div><div class='add'>+	struct bnge_auxr_info *auxr_info;</div><div class='add'>+</div><div class='add'>+	auxr_info = auxr_dev-&gt;auxr_info;</div><div class='add'>+	netdev_lock(bd-&gt;netdev);</div><div class='add'>+	mutex_lock(&amp;auxr_dev-&gt;auxr_dev_lock);</div><div class='add'>+	if (auxr_info-&gt;msix_requested)</div><div class='add'>+		auxr_dev-&gt;flags &amp;= ~BNGE_ARDEV_MSIX_ALLOC;</div><div class='add'>+	auxr_info-&gt;msix_requested = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;auxr_dev-&gt;auxr_dev_lock);</div><div class='add'>+	netdev_unlock(bd-&gt;netdev);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bnge_unregister_dev);</div><div class='add'>+</div><div class='add'>+int bnge_send_msg(struct bnge_auxr_dev *auxr_dev, struct bnge_fw_msg *fw_msg)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = pci_get_drvdata(auxr_dev-&gt;pdev);</div><div class='add'>+	struct output *resp;</div><div class='add'>+	struct input *req;</div><div class='add'>+	u32 resp_len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, 0 /* don't care */);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_replace(bd, req, fw_msg-&gt;msg, fw_msg-&gt;msg_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto drop_req;</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_timeout(bd, req, fw_msg-&gt;timeout);</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	resp_len = le16_to_cpu(resp-&gt;resp_len);</div><div class='add'>+	if (resp_len) {</div><div class='add'>+		if (fw_msg-&gt;resp_max_len &lt; resp_len)</div><div class='add'>+			resp_len = fw_msg-&gt;resp_max_len;</div><div class='add'>+</div><div class='add'>+		memcpy(fw_msg-&gt;resp, resp, resp_len);</div><div class='add'>+	}</div><div class='add'>+drop_req:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bnge_send_msg);</div><div class='add'>+</div><div class='add'>+void bnge_rdma_aux_device_uninit(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_auxr_priv *aux_priv;</div><div class='add'>+	struct auxiliary_device *adev;</div><div class='add'>+</div><div class='add'>+	/* Skip if no auxiliary device init was done. */</div><div class='add'>+	if (!bd-&gt;aux_priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aux_priv = bd-&gt;aux_priv;</div><div class='add'>+	adev = &amp;aux_priv-&gt;aux_dev;</div><div class='add'>+	auxiliary_device_uninit(adev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_aux_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnge_auxr_priv *aux_priv =</div><div class='add'>+			container_of(dev, struct bnge_auxr_priv, aux_dev.dev);</div><div class='add'>+	struct bnge_dev *bd = pci_get_drvdata(aux_priv-&gt;auxr_dev-&gt;pdev);</div><div class='add'>+</div><div class='add'>+	ida_free(&amp;bnge_aux_dev_ids, aux_priv-&gt;id);</div><div class='add'>+	kfree(aux_priv-&gt;auxr_dev-&gt;auxr_info);</div><div class='add'>+	bd-&gt;auxr_dev = NULL;</div><div class='add'>+	kfree(aux_priv-&gt;auxr_dev);</div><div class='add'>+	kfree(aux_priv);</div><div class='add'>+	bd-&gt;aux_priv = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_rdma_aux_device_del(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	if (!bd-&gt;auxr_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	auxiliary_device_delete(&amp;bd-&gt;aux_priv-&gt;aux_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_auxr_dev_info(struct bnge_auxr_dev *auxr_dev,</div><div class='add'>+				   struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	auxr_dev-&gt;pdev = bd-&gt;pdev;</div><div class='add'>+	auxr_dev-&gt;l2_db_size = bd-&gt;db_size;</div><div class='add'>+	auxr_dev-&gt;l2_db_size_nc = bd-&gt;db_size;</div><div class='add'>+	auxr_dev-&gt;l2_db_offset = bd-&gt;db_offset;</div><div class='add'>+	mutex_init(&amp;auxr_dev-&gt;auxr_dev_lock);</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_ROCE_V1)</div><div class='add'>+		auxr_dev-&gt;flags |= BNGE_ARDEV_ROCEV1_SUPP;</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_ROCE_V2)</div><div class='add'>+		auxr_dev-&gt;flags |= BNGE_ARDEV_ROCEV2_SUPP;</div><div class='add'>+</div><div class='add'>+	auxr_dev-&gt;chip_num = bd-&gt;chip_num;</div><div class='add'>+	auxr_dev-&gt;hw_ring_stats_size = bd-&gt;hw_ring_stats_size;</div><div class='add'>+	auxr_dev-&gt;pf_port_id = bd-&gt;pf.port_id;</div><div class='add'>+	auxr_dev-&gt;en_state = bd-&gt;state;</div><div class='add'>+	auxr_dev-&gt;bar0 = bd-&gt;bar0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_rdma_aux_device_add(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct auxiliary_device *aux_dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bd-&gt;auxr_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aux_dev = &amp;bd-&gt;aux_priv-&gt;aux_dev;</div><div class='add'>+	rc = auxiliary_device_add(aux_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_warn(bd-&gt;dev, "Failed to add auxiliary device for ROCE\n");</div><div class='add'>+		auxiliary_device_uninit(aux_dev);</div><div class='add'>+		bd-&gt;flags &amp;= ~BNGE_EN_ROCE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd-&gt;auxr_dev-&gt;net = bd-&gt;netdev;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_rdma_aux_device_init(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct auxiliary_device *aux_dev;</div><div class='add'>+	struct bnge_auxr_info *auxr_info;</div><div class='add'>+	struct bnge_auxr_priv *aux_priv;</div><div class='add'>+	struct bnge_auxr_dev *auxr_dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bnge_is_roce_en(bd))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aux_priv = kzalloc(sizeof(*aux_priv), GFP_KERNEL);</div><div class='add'>+	if (!aux_priv)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	aux_priv-&gt;id = ida_alloc(&amp;bnge_aux_dev_ids, GFP_KERNEL);</div><div class='add'>+	if (aux_priv-&gt;id &lt; 0) {</div><div class='add'>+		dev_warn(bd-&gt;dev, "ida alloc failed for aux device\n");</div><div class='add'>+		kfree(aux_priv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aux_dev = &amp;aux_priv-&gt;aux_dev;</div><div class='add'>+	aux_dev-&gt;id = aux_priv-&gt;id;</div><div class='add'>+	aux_dev-&gt;name = "rdma";</div><div class='add'>+	aux_dev-&gt;dev.parent = &amp;bd-&gt;pdev-&gt;dev;</div><div class='add'>+	aux_dev-&gt;dev.release = bnge_aux_dev_release;</div><div class='add'>+</div><div class='add'>+	rc = auxiliary_device_init(aux_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		ida_free(&amp;bnge_aux_dev_ids, aux_priv-&gt;id);</div><div class='add'>+		kfree(aux_priv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	bd-&gt;aux_priv = aux_priv;</div><div class='add'>+</div><div class='add'>+	auxr_dev = kzalloc(sizeof(*auxr_dev), GFP_KERNEL);</div><div class='add'>+	if (!auxr_dev)</div><div class='add'>+		goto aux_dev_uninit;</div><div class='add'>+</div><div class='add'>+	aux_priv-&gt;auxr_dev = auxr_dev;</div><div class='add'>+</div><div class='add'>+	auxr_info = kzalloc(sizeof(*auxr_info), GFP_KERNEL);</div><div class='add'>+	if (!auxr_info)</div><div class='add'>+		goto aux_dev_uninit;</div><div class='add'>+</div><div class='add'>+	auxr_dev-&gt;auxr_info = auxr_info;</div><div class='add'>+	bd-&gt;auxr_dev = auxr_dev;</div><div class='add'>+	bnge_set_auxr_dev_info(auxr_dev, bd);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+aux_dev_uninit:</div><div class='add'>+	auxiliary_device_uninit(aux_dev);</div><div class='add'>+exit:</div><div class='add'>+	bd-&gt;flags &amp;= ~BNGE_EN_ROCE;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_auxr.h b/drivers/net/ethernet/broadcom/bnge/bnge_auxr.h<br/>new file mode 100644<br/>index 000000000000..6c5c15ef2b0a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_auxr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_auxr.h</a></div><div class='hunk'>@@ -0,0 +1,84 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_AUXR_H_</div><div class='add'>+#define _BNGE_AUXR_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+</div><div class='add'>+#define BNGE_MIN_ROCE_CP_RINGS	2</div><div class='add'>+#define BNGE_MIN_ROCE_STAT_CTXS	1</div><div class='add'>+</div><div class='add'>+#define BNGE_MAX_ROCE_MSIX	64</div><div class='add'>+</div><div class='add'>+struct hwrm_async_event_cmpl;</div><div class='add'>+struct bnge;</div><div class='add'>+</div><div class='add'>+struct bnge_msix_info {</div><div class='add'>+	u32	vector;</div><div class='add'>+	u32	ring_idx;</div><div class='add'>+	u32	db_offset;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_fw_msg {</div><div class='add'>+	void	*msg;</div><div class='add'>+	int	msg_len;</div><div class='add'>+	void	*resp;</div><div class='add'>+	int	resp_max_len;</div><div class='add'>+	int	timeout;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_auxr_info {</div><div class='add'>+	void		*handle;</div><div class='add'>+	u16		msix_requested;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BNGE_ARDEV_ROCEV1_SUPP		= BIT(0),</div><div class='add'>+	BNGE_ARDEV_ROCEV2_SUPP		= BIT(1),</div><div class='add'>+	BNGE_ARDEV_MSIX_ALLOC		= BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_ARDEV_ROCE_SUPP	(BNGE_ARDEV_ROCEV1_SUPP | \</div><div class='add'>+				 BNGE_ARDEV_ROCEV2_SUPP)</div><div class='add'>+</div><div class='add'>+struct bnge_auxr_dev {</div><div class='add'>+	struct net_device	*net;</div><div class='add'>+	struct pci_dev		*pdev;</div><div class='add'>+	void __iomem		*bar0;</div><div class='add'>+</div><div class='add'>+	struct bnge_msix_info	msix_info[BNGE_MAX_ROCE_MSIX];</div><div class='add'>+</div><div class='add'>+	u32 flags;</div><div class='add'>+</div><div class='add'>+	struct bnge_auxr_info	*auxr_info;</div><div class='add'>+</div><div class='add'>+	/* Doorbell BAR size in bytes mapped by L2 driver. */</div><div class='add'>+	int	l2_db_size;</div><div class='add'>+	/* Doorbell BAR size in bytes mapped as non-cacheable. */</div><div class='add'>+	int	l2_db_size_nc;</div><div class='add'>+	/* Doorbell offset in bytes within l2_db_size_nc. */</div><div class='add'>+	int	l2_db_offset;</div><div class='add'>+</div><div class='add'>+	u16		chip_num;</div><div class='add'>+	u16		hw_ring_stats_size;</div><div class='add'>+	u16		pf_port_id;</div><div class='add'>+	unsigned long	en_state;</div><div class='add'>+</div><div class='add'>+	u16	auxr_num_msix_vec;</div><div class='add'>+	u16	auxr_num_ctxs;</div><div class='add'>+</div><div class='add'>+	/* serialize auxr operations */</div><div class='add'>+	struct mutex	auxr_dev_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void bnge_rdma_aux_device_uninit(struct bnge_dev *bdev);</div><div class='add'>+void bnge_rdma_aux_device_del(struct bnge_dev *bdev);</div><div class='add'>+void bnge_rdma_aux_device_add(struct bnge_dev *bdev);</div><div class='add'>+void bnge_rdma_aux_device_init(struct bnge_dev *bdev);</div><div class='add'>+int bnge_register_dev(struct bnge_auxr_dev *adev,</div><div class='add'>+		      void *handle);</div><div class='add'>+void bnge_unregister_dev(struct bnge_auxr_dev *adev);</div><div class='add'>+int bnge_send_msg(struct bnge_auxr_dev *adev, struct bnge_fw_msg *fw_msg);</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_AUXR_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_core.c b/drivers/net/ethernet/broadcom/bnge/bnge_core.c<br/>new file mode 100644<br/>index 000000000000..c94e132bebc8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_core.c</a></div><div class='hunk'>@@ -0,0 +1,420 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/crash_dump.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_devlink.h"</div><div class='add'>+#include "bnge_hwrm.h"</div><div class='add'>+#include "bnge_hwrm_lib.h"</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_DESCRIPTION(DRV_SUMMARY);</div><div class='add'>+</div><div class='add'>+char bnge_driver_name[] = DRV_NAME;</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	char *name;</div><div class='add'>+} board_info[] = {</div><div class='add'>+	[BCM57708] = { "Broadcom BCM57708 50Gb/100Gb/200Gb/400Gb/800Gb Ethernet" },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct pci_device_id bnge_pci_tbl[] = {</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1780), .driver_data = BCM57708 },</div><div class='add'>+	/* Required last entry */</div><div class='add'>+	{0, }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(pci, bnge_pci_tbl);</div><div class='add'>+</div><div class='add'>+static void bnge_print_device_info(struct pci_dev *pdev, enum board_idx idx)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "%s found at mem %lx\n", board_info[idx].name,</div><div class='add'>+		 (long)pci_resource_start(pdev, 0));</div><div class='add'>+</div><div class='add'>+	pcie_print_link_status(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bnge_aux_registered(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_auxr_dev *ba_dev = bd-&gt;auxr_dev;</div><div class='add'>+</div><div class='add'>+	if (ba_dev &amp;&amp; ba_dev-&gt;auxr_info-&gt;msix_requested)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_nvm_cfg_ver_get(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_dev_info_output nvm_info;</div><div class='add'>+</div><div class='add'>+	if (!bnge_hwrm_nvm_dev_info(bd, &amp;nvm_info))</div><div class='add'>+		snprintf(bd-&gt;nvm_cfg_ver, FW_VER_STR_LEN, "%d.%d.%d",</div><div class='add'>+			 nvm_info.nvm_cfg_ver_maj, nvm_info.nvm_cfg_ver_min,</div><div class='add'>+			 nvm_info.nvm_cfg_ver_upd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_func_qcaps(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_func_qcaps(bd);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_queue_qportcfg(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "query qportcfg failure rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_func_resc_qcaps(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "query resc caps failure rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_func_qcfg(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "query config failure rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_vnic_qcaps(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "vnic caps failure rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_fw_unregister_dev(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	/* ctx mem free after unrgtr only */</div><div class='add'>+	bnge_hwrm_func_drv_unrgtr(bd);</div><div class='add'>+	bnge_free_ctx_mem(bd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_dflt_rss_hash_type(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;rss_hash_cfg = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_fw_register_dev(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bd-&gt;fw_cap = 0;</div><div class='add'>+	rc = bnge_hwrm_ver_get(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Get Version command failed rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnge_nvm_cfg_ver_get(bd);</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_func_reset(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Failed to reset function rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_fw_set_time(bd);</div><div class='add'>+</div><div class='add'>+	rc =  bnge_hwrm_func_drv_rgtr(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Failed to rgtr with firmware rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_ctx_mem(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Failed to allocate ctx mem rc: %d\n", rc);</div><div class='add'>+		goto err_func_unrgtr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the resources and configuration from firmware */</div><div class='add'>+	rc = bnge_func_qcaps(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Failed initial configuration rc: %d\n", rc);</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto err_func_unrgtr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnge_set_dflt_rss_hash_type(bd);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_func_unrgtr:</div><div class='add'>+	bnge_fw_unregister_dev(bd);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_pci_disable(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	pci_release_regions(pdev);</div><div class='add'>+	if (pci_is_enabled(pdev))</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_pci_enable(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = pci_enable_device(pdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot enable PCI device, aborting\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(pci_resource_flags(pdev, 0) &amp; IORESOURCE_MEM)) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev,</div><div class='add'>+			"Cannot find PCI device base address, aborting\n");</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto err_pci_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = pci_request_regions(pdev, bnge_driver_name);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot obtain PCI resources, aborting\n");</div><div class='add'>+		goto err_pci_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+</div><div class='add'>+	pci_set_master(pdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_pci_disable:</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_unmap_bars(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;bar1) {</div><div class='add'>+		pci_iounmap(pdev, bd-&gt;bar1);</div><div class='add'>+		bd-&gt;bar1 = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;bar0) {</div><div class='add'>+		pci_iounmap(pdev, bd-&gt;bar0);</div><div class='add'>+		bd-&gt;bar0 = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_max_func_irqs(struct bnge_dev *bd,</div><div class='add'>+				   unsigned int max_irqs)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;hw_resc.max_irqs = max_irqs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_get_max_irq(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	u16 ctrl;</div><div class='add'>+</div><div class='add'>+	pci_read_config_word(pdev, pdev-&gt;msix_cap + PCI_MSIX_FLAGS, &amp;ctrl);</div><div class='add'>+	return (ctrl &amp; PCI_MSIX_FLAGS_QSIZE) + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_map_db_bar(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	if (!bd-&gt;db_size)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	bd-&gt;bar1 = pci_iomap(bd-&gt;pdev, 2, bd-&gt;db_size);</div><div class='add'>+	if (!bd-&gt;bar1)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_irqs;</div><div class='add'>+	struct bnge_dev *bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (pci_is_bridge(pdev))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!pdev-&gt;msix_cap) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "MSIX capability missing, aborting\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_kdump_kernel()) {</div><div class='add'>+		pci_clear_master(pdev);</div><div class='add'>+		pcie_flr(pdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_pci_enable(pdev);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_print_device_info(pdev, ent-&gt;driver_data);</div><div class='add'>+</div><div class='add'>+	bd = bnge_devlink_alloc(pdev);</div><div class='add'>+	if (!bd) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Devlink allocation failed\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_pci_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd-&gt;bar0 = pci_ioremap_bar(pdev, 0);</div><div class='add'>+	if (!bd-&gt;bar0) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed mapping BAR-0, aborting\n");</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_devl_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_init_hwrm_resources(bd);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_bar_unmap;</div><div class='add'>+</div><div class='add'>+	rc = bnge_fw_register_dev(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed to register with firmware rc = %d\n", rc);</div><div class='add'>+		goto err_hwrm_cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnge_devlink_register(bd);</div><div class='add'>+</div><div class='add'>+	max_irqs = bnge_get_max_irq(pdev);</div><div class='add'>+	bnge_set_max_func_irqs(bd, max_irqs);</div><div class='add'>+</div><div class='add'>+	bnge_aux_init_dflt_config(bd);</div><div class='add'>+</div><div class='add'>+	rc = bnge_net_init_dflt_config(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error setting up default cfg to netdev rc = %d\n",</div><div class='add'>+			rc);</div><div class='add'>+		goto err_fw_reg;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_map_db_bar(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Failed mapping doorbell BAR rc = %d, aborting\n",</div><div class='add'>+			rc);</div><div class='add'>+		goto err_config_uninit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	spin_lock_init(&amp;bd-&gt;db_lock);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	bnge_rdma_aux_device_init(bd);</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_irqs(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Error IRQ allocation rc = %d\n", rc);</div><div class='add'>+		goto err_uninit_auxr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_netdev_alloc(bd, max_irqs);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+</div><div class='add'>+	bnge_rdma_aux_device_add(bd);</div><div class='add'>+</div><div class='add'>+	pci_save_state(pdev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	bnge_free_irqs(bd);</div><div class='add'>+</div><div class='add'>+err_uninit_auxr:</div><div class='add'>+	bnge_rdma_aux_device_uninit(bd);</div><div class='add'>+</div><div class='add'>+err_config_uninit:</div><div class='add'>+	bnge_net_uninit_dflt_config(bd);</div><div class='add'>+</div><div class='add'>+err_fw_reg:</div><div class='add'>+	bnge_devlink_unregister(bd);</div><div class='add'>+	bnge_fw_unregister_dev(bd);</div><div class='add'>+</div><div class='add'>+err_hwrm_cleanup:</div><div class='add'>+	bnge_cleanup_hwrm_resources(bd);</div><div class='add'>+</div><div class='add'>+err_bar_unmap:</div><div class='add'>+	bnge_unmap_bars(pdev);</div><div class='add'>+</div><div class='add'>+err_devl_free:</div><div class='add'>+	bnge_devlink_free(bd);</div><div class='add'>+</div><div class='add'>+err_pci_disable:</div><div class='add'>+	bnge_pci_disable(pdev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_remove_one(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	bnge_rdma_aux_device_del(bd);</div><div class='add'>+</div><div class='add'>+	bnge_netdev_free(bd);</div><div class='add'>+</div><div class='add'>+	bnge_free_irqs(bd);</div><div class='add'>+</div><div class='add'>+	bnge_rdma_aux_device_uninit(bd);</div><div class='add'>+</div><div class='add'>+	bnge_net_uninit_dflt_config(bd);</div><div class='add'>+</div><div class='add'>+	bnge_devlink_unregister(bd);</div><div class='add'>+</div><div class='add'>+	bnge_fw_unregister_dev(bd);</div><div class='add'>+</div><div class='add'>+	bnge_cleanup_hwrm_resources(bd);</div><div class='add'>+</div><div class='add'>+	bnge_unmap_bars(pdev);</div><div class='add'>+</div><div class='add'>+	bnge_devlink_free(bd);</div><div class='add'>+</div><div class='add'>+	bnge_pci_disable(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	pci_disable_device(pdev);</div><div class='add'>+</div><div class='add'>+	if (system_state == SYSTEM_POWER_OFF) {</div><div class='add'>+		pci_wake_from_d3(pdev, 0);</div><div class='add'>+		pci_set_power_state(pdev, PCI_D3hot);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct pci_driver bnge_driver = {</div><div class='add'>+	.name		= bnge_driver_name,</div><div class='add'>+	.id_table	= bnge_pci_tbl,</div><div class='add'>+	.probe		= bnge_probe_one,</div><div class='add'>+	.remove		= bnge_remove_one,</div><div class='add'>+	.shutdown	= bnge_shutdown,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init bnge_init_module(void)</div><div class='add'>+{</div><div class='add'>+	return pci_register_driver(&amp;bnge_driver);</div><div class='add'>+}</div><div class='add'>+module_init(bnge_init_module);</div><div class='add'>+</div><div class='add'>+static void __exit bnge_exit_module(void)</div><div class='add'>+{</div><div class='add'>+	pci_unregister_driver(&amp;bnge_driver);</div><div class='add'>+}</div><div class='add'>+module_exit(bnge_exit_module);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_db.h b/drivers/net/ethernet/broadcom/bnge/bnge_db.h<br/>new file mode 100644<br/>index 000000000000..950ed582f1d8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_db.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_db.h</a></div><div class='hunk'>@@ -0,0 +1,34 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_DB_H_</div><div class='add'>+#define _BNGE_DB_H_</div><div class='add'>+</div><div class='add'>+/* 64-bit doorbell */</div><div class='add'>+#define DBR_EPOCH_SFT					24</div><div class='add'>+#define DBR_TOGGLE_SFT					25</div><div class='add'>+#define DBR_XID_SFT					32</div><div class='add'>+#define DBR_PATH_L2					(0x1ULL &lt;&lt; 56)</div><div class='add'>+#define DBR_VALID					(0x1ULL &lt;&lt; 58)</div><div class='add'>+#define DBR_TYPE_SQ					(0x0ULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_SRQ					(0x2ULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_CQ					(0x4ULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_CQ_ARMALL				(0x6ULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_NQ					(0xaULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_NQ_ARM					(0xbULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_NQ_MASK				(0xeULL &lt;&lt; 60)</div><div class='add'>+</div><div class='add'>+struct bnge_db_info {</div><div class='add'>+	void __iomem		*doorbell;</div><div class='add'>+	u64			db_key64;</div><div class='add'>+	u32			db_ring_mask;</div><div class='add'>+	u32			db_epoch_mask;</div><div class='add'>+	u8			db_epoch_shift;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DB_EPOCH(db, idx)	(((idx) &amp; (db)-&gt;db_epoch_mask) &lt;&lt;	\</div><div class='add'>+				 ((db)-&gt;db_epoch_shift))</div><div class='add'>+#define DB_RING_IDX(db, idx)	(((idx) &amp; (db)-&gt;db_ring_mask) |		\</div><div class='add'>+				 DB_EPOCH(db, idx))</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_DB_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_devlink.c b/drivers/net/ethernet/broadcom/bnge/bnge_devlink.c<br/>new file mode 100644<br/>index 000000000000..a987afebd64d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_devlink.c</a></div><div class='hunk'>@@ -0,0 +1,306 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_devlink.h"</div><div class='add'>+#include "bnge_hwrm_lib.h"</div><div class='add'>+</div><div class='add'>+static int bnge_dl_info_put(struct bnge_dev *bd, struct devlink_info_req *req,</div><div class='add'>+			    enum bnge_dl_version_type type, const char *key,</div><div class='add'>+			    char *buf)</div><div class='add'>+{</div><div class='add'>+	if (!strlen(buf))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(key, DEVLINK_INFO_VERSION_GENERIC_FW_NCSI) ||</div><div class='add'>+	    !strcmp(key, DEVLINK_INFO_VERSION_GENERIC_FW_ROCE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BNGE_VERSION_FIXED:</div><div class='add'>+		return devlink_info_version_fixed_put(req, key, buf);</div><div class='add'>+	case BNGE_VERSION_RUNNING:</div><div class='add'>+		return devlink_info_version_running_put(req, key, buf);</div><div class='add'>+	case BNGE_VERSION_STORED:</div><div class='add'>+		return devlink_info_version_stored_put(req, key, buf);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_vpd_read_info(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bd-&gt;pdev;</div><div class='add'>+	unsigned int vpd_size, kw_len;</div><div class='add'>+	int pos, size;</div><div class='add'>+	u8 *vpd_data;</div><div class='add'>+</div><div class='add'>+	vpd_data = pci_vpd_alloc(pdev, &amp;vpd_size);</div><div class='add'>+	if (IS_ERR(vpd_data)) {</div><div class='add'>+		pci_warn(pdev, "Unable to read VPD\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,</div><div class='add'>+					   PCI_VPD_RO_KEYWORD_PARTNO, &amp;kw_len);</div><div class='add'>+	if (pos &lt; 0)</div><div class='add'>+		goto read_sn;</div><div class='add'>+</div><div class='add'>+	size = min_t(int, kw_len, BNGE_VPD_FLD_LEN - 1);</div><div class='add'>+	memcpy(bd-&gt;board_partno, &amp;vpd_data[pos], size);</div><div class='add'>+</div><div class='add'>+read_sn:</div><div class='add'>+	pos = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,</div><div class='add'>+					   PCI_VPD_RO_KEYWORD_SERIALNO,</div><div class='add'>+					   &amp;kw_len);</div><div class='add'>+	if (pos &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	size = min_t(int, kw_len, BNGE_VPD_FLD_LEN - 1);</div><div class='add'>+	memcpy(bd-&gt;board_serialno, &amp;vpd_data[pos], size);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	kfree(vpd_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HWRM_FW_VER_STR_LEN	16</div><div class='add'>+</div><div class='add'>+static int bnge_devlink_info_get(struct devlink *devlink,</div><div class='add'>+				 struct devlink_info_req *req,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_dev_info_output nvm_dev_info;</div><div class='add'>+	struct bnge_dev *bd = devlink_priv(devlink);</div><div class='add'>+	struct hwrm_ver_get_output *ver_resp;</div><div class='add'>+	char mgmt_ver[FW_VER_STR_LEN];</div><div class='add'>+	char roce_ver[FW_VER_STR_LEN];</div><div class='add'>+	char ncsi_ver[FW_VER_STR_LEN];</div><div class='add'>+	char buf[32];</div><div class='add'>+</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;dsn) {</div><div class='add'>+		char buf[32];</div><div class='add'>+		u8 dsn[8];</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		put_unaligned_le64(bd-&gt;dsn, dsn);</div><div class='add'>+		sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",</div><div class='add'>+			dsn[7], dsn[6], dsn[5], dsn[4],</div><div class='add'>+			dsn[3], dsn[2], dsn[1], dsn[0]);</div><div class='add'>+		rc = devlink_info_serial_number_put(req, buf);</div><div class='add'>+		if (rc) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Failed to set dsn");</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strlen(bd-&gt;board_serialno)) {</div><div class='add'>+		rc = devlink_info_board_serial_number_put(req,</div><div class='add'>+							  bd-&gt;board_serialno);</div><div class='add'>+		if (rc) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Failed to set board serial number");</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_FIXED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_BOARD_ID,</div><div class='add'>+			      bd-&gt;board_partno);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to set board part number");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* More information from HWRM ver get command */</div><div class='add'>+	sprintf(buf, "%X", bd-&gt;chip_num);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_FIXED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID, buf);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to set asic id");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ver_resp = &amp;bd-&gt;ver_resp;</div><div class='add'>+	sprintf(buf, "%c%d", 'A' + ver_resp-&gt;chip_rev, ver_resp-&gt;chip_metal);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_FIXED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_ASIC_REV, buf);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to set asic info");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,</div><div class='add'>+			      bd-&gt;nvm_cfg_ver);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to set firmware version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	strncat(buf, ver_resp-&gt;active_pkg_name, HWRM_FW_VER_STR_LEN);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set firmware generic version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ver_resp-&gt;flags &amp; VER_GET_RESP_FLAGS_EXT_VER_AVAIL) {</div><div class='add'>+		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_major, ver_resp-&gt;hwrm_fw_minor,</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_build, ver_resp-&gt;hwrm_fw_patch);</div><div class='add'>+</div><div class='add'>+		snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_major, ver_resp-&gt;mgmt_fw_minor,</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_build, ver_resp-&gt;mgmt_fw_patch);</div><div class='add'>+</div><div class='add'>+		snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;roce_fw_major, ver_resp-&gt;roce_fw_minor,</div><div class='add'>+			 ver_resp-&gt;roce_fw_build, ver_resp-&gt;roce_fw_patch);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_maj_8b, ver_resp-&gt;hwrm_fw_min_8b,</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_bld_8b, ver_resp-&gt;hwrm_fw_rsvd_8b);</div><div class='add'>+</div><div class='add'>+		snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_maj_8b, ver_resp-&gt;mgmt_fw_min_8b,</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_bld_8b, ver_resp-&gt;mgmt_fw_rsvd_8b);</div><div class='add'>+</div><div class='add'>+		snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;roce_fw_maj_8b, ver_resp-&gt;roce_fw_min_8b,</div><div class='add'>+			 ver_resp-&gt;roce_fw_bld_8b, ver_resp-&gt;roce_fw_rsvd_8b);</div><div class='add'>+	}</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set firmware mgmt version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT_API,</div><div class='add'>+			      bd-&gt;hwrm_ver_supp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set firmware mgmt api version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set ncsi firmware version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to set roce firmware version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_nvm_dev_info(bd, &amp;nvm_dev_info);</div><div class='add'>+	if (!(nvm_dev_info.flags &amp; NVM_GET_DEV_INFO_RESP_FLAGS_FW_VER_VALID))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	strncat(buf, nvm_dev_info.pkg_name, HWRM_FW_VER_STR_LEN);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set roce firmware version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 nvm_dev_info.hwrm_fw_major, nvm_dev_info.hwrm_fw_minor,</div><div class='add'>+		 nvm_dev_info.hwrm_fw_build, nvm_dev_info.hwrm_fw_patch);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set stored firmware version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 nvm_dev_info.mgmt_fw_major, nvm_dev_info.mgmt_fw_minor,</div><div class='add'>+		 nvm_dev_info.mgmt_fw_build, nvm_dev_info.mgmt_fw_patch);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set stored ncsi firmware version");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 nvm_dev_info.roce_fw_major, nvm_dev_info.roce_fw_minor,</div><div class='add'>+		 nvm_dev_info.roce_fw_build, nvm_dev_info.roce_fw_patch);</div><div class='add'>+	rc = bnge_dl_info_put(bd, req, BNGE_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to set stored roce firmware version");</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops bnge_devlink_ops = {</div><div class='add'>+	.info_get = bnge_devlink_info_get,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void bnge_devlink_free(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = priv_to_devlink(bd);</div><div class='add'>+</div><div class='add'>+	devlink_free(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct bnge_dev *bnge_devlink_alloc(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	struct bnge_dev *bd;</div><div class='add'>+</div><div class='add'>+	devlink = devlink_alloc(&amp;bnge_devlink_ops, sizeof(*bd), &amp;pdev-&gt;dev);</div><div class='add'>+	if (!devlink)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	bd = devlink_priv(devlink);</div><div class='add'>+	pci_set_drvdata(pdev, bd);</div><div class='add'>+	bd-&gt;dev = &amp;pdev-&gt;dev;</div><div class='add'>+	bd-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	bd-&gt;dsn = pci_get_dsn(pdev);</div><div class='add'>+	if (!bd-&gt;dsn)</div><div class='add'>+		pci_warn(pdev, "Failed to get DSN\n");</div><div class='add'>+</div><div class='add'>+	bnge_vpd_read_info(bd);</div><div class='add'>+</div><div class='add'>+	return bd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_devlink_register(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = priv_to_devlink(bd);</div><div class='add'>+	devlink_register(devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_devlink_unregister(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct devlink *devlink = priv_to_devlink(bd);</div><div class='add'>+	devlink_unregister(devlink);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_devlink.h b/drivers/net/ethernet/broadcom/bnge/bnge_devlink.h<br/>new file mode 100644<br/>index 000000000000..c6575255e650<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_devlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_devlink.h</a></div><div class='hunk'>@@ -0,0 +1,18 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_DEVLINK_H_</div><div class='add'>+#define _BNGE_DEVLINK_H_</div><div class='add'>+</div><div class='add'>+enum bnge_dl_version_type {</div><div class='add'>+	BNGE_VERSION_FIXED,</div><div class='add'>+	BNGE_VERSION_RUNNING,</div><div class='add'>+	BNGE_VERSION_STORED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void bnge_devlink_free(struct bnge_dev *bd);</div><div class='add'>+struct bnge_dev *bnge_devlink_alloc(struct pci_dev *pdev);</div><div class='add'>+void bnge_devlink_register(struct bnge_dev *bd);</div><div class='add'>+void bnge_devlink_unregister(struct bnge_dev *bd);</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_DEVLINK_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c b/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c<br/>new file mode 100644<br/>index 000000000000..569371c1b4f2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,33 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_ethtool.h"</div><div class='add'>+</div><div class='add'>+static void bnge_get_drvinfo(struct net_device *dev,</div><div class='add'>+			     struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	struct bnge_net *bn = netdev_priv(dev);</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;fw_version, bd-&gt;fw_ver_str, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(bd-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops bnge_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= bnge_get_drvinfo,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void bnge_set_ethtool_ops(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;bnge_ethtool_ops;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h b/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h<br/>new file mode 100644<br/>index 000000000000..21e96a0976d5<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_ethtool.h</a></div><div class='hunk'>@@ -0,0 +1,9 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_ETHTOOL_H_</div><div class='add'>+#define _BNGE_ETHTOOL_H_</div><div class='add'>+</div><div class='add'>+void bnge_set_ethtool_ops(struct net_device *dev);</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_ETHTOOL_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c<br/>new file mode 100644<br/>index 000000000000..c3087e5cd875<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm.c</a></div><div class='hunk'>@@ -0,0 +1,548 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_hwrm.h"</div><div class='add'>+</div><div class='add'>+static u64 bnge_cal_sentinel(struct bnge_hwrm_ctx *ctx, u16 req_type)</div><div class='add'>+{</div><div class='add'>+	return (((uintptr_t)ctx) + req_type) ^ BNGE_HWRM_SENTINEL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_req_create(struct bnge_dev *bd, void **req, u16 req_type,</div><div class='add'>+			 u32 req_len)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+	u8 *req_addr;</div><div class='add'>+</div><div class='add'>+	if (req_len &gt; BNGE_HWRM_CTX_OFFSET)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	req_addr = dma_pool_alloc(bd-&gt;hwrm_dma_pool, GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+				  &amp;dma_handle);</div><div class='add'>+	if (!req_addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx = (struct bnge_hwrm_ctx *)(req_addr + BNGE_HWRM_CTX_OFFSET);</div><div class='add'>+	/* safety first, sentinel used to check for invalid requests */</div><div class='add'>+	ctx-&gt;sentinel = bnge_cal_sentinel(ctx, req_type);</div><div class='add'>+	ctx-&gt;req_len = req_len;</div><div class='add'>+	ctx-&gt;req = (struct input *)req_addr;</div><div class='add'>+	ctx-&gt;resp = (struct output *)(req_addr + BNGE_HWRM_RESP_OFFSET);</div><div class='add'>+	ctx-&gt;dma_handle = dma_handle;</div><div class='add'>+	ctx-&gt;flags = 0; /* __GFP_ZERO, but be explicit regarding ownership */</div><div class='add'>+	ctx-&gt;timeout = bd-&gt;hwrm_cmd_timeout ?: BNGE_DFLT_HWRM_CMD_TIMEOUT;</div><div class='add'>+	ctx-&gt;allocated = BNGE_HWRM_DMA_SIZE - BNGE_HWRM_CTX_OFFSET;</div><div class='add'>+	ctx-&gt;gfp = GFP_KERNEL;</div><div class='add'>+	ctx-&gt;slice_addr = NULL;</div><div class='add'>+</div><div class='add'>+	/* initialize common request fields */</div><div class='add'>+	ctx-&gt;req-&gt;req_type = cpu_to_le16(req_type);</div><div class='add'>+	ctx-&gt;req-&gt;resp_addr = cpu_to_le64(dma_handle + BNGE_HWRM_RESP_OFFSET);</div><div class='add'>+	ctx-&gt;req-&gt;cmpl_ring = cpu_to_le16(BNGE_HWRM_NO_CMPL_RING);</div><div class='add'>+	ctx-&gt;req-&gt;target_id = cpu_to_le16(BNGE_HWRM_TARGET);</div><div class='add'>+	*req = ctx-&gt;req;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnge_hwrm_ctx *__hwrm_ctx_get(struct bnge_dev *bd, u8 *req_addr)</div><div class='add'>+{</div><div class='add'>+	void *ctx_addr = req_addr + BNGE_HWRM_CTX_OFFSET;</div><div class='add'>+	struct input *req = (struct input *)req_addr;</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = ctx_addr;</div><div class='add'>+	u64 sentinel;</div><div class='add'>+</div><div class='add'>+	if (!req) {</div><div class='add'>+		dev_err(bd-&gt;dev, "null HWRM request");</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* HWRM API has no type safety, verify sentinel to validate address */</div><div class='add'>+	sentinel = bnge_cal_sentinel(ctx, le16_to_cpu(req-&gt;req_type));</div><div class='add'>+	if (ctx-&gt;sentinel != sentinel) {</div><div class='add'>+		dev_err(bd-&gt;dev, "HWRM sentinel mismatch, req_type = %u\n",</div><div class='add'>+			(u32)le16_to_cpu(req-&gt;req_type));</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_req_timeout(struct bnge_dev *bd,</div><div class='add'>+			   void *req, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		ctx-&gt;timeout = timeout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_req_alloc_flags(struct bnge_dev *bd, void *req, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		ctx-&gt;gfp = gfp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_req_replace(struct bnge_dev *bd, void *req, void *new_req,</div><div class='add'>+			  u32 len)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+	struct input *internal_req = req;</div><div class='add'>+	u16 req_type;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (len &gt; BNGE_HWRM_CTX_OFFSET)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	/* free any existing slices */</div><div class='add'>+	ctx-&gt;allocated = BNGE_HWRM_DMA_SIZE - BNGE_HWRM_CTX_OFFSET;</div><div class='add'>+	if (ctx-&gt;slice_addr) {</div><div class='add'>+		dma_free_coherent(bd-&gt;dev, ctx-&gt;slice_size,</div><div class='add'>+				  ctx-&gt;slice_addr, ctx-&gt;slice_handle);</div><div class='add'>+		ctx-&gt;slice_addr = NULL;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;gfp = GFP_KERNEL;</div><div class='add'>+</div><div class='add'>+	if ((bd-&gt;fw_cap &amp; BNGE_FW_CAP_SHORT_CMD) || len &gt; BNGE_HWRM_MAX_REQ_LEN) {</div><div class='add'>+		memcpy(internal_req, new_req, len);</div><div class='add'>+	} else {</div><div class='add'>+		internal_req-&gt;req_type = ((struct input *)new_req)-&gt;req_type;</div><div class='add'>+		ctx-&gt;req = new_req;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;req_len = len;</div><div class='add'>+	ctx-&gt;req-&gt;resp_addr = cpu_to_le64(ctx-&gt;dma_handle +</div><div class='add'>+					  BNGE_HWRM_RESP_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* update sentinel for potentially new request type */</div><div class='add'>+	req_type = le16_to_cpu(internal_req-&gt;req_type);</div><div class='add'>+	ctx-&gt;sentinel = bnge_cal_sentinel(ctx, req_type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_req_flags(struct bnge_dev *bd, void *req,</div><div class='add'>+			 enum bnge_hwrm_ctx_flags flags)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		ctx-&gt;flags |= (flags &amp; BNGE_HWRM_API_FLAGS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *bnge_hwrm_req_hold(struct bnge_dev *bd, void *req)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+	struct input *input = (struct input *)req;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flags &amp; BNGE_HWRM_INTERNAL_CTX_OWNED) {</div><div class='add'>+		dev_err(bd-&gt;dev, "HWRM context already owned, req_type = %u\n",</div><div class='add'>+			(u32)le16_to_cpu(input-&gt;req_type));</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;flags |= BNGE_HWRM_INTERNAL_CTX_OWNED;</div><div class='add'>+	return ((u8 *)req) + BNGE_HWRM_RESP_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __hwrm_ctx_invalidate(struct bnge_dev *bd,</div><div class='add'>+				  struct bnge_hwrm_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	void *addr = ((u8 *)ctx) - BNGE_HWRM_CTX_OFFSET;</div><div class='add'>+	dma_addr_t dma_handle = ctx-&gt;dma_handle; /* save before invalidate */</div><div class='add'>+</div><div class='add'>+	/* unmap any auxiliary DMA slice */</div><div class='add'>+	if (ctx-&gt;slice_addr)</div><div class='add'>+		dma_free_coherent(bd-&gt;dev, ctx-&gt;slice_size,</div><div class='add'>+				  ctx-&gt;slice_addr, ctx-&gt;slice_handle);</div><div class='add'>+</div><div class='add'>+	/* invalidate, ensure ownership, sentinel and dma_handle are cleared */</div><div class='add'>+	memset(ctx, 0, sizeof(struct bnge_hwrm_ctx));</div><div class='add'>+</div><div class='add'>+	/* return the buffer to the DMA pool */</div><div class='add'>+	if (dma_handle)</div><div class='add'>+		dma_pool_free(bd-&gt;hwrm_dma_pool, addr, dma_handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_req_drop(struct bnge_dev *bd, void *req)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		__hwrm_ctx_invalidate(bd, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_map_hwrm_error(u32 hwrm_err)</div><div class='add'>+{</div><div class='add'>+	switch (hwrm_err) {</div><div class='add'>+	case HWRM_ERR_CODE_SUCCESS:</div><div class='add'>+		return 0;</div><div class='add'>+	case HWRM_ERR_CODE_RESOURCE_LOCKED:</div><div class='add'>+		return -EROFS;</div><div class='add'>+	case HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED:</div><div class='add'>+		return -EACCES;</div><div class='add'>+	case HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR:</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	case HWRM_ERR_CODE_INVALID_PARAMS:</div><div class='add'>+	case HWRM_ERR_CODE_INVALID_FLAGS:</div><div class='add'>+	case HWRM_ERR_CODE_INVALID_ENABLES:</div><div class='add'>+	case HWRM_ERR_CODE_UNSUPPORTED_TLV:</div><div class='add'>+	case HWRM_ERR_CODE_UNSUPPORTED_OPTION_ERR:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case HWRM_ERR_CODE_NO_BUFFER:</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	case HWRM_ERR_CODE_HOT_RESET_PROGRESS:</div><div class='add'>+	case HWRM_ERR_CODE_BUSY:</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	case HWRM_ERR_CODE_CMD_NOT_SUPPORTED:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	case HWRM_ERR_CODE_PF_UNAVAILABLE:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	default:</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnge_hwrm_wait_token *</div><div class='add'>+bnge_hwrm_create_token(struct bnge_dev *bd, enum bnge_hwrm_chnl dst)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_wait_token *token;</div><div class='add'>+</div><div class='add'>+	token = kzalloc(sizeof(*token), GFP_KERNEL);</div><div class='add'>+	if (!token)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bd-&gt;hwrm_cmd_lock);</div><div class='add'>+</div><div class='add'>+	token-&gt;dst = dst;</div><div class='add'>+	token-&gt;state = BNGE_HWRM_PENDING;</div><div class='add'>+	if (dst == BNGE_HWRM_CHNL_CHIMP) {</div><div class='add'>+		token-&gt;seq_id = bd-&gt;hwrm_cmd_seq++;</div><div class='add'>+		hlist_add_head_rcu(&amp;token-&gt;node, &amp;bd-&gt;hwrm_pending_list);</div><div class='add'>+	} else {</div><div class='add'>+		token-&gt;seq_id = bd-&gt;hwrm_cmd_kong_seq++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return token;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnge_hwrm_destroy_token(struct bnge_dev *bd, struct bnge_hwrm_wait_token *token)</div><div class='add'>+{</div><div class='add'>+	if (token-&gt;dst == BNGE_HWRM_CHNL_CHIMP) {</div><div class='add'>+		hlist_del_rcu(&amp;token-&gt;node);</div><div class='add'>+		kfree_rcu(token, rcu);</div><div class='add'>+	} else {</div><div class='add'>+		kfree(token);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;bd-&gt;hwrm_cmd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_req_dbg(struct bnge_dev *bd, struct input *req)</div><div class='add'>+{</div><div class='add'>+	u32 ring = le16_to_cpu(req-&gt;cmpl_ring);</div><div class='add'>+	u32 type = le16_to_cpu(req-&gt;req_type);</div><div class='add'>+	u32 tgt = le16_to_cpu(req-&gt;target_id);</div><div class='add'>+	u32 seq = le16_to_cpu(req-&gt;seq_id);</div><div class='add'>+	char opt[32] = "\n";</div><div class='add'>+</div><div class='add'>+	if (unlikely(ring != (u16)BNGE_HWRM_NO_CMPL_RING))</div><div class='add'>+		snprintf(opt, 16, " ring %d\n", ring);</div><div class='add'>+</div><div class='add'>+	if (unlikely(tgt != BNGE_HWRM_TARGET))</div><div class='add'>+		snprintf(opt + strlen(opt) - 1, 16, " tgt 0x%x\n", tgt);</div><div class='add'>+</div><div class='add'>+	dev_dbg(bd-&gt;dev, "sent hwrm req_type 0x%x seq id 0x%x%s",</div><div class='add'>+		type, seq, opt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define bnge_hwrm_err(bd, ctx, fmt, ...)		\</div><div class='add'>+	do {							       \</div><div class='add'>+		if ((ctx)-&gt;flags &amp; BNGE_HWRM_CTX_SILENT)	       \</div><div class='add'>+			dev_dbg((bd)-&gt;dev, fmt, __VA_ARGS__);       \</div><div class='add'>+		else						       \</div><div class='add'>+			dev_err((bd)-&gt;dev, fmt, __VA_ARGS__);       \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static int __hwrm_send_ctx(struct bnge_dev *bd, struct bnge_hwrm_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	u32 doorbell_offset = BNGE_GRCPF_REG_CHIMP_COMM_TRIGGER;</div><div class='add'>+	enum bnge_hwrm_chnl dst = BNGE_HWRM_CHNL_CHIMP;</div><div class='add'>+	u32 bar_offset = BNGE_GRCPF_REG_CHIMP_COMM;</div><div class='add'>+	struct bnge_hwrm_wait_token *token = NULL;</div><div class='add'>+	u16 max_req_len = BNGE_HWRM_MAX_REQ_LEN;</div><div class='add'>+	unsigned int i, timeout, tmo_count;</div><div class='add'>+	u32 *data = (u32 *)ctx-&gt;req;</div><div class='add'>+	u32 msg_len = ctx-&gt;req_len;</div><div class='add'>+	int rc = -EBUSY;</div><div class='add'>+	u32 req_type;</div><div class='add'>+	u16 len = 0;</div><div class='add'>+	u8 *valid;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flags &amp; BNGE_HWRM_INTERNAL_RESP_DIRTY)</div><div class='add'>+		memset(ctx-&gt;resp, 0, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	req_type = le16_to_cpu(ctx-&gt;req-&gt;req_type);</div><div class='add'>+</div><div class='add'>+	if (msg_len &gt; BNGE_HWRM_MAX_REQ_LEN &amp;&amp;</div><div class='add'>+	    msg_len &gt; bd-&gt;hwrm_max_ext_req_len) {</div><div class='add'>+		dev_warn(bd-&gt;dev, "oversized hwrm request, req_type 0x%x",</div><div class='add'>+			 req_type);</div><div class='add'>+		rc = -E2BIG;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	token = bnge_hwrm_create_token(bd, dst);</div><div class='add'>+	if (!token) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;req-&gt;seq_id = cpu_to_le16(token-&gt;seq_id);</div><div class='add'>+</div><div class='add'>+	/* Ensure any associated DMA buffers are written before doorbell */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* Write request msg to hwrm channel */</div><div class='add'>+	__iowrite32_copy(bd-&gt;bar0 + bar_offset, data, msg_len / 4);</div><div class='add'>+</div><div class='add'>+	for (i = msg_len; i &lt; max_req_len; i += 4)</div><div class='add'>+		writel(0, bd-&gt;bar0 + bar_offset + i);</div><div class='add'>+</div><div class='add'>+	/* Ring channel doorbell */</div><div class='add'>+	writel(1, bd-&gt;bar0 + doorbell_offset);</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_dbg(bd, ctx-&gt;req);</div><div class='add'>+</div><div class='add'>+	/* Limit timeout to an upper limit */</div><div class='add'>+	timeout = min(ctx-&gt;timeout,</div><div class='add'>+		      bd-&gt;hwrm_cmd_max_timeout ?: BNGE_HWRM_CMD_MAX_TIMEOUT);</div><div class='add'>+	/* convert timeout to usec */</div><div class='add'>+	timeout *= 1000;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	/* Short timeout for the first few iterations:</div><div class='add'>+	 * number of loops = number of loops for short timeout +</div><div class='add'>+	 * number of loops for standard timeout.</div><div class='add'>+	 */</div><div class='add'>+	tmo_count = BNGE_HWRM_SHORT_TIMEOUT_COUNTER;</div><div class='add'>+	timeout = timeout - BNGE_HWRM_SHORT_MIN_TIMEOUT *</div><div class='add'>+			BNGE_HWRM_SHORT_TIMEOUT_COUNTER;</div><div class='add'>+	tmo_count += DIV_ROUND_UP(timeout, BNGE_HWRM_MIN_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(ctx-&gt;req-&gt;cmpl_ring) != INVALID_HW_RING_ID) {</div><div class='add'>+		/* Wait until hwrm response cmpl interrupt is processed */</div><div class='add'>+		while (READ_ONCE(token-&gt;state) &lt; BNGE_HWRM_COMPLETE &amp;&amp;</div><div class='add'>+		       i++ &lt; tmo_count) {</div><div class='add'>+			/* on first few passes, just barely sleep */</div><div class='add'>+			if (i &lt; BNGE_HWRM_SHORT_TIMEOUT_COUNTER) {</div><div class='add'>+				usleep_range(BNGE_HWRM_SHORT_MIN_TIMEOUT,</div><div class='add'>+					     BNGE_HWRM_SHORT_MAX_TIMEOUT);</div><div class='add'>+			} else {</div><div class='add'>+				usleep_range(BNGE_HWRM_MIN_TIMEOUT,</div><div class='add'>+					     BNGE_HWRM_MAX_TIMEOUT);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(token-&gt;state) != BNGE_HWRM_COMPLETE) {</div><div class='add'>+			bnge_hwrm_err(bd, ctx, "No hwrm cmpl received: 0x%x\n",</div><div class='add'>+				      req_type);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		len = le16_to_cpu(READ_ONCE(ctx-&gt;resp-&gt;resp_len));</div><div class='add'>+		valid = ((u8 *)ctx-&gt;resp) + len - 1;</div><div class='add'>+	} else {</div><div class='add'>+		__le16 seen_out_of_seq = ctx-&gt;req-&gt;seq_id; /* will never see */</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		/* Check if response len is updated */</div><div class='add'>+		for (i = 0; i &lt; tmo_count; i++) {</div><div class='add'>+			if (token &amp;&amp;</div><div class='add'>+			    READ_ONCE(token-&gt;state) == BNGE_HWRM_DEFERRED) {</div><div class='add'>+				bnge_hwrm_destroy_token(bd, token);</div><div class='add'>+				token = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			len = le16_to_cpu(READ_ONCE(ctx-&gt;resp-&gt;resp_len));</div><div class='add'>+			if (len) {</div><div class='add'>+				__le16 resp_seq = READ_ONCE(ctx-&gt;resp-&gt;seq_id);</div><div class='add'>+</div><div class='add'>+				if (resp_seq == ctx-&gt;req-&gt;seq_id)</div><div class='add'>+					break;</div><div class='add'>+				if (resp_seq != seen_out_of_seq) {</div><div class='add'>+					dev_warn(bd-&gt;dev, "Discarding out of seq response: 0x%x for msg {0x%x 0x%x}\n",</div><div class='add'>+						 le16_to_cpu(resp_seq), req_type, le16_to_cpu(ctx-&gt;req-&gt;seq_id));</div><div class='add'>+					seen_out_of_seq = resp_seq;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* on first few passes, just barely sleep */</div><div class='add'>+			if (i &lt; BNGE_HWRM_SHORT_TIMEOUT_COUNTER) {</div><div class='add'>+				usleep_range(BNGE_HWRM_SHORT_MIN_TIMEOUT,</div><div class='add'>+					     BNGE_HWRM_SHORT_MAX_TIMEOUT);</div><div class='add'>+			} else {</div><div class='add'>+				usleep_range(BNGE_HWRM_MIN_TIMEOUT,</div><div class='add'>+					     BNGE_HWRM_MAX_TIMEOUT);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i &gt;= tmo_count) {</div><div class='add'>+			bnge_hwrm_err(bd, ctx,</div><div class='add'>+				      "Error (timeout: %u) msg {0x%x 0x%x} len:%d\n",</div><div class='add'>+				      bnge_hwrm_timeout(i), req_type,</div><div class='add'>+				      le16_to_cpu(ctx-&gt;req-&gt;seq_id), len);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Last byte of resp contains valid bit */</div><div class='add'>+		valid = ((u8 *)ctx-&gt;resp) + len - 1;</div><div class='add'>+		for (j = 0; j &lt; BNGE_HWRM_FIN_WAIT_USEC; ) {</div><div class='add'>+			/* make sure we read from updated DMA memory */</div><div class='add'>+			dma_rmb();</div><div class='add'>+			if (*valid)</div><div class='add'>+				break;</div><div class='add'>+			if (j &lt; 10) {</div><div class='add'>+				udelay(1);</div><div class='add'>+				j++;</div><div class='add'>+			} else {</div><div class='add'>+				usleep_range(20, 30);</div><div class='add'>+				j += 20;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (j &gt;= BNGE_HWRM_FIN_WAIT_USEC) {</div><div class='add'>+			bnge_hwrm_err(bd, ctx, "Error (timeout: %u) msg {0x%x 0x%x} len:%d v:%d\n",</div><div class='add'>+				      bnge_hwrm_timeout(i) + j, req_type,</div><div class='add'>+				      le16_to_cpu(ctx-&gt;req-&gt;seq_id), len, *valid);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Zero valid bit for compatibility.  Valid bit in an older spec</div><div class='add'>+	 * may become a new field in a newer spec.  We must make sure that</div><div class='add'>+	 * a new field not implemented by old spec will read zero.</div><div class='add'>+	 */</div><div class='add'>+	*valid = 0;</div><div class='add'>+	rc = le16_to_cpu(ctx-&gt;resp-&gt;error_code);</div><div class='add'>+	if (rc == HWRM_ERR_CODE_BUSY &amp;&amp; !(ctx-&gt;flags &amp; BNGE_HWRM_CTX_SILENT))</div><div class='add'>+		dev_warn(bd-&gt;dev, "FW returned busy, hwrm req_type 0x%x\n",</div><div class='add'>+			 req_type);</div><div class='add'>+	else if (rc &amp;&amp; rc != HWRM_ERR_CODE_PF_UNAVAILABLE)</div><div class='add'>+		bnge_hwrm_err(bd, ctx, "hwrm req_type 0x%x seq id 0x%x error %d\n",</div><div class='add'>+			      req_type, le16_to_cpu(ctx-&gt;req-&gt;seq_id), rc);</div><div class='add'>+	rc = bnge_map_hwrm_error(rc);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (token)</div><div class='add'>+		bnge_hwrm_destroy_token(bd, token);</div><div class='add'>+	if (ctx-&gt;flags &amp; BNGE_HWRM_INTERNAL_CTX_OWNED)</div><div class='add'>+		ctx-&gt;flags |= BNGE_HWRM_INTERNAL_RESP_DIRTY;</div><div class='add'>+	else</div><div class='add'>+		__hwrm_ctx_invalidate(bd, ctx);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_req_send(struct bnge_dev *bd, void *req)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return __hwrm_send_ctx(bd, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_req_send_silent(struct bnge_dev *bd, void *req)</div><div class='add'>+{</div><div class='add'>+	bnge_hwrm_req_flags(bd, req, BNGE_HWRM_CTX_SILENT);</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *</div><div class='add'>+bnge_hwrm_req_dma_slice(struct bnge_dev *bd, void *req, u32 size,</div><div class='add'>+			dma_addr_t *dma_handle)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_ctx *ctx = __hwrm_ctx_get(bd, req);</div><div class='add'>+	u8 *end = ((u8 *)req) + BNGE_HWRM_DMA_SIZE;</div><div class='add'>+	struct input *input = req;</div><div class='add'>+	u8 *addr, *req_addr = req;</div><div class='add'>+	u32 max_offset, offset;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	max_offset = BNGE_HWRM_DMA_SIZE - ctx-&gt;allocated;</div><div class='add'>+	offset = max_offset - size;</div><div class='add'>+	offset = ALIGN_DOWN(offset, BNGE_HWRM_DMA_ALIGN);</div><div class='add'>+	addr = req_addr + offset;</div><div class='add'>+</div><div class='add'>+	if (addr &lt; req_addr + max_offset &amp;&amp; req_addr + ctx-&gt;req_len &lt;= addr) {</div><div class='add'>+		ctx-&gt;allocated = end - addr;</div><div class='add'>+		*dma_handle = ctx-&gt;dma_handle + offset;</div><div class='add'>+		return addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;slice_addr) {</div><div class='add'>+		dev_err(bd-&gt;dev, "HWRM refusing to reallocate DMA slice, req_type = %u\n",</div><div class='add'>+			(u32)le16_to_cpu(input-&gt;req_type));</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = dma_alloc_coherent(bd-&gt;dev, size, dma_handle, ctx-&gt;gfp);</div><div class='add'>+	if (!addr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;slice_addr = addr;</div><div class='add'>+	ctx-&gt;slice_size = size;</div><div class='add'>+	ctx-&gt;slice_handle = *dma_handle;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_cleanup_hwrm_resources(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hwrm_wait_token *token;</div><div class='add'>+</div><div class='add'>+	dma_pool_destroy(bd-&gt;hwrm_dma_pool);</div><div class='add'>+	bd-&gt;hwrm_dma_pool = NULL;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(token, &amp;bd-&gt;hwrm_pending_list, node)</div><div class='add'>+		WRITE_ONCE(token-&gt;state, BNGE_HWRM_CANCELLED);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_init_hwrm_resources(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;hwrm_dma_pool = dma_pool_create("bnge_hwrm", bd-&gt;dev,</div><div class='add'>+					    BNGE_HWRM_DMA_SIZE,</div><div class='add'>+					    BNGE_HWRM_DMA_ALIGN, 0);</div><div class='add'>+	if (!bd-&gt;hwrm_dma_pool)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	INIT_HLIST_HEAD(&amp;bd-&gt;hwrm_pending_list);</div><div class='add'>+	mutex_init(&amp;bd-&gt;hwrm_cmd_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h<br/>new file mode 100644<br/>index 000000000000..6df629761d95<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm.h</a></div><div class='hunk'>@@ -0,0 +1,112 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_HWRM_H_</div><div class='add'>+#define _BNGE_HWRM_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+</div><div class='add'>+enum bnge_hwrm_ctx_flags {</div><div class='add'>+	BNGE_HWRM_INTERNAL_CTX_OWNED	= BIT(0),</div><div class='add'>+	BNGE_HWRM_INTERNAL_RESP_DIRTY	= BIT(1),</div><div class='add'>+	BNGE_HWRM_CTX_SILENT		= BIT(2),</div><div class='add'>+	BNGE_HWRM_FULL_WAIT		= BIT(3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_HWRM_API_FLAGS (BNGE_HWRM_CTX_SILENT | BNGE_HWRM_FULL_WAIT)</div><div class='add'>+</div><div class='add'>+struct bnge_hwrm_ctx {</div><div class='add'>+	u64 sentinel;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+	struct output *resp;</div><div class='add'>+	struct input *req;</div><div class='add'>+	dma_addr_t slice_handle;</div><div class='add'>+	void *slice_addr;</div><div class='add'>+	u32 slice_size;</div><div class='add'>+	u32 req_len;</div><div class='add'>+	enum bnge_hwrm_ctx_flags flags;</div><div class='add'>+	unsigned int timeout;</div><div class='add'>+	u32 allocated;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnge_hwrm_wait_state {</div><div class='add'>+	BNGE_HWRM_PENDING,</div><div class='add'>+	BNGE_HWRM_DEFERRED,</div><div class='add'>+	BNGE_HWRM_COMPLETE,</div><div class='add'>+	BNGE_HWRM_CANCELLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnge_hwrm_chnl { BNGE_HWRM_CHNL_CHIMP, BNGE_HWRM_CHNL_KONG };</div><div class='add'>+</div><div class='add'>+struct bnge_hwrm_wait_token {</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	enum bnge_hwrm_wait_state state;</div><div class='add'>+	enum bnge_hwrm_chnl dst;</div><div class='add'>+	u16 seq_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_DFLT_HWRM_CMD_TIMEOUT		500</div><div class='add'>+</div><div class='add'>+#define BNGE_GRCPF_REG_CHIMP_COMM		0x0</div><div class='add'>+#define BNGE_GRCPF_REG_CHIMP_COMM_TRIGGER	0x100</div><div class='add'>+</div><div class='add'>+#define BNGE_HWRM_MAX_REQ_LEN		(bd-&gt;hwrm_max_req_len)</div><div class='add'>+#define BNGE_HWRM_SHORT_REQ_LEN		sizeof(struct hwrm_short_input)</div><div class='add'>+#define BNGE_HWRM_CMD_MAX_TIMEOUT	40000U</div><div class='add'>+#define BNGE_SHORT_HWRM_CMD_TIMEOUT	20</div><div class='add'>+#define BNGE_HWRM_CMD_TIMEOUT		(bd-&gt;hwrm_cmd_timeout)</div><div class='add'>+#define BNGE_HWRM_RESET_TIMEOUT		((BNGE_HWRM_CMD_TIMEOUT) * 4)</div><div class='add'>+#define BNGE_HWRM_TARGET		0xffff</div><div class='add'>+#define BNGE_HWRM_NO_CMPL_RING		-1</div><div class='add'>+#define BNGE_HWRM_REQ_MAX_SIZE		128</div><div class='add'>+#define BNGE_HWRM_DMA_SIZE		(2 * PAGE_SIZE) /* space for req+resp */</div><div class='add'>+#define BNGE_HWRM_RESP_RESERVED		PAGE_SIZE</div><div class='add'>+#define BNGE_HWRM_RESP_OFFSET		(BNGE_HWRM_DMA_SIZE -		\</div><div class='add'>+					 BNGE_HWRM_RESP_RESERVED)</div><div class='add'>+#define BNGE_HWRM_CTX_OFFSET		(BNGE_HWRM_RESP_OFFSET -	\</div><div class='add'>+					 sizeof(struct bnge_hwrm_ctx))</div><div class='add'>+#define BNGE_HWRM_DMA_ALIGN		16</div><div class='add'>+#define BNGE_HWRM_SENTINEL		0xb6e1f68a12e9a7eb /* arbitrary value */</div><div class='add'>+#define BNGE_HWRM_SHORT_MIN_TIMEOUT		3</div><div class='add'>+#define BNGE_HWRM_SHORT_MAX_TIMEOUT		10</div><div class='add'>+#define BNGE_HWRM_SHORT_TIMEOUT_COUNTER		5</div><div class='add'>+</div><div class='add'>+#define BNGE_HWRM_MIN_TIMEOUT		25</div><div class='add'>+#define BNGE_HWRM_MAX_TIMEOUT		40</div><div class='add'>+</div><div class='add'>+static inline unsigned int bnge_hwrm_timeout(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	return n &lt;= BNGE_HWRM_SHORT_TIMEOUT_COUNTER ?</div><div class='add'>+		n * BNGE_HWRM_SHORT_MIN_TIMEOUT :</div><div class='add'>+		BNGE_HWRM_SHORT_TIMEOUT_COUNTER *</div><div class='add'>+			BNGE_HWRM_SHORT_MIN_TIMEOUT +</div><div class='add'>+			(n - BNGE_HWRM_SHORT_TIMEOUT_COUNTER) *</div><div class='add'>+				BNGE_HWRM_MIN_TIMEOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNGE_HWRM_FIN_WAIT_USEC	50000</div><div class='add'>+</div><div class='add'>+void bnge_cleanup_hwrm_resources(struct bnge_dev *bd);</div><div class='add'>+int bnge_init_hwrm_resources(struct bnge_dev *bd);</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_req_create(struct bnge_dev *bd, void **req, u16 req_type,</div><div class='add'>+			 u32 req_len);</div><div class='add'>+#define bnge_hwrm_req_init(bd, req, req_type) \</div><div class='add'>+	bnge_hwrm_req_create((bd), (void **)&amp;(req), (req_type),	\</div><div class='add'>+			     sizeof(*(req)))</div><div class='add'>+void *bnge_hwrm_req_hold(struct bnge_dev *bd, void *req);</div><div class='add'>+void bnge_hwrm_req_drop(struct bnge_dev *bd, void *req);</div><div class='add'>+void bnge_hwrm_req_flags(struct bnge_dev *bd, void *req,</div><div class='add'>+			 enum bnge_hwrm_ctx_flags flags);</div><div class='add'>+void bnge_hwrm_req_timeout(struct bnge_dev *bd, void *req,</div><div class='add'>+			   unsigned int timeout);</div><div class='add'>+int bnge_hwrm_req_send(struct bnge_dev *bd, void *req);</div><div class='add'>+int bnge_hwrm_req_send_silent(struct bnge_dev *bd, void *req);</div><div class='add'>+void bnge_hwrm_req_alloc_flags(struct bnge_dev *bd, void *req, gfp_t flags);</div><div class='add'>+void *bnge_hwrm_req_dma_slice(struct bnge_dev *bd, void *req, u32 size,</div><div class='add'>+			      dma_addr_t *dma);</div><div class='add'>+int bnge_hwrm_req_replace(struct bnge_dev *bd, void *req, void *new_req,</div><div class='add'>+			  u32 len);</div><div class='add'>+#endif /* _BNGE_HWRM_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c<br/>new file mode 100644<br/>index 000000000000..198f49b40dbf<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c</a></div><div class='hunk'>@@ -0,0 +1,1185 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_hwrm.h"</div><div class='add'>+#include "bnge_hwrm_lib.h"</div><div class='add'>+#include "bnge_rmem.h"</div><div class='add'>+#include "bnge_resc.h"</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_ver_get(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	u32 dev_caps_cfg, hwrm_ver, hwrm_spec_code;</div><div class='add'>+	u16 fw_maj, fw_min, fw_bld, fw_rsv;</div><div class='add'>+	struct hwrm_ver_get_output *resp;</div><div class='add'>+	struct hwrm_ver_get_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VER_GET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_flags(bd, req, BNGE_HWRM_FULL_WAIT);</div><div class='add'>+	bd-&gt;hwrm_max_req_len = HWRM_MAX_REQ_LEN;</div><div class='add'>+	req-&gt;hwrm_intf_maj = HWRM_VERSION_MAJOR;</div><div class='add'>+	req-&gt;hwrm_intf_min = HWRM_VERSION_MINOR;</div><div class='add'>+	req-&gt;hwrm_intf_upd = HWRM_VERSION_UPDATE;</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto hwrm_ver_get_exit;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;bd-&gt;ver_resp, resp, sizeof(struct hwrm_ver_get_output));</div><div class='add'>+</div><div class='add'>+	hwrm_spec_code = resp-&gt;hwrm_intf_maj_8b &lt;&lt; 16 |</div><div class='add'>+			 resp-&gt;hwrm_intf_min_8b &lt;&lt; 8 |</div><div class='add'>+			 resp-&gt;hwrm_intf_upd_8b;</div><div class='add'>+	hwrm_ver = HWRM_VERSION_MAJOR &lt;&lt; 16 | HWRM_VERSION_MINOR &lt;&lt; 8 |</div><div class='add'>+			HWRM_VERSION_UPDATE;</div><div class='add'>+</div><div class='add'>+	if (hwrm_spec_code &gt; hwrm_ver)</div><div class='add'>+		snprintf(bd-&gt;hwrm_ver_supp, FW_VER_STR_LEN, "%d.%d.%d",</div><div class='add'>+			 HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR,</div><div class='add'>+			 HWRM_VERSION_UPDATE);</div><div class='add'>+	else</div><div class='add'>+		snprintf(bd-&gt;hwrm_ver_supp, FW_VER_STR_LEN, "%d.%d.%d",</div><div class='add'>+			 resp-&gt;hwrm_intf_maj_8b, resp-&gt;hwrm_intf_min_8b,</div><div class='add'>+			 resp-&gt;hwrm_intf_upd_8b);</div><div class='add'>+</div><div class='add'>+	fw_maj = le16_to_cpu(resp-&gt;hwrm_fw_major);</div><div class='add'>+	fw_min = le16_to_cpu(resp-&gt;hwrm_fw_minor);</div><div class='add'>+	fw_bld = le16_to_cpu(resp-&gt;hwrm_fw_build);</div><div class='add'>+	fw_rsv = le16_to_cpu(resp-&gt;hwrm_fw_patch);</div><div class='add'>+</div><div class='add'>+	bd-&gt;fw_ver_code = BNGE_FW_VER_CODE(fw_maj, fw_min, fw_bld, fw_rsv);</div><div class='add'>+	snprintf(bd-&gt;fw_ver_str, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 fw_maj, fw_min, fw_bld, fw_rsv);</div><div class='add'>+</div><div class='add'>+	if (strlen(resp-&gt;active_pkg_name)) {</div><div class='add'>+		int fw_ver_len = strlen(bd-&gt;fw_ver_str);</div><div class='add'>+</div><div class='add'>+		snprintf(bd-&gt;fw_ver_str + fw_ver_len,</div><div class='add'>+			 FW_VER_STR_LEN - fw_ver_len - 1, "/pkg %s",</div><div class='add'>+			 resp-&gt;active_pkg_name);</div><div class='add'>+		bd-&gt;fw_cap |= BNGE_FW_CAP_PKG_VER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bd-&gt;hwrm_cmd_timeout = le16_to_cpu(resp-&gt;def_req_timeout);</div><div class='add'>+	if (!bd-&gt;hwrm_cmd_timeout)</div><div class='add'>+		bd-&gt;hwrm_cmd_timeout = BNGE_DFLT_HWRM_CMD_TIMEOUT;</div><div class='add'>+	bd-&gt;hwrm_cmd_max_timeout = le16_to_cpu(resp-&gt;max_req_timeout) * 1000;</div><div class='add'>+	if (!bd-&gt;hwrm_cmd_max_timeout)</div><div class='add'>+		bd-&gt;hwrm_cmd_max_timeout = BNGE_HWRM_CMD_MAX_TIMEOUT;</div><div class='add'>+	else if (bd-&gt;hwrm_cmd_max_timeout &gt; BNGE_HWRM_CMD_MAX_TIMEOUT)</div><div class='add'>+		dev_warn(bd-&gt;dev, "Default HWRM commands max timeout increased to %d seconds\n",</div><div class='add'>+			 bd-&gt;hwrm_cmd_max_timeout / 1000);</div><div class='add'>+</div><div class='add'>+	bd-&gt;hwrm_max_req_len = le16_to_cpu(resp-&gt;max_req_win_len);</div><div class='add'>+	bd-&gt;hwrm_max_ext_req_len = le16_to_cpu(resp-&gt;max_ext_req_len);</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;hwrm_max_ext_req_len &lt; HWRM_MAX_REQ_LEN)</div><div class='add'>+		bd-&gt;hwrm_max_ext_req_len = HWRM_MAX_REQ_LEN;</div><div class='add'>+</div><div class='add'>+	bd-&gt;chip_num = le16_to_cpu(resp-&gt;chip_num);</div><div class='add'>+	bd-&gt;chip_rev = resp-&gt;chip_rev;</div><div class='add'>+</div><div class='add'>+	dev_caps_cfg = le32_to_cpu(resp-&gt;dev_caps_cfg);</div><div class='add'>+	if ((dev_caps_cfg &amp; VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_SUPPORTED) &amp;&amp;</div><div class='add'>+	    (dev_caps_cfg &amp; VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_REQUIRED))</div><div class='add'>+		bd-&gt;fw_cap |= BNGE_FW_CAP_SHORT_CMD;</div><div class='add'>+</div><div class='add'>+	if (dev_caps_cfg &amp; VER_GET_RESP_DEV_CAPS_CFG_KONG_MB_CHNL_SUPPORTED)</div><div class='add'>+		bd-&gt;fw_cap |= BNGE_FW_CAP_KONG_MB_CHNL;</div><div class='add'>+</div><div class='add'>+	if (dev_caps_cfg &amp;</div><div class='add'>+	    VER_GET_RESP_DEV_CAPS_CFG_CFA_ADV_FLOW_MGNT_SUPPORTED)</div><div class='add'>+		bd-&gt;fw_cap |= BNGE_FW_CAP_CFA_ADV_FLOW;</div><div class='add'>+</div><div class='add'>+hwrm_ver_get_exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int</div><div class='add'>+bnge_hwrm_nvm_dev_info(struct bnge_dev *bd,</div><div class='add'>+		       struct hwrm_nvm_get_dev_info_output *nvm_info)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_dev_info_output *resp;</div><div class='add'>+	struct hwrm_nvm_get_dev_info_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_NVM_GET_DEV_INFO);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		memcpy(nvm_info, resp, sizeof(*resp));</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_reset(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_reset_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_RESET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = 0;</div><div class='add'>+	bnge_hwrm_req_timeout(bd, req, BNGE_HWRM_RESET_TIMEOUT);</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_fw_set_time(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_fw_set_time_input *req;</div><div class='add'>+	struct tm tm;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	time64_to_tm(ktime_get_real_seconds(), 0, &amp;tm);</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FW_SET_TIME);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;year = cpu_to_le16(1900 + tm.tm_year);</div><div class='add'>+	req-&gt;month = 1 + tm.tm_mon;</div><div class='add'>+	req-&gt;day = tm.tm_mday;</div><div class='add'>+	req-&gt;hour = tm.tm_hour;</div><div class='add'>+	req-&gt;minute = tm.tm_min;</div><div class='add'>+	req-&gt;second = tm.tm_sec;</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_drv_rgtr(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_drv_rgtr_output *resp;</div><div class='add'>+	struct hwrm_func_drv_rgtr_input *req;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_DRV_RGTR);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_OS_TYPE |</div><div class='add'>+				   FUNC_DRV_RGTR_REQ_ENABLES_VER |</div><div class='add'>+				   FUNC_DRV_RGTR_REQ_ENABLES_ASYNC_EVENT_FWD);</div><div class='add'>+</div><div class='add'>+	req-&gt;os_type = cpu_to_le16(FUNC_DRV_RGTR_REQ_OS_TYPE_LINUX);</div><div class='add'>+	flags = FUNC_DRV_RGTR_REQ_FLAGS_16BIT_VER_MODE;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	req-&gt;ver_maj_8b = DRV_VER_MAJ;</div><div class='add'>+	req-&gt;ver_min_8b = DRV_VER_MIN;</div><div class='add'>+	req-&gt;ver_upd_8b = DRV_VER_UPD;</div><div class='add'>+	req-&gt;ver_maj = cpu_to_le16(DRV_VER_MAJ);</div><div class='add'>+	req-&gt;ver_min = cpu_to_le16(DRV_VER_MIN);</div><div class='add'>+	req-&gt;ver_upd = cpu_to_le16(DRV_VER_UPD);</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		set_bit(BNGE_STATE_DRV_REGISTERED, &amp;bd-&gt;state);</div><div class='add'>+		if (resp-&gt;flags &amp;</div><div class='add'>+		    cpu_to_le32(FUNC_DRV_RGTR_RESP_FLAGS_IF_CHANGE_SUPPORTED))</div><div class='add'>+			bd-&gt;fw_cap |= BNGE_FW_CAP_IF_CHANGE;</div><div class='add'>+	}</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_drv_unrgtr(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_drv_unrgtr_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!test_and_clear_bit(BNGE_STATE_DRV_REGISTERED, &amp;bd-&gt;state))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_DRV_UNRGTR);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_ctx_initializer(struct bnge_ctx_mem_type *ctxm,</div><div class='add'>+				      u8 init_val, u8 init_offset,</div><div class='add'>+				      bool init_mask_set)</div><div class='add'>+{</div><div class='add'>+	ctxm-&gt;init_value = init_val;</div><div class='add'>+	ctxm-&gt;init_offset = BNGE_CTX_INIT_INVALID_OFFSET;</div><div class='add'>+	if (init_mask_set)</div><div class='add'>+		ctxm-&gt;init_offset = init_offset * 4;</div><div class='add'>+	else</div><div class='add'>+		ctxm-&gt;init_value = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_all_ctx_pg_info(struct bnge_dev *bd, int ctx_max)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ctx_mem_info *ctx = bd-&gt;ctx;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='add'>+	for (type = 0; type &lt; ctx_max; type++) {</div><div class='add'>+		struct bnge_ctx_mem_type *ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		int n = 1;</div><div class='add'>+</div><div class='add'>+		if (!ctxm-&gt;max_entries)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ctxm-&gt;instance_bmap)</div><div class='add'>+			n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+		ctxm-&gt;pg_info = kcalloc(n, sizeof(*ctxm-&gt;pg_info), GFP_KERNEL);</div><div class='add'>+		if (!ctxm-&gt;pg_info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNGE_CTX_INIT_VALID(flags)	\</div><div class='add'>+	(!!((flags) &amp;			\</div><div class='add'>+	    FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_ENABLE_CTX_KIND_INIT))</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_backing_store_qcaps(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_backing_store_qcaps_v2_output *resp;</div><div class='add'>+	struct hwrm_func_backing_store_qcaps_v2_input *req;</div><div class='add'>+	struct bnge_ctx_mem_info *ctx;</div><div class='add'>+	u16 type;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;ctx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_BACKING_STORE_QCAPS_V2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	bd-&gt;ctx = ctx;</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+</div><div class='add'>+	for (type = 0; type &lt; BNGE_CTX_V2_MAX; ) {</div><div class='add'>+		struct bnge_ctx_mem_type *ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		u8 init_val, init_off, i;</div><div class='add'>+		__le32 *p;</div><div class='add'>+		u32 flags;</div><div class='add'>+</div><div class='add'>+		req-&gt;type = cpu_to_le16(type);</div><div class='add'>+		rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto ctx_done;</div><div class='add'>+		flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+		type = le16_to_cpu(resp-&gt;next_valid_type);</div><div class='add'>+		if (!(flags &amp;</div><div class='add'>+		      FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_TYPE_VALID))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		ctxm-&gt;type = le16_to_cpu(resp-&gt;type);</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;entry_size);</div><div class='add'>+		ctxm-&gt;flags = flags;</div><div class='add'>+		ctxm-&gt;instance_bmap = le32_to_cpu(resp-&gt;instance_bit_map);</div><div class='add'>+		ctxm-&gt;entry_multiple = resp-&gt;entry_multiple;</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;max_num_entries);</div><div class='add'>+		ctxm-&gt;min_entries = le32_to_cpu(resp-&gt;min_num_entries);</div><div class='add'>+		init_val = resp-&gt;ctx_init_value;</div><div class='add'>+		init_off = resp-&gt;ctx_init_offset;</div><div class='add'>+		bnge_init_ctx_initializer(ctxm, init_val, init_off,</div><div class='add'>+					  BNGE_CTX_INIT_VALID(flags));</div><div class='add'>+		ctxm-&gt;split_entry_cnt = min_t(u8, resp-&gt;subtype_valid_cnt,</div><div class='add'>+					      BNGE_MAX_SPLIT_ENTRY);</div><div class='add'>+		for (i = 0, p = &amp;resp-&gt;split_entry_0; i &lt; ctxm-&gt;split_entry_cnt;</div><div class='add'>+		     i++, p++)</div><div class='add'>+			ctxm-&gt;split[i] = le32_to_cpu(*p);</div><div class='add'>+	}</div><div class='add'>+	rc = bnge_alloc_all_ctx_pg_info(bd, BNGE_CTX_V2_MAX);</div><div class='add'>+</div><div class='add'>+ctx_done:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_set_pg_attr(struct bnge_ring_mem_info *rmem, u8 *pg_attr,</div><div class='add'>+				  __le64 *pg_dir)</div><div class='add'>+{</div><div class='add'>+	if (!rmem-&gt;nr_pages)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	BNGE_SET_CTX_PAGE_ATTR(*pg_attr);</div><div class='add'>+	if (rmem-&gt;depth &gt;= 1) {</div><div class='add'>+		if (rmem-&gt;depth == 2)</div><div class='add'>+			*pg_attr |= 2;</div><div class='add'>+		else</div><div class='add'>+			*pg_attr |= 1;</div><div class='add'>+		*pg_dir = cpu_to_le64(rmem-&gt;dma_pg_tbl);</div><div class='add'>+	} else {</div><div class='add'>+		*pg_dir = cpu_to_le64(rmem-&gt;dma_arr[0]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_backing_store(struct bnge_dev *bd,</div><div class='add'>+				 struct bnge_ctx_mem_type *ctxm,</div><div class='add'>+				 bool last)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_backing_store_cfg_v2_input *req;</div><div class='add'>+	u32 instance_bmap = ctxm-&gt;instance_bmap;</div><div class='add'>+	int i, j, rc = 0, n = 1;</div><div class='add'>+	__le32 *p;</div><div class='add'>+</div><div class='add'>+	if (!(ctxm-&gt;flags &amp; BNGE_CTX_MEM_TYPE_VALID) || !ctxm-&gt;pg_info)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (instance_bmap)</div><div class='add'>+		n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+	else</div><div class='add'>+		instance_bmap = 1;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_BACKING_STORE_CFG_V2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	req-&gt;type = cpu_to_le16(ctxm-&gt;type);</div><div class='add'>+	req-&gt;entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='add'>+	req-&gt;subtype_valid_cnt = ctxm-&gt;split_entry_cnt;</div><div class='add'>+	for (i = 0, p = &amp;req-&gt;split_entry_0; i &lt; ctxm-&gt;split_entry_cnt; i++)</div><div class='add'>+		p[i] = cpu_to_le32(ctxm-&gt;split[i]);</div><div class='add'>+	for (i = 0, j = 0; j &lt; n &amp;&amp; !rc; i++) {</div><div class='add'>+		struct bnge_ctx_pg_info *ctx_pg;</div><div class='add'>+</div><div class='add'>+		if (!(instance_bmap &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+		req-&gt;instance = cpu_to_le16(i);</div><div class='add'>+		ctx_pg = &amp;ctxm-&gt;pg_info[j++];</div><div class='add'>+		if (!ctx_pg-&gt;entries)</div><div class='add'>+			continue;</div><div class='add'>+		req-&gt;num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		bnge_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='add'>+				      &amp;req-&gt;page_size_pbl_level,</div><div class='add'>+				      &amp;req-&gt;page_dir);</div><div class='add'>+		if (last &amp;&amp; j == n)</div><div class='add'>+			req-&gt;flags =</div><div class='add'>+				cpu_to_le32(BNGE_BS_CFG_ALL_DONE);</div><div class='add'>+		rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	}</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_get_rings(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hw_resc *hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='add'>+	u16 cp, stats;</div><div class='add'>+	u16 rx, tx;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (rc) {</div><div class='add'>+		bnge_hwrm_req_drop(bd, req);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hw_resc-&gt;resv_tx_rings = le16_to_cpu(resp-&gt;alloc_tx_rings);</div><div class='add'>+	hw_resc-&gt;resv_rx_rings = le16_to_cpu(resp-&gt;alloc_rx_rings);</div><div class='add'>+	hw_resc-&gt;resv_hw_ring_grps =</div><div class='add'>+		le32_to_cpu(resp-&gt;alloc_hw_ring_grps);</div><div class='add'>+	hw_resc-&gt;resv_vnics = le16_to_cpu(resp-&gt;alloc_vnics);</div><div class='add'>+	hw_resc-&gt;resv_rsscos_ctxs = le16_to_cpu(resp-&gt;alloc_rsscos_ctx);</div><div class='add'>+	cp = le16_to_cpu(resp-&gt;alloc_cmpl_rings);</div><div class='add'>+	stats = le16_to_cpu(resp-&gt;alloc_stat_ctx);</div><div class='add'>+	hw_resc-&gt;resv_irqs = cp;</div><div class='add'>+	rx = hw_resc-&gt;resv_rx_rings;</div><div class='add'>+	tx = hw_resc-&gt;resv_tx_rings;</div><div class='add'>+	if (bnge_is_agg_reqd(bd))</div><div class='add'>+		rx &gt;&gt;= 1;</div><div class='add'>+	if (cp &lt; (rx + tx)) {</div><div class='add'>+		rc = bnge_fix_rings_count(&amp;rx, &amp;tx, cp, false);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto get_rings_exit;</div><div class='add'>+		if (bnge_is_agg_reqd(bd))</div><div class='add'>+			rx &lt;&lt;= 1;</div><div class='add'>+		hw_resc-&gt;resv_rx_rings = rx;</div><div class='add'>+		hw_resc-&gt;resv_tx_rings = tx;</div><div class='add'>+	}</div><div class='add'>+	hw_resc-&gt;resv_irqs = le16_to_cpu(resp-&gt;alloc_msix);</div><div class='add'>+	hw_resc-&gt;resv_hw_ring_grps = rx;</div><div class='add'>+	hw_resc-&gt;resv_cp_rings = cp;</div><div class='add'>+	hw_resc-&gt;resv_stat_ctxs = stats;</div><div class='add'>+</div><div class='add'>+get_rings_exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct hwrm_func_cfg_input *</div><div class='add'>+__bnge_hwrm_reserve_pf_rings(struct bnge_dev *bd, struct bnge_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	u32 enables = 0;</div><div class='add'>+</div><div class='add'>+	if (bnge_hwrm_req_init(bd, req, HWRM_FUNC_QCFG))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	enables |= hwr-&gt;tx ? FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS : 0;</div><div class='add'>+	req-&gt;num_tx_rings = cpu_to_le16(hwr-&gt;tx);</div><div class='add'>+</div><div class='add'>+	enables |= hwr-&gt;rx ? FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS : 0;</div><div class='add'>+	enables |= hwr-&gt;stat ? FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+	enables |= hwr-&gt;nq ? FUNC_CFG_REQ_ENABLES_NUM_MSIX : 0;</div><div class='add'>+	enables |= hwr-&gt;cmpl ? FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='add'>+	enables |= hwr-&gt;vnic ? FUNC_CFG_REQ_ENABLES_NUM_VNICS : 0;</div><div class='add'>+	enables |= hwr-&gt;rss_ctx ? FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='add'>+</div><div class='add'>+	req-&gt;num_rx_rings = cpu_to_le16(hwr-&gt;rx);</div><div class='add'>+	req-&gt;num_rsscos_ctxs = cpu_to_le16(hwr-&gt;rss_ctx);</div><div class='add'>+	req-&gt;num_cmpl_rings = cpu_to_le16(hwr-&gt;cmpl);</div><div class='add'>+	req-&gt;num_msix = cpu_to_le16(hwr-&gt;nq);</div><div class='add'>+	req-&gt;num_stat_ctxs = cpu_to_le16(hwr-&gt;stat);</div><div class='add'>+	req-&gt;num_vnics = cpu_to_le16(hwr-&gt;vnic);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(enables);</div><div class='add'>+</div><div class='add'>+	return req;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnge_hwrm_reserve_pf_rings(struct bnge_dev *bd, struct bnge_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	req = __bnge_hwrm_reserve_pf_rings(bd, hwr);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;enables) {</div><div class='add'>+		bnge_hwrm_req_drop(bd, req);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return bnge_hwrm_get_rings(bd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_reserve_rings(struct bnge_dev *bd, struct bnge_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	return bnge_hwrm_reserve_pf_rings(bd, hwr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_qcfg(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto func_qcfg_exit;</div><div class='add'>+</div><div class='add'>+	bd-&gt;max_mtu = le16_to_cpu(resp-&gt;max_mtu_configured);</div><div class='add'>+	if (!bd-&gt;max_mtu)</div><div class='add'>+		bd-&gt;max_mtu = BNGE_MAX_MTU;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;db_size)</div><div class='add'>+		goto func_qcfg_exit;</div><div class='add'>+</div><div class='add'>+	bd-&gt;db_offset = le16_to_cpu(resp-&gt;legacy_l2_db_size_kb) * 1024;</div><div class='add'>+	bd-&gt;db_size = PAGE_ALIGN(le16_to_cpu(resp-&gt;l2_doorbell_bar_size_kb) *</div><div class='add'>+			1024);</div><div class='add'>+	if (!bd-&gt;db_size || bd-&gt;db_size &gt; pci_resource_len(bd-&gt;pdev, 2) ||</div><div class='add'>+	    bd-&gt;db_size &lt;= bd-&gt;db_offset)</div><div class='add'>+		bd-&gt;db_size = pci_resource_len(bd-&gt;pdev, 2);</div><div class='add'>+</div><div class='add'>+func_qcfg_exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_resc_qcaps(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_resource_qcaps_output *resp;</div><div class='add'>+	struct bnge_hw_resc *hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+	struct hwrm_func_resource_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_RESOURCE_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send_silent(bd, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto hwrm_func_resc_qcaps_exit;</div><div class='add'>+</div><div class='add'>+	hw_resc-&gt;max_tx_sch_inputs = le16_to_cpu(resp-&gt;max_tx_scheduler_inputs);</div><div class='add'>+	hw_resc-&gt;min_rsscos_ctxs = le16_to_cpu(resp-&gt;min_rsscos_ctx);</div><div class='add'>+	hw_resc-&gt;max_rsscos_ctxs = le16_to_cpu(resp-&gt;max_rsscos_ctx);</div><div class='add'>+	hw_resc-&gt;min_cp_rings = le16_to_cpu(resp-&gt;min_cmpl_rings);</div><div class='add'>+	hw_resc-&gt;max_cp_rings = le16_to_cpu(resp-&gt;max_cmpl_rings);</div><div class='add'>+	hw_resc-&gt;min_tx_rings = le16_to_cpu(resp-&gt;min_tx_rings);</div><div class='add'>+	hw_resc-&gt;max_tx_rings = le16_to_cpu(resp-&gt;max_tx_rings);</div><div class='add'>+	hw_resc-&gt;min_rx_rings = le16_to_cpu(resp-&gt;min_rx_rings);</div><div class='add'>+	hw_resc-&gt;max_rx_rings = le16_to_cpu(resp-&gt;max_rx_rings);</div><div class='add'>+	hw_resc-&gt;min_hw_ring_grps = le16_to_cpu(resp-&gt;min_hw_ring_grps);</div><div class='add'>+	hw_resc-&gt;max_hw_ring_grps = le16_to_cpu(resp-&gt;max_hw_ring_grps);</div><div class='add'>+	hw_resc-&gt;min_l2_ctxs = le16_to_cpu(resp-&gt;min_l2_ctxs);</div><div class='add'>+	hw_resc-&gt;max_l2_ctxs = le16_to_cpu(resp-&gt;max_l2_ctxs);</div><div class='add'>+	hw_resc-&gt;min_vnics = le16_to_cpu(resp-&gt;min_vnics);</div><div class='add'>+	hw_resc-&gt;max_vnics = le16_to_cpu(resp-&gt;max_vnics);</div><div class='add'>+	hw_resc-&gt;min_stat_ctxs = le16_to_cpu(resp-&gt;min_stat_ctx);</div><div class='add'>+	hw_resc-&gt;max_stat_ctxs = le16_to_cpu(resp-&gt;max_stat_ctx);</div><div class='add'>+</div><div class='add'>+	hw_resc-&gt;max_nqs = le16_to_cpu(resp-&gt;max_msix);</div><div class='add'>+	hw_resc-&gt;max_hw_ring_grps = hw_resc-&gt;max_rx_rings;</div><div class='add'>+</div><div class='add'>+hwrm_func_resc_qcaps_exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_func_qcaps(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_qcaps_output *resp;</div><div class='add'>+	struct hwrm_func_qcaps_input *req;</div><div class='add'>+	struct bnge_pf_info *pf = &amp;bd-&gt;pf;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto hwrm_func_qcaps_exit;</div><div class='add'>+</div><div class='add'>+	flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_ROCE_V1_SUPPORTED)</div><div class='add'>+		bd-&gt;flags |= BNGE_EN_ROCE_V1;</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_ROCE_V2_SUPPORTED)</div><div class='add'>+		bd-&gt;flags |= BNGE_EN_ROCE_V2;</div><div class='add'>+</div><div class='add'>+	pf-&gt;fw_fid = le16_to_cpu(resp-&gt;fid);</div><div class='add'>+	pf-&gt;port_id = le16_to_cpu(resp-&gt;port_id);</div><div class='add'>+	memcpy(pf-&gt;mac_addr, resp-&gt;mac_address, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	bd-&gt;tso_max_segs = le16_to_cpu(resp-&gt;max_tso_segs);</div><div class='add'>+</div><div class='add'>+hwrm_func_qcaps_exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_qcaps(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_qcaps_output *resp;</div><div class='add'>+	struct hwrm_vnic_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bd-&gt;hw_ring_stats_size = sizeof(struct ctx_hw_stats);</div><div class='add'>+	bd-&gt;rss_cap &amp;= ~BNGE_RSS_CAP_NEW_RSS_CAP;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VNIC_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		u32 flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_VLAN_STRIP_CAP)</div><div class='add'>+			bd-&gt;fw_cap |= BNGE_FW_CAP_VLAN_RX_STRIP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_HASH_TYPE_DELTA_CAP)</div><div class='add'>+			bd-&gt;rss_cap |= BNGE_RSS_CAP_RSS_HASH_TYPE_DELTA;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_PROF_TCAM_MODE_ENABLED)</div><div class='add'>+			bd-&gt;rss_cap |= BNGE_RSS_CAP_RSS_TCAM;</div><div class='add'>+		bd-&gt;max_tpa_v2 = le16_to_cpu(resp-&gt;max_aggs_supported);</div><div class='add'>+		if (bd-&gt;max_tpa_v2)</div><div class='add'>+			bd-&gt;hw_ring_stats_size = BNGE_RING_STATS_SIZE;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_HW_TUNNEL_TPA_CAP)</div><div class='add'>+			bd-&gt;fw_cap |= BNGE_FW_CAP_VNIC_TUNNEL_TPA;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_AH_SPI_IPV4_CAP)</div><div class='add'>+			bd-&gt;rss_cap |= BNGE_RSS_CAP_AH_V4_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_AH_SPI_IPV6_CAP)</div><div class='add'>+			bd-&gt;rss_cap |= BNGE_RSS_CAP_AH_V6_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_ESP_SPI_IPV4_CAP)</div><div class='add'>+			bd-&gt;rss_cap |= BNGE_RSS_CAP_ESP_V4_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_ESP_SPI_IPV6_CAP)</div><div class='add'>+			bd-&gt;rss_cap |= BNGE_RSS_CAP_ESP_V6_RSS_CAP;</div><div class='add'>+	}</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNGE_CNPQ(q_profile)	\</div><div class='add'>+		((q_profile) ==	\</div><div class='add'>+		 QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSY_ROCE_CNP)</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_queue_qportcfg(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_queue_qportcfg_output *resp;</div><div class='add'>+	struct hwrm_queue_qportcfg_input *req;</div><div class='add'>+	u8 i, j, *qptr;</div><div class='add'>+	bool no_rdma;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_QUEUE_QPORTCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto qportcfg_exit;</div><div class='add'>+</div><div class='add'>+	if (!resp-&gt;max_configurable_queues) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto qportcfg_exit;</div><div class='add'>+	}</div><div class='add'>+	bd-&gt;max_tc = resp-&gt;max_configurable_queues;</div><div class='add'>+	bd-&gt;max_lltc = resp-&gt;max_configurable_lossless_queues;</div><div class='add'>+	if (bd-&gt;max_tc &gt; BNGE_MAX_QUEUE)</div><div class='add'>+		bd-&gt;max_tc = BNGE_MAX_QUEUE;</div><div class='add'>+</div><div class='add'>+	no_rdma = !bnge_is_roce_en(bd);</div><div class='add'>+	qptr = &amp;resp-&gt;queue_id0;</div><div class='add'>+	for (i = 0, j = 0; i &lt; bd-&gt;max_tc; i++) {</div><div class='add'>+		bd-&gt;q_info[j].queue_id = *qptr;</div><div class='add'>+		bd-&gt;q_ids[i] = *qptr++;</div><div class='add'>+		bd-&gt;q_info[j].queue_profile = *qptr++;</div><div class='add'>+		bd-&gt;tc_to_qidx[j] = j;</div><div class='add'>+		if (!BNGE_CNPQ(bd-&gt;q_info[j].queue_profile) || no_rdma)</div><div class='add'>+			j++;</div><div class='add'>+	}</div><div class='add'>+	bd-&gt;max_q = bd-&gt;max_tc;</div><div class='add'>+	bd-&gt;max_tc = max_t(u8, j, 1);</div><div class='add'>+</div><div class='add'>+	if (resp-&gt;queue_cfg_info &amp; QUEUE_QPORTCFG_RESP_QUEUE_CFG_INFO_ASYM_CFG)</div><div class='add'>+		bd-&gt;max_tc = 1;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;max_lltc &gt; bd-&gt;max_tc)</div><div class='add'>+		bd-&gt;max_lltc = bd-&gt;max_tc;</div><div class='add'>+</div><div class='add'>+qportcfg_exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_set_hds(struct bnge_net *bn, struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	u16 hds_thresh = (u16)bn-&gt;netdev-&gt;cfg_pending-&gt;hds_thresh;</div><div class='add'>+	struct hwrm_vnic_plcmodes_cfg_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VNIC_PLCMODES_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(VNIC_PLCMODES_CFG_REQ_FLAGS_JUMBO_PLACEMENT);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(BNGE_PLC_EN_JUMBO_THRES_VALID);</div><div class='add'>+	req-&gt;jumbo_thresh = cpu_to_le16(bn-&gt;rx_buf_use_size);</div><div class='add'>+</div><div class='add'>+	if (bnge_is_agg_reqd(bd)) {</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV4 |</div><div class='add'>+					  VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(BNGE_PLC_EN_HDS_THRES_VALID);</div><div class='add'>+		req-&gt;hds_threshold = cpu_to_le16(hds_thresh);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_ctx_alloc(struct bnge_dev *bd,</div><div class='add'>+			     struct bnge_vnic_info *vnic, u16 ctx_idx)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_rss_cos_lb_ctx_alloc_output *resp;</div><div class='add'>+	struct hwrm_vnic_rss_cos_lb_ctx_alloc_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VNIC_RSS_COS_LB_CTX_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		vnic-&gt;fw_rss_cos_lb_ctx[ctx_idx] =</div><div class='add'>+			le16_to_cpu(resp-&gt;rss_cos_lb_ctx_id);</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__bnge_hwrm_vnic_set_rss(struct bnge_net *bn,</div><div class='add'>+			 struct hwrm_vnic_rss_cfg_input *req,</div><div class='add'>+			 struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	bnge_fill_hw_rss_tbl(bn, vnic);</div><div class='add'>+	req-&gt;flags |= VNIC_RSS_CFG_REQ_FLAGS_IPSEC_HASH_TYPE_CFG_SUPPORT;</div><div class='add'>+</div><div class='add'>+	req-&gt;hash_type = cpu_to_le32(bd-&gt;rss_hash_cfg);</div><div class='add'>+	req-&gt;hash_mode_flags = VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_DEFAULT;</div><div class='add'>+	req-&gt;ring_grp_tbl_addr = cpu_to_le64(vnic-&gt;rss_table_dma_addr);</div><div class='add'>+	req-&gt;hash_key_tbl_addr = cpu_to_le64(vnic-&gt;rss_hash_key_dma_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_set_rss(struct bnge_net *bn,</div><div class='add'>+			   struct bnge_vnic_info *vnic, bool set_rss)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_rss_cfg_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	dma_addr_t ring_tbl_map;</div><div class='add'>+	u32 i, nr_ctxs;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VNIC_RSS_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	if (!set_rss)</div><div class='add'>+		return bnge_hwrm_req_send(bd, req);</div><div class='add'>+</div><div class='add'>+	__bnge_hwrm_vnic_set_rss(bn, req, vnic);</div><div class='add'>+	ring_tbl_map = vnic-&gt;rss_table_dma_addr;</div><div class='add'>+	nr_ctxs = bnge_cal_nr_rss_ctxs(bd-&gt;rx_nr_rings);</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	for (i = 0; i &lt; nr_ctxs; ring_tbl_map += BNGE_RSS_TABLE_SIZE, i++) {</div><div class='add'>+		req-&gt;ring_grp_tbl_addr = cpu_to_le64(ring_tbl_map);</div><div class='add'>+		req-&gt;ring_table_pair_index = i;</div><div class='add'>+		req-&gt;rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[i]);</div><div class='add'>+		rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_cfg(struct bnge_net *bn, struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	struct bnge_rx_ring_info *rxr = &amp;bn-&gt;rx_ring[0];</div><div class='add'>+	struct hwrm_vnic_cfg_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VNIC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;default_rx_ring_id =</div><div class='add'>+		cpu_to_le16(rxr-&gt;rx_ring_struct.fw_ring_id);</div><div class='add'>+	req-&gt;default_cmpl_ring_id =</div><div class='add'>+		cpu_to_le16(bnge_cp_ring_for_rx(rxr));</div><div class='add'>+	req-&gt;enables =</div><div class='add'>+		cpu_to_le32(VNIC_CFG_REQ_ENABLES_DEFAULT_RX_RING_ID |</div><div class='add'>+			    VNIC_CFG_REQ_ENABLES_DEFAULT_CMPL_RING_ID);</div><div class='add'>+	vnic-&gt;mru = bd-&gt;netdev-&gt;mtu + ETH_HLEN + VLAN_HLEN;</div><div class='add'>+	req-&gt;mru = cpu_to_le16(vnic-&gt;mru);</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_STRIP_VLAN)</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(VNIC_CFG_REQ_FLAGS_VLAN_STRIP_MODE);</div><div class='add'>+	if (vnic-&gt;vnic_id == BNGE_VNIC_DEFAULT &amp;&amp; bnge_aux_registered(bd))</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(BNGE_VNIC_CFG_ROCE_DUAL_MODE);</div><div class='add'>+</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_update_rss_hash_cfg(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	struct hwrm_vnic_rss_qcfg_output *resp;</div><div class='add'>+	struct hwrm_vnic_rss_qcfg_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	if (bnge_hwrm_req_init(bd, req, HWRM_VNIC_RSS_QCFG))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	/* all contexts configured to same hash_type, zero always exists */</div><div class='add'>+	req-&gt;rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	if (!bnge_hwrm_req_send(bd, req))</div><div class='add'>+		bd-&gt;rss_hash_cfg =</div><div class='add'>+			le32_to_cpu(resp-&gt;hash_type) ?: bd-&gt;rss_hash_cfg;</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_l2_filter_free(struct bnge_dev *bd, struct bnge_l2_filter *fltr)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_cfa_l2_filter_free_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_CFA_L2_FILTER_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;l2_filter_id = fltr-&gt;base.filter_id;</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_l2_filter_alloc(struct bnge_dev *bd, struct bnge_l2_filter *fltr)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_cfa_l2_filter_alloc_output *resp;</div><div class='add'>+	struct hwrm_cfa_l2_filter_alloc_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_CFA_L2_FILTER_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX);</div><div class='add'>+</div><div class='add'>+	req-&gt;flags |= cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_OUTERMOST);</div><div class='add'>+	req-&gt;dst_id = cpu_to_le16(fltr-&gt;base.fw_vnic_id);</div><div class='add'>+	req-&gt;enables =</div><div class='add'>+		cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR |</div><div class='add'>+			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID |</div><div class='add'>+			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK);</div><div class='add'>+	ether_addr_copy(req-&gt;l2_addr, fltr-&gt;l2_key.dst_mac_addr);</div><div class='add'>+	eth_broadcast_addr(req-&gt;l2_addr_mask);</div><div class='add'>+</div><div class='add'>+	if (fltr-&gt;l2_key.vlan) {</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN |</div><div class='add'>+				CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN_MASK |</div><div class='add'>+				CFA_L2_FILTER_ALLOC_REQ_ENABLES_NUM_VLANS);</div><div class='add'>+		req-&gt;num_vlans = 1;</div><div class='add'>+		req-&gt;l2_ivlan = cpu_to_le16(fltr-&gt;l2_key.vlan);</div><div class='add'>+		req-&gt;l2_ivlan_mask = cpu_to_le16(0xfff);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		fltr-&gt;base.filter_id = resp-&gt;l2_filter_id;</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_cfa_l2_set_rx_mask(struct bnge_dev *bd,</div><div class='add'>+				 struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_cfa_l2_set_rx_mask_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_CFA_L2_SET_RX_MASK);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='add'>+	if (vnic-&gt;rx_mask &amp; CFA_L2_SET_RX_MASK_REQ_MASK_MCAST) {</div><div class='add'>+		req-&gt;num_mc_entries = cpu_to_le32(vnic-&gt;mc_list_count);</div><div class='add'>+		req-&gt;mc_tbl_addr = cpu_to_le64(vnic-&gt;mc_list_mapping);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;mask = cpu_to_le32(vnic-&gt;rx_mask);</div><div class='add'>+	return bnge_hwrm_req_send_silent(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_alloc(struct bnge_dev *bd, struct bnge_vnic_info *vnic,</div><div class='add'>+			 unsigned int nr_rings)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_alloc_output *resp;</div><div class='add'>+	struct hwrm_vnic_alloc_input *req;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_VNIC_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BNGE_MAX_CTX_PER_VNIC; i++)</div><div class='add'>+		vnic-&gt;fw_rss_cos_lb_ctx[i] = INVALID_HW_RING_ID;</div><div class='add'>+	if (vnic-&gt;vnic_id == BNGE_VNIC_DEFAULT)</div><div class='add'>+		req-&gt;flags = cpu_to_le32(VNIC_ALLOC_REQ_FLAGS_DEFAULT);</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		vnic-&gt;fw_vnic_id = le32_to_cpu(resp-&gt;vnic_id);</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_vnic_free_one(struct bnge_dev *bd, struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	if (vnic-&gt;fw_vnic_id != INVALID_HW_RING_ID) {</div><div class='add'>+		struct hwrm_vnic_free_input *req;</div><div class='add'>+</div><div class='add'>+		if (bnge_hwrm_req_init(bd, req, HWRM_VNIC_FREE))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='add'>+</div><div class='add'>+		bnge_hwrm_req_send(bd, req);</div><div class='add'>+		vnic-&gt;fw_vnic_id = INVALID_HW_RING_ID;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_vnic_ctx_free_one(struct bnge_dev *bd,</div><div class='add'>+				 struct bnge_vnic_info *vnic, u16 ctx_idx)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_rss_cos_lb_ctx_free_input *req;</div><div class='add'>+</div><div class='add'>+	if (bnge_hwrm_req_init(bd, req, HWRM_VNIC_RSS_COS_LB_CTX_FREE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req-&gt;rss_cos_lb_ctx_id =</div><div class='add'>+		cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[ctx_idx]);</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_send(bd, req);</div><div class='add'>+	vnic-&gt;fw_rss_cos_lb_ctx[ctx_idx] = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_hwrm_stat_ctx_free(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_stat_ctx_free_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (bnge_hwrm_req_init(bd, req, HWRM_STAT_CTX_FREE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+</div><div class='add'>+		if (nqr-&gt;hw_stats_ctx_id != INVALID_STATS_CTX_ID) {</div><div class='add'>+			req-&gt;stat_ctx_id = cpu_to_le32(nqr-&gt;hw_stats_ctx_id);</div><div class='add'>+			bnge_hwrm_req_send(bd, req);</div><div class='add'>+</div><div class='add'>+			nqr-&gt;hw_stats_ctx_id = INVALID_STATS_CTX_ID;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_stat_ctx_alloc(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_stat_ctx_alloc_output *resp;</div><div class='add'>+	struct hwrm_stat_ctx_alloc_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_STAT_CTX_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;stats_dma_length = cpu_to_le16(bd-&gt;hw_ring_stats_size);</div><div class='add'>+	req-&gt;update_period_ms = cpu_to_le32(bn-&gt;stats_coal_ticks / 1000);</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+</div><div class='add'>+		req-&gt;stats_dma_addr = cpu_to_le64(nqr-&gt;stats.hw_stats_map);</div><div class='add'>+</div><div class='add'>+		rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		nqr-&gt;hw_stats_ctx_id = le32_to_cpu(resp-&gt;stat_ctx_id);</div><div class='add'>+		bn-&gt;grp_info[i].fw_stats_ctx = nqr-&gt;hw_stats_ctx_id;</div><div class='add'>+	}</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hwrm_ring_free_send_msg(struct bnge_net *bn,</div><div class='add'>+			    struct bnge_ring_struct *ring,</div><div class='add'>+			    u32 ring_type, int cmpl_ring_id)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_ring_free_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_RING_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	req-&gt;cmpl_ring = cpu_to_le16(cmpl_ring_id);</div><div class='add'>+	req-&gt;ring_type = ring_type;</div><div class='add'>+	req-&gt;ring_id = cpu_to_le16(ring-&gt;fw_ring_id);</div><div class='add'>+</div><div class='add'>+	bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+exit:</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bd-&gt;netdev, "hwrm_ring_free type %d failed. rc:%d\n", ring_type, rc);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int hwrm_ring_alloc_send_msg(struct bnge_net *bn,</div><div class='add'>+			     struct bnge_ring_struct *ring,</div><div class='add'>+			     u32 ring_type, u32 map_index)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_mem_info *rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+	struct bnge_ring_grp_info *grp_info;</div><div class='add'>+	struct hwrm_ring_alloc_output *resp;</div><div class='add'>+	struct hwrm_ring_alloc_input *req;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	u16 ring_id, flags = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_RING_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = 0;</div><div class='add'>+	if (rmem-&gt;nr_pages &gt; 1) {</div><div class='add'>+		req-&gt;page_tbl_addr = cpu_to_le64(rmem-&gt;dma_pg_tbl);</div><div class='add'>+		/* Page size is in log2 units */</div><div class='add'>+		req-&gt;page_size = BNGE_PAGE_SHIFT;</div><div class='add'>+		req-&gt;page_tbl_depth = 1;</div><div class='add'>+	} else {</div><div class='add'>+		req-&gt;page_tbl_addr =  cpu_to_le64(rmem-&gt;dma_arr[0]);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;fbo = 0;</div><div class='add'>+	/* Association of ring index with doorbell index and MSIX number */</div><div class='add'>+	req-&gt;logical_id = cpu_to_le16(map_index);</div><div class='add'>+</div><div class='add'>+	switch (ring_type) {</div><div class='add'>+	case HWRM_RING_ALLOC_TX: {</div><div class='add'>+		struct bnge_tx_ring_info *txr;</div><div class='add'>+</div><div class='add'>+		txr = container_of(ring, struct bnge_tx_ring_info,</div><div class='add'>+				   tx_ring_struct);</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_TX;</div><div class='add'>+		/* Association of transmit ring with completion ring */</div><div class='add'>+		grp_info = &amp;bn-&gt;grp_info[ring-&gt;grp_idx];</div><div class='add'>+		req-&gt;cmpl_ring_id = cpu_to_le16(bnge_cp_ring_for_tx(txr));</div><div class='add'>+		req-&gt;length = cpu_to_le32(bn-&gt;tx_ring_mask + 1);</div><div class='add'>+		req-&gt;stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='add'>+		req-&gt;queue_id = cpu_to_le16(ring-&gt;queue_id);</div><div class='add'>+		req-&gt;flags = cpu_to_le16(flags);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case HWRM_RING_ALLOC_RX:</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_RX;</div><div class='add'>+		req-&gt;length = cpu_to_le32(bn-&gt;rx_ring_mask + 1);</div><div class='add'>+</div><div class='add'>+		/* Association of rx ring with stats context */</div><div class='add'>+		grp_info = &amp;bn-&gt;grp_info[ring-&gt;grp_idx];</div><div class='add'>+		req-&gt;rx_buf_size = cpu_to_le16(bn-&gt;rx_buf_use_size);</div><div class='add'>+		req-&gt;stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID);</div><div class='add'>+		if (NET_IP_ALIGN == 2)</div><div class='add'>+			flags = RING_ALLOC_REQ_FLAGS_RX_SOP_PAD;</div><div class='add'>+		req-&gt;flags = cpu_to_le16(flags);</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_AGG:</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_RX_AGG;</div><div class='add'>+		/* Association of agg ring with rx ring */</div><div class='add'>+		grp_info = &amp;bn-&gt;grp_info[ring-&gt;grp_idx];</div><div class='add'>+		req-&gt;rx_ring_id = cpu_to_le16(grp_info-&gt;rx_fw_ring_id);</div><div class='add'>+		req-&gt;rx_buf_size = cpu_to_le16(BNGE_RX_PAGE_SIZE);</div><div class='add'>+		req-&gt;stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(RING_ALLOC_REQ_ENABLES_RX_RING_ID_VALID |</div><div class='add'>+				    RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID);</div><div class='add'>+		req-&gt;length = cpu_to_le32(bn-&gt;rx_agg_ring_mask + 1);</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_CMPL:</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;</div><div class='add'>+		req-&gt;length = cpu_to_le32(bn-&gt;cp_ring_mask + 1);</div><div class='add'>+		/* Association of cp ring with nq */</div><div class='add'>+		grp_info = &amp;bn-&gt;grp_info[map_index];</div><div class='add'>+		req-&gt;nq_ring_id = cpu_to_le16(grp_info-&gt;nq_fw_ring_id);</div><div class='add'>+		req-&gt;cq_handle = cpu_to_le64(ring-&gt;handle);</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(RING_ALLOC_REQ_ENABLES_NQ_RING_ID_VALID);</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_NQ:</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_NQ;</div><div class='add'>+		req-&gt;length = cpu_to_le32(bn-&gt;cp_ring_mask + 1);</div><div class='add'>+		req-&gt;int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(bn-&gt;netdev, "hwrm alloc invalid ring type %d\n", ring_type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = bnge_hwrm_req_hold(bd, req);</div><div class='add'>+	rc = bnge_hwrm_req_send(bd, req);</div><div class='add'>+	ring_id = le16_to_cpu(resp-&gt;ring_id);</div><div class='add'>+	bnge_hwrm_req_drop(bd, req);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bd-&gt;netdev, "hwrm_ring_alloc type %d failed. rc:%d\n", ring_type, rc);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+	ring-&gt;fw_ring_id = ring_id;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_set_async_event_cr(struct bnge_dev *bd, int idx)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_req_init(bd, req, HWRM_FUNC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_ASYNC_EVENT_CR);</div><div class='add'>+	req-&gt;async_event_cr = cpu_to_le16(idx);</div><div class='add'>+	return bnge_hwrm_req_send(bd, req);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h b/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h<br/>new file mode 100644<br/>index 000000000000..042f28e84a05<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h</a></div><div class='hunk'>@@ -0,0 +1,58 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_HWRM_LIB_H_</div><div class='add'>+#define _BNGE_HWRM_LIB_H_</div><div class='add'>+</div><div class='add'>+#define BNGE_PLC_EN_JUMBO_THRES_VALID		\</div><div class='add'>+	VNIC_PLCMODES_CFG_REQ_ENABLES_JUMBO_THRESH_VALID</div><div class='add'>+#define BNGE_PLC_EN_HDS_THRES_VALID		\</div><div class='add'>+	VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID</div><div class='add'>+#define BNGE_VNIC_CFG_ROCE_DUAL_MODE		\</div><div class='add'>+	VNIC_CFG_REQ_FLAGS_ROCE_DUAL_VNIC_MODE</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_ver_get(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_func_reset(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_fw_set_time(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_func_drv_rgtr(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_func_drv_unrgtr(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_vnic_qcaps(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_nvm_dev_info(struct bnge_dev *bd,</div><div class='add'>+			   struct hwrm_nvm_get_dev_info_output *nvm_dev_info);</div><div class='add'>+int bnge_hwrm_func_backing_store(struct bnge_dev *bd,</div><div class='add'>+				 struct bnge_ctx_mem_type *ctxm,</div><div class='add'>+				 bool last);</div><div class='add'>+int bnge_hwrm_func_backing_store_qcaps(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_reserve_rings(struct bnge_dev *bd,</div><div class='add'>+			    struct bnge_hw_rings *hwr);</div><div class='add'>+int bnge_hwrm_func_qcaps(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_vnic_qcaps(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_func_qcfg(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_func_resc_qcaps(struct bnge_dev *bd);</div><div class='add'>+int bnge_hwrm_queue_qportcfg(struct bnge_dev *bd);</div><div class='add'>+</div><div class='add'>+int bnge_hwrm_vnic_set_hds(struct bnge_net *bn, struct bnge_vnic_info *vnic);</div><div class='add'>+int bnge_hwrm_vnic_ctx_alloc(struct bnge_dev *bd,</div><div class='add'>+			     struct bnge_vnic_info *vnic, u16 ctx_idx);</div><div class='add'>+int bnge_hwrm_vnic_set_rss(struct bnge_net *bn,</div><div class='add'>+			   struct bnge_vnic_info *vnic, bool set_rss);</div><div class='add'>+int bnge_hwrm_vnic_cfg(struct bnge_net *bn, struct bnge_vnic_info *vnic);</div><div class='add'>+void bnge_hwrm_update_rss_hash_cfg(struct bnge_net *bn);</div><div class='add'>+int bnge_hwrm_vnic_alloc(struct bnge_dev *bd, struct bnge_vnic_info *vnic,</div><div class='add'>+			 unsigned int nr_rings);</div><div class='add'>+void bnge_hwrm_vnic_free_one(struct bnge_dev *bd, struct bnge_vnic_info *vnic);</div><div class='add'>+void bnge_hwrm_vnic_ctx_free_one(struct bnge_dev *bd,</div><div class='add'>+				 struct bnge_vnic_info *vnic, u16 ctx_idx);</div><div class='add'>+int bnge_hwrm_l2_filter_free(struct bnge_dev *bd, struct bnge_l2_filter *fltr);</div><div class='add'>+int bnge_hwrm_l2_filter_alloc(struct bnge_dev *bd, struct bnge_l2_filter *fltr);</div><div class='add'>+int bnge_hwrm_cfa_l2_set_rx_mask(struct bnge_dev *bd,</div><div class='add'>+				 struct bnge_vnic_info *vnic);</div><div class='add'>+void bnge_hwrm_stat_ctx_free(struct bnge_net *bn);</div><div class='add'>+int bnge_hwrm_stat_ctx_alloc(struct bnge_net *bn);</div><div class='add'>+int hwrm_ring_free_send_msg(struct bnge_net *bn, struct bnge_ring_struct *ring,</div><div class='add'>+			    u32 ring_type, int cmpl_ring_id);</div><div class='add'>+int hwrm_ring_alloc_send_msg(struct bnge_net *bn,</div><div class='add'>+			     struct bnge_ring_struct *ring,</div><div class='add'>+			     u32 ring_type, u32 map_index);</div><div class='add'>+int bnge_hwrm_set_async_event_cr(struct bnge_dev *bd, int idx);</div><div class='add'>+#endif /* _BNGE_HWRM_LIB_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c<br/>new file mode 100644<br/>index 000000000000..832eeb960bd2<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_netdev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_netdev.c</a></div><div class='hunk'>@@ -0,0 +1,2485 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='add'>+#include &lt;linux/delay.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/if.h&gt;</div><div class='add'>+#include &lt;net/ip.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_hwrm_lib.h"</div><div class='add'>+#include "bnge_ethtool.h"</div><div class='add'>+#include "bnge_rmem.h"</div><div class='add'>+</div><div class='add'>+#define BNGE_RING_TO_TC_OFF(bd, tx)	\</div><div class='add'>+	((tx) % (bd)-&gt;tx_nr_rings_per_tc)</div><div class='add'>+</div><div class='add'>+#define BNGE_RING_TO_TC(bd, tx)		\</div><div class='add'>+	((tx) / (bd)-&gt;tx_nr_rings_per_tc)</div><div class='add'>+</div><div class='add'>+#define BNGE_TC_TO_RING_BASE(bd, tc)	\</div><div class='add'>+	((tc) * (bd)-&gt;tx_nr_rings_per_tc)</div><div class='add'>+</div><div class='add'>+static void bnge_free_stats_mem(struct bnge_net *bn,</div><div class='add'>+				struct bnge_stats_mem *stats)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	if (stats-&gt;hw_stats) {</div><div class='add'>+		dma_free_coherent(bd-&gt;dev, stats-&gt;len, stats-&gt;hw_stats,</div><div class='add'>+				  stats-&gt;hw_stats_map);</div><div class='add'>+		stats-&gt;hw_stats = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_stats_mem(struct bnge_net *bn,</div><div class='add'>+				struct bnge_stats_mem *stats)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	stats-&gt;hw_stats = dma_alloc_coherent(bd-&gt;dev, stats-&gt;len,</div><div class='add'>+					     &amp;stats-&gt;hw_stats_map, GFP_KERNEL);</div><div class='add'>+	if (!stats-&gt;hw_stats)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_ring_stats(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bn-&gt;bnapi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+</div><div class='add'>+		bnge_free_stats_mem(bn, &amp;nqr-&gt;stats);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_ring_stats(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	u32 size, i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	size = bd-&gt;hw_ring_stats_size;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+</div><div class='add'>+		nqr-&gt;stats.len = size;</div><div class='add'>+		rc = bnge_alloc_stats_mem(bn, &amp;nqr-&gt;stats);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_ring_stats;</div><div class='add'>+</div><div class='add'>+		nqr-&gt;hw_stats_ctx_id = INVALID_STATS_CTX_ID;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_ring_stats:</div><div class='add'>+	bnge_free_ring_stats(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_nq_desc_arr(struct bnge_nq_ring_info *nqr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+</div><div class='add'>+	kfree(nqr-&gt;desc_ring);</div><div class='add'>+	nqr-&gt;desc_ring = NULL;</div><div class='add'>+	ring-&gt;ring_mem.pg_arr = NULL;</div><div class='add'>+	kfree(nqr-&gt;desc_mapping);</div><div class='add'>+	nqr-&gt;desc_mapping = NULL;</div><div class='add'>+	ring-&gt;ring_mem.dma_arr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_cp_desc_arr(struct bnge_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+</div><div class='add'>+	kfree(cpr-&gt;desc_ring);</div><div class='add'>+	cpr-&gt;desc_ring = NULL;</div><div class='add'>+	ring-&gt;ring_mem.pg_arr = NULL;</div><div class='add'>+	kfree(cpr-&gt;desc_mapping);</div><div class='add'>+	cpr-&gt;desc_mapping = NULL;</div><div class='add'>+	ring-&gt;ring_mem.dma_arr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_nq_desc_arr(struct bnge_nq_ring_info *nqr, int n)</div><div class='add'>+{</div><div class='add'>+	nqr-&gt;desc_ring = kcalloc(n, sizeof(*nqr-&gt;desc_ring), GFP_KERNEL);</div><div class='add'>+	if (!nqr-&gt;desc_ring)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	nqr-&gt;desc_mapping = kcalloc(n, sizeof(*nqr-&gt;desc_mapping), GFP_KERNEL);</div><div class='add'>+	if (!nqr-&gt;desc_mapping)</div><div class='add'>+		goto err_free_desc_ring;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_desc_ring:</div><div class='add'>+	kfree(nqr-&gt;desc_ring);</div><div class='add'>+	nqr-&gt;desc_ring = NULL;</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_cp_desc_arr(struct bnge_cp_ring_info *cpr, int n)</div><div class='add'>+{</div><div class='add'>+	cpr-&gt;desc_ring = kcalloc(n, sizeof(*cpr-&gt;desc_ring), GFP_KERNEL);</div><div class='add'>+	if (!cpr-&gt;desc_ring)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cpr-&gt;desc_mapping = kcalloc(n, sizeof(*cpr-&gt;desc_mapping), GFP_KERNEL);</div><div class='add'>+	if (!cpr-&gt;desc_mapping)</div><div class='add'>+		goto err_free_desc_ring;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_desc_ring:</div><div class='add'>+	kfree(cpr-&gt;desc_ring);</div><div class='add'>+	cpr-&gt;desc_ring = NULL;</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_nq_arrays(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+</div><div class='add'>+		bnge_free_nq_desc_arr(&amp;bnapi-&gt;nq_ring);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_nq_arrays(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+</div><div class='add'>+		rc = bnge_alloc_nq_desc_arr(&amp;bnapi-&gt;nq_ring, bn-&gt;cp_nr_pages);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_nq_arrays;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_nq_arrays:</div><div class='add'>+	bnge_free_nq_arrays(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_nq_tree(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr;</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+		ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+</div><div class='add'>+		bnge_free_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+</div><div class='add'>+		if (!nqr-&gt;cp_ring_arr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; nqr-&gt;cp_ring_count; j++) {</div><div class='add'>+			struct bnge_cp_ring_info *cpr = &amp;nqr-&gt;cp_ring_arr[j];</div><div class='add'>+</div><div class='add'>+			ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+			bnge_free_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+			bnge_free_cp_desc_arr(cpr);</div><div class='add'>+		}</div><div class='add'>+		kfree(nqr-&gt;cp_ring_arr);</div><div class='add'>+		nqr-&gt;cp_ring_arr = NULL;</div><div class='add'>+		nqr-&gt;cp_ring_count = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int alloc_one_cp_ring(struct bnge_net *bn,</div><div class='add'>+			     struct bnge_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_mem_info *rmem;</div><div class='add'>+	struct bnge_ring_struct *ring;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_cp_desc_arr(cpr, bn-&gt;cp_nr_pages);</div><div class='add'>+	if (rc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+	rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+	rmem-&gt;nr_pages = bn-&gt;cp_nr_pages;</div><div class='add'>+	rmem-&gt;page_size = HW_CMPD_RING_SIZE;</div><div class='add'>+	rmem-&gt;pg_arr = (void **)cpr-&gt;desc_ring;</div><div class='add'>+	rmem-&gt;dma_arr = cpr-&gt;desc_mapping;</div><div class='add'>+	rmem-&gt;flags = BNGE_RMEM_RING_PTE_FLAG;</div><div class='add'>+	rc = bnge_alloc_ring(bd, rmem);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_cp_desc_arr;</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+err_free_cp_desc_arr:</div><div class='add'>+	bnge_free_cp_desc_arr(cpr);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_nq_tree(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, j, ulp_msix, rc;</div><div class='add'>+	int tcs = 1;</div><div class='add'>+</div><div class='add'>+	ulp_msix = bnge_aux_get_msix(bd);</div><div class='add'>+	for (i = 0, j = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		bool sh = !!(bd-&gt;flags &amp; BNGE_EN_SHARED_CHNL);</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr;</div><div class='add'>+		struct bnge_cp_ring_info *cpr;</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+		int cp_count = 0, k;</div><div class='add'>+		int rx = 0, tx = 0;</div><div class='add'>+</div><div class='add'>+		nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+		nqr-&gt;bnapi = bnapi;</div><div class='add'>+		ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+</div><div class='add'>+		rc = bnge_alloc_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_nq_tree;</div><div class='add'>+</div><div class='add'>+		ring-&gt;map_idx = ulp_msix + i;</div><div class='add'>+</div><div class='add'>+		if (i &lt; bd-&gt;rx_nr_rings) {</div><div class='add'>+			cp_count++;</div><div class='add'>+			rx = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((sh &amp;&amp; i &lt; bd-&gt;tx_nr_rings) ||</div><div class='add'>+		    (!sh &amp;&amp; i &gt;= bd-&gt;rx_nr_rings)) {</div><div class='add'>+			cp_count += tcs;</div><div class='add'>+			tx = 1;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nqr-&gt;cp_ring_arr = kcalloc(cp_count, sizeof(*cpr),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!nqr-&gt;cp_ring_arr) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			goto err_free_nq_tree;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nqr-&gt;cp_ring_count = cp_count;</div><div class='add'>+</div><div class='add'>+		for (k = 0; k &lt; cp_count; k++) {</div><div class='add'>+			cpr = &amp;nqr-&gt;cp_ring_arr[k];</div><div class='add'>+			rc = alloc_one_cp_ring(bn, cpr);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto err_free_nq_tree;</div><div class='add'>+</div><div class='add'>+			cpr-&gt;bnapi = bnapi;</div><div class='add'>+			cpr-&gt;cp_idx = k;</div><div class='add'>+			if (!k &amp;&amp; rx) {</div><div class='add'>+				bn-&gt;rx_ring[i].rx_cpr = cpr;</div><div class='add'>+				cpr-&gt;cp_ring_type = BNGE_NQ_HDL_TYPE_RX;</div><div class='add'>+			} else {</div><div class='add'>+				int n, tc = k - rx;</div><div class='add'>+</div><div class='add'>+				n = BNGE_TC_TO_RING_BASE(bd, tc) + j;</div><div class='add'>+				bn-&gt;tx_ring[n].tx_cpr = cpr;</div><div class='add'>+				cpr-&gt;cp_ring_type = BNGE_NQ_HDL_TYPE_TX;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (tx)</div><div class='add'>+			j++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_nq_tree:</div><div class='add'>+	bnge_free_nq_tree(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnge_separate_head_pool(struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	return rxr-&gt;need_head_pool || PAGE_SIZE &gt; BNGE_RX_PAGE_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_one_rx_ring_bufs(struct bnge_net *bn,</div><div class='add'>+				       struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	int i, max_idx;</div><div class='add'>+</div><div class='add'>+	if (!rxr-&gt;rx_buf_ring)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	max_idx = bn-&gt;rx_nr_pages * RX_DESC_CNT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_idx; i++) {</div><div class='add'>+		struct bnge_sw_rx_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[i];</div><div class='add'>+		void *data = rx_buf-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (!data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rx_buf-&gt;data = NULL;</div><div class='add'>+		page_pool_free_va(rxr-&gt;head_pool, data, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_one_agg_ring_bufs(struct bnge_net *bn,</div><div class='add'>+					struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	int i, max_idx;</div><div class='add'>+</div><div class='add'>+	if (!rxr-&gt;rx_agg_buf_ring)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	max_idx = bn-&gt;rx_agg_nr_pages * RX_DESC_CNT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_idx; i++) {</div><div class='add'>+		struct bnge_sw_rx_agg_bd *rx_agg_buf = &amp;rxr-&gt;rx_agg_buf_ring[i];</div><div class='add'>+		netmem_ref netmem = rx_agg_buf-&gt;netmem;</div><div class='add'>+</div><div class='add'>+		if (!netmem)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rx_agg_buf-&gt;netmem = 0;</div><div class='add'>+		__clear_bit(i, rxr-&gt;rx_agg_bmap);</div><div class='add'>+</div><div class='add'>+		page_pool_recycle_direct_netmem(rxr-&gt;page_pool, netmem);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_one_rx_ring_pair_bufs(struct bnge_net *bn,</div><div class='add'>+					    struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	bnge_free_one_rx_ring_bufs(bn, rxr);</div><div class='add'>+	bnge_free_one_agg_ring_bufs(bn, rxr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_rx_ring_pair_bufs(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bn-&gt;rx_ring)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++)</div><div class='add'>+		bnge_free_one_rx_ring_pair_bufs(bn, &amp;bn-&gt;rx_ring[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_all_rings_bufs(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	bnge_free_rx_ring_pair_bufs(bn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_rx_rings(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnge_rx_ring_info *rxr = &amp;bn-&gt;rx_ring[i];</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+		page_pool_destroy(rxr-&gt;page_pool);</div><div class='add'>+		page_pool_destroy(rxr-&gt;head_pool);</div><div class='add'>+		rxr-&gt;page_pool = rxr-&gt;head_pool = NULL;</div><div class='add'>+</div><div class='add'>+		kfree(rxr-&gt;rx_agg_bmap);</div><div class='add'>+		rxr-&gt;rx_agg_bmap = NULL;</div><div class='add'>+</div><div class='add'>+		ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+		bnge_free_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+</div><div class='add'>+		ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+		bnge_free_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rx_page_pool(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_rx_ring_info *rxr,</div><div class='add'>+				   int numa_node)</div><div class='add'>+{</div><div class='add'>+	const unsigned int agg_size_fac = PAGE_SIZE / BNGE_RX_PAGE_SIZE;</div><div class='add'>+	const unsigned int rx_size_fac = PAGE_SIZE / SZ_4K;</div><div class='add'>+	struct page_pool_params pp = { 0 };</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+</div><div class='add'>+	pp.pool_size = bn-&gt;rx_agg_ring_size / agg_size_fac;</div><div class='add'>+	pp.nid = numa_node;</div><div class='add'>+	pp.netdev = bn-&gt;netdev;</div><div class='add'>+	pp.dev = bd-&gt;dev;</div><div class='add'>+	pp.dma_dir = bn-&gt;rx_dir;</div><div class='add'>+	pp.max_len = PAGE_SIZE;</div><div class='add'>+	pp.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV |</div><div class='add'>+		   PP_FLAG_ALLOW_UNREADABLE_NETMEM;</div><div class='add'>+	pp.queue_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+</div><div class='add'>+	pool = page_pool_create(&amp;pp);</div><div class='add'>+	if (IS_ERR(pool))</div><div class='add'>+		return PTR_ERR(pool);</div><div class='add'>+	rxr-&gt;page_pool = pool;</div><div class='add'>+</div><div class='add'>+	rxr-&gt;need_head_pool = page_pool_is_unreadable(pool);</div><div class='add'>+	if (bnge_separate_head_pool(rxr)) {</div><div class='add'>+		pp.pool_size = min(bn-&gt;rx_ring_size / rx_size_fac, 1024);</div><div class='add'>+		pp.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;</div><div class='add'>+		pool = page_pool_create(&amp;pp);</div><div class='add'>+		if (IS_ERR(pool))</div><div class='add'>+			goto err_destroy_pp;</div><div class='add'>+	} else {</div><div class='add'>+		page_pool_get(pool);</div><div class='add'>+	}</div><div class='add'>+	rxr-&gt;head_pool = pool;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_destroy_pp:</div><div class='add'>+	page_pool_destroy(rxr-&gt;page_pool);</div><div class='add'>+	rxr-&gt;page_pool = NULL;</div><div class='add'>+	return PTR_ERR(pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_enable_rx_page_pool(struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	page_pool_enable_direct_recycling(rxr-&gt;head_pool, &amp;rxr-&gt;bnapi-&gt;napi);</div><div class='add'>+	page_pool_enable_direct_recycling(rxr-&gt;page_pool, &amp;rxr-&gt;bnapi-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rx_agg_bmap(struct bnge_net *bn,</div><div class='add'>+				  struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	u16 mem_size;</div><div class='add'>+</div><div class='add'>+	rxr-&gt;rx_agg_bmap_size = bn-&gt;rx_agg_ring_mask + 1;</div><div class='add'>+	mem_size = rxr-&gt;rx_agg_bmap_size / 8;</div><div class='add'>+	rxr-&gt;rx_agg_bmap = kzalloc(mem_size, GFP_KERNEL);</div><div class='add'>+	if (!rxr-&gt;rx_agg_bmap)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rx_rings(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i, rc = 0, agg_rings = 0, cpu;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	if (bnge_is_agg_reqd(bd))</div><div class='add'>+		agg_rings = 1;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnge_rx_ring_info *rxr = &amp;bn-&gt;rx_ring[i];</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+		int cpu_node;</div><div class='add'>+</div><div class='add'>+		ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+</div><div class='add'>+		cpu = cpumask_local_spread(i, dev_to_node(bd-&gt;dev));</div><div class='add'>+		cpu_node = cpu_to_node(cpu);</div><div class='add'>+		netdev_dbg(bn-&gt;netdev, "Allocating page pool for rx_ring[%d] on numa_node: %d\n",</div><div class='add'>+			   i, cpu_node);</div><div class='add'>+		rc = bnge_alloc_rx_page_pool(bn, rxr, cpu_node);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_rx_rings;</div><div class='add'>+		bnge_enable_rx_page_pool(rxr);</div><div class='add'>+</div><div class='add'>+		rc = bnge_alloc_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_rx_rings;</div><div class='add'>+</div><div class='add'>+		ring-&gt;grp_idx = i;</div><div class='add'>+		if (agg_rings) {</div><div class='add'>+			ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+			rc = bnge_alloc_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto err_free_rx_rings;</div><div class='add'>+</div><div class='add'>+			ring-&gt;grp_idx = i;</div><div class='add'>+			rc = bnge_alloc_rx_agg_bmap(bn, rxr);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto err_free_rx_rings;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+err_free_rx_rings:</div><div class='add'>+	bnge_free_rx_rings(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_tx_rings(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;tx_nr_rings; i++) {</div><div class='add'>+		struct bnge_tx_ring_info *txr = &amp;bn-&gt;tx_ring[i];</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+		ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+</div><div class='add'>+		bnge_free_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_tx_rings(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, j, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0, j = 0; i &lt; bd-&gt;tx_nr_rings; i++) {</div><div class='add'>+		struct bnge_tx_ring_info *txr = &amp;bn-&gt;tx_ring[i];</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+		u8 qidx;</div><div class='add'>+</div><div class='add'>+		ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+</div><div class='add'>+		rc = bnge_alloc_ring(bd, &amp;ring-&gt;ring_mem);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_tx_rings;</div><div class='add'>+</div><div class='add'>+		ring-&gt;grp_idx = txr-&gt;bnapi-&gt;index;</div><div class='add'>+		qidx = bd-&gt;tc_to_qidx[j];</div><div class='add'>+		ring-&gt;queue_id = bd-&gt;q_info[qidx].queue_id;</div><div class='add'>+		if (BNGE_RING_TO_TC_OFF(bd, i) == (bd-&gt;tx_nr_rings_per_tc - 1))</div><div class='add'>+			j++;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_tx_rings:</div><div class='add'>+	bnge_free_tx_rings(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_vnic_attributes(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bn-&gt;bd-&gt;pdev;</div><div class='add'>+	struct bnge_vnic_info *vnic;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bn-&gt;vnic_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;nr_vnics; i++) {</div><div class='add'>+		vnic = &amp;bn-&gt;vnic_info[i];</div><div class='add'>+</div><div class='add'>+		kfree(vnic-&gt;uc_list);</div><div class='add'>+		vnic-&gt;uc_list = NULL;</div><div class='add'>+</div><div class='add'>+		if (vnic-&gt;mc_list) {</div><div class='add'>+			dma_free_coherent(&amp;pdev-&gt;dev, vnic-&gt;mc_list_size,</div><div class='add'>+					  vnic-&gt;mc_list, vnic-&gt;mc_list_mapping);</div><div class='add'>+			vnic-&gt;mc_list = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (vnic-&gt;rss_table) {</div><div class='add'>+			dma_free_coherent(&amp;pdev-&gt;dev, vnic-&gt;rss_table_size,</div><div class='add'>+					  vnic-&gt;rss_table,</div><div class='add'>+					  vnic-&gt;rss_table_dma_addr);</div><div class='add'>+			vnic-&gt;rss_table = NULL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		vnic-&gt;rss_hash_key = NULL;</div><div class='add'>+		vnic-&gt;flags = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_vnic_attributes(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	struct bnge_vnic_info *vnic;</div><div class='add'>+	int i, size;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;nr_vnics; i++) {</div><div class='add'>+		vnic = &amp;bn-&gt;vnic_info[i];</div><div class='add'>+</div><div class='add'>+		if (vnic-&gt;flags &amp; BNGE_VNIC_UCAST_FLAG) {</div><div class='add'>+			int mem_size = (BNGE_MAX_UC_ADDRS - 1) * ETH_ALEN;</div><div class='add'>+</div><div class='add'>+			vnic-&gt;uc_list = kmalloc(mem_size, GFP_KERNEL);</div><div class='add'>+			if (!vnic-&gt;uc_list)</div><div class='add'>+				goto err_free_vnic_attributes;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (vnic-&gt;flags &amp; BNGE_VNIC_MCAST_FLAG) {</div><div class='add'>+			vnic-&gt;mc_list_size = BNGE_MAX_MC_ADDRS * ETH_ALEN;</div><div class='add'>+			vnic-&gt;mc_list =</div><div class='add'>+				dma_alloc_coherent(bd-&gt;dev,</div><div class='add'>+						   vnic-&gt;mc_list_size,</div><div class='add'>+						   &amp;vnic-&gt;mc_list_mapping,</div><div class='add'>+						   GFP_KERNEL);</div><div class='add'>+			if (!vnic-&gt;mc_list)</div><div class='add'>+				goto err_free_vnic_attributes;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Allocate rss table and hash key */</div><div class='add'>+		size = L1_CACHE_ALIGN(BNGE_MAX_RSS_TABLE_SIZE);</div><div class='add'>+</div><div class='add'>+		vnic-&gt;rss_table_size = size + HW_HASH_KEY_SIZE;</div><div class='add'>+		vnic-&gt;rss_table = dma_alloc_coherent(bd-&gt;dev,</div><div class='add'>+						     vnic-&gt;rss_table_size,</div><div class='add'>+						     &amp;vnic-&gt;rss_table_dma_addr,</div><div class='add'>+						     GFP_KERNEL);</div><div class='add'>+		if (!vnic-&gt;rss_table)</div><div class='add'>+			goto err_free_vnic_attributes;</div><div class='add'>+</div><div class='add'>+		vnic-&gt;rss_hash_key = ((void *)vnic-&gt;rss_table) + size;</div><div class='add'>+		vnic-&gt;rss_hash_key_dma_addr = vnic-&gt;rss_table_dma_addr + size;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_vnic_attributes:</div><div class='add'>+	bnge_free_vnic_attributes(bn);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_vnics(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int num_vnics;</div><div class='add'>+</div><div class='add'>+	/* Allocate only 1 VNIC for now</div><div class='add'>+	 * Additional VNICs will be added based on RFS/NTUPLE in future patches</div><div class='add'>+	 */</div><div class='add'>+	num_vnics = 1;</div><div class='add'>+</div><div class='add'>+	bn-&gt;vnic_info = kcalloc(num_vnics, sizeof(struct bnge_vnic_info),</div><div class='add'>+				GFP_KERNEL);</div><div class='add'>+	if (!bn-&gt;vnic_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	bn-&gt;nr_vnics = num_vnics;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_vnics(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	kfree(bn-&gt;vnic_info);</div><div class='add'>+	bn-&gt;vnic_info = NULL;</div><div class='add'>+	bn-&gt;nr_vnics = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_ring_grps(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	kfree(bn-&gt;grp_info);</div><div class='add'>+	bn-&gt;grp_info = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_init_ring_grps(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bn-&gt;grp_info = kcalloc(bd-&gt;nq_nr_rings,</div><div class='add'>+			       sizeof(struct bnge_ring_grp_info),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!bn-&gt;grp_info)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		bn-&gt;grp_info[i].fw_stats_ctx = INVALID_HW_RING_ID;</div><div class='add'>+		bn-&gt;grp_info[i].fw_grp_id = INVALID_HW_RING_ID;</div><div class='add'>+		bn-&gt;grp_info[i].rx_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+		bn-&gt;grp_info[i].agg_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+		bn-&gt;grp_info[i].nq_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_core(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	bnge_free_vnic_attributes(bn);</div><div class='add'>+	bnge_free_tx_rings(bn);</div><div class='add'>+	bnge_free_rx_rings(bn);</div><div class='add'>+	bnge_free_nq_tree(bn);</div><div class='add'>+	bnge_free_nq_arrays(bn);</div><div class='add'>+	bnge_free_ring_stats(bn);</div><div class='add'>+	bnge_free_ring_grps(bn);</div><div class='add'>+	bnge_free_vnics(bn);</div><div class='add'>+	kfree(bn-&gt;tx_ring_map);</div><div class='add'>+	bn-&gt;tx_ring_map = NULL;</div><div class='add'>+	kfree(bn-&gt;tx_ring);</div><div class='add'>+	bn-&gt;tx_ring = NULL;</div><div class='add'>+	kfree(bn-&gt;rx_ring);</div><div class='add'>+	bn-&gt;rx_ring = NULL;</div><div class='add'>+	kfree(bn-&gt;bnapi);</div><div class='add'>+	bn-&gt;bnapi = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_core(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, j, size, arr_size;</div><div class='add'>+	int rc = -ENOMEM;</div><div class='add'>+	void *bnapi;</div><div class='add'>+</div><div class='add'>+	arr_size = L1_CACHE_ALIGN(sizeof(struct bnge_napi *) *</div><div class='add'>+			bd-&gt;nq_nr_rings);</div><div class='add'>+	size = L1_CACHE_ALIGN(sizeof(struct bnge_napi));</div><div class='add'>+	bnapi = kzalloc(arr_size + size * bd-&gt;nq_nr_rings, GFP_KERNEL);</div><div class='add'>+	if (!bnapi)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bn-&gt;bnapi = bnapi;</div><div class='add'>+	bnapi += arr_size;</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++, bnapi += size) {</div><div class='add'>+		struct bnge_nq_ring_info *nqr;</div><div class='add'>+</div><div class='add'>+		bn-&gt;bnapi[i] = bnapi;</div><div class='add'>+		bn-&gt;bnapi[i]-&gt;index = i;</div><div class='add'>+		bn-&gt;bnapi[i]-&gt;bn = bn;</div><div class='add'>+		nqr = &amp;bn-&gt;bnapi[i]-&gt;nq_ring;</div><div class='add'>+		nqr-&gt;ring_struct.ring_mem.flags = BNGE_RMEM_RING_PTE_FLAG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bn-&gt;rx_ring = kcalloc(bd-&gt;rx_nr_rings,</div><div class='add'>+			      sizeof(struct bnge_rx_ring_info),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!bn-&gt;rx_ring)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnge_rx_ring_info *rxr = &amp;bn-&gt;rx_ring[i];</div><div class='add'>+</div><div class='add'>+		rxr-&gt;rx_ring_struct.ring_mem.flags =</div><div class='add'>+			BNGE_RMEM_RING_PTE_FLAG;</div><div class='add'>+		rxr-&gt;rx_agg_ring_struct.ring_mem.flags =</div><div class='add'>+			BNGE_RMEM_RING_PTE_FLAG;</div><div class='add'>+		rxr-&gt;bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		bn-&gt;bnapi[i]-&gt;rx_ring = &amp;bn-&gt;rx_ring[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bn-&gt;tx_ring = kcalloc(bd-&gt;tx_nr_rings,</div><div class='add'>+			      sizeof(struct bnge_tx_ring_info),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!bn-&gt;tx_ring)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	bn-&gt;tx_ring_map = kcalloc(bd-&gt;tx_nr_rings, sizeof(u16),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!bn-&gt;tx_ring_map)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_SHARED_CHNL)</div><div class='add'>+		j = 0;</div><div class='add'>+	else</div><div class='add'>+		j = bd-&gt;rx_nr_rings;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;tx_nr_rings; i++) {</div><div class='add'>+		struct bnge_tx_ring_info *txr = &amp;bn-&gt;tx_ring[i];</div><div class='add'>+		struct bnge_napi *bnapi2;</div><div class='add'>+		int k;</div><div class='add'>+</div><div class='add'>+		txr-&gt;tx_ring_struct.ring_mem.flags = BNGE_RMEM_RING_PTE_FLAG;</div><div class='add'>+		bn-&gt;tx_ring_map[i] = i;</div><div class='add'>+		k = j + BNGE_RING_TO_TC_OFF(bd, i);</div><div class='add'>+</div><div class='add'>+		bnapi2 = bn-&gt;bnapi[k];</div><div class='add'>+		txr-&gt;txq_index = i;</div><div class='add'>+		txr-&gt;tx_napi_idx =</div><div class='add'>+			BNGE_RING_TO_TC(bd, txr-&gt;txq_index);</div><div class='add'>+		bnapi2-&gt;tx_ring[txr-&gt;tx_napi_idx] = txr;</div><div class='add'>+		txr-&gt;bnapi = bnapi2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_ring_stats(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_vnics(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_nq_arrays(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	bnge_init_ring_struct(bn);</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_rx_rings(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_tx_rings(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_nq_tree(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+</div><div class='add'>+	bn-&gt;vnic_info[BNGE_VNIC_DEFAULT].flags |= BNGE_VNIC_RSS_FLAG |</div><div class='add'>+						  BNGE_VNIC_MCAST_FLAG |</div><div class='add'>+						  BNGE_VNIC_UCAST_FLAG;</div><div class='add'>+	rc = bnge_alloc_vnic_attributes(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_core;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_core:</div><div class='add'>+	bnge_free_core(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 bnge_cp_ring_for_rx(struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	return rxr-&gt;rx_cpr-&gt;ring_struct.fw_ring_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 bnge_cp_ring_for_tx(struct bnge_tx_ring_info *txr)</div><div class='add'>+{</div><div class='add'>+	return txr-&gt;tx_cpr-&gt;ring_struct.fw_ring_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_db_nq(struct bnge_net *bn, struct bnge_db_info *db, u32 idx)</div><div class='add'>+{</div><div class='add'>+	bnge_writeq(bn-&gt;bd, db-&gt;db_key64 | DBR_TYPE_NQ_MASK |</div><div class='add'>+		    DB_RING_IDX(db, idx), db-&gt;doorbell);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_db_cq(struct bnge_net *bn, struct bnge_db_info *db, u32 idx)</div><div class='add'>+{</div><div class='add'>+	bnge_writeq(bn-&gt;bd, db-&gt;db_key64 | DBR_TYPE_CQ_ARMALL |</div><div class='add'>+		    DB_RING_IDX(db, idx), db-&gt;doorbell);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_cp_num_to_irq_num(struct bnge_net *bn, int n)</div><div class='add'>+{</div><div class='add'>+	struct bnge_napi *bnapi = bn-&gt;bnapi[n];</div><div class='add'>+	struct bnge_nq_ring_info *nqr;</div><div class='add'>+</div><div class='add'>+	nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+</div><div class='add'>+	return nqr-&gt;ring_struct.map_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t bnge_msix(int irq, void *dev_instance)</div><div class='add'>+{</div><div class='add'>+	/* NAPI scheduling to be added in a future patch */</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_nq_tree(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_nq_ring_info *nqr = &amp;bn-&gt;bnapi[i]-&gt;nq_ring;</div><div class='add'>+		struct bnge_ring_struct *ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+</div><div class='add'>+		ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+		for (j = 0; j &lt; nqr-&gt;cp_ring_count; j++) {</div><div class='add'>+			struct bnge_cp_ring_info *cpr = &amp;nqr-&gt;cp_ring_arr[j];</div><div class='add'>+</div><div class='add'>+			ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+			ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netmem_ref __bnge_alloc_rx_netmem(struct bnge_net *bn,</div><div class='add'>+					 dma_addr_t *mapping,</div><div class='add'>+					 struct bnge_rx_ring_info *rxr,</div><div class='add'>+					 unsigned int *offset,</div><div class='add'>+					 gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	if (PAGE_SIZE &gt; BNGE_RX_PAGE_SIZE) {</div><div class='add'>+		netmem = page_pool_alloc_frag_netmem(rxr-&gt;page_pool, offset,</div><div class='add'>+						     BNGE_RX_PAGE_SIZE, gfp);</div><div class='add'>+	} else {</div><div class='add'>+		netmem = page_pool_alloc_netmems(rxr-&gt;page_pool, gfp);</div><div class='add'>+		*offset = 0;</div><div class='add'>+	}</div><div class='add'>+	if (!netmem)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*mapping = page_pool_get_dma_addr_netmem(netmem) + *offset;</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 *__bnge_alloc_rx_frag(struct bnge_net *bn, dma_addr_t *mapping,</div><div class='add'>+				struct bnge_rx_ring_info *rxr,</div><div class='add'>+				gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	page = page_pool_alloc_frag(rxr-&gt;head_pool, &amp;offset,</div><div class='add'>+				    bn-&gt;rx_buf_size, gfp);</div><div class='add'>+	if (!page)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	*mapping = page_pool_get_dma_addr(page) + bn-&gt;rx_dma_offset + offset;</div><div class='add'>+	return page_address(page) + offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rx_data(struct bnge_net *bn,</div><div class='add'>+			      struct bnge_rx_ring_info *rxr,</div><div class='add'>+			      u16 prod, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct bnge_sw_rx_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[RING_RX(bn, prod)];</div><div class='add'>+	struct rx_bd *rxbd;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	u8 *data;</div><div class='add'>+</div><div class='add'>+	rxbd = &amp;rxr-&gt;rx_desc_ring[RX_RING(bn, prod)][RX_IDX(prod)];</div><div class='add'>+	data = __bnge_alloc_rx_frag(bn, &amp;mapping, rxr, gfp);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rx_buf-&gt;data = data;</div><div class='add'>+	rx_buf-&gt;data_ptr = data + bn-&gt;rx_offset;</div><div class='add'>+	rx_buf-&gt;mapping = mapping;</div><div class='add'>+</div><div class='add'>+	rxbd-&gt;rx_bd_haddr = cpu_to_le64(mapping);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_one_rx_ring_bufs(struct bnge_net *bn,</div><div class='add'>+				       struct bnge_rx_ring_info *rxr,</div><div class='add'>+				       int ring_nr)</div><div class='add'>+{</div><div class='add'>+	u32 prod = rxr-&gt;rx_prod;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;rx_ring_size; i++) {</div><div class='add'>+		rc = bnge_alloc_rx_data(bn, rxr, prod, GFP_KERNEL);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+		prod = NEXT_RX(prod);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Abort if not a single buffer can be allocated */</div><div class='add'>+	if (rc &amp;&amp; !i) {</div><div class='add'>+		netdev_err(bn-&gt;netdev,</div><div class='add'>+			   "RX ring %d: allocated %d/%d buffers, abort\n",</div><div class='add'>+			   ring_nr, i, bn-&gt;rx_ring_size);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxr-&gt;rx_prod = prod;</div><div class='add'>+</div><div class='add'>+	if (i &lt; bn-&gt;rx_ring_size)</div><div class='add'>+		netdev_warn(bn-&gt;netdev,</div><div class='add'>+			    "RX ring %d: allocated %d/%d buffers, continuing\n",</div><div class='add'>+			    ring_nr, i, bn-&gt;rx_ring_size);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_find_next_agg_idx(struct bnge_rx_ring_info *rxr, u16 idx)</div><div class='add'>+{</div><div class='add'>+	u16 next, max = rxr-&gt;rx_agg_bmap_size;</div><div class='add'>+</div><div class='add'>+	next = find_next_zero_bit(rxr-&gt;rx_agg_bmap, max, idx);</div><div class='add'>+	if (next &gt;= max)</div><div class='add'>+		next = find_first_zero_bit(rxr-&gt;rx_agg_bmap, max);</div><div class='add'>+	return next;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rx_netmem(struct bnge_net *bn,</div><div class='add'>+				struct bnge_rx_ring_info *rxr,</div><div class='add'>+				u16 prod, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct bnge_sw_rx_agg_bd *rx_agg_buf;</div><div class='add'>+	u16 sw_prod = rxr-&gt;rx_sw_agg_prod;</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	struct rx_bd *rxbd;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	rxbd = &amp;rxr-&gt;rx_agg_desc_ring[RX_AGG_RING(bn, prod)][RX_IDX(prod)];</div><div class='add'>+	netmem = __bnge_alloc_rx_netmem(bn, &amp;mapping, rxr, &amp;offset, gfp);</div><div class='add'>+	if (!netmem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (unlikely(test_bit(sw_prod, rxr-&gt;rx_agg_bmap)))</div><div class='add'>+		sw_prod = bnge_find_next_agg_idx(rxr, sw_prod);</div><div class='add'>+</div><div class='add'>+	__set_bit(sw_prod, rxr-&gt;rx_agg_bmap);</div><div class='add'>+	rx_agg_buf = &amp;rxr-&gt;rx_agg_buf_ring[sw_prod];</div><div class='add'>+	rxr-&gt;rx_sw_agg_prod = RING_RX_AGG(bn, NEXT_RX_AGG(sw_prod));</div><div class='add'>+</div><div class='add'>+	rx_agg_buf-&gt;netmem = netmem;</div><div class='add'>+	rx_agg_buf-&gt;offset = offset;</div><div class='add'>+	rx_agg_buf-&gt;mapping = mapping;</div><div class='add'>+	rxbd-&gt;rx_bd_haddr = cpu_to_le64(mapping);</div><div class='add'>+	rxbd-&gt;rx_bd_opaque = sw_prod;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_one_agg_ring_bufs(struct bnge_net *bn,</div><div class='add'>+					struct bnge_rx_ring_info *rxr,</div><div class='add'>+					int ring_nr)</div><div class='add'>+{</div><div class='add'>+	u32 prod = rxr-&gt;rx_agg_prod;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;rx_agg_ring_size; i++) {</div><div class='add'>+		rc = bnge_alloc_rx_netmem(bn, rxr, prod, GFP_KERNEL);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+		prod = NEXT_RX_AGG(prod);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc &amp;&amp; i &lt; MAX_SKB_FRAGS) {</div><div class='add'>+		netdev_err(bn-&gt;netdev,</div><div class='add'>+			   "Agg ring %d: allocated %d/%d buffers (min %d), abort\n",</div><div class='add'>+			   ring_nr, i, bn-&gt;rx_agg_ring_size, MAX_SKB_FRAGS);</div><div class='add'>+		goto err_free_one_agg_ring_bufs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxr-&gt;rx_agg_prod = prod;</div><div class='add'>+</div><div class='add'>+	if (i &lt; bn-&gt;rx_agg_ring_size)</div><div class='add'>+		netdev_warn(bn-&gt;netdev,</div><div class='add'>+			    "Agg ring %d: allocated %d/%d buffers, continuing\n",</div><div class='add'>+			    ring_nr, i, bn-&gt;rx_agg_ring_size);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_one_agg_ring_bufs:</div><div class='add'>+	bnge_free_one_agg_ring_bufs(bn, rxr);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_one_rx_ring_pair_bufs(struct bnge_net *bn, int ring_nr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_rx_ring_info *rxr = &amp;bn-&gt;rx_ring[ring_nr];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_one_rx_ring_bufs(bn, rxr, ring_nr);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (bnge_is_agg_reqd(bn-&gt;bd)) {</div><div class='add'>+		rc = bnge_alloc_one_agg_ring_bufs(bn, rxr, ring_nr);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_one_rx_ring_bufs;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_one_rx_ring_bufs:</div><div class='add'>+	bnge_free_one_rx_ring_bufs(bn, rxr);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_rxbd_pages(struct bnge_ring_struct *ring, u32 type)</div><div class='add'>+{</div><div class='add'>+	struct rx_bd **rx_desc_ring;</div><div class='add'>+	u32 prod;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rx_desc_ring = (struct rx_bd **)ring-&gt;ring_mem.pg_arr;</div><div class='add'>+	for (i = 0, prod = 0; i &lt; ring-&gt;ring_mem.nr_pages; i++) {</div><div class='add'>+		struct rx_bd *rxbd = rx_desc_ring[i];</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; RX_DESC_CNT; j++, rxbd++, prod++) {</div><div class='add'>+			rxbd-&gt;rx_bd_len_flags_type = cpu_to_le32(type);</div><div class='add'>+			rxbd-&gt;rx_bd_opaque = prod;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_one_rx_ring_rxbd(struct bnge_net *bn,</div><div class='add'>+				       struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring;</div><div class='add'>+	u32 type;</div><div class='add'>+</div><div class='add'>+	type = (bn-&gt;rx_buf_use_size &lt;&lt; RX_BD_LEN_SHIFT) |</div><div class='add'>+		RX_BD_TYPE_RX_PACKET_BD | RX_BD_FLAGS_EOP;</div><div class='add'>+</div><div class='add'>+	if (NET_IP_ALIGN == 2)</div><div class='add'>+		type |= RX_BD_FLAGS_SOP;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	bnge_init_rxbd_pages(ring, type);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_one_agg_ring_rxbd(struct bnge_net *bn,</div><div class='add'>+					struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring;</div><div class='add'>+	u32 type;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	if (bnge_is_agg_reqd(bn-&gt;bd)) {</div><div class='add'>+		type = ((u32)BNGE_RX_PAGE_SIZE &lt;&lt; RX_BD_LEN_SHIFT) |</div><div class='add'>+			RX_BD_TYPE_RX_AGG_BD | RX_BD_FLAGS_SOP;</div><div class='add'>+</div><div class='add'>+		bnge_init_rxbd_pages(ring, type);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_one_rx_ring_pair(struct bnge_net *bn, int ring_nr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_rx_ring_info *rxr;</div><div class='add'>+</div><div class='add'>+	rxr = &amp;bn-&gt;rx_ring[ring_nr];</div><div class='add'>+	bnge_init_one_rx_ring_rxbd(bn, rxr);</div><div class='add'>+</div><div class='add'>+	netif_queue_set_napi(bn-&gt;netdev, ring_nr, NETDEV_QUEUE_TYPE_RX,</div><div class='add'>+			     &amp;rxr-&gt;bnapi-&gt;napi);</div><div class='add'>+</div><div class='add'>+	bnge_init_one_agg_ring_rxbd(bn, rxr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rx_ring_pair_bufs(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+		rc = bnge_alloc_one_rx_ring_pair_bufs(bn, i);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_rx_ring_pair_bufs;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_rx_ring_pair_bufs:</div><div class='add'>+	bnge_free_rx_ring_pair_bufs(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_rx_rings(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+#define BNGE_RX_OFFSET (NET_SKB_PAD + NET_IP_ALIGN)</div><div class='add'>+#define BNGE_RX_DMA_OFFSET NET_SKB_PAD</div><div class='add'>+	bn-&gt;rx_offset = BNGE_RX_OFFSET;</div><div class='add'>+	bn-&gt;rx_dma_offset = BNGE_RX_DMA_OFFSET;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;bd-&gt;rx_nr_rings; i++)</div><div class='add'>+		bnge_init_one_rx_ring_pair(bn, i);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_tx_rings(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bn-&gt;tx_wake_thresh = max(bn-&gt;tx_ring_size / 2, BNGE_MIN_TX_DESC_CNT);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;bd-&gt;tx_nr_rings; i++) {</div><div class='add'>+		struct bnge_tx_ring_info *txr = &amp;bn-&gt;tx_ring[i];</div><div class='add'>+		struct bnge_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+</div><div class='add'>+		ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+</div><div class='add'>+		netif_queue_set_napi(bn-&gt;netdev, i, NETDEV_QUEUE_TYPE_TX,</div><div class='add'>+				     &amp;txr-&gt;bnapi-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_vnics(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic0 = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;nr_vnics; i++) {</div><div class='add'>+		struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[i];</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		vnic-&gt;fw_vnic_id = INVALID_HW_RING_ID;</div><div class='add'>+		vnic-&gt;vnic_id = i;</div><div class='add'>+		for (j = 0; j &lt; BNGE_MAX_CTX_PER_VNIC; j++)</div><div class='add'>+			vnic-&gt;fw_rss_cos_lb_ctx[j] = INVALID_HW_RING_ID;</div><div class='add'>+</div><div class='add'>+		if (bn-&gt;vnic_info[i].rss_hash_key) {</div><div class='add'>+			if (i == BNGE_VNIC_DEFAULT) {</div><div class='add'>+				u8 *key = (void *)vnic-&gt;rss_hash_key;</div><div class='add'>+				int k;</div><div class='add'>+</div><div class='add'>+				if (!bn-&gt;rss_hash_key_valid &amp;&amp;</div><div class='add'>+				    !bn-&gt;rss_hash_key_updated) {</div><div class='add'>+					get_random_bytes(bn-&gt;rss_hash_key,</div><div class='add'>+							 HW_HASH_KEY_SIZE);</div><div class='add'>+					bn-&gt;rss_hash_key_updated = true;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				memcpy(vnic-&gt;rss_hash_key, bn-&gt;rss_hash_key,</div><div class='add'>+				       HW_HASH_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+				if (!bn-&gt;rss_hash_key_updated)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				bn-&gt;rss_hash_key_updated = false;</div><div class='add'>+				bn-&gt;rss_hash_key_valid = true;</div><div class='add'>+</div><div class='add'>+				bn-&gt;toeplitz_prefix = 0;</div><div class='add'>+				for (k = 0; k &lt; 8; k++) {</div><div class='add'>+					bn-&gt;toeplitz_prefix &lt;&lt;= 8;</div><div class='add'>+					bn-&gt;toeplitz_prefix |= key[k];</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				memcpy(vnic-&gt;rss_hash_key, vnic0-&gt;rss_hash_key,</div><div class='add'>+				       HW_HASH_KEY_SIZE);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_db_mask(struct bnge_net *bn, struct bnge_db_info *db,</div><div class='add'>+			     u32 ring_type)</div><div class='add'>+{</div><div class='add'>+	switch (ring_type) {</div><div class='add'>+	case HWRM_RING_ALLOC_TX:</div><div class='add'>+		db-&gt;db_ring_mask = bn-&gt;tx_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_RX:</div><div class='add'>+		db-&gt;db_ring_mask = bn-&gt;rx_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_AGG:</div><div class='add'>+		db-&gt;db_ring_mask = bn-&gt;rx_agg_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_CMPL:</div><div class='add'>+	case HWRM_RING_ALLOC_NQ:</div><div class='add'>+		db-&gt;db_ring_mask = bn-&gt;cp_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	db-&gt;db_epoch_mask = db-&gt;db_ring_mask + 1;</div><div class='add'>+	db-&gt;db_epoch_shift = DBR_EPOCH_SFT - ilog2(db-&gt;db_epoch_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_db(struct bnge_net *bn, struct bnge_db_info *db,</div><div class='add'>+			u32 ring_type, u32 map_idx, u32 xid)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	switch (ring_type) {</div><div class='add'>+	case HWRM_RING_ALLOC_TX:</div><div class='add'>+		db-&gt;db_key64 = DBR_PATH_L2 | DBR_TYPE_SQ;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_RX:</div><div class='add'>+	case HWRM_RING_ALLOC_AGG:</div><div class='add'>+		db-&gt;db_key64 = DBR_PATH_L2 | DBR_TYPE_SRQ;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_CMPL:</div><div class='add'>+		db-&gt;db_key64 = DBR_PATH_L2;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_NQ:</div><div class='add'>+		db-&gt;db_key64 = DBR_PATH_L2;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	db-&gt;db_key64 |= ((u64)xid &lt;&lt; DBR_XID_SFT) | DBR_VALID;</div><div class='add'>+</div><div class='add'>+	db-&gt;doorbell = bd-&gt;bar1 + bd-&gt;db_offset;</div><div class='add'>+	bnge_set_db_mask(bn, db, ring_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_cp_ring_alloc(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	const u32 type = HWRM_RING_ALLOC_CMPL;</div><div class='add'>+	struct bnge_napi *bnapi = cpr-&gt;bnapi;</div><div class='add'>+	struct bnge_ring_struct *ring;</div><div class='add'>+	u32 map_idx = bnapi-&gt;index;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+	ring-&gt;handle = BNGE_SET_NQ_HDL(cpr);</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_set_db(bn, &amp;cpr-&gt;cp_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='add'>+	bnge_db_cq(bn, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_tx_ring_alloc(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_tx_ring_info *txr, u32 tx_idx)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+	const u32 type = HWRM_RING_ALLOC_TX;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bn, ring, type, tx_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_set_db(bn, &amp;txr-&gt;tx_db, type, tx_idx, ring-&gt;fw_ring_id);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_rx_agg_ring_alloc(struct bnge_net *bn,</div><div class='add'>+				       struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	u32 type = HWRM_RING_ALLOC_AGG;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	u32 grp_idx = ring-&gt;grp_idx;</div><div class='add'>+	u32 map_idx;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	map_idx = grp_idx + bd-&gt;rx_nr_rings;</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_set_db(bn, &amp;rxr-&gt;rx_agg_db, type, map_idx,</div><div class='add'>+		    ring-&gt;fw_ring_id);</div><div class='add'>+	bnge_db_write(bn-&gt;bd, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+	bnge_db_write(bn-&gt;bd, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='add'>+	bn-&gt;grp_info[grp_idx].agg_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_rx_ring_alloc(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	struct bnge_napi *bnapi = rxr-&gt;bnapi;</div><div class='add'>+	u32 type = HWRM_RING_ALLOC_RX;</div><div class='add'>+	u32 map_idx = bnapi-&gt;index;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_set_db(bn, &amp;rxr-&gt;rx_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='add'>+	bn-&gt;grp_info[map_idx].rx_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_ring_alloc(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	bool agg_rings;</div><div class='add'>+	int i, rc = 0;</div><div class='add'>+</div><div class='add'>+	agg_rings = !!(bnge_is_agg_reqd(bd));</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+		struct bnge_ring_struct *ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+		u32 type = HWRM_RING_ALLOC_NQ;</div><div class='add'>+		u32 map_idx = ring-&gt;map_idx;</div><div class='add'>+		unsigned int vector;</div><div class='add'>+</div><div class='add'>+		vector = bd-&gt;irq_tbl[map_idx].vector;</div><div class='add'>+		disable_irq_nosync(vector);</div><div class='add'>+		rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx);</div><div class='add'>+		if (rc) {</div><div class='add'>+			enable_irq(vector);</div><div class='add'>+			goto err_out;</div><div class='add'>+		}</div><div class='add'>+		bnge_set_db(bn, &amp;nqr-&gt;nq_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='add'>+		bnge_db_nq(bn, &amp;nqr-&gt;nq_db, nqr-&gt;nq_raw_cons);</div><div class='add'>+		enable_irq(vector);</div><div class='add'>+		bn-&gt;grp_info[i].nq_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='add'>+</div><div class='add'>+		if (!i) {</div><div class='add'>+			rc = bnge_hwrm_set_async_event_cr(bd, ring-&gt;fw_ring_id);</div><div class='add'>+			if (rc)</div><div class='add'>+				netdev_warn(bn-&gt;netdev, "Failed to set async event completion ring.\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;tx_nr_rings; i++) {</div><div class='add'>+		struct bnge_tx_ring_info *txr = &amp;bn-&gt;tx_ring[i];</div><div class='add'>+</div><div class='add'>+		rc = bnge_hwrm_cp_ring_alloc(bn, txr-&gt;tx_cpr);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_out;</div><div class='add'>+		rc = bnge_hwrm_tx_ring_alloc(bn, txr, i);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnge_rx_ring_info *rxr = &amp;bn-&gt;rx_ring[i];</div><div class='add'>+		struct bnge_cp_ring_info *cpr;</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+		struct bnge_napi *bnapi;</div><div class='add'>+		u32 map_idx, type;</div><div class='add'>+</div><div class='add'>+		rc = bnge_hwrm_rx_ring_alloc(bn, rxr);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_out;</div><div class='add'>+		/* If we have agg rings, post agg buffers first. */</div><div class='add'>+		if (!agg_rings)</div><div class='add'>+			bnge_db_write(bn-&gt;bd, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='add'>+</div><div class='add'>+		cpr = rxr-&gt;rx_cpr;</div><div class='add'>+		bnapi = rxr-&gt;bnapi;</div><div class='add'>+		type = HWRM_RING_ALLOC_CMPL;</div><div class='add'>+		map_idx = bnapi-&gt;index;</div><div class='add'>+</div><div class='add'>+		ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+		ring-&gt;handle = BNGE_SET_NQ_HDL(cpr);</div><div class='add'>+		rc = hwrm_ring_alloc_send_msg(bn, ring, type, map_idx);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_out;</div><div class='add'>+		bnge_set_db(bn, &amp;cpr-&gt;cp_db, type, map_idx,</div><div class='add'>+			    ring-&gt;fw_ring_id);</div><div class='add'>+		bnge_db_cq(bn, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (agg_rings) {</div><div class='add'>+		for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+			rc = bnge_hwrm_rx_agg_ring_alloc(bn, &amp;bn-&gt;rx_ring[i]);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto err_out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+err_out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_fill_hw_rss_tbl(struct bnge_net *bn, struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	__le16 *ring_tbl = vnic-&gt;rss_table;</div><div class='add'>+	struct bnge_rx_ring_info *rxr;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	u16 tbl_size, i;</div><div class='add'>+</div><div class='add'>+	tbl_size = bnge_get_rxfh_indir_size(bd);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++) {</div><div class='add'>+		u16 ring_id, j;</div><div class='add'>+</div><div class='add'>+		j = bd-&gt;rss_indir_tbl[i];</div><div class='add'>+		rxr = &amp;bn-&gt;rx_ring[j];</div><div class='add'>+</div><div class='add'>+		ring_id = rxr-&gt;rx_ring_struct.fw_ring_id;</div><div class='add'>+		*ring_tbl++ = cpu_to_le16(ring_id);</div><div class='add'>+		ring_id = bnge_cp_ring_for_rx(rxr);</div><div class='add'>+		*ring_tbl++ = cpu_to_le16(ring_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_vnic_rss_cfg(struct bnge_net *bn,</div><div class='add'>+				  struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_vnic_set_rss(bn, vnic, true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "hwrm vnic %d set rss failure rc: %d\n",</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = bnge_hwrm_vnic_cfg(bn, vnic);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bn-&gt;netdev, "hwrm vnic %d cfg failure rc: %d\n",</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_setup_vnic(struct bnge_net *bn, struct bnge_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc, i, nr_ctxs;</div><div class='add'>+</div><div class='add'>+	nr_ctxs = bnge_cal_nr_rss_ctxs(bd-&gt;rx_nr_rings);</div><div class='add'>+	for (i = 0; i &lt; nr_ctxs; i++) {</div><div class='add'>+		rc = bnge_hwrm_vnic_ctx_alloc(bd, vnic, i);</div><div class='add'>+		if (rc) {</div><div class='add'>+			netdev_err(bn-&gt;netdev, "hwrm vnic %d ctx %d alloc failure rc: %d\n",</div><div class='add'>+				   vnic-&gt;vnic_id, i, rc);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+		bn-&gt;rsscos_nr_ctxs++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_vnic_rss_cfg(bn, vnic);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (bnge_is_agg_reqd(bd)) {</div><div class='add'>+		rc = bnge_hwrm_vnic_set_hds(bn, vnic);</div><div class='add'>+		if (rc)</div><div class='add'>+			netdev_err(bn-&gt;netdev, "hwrm vnic %d set hds failure rc: %d\n",</div><div class='add'>+				   vnic-&gt;vnic_id, rc);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_del_l2_filter(struct bnge_net *bn, struct bnge_l2_filter *fltr)</div><div class='add'>+{</div><div class='add'>+	if (!refcount_dec_and_test(&amp;fltr-&gt;refcnt))</div><div class='add'>+		return;</div><div class='add'>+	hlist_del_rcu(&amp;fltr-&gt;base.hash);</div><div class='add'>+	kfree_rcu(fltr, base.rcu);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_l2_filter(struct bnge_net *bn,</div><div class='add'>+				struct bnge_l2_filter *fltr,</div><div class='add'>+				struct bnge_l2_key *key, u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(fltr-&gt;l2_key.dst_mac_addr, key-&gt;dst_mac_addr);</div><div class='add'>+	fltr-&gt;l2_key.vlan = key-&gt;vlan;</div><div class='add'>+	fltr-&gt;base.type = BNGE_FLTR_TYPE_L2;</div><div class='add'>+</div><div class='add'>+	head = &amp;bn-&gt;l2_fltr_hash_tbl[idx];</div><div class='add'>+	hlist_add_head_rcu(&amp;fltr-&gt;base.hash, head);</div><div class='add'>+	refcount_set(&amp;fltr-&gt;refcnt, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnge_l2_filter *__bnge_lookup_l2_filter(struct bnge_net *bn,</div><div class='add'>+						      struct bnge_l2_key *key,</div><div class='add'>+						      u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct bnge_l2_filter *fltr;</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+</div><div class='add'>+	head = &amp;bn-&gt;l2_fltr_hash_tbl[idx];</div><div class='add'>+	hlist_for_each_entry_rcu(fltr, head, base.hash) {</div><div class='add'>+		struct bnge_l2_key *l2_key = &amp;fltr-&gt;l2_key;</div><div class='add'>+</div><div class='add'>+		if (ether_addr_equal(l2_key-&gt;dst_mac_addr, key-&gt;dst_mac_addr) &amp;&amp;</div><div class='add'>+		    l2_key-&gt;vlan == key-&gt;vlan)</div><div class='add'>+			return fltr;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnge_l2_filter *bnge_lookup_l2_filter(struct bnge_net *bn,</div><div class='add'>+						    struct bnge_l2_key *key,</div><div class='add'>+						    u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct bnge_l2_filter *fltr;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fltr = __bnge_lookup_l2_filter(bn, key, idx);</div><div class='add'>+	if (fltr)</div><div class='add'>+		refcount_inc(&amp;fltr-&gt;refcnt);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return fltr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnge_l2_filter *bnge_alloc_l2_filter(struct bnge_net *bn,</div><div class='add'>+						   struct bnge_l2_key *key,</div><div class='add'>+						   gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct bnge_l2_filter *fltr;</div><div class='add'>+	u32 idx;</div><div class='add'>+</div><div class='add'>+	idx = jhash2(&amp;key-&gt;filter_key, BNGE_L2_KEY_SIZE, bn-&gt;hash_seed) &amp;</div><div class='add'>+	      BNGE_L2_FLTR_HASH_MASK;</div><div class='add'>+	fltr = bnge_lookup_l2_filter(bn, key, idx);</div><div class='add'>+	if (fltr)</div><div class='add'>+		return fltr;</div><div class='add'>+</div><div class='add'>+	fltr = kzalloc(sizeof(*fltr), gfp);</div><div class='add'>+	if (!fltr)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+</div><div class='add'>+	bnge_init_l2_filter(bn, fltr, key, idx);</div><div class='add'>+	return fltr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_hwrm_set_vnic_filter(struct bnge_net *bn, u16 vnic_id, u16 idx,</div><div class='add'>+				     const u8 *mac_addr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_l2_filter *fltr;</div><div class='add'>+	struct bnge_l2_key key;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(key.dst_mac_addr, mac_addr);</div><div class='add'>+	key.vlan = 0;</div><div class='add'>+	fltr = bnge_alloc_l2_filter(bn, &amp;key, GFP_KERNEL);</div><div class='add'>+	if (IS_ERR(fltr))</div><div class='add'>+		return PTR_ERR(fltr);</div><div class='add'>+</div><div class='add'>+	fltr-&gt;base.fw_vnic_id = bn-&gt;vnic_info[vnic_id].fw_vnic_id;</div><div class='add'>+	rc = bnge_hwrm_l2_filter_alloc(bn-&gt;bd, fltr);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_del_l2_filter;</div><div class='add'>+	bn-&gt;vnic_info[vnic_id].l2_filters[idx] = fltr;</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+err_del_l2_filter:</div><div class='add'>+	bnge_del_l2_filter(bn, fltr);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnge_mc_list_updated(struct bnge_net *bn, u32 *rx_mask)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	struct net_device *dev = bn-&gt;netdev;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	int mc_count = 0, off = 0;</div><div class='add'>+	bool update = false;</div><div class='add'>+	u8 *haddr;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_mc_addr(ha, dev) {</div><div class='add'>+		if (mc_count &gt;= BNGE_MAX_MC_ADDRS) {</div><div class='add'>+			*rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='add'>+			vnic-&gt;mc_list_count = 0;</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		haddr = ha-&gt;addr;</div><div class='add'>+		if (!ether_addr_equal(haddr, vnic-&gt;mc_list + off)) {</div><div class='add'>+			memcpy(vnic-&gt;mc_list + off, haddr, ETH_ALEN);</div><div class='add'>+			update = true;</div><div class='add'>+		}</div><div class='add'>+		off += ETH_ALEN;</div><div class='add'>+		mc_count++;</div><div class='add'>+	}</div><div class='add'>+	if (mc_count)</div><div class='add'>+		*rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_MCAST;</div><div class='add'>+</div><div class='add'>+	if (mc_count != vnic-&gt;mc_list_count) {</div><div class='add'>+		vnic-&gt;mc_list_count = mc_count;</div><div class='add'>+		update = true;</div><div class='add'>+	}</div><div class='add'>+	return update;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnge_uc_list_updated(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	struct net_device *dev = bn-&gt;netdev;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	int off = 0;</div><div class='add'>+</div><div class='add'>+	if (netdev_uc_count(dev) != (vnic-&gt;uc_filter_count - 1))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	netdev_for_each_uc_addr(ha, dev) {</div><div class='add'>+		if (!ether_addr_equal(ha-&gt;addr, vnic-&gt;uc_list + off))</div><div class='add'>+			return true;</div><div class='add'>+</div><div class='add'>+		off += ETH_ALEN;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnge_promisc_ok(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_cfg_def_vnic(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	struct net_device *dev = bn-&gt;netdev;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	int i, off = 0, rc;</div><div class='add'>+	bool uc_update;</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+	uc_update = bnge_uc_list_updated(bn);</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='add'>+</div><div class='add'>+	if (!uc_update)</div><div class='add'>+		goto skip_uc;</div><div class='add'>+</div><div class='add'>+	for (i = 1; i &lt; vnic-&gt;uc_filter_count; i++) {</div><div class='add'>+		struct bnge_l2_filter *fltr = vnic-&gt;l2_filters[i];</div><div class='add'>+</div><div class='add'>+		bnge_hwrm_l2_filter_free(bd, fltr);</div><div class='add'>+		bnge_del_l2_filter(bn, fltr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic-&gt;uc_filter_count = 1;</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+	if (netdev_uc_count(dev) &gt; (BNGE_MAX_UC_ADDRS - 1)) {</div><div class='add'>+		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;</div><div class='add'>+	} else {</div><div class='add'>+		netdev_for_each_uc_addr(ha, dev) {</div><div class='add'>+			memcpy(vnic-&gt;uc_list + off, ha-&gt;addr, ETH_ALEN);</div><div class='add'>+			off += ETH_ALEN;</div><div class='add'>+			vnic-&gt;uc_filter_count++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='add'>+</div><div class='add'>+	for (i = 1, off = 0; i &lt; vnic-&gt;uc_filter_count; i++, off += ETH_ALEN) {</div><div class='add'>+		rc = bnge_hwrm_set_vnic_filter(bn, 0, i, vnic-&gt;uc_list + off);</div><div class='add'>+		if (rc) {</div><div class='add'>+			netdev_err(dev, "HWRM vnic filter failure rc: %d\n", rc);</div><div class='add'>+			vnic-&gt;uc_filter_count = i;</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+skip_uc:</div><div class='add'>+	if ((vnic-&gt;rx_mask &amp; CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS) &amp;&amp;</div><div class='add'>+	    !bnge_promisc_ok(bn))</div><div class='add'>+		vnic-&gt;rx_mask &amp;= ~CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;</div><div class='add'>+	rc = bnge_hwrm_cfa_l2_set_rx_mask(bd, vnic);</div><div class='add'>+	if (rc &amp;&amp; (vnic-&gt;rx_mask &amp; CFA_L2_SET_RX_MASK_REQ_MASK_MCAST)) {</div><div class='add'>+		netdev_info(dev, "Failed setting MC filters rc: %d, turning on ALL_MCAST mode\n",</div><div class='add'>+			    rc);</div><div class='add'>+		vnic-&gt;rx_mask &amp;= ~CFA_L2_SET_RX_MASK_REQ_MASK_MCAST;</div><div class='add'>+		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='add'>+		vnic-&gt;mc_list_count = 0;</div><div class='add'>+		rc = bnge_hwrm_cfa_l2_set_rx_mask(bd, vnic);</div><div class='add'>+	}</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(dev, "HWRM cfa l2 rx mask failure rc: %d\n",</div><div class='add'>+			   rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_vnic_free(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;nr_vnics; i++)</div><div class='add'>+		bnge_hwrm_vnic_free_one(bn-&gt;bd, &amp;bn-&gt;vnic_info[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_vnic_ctx_free(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bn-&gt;nr_vnics; i++) {</div><div class='add'>+		struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[i];</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; BNGE_MAX_CTX_PER_VNIC; j++) {</div><div class='add'>+			if (vnic-&gt;fw_rss_cos_lb_ctx[j] != INVALID_HW_RING_ID)</div><div class='add'>+				bnge_hwrm_vnic_ctx_free_one(bn-&gt;bd, vnic, j);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	bn-&gt;rsscos_nr_ctxs = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_clear_vnic_filter(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; vnic-&gt;uc_filter_count; i++) {</div><div class='add'>+		struct bnge_l2_filter *fltr = vnic-&gt;l2_filters[i];</div><div class='add'>+</div><div class='add'>+		bnge_hwrm_l2_filter_free(bn-&gt;bd, fltr);</div><div class='add'>+		bnge_del_l2_filter(bn, fltr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vnic-&gt;uc_filter_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_clear_vnic(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	bnge_hwrm_clear_vnic_filter(bn);</div><div class='add'>+	bnge_hwrm_vnic_free(bn);</div><div class='add'>+	bnge_hwrm_vnic_ctx_free(bn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_rx_ring_free(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_rx_ring_info *rxr,</div><div class='add'>+				   bool close_path)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+	u32 cmpl_ring_id;</div><div class='add'>+</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmpl_ring_id = bnge_cp_ring_for_rx(rxr);</div><div class='add'>+	hwrm_ring_free_send_msg(bn, ring,</div><div class='add'>+				RING_FREE_REQ_RING_TYPE_RX,</div><div class='add'>+				close_path ? cmpl_ring_id :</div><div class='add'>+				INVALID_HW_RING_ID);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	bn-&gt;grp_info[grp_idx].rx_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_rx_agg_ring_free(struct bnge_net *bn,</div><div class='add'>+				       struct bnge_rx_ring_info *rxr,</div><div class='add'>+				       bool close_path)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+	u32 cmpl_ring_id;</div><div class='add'>+</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmpl_ring_id = bnge_cp_ring_for_rx(rxr);</div><div class='add'>+	hwrm_ring_free_send_msg(bn, ring, RING_FREE_REQ_RING_TYPE_RX_AGG,</div><div class='add'>+				close_path ? cmpl_ring_id :</div><div class='add'>+				INVALID_HW_RING_ID);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	bn-&gt;grp_info[grp_idx].agg_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_tx_ring_free(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_tx_ring_info *txr,</div><div class='add'>+				   bool close_path)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+	u32 cmpl_ring_id;</div><div class='add'>+</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cmpl_ring_id = close_path ? bnge_cp_ring_for_tx(txr) :</div><div class='add'>+		       INVALID_HW_RING_ID;</div><div class='add'>+	hwrm_ring_free_send_msg(bn, ring, RING_FREE_REQ_RING_TYPE_TX,</div><div class='add'>+				cmpl_ring_id);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_cp_ring_free(struct bnge_net *bn,</div><div class='add'>+				   struct bnge_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+	ring = &amp;cpr-&gt;ring_struct;</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hwrm_ring_free_send_msg(bn, ring, RING_FREE_REQ_RING_TYPE_L2_CMPL,</div><div class='add'>+				INVALID_HW_RING_ID);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_ring_free(struct bnge_net *bn, bool close_path)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bn-&gt;bnapi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;tx_nr_rings; i++)</div><div class='add'>+		bnge_hwrm_tx_ring_free(bn, &amp;bn-&gt;tx_ring[i], close_path);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++) {</div><div class='add'>+		bnge_hwrm_rx_ring_free(bn, &amp;bn-&gt;rx_ring[i], close_path);</div><div class='add'>+		bnge_hwrm_rx_agg_ring_free(bn, &amp;bn-&gt;rx_ring[i], close_path);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_nq_ring_info *nqr;</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+		for (j = 0; j &lt; nqr-&gt;cp_ring_count &amp;&amp; nqr-&gt;cp_ring_arr; j++)</div><div class='add'>+			bnge_hwrm_cp_ring_free(bn, &amp;nqr-&gt;cp_ring_arr[j]);</div><div class='add'>+</div><div class='add'>+		ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='add'>+			hwrm_ring_free_send_msg(bn, ring,</div><div class='add'>+						RING_FREE_REQ_RING_TYPE_NQ,</div><div class='add'>+						INVALID_HW_RING_ID);</div><div class='add'>+			ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+			bn-&gt;grp_info[i].nq_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_setup_msix(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = bn-&gt;netdev;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int len, i;</div><div class='add'>+</div><div class='add'>+	len = sizeof(bd-&gt;irq_tbl[0].name);</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		int map_idx = bnge_cp_num_to_irq_num(bn, i);</div><div class='add'>+		char *attr;</div><div class='add'>+</div><div class='add'>+		if (bd-&gt;flags &amp; BNGE_EN_SHARED_CHNL)</div><div class='add'>+			attr = "TxRx";</div><div class='add'>+		else if (i &lt; bd-&gt;rx_nr_rings)</div><div class='add'>+			attr = "rx";</div><div class='add'>+		else</div><div class='add'>+			attr = "tx";</div><div class='add'>+</div><div class='add'>+		snprintf(bd-&gt;irq_tbl[map_idx].name, len, "%s-%s-%d", dev-&gt;name,</div><div class='add'>+			 attr, i);</div><div class='add'>+		bd-&gt;irq_tbl[map_idx].handler = bnge_msix;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_setup_interrupts(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = bn-&gt;netdev;</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	bnge_setup_msix(bn);</div><div class='add'>+</div><div class='add'>+	return netif_set_real_num_queues(dev, bd-&gt;tx_nr_rings, bd-&gt;rx_nr_rings);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_hwrm_resource_free(struct bnge_net *bn, bool close_path)</div><div class='add'>+{</div><div class='add'>+	bnge_clear_vnic(bn);</div><div class='add'>+	bnge_hwrm_ring_free(bn, close_path);</div><div class='add'>+	bnge_hwrm_stat_ctx_free(bn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_irq(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	struct bnge_irq *irq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		int map_idx = bnge_cp_num_to_irq_num(bn, i);</div><div class='add'>+</div><div class='add'>+		irq = &amp;bd-&gt;irq_tbl[map_idx];</div><div class='add'>+		if (irq-&gt;requested) {</div><div class='add'>+			if (irq-&gt;have_cpumask) {</div><div class='add'>+				irq_set_affinity_hint(irq-&gt;vector, NULL);</div><div class='add'>+				free_cpumask_var(irq-&gt;cpu_mask);</div><div class='add'>+				irq-&gt;have_cpumask = 0;</div><div class='add'>+			}</div><div class='add'>+			free_irq(irq-&gt;vector, bn-&gt;bnapi[i]);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		irq-&gt;requested = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_request_irq(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_setup_interrupts(bn);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "bnge_setup_interrupts err: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		int map_idx = bnge_cp_num_to_irq_num(bn, i);</div><div class='add'>+		struct bnge_irq *irq = &amp;bd-&gt;irq_tbl[map_idx];</div><div class='add'>+</div><div class='add'>+		rc = request_irq(irq-&gt;vector, irq-&gt;handler, 0, irq-&gt;name,</div><div class='add'>+				 bn-&gt;bnapi[i]);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_irq;</div><div class='add'>+</div><div class='add'>+		netif_napi_set_irq_locked(&amp;bn-&gt;bnapi[i]-&gt;napi, irq-&gt;vector);</div><div class='add'>+		irq-&gt;requested = 1;</div><div class='add'>+</div><div class='add'>+		if (zalloc_cpumask_var(&amp;irq-&gt;cpu_mask, GFP_KERNEL)) {</div><div class='add'>+			int numa_node = dev_to_node(&amp;bd-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+			irq-&gt;have_cpumask = 1;</div><div class='add'>+			cpumask_set_cpu(cpumask_local_spread(i, numa_node),</div><div class='add'>+					irq-&gt;cpu_mask);</div><div class='add'>+			rc = irq_set_affinity_hint(irq-&gt;vector, irq-&gt;cpu_mask);</div><div class='add'>+			if (rc) {</div><div class='add'>+				netdev_warn(bn-&gt;netdev,</div><div class='add'>+					    "Set affinity failed, IRQ = %d\n",</div><div class='add'>+					    irq-&gt;vector);</div><div class='add'>+				goto err_free_irq;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	bnge_free_irq(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_init_chip(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_vnic_info *vnic = &amp;bn-&gt;vnic_info[BNGE_VNIC_DEFAULT];</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+#define BNGE_DEF_STATS_COAL_TICKS	 1000000</div><div class='add'>+	bn-&gt;stats_coal_ticks = BNGE_DEF_STATS_COAL_TICKS;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_stat_ctx_alloc(bn);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "hwrm stat ctx alloc failure rc: %d\n", rc);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_ring_alloc(bn);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "hwrm ring alloc failure rc: %d\n", rc);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_vnic_alloc(bd, vnic, bd-&gt;rx_nr_rings);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "hwrm vnic alloc failure rc: %d\n", rc);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_setup_vnic(bn, vnic);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_out;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;rss_cap &amp; BNGE_RSS_CAP_RSS_HASH_TYPE_DELTA)</div><div class='add'>+		bnge_hwrm_update_rss_hash_cfg(bn);</div><div class='add'>+</div><div class='add'>+	/* Filter for default vnic 0 */</div><div class='add'>+	rc = bnge_hwrm_set_vnic_filter(bn, 0, 0, bn-&gt;netdev-&gt;dev_addr);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "HWRM vnic filter failure rc: %d\n", rc);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+	vnic-&gt;uc_filter_count = 1;</div><div class='add'>+</div><div class='add'>+	vnic-&gt;rx_mask = 0;</div><div class='add'>+</div><div class='add'>+	if (bn-&gt;netdev-&gt;flags &amp; IFF_BROADCAST)</div><div class='add'>+		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;</div><div class='add'>+</div><div class='add'>+	if (bn-&gt;netdev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;</div><div class='add'>+</div><div class='add'>+	if (bn-&gt;netdev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='add'>+		vnic-&gt;mc_list_count = 0;</div><div class='add'>+	} else if (bn-&gt;netdev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='add'>+		u32 mask = 0;</div><div class='add'>+</div><div class='add'>+		bnge_mc_list_updated(bn, &amp;mask);</div><div class='add'>+		vnic-&gt;rx_mask |= mask;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_cfg_def_vnic(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_out;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	bnge_hwrm_resource_free(bn, 0);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_napi_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	int work_done = 0;</div><div class='add'>+</div><div class='add'>+	/* defer NAPI implementation to next patch series */</div><div class='add'>+	napi_complete_done(napi, work_done);</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_napi(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	struct bnge_napi *bnapi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		netif_napi_add_config_locked(bn-&gt;netdev, &amp;bnapi-&gt;napi,</div><div class='add'>+					     bnge_napi_poll, bnapi-&gt;index);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_del_napi(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;rx_nr_rings; i++)</div><div class='add'>+		netif_queue_set_napi(bn-&gt;netdev, i, NETDEV_QUEUE_TYPE_RX, NULL);</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;tx_nr_rings; i++)</div><div class='add'>+		netif_queue_set_napi(bn-&gt;netdev, i, NETDEV_QUEUE_TYPE_TX, NULL);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+</div><div class='add'>+		__netif_napi_del_locked(&amp;bnapi-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Wait for RCU grace period after removing NAPI instances */</div><div class='add'>+	synchronize_net();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_init_nic(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bnge_init_nq_tree(bn);</div><div class='add'>+</div><div class='add'>+	bnge_init_rx_rings(bn);</div><div class='add'>+	rc = bnge_alloc_rx_ring_pair_bufs(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_init_tx_rings(bn);</div><div class='add'>+</div><div class='add'>+	rc = bnge_init_ring_grps(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_rx_ring_pair_bufs;</div><div class='add'>+</div><div class='add'>+	bnge_init_vnics(bn);</div><div class='add'>+</div><div class='add'>+	rc = bnge_init_chip(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_ring_grps;</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+err_free_ring_grps:</div><div class='add'>+	bnge_free_ring_grps(bn);</div><div class='add'>+	return rc;</div><div class='add'>+</div><div class='add'>+err_free_rx_ring_pair_bufs:</div><div class='add'>+	bnge_free_rx_ring_pair_bufs(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_open_core(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	netif_carrier_off(bn-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	rc = bnge_reserve_rings(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "bnge_reserve_rings err: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_core(bn);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "bnge_alloc_core err: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnge_init_napi(bn);</div><div class='add'>+	rc = bnge_request_irq(bn);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "bnge_request_irq err: %d\n", rc);</div><div class='add'>+		goto err_del_napi;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnge_init_nic(bn);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bn-&gt;netdev, "bnge_init_nic err: %d\n", rc);</div><div class='add'>+		goto err_free_irq;</div><div class='add'>+	}</div><div class='add'>+	set_bit(BNGE_STATE_OPEN, &amp;bd-&gt;state);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irq:</div><div class='add'>+	bnge_free_irq(bn);</div><div class='add'>+err_del_napi:</div><div class='add'>+	bnge_del_napi(bn);</div><div class='add'>+	bnge_free_core(bn);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t bnge_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_open(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnge_net *bn = netdev_priv(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_open_core(bn);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(dev, "bnge_open_core err: %d\n", rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_shutdown_nic(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	/* TODO: close_path = 0 until we make NAPI functional */</div><div class='add'>+	bnge_hwrm_resource_free(bn, 0);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_close_core(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+</div><div class='add'>+	clear_bit(BNGE_STATE_OPEN, &amp;bd-&gt;state);</div><div class='add'>+	bnge_shutdown_nic(bn);</div><div class='add'>+	bnge_free_all_rings_bufs(bn);</div><div class='add'>+	bnge_free_irq(bn);</div><div class='add'>+	bnge_del_napi(bn);</div><div class='add'>+</div><div class='add'>+	bnge_free_core(bn);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_close(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnge_net *bn = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	bnge_close_core(bn);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops bnge_netdev_ops = {</div><div class='add'>+	.ndo_open		= bnge_open,</div><div class='add'>+	.ndo_stop		= bnge_close,</div><div class='add'>+	.ndo_start_xmit		= bnge_start_xmit,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bnge_init_mac_addr(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	eth_hw_addr_set(bd-&gt;netdev, bd-&gt;pf.mac_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_tpa_flags(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_net *bn = netdev_priv(bd-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	bn-&gt;priv_flags &amp;= ~BNGE_NET_EN_TPA;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;netdev-&gt;features &amp; NETIF_F_LRO)</div><div class='add'>+		bn-&gt;priv_flags |= BNGE_NET_EN_LRO;</div><div class='add'>+	else if (bd-&gt;netdev-&gt;features &amp; NETIF_F_GRO_HW)</div><div class='add'>+		bn-&gt;priv_flags |= BNGE_NET_EN_GRO;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_init_l2_fltr_tbl(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BNGE_L2_FLTR_HASH_SIZE; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;bn-&gt;l2_fltr_hash_tbl[i]);</div><div class='add'>+	get_random_bytes(&amp;bn-&gt;hash_seed, sizeof(bn-&gt;hash_seed));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_set_ring_params(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_net *bn = netdev_priv(bd-&gt;netdev);</div><div class='add'>+	u32 ring_size, rx_size, rx_space, max_rx_cmpl;</div><div class='add'>+	u32 agg_factor = 0, agg_ring_size = 0;</div><div class='add'>+</div><div class='add'>+	/* 8 for CRC and VLAN */</div><div class='add'>+	rx_size = SKB_DATA_ALIGN(bn-&gt;netdev-&gt;mtu + ETH_HLEN + NET_IP_ALIGN + 8);</div><div class='add'>+</div><div class='add'>+	rx_space = rx_size + ALIGN(NET_SKB_PAD, 8) +</div><div class='add'>+		SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+</div><div class='add'>+	bn-&gt;rx_copy_thresh = BNGE_RX_COPY_THRESH;</div><div class='add'>+	ring_size = bn-&gt;rx_ring_size;</div><div class='add'>+	bn-&gt;rx_agg_ring_size = 0;</div><div class='add'>+	bn-&gt;rx_agg_nr_pages = 0;</div><div class='add'>+</div><div class='add'>+	if (bn-&gt;priv_flags &amp; BNGE_NET_EN_TPA)</div><div class='add'>+		agg_factor = min_t(u32, 4, 65536 / BNGE_RX_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	bn-&gt;priv_flags &amp;= ~BNGE_NET_EN_JUMBO;</div><div class='add'>+	if (rx_space &gt; PAGE_SIZE) {</div><div class='add'>+		u32 jumbo_factor;</div><div class='add'>+</div><div class='add'>+		bn-&gt;priv_flags |= BNGE_NET_EN_JUMBO;</div><div class='add'>+		jumbo_factor = PAGE_ALIGN(bn-&gt;netdev-&gt;mtu - 40) &gt;&gt; PAGE_SHIFT;</div><div class='add'>+		if (jumbo_factor &gt; agg_factor)</div><div class='add'>+			agg_factor = jumbo_factor;</div><div class='add'>+	}</div><div class='add'>+	if (agg_factor) {</div><div class='add'>+		if (ring_size &gt; BNGE_MAX_RX_DESC_CNT_JUM_ENA) {</div><div class='add'>+			ring_size = BNGE_MAX_RX_DESC_CNT_JUM_ENA;</div><div class='add'>+			netdev_warn(bn-&gt;netdev, "RX ring size reduced from %d to %d due to jumbo ring\n",</div><div class='add'>+				    bn-&gt;rx_ring_size, ring_size);</div><div class='add'>+			bn-&gt;rx_ring_size = ring_size;</div><div class='add'>+		}</div><div class='add'>+		agg_ring_size = ring_size * agg_factor;</div><div class='add'>+</div><div class='add'>+		bn-&gt;rx_agg_nr_pages = bnge_adjust_pow_two(agg_ring_size,</div><div class='add'>+							  RX_DESC_CNT);</div><div class='add'>+		if (bn-&gt;rx_agg_nr_pages &gt; MAX_RX_AGG_PAGES) {</div><div class='add'>+			u32 tmp = agg_ring_size;</div><div class='add'>+</div><div class='add'>+			bn-&gt;rx_agg_nr_pages = MAX_RX_AGG_PAGES;</div><div class='add'>+			agg_ring_size = MAX_RX_AGG_PAGES * RX_DESC_CNT - 1;</div><div class='add'>+			netdev_warn(bn-&gt;netdev, "RX agg ring size %d reduced to %d.\n",</div><div class='add'>+				    tmp, agg_ring_size);</div><div class='add'>+		}</div><div class='add'>+		bn-&gt;rx_agg_ring_size = agg_ring_size;</div><div class='add'>+		bn-&gt;rx_agg_ring_mask = (bn-&gt;rx_agg_nr_pages * RX_DESC_CNT) - 1;</div><div class='add'>+</div><div class='add'>+		rx_size = SKB_DATA_ALIGN(BNGE_RX_COPY_THRESH + NET_IP_ALIGN);</div><div class='add'>+		rx_space = rx_size + NET_SKB_PAD +</div><div class='add'>+			SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bn-&gt;rx_buf_use_size = rx_size;</div><div class='add'>+	bn-&gt;rx_buf_size = rx_space;</div><div class='add'>+</div><div class='add'>+	bn-&gt;rx_nr_pages = bnge_adjust_pow_two(ring_size, RX_DESC_CNT);</div><div class='add'>+	bn-&gt;rx_ring_mask = (bn-&gt;rx_nr_pages * RX_DESC_CNT) - 1;</div><div class='add'>+</div><div class='add'>+	ring_size = bn-&gt;tx_ring_size;</div><div class='add'>+	bn-&gt;tx_nr_pages = bnge_adjust_pow_two(ring_size, TX_DESC_CNT);</div><div class='add'>+	bn-&gt;tx_ring_mask = (bn-&gt;tx_nr_pages * TX_DESC_CNT) - 1;</div><div class='add'>+</div><div class='add'>+	max_rx_cmpl = bn-&gt;rx_ring_size;</div><div class='add'>+</div><div class='add'>+	if (bn-&gt;priv_flags &amp; BNGE_NET_EN_TPA)</div><div class='add'>+		max_rx_cmpl += bd-&gt;max_tpa_v2;</div><div class='add'>+	ring_size = max_rx_cmpl * 2 + agg_ring_size + bn-&gt;tx_ring_size;</div><div class='add'>+	bn-&gt;cp_ring_size = ring_size;</div><div class='add'>+</div><div class='add'>+	bn-&gt;cp_nr_pages = bnge_adjust_pow_two(ring_size, CP_DESC_CNT);</div><div class='add'>+	if (bn-&gt;cp_nr_pages &gt; MAX_CP_PAGES) {</div><div class='add'>+		bn-&gt;cp_nr_pages = MAX_CP_PAGES;</div><div class='add'>+		bn-&gt;cp_ring_size = MAX_CP_PAGES * CP_DESC_CNT - 1;</div><div class='add'>+		netdev_warn(bn-&gt;netdev, "completion ring size %d reduced to %d.\n",</div><div class='add'>+			    ring_size, bn-&gt;cp_ring_size);</div><div class='add'>+	}</div><div class='add'>+	bn-&gt;cp_bit = bn-&gt;cp_nr_pages * CP_DESC_CNT;</div><div class='add'>+	bn-&gt;cp_ring_mask = bn-&gt;cp_bit - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_netdev_alloc(struct bnge_dev *bd, int max_irqs)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct bnge_net *bn;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	netdev = alloc_etherdev_mqs(sizeof(*bn), max_irqs * BNGE_MAX_QUEUE,</div><div class='add'>+				    max_irqs);</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(netdev, bd-&gt;dev);</div><div class='add'>+	bd-&gt;netdev = netdev;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;bnge_netdev_ops;</div><div class='add'>+</div><div class='add'>+	bnge_set_ethtool_ops(netdev);</div><div class='add'>+</div><div class='add'>+	bn = netdev_priv(netdev);</div><div class='add'>+	bn-&gt;netdev = netdev;</div><div class='add'>+	bn-&gt;bd = bd;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;min_mtu = ETH_ZLEN;</div><div class='add'>+	netdev-&gt;max_mtu = bd-&gt;max_mtu;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;hw_features = NETIF_F_IP_CSUM |</div><div class='add'>+			      NETIF_F_IPV6_CSUM |</div><div class='add'>+			      NETIF_F_SG |</div><div class='add'>+			      NETIF_F_TSO |</div><div class='add'>+			      NETIF_F_TSO6 |</div><div class='add'>+			      NETIF_F_GSO_UDP_TUNNEL |</div><div class='add'>+			      NETIF_F_GSO_GRE |</div><div class='add'>+			      NETIF_F_GSO_IPXIP4 |</div><div class='add'>+			      NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='add'>+			      NETIF_F_GSO_GRE_CSUM |</div><div class='add'>+			      NETIF_F_GSO_PARTIAL |</div><div class='add'>+			      NETIF_F_RXHASH |</div><div class='add'>+			      NETIF_F_RXCSUM |</div><div class='add'>+			      NETIF_F_GRO;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_UDP_GSO_SUPP)</div><div class='add'>+		netdev-&gt;hw_features |= NETIF_F_GSO_UDP_L4;</div><div class='add'>+</div><div class='add'>+	if (BNGE_SUPPORTS_TPA(bd))</div><div class='add'>+		netdev-&gt;hw_features |= NETIF_F_LRO;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;hw_enc_features = NETIF_F_IP_CSUM |</div><div class='add'>+				  NETIF_F_IPV6_CSUM |</div><div class='add'>+				  NETIF_F_SG |</div><div class='add'>+				  NETIF_F_TSO |</div><div class='add'>+				  NETIF_F_TSO6 |</div><div class='add'>+				  NETIF_F_GSO_UDP_TUNNEL |</div><div class='add'>+				  NETIF_F_GSO_GRE |</div><div class='add'>+				  NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='add'>+				  NETIF_F_GSO_GRE_CSUM |</div><div class='add'>+				  NETIF_F_GSO_IPXIP4 |</div><div class='add'>+				  NETIF_F_GSO_PARTIAL;</div><div class='add'>+</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_UDP_GSO_SUPP)</div><div class='add'>+		netdev-&gt;hw_enc_features |= NETIF_F_GSO_UDP_L4;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='add'>+				       NETIF_F_GSO_GRE_CSUM;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;vlan_features = netdev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='add'>+	if (bd-&gt;fw_cap &amp; BNGE_FW_CAP_VLAN_RX_STRIP)</div><div class='add'>+		netdev-&gt;hw_features |= BNGE_HW_FEATURE_VLAN_ALL_RX;</div><div class='add'>+	if (bd-&gt;fw_cap &amp; BNGE_FW_CAP_VLAN_TX_INSERT)</div><div class='add'>+		netdev-&gt;hw_features |= BNGE_HW_FEATURE_VLAN_ALL_TX;</div><div class='add'>+</div><div class='add'>+	if (BNGE_SUPPORTS_TPA(bd))</div><div class='add'>+		netdev-&gt;hw_features |= NETIF_F_GRO_HW;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;features |= netdev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;features &amp; NETIF_F_GRO_HW)</div><div class='add'>+		netdev-&gt;features &amp;= ~NETIF_F_LRO;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='add'>+</div><div class='add'>+	netif_set_tso_max_size(netdev, GSO_MAX_SIZE);</div><div class='add'>+	if (bd-&gt;tso_max_segs)</div><div class='add'>+		netif_set_tso_max_segs(netdev, bd-&gt;tso_max_segs);</div><div class='add'>+</div><div class='add'>+	bn-&gt;rx_ring_size = BNGE_DEFAULT_RX_RING_SIZE;</div><div class='add'>+	bn-&gt;tx_ring_size = BNGE_DEFAULT_TX_RING_SIZE;</div><div class='add'>+	bn-&gt;rx_dir = DMA_FROM_DEVICE;</div><div class='add'>+</div><div class='add'>+	bnge_set_tpa_flags(bd);</div><div class='add'>+	bnge_set_ring_params(bd);</div><div class='add'>+</div><div class='add'>+	bnge_init_l2_fltr_tbl(bn);</div><div class='add'>+	bnge_init_mac_addr(bd);</div><div class='add'>+</div><div class='add'>+	netdev-&gt;request_ops_lock = true;</div><div class='add'>+	rc = register_netdev(netdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Register netdev failed rc: %d\n", rc);</div><div class='add'>+		goto err_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_netdev:</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_netdev_free(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = bd-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	unregister_netdev(netdev);</div><div class='add'>+	free_netdev(netdev);</div><div class='add'>+	bd-&gt;netdev = NULL;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h b/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h<br/>new file mode 100644<br/>index 000000000000..fb3b961536ba<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_netdev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_netdev.h</a></div><div class='hunk'>@@ -0,0 +1,454 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_NETDEV_H_</div><div class='add'>+#define _BNGE_NETDEV_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include "bnge_db.h"</div><div class='add'>+</div><div class='add'>+struct tx_bd {</div><div class='add'>+	__le32 tx_bd_len_flags_type;</div><div class='add'>+	#define TX_BD_TYPE					(0x3f &lt;&lt; 0)</div><div class='add'>+	#define TX_BD_TYPE_SHORT_TX_BD				(0x00 &lt;&lt; 0)</div><div class='add'>+	#define TX_BD_TYPE_LONG_TX_BD				(0x10 &lt;&lt; 0)</div><div class='add'>+	#define TX_BD_FLAGS_PACKET_END				(1 &lt;&lt; 6)</div><div class='add'>+	#define TX_BD_FLAGS_NO_CMPL				(1 &lt;&lt; 7)</div><div class='add'>+	#define TX_BD_FLAGS_BD_CNT				(0x1f &lt;&lt; 8)</div><div class='add'>+	#define TX_BD_FLAGS_BD_CNT_SHIFT			8</div><div class='add'>+	#define TX_BD_FLAGS_LHINT				(3 &lt;&lt; 13)</div><div class='add'>+	#define TX_BD_FLAGS_LHINT_SHIFT				13</div><div class='add'>+	#define TX_BD_FLAGS_LHINT_512_AND_SMALLER		(0 &lt;&lt; 13)</div><div class='add'>+	#define TX_BD_FLAGS_LHINT_512_TO_1023			(1 &lt;&lt; 13)</div><div class='add'>+	#define TX_BD_FLAGS_LHINT_1024_TO_2047			(2 &lt;&lt; 13)</div><div class='add'>+	#define TX_BD_FLAGS_LHINT_2048_AND_LARGER		(3 &lt;&lt; 13)</div><div class='add'>+	#define TX_BD_FLAGS_COAL_NOW				(1 &lt;&lt; 15)</div><div class='add'>+	#define TX_BD_LEN					(0xffff &lt;&lt; 16)</div><div class='add'>+	#define TX_BD_LEN_SHIFT					16</div><div class='add'>+	u32 tx_bd_opaque;</div><div class='add'>+	__le64 tx_bd_haddr;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct rx_bd {</div><div class='add'>+	__le32 rx_bd_len_flags_type;</div><div class='add'>+	#define RX_BD_TYPE					(0x3f &lt;&lt; 0)</div><div class='add'>+	#define RX_BD_TYPE_RX_PACKET_BD				0x4</div><div class='add'>+	#define RX_BD_TYPE_RX_BUFFER_BD				0x5</div><div class='add'>+	#define RX_BD_TYPE_RX_AGG_BD				0x6</div><div class='add'>+	#define RX_BD_TYPE_16B_BD_SIZE				(0 &lt;&lt; 4)</div><div class='add'>+	#define RX_BD_TYPE_32B_BD_SIZE				(1 &lt;&lt; 4)</div><div class='add'>+	#define RX_BD_TYPE_48B_BD_SIZE				(2 &lt;&lt; 4)</div><div class='add'>+	#define RX_BD_TYPE_64B_BD_SIZE				(3 &lt;&lt; 4)</div><div class='add'>+	#define RX_BD_FLAGS_SOP					(1 &lt;&lt; 6)</div><div class='add'>+	#define RX_BD_FLAGS_EOP					(1 &lt;&lt; 7)</div><div class='add'>+	#define RX_BD_FLAGS_BUFFERS				(3 &lt;&lt; 8)</div><div class='add'>+	#define RX_BD_FLAGS_1_BUFFER_PACKET			(0 &lt;&lt; 8)</div><div class='add'>+	#define RX_BD_FLAGS_2_BUFFER_PACKET			(1 &lt;&lt; 8)</div><div class='add'>+	#define RX_BD_FLAGS_3_BUFFER_PACKET			(2 &lt;&lt; 8)</div><div class='add'>+	#define RX_BD_FLAGS_4_BUFFER_PACKET			(3 &lt;&lt; 8)</div><div class='add'>+	#define RX_BD_LEN					(0xffff &lt;&lt; 16)</div><div class='add'>+	#define RX_BD_LEN_SHIFT					16</div><div class='add'>+	u32 rx_bd_opaque;</div><div class='add'>+	__le64 rx_bd_haddr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tx_cmp {</div><div class='add'>+	__le32 tx_cmp_flags_type;</div><div class='add'>+	#define CMP_TYPE					(0x3f &lt;&lt; 0)</div><div class='add'>+	#define CMP_TYPE_TX_L2_CMP				0</div><div class='add'>+	#define CMP_TYPE_TX_L2_COAL_CMP				2</div><div class='add'>+	#define CMP_TYPE_TX_L2_PKT_TS_CMP			4</div><div class='add'>+	#define CMP_TYPE_RX_L2_CMP				17</div><div class='add'>+	#define CMP_TYPE_RX_AGG_CMP				18</div><div class='add'>+	#define CMP_TYPE_RX_L2_TPA_START_CMP			19</div><div class='add'>+	#define CMP_TYPE_RX_L2_TPA_END_CMP			21</div><div class='add'>+	#define CMP_TYPE_RX_TPA_AGG_CMP				22</div><div class='add'>+	#define CMP_TYPE_RX_L2_V3_CMP				23</div><div class='add'>+	#define CMP_TYPE_RX_L2_TPA_START_V3_CMP			25</div><div class='add'>+	#define CMP_TYPE_STATUS_CMP				32</div><div class='add'>+	#define CMP_TYPE_REMOTE_DRIVER_REQ			34</div><div class='add'>+	#define CMP_TYPE_REMOTE_DRIVER_RESP			36</div><div class='add'>+	#define CMP_TYPE_ERROR_STATUS				48</div><div class='add'>+	#define CMPL_BASE_TYPE_STAT_EJECT			0x1aUL</div><div class='add'>+	#define CMPL_BASE_TYPE_HWRM_DONE			0x20UL</div><div class='add'>+	#define CMPL_BASE_TYPE_HWRM_FWD_REQ			0x22UL</div><div class='add'>+	#define CMPL_BASE_TYPE_HWRM_FWD_RESP			0x24UL</div><div class='add'>+	#define CMPL_BASE_TYPE_HWRM_ASYNC_EVENT			0x2eUL</div><div class='add'>+	#define TX_CMP_FLAGS_ERROR				(1 &lt;&lt; 6)</div><div class='add'>+	#define TX_CMP_FLAGS_PUSH				(1 &lt;&lt; 7)</div><div class='add'>+	u32 tx_cmp_opaque;</div><div class='add'>+	__le32 tx_cmp_errors_v;</div><div class='add'>+	#define TX_CMP_V					(1 &lt;&lt; 0)</div><div class='add'>+	#define TX_CMP_ERRORS_BUFFER_ERROR			(7 &lt;&lt; 1)</div><div class='add'>+	#define TX_CMP_ERRORS_BUFFER_ERROR_NO_ERROR		0</div><div class='add'>+	#define TX_CMP_ERRORS_BUFFER_ERROR_BAD_FORMAT		2</div><div class='add'>+	#define TX_CMP_ERRORS_BUFFER_ERROR_INVALID_STAG		4</div><div class='add'>+	#define TX_CMP_ERRORS_BUFFER_ERROR_STAG_BOUNDS		5</div><div class='add'>+	#define TX_CMP_ERRORS_ZERO_LENGTH_PKT			(1 &lt;&lt; 4)</div><div class='add'>+	#define TX_CMP_ERRORS_EXCESSIVE_BD_LEN			(1 &lt;&lt; 5)</div><div class='add'>+	#define TX_CMP_ERRORS_DMA_ERROR				(1 &lt;&lt; 6)</div><div class='add'>+	#define TX_CMP_ERRORS_HINT_TOO_SHORT			(1 &lt;&lt; 7)</div><div class='add'>+	__le32 sq_cons_idx;</div><div class='add'>+	#define TX_CMP_SQ_CONS_IDX_MASK				0x00ffffff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_sw_tx_bd {</div><div class='add'>+	struct sk_buff		*skb;</div><div class='add'>+	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='add'>+	DEFINE_DMA_UNMAP_LEN(len);</div><div class='add'>+	struct page		*page;</div><div class='add'>+	u8			is_ts_pkt;</div><div class='add'>+	u8			is_push;</div><div class='add'>+	u8			action;</div><div class='add'>+	unsigned short		nr_frags;</div><div class='add'>+	union {</div><div class='add'>+		u16		rx_prod;</div><div class='add'>+		u16		txts_prod;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_sw_rx_bd {</div><div class='add'>+	void			*data;</div><div class='add'>+	u8			*data_ptr;</div><div class='add'>+	dma_addr_t		mapping;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_sw_rx_agg_bd {</div><div class='add'>+	netmem_ref		netmem;</div><div class='add'>+	unsigned int		offset;</div><div class='add'>+	dma_addr_t		mapping;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HWRM_RING_ALLOC_TX	0x1</div><div class='add'>+#define HWRM_RING_ALLOC_RX	0x2</div><div class='add'>+#define HWRM_RING_ALLOC_AGG	0x4</div><div class='add'>+#define HWRM_RING_ALLOC_CMPL	0x8</div><div class='add'>+#define HWRM_RING_ALLOC_NQ	0x10</div><div class='add'>+</div><div class='add'>+struct bnge_ring_grp_info {</div><div class='add'>+	u16	fw_stats_ctx;</div><div class='add'>+	u16	fw_grp_id;</div><div class='add'>+	u16	rx_fw_ring_id;</div><div class='add'>+	u16	agg_fw_ring_id;</div><div class='add'>+	u16	nq_fw_ring_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_RX_COPY_THRESH     256</div><div class='add'>+</div><div class='add'>+#define BNGE_HW_FEATURE_VLAN_ALL_RX	\</div><div class='add'>+		(NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)</div><div class='add'>+#define BNGE_HW_FEATURE_VLAN_ALL_TX	\</div><div class='add'>+		(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX)</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	BNGE_NET_EN_GRO		= BIT(0),</div><div class='add'>+	BNGE_NET_EN_LRO		= BIT(1),</div><div class='add'>+	BNGE_NET_EN_JUMBO	= BIT(2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_NET_EN_TPA		(BNGE_NET_EN_GRO | BNGE_NET_EN_LRO)</div><div class='add'>+</div><div class='add'>+/* Minimum TX BDs for a TX packet with MAX_SKB_FRAGS + 1. We need one extra</div><div class='add'>+ * BD because the first TX BD is always a long BD.</div><div class='add'>+ */</div><div class='add'>+#define BNGE_MIN_TX_DESC_CNT	(MAX_SKB_FRAGS + 2)</div><div class='add'>+</div><div class='add'>+#define RX_RING(bn, x)	(((x) &amp; (bn)-&gt;rx_ring_mask) &gt;&gt; (BNGE_PAGE_SHIFT - 4))</div><div class='add'>+#define RX_AGG_RING(bn, x)	(((x) &amp; (bn)-&gt;rx_agg_ring_mask) &gt;&gt;	\</div><div class='add'>+				 (BNGE_PAGE_SHIFT - 4))</div><div class='add'>+#define RX_IDX(x)	((x) &amp; (RX_DESC_CNT - 1))</div><div class='add'>+</div><div class='add'>+#define TX_RING(bn, x)	(((x) &amp; (bn)-&gt;tx_ring_mask) &gt;&gt; (BNGE_PAGE_SHIFT - 4))</div><div class='add'>+#define TX_IDX(x)	((x) &amp; (TX_DESC_CNT - 1))</div><div class='add'>+</div><div class='add'>+#define CP_RING(x)	(((x) &amp; ~(CP_DESC_CNT - 1)) &gt;&gt; (BNGE_PAGE_SHIFT - 4))</div><div class='add'>+#define CP_IDX(x)	((x) &amp; (CP_DESC_CNT - 1))</div><div class='add'>+</div><div class='add'>+#define RING_RX(bn, idx)	((idx) &amp; (bn)-&gt;rx_ring_mask)</div><div class='add'>+#define NEXT_RX(idx)		((idx) + 1)</div><div class='add'>+</div><div class='add'>+#define RING_RX_AGG(bn, idx)	((idx) &amp; (bn)-&gt;rx_agg_ring_mask)</div><div class='add'>+#define NEXT_RX_AGG(idx)	((idx) + 1)</div><div class='add'>+</div><div class='add'>+#define BNGE_NQ_HDL_TYPE_SHIFT	24</div><div class='add'>+#define BNGE_NQ_HDL_TYPE_RX	0x00</div><div class='add'>+#define BNGE_NQ_HDL_TYPE_TX	0x01</div><div class='add'>+</div><div class='add'>+struct bnge_net {</div><div class='add'>+	struct bnge_dev		*bd;</div><div class='add'>+	struct net_device	*netdev;</div><div class='add'>+</div><div class='add'>+	u32			priv_flags;</div><div class='add'>+</div><div class='add'>+	u32			rx_ring_size;</div><div class='add'>+	u32			rx_buf_size;</div><div class='add'>+	u32			rx_buf_use_size; /* usable size */</div><div class='add'>+	u32			rx_agg_ring_size;</div><div class='add'>+	u32			rx_copy_thresh;</div><div class='add'>+	u32			rx_ring_mask;</div><div class='add'>+	u32			rx_agg_ring_mask;</div><div class='add'>+	u16			rx_nr_pages;</div><div class='add'>+	u16			rx_agg_nr_pages;</div><div class='add'>+</div><div class='add'>+	u32			tx_ring_size;</div><div class='add'>+	u32			tx_ring_mask;</div><div class='add'>+	u16			tx_nr_pages;</div><div class='add'>+</div><div class='add'>+	/* NQs and Completion rings */</div><div class='add'>+	u32			cp_ring_size;</div><div class='add'>+	u32			cp_ring_mask;</div><div class='add'>+	u32			cp_bit;</div><div class='add'>+	u16			cp_nr_pages;</div><div class='add'>+</div><div class='add'>+#define BNGE_L2_FLTR_HASH_SIZE	32</div><div class='add'>+#define BNGE_L2_FLTR_HASH_MASK	(BNGE_L2_FLTR_HASH_SIZE - 1)</div><div class='add'>+	struct hlist_head	l2_fltr_hash_tbl[BNGE_L2_FLTR_HASH_SIZE];</div><div class='add'>+	u32			hash_seed;</div><div class='add'>+	u64			toeplitz_prefix;</div><div class='add'>+</div><div class='add'>+	struct bnge_napi		**bnapi;</div><div class='add'>+</div><div class='add'>+	struct bnge_rx_ring_info	*rx_ring;</div><div class='add'>+	struct bnge_tx_ring_info	*tx_ring;</div><div class='add'>+</div><div class='add'>+	u16				*tx_ring_map;</div><div class='add'>+	enum dma_data_direction		rx_dir;</div><div class='add'>+</div><div class='add'>+	/* grp_info indexed by napi/nq index */</div><div class='add'>+	struct bnge_ring_grp_info	*grp_info;</div><div class='add'>+	struct bnge_vnic_info		*vnic_info;</div><div class='add'>+	int				nr_vnics;</div><div class='add'>+	int				total_irqs;</div><div class='add'>+</div><div class='add'>+	u32			tx_wake_thresh;</div><div class='add'>+	u16			rx_offset;</div><div class='add'>+	u16			rx_dma_offset;</div><div class='add'>+</div><div class='add'>+	u8			rss_hash_key[HW_HASH_KEY_SIZE];</div><div class='add'>+	u8			rss_hash_key_valid:1;</div><div class='add'>+	u8			rss_hash_key_updated:1;</div><div class='add'>+	int			rsscos_nr_ctxs;</div><div class='add'>+	u32			stats_coal_ticks;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_DEFAULT_RX_RING_SIZE	511</div><div class='add'>+#define BNGE_DEFAULT_TX_RING_SIZE	511</div><div class='add'>+</div><div class='add'>+int bnge_netdev_alloc(struct bnge_dev *bd, int max_irqs);</div><div class='add'>+void bnge_netdev_free(struct bnge_dev *bd);</div><div class='add'>+void bnge_set_ring_params(struct bnge_dev *bd);</div><div class='add'>+</div><div class='add'>+#if (BNGE_PAGE_SHIFT == 16)</div><div class='add'>+#define MAX_RX_PAGES_AGG_ENA	1</div><div class='add'>+#define MAX_RX_PAGES		4</div><div class='add'>+#define MAX_RX_AGG_PAGES	4</div><div class='add'>+#define MAX_TX_PAGES		1</div><div class='add'>+#define MAX_CP_PAGES		16</div><div class='add'>+#else</div><div class='add'>+#define MAX_RX_PAGES_AGG_ENA	8</div><div class='add'>+#define MAX_RX_PAGES		32</div><div class='add'>+#define MAX_RX_AGG_PAGES	32</div><div class='add'>+#define MAX_TX_PAGES		8</div><div class='add'>+#define MAX_CP_PAGES		128</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define BNGE_RX_PAGE_SIZE		(1 &lt;&lt; BNGE_RX_PAGE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define RX_DESC_CNT			(BNGE_PAGE_SIZE / sizeof(struct rx_bd))</div><div class='add'>+#define TX_DESC_CNT			(BNGE_PAGE_SIZE / sizeof(struct tx_bd))</div><div class='add'>+#define CP_DESC_CNT			(BNGE_PAGE_SIZE / sizeof(struct tx_cmp))</div><div class='add'>+#define SW_RXBD_RING_SIZE		(sizeof(struct bnge_sw_rx_bd) * RX_DESC_CNT)</div><div class='add'>+#define HW_RXBD_RING_SIZE		(sizeof(struct rx_bd) * RX_DESC_CNT)</div><div class='add'>+#define SW_RXBD_AGG_RING_SIZE		(sizeof(struct bnge_sw_rx_agg_bd) * RX_DESC_CNT)</div><div class='add'>+#define SW_TXBD_RING_SIZE		(sizeof(struct bnge_sw_tx_bd) * TX_DESC_CNT)</div><div class='add'>+#define HW_TXBD_RING_SIZE		(sizeof(struct tx_bd) * TX_DESC_CNT)</div><div class='add'>+#define HW_CMPD_RING_SIZE		(sizeof(struct tx_cmp) * CP_DESC_CNT)</div><div class='add'>+#define BNGE_MAX_RX_DESC_CNT		(RX_DESC_CNT * MAX_RX_PAGES - 1)</div><div class='add'>+#define BNGE_MAX_RX_DESC_CNT_JUM_ENA	(RX_DESC_CNT * MAX_RX_PAGES_AGG_ENA - 1)</div><div class='add'>+#define BNGE_MAX_RX_JUM_DESC_CNT	(RX_DESC_CNT * MAX_RX_AGG_PAGES - 1)</div><div class='add'>+#define BNGE_MAX_TX_DESC_CNT		(TX_DESC_CNT * MAX_TX_PAGES - 1)</div><div class='add'>+</div><div class='add'>+#define BNGE_MAX_TXR_PER_NAPI	8</div><div class='add'>+</div><div class='add'>+#define bnge_for_each_napi_tx(iter, bnapi, txr)		\</div><div class='add'>+	for (iter = 0, txr = (bnapi)-&gt;tx_ring[0]; txr;	\</div><div class='add'>+	     txr = (iter &lt; BNGE_MAX_TXR_PER_NAPI - 1) ?	\</div><div class='add'>+	     (bnapi)-&gt;tx_ring[++iter] : NULL)</div><div class='add'>+</div><div class='add'>+#define BNGE_SET_NQ_HDL(cpr)						\</div><div class='add'>+	(((cpr)-&gt;cp_ring_type &lt;&lt; BNGE_NQ_HDL_TYPE_SHIFT) | (cpr)-&gt;cp_idx)</div><div class='add'>+</div><div class='add'>+struct bnge_stats_mem {</div><div class='add'>+	u64		*sw_stats;</div><div class='add'>+	u64		*hw_masks;</div><div class='add'>+	void		*hw_stats;</div><div class='add'>+	dma_addr_t	hw_stats_map;</div><div class='add'>+	int		len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_cp_ring_info {</div><div class='add'>+	struct bnge_napi	*bnapi;</div><div class='add'>+	dma_addr_t		*desc_mapping;</div><div class='add'>+	struct tx_cmp		**desc_ring;</div><div class='add'>+	struct bnge_ring_struct	ring_struct;</div><div class='add'>+	u8			cp_ring_type;</div><div class='add'>+	u8			cp_idx;</div><div class='add'>+	u32			cp_raw_cons;</div><div class='add'>+	struct bnge_db_info	cp_db;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_nq_ring_info {</div><div class='add'>+	struct bnge_napi	*bnapi;</div><div class='add'>+	dma_addr_t		*desc_mapping;</div><div class='add'>+	struct nqe_cn		**desc_ring;</div><div class='add'>+	struct bnge_ring_struct	ring_struct;</div><div class='add'>+	u32			nq_raw_cons;</div><div class='add'>+	struct bnge_db_info	nq_db;</div><div class='add'>+</div><div class='add'>+	struct bnge_stats_mem	stats;</div><div class='add'>+	u32			hw_stats_ctx_id;</div><div class='add'>+</div><div class='add'>+	int				cp_ring_count;</div><div class='add'>+	struct bnge_cp_ring_info	*cp_ring_arr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_rx_ring_info {</div><div class='add'>+	struct bnge_napi	*bnapi;</div><div class='add'>+	struct bnge_cp_ring_info	*rx_cpr;</div><div class='add'>+	u16			rx_prod;</div><div class='add'>+	u16			rx_agg_prod;</div><div class='add'>+	u16			rx_sw_agg_prod;</div><div class='add'>+	u16			rx_next_cons;</div><div class='add'>+	struct bnge_db_info	rx_db;</div><div class='add'>+	struct bnge_db_info	rx_agg_db;</div><div class='add'>+</div><div class='add'>+	struct rx_bd		*rx_desc_ring[MAX_RX_PAGES];</div><div class='add'>+	struct bnge_sw_rx_bd	*rx_buf_ring;</div><div class='add'>+</div><div class='add'>+	struct rx_bd			*rx_agg_desc_ring[MAX_RX_AGG_PAGES];</div><div class='add'>+	struct bnge_sw_rx_agg_bd	*rx_agg_buf_ring;</div><div class='add'>+</div><div class='add'>+	unsigned long		*rx_agg_bmap;</div><div class='add'>+	u16			rx_agg_bmap_size;</div><div class='add'>+</div><div class='add'>+	dma_addr_t		rx_desc_mapping[MAX_RX_PAGES];</div><div class='add'>+	dma_addr_t		rx_agg_desc_mapping[MAX_RX_AGG_PAGES];</div><div class='add'>+</div><div class='add'>+	struct bnge_ring_struct	rx_ring_struct;</div><div class='add'>+	struct bnge_ring_struct	rx_agg_ring_struct;</div><div class='add'>+	struct page_pool	*page_pool;</div><div class='add'>+	struct page_pool	*head_pool;</div><div class='add'>+	bool			need_head_pool;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_tx_ring_info {</div><div class='add'>+	struct bnge_napi	*bnapi;</div><div class='add'>+	struct bnge_cp_ring_info	*tx_cpr;</div><div class='add'>+	u16			tx_prod;</div><div class='add'>+	u16			tx_cons;</div><div class='add'>+	u16			tx_hw_cons;</div><div class='add'>+	u16			txq_index;</div><div class='add'>+	u8			tx_napi_idx;</div><div class='add'>+	u8			kick_pending;</div><div class='add'>+	struct bnge_db_info	tx_db;</div><div class='add'>+</div><div class='add'>+	struct tx_bd		*tx_desc_ring[MAX_TX_PAGES];</div><div class='add'>+	struct bnge_sw_tx_bd	*tx_buf_ring;</div><div class='add'>+</div><div class='add'>+	dma_addr_t		tx_desc_mapping[MAX_TX_PAGES];</div><div class='add'>+</div><div class='add'>+	u32			dev_state;</div><div class='add'>+#define BNGE_DEV_STATE_CLOSING	0x1</div><div class='add'>+</div><div class='add'>+	struct bnge_ring_struct	tx_ring_struct;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_napi {</div><div class='add'>+	struct napi_struct		napi;</div><div class='add'>+	struct bnge_net			*bn;</div><div class='add'>+	int				index;</div><div class='add'>+</div><div class='add'>+	struct bnge_nq_ring_info	nq_ring;</div><div class='add'>+	struct bnge_rx_ring_info	*rx_ring;</div><div class='add'>+	struct bnge_tx_ring_info	*tx_ring[BNGE_MAX_TXR_PER_NAPI];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define INVALID_STATS_CTX_ID	-1</div><div class='add'>+#define BNGE_VNIC_DEFAULT	0</div><div class='add'>+#define BNGE_MAX_UC_ADDRS	4</div><div class='add'>+</div><div class='add'>+struct bnge_vnic_info {</div><div class='add'>+	u16		fw_vnic_id;</div><div class='add'>+#define BNGE_MAX_CTX_PER_VNIC	8</div><div class='add'>+	u16		fw_rss_cos_lb_ctx[BNGE_MAX_CTX_PER_VNIC];</div><div class='add'>+	u16		mru;</div><div class='add'>+	/* index 0 always dev_addr */</div><div class='add'>+	struct bnge_l2_filter *l2_filters[BNGE_MAX_UC_ADDRS];</div><div class='add'>+	u16		uc_filter_count;</div><div class='add'>+	u8		*uc_list;</div><div class='add'>+	dma_addr_t	rss_table_dma_addr;</div><div class='add'>+	__le16		*rss_table;</div><div class='add'>+	dma_addr_t	rss_hash_key_dma_addr;</div><div class='add'>+	u64		*rss_hash_key;</div><div class='add'>+	int		rss_table_size;</div><div class='add'>+#define BNGE_RSS_TABLE_ENTRIES		64</div><div class='add'>+#define BNGE_RSS_TABLE_SIZE		(BNGE_RSS_TABLE_ENTRIES * 4)</div><div class='add'>+#define BNGE_RSS_TABLE_MAX_TBL		8</div><div class='add'>+#define BNGE_MAX_RSS_TABLE_SIZE			\</div><div class='add'>+	(BNGE_RSS_TABLE_SIZE * BNGE_RSS_TABLE_MAX_TBL)</div><div class='add'>+	u32		rx_mask;</div><div class='add'>+</div><div class='add'>+	u8		*mc_list;</div><div class='add'>+	int		mc_list_size;</div><div class='add'>+	int		mc_list_count;</div><div class='add'>+	dma_addr_t	mc_list_mapping;</div><div class='add'>+#define BNGE_MAX_MC_ADDRS	16</div><div class='add'>+</div><div class='add'>+	u32		flags;</div><div class='add'>+#define BNGE_VNIC_RSS_FLAG	1</div><div class='add'>+#define BNGE_VNIC_MCAST_FLAG	4</div><div class='add'>+#define BNGE_VNIC_UCAST_FLAG	8</div><div class='add'>+	u32		vnic_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_filter_base {</div><div class='add'>+	struct hlist_node	hash;</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	__le64			filter_id;</div><div class='add'>+	u8			type;</div><div class='add'>+#define BNGE_FLTR_TYPE_L2	2</div><div class='add'>+	u8			flags;</div><div class='add'>+	u16			rxq;</div><div class='add'>+	u16			fw_vnic_id;</div><div class='add'>+	u16			vf_idx;</div><div class='add'>+	unsigned long		state;</div><div class='add'>+#define BNGE_FLTR_VALID		0</div><div class='add'>+#define BNGE_FLTR_FW_DELETED	2</div><div class='add'>+</div><div class='add'>+	struct rcu_head         rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_l2_key {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8	dst_mac_addr[ETH_ALEN];</div><div class='add'>+			u16	vlan;</div><div class='add'>+		};</div><div class='add'>+		u32	filter_key;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_L2_KEY_SIZE	(sizeof(struct bnge_l2_key) / 4)</div><div class='add'>+struct bnge_l2_filter {</div><div class='add'>+	/* base filter must be the first member */</div><div class='add'>+	struct bnge_filter_base	base;</div><div class='add'>+	struct bnge_l2_key	l2_key;</div><div class='add'>+	refcount_t		refcnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u16 bnge_cp_ring_for_rx(struct bnge_rx_ring_info *rxr);</div><div class='add'>+u16 bnge_cp_ring_for_tx(struct bnge_tx_ring_info *txr);</div><div class='add'>+void bnge_fill_hw_rss_tbl(struct bnge_net *bn, struct bnge_vnic_info *vnic);</div><div class='add'>+#endif /* _BNGE_NETDEV_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_resc.c b/drivers/net/ethernet/broadcom/bnge/bnge_resc.c<br/>new file mode 100644<br/>index 000000000000..943df5f60f01<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_resc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_resc.c</a></div><div class='hunk'>@@ -0,0 +1,617 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_hwrm.h"</div><div class='add'>+#include "bnge_hwrm_lib.h"</div><div class='add'>+#include "bnge_resc.h"</div><div class='add'>+</div><div class='add'>+static u16 bnge_num_tx_to_cp(struct bnge_dev *bd, u16 tx)</div><div class='add'>+{</div><div class='add'>+	u16 tcs = bd-&gt;num_tc;</div><div class='add'>+</div><div class='add'>+	if (!tcs)</div><div class='add'>+		tcs = 1;</div><div class='add'>+</div><div class='add'>+	return tx / tcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_get_max_func_irqs(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hw_resc *hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+</div><div class='add'>+	return min_t(u16, hw_resc-&gt;max_irqs, hw_resc-&gt;max_nqs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int bnge_get_max_func_stat_ctxs(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;hw_resc.max_stat_ctxs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bnge_aux_has_enough_resources(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_stat_ctxs;</div><div class='add'>+</div><div class='add'>+	max_stat_ctxs = bnge_get_max_func_stat_ctxs(bd);</div><div class='add'>+	if (max_stat_ctxs &lt;= BNGE_MIN_ROCE_STAT_CTXS ||</div><div class='add'>+	    bd-&gt;nq_nr_rings == max_stat_ctxs)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int bnge_get_max_func_cp_rings(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;hw_resc.max_cp_rings;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_aux_get_dflt_msix(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	int roce_msix = BNGE_MAX_ROCE_MSIX;</div><div class='add'>+</div><div class='add'>+	return min_t(int, roce_msix, num_online_cpus() + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u16 bnge_aux_get_msix(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	if (bnge_is_roce_en(bd))</div><div class='add'>+		return bd-&gt;aux_num_msix;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_aux_set_msix_num(struct bnge_dev *bd, u16 num)</div><div class='add'>+{</div><div class='add'>+	if (bnge_is_roce_en(bd))</div><div class='add'>+		bd-&gt;aux_num_msix = num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_aux_get_stat_ctxs(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	if (bnge_is_roce_en(bd))</div><div class='add'>+		return bd-&gt;aux_num_stat_ctxs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_aux_set_stat_ctxs(struct bnge_dev *bd, u16 num_aux_ctx)</div><div class='add'>+{</div><div class='add'>+	if (bnge_is_roce_en(bd))</div><div class='add'>+		bd-&gt;aux_num_stat_ctxs = num_aux_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_func_stat_ctxs_demand(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;nq_nr_rings + bnge_aux_get_stat_ctxs(bd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_get_dflt_aux_stat_ctxs(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	int stat_ctx = 0;</div><div class='add'>+</div><div class='add'>+	if (bnge_is_roce_en(bd)) {</div><div class='add'>+		stat_ctx = BNGE_MIN_ROCE_STAT_CTXS;</div><div class='add'>+</div><div class='add'>+		if (!bd-&gt;pf.port_id &amp;&amp; bd-&gt;port_count &gt; 1)</div><div class='add'>+			stat_ctx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return stat_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_nqs_demand(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;nq_nr_rings + bnge_aux_get_msix(bd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_cprs_demand(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bd-&gt;tx_nr_rings + bd-&gt;rx_nr_rings;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_get_avail_msix(struct bnge_dev *bd, int num)</div><div class='add'>+{</div><div class='add'>+	u16 max_irq = bnge_get_max_func_irqs(bd);</div><div class='add'>+	u16 total_demand = bd-&gt;nq_nr_rings + num;</div><div class='add'>+</div><div class='add'>+	if (max_irq &lt; total_demand) {</div><div class='add'>+		num = max_irq - bd-&gt;nq_nr_rings;</div><div class='add'>+		if (num &lt;= 0)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return num;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_num_cp_to_tx(struct bnge_dev *bd, u16 tx_chunks)</div><div class='add'>+{</div><div class='add'>+	return tx_chunks * bd-&gt;num_tc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_fix_rings_count(u16 *rx, u16 *tx, u16 max, bool shared)</div><div class='add'>+{</div><div class='add'>+	u16 _rx = *rx, _tx = *tx;</div><div class='add'>+</div><div class='add'>+	if (shared) {</div><div class='add'>+		*rx = min_t(u16, _rx, max);</div><div class='add'>+		*tx = min_t(u16, _tx, max);</div><div class='add'>+	} else {</div><div class='add'>+		if (max &lt; 2)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		while (_rx + _tx &gt; max) {</div><div class='add'>+			if (_rx &gt; _tx &amp;&amp; _rx &gt; 1)</div><div class='add'>+				_rx--;</div><div class='add'>+			else if (_tx &gt; 1)</div><div class='add'>+				_tx--;</div><div class='add'>+		}</div><div class='add'>+		*rx = _rx;</div><div class='add'>+		*tx = _tx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_adjust_rings(struct bnge_dev *bd, u16 *rx,</div><div class='add'>+			     u16 *tx, u16 max_nq, bool sh)</div><div class='add'>+{</div><div class='add'>+	u16 tx_chunks = bnge_num_tx_to_cp(bd, *tx);</div><div class='add'>+</div><div class='add'>+	if (tx_chunks != *tx) {</div><div class='add'>+		u16 tx_saved = tx_chunks, rc;</div><div class='add'>+</div><div class='add'>+		rc = bnge_fix_rings_count(rx, &amp;tx_chunks, max_nq, sh);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (tx_chunks != tx_saved)</div><div class='add'>+			*tx = bnge_num_cp_to_tx(bd, tx_chunks);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bnge_fix_rings_count(rx, tx, max_nq, sh);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_cal_nr_rss_ctxs(u16 rx_rings)</div><div class='add'>+{</div><div class='add'>+	if (!rx_rings)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return bnge_adjust_pow_two(rx_rings - 1,</div><div class='add'>+				   BNGE_RSS_TABLE_ENTRIES);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_rss_ctxs_in_use(struct bnge_dev *bd,</div><div class='add'>+				struct bnge_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	return bnge_cal_nr_rss_ctxs(hwr-&gt;grp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnge_get_total_vnics(struct bnge_dev *bd, u16 rx_rings)</div><div class='add'>+{</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 bnge_get_rxfh_indir_size(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	return bnge_cal_nr_rss_ctxs(bd-&gt;rx_nr_rings) *</div><div class='add'>+	       BNGE_RSS_TABLE_ENTRIES;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_set_dflt_rss_indir_tbl(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	u16 max_entries, pad;</div><div class='add'>+	u32 *rss_indir_tbl;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	max_entries = bnge_get_rxfh_indir_size(bd);</div><div class='add'>+	rss_indir_tbl = &amp;bd-&gt;rss_indir_tbl[0];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_entries; i++)</div><div class='add'>+		rss_indir_tbl[i] = ethtool_rxfh_indir_default(i,</div><div class='add'>+							      bd-&gt;rx_nr_rings);</div><div class='add'>+</div><div class='add'>+	pad = bd-&gt;rss_indir_tbl_entries - max_entries;</div><div class='add'>+	if (pad)</div><div class='add'>+		memset(&amp;rss_indir_tbl[i], 0, pad * sizeof(*rss_indir_tbl));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_copy_reserved_rings(struct bnge_dev *bd,</div><div class='add'>+				     struct bnge_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hw_resc *hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+</div><div class='add'>+	hwr-&gt;tx = hw_resc-&gt;resv_tx_rings;</div><div class='add'>+	hwr-&gt;rx = hw_resc-&gt;resv_rx_rings;</div><div class='add'>+	hwr-&gt;nq = hw_resc-&gt;resv_irqs;</div><div class='add'>+	hwr-&gt;cmpl = hw_resc-&gt;resv_cp_rings;</div><div class='add'>+	hwr-&gt;grp = hw_resc-&gt;resv_hw_ring_grps;</div><div class='add'>+	hwr-&gt;vnic = hw_resc-&gt;resv_vnics;</div><div class='add'>+	hwr-&gt;stat = hw_resc-&gt;resv_stat_ctxs;</div><div class='add'>+	hwr-&gt;rss_ctx = hw_resc-&gt;resv_rsscos_ctxs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnge_rings_ok(struct bnge_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	return hwr-&gt;tx &amp;&amp; hwr-&gt;rx &amp;&amp; hwr-&gt;nq &amp;&amp; hwr-&gt;grp &amp;&amp; hwr-&gt;vnic &amp;&amp;</div><div class='add'>+	       hwr-&gt;stat &amp;&amp; hwr-&gt;cmpl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnge_need_reserve_rings(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hw_resc *hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+	u16 cprs = bnge_cprs_demand(bd);</div><div class='add'>+	u16 rx = bd-&gt;rx_nr_rings, stat;</div><div class='add'>+	u16 nqs = bnge_nqs_demand(bd);</div><div class='add'>+	u16 vnic;</div><div class='add'>+</div><div class='add'>+	if (hw_resc-&gt;resv_tx_rings != bd-&gt;tx_nr_rings)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	vnic = bnge_get_total_vnics(bd, rx);</div><div class='add'>+</div><div class='add'>+	if (bnge_is_agg_reqd(bd))</div><div class='add'>+		rx &lt;&lt;= 1;</div><div class='add'>+	stat = bnge_func_stat_ctxs_demand(bd);</div><div class='add'>+	if (hw_resc-&gt;resv_rx_rings != rx || hw_resc-&gt;resv_cp_rings != cprs ||</div><div class='add'>+	    hw_resc-&gt;resv_vnics != vnic || hw_resc-&gt;resv_stat_ctxs != stat)</div><div class='add'>+		return true;</div><div class='add'>+	if (hw_resc-&gt;resv_irqs != nqs)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_reserve_rings(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	u16 aux_dflt_msix = bnge_aux_get_dflt_msix(bd);</div><div class='add'>+	struct bnge_hw_rings hwr = {0};</div><div class='add'>+	u16 rx_rings, old_rx_rings;</div><div class='add'>+	u16 nq = bd-&gt;nq_nr_rings;</div><div class='add'>+	u16 aux_msix = 0;</div><div class='add'>+	bool sh = false;</div><div class='add'>+	u16 tx_cp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bnge_need_reserve_rings(bd))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!bnge_aux_registered(bd)) {</div><div class='add'>+		aux_msix = bnge_get_avail_msix(bd, aux_dflt_msix);</div><div class='add'>+		if (!aux_msix)</div><div class='add'>+			bnge_aux_set_stat_ctxs(bd, 0);</div><div class='add'>+</div><div class='add'>+		if (aux_msix &gt; aux_dflt_msix)</div><div class='add'>+			aux_msix = aux_dflt_msix;</div><div class='add'>+		hwr.nq = nq + aux_msix;</div><div class='add'>+	} else {</div><div class='add'>+		hwr.nq = bnge_nqs_demand(bd);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwr.tx = bd-&gt;tx_nr_rings;</div><div class='add'>+	hwr.rx = bd-&gt;rx_nr_rings;</div><div class='add'>+	if (bd-&gt;flags &amp; BNGE_EN_SHARED_CHNL)</div><div class='add'>+		sh = true;</div><div class='add'>+	hwr.cmpl = hwr.rx + hwr.tx;</div><div class='add'>+</div><div class='add'>+	hwr.vnic = bnge_get_total_vnics(bd, hwr.rx);</div><div class='add'>+</div><div class='add'>+	if (bnge_is_agg_reqd(bd))</div><div class='add'>+		hwr.rx &lt;&lt;= 1;</div><div class='add'>+	hwr.grp = bd-&gt;rx_nr_rings;</div><div class='add'>+	hwr.rss_ctx = bnge_rss_ctxs_in_use(bd, &amp;hwr);</div><div class='add'>+	hwr.stat = bnge_func_stat_ctxs_demand(bd);</div><div class='add'>+	old_rx_rings = bd-&gt;hw_resc.resv_rx_rings;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_reserve_rings(bd, &amp;hwr);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnge_copy_reserved_rings(bd, &amp;hwr);</div><div class='add'>+</div><div class='add'>+	rx_rings = hwr.rx;</div><div class='add'>+	if (bnge_is_agg_reqd(bd)) {</div><div class='add'>+		if (hwr.rx &gt;= 2)</div><div class='add'>+			rx_rings = hwr.rx &gt;&gt; 1;</div><div class='add'>+		else</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rx_rings = min_t(u16, rx_rings, hwr.grp);</div><div class='add'>+	hwr.nq = min_t(u16, hwr.nq, bd-&gt;nq_nr_rings);</div><div class='add'>+	if (hwr.stat &gt; bnge_aux_get_stat_ctxs(bd))</div><div class='add'>+		hwr.stat -= bnge_aux_get_stat_ctxs(bd);</div><div class='add'>+	hwr.nq = min_t(u16, hwr.nq, hwr.stat);</div><div class='add'>+</div><div class='add'>+	/* Adjust the rings */</div><div class='add'>+	rc = bnge_adjust_rings(bd, &amp;rx_rings, &amp;hwr.tx, hwr.nq, sh);</div><div class='add'>+	if (bnge_is_agg_reqd(bd))</div><div class='add'>+		hwr.rx = rx_rings &lt;&lt; 1;</div><div class='add'>+	tx_cp = hwr.tx;</div><div class='add'>+	hwr.nq = sh ? max_t(u16, tx_cp, rx_rings) : tx_cp + rx_rings;</div><div class='add'>+	bd-&gt;tx_nr_rings = hwr.tx;</div><div class='add'>+</div><div class='add'>+	if (rx_rings != bd-&gt;rx_nr_rings)</div><div class='add'>+		dev_warn(bd-&gt;dev, "RX rings resv reduced to %d than earlier %d requested\n",</div><div class='add'>+			 rx_rings, bd-&gt;rx_nr_rings);</div><div class='add'>+</div><div class='add'>+	bd-&gt;rx_nr_rings = rx_rings;</div><div class='add'>+	bd-&gt;nq_nr_rings = hwr.nq;</div><div class='add'>+</div><div class='add'>+	if (!bnge_rings_ok(&amp;hwr))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (old_rx_rings != bd-&gt;hw_resc.resv_rx_rings)</div><div class='add'>+		bnge_set_dflt_rss_indir_tbl(bd);</div><div class='add'>+</div><div class='add'>+	if (!bnge_aux_registered(bd)) {</div><div class='add'>+		u16 resv_msix, resv_ctx, aux_ctxs;</div><div class='add'>+		struct bnge_hw_resc *hw_resc;</div><div class='add'>+</div><div class='add'>+		hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+		resv_msix = hw_resc-&gt;resv_irqs - bd-&gt;nq_nr_rings;</div><div class='add'>+		aux_msix = min_t(u16, resv_msix, aux_msix);</div><div class='add'>+		bnge_aux_set_msix_num(bd, aux_msix);</div><div class='add'>+		resv_ctx = hw_resc-&gt;resv_stat_ctxs  - bd-&gt;nq_nr_rings;</div><div class='add'>+		aux_ctxs = min(resv_ctx, bnge_aux_get_stat_ctxs(bd));</div><div class='add'>+		bnge_aux_set_stat_ctxs(bd, aux_ctxs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_alloc_irqs(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	u16 aux_msix, tx_cp, num_entries;</div><div class='add'>+	int i, irqs_demand, rc;</div><div class='add'>+	u16 max, min = 1;</div><div class='add'>+</div><div class='add'>+	irqs_demand = bnge_nqs_demand(bd);</div><div class='add'>+	max = bnge_get_max_func_irqs(bd);</div><div class='add'>+	if (irqs_demand &gt; max)</div><div class='add'>+		irqs_demand = max;</div><div class='add'>+</div><div class='add'>+	if (!(bd-&gt;flags &amp; BNGE_EN_SHARED_CHNL))</div><div class='add'>+		min = 2;</div><div class='add'>+</div><div class='add'>+	irqs_demand = pci_alloc_irq_vectors(bd-&gt;pdev, min, irqs_demand,</div><div class='add'>+					    PCI_IRQ_MSIX);</div><div class='add'>+	aux_msix = bnge_aux_get_msix(bd);</div><div class='add'>+	if (irqs_demand &lt; 0 || irqs_demand &lt; aux_msix) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto err_free_irqs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_entries = irqs_demand;</div><div class='add'>+	if (pci_msix_can_alloc_dyn(bd-&gt;pdev))</div><div class='add'>+		num_entries = max;</div><div class='add'>+	bd-&gt;irq_tbl = kcalloc(num_entries, sizeof(*bd-&gt;irq_tbl), GFP_KERNEL);</div><div class='add'>+	if (!bd-&gt;irq_tbl) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto err_free_irqs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; irqs_demand; i++)</div><div class='add'>+		bd-&gt;irq_tbl[i].vector = pci_irq_vector(bd-&gt;pdev, i);</div><div class='add'>+</div><div class='add'>+	bd-&gt;irqs_acquired = irqs_demand;</div><div class='add'>+	/* Reduce rings based upon num of vectors allocated.</div><div class='add'>+	 * We dont need to consider NQs as they have been calculated</div><div class='add'>+	 * and must be more than irqs_demand.</div><div class='add'>+	 */</div><div class='add'>+	rc = bnge_adjust_rings(bd, &amp;bd-&gt;rx_nr_rings,</div><div class='add'>+			       &amp;bd-&gt;tx_nr_rings,</div><div class='add'>+			       irqs_demand - aux_msix, min == 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_irqs;</div><div class='add'>+</div><div class='add'>+	tx_cp = bnge_num_tx_to_cp(bd, bd-&gt;tx_nr_rings);</div><div class='add'>+	bd-&gt;nq_nr_rings = (min == 1) ?</div><div class='add'>+		max_t(u16, tx_cp, bd-&gt;rx_nr_rings) :</div><div class='add'>+		tx_cp + bd-&gt;rx_nr_rings;</div><div class='add'>+</div><div class='add'>+	/* Readjust tx_nr_rings_per_tc */</div><div class='add'>+	if (!bd-&gt;num_tc)</div><div class='add'>+		bd-&gt;tx_nr_rings_per_tc = bd-&gt;tx_nr_rings;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_irqs:</div><div class='add'>+	dev_err(bd-&gt;dev, "Failed to allocate IRQs err = %d\n", rc);</div><div class='add'>+	bnge_free_irqs(bd);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_free_irqs(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	pci_free_irq_vectors(bd-&gt;pdev);</div><div class='add'>+	kfree(bd-&gt;irq_tbl);</div><div class='add'>+	bd-&gt;irq_tbl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void _bnge_get_max_rings(struct bnge_dev *bd, u16 *max_rx,</div><div class='add'>+				u16 *max_tx, u16 *max_nq)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hw_resc *hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+	u16 max_ring_grps = 0, max_cp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	*max_tx = hw_resc-&gt;max_tx_rings;</div><div class='add'>+	*max_rx = hw_resc-&gt;max_rx_rings;</div><div class='add'>+	*max_nq = min_t(int, bnge_get_max_func_irqs(bd),</div><div class='add'>+			hw_resc-&gt;max_stat_ctxs);</div><div class='add'>+	max_ring_grps = hw_resc-&gt;max_hw_ring_grps;</div><div class='add'>+	if (bnge_is_agg_reqd(bd))</div><div class='add'>+		*max_rx &gt;&gt;= 1;</div><div class='add'>+</div><div class='add'>+	max_cp = bnge_get_max_func_cp_rings(bd);</div><div class='add'>+</div><div class='add'>+	/* Fix RX and TX rings according to number of CPs available */</div><div class='add'>+	rc = bnge_fix_rings_count(max_rx, max_tx, max_cp, false);</div><div class='add'>+	if (rc) {</div><div class='add'>+		*max_rx = 0;</div><div class='add'>+		*max_tx = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*max_rx = min_t(int, *max_rx, max_ring_grps);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_get_max_rings(struct bnge_dev *bd, u16 *max_rx,</div><div class='add'>+			      u16 *max_tx, bool shared)</div><div class='add'>+{</div><div class='add'>+	u16 rx, tx, nq;</div><div class='add'>+</div><div class='add'>+	_bnge_get_max_rings(bd, &amp;rx, &amp;tx, &amp;nq);</div><div class='add'>+	*max_rx = rx;</div><div class='add'>+	*max_tx = tx;</div><div class='add'>+	if (!rx || !tx || !nq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return bnge_fix_rings_count(max_rx, max_tx, nq, shared);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_get_dflt_rings(struct bnge_dev *bd, u16 *max_rx, u16 *max_tx,</div><div class='add'>+			       bool shared)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_get_max_rings(bd, max_rx, max_tx, shared);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_info(bd-&gt;dev, "Not enough rings available\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bnge_is_roce_en(bd)) {</div><div class='add'>+		int max_cp, max_stat, max_irq;</div><div class='add'>+</div><div class='add'>+		/* Reserve minimum resources for RoCE */</div><div class='add'>+		max_cp = bnge_get_max_func_cp_rings(bd);</div><div class='add'>+		max_stat = bnge_get_max_func_stat_ctxs(bd);</div><div class='add'>+		max_irq = bnge_get_max_func_irqs(bd);</div><div class='add'>+		if (max_cp &lt;= BNGE_MIN_ROCE_CP_RINGS ||</div><div class='add'>+		    max_irq &lt;= BNGE_MIN_ROCE_CP_RINGS ||</div><div class='add'>+		    max_stat &lt;= BNGE_MIN_ROCE_STAT_CTXS)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		max_cp -= BNGE_MIN_ROCE_CP_RINGS;</div><div class='add'>+		max_irq -= BNGE_MIN_ROCE_CP_RINGS;</div><div class='add'>+		max_stat -= BNGE_MIN_ROCE_STAT_CTXS;</div><div class='add'>+		max_cp = min_t(u16, max_cp, max_irq);</div><div class='add'>+		max_cp = min_t(u16, max_cp, max_stat);</div><div class='add'>+		rc = bnge_adjust_rings(bd, max_rx, max_tx, max_cp, shared);</div><div class='add'>+		if (rc)</div><div class='add'>+			rc = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* In initial default shared ring setting, each shared ring must have a</div><div class='add'>+ * RX/TX ring pair.</div><div class='add'>+ */</div><div class='add'>+static void bnge_trim_dflt_sh_rings(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;nq_nr_rings = min_t(u16, bd-&gt;tx_nr_rings_per_tc, bd-&gt;rx_nr_rings);</div><div class='add'>+	bd-&gt;rx_nr_rings = bd-&gt;nq_nr_rings;</div><div class='add'>+	bd-&gt;tx_nr_rings_per_tc = bd-&gt;nq_nr_rings;</div><div class='add'>+	bd-&gt;tx_nr_rings = bd-&gt;tx_nr_rings_per_tc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_net_init_dflt_rings(struct bnge_dev *bd, bool sh)</div><div class='add'>+{</div><div class='add'>+	u16 dflt_rings, max_rx_rings, max_tx_rings;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (sh)</div><div class='add'>+		bd-&gt;flags |= BNGE_EN_SHARED_CHNL;</div><div class='add'>+</div><div class='add'>+	dflt_rings = netif_get_num_default_rss_queues();</div><div class='add'>+</div><div class='add'>+	rc = bnge_get_dflt_rings(bd, &amp;max_rx_rings, &amp;max_tx_rings, sh);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	bd-&gt;rx_nr_rings = min_t(u16, dflt_rings, max_rx_rings);</div><div class='add'>+	bd-&gt;tx_nr_rings_per_tc = min_t(u16, dflt_rings, max_tx_rings);</div><div class='add'>+	if (sh)</div><div class='add'>+		bnge_trim_dflt_sh_rings(bd);</div><div class='add'>+	else</div><div class='add'>+		bd-&gt;nq_nr_rings = bd-&gt;tx_nr_rings_per_tc + bd-&gt;rx_nr_rings;</div><div class='add'>+	bd-&gt;tx_nr_rings = bd-&gt;tx_nr_rings_per_tc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_reserve_rings(bd);</div><div class='add'>+	if (rc &amp;&amp; rc != -ENODEV)</div><div class='add'>+		dev_warn(bd-&gt;dev, "Unable to reserve tx rings\n");</div><div class='add'>+	bd-&gt;tx_nr_rings_per_tc = bd-&gt;tx_nr_rings;</div><div class='add'>+	if (sh)</div><div class='add'>+		bnge_trim_dflt_sh_rings(bd);</div><div class='add'>+</div><div class='add'>+	/* Rings may have been reduced, re-reserve them again */</div><div class='add'>+	if (bnge_need_reserve_rings(bd)) {</div><div class='add'>+		rc = bnge_reserve_rings(bd);</div><div class='add'>+		if (rc &amp;&amp; rc != -ENODEV)</div><div class='add'>+			dev_warn(bd-&gt;dev, "Fewer rings reservation failed\n");</div><div class='add'>+		bd-&gt;tx_nr_rings_per_tc = bd-&gt;tx_nr_rings;</div><div class='add'>+	}</div><div class='add'>+	if (rc) {</div><div class='add'>+		bd-&gt;tx_nr_rings = 0;</div><div class='add'>+		bd-&gt;rx_nr_rings = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_rss_indir_tbl(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	u16 entries;</div><div class='add'>+</div><div class='add'>+	entries = BNGE_MAX_RSS_TABLE_ENTRIES;</div><div class='add'>+</div><div class='add'>+	bd-&gt;rss_indir_tbl_entries = entries;</div><div class='add'>+	bd-&gt;rss_indir_tbl =</div><div class='add'>+		kmalloc_array(entries, sizeof(*bd-&gt;rss_indir_tbl), GFP_KERNEL);</div><div class='add'>+	if (!bd-&gt;rss_indir_tbl)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_net_init_dflt_config(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_hw_resc *hw_resc;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_alloc_rss_indir_tbl(bd);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_net_init_dflt_rings(bd, true);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_tbl;</div><div class='add'>+</div><div class='add'>+	hw_resc = &amp;bd-&gt;hw_resc;</div><div class='add'>+	bd-&gt;max_fltr = hw_resc-&gt;max_rx_em_flows + hw_resc-&gt;max_rx_wm_flows +</div><div class='add'>+		       BNGE_L2_FLTR_MAX_FLTR;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_tbl:</div><div class='add'>+	kfree(bd-&gt;rss_indir_tbl);</div><div class='add'>+	bd-&gt;rss_indir_tbl = NULL;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_net_uninit_dflt_config(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	kfree(bd-&gt;rss_indir_tbl);</div><div class='add'>+	bd-&gt;rss_indir_tbl = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_aux_init_dflt_config(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	bd-&gt;aux_num_msix = bnge_aux_get_dflt_msix(bd);</div><div class='add'>+	bd-&gt;aux_num_stat_ctxs = bnge_get_dflt_aux_stat_ctxs(bd);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_resc.h b/drivers/net/ethernet/broadcom/bnge/bnge_resc.h<br/>new file mode 100644<br/>index 000000000000..b62a634669f6<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_resc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_resc.h</a></div><div class='hunk'>@@ -0,0 +1,97 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_RESC_H_</div><div class='add'>+#define _BNGE_RESC_H_</div><div class='add'>+</div><div class='add'>+#include "bnge_netdev.h"</div><div class='add'>+#include "bnge_rmem.h"</div><div class='add'>+</div><div class='add'>+struct bnge_hw_resc {</div><div class='add'>+	u16	min_rsscos_ctxs;</div><div class='add'>+	u16	max_rsscos_ctxs;</div><div class='add'>+	u16	resv_rsscos_ctxs;</div><div class='add'>+	u16	min_cp_rings;</div><div class='add'>+	u16	max_cp_rings;</div><div class='add'>+	u16	resv_cp_rings;</div><div class='add'>+	u16	min_tx_rings;</div><div class='add'>+	u16	max_tx_rings;</div><div class='add'>+	u16	resv_tx_rings;</div><div class='add'>+	u16	max_tx_sch_inputs;</div><div class='add'>+	u16	min_rx_rings;</div><div class='add'>+	u16	max_rx_rings;</div><div class='add'>+	u16	resv_rx_rings;</div><div class='add'>+	u16	min_hw_ring_grps;</div><div class='add'>+	u16	max_hw_ring_grps;</div><div class='add'>+	u16	resv_hw_ring_grps;</div><div class='add'>+	u16	min_l2_ctxs;</div><div class='add'>+	u16	max_l2_ctxs;</div><div class='add'>+	u16	min_vnics;</div><div class='add'>+	u16	max_vnics;</div><div class='add'>+	u16	resv_vnics;</div><div class='add'>+	u16	min_stat_ctxs;</div><div class='add'>+	u16	max_stat_ctxs;</div><div class='add'>+	u16	resv_stat_ctxs;</div><div class='add'>+	u16	max_nqs;</div><div class='add'>+	u16	max_irqs;</div><div class='add'>+	u16	resv_irqs;</div><div class='add'>+	u32	max_encap_records;</div><div class='add'>+	u32	max_decap_records;</div><div class='add'>+	u32	max_tx_em_flows;</div><div class='add'>+	u32	max_tx_wm_flows;</div><div class='add'>+	u32	max_rx_em_flows;</div><div class='add'>+	u32	max_rx_wm_flows;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_hw_rings {</div><div class='add'>+	u16 tx;</div><div class='add'>+	u16 rx;</div><div class='add'>+	u16 grp;</div><div class='add'>+	u16 nq;</div><div class='add'>+	u16 cmpl;</div><div class='add'>+	u16 stat;</div><div class='add'>+	u16 vnic;</div><div class='add'>+	u16 rss_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* "TXRX", 2 hypens, plus maximum integer */</div><div class='add'>+#define BNGE_IRQ_NAME_EXTRA	17</div><div class='add'>+struct bnge_irq {</div><div class='add'>+	irq_handler_t	handler;</div><div class='add'>+	unsigned int	vector;</div><div class='add'>+	u8		requested:1;</div><div class='add'>+	u8		have_cpumask:1;</div><div class='add'>+	char		name[IFNAMSIZ + BNGE_IRQ_NAME_EXTRA];</div><div class='add'>+	cpumask_var_t	cpu_mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int bnge_reserve_rings(struct bnge_dev *bd);</div><div class='add'>+int bnge_fix_rings_count(u16 *rx, u16 *tx, u16 max, bool shared);</div><div class='add'>+int bnge_alloc_irqs(struct bnge_dev *bd);</div><div class='add'>+void bnge_free_irqs(struct bnge_dev *bd);</div><div class='add'>+int bnge_net_init_dflt_config(struct bnge_dev *bd);</div><div class='add'>+void bnge_net_uninit_dflt_config(struct bnge_dev *bd);</div><div class='add'>+void bnge_aux_init_dflt_config(struct bnge_dev *bd);</div><div class='add'>+u32 bnge_get_rxfh_indir_size(struct bnge_dev *bd);</div><div class='add'>+int bnge_cal_nr_rss_ctxs(u16 rx_rings);</div><div class='add'>+bool bnge_aux_has_enough_resources(struct bnge_dev *bd);</div><div class='add'>+</div><div class='add'>+static inline u32</div><div class='add'>+bnge_adjust_pow_two(u32 total_ent, u16 ent_per_blk)</div><div class='add'>+{</div><div class='add'>+	u32 blks = total_ent / ent_per_blk;</div><div class='add'>+</div><div class='add'>+	if (blks == 0 || blks == 1)</div><div class='add'>+		return ++blks;</div><div class='add'>+</div><div class='add'>+	if (!is_power_of_2(blks))</div><div class='add'>+		blks = roundup_pow_of_two(blks);</div><div class='add'>+</div><div class='add'>+	return blks;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNGE_MAX_ROCE_MSIX		64</div><div class='add'>+#define BNGE_MIN_ROCE_CP_RINGS		2</div><div class='add'>+#define BNGE_MIN_ROCE_STAT_CTXS		1</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_RESC_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c<br/>new file mode 100644<br/>index 000000000000..79f5ce2e5d08<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_rmem.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_rmem.c</a></div><div class='hunk'>@@ -0,0 +1,499 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+// Copyright (c) 2025 Broadcom.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/mm.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='add'>+#include &lt;linux/crash_dump.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnge.h"</div><div class='add'>+#include "bnge_hwrm_lib.h"</div><div class='add'>+#include "bnge_rmem.h"</div><div class='add'>+</div><div class='add'>+static void bnge_init_ctx_mem(struct bnge_ctx_mem_type *ctxm,</div><div class='add'>+			      void *p, int len)</div><div class='add'>+{</div><div class='add'>+	u8 init_val = ctxm-&gt;init_value;</div><div class='add'>+	u16 offset = ctxm-&gt;init_offset;</div><div class='add'>+	u8 *p2 = p;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!init_val)</div><div class='add'>+		return;</div><div class='add'>+	if (offset == BNGE_CTX_INIT_INVALID_OFFSET) {</div><div class='add'>+		memset(p, init_val, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; len; i += ctxm-&gt;entry_size)</div><div class='add'>+		*(p2 + i + offset) = init_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_free_ring(struct bnge_dev *bd, struct bnge_ring_mem_info *rmem)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bd-&gt;pdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!rmem-&gt;pg_arr)</div><div class='add'>+		goto skip_pages;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='add'>+		if (!rmem-&gt;pg_arr[i])</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, rmem-&gt;page_size,</div><div class='add'>+				  rmem-&gt;pg_arr[i], rmem-&gt;dma_arr[i]);</div><div class='add'>+</div><div class='add'>+		rmem-&gt;pg_arr[i] = NULL;</div><div class='add'>+	}</div><div class='add'>+skip_pages:</div><div class='add'>+	if (rmem-&gt;pg_tbl) {</div><div class='add'>+		size_t pg_tbl_size = rmem-&gt;nr_pages * 8;</div><div class='add'>+</div><div class='add'>+		if (rmem-&gt;flags &amp; BNGE_RMEM_USE_FULL_PAGE_FLAG)</div><div class='add'>+			pg_tbl_size = rmem-&gt;page_size;</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, pg_tbl_size,</div><div class='add'>+				  rmem-&gt;pg_tbl, rmem-&gt;dma_pg_tbl);</div><div class='add'>+		rmem-&gt;pg_tbl = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (rmem-&gt;vmem_size &amp;&amp; *rmem-&gt;vmem) {</div><div class='add'>+		vfree(*rmem-&gt;vmem);</div><div class='add'>+		*rmem-&gt;vmem = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnge_alloc_ring(struct bnge_dev *bd, struct bnge_ring_mem_info *rmem)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bd-&gt;pdev;</div><div class='add'>+	u64 valid_bit = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (rmem-&gt;flags &amp; (BNGE_RMEM_VALID_PTE_FLAG | BNGE_RMEM_RING_PTE_FLAG))</div><div class='add'>+		valid_bit = PTU_PTE_VALID;</div><div class='add'>+</div><div class='add'>+	if ((rmem-&gt;nr_pages &gt; 1 || rmem-&gt;depth &gt; 0) &amp;&amp; !rmem-&gt;pg_tbl) {</div><div class='add'>+		size_t pg_tbl_size = rmem-&gt;nr_pages * 8;</div><div class='add'>+</div><div class='add'>+		if (rmem-&gt;flags &amp; BNGE_RMEM_USE_FULL_PAGE_FLAG)</div><div class='add'>+			pg_tbl_size = rmem-&gt;page_size;</div><div class='add'>+		rmem-&gt;pg_tbl = dma_alloc_coherent(&amp;pdev-&gt;dev, pg_tbl_size,</div><div class='add'>+						  &amp;rmem-&gt;dma_pg_tbl,</div><div class='add'>+						  GFP_KERNEL);</div><div class='add'>+		if (!rmem-&gt;pg_tbl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='add'>+		u64 extra_bits = valid_bit;</div><div class='add'>+</div><div class='add'>+		rmem-&gt;pg_arr[i] = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+						     rmem-&gt;page_size,</div><div class='add'>+						     &amp;rmem-&gt;dma_arr[i],</div><div class='add'>+						     GFP_KERNEL);</div><div class='add'>+		if (!rmem-&gt;pg_arr[i])</div><div class='add'>+			goto err_free_ring;</div><div class='add'>+</div><div class='add'>+		if (rmem-&gt;ctx_mem)</div><div class='add'>+			bnge_init_ctx_mem(rmem-&gt;ctx_mem, rmem-&gt;pg_arr[i],</div><div class='add'>+					  rmem-&gt;page_size);</div><div class='add'>+</div><div class='add'>+		if (rmem-&gt;nr_pages &gt; 1 || rmem-&gt;depth &gt; 0) {</div><div class='add'>+			if (i == rmem-&gt;nr_pages - 2 &amp;&amp;</div><div class='add'>+			    (rmem-&gt;flags &amp; BNGE_RMEM_RING_PTE_FLAG))</div><div class='add'>+				extra_bits |= PTU_PTE_NEXT_TO_LAST;</div><div class='add'>+			else if (i == rmem-&gt;nr_pages - 1 &amp;&amp;</div><div class='add'>+				 (rmem-&gt;flags &amp; BNGE_RMEM_RING_PTE_FLAG))</div><div class='add'>+				extra_bits |= PTU_PTE_LAST;</div><div class='add'>+			rmem-&gt;pg_tbl[i] =</div><div class='add'>+				cpu_to_le64(rmem-&gt;dma_arr[i] | extra_bits);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rmem-&gt;vmem_size) {</div><div class='add'>+		*rmem-&gt;vmem = vzalloc(rmem-&gt;vmem_size);</div><div class='add'>+		if (!(*rmem-&gt;vmem))</div><div class='add'>+			goto err_free_ring;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_ring:</div><div class='add'>+	bnge_free_ring(bd, rmem);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_ctx_one_lvl(struct bnge_dev *bd,</div><div class='add'>+				  struct bnge_ctx_pg_info *ctx_pg)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_mem_info *rmem = &amp;ctx_pg-&gt;ring_mem;</div><div class='add'>+</div><div class='add'>+	rmem-&gt;page_size = BNGE_PAGE_SIZE;</div><div class='add'>+	rmem-&gt;pg_arr = ctx_pg-&gt;ctx_pg_arr;</div><div class='add'>+	rmem-&gt;dma_arr = ctx_pg-&gt;ctx_dma_arr;</div><div class='add'>+	rmem-&gt;flags = BNGE_RMEM_VALID_PTE_FLAG;</div><div class='add'>+	if (rmem-&gt;depth &gt;= 1)</div><div class='add'>+		rmem-&gt;flags |= BNGE_RMEM_USE_FULL_PAGE_FLAG;</div><div class='add'>+	return bnge_alloc_ring(bd, rmem);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_alloc_ctx_pg_tbls(struct bnge_dev *bd,</div><div class='add'>+				  struct bnge_ctx_pg_info *ctx_pg, u32 mem_size,</div><div class='add'>+				  u8 depth, struct bnge_ctx_mem_type *ctxm)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_mem_info *rmem = &amp;ctx_pg-&gt;ring_mem;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!mem_size)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ctx_pg-&gt;nr_pages = DIV_ROUND_UP(mem_size, BNGE_PAGE_SIZE);</div><div class='add'>+	if (ctx_pg-&gt;nr_pages &gt; MAX_CTX_TOTAL_PAGES) {</div><div class='add'>+		ctx_pg-&gt;nr_pages = 0;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (ctx_pg-&gt;nr_pages &gt; MAX_CTX_PAGES || depth &gt; 1) {</div><div class='add'>+		int nr_tbls, i;</div><div class='add'>+</div><div class='add'>+		rmem-&gt;depth = 2;</div><div class='add'>+		ctx_pg-&gt;ctx_pg_tbl = kcalloc(MAX_CTX_PAGES, sizeof(ctx_pg),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+		if (!ctx_pg-&gt;ctx_pg_tbl)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		nr_tbls = DIV_ROUND_UP(ctx_pg-&gt;nr_pages, MAX_CTX_PAGES);</div><div class='add'>+		rmem-&gt;nr_pages = nr_tbls;</div><div class='add'>+		rc = bnge_alloc_ctx_one_lvl(bd, ctx_pg);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		for (i = 0; i &lt; nr_tbls; i++) {</div><div class='add'>+			struct bnge_ctx_pg_info *pg_tbl;</div><div class='add'>+</div><div class='add'>+			pg_tbl = kzalloc(sizeof(*pg_tbl), GFP_KERNEL);</div><div class='add'>+			if (!pg_tbl)</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+			ctx_pg-&gt;ctx_pg_tbl[i] = pg_tbl;</div><div class='add'>+			rmem = &amp;pg_tbl-&gt;ring_mem;</div><div class='add'>+			rmem-&gt;pg_tbl = ctx_pg-&gt;ctx_pg_arr[i];</div><div class='add'>+			rmem-&gt;dma_pg_tbl = ctx_pg-&gt;ctx_dma_arr[i];</div><div class='add'>+			rmem-&gt;depth = 1;</div><div class='add'>+			rmem-&gt;nr_pages = MAX_CTX_PAGES;</div><div class='add'>+			rmem-&gt;ctx_mem = ctxm;</div><div class='add'>+			if (i == (nr_tbls - 1)) {</div><div class='add'>+				int rem = ctx_pg-&gt;nr_pages % MAX_CTX_PAGES;</div><div class='add'>+</div><div class='add'>+				if (rem)</div><div class='add'>+					rmem-&gt;nr_pages = rem;</div><div class='add'>+			}</div><div class='add'>+			rc = bnge_alloc_ctx_one_lvl(bd, pg_tbl);</div><div class='add'>+			if (rc)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		rmem-&gt;nr_pages = DIV_ROUND_UP(mem_size, BNGE_PAGE_SIZE);</div><div class='add'>+		if (rmem-&gt;nr_pages &gt; 1 || depth)</div><div class='add'>+			rmem-&gt;depth = 1;</div><div class='add'>+		rmem-&gt;ctx_mem = ctxm;</div><div class='add'>+		rc = bnge_alloc_ctx_one_lvl(bd, ctx_pg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnge_free_ctx_pg_tbls(struct bnge_dev *bd,</div><div class='add'>+				  struct bnge_ctx_pg_info *ctx_pg)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ring_mem_info *rmem = &amp;ctx_pg-&gt;ring_mem;</div><div class='add'>+</div><div class='add'>+	if (rmem-&gt;depth &gt; 1 || ctx_pg-&gt;nr_pages &gt; MAX_CTX_PAGES ||</div><div class='add'>+	    ctx_pg-&gt;ctx_pg_tbl) {</div><div class='add'>+		int i, nr_tbls = rmem-&gt;nr_pages;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; nr_tbls; i++) {</div><div class='add'>+			struct bnge_ctx_pg_info *pg_tbl;</div><div class='add'>+			struct bnge_ring_mem_info *rmem2;</div><div class='add'>+</div><div class='add'>+			pg_tbl = ctx_pg-&gt;ctx_pg_tbl[i];</div><div class='add'>+			if (!pg_tbl)</div><div class='add'>+				continue;</div><div class='add'>+			rmem2 = &amp;pg_tbl-&gt;ring_mem;</div><div class='add'>+			bnge_free_ring(bd, rmem2);</div><div class='add'>+			ctx_pg-&gt;ctx_pg_arr[i] = NULL;</div><div class='add'>+			kfree(pg_tbl);</div><div class='add'>+			ctx_pg-&gt;ctx_pg_tbl[i] = NULL;</div><div class='add'>+		}</div><div class='add'>+		kfree(ctx_pg-&gt;ctx_pg_tbl);</div><div class='add'>+		ctx_pg-&gt;ctx_pg_tbl = NULL;</div><div class='add'>+	}</div><div class='add'>+	bnge_free_ring(bd, rmem);</div><div class='add'>+	ctx_pg-&gt;nr_pages = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_setup_ctxm_pg_tbls(struct bnge_dev *bd,</div><div class='add'>+				   struct bnge_ctx_mem_type *ctxm, u32 entries,</div><div class='add'>+				   u8 pg_lvl)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ctx_pg_info *ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+	int i, rc = 0, n = 1;</div><div class='add'>+	u32 mem_size;</div><div class='add'>+</div><div class='add'>+	if (!ctxm-&gt;entry_size || !ctx_pg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (ctxm-&gt;instance_bmap)</div><div class='add'>+		n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+	if (ctxm-&gt;entry_multiple)</div><div class='add'>+		entries = roundup(entries, ctxm-&gt;entry_multiple);</div><div class='add'>+	entries = clamp_t(u32, entries, ctxm-&gt;min_entries, ctxm-&gt;max_entries);</div><div class='add'>+	mem_size = entries * ctxm-&gt;entry_size;</div><div class='add'>+	for (i = 0; i &lt; n &amp;&amp; !rc; i++) {</div><div class='add'>+		ctx_pg[i].entries = entries;</div><div class='add'>+		rc = bnge_alloc_ctx_pg_tbls(bd, &amp;ctx_pg[i], mem_size, pg_lvl,</div><div class='add'>+					    ctxm-&gt;init_value ? ctxm : NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnge_backing_store_cfg(struct bnge_dev *bd, u32 ena)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ctx_mem_info *ctx = bd-&gt;ctx;</div><div class='add'>+	struct bnge_ctx_mem_type *ctxm;</div><div class='add'>+	u16 last_type;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='add'>+	if (!ena)</div><div class='add'>+		return 0;</div><div class='add'>+	else if (ena &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM)</div><div class='add'>+		last_type = BNGE_CTX_MAX - 1;</div><div class='add'>+	else</div><div class='add'>+		last_type = BNGE_CTX_L2_MAX - 1;</div><div class='add'>+	ctx-&gt;ctx_arr[last_type].last = 1;</div><div class='add'>+</div><div class='add'>+	for (type = 0 ; type &lt; BNGE_CTX_V2_MAX; type++) {</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+</div><div class='add'>+		rc = bnge_hwrm_func_backing_store(bd, ctxm, ctxm-&gt;last);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_free_ctx_mem(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ctx_mem_info *ctx = bd-&gt;ctx;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (type = 0; type &lt; BNGE_CTX_V2_MAX; type++) {</div><div class='add'>+		struct bnge_ctx_mem_type *ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		struct bnge_ctx_pg_info *ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		int i, n = 1;</div><div class='add'>+</div><div class='add'>+		if (!ctx_pg)</div><div class='add'>+			continue;</div><div class='add'>+		if (ctxm-&gt;instance_bmap)</div><div class='add'>+			n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+		for (i = 0; i &lt; n; i++)</div><div class='add'>+			bnge_free_ctx_pg_tbls(bd, &amp;ctx_pg[i]);</div><div class='add'>+</div><div class='add'>+		kfree(ctx_pg);</div><div class='add'>+		ctxm-&gt;pg_info = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;flags &amp;= ~BNGE_CTX_FLAG_INITED;</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	bd-&gt;ctx = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define FUNC_BACKING_STORE_CFG_REQ_DFLT_ENABLES			\</div><div class='add'>+	(FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP |		\</div><div class='add'>+	 FUNC_BACKING_STORE_CFG_REQ_ENABLES_SRQ |		\</div><div class='add'>+	 FUNC_BACKING_STORE_CFG_REQ_ENABLES_CQ |		\</div><div class='add'>+	 FUNC_BACKING_STORE_CFG_REQ_ENABLES_VNIC |		\</div><div class='add'>+	 FUNC_BACKING_STORE_CFG_REQ_ENABLES_STAT)</div><div class='add'>+</div><div class='add'>+int bnge_alloc_ctx_mem(struct bnge_dev *bd)</div><div class='add'>+{</div><div class='add'>+	struct bnge_ctx_mem_type *ctxm;</div><div class='add'>+	struct bnge_ctx_mem_info *ctx;</div><div class='add'>+	u32 l2_qps, qp1_qps, max_qps;</div><div class='add'>+	u32 ena, entries_sp, entries;</div><div class='add'>+	u32 srqs, max_srqs, min;</div><div class='add'>+	u32 num_mr, num_ah;</div><div class='add'>+	u32 extra_srqs = 0;</div><div class='add'>+	u32 extra_qps = 0;</div><div class='add'>+	u32 fast_qpmd_qps;</div><div class='add'>+	u8 pg_lvl = 1;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	rc = bnge_hwrm_func_backing_store_qcaps(bd);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Failed querying ctx mem caps, rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx = bd-&gt;ctx;</div><div class='add'>+	if (!ctx || (ctx-&gt;flags &amp; BNGE_CTX_FLAG_INITED))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_QP];</div><div class='add'>+	l2_qps = ctxm-&gt;qp_l2_entries;</div><div class='add'>+	qp1_qps = ctxm-&gt;qp_qp1_entries;</div><div class='add'>+	fast_qpmd_qps = ctxm-&gt;qp_fast_qpmd_entries;</div><div class='add'>+	max_qps = ctxm-&gt;max_entries;</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_SRQ];</div><div class='add'>+	srqs = ctxm-&gt;srq_l2_entries;</div><div class='add'>+	max_srqs = ctxm-&gt;max_entries;</div><div class='add'>+	ena = 0;</div><div class='add'>+	if (bnge_is_roce_en(bd) &amp;&amp; !is_kdump_kernel()) {</div><div class='add'>+		pg_lvl = 2;</div><div class='add'>+		extra_qps = min_t(u32, 65536, max_qps - l2_qps - qp1_qps);</div><div class='add'>+		/* allocate extra qps if fast qp destroy feature enabled */</div><div class='add'>+		extra_qps += fast_qpmd_qps;</div><div class='add'>+		extra_srqs = min_t(u32, 8192, max_srqs - srqs);</div><div class='add'>+		if (fast_qpmd_qps)</div><div class='add'>+			ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP_FAST_QPMD;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_QP];</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, l2_qps + qp1_qps + extra_qps,</div><div class='add'>+				     pg_lvl);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_SRQ];</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, srqs + extra_srqs, pg_lvl);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_CQ];</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, ctxm-&gt;cq_l2_entries +</div><div class='add'>+				     extra_qps * 2, pg_lvl);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_VNIC];</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, ctxm-&gt;max_entries, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_STAT];</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, ctxm-&gt;max_entries, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (!bnge_is_roce_en(bd))</div><div class='add'>+		goto skip_rdma;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_MRAV];</div><div class='add'>+	/* 128K extra is needed to accommodate static AH context</div><div class='add'>+	 * allocation by f/w.</div><div class='add'>+	 */</div><div class='add'>+	num_mr = min_t(u32, ctxm-&gt;max_entries / 2, 1024 * 256);</div><div class='add'>+	num_ah = min_t(u32, num_mr, 1024 * 128);</div><div class='add'>+	ctxm-&gt;split_entry_cnt = BNGE_CTX_MRAV_AV_SPLIT_ENTRY + 1;</div><div class='add'>+	if (!ctxm-&gt;mrav_av_entries || ctxm-&gt;mrav_av_entries &gt; num_ah)</div><div class='add'>+		ctxm-&gt;mrav_av_entries = num_ah;</div><div class='add'>+</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, num_mr + num_ah, 2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_TIM];</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, l2_qps + qp1_qps + extra_qps, 1);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM;</div><div class='add'>+</div><div class='add'>+skip_rdma:</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_STQM];</div><div class='add'>+	min = ctxm-&gt;min_entries;</div><div class='add'>+	entries_sp = ctx-&gt;ctx_arr[BNGE_CTX_VNIC].vnic_entries + l2_qps +</div><div class='add'>+		     2 * (extra_qps + qp1_qps) + min;</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, entries_sp, 2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNGE_CTX_FTQM];</div><div class='add'>+	entries = l2_qps + 2 * (extra_qps + qp1_qps);</div><div class='add'>+	rc = bnge_setup_ctxm_pg_tbls(bd, ctxm, entries, 2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;tqm_fp_rings_count + 1; i++)</div><div class='add'>+		ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP &lt;&lt; i;</div><div class='add'>+	ena |= FUNC_BACKING_STORE_CFG_REQ_DFLT_ENABLES;</div><div class='add'>+</div><div class='add'>+	rc = bnge_backing_store_cfg(bd, ena);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(bd-&gt;dev, "Failed configuring ctx mem, rc: %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;flags |= BNGE_CTX_FLAG_INITED;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnge_init_ring_struct(struct bnge_net *bn)</div><div class='add'>+{</div><div class='add'>+	struct bnge_dev *bd = bn-&gt;bd;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bd-&gt;nq_nr_rings; i++) {</div><div class='add'>+		struct bnge_napi *bnapi = bn-&gt;bnapi[i];</div><div class='add'>+		struct bnge_ring_mem_info *rmem;</div><div class='add'>+		struct bnge_nq_ring_info *nqr;</div><div class='add'>+		struct bnge_rx_ring_info *rxr;</div><div class='add'>+		struct bnge_tx_ring_info *txr;</div><div class='add'>+		struct bnge_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+		nqr = &amp;bnapi-&gt;nq_ring;</div><div class='add'>+		ring = &amp;nqr-&gt;ring_struct;</div><div class='add'>+		rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+		rmem-&gt;nr_pages = bn-&gt;cp_nr_pages;</div><div class='add'>+		rmem-&gt;page_size = HW_CMPD_RING_SIZE;</div><div class='add'>+		rmem-&gt;pg_arr = (void **)nqr-&gt;desc_ring;</div><div class='add'>+		rmem-&gt;dma_arr = nqr-&gt;desc_mapping;</div><div class='add'>+		rmem-&gt;vmem_size = 0;</div><div class='add'>+</div><div class='add'>+		rxr = bnapi-&gt;rx_ring;</div><div class='add'>+		if (!rxr)</div><div class='add'>+			goto skip_rx;</div><div class='add'>+</div><div class='add'>+		ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+		rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+		rmem-&gt;nr_pages = bn-&gt;rx_nr_pages;</div><div class='add'>+		rmem-&gt;page_size = HW_RXBD_RING_SIZE;</div><div class='add'>+		rmem-&gt;pg_arr = (void **)rxr-&gt;rx_desc_ring;</div><div class='add'>+		rmem-&gt;dma_arr = rxr-&gt;rx_desc_mapping;</div><div class='add'>+		rmem-&gt;vmem_size = SW_RXBD_RING_SIZE * bn-&gt;rx_nr_pages;</div><div class='add'>+		rmem-&gt;vmem = (void **)&amp;rxr-&gt;rx_buf_ring;</div><div class='add'>+</div><div class='add'>+		ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+		rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+		rmem-&gt;nr_pages = bn-&gt;rx_agg_nr_pages;</div><div class='add'>+		rmem-&gt;page_size = HW_RXBD_RING_SIZE;</div><div class='add'>+		rmem-&gt;pg_arr = (void **)rxr-&gt;rx_agg_desc_ring;</div><div class='add'>+		rmem-&gt;dma_arr = rxr-&gt;rx_agg_desc_mapping;</div><div class='add'>+		rmem-&gt;vmem_size = SW_RXBD_AGG_RING_SIZE * bn-&gt;rx_agg_nr_pages;</div><div class='add'>+		rmem-&gt;vmem = (void **)&amp;rxr-&gt;rx_agg_buf_ring;</div><div class='add'>+</div><div class='add'>+skip_rx:</div><div class='add'>+		bnge_for_each_napi_tx(j, bnapi, txr) {</div><div class='add'>+			ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+			rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+			rmem-&gt;nr_pages = bn-&gt;tx_nr_pages;</div><div class='add'>+			rmem-&gt;page_size = HW_TXBD_RING_SIZE;</div><div class='add'>+			rmem-&gt;pg_arr = (void **)txr-&gt;tx_desc_ring;</div><div class='add'>+			rmem-&gt;dma_arr = txr-&gt;tx_desc_mapping;</div><div class='add'>+			rmem-&gt;vmem_size = SW_TXBD_RING_SIZE * bn-&gt;tx_nr_pages;</div><div class='add'>+			rmem-&gt;vmem = (void **)&amp;txr-&gt;tx_buf_ring;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h b/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h<br/>new file mode 100644<br/>index 000000000000..341c7f81ed09<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnge/bnge_rmem.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnge/bnge_rmem.h</a></div><div class='hunk'>@@ -0,0 +1,202 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (c) 2025 Broadcom */</div><div class='add'>+</div><div class='add'>+#ifndef _BNGE_RMEM_H_</div><div class='add'>+#define _BNGE_RMEM_H_</div><div class='add'>+</div><div class='add'>+struct bnge_ctx_mem_type;</div><div class='add'>+struct bnge_dev;</div><div class='add'>+struct bnge_net;</div><div class='add'>+</div><div class='add'>+#define PTU_PTE_VALID             0x1UL</div><div class='add'>+#define PTU_PTE_LAST              0x2UL</div><div class='add'>+#define PTU_PTE_NEXT_TO_LAST      0x4UL</div><div class='add'>+</div><div class='add'>+struct bnge_ring_mem_info {</div><div class='add'>+	/* Number of pages to next level */</div><div class='add'>+	int			nr_pages;</div><div class='add'>+	int			page_size;</div><div class='add'>+	u16			flags;</div><div class='add'>+#define BNGE_RMEM_VALID_PTE_FLAG	1</div><div class='add'>+#define BNGE_RMEM_RING_PTE_FLAG		2</div><div class='add'>+#define BNGE_RMEM_USE_FULL_PAGE_FLAG	4</div><div class='add'>+</div><div class='add'>+	u16			depth;</div><div class='add'>+</div><div class='add'>+	void			**pg_arr;</div><div class='add'>+	dma_addr_t		*dma_arr;</div><div class='add'>+</div><div class='add'>+	__le64			*pg_tbl;</div><div class='add'>+	dma_addr_t		dma_pg_tbl;</div><div class='add'>+</div><div class='add'>+	int			vmem_size;</div><div class='add'>+	void			**vmem;</div><div class='add'>+</div><div class='add'>+	struct bnge_ctx_mem_type	*ctx_mem;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The hardware supports certain page sizes.</div><div class='add'>+ * Use the supported page sizes to allocate the rings.</div><div class='add'>+ */</div><div class='add'>+#if (PAGE_SHIFT &lt; 12)</div><div class='add'>+#define BNGE_PAGE_SHIFT	12</div><div class='add'>+#elif (PAGE_SHIFT &lt;= 13)</div><div class='add'>+#define BNGE_PAGE_SHIFT	PAGE_SHIFT</div><div class='add'>+#elif (PAGE_SHIFT &lt; 16)</div><div class='add'>+#define BNGE_PAGE_SHIFT	13</div><div class='add'>+#else</div><div class='add'>+#define BNGE_PAGE_SHIFT	16</div><div class='add'>+#endif</div><div class='add'>+#define BNGE_PAGE_SIZE	(1 &lt;&lt; BNGE_PAGE_SHIFT)</div><div class='add'>+/* The RXBD length is 16-bit so we can only support page sizes &lt; 64K */</div><div class='add'>+#if (PAGE_SHIFT &gt; 15)</div><div class='add'>+#define BNGE_RX_PAGE_SHIFT 15</div><div class='add'>+#else</div><div class='add'>+#define BNGE_RX_PAGE_SHIFT PAGE_SHIFT</div><div class='add'>+#endif</div><div class='add'>+#define MAX_CTX_PAGES	(BNGE_PAGE_SIZE / 8)</div><div class='add'>+#define MAX_CTX_TOTAL_PAGES	(MAX_CTX_PAGES * MAX_CTX_PAGES)</div><div class='add'>+</div><div class='add'>+struct bnge_ctx_pg_info {</div><div class='add'>+	u32		entries;</div><div class='add'>+	u32		nr_pages;</div><div class='add'>+	void		*ctx_pg_arr[MAX_CTX_PAGES];</div><div class='add'>+	dma_addr_t	ctx_dma_arr[MAX_CTX_PAGES];</div><div class='add'>+	struct bnge_ring_mem_info ring_mem;</div><div class='add'>+	struct bnge_ctx_pg_info **ctx_pg_tbl;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNGE_MAX_TQM_SP_RINGS		1</div><div class='add'>+#define BNGE_MAX_TQM_FP_RINGS		8</div><div class='add'>+#define BNGE_MAX_TQM_RINGS		\</div><div class='add'>+	(BNGE_MAX_TQM_SP_RINGS + BNGE_MAX_TQM_FP_RINGS)</div><div class='add'>+#define BNGE_BACKING_STORE_CFG_LEGACY_LEN	256</div><div class='add'>+#define BNGE_SET_CTX_PAGE_ATTR(attr)					\</div><div class='add'>+do {									\</div><div class='add'>+	if (BNGE_PAGE_SIZE == 0x2000)					\</div><div class='add'>+		attr = FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8K;	\</div><div class='add'>+	else if (BNGE_PAGE_SIZE == 0x10000)				\</div><div class='add'>+		attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_64K;	\</div><div class='add'>+	else								\</div><div class='add'>+		attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_4K;	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+#define BNGE_CTX_MRAV_AV_SPLIT_ENTRY	0</div><div class='add'>+</div><div class='add'>+#define BNGE_CTX_QP	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_QP</div><div class='add'>+#define BNGE_CTX_SRQ	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRQ</div><div class='add'>+#define BNGE_CTX_CQ	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CQ</div><div class='add'>+#define BNGE_CTX_VNIC	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_VNIC</div><div class='add'>+#define BNGE_CTX_STAT	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_STAT</div><div class='add'>+#define BNGE_CTX_STQM	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SP_TQM_RING</div><div class='add'>+#define BNGE_CTX_FTQM	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_FP_TQM_RING</div><div class='add'>+#define BNGE_CTX_MRAV	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_MRAV</div><div class='add'>+#define BNGE_CTX_TIM	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TIM</div><div class='add'>+#define BNGE_CTX_TCK	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TX_CK</div><div class='add'>+#define BNGE_CTX_RCK	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RX_CK</div><div class='add'>+#define BNGE_CTX_MTQM	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_MP_TQM_RING</div><div class='add'>+#define BNGE_CTX_SQDBS	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SQ_DB_SHADOW</div><div class='add'>+#define BNGE_CTX_RQDBS	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RQ_DB_SHADOW</div><div class='add'>+#define BNGE_CTX_SRQDBS	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRQ_DB_SHADOW</div><div class='add'>+#define BNGE_CTX_CQDBS	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CQ_DB_SHADOW</div><div class='add'>+#define BNGE_CTX_SRT_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRT_TRACE</div><div class='add'>+#define BNGE_CTX_SRT2_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRT2_TRACE</div><div class='add'>+#define BNGE_CTX_CRT_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CRT_TRACE</div><div class='add'>+#define BNGE_CTX_CRT2_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CRT2_TRACE</div><div class='add'>+#define BNGE_CTX_RIGP0_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RIGP0_TRACE</div><div class='add'>+#define BNGE_CTX_L2_HWRM_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_L2_HWRM_TRACE</div><div class='add'>+#define BNGE_CTX_ROCE_HWRM_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ROCE_HWRM_TRACE</div><div class='add'>+</div><div class='add'>+#define BNGE_CTX_MAX		(BNGE_CTX_TIM + 1)</div><div class='add'>+#define BNGE_CTX_L2_MAX		(BNGE_CTX_FTQM + 1)</div><div class='add'>+#define BNGE_CTX_INV		((u16)-1)</div><div class='add'>+</div><div class='add'>+#define BNGE_CTX_V2_MAX	\</div><div class='add'>+	(FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ROCE_HWRM_TRACE + 1)</div><div class='add'>+</div><div class='add'>+#define BNGE_BS_CFG_ALL_DONE	\</div><div class='add'>+	FUNC_BACKING_STORE_CFG_V2_REQ_FLAGS_BS_CFG_ALL_DONE</div><div class='add'>+</div><div class='add'>+struct bnge_ctx_mem_type {</div><div class='add'>+	u16	type;</div><div class='add'>+	u16	entry_size;</div><div class='add'>+	u32	flags;</div><div class='add'>+#define BNGE_CTX_MEM_TYPE_VALID	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_TYPE_VALID</div><div class='add'>+	u32	instance_bmap;</div><div class='add'>+	u8	init_value;</div><div class='add'>+	u8	entry_multiple;</div><div class='add'>+	u16	init_offset;</div><div class='add'>+#define	BNGE_CTX_INIT_INVALID_OFFSET	0xffff</div><div class='add'>+	u32	max_entries;</div><div class='add'>+	u32	min_entries;</div><div class='add'>+	u8	last:1;</div><div class='add'>+	u8	split_entry_cnt;</div><div class='add'>+#define BNGE_MAX_SPLIT_ENTRY	4</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32	qp_l2_entries;</div><div class='add'>+			u32	qp_qp1_entries;</div><div class='add'>+			u32	qp_fast_qpmd_entries;</div><div class='add'>+		};</div><div class='add'>+		u32	srq_l2_entries;</div><div class='add'>+		u32	cq_l2_entries;</div><div class='add'>+		u32	vnic_entries;</div><div class='add'>+		struct {</div><div class='add'>+			u32	mrav_av_entries;</div><div class='add'>+			u32	mrav_num_entries_units;</div><div class='add'>+		};</div><div class='add'>+		u32	split[BNGE_MAX_SPLIT_ENTRY];</div><div class='add'>+	};</div><div class='add'>+	struct bnge_ctx_pg_info	*pg_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_ctx_mem_info {</div><div class='add'>+	u8	tqm_fp_rings_count;</div><div class='add'>+	u32	flags;</div><div class='add'>+#define BNGE_CTX_FLAG_INITED	0x01</div><div class='add'>+	struct bnge_ctx_mem_type	ctx_arr[BNGE_CTX_V2_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnge_ring_struct {</div><div class='add'>+	struct bnge_ring_mem_info	ring_mem;</div><div class='add'>+</div><div class='add'>+	u16			fw_ring_id;</div><div class='add'>+	union {</div><div class='add'>+		u16		grp_idx;</div><div class='add'>+		u16		map_idx; /* Used by NQs */</div><div class='add'>+	};</div><div class='add'>+	u32			handle;</div><div class='add'>+	u8			queue_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int bnge_alloc_ring(struct bnge_dev *bd, struct bnge_ring_mem_info *rmem);</div><div class='add'>+void bnge_free_ring(struct bnge_dev *bd, struct bnge_ring_mem_info *rmem);</div><div class='add'>+int bnge_alloc_ctx_mem(struct bnge_dev *bd);</div><div class='add'>+void bnge_free_ctx_mem(struct bnge_dev *bd);</div><div class='add'>+void bnge_init_ring_struct(struct bnge_net *bn);</div><div class='add'>+</div><div class='add'>+#endif /* _BNGE_RMEM_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c<br/>index dfdd14eadd57..805daae9dd36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2.c</a></div><div class='hunk'>@@ -48,7 +48,6 @@</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> </div><div class='ctx'> #if IS_ENABLED(CONFIG_CNIC)</div><div class='hunk'>@@ -59,8 +58,6 @@</div><div class='ctx'> #include "bnx2_fw.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"bnx2"</div><div class='del'>-#define DRV_MODULE_VERSION	"2.2.6"</div><div class='del'>-#define DRV_MODULE_RELDATE	"January 29, 2014"</div><div class='ctx'> #define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.3.fw"</div><div class='ctx'> #define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-6.0.15.fw"</div><div class='ctx'> #define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1b.fw"</div><div class='hunk'>@@ -72,13 +69,9 @@</div><div class='ctx'> /* Time in jiffies before concluding the transmitter is hung. */</div><div class='ctx'> #define TX_TIMEOUT  (5*HZ)</div><div class='ctx'> </div><div class='del'>-static char version[] =</div><div class='del'>-	"QLogic " DRV_MODULE_NAME " Gigabit Ethernet Driver v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Michael Chan &lt;mchan@broadcom.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("QLogic BCM5706/5708/5709/5716 Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> MODULE_FIRMWARE(FW_MIPS_FILE_06);</div><div class='ctx'> MODULE_FIRMWARE(FW_RV2P_FILE_06);</div><div class='ctx'> MODULE_FIRMWARE(FW_MIPS_FILE_09);</div><div class='hunk'>@@ -182,12 +175,12 @@ static const struct flash_spec flash_table[] =</div><div class='ctx'> 	{0x19000002, 0x5b808201, 0x000500db, 0x03840253, 0xaf020406,</div><div class='ctx'> 	 NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE,</div><div class='ctx'> 	 ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*2,</div><div class='del'>-	 "Entry 0101: ST M45PE10 (128kB non-bufferred)"},</div><div class='add'>+	 "Entry 0101: ST M45PE10 (128kB non-buffered)"},</div><div class='ctx'> 	/* Entry 0110: ST M45PE20 (non-buffered flash)*/</div><div class='ctx'> 	{0x15000001, 0x57808201, 0x000500db, 0x03840253, 0xaf020406,</div><div class='ctx'> 	 NONBUFFERED_FLAGS, ST_MICRO_FLASH_PAGE_BITS, ST_MICRO_FLASH_PAGE_SIZE,</div><div class='ctx'> 	 ST_MICRO_FLASH_BYTE_ADDR_MASK, ST_MICRO_FLASH_BASE_TOTAL_SIZE*4,</div><div class='del'>-	 "Entry 0110: ST M45PE20 (256kB non-bufferred)"},</div><div class='add'>+	 "Entry 0110: ST M45PE20 (256kB non-buffered)"},</div><div class='ctx'> 	/* Saifun SA25F005 (non-buffered flash) */</div><div class='ctx'> 	/* strap, cfg1, &amp; write1 need updates */</div><div class='ctx'> 	{0x1d000003, 0x5f808201, 0x00050081, 0x03840253, 0xaf020406,</div><div class='hunk'>@@ -374,6 +367,7 @@ static void bnx2_setup_cnic_irq_info(struct bnx2 *bp)</div><div class='ctx'> 	cp-&gt;irq_arr[0].status_blk = (void *)</div><div class='ctx'> 		((unsigned long) bnapi-&gt;status_blk.msi +</div><div class='ctx'> 		(BNX2_SBLK_MSIX_ALIGN_SIZE * sb_id));</div><div class='add'>+	cp-&gt;irq_arr[0].status_blk_map = bp-&gt;status_blk_mapping;</div><div class='ctx'> 	cp-&gt;irq_arr[0].status_blk_num = sb_id;</div><div class='ctx'> 	cp-&gt;num_irq = 1;</div><div class='ctx'> }</div><div class='hunk'>@@ -578,7 +572,7 @@ bnx2_write_phy(struct bnx2 *bp, u32 reg, u32 val)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (val1 &amp; BNX2_EMAC_MDIO_COMM_START_BUSY)</div><div class='del'>-        	ret = -EBUSY;</div><div class='add'>+		ret = -EBUSY;</div><div class='ctx'> 	else</div><div class='ctx'> 		ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1343,13 +1337,13 @@ bnx2_set_mac_link(struct bnx2 *bp)</div><div class='ctx'> 					val |= BNX2_EMAC_MODE_PORT_MII_10M;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case SPEED_100:</div><div class='ctx'> 				val |= BNX2_EMAC_MODE_PORT_MII;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case SPEED_2500:</div><div class='ctx'> 				val |= BNX2_EMAC_MODE_25G_MODE;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case SPEED_1000:</div><div class='ctx'> 				val |= BNX2_EMAC_MODE_PORT_GMII;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -1461,7 +1455,7 @@ bnx2_test_and_disable_2g5(struct bnx2 *bp)</div><div class='ctx'> static void</div><div class='ctx'> bnx2_enable_forced_2g5(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='del'>-	u32 uninitialized_var(bmcr);</div><div class='add'>+	u32 bmcr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;phy_flags &amp; BNX2_PHY_FLAG_2_5G_CAPABLE))</div><div class='hunk'>@@ -1505,7 +1499,7 @@ bnx2_enable_forced_2g5(struct bnx2 *bp)</div><div class='ctx'> static void</div><div class='ctx'> bnx2_disable_forced_2g5(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='del'>-	u32 uninitialized_var(bmcr);</div><div class='add'>+	u32 bmcr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;phy_flags &amp; BNX2_PHY_FLAG_2_5G_CAPABLE))</div><div class='hunk'>@@ -2001,26 +1995,26 @@ bnx2_remote_phy_event(struct bnx2 *bp)</div><div class='ctx'> 		switch (speed) {</div><div class='ctx'> 			case BNX2_LINK_STATUS_10HALF:</div><div class='ctx'> 				bp-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case BNX2_LINK_STATUS_10FULL:</div><div class='ctx'> 				bp-&gt;line_speed = SPEED_10;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case BNX2_LINK_STATUS_100HALF:</div><div class='ctx'> 				bp-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case BNX2_LINK_STATUS_100BASE_T4:</div><div class='ctx'> 			case BNX2_LINK_STATUS_100FULL:</div><div class='ctx'> 				bp-&gt;line_speed = SPEED_100;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case BNX2_LINK_STATUS_1000HALF:</div><div class='ctx'> 				bp-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case BNX2_LINK_STATUS_1000FULL:</div><div class='ctx'> 				bp-&gt;line_speed = SPEED_1000;</div><div class='ctx'> 				break;</div><div class='ctx'> 			case BNX2_LINK_STATUS_2500HALF:</div><div class='ctx'> 				bp-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-				/* fall through */</div><div class='add'>+				fallthrough;</div><div class='ctx'> 			case BNX2_LINK_STATUS_2500FULL:</div><div class='ctx'> 				bp-&gt;line_speed = SPEED_2500;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -2710,7 +2704,7 @@ bnx2_alloc_bad_rbuf(struct bnx2 *bp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-bnx2_set_mac_addr(struct bnx2 *bp, u8 *mac_addr, u32 pos)</div><div class='add'>+bnx2_set_mac_addr(struct bnx2 *bp, const u8 *mac_addr, u32 pos)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='hunk'>@@ -2736,7 +2730,7 @@ bnx2_alloc_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gf</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	mapping = dma_map_page(&amp;bp-&gt;pdev-&gt;dev, page, 0, PAGE_SIZE,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping)) {</div><div class='ctx'> 		__free_page(page);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -2759,7 +2753,7 @@ bnx2_free_rx_page(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_page(&amp;bp-&gt;pdev-&gt;dev, dma_unmap_addr(rx_pg, mapping),</div><div class='del'>-		       PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+		       PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	__free_page(page);</div><div class='ctx'> 	rx_pg-&gt;page = NULL;</div><div class='hunk'>@@ -2781,7 +2775,7 @@ bnx2_alloc_rx_data(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr, u16 index, gf</div><div class='ctx'> 	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				 get_l2_fhdr(data),</div><div class='ctx'> 				 bp-&gt;rx_buf_use_size,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='add'>+				 DMA_FROM_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping)) {</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -2887,7 +2881,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-			skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+			skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		tx_buf-&gt;skb = NULL;</div><div class='ctx'> 		last = tx_buf-&gt;nr_frags;</div><div class='hunk'>@@ -2901,7 +2895,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> 			dma_unmap_page(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				dma_unmap_addr(tx_buf, mapping),</div><div class='ctx'> 				skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]),</div><div class='del'>-				PCI_DMA_TODEVICE);</div><div class='add'>+				DMA_TO_DEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		sw_cons = BNX2_NEXT_TX_BD(sw_cons);</div><div class='hunk'>@@ -2962,7 +2956,6 @@ bnx2_reuse_rx_skb_pages(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> 		shinfo = skb_shinfo(skb);</div><div class='ctx'> 		shinfo-&gt;nr_frags--;</div><div class='ctx'> 		page = skb_frag_page(&amp;shinfo-&gt;frags[shinfo-&gt;nr_frags]);</div><div class='del'>-		__skb_frag_set_page(&amp;shinfo-&gt;frags[shinfo-&gt;nr_frags], NULL);</div><div class='ctx'> </div><div class='ctx'> 		cons_rx_pg-&gt;page = page;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='hunk'>@@ -3009,7 +3002,7 @@ bnx2_reuse_rx_data(struct bnx2 *bp, struct bnx2_rx_ring_info *rxr,</div><div class='ctx'> </div><div class='ctx'> 	dma_sync_single_for_device(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 		dma_unmap_addr(cons_rx_buf, mapping),</div><div class='del'>-		BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH, PCI_DMA_FROMDEVICE);</div><div class='add'>+		BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	rxr-&gt;rx_prod_bseq += bp-&gt;rx_buf_use_size;</div><div class='ctx'> </div><div class='hunk'>@@ -3050,8 +3043,8 @@ error:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, dma_addr, bp-&gt;rx_buf_use_size,</div><div class='del'>-			 PCI_DMA_FROMDEVICE);</div><div class='del'>-	skb = build_skb(data, 0);</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='add'>+	skb = slab_build_skb(data);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		kfree(data);</div><div class='ctx'> 		goto error;</div><div class='hunk'>@@ -3116,7 +3109,7 @@ error:</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			dma_unmap_page(&amp;bp-&gt;pdev-&gt;dev, mapping_old,</div><div class='del'>-				       PAGE_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+				       PAGE_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			frag_size -= frag_len;</div><div class='ctx'> 			skb-&gt;data_len += frag_len;</div><div class='hunk'>@@ -3186,7 +3179,7 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)</div><div class='ctx'> </div><div class='ctx'> 		dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev, dma_addr,</div><div class='ctx'> 			BNX2_RX_OFFSET + BNX2_RX_COPY_THRESH,</div><div class='del'>-			PCI_DMA_FROMDEVICE);</div><div class='add'>+			DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		next_ring_idx = BNX2_RX_RING_IDX(BNX2_NEXT_RX_BD(sw_cons));</div><div class='ctx'> 		next_rx_buf = &amp;rxr-&gt;rx_buf_ring[next_ring_idx];</div><div class='hunk'>@@ -3605,7 +3598,7 @@ bnx2_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 		for (i = 0; i &lt; NUM_MC_HASH_REGISTERS; i++) {</div><div class='ctx'> 			BNX2_WR(bp, BNX2_EMAC_MULTICAST_HASH0 + (i * 4),</div><div class='ctx'> 				0xffffffff);</div><div class='del'>-        	}</div><div class='add'>+		}</div><div class='ctx'> 		sort_mode |= BNX2_RPM_SORT_USER0_MC_EN;</div><div class='ctx'> 	}</div><div class='ctx'> 	else {</div><div class='hunk'>@@ -3835,7 +3828,7 @@ load_rv2p_fw(struct bnx2 *bp, u32 rv2p_proc,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> load_cpu_fw(struct bnx2 *bp, const struct cpu_reg *cpu_reg,</div><div class='ctx'> 	    const struct bnx2_mips_fw_file_entry *fw_entry)</div><div class='ctx'> {</div><div class='hunk'>@@ -3903,48 +3896,34 @@ load_cpu_fw(struct bnx2 *bp, const struct cpu_reg *cpu_reg,</div><div class='ctx'> 	val &amp;= ~cpu_reg-&gt;mode_value_halt;</div><div class='ctx'> 	bnx2_reg_wr_ind(bp, cpu_reg-&gt;state, cpu_reg-&gt;state_value_clear);</div><div class='ctx'> 	bnx2_reg_wr_ind(bp, cpu_reg-&gt;mode, val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='add'>+static void</div><div class='ctx'> bnx2_init_cpus(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='ctx'> 	const struct bnx2_mips_fw_file *mips_fw =</div><div class='ctx'> 		(const struct bnx2_mips_fw_file *) bp-&gt;mips_firmware-&gt;data;</div><div class='ctx'> 	const struct bnx2_rv2p_fw_file *rv2p_fw =</div><div class='ctx'> 		(const struct bnx2_rv2p_fw_file *) bp-&gt;rv2p_firmware-&gt;data;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the RV2P processor. */</div><div class='ctx'> 	load_rv2p_fw(bp, RV2P_PROC1, &amp;rv2p_fw-&gt;proc1);</div><div class='ctx'> 	load_rv2p_fw(bp, RV2P_PROC2, &amp;rv2p_fw-&gt;proc2);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the RX Processor. */</div><div class='del'>-	rc = load_cpu_fw(bp, &amp;cpu_reg_rxp, &amp;mips_fw-&gt;rxp);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto init_cpu_err;</div><div class='add'>+	load_cpu_fw(bp, &amp;cpu_reg_rxp, &amp;mips_fw-&gt;rxp);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the TX Processor. */</div><div class='del'>-	rc = load_cpu_fw(bp, &amp;cpu_reg_txp, &amp;mips_fw-&gt;txp);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto init_cpu_err;</div><div class='add'>+	load_cpu_fw(bp, &amp;cpu_reg_txp, &amp;mips_fw-&gt;txp);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the TX Patch-up Processor. */</div><div class='del'>-	rc = load_cpu_fw(bp, &amp;cpu_reg_tpat, &amp;mips_fw-&gt;tpat);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto init_cpu_err;</div><div class='add'>+	load_cpu_fw(bp, &amp;cpu_reg_tpat, &amp;mips_fw-&gt;tpat);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the Completion Processor. */</div><div class='del'>-	rc = load_cpu_fw(bp, &amp;cpu_reg_com, &amp;mips_fw-&gt;com);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto init_cpu_err;</div><div class='add'>+	load_cpu_fw(bp, &amp;cpu_reg_com, &amp;mips_fw-&gt;com);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the Command Processor. */</div><div class='del'>-	rc = load_cpu_fw(bp, &amp;cpu_reg_cp, &amp;mips_fw-&gt;cp);</div><div class='del'>-</div><div class='del'>-init_cpu_err:</div><div class='del'>-	return rc;</div><div class='add'>+	load_cpu_fw(bp, &amp;cpu_reg_cp, &amp;mips_fw-&gt;cp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -4680,7 +4659,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,</div><div class='ctx'> </div><div class='ctx'> 				if (addr == page_end-4) {</div><div class='ctx'> 					cmd_flags = BNX2_NVM_COMMAND_LAST;</div><div class='del'>-                		}</div><div class='add'>+				}</div><div class='ctx'> 				rc = bnx2_nvram_write_dword(bp, addr,</div><div class='ctx'> 					&amp;flash_buffer[i], cmd_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -4957,8 +4936,7 @@ bnx2_init_chip(struct bnx2 *bp)</div><div class='ctx'> 	} else</div><div class='ctx'> 		bnx2_init_context(bp);</div><div class='ctx'> </div><div class='del'>-	if ((rc = bnx2_init_cpus(bp)) != 0)</div><div class='del'>-		return rc;</div><div class='add'>+	bnx2_init_cpus(bp);</div><div class='ctx'> </div><div class='ctx'> 	bnx2_init_nvram(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -5421,8 +5399,9 @@ bnx2_set_rx_ring_size(struct bnx2 *bp, u32 size)</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_buf_use_size = rx_size;</div><div class='ctx'> 	/* hw alignment + build_skb() overhead*/</div><div class='del'>-	bp-&gt;rx_buf_size = SKB_DATA_ALIGN(bp-&gt;rx_buf_use_size + BNX2_RX_ALIGN) +</div><div class='del'>-		NET_SKB_PAD + SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	bp-&gt;rx_buf_size = kmalloc_size_roundup(</div><div class='add'>+		SKB_DATA_ALIGN(bp-&gt;rx_buf_use_size + BNX2_RX_ALIGN) +</div><div class='add'>+		NET_SKB_PAD + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));</div><div class='ctx'> 	bp-&gt;rx_jumbo_thresh = rx_size - BNX2_RX_OFFSET;</div><div class='ctx'> 	bp-&gt;rx_ring_size = size;</div><div class='ctx'> 	bp-&gt;rx_max_ring = bnx2_find_max_ring(size, BNX2_MAX_RX_RINGS);</div><div class='hunk'>@@ -5455,7 +5434,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)</div><div class='ctx'> 			dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 dma_unmap_addr(tx_buf, mapping),</div><div class='ctx'> 					 skb_headlen(skb),</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			tx_buf-&gt;skb = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -5466,7 +5445,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)</div><div class='ctx'> 				dma_unmap_page(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					dma_unmap_addr(tx_buf, mapping),</div><div class='ctx'> 					skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[k]),</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='add'>+					DMA_TO_DEVICE);</div><div class='ctx'> 			}</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5497,7 +5476,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)</div><div class='ctx'> 			dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 					 bp-&gt;rx_buf_use_size,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			rx_buf-&gt;data = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -5849,7 +5828,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> 		packet[i] = (unsigned char) (i &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	map = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data, pkt_size,</div><div class='del'>-			     PCI_DMA_TODEVICE);</div><div class='add'>+			     DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, map)) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -5888,7 +5867,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> </div><div class='ctx'> 	udelay(5);</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, map, pkt_size, PCI_DMA_TODEVICE);</div><div class='add'>+	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, map, pkt_size, DMA_TO_DEVICE);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (bnx2_get_hw_tx_cons(tx_napi) != txr-&gt;tx_prod)</div><div class='hunk'>@@ -5907,7 +5886,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)</div><div class='ctx'> </div><div class='ctx'> 	dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 		dma_unmap_addr(rx_buf, mapping),</div><div class='del'>-		bp-&gt;rx_buf_use_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+		bp-&gt;rx_buf_use_size, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (rx_hdr-&gt;l2_fhdr_status &amp;</div><div class='ctx'> 		(L2_FHDR_ERRORS_BAD_CRC |</div><div class='hunk'>@@ -6184,7 +6163,7 @@ bnx2_5708_serdes_timer(struct bnx2 *bp)</div><div class='ctx'> static void</div><div class='ctx'> bnx2_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnx2 *bp = from_timer(bp, t, timer);</div><div class='add'>+	struct bnx2 *bp = timer_container_of(bp, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(bp-&gt;dev))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -6421,7 +6400,7 @@ bnx2_open(struct net_device *dev)</div><div class='ctx'> 				rc = bnx2_request_irq(bp);</div><div class='ctx'> </div><div class='ctx'> 			if (rc) {</div><div class='del'>-				del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+				timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 				goto open_err;</div><div class='ctx'> 			}</div><div class='ctx'> 			bnx2_enable_int(bp);</div><div class='hunk'>@@ -6465,7 +6444,6 @@ bnx2_reset_task(struct work_struct *work)</div><div class='ctx'> 	if (!(pcicmd &amp; PCI_COMMAND_MEMORY)) {</div><div class='ctx'> 		/* in case PCI block has reset */</div><div class='ctx'> 		pci_restore_state(bp-&gt;pdev);</div><div class='del'>-		pci_save_state(bp-&gt;pdev);</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = bnx2_init_nic(bp, 1);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -6575,7 +6553,7 @@ bnx2_dump_state(struct bnx2 *bp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-bnx2_tx_timeout(struct net_device *dev)</div><div class='add'>+bnx2_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -6666,7 +6644,8 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	} else</div><div class='ctx'> 		mss = 0;</div><div class='ctx'> </div><div class='del'>-	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data, len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, mapping)) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='hunk'>@@ -6747,7 +6726,7 @@ dma_error:</div><div class='ctx'> 	tx_buf = &amp;txr-&gt;tx_buf_ring[ring_prod];</div><div class='ctx'> 	tx_buf-&gt;skb = NULL;</div><div class='ctx'> 	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-			 skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+			 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap remaining mapped pages */</div><div class='ctx'> 	for (i = 0; i &lt; last_frag; i++) {</div><div class='hunk'>@@ -6756,7 +6735,7 @@ dma_error:</div><div class='ctx'> 		tx_buf = &amp;txr-&gt;tx_buf_ring[ring_prod];</div><div class='ctx'> 		dma_unmap_page(&amp;bp-&gt;pdev-&gt;dev, dma_unmap_addr(tx_buf, mapping),</div><div class='ctx'> 			       skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]),</div><div class='del'>-			       PCI_DMA_TODEVICE);</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='hunk'>@@ -6772,7 +6751,7 @@ bnx2_close(struct net_device *dev)</div><div class='ctx'> 	bnx2_disable_int_sync(bp);</div><div class='ctx'> 	bnx2_napi_disable(bp);</div><div class='ctx'> 	netif_tx_disable(dev);</div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	bnx2_shutdown_chip(bp);</div><div class='ctx'> 	bnx2_free_irq(bp);</div><div class='ctx'> 	bnx2_free_skbs(bp);</div><div class='hunk'>@@ -7047,10 +7026,9 @@ bnx2_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='del'>-	strlcpy(info-&gt;fw_version, bp-&gt;fw_version, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;fw_version, bp-&gt;fw_version, sizeof(info-&gt;fw_version));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BNX2_REGDUMP_LEN		(32 * 1024)</div><div class='hunk'>@@ -7248,8 +7226,10 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bnx2_get_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)</div><div class='add'>+static int bnx2_get_coalesce(struct net_device *dev,</div><div class='add'>+			     struct ethtool_coalesce *coal,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -7270,8 +7250,10 @@ bnx2_get_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)</div><div class='add'>+static int bnx2_set_coalesce(struct net_device *dev,</div><div class='add'>+			     struct ethtool_coalesce *coal,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -7320,7 +7302,9 @@ bnx2_set_coalesce(struct net_device *dev, struct ethtool_coalesce *coal)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)</div><div class='add'>+bnx2_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering,</div><div class='add'>+		   struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -7391,7 +7375,9 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx, bool reset_irq)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-bnx2_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)</div><div class='add'>+bnx2_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering,</div><div class='add'>+		   struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -7819,6 +7805,11 @@ static int bnx2_set_channels(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops bnx2_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_USECS_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_STATS_BLOCK_USECS,</div><div class='ctx'> 	.get_drvinfo		= bnx2_get_drvinfo,</div><div class='ctx'> 	.get_regs_len		= bnx2_get_regs_len,</div><div class='ctx'> 	.get_regs		= bnx2_get_regs,</div><div class='hunk'>@@ -7858,7 +7849,7 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		data-&gt;phy_id = bp-&gt;phy_addr;</div><div class='ctx'> </div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIREG: {</div><div class='ctx'> 		u32 mii_regval;</div><div class='ctx'> </div><div class='hunk'>@@ -7907,7 +7898,7 @@ bnx2_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		bnx2_set_mac_addr(bp, bp-&gt;dev-&gt;dev_addr, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -7920,7 +7911,7 @@ bnx2_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return bnx2_change_ring_size(bp, bp-&gt;rx_ring_size, bp-&gt;tx_ring_size,</div><div class='ctx'> 				     false);</div><div class='ctx'> }</div><div class='hunk'>@@ -8035,62 +8026,40 @@ bnx2_get_pci_speed(struct bnx2 *bp)</div><div class='ctx'> static void</div><div class='ctx'> bnx2_read_vpd_fw_ver(struct bnx2 *bp)</div><div class='ctx'> {</div><div class='add'>+	unsigned int len;</div><div class='ctx'> 	int rc, i, j;</div><div class='ctx'> 	u8 *data;</div><div class='del'>-	unsigned int block_end, rosize, len;</div><div class='ctx'> </div><div class='ctx'> #define BNX2_VPD_NVRAM_OFFSET	0x300</div><div class='ctx'> #define BNX2_VPD_LEN		128</div><div class='ctx'> #define BNX2_MAX_VER_SLEN	30</div><div class='ctx'> </div><div class='del'>-	data = kmalloc(256, GFP_KERNEL);</div><div class='add'>+	data = kmalloc(BNX2_VPD_LEN, GFP_KERNEL);</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	rc = bnx2_nvram_read(bp, BNX2_VPD_NVRAM_OFFSET, data + BNX2_VPD_LEN,</div><div class='del'>-			     BNX2_VPD_LEN);</div><div class='add'>+	rc = bnx2_nvram_read(bp, BNX2_VPD_NVRAM_OFFSET, data, BNX2_VPD_LEN);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto vpd_done;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNX2_VPD_LEN; i += 4) {</div><div class='del'>-		data[i] = data[i + BNX2_VPD_LEN + 3];</div><div class='del'>-		data[i + 1] = data[i + BNX2_VPD_LEN + 2];</div><div class='del'>-		data[i + 2] = data[i + BNX2_VPD_LEN + 1];</div><div class='del'>-		data[i + 3] = data[i + BNX2_VPD_LEN];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	i = pci_vpd_find_tag(data, 0, BNX2_VPD_LEN, PCI_VPD_LRDT_RO_DATA);</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		goto vpd_done;</div><div class='del'>-</div><div class='del'>-	rosize = pci_vpd_lrdt_size(&amp;data[i]);</div><div class='del'>-	i += PCI_VPD_LRDT_TAG_SIZE;</div><div class='del'>-	block_end = i + rosize;</div><div class='del'>-</div><div class='del'>-	if (block_end &gt; BNX2_VPD_LEN)</div><div class='del'>-		goto vpd_done;</div><div class='add'>+	for (i = 0; i &lt; BNX2_VPD_LEN; i += 4)</div><div class='add'>+		swab32s((u32 *)&amp;data[i]);</div><div class='ctx'> </div><div class='del'>-	j = pci_vpd_find_info_keyword(data, i, rosize,</div><div class='del'>-				      PCI_VPD_RO_KEYWORD_MFR_ID);</div><div class='add'>+	j = pci_vpd_find_ro_info_keyword(data, BNX2_VPD_LEN,</div><div class='add'>+					 PCI_VPD_RO_KEYWORD_MFR_ID, &amp;len);</div><div class='ctx'> 	if (j &lt; 0)</div><div class='ctx'> 		goto vpd_done;</div><div class='ctx'> </div><div class='del'>-	len = pci_vpd_info_field_size(&amp;data[j]);</div><div class='del'>-</div><div class='del'>-	j += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-	if (j + len &gt; block_end || len != 4 ||</div><div class='del'>-	    memcmp(&amp;data[j], "1028", 4))</div><div class='add'>+	if (len != 4 || memcmp(&amp;data[j], "1028", 4))</div><div class='ctx'> 		goto vpd_done;</div><div class='ctx'> </div><div class='del'>-	j = pci_vpd_find_info_keyword(data, i, rosize,</div><div class='del'>-				      PCI_VPD_RO_KEYWORD_VENDOR0);</div><div class='add'>+	j = pci_vpd_find_ro_info_keyword(data, BNX2_VPD_LEN,</div><div class='add'>+					 PCI_VPD_RO_KEYWORD_VENDOR0,</div><div class='add'>+					 &amp;len);</div><div class='ctx'> 	if (j &lt; 0)</div><div class='ctx'> 		goto vpd_done;</div><div class='ctx'> </div><div class='del'>-	len = pci_vpd_info_field_size(&amp;data[j]);</div><div class='del'>-</div><div class='del'>-	j += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-	if (j + len &gt; block_end || len &gt; BNX2_MAX_VER_SLEN)</div><div class='add'>+	if (len &gt; BNX2_MAX_VER_SLEN)</div><div class='ctx'> 		goto vpd_done;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(bp-&gt;fw_version, &amp;data[j], len);</div><div class='hunk'>@@ -8107,7 +8076,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	int rc, i, j;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	u64 dma_mask, persist_dma_mask;</div><div class='del'>-	int err;</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	bp = netdev_priv(dev);</div><div class='hunk'>@@ -8190,12 +8158,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		bp-&gt;flags |= BNX2_FLAG_PCIE;</div><div class='ctx'> 		if (BNX2_CHIP_REV(bp) == BNX2_CHIP_REV_Ax)</div><div class='ctx'> 			bp-&gt;flags |= BNX2_FLAG_JUMBO_BROKEN;</div><div class='del'>-</div><div class='del'>-		/* AER (Advanced Error Reporting) hooks */</div><div class='del'>-		err = pci_enable_pcie_error_reporting(pdev);</div><div class='del'>-		if (!err)</div><div class='del'>-			bp-&gt;flags |= BNX2_FLAG_AER_ENABLED;</div><div class='del'>-</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bp-&gt;pcix_cap = pci_find_capability(pdev, PCI_CAP_ID_PCIX);</div><div class='ctx'> 		if (bp-&gt;pcix_cap == 0) {</div><div class='hunk'>@@ -8226,15 +8188,15 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		persist_dma_mask = dma_mask = DMA_BIT_MASK(64);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure DMA attributes. */</div><div class='del'>-	if (pci_set_dma_mask(pdev, dma_mask) == 0) {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, dma_mask) == 0) {</div><div class='ctx'> 		dev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='del'>-		rc = pci_set_consistent_dma_mask(pdev, persist_dma_mask);</div><div class='add'>+		rc = dma_set_coherent_mask(&amp;pdev-&gt;dev, persist_dma_mask);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='del'>-				"pci_set_consistent_dma_mask failed, aborting\n");</div><div class='add'>+				"dma_set_coherent_mask failed, aborting\n");</div><div class='ctx'> 			goto err_out_unmap;</div><div class='ctx'> 		}</div><div class='del'>-	} else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {</div><div class='add'>+	} else if ((rc = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) != 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "System does not support DMA, aborting\n");</div><div class='ctx'> 		goto err_out_unmap;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8249,9 +8211,9 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		BNX2_WR(bp, PCI_COMMAND, reg);</div><div class='ctx'> 	} else if ((BNX2_CHIP_ID(bp) == BNX2_CHIP_ID_5706_A1) &amp;&amp;</div><div class='ctx'> 		!(bp-&gt;flags &amp; BNX2_FLAG_PCIX)) {</div><div class='del'>-</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"5706 A1 can only be used in a PCIX bus, aborting\n");</div><div class='add'>+		rc = -EPERM;</div><div class='ctx'> 		goto err_out_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8474,11 +8436,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_unmap:</div><div class='del'>-	if (bp-&gt;flags &amp; BNX2_FLAG_AER_ENABLED) {</div><div class='del'>-		pci_disable_pcie_error_reporting(pdev);</div><div class='del'>-		bp-&gt;flags &amp;= ~BNX2_FLAG_AER_ENABLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pci_iounmap(pdev, bp-&gt;regview);</div><div class='ctx'> 	bp-&gt;regview = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -8537,7 +8494,7 @@ bnx2_init_napi(struct bnx2 *bp)</div><div class='ctx'> 		else</div><div class='ctx'> 			poll = bnx2_poll_msix;</div><div class='ctx'> </div><div class='del'>-		netif_napi_add(bp-&gt;dev, &amp;bp-&gt;bnx2_napi[i].napi, poll, 64);</div><div class='add'>+		netif_napi_add(bp-&gt;dev, &amp;bp-&gt;bnx2_napi[i].napi, poll);</div><div class='ctx'> 		bnapi-&gt;bp = bp;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -8548,7 +8505,7 @@ static const struct net_device_ops bnx2_netdev_ops = {</div><div class='ctx'> 	.ndo_stop		= bnx2_close,</div><div class='ctx'> 	.ndo_get_stats64	= bnx2_get_stats64,</div><div class='ctx'> 	.ndo_set_rx_mode	= bnx2_set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= bnx2_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= bnx2_ioctl,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= bnx2_change_mac_addr,</div><div class='ctx'> 	.ndo_change_mtu		= bnx2_change_mtu,</div><div class='hunk'>@@ -8562,15 +8519,11 @@ static const struct net_device_ops bnx2_netdev_ops = {</div><div class='ctx'> static int</div><div class='ctx'> bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	static int version_printed = 0;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct bnx2 *bp;</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	char str[40];</div><div class='ctx'> </div><div class='del'>-	if (version_printed++ == 0)</div><div class='del'>-		pr_info("%s", version);</div><div class='del'>-</div><div class='ctx'> 	/* dev zeroed in init_etherdev */</div><div class='ctx'> 	dev = alloc_etherdev_mq(sizeof(*bp), TX_MAX_RINGS);</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -8597,7 +8550,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (is_kdump_kernel())</div><div class='ctx'> 		bnx2_wait_dma_complete(bp);</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, bp-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, bp-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |</div><div class='ctx'> 		NETIF_F_TSO | NETIF_F_TSO_ECN |</div><div class='hunk'>@@ -8648,7 +8601,7 @@ bnx2_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	cancel_work_sync(&amp;bp-&gt;reset_task);</div><div class='ctx'> </div><div class='ctx'> 	pci_iounmap(bp-&gt;pdev, bp-&gt;regview);</div><div class='hunk'>@@ -8656,11 +8609,6 @@ bnx2_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	bnx2_free_stats_blk(dev);</div><div class='ctx'> 	kfree(bp-&gt;temp_stats_blk);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNX2_FLAG_AER_ENABLED) {</div><div class='del'>-		pci_disable_pcie_error_reporting(pdev);</div><div class='del'>-		bp-&gt;flags &amp;= ~BNX2_FLAG_AER_ENABLED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bnx2_release_firmware(bp);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='hunk'>@@ -8673,15 +8621,14 @@ bnx2_remove_one(struct pci_dev *pdev)</div><div class='ctx'> static int</div><div class='ctx'> bnx2_suspend(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		cancel_work_sync(&amp;bp-&gt;reset_task);</div><div class='ctx'> 		bnx2_netif_stop(bp, true);</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='del'>-		del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 		bnx2_shutdown_chip(bp);</div><div class='ctx'> 		__bnx2_free_irq(bp);</div><div class='ctx'> 		bnx2_free_skbs(bp);</div><div class='hunk'>@@ -8693,8 +8640,7 @@ bnx2_suspend(struct device *device)</div><div class='ctx'> static int</div><div class='ctx'> bnx2_resume(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct bnx2 *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='hunk'>@@ -8740,7 +8686,7 @@ static pci_ers_result_t bnx2_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		bnx2_netif_stop(bp, true);</div><div class='del'>-		del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 		bnx2_reset_nic(bp, BNX2_DRV_MSG_CODE_RESET);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -8771,7 +8717,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pci_set_master(pdev);</div><div class='ctx'> 		pci_restore_state(pdev);</div><div class='del'>-		pci_save_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 		if (netif_running(dev))</div><div class='ctx'> 			err = bnx2_init_nic(bp, 1);</div><div class='hunk'>@@ -8786,9 +8731,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNX2_FLAG_AER_ENABLED))</div><div class='del'>-		return result;</div><div class='del'>-</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h<br/>index a09ec47461c9..315b08c64edd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2.h</a></div><div class='hunk'>@@ -6808,7 +6808,6 @@ struct bnx2 {</div><div class='ctx'> #define BNX2_FLAG_JUMBO_BROKEN		0x00000800</div><div class='ctx'> #define BNX2_FLAG_CAN_KEEP_VLAN		0x00001000</div><div class='ctx'> #define BNX2_FLAG_BROKEN_STATS		0x00002000</div><div class='del'>-#define BNX2_FLAG_AER_ENABLED		0x00004000</div><div class='ctx'> </div><div class='ctx'> 	struct bnx2_napi	bnx2_napi[BNX2_MAX_MSIX_VEC];</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/Makefile b/drivers/net/ethernet/broadcom/bnx2x/Makefile<br/>index 9fdfaa269af9..2523cfc7527d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/Makefile</a></div><div class='hunk'>@@ -5,5 +5,5 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_BNX2X) += bnx2x.o</div><div class='ctx'> </div><div class='del'>-bnx2x-y := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o bnx2x_dcb.o bnx2x_sp.o</div><div class='add'>+bnx2x-y := bnx2x_main.o bnx2x_link.o bnx2x_cmn.o bnx2x_ethtool.o bnx2x_stats.o bnx2x_dcb.o bnx2x_sp.o bnx2x_self_test.o</div><div class='ctx'> bnx2x-$(CONFIG_BNX2X_SRIOV) += bnx2x_vfpf.o bnx2x_sriov.o</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h<br/>index 6026b53137aa..9580ab83d387 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x.h</a></div><div class='hunk'>@@ -32,8 +32,14 @@</div><div class='ctx'>  * (you will need to reboot afterwards) */</div><div class='ctx'> /* #define BNX2X_STOP_ON_ERROR */</div><div class='ctx'> </div><div class='add'>+/* FIXME: Delete the DRV_MODULE_VERSION below, but please be warned</div><div class='add'>+ * that it is not an easy task because such change has all chances</div><div class='add'>+ * to break this driver due to amount of abuse of in-kernel interfaces</div><div class='add'>+ * between modules and FW.</div><div class='add'>+ *</div><div class='add'>+ * DO NOT UPDATE DRV_MODULE_VERSION below.</div><div class='add'>+ */</div><div class='ctx'> #define DRV_MODULE_VERSION      "1.713.36-0"</div><div class='del'>-#define DRV_MODULE_RELDATE      "2014/02/10"</div><div class='ctx'> #define BNX2X_BC_VER            0x040200</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_DCB)</div><div class='hunk'>@@ -1256,7 +1262,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_fw_stats_req {</div><div class='ctx'> 	struct stats_query_header hdr;</div><div class='del'>-	struct stats_query_entry query[FP_SB_MAX_E1x+</div><div class='add'>+	struct stats_query_entry query[FP_SB_MAX_E2 +</div><div class='ctx'> 		BNX2X_FIRST_QUEUE_QUERY_IDX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1265,7 +1271,7 @@ struct bnx2x_fw_stats_data {</div><div class='ctx'> 	struct per_port_stats		port;</div><div class='ctx'> 	struct per_pf_stats		pf;</div><div class='ctx'> 	struct fcoe_statistics_params	fcoe;</div><div class='del'>-	struct per_queue_stats		queue_stats[1];</div><div class='add'>+	struct per_queue_stats		queue_stats[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Public slow path states */</div><div class='hunk'>@@ -1281,7 +1287,6 @@ enum sp_rtnl_flag {</div><div class='ctx'> 	BNX2X_SP_RTNL_HYPERVISOR_VLAN,</div><div class='ctx'> 	BNX2X_SP_RTNL_TX_STOP,</div><div class='ctx'> 	BNX2X_SP_RTNL_GET_DRV_VERSION,</div><div class='del'>-	BNX2X_SP_RTNL_CHANGE_UDP_PORT,</div><div class='ctx'> 	BNX2X_SP_RTNL_UPDATE_SVID,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1337,11 +1342,6 @@ enum bnx2x_udp_port_type {</div><div class='ctx'> 	BNX2X_UDP_PORT_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bnx2x_udp_tunnel {</div><div class='del'>-	u16 dst_port;</div><div class='del'>-	u8 count;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct bnx2x {</div><div class='ctx'> 	/* Fields used in the tx and intr/napi performance paths</div><div class='ctx'> 	 * are grouped together in the beginning of the structure</div><div class='hunk'>@@ -1486,7 +1486,6 @@ struct bnx2x {</div><div class='ctx'> #define IS_VF_FLAG			(1 &lt;&lt; 22)</div><div class='ctx'> #define BC_SUPPORTS_RMMOD_CMD		(1 &lt;&lt; 23)</div><div class='ctx'> #define HAS_PHYS_PORT_ID		(1 &lt;&lt; 24)</div><div class='del'>-#define AER_ENABLED			(1 &lt;&lt; 25)</div><div class='ctx'> #define PTP_SUPPORTED			(1 &lt;&lt; 26)</div><div class='ctx'> #define TX_TIMESTAMPING_EN		(1 &lt;&lt; 27)</div><div class='ctx'> </div><div class='hunk'>@@ -1509,6 +1508,8 @@ struct bnx2x {</div><div class='ctx'> 	bool			cnic_loaded;</div><div class='ctx'> 	struct cnic_eth_dev	*(*cnic_probe)(struct net_device *);</div><div class='ctx'> </div><div class='add'>+	bool                    nic_stopped;</div><div class='add'>+</div><div class='ctx'> 	/* Flag that indicates that we can start looking for FCoE L2 queue</div><div class='ctx'> 	 * completions in the default status block.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1849,7 +1850,15 @@ struct bnx2x {</div><div class='ctx'> 	bool accept_any_vlan;</div><div class='ctx'> </div><div class='ctx'> 	/* Vxlan/Geneve related information */</div><div class='del'>-	struct bnx2x_udp_tunnel udp_tunnel_ports[BNX2X_UDP_PORT_MAX];</div><div class='add'>+	u16 udp_tunnel_ports[BNX2X_UDP_PORT_MAX];</div><div class='add'>+</div><div class='add'>+#define FW_CAP_INVALIDATE_VF_FP_HSI	BIT(0)</div><div class='add'>+	u32 fw_cap;</div><div class='add'>+</div><div class='add'>+	u32 fw_major;</div><div class='add'>+	u32 fw_minor;</div><div class='add'>+	u32 fw_rev;</div><div class='add'>+	u32 fw_eng;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Tx queues may be less or equal to Rx queues */</div><div class='hunk'>@@ -1973,6 +1982,9 @@ struct bnx2x_func_init_params {</div><div class='ctx'> </div><div class='ctx'> #define skip_queue(bp, idx)	(NO_FCOE(bp) &amp;&amp; IS_FCOE_IDX(idx))</div><div class='ctx'> </div><div class='add'>+/*self test*/</div><div class='add'>+int bnx2x_idle_chk(struct bnx2x *bp);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_set_mac_one - configure a single MAC address</div><div class='ctx'>  *</div><div class='hunk'>@@ -1991,7 +2003,7 @@ struct bnx2x_func_init_params {</div><div class='ctx'>  * operation has been successfully scheduled and a negative - if a requested</div><div class='ctx'>  * operations has failed.</div><div class='ctx'>  */</div><div class='del'>-int bnx2x_set_mac_one(struct bnx2x *bp, u8 *mac,</div><div class='add'>+int bnx2x_set_mac_one(struct bnx2x *bp, const u8 *mac,</div><div class='ctx'> 		      struct bnx2x_vlan_mac_obj *obj, bool set,</div><div class='ctx'> 		      int mac_type, unsigned long *ramrod_flags);</div><div class='ctx'> </div><div class='hunk'>@@ -2404,7 +2416,6 @@ void bnx2x_igu_clear_sb_gen(struct bnx2x *bp, u8 func, u8 idu_sb_id,</div><div class='ctx'> #define ETH_MAX_RX_CLIENTS_E2		ETH_MAX_RX_CLIENTS_E1H</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define BNX2X_VPD_LEN			128</div><div class='ctx'> #define VENDOR_ID_LEN			4</div><div class='ctx'> </div><div class='ctx'> #define VF_ACQUIRE_THRESH		3</div><div class='hunk'>@@ -2424,13 +2435,6 @@ int bnx2x_compare_fw_ver(struct bnx2x *bp, u32 load_code, bool print_err);</div><div class='ctx'> #define HC_SEG_ACCESS_ATTN		4</div><div class='ctx'> #define HC_SEG_ACCESS_NORM		0   /*Driver decision 0-1*/</div><div class='ctx'> </div><div class='del'>-static const u32 dmae_reg_go_c[] = {</div><div class='del'>-	DMAE_REG_GO_C0, DMAE_REG_GO_C1, DMAE_REG_GO_C2, DMAE_REG_GO_C3,</div><div class='del'>-	DMAE_REG_GO_C4, DMAE_REG_GO_C5, DMAE_REG_GO_C6, DMAE_REG_GO_C7,</div><div class='del'>-	DMAE_REG_GO_C8, DMAE_REG_GO_C9, DMAE_REG_GO_C10, DMAE_REG_GO_C11,</div><div class='del'>-	DMAE_REG_GO_C12, DMAE_REG_GO_C13, DMAE_REG_GO_C14, DMAE_REG_GO_C15</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> void bnx2x_set_ethtool_ops(struct bnx2x *bp, struct net_device *netdev);</div><div class='ctx'> void bnx2x_notify_link_changed(struct bnx2x *bp);</div><div class='ctx'> </div><div class='hunk'>@@ -2530,5 +2534,4 @@ void bnx2x_register_phc(struct bnx2x *bp);</div><div class='ctx'>  * Meant for implicit re-load flows.</div><div class='ctx'>  */</div><div class='ctx'> int bnx2x_vlan_reconfigure_vid(struct bnx2x *bp);</div><div class='del'>-</div><div class='ctx'> #endif /* bnx2x.h */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c<br/>index 008ad0ca89ba..e59530357e2c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> #include &lt;net/ipv6.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='hunk'>@@ -43,8 +44,7 @@ static void bnx2x_add_all_napi_cnic(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	/* Add NAPI objects */</div><div class='ctx'> 	for_each_rx_queue_cnic(bp, i) {</div><div class='del'>-		netif_napi_add(bp-&gt;dev, &amp;bnx2x_fp(bp, i, napi),</div><div class='del'>-			       bnx2x_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(bp-&gt;dev, &amp;bnx2x_fp(bp, i, napi), bnx2x_poll);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -54,8 +54,7 @@ static void bnx2x_add_all_napi(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	/* Add NAPI objects */</div><div class='ctx'> 	for_each_eth_queue(bp, i) {</div><div class='del'>-		netif_napi_add(bp-&gt;dev, &amp;bnx2x_fp(bp, i, napi),</div><div class='del'>-			       bnx2x_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(bp-&gt;dev, &amp;bnx2x_fp(bp, i, napi), bnx2x_poll);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -148,10 +147,11 @@ void bnx2x_fill_fw_str(struct bnx2x *bp, char *buf, size_t buf_len)</div><div class='ctx'> </div><div class='ctx'> 		phy_fw_ver[0] = '\0';</div><div class='ctx'> 		bnx2x_get_ext_phy_fw_version(&amp;bp-&gt;link_params,</div><div class='del'>-					     phy_fw_ver, PHY_FW_VER_LEN);</div><div class='del'>-		strlcpy(buf, bp-&gt;fw_ver, buf_len);</div><div class='del'>-		snprintf(buf + strlen(bp-&gt;fw_ver), 32 - strlen(bp-&gt;fw_ver),</div><div class='del'>-			 "bc %d.%d.%d%s%s",</div><div class='add'>+					     phy_fw_ver, sizeof(phy_fw_ver));</div><div class='add'>+		/* This may become truncated. */</div><div class='add'>+		scnprintf(buf, buf_len,</div><div class='add'>+			 "%sbc %d.%d.%d%s%s",</div><div class='add'>+			 bp-&gt;fw_ver,</div><div class='ctx'> 			 (bp-&gt;common.bc_ver &amp; 0xff0000) &gt;&gt; 16,</div><div class='ctx'> 			 (bp-&gt;common.bc_ver &amp; 0xff00) &gt;&gt; 8,</div><div class='ctx'> 			 (bp-&gt;common.bc_ver &amp; 0xff),</div><div class='hunk'>@@ -285,6 +285,9 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata)</div><div class='ctx'> 	hw_cons = le16_to_cpu(*txdata-&gt;tx_cons_sb);</div><div class='ctx'> 	sw_cons = txdata-&gt;tx_pkt_cons;</div><div class='ctx'> </div><div class='add'>+	/* Ensure subsequent loads occur after hw_cons */</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='ctx'> 	while (sw_cons != hw_cons) {</div><div class='ctx'> 		u16 pkt_cons;</div><div class='ctx'> </div><div class='hunk'>@@ -501,6 +504,7 @@ static void bnx2x_tpa_start(struct bnx2x_fastpath *fp, u16 queue,</div><div class='ctx'>  * @len_on_bd:		total length of the first packet for the</div><div class='ctx'>  *			aggregation.</div><div class='ctx'>  * @pkt_len:		length of all segments</div><div class='add'>+ * @num_of_coalesced_segs: count of segments</div><div class='ctx'>  *</div><div class='ctx'>  * Approximate value of the MSS for this aggregation calculated using</div><div class='ctx'>  * the first packet of it.</div><div class='hunk'>@@ -669,6 +673,18 @@ static int bnx2x_fill_frag_skb(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *</div><div class='add'>+bnx2x_build_skb(const struct bnx2x_fastpath *fp, void *data)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (fp-&gt;rx_frag_size)</div><div class='add'>+		skb = build_skb(data, fp-&gt;rx_frag_size);</div><div class='add'>+	else</div><div class='add'>+		skb = slab_build_skb(data);</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnx2x_frag_free(const struct bnx2x_fastpath *fp, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	if (fp-&gt;rx_frag_size)</div><div class='hunk'>@@ -684,7 +700,7 @@ static void *bnx2x_frag_alloc(const struct bnx2x_fastpath *fp, gfp_t gfp_mask)</div><div class='ctx'> 		if (unlikely(gfpflags_allow_blocking(gfp_mask)))</div><div class='ctx'> 			return (void *)__get_free_page(gfp_mask);</div><div class='ctx'> </div><div class='del'>-		return netdev_alloc_frag(fp-&gt;rx_frag_size);</div><div class='add'>+		return napi_alloc_frag(fp-&gt;rx_frag_size);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return kmalloc(fp-&gt;rx_buf_size + NET_SKB_PAD, gfp_mask);</div><div class='hunk'>@@ -776,7 +792,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 			 fp-&gt;rx_buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> 	if (likely(new_data))</div><div class='del'>-		skb = build_skb(data, fp-&gt;rx_frag_size);</div><div class='add'>+		skb = bnx2x_build_skb(fp, data);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(skb)) {</div><div class='ctx'> #ifdef BNX2X_STOP_ON_ERROR</div><div class='hunk'>@@ -784,6 +800,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 			BNX2X_ERR("skb_put is about to fail...  pad %d  len %d  rx_buf_size %d\n",</div><div class='ctx'> 				  pad, len, fp-&gt;rx_buf_size);</div><div class='ctx'> 			bnx2x_panic();</div><div class='add'>+			bnx2x_frag_free(fp, new_data);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1042,7 +1059,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)</div><div class='ctx'> 						 dma_unmap_addr(rx_buf, mapping),</div><div class='ctx'> 						 fp-&gt;rx_buf_size,</div><div class='ctx'> 						 DMA_FROM_DEVICE);</div><div class='del'>-				skb = build_skb(data, fp-&gt;rx_frag_size);</div><div class='add'>+				skb = bnx2x_build_skb(fp, data);</div><div class='ctx'> 				if (unlikely(!skb)) {</div><div class='ctx'> 					bnx2x_frag_free(fp, data);</div><div class='ctx'> 					bnx2x_fp_qstats(bp, fp)-&gt;</div><div class='hunk'>@@ -1919,8 +1936,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 		/* Skip VLAN tag if present */</div><div class='ctx'> 		if (ether_type == ETH_P_8021Q) {</div><div class='del'>-			struct vlan_ethhdr *vhdr =</div><div class='del'>-				(struct vlan_ethhdr *)skb-&gt;data;</div><div class='add'>+			struct vlan_ethhdr *vhdr = skb_vlan_eth_hdr(skb);</div><div class='ctx'> </div><div class='ctx'> 			ether_type = ntohs(vhdr-&gt;h_vlan_encapsulated_proto);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1932,7 +1948,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* select a non-FCoE queue */</div><div class='ctx'> 	return netdev_pick_tx(dev, skb, NULL) %</div><div class='del'>-	       (BNX2X_NUM_ETH_QUEUES(bp) * bp-&gt;max_cos);</div><div class='add'>+			(BNX2X_NUM_ETH_QUEUES(bp) * bp-&gt;max_cos);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnx2x_set_num_queues(struct bnx2x *bp)</div><div class='hunk'>@@ -1955,6 +1971,7 @@ void bnx2x_set_num_queues(struct bnx2x *bp)</div><div class='ctx'>  * bnx2x_set_real_num_queues - configure netdev-&gt;real_num_[tx,rx]_queues</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		Driver handle</div><div class='add'>+ * @include_cnic: handle cnic case</div><div class='ctx'>  *</div><div class='ctx'>  * We currently support for at most 16 Tx queues for each CoS thus we will</div><div class='ctx'>  * allocate a multiple of 16 for ETH L2 rings according to the value of the</div><div class='hunk'>@@ -2358,26 +2375,30 @@ int bnx2x_compare_fw_ver(struct bnx2x *bp, u32 load_code, bool print_err)</div><div class='ctx'> 	/* is another pf loaded on this engine? */</div><div class='ctx'> 	if (load_code != FW_MSG_CODE_DRV_LOAD_COMMON_CHIP &amp;&amp;</div><div class='ctx'> 	    load_code != FW_MSG_CODE_DRV_LOAD_COMMON) {</div><div class='del'>-		/* build my FW version dword */</div><div class='del'>-		u32 my_fw = (BCM_5710_FW_MAJOR_VERSION) +</div><div class='del'>-			(BCM_5710_FW_MINOR_VERSION &lt;&lt; 8) +</div><div class='del'>-			(BCM_5710_FW_REVISION_VERSION &lt;&lt; 16) +</div><div class='del'>-			(BCM_5710_FW_ENGINEERING_VERSION &lt;&lt; 24);</div><div class='add'>+		u8 loaded_fw_major, loaded_fw_minor, loaded_fw_rev, loaded_fw_eng;</div><div class='add'>+		u32 loaded_fw;</div><div class='ctx'> </div><div class='ctx'> 		/* read loaded FW from chip */</div><div class='del'>-		u32 loaded_fw = REG_RD(bp, XSEM_REG_PRAM);</div><div class='add'>+		loaded_fw = REG_RD(bp, XSEM_REG_PRAM);</div><div class='add'>+</div><div class='add'>+		loaded_fw_major = loaded_fw &amp; 0xff;</div><div class='add'>+		loaded_fw_minor = (loaded_fw &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+		loaded_fw_rev = (loaded_fw &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		loaded_fw_eng = (loaded_fw &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-		DP(BNX2X_MSG_SP, "loaded fw %x, my fw %x\n",</div><div class='del'>-		   loaded_fw, my_fw);</div><div class='add'>+		DP(BNX2X_MSG_SP, "loaded fw 0x%x major 0x%x minor 0x%x rev 0x%x eng 0x%x\n",</div><div class='add'>+		   loaded_fw, loaded_fw_major, loaded_fw_minor, loaded_fw_rev, loaded_fw_eng);</div><div class='ctx'> </div><div class='ctx'> 		/* abort nic load if version mismatch */</div><div class='del'>-		if (my_fw != loaded_fw) {</div><div class='add'>+		if (loaded_fw_major != BCM_5710_FW_MAJOR_VERSION ||</div><div class='add'>+		    loaded_fw_minor != BCM_5710_FW_MINOR_VERSION ||</div><div class='add'>+		    loaded_fw_eng != BCM_5710_FW_ENGINEERING_VERSION ||</div><div class='add'>+		    loaded_fw_rev &lt; BCM_5710_FW_REVISION_VERSION_V15) {</div><div class='ctx'> 			if (print_err)</div><div class='del'>-				BNX2X_ERR("bnx2x with FW %x was already loaded which mismatches my %x FW. Aborting\n",</div><div class='del'>-					  loaded_fw, my_fw);</div><div class='add'>+				BNX2X_ERR("loaded FW incompatible. Aborting\n");</div><div class='ctx'> 			else</div><div class='del'>-				BNX2X_DEV_INFO("bnx2x with FW %x was already loaded which mismatches my %x FW, possibly due to MF UNDI\n",</div><div class='del'>-					       loaded_fw, my_fw);</div><div class='add'>+				BNX2X_DEV_INFO("loaded FW incompatible, possibly due to MF UNDI\n");</div><div class='add'>+</div><div class='ctx'> 			return -EBUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2664,7 +2685,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocated memory for FW statistics  */</div><div class='del'>-	if (bnx2x_alloc_fw_stats_mem(bp))</div><div class='add'>+	rc = bnx2x_alloc_fw_stats_mem(bp);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		LOAD_ERROR_EXIT(bp, load_error0);</div><div class='ctx'> </div><div class='ctx'> 	/* request pf to initialize status blocks */</div><div class='hunk'>@@ -2694,6 +2716,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)</div><div class='ctx'> 	bnx2x_add_all_napi(bp);</div><div class='ctx'> 	DP(NETIF_MSG_IFUP, "napi added\n");</div><div class='ctx'> 	bnx2x_napi_enable(bp);</div><div class='add'>+	bp-&gt;nic_stopped = false;</div><div class='ctx'> </div><div class='ctx'> 	if (IS_PF(bp)) {</div><div class='ctx'> 		/* set pf load just before approaching the MCP */</div><div class='hunk'>@@ -2939,6 +2962,7 @@ load_error2:</div><div class='ctx'> load_error1:</div><div class='ctx'> 	bnx2x_napi_disable(bp);</div><div class='ctx'> 	bnx2x_del_all_napi(bp);</div><div class='add'>+	bp-&gt;nic_stopped = true;</div><div class='ctx'> </div><div class='ctx'> 	/* clear pf_load status, as it was already set */</div><div class='ctx'> 	if (IS_PF(bp))</div><div class='hunk'>@@ -3035,7 +3059,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_mode = BNX2X_RX_MODE_NONE;</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	if (IS_PF(bp) &amp;&amp; !BP_NOMCP(bp)) {</div><div class='ctx'> 		/* Set ALWAYS_ALIVE bit in shmem */</div><div class='hunk'>@@ -3055,12 +3079,13 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)</div><div class='ctx'> 	/* if VF indicate to PF this function is going down (PF will delete sp</div><div class='ctx'> 	 * elements and clear initializations</div><div class='ctx'> 	 */</div><div class='del'>-	if (IS_VF(bp))</div><div class='add'>+	if (IS_VF(bp)) {</div><div class='add'>+		bnx2x_clear_vlan_info(bp);</div><div class='ctx'> 		bnx2x_vfpf_close_vf(bp);</div><div class='del'>-	else if (unload_mode != UNLOAD_RECOVERY)</div><div class='add'>+	} else if (unload_mode != UNLOAD_RECOVERY) {</div><div class='ctx'> 		/* if this is a normal/close unload need to clean up chip*/</div><div class='ctx'> 		bnx2x_chip_cleanup(bp, unload_mode, keep_link);</div><div class='del'>-	else {</div><div class='add'>+	} else {</div><div class='ctx'> 		/* Send the UNLOAD_REQUEST to the MCP */</div><div class='ctx'> 		bnx2x_send_unload_req(bp, unload_mode);</div><div class='ctx'> </div><div class='hunk'>@@ -3073,14 +3098,17 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)</div><div class='ctx'> 		if (!CHIP_IS_E1x(bp))</div><div class='ctx'> 			bnx2x_pf_disable(bp);</div><div class='ctx'> </div><div class='del'>-		/* Disable HW interrupts, NAPI */</div><div class='del'>-		bnx2x_netif_stop(bp, 1);</div><div class='del'>-		/* Delete all NAPI objects */</div><div class='del'>-		bnx2x_del_all_napi(bp);</div><div class='del'>-		if (CNIC_LOADED(bp))</div><div class='del'>-			bnx2x_del_all_napi_cnic(bp);</div><div class='del'>-		/* Release IRQs */</div><div class='del'>-		bnx2x_free_irq(bp);</div><div class='add'>+		if (!bp-&gt;nic_stopped) {</div><div class='add'>+			/* Disable HW interrupts, NAPI */</div><div class='add'>+			bnx2x_netif_stop(bp, 1);</div><div class='add'>+			/* Delete all NAPI objects */</div><div class='add'>+			bnx2x_del_all_napi(bp);</div><div class='add'>+			if (CNIC_LOADED(bp))</div><div class='add'>+				bnx2x_del_all_napi_cnic(bp);</div><div class='add'>+			/* Release IRQs */</div><div class='add'>+			bnx2x_free_irq(bp);</div><div class='add'>+			bp-&gt;nic_stopped = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Report UNLOAD_DONE to MCP */</div><div class='ctx'> 		bnx2x_send_unload_done(bp, false);</div><div class='hunk'>@@ -3409,12 +3437,9 @@ static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 			/* Headers length */</div><div class='ctx'> 			if (xmit_type &amp; XMIT_GSO_ENC)</div><div class='del'>-				hlen = (int)(skb_inner_transport_header(skb) -</div><div class='del'>-					     skb-&gt;data) +</div><div class='del'>-					     inner_tcp_hdrlen(skb);</div><div class='add'>+				hlen = skb_inner_tcp_all_headers(skb);</div><div class='ctx'> 			else</div><div class='del'>-				hlen = (int)(skb_transport_header(skb) -</div><div class='del'>-					     skb-&gt;data) + tcp_hdrlen(skb);</div><div class='add'>+				hlen = skb_tcp_all_headers(skb);</div><div class='ctx'> </div><div class='ctx'> 			/* Amount of data (w/o headers) on linear part of SKB*/</div><div class='ctx'> 			first_bd_sz = skb_headlen(skb) - hlen;</div><div class='hunk'>@@ -3513,7 +3538,7 @@ static u8 bnx2x_set_pbd_csum_enc(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 				 u32 *parsing_data, u32 xmit_type)</div><div class='ctx'> {</div><div class='ctx'> 	*parsing_data |=</div><div class='del'>-		((((u8 *)skb_inner_transport_header(skb) - skb-&gt;data) &gt;&gt; 1) &lt;&lt;</div><div class='add'>+		((skb_inner_transport_offset(skb) &gt;&gt; 1) &lt;&lt;</div><div class='ctx'> 		ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W_SHIFT) &amp;</div><div class='ctx'> 		ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W;</div><div class='ctx'> </div><div class='hunk'>@@ -3522,15 +3547,13 @@ static u8 bnx2x_set_pbd_csum_enc(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 			ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT) &amp;</div><div class='ctx'> 			ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW;</div><div class='ctx'> </div><div class='del'>-		return skb_inner_transport_header(skb) +</div><div class='del'>-			inner_tcp_hdrlen(skb) - skb-&gt;data;</div><div class='add'>+		return skb_inner_tcp_all_headers(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* We support checksum offload for TCP and UDP only.</div><div class='ctx'> 	 * No need to pass the UDP header length - it's a constant.</div><div class='ctx'> 	 */</div><div class='del'>-	return skb_inner_transport_header(skb) +</div><div class='del'>-		sizeof(struct udphdr) - skb-&gt;data;</div><div class='add'>+	return skb_inner_transport_offset(skb) + sizeof(struct udphdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3547,7 +3570,7 @@ static u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 				u32 *parsing_data, u32 xmit_type)</div><div class='ctx'> {</div><div class='ctx'> 	*parsing_data |=</div><div class='del'>-		((((u8 *)skb_transport_header(skb) - skb-&gt;data) &gt;&gt; 1) &lt;&lt;</div><div class='add'>+		((skb_transport_offset(skb) &gt;&gt; 1) &lt;&lt;</div><div class='ctx'> 		ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W_SHIFT) &amp;</div><div class='ctx'> 		ETH_TX_PARSE_BD_E2_L4_HDR_START_OFFSET_W;</div><div class='ctx'> </div><div class='hunk'>@@ -3556,12 +3579,12 @@ static u8 bnx2x_set_pbd_csum_e2(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 			ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW_SHIFT) &amp;</div><div class='ctx'> 			ETH_TX_PARSE_BD_E2_TCP_HDR_LENGTH_DW;</div><div class='ctx'> </div><div class='del'>-		return skb_transport_header(skb) + tcp_hdrlen(skb) - skb-&gt;data;</div><div class='add'>+		return skb_tcp_all_headers(skb);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* We support checksum offload for TCP and UDP only.</div><div class='ctx'> 	 * No need to pass the UDP header length - it's a constant.</div><div class='ctx'> 	 */</div><div class='del'>-	return skb_transport_header(skb) + sizeof(struct udphdr) - skb-&gt;data;</div><div class='add'>+	return skb_transport_offset(skb) + sizeof(struct udphdr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* set FW indication according to inner or outer protocols if tunneled */</div><div class='hunk'>@@ -3590,7 +3613,7 @@ static u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 			     struct eth_tx_parse_bd_e1x *pbd,</div><div class='ctx'> 			     u32 xmit_type)</div><div class='ctx'> {</div><div class='del'>-	u8 hlen = (skb_network_header(skb) - skb-&gt;data) &gt;&gt; 1;</div><div class='add'>+	u8 hlen = skb_network_offset(skb) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	/* for now NS flag is not used in Linux */</div><div class='ctx'> 	pbd-&gt;global_data =</div><div class='hunk'>@@ -3598,8 +3621,7 @@ static u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb,</div><div class='ctx'> 			    ((skb-&gt;protocol == cpu_to_be16(ETH_P_8021Q)) &lt;&lt;</div><div class='ctx'> 			     ETH_TX_PARSE_BD_E1X_LLC_SNAP_EN_SHIFT));</div><div class='ctx'> </div><div class='del'>-	pbd-&gt;ip_hlen_w = (skb_transport_header(skb) -</div><div class='del'>-			skb_network_header(skb)) &gt;&gt; 1;</div><div class='add'>+	pbd-&gt;ip_hlen_w = skb_network_header_len(skb) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	hlen += pbd-&gt;ip_hlen_w;</div><div class='ctx'> </div><div class='hunk'>@@ -3644,8 +3666,7 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,</div><div class='ctx'> 	u8 outerip_off, outerip_len = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* from outer IP to transport */</div><div class='del'>-	hlen_w = (skb_inner_transport_header(skb) -</div><div class='del'>-		  skb_network_header(skb)) &gt;&gt; 1;</div><div class='add'>+	hlen_w = skb_inner_transport_offset(skb) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	/* transport len */</div><div class='ctx'> 	hlen_w += inner_tcp_hdrlen(skb) &gt;&gt; 1;</div><div class='hunk'>@@ -3691,7 +3712,7 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,</div><div class='ctx'> 					0, IPPROTO_TCP, 0));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	outerip_off = (skb_network_header(skb) - skb-&gt;data) &gt;&gt; 1;</div><div class='add'>+	outerip_off = (skb_network_offset(skb)) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	*global_data |=</div><div class='ctx'> 		outerip_off |</div><div class='hunk'>@@ -3857,9 +3878,12 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)) {</div><div class='ctx'> 		if (!(bp-&gt;flags &amp; TX_TIMESTAMPING_EN)) {</div><div class='add'>+			bp-&gt;eth_stats.ptp_skip_tx_ts++;</div><div class='ctx'> 			BNX2X_ERR("Tx timestamping was not enabled, this packet will not be timestamped\n");</div><div class='ctx'> 		} else if (bp-&gt;ptp_tx_skb) {</div><div class='del'>-			BNX2X_ERR("The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n");</div><div class='add'>+			bp-&gt;eth_stats.ptp_skip_tx_ts++;</div><div class='add'>+			netdev_err_once(bp-&gt;dev,</div><div class='add'>+					"Device supports only a single outstanding packet to timestamp, this packet won't be timestamped\n");</div><div class='ctx'> 		} else {</div><div class='ctx'> 			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='ctx'> 			/* schedule check for Tx timestamp */</div><div class='hunk'>@@ -4222,8 +4246,8 @@ void bnx2x_get_c2s_mapping(struct bnx2x *bp, u8 *c2s_map, u8 *c2s_default)</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_setup_tc - routine to configure net_device for multi tc</div><div class='ctx'>  *</div><div class='del'>- * @netdev: net device to configure</div><div class='del'>- * @tc: number of traffic classes to enable</div><div class='add'>+ * @dev: net device to configure</div><div class='add'>+ * @num_tc: number of traffic classes to enable</div><div class='ctx'>  *</div><div class='ctx'>  * callback connected to the ndo_setup_tc function pointer</div><div class='ctx'>  */</div><div class='hunk'>@@ -4326,7 +4350,7 @@ int bnx2x_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		rc = bnx2x_set_eth_mac(bp, true);</div><div class='hunk'>@@ -4878,7 +4902,7 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	 * because the actual alloc size is</div><div class='ctx'> 	 * only updated as part of load</div><div class='ctx'> 	 */</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (!bnx2x_mtu_allows_gro(new_mtu))</div><div class='ctx'> 		dev-&gt;features &amp;= ~NETIF_F_GRO_HW;</div><div class='hunk'>@@ -4963,7 +4987,7 @@ int bnx2x_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bnx2x_tx_timeout(struct net_device *dev)</div><div class='add'>+void bnx2x_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -4981,8 +5005,9 @@ void bnx2x_tx_timeout(struct net_device *dev)</div><div class='ctx'> 	bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_TX_TIMEOUT, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused bnx2x_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnx2x *bp;</div><div class='ctx'> </div><div class='hunk'>@@ -4994,8 +5019,6 @@ int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-</div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -5005,15 +5028,14 @@ int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_nic_unload(bp, UNLOAD_CLOSE, false);</div><div class='ctx'> </div><div class='del'>-	bnx2x_set_power_state(bp, pci_choose_state(pdev, state));</div><div class='del'>-</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnx2x_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused bnx2x_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnx2x *bp;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -5031,14 +5053,11 @@ int bnx2x_resume(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnx2x_set_power_state(bp, PCI_D0);</div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='ctx'> 	rc = bnx2x_nic_load(bp, LOAD_OPEN);</div><div class='hunk'>@@ -5048,6 +5067,8 @@ int bnx2x_resume(struct pci_dev *pdev)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+SIMPLE_DEV_PM_OPS(bnx2x_pm_ops, bnx2x_suspend, bnx2x_resume);</div><div class='add'>+</div><div class='ctx'> void bnx2x_set_ctx_validation(struct bnx2x *bp, struct eth_context *cxt,</div><div class='ctx'> 			      u32 cid)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h<br/>index c2f6e44e9a3f..0bc1367fd649 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h</a></div><div class='hunk'>@@ -425,6 +425,8 @@ void bnx2x_set_reset_global(struct bnx2x *bp);</div><div class='ctx'> void bnx2x_disable_close_the_gate(struct bnx2x *bp);</div><div class='ctx'> int bnx2x_init_hw_func_cnic(struct bnx2x *bp);</div><div class='ctx'> </div><div class='add'>+void bnx2x_clear_vlan_info(struct bnx2x *bp);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_sp_event - handle ramrods completion.</div><div class='ctx'>  *</div><div class='hunk'>@@ -539,9 +541,7 @@ int bnx2x_change_mac_addr(struct net_device *dev, void *p);</div><div class='ctx'> /* NAPI poll Tx part */</div><div class='ctx'> int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata);</div><div class='ctx'> </div><div class='del'>-/* suspend/resume callbacks */</div><div class='del'>-int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state);</div><div class='del'>-int bnx2x_resume(struct pci_dev *pdev);</div><div class='add'>+extern const struct dev_pm_ops bnx2x_pm_ops;</div><div class='ctx'> </div><div class='ctx'> /* Release IRQ vectors */</div><div class='ctx'> void bnx2x_free_irq(struct bnx2x *bp);</div><div class='hunk'>@@ -615,7 +615,7 @@ int bnx2x_set_features(struct net_device *dev, netdev_features_t features);</div><div class='ctx'>  *</div><div class='ctx'>  * @dev:	net device</div><div class='ctx'>  */</div><div class='del'>-void bnx2x_tx_timeout(struct net_device *dev);</div><div class='add'>+void bnx2x_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> </div><div class='ctx'> /** bnx2x_get_c2s_mapping - read inner-to-outer vlan configuration</div><div class='ctx'>  * c2s_map should have BNX2X_MAX_PRIORITY entries.</div><div class='hunk'>@@ -825,9 +825,9 @@ static inline void bnx2x_del_all_napi_cnic(struct bnx2x *bp)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_rx_queue_cnic(bp, i) {</div><div class='del'>-		napi_hash_del(&amp;bnx2x_fp(bp, i, napi));</div><div class='del'>-		netif_napi_del(&amp;bnx2x_fp(bp, i, napi));</div><div class='add'>+		__netif_napi_del(&amp;bnx2x_fp(bp, i, napi));</div><div class='ctx'> 	}</div><div class='add'>+	synchronize_net();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void bnx2x_del_all_napi(struct bnx2x *bp)</div><div class='hunk'>@@ -835,9 +835,9 @@ static inline void bnx2x_del_all_napi(struct bnx2x *bp)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for_each_eth_queue(bp, i) {</div><div class='del'>-		napi_hash_del(&amp;bnx2x_fp(bp, i, napi));</div><div class='del'>-		netif_napi_del(&amp;bnx2x_fp(bp, i, napi));</div><div class='add'>+		__netif_napi_del(&amp;bnx2x_fp(bp, i, napi));</div><div class='ctx'> 	}</div><div class='add'>+	synchronize_net();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnx2x_set_int_mode(struct bnx2x *bp);</div><div class='hunk'>@@ -960,12 +960,12 @@ static inline int bnx2x_func_start(struct bnx2x *bp)</div><div class='ctx'> 		start_params-&gt;network_cos_mode = STATIC_COS;</div><div class='ctx'> 	else /* CHIP_IS_E1X */</div><div class='ctx'> 		start_params-&gt;network_cos_mode = FW_WRR;</div><div class='del'>-	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN].count) {</div><div class='del'>-		port = bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN].dst_port;</div><div class='add'>+	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN]) {</div><div class='add'>+		port = bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN];</div><div class='ctx'> 		start_params-&gt;vxlan_dst_port = port;</div><div class='ctx'> 	}</div><div class='del'>-	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE].count) {</div><div class='del'>-		port = bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE].dst_port;</div><div class='add'>+	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE]) {</div><div class='add'>+		port = bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE];</div><div class='ctx'> 		start_params-&gt;geneve_dst_port = port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1002,9 +1002,6 @@ static inline void bnx2x_set_fw_mac_addr(__le16 *fw_hi, __le16 *fw_mid,</div><div class='ctx'> static inline void bnx2x_free_rx_mem_pool(struct bnx2x *bp,</div><div class='ctx'> 					  struct bnx2x_alloc_pool *pool)</div><div class='ctx'> {</div><div class='del'>-	if (!pool-&gt;page)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	put_page(pool-&gt;page);</div><div class='ctx'> </div><div class='ctx'> 	pool-&gt;page = NULL;</div><div class='hunk'>@@ -1015,6 +1012,9 @@ static inline void bnx2x_free_rx_sge_range(struct bnx2x *bp,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!fp-&gt;page_pool.page)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	if (fp-&gt;mode == TPA_MODE_DISABLED)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -1107,7 +1107,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)</div><div class='ctx'> 		for (i = 0; i &lt; E1H_FUNC_MAX / 2; i++) {</div><div class='ctx'> 			u32 func_config =</div><div class='ctx'> 				MF_CFG_RD(bp,</div><div class='del'>-					  func_mf_config[BP_PORT(bp) + 2 * i].</div><div class='add'>+					  func_mf_config[BP_PATH(bp) + 2 * i].</div><div class='ctx'> 					  config);</div><div class='ctx'> 			func_num +=</div><div class='ctx'> 				((func_config &amp; FUNC_MF_CFG_FUNC_HIDE) ? 0 : 1);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c<br/>index 2c6ba046d2a8..9af81630c8a4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c</a></div><div class='hunk'>@@ -344,7 +344,7 @@ static void  bnx2x_dcbx_get_pfc_feature(struct bnx2x *bp,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* maps unmapped priorities to to the same COS as L2 */</div><div class='add'>+/* maps unmapped priorities to the same COS as L2 */</div><div class='ctx'> static void bnx2x_dcbx_map_nw(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1145,7 +1145,7 @@ static void bnx2x_dcbx_get_num_pg_traf_type(struct bnx2x *bp,</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='del'>-			if (false == pg_found) {</div><div class='add'>+			if (!pg_found) {</div><div class='ctx'> 				data[help_data-&gt;num_of_pg].pg = add_pg;</div><div class='ctx'> 				data[help_data-&gt;num_of_pg].pg_priority =</div><div class='ctx'> 						(1 &lt;&lt; ttp[add_traf_type]);</div><div class='hunk'>@@ -1155,7 +1155,7 @@ static void bnx2x_dcbx_get_num_pg_traf_type(struct bnx2x *bp,</div><div class='ctx'> 		}</div><div class='ctx'> 		DP(BNX2X_MSG_DCB,</div><div class='ctx'> 		   "add_traf_type %d pg_found %s num_of_pg %d\n",</div><div class='del'>-		   add_traf_type, (false == pg_found) ? "NO" : "YES",</div><div class='add'>+		   add_traf_type, !pg_found ? "NO" : "YES",</div><div class='ctx'> 		   help_data-&gt;num_of_pg);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -1544,8 +1544,7 @@ static void bnx2x_dcbx_2cos_limit_cee_three_pg_to_cos_params(</div><div class='ctx'> 			if (pg_entry &lt; DCBX_MAX_NUM_PG_BW_ENTRIES) {</div><div class='ctx'> 				entry = 0;</div><div class='ctx'> </div><div class='del'>-				if (i == (num_of_pri-1) &amp;&amp;</div><div class='del'>-				    false == b_found_strict)</div><div class='add'>+				if (i == (num_of_pri-1) &amp;&amp; !b_found_strict)</div><div class='ctx'> 					/* last entry will be handled separately</div><div class='ctx'> 					 * If no priority is strict than last</div><div class='ctx'> 					 * entry goes to last queue.</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c<br/>index 0745cccd416d..3d853eeb976f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c</a></div><div class='hunk'>@@ -39,34 +39,34 @@ static const struct {</div><div class='ctx'> 	int size;</div><div class='ctx'> 	char string[ETH_GSTRING_LEN];</div><div class='ctx'> } bnx2x_q_stats_arr[] = {</div><div class='del'>-/* 1 */	{ Q_STATS_OFFSET32(total_bytes_received_hi), 8, "[%s]: rx_bytes" },</div><div class='add'>+/* 1 */	{ Q_STATS_OFFSET32(total_bytes_received_hi), 8, "[%d]: rx_bytes" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_unicast_packets_received_hi),</div><div class='del'>-						8, "[%s]: rx_ucast_packets" },</div><div class='add'>+						8, "[%d]: rx_ucast_packets" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_multicast_packets_received_hi),</div><div class='del'>-						8, "[%s]: rx_mcast_packets" },</div><div class='add'>+						8, "[%d]: rx_mcast_packets" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_broadcast_packets_received_hi),</div><div class='del'>-						8, "[%s]: rx_bcast_packets" },</div><div class='del'>-	{ Q_STATS_OFFSET32(no_buff_discard_hi),	8, "[%s]: rx_discards" },</div><div class='add'>+						8, "[%d]: rx_bcast_packets" },</div><div class='add'>+	{ Q_STATS_OFFSET32(no_buff_discard_hi),	8, "[%d]: rx_discards" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(rx_err_discard_pkt),</div><div class='del'>-					 4, "[%s]: rx_phy_ip_err_discards"},</div><div class='add'>+					 4, "[%d]: rx_phy_ip_err_discards"},</div><div class='ctx'> 	{ Q_STATS_OFFSET32(rx_skb_alloc_failed),</div><div class='del'>-					 4, "[%s]: rx_skb_alloc_discard" },</div><div class='del'>-	{ Q_STATS_OFFSET32(hw_csum_err), 4, "[%s]: rx_csum_offload_errors" },</div><div class='del'>-	{ Q_STATS_OFFSET32(driver_xoff), 4, "[%s]: tx_exhaustion_events" },</div><div class='del'>-	{ Q_STATS_OFFSET32(total_bytes_transmitted_hi),	8, "[%s]: tx_bytes" },</div><div class='add'>+					 4, "[%d]: rx_skb_alloc_discard" },</div><div class='add'>+	{ Q_STATS_OFFSET32(hw_csum_err), 4, "[%d]: rx_csum_offload_errors" },</div><div class='add'>+	{ Q_STATS_OFFSET32(driver_xoff), 4, "[%d]: tx_exhaustion_events" },</div><div class='add'>+	{ Q_STATS_OFFSET32(total_bytes_transmitted_hi),	8, "[%d]: tx_bytes" },</div><div class='ctx'> /* 10 */{ Q_STATS_OFFSET32(total_unicast_packets_transmitted_hi),</div><div class='del'>-						8, "[%s]: tx_ucast_packets" },</div><div class='add'>+						8, "[%d]: tx_ucast_packets" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_multicast_packets_transmitted_hi),</div><div class='del'>-						8, "[%s]: tx_mcast_packets" },</div><div class='add'>+						8, "[%d]: tx_mcast_packets" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_broadcast_packets_transmitted_hi),</div><div class='del'>-						8, "[%s]: tx_bcast_packets" },</div><div class='add'>+						8, "[%d]: tx_bcast_packets" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_tpa_aggregations_hi),</div><div class='del'>-						8, "[%s]: tpa_aggregations" },</div><div class='add'>+						8, "[%d]: tpa_aggregations" },</div><div class='ctx'> 	{ Q_STATS_OFFSET32(total_tpa_aggregated_frames_hi),</div><div class='del'>-					8, "[%s]: tpa_aggregated_frames"},</div><div class='del'>-	{ Q_STATS_OFFSET32(total_tpa_bytes_hi),	8, "[%s]: tpa_bytes"},</div><div class='add'>+					8, "[%d]: tpa_aggregated_frames"},</div><div class='add'>+	{ Q_STATS_OFFSET32(total_tpa_bytes_hi),	8, "[%d]: tpa_bytes"},</div><div class='ctx'> 	{ Q_STATS_OFFSET32(driver_filtered_tx_pkt),</div><div class='del'>-					4, "[%s]: driver_filtered_tx_pkt" }</div><div class='add'>+					4, "[%d]: driver_filtered_tx_pkt" }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BNX2X_NUM_Q_STATS ARRAY_SIZE(bnx2x_q_stats_arr)</div><div class='hunk'>@@ -182,7 +182,9 @@ static const struct {</div><div class='ctx'> 	{ STATS_OFFSET32(driver_filtered_tx_pkt),</div><div class='ctx'> 				4, false, "driver_filtered_tx_pkt" },</div><div class='ctx'> 	{ STATS_OFFSET32(eee_tx_lpi),</div><div class='del'>-				4, true, "Tx LPI entry count"}</div><div class='add'>+				4, true, "Tx LPI entry count"},</div><div class='add'>+	{ STATS_OFFSET32(ptp_skip_tx_ts),</div><div class='add'>+				4, false, "ptp_skipped_tx_tstamp" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BNX2X_NUM_STATS		ARRAY_SIZE(bnx2x_stats_arr)</div><div class='hunk'>@@ -837,8 +839,9 @@ static bool bnx2x_is_wreg_in_chip(struct bnx2x *bp,</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_read_pages_regs - read "paged" registers</div><div class='ctx'>  *</div><div class='del'>- * @bp		device handle</div><div class='del'>- * @p		output buffer</div><div class='add'>+ * @bp:		device handle</div><div class='add'>+ * @p:		output buffer</div><div class='add'>+ * @preset:	the preset value</div><div class='ctx'>  *</div><div class='ctx'>  * Reads "paged" memories: memories that may only be read by first writing to a</div><div class='ctx'>  * specific address ("write address") and then reading from a specific address</div><div class='hunk'>@@ -1109,14 +1112,7 @@ static void bnx2x_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	int ext_dev_info_offset;</div><div class='ctx'> 	u32 mbi;</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='del'>-</div><div class='del'>-	memset(version, 0, sizeof(version));</div><div class='del'>-	snprintf(version, ETHTOOL_FWVERS_LEN, " storm %d.%d.%d.%d",</div><div class='del'>-		 BCM_5710_FW_MAJOR_VERSION, BCM_5710_FW_MINOR_VERSION,</div><div class='del'>-		 BCM_5710_FW_REVISION_VERSION, BCM_5710_FW_ENGINEERING_VERSION);</div><div class='del'>-	strlcat(info-&gt;version, version, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> </div><div class='ctx'> 	if (SHMEM2_HAS(bp, extended_dev_info_shared_addr)) {</div><div class='ctx'> 		ext_dev_info_offset = SHMEM2_RD(bp,</div><div class='hunk'>@@ -1130,16 +1126,16 @@ static void bnx2x_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				 (mbi &amp; 0xff000000) &gt;&gt; 24,</div><div class='ctx'> 				 (mbi &amp; 0x00ff0000) &gt;&gt; 16,</div><div class='ctx'> 				 (mbi &amp; 0x0000ff00) &gt;&gt; 8);</div><div class='del'>-			strlcpy(info-&gt;fw_version, version,</div><div class='add'>+			strscpy(info-&gt;fw_version, version,</div><div class='ctx'> 				sizeof(info-&gt;fw_version));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	memset(version, 0, sizeof(version));</div><div class='del'>-	bnx2x_fill_fw_str(bp, version, ETHTOOL_FWVERS_LEN);</div><div class='add'>+	bnx2x_fill_fw_str(bp, version, sizeof(version));</div><div class='ctx'> 	strlcat(info-&gt;fw_version, version, sizeof(info-&gt;fw_version));</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='hunk'>@@ -1247,9 +1243,9 @@ static int bnx2x_get_eeprom_len(struct net_device *dev)</div><div class='ctx'>  * pf B succeeds in taking the same lock since they are from the same port.</div><div class='ctx'>  * pf A takes the per pf misc lock. Performs eeprom access.</div><div class='ctx'>  * pf A finishes. Unlocks the per pf misc lock.</div><div class='del'>- * Pf B takes the lock and proceeds to perform it's own access.</div><div class='add'>+ * Pf B takes the lock and proceeds to perform its own access.</div><div class='ctx'>  * pf A unlocks the per port lock, while pf B is still working (!).</div><div class='del'>- * mcp takes the per port lock and corrupts pf B's access (and/or has it's own</div><div class='add'>+ * mcp takes the per port lock and corrupts pf B's access (and/or has its own</div><div class='ctx'>  * access corrupted by pf B)</div><div class='ctx'>  */</div><div class='ctx'> static int bnx2x_acquire_nvram_lock(struct bnx2x *bp)</div><div class='hunk'>@@ -1609,7 +1605,8 @@ static int bnx2x_get_module_info(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!sff8472_comp ||</div><div class='del'>-	    (diag_type &amp; SFP_EEPROM_DIAG_ADDR_CHANGE_REQ)) {</div><div class='add'>+	    (diag_type &amp; SFP_EEPROM_DIAG_ADDR_CHANGE_REQ) ||</div><div class='add'>+	    !(diag_type &amp; SFP_EEPROM_DDM_IMPLEMENTED)) {</div><div class='ctx'> 		modinfo-&gt;type = ETH_MODULE_SFF_8079;</div><div class='ctx'> 		modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8079_LEN;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1881,7 +1878,9 @@ static int bnx2x_set_eeprom(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_get_coalesce(struct net_device *dev,</div><div class='del'>-			      struct ethtool_coalesce *coal)</div><div class='add'>+			      struct ethtool_coalesce *coal,</div><div class='add'>+			      struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1894,7 +1893,9 @@ static int bnx2x_get_coalesce(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_set_coalesce(struct net_device *dev,</div><div class='del'>-			      struct ethtool_coalesce *coal)</div><div class='add'>+			      struct ethtool_coalesce *coal,</div><div class='add'>+			      struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1913,7 +1914,9 @@ static int bnx2x_set_coalesce(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_get_ringparam(struct net_device *dev,</div><div class='del'>-				struct ethtool_ringparam *ering)</div><div class='add'>+				struct ethtool_ringparam *ering,</div><div class='add'>+				struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1937,7 +1940,9 @@ static void bnx2x_get_ringparam(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_set_ringparam(struct net_device *dev,</div><div class='del'>-			       struct ethtool_ringparam *ering)</div><div class='add'>+			       struct ethtool_ringparam *ering,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2076,34 +2081,31 @@ static const char bnx2x_private_arr[BNX2X_PRI_FLAG_LEN][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"Storage only interface"</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 bnx2x_eee_to_adv(u32 eee_adv)</div><div class='add'>+static void bnx2x_eee_to_linkmode(unsigned long *mode, u32 eee_adv)</div><div class='ctx'> {</div><div class='del'>-	u32 modes = 0;</div><div class='del'>-</div><div class='ctx'> 	if (eee_adv &amp; SHMEM_EEE_100M_ADV)</div><div class='del'>-		modes |= ADVERTISED_100baseT_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mode);</div><div class='ctx'> 	if (eee_adv &amp; SHMEM_EEE_1G_ADV)</div><div class='del'>-		modes |= ADVERTISED_1000baseT_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, mode);</div><div class='ctx'> 	if (eee_adv &amp; SHMEM_EEE_10G_ADV)</div><div class='del'>-		modes |= ADVERTISED_10000baseT_Full;</div><div class='del'>-</div><div class='del'>-	return modes;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, mode);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bnx2x_adv_to_eee(u32 modes, u32 shift)</div><div class='add'>+static u32 bnx2x_linkmode_to_eee(const unsigned long *mode, u32 shift)</div><div class='ctx'> {</div><div class='ctx'> 	u32 eee_adv = 0;</div><div class='del'>-	if (modes &amp; ADVERTISED_100baseT_Full)</div><div class='add'>+</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mode))</div><div class='ctx'> 		eee_adv |= SHMEM_EEE_100M_ADV;</div><div class='del'>-	if (modes &amp; ADVERTISED_1000baseT_Full)</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, mode))</div><div class='ctx'> 		eee_adv |= SHMEM_EEE_1G_ADV;</div><div class='del'>-	if (modes &amp; ADVERTISED_10000baseT_Full)</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, mode))</div><div class='ctx'> 		eee_adv |= SHMEM_EEE_10G_ADV;</div><div class='ctx'> </div><div class='ctx'> 	return eee_adv &lt;&lt; shift;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='add'>+static int bnx2x_get_eee(struct net_device *dev, struct ethtool_keee *edata)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	u32 eee_cfg;</div><div class='hunk'>@@ -2115,16 +2117,17 @@ static int bnx2x_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> </div><div class='ctx'> 	eee_cfg = bp-&gt;link_vars.eee_status;</div><div class='ctx'> </div><div class='del'>-	edata-&gt;supported =</div><div class='del'>-		bnx2x_eee_to_adv((eee_cfg &amp; SHMEM_EEE_SUPPORTED_MASK) &gt;&gt;</div><div class='del'>-				 SHMEM_EEE_SUPPORTED_SHIFT);</div><div class='add'>+	bnx2x_eee_to_linkmode(edata-&gt;supported,</div><div class='add'>+			      (eee_cfg &amp; SHMEM_EEE_SUPPORTED_MASK) &gt;&gt;</div><div class='add'>+			      SHMEM_EEE_SUPPORTED_SHIFT);</div><div class='add'>+</div><div class='add'>+	bnx2x_eee_to_linkmode(edata-&gt;advertised,</div><div class='add'>+			      (eee_cfg &amp; SHMEM_EEE_ADV_STATUS_MASK) &gt;&gt;</div><div class='add'>+			      SHMEM_EEE_ADV_STATUS_SHIFT);</div><div class='ctx'> </div><div class='del'>-	edata-&gt;advertised =</div><div class='del'>-		bnx2x_eee_to_adv((eee_cfg &amp; SHMEM_EEE_ADV_STATUS_MASK) &gt;&gt;</div><div class='del'>-				 SHMEM_EEE_ADV_STATUS_SHIFT);</div><div class='del'>-	edata-&gt;lp_advertised =</div><div class='del'>-		bnx2x_eee_to_adv((eee_cfg &amp; SHMEM_EEE_LP_ADV_STATUS_MASK) &gt;&gt;</div><div class='del'>-				 SHMEM_EEE_LP_ADV_STATUS_SHIFT);</div><div class='add'>+	bnx2x_eee_to_linkmode(edata-&gt;lp_advertised,</div><div class='add'>+			      (eee_cfg &amp; SHMEM_EEE_LP_ADV_STATUS_MASK) &gt;&gt;</div><div class='add'>+			      SHMEM_EEE_LP_ADV_STATUS_SHIFT);</div><div class='ctx'> </div><div class='ctx'> 	/* SHMEM value is in 16u units --&gt; Convert to 1u units. */</div><div class='ctx'> 	edata-&gt;tx_lpi_timer = (eee_cfg &amp; SHMEM_EEE_TIMER_MASK) &lt;&lt; 4;</div><div class='hunk'>@@ -2136,7 +2139,7 @@ static int bnx2x_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='add'>+static int bnx2x_set_eee(struct net_device *dev, struct ethtool_keee *edata)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	u32 eee_cfg;</div><div class='hunk'>@@ -2157,8 +2160,8 @@ static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	advertised = bnx2x_adv_to_eee(edata-&gt;advertised,</div><div class='del'>-				      SHMEM_EEE_ADV_STATUS_SHIFT);</div><div class='add'>+	advertised = bnx2x_linkmode_to_eee(edata-&gt;advertised,</div><div class='add'>+					   SHMEM_EEE_ADV_STATUS_SHIFT);</div><div class='ctx'> 	if ((advertised != (eee_cfg &amp; SHMEM_EEE_ADV_STATUS_MASK))) {</div><div class='ctx'> 		DP(BNX2X_MSG_ETHTOOL,</div><div class='ctx'> 		   "Direct manipulation of EEE advertisement is not supported\n");</div><div class='hunk'>@@ -3181,49 +3184,43 @@ static u32 bnx2x_get_private_flags(struct net_device *dev)</div><div class='ctx'> static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='del'>-	int i, j, k, start;</div><div class='del'>-	char queue_name[MAX_QUEUE_NAME_LEN+1];</div><div class='add'>+	const char *str;</div><div class='add'>+	int i, j, start;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		k = 0;</div><div class='ctx'> 		if (is_multi(bp)) {</div><div class='ctx'> 			for_each_eth_queue(bp, i) {</div><div class='del'>-				memset(queue_name, 0, sizeof(queue_name));</div><div class='del'>-				snprintf(queue_name, sizeof(queue_name),</div><div class='del'>-					 "%d", i);</div><div class='del'>-				for (j = 0; j &lt; BNX2X_NUM_Q_STATS; j++)</div><div class='del'>-					snprintf(buf + (k + j)*ETH_GSTRING_LEN,</div><div class='del'>-						ETH_GSTRING_LEN,</div><div class='del'>-						bnx2x_q_stats_arr[j].string,</div><div class='del'>-						queue_name);</div><div class='del'>-				k += BNX2X_NUM_Q_STATS;</div><div class='add'>+				for (j = 0; j &lt; BNX2X_NUM_Q_STATS; j++) {</div><div class='add'>+					str = bnx2x_q_stats_arr[j].string;</div><div class='add'>+					ethtool_sprintf(&amp;buf, str, i);</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		for (i = 0, j = 0; i &lt; BNX2X_NUM_STATS; i++) {</div><div class='add'>+		for (i = 0; i &lt; BNX2X_NUM_STATS; i++) {</div><div class='ctx'> 			if (HIDE_PORT_STAT(bp) &amp;&amp; IS_PORT_STAT(i))</div><div class='ctx'> 				continue;</div><div class='del'>-			strcpy(buf + (k + j)*ETH_GSTRING_LEN,</div><div class='del'>-				   bnx2x_stats_arr[i].string);</div><div class='del'>-			j++;</div><div class='add'>+			ethtool_puts(&amp;buf, bnx2x_stats_arr[i].string);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ETH_SS_TEST:</div><div class='add'>+		if (IS_VF(bp))</div><div class='add'>+			break;</div><div class='ctx'> 		/* First 4 tests cannot be done in MF mode */</div><div class='ctx'> 		if (!IS_MF(bp))</div><div class='ctx'> 			start = 0;</div><div class='ctx'> 		else</div><div class='ctx'> 			start = 4;</div><div class='del'>-		memcpy(buf, bnx2x_tests_str_arr + start,</div><div class='del'>-		       ETH_GSTRING_LEN * BNX2X_NUM_TESTS(bp));</div><div class='add'>+		for (i = start; i &lt; BNX2X_NUM_TESTS_SF; i++)</div><div class='add'>+			ethtool_puts(&amp;buf, bnx2x_tests_str_arr[i]);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ETH_SS_PRIV_FLAGS:</div><div class='del'>-		memcpy(buf, bnx2x_private_arr,</div><div class='del'>-		       ETH_GSTRING_LEN * BNX2X_PRI_FLAG_LEN);</div><div class='add'>+		for (i = 0; i &lt; BNX2X_PRI_FLAG_LEN; i++)</div><div class='add'>+			ethtool_puts(&amp;buf, bnx2x_private_arr[i]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3321,8 +3318,11 @@ static int bnx2x_set_phys_id(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_get_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)</div><div class='add'>+static int bnx2x_get_rxfh_fields(struct net_device *dev,</div><div class='add'>+				 struct ethtool_rxfh_fields *info)</div><div class='ctx'> {</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 	switch (info-&gt;flow_type) {</div><div class='ctx'> 	case TCP_V4_FLOW:</div><div class='ctx'> 	case TCP_V6_FLOW:</div><div class='hunk'>@@ -3355,29 +3355,22 @@ static int bnx2x_get_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,</div><div class='del'>-			   u32 *rules __always_unused)</div><div class='add'>+static u32 bnx2x_get_rx_ring_count(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXRINGS:</div><div class='del'>-		info-&gt;data = BNX2X_NUM_ETH_QUEUES(bp);</div><div class='del'>-		return 0;</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		return bnx2x_get_rss_flags(bp, info);</div><div class='del'>-	default:</div><div class='del'>-		DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	return BNX2X_NUM_ETH_QUEUES(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)</div><div class='add'>+static int bnx2x_set_rxfh_fields(struct net_device *dev,</div><div class='add'>+				 const struct ethtool_rxfh_fields *info,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	int udp_rss_requested;</div><div class='ctx'> </div><div class='ctx'> 	DP(BNX2X_MSG_ETHTOOL,</div><div class='del'>-	   "Set rss flags command parameters: flow type = %d, data = %llu\n",</div><div class='add'>+	   "Set rss flags command parameters: flow type = %d, data = %u\n",</div><div class='ctx'> 	   info-&gt;flow_type, info-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;flow_type) {</div><div class='hunk'>@@ -3463,34 +3456,20 @@ static int bnx2x_set_rss_flags(struct bnx2x *bp, struct ethtool_rxnfc *info)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)</div><div class='del'>-{</div><div class='del'>-	struct bnx2x *bp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		return bnx2x_set_rss_flags(bp, info);</div><div class='del'>-	default:</div><div class='del'>-		DP(BNX2X_MSG_ETHTOOL, "Command parameters not supported\n");</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u32 bnx2x_get_rxfh_indir_size(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return T_ETH_INDIRECTION_TABLE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,</div><div class='del'>-			  u8 *hfunc)</div><div class='add'>+static int bnx2x_get_rxfh(struct net_device *dev,</div><div class='add'>+			  struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};</div><div class='ctx'> 	size_t i;</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='del'>-	if (!indir)</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the current configuration of the RSS indirection table */</div><div class='hunk'>@@ -3506,13 +3485,14 @@ static int bnx2x_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,</div><div class='ctx'> 	 * queue.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; T_ETH_INDIRECTION_TABLE_SIZE; i++)</div><div class='del'>-		indir[i] = ind_table[i] - bp-&gt;fp-&gt;cl_id;</div><div class='add'>+		rxfh-&gt;indir[i] = ind_table[i] - bp-&gt;fp-&gt;cl_id;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir,</div><div class='del'>-			  const u8 *key, const u8 hfunc)</div><div class='add'>+static int bnx2x_set_rxfh(struct net_device *dev,</div><div class='add'>+			  struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	size_t i;</div><div class='hunk'>@@ -3520,11 +3500,12 @@ static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir,</div><div class='ctx'> 	/* We require at least one supported parameter to be changed and no</div><div class='ctx'> 	 * change in any of the unsupported parameters</div><div class='ctx'> 	 */</div><div class='del'>-	if (key ||</div><div class='del'>-	    (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP))</div><div class='add'>+	if (rxfh-&gt;key ||</div><div class='add'>+	    (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	     rxfh-&gt;hfunc != ETH_RSS_HASH_TOP))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!indir)</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; T_ETH_INDIRECTION_TABLE_SIZE; i++) {</div><div class='hunk'>@@ -3537,7 +3518,7 @@ static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir,</div><div class='ctx'> 		 * align the received table to the Client ID of the leading RSS</div><div class='ctx'> 		 * queue</div><div class='ctx'> 		 */</div><div class='del'>-		bp-&gt;rss_conf_obj.ind_table[i] = indir[i] + bp-&gt;fp-&gt;cl_id;</div><div class='add'>+		bp-&gt;rss_conf_obj.ind_table[i] = rxfh-&gt;indir[i] + bp-&gt;fp-&gt;cl_id;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;state == BNX2X_STATE_OPEN)</div><div class='hunk'>@@ -3565,6 +3546,7 @@ static void bnx2x_get_channels(struct net_device *dev,</div><div class='ctx'>  * bnx2x_change_num_queues - change the number of RSS queues.</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:			bnx2x private structure</div><div class='add'>+ * @num_rss:		rss count</div><div class='ctx'>  *</div><div class='ctx'>  * Re-configure interrupt mode to get the new number of MSI-X</div><div class='ctx'>  * vectors and re-add NAPI objects.</div><div class='hunk'>@@ -3629,22 +3611,18 @@ static int bnx2x_set_channels(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_get_ts_info(struct net_device *dev,</div><div class='del'>-			     struct ethtool_ts_info *info)</div><div class='add'>+			     struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; PTP_SUPPORTED) {</div><div class='ctx'> 		info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-					SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-					SOF_TIMESTAMPING_SOFTWARE |</div><div class='ctx'> 					SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='ctx'> 					SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='ctx'> 					SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='ctx'> </div><div class='ctx'> 		if (bp-&gt;ptp_clock)</div><div class='ctx'> 			info-&gt;phc_index = ptp_clock_index(bp-&gt;ptp_clock);</div><div class='del'>-		else</div><div class='del'>-			info-&gt;phc_index = -1;</div><div class='ctx'> </div><div class='ctx'> 		info-&gt;rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='ctx'> 				   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |</div><div class='hunk'>@@ -3660,6 +3638,7 @@ static int bnx2x_get_ts_info(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops bnx2x_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,</div><div class='ctx'> 	.get_drvinfo		= bnx2x_get_drvinfo,</div><div class='ctx'> 	.get_regs_len		= bnx2x_get_regs_len,</div><div class='ctx'> 	.get_regs		= bnx2x_get_regs,</div><div class='hunk'>@@ -3687,11 +3666,12 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {</div><div class='ctx'> 	.get_strings		= bnx2x_get_strings,</div><div class='ctx'> 	.set_phys_id		= bnx2x_set_phys_id,</div><div class='ctx'> 	.get_ethtool_stats	= bnx2x_get_ethtool_stats,</div><div class='del'>-	.get_rxnfc		= bnx2x_get_rxnfc,</div><div class='del'>-	.set_rxnfc		= bnx2x_set_rxnfc,</div><div class='add'>+	.get_rx_ring_count	= bnx2x_get_rx_ring_count,</div><div class='ctx'> 	.get_rxfh_indir_size	= bnx2x_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh		= bnx2x_get_rxfh,</div><div class='ctx'> 	.set_rxfh		= bnx2x_set_rxfh,</div><div class='add'>+	.get_rxfh_fields	= bnx2x_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields	= bnx2x_set_rxfh_fields,</div><div class='ctx'> 	.get_channels		= bnx2x_get_channels,</div><div class='ctx'> 	.set_channels		= bnx2x_set_channels,</div><div class='ctx'> 	.get_module_info	= bnx2x_get_module_info,</div><div class='hunk'>@@ -3714,11 +3694,12 @@ static const struct ethtool_ops bnx2x_vf_ethtool_ops = {</div><div class='ctx'> 	.get_sset_count		= bnx2x_get_sset_count,</div><div class='ctx'> 	.get_strings		= bnx2x_get_strings,</div><div class='ctx'> 	.get_ethtool_stats	= bnx2x_get_ethtool_stats,</div><div class='del'>-	.get_rxnfc		= bnx2x_get_rxnfc,</div><div class='del'>-	.set_rxnfc		= bnx2x_set_rxnfc,</div><div class='add'>+	.get_rx_ring_count	= bnx2x_get_rx_ring_count,</div><div class='ctx'> 	.get_rxfh_indir_size	= bnx2x_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh		= bnx2x_get_rxfh,</div><div class='ctx'> 	.set_rxfh		= bnx2x_set_rxfh,</div><div class='add'>+	.get_rxfh_fields	= bnx2x_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields	= bnx2x_set_rxfh_fields,</div><div class='ctx'> 	.get_channels		= bnx2x_get_channels,</div><div class='ctx'> 	.set_channels		= bnx2x_set_channels,</div><div class='ctx'> 	.get_link_ksettings	= bnx2x_get_vf_link_ksettings,</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h<br/>index 226ab29f4cb6..9221942290a8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h</a></div><div class='hunk'>@@ -32,31 +32,31 @@</div><div class='ctx'> 	* IRO[142].m2) + ((sbId) * IRO[142].m3))</div><div class='ctx'> #define CSTORM_IGU_MODE_OFFSET (IRO[161].base)</div><div class='ctx'> #define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[323].base + ((pfId) * IRO[323].m1))</div><div class='del'>-#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[324].base + ((pfId) * IRO[324].m1))</div><div class='add'>+#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \</div><div class='add'>+	(IRO[325].base + ((pfId) * IRO[325].m1))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[316].base + ((pfId) * IRO[316].m1) + ((iscsiEqId) * IRO[316].m2))</div><div class='add'>+	(IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2))</div><div class='add'>+	(IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2))</div><div class='add'>+	(IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2))</div><div class='add'>+	(IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[315].base + ((pfId) * IRO[315].m1) + ((iscsiEqId) * IRO[315].m2))</div><div class='add'>+	(IRO[316].base + ((pfId) * IRO[316].m1) + ((iscsiEqId) * IRO[316].m2))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2))</div><div class='add'>+	(IRO[322].base + ((pfId) * IRO[322].m1) + ((iscsiEqId) * IRO[322].m2))</div><div class='ctx'> #define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \</div><div class='del'>-	(IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2))</div><div class='add'>+	(IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2))</div><div class='ctx'> #define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[322].base + ((pfId) * IRO[322].m1))</div><div class='add'>+	(IRO[323].base + ((pfId) * IRO[323].m1))</div><div class='ctx'> #define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \</div><div class='del'>-	(IRO[314].base + ((pfId) * IRO[314].m1))</div><div class='add'>+	(IRO[315].base + ((pfId) * IRO[315].m1))</div><div class='ctx'> #define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \</div><div class='del'>-	(IRO[313].base + ((pfId) * IRO[313].m1))</div><div class='add'>+	(IRO[314].base + ((pfId) * IRO[314].m1))</div><div class='ctx'> #define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[312].base + ((pfId) * IRO[312].m1))</div><div class='add'>+	(IRO[313].base + ((pfId) * IRO[313].m1))</div><div class='ctx'> #define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[155].base + ((funcId) * IRO[155].m1))</div><div class='ctx'> #define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \</div><div class='hunk'>@@ -99,81 +99,81 @@</div><div class='ctx'> #define TSTORM_FUNC_EN_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[107].base + ((funcId) * IRO[107].m1))</div><div class='ctx'> #define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \</div><div class='del'>-	(IRO[278].base + ((pfId) * IRO[278].m1))</div><div class='del'>-#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[279].base + ((pfId) * IRO[279].m1))</div><div class='del'>-#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \</div><div class='add'>+#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[280].base + ((pfId) * IRO[280].m1))</div><div class='del'>-#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \</div><div class='add'>+#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[281].base + ((pfId) * IRO[281].m1))</div><div class='add'>+#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \</div><div class='add'>+	(IRO[282].base + ((pfId) * IRO[282].m1))</div><div class='ctx'> #define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \</div><div class='del'>-	(IRO[277].base + ((pfId) * IRO[277].m1))</div><div class='add'>+	(IRO[278].base + ((pfId) * IRO[278].m1))</div><div class='ctx'> #define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \</div><div class='del'>-	(IRO[276].base + ((pfId) * IRO[276].m1))</div><div class='add'>+	(IRO[277].base + ((pfId) * IRO[277].m1))</div><div class='ctx'> #define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[275].base + ((pfId) * IRO[275].m1))</div><div class='add'>+	(IRO[276].base + ((pfId) * IRO[276].m1))</div><div class='ctx'> #define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[274].base + ((pfId) * IRO[274].m1))</div><div class='add'>+	(IRO[275].base + ((pfId) * IRO[275].m1))</div><div class='ctx'> #define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \</div><div class='del'>-	(IRO[284].base + ((pfId) * IRO[284].m1))</div><div class='add'>+	(IRO[285].base + ((pfId) * IRO[285].m1))</div><div class='ctx'> #define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \</div><div class='del'>-	(IRO[270].base + ((pfId) * IRO[270].m1))</div><div class='del'>-#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[271].base + ((pfId) * IRO[271].m1))</div><div class='del'>-#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \</div><div class='add'>+#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[272].base + ((pfId) * IRO[272].m1))</div><div class='del'>-#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \</div><div class='add'>+#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[273].base + ((pfId) * IRO[273].m1))</div><div class='add'>+#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \</div><div class='add'>+	(IRO[274].base + ((pfId) * IRO[274].m1))</div><div class='ctx'> #define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[206].base + ((pfId) * IRO[206].m1))</div><div class='ctx'> #define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[109].base + ((funcId) * IRO[109].m1))</div><div class='ctx'> #define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \</div><div class='del'>-	(IRO[223].base + ((pfId) * IRO[223].m1))</div><div class='add'>+	(IRO[224].base + ((pfId) * IRO[224].m1))</div><div class='ctx'> #define TSTORM_VF_TO_PF_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[108].base + ((funcId) * IRO[108].m1))</div><div class='del'>-#define USTORM_AGG_DATA_OFFSET (IRO[212].base)</div><div class='del'>-#define USTORM_AGG_DATA_SIZE (IRO[212].size)</div><div class='add'>+#define USTORM_AGG_DATA_OFFSET (IRO[213].base)</div><div class='add'>+#define USTORM_AGG_DATA_SIZE (IRO[213].size)</div><div class='ctx'> #define USTORM_ASSERT_LIST_INDEX_OFFSET	(IRO[181].base)</div><div class='ctx'> #define USTORM_ASSERT_LIST_OFFSET(assertListEntry) \</div><div class='ctx'> 	(IRO[180].base + ((assertListEntry) * IRO[180].m1))</div><div class='ctx'> #define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \</div><div class='ctx'> 	(IRO[187].base + ((portId) * IRO[187].m1))</div><div class='ctx'> #define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \</div><div class='del'>-	(IRO[325].base + ((pfId) * IRO[325].m1))</div><div class='add'>+	(IRO[326].base + ((pfId) * IRO[326].m1))</div><div class='ctx'> #define USTORM_FUNC_EN_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[182].base + ((funcId) * IRO[182].m1))</div><div class='ctx'> #define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[289].base + ((pfId) * IRO[289].m1))</div><div class='del'>-#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[290].base + ((pfId) * IRO[290].m1))</div><div class='add'>+#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \</div><div class='add'>+	(IRO[291].base + ((pfId) * IRO[291].m1))</div><div class='ctx'> #define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \</div><div class='del'>-	(IRO[294].base + ((pfId) * IRO[294].m1))</div><div class='add'>+	(IRO[295].base + ((pfId) * IRO[295].m1))</div><div class='ctx'> #define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \</div><div class='del'>-	(IRO[291].base + ((pfId) * IRO[291].m1))</div><div class='add'>+	(IRO[292].base + ((pfId) * IRO[292].m1))</div><div class='ctx'> #define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \</div><div class='del'>-	(IRO[287].base + ((pfId) * IRO[287].m1))</div><div class='add'>+	(IRO[288].base + ((pfId) * IRO[288].m1))</div><div class='ctx'> #define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \</div><div class='del'>-	(IRO[286].base + ((pfId) * IRO[286].m1))</div><div class='add'>+	(IRO[287].base + ((pfId) * IRO[287].m1))</div><div class='ctx'> #define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[285].base + ((pfId) * IRO[285].m1))</div><div class='add'>+	(IRO[286].base + ((pfId) * IRO[286].m1))</div><div class='ctx'> #define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[288].base + ((pfId) * IRO[288].m1))</div><div class='add'>+	(IRO[289].base + ((pfId) * IRO[289].m1))</div><div class='ctx'> #define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[292].base + ((pfId) * IRO[292].m1))</div><div class='del'>-#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[293].base + ((pfId) * IRO[293].m1))</div><div class='add'>+#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \</div><div class='add'>+	(IRO[294].base + ((pfId) * IRO[294].m1))</div><div class='ctx'> #define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[186].base + ((pfId) * IRO[186].m1))</div><div class='ctx'> #define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[184].base + ((funcId) * IRO[184].m1))</div><div class='ctx'> #define USTORM_RX_PRODS_E1X_OFFSET(portId, clientId) \</div><div class='del'>-	(IRO[215].base + ((portId) * IRO[215].m1) + ((clientId) * \</div><div class='del'>-	IRO[215].m2))</div><div class='add'>+	(IRO[216].base + ((portId) * IRO[216].m1) + ((clientId) * \</div><div class='add'>+	IRO[216].m2))</div><div class='ctx'> #define USTORM_RX_PRODS_E2_OFFSET(qzoneId) \</div><div class='del'>-	(IRO[216].base + ((qzoneId) * IRO[216].m1))</div><div class='del'>-#define USTORM_TPA_BTR_OFFSET (IRO[213].base)</div><div class='del'>-#define USTORM_TPA_BTR_SIZE (IRO[213].size)</div><div class='add'>+	(IRO[217].base + ((qzoneId) * IRO[217].m1))</div><div class='add'>+#define USTORM_TPA_BTR_OFFSET (IRO[214].base)</div><div class='add'>+#define USTORM_TPA_BTR_SIZE (IRO[214].size)</div><div class='ctx'> #define USTORM_VF_TO_PF_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[183].base + ((funcId) * IRO[183].m1))</div><div class='ctx'> #define XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE (IRO[67].base)</div><div class='hunk'>@@ -188,39 +188,39 @@</div><div class='ctx'> #define XSTORM_FUNC_EN_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[47].base + ((funcId) * IRO[47].m1))</div><div class='ctx'> #define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[302].base + ((pfId) * IRO[302].m1))</div><div class='add'>+	(IRO[303].base + ((pfId) * IRO[303].m1))</div><div class='ctx'> #define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \</div><div class='del'>-	(IRO[305].base + ((pfId) * IRO[305].m1))</div><div class='del'>-#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[306].base + ((pfId) * IRO[306].m1))</div><div class='del'>-#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \</div><div class='add'>+#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[307].base + ((pfId) * IRO[307].m1))</div><div class='del'>-#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \</div><div class='add'>+#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[308].base + ((pfId) * IRO[308].m1))</div><div class='del'>-#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \</div><div class='add'>+#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[309].base + ((pfId) * IRO[309].m1))</div><div class='del'>-#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \</div><div class='add'>+#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[310].base + ((pfId) * IRO[310].m1))</div><div class='del'>-#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \</div><div class='add'>+#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[311].base + ((pfId) * IRO[311].m1))</div><div class='add'>+#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \</div><div class='add'>+	(IRO[312].base + ((pfId) * IRO[312].m1))</div><div class='ctx'> #define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \</div><div class='del'>-	(IRO[301].base + ((pfId) * IRO[301].m1))</div><div class='add'>+	(IRO[302].base + ((pfId) * IRO[302].m1))</div><div class='ctx'> #define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \</div><div class='del'>-	(IRO[300].base + ((pfId) * IRO[300].m1))</div><div class='add'>+	(IRO[301].base + ((pfId) * IRO[301].m1))</div><div class='ctx'> #define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[299].base + ((pfId) * IRO[299].m1))</div><div class='add'>+	(IRO[300].base + ((pfId) * IRO[300].m1))</div><div class='ctx'> #define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[304].base + ((pfId) * IRO[304].m1))</div><div class='add'>+	(IRO[305].base + ((pfId) * IRO[305].m1))</div><div class='ctx'> #define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \</div><div class='del'>-	(IRO[303].base + ((pfId) * IRO[303].m1))</div><div class='add'>+	(IRO[304].base + ((pfId) * IRO[304].m1))</div><div class='ctx'> #define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \</div><div class='del'>-	(IRO[298].base + ((pfId) * IRO[298].m1))</div><div class='add'>+	(IRO[299].base + ((pfId) * IRO[299].m1))</div><div class='ctx'> #define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \</div><div class='del'>-	(IRO[297].base + ((pfId) * IRO[297].m1))</div><div class='add'>+	(IRO[298].base + ((pfId) * IRO[298].m1))</div><div class='ctx'> #define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \</div><div class='del'>-	(IRO[296].base + ((pfId) * IRO[296].m1))</div><div class='add'>+	(IRO[297].base + ((pfId) * IRO[297].m1))</div><div class='ctx'> #define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \</div><div class='del'>-	(IRO[295].base + ((pfId) * IRO[295].m1))</div><div class='add'>+	(IRO[296].base + ((pfId) * IRO[296].m1))</div><div class='ctx'> #define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \</div><div class='ctx'> 	(IRO[44].base + ((pfId) * IRO[44].m1))</div><div class='ctx'> #define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \</div><div class='hunk'>@@ -233,14 +233,16 @@</div><div class='ctx'> #define XSTORM_SPQ_PROD_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[31].base + ((funcId) * IRO[31].m1))</div><div class='ctx'> #define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_ENABLED_OFFSET(portId) \</div><div class='del'>-	(IRO[217].base + ((portId) * IRO[217].m1))</div><div class='del'>-#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \</div><div class='ctx'> 	(IRO[218].base + ((portId) * IRO[218].m1))</div><div class='add'>+#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \</div><div class='add'>+	(IRO[219].base + ((portId) * IRO[219].m1))</div><div class='ctx'> #define XSTORM_TCP_TX_SWS_TIMER_VAL_OFFSET(pfId) \</div><div class='del'>-	(IRO[220].base + (((pfId)&gt;&gt;1) * IRO[220].m1) + (((pfId)&amp;1) * \</div><div class='del'>-	IRO[220].m2))</div><div class='add'>+	(IRO[221].base + (((pfId)&gt;&gt;1) * IRO[221].m1) + (((pfId)&amp;1) * \</div><div class='add'>+	IRO[221].m2))</div><div class='ctx'> #define XSTORM_VF_TO_PF_OFFSET(funcId) \</div><div class='ctx'> 	(IRO[48].base + ((funcId) * IRO[48].m1))</div><div class='add'>+#define XSTORM_ETH_FUNCTION_INFO_FP_HSI_VALID_E2_OFFSET(fid)	\</div><div class='add'>+	(IRO[386].base + ((fid) * IRO[386].m1))</div><div class='ctx'> #define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0</div><div class='ctx'> </div><div class='ctx'> /* eth hsi version */</div><div class='hunk'>@@ -330,7 +332,7 @@</div><div class='ctx'> #define TOE_STATE (TOE_CONNECTION_TYPE &lt;&lt; PROTOCOL_STATE_BIT_OFFSET)</div><div class='ctx'> #define RDMA_STATE (RDMA_CONNECTION_TYPE &lt;&lt; PROTOCOL_STATE_BIT_OFFSET)</div><div class='ctx'> </div><div class='del'>-/* microcode fixed page page size 4K (chains and ring segments) */</div><div class='add'>+/* microcode fixed page size 4K (chains and ring segments) */</div><div class='ctx'> #define MC_PAGE_SIZE 4096</div><div class='ctx'> </div><div class='ctx'> /* Number of indices per slow-path SB */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h<br/>index 78326a6c0aba..611efee75834 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h</a></div><div class='hunk'>@@ -3024,7 +3024,8 @@ struct afex_stats {</div><div class='ctx'> </div><div class='ctx'> #define BCM_5710_FW_MAJOR_VERSION			7</div><div class='ctx'> #define BCM_5710_FW_MINOR_VERSION			13</div><div class='del'>-#define BCM_5710_FW_REVISION_VERSION		11</div><div class='add'>+#define BCM_5710_FW_REVISION_VERSION		21</div><div class='add'>+#define BCM_5710_FW_REVISION_VERSION_V15	15</div><div class='ctx'> #define BCM_5710_FW_ENGINEERING_VERSION		0</div><div class='ctx'> #define BCM_5710_FW_COMPILE_FLAGS			1</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h<br/>index 066765fbef06..0a59a09ef82f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h</a></div><div class='hunk'>@@ -296,7 +296,6 @@ static inline void bnx2x_dcb_config_qm(struct bnx2x *bp, enum cos_mode mode,</div><div class='ctx'>  *    possible, the driver should only write the valid vnics into the internal</div><div class='ctx'>  *    ram according to the appropriate port mode.</div><div class='ctx'>  */</div><div class='del'>-#define BITS_TO_BYTES(x) ((x)/8)</div><div class='ctx'> </div><div class='ctx'> /* CMNG constants, as derived from system spec calculations */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h<br/>index 1835d2e451c0..fc7fce642666 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h</a></div><div class='hunk'>@@ -635,11 +635,13 @@ static int bnx2x_ilt_client_mem_op(struct bnx2x *bp, int cli_num,</div><div class='ctx'> {</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> 	struct bnx2x_ilt *ilt = BP_ILT(bp);</div><div class='del'>-	struct ilt_client_info *ilt_cli = &amp;ilt-&gt;clients[cli_num];</div><div class='add'>+	struct ilt_client_info *ilt_cli;</div><div class='ctx'> </div><div class='ctx'> 	if (!ilt || !ilt-&gt;lines)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='add'>+	ilt_cli = &amp;ilt-&gt;clients[cli_num];</div><div class='add'>+</div><div class='ctx'> 	if (ilt_cli-&gt;flags &amp; (ILT_CLIENT_SKIP_INIT | ILT_CLIENT_SKIP_MEM))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c<br/>index d581d0ae6584..ea310057fe3a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c</a></div><div class='hunk'>@@ -3085,6 +3085,7 @@ static int bnx2x_bsc_read(struct link_params *params,</div><div class='ctx'> 			  u8 xfer_cnt,</div><div class='ctx'> 			  u32 *data_array)</div><div class='ctx'> {</div><div class='add'>+	u64 t0, delta;</div><div class='ctx'> 	u32 val, i;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3114,17 +3115,18 @@ static int bnx2x_bsc_read(struct link_params *params,</div><div class='ctx'> 	REG_WR(bp, MCP_REG_MCPR_IMC_COMMAND, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Poll for completion */</div><div class='del'>-	i = 0;</div><div class='add'>+	t0 = ktime_get_ns();</div><div class='ctx'> 	val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);</div><div class='ctx'> 	while (((val &gt;&gt; MCPR_IMC_COMMAND_IMC_STATUS_BITSHIFT) &amp; 0x3) != 1) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);</div><div class='del'>-		if (i++ &gt; 1000) {</div><div class='del'>-			DP(NETIF_MSG_LINK, "wr 0 byte timed out after %d try\n",</div><div class='del'>-								i);</div><div class='add'>+		delta = ktime_get_ns() - t0;</div><div class='add'>+		if (delta &gt; 10 * NSEC_PER_MSEC) {</div><div class='add'>+			DP(NETIF_MSG_LINK, "wr 0 byte timed out after %Lu ns\n",</div><div class='add'>+					   delta);</div><div class='ctx'> 			rc = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		usleep_range(10, 20);</div><div class='add'>+		val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rc == -EFAULT)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -3138,16 +3140,18 @@ static int bnx2x_bsc_read(struct link_params *params,</div><div class='ctx'> 	REG_WR(bp, MCP_REG_MCPR_IMC_COMMAND, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Poll for completion */</div><div class='del'>-	i = 0;</div><div class='add'>+	t0 = ktime_get_ns();</div><div class='ctx'> 	val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);</div><div class='ctx'> 	while (((val &gt;&gt; MCPR_IMC_COMMAND_IMC_STATUS_BITSHIFT) &amp; 0x3) != 1) {</div><div class='del'>-		udelay(10);</div><div class='del'>-		val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);</div><div class='del'>-		if (i++ &gt; 1000) {</div><div class='del'>-			DP(NETIF_MSG_LINK, "rd op timed out after %d try\n", i);</div><div class='add'>+		delta = ktime_get_ns() - t0;</div><div class='add'>+		if (delta &gt; 10 * NSEC_PER_MSEC) {</div><div class='add'>+			DP(NETIF_MSG_LINK, "rd op timed out after %Lu ns\n",</div><div class='add'>+					   delta);</div><div class='ctx'> 			rc = -EFAULT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='add'>+		usleep_range(10, 20);</div><div class='add'>+		val = REG_RD(bp, MCP_REG_MCPR_IMC_COMMAND);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rc == -EFAULT)</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -4708,14 +4712,14 @@ static void bnx2x_sync_link(struct link_params *params,</div><div class='ctx'> 			LINK_STATUS_SPEED_AND_DUPLEX_MASK) {</div><div class='ctx'> 		case LINK_10THD:</div><div class='ctx'> 			vars-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-			/* Fall thru */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case LINK_10TFD:</div><div class='ctx'> 			vars-&gt;line_speed = SPEED_10;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case LINK_100TXHD:</div><div class='ctx'> 			vars-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-			/* Fall thru */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case LINK_100T4:</div><div class='ctx'> 		case LINK_100TXFD:</div><div class='ctx'> 			vars-&gt;line_speed = SPEED_100;</div><div class='hunk'>@@ -4723,14 +4727,14 @@ static void bnx2x_sync_link(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 		case LINK_1000THD:</div><div class='ctx'> 			vars-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-			/* Fall thru */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case LINK_1000TFD:</div><div class='ctx'> 			vars-&gt;line_speed = SPEED_1000;</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		case LINK_2500THD:</div><div class='ctx'> 			vars-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-			/* Fall thru */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case LINK_2500TFD:</div><div class='ctx'> 			vars-&gt;line_speed = SPEED_2500;</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -5611,9 +5615,9 @@ static int bnx2x_get_link_speed_duplex(struct bnx2x_phy *phy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_link_settings_status(struct bnx2x_phy *phy,</div><div class='del'>-				      struct link_params *params,</div><div class='del'>-				      struct link_vars *vars)</div><div class='add'>+static u8 bnx2x_link_settings_status(struct bnx2x_phy *phy,</div><div class='add'>+				     struct link_params *params,</div><div class='add'>+				     struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> </div><div class='hunk'>@@ -5685,7 +5689,7 @@ static int bnx2x_link_settings_status(struct bnx2x_phy *phy,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_warpcore_read_status(struct bnx2x_phy *phy,</div><div class='add'>+static u8 bnx2x_warpcore_read_status(struct bnx2x_phy *phy,</div><div class='ctx'> 				     struct link_params *params,</div><div class='ctx'> 				     struct link_vars *vars)</div><div class='ctx'> {</div><div class='hunk'>@@ -6159,8 +6163,8 @@ static void bnx2x_link_int_ack(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_null_format_ver(u32 spirom_ver, u8 *str, u16 *len)</div><div class='ctx'> {</div><div class='del'>-	str[0] = '\0';</div><div class='del'>-	(*len)--;</div><div class='add'>+	if (*len)</div><div class='add'>+		str[0] = '\0';</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -6169,12 +6173,13 @@ static int bnx2x_format_ver(u32 num, u8 *str, u16 *len)</div><div class='ctx'> 	u16 ret;</div><div class='ctx'> </div><div class='ctx'> 	if (*len &lt; 10) {</div><div class='del'>-		/* Need more than 10chars for this format */</div><div class='add'>+		/* Need more than 10 chars for this format */</div><div class='ctx'> 		bnx2x_null_format_ver(num, str, len);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = scnprintf(str, *len, "%hx.%hx", num &gt;&gt; 16, num);</div><div class='add'>+	ret = scnprintf(str, *len, "%x.%x", (num &gt;&gt; 16) &amp; 0xFFFF,</div><div class='add'>+			num &amp; 0xFFFF);</div><div class='ctx'> 	*len -= ret;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -6183,13 +6188,14 @@ static int bnx2x_3_seq_format_ver(u32 num, u8 *str, u16 *len)</div><div class='ctx'> {</div><div class='ctx'> 	u16 ret;</div><div class='ctx'> </div><div class='del'>-	if (*len &lt; 10) {</div><div class='del'>-		/* Need more than 10chars for this format */</div><div class='add'>+	if (*len &lt; 9) {</div><div class='add'>+		/* Need more than 9 chars for this format */</div><div class='ctx'> 		bnx2x_null_format_ver(num, str, len);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = scnprintf(str, *len, "%hhx.%hhx.%hhx", num &gt;&gt; 16, num &gt;&gt; 8, num);</div><div class='add'>+	ret = scnprintf(str, *len, "%x.%x.%x", (num &gt;&gt; 16) &amp; 0xFF,</div><div class='add'>+			(num &gt;&gt; 8) &amp; 0xFF, num &amp; 0xFF);</div><div class='ctx'> 	*len -= ret;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -6202,7 +6208,7 @@ int bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 *version,</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> 	u8 *ver_p = version;</div><div class='ctx'> 	u16 remain_len = len;</div><div class='del'>-	if (version == NULL || params == NULL)</div><div class='add'>+	if (version == NULL || params == NULL || len == 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	bp = params-&gt;bp;</div><div class='ctx'> </div><div class='hunk'>@@ -6335,7 +6341,7 @@ int bnx2x_set_led(struct link_params *params,</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (!vars-&gt;link_up)</div><div class='ctx'> 			break;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case LED_MODE_ON:</div><div class='ctx'> 		if (((params-&gt;phy[EXT_PHY1].type ==</div><div class='ctx'> 			  PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727) ||</div><div class='hunk'>@@ -6874,7 +6880,8 @@ int bnx2x_link_update(struct link_params *params, struct link_vars *vars)</div><div class='ctx'> 			case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY:</div><div class='ctx'> 			/* In this option, the first PHY makes sure to pass the</div><div class='ctx'> 			 * traffic through itself only.</div><div class='del'>-			 * Its not clear how to reset the link on the second phy</div><div class='add'>+			 * It's not clear how to reset the link on the second</div><div class='add'>+			 * phy.</div><div class='ctx'> 			 */</div><div class='ctx'> 				active_external_phy = EXT_PHY1;</div><div class='ctx'> 				break;</div><div class='hunk'>@@ -7364,9 +7371,9 @@ static void bnx2x_8073_specific_func(struct bnx2x_phy *phy,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_8073_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static void bnx2x_8073_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u16 val = 0, tmp1;</div><div class='hunk'>@@ -7427,7 +7434,7 @@ static int bnx2x_8073_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	if (params-&gt;loopback_mode == LOOPBACK_EXT) {</div><div class='ctx'> 		bnx2x_807x_force_10G(bp, phy);</div><div class='ctx'> 		DP(NETIF_MSG_LINK, "Forced speed 10G on 807X\n");</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bnx2x_cl45_write(bp, phy,</div><div class='ctx'> 				 MDIO_PMA_DEVAD, MDIO_PMA_REG_BCM_CTRL, 0x0002);</div><div class='hunk'>@@ -7509,7 +7516,6 @@ static int bnx2x_8073_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	bnx2x_cl45_write(bp, phy, MDIO_AN_DEVAD, MDIO_AN_REG_CTRL, 0x1200);</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "807x Autoneg Restart: Advertise 1G=%x, 10G=%x\n",</div><div class='ctx'> 		   ((val &amp; (1&lt;&lt;5)) &gt; 0), ((val &amp; (1&lt;&lt;7)) &gt; 0));</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_8073_read_status(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -7676,9 +7682,9 @@ static void bnx2x_8073_link_reset(struct bnx2x_phy *phy,</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> /*			BCM8705 PHY SECTION			  */</div><div class='ctx'> /******************************************************************/</div><div class='del'>-static int bnx2x_8705_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static void bnx2x_8705_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "init 8705\n");</div><div class='hunk'>@@ -7700,7 +7706,6 @@ static int bnx2x_8705_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 			 MDIO_WIS_DEVAD, MDIO_WIS_REG_LASI_CNTL, 0x1);</div><div class='ctx'> 	/* BCM8705 doesn't have microcode, hence the 0 */</div><div class='ctx'> 	bnx2x_save_spirom_version(bp, params-&gt;port, params-&gt;shmem_base, 0);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_8705_read_status(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -8887,9 +8892,9 @@ static u8 bnx2x_8706_8726_read_status(struct bnx2x_phy *phy,</div><div class='ctx'> /******************************************************************/</div><div class='ctx'> /*			BCM8706 PHY SECTION			  */</div><div class='ctx'> /******************************************************************/</div><div class='del'>-static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				 struct link_params *params,</div><div class='del'>-				 struct link_vars *vars)</div><div class='add'>+static void bnx2x_8706_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tx_en_mode;</div><div class='ctx'> 	u16 cnt, val, tmp1;</div><div class='hunk'>@@ -8989,13 +8994,11 @@ static u8 bnx2x_8706_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 		bnx2x_cl45_write(bp, phy,</div><div class='ctx'> 			MDIO_PMA_DEVAD, MDIO_PMA_REG_DIGITAL_CTRL, tmp1);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_8706_read_status(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static u8 bnx2x_8706_read_status(struct bnx2x_phy *phy,</div><div class='add'>+				 struct link_params *params,</div><div class='add'>+				 struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	return bnx2x_8706_8726_read_status(phy, params, vars);</div><div class='ctx'> }</div><div class='hunk'>@@ -9070,9 +9073,9 @@ static u8 bnx2x_8726_read_status(struct bnx2x_phy *phy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static int bnx2x_8726_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static void bnx2x_8726_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "Initializing BCM8726\n");</div><div class='hunk'>@@ -9150,9 +9153,6 @@ static int bnx2x_8726_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				 MDIO_PMA_REG_8726_TX_CTRL2,</div><div class='ctx'> 				 phy-&gt;tx_preemphasis[1]);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_8726_link_reset(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -9288,9 +9288,9 @@ static void bnx2x_8727_config_speed(struct bnx2x_phy *phy,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_8727_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static void bnx2x_8727_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	u32 tx_en_mode;</div><div class='ctx'> 	u16 tmp1, mod_abs, tmp2;</div><div class='hunk'>@@ -9370,8 +9370,6 @@ static int bnx2x_8727_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 				 MDIO_PMA_DEVAD, MDIO_PMA_REG_PHY_IDENTIFIER,</div><div class='ctx'> 				 (tmp2 &amp; 0x7fff));</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -9946,9 +9944,9 @@ static int bnx2x_848xx_cmn_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_8481_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static void bnx2x_8481_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	/* Restore normal power mode*/</div><div class='hunk'>@@ -9960,7 +9958,7 @@ static int bnx2x_8481_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 	bnx2x_wait_reset_complete(bp, phy, params);</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_cl45_write(bp, phy, MDIO_PMA_DEVAD, MDIO_PMA_REG_CTRL, 1&lt;&lt;15);</div><div class='del'>-	return bnx2x_848xx_cmn_config_init(phy, params, vars);</div><div class='add'>+	bnx2x_848xx_cmn_config_init(phy, params, vars);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PHY848xx_CMDHDLR_WAIT 300</div><div class='hunk'>@@ -10210,8 +10208,8 @@ static u8 bnx2x_84833_get_reset_gpios(struct bnx2x *bp,</div><div class='ctx'> 	return reset_gpios;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,</div><div class='del'>-				struct link_params *params)</div><div class='add'>+static void bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,</div><div class='add'>+				     struct link_params *params)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 reset_gpios;</div><div class='hunk'>@@ -10239,8 +10237,6 @@ static int bnx2x_84833_hw_reset_phy(struct bnx2x_phy *phy,</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> 	DP(NETIF_MSG_LINK, "84833 hw reset on pin values 0x%x\n",</div><div class='ctx'> 		reset_gpios);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_8483x_disable_eee(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -10283,9 +10279,9 @@ static int bnx2x_8483x_enable_eee(struct bnx2x_phy *phy,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define PHY84833_CONSTANT_LATENCY 1193</div><div class='del'>-static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				   struct link_params *params,</div><div class='del'>-				   struct link_vars *vars)</div><div class='add'>+static void bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				    struct link_params *params,</div><div class='add'>+				    struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port, initialize = 1;</div><div class='hunk'>@@ -10430,7 +10426,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "Failed to configure EEE timers\n");</div><div class='ctx'> 			bnx2x_8483x_disable_eee(phy, params, vars);</div><div class='del'>-			return rc;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if ((phy-&gt;req_duplex == DUPLEX_FULL) &amp;&amp;</div><div class='hunk'>@@ -10442,7 +10438,7 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 			rc = bnx2x_8483x_disable_eee(phy, params, vars);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			DP(NETIF_MSG_LINK, "Failed to set EEE advertisement\n");</div><div class='del'>-			return rc;</div><div class='add'>+			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		vars-&gt;eee_status &amp;= ~SHMEM_EEE_SUPPORTED_MASK;</div><div class='hunk'>@@ -10481,7 +10477,6 @@ static int bnx2x_848x3_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 					  MDIO_84833_TOP_CFG_XGPHY_STRAP1,</div><div class='ctx'> 					  (u16)~MDIO_84833_SUPER_ISOLATE);</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -11038,9 +11033,9 @@ static void bnx2x_54618se_specific_func(struct bnx2x_phy *phy,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,</div><div class='del'>-					       struct link_params *params,</div><div class='del'>-					       struct link_vars *vars)</div><div class='add'>+static void bnx2x_54618se_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				      struct link_params *params,</div><div class='add'>+				      struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='ctx'> 	u8 port;</div><div class='hunk'>@@ -11240,8 +11235,6 @@ static int bnx2x_54618se_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_cl22_write(bp, phy,</div><div class='ctx'> 			MDIO_PMA_REG_CTRL, autoneg_val);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -11465,9 +11458,9 @@ static void bnx2x_7101_config_loopback(struct bnx2x_phy *phy,</div><div class='ctx'> 			 MDIO_XS_DEVAD, MDIO_XS_SFX7101_XGXS_TEST1, 0x100);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_7101_config_init(struct bnx2x_phy *phy,</div><div class='del'>-				  struct link_params *params,</div><div class='del'>-				  struct link_vars *vars)</div><div class='add'>+static void bnx2x_7101_config_init(struct bnx2x_phy *phy,</div><div class='add'>+				   struct link_params *params,</div><div class='add'>+				   struct link_vars *vars)</div><div class='ctx'> {</div><div class='ctx'> 	u16 fw_ver1, fw_ver2, val;</div><div class='ctx'> 	struct bnx2x *bp = params-&gt;bp;</div><div class='hunk'>@@ -11502,7 +11495,6 @@ static int bnx2x_7101_config_init(struct bnx2x_phy *phy,</div><div class='ctx'> 			MDIO_PMA_DEVAD, MDIO_PMA_REG_7101_VER2, &amp;fw_ver2);</div><div class='ctx'> 	bnx2x_save_spirom_version(bp, params-&gt;port,</div><div class='ctx'> 				  (u32)(fw_ver1&lt;&lt;16 | fw_ver2), phy-&gt;ver_addr);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_7101_read_status(struct bnx2x_phy *phy,</div><div class='hunk'>@@ -11554,7 +11546,7 @@ static int bnx2x_7101_format_ver(u32 spirom_ver, u8 *str, u16 *len)</div><div class='ctx'> 	str[2] = (spirom_ver &amp; 0xFF0000) &gt;&gt; 16;</div><div class='ctx'> 	str[3] = (spirom_ver &amp; 0xFF000000) &gt;&gt; 24;</div><div class='ctx'> 	str[4] = '\0';</div><div class='del'>-	*len -= 5;</div><div class='add'>+	*len -= 4;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -11636,14 +11628,14 @@ static const struct bnx2x_phy phy_null = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)NULL,</div><div class='del'>-	.read_status	= (read_status_t)NULL,</div><div class='del'>-	.link_reset	= (link_reset_t)NULL,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)NULL,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= NULL,</div><div class='add'>+	.read_status	= NULL,</div><div class='add'>+	.link_reset	= NULL,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= NULL,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_serdes = {</div><div class='hunk'>@@ -11671,14 +11663,14 @@ static const struct bnx2x_phy phy_serdes = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_xgxs_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_link_settings_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_int_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)NULL,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_xgxs_config_init,</div><div class='add'>+	.read_status	= bnx2x_link_settings_status,</div><div class='add'>+	.link_reset	= bnx2x_int_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= NULL,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_xgxs = {</div><div class='hunk'>@@ -11707,14 +11699,14 @@ static const struct bnx2x_phy phy_xgxs = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_xgxs_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_link_settings_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_int_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)bnx2x_set_xgxs_loopback,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)NULL,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_xgxs_specific_func</div><div class='add'>+	.config_init	= bnx2x_xgxs_config_init,</div><div class='add'>+	.read_status	= bnx2x_link_settings_status,</div><div class='add'>+	.link_reset	= bnx2x_int_link_reset,</div><div class='add'>+	.config_loopback = bnx2x_set_xgxs_loopback,</div><div class='add'>+	.format_fw_ver	= NULL,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = bnx2x_xgxs_specific_func</div><div class='ctx'> };</div><div class='ctx'> static const struct bnx2x_phy phy_warpcore = {</div><div class='ctx'> 	.type		= PORT_HW_CFG_XGXS_EXT_PHY_TYPE_DIRECT,</div><div class='hunk'>@@ -11745,14 +11737,14 @@ static const struct bnx2x_phy phy_warpcore = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	/* req_duplex = */0,</div><div class='ctx'> 	/* rsrv = */0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_warpcore_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_warpcore_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_warpcore_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)bnx2x_set_warpcore_loopback,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)NULL,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_warpcore_hw_reset,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_warpcore_config_init,</div><div class='add'>+	.read_status	= bnx2x_warpcore_read_status,</div><div class='add'>+	.link_reset	= bnx2x_warpcore_link_reset,</div><div class='add'>+	.config_loopback = bnx2x_set_warpcore_loopback,</div><div class='add'>+	.format_fw_ver	= NULL,</div><div class='add'>+	.hw_reset	= bnx2x_warpcore_hw_reset,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -11776,14 +11768,14 @@ static const struct bnx2x_phy phy_7101 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_7101_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_7101_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_common_ext_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)bnx2x_7101_config_loopback,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_7101_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_7101_hw_reset,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_7101_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_7101_config_init,</div><div class='add'>+	.read_status	= bnx2x_7101_read_status,</div><div class='add'>+	.link_reset	= bnx2x_common_ext_link_reset,</div><div class='add'>+	.config_loopback = bnx2x_7101_config_loopback,</div><div class='add'>+	.format_fw_ver	= bnx2x_7101_format_ver,</div><div class='add'>+	.hw_reset	= bnx2x_7101_hw_reset,</div><div class='add'>+	.set_link_led	= bnx2x_7101_set_link_led,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> static const struct bnx2x_phy phy_8073 = {</div><div class='ctx'> 	.type		= PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8073,</div><div class='hunk'>@@ -11807,14 +11799,14 @@ static const struct bnx2x_phy phy_8073 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_8073_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_8073_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_8073_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_8073_specific_func</div><div class='add'>+	.config_init	= bnx2x_8073_config_init,</div><div class='add'>+	.read_status	= bnx2x_8073_read_status,</div><div class='add'>+	.link_reset	= bnx2x_8073_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_format_ver,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = bnx2x_8073_specific_func</div><div class='ctx'> };</div><div class='ctx'> static const struct bnx2x_phy phy_8705 = {</div><div class='ctx'> 	.type		= PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8705,</div><div class='hunk'>@@ -11835,14 +11827,14 @@ static const struct bnx2x_phy phy_8705 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_8705_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_8705_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_common_ext_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_null_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_8705_config_init,</div><div class='add'>+	.read_status	= bnx2x_8705_read_status,</div><div class='add'>+	.link_reset	= bnx2x_common_ext_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_null_format_ver,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> static const struct bnx2x_phy phy_8706 = {</div><div class='ctx'> 	.type		= PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706,</div><div class='hunk'>@@ -11864,14 +11856,14 @@ static const struct bnx2x_phy phy_8706 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_8706_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_8706_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_common_ext_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_8706_config_init,</div><div class='add'>+	.read_status	= bnx2x_8706_read_status,</div><div class='add'>+	.link_reset	= bnx2x_common_ext_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_format_ver,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_8726 = {</div><div class='hunk'>@@ -11896,14 +11888,14 @@ static const struct bnx2x_phy phy_8726 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_8726_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_8726_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_8726_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)bnx2x_8726_config_loopback,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)NULL,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_8726_config_init,</div><div class='add'>+	.read_status	= bnx2x_8726_read_status,</div><div class='add'>+	.link_reset	= bnx2x_8726_link_reset,</div><div class='add'>+	.config_loopback = bnx2x_8726_config_loopback,</div><div class='add'>+	.format_fw_ver	= bnx2x_format_ver,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= NULL,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_8727 = {</div><div class='hunk'>@@ -11927,14 +11919,14 @@ static const struct bnx2x_phy phy_8727 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_8727_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_8727_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_8727_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_8727_hw_reset,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_8727_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_8727_specific_func</div><div class='add'>+	.config_init	= bnx2x_8727_config_init,</div><div class='add'>+	.read_status	= bnx2x_8727_read_status,</div><div class='add'>+	.link_reset	= bnx2x_8727_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_format_ver,</div><div class='add'>+	.hw_reset	= bnx2x_8727_hw_reset,</div><div class='add'>+	.set_link_led	= bnx2x_8727_set_link_led,</div><div class='add'>+	.phy_specific_func = bnx2x_8727_specific_func</div><div class='ctx'> };</div><div class='ctx'> static const struct bnx2x_phy phy_8481 = {</div><div class='ctx'> 	.type		= PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8481,</div><div class='hunk'>@@ -11962,14 +11954,14 @@ static const struct bnx2x_phy phy_8481 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_8481_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_848xx_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_8481_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_848xx_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_8481_hw_reset,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_848xx_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)NULL</div><div class='add'>+	.config_init	= bnx2x_8481_config_init,</div><div class='add'>+	.read_status	= bnx2x_848xx_read_status,</div><div class='add'>+	.link_reset	= bnx2x_8481_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_848xx_format_ver,</div><div class='add'>+	.hw_reset	= bnx2x_8481_hw_reset,</div><div class='add'>+	.set_link_led	= bnx2x_848xx_set_link_led,</div><div class='add'>+	.phy_specific_func = NULL</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_84823 = {</div><div class='hunk'>@@ -11999,14 +11991,14 @@ static const struct bnx2x_phy phy_84823 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_848x3_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_848xx_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_848x3_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_848xx_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_848xx_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_848xx_specific_func</div><div class='add'>+	.config_init	= bnx2x_848x3_config_init,</div><div class='add'>+	.read_status	= bnx2x_848xx_read_status,</div><div class='add'>+	.link_reset	= bnx2x_848x3_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_848xx_format_ver,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= bnx2x_848xx_set_link_led,</div><div class='add'>+	.phy_specific_func = bnx2x_848xx_specific_func</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_84833 = {</div><div class='hunk'>@@ -12034,14 +12026,14 @@ static const struct bnx2x_phy phy_84833 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_848x3_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_848xx_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_848x3_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_848xx_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_84833_hw_reset_phy,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_848xx_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_848xx_specific_func</div><div class='add'>+	.config_init	= bnx2x_848x3_config_init,</div><div class='add'>+	.read_status	= bnx2x_848xx_read_status,</div><div class='add'>+	.link_reset	= bnx2x_848x3_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_848xx_format_ver,</div><div class='add'>+	.hw_reset	= bnx2x_84833_hw_reset_phy,</div><div class='add'>+	.set_link_led	= bnx2x_848xx_set_link_led,</div><div class='add'>+	.phy_specific_func = bnx2x_848xx_specific_func</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_84834 = {</div><div class='hunk'>@@ -12068,14 +12060,14 @@ static const struct bnx2x_phy phy_84834 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_848x3_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_848xx_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_848x3_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_848xx_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_84833_hw_reset_phy,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_848xx_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_848xx_specific_func</div><div class='add'>+	.config_init	= bnx2x_848x3_config_init,</div><div class='add'>+	.read_status	= bnx2x_848xx_read_status,</div><div class='add'>+	.link_reset	= bnx2x_848x3_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_848xx_format_ver,</div><div class='add'>+	.hw_reset	= bnx2x_84833_hw_reset_phy,</div><div class='add'>+	.set_link_led	= bnx2x_848xx_set_link_led,</div><div class='add'>+	.phy_specific_func = bnx2x_848xx_specific_func</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_84858 = {</div><div class='hunk'>@@ -12102,14 +12094,14 @@ static const struct bnx2x_phy phy_84858 = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	.req_duplex	= 0,</div><div class='ctx'> 	.rsrv		= 0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_848x3_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_848xx_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_848x3_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)NULL,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)bnx2x_8485x_format_ver,</div><div class='del'>-	.hw_reset	= (hw_reset_t)bnx2x_84833_hw_reset_phy,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_848xx_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_848xx_specific_func</div><div class='add'>+	.config_init	= bnx2x_848x3_config_init,</div><div class='add'>+	.read_status	= bnx2x_848xx_read_status,</div><div class='add'>+	.link_reset	= bnx2x_848x3_link_reset,</div><div class='add'>+	.config_loopback = NULL,</div><div class='add'>+	.format_fw_ver	= bnx2x_8485x_format_ver,</div><div class='add'>+	.hw_reset	= bnx2x_84833_hw_reset_phy,</div><div class='add'>+	.set_link_led	= bnx2x_848xx_set_link_led,</div><div class='add'>+	.phy_specific_func = bnx2x_848xx_specific_func</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct bnx2x_phy phy_54618se = {</div><div class='hunk'>@@ -12136,14 +12128,14 @@ static const struct bnx2x_phy phy_54618se = {</div><div class='ctx'> 	.speed_cap_mask	= 0,</div><div class='ctx'> 	/* req_duplex = */0,</div><div class='ctx'> 	/* rsrv = */0,</div><div class='del'>-	.config_init	= (config_init_t)bnx2x_54618se_config_init,</div><div class='del'>-	.read_status	= (read_status_t)bnx2x_54618se_read_status,</div><div class='del'>-	.link_reset	= (link_reset_t)bnx2x_54618se_link_reset,</div><div class='del'>-	.config_loopback = (config_loopback_t)bnx2x_54618se_config_loopback,</div><div class='del'>-	.format_fw_ver	= (format_fw_ver_t)NULL,</div><div class='del'>-	.hw_reset	= (hw_reset_t)NULL,</div><div class='del'>-	.set_link_led	= (set_link_led_t)bnx2x_5461x_set_link_led,</div><div class='del'>-	.phy_specific_func = (phy_specific_func_t)bnx2x_54618se_specific_func</div><div class='add'>+	.config_init	= bnx2x_54618se_config_init,</div><div class='add'>+	.read_status	= bnx2x_54618se_read_status,</div><div class='add'>+	.link_reset	= bnx2x_54618se_link_reset,</div><div class='add'>+	.config_loopback = bnx2x_54618se_config_loopback,</div><div class='add'>+	.format_fw_ver	= NULL,</div><div class='add'>+	.hw_reset	= NULL,</div><div class='add'>+	.set_link_led	= bnx2x_5461x_set_link_led,</div><div class='add'>+	.phy_specific_func = bnx2x_54618se_specific_func</div><div class='ctx'> };</div><div class='ctx'> /*****************************************************************/</div><div class='ctx'> /*                                                               */</div><div class='hunk'>@@ -12518,13 +12510,13 @@ static void bnx2x_phy_def_cfg(struct link_params *params,</div><div class='ctx'> 	switch (link_config  &amp; PORT_FEATURE_LINK_SPEED_MASK) {</div><div class='ctx'> 	case PORT_FEATURE_LINK_SPEED_10M_HALF:</div><div class='ctx'> 		phy-&gt;req_duplex = DUPLEX_HALF;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PORT_FEATURE_LINK_SPEED_10M_FULL:</div><div class='ctx'> 		phy-&gt;req_line_speed = SPEED_10;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PORT_FEATURE_LINK_SPEED_100M_HALF:</div><div class='ctx'> 		phy-&gt;req_duplex = DUPLEX_HALF;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PORT_FEATURE_LINK_SPEED_100M_FULL:</div><div class='ctx'> 		phy-&gt;req_line_speed = SPEED_100;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -13852,7 +13844,7 @@ static void bnx2x_check_kr2_wa(struct link_params *params,</div><div class='ctx'> </div><div class='ctx'> 	/* Once KR2 was disabled, wait 5 seconds before checking KR2 recovery</div><div class='ctx'> 	 * Since some switches tend to reinit the AN process and clear the</div><div class='del'>-	 * the advertised BP/NP after ~2 seconds causing the KR2 to be disabled</div><div class='add'>+	 * advertised BP/NP after ~2 seconds causing the KR2 to be disabled</div><div class='ctx'> 	 * and recovered many times</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (vars-&gt;check_kr2_recovery_cnt &gt; 0) {</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h<br/>index b7d251108c19..cae03c89dc73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h</a></div><div class='hunk'>@@ -62,6 +62,7 @@</div><div class='ctx'> #define SFP_EEPROM_DIAG_TYPE_ADDR		0x5c</div><div class='ctx'> #define SFP_EEPROM_DIAG_TYPE_SIZE		1</div><div class='ctx'> #define SFP_EEPROM_DIAG_ADDR_CHANGE_REQ		(1&lt;&lt;2)</div><div class='add'>+#define SFP_EEPROM_DDM_IMPLEMENTED		(1&lt;&lt;6)</div><div class='ctx'> #define SFP_EEPROM_SFF_8472_COMP_ADDR		0x5e</div><div class='ctx'> #define SFP_EEPROM_SFF_8472_COMP_SIZE		1</div><div class='ctx'> </div><div class='hunk'>@@ -126,15 +127,15 @@ struct link_vars;</div><div class='ctx'> struct link_params;</div><div class='ctx'> struct bnx2x_phy;</div><div class='ctx'> </div><div class='del'>-typedef u8 (*config_init_t)(struct bnx2x_phy *phy, struct link_params *params,</div><div class='del'>-			    struct link_vars *vars);</div><div class='add'>+typedef void (*config_init_t)(struct bnx2x_phy *phy, struct link_params *params,</div><div class='add'>+			      struct link_vars *vars);</div><div class='ctx'> typedef u8 (*read_status_t)(struct bnx2x_phy *phy, struct link_params *params,</div><div class='ctx'> 			    struct link_vars *vars);</div><div class='ctx'> typedef void (*link_reset_t)(struct bnx2x_phy *phy,</div><div class='ctx'> 			     struct link_params *params);</div><div class='ctx'> typedef void (*config_loopback_t)(struct bnx2x_phy *phy,</div><div class='ctx'> 				  struct link_params *params);</div><div class='del'>-typedef u8 (*format_fw_ver_t)(u32 raw, u8 *str, u16 *len);</div><div class='add'>+typedef int (*format_fw_ver_t)(u32 raw, u8 *str, u16 *len);</div><div class='ctx'> typedef void (*hw_reset_t)(struct bnx2x_phy *phy, struct link_params *params);</div><div class='ctx'> typedef void (*set_link_led_t)(struct bnx2x_phy *phy,</div><div class='ctx'> 			       struct link_params *params, u8 mode);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c<br/>index 03ac10b1cd1e..6a1cc2032bf3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c</a></div><div class='hunk'>@@ -29,7 +29,6 @@</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -74,27 +73,35 @@</div><div class='ctx'> 	__stringify(BCM_5710_FW_MINOR_VERSION) "."	\</div><div class='ctx'> 	__stringify(BCM_5710_FW_REVISION_VERSION) "."	\</div><div class='ctx'> 	__stringify(BCM_5710_FW_ENGINEERING_VERSION)</div><div class='add'>+</div><div class='add'>+#define FW_FILE_VERSION_V15				\</div><div class='add'>+	__stringify(BCM_5710_FW_MAJOR_VERSION) "."      \</div><div class='add'>+	__stringify(BCM_5710_FW_MINOR_VERSION) "."	\</div><div class='add'>+	__stringify(BCM_5710_FW_REVISION_VERSION_V15) "."	\</div><div class='add'>+	__stringify(BCM_5710_FW_ENGINEERING_VERSION)</div><div class='add'>+</div><div class='ctx'> #define FW_FILE_NAME_E1		"bnx2x/bnx2x-e1-" FW_FILE_VERSION ".fw"</div><div class='ctx'> #define FW_FILE_NAME_E1H	"bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw"</div><div class='ctx'> #define FW_FILE_NAME_E2		"bnx2x/bnx2x-e2-" FW_FILE_VERSION ".fw"</div><div class='add'>+#define FW_FILE_NAME_E1_V15	"bnx2x/bnx2x-e1-" FW_FILE_VERSION_V15 ".fw"</div><div class='add'>+#define FW_FILE_NAME_E1H_V15	"bnx2x/bnx2x-e1h-" FW_FILE_VERSION_V15 ".fw"</div><div class='add'>+#define FW_FILE_NAME_E2_V15	"bnx2x/bnx2x-e2-" FW_FILE_VERSION_V15 ".fw"</div><div class='ctx'> </div><div class='ctx'> /* Time in jiffies before concluding the transmitter is hung */</div><div class='ctx'> #define TX_TIMEOUT		(5*HZ)</div><div class='ctx'> </div><div class='del'>-static char version[] =</div><div class='del'>-	"QLogic 5771x/578xx 10/20-Gigabit Ethernet Driver "</div><div class='del'>-	DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Eliezer Tamir");</div><div class='ctx'> MODULE_DESCRIPTION("QLogic "</div><div class='ctx'> 		   "BCM57710/57711/57711E/"</div><div class='ctx'> 		   "57712/57712_MF/57800/57800_MF/57810/57810_MF/"</div><div class='ctx'> 		   "57840/57840_MF Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> MODULE_FIRMWARE(FW_FILE_NAME_E1);</div><div class='ctx'> MODULE_FIRMWARE(FW_FILE_NAME_E1H);</div><div class='ctx'> MODULE_FIRMWARE(FW_FILE_NAME_E2);</div><div class='add'>+MODULE_FIRMWARE(FW_FILE_NAME_E1_V15);</div><div class='add'>+MODULE_FIRMWARE(FW_FILE_NAME_E1H_V15);</div><div class='add'>+MODULE_FIRMWARE(FW_FILE_NAME_E2_V15);</div><div class='ctx'> </div><div class='ctx'> int bnx2x_num_queues;</div><div class='ctx'> module_param_named(num_queues, bnx2x_num_queues, int, 0444);</div><div class='hunk'>@@ -281,9 +288,16 @@ static const struct pci_device_id bnx2x_pci_tbl[] = {</div><div class='ctx'> </div><div class='ctx'> MODULE_DEVICE_TABLE(pci, bnx2x_pci_tbl);</div><div class='ctx'> </div><div class='add'>+const u32 dmae_reg_go_c[] = {</div><div class='add'>+	DMAE_REG_GO_C0, DMAE_REG_GO_C1, DMAE_REG_GO_C2, DMAE_REG_GO_C3,</div><div class='add'>+	DMAE_REG_GO_C4, DMAE_REG_GO_C5, DMAE_REG_GO_C6, DMAE_REG_GO_C7,</div><div class='add'>+	DMAE_REG_GO_C8, DMAE_REG_GO_C9, DMAE_REG_GO_C10, DMAE_REG_GO_C11,</div><div class='add'>+	DMAE_REG_GO_C12, DMAE_REG_GO_C13, DMAE_REG_GO_C14, DMAE_REG_GO_C15</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Global resources for unloading a previously loaded device */</div><div class='ctx'> #define BNX2X_PREV_WAIT_NEEDED 1</div><div class='del'>-static DEFINE_SEMAPHORE(bnx2x_prev_sem);</div><div class='add'>+static DEFINE_SEMAPHORE(bnx2x_prev_sem, 1);</div><div class='ctx'> static LIST_HEAD(bnx2x_prev_list);</div><div class='ctx'> </div><div class='ctx'> /* Forward declaration */</div><div class='hunk'>@@ -294,8 +308,11 @@ static int bnx2x_set_storm_rx_mode(struct bnx2x *bp);</div><div class='ctx'> /****************************************************************************</div><div class='ctx'> * General service functions</div><div class='ctx'> ****************************************************************************/</div><div class='del'>-</div><div class='del'>-static int bnx2x_hwtstamp_ioctl(struct bnx2x *bp, struct ifreq *ifr);</div><div class='add'>+static int bnx2x_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			      struct kernel_hwtstamp_config *config,</div><div class='add'>+			      struct netlink_ext_ack *extack);</div><div class='add'>+static int bnx2x_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			      struct kernel_hwtstamp_config *config);</div><div class='ctx'> </div><div class='ctx'> static void __storm_memset_dma_mapping(struct bnx2x *bp,</div><div class='ctx'> 				       u32 addr, dma_addr_t mapping)</div><div class='hunk'>@@ -745,9 +762,7 @@ static int bnx2x_mc_assert(struct bnx2x *bp)</div><div class='ctx'> 		  CHIP_IS_E1(bp) ? "everest1" :</div><div class='ctx'> 		  CHIP_IS_E1H(bp) ? "everest1h" :</div><div class='ctx'> 		  CHIP_IS_E2(bp) ? "everest2" : "everest3",</div><div class='del'>-		  BCM_5710_FW_MAJOR_VERSION,</div><div class='del'>-		  BCM_5710_FW_MINOR_VERSION,</div><div class='del'>-		  BCM_5710_FW_REVISION_VERSION);</div><div class='add'>+		  bp-&gt;fw_major, bp-&gt;fw_minor, bp-&gt;fw_rev);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1174,9 +1189,18 @@ void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	if (IS_PF(bp)) {</div><div class='add'>+		int tmp_msg_en = bp-&gt;msg_enable;</div><div class='add'>+</div><div class='ctx'> 		bnx2x_fw_dump(bp);</div><div class='add'>+		bp-&gt;msg_enable |= NETIF_MSG_HW;</div><div class='add'>+		BNX2X_ERR("Idle check (1st round) ----------\n");</div><div class='add'>+		bnx2x_idle_chk(bp);</div><div class='add'>+		BNX2X_ERR("Idle check (2nd round) ----------\n");</div><div class='add'>+		bnx2x_idle_chk(bp);</div><div class='add'>+		bp-&gt;msg_enable = tmp_msg_en;</div><div class='ctx'> 		bnx2x_mc_assert(bp);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	BNX2X_ERR("end crash dump -----------------\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1384,7 +1408,6 @@ int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func, u32 poll_cnt)</div><div class='ctx'> 	u32 op_gen_command = 0;</div><div class='ctx'> 	u32 comp_addr = BAR_CSTRORM_INTMEM +</div><div class='ctx'> 			CSTORM_FINAL_CLEANUP_COMPLETE_OFFSET(clnup_func);</div><div class='del'>-	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (REG_RD(bp, comp_addr)) {</div><div class='ctx'> 		BNX2X_ERR("Cleanup complete was not 0 before sending\n");</div><div class='hunk'>@@ -1409,7 +1432,7 @@ int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func, u32 poll_cnt)</div><div class='ctx'> 	/* Zero completion for next FLR */</div><div class='ctx'> 	REG_WR(bp, comp_addr, 0);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u8 bnx2x_is_pcie_pending(struct pci_dev *dev)</div><div class='hunk'>@@ -1748,7 +1771,7 @@ static bool bnx2x_trylock_hw_lock(struct bnx2x *bp, u32 resource)</div><div class='ctx'>  * @bp:	driver handle</div><div class='ctx'>  *</div><div class='ctx'>  * Returns the recovery leader resource id according to the engine this function</div><div class='del'>- * belongs to. Currently only only 2 engines is supported.</div><div class='add'>+ * belongs to. Currently only 2 engines is supported.</div><div class='ctx'>  */</div><div class='ctx'> static int bnx2x_get_leader_lock_resource(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -3075,9 +3098,9 @@ void bnx2x_func_init(struct bnx2x *bp, struct bnx2x_func_init_params *p)</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_get_common_flags - Return common flags</div><div class='ctx'>  *</div><div class='del'>- * @bp		device handle</div><div class='del'>- * @fp		queue handle</div><div class='del'>- * @zero_stats	TRUE if statistics zeroing is needed</div><div class='add'>+ * @bp:		device handle</div><div class='add'>+ * @fp:		queue handle</div><div class='add'>+ * @zero_stats:	TRUE if statistics zeroing is needed</div><div class='ctx'>  *</div><div class='ctx'>  * Return the flags that are common for the Tx-only and not normal connections.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3364,7 +3387,7 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)</div><div class='ctx'> 		&amp;bp-&gt;sp_objs-&gt;mac_obj;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	strlcpy(ether_stat-&gt;version, DRV_MODULE_VERSION,</div><div class='add'>+	strscpy(ether_stat-&gt;version, DRV_MODULE_VERSION,</div><div class='ctx'> 		ETH_STAT_INFO_VERSION_LEN);</div><div class='ctx'> </div><div class='ctx'> 	/* get DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED macs, placing them in the</div><div class='hunk'>@@ -5763,7 +5786,7 @@ void bnx2x_drv_pulse(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnx2x *bp = from_timer(bp, t, timer);</div><div class='add'>+	struct bnx2x *bp = timer_container_of(bp, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(bp-&gt;dev))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -6302,11 +6325,11 @@ static void bnx2x_init_internal(struct bnx2x *bp, u32 load_code)</div><div class='ctx'> 	case FW_MSG_CODE_DRV_LOAD_COMMON:</div><div class='ctx'> 	case FW_MSG_CODE_DRV_LOAD_COMMON_CHIP:</div><div class='ctx'> 		bnx2x_init_internal_common(bp);</div><div class='del'>-		/* no break */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case FW_MSG_CODE_DRV_LOAD_PORT:</div><div class='ctx'> 		/* nothing to do */</div><div class='del'>-		/* no break */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case FW_MSG_CODE_DRV_LOAD_FUNCTION:</div><div class='ctx'> 		/* internal memory per function is</div><div class='hunk'>@@ -8407,7 +8430,7 @@ alloc_mem_err:</div><div class='ctx'>  * Init service functions</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int bnx2x_set_mac_one(struct bnx2x *bp, u8 *mac,</div><div class='add'>+int bnx2x_set_mac_one(struct bnx2x *bp, const u8 *mac,</div><div class='ctx'> 		      struct bnx2x_vlan_mac_obj *obj, bool set,</div><div class='ctx'> 		      int mac_type, unsigned long *ramrod_flags)</div><div class='ctx'> {</div><div class='hunk'>@@ -8482,11 +8505,21 @@ int bnx2x_set_vlan_one(struct bnx2x *bp, u16 vlan,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void bnx2x_clear_vlan_info(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x_vlan_entry *vlan;</div><div class='add'>+</div><div class='add'>+	/* Mark that hw forgot all entries */</div><div class='add'>+	list_for_each_entry(vlan, &amp;bp-&gt;vlan_reg, link)</div><div class='add'>+		vlan-&gt;hw = false;</div><div class='add'>+</div><div class='add'>+	bp-&gt;vlan_cnt = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnx2x_del_all_vlans(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x_vlan_mac_obj *vlan_obj = &amp;bp-&gt;sp_objs[0].vlan_obj;</div><div class='ctx'> 	unsigned long ramrod_flags = 0, vlan_flags = 0;</div><div class='del'>-	struct bnx2x_vlan_entry *vlan;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(RAMROD_COMP_WAIT, &amp;ramrod_flags);</div><div class='hunk'>@@ -8495,10 +8528,7 @@ static int bnx2x_del_all_vlans(struct bnx2x *bp)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	/* Mark that hw forgot all entries */</div><div class='del'>-	list_for_each_entry(vlan, &amp;bp-&gt;vlan_reg, link)</div><div class='del'>-		vlan-&gt;hw = false;</div><div class='del'>-	bp-&gt;vlan_cnt = 0;</div><div class='add'>+	bnx2x_clear_vlan_info(bp);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -8582,11 +8612,11 @@ int bnx2x_set_int_mode(struct bnx2x *bp)</div><div class='ctx'> 			       bp-&gt;num_queues,</div><div class='ctx'> 			       1 + bp-&gt;num_cnic_queues);</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BNX2X_INT_MODE_MSI:</div><div class='ctx'> 		bnx2x_enable_msi(bp);</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case BNX2X_INT_MODE_INTX:</div><div class='ctx'> 		bp-&gt;num_ethernet_queues = 1;</div><div class='ctx'> 		bp-&gt;num_queues = bp-&gt;num_ethernet_queues + bp-&gt;num_cnic_queues;</div><div class='hunk'>@@ -9129,7 +9159,7 @@ u32 bnx2x_send_unload_req(struct bnx2x *bp, int unload_mode)</div><div class='ctx'> </div><div class='ctx'> 	else if (bp-&gt;wol) {</div><div class='ctx'> 		u32 emac_base = port ? GRCBASE_EMAC1 : GRCBASE_EMAC0;</div><div class='del'>-		u8 *mac_addr = bp-&gt;dev-&gt;dev_addr;</div><div class='add'>+		const u8 *mac_addr = bp-&gt;dev-&gt;dev_addr;</div><div class='ctx'> 		struct pci_dev *pdev = bp-&gt;pdev;</div><div class='ctx'> 		u32 val;</div><div class='ctx'> 		u16 pmc;</div><div class='hunk'>@@ -9447,15 +9477,18 @@ unload_error:</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Disable HW interrupts, NAPI */</div><div class='del'>-	bnx2x_netif_stop(bp, 1);</div><div class='del'>-	/* Delete all NAPI objects */</div><div class='del'>-	bnx2x_del_all_napi(bp);</div><div class='del'>-	if (CNIC_LOADED(bp))</div><div class='del'>-		bnx2x_del_all_napi_cnic(bp);</div><div class='add'>+	if (!bp-&gt;nic_stopped) {</div><div class='add'>+		/* Disable HW interrupts, NAPI */</div><div class='add'>+		bnx2x_netif_stop(bp, 1);</div><div class='add'>+		/* Delete all NAPI objects */</div><div class='add'>+		bnx2x_del_all_napi(bp);</div><div class='add'>+		if (CNIC_LOADED(bp))</div><div class='add'>+			bnx2x_del_all_napi_cnic(bp);</div><div class='ctx'> </div><div class='del'>-	/* Release IRQs */</div><div class='del'>-	bnx2x_free_irq(bp);</div><div class='add'>+		/* Release IRQs */</div><div class='add'>+		bnx2x_free_irq(bp);</div><div class='add'>+		bp-&gt;nic_stopped = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the chip, unless PCI function is offline. If we reach this</div><div class='ctx'> 	 * point following a PCI error handling, it means device is really</div><div class='hunk'>@@ -9969,10 +10002,18 @@ static void bnx2x_recovery_failed(struct bnx2x *bp)</div><div class='ctx'>  */</div><div class='ctx'> static void bnx2x_parity_recover(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	bool global = false;</div><div class='ctx'> 	u32 error_recovered, error_unrecovered;</div><div class='del'>-	bool is_parity;</div><div class='add'>+	bool is_parity, global = false;</div><div class='add'>+#ifdef CONFIG_BNX2X_SRIOV</div><div class='add'>+	int vf_idx;</div><div class='ctx'> </div><div class='add'>+	for (vf_idx = 0; vf_idx &lt; bp-&gt;requested_nr_virtfn; vf_idx++) {</div><div class='add'>+		struct bnx2x_virtf *vf = BP_VF(bp, vf_idx);</div><div class='add'>+</div><div class='add'>+		if (vf)</div><div class='add'>+			vf-&gt;state = VF_LOST;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	DP(NETIF_MSG_HW, "Handling parity\n");</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		switch (bp-&gt;recovery_state) {</div><div class='hunk'>@@ -10126,7 +10167,6 @@ static int bnx2x_udp_port_update(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x_func_switch_update_params *switch_update_params;</div><div class='ctx'> 	struct bnx2x_func_state_params func_params = {NULL};</div><div class='del'>-	struct bnx2x_udp_tunnel *udp_tunnel;</div><div class='ctx'> 	u16 vxlan_port = 0, geneve_port = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -10143,15 +10183,13 @@ static int bnx2x_udp_port_update(struct bnx2x *bp)</div><div class='ctx'> 	__set_bit(BNX2X_F_UPDATE_TUNNEL_CFG_CHNG,</div><div class='ctx'> 		  &amp;switch_update_params-&gt;changes);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE].count) {</div><div class='del'>-		udp_tunnel = &amp;bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE];</div><div class='del'>-		geneve_port = udp_tunnel-&gt;dst_port;</div><div class='add'>+	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE]) {</div><div class='add'>+		geneve_port = bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE];</div><div class='ctx'> 		switch_update_params-&gt;geneve_dst_port = geneve_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN].count) {</div><div class='del'>-		udp_tunnel = &amp;bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN];</div><div class='del'>-		vxlan_port = udp_tunnel-&gt;dst_port;</div><div class='add'>+	if (bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN]) {</div><div class='add'>+		vxlan_port = bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN];</div><div class='ctx'> 		switch_update_params-&gt;vxlan_dst_port = vxlan_port;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -10171,94 +10209,26 @@ static int bnx2x_udp_port_update(struct bnx2x *bp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __bnx2x_add_udp_port(struct bnx2x *bp, u16 port,</div><div class='del'>-				 enum bnx2x_udp_port_type type)</div><div class='del'>-{</div><div class='del'>-	struct bnx2x_udp_tunnel *udp_port = &amp;bp-&gt;udp_tunnel_ports[type];</div><div class='del'>-</div><div class='del'>-	if (!netif_running(bp-&gt;dev) || !IS_PF(bp) || CHIP_IS_E1x(bp))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (udp_port-&gt;count &amp;&amp; udp_port-&gt;dst_port == port) {</div><div class='del'>-		udp_port-&gt;count++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (udp_port-&gt;count) {</div><div class='del'>-		DP(BNX2X_MSG_SP,</div><div class='del'>-		   "UDP tunnel [%d] -  destination port limit reached\n",</div><div class='del'>-		   type);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	udp_port-&gt;dst_port = port;</div><div class='del'>-	udp_port-&gt;count = 1;</div><div class='del'>-	bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_CHANGE_UDP_PORT, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __bnx2x_del_udp_port(struct bnx2x *bp, u16 port,</div><div class='del'>-				 enum bnx2x_udp_port_type type)</div><div class='del'>-{</div><div class='del'>-	struct bnx2x_udp_tunnel *udp_port = &amp;bp-&gt;udp_tunnel_ports[type];</div><div class='del'>-</div><div class='del'>-	if (!IS_PF(bp) || CHIP_IS_E1x(bp))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!udp_port-&gt;count || udp_port-&gt;dst_port != port) {</div><div class='del'>-		DP(BNX2X_MSG_SP, "Invalid UDP tunnel [%d] port\n",</div><div class='del'>-		   type);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove reference, and make certain it's no longer in use */</div><div class='del'>-	udp_port-&gt;count--;</div><div class='del'>-	if (udp_port-&gt;count)</div><div class='del'>-		return;</div><div class='del'>-	udp_port-&gt;dst_port = 0;</div><div class='del'>-</div><div class='del'>-	if (netif_running(bp-&gt;dev))</div><div class='del'>-		bnx2x_schedule_sp_rtnl(bp, BNX2X_SP_RTNL_CHANGE_UDP_PORT, 0);</div><div class='del'>-	else</div><div class='del'>-		DP(BNX2X_MSG_SP, "Deleted UDP tunnel [%d] port %d\n",</div><div class='del'>-		   type, port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnx2x_udp_tunnel_add(struct net_device *netdev,</div><div class='del'>-				 struct udp_tunnel_info *ti)</div><div class='add'>+static int bnx2x_udp_tunnel_sync(struct net_device *netdev, unsigned int table)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(netdev);</div><div class='del'>-	u16 t_port = ntohs(ti-&gt;port);</div><div class='del'>-</div><div class='del'>-	switch (ti-&gt;type) {</div><div class='del'>-	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		__bnx2x_add_udp_port(bp, t_port, BNX2X_UDP_PORT_VXLAN);</div><div class='del'>-		break;</div><div class='del'>-	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		__bnx2x_add_udp_port(bp, t_port, BNX2X_UDP_PORT_GENEVE);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	struct udp_tunnel_info ti;</div><div class='ctx'> </div><div class='del'>-static void bnx2x_udp_tunnel_del(struct net_device *netdev,</div><div class='del'>-				 struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	struct bnx2x *bp = netdev_priv(netdev);</div><div class='del'>-	u16 t_port = ntohs(ti-&gt;port);</div><div class='add'>+	udp_tunnel_nic_get_port(netdev, table, 0, &amp;ti);</div><div class='add'>+	bp-&gt;udp_tunnel_ports[table] = be16_to_cpu(ti.port);</div><div class='ctx'> </div><div class='del'>-	switch (ti-&gt;type) {</div><div class='del'>-	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		__bnx2x_del_udp_port(bp, t_port, BNX2X_UDP_PORT_VXLAN);</div><div class='del'>-		break;</div><div class='del'>-	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		__bnx2x_del_udp_port(bp, t_port, BNX2X_UDP_PORT_GENEVE);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='add'>+	return bnx2x_udp_port_update(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct udp_tunnel_nic_info bnx2x_udp_tunnels = {</div><div class='add'>+	.sync_table	= bnx2x_udp_tunnel_sync,</div><div class='add'>+	.flags		= UDP_TUNNEL_NIC_INFO_OPEN_ONLY,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN,  },</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static int bnx2x_close(struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> /* bnx2x_nic_unload() flushes the bnx2x_wq, thus reset task is</div><div class='hunk'>@@ -10381,24 +10351,6 @@ sp_rtnl_not_reset:</div><div class='ctx'> 	if (test_and_clear_bit(BNX2X_SP_RTNL_UPDATE_SVID, &amp;bp-&gt;sp_rtnl_state))</div><div class='ctx'> 		bnx2x_handle_update_svid_cmd(bp);</div><div class='ctx'> </div><div class='del'>-	if (test_and_clear_bit(BNX2X_SP_RTNL_CHANGE_UDP_PORT,</div><div class='del'>-			       &amp;bp-&gt;sp_rtnl_state)) {</div><div class='del'>-		if (bnx2x_udp_port_update(bp)) {</div><div class='del'>-			/* On error, forget configuration */</div><div class='del'>-			memset(bp-&gt;udp_tunnel_ports, 0,</div><div class='del'>-			       sizeof(struct bnx2x_udp_tunnel) *</div><div class='del'>-			       BNX2X_UDP_PORT_MAX);</div><div class='del'>-		} else {</div><div class='del'>-			/* Since we don't store additional port information,</div><div class='del'>-			 * if no ports are configured for any feature ask for</div><div class='del'>-			 * information about currently configured ports.</div><div class='del'>-			 */</div><div class='del'>-			if (!bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_VXLAN].count &amp;&amp;</div><div class='del'>-			    !bp-&gt;udp_tunnel_ports[BNX2X_UDP_PORT_GENEVE].count)</div><div class='del'>-				udp_tunnel_get_rx_info(bp-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* work which needs rtnl lock not-taken (as it takes the lock itself and</div><div class='ctx'> 	 * can be called from other contexts as well)</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -11853,7 +11805,7 @@ static void bnx2x_get_cnic_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 		 * as the SAN mac was copied from the primary MAC.</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (IS_MF_FCOE_AFEX(bp))</div><div class='del'>-			memcpy(bp-&gt;dev-&gt;dev_addr, fip_mac, ETH_ALEN);</div><div class='add'>+			eth_hw_addr_set(bp-&gt;dev, fip_mac);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].</div><div class='ctx'> 				iscsi_mac_upper);</div><div class='hunk'>@@ -11886,9 +11838,10 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 	u32 val, val2;</div><div class='ctx'> 	int func = BP_ABS_FUNC(bp);</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='add'>+	u8 addr[ETH_ALEN] = {};</div><div class='ctx'> </div><div class='ctx'> 	/* Zero primary MAC configuration */</div><div class='del'>-	eth_zero_addr(bp-&gt;dev-&gt;dev_addr);</div><div class='add'>+	eth_hw_addr_set(bp-&gt;dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (BP_NOMCP(bp)) {</div><div class='ctx'> 		BNX2X_ERROR("warning: random MAC workaround active\n");</div><div class='hunk'>@@ -11897,8 +11850,10 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 		val2 = MF_CFG_RD(bp, func_mf_config[func].mac_upper);</div><div class='ctx'> 		val = MF_CFG_RD(bp, func_mf_config[func].mac_lower);</div><div class='ctx'> 		if ((val2 != FUNC_MF_CFG_UPPERMAC_DEFAULT) &amp;&amp;</div><div class='del'>-		    (val != FUNC_MF_CFG_LOWERMAC_DEFAULT))</div><div class='del'>-			bnx2x_set_mac_buf(bp-&gt;dev-&gt;dev_addr, val, val2);</div><div class='add'>+		    (val != FUNC_MF_CFG_LOWERMAC_DEFAULT)) {</div><div class='add'>+			bnx2x_set_mac_buf(addr, val, val2);</div><div class='add'>+			eth_hw_addr_set(bp-&gt;dev, addr);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		if (CNIC_SUPPORT(bp))</div><div class='ctx'> 			bnx2x_get_cnic_mac_hwinfo(bp);</div><div class='hunk'>@@ -11906,7 +11861,8 @@ static void bnx2x_get_mac_hwinfo(struct bnx2x *bp)</div><div class='ctx'> 		/* in SF read MACs from port configuration */</div><div class='ctx'> 		val2 = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_upper);</div><div class='ctx'> 		val = SHMEM_RD(bp, dev_info.port_hw_config[port].mac_lower);</div><div class='del'>-		bnx2x_set_mac_buf(bp-&gt;dev-&gt;dev_addr, val, val2);</div><div class='add'>+		bnx2x_set_mac_buf(addr, val, val2);</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, addr);</div><div class='ctx'> </div><div class='ctx'> 		if (CNIC_SUPPORT(bp))</div><div class='ctx'> 			bnx2x_get_cnic_mac_hwinfo(bp);</div><div class='hunk'>@@ -12252,87 +12208,35 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_read_fwinfo(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	int cnt, i, block_end, rodi;</div><div class='del'>-	char vpd_start[BNX2X_VPD_LEN+1];</div><div class='del'>-	char str_id_reg[VENDOR_ID_LEN+1];</div><div class='del'>-	char str_id_cap[VENDOR_ID_LEN+1];</div><div class='del'>-	char *vpd_data;</div><div class='del'>-	char *vpd_extended_data = NULL;</div><div class='del'>-	u8 len;</div><div class='add'>+	char str_id[VENDOR_ID_LEN + 1];</div><div class='add'>+	unsigned int vpd_len, kw_len;</div><div class='add'>+	u8 *vpd_data;</div><div class='add'>+	int rodi;</div><div class='ctx'> </div><div class='del'>-	cnt = pci_read_vpd(bp-&gt;pdev, 0, BNX2X_VPD_LEN, vpd_start);</div><div class='ctx'> 	memset(bp-&gt;fw_ver, 0, sizeof(bp-&gt;fw_ver));</div><div class='ctx'> </div><div class='del'>-	if (cnt &lt; BNX2X_VPD_LEN)</div><div class='del'>-		goto out_not_found;</div><div class='del'>-</div><div class='del'>-	/* VPD RO tag should be first tag after identifier string, hence</div><div class='del'>-	 * we should be able to find it in first BNX2X_VPD_LEN chars</div><div class='del'>-	 */</div><div class='del'>-	i = pci_vpd_find_tag(vpd_start, 0, BNX2X_VPD_LEN,</div><div class='del'>-			     PCI_VPD_LRDT_RO_DATA);</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		goto out_not_found;</div><div class='del'>-</div><div class='del'>-	block_end = i + PCI_VPD_LRDT_TAG_SIZE +</div><div class='del'>-		    pci_vpd_lrdt_size(&amp;vpd_start[i]);</div><div class='del'>-</div><div class='del'>-	i += PCI_VPD_LRDT_TAG_SIZE;</div><div class='del'>-</div><div class='del'>-	if (block_end &gt; BNX2X_VPD_LEN) {</div><div class='del'>-		vpd_extended_data = kmalloc(block_end, GFP_KERNEL);</div><div class='del'>-		if (vpd_extended_data  == NULL)</div><div class='del'>-			goto out_not_found;</div><div class='del'>-</div><div class='del'>-		/* read rest of vpd image into vpd_extended_data */</div><div class='del'>-		memcpy(vpd_extended_data, vpd_start, BNX2X_VPD_LEN);</div><div class='del'>-		cnt = pci_read_vpd(bp-&gt;pdev, BNX2X_VPD_LEN,</div><div class='del'>-				   block_end - BNX2X_VPD_LEN,</div><div class='del'>-				   vpd_extended_data + BNX2X_VPD_LEN);</div><div class='del'>-		if (cnt &lt; (block_end - BNX2X_VPD_LEN))</div><div class='del'>-			goto out_not_found;</div><div class='del'>-		vpd_data = vpd_extended_data;</div><div class='del'>-	} else</div><div class='del'>-		vpd_data = vpd_start;</div><div class='del'>-</div><div class='del'>-	/* now vpd_data holds full vpd content in both cases */</div><div class='del'>-</div><div class='del'>-	rodi = pci_vpd_find_info_keyword(vpd_data, i, block_end,</div><div class='del'>-				   PCI_VPD_RO_KEYWORD_MFR_ID);</div><div class='del'>-	if (rodi &lt; 0)</div><div class='del'>-		goto out_not_found;</div><div class='del'>-</div><div class='del'>-	len = pci_vpd_info_field_size(&amp;vpd_data[rodi]);</div><div class='add'>+	vpd_data = pci_vpd_alloc(bp-&gt;pdev, &amp;vpd_len);</div><div class='add'>+	if (IS_ERR(vpd_data))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	if (len != VENDOR_ID_LEN)</div><div class='add'>+	rodi = pci_vpd_find_ro_info_keyword(vpd_data, vpd_len,</div><div class='add'>+					    PCI_VPD_RO_KEYWORD_MFR_ID, &amp;kw_len);</div><div class='add'>+	if (rodi &lt; 0 || kw_len != VENDOR_ID_LEN)</div><div class='ctx'> 		goto out_not_found;</div><div class='ctx'> </div><div class='del'>-	rodi += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-</div><div class='ctx'> 	/* vendor specific info */</div><div class='del'>-	snprintf(str_id_reg, VENDOR_ID_LEN + 1, "%04x", PCI_VENDOR_ID_DELL);</div><div class='del'>-	snprintf(str_id_cap, VENDOR_ID_LEN + 1, "%04X", PCI_VENDOR_ID_DELL);</div><div class='del'>-	if (!strncmp(str_id_reg, &amp;vpd_data[rodi], VENDOR_ID_LEN) ||</div><div class='del'>-	    !strncmp(str_id_cap, &amp;vpd_data[rodi], VENDOR_ID_LEN)) {</div><div class='del'>-</div><div class='del'>-		rodi = pci_vpd_find_info_keyword(vpd_data, i, block_end,</div><div class='del'>-						PCI_VPD_RO_KEYWORD_VENDOR0);</div><div class='del'>-		if (rodi &gt;= 0) {</div><div class='del'>-			len = pci_vpd_info_field_size(&amp;vpd_data[rodi]);</div><div class='del'>-</div><div class='del'>-			rodi += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-</div><div class='del'>-			if (len &lt; 32 &amp;&amp; (len + rodi) &lt;= BNX2X_VPD_LEN) {</div><div class='del'>-				memcpy(bp-&gt;fw_ver, &amp;vpd_data[rodi], len);</div><div class='del'>-				bp-&gt;fw_ver[len] = ' ';</div><div class='del'>-			}</div><div class='add'>+	snprintf(str_id, VENDOR_ID_LEN + 1, "%04x", PCI_VENDOR_ID_DELL);</div><div class='add'>+	if (!strncasecmp(str_id, &amp;vpd_data[rodi], VENDOR_ID_LEN)) {</div><div class='add'>+		rodi = pci_vpd_find_ro_info_keyword(vpd_data, vpd_len,</div><div class='add'>+						    PCI_VPD_RO_KEYWORD_VENDOR0,</div><div class='add'>+						    &amp;kw_len);</div><div class='add'>+		if (rodi &gt;= 0 &amp;&amp; kw_len &lt; sizeof(bp-&gt;fw_ver)) {</div><div class='add'>+			memcpy(bp-&gt;fw_ver, &amp;vpd_data[rodi], kw_len);</div><div class='add'>+			bp-&gt;fw_ver[kw_len] = ' ';</div><div class='ctx'> 		}</div><div class='del'>-		kfree(vpd_extended_data);</div><div class='del'>-		return;</div><div class='ctx'> 	}</div><div class='ctx'> out_not_found:</div><div class='del'>-	kfree(vpd_extended_data);</div><div class='del'>-	return;</div><div class='add'>+	kfree(vpd_data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_set_modes_bitmap(struct bnx2x *bp)</div><div class='hunk'>@@ -12406,7 +12310,9 @@ static int bnx2x_init_bp(struct bnx2x *bp)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> 	} else {</div><div class='del'>-		eth_zero_addr(bp-&gt;dev-&gt;dev_addr);</div><div class='add'>+		static const u8 zero_addr[ETH_ALEN] = {};</div><div class='add'>+</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, zero_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bnx2x_set_modes_bitmap(bp);</div><div class='hunk'>@@ -12452,7 +12358,7 @@ static int bnx2x_init_bp(struct bnx2x *bp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (CHIP_IS_E1(bp))</div><div class='del'>-		bp-&gt;dropless_fc = 0;</div><div class='add'>+		bp-&gt;dropless_fc = false;</div><div class='ctx'> 	else</div><div class='ctx'> 		bp-&gt;dropless_fc = dropless_fc | bnx2x_get_dropless_info(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -12594,9 +12500,6 @@ static int bnx2x_open(struct net_device *dev)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	if (IS_PF(bp))</div><div class='del'>-		udp_tunnel_get_rx_info(dev);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -12913,14 +12816,9 @@ static int bnx2x_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		return bnx2x_hwtstamp_ioctl(bp, ifr);</div><div class='del'>-	default:</div><div class='del'>-		DP(NETIF_MSG_LINK, "ioctl: phy id 0x%x, reg 0x%x, val_in 0x%x\n",</div><div class='del'>-		   mdio-&gt;phy_id, mdio-&gt;reg_num, mdio-&gt;val_in);</div><div class='del'>-		return mdio_mii_ioctl(&amp;bp-&gt;mdio, mdio, cmd);</div><div class='del'>-	}</div><div class='add'>+	DP(NETIF_MSG_LINK, "ioctl: phy id 0x%x, reg 0x%x, val_in 0x%x\n",</div><div class='add'>+	   mdio-&gt;phy_id, mdio-&gt;reg_num, mdio-&gt;val_in);</div><div class='add'>+	return mdio_mii_ioctl(&amp;bp-&gt;mdio, mdio, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_validate_addr(struct net_device *dev)</div><div class='hunk'>@@ -13115,7 +13013,7 @@ static const struct net_device_ops bnx2x_netdev_ops = {</div><div class='ctx'> 	.ndo_set_rx_mode	= bnx2x_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= bnx2x_change_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= bnx2x_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= bnx2x_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= bnx2x_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= bnx2x_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= bnx2x_fix_features,</div><div class='ctx'> 	.ndo_set_features	= bnx2x_set_features,</div><div class='hunk'>@@ -13136,31 +13034,10 @@ static const struct net_device_ops bnx2x_netdev_ops = {</div><div class='ctx'> 	.ndo_get_phys_port_id	= bnx2x_get_phys_port_id,</div><div class='ctx'> 	.ndo_set_vf_link_state	= bnx2x_set_vf_link_state,</div><div class='ctx'> 	.ndo_features_check	= bnx2x_features_check,</div><div class='del'>-	.ndo_udp_tunnel_add	= bnx2x_udp_tunnel_add,</div><div class='del'>-	.ndo_udp_tunnel_del	= bnx2x_udp_tunnel_del,</div><div class='add'>+	.ndo_hwtstamp_get	= bnx2x_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= bnx2x_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int bnx2x_set_coherency_mask(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	struct device *dev = &amp;bp-&gt;pdev-&gt;dev;</div><div class='del'>-</div><div class='del'>-	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) != 0 &amp;&amp;</div><div class='del'>-	    dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {</div><div class='del'>-		dev_err(dev, "System does not support DMA, aborting\n");</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnx2x_disable_pcie_error_reporting(struct bnx2x *bp)</div><div class='del'>-{</div><div class='del'>-	if (bp-&gt;flags &amp; AER_ENABLED) {</div><div class='del'>-		pci_disable_pcie_error_reporting(bp-&gt;pdev);</div><div class='del'>-		bp-&gt;flags &amp;= ~AER_ENABLED;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,</div><div class='ctx'> 			  struct net_device *dev, unsigned long board_type)</div><div class='ctx'> {</div><div class='hunk'>@@ -13230,9 +13107,11 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,</div><div class='ctx'> 		goto err_out_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = bnx2x_set_coherency_mask(bp);</div><div class='del'>-	if (rc)</div><div class='add'>+	rc = dma_set_mask_and_coherent(&amp;bp-&gt;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;bp-&gt;pdev-&gt;dev, "System does not support DMA, aborting\n");</div><div class='ctx'> 		goto err_out_release;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;mem_start = pci_resource_start(pdev, 0);</div><div class='ctx'> 	dev-&gt;base_addr = dev-&gt;mem_start;</div><div class='hunk'>@@ -13271,13 +13150,6 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,</div><div class='ctx'> 	/* Set PCIe reset type to fundamental for EEH recovery */</div><div class='ctx'> 	pdev-&gt;needs_freset = 1;</div><div class='ctx'> </div><div class='del'>-	/* AER (Advanced Error reporting) configuration */</div><div class='del'>-	rc = pci_enable_pcie_error_reporting(pdev);</div><div class='del'>-	if (!rc)</div><div class='del'>-		bp-&gt;flags |= AER_ENABLED;</div><div class='del'>-	else</div><div class='del'>-		BNX2X_DEV_INFO("Failed To configure PCIe AER [%d]\n", rc);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Clean the following indirect addresses for all functions since it</div><div class='ctx'> 	 * is not used by the driver.</div><div class='hunk'>@@ -13332,6 +13204,9 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 		dev-&gt;gso_partial_features = NETIF_F_GSO_GRE_CSUM |</div><div class='ctx'> 					    NETIF_F_GSO_UDP_TUNNEL_CSUM;</div><div class='add'>+</div><div class='add'>+		if (IS_PF(bp))</div><div class='add'>+			dev-&gt;udp_tunnel_nic_info = &amp;bnx2x_udp_tunnels;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='hunk'>@@ -13428,16 +13303,11 @@ static int bnx2x_check_firmware(struct bnx2x *bp)</div><div class='ctx'> 	/* Check FW version */</div><div class='ctx'> 	offset = be32_to_cpu(fw_hdr-&gt;fw_version.offset);</div><div class='ctx'> 	fw_ver = firmware-&gt;data + offset;</div><div class='del'>-	if ((fw_ver[0] != BCM_5710_FW_MAJOR_VERSION) ||</div><div class='del'>-	    (fw_ver[1] != BCM_5710_FW_MINOR_VERSION) ||</div><div class='del'>-	    (fw_ver[2] != BCM_5710_FW_REVISION_VERSION) ||</div><div class='del'>-	    (fw_ver[3] != BCM_5710_FW_ENGINEERING_VERSION)) {</div><div class='add'>+	if (fw_ver[0] != bp-&gt;fw_major || fw_ver[1] != bp-&gt;fw_minor ||</div><div class='add'>+	    fw_ver[2] != bp-&gt;fw_rev || fw_ver[3] != bp-&gt;fw_eng) {</div><div class='ctx'> 		BNX2X_ERR("Bad FW version:%d.%d.%d.%d. Should be %d.%d.%d.%d\n",</div><div class='del'>-		       fw_ver[0], fw_ver[1], fw_ver[2], fw_ver[3],</div><div class='del'>-		       BCM_5710_FW_MAJOR_VERSION,</div><div class='del'>-		       BCM_5710_FW_MINOR_VERSION,</div><div class='del'>-		       BCM_5710_FW_REVISION_VERSION,</div><div class='del'>-		       BCM_5710_FW_ENGINEERING_VERSION);</div><div class='add'>+			  fw_ver[0], fw_ver[1], fw_ver[2], fw_ver[3],</div><div class='add'>+			  bp-&gt;fw_major, bp-&gt;fw_minor, bp-&gt;fw_rev, bp-&gt;fw_eng);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -13517,32 +13387,49 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> static int bnx2x_init_firmware(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='del'>-	const char *fw_file_name;</div><div class='add'>+	const char *fw_file_name, *fw_file_name_v15;</div><div class='ctx'> 	struct bnx2x_fw_file_hdr *fw_hdr;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;firmware)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (CHIP_IS_E1(bp))</div><div class='add'>+	if (CHIP_IS_E1(bp)) {</div><div class='ctx'> 		fw_file_name = FW_FILE_NAME_E1;</div><div class='del'>-	else if (CHIP_IS_E1H(bp))</div><div class='add'>+		fw_file_name_v15 = FW_FILE_NAME_E1_V15;</div><div class='add'>+	} else if (CHIP_IS_E1H(bp)) {</div><div class='ctx'> 		fw_file_name = FW_FILE_NAME_E1H;</div><div class='del'>-	else if (!CHIP_IS_E1x(bp))</div><div class='add'>+		fw_file_name_v15 = FW_FILE_NAME_E1H_V15;</div><div class='add'>+	} else if (!CHIP_IS_E1x(bp)) {</div><div class='ctx'> 		fw_file_name = FW_FILE_NAME_E2;</div><div class='del'>-	else {</div><div class='add'>+		fw_file_name_v15 = FW_FILE_NAME_E2_V15;</div><div class='add'>+	} else {</div><div class='ctx'> 		BNX2X_ERR("Unsupported chip revision\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	BNX2X_DEV_INFO("Loading %s\n", fw_file_name);</div><div class='ctx'> </div><div class='ctx'> 	rc = request_firmware(&amp;bp-&gt;firmware, fw_file_name, &amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		BNX2X_ERR("Can't load firmware file %s\n",</div><div class='del'>-			  fw_file_name);</div><div class='del'>-		goto request_firmware_exit;</div><div class='add'>+		BNX2X_DEV_INFO("Trying to load older fw %s\n", fw_file_name_v15);</div><div class='add'>+</div><div class='add'>+		/* try to load prev version */</div><div class='add'>+		rc = request_firmware(&amp;bp-&gt;firmware, fw_file_name_v15, &amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+</div><div class='add'>+		if (rc)</div><div class='add'>+			goto request_firmware_exit;</div><div class='add'>+</div><div class='add'>+		bp-&gt;fw_rev = BCM_5710_FW_REVISION_VERSION_V15;</div><div class='add'>+	} else {</div><div class='add'>+		bp-&gt;fw_cap |= FW_CAP_INVALIDATE_VF_FP_HSI;</div><div class='add'>+		bp-&gt;fw_rev = BCM_5710_FW_REVISION_VERSION;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bp-&gt;fw_major = BCM_5710_FW_MAJOR_VERSION;</div><div class='add'>+	bp-&gt;fw_minor = BCM_5710_FW_MINOR_VERSION;</div><div class='add'>+	bp-&gt;fw_eng = BCM_5710_FW_ENGINEERING_VERSION;</div><div class='add'>+</div><div class='ctx'> 	rc = bnx2x_check_firmware(bp);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		BNX2X_ERR("Corrupt firmware file %s\n", fw_file_name);</div><div class='hunk'>@@ -13652,9 +13539,9 @@ static int bnx2x_set_qm_cid_count(struct bnx2x *bp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bnx2x_get_num_none_def_sbs - return the number of none default SBs</div><div class='del'>- *</div><div class='del'>- * @dev:	pci device</div><div class='add'>+ * bnx2x_get_num_non_def_sbs - return the number of none default SBs</div><div class='add'>+ * @pdev: pci device</div><div class='add'>+ * @cnic_cnt: count</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev, int cnic_cnt)</div><div class='hunk'>@@ -13770,19 +13657,20 @@ static int bnx2x_send_update_drift_ramrod(struct bnx2x *bp, int drift_dir,</div><div class='ctx'> 	return bnx2x_func_state_change(bp, &amp;func_params);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='add'>+static int bnx2x_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = container_of(ptp, struct bnx2x, ptp_clock_info);</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	int drift_dir = 1;</div><div class='ctx'> 	int val, period, period1, period2, dif, dif1, dif2;</div><div class='ctx'> 	int best_dif = BNX2X_MAX_PHC_DRIFT, best_period = 0, best_val = 0;</div><div class='add'>+	s32 ppb = scaled_ppm_to_ppb(scaled_ppm);</div><div class='ctx'> </div><div class='del'>-	DP(BNX2X_MSG_PTP, "PTP adjfreq called, ppb = %d\n", ppb);</div><div class='add'>+	DP(BNX2X_MSG_PTP, "PTP adjfine called, ppb = %d\n", ppb);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(bp-&gt;dev)) {</div><div class='ctx'> 		DP(BNX2X_MSG_PTP,</div><div class='del'>-		   "PTP adjfreq called while the interface is down\n");</div><div class='add'>+		   "PTP adjfine called while the interface is down\n");</div><div class='ctx'> 		return -ENETDOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -13917,7 +13805,7 @@ void bnx2x_register_phc(struct bnx2x *bp)</div><div class='ctx'> 	bp-&gt;ptp_clock_info.n_ext_ts = 0;</div><div class='ctx'> 	bp-&gt;ptp_clock_info.n_per_out = 0;</div><div class='ctx'> 	bp-&gt;ptp_clock_info.pps = 0;</div><div class='del'>-	bp-&gt;ptp_clock_info.adjfreq = bnx2x_ptp_adjfreq;</div><div class='add'>+	bp-&gt;ptp_clock_info.adjfine = bnx2x_ptp_adjfine;</div><div class='ctx'> 	bp-&gt;ptp_clock_info.adjtime = bnx2x_ptp_adjtime;</div><div class='ctx'> 	bp-&gt;ptp_clock_info.gettime64 = bnx2x_ptp_gettime;</div><div class='ctx'> 	bp-&gt;ptp_clock_info.settime64 = bnx2x_ptp_settime;</div><div class='hunk'>@@ -14038,7 +13926,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,</div><div class='ctx'> 			rc = -ENOMEM;</div><div class='ctx'> 			goto init_one_freemem;</div><div class='ctx'> 		}</div><div class='del'>-		bp-&gt;doorbells = ioremap_nocache(pci_resource_start(pdev, 2),</div><div class='add'>+		bp-&gt;doorbells = ioremap(pci_resource_start(pdev, 2),</div><div class='ctx'> 						doorbell_size);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!bp-&gt;doorbells) {</div><div class='hunk'>@@ -14118,8 +14006,6 @@ init_one_freemem:</div><div class='ctx'> 	bnx2x_free_mem_bp(bp);</div><div class='ctx'> </div><div class='ctx'> init_one_exit:</div><div class='del'>-	bnx2x_disable_pcie_error_reporting(bp);</div><div class='del'>-</div><div class='ctx'> 	if (bp-&gt;regview)</div><div class='ctx'> 		iounmap(bp-&gt;regview);</div><div class='ctx'> </div><div class='hunk'>@@ -14200,7 +14086,6 @@ static void __bnx2x_remove(struct pci_dev *pdev,</div><div class='ctx'> 		pci_set_power_state(pdev, PCI_D3hot);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnx2x_disable_pcie_error_reporting(bp);</div><div class='ctx'> 	if (remove_netdev) {</div><div class='ctx'> 		if (bp-&gt;regview)</div><div class='ctx'> 			iounmap(bp-&gt;regview);</div><div class='hunk'>@@ -14252,13 +14137,9 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	/* Stop Tx */</div><div class='ctx'> 	bnx2x_tx_disable(bp);</div><div class='del'>-	/* Delete all NAPI objects */</div><div class='del'>-	bnx2x_del_all_napi(bp);</div><div class='del'>-	if (CNIC_LOADED(bp))</div><div class='del'>-		bnx2x_del_all_napi_cnic(bp);</div><div class='ctx'> 	netdev_reset_tc(bp-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;bp-&gt;sp_task);</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;bp-&gt;period_task);</div><div class='ctx'> </div><div class='hunk'>@@ -14335,7 +14216,6 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='del'>-	pci_save_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		bnx2x_set_power_state(bp, PCI_D0);</div><div class='hunk'>@@ -14359,8 +14239,16 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> 		}</div><div class='ctx'> 		bnx2x_drain_tx_queues(bp);</div><div class='ctx'> 		bnx2x_send_unload_req(bp, UNLOAD_RECOVERY);</div><div class='del'>-		bnx2x_netif_stop(bp, 1);</div><div class='del'>-		bnx2x_free_irq(bp);</div><div class='add'>+		if (!bp-&gt;nic_stopped) {</div><div class='add'>+			bnx2x_netif_stop(bp, 1);</div><div class='add'>+			bnx2x_del_all_napi(bp);</div><div class='add'>+</div><div class='add'>+			if (CNIC_LOADED(bp))</div><div class='add'>+				bnx2x_del_all_napi_cnic(bp);</div><div class='add'>+</div><div class='add'>+			bnx2x_free_irq(bp);</div><div class='add'>+			bp-&gt;nic_stopped = true;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		/* Report UNLOAD_DONE to MCP */</div><div class='ctx'> 		bnx2x_send_unload_done(bp, true);</div><div class='hunk'>@@ -14410,11 +14298,16 @@ static void bnx2x_io_resume(struct pci_dev *pdev)</div><div class='ctx'> 	bp-&gt;fw_seq = SHMEM_RD(bp, func_mb[BP_FW_MB_IDX(bp)].drv_mb_header) &amp;</div><div class='ctx'> 							DRV_MSG_SEQ_NUMBER_MASK;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(dev))</div><div class='del'>-		bnx2x_nic_load(bp, LOAD_NORMAL);</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		if (bnx2x_nic_load(bp, LOAD_NORMAL)) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Error during driver initialization, try unloading/reloading the driver\n");</div><div class='add'>+			goto done;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='add'>+done:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -14452,8 +14345,7 @@ static struct pci_driver bnx2x_pci_driver = {</div><div class='ctx'> 	.id_table    = bnx2x_pci_tbl,</div><div class='ctx'> 	.probe       = bnx2x_init_one,</div><div class='ctx'> 	.remove      = bnx2x_remove_one,</div><div class='del'>-	.suspend     = bnx2x_suspend,</div><div class='del'>-	.resume      = bnx2x_resume,</div><div class='add'>+	.driver.pm   = &amp;bnx2x_pm_ops,</div><div class='ctx'> 	.err_handler = &amp;bnx2x_err_handler,</div><div class='ctx'> #ifdef CONFIG_BNX2X_SRIOV</div><div class='ctx'> 	.sriov_configure = bnx2x_sriov_configure,</div><div class='hunk'>@@ -14465,8 +14357,6 @@ static int __init bnx2x_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	pr_info("%s", version);</div><div class='del'>-</div><div class='ctx'> 	bnx2x_wq = create_singlethread_workqueue("bnx2x");</div><div class='ctx'> 	if (bnx2x_wq == NULL) {</div><div class='ctx'> 		pr_err("Cannot create workqueue\n");</div><div class='hunk'>@@ -14516,9 +14406,7 @@ module_exit(bnx2x_cleanup);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_set_iscsi_eth_mac_addr - set iSCSI MAC(s).</div><div class='del'>- *</div><div class='ctx'>  * @bp:		driver handle</div><div class='del'>- * @set:	set or clear the CAM entry</div><div class='ctx'>  *</div><div class='ctx'>  * This function will wait until the ramrod completion returns.</div><div class='ctx'>  * Return 0 if success, -ENODEV if ramrod doesn't return.</div><div class='hunk'>@@ -15022,9 +14910,11 @@ void bnx2x_setup_cnic_irq_info(struct bnx2x *bp)</div><div class='ctx'> 	else</div><div class='ctx'> 		cp-&gt;irq_arr[0].status_blk = (void *)bp-&gt;cnic_sb.e1x_sb;</div><div class='ctx'> </div><div class='add'>+	cp-&gt;irq_arr[0].status_blk_map = bp-&gt;cnic_sb_mapping;</div><div class='ctx'> 	cp-&gt;irq_arr[0].status_blk_num =  bnx2x_cnic_fw_sb_id(bp);</div><div class='ctx'> 	cp-&gt;irq_arr[0].status_blk_num2 = bnx2x_cnic_igu_sb_id(bp);</div><div class='ctx'> 	cp-&gt;irq_arr[1].status_blk = bp-&gt;def_status_blk;</div><div class='add'>+	cp-&gt;irq_arr[1].status_blk_map = bp-&gt;def_status_blk_mapping;</div><div class='ctx'> 	cp-&gt;irq_arr[1].status_blk_num = DEF_SB_ID;</div><div class='ctx'> 	cp-&gt;irq_arr[1].status_blk_num2 = DEF_SB_IGU_ID;</div><div class='ctx'> </div><div class='hunk'>@@ -15214,11 +15104,24 @@ static void bnx2x_ptp_task(struct work_struct *work)</div><div class='ctx'> 	u32 val_seq;</div><div class='ctx'> 	u64 timestamp, ns;</div><div class='ctx'> 	struct skb_shared_hwtstamps shhwtstamps;</div><div class='add'>+	bool bail = true;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	/* Read Tx timestamp registers */</div><div class='del'>-	val_seq = REG_RD(bp, port ? NIG_REG_P1_TLLH_PTP_BUF_SEQID :</div><div class='del'>-			 NIG_REG_P0_TLLH_PTP_BUF_SEQID);</div><div class='del'>-	if (val_seq &amp; 0x10000) {</div><div class='add'>+	/* FW may take a while to complete timestamping; try a bit and if it's</div><div class='add'>+	 * still not complete, may indicate an error state - bail out then.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; 10; i++) {</div><div class='add'>+		/* Read Tx timestamp registers */</div><div class='add'>+		val_seq = REG_RD(bp, port ? NIG_REG_P1_TLLH_PTP_BUF_SEQID :</div><div class='add'>+				 NIG_REG_P0_TLLH_PTP_BUF_SEQID);</div><div class='add'>+		if (val_seq &amp; 0x10000) {</div><div class='add'>+			bail = false;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		msleep(1 &lt;&lt; i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!bail) {</div><div class='ctx'> 		/* There is a valid timestamp value */</div><div class='ctx'> 		timestamp = REG_RD(bp, port ? NIG_REG_P1_TLLH_PTP_BUF_TS_MSB :</div><div class='ctx'> 				   NIG_REG_P0_TLLH_PTP_BUF_TS_MSB);</div><div class='hunk'>@@ -15233,16 +15136,18 @@ static void bnx2x_ptp_task(struct work_struct *work)</div><div class='ctx'> 		memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='ctx'> 		shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='ctx'> 		skb_tstamp_tx(bp-&gt;ptp_tx_skb, &amp;shhwtstamps);</div><div class='del'>-		dev_kfree_skb_any(bp-&gt;ptp_tx_skb);</div><div class='del'>-		bp-&gt;ptp_tx_skb = NULL;</div><div class='ctx'> </div><div class='ctx'> 		DP(BNX2X_MSG_PTP, "Tx timestamp, timestamp cycles = %llu, ns = %llu\n",</div><div class='ctx'> 		   timestamp, ns);</div><div class='ctx'> 	} else {</div><div class='del'>-		DP(BNX2X_MSG_PTP, "There is no valid Tx timestamp yet\n");</div><div class='del'>-		/* Reschedule to keep checking for a valid timestamp value */</div><div class='del'>-		schedule_work(&amp;bp-&gt;ptp_task);</div><div class='add'>+		DP(BNX2X_MSG_PTP,</div><div class='add'>+		   "Tx timestamp is not recorded (register read=%u)\n",</div><div class='add'>+		   val_seq);</div><div class='add'>+		bp-&gt;eth_stats.ptp_skip_tx_ts++;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb_any(bp-&gt;ptp_tx_skb);</div><div class='add'>+	bp-&gt;ptp_tx_skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnx2x_set_rx_ts(struct bnx2x *bp, struct sk_buff *skb)</div><div class='hunk'>@@ -15269,7 +15174,7 @@ void bnx2x_set_rx_ts(struct bnx2x *bp, struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Read the PHC */</div><div class='del'>-static u64 bnx2x_cyclecounter_read(const struct cyclecounter *cc)</div><div class='add'>+static u64 bnx2x_cyclecounter_read(struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnx2x *bp = container_of(cc, struct bnx2x, cyclecounter);</div><div class='ctx'> 	int port = BP_PORT(bp);</div><div class='hunk'>@@ -15380,6 +15285,7 @@ int bnx2x_configure_ptp_filters(struct bnx2x *bp)</div><div class='ctx'> 		REG_WR(bp, rule, BNX2X_PTP_TX_ON_RULE_MASK);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_TX_ONESTEP_SYNC:</div><div class='add'>+	case HWTSTAMP_TX_ONESTEP_P2P:</div><div class='ctx'> 		BNX2X_ERR("One-step timestamping is not supported\n");</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -15443,36 +15349,57 @@ int bnx2x_configure_ptp_filters(struct bnx2x *bp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnx2x_hwtstamp_ioctl(struct bnx2x *bp, struct ifreq *ifr)</div><div class='add'>+static int bnx2x_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			      struct kernel_hwtstamp_config *config,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct hwtstamp_config config;</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	DP(BNX2X_MSG_PTP, "HWTSTAMP IOCTL called\n");</div><div class='add'>+	DP(BNX2X_MSG_PTP, "HWTSTAMP SET called\n");</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;config, ifr-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (!netif_running(dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Device is down");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	DP(BNX2X_MSG_PTP, "Requested tx_type: %d, requested rx_filters = %d\n",</div><div class='del'>-	   config.tx_type, config.rx_filter);</div><div class='add'>+	   config-&gt;tx_type, config-&gt;rx_filter);</div><div class='ctx'> </div><div class='del'>-	if (config.flags) {</div><div class='del'>-		BNX2X_ERR("config.flags is reserved for future use\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "One-step timestamping is not supported");</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;hwtstamp_ioctl_called = 1;</div><div class='del'>-	bp-&gt;tx_type = config.tx_type;</div><div class='del'>-	bp-&gt;rx_filter = config.rx_filter;</div><div class='add'>+	bp-&gt;hwtstamp_ioctl_called = true;</div><div class='add'>+	bp-&gt;tx_type = config-&gt;tx_type;</div><div class='add'>+	bp-&gt;rx_filter = config-&gt;rx_filter;</div><div class='ctx'> </div><div class='ctx'> 	rc = bnx2x_configure_ptp_filters(bp);</div><div class='del'>-	if (rc)</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "HW configuration failure");</div><div class='ctx'> 		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	config.rx_filter = bp-&gt;rx_filter;</div><div class='add'>+	config-&gt;rx_filter = bp-&gt;rx_filter;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, &amp;config, sizeof(config)) ?</div><div class='del'>-		-EFAULT : 0;</div><div class='add'>+static int bnx2x_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			      struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct bnx2x *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	config-&gt;rx_filter = bp-&gt;rx_filter;</div><div class='add'>+	config-&gt;tx_type = bp-&gt;tx_type;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configures HW for PTP */</div><div class='hunk'>@@ -15543,7 +15470,7 @@ void bnx2x_init_ptp(struct bnx2x *bp)</div><div class='ctx'> 		bnx2x_init_cyclecounter(bp);</div><div class='ctx'> 		timecounter_init(&amp;bp-&gt;timecounter, &amp;bp-&gt;cyclecounter,</div><div class='ctx'> 				 ktime_to_ns(ktime_get_real()));</div><div class='del'>-		bp-&gt;timecounter_init_done = 1;</div><div class='add'>+		bp-&gt;timecounter_init_done = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	DP(BNX2X_MSG_PTP, "PTP initialization ended successfully\n");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h<br/>index a43dea259b12..a018f251d198 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h</a></div><div class='hunk'>@@ -284,12 +284,12 @@</div><div class='ctx'> #define CCM_REG_GR_ARB_TYPE					 0xd015c</div><div class='ctx'> /* [RW 2] Load (FIC0) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed; that the Store channel priority is</div><div class='del'>-   the compliment to 4 of the rest priorities - Aggregation channel; Load</div><div class='add'>+   the complement to 4 of the rest priorities - Aggregation channel; Load</div><div class='ctx'>    (FIC0) channel and Load (FIC1). */</div><div class='ctx'> #define CCM_REG_GR_LD0_PR					 0xd0164</div><div class='ctx'> /* [RW 2] Load (FIC1) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed; that the Store channel priority is</div><div class='del'>-   the compliment to 4 of the rest priorities - Aggregation channel; Load</div><div class='add'>+   the complement to 4 of the rest priorities - Aggregation channel; Load</div><div class='ctx'>    (FIC0) channel and Load (FIC1). */</div><div class='ctx'> #define CCM_REG_GR_LD1_PR					 0xd0168</div><div class='ctx'> /* [RW 2] General flags index. */</div><div class='hunk'>@@ -868,6 +868,8 @@</div><div class='ctx'> #define DORQ_REG_VF_TYPE_VALUE_0				 0x170258</div><div class='ctx'> #define DORQ_REG_VF_USAGE_CT_LIMIT				 0x170340</div><div class='ctx'> </div><div class='add'>+extern const u32 dmae_reg_go_c[];</div><div class='add'>+</div><div class='ctx'> /* [RW 4] Initial activity counter value on the load request; when the</div><div class='ctx'>    shortcut is done. */</div><div class='ctx'> #define DORQ_REG_SHRT_ACT_CNT					 0x170070</div><div class='hunk'>@@ -2212,7 +2214,7 @@</div><div class='ctx'>  * MAC DA 2. The reset default is set to mask out all parameters.</div><div class='ctx'>  */</div><div class='ctx'> #define NIG_REG_P0_LLH_PTP_PARAM_MASK				 0x187a0</div><div class='del'>-/* [RW 14] Mask regiser for the rules used in detecting PTP packets. Set</div><div class='add'>+/* [RW 14] Mask register for the rules used in detecting PTP packets. Set</div><div class='ctx'>  * each bit to 1 to mask out that particular rule. 0-{IPv4 DA 0; UDP DP 0} .</div><div class='ctx'>  * 1-{IPv4 DA 0; UDP DP 1} . 2-{IPv4 DA 1; UDP DP 0} . 3-{IPv4 DA 1; UDP DP</div><div class='ctx'>  * 1} . 4-{IPv6 DA 0; UDP DP 0} . 5-{IPv6 DA 0; UDP DP 1} . 6-{IPv6 DA 1;</div><div class='hunk'>@@ -2381,7 +2383,7 @@</div><div class='ctx'>  * MAC DA 2. The reset default is set to mask out all parameters.</div><div class='ctx'>  */</div><div class='ctx'> #define NIG_REG_P1_LLH_PTP_PARAM_MASK				 0x187c8</div><div class='del'>-/* [RW 14] Mask regiser for the rules used in detecting PTP packets. Set</div><div class='add'>+/* [RW 14] Mask register for the rules used in detecting PTP packets. Set</div><div class='ctx'>  * each bit to 1 to mask out that particular rule. 0-{IPv4 DA 0; UDP DP 0} .</div><div class='ctx'>  * 1-{IPv4 DA 0; UDP DP 1} . 2-{IPv4 DA 1; UDP DP 0} . 3-{IPv4 DA 1; UDP DP</div><div class='ctx'>  * 1} . 4-{IPv6 DA 0; UDP DP 0} . 5-{IPv6 DA 0; UDP DP 1} . 6-{IPv6 DA 1;</div><div class='hunk'>@@ -2493,7 +2495,7 @@</div><div class='ctx'>  * MAC DA 2. The reset default is set to mask out all parameters.</div><div class='ctx'>  */</div><div class='ctx'> #define NIG_REG_P0_TLLH_PTP_PARAM_MASK				 0x187f0</div><div class='del'>-/* [RW 14] Mask regiser for the rules used in detecting PTP packets. Set</div><div class='add'>+/* [RW 14] Mask register for the rules used in detecting PTP packets. Set</div><div class='ctx'>  * each bit to 1 to mask out that particular rule. 0-{IPv4 DA 0; UDP DP 0} .</div><div class='ctx'>  * 1-{IPv4 DA 0; UDP DP 1} . 2-{IPv4 DA 1; UDP DP 0} . 3-{IPv4 DA 1; UDP DP</div><div class='ctx'>  * 1} . 4-{IPv6 DA 0; UDP DP 0} . 5-{IPv6 DA 0; UDP DP 1} . 6-{IPv6 DA 1;</div><div class='hunk'>@@ -2529,7 +2531,7 @@</div><div class='ctx'>  * MAC DA 2. The reset default is set to mask out all parameters.</div><div class='ctx'>  */</div><div class='ctx'> #define NIG_REG_P1_TLLH_PTP_PARAM_MASK				 0x187f8</div><div class='del'>-/* [RW 14] Mask regiser for the rules used in detecting PTP packets. Set</div><div class='add'>+/* [RW 14] Mask register for the rules used in detecting PTP packets. Set</div><div class='ctx'>  * each bit to 1 to mask out that particular rule. 0-{IPv4 DA 0; UDP DP 0} .</div><div class='ctx'>  * 1-{IPv4 DA 0; UDP DP 1} . 2-{IPv4 DA 1; UDP DP 0} . 3-{IPv4 DA 1; UDP DP</div><div class='ctx'>  * 1} . 4-{IPv6 DA 0; UDP DP 0} . 5-{IPv6 DA 0; UDP DP 1} . 6-{IPv6 DA 1;</div><div class='hunk'>@@ -4489,11 +4491,11 @@</div><div class='ctx'> #define TCM_REG_GR_ARB_TYPE					 0x50114</div><div class='ctx'> /* [RW 2] Load (FIC0) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed that the Store channel is the</div><div class='del'>-   compliment of the other 3 groups. */</div><div class='add'>+   complement of the other 3 groups. */</div><div class='ctx'> #define TCM_REG_GR_LD0_PR					 0x5011c</div><div class='ctx'> /* [RW 2] Load (FIC1) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed that the Store channel is the</div><div class='del'>-   compliment of the other 3 groups. */</div><div class='add'>+   complement of the other 3 groups. */</div><div class='ctx'> #define TCM_REG_GR_LD1_PR					 0x50120</div><div class='ctx'> /* [RW 4] The number of double REG-pairs; loaded from the STORM context and</div><div class='ctx'>    sent to STORM; for a specific connection type. The double REG-pairs are</div><div class='hunk'>@@ -5020,11 +5022,11 @@</div><div class='ctx'> #define UCM_REG_GR_ARB_TYPE					 0xe0144</div><div class='ctx'> /* [RW 2] Load (FIC0) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed that the Store channel group is</div><div class='del'>-   compliment to the others. */</div><div class='add'>+   complement to the others. */</div><div class='ctx'> #define UCM_REG_GR_LD0_PR					 0xe014c</div><div class='ctx'> /* [RW 2] Load (FIC1) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed that the Store channel group is</div><div class='del'>-   compliment to the others. */</div><div class='add'>+   complement to the others. */</div><div class='ctx'> #define UCM_REG_GR_LD1_PR					 0xe0150</div><div class='ctx'> /* [RW 2] The queue index for invalidate counter flag decision. */</div><div class='ctx'> #define UCM_REG_INV_CFLG_Q					 0xe00e4</div><div class='hunk'>@@ -5523,11 +5525,11 @@</div><div class='ctx'> #define XCM_REG_GR_ARB_TYPE					 0x2020c</div><div class='ctx'> /* [RW 2] Load (FIC0) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed that the Channel group is the</div><div class='del'>-   compliment of the other 3 groups. */</div><div class='add'>+   complement of the other 3 groups. */</div><div class='ctx'> #define XCM_REG_GR_LD0_PR					 0x20214</div><div class='ctx'> /* [RW 2] Load (FIC1) channel group priority. The lowest priority is 0; the</div><div class='ctx'>    highest priority is 3. It is supposed that the Channel group is the</div><div class='del'>-   compliment of the other 3 groups. */</div><div class='add'>+   complement of the other 3 groups. */</div><div class='ctx'> #define XCM_REG_GR_LD1_PR					 0x20218</div><div class='ctx'> /* [RW 1] Input nig0 Interface enable. If 0 - the valid input is</div><div class='ctx'>    disregarded; acknowledge output is deasserted; all other signals are</div><div class='hunk'>@@ -6218,7 +6220,7 @@</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_GPIO0_FUNCTION_0			 (0x1&lt;&lt;2)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR			 (0x1&lt;&lt;12)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY		 (0x1&lt;&lt;28)</div><div class='del'>-#define AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY		 (0x1&lt;&lt;31)</div><div class='add'>+#define AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY		 (0x1U&lt;&lt;31)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY		 (0x1&lt;&lt;29)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY		 (0x1&lt;&lt;30)</div><div class='ctx'> #define AEU_INPUTS_ATTN_BITS_MISC_HW_INTERRUPT			 (0x1&lt;&lt;15)</div><div class='hunk'>@@ -7639,6 +7641,82 @@ Theotherbitsarereservedandshouldbezero*/</div><div class='ctx'> 	(0x80 | ((_type)&amp;0xf &lt;&lt; 3) | ((CDU_CRC8(_cid, _region, _type)) &amp; 0x7))</div><div class='ctx'> #define CDU_RSRVD_INVALIDATE_CONTEXT_VALUE(_val) ((_val) &amp; ~0x80)</div><div class='ctx'> </div><div class='add'>+/* IdleChk registers */</div><div class='add'>+#define PXP_REG_HST_VF_DISABLED_ERROR_VALID			 0x1030bc</div><div class='add'>+#define PXP_REG_HST_VF_DISABLED_ERROR_DATA			 0x1030b8</div><div class='add'>+#define PXP_REG_HST_PER_VIOLATION_VALID				 0x1030e0</div><div class='add'>+#define PXP_REG_HST_INCORRECT_ACCESS_VALID			 0x1030cc</div><div class='add'>+#define PXP2_REG_RD_CPL_ERR_DETAILS				 0x120778</div><div class='add'>+#define PXP2_REG_RD_CPL_ERR_DETAILS2				 0x12077c</div><div class='add'>+#define PXP2_REG_RQ_GARB					 0x120748</div><div class='add'>+#define PBF_REG_DISABLE_NEW_TASK_PROC_Q0			 0x15c1bc</div><div class='add'>+#define PBF_REG_DISABLE_NEW_TASK_PROC_Q1			 0x15c1c0</div><div class='add'>+#define PBF_REG_DISABLE_NEW_TASK_PROC_Q2			 0x15c1c4</div><div class='add'>+#define PBF_REG_DISABLE_NEW_TASK_PROC_Q3			 0x15c1c8</div><div class='add'>+#define PBF_REG_DISABLE_NEW_TASK_PROC_Q4			 0x15c1cc</div><div class='add'>+#define PBF_REG_DISABLE_NEW_TASK_PROC_Q5			 0x15c1d0</div><div class='add'>+#define PBF_REG_CREDIT_Q2					 0x140344</div><div class='add'>+#define PBF_REG_CREDIT_Q3					 0x140348</div><div class='add'>+#define PBF_REG_CREDIT_Q4					 0x14034c</div><div class='add'>+#define PBF_REG_CREDIT_Q5					 0x140350</div><div class='add'>+#define PBF_REG_INIT_CRD_Q2					 0x15c238</div><div class='add'>+#define PBF_REG_INIT_CRD_Q3					 0x15c23c</div><div class='add'>+#define PBF_REG_INIT_CRD_Q4					 0x15c240</div><div class='add'>+#define PBF_REG_INIT_CRD_Q5					 0x15c244</div><div class='add'>+#define PBF_REG_TASK_CNT_Q0					 0x140374</div><div class='add'>+#define PBF_REG_TASK_CNT_Q1					 0x140378</div><div class='add'>+#define PBF_REG_TASK_CNT_Q2					 0x14037c</div><div class='add'>+#define PBF_REG_TASK_CNT_Q3					 0x140380</div><div class='add'>+#define PBF_REG_TASK_CNT_Q4					 0x140384</div><div class='add'>+#define PBF_REG_TASK_CNT_Q5					 0x140388</div><div class='add'>+#define PBF_REG_TASK_CNT_LB_Q					 0x140370</div><div class='add'>+#define QM_REG_BYTECRD0						 0x16e6fc</div><div class='add'>+#define QM_REG_BYTECRD1						 0x16e700</div><div class='add'>+#define QM_REG_BYTECRD2						 0x16e704</div><div class='add'>+#define QM_REG_BYTECRD3						 0x16e7ac</div><div class='add'>+#define QM_REG_BYTECRD4						 0x16e7b0</div><div class='add'>+#define QM_REG_BYTECRD5						 0x16e7b4</div><div class='add'>+#define QM_REG_BYTECRD6						 0x16e7b8</div><div class='add'>+#define QM_REG_BYTECRDCMDQ_0					 0x16e6e8</div><div class='add'>+#define QM_REG_BYTECRDERRREG					 0x16e708</div><div class='add'>+#define MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID			 0xa714</div><div class='add'>+#define QM_REG_VOQCREDIT_2					 0x1682d8</div><div class='add'>+#define QM_REG_VOQCREDIT_3					 0x1682dc</div><div class='add'>+#define QM_REG_VOQCREDIT_5					 0x1682e4</div><div class='add'>+#define QM_REG_VOQCREDIT_6					 0x1682e8</div><div class='add'>+#define QM_REG_VOQINITCREDIT_3					 0x16806c</div><div class='add'>+#define QM_REG_VOQINITCREDIT_6					 0x168078</div><div class='add'>+#define QM_REG_FWVOQ0TOHWVOQ					 0x16e7bc</div><div class='add'>+#define QM_REG_FWVOQ1TOHWVOQ					 0x16e7c0</div><div class='add'>+#define QM_REG_FWVOQ2TOHWVOQ					 0x16e7c4</div><div class='add'>+#define QM_REG_FWVOQ3TOHWVOQ					 0x16e7c8</div><div class='add'>+#define QM_REG_FWVOQ4TOHWVOQ					 0x16e7cc</div><div class='add'>+#define QM_REG_FWVOQ5TOHWVOQ					 0x16e7d0</div><div class='add'>+#define QM_REG_FWVOQ6TOHWVOQ					 0x16e7d4</div><div class='add'>+#define QM_REG_FWVOQ7TOHWVOQ					 0x16e7d8</div><div class='add'>+#define NIG_REG_INGRESS_EOP_PORT0_EMPTY				 0x104ec</div><div class='add'>+#define NIG_REG_INGRESS_EOP_PORT1_EMPTY				 0x104f8</div><div class='add'>+#define NIG_REG_INGRESS_RMP0_DSCR_EMPTY				 0x10530</div><div class='add'>+#define NIG_REG_INGRESS_RMP1_DSCR_EMPTY				 0x10538</div><div class='add'>+#define NIG_REG_INGRESS_LB_PBF_DELAY_EMPTY			 0x10508</div><div class='add'>+#define NIG_REG_EGRESS_MNG0_FIFO_EMPTY				 0x10460</div><div class='add'>+#define NIG_REG_EGRESS_MNG1_FIFO_EMPTY				 0x10474</div><div class='add'>+#define NIG_REG_EGRESS_DEBUG_FIFO_EMPTY				 0x10418</div><div class='add'>+#define NIG_REG_EGRESS_DELAY0_EMPTY				 0x10420</div><div class='add'>+#define NIG_REG_EGRESS_DELAY1_EMPTY				 0x10428</div><div class='add'>+#define NIG_REG_LLH0_FIFO_EMPTY					 0x10548</div><div class='add'>+#define NIG_REG_LLH1_FIFO_EMPTY					 0x10558</div><div class='add'>+#define NIG_REG_P0_TX_MNG_HOST_FIFO_EMPTY			 0x182a8</div><div class='add'>+#define NIG_REG_P0_TLLH_FIFO_EMPTY				 0x18308</div><div class='add'>+#define NIG_REG_P0_HBUF_DSCR_EMPTY				 0x18318</div><div class='add'>+#define NIG_REG_P1_HBUF_DSCR_EMPTY				 0x18348</div><div class='add'>+#define NIG_REG_P0_RX_MACFIFO_EMPTY				 0x18570</div><div class='add'>+#define NIG_REG_P0_TX_MACFIFO_EMPTY				 0x18578</div><div class='add'>+#define NIG_REG_EGRESS_DELAY2_EMPTY				 0x1862c</div><div class='add'>+#define NIG_REG_EGRESS_DELAY3_EMPTY				 0x18630</div><div class='add'>+#define NIG_REG_EGRESS_DELAY4_EMPTY				 0x18634</div><div class='add'>+#define NIG_REG_EGRESS_DELAY5_EMPTY				 0x18638</div><div class='add'>+</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * Description:</div><div class='ctx'>  *	   Calculates crc 8 on a word value: polynomial 0-1-2-8</div><div class='hunk'>@@ -7697,6 +7775,4 @@ static inline u8 calc_crc8(u32 data, u8 crc)</div><div class='ctx'> </div><div class='ctx'> 	return crc_res;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> #endif /* BNX2X_REG_H */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c<br/>new file mode 100644<br/>index 000000000000..3f8bdad3351c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_self_test.c</a></div><div class='hunk'>@@ -0,0 +1,3183 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include "bnx2x.h"</div><div class='add'>+</div><div class='add'>+#define NA 0xCD</div><div class='add'>+</div><div class='add'>+#define IDLE_CHK_E1			0x01</div><div class='add'>+#define IDLE_CHK_E1H			0x02</div><div class='add'>+#define IDLE_CHK_E2			0x04</div><div class='add'>+#define IDLE_CHK_E3A0			0x08</div><div class='add'>+#define IDLE_CHK_E3B0			0x10</div><div class='add'>+</div><div class='add'>+#define IDLE_CHK_ERROR			1</div><div class='add'>+#define IDLE_CHK_ERROR_NO_TRAFFIC	2</div><div class='add'>+#define IDLE_CHK_WARNING		3</div><div class='add'>+</div><div class='add'>+#define MAX_FAIL_MSG 256</div><div class='add'>+</div><div class='add'>+/* statistics and error reporting */</div><div class='add'>+static int idle_chk_errors, idle_chk_warnings;</div><div class='add'>+</div><div class='add'>+/* masks for all chip types */</div><div class='add'>+static int is_e1, is_e1h, is_e2, is_e3a0, is_e3b0;</div><div class='add'>+</div><div class='add'>+/* struct for the argument list for a predicate in the self test databasei */</div><div class='add'>+struct st_pred_args {</div><div class='add'>+	u32 val1; /* value read from first register */</div><div class='add'>+	u32 val2; /* value read from second register, if applicable */</div><div class='add'>+	u32 imm1; /* 1st value in predicate condition, left-to-right */</div><div class='add'>+	u32 imm2; /* 2nd value in predicate condition, left-to-right */</div><div class='add'>+	u32 imm3; /* 3rd value in predicate condition, left-to-right */</div><div class='add'>+	u32 imm4; /* 4th value in predicate condition, left-to-right */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* struct representing self test record - a single test */</div><div class='add'>+struct st_record {</div><div class='add'>+	u8 chip_mask;</div><div class='add'>+	u8 macro;</div><div class='add'>+	u32 reg1;</div><div class='add'>+	u32 reg2;</div><div class='add'>+	u16 loop;</div><div class='add'>+	u16 incr;</div><div class='add'>+	int (*bnx2x_predicate)(struct st_pred_args *pred_args);</div><div class='add'>+	u32 reg3;</div><div class='add'>+	u8 severity;</div><div class='add'>+	char *fail_msg;</div><div class='add'>+	struct st_pred_args pred_args;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* predicates for self test */</div><div class='add'>+static int peq(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (args-&gt;val1 == args-&gt;imm1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pneq(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (args-&gt;val1 != args-&gt;imm1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pand_neq(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return ((args-&gt;val1 &amp; args-&gt;imm1) != args-&gt;imm2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pand_neq_x2(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (((args-&gt;val1 &amp; args-&gt;imm1) != args-&gt;imm2) &amp;&amp;</div><div class='add'>+		((args-&gt;val1 &amp; args-&gt;imm3) != args-&gt;imm4));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pneq_err(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return ((args-&gt;val1 != args-&gt;imm1) &amp;&amp; (idle_chk_errors &gt; args-&gt;imm2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pgt(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (args-&gt;val1 &gt; args-&gt;imm1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pneq_r2(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (args-&gt;val1 != args-&gt;val2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int plt_sub_r2(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (args-&gt;val1 &lt; (args-&gt;val2 - args-&gt;imm1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int pne_sub_r2(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (args-&gt;val1 != (args-&gt;val2 - args-&gt;imm1));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int prsh_and_neq(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return (((args-&gt;val1 &gt;&gt; args-&gt;imm1) &amp; args-&gt;imm2) != args-&gt;imm3);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int peq_neq_r2(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return ((args-&gt;val1 == args-&gt;imm1) &amp;&amp; (args-&gt;val2 != args-&gt;imm2));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int peq_neq_neq_r2(struct st_pred_args *args)</div><div class='add'>+{</div><div class='add'>+	return ((args-&gt;val1 == args-&gt;imm1) &amp;&amp; (args-&gt;val2 != args-&gt;imm2) &amp;&amp;</div><div class='add'>+		(args-&gt;val2 != args-&gt;imm3));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* struct holding the database of self test checks (registers and predicates) */</div><div class='add'>+/* lines start from 2 since line 1 is heading in csv */</div><div class='add'>+#define ST_DB_LINES 468</div><div class='add'>+static struct st_record st_database[ST_DB_LINES] = {</div><div class='add'>+/*line 2*/{(0x3), 1, 0x2114,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: ucorr_err_status is not 0",</div><div class='add'>+	{NA, NA, 0x0FF010, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 3*/{(0x3), 1, 0x2114,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: ucorr_err_status - Unsupported request error",</div><div class='add'>+	{NA, NA, 0x100000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 4*/{(0x3), 1, 0x2120,</div><div class='add'>+	NA, 1, 0, pand_neq_x2,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: corr_err_status is not 0x2000",</div><div class='add'>+	{NA, NA, 0x31C1, 0x2000, 0x31C1, 0} },</div><div class='add'>+</div><div class='add'>+/*line 5*/{(0x3), 1, 0x2814,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: attentions register is not 0x40100",</div><div class='add'>+	{NA, NA, ~0x40100, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 6*/{(0x2), 1, 0x281c,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: attentions register is not 0x40040100",</div><div class='add'>+	{NA, NA, ~0x40040100, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 7*/{(0x2), 1, 0x2820,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: attentions register is not 0x40040100",</div><div class='add'>+	{NA, NA, ~0x40040100, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 8*/{(0x3), 1, PXP2_REG_PGL_EXP_ROM2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: There are outstanding read requests. Not all completios have arrived for read requests on tags that are marked with 0",</div><div class='add'>+	{NA, NA, 0xffffffff, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 9*/{(0x3), 2, 0x212c,</div><div class='add'>+	NA, 4, 4, pneq_err,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: error packet header is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 10*/{(0x1C), 1, 0x2104,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: ucorr_err_status is not 0",</div><div class='add'>+	{NA, NA, 0x0FD010, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 11*/{(0x1C), 1, 0x2104,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: ucorr_err_status - Unsupported request error",</div><div class='add'>+	{NA, NA, 0x100000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 12*/{(0x1C), 1, 0x2104,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: ucorr_err_status - Flow Control Protocol Error",</div><div class='add'>+	{NA, NA, 0x2000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 13*/{(0x1C), 1, 0x2110,</div><div class='add'>+	NA, 1, 0, pand_neq_x2,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: corr_err_status is not 0x2000",</div><div class='add'>+	{NA, NA, 0x31C1, 0x2000, 0x31C1, 0} },</div><div class='add'>+</div><div class='add'>+/*line 14*/{(0x1C), 1, 0x2814,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: TTX_BRIDGE_FORWARD_ERR - Received master request while BME was 0",</div><div class='add'>+	{NA, NA, 0x2000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 15*/{(0x1C), 1, 0x2814,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: Func 0 1: attentions register is not 0x2040902",</div><div class='add'>+	{NA, NA, ~0x2040902, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 16*/{(0x1C), 1, 0x2854,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: Func 2 3 4: attentions register is not 0x10240902",</div><div class='add'>+	{NA, NA, ~0x10240902, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 17*/{(0x1C), 1, 0x285c,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: Func 5 6 7: attentions register is not 0x10240902",</div><div class='add'>+	{NA, NA, ~0x10240902, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 18*/{(0x18), 1, 0x3040,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PCIE: Overflow in DLP2TLP buffer",</div><div class='add'>+	{NA, NA, 0x2, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 19*/{(0x1C), 1, PXP2_REG_PGL_EXP_ROM2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: There are outstanding read requests for tags 0-31. Not all completios have arrived for read requests on tags that are marked with 0",</div><div class='add'>+	{NA, NA, 0xffffffff, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 20*/{(0x1C), 2, 0x211c,</div><div class='add'>+	NA, 4, 4, pneq_err,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PCIE: error packet header is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 21*/{(0x1C), 1, PGLUE_B_REG_INCORRECT_RCV_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PGLUE_B: Packet received from PCIe not according to the rules",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 22*/{(0x1C), 1, PGLUE_B_REG_WAS_ERROR_VF_31_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: was_error for VFs 0-31 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 23*/{(0x1C), 1, PGLUE_B_REG_WAS_ERROR_VF_63_32,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: was_error for VFs 32-63 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 24*/{(0x1C), 1, PGLUE_B_REG_WAS_ERROR_VF_95_64,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: was_error for VFs 64-95 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 25*/{(0x1C), 1, PGLUE_B_REG_WAS_ERROR_VF_127_96,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: was_error for VFs 96-127 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 26*/{(0x1C), 1, PGLUE_B_REG_WAS_ERROR_PF_7_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: was_error for PFs 0-7 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 27*/{(0x1C), 1, PGLUE_B_REG_RX_ERR_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Completion received with error. (2:0) - PFID. (3) - VF_VALID. (9:4) - VFID. (11:10) - Error code : 0 - Completion Timeout; 1 - Unsupported Request; 2 - Completer Abort. (12) - valid bit",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 28*/{(0x1C), 1, PGLUE_B_REG_RX_TCPL_ERR_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: ATS TCPL received with error. (2:0) - PFID. (3) - VF_VALID. (9:4) - VFID. (11:10) - Error code : 0 - Completion Timeout ; 1 - Unsupported Request; 2 - Completer Abort. (16:12) - OTB Entry ID. (17) - valid bit",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 29*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_WR_ADD_31_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master write. Address(31:0) is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 30*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_WR_ADD_63_32,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master write. Address(63:32) is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 31*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_WR_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master write. Error details register is not 0. (4:0) VQID. (23:21) - PFID. (24) - VF_VALID. (30:25) - VFID",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 32*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_WR_DETAILS2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master write. Error details 2nd register is not 0. (21) - was_error set; (22) - BME cleared; (23) - FID_enable cleared; (24) - VF with parent PF FLR_request or IOV_disable_request",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 33*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_RD_ADD_31_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE: Error in master read address(31:0) is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 34*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_RD_ADD_63_32,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master read address(63:32) is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 35*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_RD_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master read Error details register is not 0. (4:0) VQID. (23:21) - PFID. (24) - VF_VALID. (30:25) - VFID",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 36*/{(0x1C), 1, PGLUE_B_REG_TX_ERR_RD_DETAILS2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Error in master read Error details 2nd register is not 0. (21) - was_error set; (22) - BME cleared; (23) - FID_enable cleared; (24) - VF with parent PF FLR_request or IOV_disable_request",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 37*/{(0x1C), 1, PGLUE_B_REG_VF_LENGTH_VIOLATION_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Target VF length violation access",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 38*/{(0x1C), 1, PGLUE_B_REG_VF_GRC_SPACE_VIOLATION_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Target VF GRC space access failed permission check",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 39*/{(0x1C), 1, PGLUE_B_REG_TAGS_63_32,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: There are outstanding read requests for tags 32-63. Not all completios have arrived for read requests on tags that are marked with 0",</div><div class='add'>+	{NA, NA, 0xffffffff, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 40*/{(0x1C), 3, PXP_REG_HST_VF_DISABLED_ERROR_VALID,</div><div class='add'>+	PXP_REG_HST_VF_DISABLED_ERROR_DATA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: Access to disabled VF took place",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 41*/{(0x1C), 1, PXP_REG_HST_PER_VIOLATION_VALID,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: Zone A permission violation occurred",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 42*/{(0x1C), 1, PXP_REG_HST_INCORRECT_ACCESS_VALID,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: Incorrect transaction took place",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 43*/{(0x1C), 1, PXP2_REG_RD_CPL_ERR_DETAILS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: Completion received with error. Error details register is not 0. (15:0) - ECHO. (28:16) - Sub Request length plus start_offset_2_0 minus 1",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 44*/{(0x1C), 1, PXP2_REG_RD_CPL_ERR_DETAILS2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: Completion received with error. Error details 2nd register is not 0. (4:0) - VQ ID. (8:5) - client ID. (9) - valid bit",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 45*/{(0x1F), 1, PXP2_REG_RQ_VQ0_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ0 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 46*/{(0x1F), 1, PXP2_REG_RQ_VQ1_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ1 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 47*/{(0x1F), 1, PXP2_REG_RQ_VQ2_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ2 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 48*/{(0x1F), 1, PXP2_REG_RQ_VQ3_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pgt,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ3 is not empty",</div><div class='add'>+	{NA, NA, 2, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 49*/{(0x1F), 1, PXP2_REG_RQ_VQ4_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ4 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 50*/{(0x1F), 1, PXP2_REG_RQ_VQ5_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ5 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 51*/{(0x1F), 1, PXP2_REG_RQ_VQ6_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ6 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 52*/{(0x1F), 1, PXP2_REG_RQ_VQ7_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ7 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 53*/{(0x1F), 1, PXP2_REG_RQ_VQ8_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ8 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 54*/{(0x1F), 1, PXP2_REG_RQ_VQ9_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ9 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 55*/{(0x1F), 1, PXP2_REG_RQ_VQ10_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ10 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 56*/{(0x1F), 1, PXP2_REG_RQ_VQ11_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ11 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 57*/{(0x1F), 1, PXP2_REG_RQ_VQ12_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ12 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 58*/{(0x1F), 1, PXP2_REG_RQ_VQ13_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ13 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 59*/{(0x1F), 1, PXP2_REG_RQ_VQ14_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ14 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 60*/{(0x1F), 1, PXP2_REG_RQ_VQ15_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ15 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 61*/{(0x1F), 1, PXP2_REG_RQ_VQ16_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ16 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 62*/{(0x1F), 1, PXP2_REG_RQ_VQ17_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ17 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 63*/{(0x1F), 1, PXP2_REG_RQ_VQ18_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ18 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 64*/{(0x1F), 1, PXP2_REG_RQ_VQ19_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ19 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 65*/{(0x1F), 1, PXP2_REG_RQ_VQ20_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ20 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 66*/{(0x1F), 1, PXP2_REG_RQ_VQ21_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ21 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 67*/{(0x1F), 1, PXP2_REG_RQ_VQ22_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ22 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 68*/{(0x1F), 1, PXP2_REG_RQ_VQ23_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ23 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 69*/{(0x1F), 1, PXP2_REG_RQ_VQ24_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ24 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 70*/{(0x1F), 1, PXP2_REG_RQ_VQ25_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ25 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 71*/{(0x1F), 1, PXP2_REG_RQ_VQ26_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ26 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 72*/{(0x1F), 1, PXP2_REG_RQ_VQ27_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ27 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 73*/{(0x1F), 1, PXP2_REG_RQ_VQ28_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ28 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 74*/{(0x1F), 1, PXP2_REG_RQ_VQ29_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ29 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 75*/{(0x1F), 1, PXP2_REG_RQ_VQ30_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ30 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 76*/{(0x1F), 1, PXP2_REG_RQ_VQ31_ENTRY_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: VQ31 is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 77*/{(0x1F), 1, PXP2_REG_RQ_UFIFO_NUM_OF_ENTRY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: rq_ufifo_num_of_entry is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 78*/{(0x1F), 1, PXP2_REG_RQ_RBC_DONE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: rq_rbc_done is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 79*/{(0x1F), 1, PXP2_REG_RQ_CFG_DONE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: rq_cfg_done is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 80*/{(0x3), 1, PXP2_REG_PSWRQ_BW_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: rq_read_credit and rq_write_credit are not 3",</div><div class='add'>+	{NA, NA, 0x1B, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 81*/{(0x1F), 1, PXP2_REG_RD_START_INIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: rd_start_init is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 82*/{(0x1F), 1, PXP2_REG_RD_INIT_DONE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: rd_init_done is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 83*/{(0x1F), 3, PXP2_REG_RD_SR_CNT,</div><div class='add'>+	PXP2_REG_RD_SR_NUM_CFG, 1, 0, pne_sub_r2,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: rd_sr_cnt is not equal to rd_sr_num_cfg",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 84*/{(0x1F), 3, PXP2_REG_RD_BLK_CNT,</div><div class='add'>+	PXP2_REG_RD_BLK_NUM_CFG, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: rd_blk_cnt is not equal to rd_blk_num_cfg",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 85*/{(0x1F), 3, PXP2_REG_RD_SR_CNT,</div><div class='add'>+	PXP2_REG_RD_SR_NUM_CFG, 1, 0, plt_sub_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: There are more than two unused SRs",</div><div class='add'>+	{NA, NA, 3, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 86*/{(0x1F), 3, PXP2_REG_RD_BLK_CNT,</div><div class='add'>+	PXP2_REG_RD_BLK_NUM_CFG, 1, 0, plt_sub_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: There are more than two unused blocks",</div><div class='add'>+	{NA, NA, 2, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 87*/{(0x1F), 1, PXP2_REG_RD_PORT_IS_IDLE_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: P0 All delivery ports are not idle",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 88*/{(0x1F), 1, PXP2_REG_RD_PORT_IS_IDLE_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: P1 All delivery ports are not idle",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 89*/{(0x1F), 2, PXP2_REG_RD_ALMOST_FULL_0,</div><div class='add'>+	NA, 11, 4, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: rd_almost_full is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 90*/{(0x1F), 1, PXP2_REG_RD_DISABLE_INPUTS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: PSWRD inputs are disabled",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 91*/{(0x1F), 1, PXP2_REG_HST_HEADER_FIFO_STATUS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: HST header FIFO status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 92*/{(0x1F), 1, PXP2_REG_HST_DATA_FIFO_STATUS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: HST data FIFO status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 93*/{(0x3), 1, PXP2_REG_PGL_WRITE_BLOCKED,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: pgl_write_blocked is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 94*/{(0x3), 1, PXP2_REG_PGL_READ_BLOCKED,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: pgl_read_blocked is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 95*/{(0x1C), 1, PXP2_REG_PGL_WRITE_BLOCKED,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: pgl_write_blocked is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 96*/{(0x1C), 1, PXP2_REG_PGL_READ_BLOCKED,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: pgl_read_blocked is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 97*/{(0x1F), 1, PXP2_REG_PGL_TXW_CDTS,</div><div class='add'>+	NA, 1, 0, prsh_and_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PXP2: There is data which is ready",</div><div class='add'>+	{NA, NA, 17, 1, 0, NA} },</div><div class='add'>+</div><div class='add'>+/*line 98*/{(0x1F), 1, PXP_REG_HST_ARB_IS_IDLE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: HST arbiter is not idle",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 99*/{(0x1F), 1, PXP_REG_HST_CLIENTS_WAITING_TO_ARB,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: HST one of the clients is waiting for delivery",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 100*/{(0x1E), 1, PXP_REG_HST_DISCARD_INTERNAL_WRITES_STATUS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: HST Close the gates: Discarding internal writes",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 101*/{(0x1E), 1, PXP_REG_HST_DISCARD_DOORBELLS_STATUS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: HST Close the gates: Discarding doorbells",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 102*/{(0x1C), 1, PXP2_REG_RQ_GARB,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: PSWRQ Close the gates is asserted. Check AEU AFTER_INVERT registers for parity errors",</div><div class='add'>+	{NA, NA, 0x1000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 103*/{(0x1F), 1, DMAE_REG_GO_C0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 0 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 104*/{(0x1F), 1, DMAE_REG_GO_C1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 1 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 105*/{(0x1F), 1, DMAE_REG_GO_C2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 2 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 106*/{(0x1F), 1, DMAE_REG_GO_C3,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 3 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 107*/{(0x1F), 1, DMAE_REG_GO_C4,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 4 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 108*/{(0x1F), 1, DMAE_REG_GO_C5,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 5 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 109*/{(0x1F), 1, DMAE_REG_GO_C6,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 6 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 110*/{(0x1F), 1, DMAE_REG_GO_C7,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 7 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 111*/{(0x1F), 1, DMAE_REG_GO_C8,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 8 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 112*/{(0x1F), 1, DMAE_REG_GO_C9,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 9 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 113*/{(0x1F), 1, DMAE_REG_GO_C10,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 10 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 114*/{(0x1F), 1, DMAE_REG_GO_C11,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 11 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 115*/{(0x1F), 1, DMAE_REG_GO_C12,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 12 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 116*/{(0x1F), 1, DMAE_REG_GO_C13,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 13 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 117*/{(0x1F), 1, DMAE_REG_GO_C14,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 14 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 118*/{(0x1F), 1, DMAE_REG_GO_C15,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DMAE: command 15 go is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 119*/{(0x1F), 1, CFC_REG_ERROR_VECTOR,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CFC: error vector is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 120*/{(0x1F), 1, CFC_REG_NUM_LCIDS_ARRIVING,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CFC: number of arriving LCIDs is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 121*/{(0x1F), 1, CFC_REG_NUM_LCIDS_ALLOC,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CFC: number of alloc LCIDs is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 122*/{(0x1F), 1, CFC_REG_NUM_LCIDS_LEAVING,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CFC: number of leaving LCIDs is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 123*/{(0x1F), 7, CFC_REG_INFO_RAM,</div><div class='add'>+	CFC_REG_CID_CAM, (CFC_REG_INFO_RAM_SIZE &gt;&gt; 4), 16, peq_neq_neq_r2,</div><div class='add'>+	CFC_REG_ACTIVITY_COUNTER, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CFC: AC is neither 0 nor 2 on connType 0 (ETH)",</div><div class='add'>+	{NA, NA, 0, 0, 2, NA} },</div><div class='add'>+</div><div class='add'>+/*line 124*/{(0x1F), 7, CFC_REG_INFO_RAM,</div><div class='add'>+	CFC_REG_CID_CAM, (CFC_REG_INFO_RAM_SIZE &gt;&gt; 4), 16, peq_neq_r2,</div><div class='add'>+	CFC_REG_ACTIVITY_COUNTER, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CFC: AC is not 0 on connType 1 (TOE)",</div><div class='add'>+	{NA, NA, 1, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 125*/{(0x1F), 7, CFC_REG_INFO_RAM,</div><div class='add'>+	CFC_REG_CID_CAM, (CFC_REG_INFO_RAM_SIZE &gt;&gt; 4), 16, peq_neq_r2,</div><div class='add'>+	CFC_REG_ACTIVITY_COUNTER, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CFC: AC is not 0 on connType 3 (iSCSI)",</div><div class='add'>+	{NA, NA, 3, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 126*/{(0x1F), 7, CFC_REG_INFO_RAM,</div><div class='add'>+	CFC_REG_CID_CAM, (CFC_REG_INFO_RAM_SIZE &gt;&gt; 4), 16, peq_neq_r2,</div><div class='add'>+	CFC_REG_ACTIVITY_COUNTER, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CFC: AC is not 0 on connType 4 (FCoE)",</div><div class='add'>+	{NA, NA, 4, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 127*/{(0x1F), 2, QM_REG_QTASKCTR_0,</div><div class='add'>+	NA, 64, 4, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Queue is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 128*/{(0xF), 3, QM_REG_VOQCREDIT_0,</div><div class='add'>+	QM_REG_VOQINITCREDIT_0, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_0, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 129*/{(0xF), 3, QM_REG_VOQCREDIT_1,</div><div class='add'>+	QM_REG_VOQINITCREDIT_1, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_1, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 130*/{(0xF), 3, QM_REG_VOQCREDIT_4,</div><div class='add'>+	QM_REG_VOQINITCREDIT_4, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_4, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 131*/{(0x3), 3, QM_REG_PORT0BYTECRD,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: P0 Byte credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 132*/{(0x3), 3, QM_REG_PORT1BYTECRD,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: P1 Byte credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 133*/{(0x1F), 1, CCM_REG_CAM_OCCUP,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CCM: XX protection CAM is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 134*/{(0x1F), 1, TCM_REG_CAM_OCCUP,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: XX protection CAM is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 135*/{(0x1F), 1, UCM_REG_CAM_OCCUP,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: XX protection CAM is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 136*/{(0x1F), 1, XCM_REG_CAM_OCCUP,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: XX protection CAM is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 137*/{(0x1F), 1, BRB1_REG_NUM_OF_FULL_BLOCKS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"BRB1: BRB is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 138*/{(0x1F), 1, CSEM_REG_SLEEP_THREADS_VALID,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSEM: There are sleeping threads",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 139*/{(0x1F), 1, TSEM_REG_SLEEP_THREADS_VALID,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSEM: There are sleeping threads",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 140*/{(0x1F), 1, USEM_REG_SLEEP_THREADS_VALID,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USEM: There are sleeping threads",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 141*/{(0x1F), 1, XSEM_REG_SLEEP_THREADS_VALID,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSEM: There are sleeping threads",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 142*/{(0x1F), 1, CSEM_REG_SLOW_EXT_STORE_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSEM: External store FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 143*/{(0x1F), 1, TSEM_REG_SLOW_EXT_STORE_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSEM: External store FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 144*/{(0x1F), 1, USEM_REG_SLOW_EXT_STORE_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USEM: External store FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 145*/{(0x1F), 1, XSEM_REG_SLOW_EXT_STORE_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSEM: External store FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 146*/{(0x1F), 1, CSDM_REG_SYNC_PARSER_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSDM: Parser serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 147*/{(0x1F), 1, TSDM_REG_SYNC_PARSER_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSDM: Parser serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 148*/{(0x1F), 1, USDM_REG_SYNC_PARSER_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USDM: Parser serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 149*/{(0x1F), 1, XSDM_REG_SYNC_PARSER_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSDM: Parser serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 150*/{(0x1F), 1, CSDM_REG_SYNC_SYNC_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSDM: Parser SYNC serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 151*/{(0x1F), 1, TSDM_REG_SYNC_SYNC_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSDM: Parser SYNC serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 152*/{(0x1F), 1, USDM_REG_SYNC_SYNC_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USDM: Parser SYNC serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 153*/{(0x1F), 1, XSDM_REG_SYNC_SYNC_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSDM: Parser SYNC serial FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 154*/{(0x1F), 1, CSDM_REG_RSP_PXP_CTRL_RDATA_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSDM: pxp_ctrl rd_data fifo is not empty in sdm_dma_rsp block",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 155*/{(0x1F), 1, TSDM_REG_RSP_PXP_CTRL_RDATA_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSDM: pxp_ctrl rd_data fifo is not empty in sdm_dma_rsp block",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 156*/{(0x1F), 1, USDM_REG_RSP_PXP_CTRL_RDATA_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USDM: pxp_ctrl rd_data fifo is not empty in sdm_dma_rsp block",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 157*/{(0x1F), 1, XSDM_REG_RSP_PXP_CTRL_RDATA_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSDM: pxp_ctrl rd_data fifo is not empty in sdm_dma_rsp block",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 158*/{(0x1F), 1, DORQ_REG_DQ_FILL_LVLF,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DORQ: DORQ queue is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 159*/{(0x1F), 1, CFC_REG_CFC_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CFC: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 160*/{(0x1F), 1, CDU_REG_CDU_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CDU: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 161*/{(0x1F), 1, CCM_REG_CCM_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 162*/{(0x1F), 1, TCM_REG_TCM_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 163*/{(0x1F), 1, UCM_REG_UCM_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 164*/{(0x1F), 1, XCM_REG_XCM_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 165*/{(0xF), 1, PBF_REG_PBF_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PBF: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 166*/{(0x1F), 1, TM_REG_TM_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TIMERS: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 167*/{(0x1F), 1, DORQ_REG_DORQ_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"DORQ: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 168*/{(0x1F), 1, SRC_REG_SRC_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"SRCH: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 169*/{(0x1F), 1, PRS_REG_PRS_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PRS: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 170*/{(0x1F), 1, BRB1_REG_BRB1_INT_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"BRB1: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, ~0xFC00, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 171*/{(0x1F), 1, GRCBASE_XPB + PB_REG_PB_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XPB: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 172*/{(0x1F), 1, GRCBASE_UPB + PB_REG_PB_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UPB: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 173*/{(0x1), 1, PXP2_REG_PXP2_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: Interrupt status 0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 174*/{(0x1E), 1, PXP2_REG_PXP2_INT_STS_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: Interrupt status 0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 175*/{(0x1E), 1, PXP2_REG_PXP2_INT_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: Interrupt status 1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 176*/{(0x1F), 1, QM_REG_QM_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 177*/{(0x1F), 1, PXP_REG_PXP_INT_STS_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: P0 Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 178*/{(0x1F), 1, PXP_REG_PXP_INT_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: P1 Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 179*/{(0x1C), 1, PGLUE_B_REG_PGLUE_B_INT_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: Interrupt status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 180*/{(0x1F), 1, DORQ_REG_RSPA_CRD_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DORQ: Credit to XCM is not full",</div><div class='add'>+	{NA, NA, 2, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 181*/{(0x1F), 1, DORQ_REG_RSPB_CRD_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"DORQ: Credit to UCM is not full",</div><div class='add'>+	{NA, NA, 2, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 182*/{(0x3), 1, QM_REG_VOQCRDERRREG,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: Credit error register is not 0 (byte or credit overflow/underflow)",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 183*/{(0x1F), 1, DORQ_REG_DQ_FULL_ST,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"DORQ: DORQ queue is full",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 184*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_1_FUNC_0,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"AEU: P0 AFTER_INVERT_1 is not 0",</div><div class='add'>+	{NA, NA, ~0xCFFC, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 185*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_2_FUNC_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: P0 AFTER_INVERT_2 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 186*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_3_FUNC_0,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: P0 AFTER_INVERT_3 is not 0",</div><div class='add'>+	{NA, NA, ~0xFFFF0000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 187*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_4_FUNC_0,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: P0 AFTER_INVERT_4 is not 0",</div><div class='add'>+	{NA, NA, ~0x801FFFFF, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 188*/{(0x3), 1, MISC_REG_AEU_AFTER_INVERT_1_FUNC_1,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"AEU: P1 AFTER_INVERT_1 is not 0",</div><div class='add'>+	{NA, NA, ~0xCFFC, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 189*/{(0x3), 1, MISC_REG_AEU_AFTER_INVERT_2_FUNC_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: P1 AFTER_INVERT_2 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 190*/{(0x3), 1, MISC_REG_AEU_AFTER_INVERT_3_FUNC_1,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: P1 AFTER_INVERT_3 is not 0",</div><div class='add'>+	{NA, NA, ~0xFFFF0000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 191*/{(0x3), 1, MISC_REG_AEU_AFTER_INVERT_4_FUNC_1,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: P1 AFTER_INVERT_4 is not 0",</div><div class='add'>+	{NA, NA, ~0x801FFFFF, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 192*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_1_MCP,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"AEU: MCP AFTER_INVERT_1 is not 0",</div><div class='add'>+	{NA, NA, ~0xCFFC, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 193*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_2_MCP,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: MCP AFTER_INVERT_2 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 194*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_3_MCP,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: MCP AFTER_INVERT_3 is not 0",</div><div class='add'>+	{NA, NA, ~0xFFFF0000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 195*/{(0x1F), 1, MISC_REG_AEU_AFTER_INVERT_4_MCP,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"AEU: MCP AFTER_INVERT_4 is not 0",</div><div class='add'>+	{NA, NA, ~0x801FFFFF, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 196*/{(0xF), 5, PBF_REG_P0_CREDIT,</div><div class='add'>+	PBF_REG_P0_INIT_CRD, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_P0, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: P0 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 197*/{(0xF), 5, PBF_REG_P1_CREDIT,</div><div class='add'>+	PBF_REG_P1_INIT_CRD, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_P1, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: P1 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 198*/{(0xF), 3, PBF_REG_P4_CREDIT,</div><div class='add'>+	PBF_REG_P4_INIT_CRD, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: P4 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 199*/{(0x10), 5, PBF_REG_CREDIT_Q0,</div><div class='add'>+	PBF_REG_INIT_CRD_Q0, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_Q0, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q0 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 200*/{(0x10), 5, PBF_REG_CREDIT_Q1,</div><div class='add'>+	PBF_REG_INIT_CRD_Q1, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_Q1, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q1 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 201*/{(0x10), 5, PBF_REG_CREDIT_Q2,</div><div class='add'>+	PBF_REG_INIT_CRD_Q2, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_Q2, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q2 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 202*/{(0x10), 5, PBF_REG_CREDIT_Q3,</div><div class='add'>+	PBF_REG_INIT_CRD_Q3, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_Q3, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q3 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 203*/{(0x10), 5, PBF_REG_CREDIT_Q4,</div><div class='add'>+	PBF_REG_INIT_CRD_Q4, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_Q4, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q4 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 204*/{(0x10), 5, PBF_REG_CREDIT_Q5,</div><div class='add'>+	PBF_REG_INIT_CRD_Q5, 1, 0, pneq_r2,</div><div class='add'>+	PBF_REG_DISABLE_NEW_TASK_PROC_Q5, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q5 credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 205*/{(0x10), 3, PBF_REG_CREDIT_LB_Q,</div><div class='add'>+	PBF_REG_INIT_CRD_LB_Q, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: LB Q credit is not equal to init_crd",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 206*/{(0xF), 1, PBF_REG_P0_TASK_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: P0 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 207*/{(0xF), 1, PBF_REG_P1_TASK_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: P1 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 208*/{(0xF), 1, PBF_REG_P4_TASK_CNT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: P4 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 209*/{(0x10), 1, PBF_REG_TASK_CNT_Q0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q0 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 210*/{(0x10), 1, PBF_REG_TASK_CNT_Q1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q1 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 211*/{(0x10), 1, PBF_REG_TASK_CNT_Q2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q2 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 212*/{(0x10), 1, PBF_REG_TASK_CNT_Q3,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q3 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 213*/{(0x10), 1, PBF_REG_TASK_CNT_Q4,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q4 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 214*/{(0x10), 1, PBF_REG_TASK_CNT_Q5,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: Q5 task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 215*/{(0x10), 1, PBF_REG_TASK_CNT_LB_Q,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PBF: LB Q task_cnt is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 216*/{(0x1F), 1, XCM_REG_CFC_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: CFC_INIT_CRD is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 217*/{(0x1F), 1, UCM_REG_CFC_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: CFC_INIT_CRD is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 218*/{(0x1F), 1, TCM_REG_CFC_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: CFC_INIT_CRD is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 219*/{(0x1F), 1, CCM_REG_CFC_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CCM: CFC_INIT_CRD is not 1",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 220*/{(0x1F), 1, XCM_REG_XQM_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: XQM_INIT_CRD is not 32",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 221*/{(0x1F), 1, UCM_REG_UQM_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: UQM_INIT_CRD is not 32",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 222*/{(0x1F), 1, TCM_REG_TQM_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: TQM_INIT_CRD is not 32",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 223*/{(0x1F), 1, CCM_REG_CQM_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CCM: CQM_INIT_CRD is not 32",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 224*/{(0x1F), 1, XCM_REG_TM_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: TM_INIT_CRD is not 4",</div><div class='add'>+	{NA, NA, 4, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 225*/{(0x1F), 1, UCM_REG_TM_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: TM_INIT_CRD is not 4",</div><div class='add'>+	{NA, NA, 4, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 226*/{(0x1F), 1, XCM_REG_FIC0_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XCM: FIC0_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 227*/{(0x1F), 1, UCM_REG_FIC0_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: FIC0_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 228*/{(0x1F), 1, TCM_REG_FIC0_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: FIC0_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 229*/{(0x1F), 1, CCM_REG_FIC0_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CCM: FIC0_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 230*/{(0x1F), 1, XCM_REG_FIC1_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: FIC1_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 231*/{(0x1F), 1, UCM_REG_FIC1_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: FIC1_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 232*/{(0x1F), 1, TCM_REG_FIC1_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: FIC1_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 233*/{(0x1F), 1, CCM_REG_FIC1_INIT_CRD,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CCM: FIC1_INIT_CRD is not 64",</div><div class='add'>+	{NA, NA, 64, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 234*/{(0x1), 1, XCM_REG_XX_FREE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: XX_FREE differs from expected 31",</div><div class='add'>+	{NA, NA, 31, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 235*/{(0x1E), 1, XCM_REG_XX_FREE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XCM: XX_FREE differs from expected 32",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 236*/{(0x1F), 1, UCM_REG_XX_FREE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"UCM: XX_FREE differs from expected 27",</div><div class='add'>+	{NA, NA, 27, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 237*/{(0x7), 1, TCM_REG_XX_FREE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: XX_FREE differs from expected 32",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 238*/{(0x18), 1, TCM_REG_XX_FREE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TCM: XX_FREE differs from expected 29",</div><div class='add'>+	{NA, NA, 29, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 239*/{(0x1F), 1, CCM_REG_XX_FREE,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CCM: XX_FREE differs from expected 24",</div><div class='add'>+	{NA, NA, 24, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 240*/{(0x1F), 1, XSEM_REG_FAST_MEMORY + 0x18000,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSEM: FOC0 credit less than initial credit",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 241*/{(0x1F), 1, XSEM_REG_FAST_MEMORY + 0x18040,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSEM: FOC1 credit less than initial credit",</div><div class='add'>+	{NA, NA, 24, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 242*/{(0x1F), 1, XSEM_REG_FAST_MEMORY + 0x18080,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"XSEM: FOC2 credit less than initial credit",</div><div class='add'>+	{NA, NA, 12, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 243*/{(0x1F), 1, USEM_REG_FAST_MEMORY + 0x18000,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USEM: FOC0 credit less than initial credit",</div><div class='add'>+	{NA, NA, 26, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 244*/{(0x1F), 1, USEM_REG_FAST_MEMORY + 0x18040,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USEM: FOC1 credit less than initial credit",</div><div class='add'>+	{NA, NA, 78, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 245*/{(0x1F), 1, USEM_REG_FAST_MEMORY + 0x18080,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USEM: FOC2 credit less than initial credit",</div><div class='add'>+	{NA, NA, 16, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 246*/{(0x1F), 1, USEM_REG_FAST_MEMORY + 0x180C0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"USEM: FOC3 credit less than initial credit",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 247*/{(0x1F), 1, TSEM_REG_FAST_MEMORY + 0x18000,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSEM: FOC0 credit less than initial credit",</div><div class='add'>+	{NA, NA, 52, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 248*/{(0x1F), 1, TSEM_REG_FAST_MEMORY + 0x18040,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSEM: FOC1 credit less than initial credit",</div><div class='add'>+	{NA, NA, 24, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 249*/{(0x1F), 1, TSEM_REG_FAST_MEMORY + 0x18080,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSEM: FOC2 credit less than initial credit",</div><div class='add'>+	{NA, NA, 12, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 250*/{(0x1F), 1, TSEM_REG_FAST_MEMORY + 0x180C0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"TSEM: FOC3 credit less than initial credit",</div><div class='add'>+	{NA, NA, 32, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 251*/{(0x1F), 1, CSEM_REG_FAST_MEMORY + 0x18000,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSEM: FOC0 credit less than initial credit",</div><div class='add'>+	{NA, NA, 16, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 252*/{(0x1F), 1, CSEM_REG_FAST_MEMORY + 0x18040,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSEM: FOC1 credit less than initial credit",</div><div class='add'>+	{NA, NA, 18, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 253*/{(0x1F), 1, CSEM_REG_FAST_MEMORY + 0x18080,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSEM: FOC2 credit less than initial credit",</div><div class='add'>+	{NA, NA, 48, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 254*/{(0x1F), 1, CSEM_REG_FAST_MEMORY + 0x180C0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"CSEM: FOC3 credit less than initial credit",</div><div class='add'>+	{NA, NA, 14, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 255*/{(0x1F), 1, PRS_REG_TSDM_CURRENT_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: TSDM current credit is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 256*/{(0x1F), 1, PRS_REG_TCM_CURRENT_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: TCM current credit is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 257*/{(0x1F), 1, PRS_REG_CFC_LD_CURRENT_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: CFC_LD current credit is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 258*/{(0x1F), 1, PRS_REG_CFC_SEARCH_CURRENT_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: CFC_SEARCH current credit is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 259*/{(0x1F), 1, PRS_REG_SRC_CURRENT_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: SRCH current credit is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 260*/{(0x1F), 1, PRS_REG_PENDING_BRB_PRS_RQ,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: PENDING_BRB_PRS_RQ is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 261*/{(0x1F), 2, PRS_REG_PENDING_BRB_CAC0_RQ,</div><div class='add'>+	NA, 5, 4, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: PENDING_BRB_CAC_RQ is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 262*/{(0x1F), 1, PRS_REG_SERIAL_NUM_STATUS_LSB,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: SERIAL_NUM_STATUS_LSB is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 263*/{(0x1F), 1, PRS_REG_SERIAL_NUM_STATUS_MSB,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"PRS: SERIAL_NUM_STATUS_MSB is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 264*/{(0x1F), 1, CDU_REG_ERROR_DATA,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CDU: ERROR_DATA is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 265*/{(0x1F), 1, CCM_REG_STORM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: STORM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 266*/{(0x1F), 1, CCM_REG_CSDM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: CSDM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 267*/{(0x1F), 1, CCM_REG_TSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: TSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 268*/{(0x1F), 1, CCM_REG_XSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: XSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 269*/{(0x1F), 1, CCM_REG_USEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: USEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 270*/{(0x1F), 1, CCM_REG_PBF_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CCM: PBF declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 271*/{(0x1F), 1, TCM_REG_STORM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: STORM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 272*/{(0x1F), 1, TCM_REG_TSDM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: TSDM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 273*/{(0x1F), 1, TCM_REG_PRS_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: PRS declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 274*/{(0x1F), 1, TCM_REG_PBF_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: PBF declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 275*/{(0x1F), 1, TCM_REG_USEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: USEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 276*/{(0x1F), 1, TCM_REG_CSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TCM: CSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 277*/{(0x1F), 1, UCM_REG_STORM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: STORM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 278*/{(0x1F), 1, UCM_REG_USDM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: USDM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 279*/{(0x1F), 1, UCM_REG_TSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: TSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 280*/{(0x1F), 1, UCM_REG_CSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: CSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 281*/{(0x1F), 1, UCM_REG_XSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: XSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 282*/{(0x1F), 1, UCM_REG_DORQ_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"UCM: DORQ declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 283*/{(0x1F), 1, XCM_REG_STORM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: STORM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 284*/{(0x1F), 1, XCM_REG_XSDM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: XSDM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 285*/{(0x1F), 1, XCM_REG_TSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: TSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 286*/{(0x1F), 1, XCM_REG_CSEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: CSEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 287*/{(0x1F), 1, XCM_REG_USEM_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: USEM declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 288*/{(0x1F), 1, XCM_REG_DORQ_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: DORQ declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 289*/{(0x1F), 1, XCM_REG_PBF_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: PBF declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 290*/{(0x1F), 1, XCM_REG_NIG0_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: NIG0 declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 291*/{(0x1F), 1, XCM_REG_NIG1_LENGTH_MIS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XCM: NIG1 declared message length unequal to actual",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 292*/{(0x1F), 1, QM_REG_XQM_WRC_FIFOLVL,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: XQM wrc_fifolvl is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 293*/{(0x1F), 1, QM_REG_UQM_WRC_FIFOLVL,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: UQM wrc_fifolvl is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 294*/{(0x1F), 1, QM_REG_TQM_WRC_FIFOLVL,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: TQM wrc_fifolvl is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 295*/{(0x1F), 1, QM_REG_CQM_WRC_FIFOLVL,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: CQM wrc_fifolvl is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 296*/{(0x1F), 1, QM_REG_QSTATUS_LOW,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: QSTATUS_LOW is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 297*/{(0x1F), 1, QM_REG_QSTATUS_HIGH,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: QSTATUS_HIGH is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 298*/{(0x1F), 1, QM_REG_PAUSESTATE0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: PAUSESTATE0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 299*/{(0x1F), 1, QM_REG_PAUSESTATE1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: PAUSESTATE1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 300*/{(0x1F), 1, QM_REG_OVFQNUM,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: OVFQNUM is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 301*/{(0x1F), 1, QM_REG_OVFERROR,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: OVFERROR is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 302*/{(0x1F), 6, QM_REG_PTRTBL,</div><div class='add'>+	NA, 64, 8, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: read and write variables not equal",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 303*/{(0x1F), 1, BRB1_REG_BRB1_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"BRB1: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x8, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 304*/{(0x1F), 1, CDU_REG_CDU_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CDU: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 305*/{(0x1F), 1, CFC_REG_CFC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CFC: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x2, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 306*/{(0x1F), 1, CSDM_REG_CSDM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CSDM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 307*/{(0x3), 1, DBG_REG_DBG_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"DBG: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 308*/{(0x1F), 1, DMAE_REG_DMAE_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"DMAE: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 309*/{(0x1F), 1, DORQ_REG_DORQ_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"DORQ: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 310*/{(0x1), 1, TCM_REG_TCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TCM: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x3ffc0, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 311*/{(0x1E), 1, TCM_REG_TCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TCM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 312*/{(0x1), 1, CCM_REG_CCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CCM: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x3ffc0, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 313*/{(0x1E), 1, CCM_REG_CCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CCM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 314*/{(0x1), 1, UCM_REG_UCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"UCM: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x3ffc0, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 315*/{(0x1E), 1, UCM_REG_UCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"UCM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 316*/{(0x1), 1, XCM_REG_XCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XCM: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x3ffc0, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 317*/{(0x1E), 1, XCM_REG_XCM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XCM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 318*/{(0x1), 1, HC_REG_HC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"HC: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x1, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 319*/{(0x1), 1, MISC_REG_MISC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"MISC: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x1, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 320*/{(0x1F), 1, PRS_REG_PRS_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PRS: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 321*/{(0x1F), 1, PXP_REG_PXP_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 322*/{(0x1F), 1, QM_REG_QM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"QM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 323*/{(0x1), 1, SRC_REG_SRC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"SRCH: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x4, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 324*/{(0x1F), 1, TSDM_REG_TSDM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TSDM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 325*/{(0x1F), 1, USDM_REG_USDM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"USDM: parity status is not 0",</div><div class='add'>+	{NA, NA, ~0x20, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 326*/{(0x1F), 1, XSDM_REG_XSDM_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XSDM: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 327*/{(0x1F), 1, GRCBASE_XPB + PB_REG_PB_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XPB: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 328*/{(0x1F), 1, GRCBASE_UPB + PB_REG_PB_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"UPB: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 329*/{(0x1F), 1, CSEM_REG_CSEM_PRTY_STS_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CSEM: parity status 0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 330*/{(0x1), 1, PXP2_REG_PXP2_PRTY_STS_0,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: parity status 0 is not 0",</div><div class='add'>+	{NA, NA, ~0xfff40020, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 331*/{(0x1E), 1, PXP2_REG_PXP2_PRTY_STS_0,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: parity status 0 is not 0",</div><div class='add'>+	{NA, NA, ~0x20, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 332*/{(0x1F), 1, TSEM_REG_TSEM_PRTY_STS_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TSEM: parity status 0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 333*/{(0x1F), 1, USEM_REG_USEM_PRTY_STS_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"USEM: parity status 0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 334*/{(0x1F), 1, XSEM_REG_XSEM_PRTY_STS_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XSEM: parity status 0 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 335*/{(0x1F), 1, CSEM_REG_CSEM_PRTY_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CSEM: parity status 1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 336*/{(0x1), 1, PXP2_REG_PXP2_PRTY_STS_1,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: parity status 1 is not 0",</div><div class='add'>+	{NA, NA, ~0x20, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 337*/{(0x1E), 1, PXP2_REG_PXP2_PRTY_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PXP2: parity status 1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 338*/{(0x1F), 1, TSEM_REG_TSEM_PRTY_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TSEM: parity status 1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 339*/{(0x1F), 1, USEM_REG_USEM_PRTY_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"USEM: parity status 1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 340*/{(0x1F), 1, XSEM_REG_XSEM_PRTY_STS_1,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XSEM: parity status 1 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 341*/{(0x1C), 1, PGLUE_B_REG_PGLUE_B_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGLUE_B: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 342*/{(0x2), 2, QM_REG_QTASKCTR_EXT_A_0,</div><div class='add'>+	NA, 64, 4, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Q_EXT_A (upper 64 queues), Queue is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 343*/{(0x2), 1, QM_REG_QSTATUS_LOW_EXT_A,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: QSTATUS_LOW_EXT_A is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 344*/{(0x2), 1, QM_REG_QSTATUS_HIGH_EXT_A,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: QSTATUS_HIGH_EXT_A is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 345*/{(0x1E), 1, QM_REG_PAUSESTATE2,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: PAUSESTATE2 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 346*/{(0x1E), 1, QM_REG_PAUSESTATE3,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: PAUSESTATE3 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 347*/{(0x2), 1, QM_REG_PAUSESTATE4,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: PAUSESTATE4 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 348*/{(0x2), 1, QM_REG_PAUSESTATE5,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: PAUSESTATE5 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 349*/{(0x2), 1, QM_REG_PAUSESTATE6,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: PAUSESTATE6 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 350*/{(0x2), 1, QM_REG_PAUSESTATE7,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: PAUSESTATE7 is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 351*/{(0x2), 6, QM_REG_PTRTBL_EXT_A,</div><div class='add'>+	NA, 64, 8, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: read and write variables not equal in ext table",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 352*/{(0x1E), 1, MISC_REG_AEU_SYS_KILL_OCCURRED,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC: system kill occurred;",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 353*/{(0x1E), 1, MISC_REG_AEU_SYS_KILL_STATUS_0,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC: system kill occurred; status_0 register",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 354*/{(0x1E), 1, MISC_REG_AEU_SYS_KILL_STATUS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC: system kill occurred; status_1 register",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 355*/{(0x1E), 1, MISC_REG_AEU_SYS_KILL_STATUS_2,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC: system kill occurred; status_2 register",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 356*/{(0x1E), 1, MISC_REG_AEU_SYS_KILL_STATUS_3,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC: system kill occurred; status_3 register",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 357*/{(0x1E), 1, MISC_REG_PCIE_HOT_RESET,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"MISC: pcie_rst_b was asserted without perst assertion",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 358*/{(0x1F), 1, NIG_REG_NIG_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"NIG: interrupt 0 is active",</div><div class='add'>+	{NA, NA, ~0x300, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 359*/{(0x1F), 1, NIG_REG_NIG_INT_STS_0,</div><div class='add'>+	NA, NA, NA, peq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Access to BMAC while not active. If tested on FPGA, ignore this warning",</div><div class='add'>+	{NA, NA, 0x300, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 360*/{(0x1F), 1, NIG_REG_NIG_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"NIG: interrupt 1 is active",</div><div class='add'>+	{NA, NA, 0x783FF03, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 361*/{(0x1F), 1, NIG_REG_NIG_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: port cos was paused too long",</div><div class='add'>+	{NA, NA, ~0x783FF0F, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 362*/{(0x1F), 1, NIG_REG_NIG_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Got packets w/o Outer-VLAN in MF mode",</div><div class='add'>+	{NA, NA, 0xC, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 363*/{(0x2), 1, NIG_REG_NIG_PRTY_STS,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"NIG: parity interrupt is active",</div><div class='add'>+	{NA, NA, ~0xFFC00000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 364*/{(0x1C), 1, NIG_REG_NIG_PRTY_STS_0,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"NIG: parity 0 interrupt is active",</div><div class='add'>+	{NA, NA, ~0xFFC00000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 365*/{(0x4), 1, NIG_REG_NIG_PRTY_STS_1,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"NIG: parity 1 interrupt is active",</div><div class='add'>+	{NA, NA, 0xff, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 366*/{(0x18), 1, NIG_REG_NIG_PRTY_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"NIG: parity 1 interrupt is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 367*/{(0x1F), 1, TSEM_REG_TSEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TSEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, ~0x10000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 368*/{(0x1F), 1, TSEM_REG_TSEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, peq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"TSEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0x10000000, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 369*/{(0x1F), 1, TSEM_REG_TSEM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TSEM: interrupt 1 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 370*/{(0x1F), 1, CSEM_REG_CSEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CSEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, ~0x10000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 371*/{(0x1F), 1, CSEM_REG_CSEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, peq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"CSEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0x10000000, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 372*/{(0x1F), 1, CSEM_REG_CSEM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CSEM: interrupt 1 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 373*/{(0x1F), 1, USEM_REG_USEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"USEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, ~0x10000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 374*/{(0x1F), 1, USEM_REG_USEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, peq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"USEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0x10000000, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 375*/{(0x1F), 1, USEM_REG_USEM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"USEM: interrupt 1 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 376*/{(0x1F), 1, XSEM_REG_XSEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XSEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, ~0x10000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 377*/{(0x1F), 1, XSEM_REG_XSEM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, peq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"XSEM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0x10000000, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 378*/{(0x1F), 1, XSEM_REG_XSEM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XSEM: interrupt 1 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 379*/{(0x1F), 1, TSDM_REG_TSDM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TSDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 380*/{(0x1F), 1, TSDM_REG_TSDM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"TSDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 381*/{(0x1F), 1, CSDM_REG_CSDM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CSDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 382*/{(0x1F), 1, CSDM_REG_CSDM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"CSDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 383*/{(0x1F), 1, USDM_REG_USDM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"USDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 384*/{(0x1F), 1, USDM_REG_USDM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"USDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 385*/{(0x1F), 1, XSDM_REG_XSDM_INT_STS_0,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XSDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 386*/{(0x1F), 1, XSDM_REG_XSDM_INT_STS_1,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"XSDM: interrupt 0 is active",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 387*/{(0x2), 1, HC_REG_HC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"HC: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 388*/{(0x1E), 1, MISC_REG_MISC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"MISC: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 389*/{(0x1E), 1, SRC_REG_SRC_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"SRCH: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 390*/{(0xC), 3, QM_REG_BYTECRD0,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 0 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 391*/{(0xC), 3, QM_REG_BYTECRD1,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 1 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 392*/{(0xC), 3, QM_REG_BYTECRD2,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 2 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 393*/{(0x1C), 1, QM_REG_VOQCRDERRREG,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: VOQ credit error register is not 0 (VOQ credit overflow/underflow)",</div><div class='add'>+	{NA, NA, 0xFFFF, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 394*/{(0x1C), 1, QM_REG_BYTECRDERRREG,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: Byte credit error register is not 0 (Byte credit overflow/underflow)",</div><div class='add'>+	{NA, NA, 0xFFF, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 395*/{(0x1C), 1, PGLUE_B_REG_FLR_REQUEST_VF_31_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: FLR request is set for VF addresses 31-0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 396*/{(0x1C), 1, PGLUE_B_REG_FLR_REQUEST_VF_63_32,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: FLR request is set for VF addresses 63-32",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 397*/{(0x1C), 1, PGLUE_B_REG_FLR_REQUEST_VF_95_64,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: FLR request is set for VF addresses 95-64",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 398*/{(0x1C), 1, PGLUE_B_REG_FLR_REQUEST_VF_127_96,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: FLR request is set for VF addresses 127-96",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 399*/{(0x1C), 1, PGLUE_B_REG_FLR_REQUEST_PF_7_0,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: FLR request is set for PF addresses 7-0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 400*/{(0x1C), 1, PGLUE_B_REG_SR_IOV_DISABLED_REQUEST,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: SR-IOV disable request is set",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 401*/{(0x1C), 1, PGLUE_B_REG_CFG_SPACE_A_REQUEST,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: Cfg-Space A request is set",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 402*/{(0x1C), 1, PGLUE_B_REG_CFG_SPACE_B_REQUEST,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"PGL: Cfg-Space B request is set",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 403*/{(0x1C), 1, IGU_REG_ERROR_HANDLING_DATA_VALID,</div><div class='add'>+	NA, NA, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: some unauthorized commands arrived to the IGU. Use igu_dump_fifo utility for more details",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 404*/{(0x1C), 1, IGU_REG_ATTN_WRITE_DONE_PENDING,</div><div class='add'>+	NA, NA, NA, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU attention message write done pending is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 405*/{(0x1C), 1, IGU_REG_WRITE_DONE_PENDING,</div><div class='add'>+	NA, 5, 4, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU MSI/MSIX message write done pending is not empty",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 406*/{(0x1C), 1, IGU_REG_IGU_PRTY_STS,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: parity status is not 0",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 407*/{(0x1E), 3, MISC_REG_GRC_TIMEOUT_ATTN,</div><div class='add'>+	MISC_REG_AEU_AFTER_INVERT_4_FUNC_0, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC_REG_GRC_TIMEOUT_ATTN: GRC timeout attention parameters (FUNC_0)",</div><div class='add'>+	{NA, NA, 0x4000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 408*/{(0x1C), 3, MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID,</div><div class='add'>+	MISC_REG_AEU_AFTER_INVERT_4_FUNC_0, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID: GRC timeout attention FID (FUNC_0)",</div><div class='add'>+	{NA, NA, 0x4000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 409*/{(0x1E), 3, MISC_REG_GRC_TIMEOUT_ATTN,</div><div class='add'>+	MISC_REG_AEU_AFTER_INVERT_4_FUNC_1, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC_REG_GRC_TIMEOUT_ATTN: GRC timeout attention parameters (FUNC_1)",</div><div class='add'>+	{NA, NA, 0x4000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 410*/{(0x1C), 3, MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID,</div><div class='add'>+	MISC_REG_AEU_AFTER_INVERT_4_FUNC_1, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID: GRC timeout attention FID (FUNC_1)",</div><div class='add'>+	{NA, NA, 0x4000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 411*/{(0x1E), 3, MISC_REG_GRC_TIMEOUT_ATTN,</div><div class='add'>+	MISC_REG_AEU_AFTER_INVERT_4_MCP, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC_REG_GRC_TIMEOUT_ATTN: GRC timeout attention parameters (MCP)",</div><div class='add'>+	{NA, NA, 0x4000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 412*/{(0x1C), 3, MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID,</div><div class='add'>+	MISC_REG_AEU_AFTER_INVERT_4_MCP, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"MISC_REG_GRC_TIMEOUT_ATTN_FULL_FID: GRC timeout attention FID (MCP)",</div><div class='add'>+	{NA, NA, 0x4000000, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 413*/{(0x1C), 1, IGU_REG_SILENT_DROP,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"Some messages were not executed in the IGU",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 414*/{(0x1C), 1, PXP2_REG_PSWRQ_BW_CREDIT,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"PXP2: rq_read_credit and rq_write_credit are not 5",</div><div class='add'>+	{NA, NA, 0x2D, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 415*/{(0x1C), 1, IGU_REG_SB_CTRL_FSM,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: block is not in idle. SB_CTRL_FSM should be zero in idle state",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 416*/{(0x1C), 1, IGU_REG_INT_HANDLE_FSM,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: block is not in idle. INT_HANDLE_FSM should be zero in idle state",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 417*/{(0x1C), 1, IGU_REG_ATTN_FSM,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: block is not in idle. SB_ATTN_FSMshould be zeroor two in idle state",</div><div class='add'>+	{NA, NA, ~0x2, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 418*/{(0x1C), 1, IGU_REG_CTRL_FSM,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: block is not in idle. SB_CTRL_FSM should be zero in idle state",</div><div class='add'>+	{NA, NA, ~0x1, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 419*/{(0x1C), 1, IGU_REG_PXP_ARB_FSM,</div><div class='add'>+	NA, 1, 0, pand_neq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: block is not in idle. SB_ARB_FSM should be zero in idle state",</div><div class='add'>+	{NA, NA, ~0x1, 0, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 420*/{(0x1C), 1, IGU_REG_PENDING_BITS_STATUS,</div><div class='add'>+	NA, 5, 4, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"IGU: block is not in idle. There are pending write done",</div><div class='add'>+	{NA, NA, 0, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 421*/{(0x10), 3, QM_REG_VOQCREDIT_0,</div><div class='add'>+	QM_REG_VOQINITCREDIT_0, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_0, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 422*/{(0x10), 3, QM_REG_VOQCREDIT_1,</div><div class='add'>+	QM_REG_VOQINITCREDIT_1, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_1, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 423*/{(0x10), 3, QM_REG_VOQCREDIT_2,</div><div class='add'>+	QM_REG_VOQINITCREDIT_2, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_2, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 424*/{(0x10), 3, QM_REG_VOQCREDIT_3,</div><div class='add'>+	QM_REG_VOQINITCREDIT_3, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_3, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 425*/{(0x10), 3, QM_REG_VOQCREDIT_4,</div><div class='add'>+	QM_REG_VOQINITCREDIT_4, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_4, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 426*/{(0x10), 3, QM_REG_VOQCREDIT_5,</div><div class='add'>+	QM_REG_VOQINITCREDIT_5, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_5, VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 427*/{(0x10), 3, QM_REG_VOQCREDIT_6,</div><div class='add'>+	QM_REG_VOQINITCREDIT_6, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: VOQ_6 (LB VOQ), VOQ credit is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 428*/{(0x10), 3, QM_REG_BYTECRD0,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 0 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 429*/{(0x10), 3, QM_REG_BYTECRD1,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 1 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 430*/{(0x10), 3, QM_REG_BYTECRD2,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 2 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 431*/{(0x10), 3, QM_REG_BYTECRD3,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 3 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 432*/{(0x10), 3, QM_REG_BYTECRD4,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 4 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 433*/{(0x10), 3, QM_REG_BYTECRD5,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 5 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 434*/{(0x10), 3, QM_REG_BYTECRD6,</div><div class='add'>+	QM_REG_BYTECRDINITVAL, 1, 0, pneq_r2,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"QM: Byte credit 6 is not equal to initial credit",</div><div class='add'>+	{NA, NA, NA, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 435*/{(0x10), 1, QM_REG_FWVOQ0TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq0 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 436*/{(0x10), 1, QM_REG_FWVOQ1TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq1 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 437*/{(0x10), 1, QM_REG_FWVOQ2TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq2 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 438*/{(0x10), 1, QM_REG_FWVOQ3TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq3 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 439*/{(0x10), 1, QM_REG_FWVOQ4TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq4 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 440*/{(0x10), 1, QM_REG_FWVOQ5TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq5 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 441*/{(0x10), 1, QM_REG_FWVOQ6TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq6 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 442*/{(0x10), 1, QM_REG_FWVOQ7TOHWVOQ,</div><div class='add'>+	NA, 1, 0, peq,</div><div class='add'>+	NA, IDLE_CHK_ERROR,</div><div class='add'>+	"QM: FwVoq7 is mapped to HwVoq7 (non-TX HwVoq)",</div><div class='add'>+	{NA, NA, 0x7, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 443*/{(0x1F), 1, NIG_REG_INGRESS_EOP_PORT0_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 0 EOP FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 444*/{(0x1F), 1, NIG_REG_INGRESS_EOP_PORT1_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 1 EOP FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 445*/{(0x1F), 1, NIG_REG_INGRESS_EOP_LB_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: LB EOP FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 446*/{(0x1F), 1, NIG_REG_INGRESS_RMP0_DSCR_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 0 RX MCP descriptor FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 447*/{(0x1F), 1, NIG_REG_INGRESS_RMP1_DSCR_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 1 RX MCP descriptor FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 448*/{(0x1F), 1, NIG_REG_INGRESS_LB_PBF_DELAY_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF LB FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 449*/{(0x1F), 1, NIG_REG_EGRESS_MNG0_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 0 TX MCP FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 450*/{(0x1F), 1, NIG_REG_EGRESS_MNG1_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 1 TX MCP FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 451*/{(0x1F), 1, NIG_REG_EGRESS_DEBUG_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Debug FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 452*/{(0x1F), 1, NIG_REG_EGRESS_DELAY0_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF IF0 FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 453*/{(0x1F), 1, NIG_REG_EGRESS_DELAY1_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF IF1 FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 454*/{(0x1F), 1, NIG_REG_LLH0_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 0 RX LLH FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 455*/{(0x1F), 1, NIG_REG_LLH1_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 1 RX LLH FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 456*/{(0x1C), 1, NIG_REG_P0_TX_MNG_HOST_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 0 TX MCP FIFO for traffic going to the host is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 457*/{(0x1C), 1, NIG_REG_P1_TX_MNG_HOST_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 1 TX MCP FIFO for traffic going to the host is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 458*/{(0x1C), 1, NIG_REG_P0_TLLH_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 0 TX LLH FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 459*/{(0x1C), 1, NIG_REG_P1_TLLH_FIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 1 TX LLH FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 460*/{(0x1C), 1, NIG_REG_P0_HBUF_DSCR_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 0 RX MCP descriptor FIFO for traffic from the host is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 461*/{(0x1C), 1, NIG_REG_P1_HBUF_DSCR_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_WARNING,</div><div class='add'>+	"NIG: Port 1 RX MCP descriptor FIFO for traffic from the host is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 462*/{(0x18), 1, NIG_REG_P0_RX_MACFIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 0 RX MAC interface FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 463*/{(0x18), 1, NIG_REG_P1_RX_MACFIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 1 RX MAC interface FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 464*/{(0x18), 1, NIG_REG_P0_TX_MACFIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 0 TX MAC interface FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 465*/{(0x18), 1, NIG_REG_P1_TX_MACFIFO_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: Port 1 TX MAC interface FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 466*/{(0x10), 1, NIG_REG_EGRESS_DELAY2_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF IF2 FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 467*/{(0x10), 1, NIG_REG_EGRESS_DELAY3_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF IF3 FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 468*/{(0x10), 1, NIG_REG_EGRESS_DELAY4_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF IF4 FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+</div><div class='add'>+/*line 469*/{(0x10), 1, NIG_REG_EGRESS_DELAY5_EMPTY,</div><div class='add'>+	NA, 1, 0, pneq,</div><div class='add'>+	NA, IDLE_CHK_ERROR_NO_TRAFFIC,</div><div class='add'>+	"NIG: PBF IF5 FIFO is not empty",</div><div class='add'>+	{NA, NA, 1, NA, NA, NA} },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* handle self test fails according to severity and type */</div><div class='add'>+static void bnx2x_self_test_log(struct bnx2x *bp, u8 severity, char *message)</div><div class='add'>+{</div><div class='add'>+	switch (severity) {</div><div class='add'>+	case IDLE_CHK_ERROR:</div><div class='add'>+		BNX2X_ERR("ERROR %s", message);</div><div class='add'>+		idle_chk_errors++;</div><div class='add'>+		break;</div><div class='add'>+	case IDLE_CHK_ERROR_NO_TRAFFIC:</div><div class='add'>+		DP(NETIF_MSG_HW, "INFO %s", message);</div><div class='add'>+		break;</div><div class='add'>+	case IDLE_CHK_WARNING:</div><div class='add'>+		DP(NETIF_MSG_HW, "WARNING %s", message);</div><div class='add'>+		idle_chk_warnings++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* specific test for QM rd/wr pointers and rd/wr banks */</div><div class='add'>+static void bnx2x_idle_chk6(struct bnx2x *bp,</div><div class='add'>+			    struct st_record *rec, char *message)</div><div class='add'>+{</div><div class='add'>+	u32 rd_ptr, wr_ptr, rd_bank, wr_bank;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rec-&gt;loop; i++) {</div><div class='add'>+		/* read regs */</div><div class='add'>+		rec-&gt;pred_args.val1 =</div><div class='add'>+			REG_RD(bp, rec-&gt;reg1 + i * rec-&gt;incr);</div><div class='add'>+		rec-&gt;pred_args.val2 =</div><div class='add'>+			REG_RD(bp, rec-&gt;reg1 + i * rec-&gt;incr + 4);</div><div class='add'>+</div><div class='add'>+		/* calc read and write pointers */</div><div class='add'>+		rd_ptr = ((rec-&gt;pred_args.val1 &amp; 0x3FFFFFC0) &gt;&gt; 6);</div><div class='add'>+		wr_ptr = ((((rec-&gt;pred_args.val1 &amp; 0xC0000000) &gt;&gt; 30) &amp; 0x3) |</div><div class='add'>+			((rec-&gt;pred_args.val2 &amp; 0x3FFFFF) &lt;&lt; 2));</div><div class='add'>+</div><div class='add'>+		/* perfrom pointer test */</div><div class='add'>+		if (rd_ptr != wr_ptr) {</div><div class='add'>+			snprintf(message, MAX_FAIL_MSG,</div><div class='add'>+				 "QM: PTRTBL entry %d- rd_ptr is not equal to wr_ptr. Values are 0x%x and 0x%x\n",</div><div class='add'>+				 i, rd_ptr, wr_ptr);</div><div class='add'>+			bnx2x_self_test_log(bp, rec-&gt;severity, message);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* calculate read and write banks */</div><div class='add'>+		rd_bank = ((rec-&gt;pred_args.val1 &amp; 0x30) &gt;&gt; 4);</div><div class='add'>+		wr_bank = (rec-&gt;pred_args.val1 &amp; 0x03);</div><div class='add'>+</div><div class='add'>+		/* perform bank test */</div><div class='add'>+		if (rd_bank != wr_bank) {</div><div class='add'>+			snprintf(message, MAX_FAIL_MSG,</div><div class='add'>+				 "QM: PTRTBL entry %d - rd_bank is not equal to wr_bank. Values are 0x%x 0x%x\n",</div><div class='add'>+				 i, rd_bank, wr_bank);</div><div class='add'>+			bnx2x_self_test_log(bp, rec-&gt;severity, message);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* specific test for cfc info ram and cid cam */</div><div class='add'>+static void bnx2x_idle_chk7(struct bnx2x *bp,</div><div class='add'>+			    struct st_record *rec, char *message)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* iterate through lcids */</div><div class='add'>+	for (i = 0; i &lt; rec-&gt;loop; i++) {</div><div class='add'>+		/* make sure cam entry is valid (bit 0) */</div><div class='add'>+		if ((REG_RD(bp, (rec-&gt;reg2 + i * 4)) &amp; 0x1) != 0x1)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* get connection type (multiple reads due to widebus) */</div><div class='add'>+		REG_RD(bp, (rec-&gt;reg1 + i * rec-&gt;incr));</div><div class='add'>+		REG_RD(bp, (rec-&gt;reg1 + i * rec-&gt;incr + 4));</div><div class='add'>+		rec-&gt;pred_args.val1 =</div><div class='add'>+			REG_RD(bp, (rec-&gt;reg1 + i * rec-&gt;incr + 8));</div><div class='add'>+		REG_RD(bp, (rec-&gt;reg1 + i * rec-&gt;incr + 12));</div><div class='add'>+</div><div class='add'>+		/* obtain connection type */</div><div class='add'>+		if (is_e1 || is_e1h) {</div><div class='add'>+			/* E1 E1H (bits 4..7) */</div><div class='add'>+			rec-&gt;pred_args.val1 &amp;= 0x78;</div><div class='add'>+			rec-&gt;pred_args.val1 &gt;&gt;= 3;</div><div class='add'>+		} else {</div><div class='add'>+			/* E2 E3A0 E3B0 (bits 26..29) */</div><div class='add'>+			rec-&gt;pred_args.val1 &amp;= 0x1E000000;</div><div class='add'>+			rec-&gt;pred_args.val1 &gt;&gt;= 25;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* get activity counter value */</div><div class='add'>+		rec-&gt;pred_args.val2 = REG_RD(bp, rec-&gt;reg3 + i * 4);</div><div class='add'>+</div><div class='add'>+		/* validate ac value is legal for con_type at idle state */</div><div class='add'>+		if (rec-&gt;bnx2x_predicate(&amp;rec-&gt;pred_args)) {</div><div class='add'>+			snprintf(message, MAX_FAIL_MSG,</div><div class='add'>+				 "%s. Values are 0x%x 0x%x\n", rec-&gt;fail_msg,</div><div class='add'>+				 rec-&gt;pred_args.val1, rec-&gt;pred_args.val2);</div><div class='add'>+			bnx2x_self_test_log(bp, rec-&gt;severity, message);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* self test procedure</div><div class='add'>+ * scan auto-generated database</div><div class='add'>+ * for each line:</div><div class='add'>+ * 1.	compare chip mask</div><div class='add'>+ * 2.	determine type (according to maro number)</div><div class='add'>+ * 3.	read registers</div><div class='add'>+ * 4.	call predicate</div><div class='add'>+ * 5.	collate results and statistics</div><div class='add'>+ */</div><div class='add'>+int bnx2x_idle_chk(struct bnx2x *bp)</div><div class='add'>+{</div><div class='add'>+	u16 i;				/* loop counter */</div><div class='add'>+	u16 st_ind;			/* self test database access index */</div><div class='add'>+	struct st_record rec;		/* current record variable */</div><div class='add'>+	char message[MAX_FAIL_MSG];	/* message to log */</div><div class='add'>+</div><div class='add'>+	/*init stats*/</div><div class='add'>+	idle_chk_errors = 0;</div><div class='add'>+	idle_chk_warnings = 0;</div><div class='add'>+</div><div class='add'>+	/*create masks for all chip types*/</div><div class='add'>+	is_e1	= CHIP_IS_E1(bp);</div><div class='add'>+	is_e1h	= CHIP_IS_E1H(bp);</div><div class='add'>+	is_e2	= CHIP_IS_E2(bp);</div><div class='add'>+	is_e3a0	= CHIP_IS_E3A0(bp);</div><div class='add'>+	is_e3b0	= CHIP_IS_E3B0(bp);</div><div class='add'>+</div><div class='add'>+	/*database main loop*/</div><div class='add'>+	for (st_ind = 0; st_ind &lt; ST_DB_LINES; st_ind++) {</div><div class='add'>+		rec = st_database[st_ind];</div><div class='add'>+</div><div class='add'>+		/*check if test applies to chip*/</div><div class='add'>+		if (!((rec.chip_mask &amp; IDLE_CHK_E1) &amp;&amp; is_e1) &amp;&amp;</div><div class='add'>+		    !((rec.chip_mask &amp; IDLE_CHK_E1H) &amp;&amp; is_e1h) &amp;&amp;</div><div class='add'>+		    !((rec.chip_mask &amp; IDLE_CHK_E2) &amp;&amp; is_e2) &amp;&amp;</div><div class='add'>+		    !((rec.chip_mask &amp; IDLE_CHK_E3A0) &amp;&amp; is_e3a0) &amp;&amp;</div><div class='add'>+		    !((rec.chip_mask &amp; IDLE_CHK_E3B0) &amp;&amp; is_e3b0))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		/* identify macro */</div><div class='add'>+		switch (rec.macro) {</div><div class='add'>+		case 1:</div><div class='add'>+			/* read single reg and call predicate */</div><div class='add'>+			rec.pred_args.val1 = REG_RD(bp, rec.reg1);</div><div class='add'>+			DP(BNX2X_MSG_IDLE, "mac1 add %x\n", rec.reg1);</div><div class='add'>+			if (rec.bnx2x_predicate(&amp;rec.pred_args)) {</div><div class='add'>+				snprintf(message, sizeof(message),</div><div class='add'>+					 "%s.Value is 0x%x\n", rec.fail_msg,</div><div class='add'>+					 rec.pred_args.val1);</div><div class='add'>+				bnx2x_self_test_log(bp, rec.severity, message);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			/* read repeatedly starting from reg1 and call</div><div class='add'>+			 * predicate after each read</div><div class='add'>+			 */</div><div class='add'>+			for (i = 0; i &lt; rec.loop; i++) {</div><div class='add'>+				rec.pred_args.val1 =</div><div class='add'>+					REG_RD(bp, rec.reg1 + i * rec.incr);</div><div class='add'>+				DP(BNX2X_MSG_IDLE, "mac2 add %x\n", rec.reg1);</div><div class='add'>+				if (rec.bnx2x_predicate(&amp;rec.pred_args)) {</div><div class='add'>+					snprintf(message, sizeof(message),</div><div class='add'>+						 "%s. Value is 0x%x in loop %d\n",</div><div class='add'>+						 rec.fail_msg,</div><div class='add'>+						 rec.pred_args.val1, i);</div><div class='add'>+					bnx2x_self_test_log(bp, rec.severity,</div><div class='add'>+							    message);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 3:</div><div class='add'>+			/* read two regs and call predicate */</div><div class='add'>+			rec.pred_args.val1 = REG_RD(bp, rec.reg1);</div><div class='add'>+			rec.pred_args.val2 = REG_RD(bp, rec.reg2);</div><div class='add'>+			DP(BNX2X_MSG_IDLE, "mac3 add1 %x add2 %x\n",</div><div class='add'>+			   rec.reg1, rec.reg2);</div><div class='add'>+			if (rec.bnx2x_predicate(&amp;rec.pred_args)) {</div><div class='add'>+				snprintf(message, sizeof(message),</div><div class='add'>+					 "%s. Values are 0x%x 0x%x\n",</div><div class='add'>+					 rec.fail_msg, rec.pred_args.val1,</div><div class='add'>+					 rec.pred_args.val2);</div><div class='add'>+				bnx2x_self_test_log(bp, rec.severity, message);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 4:</div><div class='add'>+			/*unused to-date*/</div><div class='add'>+			for (i = 0; i &lt; rec.loop; i++) {</div><div class='add'>+				rec.pred_args.val1 =</div><div class='add'>+					REG_RD(bp, rec.reg1 + i * rec.incr);</div><div class='add'>+				rec.pred_args.val2 =</div><div class='add'>+					(REG_RD(bp,</div><div class='add'>+						rec.reg2 + i * rec.incr)) &gt;&gt; 1;</div><div class='add'>+				if (rec.bnx2x_predicate(&amp;rec.pred_args)) {</div><div class='add'>+					snprintf(message, sizeof(message),</div><div class='add'>+						 "%s. Values are 0x%x 0x%x in loop %d\n",</div><div class='add'>+						 rec.fail_msg,</div><div class='add'>+						 rec.pred_args.val1,</div><div class='add'>+						 rec.pred_args.val2, i);</div><div class='add'>+					bnx2x_self_test_log(bp, rec.severity,</div><div class='add'>+							    message);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 5:</div><div class='add'>+			/* compare two regs, pending</div><div class='add'>+			 * the value of a condition reg</div><div class='add'>+			 */</div><div class='add'>+			rec.pred_args.val1 = REG_RD(bp, rec.reg1);</div><div class='add'>+			rec.pred_args.val2 = REG_RD(bp, rec.reg2);</div><div class='add'>+			DP(BNX2X_MSG_IDLE, "mac3 add1 %x add2 %x add3 %x\n",</div><div class='add'>+			   rec.reg1, rec.reg2, rec.reg3);</div><div class='add'>+			if (REG_RD(bp, rec.reg3) != 0) {</div><div class='add'>+				if (rec.bnx2x_predicate(&amp;rec.pred_args)) {</div><div class='add'>+					snprintf(message, sizeof(message),</div><div class='add'>+						 "%s. Values are 0x%x 0x%x\n",</div><div class='add'>+						 rec.fail_msg,</div><div class='add'>+						 rec.pred_args.val1,</div><div class='add'>+						 rec.pred_args.val2);</div><div class='add'>+					bnx2x_self_test_log(bp, rec.severity,</div><div class='add'>+							    message);</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 6:</div><div class='add'>+			/* compare read and write pointers</div><div class='add'>+			 * and read and write banks in QM</div><div class='add'>+			 */</div><div class='add'>+			bnx2x_idle_chk6(bp, &amp;rec, message);</div><div class='add'>+			break;</div><div class='add'>+		case 7:</div><div class='add'>+			/* compare cfc info cam with cid cam */</div><div class='add'>+			bnx2x_idle_chk7(bp, &amp;rec, message);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			DP(BNX2X_MSG_IDLE,</div><div class='add'>+			   "unknown macro in self test data base. macro %d line %d",</div><div class='add'>+			   rec.macro, st_ind);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* abort if interface is not running */</div><div class='add'>+	if (!netif_running(bp-&gt;dev))</div><div class='add'>+		return idle_chk_errors;</div><div class='add'>+</div><div class='add'>+	/* return value accorindg to statistics */</div><div class='add'>+	if (idle_chk_errors == 0) {</div><div class='add'>+		DP(BNX2X_MSG_IDLE,</div><div class='add'>+		   "completed successfully (logged %d warnings)\n",</div><div class='add'>+		   idle_chk_warnings);</div><div class='add'>+	} else {</div><div class='add'>+		BNX2X_ERR("failed (with %d errors, %d warnings)\n",</div><div class='add'>+			  idle_chk_errors, idle_chk_warnings);</div><div class='add'>+	}</div><div class='add'>+	return idle_chk_errors;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c<br/>index 80d250a6d048..02c8213915a5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c</a></div><div class='hunk'>@@ -37,10 +37,12 @@</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_exe_queue_init - init the Exe Queue object</div><div class='ctx'>  *</div><div class='add'>+ * @bp:		driver handle</div><div class='ctx'>  * @o:		pointer to the object</div><div class='ctx'>  * @exe_len:	length</div><div class='ctx'>  * @owner:	pointer to the owner</div><div class='ctx'>  * @validate:	validate function pointer</div><div class='add'>+ * @remove:	remove function pointer</div><div class='ctx'>  * @optimize:	optimize function pointer</div><div class='ctx'>  * @exec:	execute function pointer</div><div class='ctx'>  * @get:	get function pointer</div><div class='hunk'>@@ -103,7 +105,7 @@ static inline int bnx2x_exe_queue_length(struct bnx2x_exe_queue_obj *o)</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		driver handle</div><div class='ctx'>  * @o:		queue</div><div class='del'>- * @cmd:	new command to add</div><div class='add'>+ * @elem:	new command to add</div><div class='ctx'>  * @restore:	true - do not optimize the command</div><div class='ctx'>  *</div><div class='ctx'>  * If the element is optimized or is illegal, frees it.</div><div class='hunk'>@@ -277,7 +279,7 @@ static void bnx2x_raw_set_pending(struct bnx2x_raw_obj *o)</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='ctx'>  * @state:	state which is to be cleared</div><div class='del'>- * @state_p:	state buffer</div><div class='add'>+ * @pstate:	state buffer</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static inline int bnx2x_state_wait(struct bnx2x *bp, int state,</div><div class='hunk'>@@ -424,8 +426,8 @@ static bool bnx2x_put_credit_vlan_mac(struct bnx2x_vlan_mac_obj *o)</div><div class='ctx'>  * @bp:		device handle</div><div class='ctx'>  * @o:		vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details: Non-blocking implementation; should be called under execution</div><div class='del'>- *           queue lock.</div><div class='add'>+ * Context: Non-blocking implementation; should be called under execution</div><div class='add'>+ *          queue lock.</div><div class='ctx'>  */</div><div class='ctx'> static int __bnx2x_vlan_mac_h_write_trylock(struct bnx2x *bp,</div><div class='ctx'> 					    struct bnx2x_vlan_mac_obj *o)</div><div class='hunk'>@@ -445,7 +447,7 @@ static int __bnx2x_vlan_mac_h_write_trylock(struct bnx2x *bp,</div><div class='ctx'>  * @bp:		device handle</div><div class='ctx'>  * @o:		vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details Should be called under execution queue lock; notice it might release</div><div class='add'>+ * details Should be called under execution queue lock; notice it might release</div><div class='ctx'>  *          and reclaim it during its run.</div><div class='ctx'>  */</div><div class='ctx'> static void __bnx2x_vlan_mac_h_exec_pending(struct bnx2x *bp,</div><div class='hunk'>@@ -475,7 +477,7 @@ static void __bnx2x_vlan_mac_h_exec_pending(struct bnx2x *bp,</div><div class='ctx'>  * @o:			vlan_mac object</div><div class='ctx'>  * @ramrod_flags:	ramrod flags of missed execution</div><div class='ctx'>  *</div><div class='del'>- * @details Should be called under execution queue lock.</div><div class='add'>+ * Context: Should be called under execution queue lock.</div><div class='ctx'>  */</div><div class='ctx'> static void __bnx2x_vlan_mac_h_pend(struct bnx2x *bp,</div><div class='ctx'> 				    struct bnx2x_vlan_mac_obj *o,</div><div class='hunk'>@@ -493,7 +495,7 @@ static void __bnx2x_vlan_mac_h_pend(struct bnx2x *bp,</div><div class='ctx'>  * @bp:			device handle</div><div class='ctx'>  * @o:			vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details Should be called under execution queue lock. Notice if a pending</div><div class='add'>+ * Context: Should be called under execution queue lock. Notice if a pending</div><div class='ctx'>  *          execution exists, it would perform it - possibly releasing and</div><div class='ctx'>  *          reclaiming the execution queue lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -516,7 +518,7 @@ static void __bnx2x_vlan_mac_h_write_unlock(struct bnx2x *bp,</div><div class='ctx'>  * @bp:			device handle</div><div class='ctx'>  * @o:			vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details Should be called under the execution queue lock. May sleep. May</div><div class='add'>+ * Context: Should be called under the execution queue lock. May sleep. May</div><div class='ctx'>  *          release and reclaim execution queue lock during its run.</div><div class='ctx'>  */</div><div class='ctx'> static int __bnx2x_vlan_mac_h_read_lock(struct bnx2x *bp,</div><div class='hunk'>@@ -536,7 +538,7 @@ static int __bnx2x_vlan_mac_h_read_lock(struct bnx2x *bp,</div><div class='ctx'>  * @bp:			device handle</div><div class='ctx'>  * @o:			vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details May sleep. Claims and releases execution queue lock during its run.</div><div class='add'>+ * Context: May sleep. Claims and releases execution queue lock during its run.</div><div class='ctx'>  */</div><div class='ctx'> int bnx2x_vlan_mac_h_read_lock(struct bnx2x *bp,</div><div class='ctx'> 			       struct bnx2x_vlan_mac_obj *o)</div><div class='hunk'>@@ -556,7 +558,7 @@ int bnx2x_vlan_mac_h_read_lock(struct bnx2x *bp,</div><div class='ctx'>  * @bp:			device handle</div><div class='ctx'>  * @o:			vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details Should be called under execution queue lock. Notice if a pending</div><div class='add'>+ * Context: Should be called under execution queue lock. Notice if a pending</div><div class='ctx'>  *          execution exists, it would be performed if this was the last</div><div class='ctx'>  *          reader. possibly releasing and reclaiming the execution queue lock.</div><div class='ctx'>  */</div><div class='hunk'>@@ -591,7 +593,7 @@ static void __bnx2x_vlan_mac_h_read_unlock(struct bnx2x *bp,</div><div class='ctx'>  * @bp:			device handle</div><div class='ctx'>  * @o:			vlan_mac object</div><div class='ctx'>  *</div><div class='del'>- * @details Notice if a pending execution exists, it would be performed if this</div><div class='add'>+ * Context: Notice if a pending execution exists, it would be performed if this</div><div class='ctx'>  *          was the last reader. Claims and releases the execution queue lock</div><div class='ctx'>  *          during its run.</div><div class='ctx'>  */</div><div class='hunk'>@@ -888,7 +890,7 @@ static void bnx2x_set_one_mac_e2(struct bnx2x *bp,</div><div class='ctx'> 		(struct eth_classify_rules_ramrod_data *)(raw-&gt;rdata);</div><div class='ctx'> 	int rule_cnt = rule_idx + 1, cmd = elem-&gt;cmd_data.vlan_mac.cmd;</div><div class='ctx'> 	union eth_classify_rule_cmd *rule_entry = &amp;data-&gt;rules[rule_idx];</div><div class='del'>-	bool add = (cmd == BNX2X_VLAN_MAC_ADD) ? true : false;</div><div class='add'>+	bool add = cmd == BNX2X_VLAN_MAC_ADD;</div><div class='ctx'> 	unsigned long *vlan_mac_flags = &amp;elem-&gt;cmd_data.vlan_mac.vlan_mac_flags;</div><div class='ctx'> 	u8 *mac = elem-&gt;cmd_data.vlan_mac.u.mac.mac;</div><div class='ctx'> </div><div class='hunk'>@@ -968,7 +970,7 @@ static void bnx2x_set_one_mac_e2(struct bnx2x *bp,</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='ctx'>  * @o:		queue</div><div class='del'>- * @type:</div><div class='add'>+ * @type:	the type of echo</div><div class='ctx'>  * @cam_offset:	offset in cam memory</div><div class='ctx'>  * @hdr:	pointer to a header to setup</div><div class='ctx'>  *</div><div class='hunk'>@@ -1073,7 +1075,7 @@ static void bnx2x_set_one_vlan_e2(struct bnx2x *bp,</div><div class='ctx'> 	int rule_cnt = rule_idx + 1;</div><div class='ctx'> 	union eth_classify_rule_cmd *rule_entry = &amp;data-&gt;rules[rule_idx];</div><div class='ctx'> 	enum bnx2x_vlan_mac_cmd cmd = elem-&gt;cmd_data.vlan_mac.cmd;</div><div class='del'>-	bool add = (cmd == BNX2X_VLAN_MAC_ADD) ? true : false;</div><div class='add'>+	bool add = cmd == BNX2X_VLAN_MAC_ADD;</div><div class='ctx'> 	u16 vlan = elem-&gt;cmd_data.vlan_mac.u.vlan.vlan;</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the ramrod data buffer for the first rule */</div><div class='hunk'>@@ -1123,7 +1125,7 @@ static void bnx2x_set_one_vlan_mac_e2(struct bnx2x *bp,</div><div class='ctx'> 	int rule_cnt = rule_idx + 1;</div><div class='ctx'> 	union eth_classify_rule_cmd *rule_entry = &amp;data-&gt;rules[rule_idx];</div><div class='ctx'> 	enum bnx2x_vlan_mac_cmd cmd = elem-&gt;cmd_data.vlan_mac.cmd;</div><div class='del'>-	bool add = (cmd == BNX2X_VLAN_MAC_ADD) ? true : false;</div><div class='add'>+	bool add = cmd == BNX2X_VLAN_MAC_ADD;</div><div class='ctx'> 	u16 vlan = elem-&gt;cmd_data.vlan_mac.u.vlan_mac.vlan;</div><div class='ctx'> 	u8 *mac = elem-&gt;cmd_data.vlan_mac.u.vlan_mac.mac;</div><div class='ctx'> 	u16 inner_mac;</div><div class='hunk'>@@ -1608,8 +1610,8 @@ static int __bnx2x_vlan_mac_execute_step(struct bnx2x *bp,</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='ctx'>  * @o:		bnx2x_vlan_mac_obj</div><div class='del'>- * @cqe:</div><div class='del'>- * @cont:	if true schedule next execution chunk</div><div class='add'>+ * @cqe:	completion element</div><div class='add'>+ * @ramrod_flags: if set schedule next execution chunk</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='ctx'> static int bnx2x_complete_vlan_mac(struct bnx2x *bp,</div><div class='hunk'>@@ -1656,7 +1658,7 @@ static int bnx2x_complete_vlan_mac(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_optimize_vlan_mac - optimize ADD and DEL commands.</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:		bnx2x_qable_obj</div><div class='add'>+ * @qo:		bnx2x_qable_obj</div><div class='ctx'>  * @elem:	bnx2x_exeq_elem</div><div class='ctx'>  */</div><div class='ctx'> static int bnx2x_optimize_vlan_mac(struct bnx2x *bp,</div><div class='hunk'>@@ -1714,10 +1716,10 @@ static int bnx2x_optimize_vlan_mac(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_vlan_mac_get_registry_elem - prepare a registry element</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:	  device handle</div><div class='del'>- * @o:</div><div class='del'>- * @elem:</div><div class='del'>- * @restore:</div><div class='del'>- * @re:</div><div class='add'>+ * @o:	vlan object</div><div class='add'>+ * @elem: element</div><div class='add'>+ * @restore: to restore or not</div><div class='add'>+ * @re: registry</div><div class='ctx'>  *</div><div class='ctx'>  * prepare a registry element according to the current command request.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1768,9 +1770,9 @@ static inline int bnx2x_vlan_mac_get_registry_elem(</div><div class='ctx'>  * bnx2x_execute_vlan_mac - execute vlan mac command</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:			device handle</div><div class='del'>- * @qo:</div><div class='del'>- * @exe_chunk:</div><div class='del'>- * @ramrod_flags:</div><div class='add'>+ * @qo:			bnx2x_qable_obj pointer</div><div class='add'>+ * @exe_chunk:		chunk</div><div class='add'>+ * @ramrod_flags:	flags</div><div class='ctx'>  *</div><div class='ctx'>  * go and send a ramrod!</div><div class='ctx'>  */</div><div class='hunk'>@@ -2006,8 +2008,8 @@ int bnx2x_config_vlan_mac(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_vlan_mac_del_all - delete elements with given vlan_mac_flags spec</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:			device handle</div><div class='del'>- * @o:</div><div class='del'>- * @vlan_mac_flags:</div><div class='add'>+ * @o:			vlan object info</div><div class='add'>+ * @vlan_mac_flags:	vlan flags</div><div class='ctx'>  * @ramrod_flags:	execution flags to be used for this deletion</div><div class='ctx'>  *</div><div class='ctx'>  * if the last operation has completed successfully and there are no</div><div class='hunk'>@@ -2591,7 +2593,7 @@ void bnx2x_init_rx_mode_obj(struct bnx2x *bp,</div><div class='ctx'> /********************* Multicast verbs: SET, CLEAR ****************************/</div><div class='ctx'> static inline u8 bnx2x_mcast_bin_from_mac(u8 *mac)</div><div class='ctx'> {</div><div class='del'>-	return (crc32c_le(0, mac, ETH_ALEN) &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+	return (crc32c(0, mac, ETH_ALEN) &gt;&gt; 24) &amp; 0xff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_mcast_mac_elem {</div><div class='hunk'>@@ -2767,7 +2769,7 @@ static int bnx2x_mcast_enqueue_cmd(struct bnx2x *bp,</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_mcast_get_next_bin - get the next set bin (index)</div><div class='ctx'>  *</div><div class='del'>- * @o:</div><div class='add'>+ * @o:		multicast object info</div><div class='ctx'>  * @last:	index to start looking from (including)</div><div class='ctx'>  *</div><div class='ctx'>  * returns the next found (set) bin or a negative value if none is found.</div><div class='hunk'>@@ -2892,7 +2894,7 @@ static void bnx2x_mcast_set_one_rule_e2(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_mcast_handle_restore_cmd_e2 - restore configuration from the registry</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='add'>+ * @o:		multicast object info</div><div class='ctx'>  * @start_bin:	index in the registry to start from (including)</div><div class='ctx'>  * @rdata_idx:	index in the ramrod data to start from</div><div class='ctx'>  *</div><div class='hunk'>@@ -3202,11 +3204,11 @@ static inline void bnx2x_mcast_hdl_del(struct bnx2x *bp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bnx2x_mcast_handle_current_cmd -</div><div class='add'>+ * bnx2x_mcast_handle_current_cmd - send command if room</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @p:</div><div class='del'>- * @cmd:</div><div class='add'>+ * @p:		ramrod mcast info</div><div class='add'>+ * @cmd:	command</div><div class='ctx'>  * @start_cnt:	first line in the ramrod data that may be used</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called iff there is enough place for the current command in</div><div class='hunk'>@@ -3258,7 +3260,7 @@ static int bnx2x_mcast_validate_e2(struct bnx2x *bp,</div><div class='ctx'> 	/* DEL command deletes all currently configured MACs */</div><div class='ctx'> 	case BNX2X_MCAST_CMD_DEL:</div><div class='ctx'> 		o-&gt;set_registry_size(o, 0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	/* RESTORE command will restore the entire multicast configuration */</div><div class='ctx'> 	case BNX2X_MCAST_CMD_RESTORE:</div><div class='hunk'>@@ -3323,7 +3325,7 @@ static void bnx2x_mcast_revert_e2(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_mcast_set_rdata_hdr_e2 - sets a header values</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @p:</div><div class='add'>+ * @p:		ramrod parameters</div><div class='ctx'>  * @len:	number of rules to handle</div><div class='ctx'>  */</div><div class='ctx'> static inline void bnx2x_mcast_set_rdata_hdr_e2(struct bnx2x *bp,</div><div class='hunk'>@@ -3592,7 +3594,7 @@ static int bnx2x_mcast_validate_e1(struct bnx2x *bp,</div><div class='ctx'> 	/* DEL command deletes all currently configured MACs */</div><div class='ctx'> 	case BNX2X_MCAST_CMD_DEL:</div><div class='ctx'> 		o-&gt;set_registry_size(o, 0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	/* RESTORE command will restore the entire multicast configuration */</div><div class='ctx'> 	case BNX2X_MCAST_CMD_RESTORE:</div><div class='hunk'>@@ -3684,7 +3686,7 @@ static void bnx2x_mcast_set_one_rule_e1(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_mcast_set_rdata_hdr_e1  - set header values in mac_configuration_cmd</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @p:</div><div class='add'>+ * @p:		ramrod parameters</div><div class='ctx'>  * @len:	number of rules to handle</div><div class='ctx'>  */</div><div class='ctx'> static inline void bnx2x_mcast_set_rdata_hdr_e1(struct bnx2x *bp,</div><div class='hunk'>@@ -3711,7 +3713,7 @@ static inline void bnx2x_mcast_set_rdata_hdr_e1(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_mcast_handle_restore_cmd_e1 - restore command for 57710</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='add'>+ * @o:		multicast info</div><div class='ctx'>  * @start_idx:	index in the registry to start from</div><div class='ctx'>  * @rdata_idx:	index in the ramrod data to start from</div><div class='ctx'>  *</div><div class='hunk'>@@ -3798,10 +3800,10 @@ static inline int bnx2x_mcast_handle_pending_cmds_e1(</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_get_fw_mac_addr - revert the bnx2x_set_fw_mac_addr().</div><div class='ctx'>  *</div><div class='del'>- * @fw_hi:</div><div class='del'>- * @fw_mid:</div><div class='del'>- * @fw_lo:</div><div class='del'>- * @mac:</div><div class='add'>+ * @fw_hi: address</div><div class='add'>+ * @fw_mid: address</div><div class='add'>+ * @fw_lo: address</div><div class='add'>+ * @mac: mac address</div><div class='ctx'>  */</div><div class='ctx'> static inline void bnx2x_get_fw_mac_addr(__le16 *fw_hi, __le16 *fw_mid,</div><div class='ctx'> 					 __le16 *fw_lo, u8 *mac)</div><div class='hunk'>@@ -3818,7 +3820,7 @@ static inline void bnx2x_get_fw_mac_addr(__le16 *fw_hi, __le16 *fw_mid,</div><div class='ctx'>  * bnx2x_mcast_refresh_registry_e1 -</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @cnt:</div><div class='add'>+ * @o:		multicast info</div><div class='ctx'>  *</div><div class='ctx'>  * Check the ramrod data first entry flag to see if it's a DELETE or ADD command</div><div class='ctx'>  * and update the registry correspondingly: if ADD - allocate a memory and add</div><div class='hunk'>@@ -4150,7 +4152,7 @@ void bnx2x_init_mcast_obj(struct bnx2x *bp,</div><div class='ctx'> /*************************** Credit handling **********************************/</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atomic_add_ifless - add if the result is less than a given value.</div><div class='add'>+ * __atomic_add_ifless - add if the result is less than a given value.</div><div class='ctx'>  *</div><div class='ctx'>  * @v:	pointer of type atomic_t</div><div class='ctx'>  * @a:	the amount to add to v...</div><div class='hunk'>@@ -4178,7 +4180,7 @@ static inline bool __atomic_add_ifless(atomic_t *v, int a, int u)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * atomic_dec_ifmoe - dec if the result is more or equal than a given value.</div><div class='add'>+ * __atomic_dec_ifmoe - dec if the result is more or equal than a given value.</div><div class='ctx'>  *</div><div class='ctx'>  * @v:	pointer of type atomic_t</div><div class='ctx'>  * @a:	the amount to dec from v...</div><div class='hunk'>@@ -4311,7 +4313,7 @@ static bool bnx2x_credit_pool_get_entry_always_true(</div><div class='ctx'> /**</div><div class='ctx'>  * bnx2x_init_credit_pool - initialize credit pool internals.</div><div class='ctx'>  *</div><div class='del'>- * @p:</div><div class='add'>+ * @p:		credit pool</div><div class='ctx'>  * @base:	Base entry in the CAM to use.</div><div class='ctx'>  * @credit:	pool size.</div><div class='ctx'>  *</div><div class='hunk'>@@ -4725,8 +4727,8 @@ static int bnx2x_queue_wait_comp(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_queue_comp_cmd - complete the state change command.</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='del'>- * @cmd:</div><div class='add'>+ * @o:		queue info</div><div class='add'>+ * @cmd:	command to exec</div><div class='ctx'>  *</div><div class='ctx'>  * Checks that the arrived completion is expected.</div><div class='ctx'>  */</div><div class='hunk'>@@ -5477,8 +5479,8 @@ static int bnx2x_queue_send_cmd_e2(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_queue_chk_transition - check state machine of a regular Queue</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='del'>- * @params:</div><div class='add'>+ * @o:		queue info</div><div class='add'>+ * @params:	queue state</div><div class='ctx'>  *</div><div class='ctx'>  * (not Forwarding)</div><div class='ctx'>  * It both checks if the requested command is legal in a current</div><div class='hunk'>@@ -5735,8 +5737,8 @@ static int bnx2x_func_wait_comp(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_func_state_change_comp - complete the state machine transition</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='del'>- * @cmd:</div><div class='add'>+ * @o:		function info</div><div class='add'>+ * @cmd:	more info</div><div class='ctx'>  *</div><div class='ctx'>  * Called on state change transition. Completes the state</div><div class='ctx'>  * machine transition only - no HW interaction.</div><div class='hunk'>@@ -5776,8 +5778,8 @@ static inline int bnx2x_func_state_change_comp(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_func_comp_cmd - complete the state change command</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='del'>- * @cmd:</div><div class='add'>+ * @o:		function info</div><div class='add'>+ * @cmd:	more info</div><div class='ctx'>  *</div><div class='ctx'>  * Checks that the arrived completion is expected.</div><div class='ctx'>  */</div><div class='hunk'>@@ -5796,8 +5798,8 @@ static int bnx2x_func_comp_cmd(struct bnx2x *bp,</div><div class='ctx'>  * bnx2x_func_chk_transition - perform function state machine transition</div><div class='ctx'>  *</div><div class='ctx'>  * @bp:		device handle</div><div class='del'>- * @o:</div><div class='del'>- * @params:</div><div class='add'>+ * @o:		function info</div><div class='add'>+ * @params:	state parameters</div><div class='ctx'>  *</div><div class='ctx'>  * It both checks if the requested command is legal in a current</div><div class='ctx'>  * state and, if it's legal, sets a `next_state' in the object</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h<br/>index 7a6e82db4231..00ca861c80dd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h</a></div><div class='hunk'>@@ -379,7 +379,7 @@ struct bnx2x_vlan_mac_obj {</div><div class='ctx'> 	/**</div><div class='ctx'> 	*  Delete all configured elements having the given</div><div class='ctx'> 	*  vlan_mac_flags specification. Assumes no pending for</div><div class='del'>-	*  execution commands. Will schedule all all currently</div><div class='add'>+	*  execution commands. Will schedule all currently</div><div class='ctx'> 	*  configured MACs/VLANs/VLAN-MACs matching the vlan_mac_flags</div><div class='ctx'> 	*  specification for deletion and will use the given</div><div class='ctx'> 	*  ramrod_flags for the last DEL operation.</div><div class='hunk'>@@ -1536,8 +1536,11 @@ void bnx2x_get_rss_ind_table(struct bnx2x_rss_config_obj *rss_obj,</div><div class='ctx'> 	((MAX_MAC_CREDIT_E2 - GET_NUM_VFS_PER_PATH(bp) * VF_MAC_CREDIT_CNT) / \</div><div class='ctx'> 	 func_num + GET_NUM_VFS_PER_PF(bp) * VF_MAC_CREDIT_CNT)</div><div class='ctx'> </div><div class='add'>+#define BNX2X_VFS_VLAN_CREDIT(bp)	\</div><div class='add'>+	(GET_NUM_VFS_PER_PATH(bp) * VF_VLAN_CREDIT_CNT)</div><div class='add'>+</div><div class='ctx'> #define PF_VLAN_CREDIT_E2(bp, func_num)					 \</div><div class='del'>-	((MAX_MAC_CREDIT_E2 - GET_NUM_VFS_PER_PATH(bp) * VF_VLAN_CREDIT_CNT) / \</div><div class='add'>+	((MAX_VLAN_CREDIT_E2 - 1 - BNX2X_VFS_VLAN_CREDIT(bp)) /	\</div><div class='ctx'> 	 func_num + GET_NUM_VFS_PER_PF(bp) * VF_VLAN_CREDIT_CNT)</div><div class='ctx'> </div><div class='ctx'> #endif /* BNX2X_SP_VERBS */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c<br/>index 0edbb0a76847..12198fc3ab22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c</a></div><div class='hunk'>@@ -331,27 +331,6 @@ bnx2x_vf_set_igu_info(struct bnx2x *bp, u8 igu_sb_id, u8 abs_vfid)</div><div class='ctx'> 	BP_VFDB(bp)-&gt;vf_sbs_pool++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bnx2x_vf_vlan_credit(struct bnx2x *bp,</div><div class='del'>-					struct bnx2x_vlan_mac_obj *obj,</div><div class='del'>-					atomic_t *counter)</div><div class='del'>-{</div><div class='del'>-	struct list_head *pos;</div><div class='del'>-	int read_lock;</div><div class='del'>-	int cnt = 0;</div><div class='del'>-</div><div class='del'>-	read_lock = bnx2x_vlan_mac_h_read_lock(bp, obj);</div><div class='del'>-	if (read_lock)</div><div class='del'>-		DP(BNX2X_MSG_SP, "Failed to take vlan mac read head; continuing anyway\n");</div><div class='del'>-</div><div class='del'>-	list_for_each(pos, &amp;obj-&gt;head)</div><div class='del'>-		cnt++;</div><div class='del'>-</div><div class='del'>-	if (!read_lock)</div><div class='del'>-		bnx2x_vlan_mac_h_read_unlock(bp, obj);</div><div class='del'>-</div><div class='del'>-	atomic_set(counter, cnt);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bnx2x_vf_vlan_mac_clear(struct bnx2x *bp, struct bnx2x_virtf *vf,</div><div class='ctx'> 				   int qid, bool drv_only, int type)</div><div class='ctx'> {</div><div class='hunk'>@@ -779,9 +758,18 @@ static void bnx2x_vf_igu_reset(struct bnx2x *bp, struct bnx2x_virtf *vf)</div><div class='ctx'> </div><div class='ctx'> void bnx2x_vf_enable_access(struct bnx2x *bp, u8 abs_vfid)</div><div class='ctx'> {</div><div class='add'>+	u16 abs_fid;</div><div class='add'>+</div><div class='add'>+	abs_fid = FW_VF_HANDLE(abs_vfid);</div><div class='add'>+</div><div class='ctx'> 	/* set the VF-PF association in the FW */</div><div class='del'>-	storm_memset_vf_to_pf(bp, FW_VF_HANDLE(abs_vfid), BP_FUNC(bp));</div><div class='del'>-	storm_memset_func_en(bp, FW_VF_HANDLE(abs_vfid), 1);</div><div class='add'>+	storm_memset_vf_to_pf(bp, abs_fid, BP_FUNC(bp));</div><div class='add'>+	storm_memset_func_en(bp, abs_fid, 1);</div><div class='add'>+</div><div class='add'>+	/* Invalidate fp_hsi version for vfs */</div><div class='add'>+	if (bp-&gt;fw_cap &amp; FW_CAP_INVALIDATE_VF_FP_HSI)</div><div class='add'>+		REG_WR8(bp, BAR_XSTRORM_INTMEM +</div><div class='add'>+			    XSTORM_ETH_FUNCTION_INFO_FP_HSI_VALID_E2_OFFSET(abs_fid), 0);</div><div class='ctx'> </div><div class='ctx'> 	/* clear vf errors*/</div><div class='ctx'> 	bnx2x_vf_semi_clear_err(bp, abs_vfid);</div><div class='hunk'>@@ -807,16 +795,20 @@ static void bnx2x_vf_enable_traffic(struct bnx2x *bp, struct bnx2x_virtf *vf)</div><div class='ctx'> </div><div class='ctx'> static u8 bnx2x_vf_is_pcie_pending(struct bnx2x *bp, u8 abs_vfid)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *dev;</div><div class='ctx'> 	struct bnx2x_virtf *vf = bnx2x_vf_by_abs_fid(bp, abs_vfid);</div><div class='add'>+	struct pci_dev *dev;</div><div class='add'>+	bool pending;</div><div class='ctx'> </div><div class='ctx'> 	if (!vf)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	dev = pci_get_domain_bus_and_slot(vf-&gt;domain, vf-&gt;bus, vf-&gt;devfn);</div><div class='del'>-	if (dev)</div><div class='del'>-		return bnx2x_is_pcie_pending(dev);</div><div class='del'>-	return false;</div><div class='add'>+	if (!dev)</div><div class='add'>+		return false;</div><div class='add'>+	pending = bnx2x_is_pcie_pending(dev);</div><div class='add'>+	pci_dev_put(dev);</div><div class='add'>+</div><div class='add'>+	return pending;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnx2x_vf_flr_clnup_epilog(struct bnx2x *bp, u8 abs_vfid)</div><div class='hunk'>@@ -1213,7 +1205,6 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = -EIO;</div><div class='ctx'> 	/* verify ari is enabled */</div><div class='ctx'> 	if (!pci_ari_enabled(bp-&gt;pdev-&gt;bus)) {</div><div class='ctx'> 		BNX2X_ERR("ARI not supported (check pci bridge ARI forwarding), SRIOV can not be enabled\n");</div><div class='hunk'>@@ -1245,8 +1236,10 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,</div><div class='ctx'> 		goto failed;</div><div class='ctx'> </div><div class='ctx'> 	/* SR-IOV capability was enabled but there are no VFs*/</div><div class='del'>-	if (iov-&gt;total == 0)</div><div class='add'>+	if (iov-&gt;total == 0) {</div><div class='add'>+		err = 0;</div><div class='ctx'> 		goto failed;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	iov-&gt;nr_virtfn = min_t(u16, iov-&gt;total, num_vfs_param);</div><div class='ctx'> </div><div class='hunk'>@@ -1830,7 +1823,7 @@ get_vf:</div><div class='ctx'> 		DP(BNX2X_MSG_IOV, "got VF [%d:%d] RSS update ramrod\n",</div><div class='ctx'> 		   vf-&gt;abs_vfid, qidx);</div><div class='ctx'> 		bnx2x_vf_handle_rss_update_eqe(bp, vf);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case EVENT_RING_OPCODE_VF_FLR:</div><div class='ctx'> 		/* Do nothing for now */</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1878,7 +1871,6 @@ void bnx2x_iov_adjust_stats_req(struct bnx2x *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	int first_queue_query_index, num_queues_req;</div><div class='del'>-	dma_addr_t cur_data_offset;</div><div class='ctx'> 	struct stats_query_entry *cur_query_entry;</div><div class='ctx'> 	u8 stats_count = 0;</div><div class='ctx'> 	bool is_fcoe = false;</div><div class='hunk'>@@ -1899,10 +1891,6 @@ void bnx2x_iov_adjust_stats_req(struct bnx2x *bp)</div><div class='ctx'> 	       BNX2X_NUM_ETH_QUEUES(bp), is_fcoe, first_queue_query_index,</div><div class='ctx'> 	       first_queue_query_index + num_queues_req);</div><div class='ctx'> </div><div class='del'>-	cur_data_offset = bp-&gt;fw_stats_data_mapping +</div><div class='del'>-		offsetof(struct bnx2x_fw_stats_data, queue_stats) +</div><div class='del'>-		num_queues_req * sizeof(struct per_queue_stats);</div><div class='del'>-</div><div class='ctx'> 	cur_query_entry = &amp;bp-&gt;fw_stats_req-&gt;</div><div class='ctx'> 		query[first_queue_query_index + num_queues_req];</div><div class='ctx'> </div><div class='hunk'>@@ -1953,7 +1941,6 @@ void bnx2x_iov_adjust_stats_req(struct bnx2x *bp)</div><div class='ctx'> 			       cur_query_entry-&gt;funcID,</div><div class='ctx'> 			       j, cur_query_entry-&gt;index);</div><div class='ctx'> 			cur_query_entry++;</div><div class='del'>-			cur_data_offset += sizeof(struct per_queue_stats);</div><div class='ctx'> 			stats_count++;</div><div class='ctx'> </div><div class='ctx'> 			/* all stats are coalesced to the leading queue */</div><div class='hunk'>@@ -2228,7 +2215,7 @@ int bnx2x_vf_free(struct bnx2x *bp, struct bnx2x_virtf *vf)</div><div class='ctx'> 		rc = bnx2x_vf_close(bp, vf);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto op_err;</div><div class='del'>-		/* Fall through - to release resources */</div><div class='add'>+		fallthrough;	/* to release resources */</div><div class='ctx'> 	case VF_ACQUIRED:</div><div class='ctx'> 		DP(BNX2X_MSG_IOV, "about to free resources\n");</div><div class='ctx'> 		bnx2x_vf_free_resc(bp, vf);</div><div class='hunk'>@@ -2397,15 +2384,21 @@ static int bnx2x_set_pf_tx_switching(struct bnx2x *bp, bool enable)</div><div class='ctx'> 	/* send the ramrod on all the queues of the PF */</div><div class='ctx'> 	for_each_eth_queue(bp, i) {</div><div class='ctx'> 		struct bnx2x_fastpath *fp = &amp;bp-&gt;fp[i];</div><div class='add'>+		int tx_idx;</div><div class='ctx'> </div><div class='ctx'> 		/* Set the appropriate Queue object */</div><div class='ctx'> 		q_params.q_obj = &amp;bnx2x_sp_obj(bp, fp).q_obj;</div><div class='ctx'> </div><div class='del'>-		/* Update the Queue state */</div><div class='del'>-		rc = bnx2x_queue_state_change(bp, &amp;q_params);</div><div class='del'>-		if (rc) {</div><div class='del'>-			BNX2X_ERR("Failed to configure Tx switching\n");</div><div class='del'>-			return rc;</div><div class='add'>+		for (tx_idx = FIRST_TX_COS_INDEX;</div><div class='add'>+		     tx_idx &lt; fp-&gt;max_cos; tx_idx++) {</div><div class='add'>+			q_params.params.update.cid_index = tx_idx;</div><div class='add'>+</div><div class='add'>+			/* Update the Queue state */</div><div class='add'>+			rc = bnx2x_queue_state_change(bp, &amp;q_params);</div><div class='add'>+			if (rc) {</div><div class='add'>+				BNX2X_ERR("Failed to configure Tx switching\n");</div><div class='add'>+				return rc;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2659,10 +2652,10 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx,</div><div class='ctx'> 		/* vlan */</div><div class='ctx'> 		if (bulletin-&gt;valid_bitmap &amp; (1 &lt;&lt; VLAN_VALID))</div><div class='ctx'> 			/* vlan configured by ndo so its in bulletin board */</div><div class='del'>-			memcpy(&amp;ivi-&gt;vlan, &amp;bulletin-&gt;vlan, VLAN_HLEN);</div><div class='add'>+			ivi-&gt;vlan = bulletin-&gt;vlan;</div><div class='ctx'> 		else</div><div class='ctx'> 			/* function has not been loaded yet. Show vlans as 0s */</div><div class='del'>-			memset(&amp;ivi-&gt;vlan, 0, VLAN_HLEN);</div><div class='add'>+			ivi-&gt;vlan = 0;</div><div class='ctx'> </div><div class='ctx'> 		mutex_unlock(&amp;bp-&gt;vfdb-&gt;bulletin_mutex);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3078,7 +3071,7 @@ enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp)</div><div class='ctx'> 	if (bulletin-&gt;valid_bitmap &amp; 1 &lt;&lt; MAC_ADDR_VALID &amp;&amp;</div><div class='ctx'> 	    !ether_addr_equal(bulletin-&gt;mac, bp-&gt;old_bulletin.mac)) {</div><div class='ctx'> 		/* update new mac to net device */</div><div class='del'>-		memcpy(bp-&gt;dev-&gt;dev_addr, bulletin-&gt;mac, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, bulletin-&gt;mac);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bulletin-&gt;valid_bitmap &amp; (1 &lt;&lt; LINK_VALID)) {</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h<br/>index b6ebd92ec565..02a4e557e176 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h</a></div><div class='hunk'>@@ -139,6 +139,7 @@ struct bnx2x_virtf {</div><div class='ctx'> #define VF_ACQUIRED	1	/* VF acquired, but not initialized */</div><div class='ctx'> #define VF_ENABLED	2	/* VF Enabled */</div><div class='ctx'> #define VF_RESET	3	/* VF FLR'd, pending cleanup */</div><div class='add'>+#define VF_LOST		4	/* Recovery while VFs are loaded */</div><div class='ctx'> </div><div class='ctx'> 	bool flr_clnup_stage;	/* true during flr cleanup */</div><div class='ctx'> 	bool malicious;		/* true if FW indicated so, until FLR */</div><div class='hunk'>@@ -503,12 +504,12 @@ enum sample_bulletin_result bnx2x_sample_bulletin(struct bnx2x *bp);</div><div class='ctx'> /* VF side vfpf channel functions */</div><div class='ctx'> int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count);</div><div class='ctx'> int bnx2x_vfpf_release(struct bnx2x *bp);</div><div class='del'>-int bnx2x_vfpf_release(struct bnx2x *bp);</div><div class='ctx'> int bnx2x_vfpf_init(struct bnx2x *bp);</div><div class='ctx'> void bnx2x_vfpf_close_vf(struct bnx2x *bp);</div><div class='ctx'> int bnx2x_vfpf_setup_q(struct bnx2x *bp, struct bnx2x_fastpath *fp,</div><div class='ctx'> 		       bool is_leading);</div><div class='del'>-int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr, u8 vf_qid, bool set);</div><div class='add'>+int bnx2x_vfpf_config_mac(struct bnx2x *bp, const u8 *addr, u8 vf_qid,</div><div class='add'>+			  bool set);</div><div class='ctx'> int bnx2x_vfpf_config_rss(struct bnx2x *bp,</div><div class='ctx'> 			  struct bnx2x_config_rss_params *params);</div><div class='ctx'> int bnx2x_vfpf_set_mcast(struct net_device *dev);</div><div class='hunk'>@@ -517,7 +518,7 @@ int bnx2x_vfpf_storm_rx_mode(struct bnx2x *bp);</div><div class='ctx'> static inline void bnx2x_vf_fill_fw_str(struct bnx2x *bp, char *buf,</div><div class='ctx'> 					size_t buf_len)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(buf, bp-&gt;acquire_resp.pfdev_info.fw_ver, buf_len);</div><div class='add'>+	strscpy(buf, bp-&gt;acquire_resp.pfdev_info.fw_ver, buf_len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int bnx2x_vf_ustorm_prods_offset(struct bnx2x *bp,</div><div class='hunk'>@@ -585,7 +586,7 @@ static inline int bnx2x_vfpf_release(struct bnx2x *bp) {return 0; }</div><div class='ctx'> static inline int bnx2x_vfpf_init(struct bnx2x *bp) {return 0; }</div><div class='ctx'> static inline void bnx2x_vfpf_close_vf(struct bnx2x *bp) {}</div><div class='ctx'> static inline int bnx2x_vfpf_setup_q(struct bnx2x *bp, struct bnx2x_fastpath *fp, bool is_leading) {return 0; }</div><div class='del'>-static inline int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr,</div><div class='add'>+static inline int bnx2x_vfpf_config_mac(struct bnx2x *bp, const u8 *addr,</div><div class='ctx'> 					u8 vf_qid, bool set) {return 0; }</div><div class='ctx'> static inline int bnx2x_vfpf_config_rss(struct bnx2x *bp,</div><div class='ctx'> 					struct bnx2x_config_rss_params *params) {return 0; }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c<br/>index 7e0919aa450e..ba6729f2f9c0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c</a></div><div class='hunk'>@@ -847,7 +847,8 @@ static int bnx2x_hw_stats_update(struct bnx2x *bp)</div><div class='ctx'> </div><div class='ctx'> 	memcpy(old, new, sizeof(struct nig_stats));</div><div class='ctx'> </div><div class='del'>-	memcpy(&amp;(estats-&gt;rx_stat_ifhcinbadoctets_hi), &amp;(pstats-&gt;mac_stx[1]),</div><div class='add'>+	BUILD_BUG_ON(sizeof(estats-&gt;shared) != sizeof(pstats-&gt;mac_stx[1]));</div><div class='add'>+	memcpy(&amp;(estats-&gt;shared), &amp;(pstats-&gt;mac_stx[1]),</div><div class='ctx'> 	       sizeof(struct mac_stx));</div><div class='ctx'> 	estats-&gt;brb_drop_hi = pstats-&gt;brb_drop_hi;</div><div class='ctx'> 	estats-&gt;brb_drop_lo = pstats-&gt;brb_drop_lo;</div><div class='hunk'>@@ -1632,9 +1633,9 @@ void bnx2x_stats_init(struct bnx2x *bp)</div><div class='ctx'> 			REG_RD(bp, NIG_REG_STAT0_BRB_TRUNCATE + port*0x38);</div><div class='ctx'> 	if (!CHIP_IS_E3(bp)) {</div><div class='ctx'> 		REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT0 + port*0x50,</div><div class='del'>-			    &amp;(bp-&gt;port.old_nig_stats.egress_mac_pkt0_lo), 2);</div><div class='add'>+			    &amp;(bp-&gt;port.old_nig_stats.egress_mac_pkt0), 2);</div><div class='ctx'> 		REG_RD_DMAE(bp, NIG_REG_STAT0_EGRESS_MAC_PKT1 + port*0x50,</div><div class='del'>-			    &amp;(bp-&gt;port.old_nig_stats.egress_mac_pkt1_lo), 2);</div><div class='add'>+			    &amp;(bp-&gt;port.old_nig_stats.egress_mac_pkt1), 2);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare statistics ramrod data */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h<br/>index b2644ed13d06..ae93c078707b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h</a></div><div class='hunk'>@@ -36,10 +36,14 @@ struct nig_stats {</div><div class='ctx'> 	u32 pbf_octets;</div><div class='ctx'> 	u32 pbf_packet;</div><div class='ctx'> 	u32 safc_inp;</div><div class='del'>-	u32 egress_mac_pkt0_lo;</div><div class='del'>-	u32 egress_mac_pkt0_hi;</div><div class='del'>-	u32 egress_mac_pkt1_lo;</div><div class='del'>-	u32 egress_mac_pkt1_hi;</div><div class='add'>+	struct_group(egress_mac_pkt0,</div><div class='add'>+		u32 egress_mac_pkt0_lo;</div><div class='add'>+		u32 egress_mac_pkt0_hi;</div><div class='add'>+	);</div><div class='add'>+	struct_group(egress_mac_pkt1,</div><div class='add'>+		u32 egress_mac_pkt1_lo;</div><div class='add'>+		u32 egress_mac_pkt1_hi;</div><div class='add'>+	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum bnx2x_stats_event {</div><div class='hunk'>@@ -83,6 +87,7 @@ struct bnx2x_eth_stats {</div><div class='ctx'> 	u32 no_buff_discard_hi;</div><div class='ctx'> 	u32 no_buff_discard_lo;</div><div class='ctx'> </div><div class='add'>+	struct_group(shared,</div><div class='ctx'> 	u32 rx_stat_ifhcinbadoctets_hi;</div><div class='ctx'> 	u32 rx_stat_ifhcinbadoctets_lo;</div><div class='ctx'> 	u32 tx_stat_ifhcoutbadoctets_hi;</div><div class='hunk'>@@ -159,6 +164,7 @@ struct bnx2x_eth_stats {</div><div class='ctx'> 	u32 tx_stat_dot3statsinternalmactransmiterrors_lo;</div><div class='ctx'> 	u32 tx_stat_bmac_ufl_hi;</div><div class='ctx'> 	u32 tx_stat_bmac_ufl_lo;</div><div class='add'>+	);</div><div class='ctx'> </div><div class='ctx'> 	u32 pause_frames_received_hi;</div><div class='ctx'> 	u32 pause_frames_received_lo;</div><div class='hunk'>@@ -207,6 +213,9 @@ struct bnx2x_eth_stats {</div><div class='ctx'> 	u32 driver_filtered_tx_pkt;</div><div class='ctx'> 	/* src: Clear-on-Read register; Will not survive PMF Migration */</div><div class='ctx'> 	u32 eee_tx_lpi;</div><div class='add'>+</div><div class='add'>+	/* PTP */</div><div class='add'>+	u32 ptp_skip_tx_ts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnx2x_eth_q_stats {</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c<br/>index 0752b7fa4d9c..8946a931e87e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c</a></div><div class='hunk'>@@ -380,13 +380,12 @@ int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count)</div><div class='ctx'> 	bp-&gt;igu_base_sb = bp-&gt;acquire_resp.resc.hw_sbs[0].hw_sb_id;</div><div class='ctx'> 	bp-&gt;vlan_credit = bp-&gt;acquire_resp.resc.num_vlan_filters;</div><div class='ctx'> </div><div class='del'>-	strlcpy(bp-&gt;fw_ver, bp-&gt;acquire_resp.pfdev_info.fw_ver,</div><div class='add'>+	strscpy(bp-&gt;fw_ver, bp-&gt;acquire_resp.pfdev_info.fw_ver,</div><div class='ctx'> 		sizeof(bp-&gt;fw_ver));</div><div class='ctx'> </div><div class='ctx'> 	if (is_valid_ether_addr(bp-&gt;acquire_resp.resc.current_mac_addr))</div><div class='del'>-		memcpy(bp-&gt;dev-&gt;dev_addr,</div><div class='del'>-		       bp-&gt;acquire_resp.resc.current_mac_addr,</div><div class='del'>-		       ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev,</div><div class='add'>+				bp-&gt;acquire_resp.resc.current_mac_addr);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	bnx2x_vfpf_finalize(bp, &amp;req-&gt;first_tlv);</div><div class='hunk'>@@ -530,13 +529,16 @@ void bnx2x_vfpf_close_vf(struct bnx2x *bp)</div><div class='ctx'> 	bnx2x_vfpf_finalize(bp, &amp;req-&gt;first_tlv);</div><div class='ctx'> </div><div class='ctx'> free_irq:</div><div class='del'>-	/* Disable HW interrupts, NAPI */</div><div class='del'>-	bnx2x_netif_stop(bp, 0);</div><div class='del'>-	/* Delete all NAPI objects */</div><div class='del'>-	bnx2x_del_all_napi(bp);</div><div class='del'>-</div><div class='del'>-	/* Release IRQs */</div><div class='del'>-	bnx2x_free_irq(bp);</div><div class='add'>+	if (!bp-&gt;nic_stopped) {</div><div class='add'>+		/* Disable HW interrupts, NAPI */</div><div class='add'>+		bnx2x_netif_stop(bp, 0);</div><div class='add'>+		/* Delete all NAPI objects */</div><div class='add'>+		bnx2x_del_all_napi(bp);</div><div class='add'>+</div><div class='add'>+		/* Release IRQs */</div><div class='add'>+		bnx2x_free_irq(bp);</div><div class='add'>+		bp-&gt;nic_stopped = true;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnx2x_leading_vfq_init(struct bnx2x *bp, struct bnx2x_virtf *vf,</div><div class='hunk'>@@ -722,7 +724,7 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* request pf to add a mac for the vf */</div><div class='del'>-int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr, u8 vf_qid, bool set)</div><div class='add'>+int bnx2x_vfpf_config_mac(struct bnx2x *bp, const u8 *addr, u8 vf_qid, bool set)</div><div class='ctx'> {</div><div class='ctx'> 	struct vfpf_set_q_filters_tlv *req = &amp;bp-&gt;vf2pf_mbox-&gt;req.set_q_filters;</div><div class='ctx'> 	struct pfvf_general_resp_tlv *resp = &amp;bp-&gt;vf2pf_mbox-&gt;resp.general_resp;</div><div class='hunk'>@@ -767,7 +769,7 @@ int bnx2x_vfpf_config_mac(struct bnx2x *bp, u8 *addr, u8 vf_qid, bool set)</div><div class='ctx'> 		   "vfpf SET MAC failed. Check bulletin board for new posts\n");</div><div class='ctx'> </div><div class='ctx'> 		/* copy mac from bulletin to device */</div><div class='del'>-		memcpy(bp-&gt;dev-&gt;dev_addr, bulletin.mac, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, bulletin.mac);</div><div class='ctx'> </div><div class='ctx'> 		/* check if bulletin board was updated */</div><div class='ctx'> 		if (bnx2x_sample_bulletin(bp) == PFVF_BULLETIN_UPDATED) {</div><div class='hunk'>@@ -2107,6 +2109,18 @@ static void bnx2x_vf_mbx_request(struct bnx2x *bp, struct bnx2x_virtf *vf,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (vf-&gt;state == VF_LOST) {</div><div class='add'>+		/* Just ack the FW and return if VFs are lost</div><div class='add'>+		 * in case of parity error. VFs are supposed to be timedout</div><div class='add'>+		 * on waiting for PF response.</div><div class='add'>+		 */</div><div class='add'>+		DP(BNX2X_MSG_IOV,</div><div class='add'>+		   "VF 0x%x lost, not handling the request\n", vf-&gt;abs_vfid);</div><div class='add'>+</div><div class='add'>+		storm_memset_vf_mbx_ack(bp, vf-&gt;abs_vfid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* check if tlv type is known */</div><div class='ctx'> 	if (bnx2x_tlv_supported(mbx-&gt;first_tlv.tl.type)) {</div><div class='ctx'> 		/* Lock the per vf op mutex and note the locker's identity.</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/Makefile b/drivers/net/ethernet/broadcom/bnxt/Makefile<br/>index cb97ec56fdec..ba6c239d52fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/Makefile</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> obj-$(CONFIG_BNXT) += bnxt_en.o</div><div class='ctx'> </div><div class='del'>-bnxt_en-y := bnxt.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o bnxt_ulp.o bnxt_xdp.o bnxt_vfr.o bnxt_devlink.o bnxt_dim.o</div><div class='add'>+bnxt_en-y := bnxt.o bnxt_hwrm.o bnxt_sriov.o bnxt_ethtool.o bnxt_dcb.o bnxt_ulp.o bnxt_xdp.o bnxt_ptp.o bnxt_vfr.o bnxt_devlink.o bnxt_dim.o bnxt_coredump.o</div><div class='ctx'> bnxt_en-$(CONFIG_BNXT_FLOWER_OFFLOAD) += bnxt_tc.o</div><div class='ctx'> bnxt_en-$(CONFIG_DEBUG_FS) += bnxt_debugfs.o</div><div class='add'>+bnxt_en-$(CONFIG_BNXT_HWMON) += bnxt_hwmon.o</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c<br/>index f758b2e0591f..d17d0ea89c36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt.c</a></div><div class='hunk'>@@ -37,6 +37,7 @@</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;linux/rtc.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/tcp.h&gt;</div><div class='ctx'> #include &lt;net/udp.h&gt;</div><div class='hunk'>@@ -47,84 +48,47 @@</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='ctx'> #include &lt;linux/log2.h&gt;</div><div class='del'>-#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='ctx'> #include &lt;linux/cpu_rmap.h&gt;</div><div class='ctx'> #include &lt;linux/cpumask.h&gt;</div><div class='ctx'> #include &lt;net/pkt_cls.h&gt;</div><div class='del'>-#include &lt;linux/hwmon.h&gt;</div><div class='del'>-#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;linux/align.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include &lt;net/netdev_rx_queue.h&gt;</div><div class='add'>+#include &lt;linux/pci-tph.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bnxt_hsi.h"</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_ulp.h"</div><div class='ctx'> #include "bnxt_sriov.h"</div><div class='ctx'> #include "bnxt_ethtool.h"</div><div class='ctx'> #include "bnxt_dcb.h"</div><div class='ctx'> #include "bnxt_xdp.h"</div><div class='add'>+#include "bnxt_ptp.h"</div><div class='ctx'> #include "bnxt_vfr.h"</div><div class='ctx'> #include "bnxt_tc.h"</div><div class='ctx'> #include "bnxt_devlink.h"</div><div class='ctx'> #include "bnxt_debugfs.h"</div><div class='add'>+#include "bnxt_coredump.h"</div><div class='add'>+#include "bnxt_hwmon.h"</div><div class='ctx'> </div><div class='ctx'> #define BNXT_TX_TIMEOUT		(5 * HZ)</div><div class='add'>+#define BNXT_DEF_MSG_ENABLE	(NETIF_MSG_DRV | NETIF_MSG_HW | \</div><div class='add'>+				 NETIF_MSG_TX_ERR)</div><div class='ctx'> </div><div class='del'>-static const char version[] =</div><div class='del'>-	"Broadcom NetXtreme-C/E driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION "\n";</div><div class='del'>-</div><div class='add'>+MODULE_IMPORT_NS("NETDEV_INTERNAL");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_DESCRIPTION("Broadcom BCM573xx network driver");</div><div class='del'>-MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='add'>+MODULE_DESCRIPTION("Broadcom NetXtreme network driver");</div><div class='ctx'> </div><div class='ctx'> #define BNXT_RX_OFFSET (NET_SKB_PAD + NET_IP_ALIGN)</div><div class='ctx'> #define BNXT_RX_DMA_OFFSET NET_SKB_PAD</div><div class='del'>-#define BNXT_RX_COPY_THRESH 256</div><div class='ctx'> </div><div class='ctx'> #define BNXT_TX_PUSH_THRESH 164</div><div class='ctx'> </div><div class='del'>-enum board_idx {</div><div class='del'>-	BCM57301,</div><div class='del'>-	BCM57302,</div><div class='del'>-	BCM57304,</div><div class='del'>-	BCM57417_NPAR,</div><div class='del'>-	BCM58700,</div><div class='del'>-	BCM57311,</div><div class='del'>-	BCM57312,</div><div class='del'>-	BCM57402,</div><div class='del'>-	BCM57404,</div><div class='del'>-	BCM57406,</div><div class='del'>-	BCM57402_NPAR,</div><div class='del'>-	BCM57407,</div><div class='del'>-	BCM57412,</div><div class='del'>-	BCM57414,</div><div class='del'>-	BCM57416,</div><div class='del'>-	BCM57417,</div><div class='del'>-	BCM57412_NPAR,</div><div class='del'>-	BCM57314,</div><div class='del'>-	BCM57417_SFP,</div><div class='del'>-	BCM57416_SFP,</div><div class='del'>-	BCM57404_NPAR,</div><div class='del'>-	BCM57406_NPAR,</div><div class='del'>-	BCM57407_SFP,</div><div class='del'>-	BCM57407_NPAR,</div><div class='del'>-	BCM57414_NPAR,</div><div class='del'>-	BCM57416_NPAR,</div><div class='del'>-	BCM57452,</div><div class='del'>-	BCM57454,</div><div class='del'>-	BCM5745x_NPAR,</div><div class='del'>-	BCM57508,</div><div class='del'>-	BCM57504,</div><div class='del'>-	BCM57502,</div><div class='del'>-	BCM58802,</div><div class='del'>-	BCM58804,</div><div class='del'>-	BCM58808,</div><div class='del'>-	NETXTREME_E_VF,</div><div class='del'>-	NETXTREME_C_VF,</div><div class='del'>-	NETXTREME_S_VF,</div><div class='del'>-	NETXTREME_E_P5_VF,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* indexed by enum above */</div><div class='add'>+/* indexed by enum board_idx */</div><div class='ctx'> static const struct {</div><div class='ctx'> 	char *name;</div><div class='ctx'> } board_info[] = {</div><div class='hunk'>@@ -160,13 +124,25 @@ static const struct {</div><div class='ctx'> 	[BCM57508] = { "Broadcom BCM57508 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" },</div><div class='ctx'> 	[BCM57504] = { "Broadcom BCM57504 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" },</div><div class='ctx'> 	[BCM57502] = { "Broadcom BCM57502 NetXtreme-E 10Gb/25Gb/50Gb Ethernet" },</div><div class='add'>+	[BCM57608] = { "Broadcom BCM57608 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb/400Gb Ethernet" },</div><div class='add'>+	[BCM57604] = { "Broadcom BCM57604 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" },</div><div class='add'>+	[BCM57602] = { "Broadcom BCM57602 NetXtreme-E 10Gb/25Gb/50Gb/100Gb Ethernet" },</div><div class='add'>+	[BCM57601] = { "Broadcom BCM57601 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb/400Gb Ethernet" },</div><div class='add'>+	[BCM57508_NPAR] = { "Broadcom BCM57508 NetXtreme-E Ethernet Partition" },</div><div class='add'>+	[BCM57504_NPAR] = { "Broadcom BCM57504 NetXtreme-E Ethernet Partition" },</div><div class='add'>+	[BCM57502_NPAR] = { "Broadcom BCM57502 NetXtreme-E Ethernet Partition" },</div><div class='ctx'> 	[BCM58802] = { "Broadcom BCM58802 NetXtreme-S 10Gb/25Gb/40Gb/50Gb Ethernet" },</div><div class='ctx'> 	[BCM58804] = { "Broadcom BCM58804 NetXtreme-S 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet" },</div><div class='ctx'> 	[BCM58808] = { "Broadcom BCM58808 NetXtreme-S 10Gb/25Gb/40Gb/50Gb/100Gb Ethernet" },</div><div class='ctx'> 	[NETXTREME_E_VF] = { "Broadcom NetXtreme-E Ethernet Virtual Function" },</div><div class='ctx'> 	[NETXTREME_C_VF] = { "Broadcom NetXtreme-C Ethernet Virtual Function" },</div><div class='ctx'> 	[NETXTREME_S_VF] = { "Broadcom NetXtreme-S Ethernet Virtual Function" },</div><div class='add'>+	[NETXTREME_C_VF_HV] = { "Broadcom NetXtreme-C Virtual Function for Hyper-V" },</div><div class='add'>+	[NETXTREME_E_VF_HV] = { "Broadcom NetXtreme-E Virtual Function for Hyper-V" },</div><div class='ctx'> 	[NETXTREME_E_P5_VF] = { "Broadcom BCM5750X NetXtreme-E Ethernet Virtual Function" },</div><div class='add'>+	[NETXTREME_E_P5_VF_HV] = { "Broadcom BCM5750X NetXtreme-E Virtual Function for Hyper-V" },</div><div class='add'>+	[NETXTREME_E_P7_VF] = { "Broadcom BCM5760X Virtual Function" },</div><div class='add'>+	[NETXTREME_E_P7_VF_HV] = { "Broadcom BCM5760X Virtual Function for Hyper-V" },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id bnxt_pci_tbl[] = {</div><div class='hunk'>@@ -208,19 +184,41 @@ static const struct pci_device_id bnxt_pci_tbl[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1760), .driver_data = BCM57608 },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1761), .driver_data = BCM57604 },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1762), .driver_data = BCM57602 },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1763), .driver_data = BCM57601 },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57502_NPAR },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1801), .driver_data = BCM57504_NPAR },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57508_NPAR },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57502_NPAR },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1804), .driver_data = BCM57504_NPAR },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57508_NPAR },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0xd802), .driver_data = BCM58802 },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 },</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1606), .driver_data = NETXTREME_E_VF },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1607), .driver_data = NETXTREME_E_VF_HV },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1608), .driver_data = NETXTREME_E_VF_HV },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1609), .driver_data = NETXTREME_E_VF },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x16bd), .driver_data = NETXTREME_E_VF_HV },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16c1), .driver_data = NETXTREME_E_VF },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x16c2), .driver_data = NETXTREME_C_VF_HV },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x16c3), .driver_data = NETXTREME_C_VF_HV },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x16c4), .driver_data = NETXTREME_E_VF_HV },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x16c5), .driver_data = NETXTREME_E_VF_HV },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16cb), .driver_data = NETXTREME_C_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16d3), .driver_data = NETXTREME_E_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16dc), .driver_data = NETXTREME_E_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16e1), .driver_data = NETXTREME_C_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x16e5), .driver_data = NETXTREME_C_VF },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x16e6), .driver_data = NETXTREME_C_VF_HV },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1806), .driver_data = NETXTREME_E_P5_VF },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0x1807), .driver_data = NETXTREME_E_P5_VF },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1808), .driver_data = NETXTREME_E_P5_VF_HV },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1809), .driver_data = NETXTREME_E_P5_VF_HV },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x1819), .driver_data = NETXTREME_E_P7_VF },</div><div class='add'>+	{ PCI_VDEVICE(BROADCOM, 0x181b), .driver_data = NETXTREME_E_P7_VF_HV },</div><div class='ctx'> 	{ PCI_VDEVICE(BROADCOM, 0xd800), .driver_data = NETXTREME_S_VF },</div><div class='ctx'> #endif</div><div class='ctx'> 	{ 0 }</div><div class='hunk'>@@ -237,42 +235,120 @@ static const u16 bnxt_vf_req_snif[] = {</div><div class='ctx'> </div><div class='ctx'> static const u16 bnxt_async_events_arr[] = {</div><div class='ctx'> 	ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CHANGE,</div><div class='ctx'> 	ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD,</div><div class='ctx'> 	ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED,</div><div class='ctx'> 	ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE,</div><div class='ctx'> 	ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_PORT_PHY_CFG_CHANGE,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_DEFERRED_RESPONSE,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE,</div><div class='add'>+	ASYNC_EVENT_CMPL_EVENT_ID_DBG_BUF_PRODUCER,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const u16 bnxt_bstore_to_trace[] = {</div><div class='add'>+	[BNXT_CTX_SRT]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_SRT_TRACE,</div><div class='add'>+	[BNXT_CTX_SRT2]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_SRT2_TRACE,</div><div class='add'>+	[BNXT_CTX_CRT]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CRT_TRACE,</div><div class='add'>+	[BNXT_CTX_CRT2]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CRT2_TRACE,</div><div class='add'>+	[BNXT_CTX_RIGP0]	= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_RIGP0_TRACE,</div><div class='add'>+	[BNXT_CTX_L2HWRM]	= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_L2_HWRM_TRACE,</div><div class='add'>+	[BNXT_CTX_REHWRM]	= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ROCE_HWRM_TRACE,</div><div class='add'>+	[BNXT_CTX_CA0]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA0_TRACE,</div><div class='add'>+	[BNXT_CTX_CA1]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA1_TRACE,</div><div class='add'>+	[BNXT_CTX_CA2]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_CA2_TRACE,</div><div class='add'>+	[BNXT_CTX_RIGP1]	= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_RIGP1_TRACE,</div><div class='add'>+	[BNXT_CTX_KONG]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_AFM_KONG_HWRM_TRACE,</div><div class='add'>+	[BNXT_CTX_QPC]		= DBG_LOG_BUFFER_FLUSH_REQ_TYPE_ERR_QPC_TRACE,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static struct workqueue_struct *bnxt_pf_wq;</div><div class='ctx'> </div><div class='add'>+#define BNXT_IPV6_MASK_ALL {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \</div><div class='add'>+			       0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}}</div><div class='add'>+#define BNXT_IPV6_MASK_NONE {{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}}</div><div class='add'>+</div><div class='add'>+const struct bnxt_flow_masks BNXT_FLOW_MASK_NONE = {</div><div class='add'>+	.ports = {</div><div class='add'>+		.src = 0,</div><div class='add'>+		.dst = 0,</div><div class='add'>+	},</div><div class='add'>+	.addrs = {</div><div class='add'>+		.v6addrs = {</div><div class='add'>+			.src = BNXT_IPV6_MASK_NONE,</div><div class='add'>+			.dst = BNXT_IPV6_MASK_NONE,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bnxt_flow_masks BNXT_FLOW_IPV6_MASK_ALL = {</div><div class='add'>+	.ports = {</div><div class='add'>+		.src = cpu_to_be16(0xffff),</div><div class='add'>+		.dst = cpu_to_be16(0xffff),</div><div class='add'>+	},</div><div class='add'>+	.addrs = {</div><div class='add'>+		.v6addrs = {</div><div class='add'>+			.src = BNXT_IPV6_MASK_ALL,</div><div class='add'>+			.dst = BNXT_IPV6_MASK_ALL,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+const struct bnxt_flow_masks BNXT_FLOW_IPV4_MASK_ALL = {</div><div class='add'>+	.ports = {</div><div class='add'>+		.src = cpu_to_be16(0xffff),</div><div class='add'>+		.dst = cpu_to_be16(0xffff),</div><div class='add'>+	},</div><div class='add'>+	.addrs = {</div><div class='add'>+		.v4addrs = {</div><div class='add'>+			.src = cpu_to_be32(0xffffffff),</div><div class='add'>+			.dst = cpu_to_be32(0xffffffff),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static bool bnxt_vf_pciid(enum board_idx idx)</div><div class='ctx'> {</div><div class='ctx'> 	return (idx == NETXTREME_C_VF || idx == NETXTREME_E_VF ||</div><div class='del'>-		idx == NETXTREME_S_VF || idx == NETXTREME_E_P5_VF);</div><div class='add'>+		idx == NETXTREME_S_VF || idx == NETXTREME_C_VF_HV ||</div><div class='add'>+		idx == NETXTREME_E_VF_HV || idx == NETXTREME_E_P5_VF ||</div><div class='add'>+		idx == NETXTREME_E_P5_VF_HV || idx == NETXTREME_E_P7_VF ||</div><div class='add'>+		idx == NETXTREME_E_P7_VF_HV);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define DB_CP_REARM_FLAGS	(DB_KEY_CP | DB_IDX_VALID)</div><div class='ctx'> #define DB_CP_FLAGS		(DB_KEY_CP | DB_IDX_VALID | DB_IRQ_DIS)</div><div class='del'>-#define DB_CP_IRQ_DIS_FLAGS	(DB_KEY_CP | DB_IRQ_DIS)</div><div class='del'>-</div><div class='del'>-#define BNXT_CP_DB_IRQ_DIS(db)						\</div><div class='del'>-		writel(DB_CP_IRQ_DIS_FLAGS, db)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_DB_CQ(db, idx)						\</div><div class='del'>-	writel(DB_CP_FLAGS | RING_CMP(idx), (db)-&gt;doorbell)</div><div class='add'>+	writel(DB_CP_FLAGS | DB_RING_IDX(db, idx), (db)-&gt;doorbell)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_DB_NQ_P5(db, idx)						\</div><div class='del'>-	writeq((db)-&gt;db_key64 | DBR_TYPE_NQ | RING_CMP(idx), (db)-&gt;doorbell)</div><div class='add'>+	bnxt_writeq(bp, (db)-&gt;db_key64 | DBR_TYPE_NQ | DB_RING_IDX(db, idx),\</div><div class='add'>+		    (db)-&gt;doorbell)</div><div class='add'>+</div><div class='add'>+#define BNXT_DB_NQ_P7(db, idx)						\</div><div class='add'>+	bnxt_writeq(bp, (db)-&gt;db_key64 | DBR_TYPE_NQ_MASK |		\</div><div class='add'>+		    DB_RING_IDX(db, idx), (db)-&gt;doorbell)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_DB_CQ_ARM(db, idx)						\</div><div class='del'>-	writel(DB_CP_REARM_FLAGS | RING_CMP(idx), (db)-&gt;doorbell)</div><div class='add'>+	writel(DB_CP_REARM_FLAGS | DB_RING_IDX(db, idx), (db)-&gt;doorbell)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_DB_NQ_ARM_P5(db, idx)					\</div><div class='del'>-	writeq((db)-&gt;db_key64 | DBR_TYPE_NQ_ARM | RING_CMP(idx), (db)-&gt;doorbell)</div><div class='add'>+	bnxt_writeq(bp, (db)-&gt;db_key64 | DBR_TYPE_NQ_ARM |		\</div><div class='add'>+		    DB_RING_IDX(db, idx), (db)-&gt;doorbell)</div><div class='ctx'> </div><div class='ctx'> static void bnxt_db_nq(struct bnxt *bp, struct bnxt_db_info *db, u32 idx)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P7)</div><div class='add'>+		BNXT_DB_NQ_P7(db, idx);</div><div class='add'>+	else if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		BNXT_DB_NQ_P5(db, idx);</div><div class='ctx'> 	else</div><div class='ctx'> 		BNXT_DB_CQ(db, idx);</div><div class='hunk'>@@ -280,7 +356,7 @@ static void bnxt_db_nq(struct bnxt *bp, struct bnxt_db_info *db, u32 idx)</div><div class='ctx'> </div><div class='ctx'> static void bnxt_db_nq_arm(struct bnxt *bp, struct bnxt_db_info *db, u32 idx)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		BNXT_DB_NQ_ARM_P5(db, idx);</div><div class='ctx'> 	else</div><div class='ctx'> 		BNXT_DB_CQ_ARM(db, idx);</div><div class='hunk'>@@ -288,13 +364,67 @@ static void bnxt_db_nq_arm(struct bnxt *bp, struct bnxt_db_info *db, u32 idx)</div><div class='ctx'> </div><div class='ctx'> static void bnxt_db_cq(struct bnxt *bp, struct bnxt_db_info *db, u32 idx)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-		writeq(db-&gt;db_key64 | DBR_TYPE_CQ_ARMALL | RING_CMP(idx),</div><div class='del'>-		       db-&gt;doorbell);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		bnxt_writeq(bp, db-&gt;db_key64 | DBR_TYPE_CQ_ARMALL |</div><div class='add'>+			    DB_RING_IDX(db, idx), db-&gt;doorbell);</div><div class='ctx'> 	else</div><div class='ctx'> 		BNXT_DB_CQ(db, idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_queue_fw_reset_work(struct bnxt *bp, unsigned long delay)</div><div class='add'>+{</div><div class='add'>+	if (!(test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (BNXT_PF(bp))</div><div class='add'>+		queue_delayed_work(bnxt_pf_wq, &amp;bp-&gt;fw_reset_task, delay);</div><div class='add'>+	else</div><div class='add'>+		schedule_delayed_work(&amp;bp-&gt;fw_reset_task, delay);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bnxt_queue_sp_work(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (BNXT_PF(bp))</div><div class='add'>+		queue_work(bnxt_pf_wq, &amp;bp-&gt;sp_task);</div><div class='add'>+	else</div><div class='add'>+		schedule_work(&amp;bp-&gt;sp_task);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_queue_sp_work(struct bnxt *bp, unsigned int event)</div><div class='add'>+{</div><div class='add'>+	set_bit(event, &amp;bp-&gt;sp_event);</div><div class='add'>+	__bnxt_queue_sp_work(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_sched_reset_rxr(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	if (!rxr-&gt;bnapi-&gt;in_reset) {</div><div class='add'>+		rxr-&gt;bnapi-&gt;in_reset = true;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			set_bit(BNXT_RESET_TASK_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='add'>+		else</div><div class='add'>+			set_bit(BNXT_RST_RING_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='add'>+		__bnxt_queue_sp_work(bp);</div><div class='add'>+	}</div><div class='add'>+	rxr-&gt;rx_next_cons = 0xffff;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_sched_reset_txr(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='add'>+			  u16 curr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_napi *bnapi = txr-&gt;bnapi;</div><div class='add'>+</div><div class='add'>+	if (bnapi-&gt;tx_fault)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_err(bp-&gt;dev, "Invalid Tx completion (ring:%d tx_hw_cons:%u cons:%u prod:%u curr:%u)",</div><div class='add'>+		   txr-&gt;txq_index, txr-&gt;tx_hw_cons,</div><div class='add'>+		   txr-&gt;tx_cons, txr-&gt;tx_prod, curr);</div><div class='add'>+	WARN_ON_ONCE(1);</div><div class='add'>+	bnapi-&gt;tx_fault = 1;</div><div class='add'>+	bnxt_queue_sp_work(bp, BNXT_RESET_TASK_SP_EVENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const u16 bnxt_lhint_arr[] = {</div><div class='ctx'> 	TX_BD_FLAGS_LHINT_512_AND_SMALLER,</div><div class='ctx'> 	TX_BD_FLAGS_LHINT_512_TO_1023,</div><div class='hunk'>@@ -327,24 +457,37 @@ static u16 bnxt_xmit_get_cfa_action(struct sk_buff *skb)</div><div class='ctx'> 	return md_dst-&gt;u.port_info.port_id;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_txr_db_kick(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='add'>+			     u16 prod)</div><div class='add'>+{</div><div class='add'>+	/* Sync BD data before updating doorbell */</div><div class='add'>+	wmb();</div><div class='add'>+	bnxt_db_write(bp, &amp;txr-&gt;tx_db, prod);</div><div class='add'>+	txr-&gt;kick_pending = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct tx_bd *txbd;</div><div class='add'>+	struct tx_bd *txbd, *txbd0;</div><div class='ctx'> 	struct tx_bd_ext *txbd1;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	unsigned int length, pad = 0;</div><div class='ctx'> 	u32 len, free_size, vlan_tag_flags, cfa_action, flags;</div><div class='del'>-	u16 prod, last_frag;</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='ctx'> 	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	u16 prod, last_frag, txts_prod;</div><div class='ctx'> 	struct bnxt_tx_ring_info *txr;</div><div class='ctx'> 	struct bnxt_sw_tx_bd *tx_buf;</div><div class='add'>+	__le32 lflags = 0;</div><div class='add'>+	skb_frag_t *frag;</div><div class='ctx'> </div><div class='ctx'> 	i = skb_get_queue_mapping(skb);</div><div class='ctx'> 	if (unlikely(i &gt;= bp-&gt;tx_nr_rings)) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='add'>+		dev_core_stats_tx_dropped_inc(dev);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -352,21 +495,38 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	txr = &amp;bp-&gt;tx_ring[bp-&gt;tx_ring_map[i]];</div><div class='ctx'> 	prod = txr-&gt;tx_prod;</div><div class='ctx'> </div><div class='add'>+#if (MAX_SKB_FRAGS &gt; TX_MAX_FRAGS)</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags &gt; TX_MAX_FRAGS) {</div><div class='add'>+		netdev_warn_once(dev, "SKB has too many (%d) fragments, max supported is %d.  SKB will be linearized.\n",</div><div class='add'>+				 skb_shinfo(skb)-&gt;nr_frags, TX_MAX_FRAGS);</div><div class='add'>+		if (skb_linearize(skb)) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			dev_core_stats_tx_dropped_inc(dev);</div><div class='add'>+			return NETDEV_TX_OK;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	free_size = bnxt_tx_avail(bp, txr);</div><div class='ctx'> 	if (unlikely(free_size &lt; skb_shinfo(skb)-&gt;nr_frags + 2)) {</div><div class='del'>-		netif_tx_stop_queue(txq);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='add'>+		/* We must have raced with NAPI cleanup */</div><div class='add'>+		if (net_ratelimit() &amp;&amp; txr-&gt;kick_pending)</div><div class='add'>+			netif_warn(bp, tx_err, dev,</div><div class='add'>+				   "bnxt: ring busy w/ flush pending!\n");</div><div class='add'>+		if (!netif_txq_try_stop(txq, bnxt_tx_avail(bp, txr),</div><div class='add'>+					bp-&gt;tx_wake_thresh))</div><div class='add'>+			return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely(ipv6_hopopt_jumbo_remove(skb)))</div><div class='add'>+		goto tx_free;</div><div class='add'>+</div><div class='ctx'> 	length = skb-&gt;len;</div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> 	last_frag = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='del'>-	txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];</div><div class='add'>+	txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];</div><div class='ctx'> </div><div class='del'>-	txbd-&gt;tx_bd_opaque = prod;</div><div class='del'>-</div><div class='del'>-	tx_buf = &amp;txr-&gt;tx_buf_ring[prod];</div><div class='add'>+	tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, prod)];</div><div class='ctx'> 	tx_buf-&gt;skb = skb;</div><div class='ctx'> 	tx_buf-&gt;nr_frags = last_frag;</div><div class='ctx'> </div><div class='hunk'>@@ -382,7 +542,34 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			vlan_tag_flags |= 1 &lt;&lt; TX_BD_CFA_META_TPID_SHIFT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (free_size == bp-&gt;tx_ring_size &amp;&amp; length &lt;= bp-&gt;tx_push_thresh) {</div><div class='add'>+	if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) &amp;&amp; ptp &amp;&amp;</div><div class='add'>+	    ptp-&gt;tx_tstamp_en) {</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_TX_TS_CMP) {</div><div class='add'>+			lflags |= cpu_to_le32(TX_BD_FLAGS_STAMP);</div><div class='add'>+			tx_buf-&gt;is_ts_pkt = 1;</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+		} else if (!skb_is_gso(skb)) {</div><div class='add'>+			u16 seq_id, hdr_off;</div><div class='add'>+</div><div class='add'>+			if (!bnxt_ptp_parse(skb, &amp;seq_id, &amp;hdr_off) &amp;&amp;</div><div class='add'>+			    !bnxt_ptp_get_txts_prod(ptp, &amp;txts_prod)) {</div><div class='add'>+				if (vlan_tag_flags)</div><div class='add'>+					hdr_off += VLAN_HLEN;</div><div class='add'>+				lflags |= cpu_to_le32(TX_BD_FLAGS_STAMP);</div><div class='add'>+				tx_buf-&gt;is_ts_pkt = 1;</div><div class='add'>+				skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+</div><div class='add'>+				ptp-&gt;txts_req[txts_prod].tx_seqid = seq_id;</div><div class='add'>+				ptp-&gt;txts_req[txts_prod].tx_hdr_off = hdr_off;</div><div class='add'>+				tx_buf-&gt;txts_prod = txts_prod;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (unlikely(skb-&gt;no_fcs))</div><div class='add'>+		lflags |= cpu_to_le32(TX_BD_FLAGS_NO_CRC);</div><div class='add'>+</div><div class='add'>+	if (free_size == bp-&gt;tx_ring_size &amp;&amp; length &lt;= bp-&gt;tx_push_thresh &amp;&amp;</div><div class='add'>+	    skb_frags_readable(skb) &amp;&amp; !lflags) {</div><div class='ctx'> 		struct tx_push_buffer *tx_push_buf = txr-&gt;tx_push;</div><div class='ctx'> 		struct tx_push_bd *tx_push = &amp;tx_push_buf-&gt;push_bd;</div><div class='ctx'> 		struct tx_bd_ext *tx_push1 = &amp;tx_push-&gt;txbd2;</div><div class='hunk'>@@ -398,7 +585,7 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 					TX_BD_FLAGS_LHINT_512_AND_SMALLER |</div><div class='ctx'> 					TX_BD_FLAGS_COAL_NOW |</div><div class='ctx'> 					TX_BD_FLAGS_PACKET_END |</div><div class='del'>-					(2 &lt;&lt; TX_BD_FLAGS_BD_CNT_SHIFT));</div><div class='add'>+					TX_BD_CNT(2));</div><div class='ctx'> </div><div class='ctx'> 		if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 			tx_push1-&gt;tx_bd_hsize_lflags =</div><div class='hunk'>@@ -417,9 +604,9 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		skb_copy_from_linear_data(skb, pdata, len);</div><div class='ctx'> 		pdata += len;</div><div class='ctx'> 		for (j = 0; j &lt; last_frag; j++) {</div><div class='del'>-			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[j];</div><div class='ctx'> 			void *fptr;</div><div class='ctx'> </div><div class='add'>+			frag = &amp;skb_shinfo(skb)-&gt;frags[j];</div><div class='ctx'> 			fptr = skb_frag_address_safe(frag);</div><div class='ctx'> 			if (!fptr)</div><div class='ctx'> 				goto normal_tx;</div><div class='hunk'>@@ -430,13 +617,16 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		txbd-&gt;tx_bd_len_flags_type = tx_push-&gt;tx_bd_len_flags_type;</div><div class='ctx'> 		txbd-&gt;tx_bd_haddr = txr-&gt;data_mapping;</div><div class='add'>+		txbd-&gt;tx_bd_opaque = SET_TX_OPAQUE(bp, txr, prod, 2);</div><div class='ctx'> 		prod = NEXT_TX(prod);</div><div class='del'>-		txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];</div><div class='add'>+		tx_push-&gt;tx_bd_opaque = txbd-&gt;tx_bd_opaque;</div><div class='add'>+		txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];</div><div class='ctx'> 		memcpy(txbd, tx_push1, sizeof(*txbd));</div><div class='ctx'> 		prod = NEXT_TX(prod);</div><div class='ctx'> 		tx_push-&gt;doorbell =</div><div class='del'>-			cpu_to_le32(DB_KEY_TX_PUSH | DB_LONG_TX_PUSH | prod);</div><div class='del'>-		txr-&gt;tx_prod = prod;</div><div class='add'>+			cpu_to_le32(DB_KEY_TX_PUSH | DB_LONG_TX_PUSH |</div><div class='add'>+				    DB_RING_IDX(&amp;txr-&gt;tx_db, prod));</div><div class='add'>+		WRITE_ONCE(txr-&gt;tx_prod, prod);</div><div class='ctx'> </div><div class='ctx'> 		tx_buf-&gt;is_push = 1;</div><div class='ctx'> 		netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='hunk'>@@ -457,52 +647,54 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> normal_tx:</div><div class='ctx'> 	if (length &lt; BNXT_MIN_PKT_SIZE) {</div><div class='ctx'> 		pad = BNXT_MIN_PKT_SIZE - length;</div><div class='del'>-		if (skb_pad(skb, pad)) {</div><div class='add'>+		if (skb_pad(skb, pad))</div><div class='ctx'> 			/* SKB already freed. */</div><div class='del'>-			tx_buf-&gt;skb = NULL;</div><div class='del'>-			return NETDEV_TX_OK;</div><div class='del'>-		}</div><div class='add'>+			goto tx_kick_pending;</div><div class='ctx'> 		length = BNXT_MIN_PKT_SIZE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mapping = dma_map_single(&amp;pdev-&gt;dev, skb-&gt;data, len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dma_mapping_error(&amp;pdev-&gt;dev, mapping))) {</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		tx_buf-&gt;skb = NULL;</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;pdev-&gt;dev, mapping)))</div><div class='add'>+		goto tx_free;</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_addr_set(tx_buf, mapping, mapping);</div><div class='ctx'> 	flags = (len &lt;&lt; TX_BD_LEN_SHIFT) | TX_BD_TYPE_LONG_TX_BD |</div><div class='del'>-		((last_frag + 2) &lt;&lt; TX_BD_FLAGS_BD_CNT_SHIFT);</div><div class='add'>+		TX_BD_CNT(last_frag + 2);</div><div class='ctx'> </div><div class='ctx'> 	txbd-&gt;tx_bd_haddr = cpu_to_le64(mapping);</div><div class='add'>+	txbd-&gt;tx_bd_opaque = SET_TX_OPAQUE(bp, txr, prod, 2 + last_frag);</div><div class='ctx'> </div><div class='ctx'> 	prod = NEXT_TX(prod);</div><div class='ctx'> 	txbd1 = (struct tx_bd_ext *)</div><div class='del'>-		&amp;txr-&gt;tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];</div><div class='add'>+		&amp;txr-&gt;tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];</div><div class='ctx'> </div><div class='del'>-	txbd1-&gt;tx_bd_hsize_lflags = 0;</div><div class='add'>+	txbd1-&gt;tx_bd_hsize_lflags = lflags;</div><div class='ctx'> 	if (skb_is_gso(skb)) {</div><div class='add'>+		bool udp_gso = !!(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4);</div><div class='ctx'> 		u32 hdr_len;</div><div class='ctx'> </div><div class='del'>-		if (skb-&gt;encapsulation)</div><div class='del'>-			hdr_len = skb_inner_network_offset(skb) +</div><div class='del'>-				skb_inner_network_header_len(skb) +</div><div class='del'>-				inner_tcp_hdrlen(skb);</div><div class='del'>-		else</div><div class='add'>+		if (skb-&gt;encapsulation) {</div><div class='add'>+			if (udp_gso)</div><div class='add'>+				hdr_len = skb_inner_transport_offset(skb) +</div><div class='add'>+					  sizeof(struct udphdr);</div><div class='add'>+			else</div><div class='add'>+				hdr_len = skb_inner_tcp_all_headers(skb);</div><div class='add'>+		} else if (udp_gso) {</div><div class='ctx'> 			hdr_len = skb_transport_offset(skb) +</div><div class='del'>-				tcp_hdrlen(skb);</div><div class='add'>+				  sizeof(struct udphdr);</div><div class='add'>+		} else {</div><div class='add'>+			hdr_len = skb_tcp_all_headers(skb);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		txbd1-&gt;tx_bd_hsize_lflags = cpu_to_le32(TX_BD_FLAGS_LSO |</div><div class='add'>+		txbd1-&gt;tx_bd_hsize_lflags |= cpu_to_le32(TX_BD_FLAGS_LSO |</div><div class='ctx'> 					TX_BD_FLAGS_T_IPID |</div><div class='ctx'> 					(hdr_len &lt;&lt; (TX_BD_HSIZE_SHIFT - 1)));</div><div class='ctx'> 		length = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 		txbd1-&gt;tx_bd_mss = cpu_to_le32(length);</div><div class='ctx'> 		length += hdr_len;</div><div class='ctx'> 	} else if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='del'>-		txbd1-&gt;tx_bd_hsize_lflags =</div><div class='add'>+		txbd1-&gt;tx_bd_hsize_lflags |=</div><div class='ctx'> 			cpu_to_le32(TX_BD_FLAGS_TCP_UDP_CHKSUM);</div><div class='ctx'> 		txbd1-&gt;tx_bd_mss = 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -520,11 +712,11 @@ normal_tx:</div><div class='ctx'> 	txbd1-&gt;tx_bd_cfa_meta = cpu_to_le32(vlan_tag_flags);</div><div class='ctx'> 	txbd1-&gt;tx_bd_cfa_action =</div><div class='ctx'> 			cpu_to_le32(cfa_action &lt;&lt; TX_BD_CFA_ACTION_SHIFT);</div><div class='add'>+	txbd0 = txbd;</div><div class='ctx'> 	for (i = 0; i &lt; last_frag; i++) {</div><div class='del'>-		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='del'>-</div><div class='add'>+		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 		prod = NEXT_TX(prod);</div><div class='del'>-		txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];</div><div class='add'>+		txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];</div><div class='ctx'> </div><div class='ctx'> 		len = skb_frag_size(frag);</div><div class='ctx'> 		mapping = skb_frag_dma_map(&amp;pdev-&gt;dev, frag, 0, len,</div><div class='hunk'>@@ -533,8 +725,9 @@ normal_tx:</div><div class='ctx'> 		if (unlikely(dma_mapping_error(&amp;pdev-&gt;dev, mapping)))</div><div class='ctx'> 			goto tx_dma_error;</div><div class='ctx'> </div><div class='del'>-		tx_buf = &amp;txr-&gt;tx_buf_ring[prod];</div><div class='del'>-		dma_unmap_addr_set(tx_buf, mapping, mapping);</div><div class='add'>+		tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, prod)];</div><div class='add'>+		netmem_dma_unmap_addr_set(skb_frag_netmem(frag), tx_buf,</div><div class='add'>+					  mapping, mapping);</div><div class='ctx'> </div><div class='ctx'> 		txbd-&gt;tx_bd_haddr = cpu_to_le64(mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -549,31 +742,31 @@ normal_tx:</div><div class='ctx'> </div><div class='ctx'> 	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='ctx'> </div><div class='del'>-	/* Sync BD data before updating doorbell */</div><div class='del'>-	wmb();</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='ctx'> </div><div class='ctx'> 	prod = NEXT_TX(prod);</div><div class='del'>-	txr-&gt;tx_prod = prod;</div><div class='add'>+	WRITE_ONCE(txr-&gt;tx_prod, prod);</div><div class='ctx'> </div><div class='del'>-	if (!netdev_xmit_more() || netif_xmit_stopped(txq))</div><div class='del'>-		bnxt_db_write(bp, &amp;txr-&gt;tx_db, prod);</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(txq)) {</div><div class='add'>+		bnxt_txr_db_kick(bp, txr, prod);</div><div class='add'>+	} else {</div><div class='add'>+		if (free_size &gt;= bp-&gt;tx_wake_thresh)</div><div class='add'>+			txbd0-&gt;tx_bd_len_flags_type |=</div><div class='add'>+				cpu_to_le32(TX_BD_FLAGS_NO_CMPL);</div><div class='add'>+		txr-&gt;kick_pending = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> tx_done:</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bnxt_tx_avail(bp, txr) &lt;= MAX_SKB_FRAGS + 1)) {</div><div class='del'>-		if (netdev_xmit_more() &amp;&amp; !tx_buf-&gt;is_push)</div><div class='del'>-			bnxt_db_write(bp, &amp;txr-&gt;tx_db, prod);</div><div class='del'>-</div><div class='del'>-		netif_tx_stop_queue(txq);</div><div class='add'>+		if (netdev_xmit_more() &amp;&amp; !tx_buf-&gt;is_push) {</div><div class='add'>+			txbd0-&gt;tx_bd_len_flags_type &amp;=</div><div class='add'>+				cpu_to_le32(~TX_BD_FLAGS_NO_CMPL);</div><div class='add'>+			bnxt_txr_db_kick(bp, txr, prod);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		/* netif_tx_stop_queue() must be done before checking</div><div class='del'>-		 * tx index in bnxt_tx_avail() below, because in</div><div class='del'>-		 * bnxt_tx_int(), we update tx index before checking for</div><div class='del'>-		 * netif_tx_queue_stopped().</div><div class='del'>-		 */</div><div class='del'>-		smp_mb();</div><div class='del'>-		if (bnxt_tx_avail(bp, txr) &gt; bp-&gt;tx_wake_thresh)</div><div class='del'>-			netif_tx_wake_queue(txq);</div><div class='add'>+		netif_txq_try_stop(txq, bnxt_tx_avail(bp, txr),</div><div class='add'>+				   bp-&gt;tx_wake_thresh);</div><div class='ctx'> 	}</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='hunk'>@@ -582,43 +775,77 @@ tx_dma_error:</div><div class='ctx'> </div><div class='ctx'> 	/* start back at beginning and unmap skb */</div><div class='ctx'> 	prod = txr-&gt;tx_prod;</div><div class='del'>-	tx_buf = &amp;txr-&gt;tx_buf_ring[prod];</div><div class='del'>-	tx_buf-&gt;skb = NULL;</div><div class='add'>+	tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, prod)];</div><div class='ctx'> 	dma_unmap_single(&amp;pdev-&gt;dev, dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-			 skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+			 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> 	prod = NEXT_TX(prod);</div><div class='ctx'> </div><div class='ctx'> 	/* unmap remaining mapped pages */</div><div class='ctx'> 	for (i = 0; i &lt; last_frag; i++) {</div><div class='ctx'> 		prod = NEXT_TX(prod);</div><div class='del'>-		tx_buf = &amp;txr-&gt;tx_buf_ring[prod];</div><div class='del'>-		dma_unmap_page(&amp;pdev-&gt;dev, dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-			       skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]),</div><div class='del'>-			       PCI_DMA_TODEVICE);</div><div class='add'>+		tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, prod)];</div><div class='add'>+		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		netmem_dma_unmap_page_attrs(&amp;pdev-&gt;dev,</div><div class='add'>+					    dma_unmap_addr(tx_buf, mapping),</div><div class='add'>+					    skb_frag_size(frag),</div><div class='add'>+					    DMA_TO_DEVICE, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+tx_free:</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='add'>+tx_kick_pending:</div><div class='add'>+	if (BNXT_TX_PTP_IS_SET(lflags)) {</div><div class='add'>+		txr-&gt;tx_buf_ring[RING_TX(bp, txr-&gt;tx_prod)].is_ts_pkt = 0;</div><div class='add'>+		atomic64_inc(&amp;bp-&gt;ptp_cfg-&gt;stats.ts_err);</div><div class='add'>+		if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_TX_TS_CMP))</div><div class='add'>+			/* set SKB to err so PTP worker will clean up */</div><div class='add'>+			ptp-&gt;txts_req[txts_prod].tx_skb = ERR_PTR(-EIO);</div><div class='add'>+	}</div><div class='add'>+	if (txr-&gt;kick_pending)</div><div class='add'>+		bnxt_txr_db_kick(bp, txr, txr-&gt;tx_prod);</div><div class='add'>+	txr-&gt;tx_buf_ring[RING_TX(bp, txr-&gt;tx_prod)].skb = NULL;</div><div class='add'>+	dev_core_stats_tx_dropped_inc(dev);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts)</div><div class='add'>+/* Returns true if some remaining TX packets not processed. */</div><div class='add'>+static bool __bnxt_tx_int(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='add'>+			  int budget)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_tx_ring_info *txr = bnapi-&gt;tx_ring;</div><div class='ctx'> 	struct netdev_queue *txq = netdev_get_tx_queue(bp-&gt;dev, txr-&gt;txq_index);</div><div class='del'>-	u16 cons = txr-&gt;tx_cons;</div><div class='ctx'> 	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-	int i;</div><div class='add'>+	u16 hw_cons = txr-&gt;tx_hw_cons;</div><div class='ctx'> 	unsigned int tx_bytes = 0;</div><div class='add'>+	u16 cons = txr-&gt;tx_cons;</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+	int tx_pkts = 0;</div><div class='add'>+	bool rc = false;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_pkts; i++) {</div><div class='add'>+	while (RING_TX(bp, cons) != hw_cons) {</div><div class='ctx'> 		struct bnxt_sw_tx_bd *tx_buf;</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='add'>+		bool is_ts_pkt;</div><div class='ctx'> 		int j, last;</div><div class='ctx'> </div><div class='del'>-		tx_buf = &amp;txr-&gt;tx_buf_ring[cons];</div><div class='del'>-		cons = NEXT_TX(cons);</div><div class='add'>+		tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, cons)];</div><div class='ctx'> 		skb = tx_buf-&gt;skb;</div><div class='add'>+</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			bnxt_sched_reset_txr(bp, txr, cons);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		is_ts_pkt = tx_buf-&gt;is_ts_pkt;</div><div class='add'>+		if (is_ts_pkt &amp;&amp; (bp-&gt;fw_cap &amp; BNXT_FW_CAP_TX_TS_CMP)) {</div><div class='add'>+			rc = true;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cons = NEXT_TX(cons);</div><div class='add'>+		tx_pkts++;</div><div class='add'>+		tx_bytes += skb-&gt;len;</div><div class='ctx'> 		tx_buf-&gt;skb = NULL;</div><div class='add'>+		tx_buf-&gt;is_ts_pkt = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (tx_buf-&gt;is_push) {</div><div class='ctx'> 			tx_buf-&gt;is_push = 0;</div><div class='hunk'>@@ -626,105 +853,138 @@ static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dma_unmap_single(&amp;pdev-&gt;dev, dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-				 skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+				 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> 		last = tx_buf-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; last; j++) {</div><div class='add'>+			frag = &amp;skb_shinfo(skb)-&gt;frags[j];</div><div class='ctx'> 			cons = NEXT_TX(cons);</div><div class='del'>-			tx_buf = &amp;txr-&gt;tx_buf_ring[cons];</div><div class='del'>-			dma_unmap_page(</div><div class='del'>-				&amp;pdev-&gt;dev,</div><div class='del'>-				dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-				skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[j]),</div><div class='del'>-				PCI_DMA_TODEVICE);</div><div class='add'>+			tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, cons)];</div><div class='add'>+			netmem_dma_unmap_page_attrs(&amp;pdev-&gt;dev,</div><div class='add'>+						    dma_unmap_addr(tx_buf,</div><div class='add'>+								   mapping),</div><div class='add'>+						    skb_frag_size(frag),</div><div class='add'>+						    DMA_TO_DEVICE, 0);</div><div class='add'>+		}</div><div class='add'>+		if (unlikely(is_ts_pkt)) {</div><div class='add'>+			if (BNXT_CHIP_P5(bp)) {</div><div class='add'>+				/* PTP worker takes ownership of the skb */</div><div class='add'>+				bnxt_get_tx_ts_p5(bp, skb, tx_buf-&gt;txts_prod);</div><div class='add'>+				skb = NULL;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> next_tx_int:</div><div class='ctx'> 		cons = NEXT_TX(cons);</div><div class='ctx'> </div><div class='del'>-		tx_bytes += skb-&gt;len;</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='add'>+		napi_consume_skb(skb, budget);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev_tx_completed_queue(txq, nr_pkts, tx_bytes);</div><div class='del'>-	txr-&gt;tx_cons = cons;</div><div class='add'>+	WRITE_ONCE(txr-&gt;tx_cons, cons);</div><div class='ctx'> </div><div class='del'>-	/* Need to make the tx_cons update visible to bnxt_start_xmit()</div><div class='del'>-	 * before checking for netif_tx_queue_stopped().  Without the</div><div class='del'>-	 * memory barrier, there is a small possibility that bnxt_start_xmit()</div><div class='del'>-	 * will miss it and cause the queue to be stopped forever.</div><div class='del'>-	 */</div><div class='del'>-	smp_mb();</div><div class='add'>+	__netif_txq_completed_wake(txq, tx_pkts, tx_bytes,</div><div class='add'>+				   bnxt_tx_avail(bp, txr), bp-&gt;tx_wake_thresh,</div><div class='add'>+				   READ_ONCE(txr-&gt;dev_state) == BNXT_DEV_STATE_CLOSING);</div><div class='ctx'> </div><div class='del'>-	if (unlikely(netif_tx_queue_stopped(txq)) &amp;&amp;</div><div class='del'>-	    (bnxt_tx_avail(bp, txr) &gt; bp-&gt;tx_wake_thresh)) {</div><div class='del'>-		__netif_tx_lock(txq, smp_processor_id());</div><div class='del'>-		if (netif_tx_queue_stopped(txq) &amp;&amp;</div><div class='del'>-		    bnxt_tx_avail(bp, txr) &gt; bp-&gt;tx_wake_thresh &amp;&amp;</div><div class='del'>-		    txr-&gt;dev_state != BNXT_DEV_STATE_CLOSING)</div><div class='del'>-			netif_tx_wake_queue(txq);</div><div class='del'>-		__netif_tx_unlock(txq);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_tx_int(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	bool more = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bnxt_for_each_napi_tx(i, bnapi, txr) {</div><div class='add'>+		if (txr-&gt;tx_hw_cons != RING_TX(bp, txr-&gt;tx_cons))</div><div class='add'>+			more |= __bnxt_tx_int(bp, txr, budget);</div><div class='ctx'> 	}</div><div class='add'>+	if (!more)</div><div class='add'>+		bnapi-&gt;events &amp;= ~BNXT_TX_CMP_EVENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_separate_head_pool(struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	return rxr-&gt;need_head_pool || PAGE_SIZE &gt; BNXT_RX_PAGE_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct page *__bnxt_alloc_rx_page(struct bnxt *bp, dma_addr_t *mapping,</div><div class='add'>+					 struct bnxt_rx_ring_info *rxr,</div><div class='add'>+					 unsigned int *offset,</div><div class='ctx'> 					 gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = &amp;bp-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> </div><div class='del'>-	page = alloc_page(gfp);</div><div class='add'>+	if (PAGE_SIZE &gt; BNXT_RX_PAGE_SIZE) {</div><div class='add'>+		page = page_pool_dev_alloc_frag(rxr-&gt;page_pool, offset,</div><div class='add'>+						BNXT_RX_PAGE_SIZE);</div><div class='add'>+	} else {</div><div class='add'>+		page = page_pool_dev_alloc_pages(rxr-&gt;page_pool);</div><div class='add'>+		*offset = 0;</div><div class='add'>+	}</div><div class='ctx'> 	if (!page)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	*mapping = dma_map_page_attrs(dev, page, 0, PAGE_SIZE, bp-&gt;rx_dir,</div><div class='del'>-				      DMA_ATTR_WEAK_ORDERING);</div><div class='del'>-	if (dma_mapping_error(dev, *mapping)) {</div><div class='del'>-		__free_page(page);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	*mapping += bp-&gt;rx_dma_offset;</div><div class='add'>+	*mapping = page_pool_get_dma_addr(page) + *offset;</div><div class='ctx'> 	return page;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u8 *__bnxt_alloc_rx_data(struct bnxt *bp, dma_addr_t *mapping,</div><div class='add'>+static netmem_ref __bnxt_alloc_rx_netmem(struct bnxt *bp, dma_addr_t *mapping,</div><div class='add'>+					 struct bnxt_rx_ring_info *rxr,</div><div class='add'>+					 unsigned int *offset,</div><div class='add'>+					 gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	netmem_ref netmem;</div><div class='add'>+</div><div class='add'>+	if (PAGE_SIZE &gt; BNXT_RX_PAGE_SIZE) {</div><div class='add'>+		netmem = page_pool_alloc_frag_netmem(rxr-&gt;page_pool, offset, BNXT_RX_PAGE_SIZE, gfp);</div><div class='add'>+	} else {</div><div class='add'>+		netmem = page_pool_alloc_netmems(rxr-&gt;page_pool, gfp);</div><div class='add'>+		*offset = 0;</div><div class='add'>+	}</div><div class='add'>+	if (!netmem)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	*mapping = page_pool_get_dma_addr_netmem(netmem) + *offset;</div><div class='add'>+	return netmem;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 *__bnxt_alloc_rx_frag(struct bnxt *bp, dma_addr_t *mapping,</div><div class='add'>+				       struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 				       gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	u8 *data;</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	struct page *page;</div><div class='ctx'> </div><div class='del'>-	data = kmalloc(bp-&gt;rx_buf_size, gfp);</div><div class='del'>-	if (!data)</div><div class='add'>+	page = page_pool_alloc_frag(rxr-&gt;head_pool, &amp;offset,</div><div class='add'>+				    bp-&gt;rx_buf_size, gfp);</div><div class='add'>+	if (!page)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	*mapping = dma_map_single_attrs(&amp;pdev-&gt;dev, data + bp-&gt;rx_dma_offset,</div><div class='del'>-					bp-&gt;rx_buf_use_size, bp-&gt;rx_dir,</div><div class='del'>-					DMA_ATTR_WEAK_ORDERING);</div><div class='del'>-</div><div class='del'>-	if (dma_mapping_error(&amp;pdev-&gt;dev, *mapping)) {</div><div class='del'>-		kfree(data);</div><div class='del'>-		data = NULL;</div><div class='del'>-	}</div><div class='del'>-	return data;</div><div class='add'>+	*mapping = page_pool_get_dma_addr(page) + bp-&gt;rx_dma_offset + offset;</div><div class='add'>+	return page_address(page) + offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_alloc_rx_data(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 		       u16 prod, gfp_t gfp)</div><div class='ctx'> {</div><div class='del'>-	struct rx_bd *rxbd = &amp;rxr-&gt;rx_desc_ring[RX_RING(prod)][RX_IDX(prod)];</div><div class='del'>-	struct bnxt_sw_rx_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[prod];</div><div class='add'>+	struct rx_bd *rxbd = &amp;rxr-&gt;rx_desc_ring[RX_RING(bp, prod)][RX_IDX(prod)];</div><div class='add'>+	struct bnxt_sw_rx_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[RING_RX(bp, prod)];</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_RX_PAGE_MODE(bp)) {</div><div class='del'>-		struct page *page = __bnxt_alloc_rx_page(bp, &amp;mapping, gfp);</div><div class='add'>+		unsigned int offset;</div><div class='add'>+		struct page *page =</div><div class='add'>+			__bnxt_alloc_rx_page(bp, &amp;mapping, rxr, &amp;offset, gfp);</div><div class='ctx'> </div><div class='ctx'> 		if (!page)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+		mapping += bp-&gt;rx_dma_offset;</div><div class='ctx'> 		rx_buf-&gt;data = page;</div><div class='del'>-		rx_buf-&gt;data_ptr = page_address(page) + bp-&gt;rx_offset;</div><div class='add'>+		rx_buf-&gt;data_ptr = page_address(page) + offset + bp-&gt;rx_offset;</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 *data = __bnxt_alloc_rx_data(bp, &amp;mapping, gfp);</div><div class='add'>+		u8 *data = __bnxt_alloc_rx_frag(bp, &amp;mapping, rxr, gfp);</div><div class='ctx'> </div><div class='ctx'> 		if (!data)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -742,9 +1002,10 @@ void bnxt_reuse_rx_data(struct bnxt_rx_ring_info *rxr, u16 cons, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	u16 prod = rxr-&gt;rx_prod;</div><div class='ctx'> 	struct bnxt_sw_rx_bd *cons_rx_buf, *prod_rx_buf;</div><div class='add'>+	struct bnxt *bp = rxr-&gt;bnapi-&gt;bp;</div><div class='ctx'> 	struct rx_bd *cons_bd, *prod_bd;</div><div class='ctx'> </div><div class='del'>-	prod_rx_buf = &amp;rxr-&gt;rx_buf_ring[prod];</div><div class='add'>+	prod_rx_buf = &amp;rxr-&gt;rx_buf_ring[RING_RX(bp, prod)];</div><div class='ctx'> 	cons_rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='ctx'> </div><div class='ctx'> 	prod_rx_buf-&gt;data = data;</div><div class='hunk'>@@ -752,8 +1013,8 @@ void bnxt_reuse_rx_data(struct bnxt_rx_ring_info *rxr, u16 cons, void *data)</div><div class='ctx'> </div><div class='ctx'> 	prod_rx_buf-&gt;mapping = cons_rx_buf-&gt;mapping;</div><div class='ctx'> </div><div class='del'>-	prod_bd = &amp;rxr-&gt;rx_desc_ring[RX_RING(prod)][RX_IDX(prod)];</div><div class='del'>-	cons_bd = &amp;rxr-&gt;rx_desc_ring[RX_RING(cons)][RX_IDX(cons)];</div><div class='add'>+	prod_bd = &amp;rxr-&gt;rx_desc_ring[RX_RING(bp, prod)][RX_IDX(prod)];</div><div class='add'>+	cons_bd = &amp;rxr-&gt;rx_desc_ring[RX_RING(bp, cons)][RX_IDX(cons)];</div><div class='ctx'> </div><div class='ctx'> 	prod_bd-&gt;rx_bd_haddr = cons_bd-&gt;rx_bd_haddr;</div><div class='ctx'> }</div><div class='hunk'>@@ -768,56 +1029,29 @@ static inline u16 bnxt_find_next_agg_idx(struct bnxt_rx_ring_info *rxr, u16 idx)</div><div class='ctx'> 	return next;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int bnxt_alloc_rx_page(struct bnxt *bp,</div><div class='del'>-				     struct bnxt_rx_ring_info *rxr,</div><div class='del'>-				     u16 prod, gfp_t gfp)</div><div class='add'>+static int bnxt_alloc_rx_netmem(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='add'>+				u16 prod, gfp_t gfp)</div><div class='ctx'> {</div><div class='ctx'> 	struct rx_bd *rxbd =</div><div class='del'>-		&amp;rxr-&gt;rx_agg_desc_ring[RX_RING(prod)][RX_IDX(prod)];</div><div class='add'>+		&amp;rxr-&gt;rx_agg_desc_ring[RX_AGG_RING(bp, prod)][RX_IDX(prod)];</div><div class='ctx'> 	struct bnxt_sw_rx_agg_bd *rx_agg_buf;</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-	struct page *page;</div><div class='del'>-	dma_addr_t mapping;</div><div class='ctx'> 	u16 sw_prod = rxr-&gt;rx_sw_agg_prod;</div><div class='ctx'> 	unsigned int offset = 0;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	netmem_ref netmem;</div><div class='ctx'> </div><div class='del'>-	if (PAGE_SIZE &gt; BNXT_RX_PAGE_SIZE) {</div><div class='del'>-		page = rxr-&gt;rx_page;</div><div class='del'>-		if (!page) {</div><div class='del'>-			page = alloc_page(gfp);</div><div class='del'>-			if (!page)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			rxr-&gt;rx_page = page;</div><div class='del'>-			rxr-&gt;rx_page_offset = 0;</div><div class='del'>-		}</div><div class='del'>-		offset = rxr-&gt;rx_page_offset;</div><div class='del'>-		rxr-&gt;rx_page_offset += BNXT_RX_PAGE_SIZE;</div><div class='del'>-		if (rxr-&gt;rx_page_offset == PAGE_SIZE)</div><div class='del'>-			rxr-&gt;rx_page = NULL;</div><div class='del'>-		else</div><div class='del'>-			get_page(page);</div><div class='del'>-	} else {</div><div class='del'>-		page = alloc_page(gfp);</div><div class='del'>-		if (!page)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mapping = dma_map_page_attrs(&amp;pdev-&gt;dev, page, offset,</div><div class='del'>-				     BNXT_RX_PAGE_SIZE, PCI_DMA_FROMDEVICE,</div><div class='del'>-				     DMA_ATTR_WEAK_ORDERING);</div><div class='del'>-	if (dma_mapping_error(&amp;pdev-&gt;dev, mapping)) {</div><div class='del'>-		__free_page(page);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='add'>+	netmem = __bnxt_alloc_rx_netmem(bp, &amp;mapping, rxr, &amp;offset, gfp);</div><div class='add'>+	if (!netmem)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(test_bit(sw_prod, rxr-&gt;rx_agg_bmap)))</div><div class='ctx'> 		sw_prod = bnxt_find_next_agg_idx(rxr, sw_prod);</div><div class='ctx'> </div><div class='ctx'> 	__set_bit(sw_prod, rxr-&gt;rx_agg_bmap);</div><div class='ctx'> 	rx_agg_buf = &amp;rxr-&gt;rx_agg_ring[sw_prod];</div><div class='del'>-	rxr-&gt;rx_sw_agg_prod = NEXT_RX_AGG(sw_prod);</div><div class='add'>+	rxr-&gt;rx_sw_agg_prod = RING_RX_AGG(bp, NEXT_RX_AGG(sw_prod));</div><div class='ctx'> </div><div class='del'>-	rx_agg_buf-&gt;page = page;</div><div class='add'>+	rx_agg_buf-&gt;netmem = netmem;</div><div class='ctx'> 	rx_agg_buf-&gt;offset = offset;</div><div class='ctx'> 	rx_agg_buf-&gt;mapping = mapping;</div><div class='ctx'> 	rxbd-&gt;rx_bd_haddr = cpu_to_le64(mapping);</div><div class='hunk'>@@ -825,25 +1059,52 @@ static inline int bnxt_alloc_rx_page(struct bnxt *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_reuse_rx_agg_bufs(struct bnxt_cp_ring_info *cpr, u16 cp_cons,</div><div class='del'>-				   u32 agg_bufs)</div><div class='add'>+static struct rx_agg_cmp *bnxt_get_agg(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_cp_ring_info *cpr,</div><div class='add'>+				       u16 cp_cons, u16 curr)</div><div class='add'>+{</div><div class='add'>+	struct rx_agg_cmp *agg;</div><div class='add'>+</div><div class='add'>+	cp_cons = RING_CMP(ADV_RAW_CMP(cp_cons, curr));</div><div class='add'>+	agg = (struct rx_agg_cmp *)</div><div class='add'>+		&amp;cpr-&gt;cp_desc_ring[CP_RING(cp_cons)][CP_IDX(cp_cons)];</div><div class='add'>+	return agg;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct rx_agg_cmp *bnxt_get_tpa_agg_p5(struct bnxt *bp,</div><div class='add'>+					      struct bnxt_rx_ring_info *rxr,</div><div class='add'>+					      u16 agg_id, u16 curr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_tpa_info *tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='add'>+</div><div class='add'>+	return &amp;tpa_info-&gt;agg_arr[curr];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_reuse_rx_agg_bufs(struct bnxt_cp_ring_info *cpr, u16 idx,</div><div class='add'>+				   u16 start, u32 agg_bufs, bool tpa)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_napi *bnapi = cpr-&gt;bnapi;</div><div class='ctx'> 	struct bnxt *bp = bnapi-&gt;bp;</div><div class='ctx'> 	struct bnxt_rx_ring_info *rxr = bnapi-&gt;rx_ring;</div><div class='ctx'> 	u16 prod = rxr-&gt;rx_agg_prod;</div><div class='ctx'> 	u16 sw_prod = rxr-&gt;rx_sw_agg_prod;</div><div class='add'>+	bool p5_tpa = false;</div><div class='ctx'> 	u32 i;</div><div class='ctx'> </div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp; tpa)</div><div class='add'>+		p5_tpa = true;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; agg_bufs; i++) {</div><div class='del'>-		u16 cons;</div><div class='del'>-		struct rx_agg_cmp *agg;</div><div class='ctx'> 		struct bnxt_sw_rx_agg_bd *cons_rx_buf, *prod_rx_buf;</div><div class='add'>+		struct rx_agg_cmp *agg;</div><div class='ctx'> 		struct rx_bd *prod_bd;</div><div class='del'>-		struct page *page;</div><div class='add'>+		netmem_ref netmem;</div><div class='add'>+		u16 cons;</div><div class='ctx'> </div><div class='del'>-		agg = (struct rx_agg_cmp *)</div><div class='del'>-			&amp;cpr-&gt;cp_desc_ring[CP_RING(cp_cons)][CP_IDX(cp_cons)];</div><div class='add'>+		if (p5_tpa)</div><div class='add'>+			agg = bnxt_get_tpa_agg_p5(bp, rxr, idx, start + i);</div><div class='add'>+		else</div><div class='add'>+			agg = bnxt_get_agg(bp, cpr, idx, start + i);</div><div class='ctx'> 		cons = agg-&gt;rx_agg_cmp_opaque;</div><div class='ctx'> 		__clear_bit(cons, rxr-&gt;rx_agg_bmap);</div><div class='ctx'> </div><div class='hunk'>@@ -855,28 +1116,59 @@ static void bnxt_reuse_rx_agg_bufs(struct bnxt_cp_ring_info *cpr, u16 cp_cons,</div><div class='ctx'> 		cons_rx_buf = &amp;rxr-&gt;rx_agg_ring[cons];</div><div class='ctx'> </div><div class='ctx'> 		/* It is possible for sw_prod to be equal to cons, so</div><div class='del'>-		 * set cons_rx_buf-&gt;page to NULL first.</div><div class='add'>+		 * set cons_rx_buf-&gt;netmem to 0 first.</div><div class='ctx'> 		 */</div><div class='del'>-		page = cons_rx_buf-&gt;page;</div><div class='del'>-		cons_rx_buf-&gt;page = NULL;</div><div class='del'>-		prod_rx_buf-&gt;page = page;</div><div class='add'>+		netmem = cons_rx_buf-&gt;netmem;</div><div class='add'>+		cons_rx_buf-&gt;netmem = 0;</div><div class='add'>+		prod_rx_buf-&gt;netmem = netmem;</div><div class='ctx'> 		prod_rx_buf-&gt;offset = cons_rx_buf-&gt;offset;</div><div class='ctx'> </div><div class='ctx'> 		prod_rx_buf-&gt;mapping = cons_rx_buf-&gt;mapping;</div><div class='ctx'> </div><div class='del'>-		prod_bd = &amp;rxr-&gt;rx_agg_desc_ring[RX_RING(prod)][RX_IDX(prod)];</div><div class='add'>+		prod_bd = &amp;rxr-&gt;rx_agg_desc_ring[RX_AGG_RING(bp, prod)][RX_IDX(prod)];</div><div class='ctx'> </div><div class='ctx'> 		prod_bd-&gt;rx_bd_haddr = cpu_to_le64(cons_rx_buf-&gt;mapping);</div><div class='ctx'> 		prod_bd-&gt;rx_bd_opaque = sw_prod;</div><div class='ctx'> </div><div class='ctx'> 		prod = NEXT_RX_AGG(prod);</div><div class='del'>-		sw_prod = NEXT_RX_AGG(sw_prod);</div><div class='del'>-		cp_cons = NEXT_CMP(cp_cons);</div><div class='add'>+		sw_prod = RING_RX_AGG(bp, NEXT_RX_AGG(sw_prod));</div><div class='ctx'> 	}</div><div class='ctx'> 	rxr-&gt;rx_agg_prod = prod;</div><div class='ctx'> 	rxr-&gt;rx_sw_agg_prod = sw_prod;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct sk_buff *bnxt_rx_multi_page_skb(struct bnxt *bp,</div><div class='add'>+					      struct bnxt_rx_ring_info *rxr,</div><div class='add'>+					      u16 cons, void *data, u8 *data_ptr,</div><div class='add'>+					      dma_addr_t dma_addr,</div><div class='add'>+					      unsigned int offset_and_len)</div><div class='add'>+{</div><div class='add'>+	unsigned int len = offset_and_len &amp; 0xffff;</div><div class='add'>+	struct page *page = data;</div><div class='add'>+	u16 prod = rxr-&gt;rx_prod;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = bnxt_alloc_rx_data(bp, rxr, prod, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		bnxt_reuse_rx_data(rxr, cons, data);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	dma_addr -= bp-&gt;rx_dma_offset;</div><div class='add'>+	dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev, dma_addr, BNXT_RX_PAGE_SIZE,</div><div class='add'>+				bp-&gt;rx_dir);</div><div class='add'>+	skb = napi_build_skb(data_ptr - bp-&gt;rx_offset, BNXT_RX_PAGE_SIZE);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		page_pool_recycle_direct(rxr-&gt;page_pool, page);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+	skb_mark_for_recycle(skb);</div><div class='add'>+	skb_reserve(skb, bp-&gt;rx_offset);</div><div class='add'>+	__skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp,</div><div class='ctx'> 					struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 					u16 cons, void *data, u8 *data_ptr,</div><div class='hunk'>@@ -885,7 +1177,7 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp,</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int payload = offset_and_len &gt;&gt; 16;</div><div class='ctx'> 	unsigned int len = offset_and_len &amp; 0xffff;</div><div class='del'>-	struct skb_frag_struct *frag;</div><div class='add'>+	skb_frag_t *frag;</div><div class='ctx'> 	struct page *page = data;</div><div class='ctx'> 	u16 prod = rxr-&gt;rx_prod;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -897,26 +1189,27 @@ static struct sk_buff *bnxt_rx_page_skb(struct bnxt *bp,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	dma_addr -= bp-&gt;rx_dma_offset;</div><div class='del'>-	dma_unmap_page_attrs(&amp;bp-&gt;pdev-&gt;dev, dma_addr, PAGE_SIZE, bp-&gt;rx_dir,</div><div class='del'>-			     DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev, dma_addr, BNXT_RX_PAGE_SIZE,</div><div class='add'>+				bp-&gt;rx_dir);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(!payload))</div><div class='ctx'> 		payload = eth_get_headlen(bp-&gt;dev, data_ptr, len);</div><div class='ctx'> </div><div class='ctx'> 	skb = napi_alloc_skb(&amp;rxr-&gt;bnapi-&gt;napi, payload);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		__free_page(page);</div><div class='add'>+		page_pool_recycle_direct(rxr-&gt;page_pool, page);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_mark_for_recycle(skb);</div><div class='ctx'> 	off = (void *)data_ptr - page_address(page);</div><div class='del'>-	skb_add_rx_frag(skb, 0, page, off, len, PAGE_SIZE);</div><div class='add'>+	skb_add_rx_frag(skb, 0, page, off, len, BNXT_RX_PAGE_SIZE);</div><div class='ctx'> 	memcpy(skb-&gt;data - NET_IP_ALIGN, data_ptr - NET_IP_ALIGN,</div><div class='ctx'> 	       payload + NET_IP_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 	frag = &amp;skb_shinfo(skb)-&gt;frags[0];</div><div class='ctx'> 	skb_frag_size_sub(frag, payload);</div><div class='del'>-	frag-&gt;page_offset += payload;</div><div class='add'>+	skb_frag_off_add(frag, payload);</div><div class='ctx'> 	skb-&gt;data_len -= payload;</div><div class='ctx'> 	skb-&gt;tail += payload;</div><div class='ctx'> </div><div class='hunk'>@@ -939,91 +1232,150 @@ static struct sk_buff *bnxt_rx_skb(struct bnxt *bp,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb = build_skb(data, 0);</div><div class='del'>-	dma_unmap_single_attrs(&amp;bp-&gt;pdev-&gt;dev, dma_addr, bp-&gt;rx_buf_use_size,</div><div class='del'>-			       bp-&gt;rx_dir, DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+	skb = napi_build_skb(data, bp-&gt;rx_buf_size);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev, dma_addr, bp-&gt;rx_buf_use_size,</div><div class='add'>+				bp-&gt;rx_dir);</div><div class='ctx'> 	if (!skb) {</div><div class='del'>-		kfree(data);</div><div class='add'>+		page_pool_free_va(rxr-&gt;head_pool, data, true);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	skb_mark_for_recycle(skb);</div><div class='ctx'> 	skb_reserve(skb, bp-&gt;rx_offset);</div><div class='ctx'> 	skb_put(skb, offset_and_len &amp; 0xffff);</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sk_buff *bnxt_rx_pages(struct bnxt *bp,</div><div class='del'>-				     struct bnxt_cp_ring_info *cpr,</div><div class='del'>-				     struct sk_buff *skb, u16 cp_cons,</div><div class='del'>-				     u32 agg_bufs)</div><div class='add'>+static u32 __bnxt_rx_agg_netmems(struct bnxt *bp,</div><div class='add'>+				 struct bnxt_cp_ring_info *cpr,</div><div class='add'>+				 u16 idx, u32 agg_bufs, bool tpa,</div><div class='add'>+				 struct sk_buff *skb,</div><div class='add'>+				 struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_napi *bnapi = cpr-&gt;bnapi;</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-	struct bnxt_rx_ring_info *rxr = bnapi-&gt;rx_ring;</div><div class='del'>-	u16 prod = rxr-&gt;rx_agg_prod;</div><div class='del'>-	u32 i;</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	struct bnxt_rx_ring_info *rxr;</div><div class='add'>+	u32 i, total_frag_len = 0;</div><div class='add'>+	bool p5_tpa = false;</div><div class='add'>+	u16 prod;</div><div class='add'>+</div><div class='add'>+	rxr = bnapi-&gt;rx_ring;</div><div class='add'>+	prod = rxr-&gt;rx_agg_prod;</div><div class='add'>+</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp; tpa)</div><div class='add'>+		p5_tpa = true;</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		shinfo = skb_shinfo(skb);</div><div class='add'>+	else</div><div class='add'>+		shinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; agg_bufs; i++) {</div><div class='del'>-		u16 cons, frag_len;</div><div class='del'>-		struct rx_agg_cmp *agg;</div><div class='ctx'> 		struct bnxt_sw_rx_agg_bd *cons_rx_buf;</div><div class='del'>-		struct page *page;</div><div class='del'>-		dma_addr_t mapping;</div><div class='add'>+		struct rx_agg_cmp *agg;</div><div class='add'>+		u16 cons, frag_len;</div><div class='add'>+		netmem_ref netmem;</div><div class='ctx'> </div><div class='del'>-		agg = (struct rx_agg_cmp *)</div><div class='del'>-			&amp;cpr-&gt;cp_desc_ring[CP_RING(cp_cons)][CP_IDX(cp_cons)];</div><div class='add'>+		if (p5_tpa)</div><div class='add'>+			agg = bnxt_get_tpa_agg_p5(bp, rxr, idx, i);</div><div class='add'>+		else</div><div class='add'>+			agg = bnxt_get_agg(bp, cpr, idx, i);</div><div class='ctx'> 		cons = agg-&gt;rx_agg_cmp_opaque;</div><div class='ctx'> 		frag_len = (le32_to_cpu(agg-&gt;rx_agg_cmp_len_flags_type) &amp;</div><div class='ctx'> 			    RX_AGG_CMP_LEN) &gt;&gt; RX_AGG_CMP_LEN_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 		cons_rx_buf = &amp;rxr-&gt;rx_agg_ring[cons];</div><div class='del'>-		skb_fill_page_desc(skb, i, cons_rx_buf-&gt;page,</div><div class='del'>-				   cons_rx_buf-&gt;offset, frag_len);</div><div class='add'>+		if (skb) {</div><div class='add'>+			skb_add_rx_frag_netmem(skb, i, cons_rx_buf-&gt;netmem,</div><div class='add'>+					       cons_rx_buf-&gt;offset,</div><div class='add'>+					       frag_len, BNXT_RX_PAGE_SIZE);</div><div class='add'>+		} else {</div><div class='add'>+			skb_frag_t *frag = &amp;shinfo-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+			skb_frag_fill_netmem_desc(frag, cons_rx_buf-&gt;netmem,</div><div class='add'>+						  cons_rx_buf-&gt;offset,</div><div class='add'>+						  frag_len);</div><div class='add'>+			shinfo-&gt;nr_frags = i + 1;</div><div class='add'>+		}</div><div class='ctx'> 		__clear_bit(cons, rxr-&gt;rx_agg_bmap);</div><div class='ctx'> </div><div class='del'>-		/* It is possible for bnxt_alloc_rx_page() to allocate</div><div class='add'>+		/* It is possible for bnxt_alloc_rx_netmem() to allocate</div><div class='ctx'> 		 * a sw_prod index that equals the cons index, so we</div><div class='ctx'> 		 * need to clear the cons entry now.</div><div class='ctx'> 		 */</div><div class='del'>-		mapping = cons_rx_buf-&gt;mapping;</div><div class='del'>-		page = cons_rx_buf-&gt;page;</div><div class='del'>-		cons_rx_buf-&gt;page = NULL;</div><div class='del'>-</div><div class='del'>-		if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_ATOMIC) != 0) {</div><div class='del'>-			struct skb_shared_info *shinfo;</div><div class='del'>-			unsigned int nr_frags;</div><div class='add'>+		netmem = cons_rx_buf-&gt;netmem;</div><div class='add'>+		cons_rx_buf-&gt;netmem = 0;</div><div class='ctx'> </div><div class='del'>-			shinfo = skb_shinfo(skb);</div><div class='del'>-			nr_frags = --shinfo-&gt;nr_frags;</div><div class='del'>-			__skb_frag_set_page(&amp;shinfo-&gt;frags[nr_frags], NULL);</div><div class='add'>+		if (xdp &amp;&amp; netmem_is_pfmemalloc(netmem))</div><div class='add'>+			xdp_buff_set_frag_pfmemalloc(xdp);</div><div class='ctx'> </div><div class='del'>-			dev_kfree_skb(skb);</div><div class='add'>+		if (bnxt_alloc_rx_netmem(bp, rxr, prod, GFP_ATOMIC) != 0) {</div><div class='add'>+			if (skb) {</div><div class='add'>+				skb-&gt;len -= frag_len;</div><div class='add'>+				skb-&gt;data_len -= frag_len;</div><div class='add'>+				skb-&gt;truesize -= BNXT_RX_PAGE_SIZE;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-			cons_rx_buf-&gt;page = page;</div><div class='add'>+			--shinfo-&gt;nr_frags;</div><div class='add'>+			cons_rx_buf-&gt;netmem = netmem;</div><div class='ctx'> </div><div class='del'>-			/* Update prod since possibly some pages have been</div><div class='add'>+			/* Update prod since possibly some netmems have been</div><div class='ctx'> 			 * allocated already.</div><div class='ctx'> 			 */</div><div class='ctx'> 			rxr-&gt;rx_agg_prod = prod;</div><div class='del'>-			bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs - i);</div><div class='del'>-			return NULL;</div><div class='add'>+			bnxt_reuse_rx_agg_bufs(cpr, idx, i, agg_bufs - i, tpa);</div><div class='add'>+			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page_attrs(&amp;pdev-&gt;dev, mapping, BNXT_RX_PAGE_SIZE,</div><div class='del'>-				     PCI_DMA_FROMDEVICE,</div><div class='del'>-				     DMA_ATTR_WEAK_ORDERING);</div><div class='del'>-</div><div class='del'>-		skb-&gt;data_len += frag_len;</div><div class='del'>-		skb-&gt;len += frag_len;</div><div class='del'>-		skb-&gt;truesize += PAGE_SIZE;</div><div class='add'>+		page_pool_dma_sync_netmem_for_cpu(rxr-&gt;page_pool, netmem, 0,</div><div class='add'>+						  BNXT_RX_PAGE_SIZE);</div><div class='ctx'> </div><div class='add'>+		total_frag_len += frag_len;</div><div class='ctx'> 		prod = NEXT_RX_AGG(prod);</div><div class='del'>-		cp_cons = NEXT_CMP(cp_cons);</div><div class='ctx'> 	}</div><div class='ctx'> 	rxr-&gt;rx_agg_prod = prod;</div><div class='add'>+	return total_frag_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *bnxt_rx_agg_netmems_skb(struct bnxt *bp,</div><div class='add'>+					       struct bnxt_cp_ring_info *cpr,</div><div class='add'>+					       struct sk_buff *skb, u16 idx,</div><div class='add'>+					       u32 agg_bufs, bool tpa)</div><div class='add'>+{</div><div class='add'>+	u32 total_frag_len = 0;</div><div class='add'>+</div><div class='add'>+	total_frag_len = __bnxt_rx_agg_netmems(bp, cpr, idx, agg_bufs, tpa,</div><div class='add'>+					       skb, NULL);</div><div class='add'>+	if (!total_frag_len) {</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 bnxt_rx_agg_netmems_xdp(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_cp_ring_info *cpr,</div><div class='add'>+				   struct xdp_buff *xdp, u16 idx,</div><div class='add'>+				   u32 agg_bufs, bool tpa)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	u32 total_frag_len = 0;</div><div class='add'>+</div><div class='add'>+	if (!xdp_buff_has_frags(xdp))</div><div class='add'>+		shinfo-&gt;nr_frags = 0;</div><div class='add'>+</div><div class='add'>+	total_frag_len = __bnxt_rx_agg_netmems(bp, cpr, idx, agg_bufs, tpa,</div><div class='add'>+					       NULL, xdp);</div><div class='add'>+	if (total_frag_len) {</div><div class='add'>+		xdp_buff_set_frags_flag(xdp);</div><div class='add'>+		shinfo-&gt;nr_frags = agg_bufs;</div><div class='add'>+		shinfo-&gt;xdp_frags_size = total_frag_len;</div><div class='add'>+	}</div><div class='add'>+	return total_frag_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_agg_bufs_valid(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 			       u8 agg_bufs, u32 *raw_cons)</div><div class='ctx'> {</div><div class='hunk'>@@ -1037,9 +1389,9 @@ static int bnxt_agg_bufs_valid(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	return RX_AGG_CMP_VALID(agg, *raw_cons);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline struct sk_buff *bnxt_copy_skb(struct bnxt_napi *bnapi, u8 *data,</div><div class='del'>-					    unsigned int len,</div><div class='del'>-					    dma_addr_t mapping)</div><div class='add'>+static struct sk_buff *bnxt_copy_data(struct bnxt_napi *bnapi, u8 *data,</div><div class='add'>+				      unsigned int len,</div><div class='add'>+				      dma_addr_t mapping)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = bnapi-&gt;bp;</div><div class='ctx'> 	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='hunk'>@@ -1049,16 +1401,49 @@ static inline struct sk_buff *bnxt_copy_skb(struct bnxt_napi *bnapi, u8 *data,</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_cpu(&amp;pdev-&gt;dev, mapping, bp-&gt;rx_copy_thresh,</div><div class='add'>+	dma_sync_single_for_cpu(&amp;pdev-&gt;dev, mapping, bp-&gt;rx_copybreak,</div><div class='ctx'> 				bp-&gt;rx_dir);</div><div class='ctx'> </div><div class='ctx'> 	memcpy(skb-&gt;data - NET_IP_ALIGN, data - NET_IP_ALIGN,</div><div class='ctx'> 	       len + NET_IP_ALIGN);</div><div class='ctx'> </div><div class='del'>-	dma_sync_single_for_device(&amp;pdev-&gt;dev, mapping, bp-&gt;rx_copy_thresh,</div><div class='add'>+	dma_sync_single_for_device(&amp;pdev-&gt;dev, mapping, bp-&gt;rx_copybreak,</div><div class='ctx'> 				   bp-&gt;rx_dir);</div><div class='ctx'> </div><div class='ctx'> 	skb_put(skb, len);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *bnxt_copy_skb(struct bnxt_napi *bnapi, u8 *data,</div><div class='add'>+				     unsigned int len,</div><div class='add'>+				     dma_addr_t mapping)</div><div class='add'>+{</div><div class='add'>+	return bnxt_copy_data(bnapi, data, len, mapping);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *bnxt_copy_xdp(struct bnxt_napi *bnapi,</div><div class='add'>+				     struct xdp_buff *xdp,</div><div class='add'>+				     unsigned int len,</div><div class='add'>+				     dma_addr_t mapping)</div><div class='add'>+{</div><div class='add'>+	unsigned int metasize = 0;</div><div class='add'>+	u8 *data = xdp-&gt;data;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	len = xdp-&gt;data_end - xdp-&gt;data_meta;</div><div class='add'>+	metasize = xdp-&gt;data - xdp-&gt;data_meta;</div><div class='add'>+	data = xdp-&gt;data_meta;</div><div class='add'>+</div><div class='add'>+	skb = bnxt_copy_data(bnapi, data, len, mapping);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return skb;</div><div class='add'>+</div><div class='add'>+	if (metasize) {</div><div class='add'>+		skb_metadata_set(skb, metasize);</div><div class='add'>+		__skb_pull(skb, metasize);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1078,9 +1463,10 @@ static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	} else if (cmp_type == CMP_TYPE_RX_L2_TPA_END_CMP) {</div><div class='ctx'> 		struct rx_tpa_end_cmp *tpa_end = cmp;</div><div class='ctx'> </div><div class='del'>-		agg_bufs = (le32_to_cpu(tpa_end-&gt;rx_tpa_end_cmp_misc_v1) &amp;</div><div class='del'>-			    RX_TPA_END_CMP_AGG_BUFS) &gt;&gt;</div><div class='del'>-			   RX_TPA_END_CMP_AGG_BUFS_SHIFT;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		agg_bufs = TPA_END_AGG_BUFS(tpa_end);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (agg_bufs) {</div><div class='hunk'>@@ -1091,66 +1477,101 @@ static int bnxt_discard_rx(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_queue_sp_work(struct bnxt *bp)</div><div class='add'>+static u16 bnxt_alloc_agg_idx(struct bnxt_rx_ring_info *rxr, u16 agg_id)</div><div class='ctx'> {</div><div class='del'>-	if (BNXT_PF(bp))</div><div class='del'>-		queue_work(bnxt_pf_wq, &amp;bp-&gt;sp_task);</div><div class='del'>-	else</div><div class='del'>-		schedule_work(&amp;bp-&gt;sp_task);</div><div class='add'>+	struct bnxt_tpa_idx_map *map = rxr-&gt;rx_tpa_idx_map;</div><div class='add'>+	u16 idx = agg_id &amp; MAX_TPA_P5_MASK;</div><div class='add'>+</div><div class='add'>+	if (test_bit(idx, map-&gt;agg_idx_bmap))</div><div class='add'>+		idx = find_first_zero_bit(map-&gt;agg_idx_bmap,</div><div class='add'>+					  BNXT_AGG_IDX_BMAP_SIZE);</div><div class='add'>+	__set_bit(idx, map-&gt;agg_idx_bmap);</div><div class='add'>+	map-&gt;agg_id_tbl[agg_id] = idx;</div><div class='add'>+	return idx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_cancel_sp_work(struct bnxt *bp)</div><div class='add'>+static void bnxt_free_agg_idx(struct bnxt_rx_ring_info *rxr, u16 idx)</div><div class='ctx'> {</div><div class='del'>-	if (BNXT_PF(bp))</div><div class='del'>-		flush_workqueue(bnxt_pf_wq);</div><div class='del'>-	else</div><div class='del'>-		cancel_work_sync(&amp;bp-&gt;sp_task);</div><div class='add'>+	struct bnxt_tpa_idx_map *map = rxr-&gt;rx_tpa_idx_map;</div><div class='add'>+</div><div class='add'>+	__clear_bit(idx, map-&gt;agg_idx_bmap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_sched_reset(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='add'>+static u16 bnxt_lookup_agg_idx(struct bnxt_rx_ring_info *rxr, u16 agg_id)</div><div class='ctx'> {</div><div class='del'>-	if (!rxr-&gt;bnapi-&gt;in_reset) {</div><div class='del'>-		rxr-&gt;bnapi-&gt;in_reset = true;</div><div class='del'>-		set_bit(BNXT_RESET_TASK_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		bnxt_queue_sp_work(bp);</div><div class='add'>+	struct bnxt_tpa_idx_map *map = rxr-&gt;rx_tpa_idx_map;</div><div class='add'>+</div><div class='add'>+	return map-&gt;agg_id_tbl[agg_id];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_tpa_metadata(struct bnxt_tpa_info *tpa_info,</div><div class='add'>+			      struct rx_tpa_start_cmp *tpa_start,</div><div class='add'>+			      struct rx_tpa_start_cmp_ext *tpa_start1)</div><div class='add'>+{</div><div class='add'>+	tpa_info-&gt;cfa_code_valid = 1;</div><div class='add'>+	tpa_info-&gt;cfa_code = TPA_START_CFA_CODE(tpa_start1);</div><div class='add'>+	tpa_info-&gt;vlan_valid = 0;</div><div class='add'>+	if (tpa_info-&gt;flags2 &amp; RX_CMP_FLAGS2_META_FORMAT_VLAN) {</div><div class='add'>+		tpa_info-&gt;vlan_valid = 1;</div><div class='add'>+		tpa_info-&gt;metadata =</div><div class='add'>+			le32_to_cpu(tpa_start1-&gt;rx_tpa_start_cmp_metadata);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_tpa_metadata_v2(struct bnxt_tpa_info *tpa_info,</div><div class='add'>+				 struct rx_tpa_start_cmp *tpa_start,</div><div class='add'>+				 struct rx_tpa_start_cmp_ext *tpa_start1)</div><div class='add'>+{</div><div class='add'>+	tpa_info-&gt;vlan_valid = 0;</div><div class='add'>+	if (TPA_START_VLAN_VALID(tpa_start)) {</div><div class='add'>+		u32 tpid_sel = TPA_START_VLAN_TPID_SEL(tpa_start);</div><div class='add'>+		u32 vlan_proto = ETH_P_8021Q;</div><div class='add'>+</div><div class='add'>+		tpa_info-&gt;vlan_valid = 1;</div><div class='add'>+		if (tpid_sel == RX_TPA_START_METADATA1_TPID_8021AD)</div><div class='add'>+			vlan_proto = ETH_P_8021AD;</div><div class='add'>+		tpa_info-&gt;metadata = vlan_proto &lt;&lt; 16 |</div><div class='add'>+				     TPA_START_METADATA0_TCI(tpa_start1);</div><div class='ctx'> 	}</div><div class='del'>-	rxr-&gt;rx_next_cons = 0xffff;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='del'>-			   struct rx_tpa_start_cmp *tpa_start,</div><div class='add'>+			   u8 cmp_type, struct rx_tpa_start_cmp *tpa_start,</div><div class='ctx'> 			   struct rx_tpa_start_cmp_ext *tpa_start1)</div><div class='ctx'> {</div><div class='del'>-	u8 agg_id = TPA_START_AGG_ID(tpa_start);</div><div class='del'>-	u16 cons, prod;</div><div class='del'>-	struct bnxt_tpa_info *tpa_info;</div><div class='ctx'> 	struct bnxt_sw_rx_bd *cons_rx_buf, *prod_rx_buf;</div><div class='add'>+	struct bnxt_tpa_info *tpa_info;</div><div class='add'>+	u16 cons, prod, agg_id;</div><div class='ctx'> 	struct rx_bd *prod_bd;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		agg_id = TPA_START_AGG_ID_P5(tpa_start);</div><div class='add'>+		agg_id = bnxt_alloc_agg_idx(rxr, agg_id);</div><div class='add'>+	} else {</div><div class='add'>+		agg_id = TPA_START_AGG_ID(tpa_start);</div><div class='add'>+	}</div><div class='ctx'> 	cons = tpa_start-&gt;rx_tpa_start_cmp_opaque;</div><div class='ctx'> 	prod = rxr-&gt;rx_prod;</div><div class='ctx'> 	cons_rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='del'>-	prod_rx_buf = &amp;rxr-&gt;rx_buf_ring[prod];</div><div class='add'>+	prod_rx_buf = &amp;rxr-&gt;rx_buf_ring[RING_RX(bp, prod)];</div><div class='ctx'> 	tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='ctx'> </div><div class='del'>-	if (unlikely(cons != rxr-&gt;rx_next_cons)) {</div><div class='del'>-		netdev_warn(bp-&gt;dev, "TPA cons %x != expected cons %x\n",</div><div class='del'>-			    cons, rxr-&gt;rx_next_cons);</div><div class='del'>-		bnxt_sched_reset(bp, rxr);</div><div class='add'>+	if (unlikely(cons != rxr-&gt;rx_next_cons ||</div><div class='add'>+		     TPA_START_ERROR(tpa_start))) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "TPA cons %x, expected cons %x, error code %x\n",</div><div class='add'>+			    cons, rxr-&gt;rx_next_cons,</div><div class='add'>+			    TPA_START_ERROR_CODE(tpa_start1));</div><div class='add'>+		bnxt_sched_reset_rxr(bp, rxr);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='del'>-	/* Store cfa_code in tpa_info to use in tpa_end</div><div class='del'>-	 * completion processing.</div><div class='del'>-	 */</div><div class='del'>-	tpa_info-&gt;cfa_code = TPA_START_CFA_CODE(tpa_start1);</div><div class='ctx'> 	prod_rx_buf-&gt;data = tpa_info-&gt;data;</div><div class='ctx'> 	prod_rx_buf-&gt;data_ptr = tpa_info-&gt;data_ptr;</div><div class='ctx'> </div><div class='ctx'> 	mapping = tpa_info-&gt;mapping;</div><div class='ctx'> 	prod_rx_buf-&gt;mapping = mapping;</div><div class='ctx'> </div><div class='del'>-	prod_bd = &amp;rxr-&gt;rx_desc_ring[RX_RING(prod)][RX_IDX(prod)];</div><div class='add'>+	prod_bd = &amp;rxr-&gt;rx_desc_ring[RX_RING(bp, prod)][RX_IDX(prod)];</div><div class='ctx'> </div><div class='ctx'> 	prod_bd-&gt;rx_bd_haddr = cpu_to_le64(mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -1163,28 +1584,32 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 		le32_to_cpu(tpa_start-&gt;rx_tpa_start_cmp_len_flags_type) &gt;&gt;</div><div class='ctx'> 				RX_TPA_START_CMP_LEN_SHIFT;</div><div class='ctx'> 	if (likely(TPA_START_HASH_VALID(tpa_start))) {</div><div class='del'>-		u32 hash_type = TPA_START_HASH_TYPE(tpa_start);</div><div class='del'>-</div><div class='ctx'> 		tpa_info-&gt;hash_type = PKT_HASH_TYPE_L4;</div><div class='ctx'> 		tpa_info-&gt;gso_type = SKB_GSO_TCPV4;</div><div class='add'>+		if (TPA_START_IS_IPV6(tpa_start1))</div><div class='add'>+			tpa_info-&gt;gso_type = SKB_GSO_TCPV6;</div><div class='ctx'> 		/* RSS profiles 1 and 3 with extract code 0 for inner 4-tuple */</div><div class='del'>-		if (hash_type == 3 || TPA_START_IS_IPV6(tpa_start1))</div><div class='add'>+		else if (!BNXT_CHIP_P4_PLUS(bp) &amp;&amp;</div><div class='add'>+			 TPA_START_HASH_TYPE(tpa_start) == 3)</div><div class='ctx'> 			tpa_info-&gt;gso_type = SKB_GSO_TCPV6;</div><div class='ctx'> 		tpa_info-&gt;rss_hash =</div><div class='ctx'> 			le32_to_cpu(tpa_start-&gt;rx_tpa_start_cmp_rss_hash);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tpa_info-&gt;hash_type = PKT_HASH_TYPE_NONE;</div><div class='ctx'> 		tpa_info-&gt;gso_type = 0;</div><div class='del'>-		if (netif_msg_rx_err(bp))</div><div class='del'>-			netdev_warn(bp-&gt;dev, "TPA packet without valid hash\n");</div><div class='add'>+		netif_warn(bp, rx_err, bp-&gt;dev, "TPA packet without valid hash\n");</div><div class='ctx'> 	}</div><div class='ctx'> 	tpa_info-&gt;flags2 = le32_to_cpu(tpa_start1-&gt;rx_tpa_start_cmp_flags2);</div><div class='del'>-	tpa_info-&gt;metadata = le32_to_cpu(tpa_start1-&gt;rx_tpa_start_cmp_metadata);</div><div class='ctx'> 	tpa_info-&gt;hdr_info = le32_to_cpu(tpa_start1-&gt;rx_tpa_start_cmp_hdr_info);</div><div class='add'>+	if (cmp_type == CMP_TYPE_RX_L2_TPA_START_CMP)</div><div class='add'>+		bnxt_tpa_metadata(tpa_info, tpa_start, tpa_start1);</div><div class='add'>+	else</div><div class='add'>+		bnxt_tpa_metadata_v2(tpa_info, tpa_start, tpa_start1);</div><div class='add'>+	tpa_info-&gt;agg_count = 0;</div><div class='ctx'> </div><div class='ctx'> 	rxr-&gt;rx_prod = NEXT_RX(prod);</div><div class='del'>-	cons = NEXT_RX(cons);</div><div class='del'>-	rxr-&gt;rx_next_cons = NEXT_RX(cons);</div><div class='add'>+	cons = RING_RX(bp, NEXT_RX(cons));</div><div class='add'>+	rxr-&gt;rx_next_cons = RING_RX(bp, NEXT_RX(cons));</div><div class='ctx'> 	cons_rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='ctx'> </div><div class='ctx'> 	bnxt_reuse_rx_data(rxr, cons, cons_rx_buf-&gt;data);</div><div class='hunk'>@@ -1192,12 +1617,36 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 	cons_rx_buf-&gt;data = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_abort_tpa(struct bnxt_cp_ring_info *cpr, u16 cp_cons,</div><div class='del'>-			   u32 agg_bufs)</div><div class='add'>+static void bnxt_abort_tpa(struct bnxt_cp_ring_info *cpr, u16 idx, u32 agg_bufs)</div><div class='ctx'> {</div><div class='ctx'> 	if (agg_bufs)</div><div class='del'>-		bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);</div><div class='add'>+		bnxt_reuse_rx_agg_bufs(cpr, idx, 0, agg_bufs, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+static void bnxt_gro_tunnel(struct sk_buff *skb, __be16 ip_proto)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh = NULL;</div><div class='add'>+</div><div class='add'>+	if (ip_proto == htons(ETH_P_IP)) {</div><div class='add'>+		struct iphdr *iph = (struct iphdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (iph-&gt;protocol == IPPROTO_UDP)</div><div class='add'>+			uh = (struct udphdr *)(iph + 1);</div><div class='add'>+	} else {</div><div class='add'>+		struct ipv6hdr *iph = (struct ipv6hdr *)skb-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (iph-&gt;nexthdr == IPPROTO_UDP)</div><div class='add'>+			uh = (struct udphdr *)(iph + 1);</div><div class='add'>+	}</div><div class='add'>+	if (uh) {</div><div class='add'>+		if (uh-&gt;check)</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL_CSUM;</div><div class='add'>+		else</div><div class='add'>+			skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static struct sk_buff *bnxt_gro_func_5731x(struct bnxt_tpa_info *tpa_info,</div><div class='ctx'> 					   int payload_off, int tcp_ts,</div><div class='hunk'>@@ -1256,28 +1705,39 @@ static struct sk_buff *bnxt_gro_func_5731x(struct bnxt_tpa_info *tpa_info,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (inner_mac_off) { /* tunnel */</div><div class='del'>-		struct udphdr *uh = NULL;</div><div class='ctx'> 		__be16 proto = *((__be16 *)(skb-&gt;data + outer_ip_off -</div><div class='ctx'> 					    ETH_HLEN - 2));</div><div class='ctx'> </div><div class='del'>-		if (proto == htons(ETH_P_IP)) {</div><div class='del'>-			struct iphdr *iph = (struct iphdr *)skb-&gt;data;</div><div class='add'>+		bnxt_gro_tunnel(skb, proto);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (iph-&gt;protocol == IPPROTO_UDP)</div><div class='del'>-				uh = (struct udphdr *)(iph + 1);</div><div class='del'>-		} else {</div><div class='del'>-			struct ipv6hdr *iph = (struct ipv6hdr *)skb-&gt;data;</div><div class='add'>+static struct sk_buff *bnxt_gro_func_5750x(struct bnxt_tpa_info *tpa_info,</div><div class='add'>+					   int payload_off, int tcp_ts,</div><div class='add'>+					   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_INET</div><div class='add'>+	u16 outer_ip_off, inner_ip_off, inner_mac_off;</div><div class='add'>+	u32 hdr_info = tpa_info-&gt;hdr_info;</div><div class='add'>+	int iphdr_len, nw_off;</div><div class='ctx'> </div><div class='del'>-			if (iph-&gt;nexthdr == IPPROTO_UDP)</div><div class='del'>-				uh = (struct udphdr *)(iph + 1);</div><div class='del'>-		}</div><div class='del'>-		if (uh) {</div><div class='del'>-			if (uh-&gt;check)</div><div class='del'>-				skb_shinfo(skb)-&gt;gso_type |=</div><div class='del'>-					SKB_GSO_UDP_TUNNEL_CSUM;</div><div class='del'>-			else</div><div class='del'>-				skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL;</div><div class='del'>-		}</div><div class='add'>+	inner_ip_off = BNXT_TPA_INNER_L3_OFF(hdr_info);</div><div class='add'>+	inner_mac_off = BNXT_TPA_INNER_L2_OFF(hdr_info);</div><div class='add'>+	outer_ip_off = BNXT_TPA_OUTER_L3_OFF(hdr_info);</div><div class='add'>+</div><div class='add'>+	nw_off = inner_ip_off - ETH_HLEN;</div><div class='add'>+	skb_set_network_header(skb, nw_off);</div><div class='add'>+	iphdr_len = (tpa_info-&gt;flags2 &amp; RX_TPA_START_CMP_FLAGS2_IP_TYPE) ?</div><div class='add'>+		     sizeof(struct ipv6hdr) : sizeof(struct iphdr);</div><div class='add'>+	skb_set_transport_header(skb, nw_off + iphdr_len);</div><div class='add'>+</div><div class='add'>+	if (inner_mac_off) { /* tunnel */</div><div class='add'>+		__be16 proto = *((__be16 *)(skb-&gt;data + outer_ip_off -</div><div class='add'>+					    ETH_HLEN - 2));</div><div class='add'>+</div><div class='add'>+		bnxt_gro_tunnel(skb, proto);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	return skb;</div><div class='hunk'>@@ -1324,28 +1784,8 @@ static struct sk_buff *bnxt_gro_func_5730x(struct bnxt_tpa_info *tpa_info,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (nw_off) { /* tunnel */</div><div class='del'>-		struct udphdr *uh = NULL;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='del'>-			struct iphdr *iph = (struct iphdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (iph-&gt;protocol == IPPROTO_UDP)</div><div class='del'>-				uh = (struct udphdr *)(iph + 1);</div><div class='del'>-		} else {</div><div class='del'>-			struct ipv6hdr *iph = (struct ipv6hdr *)skb-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (iph-&gt;nexthdr == IPPROTO_UDP)</div><div class='del'>-				uh = (struct udphdr *)(iph + 1);</div><div class='del'>-		}</div><div class='del'>-		if (uh) {</div><div class='del'>-			if (uh-&gt;check)</div><div class='del'>-				skb_shinfo(skb)-&gt;gso_type |=</div><div class='del'>-					SKB_GSO_UDP_TUNNEL_CSUM;</div><div class='del'>-			else</div><div class='del'>-				skb_shinfo(skb)-&gt;gso_type |= SKB_GSO_UDP_TUNNEL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (nw_off) /* tunnel */</div><div class='add'>+		bnxt_gro_tunnel(skb, skb-&gt;protocol);</div><div class='ctx'> #endif</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='hunk'>@@ -1368,9 +1808,10 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt *bp,</div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_size =</div><div class='ctx'> 		le32_to_cpu(tpa_end1-&gt;rx_tpa_end_cmp_seg_len);</div><div class='ctx'> 	skb_shinfo(skb)-&gt;gso_type = tpa_info-&gt;gso_type;</div><div class='del'>-	payload_off = (le32_to_cpu(tpa_end-&gt;rx_tpa_end_cmp_misc_v1) &amp;</div><div class='del'>-		       RX_TPA_END_CMP_PAYLOAD_OFFSET) &gt;&gt;</div><div class='del'>-		      RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		payload_off = TPA_END_PAYLOAD_OFF_P5(tpa_end1);</div><div class='add'>+	else</div><div class='add'>+		payload_off = TPA_END_PAYLOAD_OFF(tpa_end);</div><div class='ctx'> 	skb = bp-&gt;gro_func(tpa_info, payload_off, TPA_END_GRO_TS(tpa_end), skb);</div><div class='ctx'> 	if (likely(skb))</div><div class='ctx'> 		tcp_gro_complete(skb);</div><div class='hunk'>@@ -1385,7 +1826,7 @@ static struct net_device *bnxt_get_pkt_dev(struct bnxt *bp, u16 cfa_code)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = bnxt_get_vf_rep(bp, cfa_code);</div><div class='ctx'> </div><div class='del'>-	/* if vf-rep dev is NULL, the must belongs to the PF */</div><div class='add'>+	/* if vf-rep dev is NULL, it must belong to the PF */</div><div class='ctx'> 	return dev ? dev : bp-&gt;dev;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1398,14 +1839,15 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_napi *bnapi = cpr-&gt;bnapi;</div><div class='ctx'> 	struct bnxt_rx_ring_info *rxr = bnapi-&gt;rx_ring;</div><div class='del'>-	u8 agg_id = TPA_END_AGG_ID(tpa_end);</div><div class='add'>+	struct net_device *dev = bp-&gt;dev;</div><div class='ctx'> 	u8 *data_ptr, agg_bufs;</div><div class='del'>-	u16 cp_cons = RING_CMP(*raw_cons);</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	struct bnxt_tpa_info *tpa_info;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	u16 idx = 0, agg_id;</div><div class='ctx'> 	void *data;</div><div class='add'>+	bool gro;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(bnapi-&gt;in_reset)) {</div><div class='ctx'> 		int rc = bnxt_discard_rx(bp, cpr, raw_cons, tpa_end);</div><div class='hunk'>@@ -1415,45 +1857,65 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		agg_id = TPA_END_AGG_ID_P5(tpa_end);</div><div class='add'>+		agg_id = bnxt_lookup_agg_idx(rxr, agg_id);</div><div class='add'>+		agg_bufs = TPA_END_AGG_BUFS_P5(tpa_end1);</div><div class='add'>+		tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='add'>+		if (unlikely(agg_bufs != tpa_info-&gt;agg_count)) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "TPA end agg_buf %d != expected agg_bufs %d\n",</div><div class='add'>+				    agg_bufs, tpa_info-&gt;agg_count);</div><div class='add'>+			agg_bufs = tpa_info-&gt;agg_count;</div><div class='add'>+		}</div><div class='add'>+		tpa_info-&gt;agg_count = 0;</div><div class='add'>+		*event |= BNXT_AGG_EVENT;</div><div class='add'>+		bnxt_free_agg_idx(rxr, agg_id);</div><div class='add'>+		idx = agg_id;</div><div class='add'>+		gro = !!(bp-&gt;flags &amp; BNXT_FLAG_GRO);</div><div class='add'>+	} else {</div><div class='add'>+		agg_id = TPA_END_AGG_ID(tpa_end);</div><div class='add'>+		agg_bufs = TPA_END_AGG_BUFS(tpa_end);</div><div class='add'>+		tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='add'>+		idx = RING_CMP(*raw_cons);</div><div class='add'>+		if (agg_bufs) {</div><div class='add'>+			if (!bnxt_agg_bufs_valid(bp, cpr, agg_bufs, raw_cons))</div><div class='add'>+				return ERR_PTR(-EBUSY);</div><div class='add'>+</div><div class='add'>+			*event |= BNXT_AGG_EVENT;</div><div class='add'>+			idx = NEXT_CMP(idx);</div><div class='add'>+		}</div><div class='add'>+		gro = !!TPA_END_GRO(tpa_end);</div><div class='add'>+	}</div><div class='ctx'> 	data = tpa_info-&gt;data;</div><div class='ctx'> 	data_ptr = tpa_info-&gt;data_ptr;</div><div class='ctx'> 	prefetch(data_ptr);</div><div class='ctx'> 	len = tpa_info-&gt;len;</div><div class='ctx'> 	mapping = tpa_info-&gt;mapping;</div><div class='ctx'> </div><div class='del'>-	agg_bufs = (le32_to_cpu(tpa_end-&gt;rx_tpa_end_cmp_misc_v1) &amp;</div><div class='del'>-		    RX_TPA_END_CMP_AGG_BUFS) &gt;&gt; RX_TPA_END_CMP_AGG_BUFS_SHIFT;</div><div class='del'>-</div><div class='del'>-	if (agg_bufs) {</div><div class='del'>-		if (!bnxt_agg_bufs_valid(bp, cpr, agg_bufs, raw_cons))</div><div class='del'>-			return ERR_PTR(-EBUSY);</div><div class='del'>-</div><div class='del'>-		*event |= BNXT_AGG_EVENT;</div><div class='del'>-		cp_cons = NEXT_CMP(cp_cons);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (unlikely(agg_bufs &gt; MAX_SKB_FRAGS || TPA_END_ERRORS(tpa_end1))) {</div><div class='del'>-		bnxt_abort_tpa(cpr, cp_cons, agg_bufs);</div><div class='add'>+		bnxt_abort_tpa(cpr, idx, agg_bufs);</div><div class='ctx'> 		if (agg_bufs &gt; MAX_SKB_FRAGS)</div><div class='ctx'> 			netdev_warn(bp-&gt;dev, "TPA frags %d exceeded MAX_SKB_FRAGS %d\n",</div><div class='ctx'> 				    agg_bufs, (int)MAX_SKB_FRAGS);</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (len &lt;= bp-&gt;rx_copy_thresh) {</div><div class='add'>+	if (len &lt;= bp-&gt;rx_copybreak) {</div><div class='ctx'> 		skb = bnxt_copy_skb(bnapi, data_ptr, len, mapping);</div><div class='ctx'> 		if (!skb) {</div><div class='del'>-			bnxt_abort_tpa(cpr, cp_cons, agg_bufs);</div><div class='add'>+			bnxt_abort_tpa(cpr, idx, agg_bufs);</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_oom_discards += 1;</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u8 *new_data;</div><div class='ctx'> 		dma_addr_t new_mapping;</div><div class='ctx'> </div><div class='del'>-		new_data = __bnxt_alloc_rx_data(bp, &amp;new_mapping, GFP_ATOMIC);</div><div class='add'>+		new_data = __bnxt_alloc_rx_frag(bp, &amp;new_mapping, rxr,</div><div class='add'>+						GFP_ATOMIC);</div><div class='ctx'> 		if (!new_data) {</div><div class='del'>-			bnxt_abort_tpa(cpr, cp_cons, agg_bufs);</div><div class='add'>+			bnxt_abort_tpa(cpr, idx, agg_bufs);</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_oom_discards += 1;</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1461,41 +1923,50 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,</div><div class='ctx'> 		tpa_info-&gt;data_ptr = new_data + bp-&gt;rx_offset;</div><div class='ctx'> 		tpa_info-&gt;mapping = new_mapping;</div><div class='ctx'> </div><div class='del'>-		skb = build_skb(data, 0);</div><div class='del'>-		dma_unmap_single_attrs(&amp;bp-&gt;pdev-&gt;dev, mapping,</div><div class='del'>-				       bp-&gt;rx_buf_use_size, bp-&gt;rx_dir,</div><div class='del'>-				       DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+		skb = napi_build_skb(data, bp-&gt;rx_buf_size);</div><div class='add'>+		dma_sync_single_for_cpu(&amp;bp-&gt;pdev-&gt;dev, mapping,</div><div class='add'>+					bp-&gt;rx_buf_use_size, bp-&gt;rx_dir);</div><div class='ctx'> </div><div class='ctx'> 		if (!skb) {</div><div class='del'>-			kfree(data);</div><div class='del'>-			bnxt_abort_tpa(cpr, cp_cons, agg_bufs);</div><div class='add'>+			page_pool_free_va(rxr-&gt;head_pool, data, true);</div><div class='add'>+			bnxt_abort_tpa(cpr, idx, agg_bufs);</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_oom_discards += 1;</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='ctx'> 		skb_reserve(skb, bp-&gt;rx_offset);</div><div class='ctx'> 		skb_put(skb, len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (agg_bufs) {</div><div class='del'>-		skb = bnxt_rx_pages(bp, cpr, skb, cp_cons, agg_bufs);</div><div class='add'>+		skb = bnxt_rx_agg_netmems_skb(bp, cpr, skb, idx, agg_bufs,</div><div class='add'>+					      true);</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			/* Page reuse already handled by bnxt_rx_pages(). */</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_oom_discards += 1;</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	skb-&gt;protocol =</div><div class='del'>-		eth_type_trans(skb, bnxt_get_pkt_dev(bp, tpa_info-&gt;cfa_code));</div><div class='add'>+	if (tpa_info-&gt;cfa_code_valid)</div><div class='add'>+		dev = bnxt_get_pkt_dev(bp, tpa_info-&gt;cfa_code);</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> </div><div class='ctx'> 	if (tpa_info-&gt;hash_type != PKT_HASH_TYPE_NONE)</div><div class='ctx'> 		skb_set_hash(skb, tpa_info-&gt;rss_hash, tpa_info-&gt;hash_type);</div><div class='ctx'> </div><div class='del'>-	if ((tpa_info-&gt;flags2 &amp; RX_CMP_FLAGS2_META_FORMAT_VLAN) &amp;&amp;</div><div class='del'>-	    (skb-&gt;dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX)) {</div><div class='del'>-		u16 vlan_proto = tpa_info-&gt;metadata &gt;&gt;</div><div class='del'>-			RX_CMP_FLAGS2_METADATA_TPID_SFT;</div><div class='add'>+	if (tpa_info-&gt;vlan_valid &amp;&amp;</div><div class='add'>+	    (dev-&gt;features &amp; BNXT_HW_FEATURE_VLAN_ALL_RX)) {</div><div class='add'>+		__be16 vlan_proto = htons(tpa_info-&gt;metadata &gt;&gt;</div><div class='add'>+					  RX_CMP_FLAGS2_METADATA_TPID_SFT);</div><div class='ctx'> 		u16 vtag = tpa_info-&gt;metadata &amp; RX_CMP_FLAGS2_METADATA_TCI_MASK;</div><div class='ctx'> </div><div class='del'>-		__vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);</div><div class='add'>+		if (eth_type_vlan(vlan_proto)) {</div><div class='add'>+			__vlan_hwaccel_put_tag(skb, vlan_proto, vtag);</div><div class='add'>+		} else {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_checksum_none_assert(skb);</div><div class='hunk'>@@ -1505,15 +1976,29 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,</div><div class='ctx'> 			(tpa_info-&gt;flags2 &amp; RX_CMP_FLAGS2_T_L4_CS_CALC) &gt;&gt; 3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (TPA_END_GRO(tpa_end))</div><div class='add'>+	if (gro)</div><div class='ctx'> 		skb = bnxt_gro_skb(bp, tpa_info, tpa_end, tpa_end1, skb);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_tpa_agg(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='add'>+			 struct rx_agg_cmp *rx_agg)</div><div class='add'>+{</div><div class='add'>+	u16 agg_id = TPA_AGG_AGG_ID(rx_agg);</div><div class='add'>+	struct bnxt_tpa_info *tpa_info;</div><div class='add'>+</div><div class='add'>+	agg_id = bnxt_lookup_agg_idx(rxr, agg_id);</div><div class='add'>+	tpa_info = &amp;rxr-&gt;rx_tpa[agg_id];</div><div class='add'>+	BUG_ON(tpa_info-&gt;agg_count &gt;= MAX_SKB_FRAGS);</div><div class='add'>+	tpa_info-&gt;agg_arr[tpa_info-&gt;agg_count++] = *rx_agg;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_deliver_skb(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='ctx'> 			     struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	skb_mark_for_recycle(skb);</div><div class='add'>+</div><div class='ctx'> 	if (skb-&gt;dev != bp-&gt;dev) {</div><div class='ctx'> 		/* this packet belongs to a vf-rep */</div><div class='ctx'> 		bnxt_vf_rep_rx(bp, skb);</div><div class='hunk'>@@ -1523,6 +2008,80 @@ static void bnxt_deliver_skb(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='ctx'> 	napi_gro_receive(&amp;bnapi-&gt;napi, skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool bnxt_rx_ts_valid(struct bnxt *bp, u32 flags,</div><div class='add'>+			     struct rx_cmp_ext *rxcmp1, u32 *cmpl_ts)</div><div class='add'>+{</div><div class='add'>+	u32 ts = le32_to_cpu(rxcmp1-&gt;rx_cmp_timestamp);</div><div class='add'>+</div><div class='add'>+	if (BNXT_PTP_RX_TS_VALID(flags))</div><div class='add'>+		goto ts_valid;</div><div class='add'>+	if (!bp-&gt;ptp_all_rx_tstamp || !ts || !BNXT_ALL_RX_TS_VALID(flags))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+ts_valid:</div><div class='add'>+	*cmpl_ts = ts;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *bnxt_rx_vlan(struct sk_buff *skb, u8 cmp_type,</div><div class='add'>+				    struct rx_cmp *rxcmp,</div><div class='add'>+				    struct rx_cmp_ext *rxcmp1)</div><div class='add'>+{</div><div class='add'>+	__be16 vlan_proto;</div><div class='add'>+	u16 vtag;</div><div class='add'>+</div><div class='add'>+	if (cmp_type == CMP_TYPE_RX_L2_CMP) {</div><div class='add'>+		__le32 flags2 = rxcmp1-&gt;rx_cmp_flags2;</div><div class='add'>+		u32 meta_data;</div><div class='add'>+</div><div class='add'>+		if (!(flags2 &amp; cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)))</div><div class='add'>+			return skb;</div><div class='add'>+</div><div class='add'>+		meta_data = le32_to_cpu(rxcmp1-&gt;rx_cmp_meta_data);</div><div class='add'>+		vtag = meta_data &amp; RX_CMP_FLAGS2_METADATA_TCI_MASK;</div><div class='add'>+		vlan_proto = htons(meta_data &gt;&gt; RX_CMP_FLAGS2_METADATA_TPID_SFT);</div><div class='add'>+		if (eth_type_vlan(vlan_proto))</div><div class='add'>+			__vlan_hwaccel_put_tag(skb, vlan_proto, vtag);</div><div class='add'>+		else</div><div class='add'>+			goto vlan_err;</div><div class='add'>+	} else if (cmp_type == CMP_TYPE_RX_L2_V3_CMP) {</div><div class='add'>+		if (RX_CMP_VLAN_VALID(rxcmp)) {</div><div class='add'>+			u32 tpid_sel = RX_CMP_VLAN_TPID_SEL(rxcmp);</div><div class='add'>+</div><div class='add'>+			if (tpid_sel == RX_CMP_METADATA1_TPID_8021Q)</div><div class='add'>+				vlan_proto = htons(ETH_P_8021Q);</div><div class='add'>+			else if (tpid_sel == RX_CMP_METADATA1_TPID_8021AD)</div><div class='add'>+				vlan_proto = htons(ETH_P_8021AD);</div><div class='add'>+			else</div><div class='add'>+				goto vlan_err;</div><div class='add'>+			vtag = RX_CMP_METADATA0_TCI(rxcmp1);</div><div class='add'>+			__vlan_hwaccel_put_tag(skb, vlan_proto, vtag);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+vlan_err:</div><div class='add'>+	skb_mark_for_recycle(skb);</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum pkt_hash_types bnxt_rss_ext_op(struct bnxt *bp,</div><div class='add'>+					   struct rx_cmp *rxcmp)</div><div class='add'>+{</div><div class='add'>+	u8 ext_op;</div><div class='add'>+</div><div class='add'>+	ext_op = RX_CMP_V3_HASH_TYPE(bp, rxcmp);</div><div class='add'>+	switch (ext_op) {</div><div class='add'>+	case EXT_OP_INNER_4:</div><div class='add'>+	case EXT_OP_OUTER_4:</div><div class='add'>+	case EXT_OP_INNFL_3:</div><div class='add'>+	case EXT_OP_OUTFL_3:</div><div class='add'>+		return PKT_HASH_TYPE_L4;</div><div class='add'>+	default:</div><div class='add'>+		return PKT_HASH_TYPE_L3;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* returns the following:</div><div class='ctx'>  * 1       - 1 packet successfully received</div><div class='ctx'>  * 0       - successful TPA_START, packet not completed yet</div><div class='hunk'>@@ -1539,19 +2098,30 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	struct rx_cmp *rxcmp;</div><div class='ctx'> 	struct rx_cmp_ext *rxcmp1;</div><div class='ctx'> 	u32 tmp_raw_cons = *raw_cons;</div><div class='del'>-	u16 cfa_code, cons, prod, cp_cons = RING_CMP(tmp_raw_cons);</div><div class='add'>+	u16 cons, prod, cp_cons = RING_CMP(tmp_raw_cons);</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='ctx'> 	struct bnxt_sw_rx_bd *rx_buf;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	u8 *data_ptr, agg_bufs, cmp_type;</div><div class='add'>+	bool xdp_active = false;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='add'>+	struct xdp_buff xdp;</div><div class='add'>+	u32 flags, misc;</div><div class='add'>+	u32 cmpl_ts;</div><div class='ctx'> 	void *data;</div><div class='ctx'> 	int rc = 0;</div><div class='del'>-	u32 misc;</div><div class='ctx'> </div><div class='ctx'> 	rxcmp = (struct rx_cmp *)</div><div class='ctx'> 			&amp;cpr-&gt;cp_desc_ring[CP_RING(cp_cons)][CP_IDX(cp_cons)];</div><div class='ctx'> </div><div class='add'>+	cmp_type = RX_CMP_TYPE(rxcmp);</div><div class='add'>+</div><div class='add'>+	if (cmp_type == CMP_TYPE_RX_TPA_AGG_CMP) {</div><div class='add'>+		bnxt_tpa_agg(bp, rxr, (struct rx_agg_cmp *)rxcmp);</div><div class='add'>+		goto next_rx_no_prod_no_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	tmp_raw_cons = NEXT_RAW_CMP(tmp_raw_cons);</div><div class='ctx'> 	cp_cons = RING_CMP(tmp_raw_cons);</div><div class='ctx'> 	rxcmp1 = (struct rx_cmp_ext *)</div><div class='hunk'>@@ -1560,12 +2130,16 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	if (!RX_CMP_VALID(rxcmp1, tmp_raw_cons))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	cmp_type = RX_CMP_TYPE(rxcmp);</div><div class='del'>-</div><div class='add'>+	/* The valid test of the entry must be done first before</div><div class='add'>+	 * reading any further.</div><div class='add'>+	 */</div><div class='add'>+	dma_rmb();</div><div class='ctx'> 	prod = rxr-&gt;rx_prod;</div><div class='ctx'> </div><div class='del'>-	if (cmp_type == CMP_TYPE_RX_L2_TPA_START_CMP) {</div><div class='del'>-		bnxt_tpa_start(bp, rxr, (struct rx_tpa_start_cmp *)rxcmp,</div><div class='add'>+	if (cmp_type == CMP_TYPE_RX_L2_TPA_START_CMP ||</div><div class='add'>+	    cmp_type == CMP_TYPE_RX_L2_TPA_START_V3_CMP) {</div><div class='add'>+		bnxt_tpa_start(bp, rxr, cmp_type,</div><div class='add'>+			       (struct rx_tpa_start_cmp *)rxcmp,</div><div class='ctx'> 			       (struct rx_tpa_start_cmp_ext *)rxcmp1);</div><div class='ctx'> </div><div class='ctx'> 		*event |= BNXT_RX_EVENT;</div><div class='hunk'>@@ -1590,12 +2164,16 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> </div><div class='ctx'> 	cons = rxcmp-&gt;rx_cmp_opaque;</div><div class='ctx'> 	if (unlikely(cons != rxr-&gt;rx_next_cons)) {</div><div class='del'>-		int rc1 = bnxt_discard_rx(bp, cpr, raw_cons, rxcmp);</div><div class='del'>-</div><div class='del'>-		netdev_warn(bp-&gt;dev, "RX cons %x != expected cons %x\n",</div><div class='del'>-			    cons, rxr-&gt;rx_next_cons);</div><div class='del'>-		bnxt_sched_reset(bp, rxr);</div><div class='del'>-		return rc1;</div><div class='add'>+		int rc1 = bnxt_discard_rx(bp, cpr, &amp;tmp_raw_cons, rxcmp);</div><div class='add'>+</div><div class='add'>+		/* 0xffff is forced error, don't print it */</div><div class='add'>+		if (rxr-&gt;rx_next_cons != 0xffff)</div><div class='add'>+			netdev_warn(bp-&gt;dev, "RX cons %x != expected cons %x\n",</div><div class='add'>+				    cons, rxr-&gt;rx_next_cons);</div><div class='add'>+		bnxt_sched_reset_rxr(bp, rxr);</div><div class='add'>+		if (rc1)</div><div class='add'>+			return rc1;</div><div class='add'>+		goto next_rx_no_prod_no_len;</div><div class='ctx'> 	}</div><div class='ctx'> 	rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='ctx'> 	data = rx_buf-&gt;data;</div><div class='hunk'>@@ -1620,32 +2198,68 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> </div><div class='ctx'> 		bnxt_reuse_rx_data(rxr, cons, data);</div><div class='ctx'> 		if (agg_bufs)</div><div class='del'>-			bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);</div><div class='add'>+			bnxt_reuse_rx_agg_bufs(cpr, cp_cons, 0, agg_bufs,</div><div class='add'>+					       false);</div><div class='ctx'> </div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		if (rx_err &amp; RX_CMPL_ERRORS_BUFFER_ERROR_MASK) {</div><div class='del'>-			netdev_warn(bp-&gt;dev, "RX buffer error %x\n", rx_err);</div><div class='del'>-			bnxt_sched_reset(bp, rxr);</div><div class='add'>+			bnapi-&gt;cp_ring.sw_stats-&gt;rx.rx_buf_errors++;</div><div class='add'>+			if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='add'>+			    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_RING_MONITOR)) {</div><div class='add'>+				netdev_warn_once(bp-&gt;dev, "RX buffer error %x\n",</div><div class='add'>+						 rx_err);</div><div class='add'>+				bnxt_sched_reset_rxr(bp, rxr);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 		goto next_rx_no_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	len = le32_to_cpu(rxcmp-&gt;rx_cmp_len_flags_type) &gt;&gt; RX_CMP_LEN_SHIFT;</div><div class='add'>+	flags = le32_to_cpu(rxcmp-&gt;rx_cmp_len_flags_type);</div><div class='add'>+	len = flags &gt;&gt; RX_CMP_LEN_SHIFT;</div><div class='ctx'> 	dma_addr = rx_buf-&gt;mapping;</div><div class='ctx'> </div><div class='del'>-	if (bnxt_rx_xdp(bp, rxr, cons, data, &amp;data_ptr, &amp;len, event)) {</div><div class='del'>-		rc = 1;</div><div class='del'>-		goto next_rx;</div><div class='add'>+	if (bnxt_xdp_attached(bp, rxr)) {</div><div class='add'>+		bnxt_xdp_buff_init(bp, rxr, cons, data_ptr, len, &amp;xdp);</div><div class='add'>+		if (agg_bufs) {</div><div class='add'>+			u32 frag_len = bnxt_rx_agg_netmems_xdp(bp, cpr, &amp;xdp,</div><div class='add'>+							       cp_cons,</div><div class='add'>+							       agg_bufs,</div><div class='add'>+							       false);</div><div class='add'>+			if (!frag_len)</div><div class='add'>+				goto oom_next_rx;</div><div class='add'>+</div><div class='add'>+		}</div><div class='add'>+		xdp_active = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (len &lt;= bp-&gt;rx_copy_thresh) {</div><div class='del'>-		skb = bnxt_copy_skb(bnapi, data_ptr, len, dma_addr);</div><div class='add'>+	if (xdp_active) {</div><div class='add'>+		if (bnxt_rx_xdp(bp, rxr, cons, &amp;xdp, data, &amp;data_ptr, &amp;len, event)) {</div><div class='add'>+			rc = 1;</div><div class='add'>+			goto next_rx;</div><div class='add'>+		}</div><div class='add'>+		if (xdp_buff_has_frags(&amp;xdp)) {</div><div class='add'>+			sinfo = xdp_get_shared_info_from_buff(&amp;xdp);</div><div class='add'>+			agg_bufs = sinfo-&gt;nr_frags;</div><div class='add'>+		} else {</div><div class='add'>+			agg_bufs = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (len &lt;= bp-&gt;rx_copybreak) {</div><div class='add'>+		if (!xdp_active)</div><div class='add'>+			skb = bnxt_copy_skb(bnapi, data_ptr, len, dma_addr);</div><div class='add'>+		else</div><div class='add'>+			skb = bnxt_copy_xdp(bnapi, &amp;xdp, len, dma_addr);</div><div class='ctx'> 		bnxt_reuse_rx_data(rxr, cons, data);</div><div class='ctx'> 		if (!skb) {</div><div class='del'>-			if (agg_bufs)</div><div class='del'>-				bnxt_reuse_rx_agg_bufs(cpr, cp_cons, agg_bufs);</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto next_rx;</div><div class='add'>+			if (agg_bufs) {</div><div class='add'>+				if (!xdp_active)</div><div class='add'>+					bnxt_reuse_rx_agg_bufs(cpr, cp_cons, 0,</div><div class='add'>+							       agg_bufs, false);</div><div class='add'>+				else</div><div class='add'>+					bnxt_xdp_buff_frags_free(rxr, &amp;xdp);</div><div class='add'>+			}</div><div class='add'>+			goto oom_next_rx;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		u32 payload;</div><div class='hunk'>@@ -1656,41 +2270,52 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 			payload = 0;</div><div class='ctx'> 		skb = bp-&gt;rx_skb_func(bp, rxr, cons, data, data_ptr, dma_addr,</div><div class='ctx'> 				      payload | len);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto next_rx;</div><div class='del'>-		}</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto oom_next_rx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (agg_bufs) {</div><div class='del'>-		skb = bnxt_rx_pages(bp, cpr, skb, cp_cons, agg_bufs);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto next_rx;</div><div class='add'>+		if (!xdp_active) {</div><div class='add'>+			skb = bnxt_rx_agg_netmems_skb(bp, cpr, skb, cp_cons,</div><div class='add'>+						      agg_bufs, false);</div><div class='add'>+			if (!skb)</div><div class='add'>+				goto oom_next_rx;</div><div class='add'>+		} else {</div><div class='add'>+			skb = bnxt_xdp_build_skb(bp, skb, agg_bufs,</div><div class='add'>+						 rxr-&gt;page_pool, &amp;xdp);</div><div class='add'>+			if (!skb) {</div><div class='add'>+				/* we should be able to free the old skb here */</div><div class='add'>+				bnxt_xdp_buff_frags_free(rxr, &amp;xdp);</div><div class='add'>+				goto oom_next_rx;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (RX_CMP_HASH_VALID(rxcmp)) {</div><div class='del'>-		u32 hash_type = RX_CMP_HASH_TYPE(rxcmp);</div><div class='del'>-		enum pkt_hash_types type = PKT_HASH_TYPE_L4;</div><div class='add'>+		enum pkt_hash_types type;</div><div class='ctx'> </div><div class='del'>-		/* RSS profiles 1 and 3 with extract code 0 for inner 4-tuple */</div><div class='del'>-		if (hash_type != 1 &amp;&amp; hash_type != 3)</div><div class='del'>-			type = PKT_HASH_TYPE_L3;</div><div class='add'>+		if (cmp_type == CMP_TYPE_RX_L2_V3_CMP) {</div><div class='add'>+			type = bnxt_rss_ext_op(bp, rxcmp);</div><div class='add'>+		} else {</div><div class='add'>+			u32 itypes = RX_CMP_ITYPES(rxcmp);</div><div class='add'>+</div><div class='add'>+			if (itypes == RX_CMP_FLAGS_ITYPE_TCP ||</div><div class='add'>+			    itypes == RX_CMP_FLAGS_ITYPE_UDP)</div><div class='add'>+				type = PKT_HASH_TYPE_L4;</div><div class='add'>+			else</div><div class='add'>+				type = PKT_HASH_TYPE_L3;</div><div class='add'>+		}</div><div class='ctx'> 		skb_set_hash(skb, le32_to_cpu(rxcmp-&gt;rx_cmp_rss_hash), type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cfa_code = RX_CMP_CFA_CODE(rxcmp1);</div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, bnxt_get_pkt_dev(bp, cfa_code));</div><div class='del'>-</div><div class='del'>-	if ((rxcmp1-&gt;rx_cmp_flags2 &amp;</div><div class='del'>-	     cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)) &amp;&amp;</div><div class='del'>-	    (skb-&gt;dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX)) {</div><div class='del'>-		u32 meta_data = le32_to_cpu(rxcmp1-&gt;rx_cmp_meta_data);</div><div class='del'>-		u16 vtag = meta_data &amp; RX_CMP_FLAGS2_METADATA_TCI_MASK;</div><div class='del'>-		u16 vlan_proto = meta_data &gt;&gt; RX_CMP_FLAGS2_METADATA_TPID_SFT;</div><div class='add'>+	if (cmp_type == CMP_TYPE_RX_L2_CMP)</div><div class='add'>+		dev = bnxt_get_pkt_dev(bp, RX_CMP_CFA_CODE(rxcmp1));</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, dev);</div><div class='ctx'> </div><div class='del'>-		__vlan_hwaccel_put_tag(skb, htons(vlan_proto), vtag);</div><div class='add'>+	if (skb-&gt;dev-&gt;features &amp; BNXT_HW_FEATURE_VLAN_ALL_RX) {</div><div class='add'>+		skb = bnxt_rx_vlan(skb, cmp_type, rxcmp, rxcmp1);</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto next_rx;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_checksum_none_assert(skb);</div><div class='hunk'>@@ -1702,10 +2327,24 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (rxcmp1-&gt;rx_cmp_cfa_code_errors_v2 &amp; RX_CMP_L4_CS_ERR_BITS) {</div><div class='ctx'> 			if (dev-&gt;features &amp; NETIF_F_RXCSUM)</div><div class='del'>-				bnapi-&gt;cp_ring.rx_l4_csum_errors++;</div><div class='add'>+				bnapi-&gt;cp_ring.sw_stats-&gt;rx.rx_l4_csum_errors++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (bnxt_rx_ts_valid(bp, flags, rxcmp1, &amp;cmpl_ts)) {</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+			u64 ns, ts;</div><div class='add'>+</div><div class='add'>+			if (!bnxt_get_rx_ts_p5(bp, &amp;ts, cmpl_ts)) {</div><div class='add'>+				struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+				ns = bnxt_timecounter_cyc2time(ptp, ts);</div><div class='add'>+				memset(skb_hwtstamps(skb), 0,</div><div class='add'>+				       sizeof(*skb_hwtstamps(skb)));</div><div class='add'>+				skb_hwtstamps(skb)-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	bnxt_deliver_skb(bp, bnapi, skb);</div><div class='ctx'> 	rc = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1715,12 +2354,17 @@ next_rx:</div><div class='ctx'> </div><div class='ctx'> next_rx_no_len:</div><div class='ctx'> 	rxr-&gt;rx_prod = NEXT_RX(prod);</div><div class='del'>-	rxr-&gt;rx_next_cons = NEXT_RX(cons);</div><div class='add'>+	rxr-&gt;rx_next_cons = RING_RX(bp, NEXT_RX(cons));</div><div class='ctx'> </div><div class='ctx'> next_rx_no_prod_no_len:</div><div class='ctx'> 	*raw_cons = tmp_raw_cons;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='add'>+</div><div class='add'>+oom_next_rx:</div><div class='add'>+	cpr-&gt;sw_stats-&gt;rx.rx_oom_discards += 1;</div><div class='add'>+	rc = -ENOMEM;</div><div class='add'>+	goto next_rx;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* In netpoll mode, if we are using a combined completion ring, we need to</div><div class='hunk'>@@ -1735,6 +2379,7 @@ static int bnxt_force_rx_discard(struct bnxt *bp,</div><div class='ctx'> 	struct rx_cmp *rxcmp;</div><div class='ctx'> 	u16 cp_cons;</div><div class='ctx'> 	u8 cmp_type;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	cp_cons = RING_CMP(tmp_raw_cons);</div><div class='ctx'> 	rxcmp = (struct rx_cmp *)</div><div class='hunk'>@@ -1748,8 +2393,13 @@ static int bnxt_force_rx_discard(struct bnxt *bp,</div><div class='ctx'> 	if (!RX_CMP_VALID(rxcmp1, tmp_raw_cons))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='add'>+	/* The valid test of the entry must be done first before</div><div class='add'>+	 * reading any further.</div><div class='add'>+	 */</div><div class='add'>+	dma_rmb();</div><div class='ctx'> 	cmp_type = RX_CMP_TYPE(rxcmp);</div><div class='del'>-	if (cmp_type == CMP_TYPE_RX_L2_CMP) {</div><div class='add'>+	if (cmp_type == CMP_TYPE_RX_L2_CMP ||</div><div class='add'>+	    cmp_type == CMP_TYPE_RX_L2_V3_CMP) {</div><div class='ctx'> 		rxcmp1-&gt;rx_cmp_cfa_code_errors_v2 |=</div><div class='ctx'> 			cpu_to_le32(RX_CMPL_ERRORS_CRC_ERROR);</div><div class='ctx'> 	} else if (cmp_type == CMP_TYPE_RX_L2_TPA_END_CMP) {</div><div class='hunk'>@@ -1759,22 +2409,316 @@ static int bnxt_force_rx_discard(struct bnxt *bp,</div><div class='ctx'> 		tpa_end1-&gt;rx_tpa_end_cmp_errors_v2 |=</div><div class='ctx'> 			cpu_to_le32(RX_TPA_END_CMP_ERRORS);</div><div class='ctx'> 	}</div><div class='del'>-	return bnxt_rx_pkt(bp, cpr, raw_cons, event);</div><div class='add'>+	rc = bnxt_rx_pkt(bp, cpr, raw_cons, event);</div><div class='add'>+	if (rc &amp;&amp; rc != -EBUSY)</div><div class='add'>+		cpr-&gt;sw_stats-&gt;rx.rx_netpoll_discards += 1;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 bnxt_fw_health_readl(struct bnxt *bp, int reg_idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	u32 reg = fw_health-&gt;regs[reg_idx];</div><div class='add'>+	u32 reg_type, reg_off, val = 0;</div><div class='add'>+</div><div class='add'>+	reg_type = BNXT_FW_HEALTH_REG_TYPE(reg);</div><div class='add'>+	reg_off = BNXT_FW_HEALTH_REG_OFF(reg);</div><div class='add'>+	switch (reg_type) {</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_CFG:</div><div class='add'>+		pci_read_config_dword(bp-&gt;pdev, reg_off, &amp;val);</div><div class='add'>+		break;</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_GRC:</div><div class='add'>+		reg_off = fw_health-&gt;mapped_regs[reg_idx];</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_BAR0:</div><div class='add'>+		val = readl(bp-&gt;bar0 + reg_off);</div><div class='add'>+		break;</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_BAR1:</div><div class='add'>+		val = readl(bp-&gt;bar1 + reg_off);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (reg_idx == BNXT_FW_RESET_INPROG_REG)</div><div class='add'>+		val &amp;= fw_health-&gt;fw_reset_inprog_reg_mask;</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnxt_agg_ring_id_to_grp_idx(struct bnxt *bp, u16 ring_id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='add'>+		u16 grp_idx = bp-&gt;rx_ring[i].bnapi-&gt;index;</div><div class='add'>+		struct bnxt_ring_grp_info *grp_info;</div><div class='add'>+</div><div class='add'>+		grp_info = &amp;bp-&gt;grp_info[grp_idx];</div><div class='add'>+		if (grp_info-&gt;agg_fw_ring_id == ring_id)</div><div class='add'>+			return grp_idx;</div><div class='add'>+	}</div><div class='add'>+	return INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnxt_get_force_speed(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2)</div><div class='add'>+		return link_info-&gt;force_link_speed2;</div><div class='add'>+	if (link_info-&gt;req_signal_mode == BNXT_SIG_MODE_PAM4)</div><div class='add'>+		return link_info-&gt;force_pam4_link_speed;</div><div class='add'>+	return link_info-&gt;force_link_speed;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_force_speed(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		link_info-&gt;req_link_speed = link_info-&gt;force_link_speed2;</div><div class='add'>+		link_info-&gt;req_signal_mode = BNXT_SIG_MODE_NRZ;</div><div class='add'>+		switch (link_info-&gt;req_link_speed) {</div><div class='add'>+		case BNXT_LINK_SPEED_50GB_PAM4:</div><div class='add'>+		case BNXT_LINK_SPEED_100GB_PAM4:</div><div class='add'>+		case BNXT_LINK_SPEED_200GB_PAM4:</div><div class='add'>+		case BNXT_LINK_SPEED_400GB_PAM4:</div><div class='add'>+			link_info-&gt;req_signal_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+			break;</div><div class='add'>+		case BNXT_LINK_SPEED_100GB_PAM4_112:</div><div class='add'>+		case BNXT_LINK_SPEED_200GB_PAM4_112:</div><div class='add'>+		case BNXT_LINK_SPEED_400GB_PAM4_112:</div><div class='add'>+			link_info-&gt;req_signal_mode = BNXT_SIG_MODE_PAM4_112;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			link_info-&gt;req_signal_mode = BNXT_SIG_MODE_NRZ;</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	link_info-&gt;req_link_speed = link_info-&gt;force_link_speed;</div><div class='add'>+	link_info-&gt;req_signal_mode = BNXT_SIG_MODE_NRZ;</div><div class='add'>+	if (link_info-&gt;force_pam4_link_speed) {</div><div class='add'>+		link_info-&gt;req_link_speed = link_info-&gt;force_pam4_link_speed;</div><div class='add'>+		link_info-&gt;req_signal_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_auto_speed(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		link_info-&gt;advertising = link_info-&gt;auto_link_speeds2;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	link_info-&gt;advertising = link_info-&gt;auto_link_speeds;</div><div class='add'>+	link_info-&gt;advertising_pam4 = link_info-&gt;auto_pam4_link_speeds;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_force_speed_updated(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		if (link_info-&gt;req_link_speed != link_info-&gt;force_link_speed2)</div><div class='add'>+			return true;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (link_info-&gt;req_signal_mode == BNXT_SIG_MODE_NRZ &amp;&amp;</div><div class='add'>+	    link_info-&gt;req_link_speed != link_info-&gt;force_link_speed)</div><div class='add'>+		return true;</div><div class='add'>+	if (link_info-&gt;req_signal_mode == BNXT_SIG_MODE_PAM4 &amp;&amp;</div><div class='add'>+	    link_info-&gt;req_link_speed != link_info-&gt;force_pam4_link_speed)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_auto_speed_updated(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		if (link_info-&gt;advertising != link_info-&gt;auto_link_speeds2)</div><div class='add'>+			return true;</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (link_info-&gt;advertising != link_info-&gt;auto_link_speeds ||</div><div class='add'>+	    link_info-&gt;advertising_pam4 != link_info-&gt;auto_pam4_link_speeds)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bnxt_bs_trace_avail(struct bnxt *bp, u16 type)</div><div class='add'>+{</div><div class='add'>+	u32 flags = bp-&gt;ctx-&gt;ctx_arr[type].flags;</div><div class='add'>+</div><div class='add'>+	return (flags &amp; BNXT_CTX_MEM_TYPE_VALID) &amp;&amp;</div><div class='add'>+		((flags &amp; BNXT_CTX_MEM_FW_TRACE) ||</div><div class='add'>+		 (flags &amp; BNXT_CTX_MEM_FW_BIN_TRACE));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_bs_trace_init(struct bnxt *bp, struct bnxt_ctx_mem_type *ctxm)</div><div class='add'>+{</div><div class='add'>+	u32 mem_size, pages, rem_bytes, magic_byte_offset;</div><div class='add'>+	u16 trace_type = bnxt_bstore_to_trace[ctxm-&gt;type];</div><div class='add'>+	struct bnxt_ctx_pg_info *ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+	struct bnxt_ring_mem_info *rmem, *rmem_pg_tbl;</div><div class='add'>+	struct bnxt_bs_trace_info *bs_trace;</div><div class='add'>+	int last_pg;</div><div class='add'>+</div><div class='add'>+	if (ctxm-&gt;instance_bmap &amp;&amp; ctxm-&gt;instance_bmap &gt; 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mem_size = ctxm-&gt;max_entries * ctxm-&gt;entry_size;</div><div class='add'>+	rem_bytes = mem_size % BNXT_PAGE_SIZE;</div><div class='add'>+	pages = DIV_ROUND_UP(mem_size, BNXT_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	last_pg = (pages - 1) &amp; (MAX_CTX_PAGES - 1);</div><div class='add'>+	magic_byte_offset = (rem_bytes ? rem_bytes : BNXT_PAGE_SIZE) - 1;</div><div class='add'>+</div><div class='add'>+	rmem = &amp;ctx_pg[0].ring_mem;</div><div class='add'>+	bs_trace = &amp;bp-&gt;bs_trace[trace_type];</div><div class='add'>+	bs_trace-&gt;ctx_type = ctxm-&gt;type;</div><div class='add'>+	bs_trace-&gt;trace_type = trace_type;</div><div class='add'>+	if (pages &gt; MAX_CTX_PAGES) {</div><div class='add'>+		int last_pg_dir = rmem-&gt;nr_pages - 1;</div><div class='add'>+</div><div class='add'>+		rmem_pg_tbl = &amp;ctx_pg[0].ctx_pg_tbl[last_pg_dir]-&gt;ring_mem;</div><div class='add'>+		bs_trace-&gt;magic_byte = rmem_pg_tbl-&gt;pg_arr[last_pg];</div><div class='add'>+	} else {</div><div class='add'>+		bs_trace-&gt;magic_byte = rmem-&gt;pg_arr[last_pg];</div><div class='add'>+	}</div><div class='add'>+	bs_trace-&gt;magic_byte += magic_byte_offset;</div><div class='add'>+	*bs_trace-&gt;magic_byte = BNXT_TRACE_BUF_MAGIC_BYTE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_BUF_PRODUCER_TYPE(data1)				\</div><div class='add'>+	(((data1) &amp; ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA1_TYPE_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_BUF_PRODUCER_OFFSET(data2)				\</div><div class='add'>+	(((data2) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA2_CURR_OFF_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_DBG_BUF_PRODUCER_EVENT_DATA2_CURR_OFF_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_THERMAL_CURRENT_TEMP(data2)				\</div><div class='add'>+	((data2) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_CURRENT_TEMP_MASK)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_THERMAL_THRESHOLD_TEMP(data2)			\</div><div class='add'>+	(((data2) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_THRESHOLD_TEMP_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_THRESHOLD_TEMP_SFT)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA1_THERMAL_THRESHOLD_TYPE(data1)			\</div><div class='add'>+	((data1) &amp;							\</div><div class='add'>+	 ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_MASK)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA1_THERMAL_THRESHOLD_DIR_INCREASING(data1)		\</div><div class='add'>+	(((data1) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR) ==\</div><div class='add'>+	 ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_INCREASING)</div><div class='add'>+</div><div class='add'>+/* Return true if the workqueue has to be scheduled */</div><div class='add'>+static bool bnxt_event_error_report(struct bnxt *bp, u32 data1, u32 data2)</div><div class='add'>+{</div><div class='add'>+	u32 err_type = BNXT_EVENT_ERROR_REPORT_TYPE(data1);</div><div class='add'>+</div><div class='add'>+	switch (err_type) {</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_INVALID_SIGNAL:</div><div class='add'>+		netdev_err(bp-&gt;dev, "1PPS: Received invalid signal on pin%lu from the external source. Please fix the signal and reconfigure the pin\n",</div><div class='add'>+			   BNXT_EVENT_INVALID_SIGNAL_DATA(data2));</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_PAUSE_STORM:</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Pause Storm detected!\n");</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DOORBELL_DROP_THRESHOLD:</div><div class='add'>+		netdev_warn(bp-&gt;dev, "One or more MMIO doorbells dropped by the device!\n");</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_THERMAL_THRESHOLD: {</div><div class='add'>+		u32 type = EVENT_DATA1_THERMAL_THRESHOLD_TYPE(data1);</div><div class='add'>+		char *threshold_type;</div><div class='add'>+		bool notify = false;</div><div class='add'>+		char *dir_str;</div><div class='add'>+</div><div class='add'>+		switch (type) {</div><div class='add'>+		case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_WARN:</div><div class='add'>+			threshold_type = "warning";</div><div class='add'>+			break;</div><div class='add'>+		case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_CRITICAL:</div><div class='add'>+			threshold_type = "critical";</div><div class='add'>+			break;</div><div class='add'>+		case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_FATAL:</div><div class='add'>+			threshold_type = "fatal";</div><div class='add'>+			break;</div><div class='add'>+		case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_SHUTDOWN:</div><div class='add'>+			threshold_type = "shutdown";</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			netdev_err(bp-&gt;dev, "Unknown Thermal threshold type event\n");</div><div class='add'>+			return false;</div><div class='add'>+		}</div><div class='add'>+		if (EVENT_DATA1_THERMAL_THRESHOLD_DIR_INCREASING(data1)) {</div><div class='add'>+			dir_str = "above";</div><div class='add'>+			notify = true;</div><div class='add'>+		} else {</div><div class='add'>+			dir_str = "below";</div><div class='add'>+		}</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Chip temperature has gone %s the %s thermal threshold!\n",</div><div class='add'>+			    dir_str, threshold_type);</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Temperature (In Celsius), Current: %lu, threshold: %lu\n",</div><div class='add'>+			    BNXT_EVENT_THERMAL_CURRENT_TEMP(data2),</div><div class='add'>+			    BNXT_EVENT_THERMAL_THRESHOLD_TEMP(data2));</div><div class='add'>+		if (notify) {</div><div class='add'>+			bp-&gt;thermal_threshold_type = type;</div><div class='add'>+			set_bit(BNXT_THERMAL_THRESHOLD_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_DUAL_DATA_RATE_NOT_SUPPORTED:</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Speed change not supported with dual rate transceivers on this board\n");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(bp-&gt;dev, "FW reported unknown error type %u\n",</div><div class='add'>+			   err_type);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BNXT_GET_EVENT_PORT(data)	\</div><div class='ctx'> 	((data) &amp;			\</div><div class='ctx'> 	 ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_MASK)</div><div class='ctx'> </div><div class='add'>+#define BNXT_EVENT_RING_TYPE(data2)	\</div><div class='add'>+	((data2) &amp;			\</div><div class='add'>+	 ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_MASK)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_RING_TYPE_RX(data2)	\</div><div class='add'>+	(BNXT_EVENT_RING_TYPE(data2) ==	\</div><div class='add'>+	 ASYNC_EVENT_CMPL_RING_MONITOR_MSG_EVENT_DATA2_DISABLE_RING_TYPE_RX)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_PHC_EVENT_TYPE(data1)	\</div><div class='add'>+	(((data1) &amp; ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_PHC_RTC_UPDATE(data1)	\</div><div class='add'>+	(((data1) &amp; ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_PHC_TIME_MSB_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_PHC_TIME_MSB_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_PHC_BITS	48</div><div class='add'>+</div><div class='ctx'> static int bnxt_async_event_process(struct bnxt *bp,</div><div class='ctx'> 				    struct hwrm_async_event_cmpl *cmpl)</div><div class='ctx'> {</div><div class='ctx'> 	u16 event_id = le16_to_cpu(cmpl-&gt;event_id);</div><div class='add'>+	u32 data1 = le32_to_cpu(cmpl-&gt;event_data1);</div><div class='add'>+	u32 data2 = le32_to_cpu(cmpl-&gt;event_data2);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "hwrm event 0x%x {0x%x, 0x%x}\n",</div><div class='add'>+		   event_id, data1, data2);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO CHIMP_FW: Define event id's for link change, error etc */</div><div class='ctx'> 	switch (event_id) {</div><div class='ctx'> 	case ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE: {</div><div class='del'>-		u32 data1 = le32_to_cpu(cmpl-&gt;event_data1);</div><div class='ctx'> 		struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> </div><div class='ctx'> 		if (BNXT_VF(bp))</div><div class='hunk'>@@ -1783,7 +2727,7 @@ static int bnxt_async_event_process(struct bnxt *bp,</div><div class='ctx'> 		/* print unsupported speed warning in forced speed mode only */</div><div class='ctx'> 		if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED) &amp;&amp;</div><div class='ctx'> 		    (data1 &amp; 0x20000)) {</div><div class='del'>-			u16 fw_speed = link_info-&gt;force_link_speed;</div><div class='add'>+			u16 fw_speed = bnxt_get_force_speed(link_info);</div><div class='ctx'> 			u32 speed = bnxt_fw_to_ethtool_speed(fw_speed);</div><div class='ctx'> </div><div class='ctx'> 			if (speed != SPEED_UNKNOWN)</div><div class='hunk'>@@ -1792,7 +2736,11 @@ static int bnxt_async_event_process(struct bnxt *bp,</div><div class='ctx'> 		}</div><div class='ctx'> 		set_bit(BNXT_LINK_SPEED_CHNG_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='ctx'> 	}</div><div class='del'>-	/* fall through */</div><div class='add'>+		fallthrough;</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CHANGE:</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_PORT_PHY_CFG_CHANGE:</div><div class='add'>+		set_bit(BNXT_LINK_CFG_CHANGE_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE:</div><div class='ctx'> 		set_bit(BNXT_LINK_CHNG_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1800,7 +2748,6 @@ static int bnxt_async_event_process(struct bnxt *bp,</div><div class='ctx'> 		set_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED: {</div><div class='del'>-		u32 data1 = le32_to_cpu(cmpl-&gt;event_data1);</div><div class='ctx'> 		u16 port_id = BNXT_GET_EVENT_PORT(data1);</div><div class='ctx'> </div><div class='ctx'> 		if (BNXT_VF(bp))</div><div class='hunk'>@@ -1817,10 +2764,167 @@ static int bnxt_async_event_process(struct bnxt *bp,</div><div class='ctx'> 			goto async_event_process_exit;</div><div class='ctx'> 		set_bit(BNXT_RESET_TASK_SILENT_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='ctx'> 		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY: {</div><div class='add'>+		char *type_str = "Solicited";</div><div class='add'>+</div><div class='add'>+		if (!bp-&gt;fw_health)</div><div class='add'>+			goto async_event_process_exit;</div><div class='add'>+</div><div class='add'>+		bp-&gt;fw_reset_timestamp = jiffies;</div><div class='add'>+		bp-&gt;fw_reset_min_dsecs = cmpl-&gt;timestamp_lo;</div><div class='add'>+		if (!bp-&gt;fw_reset_min_dsecs)</div><div class='add'>+			bp-&gt;fw_reset_min_dsecs = BNXT_DFLT_FW_RST_MIN_DSECS;</div><div class='add'>+		bp-&gt;fw_reset_max_dsecs = le16_to_cpu(cmpl-&gt;timestamp_hi);</div><div class='add'>+		if (!bp-&gt;fw_reset_max_dsecs)</div><div class='add'>+			bp-&gt;fw_reset_max_dsecs = BNXT_DFLT_FW_RST_MAX_DSECS;</div><div class='add'>+		if (EVENT_DATA1_RESET_NOTIFY_FW_ACTIVATION(data1)) {</div><div class='add'>+			set_bit(BNXT_STATE_FW_ACTIVATE_RESET, &amp;bp-&gt;state);</div><div class='add'>+		} else if (EVENT_DATA1_RESET_NOTIFY_FATAL(data1)) {</div><div class='add'>+			type_str = "Fatal";</div><div class='add'>+			bp-&gt;fw_health-&gt;fatalities++;</div><div class='add'>+			set_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state);</div><div class='add'>+		} else if (data2 &amp;&amp; BNXT_FW_STATUS_HEALTHY !=</div><div class='add'>+			   EVENT_DATA2_RESET_NOTIFY_FW_STATUS_CODE(data2)) {</div><div class='add'>+			type_str = "Non-fatal";</div><div class='add'>+			bp-&gt;fw_health-&gt;survivals++;</div><div class='add'>+			set_bit(BNXT_STATE_FW_NON_FATAL_COND, &amp;bp-&gt;state);</div><div class='add'>+		}</div><div class='add'>+		netif_warn(bp, hw, bp-&gt;dev,</div><div class='add'>+			   "%s firmware reset event, data1: 0x%x, data2: 0x%x, min wait %u ms, max wait %u ms\n",</div><div class='add'>+			   type_str, data1, data2,</div><div class='add'>+			   bp-&gt;fw_reset_min_dsecs * 100,</div><div class='add'>+			   bp-&gt;fw_reset_max_dsecs * 100);</div><div class='add'>+		set_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY: {</div><div class='add'>+		struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+		char *status_desc = "healthy";</div><div class='add'>+		u32 status;</div><div class='add'>+</div><div class='add'>+		if (!fw_health)</div><div class='add'>+			goto async_event_process_exit;</div><div class='add'>+</div><div class='add'>+		if (!EVENT_DATA1_RECOVERY_ENABLED(data1)) {</div><div class='add'>+			fw_health-&gt;enabled = false;</div><div class='add'>+			netif_info(bp, drv, bp-&gt;dev, "Driver recovery watchdog is disabled\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		fw_health-&gt;primary = EVENT_DATA1_RECOVERY_MASTER_FUNC(data1);</div><div class='add'>+		fw_health-&gt;tmr_multiplier =</div><div class='add'>+			DIV_ROUND_UP(fw_health-&gt;polling_dsecs * HZ,</div><div class='add'>+				     bp-&gt;current_interval * 10);</div><div class='add'>+		fw_health-&gt;tmr_counter = fw_health-&gt;tmr_multiplier;</div><div class='add'>+		if (!fw_health-&gt;enabled)</div><div class='add'>+			fw_health-&gt;last_fw_heartbeat =</div><div class='add'>+				bnxt_fw_health_readl(bp, BNXT_FW_HEARTBEAT_REG);</div><div class='add'>+		fw_health-&gt;last_fw_reset_cnt =</div><div class='add'>+			bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG);</div><div class='add'>+		status = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);</div><div class='add'>+		if (status != BNXT_FW_STATUS_HEALTHY)</div><div class='add'>+			status_desc = "unhealthy";</div><div class='add'>+		netif_info(bp, drv, bp-&gt;dev,</div><div class='add'>+			   "Driver recovery watchdog, role: %s, firmware status: 0x%x (%s), resets: %u\n",</div><div class='add'>+			   fw_health-&gt;primary ? "primary" : "backup", status,</div><div class='add'>+			   status_desc, fw_health-&gt;last_fw_reset_cnt);</div><div class='add'>+		if (!fw_health-&gt;enabled) {</div><div class='add'>+			/* Make sure tmr_counter is set and visible to</div><div class='add'>+			 * bnxt_health_check() before setting enabled to true.</div><div class='add'>+			 */</div><div class='add'>+			smp_wmb();</div><div class='add'>+			fw_health-&gt;enabled = true;</div><div class='add'>+		}</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION:</div><div class='add'>+		netif_notice(bp, hw, bp-&gt;dev,</div><div class='add'>+			     "Received firmware debug notification, data1: 0x%x, data2: 0x%x\n",</div><div class='add'>+			     data1, data2);</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG: {</div><div class='add'>+		struct bnxt_rx_ring_info *rxr;</div><div class='add'>+		u16 grp_idx;</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			goto async_event_process_exit;</div><div class='add'>+</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Ring monitor event, ring type %lu id 0x%x\n",</div><div class='add'>+			    BNXT_EVENT_RING_TYPE(data2), data1);</div><div class='add'>+		if (!BNXT_EVENT_RING_TYPE_RX(data2))</div><div class='add'>+			goto async_event_process_exit;</div><div class='add'>+</div><div class='add'>+		grp_idx = bnxt_agg_ring_id_to_grp_idx(bp, data1);</div><div class='add'>+		if (grp_idx == INVALID_HW_RING_ID) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Unknown RX agg ring id 0x%x\n",</div><div class='add'>+				    data1);</div><div class='add'>+			goto async_event_process_exit;</div><div class='add'>+		}</div><div class='add'>+		rxr = bp-&gt;bnapi[grp_idx]-&gt;rx_ring;</div><div class='add'>+		bnxt_sched_reset_rxr(bp, rxr);</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST: {</div><div class='add'>+		struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+</div><div class='add'>+		netif_notice(bp, hw, bp-&gt;dev,</div><div class='add'>+			     "Received firmware echo request, data1: 0x%x, data2: 0x%x\n",</div><div class='add'>+			     data1, data2);</div><div class='add'>+		if (fw_health) {</div><div class='add'>+			fw_health-&gt;echo_req_data1 = data1;</div><div class='add'>+			fw_health-&gt;echo_req_data2 = data2;</div><div class='add'>+			set_bit(BNXT_FW_ECHO_REQUEST_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP: {</div><div class='add'>+		bnxt_ptp_pps_event(bp, data1, data2);</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT: {</div><div class='add'>+		if (bnxt_event_error_report(bp, data1, data2))</div><div class='add'>+			break;</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE: {</div><div class='add'>+		switch (BNXT_EVENT_PHC_EVENT_TYPE(data1)) {</div><div class='add'>+		case ASYNC_EVENT_CMPL_PHC_UPDATE_EVENT_DATA1_FLAGS_PHC_RTC_UPDATE:</div><div class='add'>+			if (BNXT_PTP_USE_RTC(bp)) {</div><div class='add'>+				struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+				unsigned long flags;</div><div class='add'>+				u64 ns;</div><div class='add'>+</div><div class='add'>+				if (!ptp)</div><div class='add'>+					goto async_event_process_exit;</div><div class='add'>+</div><div class='add'>+				bnxt_ptp_update_current_time(bp);</div><div class='add'>+				ns = (((u64)BNXT_EVENT_PHC_RTC_UPDATE(data1) &lt;&lt;</div><div class='add'>+				       BNXT_PHC_BITS) | ptp-&gt;current_time);</div><div class='add'>+				write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+				bnxt_ptp_rtc_timecounter_init(ptp, ns);</div><div class='add'>+				write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_DEFERRED_RESPONSE: {</div><div class='add'>+		u16 seq_id = le32_to_cpu(cmpl-&gt;event_data2) &amp; 0xffff;</div><div class='add'>+</div><div class='add'>+		hwrm_update_token(bp, seq_id, BNXT_HWRM_DEFERRED);</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='add'>+	case ASYNC_EVENT_CMPL_EVENT_ID_DBG_BUF_PRODUCER: {</div><div class='add'>+		u16 type = (u16)BNXT_EVENT_BUF_PRODUCER_TYPE(data1);</div><div class='add'>+		u32 offset =  BNXT_EVENT_BUF_PRODUCER_OFFSET(data2);</div><div class='add'>+</div><div class='add'>+		bnxt_bs_trace_check_wrap(&amp;bp-&gt;bs_trace[type], offset);</div><div class='add'>+		goto async_event_process_exit;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		goto async_event_process_exit;</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_queue_sp_work(bp);</div><div class='add'>+	__bnxt_queue_sp_work(bp);</div><div class='ctx'> async_event_process_exit:</div><div class='ctx'> 	bnxt_ulp_async_events(bp, cmpl);</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1836,10 +2940,7 @@ static int bnxt_hwrm_handler(struct bnxt *bp, struct tx_cmp *txcmp)</div><div class='ctx'> 	switch (cmpl_type) {</div><div class='ctx'> 	case CMPL_BASE_TYPE_HWRM_DONE:</div><div class='ctx'> 		seq_id = le16_to_cpu(h_cmpl-&gt;sequence_id);</div><div class='del'>-		if (seq_id == bp-&gt;hwrm_intr_seq_id)</div><div class='del'>-			bp-&gt;hwrm_intr_seq_id = (u16)~bp-&gt;hwrm_intr_seq_id;</div><div class='del'>-		else</div><div class='del'>-			netdev_err(bp-&gt;dev, "Invalid hwrm seq id %d\n", seq_id);</div><div class='add'>+		hwrm_update_token(bp, seq_id, BNXT_HWRM_COMPLETE);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CMPL_BASE_TYPE_HWRM_FWD_REQ:</div><div class='hunk'>@@ -1853,13 +2954,13 @@ static int bnxt_hwrm_handler(struct bnxt *bp, struct tx_cmp *txcmp)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		set_bit(vf_id - bp-&gt;pf.first_vf_id, bp-&gt;pf.vf_event_bmap);</div><div class='del'>-		set_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		bnxt_queue_sp_work(bp);</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case CMPL_BASE_TYPE_HWRM_ASYNC_EVENT:</div><div class='ctx'> 		bnxt_async_event_process(bp,</div><div class='ctx'> 					 (struct hwrm_async_event_cmpl *)txcmp);</div><div class='add'>+		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1868,6 +2969,13 @@ static int bnxt_hwrm_handler(struct bnxt *bp, struct tx_cmp *txcmp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool bnxt_vnic_is_active(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='add'>+</div><div class='add'>+	return vnic-&gt;fw_vnic_id != INVALID_HW_RING_ID &amp;&amp; vnic-&gt;mru &gt; 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t bnxt_msix(int irq, void *dev_instance)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_napi *bnapi = dev_instance;</div><div class='hunk'>@@ -1892,47 +3000,21 @@ static inline int bnxt_has_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)</div><div class='ctx'> 	return TX_CMP_VALID(txcmp, raw_cons);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static irqreturn_t bnxt_inta(int irq, void *dev_instance)</div><div class='del'>-{</div><div class='del'>-	struct bnxt_napi *bnapi = dev_instance;</div><div class='del'>-	struct bnxt *bp = bnapi-&gt;bp;</div><div class='del'>-	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-	u32 cons = RING_CMP(cpr-&gt;cp_raw_cons);</div><div class='del'>-	u32 int_status;</div><div class='del'>-</div><div class='del'>-	prefetch(&amp;cpr-&gt;cp_desc_ring[CP_RING(cons)][CP_IDX(cons)]);</div><div class='del'>-</div><div class='del'>-	if (!bnxt_has_work(bp, cpr)) {</div><div class='del'>-		int_status = readl(bp-&gt;bar0 + BNXT_CAG_REG_LEGACY_INT_STATUS);</div><div class='del'>-		/* return if erroneous interrupt */</div><div class='del'>-		if (!(int_status &amp; (0x10000 &lt;&lt; cpr-&gt;cp_ring_struct.fw_ring_id)))</div><div class='del'>-			return IRQ_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* disable ring IRQ */</div><div class='del'>-	BNXT_CP_DB_IRQ_DIS(cpr-&gt;cp_db.doorbell);</div><div class='del'>-</div><div class='del'>-	/* Return here if interrupt is shared and is disabled. */</div><div class='del'>-	if (unlikely(atomic_read(&amp;bp-&gt;intr_sem) != 0))</div><div class='del'>-		return IRQ_HANDLED;</div><div class='del'>-</div><div class='del'>-	napi_schedule(&amp;bnapi-&gt;napi);</div><div class='del'>-	return IRQ_HANDLED;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 			    int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_napi *bnapi = cpr-&gt;bnapi;</div><div class='ctx'> 	u32 raw_cons = cpr-&gt;cp_raw_cons;</div><div class='add'>+	bool flush_xdp = false;</div><div class='ctx'> 	u32 cons;</div><div class='del'>-	int tx_pkts = 0;</div><div class='ctx'> 	int rx_pkts = 0;</div><div class='ctx'> 	u8 event = 0;</div><div class='ctx'> 	struct tx_cmp *txcmp;</div><div class='ctx'> </div><div class='ctx'> 	cpr-&gt;has_more_work = 0;</div><div class='add'>+	cpr-&gt;had_work_done = 1;</div><div class='ctx'> 	while (1) {</div><div class='add'>+		u8 cmp_type;</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='ctx'> 		cons = RING_CMP(raw_cons);</div><div class='hunk'>@@ -1945,23 +3027,40 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 		 * reading any further.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dma_rmb();</div><div class='del'>-		cpr-&gt;had_work_done = 1;</div><div class='del'>-		if (TX_CMP_TYPE(txcmp) == CMP_TYPE_TX_L2_CMP) {</div><div class='del'>-			tx_pkts++;</div><div class='add'>+		cmp_type = TX_CMP_TYPE(txcmp);</div><div class='add'>+		if (cmp_type == CMP_TYPE_TX_L2_CMP ||</div><div class='add'>+		    cmp_type == CMP_TYPE_TX_L2_COAL_CMP) {</div><div class='add'>+			u32 opaque = txcmp-&gt;tx_cmp_opaque;</div><div class='add'>+			struct bnxt_tx_ring_info *txr;</div><div class='add'>+			u16 tx_freed;</div><div class='add'>+</div><div class='add'>+			txr = bnapi-&gt;tx_ring[TX_OPAQUE_RING(opaque)];</div><div class='add'>+			event |= BNXT_TX_CMP_EVENT;</div><div class='add'>+			if (cmp_type == CMP_TYPE_TX_L2_COAL_CMP)</div><div class='add'>+				txr-&gt;tx_hw_cons = TX_CMP_SQ_CONS_IDX(txcmp);</div><div class='add'>+			else</div><div class='add'>+				txr-&gt;tx_hw_cons = TX_OPAQUE_PROD(bp, opaque);</div><div class='add'>+			tx_freed = (txr-&gt;tx_hw_cons - txr-&gt;tx_cons) &amp;</div><div class='add'>+				   bp-&gt;tx_ring_mask;</div><div class='ctx'> 			/* return full budget so NAPI will complete. */</div><div class='del'>-			if (unlikely(tx_pkts &gt; bp-&gt;tx_wake_thresh)) {</div><div class='add'>+			if (unlikely(tx_freed &gt;= bp-&gt;tx_wake_thresh)) {</div><div class='ctx'> 				rx_pkts = budget;</div><div class='ctx'> 				raw_cons = NEXT_RAW_CMP(raw_cons);</div><div class='ctx'> 				if (budget)</div><div class='ctx'> 					cpr-&gt;has_more_work = 1;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-		} else if ((TX_CMP_TYPE(txcmp) &amp; 0x30) == 0x10) {</div><div class='add'>+		} else if (cmp_type == CMP_TYPE_TX_L2_PKT_TS_CMP) {</div><div class='add'>+			bnxt_tx_ts_cmp(bp, bnapi, (struct tx_ts_cmp *)txcmp);</div><div class='add'>+		} else if (cmp_type &gt;= CMP_TYPE_RX_L2_CMP &amp;&amp;</div><div class='add'>+			   cmp_type &lt;= CMP_TYPE_RX_L2_TPA_START_V3_CMP) {</div><div class='ctx'> 			if (likely(budget))</div><div class='ctx'> 				rc = bnxt_rx_pkt(bp, cpr, &amp;raw_cons, &amp;event);</div><div class='ctx'> 			else</div><div class='ctx'> 				rc = bnxt_force_rx_discard(bp, cpr, &amp;raw_cons,</div><div class='ctx'> 							   &amp;event);</div><div class='add'>+			if (event &amp; BNXT_REDIRECT_EVENT)</div><div class='add'>+				flush_xdp = true;</div><div class='ctx'> 			if (likely(rc &gt;= 0))</div><div class='ctx'> 				rx_pkts += rc;</div><div class='ctx'> 			/* Increment rx_pkts when rc is -ENOMEM to count towards</div><div class='hunk'>@@ -1973,12 +3072,9 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 				rx_pkts++;</div><div class='ctx'> 			else if (rc == -EBUSY)	/* partial completion */</div><div class='ctx'> 				break;</div><div class='del'>-		} else if (unlikely((TX_CMP_TYPE(txcmp) ==</div><div class='del'>-				     CMPL_BASE_TYPE_HWRM_DONE) ||</div><div class='del'>-				    (TX_CMP_TYPE(txcmp) ==</div><div class='del'>-				     CMPL_BASE_TYPE_HWRM_FWD_REQ) ||</div><div class='del'>-				    (TX_CMP_TYPE(txcmp) ==</div><div class='del'>-				     CMPL_BASE_TYPE_HWRM_ASYNC_EVENT))) {</div><div class='add'>+		} else if (unlikely(cmp_type == CMPL_BASE_TYPE_HWRM_DONE ||</div><div class='add'>+				    cmp_type == CMPL_BASE_TYPE_HWRM_FWD_REQ ||</div><div class='add'>+				    cmp_type == CMPL_BASE_TYPE_HWRM_ASYNC_EVENT)) {</div><div class='ctx'> 			bnxt_hwrm_handler(bp, txcmp);</div><div class='ctx'> 		}</div><div class='ctx'> 		raw_cons = NEXT_RAW_CMP(raw_cons);</div><div class='hunk'>@@ -1989,37 +3085,45 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (flush_xdp) {</div><div class='add'>+		xdp_do_flush();</div><div class='add'>+		event &amp;= ~BNXT_REDIRECT_EVENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (event &amp; BNXT_TX_EVENT) {</div><div class='del'>-		struct bnxt_tx_ring_info *txr = bnapi-&gt;tx_ring;</div><div class='add'>+		struct bnxt_tx_ring_info *txr = bnapi-&gt;tx_ring[0];</div><div class='ctx'> 		u16 prod = txr-&gt;tx_prod;</div><div class='ctx'> </div><div class='ctx'> 		/* Sync BD data before updating doorbell */</div><div class='ctx'> 		wmb();</div><div class='ctx'> </div><div class='ctx'> 		bnxt_db_write_relaxed(bp, &amp;txr-&gt;tx_db, prod);</div><div class='add'>+		event &amp;= ~BNXT_TX_EVENT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	cpr-&gt;cp_raw_cons = raw_cons;</div><div class='del'>-	bnapi-&gt;tx_pkts += tx_pkts;</div><div class='ctx'> 	bnapi-&gt;events |= event;</div><div class='ctx'> 	return rx_pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void __bnxt_poll_work_done(struct bnxt *bp, struct bnxt_napi *bnapi)</div><div class='add'>+static void __bnxt_poll_work_done(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='add'>+				  int budget)</div><div class='ctx'> {</div><div class='del'>-	if (bnapi-&gt;tx_pkts) {</div><div class='del'>-		bnapi-&gt;tx_int(bp, bnapi, bnapi-&gt;tx_pkts);</div><div class='del'>-		bnapi-&gt;tx_pkts = 0;</div><div class='del'>-	}</div><div class='add'>+	if ((bnapi-&gt;events &amp; BNXT_TX_CMP_EVENT) &amp;&amp; !bnapi-&gt;tx_fault)</div><div class='add'>+		bnapi-&gt;tx_int(bp, bnapi, budget);</div><div class='ctx'> </div><div class='del'>-	if (bnapi-&gt;events &amp; BNXT_RX_EVENT) {</div><div class='add'>+	if ((bnapi-&gt;events &amp; BNXT_RX_EVENT) &amp;&amp; !(bnapi-&gt;in_reset)) {</div><div class='ctx'> 		struct bnxt_rx_ring_info *rxr = bnapi-&gt;rx_ring;</div><div class='ctx'> </div><div class='ctx'> 		bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='del'>-		if (bnapi-&gt;events &amp; BNXT_AGG_EVENT)</div><div class='del'>-			bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+		bnapi-&gt;events &amp;= ~BNXT_RX_EVENT;</div><div class='add'>+	}</div><div class='add'>+	if (bnapi-&gt;events &amp; BNXT_AGG_EVENT) {</div><div class='add'>+		struct bnxt_rx_ring_info *rxr = bnapi-&gt;rx_ring;</div><div class='add'>+</div><div class='add'>+		bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+		bnapi-&gt;events &amp;= ~BNXT_AGG_EVENT;</div><div class='ctx'> 	}</div><div class='del'>-	bnapi-&gt;events = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='hunk'>@@ -2036,7 +3140,7 @@ static int bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 	 */</div><div class='ctx'> 	bnxt_db_cq(bp, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='ctx'> </div><div class='del'>-	__bnxt_poll_work_done(bp, bnapi);</div><div class='add'>+	__bnxt_poll_work_done(bp, bnapi, budget);</div><div class='ctx'> 	return rx_pkts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2050,6 +3154,7 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct rx_cmp_ext *rxcmp1;</div><div class='ctx'> 	u32 cp_cons, tmp_raw_cons;</div><div class='ctx'> 	u32 raw_cons = cpr-&gt;cp_raw_cons;</div><div class='add'>+	bool flush_xdp = false;</div><div class='ctx'> 	u32 rx_pkts = 0;</div><div class='ctx'> 	u8 event = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2062,6 +3167,10 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)</div><div class='ctx'> 		if (!TX_CMP_VALID(txcmp, raw_cons))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		/* The valid test of the entry must be done first before</div><div class='add'>+		 * reading any further.</div><div class='add'>+		 */</div><div class='add'>+		dma_rmb();</div><div class='ctx'> 		if ((TX_CMP_TYPE(txcmp) &amp; 0x30) == 0x10) {</div><div class='ctx'> 			tmp_raw_cons = NEXT_RAW_CMP(raw_cons);</div><div class='ctx'> 			cp_cons = RING_CMP(tmp_raw_cons);</div><div class='hunk'>@@ -2080,6 +3189,8 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)</div><div class='ctx'> 				rx_pkts++;</div><div class='ctx'> 			else if (rc == -EBUSY)	/* partial completion */</div><div class='ctx'> 				break;</div><div class='add'>+			if (event &amp; BNXT_REDIRECT_EVENT)</div><div class='add'>+				flush_xdp = true;</div><div class='ctx'> 		} else if (unlikely(TX_CMP_TYPE(txcmp) ==</div><div class='ctx'> 				    CMPL_BASE_TYPE_HWRM_DONE)) {</div><div class='ctx'> 			bnxt_hwrm_handler(bp, txcmp);</div><div class='hunk'>@@ -2099,6 +3210,8 @@ static int bnxt_poll_nitroa0(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> 	if (event &amp; BNXT_AGG_EVENT)</div><div class='ctx'> 		bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+	if (flush_xdp)</div><div class='add'>+		xdp_do_flush();</div><div class='ctx'> </div><div class='ctx'> 	if (!bnxt_has_work(bp, cpr) &amp;&amp; rx_pkts &lt; budget) {</div><div class='ctx'> 		napi_complete_done(napi, rx_pkts);</div><div class='hunk'>@@ -2114,6 +3227,10 @@ static int bnxt_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state))) {</div><div class='add'>+		napi_complete(napi);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	while (1) {</div><div class='ctx'> 		work_done += bnxt_poll_work(bp, cpr, budget - work_done);</div><div class='ctx'> </div><div class='hunk'>@@ -2129,14 +3246,14 @@ static int bnxt_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_DIM) {</div><div class='del'>-		struct net_dim_sample dim_sample;</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_DIM) &amp;&amp; bnxt_vnic_is_active(bp)) {</div><div class='add'>+		struct dim_sample dim_sample = {};</div><div class='ctx'> </div><div class='del'>-		net_dim_sample(cpr-&gt;event_ctr,</div><div class='del'>-			       cpr-&gt;rx_packets,</div><div class='del'>-			       cpr-&gt;rx_bytes,</div><div class='del'>-			       &amp;dim_sample);</div><div class='del'>-		net_dim(&amp;cpr-&gt;dim, dim_sample);</div><div class='add'>+		dim_update_sample(cpr-&gt;event_ctr,</div><div class='add'>+				  cpr-&gt;rx_packets,</div><div class='add'>+				  cpr-&gt;rx_bytes,</div><div class='add'>+				  &amp;dim_sample);</div><div class='add'>+		net_dim(&amp;cpr-&gt;dim, &amp;dim_sample);</div><div class='ctx'> 	}</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='hunk'>@@ -2146,10 +3263,10 @@ static int __bnxt_poll_cqs(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> 	int i, work_done = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct bnxt_cp_ring_info *cpr2 = cpr-&gt;cp_ring_arr[i];</div><div class='add'>+	for (i = 0; i &lt; cpr-&gt;cp_ring_count; i++) {</div><div class='add'>+		struct bnxt_cp_ring_info *cpr2 = &amp;cpr-&gt;cp_ring_arr[i];</div><div class='ctx'> </div><div class='del'>-		if (cpr2) {</div><div class='add'>+		if (cpr2-&gt;had_nqe_notify) {</div><div class='ctx'> 			work_done += __bnxt_poll_work(bp, cpr2,</div><div class='ctx'> 						      budget - work_done);</div><div class='ctx'> 			cpr-&gt;has_more_work |= cpr2-&gt;has_more_work;</div><div class='hunk'>@@ -2159,59 +3276,69 @@ static int __bnxt_poll_cqs(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __bnxt_poll_cqs_done(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='del'>-				 u64 dbr_type, bool all)</div><div class='add'>+				 u64 dbr_type, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 2; i++) {</div><div class='del'>-		struct bnxt_cp_ring_info *cpr2 = cpr-&gt;cp_ring_arr[i];</div><div class='add'>+	for (i = 0; i &lt; cpr-&gt;cp_ring_count; i++) {</div><div class='add'>+		struct bnxt_cp_ring_info *cpr2 = &amp;cpr-&gt;cp_ring_arr[i];</div><div class='ctx'> 		struct bnxt_db_info *db;</div><div class='ctx'> </div><div class='del'>-		if (cpr2 &amp;&amp; (all || cpr2-&gt;had_work_done)) {</div><div class='add'>+		if (cpr2-&gt;had_work_done) {</div><div class='add'>+			u32 tgl = 0;</div><div class='add'>+</div><div class='add'>+			if (dbr_type == DBR_TYPE_CQ_ARMALL) {</div><div class='add'>+				cpr2-&gt;had_nqe_notify = 0;</div><div class='add'>+				tgl = cpr2-&gt;toggle;</div><div class='add'>+			}</div><div class='ctx'> 			db = &amp;cpr2-&gt;cp_db;</div><div class='del'>-			writeq(db-&gt;db_key64 | dbr_type |</div><div class='del'>-			       RING_CMP(cpr2-&gt;cp_raw_cons), db-&gt;doorbell);</div><div class='add'>+			bnxt_writeq(bp,</div><div class='add'>+				    db-&gt;db_key64 | dbr_type | DB_TOGGLE(tgl) |</div><div class='add'>+				    DB_RING_IDX(db, cpr2-&gt;cp_raw_cons),</div><div class='add'>+				    db-&gt;doorbell);</div><div class='ctx'> 			cpr2-&gt;had_work_done = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	__bnxt_poll_work_done(bp, bnapi);</div><div class='add'>+	__bnxt_poll_work_done(bp, bnapi, budget);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_poll_p5(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_napi *bnapi = container_of(napi, struct bnxt_napi, napi);</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+	struct bnxt_cp_ring_info *cpr_rx;</div><div class='ctx'> 	u32 raw_cons = cpr-&gt;cp_raw_cons;</div><div class='ctx'> 	struct bnxt *bp = bnapi-&gt;bp;</div><div class='ctx'> 	struct nqe_cn *nqcmp;</div><div class='ctx'> 	int work_done = 0;</div><div class='ctx'> 	u32 cons;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state))) {</div><div class='add'>+		napi_complete(napi);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='ctx'> 	if (cpr-&gt;has_more_work) {</div><div class='ctx'> 		cpr-&gt;has_more_work = 0;</div><div class='ctx'> 		work_done = __bnxt_poll_cqs(bp, bnapi, budget);</div><div class='del'>-		if (cpr-&gt;has_more_work) {</div><div class='del'>-			__bnxt_poll_cqs_done(bp, bnapi, DBR_TYPE_CQ, false);</div><div class='del'>-			return work_done;</div><div class='del'>-		}</div><div class='del'>-		__bnxt_poll_cqs_done(bp, bnapi, DBR_TYPE_CQ_ARMALL, true);</div><div class='del'>-		if (napi_complete_done(napi, work_done))</div><div class='del'>-			BNXT_DB_NQ_ARM_P5(&amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='del'>-		return work_done;</div><div class='ctx'> 	}</div><div class='ctx'> 	while (1) {</div><div class='add'>+		u16 type;</div><div class='add'>+</div><div class='ctx'> 		cons = RING_CMP(raw_cons);</div><div class='ctx'> 		nqcmp = &amp;cpr-&gt;nq_desc_ring[CP_RING(cons)][CP_IDX(cons)];</div><div class='ctx'> </div><div class='ctx'> 		if (!NQ_CMP_VALID(nqcmp, raw_cons)) {</div><div class='add'>+			if (cpr-&gt;has_more_work)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='ctx'> 			__bnxt_poll_cqs_done(bp, bnapi, DBR_TYPE_CQ_ARMALL,</div><div class='del'>-					     false);</div><div class='add'>+					     budget);</div><div class='ctx'> 			cpr-&gt;cp_raw_cons = raw_cons;</div><div class='ctx'> 			if (napi_complete_done(napi, work_done))</div><div class='ctx'> 				BNXT_DB_NQ_ARM_P5(&amp;cpr-&gt;cp_db,</div><div class='ctx'> 						  cpr-&gt;cp_raw_cons);</div><div class='del'>-			return work_done;</div><div class='add'>+			goto poll_done;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* The valid test of the entry must be done first before</div><div class='hunk'>@@ -2219,176 +3346,289 @@ static int bnxt_poll_p5(struct napi_struct *napi, int budget)</div><div class='ctx'> 		 */</div><div class='ctx'> 		dma_rmb();</div><div class='ctx'> </div><div class='del'>-		if (nqcmp-&gt;type == cpu_to_le16(NQ_CN_TYPE_CQ_NOTIFICATION)) {</div><div class='add'>+		type = le16_to_cpu(nqcmp-&gt;type);</div><div class='add'>+		if (NQE_CN_TYPE(type) == NQ_CN_TYPE_CQ_NOTIFICATION) {</div><div class='ctx'> 			u32 idx = le32_to_cpu(nqcmp-&gt;cq_handle_low);</div><div class='add'>+			u32 cq_type = BNXT_NQ_HDL_TYPE(idx);</div><div class='ctx'> 			struct bnxt_cp_ring_info *cpr2;</div><div class='ctx'> </div><div class='del'>-			cpr2 = cpr-&gt;cp_ring_arr[idx];</div><div class='add'>+			/* No more budget for RX work */</div><div class='add'>+			if (budget &amp;&amp; work_done &gt;= budget &amp;&amp;</div><div class='add'>+			    cq_type == BNXT_NQ_HDL_TYPE_RX)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			idx = BNXT_NQ_HDL_IDX(idx);</div><div class='add'>+			cpr2 = &amp;cpr-&gt;cp_ring_arr[idx];</div><div class='add'>+			cpr2-&gt;had_nqe_notify = 1;</div><div class='add'>+			cpr2-&gt;toggle = NQE_CN_TOGGLE(type);</div><div class='ctx'> 			work_done += __bnxt_poll_work(bp, cpr2,</div><div class='ctx'> 						      budget - work_done);</div><div class='del'>-			cpr-&gt;has_more_work = cpr2-&gt;has_more_work;</div><div class='add'>+			cpr-&gt;has_more_work |= cpr2-&gt;has_more_work;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			bnxt_hwrm_handler(bp, (struct tx_cmp *)nqcmp);</div><div class='ctx'> 		}</div><div class='ctx'> 		raw_cons = NEXT_RAW_CMP(raw_cons);</div><div class='del'>-		if (cpr-&gt;has_more_work)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='del'>-	__bnxt_poll_cqs_done(bp, bnapi, DBR_TYPE_CQ, true);</div><div class='del'>-	cpr-&gt;cp_raw_cons = raw_cons;</div><div class='add'>+	__bnxt_poll_cqs_done(bp, bnapi, DBR_TYPE_CQ, budget);</div><div class='add'>+	if (raw_cons != cpr-&gt;cp_raw_cons) {</div><div class='add'>+		cpr-&gt;cp_raw_cons = raw_cons;</div><div class='add'>+		BNXT_DB_NQ_P5(&amp;cpr-&gt;cp_db, raw_cons);</div><div class='add'>+	}</div><div class='add'>+poll_done:</div><div class='add'>+	cpr_rx = &amp;cpr-&gt;cp_ring_arr[0];</div><div class='add'>+	if (cpr_rx-&gt;cp_ring_type == BNXT_NQ_HDL_TYPE_RX &amp;&amp;</div><div class='add'>+	    (bp-&gt;flags &amp; BNXT_FLAG_DIM) &amp;&amp; bnxt_vnic_is_active(bp)) {</div><div class='add'>+		struct dim_sample dim_sample = {};</div><div class='add'>+</div><div class='add'>+		dim_update_sample(cpr-&gt;event_ctr,</div><div class='add'>+				  cpr_rx-&gt;rx_packets,</div><div class='add'>+				  cpr_rx-&gt;rx_bytes,</div><div class='add'>+				  &amp;dim_sample);</div><div class='add'>+		net_dim(&amp;cpr-&gt;dim, &amp;dim_sample);</div><div class='add'>+	}</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_free_tx_skbs(struct bnxt *bp)</div><div class='add'>+static void bnxt_free_one_tx_ring_skbs(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_tx_ring_info *txr, int idx)</div><div class='ctx'> {</div><div class='ctx'> 	int i, max_idx;</div><div class='ctx'> 	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;tx_ring)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	max_idx = bp-&gt;tx_nr_pages * TX_DESC_CNT;</div><div class='del'>-	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='del'>-		struct bnxt_tx_ring_info *txr = &amp;bp-&gt;tx_ring[i];</div><div class='del'>-		int j;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; max_idx;) {</div><div class='del'>-			struct bnxt_sw_tx_bd *tx_buf = &amp;txr-&gt;tx_buf_ring[j];</div><div class='del'>-			struct sk_buff *skb = tx_buf-&gt;skb;</div><div class='del'>-			int k, last;</div><div class='add'>+	for (i = 0; i &lt; max_idx;) {</div><div class='add'>+		struct bnxt_sw_tx_bd *tx_buf = &amp;txr-&gt;tx_buf_ring[i];</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		int j, last;</div><div class='ctx'> </div><div class='del'>-			if (!skb) {</div><div class='del'>-				j++;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+		if (idx  &lt; bp-&gt;tx_nr_rings_xdp &amp;&amp;</div><div class='add'>+		    tx_buf-&gt;action == XDP_REDIRECT) {</div><div class='add'>+			dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='add'>+					 dma_unmap_addr(tx_buf, mapping),</div><div class='add'>+					 dma_unmap_len(tx_buf, len),</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+			xdp_return_frame(tx_buf-&gt;xdpf);</div><div class='add'>+			tx_buf-&gt;action = 0;</div><div class='add'>+			tx_buf-&gt;xdpf = NULL;</div><div class='add'>+			i++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			tx_buf-&gt;skb = NULL;</div><div class='add'>+		skb = tx_buf-&gt;skb;</div><div class='add'>+		if (!skb) {</div><div class='add'>+			i++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			if (tx_buf-&gt;is_push) {</div><div class='del'>-				dev_kfree_skb(skb);</div><div class='del'>-				j += 2;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='add'>+		tx_buf-&gt;skb = NULL;</div><div class='ctx'> </div><div class='del'>-			dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='del'>-					 dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-					 skb_headlen(skb),</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='del'>-			last = tx_buf-&gt;nr_frags;</div><div class='del'>-			j += 2;</div><div class='del'>-			for (k = 0; k &lt; last; k++, j++) {</div><div class='del'>-				int ring_idx = j &amp; bp-&gt;tx_ring_mask;</div><div class='del'>-				skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[k];</div><div class='del'>-</div><div class='del'>-				tx_buf = &amp;txr-&gt;tx_buf_ring[ring_idx];</div><div class='del'>-				dma_unmap_page(</div><div class='del'>-					&amp;pdev-&gt;dev,</div><div class='del'>-					dma_unmap_addr(tx_buf, mapping),</div><div class='del'>-					skb_frag_size(frag), PCI_DMA_TODEVICE);</div><div class='del'>-			}</div><div class='add'>+		if (tx_buf-&gt;is_push) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='add'>+			i += 2;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='add'>+				 dma_unmap_addr(tx_buf, mapping),</div><div class='add'>+				 skb_headlen(skb),</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		last = tx_buf-&gt;nr_frags;</div><div class='add'>+		i += 2;</div><div class='add'>+		for (j = 0; j &lt; last; j++, i++) {</div><div class='add'>+			int ring_idx = i &amp; bp-&gt;tx_ring_mask;</div><div class='add'>+			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[j];</div><div class='add'>+</div><div class='add'>+			tx_buf = &amp;txr-&gt;tx_buf_ring[ring_idx];</div><div class='add'>+			netmem_dma_unmap_page_attrs(&amp;pdev-&gt;dev,</div><div class='add'>+						    dma_unmap_addr(tx_buf,</div><div class='add'>+								   mapping),</div><div class='add'>+						    skb_frag_size(frag),</div><div class='add'>+						    DMA_TO_DEVICE, 0);</div><div class='ctx'> 		}</div><div class='del'>-		netdev_tx_reset_queue(netdev_get_tx_queue(bp-&gt;dev, i));</div><div class='add'>+		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='add'>+	netdev_tx_reset_queue(netdev_get_tx_queue(bp-&gt;dev, idx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_free_rx_skbs(struct bnxt *bp)</div><div class='add'>+static void bnxt_free_tx_skbs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int i, max_idx, max_agg_idx;</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;rx_ring)</div><div class='add'>+	if (!bp-&gt;tx_ring)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	max_idx = bp-&gt;rx_nr_pages * RX_DESC_CNT;</div><div class='del'>-	max_agg_idx = bp-&gt;rx_agg_nr_pages * RX_DESC_CNT;</div><div class='del'>-	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='del'>-		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='del'>-		int j;</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='add'>+		struct bnxt_tx_ring_info *txr = &amp;bp-&gt;tx_ring[i];</div><div class='ctx'> </div><div class='del'>-		if (rxr-&gt;rx_tpa) {</div><div class='del'>-			for (j = 0; j &lt; MAX_TPA; j++) {</div><div class='del'>-				struct bnxt_tpa_info *tpa_info =</div><div class='del'>-							&amp;rxr-&gt;rx_tpa[j];</div><div class='del'>-				u8 *data = tpa_info-&gt;data;</div><div class='add'>+		if (!txr-&gt;tx_buf_ring)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-				if (!data)</div><div class='del'>-					continue;</div><div class='add'>+		bnxt_free_one_tx_ring_skbs(bp, txr, i);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-				dma_unmap_single_attrs(&amp;pdev-&gt;dev,</div><div class='del'>-						       tpa_info-&gt;mapping,</div><div class='del'>-						       bp-&gt;rx_buf_use_size,</div><div class='del'>-						       bp-&gt;rx_dir,</div><div class='del'>-						       DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+	if (bp-&gt;ptp_cfg &amp;&amp; !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_TX_TS_CMP))</div><div class='add'>+		bnxt_ptp_free_txts_skbs(bp-&gt;ptp_cfg);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-				tpa_info-&gt;data = NULL;</div><div class='add'>+static void bnxt_free_one_rx_ring(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	int i, max_idx;</div><div class='ctx'> </div><div class='del'>-				kfree(data);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	max_idx = bp-&gt;rx_nr_pages * RX_DESC_CNT;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; max_idx; j++) {</div><div class='del'>-			struct bnxt_sw_rx_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[j];</div><div class='del'>-			dma_addr_t mapping = rx_buf-&gt;mapping;</div><div class='del'>-			void *data = rx_buf-&gt;data;</div><div class='add'>+	for (i = 0; i &lt; max_idx; i++) {</div><div class='add'>+		struct bnxt_sw_rx_bd *rx_buf = &amp;rxr-&gt;rx_buf_ring[i];</div><div class='add'>+		void *data = rx_buf-&gt;data;</div><div class='ctx'> </div><div class='del'>-			if (!data)</div><div class='del'>-				continue;</div><div class='add'>+		if (!data)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			rx_buf-&gt;data = NULL;</div><div class='add'>+		rx_buf-&gt;data = NULL;</div><div class='add'>+		if (BNXT_RX_PAGE_MODE(bp))</div><div class='add'>+			page_pool_recycle_direct(rxr-&gt;page_pool, data);</div><div class='add'>+		else</div><div class='add'>+			page_pool_free_va(rxr-&gt;head_pool, data, true);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (BNXT_RX_PAGE_MODE(bp)) {</div><div class='del'>-				mapping -= bp-&gt;rx_dma_offset;</div><div class='del'>-				dma_unmap_page_attrs(&amp;pdev-&gt;dev, mapping,</div><div class='del'>-						     PAGE_SIZE, bp-&gt;rx_dir,</div><div class='del'>-						     DMA_ATTR_WEAK_ORDERING);</div><div class='del'>-				__free_page(data);</div><div class='del'>-			} else {</div><div class='del'>-				dma_unmap_single_attrs(&amp;pdev-&gt;dev, mapping,</div><div class='del'>-						       bp-&gt;rx_buf_use_size,</div><div class='del'>-						       bp-&gt;rx_dir,</div><div class='del'>-						       DMA_ATTR_WEAK_ORDERING);</div><div class='del'>-				kfree(data);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+static void bnxt_free_one_rx_agg_ring(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	int i, max_idx;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; max_agg_idx; j++) {</div><div class='del'>-			struct bnxt_sw_rx_agg_bd *rx_agg_buf =</div><div class='del'>-				&amp;rxr-&gt;rx_agg_ring[j];</div><div class='del'>-			struct page *page = rx_agg_buf-&gt;page;</div><div class='add'>+	max_idx = bp-&gt;rx_agg_nr_pages * RX_DESC_CNT;</div><div class='ctx'> </div><div class='del'>-			if (!page)</div><div class='del'>-				continue;</div><div class='add'>+	for (i = 0; i &lt; max_idx; i++) {</div><div class='add'>+		struct bnxt_sw_rx_agg_bd *rx_agg_buf = &amp;rxr-&gt;rx_agg_ring[i];</div><div class='add'>+		netmem_ref netmem = rx_agg_buf-&gt;netmem;</div><div class='ctx'> </div><div class='del'>-			dma_unmap_page_attrs(&amp;pdev-&gt;dev, rx_agg_buf-&gt;mapping,</div><div class='del'>-					     BNXT_RX_PAGE_SIZE,</div><div class='del'>-					     PCI_DMA_FROMDEVICE,</div><div class='del'>-					     DMA_ATTR_WEAK_ORDERING);</div><div class='add'>+		if (!netmem)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-			rx_agg_buf-&gt;page = NULL;</div><div class='del'>-			__clear_bit(j, rxr-&gt;rx_agg_bmap);</div><div class='add'>+		rx_agg_buf-&gt;netmem = 0;</div><div class='add'>+		__clear_bit(i, rxr-&gt;rx_agg_bmap);</div><div class='ctx'> </div><div class='del'>-			__free_page(page);</div><div class='del'>-		}</div><div class='del'>-		if (rxr-&gt;rx_page) {</div><div class='del'>-			__free_page(rxr-&gt;rx_page);</div><div class='del'>-			rxr-&gt;rx_page = NULL;</div><div class='del'>-		}</div><div class='add'>+		page_pool_recycle_direct_netmem(rxr-&gt;page_pool, netmem);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_free_one_tpa_info_data(struct bnxt *bp,</div><div class='add'>+					struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;max_tpa; i++) {</div><div class='add'>+		struct bnxt_tpa_info *tpa_info = &amp;rxr-&gt;rx_tpa[i];</div><div class='add'>+		u8 *data = tpa_info-&gt;data;</div><div class='add'>+</div><div class='add'>+		if (!data)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tpa_info-&gt;data = NULL;</div><div class='add'>+		page_pool_free_va(rxr-&gt;head_pool, data, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_one_rx_ring_skbs(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_tpa_idx_map *map;</div><div class='add'>+</div><div class='add'>+	if (!rxr-&gt;rx_tpa)</div><div class='add'>+		goto skip_rx_tpa_free;</div><div class='add'>+</div><div class='add'>+	bnxt_free_one_tpa_info_data(bp, rxr);</div><div class='add'>+</div><div class='add'>+skip_rx_tpa_free:</div><div class='add'>+	if (!rxr-&gt;rx_buf_ring)</div><div class='add'>+		goto skip_rx_buf_free;</div><div class='add'>+</div><div class='add'>+	bnxt_free_one_rx_ring(bp, rxr);</div><div class='add'>+</div><div class='add'>+skip_rx_buf_free:</div><div class='add'>+	if (!rxr-&gt;rx_agg_ring)</div><div class='add'>+		goto skip_rx_agg_free;</div><div class='add'>+</div><div class='add'>+	bnxt_free_one_rx_agg_ring(bp, rxr);</div><div class='add'>+</div><div class='add'>+skip_rx_agg_free:</div><div class='add'>+	map = rxr-&gt;rx_tpa_idx_map;</div><div class='add'>+	if (map)</div><div class='add'>+		memset(map-&gt;agg_idx_bmap, 0, sizeof(map-&gt;agg_idx_bmap));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_rx_skbs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;rx_ring)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++)</div><div class='add'>+		bnxt_free_one_rx_ring_skbs(bp, &amp;bp-&gt;rx_ring[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_skbs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	bnxt_free_tx_skbs(bp);</div><div class='ctx'> 	bnxt_free_rx_skbs(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_init_ctx_mem(struct bnxt_ctx_mem_type *ctxm, void *p, int len)</div><div class='add'>+{</div><div class='add'>+	u8 init_val = ctxm-&gt;init_value;</div><div class='add'>+	u16 offset = ctxm-&gt;init_offset;</div><div class='add'>+	u8 *p2 = p;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!init_val)</div><div class='add'>+		return;</div><div class='add'>+	if (offset == BNXT_CTX_INIT_INVALID_OFFSET) {</div><div class='add'>+		memset(p, init_val, len);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; len; i += ctxm-&gt;entry_size)</div><div class='add'>+		*(p2 + i + offset) = init_val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static size_t __bnxt_copy_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem,</div><div class='add'>+			       void *buf, size_t offset, size_t head,</div><div class='add'>+			       size_t tail)</div><div class='add'>+{</div><div class='add'>+	int i, head_page, start_idx, source_offset;</div><div class='add'>+	size_t len, rem_len, total_len, max_bytes;</div><div class='add'>+</div><div class='add'>+	head_page = head / rmem-&gt;page_size;</div><div class='add'>+	source_offset = head % rmem-&gt;page_size;</div><div class='add'>+	total_len = (tail - head) &amp; MAX_CTX_BYTES_MASK;</div><div class='add'>+	if (!total_len)</div><div class='add'>+		total_len = MAX_CTX_BYTES;</div><div class='add'>+	start_idx = head_page % MAX_CTX_PAGES;</div><div class='add'>+	max_bytes = (rmem-&gt;nr_pages - start_idx) * rmem-&gt;page_size -</div><div class='add'>+		    source_offset;</div><div class='add'>+	total_len = min(total_len, max_bytes);</div><div class='add'>+	rem_len = total_len;</div><div class='add'>+</div><div class='add'>+	for (i = start_idx; rem_len; i++, source_offset = 0) {</div><div class='add'>+		len = min((size_t)(rmem-&gt;page_size - source_offset), rem_len);</div><div class='add'>+		if (buf)</div><div class='add'>+			memcpy(buf + offset, rmem-&gt;pg_arr[i] + source_offset,</div><div class='add'>+			       len);</div><div class='add'>+		offset += len;</div><div class='add'>+		rem_len -= len;</div><div class='add'>+	}</div><div class='add'>+	return total_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!rmem-&gt;pg_arr)</div><div class='add'>+		goto skip_pages;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='ctx'> 		if (!rmem-&gt;pg_arr[i])</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2398,6 +3638,7 @@ static void bnxt_free_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)</div><div class='ctx'> </div><div class='ctx'> 		rmem-&gt;pg_arr[i] = NULL;</div><div class='ctx'> 	}</div><div class='add'>+skip_pages:</div><div class='ctx'> 	if (rmem-&gt;pg_tbl) {</div><div class='ctx'> 		size_t pg_tbl_size = rmem-&gt;nr_pages * 8;</div><div class='ctx'> </div><div class='hunk'>@@ -2443,6 +3684,9 @@ static int bnxt_alloc_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)</div><div class='ctx'> 		if (!rmem-&gt;pg_arr[i])</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+		if (rmem-&gt;ctx_mem)</div><div class='add'>+			bnxt_init_ctx_mem(rmem-&gt;ctx_mem, rmem-&gt;pg_arr[i],</div><div class='add'>+					  rmem-&gt;page_size);</div><div class='ctx'> 		if (rmem-&gt;nr_pages &gt; 1 || rmem-&gt;depth &gt; 0) {</div><div class='ctx'> 			if (i == rmem-&gt;nr_pages - 2 &amp;&amp;</div><div class='ctx'> 			    (rmem-&gt;flags &amp; BNXT_RMEM_RING_PTE_FLAG))</div><div class='hunk'>@@ -2463,6 +3707,82 @@ static int bnxt_alloc_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_free_one_tpa_info(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	kfree(rxr-&gt;rx_tpa_idx_map);</div><div class='add'>+	rxr-&gt;rx_tpa_idx_map = NULL;</div><div class='add'>+	if (rxr-&gt;rx_tpa) {</div><div class='add'>+		for (i = 0; i &lt; bp-&gt;max_tpa; i++) {</div><div class='add'>+			kfree(rxr-&gt;rx_tpa[i].agg_arr);</div><div class='add'>+			rxr-&gt;rx_tpa[i].agg_arr = NULL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree(rxr-&gt;rx_tpa);</div><div class='add'>+	rxr-&gt;rx_tpa = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_tpa_info(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='add'>+</div><div class='add'>+		bnxt_free_one_tpa_info(bp, rxr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_one_tpa_info(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct rx_agg_cmp *agg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	rxr-&gt;rx_tpa = kcalloc(bp-&gt;max_tpa, sizeof(struct bnxt_tpa_info),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!rxr-&gt;rx_tpa)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+		return 0;</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;max_tpa; i++) {</div><div class='add'>+		agg = kcalloc(MAX_SKB_FRAGS, sizeof(*agg), GFP_KERNEL);</div><div class='add'>+		if (!agg)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		rxr-&gt;rx_tpa[i].agg_arr = agg;</div><div class='add'>+	}</div><div class='add'>+	rxr-&gt;rx_tpa_idx_map = kzalloc(sizeof(*rxr-&gt;rx_tpa_idx_map),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!rxr-&gt;rx_tpa_idx_map)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_tpa_info(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	bp-&gt;max_tpa = MAX_TPA;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		if (!bp-&gt;max_tpa_v2)</div><div class='add'>+			return 0;</div><div class='add'>+		bp-&gt;max_tpa = max_t(u16, bp-&gt;max_tpa_v2, MAX_TPA_P5);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='add'>+</div><div class='add'>+		rc = bnxt_alloc_one_tpa_info(bp, rxr);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_rx_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2470,6 +3790,7 @@ static void bnxt_free_rx_rings(struct bnxt *bp)</div><div class='ctx'> 	if (!bp-&gt;rx_ring)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	bnxt_free_tpa_info(bp);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='ctx'> 		struct bnxt_ring_struct *ring;</div><div class='hunk'>@@ -2480,8 +3801,9 @@ static void bnxt_free_rx_rings(struct bnxt *bp)</div><div class='ctx'> 		if (xdp_rxq_info_is_reg(&amp;rxr-&gt;xdp_rxq))</div><div class='ctx'> 			xdp_rxq_info_unreg(&amp;rxr-&gt;xdp_rxq);</div><div class='ctx'> </div><div class='del'>-		kfree(rxr-&gt;rx_tpa);</div><div class='del'>-		rxr-&gt;rx_tpa = NULL;</div><div class='add'>+		page_pool_destroy(rxr-&gt;page_pool);</div><div class='add'>+		page_pool_destroy(rxr-&gt;head_pool);</div><div class='add'>+		rxr-&gt;page_pool = rxr-&gt;head_pool = NULL;</div><div class='ctx'> </div><div class='ctx'> 		kfree(rxr-&gt;rx_agg_bmap);</div><div class='ctx'> 		rxr-&gt;rx_agg_bmap = NULL;</div><div class='hunk'>@@ -2494,9 +3816,75 @@ static void bnxt_free_rx_rings(struct bnxt *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_alloc_rx_page_pool(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_rx_ring_info *rxr,</div><div class='add'>+				   int numa_node)</div><div class='add'>+{</div><div class='add'>+	const unsigned int agg_size_fac = PAGE_SIZE / BNXT_RX_PAGE_SIZE;</div><div class='add'>+	const unsigned int rx_size_fac = PAGE_SIZE / SZ_4K;</div><div class='add'>+	struct page_pool_params pp = { 0 };</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+</div><div class='add'>+	pp.pool_size = bp-&gt;rx_agg_ring_size / agg_size_fac;</div><div class='add'>+	if (BNXT_RX_PAGE_MODE(bp))</div><div class='add'>+		pp.pool_size += bp-&gt;rx_ring_size / rx_size_fac;</div><div class='add'>+	pp.nid = numa_node;</div><div class='add'>+	pp.netdev = bp-&gt;dev;</div><div class='add'>+	pp.dev = &amp;bp-&gt;pdev-&gt;dev;</div><div class='add'>+	pp.dma_dir = bp-&gt;rx_dir;</div><div class='add'>+	pp.max_len = PAGE_SIZE;</div><div class='add'>+	pp.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV |</div><div class='add'>+		   PP_FLAG_ALLOW_UNREADABLE_NETMEM;</div><div class='add'>+	pp.queue_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+</div><div class='add'>+	pool = page_pool_create(&amp;pp);</div><div class='add'>+	if (IS_ERR(pool))</div><div class='add'>+		return PTR_ERR(pool);</div><div class='add'>+	rxr-&gt;page_pool = pool;</div><div class='add'>+</div><div class='add'>+	rxr-&gt;need_head_pool = page_pool_is_unreadable(pool);</div><div class='add'>+	if (bnxt_separate_head_pool(rxr)) {</div><div class='add'>+		pp.pool_size = min(bp-&gt;rx_ring_size / rx_size_fac, 1024);</div><div class='add'>+		pp.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;</div><div class='add'>+		pool = page_pool_create(&amp;pp);</div><div class='add'>+		if (IS_ERR(pool))</div><div class='add'>+			goto err_destroy_pp;</div><div class='add'>+	} else {</div><div class='add'>+		page_pool_get(pool);</div><div class='add'>+	}</div><div class='add'>+	rxr-&gt;head_pool = pool;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_destroy_pp:</div><div class='add'>+	page_pool_destroy(rxr-&gt;page_pool);</div><div class='add'>+	rxr-&gt;page_pool = NULL;</div><div class='add'>+	return PTR_ERR(pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_enable_rx_page_pool(struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	page_pool_enable_direct_recycling(rxr-&gt;head_pool, &amp;rxr-&gt;bnapi-&gt;napi);</div><div class='add'>+	page_pool_enable_direct_recycling(rxr-&gt;page_pool, &amp;rxr-&gt;bnapi-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_rx_agg_bmap(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	u16 mem_size;</div><div class='add'>+</div><div class='add'>+	rxr-&gt;rx_agg_bmap_size = bp-&gt;rx_agg_ring_mask + 1;</div><div class='add'>+	mem_size = rxr-&gt;rx_agg_bmap_size / 8;</div><div class='add'>+	rxr-&gt;rx_agg_bmap = kzalloc(mem_size, GFP_KERNEL);</div><div class='add'>+	if (!rxr-&gt;rx_agg_bmap)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_alloc_rx_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int i, rc, agg_rings = 0, tpa_rings = 0;</div><div class='add'>+	int numa_node = dev_to_node(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	int i, rc = 0, agg_rings = 0, cpu;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;rx_ring)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2504,49 +3892,54 @@ static int bnxt_alloc_rx_rings(struct bnxt *bp)</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='ctx'> 		agg_rings = 1;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='del'>-		tpa_rings = 1;</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='ctx'> 		struct bnxt_ring_struct *ring;</div><div class='add'>+		int cpu_node;</div><div class='ctx'> </div><div class='ctx'> 		ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='ctx'> </div><div class='del'>-		rc = xdp_rxq_info_reg(&amp;rxr-&gt;xdp_rxq, bp-&gt;dev, i);</div><div class='add'>+		cpu = cpumask_local_spread(i, numa_node);</div><div class='add'>+		cpu_node = cpu_to_node(cpu);</div><div class='add'>+		netdev_dbg(bp-&gt;dev, "Allocating page pool for rx_ring[%d] on numa_node: %d\n",</div><div class='add'>+			   i, cpu_node);</div><div class='add'>+		rc = bnxt_alloc_rx_page_pool(bp, rxr, cpu_node);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		bnxt_enable_rx_page_pool(rxr);</div><div class='add'>+</div><div class='add'>+		rc = xdp_rxq_info_reg(&amp;rxr-&gt;xdp_rxq, bp-&gt;dev, i, 0);</div><div class='ctx'> 		if (rc &lt; 0)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='add'>+		rc = xdp_rxq_info_reg_mem_model(&amp;rxr-&gt;xdp_rxq,</div><div class='add'>+						MEM_TYPE_PAGE_POOL,</div><div class='add'>+						rxr-&gt;page_pool);</div><div class='add'>+		if (rc) {</div><div class='add'>+			xdp_rxq_info_unreg(&amp;rxr-&gt;xdp_rxq);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		rc = bnxt_alloc_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='ctx'> 		ring-&gt;grp_idx = i;</div><div class='ctx'> 		if (agg_rings) {</div><div class='del'>-			u16 mem_size;</div><div class='del'>-</div><div class='ctx'> 			ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='ctx'> 			rc = bnxt_alloc_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				return rc;</div><div class='ctx'> </div><div class='ctx'> 			ring-&gt;grp_idx = i;</div><div class='del'>-			rxr-&gt;rx_agg_bmap_size = bp-&gt;rx_agg_ring_mask + 1;</div><div class='del'>-			mem_size = rxr-&gt;rx_agg_bmap_size / 8;</div><div class='del'>-			rxr-&gt;rx_agg_bmap = kzalloc(mem_size, GFP_KERNEL);</div><div class='del'>-			if (!rxr-&gt;rx_agg_bmap)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-</div><div class='del'>-			if (tpa_rings) {</div><div class='del'>-				rxr-&gt;rx_tpa = kcalloc(MAX_TPA,</div><div class='del'>-						sizeof(struct bnxt_tpa_info),</div><div class='del'>-						GFP_KERNEL);</div><div class='del'>-				if (!rxr-&gt;rx_tpa)</div><div class='del'>-					return -ENOMEM;</div><div class='del'>-			}</div><div class='add'>+			rc = bnxt_alloc_rx_agg_bmap(bp, rxr);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		rc = bnxt_alloc_tpa_info(bp);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_free_tx_rings(struct bnxt *bp)</div><div class='hunk'>@@ -2573,6 +3966,15 @@ static void bnxt_free_tx_rings(struct bnxt *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define BNXT_TC_TO_RING_BASE(bp, tc)	\</div><div class='add'>+	((tc) * (bp)-&gt;tx_nr_rings_per_tc)</div><div class='add'>+</div><div class='add'>+#define BNXT_RING_TO_TC_OFF(bp, tx)	\</div><div class='add'>+	((tx) % (bp)-&gt;tx_nr_rings_per_tc)</div><div class='add'>+</div><div class='add'>+#define BNXT_RING_TO_TC(bp, tx)		\</div><div class='add'>+	((tx) / (bp)-&gt;tx_nr_rings_per_tc)</div><div class='add'>+</div><div class='ctx'> static int bnxt_alloc_tx_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j, rc;</div><div class='hunk'>@@ -2622,19 +4024,74 @@ static int bnxt_alloc_tx_rings(struct bnxt *bp)</div><div class='ctx'> 			mapping = txr-&gt;tx_push_mapping +</div><div class='ctx'> 				sizeof(struct tx_push_bd);</div><div class='ctx'> 			txr-&gt;data_mapping = cpu_to_le64(mapping);</div><div class='del'>-</div><div class='del'>-			memset(txr-&gt;tx_push, 0, sizeof(struct tx_push_bd));</div><div class='ctx'> 		}</div><div class='ctx'> 		qidx = bp-&gt;tc_to_qidx[j];</div><div class='ctx'> 		ring-&gt;queue_id = bp-&gt;q_info[qidx].queue_id;</div><div class='add'>+		spin_lock_init(&amp;txr-&gt;xdp_tx_lock);</div><div class='ctx'> 		if (i &lt; bp-&gt;tx_nr_rings_xdp)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (i % bp-&gt;tx_nr_rings_per_tc == (bp-&gt;tx_nr_rings_per_tc - 1))</div><div class='add'>+		if (BNXT_RING_TO_TC_OFF(bp, i) == (bp-&gt;tx_nr_rings_per_tc - 1))</div><div class='ctx'> 			j++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_free_cp_arrays(struct bnxt_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;cpr-&gt;cp_ring_struct;</div><div class='add'>+</div><div class='add'>+	kfree(cpr-&gt;cp_desc_ring);</div><div class='add'>+	cpr-&gt;cp_desc_ring = NULL;</div><div class='add'>+	ring-&gt;ring_mem.pg_arr = NULL;</div><div class='add'>+	kfree(cpr-&gt;cp_desc_mapping);</div><div class='add'>+	cpr-&gt;cp_desc_mapping = NULL;</div><div class='add'>+	ring-&gt;ring_mem.dma_arr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_cp_arrays(struct bnxt_cp_ring_info *cpr, int n)</div><div class='add'>+{</div><div class='add'>+	cpr-&gt;cp_desc_ring = kcalloc(n, sizeof(*cpr-&gt;cp_desc_ring), GFP_KERNEL);</div><div class='add'>+	if (!cpr-&gt;cp_desc_ring)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	cpr-&gt;cp_desc_mapping = kcalloc(n, sizeof(*cpr-&gt;cp_desc_mapping),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!cpr-&gt;cp_desc_mapping)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_all_cp_arrays(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;bnapi)</div><div class='add'>+		return;</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='add'>+		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='add'>+</div><div class='add'>+		if (!bnapi)</div><div class='add'>+			continue;</div><div class='add'>+		bnxt_free_cp_arrays(&amp;bnapi-&gt;cp_ring);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_all_cp_arrays(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i, n = bp-&gt;cp_nr_pages;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='add'>+		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		if (!bnapi)</div><div class='add'>+			continue;</div><div class='add'>+		rc = bnxt_alloc_cp_arrays(&amp;bnapi-&gt;cp_ring, n);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_cp_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2656,30 +4113,34 @@ static void bnxt_free_cp_rings(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 		bnxt_free_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2 = cpr-&gt;cp_ring_arr[j];</div><div class='add'>+		if (!cpr-&gt;cp_ring_arr)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; cpr-&gt;cp_ring_count; j++) {</div><div class='add'>+			struct bnxt_cp_ring_info *cpr2 = &amp;cpr-&gt;cp_ring_arr[j];</div><div class='ctx'> </div><div class='del'>-			if (cpr2) {</div><div class='del'>-				ring = &amp;cpr2-&gt;cp_ring_struct;</div><div class='del'>-				bnxt_free_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='del'>-				kfree(cpr2);</div><div class='del'>-				cpr-&gt;cp_ring_arr[j] = NULL;</div><div class='del'>-			}</div><div class='add'>+			ring = &amp;cpr2-&gt;cp_ring_struct;</div><div class='add'>+			bnxt_free_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='add'>+			bnxt_free_cp_arrays(cpr2);</div><div class='ctx'> 		}</div><div class='add'>+		kfree(cpr-&gt;cp_ring_arr);</div><div class='add'>+		cpr-&gt;cp_ring_arr = NULL;</div><div class='add'>+		cpr-&gt;cp_ring_count = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct bnxt_cp_ring_info *bnxt_alloc_cp_sub_ring(struct bnxt *bp)</div><div class='add'>+static int bnxt_alloc_cp_sub_ring(struct bnxt *bp,</div><div class='add'>+				  struct bnxt_cp_ring_info *cpr)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_ring_mem_info *rmem;</div><div class='ctx'> 	struct bnxt_ring_struct *ring;</div><div class='del'>-	struct bnxt_cp_ring_info *cpr;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	cpr = kzalloc(sizeof(*cpr), GFP_KERNEL);</div><div class='del'>-	if (!cpr)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='add'>+	rc = bnxt_alloc_cp_arrays(cpr, bp-&gt;cp_nr_pages);</div><div class='add'>+	if (rc) {</div><div class='add'>+		bnxt_free_cp_arrays(cpr);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> 	ring = &amp;cpr-&gt;cp_ring_struct;</div><div class='ctx'> 	rmem = &amp;ring-&gt;ring_mem;</div><div class='ctx'> 	rmem-&gt;nr_pages = bp-&gt;cp_nr_pages;</div><div class='hunk'>@@ -2690,23 +4151,26 @@ static struct bnxt_cp_ring_info *bnxt_alloc_cp_sub_ring(struct bnxt *bp)</div><div class='ctx'> 	rc = bnxt_alloc_ring(bp, rmem);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		bnxt_free_ring(bp, rmem);</div><div class='del'>-		kfree(cpr);</div><div class='del'>-		cpr = NULL;</div><div class='add'>+		bnxt_free_cp_arrays(cpr);</div><div class='ctx'> 	}</div><div class='del'>-	return cpr;</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_cp_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	bool sh = !!(bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS);</div><div class='del'>-	int i, rc, ulp_base_vec, ulp_msix;</div><div class='add'>+	int i, j, rc, ulp_msix;</div><div class='add'>+	int tcs = bp-&gt;num_tc;</div><div class='ctx'> </div><div class='add'>+	if (!tcs)</div><div class='add'>+		tcs = 1;</div><div class='ctx'> 	ulp_msix = bnxt_get_ulp_msix_num(bp);</div><div class='del'>-	ulp_base_vec = bnxt_get_ulp_msix_base(bp);</div><div class='del'>-	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='add'>+	for (i = 0, j = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='del'>-		struct bnxt_cp_ring_info *cpr;</div><div class='add'>+		struct bnxt_cp_ring_info *cpr, *cpr2;</div><div class='ctx'> 		struct bnxt_ring_struct *ring;</div><div class='add'>+		int cp_count = 0, k;</div><div class='add'>+		int rx = 0, tx = 0;</div><div class='ctx'> </div><div class='ctx'> 		if (!bnapi)</div><div class='ctx'> 			continue;</div><div class='hunk'>@@ -2719,41 +4183,118 @@ static int bnxt_alloc_cp_rings(struct bnxt *bp)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='ctx'> </div><div class='del'>-		if (ulp_msix &amp;&amp; i &gt;= ulp_base_vec)</div><div class='del'>-			ring-&gt;map_idx = i + ulp_msix;</div><div class='del'>-		else</div><div class='del'>-			ring-&gt;map_idx = i;</div><div class='add'>+		ring-&gt;map_idx = ulp_msix + i;</div><div class='ctx'> </div><div class='del'>-		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		if (i &lt; bp-&gt;rx_nr_rings) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2 =</div><div class='del'>-				bnxt_alloc_cp_sub_ring(bp);</div><div class='del'>-</div><div class='del'>-			cpr-&gt;cp_ring_arr[BNXT_RX_HDL] = cpr2;</div><div class='del'>-			if (!cpr2)</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			cpr2-&gt;bnapi = bnapi;</div><div class='add'>+			cp_count++;</div><div class='add'>+			rx = 1;</div><div class='add'>+		}</div><div class='add'>+		if (i &lt; bp-&gt;tx_nr_rings_xdp) {</div><div class='add'>+			cp_count++;</div><div class='add'>+			tx = 1;</div><div class='add'>+		} else if ((sh &amp;&amp; i &lt; bp-&gt;tx_nr_rings) ||</div><div class='add'>+			 (!sh &amp;&amp; i &gt;= bp-&gt;rx_nr_rings)) {</div><div class='add'>+			cp_count += tcs;</div><div class='add'>+			tx = 1;</div><div class='ctx'> 		}</div><div class='del'>-		if ((sh &amp;&amp; i &lt; bp-&gt;tx_nr_rings) ||</div><div class='del'>-		    (!sh &amp;&amp; i &gt;= bp-&gt;rx_nr_rings)) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2 =</div><div class='del'>-				bnxt_alloc_cp_sub_ring(bp);</div><div class='ctx'> </div><div class='del'>-			cpr-&gt;cp_ring_arr[BNXT_TX_HDL] = cpr2;</div><div class='del'>-			if (!cpr2)</div><div class='del'>-				return -ENOMEM;</div><div class='add'>+		cpr-&gt;cp_ring_arr = kcalloc(cp_count, sizeof(*cpr),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!cpr-&gt;cp_ring_arr)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		cpr-&gt;cp_ring_count = cp_count;</div><div class='add'>+</div><div class='add'>+		for (k = 0; k &lt; cp_count; k++) {</div><div class='add'>+			cpr2 = &amp;cpr-&gt;cp_ring_arr[k];</div><div class='add'>+			rc = bnxt_alloc_cp_sub_ring(bp, cpr2);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='ctx'> 			cpr2-&gt;bnapi = bnapi;</div><div class='add'>+			cpr2-&gt;sw_stats = cpr-&gt;sw_stats;</div><div class='add'>+			cpr2-&gt;cp_idx = k;</div><div class='add'>+			if (!k &amp;&amp; rx) {</div><div class='add'>+				bp-&gt;rx_ring[i].rx_cpr = cpr2;</div><div class='add'>+				cpr2-&gt;cp_ring_type = BNXT_NQ_HDL_TYPE_RX;</div><div class='add'>+			} else {</div><div class='add'>+				int n, tc = k - rx;</div><div class='add'>+</div><div class='add'>+				n = BNXT_TC_TO_RING_BASE(bp, tc) + j;</div><div class='add'>+				bp-&gt;tx_ring[n].tx_cpr = cpr2;</div><div class='add'>+				cpr2-&gt;cp_ring_type = BNXT_NQ_HDL_TYPE_TX;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='add'>+		if (tx)</div><div class='add'>+			j++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_init_ring_struct(struct bnxt *bp)</div><div class='add'>+static void bnxt_init_rx_ring_struct(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_rx_ring_info *rxr)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_ring_mem_info *rmem;</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+	rmem-&gt;nr_pages = bp-&gt;rx_nr_pages;</div><div class='add'>+	rmem-&gt;page_size = HW_RXBD_RING_SIZE;</div><div class='add'>+	rmem-&gt;pg_arr = (void **)rxr-&gt;rx_desc_ring;</div><div class='add'>+	rmem-&gt;dma_arr = rxr-&gt;rx_desc_mapping;</div><div class='add'>+	rmem-&gt;vmem_size = SW_RXBD_RING_SIZE * bp-&gt;rx_nr_pages;</div><div class='add'>+	rmem-&gt;vmem = (void **)&amp;rxr-&gt;rx_buf_ring;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+	rmem-&gt;nr_pages = bp-&gt;rx_agg_nr_pages;</div><div class='add'>+	rmem-&gt;page_size = HW_RXBD_RING_SIZE;</div><div class='add'>+	rmem-&gt;pg_arr = (void **)rxr-&gt;rx_agg_desc_ring;</div><div class='add'>+	rmem-&gt;dma_arr = rxr-&gt;rx_agg_desc_mapping;</div><div class='add'>+	rmem-&gt;vmem_size = SW_RXBD_AGG_RING_SIZE * bp-&gt;rx_agg_nr_pages;</div><div class='add'>+	rmem-&gt;vmem = (void **)&amp;rxr-&gt;rx_agg_ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_reset_rx_ring_struct(struct bnxt *bp,</div><div class='add'>+				      struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_mem_info *rmem;</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	rxr-&gt;page_pool-&gt;p.napi = NULL;</div><div class='add'>+	rxr-&gt;page_pool = NULL;</div><div class='add'>+	rxr-&gt;head_pool-&gt;p.napi = NULL;</div><div class='add'>+	rxr-&gt;head_pool = NULL;</div><div class='add'>+	memset(&amp;rxr-&gt;xdp_rxq, 0, sizeof(struct xdp_rxq_info));</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+	rmem-&gt;pg_tbl = NULL;</div><div class='add'>+	rmem-&gt;pg_tbl_map = 0;</div><div class='add'>+	for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='add'>+		rmem-&gt;pg_arr[i] = NULL;</div><div class='add'>+		rmem-&gt;dma_arr[i] = 0;</div><div class='add'>+	}</div><div class='add'>+	*rmem-&gt;vmem = NULL;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+	rmem-&gt;pg_tbl = NULL;</div><div class='add'>+	rmem-&gt;pg_tbl_map = 0;</div><div class='add'>+	for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='add'>+		rmem-&gt;pg_arr[i] = NULL;</div><div class='add'>+		rmem-&gt;dma_arr[i] = 0;</div><div class='add'>+	}</div><div class='add'>+	*rmem-&gt;vmem = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_init_ring_struct(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_ring_mem_info *rmem;</div><div class='hunk'>@@ -2797,18 +4338,16 @@ static void bnxt_init_ring_struct(struct bnxt *bp)</div><div class='ctx'> 		rmem-&gt;vmem = (void **)&amp;rxr-&gt;rx_agg_ring;</div><div class='ctx'> </div><div class='ctx'> skip_rx:</div><div class='del'>-		txr = bnapi-&gt;tx_ring;</div><div class='del'>-		if (!txr)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ring = &amp;txr-&gt;tx_ring_struct;</div><div class='del'>-		rmem = &amp;ring-&gt;ring_mem;</div><div class='del'>-		rmem-&gt;nr_pages = bp-&gt;tx_nr_pages;</div><div class='del'>-		rmem-&gt;page_size = HW_RXBD_RING_SIZE;</div><div class='del'>-		rmem-&gt;pg_arr = (void **)txr-&gt;tx_desc_ring;</div><div class='del'>-		rmem-&gt;dma_arr = txr-&gt;tx_desc_mapping;</div><div class='del'>-		rmem-&gt;vmem_size = SW_TXBD_RING_SIZE * bp-&gt;tx_nr_pages;</div><div class='del'>-		rmem-&gt;vmem = (void **)&amp;txr-&gt;tx_buf_ring;</div><div class='add'>+		bnxt_for_each_napi_tx(j, bnapi, txr) {</div><div class='add'>+			ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+			rmem = &amp;ring-&gt;ring_mem;</div><div class='add'>+			rmem-&gt;nr_pages = bp-&gt;tx_nr_pages;</div><div class='add'>+			rmem-&gt;page_size = HW_TXBD_RING_SIZE;</div><div class='add'>+			rmem-&gt;pg_arr = (void **)txr-&gt;tx_desc_ring;</div><div class='add'>+			rmem-&gt;dma_arr = txr-&gt;tx_desc_mapping;</div><div class='add'>+			rmem-&gt;vmem_size = SW_TXBD_RING_SIZE * bp-&gt;tx_nr_pages;</div><div class='add'>+			rmem-&gt;vmem = (void **)&amp;txr-&gt;tx_buf_ring;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2834,91 +4373,145 @@ static void bnxt_init_rxbd_pages(struct bnxt_ring_struct *ring, u32 type)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr)</div><div class='add'>+static void bnxt_alloc_one_rx_ring_skb(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_rx_ring_info *rxr,</div><div class='add'>+				       int ring_nr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = bp-&gt;dev;</div><div class='del'>-	struct bnxt_rx_ring_info *rxr;</div><div class='del'>-	struct bnxt_ring_struct *ring;</div><div class='del'>-	u32 prod, type;</div><div class='add'>+	u32 prod;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	type = (bp-&gt;rx_buf_use_size &lt;&lt; RX_BD_LEN_SHIFT) |</div><div class='del'>-		RX_BD_TYPE_RX_PACKET_BD | RX_BD_FLAGS_EOP;</div><div class='del'>-</div><div class='del'>-	if (NET_IP_ALIGN == 2)</div><div class='del'>-		type |= RX_BD_FLAGS_SOP;</div><div class='del'>-</div><div class='del'>-	rxr = &amp;bp-&gt;rx_ring[ring_nr];</div><div class='del'>-	ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='del'>-	bnxt_init_rxbd_pages(ring, type);</div><div class='del'>-</div><div class='del'>-	if (BNXT_RX_PAGE_MODE(bp) &amp;&amp; bp-&gt;xdp_prog) {</div><div class='del'>-		rxr-&gt;xdp_prog = bpf_prog_add(bp-&gt;xdp_prog, 1);</div><div class='del'>-		if (IS_ERR(rxr-&gt;xdp_prog)) {</div><div class='del'>-			int rc = PTR_ERR(rxr-&gt;xdp_prog);</div><div class='del'>-</div><div class='del'>-			rxr-&gt;xdp_prog = NULL;</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	prod = rxr-&gt;rx_prod;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_ring_size; i++) {</div><div class='del'>-		if (bnxt_alloc_rx_data(bp, rxr, prod, GFP_KERNEL) != 0) {</div><div class='del'>-			netdev_warn(dev, "init'ed rx ring %d with %d/%d skbs only\n",</div><div class='add'>+		if (bnxt_alloc_rx_data(bp, rxr, prod, GFP_KERNEL)) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "init'ed rx ring %d with %d/%d skbs only\n",</div><div class='ctx'> 				    ring_nr, i, bp-&gt;rx_ring_size);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		prod = NEXT_RX(prod);</div><div class='ctx'> 	}</div><div class='ctx'> 	rxr-&gt;rx_prod = prod;</div><div class='del'>-	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='del'>-</div><div class='del'>-	ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='del'>-	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='del'>-</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	type = ((u32)BNXT_RX_PAGE_SIZE &lt;&lt; RX_BD_LEN_SHIFT) |</div><div class='del'>-		RX_BD_TYPE_RX_AGG_BD | RX_BD_FLAGS_SOP;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	bnxt_init_rxbd_pages(ring, type);</div><div class='add'>+static void bnxt_alloc_one_rx_ring_netmem(struct bnxt *bp,</div><div class='add'>+					  struct bnxt_rx_ring_info *rxr,</div><div class='add'>+					  int ring_nr)</div><div class='add'>+{</div><div class='add'>+	u32 prod;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	prod = rxr-&gt;rx_agg_prod;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_agg_ring_size; i++) {</div><div class='del'>-		if (bnxt_alloc_rx_page(bp, rxr, prod, GFP_KERNEL) != 0) {</div><div class='del'>-			netdev_warn(dev, "init'ed rx ring %d with %d/%d pages only\n",</div><div class='del'>-				    ring_nr, i, bp-&gt;rx_ring_size);</div><div class='add'>+		if (bnxt_alloc_rx_netmem(bp, rxr, prod, GFP_KERNEL)) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "init'ed rx ring %d with %d/%d pages only\n",</div><div class='add'>+				    ring_nr, i, bp-&gt;rx_agg_ring_size);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		prod = NEXT_RX_AGG(prod);</div><div class='ctx'> 	}</div><div class='ctx'> 	rxr-&gt;rx_agg_prod = prod;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_TPA) {</div><div class='del'>-		if (rxr-&gt;rx_tpa) {</div><div class='del'>-			u8 *data;</div><div class='del'>-			dma_addr_t mapping;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; MAX_TPA; i++) {</div><div class='del'>-				data = __bnxt_alloc_rx_data(bp, &amp;mapping,</div><div class='del'>-							    GFP_KERNEL);</div><div class='del'>-				if (!data)</div><div class='del'>-					return -ENOMEM;</div><div class='add'>+static int bnxt_alloc_one_tpa_info_data(struct bnxt *bp,</div><div class='add'>+					struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	u8 *data;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-				rxr-&gt;rx_tpa[i].data = data;</div><div class='del'>-				rxr-&gt;rx_tpa[i].data_ptr = data + bp-&gt;rx_offset;</div><div class='del'>-				rxr-&gt;rx_tpa[i].mapping = mapping;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			netdev_err(bp-&gt;dev, "No resource allocated for LRO/GRO\n");</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;max_tpa; i++) {</div><div class='add'>+		data = __bnxt_alloc_rx_frag(bp, &amp;mapping, rxr,</div><div class='add'>+					    GFP_KERNEL);</div><div class='add'>+		if (!data)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		rxr-&gt;rx_tpa[i].data = data;</div><div class='add'>+		rxr-&gt;rx_tpa[i].data_ptr = data + bp-&gt;rx_offset;</div><div class='add'>+		rxr-&gt;rx_tpa[i].mapping = mapping;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_alloc_one_rx_ring(struct bnxt *bp, int ring_nr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[ring_nr];</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bnxt_alloc_one_rx_ring_skb(bp, rxr, ring_nr);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bnxt_alloc_one_rx_ring_netmem(bp, rxr, ring_nr);</div><div class='add'>+</div><div class='add'>+	if (rxr-&gt;rx_tpa) {</div><div class='add'>+		rc = bnxt_alloc_one_tpa_info_data(bp, rxr);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_init_one_rx_ring_rxbd(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+	u32 type;</div><div class='add'>+</div><div class='add'>+	type = (bp-&gt;rx_buf_use_size &lt;&lt; RX_BD_LEN_SHIFT) |</div><div class='add'>+		RX_BD_TYPE_RX_PACKET_BD | RX_BD_FLAGS_EOP;</div><div class='add'>+</div><div class='add'>+	if (NET_IP_ALIGN == 2)</div><div class='add'>+		type |= RX_BD_FLAGS_SOP;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	bnxt_init_rxbd_pages(ring, type);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_init_one_rx_agg_ring_rxbd(struct bnxt *bp,</div><div class='add'>+					   struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+	u32 type;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)) {</div><div class='add'>+		type = ((u32)BNXT_RX_PAGE_SIZE &lt;&lt; RX_BD_LEN_SHIFT) |</div><div class='add'>+			RX_BD_TYPE_RX_AGG_BD;</div><div class='add'>+</div><div class='add'>+		/* On P7, setting EOP will cause the chip to disable</div><div class='add'>+		 * Relaxed Ordering (RO) for TPA data.  Disable EOP for</div><div class='add'>+		 * potentially higher performance with RO.</div><div class='add'>+		 */</div><div class='add'>+		if (BNXT_CHIP_P5_AND_MINUS(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_TPA))</div><div class='add'>+			type |= RX_BD_FLAGS_AGG_EOP;</div><div class='add'>+</div><div class='add'>+		bnxt_init_rxbd_pages(ring, type);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_init_one_rx_ring(struct bnxt *bp, int ring_nr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_rx_ring_info *rxr;</div><div class='add'>+</div><div class='add'>+	rxr = &amp;bp-&gt;rx_ring[ring_nr];</div><div class='add'>+	bnxt_init_one_rx_ring_rxbd(bp, rxr);</div><div class='add'>+</div><div class='add'>+	netif_queue_set_napi(bp-&gt;dev, ring_nr, NETDEV_QUEUE_TYPE_RX,</div><div class='add'>+			     &amp;rxr-&gt;bnapi-&gt;napi);</div><div class='add'>+</div><div class='add'>+	if (BNXT_RX_PAGE_MODE(bp) &amp;&amp; bp-&gt;xdp_prog) {</div><div class='add'>+		bpf_prog_add(bp-&gt;xdp_prog, 1);</div><div class='add'>+		rxr-&gt;xdp_prog = bp-&gt;xdp_prog;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnxt_init_one_rx_agg_ring_rxbd(bp, rxr);</div><div class='add'>+</div><div class='add'>+	return bnxt_alloc_one_rx_ring(bp, ring_nr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_init_cp_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -2930,11 +4523,10 @@ static void bnxt_init_cp_rings(struct bnxt *bp)</div><div class='ctx'> 		ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='ctx'> 		cpr-&gt;rx_ring_coal.coal_ticks = bp-&gt;rx_coal.coal_ticks;</div><div class='ctx'> 		cpr-&gt;rx_ring_coal.coal_bufs = bp-&gt;rx_coal.coal_bufs;</div><div class='del'>-		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2 = cpr-&gt;cp_ring_arr[j];</div><div class='del'>-</div><div class='del'>-			if (!cpr2)</div><div class='del'>-				continue;</div><div class='add'>+		if (!cpr-&gt;cp_ring_arr)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; cpr-&gt;cp_ring_count; j++) {</div><div class='add'>+			struct bnxt_cp_ring_info *cpr2 = &amp;cpr-&gt;cp_ring_arr[j];</div><div class='ctx'> </div><div class='ctx'> 			ring = &amp;cpr2-&gt;cp_ring_struct;</div><div class='ctx'> 			ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='hunk'>@@ -2970,13 +4562,18 @@ static int bnxt_init_tx_rings(struct bnxt *bp)</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;tx_wake_thresh = max_t(int, bp-&gt;tx_ring_size / 2,</div><div class='del'>-				   MAX_SKB_FRAGS + 1);</div><div class='add'>+				   BNXT_MIN_TX_DESC_CNT);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_tx_ring_info *txr = &amp;bp-&gt;tx_ring[i];</div><div class='ctx'> 		struct bnxt_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='ctx'> </div><div class='ctx'> 		ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+</div><div class='add'>+		if (i &gt;= bp-&gt;tx_nr_rings_xdp)</div><div class='add'>+			netif_queue_set_napi(bp-&gt;dev, i - bp-&gt;tx_nr_rings_xdp,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_TX,</div><div class='add'>+					     &amp;txr-&gt;bnapi-&gt;napi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3022,8 +4619,12 @@ static int bnxt_alloc_vnics(struct bnxt *bp)</div><div class='ctx'> 	int num_vnics = 1;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_RFS)</div><div class='del'>-		num_vnics += bp-&gt;rx_nr_rings;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_RFS) {</div><div class='add'>+		if (BNXT_SUPPORTS_NTUPLE_VNIC(bp))</div><div class='add'>+			num_vnics++;</div><div class='add'>+		else if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+			num_vnics += bp-&gt;rx_nr_rings;</div><div class='add'>+	}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='hunk'>@@ -3040,6 +4641,7 @@ static int bnxt_alloc_vnics(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> static void bnxt_init_vnics(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_vnic_info *vnic0 = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;nr_vnics; i++) {</div><div class='hunk'>@@ -3047,19 +4649,42 @@ static void bnxt_init_vnics(struct bnxt *bp)</div><div class='ctx'> 		int j;</div><div class='ctx'> </div><div class='ctx'> 		vnic-&gt;fw_vnic_id = INVALID_HW_RING_ID;</div><div class='add'>+		vnic-&gt;vnic_id = i;</div><div class='ctx'> 		for (j = 0; j &lt; BNXT_MAX_CTX_PER_VNIC; j++)</div><div class='ctx'> 			vnic-&gt;fw_rss_cos_lb_ctx[j] = INVALID_HW_RING_ID;</div><div class='ctx'> </div><div class='ctx'> 		vnic-&gt;fw_l2_ctx_id = INVALID_HW_RING_ID;</div><div class='ctx'> </div><div class='ctx'> 		if (bp-&gt;vnic_info[i].rss_hash_key) {</div><div class='del'>-			if (i == 0)</div><div class='del'>-				prandom_bytes(vnic-&gt;rss_hash_key,</div><div class='del'>-					      HW_HASH_KEY_SIZE);</div><div class='del'>-			else</div><div class='del'>-				memcpy(vnic-&gt;rss_hash_key,</div><div class='del'>-				       bp-&gt;vnic_info[0].rss_hash_key,</div><div class='add'>+			if (i == BNXT_VNIC_DEFAULT) {</div><div class='add'>+				u8 *key = (void *)vnic-&gt;rss_hash_key;</div><div class='add'>+				int k;</div><div class='add'>+</div><div class='add'>+				if (!bp-&gt;rss_hash_key_valid &amp;&amp;</div><div class='add'>+				    !bp-&gt;rss_hash_key_updated) {</div><div class='add'>+					get_random_bytes(bp-&gt;rss_hash_key,</div><div class='add'>+							 HW_HASH_KEY_SIZE);</div><div class='add'>+					bp-&gt;rss_hash_key_updated = true;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				memcpy(vnic-&gt;rss_hash_key, bp-&gt;rss_hash_key,</div><div class='ctx'> 				       HW_HASH_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+				if (!bp-&gt;rss_hash_key_updated)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				bp-&gt;rss_hash_key_updated = false;</div><div class='add'>+				bp-&gt;rss_hash_key_valid = true;</div><div class='add'>+</div><div class='add'>+				bp-&gt;toeplitz_prefix = 0;</div><div class='add'>+				for (k = 0; k &lt; 8; k++) {</div><div class='add'>+					bp-&gt;toeplitz_prefix &lt;&lt;= 8;</div><div class='add'>+					bp-&gt;toeplitz_prefix |= key[k];</div><div class='add'>+				}</div><div class='add'>+			} else {</div><div class='add'>+				memcpy(vnic-&gt;rss_hash_key, vnic0-&gt;rss_hash_key,</div><div class='add'>+				       HW_HASH_KEY_SIZE);</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -3092,26 +4717,36 @@ void bnxt_set_tpa_flags(struct bnxt *bp)</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_GRO;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_init_ring_params(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	unsigned int rx_size;</div><div class='add'>+</div><div class='add'>+	bp-&gt;rx_copybreak = BNXT_DEFAULT_RX_COPYBREAK;</div><div class='add'>+	/* Try to fit 4 chunks into a 4k page */</div><div class='add'>+	rx_size = SZ_1K -</div><div class='add'>+		NET_SKB_PAD - SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+	bp-&gt;dev-&gt;cfg-&gt;hds_thresh = max(BNXT_DEFAULT_RX_COPYBREAK, rx_size);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* bp-&gt;rx_ring_size, bp-&gt;tx_ring_size, dev-&gt;mtu, BNXT_FLAG_{G|L}RO flags must</div><div class='ctx'>  * be set on entry.</div><div class='ctx'>  */</div><div class='ctx'> void bnxt_set_ring_params(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	u32 ring_size, rx_size, rx_space;</div><div class='add'>+	u32 ring_size, rx_size, rx_space, max_rx_cmpl;</div><div class='ctx'> 	u32 agg_factor = 0, agg_ring_size = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* 8 for CRC and VLAN */</div><div class='ctx'> 	rx_size = SKB_DATA_ALIGN(bp-&gt;dev-&gt;mtu + ETH_HLEN + NET_IP_ALIGN + 8);</div><div class='ctx'> </div><div class='del'>-	rx_space = rx_size + NET_SKB_PAD +</div><div class='add'>+	rx_space = rx_size + ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) +</div><div class='ctx'> 		SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> </div><div class='del'>-	bp-&gt;rx_copy_thresh = BNXT_RX_COPY_THRESH;</div><div class='ctx'> 	ring_size = bp-&gt;rx_ring_size;</div><div class='ctx'> 	bp-&gt;rx_agg_ring_size = 0;</div><div class='ctx'> 	bp-&gt;rx_agg_nr_pages = 0;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA || bp-&gt;flags &amp; BNXT_FLAG_HDS)</div><div class='ctx'> 		agg_factor = min_t(u32, 4, 65536 / BNXT_RX_PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;flags &amp;= ~BNXT_FLAG_JUMBO;</div><div class='hunk'>@@ -3123,9 +4758,15 @@ void bnxt_set_ring_params(struct bnxt *bp)</div><div class='ctx'> 		if (jumbo_factor &gt; agg_factor)</div><div class='ctx'> 			agg_factor = jumbo_factor;</div><div class='ctx'> 	}</div><div class='del'>-	agg_ring_size = ring_size * agg_factor;</div><div class='add'>+	if (agg_factor) {</div><div class='add'>+		if (ring_size &gt; BNXT_MAX_RX_DESC_CNT_JUM_ENA) {</div><div class='add'>+			ring_size = BNXT_MAX_RX_DESC_CNT_JUM_ENA;</div><div class='add'>+			netdev_warn(bp-&gt;dev, "RX ring size reduced from %d to %d because the jumbo ring is now enabled\n",</div><div class='add'>+				    bp-&gt;rx_ring_size, ring_size);</div><div class='add'>+			bp-&gt;rx_ring_size = ring_size;</div><div class='add'>+		}</div><div class='add'>+		agg_ring_size = ring_size * agg_factor;</div><div class='ctx'> </div><div class='del'>-	if (agg_ring_size) {</div><div class='ctx'> 		bp-&gt;rx_agg_nr_pages = bnxt_calc_nr_ring_pages(agg_ring_size,</div><div class='ctx'> 							RX_DESC_CNT);</div><div class='ctx'> 		if (bp-&gt;rx_agg_nr_pages &gt; MAX_RX_AGG_PAGES) {</div><div class='hunk'>@@ -3138,9 +4779,20 @@ void bnxt_set_ring_params(struct bnxt *bp)</div><div class='ctx'> 		}</div><div class='ctx'> 		bp-&gt;rx_agg_ring_size = agg_ring_size;</div><div class='ctx'> 		bp-&gt;rx_agg_ring_mask = (bp-&gt;rx_agg_nr_pages * RX_DESC_CNT) - 1;</div><div class='del'>-		rx_size = SKB_DATA_ALIGN(BNXT_RX_COPY_THRESH + NET_IP_ALIGN);</div><div class='del'>-		rx_space = rx_size + NET_SKB_PAD +</div><div class='del'>-			SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+</div><div class='add'>+		if (BNXT_RX_PAGE_MODE(bp)) {</div><div class='add'>+			rx_space = PAGE_SIZE;</div><div class='add'>+			rx_size = PAGE_SIZE -</div><div class='add'>+				  ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -</div><div class='add'>+				  SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+		} else {</div><div class='add'>+			rx_size = max3(BNXT_DEFAULT_RX_COPYBREAK,</div><div class='add'>+				       bp-&gt;rx_copybreak,</div><div class='add'>+				       bp-&gt;dev-&gt;cfg_pending-&gt;hds_thresh);</div><div class='add'>+			rx_size = SKB_DATA_ALIGN(rx_size + NET_IP_ALIGN);</div><div class='add'>+			rx_space = rx_size + NET_SKB_PAD +</div><div class='add'>+				SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;rx_buf_use_size = rx_size;</div><div class='hunk'>@@ -3153,7 +4805,15 @@ void bnxt_set_ring_params(struct bnxt *bp)</div><div class='ctx'> 	bp-&gt;tx_nr_pages = bnxt_calc_nr_ring_pages(ring_size, TX_DESC_CNT);</div><div class='ctx'> 	bp-&gt;tx_ring_mask = (bp-&gt;tx_nr_pages * TX_DESC_CNT) - 1;</div><div class='ctx'> </div><div class='del'>-	ring_size = bp-&gt;rx_ring_size * (2 + agg_factor) + bp-&gt;tx_ring_size;</div><div class='add'>+	max_rx_cmpl = bp-&gt;rx_ring_size;</div><div class='add'>+	/* MAX TPA needs to be added because TPA_START completions are</div><div class='add'>+	 * immediately recycled, so the TPA completions are not bound by</div><div class='add'>+	 * the RX ring size.</div><div class='add'>+	 */</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		max_rx_cmpl += bp-&gt;max_tpa;</div><div class='add'>+	/* RX and TPA completions are 32-byte, all others are 16-byte */</div><div class='add'>+	ring_size = max_rx_cmpl * 2 + agg_ring_size + bp-&gt;tx_ring_size;</div><div class='ctx'> 	bp-&gt;cp_ring_size = ring_size;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;cp_nr_pages = bnxt_calc_nr_ring_pages(ring_size, CP_DESC_CNT);</div><div class='hunk'>@@ -3170,26 +4830,51 @@ void bnxt_set_ring_params(struct bnxt *bp)</div><div class='ctx'> /* Changing allocation mode of RX rings.</div><div class='ctx'>  * TODO: Update when extending xdp_rxq_info to support allocation modes.</div><div class='ctx'>  */</div><div class='del'>-int bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode)</div><div class='add'>+static void __bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = bp-&gt;dev;</div><div class='add'>+</div><div class='ctx'> 	if (page_mode) {</div><div class='del'>-		if (bp-&gt;dev-&gt;mtu &gt; BNXT_MAX_PAGE_MODE_MTU)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		bp-&gt;dev-&gt;max_mtu =</div><div class='del'>-			min_t(u16, bp-&gt;max_mtu, BNXT_MAX_PAGE_MODE_MTU);</div><div class='del'>-		bp-&gt;flags &amp;= ~BNXT_FLAG_AGG_RINGS;</div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_NO_AGG_RINGS | BNXT_FLAG_RX_PAGE_MODE;</div><div class='add'>+		bp-&gt;flags &amp;= ~(BNXT_FLAG_AGG_RINGS | BNXT_FLAG_NO_AGG_RINGS);</div><div class='add'>+		bp-&gt;flags |= BNXT_FLAG_RX_PAGE_MODE;</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;xdp_prog-&gt;aux-&gt;xdp_has_frags)</div><div class='add'>+			dev-&gt;max_mtu = min_t(u16, bp-&gt;max_mtu, BNXT_MAX_MTU);</div><div class='add'>+		else</div><div class='add'>+			dev-&gt;max_mtu =</div><div class='add'>+				min_t(u16, bp-&gt;max_mtu, BNXT_MAX_PAGE_MODE_MTU);</div><div class='add'>+		if (dev-&gt;mtu &gt; BNXT_MAX_PAGE_MODE_MTU) {</div><div class='add'>+			bp-&gt;flags |= BNXT_FLAG_JUMBO;</div><div class='add'>+			bp-&gt;rx_skb_func = bnxt_rx_multi_page_skb;</div><div class='add'>+		} else {</div><div class='add'>+			bp-&gt;flags |= BNXT_FLAG_NO_AGG_RINGS;</div><div class='add'>+			bp-&gt;rx_skb_func = bnxt_rx_page_skb;</div><div class='add'>+		}</div><div class='ctx'> 		bp-&gt;rx_dir = DMA_BIDIRECTIONAL;</div><div class='del'>-		bp-&gt;rx_skb_func = bnxt_rx_page_skb;</div><div class='del'>-		/* Disable LRO or GRO_HW */</div><div class='del'>-		netdev_update_features(bp-&gt;dev);</div><div class='ctx'> 	} else {</div><div class='del'>-		bp-&gt;dev-&gt;max_mtu = bp-&gt;max_mtu;</div><div class='add'>+		dev-&gt;max_mtu = bp-&gt;max_mtu;</div><div class='ctx'> 		bp-&gt;flags &amp;= ~BNXT_FLAG_RX_PAGE_MODE;</div><div class='ctx'> 		bp-&gt;rx_dir = DMA_FROM_DEVICE;</div><div class='ctx'> 		bp-&gt;rx_skb_func = bnxt_rx_skb;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode)</div><div class='add'>+{</div><div class='add'>+	__bnxt_set_rx_skb_mode(bp, page_mode);</div><div class='add'>+</div><div class='add'>+	if (!page_mode) {</div><div class='add'>+		int rx, tx;</div><div class='add'>+</div><div class='add'>+		bnxt_get_max_rings(bp, &amp;rx, &amp;tx, true);</div><div class='add'>+		if (rx &gt; 1) {</div><div class='add'>+			bp-&gt;flags &amp;= ~BNXT_FLAG_NO_AGG_RINGS;</div><div class='add'>+			bp-&gt;dev-&gt;hw_features |= NETIF_F_LRO;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Update LRO and GRO_HW availability */</div><div class='add'>+	netdev_update_features(bp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_free_vnic_attributes(struct bnxt *bp)</div><div class='hunk'>@@ -3217,7 +4902,7 @@ static void bnxt_free_vnic_attributes(struct bnxt *bp)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (vnic-&gt;rss_table) {</div><div class='del'>-			dma_free_coherent(&amp;pdev-&gt;dev, PAGE_SIZE,</div><div class='add'>+			dma_free_coherent(&amp;pdev-&gt;dev, vnic-&gt;rss_table_size,</div><div class='ctx'> 					  vnic-&gt;rss_table,</div><div class='ctx'> 					  vnic-&gt;rss_table_dma_addr);</div><div class='ctx'> 			vnic-&gt;rss_table = NULL;</div><div class='hunk'>@@ -3263,7 +4948,7 @@ static int bnxt_alloc_vnic_attributes(struct bnxt *bp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 			goto vnic_skip_grps;</div><div class='ctx'> </div><div class='ctx'> 		if (vnic-&gt;flags &amp; BNXT_VNIC_RSS_FLAG)</div><div class='hunk'>@@ -3277,12 +4962,18 @@ static int bnxt_alloc_vnic_attributes(struct bnxt *bp)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> vnic_skip_grps:</div><div class='del'>-		if ((bp-&gt;flags &amp; BNXT_FLAG_NEW_RSS_CAP) &amp;&amp;</div><div class='add'>+		if ((bp-&gt;rss_cap &amp; BNXT_RSS_CAP_NEW_RSS_CAP) &amp;&amp;</div><div class='ctx'> 		    !(vnic-&gt;flags &amp; BNXT_VNIC_RSS_FLAG))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		/* Allocate rss table and hash key */</div><div class='del'>-		vnic-&gt;rss_table = dma_alloc_coherent(&amp;pdev-&gt;dev, PAGE_SIZE,</div><div class='add'>+		size = L1_CACHE_ALIGN(HW_HASH_INDEX_SIZE * sizeof(u16));</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			size = L1_CACHE_ALIGN(BNXT_MAX_RSS_TABLE_SIZE_P5);</div><div class='add'>+</div><div class='add'>+		vnic-&gt;rss_table_size = size + HW_HASH_KEY_SIZE;</div><div class='add'>+		vnic-&gt;rss_table = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+						     vnic-&gt;rss_table_size,</div><div class='ctx'> 						     &amp;vnic-&gt;rss_table_dma_addr,</div><div class='ctx'> 						     GFP_KERNEL);</div><div class='ctx'> 		if (!vnic-&gt;rss_table) {</div><div class='hunk'>@@ -3290,8 +4981,6 @@ vnic_skip_grps:</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		size = L1_CACHE_ALIGN(HW_HASH_INDEX_SIZE * sizeof(u16));</div><div class='del'>-</div><div class='ctx'> 		vnic-&gt;rss_hash_key = ((void *)vnic-&gt;rss_table) + size;</div><div class='ctx'> 		vnic-&gt;rss_hash_key_dma_addr = vnic-&gt;rss_table_dma_addr + size;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3303,171 +4992,248 @@ out:</div><div class='ctx'> </div><div class='ctx'> static void bnxt_free_hwrm_resources(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	struct bnxt_hwrm_wait_token *token;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_cmd_resp_addr) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, PAGE_SIZE, bp-&gt;hwrm_cmd_resp_addr,</div><div class='del'>-				  bp-&gt;hwrm_cmd_resp_dma_addr);</div><div class='del'>-		bp-&gt;hwrm_cmd_resp_addr = NULL;</div><div class='del'>-	}</div><div class='add'>+	dma_pool_destroy(bp-&gt;hwrm_dma_pool);</div><div class='add'>+	bp-&gt;hwrm_dma_pool = NULL;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_cmd_kong_resp_addr) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, PAGE_SIZE,</div><div class='del'>-				  bp-&gt;hwrm_cmd_kong_resp_addr,</div><div class='del'>-				  bp-&gt;hwrm_cmd_kong_resp_dma_addr);</div><div class='del'>-		bp-&gt;hwrm_cmd_kong_resp_addr = NULL;</div><div class='del'>-	}</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(token, &amp;bp-&gt;hwrm_pending_list, node)</div><div class='add'>+		WRITE_ONCE(token-&gt;state, BNXT_HWRM_CANCELLED);</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_alloc_kong_hwrm_resources(struct bnxt *bp)</div><div class='add'>+static int bnxt_alloc_hwrm_resources(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-</div><div class='del'>-	bp-&gt;hwrm_cmd_kong_resp_addr =</div><div class='del'>-		dma_alloc_coherent(&amp;pdev-&gt;dev, PAGE_SIZE,</div><div class='del'>-				   &amp;bp-&gt;hwrm_cmd_kong_resp_dma_addr,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;hwrm_cmd_kong_resp_addr)</div><div class='add'>+	bp-&gt;hwrm_dma_pool = dma_pool_create("bnxt_hwrm", &amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+					    BNXT_HWRM_DMA_SIZE,</div><div class='add'>+					    BNXT_HWRM_DMA_ALIGN, 0);</div><div class='add'>+	if (!bp-&gt;hwrm_dma_pool)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	INIT_HLIST_HEAD(&amp;bp-&gt;hwrm_pending_list);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_alloc_hwrm_resources(struct bnxt *bp)</div><div class='add'>+static void bnxt_free_stats_mem(struct bnxt *bp, struct bnxt_stats_mem *stats)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	kfree(stats-&gt;hw_masks);</div><div class='add'>+	stats-&gt;hw_masks = NULL;</div><div class='add'>+	kfree(stats-&gt;sw_stats);</div><div class='add'>+	stats-&gt;sw_stats = NULL;</div><div class='add'>+	if (stats-&gt;hw_stats) {</div><div class='add'>+		dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, stats-&gt;len, stats-&gt;hw_stats,</div><div class='add'>+				  stats-&gt;hw_stats_map);</div><div class='add'>+		stats-&gt;hw_stats = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;hwrm_cmd_resp_addr = dma_alloc_coherent(&amp;pdev-&gt;dev, PAGE_SIZE,</div><div class='del'>-						   &amp;bp-&gt;hwrm_cmd_resp_dma_addr,</div><div class='del'>-						   GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;hwrm_cmd_resp_addr)</div><div class='add'>+static int bnxt_alloc_stats_mem(struct bnxt *bp, struct bnxt_stats_mem *stats,</div><div class='add'>+				bool alloc_masks)</div><div class='add'>+{</div><div class='add'>+	stats-&gt;hw_stats = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, stats-&gt;len,</div><div class='add'>+					     &amp;stats-&gt;hw_stats_map, GFP_KERNEL);</div><div class='add'>+	if (!stats-&gt;hw_stats)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	stats-&gt;sw_stats = kzalloc(stats-&gt;len, GFP_KERNEL);</div><div class='add'>+	if (!stats-&gt;sw_stats)</div><div class='add'>+		goto stats_mem_err;</div><div class='add'>+</div><div class='add'>+	if (alloc_masks) {</div><div class='add'>+		stats-&gt;hw_masks = kzalloc(stats-&gt;len, GFP_KERNEL);</div><div class='add'>+		if (!stats-&gt;hw_masks)</div><div class='add'>+			goto stats_mem_err;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+stats_mem_err:</div><div class='add'>+	bnxt_free_stats_mem(bp, stats);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_free_hwrm_short_cmd_req(struct bnxt *bp)</div><div class='add'>+static void bnxt_fill_masks(u64 *mask_arr, u64 mask, int count)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;hwrm_short_cmd_req_addr) {</div><div class='del'>-		struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, bp-&gt;hwrm_max_ext_req_len,</div><div class='del'>-				  bp-&gt;hwrm_short_cmd_req_addr,</div><div class='del'>-				  bp-&gt;hwrm_short_cmd_req_dma_addr);</div><div class='del'>-		bp-&gt;hwrm_short_cmd_req_addr = NULL;</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		mask_arr[i] = mask;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_alloc_hwrm_short_cmd_req(struct bnxt *bp)</div><div class='add'>+static void bnxt_copy_hw_masks(u64 *mask_arr, __le64 *hw_mask_arr, int count)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-</div><div class='del'>-	bp-&gt;hwrm_short_cmd_req_addr =</div><div class='del'>-		dma_alloc_coherent(&amp;pdev-&gt;dev, bp-&gt;hwrm_max_ext_req_len,</div><div class='del'>-				   &amp;bp-&gt;hwrm_short_cmd_req_dma_addr,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;hwrm_short_cmd_req_addr)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		mask_arr[i] = le64_to_cpu(hw_mask_arr[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_free_port_stats(struct bnxt *bp)</div><div class='add'>+static int bnxt_hwrm_func_qstat_ext(struct bnxt *bp,</div><div class='add'>+				    struct bnxt_stats_mem *stats)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	struct hwrm_func_qstats_ext_output *resp;</div><div class='add'>+	struct hwrm_func_qstats_ext_input *req;</div><div class='add'>+	__le64 *hw_masks;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;flags &amp;= ~BNXT_FLAG_PORT_STATS;</div><div class='del'>-	bp-&gt;flags &amp;= ~BNXT_FLAG_PORT_STATS_EXT;</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED) ||</div><div class='add'>+	    !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QSTATS_EXT);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;flags = FUNC_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_rx_port_stats) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, bp-&gt;hw_port_stats_size,</div><div class='del'>-				  bp-&gt;hw_rx_port_stats,</div><div class='del'>-				  bp-&gt;hw_rx_port_stats_map);</div><div class='del'>-		bp-&gt;hw_rx_port_stats = NULL;</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		hw_masks = &amp;resp-&gt;rx_ucast_pkts;</div><div class='add'>+		bnxt_copy_hw_masks(stats-&gt;hw_masks, hw_masks, stats-&gt;len / 8);</div><div class='ctx'> 	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_tx_port_stats_ext) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, sizeof(struct tx_port_stats_ext),</div><div class='del'>-				  bp-&gt;hw_tx_port_stats_ext,</div><div class='del'>-				  bp-&gt;hw_tx_port_stats_ext_map);</div><div class='del'>-		bp-&gt;hw_tx_port_stats_ext = NULL;</div><div class='add'>+static int bnxt_hwrm_port_qstats(struct bnxt *bp, u8 flags);</div><div class='add'>+static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp, u8 flags);</div><div class='add'>+</div><div class='add'>+static void bnxt_init_stats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_napi *bnapi = bp-&gt;bnapi[0];</div><div class='add'>+	struct bnxt_cp_ring_info *cpr;</div><div class='add'>+	struct bnxt_stats_mem *stats;</div><div class='add'>+	__le64 *rx_stats, *tx_stats;</div><div class='add'>+	int rc, rx_count, tx_count;</div><div class='add'>+	u64 *rx_masks, *tx_masks;</div><div class='add'>+	u64 mask;</div><div class='add'>+	u8 flags;</div><div class='add'>+</div><div class='add'>+	cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+	stats = &amp;cpr-&gt;stats;</div><div class='add'>+	rc = bnxt_hwrm_func_qstat_ext(bp, stats);</div><div class='add'>+	if (rc) {</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			mask = (1ULL &lt;&lt; 48) - 1;</div><div class='add'>+		else</div><div class='add'>+			mask = -1ULL;</div><div class='add'>+		bnxt_fill_masks(stats-&gt;hw_masks, mask, stats-&gt;len / 8);</div><div class='ctx'> 	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS) {</div><div class='add'>+		stats = &amp;bp-&gt;port_stats;</div><div class='add'>+		rx_stats = stats-&gt;hw_stats;</div><div class='add'>+		rx_masks = stats-&gt;hw_masks;</div><div class='add'>+		rx_count = sizeof(struct rx_port_stats) / 8;</div><div class='add'>+		tx_stats = rx_stats + BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+		tx_masks = rx_masks + BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+		tx_count = sizeof(struct tx_port_stats) / 8;</div><div class='add'>+</div><div class='add'>+		flags = PORT_QSTATS_REQ_FLAGS_COUNTER_MASK;</div><div class='add'>+		rc = bnxt_hwrm_port_qstats(bp, flags);</div><div class='add'>+		if (rc) {</div><div class='add'>+			mask = (1ULL &lt;&lt; 40) - 1;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_rx_port_stats_ext) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, sizeof(struct rx_port_stats_ext),</div><div class='del'>-				  bp-&gt;hw_rx_port_stats_ext,</div><div class='del'>-				  bp-&gt;hw_rx_port_stats_ext_map);</div><div class='del'>-		bp-&gt;hw_rx_port_stats_ext = NULL;</div><div class='add'>+			bnxt_fill_masks(rx_masks, mask, rx_count);</div><div class='add'>+			bnxt_fill_masks(tx_masks, mask, tx_count);</div><div class='add'>+		} else {</div><div class='add'>+			bnxt_copy_hw_masks(rx_masks, rx_stats, rx_count);</div><div class='add'>+			bnxt_copy_hw_masks(tx_masks, tx_stats, tx_count);</div><div class='add'>+			bnxt_hwrm_port_qstats(bp, 0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT) {</div><div class='add'>+		stats = &amp;bp-&gt;rx_port_stats_ext;</div><div class='add'>+		rx_stats = stats-&gt;hw_stats;</div><div class='add'>+		rx_masks = stats-&gt;hw_masks;</div><div class='add'>+		rx_count = sizeof(struct rx_port_stats_ext) / 8;</div><div class='add'>+		stats = &amp;bp-&gt;tx_port_stats_ext;</div><div class='add'>+		tx_stats = stats-&gt;hw_stats;</div><div class='add'>+		tx_masks = stats-&gt;hw_masks;</div><div class='add'>+		tx_count = sizeof(struct tx_port_stats_ext) / 8;</div><div class='add'>+</div><div class='add'>+		flags = PORT_QSTATS_EXT_REQ_FLAGS_COUNTER_MASK;</div><div class='add'>+		rc = bnxt_hwrm_port_qstats_ext(bp, flags);</div><div class='add'>+		if (rc) {</div><div class='add'>+			mask = (1ULL &lt;&lt; 40) - 1;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_pcie_stats) {</div><div class='del'>-		dma_free_coherent(&amp;pdev-&gt;dev, sizeof(struct pcie_ctx_hw_stats),</div><div class='del'>-				  bp-&gt;hw_pcie_stats, bp-&gt;hw_pcie_stats_map);</div><div class='del'>-		bp-&gt;hw_pcie_stats = NULL;</div><div class='add'>+			bnxt_fill_masks(rx_masks, mask, rx_count);</div><div class='add'>+			if (tx_stats)</div><div class='add'>+				bnxt_fill_masks(tx_masks, mask, tx_count);</div><div class='add'>+		} else {</div><div class='add'>+			bnxt_copy_hw_masks(rx_masks, rx_stats, rx_count);</div><div class='add'>+			if (tx_stats)</div><div class='add'>+				bnxt_copy_hw_masks(tx_masks, tx_stats,</div><div class='add'>+						   tx_count);</div><div class='add'>+			bnxt_hwrm_port_qstats_ext(bp, 0);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_free_port_stats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	bp-&gt;flags &amp;= ~BNXT_FLAG_PORT_STATS;</div><div class='add'>+	bp-&gt;flags &amp;= ~BNXT_FLAG_PORT_STATS_EXT;</div><div class='add'>+</div><div class='add'>+	bnxt_free_stats_mem(bp, &amp;bp-&gt;port_stats);</div><div class='add'>+	bnxt_free_stats_mem(bp, &amp;bp-&gt;rx_port_stats_ext);</div><div class='add'>+	bnxt_free_stats_mem(bp, &amp;bp-&gt;tx_port_stats_ext);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_ring_stats(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-	int size, i;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;bnapi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct ctx_hw_stats);</div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> </div><div class='del'>-		if (cpr-&gt;hw_stats) {</div><div class='del'>-			dma_free_coherent(&amp;pdev-&gt;dev, size, cpr-&gt;hw_stats,</div><div class='del'>-					  cpr-&gt;hw_stats_map);</div><div class='del'>-			cpr-&gt;hw_stats = NULL;</div><div class='del'>-		}</div><div class='add'>+		bnxt_free_stats_mem(bp, &amp;cpr-&gt;stats);</div><div class='add'>+</div><div class='add'>+		kfree(cpr-&gt;sw_stats);</div><div class='add'>+		cpr-&gt;sw_stats = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_stats(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 size, i;</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	size = sizeof(struct ctx_hw_stats);</div><div class='add'>+	size = bp-&gt;hw_ring_stats_size;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> </div><div class='del'>-		cpr-&gt;hw_stats = dma_alloc_coherent(&amp;pdev-&gt;dev, size,</div><div class='del'>-						   &amp;cpr-&gt;hw_stats_map,</div><div class='del'>-						   GFP_KERNEL);</div><div class='del'>-		if (!cpr-&gt;hw_stats)</div><div class='add'>+		cpr-&gt;sw_stats = kzalloc(sizeof(*cpr-&gt;sw_stats), GFP_KERNEL);</div><div class='add'>+		if (!cpr-&gt;sw_stats)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+		cpr-&gt;stats.len = size;</div><div class='add'>+		rc = bnxt_alloc_stats_mem(bp, &amp;cpr-&gt;stats, !i);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='ctx'> 		cpr-&gt;hw_stats_ctx_id = INVALID_STATS_CTX_ID;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_VF(bp) || bp-&gt;chip_num == CHIP_NUM_58700)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_rx_port_stats)</div><div class='add'>+	if (bp-&gt;port_stats.hw_stats)</div><div class='ctx'> 		goto alloc_ext_stats;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;hw_port_stats_size = sizeof(struct rx_port_stats) +</div><div class='del'>-				 sizeof(struct tx_port_stats) + 1024;</div><div class='del'>-</div><div class='del'>-	bp-&gt;hw_rx_port_stats =</div><div class='del'>-		dma_alloc_coherent(&amp;pdev-&gt;dev, bp-&gt;hw_port_stats_size,</div><div class='del'>-				   &amp;bp-&gt;hw_rx_port_stats_map,</div><div class='del'>-				   GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;hw_rx_port_stats)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	bp-&gt;port_stats.len = BNXT_PORT_STATS_SIZE;</div><div class='add'>+	rc = bnxt_alloc_stats_mem(bp, &amp;bp-&gt;port_stats, true);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;hw_tx_port_stats = (void *)(bp-&gt;hw_rx_port_stats + 1) + 512;</div><div class='del'>-	bp-&gt;hw_tx_port_stats_map = bp-&gt;hw_rx_port_stats_map +</div><div class='del'>-				   sizeof(struct rx_port_stats) + 512;</div><div class='ctx'> 	bp-&gt;flags |= BNXT_FLAG_PORT_STATS;</div><div class='ctx'> </div><div class='ctx'> alloc_ext_stats:</div><div class='hunk'>@@ -3476,47 +5242,34 @@ alloc_ext_stats:</div><div class='ctx'> 		if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_STATS_SUPPORTED))</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_rx_port_stats_ext)</div><div class='add'>+	if (bp-&gt;rx_port_stats_ext.hw_stats)</div><div class='ctx'> 		goto alloc_tx_ext_stats;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;hw_rx_port_stats_ext =</div><div class='del'>-		dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(struct rx_port_stats_ext),</div><div class='del'>-				   &amp;bp-&gt;hw_rx_port_stats_ext_map, GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;hw_rx_port_stats_ext)</div><div class='add'>+	bp-&gt;rx_port_stats_ext.len = sizeof(struct rx_port_stats_ext);</div><div class='add'>+	rc = bnxt_alloc_stats_mem(bp, &amp;bp-&gt;rx_port_stats_ext, true);</div><div class='add'>+	/* Extended stats are optional */</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> alloc_tx_ext_stats:</div><div class='del'>-	if (bp-&gt;hw_tx_port_stats_ext)</div><div class='del'>-		goto alloc_pcie_stats;</div><div class='add'>+	if (bp-&gt;tx_port_stats_ext.hw_stats)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &gt;= 0x10902 ||</div><div class='ctx'> 	    (bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_STATS_SUPPORTED)) {</div><div class='del'>-		bp-&gt;hw_tx_port_stats_ext =</div><div class='del'>-			dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='del'>-					   sizeof(struct tx_port_stats_ext),</div><div class='del'>-					   &amp;bp-&gt;hw_tx_port_stats_ext_map,</div><div class='del'>-					   GFP_KERNEL);</div><div class='add'>+		bp-&gt;tx_port_stats_ext.len = sizeof(struct tx_port_stats_ext);</div><div class='add'>+		rc = bnxt_alloc_stats_mem(bp, &amp;bp-&gt;tx_port_stats_ext, true);</div><div class='add'>+		/* Extended stats are optional */</div><div class='add'>+		if (rc)</div><div class='add'>+			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;flags |= BNXT_FLAG_PORT_STATS_EXT;</div><div class='del'>-</div><div class='del'>-alloc_pcie_stats:</div><div class='del'>-	if (bp-&gt;hw_pcie_stats ||</div><div class='del'>-	    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PCIE_STATS_SUPPORTED))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bp-&gt;hw_pcie_stats =</div><div class='del'>-		dma_alloc_coherent(&amp;pdev-&gt;dev, sizeof(struct pcie_ctx_hw_stats),</div><div class='del'>-				   &amp;bp-&gt;hw_pcie_stats_map, GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;hw_pcie_stats)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bp-&gt;flags |= BNXT_FLAG_PCIE_STATS;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_clear_ring_indices(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;bnapi)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -3533,10 +5286,10 @@ static void bnxt_clear_ring_indices(struct bnxt *bp)</div><div class='ctx'> 		cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> 		cpr-&gt;cp_raw_cons = 0;</div><div class='ctx'> </div><div class='del'>-		txr = bnapi-&gt;tx_ring;</div><div class='del'>-		if (txr) {</div><div class='add'>+		bnxt_for_each_napi_tx(j, bnapi, txr) {</div><div class='ctx'> 			txr-&gt;tx_prod = 0;</div><div class='ctx'> 			txr-&gt;tx_cons = 0;</div><div class='add'>+			txr-&gt;tx_hw_cons = 0;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rxr = bnapi-&gt;rx_ring;</div><div class='hunk'>@@ -3546,16 +5299,56 @@ static void bnxt_clear_ring_indices(struct bnxt *bp)</div><div class='ctx'> 			rxr-&gt;rx_sw_agg_prod = 0;</div><div class='ctx'> 			rxr-&gt;rx_next_cons = 0;</div><div class='ctx'> 		}</div><div class='add'>+		bnapi-&gt;events = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_free_ntp_fltrs(struct bnxt *bp, bool irq_reinit)</div><div class='add'>+void bnxt_insert_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr)</div><div class='add'>+{</div><div class='add'>+	u8 type = fltr-&gt;type, flags = fltr-&gt;flags;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;fltr-&gt;list);</div><div class='add'>+	if ((type == BNXT_FLTR_TYPE_L2 &amp;&amp; flags &amp; BNXT_ACT_RING_DST) ||</div><div class='add'>+	    (type == BNXT_FLTR_TYPE_NTUPLE &amp;&amp; flags &amp; BNXT_ACT_NO_AGING))</div><div class='add'>+		list_add_tail(&amp;fltr-&gt;list, &amp;bp-&gt;usr_fltr_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_del_one_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr)</div><div class='add'>+{</div><div class='add'>+	if (!list_empty(&amp;fltr-&gt;list))</div><div class='add'>+		list_del_init(&amp;fltr-&gt;list);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_clear_usr_fltrs(struct bnxt *bp, bool all)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_filter_base *usr_fltr, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(usr_fltr, tmp, &amp;bp-&gt;usr_fltr_list, list) {</div><div class='add'>+		if (!all &amp;&amp; usr_fltr-&gt;type == BNXT_FLTR_TYPE_L2)</div><div class='add'>+			continue;</div><div class='add'>+		bnxt_del_one_usr_fltr(bp, usr_fltr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_del_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr)</div><div class='add'>+{</div><div class='add'>+	hlist_del(&amp;fltr-&gt;hash);</div><div class='add'>+	bnxt_del_one_usr_fltr(bp, fltr);</div><div class='add'>+	if (fltr-&gt;flags) {</div><div class='add'>+		clear_bit(fltr-&gt;sw_id, bp-&gt;ntp_fltr_bmap);</div><div class='add'>+		bp-&gt;ntp_fltr_count--;</div><div class='add'>+	}</div><div class='add'>+	kfree(fltr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_ntp_fltrs(struct bnxt *bp, bool all)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	/* Under rtnl_lock and all our NAPIs have been disabled.  It's</div><div class='del'>-	 * safe to delete the hash table.</div><div class='add'>+	netdev_assert_locked_or_invisible(bp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Under netdev instance lock and all our NAPIs have been disabled.</div><div class='add'>+	 * It's safe to delete the hash table.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; BNXT_NTP_FLTR_HASH_SIZE; i++) {</div><div class='ctx'> 		struct hlist_head *head;</div><div class='hunk'>@@ -3563,42 +5356,67 @@ static void bnxt_free_ntp_fltrs(struct bnxt *bp, bool irq_reinit)</div><div class='ctx'> 		struct bnxt_ntuple_filter *fltr;</div><div class='ctx'> </div><div class='ctx'> 		head = &amp;bp-&gt;ntp_fltr_hash_tbl[i];</div><div class='del'>-		hlist_for_each_entry_safe(fltr, tmp, head, hash) {</div><div class='del'>-			hlist_del(&amp;fltr-&gt;hash);</div><div class='del'>-			kfree(fltr);</div><div class='add'>+		hlist_for_each_entry_safe(fltr, tmp, head, base.hash) {</div><div class='add'>+			bnxt_del_l2_filter(bp, fltr-&gt;l2_fltr);</div><div class='add'>+			if (!all &amp;&amp; ((fltr-&gt;base.flags &amp; BNXT_ACT_FUNC_DST) ||</div><div class='add'>+				     !list_empty(&amp;fltr-&gt;base.list)))</div><div class='add'>+				continue;</div><div class='add'>+			bnxt_del_fltr(bp, &amp;fltr-&gt;base);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (irq_reinit) {</div><div class='del'>-		kfree(bp-&gt;ntp_fltr_bmap);</div><div class='del'>-		bp-&gt;ntp_fltr_bmap = NULL;</div><div class='del'>-	}</div><div class='add'>+	if (!all)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bitmap_free(bp-&gt;ntp_fltr_bmap);</div><div class='add'>+	bp-&gt;ntp_fltr_bmap = NULL;</div><div class='ctx'> 	bp-&gt;ntp_fltr_count = 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_ntp_fltrs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_RFS))</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_RFS) || bp-&gt;ntp_fltr_bmap)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BNXT_NTP_FLTR_HASH_SIZE; i++)</div><div class='ctx'> 		INIT_HLIST_HEAD(&amp;bp-&gt;ntp_fltr_hash_tbl[i]);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;ntp_fltr_count = 0;</div><div class='del'>-	bp-&gt;ntp_fltr_bmap = kcalloc(BITS_TO_LONGS(BNXT_NTP_FLTR_MAX_FLTR),</div><div class='del'>-				    sizeof(long),</div><div class='del'>-				    GFP_KERNEL);</div><div class='add'>+	bp-&gt;ntp_fltr_bmap = bitmap_zalloc(bp-&gt;max_fltr, GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;ntp_fltr_bmap)</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='del'>-#else</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_l2_filters(struct bnxt *bp, bool all)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BNXT_L2_FLTR_HASH_SIZE; i++) {</div><div class='add'>+		struct hlist_head *head;</div><div class='add'>+		struct hlist_node *tmp;</div><div class='add'>+		struct bnxt_l2_filter *fltr;</div><div class='add'>+</div><div class='add'>+		head = &amp;bp-&gt;l2_fltr_hash_tbl[i];</div><div class='add'>+		hlist_for_each_entry_safe(fltr, tmp, head, base.hash) {</div><div class='add'>+			if (!all &amp;&amp; ((fltr-&gt;base.flags &amp; BNXT_ACT_FUNC_DST) ||</div><div class='add'>+				     !list_empty(&amp;fltr-&gt;base.list)))</div><div class='add'>+				continue;</div><div class='add'>+			bnxt_del_fltr(bp, &amp;fltr-&gt;base);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_init_l2_fltr_tbl(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BNXT_L2_FLTR_HASH_SIZE; i++)</div><div class='add'>+		INIT_HLIST_HEAD(&amp;bp-&gt;l2_fltr_hash_tbl[i]);</div><div class='add'>+	get_random_bytes(&amp;bp-&gt;hash_seed, sizeof(bp-&gt;hash_seed));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_free_mem(struct bnxt *bp, bool irq_re_init)</div><div class='hunk'>@@ -3607,9 +5425,14 @@ static void bnxt_free_mem(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 	bnxt_free_tx_rings(bp);</div><div class='ctx'> 	bnxt_free_rx_rings(bp);</div><div class='ctx'> 	bnxt_free_cp_rings(bp);</div><div class='del'>-	bnxt_free_ntp_fltrs(bp, irq_re_init);</div><div class='add'>+	bnxt_free_all_cp_arrays(bp);</div><div class='add'>+	bnxt_free_ntp_fltrs(bp, false);</div><div class='add'>+	bnxt_free_l2_filters(bp, false);</div><div class='ctx'> 	if (irq_re_init) {</div><div class='ctx'> 		bnxt_free_ring_stats(bp);</div><div class='add'>+		if (!(bp-&gt;phy_flags &amp; BNXT_PHY_FL_PORT_STATS_NO_RESET) ||</div><div class='add'>+		    test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+			bnxt_free_port_stats(bp);</div><div class='ctx'> 		bnxt_free_ring_grps(bp);</div><div class='ctx'> 		bnxt_free_vnics(bp);</div><div class='ctx'> 		kfree(bp-&gt;tx_ring_map);</div><div class='hunk'>@@ -3647,7 +5470,7 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 			bp-&gt;bnapi[i] = bnapi;</div><div class='ctx'> 			bp-&gt;bnapi[i]-&gt;index = i;</div><div class='ctx'> 			bp-&gt;bnapi[i]-&gt;bp = bp;</div><div class='del'>-			if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+			if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 				struct bnxt_cp_ring_info *cpr =</div><div class='ctx'> 					&amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='ctx'> </div><div class='hunk'>@@ -3665,11 +5488,13 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 		for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='ctx'> 			struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='ctx'> </div><div class='del'>-			if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+			if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 				rxr-&gt;rx_ring_struct.ring_mem.flags =</div><div class='ctx'> 					BNXT_RMEM_RING_PTE_FLAG;</div><div class='ctx'> 				rxr-&gt;rx_agg_ring_struct.ring_mem.flags =</div><div class='ctx'> 					BNXT_RMEM_RING_PTE_FLAG;</div><div class='add'>+			} else {</div><div class='add'>+				rxr-&gt;rx_cpr =  &amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='ctx'> 			}</div><div class='ctx'> 			rxr-&gt;bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 			bp-&gt;bnapi[i]-&gt;rx_ring = &amp;bp-&gt;rx_ring[i];</div><div class='hunk'>@@ -3692,27 +5517,39 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 		else</div><div class='ctx'> 			j = bp-&gt;rx_nr_rings;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++, j++) {</div><div class='add'>+		for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='ctx'> 			struct bnxt_tx_ring_info *txr = &amp;bp-&gt;tx_ring[i];</div><div class='add'>+			struct bnxt_napi *bnapi2;</div><div class='ctx'> </div><div class='del'>-			if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+			if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 				txr-&gt;tx_ring_struct.ring_mem.flags =</div><div class='ctx'> 					BNXT_RMEM_RING_PTE_FLAG;</div><div class='del'>-			txr-&gt;bnapi = bp-&gt;bnapi[j];</div><div class='del'>-			bp-&gt;bnapi[j]-&gt;tx_ring = txr;</div><div class='ctx'> 			bp-&gt;tx_ring_map[i] = bp-&gt;tx_nr_rings_xdp + i;</div><div class='ctx'> 			if (i &gt;= bp-&gt;tx_nr_rings_xdp) {</div><div class='add'>+				int k = j + BNXT_RING_TO_TC_OFF(bp, i);</div><div class='add'>+</div><div class='add'>+				bnapi2 = bp-&gt;bnapi[k];</div><div class='ctx'> 				txr-&gt;txq_index = i - bp-&gt;tx_nr_rings_xdp;</div><div class='del'>-				bp-&gt;bnapi[j]-&gt;tx_int = bnxt_tx_int;</div><div class='add'>+				txr-&gt;tx_napi_idx =</div><div class='add'>+					BNXT_RING_TO_TC(bp, txr-&gt;txq_index);</div><div class='add'>+				bnapi2-&gt;tx_ring[txr-&gt;tx_napi_idx] = txr;</div><div class='add'>+				bnapi2-&gt;tx_int = bnxt_tx_int;</div><div class='ctx'> 			} else {</div><div class='del'>-				bp-&gt;bnapi[j]-&gt;flags |= BNXT_NAPI_FLAG_XDP;</div><div class='del'>-				bp-&gt;bnapi[j]-&gt;tx_int = bnxt_tx_int_xdp;</div><div class='add'>+				bnapi2 = bp-&gt;bnapi[j];</div><div class='add'>+				bnapi2-&gt;flags |= BNXT_NAPI_FLAG_XDP;</div><div class='add'>+				bnapi2-&gt;tx_ring[0] = txr;</div><div class='add'>+				bnapi2-&gt;tx_int = bnxt_tx_int_xdp;</div><div class='add'>+				j++;</div><div class='ctx'> 			}</div><div class='add'>+			txr-&gt;bnapi = bnapi2;</div><div class='add'>+			if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+				txr-&gt;tx_cpr = &amp;bnapi2-&gt;cp_ring;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		rc = bnxt_alloc_stats(bp);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto alloc_mem_err;</div><div class='add'>+		bnxt_init_stats(bp);</div><div class='ctx'> </div><div class='ctx'> 		rc = bnxt_alloc_ntp_fltrs(bp);</div><div class='ctx'> 		if (rc)</div><div class='hunk'>@@ -3723,6 +5560,10 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 			goto alloc_mem_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	rc = bnxt_alloc_all_cp_arrays(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto alloc_mem_err;</div><div class='add'>+</div><div class='ctx'> 	bnxt_init_ring_struct(bp);</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_alloc_rx_rings(bp);</div><div class='hunk'>@@ -3737,8 +5578,13 @@ static int bnxt_alloc_mem(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto alloc_mem_err;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;vnic_info[0].flags |= BNXT_VNIC_RSS_FLAG | BNXT_VNIC_MCAST_FLAG |</div><div class='del'>-				  BNXT_VNIC_UCAST_FLAG;</div><div class='add'>+	bp-&gt;vnic_info[BNXT_VNIC_DEFAULT].flags |= BNXT_VNIC_RSS_FLAG |</div><div class='add'>+						  BNXT_VNIC_MCAST_FLAG |</div><div class='add'>+						  BNXT_VNIC_UCAST_FLAG;</div><div class='add'>+	if (BNXT_SUPPORTS_NTUPLE_VNIC(bp) &amp;&amp; (bp-&gt;flags &amp; BNXT_FLAG_RFS))</div><div class='add'>+		bp-&gt;vnic_info[BNXT_VNIC_NTUPLE].flags |=</div><div class='add'>+			BNXT_VNIC_RSS_FLAG | BNXT_VNIC_NTUPLE_FLAG;</div><div class='add'>+</div><div class='ctx'> 	rc = bnxt_alloc_vnic_attributes(bp);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto alloc_mem_err;</div><div class='hunk'>@@ -3779,6 +5625,9 @@ static void bnxt_disable_int_sync(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!bp-&gt;irq_tbl)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	atomic_inc(&amp;bp-&gt;intr_sem);</div><div class='ctx'> </div><div class='ctx'> 	bnxt_disable_int(bp);</div><div class='hunk'>@@ -3802,415 +5651,569 @@ static void bnxt_enable_int(struct bnxt *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bnxt_hwrm_cmd_hdr_init(struct bnxt *bp, void *request, u16 req_type,</div><div class='del'>-			    u16 cmpl_ring, u16 target_id)</div><div class='add'>+int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp, unsigned long *bmap, int bmap_size,</div><div class='add'>+			    bool async_only)</div><div class='ctx'> {</div><div class='del'>-	struct input *req = request;</div><div class='add'>+	DECLARE_BITMAP(async_events_bmap, 256);</div><div class='add'>+	u32 *events = (u32 *)async_events_bmap;</div><div class='add'>+	struct hwrm_func_drv_rgtr_output *resp;</div><div class='add'>+	struct hwrm_func_drv_rgtr_input *req;</div><div class='add'>+	u32 flags;</div><div class='add'>+	int rc, i;</div><div class='ctx'> </div><div class='del'>-	req-&gt;req_type = cpu_to_le16(req_type);</div><div class='del'>-	req-&gt;cmpl_ring = cpu_to_le16(cmpl_ring);</div><div class='del'>-	req-&gt;target_id = cpu_to_le16(target_id);</div><div class='del'>-	if (bnxt_kong_hwrm_message(bp, req))</div><div class='del'>-		req-&gt;resp_addr = cpu_to_le64(bp-&gt;hwrm_cmd_kong_resp_dma_addr);</div><div class='del'>-	else</div><div class='del'>-		req-&gt;resp_addr = cpu_to_le64(bp-&gt;hwrm_cmd_resp_dma_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,</div><div class='del'>-				 int timeout, bool silent)</div><div class='del'>-{</div><div class='del'>-	int i, intr_process, rc, tmo_count;</div><div class='del'>-	struct input *req = msg;</div><div class='del'>-	u32 *data = msg;</div><div class='del'>-	__le32 *resp_len;</div><div class='del'>-	u8 *valid;</div><div class='del'>-	u16 cp_ring_id, len = 0;</div><div class='del'>-	struct hwrm_err_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	u16 max_req_len = BNXT_HWRM_MAX_REQ_LEN;</div><div class='del'>-	struct hwrm_short_input short_input = {0};</div><div class='del'>-	u32 doorbell_offset = BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER;</div><div class='del'>-	u8 *resp_addr = (u8 *)bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	u32 bar_offset = BNXT_GRCPF_REG_CHIMP_COMM;</div><div class='del'>-	u16 dst = BNXT_HWRM_CHNL_CHIMP;</div><div class='del'>-</div><div class='del'>-	if (msg_len &gt; BNXT_HWRM_MAX_REQ_LEN) {</div><div class='del'>-		if (msg_len &gt; bp-&gt;hwrm_max_ext_req_len ||</div><div class='del'>-		    !bp-&gt;hwrm_short_cmd_req_addr)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_DRV_RGTR);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	if (bnxt_hwrm_kong_chnl(bp, req)) {</div><div class='del'>-		dst = BNXT_HWRM_CHNL_KONG;</div><div class='del'>-		bar_offset = BNXT_GRCPF_REG_KONG_COMM;</div><div class='del'>-		doorbell_offset = BNXT_GRCPF_REG_KONG_COMM_TRIGGER;</div><div class='del'>-		resp = bp-&gt;hwrm_cmd_kong_resp_addr;</div><div class='del'>-		resp_addr = (u8 *)bp-&gt;hwrm_cmd_kong_resp_addr;</div><div class='del'>-	}</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_OS_TYPE |</div><div class='add'>+				   FUNC_DRV_RGTR_REQ_ENABLES_VER |</div><div class='add'>+				   FUNC_DRV_RGTR_REQ_ENABLES_ASYNC_EVENT_FWD);</div><div class='add'>+</div><div class='add'>+	req-&gt;os_type = cpu_to_le16(FUNC_DRV_RGTR_REQ_OS_TYPE_LINUX);</div><div class='add'>+	flags = FUNC_DRV_RGTR_REQ_FLAGS_16BIT_VER_MODE;</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET)</div><div class='add'>+		flags |= FUNC_DRV_RGTR_REQ_FLAGS_HOT_RESET_SUPPORT;</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY)</div><div class='add'>+		flags |= FUNC_DRV_RGTR_REQ_FLAGS_ERROR_RECOVERY_SUPPORT |</div><div class='add'>+			 FUNC_DRV_RGTR_REQ_FLAGS_MASTER_SUPPORT;</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_NPAR_1_2)</div><div class='add'>+		flags |= FUNC_DRV_RGTR_REQ_FLAGS_NPAR_1_2_SUPPORT;</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	req-&gt;ver_maj_8b = DRV_VER_MAJ;</div><div class='add'>+	req-&gt;ver_min_8b = DRV_VER_MIN;</div><div class='add'>+	req-&gt;ver_upd_8b = DRV_VER_UPD;</div><div class='add'>+	req-&gt;ver_maj = cpu_to_le16(DRV_VER_MAJ);</div><div class='add'>+	req-&gt;ver_min = cpu_to_le16(DRV_VER_MIN);</div><div class='add'>+	req-&gt;ver_upd = cpu_to_le16(DRV_VER_UPD);</div><div class='ctx'> </div><div class='del'>-	memset(resp, 0, PAGE_SIZE);</div><div class='del'>-	cp_ring_id = le16_to_cpu(req-&gt;cmpl_ring);</div><div class='del'>-	intr_process = (cp_ring_id == INVALID_HW_RING_ID) ? 0 : 1;</div><div class='add'>+	if (BNXT_PF(bp)) {</div><div class='add'>+		u32 data[8];</div><div class='add'>+		int i;</div><div class='ctx'> </div><div class='del'>-	req-&gt;seq_id = cpu_to_le16(bnxt_get_hwrm_seq_id(bp, dst));</div><div class='del'>-	/* currently supports only one outstanding message */</div><div class='del'>-	if (intr_process)</div><div class='del'>-		bp-&gt;hwrm_intr_seq_id = le16_to_cpu(req-&gt;seq_id);</div><div class='add'>+		memset(data, 0, sizeof(data));</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(bnxt_vf_req_snif); i++) {</div><div class='add'>+			u16 cmd = bnxt_vf_req_snif[i];</div><div class='add'>+			unsigned int bit, idx;</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_SHORT_CMD) ||</div><div class='del'>-	    msg_len &gt; BNXT_HWRM_MAX_REQ_LEN) {</div><div class='del'>-		void *short_cmd_req = bp-&gt;hwrm_short_cmd_req_addr;</div><div class='del'>-		u16 max_msg_len;</div><div class='add'>+			if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_LINK_ADMIN) &amp;&amp;</div><div class='add'>+			    cmd == HWRM_PORT_PHY_QCFG)</div><div class='add'>+				continue;</div><div class='ctx'> </div><div class='del'>-		/* Set boundary for maximum extended request length for short</div><div class='del'>-		 * cmd format. If passed up from device use the max supported</div><div class='del'>-		 * internal req length.</div><div class='del'>-		 */</div><div class='del'>-		max_msg_len = bp-&gt;hwrm_max_ext_req_len;</div><div class='add'>+			idx = cmd / 32;</div><div class='add'>+			bit = cmd % 32;</div><div class='add'>+			data[idx] |= 1 &lt;&lt; bit;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		memcpy(short_cmd_req, req, msg_len);</div><div class='del'>-		if (msg_len &lt; max_msg_len)</div><div class='del'>-			memset(short_cmd_req + msg_len, 0,</div><div class='del'>-			       max_msg_len - msg_len);</div><div class='add'>+		for (i = 0; i &lt; 8; i++)</div><div class='add'>+			req-&gt;vf_req_fwd[i] = cpu_to_le32(data[i]);</div><div class='ctx'> </div><div class='del'>-		short_input.req_type = req-&gt;req_type;</div><div class='del'>-		short_input.signature =</div><div class='del'>-				cpu_to_le16(SHORT_REQ_SIGNATURE_SHORT_CMD);</div><div class='del'>-		short_input.size = cpu_to_le16(msg_len);</div><div class='del'>-		short_input.req_addr =</div><div class='del'>-			cpu_to_le64(bp-&gt;hwrm_short_cmd_req_dma_addr);</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_VF_REQ_FWD);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		data = (u32 *)&amp;short_input;</div><div class='del'>-		msg_len = sizeof(short_input);</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_OVS_64BIT_HANDLE)</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(</div><div class='add'>+			FUNC_DRV_RGTR_REQ_FLAGS_FLOW_HANDLE_64BIT_MODE);</div><div class='ctx'> </div><div class='del'>-		/* Sync memory write before updating doorbell */</div><div class='del'>-		wmb();</div><div class='add'>+	memset(async_events_bmap, 0, sizeof(async_events_bmap));</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(bnxt_async_events_arr); i++) {</div><div class='add'>+		u16 event_id = bnxt_async_events_arr[i];</div><div class='ctx'> </div><div class='del'>-		max_req_len = BNXT_HWRM_SHORT_REQ_LEN;</div><div class='add'>+		if (event_id == ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY &amp;&amp;</div><div class='add'>+		    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY))</div><div class='add'>+			continue;</div><div class='add'>+		if (event_id == ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE &amp;&amp;</div><div class='add'>+		    !bp-&gt;ptp_cfg)</div><div class='add'>+			continue;</div><div class='add'>+		__set_bit(bnxt_async_events_arr[i], async_events_bmap);</div><div class='ctx'> 	}</div><div class='add'>+	if (bmap &amp;&amp; bmap_size) {</div><div class='add'>+		for (i = 0; i &lt; bmap_size; i++) {</div><div class='add'>+			if (test_bit(i, bmap))</div><div class='add'>+				__set_bit(i, async_events_bmap);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; 8; i++)</div><div class='add'>+		req-&gt;async_event_fwd[i] |= cpu_to_le32(events[i]);</div><div class='ctx'> </div><div class='del'>-	/* Write request msg to hwrm channel */</div><div class='del'>-	__iowrite32_copy(bp-&gt;bar0 + bar_offset, data, msg_len / 4);</div><div class='add'>+	if (async_only)</div><div class='add'>+		req-&gt;enables =</div><div class='add'>+			cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_ASYNC_EVENT_FWD);</div><div class='ctx'> </div><div class='del'>-	for (i = msg_len; i &lt; max_req_len; i += 4)</div><div class='del'>-		writel(0, bp-&gt;bar0 + bar_offset + i);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		set_bit(BNXT_STATE_DRV_REGISTERED, &amp;bp-&gt;state);</div><div class='add'>+		if (resp-&gt;flags &amp;</div><div class='add'>+		    cpu_to_le32(FUNC_DRV_RGTR_RESP_FLAGS_IF_CHANGE_SUPPORTED))</div><div class='add'>+			bp-&gt;fw_cap |= BNXT_FW_CAP_IF_CHANGE;</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Ring channel doorbell */</div><div class='del'>-	writel(1, bp-&gt;bar0 + doorbell_offset);</div><div class='add'>+int bnxt_hwrm_func_drv_unrgtr(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_drv_unrgtr_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!timeout)</div><div class='del'>-		timeout = DFLT_HWRM_CMD_TIMEOUT;</div><div class='del'>-	/* convert timeout to usec */</div><div class='del'>-	timeout *= 1000;</div><div class='add'>+	if (!test_and_clear_bit(BNXT_STATE_DRV_REGISTERED, &amp;bp-&gt;state))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	i = 0;</div><div class='del'>-	/* Short timeout for the first few iterations:</div><div class='del'>-	 * number of loops = number of loops for short timeout +</div><div class='del'>-	 * number of loops for standard timeout.</div><div class='del'>-	 */</div><div class='del'>-	tmo_count = HWRM_SHORT_TIMEOUT_COUNTER;</div><div class='del'>-	timeout = timeout - HWRM_SHORT_MIN_TIMEOUT * HWRM_SHORT_TIMEOUT_COUNTER;</div><div class='del'>-	tmo_count += DIV_ROUND_UP(timeout, HWRM_MIN_TIMEOUT);</div><div class='del'>-	resp_len = (__le32 *)(resp_addr + HWRM_RESP_LEN_OFFSET);</div><div class='del'>-</div><div class='del'>-	if (intr_process) {</div><div class='del'>-		u16 seq_id = bp-&gt;hwrm_intr_seq_id;</div><div class='del'>-</div><div class='del'>-		/* Wait until hwrm response cmpl interrupt is processed */</div><div class='del'>-		while (bp-&gt;hwrm_intr_seq_id != (u16)~seq_id &amp;&amp;</div><div class='del'>-		       i++ &lt; tmo_count) {</div><div class='del'>-			/* on first few passes, just barely sleep */</div><div class='del'>-			if (i &lt; HWRM_SHORT_TIMEOUT_COUNTER)</div><div class='del'>-				usleep_range(HWRM_SHORT_MIN_TIMEOUT,</div><div class='del'>-					     HWRM_SHORT_MAX_TIMEOUT);</div><div class='del'>-			else</div><div class='del'>-				usleep_range(HWRM_MIN_TIMEOUT,</div><div class='del'>-					     HWRM_MAX_TIMEOUT);</div><div class='del'>-		}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_DRV_UNRGTR);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;hwrm_intr_seq_id != (u16)~seq_id) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "Resp cmpl intr err msg: 0x%x\n",</div><div class='del'>-				   le16_to_cpu(req-&gt;req_type));</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		len = (le32_to_cpu(*resp_len) &amp; HWRM_RESP_LEN_MASK) &gt;&gt;</div><div class='del'>-		      HWRM_RESP_LEN_SFT;</div><div class='del'>-		valid = resp_addr + len - 1;</div><div class='del'>-	} else {</div><div class='del'>-		int j;</div><div class='add'>+static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa);</div><div class='ctx'> </div><div class='del'>-		/* Check if response len is updated */</div><div class='del'>-		for (i = 0; i &lt; tmo_count; i++) {</div><div class='del'>-			len = (le32_to_cpu(*resp_len) &amp; HWRM_RESP_LEN_MASK) &gt;&gt;</div><div class='del'>-			      HWRM_RESP_LEN_SFT;</div><div class='del'>-			if (len)</div><div class='del'>-				break;</div><div class='del'>-			/* on first few passes, just barely sleep */</div><div class='del'>-			if (i &lt; HWRM_SHORT_TIMEOUT_COUNTER)</div><div class='del'>-				usleep_range(HWRM_SHORT_MIN_TIMEOUT,</div><div class='del'>-					     HWRM_SHORT_MAX_TIMEOUT);</div><div class='del'>-			else</div><div class='del'>-				usleep_range(HWRM_MIN_TIMEOUT,</div><div class='del'>-					     HWRM_MAX_TIMEOUT);</div><div class='del'>-		}</div><div class='add'>+static int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, u8 tunnel_type)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_tunnel_dst_port_free_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-		if (i &gt;= tmo_count) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "Error (timeout: %d) msg {0x%x 0x%x} len:%d\n",</div><div class='del'>-				   HWRM_TOTAL_TIMEOUT(i),</div><div class='del'>-				   le16_to_cpu(req-&gt;req_type),</div><div class='del'>-				   le16_to_cpu(req-&gt;seq_id), len);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='add'>+	if (tunnel_type == TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN &amp;&amp;</div><div class='add'>+	    bp-&gt;vxlan_fw_dst_port_id == INVALID_HW_RING_ID)</div><div class='add'>+		return 0;</div><div class='add'>+	if (tunnel_type == TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE &amp;&amp;</div><div class='add'>+	    bp-&gt;nge_fw_dst_port_id == INVALID_HW_RING_ID)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-		/* Last byte of resp contains valid bit */</div><div class='del'>-		valid = resp_addr + len - 1;</div><div class='del'>-		for (j = 0; j &lt; HWRM_VALID_BIT_DELAY_USEC; j++) {</div><div class='del'>-			/* make sure we read from updated DMA memory */</div><div class='del'>-			dma_rmb();</div><div class='del'>-			if (*valid)</div><div class='del'>-				break;</div><div class='del'>-			usleep_range(1, 5);</div><div class='del'>-		}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_TUNNEL_DST_PORT_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-		if (j &gt;= HWRM_VALID_BIT_DELAY_USEC) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "Error (timeout: %d) msg {0x%x 0x%x} len:%d v:%d\n",</div><div class='del'>-				   HWRM_TOTAL_TIMEOUT(i),</div><div class='del'>-				   le16_to_cpu(req-&gt;req_type),</div><div class='del'>-				   le16_to_cpu(req-&gt;seq_id), len, *valid);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='add'>+	req-&gt;tunnel_type = tunnel_type;</div><div class='add'>+</div><div class='add'>+	switch (tunnel_type) {</div><div class='add'>+	case TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN:</div><div class='add'>+		req-&gt;tunnel_dst_port_id = cpu_to_le16(bp-&gt;vxlan_fw_dst_port_id);</div><div class='add'>+		bp-&gt;vxlan_port = 0;</div><div class='add'>+		bp-&gt;vxlan_fw_dst_port_id = INVALID_HW_RING_ID;</div><div class='add'>+		break;</div><div class='add'>+	case TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE:</div><div class='add'>+		req-&gt;tunnel_dst_port_id = cpu_to_le16(bp-&gt;nge_fw_dst_port_id);</div><div class='add'>+		bp-&gt;nge_port = 0;</div><div class='add'>+		bp-&gt;nge_fw_dst_port_id = INVALID_HW_RING_ID;</div><div class='add'>+		break;</div><div class='add'>+	case TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE:</div><div class='add'>+		req-&gt;tunnel_dst_port_id = cpu_to_le16(bp-&gt;vxlan_gpe_fw_dst_port_id);</div><div class='add'>+		bp-&gt;vxlan_gpe_port = 0;</div><div class='add'>+		bp-&gt;vxlan_gpe_fw_dst_port_id = INVALID_HW_RING_ID;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Zero valid bit for compatibility.  Valid bit in an older spec</div><div class='del'>-	 * may become a new field in a newer spec.  We must make sure that</div><div class='del'>-	 * a new field not implemented by old spec will read zero.</div><div class='del'>-	 */</div><div class='del'>-	*valid = 0;</div><div class='del'>-	rc = le16_to_cpu(resp-&gt;error_code);</div><div class='del'>-	if (rc &amp;&amp; !silent)</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm req_type 0x%x seq id 0x%x error 0x%x\n",</div><div class='del'>-			   le16_to_cpu(resp-&gt;req_type),</div><div class='del'>-			   le16_to_cpu(resp-&gt;seq_id), rc);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm_tunnel_dst_port_free failed. rc:%d\n",</div><div class='add'>+			   rc);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		bnxt_set_tpa(bp, true);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int _hwrm_send_message(struct bnxt *bp, void *msg, u32 msg_len, int timeout)</div><div class='add'>+static int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, __be16 port,</div><div class='add'>+					   u8 tunnel_type)</div><div class='ctx'> {</div><div class='del'>-	return bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, false);</div><div class='del'>-}</div><div class='add'>+	struct hwrm_tunnel_dst_port_alloc_output *resp;</div><div class='add'>+	struct hwrm_tunnel_dst_port_alloc_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-int _hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 msg_len,</div><div class='del'>-			      int timeout)</div><div class='del'>-{</div><div class='del'>-	return bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, true);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_TUNNEL_DST_PORT_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;tunnel_type = tunnel_type;</div><div class='add'>+	req-&gt;tunnel_dst_port_val = port;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm_tunnel_dst_port_alloc failed. rc:%d\n",</div><div class='add'>+			   rc);</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (tunnel_type) {</div><div class='add'>+	case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN:</div><div class='add'>+		bp-&gt;vxlan_port = port;</div><div class='add'>+		bp-&gt;vxlan_fw_dst_port_id =</div><div class='add'>+			le16_to_cpu(resp-&gt;tunnel_dst_port_id);</div><div class='add'>+		break;</div><div class='add'>+	case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE:</div><div class='add'>+		bp-&gt;nge_port = port;</div><div class='add'>+		bp-&gt;nge_fw_dst_port_id = le16_to_cpu(resp-&gt;tunnel_dst_port_id);</div><div class='add'>+		break;</div><div class='add'>+	case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE:</div><div class='add'>+		bp-&gt;vxlan_gpe_port = port;</div><div class='add'>+		bp-&gt;vxlan_gpe_fw_dst_port_id =</div><div class='add'>+			le16_to_cpu(resp-&gt;tunnel_dst_port_id);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		bnxt_set_tpa(bp, true);</div><div class='add'>+</div><div class='add'>+err_out:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hwrm_send_message(struct bnxt *bp, void *msg, u32 msg_len, int timeout)</div><div class='add'>+static int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, u16 vnic_id)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_cfa_l2_set_rx_mask_input *req;</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, msg, msg_len, timeout);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_L2_SET_RX_MASK);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='add'>+	if (vnic-&gt;rx_mask &amp; CFA_L2_SET_RX_MASK_REQ_MASK_MCAST) {</div><div class='add'>+		req-&gt;num_mc_entries = cpu_to_le32(vnic-&gt;mc_list_count);</div><div class='add'>+		req-&gt;mc_tbl_addr = cpu_to_le64(vnic-&gt;mc_list_mapping);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;mask = cpu_to_le32(vnic-&gt;rx_mask);</div><div class='add'>+	return hwrm_req_send_silent(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 msg_len,</div><div class='del'>-			     int timeout)</div><div class='add'>+void bnxt_del_l2_filter(struct bnxt *bp, struct bnxt_l2_filter *fltr)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	if (!atomic_dec_and_test(&amp;fltr-&gt;refcnt))</div><div class='add'>+		return;</div><div class='add'>+	spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	if (!test_and_clear_bit(BNXT_FLTR_INSERTED, &amp;fltr-&gt;base.state)) {</div><div class='add'>+		spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	hlist_del_rcu(&amp;fltr-&gt;base.hash);</div><div class='add'>+	bnxt_del_one_usr_fltr(bp, &amp;fltr-&gt;base);</div><div class='add'>+	if (fltr-&gt;base.flags) {</div><div class='add'>+		clear_bit(fltr-&gt;base.sw_id, bp-&gt;ntp_fltr_bmap);</div><div class='add'>+		bp-&gt;ntp_fltr_count--;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	kfree_rcu(fltr, base.rcu);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = bnxt_hwrm_do_send_msg(bp, msg, msg_len, timeout, true);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='add'>+static struct bnxt_l2_filter *__bnxt_lookup_l2_filter(struct bnxt *bp,</div><div class='add'>+						      struct bnxt_l2_key *key,</div><div class='add'>+						      u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head = &amp;bp-&gt;l2_fltr_hash_tbl[idx];</div><div class='add'>+	struct bnxt_l2_filter *fltr;</div><div class='add'>+</div><div class='add'>+	hlist_for_each_entry_rcu(fltr, head, base.hash) {</div><div class='add'>+		struct bnxt_l2_key *l2_key = &amp;fltr-&gt;l2_key;</div><div class='add'>+</div><div class='add'>+		if (ether_addr_equal(l2_key-&gt;dst_mac_addr, key-&gt;dst_mac_addr) &amp;&amp;</div><div class='add'>+		    l2_key-&gt;vlan == key-&gt;vlan)</div><div class='add'>+			return fltr;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnxt_hwrm_func_rgtr_async_events(struct bnxt *bp, unsigned long *bmap,</div><div class='del'>-				     int bmap_size)</div><div class='add'>+static struct bnxt_l2_filter *bnxt_lookup_l2_filter(struct bnxt *bp,</div><div class='add'>+						    struct bnxt_l2_key *key,</div><div class='add'>+						    u32 idx)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_drv_rgtr_input req = {0};</div><div class='del'>-	DECLARE_BITMAP(async_events_bmap, 256);</div><div class='del'>-	u32 *events = (u32 *)async_events_bmap;</div><div class='del'>-	int i;</div><div class='add'>+	struct bnxt_l2_filter *fltr = NULL;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_DRV_RGTR, -1, -1);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fltr = __bnxt_lookup_l2_filter(bp, key, idx);</div><div class='add'>+	if (fltr)</div><div class='add'>+		atomic_inc(&amp;fltr-&gt;refcnt);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	return fltr;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	req.enables =</div><div class='del'>-		cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_ASYNC_EVENT_FWD);</div><div class='add'>+#define BNXT_IPV4_4TUPLE(bp, fkeys)					\</div><div class='add'>+	(((fkeys)-&gt;basic.ip_proto == IPPROTO_TCP &amp;&amp;			\</div><div class='add'>+	  (bp)-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4) ||	\</div><div class='add'>+	 ((fkeys)-&gt;basic.ip_proto == IPPROTO_UDP &amp;&amp;			\</div><div class='add'>+	  (bp)-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4))</div><div class='ctx'> </div><div class='del'>-	memset(async_events_bmap, 0, sizeof(async_events_bmap));</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(bnxt_async_events_arr); i++)</div><div class='del'>-		__set_bit(bnxt_async_events_arr[i], async_events_bmap);</div><div class='add'>+#define BNXT_IPV6_4TUPLE(bp, fkeys)					\</div><div class='add'>+	(((fkeys)-&gt;basic.ip_proto == IPPROTO_TCP &amp;&amp;			\</div><div class='add'>+	  (bp)-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6) ||	\</div><div class='add'>+	 ((fkeys)-&gt;basic.ip_proto == IPPROTO_UDP &amp;&amp;			\</div><div class='add'>+	  (bp)-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6))</div><div class='ctx'> </div><div class='del'>-	if (bmap &amp;&amp; bmap_size) {</div><div class='del'>-		for (i = 0; i &lt; bmap_size; i++) {</div><div class='del'>-			if (test_bit(i, bmap))</div><div class='del'>-				__set_bit(i, async_events_bmap);</div><div class='del'>-		}</div><div class='add'>+static u32 bnxt_get_rss_flow_tuple_len(struct bnxt *bp, struct flow_keys *fkeys)</div><div class='add'>+{</div><div class='add'>+	if (fkeys-&gt;basic.n_proto == htons(ETH_P_IP)) {</div><div class='add'>+		if (BNXT_IPV4_4TUPLE(bp, fkeys))</div><div class='add'>+			return sizeof(fkeys-&gt;addrs.v4addrs) +</div><div class='add'>+			       sizeof(fkeys-&gt;ports);</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4)</div><div class='add'>+			return sizeof(fkeys-&gt;addrs.v4addrs);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 8; i++)</div><div class='del'>-		req.async_event_fwd[i] |= cpu_to_le32(events[i]);</div><div class='add'>+	if (fkeys-&gt;basic.n_proto == htons(ETH_P_IPV6)) {</div><div class='add'>+		if (BNXT_IPV6_4TUPLE(bp, fkeys))</div><div class='add'>+			return sizeof(fkeys-&gt;addrs.v6addrs) +</div><div class='add'>+			       sizeof(fkeys-&gt;ports);</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+		if (bp-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6)</div><div class='add'>+			return sizeof(fkeys-&gt;addrs.v6addrs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp)</div><div class='add'>+static u32 bnxt_toeplitz(struct bnxt *bp, struct flow_keys *fkeys,</div><div class='add'>+			 const unsigned char *key)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_drv_rgtr_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_func_drv_rgtr_input req = {0};</div><div class='del'>-	int rc;</div><div class='add'>+	u64 prefix = bp-&gt;toeplitz_prefix, hash = 0;</div><div class='add'>+	struct bnxt_ipv4_tuple tuple4;</div><div class='add'>+	struct bnxt_ipv6_tuple tuple6;</div><div class='add'>+	int i, j, len = 0;</div><div class='add'>+	u8 *four_tuple;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_DRV_RGTR, -1, -1);</div><div class='add'>+	len = bnxt_get_rss_flow_tuple_len(bp, fkeys);</div><div class='add'>+	if (!len)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	req.enables =</div><div class='del'>-		cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_OS_TYPE |</div><div class='del'>-			    FUNC_DRV_RGTR_REQ_ENABLES_VER);</div><div class='add'>+	if (fkeys-&gt;basic.n_proto == htons(ETH_P_IP)) {</div><div class='add'>+		tuple4.v4addrs = fkeys-&gt;addrs.v4addrs;</div><div class='add'>+		tuple4.ports = fkeys-&gt;ports;</div><div class='add'>+		four_tuple = (unsigned char *)&amp;tuple4;</div><div class='add'>+	} else {</div><div class='add'>+		tuple6.v6addrs = fkeys-&gt;addrs.v6addrs;</div><div class='add'>+		tuple6.ports = fkeys-&gt;ports;</div><div class='add'>+		four_tuple = (unsigned char *)&amp;tuple6;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	req.os_type = cpu_to_le16(FUNC_DRV_RGTR_REQ_OS_TYPE_LINUX);</div><div class='del'>-	req.flags = cpu_to_le32(FUNC_DRV_RGTR_REQ_FLAGS_16BIT_VER_MODE);</div><div class='del'>-	req.ver_maj_8b = DRV_VER_MAJ;</div><div class='del'>-	req.ver_min_8b = DRV_VER_MIN;</div><div class='del'>-	req.ver_upd_8b = DRV_VER_UPD;</div><div class='del'>-	req.ver_maj = cpu_to_le16(DRV_VER_MAJ);</div><div class='del'>-	req.ver_min = cpu_to_le16(DRV_VER_MIN);</div><div class='del'>-	req.ver_upd = cpu_to_le16(DRV_VER_UPD);</div><div class='add'>+	for (i = 0, j = 8; i &lt; len; i++, j++) {</div><div class='add'>+		u8 byte = four_tuple[i];</div><div class='add'>+		int bit;</div><div class='ctx'> </div><div class='del'>-	if (BNXT_PF(bp)) {</div><div class='del'>-		u32 data[8];</div><div class='del'>-		int i;</div><div class='add'>+		for (bit = 0; bit &lt; 8; bit++, prefix &lt;&lt;= 1, byte &lt;&lt;= 1) {</div><div class='add'>+			if (byte &amp; 0x80)</div><div class='add'>+				hash ^= prefix;</div><div class='add'>+		}</div><div class='add'>+		prefix |= (j &lt; HW_HASH_KEY_SIZE) ? key[j] : 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		memset(data, 0, sizeof(data));</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(bnxt_vf_req_snif); i++) {</div><div class='del'>-			u16 cmd = bnxt_vf_req_snif[i];</div><div class='del'>-			unsigned int bit, idx;</div><div class='add'>+	/* The valid part of the hash is in the upper 32 bits. */</div><div class='add'>+	return (hash &gt;&gt; 32) &amp; BNXT_NTP_FLTR_HASH_MASK;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			idx = cmd / 32;</div><div class='del'>-			bit = cmd % 32;</div><div class='del'>-			data[idx] |= 1 &lt;&lt; bit;</div><div class='del'>-		}</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+static struct bnxt_l2_filter *</div><div class='add'>+bnxt_lookup_l2_filter_from_key(struct bnxt *bp, struct bnxt_l2_key *key)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_l2_filter *fltr;</div><div class='add'>+	u32 idx;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; 8; i++)</div><div class='del'>-			req.vf_req_fwd[i] = cpu_to_le32(data[i]);</div><div class='add'>+	idx = jhash2(&amp;key-&gt;filter_key, BNXT_L2_KEY_SIZE, bp-&gt;hash_seed) &amp;</div><div class='add'>+	      BNXT_L2_FLTR_HASH_MASK;</div><div class='add'>+	fltr = bnxt_lookup_l2_filter(bp, key, idx);</div><div class='add'>+	return fltr;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-		req.enables |=</div><div class='del'>-			cpu_to_le32(FUNC_DRV_RGTR_REQ_ENABLES_VF_REQ_FWD);</div><div class='add'>+static int bnxt_init_l2_filter(struct bnxt *bp, struct bnxt_l2_filter *fltr,</div><div class='add'>+			       struct bnxt_l2_key *key, u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(fltr-&gt;l2_key.dst_mac_addr, key-&gt;dst_mac_addr);</div><div class='add'>+	fltr-&gt;l2_key.vlan = key-&gt;vlan;</div><div class='add'>+	fltr-&gt;base.type = BNXT_FLTR_TYPE_L2;</div><div class='add'>+	if (fltr-&gt;base.flags) {</div><div class='add'>+		int bit_id;</div><div class='add'>+</div><div class='add'>+		bit_id = bitmap_find_free_region(bp-&gt;ntp_fltr_bmap,</div><div class='add'>+						 bp-&gt;max_fltr, 0);</div><div class='add'>+		if (bit_id &lt; 0)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		fltr-&gt;base.sw_id = (u16)bit_id;</div><div class='add'>+		bp-&gt;ntp_fltr_count++;</div><div class='add'>+	}</div><div class='add'>+	head = &amp;bp-&gt;l2_fltr_hash_tbl[idx];</div><div class='add'>+	hlist_add_head_rcu(&amp;fltr-&gt;base.hash, head);</div><div class='add'>+	bnxt_insert_usr_fltr(bp, &amp;fltr-&gt;base);</div><div class='add'>+	set_bit(BNXT_FLTR_INSERTED, &amp;fltr-&gt;base.state);</div><div class='add'>+	atomic_set(&amp;fltr-&gt;refcnt, 1);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnxt_l2_filter *bnxt_alloc_l2_filter(struct bnxt *bp,</div><div class='add'>+						   struct bnxt_l2_key *key,</div><div class='add'>+						   gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_l2_filter *fltr;</div><div class='add'>+	u32 idx;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	idx = jhash2(&amp;key-&gt;filter_key, BNXT_L2_KEY_SIZE, bp-&gt;hash_seed) &amp;</div><div class='add'>+	      BNXT_L2_FLTR_HASH_MASK;</div><div class='add'>+	fltr = bnxt_lookup_l2_filter(bp, key, idx);</div><div class='add'>+	if (fltr)</div><div class='add'>+		return fltr;</div><div class='add'>+</div><div class='add'>+	fltr = kzalloc(sizeof(*fltr), gfp);</div><div class='add'>+	if (!fltr)</div><div class='add'>+		return ERR_PTR(-ENOMEM);</div><div class='add'>+	spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	rc = bnxt_init_l2_filter(bp, fltr, key, idx);</div><div class='add'>+	spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	if (rc) {</div><div class='add'>+		bnxt_del_l2_filter(bp, fltr);</div><div class='add'>+		fltr = ERR_PTR(rc);</div><div class='ctx'> 	}</div><div class='add'>+	return fltr;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_OVS_64BIT_HANDLE)</div><div class='del'>-		req.flags |= cpu_to_le32(</div><div class='del'>-			FUNC_DRV_RGTR_REQ_FLAGS_FLOW_HANDLE_64BIT_MODE);</div><div class='add'>+struct bnxt_l2_filter *bnxt_alloc_new_l2_filter(struct bnxt *bp,</div><div class='add'>+						struct bnxt_l2_key *key,</div><div class='add'>+						u16 flags)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_l2_filter *fltr;</div><div class='add'>+	u32 idx;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	else if (resp-&gt;flags &amp;</div><div class='del'>-		 cpu_to_le32(FUNC_DRV_RGTR_RESP_FLAGS_IF_CHANGE_SUPPORTED))</div><div class='del'>-		bp-&gt;fw_cap |= BNXT_FW_CAP_IF_CHANGE;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	idx = jhash2(&amp;key-&gt;filter_key, BNXT_L2_KEY_SIZE, bp-&gt;hash_seed) &amp;</div><div class='add'>+	      BNXT_L2_FLTR_HASH_MASK;</div><div class='add'>+	spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	fltr = __bnxt_lookup_l2_filter(bp, key, idx);</div><div class='add'>+	if (fltr) {</div><div class='add'>+		fltr = ERR_PTR(-EEXIST);</div><div class='add'>+		goto l2_filter_exit;</div><div class='add'>+	}</div><div class='add'>+	fltr = kzalloc(sizeof(*fltr), GFP_ATOMIC);</div><div class='add'>+	if (!fltr) {</div><div class='add'>+		fltr = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto l2_filter_exit;</div><div class='add'>+	}</div><div class='add'>+	fltr-&gt;base.flags = flags;</div><div class='add'>+	rc = bnxt_init_l2_filter(bp, fltr, key, idx);</div><div class='add'>+	if (rc) {</div><div class='add'>+		spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+		bnxt_del_l2_filter(bp, fltr);</div><div class='add'>+		return ERR_PTR(rc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+l2_filter_exit:</div><div class='add'>+	spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	return fltr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_func_drv_unrgtr(struct bnxt *bp)</div><div class='add'>+static u16 bnxt_vf_target_id(struct bnxt_pf_info *pf, u16 vf_idx)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_drv_unrgtr_input req = {0};</div><div class='add'>+#ifdef CONFIG_BNXT_SRIOV</div><div class='add'>+	struct bnxt_vf_info *vf = &amp;pf-&gt;vf[vf_idx];</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_DRV_UNRGTR, -1, -1);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	return vf-&gt;fw_fid;</div><div class='add'>+#else</div><div class='add'>+	return INVALID_HW_RING_ID;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, u8 tunnel_type)</div><div class='add'>+int bnxt_hwrm_l2_filter_free(struct bnxt *bp, struct bnxt_l2_filter *fltr)</div><div class='ctx'> {</div><div class='del'>-	u32 rc = 0;</div><div class='del'>-	struct hwrm_tunnel_dst_port_free_input req = {0};</div><div class='add'>+	struct hwrm_cfa_l2_filter_free_input *req;</div><div class='add'>+	u16 target_id = 0xffff;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_TUNNEL_DST_PORT_FREE, -1, -1);</div><div class='del'>-	req.tunnel_type = tunnel_type;</div><div class='add'>+	if (fltr-&gt;base.flags &amp; BNXT_ACT_FUNC_DST) {</div><div class='add'>+		struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> </div><div class='del'>-	switch (tunnel_type) {</div><div class='del'>-	case TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		req.tunnel_dst_port_id = bp-&gt;vxlan_fw_dst_port_id;</div><div class='del'>-		break;</div><div class='del'>-	case TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		req.tunnel_dst_port_id = bp-&gt;nge_fw_dst_port_id;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+		if (fltr-&gt;base.vf_idx &gt;= pf-&gt;active_vfs)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		target_id = bnxt_vf_target_id(pf, fltr-&gt;base.vf_idx);</div><div class='add'>+		if (target_id == INVALID_HW_RING_ID)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_L2_FILTER_FREE);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_tunnel_dst_port_free failed. rc:%d\n",</div><div class='del'>-			   rc);</div><div class='del'>-	return rc;</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;target_id = cpu_to_le16(target_id);</div><div class='add'>+	req-&gt;l2_filter_id = fltr-&gt;base.filter_id;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, __be16 port,</div><div class='del'>-					   u8 tunnel_type)</div><div class='add'>+int bnxt_hwrm_l2_filter_alloc(struct bnxt *bp, struct bnxt_l2_filter *fltr)</div><div class='ctx'> {</div><div class='del'>-	u32 rc = 0;</div><div class='del'>-	struct hwrm_tunnel_dst_port_alloc_input req = {0};</div><div class='del'>-	struct hwrm_tunnel_dst_port_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_cfa_l2_filter_alloc_output *resp;</div><div class='add'>+	struct hwrm_cfa_l2_filter_alloc_input *req;</div><div class='add'>+	u16 target_id = 0xffff;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_TUNNEL_DST_PORT_ALLOC, -1, -1);</div><div class='add'>+	if (fltr-&gt;base.flags &amp; BNXT_ACT_FUNC_DST) {</div><div class='add'>+		struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> </div><div class='del'>-	req.tunnel_type = tunnel_type;</div><div class='del'>-	req.tunnel_dst_port_val = port;</div><div class='add'>+		if (fltr-&gt;base.vf_idx &gt;= pf-&gt;active_vfs)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_tunnel_dst_port_alloc failed. rc:%d\n",</div><div class='del'>-			   rc);</div><div class='del'>-		goto err_out;</div><div class='add'>+		target_id = bnxt_vf_target_id(pf, fltr-&gt;base.vf_idx);</div><div class='ctx'> 	}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_L2_FILTER_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	switch (tunnel_type) {</div><div class='del'>-	case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		bp-&gt;vxlan_fw_dst_port_id = resp-&gt;tunnel_dst_port_id;</div><div class='del'>-		break;</div><div class='del'>-	case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		bp-&gt;nge_fw_dst_port_id = resp-&gt;tunnel_dst_port_id;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	req-&gt;target_id = cpu_to_le16(target_id);</div><div class='add'>+	req-&gt;flags = cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX);</div><div class='add'>+</div><div class='add'>+	if (!BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='add'>+		req-&gt;flags |=</div><div class='add'>+			cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_OUTERMOST);</div><div class='add'>+	req-&gt;dst_id = cpu_to_le16(fltr-&gt;base.fw_vnic_id);</div><div class='add'>+	req-&gt;enables =</div><div class='add'>+		cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR |</div><div class='add'>+			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID |</div><div class='add'>+			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK);</div><div class='add'>+	ether_addr_copy(req-&gt;l2_addr, fltr-&gt;l2_key.dst_mac_addr);</div><div class='add'>+	eth_broadcast_addr(req-&gt;l2_addr_mask);</div><div class='add'>+</div><div class='add'>+	if (fltr-&gt;l2_key.vlan) {</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN |</div><div class='add'>+				CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN_MASK |</div><div class='add'>+				CFA_L2_FILTER_ALLOC_REQ_ENABLES_NUM_VLANS);</div><div class='add'>+		req-&gt;num_vlans = 1;</div><div class='add'>+		req-&gt;l2_ivlan = cpu_to_le16(fltr-&gt;l2_key.vlan);</div><div class='add'>+		req-&gt;l2_ivlan_mask = cpu_to_le16(0xfff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-err_out:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		fltr-&gt;base.filter_id = resp-&gt;l2_filter_id;</div><div class='add'>+		set_bit(BNXT_FLTR_VALID, &amp;fltr-&gt;base.state);</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_ntuple_filter *fltr)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_l2_set_rx_mask_input req = {0};</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_L2_SET_RX_MASK, -1, -1);</div><div class='del'>-	req.vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='del'>-</div><div class='del'>-	req.num_mc_entries = cpu_to_le32(vnic-&gt;mc_list_count);</div><div class='del'>-	req.mc_tbl_addr = cpu_to_le64(vnic-&gt;mc_list_mapping);</div><div class='del'>-	req.mask = cpu_to_le32(vnic-&gt;rx_mask);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-}</div><div class='add'>+	struct hwrm_cfa_ntuple_filter_free_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,</div><div class='del'>-					    struct bnxt_ntuple_filter *fltr)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_cfa_ntuple_filter_free_input req = {0};</div><div class='add'>+	set_bit(BNXT_FLTR_FW_DELETED, &amp;fltr-&gt;base.state);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_NTUPLE_FILTER_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_NTUPLE_FILTER_FREE, -1, -1);</div><div class='del'>-	req.ntuple_filter_id = fltr-&gt;filter_id;</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;ntuple_filter_id = fltr-&gt;base.filter_id;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define BNXT_NTP_FLTR_FLAGS					\</div><div class='ctx'> 	(CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_L2_FILTER_ID |	\</div><div class='ctx'> 	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_ETHERTYPE |	\</div><div class='del'>-	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_MACADDR |	\</div><div class='ctx'> 	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_IPADDR_TYPE |	\</div><div class='ctx'> 	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR |	\</div><div class='ctx'> 	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR_MASK |	\</div><div class='hunk'>@@ -4226,147 +6229,197 @@ static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,</div><div class='ctx'> #define BNXT_NTP_TUNNEL_FLTR_FLAG				\</div><div class='ctx'> 		CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,</div><div class='del'>-					     struct bnxt_ntuple_filter *fltr)</div><div class='add'>+void bnxt_fill_ipv6_mask(__be32 mask[4])</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 4; i++)</div><div class='add'>+		mask[i] = cpu_to_be32(~0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_cfg_rfs_ring_tbl_idx(struct bnxt *bp,</div><div class='add'>+			  struct hwrm_cfa_ntuple_filter_alloc_input *req,</div><div class='add'>+			  struct bnxt_ntuple_filter *fltr)</div><div class='add'>+{</div><div class='add'>+	u16 rxq = fltr-&gt;base.rxq;</div><div class='add'>+</div><div class='add'>+	if (fltr-&gt;base.flags &amp; BNXT_ACT_RSS_CTX) {</div><div class='add'>+		struct ethtool_rxfh_context *ctx;</div><div class='add'>+		struct bnxt_rss_ctx *rss_ctx;</div><div class='add'>+		struct bnxt_vnic_info *vnic;</div><div class='add'>+</div><div class='add'>+		ctx = xa_load(&amp;bp-&gt;dev-&gt;ethtool-&gt;rss_ctx,</div><div class='add'>+			      fltr-&gt;base.fw_vnic_id);</div><div class='add'>+		if (ctx) {</div><div class='add'>+			rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+			vnic = &amp;rss_ctx-&gt;vnic;</div><div class='add'>+</div><div class='add'>+			req-&gt;dst_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+		}</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (BNXT_SUPPORTS_NTUPLE_VNIC(bp)) {</div><div class='add'>+		struct bnxt_vnic_info *vnic;</div><div class='add'>+		u32 enables;</div><div class='add'>+</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_NTUPLE];</div><div class='add'>+		req-&gt;dst_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+		enables = CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX;</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(enables);</div><div class='add'>+		req-&gt;rfs_ring_tbl_idx = cpu_to_le16(rxq);</div><div class='add'>+	} else {</div><div class='add'>+		u32 flags;</div><div class='add'>+</div><div class='add'>+		flags = CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_RFS_RING_IDX;</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(flags);</div><div class='add'>+		req-&gt;dst_id = cpu_to_le16(rxq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,</div><div class='add'>+				      struct bnxt_ntuple_filter *fltr)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_ntuple_filter_alloc_input req = {0};</div><div class='ctx'> 	struct hwrm_cfa_ntuple_filter_alloc_output *resp;</div><div class='add'>+	struct hwrm_cfa_ntuple_filter_alloc_input *req;</div><div class='add'>+	struct bnxt_flow_masks *masks = &amp;fltr-&gt;fmasks;</div><div class='ctx'> 	struct flow_keys *keys = &amp;fltr-&gt;fkeys;</div><div class='add'>+	struct bnxt_l2_filter *l2_fltr;</div><div class='ctx'> 	struct bnxt_vnic_info *vnic;</div><div class='del'>-	u32 dst_ena = 0;</div><div class='del'>-	int rc = 0;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_NTUPLE_FILTER_ALLOC, -1, -1);</div><div class='del'>-	req.l2_filter_id = bp-&gt;vnic_info[0].fw_l2_filter_id[fltr-&gt;l2_fltr_idx];</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_NTUPLE_FILTER_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX) {</div><div class='del'>-		dst_ena = CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX;</div><div class='del'>-		req.rfs_ring_tbl_idx = cpu_to_le16(fltr-&gt;rxq);</div><div class='del'>-		vnic = &amp;bp-&gt;vnic_info[0];</div><div class='add'>+	l2_fltr = fltr-&gt;l2_fltr;</div><div class='add'>+	req-&gt;l2_filter_id = l2_fltr-&gt;base.filter_id;</div><div class='add'>+</div><div class='add'>+	if (fltr-&gt;base.flags &amp; BNXT_ACT_DROP) {</div><div class='add'>+		req-&gt;flags =</div><div class='add'>+			cpu_to_le32(CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DROP);</div><div class='add'>+	} else if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2) {</div><div class='add'>+		bnxt_cfg_rfs_ring_tbl_idx(bp, req, fltr);</div><div class='ctx'> 	} else {</div><div class='del'>-		vnic = &amp;bp-&gt;vnic_info[fltr-&gt;rxq + 1];</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[fltr-&gt;base.rxq + 1];</div><div class='add'>+		req-&gt;dst_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='ctx'> 	}</div><div class='del'>-	req.dst_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='del'>-	req.enables = cpu_to_le32(BNXT_NTP_FLTR_FLAGS | dst_ena);</div><div class='add'>+	req-&gt;enables |= cpu_to_le32(BNXT_NTP_FLTR_FLAGS);</div><div class='ctx'> </div><div class='del'>-	req.ethertype = htons(ETH_P_IP);</div><div class='del'>-	memcpy(req.src_macaddr, fltr-&gt;src_mac_addr, ETH_ALEN);</div><div class='del'>-	req.ip_addr_type = CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;</div><div class='del'>-	req.ip_protocol = keys-&gt;basic.ip_proto;</div><div class='add'>+	req-&gt;ethertype = htons(ETH_P_IP);</div><div class='add'>+	req-&gt;ip_addr_type = CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;</div><div class='add'>+	req-&gt;ip_protocol = keys-&gt;basic.ip_proto;</div><div class='ctx'> </div><div class='ctx'> 	if (keys-&gt;basic.n_proto == htons(ETH_P_IPV6)) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		req.ethertype = htons(ETH_P_IPV6);</div><div class='del'>-		req.ip_addr_type =</div><div class='add'>+		req-&gt;ethertype = htons(ETH_P_IPV6);</div><div class='add'>+		req-&gt;ip_addr_type =</div><div class='ctx'> 			CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6;</div><div class='del'>-		*(struct in6_addr *)&amp;req.src_ipaddr[0] =</div><div class='del'>-			keys-&gt;addrs.v6addrs.src;</div><div class='del'>-		*(struct in6_addr *)&amp;req.dst_ipaddr[0] =</div><div class='del'>-			keys-&gt;addrs.v6addrs.dst;</div><div class='del'>-		for (i = 0; i &lt; 4; i++) {</div><div class='del'>-			req.src_ipaddr_mask[i] = cpu_to_be32(0xffffffff);</div><div class='del'>-			req.dst_ipaddr_mask[i] = cpu_to_be32(0xffffffff);</div><div class='del'>-		}</div><div class='add'>+		*(struct in6_addr *)&amp;req-&gt;src_ipaddr[0] = keys-&gt;addrs.v6addrs.src;</div><div class='add'>+		*(struct in6_addr *)&amp;req-&gt;src_ipaddr_mask[0] = masks-&gt;addrs.v6addrs.src;</div><div class='add'>+		*(struct in6_addr *)&amp;req-&gt;dst_ipaddr[0] = keys-&gt;addrs.v6addrs.dst;</div><div class='add'>+		*(struct in6_addr *)&amp;req-&gt;dst_ipaddr_mask[0] = masks-&gt;addrs.v6addrs.dst;</div><div class='ctx'> 	} else {</div><div class='del'>-		req.src_ipaddr[0] = keys-&gt;addrs.v4addrs.src;</div><div class='del'>-		req.src_ipaddr_mask[0] = cpu_to_be32(0xffffffff);</div><div class='del'>-		req.dst_ipaddr[0] = keys-&gt;addrs.v4addrs.dst;</div><div class='del'>-		req.dst_ipaddr_mask[0] = cpu_to_be32(0xffffffff);</div><div class='add'>+		req-&gt;src_ipaddr[0] = keys-&gt;addrs.v4addrs.src;</div><div class='add'>+		req-&gt;src_ipaddr_mask[0] = masks-&gt;addrs.v4addrs.src;</div><div class='add'>+		req-&gt;dst_ipaddr[0] = keys-&gt;addrs.v4addrs.dst;</div><div class='add'>+		req-&gt;dst_ipaddr_mask[0] = masks-&gt;addrs.v4addrs.dst;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (keys-&gt;control.flags &amp; FLOW_DIS_ENCAPSULATION) {</div><div class='del'>-		req.enables |= cpu_to_le32(BNXT_NTP_TUNNEL_FLTR_FLAG);</div><div class='del'>-		req.tunnel_type =</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(BNXT_NTP_TUNNEL_FLTR_FLAG);</div><div class='add'>+		req-&gt;tunnel_type =</div><div class='ctx'> 			CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req.src_port = keys-&gt;ports.src;</div><div class='del'>-	req.src_port_mask = cpu_to_be16(0xffff);</div><div class='del'>-	req.dst_port = keys-&gt;ports.dst;</div><div class='del'>-	req.dst_port_mask = cpu_to_be16(0xffff);</div><div class='add'>+	req-&gt;src_port = keys-&gt;ports.src;</div><div class='add'>+	req-&gt;src_port_mask = masks-&gt;ports.src;</div><div class='add'>+	req-&gt;dst_port = keys-&gt;ports.dst;</div><div class='add'>+	req-&gt;dst_port_mask = masks-&gt;ports.dst;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc) {</div><div class='del'>-		resp = bnxt_get_hwrm_resp_addr(bp, &amp;req);</div><div class='del'>-		fltr-&gt;filter_id = resp-&gt;ntuple_filter_id;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		fltr-&gt;base.filter_id = resp-&gt;ntuple_filter_id;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_set_vnic_filter(struct bnxt *bp, u16 vnic_id, u16 idx,</div><div class='del'>-				     u8 *mac_addr)</div><div class='add'>+				     const u8 *mac_addr)</div><div class='ctx'> {</div><div class='del'>-	u32 rc = 0;</div><div class='del'>-	struct hwrm_cfa_l2_filter_alloc_input req = {0};</div><div class='del'>-	struct hwrm_cfa_l2_filter_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct bnxt_l2_filter *fltr;</div><div class='add'>+	struct bnxt_l2_key key;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_L2_FILTER_ALLOC, -1, -1);</div><div class='del'>-	req.flags = cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX);</div><div class='del'>-	if (!BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='del'>-		req.flags |=</div><div class='del'>-			cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_OUTERMOST);</div><div class='del'>-	req.dst_id = cpu_to_le16(bp-&gt;vnic_info[vnic_id].fw_vnic_id);</div><div class='del'>-	req.enables =</div><div class='del'>-		cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR |</div><div class='del'>-			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID |</div><div class='del'>-			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK);</div><div class='del'>-	memcpy(req.l2_addr, mac_addr, ETH_ALEN);</div><div class='del'>-	req.l2_addr_mask[0] = 0xff;</div><div class='del'>-	req.l2_addr_mask[1] = 0xff;</div><div class='del'>-	req.l2_addr_mask[2] = 0xff;</div><div class='del'>-	req.l2_addr_mask[3] = 0xff;</div><div class='del'>-	req.l2_addr_mask[4] = 0xff;</div><div class='del'>-	req.l2_addr_mask[5] = 0xff;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc)</div><div class='del'>-		bp-&gt;vnic_info[vnic_id].fw_l2_filter_id[idx] =</div><div class='del'>-							resp-&gt;l2_filter_id;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	ether_addr_copy(key.dst_mac_addr, mac_addr);</div><div class='add'>+	key.vlan = 0;</div><div class='add'>+	fltr = bnxt_alloc_l2_filter(bp, &amp;key, GFP_KERNEL);</div><div class='add'>+	if (IS_ERR(fltr))</div><div class='add'>+		return PTR_ERR(fltr);</div><div class='add'>+</div><div class='add'>+	fltr-&gt;base.fw_vnic_id = bp-&gt;vnic_info[vnic_id].fw_vnic_id;</div><div class='add'>+	rc = bnxt_hwrm_l2_filter_alloc(bp, fltr);</div><div class='add'>+	if (rc)</div><div class='add'>+		bnxt_del_l2_filter(bp, fltr);</div><div class='add'>+	else</div><div class='add'>+		bp-&gt;vnic_info[vnic_id].l2_filters[idx] = fltr;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_clear_vnic_filter(struct bnxt *bp)</div><div class='add'>+static void bnxt_hwrm_clear_vnic_filter(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u16 i, j, num_of_vnics = 1; /* only vnic 0 supported */</div><div class='del'>-	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Any associated ntuple filters will also be cleared by firmware. */</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	for (i = 0; i &lt; num_of_vnics; i++) {</div><div class='ctx'> 		struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[i];</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; vnic-&gt;uc_filter_count; j++) {</div><div class='del'>-			struct hwrm_cfa_l2_filter_free_input req = {0};</div><div class='del'>-</div><div class='del'>-			bnxt_hwrm_cmd_hdr_init(bp, &amp;req,</div><div class='del'>-					       HWRM_CFA_L2_FILTER_FREE, -1, -1);</div><div class='del'>-</div><div class='del'>-			req.l2_filter_id = vnic-&gt;fw_l2_filter_id[j];</div><div class='add'>+			struct bnxt_l2_filter *fltr = vnic-&gt;l2_filters[j];</div><div class='ctx'> </div><div class='del'>-			rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-						HWRM_CMD_TIMEOUT);</div><div class='add'>+			bnxt_hwrm_l2_filter_free(bp, fltr);</div><div class='add'>+			bnxt_del_l2_filter(bp, fltr);</div><div class='ctx'> 		}</div><div class='ctx'> 		vnic-&gt;uc_filter_count = 0;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+#define BNXT_DFLT_TUNL_TPA_BMAP				\</div><div class='add'>+	(VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GRE |	\</div><div class='add'>+	 VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_IPV4 |	\</div><div class='add'>+	 VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_IPV6)</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_vnic_update_tunl_tpa(struct bnxt *bp,</div><div class='add'>+					   struct hwrm_vnic_tpa_cfg_input *req)</div><div class='add'>+{</div><div class='add'>+	u32 tunl_tpa_bmap = BNXT_DFLT_TUNL_TPA_BMAP;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_VNIC_TUNNEL_TPA))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;vxlan_port)</div><div class='add'>+		tunl_tpa_bmap |= VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN;</div><div class='add'>+	if (bp-&gt;vxlan_gpe_port)</div><div class='add'>+		tunl_tpa_bmap |= VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN_GPE;</div><div class='add'>+	if (bp-&gt;nge_port)</div><div class='add'>+		tunl_tpa_bmap |= VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GENEVE;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables |= cpu_to_le32(VNIC_TPA_CFG_REQ_ENABLES_TNL_TPA_EN);</div><div class='add'>+	req-&gt;tnl_tpa_en_bitmap = cpu_to_le32(tunl_tpa_bmap);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)</div><div class='add'>+int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+			   u32 tpa_flags)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='del'>-	struct hwrm_vnic_tpa_cfg_input req = {0};</div><div class='add'>+	u16 max_aggs = VNIC_TPA_CFG_REQ_MAX_AGGS_MAX;</div><div class='add'>+	struct hwrm_vnic_tpa_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (vnic-&gt;fw_vnic_id == INVALID_HW_RING_ID)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_TPA_CFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_TPA_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if (tpa_flags) {</div><div class='ctx'> 		u16 mss = bp-&gt;dev-&gt;mtu - 40;</div><div class='hunk'>@@ -4380,9 +6433,9 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)</div><div class='ctx'> 		if (tpa_flags &amp; BNXT_FLAG_GRO)</div><div class='ctx'> 			flags |= VNIC_TPA_CFG_REQ_FLAGS_GRO;</div><div class='ctx'> </div><div class='del'>-		req.flags = cpu_to_le32(flags);</div><div class='add'>+		req-&gt;flags = cpu_to_le32(flags);</div><div class='ctx'> </div><div class='del'>-		req.enables =</div><div class='add'>+		req-&gt;enables =</div><div class='ctx'> 			cpu_to_le32(VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_SEGS |</div><div class='ctx'> 				    VNIC_TPA_CFG_REQ_ENABLES_MAX_AGGS |</div><div class='ctx'> 				    VNIC_TPA_CFG_REQ_ENABLES_MIN_AGG_LEN);</div><div class='hunk'>@@ -4400,15 +6453,21 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)</div><div class='ctx'> 			nsegs = (MAX_SKB_FRAGS - n) / n;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		segs = ilog2(nsegs);</div><div class='del'>-		req.max_agg_segs = cpu_to_le16(segs);</div><div class='del'>-		req.max_aggs = cpu_to_le16(VNIC_TPA_CFG_REQ_MAX_AGGS_MAX);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+			segs = MAX_TPA_SEGS_P5;</div><div class='add'>+			max_aggs = bp-&gt;max_tpa;</div><div class='add'>+		} else {</div><div class='add'>+			segs = ilog2(nsegs);</div><div class='add'>+		}</div><div class='add'>+		req-&gt;max_agg_segs = cpu_to_le16(segs);</div><div class='add'>+		req-&gt;max_aggs = cpu_to_le16(max_aggs);</div><div class='ctx'> </div><div class='del'>-		req.min_agg_len = cpu_to_le32(512);</div><div class='add'>+		req-&gt;min_agg_len = cpu_to_le32(512);</div><div class='add'>+		bnxt_hwrm_vnic_update_tunl_tpa(bp, req);</div><div class='ctx'> 	}</div><div class='del'>-	req.vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 bnxt_cp_ring_from_grp(struct bnxt *bp, struct bnxt_ring_struct *ring)</div><div class='hunk'>@@ -4421,143 +6480,272 @@ static u16 bnxt_cp_ring_from_grp(struct bnxt *bp, struct bnxt_ring_struct *ring)</div><div class='ctx'> </div><div class='ctx'> static u16 bnxt_cp_ring_for_rx(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		struct bnxt_napi *bnapi = rxr-&gt;bnapi;</div><div class='del'>-		struct bnxt_cp_ring_info *cpr;</div><div class='del'>-</div><div class='del'>-		cpr = bnapi-&gt;cp_ring.cp_ring_arr[BNXT_RX_HDL];</div><div class='del'>-		return cpr-&gt;cp_ring_struct.fw_ring_id;</div><div class='del'>-	} else {</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		return rxr-&gt;rx_cpr-&gt;cp_ring_struct.fw_ring_id;</div><div class='add'>+	else</div><div class='ctx'> 		return bnxt_cp_ring_from_grp(bp, &amp;rxr-&gt;rx_ring_struct);</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 bnxt_cp_ring_for_tx(struct bnxt *bp, struct bnxt_tx_ring_info *txr)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		struct bnxt_napi *bnapi = txr-&gt;bnapi;</div><div class='del'>-		struct bnxt_cp_ring_info *cpr;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		return txr-&gt;tx_cpr-&gt;cp_ring_struct.fw_ring_id;</div><div class='add'>+	else</div><div class='add'>+		return bnxt_cp_ring_from_grp(bp, &amp;txr-&gt;tx_ring_struct);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_rss_indir_tbl(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int entries;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		entries = BNXT_MAX_RSS_TABLE_ENTRIES_P5;</div><div class='add'>+	else</div><div class='add'>+		entries = HW_HASH_INDEX_SIZE;</div><div class='add'>+</div><div class='add'>+	bp-&gt;rss_indir_tbl_entries = entries;</div><div class='add'>+	bp-&gt;rss_indir_tbl =</div><div class='add'>+		kmalloc_array(entries, sizeof(*bp-&gt;rss_indir_tbl), GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;rss_indir_tbl)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-		cpr = bnapi-&gt;cp_ring.cp_ring_arr[BNXT_TX_HDL];</div><div class='del'>-		return cpr-&gt;cp_ring_struct.fw_ring_id;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_set_dflt_rss_indir_tbl(struct bnxt *bp,</div><div class='add'>+				 struct ethtool_rxfh_context *rss_ctx)</div><div class='add'>+{</div><div class='add'>+	u16 max_rings, max_entries, pad, i;</div><div class='add'>+	u32 *rss_indir_tbl;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;rx_nr_rings)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='add'>+		max_rings = bp-&gt;rx_nr_rings - 1;</div><div class='add'>+	else</div><div class='add'>+		max_rings = bp-&gt;rx_nr_rings;</div><div class='add'>+</div><div class='add'>+	max_entries = bnxt_get_rxfh_indir_size(bp-&gt;dev);</div><div class='add'>+	if (rss_ctx)</div><div class='add'>+		rss_indir_tbl = ethtool_rxfh_context_indir(rss_ctx);</div><div class='add'>+	else</div><div class='add'>+		rss_indir_tbl = &amp;bp-&gt;rss_indir_tbl[0];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; max_entries; i++)</div><div class='add'>+		rss_indir_tbl[i] = ethtool_rxfh_indir_default(i, max_rings);</div><div class='add'>+</div><div class='add'>+	pad = bp-&gt;rss_indir_tbl_entries - max_entries;</div><div class='add'>+	if (pad)</div><div class='add'>+		memset(&amp;rss_indir_tbl[i], 0, pad * sizeof(*rss_indir_tbl));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 bnxt_get_max_rss_ring(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u32 i, tbl_size, max_ring = 0;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;rss_indir_tbl)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	tbl_size = bnxt_get_rxfh_indir_size(bp-&gt;dev);</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++)</div><div class='add'>+		max_ring = max(max_ring, bp-&gt;rss_indir_tbl[i]);</div><div class='add'>+	return max_ring;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_get_nr_rss_ctxs(struct bnxt *bp, int rx_rings)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		if (!rx_rings)</div><div class='add'>+			return 0;</div><div class='add'>+		return bnxt_calc_nr_ring_pages(rx_rings - 1,</div><div class='add'>+					       BNXT_RSS_TABLE_ENTRIES_P5);</div><div class='add'>+	}</div><div class='add'>+	if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='add'>+		return 2;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fill_hw_rss_tbl(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	bool no_rss = !(vnic-&gt;flags &amp; BNXT_VNIC_RSS_FLAG);</div><div class='add'>+	u16 i, j;</div><div class='add'>+</div><div class='add'>+	/* Fill the RSS indirection table with ring group ids */</div><div class='add'>+	for (i = 0, j = 0; i &lt; HW_HASH_INDEX_SIZE; i++) {</div><div class='add'>+		if (!no_rss)</div><div class='add'>+			j = bp-&gt;rss_indir_tbl[i];</div><div class='add'>+		vnic-&gt;rss_table[i] = cpu_to_le16(vnic-&gt;fw_grp_ids[j]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fill_hw_rss_tbl_p5(struct bnxt *bp,</div><div class='add'>+				    struct bnxt_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	__le16 *ring_tbl = vnic-&gt;rss_table;</div><div class='add'>+	struct bnxt_rx_ring_info *rxr;</div><div class='add'>+	u16 tbl_size, i;</div><div class='add'>+</div><div class='add'>+	tbl_size = bnxt_get_rxfh_indir_size(bp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++) {</div><div class='add'>+		u16 ring_id, j;</div><div class='add'>+</div><div class='add'>+		if (vnic-&gt;flags &amp; BNXT_VNIC_NTUPLE_FLAG)</div><div class='add'>+			j = ethtool_rxfh_indir_default(i, bp-&gt;rx_nr_rings);</div><div class='add'>+		else if (vnic-&gt;flags &amp; BNXT_VNIC_RSSCTX_FLAG)</div><div class='add'>+			j = ethtool_rxfh_context_indir(vnic-&gt;rss_ctx)[i];</div><div class='add'>+		else</div><div class='add'>+			j = bp-&gt;rss_indir_tbl[i];</div><div class='add'>+		rxr = &amp;bp-&gt;rx_ring[j];</div><div class='add'>+</div><div class='add'>+		ring_id = rxr-&gt;rx_ring_struct.fw_ring_id;</div><div class='add'>+		*ring_tbl++ = cpu_to_le16(ring_id);</div><div class='add'>+		ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+		*ring_tbl++ = cpu_to_le16(ring_id);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__bnxt_hwrm_vnic_set_rss(struct bnxt *bp, struct hwrm_vnic_rss_cfg_input *req,</div><div class='add'>+			 struct bnxt_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		bnxt_fill_hw_rss_tbl_p5(bp, vnic);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P7)</div><div class='add'>+			req-&gt;flags |= VNIC_RSS_CFG_REQ_FLAGS_IPSEC_HASH_TYPE_CFG_SUPPORT;</div><div class='ctx'> 	} else {</div><div class='del'>-		return bnxt_cp_ring_from_grp(bp, &amp;txr-&gt;tx_ring_struct);</div><div class='add'>+		bnxt_fill_hw_rss_tbl(bp, vnic);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;rss_hash_delta) {</div><div class='add'>+		req-&gt;hash_type = cpu_to_le32(bp-&gt;rss_hash_delta);</div><div class='add'>+		if (bp-&gt;rss_hash_cfg &amp; bp-&gt;rss_hash_delta)</div><div class='add'>+			req-&gt;flags |= VNIC_RSS_CFG_REQ_FLAGS_HASH_TYPE_INCLUDE;</div><div class='add'>+		else</div><div class='add'>+			req-&gt;flags |= VNIC_RSS_CFG_REQ_FLAGS_HASH_TYPE_EXCLUDE;</div><div class='add'>+	} else {</div><div class='add'>+		req-&gt;hash_type = cpu_to_le32(bp-&gt;rss_hash_cfg);</div><div class='ctx'> 	}</div><div class='add'>+	req-&gt;hash_mode_flags = VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_DEFAULT;</div><div class='add'>+	req-&gt;ring_grp_tbl_addr = cpu_to_le64(vnic-&gt;rss_table_dma_addr);</div><div class='add'>+	req-&gt;hash_key_tbl_addr = cpu_to_le64(vnic-&gt;rss_hash_key_dma_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_set_rss(struct bnxt *bp, u16 vnic_id, bool set_rss)</div><div class='add'>+static int bnxt_hwrm_vnic_set_rss(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+				  bool set_rss)</div><div class='ctx'> {</div><div class='del'>-	u32 i, j, max_rings;</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='del'>-	struct hwrm_vnic_rss_cfg_input req = {0};</div><div class='add'>+	struct hwrm_vnic_rss_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) ||</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) ||</div><div class='ctx'> 	    vnic-&gt;fw_rss_cos_lb_ctx[0] == INVALID_HW_RING_ID)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_RSS_CFG, -1, -1);</div><div class='del'>-	if (set_rss) {</div><div class='del'>-		req.hash_type = cpu_to_le32(bp-&gt;rss_hash_cfg);</div><div class='del'>-		req.hash_mode_flags = VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_DEFAULT;</div><div class='del'>-		if (vnic-&gt;flags &amp; BNXT_VNIC_RSS_FLAG) {</div><div class='del'>-			if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='del'>-				max_rings = bp-&gt;rx_nr_rings - 1;</div><div class='del'>-			else</div><div class='del'>-				max_rings = bp-&gt;rx_nr_rings;</div><div class='del'>-		} else {</div><div class='del'>-			max_rings = 1;</div><div class='del'>-		}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_RSS_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-		/* Fill the RSS indirection table with ring group ids */</div><div class='del'>-		for (i = 0, j = 0; i &lt; HW_HASH_INDEX_SIZE; i++, j++) {</div><div class='del'>-			if (j == max_rings)</div><div class='del'>-				j = 0;</div><div class='del'>-			vnic-&gt;rss_table[i] = cpu_to_le16(vnic-&gt;fw_grp_ids[j]);</div><div class='del'>-		}</div><div class='add'>+	if (set_rss)</div><div class='add'>+		__bnxt_hwrm_vnic_set_rss(bp, req, vnic);</div><div class='add'>+	req-&gt;rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		req.ring_grp_tbl_addr = cpu_to_le64(vnic-&gt;rss_table_dma_addr);</div><div class='del'>-		req.hash_key_tbl_addr =</div><div class='del'>-			cpu_to_le64(vnic-&gt;rss_hash_key_dma_addr);</div><div class='add'>+static int bnxt_hwrm_vnic_set_rss_p5(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_vnic_info *vnic, bool set_rss)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_rss_cfg_input *req;</div><div class='add'>+	dma_addr_t ring_tbl_map;</div><div class='add'>+	u32 i, nr_ctxs;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_RSS_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	if (!set_rss)</div><div class='add'>+		return hwrm_req_send(bp, req);</div><div class='add'>+</div><div class='add'>+	__bnxt_hwrm_vnic_set_rss(bp, req, vnic);</div><div class='add'>+	ring_tbl_map = vnic-&gt;rss_table_dma_addr;</div><div class='add'>+	nr_ctxs = bnxt_get_nr_rss_ctxs(bp, bp-&gt;rx_nr_rings);</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='add'>+	for (i = 0; i &lt; nr_ctxs; ring_tbl_map += BNXT_RSS_TABLE_SIZE_P5, i++) {</div><div class='add'>+		req-&gt;ring_grp_tbl_addr = cpu_to_le64(ring_tbl_map);</div><div class='add'>+		req-&gt;ring_table_pair_index = i;</div><div class='add'>+		req-&gt;rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[i]);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit;</div><div class='ctx'> 	}</div><div class='del'>-	req.rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_set_rss_p5(struct bnxt *bp, u16 vnic_id, bool set_rss)</div><div class='add'>+static void bnxt_hwrm_update_rss_hash_cfg(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='del'>-	u32 i, j, k, nr_ctxs, max_rings = bp-&gt;rx_nr_rings;</div><div class='del'>-	struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[0];</div><div class='del'>-	struct hwrm_vnic_rss_cfg_input req = {0};</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_RSS_CFG, -1, -1);</div><div class='del'>-	req.vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='del'>-	if (!set_rss) {</div><div class='del'>-		hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	req.hash_type = cpu_to_le32(bp-&gt;rss_hash_cfg);</div><div class='del'>-	req.hash_mode_flags = VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_DEFAULT;</div><div class='del'>-	req.ring_grp_tbl_addr = cpu_to_le64(vnic-&gt;rss_table_dma_addr);</div><div class='del'>-	req.hash_key_tbl_addr = cpu_to_le64(vnic-&gt;rss_hash_key_dma_addr);</div><div class='del'>-	nr_ctxs = DIV_ROUND_UP(bp-&gt;rx_nr_rings, 64);</div><div class='del'>-	for (i = 0, k = 0; i &lt; nr_ctxs; i++) {</div><div class='del'>-		__le16 *ring_tbl = vnic-&gt;rss_table;</div><div class='del'>-		int rc;</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='add'>+	struct hwrm_vnic_rss_qcfg_output *resp;</div><div class='add'>+	struct hwrm_vnic_rss_qcfg_input *req;</div><div class='ctx'> </div><div class='del'>-		req.ring_table_pair_index = i;</div><div class='del'>-		req.rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[i]);</div><div class='del'>-		for (j = 0; j &lt; 64; j++) {</div><div class='del'>-			u16 ring_id;</div><div class='del'>-</div><div class='del'>-			ring_id = rxr-&gt;rx_ring_struct.fw_ring_id;</div><div class='del'>-			*ring_tbl++ = cpu_to_le16(ring_id);</div><div class='del'>-			ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='del'>-			*ring_tbl++ = cpu_to_le16(ring_id);</div><div class='del'>-			rxr++;</div><div class='del'>-			k++;</div><div class='del'>-			if (k == max_rings) {</div><div class='del'>-				k = 0;</div><div class='del'>-				rxr = &amp;bp-&gt;rx_ring[0];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-		if (rc)</div><div class='del'>-			return -EIO;</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_VNIC_RSS_QCFG))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	/* all contexts configured to same hash_type, zero always exists */</div><div class='add'>+	req-&gt;rss_ctx_idx = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	if (!hwrm_req_send(bp, req)) {</div><div class='add'>+		bp-&gt;rss_hash_cfg = le32_to_cpu(resp-&gt;hash_type) ?: bp-&gt;rss_hash_cfg;</div><div class='add'>+		bp-&gt;rss_hash_delta = 0;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+static int bnxt_hwrm_vnic_set_hds(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='del'>-	struct hwrm_vnic_plcmodes_cfg_input req = {0};</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_PLCMODES_CFG, -1, -1);</div><div class='del'>-	req.flags = cpu_to_le32(VNIC_PLCMODES_CFG_REQ_FLAGS_JUMBO_PLACEMENT |</div><div class='del'>-				VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV4 |</div><div class='del'>-				VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);</div><div class='del'>-	req.enables =</div><div class='del'>-		cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_JUMBO_THRESH_VALID |</div><div class='del'>-			    VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);</div><div class='del'>-	/* thresholds not implemented in firmware yet */</div><div class='del'>-	req.jumbo_thresh = cpu_to_le16(bp-&gt;rx_copy_thresh);</div><div class='del'>-	req.hds_threshold = cpu_to_le16(bp-&gt;rx_copy_thresh);</div><div class='del'>-	req.vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnxt_hwrm_vnic_ctx_free_one(struct bnxt *bp, u16 vnic_id,</div><div class='add'>+	u16 hds_thresh = (u16)bp-&gt;dev-&gt;cfg_pending-&gt;hds_thresh;</div><div class='add'>+	struct hwrm_vnic_plcmodes_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_PLCMODES_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(VNIC_PLCMODES_CFG_REQ_FLAGS_JUMBO_PLACEMENT);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_JUMBO_THRESH_VALID);</div><div class='add'>+	req-&gt;jumbo_thresh = cpu_to_le16(bp-&gt;rx_buf_use_size);</div><div class='add'>+</div><div class='add'>+	if (!BNXT_RX_PAGE_MODE(bp) &amp;&amp; (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)) {</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV4 |</div><div class='add'>+					  VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6);</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID);</div><div class='add'>+		req-&gt;hds_threshold = cpu_to_le16(hds_thresh);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_vnic_ctx_free_one(struct bnxt *bp,</div><div class='add'>+					struct bnxt_vnic_info *vnic,</div><div class='ctx'> 					u16 ctx_idx)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_vnic_rss_cos_lb_ctx_free_input req = {0};</div><div class='add'>+	struct hwrm_vnic_rss_cos_lb_ctx_free_input *req;</div><div class='add'>+</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_VNIC_RSS_COS_LB_CTX_FREE))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_RSS_COS_LB_CTX_FREE, -1, -1);</div><div class='del'>-	req.rss_cos_lb_ctx_id =</div><div class='del'>-		cpu_to_le16(bp-&gt;vnic_info[vnic_id].fw_rss_cos_lb_ctx[ctx_idx]);</div><div class='add'>+	req-&gt;rss_cos_lb_ctx_id =</div><div class='add'>+		cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[ctx_idx]);</div><div class='ctx'> </div><div class='del'>-	hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	bp-&gt;vnic_info[vnic_id].fw_rss_cos_lb_ctx[ctx_idx] = INVALID_HW_RING_ID;</div><div class='add'>+	hwrm_req_send(bp, req);</div><div class='add'>+	vnic-&gt;fw_rss_cos_lb_ctx[ctx_idx] = INVALID_HW_RING_ID;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_hwrm_vnic_ctx_free(struct bnxt *bp)</div><div class='hunk'>@@ -4569,28 +6757,29 @@ static void bnxt_hwrm_vnic_ctx_free(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; BNXT_MAX_CTX_PER_VNIC; j++) {</div><div class='ctx'> 			if (vnic-&gt;fw_rss_cos_lb_ctx[j] != INVALID_HW_RING_ID)</div><div class='del'>-				bnxt_hwrm_vnic_ctx_free_one(bp, i, j);</div><div class='add'>+				bnxt_hwrm_vnic_ctx_free_one(bp, vnic, j);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;rsscos_nr_ctxs = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_ctx_alloc(struct bnxt *bp, u16 vnic_id, u16 ctx_idx)</div><div class='add'>+static int bnxt_hwrm_vnic_ctx_alloc(struct bnxt *bp,</div><div class='add'>+				    struct bnxt_vnic_info *vnic, u16 ctx_idx)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_vnic_rss_cos_lb_ctx_alloc_output *resp;</div><div class='add'>+	struct hwrm_vnic_rss_cos_lb_ctx_alloc_input *req;</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct hwrm_vnic_rss_cos_lb_ctx_alloc_input req = {0};</div><div class='del'>-	struct hwrm_vnic_rss_cos_lb_ctx_alloc_output *resp =</div><div class='del'>-						bp-&gt;hwrm_cmd_resp_addr;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_RSS_COS_LB_CTX_ALLOC, -1,</div><div class='del'>-			       -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_RSS_COS_LB_CTX_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc)</div><div class='del'>-		bp-&gt;vnic_info[vnic_id].fw_rss_cos_lb_ctx[ctx_idx] =</div><div class='add'>+		vnic-&gt;fw_rss_cos_lb_ctx[ctx_idx] =</div><div class='ctx'> 			le16_to_cpu(resp-&gt;rss_cos_lb_ctx_id);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -4602,95 +6791,94 @@ static u32 bnxt_get_roce_vnic_mode(struct bnxt *bp)</div><div class='ctx'> 	return VNIC_CFG_REQ_FLAGS_ROCE_DUAL_VNIC_MODE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnxt_hwrm_vnic_cfg(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_vnic_info *vnic0 = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='add'>+	struct hwrm_vnic_cfg_input *req;</div><div class='ctx'> 	unsigned int ring = 0, grp_idx;</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='del'>-	struct hwrm_vnic_cfg_input req = {0};</div><div class='ctx'> 	u16 def_vlan = 0;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_CFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[0];</div><div class='ctx'> </div><div class='del'>-		req.default_rx_ring_id =</div><div class='add'>+		req-&gt;default_rx_ring_id =</div><div class='ctx'> 			cpu_to_le16(rxr-&gt;rx_ring_struct.fw_ring_id);</div><div class='del'>-		req.default_cmpl_ring_id =</div><div class='add'>+		req-&gt;default_cmpl_ring_id =</div><div class='ctx'> 			cpu_to_le16(bnxt_cp_ring_for_rx(bp, rxr));</div><div class='del'>-		req.enables =</div><div class='add'>+		req-&gt;enables =</div><div class='ctx'> 			cpu_to_le32(VNIC_CFG_REQ_ENABLES_DEFAULT_RX_RING_ID |</div><div class='ctx'> 				    VNIC_CFG_REQ_ENABLES_DEFAULT_CMPL_RING_ID);</div><div class='ctx'> 		goto vnic_mru;</div><div class='ctx'> 	}</div><div class='del'>-	req.enables = cpu_to_le32(VNIC_CFG_REQ_ENABLES_DFLT_RING_GRP);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(VNIC_CFG_REQ_ENABLES_DFLT_RING_GRP);</div><div class='ctx'> 	/* Only RSS support for now TBD: COS &amp; LB */</div><div class='ctx'> 	if (vnic-&gt;fw_rss_cos_lb_ctx[0] != INVALID_HW_RING_ID) {</div><div class='del'>-		req.rss_rule = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='del'>-		req.enables |= cpu_to_le32(VNIC_CFG_REQ_ENABLES_RSS_RULE |</div><div class='add'>+		req-&gt;rss_rule = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(VNIC_CFG_REQ_ENABLES_RSS_RULE |</div><div class='ctx'> 					   VNIC_CFG_REQ_ENABLES_MRU);</div><div class='ctx'> 	} else if (vnic-&gt;flags &amp; BNXT_VNIC_RFS_NEW_RSS_FLAG) {</div><div class='del'>-		req.rss_rule =</div><div class='del'>-			cpu_to_le16(bp-&gt;vnic_info[0].fw_rss_cos_lb_ctx[0]);</div><div class='del'>-		req.enables |= cpu_to_le32(VNIC_CFG_REQ_ENABLES_RSS_RULE |</div><div class='add'>+		req-&gt;rss_rule = cpu_to_le16(vnic0-&gt;fw_rss_cos_lb_ctx[0]);</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(VNIC_CFG_REQ_ENABLES_RSS_RULE |</div><div class='ctx'> 					   VNIC_CFG_REQ_ENABLES_MRU);</div><div class='del'>-		req.flags |= cpu_to_le32(VNIC_CFG_REQ_FLAGS_RSS_DFLT_CR_MODE);</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(VNIC_CFG_REQ_FLAGS_RSS_DFLT_CR_MODE);</div><div class='ctx'> 	} else {</div><div class='del'>-		req.rss_rule = cpu_to_le16(0xffff);</div><div class='add'>+		req-&gt;rss_rule = cpu_to_le16(0xffff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp) &amp;&amp;</div><div class='ctx'> 	    (vnic-&gt;fw_rss_cos_lb_ctx[0] != INVALID_HW_RING_ID)) {</div><div class='del'>-		req.cos_rule = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[1]);</div><div class='del'>-		req.enables |= cpu_to_le32(VNIC_CFG_REQ_ENABLES_COS_RULE);</div><div class='add'>+		req-&gt;cos_rule = cpu_to_le16(vnic-&gt;fw_rss_cos_lb_ctx[1]);</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(VNIC_CFG_REQ_ENABLES_COS_RULE);</div><div class='ctx'> 	} else {</div><div class='del'>-		req.cos_rule = cpu_to_le16(0xffff);</div><div class='add'>+		req-&gt;cos_rule = cpu_to_le16(0xffff);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (vnic-&gt;flags &amp; BNXT_VNIC_RSS_FLAG)</div><div class='ctx'> 		ring = 0;</div><div class='ctx'> 	else if (vnic-&gt;flags &amp; BNXT_VNIC_RFS_FLAG)</div><div class='del'>-		ring = vnic_id - 1;</div><div class='del'>-	else if ((vnic_id == 1) &amp;&amp; BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='add'>+		ring = vnic-&gt;vnic_id - 1;</div><div class='add'>+	else if ((vnic-&gt;vnic_id == 1) &amp;&amp; BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='ctx'> 		ring = bp-&gt;rx_nr_rings - 1;</div><div class='ctx'> </div><div class='ctx'> 	grp_idx = bp-&gt;rx_ring[ring].bnapi-&gt;index;</div><div class='del'>-	req.dflt_ring_grp = cpu_to_le16(bp-&gt;grp_info[grp_idx].fw_grp_id);</div><div class='del'>-	req.lb_rule = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;dflt_ring_grp = cpu_to_le16(bp-&gt;grp_info[grp_idx].fw_grp_id);</div><div class='add'>+	req-&gt;lb_rule = cpu_to_le16(0xffff);</div><div class='ctx'> vnic_mru:</div><div class='del'>-	req.mru = cpu_to_le16(bp-&gt;dev-&gt;mtu + ETH_HLEN + ETH_FCS_LEN +</div><div class='del'>-			      VLAN_HLEN);</div><div class='add'>+	vnic-&gt;mru = bp-&gt;dev-&gt;mtu + VLAN_ETH_HLEN;</div><div class='add'>+	req-&gt;mru = cpu_to_le16(vnic-&gt;mru);</div><div class='ctx'> </div><div class='del'>-	req.vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le16(vnic-&gt;fw_vnic_id);</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	if (BNXT_VF(bp))</div><div class='ctx'> 		def_vlan = bp-&gt;vf.vlan;</div><div class='ctx'> #endif</div><div class='ctx'> 	if ((bp-&gt;flags &amp; BNXT_FLAG_STRIP_VLAN) || def_vlan)</div><div class='del'>-		req.flags |= cpu_to_le32(VNIC_CFG_REQ_FLAGS_VLAN_STRIP_MODE);</div><div class='del'>-	if (!vnic_id &amp;&amp; bnxt_ulp_registered(bp-&gt;edev, BNXT_ROCE_ULP))</div><div class='del'>-		req.flags |= cpu_to_le32(bnxt_get_roce_vnic_mode(bp));</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(VNIC_CFG_REQ_FLAGS_VLAN_STRIP_MODE);</div><div class='add'>+	if (vnic-&gt;vnic_id == BNXT_VNIC_DEFAULT &amp;&amp; bnxt_ulp_registered(bp-&gt;edev))</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(bnxt_get_roce_vnic_mode(bp));</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_free_one(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+static void bnxt_hwrm_vnic_free_one(struct bnxt *bp,</div><div class='add'>+				    struct bnxt_vnic_info *vnic)</div><div class='ctx'> {</div><div class='del'>-	u32 rc = 0;</div><div class='add'>+	if (vnic-&gt;fw_vnic_id != INVALID_HW_RING_ID) {</div><div class='add'>+		struct hwrm_vnic_free_input *req;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;vnic_info[vnic_id].fw_vnic_id != INVALID_HW_RING_ID) {</div><div class='del'>-		struct hwrm_vnic_free_input req = {0};</div><div class='add'>+		if (hwrm_req_init(bp, req, HWRM_VNIC_FREE))</div><div class='add'>+			return;</div><div class='ctx'> </div><div class='del'>-		bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_FREE, -1, -1);</div><div class='del'>-		req.vnic_id =</div><div class='del'>-			cpu_to_le32(bp-&gt;vnic_info[vnic_id].fw_vnic_id);</div><div class='add'>+		req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='ctx'> </div><div class='del'>-		rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='del'>-		bp-&gt;vnic_info[vnic_id].fw_vnic_id = INVALID_HW_RING_ID;</div><div class='add'>+		hwrm_req_send(bp, req);</div><div class='add'>+		vnic-&gt;fw_vnic_id = INVALID_HW_RING_ID;</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_hwrm_vnic_free(struct bnxt *bp)</div><div class='hunk'>@@ -4698,20 +6886,23 @@ static void bnxt_hwrm_vnic_free(struct bnxt *bp)</div><div class='ctx'> 	u16 i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;nr_vnics; i++)</div><div class='del'>-		bnxt_hwrm_vnic_free_one(bp, i);</div><div class='add'>+		bnxt_hwrm_vnic_free_one(bp, &amp;bp-&gt;vnic_info[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_vnic_alloc(struct bnxt *bp, u16 vnic_id,</div><div class='del'>-				unsigned int start_rx_ring_idx,</div><div class='del'>-				unsigned int nr_rings)</div><div class='add'>+int bnxt_hwrm_vnic_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+			 unsigned int start_rx_ring_idx,</div><div class='add'>+			 unsigned int nr_rings)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	unsigned int i, j, grp_idx, end_idx = start_rx_ring_idx + nr_rings;</div><div class='del'>-	struct hwrm_vnic_alloc_input req = {0};</div><div class='del'>-	struct hwrm_vnic_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='add'>+	struct hwrm_vnic_alloc_output *resp;</div><div class='add'>+	struct hwrm_vnic_alloc_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		goto vnic_no_ring_grps;</div><div class='ctx'> </div><div class='ctx'> 	/* map ring groups to this vnic */</div><div class='hunk'>@@ -4728,213 +6919,256 @@ static int bnxt_hwrm_vnic_alloc(struct bnxt *bp, u16 vnic_id,</div><div class='ctx'> vnic_no_ring_grps:</div><div class='ctx'> 	for (i = 0; i &lt; BNXT_MAX_CTX_PER_VNIC; i++)</div><div class='ctx'> 		vnic-&gt;fw_rss_cos_lb_ctx[i] = INVALID_HW_RING_ID;</div><div class='del'>-	if (vnic_id == 0)</div><div class='del'>-		req.flags = cpu_to_le32(VNIC_ALLOC_REQ_FLAGS_DEFAULT);</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_ALLOC, -1, -1);</div><div class='add'>+	if (vnic-&gt;vnic_id == BNXT_VNIC_DEFAULT)</div><div class='add'>+		req-&gt;flags = cpu_to_le32(VNIC_ALLOC_REQ_FLAGS_DEFAULT);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		vnic-&gt;fw_vnic_id = le32_to_cpu(resp-&gt;vnic_id);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_vnic_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_vnic_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_vnic_qcaps_output *resp;</div><div class='add'>+	struct hwrm_vnic_qcaps_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;hw_ring_stats_size = sizeof(struct ctx_hw_stats);</div><div class='add'>+	bp-&gt;flags &amp;= ~BNXT_FLAG_ROCE_MIRROR_CAP;</div><div class='add'>+	bp-&gt;rss_cap &amp;= ~BNXT_RSS_CAP_NEW_RSS_CAP;</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10600)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VNIC_QCAPS, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		u32 flags = le32_to_cpu(resp-&gt;flags);</div><div class='ctx'> </div><div class='del'>-		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) &amp;&amp;</div><div class='add'>+		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='ctx'> 		    (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_DFLT_CR_CAP))</div><div class='del'>-			bp-&gt;flags |= BNXT_FLAG_NEW_RSS_CAP;</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_NEW_RSS_CAP;</div><div class='ctx'> 		if (flags &amp;</div><div class='ctx'> 		    VNIC_QCAPS_RESP_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_CAP)</div><div class='ctx'> 			bp-&gt;flags |= BNXT_FLAG_ROCE_MIRROR_CAP;</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+</div><div class='add'>+		/* Older P5 fw before EXT_HW_STATS support did not set</div><div class='add'>+		 * VLAN_STRIP_CAP properly.</div><div class='add'>+		 */</div><div class='add'>+		if ((flags &amp; VNIC_QCAPS_RESP_FLAGS_VLAN_STRIP_CAP) ||</div><div class='add'>+		    (BNXT_CHIP_P5(bp) &amp;&amp;</div><div class='add'>+		     !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED)))</div><div class='add'>+			bp-&gt;fw_cap |= BNXT_FW_CAP_VLAN_RX_STRIP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_HASH_TYPE_DELTA_CAP)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_PROF_TCAM_MODE_ENABLED)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_RSS_TCAM;</div><div class='add'>+		bp-&gt;max_tpa_v2 = le16_to_cpu(resp-&gt;max_aggs_supported);</div><div class='add'>+		if (bp-&gt;max_tpa_v2) {</div><div class='add'>+			if (BNXT_CHIP_P5(bp))</div><div class='add'>+				bp-&gt;hw_ring_stats_size = BNXT_RING_STATS_SIZE_P5;</div><div class='add'>+			else</div><div class='add'>+				bp-&gt;hw_ring_stats_size = BNXT_RING_STATS_SIZE_P7;</div><div class='add'>+		}</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_HW_TUNNEL_TPA_CAP)</div><div class='add'>+			bp-&gt;fw_cap |= BNXT_FW_CAP_VNIC_TUNNEL_TPA;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_AH_SPI_IPV4_CAP)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_AH_V4_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_AH_SPI_IPV6_CAP)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_AH_V6_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_ESP_SPI_IPV4_CAP)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_ESP_V4_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPSEC_ESP_SPI_IPV6_CAP)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_ESP_V6_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RSS_IPV6_FLOW_LABEL_CAP)</div><div class='add'>+			bp-&gt;rss_cap |= BNXT_RSS_CAP_IPV6_FLOW_LABEL_RSS_CAP;</div><div class='add'>+		if (flags &amp; VNIC_QCAPS_RESP_FLAGS_RE_FLUSH_CAP)</div><div class='add'>+			bp-&gt;fw_cap |= BNXT_FW_CAP_VNIC_RE_FLUSH;</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_ring_grp_alloc_output *resp;</div><div class='add'>+	struct hwrm_ring_grp_alloc_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> 	u16 i;</div><div class='del'>-	u32 rc = 0;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_RING_GRP_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='del'>-		struct hwrm_ring_grp_alloc_input req = {0};</div><div class='del'>-		struct hwrm_ring_grp_alloc_output *resp =</div><div class='del'>-					bp-&gt;hwrm_cmd_resp_addr;</div><div class='ctx'> 		unsigned int grp_idx = bp-&gt;rx_ring[i].bnapi-&gt;index;</div><div class='ctx'> </div><div class='del'>-		bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_RING_GRP_ALLOC, -1, -1);</div><div class='add'>+		req-&gt;cr = cpu_to_le16(bp-&gt;grp_info[grp_idx].cp_fw_ring_id);</div><div class='add'>+		req-&gt;rr = cpu_to_le16(bp-&gt;grp_info[grp_idx].rx_fw_ring_id);</div><div class='add'>+		req-&gt;ar = cpu_to_le16(bp-&gt;grp_info[grp_idx].agg_fw_ring_id);</div><div class='add'>+		req-&gt;sc = cpu_to_le16(bp-&gt;grp_info[grp_idx].fw_stats_ctx);</div><div class='ctx'> </div><div class='del'>-		req.cr = cpu_to_le16(bp-&gt;grp_info[grp_idx].cp_fw_ring_id);</div><div class='del'>-		req.rr = cpu_to_le16(bp-&gt;grp_info[grp_idx].rx_fw_ring_id);</div><div class='del'>-		req.ar = cpu_to_le16(bp-&gt;grp_info[grp_idx].agg_fw_ring_id);</div><div class='del'>-		req.sc = cpu_to_le16(bp-&gt;grp_info[grp_idx].fw_stats_ctx);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> </div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		bp-&gt;grp_info[grp_idx].fw_grp_id =</div><div class='ctx'> 			le32_to_cpu(resp-&gt;ring_group_id);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_ring_grp_free(struct bnxt *bp)</div><div class='add'>+static void bnxt_hwrm_ring_grp_free(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_ring_grp_free_input *req;</div><div class='ctx'> 	u16 i;</div><div class='del'>-	u32 rc = 0;</div><div class='del'>-	struct hwrm_ring_grp_free_input req = {0};</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;grp_info || (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='del'>-		return 0;</div><div class='add'>+	if (!bp-&gt;grp_info || (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_RING_GRP_FREE, -1, -1);</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_RING_GRP_FREE))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		if (bp-&gt;grp_info[i].fw_grp_id == INVALID_HW_RING_ID)</div><div class='ctx'> 			continue;</div><div class='del'>-		req.ring_group_id =</div><div class='add'>+		req-&gt;ring_group_id =</div><div class='ctx'> 			cpu_to_le32(bp-&gt;grp_info[i].fw_grp_id);</div><div class='ctx'> </div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='del'>-		if (rc)</div><div class='del'>-			break;</div><div class='add'>+		hwrm_req_send(bp, req);</div><div class='ctx'> 		bp-&gt;grp_info[i].fw_grp_id = INVALID_HW_RING_ID;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_rx_ring_params_p5(struct bnxt *bp, u32 ring_type,</div><div class='add'>+				       struct hwrm_ring_alloc_input *req,</div><div class='add'>+				       struct bnxt_ring_struct *ring)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_grp_info *grp_info = &amp;bp-&gt;grp_info[ring-&gt;grp_idx];</div><div class='add'>+	u32 enables = RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID |</div><div class='add'>+		      RING_ALLOC_REQ_ENABLES_NQ_RING_ID_VALID;</div><div class='add'>+</div><div class='add'>+	if (ring_type == HWRM_RING_ALLOC_AGG) {</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_RX_AGG;</div><div class='add'>+		req-&gt;rx_ring_id = cpu_to_le16(grp_info-&gt;rx_fw_ring_id);</div><div class='add'>+		req-&gt;rx_buf_size = cpu_to_le16(BNXT_RX_PAGE_SIZE);</div><div class='add'>+		enables |= RING_ALLOC_REQ_ENABLES_RX_RING_ID_VALID;</div><div class='add'>+	} else {</div><div class='add'>+		req-&gt;rx_buf_size = cpu_to_le16(bp-&gt;rx_buf_use_size);</div><div class='add'>+		if (NET_IP_ALIGN == 2)</div><div class='add'>+			req-&gt;flags =</div><div class='add'>+				cpu_to_le16(RING_ALLOC_REQ_FLAGS_RX_SOP_PAD);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='add'>+	req-&gt;nq_ring_id = cpu_to_le16(grp_info-&gt;cp_fw_ring_id);</div><div class='add'>+	req-&gt;enables |= cpu_to_le32(enables);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hwrm_ring_alloc_send_msg(struct bnxt *bp,</div><div class='ctx'> 				    struct bnxt_ring_struct *ring,</div><div class='ctx'> 				    u32 ring_type, u32 map_index)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0, err = 0;</div><div class='del'>-	struct hwrm_ring_alloc_input req = {0};</div><div class='del'>-	struct hwrm_ring_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_ring_alloc_output *resp;</div><div class='add'>+	struct hwrm_ring_alloc_input *req;</div><div class='ctx'> 	struct bnxt_ring_mem_info *rmem = &amp;ring-&gt;ring_mem;</div><div class='ctx'> 	struct bnxt_ring_grp_info *grp_info;</div><div class='add'>+	int rc, err = 0;</div><div class='ctx'> 	u16 ring_id;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_RING_ALLOC, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_RING_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='del'>-	req.enables = 0;</div><div class='add'>+	req-&gt;enables = 0;</div><div class='ctx'> 	if (rmem-&gt;nr_pages &gt; 1) {</div><div class='del'>-		req.page_tbl_addr = cpu_to_le64(rmem-&gt;pg_tbl_map);</div><div class='add'>+		req-&gt;page_tbl_addr = cpu_to_le64(rmem-&gt;pg_tbl_map);</div><div class='ctx'> 		/* Page size is in log2 units */</div><div class='del'>-		req.page_size = BNXT_PAGE_SHIFT;</div><div class='del'>-		req.page_tbl_depth = 1;</div><div class='add'>+		req-&gt;page_size = BNXT_PAGE_SHIFT;</div><div class='add'>+		req-&gt;page_tbl_depth = 1;</div><div class='ctx'> 	} else {</div><div class='del'>-		req.page_tbl_addr =  cpu_to_le64(rmem-&gt;dma_arr[0]);</div><div class='add'>+		req-&gt;page_tbl_addr =  cpu_to_le64(rmem-&gt;dma_arr[0]);</div><div class='ctx'> 	}</div><div class='del'>-	req.fbo = 0;</div><div class='add'>+	req-&gt;fbo = 0;</div><div class='ctx'> 	/* Association of ring index with doorbell index and MSIX number */</div><div class='del'>-	req.logical_id = cpu_to_le16(map_index);</div><div class='add'>+	req-&gt;logical_id = cpu_to_le16(map_index);</div><div class='ctx'> </div><div class='ctx'> 	switch (ring_type) {</div><div class='ctx'> 	case HWRM_RING_ALLOC_TX: {</div><div class='ctx'> 		struct bnxt_tx_ring_info *txr;</div><div class='add'>+		u16 flags = 0;</div><div class='ctx'> </div><div class='ctx'> 		txr = container_of(ring, struct bnxt_tx_ring_info,</div><div class='ctx'> 				   tx_ring_struct);</div><div class='del'>-		req.ring_type = RING_ALLOC_REQ_RING_TYPE_TX;</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_TX;</div><div class='ctx'> 		/* Association of transmit ring with completion ring */</div><div class='ctx'> 		grp_info = &amp;bp-&gt;grp_info[ring-&gt;grp_idx];</div><div class='del'>-		req.cmpl_ring_id = cpu_to_le16(bnxt_cp_ring_for_tx(bp, txr));</div><div class='del'>-		req.length = cpu_to_le32(bp-&gt;tx_ring_mask + 1);</div><div class='del'>-		req.stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='del'>-		req.queue_id = cpu_to_le16(ring-&gt;queue_id);</div><div class='add'>+		req-&gt;cmpl_ring_id = cpu_to_le16(bnxt_cp_ring_for_tx(bp, txr));</div><div class='add'>+		req-&gt;length = cpu_to_le32(bp-&gt;tx_ring_mask + 1);</div><div class='add'>+		req-&gt;stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='add'>+		req-&gt;queue_id = cpu_to_le16(ring-&gt;queue_id);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_TX_COAL_CMPL)</div><div class='add'>+			req-&gt;cmpl_coal_cnt =</div><div class='add'>+				RING_ALLOC_REQ_CMPL_COAL_CNT_COAL_64;</div><div class='add'>+		if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_TX_TS_CMP) &amp;&amp; bp-&gt;ptp_cfg)</div><div class='add'>+			flags |= RING_ALLOC_REQ_FLAGS_TX_PKT_TS_CMPL_ENABLE;</div><div class='add'>+		req-&gt;flags = cpu_to_le16(flags);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	case HWRM_RING_ALLOC_RX:</div><div class='del'>-		req.ring_type = RING_ALLOC_REQ_RING_TYPE_RX;</div><div class='del'>-		req.length = cpu_to_le32(bp-&gt;rx_ring_mask + 1);</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-			u16 flags = 0;</div><div class='del'>-</div><div class='del'>-			/* Association of rx ring with stats context */</div><div class='del'>-			grp_info = &amp;bp-&gt;grp_info[ring-&gt;grp_idx];</div><div class='del'>-			req.rx_buf_size = cpu_to_le16(bp-&gt;rx_buf_use_size);</div><div class='del'>-			req.stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='del'>-			req.enables |= cpu_to_le32(</div><div class='del'>-				RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID);</div><div class='del'>-			if (NET_IP_ALIGN == 2)</div><div class='del'>-				flags = RING_ALLOC_REQ_FLAGS_RX_SOP_PAD;</div><div class='del'>-			req.flags = cpu_to_le16(flags);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='ctx'> 	case HWRM_RING_ALLOC_AGG:</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-			req.ring_type = RING_ALLOC_REQ_RING_TYPE_RX_AGG;</div><div class='del'>-			/* Association of agg ring with rx ring */</div><div class='del'>-			grp_info = &amp;bp-&gt;grp_info[ring-&gt;grp_idx];</div><div class='del'>-			req.rx_ring_id = cpu_to_le16(grp_info-&gt;rx_fw_ring_id);</div><div class='del'>-			req.rx_buf_size = cpu_to_le16(BNXT_RX_PAGE_SIZE);</div><div class='del'>-			req.stat_ctx_id = cpu_to_le32(grp_info-&gt;fw_stats_ctx);</div><div class='del'>-			req.enables |= cpu_to_le32(</div><div class='del'>-				RING_ALLOC_REQ_ENABLES_RX_RING_ID_VALID |</div><div class='del'>-				RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID);</div><div class='del'>-		} else {</div><div class='del'>-			req.ring_type = RING_ALLOC_REQ_RING_TYPE_RX;</div><div class='del'>-		}</div><div class='del'>-		req.length = cpu_to_le32(bp-&gt;rx_agg_ring_mask + 1);</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_RX;</div><div class='add'>+		req-&gt;length = (ring_type == HWRM_RING_ALLOC_RX) ?</div><div class='add'>+			      cpu_to_le32(bp-&gt;rx_ring_mask + 1) :</div><div class='add'>+			      cpu_to_le32(bp-&gt;rx_agg_ring_mask + 1);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			bnxt_set_rx_ring_params_p5(bp, ring_type, req, ring);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWRM_RING_ALLOC_CMPL:</div><div class='del'>-		req.ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;</div><div class='del'>-		req.length = cpu_to_le32(bp-&gt;cp_ring_mask + 1);</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_L2_CMPL;</div><div class='add'>+		req-&gt;length = cpu_to_le32(bp-&gt;cp_ring_mask + 1);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 			/* Association of cp ring with nq */</div><div class='ctx'> 			grp_info = &amp;bp-&gt;grp_info[map_index];</div><div class='del'>-			req.nq_ring_id = cpu_to_le16(grp_info-&gt;cp_fw_ring_id);</div><div class='del'>-			req.cq_handle = cpu_to_le64(ring-&gt;handle);</div><div class='del'>-			req.enables |= cpu_to_le32(</div><div class='add'>+			req-&gt;nq_ring_id = cpu_to_le16(grp_info-&gt;cp_fw_ring_id);</div><div class='add'>+			req-&gt;cq_handle = cpu_to_le64(ring-&gt;handle);</div><div class='add'>+			req-&gt;enables |= cpu_to_le32(</div><div class='ctx'> 				RING_ALLOC_REQ_ENABLES_NQ_RING_ID_VALID);</div><div class='del'>-		} else if (bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX) {</div><div class='del'>-			req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;</div><div class='add'>+		} else {</div><div class='add'>+			req-&gt;int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWRM_RING_ALLOC_NQ:</div><div class='del'>-		req.ring_type = RING_ALLOC_REQ_RING_TYPE_NQ;</div><div class='del'>-		req.length = cpu_to_le32(bp-&gt;cp_ring_mask + 1);</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX)</div><div class='del'>-			req.int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;</div><div class='add'>+		req-&gt;ring_type = RING_ALLOC_REQ_RING_TYPE_NQ;</div><div class='add'>+		req-&gt;length = cpu_to_le32(bp-&gt;cp_ring_mask + 1);</div><div class='add'>+		req-&gt;int_mode = RING_ALLOC_REQ_INT_MODE_MSIX;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm alloc invalid ring type %d\n",</div><div class='ctx'> 			   ring_type);</div><div class='del'>-		return -1;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	err = le16_to_cpu(resp-&gt;error_code);</div><div class='ctx'> 	ring_id = le16_to_cpu(resp-&gt;ring_id);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> </div><div class='add'>+exit:</div><div class='ctx'> 	if (rc || err) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm_ring_alloc type %d failed. rc:%x err:%x\n",</div><div class='ctx'> 			   ring_type, rc, err);</div><div class='hunk'>@@ -4949,33 +7183,58 @@ static int bnxt_hwrm_set_async_event_cr(struct bnxt *bp, int idx)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_PF(bp)) {</div><div class='del'>-		struct hwrm_func_cfg_input req = {0};</div><div class='add'>+		struct hwrm_func_cfg_input *req;</div><div class='ctx'> </div><div class='del'>-		bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-		req.fid = cpu_to_le16(0xffff);</div><div class='del'>-		req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_ASYNC_EVENT_CR);</div><div class='del'>-		req.async_event_cr = cpu_to_le16(idx);</div><div class='del'>-		rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+		rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+		req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_ASYNC_EVENT_CR);</div><div class='add'>+		req-&gt;async_event_cr = cpu_to_le16(idx);</div><div class='add'>+		return hwrm_req_send(bp, req);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct hwrm_func_vf_cfg_input req = {0};</div><div class='add'>+		struct hwrm_func_vf_cfg_input *req;</div><div class='add'>+</div><div class='add'>+		rc = hwrm_req_init(bp, req, HWRM_FUNC_VF_CFG);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='ctx'> </div><div class='del'>-		bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_VF_CFG, -1, -1);</div><div class='del'>-		req.enables =</div><div class='add'>+		req-&gt;enables =</div><div class='ctx'> 			cpu_to_le32(FUNC_VF_CFG_REQ_ENABLES_ASYNC_EVENT_CR);</div><div class='del'>-		req.async_event_cr = cpu_to_le16(idx);</div><div class='del'>-		rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+		req-&gt;async_event_cr = cpu_to_le16(idx);</div><div class='add'>+		return hwrm_req_send(bp, req);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_db_mask(struct bnxt *bp, struct bnxt_db_info *db,</div><div class='add'>+			     u32 ring_type)</div><div class='add'>+{</div><div class='add'>+	switch (ring_type) {</div><div class='add'>+	case HWRM_RING_ALLOC_TX:</div><div class='add'>+		db-&gt;db_ring_mask = bp-&gt;tx_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_RX:</div><div class='add'>+		db-&gt;db_ring_mask = bp-&gt;rx_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_AGG:</div><div class='add'>+		db-&gt;db_ring_mask = bp-&gt;rx_agg_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	case HWRM_RING_ALLOC_CMPL:</div><div class='add'>+	case HWRM_RING_ALLOC_NQ:</div><div class='add'>+		db-&gt;db_ring_mask = bp-&gt;cp_ring_mask;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P7) {</div><div class='add'>+		db-&gt;db_epoch_mask = db-&gt;db_ring_mask + 1;</div><div class='add'>+		db-&gt;db_epoch_shift = DBR_EPOCH_SFT - ilog2(db-&gt;db_epoch_mask);</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,</div><div class='ctx'> 			u32 map_idx, u32 xid)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		if (BNXT_PF(bp))</div><div class='del'>-			db-&gt;doorbell = bp-&gt;bar1 + 0x10000;</div><div class='del'>-		else</div><div class='del'>-			db-&gt;doorbell = bp-&gt;bar1 + 0x4000;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 		switch (ring_type) {</div><div class='ctx'> 		case HWRM_RING_ALLOC_TX:</div><div class='ctx'> 			db-&gt;db_key64 = DBR_PATH_L2 | DBR_TYPE_SQ;</div><div class='hunk'>@@ -4992,6 +7251,11 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		db-&gt;db_key64 |= (u64)xid &lt;&lt; DBR_XID_SFT;</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P7)</div><div class='add'>+			db-&gt;db_key64 |= DBR_VALID;</div><div class='add'>+</div><div class='add'>+		db-&gt;doorbell = bp-&gt;bar1 + bp-&gt;db_offset;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		db-&gt;doorbell = bp-&gt;bar1 + map_idx * 0x80;</div><div class='ctx'> 		switch (ring_type) {</div><div class='hunk'>@@ -5007,14 +7271,91 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	bnxt_set_db_mask(bp, db, ring_type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_rx_ring_alloc(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	struct bnxt_napi *bnapi = rxr-&gt;bnapi;</div><div class='add'>+	u32 type = HWRM_RING_ALLOC_RX;</div><div class='add'>+	u32 map_idx = bnapi-&gt;index;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnxt_set_db(bp, &amp;rxr-&gt;rx_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='add'>+	bp-&gt;grp_info[map_idx].rx_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_rx_agg_ring_alloc(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	u32 type = HWRM_RING_ALLOC_AGG;</div><div class='add'>+	u32 grp_idx = ring-&gt;grp_idx;</div><div class='add'>+	u32 map_idx;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	map_idx = grp_idx + bp-&gt;rx_nr_rings;</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnxt_set_db(bp, &amp;rxr-&gt;rx_agg_db, type, map_idx,</div><div class='add'>+		    ring-&gt;fw_ring_id);</div><div class='add'>+	bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+	bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='add'>+	bp-&gt;grp_info[grp_idx].agg_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp,</div><div class='add'>+				      struct bnxt_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	const u32 type = HWRM_RING_ALLOC_CMPL;</div><div class='add'>+	struct bnxt_napi *bnapi = cpr-&gt;bnapi;</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+	u32 map_idx = bnapi-&gt;index;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	ring = &amp;cpr-&gt;cp_ring_struct;</div><div class='add'>+	ring-&gt;handle = BNXT_SET_NQ_HDL(cpr);</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	bnxt_set_db(bp, &amp;cpr-&gt;cp_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='add'>+	bnxt_db_cq(bp, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_tx_ring_alloc(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_tx_ring_info *txr, u32 tx_idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+	const u32 type = HWRM_RING_ALLOC_TX;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_ring_alloc_send_msg(bp, ring, type, tx_idx);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	bnxt_set_db(bp, &amp;txr-&gt;tx_db, type, tx_idx, ring-&gt;fw_ring_id);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_ring_alloc(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	bool agg_rings = !!(bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS);</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> 	u32 type;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		type = HWRM_RING_ALLOC_NQ;</div><div class='ctx'> 	else</div><div class='ctx'> 		type = HWRM_RING_ALLOC_CMPL;</div><div class='hunk'>@@ -5044,108 +7385,91 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	type = HWRM_RING_ALLOC_TX;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_tx_ring_info *txr = &amp;bp-&gt;tx_ring[i];</div><div class='del'>-		struct bnxt_ring_struct *ring;</div><div class='del'>-		u32 map_idx;</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-			struct bnxt_napi *bnapi = txr-&gt;bnapi;</div><div class='del'>-			struct bnxt_cp_ring_info *cpr, *cpr2;</div><div class='del'>-			u32 type2 = HWRM_RING_ALLOC_CMPL;</div><div class='del'>-</div><div class='del'>-			cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-			cpr2 = cpr-&gt;cp_ring_arr[BNXT_TX_HDL];</div><div class='del'>-			ring = &amp;cpr2-&gt;cp_ring_struct;</div><div class='del'>-			ring-&gt;handle = BNXT_TX_HDL;</div><div class='del'>-			map_idx = bnapi-&gt;index;</div><div class='del'>-			rc = hwrm_ring_alloc_send_msg(bp, ring, type2, map_idx);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+			rc = bnxt_hwrm_cp_ring_alloc_p5(bp, txr-&gt;tx_cpr);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				goto err_out;</div><div class='del'>-			bnxt_set_db(bp, &amp;cpr2-&gt;cp_db, type2, map_idx,</div><div class='del'>-				    ring-&gt;fw_ring_id);</div><div class='del'>-			bnxt_db_cq(bp, &amp;cpr2-&gt;cp_db, cpr2-&gt;cp_raw_cons);</div><div class='ctx'> 		}</div><div class='del'>-		ring = &amp;txr-&gt;tx_ring_struct;</div><div class='del'>-		map_idx = i;</div><div class='del'>-		rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);</div><div class='add'>+		rc = bnxt_hwrm_tx_ring_alloc(bp, txr, i);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_out;</div><div class='del'>-		bnxt_set_db(bp, &amp;txr-&gt;tx_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	type = HWRM_RING_ALLOC_RX;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='del'>-		struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='del'>-		struct bnxt_napi *bnapi = rxr-&gt;bnapi;</div><div class='del'>-		u32 map_idx = bnapi-&gt;index;</div><div class='ctx'> </div><div class='del'>-		rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);</div><div class='add'>+		rc = bnxt_hwrm_rx_ring_alloc(bp, rxr);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto err_out;</div><div class='del'>-		bnxt_set_db(bp, &amp;rxr-&gt;rx_db, type, map_idx, ring-&gt;fw_ring_id);</div><div class='del'>-		bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='del'>-		bp-&gt;grp_info[map_idx].rx_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-			u32 type2 = HWRM_RING_ALLOC_CMPL;</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2;</div><div class='del'>-</div><div class='del'>-			cpr2 = cpr-&gt;cp_ring_arr[BNXT_RX_HDL];</div><div class='del'>-			ring = &amp;cpr2-&gt;cp_ring_struct;</div><div class='del'>-			ring-&gt;handle = BNXT_RX_HDL;</div><div class='del'>-			rc = hwrm_ring_alloc_send_msg(bp, ring, type2, map_idx);</div><div class='add'>+		/* If we have agg rings, post agg buffers first. */</div><div class='add'>+		if (!agg_rings)</div><div class='add'>+			bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+			rc = bnxt_hwrm_cp_ring_alloc_p5(bp, rxr-&gt;rx_cpr);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				goto err_out;</div><div class='del'>-			bnxt_set_db(bp, &amp;cpr2-&gt;cp_db, type2, map_idx,</div><div class='del'>-				    ring-&gt;fw_ring_id);</div><div class='del'>-			bnxt_db_cq(bp, &amp;cpr2-&gt;cp_db, cpr2-&gt;cp_raw_cons);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS) {</div><div class='del'>-		type = HWRM_RING_ALLOC_AGG;</div><div class='add'>+	if (agg_rings) {</div><div class='ctx'> 		for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='del'>-			struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='del'>-			struct bnxt_ring_struct *ring =</div><div class='del'>-						&amp;rxr-&gt;rx_agg_ring_struct;</div><div class='del'>-			u32 grp_idx = ring-&gt;grp_idx;</div><div class='del'>-			u32 map_idx = grp_idx + bp-&gt;rx_nr_rings;</div><div class='del'>-</div><div class='del'>-			rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);</div><div class='add'>+			rc = bnxt_hwrm_rx_agg_ring_alloc(bp, &amp;bp-&gt;rx_ring[i]);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				goto err_out;</div><div class='del'>-</div><div class='del'>-			bnxt_set_db(bp, &amp;rxr-&gt;rx_agg_db, type, map_idx,</div><div class='del'>-				    ring-&gt;fw_ring_id);</div><div class='del'>-			bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='del'>-			bp-&gt;grp_info[grp_idx].agg_fw_ring_id = ring-&gt;fw_ring_id;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> err_out:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_cancel_dim(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* DIM work is initialized in bnxt_enable_napi().  Proceed only</div><div class='add'>+	 * if NAPI is enabled.</div><div class='add'>+	 */</div><div class='add'>+	if (!bp-&gt;bnapi || test_bit(BNXT_STATE_NAPI_DISABLED, &amp;bp-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Make sure NAPI sees that the VNIC is disabled */</div><div class='add'>+	synchronize_net();</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='add'>+		struct bnxt_napi *bnapi = rxr-&gt;bnapi;</div><div class='add'>+</div><div class='add'>+		cancel_work_sync(&amp;bnapi-&gt;cp_ring.dim.work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int hwrm_ring_free_send_msg(struct bnxt *bp,</div><div class='ctx'> 				   struct bnxt_ring_struct *ring,</div><div class='ctx'> 				   u32 ring_type, int cmpl_ring_id)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_ring_free_output *resp;</div><div class='add'>+	struct hwrm_ring_free_input *req;</div><div class='add'>+	u16 error_code = 0;</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct hwrm_ring_free_input req = {0};</div><div class='del'>-	struct hwrm_ring_free_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	u16 error_code;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_RING_FREE, cmpl_ring_id, -1);</div><div class='del'>-	req.ring_type = ring_type;</div><div class='del'>-	req.ring_id = cpu_to_le16(ring-&gt;fw_ring_id);</div><div class='add'>+	if (BNXT_NO_FW_ACCESS(bp))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	error_code = le16_to_cpu(resp-&gt;error_code);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_RING_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	req-&gt;cmpl_ring = cpu_to_le16(cmpl_ring_id);</div><div class='add'>+	req-&gt;ring_type = ring_type;</div><div class='add'>+	req-&gt;ring_id = cpu_to_le16(ring-&gt;fw_ring_id);</div><div class='ctx'> </div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	error_code = le16_to_cpu(resp-&gt;error_code);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+exit:</div><div class='ctx'> 	if (rc || error_code) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm_ring_free type %d failed. rc:%x err:%x\n",</div><div class='ctx'> 			   ring_type, rc, error_code);</div><div class='hunk'>@@ -5154,66 +7478,109 @@ static int hwrm_ring_free_send_msg(struct bnxt *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</div><div class='add'>+static void bnxt_hwrm_tx_ring_free(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_tx_ring_info *txr,</div><div class='add'>+				   bool close_path)</div><div class='ctx'> {</div><div class='del'>-	u32 type;</div><div class='del'>-	int i;</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='add'>+	u32 cmpl_ring_id;</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;bnapi)</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='del'>-		struct bnxt_tx_ring_info *txr = &amp;bp-&gt;tx_ring[i];</div><div class='del'>-		struct bnxt_ring_struct *ring = &amp;txr-&gt;tx_ring_struct;</div><div class='del'>-</div><div class='del'>-		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='del'>-			u32 cmpl_ring_id = bnxt_cp_ring_for_tx(bp, txr);</div><div class='add'>+	cmpl_ring_id = close_path ? bnxt_cp_ring_for_tx(bp, txr) :</div><div class='add'>+		       INVALID_HW_RING_ID;</div><div class='add'>+	hwrm_ring_free_send_msg(bp, ring, RING_FREE_REQ_RING_TYPE_TX,</div><div class='add'>+				cmpl_ring_id);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			hwrm_ring_free_send_msg(bp, ring,</div><div class='del'>-						RING_FREE_REQ_RING_TYPE_TX,</div><div class='del'>-						close_path ? cmpl_ring_id :</div><div class='del'>-						INVALID_HW_RING_ID);</div><div class='del'>-			ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static void bnxt_hwrm_rx_ring_free(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_rx_ring_info *rxr,</div><div class='add'>+				   bool close_path)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+	u32 cmpl_ring_id;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='del'>-		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='del'>-		struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='del'>-		u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='del'>-			u32 cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+	cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+	hwrm_ring_free_send_msg(bp, ring,</div><div class='add'>+				RING_FREE_REQ_RING_TYPE_RX,</div><div class='add'>+				close_path ? cmpl_ring_id :</div><div class='add'>+				INVALID_HW_RING_ID);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	bp-&gt;grp_info[grp_idx].rx_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			hwrm_ring_free_send_msg(bp, ring,</div><div class='del'>-						RING_FREE_REQ_RING_TYPE_RX,</div><div class='del'>-						close_path ? cmpl_ring_id :</div><div class='del'>-						INVALID_HW_RING_ID);</div><div class='del'>-			ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='del'>-			bp-&gt;grp_info[grp_idx].rx_fw_ring_id =</div><div class='del'>-				INVALID_HW_RING_ID;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+static void bnxt_hwrm_rx_agg_ring_free(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_rx_ring_info *rxr,</div><div class='add'>+				       bool close_path)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='add'>+	u32 type, cmpl_ring_id;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		type = RING_FREE_REQ_RING_TYPE_RX_AGG;</div><div class='ctx'> 	else</div><div class='ctx'> 		type = RING_FREE_REQ_RING_TYPE_RX;</div><div class='del'>-	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='del'>-		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='del'>-		struct bnxt_ring_struct *ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='del'>-		u32 grp_idx = rxr-&gt;bnapi-&gt;index;</div><div class='ctx'> </div><div class='del'>-		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='del'>-			u32 cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-			hwrm_ring_free_send_msg(bp, ring, type,</div><div class='del'>-						close_path ? cmpl_ring_id :</div><div class='del'>-						INVALID_HW_RING_ID);</div><div class='del'>-			ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='del'>-			bp-&gt;grp_info[grp_idx].agg_fw_ring_id =</div><div class='del'>-				INVALID_HW_RING_ID;</div><div class='del'>-		}</div><div class='add'>+	cmpl_ring_id = bnxt_cp_ring_for_rx(bp, rxr);</div><div class='add'>+	hwrm_ring_free_send_msg(bp, ring, type,</div><div class='add'>+				close_path ? cmpl_ring_id :</div><div class='add'>+				INVALID_HW_RING_ID);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+	bp-&gt;grp_info[grp_idx].agg_fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_cp_ring_free(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+	ring = &amp;cpr-&gt;cp_ring_struct;</div><div class='add'>+	if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	hwrm_ring_free_send_msg(bp, ring, RING_FREE_REQ_RING_TYPE_L2_CMPL,</div><div class='add'>+				INVALID_HW_RING_ID);</div><div class='add'>+	ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_clear_one_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_struct *ring = &amp;cpr-&gt;cp_ring_struct;</div><div class='add'>+	int i, size = ring-&gt;ring_mem.page_size;</div><div class='add'>+</div><div class='add'>+	cpr-&gt;cp_raw_cons = 0;</div><div class='add'>+	cpr-&gt;toggle = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;cp_nr_pages; i++)</div><div class='add'>+		if (cpr-&gt;cp_desc_ring[i])</div><div class='add'>+			memset(cpr-&gt;cp_desc_ring[i], 0, size);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</div><div class='add'>+{</div><div class='add'>+	u32 type;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;bnapi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++)</div><div class='add'>+		bnxt_hwrm_tx_ring_free(bp, &amp;bp-&gt;tx_ring[i], close_path);</div><div class='add'>+</div><div class='add'>+	bnxt_cancel_dim(bp);</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='add'>+		bnxt_hwrm_rx_ring_free(bp, &amp;bp-&gt;rx_ring[i], close_path);</div><div class='add'>+		bnxt_hwrm_rx_agg_ring_free(bp, &amp;bp-&gt;rx_ring[i], close_path);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The completion rings are about to be freed.  After that the</div><div class='hunk'>@@ -5222,7 +7589,7 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</div><div class='ctx'> 	 */</div><div class='ctx'> 	bnxt_disable_int_sync(bp);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		type = RING_FREE_REQ_RING_TYPE_NQ;</div><div class='ctx'> 	else</div><div class='ctx'> 		type = RING_FREE_REQ_RING_TYPE_L2_CMPL;</div><div class='hunk'>@@ -5232,19 +7599,9 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</div><div class='ctx'> 		struct bnxt_ring_struct *ring;</div><div class='ctx'> 		int j;</div><div class='ctx'> </div><div class='del'>-		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2 = cpr-&gt;cp_ring_arr[j];</div><div class='add'>+		for (j = 0; j &lt; cpr-&gt;cp_ring_count &amp;&amp; cpr-&gt;cp_ring_arr; j++)</div><div class='add'>+			bnxt_hwrm_cp_ring_free(bp, &amp;cpr-&gt;cp_ring_arr[j]);</div><div class='ctx'> </div><div class='del'>-			if (cpr2) {</div><div class='del'>-				ring = &amp;cpr2-&gt;cp_ring_struct;</div><div class='del'>-				if (ring-&gt;fw_ring_id == INVALID_HW_RING_ID)</div><div class='del'>-					continue;</div><div class='del'>-				hwrm_ring_free_send_msg(bp, ring,</div><div class='del'>-					RING_FREE_REQ_RING_TYPE_L2_CMPL,</div><div class='del'>-					INVALID_HW_RING_ID);</div><div class='del'>-				ring-&gt;fw_ring_id = INVALID_HW_RING_ID;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		ring = &amp;cpr-&gt;cp_ring_struct;</div><div class='ctx'> 		if (ring-&gt;fw_ring_id != INVALID_HW_RING_ID) {</div><div class='ctx'> 			hwrm_ring_free_send_msg(bp, ring, type,</div><div class='hunk'>@@ -5255,26 +7612,31 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,</div><div class='add'>+			     bool shared);</div><div class='ctx'> static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,</div><div class='ctx'> 			   bool shared);</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_get_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='del'>-	struct hwrm_func_qcfg_input req = {0};</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10601)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-		return -EIO;</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	hw_resc-&gt;resv_tx_rings = le16_to_cpu(resp-&gt;alloc_tx_rings);</div><div class='hunk'>@@ -5285,17 +7647,20 @@ static int bnxt_hwrm_get_rings(struct bnxt *bp)</div><div class='ctx'> 		hw_resc-&gt;resv_hw_ring_grps =</div><div class='ctx'> 			le32_to_cpu(resp-&gt;alloc_hw_ring_grps);</div><div class='ctx'> 		hw_resc-&gt;resv_vnics = le16_to_cpu(resp-&gt;alloc_vnics);</div><div class='add'>+		hw_resc-&gt;resv_rsscos_ctxs = le16_to_cpu(resp-&gt;alloc_rsscos_ctx);</div><div class='ctx'> 		cp = le16_to_cpu(resp-&gt;alloc_cmpl_rings);</div><div class='ctx'> 		stats = le16_to_cpu(resp-&gt;alloc_stat_ctx);</div><div class='ctx'> 		hw_resc-&gt;resv_irqs = cp;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 			int rx = hw_resc-&gt;resv_rx_rings;</div><div class='ctx'> 			int tx = hw_resc-&gt;resv_tx_rings;</div><div class='ctx'> </div><div class='ctx'> 			if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='ctx'> 				rx &gt;&gt;= 1;</div><div class='ctx'> 			if (cp &lt; (rx + tx)) {</div><div class='del'>-				bnxt_trim_rings(bp, &amp;rx, &amp;tx, cp, false);</div><div class='add'>+				rc = __bnxt_trim_rings(bp, &amp;rx, &amp;tx, cp, false);</div><div class='add'>+				if (rc)</div><div class='add'>+					goto get_rings_exit;</div><div class='ctx'> 				if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='ctx'> 					rx &lt;&lt;= 1;</div><div class='ctx'> 				hw_resc-&gt;resv_rx_rings = rx;</div><div class='hunk'>@@ -5307,199 +7672,187 @@ static int bnxt_hwrm_get_rings(struct bnxt *bp)</div><div class='ctx'> 		hw_resc-&gt;resv_cp_rings = cp;</div><div class='ctx'> 		hw_resc-&gt;resv_stat_ctxs = stats;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return 0;</div><div class='add'>+get_rings_exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller must hold bp-&gt;hwrm_cmd_lock */</div><div class='ctx'> int __bnxt_hwrm_get_tx_rings(struct bnxt *bp, u16 fid, int *tx_rings)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_func_qcfg_input req = {0};</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10601)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(fid);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(fid);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		*tx_rings = le16_to_cpu(resp-&gt;alloc_tx_rings);</div><div class='ctx'> </div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool bnxt_rfs_supported(struct bnxt *bp);</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-__bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct hwrm_func_cfg_input *req,</div><div class='del'>-			     int tx_rings, int rx_rings, int ring_grps,</div><div class='del'>-			     int cp_rings, int stats, int vnics)</div><div class='add'>+static struct hwrm_func_cfg_input *</div><div class='add'>+__bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	u32 enables = 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, req, HWRM_FUNC_CFG, -1, -1);</div><div class='add'>+	if (bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='ctx'> 	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='del'>-	enables |= tx_rings ? FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS : 0;</div><div class='del'>-	req-&gt;num_tx_rings = cpu_to_le16(tx_rings);</div><div class='add'>+	enables |= hwr-&gt;tx ? FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS : 0;</div><div class='add'>+	req-&gt;num_tx_rings = cpu_to_le16(hwr-&gt;tx);</div><div class='ctx'> 	if (BNXT_NEW_RM(bp)) {</div><div class='del'>-		enables |= rx_rings ? FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS : 0;</div><div class='del'>-		enables |= stats ? FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-			enables |= cp_rings ? FUNC_CFG_REQ_ENABLES_NUM_MSIX : 0;</div><div class='del'>-			enables |= tx_rings + ring_grps ?</div><div class='add'>+		enables |= hwr-&gt;rx ? FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS : 0;</div><div class='add'>+		enables |= hwr-&gt;stat ? FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+			enables |= hwr-&gt;cp ? FUNC_CFG_REQ_ENABLES_NUM_MSIX : 0;</div><div class='add'>+			enables |= hwr-&gt;cp_p5 ?</div><div class='ctx'> 				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='del'>-			enables |= rx_rings ?</div><div class='del'>-				FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='ctx'> 		} else {</div><div class='del'>-			enables |= cp_rings ?</div><div class='add'>+			enables |= hwr-&gt;cp ?</div><div class='ctx'> 				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='del'>-			enables |= ring_grps ?</div><div class='del'>-				   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS |</div><div class='del'>-				   FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='del'>-		}</div><div class='del'>-		enables |= vnics ? FUNC_CFG_REQ_ENABLES_NUM_VNICS : 0;</div><div class='del'>-</div><div class='del'>-		req-&gt;num_rx_rings = cpu_to_le16(rx_rings);</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-			req-&gt;num_cmpl_rings = cpu_to_le16(tx_rings + ring_grps);</div><div class='del'>-			req-&gt;num_msix = cpu_to_le16(cp_rings);</div><div class='del'>-			req-&gt;num_rsscos_ctxs =</div><div class='del'>-				cpu_to_le16(DIV_ROUND_UP(ring_grps, 64));</div><div class='add'>+			enables |= hwr-&gt;grp ?</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS : 0;</div><div class='add'>+		}</div><div class='add'>+		enables |= hwr-&gt;vnic ? FUNC_CFG_REQ_ENABLES_NUM_VNICS : 0;</div><div class='add'>+		enables |= hwr-&gt;rss_ctx ? FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS :</div><div class='add'>+					  0;</div><div class='add'>+		req-&gt;num_rx_rings = cpu_to_le16(hwr-&gt;rx);</div><div class='add'>+		req-&gt;num_rsscos_ctxs = cpu_to_le16(hwr-&gt;rss_ctx);</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+			req-&gt;num_cmpl_rings = cpu_to_le16(hwr-&gt;cp_p5);</div><div class='add'>+			req-&gt;num_msix = cpu_to_le16(hwr-&gt;cp);</div><div class='ctx'> 		} else {</div><div class='del'>-			req-&gt;num_cmpl_rings = cpu_to_le16(cp_rings);</div><div class='del'>-			req-&gt;num_hw_ring_grps = cpu_to_le16(ring_grps);</div><div class='del'>-			req-&gt;num_rsscos_ctxs = cpu_to_le16(1);</div><div class='del'>-			if (!(bp-&gt;flags &amp; BNXT_FLAG_NEW_RSS_CAP) &amp;&amp;</div><div class='del'>-			    bnxt_rfs_supported(bp))</div><div class='del'>-				req-&gt;num_rsscos_ctxs =</div><div class='del'>-					cpu_to_le16(ring_grps + 1);</div><div class='add'>+			req-&gt;num_cmpl_rings = cpu_to_le16(hwr-&gt;cp);</div><div class='add'>+			req-&gt;num_hw_ring_grps = cpu_to_le16(hwr-&gt;grp);</div><div class='ctx'> 		}</div><div class='del'>-		req-&gt;num_stat_ctxs = cpu_to_le16(stats);</div><div class='del'>-		req-&gt;num_vnics = cpu_to_le16(vnics);</div><div class='add'>+		req-&gt;num_stat_ctxs = cpu_to_le16(hwr-&gt;stat);</div><div class='add'>+		req-&gt;num_vnics = cpu_to_le16(hwr-&gt;vnic);</div><div class='ctx'> 	}</div><div class='ctx'> 	req-&gt;enables = cpu_to_le32(enables);</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void</div><div class='del'>-__bnxt_hwrm_reserve_vf_rings(struct bnxt *bp,</div><div class='del'>-			     struct hwrm_func_vf_cfg_input *req, int tx_rings,</div><div class='del'>-			     int rx_rings, int ring_grps, int cp_rings,</div><div class='del'>-			     int stats, int vnics)</div><div class='add'>+static struct hwrm_func_vf_cfg_input *</div><div class='add'>+__bnxt_hwrm_reserve_vf_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_func_vf_cfg_input *req;</div><div class='ctx'> 	u32 enables = 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, req, HWRM_FUNC_VF_CFG, -1, -1);</div><div class='del'>-	enables |= tx_rings ? FUNC_VF_CFG_REQ_ENABLES_NUM_TX_RINGS : 0;</div><div class='del'>-	enables |= rx_rings ? FUNC_VF_CFG_REQ_ENABLES_NUM_RX_RINGS |</div><div class='del'>-			      FUNC_VF_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='del'>-	enables |= stats ? FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		enables |= tx_rings + ring_grps ?</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_FUNC_VF_CFG))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	enables |= hwr-&gt;tx ? FUNC_VF_CFG_REQ_ENABLES_NUM_TX_RINGS : 0;</div><div class='add'>+	enables |= hwr-&gt;rx ? FUNC_VF_CFG_REQ_ENABLES_NUM_RX_RINGS |</div><div class='add'>+			     FUNC_VF_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='add'>+	enables |= hwr-&gt;stat ? FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;</div><div class='add'>+	enables |= hwr-&gt;rss_ctx ? FUNC_VF_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS : 0;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		enables |= hwr-&gt;cp_p5 ?</div><div class='ctx'> 			   FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='ctx'> 	} else {</div><div class='del'>-		enables |= cp_rings ?</div><div class='del'>-			   FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='del'>-		enables |= ring_grps ?</div><div class='add'>+		enables |= hwr-&gt;cp ? FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS : 0;</div><div class='add'>+		enables |= hwr-&gt;grp ?</div><div class='ctx'> 			   FUNC_VF_CFG_REQ_ENABLES_NUM_HW_RING_GRPS : 0;</div><div class='ctx'> 	}</div><div class='del'>-	enables |= vnics ? FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS : 0;</div><div class='add'>+	enables |= hwr-&gt;vnic ? FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS : 0;</div><div class='ctx'> 	enables |= FUNC_VF_CFG_REQ_ENABLES_NUM_L2_CTXS;</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;num_l2_ctxs = cpu_to_le16(BNXT_VF_MAX_L2_CTX);</div><div class='del'>-	req-&gt;num_tx_rings = cpu_to_le16(tx_rings);</div><div class='del'>-	req-&gt;num_rx_rings = cpu_to_le16(rx_rings);</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		req-&gt;num_cmpl_rings = cpu_to_le16(tx_rings + ring_grps);</div><div class='del'>-		req-&gt;num_rsscos_ctxs = cpu_to_le16(DIV_ROUND_UP(ring_grps, 64));</div><div class='add'>+	req-&gt;num_tx_rings = cpu_to_le16(hwr-&gt;tx);</div><div class='add'>+	req-&gt;num_rx_rings = cpu_to_le16(hwr-&gt;rx);</div><div class='add'>+	req-&gt;num_rsscos_ctxs = cpu_to_le16(hwr-&gt;rss_ctx);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		req-&gt;num_cmpl_rings = cpu_to_le16(hwr-&gt;cp_p5);</div><div class='ctx'> 	} else {</div><div class='del'>-		req-&gt;num_cmpl_rings = cpu_to_le16(cp_rings);</div><div class='del'>-		req-&gt;num_hw_ring_grps = cpu_to_le16(ring_grps);</div><div class='del'>-		req-&gt;num_rsscos_ctxs = cpu_to_le16(BNXT_VF_MAX_RSS_CTX);</div><div class='add'>+		req-&gt;num_cmpl_rings = cpu_to_le16(hwr-&gt;cp);</div><div class='add'>+		req-&gt;num_hw_ring_grps = cpu_to_le16(hwr-&gt;grp);</div><div class='ctx'> 	}</div><div class='del'>-	req-&gt;num_stat_ctxs = cpu_to_le16(stats);</div><div class='del'>-	req-&gt;num_vnics = cpu_to_le16(vnics);</div><div class='add'>+	req-&gt;num_stat_ctxs = cpu_to_le16(hwr-&gt;stat);</div><div class='add'>+	req-&gt;num_vnics = cpu_to_le16(hwr-&gt;vnic);</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;enables = cpu_to_le32(enables);</div><div class='add'>+	return req;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, int tx_rings, int rx_rings,</div><div class='del'>-			   int ring_grps, int cp_rings, int stats, int vnics)</div><div class='add'>+bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	__bnxt_hwrm_reserve_pf_rings(bp, &amp;req, tx_rings, rx_rings, ring_grps,</div><div class='del'>-				     cp_rings, stats, vnics);</div><div class='del'>-	if (!req.enables)</div><div class='add'>+	req = __bnxt_hwrm_reserve_pf_rings(bp, hwr);</div><div class='add'>+	if (!req)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!req-&gt;enables) {</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return 0;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10601)</div><div class='del'>-		bp-&gt;hw_resc.resv_tx_rings = tx_rings;</div><div class='add'>+		bp-&gt;hw_resc.resv_tx_rings = hwr-&gt;tx;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_get_rings(bp);</div><div class='del'>-	return rc;</div><div class='add'>+	return bnxt_hwrm_get_rings(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='del'>-bnxt_hwrm_reserve_vf_rings(struct bnxt *bp, int tx_rings, int rx_rings,</div><div class='del'>-			   int ring_grps, int cp_rings, int stats, int vnics)</div><div class='add'>+bnxt_hwrm_reserve_vf_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_vf_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_vf_cfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!BNXT_NEW_RM(bp)) {</div><div class='del'>-		bp-&gt;hw_resc.resv_tx_rings = tx_rings;</div><div class='add'>+		bp-&gt;hw_resc.resv_tx_rings = hwr-&gt;tx;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	__bnxt_hwrm_reserve_vf_rings(bp, &amp;req, tx_rings, rx_rings, ring_grps,</div><div class='del'>-				     cp_rings, stats, vnics);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='add'>+	req = __bnxt_hwrm_reserve_vf_rings(bp, hwr);</div><div class='add'>+	if (!req)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_get_rings(bp);</div><div class='del'>-	return rc;</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	return bnxt_hwrm_get_rings(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_reserve_rings(struct bnxt *bp, int tx, int rx, int grp,</div><div class='del'>-				   int cp, int stat, int vnic)</div><div class='add'>+static int bnxt_hwrm_reserve_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='ctx'> 	if (BNXT_PF(bp))</div><div class='del'>-		return bnxt_hwrm_reserve_pf_rings(bp, tx, rx, grp, cp, stat,</div><div class='del'>-						  vnic);</div><div class='add'>+		return bnxt_hwrm_reserve_pf_rings(bp, hwr);</div><div class='ctx'> 	else</div><div class='del'>-		return bnxt_hwrm_reserve_vf_rings(bp, tx, rx, grp, cp, stat,</div><div class='del'>-						  vnic);</div><div class='add'>+		return bnxt_hwrm_reserve_vf_rings(bp, hwr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_nq_rings_in_use(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int cp = bp-&gt;cp_nr_rings;</div><div class='del'>-	int ulp_msix, ulp_base;</div><div class='del'>-</div><div class='del'>-	ulp_msix = bnxt_get_ulp_msix_num(bp);</div><div class='del'>-	if (ulp_msix) {</div><div class='del'>-		ulp_base = bnxt_get_ulp_msix_base(bp);</div><div class='del'>-		cp += ulp_msix;</div><div class='del'>-		if ((ulp_base + ulp_msix) &gt; cp)</div><div class='del'>-			cp = ulp_base + ulp_msix;</div><div class='del'>-	}</div><div class='del'>-	return cp;</div><div class='add'>+	return bp-&gt;cp_nr_rings + bnxt_get_ulp_msix_num(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_cp_rings_in_use(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int cp;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 		return bnxt_nq_rings_in_use(bp);</div><div class='ctx'> </div><div class='ctx'> 	cp = bp-&gt;tx_nr_rings + bp-&gt;rx_nr_rings;</div><div class='hunk'>@@ -5511,76 +7864,164 @@ static int bnxt_get_func_stat_ctxs(struct bnxt *bp)</div><div class='ctx'> 	return bp-&gt;cp_nr_rings + bnxt_get_ulp_stat_ctxs(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_get_total_rss_ctxs(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	if (!hwr-&gt;grp)</div><div class='add'>+		return 0;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		int rss_ctx = bnxt_get_nr_rss_ctxs(bp, hwr-&gt;grp);</div><div class='add'>+</div><div class='add'>+		if (BNXT_SUPPORTS_NTUPLE_VNIC(bp))</div><div class='add'>+			rss_ctx *= hwr-&gt;vnic;</div><div class='add'>+		return rss_ctx;</div><div class='add'>+	}</div><div class='add'>+	if (BNXT_VF(bp))</div><div class='add'>+		return BNXT_VF_MAX_RSS_CTX;</div><div class='add'>+	if (!(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_NEW_RSS_CAP) &amp;&amp; bnxt_rfs_supported(bp))</div><div class='add'>+		return hwr-&gt;grp + 1;</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Check if a default RSS map needs to be setup.  This function is only</div><div class='add'>+ * used on older firmware that does not require reserving RX rings.</div><div class='add'>+ */</div><div class='add'>+static void bnxt_check_rss_tbl_no_rmgr(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='add'>+</div><div class='add'>+	/* The RSS map is valid for RX rings set to resv_rx_rings */</div><div class='add'>+	if (hw_resc-&gt;resv_rx_rings != bp-&gt;rx_nr_rings) {</div><div class='add'>+		hw_resc-&gt;resv_rx_rings = bp-&gt;rx_nr_rings;</div><div class='add'>+		if (!netif_is_rxfh_configured(bp-&gt;dev))</div><div class='add'>+			bnxt_set_dflt_rss_indir_tbl(bp, NULL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_total_vnics(struct bnxt *bp, int rx_rings)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_RFS) {</div><div class='add'>+		if (BNXT_SUPPORTS_NTUPLE_VNIC(bp))</div><div class='add'>+			return 2 + bp-&gt;num_rss_ctx;</div><div class='add'>+		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+			return rx_rings + 1;</div><div class='add'>+	}</div><div class='add'>+	return 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool bnxt_need_reserve_rings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='ctx'> 	int cp = bnxt_cp_rings_in_use(bp);</div><div class='ctx'> 	int nq = bnxt_nq_rings_in_use(bp);</div><div class='ctx'> 	int rx = bp-&gt;rx_nr_rings, stat;</div><div class='del'>-	int vnic = 1, grp = rx;</div><div class='add'>+	int vnic, grp = rx;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_spec_code &lt; 0x10601)</div><div class='del'>-		return false;</div><div class='add'>+	/* Old firmware does not need RX ring reservations but we still</div><div class='add'>+	 * need to setup a default RSS map when needed.  With new firmware</div><div class='add'>+	 * we go through RX ring reservations first and then set up the</div><div class='add'>+	 * RSS map for the successfully reserved RX rings when needed.</div><div class='add'>+	 */</div><div class='add'>+	if (!BNXT_NEW_RM(bp))</div><div class='add'>+		bnxt_check_rss_tbl_no_rmgr(bp);</div><div class='ctx'> </div><div class='del'>-	if (hw_resc-&gt;resv_tx_rings != bp-&gt;tx_nr_rings)</div><div class='add'>+	if (hw_resc-&gt;resv_tx_rings != bp-&gt;tx_nr_rings &amp;&amp;</div><div class='add'>+	    bp-&gt;hwrm_spec_code &gt;= 0x10601)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;flags &amp; BNXT_FLAG_RFS) &amp;&amp; !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='del'>-		vnic = rx + 1;</div><div class='add'>+	if (!BNXT_NEW_RM(bp))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	vnic = bnxt_get_total_vnics(bp, rx);</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='ctx'> 		rx &lt;&lt;= 1;</div><div class='ctx'> 	stat = bnxt_get_func_stat_ctxs(bp);</div><div class='del'>-	if (BNXT_NEW_RM(bp) &amp;&amp;</div><div class='del'>-	    (hw_resc-&gt;resv_rx_rings != rx || hw_resc-&gt;resv_cp_rings != cp ||</div><div class='del'>-	     hw_resc-&gt;resv_vnics != vnic || hw_resc-&gt;resv_stat_ctxs != stat ||</div><div class='del'>-	     (hw_resc-&gt;resv_hw_ring_grps != grp &amp;&amp;</div><div class='del'>-	      !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))))</div><div class='add'>+	if (hw_resc-&gt;resv_rx_rings != rx || hw_resc-&gt;resv_cp_rings != cp ||</div><div class='add'>+	    hw_resc-&gt;resv_vnics != vnic || hw_resc-&gt;resv_stat_ctxs != stat ||</div><div class='add'>+	    (hw_resc-&gt;resv_hw_ring_grps != grp &amp;&amp;</div><div class='add'>+	     !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)))</div><div class='ctx'> 		return true;</div><div class='del'>-	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) &amp;&amp; BNXT_PF(bp) &amp;&amp;</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp; BNXT_PF(bp) &amp;&amp;</div><div class='ctx'> 	    hw_resc-&gt;resv_irqs != nq)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __bnxt_reserve_rings(struct bnxt *bp)</div><div class='add'>+static void bnxt_copy_reserved_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='del'>-	int cp = bnxt_nq_rings_in_use(bp);</div><div class='del'>-	int tx = bp-&gt;tx_nr_rings;</div><div class='del'>-	int rx = bp-&gt;rx_nr_rings;</div><div class='del'>-	int grp, rx_rings, rc;</div><div class='del'>-	int vnic = 1, stat;</div><div class='add'>+</div><div class='add'>+	hwr-&gt;tx = hw_resc-&gt;resv_tx_rings;</div><div class='add'>+	if (BNXT_NEW_RM(bp)) {</div><div class='add'>+		hwr-&gt;rx = hw_resc-&gt;resv_rx_rings;</div><div class='add'>+		hwr-&gt;cp = hw_resc-&gt;resv_irqs;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			hwr-&gt;cp_p5 = hw_resc-&gt;resv_cp_rings;</div><div class='add'>+		hwr-&gt;grp = hw_resc-&gt;resv_hw_ring_grps;</div><div class='add'>+		hwr-&gt;vnic = hw_resc-&gt;resv_vnics;</div><div class='add'>+		hwr-&gt;stat = hw_resc-&gt;resv_stat_ctxs;</div><div class='add'>+		hwr-&gt;rss_ctx = hw_resc-&gt;resv_rsscos_ctxs;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_rings_ok(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='add'>+{</div><div class='add'>+	return hwr-&gt;tx &amp;&amp; hwr-&gt;rx &amp;&amp; hwr-&gt;cp &amp;&amp; hwr-&gt;grp &amp;&amp; hwr-&gt;vnic &amp;&amp;</div><div class='add'>+	       hwr-&gt;stat &amp;&amp; (hwr-&gt;cp_p5 || !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_avail_msix(struct bnxt *bp, int num);</div><div class='add'>+</div><div class='add'>+static int __bnxt_reserve_rings(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hw_rings hwr = {0};</div><div class='add'>+	int rx_rings, old_rx_rings, rc;</div><div class='add'>+	int cp = bp-&gt;cp_nr_rings;</div><div class='add'>+	int ulp_msix = 0;</div><div class='ctx'> 	bool sh = false;</div><div class='add'>+	int tx_cp;</div><div class='ctx'> </div><div class='ctx'> 	if (!bnxt_need_reserve_rings(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (BNXT_NEW_RM(bp) &amp;&amp; !bnxt_ulp_registered(bp-&gt;edev)) {</div><div class='add'>+		ulp_msix = bnxt_get_avail_msix(bp, bp-&gt;ulp_num_msix_want);</div><div class='add'>+		if (!ulp_msix)</div><div class='add'>+			bnxt_set_ulp_stat_ctxs(bp, 0);</div><div class='add'>+</div><div class='add'>+		if (ulp_msix &gt; bp-&gt;ulp_num_msix_want)</div><div class='add'>+			ulp_msix = bp-&gt;ulp_num_msix_want;</div><div class='add'>+		hwr.cp = cp + ulp_msix;</div><div class='add'>+	} else {</div><div class='add'>+		hwr.cp = bnxt_nq_rings_in_use(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwr.tx = bp-&gt;tx_nr_rings;</div><div class='add'>+	hwr.rx = bp-&gt;rx_nr_rings;</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS)</div><div class='ctx'> 		sh = true;</div><div class='del'>-	if ((bp-&gt;flags &amp; BNXT_FLAG_RFS) &amp;&amp; !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='del'>-		vnic = rx + 1;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		hwr.cp_p5 = hwr.rx + hwr.tx;</div><div class='add'>+</div><div class='add'>+	hwr.vnic = bnxt_get_total_vnics(bp, hwr.rx);</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='del'>-		rx &lt;&lt;= 1;</div><div class='del'>-	grp = bp-&gt;rx_nr_rings;</div><div class='del'>-	stat = bnxt_get_func_stat_ctxs(bp);</div><div class='add'>+		hwr.rx &lt;&lt;= 1;</div><div class='add'>+	hwr.grp = bp-&gt;rx_nr_rings;</div><div class='add'>+	hwr.rss_ctx = bnxt_get_total_rss_ctxs(bp, &amp;hwr);</div><div class='add'>+	hwr.stat = bnxt_get_func_stat_ctxs(bp);</div><div class='add'>+	old_rx_rings = bp-&gt;hw_resc.resv_rx_rings;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_reserve_rings(bp, tx, rx, grp, cp, stat, vnic);</div><div class='add'>+	rc = bnxt_hwrm_reserve_rings(bp, &amp;hwr);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	tx = hw_resc-&gt;resv_tx_rings;</div><div class='del'>-	if (BNXT_NEW_RM(bp)) {</div><div class='del'>-		rx = hw_resc-&gt;resv_rx_rings;</div><div class='del'>-		cp = hw_resc-&gt;resv_irqs;</div><div class='del'>-		grp = hw_resc-&gt;resv_hw_ring_grps;</div><div class='del'>-		vnic = hw_resc-&gt;resv_vnics;</div><div class='del'>-		stat = hw_resc-&gt;resv_stat_ctxs;</div><div class='del'>-	}</div><div class='add'>+	bnxt_copy_reserved_rings(bp, &amp;hwr);</div><div class='ctx'> </div><div class='del'>-	rx_rings = rx;</div><div class='add'>+	rx_rings = hwr.rx;</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS) {</div><div class='del'>-		if (rx &gt;= 2) {</div><div class='del'>-			rx_rings = rx &gt;&gt; 1;</div><div class='add'>+		if (hwr.rx &gt;= 2) {</div><div class='add'>+			rx_rings = hwr.rx &gt;&gt; 1;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			if (netif_running(bp-&gt;dev))</div><div class='ctx'> 				return -ENOMEM;</div><div class='hunk'>@@ -5592,105 +8033,125 @@ static int __bnxt_reserve_rings(struct bnxt *bp)</div><div class='ctx'> 			bnxt_set_ring_params(bp);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rx_rings = min_t(int, rx_rings, grp);</div><div class='del'>-	cp = min_t(int, cp, bp-&gt;cp_nr_rings);</div><div class='del'>-	if (stat &gt; bnxt_get_ulp_stat_ctxs(bp))</div><div class='del'>-		stat -= bnxt_get_ulp_stat_ctxs(bp);</div><div class='del'>-	cp = min_t(int, cp, stat);</div><div class='del'>-	rc = bnxt_trim_rings(bp, &amp;rx_rings, &amp;tx, cp, sh);</div><div class='add'>+	rx_rings = min_t(int, rx_rings, hwr.grp);</div><div class='add'>+	hwr.cp = min_t(int, hwr.cp, bp-&gt;cp_nr_rings);</div><div class='add'>+	if (bnxt_ulp_registered(bp-&gt;edev) &amp;&amp;</div><div class='add'>+	    hwr.stat &gt; bnxt_get_ulp_stat_ctxs(bp))</div><div class='add'>+		hwr.stat -= bnxt_get_ulp_stat_ctxs(bp);</div><div class='add'>+	hwr.cp = min_t(int, hwr.cp, hwr.stat);</div><div class='add'>+	rc = bnxt_trim_rings(bp, &amp;rx_rings, &amp;hwr.tx, hwr.cp, sh);</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='del'>-		rx = rx_rings &lt;&lt; 1;</div><div class='del'>-	cp = sh ? max_t(int, tx, rx_rings) : tx + rx_rings;</div><div class='del'>-	bp-&gt;tx_nr_rings = tx;</div><div class='add'>+		hwr.rx = rx_rings &lt;&lt; 1;</div><div class='add'>+	tx_cp = bnxt_num_tx_to_cp(bp, hwr.tx);</div><div class='add'>+	hwr.cp = sh ? max_t(int, tx_cp, rx_rings) : tx_cp + rx_rings;</div><div class='add'>+	if (hwr.tx != bp-&gt;tx_nr_rings) {</div><div class='add'>+		netdev_warn(bp-&gt;dev,</div><div class='add'>+			    "Able to reserve only %d out of %d requested TX rings\n",</div><div class='add'>+			    hwr.tx, bp-&gt;tx_nr_rings);</div><div class='add'>+	}</div><div class='add'>+	bp-&gt;tx_nr_rings = hwr.tx;</div><div class='add'>+</div><div class='add'>+	/* If we cannot reserve all the RX rings, reset the RSS map only</div><div class='add'>+	 * if absolutely necessary</div><div class='add'>+	 */</div><div class='add'>+	if (rx_rings != bp-&gt;rx_nr_rings) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Able to reserve only %d out of %d requested RX rings\n",</div><div class='add'>+			    rx_rings, bp-&gt;rx_nr_rings);</div><div class='add'>+		if (netif_is_rxfh_configured(bp-&gt;dev) &amp;&amp;</div><div class='add'>+		    (bnxt_get_nr_rss_ctxs(bp, bp-&gt;rx_nr_rings) !=</div><div class='add'>+		     bnxt_get_nr_rss_ctxs(bp, rx_rings) ||</div><div class='add'>+		     bnxt_get_max_rss_ring(bp) &gt;= rx_rings)) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "RSS table entries reverting to default\n");</div><div class='add'>+			bp-&gt;dev-&gt;priv_flags &amp;= ~IFF_RXFH_CONFIGURED;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	bp-&gt;rx_nr_rings = rx_rings;</div><div class='del'>-	bp-&gt;cp_nr_rings = cp;</div><div class='add'>+	bp-&gt;cp_nr_rings = hwr.cp;</div><div class='ctx'> </div><div class='del'>-	if (!tx || !rx || !cp || !grp || !vnic || !stat)</div><div class='add'>+	if (!bnxt_rings_ok(bp, &amp;hwr))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (old_rx_rings != bp-&gt;hw_resc.resv_rx_rings &amp;&amp;</div><div class='add'>+	    !netif_is_rxfh_configured(bp-&gt;dev))</div><div class='add'>+		bnxt_set_dflt_rss_indir_tbl(bp, NULL);</div><div class='add'>+</div><div class='add'>+	if (!bnxt_ulp_registered(bp-&gt;edev) &amp;&amp; BNXT_NEW_RM(bp)) {</div><div class='add'>+		int resv_msix, resv_ctx, ulp_ctxs;</div><div class='add'>+		struct bnxt_hw_resc *hw_resc;</div><div class='add'>+</div><div class='add'>+		hw_resc = &amp;bp-&gt;hw_resc;</div><div class='add'>+		resv_msix = hw_resc-&gt;resv_irqs - bp-&gt;cp_nr_rings;</div><div class='add'>+		ulp_msix = min_t(int, resv_msix, ulp_msix);</div><div class='add'>+		bnxt_set_ulp_msix_num(bp, ulp_msix);</div><div class='add'>+		resv_ctx = hw_resc-&gt;resv_stat_ctxs  - bp-&gt;cp_nr_rings;</div><div class='add'>+		ulp_ctxs = min(resv_ctx, bnxt_get_ulp_stat_ctxs(bp));</div><div class='add'>+		bnxt_set_ulp_stat_ctxs(bp, ulp_ctxs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_check_vf_rings(struct bnxt *bp, int tx_rings, int rx_rings,</div><div class='del'>-				    int ring_grps, int cp_rings, int stats,</div><div class='del'>-				    int vnics)</div><div class='add'>+static int bnxt_hwrm_check_vf_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_vf_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_vf_cfg_input *req;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!BNXT_NEW_RM(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	__bnxt_hwrm_reserve_vf_rings(bp, &amp;req, tx_rings, rx_rings, ring_grps,</div><div class='del'>-				     cp_rings, stats, vnics);</div><div class='add'>+	req = __bnxt_hwrm_reserve_vf_rings(bp, hwr);</div><div class='ctx'> 	flags = FUNC_VF_CFG_REQ_FLAGS_TX_ASSETS_TEST |</div><div class='ctx'> 		FUNC_VF_CFG_REQ_FLAGS_RX_ASSETS_TEST |</div><div class='ctx'> 		FUNC_VF_CFG_REQ_FLAGS_CMPL_ASSETS_TEST |</div><div class='ctx'> 		FUNC_VF_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST |</div><div class='ctx'> 		FUNC_VF_CFG_REQ_FLAGS_VNIC_ASSETS_TEST |</div><div class='ctx'> 		FUNC_VF_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST;</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 		flags |= FUNC_VF_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST;</div><div class='ctx'> </div><div class='del'>-	req.flags = cpu_to_le32(flags);</div><div class='del'>-	rc = hwrm_send_message_silent(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	return hwrm_req_send_silent(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_check_pf_rings(struct bnxt *bp, int tx_rings, int rx_rings,</div><div class='del'>-				    int ring_grps, int cp_rings, int stats,</div><div class='del'>-				    int vnics)</div><div class='add'>+static int bnxt_hwrm_check_pf_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	u32 flags;</div><div class='del'>-	int rc;</div><div class='ctx'> </div><div class='del'>-	__bnxt_hwrm_reserve_pf_rings(bp, &amp;req, tx_rings, rx_rings, ring_grps,</div><div class='del'>-				     cp_rings, stats, vnics);</div><div class='add'>+	req = __bnxt_hwrm_reserve_pf_rings(bp, hwr);</div><div class='ctx'> 	flags = FUNC_CFG_REQ_FLAGS_TX_ASSETS_TEST;</div><div class='ctx'> 	if (BNXT_NEW_RM(bp)) {</div><div class='ctx'> 		flags |= FUNC_CFG_REQ_FLAGS_RX_ASSETS_TEST |</div><div class='ctx'> 			 FUNC_CFG_REQ_FLAGS_CMPL_ASSETS_TEST |</div><div class='ctx'> 			 FUNC_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST |</div><div class='ctx'> 			 FUNC_CFG_REQ_FLAGS_VNIC_ASSETS_TEST;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 			flags |= FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST |</div><div class='ctx'> 				 FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST;</div><div class='ctx'> 		else</div><div class='ctx'> 			flags |= FUNC_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req.flags = cpu_to_le32(flags);</div><div class='del'>-	rc = hwrm_send_message_silent(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	return 0;</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	return hwrm_req_send_silent(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_check_rings(struct bnxt *bp, int tx_rings, int rx_rings,</div><div class='del'>-				 int ring_grps, int cp_rings, int stats,</div><div class='del'>-				 int vnics)</div><div class='add'>+static int bnxt_hwrm_check_rings(struct bnxt *bp, struct bnxt_hw_rings *hwr)</div><div class='ctx'> {</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10801)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_PF(bp))</div><div class='del'>-		return bnxt_hwrm_check_pf_rings(bp, tx_rings, rx_rings,</div><div class='del'>-						ring_grps, cp_rings, stats,</div><div class='del'>-						vnics);</div><div class='add'>+		return bnxt_hwrm_check_pf_rings(bp, hwr);</div><div class='ctx'> </div><div class='del'>-	return bnxt_hwrm_check_vf_rings(bp, tx_rings, rx_rings, ring_grps,</div><div class='del'>-					cp_rings, stats, vnics);</div><div class='add'>+	return bnxt_hwrm_check_vf_rings(bp, hwr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_hwrm_coal_params_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_ring_aggint_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='ctx'> 	struct bnxt_coal_cap *coal_cap = &amp;bp-&gt;coal_cap;</div><div class='del'>-	struct hwrm_ring_aggint_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_ring_aggint_qcaps_output *resp;</div><div class='add'>+	struct hwrm_ring_aggint_qcaps_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	coal_cap-&gt;cmpl_params = BNXT_LEGACY_COAL_CMPL_PARAMS;</div><div class='hunk'>@@ -5706,9 +8167,11 @@ static void bnxt_hwrm_coal_params_qcaps(struct bnxt *bp)</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10902)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_RING_AGGINT_QCAPS, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message_silent(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_RING_AGGINT_QCAPS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		coal_cap-&gt;cmpl_params = le32_to_cpu(resp-&gt;cmpl_params);</div><div class='ctx'> 		coal_cap-&gt;nq_params = le32_to_cpu(resp-&gt;nq_params);</div><div class='hunk'>@@ -5728,7 +8191,7 @@ static void bnxt_hwrm_coal_params_qcaps(struct bnxt *bp)</div><div class='ctx'> 			le16_to_cpu(resp-&gt;num_cmpl_aggr_int_max);</div><div class='ctx'> 		coal_cap-&gt;timer_units = le16_to_cpu(resp-&gt;timer_units);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 bnxt_usec_to_coal_tmr(struct bnxt *bp, u16 usec)</div><div class='hunk'>@@ -5743,8 +8206,8 @@ static void bnxt_hwrm_set_coal_params(struct bnxt *bp,</div><div class='ctx'> 	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input *req)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_coal_cap *coal_cap = &amp;bp-&gt;coal_cap;</div><div class='add'>+	u16 val, tmr, max, flags = hw_coal-&gt;flags;</div><div class='ctx'> 	u32 cmpl_params = coal_cap-&gt;cmpl_params;</div><div class='del'>-	u16 val, tmr, max, flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	max = hw_coal-&gt;bufs_per_record * 128;</div><div class='ctx'> 	if (hw_coal-&gt;budget)</div><div class='hunk'>@@ -5782,13 +8245,11 @@ static void bnxt_hwrm_set_coal_params(struct bnxt *bp,</div><div class='ctx'> 		tmr = bnxt_usec_to_coal_tmr(bp, hw_coal-&gt;coal_ticks_irq);</div><div class='ctx'> 		val = clamp_t(u16, tmr, 1,</div><div class='ctx'> 			      coal_cap-&gt;cmpl_aggr_dma_tmr_during_int_max);</div><div class='del'>-		req-&gt;cmpl_aggr_dma_tmr_during_int = cpu_to_le16(tmr);</div><div class='add'>+		req-&gt;cmpl_aggr_dma_tmr_during_int = cpu_to_le16(val);</div><div class='ctx'> 		req-&gt;enables |=</div><div class='ctx'> 			cpu_to_le16(BNXT_COAL_CMPL_AGGR_TMR_DURING_INT_ENABLE);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (cmpl_params &amp; RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_TIMER_RESET)</div><div class='del'>-		flags |= RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET;</div><div class='ctx'> 	if ((cmpl_params &amp; RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_RING_IDLE) &amp;&amp;</div><div class='ctx'> 	    hw_coal-&gt;idle_thresh &amp;&amp; hw_coal-&gt;coal_ticks &lt; hw_coal-&gt;idle_thresh)</div><div class='ctx'> 		flags |= RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_RING_IDLE;</div><div class='hunk'>@@ -5796,37 +8257,40 @@ static void bnxt_hwrm_set_coal_params(struct bnxt *bp,</div><div class='ctx'> 	req-&gt;enables |= cpu_to_le16(BNXT_COAL_CMPL_ENABLES);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Caller holds bp-&gt;hwrm_cmd_lock */</div><div class='ctx'> static int __bnxt_hwrm_set_coal_nq(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='ctx'> 				   struct bnxt_coal *hw_coal)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input req = {0};</div><div class='add'>+	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input *req;</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> 	struct bnxt_coal_cap *coal_cap = &amp;bp-&gt;coal_cap;</div><div class='ctx'> 	u32 nq_params = coal_cap-&gt;nq_params;</div><div class='ctx'> 	u16 tmr;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(nq_params &amp; RING_AGGINT_QCAPS_RESP_NQ_PARAMS_INT_LAT_TMR_MIN))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS,</div><div class='del'>-			       -1, -1);</div><div class='del'>-	req.ring_id = cpu_to_le16(cpr-&gt;cp_ring_struct.fw_ring_id);</div><div class='del'>-	req.flags =</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;ring_id = cpu_to_le16(cpr-&gt;cp_ring_struct.fw_ring_id);</div><div class='add'>+	req-&gt;flags =</div><div class='ctx'> 		cpu_to_le16(RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_IS_NQ);</div><div class='ctx'> </div><div class='ctx'> 	tmr = bnxt_usec_to_coal_tmr(bp, hw_coal-&gt;coal_ticks) / 2;</div><div class='ctx'> 	tmr = clamp_t(u16, tmr, 1, coal_cap-&gt;int_lat_tmr_min_max);</div><div class='del'>-	req.int_lat_tmr_min = cpu_to_le16(tmr);</div><div class='del'>-	req.enables |= cpu_to_le16(BNXT_COAL_CMPL_MIN_TMR_ENABLE);</div><div class='del'>-	return _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;int_lat_tmr_min = cpu_to_le16(tmr);</div><div class='add'>+	req-&gt;enables |= cpu_to_le16(BNXT_COAL_CMPL_MIN_TMR_ENABLE);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input req_rx = {0};</div><div class='add'>+	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input *req_rx;</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> 	struct bnxt_coal coal;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Tick values in micro seconds.</div><div class='ctx'> 	 * 1 coal_buf x bufs_per_record = 1 completion record.</div><div class='hunk'>@@ -5839,60 +8303,84 @@ int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi)</div><div class='ctx'> 	if (!bnapi-&gt;rx_ring)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req_rx,</div><div class='del'>-			       HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req_rx, HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_set_coal_params(bp, &amp;coal, &amp;req_rx);</div><div class='add'>+	bnxt_hwrm_set_coal_params(bp, &amp;coal, req_rx);</div><div class='ctx'> </div><div class='del'>-	req_rx.ring_id = cpu_to_le16(bnxt_cp_ring_for_rx(bp, bnapi-&gt;rx_ring));</div><div class='add'>+	req_rx-&gt;ring_id = cpu_to_le16(bnxt_cp_ring_for_rx(bp, bnapi-&gt;rx_ring));</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req_rx, sizeof(req_rx),</div><div class='del'>-				 HWRM_CMD_TIMEOUT);</div><div class='add'>+	return hwrm_req_send(bp, req_rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_hwrm_set_rx_coal(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='add'>+		      struct hwrm_ring_cmpl_ring_cfg_aggint_params_input *req)</div><div class='add'>+{</div><div class='add'>+	u16 ring_id = bnxt_cp_ring_for_rx(bp, bnapi-&gt;rx_ring);</div><div class='add'>+</div><div class='add'>+	req-&gt;ring_id = cpu_to_le16(ring_id);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_hwrm_set_tx_coal(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='add'>+		      struct hwrm_ring_cmpl_ring_cfg_aggint_params_input *req)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	bnxt_for_each_napi_tx(i, bnapi, txr) {</div><div class='add'>+		u16 ring_id;</div><div class='add'>+</div><div class='add'>+		ring_id = bnxt_cp_ring_for_tx(bp, txr);</div><div class='add'>+		req-&gt;ring_id = cpu_to_le16(ring_id);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_set_coal(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int i, rc = 0;</div><div class='del'>-	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input req_rx = {0},</div><div class='del'>-							   req_tx = {0}, *req;</div><div class='add'>+	struct hwrm_ring_cmpl_ring_cfg_aggint_params_input *req_rx, *req_tx;</div><div class='add'>+	int i, rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req_rx,</div><div class='del'>-			       HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS, -1, -1);</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req_tx,</div><div class='del'>-			       HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req_rx, HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_set_coal_params(bp, &amp;bp-&gt;rx_coal, &amp;req_rx);</div><div class='del'>-	bnxt_hwrm_set_coal_params(bp, &amp;bp-&gt;tx_coal, &amp;req_tx);</div><div class='add'>+	rc = hwrm_req_init(bp, req_tx, HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS);</div><div class='add'>+	if (rc) {</div><div class='add'>+		hwrm_req_drop(bp, req_rx);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	bnxt_hwrm_set_coal_params(bp, &amp;bp-&gt;rx_coal, req_rx);</div><div class='add'>+	bnxt_hwrm_set_coal_params(bp, &amp;bp-&gt;tx_coal, req_tx);</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req_rx);</div><div class='add'>+	hwrm_req_hold(bp, req_tx);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_coal *hw_coal;</div><div class='del'>-		u16 ring_id;</div><div class='del'>-</div><div class='del'>-		req = &amp;req_rx;</div><div class='del'>-		if (!bnapi-&gt;rx_ring) {</div><div class='del'>-			ring_id = bnxt_cp_ring_for_tx(bp, bnapi-&gt;tx_ring);</div><div class='del'>-			req = &amp;req_tx;</div><div class='del'>-		} else {</div><div class='del'>-			ring_id = bnxt_cp_ring_for_rx(bp, bnapi-&gt;rx_ring);</div><div class='del'>-		}</div><div class='del'>-		req-&gt;ring_id = cpu_to_le16(ring_id);</div><div class='ctx'> </div><div class='del'>-		rc = _hwrm_send_message(bp, req, sizeof(*req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='add'>+		if (!bnapi-&gt;rx_ring)</div><div class='add'>+			rc = bnxt_hwrm_set_tx_coal(bp, bnapi, req_tx);</div><div class='add'>+		else</div><div class='add'>+			rc = bnxt_hwrm_set_rx_coal(bp, bnapi, req_rx);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		if (bnapi-&gt;rx_ring &amp;&amp; bnapi-&gt;tx_ring) {</div><div class='del'>-			req = &amp;req_tx;</div><div class='del'>-			ring_id = bnxt_cp_ring_for_tx(bp, bnapi-&gt;tx_ring);</div><div class='del'>-			req-&gt;ring_id = cpu_to_le16(ring_id);</div><div class='del'>-			rc = _hwrm_send_message(bp, req, sizeof(*req),</div><div class='del'>-						HWRM_CMD_TIMEOUT);</div><div class='add'>+		if (bnapi-&gt;rx_ring &amp;&amp; bnapi-&gt;tx_ring[0]) {</div><div class='add'>+			rc = bnxt_hwrm_set_tx_coal(bp, bnapi, req_tx);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				break;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -5902,65 +8390,77 @@ int bnxt_hwrm_set_coal(struct bnxt *bp)</div><div class='ctx'> 			hw_coal = &amp;bp-&gt;tx_coal;</div><div class='ctx'> 		__bnxt_hwrm_set_coal_nq(bp, bnapi, hw_coal);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req_rx);</div><div class='add'>+	hwrm_req_drop(bp, req_tx);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_stat_ctx_free(struct bnxt *bp)</div><div class='add'>+static void bnxt_hwrm_stat_ctx_free(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0, i;</div><div class='del'>-	struct hwrm_stat_ctx_free_input req = {0};</div><div class='add'>+	struct hwrm_stat_ctx_clr_stats_input *req0 = NULL;</div><div class='add'>+	struct hwrm_stat_ctx_free_input *req;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;bnapi)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_STAT_CTX_FREE, -1, -1);</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_STAT_CTX_FREE))</div><div class='add'>+		return;</div><div class='add'>+	if (BNXT_FW_MAJ(bp) &lt;= 20) {</div><div class='add'>+		if (hwrm_req_init(bp, req0, HWRM_STAT_CTX_CLR_STATS)) {</div><div class='add'>+			hwrm_req_drop(bp, req);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		hwrm_req_hold(bp, req0);</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> </div><div class='ctx'> 		if (cpr-&gt;hw_stats_ctx_id != INVALID_STATS_CTX_ID) {</div><div class='del'>-			req.stat_ctx_id = cpu_to_le32(cpr-&gt;hw_stats_ctx_id);</div><div class='del'>-</div><div class='del'>-			rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-						HWRM_CMD_TIMEOUT);</div><div class='del'>-			if (rc)</div><div class='del'>-				break;</div><div class='add'>+			req-&gt;stat_ctx_id = cpu_to_le32(cpr-&gt;hw_stats_ctx_id);</div><div class='add'>+			if (req0) {</div><div class='add'>+				req0-&gt;stat_ctx_id = req-&gt;stat_ctx_id;</div><div class='add'>+				hwrm_req_send(bp, req0);</div><div class='add'>+			}</div><div class='add'>+			hwrm_req_send(bp, req);</div><div class='ctx'> </div><div class='ctx'> 			cpr-&gt;hw_stats_ctx_id = INVALID_STATS_CTX_ID;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (req0)</div><div class='add'>+		hwrm_req_drop(bp, req0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0, i;</div><div class='del'>-	struct hwrm_stat_ctx_alloc_input req = {0};</div><div class='del'>-	struct hwrm_stat_ctx_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_stat_ctx_alloc_output *resp;</div><div class='add'>+	struct hwrm_stat_ctx_alloc_input *req;</div><div class='add'>+	int rc, i;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_STAT_CTX_ALLOC, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_STAT_CTX_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	req.update_period_ms = cpu_to_le32(bp-&gt;stats_coal_ticks / 1000);</div><div class='add'>+	req-&gt;stats_dma_length = cpu_to_le16(bp-&gt;hw_ring_stats_size);</div><div class='add'>+	req-&gt;update_period_ms = cpu_to_le32(bp-&gt;stats_coal_ticks / 1000);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='ctx'> </div><div class='del'>-		req.stats_dma_addr = cpu_to_le64(cpr-&gt;hw_stats_map);</div><div class='add'>+		req-&gt;stats_dma_addr = cpu_to_le64(cpr-&gt;stats.hw_stats_map);</div><div class='ctx'> </div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='hunk'>@@ -5968,32 +8468,41 @@ static int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 		bp-&gt;grp_info[i].fw_stats_ctx = cpr-&gt;hw_stats_ctx_id;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_qcfg(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_qcfg_input req = {0};</div><div class='del'>-	struct hwrm_func_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='ctx'> 	u16 flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto func_qcfg_exit;</div><div class='ctx'> </div><div class='add'>+	flags = le16_to_cpu(resp-&gt;flags);</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	if (BNXT_VF(bp)) {</div><div class='ctx'> 		struct bnxt_vf_info *vf = &amp;bp-&gt;vf;</div><div class='ctx'> </div><div class='ctx'> 		vf-&gt;vlan = le16_to_cpu(resp-&gt;vlan) &amp; VLAN_VID_MASK;</div><div class='add'>+		if (flags &amp; FUNC_QCFG_RESP_FLAGS_TRUSTED_VF)</div><div class='add'>+			vf-&gt;flags |= BNXT_VF_TRUST;</div><div class='add'>+		else</div><div class='add'>+			vf-&gt;flags &amp;= ~BNXT_VF_TRUST;</div><div class='add'>+	} else {</div><div class='add'>+		bp-&gt;pf.registered_vfs = le16_to_cpu(resp-&gt;registered_vfs);</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='del'>-	flags = le16_to_cpu(resp-&gt;flags);</div><div class='ctx'> 	if (flags &amp; (FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED |</div><div class='ctx'> 		     FUNC_QCFG_RESP_FLAGS_FW_LLDP_AGENT_ENABLED)) {</div><div class='ctx'> 		bp-&gt;fw_cap |= BNXT_FW_CAP_LLDP_AGENT;</div><div class='hunk'>@@ -6003,8 +8512,20 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp)</div><div class='ctx'> 	if (BNXT_PF(bp) &amp;&amp; (flags &amp; FUNC_QCFG_RESP_FLAGS_MULTI_HOST))</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_MULTI_HOST;</div><div class='ctx'> </div><div class='add'>+	if (flags &amp; FUNC_QCFG_RESP_FLAGS_RING_MONITOR_ENABLED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_RING_MONITOR;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; FUNC_QCFG_RESP_FLAGS_ENABLE_RDMA_SRIOV)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_ENABLE_RDMA_SRIOV;</div><div class='add'>+	if (resp-&gt;roce_bidi_opt_mode &amp;</div><div class='add'>+	    FUNC_QCFG_RESP_ROCE_BIDI_OPT_MODE_DEDICATED)</div><div class='add'>+		bp-&gt;cos0_cos1_shared = 1;</div><div class='add'>+	else</div><div class='add'>+		bp-&gt;cos0_cos1_shared = 0;</div><div class='add'>+</div><div class='ctx'> 	switch (resp-&gt;port_partition_type) {</div><div class='ctx'> 	case FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_0:</div><div class='add'>+	case FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_2:</div><div class='ctx'> 	case FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_5:</div><div class='ctx'> 	case FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR2_0:</div><div class='ctx'> 		bp-&gt;port_partition_type = resp-&gt;port_partition_type;</div><div class='hunk'>@@ -6022,94 +8543,265 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp)</div><div class='ctx'> 	if (!bp-&gt;max_mtu)</div><div class='ctx'> 		bp-&gt;max_mtu = BNXT_MAX_MTU;</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;db_size)</div><div class='add'>+		goto func_qcfg_exit;</div><div class='add'>+</div><div class='add'>+	bp-&gt;db_offset = le16_to_cpu(resp-&gt;legacy_l2_db_size_kb) * 1024;</div><div class='add'>+	if (BNXT_CHIP_P5(bp)) {</div><div class='add'>+		if (BNXT_PF(bp))</div><div class='add'>+			bp-&gt;db_offset = DB_PF_OFFSET_P5;</div><div class='add'>+		else</div><div class='add'>+			bp-&gt;db_offset = DB_VF_OFFSET_P5;</div><div class='add'>+	}</div><div class='add'>+	bp-&gt;db_size = PAGE_ALIGN(le16_to_cpu(resp-&gt;l2_doorbell_bar_size_kb) *</div><div class='add'>+				 1024);</div><div class='add'>+	if (!bp-&gt;db_size || bp-&gt;db_size &gt; pci_resource_len(bp-&gt;pdev, 2) ||</div><div class='add'>+	    bp-&gt;db_size &lt;= bp-&gt;db_offset)</div><div class='add'>+		bp-&gt;db_size = pci_resource_len(bp-&gt;pdev, 2);</div><div class='add'>+</div><div class='ctx'> func_qcfg_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_init_ctx_initializer(struct bnxt_ctx_mem_type *ctxm,</div><div class='add'>+				      u8 init_val, u8 init_offset,</div><div class='add'>+				      bool init_mask_set)</div><div class='add'>+{</div><div class='add'>+	ctxm-&gt;init_value = init_val;</div><div class='add'>+	ctxm-&gt;init_offset = BNXT_CTX_INIT_INVALID_OFFSET;</div><div class='add'>+	if (init_mask_set)</div><div class='add'>+		ctxm-&gt;init_offset = init_offset * 4;</div><div class='add'>+	else</div><div class='add'>+		ctxm-&gt;init_value = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_all_ctx_pg_info(struct bnxt *bp, int ctx_max)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ctx_mem_info *ctx = bp-&gt;ctx;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='add'>+	for (type = 0; type &lt; ctx_max; type++) {</div><div class='add'>+		struct bnxt_ctx_mem_type *ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		int n = 1;</div><div class='add'>+</div><div class='add'>+		if (!ctxm-&gt;max_entries || ctxm-&gt;pg_info)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (ctxm-&gt;instance_bmap)</div><div class='add'>+			n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+		ctxm-&gt;pg_info = kcalloc(n, sizeof(*ctxm-&gt;pg_info), GFP_KERNEL);</div><div class='add'>+		if (!ctxm-&gt;pg_info)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_one_ctx_mem(struct bnxt *bp,</div><div class='add'>+				  struct bnxt_ctx_mem_type *ctxm, bool force);</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_INIT_VALID(flags)	\</div><div class='add'>+	(!!((flags) &amp;			\</div><div class='add'>+	    FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_ENABLE_CTX_KIND_INIT))</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_backing_store_qcaps_v2_output *resp;</div><div class='add'>+	struct hwrm_func_backing_store_qcaps_v2_input *req;</div><div class='add'>+	struct bnxt_ctx_mem_info *ctx = bp-&gt;ctx;</div><div class='add'>+	u16 type;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_BACKING_STORE_QCAPS_V2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (!ctx) {</div><div class='add'>+		ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+		if (!ctx)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		bp-&gt;ctx = ctx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+</div><div class='add'>+	for (type = 0; type &lt; BNXT_CTX_V2_MAX; ) {</div><div class='add'>+		struct bnxt_ctx_mem_type *ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		u8 init_val, init_off, i;</div><div class='add'>+		u32 max_entries;</div><div class='add'>+		u16 entry_size;</div><div class='add'>+		__le32 *p;</div><div class='add'>+		u32 flags;</div><div class='add'>+</div><div class='add'>+		req-&gt;type = cpu_to_le16(type);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto ctx_done;</div><div class='add'>+		flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+		type = le16_to_cpu(resp-&gt;next_valid_type);</div><div class='add'>+		if (!(flags &amp; BNXT_CTX_MEM_TYPE_VALID)) {</div><div class='add'>+			bnxt_free_one_ctx_mem(bp, ctxm, true);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		entry_size = le16_to_cpu(resp-&gt;entry_size);</div><div class='add'>+		max_entries = le32_to_cpu(resp-&gt;max_num_entries);</div><div class='add'>+		if (ctxm-&gt;mem_valid) {</div><div class='add'>+			if (!(flags &amp; BNXT_CTX_MEM_PERSIST) ||</div><div class='add'>+			    ctxm-&gt;entry_size != entry_size ||</div><div class='add'>+			    ctxm-&gt;max_entries != max_entries)</div><div class='add'>+				bnxt_free_one_ctx_mem(bp, ctxm, true);</div><div class='add'>+			else</div><div class='add'>+				continue;</div><div class='add'>+		}</div><div class='add'>+		ctxm-&gt;type = le16_to_cpu(resp-&gt;type);</div><div class='add'>+		ctxm-&gt;entry_size = entry_size;</div><div class='add'>+		ctxm-&gt;flags = flags;</div><div class='add'>+		ctxm-&gt;instance_bmap = le32_to_cpu(resp-&gt;instance_bit_map);</div><div class='add'>+		ctxm-&gt;entry_multiple = resp-&gt;entry_multiple;</div><div class='add'>+		ctxm-&gt;max_entries = max_entries;</div><div class='add'>+		ctxm-&gt;min_entries = le32_to_cpu(resp-&gt;min_num_entries);</div><div class='add'>+		init_val = resp-&gt;ctx_init_value;</div><div class='add'>+		init_off = resp-&gt;ctx_init_offset;</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val, init_off,</div><div class='add'>+					  BNXT_CTX_INIT_VALID(flags));</div><div class='add'>+		ctxm-&gt;split_entry_cnt = min_t(u8, resp-&gt;subtype_valid_cnt,</div><div class='add'>+					      BNXT_MAX_SPLIT_ENTRY);</div><div class='add'>+		for (i = 0, p = &amp;resp-&gt;split_entry_0; i &lt; ctxm-&gt;split_entry_cnt;</div><div class='add'>+		     i++, p++)</div><div class='add'>+			ctxm-&gt;split[i] = le32_to_cpu(*p);</div><div class='add'>+	}</div><div class='add'>+	rc = bnxt_alloc_all_ctx_pg_info(bp, BNXT_CTX_V2_MAX);</div><div class='add'>+</div><div class='add'>+ctx_done:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_backing_store_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_backing_store_qcaps_input req = {0};</div><div class='del'>-	struct hwrm_func_backing_store_qcaps_output *resp =</div><div class='del'>-		bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_func_backing_store_qcaps_output *resp;</div><div class='add'>+	struct hwrm_func_backing_store_qcaps_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_spec_code &lt; 0x10902 || BNXT_VF(bp) || bp-&gt;ctx)</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10902 || BNXT_VF(bp) ||</div><div class='add'>+	    (bp-&gt;ctx &amp;&amp; bp-&gt;ctx-&gt;flags &amp; BNXT_CTX_FLAG_INITED))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_BACKING_STORE_QCAPS, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message_silent(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_BACKING_STORE_V2)</div><div class='add'>+		return bnxt_hwrm_func_backing_store_qcaps_v2(bp);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_BACKING_STORE_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		struct bnxt_ctx_pg_info *ctx_pg;</div><div class='add'>+		struct bnxt_ctx_mem_type *ctxm;</div><div class='ctx'> 		struct bnxt_ctx_mem_info *ctx;</div><div class='del'>-		int i;</div><div class='add'>+		u8 init_val, init_idx = 0;</div><div class='add'>+		u16 init_mask;</div><div class='ctx'> </div><div class='del'>-		ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+		ctx = bp-&gt;ctx;</div><div class='ctx'> 		if (!ctx) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto ctx_err;</div><div class='del'>-		}</div><div class='del'>-		ctx_pg = kzalloc(sizeof(*ctx_pg) * (bp-&gt;max_q + 1), GFP_KERNEL);</div><div class='del'>-		if (!ctx_pg) {</div><div class='del'>-			kfree(ctx);</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-			goto ctx_err;</div><div class='add'>+			ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+			if (!ctx) {</div><div class='add'>+				rc = -ENOMEM;</div><div class='add'>+				goto ctx_err;</div><div class='add'>+			}</div><div class='add'>+			bp-&gt;ctx = ctx;</div><div class='ctx'> 		}</div><div class='del'>-		for (i = 0; i &lt; bp-&gt;max_q + 1; i++, ctx_pg++)</div><div class='del'>-			ctx-&gt;tqm_mem[i] = ctx_pg;</div><div class='del'>-</div><div class='del'>-		bp-&gt;ctx = ctx;</div><div class='del'>-		ctx-&gt;qp_max_entries = le32_to_cpu(resp-&gt;qp_max_entries);</div><div class='del'>-		ctx-&gt;qp_min_qp1_entries = le16_to_cpu(resp-&gt;qp_min_qp1_entries);</div><div class='del'>-		ctx-&gt;qp_max_l2_entries = le16_to_cpu(resp-&gt;qp_max_l2_entries);</div><div class='del'>-		ctx-&gt;qp_entry_size = le16_to_cpu(resp-&gt;qp_entry_size);</div><div class='del'>-		ctx-&gt;srq_max_l2_entries = le16_to_cpu(resp-&gt;srq_max_l2_entries);</div><div class='del'>-		ctx-&gt;srq_max_entries = le32_to_cpu(resp-&gt;srq_max_entries);</div><div class='del'>-		ctx-&gt;srq_entry_size = le16_to_cpu(resp-&gt;srq_entry_size);</div><div class='del'>-		ctx-&gt;cq_max_l2_entries = le16_to_cpu(resp-&gt;cq_max_l2_entries);</div><div class='del'>-		ctx-&gt;cq_max_entries = le32_to_cpu(resp-&gt;cq_max_entries);</div><div class='del'>-		ctx-&gt;cq_entry_size = le16_to_cpu(resp-&gt;cq_entry_size);</div><div class='del'>-		ctx-&gt;vnic_max_vnic_entries =</div><div class='del'>-			le16_to_cpu(resp-&gt;vnic_max_vnic_entries);</div><div class='del'>-		ctx-&gt;vnic_max_ring_table_entries =</div><div class='add'>+		init_val = resp-&gt;ctx_kind_initializer;</div><div class='add'>+		init_mask = le16_to_cpu(resp-&gt;ctx_init_mask);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_QP];</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;qp_max_entries);</div><div class='add'>+		ctxm-&gt;qp_qp1_entries = le16_to_cpu(resp-&gt;qp_min_qp1_entries);</div><div class='add'>+		ctxm-&gt;qp_l2_entries = le16_to_cpu(resp-&gt;qp_max_l2_entries);</div><div class='add'>+		ctxm-&gt;qp_fast_qpmd_entries = le16_to_cpu(resp-&gt;fast_qpmd_qp_num_entries);</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;qp_entry_size);</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val, resp-&gt;qp_init_offset,</div><div class='add'>+					  (init_mask &amp; (1 &lt;&lt; init_idx++)) != 0);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_SRQ];</div><div class='add'>+		ctxm-&gt;srq_l2_entries = le16_to_cpu(resp-&gt;srq_max_l2_entries);</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;srq_max_entries);</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;srq_entry_size);</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val, resp-&gt;srq_init_offset,</div><div class='add'>+					  (init_mask &amp; (1 &lt;&lt; init_idx++)) != 0);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_CQ];</div><div class='add'>+		ctxm-&gt;cq_l2_entries = le16_to_cpu(resp-&gt;cq_max_l2_entries);</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;cq_max_entries);</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;cq_entry_size);</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val, resp-&gt;cq_init_offset,</div><div class='add'>+					  (init_mask &amp; (1 &lt;&lt; init_idx++)) != 0);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_VNIC];</div><div class='add'>+		ctxm-&gt;vnic_entries = le16_to_cpu(resp-&gt;vnic_max_vnic_entries);</div><div class='add'>+		ctxm-&gt;max_entries = ctxm-&gt;vnic_entries +</div><div class='ctx'> 			le16_to_cpu(resp-&gt;vnic_max_ring_table_entries);</div><div class='del'>-		ctx-&gt;vnic_entry_size = le16_to_cpu(resp-&gt;vnic_entry_size);</div><div class='del'>-		ctx-&gt;stat_max_entries = le32_to_cpu(resp-&gt;stat_max_entries);</div><div class='del'>-		ctx-&gt;stat_entry_size = le16_to_cpu(resp-&gt;stat_entry_size);</div><div class='del'>-		ctx-&gt;tqm_entry_size = le16_to_cpu(resp-&gt;tqm_entry_size);</div><div class='del'>-		ctx-&gt;tqm_min_entries_per_ring =</div><div class='del'>-			le32_to_cpu(resp-&gt;tqm_min_entries_per_ring);</div><div class='del'>-		ctx-&gt;tqm_max_entries_per_ring =</div><div class='del'>-			le32_to_cpu(resp-&gt;tqm_max_entries_per_ring);</div><div class='del'>-		ctx-&gt;tqm_entries_multiple = resp-&gt;tqm_entries_multiple;</div><div class='del'>-		if (!ctx-&gt;tqm_entries_multiple)</div><div class='del'>-			ctx-&gt;tqm_entries_multiple = 1;</div><div class='del'>-		ctx-&gt;mrav_max_entries = le32_to_cpu(resp-&gt;mrav_max_entries);</div><div class='del'>-		ctx-&gt;mrav_entry_size = le16_to_cpu(resp-&gt;mrav_entry_size);</div><div class='del'>-		ctx-&gt;mrav_num_entries_units =</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;vnic_entry_size);</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val,</div><div class='add'>+					  resp-&gt;vnic_init_offset,</div><div class='add'>+					  (init_mask &amp; (1 &lt;&lt; init_idx++)) != 0);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_STAT];</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;stat_max_entries);</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;stat_entry_size);</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val,</div><div class='add'>+					  resp-&gt;stat_init_offset,</div><div class='add'>+					  (init_mask &amp; (1 &lt;&lt; init_idx++)) != 0);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_STQM];</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;tqm_entry_size);</div><div class='add'>+		ctxm-&gt;min_entries = le32_to_cpu(resp-&gt;tqm_min_entries_per_ring);</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;tqm_max_entries_per_ring);</div><div class='add'>+		ctxm-&gt;entry_multiple = resp-&gt;tqm_entries_multiple;</div><div class='add'>+		if (!ctxm-&gt;entry_multiple)</div><div class='add'>+			ctxm-&gt;entry_multiple = 1;</div><div class='add'>+</div><div class='add'>+		memcpy(&amp;ctx-&gt;ctx_arr[BNXT_CTX_FTQM], ctxm, sizeof(*ctxm));</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_MRAV];</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;mrav_max_entries);</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;mrav_entry_size);</div><div class='add'>+		ctxm-&gt;mrav_num_entries_units =</div><div class='ctx'> 			le16_to_cpu(resp-&gt;mrav_num_entries_units);</div><div class='del'>-		ctx-&gt;tim_entry_size = le16_to_cpu(resp-&gt;tim_entry_size);</div><div class='del'>-		ctx-&gt;tim_max_entries = le32_to_cpu(resp-&gt;tim_max_entries);</div><div class='add'>+		bnxt_init_ctx_initializer(ctxm, init_val,</div><div class='add'>+					  resp-&gt;mrav_init_offset,</div><div class='add'>+					  (init_mask &amp; (1 &lt;&lt; init_idx++)) != 0);</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_TIM];</div><div class='add'>+		ctxm-&gt;entry_size = le16_to_cpu(resp-&gt;tim_entry_size);</div><div class='add'>+		ctxm-&gt;max_entries = le32_to_cpu(resp-&gt;tim_max_entries);</div><div class='add'>+</div><div class='add'>+		ctx-&gt;tqm_fp_rings_count = resp-&gt;tqm_fp_rings_count;</div><div class='add'>+		if (!ctx-&gt;tqm_fp_rings_count)</div><div class='add'>+			ctx-&gt;tqm_fp_rings_count = bp-&gt;max_q;</div><div class='add'>+		else if (ctx-&gt;tqm_fp_rings_count &gt; BNXT_MAX_TQM_FP_RINGS)</div><div class='add'>+			ctx-&gt;tqm_fp_rings_count = BNXT_MAX_TQM_FP_RINGS;</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_FTQM];</div><div class='add'>+		memcpy(ctxm, &amp;ctx-&gt;ctx_arr[BNXT_CTX_STQM], sizeof(*ctxm));</div><div class='add'>+		ctxm-&gt;instance_bmap = (1 &lt;&lt; ctx-&gt;tqm_fp_rings_count) - 1;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_alloc_all_ctx_pg_info(bp, BNXT_CTX_MAX);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = 0;</div><div class='ctx'> 	}</div><div class='ctx'> ctx_err:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info *rmem, u8 *pg_attr,</div><div class='ctx'> 				  __le64 *pg_dir)</div><div class='ctx'> {</div><div class='del'>-	u8 pg_size = 0;</div><div class='del'>-</div><div class='del'>-	if (BNXT_PAGE_SHIFT == 13)</div><div class='del'>-		pg_size = 1 &lt;&lt; 4;</div><div class='del'>-	else if (BNXT_PAGE_SIZE == 16)</div><div class='del'>-		pg_size = 2 &lt;&lt; 4;</div><div class='add'>+	if (!rmem-&gt;nr_pages)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	*pg_attr = pg_size;</div><div class='add'>+	BNXT_SET_CTX_PAGE_ATTR(*pg_attr);</div><div class='ctx'> 	if (rmem-&gt;depth &gt;= 1) {</div><div class='ctx'> 		if (rmem-&gt;depth == 2)</div><div class='ctx'> 			*pg_attr |= 2;</div><div class='hunk'>@@ -6130,105 +8822,132 @@ static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info *rmem, u8 *pg_attr,</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_backing_store_cfg(struct bnxt *bp, u32 enables)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_backing_store_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_backing_store_cfg_input *req;</div><div class='ctx'> 	struct bnxt_ctx_mem_info *ctx = bp-&gt;ctx;</div><div class='ctx'> 	struct bnxt_ctx_pg_info *ctx_pg;</div><div class='add'>+	struct bnxt_ctx_mem_type *ctxm;</div><div class='add'>+	void **__req = (void **)&amp;req;</div><div class='add'>+	u32 req_len = sizeof(*req);</div><div class='ctx'> 	__le32 *num_entries;</div><div class='ctx'> 	__le64 *pg_dir;</div><div class='ctx'> 	u32 flags = 0;</div><div class='ctx'> 	u8 *pg_attr;</div><div class='del'>-	int i, rc;</div><div class='ctx'> 	u32 ena;</div><div class='add'>+	int rc;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!ctx)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_BACKING_STORE_CFG, -1, -1);</div><div class='del'>-	req.enables = cpu_to_le32(enables);</div><div class='add'>+	if (req_len &gt; bp-&gt;hwrm_max_ext_req_len)</div><div class='add'>+		req_len = BNXT_BACKING_STORE_CFG_LEGACY_LEN;</div><div class='add'>+	rc = __hwrm_req_init(bp, __req, HWRM_FUNC_BACKING_STORE_CFG, req_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='add'>+	req-&gt;enables = cpu_to_le32(enables);</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;qp_mem;</div><div class='del'>-		req.qp_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='del'>-		req.qp_num_qp1_entries = cpu_to_le16(ctx-&gt;qp_min_qp1_entries);</div><div class='del'>-		req.qp_num_l2_entries = cpu_to_le16(ctx-&gt;qp_max_l2_entries);</div><div class='del'>-		req.qp_entry_size = cpu_to_le16(ctx-&gt;qp_entry_size);</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_QP];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;qp_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		req-&gt;qp_num_qp1_entries = cpu_to_le16(ctxm-&gt;qp_qp1_entries);</div><div class='add'>+		req-&gt;qp_num_l2_entries = cpu_to_le16(ctxm-&gt;qp_l2_entries);</div><div class='add'>+		req-&gt;qp_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='del'>-				      &amp;req.qpc_pg_size_qpc_lvl,</div><div class='del'>-				      &amp;req.qpc_page_dir);</div><div class='add'>+				      &amp;req-&gt;qpc_pg_size_qpc_lvl,</div><div class='add'>+				      &amp;req-&gt;qpc_page_dir);</div><div class='add'>+</div><div class='add'>+		if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP_FAST_QPMD)</div><div class='add'>+			req-&gt;qp_num_fast_qpmd_entries = cpu_to_le16(ctxm-&gt;qp_fast_qpmd_entries);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_SRQ) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;srq_mem;</div><div class='del'>-		req.srq_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='del'>-		req.srq_num_l2_entries = cpu_to_le16(ctx-&gt;srq_max_l2_entries);</div><div class='del'>-		req.srq_entry_size = cpu_to_le16(ctx-&gt;srq_entry_size);</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_SRQ];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;srq_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		req-&gt;srq_num_l2_entries = cpu_to_le16(ctxm-&gt;srq_l2_entries);</div><div class='add'>+		req-&gt;srq_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='del'>-				      &amp;req.srq_pg_size_srq_lvl,</div><div class='del'>-				      &amp;req.srq_page_dir);</div><div class='add'>+				      &amp;req-&gt;srq_pg_size_srq_lvl,</div><div class='add'>+				      &amp;req-&gt;srq_page_dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_CQ) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;cq_mem;</div><div class='del'>-		req.cq_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='del'>-		req.cq_num_l2_entries = cpu_to_le16(ctx-&gt;cq_max_l2_entries);</div><div class='del'>-		req.cq_entry_size = cpu_to_le16(ctx-&gt;cq_entry_size);</div><div class='del'>-		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem, &amp;req.cq_pg_size_cq_lvl,</div><div class='del'>-				      &amp;req.cq_page_dir);</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_CQ];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;cq_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		req-&gt;cq_num_l2_entries = cpu_to_le16(ctxm-&gt;cq_l2_entries);</div><div class='add'>+		req-&gt;cq_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='add'>+		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='add'>+				      &amp;req-&gt;cq_pg_size_cq_lvl,</div><div class='add'>+				      &amp;req-&gt;cq_page_dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_VNIC) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;vnic_mem;</div><div class='del'>-		req.vnic_num_vnic_entries =</div><div class='del'>-			cpu_to_le16(ctx-&gt;vnic_max_vnic_entries);</div><div class='del'>-		req.vnic_num_ring_table_entries =</div><div class='del'>-			cpu_to_le16(ctx-&gt;vnic_max_ring_table_entries);</div><div class='del'>-		req.vnic_entry_size = cpu_to_le16(ctx-&gt;vnic_entry_size);</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_VNIC];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;vnic_num_vnic_entries = cpu_to_le16(ctxm-&gt;vnic_entries);</div><div class='add'>+		req-&gt;vnic_num_ring_table_entries =</div><div class='add'>+			cpu_to_le16(ctxm-&gt;max_entries - ctxm-&gt;vnic_entries);</div><div class='add'>+		req-&gt;vnic_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='del'>-				      &amp;req.vnic_pg_size_vnic_lvl,</div><div class='del'>-				      &amp;req.vnic_page_dir);</div><div class='add'>+				      &amp;req-&gt;vnic_pg_size_vnic_lvl,</div><div class='add'>+				      &amp;req-&gt;vnic_page_dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_STAT) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;stat_mem;</div><div class='del'>-		req.stat_num_entries = cpu_to_le32(ctx-&gt;stat_max_entries);</div><div class='del'>-		req.stat_entry_size = cpu_to_le16(ctx-&gt;stat_entry_size);</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_STAT];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;stat_num_entries = cpu_to_le32(ctxm-&gt;max_entries);</div><div class='add'>+		req-&gt;stat_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='del'>-				      &amp;req.stat_pg_size_stat_lvl,</div><div class='del'>-				      &amp;req.stat_page_dir);</div><div class='add'>+				      &amp;req-&gt;stat_pg_size_stat_lvl,</div><div class='add'>+				      &amp;req-&gt;stat_page_dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;mrav_mem;</div><div class='del'>-		req.mrav_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='del'>-		if (ctx-&gt;mrav_num_entries_units)</div><div class='del'>-			flags |=</div><div class='del'>-			FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT;</div><div class='del'>-		req.mrav_entry_size = cpu_to_le16(ctx-&gt;mrav_entry_size);</div><div class='add'>+		u32 units;</div><div class='add'>+</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_MRAV];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;mrav_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		units = ctxm-&gt;mrav_num_entries_units;</div><div class='add'>+		if (units) {</div><div class='add'>+			u32 num_mr, num_ah = ctxm-&gt;mrav_av_entries;</div><div class='add'>+			u32 entries;</div><div class='add'>+</div><div class='add'>+			num_mr = ctx_pg-&gt;entries - num_ah;</div><div class='add'>+			entries = ((num_mr / units) &lt;&lt; 16) | (num_ah / units);</div><div class='add'>+			req-&gt;mrav_num_entries = cpu_to_le32(entries);</div><div class='add'>+			flags |= FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT;</div><div class='add'>+		}</div><div class='add'>+		req-&gt;mrav_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='del'>-				      &amp;req.mrav_pg_size_mrav_lvl,</div><div class='del'>-				      &amp;req.mrav_page_dir);</div><div class='add'>+				      &amp;req-&gt;mrav_pg_size_mrav_lvl,</div><div class='add'>+				      &amp;req-&gt;mrav_page_dir);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (enables &amp; FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM) {</div><div class='del'>-		ctx_pg = &amp;ctx-&gt;tim_mem;</div><div class='del'>-		req.tim_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='del'>-		req.tim_entry_size = cpu_to_le16(ctx-&gt;tim_entry_size);</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_TIM];</div><div class='add'>+		ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+		req-&gt;tim_num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		req-&gt;tim_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='del'>-				      &amp;req.tim_pg_size_tim_lvl,</div><div class='del'>-				      &amp;req.tim_page_dir);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0, num_entries = &amp;req.tqm_sp_num_entries,</div><div class='del'>-	     pg_attr = &amp;req.tqm_sp_pg_size_tqm_sp_lvl,</div><div class='del'>-	     pg_dir = &amp;req.tqm_sp_page_dir,</div><div class='del'>-	     ena = FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP;</div><div class='del'>-	     i &lt; 9; i++, num_entries++, pg_attr++, pg_dir++, ena &lt;&lt;= 1) {</div><div class='add'>+				      &amp;req-&gt;tim_pg_size_tim_lvl,</div><div class='add'>+				      &amp;req-&gt;tim_page_dir);</div><div class='add'>+	}</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_STQM];</div><div class='add'>+	for (i = 0, num_entries = &amp;req-&gt;tqm_sp_num_entries,</div><div class='add'>+	     pg_attr = &amp;req-&gt;tqm_sp_pg_size_tqm_sp_lvl,</div><div class='add'>+	     pg_dir = &amp;req-&gt;tqm_sp_page_dir,</div><div class='add'>+	     ena = FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP,</div><div class='add'>+	     ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+	     i &lt; BNXT_MAX_TQM_RINGS;</div><div class='add'>+	     ctx_pg = &amp;ctx-&gt;ctx_arr[BNXT_CTX_FTQM].pg_info[i],</div><div class='add'>+	     i++, num_entries++, pg_attr++, pg_dir++, ena &lt;&lt;= 1) {</div><div class='ctx'> 		if (!(enables &amp; ena))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		req.tqm_entry_size = cpu_to_le16(ctx-&gt;tqm_entry_size);</div><div class='del'>-		ctx_pg = ctx-&gt;tqm_mem[i];</div><div class='add'>+		req-&gt;tqm_entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='ctx'> 		*num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='ctx'> 		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem, pg_attr, pg_dir);</div><div class='ctx'> 	}</div><div class='del'>-	req.flags = cpu_to_le32(flags);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	return rc;</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,</div><div class='hunk'>@@ -6247,13 +8966,13 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,</div><div class='ctx'> 				  struct bnxt_ctx_pg_info *ctx_pg, u32 mem_size,</div><div class='del'>-				  u8 depth)</div><div class='add'>+				  u8 depth, struct bnxt_ctx_mem_type *ctxm)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_ring_mem_info *rmem = &amp;ctx_pg-&gt;ring_mem;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!mem_size)</div><div class='del'>-		return 0;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	ctx_pg-&gt;nr_pages = DIV_ROUND_UP(mem_size, BNXT_PAGE_SIZE);</div><div class='ctx'> 	if (ctx_pg-&gt;nr_pages &gt; MAX_CTX_TOTAL_PAGES) {</div><div class='hunk'>@@ -6285,6 +9004,7 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,</div><div class='ctx'> 			rmem-&gt;pg_tbl_map = ctx_pg-&gt;ctx_dma_arr[i];</div><div class='ctx'> 			rmem-&gt;depth = 1;</div><div class='ctx'> 			rmem-&gt;nr_pages = MAX_CTX_PAGES;</div><div class='add'>+			rmem-&gt;ctx_mem = ctxm;</div><div class='ctx'> 			if (i == (nr_tbls - 1)) {</div><div class='ctx'> 				int rem = ctx_pg-&gt;nr_pages % MAX_CTX_PAGES;</div><div class='ctx'> </div><div class='hunk'>@@ -6299,11 +9019,42 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp,</div><div class='ctx'> 		rmem-&gt;nr_pages = DIV_ROUND_UP(mem_size, BNXT_PAGE_SIZE);</div><div class='ctx'> 		if (rmem-&gt;nr_pages &gt; 1 || depth)</div><div class='ctx'> 			rmem-&gt;depth = 1;</div><div class='add'>+		rmem-&gt;ctx_mem = ctxm;</div><div class='ctx'> 		rc = bnxt_alloc_ctx_mem_blk(bp, ctx_pg);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static size_t bnxt_copy_ctx_pg_tbls(struct bnxt *bp,</div><div class='add'>+				    struct bnxt_ctx_pg_info *ctx_pg,</div><div class='add'>+				    void *buf, size_t offset, size_t head,</div><div class='add'>+				    size_t tail)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_mem_info *rmem = &amp;ctx_pg-&gt;ring_mem;</div><div class='add'>+	size_t nr_pages = ctx_pg-&gt;nr_pages;</div><div class='add'>+	int page_size = rmem-&gt;page_size;</div><div class='add'>+	size_t len = 0, total_len = 0;</div><div class='add'>+	u16 depth = rmem-&gt;depth;</div><div class='add'>+</div><div class='add'>+	tail %= nr_pages * page_size;</div><div class='add'>+	do {</div><div class='add'>+		if (depth &gt; 1) {</div><div class='add'>+			int i = head / (page_size * MAX_CTX_PAGES);</div><div class='add'>+			struct bnxt_ctx_pg_info *pg_tbl;</div><div class='add'>+</div><div class='add'>+			pg_tbl = ctx_pg-&gt;ctx_pg_tbl[i];</div><div class='add'>+			rmem = &amp;pg_tbl-&gt;ring_mem;</div><div class='add'>+		}</div><div class='add'>+		len = __bnxt_copy_ring(bp, rmem, buf, offset, head, tail);</div><div class='add'>+		head += len;</div><div class='add'>+		offset += len;</div><div class='add'>+		total_len += len;</div><div class='add'>+		if (head &gt;= nr_pages * page_size)</div><div class='add'>+			head = 0;</div><div class='add'>+	} while (head != tail);</div><div class='add'>+	return total_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_ctx_pg_tbls(struct bnxt *bp,</div><div class='ctx'> 				  struct bnxt_ctx_pg_info *ctx_pg)</div><div class='ctx'> {</div><div class='hunk'>@@ -6333,39 +9084,236 @@ static void bnxt_free_ctx_pg_tbls(struct bnxt *bp,</div><div class='ctx'> 	ctx_pg-&gt;nr_pages = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_free_ctx_mem(struct bnxt *bp)</div><div class='add'>+static int bnxt_setup_ctxm_pg_tbls(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_ctx_mem_type *ctxm, u32 entries,</div><div class='add'>+				   u8 pg_lvl)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ctx_pg_info *ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+	int i, rc = 0, n = 1;</div><div class='add'>+	u32 mem_size;</div><div class='add'>+</div><div class='add'>+	if (!ctxm-&gt;entry_size || !ctx_pg)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (ctxm-&gt;instance_bmap)</div><div class='add'>+		n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+	if (ctxm-&gt;entry_multiple)</div><div class='add'>+		entries = roundup(entries, ctxm-&gt;entry_multiple);</div><div class='add'>+	entries = clamp_t(u32, entries, ctxm-&gt;min_entries, ctxm-&gt;max_entries);</div><div class='add'>+	mem_size = entries * ctxm-&gt;entry_size;</div><div class='add'>+	for (i = 0; i &lt; n &amp;&amp; !rc; i++) {</div><div class='add'>+		ctx_pg[i].entries = entries;</div><div class='add'>+		rc = bnxt_alloc_ctx_pg_tbls(bp, &amp;ctx_pg[i], mem_size, pg_lvl,</div><div class='add'>+					    ctxm-&gt;init_value ? ctxm : NULL);</div><div class='add'>+	}</div><div class='add'>+	if (!rc)</div><div class='add'>+		ctxm-&gt;mem_valid = 1;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_func_backing_store_cfg_v2(struct bnxt *bp,</div><div class='add'>+					       struct bnxt_ctx_mem_type *ctxm,</div><div class='add'>+					       bool last)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_backing_store_cfg_v2_input *req;</div><div class='add'>+	u32 instance_bmap = ctxm-&gt;instance_bmap;</div><div class='add'>+	int i, j, rc = 0, n = 1;</div><div class='add'>+	__le32 *p;</div><div class='add'>+</div><div class='add'>+	if (!(ctxm-&gt;flags &amp; BNXT_CTX_MEM_TYPE_VALID) || !ctxm-&gt;pg_info)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (instance_bmap)</div><div class='add'>+		n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+	else</div><div class='add'>+		instance_bmap = 1;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_BACKING_STORE_CFG_V2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='add'>+	req-&gt;type = cpu_to_le16(ctxm-&gt;type);</div><div class='add'>+	req-&gt;entry_size = cpu_to_le16(ctxm-&gt;entry_size);</div><div class='add'>+	if ((ctxm-&gt;flags &amp; BNXT_CTX_MEM_PERSIST) &amp;&amp;</div><div class='add'>+	    bnxt_bs_trace_avail(bp, ctxm-&gt;type)) {</div><div class='add'>+		struct bnxt_bs_trace_info *bs_trace;</div><div class='add'>+		u32 enables;</div><div class='add'>+</div><div class='add'>+		enables = FUNC_BACKING_STORE_CFG_V2_REQ_ENABLES_NEXT_BS_OFFSET;</div><div class='add'>+		req-&gt;enables = cpu_to_le32(enables);</div><div class='add'>+		bs_trace = &amp;bp-&gt;bs_trace[bnxt_bstore_to_trace[ctxm-&gt;type]];</div><div class='add'>+		req-&gt;next_bs_offset = cpu_to_le32(bs_trace-&gt;last_offset);</div><div class='add'>+	}</div><div class='add'>+	req-&gt;subtype_valid_cnt = ctxm-&gt;split_entry_cnt;</div><div class='add'>+	for (i = 0, p = &amp;req-&gt;split_entry_0; i &lt; ctxm-&gt;split_entry_cnt; i++)</div><div class='add'>+		p[i] = cpu_to_le32(ctxm-&gt;split[i]);</div><div class='add'>+	for (i = 0, j = 0; j &lt; n &amp;&amp; !rc; i++) {</div><div class='add'>+		struct bnxt_ctx_pg_info *ctx_pg;</div><div class='add'>+</div><div class='add'>+		if (!(instance_bmap &amp; (1 &lt;&lt; i)))</div><div class='add'>+			continue;</div><div class='add'>+		req-&gt;instance = cpu_to_le16(i);</div><div class='add'>+		ctx_pg = &amp;ctxm-&gt;pg_info[j++];</div><div class='add'>+		if (!ctx_pg-&gt;entries)</div><div class='add'>+			continue;</div><div class='add'>+		req-&gt;num_entries = cpu_to_le32(ctx_pg-&gt;entries);</div><div class='add'>+		bnxt_hwrm_set_pg_attr(&amp;ctx_pg-&gt;ring_mem,</div><div class='add'>+				      &amp;req-&gt;page_size_pbl_level,</div><div class='add'>+				      &amp;req-&gt;page_dir);</div><div class='add'>+		if (last &amp;&amp; j == n)</div><div class='add'>+			req-&gt;flags =</div><div class='add'>+				cpu_to_le32(FUNC_BACKING_STORE_CFG_V2_REQ_FLAGS_BS_CFG_ALL_DONE);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_backing_store_cfg_v2(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_ctx_mem_info *ctx = bp-&gt;ctx;</div><div class='del'>-	int i;</div><div class='add'>+	struct bnxt_ctx_mem_type *ctxm;</div><div class='add'>+	u16 last_type = BNXT_CTX_INV;</div><div class='add'>+	int rc = 0;</div><div class='add'>+	u16 type;</div><div class='ctx'> </div><div class='del'>-	if (!ctx)</div><div class='add'>+	for (type = BNXT_CTX_SRT; type &lt;= BNXT_CTX_QPC; type++) {</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		if (!bnxt_bs_trace_avail(bp, type))</div><div class='add'>+			continue;</div><div class='add'>+		if (!ctxm-&gt;mem_valid) {</div><div class='add'>+			rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm,</div><div class='add'>+						     ctxm-&gt;max_entries, 1);</div><div class='add'>+			if (rc) {</div><div class='add'>+				netdev_warn(bp-&gt;dev, "Unable to setup ctx page for type:0x%x.\n",</div><div class='add'>+					    type);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			bnxt_bs_trace_init(bp, ctxm);</div><div class='add'>+		}</div><div class='add'>+		last_type = type;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (last_type == BNXT_CTX_INV) {</div><div class='add'>+		for (type = 0; type &lt; BNXT_CTX_MAX; type++) {</div><div class='add'>+			ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+			if (ctxm-&gt;mem_valid)</div><div class='add'>+				last_type = type;</div><div class='add'>+		}</div><div class='add'>+		if (last_type == BNXT_CTX_INV)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;ctx_arr[last_type].last = 1;</div><div class='add'>+</div><div class='add'>+	for (type = 0 ; type &lt; BNXT_CTX_V2_MAX; type++) {</div><div class='add'>+		ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+</div><div class='add'>+		if (!ctxm-&gt;mem_valid)</div><div class='add'>+			continue;</div><div class='add'>+		rc = bnxt_hwrm_func_backing_store_cfg_v2(bp, ctxm, ctxm-&gt;last);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __bnxt_copy_ctx_mem - copy host context memory</div><div class='add'>+ * @bp: The driver context</div><div class='add'>+ * @ctxm: The pointer to the context memory type</div><div class='add'>+ * @buf: The destination buffer or NULL to just obtain the length</div><div class='add'>+ * @offset: The buffer offset to copy the data to</div><div class='add'>+ * @head: The head offset of context memory to copy from</div><div class='add'>+ * @tail: The tail offset (last byte + 1) of context memory to end the copy</div><div class='add'>+ *</div><div class='add'>+ * This function is called for debugging purposes to dump the host context</div><div class='add'>+ * used by the chip.</div><div class='add'>+ *</div><div class='add'>+ * Return: Length of memory copied</div><div class='add'>+ */</div><div class='add'>+static size_t __bnxt_copy_ctx_mem(struct bnxt *bp,</div><div class='add'>+				  struct bnxt_ctx_mem_type *ctxm, void *buf,</div><div class='add'>+				  size_t offset, size_t head, size_t tail)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ctx_pg_info *ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+	size_t len = 0, total_len = 0;</div><div class='add'>+	int i, n = 1;</div><div class='add'>+</div><div class='add'>+	if (!ctx_pg)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (ctxm-&gt;instance_bmap)</div><div class='add'>+		n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		len = bnxt_copy_ctx_pg_tbls(bp, &amp;ctx_pg[i], buf, offset, head,</div><div class='add'>+					    tail);</div><div class='add'>+		offset += len;</div><div class='add'>+		total_len += len;</div><div class='add'>+	}</div><div class='add'>+	return total_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+size_t bnxt_copy_ctx_mem(struct bnxt *bp, struct bnxt_ctx_mem_type *ctxm,</div><div class='add'>+			 void *buf, size_t offset)</div><div class='add'>+{</div><div class='add'>+	size_t tail = ctxm-&gt;max_entries * ctxm-&gt;entry_size;</div><div class='add'>+</div><div class='add'>+	return __bnxt_copy_ctx_mem(bp, ctxm, buf, offset, 0, tail);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_one_ctx_mem(struct bnxt *bp,</div><div class='add'>+				  struct bnxt_ctx_mem_type *ctxm, bool force)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ctx_pg_info *ctx_pg;</div><div class='add'>+	int i, n = 1;</div><div class='add'>+</div><div class='add'>+	ctxm-&gt;last = 0;</div><div class='add'>+</div><div class='add'>+	if (ctxm-&gt;mem_valid &amp;&amp; !force &amp;&amp; (ctxm-&gt;flags &amp; BNXT_CTX_MEM_PERSIST))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (ctx-&gt;tqm_mem[0]) {</div><div class='del'>-		for (i = 0; i &lt; bp-&gt;max_q + 1; i++)</div><div class='del'>-			bnxt_free_ctx_pg_tbls(bp, ctx-&gt;tqm_mem[i]);</div><div class='del'>-		kfree(ctx-&gt;tqm_mem[0]);</div><div class='del'>-		ctx-&gt;tqm_mem[0] = NULL;</div><div class='add'>+	ctx_pg = ctxm-&gt;pg_info;</div><div class='add'>+	if (ctx_pg) {</div><div class='add'>+		if (ctxm-&gt;instance_bmap)</div><div class='add'>+			n = hweight32(ctxm-&gt;instance_bmap);</div><div class='add'>+		for (i = 0; i &lt; n; i++)</div><div class='add'>+			bnxt_free_ctx_pg_tbls(bp, &amp;ctx_pg[i]);</div><div class='add'>+</div><div class='add'>+		kfree(ctx_pg);</div><div class='add'>+		ctxm-&gt;pg_info = NULL;</div><div class='add'>+		ctxm-&gt;mem_valid = 0;</div><div class='ctx'> 	}</div><div class='add'>+	memset(ctxm, 0, sizeof(*ctxm));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_free_ctx_mem(struct bnxt *bp, bool force)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ctx_mem_info *ctx = bp-&gt;ctx;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (type = 0; type &lt; BNXT_CTX_V2_MAX; type++)</div><div class='add'>+		bnxt_free_one_ctx_mem(bp, &amp;ctx-&gt;ctx_arr[type], force);</div><div class='ctx'> </div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;tim_mem);</div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;mrav_mem);</div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;stat_mem);</div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;vnic_mem);</div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;cq_mem);</div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;srq_mem);</div><div class='del'>-	bnxt_free_ctx_pg_tbls(bp, &amp;ctx-&gt;qp_mem);</div><div class='ctx'> 	ctx-&gt;flags &amp;= ~BNXT_CTX_FLAG_INITED;</div><div class='add'>+	if (force) {</div><div class='add'>+		kfree(ctx);</div><div class='add'>+		bp-&gt;ctx = NULL;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_ctx_mem(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_ctx_pg_info *ctx_pg;</div><div class='add'>+	struct bnxt_ctx_mem_type *ctxm;</div><div class='ctx'> 	struct bnxt_ctx_mem_info *ctx;</div><div class='del'>-	u32 mem_size, ena, entries;</div><div class='add'>+	u32 l2_qps, qp1_qps, max_qps;</div><div class='add'>+	u32 ena, entries_sp, entries;</div><div class='add'>+	u32 srqs, max_srqs, min;</div><div class='ctx'> 	u32 num_mr, num_ah;</div><div class='ctx'> 	u32 extra_srqs = 0;</div><div class='ctx'> 	u32 extra_qps = 0;</div><div class='add'>+	u32 fast_qpmd_qps;</div><div class='ctx'> 	u8 pg_lvl = 1;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='hunk'>@@ -6379,120 +9327,215 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp)</div><div class='ctx'> 	if (!ctx || (ctx-&gt;flags &amp; BNXT_CTX_FLAG_INITED))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	ena = 0;</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+		goto skip_legacy;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_QP];</div><div class='add'>+	l2_qps = ctxm-&gt;qp_l2_entries;</div><div class='add'>+	qp1_qps = ctxm-&gt;qp_qp1_entries;</div><div class='add'>+	fast_qpmd_qps = ctxm-&gt;qp_fast_qpmd_entries;</div><div class='add'>+	max_qps = ctxm-&gt;max_entries;</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_SRQ];</div><div class='add'>+	srqs = ctxm-&gt;srq_l2_entries;</div><div class='add'>+	max_srqs = ctxm-&gt;max_entries;</div><div class='ctx'> 	if ((bp-&gt;flags &amp; BNXT_FLAG_ROCE_CAP) &amp;&amp; !is_kdump_kernel()) {</div><div class='ctx'> 		pg_lvl = 2;</div><div class='del'>-		extra_qps = 65536;</div><div class='del'>-		extra_srqs = 8192;</div><div class='add'>+		if (BNXT_SW_RES_LMT(bp)) {</div><div class='add'>+			extra_qps = max_qps - l2_qps - qp1_qps;</div><div class='add'>+			extra_srqs = max_srqs - srqs;</div><div class='add'>+		} else {</div><div class='add'>+			extra_qps = min_t(u32, 65536,</div><div class='add'>+					  max_qps - l2_qps - qp1_qps);</div><div class='add'>+			/* allocate extra qps if fw supports RoCE fast qp</div><div class='add'>+			 * destroy feature</div><div class='add'>+			 */</div><div class='add'>+			extra_qps += fast_qpmd_qps;</div><div class='add'>+			extra_srqs = min_t(u32, 8192, max_srqs - srqs);</div><div class='add'>+		}</div><div class='add'>+		if (fast_qpmd_qps)</div><div class='add'>+			ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP_FAST_QPMD;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;qp_mem;</div><div class='del'>-	ctx_pg-&gt;entries = ctx-&gt;qp_min_qp1_entries + ctx-&gt;qp_max_l2_entries +</div><div class='del'>-			  extra_qps;</div><div class='del'>-	mem_size = ctx-&gt;qp_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_QP];</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, l2_qps + qp1_qps + extra_qps,</div><div class='add'>+				     pg_lvl);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;srq_mem;</div><div class='del'>-	ctx_pg-&gt;entries = ctx-&gt;srq_max_l2_entries + extra_srqs;</div><div class='del'>-	mem_size = ctx-&gt;srq_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_SRQ];</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, srqs + extra_srqs, pg_lvl);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;cq_mem;</div><div class='del'>-	ctx_pg-&gt;entries = ctx-&gt;cq_max_l2_entries + extra_qps * 2;</div><div class='del'>-	mem_size = ctx-&gt;cq_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, pg_lvl);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_CQ];</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, ctxm-&gt;cq_l2_entries +</div><div class='add'>+				     extra_qps * 2, pg_lvl);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;vnic_mem;</div><div class='del'>-	ctx_pg-&gt;entries = ctx-&gt;vnic_max_vnic_entries +</div><div class='del'>-			  ctx-&gt;vnic_max_ring_table_entries;</div><div class='del'>-	mem_size = ctx-&gt;vnic_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_VNIC];</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, ctxm-&gt;max_entries, 1);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;stat_mem;</div><div class='del'>-	ctx_pg-&gt;entries = ctx-&gt;stat_max_entries;</div><div class='del'>-	mem_size = ctx-&gt;stat_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_STAT];</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, ctxm-&gt;max_entries, 1);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	ena = 0;</div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_ROCE_CAP))</div><div class='ctx'> 		goto skip_rdma;</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;mrav_mem;</div><div class='del'>-	/* 128K extra is needed to accommodate static AH context</div><div class='del'>-	 * allocation by f/w.</div><div class='del'>-	 */</div><div class='del'>-	num_mr = 1024 * 256;</div><div class='del'>-	num_ah = 1024 * 128;</div><div class='del'>-	ctx_pg-&gt;entries = num_mr + num_ah;</div><div class='del'>-	mem_size = ctx-&gt;mrav_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 2);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_MRAV];</div><div class='add'>+	if (BNXT_SW_RES_LMT(bp) &amp;&amp;</div><div class='add'>+	    ctxm-&gt;split_entry_cnt == BNXT_CTX_MRAV_AV_SPLIT_ENTRY + 1) {</div><div class='add'>+		num_ah = ctxm-&gt;mrav_av_entries;</div><div class='add'>+		num_mr = ctxm-&gt;max_entries - num_ah;</div><div class='add'>+	} else {</div><div class='add'>+		/* 128K extra is needed to accommodate static AH context</div><div class='add'>+		 * allocation by f/w.</div><div class='add'>+		 */</div><div class='add'>+		num_mr = min_t(u32, ctxm-&gt;max_entries / 2, 1024 * 256);</div><div class='add'>+		num_ah = min_t(u32, num_mr, 1024 * 128);</div><div class='add'>+		ctxm-&gt;split_entry_cnt = BNXT_CTX_MRAV_AV_SPLIT_ENTRY + 1;</div><div class='add'>+		if (!ctxm-&gt;mrav_av_entries || ctxm-&gt;mrav_av_entries &gt; num_ah)</div><div class='add'>+			ctxm-&gt;mrav_av_entries = num_ah;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, num_mr + num_ah, 2);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	ena = FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV;</div><div class='del'>-	if (ctx-&gt;mrav_num_entries_units)</div><div class='del'>-		ctx_pg-&gt;entries =</div><div class='del'>-			((num_mr / ctx-&gt;mrav_num_entries_units) &lt;&lt; 16) |</div><div class='del'>-			 (num_ah / ctx-&gt;mrav_num_entries_units);</div><div class='add'>+	ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV;</div><div class='ctx'> </div><div class='del'>-	ctx_pg = &amp;ctx-&gt;tim_mem;</div><div class='del'>-	ctx_pg-&gt;entries = ctx-&gt;qp_mem.entries;</div><div class='del'>-	mem_size = ctx-&gt;tim_entry_size * ctx_pg-&gt;entries;</div><div class='del'>-	rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_TIM];</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, l2_qps + qp1_qps + extra_qps, 1);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM;</div><div class='ctx'> </div><div class='ctx'> skip_rdma:</div><div class='del'>-	entries = ctx-&gt;qp_max_l2_entries + extra_qps;</div><div class='del'>-	entries = roundup(entries, ctx-&gt;tqm_entries_multiple);</div><div class='del'>-	entries = clamp_t(u32, entries, ctx-&gt;tqm_min_entries_per_ring,</div><div class='del'>-			  ctx-&gt;tqm_max_entries_per_ring);</div><div class='del'>-	for (i = 0; i &lt; bp-&gt;max_q + 1; i++) {</div><div class='del'>-		ctx_pg = ctx-&gt;tqm_mem[i];</div><div class='del'>-		ctx_pg-&gt;entries = entries;</div><div class='del'>-		mem_size = ctx-&gt;tqm_entry_size * entries;</div><div class='del'>-		rc = bnxt_alloc_ctx_pg_tbls(bp, ctx_pg, mem_size, 1);</div><div class='del'>-		if (rc)</div><div class='del'>-			return rc;</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_STQM];</div><div class='add'>+	min = ctxm-&gt;min_entries;</div><div class='add'>+	entries_sp = ctx-&gt;ctx_arr[BNXT_CTX_VNIC].vnic_entries + l2_qps +</div><div class='add'>+		     2 * (extra_qps + qp1_qps) + min;</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, entries_sp, 2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ctxm = &amp;ctx-&gt;ctx_arr[BNXT_CTX_FTQM];</div><div class='add'>+	entries = l2_qps + 2 * (extra_qps + qp1_qps);</div><div class='add'>+	rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, entries, 2);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	for (i = 0; i &lt; ctx-&gt;tqm_fp_rings_count + 1; i++)</div><div class='ctx'> 		ena |= FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP &lt;&lt; i;</div><div class='del'>-	}</div><div class='ctx'> 	ena |= FUNC_BACKING_STORE_CFG_REQ_DFLT_ENABLES;</div><div class='del'>-	rc = bnxt_hwrm_func_backing_store_cfg(bp, ena);</div><div class='del'>-	if (rc)</div><div class='add'>+</div><div class='add'>+skip_legacy:</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_BACKING_STORE_V2)</div><div class='add'>+		rc = bnxt_backing_store_cfg_v2(bp);</div><div class='add'>+	else</div><div class='add'>+		rc = bnxt_hwrm_func_backing_store_cfg(bp, ena);</div><div class='add'>+	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "Failed configuring context mem, rc = %d.\n",</div><div class='ctx'> 			   rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;flags |= BNXT_CTX_FLAG_INITED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_crash_dump_mem_cfg(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_crashdump_medium_cfg_input *req;</div><div class='add'>+	u16 page_attr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_CRASHDUMP_MEDIUM_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_PAGE_SIZE == 0x2000)</div><div class='add'>+		page_attr = DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_8K;</div><div class='add'>+	else if (BNXT_PAGE_SIZE == 0x10000)</div><div class='add'>+		page_attr = DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_64K;</div><div class='ctx'> 	else</div><div class='del'>-		ctx-&gt;flags |= BNXT_CTX_FLAG_INITED;</div><div class='add'>+		page_attr = DBG_CRASHDUMP_MEDIUM_CFG_REQ_PG_SIZE_PG_4K;</div><div class='add'>+	req-&gt;pg_size_lvl = cpu_to_le16(page_attr |</div><div class='add'>+				       bp-&gt;fw_crash_mem-&gt;ring_mem.depth);</div><div class='add'>+	req-&gt;pbl = cpu_to_le64(bp-&gt;fw_crash_mem-&gt;ring_mem.pg_tbl_map);</div><div class='add'>+	req-&gt;size = cpu_to_le32(bp-&gt;fw_crash_len);</div><div class='add'>+	req-&gt;output_dest_flags = cpu_to_le16(BNXT_DBG_CR_DUMP_MDM_CFG_DDR);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_free_crash_dump_mem(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;fw_crash_mem) {</div><div class='add'>+		bnxt_free_ctx_pg_tbls(bp, bp-&gt;fw_crash_mem);</div><div class='add'>+		kfree(bp-&gt;fw_crash_mem);</div><div class='add'>+		bp-&gt;fw_crash_mem = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_crash_dump_mem(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u32 mem_size = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_get_dump_len(bp, BNXT_DUMP_CRASH, &amp;mem_size);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	mem_size = round_up(mem_size, 4);</div><div class='add'>+</div><div class='add'>+	/* keep and use the existing pages */</div><div class='add'>+	if (bp-&gt;fw_crash_mem &amp;&amp;</div><div class='add'>+	    mem_size &lt;= bp-&gt;fw_crash_mem-&gt;nr_pages * BNXT_PAGE_SIZE)</div><div class='add'>+		goto alloc_done;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_crash_mem)</div><div class='add'>+		bnxt_free_ctx_pg_tbls(bp, bp-&gt;fw_crash_mem);</div><div class='add'>+	else</div><div class='add'>+		bp-&gt;fw_crash_mem = kzalloc(sizeof(*bp-&gt;fw_crash_mem),</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;fw_crash_mem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_alloc_ctx_pg_tbls(bp, bp-&gt;fw_crash_mem, mem_size, 1, NULL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		bnxt_free_crash_dump_mem(bp);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+alloc_done:</div><div class='add'>+	bp-&gt;fw_crash_len = mem_size;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp, bool all)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_resource_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_func_resource_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_func_resource_qcaps_output *resp;</div><div class='add'>+	struct hwrm_func_resource_qcaps_input *req;</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_RESOURCE_QCAPS, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_RESOURCE_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message_silent(bp, &amp;req, sizeof(req),</div><div class='del'>-				       HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc) {</div><div class='del'>-		rc = -EIO;</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		goto hwrm_func_resc_qcaps_exit;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	hw_resc-&gt;max_tx_sch_inputs = le16_to_cpu(resp-&gt;max_tx_scheduler_inputs);</div><div class='ctx'> 	if (!all)</div><div class='hunk'>@@ -6515,7 +9558,7 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp, bool all)</div><div class='ctx'> 	hw_resc-&gt;min_stat_ctxs = le16_to_cpu(resp-&gt;min_stat_ctx);</div><div class='ctx'> 	hw_resc-&gt;max_stat_ctxs = le16_to_cpu(resp-&gt;max_stat_ctx);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 		u16 max_msix = le16_to_cpu(resp-&gt;max_msix);</div><div class='ctx'> </div><div class='ctx'> 		hw_resc-&gt;max_nqs = max_msix;</div><div class='hunk'>@@ -6531,23 +9574,93 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp, bool all)</div><div class='ctx'> 			pf-&gt;vf_resv_strategy = BNXT_VF_RESV_STRATEGY_MAXIMAL;</div><div class='ctx'> 	}</div><div class='ctx'> hwrm_func_resc_qcaps_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bnxt_hwrm_ptp_qcfg(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_mac_ptp_qcfg_output *resp;</div><div class='add'>+	struct hwrm_port_mac_ptp_qcfg_input *req;</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u8 flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10801 || !BNXT_CHIP_P5_PLUS(bp)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto no_ptp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_PTP_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto no_ptp;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	flags = resp-&gt;flags;</div><div class='add'>+	if (BNXT_CHIP_P5_AND_MINUS(bp) &amp;&amp;</div><div class='add'>+	    !(flags &amp; PORT_MAC_PTP_QCFG_RESP_FLAGS_HWRM_ACCESS)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	if (!ptp) {</div><div class='add'>+		ptp = kzalloc(sizeof(*ptp), GFP_KERNEL);</div><div class='add'>+		if (!ptp) {</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		ptp-&gt;bp = bp;</div><div class='add'>+		bp-&gt;ptp_cfg = ptp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp;</div><div class='add'>+	    (PORT_MAC_PTP_QCFG_RESP_FLAGS_PARTIAL_DIRECT_ACCESS_REF_CLOCK |</div><div class='add'>+	     PORT_MAC_PTP_QCFG_RESP_FLAGS_64B_PHC_TIME)) {</div><div class='add'>+		ptp-&gt;refclk_regs[0] = le32_to_cpu(resp-&gt;ts_ref_clock_reg_lower);</div><div class='add'>+		ptp-&gt;refclk_regs[1] = le32_to_cpu(resp-&gt;ts_ref_clock_reg_upper);</div><div class='add'>+	} else if (BNXT_CHIP_P5(bp)) {</div><div class='add'>+		ptp-&gt;refclk_regs[0] = BNXT_TS_REG_TIMESYNC_TS0_LOWER;</div><div class='add'>+		ptp-&gt;refclk_regs[1] = BNXT_TS_REG_TIMESYNC_TS0_UPPER;</div><div class='add'>+	} else {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ptp-&gt;rtc_configured =</div><div class='add'>+		(flags &amp; PORT_MAC_PTP_QCFG_RESP_FLAGS_RTC_CONFIGURED) != 0;</div><div class='add'>+	rc = bnxt_ptp_init(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_warn(bp-&gt;dev, "PTP initialization failed.\n");</div><div class='add'>+exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+no_ptp:</div><div class='add'>+	bnxt_ptp_clear(bp);</div><div class='add'>+	kfree(ptp);</div><div class='add'>+	bp-&gt;ptp_cfg = NULL;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct hwrm_func_qcaps_input req = {0};</div><div class='del'>-	struct hwrm_func_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	u32 flags, flags_ext, flags_ext2, flags_ext3;</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='del'>-	u32 flags;</div><div class='add'>+	struct hwrm_func_qcaps_output *resp;</div><div class='add'>+	struct hwrm_func_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCAPS, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto hwrm_func_qcaps_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -6556,13 +9669,66 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_ROCEV1_CAP;</div><div class='ctx'> 	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_ROCE_V2_SUPPORTED)</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_ROCEV2_CAP;</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_LINK_ADMIN_STATUS_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_LINK_ADMIN;</div><div class='ctx'> 	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_PCIE_STATS_SUPPORTED)</div><div class='ctx'> 		bp-&gt;fw_cap |= BNXT_FW_CAP_PCIE_STATS_SUPPORTED;</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_HOT_RESET_CAPABLE)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_HOT_RESET;</div><div class='ctx'> 	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_EXT_STATS_SUPPORTED)</div><div class='ctx'> 		bp-&gt;fw_cap |= BNXT_FW_CAP_EXT_STATS_SUPPORTED;</div><div class='add'>+	if (flags &amp;  FUNC_QCAPS_RESP_FLAGS_ERROR_RECOVERY_CAPABLE)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_ERROR_RECOVERY;</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_ERR_RECOVER_RELOAD)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_ERR_RECOVER_RELOAD;</div><div class='add'>+	if (!(flags &amp; FUNC_QCAPS_RESP_FLAGS_VLAN_ACCELERATION_TX_DISABLED))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_VLAN_TX_INSERT;</div><div class='add'>+	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_DBG_QCAPS_CMD_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_DBG_QCAPS;</div><div class='add'>+</div><div class='add'>+	flags_ext = le32_to_cpu(resp-&gt;flags_ext);</div><div class='add'>+	if (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_EXT_HW_STATS_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED;</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_PTP_PPS_SUPPORTED))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_PTP_PPS;</div><div class='add'>+	if (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_PTP_64BIT_RTC_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_PTP_RTC;</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_HOT_RESET_IF_SUPPORT))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_HOT_RESET_IF;</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_FW_LIVEPATCH_SUPPORTED))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_LIVEPATCH;</div><div class='add'>+	if (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_NPAR_1_2_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_NPAR_1_2;</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_DFLT_VLAN_TPID_PCP_SUPPORTED))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_DFLT_VLAN_TPID_PCP;</div><div class='add'>+	if (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_BS_V2_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_BACKING_STORE_V2;</div><div class='add'>+	if (flags_ext &amp; FUNC_QCAPS_RESP_FLAGS_EXT_TX_COAL_CMPL_CAP)</div><div class='add'>+		bp-&gt;flags |= BNXT_FLAG_TX_COAL_CMPL;</div><div class='add'>+</div><div class='add'>+	flags_ext2 = le32_to_cpu(resp-&gt;flags_ext2);</div><div class='add'>+	if (flags_ext2 &amp; FUNC_QCAPS_RESP_FLAGS_EXT2_RX_ALL_PKTS_TIMESTAMPS_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_RX_ALL_PKT_TS;</div><div class='add'>+	if (flags_ext2 &amp; FUNC_QCAPS_RESP_FLAGS_EXT2_UDP_GSO_SUPPORTED)</div><div class='add'>+		bp-&gt;flags |= BNXT_FLAG_UDP_GSO_CAP;</div><div class='add'>+	if (flags_ext2 &amp; FUNC_QCAPS_RESP_FLAGS_EXT2_TX_PKT_TS_CMPL_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_TX_TS_CMP;</div><div class='add'>+	if (flags_ext2 &amp;</div><div class='add'>+	    FUNC_QCAPS_RESP_FLAGS_EXT2_SW_MAX_RESOURCE_LIMITS_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_SW_MAX_RESOURCE_LIMITS;</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp;</div><div class='add'>+	    (flags_ext2 &amp; FUNC_QCAPS_RESP_FLAGS_EXT2_ROCE_VF_RESOURCE_MGMT_SUPPORTED))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_ROCE_VF_RESC_MGMT_SUPPORTED;</div><div class='add'>+</div><div class='add'>+	flags_ext3 = le32_to_cpu(resp-&gt;flags_ext3);</div><div class='add'>+	if (flags_ext3 &amp; FUNC_QCAPS_RESP_FLAGS_EXT3_ROCE_VF_DYN_ALLOC_SUPPORT)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_ROCE_VF_DYN_ALLOC_SUPPORT;</div><div class='add'>+	if (flags_ext3 &amp; FUNC_QCAPS_RESP_FLAGS_EXT3_MIRROR_ON_ROCE_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_MIRROR_ON_ROCE;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;tx_push_thresh = 0;</div><div class='del'>-	if (flags &amp; FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED)</div><div class='add'>+	if ((flags &amp; FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED) &amp;&amp;</div><div class='add'>+	    BNXT_FW_MAJ(bp) &gt; 217)</div><div class='ctx'> 		bp-&gt;tx_push_thresh = BNXT_TX_PUSH_THRESH;</div><div class='ctx'> </div><div class='ctx'> 	hw_resc-&gt;max_rsscos_ctxs = le16_to_cpu(resp-&gt;max_rsscos_ctx);</div><div class='hunk'>@@ -6576,23 +9742,31 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> 	hw_resc-&gt;max_vnics = le16_to_cpu(resp-&gt;max_vnics);</div><div class='ctx'> 	hw_resc-&gt;max_stat_ctxs = le16_to_cpu(resp-&gt;max_stat_ctx);</div><div class='ctx'> </div><div class='add'>+	hw_resc-&gt;max_encap_records = le32_to_cpu(resp-&gt;max_encap_records);</div><div class='add'>+	hw_resc-&gt;max_decap_records = le32_to_cpu(resp-&gt;max_decap_records);</div><div class='add'>+	hw_resc-&gt;max_tx_em_flows = le32_to_cpu(resp-&gt;max_tx_em_flows);</div><div class='add'>+	hw_resc-&gt;max_tx_wm_flows = le32_to_cpu(resp-&gt;max_tx_wm_flows);</div><div class='add'>+	hw_resc-&gt;max_rx_em_flows = le32_to_cpu(resp-&gt;max_rx_em_flows);</div><div class='add'>+	hw_resc-&gt;max_rx_wm_flows = le32_to_cpu(resp-&gt;max_rx_wm_flows);</div><div class='add'>+</div><div class='ctx'> 	if (BNXT_PF(bp)) {</div><div class='ctx'> 		struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> </div><div class='ctx'> 		pf-&gt;fw_fid = le16_to_cpu(resp-&gt;fid);</div><div class='ctx'> 		pf-&gt;port_id = le16_to_cpu(resp-&gt;port_id);</div><div class='del'>-		bp-&gt;dev-&gt;dev_port = pf-&gt;port_id;</div><div class='ctx'> 		memcpy(pf-&gt;mac_addr, resp-&gt;mac_address, ETH_ALEN);</div><div class='ctx'> 		pf-&gt;first_vf_id = le16_to_cpu(resp-&gt;first_vf_id);</div><div class='ctx'> 		pf-&gt;max_vfs = le16_to_cpu(resp-&gt;max_vfs);</div><div class='del'>-		pf-&gt;max_encap_records = le32_to_cpu(resp-&gt;max_encap_records);</div><div class='del'>-		pf-&gt;max_decap_records = le32_to_cpu(resp-&gt;max_decap_records);</div><div class='del'>-		pf-&gt;max_tx_em_flows = le32_to_cpu(resp-&gt;max_tx_em_flows);</div><div class='del'>-		pf-&gt;max_tx_wm_flows = le32_to_cpu(resp-&gt;max_tx_wm_flows);</div><div class='del'>-		pf-&gt;max_rx_em_flows = le32_to_cpu(resp-&gt;max_rx_em_flows);</div><div class='del'>-		pf-&gt;max_rx_wm_flows = le32_to_cpu(resp-&gt;max_rx_wm_flows);</div><div class='add'>+		bp-&gt;flags &amp;= ~BNXT_FLAG_WOL_CAP;</div><div class='ctx'> 		if (flags &amp; FUNC_QCAPS_RESP_FLAGS_WOL_MAGICPKT_SUPPORTED)</div><div class='ctx'> 			bp-&gt;flags |= BNXT_FLAG_WOL_CAP;</div><div class='add'>+		if (flags &amp; FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED) {</div><div class='add'>+			bp-&gt;fw_cap |= BNXT_FW_CAP_PTP;</div><div class='add'>+		} else {</div><div class='add'>+			bnxt_ptp_clear(bp);</div><div class='add'>+			kfree(bp-&gt;ptp_cfg);</div><div class='add'>+			bp-&gt;ptp_cfg = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 		struct bnxt_vf_info *vf = &amp;bp-&gt;vf;</div><div class='hunk'>@@ -6601,21 +9775,51 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> 		memcpy(vf-&gt;mac_addr, resp-&gt;mac_address, ETH_ALEN);</div><div class='ctx'> #endif</div><div class='ctx'> 	}</div><div class='add'>+	bp-&gt;tso_max_segs = le16_to_cpu(resp-&gt;max_tso_segs);</div><div class='ctx'> </div><div class='ctx'> hwrm_func_qcaps_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_hwrm_dbg_qcaps(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_qcaps_output *resp;</div><div class='add'>+	struct hwrm_dbg_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_dbg_cap = 0;</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_DBG_QCAPS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto hwrm_dbg_qcaps_exit;</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_dbg_cap = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+</div><div class='add'>+hwrm_dbg_qcaps_exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_hwrm_queue_qportcfg(struct bnxt *bp);</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='add'>+int bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = __bnxt_hwrm_func_qcaps(bp);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_dbg_qcaps(bp);</div><div class='add'>+</div><div class='ctx'> 	rc = bnxt_hwrm_queue_qportcfg(bp);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm query qportcfg failure rc: %d\n", rc);</div><div class='hunk'>@@ -6634,54 +9838,288 @@ static int bnxt_hwrm_func_qcaps(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_cfa_adv_flow_mgnt_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_adv_flow_mgnt_qcaps_input req = {0};</div><div class='ctx'> 	struct hwrm_cfa_adv_flow_mgnt_qcaps_output *resp;</div><div class='del'>-	int rc = 0;</div><div class='add'>+	struct hwrm_cfa_adv_flow_mgnt_qcaps_input *req;</div><div class='ctx'> 	u32 flags;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_ADV_FLOW))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_ADV_FLOW_MGNT_QCAPS, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_ADV_FLOW_MGNT_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto hwrm_cfa_adv_qcaps_exit;</div><div class='ctx'> </div><div class='ctx'> 	flags = le32_to_cpu(resp-&gt;flags);</div><div class='ctx'> 	if (flags &amp;</div><div class='del'>-	    CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_SUPPORTED)</div><div class='del'>-		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX;</div><div class='add'>+	    CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_V2_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2;</div><div class='add'>+</div><div class='add'>+	if (flags &amp;</div><div class='add'>+	    CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_V3_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V3;</div><div class='add'>+</div><div class='add'>+	if (flags &amp;</div><div class='add'>+	    CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_RX_EXT_IP_PROTO_SUPPORTED)</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_NTUPLE_RX_EXT_IP_PROTO;</div><div class='ctx'> </div><div class='ctx'> hwrm_cfa_adv_qcaps_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bnxt_alloc_fw_health(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;fw_health)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_health = kzalloc(sizeof(*bp-&gt;fw_health), GFP_KERNEL);</div><div class='add'>+	if (!bp-&gt;fw_health)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;bp-&gt;fw_health-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_fw_health(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET) &amp;&amp;</div><div class='add'>+	    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = __bnxt_alloc_fw_health(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		bp-&gt;fw_cap &amp;= ~BNXT_FW_CAP_HOT_RESET;</div><div class='add'>+		bp-&gt;fw_cap &amp;= ~BNXT_FW_CAP_ERROR_RECOVERY;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bnxt_map_fw_health_reg(struct bnxt *bp, u32 reg)</div><div class='add'>+{</div><div class='add'>+	writel(reg &amp; BNXT_GRC_BASE_MASK, bp-&gt;bar0 +</div><div class='add'>+					 BNXT_GRCPF_REG_WINDOW_BASE_OUT +</div><div class='add'>+					 BNXT_FW_HEALTH_WIN_MAP_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_inv_fw_health_reg(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	u32 reg_type;</div><div class='add'>+</div><div class='add'>+	if (!fw_health)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	reg_type = BNXT_FW_HEALTH_REG_TYPE(fw_health-&gt;regs[BNXT_FW_HEALTH_REG]);</div><div class='add'>+	if (reg_type == BNXT_FW_HEALTH_REG_TYPE_GRC)</div><div class='add'>+		fw_health-&gt;status_reliable = false;</div><div class='add'>+</div><div class='add'>+	reg_type = BNXT_FW_HEALTH_REG_TYPE(fw_health-&gt;regs[BNXT_FW_RESET_CNT_REG]);</div><div class='add'>+	if (reg_type == BNXT_FW_HEALTH_REG_TYPE_GRC)</div><div class='add'>+		fw_health-&gt;resets_reliable = false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_try_map_fw_health_reg(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	void __iomem *hs;</div><div class='add'>+	u32 status_loc;</div><div class='add'>+	u32 reg_type;</div><div class='add'>+	u32 sig;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_health)</div><div class='add'>+		bp-&gt;fw_health-&gt;status_reliable = false;</div><div class='add'>+</div><div class='add'>+	__bnxt_map_fw_health_reg(bp, HCOMM_STATUS_STRUCT_LOC);</div><div class='add'>+	hs = bp-&gt;bar0 + BNXT_FW_HEALTH_WIN_OFF(HCOMM_STATUS_STRUCT_LOC);</div><div class='add'>+</div><div class='add'>+	sig = readl(hs + offsetof(struct hcomm_status, sig_ver));</div><div class='add'>+	if ((sig &amp; HCOMM_STATUS_SIGNATURE_MASK) != HCOMM_STATUS_SIGNATURE_VAL) {</div><div class='add'>+		if (!bp-&gt;chip_num) {</div><div class='add'>+			__bnxt_map_fw_health_reg(bp, BNXT_GRC_REG_BASE);</div><div class='add'>+			bp-&gt;chip_num = readl(bp-&gt;bar0 +</div><div class='add'>+					     BNXT_FW_HEALTH_WIN_BASE +</div><div class='add'>+					     BNXT_GRC_REG_CHIP_NUM);</div><div class='add'>+		}</div><div class='add'>+		if (!BNXT_CHIP_P5_PLUS(bp))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		status_loc = BNXT_GRC_REG_STATUS_P5 |</div><div class='add'>+			     BNXT_FW_HEALTH_REG_TYPE_BAR0;</div><div class='add'>+	} else {</div><div class='add'>+		status_loc = readl(hs + offsetof(struct hcomm_status,</div><div class='add'>+						 fw_status_loc));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (__bnxt_alloc_fw_health(bp)) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "no memory for firmware status checks\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_health-&gt;regs[BNXT_FW_HEALTH_REG] = status_loc;</div><div class='add'>+	reg_type = BNXT_FW_HEALTH_REG_TYPE(status_loc);</div><div class='add'>+	if (reg_type == BNXT_FW_HEALTH_REG_TYPE_GRC) {</div><div class='add'>+		__bnxt_map_fw_health_reg(bp, status_loc);</div><div class='add'>+		bp-&gt;fw_health-&gt;mapped_regs[BNXT_FW_HEALTH_REG] =</div><div class='add'>+			BNXT_FW_HEALTH_WIN_OFF(status_loc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_health-&gt;status_reliable = true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_map_fw_health_regs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	u32 reg_base = 0xffffffff;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_health-&gt;status_reliable = false;</div><div class='add'>+	bp-&gt;fw_health-&gt;resets_reliable = false;</div><div class='add'>+	/* Only pre-map the monitoring GRC registers using window 3 */</div><div class='add'>+	for (i = 0; i &lt; 4; i++) {</div><div class='add'>+		u32 reg = fw_health-&gt;regs[i];</div><div class='add'>+</div><div class='add'>+		if (BNXT_FW_HEALTH_REG_TYPE(reg) != BNXT_FW_HEALTH_REG_TYPE_GRC)</div><div class='add'>+			continue;</div><div class='add'>+		if (reg_base == 0xffffffff)</div><div class='add'>+			reg_base = reg &amp; BNXT_GRC_BASE_MASK;</div><div class='add'>+		if ((reg &amp; BNXT_GRC_BASE_MASK) != reg_base)</div><div class='add'>+			return -ERANGE;</div><div class='add'>+		fw_health-&gt;mapped_regs[i] = BNXT_FW_HEALTH_WIN_OFF(reg);</div><div class='add'>+	}</div><div class='add'>+	bp-&gt;fw_health-&gt;status_reliable = true;</div><div class='add'>+	bp-&gt;fw_health-&gt;resets_reliable = true;</div><div class='add'>+	if (reg_base == 0xffffffff)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	__bnxt_map_fw_health_reg(bp, reg_base);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_remap_fw_health_regs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (!bp-&gt;fw_health)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY) {</div><div class='add'>+		bp-&gt;fw_health-&gt;status_reliable = true;</div><div class='add'>+		bp-&gt;fw_health-&gt;resets_reliable = true;</div><div class='add'>+	} else {</div><div class='add'>+		bnxt_try_map_fw_health_reg(bp);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_error_recovery_qcfg(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	struct hwrm_error_recovery_qcfg_output *resp;</div><div class='add'>+	struct hwrm_error_recovery_qcfg_input *req;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_ERROR_RECOVERY_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_recovery_out;</div><div class='add'>+	fw_health-&gt;flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+	if ((fw_health-&gt;flags &amp; ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU) &amp;&amp;</div><div class='add'>+	    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_KONG_MB_CHNL)) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto err_recovery_out;</div><div class='add'>+	}</div><div class='add'>+	fw_health-&gt;polling_dsecs = le32_to_cpu(resp-&gt;driver_polling_freq);</div><div class='add'>+	fw_health-&gt;master_func_wait_dsecs =</div><div class='add'>+		le32_to_cpu(resp-&gt;master_func_wait_period);</div><div class='add'>+	fw_health-&gt;normal_func_wait_dsecs =</div><div class='add'>+		le32_to_cpu(resp-&gt;normal_func_wait_period);</div><div class='add'>+	fw_health-&gt;post_reset_wait_dsecs =</div><div class='add'>+		le32_to_cpu(resp-&gt;master_func_wait_period_after_reset);</div><div class='add'>+	fw_health-&gt;post_reset_max_wait_dsecs =</div><div class='add'>+		le32_to_cpu(resp-&gt;max_bailout_time_after_reset);</div><div class='add'>+	fw_health-&gt;regs[BNXT_FW_HEALTH_REG] =</div><div class='add'>+		le32_to_cpu(resp-&gt;fw_health_status_reg);</div><div class='add'>+	fw_health-&gt;regs[BNXT_FW_HEARTBEAT_REG] =</div><div class='add'>+		le32_to_cpu(resp-&gt;fw_heartbeat_reg);</div><div class='add'>+	fw_health-&gt;regs[BNXT_FW_RESET_CNT_REG] =</div><div class='add'>+		le32_to_cpu(resp-&gt;fw_reset_cnt_reg);</div><div class='add'>+	fw_health-&gt;regs[BNXT_FW_RESET_INPROG_REG] =</div><div class='add'>+		le32_to_cpu(resp-&gt;reset_inprogress_reg);</div><div class='add'>+	fw_health-&gt;fw_reset_inprog_reg_mask =</div><div class='add'>+		le32_to_cpu(resp-&gt;reset_inprogress_reg_mask);</div><div class='add'>+	fw_health-&gt;fw_reset_seq_cnt = resp-&gt;reg_array_cnt;</div><div class='add'>+	if (fw_health-&gt;fw_reset_seq_cnt &gt;= 16) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto err_recovery_out;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; fw_health-&gt;fw_reset_seq_cnt; i++) {</div><div class='add'>+		fw_health-&gt;fw_reset_seq_regs[i] =</div><div class='add'>+			le32_to_cpu(resp-&gt;reset_reg[i]);</div><div class='add'>+		fw_health-&gt;fw_reset_seq_vals[i] =</div><div class='add'>+			le32_to_cpu(resp-&gt;reset_reg_val[i]);</div><div class='add'>+		fw_health-&gt;fw_reset_seq_delay_msec[i] =</div><div class='add'>+			resp-&gt;delay_after_reset[i];</div><div class='add'>+	}</div><div class='add'>+err_recovery_out:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = bnxt_map_fw_health_regs(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		bp-&gt;fw_cap &amp;= ~BNXT_FW_CAP_ERROR_RECOVERY;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_reset(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_reset_input req = {0};</div><div class='add'>+	struct hwrm_func_reset_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_RESET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_RESET, -1, -1);</div><div class='del'>-	req.enables = 0;</div><div class='add'>+	req-&gt;enables = 0;</div><div class='add'>+	hwrm_req_timeout(bp, req, HWRM_RESET_TIMEOUT);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_nvm_cfg_ver_get(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_dev_info_output nvm_info;</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_RESET_TIMEOUT);</div><div class='add'>+	if (!bnxt_hwrm_nvm_get_dev_info(bp, &amp;nvm_info))</div><div class='add'>+		snprintf(bp-&gt;nvm_cfg_ver, FW_VER_STR_LEN, "%d.%d.%d",</div><div class='add'>+			 nvm_info.nvm_cfg_ver_maj, nvm_info.nvm_cfg_ver_min,</div><div class='add'>+			 nvm_info.nvm_cfg_ver_upd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct hwrm_queue_qportcfg_input req = {0};</div><div class='del'>-	struct hwrm_queue_qportcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_queue_qportcfg_output *resp;</div><div class='add'>+	struct hwrm_queue_qportcfg_input *req;</div><div class='ctx'> 	u8 i, j, *qptr;</div><div class='ctx'> 	bool no_rdma;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_QPORTCFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_QPORTCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto qportcfg_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -6715,24 +10153,48 @@ static int bnxt_hwrm_queue_qportcfg(struct bnxt *bp)</div><div class='ctx'> 		bp-&gt;max_lltc = bp-&gt;max_tc;</div><div class='ctx'> </div><div class='ctx'> qportcfg_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='add'>+static int bnxt_hwrm_poll(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_ver_get_input *req;</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct hwrm_ver_get_input req = {0};</div><div class='del'>-	struct hwrm_ver_get_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	u32 dev_caps_cfg;</div><div class='ctx'> </div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VER_GET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;hwrm_intf_maj = HWRM_VERSION_MAJOR;</div><div class='add'>+	req-&gt;hwrm_intf_min = HWRM_VERSION_MINOR;</div><div class='add'>+	req-&gt;hwrm_intf_upd = HWRM_VERSION_UPDATE;</div><div class='add'>+</div><div class='add'>+	hwrm_req_flags(bp, req, BNXT_HWRM_CTX_SILENT | BNXT_HWRM_FULL_WAIT);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_ver_get_output *resp;</div><div class='add'>+	struct hwrm_ver_get_input *req;</div><div class='add'>+	u16 fw_maj, fw_min, fw_bld, fw_rsv;</div><div class='add'>+	u32 dev_caps_cfg, hwrm_ver;</div><div class='add'>+	int rc, len, max_tmo_secs;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VER_GET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	hwrm_req_flags(bp, req, BNXT_HWRM_FULL_WAIT);</div><div class='ctx'> 	bp-&gt;hwrm_max_req_len = HWRM_MAX_REQ_LEN;</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_VER_GET, -1, -1);</div><div class='del'>-	req.hwrm_intf_maj = HWRM_VERSION_MAJOR;</div><div class='del'>-	req.hwrm_intf_min = HWRM_VERSION_MINOR;</div><div class='del'>-	req.hwrm_intf_upd = HWRM_VERSION_UPDATE;</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;hwrm_intf_maj = HWRM_VERSION_MAJOR;</div><div class='add'>+	req-&gt;hwrm_intf_min = HWRM_VERSION_MINOR;</div><div class='add'>+	req-&gt;hwrm_intf_upd = HWRM_VERSION_UPDATE;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto hwrm_ver_get_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -6747,9 +10209,35 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='ctx'> 			    resp-&gt;hwrm_intf_upd_8b);</div><div class='ctx'> 		netdev_warn(bp-&gt;dev, "Please update firmware with HWRM interface 1.0.0 or newer.\n");</div><div class='ctx'> 	}</div><div class='del'>-	snprintf(bp-&gt;fw_ver_str, BC_HWRM_STR_LEN, "%d.%d.%d.%d",</div><div class='del'>-		 resp-&gt;hwrm_fw_maj_8b, resp-&gt;hwrm_fw_min_8b,</div><div class='del'>-		 resp-&gt;hwrm_fw_bld_8b, resp-&gt;hwrm_fw_rsvd_8b);</div><div class='add'>+</div><div class='add'>+	hwrm_ver = HWRM_VERSION_MAJOR &lt;&lt; 16 | HWRM_VERSION_MINOR &lt;&lt; 8 |</div><div class='add'>+			HWRM_VERSION_UPDATE;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &gt; hwrm_ver)</div><div class='add'>+		snprintf(bp-&gt;hwrm_ver_supp, FW_VER_STR_LEN, "%d.%d.%d",</div><div class='add'>+			 HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR,</div><div class='add'>+			 HWRM_VERSION_UPDATE);</div><div class='add'>+	else</div><div class='add'>+		snprintf(bp-&gt;hwrm_ver_supp, FW_VER_STR_LEN, "%d.%d.%d",</div><div class='add'>+			 resp-&gt;hwrm_intf_maj_8b, resp-&gt;hwrm_intf_min_8b,</div><div class='add'>+			 resp-&gt;hwrm_intf_upd_8b);</div><div class='add'>+</div><div class='add'>+	fw_maj = le16_to_cpu(resp-&gt;hwrm_fw_major);</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &gt; 0x10803 &amp;&amp; fw_maj) {</div><div class='add'>+		fw_min = le16_to_cpu(resp-&gt;hwrm_fw_minor);</div><div class='add'>+		fw_bld = le16_to_cpu(resp-&gt;hwrm_fw_build);</div><div class='add'>+		fw_rsv = le16_to_cpu(resp-&gt;hwrm_fw_patch);</div><div class='add'>+		len = FW_VER_STR_LEN;</div><div class='add'>+	} else {</div><div class='add'>+		fw_maj = resp-&gt;hwrm_fw_maj_8b;</div><div class='add'>+		fw_min = resp-&gt;hwrm_fw_min_8b;</div><div class='add'>+		fw_bld = resp-&gt;hwrm_fw_bld_8b;</div><div class='add'>+		fw_rsv = resp-&gt;hwrm_fw_rsvd_8b;</div><div class='add'>+		len = BC_HWRM_STR_LEN;</div><div class='add'>+	}</div><div class='add'>+	bp-&gt;fw_ver_code = BNXT_FW_VER_CODE(fw_maj, fw_min, fw_bld, fw_rsv);</div><div class='add'>+	snprintf(bp-&gt;fw_ver_str, len, "%d.%d.%d.%d", fw_maj, fw_min, fw_bld,</div><div class='add'>+		 fw_rsv);</div><div class='ctx'> </div><div class='ctx'> 	if (strlen(resp-&gt;active_pkg_name)) {</div><div class='ctx'> 		int fw_ver_len = strlen(bp-&gt;fw_ver_str);</div><div class='hunk'>@@ -6763,6 +10251,17 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='ctx'> 	bp-&gt;hwrm_cmd_timeout = le16_to_cpu(resp-&gt;def_req_timeout);</div><div class='ctx'> 	if (!bp-&gt;hwrm_cmd_timeout)</div><div class='ctx'> 		bp-&gt;hwrm_cmd_timeout = DFLT_HWRM_CMD_TIMEOUT;</div><div class='add'>+	bp-&gt;hwrm_cmd_max_timeout = le16_to_cpu(resp-&gt;max_req_timeout) * 1000;</div><div class='add'>+	if (!bp-&gt;hwrm_cmd_max_timeout)</div><div class='add'>+		bp-&gt;hwrm_cmd_max_timeout = HWRM_CMD_MAX_TIMEOUT;</div><div class='add'>+	max_tmo_secs = bp-&gt;hwrm_cmd_max_timeout / 1000;</div><div class='add'>+#ifdef CONFIG_DETECT_HUNG_TASK</div><div class='add'>+	if (bp-&gt;hwrm_cmd_max_timeout &gt; HWRM_CMD_MAX_TIMEOUT ||</div><div class='add'>+	    max_tmo_secs &gt; CONFIG_DEFAULT_HUNG_TASK_TIMEOUT) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Device requests max timeout of %d seconds, may trigger hung task watchdog (kernel default %ds)\n",</div><div class='add'>+			    max_tmo_secs, CONFIG_DEFAULT_HUNG_TASK_TIMEOUT);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	if (resp-&gt;hwrm_intf_maj_8b &gt;= 1) {</div><div class='ctx'> 		bp-&gt;hwrm_max_req_len = le16_to_cpu(resp-&gt;max_req_win_len);</div><div class='hunk'>@@ -6772,6 +10271,7 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='ctx'> 		bp-&gt;hwrm_max_ext_req_len = HWRM_MAX_REQ_LEN;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;chip_num = le16_to_cpu(resp-&gt;chip_num);</div><div class='add'>+	bp-&gt;chip_rev = resp-&gt;chip_rev;</div><div class='ctx'> 	if (bp-&gt;chip_num == CHIP_NUM_58700 &amp;&amp; !resp-&gt;chip_rev &amp;&amp;</div><div class='ctx'> 	    !resp-&gt;chip_metal)</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_CHIP_NITRO_A0;</div><div class='hunk'>@@ -6797,53 +10297,148 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp)</div><div class='ctx'> 		bp-&gt;fw_cap |= BNXT_FW_CAP_CFA_ADV_FLOW;</div><div class='ctx'> </div><div class='ctx'> hwrm_ver_get_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_fw_set_time(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_fw_set_time_input req = {0};</div><div class='add'>+	struct hwrm_fw_set_time_input *req;</div><div class='ctx'> 	struct tm tm;</div><div class='ctx'> 	time64_t now = ktime_get_real_seconds();</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if ((BNXT_VF(bp) &amp;&amp; bp-&gt;hwrm_spec_code &lt; 0x10901) ||</div><div class='ctx'> 	    bp-&gt;hwrm_spec_code &lt; 0x10400)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	time64_to_tm(now, 0, &amp;tm);</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FW_SET_TIME, -1, -1);</div><div class='del'>-	req.year = cpu_to_le16(1900 + tm.tm_year);</div><div class='del'>-	req.month = 1 + tm.tm_mon;</div><div class='del'>-	req.day = tm.tm_mday;</div><div class='del'>-	req.hour = tm.tm_hour;</div><div class='del'>-	req.minute = tm.tm_min;</div><div class='del'>-	req.second = tm.tm_sec;</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FW_SET_TIME);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;year = cpu_to_le16(1900 + tm.tm_year);</div><div class='add'>+	req-&gt;month = 1 + tm.tm_mon;</div><div class='add'>+	req-&gt;day = tm.tm_mday;</div><div class='add'>+	req-&gt;hour = tm.tm_hour;</div><div class='add'>+	req-&gt;minute = tm.tm_min;</div><div class='add'>+	req-&gt;second = tm.tm_sec;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_port_qstats(struct bnxt *bp)</div><div class='add'>+static void bnxt_add_one_ctr(u64 hw, u64 *sw, u64 mask)</div><div class='ctx'> {</div><div class='del'>-	int rc;</div><div class='add'>+	u64 sw_tmp;</div><div class='add'>+</div><div class='add'>+	hw &amp;= mask;</div><div class='add'>+	sw_tmp = (*sw &amp; ~mask) | hw;</div><div class='add'>+	if (hw &lt; (*sw &amp; mask))</div><div class='add'>+		sw_tmp += mask + 1;</div><div class='add'>+	WRITE_ONCE(*sw, sw_tmp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bnxt_accumulate_stats(__le64 *hw_stats, u64 *sw_stats, u64 *masks,</div><div class='add'>+				    int count, bool ignore_zero)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		u64 hw = le64_to_cpu(READ_ONCE(hw_stats[i]));</div><div class='add'>+</div><div class='add'>+		if (ignore_zero &amp;&amp; !hw)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (masks[i] == -1ULL)</div><div class='add'>+			sw_stats[i] = hw;</div><div class='add'>+		else</div><div class='add'>+			bnxt_add_one_ctr(hw, &amp;sw_stats[i], masks[i]);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_accumulate_stats(struct bnxt_stats_mem *stats)</div><div class='add'>+{</div><div class='add'>+	if (!stats-&gt;hw_stats)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__bnxt_accumulate_stats(stats-&gt;hw_stats, stats-&gt;sw_stats,</div><div class='add'>+				stats-&gt;hw_masks, stats-&gt;len / 8, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_accumulate_all_stats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_stats_mem *ring0_stats;</div><div class='add'>+	bool ignore_zero = false;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Chip bug.  Counter intermittently becomes 0. */</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		ignore_zero = true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='add'>+		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='add'>+		struct bnxt_cp_ring_info *cpr;</div><div class='add'>+		struct bnxt_stats_mem *stats;</div><div class='add'>+</div><div class='add'>+		cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+		stats = &amp;cpr-&gt;stats;</div><div class='add'>+		if (!i)</div><div class='add'>+			ring0_stats = stats;</div><div class='add'>+		__bnxt_accumulate_stats(stats-&gt;hw_stats, stats-&gt;sw_stats,</div><div class='add'>+					ring0_stats-&gt;hw_masks,</div><div class='add'>+					ring0_stats-&gt;len / 8, ignore_zero);</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS) {</div><div class='add'>+		struct bnxt_stats_mem *stats = &amp;bp-&gt;port_stats;</div><div class='add'>+		__le64 *hw_stats = stats-&gt;hw_stats;</div><div class='add'>+		u64 *sw_stats = stats-&gt;sw_stats;</div><div class='add'>+		u64 *masks = stats-&gt;hw_masks;</div><div class='add'>+		int cnt;</div><div class='add'>+</div><div class='add'>+		cnt = sizeof(struct rx_port_stats) / 8;</div><div class='add'>+		__bnxt_accumulate_stats(hw_stats, sw_stats, masks, cnt, false);</div><div class='add'>+</div><div class='add'>+		hw_stats += BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+		sw_stats += BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+		masks += BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+		cnt = sizeof(struct tx_port_stats) / 8;</div><div class='add'>+		__bnxt_accumulate_stats(hw_stats, sw_stats, masks, cnt, false);</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT) {</div><div class='add'>+		bnxt_accumulate_stats(&amp;bp-&gt;rx_port_stats_ext);</div><div class='add'>+		bnxt_accumulate_stats(&amp;bp-&gt;tx_port_stats_ext);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_port_qstats(struct bnxt *bp, u8 flags)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_qstats_input *req;</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='del'>-	struct hwrm_port_qstats_input req = {0};</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_QSTATS, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='del'>-	req.tx_stat_host_addr = cpu_to_le64(bp-&gt;hw_tx_port_stats_map);</div><div class='del'>-	req.rx_stat_host_addr = cpu_to_le64(bp-&gt;hw_rx_port_stats_map);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	return rc;</div><div class='add'>+	if (flags &amp;&amp; !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_QSTATS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = flags;</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='add'>+	req-&gt;tx_stat_host_addr = cpu_to_le64(bp-&gt;port_stats.hw_stats_map +</div><div class='add'>+					    BNXT_TX_PORT_STATS_BYTE_OFFSET);</div><div class='add'>+	req-&gt;rx_stat_host_addr = cpu_to_le64(bp-&gt;port_stats.hw_stats_map);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)</div><div class='add'>+static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp, u8 flags)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_qstats_ext_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_queue_pri2cos_qcfg_input req2 = {0};</div><div class='del'>-	struct hwrm_port_qstats_ext_input req = {0};</div><div class='add'>+	struct hwrm_queue_pri2cos_qcfg_output *resp_qc;</div><div class='add'>+	struct hwrm_queue_pri2cos_qcfg_input *req_qc;</div><div class='add'>+	struct hwrm_port_qstats_ext_output *resp_qs;</div><div class='add'>+	struct hwrm_port_qstats_ext_input *req_qs;</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> 	u32 tx_stat_size;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -6851,81 +10446,89 @@ static int bnxt_hwrm_port_qstats_ext(struct bnxt *bp)</div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_QSTATS_EXT, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='del'>-	req.rx_stat_size = cpu_to_le16(sizeof(struct rx_port_stats_ext));</div><div class='del'>-	req.rx_stat_host_addr = cpu_to_le64(bp-&gt;hw_rx_port_stats_ext_map);</div><div class='del'>-	tx_stat_size = bp-&gt;hw_tx_port_stats_ext ?</div><div class='del'>-		       sizeof(*bp-&gt;hw_tx_port_stats_ext) : 0;</div><div class='del'>-	req.tx_stat_size = cpu_to_le16(tx_stat_size);</div><div class='del'>-	req.tx_stat_host_addr = cpu_to_le64(bp-&gt;hw_tx_port_stats_ext_map);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	if (flags &amp;&amp; !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req_qs, HWRM_PORT_QSTATS_EXT);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req_qs-&gt;flags = flags;</div><div class='add'>+	req_qs-&gt;port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='add'>+	req_qs-&gt;rx_stat_size = cpu_to_le16(sizeof(struct rx_port_stats_ext));</div><div class='add'>+	req_qs-&gt;rx_stat_host_addr = cpu_to_le64(bp-&gt;rx_port_stats_ext.hw_stats_map);</div><div class='add'>+	tx_stat_size = bp-&gt;tx_port_stats_ext.hw_stats ?</div><div class='add'>+		       sizeof(struct tx_port_stats_ext) : 0;</div><div class='add'>+	req_qs-&gt;tx_stat_size = cpu_to_le16(tx_stat_size);</div><div class='add'>+	req_qs-&gt;tx_stat_host_addr = cpu_to_le64(bp-&gt;tx_port_stats_ext.hw_stats_map);</div><div class='add'>+	resp_qs = hwrm_req_hold(bp, req_qs);</div><div class='add'>+	rc = hwrm_req_send(bp, req_qs);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		bp-&gt;fw_rx_stats_ext_size = le16_to_cpu(resp-&gt;rx_stat_size) / 8;</div><div class='add'>+		bp-&gt;fw_rx_stats_ext_size =</div><div class='add'>+			le16_to_cpu(resp_qs-&gt;rx_stat_size) / 8;</div><div class='add'>+		if (BNXT_FW_MAJ(bp) &lt; 220 &amp;&amp;</div><div class='add'>+		    bp-&gt;fw_rx_stats_ext_size &gt; BNXT_RX_STATS_EXT_NUM_LEGACY)</div><div class='add'>+			bp-&gt;fw_rx_stats_ext_size = BNXT_RX_STATS_EXT_NUM_LEGACY;</div><div class='add'>+</div><div class='ctx'> 		bp-&gt;fw_tx_stats_ext_size = tx_stat_size ?</div><div class='del'>-			le16_to_cpu(resp-&gt;tx_stat_size) / 8 : 0;</div><div class='add'>+			le16_to_cpu(resp_qs-&gt;tx_stat_size) / 8 : 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bp-&gt;fw_rx_stats_ext_size = 0;</div><div class='ctx'> 		bp-&gt;fw_tx_stats_ext_size = 0;</div><div class='ctx'> 	}</div><div class='add'>+	hwrm_req_drop(bp, req_qs);</div><div class='add'>+</div><div class='add'>+	if (flags)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;fw_tx_stats_ext_size &lt;=</div><div class='ctx'> 	    offsetof(struct tx_port_stats_ext, pfc_pri0_tx_duration_us) / 8) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 		bp-&gt;pri2cos_valid = 0;</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req2, HWRM_QUEUE_PRI2COS_QCFG, -1, -1);</div><div class='del'>-	req2.flags = cpu_to_le32(QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN);</div><div class='add'>+	rc = hwrm_req_init(bp, req_qc, HWRM_QUEUE_PRI2COS_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req2, sizeof(req2), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req_qc-&gt;flags = cpu_to_le32(QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN);</div><div class='add'>+</div><div class='add'>+	resp_qc = hwrm_req_hold(bp, req_qc);</div><div class='add'>+	rc = hwrm_req_send(bp, req_qc);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		struct hwrm_queue_pri2cos_qcfg_output *resp2;</div><div class='ctx'> 		u8 *pri2cos;</div><div class='ctx'> 		int i, j;</div><div class='ctx'> </div><div class='del'>-		resp2 = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-		pri2cos = &amp;resp2-&gt;pri0_cos_queue_id;</div><div class='add'>+		pri2cos = &amp;resp_qc-&gt;pri0_cos_queue_id;</div><div class='ctx'> 		for (i = 0; i &lt; 8; i++) {</div><div class='ctx'> 			u8 queue_id = pri2cos[i];</div><div class='add'>+			u8 queue_idx;</div><div class='ctx'> </div><div class='add'>+			/* Per port queue IDs start from 0, 10, 20, etc */</div><div class='add'>+			queue_idx = queue_id % 10;</div><div class='add'>+			if (queue_idx &gt; BNXT_MAX_QUEUE) {</div><div class='add'>+				bp-&gt;pri2cos_valid = false;</div><div class='add'>+				hwrm_req_drop(bp, req_qc);</div><div class='add'>+				return rc;</div><div class='add'>+			}</div><div class='ctx'> 			for (j = 0; j &lt; bp-&gt;max_q; j++) {</div><div class='ctx'> 				if (bp-&gt;q_ids[j] == queue_id)</div><div class='del'>-					bp-&gt;pri2cos[i] = j;</div><div class='add'>+					bp-&gt;pri2cos_idx[i] = queue_idx;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		bp-&gt;pri2cos_valid = 1;</div><div class='add'>+		bp-&gt;pri2cos_valid = true;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='add'>+	hwrm_req_drop(bp, req_qc);</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_pcie_qstats(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_pcie_qstats_input req = {0};</div><div class='del'>-</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PCIE_QSTATS, -1, -1);</div><div class='del'>-	req.pcie_stat_size = cpu_to_le16(sizeof(struct pcie_ctx_hw_stats));</div><div class='del'>-	req.pcie_stat_host_addr = cpu_to_le64(bp-&gt;hw_pcie_stats_map);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_hwrm_free_tunnel_ports(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;vxlan_port_cnt) {</div><div class='del'>-		bnxt_hwrm_tunnel_dst_port_free(</div><div class='del'>-			bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN);</div><div class='del'>-	}</div><div class='del'>-	bp-&gt;vxlan_port_cnt = 0;</div><div class='del'>-	if (bp-&gt;nge_port_cnt) {</div><div class='del'>-		bnxt_hwrm_tunnel_dst_port_free(</div><div class='del'>-			bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE);</div><div class='del'>-	}</div><div class='del'>-	bp-&gt;nge_port_cnt = 0;</div><div class='add'>+	bnxt_hwrm_tunnel_dst_port_free(bp,</div><div class='add'>+		TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN);</div><div class='add'>+	bnxt_hwrm_tunnel_dst_port_free(bp,</div><div class='add'>+		TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa)</div><div class='hunk'>@@ -6935,8 +10538,10 @@ static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa)</div><div class='ctx'> </div><div class='ctx'> 	if (set_tpa)</div><div class='ctx'> 		tpa_flags = bp-&gt;flags &amp; BNXT_FLAG_TPA;</div><div class='add'>+	else if (BNXT_NO_FW_ACCESS(bp))</div><div class='add'>+		return 0;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;nr_vnics; i++) {</div><div class='del'>-		rc = bnxt_hwrm_vnic_set_tpa(bp, i, tpa_flags);</div><div class='add'>+		rc = bnxt_hwrm_vnic_set_tpa(bp, &amp;bp-&gt;vnic_info[i], tpa_flags);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "hwrm vnic set tpa failure rc for vnic %d: %x\n",</div><div class='ctx'> 				   i, rc);</div><div class='hunk'>@@ -6951,22 +10556,32 @@ static void bnxt_hwrm_clear_vnic_rss(struct bnxt *bp)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;nr_vnics; i++)</div><div class='del'>-		bnxt_hwrm_vnic_set_rss(bp, i, false);</div><div class='add'>+		bnxt_hwrm_vnic_set_rss(bp, &amp;bp-&gt;vnic_info[i], false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_hwrm_resource_free(struct bnxt *bp, bool close_path,</div><div class='del'>-				    bool irq_re_init)</div><div class='add'>+static void bnxt_clear_vnic(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;vnic_info) {</div><div class='del'>-		bnxt_hwrm_clear_vnic_filter(bp);</div><div class='add'>+	if (!bp-&gt;vnic_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_clear_vnic_filter(bp);</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)) {</div><div class='ctx'> 		/* clear all RSS setting before free vnic ctx */</div><div class='ctx'> 		bnxt_hwrm_clear_vnic_rss(bp);</div><div class='ctx'> 		bnxt_hwrm_vnic_ctx_free(bp);</div><div class='del'>-		/* before free the vnic, undo the vnic tpa settings */</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='del'>-			bnxt_set_tpa(bp, false);</div><div class='del'>-		bnxt_hwrm_vnic_free(bp);</div><div class='ctx'> 	}</div><div class='add'>+	/* before free the vnic, undo the vnic tpa settings */</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		bnxt_set_tpa(bp, false);</div><div class='add'>+	bnxt_hwrm_vnic_free(bp);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		bnxt_hwrm_vnic_ctx_free(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_resource_free(struct bnxt *bp, bool close_path,</div><div class='add'>+				    bool irq_re_init)</div><div class='add'>+{</div><div class='add'>+	bnxt_clear_vnic(bp);</div><div class='ctx'> 	bnxt_hwrm_ring_free(bp, close_path);</div><div class='ctx'> 	bnxt_hwrm_ring_grp_free(bp);</div><div class='ctx'> 	if (irq_re_init) {</div><div class='hunk'>@@ -6977,67 +10592,69 @@ static void bnxt_hwrm_resource_free(struct bnxt *bp, bool close_path,</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_set_br_mode(struct bnxt *bp, u16 br_mode)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	u8 evb_mode;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='del'>-	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_EVB_MODE);</div><div class='ctx'> 	if (br_mode == BRIDGE_MODE_VEB)</div><div class='del'>-		req.evb_mode = FUNC_CFG_REQ_EVB_MODE_VEB;</div><div class='add'>+		evb_mode = FUNC_CFG_REQ_EVB_MODE_VEB;</div><div class='ctx'> 	else if (br_mode == BRIDGE_MODE_VEPA)</div><div class='del'>-		req.evb_mode = FUNC_CFG_REQ_EVB_MODE_VEPA;</div><div class='add'>+		evb_mode = FUNC_CFG_REQ_EVB_MODE_VEPA;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	return rc;</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_EVB_MODE);</div><div class='add'>+	req-&gt;evb_mode = evb_mode;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_set_cache_line_size(struct bnxt *bp, int size)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_VF(bp) || bp-&gt;hwrm_spec_code &lt; 0x10803)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='del'>-	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_CACHE_LINESIZE);</div><div class='del'>-	req.options = FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_64;</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_CACHE_LINESIZE);</div><div class='add'>+	req-&gt;options = FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_64;</div><div class='ctx'> 	if (size == 128)</div><div class='del'>-		req.options = FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_128;</div><div class='add'>+		req-&gt;options = FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_128;</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	return rc;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __bnxt_setup_vnic(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+static int __bnxt_setup_vnic(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (vnic-&gt;flags &amp; BNXT_VNIC_RFS_NEW_RSS_FLAG)</div><div class='ctx'> 		goto skip_rss_ctx;</div><div class='ctx'> </div><div class='ctx'> 	/* allocate context for vnic */</div><div class='del'>-	rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic_id, 0);</div><div class='add'>+	rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, 0);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm vnic %d alloc failure rc: %x\n",</div><div class='del'>-			   vnic_id, rc);</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='ctx'> 		goto vnic_setup_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;rsscos_nr_ctxs++;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {</div><div class='del'>-		rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic_id, 1);</div><div class='add'>+		rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, 1);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "hwrm vnic %d cos ctx alloc failure rc: %x\n",</div><div class='del'>-				   vnic_id, rc);</div><div class='add'>+				   vnic-&gt;vnic_id, rc);</div><div class='ctx'> 			goto vnic_setup_err;</div><div class='ctx'> 		}</div><div class='ctx'> 		bp-&gt;rsscos_nr_ctxs++;</div><div class='hunk'>@@ -7045,26 +10662,26 @@ static int __bnxt_setup_vnic(struct bnxt *bp, u16 vnic_id)</div><div class='ctx'> </div><div class='ctx'> skip_rss_ctx:</div><div class='ctx'> 	/* configure default vnic, ring grp */</div><div class='del'>-	rc = bnxt_hwrm_vnic_cfg(bp, vnic_id);</div><div class='add'>+	rc = bnxt_hwrm_vnic_cfg(bp, vnic);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm vnic %d cfg failure rc: %x\n",</div><div class='del'>-			   vnic_id, rc);</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='ctx'> 		goto vnic_setup_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable RSS hashing on vnic */</div><div class='del'>-	rc = bnxt_hwrm_vnic_set_rss(bp, vnic_id, true);</div><div class='add'>+	rc = bnxt_hwrm_vnic_set_rss(bp, vnic, true);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm vnic %d set rss failure rc: %x\n",</div><div class='del'>-			   vnic_id, rc);</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='ctx'> 		goto vnic_setup_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS) {</div><div class='del'>-		rc = bnxt_hwrm_vnic_set_hds(bp, vnic_id);</div><div class='add'>+		rc = bnxt_hwrm_vnic_set_hds(bp, vnic);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "hwrm vnic %d set hds failure rc: %x\n",</div><div class='del'>-				   vnic_id, rc);</div><div class='add'>+				   vnic-&gt;vnic_id, rc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7072,16 +10689,53 @@ vnic_setup_err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int __bnxt_setup_vnic_p5(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+int bnxt_hwrm_vnic_update(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+			  u8 valid)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_vnic_update_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_VNIC_UPDATE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;vnic_id = cpu_to_le32(vnic-&gt;fw_vnic_id);</div><div class='add'>+</div><div class='add'>+	if (valid &amp; VNIC_UPDATE_REQ_ENABLES_MRU_VALID)</div><div class='add'>+		req-&gt;mru = cpu_to_le16(vnic-&gt;mru);</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = cpu_to_le32(valid);</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_hwrm_vnic_rss_cfg_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_vnic_set_rss_p5(bp, vnic, true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm vnic %d set rss failure rc: %d\n",</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = bnxt_hwrm_vnic_cfg(bp, vnic);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm vnic %d cfg failure rc: %x\n",</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __bnxt_setup_vnic_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='ctx'> {</div><div class='ctx'> 	int rc, i, nr_ctxs;</div><div class='ctx'> </div><div class='del'>-	nr_ctxs = DIV_ROUND_UP(bp-&gt;rx_nr_rings, 64);</div><div class='add'>+	nr_ctxs = bnxt_get_nr_rss_ctxs(bp, bp-&gt;rx_nr_rings);</div><div class='ctx'> 	for (i = 0; i &lt; nr_ctxs; i++) {</div><div class='del'>-		rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic_id, i);</div><div class='add'>+		rc = bnxt_hwrm_vnic_ctx_alloc(bp, vnic, i);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "hwrm vnic %d ctx %d alloc failure rc: %x\n",</div><div class='del'>-				   vnic_id, i, rc);</div><div class='add'>+				   vnic-&gt;vnic_id, i, rc);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		bp-&gt;rsscos_nr_ctxs++;</div><div class='hunk'>@@ -7089,43 +10743,57 @@ static int __bnxt_setup_vnic_p5(struct bnxt *bp, u16 vnic_id)</div><div class='ctx'> 	if (i &lt; nr_ctxs)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_vnic_set_rss_p5(bp, vnic_id, true);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm vnic %d set rss failure rc: %d\n",</div><div class='del'>-			   vnic_id, rc);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='del'>-	rc = bnxt_hwrm_vnic_cfg(bp, vnic_id);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm vnic %d cfg failure rc: %x\n",</div><div class='del'>-			   vnic_id, rc);</div><div class='add'>+	rc = bnxt_hwrm_vnic_rss_cfg_p5(bp, vnic);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS) {</div><div class='del'>-		rc = bnxt_hwrm_vnic_set_hds(bp, vnic_id);</div><div class='add'>+		rc = bnxt_hwrm_vnic_set_hds(bp, vnic);</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "hwrm vnic %d set hds failure rc: %x\n",</div><div class='del'>-				   vnic_id, rc);</div><div class='add'>+				   vnic-&gt;vnic_id, rc);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_setup_vnic(struct bnxt *bp, u16 vnic_id)</div><div class='add'>+static int bnxt_setup_vnic(struct bnxt *bp, struct bnxt_vnic_info *vnic)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-		return __bnxt_setup_vnic_p5(bp, vnic_id);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		return __bnxt_setup_vnic_p5(bp, vnic);</div><div class='ctx'> 	else</div><div class='del'>-		return __bnxt_setup_vnic(bp, vnic_id);</div><div class='add'>+		return __bnxt_setup_vnic(bp, vnic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_and_setup_vnic(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_vnic_info *vnic,</div><div class='add'>+				     u16 start_rx_ring_idx, int rx_rings)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_vnic_alloc(bp, vnic, start_rx_ring_idx, rx_rings);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm vnic %d alloc failure rc: %x\n",</div><div class='add'>+			   vnic-&gt;vnic_id, rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	return bnxt_setup_vnic(bp, vnic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_alloc_rfs_vnics(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='ctx'> 	int i, rc = 0;</div><div class='ctx'> </div><div class='add'>+	if (BNXT_SUPPORTS_NTUPLE_VNIC(bp)) {</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_NTUPLE];</div><div class='add'>+		return bnxt_alloc_and_setup_vnic(bp, vnic, 0, bp-&gt;rx_nr_rings);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='del'>-		struct bnxt_vnic_info *vnic;</div><div class='ctx'> 		u16 vnic_id = i + 1;</div><div class='ctx'> 		u16 ring_id = i;</div><div class='ctx'> </div><div class='hunk'>@@ -7134,29 +10802,155 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 		vnic = &amp;bp-&gt;vnic_info[vnic_id];</div><div class='ctx'> 		vnic-&gt;flags |= BNXT_VNIC_RFS_FLAG;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_NEW_RSS_CAP)</div><div class='add'>+		if (bp-&gt;rss_cap &amp; BNXT_RSS_CAP_NEW_RSS_CAP)</div><div class='ctx'> 			vnic-&gt;flags |= BNXT_VNIC_RFS_NEW_RSS_FLAG;</div><div class='del'>-		rc = bnxt_hwrm_vnic_alloc(bp, vnic_id, ring_id, 1);</div><div class='del'>-		if (rc) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "hwrm vnic %d alloc failure rc: %x\n",</div><div class='del'>-				   vnic_id, rc);</div><div class='add'>+		if (bnxt_alloc_and_setup_vnic(bp, &amp;bp-&gt;vnic_info[vnic_id], ring_id, 1))</div><div class='ctx'> 			break;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,</div><div class='add'>+			  bool all)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;rss_ctx-&gt;vnic;</div><div class='add'>+	struct bnxt_filter_base *usr_fltr, *tmp;</div><div class='add'>+	struct bnxt_ntuple_filter *ntp_fltr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (netif_running(bp-&gt;dev)) {</div><div class='add'>+		bnxt_hwrm_vnic_free_one(bp, &amp;rss_ctx-&gt;vnic);</div><div class='add'>+		for (i = 0; i &lt; BNXT_MAX_CTX_PER_VNIC; i++) {</div><div class='add'>+			if (vnic-&gt;fw_rss_cos_lb_ctx[i] != INVALID_HW_RING_ID)</div><div class='add'>+				bnxt_hwrm_vnic_ctx_free_one(bp, vnic, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (!all)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(usr_fltr, tmp, &amp;bp-&gt;usr_fltr_list, list) {</div><div class='add'>+		if ((usr_fltr-&gt;flags &amp; BNXT_ACT_RSS_CTX) &amp;&amp;</div><div class='add'>+		    usr_fltr-&gt;fw_vnic_id == rss_ctx-&gt;index) {</div><div class='add'>+			ntp_fltr = container_of(usr_fltr,</div><div class='add'>+						struct bnxt_ntuple_filter,</div><div class='add'>+						base);</div><div class='add'>+			bnxt_hwrm_cfa_ntuple_filter_free(bp, ntp_fltr);</div><div class='add'>+			bnxt_del_ntp_filter(bp, ntp_fltr);</div><div class='add'>+			bnxt_del_one_usr_fltr(bp, usr_fltr);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vnic-&gt;rss_table)</div><div class='add'>+		dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, vnic-&gt;rss_table_size,</div><div class='add'>+				  vnic-&gt;rss_table,</div><div class='add'>+				  vnic-&gt;rss_table_dma_addr);</div><div class='add'>+	bp-&gt;num_rss_ctx--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_vnic_has_rx_ring(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+				  int rxr_id)</div><div class='add'>+{</div><div class='add'>+	u16 tbl_size = bnxt_get_rxfh_indir_size(bp-&gt;dev);</div><div class='add'>+	int i, vnic_rx;</div><div class='add'>+</div><div class='add'>+	/* Ntuple VNIC always has all the rx rings. Any change of ring id</div><div class='add'>+	 * must be updated because a future filter may use it.</div><div class='add'>+	 */</div><div class='add'>+	if (vnic-&gt;flags &amp; BNXT_VNIC_NTUPLE_FLAG)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++) {</div><div class='add'>+		if (vnic-&gt;flags &amp; BNXT_VNIC_RSSCTX_FLAG)</div><div class='add'>+			vnic_rx = ethtool_rxfh_context_indir(vnic-&gt;rss_ctx)[i];</div><div class='add'>+		else</div><div class='add'>+			vnic_rx = bp-&gt;rss_indir_tbl[i];</div><div class='add'>+</div><div class='add'>+		if (rxr_id == vnic_rx)</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_vnic_mru_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+				u16 mru, int rxr_id)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bnxt_vnic_has_rx_ring(bp, vnic, rxr_id))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mru) {</div><div class='add'>+		rc = bnxt_hwrm_vnic_set_rss_p5(bp, vnic, true);</div><div class='add'>+		if (rc) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "hwrm vnic %d set rss failure rc: %d\n",</div><div class='add'>+				   vnic-&gt;vnic_id, rc);</div><div class='add'>+			return rc;</div><div class='ctx'> 		}</div><div class='del'>-		rc = bnxt_setup_vnic(bp, vnic_id);</div><div class='add'>+	}</div><div class='add'>+	vnic-&gt;mru = mru;</div><div class='add'>+	bnxt_hwrm_vnic_update(bp, vnic,</div><div class='add'>+			      VNIC_UPDATE_REQ_ENABLES_MRU_VALID);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_rss_ctx_vnic_mru(struct bnxt *bp, u16 mru, int rxr_id)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	unsigned long context;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;bp-&gt;dev-&gt;ethtool-&gt;rss_ctx, context, ctx) {</div><div class='add'>+		struct bnxt_rss_ctx *rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+		struct bnxt_vnic_info *vnic = &amp;rss_ctx-&gt;vnic;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_set_vnic_mru_p5(bp, vnic, mru, rxr_id);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			break;</div><div class='add'>+			return rc;</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='del'>-#else</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Allow PF and VF with default VLAN to be in promiscuous mode */</div><div class='add'>+static void bnxt_hwrm_realloc_rss_ctx_vnic(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	bool set_tpa = !!(bp-&gt;flags &amp; BNXT_FLAG_TPA);</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	unsigned long context;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;bp-&gt;dev-&gt;ethtool-&gt;rss_ctx, context, ctx) {</div><div class='add'>+		struct bnxt_rss_ctx *rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+		struct bnxt_vnic_info *vnic = &amp;rss_ctx-&gt;vnic;</div><div class='add'>+</div><div class='add'>+		if (bnxt_hwrm_vnic_alloc(bp, vnic, 0, bp-&gt;rx_nr_rings) ||</div><div class='add'>+		    bnxt_hwrm_vnic_set_tpa(bp, vnic, set_tpa) ||</div><div class='add'>+		    __bnxt_setup_vnic_p5(bp, vnic)) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Failed to restore RSS ctx %d\n",</div><div class='add'>+				   rss_ctx-&gt;index);</div><div class='add'>+			bnxt_del_one_rss_ctx(bp, rss_ctx, true);</div><div class='add'>+			ethtool_rxfh_context_lost(bp-&gt;dev, rss_ctx-&gt;index);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_clear_rss_ctxs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+	unsigned long context;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;bp-&gt;dev-&gt;ethtool-&gt;rss_ctx, context, ctx) {</div><div class='add'>+		struct bnxt_rss_ctx *rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+</div><div class='add'>+		bnxt_del_one_rss_ctx(bp, rss_ctx, false);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allow PF, trusted VFs and VFs with default VLAN to be in promiscuous mode */</div><div class='ctx'> static bool bnxt_promisc_ok(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='del'>-	if (BNXT_VF(bp) &amp;&amp; !bp-&gt;vf.vlan)</div><div class='add'>+	if (BNXT_VF(bp) &amp;&amp; !bp-&gt;vf.vlan &amp;&amp; !bnxt_is_trusted_vf(bp, &amp;bp-&gt;vf))</div><div class='ctx'> 		return false;</div><div class='ctx'> #endif</div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -7164,16 +10958,17 @@ static bool bnxt_promisc_ok(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_setup_nitroa0_vnic(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[1];</div><div class='ctx'> 	unsigned int rc = 0;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_vnic_alloc(bp, 1, bp-&gt;rx_nr_rings - 1, 1);</div><div class='add'>+	rc = bnxt_hwrm_vnic_alloc(bp, vnic, bp-&gt;rx_nr_rings - 1, 1);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "Cannot allocate special vnic for NS2 A0: %x\n",</div><div class='ctx'> 			   rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_vnic_cfg(bp, 1);</div><div class='add'>+	rc = bnxt_hwrm_vnic_cfg(bp, vnic);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "Cannot allocate special vnic for NS2 A0: %x\n",</div><div class='ctx'> 			   rc);</div><div class='hunk'>@@ -7187,7 +10982,7 @@ static bool bnxt_mc_list_updated(struct bnxt *, u32 *);</div><div class='ctx'> </div><div class='ctx'> static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	unsigned int rx_nr_rings = bp-&gt;rx_nr_rings;</div><div class='ctx'> </div><div class='hunk'>@@ -7216,15 +11011,20 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 		rx_nr_rings--;</div><div class='ctx'> </div><div class='ctx'> 	/* default vnic 0 */</div><div class='del'>-	rc = bnxt_hwrm_vnic_alloc(bp, 0, 0, rx_nr_rings);</div><div class='add'>+	rc = bnxt_hwrm_vnic_alloc(bp, vnic, 0, rx_nr_rings);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm vnic alloc failure rc: %x\n", rc);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_setup_vnic(bp, 0);</div><div class='add'>+	if (BNXT_VF(bp))</div><div class='add'>+		bnxt_hwrm_func_qcfg(bp);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_setup_vnic(bp, vnic);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out;</div><div class='add'>+	if (bp-&gt;rss_cap &amp; BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA)</div><div class='add'>+		bnxt_hwrm_update_rss_hash_cfg(bp);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_RFS) {</div><div class='ctx'> 		rc = bnxt_alloc_rfs_vnics(bp);</div><div class='hunk'>@@ -7244,22 +11044,28 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 	/* Filter for default vnic 0 */</div><div class='ctx'> 	rc = bnxt_hwrm_set_vnic_filter(bp, 0, 0, bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "HWRM vnic filter failure rc: %x\n", rc);</div><div class='add'>+		if (BNXT_VF(bp) &amp;&amp; rc == -ENODEV)</div><div class='add'>+			netdev_err(bp-&gt;dev, "Cannot configure L2 filter while PF is unavailable\n");</div><div class='add'>+		else</div><div class='add'>+			netdev_err(bp-&gt;dev, "HWRM vnic filter failure rc: %x\n", rc);</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> 	vnic-&gt;uc_filter_count = 1;</div><div class='ctx'> </div><div class='ctx'> 	vnic-&gt;rx_mask = 0;</div><div class='add'>+	if (test_bit(BNXT_STATE_HALF_OPEN, &amp;bp-&gt;state))</div><div class='add'>+		goto skip_rx_mask;</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;dev-&gt;flags &amp; IFF_BROADCAST)</div><div class='ctx'> 		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;dev-&gt;flags &amp; IFF_PROMISC) &amp;&amp; bnxt_promisc_ok(bp))</div><div class='add'>+	if (bp-&gt;dev-&gt;flags &amp; IFF_PROMISC)</div><div class='ctx'> 		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='ctx'> 		vnic-&gt;mc_list_count = 0;</div><div class='del'>-	} else {</div><div class='add'>+	} else if (bp-&gt;dev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='ctx'> 		u32 mask = 0;</div><div class='ctx'> </div><div class='ctx'> 		bnxt_mc_list_updated(bp, &amp;mask);</div><div class='hunk'>@@ -7270,6 +11076,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> </div><div class='add'>+skip_rx_mask:</div><div class='ctx'> 	rc = bnxt_hwrm_set_coal(bp);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		netdev_warn(bp-&gt;dev, "HWRM set coalescing failure rc: %x\n",</div><div class='hunk'>@@ -7334,8 +11141,8 @@ static int bnxt_set_real_num_queues(struct bnxt *bp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,</div><div class='del'>-			   bool shared)</div><div class='add'>+static int __bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,</div><div class='add'>+			     bool shared)</div><div class='ctx'> {</div><div class='ctx'> 	int _rx = *rx, _tx = *tx;</div><div class='ctx'> </div><div class='hunk'>@@ -7358,19 +11165,59 @@ static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int __bnxt_num_tx_to_cp(struct bnxt *bp, int tx, int tx_sets, int tx_xdp)</div><div class='add'>+{</div><div class='add'>+	return (tx - tx_xdp) / tx_sets + tx_xdp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_num_tx_to_cp(struct bnxt *bp, int tx)</div><div class='add'>+{</div><div class='add'>+	int tcs = bp-&gt;num_tc;</div><div class='add'>+</div><div class='add'>+	if (!tcs)</div><div class='add'>+		tcs = 1;</div><div class='add'>+	return __bnxt_num_tx_to_cp(bp, tx, tcs, bp-&gt;tx_nr_rings_xdp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_num_cp_to_tx(struct bnxt *bp, int tx_cp)</div><div class='add'>+{</div><div class='add'>+	int tcs = bp-&gt;num_tc;</div><div class='add'>+</div><div class='add'>+	return (tx_cp - bp-&gt;tx_nr_rings_xdp) * tcs +</div><div class='add'>+	       bp-&gt;tx_nr_rings_xdp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_trim_rings(struct bnxt *bp, int *rx, int *tx, int max,</div><div class='add'>+			   bool sh)</div><div class='add'>+{</div><div class='add'>+	int tx_cp = bnxt_num_tx_to_cp(bp, *tx);</div><div class='add'>+</div><div class='add'>+	if (tx_cp != *tx) {</div><div class='add'>+		int tx_saved = tx_cp, rc;</div><div class='add'>+</div><div class='add'>+		rc = __bnxt_trim_rings(bp, rx, &amp;tx_cp, max, sh);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		if (tx_cp != tx_saved)</div><div class='add'>+			*tx = bnxt_num_cp_to_tx(bp, tx_cp);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return __bnxt_trim_rings(bp, rx, tx, max, sh);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_setup_msix(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	const int len = sizeof(bp-&gt;irq_tbl[0].name);</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='ctx'> 	int tcs, i;</div><div class='ctx'> </div><div class='del'>-	tcs = netdev_get_num_tc(dev);</div><div class='del'>-	if (tcs &gt; 1) {</div><div class='add'>+	tcs = bp-&gt;num_tc;</div><div class='add'>+	if (tcs) {</div><div class='ctx'> 		int i, off, count;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; tcs; i++) {</div><div class='ctx'> 			count = bp-&gt;tx_nr_rings_per_tc;</div><div class='del'>-			off = i * count;</div><div class='add'>+			off = BNXT_TC_TO_RING_BASE(bp, i);</div><div class='ctx'> 			netdev_set_tc_queue(dev, i, count, off);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -7392,32 +11239,48 @@ static void bnxt_setup_msix(struct bnxt *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_setup_inta(struct bnxt *bp)</div><div class='add'>+static int bnxt_init_int_mode(struct bnxt *bp);</div><div class='add'>+</div><div class='add'>+static int bnxt_change_msix(struct bnxt *bp, int total)</div><div class='ctx'> {</div><div class='del'>-	const int len = sizeof(bp-&gt;irq_tbl[0].name);</div><div class='add'>+	struct msi_map map;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (netdev_get_num_tc(bp-&gt;dev))</div><div class='del'>-		netdev_reset_tc(bp-&gt;dev);</div><div class='add'>+	/* add MSIX to the end if needed */</div><div class='add'>+	for (i = bp-&gt;total_irqs; i &lt; total; i++) {</div><div class='add'>+		map = pci_msix_alloc_irq_at(bp-&gt;pdev, i, NULL);</div><div class='add'>+		if (map.index &lt; 0)</div><div class='add'>+			return bp-&gt;total_irqs;</div><div class='add'>+		bp-&gt;irq_tbl[i].vector = map.virq;</div><div class='add'>+		bp-&gt;total_irqs++;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	snprintf(bp-&gt;irq_tbl[0].name, len, "%s-%s-%d", bp-&gt;dev-&gt;name, "TxRx",</div><div class='del'>-		 0);</div><div class='del'>-	bp-&gt;irq_tbl[0].handler = bnxt_inta;</div><div class='add'>+	/* trim MSIX from the end if needed */</div><div class='add'>+	for (i = bp-&gt;total_irqs; i &gt; total; i--) {</div><div class='add'>+		map.index = i - 1;</div><div class='add'>+		map.virq = bp-&gt;irq_tbl[i - 1].vector;</div><div class='add'>+		pci_msix_free_irq(bp-&gt;pdev, map);</div><div class='add'>+		bp-&gt;total_irqs--;</div><div class='add'>+	}</div><div class='add'>+	return bp-&gt;total_irqs;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_setup_int_mode(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX)</div><div class='del'>-		bnxt_setup_msix(bp);</div><div class='del'>-	else</div><div class='del'>-		bnxt_setup_inta(bp);</div><div class='add'>+	if (!bp-&gt;irq_tbl) {</div><div class='add'>+		rc = bnxt_init_int_mode(bp);</div><div class='add'>+		if (rc || !bp-&gt;irq_tbl)</div><div class='add'>+			return rc ?: -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnxt_setup_msix(bp);</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_set_real_num_queues(bp);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> static unsigned int bnxt_get_max_func_rss_ctxs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	return bp-&gt;hw_resc.max_rsscos_ctxs;</div><div class='hunk'>@@ -7427,7 +11290,6 @@ static unsigned int bnxt_get_max_func_vnics(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	return bp-&gt;hw_resc.max_vnics;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> unsigned int bnxt_get_max_func_stat_ctxs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -7443,7 +11305,7 @@ static unsigned int bnxt_get_max_func_cp_rings_for_en(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int cp = bp-&gt;hw_resc.max_cp_rings;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 		cp -= bnxt_get_ulp_msix_num(bp);</div><div class='ctx'> </div><div class='ctx'> 	return cp;</div><div class='hunk'>@@ -7453,7 +11315,7 @@ static unsigned int bnxt_get_max_func_irqs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		return min_t(unsigned int, hw_resc-&gt;max_irqs, hw_resc-&gt;max_nqs);</div><div class='ctx'> </div><div class='ctx'> 	return min_t(unsigned int, hw_resc-&gt;max_irqs, hw_resc-&gt;max_cp_rings);</div><div class='hunk'>@@ -7469,7 +11331,7 @@ unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp)</div><div class='ctx'> 	unsigned int cp;</div><div class='ctx'> </div><div class='ctx'> 	cp = bnxt_get_max_func_cp_rings_for_en(bp);</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='ctx'> 		return cp - bp-&gt;rx_nr_rings - bp-&gt;tx_nr_rings;</div><div class='ctx'> 	else</div><div class='ctx'> 		return cp - bp-&gt;cp_nr_rings;</div><div class='hunk'>@@ -7477,26 +11339,13 @@ unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> unsigned int bnxt_get_avail_stat_ctxs_for_en(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	unsigned int stat;</div><div class='del'>-</div><div class='del'>-	stat = bnxt_get_max_func_stat_ctxs(bp) - bnxt_get_ulp_stat_ctxs(bp);</div><div class='del'>-	stat -= bp-&gt;cp_nr_rings;</div><div class='del'>-	return stat;</div><div class='add'>+	return bnxt_get_max_func_stat_ctxs(bp) - bnxt_get_func_stat_ctxs(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnxt_get_avail_msix(struct bnxt *bp, int num)</div><div class='add'>+static int bnxt_get_avail_msix(struct bnxt *bp, int num)</div><div class='ctx'> {</div><div class='del'>-	int max_cp = bnxt_get_max_func_cp_rings(bp);</div><div class='ctx'> 	int max_irq = bnxt_get_max_func_irqs(bp);</div><div class='ctx'> 	int total_req = bp-&gt;cp_nr_rings + num;</div><div class='del'>-	int max_idx, avail_msix;</div><div class='del'>-</div><div class='del'>-	max_idx = bp-&gt;total_irqs;</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='del'>-		max_idx = min_t(int, bp-&gt;total_irqs, max_cp);</div><div class='del'>-	avail_msix = max_idx - bp-&gt;cp_nr_rings;</div><div class='del'>-	if (!BNXT_NEW_RM(bp) || avail_msix &gt;= num)</div><div class='del'>-		return avail_msix;</div><div class='ctx'> </div><div class='ctx'> 	if (max_irq &lt; total_req) {</div><div class='ctx'> 		num = max_irq - bp-&gt;cp_nr_rings;</div><div class='hunk'>@@ -7514,10 +11363,9 @@ static int bnxt_get_num_msix(struct bnxt *bp)</div><div class='ctx'> 	return bnxt_nq_rings_in_use(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_init_msix(struct bnxt *bp)</div><div class='add'>+static int bnxt_init_int_mode(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int i, total_vecs, max, rc = 0, min = 1, ulp_msix;</div><div class='del'>-	struct msix_entry *msix_ent;</div><div class='add'>+	int i, total_vecs, max, rc = 0, min = 1, ulp_msix, tx_cp, tbl_size;</div><div class='ctx'> </div><div class='ctx'> 	total_vecs = bnxt_get_num_msix(bp);</div><div class='ctx'> 	max = bnxt_get_max_func_irqs(bp);</div><div class='hunk'>@@ -7527,29 +11375,24 @@ static int bnxt_init_msix(struct bnxt *bp)</div><div class='ctx'> 	if (!total_vecs)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	msix_ent = kcalloc(total_vecs, sizeof(struct msix_entry), GFP_KERNEL);</div><div class='del'>-	if (!msix_ent)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; total_vecs; i++) {</div><div class='del'>-		msix_ent[i].entry = i;</div><div class='del'>-		msix_ent[i].vector = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS))</div><div class='ctx'> 		min = 2;</div><div class='ctx'> </div><div class='del'>-	total_vecs = pci_enable_msix_range(bp-&gt;pdev, msix_ent, min, total_vecs);</div><div class='add'>+	total_vecs = pci_alloc_irq_vectors(bp-&gt;pdev, min, total_vecs,</div><div class='add'>+					   PCI_IRQ_MSIX);</div><div class='ctx'> 	ulp_msix = bnxt_get_ulp_msix_num(bp);</div><div class='ctx'> 	if (total_vecs &lt; 0 || total_vecs &lt; ulp_msix) {</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto msix_setup_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;irq_tbl = kcalloc(total_vecs, sizeof(struct bnxt_irq), GFP_KERNEL);</div><div class='add'>+	tbl_size = total_vecs;</div><div class='add'>+	if (pci_msix_can_alloc_dyn(bp-&gt;pdev))</div><div class='add'>+		tbl_size = max;</div><div class='add'>+	bp-&gt;irq_tbl = kcalloc(tbl_size, sizeof(*bp-&gt;irq_tbl), GFP_KERNEL);</div><div class='ctx'> 	if (bp-&gt;irq_tbl) {</div><div class='ctx'> 		for (i = 0; i &lt; total_vecs; i++)</div><div class='del'>-			bp-&gt;irq_tbl[i].vector = msix_ent[i].vector;</div><div class='add'>+			bp-&gt;irq_tbl[i].vector = pci_irq_vector(bp-&gt;pdev, i);</div><div class='ctx'> </div><div class='ctx'> 		bp-&gt;total_irqs = total_vecs;</div><div class='ctx'> 		/* Trim rings based upon num of vectors allocated */</div><div class='hunk'>@@ -7558,100 +11401,238 @@ static int bnxt_init_msix(struct bnxt *bp)</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			goto msix_setup_exit;</div><div class='ctx'> </div><div class='add'>+		tx_cp = bnxt_num_tx_to_cp(bp, bp-&gt;tx_nr_rings);</div><div class='ctx'> 		bp-&gt;cp_nr_rings = (min == 1) ?</div><div class='del'>-				  max_t(int, bp-&gt;tx_nr_rings, bp-&gt;rx_nr_rings) :</div><div class='del'>-				  bp-&gt;tx_nr_rings + bp-&gt;rx_nr_rings;</div><div class='add'>+				  max_t(int, tx_cp, bp-&gt;rx_nr_rings) :</div><div class='add'>+				  tx_cp + bp-&gt;rx_nr_rings;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		rc = -ENOMEM;</div><div class='ctx'> 		goto msix_setup_exit;</div><div class='ctx'> 	}</div><div class='del'>-	bp-&gt;flags |= BNXT_FLAG_USING_MSIX;</div><div class='del'>-	kfree(msix_ent);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> msix_setup_exit:</div><div class='del'>-	netdev_err(bp-&gt;dev, "bnxt_init_msix err: %x\n", rc);</div><div class='add'>+	netdev_err(bp-&gt;dev, "bnxt_init_int_mode err: %x\n", rc);</div><div class='ctx'> 	kfree(bp-&gt;irq_tbl);</div><div class='ctx'> 	bp-&gt;irq_tbl = NULL;</div><div class='del'>-	pci_disable_msix(bp-&gt;pdev);</div><div class='del'>-	kfree(msix_ent);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bnxt_init_inta(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	bp-&gt;irq_tbl = kcalloc(1, sizeof(struct bnxt_irq), GFP_KERNEL);</div><div class='del'>-	if (!bp-&gt;irq_tbl)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	bp-&gt;total_irqs = 1;</div><div class='del'>-	bp-&gt;rx_nr_rings = 1;</div><div class='del'>-	bp-&gt;tx_nr_rings = 1;</div><div class='del'>-	bp-&gt;cp_nr_rings = 1;</div><div class='del'>-	bp-&gt;flags |= BNXT_FLAG_SHARED_RINGS;</div><div class='del'>-	bp-&gt;irq_tbl[0].vector = bp-&gt;pdev-&gt;irq;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bnxt_init_int_mode(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_MSIX_CAP)</div><div class='del'>-		rc = bnxt_init_msix(bp);</div><div class='del'>-</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX) &amp;&amp; BNXT_PF(bp)) {</div><div class='del'>-		/* fallback to INTA */</div><div class='del'>-		rc = bnxt_init_inta(bp);</div><div class='del'>-	}</div><div class='add'>+	pci_free_irq_vectors(bp-&gt;pdev);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_clear_int_mode(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX)</div><div class='del'>-		pci_disable_msix(bp-&gt;pdev);</div><div class='add'>+	pci_free_irq_vectors(bp-&gt;pdev);</div><div class='ctx'> </div><div class='ctx'> 	kfree(bp-&gt;irq_tbl);</div><div class='ctx'> 	bp-&gt;irq_tbl = NULL;</div><div class='del'>-	bp-&gt;flags &amp;= ~BNXT_FLAG_USING_MSIX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init)</div><div class='ctx'> {</div><div class='del'>-	int tcs = netdev_get_num_tc(bp-&gt;dev);</div><div class='ctx'> 	bool irq_cleared = false;</div><div class='add'>+	bool irq_change = false;</div><div class='add'>+	int tcs = bp-&gt;num_tc;</div><div class='add'>+	int irqs_required;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!bnxt_need_reserve_rings(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (irq_re_init &amp;&amp; BNXT_NEW_RM(bp) &amp;&amp;</div><div class='del'>-	    bnxt_get_num_msix(bp) != bp-&gt;total_irqs) {</div><div class='del'>-		bnxt_ulp_irq_stop(bp);</div><div class='del'>-		bnxt_clear_int_mode(bp);</div><div class='del'>-		irq_cleared = true;</div><div class='add'>+	if (BNXT_NEW_RM(bp) &amp;&amp; !bnxt_ulp_registered(bp-&gt;edev)) {</div><div class='add'>+		int ulp_msix = bnxt_get_avail_msix(bp, bp-&gt;ulp_num_msix_want);</div><div class='add'>+</div><div class='add'>+		if (ulp_msix &gt; bp-&gt;ulp_num_msix_want)</div><div class='add'>+			ulp_msix = bp-&gt;ulp_num_msix_want;</div><div class='add'>+		irqs_required = ulp_msix + bp-&gt;cp_nr_rings;</div><div class='add'>+	} else {</div><div class='add'>+		irqs_required = bnxt_get_num_msix(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (irq_re_init &amp;&amp; BNXT_NEW_RM(bp) &amp;&amp; irqs_required != bp-&gt;total_irqs) {</div><div class='add'>+		irq_change = true;</div><div class='add'>+		if (!pci_msix_can_alloc_dyn(bp-&gt;pdev)) {</div><div class='add'>+			bnxt_ulp_irq_stop(bp);</div><div class='add'>+			bnxt_clear_int_mode(bp);</div><div class='add'>+			irq_cleared = true;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = __bnxt_reserve_rings(bp);</div><div class='ctx'> 	if (irq_cleared) {</div><div class='ctx'> 		if (!rc)</div><div class='ctx'> 			rc = bnxt_init_int_mode(bp);</div><div class='ctx'> 		bnxt_ulp_irq_restart(bp, rc);</div><div class='add'>+	} else if (irq_change &amp;&amp; !rc) {</div><div class='add'>+		if (bnxt_change_msix(bp, irqs_required) != irqs_required)</div><div class='add'>+			rc = -ENOSPC;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "ring reservation/IRQ init failure rc: %d\n", rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	if (tcs &amp;&amp; (bp-&gt;tx_nr_rings_per_tc * tcs != bp-&gt;tx_nr_rings)) {</div><div class='add'>+	if (tcs &amp;&amp; (bp-&gt;tx_nr_rings_per_tc * tcs !=</div><div class='add'>+		    bp-&gt;tx_nr_rings - bp-&gt;tx_nr_rings_xdp)) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "tx ring reservation failure\n");</div><div class='ctx'> 		netdev_reset_tc(bp-&gt;dev);</div><div class='del'>-		bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings;</div><div class='add'>+		bp-&gt;num_tc = 0;</div><div class='add'>+		if (bp-&gt;tx_nr_rings_xdp)</div><div class='add'>+			bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings_xdp;</div><div class='add'>+		else</div><div class='add'>+			bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings;</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_tx_queue_stop(struct bnxt *bp, int idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	struct bnxt_napi *bnapi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bnapi = bp-&gt;bnapi[idx];</div><div class='add'>+	bnxt_for_each_napi_tx(i, bnapi, txr) {</div><div class='add'>+		WRITE_ONCE(txr-&gt;dev_state, BNXT_DEV_STATE_CLOSING);</div><div class='add'>+		synchronize_net();</div><div class='add'>+</div><div class='add'>+		if (!(bnapi-&gt;flags &amp; BNXT_NAPI_FLAG_XDP)) {</div><div class='add'>+			txq = netdev_get_tx_queue(bp-&gt;dev, txr-&gt;txq_index);</div><div class='add'>+			if (txq) {</div><div class='add'>+				__netif_tx_lock_bh(txq);</div><div class='add'>+				netif_tx_stop_queue(txq);</div><div class='add'>+				__netif_tx_unlock_bh(txq);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!bp-&gt;tph_mode)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		bnxt_hwrm_tx_ring_free(bp, txr, true);</div><div class='add'>+		bnxt_hwrm_cp_ring_free(bp, txr-&gt;tx_cpr);</div><div class='add'>+		bnxt_free_one_tx_ring_skbs(bp, txr, txr-&gt;txq_index);</div><div class='add'>+		bnxt_clear_one_cp_ring(bp, txr-&gt;tx_cpr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_tx_queue_start(struct bnxt *bp, int idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	struct bnxt_napi *bnapi;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	bnapi = bp-&gt;bnapi[idx];</div><div class='add'>+	/* All rings have been reserved and previously allocated.</div><div class='add'>+	 * Reallocating with the same parameters should never fail.</div><div class='add'>+	 */</div><div class='add'>+	bnxt_for_each_napi_tx(i, bnapi, txr) {</div><div class='add'>+		if (!bp-&gt;tph_mode)</div><div class='add'>+			goto start_tx;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_hwrm_cp_ring_alloc_p5(bp, txr-&gt;tx_cpr);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_hwrm_tx_ring_alloc(bp, txr, false);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+</div><div class='add'>+		txr-&gt;tx_prod = 0;</div><div class='add'>+		txr-&gt;tx_cons = 0;</div><div class='add'>+		txr-&gt;tx_hw_cons = 0;</div><div class='add'>+start_tx:</div><div class='add'>+		WRITE_ONCE(txr-&gt;dev_state, 0);</div><div class='add'>+		synchronize_net();</div><div class='add'>+</div><div class='add'>+		if (bnapi-&gt;flags &amp; BNXT_NAPI_FLAG_XDP)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		txq = netdev_get_tx_queue(bp-&gt;dev, txr-&gt;txq_index);</div><div class='add'>+		if (txq)</div><div class='add'>+			netif_tx_start_queue(txq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_irq_affinity_notify(struct irq_affinity_notify *notify,</div><div class='add'>+				     const cpumask_t *mask)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_irq *irq;</div><div class='add'>+	u16 tag;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	irq = container_of(notify, struct bnxt_irq, affinity_notify);</div><div class='add'>+</div><div class='add'>+	if (!irq-&gt;bp-&gt;tph_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpumask_copy(irq-&gt;cpu_mask, mask);</div><div class='add'>+</div><div class='add'>+	if (irq-&gt;ring_nr &gt;= irq-&gt;bp-&gt;rx_nr_rings)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pcie_tph_get_cpu_st(irq-&gt;bp-&gt;pdev, TPH_MEM_TYPE_VM,</div><div class='add'>+				cpumask_first(irq-&gt;cpu_mask), &amp;tag))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pcie_tph_set_st_entry(irq-&gt;bp-&gt;pdev, irq-&gt;msix_nr, tag))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_lock(irq-&gt;bp-&gt;dev);</div><div class='add'>+	if (netif_running(irq-&gt;bp-&gt;dev)) {</div><div class='add'>+		err = netdev_rx_queue_restart(irq-&gt;bp-&gt;dev, irq-&gt;ring_nr);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_err(irq-&gt;bp-&gt;dev,</div><div class='add'>+				   "RX queue restart failed: err=%d\n", err);</div><div class='add'>+	}</div><div class='add'>+	netdev_unlock(irq-&gt;bp-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_irq_affinity_release(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct irq_affinity_notify *notify =</div><div class='add'>+		container_of(ref, struct irq_affinity_notify, kref);</div><div class='add'>+	struct bnxt_irq *irq;</div><div class='add'>+</div><div class='add'>+	irq = container_of(notify, struct bnxt_irq, affinity_notify);</div><div class='add'>+</div><div class='add'>+	if (!irq-&gt;bp-&gt;tph_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pcie_tph_set_st_entry(irq-&gt;bp-&gt;pdev, irq-&gt;msix_nr, 0)) {</div><div class='add'>+		netdev_err(irq-&gt;bp-&gt;dev,</div><div class='add'>+			   "Setting ST=0 for MSIX entry %d failed\n",</div><div class='add'>+			   irq-&gt;msix_nr);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_release_irq_notifier(struct bnxt_irq *irq)</div><div class='add'>+{</div><div class='add'>+	irq_set_affinity_notifier(irq-&gt;vector, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_register_irq_notifier(struct bnxt *bp, struct bnxt_irq *irq)</div><div class='add'>+{</div><div class='add'>+	struct irq_affinity_notify *notify;</div><div class='add'>+</div><div class='add'>+	irq-&gt;bp = bp;</div><div class='add'>+</div><div class='add'>+	/* Nothing to do if TPH is not enabled */</div><div class='add'>+	if (!bp-&gt;tph_mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Register IRQ affinity notifier */</div><div class='add'>+	notify = &amp;irq-&gt;affinity_notify;</div><div class='add'>+	notify-&gt;irq = irq-&gt;vector;</div><div class='add'>+	notify-&gt;notify = bnxt_irq_affinity_notify;</div><div class='add'>+	notify-&gt;release = bnxt_irq_affinity_release;</div><div class='add'>+</div><div class='add'>+	irq_set_affinity_notifier(irq-&gt;vector, notify);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_free_irq(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_irq *irq;</div><div class='hunk'>@@ -7670,24 +11651,29 @@ static void bnxt_free_irq(struct bnxt *bp)</div><div class='ctx'> 		irq = &amp;bp-&gt;irq_tbl[map_idx];</div><div class='ctx'> 		if (irq-&gt;requested) {</div><div class='ctx'> 			if (irq-&gt;have_cpumask) {</div><div class='del'>-				irq_set_affinity_hint(irq-&gt;vector, NULL);</div><div class='add'>+				irq_update_affinity_hint(irq-&gt;vector, NULL);</div><div class='ctx'> 				free_cpumask_var(irq-&gt;cpu_mask);</div><div class='ctx'> 				irq-&gt;have_cpumask = 0;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			bnxt_release_irq_notifier(irq);</div><div class='add'>+</div><div class='ctx'> 			free_irq(irq-&gt;vector, bp-&gt;bnapi[i]);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		irq-&gt;requested = 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* Disable TPH support */</div><div class='add'>+	pcie_disable_tph(bp-&gt;pdev);</div><div class='add'>+	bp-&gt;tph_mode = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_request_irq(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct cpu_rmap *rmap = NULL;</div><div class='ctx'> 	int i, j, rc = 0;</div><div class='ctx'> 	unsigned long flags = 0;</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	struct cpu_rmap *rmap;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_setup_int_mode(bp);</div><div class='ctx'> 	if (rc) {</div><div class='hunk'>@@ -7698,42 +11684,59 @@ static int bnxt_request_irq(struct bnxt *bp)</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	rmap = bp-&gt;dev-&gt;rx_cpu_rmap;</div><div class='ctx'> #endif</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX))</div><div class='del'>-		flags = IRQF_SHARED;</div><div class='add'>+</div><div class='add'>+	/* Enable TPH support as part of IRQ request */</div><div class='add'>+	rc = pcie_enable_tph(bp-&gt;pdev, PCI_TPH_ST_IV_MODE);</div><div class='add'>+	if (!rc)</div><div class='add'>+		bp-&gt;tph_mode = PCI_TPH_ST_IV_MODE;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, j = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		int map_idx = bnxt_cp_num_to_irq_num(bp, i);</div><div class='ctx'> 		struct bnxt_irq *irq = &amp;bp-&gt;irq_tbl[map_idx];</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-		if (rmap &amp;&amp; bp-&gt;bnapi[i]-&gt;rx_ring) {</div><div class='add'>+		if (IS_ENABLED(CONFIG_RFS_ACCEL) &amp;&amp;</div><div class='add'>+		    rmap &amp;&amp; bp-&gt;bnapi[i]-&gt;rx_ring) {</div><div class='ctx'> 			rc = irq_cpu_rmap_add(rmap, irq-&gt;vector);</div><div class='ctx'> 			if (rc)</div><div class='ctx'> 				netdev_warn(bp-&gt;dev, "failed adding irq rmap for ring %d\n",</div><div class='ctx'> 					    j);</div><div class='ctx'> 			j++;</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 		rc = request_irq(irq-&gt;vector, irq-&gt;handler, flags, irq-&gt;name,</div><div class='ctx'> 				 bp-&gt;bnapi[i]);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='add'>+		netif_napi_set_irq_locked(&amp;bp-&gt;bnapi[i]-&gt;napi, irq-&gt;vector);</div><div class='ctx'> 		irq-&gt;requested = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (zalloc_cpumask_var(&amp;irq-&gt;cpu_mask, GFP_KERNEL)) {</div><div class='ctx'> 			int numa_node = dev_to_node(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+			u16 tag;</div><div class='ctx'> </div><div class='ctx'> 			irq-&gt;have_cpumask = 1;</div><div class='add'>+			irq-&gt;msix_nr = map_idx;</div><div class='add'>+			irq-&gt;ring_nr = i;</div><div class='ctx'> 			cpumask_set_cpu(cpumask_local_spread(i, numa_node),</div><div class='ctx'> 					irq-&gt;cpu_mask);</div><div class='del'>-			rc = irq_set_affinity_hint(irq-&gt;vector, irq-&gt;cpu_mask);</div><div class='add'>+			rc = irq_update_affinity_hint(irq-&gt;vector, irq-&gt;cpu_mask);</div><div class='ctx'> 			if (rc) {</div><div class='ctx'> 				netdev_warn(bp-&gt;dev,</div><div class='del'>-					    "Set affinity failed, IRQ = %d\n",</div><div class='add'>+					    "Update affinity hint failed, IRQ = %d\n",</div><div class='ctx'> 					    irq-&gt;vector);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			bnxt_register_irq_notifier(bp, irq);</div><div class='add'>+</div><div class='add'>+			/* Init ST table entry */</div><div class='add'>+			if (pcie_tph_get_cpu_st(irq-&gt;bp-&gt;pdev, TPH_MEM_TYPE_VM,</div><div class='add'>+						cpumask_first(irq-&gt;cpu_mask),</div><div class='add'>+						&amp;tag))</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			pcie_tph_set_st_entry(irq-&gt;bp-&gt;pdev, irq-&gt;msix_nr, tag);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -7746,13 +11749,17 @@ static void bnxt_del_napi(struct bnxt *bp)</div><div class='ctx'> 	if (!bp-&gt;bnapi)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++)</div><div class='add'>+		netif_queue_set_napi(bp-&gt;dev, i, NETDEV_QUEUE_TYPE_RX, NULL);</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;tx_nr_rings - bp-&gt;tx_nr_rings_xdp; i++)</div><div class='add'>+		netif_queue_set_napi(bp-&gt;dev, i, NETDEV_QUEUE_TYPE_TX, NULL);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> </div><div class='del'>-		napi_hash_del(&amp;bnapi-&gt;napi);</div><div class='del'>-		netif_napi_del(&amp;bnapi-&gt;napi);</div><div class='add'>+		__netif_napi_del_locked(&amp;bnapi-&gt;napi);</div><div class='ctx'> 	}</div><div class='del'>-	/* We called napi_hash_del() before netif_napi_del(), we need</div><div class='add'>+	/* We called __netif_napi_del_locked(), we need</div><div class='ctx'> 	 * to respect an RCU grace period before freeing napi structures.</div><div class='ctx'> 	 */</div><div class='ctx'> 	synchronize_net();</div><div class='hunk'>@@ -7760,29 +11767,26 @@ static void bnxt_del_napi(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> static void bnxt_init_napi(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int (*poll_fn)(struct napi_struct *, int) = bnxt_poll;</div><div class='ctx'> 	unsigned int cp_nr_rings = bp-&gt;cp_nr_rings;</div><div class='ctx'> 	struct bnxt_napi *bnapi;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX) {</div><div class='del'>-		int (*poll_fn)(struct napi_struct *, int) = bnxt_poll;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		poll_fn = bnxt_poll_p5;</div><div class='add'>+	else if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='add'>+		cp_nr_rings--;</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-			poll_fn = bnxt_poll_p5;</div><div class='del'>-		else if (BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='del'>-			cp_nr_rings--;</div><div class='del'>-		for (i = 0; i &lt; cp_nr_rings; i++) {</div><div class='del'>-			bnapi = bp-&gt;bnapi[i];</div><div class='del'>-			netif_napi_add(bp-&gt;dev, &amp;bnapi-&gt;napi, poll_fn, 64);</div><div class='del'>-		}</div><div class='del'>-		if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {</div><div class='del'>-			bnapi = bp-&gt;bnapi[cp_nr_rings];</div><div class='del'>-			netif_napi_add(bp-&gt;dev, &amp;bnapi-&gt;napi,</div><div class='del'>-				       bnxt_poll_nitroa0, 64);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		bnapi = bp-&gt;bnapi[0];</div><div class='del'>-		netif_napi_add(bp-&gt;dev, &amp;bnapi-&gt;napi, bnxt_poll, 64);</div><div class='add'>+	set_bit(BNXT_STATE_NAPI_DISABLED, &amp;bp-&gt;state);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cp_nr_rings; i++) {</div><div class='add'>+		bnapi = bp-&gt;bnapi[i];</div><div class='add'>+		netif_napi_add_config_locked(bp-&gt;dev, &amp;bnapi-&gt;napi, poll_fn,</div><div class='add'>+					     bnapi-&gt;index);</div><div class='add'>+	}</div><div class='add'>+	if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {</div><div class='add'>+		bnapi = bp-&gt;bnapi[cp_nr_rings];</div><div class='add'>+		netif_napi_add_locked(bp-&gt;dev, &amp;bnapi-&gt;napi, bnxt_poll_nitroa0);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7790,16 +11794,20 @@ static void bnxt_disable_napi(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;bnapi)</div><div class='add'>+	if (!bp-&gt;bnapi ||</div><div class='add'>+	    test_and_set_bit(BNXT_STATE_NAPI_DISABLED, &amp;bp-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='del'>-		struct bnxt_cp_ring_info *cpr = &amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='del'>-</div><div class='del'>-		if (bp-&gt;bnapi[i]-&gt;rx_ring)</div><div class='del'>-			cancel_work_sync(&amp;cpr-&gt;dim.work);</div><div class='add'>+		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='add'>+		struct bnxt_cp_ring_info *cpr;</div><div class='ctx'> </div><div class='del'>-		napi_disable(&amp;bp-&gt;bnapi[i]-&gt;napi);</div><div class='add'>+		cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+		if (bnapi-&gt;tx_fault)</div><div class='add'>+			cpr-&gt;sw_stats-&gt;tx.tx_resets++;</div><div class='add'>+		if (bnapi-&gt;in_reset)</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_resets++;</div><div class='add'>+		napi_disable_locked(&amp;bnapi-&gt;napi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7807,15 +11815,21 @@ static void bnxt_enable_napi(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	clear_bit(BNXT_STATE_NAPI_DISABLED, &amp;bp-&gt;state);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='del'>-		struct bnxt_cp_ring_info *cpr = &amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='del'>-		bp-&gt;bnapi[i]-&gt;in_reset = false;</div><div class='add'>+		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='add'>+		struct bnxt_cp_ring_info *cpr;</div><div class='add'>+</div><div class='add'>+		bnapi-&gt;tx_fault = 0;</div><div class='ctx'> </div><div class='del'>-		if (bp-&gt;bnapi[i]-&gt;rx_ring) {</div><div class='add'>+		cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+		bnapi-&gt;in_reset = false;</div><div class='add'>+</div><div class='add'>+		if (bnapi-&gt;rx_ring) {</div><div class='ctx'> 			INIT_WORK(&amp;cpr-&gt;dim.work, bnxt_dim_work);</div><div class='del'>-			cpr-&gt;dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='add'>+			cpr-&gt;dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='ctx'> 		}</div><div class='del'>-		napi_enable(&amp;bp-&gt;bnapi[i]-&gt;napi);</div><div class='add'>+		napi_enable_locked(&amp;bnapi-&gt;napi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7827,12 +11841,15 @@ void bnxt_tx_disable(struct bnxt *bp)</div><div class='ctx'> 	if (bp-&gt;tx_ring) {</div><div class='ctx'> 		for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='ctx'> 			txr = &amp;bp-&gt;tx_ring[i];</div><div class='del'>-			txr-&gt;dev_state = BNXT_DEV_STATE_CLOSING;</div><div class='add'>+			WRITE_ONCE(txr-&gt;dev_state, BNXT_DEV_STATE_CLOSING);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	/* Make sure napi polls see @dev_state change */</div><div class='add'>+	synchronize_net();</div><div class='add'>+	/* Drop carrier first to prevent TX timeout */</div><div class='add'>+	netif_carrier_off(bp-&gt;dev);</div><div class='ctx'> 	/* Stop all TX queues */</div><div class='ctx'> 	netif_tx_disable(bp-&gt;dev);</div><div class='del'>-	netif_carrier_off(bp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnxt_tx_enable(struct bnxt *bp)</div><div class='hunk'>@@ -7842,22 +11859,54 @@ void bnxt_tx_enable(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;tx_nr_rings; i++) {</div><div class='ctx'> 		txr = &amp;bp-&gt;tx_ring[i];</div><div class='del'>-		txr-&gt;dev_state = 0;</div><div class='add'>+		WRITE_ONCE(txr-&gt;dev_state, 0);</div><div class='ctx'> 	}</div><div class='add'>+	/* Make sure napi polls see @dev_state change */</div><div class='add'>+	synchronize_net();</div><div class='ctx'> 	netif_tx_wake_all_queues(bp-&gt;dev);</div><div class='del'>-	if (bp-&gt;link_info.link_up)</div><div class='add'>+	if (BNXT_LINK_IS_UP(bp))</div><div class='ctx'> 		netif_carrier_on(bp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_report_link(struct bnxt *bp)</div><div class='add'>+static char *bnxt_report_fec(struct bnxt_link_info *link_info)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;link_info.link_up) {</div><div class='del'>-		const char *duplex;</div><div class='add'>+	u8 active_fec = link_info-&gt;active_fec_sig_mode &amp;</div><div class='add'>+			PORT_PHY_QCFG_RESP_ACTIVE_FEC_MASK;</div><div class='add'>+</div><div class='add'>+	switch (active_fec) {</div><div class='add'>+	default:</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_NONE_ACTIVE:</div><div class='add'>+		return "None";</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_CLAUSE74_ACTIVE:</div><div class='add'>+		return "Clause 74 BaseR";</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_CLAUSE91_ACTIVE:</div><div class='add'>+		return "Clause 91 RS(528,514)";</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS544_1XN_ACTIVE:</div><div class='add'>+		return "Clause 91 RS544_1XN";</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS544_IEEE_ACTIVE:</div><div class='add'>+		return "Clause 91 RS(544,514)";</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_1XN_ACTIVE:</div><div class='add'>+		return "Clause 91 RS272_1XN";</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_IEEE_ACTIVE:</div><div class='add'>+		return "Clause 91 RS(272,257)";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_report_link(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (BNXT_LINK_IS_UP(bp)) {</div><div class='add'>+		const char *signal = "";</div><div class='ctx'> 		const char *flow_ctrl;</div><div class='add'>+		const char *duplex;</div><div class='ctx'> 		u32 speed;</div><div class='ctx'> 		u16 fec;</div><div class='ctx'> </div><div class='ctx'> 		netif_carrier_on(bp-&gt;dev);</div><div class='add'>+		speed = bnxt_fw_to_ethtool_speed(bp-&gt;link_info.link_speed);</div><div class='add'>+		if (speed == SPEED_UNKNOWN) {</div><div class='add'>+			netdev_info(bp-&gt;dev, "NIC Link is Up, speed unknown\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		if (bp-&gt;link_info.duplex == BNXT_LINK_DUPLEX_FULL)</div><div class='ctx'> 			duplex = "full";</div><div class='ctx'> 		else</div><div class='hunk'>@@ -7870,83 +11919,190 @@ static void bnxt_report_link(struct bnxt *bp)</div><div class='ctx'> 			flow_ctrl = "ON - receive";</div><div class='ctx'> 		else</div><div class='ctx'> 			flow_ctrl = "none";</div><div class='del'>-		speed = bnxt_fw_to_ethtool_speed(bp-&gt;link_info.link_speed);</div><div class='del'>-		netdev_info(bp-&gt;dev, "NIC Link is Up, %u Mbps %s duplex, Flow control: %s\n",</div><div class='del'>-			    speed, duplex, flow_ctrl);</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_EEE_CAP)</div><div class='add'>+		if (bp-&gt;link_info.phy_qcfg_resp.option_flags &amp;</div><div class='add'>+		    PORT_PHY_QCFG_RESP_OPTION_FLAGS_SIGNAL_MODE_KNOWN) {</div><div class='add'>+			u8 sig_mode = bp-&gt;link_info.active_fec_sig_mode &amp;</div><div class='add'>+				      PORT_PHY_QCFG_RESP_SIGNAL_MODE_MASK;</div><div class='add'>+			switch (sig_mode) {</div><div class='add'>+			case PORT_PHY_QCFG_RESP_SIGNAL_MODE_NRZ:</div><div class='add'>+				signal = "(NRZ) ";</div><div class='add'>+				break;</div><div class='add'>+			case PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4:</div><div class='add'>+				signal = "(PAM4 56Gbps) ";</div><div class='add'>+				break;</div><div class='add'>+			case PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4_112:</div><div class='add'>+				signal = "(PAM4 112Gbps) ";</div><div class='add'>+				break;</div><div class='add'>+			default:</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		netdev_info(bp-&gt;dev, "NIC Link is Up, %u Mbps %s%s duplex, Flow control: %s\n",</div><div class='add'>+			    speed, signal, duplex, flow_ctrl);</div><div class='add'>+		if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_EEE_CAP)</div><div class='ctx'> 			netdev_info(bp-&gt;dev, "EEE is %s\n",</div><div class='ctx'> 				    bp-&gt;eee.eee_active ? "active" :</div><div class='ctx'> 							 "not active");</div><div class='ctx'> 		fec = bp-&gt;link_info.fec_cfg;</div><div class='ctx'> 		if (!(fec &amp; PORT_PHY_QCFG_RESP_FEC_CFG_FEC_NONE_SUPPORTED))</div><div class='del'>-			netdev_info(bp-&gt;dev, "FEC autoneg %s encodings: %s\n",</div><div class='add'>+			netdev_info(bp-&gt;dev, "FEC autoneg %s encoding: %s\n",</div><div class='ctx'> 				    (fec &amp; BNXT_FEC_AUTONEG) ? "on" : "off",</div><div class='del'>-				    (fec &amp; BNXT_FEC_ENC_BASE_R) ? "BaseR" :</div><div class='del'>-				     (fec &amp; BNXT_FEC_ENC_RS) ? "RS" : "None");</div><div class='add'>+				    bnxt_report_fec(&amp;bp-&gt;link_info));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netif_carrier_off(bp-&gt;dev);</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "NIC Link is Down\n");</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool bnxt_phy_qcaps_no_speed(struct hwrm_port_phy_qcaps_output *resp)</div><div class='add'>+{</div><div class='add'>+	if (!resp-&gt;supported_speeds_auto_mode &amp;&amp;</div><div class='add'>+	    !resp-&gt;supported_speeds_force_mode &amp;&amp;</div><div class='add'>+	    !resp-&gt;supported_pam4_speeds_auto_mode &amp;&amp;</div><div class='add'>+	    !resp-&gt;supported_pam4_speeds_force_mode &amp;&amp;</div><div class='add'>+	    !resp-&gt;supported_speeds2_auto_mode &amp;&amp;</div><div class='add'>+	    !resp-&gt;supported_speeds2_force_mode)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct hwrm_port_phy_qcaps_input req = {0};</div><div class='del'>-	struct hwrm_port_phy_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='add'>+	struct hwrm_port_phy_qcaps_output *resp;</div><div class='add'>+	struct hwrm_port_phy_qcaps_input *req;</div><div class='add'>+	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10201)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_QCAPS, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto hwrm_phy_qcaps_exit;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;phy_flags = resp-&gt;flags | (le16_to_cpu(resp-&gt;flags2) &lt;&lt; 8);</div><div class='ctx'> 	if (resp-&gt;flags &amp; PORT_PHY_QCAPS_RESP_FLAGS_EEE_SUPPORTED) {</div><div class='del'>-		struct ethtool_eee *eee = &amp;bp-&gt;eee;</div><div class='add'>+		struct ethtool_keee *eee = &amp;bp-&gt;eee;</div><div class='ctx'> 		u16 fw_speeds = le16_to_cpu(resp-&gt;supported_speeds_eee_mode);</div><div class='ctx'> </div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_EEE_CAP;</div><div class='del'>-		eee-&gt;supported = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);</div><div class='add'>+		_bnxt_fw_to_linkmode(eee-&gt;supported, fw_speeds);</div><div class='ctx'> 		bp-&gt;lpi_tmr_lo = le32_to_cpu(resp-&gt;tx_lpi_timer_low) &amp;</div><div class='ctx'> 				 PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_MASK;</div><div class='ctx'> 		bp-&gt;lpi_tmr_hi = le32_to_cpu(resp-&gt;valid_tx_lpi_timer_high) &amp;</div><div class='ctx'> 				 PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK;</div><div class='ctx'> 	}</div><div class='del'>-	if (resp-&gt;flags &amp; PORT_PHY_QCAPS_RESP_FLAGS_EXTERNAL_LPBK_SUPPORTED) {</div><div class='del'>-		if (bp-&gt;test_info)</div><div class='del'>-			bp-&gt;test_info-&gt;flags |= BNXT_TEST_FL_EXT_LPBK;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &gt;= 0x10a01) {</div><div class='add'>+		if (bnxt_phy_qcaps_no_speed(resp)) {</div><div class='add'>+			link_info-&gt;phy_state = BNXT_PHY_STATE_DISABLED;</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Ethernet link disabled\n");</div><div class='add'>+		} else if (link_info-&gt;phy_state == BNXT_PHY_STATE_DISABLED) {</div><div class='add'>+			link_info-&gt;phy_state = BNXT_PHY_STATE_ENABLED;</div><div class='add'>+			netdev_info(bp-&gt;dev, "Ethernet link enabled\n");</div><div class='add'>+			/* Phy re-enabled, reprobe the speeds */</div><div class='add'>+			link_info-&gt;support_auto_speeds = 0;</div><div class='add'>+			link_info-&gt;support_pam4_auto_speeds = 0;</div><div class='add'>+			link_info-&gt;support_auto_speeds2 = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (resp-&gt;supported_speeds_auto_mode)</div><div class='ctx'> 		link_info-&gt;support_auto_speeds =</div><div class='ctx'> 			le16_to_cpu(resp-&gt;supported_speeds_auto_mode);</div><div class='add'>+	if (resp-&gt;supported_pam4_speeds_auto_mode)</div><div class='add'>+		link_info-&gt;support_pam4_auto_speeds =</div><div class='add'>+			le16_to_cpu(resp-&gt;supported_pam4_speeds_auto_mode);</div><div class='add'>+	if (resp-&gt;supported_speeds2_auto_mode)</div><div class='add'>+		link_info-&gt;support_auto_speeds2 =</div><div class='add'>+			le16_to_cpu(resp-&gt;supported_speeds2_auto_mode);</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;port_count = resp-&gt;port_cnt;</div><div class='ctx'> </div><div class='ctx'> hwrm_phy_qcaps_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='add'>+static void bnxt_hwrm_mac_qcaps(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_mac_qcaps_output *resp;</div><div class='add'>+	struct hwrm_port_mac_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10a03)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		bp-&gt;mac_flags = resp-&gt;flags;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_support_dropped(u16 advertising, u16 supported)</div><div class='add'>+{</div><div class='add'>+	u16 diff = advertising ^ supported;</div><div class='add'>+</div><div class='add'>+	return ((supported | diff) != supported);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_support_speed_dropped(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	/* Check if any advertised speeds are no longer supported. The caller</div><div class='add'>+	 * holds the link_lock mutex, so we can modify link_info settings.</div><div class='add'>+	 */</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		if (bnxt_support_dropped(link_info-&gt;advertising,</div><div class='add'>+					 link_info-&gt;support_auto_speeds2)) {</div><div class='add'>+			link_info-&gt;advertising = link_info-&gt;support_auto_speeds2;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (bnxt_support_dropped(link_info-&gt;advertising,</div><div class='add'>+				 link_info-&gt;support_auto_speeds)) {</div><div class='add'>+		link_info-&gt;advertising = link_info-&gt;support_auto_speeds;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	if (bnxt_support_dropped(link_info-&gt;advertising_pam4,</div><div class='add'>+				 link_info-&gt;support_pam4_auto_speeds)) {</div><div class='add'>+		link_info-&gt;advertising_pam4 = link_info-&gt;support_pam4_auto_speeds;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='del'>-	struct hwrm_port_phy_qcfg_input req = {0};</div><div class='del'>-	struct hwrm_port_phy_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	u8 link_up = link_info-&gt;link_up;</div><div class='del'>-	u16 diff;</div><div class='add'>+	struct hwrm_port_phy_qcfg_output *resp;</div><div class='add'>+	struct hwrm_port_phy_qcfg_input *req;</div><div class='add'>+	u8 link_state = link_info-&gt;link_state;</div><div class='add'>+	bool support_changed;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_QCFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='add'>+		if (BNXT_VF(bp) &amp;&amp; rc == -ENODEV) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Cannot obtain link state while PF unavailable.\n");</div><div class='add'>+			rc = 0;</div><div class='add'>+		}</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -7961,15 +12117,29 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='ctx'> 	link_info-&gt;lp_pause = resp-&gt;link_partner_adv_pause;</div><div class='ctx'> 	link_info-&gt;force_pause_setting = resp-&gt;force_pause;</div><div class='ctx'> 	link_info-&gt;duplex_setting = resp-&gt;duplex_cfg;</div><div class='del'>-	if (link_info-&gt;phy_link_status == BNXT_LINK_LINK)</div><div class='add'>+	if (link_info-&gt;phy_link_status == BNXT_LINK_LINK) {</div><div class='ctx'> 		link_info-&gt;link_speed = le16_to_cpu(resp-&gt;link_speed);</div><div class='del'>-	else</div><div class='add'>+		if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2)</div><div class='add'>+			link_info-&gt;active_lanes = resp-&gt;active_lanes;</div><div class='add'>+	} else {</div><div class='ctx'> 		link_info-&gt;link_speed = 0;</div><div class='add'>+		link_info-&gt;active_lanes = 0;</div><div class='add'>+	}</div><div class='ctx'> 	link_info-&gt;force_link_speed = le16_to_cpu(resp-&gt;force_link_speed);</div><div class='add'>+	link_info-&gt;force_pam4_link_speed =</div><div class='add'>+		le16_to_cpu(resp-&gt;force_pam4_link_speed);</div><div class='add'>+	link_info-&gt;force_link_speed2 = le16_to_cpu(resp-&gt;force_link_speeds2);</div><div class='ctx'> 	link_info-&gt;support_speeds = le16_to_cpu(resp-&gt;support_speeds);</div><div class='add'>+	link_info-&gt;support_pam4_speeds = le16_to_cpu(resp-&gt;support_pam4_speeds);</div><div class='add'>+	link_info-&gt;support_speeds2 = le16_to_cpu(resp-&gt;support_speeds2);</div><div class='ctx'> 	link_info-&gt;auto_link_speeds = le16_to_cpu(resp-&gt;auto_link_speed_mask);</div><div class='add'>+	link_info-&gt;auto_pam4_link_speeds =</div><div class='add'>+		le16_to_cpu(resp-&gt;auto_pam4_link_speed_mask);</div><div class='add'>+	link_info-&gt;auto_link_speeds2 = le16_to_cpu(resp-&gt;auto_link_speeds2);</div><div class='ctx'> 	link_info-&gt;lp_auto_link_speeds =</div><div class='ctx'> 		le16_to_cpu(resp-&gt;link_partner_adv_speeds);</div><div class='add'>+	link_info-&gt;lp_auto_pam4_link_speeds =</div><div class='add'>+		resp-&gt;link_partner_pam4_adv_speeds;</div><div class='ctx'> 	link_info-&gt;preemphasis = le32_to_cpu(resp-&gt;preemphasis);</div><div class='ctx'> 	link_info-&gt;phy_ver[0] = resp-&gt;phy_maj;</div><div class='ctx'> 	link_info-&gt;phy_ver[1] = resp-&gt;phy_min;</div><div class='hunk'>@@ -7981,8 +12151,8 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='ctx'> 			      PORT_PHY_QCFG_RESP_PHY_ADDR_MASK;</div><div class='ctx'> 	link_info-&gt;module_status = resp-&gt;module_status;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_EEE_CAP) {</div><div class='del'>-		struct ethtool_eee *eee = &amp;bp-&gt;eee;</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_EEE_CAP) {</div><div class='add'>+		struct ethtool_keee *eee = &amp;bp-&gt;eee;</div><div class='ctx'> 		u16 fw_speeds;</div><div class='ctx'> </div><div class='ctx'> 		eee-&gt;eee_active = 0;</div><div class='hunk'>@@ -7991,8 +12161,7 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='ctx'> 			eee-&gt;eee_active = 1;</div><div class='ctx'> 			fw_speeds = le16_to_cpu(</div><div class='ctx'> 				resp-&gt;link_partner_adv_eee_link_speed_mask);</div><div class='del'>-			eee-&gt;lp_advertised =</div><div class='del'>-				_bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);</div><div class='add'>+			_bnxt_fw_to_linkmode(eee-&gt;lp_advertised, fw_speeds);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Pull initial EEE config */</div><div class='hunk'>@@ -8002,8 +12171,7 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='ctx'> 				eee-&gt;eee_enabled = 1;</div><div class='ctx'> </div><div class='ctx'> 			fw_speeds = le16_to_cpu(resp-&gt;adv_eee_link_speed_mask);</div><div class='del'>-			eee-&gt;advertised =</div><div class='del'>-				_bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);</div><div class='add'>+			_bnxt_fw_to_linkmode(eee-&gt;advertised, fw_speeds);</div><div class='ctx'> </div><div class='ctx'> 			if (resp-&gt;eee_config_phy_addr &amp;</div><div class='ctx'> 			    PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_TX_LPI) {</div><div class='hunk'>@@ -8018,37 +12186,30 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	link_info-&gt;fec_cfg = PORT_PHY_QCFG_RESP_FEC_CFG_FEC_NONE_SUPPORTED;</div><div class='del'>-	if (bp-&gt;hwrm_spec_code &gt;= 0x10504)</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &gt;= 0x10504) {</div><div class='ctx'> 		link_info-&gt;fec_cfg = le16_to_cpu(resp-&gt;fec_cfg);</div><div class='del'>-</div><div class='add'>+		link_info-&gt;active_fec_sig_mode = resp-&gt;active_fec_signal_mode;</div><div class='add'>+	}</div><div class='ctx'> 	/* TODO: need to add more logic to report VF link */</div><div class='ctx'> 	if (chng_link_state) {</div><div class='ctx'> 		if (link_info-&gt;phy_link_status == BNXT_LINK_LINK)</div><div class='del'>-			link_info-&gt;link_up = 1;</div><div class='add'>+			link_info-&gt;link_state = BNXT_LINK_STATE_UP;</div><div class='ctx'> 		else</div><div class='del'>-			link_info-&gt;link_up = 0;</div><div class='del'>-		if (link_up != link_info-&gt;link_up)</div><div class='add'>+			link_info-&gt;link_state = BNXT_LINK_STATE_DOWN;</div><div class='add'>+		if (link_state != link_info-&gt;link_state)</div><div class='ctx'> 			bnxt_report_link(bp);</div><div class='ctx'> 	} else {</div><div class='del'>-		/* alwasy link down if not require to update link state */</div><div class='del'>-		link_info-&gt;link_up = 0;</div><div class='add'>+		/* always link down if not require to update link state */</div><div class='add'>+		link_info-&gt;link_state = BNXT_LINK_STATE_DOWN;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> </div><div class='del'>-	if (!BNXT_SINGLE_PF(bp))</div><div class='add'>+	if (!BNXT_PHY_CFG_ABLE(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	diff = link_info-&gt;support_auto_speeds ^ link_info-&gt;advertising;</div><div class='del'>-	if ((link_info-&gt;support_auto_speeds | diff) !=</div><div class='del'>-	    link_info-&gt;support_auto_speeds) {</div><div class='del'>-		/* An advertised speed is no longer supported, so we need to</div><div class='del'>-		 * update the advertisement settings.  Caller holds RTNL</div><div class='del'>-		 * so we can modify link settings.</div><div class='del'>-		 */</div><div class='del'>-		link_info-&gt;advertising = link_info-&gt;support_auto_speeds;</div><div class='del'>-		if (link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED)</div><div class='del'>-			bnxt_hwrm_set_link_setting(bp, true, false);</div><div class='del'>-	}</div><div class='add'>+	support_changed = bnxt_support_speed_dropped(link_info);</div><div class='add'>+	if (support_changed &amp;&amp; (link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED))</div><div class='add'>+		bnxt_hwrm_set_link_setting(bp, true, false);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8107,27 +12268,39 @@ bnxt_hwrm_set_pause_common(struct bnxt *bp, struct hwrm_port_phy_cfg_input *req)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_hwrm_set_link_common(struct bnxt *bp,</div><div class='del'>-				      struct hwrm_port_phy_cfg_input *req)</div><div class='add'>+static void bnxt_hwrm_set_link_common(struct bnxt *bp, struct hwrm_port_phy_cfg_input *req)</div><div class='ctx'> {</div><div class='del'>-	u8 autoneg = bp-&gt;link_info.autoneg;</div><div class='del'>-	u16 fw_link_speed = bp-&gt;link_info.req_link_speed;</div><div class='del'>-	u16 advertising = bp-&gt;link_info.advertising;</div><div class='del'>-</div><div class='del'>-	if (autoneg &amp; BNXT_AUTONEG_SPEED) {</div><div class='del'>-		req-&gt;auto_mode |=</div><div class='del'>-			PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK;</div><div class='del'>-</div><div class='del'>-		req-&gt;enables |= cpu_to_le32(</div><div class='del'>-			PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED_MASK);</div><div class='del'>-		req-&gt;auto_link_speed_mask = cpu_to_le16(advertising);</div><div class='del'>-</div><div class='add'>+	if (bp-&gt;link_info.autoneg &amp; BNXT_AUTONEG_SPEED) {</div><div class='add'>+		req-&gt;auto_mode |= PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK;</div><div class='add'>+		if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+			req-&gt;enables |=</div><div class='add'>+				cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEEDS2_MASK);</div><div class='add'>+			req-&gt;auto_link_speeds2_mask = cpu_to_le16(bp-&gt;link_info.advertising);</div><div class='add'>+		} else if (bp-&gt;link_info.advertising) {</div><div class='add'>+			req-&gt;enables |= cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED_MASK);</div><div class='add'>+			req-&gt;auto_link_speed_mask = cpu_to_le16(bp-&gt;link_info.advertising);</div><div class='add'>+		}</div><div class='add'>+		if (bp-&gt;link_info.advertising_pam4) {</div><div class='add'>+			req-&gt;enables |=</div><div class='add'>+				cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_AUTO_PAM4_LINK_SPEED_MASK);</div><div class='add'>+			req-&gt;auto_link_pam4_speed_mask =</div><div class='add'>+				cpu_to_le16(bp-&gt;link_info.advertising_pam4);</div><div class='add'>+		}</div><div class='ctx'> 		req-&gt;enables |= cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_AUTO_MODE);</div><div class='del'>-		req-&gt;flags |=</div><div class='del'>-			cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG);</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG);</div><div class='ctx'> 	} else {</div><div class='del'>-		req-&gt;force_link_speed = cpu_to_le16(fw_link_speed);</div><div class='ctx'> 		req-&gt;flags |= cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE);</div><div class='add'>+		if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+			req-&gt;force_link_speeds2 = cpu_to_le16(bp-&gt;link_info.req_link_speed);</div><div class='add'>+			req-&gt;enables |= cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_FORCE_LINK_SPEEDS2);</div><div class='add'>+			netif_info(bp, link, bp-&gt;dev, "Forcing FW speed2: %d\n",</div><div class='add'>+				   (u32)bp-&gt;link_info.req_link_speed);</div><div class='add'>+		} else if (bp-&gt;link_info.req_signal_mode == BNXT_SIG_MODE_PAM4) {</div><div class='add'>+			req-&gt;force_pam4_link_speed = cpu_to_le16(bp-&gt;link_info.req_link_speed);</div><div class='add'>+			req-&gt;enables |= cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_FORCE_PAM4_LINK_SPEED);</div><div class='add'>+		} else {</div><div class='add'>+			req-&gt;force_link_speed = cpu_to_le16(bp-&gt;link_info.req_link_speed);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* tell chimp that the setting takes effect immediately */</div><div class='hunk'>@@ -8136,18 +12309,20 @@ static void bnxt_hwrm_set_link_common(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_set_pause(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_cfg_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_cfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_CFG, -1, -1);</div><div class='del'>-	bnxt_hwrm_set_pause_common(bp, &amp;req);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_set_pause_common(bp, req);</div><div class='ctx'> </div><div class='ctx'> 	if ((bp-&gt;link_info.autoneg &amp; BNXT_AUTONEG_FLOW_CTRL) ||</div><div class='ctx'> 	    bp-&gt;link_info.force_link_chng)</div><div class='del'>-		bnxt_hwrm_set_link_common(bp, &amp;req);</div><div class='add'>+		bnxt_hwrm_set_link_common(bp, req);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc &amp;&amp; !(bp-&gt;link_info.autoneg &amp; BNXT_AUTONEG_FLOW_CTRL)) {</div><div class='ctx'> 		/* since changing of pause setting doesn't trigger any link</div><div class='ctx'> 		 * change event, the driver needs to update the current pause</div><div class='hunk'>@@ -8160,14 +12335,13 @@ int bnxt_hwrm_set_pause(struct bnxt *bp)</div><div class='ctx'> 			bnxt_report_link(bp);</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;link_info.force_link_chng = false;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_hwrm_set_eee(struct bnxt *bp,</div><div class='ctx'> 			      struct hwrm_port_phy_cfg_input *req)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_eee *eee = &amp;bp-&gt;eee;</div><div class='add'>+	struct ethtool_keee *eee = &amp;bp-&gt;eee;</div><div class='ctx'> </div><div class='ctx'> 	if (eee-&gt;eee_enabled) {</div><div class='ctx'> 		u16 eee_speeds;</div><div class='hunk'>@@ -8189,87 +12363,246 @@ static void bnxt_hwrm_set_eee(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_set_link_setting(struct bnxt *bp, bool set_pause, bool set_eee)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_cfg_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_CFG, -1, -1);</div><div class='ctx'> 	if (set_pause)</div><div class='del'>-		bnxt_hwrm_set_pause_common(bp, &amp;req);</div><div class='add'>+		bnxt_hwrm_set_pause_common(bp, req);</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_set_link_common(bp, &amp;req);</div><div class='add'>+	bnxt_hwrm_set_link_common(bp, req);</div><div class='ctx'> </div><div class='ctx'> 	if (set_eee)</div><div class='del'>-		bnxt_hwrm_set_eee(bp, &amp;req);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+		bnxt_hwrm_set_eee(bp, req);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_shutdown_link(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_cfg_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!BNXT_SINGLE_PF(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if (pci_num_vf(bp-&gt;pdev))</div><div class='add'>+	if (pci_num_vf(bp-&gt;pdev) &amp;&amp;</div><div class='add'>+	    !(bp-&gt;phy_flags &amp; BNXT_PHY_FL_FW_MANAGED_LKDN))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_CFG, -1, -1);</div><div class='del'>-	req.flags = cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DWN);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DWN);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		mutex_lock(&amp;bp-&gt;link_lock);</div><div class='add'>+		/* Device is not obliged link down in certain scenarios, even</div><div class='add'>+		 * when forced. Setting the state unknown is consistent with</div><div class='add'>+		 * driver startup and will force link state to be reported</div><div class='add'>+		 * during subsequent open based on PORT_PHY_QCFG.</div><div class='add'>+		 */</div><div class='add'>+		bp-&gt;link_info.link_state = BNXT_LINK_STATE_UNKNOWN;</div><div class='add'>+		mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_fw_reset_via_optee(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_TEE_BNXT_FW</div><div class='add'>+	int rc = tee_bnxt_fw_load();</div><div class='add'>+</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "Failed FW reset via OP-TEE, rc=%d\n", rc);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+#else</div><div class='add'>+	netdev_err(bp-&gt;dev, "OP-TEE not supported\n");</div><div class='add'>+	return -ENODEV;</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_try_recover_fw(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;fw_health &amp;&amp; bp-&gt;fw_health-&gt;status_reliable) {</div><div class='add'>+		int retry = 0, rc;</div><div class='add'>+		u32 sts;</div><div class='add'>+</div><div class='add'>+		do {</div><div class='add'>+			sts = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);</div><div class='add'>+			rc = bnxt_hwrm_poll(bp);</div><div class='add'>+			if (!BNXT_FW_IS_BOOTING(sts) &amp;&amp;</div><div class='add'>+			    !BNXT_FW_IS_RECOVERING(sts))</div><div class='add'>+				break;</div><div class='add'>+			retry++;</div><div class='add'>+		} while (rc == -EBUSY &amp;&amp; retry &lt; BNXT_FW_RETRY);</div><div class='add'>+</div><div class='add'>+		if (!BNXT_FW_IS_HEALTHY(sts)) {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "Firmware not responding, status: 0x%x\n",</div><div class='add'>+				   sts);</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		if (sts &amp; FW_STATUS_REG_CRASHED_NO_MASTER) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Firmware recover via OP-TEE requested\n");</div><div class='add'>+			return bnxt_fw_reset_via_optee(bp);</div><div class='add'>+		}</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_clear_reservations(struct bnxt *bp, bool fw_reset)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='add'>+</div><div class='add'>+	if (!BNXT_NEW_RM(bp))</div><div class='add'>+		return; /* no resource reservations required */</div><div class='add'>+</div><div class='add'>+	hw_resc-&gt;resv_cp_rings = 0;</div><div class='add'>+	hw_resc-&gt;resv_stat_ctxs = 0;</div><div class='add'>+	hw_resc-&gt;resv_irqs = 0;</div><div class='add'>+	hw_resc-&gt;resv_tx_rings = 0;</div><div class='add'>+	hw_resc-&gt;resv_rx_rings = 0;</div><div class='add'>+	hw_resc-&gt;resv_hw_ring_grps = 0;</div><div class='add'>+	hw_resc-&gt;resv_vnics = 0;</div><div class='add'>+	hw_resc-&gt;resv_rsscos_ctxs = 0;</div><div class='add'>+	if (!fw_reset) {</div><div class='add'>+		bp-&gt;tx_nr_rings = 0;</div><div class='add'>+		bp-&gt;rx_nr_rings = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_cancel_reservations(struct bnxt *bp, bool fw_reset)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!BNXT_NEW_RM(bp))</div><div class='add'>+		return 0; /* no resource reservations required */</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_resc_qcaps(bp, true);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "resc_qcaps failed\n");</div><div class='add'>+</div><div class='add'>+	bnxt_clear_reservations(bp, fw_reset);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_if_change(struct bnxt *bp, bool up)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_drv_if_change_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_func_drv_if_change_input req = {0};</div><div class='add'>+	struct hwrm_func_drv_if_change_output *resp;</div><div class='add'>+	struct hwrm_func_drv_if_change_input *req;</div><div class='ctx'> 	bool resc_reinit = false;</div><div class='del'>-	int rc;</div><div class='add'>+	bool caps_change = false;</div><div class='add'>+	int rc, retry = 0;</div><div class='add'>+	bool fw_reset;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	fw_reset = (bp-&gt;fw_reset_state == BNXT_FW_RESET_STATE_ABORT);</div><div class='add'>+	bp-&gt;fw_reset_state = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_IF_CHANGE))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_DRV_IF_CHANGE, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_DRV_IF_CHANGE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	if (up)</div><div class='del'>-		req.flags = cpu_to_le32(FUNC_DRV_IF_CHANGE_REQ_FLAGS_UP);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc &amp;&amp; (resp-&gt;flags &amp;</div><div class='del'>-		    cpu_to_le32(FUNC_DRV_IF_CHANGE_RESP_FLAGS_RESC_CHANGE)))</div><div class='del'>-		resc_reinit = true;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		req-&gt;flags = cpu_to_le32(FUNC_DRV_IF_CHANGE_REQ_FLAGS_UP);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='ctx'> </div><div class='del'>-	if (up &amp;&amp; resc_reinit &amp;&amp; BNXT_NEW_RM(bp)) {</div><div class='del'>-		struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='add'>+	hwrm_req_flags(bp, req, BNXT_HWRM_FULL_WAIT);</div><div class='add'>+	while (retry &lt; BNXT_FW_IF_RETRY) {</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc != -EAGAIN)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		rc = bnxt_hwrm_func_resc_qcaps(bp, true);</div><div class='del'>-		hw_resc-&gt;resv_cp_rings = 0;</div><div class='del'>-		hw_resc-&gt;resv_stat_ctxs = 0;</div><div class='del'>-		hw_resc-&gt;resv_irqs = 0;</div><div class='del'>-		hw_resc-&gt;resv_tx_rings = 0;</div><div class='del'>-		hw_resc-&gt;resv_rx_rings = 0;</div><div class='del'>-		hw_resc-&gt;resv_hw_ring_grps = 0;</div><div class='del'>-		hw_resc-&gt;resv_vnics = 0;</div><div class='del'>-		bp-&gt;tx_nr_rings = 0;</div><div class='del'>-		bp-&gt;rx_nr_rings = 0;</div><div class='add'>+		msleep(50);</div><div class='add'>+		retry++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rc == -EAGAIN) {</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='add'>+		return rc;</div><div class='add'>+	} else if (!rc) {</div><div class='add'>+		flags = le32_to_cpu(resp-&gt;flags);</div><div class='add'>+	} else if (up) {</div><div class='add'>+		rc = bnxt_try_recover_fw(bp);</div><div class='add'>+		fw_reset = true;</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (!up) {</div><div class='add'>+		bnxt_inv_fw_health_reg(bp);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; FUNC_DRV_IF_CHANGE_RESP_FLAGS_RESC_CHANGE)</div><div class='add'>+		resc_reinit = true;</div><div class='add'>+	if (flags &amp; FUNC_DRV_IF_CHANGE_RESP_FLAGS_HOT_FW_RESET_DONE ||</div><div class='add'>+	    test_bit(BNXT_STATE_FW_RESET_DET, &amp;bp-&gt;state))</div><div class='add'>+		fw_reset = true;</div><div class='add'>+	else</div><div class='add'>+		bnxt_remap_fw_health_regs(bp);</div><div class='add'>+</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state) &amp;&amp; !fw_reset) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "RESET_DONE not set during FW reset.\n");</div><div class='add'>+		set_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	if (flags &amp; FUNC_DRV_IF_CHANGE_RESP_FLAGS_CAPS_CHANGE)</div><div class='add'>+		caps_change = true;</div><div class='add'>+</div><div class='add'>+	if (resc_reinit || fw_reset || caps_change) {</div><div class='add'>+		if (fw_reset || caps_change) {</div><div class='add'>+			set_bit(BNXT_STATE_FW_RESET_DET, &amp;bp-&gt;state);</div><div class='add'>+			if (!test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+				bnxt_ulp_irq_stop(bp);</div><div class='add'>+			bnxt_free_ctx_mem(bp, false);</div><div class='add'>+			bnxt_dcb_free(bp);</div><div class='add'>+			rc = bnxt_fw_init_one(bp);</div><div class='add'>+			if (rc) {</div><div class='add'>+				clear_bit(BNXT_STATE_FW_RESET_DET, &amp;bp-&gt;state);</div><div class='add'>+				set_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state);</div><div class='add'>+				return rc;</div><div class='add'>+			}</div><div class='add'>+			/* IRQ will be initialized later in bnxt_request_irq()*/</div><div class='add'>+			bnxt_clear_int_mode(bp);</div><div class='add'>+		}</div><div class='add'>+		rc = bnxt_cancel_reservations(bp, fw_reset);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_port_led_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_led_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_port_led_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_port_led_qcaps_output *resp;</div><div class='add'>+	struct hwrm_port_led_qcaps_input *req;</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;num_leds = 0;</div><div class='ctx'> 	if (BNXT_VF(bp) || bp-&gt;hwrm_spec_code &lt; 0x10601)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_LED_QCAPS, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_LED_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (resp-&gt;num_leds &gt; 0 &amp;&amp; resp-&gt;num_leds &lt; BNXT_MAX_LED) {</div><div class='hunk'>@@ -8289,54 +12622,64 @@ static int bnxt_hwrm_port_led_qcaps(struct bnxt *bp)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_alloc_wol_fltr(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_wol_filter_alloc_input req = {0};</div><div class='del'>-	struct hwrm_wol_filter_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_wol_filter_alloc_output *resp;</div><div class='add'>+	struct hwrm_wol_filter_alloc_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_WOL_FILTER_ALLOC, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='del'>-	req.wol_type = WOL_FILTER_ALLOC_REQ_WOL_TYPE_MAGICPKT;</div><div class='del'>-	req.enables = cpu_to_le32(WOL_FILTER_ALLOC_REQ_ENABLES_MAC_ADDRESS);</div><div class='del'>-	memcpy(req.mac_address, bp-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_WOL_FILTER_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	req-&gt;wol_type = WOL_FILTER_ALLOC_REQ_WOL_TYPE_MAGICPKT;</div><div class='add'>+	req-&gt;enables = cpu_to_le32(WOL_FILTER_ALLOC_REQ_ENABLES_MAC_ADDRESS);</div><div class='add'>+	memcpy(req-&gt;mac_address, bp-&gt;dev-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		bp-&gt;wol_filter_id = resp-&gt;wol_filter_id;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_hwrm_free_wol_fltr(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_wol_filter_free_input req = {0};</div><div class='add'>+	struct hwrm_wol_filter_free_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_WOL_FILTER_FREE, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='del'>-	req.enables = cpu_to_le32(WOL_FILTER_FREE_REQ_ENABLES_WOL_FILTER_ID);</div><div class='del'>-	req.wol_filter_id = bp-&gt;wol_filter_id;</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	return rc;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_WOL_FILTER_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(WOL_FILTER_FREE_REQ_ENABLES_WOL_FILTER_ID);</div><div class='add'>+	req-&gt;wol_filter_id = bp-&gt;wol_filter_id;</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u16 bnxt_hwrm_get_wol_fltrs(struct bnxt *bp, u16 handle)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_wol_filter_qcfg_input req = {0};</div><div class='del'>-	struct hwrm_wol_filter_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_wol_filter_qcfg_output *resp;</div><div class='add'>+	struct hwrm_wol_filter_qcfg_input *req;</div><div class='ctx'> 	u16 next_handle = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_WOL_FILTER_QCFG, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='del'>-	req.handle = cpu_to_le16(handle);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_WOL_FILTER_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	req-&gt;handle = cpu_to_le16(handle);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		next_handle = le16_to_cpu(resp-&gt;next_handle);</div><div class='ctx'> 		if (next_handle != 0) {</div><div class='hunk'>@@ -8347,7 +12690,7 @@ static u16 bnxt_hwrm_get_wol_fltrs(struct bnxt *bp, u16 handle)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return next_handle;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8355,6 +12698,7 @@ static void bnxt_get_wol_settings(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u16 handle = 0;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;wol = 0;</div><div class='ctx'> 	if (!BNXT_PF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_WOL_CAP))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -8363,80 +12707,27 @@ static void bnxt_get_wol_settings(struct bnxt *bp)</div><div class='ctx'> 	} while (handle &amp;&amp; handle != 0xffff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_BNXT_HWMON</div><div class='del'>-static ssize_t bnxt_show_temp(struct device *dev,</div><div class='del'>-			      struct device_attribute *devattr, char *buf)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_temp_monitor_query_input req = {0};</div><div class='del'>-	struct hwrm_temp_monitor_query_output *resp;</div><div class='del'>-	struct bnxt *bp = dev_get_drvdata(dev);</div><div class='del'>-	u32 temp = 0;</div><div class='del'>-</div><div class='del'>-	resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_TEMP_MONITOR_QUERY, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	if (!_hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT))</div><div class='del'>-		temp = resp-&gt;temp * 1000; /* display millidegree */</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-</div><div class='del'>-	return sprintf(buf, "%u\n", temp);</div><div class='del'>-}</div><div class='del'>-static SENSOR_DEVICE_ATTR(temp1_input, 0444, bnxt_show_temp, NULL, 0);</div><div class='del'>-</div><div class='del'>-static struct attribute *bnxt_attrs[] = {</div><div class='del'>-	&amp;sensor_dev_attr_temp1_input.dev_attr.attr,</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-ATTRIBUTE_GROUPS(bnxt);</div><div class='del'>-</div><div class='del'>-static void bnxt_hwmon_close(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	if (bp-&gt;hwmon_dev) {</div><div class='del'>-		hwmon_device_unregister(bp-&gt;hwmon_dev);</div><div class='del'>-		bp-&gt;hwmon_dev = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnxt_hwmon_open(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-</div><div class='del'>-	bp-&gt;hwmon_dev = hwmon_device_register_with_groups(&amp;pdev-&gt;dev,</div><div class='del'>-							  DRV_MODULE_NAME, bp,</div><div class='del'>-							  bnxt_groups);</div><div class='del'>-	if (IS_ERR(bp-&gt;hwmon_dev)) {</div><div class='del'>-		bp-&gt;hwmon_dev = NULL;</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "Cannot register hwmon device\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-static void bnxt_hwmon_close(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnxt_hwmon_open(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static bool bnxt_eee_config_ok(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_eee *eee = &amp;bp-&gt;eee;</div><div class='add'>+	struct ethtool_keee *eee = &amp;bp-&gt;eee;</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_EEE_CAP))</div><div class='add'>+	if (!(bp-&gt;phy_flags &amp; BNXT_PHY_FL_EEE_CAP))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	if (eee-&gt;eee_enabled) {</div><div class='del'>-		u32 advertising =</div><div class='del'>-			_bnxt_fw_to_ethtool_adv_spds(link_info-&gt;advertising, 0);</div><div class='add'>+		__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);</div><div class='add'>+		__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);</div><div class='add'>+</div><div class='add'>+		_bnxt_fw_to_linkmode(advertising, link_info-&gt;advertising);</div><div class='ctx'> </div><div class='ctx'> 		if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED)) {</div><div class='ctx'> 			eee-&gt;eee_enabled = 0;</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='del'>-		if (eee-&gt;advertised &amp; ~advertising) {</div><div class='del'>-			eee-&gt;advertised = advertising &amp; eee-&gt;supported;</div><div class='add'>+		if (linkmode_andnot(tmp, eee-&gt;advertised, advertising)) {</div><div class='add'>+			linkmode_and(eee-&gt;advertised, advertising,</div><div class='add'>+				     eee-&gt;supported);</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8470,21 +12761,21 @@ static int bnxt_update_phy_setting(struct bnxt *bp)</div><div class='ctx'> 	if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED)) {</div><div class='ctx'> 		if (BNXT_AUTO_MODE(link_info-&gt;auto_mode))</div><div class='ctx'> 			update_link = true;</div><div class='del'>-		if (link_info-&gt;req_link_speed != link_info-&gt;force_link_speed)</div><div class='add'>+		if (bnxt_force_speed_updated(link_info))</div><div class='ctx'> 			update_link = true;</div><div class='ctx'> 		if (link_info-&gt;req_duplex != link_info-&gt;duplex_setting)</div><div class='ctx'> 			update_link = true;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (link_info-&gt;auto_mode == BNXT_LINK_AUTO_NONE)</div><div class='ctx'> 			update_link = true;</div><div class='del'>-		if (link_info-&gt;advertising != link_info-&gt;auto_link_speeds)</div><div class='add'>+		if (bnxt_auto_speed_updated(link_info))</div><div class='ctx'> 			update_link = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* The last close may have shutdown the link, so need to call</div><div class='ctx'> 	 * PHY_CFG to bring it back up.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!netif_carrier_ok(bp-&gt;dev))</div><div class='add'>+	if (!BNXT_LINK_IS_UP(bp))</div><div class='ctx'> 		update_link = true;</div><div class='ctx'> </div><div class='ctx'> 	if (!bnxt_eee_config_ok(bp))</div><div class='hunk'>@@ -8503,27 +12794,121 @@ static int bnxt_update_phy_setting(struct bnxt *bp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Common routine to pre-map certain register block to different GRC window.</div><div class='del'>- * A PF has 16 4K windows and a VF has 4 4K windows. However, only 15 windows</div><div class='del'>- * in PF and 3 windows in VF that can be customized to map in different</div><div class='del'>- * register blocks.</div><div class='del'>- */</div><div class='del'>-static void bnxt_preset_reg_win(struct bnxt *bp)</div><div class='add'>+static int bnxt_init_dflt_ring_mode(struct bnxt *bp);</div><div class='add'>+</div><div class='add'>+static int bnxt_reinit_after_abort(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	if (BNXT_PF(bp)) {</div><div class='del'>-		/* CAG registers map to GRC window #4 */</div><div class='del'>-		writel(BNXT_CAG_REG_BASE,</div><div class='del'>-		       bp-&gt;bar0 + BNXT_GRCPF_REG_WINDOW_BASE_OUT + 12);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;dev-&gt;reg_state == NETREG_UNREGISTERED)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_fw_init_one(bp);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		bnxt_clear_int_mode(bp);</div><div class='add'>+		rc = bnxt_init_int_mode(bp);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			clear_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state);</div><div class='add'>+			set_bit(BNXT_STATE_FW_RESET_DET, &amp;bp-&gt;state);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_init_dflt_ring_mode(struct bnxt *bp);</div><div class='add'>+static void bnxt_cfg_one_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ntuple_filter *ntp_fltr;</div><div class='add'>+	struct bnxt_l2_filter *l2_fltr;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;fltr-&gt;list))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (fltr-&gt;type == BNXT_FLTR_TYPE_NTUPLE) {</div><div class='add'>+		ntp_fltr = container_of(fltr, struct bnxt_ntuple_filter, base);</div><div class='add'>+		l2_fltr = bp-&gt;vnic_info[BNXT_VNIC_DEFAULT].l2_filters[0];</div><div class='add'>+		atomic_inc(&amp;l2_fltr-&gt;refcnt);</div><div class='add'>+		ntp_fltr-&gt;l2_fltr = l2_fltr;</div><div class='add'>+		if (bnxt_hwrm_cfa_ntuple_filter_alloc(bp, ntp_fltr)) {</div><div class='add'>+			bnxt_del_ntp_filter(bp, ntp_fltr);</div><div class='add'>+			netdev_err(bp-&gt;dev, "restoring previously configured ntuple filter id %d failed\n",</div><div class='add'>+				   fltr-&gt;sw_id);</div><div class='add'>+		}</div><div class='add'>+	} else if (fltr-&gt;type == BNXT_FLTR_TYPE_L2) {</div><div class='add'>+		l2_fltr = container_of(fltr, struct bnxt_l2_filter, base);</div><div class='add'>+		if (bnxt_hwrm_l2_filter_alloc(bp, l2_fltr)) {</div><div class='add'>+			bnxt_del_l2_filter(bp, l2_fltr);</div><div class='add'>+			netdev_err(bp-&gt;dev, "restoring previously configured l2 filter id %d failed\n",</div><div class='add'>+				   fltr-&gt;sw_id);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_cfg_usr_fltrs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_filter_base *usr_fltr, *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(usr_fltr, tmp, &amp;bp-&gt;usr_fltr_list, list)</div><div class='add'>+		bnxt_cfg_one_usr_fltr(bp, usr_fltr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_xps_mapping(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int numa_node = dev_to_node(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	unsigned int q_idx, map_idx, cpu, i;</div><div class='add'>+	const struct cpumask *cpu_mask_ptr;</div><div class='add'>+	int nr_cpus = num_online_cpus();</div><div class='add'>+	cpumask_t *q_map;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	q_map = kcalloc(bp-&gt;tx_nr_rings_per_tc, sizeof(*q_map), GFP_KERNEL);</div><div class='add'>+	if (!q_map)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Create CPU mask for all TX queues across MQPRIO traffic classes.</div><div class='add'>+	 * Each TC has the same number of TX queues. The nth TX queue for each</div><div class='add'>+	 * TC will have the same CPU mask.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; nr_cpus; i++) {</div><div class='add'>+		map_idx = i % bp-&gt;tx_nr_rings_per_tc;</div><div class='add'>+		cpu = cpumask_local_spread(i, numa_node);</div><div class='add'>+		cpu_mask_ptr = get_cpu_mask(cpu);</div><div class='add'>+		cpumask_or(&amp;q_map[map_idx], &amp;q_map[map_idx], cpu_mask_ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Register CPU mask for each TX queue except the ones marked for XDP */</div><div class='add'>+	for (q_idx = 0; q_idx &lt; bp-&gt;dev-&gt;real_num_tx_queues; q_idx++) {</div><div class='add'>+		map_idx = q_idx % bp-&gt;tx_nr_rings_per_tc;</div><div class='add'>+		rc = netif_set_xps_queue(bp-&gt;dev, &amp;q_map[map_idx], q_idx);</div><div class='add'>+		if (rc) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Error setting XPS for q:%d\n",</div><div class='add'>+				    q_idx);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(q_map);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_tx_nr_rings(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	return bp-&gt;num_tc ? bp-&gt;tx_nr_rings_per_tc * bp-&gt;num_tc :</div><div class='add'>+			    bp-&gt;tx_nr_rings_per_tc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_tx_nr_rings_per_tc(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	return bp-&gt;num_tc ? bp-&gt;tx_nr_rings / bp-&gt;num_tc : bp-&gt;tx_nr_rings;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_preset_reg_win(bp);</div><div class='ctx'> 	netif_carrier_off(bp-&gt;dev);</div><div class='ctx'> 	if (irq_re_init) {</div><div class='ctx'> 		/* Reserve rings now if none were reserved at driver probe. */</div><div class='hunk'>@@ -8536,13 +12921,14 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='ctx'> 	rc = bnxt_reserve_rings(bp, irq_re_init);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='del'>-	if ((bp-&gt;flags &amp; BNXT_FLAG_RFS) &amp;&amp;</div><div class='del'>-	    !(bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX)) {</div><div class='del'>-		/* disable RFS if falling back to INTA */</div><div class='del'>-		bp-&gt;dev-&gt;hw_features &amp;= ~NETIF_F_NTUPLE;</div><div class='del'>-		bp-&gt;flags &amp;= ~BNXT_FLAG_RFS;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='add'>+	/* Make adjustments if reserved TX rings are less than requested */</div><div class='add'>+	bp-&gt;tx_nr_rings -= bp-&gt;tx_nr_rings_xdp;</div><div class='add'>+	bp-&gt;tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);</div><div class='add'>+	if (bp-&gt;tx_nr_rings_xdp) {</div><div class='add'>+		bp-&gt;tx_nr_rings_xdp = bp-&gt;tx_nr_rings_per_tc;</div><div class='add'>+		bp-&gt;tx_nr_rings += bp-&gt;tx_nr_rings_xdp;</div><div class='add'>+	}</div><div class='ctx'> 	rc = bnxt_alloc_mem(bp, irq_re_init);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "bnxt_alloc_mem err: %x\n", rc);</div><div class='hunk'>@@ -8558,15 +12944,15 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnxt_enable_napi(bp);</div><div class='del'>-	bnxt_debug_dev_init(bp);</div><div class='del'>-</div><div class='ctx'> 	rc = bnxt_init_nic(bp, irq_re_init);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "bnxt_init_nic err: %x\n", rc);</div><div class='del'>-		goto open_err;</div><div class='add'>+		goto open_err_irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bnxt_enable_napi(bp);</div><div class='add'>+	bnxt_debug_dev_init(bp);</div><div class='add'>+</div><div class='ctx'> 	if (link_re_init) {</div><div class='ctx'> 		mutex_lock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 		rc = bnxt_update_phy_setting(bp);</div><div class='hunk'>@@ -8581,26 +12967,39 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (irq_re_init)</div><div class='del'>-		udp_tunnel_get_rx_info(bp-&gt;dev);</div><div class='add'>+	if (irq_re_init) {</div><div class='add'>+		udp_tunnel_nic_reset_ntf(bp-&gt;dev);</div><div class='add'>+		rc = bnxt_set_xps_mapping(bp);</div><div class='add'>+		if (rc)</div><div class='add'>+			netdev_warn(bp-&gt;dev, "failed to set xps mapping\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;tx_nr_rings_xdp &lt; num_possible_cpus()) {</div><div class='add'>+		if (!static_key_enabled(&amp;bnxt_xdp_locking_key))</div><div class='add'>+			static_branch_enable(&amp;bnxt_xdp_locking_key);</div><div class='add'>+	} else if (static_key_enabled(&amp;bnxt_xdp_locking_key)) {</div><div class='add'>+		static_branch_disable(&amp;bnxt_xdp_locking_key);</div><div class='add'>+	}</div><div class='ctx'> 	set_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state);</div><div class='ctx'> 	bnxt_enable_int(bp);</div><div class='ctx'> 	/* Enable TX queues */</div><div class='ctx'> 	bnxt_tx_enable(bp);</div><div class='ctx'> 	mod_timer(&amp;bp-&gt;timer, jiffies + bp-&gt;current_interval);</div><div class='ctx'> 	/* Poll link status and check for SFP+ module status */</div><div class='add'>+	mutex_lock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	bnxt_get_port_module_status(bp);</div><div class='add'>+	mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* VF-reps may need to be re-opened after the PF is re-opened */</div><div class='ctx'> 	if (BNXT_PF(bp))</div><div class='ctx'> 		bnxt_vf_reps_open(bp);</div><div class='add'>+	bnxt_ptp_init_rtc(bp, true);</div><div class='add'>+	bnxt_ptp_cfg_tstamp_filters(bp);</div><div class='add'>+	if (BNXT_SUPPORTS_MULTI_RSS_CTX(bp))</div><div class='add'>+		bnxt_hwrm_realloc_rss_ctx_vnic(bp);</div><div class='add'>+	bnxt_cfg_usr_fltrs(bp);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-open_err:</div><div class='del'>-	bnxt_debug_dev_exit(bp);</div><div class='del'>-	bnxt_disable_napi(bp);</div><div class='del'>-</div><div class='ctx'> open_err_irq:</div><div class='ctx'> 	bnxt_del_napi(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -8611,34 +13010,46 @@ open_err_free_mem:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rtnl_lock held */</div><div class='ctx'> int bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	rc = __bnxt_open_nic(bp, irq_re_init, link_re_init);</div><div class='add'>+	if (test_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state))</div><div class='add'>+		rc = -EIO;</div><div class='add'>+	if (!rc)</div><div class='add'>+		rc = __bnxt_open_nic(bp, irq_re_init, link_re_init);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "nic open fail (rc: %x)\n", rc);</div><div class='del'>-		dev_close(bp-&gt;dev);</div><div class='add'>+		netif_close(bp-&gt;dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rtnl_lock held, open the NIC half way by allocating all resources, but</div><div class='del'>- * NAPI, IRQ, and TX are not enabled.  This is mainly used for offline</div><div class='del'>- * self tests.</div><div class='add'>+/* netdev instance lock held, open the NIC half way by allocating all</div><div class='add'>+ * resources, but NAPI, IRQ, and TX are not enabled.  This is mainly used</div><div class='add'>+ * for offline self tests.</div><div class='ctx'>  */</div><div class='ctx'> int bnxt_half_open_nic(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_alloc_mem(bp, false);</div><div class='add'>+	if (test_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state)) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "A previous firmware reset has not completed, aborting half open\n");</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto half_open_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_alloc_mem(bp, true);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "bnxt_alloc_mem err: %x\n", rc);</div><div class='ctx'> 		goto half_open_err;</div><div class='ctx'> 	}</div><div class='del'>-	rc = bnxt_init_nic(bp, false);</div><div class='add'>+	bnxt_init_napi(bp);</div><div class='add'>+	set_bit(BNXT_STATE_HALF_OPEN, &amp;bp-&gt;state);</div><div class='add'>+	rc = bnxt_init_nic(bp, true);</div><div class='ctx'> 	if (rc) {</div><div class='add'>+		clear_bit(BNXT_STATE_HALF_OPEN, &amp;bp-&gt;state);</div><div class='add'>+		bnxt_del_napi(bp);</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "bnxt_init_nic err: %x\n", rc);</div><div class='ctx'> 		goto half_open_err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -8646,19 +13057,32 @@ int bnxt_half_open_nic(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> half_open_err:</div><div class='ctx'> 	bnxt_free_skbs(bp);</div><div class='del'>-	bnxt_free_mem(bp, false);</div><div class='del'>-	dev_close(bp-&gt;dev);</div><div class='add'>+	bnxt_free_mem(bp, true);</div><div class='add'>+	netif_close(bp-&gt;dev);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rtnl_lock held, this call can only be made after a previous successful</div><div class='del'>- * call to bnxt_half_open_nic().</div><div class='add'>+/* netdev instance lock held, this call can only be made after a previous</div><div class='add'>+ * successful call to bnxt_half_open_nic().</div><div class='ctx'>  */</div><div class='ctx'> void bnxt_half_close_nic(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	bnxt_hwrm_resource_free(bp, false, false);</div><div class='add'>+	bnxt_hwrm_resource_free(bp, false, true);</div><div class='add'>+	bnxt_del_napi(bp);</div><div class='ctx'> 	bnxt_free_skbs(bp);</div><div class='del'>-	bnxt_free_mem(bp, false);</div><div class='add'>+	bnxt_free_mem(bp, true);</div><div class='add'>+	clear_bit(BNXT_STATE_HALF_OPEN, &amp;bp-&gt;state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_reenable_sriov(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (BNXT_PF(bp)) {</div><div class='add'>+		struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='add'>+		int n = pf-&gt;active_vfs;</div><div class='add'>+</div><div class='add'>+		if (n)</div><div class='add'>+			bnxt_cfg_hw_sriov(bp, &amp;n, true);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_open(struct net_device *dev)</div><div class='hunk'>@@ -8666,12 +13090,31 @@ static int bnxt_open(struct net_device *dev)</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_if_change(bp, true);</div><div class='del'>-	rc = __bnxt_open_nic(bp, true, true);</div><div class='add'>+	if (test_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state)) {</div><div class='add'>+		rc = bnxt_reinit_after_abort(bp);</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (rc == -EBUSY)</div><div class='add'>+				netdev_err(bp-&gt;dev, "A previous firmware reset has not completed, aborting\n");</div><div class='add'>+			else</div><div class='add'>+				netdev_err(bp-&gt;dev, "Failed to reinitialize after aborted firmware reset\n");</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_if_change(bp, true);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		bnxt_hwrm_if_change(bp, false);</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwmon_open(bp);</div><div class='add'>+	rc = __bnxt_open_nic(bp, true, true);</div><div class='add'>+	if (rc) {</div><div class='add'>+		bnxt_hwrm_if_change(bp, false);</div><div class='add'>+	} else {</div><div class='add'>+		if (test_and_clear_bit(BNXT_STATE_FW_RESET_DET, &amp;bp-&gt;state)) {</div><div class='add'>+			if (!test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+				bnxt_queue_sp_work(bp,</div><div class='add'>+						   BNXT_RESTART_ULP_SP_EVENT);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -8700,19 +13143,23 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,</div><div class='ctx'> 	while (bnxt_drv_busy(bp))</div><div class='ctx'> 		msleep(20);</div><div class='ctx'> </div><div class='del'>-	/* Flush rings and and disable interrupts */</div><div class='add'>+	if (BNXT_SUPPORTS_MULTI_RSS_CTX(bp))</div><div class='add'>+		bnxt_clear_rss_ctxs(bp);</div><div class='add'>+	/* Flush rings and disable interrupts */</div><div class='ctx'> 	bnxt_shutdown_nic(bp, irq_re_init);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO CHIMP_FW: Link/PHY related cleanup if (link_re_init) */</div><div class='ctx'> </div><div class='ctx'> 	bnxt_debug_dev_exit(bp);</div><div class='ctx'> 	bnxt_disable_napi(bp);</div><div class='del'>-	del_timer_sync(&amp;bp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;bp-&gt;timer);</div><div class='ctx'> 	bnxt_free_skbs(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* Save ring stats before shutdown */</div><div class='del'>-	if (bp-&gt;bnapi)</div><div class='add'>+	if (bp-&gt;bnapi &amp;&amp; irq_re_init) {</div><div class='ctx'> 		bnxt_get_ring_stats(bp, &amp;bp-&gt;net_stats_prev);</div><div class='add'>+		bnxt_get_ring_err_stats(bp, &amp;bp-&gt;ring_err_stats_prev);</div><div class='add'>+	}</div><div class='ctx'> 	if (irq_re_init) {</div><div class='ctx'> 		bnxt_free_irq(bp);</div><div class='ctx'> 		bnxt_del_napi(bp);</div><div class='hunk'>@@ -8720,28 +13167,41 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,</div><div class='ctx'> 	bnxt_free_mem(bp, irq_re_init);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnxt_close_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='add'>+void bnxt_close_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		/* If we get here, it means firmware reset is in progress</div><div class='add'>+		 * while we are trying to close.  We can safely proceed with</div><div class='add'>+		 * the close because we are holding netdev instance lock.</div><div class='add'>+		 * Some firmware messages may fail as we proceed to close.</div><div class='add'>+		 * We set the ABORT_ERR flag here so that the FW reset thread</div><div class='add'>+		 * will later abort when it gets the netdev instance lock</div><div class='add'>+		 * and sees the flag.</div><div class='add'>+		 */</div><div class='add'>+		netdev_warn(bp-&gt;dev, "FW reset in progress during close, FW reset will be aborted\n");</div><div class='add'>+		set_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	if (bp-&gt;sriov_cfg) {</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='ctx'> 		rc = wait_event_interruptible_timeout(bp-&gt;sriov_cfg_wait,</div><div class='ctx'> 						      !bp-&gt;sriov_cfg,</div><div class='ctx'> 						      BNXT_SRIOV_CFG_WAIT_TMO);</div><div class='del'>-		if (rc)</div><div class='del'>-			netdev_warn(bp-&gt;dev, "timeout waiting for SRIOV config operation to complete!\n");</div><div class='add'>+		if (!rc)</div><div class='add'>+			netdev_warn(bp-&gt;dev, "timeout waiting for SRIOV config operation to complete, proceeding to close!\n");</div><div class='add'>+		else if (rc &lt; 0)</div><div class='add'>+			netdev_warn(bp-&gt;dev, "SRIOV config operation interrupted, proceeding to close!\n");</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	__bnxt_close_nic(bp, irq_re_init, link_re_init);</div><div class='del'>-	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	bnxt_hwmon_close(bp);</div><div class='ctx'> 	bnxt_close_nic(bp, true, true);</div><div class='ctx'> 	bnxt_hwrm_shutdown_link(bp);</div><div class='ctx'> 	bnxt_hwrm_if_change(bp, false);</div><div class='hunk'>@@ -8751,56 +13211,63 @@ static int bnxt_close(struct net_device *dev)</div><div class='ctx'> static int bnxt_hwrm_port_phy_read(struct bnxt *bp, u16 phy_addr, u16 reg,</div><div class='ctx'> 				   u16 *val)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_mdio_read_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_port_phy_mdio_read_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_mdio_read_output *resp;</div><div class='add'>+	struct hwrm_port_phy_mdio_read_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10a00)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_MDIO_READ, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='del'>-	req.phy_addr = phy_addr;</div><div class='del'>-	req.reg_addr = cpu_to_le16(reg &amp; 0x1f);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_MDIO_READ);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	req-&gt;phy_addr = phy_addr;</div><div class='add'>+	req-&gt;reg_addr = cpu_to_le16(reg &amp; 0x1f);</div><div class='ctx'> 	if (mdio_phy_id_is_c45(phy_addr)) {</div><div class='del'>-		req.cl45_mdio = 1;</div><div class='del'>-		req.phy_addr = mdio_phy_id_prtad(phy_addr);</div><div class='del'>-		req.dev_addr = mdio_phy_id_devad(phy_addr);</div><div class='del'>-		req.reg_addr = cpu_to_le16(reg);</div><div class='add'>+		req-&gt;cl45_mdio = 1;</div><div class='add'>+		req-&gt;phy_addr = mdio_phy_id_prtad(phy_addr);</div><div class='add'>+		req-&gt;dev_addr = mdio_phy_id_devad(phy_addr);</div><div class='add'>+		req-&gt;reg_addr = cpu_to_le16(reg);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		*val = le16_to_cpu(resp-&gt;reg_data);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_port_phy_write(struct bnxt *bp, u16 phy_addr, u16 reg,</div><div class='ctx'> 				    u16 val)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_mdio_write_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_mdio_write_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10a00)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_MDIO_WRITE, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='del'>-	req.phy_addr = phy_addr;</div><div class='del'>-	req.reg_addr = cpu_to_le16(reg &amp; 0x1f);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_MDIO_WRITE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	req-&gt;phy_addr = phy_addr;</div><div class='add'>+	req-&gt;reg_addr = cpu_to_le16(reg &amp; 0x1f);</div><div class='ctx'> 	if (mdio_phy_id_is_c45(phy_addr)) {</div><div class='del'>-		req.cl45_mdio = 1;</div><div class='del'>-		req.phy_addr = mdio_phy_id_prtad(phy_addr);</div><div class='del'>-		req.dev_addr = mdio_phy_id_devad(phy_addr);</div><div class='del'>-		req.reg_addr = cpu_to_le16(reg);</div><div class='add'>+		req-&gt;cl45_mdio = 1;</div><div class='add'>+		req-&gt;phy_addr = mdio_phy_id_prtad(phy_addr);</div><div class='add'>+		req-&gt;dev_addr = mdio_phy_id_devad(phy_addr);</div><div class='add'>+		req-&gt;reg_addr = cpu_to_le16(reg);</div><div class='ctx'> 	}</div><div class='del'>-	req.reg_data = cpu_to_le16(val);</div><div class='add'>+	req-&gt;reg_data = cpu_to_le16(val);</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rtnl_lock held */</div><div class='add'>+/* netdev instance lock held */</div><div class='ctx'> static int bnxt_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct mii_ioctl_data *mdio = if_mii(ifr);</div><div class='hunk'>@@ -8811,7 +13278,7 @@ static int bnxt_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		mdio-&gt;phy_id = bp-&gt;link_info.phy_addr;</div><div class='ctx'> </div><div class='del'>-		/* fallthru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIREG: {</div><div class='ctx'> 		u16 mii_regval = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -8843,34 +13310,37 @@ static void bnxt_get_ring_stats(struct bnxt *bp,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-		struct ctx_hw_stats *hw_stats = cpr-&gt;hw_stats;</div><div class='add'>+		u64 *sw = cpr-&gt;stats.sw_stats;</div><div class='ctx'> </div><div class='del'>-		stats-&gt;rx_packets += le64_to_cpu(hw_stats-&gt;rx_ucast_pkts);</div><div class='del'>-		stats-&gt;rx_packets += le64_to_cpu(hw_stats-&gt;rx_mcast_pkts);</div><div class='del'>-		stats-&gt;rx_packets += le64_to_cpu(hw_stats-&gt;rx_bcast_pkts);</div><div class='add'>+		stats-&gt;rx_packets += BNXT_GET_RING_STATS64(sw, rx_ucast_pkts);</div><div class='add'>+		stats-&gt;rx_packets += BNXT_GET_RING_STATS64(sw, rx_mcast_pkts);</div><div class='add'>+		stats-&gt;rx_packets += BNXT_GET_RING_STATS64(sw, rx_bcast_pkts);</div><div class='ctx'> </div><div class='del'>-		stats-&gt;tx_packets += le64_to_cpu(hw_stats-&gt;tx_ucast_pkts);</div><div class='del'>-		stats-&gt;tx_packets += le64_to_cpu(hw_stats-&gt;tx_mcast_pkts);</div><div class='del'>-		stats-&gt;tx_packets += le64_to_cpu(hw_stats-&gt;tx_bcast_pkts);</div><div class='add'>+		stats-&gt;tx_packets += BNXT_GET_RING_STATS64(sw, tx_ucast_pkts);</div><div class='add'>+		stats-&gt;tx_packets += BNXT_GET_RING_STATS64(sw, tx_mcast_pkts);</div><div class='add'>+		stats-&gt;tx_packets += BNXT_GET_RING_STATS64(sw, tx_bcast_pkts);</div><div class='ctx'> </div><div class='del'>-		stats-&gt;rx_bytes += le64_to_cpu(hw_stats-&gt;rx_ucast_bytes);</div><div class='del'>-		stats-&gt;rx_bytes += le64_to_cpu(hw_stats-&gt;rx_mcast_bytes);</div><div class='del'>-		stats-&gt;rx_bytes += le64_to_cpu(hw_stats-&gt;rx_bcast_bytes);</div><div class='add'>+		stats-&gt;rx_bytes += BNXT_GET_RING_STATS64(sw, rx_ucast_bytes);</div><div class='add'>+		stats-&gt;rx_bytes += BNXT_GET_RING_STATS64(sw, rx_mcast_bytes);</div><div class='add'>+		stats-&gt;rx_bytes += BNXT_GET_RING_STATS64(sw, rx_bcast_bytes);</div><div class='ctx'> </div><div class='del'>-		stats-&gt;tx_bytes += le64_to_cpu(hw_stats-&gt;tx_ucast_bytes);</div><div class='del'>-		stats-&gt;tx_bytes += le64_to_cpu(hw_stats-&gt;tx_mcast_bytes);</div><div class='del'>-		stats-&gt;tx_bytes += le64_to_cpu(hw_stats-&gt;tx_bcast_bytes);</div><div class='add'>+		stats-&gt;tx_bytes += BNXT_GET_RING_STATS64(sw, tx_ucast_bytes);</div><div class='add'>+		stats-&gt;tx_bytes += BNXT_GET_RING_STATS64(sw, tx_mcast_bytes);</div><div class='add'>+		stats-&gt;tx_bytes += BNXT_GET_RING_STATS64(sw, tx_bcast_bytes);</div><div class='ctx'> </div><div class='ctx'> 		stats-&gt;rx_missed_errors +=</div><div class='del'>-			le64_to_cpu(hw_stats-&gt;rx_discard_pkts);</div><div class='add'>+			BNXT_GET_RING_STATS64(sw, rx_discard_pkts);</div><div class='ctx'> </div><div class='del'>-		stats-&gt;multicast += le64_to_cpu(hw_stats-&gt;rx_mcast_pkts);</div><div class='add'>+		stats-&gt;multicast += BNXT_GET_RING_STATS64(sw, rx_mcast_pkts);</div><div class='ctx'> </div><div class='del'>-		stats-&gt;tx_dropped += le64_to_cpu(hw_stats-&gt;tx_drop_pkts);</div><div class='add'>+		stats-&gt;tx_dropped += BNXT_GET_RING_STATS64(sw, tx_error_pkts);</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_dropped +=</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_netpoll_discards +</div><div class='add'>+			cpr-&gt;sw_stats-&gt;rx.rx_oom_discards;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8885,6 +13355,7 @@ static void bnxt_add_prev_stats(struct bnxt *bp,</div><div class='ctx'> 	stats-&gt;tx_bytes += prev_stats-&gt;tx_bytes;</div><div class='ctx'> 	stats-&gt;rx_missed_errors += prev_stats-&gt;rx_missed_errors;</div><div class='ctx'> 	stats-&gt;multicast += prev_stats-&gt;multicast;</div><div class='add'>+	stats-&gt;rx_dropped += prev_stats-&gt;rx_dropped;</div><div class='ctx'> 	stats-&gt;tx_dropped += prev_stats-&gt;tx_dropped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -8908,27 +13379,63 @@ bnxt_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)</div><div class='ctx'> 	bnxt_add_prev_stats(bp, stats);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS) {</div><div class='del'>-		struct rx_port_stats *rx = bp-&gt;hw_rx_port_stats;</div><div class='del'>-		struct tx_port_stats *tx = bp-&gt;hw_tx_port_stats;</div><div class='del'>-</div><div class='del'>-		stats-&gt;rx_crc_errors = le64_to_cpu(rx-&gt;rx_fcs_err_frames);</div><div class='del'>-		stats-&gt;rx_frame_errors = le64_to_cpu(rx-&gt;rx_align_err_frames);</div><div class='del'>-		stats-&gt;rx_length_errors = le64_to_cpu(rx-&gt;rx_undrsz_frames) +</div><div class='del'>-					  le64_to_cpu(rx-&gt;rx_ovrsz_frames) +</div><div class='del'>-					  le64_to_cpu(rx-&gt;rx_runt_frames);</div><div class='del'>-		stats-&gt;rx_errors = le64_to_cpu(rx-&gt;rx_false_carrier_frames) +</div><div class='del'>-				   le64_to_cpu(rx-&gt;rx_jbr_frames);</div><div class='del'>-		stats-&gt;collisions = le64_to_cpu(tx-&gt;tx_total_collisions);</div><div class='del'>-		stats-&gt;tx_fifo_errors = le64_to_cpu(tx-&gt;tx_fifo_underruns);</div><div class='del'>-		stats-&gt;tx_errors = le64_to_cpu(tx-&gt;tx_err);</div><div class='add'>+		u64 *rx = bp-&gt;port_stats.sw_stats;</div><div class='add'>+		u64 *tx = bp-&gt;port_stats.sw_stats +</div><div class='add'>+			  BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_crc_errors =</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_fcs_err_frames);</div><div class='add'>+		stats-&gt;rx_frame_errors =</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_align_err_frames);</div><div class='add'>+		stats-&gt;rx_length_errors =</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_undrsz_frames) +</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_ovrsz_frames) +</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_runt_frames);</div><div class='add'>+		stats-&gt;rx_errors =</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_false_carrier_frames) +</div><div class='add'>+			BNXT_GET_RX_PORT_STATS64(rx, rx_jbr_frames);</div><div class='add'>+		stats-&gt;collisions =</div><div class='add'>+			BNXT_GET_TX_PORT_STATS64(tx, tx_total_collisions);</div><div class='add'>+		stats-&gt;tx_fifo_errors =</div><div class='add'>+			BNXT_GET_TX_PORT_STATS64(tx, tx_fifo_underruns);</div><div class='add'>+		stats-&gt;tx_errors = BNXT_GET_TX_PORT_STATS64(tx, tx_err);</div><div class='ctx'> 	}</div><div class='ctx'> 	clear_bit(BNXT_STATE_READ_STATS, &amp;bp-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_get_one_ring_err_stats(struct bnxt *bp,</div><div class='add'>+					struct bnxt_total_ring_err_stats *stats,</div><div class='add'>+					struct bnxt_cp_ring_info *cpr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_sw_stats *sw_stats = cpr-&gt;sw_stats;</div><div class='add'>+	u64 *hw_stats = cpr-&gt;stats.sw_stats;</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_total_l4_csum_errors += sw_stats-&gt;rx.rx_l4_csum_errors;</div><div class='add'>+	stats-&gt;rx_total_resets += sw_stats-&gt;rx.rx_resets;</div><div class='add'>+	stats-&gt;rx_total_buf_errors += sw_stats-&gt;rx.rx_buf_errors;</div><div class='add'>+	stats-&gt;rx_total_oom_discards += sw_stats-&gt;rx.rx_oom_discards;</div><div class='add'>+	stats-&gt;rx_total_netpoll_discards += sw_stats-&gt;rx.rx_netpoll_discards;</div><div class='add'>+	stats-&gt;rx_total_ring_discards +=</div><div class='add'>+		BNXT_GET_RING_STATS64(hw_stats, rx_discard_pkts);</div><div class='add'>+	stats-&gt;tx_total_resets += sw_stats-&gt;tx.tx_resets;</div><div class='add'>+	stats-&gt;tx_total_ring_discards +=</div><div class='add'>+		BNXT_GET_RING_STATS64(hw_stats, tx_discard_pkts);</div><div class='add'>+	stats-&gt;total_missed_irqs += sw_stats-&gt;cmn.missed_irqs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_get_ring_err_stats(struct bnxt *bp,</div><div class='add'>+			     struct bnxt_total_ring_err_stats *stats)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++)</div><div class='add'>+		bnxt_get_one_ring_err_stats(bp, stats, &amp;bp-&gt;bnapi[i]-&gt;cp_ring);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool bnxt_mc_list_updated(struct bnxt *bp, u32 *rx_mask)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	u8 *haddr;</div><div class='ctx'> 	int mc_count = 0;</div><div class='hunk'>@@ -8962,7 +13469,7 @@ static bool bnxt_mc_list_updated(struct bnxt *bp, u32 *rx_mask)</div><div class='ctx'> static bool bnxt_uc_list_updated(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int off = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -8981,20 +13488,22 @@ static bool bnxt_uc_list_updated(struct bnxt *bp)</div><div class='ctx'> static void bnxt_set_rx_mode(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='del'>-	u32 mask = vnic-&gt;rx_mask;</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='ctx'> 	bool mc_update = false;</div><div class='ctx'> 	bool uc_update;</div><div class='add'>+	u32 mask;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(dev))</div><div class='add'>+	if (!test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='add'>+	mask = vnic-&gt;rx_mask;</div><div class='ctx'> 	mask &amp;= ~(CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS |</div><div class='ctx'> 		  CFA_L2_SET_RX_MASK_REQ_MASK_MCAST |</div><div class='ctx'> 		  CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST |</div><div class='ctx'> 		  CFA_L2_SET_RX_MASK_REQ_MASK_BCAST);</div><div class='ctx'> </div><div class='del'>-	if ((dev-&gt;flags &amp; IFF_PROMISC) &amp;&amp; bnxt_promisc_ok(bp))</div><div class='add'>+	if (dev-&gt;flags &amp; IFF_PROMISC)</div><div class='ctx'> 		mask |= CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;</div><div class='ctx'> </div><div class='ctx'> 	uc_update = bnxt_uc_list_updated(bp);</div><div class='hunk'>@@ -9004,22 +13513,21 @@ static void bnxt_set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='ctx'> 		mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='ctx'> 		vnic-&gt;mc_list_count = 0;</div><div class='del'>-	} else {</div><div class='add'>+	} else if (dev-&gt;flags &amp; IFF_MULTICAST) {</div><div class='ctx'> 		mc_update = bnxt_mc_list_updated(bp, &amp;mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (mask != vnic-&gt;rx_mask || uc_update || mc_update) {</div><div class='ctx'> 		vnic-&gt;rx_mask = mask;</div><div class='ctx'> </div><div class='del'>-		set_bit(BNXT_RX_MASK_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		bnxt_queue_sp_work(bp);</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_RX_MASK_SP_EVENT);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_cfg_rx_mode(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='del'>-	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='add'>+	struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int i, off = 0, rc;</div><div class='ctx'> 	bool uc_update;</div><div class='hunk'>@@ -9031,19 +13539,12 @@ static int bnxt_cfg_rx_mode(struct bnxt *bp)</div><div class='ctx'> 	if (!uc_update)</div><div class='ctx'> 		goto skip_uc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	for (i = 1; i &lt; vnic-&gt;uc_filter_count; i++) {</div><div class='del'>-		struct hwrm_cfa_l2_filter_free_input req = {0};</div><div class='del'>-</div><div class='del'>-		bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_L2_FILTER_FREE, -1,</div><div class='del'>-				       -1);</div><div class='add'>+		struct bnxt_l2_filter *fltr = vnic-&gt;l2_filters[i];</div><div class='ctx'> </div><div class='del'>-		req.l2_filter_id = vnic-&gt;fw_l2_filter_id[i];</div><div class='del'>-</div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='add'>+		bnxt_hwrm_l2_filter_free(bp, fltr);</div><div class='add'>+		bnxt_del_l2_filter(bp, fltr);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> </div><div class='ctx'> 	vnic-&gt;uc_filter_count = 1;</div><div class='ctx'> </div><div class='hunk'>@@ -9062,18 +13563,31 @@ static int bnxt_cfg_rx_mode(struct bnxt *bp)</div><div class='ctx'> 	for (i = 1, off = 0; i &lt; vnic-&gt;uc_filter_count; i++, off += ETH_ALEN) {</div><div class='ctx'> 		rc = bnxt_hwrm_set_vnic_filter(bp, 0, i, vnic-&gt;uc_list + off);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "HWRM vnic filter failure rc: %x\n",</div><div class='del'>-				   rc);</div><div class='add'>+			if (BNXT_VF(bp) &amp;&amp; rc == -ENODEV) {</div><div class='add'>+				if (!test_and_set_bit(BNXT_STATE_L2_FILTER_RETRY, &amp;bp-&gt;state))</div><div class='add'>+					netdev_warn(bp-&gt;dev, "Cannot configure L2 filters while PF is unavailable, will retry\n");</div><div class='add'>+				else</div><div class='add'>+					netdev_dbg(bp-&gt;dev, "PF still unavailable while configuring L2 filters.\n");</div><div class='add'>+				rc = 0;</div><div class='add'>+			} else {</div><div class='add'>+				netdev_err(bp-&gt;dev, "HWRM vnic filter failure rc: %x\n", rc);</div><div class='add'>+			}</div><div class='ctx'> 			vnic-&gt;uc_filter_count = i;</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (test_and_clear_bit(BNXT_STATE_L2_FILTER_RETRY, &amp;bp-&gt;state))</div><div class='add'>+		netdev_notice(bp-&gt;dev, "Retry of L2 filter configuration successful.\n");</div><div class='ctx'> </div><div class='ctx'> skip_uc:</div><div class='add'>+	if ((vnic-&gt;rx_mask &amp; CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS) &amp;&amp;</div><div class='add'>+	    !bnxt_promisc_ok(bp))</div><div class='add'>+		vnic-&gt;rx_mask &amp;= ~CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS;</div><div class='ctx'> 	rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, 0);</div><div class='del'>-	if (rc &amp;&amp; vnic-&gt;mc_list_count) {</div><div class='add'>+	if (rc &amp;&amp; (vnic-&gt;rx_mask &amp; CFA_L2_SET_RX_MASK_REQ_MASK_MCAST)) {</div><div class='ctx'> 		netdev_info(bp-&gt;dev, "Failed setting MC filters rc: %d, turning on ALL_MCAST mode\n",</div><div class='ctx'> 			    rc);</div><div class='add'>+		vnic-&gt;rx_mask &amp;= ~CFA_L2_SET_RX_MASK_REQ_MASK_MCAST;</div><div class='ctx'> 		vnic-&gt;rx_mask |= CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST;</div><div class='ctx'> 		vnic-&gt;mc_list_count = 0;</div><div class='ctx'> 		rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, 0);</div><div class='hunk'>@@ -9107,37 +13621,43 @@ static bool bnxt_can_reserve_rings(struct bnxt *bp)</div><div class='ctx'> /* If the chip and firmware supports RFS */</div><div class='ctx'> static bool bnxt_rfs_supported(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2)</div><div class='ctx'> 			return true;</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='add'>+	/* 212 firmware is broken for aRFS */</div><div class='add'>+	if (BNXT_FW_MAJ(bp) == 212)</div><div class='add'>+		return false;</div><div class='ctx'> 	if (BNXT_PF(bp) &amp;&amp; !BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='ctx'> 		return true;</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_NEW_RSS_CAP)</div><div class='add'>+	if (bp-&gt;rss_cap &amp; BNXT_RSS_CAP_NEW_RSS_CAP)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* If runtime conditions support RFS */</div><div class='del'>-static bool bnxt_rfs_capable(struct bnxt *bp)</div><div class='add'>+bool bnxt_rfs_capable(struct bnxt *bp, bool new_rss_ctx)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	int vnics, max_vnics, max_rss_ctxs;</div><div class='add'>+	struct bnxt_hw_rings hwr = {0};</div><div class='add'>+	int max_vnics, max_rss_ctxs;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='add'>+	    !BNXT_SUPPORTS_NTUPLE_VNIC(bp))</div><div class='ctx'> 		return bnxt_rfs_supported(bp);</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_MSIX_CAP) || !bnxt_can_reserve_rings(bp))</div><div class='add'>+</div><div class='add'>+	if (!bnxt_can_reserve_rings(bp) || !bp-&gt;rx_nr_rings)</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='del'>-	vnics = 1 + bp-&gt;rx_nr_rings;</div><div class='add'>+	hwr.grp = bp-&gt;rx_nr_rings;</div><div class='add'>+	hwr.vnic = bnxt_get_total_vnics(bp, bp-&gt;rx_nr_rings);</div><div class='add'>+	if (new_rss_ctx)</div><div class='add'>+		hwr.vnic++;</div><div class='add'>+	hwr.rss_ctx = bnxt_get_total_rss_ctxs(bp, &amp;hwr);</div><div class='ctx'> 	max_vnics = bnxt_get_max_func_vnics(bp);</div><div class='ctx'> 	max_rss_ctxs = bnxt_get_max_func_rss_ctxs(bp);</div><div class='ctx'> </div><div class='del'>-	/* RSS contexts not a limiting factor */</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_NEW_RSS_CAP)</div><div class='del'>-		max_rss_ctxs = max_vnics;</div><div class='del'>-	if (vnics &gt; max_vnics || vnics &gt; max_rss_ctxs) {</div><div class='add'>+	if (hwr.vnic &gt; max_vnics || hwr.rss_ctx &gt; max_rss_ctxs) {</div><div class='ctx'> 		if (bp-&gt;rx_nr_rings &gt; 1)</div><div class='ctx'> 			netdev_warn(bp-&gt;dev,</div><div class='ctx'> 				    "Not enough resources to support NTUPLE filters, enough resources for up to %d rx rings\n",</div><div class='hunk'>@@ -9148,30 +13668,36 @@ static bool bnxt_rfs_capable(struct bnxt *bp)</div><div class='ctx'> 	if (!BNXT_NEW_RM(bp))</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	if (vnics == bp-&gt;hw_resc.resv_vnics)</div><div class='add'>+	/* Do not reduce VNIC and RSS ctx reservations.  There is a FW</div><div class='add'>+	 * issue that will mess up the default VNIC if we reduce the</div><div class='add'>+	 * reservations.</div><div class='add'>+	 */</div><div class='add'>+	if (hwr.vnic &lt;= bp-&gt;hw_resc.resv_vnics &amp;&amp;</div><div class='add'>+	    hwr.rss_ctx &lt;= bp-&gt;hw_resc.resv_rsscos_ctxs)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_reserve_rings(bp, 0, 0, 0, 0, 0, vnics);</div><div class='del'>-	if (vnics &lt;= bp-&gt;hw_resc.resv_vnics)</div><div class='add'>+	bnxt_hwrm_reserve_rings(bp, &amp;hwr);</div><div class='add'>+	if (hwr.vnic &lt;= bp-&gt;hw_resc.resv_vnics &amp;&amp;</div><div class='add'>+	    hwr.rss_ctx &lt;= bp-&gt;hw_resc.resv_rsscos_ctxs)</div><div class='ctx'> 		return true;</div><div class='ctx'> </div><div class='ctx'> 	netdev_warn(bp-&gt;dev, "Unable to reserve resources to support NTUPLE filters.\n");</div><div class='del'>-	bnxt_hwrm_reserve_rings(bp, 0, 0, 0, 0, 0, 1);</div><div class='add'>+	hwr.vnic = 1;</div><div class='add'>+	hwr.rss_ctx = 0;</div><div class='add'>+	bnxt_hwrm_reserve_rings(bp, &amp;hwr);</div><div class='ctx'> 	return false;</div><div class='del'>-#else</div><div class='del'>-	return false;</div><div class='del'>-#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_features_t bnxt_fix_features(struct net_device *dev,</div><div class='ctx'> 					   netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	netdev_features_t vlan_features;</div><div class='ctx'> </div><div class='del'>-	if ((features &amp; NETIF_F_NTUPLE) &amp;&amp; !bnxt_rfs_capable(bp))</div><div class='add'>+	if ((features &amp; NETIF_F_NTUPLE) &amp;&amp; !bnxt_rfs_capable(bp, false))</div><div class='ctx'> 		features &amp;= ~NETIF_F_NTUPLE;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_NO_AGG_RINGS)</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_NO_AGG_RINGS) || bp-&gt;xdp_prog)</div><div class='ctx'> 		features &amp;= ~(NETIF_F_LRO | NETIF_F_GRO_HW);</div><div class='ctx'> </div><div class='ctx'> 	if (!(features &amp; NETIF_F_GRO))</div><div class='hunk'>@@ -9180,37 +13706,41 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev,</div><div class='ctx'> 	if (features &amp; NETIF_F_GRO_HW)</div><div class='ctx'> 		features &amp;= ~NETIF_F_LRO;</div><div class='ctx'> </div><div class='del'>-	/* Both CTAG and STAG VLAN accelaration on the RX side have to be</div><div class='add'>+	/* Both CTAG and STAG VLAN acceleration on the RX side have to be</div><div class='ctx'> 	 * turned on or off together.</div><div class='ctx'> 	 */</div><div class='del'>-	if ((features &amp; (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) !=</div><div class='del'>-	    (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) {</div><div class='del'>-		if (dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX)</div><div class='del'>-			features &amp;= ~(NETIF_F_HW_VLAN_CTAG_RX |</div><div class='del'>-				      NETIF_F_HW_VLAN_STAG_RX);</div><div class='del'>-		else</div><div class='del'>-			features |= NETIF_F_HW_VLAN_CTAG_RX |</div><div class='del'>-				    NETIF_F_HW_VLAN_STAG_RX;</div><div class='add'>+	vlan_features = features &amp; BNXT_HW_FEATURE_VLAN_ALL_RX;</div><div class='add'>+	if (vlan_features != BNXT_HW_FEATURE_VLAN_ALL_RX) {</div><div class='add'>+		if (dev-&gt;features &amp; BNXT_HW_FEATURE_VLAN_ALL_RX)</div><div class='add'>+			features &amp;= ~BNXT_HW_FEATURE_VLAN_ALL_RX;</div><div class='add'>+		else if (vlan_features)</div><div class='add'>+			features |= BNXT_HW_FEATURE_VLAN_ALL_RX;</div><div class='ctx'> 	}</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='del'>-	if (BNXT_VF(bp)) {</div><div class='del'>-		if (bp-&gt;vf.vlan) {</div><div class='del'>-			features &amp;= ~(NETIF_F_HW_VLAN_CTAG_RX |</div><div class='del'>-				      NETIF_F_HW_VLAN_STAG_RX);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (BNXT_VF(bp) &amp;&amp; bp-&gt;vf.vlan)</div><div class='add'>+		features &amp;= ~BNXT_HW_FEATURE_VLAN_ALL_RX;</div><div class='ctx'> #endif</div><div class='ctx'> 	return features;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_reinit_features(struct bnxt *bp, bool irq_re_init,</div><div class='add'>+				bool link_re_init, u32 flags, bool update_tpa)</div><div class='add'>+{</div><div class='add'>+	bnxt_close_nic(bp, irq_re_init, link_re_init);</div><div class='add'>+	bp-&gt;flags = flags;</div><div class='add'>+	if (update_tpa)</div><div class='add'>+		bnxt_set_ring_params(bp);</div><div class='add'>+	return bnxt_open_nic(bp, irq_re_init, link_re_init);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='add'>+	bool update_tpa = false, update_ntuple = false;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	u32 flags = bp-&gt;flags;</div><div class='ctx'> 	u32 changes;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	bool re_init = false;</div><div class='del'>-	bool update_tpa = false;</div><div class='ctx'> </div><div class='ctx'> 	flags &amp;= ~BNXT_FLAG_ALL_CONFIG_FEATS;</div><div class='ctx'> 	if (features &amp; NETIF_F_GRO_HW)</div><div class='hunk'>@@ -9221,42 +13751,47 @@ static int bnxt_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_NO_AGG_RINGS)</div><div class='ctx'> 		flags &amp;= ~BNXT_FLAG_TPA;</div><div class='ctx'> </div><div class='del'>-	if (features &amp; NETIF_F_HW_VLAN_CTAG_RX)</div><div class='add'>+	if (features &amp; BNXT_HW_FEATURE_VLAN_ALL_RX)</div><div class='ctx'> 		flags |= BNXT_FLAG_STRIP_VLAN;</div><div class='ctx'> </div><div class='ctx'> 	if (features &amp; NETIF_F_NTUPLE)</div><div class='ctx'> 		flags |= BNXT_FLAG_RFS;</div><div class='add'>+	else</div><div class='add'>+		bnxt_clear_usr_fltrs(bp, true);</div><div class='ctx'> </div><div class='ctx'> 	changes = flags ^ bp-&gt;flags;</div><div class='ctx'> 	if (changes &amp; BNXT_FLAG_TPA) {</div><div class='ctx'> 		update_tpa = true;</div><div class='ctx'> 		if ((bp-&gt;flags &amp; BNXT_FLAG_TPA) == 0 ||</div><div class='del'>-		    (flags &amp; BNXT_FLAG_TPA) == 0)</div><div class='add'>+		    (flags &amp; BNXT_FLAG_TPA) == 0 ||</div><div class='add'>+		    (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 			re_init = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changes &amp; ~BNXT_FLAG_TPA)</div><div class='ctx'> 		re_init = true;</div><div class='ctx'> </div><div class='add'>+	if (changes &amp; BNXT_FLAG_RFS)</div><div class='add'>+		update_ntuple = true;</div><div class='add'>+</div><div class='ctx'> 	if (flags != bp-&gt;flags) {</div><div class='ctx'> 		u32 old_flags = bp-&gt;flags;</div><div class='ctx'> </div><div class='del'>-		bp-&gt;flags = flags;</div><div class='del'>-</div><div class='ctx'> 		if (!test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state)) {</div><div class='add'>+			bp-&gt;flags = flags;</div><div class='ctx'> 			if (update_tpa)</div><div class='ctx'> 				bnxt_set_ring_params(bp);</div><div class='ctx'> 			return rc;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (re_init) {</div><div class='del'>-			bnxt_close_nic(bp, false, false);</div><div class='del'>-			if (update_tpa)</div><div class='del'>-				bnxt_set_ring_params(bp);</div><div class='add'>+		if (update_ntuple)</div><div class='add'>+			return bnxt_reinit_features(bp, true, false, flags, update_tpa);</div><div class='add'>+</div><div class='add'>+		if (re_init)</div><div class='add'>+			return bnxt_reinit_features(bp, false, false, flags, update_tpa);</div><div class='ctx'> </div><div class='del'>-			return bnxt_open_nic(bp, false, false);</div><div class='del'>-		}</div><div class='ctx'> 		if (update_tpa) {</div><div class='add'>+			bp-&gt;flags = flags;</div><div class='ctx'> 			rc = bnxt_set_tpa(bp,</div><div class='ctx'> 					  (flags &amp; BNXT_FLAG_TPA) ?</div><div class='ctx'> 					  true : false);</div><div class='hunk'>@@ -9267,37 +13802,224 @@ static int bnxt_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool bnxt_exthdr_check(struct bnxt *bp, struct sk_buff *skb, int nw_off,</div><div class='add'>+			      u8 **nextp)</div><div class='add'>+{</div><div class='add'>+	struct ipv6hdr *ip6h = (struct ipv6hdr *)(skb-&gt;data + nw_off);</div><div class='add'>+	struct hop_jumbo_hdr *jhdr;</div><div class='add'>+	int hdr_count = 0;</div><div class='add'>+	u8 *nexthdr;</div><div class='add'>+	int start;</div><div class='add'>+</div><div class='add'>+	/* Check that there are at most 2 IPv6 extension headers, no</div><div class='add'>+	 * fragment header, and each is &lt;= 64 bytes.</div><div class='add'>+	 */</div><div class='add'>+	start = nw_off + sizeof(*ip6h);</div><div class='add'>+	nexthdr = &amp;ip6h-&gt;nexthdr;</div><div class='add'>+	while (ipv6_ext_hdr(*nexthdr)) {</div><div class='add'>+		struct ipv6_opt_hdr *hp;</div><div class='add'>+		int hdrlen;</div><div class='add'>+</div><div class='add'>+		if (hdr_count &gt;= 3 || *nexthdr == NEXTHDR_NONE ||</div><div class='add'>+		    *nexthdr == NEXTHDR_FRAGMENT)</div><div class='add'>+			return false;</div><div class='add'>+		hp = __skb_header_pointer(NULL, start, sizeof(*hp), skb-&gt;data,</div><div class='add'>+					  skb_headlen(skb), NULL);</div><div class='add'>+		if (!hp)</div><div class='add'>+			return false;</div><div class='add'>+		if (*nexthdr == NEXTHDR_AUTH)</div><div class='add'>+			hdrlen = ipv6_authlen(hp);</div><div class='add'>+		else</div><div class='add'>+			hdrlen = ipv6_optlen(hp);</div><div class='add'>+</div><div class='add'>+		if (hdrlen &gt; 64)</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		/* The ext header may be a hop-by-hop header inserted for</div><div class='add'>+		 * big TCP purposes. This will be removed before sending</div><div class='add'>+		 * from NIC, so do not count it.</div><div class='add'>+		 */</div><div class='add'>+		if (*nexthdr == NEXTHDR_HOP) {</div><div class='add'>+			if (likely(skb-&gt;len &lt;= GRO_LEGACY_MAX_SIZE))</div><div class='add'>+				goto increment_hdr;</div><div class='add'>+</div><div class='add'>+			jhdr = (struct hop_jumbo_hdr *)hp;</div><div class='add'>+			if (jhdr-&gt;tlv_type != IPV6_TLV_JUMBO || jhdr-&gt;hdrlen != 0 ||</div><div class='add'>+			    jhdr-&gt;nexthdr != IPPROTO_TCP)</div><div class='add'>+				goto increment_hdr;</div><div class='add'>+</div><div class='add'>+			goto next_hdr;</div><div class='add'>+		}</div><div class='add'>+increment_hdr:</div><div class='add'>+		hdr_count++;</div><div class='add'>+next_hdr:</div><div class='add'>+		nexthdr = &amp;hp-&gt;nexthdr;</div><div class='add'>+		start += hdrlen;</div><div class='add'>+	}</div><div class='add'>+	if (nextp) {</div><div class='add'>+		/* Caller will check inner protocol */</div><div class='add'>+		if (skb-&gt;encapsulation) {</div><div class='add'>+			*nextp = nexthdr;</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+		*nextp = NULL;</div><div class='add'>+	}</div><div class='add'>+	/* Only support TCP/UDP for non-tunneled ipv6 and inner ipv6 */</div><div class='add'>+	return *nexthdr == IPPROTO_TCP || *nexthdr == IPPROTO_UDP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* For UDP, we can only handle 1 Vxlan port and 1 Geneve port. */</div><div class='add'>+static bool bnxt_udp_tunl_check(struct bnxt *bp, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct udphdr *uh = udp_hdr(skb);</div><div class='add'>+	__be16 udp_port = uh-&gt;dest;</div><div class='add'>+</div><div class='add'>+	if (udp_port != bp-&gt;vxlan_port &amp;&amp; udp_port != bp-&gt;nge_port &amp;&amp;</div><div class='add'>+	    udp_port != bp-&gt;vxlan_gpe_port)</div><div class='add'>+		return false;</div><div class='add'>+	if (skb-&gt;inner_protocol == htons(ETH_P_TEB)) {</div><div class='add'>+		struct ethhdr *eh = inner_eth_hdr(skb);</div><div class='add'>+</div><div class='add'>+		switch (eh-&gt;h_proto) {</div><div class='add'>+		case htons(ETH_P_IP):</div><div class='add'>+			return true;</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			return bnxt_exthdr_check(bp, skb,</div><div class='add'>+						 skb_inner_network_offset(skb),</div><div class='add'>+						 NULL);</div><div class='add'>+		}</div><div class='add'>+	} else if (skb-&gt;inner_protocol == htons(ETH_P_IP)) {</div><div class='add'>+		return true;</div><div class='add'>+	} else if (skb-&gt;inner_protocol == htons(ETH_P_IPV6)) {</div><div class='add'>+		return bnxt_exthdr_check(bp, skb, skb_inner_network_offset(skb),</div><div class='add'>+					 NULL);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_tunl_check(struct bnxt *bp, struct sk_buff *skb, u8 l4_proto)</div><div class='add'>+{</div><div class='add'>+	switch (l4_proto) {</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+		return bnxt_udp_tunl_check(bp, skb);</div><div class='add'>+	case IPPROTO_IPIP:</div><div class='add'>+		return true;</div><div class='add'>+	case IPPROTO_GRE: {</div><div class='add'>+		switch (skb-&gt;inner_protocol) {</div><div class='add'>+		default:</div><div class='add'>+			return false;</div><div class='add'>+		case htons(ETH_P_IP):</div><div class='add'>+			return true;</div><div class='add'>+		case htons(ETH_P_IPV6):</div><div class='add'>+			fallthrough;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	case IPPROTO_IPV6:</div><div class='add'>+		/* Check ext headers of inner ipv6 */</div><div class='add'>+		return bnxt_exthdr_check(bp, skb, skb_inner_network_offset(skb),</div><div class='add'>+					 NULL);</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_features_t bnxt_features_check(struct sk_buff *skb,</div><div class='add'>+					     struct net_device *dev,</div><div class='add'>+					     netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u8 *l4_proto;</div><div class='add'>+</div><div class='add'>+	features = vlan_features_check(skb, features);</div><div class='add'>+	switch (vlan_get_protocol(skb)) {</div><div class='add'>+	case htons(ETH_P_IP):</div><div class='add'>+		if (!skb-&gt;encapsulation)</div><div class='add'>+			return features;</div><div class='add'>+		l4_proto = &amp;ip_hdr(skb)-&gt;protocol;</div><div class='add'>+		if (bnxt_tunl_check(bp, skb, *l4_proto))</div><div class='add'>+			return features;</div><div class='add'>+		break;</div><div class='add'>+	case htons(ETH_P_IPV6):</div><div class='add'>+		if (!bnxt_exthdr_check(bp, skb, skb_network_offset(skb),</div><div class='add'>+				       &amp;l4_proto))</div><div class='add'>+			break;</div><div class='add'>+		if (!l4_proto || bnxt_tunl_check(bp, skb, *l4_proto))</div><div class='add'>+			return features;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return features &amp; ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_dbg_hwrm_rd_reg(struct bnxt *bp, u32 reg_off, u16 num_words,</div><div class='add'>+			 u32 *reg_buf)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_read_direct_output *resp;</div><div class='add'>+	struct hwrm_dbg_read_direct_input *req;</div><div class='add'>+	__le32 *dbg_reg_buf;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_READ_DIRECT);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	dbg_reg_buf = hwrm_req_dma_slice(bp, req, num_words * 4,</div><div class='add'>+					 &amp;mapping);</div><div class='add'>+	if (!dbg_reg_buf) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto dbg_rd_reg_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;host_dest_addr = cpu_to_le64(mapping);</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	req-&gt;read_addr = cpu_to_le32(reg_off + CHIMP_REG_VIEW_ADDR);</div><div class='add'>+	req-&gt;read_len32 = cpu_to_le32(num_words);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc || resp-&gt;error_code) {</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto dbg_rd_reg_exit;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; num_words; i++)</div><div class='add'>+		reg_buf[i] = le32_to_cpu(dbg_reg_buf[i]);</div><div class='add'>+</div><div class='add'>+dbg_rd_reg_exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_dbg_hwrm_ring_info_get(struct bnxt *bp, u8 ring_type,</div><div class='ctx'> 				       u32 ring_id, u32 *prod, u32 *cons)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_dbg_ring_info_get_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_dbg_ring_info_get_input req = {0};</div><div class='add'>+	struct hwrm_dbg_ring_info_get_output *resp;</div><div class='add'>+	struct hwrm_dbg_ring_info_get_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_DBG_RING_INFO_GET, -1, -1);</div><div class='del'>-	req.ring_type = ring_type;</div><div class='del'>-	req.fw_ring_id = cpu_to_le32(ring_id);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_RING_INFO_GET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;ring_type = ring_type;</div><div class='add'>+	req-&gt;fw_ring_id = cpu_to_le32(ring_id);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		*prod = le32_to_cpu(resp-&gt;producer_index);</div><div class='ctx'> 		*cons = le32_to_cpu(resp-&gt;consumer_index);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_dump_tx_sw_state(struct bnxt_napi *bnapi)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_tx_ring_info *txr = bnapi-&gt;tx_ring;</div><div class='del'>-	int i = bnapi-&gt;index;</div><div class='del'>-</div><div class='del'>-	if (!txr)</div><div class='del'>-		return;</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	int i = bnapi-&gt;index, j;</div><div class='ctx'> </div><div class='del'>-	netdev_info(bnapi-&gt;bp-&gt;dev, "[%d]: tx{fw_ring: %d prod: %x cons: %x}\n",</div><div class='del'>-		    i, txr-&gt;tx_ring_struct.fw_ring_id, txr-&gt;tx_prod,</div><div class='del'>-		    txr-&gt;tx_cons);</div><div class='add'>+	bnxt_for_each_napi_tx(j, bnapi, txr)</div><div class='add'>+		netdev_info(bnapi-&gt;bp-&gt;dev, "[%d.%d]: tx{fw_ring: %d prod: %x cons: %x}\n",</div><div class='add'>+			    i, j, txr-&gt;tx_ring_struct.fw_ring_id, txr-&gt;tx_prod,</div><div class='add'>+			    txr-&gt;tx_cons);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_dump_rx_sw_state(struct bnxt_napi *bnapi)</div><div class='hunk'>@@ -9316,11 +14038,19 @@ static void bnxt_dump_rx_sw_state(struct bnxt_napi *bnapi)</div><div class='ctx'> </div><div class='ctx'> static void bnxt_dump_cp_sw_state(struct bnxt_napi *bnapi)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-	int i = bnapi-&gt;index;</div><div class='add'>+	struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring, *cpr2;</div><div class='add'>+	int i = bnapi-&gt;index, j;</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(bnapi-&gt;bp-&gt;dev, "[%d]: cp{fw_ring: %d raw_cons: %x}\n",</div><div class='ctx'> 		    i, cpr-&gt;cp_ring_struct.fw_ring_id, cpr-&gt;cp_raw_cons);</div><div class='add'>+	for (j = 0; j &lt; cpr-&gt;cp_ring_count; j++) {</div><div class='add'>+		cpr2 = &amp;cpr-&gt;cp_ring_arr[j];</div><div class='add'>+		if (!cpr2-&gt;bnapi)</div><div class='add'>+			continue;</div><div class='add'>+		netdev_info(bnapi-&gt;bp-&gt;dev, "[%d.%d]: cp{fw_ring: %d raw_cons: %x}\n",</div><div class='add'>+			    i, j, cpr2-&gt;cp_ring_struct.fw_ring_id,</div><div class='add'>+			    cpr2-&gt;cp_raw_cons);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_dbg_dump_states(struct bnxt *bp)</div><div class='hunk'>@@ -9338,102 +14068,384 @@ static void bnxt_dbg_dump_states(struct bnxt *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_hwrm_rx_ring_reset(struct bnxt *bp, int ring_nr)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[ring_nr];</div><div class='add'>+	struct hwrm_ring_reset_input *req;</div><div class='add'>+	struct bnxt_napi *bnapi = rxr-&gt;bnapi;</div><div class='add'>+	struct bnxt_cp_ring_info *cpr;</div><div class='add'>+	u16 cp_ring_id;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_RING_RESET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+	cp_ring_id = cpr-&gt;cp_ring_struct.fw_ring_id;</div><div class='add'>+	req-&gt;cmpl_ring = cpu_to_le16(cp_ring_id);</div><div class='add'>+	req-&gt;ring_type = RING_RESET_REQ_RING_TYPE_RX_RING_GRP;</div><div class='add'>+	req-&gt;ring_id = cpu_to_le16(bp-&gt;grp_info[bnapi-&gt;index].fw_grp_id);</div><div class='add'>+	return hwrm_req_send_silent(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_reset_task(struct bnxt *bp, bool silent)</div><div class='ctx'> {</div><div class='ctx'> 	if (!silent)</div><div class='ctx'> 		bnxt_dbg_dump_states(bp);</div><div class='ctx'> 	if (netif_running(bp-&gt;dev)) {</div><div class='del'>-		int rc;</div><div class='del'>-</div><div class='del'>-		if (!silent)</div><div class='del'>-			bnxt_ulp_stop(bp);</div><div class='del'>-		bnxt_close_nic(bp, false, false);</div><div class='del'>-		rc = bnxt_open_nic(bp, false, false);</div><div class='del'>-		if (!silent &amp;&amp; !rc)</div><div class='del'>-			bnxt_ulp_start(bp);</div><div class='add'>+		bnxt_close_nic(bp, !silent, false);</div><div class='add'>+		bnxt_open_nic(bp, !silent, false);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_tx_timeout(struct net_device *dev)</div><div class='add'>+static void bnxt_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	netdev_err(bp-&gt;dev,  "TX timeout detected, starting reset task!\n");</div><div class='del'>-	set_bit(BNXT_RESET_TASK_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-	bnxt_queue_sp_work(bp);</div><div class='add'>+	bnxt_queue_sp_work(bp, BNXT_RESET_TASK_SP_EVENT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_health_check(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	if (!fw_health-&gt;enabled || test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Make sure it is enabled before checking the tmr_counter. */</div><div class='add'>+	smp_rmb();</div><div class='add'>+	if (fw_health-&gt;tmr_counter) {</div><div class='add'>+		fw_health-&gt;tmr_counter--;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	val = bnxt_fw_health_readl(bp, BNXT_FW_HEARTBEAT_REG);</div><div class='add'>+	if (val == fw_health-&gt;last_fw_heartbeat &amp;&amp; pci_device_is_present(pdev)) {</div><div class='add'>+		fw_health-&gt;arrests++;</div><div class='add'>+		goto fw_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_health-&gt;last_fw_heartbeat = val;</div><div class='add'>+</div><div class='add'>+	val = bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG);</div><div class='add'>+	if (val != fw_health-&gt;last_fw_reset_cnt &amp;&amp; pci_device_is_present(pdev)) {</div><div class='add'>+		fw_health-&gt;discoveries++;</div><div class='add'>+		goto fw_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fw_health-&gt;tmr_counter = fw_health-&gt;tmr_multiplier;</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+fw_reset:</div><div class='add'>+	bnxt_queue_sp_work(bp, BNXT_FW_EXCEPTION_SP_EVENT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt *bp = from_timer(bp, t, timer);</div><div class='add'>+	struct bnxt *bp = timer_container_of(bp, t, timer);</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(dev))</div><div class='add'>+	if (!netif_running(dev) || !test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;bp-&gt;intr_sem) != 0)</div><div class='ctx'> 		goto bnxt_restart_timer;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;link_info.link_up &amp;&amp; (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS) &amp;&amp;</div><div class='del'>-	    bp-&gt;stats_coal_ticks) {</div><div class='del'>-		set_bit(BNXT_PERIODIC_STATS_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		bnxt_queue_sp_work(bp);</div><div class='del'>-	}</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY)</div><div class='add'>+		bnxt_fw_health_check(bp);</div><div class='ctx'> </div><div class='del'>-	if (bnxt_tc_flower_enabled(bp)) {</div><div class='del'>-		set_bit(BNXT_FLOW_STATS_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		bnxt_queue_sp_work(bp);</div><div class='del'>-	}</div><div class='add'>+	if (BNXT_LINK_IS_UP(bp) &amp;&amp; bp-&gt;stats_coal_ticks)</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_PERIODIC_STATS_SP_EVENT);</div><div class='add'>+</div><div class='add'>+	if (bnxt_tc_flower_enabled(bp))</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_FLOW_STATS_SP_EVENT);</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_RFS) &amp;&amp; bp-&gt;ntp_fltr_count)</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_RX_NTP_FLTR_SP_EVENT);</div><div class='add'>+#endif /*CONFIG_RFS_ACCEL*/</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;link_info.phy_retry) {</div><div class='ctx'> 		if (time_after(jiffies, bp-&gt;link_info.phy_retry_expires)) {</div><div class='del'>-			bp-&gt;link_info.phy_retry = 0;</div><div class='add'>+			bp-&gt;link_info.phy_retry = false;</div><div class='ctx'> 			netdev_warn(bp-&gt;dev, "failed to update phy settings after maximum retries.\n");</div><div class='ctx'> 		} else {</div><div class='del'>-			set_bit(BNXT_UPDATE_PHY_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-			bnxt_queue_sp_work(bp);</div><div class='add'>+			bnxt_queue_sp_work(bp, BNXT_UPDATE_PHY_SP_EVENT);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) &amp;&amp; netif_carrier_ok(dev)) {</div><div class='del'>-		set_bit(BNXT_RING_COAL_NOW_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		bnxt_queue_sp_work(bp);</div><div class='del'>-	}</div><div class='add'>+	if (test_bit(BNXT_STATE_L2_FILTER_RETRY, &amp;bp-&gt;state))</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_RX_MASK_SP_EVENT);</div><div class='add'>+</div><div class='add'>+	if ((BNXT_CHIP_P5(bp)) &amp;&amp; !bp-&gt;chip_rev &amp;&amp; netif_carrier_ok(dev))</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_RING_COAL_NOW_SP_EVENT);</div><div class='add'>+</div><div class='ctx'> bnxt_restart_timer:</div><div class='ctx'> 	mod_timer(&amp;bp-&gt;timer, jiffies + bp-&gt;current_interval);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_rtnl_lock_sp(struct bnxt *bp)</div><div class='add'>+static void bnxt_lock_sp(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	/* We are called from bnxt_sp_task which has BNXT_STATE_IN_SP_TASK</div><div class='ctx'> 	 * set.  If the device is being closed, bnxt_close() may be holding</div><div class='del'>-	 * rtnl() and waiting for BNXT_STATE_IN_SP_TASK to clear.  So we</div><div class='del'>-	 * must clear BNXT_STATE_IN_SP_TASK before holding rtnl().</div><div class='add'>+	 * netdev instance lock and waiting for BNXT_STATE_IN_SP_TASK to clear.</div><div class='add'>+	 * So we must clear BNXT_STATE_IN_SP_TASK before holding netdev</div><div class='add'>+	 * instance lock.</div><div class='ctx'> 	 */</div><div class='ctx'> 	clear_bit(BNXT_STATE_IN_SP_TASK, &amp;bp-&gt;state);</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	netdev_lock(bp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_rtnl_unlock_sp(struct bnxt *bp)</div><div class='add'>+static void bnxt_unlock_sp(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	set_bit(BNXT_STATE_IN_SP_TASK, &amp;bp-&gt;state);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	netdev_unlock(bp-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Only called from bnxt_sp_task() */</div><div class='ctx'> static void bnxt_reset(struct bnxt *bp, bool silent)</div><div class='ctx'> {</div><div class='del'>-	bnxt_rtnl_lock_sp(bp);</div><div class='add'>+	bnxt_lock_sp(bp);</div><div class='ctx'> 	if (test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state))</div><div class='ctx'> 		bnxt_reset_task(bp, silent);</div><div class='del'>-	bnxt_rtnl_unlock_sp(bp);</div><div class='add'>+	bnxt_unlock_sp(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Only called from bnxt_sp_task() */</div><div class='add'>+static void bnxt_rx_ring_reset(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bnxt_lock_sp(bp);</div><div class='add'>+	if (!test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state)) {</div><div class='add'>+		bnxt_unlock_sp(bp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	/* Disable and flush TPA before resetting the RX ring */</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		bnxt_set_tpa(bp, false);</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;rx_nr_rings; i++) {</div><div class='add'>+		struct bnxt_rx_ring_info *rxr = &amp;bp-&gt;rx_ring[i];</div><div class='add'>+		struct bnxt_cp_ring_info *cpr;</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		if (!rxr-&gt;bnapi-&gt;in_reset)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_hwrm_rx_ring_reset(bp, i);</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (rc == -EINVAL || rc == -EOPNOTSUPP)</div><div class='add'>+				netdev_info_once(bp-&gt;dev, "RX ring reset not supported by firmware, falling back to global reset\n");</div><div class='add'>+			else</div><div class='add'>+				netdev_warn(bp-&gt;dev, "RX ring reset failed, rc = %d, falling back to global reset\n",</div><div class='add'>+					    rc);</div><div class='add'>+			bnxt_reset_task(bp, true);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		bnxt_free_one_rx_ring_skbs(bp, rxr);</div><div class='add'>+		rxr-&gt;rx_prod = 0;</div><div class='add'>+		rxr-&gt;rx_agg_prod = 0;</div><div class='add'>+		rxr-&gt;rx_sw_agg_prod = 0;</div><div class='add'>+		rxr-&gt;rx_next_cons = 0;</div><div class='add'>+		rxr-&gt;bnapi-&gt;in_reset = false;</div><div class='add'>+		bnxt_alloc_one_rx_ring(bp, i);</div><div class='add'>+		cpr = &amp;rxr-&gt;bnapi-&gt;cp_ring;</div><div class='add'>+		cpr-&gt;sw_stats-&gt;rx.rx_resets++;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='add'>+			bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+		bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		bnxt_set_tpa(bp, true);</div><div class='add'>+	bnxt_unlock_sp(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_fatal_close(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	bnxt_tx_disable(bp);</div><div class='add'>+	bnxt_disable_napi(bp);</div><div class='add'>+	bnxt_disable_int_sync(bp);</div><div class='add'>+	bnxt_free_irq(bp);</div><div class='add'>+	bnxt_clear_int_mode(bp);</div><div class='add'>+	pci_disable_device(bp-&gt;pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_reset_close(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	/* When firmware is in fatal state, quiesce device and disable</div><div class='add'>+	 * bus master to prevent any potential bad DMAs before freeing</div><div class='add'>+	 * kernel memory.</div><div class='add'>+	 */</div><div class='add'>+	if (test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state)) {</div><div class='add'>+		u16 val = 0;</div><div class='add'>+</div><div class='add'>+		pci_read_config_word(bp-&gt;pdev, PCI_SUBSYSTEM_ID, &amp;val);</div><div class='add'>+		if (val == 0xffff)</div><div class='add'>+			bp-&gt;fw_reset_min_dsecs = 0;</div><div class='add'>+		bnxt_fw_fatal_close(bp);</div><div class='add'>+	}</div><div class='add'>+	__bnxt_close_nic(bp, true, false);</div><div class='add'>+	bnxt_vf_reps_free(bp);</div><div class='add'>+	bnxt_clear_int_mode(bp);</div><div class='add'>+	bnxt_hwrm_func_drv_unrgtr(bp);</div><div class='add'>+	if (pci_is_enabled(bp-&gt;pdev))</div><div class='add'>+		pci_disable_device(bp-&gt;pdev);</div><div class='add'>+	bnxt_free_ctx_mem(bp, false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_bnxt_fw_ok(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	bool no_heartbeat = false, has_reset = false;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	val = bnxt_fw_health_readl(bp, BNXT_FW_HEARTBEAT_REG);</div><div class='add'>+	if (val == fw_health-&gt;last_fw_heartbeat)</div><div class='add'>+		no_heartbeat = true;</div><div class='add'>+</div><div class='add'>+	val = bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG);</div><div class='add'>+	if (val != fw_health-&gt;last_fw_reset_cnt)</div><div class='add'>+		has_reset = true;</div><div class='add'>+</div><div class='add'>+	if (!no_heartbeat &amp;&amp; has_reset)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* netdev instance lock is acquired before calling this function */</div><div class='add'>+static void bnxt_force_fw_reset(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u32 wait_dsecs;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state) ||</div><div class='add'>+	    test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* we have to serialize with bnxt_refclk_read()*/</div><div class='add'>+	if (ptp) {</div><div class='add'>+		unsigned long flags;</div><div class='add'>+</div><div class='add'>+		write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+		set_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+		write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	} else {</div><div class='add'>+		set_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+	}</div><div class='add'>+	bnxt_fw_reset_close(bp);</div><div class='add'>+	wait_dsecs = fw_health-&gt;master_func_wait_dsecs;</div><div class='add'>+	if (fw_health-&gt;primary) {</div><div class='add'>+		if (fw_health-&gt;flags &amp; ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU)</div><div class='add'>+			wait_dsecs = 0;</div><div class='add'>+		bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_RESET_FW;</div><div class='add'>+	} else {</div><div class='add'>+		bp-&gt;fw_reset_timestamp = jiffies + wait_dsecs * HZ / 10;</div><div class='add'>+		wait_dsecs = fw_health-&gt;normal_func_wait_dsecs;</div><div class='add'>+		bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_reset_min_dsecs = fw_health-&gt;post_reset_wait_dsecs;</div><div class='add'>+	bp-&gt;fw_reset_max_dsecs = fw_health-&gt;post_reset_max_wait_dsecs;</div><div class='add'>+	bnxt_queue_fw_reset_work(bp, wait_dsecs * HZ / 10);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_fw_exception(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	netdev_warn(bp-&gt;dev, "Detected firmware fatal condition, initiating reset\n");</div><div class='add'>+	set_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state);</div><div class='add'>+	bnxt_ulp_stop(bp);</div><div class='add'>+	bnxt_lock_sp(bp);</div><div class='add'>+	bnxt_force_fw_reset(bp);</div><div class='add'>+	bnxt_unlock_sp(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Returns the number of registered VFs, or 1 if VF configuration is pending, or</div><div class='add'>+ * &lt; 0 on error.</div><div class='add'>+ */</div><div class='add'>+static int bnxt_get_registered_vfs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+#ifdef CONFIG_BNXT_SRIOV</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!BNXT_PF(bp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_qcfg(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "func_qcfg cmd failed, rc = %d\n", rc);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;pf.registered_vfs)</div><div class='add'>+		return bp-&gt;pf.registered_vfs;</div><div class='add'>+	if (bp-&gt;sriov_cfg)</div><div class='add'>+		return 1;</div><div class='add'>+#endif</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_fw_reset(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	bnxt_ulp_stop(bp);</div><div class='add'>+	bnxt_lock_sp(bp);</div><div class='add'>+	if (test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state) &amp;&amp;</div><div class='add'>+	    !test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+		int n = 0, tmo;</div><div class='add'>+</div><div class='add'>+		/* we have to serialize with bnxt_refclk_read()*/</div><div class='add'>+		if (ptp) {</div><div class='add'>+			unsigned long flags;</div><div class='add'>+</div><div class='add'>+			write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+			set_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+			write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+		} else {</div><div class='add'>+			set_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+		}</div><div class='add'>+		if (bp-&gt;pf.active_vfs &amp;&amp;</div><div class='add'>+		    !test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state))</div><div class='add'>+			n = bnxt_get_registered_vfs(bp);</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Firmware reset aborted, rc = %d\n",</div><div class='add'>+				   n);</div><div class='add'>+			clear_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+			netif_close(bp-&gt;dev);</div><div class='add'>+			goto fw_reset_exit;</div><div class='add'>+		} else if (n &gt; 0) {</div><div class='add'>+			u16 vf_tmo_dsecs = n * 10;</div><div class='add'>+</div><div class='add'>+			if (bp-&gt;fw_reset_max_dsecs &lt; vf_tmo_dsecs)</div><div class='add'>+				bp-&gt;fw_reset_max_dsecs = vf_tmo_dsecs;</div><div class='add'>+			bp-&gt;fw_reset_state =</div><div class='add'>+				BNXT_FW_RESET_STATE_POLL_VF;</div><div class='add'>+			bnxt_queue_fw_reset_work(bp, HZ / 10);</div><div class='add'>+			goto fw_reset_exit;</div><div class='add'>+		}</div><div class='add'>+		bnxt_fw_reset_close(bp);</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERR_RECOVER_RELOAD) {</div><div class='add'>+			bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW_DOWN;</div><div class='add'>+			tmo = HZ / 10;</div><div class='add'>+		} else {</div><div class='add'>+			bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;</div><div class='add'>+			tmo = bp-&gt;fw_reset_min_dsecs * HZ / 10;</div><div class='add'>+		}</div><div class='add'>+		bnxt_queue_fw_reset_work(bp, tmo);</div><div class='add'>+	}</div><div class='add'>+fw_reset_exit:</div><div class='add'>+	bnxt_unlock_sp(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_chk_missed_irq(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='hunk'>@@ -9446,12 +14458,11 @@ static void bnxt_chk_missed_irq(struct bnxt *bp)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr2 = cpr-&gt;cp_ring_arr[j];</div><div class='add'>+		for (j = 0; j &lt; cpr-&gt;cp_ring_count; j++) {</div><div class='add'>+			struct bnxt_cp_ring_info *cpr2 = &amp;cpr-&gt;cp_ring_arr[j];</div><div class='ctx'> 			u32 val[2];</div><div class='ctx'> </div><div class='del'>-			if (!cpr2 || cpr2-&gt;has_more_work ||</div><div class='del'>-			    !bnxt_has_work(bp, cpr2))</div><div class='add'>+			if (cpr2-&gt;has_more_work || !bnxt_has_work(bp, cpr2))</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			if (cpr2-&gt;cp_raw_cons != cpr2-&gt;last_cp_raw_cons) {</div><div class='hunk'>@@ -9462,13 +14473,58 @@ static void bnxt_chk_missed_irq(struct bnxt *bp)</div><div class='ctx'> 			bnxt_dbg_hwrm_ring_info_get(bp,</div><div class='ctx'> 				DBG_RING_INFO_GET_REQ_RING_TYPE_L2_CMPL,</div><div class='ctx'> 				fw_ring_id, &amp;val[0], &amp;val[1]);</div><div class='del'>-			cpr-&gt;missed_irqs++;</div><div class='add'>+			cpr-&gt;sw_stats-&gt;cmn.missed_irqs++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_cfg_ntp_filters(struct bnxt *);</div><div class='ctx'> </div><div class='add'>+static void bnxt_init_ethtool_link_settings(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='add'>+</div><div class='add'>+	if (BNXT_AUTO_MODE(link_info-&gt;auto_mode)) {</div><div class='add'>+		link_info-&gt;autoneg = BNXT_AUTONEG_SPEED;</div><div class='add'>+		if (bp-&gt;hwrm_spec_code &gt;= 0x10201) {</div><div class='add'>+			if (link_info-&gt;auto_pause_setting &amp;</div><div class='add'>+			    PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE)</div><div class='add'>+				link_info-&gt;autoneg |= BNXT_AUTONEG_FLOW_CTRL;</div><div class='add'>+		} else {</div><div class='add'>+			link_info-&gt;autoneg |= BNXT_AUTONEG_FLOW_CTRL;</div><div class='add'>+		}</div><div class='add'>+		bnxt_set_auto_speed(link_info);</div><div class='add'>+	} else {</div><div class='add'>+		bnxt_set_force_speed(link_info);</div><div class='add'>+		link_info-&gt;req_duplex = link_info-&gt;duplex_setting;</div><div class='add'>+	}</div><div class='add'>+	if (link_info-&gt;autoneg &amp; BNXT_AUTONEG_FLOW_CTRL)</div><div class='add'>+		link_info-&gt;req_flow_ctrl =</div><div class='add'>+			link_info-&gt;auto_pause_setting &amp; BNXT_LINK_PAUSE_BOTH;</div><div class='add'>+	else</div><div class='add'>+		link_info-&gt;req_flow_ctrl = link_info-&gt;force_pause_setting;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_echo_reply(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	struct hwrm_func_echo_response_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_ECHO_RESPONSE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+	req-&gt;event_data1 = cpu_to_le32(fw_health-&gt;echo_req_data1);</div><div class='add'>+	req-&gt;event_data2 = cpu_to_le32(fw_health-&gt;echo_req_data2);</div><div class='add'>+	hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_ulp_restart(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	bnxt_ulp_stop(bp);</div><div class='add'>+	bnxt_ulp_start(bp, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = container_of(work, struct bnxt, sp_task);</div><div class='hunk'>@@ -9480,6 +14536,11 @@ static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (test_and_clear_bit(BNXT_RESTART_ULP_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='add'>+		bnxt_ulp_restart(bp);</div><div class='add'>+		bnxt_reenable_sriov(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_RX_MASK_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='ctx'> 		bnxt_cfg_rx_mode(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -9487,28 +14548,12 @@ static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> 		bnxt_cfg_ntp_filters(bp);</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='ctx'> 		bnxt_hwrm_exec_fwd_req(bp);</div><div class='del'>-	if (test_and_clear_bit(BNXT_VXLAN_ADD_PORT_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='del'>-		bnxt_hwrm_tunnel_dst_port_alloc(</div><div class='del'>-			bp, bp-&gt;vxlan_port,</div><div class='del'>-			TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN);</div><div class='del'>-	}</div><div class='del'>-	if (test_and_clear_bit(BNXT_VXLAN_DEL_PORT_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='del'>-		bnxt_hwrm_tunnel_dst_port_free(</div><div class='del'>-			bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN);</div><div class='del'>-	}</div><div class='del'>-	if (test_and_clear_bit(BNXT_GENEVE_ADD_PORT_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='del'>-		bnxt_hwrm_tunnel_dst_port_alloc(</div><div class='del'>-			bp, bp-&gt;nge_port,</div><div class='del'>-			TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE);</div><div class='del'>-	}</div><div class='del'>-	if (test_and_clear_bit(BNXT_GENEVE_DEL_PORT_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='del'>-		bnxt_hwrm_tunnel_dst_port_free(</div><div class='del'>-			bp, TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE);</div><div class='del'>-	}</div><div class='add'>+	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='add'>+		netdev_info(bp-&gt;dev, "Receive PF driver unload event!\n");</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='del'>-		bnxt_hwrm_port_qstats(bp);</div><div class='del'>-		bnxt_hwrm_port_qstats_ext(bp);</div><div class='del'>-		bnxt_hwrm_pcie_qstats(bp);</div><div class='add'>+		bnxt_hwrm_port_qstats(bp, 0);</div><div class='add'>+		bnxt_hwrm_port_qstats_ext(bp, 0);</div><div class='add'>+		bnxt_accumulate_all_stats(bp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (test_and_clear_bit(BNXT_LINK_CHNG_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='hunk'>@@ -9520,10 +14565,14 @@ static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> 			bnxt_hwrm_phy_qcaps(bp);</div><div class='ctx'> </div><div class='ctx'> 		rc = bnxt_update_link(bp, true);</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "SP task can't update link (rc: %x)\n",</div><div class='ctx'> 				   rc);</div><div class='add'>+</div><div class='add'>+		if (test_and_clear_bit(BNXT_LINK_CFG_CHANGE_SP_EVENT,</div><div class='add'>+				       &amp;bp-&gt;sp_event))</div><div class='add'>+			bnxt_init_ethtool_link_settings(bp);</div><div class='add'>+		mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_UPDATE_PHY_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='ctx'> 		int rc;</div><div class='hunk'>@@ -9550,6 +14599,12 @@ static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_RING_COAL_NOW_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='ctx'> 		bnxt_chk_missed_irq(bp);</div><div class='ctx'> </div><div class='add'>+	if (test_and_clear_bit(BNXT_FW_ECHO_REQUEST_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='add'>+		bnxt_fw_echo_reply(bp);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(BNXT_THERMAL_THRESHOLD_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='add'>+		bnxt_hwmon_notify_event(bp);</div><div class='add'>+</div><div class='ctx'> 	/* These functions below will clear BNXT_STATE_IN_SP_TASK.  They</div><div class='ctx'> 	 * must be the last functions to be called before exiting.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -9559,47 +14614,86 @@ static void bnxt_sp_task(struct work_struct *work)</div><div class='ctx'> 	if (test_and_clear_bit(BNXT_RESET_TASK_SILENT_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='ctx'> 		bnxt_reset(bp, true);</div><div class='ctx'> </div><div class='add'>+	if (test_and_clear_bit(BNXT_RST_RING_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='add'>+		bnxt_rx_ring_reset(bp);</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(BNXT_FW_RESET_NOTIFY_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='add'>+		if (test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state) ||</div><div class='add'>+		    test_bit(BNXT_STATE_FW_NON_FATAL_COND, &amp;bp-&gt;state))</div><div class='add'>+			bnxt_devlink_health_fw_report(bp);</div><div class='add'>+		else</div><div class='add'>+			bnxt_fw_reset(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_and_clear_bit(BNXT_FW_EXCEPTION_SP_EVENT, &amp;bp-&gt;sp_event)) {</div><div class='add'>+		if (!is_bnxt_fw_ok(bp))</div><div class='add'>+			bnxt_devlink_health_fw_report(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	smp_mb__before_atomic();</div><div class='ctx'> 	clear_bit(BNXT_STATE_IN_SP_TASK, &amp;bp-&gt;state);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Under rtnl_lock */</div><div class='add'>+static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,</div><div class='add'>+				int *max_cp);</div><div class='add'>+</div><div class='add'>+/* Under netdev instance lock */</div><div class='ctx'> int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,</div><div class='ctx'> 		     int tx_xdp)</div><div class='ctx'> {</div><div class='del'>-	int max_rx, max_tx, tx_sets = 1;</div><div class='del'>-	int tx_rings_needed, stats;</div><div class='add'>+	int max_rx, max_tx, max_cp, tx_sets = 1, tx_cp;</div><div class='add'>+	struct bnxt_hw_rings hwr = {0};</div><div class='ctx'> 	int rx_rings = rx;</div><div class='del'>-	int cp, vnics, rc;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (tcs)</div><div class='ctx'> 		tx_sets = tcs;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_get_max_rings(bp, &amp;max_rx, &amp;max_tx, sh);</div><div class='del'>-	if (rc)</div><div class='del'>-		return rc;</div><div class='add'>+	_bnxt_get_max_rings(bp, &amp;max_rx, &amp;max_tx, &amp;max_cp);</div><div class='ctx'> </div><div class='del'>-	if (max_rx &lt; rx)</div><div class='add'>+	if (max_rx &lt; rx_rings)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	tx_rings_needed = tx * tx_sets + tx_xdp;</div><div class='del'>-	if (max_tx &lt; tx_rings_needed)</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='add'>+		rx_rings &lt;&lt;= 1;</div><div class='add'>+</div><div class='add'>+	hwr.rx = rx_rings;</div><div class='add'>+	hwr.tx = tx * tx_sets + tx_xdp;</div><div class='add'>+	if (max_tx &lt; hwr.tx)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	vnics = 1;</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_RFS)</div><div class='del'>-		vnics += rx_rings;</div><div class='add'>+	hwr.vnic = bnxt_get_total_vnics(bp, rx);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='del'>-		rx_rings &lt;&lt;= 1;</div><div class='del'>-	cp = sh ? max_t(int, tx_rings_needed, rx) : tx_rings_needed + rx;</div><div class='del'>-	stats = cp;</div><div class='add'>+	tx_cp = __bnxt_num_tx_to_cp(bp, hwr.tx, tx_sets, tx_xdp);</div><div class='add'>+	hwr.cp = sh ? max_t(int, tx_cp, rx) : tx_cp + rx;</div><div class='add'>+	if (max_cp &lt; hwr.cp)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	hwr.stat = hwr.cp;</div><div class='ctx'> 	if (BNXT_NEW_RM(bp)) {</div><div class='del'>-		cp += bnxt_get_ulp_msix_num(bp);</div><div class='del'>-		stats += bnxt_get_ulp_stat_ctxs(bp);</div><div class='add'>+		hwr.cp += bnxt_get_ulp_msix_num_in_use(bp);</div><div class='add'>+		hwr.stat += bnxt_get_ulp_stat_ctxs_in_use(bp);</div><div class='add'>+		hwr.grp = rx;</div><div class='add'>+		hwr.rss_ctx = bnxt_get_total_rss_ctxs(bp, &amp;hwr);</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		hwr.cp_p5 = hwr.tx + rx;</div><div class='add'>+	rc = bnxt_hwrm_check_rings(bp, &amp;hwr);</div><div class='add'>+	if (!rc &amp;&amp; pci_msix_can_alloc_dyn(bp-&gt;pdev)) {</div><div class='add'>+		if (!bnxt_ulp_registered(bp-&gt;edev)) {</div><div class='add'>+			hwr.cp += bnxt_get_ulp_msix_num(bp);</div><div class='add'>+			hwr.cp = min_t(int, hwr.cp, bnxt_get_max_func_irqs(bp));</div><div class='add'>+		}</div><div class='add'>+		if (hwr.cp &gt; bp-&gt;total_irqs) {</div><div class='add'>+			int total_msix = bnxt_change_msix(bp, hwr.cp);</div><div class='add'>+</div><div class='add'>+			if (total_msix &lt; hwr.cp) {</div><div class='add'>+				netdev_warn(bp-&gt;dev, "Unable to allocate %d MSIX vectors, maximum available %d\n",</div><div class='add'>+					    hwr.cp, total_msix);</div><div class='add'>+				rc = -ENOSPC;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='del'>-	return bnxt_hwrm_check_rings(bp, tx_rings_needed, rx_rings, rx, cp,</div><div class='del'>-				     stats, vnics);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_unmap_bars(struct bnxt *bp, struct pci_dev *pdev)</div><div class='hunk'>@@ -9624,12 +14718,19 @@ static void bnxt_cleanup_pci(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	bnxt_unmap_bars(bp, bp-&gt;pdev);</div><div class='ctx'> 	pci_release_regions(bp-&gt;pdev);</div><div class='del'>-	pci_disable_device(bp-&gt;pdev);</div><div class='add'>+	if (pci_is_enabled(bp-&gt;pdev))</div><div class='add'>+		pci_disable_device(bp-&gt;pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_init_dflt_coal(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_coal_cap *coal_cap = &amp;bp-&gt;coal_cap;</div><div class='ctx'> 	struct bnxt_coal *coal;</div><div class='add'>+	u16 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (coal_cap-&gt;cmpl_params &amp;</div><div class='add'>+	    RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_TIMER_RESET)</div><div class='add'>+		flags |= RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET;</div><div class='ctx'> </div><div class='ctx'> 	/* Tick values in micro seconds.</div><div class='ctx'> 	 * 1 coal_buf x bufs_per_record = 1 completion record.</div><div class='hunk'>@@ -9642,6 +14743,7 @@ static void bnxt_init_dflt_coal(struct bnxt *bp)</div><div class='ctx'> 	coal-&gt;idle_thresh = 50;</div><div class='ctx'> 	coal-&gt;bufs_per_record = 2;</div><div class='ctx'> 	coal-&gt;budget = 64;		/* NAPI budget */</div><div class='add'>+	coal-&gt;flags = flags;</div><div class='ctx'> </div><div class='ctx'> 	coal = &amp;bp-&gt;tx_coal;</div><div class='ctx'> 	coal-&gt;coal_ticks = 28;</div><div class='hunk'>@@ -9649,10 +14751,479 @@ static void bnxt_init_dflt_coal(struct bnxt *bp)</div><div class='ctx'> 	coal-&gt;coal_ticks_irq = 2;</div><div class='ctx'> 	coal-&gt;coal_bufs_irq = 2;</div><div class='ctx'> 	coal-&gt;bufs_per_record = 1;</div><div class='add'>+	coal-&gt;flags = flags;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;stats_coal_ticks = BNXT_DEF_STATS_COAL_TICKS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* FW that pre-reserves 1 VNIC per function */</div><div class='add'>+static bool bnxt_fw_pre_resv_vnics(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u16 fw_maj = BNXT_FW_MAJ(bp), fw_bld = BNXT_FW_BLD(bp);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='add'>+	    (fw_maj &gt; 218 || (fw_maj == 218 &amp;&amp; fw_bld &gt;= 18)))</div><div class='add'>+		return true;</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='add'>+	    (fw_maj &gt; 216 || (fw_maj == 216 &amp;&amp; fw_bld &gt;= 172)))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_pfcwd_qcaps(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_queue_pfcwd_timeout_qcaps_output *resp;</div><div class='add'>+	struct hwrm_queue_pfcwd_timeout_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bp-&gt;max_pfcwd_tmo_ms = 0;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PFCWD_TIMEOUT_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		bp-&gt;max_pfcwd_tmo_ms = le16_to_cpu(resp-&gt;max_pfcwd_timeout);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_fw_init_one_p1(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	bp-&gt;fw_cap = 0;</div><div class='add'>+	rc = bnxt_hwrm_ver_get(bp);</div><div class='add'>+	/* FW may be unresponsive after FLR. FLR must complete within 100 msec</div><div class='add'>+	 * so wait before continuing with recovery.</div><div class='add'>+	 */</div><div class='add'>+	if (rc)</div><div class='add'>+		msleep(100);</div><div class='add'>+	bnxt_try_map_fw_health_reg(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		rc = bnxt_try_recover_fw(bp);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		rc = bnxt_hwrm_ver_get(bp);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnxt_nvm_cfg_ver_get(bp);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_reset(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_fw_set_time(bp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_fw_init_one_p2(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Get the MAX capabilities for this function */</div><div class='add'>+	rc = bnxt_hwrm_func_qcaps(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm query capability failure rc: %x\n",</div><div class='add'>+			   rc);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_cfa_adv_flow_mgnt_qcaps(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_warn(bp-&gt;dev, "hwrm query adv flow mgnt failure rc: %d\n",</div><div class='add'>+			    rc);</div><div class='add'>+</div><div class='add'>+	if (bnxt_alloc_fw_health(bp)) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "no memory for firmware error recovery\n");</div><div class='add'>+	} else {</div><div class='add'>+		rc = bnxt_hwrm_error_recovery_qcfg(bp);</div><div class='add'>+		if (rc)</div><div class='add'>+			netdev_warn(bp-&gt;dev, "hwrm query error recovery failure rc: %d\n",</div><div class='add'>+				    rc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_drv_rgtr(bp, NULL, 0, false);</div><div class='add'>+	if (rc)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_alloc_crash_dump_mem(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_warn(bp-&gt;dev, "crash dump mem alloc failure rc: %d\n",</div><div class='add'>+			    rc);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		rc = bnxt_hwrm_crash_dump_mem_cfg(bp);</div><div class='add'>+		if (rc) {</div><div class='add'>+			bnxt_free_crash_dump_mem(bp);</div><div class='add'>+			netdev_warn(bp-&gt;dev,</div><div class='add'>+				    "hwrm crash dump mem failure rc: %d\n", rc);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bnxt_fw_pre_resv_vnics(bp))</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_PRE_RESV_VNICS;</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_pfcwd_qcaps(bp);</div><div class='add'>+	bnxt_hwrm_func_qcfg(bp);</div><div class='add'>+	bnxt_hwrm_vnic_qcaps(bp);</div><div class='add'>+	bnxt_hwrm_port_led_qcaps(bp);</div><div class='add'>+	bnxt_ethtool_init(bp);</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_PTP)</div><div class='add'>+		__bnxt_hwrm_ptp_qcfg(bp);</div><div class='add'>+	bnxt_dcb_init(bp);</div><div class='add'>+	bnxt_hwmon_init(bp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_dflt_rss_hash_type(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	bp-&gt;rss_cap &amp;= ~BNXT_RSS_CAP_UDP_RSS_CAP;</div><div class='add'>+	bp-&gt;rss_hash_cfg = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |</div><div class='add'>+			   VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;</div><div class='add'>+	if (bp-&gt;rss_cap &amp; BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA)</div><div class='add'>+		bp-&gt;rss_hash_delta = bp-&gt;rss_hash_cfg;</div><div class='add'>+	if (BNXT_CHIP_P4_PLUS(bp) &amp;&amp; bp-&gt;hwrm_spec_code &gt;= 0x10501) {</div><div class='add'>+		bp-&gt;rss_cap |= BNXT_RSS_CAP_UDP_RSS_CAP;</div><div class='add'>+		bp-&gt;rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 |</div><div class='add'>+				    VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_dflt_rfs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = bp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	dev-&gt;hw_features &amp;= ~NETIF_F_NTUPLE;</div><div class='add'>+	dev-&gt;features &amp;= ~NETIF_F_NTUPLE;</div><div class='add'>+	bp-&gt;flags &amp;= ~BNXT_FLAG_RFS;</div><div class='add'>+	if (bnxt_rfs_supported(bp)) {</div><div class='add'>+		dev-&gt;hw_features |= NETIF_F_NTUPLE;</div><div class='add'>+		if (bnxt_rfs_capable(bp, false)) {</div><div class='add'>+			bp-&gt;flags |= BNXT_FLAG_RFS;</div><div class='add'>+			dev-&gt;features |= NETIF_F_NTUPLE;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_init_one_p3(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+</div><div class='add'>+	bnxt_set_dflt_rss_hash_type(bp);</div><div class='add'>+	bnxt_set_dflt_rfs(bp);</div><div class='add'>+</div><div class='add'>+	bnxt_get_wol_settings(bp);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_WOL_CAP)</div><div class='add'>+		device_set_wakeup_enable(&amp;pdev-&gt;dev, bp-&gt;wol);</div><div class='add'>+	else</div><div class='add'>+		device_set_wakeup_capable(&amp;pdev-&gt;dev, false);</div><div class='add'>+</div><div class='add'>+	bnxt_hwrm_set_cache_line_size(bp, cache_line_size());</div><div class='add'>+	bnxt_hwrm_coal_params_qcaps(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt);</div><div class='add'>+</div><div class='add'>+int bnxt_fw_init_one(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_fw_init_one_p1(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "Firmware init phase 1 failed\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = bnxt_fw_init_one_p2(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "Firmware init phase 2 failed\n");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	rc = bnxt_probe_phy(bp, false);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	rc = bnxt_approve_mac(bp, bp-&gt;dev-&gt;dev_addr, false);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnxt_fw_init_one_p3(bp);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_reset_writel(struct bnxt *bp, int reg_idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	u32 reg = fw_health-&gt;fw_reset_seq_regs[reg_idx];</div><div class='add'>+	u32 val = fw_health-&gt;fw_reset_seq_vals[reg_idx];</div><div class='add'>+	u32 reg_type, reg_off, delay_msecs;</div><div class='add'>+</div><div class='add'>+	delay_msecs = fw_health-&gt;fw_reset_seq_delay_msec[reg_idx];</div><div class='add'>+	reg_type = BNXT_FW_HEALTH_REG_TYPE(reg);</div><div class='add'>+	reg_off = BNXT_FW_HEALTH_REG_OFF(reg);</div><div class='add'>+	switch (reg_type) {</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_CFG:</div><div class='add'>+		pci_write_config_dword(bp-&gt;pdev, reg_off, val);</div><div class='add'>+		break;</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_GRC:</div><div class='add'>+		writel(reg_off &amp; BNXT_GRC_BASE_MASK,</div><div class='add'>+		       bp-&gt;bar0 + BNXT_GRCPF_REG_WINDOW_BASE_OUT + 4);</div><div class='add'>+		reg_off = (reg_off &amp; BNXT_GRC_OFFSET_MASK) + 0x2000;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_BAR0:</div><div class='add'>+		writel(val, bp-&gt;bar0 + reg_off);</div><div class='add'>+		break;</div><div class='add'>+	case BNXT_FW_HEALTH_REG_TYPE_BAR1:</div><div class='add'>+		writel(val, bp-&gt;bar1 + reg_off);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	if (delay_msecs) {</div><div class='add'>+		pci_read_config_dword(bp-&gt;pdev, 0, &amp;val);</div><div class='add'>+		msleep(delay_msecs);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bnxt_hwrm_reset_permitted(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='add'>+	bool result = true; /* firmware will enforce if unknown */</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET_IF)</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_FUNC_QCFG))</div><div class='add'>+		return result;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	if (!hwrm_req_send(bp, req))</div><div class='add'>+		result = !!(le16_to_cpu(resp-&gt;flags) &amp;</div><div class='add'>+			    FUNC_QCFG_RESP_FLAGS_HOT_RESET_ALLOWED);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return result;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_reset_all(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	int i, rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERR_RECOVER_RELOAD) {</div><div class='add'>+		bnxt_fw_reset_via_optee(bp);</div><div class='add'>+		bp-&gt;fw_reset_timestamp = jiffies;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_health-&gt;flags &amp; ERROR_RECOVERY_QCFG_RESP_FLAGS_HOST) {</div><div class='add'>+		for (i = 0; i &lt; fw_health-&gt;fw_reset_seq_cnt; i++)</div><div class='add'>+			bnxt_fw_reset_writel(bp, i);</div><div class='add'>+	} else if (fw_health-&gt;flags &amp; ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU) {</div><div class='add'>+		struct hwrm_fw_reset_input *req;</div><div class='add'>+</div><div class='add'>+		rc = hwrm_req_init(bp, req, HWRM_FW_RESET);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			req-&gt;target_id = cpu_to_le16(HWRM_TARGET_ID_KONG);</div><div class='add'>+			req-&gt;embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP;</div><div class='add'>+			req-&gt;selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP;</div><div class='add'>+			req-&gt;flags = FW_RESET_REQ_FLAGS_RESET_GRACEFUL;</div><div class='add'>+			rc = hwrm_req_send(bp, req);</div><div class='add'>+		}</div><div class='add'>+		if (rc != -ENODEV)</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Unable to reset FW rc=%d\n", rc);</div><div class='add'>+	}</div><div class='add'>+	bp-&gt;fw_reset_timestamp = jiffies;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_fw_reset_timeout(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	return time_after(jiffies, bp-&gt;fw_reset_timestamp +</div><div class='add'>+			  (bp-&gt;fw_reset_max_dsecs * HZ / 10));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_reset_abort(struct bnxt *bp, int rc)</div><div class='add'>+{</div><div class='add'>+	clear_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+	if (bp-&gt;fw_reset_state != BNXT_FW_RESET_STATE_POLL_VF)</div><div class='add'>+		bnxt_dl_health_fw_status_update(bp, false);</div><div class='add'>+	bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_ABORT;</div><div class='add'>+	netif_close(bp-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fw_reset_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(work, struct bnxt, fw_reset_task.work);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "bnxt_fw_reset_task() called when not in fw reset mode!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (bp-&gt;fw_reset_state) {</div><div class='add'>+	case BNXT_FW_RESET_STATE_POLL_VF: {</div><div class='add'>+		int n = bnxt_get_registered_vfs(bp);</div><div class='add'>+		int tmo;</div><div class='add'>+</div><div class='add'>+		if (n &lt; 0) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Firmware reset aborted, subsequent func_qcfg cmd failed, rc = %d, %d msecs since reset timestamp\n",</div><div class='add'>+				   n, jiffies_to_msecs(jiffies -</div><div class='add'>+				   bp-&gt;fw_reset_timestamp));</div><div class='add'>+			goto fw_reset_abort;</div><div class='add'>+		} else if (n &gt; 0) {</div><div class='add'>+			if (bnxt_fw_reset_timeout(bp)) {</div><div class='add'>+				clear_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+				bp-&gt;fw_reset_state = 0;</div><div class='add'>+				netdev_err(bp-&gt;dev, "Firmware reset aborted, bnxt_get_registered_vfs() returns %d\n",</div><div class='add'>+					   n);</div><div class='add'>+				goto ulp_start;</div><div class='add'>+			}</div><div class='add'>+			bnxt_queue_fw_reset_work(bp, HZ / 10);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		bp-&gt;fw_reset_timestamp = jiffies;</div><div class='add'>+		netdev_lock(bp-&gt;dev);</div><div class='add'>+		if (test_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state)) {</div><div class='add'>+			bnxt_fw_reset_abort(bp, rc);</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			goto ulp_start;</div><div class='add'>+		}</div><div class='add'>+		bnxt_fw_reset_close(bp);</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERR_RECOVER_RELOAD) {</div><div class='add'>+			bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW_DOWN;</div><div class='add'>+			tmo = HZ / 10;</div><div class='add'>+		} else {</div><div class='add'>+			bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;</div><div class='add'>+			tmo = bp-&gt;fw_reset_min_dsecs * HZ / 10;</div><div class='add'>+		}</div><div class='add'>+		netdev_unlock(bp-&gt;dev);</div><div class='add'>+		bnxt_queue_fw_reset_work(bp, tmo);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	case BNXT_FW_RESET_STATE_POLL_FW_DOWN: {</div><div class='add'>+		u32 val;</div><div class='add'>+</div><div class='add'>+		val = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);</div><div class='add'>+		if (!(val &amp; BNXT_FW_STATUS_SHUTDOWN) &amp;&amp;</div><div class='add'>+		    !bnxt_fw_reset_timeout(bp)) {</div><div class='add'>+			bnxt_queue_fw_reset_work(bp, HZ / 5);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!bp-&gt;fw_health-&gt;primary) {</div><div class='add'>+			u32 wait_dsecs = bp-&gt;fw_health-&gt;normal_func_wait_dsecs;</div><div class='add'>+</div><div class='add'>+			bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;</div><div class='add'>+			bnxt_queue_fw_reset_work(bp, wait_dsecs * HZ / 10);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_RESET_FW;</div><div class='add'>+	}</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BNXT_FW_RESET_STATE_RESET_FW:</div><div class='add'>+		bnxt_reset_all(bp);</div><div class='add'>+		bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV;</div><div class='add'>+		bnxt_queue_fw_reset_work(bp, bp-&gt;fw_reset_min_dsecs * HZ / 10);</div><div class='add'>+		return;</div><div class='add'>+	case BNXT_FW_RESET_STATE_ENABLE_DEV:</div><div class='add'>+		bnxt_inv_fw_health_reg(bp);</div><div class='add'>+		if (test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state) &amp;&amp;</div><div class='add'>+		    !bp-&gt;fw_reset_min_dsecs) {</div><div class='add'>+			u16 val;</div><div class='add'>+</div><div class='add'>+			pci_read_config_word(bp-&gt;pdev, PCI_SUBSYSTEM_ID, &amp;val);</div><div class='add'>+			if (val == 0xffff) {</div><div class='add'>+				if (bnxt_fw_reset_timeout(bp)) {</div><div class='add'>+					netdev_err(bp-&gt;dev, "Firmware reset aborted, PCI config space invalid\n");</div><div class='add'>+					rc = -ETIMEDOUT;</div><div class='add'>+					goto fw_reset_abort;</div><div class='add'>+				}</div><div class='add'>+				bnxt_queue_fw_reset_work(bp, HZ / 1000);</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		clear_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state);</div><div class='add'>+		clear_bit(BNXT_STATE_FW_NON_FATAL_COND, &amp;bp-&gt;state);</div><div class='add'>+		if (test_and_clear_bit(BNXT_STATE_FW_ACTIVATE_RESET, &amp;bp-&gt;state) &amp;&amp;</div><div class='add'>+		    !test_bit(BNXT_STATE_FW_ACTIVATE, &amp;bp-&gt;state))</div><div class='add'>+			bnxt_dl_remote_reload(bp);</div><div class='add'>+		if (pci_enable_device(bp-&gt;pdev)) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Cannot re-enable PCI device\n");</div><div class='add'>+			rc = -ENODEV;</div><div class='add'>+			goto fw_reset_abort;</div><div class='add'>+		}</div><div class='add'>+		pci_set_master(bp-&gt;pdev);</div><div class='add'>+		bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_POLL_FW;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BNXT_FW_RESET_STATE_POLL_FW:</div><div class='add'>+		bp-&gt;hwrm_cmd_timeout = SHORT_HWRM_CMD_TIMEOUT;</div><div class='add'>+		rc = bnxt_hwrm_poll(bp);</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (bnxt_fw_reset_timeout(bp)) {</div><div class='add'>+				netdev_err(bp-&gt;dev, "Firmware reset aborted\n");</div><div class='add'>+				goto fw_reset_abort_status;</div><div class='add'>+			}</div><div class='add'>+			bnxt_queue_fw_reset_work(bp, HZ / 5);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		bp-&gt;hwrm_cmd_timeout = DFLT_HWRM_CMD_TIMEOUT;</div><div class='add'>+		bp-&gt;fw_reset_state = BNXT_FW_RESET_STATE_OPENING;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case BNXT_FW_RESET_STATE_OPENING:</div><div class='add'>+		while (!netdev_trylock(bp-&gt;dev)) {</div><div class='add'>+			bnxt_queue_fw_reset_work(bp, HZ / 10);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		rc = bnxt_open(bp-&gt;dev);</div><div class='add'>+		if (rc) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "bnxt_open() failed during FW reset\n");</div><div class='add'>+			bnxt_fw_reset_abort(bp, rc);</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			goto ulp_start;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY) &amp;&amp;</div><div class='add'>+		    bp-&gt;fw_health-&gt;enabled) {</div><div class='add'>+			bp-&gt;fw_health-&gt;last_fw_reset_cnt =</div><div class='add'>+				bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG);</div><div class='add'>+		}</div><div class='add'>+		bp-&gt;fw_reset_state = 0;</div><div class='add'>+		/* Make sure fw_reset_state is 0 before clearing the flag */</div><div class='add'>+		smp_mb__before_atomic();</div><div class='add'>+		clear_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+		bnxt_ptp_reapply_pps(bp);</div><div class='add'>+		clear_bit(BNXT_STATE_FW_ACTIVATE, &amp;bp-&gt;state);</div><div class='add'>+		if (test_and_clear_bit(BNXT_STATE_RECOVER, &amp;bp-&gt;state)) {</div><div class='add'>+			bnxt_dl_health_fw_recovery_done(bp);</div><div class='add'>+			bnxt_dl_health_fw_status_update(bp, true);</div><div class='add'>+		}</div><div class='add'>+		netdev_unlock(bp-&gt;dev);</div><div class='add'>+		bnxt_ulp_start(bp, 0);</div><div class='add'>+		bnxt_reenable_sriov(bp);</div><div class='add'>+		netdev_lock(bp-&gt;dev);</div><div class='add'>+		bnxt_vf_reps_alloc(bp);</div><div class='add'>+		bnxt_vf_reps_open(bp);</div><div class='add'>+		netdev_unlock(bp-&gt;dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+fw_reset_abort_status:</div><div class='add'>+	if (bp-&gt;fw_health-&gt;status_reliable ||</div><div class='add'>+	    (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY)) {</div><div class='add'>+		u32 sts = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);</div><div class='add'>+</div><div class='add'>+		netdev_err(bp-&gt;dev, "fw_health_status 0x%x\n", sts);</div><div class='add'>+	}</div><div class='add'>+fw_reset_abort:</div><div class='add'>+	netdev_lock(bp-&gt;dev);</div><div class='add'>+	bnxt_fw_reset_abort(bp, rc);</div><div class='add'>+	netdev_unlock(bp-&gt;dev);</div><div class='add'>+ulp_start:</div><div class='add'>+	bnxt_ulp_start(bp, rc);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -9683,7 +15254,8 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	if (dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64)) != 0 &amp;&amp;</div><div class='ctx'> 	    dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32)) != 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "System does not support DMA, aborting\n");</div><div class='del'>-		goto init_err_disable;</div><div class='add'>+		rc = -EIO;</div><div class='add'>+		goto init_err_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='hunk'>@@ -9691,6 +15263,9 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	bp-&gt;dev = dev;</div><div class='ctx'> 	bp-&gt;pdev = pdev;</div><div class='ctx'> </div><div class='add'>+	/* Doorbell BAR bp-&gt;bar1 is mapped after bnxt_fw_init_one_p2()</div><div class='add'>+	 * determines the BAR size.</div><div class='add'>+	 */</div><div class='ctx'> 	bp-&gt;bar0 = pci_ioremap_bar(pdev, 0);</div><div class='ctx'> 	if (!bp-&gt;bar0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot map device registers, aborting\n");</div><div class='hunk'>@@ -9698,13 +15273,6 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		goto init_err_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;bar1 = pci_ioremap_bar(pdev, 2);</div><div class='del'>-	if (!bp-&gt;bar1) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Cannot map doorbell registers, aborting\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='del'>-		goto init_err_release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	bp-&gt;bar2 = pci_ioremap_bar(pdev, 4);</div><div class='ctx'> 	if (!bp-&gt;bar2) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Cannot map bar4 registers, aborting\n");</div><div class='hunk'>@@ -9712,9 +15280,8 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 		goto init_err_release;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_enable_pcie_error_reporting(pdev);</div><div class='del'>-</div><div class='ctx'> 	INIT_WORK(&amp;bp-&gt;sp_task, bnxt_sp_task);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;bp-&gt;fw_reset_task, bnxt_fw_reset_task);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;ntp_fltr_lock);</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='hunk'>@@ -9724,11 +15291,12 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> 	bp-&gt;rx_ring_size = BNXT_DEFAULT_RX_RING_SIZE;</div><div class='ctx'> 	bp-&gt;tx_ring_size = BNXT_DEFAULT_TX_RING_SIZE;</div><div class='ctx'> </div><div class='del'>-	bnxt_init_dflt_coal(bp);</div><div class='del'>-</div><div class='ctx'> 	timer_setup(&amp;bp-&gt;timer, bnxt_timer, 0);</div><div class='ctx'> 	bp-&gt;current_interval = BNXT_TIMER_INTERVAL;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;vxlan_fw_dst_port_id = INVALID_HW_RING_ID;</div><div class='add'>+	bp-&gt;nge_fw_dst_port_id = INVALID_HW_RING_ID;</div><div class='add'>+</div><div class='ctx'> 	clear_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -9743,13 +15311,14 @@ init_err:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rtnl_lock held */</div><div class='ctx'> static int bnxt_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr *addr = p;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='add'>+	netdev_assert_locked(dev);</div><div class='add'>+</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='hunk'>@@ -9760,7 +15329,8 @@ static int bnxt_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='add'>+	bnxt_clear_usr_fltrs(bp, true);</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		bnxt_close_nic(bp, false, false);</div><div class='ctx'> 		rc = bnxt_open_nic(bp, false, false);</div><div class='hunk'>@@ -9769,19 +15339,28 @@ static int bnxt_change_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* rtnl_lock held */</div><div class='ctx'> static int bnxt_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	netdev_assert_locked(dev);</div><div class='add'>+</div><div class='ctx'> 	if (netif_running(dev))</div><div class='del'>-		bnxt_close_nic(bp, false, false);</div><div class='add'>+		bnxt_close_nic(bp, true, false);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='add'>+</div><div class='add'>+	/* MTU change may change the AGG ring settings if an XDP multi-buffer</div><div class='add'>+	 * program is attached.  We need to set the AGG rings settings and</div><div class='add'>+	 * rx_skb_func accordingly.</div><div class='add'>+	 */</div><div class='add'>+	if (READ_ONCE(bp-&gt;xdp_prog))</div><div class='add'>+		bnxt_set_rx_skb_mode(bp, true);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='ctx'> 	bnxt_set_ring_params(bp);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='del'>-		return bnxt_open_nic(bp, false, false);</div><div class='add'>+		return bnxt_open_nic(bp, true, false);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -9790,7 +15369,7 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	bool sh = false;</div><div class='del'>-	int rc;</div><div class='add'>+	int rc, tx_cp;</div><div class='ctx'> </div><div class='ctx'> 	if (tc &gt; bp-&gt;max_tc) {</div><div class='ctx'> 		netdev_err(dev, "Too many traffic classes requested: %d. Max supported is %d.\n",</div><div class='hunk'>@@ -9798,7 +15377,7 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (netdev_get_num_tc(dev) == tc)</div><div class='add'>+	if (bp-&gt;num_tc == tc)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS)</div><div class='hunk'>@@ -9816,13 +15395,16 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc)</div><div class='ctx'> 	if (tc) {</div><div class='ctx'> 		bp-&gt;tx_nr_rings = bp-&gt;tx_nr_rings_per_tc * tc;</div><div class='ctx'> 		netdev_set_num_tc(dev, tc);</div><div class='add'>+		bp-&gt;num_tc = tc;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		bp-&gt;tx_nr_rings = bp-&gt;tx_nr_rings_per_tc;</div><div class='ctx'> 		netdev_reset_tc(dev);</div><div class='add'>+		bp-&gt;num_tc = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;tx_nr_rings += bp-&gt;tx_nr_rings_xdp;</div><div class='del'>-	bp-&gt;cp_nr_rings = sh ? max_t(int, bp-&gt;tx_nr_rings, bp-&gt;rx_nr_rings) :</div><div class='del'>-			       bp-&gt;tx_nr_rings + bp-&gt;rx_nr_rings;</div><div class='add'>+	tx_cp = bnxt_num_tx_to_cp(bp, bp-&gt;tx_nr_rings);</div><div class='add'>+	bp-&gt;cp_nr_rings = sh ? max_t(int, tx_cp, bp-&gt;rx_nr_rings) :</div><div class='add'>+			       tx_cp + bp-&gt;rx_nr_rings;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(bp-&gt;dev))</div><div class='ctx'> 		return bnxt_open_nic(bp, true, false);</div><div class='hunk'>@@ -9847,32 +15429,19 @@ static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_setup_tc_block(struct net_device *dev,</div><div class='del'>-			       struct tc_block_offload *f)</div><div class='del'>-{</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (f-&gt;command) {</div><div class='del'>-	case TC_BLOCK_BIND:</div><div class='del'>-		return tcf_block_cb_register(f-&gt;block, bnxt_setup_tc_block_cb,</div><div class='del'>-					     bp, bp, f-&gt;extack);</div><div class='del'>-	case TC_BLOCK_UNBIND:</div><div class='del'>-		tcf_block_cb_unregister(f-&gt;block, bnxt_setup_tc_block_cb, bp);</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+LIST_HEAD(bnxt_block_cb_list);</div><div class='ctx'> </div><div class='ctx'> static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='ctx'> 			 void *type_data)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case TC_SETUP_BLOCK:</div><div class='del'>-		return bnxt_setup_tc_block(dev, type_data);</div><div class='add'>+		return flow_block_cb_setup_simple(type_data,</div><div class='add'>+						  &amp;bnxt_block_cb_list,</div><div class='add'>+						  bnxt_setup_tc_block_cb,</div><div class='add'>+						  bp, bp, true);</div><div class='ctx'> 	case TC_SETUP_QDISC_MQPRIO: {</div><div class='ctx'> 		struct tc_mqprio_qopt *mqprio = type_data;</div><div class='ctx'> </div><div class='hunk'>@@ -9885,26 +15454,97 @@ static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='add'>+u32 bnxt_get_ntp_filter_idx(struct bnxt *bp, struct flow_keys *fkeys,</div><div class='add'>+			    const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='add'>+</div><div class='add'>+	if (skb)</div><div class='add'>+		return skb_get_hash_raw(skb) &amp; BNXT_NTP_FLTR_HASH_MASK;</div><div class='add'>+</div><div class='add'>+	vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='add'>+	return bnxt_toeplitz(bp, fkeys, (void *)vnic-&gt;rss_hash_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_insert_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr,</div><div class='add'>+			   u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+	int bit_id;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	bit_id = bitmap_find_free_region(bp-&gt;ntp_fltr_bmap, bp-&gt;max_fltr, 0);</div><div class='add'>+	if (bit_id &lt; 0) {</div><div class='add'>+		spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fltr-&gt;base.sw_id = (u16)bit_id;</div><div class='add'>+	fltr-&gt;base.type = BNXT_FLTR_TYPE_NTUPLE;</div><div class='add'>+	fltr-&gt;base.flags |= BNXT_ACT_RING_DST;</div><div class='add'>+	head = &amp;bp-&gt;ntp_fltr_hash_tbl[idx];</div><div class='add'>+	hlist_add_head_rcu(&amp;fltr-&gt;base.hash, head);</div><div class='add'>+	set_bit(BNXT_FLTR_INSERTED, &amp;fltr-&gt;base.state);</div><div class='add'>+	bnxt_insert_usr_fltr(bp, &amp;fltr-&gt;base);</div><div class='add'>+	bp-&gt;ntp_fltr_count++;</div><div class='add'>+	spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static bool bnxt_fltr_match(struct bnxt_ntuple_filter *f1,</div><div class='ctx'> 			    struct bnxt_ntuple_filter *f2)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_flow_masks *masks1 = &amp;f1-&gt;fmasks;</div><div class='add'>+	struct bnxt_flow_masks *masks2 = &amp;f2-&gt;fmasks;</div><div class='ctx'> 	struct flow_keys *keys1 = &amp;f1-&gt;fkeys;</div><div class='ctx'> 	struct flow_keys *keys2 = &amp;f2-&gt;fkeys;</div><div class='ctx'> </div><div class='del'>-	if (keys1-&gt;addrs.v4addrs.src == keys2-&gt;addrs.v4addrs.src &amp;&amp;</div><div class='del'>-	    keys1-&gt;addrs.v4addrs.dst == keys2-&gt;addrs.v4addrs.dst &amp;&amp;</div><div class='del'>-	    keys1-&gt;ports.ports == keys2-&gt;ports.ports &amp;&amp;</div><div class='del'>-	    keys1-&gt;basic.ip_proto == keys2-&gt;basic.ip_proto &amp;&amp;</div><div class='del'>-	    keys1-&gt;basic.n_proto == keys2-&gt;basic.n_proto &amp;&amp;</div><div class='del'>-	    keys1-&gt;control.flags == keys2-&gt;control.flags &amp;&amp;</div><div class='del'>-	    ether_addr_equal(f1-&gt;src_mac_addr, f2-&gt;src_mac_addr) &amp;&amp;</div><div class='del'>-	    ether_addr_equal(f1-&gt;dst_mac_addr, f2-&gt;dst_mac_addr))</div><div class='del'>-		return true;</div><div class='add'>+	if (keys1-&gt;basic.n_proto != keys2-&gt;basic.n_proto ||</div><div class='add'>+	    keys1-&gt;basic.ip_proto != keys2-&gt;basic.ip_proto)</div><div class='add'>+		return false;</div><div class='ctx'> </div><div class='del'>-	return false;</div><div class='add'>+	if (keys1-&gt;basic.n_proto == htons(ETH_P_IP)) {</div><div class='add'>+		if (keys1-&gt;addrs.v4addrs.src != keys2-&gt;addrs.v4addrs.src ||</div><div class='add'>+		    masks1-&gt;addrs.v4addrs.src != masks2-&gt;addrs.v4addrs.src ||</div><div class='add'>+		    keys1-&gt;addrs.v4addrs.dst != keys2-&gt;addrs.v4addrs.dst ||</div><div class='add'>+		    masks1-&gt;addrs.v4addrs.dst != masks2-&gt;addrs.v4addrs.dst)</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+		if (!ipv6_addr_equal(&amp;keys1-&gt;addrs.v6addrs.src,</div><div class='add'>+				     &amp;keys2-&gt;addrs.v6addrs.src) ||</div><div class='add'>+		    !ipv6_addr_equal(&amp;masks1-&gt;addrs.v6addrs.src,</div><div class='add'>+				     &amp;masks2-&gt;addrs.v6addrs.src) ||</div><div class='add'>+		    !ipv6_addr_equal(&amp;keys1-&gt;addrs.v6addrs.dst,</div><div class='add'>+				     &amp;keys2-&gt;addrs.v6addrs.dst) ||</div><div class='add'>+		    !ipv6_addr_equal(&amp;masks1-&gt;addrs.v6addrs.dst,</div><div class='add'>+				     &amp;masks2-&gt;addrs.v6addrs.dst))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return keys1-&gt;ports.src == keys2-&gt;ports.src &amp;&amp;</div><div class='add'>+	       masks1-&gt;ports.src == masks2-&gt;ports.src &amp;&amp;</div><div class='add'>+	       keys1-&gt;ports.dst == keys2-&gt;ports.dst &amp;&amp;</div><div class='add'>+	       masks1-&gt;ports.dst == masks2-&gt;ports.dst &amp;&amp;</div><div class='add'>+	       keys1-&gt;control.flags == keys2-&gt;control.flags &amp;&amp;</div><div class='add'>+	       f1-&gt;l2_fltr == f2-&gt;l2_fltr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct bnxt_ntuple_filter *</div><div class='add'>+bnxt_lookup_ntp_filter_from_idx(struct bnxt *bp,</div><div class='add'>+				struct bnxt_ntuple_filter *fltr, u32 idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ntuple_filter *f;</div><div class='add'>+	struct hlist_head *head;</div><div class='add'>+</div><div class='add'>+	head = &amp;bp-&gt;ntp_fltr_hash_tbl[idx];</div><div class='add'>+	hlist_for_each_entry_rcu(f, head, base.hash) {</div><div class='add'>+		if (bnxt_fltr_match(f, fltr))</div><div class='add'>+			return f;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,</div><div class='ctx'> 			      u16 rxq_index, u32 flow_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -9912,28 +15552,31 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,</div><div class='ctx'> 	struct bnxt_ntuple_filter *fltr, *new_fltr;</div><div class='ctx'> 	struct flow_keys *fkeys;</div><div class='ctx'> 	struct ethhdr *eth = (struct ethhdr *)skb_mac_header(skb);</div><div class='del'>-	int rc = 0, idx, bit_id, l2_idx = 0;</div><div class='del'>-	struct hlist_head *head;</div><div class='add'>+	struct bnxt_l2_filter *l2_fltr;</div><div class='add'>+	int rc = 0, idx;</div><div class='add'>+	u32 flags;</div><div class='ctx'> </div><div class='del'>-	if (!ether_addr_equal(dev-&gt;dev_addr, eth-&gt;h_dest)) {</div><div class='del'>-		struct bnxt_vnic_info *vnic = &amp;bp-&gt;vnic_info[0];</div><div class='del'>-		int off = 0, j;</div><div class='add'>+	if (ether_addr_equal(dev-&gt;dev_addr, eth-&gt;h_dest)) {</div><div class='add'>+		l2_fltr = bp-&gt;vnic_info[BNXT_VNIC_DEFAULT].l2_filters[0];</div><div class='add'>+		atomic_inc(&amp;l2_fltr-&gt;refcnt);</div><div class='add'>+	} else {</div><div class='add'>+		struct bnxt_l2_key key;</div><div class='ctx'> </div><div class='del'>-		netif_addr_lock_bh(dev);</div><div class='del'>-		for (j = 0; j &lt; vnic-&gt;uc_filter_count; j++, off += ETH_ALEN) {</div><div class='del'>-			if (ether_addr_equal(eth-&gt;h_dest,</div><div class='del'>-					     vnic-&gt;uc_list + off)) {</div><div class='del'>-				l2_idx = j + 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		netif_addr_unlock_bh(dev);</div><div class='del'>-		if (!l2_idx)</div><div class='add'>+		ether_addr_copy(key.dst_mac_addr, eth-&gt;h_dest);</div><div class='add'>+		key.vlan = 0;</div><div class='add'>+		l2_fltr = bnxt_lookup_l2_filter_from_key(bp, &amp;key);</div><div class='add'>+		if (!l2_fltr)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+		if (l2_fltr-&gt;base.flags &amp; BNXT_ACT_FUNC_DST) {</div><div class='add'>+			bnxt_del_l2_filter(bp, l2_fltr);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	new_fltr = kzalloc(sizeof(*new_fltr), GFP_ATOMIC);</div><div class='del'>-	if (!new_fltr)</div><div class='add'>+	if (!new_fltr) {</div><div class='add'>+		bnxt_del_l2_filter(bp, l2_fltr);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	fkeys = &amp;new_fltr-&gt;fkeys;</div><div class='ctx'> 	if (!skb_flow_dissect_flow_keys(skb, fkeys, 0)) {</div><div class='hunk'>@@ -9948,61 +15591,66 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,</div><div class='ctx'> 		rc = -EPROTONOSUPPORT;</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='del'>-	if (fkeys-&gt;basic.n_proto == htons(ETH_P_IPV6) &amp;&amp;</div><div class='del'>-	    bp-&gt;hwrm_spec_code &lt; 0x10601) {</div><div class='del'>-		rc = -EPROTONOSUPPORT;</div><div class='del'>-		goto err_free;</div><div class='add'>+	new_fltr-&gt;fmasks = BNXT_FLOW_IPV4_MASK_ALL;</div><div class='add'>+	if (fkeys-&gt;basic.n_proto == htons(ETH_P_IPV6)) {</div><div class='add'>+		if (bp-&gt;hwrm_spec_code &lt; 0x10601) {</div><div class='add'>+			rc = -EPROTONOSUPPORT;</div><div class='add'>+			goto err_free;</div><div class='add'>+		}</div><div class='add'>+		new_fltr-&gt;fmasks = BNXT_FLOW_IPV6_MASK_ALL;</div><div class='ctx'> 	}</div><div class='del'>-	if ((fkeys-&gt;control.flags &amp; FLOW_DIS_ENCAPSULATION) &amp;&amp;</div><div class='del'>-	    bp-&gt;hwrm_spec_code &lt; 0x10601) {</div><div class='add'>+	flags = fkeys-&gt;control.flags;</div><div class='add'>+	if (((flags &amp; FLOW_DIS_ENCAPSULATION) &amp;&amp;</div><div class='add'>+	     bp-&gt;hwrm_spec_code &lt; 0x10601) || (flags &amp; FLOW_DIS_IS_FRAGMENT)) {</div><div class='ctx'> 		rc = -EPROTONOSUPPORT;</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='add'>+	new_fltr-&gt;l2_fltr = l2_fltr;</div><div class='ctx'> </div><div class='del'>-	memcpy(new_fltr-&gt;dst_mac_addr, eth-&gt;h_dest, ETH_ALEN);</div><div class='del'>-	memcpy(new_fltr-&gt;src_mac_addr, eth-&gt;h_source, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	idx = skb_get_hash_raw(skb) &amp; BNXT_NTP_FLTR_HASH_MASK;</div><div class='del'>-	head = &amp;bp-&gt;ntp_fltr_hash_tbl[idx];</div><div class='add'>+	idx = bnxt_get_ntp_filter_idx(bp, fkeys, skb);</div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	hlist_for_each_entry_rcu(fltr, head, hash) {</div><div class='del'>-		if (bnxt_fltr_match(fltr, new_fltr)) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			rc = 0;</div><div class='del'>-			goto err_free;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcu_read_unlock();</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='del'>-	bit_id = bitmap_find_free_region(bp-&gt;ntp_fltr_bmap,</div><div class='del'>-					 BNXT_NTP_FLTR_MAX_FLTR, 0);</div><div class='del'>-	if (bit_id &lt; 0) {</div><div class='del'>-		spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='del'>-		rc = -ENOMEM;</div><div class='add'>+	fltr = bnxt_lookup_ntp_filter_from_idx(bp, new_fltr, idx);</div><div class='add'>+	if (fltr) {</div><div class='add'>+		rc = fltr-&gt;base.sw_id;</div><div class='add'>+		rcu_read_unlock();</div><div class='ctx'> 		goto err_free;</div><div class='ctx'> 	}</div><div class='add'>+	rcu_read_unlock();</div><div class='ctx'> </div><div class='del'>-	new_fltr-&gt;sw_id = (u16)bit_id;</div><div class='ctx'> 	new_fltr-&gt;flow_id = flow_id;</div><div class='del'>-	new_fltr-&gt;l2_fltr_idx = l2_idx;</div><div class='del'>-	new_fltr-&gt;rxq = rxq_index;</div><div class='del'>-	hlist_add_head_rcu(&amp;new_fltr-&gt;hash, head);</div><div class='del'>-	bp-&gt;ntp_fltr_count++;</div><div class='del'>-	spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='del'>-</div><div class='del'>-	set_bit(BNXT_RX_NTP_FLTR_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-	bnxt_queue_sp_work(bp);</div><div class='del'>-</div><div class='del'>-	return new_fltr-&gt;sw_id;</div><div class='add'>+	new_fltr-&gt;base.rxq = rxq_index;</div><div class='add'>+	rc = bnxt_insert_ntp_filter(bp, new_fltr, idx);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		bnxt_queue_sp_work(bp, BNXT_RX_NTP_FLTR_SP_EVENT);</div><div class='add'>+		return new_fltr-&gt;base.sw_id;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> err_free:</div><div class='add'>+	bnxt_del_l2_filter(bp, l2_fltr);</div><div class='ctx'> 	kfree(new_fltr);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+void bnxt_del_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	if (!test_and_clear_bit(BNXT_FLTR_INSERTED, &amp;fltr-&gt;base.state)) {</div><div class='add'>+		spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	hlist_del_rcu(&amp;fltr-&gt;base.hash);</div><div class='add'>+	bnxt_del_one_usr_fltr(bp, &amp;fltr-&gt;base);</div><div class='add'>+	bp-&gt;ntp_fltr_count--;</div><div class='add'>+	spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='add'>+	bnxt_del_l2_filter(bp, fltr-&gt;l2_fltr);</div><div class='add'>+	clear_bit(fltr-&gt;base.sw_id, bp-&gt;ntp_fltr_bmap);</div><div class='add'>+	kfree_rcu(fltr, base.rcu);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static void bnxt_cfg_ntp_filters(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+#ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BNXT_NTP_FLTR_HASH_SIZE; i++) {</div><div class='hunk'>@@ -10012,13 +15660,15 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp)</div><div class='ctx'> 		int rc;</div><div class='ctx'> </div><div class='ctx'> 		head = &amp;bp-&gt;ntp_fltr_hash_tbl[i];</div><div class='del'>-		hlist_for_each_entry_safe(fltr, tmp, head, hash) {</div><div class='add'>+		hlist_for_each_entry_safe(fltr, tmp, head, base.hash) {</div><div class='ctx'> 			bool del = false;</div><div class='ctx'> </div><div class='del'>-			if (test_bit(BNXT_FLTR_VALID, &amp;fltr-&gt;state)) {</div><div class='del'>-				if (rps_may_expire_flow(bp-&gt;dev, fltr-&gt;rxq,</div><div class='add'>+			if (test_bit(BNXT_FLTR_VALID, &amp;fltr-&gt;base.state)) {</div><div class='add'>+				if (fltr-&gt;base.flags &amp; BNXT_ACT_NO_AGING)</div><div class='add'>+					continue;</div><div class='add'>+				if (rps_may_expire_flow(bp-&gt;dev, fltr-&gt;base.rxq,</div><div class='ctx'> 							fltr-&gt;flow_id,</div><div class='del'>-							fltr-&gt;sw_id)) {</div><div class='add'>+							fltr-&gt;base.sw_id)) {</div><div class='ctx'> 					bnxt_hwrm_cfa_ntuple_filter_free(bp,</div><div class='ctx'> 									 fltr);</div><div class='ctx'> 					del = true;</div><div class='hunk'>@@ -10029,110 +15679,66 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp)</div><div class='ctx'> 				if (rc)</div><div class='ctx'> 					del = true;</div><div class='ctx'> 				else</div><div class='del'>-					set_bit(BNXT_FLTR_VALID, &amp;fltr-&gt;state);</div><div class='add'>+					set_bit(BNXT_FLTR_VALID, &amp;fltr-&gt;base.state);</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			if (del) {</div><div class='del'>-				spin_lock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='del'>-				hlist_del_rcu(&amp;fltr-&gt;hash);</div><div class='del'>-				bp-&gt;ntp_fltr_count--;</div><div class='del'>-				spin_unlock_bh(&amp;bp-&gt;ntp_fltr_lock);</div><div class='del'>-				synchronize_rcu();</div><div class='del'>-				clear_bit(fltr-&gt;sw_id, bp-&gt;ntp_fltr_bmap);</div><div class='del'>-				kfree(fltr);</div><div class='del'>-			}</div><div class='add'>+			if (del)</div><div class='add'>+				bnxt_del_ntp_filter(bp, fltr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (test_and_clear_bit(BNXT_HWRM_PF_UNLOAD_SP_EVENT, &amp;bp-&gt;sp_event))</div><div class='del'>-		netdev_info(bp-&gt;dev, "Receive PF driver unload event!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-static void bnxt_cfg_ntp_filters(struct bnxt *bp)</div><div class='del'>-{</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_RFS_ACCEL */</div><div class='del'>-</div><div class='del'>-static void bnxt_udp_tunnel_add(struct net_device *dev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='add'>+static int bnxt_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,</div><div class='add'>+				    unsigned int entry, struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (ti-&gt;sa_family != AF_INET6 &amp;&amp; ti-&gt;sa_family != AF_INET)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (ti-&gt;type) {</div><div class='del'>-	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		if (bp-&gt;vxlan_port_cnt &amp;&amp; bp-&gt;vxlan_port != ti-&gt;port)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		bp-&gt;vxlan_port_cnt++;</div><div class='del'>-		if (bp-&gt;vxlan_port_cnt == 1) {</div><div class='del'>-			bp-&gt;vxlan_port = ti-&gt;port;</div><div class='del'>-			set_bit(BNXT_VXLAN_ADD_PORT_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-			bnxt_queue_sp_work(bp);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		if (bp-&gt;nge_port_cnt &amp;&amp; bp-&gt;nge_port != ti-&gt;port)</div><div class='del'>-			return;</div><div class='add'>+	struct bnxt *bp = netdev_priv(netdev);</div><div class='add'>+	unsigned int cmd;</div><div class='ctx'> </div><div class='del'>-		bp-&gt;nge_port_cnt++;</div><div class='del'>-		if (bp-&gt;nge_port_cnt == 1) {</div><div class='del'>-			bp-&gt;nge_port = ti-&gt;port;</div><div class='del'>-			set_bit(BNXT_GENEVE_ADD_PORT_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	if (ti-&gt;type == UDP_TUNNEL_TYPE_VXLAN)</div><div class='add'>+		cmd = TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN;</div><div class='add'>+	else if (ti-&gt;type == UDP_TUNNEL_TYPE_GENEVE)</div><div class='add'>+		cmd = TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE;</div><div class='add'>+	else</div><div class='add'>+		cmd = TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE;</div><div class='ctx'> </div><div class='del'>-	bnxt_queue_sp_work(bp);</div><div class='add'>+	return bnxt_hwrm_tunnel_dst_port_alloc(bp, ti-&gt;port, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_udp_tunnel_del(struct net_device *dev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='add'>+static int bnxt_udp_tunnel_unset_port(struct net_device *netdev, unsigned int table,</div><div class='add'>+				      unsigned int entry, struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (ti-&gt;sa_family != AF_INET6 &amp;&amp; ti-&gt;sa_family != AF_INET)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (ti-&gt;type) {</div><div class='del'>-	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		if (!bp-&gt;vxlan_port_cnt || bp-&gt;vxlan_port != ti-&gt;port)</div><div class='del'>-			return;</div><div class='del'>-		bp-&gt;vxlan_port_cnt--;</div><div class='del'>-</div><div class='del'>-		if (bp-&gt;vxlan_port_cnt != 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		set_bit(BNXT_VXLAN_DEL_PORT_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		break;</div><div class='del'>-	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		if (!bp-&gt;nge_port_cnt || bp-&gt;nge_port != ti-&gt;port)</div><div class='del'>-			return;</div><div class='del'>-		bp-&gt;nge_port_cnt--;</div><div class='del'>-</div><div class='del'>-		if (bp-&gt;nge_port_cnt != 0)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		set_bit(BNXT_GENEVE_DEL_PORT_SP_EVENT, &amp;bp-&gt;sp_event);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	struct bnxt *bp = netdev_priv(netdev);</div><div class='add'>+	unsigned int cmd;</div><div class='ctx'> </div><div class='del'>-	bnxt_queue_sp_work(bp);</div><div class='del'>-}</div><div class='add'>+	if (ti-&gt;type == UDP_TUNNEL_TYPE_VXLAN)</div><div class='add'>+		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN;</div><div class='add'>+	else if (ti-&gt;type == UDP_TUNNEL_TYPE_GENEVE)</div><div class='add'>+		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE;</div><div class='add'>+	else</div><div class='add'>+		cmd = TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE;</div><div class='add'>+</div><div class='add'>+	return bnxt_hwrm_tunnel_dst_port_free(bp, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct udp_tunnel_nic_info bnxt_udp_tunnels = {</div><div class='add'>+	.set_port	= bnxt_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= bnxt_udp_tunnel_unset_port,</div><div class='add'>+	.flags		= UDP_TUNNEL_NIC_INFO_OPEN_ONLY,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN,  },</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },</div><div class='add'>+	},</div><div class='add'>+}, bnxt_udp_tunnels_p7 = {</div><div class='add'>+	.set_port	= bnxt_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= bnxt_udp_tunnel_unset_port,</div><div class='add'>+	.flags		= UDP_TUNNEL_NIC_INFO_OPEN_ONLY,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN,  },</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN_GPE, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> static int bnxt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,</div><div class='ctx'> 			       struct net_device *dev, u32 filter_mask,</div><div class='hunk'>@@ -10158,15 +15764,9 @@ static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!br_spec)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	nla_for_each_nested(attr, br_spec, rem) {</div><div class='add'>+	nla_for_each_nested_type(attr, IFLA_BRIDGE_MODE, br_spec, rem) {</div><div class='ctx'> 		u16 mode;</div><div class='ctx'> </div><div class='del'>-		if (nla_type(attr) != IFLA_BRIDGE_MODE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (nla_len(attr) &lt; sizeof(mode))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 		mode = nla_get_u16(attr);</div><div class='ctx'> 		if (mode == bp-&gt;br_mode)</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -10188,34 +15788,28 @@ int bnxt_get_port_parent_id(struct net_device *dev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* The PF and it's VF-reps only support the switchdev framework */</div><div class='del'>-	if (!BNXT_PF(bp))</div><div class='add'>+	if (!BNXT_PF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_DSN_VALID))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ppid-&gt;id_len = sizeof(bp-&gt;switch_id);</div><div class='del'>-	memcpy(ppid-&gt;id, bp-&gt;switch_id, ppid-&gt;id_len);</div><div class='add'>+	ppid-&gt;id_len = sizeof(bp-&gt;dsn);</div><div class='add'>+	memcpy(ppid-&gt;id, bp-&gt;dsn, ppid-&gt;id_len);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct devlink_port *bnxt_get_devlink_port(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	return &amp;bp-&gt;dl_port;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct net_device_ops bnxt_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= bnxt_open,</div><div class='ctx'> 	.ndo_start_xmit		= bnxt_start_xmit,</div><div class='ctx'> 	.ndo_stop		= bnxt_close,</div><div class='ctx'> 	.ndo_get_stats64	= bnxt_get_stats64,</div><div class='ctx'> 	.ndo_set_rx_mode	= bnxt_set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= bnxt_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= bnxt_ioctl,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= bnxt_change_mac_addr,</div><div class='ctx'> 	.ndo_change_mtu		= bnxt_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= bnxt_fix_features,</div><div class='ctx'> 	.ndo_set_features	= bnxt_set_features,</div><div class='add'>+	.ndo_features_check	= bnxt_features_check,</div><div class='ctx'> 	.ndo_tx_timeout		= bnxt_tx_timeout,</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	.ndo_get_vf_config	= bnxt_get_vf_config,</div><div class='hunk'>@@ -10230,12 +15824,383 @@ static const struct net_device_ops bnxt_netdev_ops = {</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	.ndo_rx_flow_steer	= bnxt_rx_flow_steer,</div><div class='ctx'> #endif</div><div class='del'>-	.ndo_udp_tunnel_add	= bnxt_udp_tunnel_add,</div><div class='del'>-	.ndo_udp_tunnel_del	= bnxt_udp_tunnel_del,</div><div class='ctx'> 	.ndo_bpf		= bnxt_xdp,</div><div class='add'>+	.ndo_xdp_xmit		= bnxt_xdp_xmit,</div><div class='ctx'> 	.ndo_bridge_getlink	= bnxt_bridge_getlink,</div><div class='ctx'> 	.ndo_bridge_setlink	= bnxt_bridge_setlink,</div><div class='del'>-	.ndo_get_devlink_port	= bnxt_get_devlink_port,</div><div class='add'>+	.ndo_hwtstamp_get	= bnxt_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= bnxt_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bnxt_get_queue_stats_rx(struct net_device *dev, int i,</div><div class='add'>+				    struct netdev_queue_stats_rx *stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_cp_ring_info *cpr;</div><div class='add'>+	u64 *sw;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;bnapi)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cpr = &amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='add'>+	sw = cpr-&gt;stats.sw_stats;</div><div class='add'>+</div><div class='add'>+	stats-&gt;packets = 0;</div><div class='add'>+	stats-&gt;packets += BNXT_GET_RING_STATS64(sw, rx_ucast_pkts);</div><div class='add'>+	stats-&gt;packets += BNXT_GET_RING_STATS64(sw, rx_mcast_pkts);</div><div class='add'>+	stats-&gt;packets += BNXT_GET_RING_STATS64(sw, rx_bcast_pkts);</div><div class='add'>+</div><div class='add'>+	stats-&gt;bytes = 0;</div><div class='add'>+	stats-&gt;bytes += BNXT_GET_RING_STATS64(sw, rx_ucast_bytes);</div><div class='add'>+	stats-&gt;bytes += BNXT_GET_RING_STATS64(sw, rx_mcast_bytes);</div><div class='add'>+	stats-&gt;bytes += BNXT_GET_RING_STATS64(sw, rx_bcast_bytes);</div><div class='add'>+</div><div class='add'>+	stats-&gt;alloc_fail = cpr-&gt;sw_stats-&gt;rx.rx_oom_discards;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_queue_stats_tx(struct net_device *dev, int i,</div><div class='add'>+				    struct netdev_queue_stats_tx *stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_napi *bnapi;</div><div class='add'>+	u64 *sw;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;tx_ring)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bnapi = bp-&gt;tx_ring[bp-&gt;tx_ring_map[i]].bnapi;</div><div class='add'>+	sw = bnapi-&gt;cp_ring.stats.sw_stats;</div><div class='add'>+</div><div class='add'>+	stats-&gt;packets = 0;</div><div class='add'>+	stats-&gt;packets += BNXT_GET_RING_STATS64(sw, tx_ucast_pkts);</div><div class='add'>+	stats-&gt;packets += BNXT_GET_RING_STATS64(sw, tx_mcast_pkts);</div><div class='add'>+	stats-&gt;packets += BNXT_GET_RING_STATS64(sw, tx_bcast_pkts);</div><div class='add'>+</div><div class='add'>+	stats-&gt;bytes = 0;</div><div class='add'>+	stats-&gt;bytes += BNXT_GET_RING_STATS64(sw, tx_ucast_bytes);</div><div class='add'>+	stats-&gt;bytes += BNXT_GET_RING_STATS64(sw, tx_mcast_bytes);</div><div class='add'>+	stats-&gt;bytes += BNXT_GET_RING_STATS64(sw, tx_bcast_bytes);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_base_stats(struct net_device *dev,</div><div class='add'>+				struct netdev_queue_stats_rx *rx,</div><div class='add'>+				struct netdev_queue_stats_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	rx-&gt;packets = bp-&gt;net_stats_prev.rx_packets;</div><div class='add'>+	rx-&gt;bytes = bp-&gt;net_stats_prev.rx_bytes;</div><div class='add'>+	rx-&gt;alloc_fail = bp-&gt;ring_err_stats_prev.rx_total_oom_discards;</div><div class='add'>+</div><div class='add'>+	tx-&gt;packets = bp-&gt;net_stats_prev.tx_packets;</div><div class='add'>+	tx-&gt;bytes = bp-&gt;net_stats_prev.tx_bytes;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct netdev_stat_ops bnxt_stat_ops = {</div><div class='add'>+	.get_queue_stats_rx	= bnxt_get_queue_stats_rx,</div><div class='add'>+	.get_queue_stats_tx	= bnxt_get_queue_stats_tx,</div><div class='add'>+	.get_base_stats		= bnxt_get_base_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bnxt_queue_mem_alloc(struct net_device *dev, void *qmem, int idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_rx_ring_info *rxr, *clone;</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;rx_ring)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	rxr = &amp;bp-&gt;rx_ring[idx];</div><div class='add'>+	clone = qmem;</div><div class='add'>+	memcpy(clone, rxr, sizeof(*rxr));</div><div class='add'>+	bnxt_init_rx_ring_struct(bp, clone);</div><div class='add'>+	bnxt_reset_rx_ring_struct(bp, clone);</div><div class='add'>+</div><div class='add'>+	clone-&gt;rx_prod = 0;</div><div class='add'>+	clone-&gt;rx_agg_prod = 0;</div><div class='add'>+	clone-&gt;rx_sw_agg_prod = 0;</div><div class='add'>+	clone-&gt;rx_next_cons = 0;</div><div class='add'>+	clone-&gt;need_head_pool = false;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_alloc_rx_page_pool(bp, clone, rxr-&gt;page_pool-&gt;p.nid);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = xdp_rxq_info_reg(&amp;clone-&gt;xdp_rxq, bp-&gt;dev, idx, 0);</div><div class='add'>+	if (rc &lt; 0)</div><div class='add'>+		goto err_page_pool_destroy;</div><div class='add'>+</div><div class='add'>+	rc = xdp_rxq_info_reg_mem_model(&amp;clone-&gt;xdp_rxq,</div><div class='add'>+					MEM_TYPE_PAGE_POOL,</div><div class='add'>+					clone-&gt;page_pool);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_rxq_info_unreg;</div><div class='add'>+</div><div class='add'>+	ring = &amp;clone-&gt;rx_ring_struct;</div><div class='add'>+	rc = bnxt_alloc_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_free_rx_ring;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS) {</div><div class='add'>+		ring = &amp;clone-&gt;rx_agg_ring_struct;</div><div class='add'>+		rc = bnxt_alloc_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_rx_agg_ring;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_alloc_rx_agg_bmap(bp, clone);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_rx_agg_ring;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA) {</div><div class='add'>+		rc = bnxt_alloc_one_tpa_info(bp, clone);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_free_tpa_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnxt_init_one_rx_ring_rxbd(bp, clone);</div><div class='add'>+	bnxt_init_one_rx_agg_ring_rxbd(bp, clone);</div><div class='add'>+</div><div class='add'>+	bnxt_alloc_one_rx_ring_skb(bp, clone, idx);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='add'>+		bnxt_alloc_one_rx_ring_netmem(bp, clone, idx);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_TPA)</div><div class='add'>+		bnxt_alloc_one_tpa_info_data(bp, clone);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_free_tpa_info:</div><div class='add'>+	bnxt_free_one_tpa_info(bp, clone);</div><div class='add'>+err_free_rx_agg_ring:</div><div class='add'>+	bnxt_free_ring(bp, &amp;clone-&gt;rx_agg_ring_struct.ring_mem);</div><div class='add'>+err_free_rx_ring:</div><div class='add'>+	bnxt_free_ring(bp, &amp;clone-&gt;rx_ring_struct.ring_mem);</div><div class='add'>+err_rxq_info_unreg:</div><div class='add'>+	xdp_rxq_info_unreg(&amp;clone-&gt;xdp_rxq);</div><div class='add'>+err_page_pool_destroy:</div><div class='add'>+	page_pool_destroy(clone-&gt;page_pool);</div><div class='add'>+	page_pool_destroy(clone-&gt;head_pool);</div><div class='add'>+	clone-&gt;page_pool = NULL;</div><div class='add'>+	clone-&gt;head_pool = NULL;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_queue_mem_free(struct net_device *dev, void *qmem)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_rx_ring_info *rxr = qmem;</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ring_struct *ring;</div><div class='add'>+</div><div class='add'>+	bnxt_free_one_rx_ring_skbs(bp, rxr);</div><div class='add'>+	bnxt_free_one_tpa_info(bp, rxr);</div><div class='add'>+</div><div class='add'>+	xdp_rxq_info_unreg(&amp;rxr-&gt;xdp_rxq);</div><div class='add'>+</div><div class='add'>+	page_pool_destroy(rxr-&gt;page_pool);</div><div class='add'>+	page_pool_destroy(rxr-&gt;head_pool);</div><div class='add'>+	rxr-&gt;page_pool = NULL;</div><div class='add'>+	rxr-&gt;head_pool = NULL;</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_ring_struct;</div><div class='add'>+	bnxt_free_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='add'>+</div><div class='add'>+	ring = &amp;rxr-&gt;rx_agg_ring_struct;</div><div class='add'>+	bnxt_free_ring(bp, &amp;ring-&gt;ring_mem);</div><div class='add'>+</div><div class='add'>+	kfree(rxr-&gt;rx_agg_bmap);</div><div class='add'>+	rxr-&gt;rx_agg_bmap = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_copy_rx_ring(struct bnxt *bp,</div><div class='add'>+			      struct bnxt_rx_ring_info *dst,</div><div class='add'>+			      struct bnxt_rx_ring_info *src)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_mem_info *dst_rmem, *src_rmem;</div><div class='add'>+	struct bnxt_ring_struct *dst_ring, *src_ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dst_ring = &amp;dst-&gt;rx_ring_struct;</div><div class='add'>+	dst_rmem = &amp;dst_ring-&gt;ring_mem;</div><div class='add'>+	src_ring = &amp;src-&gt;rx_ring_struct;</div><div class='add'>+	src_rmem = &amp;src_ring-&gt;ring_mem;</div><div class='add'>+</div><div class='add'>+	WARN_ON(dst_rmem-&gt;nr_pages != src_rmem-&gt;nr_pages);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;page_size != src_rmem-&gt;page_size);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;flags != src_rmem-&gt;flags);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;depth != src_rmem-&gt;depth);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;vmem_size != src_rmem-&gt;vmem_size);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;ctx_mem != src_rmem-&gt;ctx_mem);</div><div class='add'>+</div><div class='add'>+	dst_rmem-&gt;pg_tbl = src_rmem-&gt;pg_tbl;</div><div class='add'>+	dst_rmem-&gt;pg_tbl_map = src_rmem-&gt;pg_tbl_map;</div><div class='add'>+	*dst_rmem-&gt;vmem = *src_rmem-&gt;vmem;</div><div class='add'>+	for (i = 0; i &lt; dst_rmem-&gt;nr_pages; i++) {</div><div class='add'>+		dst_rmem-&gt;pg_arr[i] = src_rmem-&gt;pg_arr[i];</div><div class='add'>+		dst_rmem-&gt;dma_arr[i] = src_rmem-&gt;dma_arr[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dst_ring = &amp;dst-&gt;rx_agg_ring_struct;</div><div class='add'>+	dst_rmem = &amp;dst_ring-&gt;ring_mem;</div><div class='add'>+	src_ring = &amp;src-&gt;rx_agg_ring_struct;</div><div class='add'>+	src_rmem = &amp;src_ring-&gt;ring_mem;</div><div class='add'>+</div><div class='add'>+	WARN_ON(dst_rmem-&gt;nr_pages != src_rmem-&gt;nr_pages);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;page_size != src_rmem-&gt;page_size);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;flags != src_rmem-&gt;flags);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;depth != src_rmem-&gt;depth);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;vmem_size != src_rmem-&gt;vmem_size);</div><div class='add'>+	WARN_ON(dst_rmem-&gt;ctx_mem != src_rmem-&gt;ctx_mem);</div><div class='add'>+	WARN_ON(dst-&gt;rx_agg_bmap_size != src-&gt;rx_agg_bmap_size);</div><div class='add'>+</div><div class='add'>+	dst_rmem-&gt;pg_tbl = src_rmem-&gt;pg_tbl;</div><div class='add'>+	dst_rmem-&gt;pg_tbl_map = src_rmem-&gt;pg_tbl_map;</div><div class='add'>+	*dst_rmem-&gt;vmem = *src_rmem-&gt;vmem;</div><div class='add'>+	for (i = 0; i &lt; dst_rmem-&gt;nr_pages; i++) {</div><div class='add'>+		dst_rmem-&gt;pg_arr[i] = src_rmem-&gt;pg_arr[i];</div><div class='add'>+		dst_rmem-&gt;dma_arr[i] = src_rmem-&gt;dma_arr[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dst-&gt;rx_agg_bmap = src-&gt;rx_agg_bmap;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_rx_ring_info *rxr, *clone;</div><div class='add'>+	struct bnxt_cp_ring_info *cpr;</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='add'>+	struct bnxt_napi *bnapi;</div><div class='add'>+	int i, rc;</div><div class='add'>+	u16 mru;</div><div class='add'>+</div><div class='add'>+	rxr = &amp;bp-&gt;rx_ring[idx];</div><div class='add'>+	clone = qmem;</div><div class='add'>+</div><div class='add'>+	rxr-&gt;rx_prod = clone-&gt;rx_prod;</div><div class='add'>+	rxr-&gt;rx_agg_prod = clone-&gt;rx_agg_prod;</div><div class='add'>+	rxr-&gt;rx_sw_agg_prod = clone-&gt;rx_sw_agg_prod;</div><div class='add'>+	rxr-&gt;rx_next_cons = clone-&gt;rx_next_cons;</div><div class='add'>+	rxr-&gt;rx_tpa = clone-&gt;rx_tpa;</div><div class='add'>+	rxr-&gt;rx_tpa_idx_map = clone-&gt;rx_tpa_idx_map;</div><div class='add'>+	rxr-&gt;page_pool = clone-&gt;page_pool;</div><div class='add'>+	rxr-&gt;head_pool = clone-&gt;head_pool;</div><div class='add'>+	rxr-&gt;xdp_rxq = clone-&gt;xdp_rxq;</div><div class='add'>+	rxr-&gt;need_head_pool = clone-&gt;need_head_pool;</div><div class='add'>+</div><div class='add'>+	bnxt_copy_rx_ring(bp, rxr, clone);</div><div class='add'>+</div><div class='add'>+	bnapi = rxr-&gt;bnapi;</div><div class='add'>+	cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+</div><div class='add'>+	/* All rings have been reserved and previously allocated.</div><div class='add'>+	 * Reallocating with the same parameters should never fail.</div><div class='add'>+	 */</div><div class='add'>+	rc = bnxt_hwrm_rx_ring_alloc(bp, rxr);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_reset;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;tph_mode) {</div><div class='add'>+		rc = bnxt_hwrm_cp_ring_alloc_p5(bp, rxr-&gt;rx_cpr);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_rx_agg_ring_alloc(bp, rxr);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err_reset;</div><div class='add'>+</div><div class='add'>+	bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rxr-&gt;rx_prod);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='add'>+		bnxt_db_write(bp, &amp;rxr-&gt;rx_agg_db, rxr-&gt;rx_agg_prod);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS) {</div><div class='add'>+		rc = bnxt_tx_queue_start(bp, idx);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnxt_enable_rx_page_pool(rxr);</div><div class='add'>+	napi_enable_locked(&amp;bnapi-&gt;napi);</div><div class='add'>+	bnxt_db_nq_arm(bp, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='add'>+</div><div class='add'>+	mru = bp-&gt;dev-&gt;mtu + VLAN_ETH_HLEN;</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;nr_vnics; i++) {</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[i];</div><div class='add'>+</div><div class='add'>+		rc = bnxt_set_vnic_mru_p5(bp, vnic, mru, idx);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return bnxt_set_rss_ctx_vnic_mru(bp, mru, idx);</div><div class='add'>+</div><div class='add'>+err_reset:</div><div class='add'>+	netdev_err(bp-&gt;dev, "Unexpected HWRM error during queue start rc: %d\n",</div><div class='add'>+		   rc);</div><div class='add'>+	napi_enable_locked(&amp;bnapi-&gt;napi);</div><div class='add'>+	bnxt_db_nq_arm(bp, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='add'>+	bnxt_reset_task(bp, true);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_rx_ring_info *rxr;</div><div class='add'>+	struct bnxt_cp_ring_info *cpr;</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='add'>+	struct bnxt_napi *bnapi;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;nr_vnics; i++) {</div><div class='add'>+		vnic = &amp;bp-&gt;vnic_info[i];</div><div class='add'>+</div><div class='add'>+		bnxt_set_vnic_mru_p5(bp, vnic, 0, idx);</div><div class='add'>+	}</div><div class='add'>+	bnxt_set_rss_ctx_vnic_mru(bp, 0, idx);</div><div class='add'>+	/* Make sure NAPI sees that the VNIC is disabled */</div><div class='add'>+	synchronize_net();</div><div class='add'>+	rxr = &amp;bp-&gt;rx_ring[idx];</div><div class='add'>+	bnapi = rxr-&gt;bnapi;</div><div class='add'>+	cpr = &amp;bnapi-&gt;cp_ring;</div><div class='add'>+	cancel_work_sync(&amp;cpr-&gt;dim.work);</div><div class='add'>+	bnxt_hwrm_rx_ring_free(bp, rxr, false);</div><div class='add'>+	bnxt_hwrm_rx_agg_ring_free(bp, rxr, false);</div><div class='add'>+	page_pool_disable_direct_recycling(rxr-&gt;page_pool);</div><div class='add'>+	if (bnxt_separate_head_pool(rxr))</div><div class='add'>+		page_pool_disable_direct_recycling(rxr-&gt;head_pool);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS)</div><div class='add'>+		bnxt_tx_queue_stop(bp, idx);</div><div class='add'>+</div><div class='add'>+	/* Disable NAPI now after freeing the rings because HWRM_RING_FREE</div><div class='add'>+	 * completion is handled in NAPI to guarantee no more DMA on that ring</div><div class='add'>+	 * after seeing the completion.</div><div class='add'>+	 */</div><div class='add'>+	napi_disable_locked(&amp;bnapi-&gt;napi);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;tph_mode) {</div><div class='add'>+		bnxt_hwrm_cp_ring_free(bp, rxr-&gt;rx_cpr);</div><div class='add'>+		bnxt_clear_one_cp_ring(bp, rxr-&gt;rx_cpr);</div><div class='add'>+	}</div><div class='add'>+	bnxt_db_nq(bp, &amp;cpr-&gt;cp_db, cpr-&gt;cp_raw_cons);</div><div class='add'>+</div><div class='add'>+	memcpy(qmem, rxr, sizeof(*rxr));</div><div class='add'>+	bnxt_init_rx_ring_struct(bp, qmem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct netdev_queue_mgmt_ops bnxt_queue_mgmt_ops = {</div><div class='add'>+	.ndo_queue_mem_size	= sizeof(struct bnxt_rx_ring_info),</div><div class='add'>+	.ndo_queue_mem_alloc	= bnxt_queue_mem_alloc,</div><div class='add'>+	.ndo_queue_mem_free	= bnxt_queue_mem_free,</div><div class='add'>+	.ndo_queue_start	= bnxt_queue_start,</div><div class='add'>+	.ndo_queue_stop		= bnxt_queue_stop,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void bnxt_remove_one(struct pci_dev *pdev)</div><div class='hunk'>@@ -10243,48 +16208,75 @@ static void bnxt_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (BNXT_PF(bp)) {</div><div class='del'>-		bnxt_sriov_disable(bp);</div><div class='del'>-		bnxt_dl_unregister(bp);</div><div class='del'>-	}</div><div class='add'>+	if (BNXT_PF(bp))</div><div class='add'>+		__bnxt_sriov_disable(bp);</div><div class='add'>+</div><div class='add'>+	bnxt_rdma_aux_device_del(bp);</div><div class='ctx'> </div><div class='del'>-	pci_disable_pcie_error_reporting(pdev);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	bnxt_shutdown_tc(bp);</div><div class='del'>-	bnxt_cancel_sp_work(bp);</div><div class='add'>+	bnxt_ptp_clear(bp);</div><div class='add'>+</div><div class='add'>+	bnxt_rdma_aux_device_uninit(bp);</div><div class='add'>+</div><div class='add'>+	bnxt_free_l2_filters(bp, true);</div><div class='add'>+	bnxt_free_ntp_fltrs(bp, true);</div><div class='add'>+	WARN_ON(bp-&gt;num_rss_ctx);</div><div class='add'>+	clear_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+	/* Flush any pending tasks */</div><div class='add'>+	cancel_work_sync(&amp;bp-&gt;sp_task);</div><div class='add'>+	cancel_delayed_work_sync(&amp;bp-&gt;fw_reset_task);</div><div class='ctx'> 	bp-&gt;sp_event = 0;</div><div class='ctx'> </div><div class='add'>+	bnxt_dl_fw_reporters_destroy(bp);</div><div class='add'>+	bnxt_dl_unregister(bp);</div><div class='add'>+	bnxt_shutdown_tc(bp);</div><div class='add'>+</div><div class='ctx'> 	bnxt_clear_int_mode(bp);</div><div class='ctx'> 	bnxt_hwrm_func_drv_unrgtr(bp);</div><div class='ctx'> 	bnxt_free_hwrm_resources(bp);</div><div class='del'>-	bnxt_free_hwrm_short_cmd_req(bp);</div><div class='add'>+	bnxt_hwmon_uninit(bp);</div><div class='ctx'> 	bnxt_ethtool_free(bp);</div><div class='ctx'> 	bnxt_dcb_free(bp);</div><div class='del'>-	kfree(bp-&gt;edev);</div><div class='del'>-	bp-&gt;edev = NULL;</div><div class='del'>-	bnxt_free_ctx_mem(bp);</div><div class='del'>-	kfree(bp-&gt;ctx);</div><div class='del'>-	bp-&gt;ctx = NULL;</div><div class='add'>+	kfree(bp-&gt;ptp_cfg);</div><div class='add'>+	bp-&gt;ptp_cfg = NULL;</div><div class='add'>+	kfree(bp-&gt;fw_health);</div><div class='add'>+	bp-&gt;fw_health = NULL;</div><div class='ctx'> 	bnxt_cleanup_pci(bp);</div><div class='add'>+	bnxt_free_ctx_mem(bp, true);</div><div class='add'>+	bnxt_free_crash_dump_mem(bp);</div><div class='add'>+	kfree(bp-&gt;rss_indir_tbl);</div><div class='add'>+	bp-&gt;rss_indir_tbl = NULL;</div><div class='ctx'> 	bnxt_free_port_stats(bp);</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_probe_phy(struct bnxt *bp)</div><div class='add'>+static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;phy_flags = 0;</div><div class='ctx'> 	rc = bnxt_hwrm_phy_qcaps(bp);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "Probe phy can't get phy capabilities (rc: %x)\n",</div><div class='ctx'> 			   rc);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_init(&amp;bp-&gt;link_lock);</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_NO_FCS)</div><div class='add'>+		bp-&gt;dev-&gt;priv_flags |= IFF_SUPP_NOFCS;</div><div class='add'>+	else</div><div class='add'>+		bp-&gt;dev-&gt;priv_flags &amp;= ~IFF_SUPP_NOFCS;</div><div class='add'>+</div><div class='add'>+	bp-&gt;mac_flags = 0;</div><div class='add'>+	bnxt_hwrm_mac_qcaps(bp);</div><div class='ctx'> </div><div class='add'>+	if (!fw_dflt)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	rc = bnxt_update_link(bp, false);</div><div class='ctx'> 	if (rc) {</div><div class='add'>+		mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "Probe phy can't update link (rc: %x)\n",</div><div class='ctx'> 			   rc);</div><div class='ctx'> 		return rc;</div><div class='hunk'>@@ -10296,27 +16288,9 @@ static int bnxt_probe_phy(struct bnxt *bp)</div><div class='ctx'> 	if (link_info-&gt;auto_link_speeds &amp;&amp; !link_info-&gt;support_auto_speeds)</div><div class='ctx'> 		link_info-&gt;support_auto_speeds = link_info-&gt;support_speeds;</div><div class='ctx'> </div><div class='del'>-	/*initialize the ethool setting copy with NVM settings */</div><div class='del'>-	if (BNXT_AUTO_MODE(link_info-&gt;auto_mode)) {</div><div class='del'>-		link_info-&gt;autoneg = BNXT_AUTONEG_SPEED;</div><div class='del'>-		if (bp-&gt;hwrm_spec_code &gt;= 0x10201) {</div><div class='del'>-			if (link_info-&gt;auto_pause_setting &amp;</div><div class='del'>-			    PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE)</div><div class='del'>-				link_info-&gt;autoneg |= BNXT_AUTONEG_FLOW_CTRL;</div><div class='del'>-		} else {</div><div class='del'>-			link_info-&gt;autoneg |= BNXT_AUTONEG_FLOW_CTRL;</div><div class='del'>-		}</div><div class='del'>-		link_info-&gt;advertising = link_info-&gt;auto_link_speeds;</div><div class='del'>-	} else {</div><div class='del'>-		link_info-&gt;req_link_speed = link_info-&gt;force_link_speed;</div><div class='del'>-		link_info-&gt;req_duplex = link_info-&gt;duplex_setting;</div><div class='del'>-	}</div><div class='del'>-	if (link_info-&gt;autoneg &amp; BNXT_AUTONEG_FLOW_CTRL)</div><div class='del'>-		link_info-&gt;req_flow_ctrl =</div><div class='del'>-			link_info-&gt;auto_pause_setting &amp; BNXT_LINK_PAUSE_BOTH;</div><div class='del'>-	else</div><div class='del'>-		link_info-&gt;req_flow_ctrl = link_info-&gt;force_pause_setting;</div><div class='del'>-	return rc;</div><div class='add'>+	bnxt_init_ethtool_link_settings(bp);</div><div class='add'>+	mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_max_irq(struct pci_dev *pdev)</div><div class='hunk'>@@ -10340,9 +16314,10 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,</div><div class='ctx'> 	*max_rx = hw_resc-&gt;max_rx_rings;</div><div class='ctx'> 	*max_cp = bnxt_get_max_func_cp_rings_for_en(bp);</div><div class='ctx'> 	max_irq = min_t(int, bnxt_get_max_func_irqs(bp) -</div><div class='del'>-			bnxt_get_ulp_msix_num(bp),</div><div class='del'>-			hw_resc-&gt;max_stat_ctxs - bnxt_get_ulp_stat_ctxs(bp));</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='add'>+			bnxt_get_ulp_msix_num_in_use(bp),</div><div class='add'>+			hw_resc-&gt;max_stat_ctxs -</div><div class='add'>+			bnxt_get_ulp_stat_ctxs_in_use(bp));</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='ctx'> 		*max_cp = min_t(int, *max_cp, max_irq);</div><div class='ctx'> 	max_ring_grps = hw_resc-&gt;max_hw_ring_grps;</div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp) &amp;&amp; BNXT_PF(bp)) {</div><div class='hunk'>@@ -10351,8 +16326,14 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS)</div><div class='ctx'> 		*max_rx &gt;&gt;= 1;</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		bnxt_trim_rings(bp, max_rx, max_tx, *max_cp, false);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		int rc;</div><div class='add'>+</div><div class='add'>+		rc = __bnxt_trim_rings(bp, max_rx, max_tx, *max_cp, false);</div><div class='add'>+		if (rc) {</div><div class='add'>+			*max_rx = 0;</div><div class='add'>+			*max_tx = 0;</div><div class='add'>+		}</div><div class='ctx'> 		/* On P5 chips, max_cp output param should be available NQs */</div><div class='ctx'> 		*max_cp = max_irq;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -10425,12 +16406,13 @@ static void bnxt_trim_dflt_sh_rings(struct bnxt *bp)</div><div class='ctx'> 	bp-&gt;cp_nr_rings = min_t(int, bp-&gt;tx_nr_rings_per_tc, bp-&gt;rx_nr_rings);</div><div class='ctx'> 	bp-&gt;rx_nr_rings = bp-&gt;cp_nr_rings;</div><div class='ctx'> 	bp-&gt;tx_nr_rings_per_tc = bp-&gt;cp_nr_rings;</div><div class='del'>-	bp-&gt;tx_nr_rings = bp-&gt;tx_nr_rings_per_tc;</div><div class='add'>+	bp-&gt;tx_nr_rings = bnxt_tx_nr_rings(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)</div><div class='ctx'> {</div><div class='ctx'> 	int dflt_rings, max_rx_rings, max_tx_rings, rc;</div><div class='add'>+	int avail_msix;</div><div class='ctx'> </div><div class='ctx'> 	if (!bnxt_can_reserve_rings(bp))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -10456,26 +16438,38 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)</div><div class='ctx'> 		bnxt_trim_dflt_sh_rings(bp);</div><div class='ctx'> 	else</div><div class='ctx'> 		bp-&gt;cp_nr_rings = bp-&gt;tx_nr_rings_per_tc + bp-&gt;rx_nr_rings;</div><div class='del'>-	bp-&gt;tx_nr_rings = bp-&gt;tx_nr_rings_per_tc;</div><div class='add'>+	bp-&gt;tx_nr_rings = bnxt_tx_nr_rings(bp);</div><div class='add'>+</div><div class='add'>+	avail_msix = bnxt_get_max_func_irqs(bp) - bp-&gt;cp_nr_rings;</div><div class='add'>+	if (avail_msix &gt;= BNXT_MIN_ROCE_CP_RINGS) {</div><div class='add'>+		int ulp_num_msix = min(avail_msix, bp-&gt;ulp_num_msix_want);</div><div class='add'>+</div><div class='add'>+		bnxt_set_ulp_msix_num(bp, ulp_num_msix);</div><div class='add'>+		bnxt_set_dflt_ulp_stat_ctxs(bp);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rc = __bnxt_reserve_rings(bp);</div><div class='del'>-	if (rc)</div><div class='add'>+	if (rc &amp;&amp; rc != -ENODEV)</div><div class='ctx'> 		netdev_warn(bp-&gt;dev, "Unable to reserve tx rings\n");</div><div class='del'>-	bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings;</div><div class='add'>+	bp-&gt;tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);</div><div class='ctx'> 	if (sh)</div><div class='ctx'> 		bnxt_trim_dflt_sh_rings(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* Rings may have been trimmed, re-reserve the trimmed rings. */</div><div class='ctx'> 	if (bnxt_need_reserve_rings(bp)) {</div><div class='ctx'> 		rc = __bnxt_reserve_rings(bp);</div><div class='del'>-		if (rc)</div><div class='add'>+		if (rc &amp;&amp; rc != -ENODEV)</div><div class='ctx'> 			netdev_warn(bp-&gt;dev, "2nd rings reservation failed.\n");</div><div class='del'>-		bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings;</div><div class='add'>+		bp-&gt;tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (BNXT_CHIP_TYPE_NITRO_A0(bp)) {</div><div class='ctx'> 		bp-&gt;rx_nr_rings++;</div><div class='ctx'> 		bp-&gt;cp_nr_rings++;</div><div class='ctx'> 	}</div><div class='add'>+	if (rc) {</div><div class='add'>+		bp-&gt;tx_nr_rings = 0;</div><div class='add'>+		bp-&gt;rx_nr_rings = 0;</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10490,18 +16484,20 @@ static int bnxt_init_dflt_ring_mode(struct bnxt *bp)</div><div class='ctx'> 	bnxt_clear_int_mode(bp);</div><div class='ctx'> 	rc = bnxt_set_dflt_rings(bp, true);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "Not enough rings available.\n");</div><div class='add'>+		if (BNXT_VF(bp) &amp;&amp; rc == -ENODEV)</div><div class='add'>+			netdev_err(bp-&gt;dev, "Cannot configure VF rings while PF is unavailable.\n");</div><div class='add'>+		else</div><div class='add'>+			netdev_err(bp-&gt;dev, "Not enough rings available.\n");</div><div class='ctx'> 		goto init_dflt_ring_err;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = bnxt_init_int_mode(bp);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto init_dflt_ring_err;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings;</div><div class='del'>-	if (bnxt_rfs_supported(bp) &amp;&amp; bnxt_rfs_capable(bp)) {</div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_RFS;</div><div class='del'>-		bp-&gt;dev-&gt;features |= NETIF_F_NTUPLE;</div><div class='del'>-	}</div><div class='add'>+	bp-&gt;tx_nr_rings_per_tc = bnxt_tx_nr_rings_per_tc(bp);</div><div class='add'>+</div><div class='add'>+	bnxt_set_dflt_rfs(bp);</div><div class='add'>+</div><div class='ctx'> init_dflt_ring_err:</div><div class='ctx'> 	bnxt_ulp_irq_restart(bp, rc);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -10511,7 +16507,7 @@ int bnxt_restore_pf_fw_resources(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='add'>+	netdev_ops_assert_locked(bp-&gt;dev);</div><div class='ctx'> 	bnxt_hwrm_func_qcaps(bp);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(bp-&gt;dev))</div><div class='hunk'>@@ -10524,7 +16520,7 @@ int bnxt_restore_pf_fw_resources(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(bp-&gt;dev)) {</div><div class='ctx'> 		if (rc)</div><div class='del'>-			dev_close(bp-&gt;dev);</div><div class='add'>+			netif_close(bp-&gt;dev);</div><div class='ctx'> 		else</div><div class='ctx'> 			rc = bnxt_open_nic(bp, true, false);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -10537,7 +16533,7 @@ static int bnxt_init_mac_addr(struct bnxt *bp)</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_PF(bp)) {</div><div class='del'>-		memcpy(bp-&gt;dev-&gt;dev_addr, bp-&gt;pf.mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, bp-&gt;pf.mac_addr);</div><div class='ctx'> 	} else {</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 		struct bnxt_vf_info *vf = &amp;bp-&gt;vf;</div><div class='hunk'>@@ -10545,7 +16541,7 @@ static int bnxt_init_mac_addr(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 		if (is_valid_ether_addr(vf-&gt;mac_addr)) {</div><div class='ctx'> 			/* overwrite netdev dev_addr with admin VF MAC */</div><div class='del'>-			memcpy(bp-&gt;dev-&gt;dev_addr, vf-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+			eth_hw_addr_set(bp-&gt;dev, vf-&gt;mac_addr);</div><div class='ctx'> 			/* Older PF driver or firmware may not approve this</div><div class='ctx'> 			 * correctly.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -10559,29 +16555,79 @@ static int bnxt_init_mac_addr(struct bnxt *bp)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_vpd_read_info(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	unsigned int vpd_size, kw_len;</div><div class='add'>+	int pos, size;</div><div class='add'>+	u8 *vpd_data;</div><div class='add'>+</div><div class='add'>+	vpd_data = pci_vpd_alloc(pdev, &amp;vpd_size);</div><div class='add'>+	if (IS_ERR(vpd_data)) {</div><div class='add'>+		pci_warn(pdev, "Unable to read VPD\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,</div><div class='add'>+					   PCI_VPD_RO_KEYWORD_PARTNO, &amp;kw_len);</div><div class='add'>+	if (pos &lt; 0)</div><div class='add'>+		goto read_sn;</div><div class='add'>+</div><div class='add'>+	size = min_t(int, kw_len, BNXT_VPD_FLD_LEN - 1);</div><div class='add'>+	memcpy(bp-&gt;board_partno, &amp;vpd_data[pos], size);</div><div class='add'>+</div><div class='add'>+read_sn:</div><div class='add'>+	pos = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,</div><div class='add'>+					   PCI_VPD_RO_KEYWORD_SERIALNO,</div><div class='add'>+					   &amp;kw_len);</div><div class='add'>+	if (pos &lt; 0)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	size = min_t(int, kw_len, BNXT_VPD_FLD_LEN - 1);</div><div class='add'>+	memcpy(bp-&gt;board_serialno, &amp;vpd_data[pos], size);</div><div class='add'>+exit:</div><div class='add'>+	kfree(vpd_data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_pcie_dsn_get(struct bnxt *bp, u8 dsn[])</div><div class='ctx'> {</div><div class='ctx'> 	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='del'>-	int pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_DSN);</div><div class='del'>-	u32 dw;</div><div class='add'>+	u64 qword;</div><div class='ctx'> </div><div class='del'>-	if (!pos) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "Unable do read adapter's DSN");</div><div class='add'>+	qword = pci_get_dsn(pdev);</div><div class='add'>+	if (!qword) {</div><div class='add'>+		netdev_info(bp-&gt;dev, "Unable to read adapter's DSN\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* DSN (two dw) is at an offset of 4 from the cap pos */</div><div class='del'>-	pos += 4;</div><div class='del'>-	pci_read_config_dword(pdev, pos, &amp;dw);</div><div class='del'>-	put_unaligned_le32(dw, &amp;dsn[0]);</div><div class='del'>-	pci_read_config_dword(pdev, pos + 4, &amp;dw);</div><div class='del'>-	put_unaligned_le32(dw, &amp;dsn[4]);</div><div class='add'>+	put_unaligned_le64(qword, dsn);</div><div class='add'>+</div><div class='add'>+	bp-&gt;flags |= BNXT_FLAG_DSN_VALID;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_map_db_bar(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (!bp-&gt;db_size)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	bp-&gt;bar1 = pci_iomap(bp-&gt;pdev, 2, bp-&gt;db_size);</div><div class='add'>+	if (!bp-&gt;bar1)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_print_device_info(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	netdev_info(bp-&gt;dev, "%s found at mem %lx, node addr %pM\n",</div><div class='add'>+		    board_info[bp-&gt;board_idx].name,</div><div class='add'>+		    (long)pci_resource_start(bp-&gt;pdev, 0), bp-&gt;dev-&gt;dev_addr);</div><div class='add'>+</div><div class='add'>+	pcie_print_link_status(bp-&gt;pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	static int version_printed;</div><div class='add'>+	struct bnxt_hw_resc *hw_resc;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct bnxt *bp;</div><div class='ctx'> 	int rc, max_irqs;</div><div class='hunk'>@@ -10589,28 +16635,43 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (pci_is_bridge(pdev))</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	if (version_printed++ == 0)</div><div class='del'>-		pr_info("%s", version);</div><div class='add'>+	if (!pdev-&gt;msix_cap) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "MSIX capability not found, aborting\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Clear any pending DMA transactions from crash kernel</div><div class='add'>+	 * while loading driver in capture kernel.</div><div class='add'>+	 */</div><div class='add'>+	if (is_kdump_kernel()) {</div><div class='add'>+		pci_clear_master(pdev);</div><div class='add'>+		pcie_flr(pdev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	max_irqs = bnxt_get_max_irq(pdev);</div><div class='del'>-	dev = alloc_etherdev_mq(sizeof(*bp), max_irqs);</div><div class='add'>+	dev = alloc_etherdev_mqs(sizeof(*bp), max_irqs * BNXT_MAX_QUEUE,</div><div class='add'>+				 max_irqs);</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	bp = netdev_priv(dev);</div><div class='add'>+	bp-&gt;board_idx = ent-&gt;driver_data;</div><div class='add'>+	bp-&gt;msg_enable = BNXT_DEF_MSG_ENABLE;</div><div class='ctx'> 	bnxt_set_max_func_irqs(bp, max_irqs);</div><div class='ctx'> </div><div class='del'>-	if (bnxt_vf_pciid(ent-&gt;driver_data))</div><div class='add'>+	if (bnxt_vf_pciid(bp-&gt;board_idx))</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_VF;</div><div class='ctx'> </div><div class='del'>-	if (pdev-&gt;msix_cap)</div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_MSIX_CAP;</div><div class='add'>+	/* No devlink port registration in case of a VF */</div><div class='add'>+	if (BNXT_PF(bp))</div><div class='add'>+		SET_NETDEV_DEVLINK_PORT(dev, &amp;bp-&gt;dl_port);</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_init_board(pdev, dev);</div><div class='ctx'> 	if (rc &lt; 0)</div><div class='ctx'> 		goto init_err_free;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;bnxt_netdev_ops;</div><div class='add'>+	dev-&gt;stat_ops = &amp;bnxt_stat_ops;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = BNXT_TX_TIMEOUT;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;bnxt_ethtool_ops;</div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='hunk'>@@ -10620,31 +16681,35 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto init_err_pci_clean;</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = bnxt_hwrm_ver_get(bp);</div><div class='add'>+	mutex_init(&amp;bp-&gt;link_lock);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_fw_init_one_p1(bp);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto init_err_pci_clean;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_KONG_MB_CHNL) {</div><div class='del'>-		rc = bnxt_alloc_kong_hwrm_resources(bp);</div><div class='del'>-		if (rc)</div><div class='del'>-			bp-&gt;fw_cap &amp;= ~BNXT_FW_CAP_KONG_MB_CHNL;</div><div class='del'>-	}</div><div class='add'>+	if (BNXT_PF(bp))</div><div class='add'>+		bnxt_vpd_read_info(bp);</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_SHORT_CMD) ||</div><div class='del'>-	    bp-&gt;hwrm_max_ext_req_len &gt; BNXT_HWRM_MAX_REQ_LEN) {</div><div class='del'>-		rc = bnxt_alloc_hwrm_short_cmd_req(bp);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto init_err_pci_clean;</div><div class='add'>+	if (BNXT_CHIP_P5_PLUS(bp)) {</div><div class='add'>+		bp-&gt;flags |= BNXT_FLAG_CHIP_P5_PLUS;</div><div class='add'>+		if (BNXT_CHIP_P7(bp))</div><div class='add'>+			bp-&gt;flags |= BNXT_FLAG_CHIP_P7;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (BNXT_CHIP_P5(bp))</div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_CHIP_P5;</div><div class='add'>+	rc = bnxt_alloc_rss_indir_tbl(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_err_pci_clean;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_func_reset(bp);</div><div class='add'>+	rc = bnxt_fw_init_one_p2(bp);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto init_err_pci_clean;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_fw_set_time(bp);</div><div class='add'>+	rc = bnxt_map_db_bar(bp);</div><div class='add'>+	if (rc) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Cannot map doorbell BAR rc = %d, aborting\n",</div><div class='add'>+			rc);</div><div class='add'>+		goto init_err_pci_clean;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;hw_features = NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_SG |</div><div class='ctx'> 			   NETIF_F_TSO | NETIF_F_TSO6 |</div><div class='hunk'>@@ -10653,6 +16718,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			   NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_GRE_CSUM |</div><div class='ctx'> 			   NETIF_F_GSO_PARTIAL | NETIF_F_RXHASH |</div><div class='ctx'> 			   NETIF_F_RXCSUM | NETIF_F_GRO;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_UDP_GSO_CAP)</div><div class='add'>+		dev-&gt;hw_features |= NETIF_F_GSO_UDP_L4;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_SUPPORTS_TPA(bp))</div><div class='ctx'> 		dev-&gt;hw_features |= NETIF_F_LRO;</div><div class='hunk'>@@ -10663,11 +16730,20 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			NETIF_F_GSO_UDP_TUNNEL | NETIF_F_GSO_GRE |</div><div class='ctx'> 			NETIF_F_GSO_UDP_TUNNEL_CSUM | NETIF_F_GSO_GRE_CSUM |</div><div class='ctx'> 			NETIF_F_GSO_IPXIP4 | NETIF_F_GSO_PARTIAL;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_UDP_GSO_CAP)</div><div class='add'>+		dev-&gt;hw_enc_features |= NETIF_F_GSO_UDP_L4;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P7)</div><div class='add'>+		dev-&gt;udp_tunnel_nic_info = &amp;bnxt_udp_tunnels_p7;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;udp_tunnel_nic_info = &amp;bnxt_udp_tunnels;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='ctx'> 				    NETIF_F_GSO_GRE_CSUM;</div><div class='ctx'> 	dev-&gt;vlan_features = dev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='del'>-	dev-&gt;hw_features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX |</div><div class='del'>-			    NETIF_F_HW_VLAN_STAG_RX | NETIF_F_HW_VLAN_STAG_TX;</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_VLAN_RX_STRIP)</div><div class='add'>+		dev-&gt;hw_features |= BNXT_HW_FEATURE_VLAN_ALL_RX;</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_VLAN_TX_INSERT)</div><div class='add'>+		dev-&gt;hw_features |= BNXT_HW_FEATURE_VLAN_ALL_TX;</div><div class='ctx'> 	if (BNXT_SUPPORTS_TPA(bp))</div><div class='ctx'> 		dev-&gt;hw_features |= NETIF_F_GRO_HW;</div><div class='ctx'> 	dev-&gt;features |= dev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='hunk'>@@ -10675,49 +16751,26 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev-&gt;features &amp;= ~NETIF_F_LRO;</div><div class='ctx'> 	dev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='ctx'> </div><div class='add'>+	netif_set_tso_max_size(dev, GSO_MAX_SIZE);</div><div class='add'>+	if (bp-&gt;tso_max_segs)</div><div class='add'>+		netif_set_tso_max_segs(dev, bp-&gt;tso_max_segs);</div><div class='add'>+</div><div class='add'>+	dev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |</div><div class='add'>+			    NETDEV_XDP_ACT_RX_SG;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	init_waitqueue_head(&amp;bp-&gt;sriov_cfg_wait);</div><div class='del'>-	mutex_init(&amp;bp-&gt;sriov_lock);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (BNXT_SUPPORTS_TPA(bp)) {</div><div class='ctx'> 		bp-&gt;gro_func = bnxt_gro_func_5730x;</div><div class='ctx'> 		if (BNXT_CHIP_P4(bp))</div><div class='ctx'> 			bp-&gt;gro_func = bnxt_gro_func_5731x;</div><div class='add'>+		else if (BNXT_CHIP_P5_PLUS(bp))</div><div class='add'>+			bp-&gt;gro_func = bnxt_gro_func_5750x;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!BNXT_CHIP_P4_PLUS(bp))</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_DOUBLE_DB;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_func_drv_rgtr(bp);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto init_err_pci_clean;</div><div class='del'>-</div><div class='del'>-	rc = bnxt_hwrm_func_rgtr_async_events(bp, NULL, 0);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto init_err_pci_clean;</div><div class='del'>-</div><div class='del'>-	bp-&gt;ulp_probe = bnxt_ulp_probe;</div><div class='del'>-</div><div class='del'>-	rc = bnxt_hwrm_queue_qportcfg(bp);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm query qportcfg failure rc: %x\n",</div><div class='del'>-			   rc);</div><div class='del'>-		rc = -1;</div><div class='del'>-		goto init_err_pci_clean;</div><div class='del'>-	}</div><div class='del'>-	/* Get the MAX capabilities for this function */</div><div class='del'>-	rc = bnxt_hwrm_func_qcaps(bp);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm query capability failure rc: %x\n",</div><div class='del'>-			   rc);</div><div class='del'>-		rc = -1;</div><div class='del'>-		goto init_err_pci_clean;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = bnxt_hwrm_cfa_adv_flow_mgnt_qcaps(bp);</div><div class='del'>-	if (rc)</div><div class='del'>-		netdev_warn(bp-&gt;dev, "hwrm query adv flow mgnt failure rc: %d\n",</div><div class='del'>-			    rc);</div><div class='del'>-</div><div class='ctx'> 	rc = bnxt_init_mac_addr(bp);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Unable to initialize mac address.\n");</div><div class='hunk'>@@ -10727,54 +16780,45 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_PF(bp)) {</div><div class='ctx'> 		/* Read the adapter's DSN to use as the eswitch switch_id */</div><div class='del'>-		rc = bnxt_pcie_dsn_get(bp, bp-&gt;switch_id);</div><div class='del'>-		if (rc)</div><div class='del'>-			goto init_err_pci_clean;</div><div class='add'>+		rc = bnxt_pcie_dsn_get(bp, bp-&gt;dsn);</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_hwrm_func_qcfg(bp);</div><div class='del'>-	bnxt_hwrm_vnic_qcaps(bp);</div><div class='del'>-	bnxt_hwrm_port_led_qcaps(bp);</div><div class='del'>-	bnxt_ethtool_init(bp);</div><div class='del'>-	bnxt_dcb_init(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* MTU range: 60 - FW defined max */</div><div class='ctx'> 	dev-&gt;min_mtu = ETH_ZLEN;</div><div class='ctx'> 	dev-&gt;max_mtu = bp-&gt;max_mtu;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_probe_phy(bp);</div><div class='add'>+	rc = bnxt_probe_phy(bp, true);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto init_err_pci_clean;</div><div class='ctx'> </div><div class='del'>-	bnxt_set_rx_skb_mode(bp, false);</div><div class='add'>+	hw_resc = &amp;bp-&gt;hw_resc;</div><div class='add'>+	bp-&gt;max_fltr = hw_resc-&gt;max_rx_em_flows + hw_resc-&gt;max_rx_wm_flows +</div><div class='add'>+		       BNXT_L2_FLTR_MAX_FLTR;</div><div class='add'>+	/* Older firmware may not report these filters properly */</div><div class='add'>+	if (bp-&gt;max_fltr &lt; BNXT_MAX_FLTR)</div><div class='add'>+		bp-&gt;max_fltr = BNXT_MAX_FLTR;</div><div class='add'>+	bnxt_init_l2_fltr_tbl(bp);</div><div class='add'>+	__bnxt_set_rx_skb_mode(bp, false);</div><div class='ctx'> 	bnxt_set_tpa_flags(bp);</div><div class='add'>+	bnxt_init_ring_params(bp);</div><div class='ctx'> 	bnxt_set_ring_params(bp);</div><div class='add'>+	bnxt_rdma_aux_device_init(bp);</div><div class='ctx'> 	rc = bnxt_set_dflt_rings(bp, true);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "Not enough rings available.\n");</div><div class='del'>-		rc = -ENOMEM;</div><div class='add'>+		if (BNXT_VF(bp) &amp;&amp; rc == -ENODEV) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Cannot configure VF rings while PF is unavailable.\n");</div><div class='add'>+		} else {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Not enough rings available.\n");</div><div class='add'>+			rc = -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> 		goto init_err_pci_clean;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Default RSS hash cfg. */</div><div class='del'>-	bp-&gt;rss_hash_cfg = VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 |</div><div class='del'>-			   VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 |</div><div class='del'>-			   VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |</div><div class='del'>-			   VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;</div><div class='del'>-	if (BNXT_CHIP_P4(bp) &amp;&amp; bp-&gt;hwrm_spec_code &gt;= 0x10501) {</div><div class='del'>-		bp-&gt;flags |= BNXT_FLAG_UDP_RSS_CAP;</div><div class='del'>-		bp-&gt;rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 |</div><div class='del'>-				    VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;</div><div class='del'>-	}</div><div class='add'>+	bnxt_fw_init_one_p3(bp);</div><div class='ctx'> </div><div class='del'>-	if (bnxt_rfs_supported(bp)) {</div><div class='del'>-		dev-&gt;hw_features |= NETIF_F_NTUPLE;</div><div class='del'>-		if (bnxt_rfs_capable(bp)) {</div><div class='del'>-			bp-&gt;flags |= BNXT_FLAG_RFS;</div><div class='del'>-			dev-&gt;features |= NETIF_F_NTUPLE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	bnxt_init_dflt_coal(bp);</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;hw_features &amp; NETIF_F_HW_VLAN_CTAG_RX)</div><div class='add'>+	if (dev-&gt;hw_features &amp; BNXT_HW_FEATURE_VLAN_ALL_RX)</div><div class='ctx'> 		bp-&gt;flags |= BNXT_FLAG_STRIP_VLAN;</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_init_int_mode(bp);</div><div class='hunk'>@@ -10786,53 +16830,71 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 */</div><div class='ctx'> 	bp-&gt;tx_nr_rings_per_tc = bp-&gt;tx_nr_rings;</div><div class='ctx'> </div><div class='del'>-	bnxt_get_wol_settings(bp);</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_WOL_CAP)</div><div class='del'>-		device_set_wakeup_enable(&amp;pdev-&gt;dev, bp-&gt;wol);</div><div class='del'>-	else</div><div class='del'>-		device_set_wakeup_capable(&amp;pdev-&gt;dev, false);</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_set_cache_line_size(bp, cache_line_size());</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_coal_params_qcaps(bp);</div><div class='del'>-</div><div class='ctx'> 	if (BNXT_PF(bp)) {</div><div class='ctx'> 		if (!bnxt_pf_wq) {</div><div class='ctx'> 			bnxt_pf_wq =</div><div class='ctx'> 				create_singlethread_workqueue("bnxt_pf_wq");</div><div class='ctx'> 			if (!bnxt_pf_wq) {</div><div class='ctx'> 				dev_err(&amp;pdev-&gt;dev, "Unable to create workqueue.\n");</div><div class='add'>+				rc = -ENOMEM;</div><div class='ctx'> 				goto init_err_pci_clean;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		bnxt_init_tc(bp);</div><div class='add'>+		rc = bnxt_init_tc(bp);</div><div class='add'>+		if (rc)</div><div class='add'>+			netdev_err(dev, "Failed to initialize TC flower offload, err = %d.\n",</div><div class='add'>+				   rc);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bnxt_inv_fw_health_reg(bp);</div><div class='add'>+	rc = bnxt_dl_register(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto init_err_dl;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;bp-&gt;usr_fltr_list);</div><div class='add'>+</div><div class='add'>+	if (BNXT_SUPPORTS_NTUPLE_VNIC(bp))</div><div class='add'>+		bp-&gt;rss_cap |= BNXT_RSS_CAP_MULTI_RSS_CTX;</div><div class='add'>+	if (BNXT_SUPPORTS_QUEUE_API(bp))</div><div class='add'>+		dev-&gt;queue_mgmt_ops = &amp;bnxt_queue_mgmt_ops;</div><div class='add'>+	dev-&gt;request_ops_lock = true;</div><div class='add'>+	dev-&gt;netmem_tx = true;</div><div class='add'>+</div><div class='ctx'> 	rc = register_netdev(dev);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		goto init_err_cleanup_tc;</div><div class='add'>+		goto init_err_cleanup;</div><div class='ctx'> </div><div class='del'>-	if (BNXT_PF(bp))</div><div class='del'>-		bnxt_dl_register(bp);</div><div class='add'>+	bnxt_dl_fw_reporters_create(bp);</div><div class='ctx'> </div><div class='del'>-	netdev_info(dev, "%s found at mem %lx, node addr %pM\n",</div><div class='del'>-		    board_info[ent-&gt;driver_data].name,</div><div class='del'>-		    (long)pci_resource_start(pdev, 0), dev-&gt;dev_addr);</div><div class='del'>-	pcie_print_link_status(pdev);</div><div class='add'>+	bnxt_rdma_aux_device_add(bp);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	bnxt_print_device_info(bp);</div><div class='add'>+</div><div class='add'>+	pci_save_state(pdev);</div><div class='ctx'> </div><div class='del'>-init_err_cleanup_tc:</div><div class='add'>+	return 0;</div><div class='add'>+init_err_cleanup:</div><div class='add'>+	bnxt_rdma_aux_device_uninit(bp);</div><div class='add'>+	bnxt_dl_unregister(bp);</div><div class='add'>+init_err_dl:</div><div class='ctx'> 	bnxt_shutdown_tc(bp);</div><div class='ctx'> 	bnxt_clear_int_mode(bp);</div><div class='ctx'> </div><div class='ctx'> init_err_pci_clean:</div><div class='del'>-	bnxt_free_hwrm_short_cmd_req(bp);</div><div class='add'>+	bnxt_hwrm_func_drv_unrgtr(bp);</div><div class='ctx'> 	bnxt_free_hwrm_resources(bp);</div><div class='del'>-	bnxt_free_ctx_mem(bp);</div><div class='del'>-	kfree(bp-&gt;ctx);</div><div class='del'>-	bp-&gt;ctx = NULL;</div><div class='add'>+	bnxt_hwmon_uninit(bp);</div><div class='add'>+	bnxt_ethtool_free(bp);</div><div class='add'>+	bnxt_ptp_clear(bp);</div><div class='add'>+	kfree(bp-&gt;ptp_cfg);</div><div class='add'>+	bp-&gt;ptp_cfg = NULL;</div><div class='add'>+	kfree(bp-&gt;fw_health);</div><div class='add'>+	bp-&gt;fw_health = NULL;</div><div class='ctx'> 	bnxt_cleanup_pci(bp);</div><div class='add'>+	bnxt_free_ctx_mem(bp, true);</div><div class='add'>+	bnxt_free_crash_dump_mem(bp);</div><div class='add'>+	kfree(bp-&gt;rss_indir_tbl);</div><div class='add'>+	bp-&gt;rss_indir_tbl = NULL;</div><div class='ctx'> </div><div class='ctx'> init_err_free:</div><div class='ctx'> 	free_netdev(dev);</div><div class='hunk'>@@ -10848,52 +16910,69 @@ static void bnxt_shutdown(struct pci_dev *pdev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	bp = netdev_priv(dev);</div><div class='ctx'> 	if (!bp)</div><div class='ctx'> 		goto shutdown_exit;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='del'>-		dev_close(dev);</div><div class='add'>+		netif_close(dev);</div><div class='ctx'> </div><div class='del'>-	bnxt_ulp_shutdown(bp);</div><div class='add'>+	if (bnxt_hwrm_func_drv_unrgtr(bp)) {</div><div class='add'>+		pcie_flr(pdev);</div><div class='add'>+		goto shutdown_exit;</div><div class='add'>+	}</div><div class='add'>+	bnxt_ptp_clear(bp);</div><div class='add'>+	bnxt_clear_int_mode(bp);</div><div class='add'>+	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (system_state == SYSTEM_POWER_OFF) {</div><div class='del'>-		bnxt_clear_int_mode(bp);</div><div class='ctx'> 		pci_wake_from_d3(pdev, bp-&gt;wol);</div><div class='ctx'> 		pci_set_power_state(pdev, PCI_D3hot);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> shutdown_exit:</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int bnxt_suspend(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	bnxt_ulp_stop(bp);</div><div class='add'>+</div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='ctx'> 		rc = bnxt_close(dev);</div><div class='ctx'> 	}</div><div class='ctx'> 	bnxt_hwrm_func_drv_unrgtr(bp);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	bnxt_ptp_clear(bp);</div><div class='add'>+	pci_disable_device(bp-&gt;pdev);</div><div class='add'>+	bnxt_free_ctx_mem(bp, false);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_resume(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='del'>-	if (bnxt_hwrm_ver_get(bp) || bnxt_hwrm_func_drv_rgtr(bp)) {</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	rc = pci_enable_device(bp-&gt;pdev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(dev, "Cannot re-enable PCI device during resume, err = %d\n",</div><div class='add'>+			   rc);</div><div class='add'>+		goto resume_exit;</div><div class='add'>+	}</div><div class='add'>+	pci_set_master(bp-&gt;pdev);</div><div class='add'>+	if (bnxt_hwrm_ver_get(bp)) {</div><div class='ctx'> 		rc = -ENODEV;</div><div class='ctx'> 		goto resume_exit;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -10902,6 +16981,24 @@ static int bnxt_resume(struct device *device)</div><div class='ctx'> 		rc = -EBUSY;</div><div class='ctx'> 		goto resume_exit;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_qcaps(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto resume_exit;</div><div class='add'>+</div><div class='add'>+	bnxt_clear_reservations(bp, true);</div><div class='add'>+</div><div class='add'>+	if (bnxt_hwrm_func_drv_rgtr(bp, NULL, 0, false)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto resume_exit;</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;fw_crash_mem)</div><div class='add'>+		bnxt_hwrm_crash_dump_mem_cfg(bp);</div><div class='add'>+</div><div class='add'>+	if (bnxt_ptp_init(bp)) {</div><div class='add'>+		kfree(bp-&gt;ptp_cfg);</div><div class='add'>+		bp-&gt;ptp_cfg = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	bnxt_get_wol_settings(bp);</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='ctx'> 		rc = bnxt_open(dev);</div><div class='hunk'>@@ -10910,7 +17007,10 @@ static int bnxt_resume(struct device *device)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> resume_exit:</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	netdev_unlock(bp-&gt;dev);</div><div class='add'>+	bnxt_ulp_start(bp, rc);</div><div class='add'>+	if (!rc)</div><div class='add'>+		bnxt_reenable_sriov(bp);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10936,26 +17036,43 @@ static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(netdev);</div><div class='add'>+	bool abort = false;</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(netdev, "PCI I/O error detected\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	bnxt_ulp_stop(bp);</div><div class='add'>+</div><div class='add'>+	netdev_lock(netdev);</div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='ctx'> </div><div class='del'>-	bnxt_ulp_stop(bp);</div><div class='add'>+	if (test_and_set_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "Firmware reset already in progress\n");</div><div class='add'>+		abort = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (state == pci_channel_io_perm_failure) {</div><div class='del'>-		rtnl_unlock();</div><div class='add'>+	if (abort || state == pci_channel_io_perm_failure) {</div><div class='add'>+		netdev_unlock(netdev);</div><div class='ctx'> 		return PCI_ERS_RESULT_DISCONNECT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Link is not reliable anymore if state is pci_channel_io_frozen</div><div class='add'>+	 * so we disable bus master to prevent any potential bad DMAs before</div><div class='add'>+	 * freeing kernel memory.</div><div class='add'>+	 */</div><div class='add'>+	if (state == pci_channel_io_frozen) {</div><div class='add'>+		set_bit(BNXT_STATE_PCI_CHANNEL_IO_FROZEN, &amp;bp-&gt;state);</div><div class='add'>+		bnxt_fw_fatal_close(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='del'>-		bnxt_close(netdev);</div><div class='add'>+		__bnxt_close_nic(bp, true, true);</div><div class='ctx'> </div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	if (pci_is_enabled(pdev))</div><div class='add'>+		pci_disable_device(pdev);</div><div class='add'>+	bnxt_free_ctx_mem(bp, false);</div><div class='add'>+	netdev_unlock(netdev);</div><div class='ctx'> </div><div class='del'>-	/* Request a slot slot reset. */</div><div class='add'>+	/* Request a slot reset. */</div><div class='ctx'> 	return PCI_ERS_RESULT_NEED_RESET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10964,43 +17081,82 @@ static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'>  * @pdev: Pointer to PCI device</div><div class='ctx'>  *</div><div class='ctx'>  * Restart the card from scratch, as if from a cold-boot.</div><div class='del'>- * At this point, the card has exprienced a hard reset,</div><div class='add'>+ * At this point, the card has experienced a hard reset,</div><div class='ctx'>  * followed by fixups by BIOS, and has its config space</div><div class='ctx'>  * set up identically to what it was at cold boot.</div><div class='ctx'>  */</div><div class='ctx'> static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='add'>+	pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(netdev);</div><div class='add'>+	int retry = 0;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	pci_ers_result_t result = PCI_ERS_RESULT_DISCONNECT;</div><div class='add'>+	int off;</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(bp-&gt;dev, "PCI Slot Reset\n");</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='add'>+	    test_bit(BNXT_STATE_PCI_CHANNEL_IO_FROZEN, &amp;bp-&gt;state))</div><div class='add'>+		msleep(900);</div><div class='add'>+</div><div class='add'>+	netdev_lock(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(pdev)) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Cannot re-enable PCI device after reset.\n");</div><div class='ctx'> 	} else {</div><div class='ctx'> 		pci_set_master(pdev);</div><div class='add'>+		/* Upon fatal error, our device internal logic that latches to</div><div class='add'>+		 * BAR value is getting reset and will restore only upon</div><div class='add'>+		 * rewriting the BARs.</div><div class='add'>+		 *</div><div class='add'>+		 * As pci_restore_state() does not re-write the BARs if the</div><div class='add'>+		 * value is same as saved value earlier, driver needs to</div><div class='add'>+		 * write the BARs to 0 to force restore, in case of fatal error.</div><div class='add'>+		 */</div><div class='add'>+		if (test_and_clear_bit(BNXT_STATE_PCI_CHANNEL_IO_FROZEN,</div><div class='add'>+				       &amp;bp-&gt;state)) {</div><div class='add'>+			for (off = PCI_BASE_ADDRESS_0;</div><div class='add'>+			     off &lt;= PCI_BASE_ADDRESS_5; off += 4)</div><div class='add'>+				pci_write_config_dword(bp-&gt;pdev, off, 0);</div><div class='add'>+		}</div><div class='add'>+		pci_restore_state(pdev);</div><div class='add'>+		pci_save_state(pdev);</div><div class='ctx'> </div><div class='del'>-		err = bnxt_hwrm_func_reset(bp);</div><div class='del'>-		if (!err &amp;&amp; netif_running(netdev))</div><div class='del'>-			err = bnxt_open(netdev);</div><div class='add'>+		bnxt_inv_fw_health_reg(bp);</div><div class='add'>+		bnxt_try_map_fw_health_reg(bp);</div><div class='ctx'> </div><div class='del'>-		if (!err) {</div><div class='del'>-			result = PCI_ERS_RESULT_RECOVERED;</div><div class='del'>-			bnxt_ulp_start(bp);</div><div class='add'>+		/* In some PCIe AER scenarios, firmware may take up to</div><div class='add'>+		 * 10 seconds to become ready in the worst case.</div><div class='add'>+		 */</div><div class='add'>+		do {</div><div class='add'>+			err = bnxt_try_recover_fw(bp);</div><div class='add'>+			if (!err)</div><div class='add'>+				break;</div><div class='add'>+			retry++;</div><div class='add'>+		} while (retry &lt; BNXT_FW_SLOT_RESET_RETRY);</div><div class='add'>+</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Firmware not ready\n");</div><div class='add'>+			goto reset_exit;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (result != PCI_ERS_RESULT_RECOVERED &amp;&amp; netif_running(netdev))</div><div class='del'>-		dev_close(netdev);</div><div class='add'>+		err = bnxt_hwrm_func_reset(bp);</div><div class='add'>+		if (!err)</div><div class='add'>+			result = PCI_ERS_RESULT_RECOVERED;</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+		/* IRQ will be initialized later in bnxt_io_resume */</div><div class='add'>+		bnxt_ulp_irq_stop(bp);</div><div class='add'>+		bnxt_clear_int_mode(bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+reset_exit:</div><div class='add'>+	clear_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state);</div><div class='add'>+	bnxt_clear_reservations(bp, true);</div><div class='add'>+	netdev_unlock(netdev);</div><div class='ctx'> </div><div class='del'>-	return PCI_ERS_RESULT_RECOVERED;</div><div class='add'>+	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -11013,12 +17169,30 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> static void bnxt_io_resume(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = pci_get_drvdata(pdev);</div><div class='add'>+	struct bnxt *bp = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	rtnl_lock();</div><div class='add'>+	netdev_info(bp-&gt;dev, "PCI Slot Resume\n");</div><div class='add'>+	netdev_lock(netdev);</div><div class='add'>+</div><div class='add'>+	err = bnxt_hwrm_func_qcaps(bp);</div><div class='add'>+	if (!err) {</div><div class='add'>+		if (netif_running(netdev)) {</div><div class='add'>+			err = bnxt_open(netdev);</div><div class='add'>+		} else {</div><div class='add'>+			err = bnxt_reserve_rings(bp, true);</div><div class='add'>+			if (!err)</div><div class='add'>+				err = bnxt_init_int_mode(bp);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	netif_device_attach(netdev);</div><div class='add'>+	if (!err)</div><div class='add'>+		netif_device_attach(netdev);</div><div class='ctx'> </div><div class='del'>-	rtnl_unlock();</div><div class='add'>+	netdev_unlock(netdev);</div><div class='add'>+	bnxt_ulp_start(bp, err);</div><div class='add'>+	if (!err)</div><div class='add'>+		bnxt_reenable_sriov(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_error_handlers bnxt_err_handler = {</div><div class='hunk'>@@ -11042,8 +17216,16 @@ static struct pci_driver bnxt_pci_driver = {</div><div class='ctx'> </div><div class='ctx'> static int __init bnxt_init(void)</div><div class='ctx'> {</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='ctx'> 	bnxt_debug_init();</div><div class='del'>-	return pci_register_driver(&amp;bnxt_pci_driver);</div><div class='add'>+	err = pci_register_driver(&amp;bnxt_pci_driver);</div><div class='add'>+	if (err) {</div><div class='add'>+		bnxt_debug_exit();</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __exit bnxt_exit(void)</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h<br/>index be438d82f939..f5f07a7e6b29 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt.h</a></div><div class='hunk'>@@ -12,19 +12,34 @@</div><div class='ctx'> #define BNXT_H</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"bnxt_en"</div><div class='del'>-#define DRV_MODULE_VERSION	"1.10.0"</div><div class='ctx'> </div><div class='add'>+/* DO NOT CHANGE DRV_VER_* defines</div><div class='add'>+ * FIXME: Delete them</div><div class='add'>+ */</div><div class='ctx'> #define DRV_VER_MAJ	1</div><div class='ctx'> #define DRV_VER_MIN	10</div><div class='del'>-#define DRV_VER_UPD	0</div><div class='add'>+#define DRV_VER_UPD	3</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/rhashtable.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='ctx'> #include &lt;net/devlink.h&gt;</div><div class='ctx'> #include &lt;net/dst_metadata.h&gt;</div><div class='ctx'> #include &lt;net/xdp.h&gt;</div><div class='del'>-#include &lt;linux/net_dim.h&gt;</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='add'>+#include &lt;linux/io-64-nonatomic-lo-hi.h&gt;</div><div class='add'>+#ifdef CONFIG_TEE_BNXT_FW</div><div class='add'>+#include &lt;linux/firmware/broadcom/tee_bnxt_fw.h&gt;</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define BNXT_DEFAULT_RX_COPYBREAK 256</div><div class='add'>+#define BNXT_MAX_RX_COPYBREAK 1024</div><div class='add'>+</div><div class='add'>+extern struct list_head bnxt_block_cb_list;</div><div class='add'>+</div><div class='add'>+struct page_pool;</div><div class='ctx'> </div><div class='ctx'> struct tx_bd {</div><div class='ctx'> 	__le32 tx_bd_len_flags_type;</div><div class='hunk'>@@ -49,6 +64,30 @@ struct tx_bd {</div><div class='ctx'> 	__le64 tx_bd_haddr;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='add'>+#define TX_OPAQUE_IDX_MASK	0x0000ffff</div><div class='add'>+#define TX_OPAQUE_BDS_MASK	0x00ff0000</div><div class='add'>+#define TX_OPAQUE_BDS_SHIFT	16</div><div class='add'>+#define TX_OPAQUE_RING_MASK	0xff000000</div><div class='add'>+#define TX_OPAQUE_RING_SHIFT	24</div><div class='add'>+</div><div class='add'>+#define SET_TX_OPAQUE(bp, txr, idx, bds)				\</div><div class='add'>+	(((txr)-&gt;tx_napi_idx &lt;&lt; TX_OPAQUE_RING_SHIFT) |			\</div><div class='add'>+	 ((bds) &lt;&lt; TX_OPAQUE_BDS_SHIFT) | ((idx) &amp; (bp)-&gt;tx_ring_mask))</div><div class='add'>+</div><div class='add'>+#define TX_OPAQUE_IDX(opq)	((opq) &amp; TX_OPAQUE_IDX_MASK)</div><div class='add'>+#define TX_OPAQUE_RING(opq)	(((opq) &amp; TX_OPAQUE_RING_MASK) &gt;&gt;	\</div><div class='add'>+				 TX_OPAQUE_RING_SHIFT)</div><div class='add'>+#define TX_OPAQUE_BDS(opq)	(((opq) &amp; TX_OPAQUE_BDS_MASK) &gt;&gt;	\</div><div class='add'>+				 TX_OPAQUE_BDS_SHIFT)</div><div class='add'>+#define TX_OPAQUE_PROD(bp, opq)	((TX_OPAQUE_IDX(opq) + TX_OPAQUE_BDS(opq)) &amp;\</div><div class='add'>+				 (bp)-&gt;tx_ring_mask)</div><div class='add'>+</div><div class='add'>+#define TX_BD_CNT(n)	(((n) &lt;&lt; TX_BD_FLAGS_BD_CNT_SHIFT) &amp; TX_BD_FLAGS_BD_CNT)</div><div class='add'>+</div><div class='add'>+#define TX_MAX_BD_CNT	32</div><div class='add'>+</div><div class='add'>+#define TX_MAX_FRAGS		(TX_MAX_BD_CNT - 2)</div><div class='add'>+</div><div class='ctx'> struct tx_bd_ext {</div><div class='ctx'> 	__le32 tx_bd_hsize_lflags;</div><div class='ctx'> 	#define TX_BD_FLAGS_TCP_UDP_CHKSUM			(1 &lt;&lt; 0)</div><div class='hunk'>@@ -79,6 +118,8 @@ struct tx_bd_ext {</div><div class='ctx'> 	#define TX_BD_CFA_META_KEY_VLAN                         (1 &lt;&lt; 28)</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_TX_PTP_IS_SET(lflags) ((lflags) &amp; cpu_to_le32(TX_BD_FLAGS_STAMP))</div><div class='add'>+</div><div class='ctx'> struct rx_bd {</div><div class='ctx'> 	__le32 rx_bd_len_flags_type;</div><div class='ctx'> 	#define RX_BD_TYPE					(0x3f &lt;&lt; 0)</div><div class='hunk'>@@ -90,6 +131,7 @@ struct rx_bd {</div><div class='ctx'> 	 #define RX_BD_TYPE_48B_BD_SIZE				 (2 &lt;&lt; 4)</div><div class='ctx'> 	 #define RX_BD_TYPE_64B_BD_SIZE				 (3 &lt;&lt; 4)</div><div class='ctx'> 	#define RX_BD_FLAGS_SOP					(1 &lt;&lt; 6)</div><div class='add'>+	#define RX_BD_FLAGS_AGG_EOP				(1 &lt;&lt; 6)</div><div class='ctx'> 	#define RX_BD_FLAGS_EOP					(1 &lt;&lt; 7)</div><div class='ctx'> 	#define RX_BD_FLAGS_BUFFERS				(3 &lt;&lt; 8)</div><div class='ctx'> 	 #define RX_BD_FLAGS_1_BUFFER_PACKET			 (0 &lt;&lt; 8)</div><div class='hunk'>@@ -107,10 +149,15 @@ struct tx_cmp {</div><div class='ctx'> 	__le32 tx_cmp_flags_type;</div><div class='ctx'> 	#define CMP_TYPE					(0x3f &lt;&lt; 0)</div><div class='ctx'> 	 #define CMP_TYPE_TX_L2_CMP				 0</div><div class='add'>+	 #define CMP_TYPE_TX_L2_COAL_CMP			 2</div><div class='add'>+	 #define CMP_TYPE_TX_L2_PKT_TS_CMP			 4</div><div class='ctx'> 	 #define CMP_TYPE_RX_L2_CMP				 17</div><div class='ctx'> 	 #define CMP_TYPE_RX_AGG_CMP				 18</div><div class='ctx'> 	 #define CMP_TYPE_RX_L2_TPA_START_CMP			 19</div><div class='ctx'> 	 #define CMP_TYPE_RX_L2_TPA_END_CMP			 21</div><div class='add'>+	 #define CMP_TYPE_RX_TPA_AGG_CMP			 22</div><div class='add'>+	 #define CMP_TYPE_RX_L2_V3_CMP				 23</div><div class='add'>+	 #define CMP_TYPE_RX_L2_TPA_START_V3_CMP		 25</div><div class='ctx'> 	 #define CMP_TYPE_STATUS_CMP				 32</div><div class='ctx'> 	 #define CMP_TYPE_REMOTE_DRIVER_REQ			 34</div><div class='ctx'> 	 #define CMP_TYPE_REMOTE_DRIVER_RESP			 36</div><div class='hunk'>@@ -137,17 +184,48 @@ struct tx_cmp {</div><div class='ctx'> 	 #define TX_CMP_ERRORS_DMA_ERROR			 (1 &lt;&lt; 6)</div><div class='ctx'> 	 #define TX_CMP_ERRORS_HINT_TOO_SHORT			 (1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='del'>-	__le32 tx_cmp_unsed_3;</div><div class='add'>+	__le32 sq_cons_idx;</div><div class='add'>+	#define TX_CMP_SQ_CONS_IDX_MASK				0x00ffffff</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TX_CMP_SQ_CONS_IDX(txcmp)					\</div><div class='add'>+	(le32_to_cpu((txcmp)-&gt;sq_cons_idx) &amp; TX_CMP_SQ_CONS_IDX_MASK)</div><div class='add'>+</div><div class='add'>+struct tx_ts_cmp {</div><div class='add'>+	__le32 tx_ts_cmp_flags_type;</div><div class='add'>+	#define TX_TS_CMP_FLAGS_ERROR				(1 &lt;&lt; 6)</div><div class='add'>+	#define TX_TS_CMP_FLAGS_TS_TYPE				(1 &lt;&lt; 7)</div><div class='add'>+	 #define TX_TS_CMP_FLAGS_TS_TYPE_PM			 (0 &lt;&lt; 7)</div><div class='add'>+	 #define TX_TS_CMP_FLAGS_TS_TYPE_PA			 (1 &lt;&lt; 7)</div><div class='add'>+	#define TX_TS_CMP_FLAGS_TS_FALLBACK			(1 &lt;&lt; 8)</div><div class='add'>+	#define TX_TS_CMP_TS_SUB_NS				(0xf &lt;&lt; 12)</div><div class='add'>+	#define TX_TS_CMP_TS_NS_MID				(0xffff &lt;&lt; 16)</div><div class='add'>+	#define TX_TS_CMP_TS_NS_MID_SFT				16</div><div class='add'>+	u32 tx_ts_cmp_opaque;</div><div class='add'>+	__le32 tx_ts_cmp_errors_v;</div><div class='add'>+	#define TX_TS_CMP_V					(1 &lt;&lt; 0)</div><div class='add'>+	#define TX_TS_CMP_TS_INVALID_ERR			(1 &lt;&lt; 10)</div><div class='add'>+	__le32 tx_ts_cmp_ts_ns_lo;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_GET_TX_TS_48B_NS(tscmp)					\</div><div class='add'>+	(le32_to_cpu((tscmp)-&gt;tx_ts_cmp_ts_ns_lo) |			\</div><div class='add'>+	 ((u64)(le32_to_cpu((tscmp)-&gt;tx_ts_cmp_flags_type) &amp;		\</div><div class='add'>+	  TX_TS_CMP_TS_NS_MID) &lt;&lt; TX_TS_CMP_TS_NS_MID_SFT))</div><div class='add'>+</div><div class='add'>+#define BNXT_TX_TS_ERR(tscmp)						\</div><div class='add'>+	(((tscmp)-&gt;tx_ts_cmp_flags_type &amp; cpu_to_le32(TX_TS_CMP_FLAGS_ERROR)) &amp;&amp;\</div><div class='add'>+	 ((tscmp)-&gt;tx_ts_cmp_errors_v &amp; cpu_to_le32(TX_TS_CMP_TS_INVALID_ERR)))</div><div class='add'>+</div><div class='ctx'> struct rx_cmp {</div><div class='ctx'> 	__le32 rx_cmp_len_flags_type;</div><div class='ctx'> 	#define RX_CMP_CMP_TYPE					(0x3f &lt;&lt; 0)</div><div class='ctx'> 	#define RX_CMP_FLAGS_ERROR				(1 &lt;&lt; 6)</div><div class='ctx'> 	#define RX_CMP_FLAGS_PLACEMENT				(7 &lt;&lt; 7)</div><div class='ctx'> 	#define RX_CMP_FLAGS_RSS_VALID				(1 &lt;&lt; 10)</div><div class='del'>-	#define RX_CMP_FLAGS_UNUSED				(1 &lt;&lt; 11)</div><div class='add'>+	#define RX_CMP_FLAGS_PKT_METADATA_PRESENT		(1 &lt;&lt; 11)</div><div class='ctx'> 	 #define RX_CMP_FLAGS_ITYPES_SHIFT			 12</div><div class='add'>+	 #define RX_CMP_FLAGS_ITYPES_MASK			 0xf000</div><div class='ctx'> 	 #define RX_CMP_FLAGS_ITYPE_UNKNOWN			 (0 &lt;&lt; 12)</div><div class='ctx'> 	 #define RX_CMP_FLAGS_ITYPE_IP				 (1 &lt;&lt; 12)</div><div class='ctx'> 	 #define RX_CMP_FLAGS_ITYPE_TCP				 (2 &lt;&lt; 12)</div><div class='hunk'>@@ -166,12 +244,30 @@ struct rx_cmp {</div><div class='ctx'> 	 #define RX_CMP_AGG_BUFS_SHIFT				 1</div><div class='ctx'> 	#define RX_CMP_RSS_HASH_TYPE				(0x7f &lt;&lt; 9)</div><div class='ctx'> 	 #define RX_CMP_RSS_HASH_TYPE_SHIFT			 9</div><div class='add'>+	#define RX_CMP_V3_RSS_EXT_OP_LEGACY			(0xf &lt;&lt; 12)</div><div class='add'>+	 #define RX_CMP_V3_RSS_EXT_OP_LEGACY_SHIFT		 12</div><div class='add'>+	#define RX_CMP_V3_RSS_EXT_OP_NEW			(0xf &lt;&lt; 8)</div><div class='add'>+	 #define RX_CMP_V3_RSS_EXT_OP_NEW_SHIFT			 8</div><div class='ctx'> 	#define RX_CMP_PAYLOAD_OFFSET				(0xff &lt;&lt; 16)</div><div class='ctx'> 	 #define RX_CMP_PAYLOAD_OFFSET_SHIFT			 16</div><div class='add'>+	#define RX_CMP_SUB_NS_TS				(0xf &lt;&lt; 16)</div><div class='add'>+	 #define RX_CMP_SUB_NS_TS_SHIFT				 16</div><div class='add'>+	#define RX_CMP_METADATA1				(0xf &lt;&lt; 28)</div><div class='add'>+	 #define RX_CMP_METADATA1_SHIFT				 28</div><div class='add'>+	#define RX_CMP_METADATA1_TPID_SEL			(0x7 &lt;&lt; 28)</div><div class='add'>+	#define RX_CMP_METADATA1_TPID_8021Q			(0x1 &lt;&lt; 28)</div><div class='add'>+	#define RX_CMP_METADATA1_TPID_8021AD			(0x0 &lt;&lt; 28)</div><div class='add'>+	#define RX_CMP_METADATA1_VALID				(0x8 &lt;&lt; 28)</div><div class='ctx'> </div><div class='ctx'> 	__le32 rx_cmp_rss_hash;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_PTP_RX_TS_VALID(flags)				\</div><div class='add'>+	(((flags) &amp; RX_CMP_FLAGS_ITYPES_MASK) == RX_CMP_FLAGS_ITYPE_PTP_W_TS)</div><div class='add'>+</div><div class='add'>+#define BNXT_ALL_RX_TS_VALID(flags)				\</div><div class='add'>+	!((flags) &amp; RX_CMP_FLAGS_PKT_METADATA_PRESENT)</div><div class='add'>+</div><div class='ctx'> #define RX_CMP_HASH_VALID(rxcmp)				\</div><div class='ctx'> 	((rxcmp)-&gt;rx_cmp_len_flags_type &amp; cpu_to_le32(RX_CMP_FLAGS_RSS_VALID))</div><div class='ctx'> </div><div class='hunk'>@@ -181,6 +277,33 @@ struct rx_cmp {</div><div class='ctx'> 	(((le32_to_cpu((rxcmp)-&gt;rx_cmp_misc_v1) &amp; RX_CMP_RSS_HASH_TYPE) &gt;&gt;\</div><div class='ctx'> 	  RX_CMP_RSS_HASH_TYPE_SHIFT) &amp; RSS_PROFILE_ID_MASK)</div><div class='ctx'> </div><div class='add'>+#define RX_CMP_ITYPES(rxcmp)					\</div><div class='add'>+	(le32_to_cpu((rxcmp)-&gt;rx_cmp_len_flags_type) &amp; RX_CMP_FLAGS_ITYPES_MASK)</div><div class='add'>+</div><div class='add'>+#define RX_CMP_V3_HASH_TYPE_LEGACY(rxcmp)				\</div><div class='add'>+	((le32_to_cpu((rxcmp)-&gt;rx_cmp_misc_v1) &amp; RX_CMP_V3_RSS_EXT_OP_LEGACY) &gt;&gt;\</div><div class='add'>+	 RX_CMP_V3_RSS_EXT_OP_LEGACY_SHIFT)</div><div class='add'>+</div><div class='add'>+#define RX_CMP_V3_HASH_TYPE_NEW(rxcmp)				\</div><div class='add'>+	((le32_to_cpu((rxcmp)-&gt;rx_cmp_misc_v1) &amp; RX_CMP_V3_RSS_EXT_OP_NEW) &gt;&gt;\</div><div class='add'>+	 RX_CMP_V3_RSS_EXT_OP_NEW_SHIFT)</div><div class='add'>+</div><div class='add'>+#define RX_CMP_V3_HASH_TYPE(bp, rxcmp)				\</div><div class='add'>+	(((bp)-&gt;rss_cap &amp; BNXT_RSS_CAP_RSS_TCAM) ?		\</div><div class='add'>+	  RX_CMP_V3_HASH_TYPE_NEW(rxcmp) :			\</div><div class='add'>+	  RX_CMP_V3_HASH_TYPE_LEGACY(rxcmp))</div><div class='add'>+</div><div class='add'>+#define EXT_OP_INNER_4		0x0</div><div class='add'>+#define EXT_OP_OUTER_4		0x2</div><div class='add'>+#define EXT_OP_INNFL_3		0x8</div><div class='add'>+#define EXT_OP_OUTFL_3		0xa</div><div class='add'>+</div><div class='add'>+#define RX_CMP_VLAN_VALID(rxcmp)				\</div><div class='add'>+	((rxcmp)-&gt;rx_cmp_misc_v1 &amp; cpu_to_le32(RX_CMP_METADATA1_VALID))</div><div class='add'>+</div><div class='add'>+#define RX_CMP_VLAN_TPID_SEL(rxcmp)				\</div><div class='add'>+	(le32_to_cpu((rxcmp)-&gt;rx_cmp_misc_v1) &amp; RX_CMP_METADATA1_TPID_SEL)</div><div class='add'>+</div><div class='ctx'> struct rx_cmp_ext {</div><div class='ctx'> 	__le32 rx_cmp_flags2;</div><div class='ctx'> 	#define RX_CMP_FLAGS2_IP_CS_CALC			0x1</div><div class='hunk'>@@ -228,8 +351,11 @@ struct rx_cmp_ext {</div><div class='ctx'> </div><div class='ctx'> 	#define RX_CMPL_CFA_CODE_MASK				(0xffff &lt;&lt; 16)</div><div class='ctx'> 	 #define RX_CMPL_CFA_CODE_SFT				 16</div><div class='add'>+	#define RX_CMPL_METADATA0_TCI_MASK			(0xffff &lt;&lt; 16)</div><div class='add'>+	#define RX_CMPL_METADATA0_VID_MASK			(0x0fff &lt;&lt; 16)</div><div class='add'>+	 #define RX_CMPL_METADATA0_SFT				 16</div><div class='ctx'> </div><div class='del'>-	__le32 rx_cmp_unused3;</div><div class='add'>+	__le32 rx_cmp_timestamp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define RX_CMP_L2_ERRORS						\</div><div class='hunk'>@@ -253,6 +379,10 @@ struct rx_cmp_ext {</div><div class='ctx'> 	((le32_to_cpu((rxcmpl1)-&gt;rx_cmp_cfa_code_errors_v2) &amp;		\</div><div class='ctx'> 	  RX_CMPL_CFA_CODE_MASK) &gt;&gt; RX_CMPL_CFA_CODE_SFT)</div><div class='ctx'> </div><div class='add'>+#define RX_CMP_METADATA0_TCI(rxcmp1)					\</div><div class='add'>+	((le32_to_cpu((rxcmp1)-&gt;rx_cmp_cfa_code_errors_v2) &amp;		\</div><div class='add'>+	  RX_CMPL_METADATA0_TCI_MASK) &gt;&gt; RX_CMPL_METADATA0_SFT)</div><div class='add'>+</div><div class='ctx'> struct rx_agg_cmp {</div><div class='ctx'> 	__le32 rx_agg_cmp_len_flags_type;</div><div class='ctx'> 	#define RX_AGG_CMP_TYPE					(0x3f &lt;&lt; 0)</div><div class='hunk'>@@ -261,14 +391,21 @@ struct rx_agg_cmp {</div><div class='ctx'> 	u32 rx_agg_cmp_opaque;</div><div class='ctx'> 	__le32 rx_agg_cmp_v;</div><div class='ctx'> 	#define RX_AGG_CMP_V					(1 &lt;&lt; 0)</div><div class='add'>+	#define RX_AGG_CMP_AGG_ID				(0x0fff &lt;&lt; 16)</div><div class='add'>+	 #define RX_AGG_CMP_AGG_ID_SHIFT			 16</div><div class='ctx'> 	__le32 rx_agg_cmp_unused;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define TPA_AGG_AGG_ID(rx_agg)				\</div><div class='add'>+	((le32_to_cpu((rx_agg)-&gt;rx_agg_cmp_v) &amp;		\</div><div class='add'>+	 RX_AGG_CMP_AGG_ID) &gt;&gt; RX_AGG_CMP_AGG_ID_SHIFT)</div><div class='add'>+</div><div class='ctx'> struct rx_tpa_start_cmp {</div><div class='ctx'> 	__le32 rx_tpa_start_cmp_len_flags_type;</div><div class='ctx'> 	#define RX_TPA_START_CMP_TYPE				(0x3f &lt;&lt; 0)</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS				(0x3ff &lt;&lt; 6)</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_SHIFT			 6</div><div class='add'>+	#define RX_TPA_START_CMP_FLAGS_ERROR			(0x1 &lt;&lt; 6)</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS_PLACEMENT		(0x7 &lt;&lt; 7)</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_PLACEMENT_SHIFT		 7</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_PLACEMENT_JUMBO		 (0x1 &lt;&lt; 7)</div><div class='hunk'>@@ -276,6 +413,7 @@ struct rx_tpa_start_cmp {</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_PLACEMENT_GRO_JUMBO	 (0x5 &lt;&lt; 7)</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_PLACEMENT_GRO_HDS	 (0x6 &lt;&lt; 7)</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS_RSS_VALID		(0x1 &lt;&lt; 10)</div><div class='add'>+	#define RX_TPA_START_CMP_FLAGS_TIMESTAMP		(0x1 &lt;&lt; 11)</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS_ITYPES			(0xf &lt;&lt; 12)</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_ITYPES_SHIFT		 12</div><div class='ctx'> 	 #define RX_TPA_START_CMP_FLAGS_ITYPE_TCP		 (0x2 &lt;&lt; 12)</div><div class='hunk'>@@ -287,8 +425,18 @@ struct rx_tpa_start_cmp {</div><div class='ctx'> 	#define RX_TPA_START_CMP_V1				(0x1 &lt;&lt; 0)</div><div class='ctx'> 	#define RX_TPA_START_CMP_RSS_HASH_TYPE			(0x7f &lt;&lt; 9)</div><div class='ctx'> 	 #define RX_TPA_START_CMP_RSS_HASH_TYPE_SHIFT		 9</div><div class='add'>+	#define RX_TPA_START_CMP_V3_RSS_HASH_TYPE		(0x1ff &lt;&lt; 7)</div><div class='add'>+	 #define RX_TPA_START_CMP_V3_RSS_HASH_TYPE_SHIFT	 7</div><div class='ctx'> 	#define RX_TPA_START_CMP_AGG_ID				(0x7f &lt;&lt; 25)</div><div class='ctx'> 	 #define RX_TPA_START_CMP_AGG_ID_SHIFT			 25</div><div class='add'>+	#define RX_TPA_START_CMP_AGG_ID_P5			(0x0fff &lt;&lt; 16)</div><div class='add'>+	 #define RX_TPA_START_CMP_AGG_ID_SHIFT_P5		 16</div><div class='add'>+	#define RX_TPA_START_CMP_METADATA1			(0xf &lt;&lt; 28)</div><div class='add'>+	 #define RX_TPA_START_CMP_METADATA1_SHIFT		 28</div><div class='add'>+	#define RX_TPA_START_METADATA1_TPID_SEL			(0x7 &lt;&lt; 28)</div><div class='add'>+	#define RX_TPA_START_METADATA1_TPID_8021Q		(0x1 &lt;&lt; 28)</div><div class='add'>+	#define RX_TPA_START_METADATA1_TPID_8021AD		(0x0 &lt;&lt; 28)</div><div class='add'>+	#define RX_TPA_START_METADATA1_VALID			(0x8 &lt;&lt; 28)</div><div class='ctx'> </div><div class='ctx'> 	__le32 rx_tpa_start_cmp_rss_hash;</div><div class='ctx'> };</div><div class='hunk'>@@ -302,10 +450,31 @@ struct rx_tpa_start_cmp {</div><div class='ctx'> 	   RX_TPA_START_CMP_RSS_HASH_TYPE) &gt;&gt;				\</div><div class='ctx'> 	  RX_TPA_START_CMP_RSS_HASH_TYPE_SHIFT) &amp; RSS_PROFILE_ID_MASK)</div><div class='ctx'> </div><div class='add'>+#define TPA_START_V3_HASH_TYPE(rx_tpa_start)				\</div><div class='add'>+	(((le32_to_cpu((rx_tpa_start)-&gt;rx_tpa_start_cmp_misc_v1) &amp;	\</div><div class='add'>+	   RX_TPA_START_CMP_V3_RSS_HASH_TYPE) &gt;&gt;			\</div><div class='add'>+	  RX_TPA_START_CMP_V3_RSS_HASH_TYPE_SHIFT) &amp; RSS_PROFILE_ID_MASK)</div><div class='add'>+</div><div class='ctx'> #define TPA_START_AGG_ID(rx_tpa_start)					\</div><div class='ctx'> 	((le32_to_cpu((rx_tpa_start)-&gt;rx_tpa_start_cmp_misc_v1) &amp;	\</div><div class='ctx'> 	 RX_TPA_START_CMP_AGG_ID) &gt;&gt; RX_TPA_START_CMP_AGG_ID_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define TPA_START_AGG_ID_P5(rx_tpa_start)				\</div><div class='add'>+	((le32_to_cpu((rx_tpa_start)-&gt;rx_tpa_start_cmp_misc_v1) &amp;	\</div><div class='add'>+	 RX_TPA_START_CMP_AGG_ID_P5) &gt;&gt; RX_TPA_START_CMP_AGG_ID_SHIFT_P5)</div><div class='add'>+</div><div class='add'>+#define TPA_START_ERROR(rx_tpa_start)					\</div><div class='add'>+	((rx_tpa_start)-&gt;rx_tpa_start_cmp_len_flags_type &amp;		\</div><div class='add'>+	 cpu_to_le32(RX_TPA_START_CMP_FLAGS_ERROR))</div><div class='add'>+</div><div class='add'>+#define TPA_START_VLAN_VALID(rx_tpa_start)				\</div><div class='add'>+	((rx_tpa_start)-&gt;rx_tpa_start_cmp_misc_v1 &amp;			\</div><div class='add'>+	 cpu_to_le32(RX_TPA_START_METADATA1_VALID))</div><div class='add'>+</div><div class='add'>+#define TPA_START_VLAN_TPID_SEL(rx_tpa_start)				\</div><div class='add'>+	(le32_to_cpu((rx_tpa_start)-&gt;rx_tpa_start_cmp_misc_v1) &amp;	\</div><div class='add'>+	 RX_TPA_START_METADATA1_TPID_SEL)</div><div class='add'>+</div><div class='ctx'> struct rx_tpa_start_cmp_ext {</div><div class='ctx'> 	__le32 rx_tpa_start_cmp_flags2;</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS2_IP_CS_CALC		(0x1 &lt;&lt; 0)</div><div class='hunk'>@@ -313,12 +482,27 @@ struct rx_tpa_start_cmp_ext {</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS2_T_IP_CS_CALC		(0x1 &lt;&lt; 2)</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS2_T_L4_CS_CALC		(0x1 &lt;&lt; 3)</div><div class='ctx'> 	#define RX_TPA_START_CMP_FLAGS2_IP_TYPE			(0x1 &lt;&lt; 8)</div><div class='add'>+	#define RX_TPA_START_CMP_FLAGS2_CSUM_CMPL_VALID		(0x1 &lt;&lt; 9)</div><div class='add'>+	#define RX_TPA_START_CMP_FLAGS2_EXT_META_FORMAT		(0x3 &lt;&lt; 10)</div><div class='add'>+	 #define RX_TPA_START_CMP_FLAGS2_EXT_META_FORMAT_SHIFT	 10</div><div class='add'>+	#define RX_TPA_START_CMP_V3_FLAGS2_T_IP_TYPE		(0x1 &lt;&lt; 10)</div><div class='add'>+	#define RX_TPA_START_CMP_V3_FLAGS2_AGG_GRO		(0x1 &lt;&lt; 11)</div><div class='add'>+	#define RX_TPA_START_CMP_FLAGS2_CSUM_CMPL		(0xffff &lt;&lt; 16)</div><div class='add'>+	 #define RX_TPA_START_CMP_FLAGS2_CSUM_CMPL_SHIFT	 16</div><div class='ctx'> </div><div class='ctx'> 	__le32 rx_tpa_start_cmp_metadata;</div><div class='ctx'> 	__le32 rx_tpa_start_cmp_cfa_code_v2;</div><div class='ctx'> 	#define RX_TPA_START_CMP_V2				(0x1 &lt;&lt; 0)</div><div class='add'>+	#define RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_MASK	(0x7 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_SHIFT	 1</div><div class='add'>+	 #define RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_NO_BUFFER	 (0x0 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_BAD_FORMAT (0x3 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_FLUSH	 (0x5 &lt;&lt; 1)</div><div class='ctx'> 	#define RX_TPA_START_CMP_CFA_CODE			(0xffff &lt;&lt; 16)</div><div class='ctx'> 	 #define RX_TPA_START_CMPL_CFA_CODE_SHIFT		 16</div><div class='add'>+	#define RX_TPA_START_CMP_METADATA0_TCI_MASK		(0xffff &lt;&lt; 16)</div><div class='add'>+	#define RX_TPA_START_CMP_METADATA0_VID_MASK		(0x0fff &lt;&lt; 16)</div><div class='add'>+	 #define RX_TPA_START_CMP_METADATA0_SFT			 16</div><div class='ctx'> 	__le32 rx_tpa_start_cmp_hdr_info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -330,6 +514,16 @@ struct rx_tpa_start_cmp_ext {</div><div class='ctx'> 	(!!((rx_tpa_start)-&gt;rx_tpa_start_cmp_flags2 &amp;		\</div><div class='ctx'> 	    cpu_to_le32(RX_TPA_START_CMP_FLAGS2_IP_TYPE)))</div><div class='ctx'> </div><div class='add'>+#define TPA_START_ERROR_CODE(rx_tpa_start)				\</div><div class='add'>+	((le32_to_cpu((rx_tpa_start)-&gt;rx_tpa_start_cmp_cfa_code_v2) &amp;	\</div><div class='add'>+	  RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_MASK) &gt;&gt;			\</div><div class='add'>+	 RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TPA_START_METADATA0_TCI(rx_tpa_start)				\</div><div class='add'>+	((le32_to_cpu((rx_tpa_start)-&gt;rx_tpa_start_cmp_cfa_code_v2) &amp;	\</div><div class='add'>+	  RX_TPA_START_CMP_METADATA0_TCI_MASK) &gt;&gt;			\</div><div class='add'>+	 RX_TPA_START_CMP_METADATA0_SFT)</div><div class='add'>+</div><div class='ctx'> struct rx_tpa_end_cmp {</div><div class='ctx'> 	__le32 rx_tpa_end_cmp_len_flags_type;</div><div class='ctx'> 	#define RX_TPA_END_CMP_TYPE				(0x3f &lt;&lt; 0)</div><div class='hunk'>@@ -359,6 +553,8 @@ struct rx_tpa_end_cmp {</div><div class='ctx'> 	 #define RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT		 16</div><div class='ctx'> 	#define RX_TPA_END_CMP_AGG_ID				(0x7f &lt;&lt; 25)</div><div class='ctx'> 	 #define RX_TPA_END_CMP_AGG_ID_SHIFT			 25</div><div class='add'>+	#define RX_TPA_END_CMP_AGG_ID_P5			(0x0fff &lt;&lt; 16)</div><div class='add'>+	 #define RX_TPA_END_CMP_AGG_ID_SHIFT_P5			 16</div><div class='ctx'> </div><div class='ctx'> 	__le32 rx_tpa_end_cmp_tsdelta;</div><div class='ctx'> 	#define RX_TPA_END_GRO_TS				(0x1 &lt;&lt; 31)</div><div class='hunk'>@@ -368,6 +564,18 @@ struct rx_tpa_end_cmp {</div><div class='ctx'> 	((le32_to_cpu((rx_tpa_end)-&gt;rx_tpa_end_cmp_misc_v1) &amp;		\</div><div class='ctx'> 	 RX_TPA_END_CMP_AGG_ID) &gt;&gt; RX_TPA_END_CMP_AGG_ID_SHIFT)</div><div class='ctx'> </div><div class='add'>+#define TPA_END_AGG_ID_P5(rx_tpa_end)					\</div><div class='add'>+	((le32_to_cpu((rx_tpa_end)-&gt;rx_tpa_end_cmp_misc_v1) &amp;		\</div><div class='add'>+	 RX_TPA_END_CMP_AGG_ID_P5) &gt;&gt; RX_TPA_END_CMP_AGG_ID_SHIFT_P5)</div><div class='add'>+</div><div class='add'>+#define TPA_END_PAYLOAD_OFF(rx_tpa_end)					\</div><div class='add'>+	((le32_to_cpu((rx_tpa_end)-&gt;rx_tpa_end_cmp_misc_v1) &amp;		\</div><div class='add'>+	 RX_TPA_END_CMP_PAYLOAD_OFFSET) &gt;&gt; RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT)</div><div class='add'>+</div><div class='add'>+#define TPA_END_AGG_BUFS(rx_tpa_end)					\</div><div class='add'>+	((le32_to_cpu((rx_tpa_end)-&gt;rx_tpa_end_cmp_misc_v1) &amp;		\</div><div class='add'>+	 RX_TPA_END_CMP_AGG_BUFS) &gt;&gt; RX_TPA_END_CMP_AGG_BUFS_SHIFT)</div><div class='add'>+</div><div class='ctx'> #define TPA_END_TPA_SEGS(rx_tpa_end)					\</div><div class='ctx'> 	((le32_to_cpu((rx_tpa_end)-&gt;rx_tpa_end_cmp_misc_v1) &amp;		\</div><div class='ctx'> 	 RX_TPA_END_CMP_TPA_SEGS) &gt;&gt; RX_TPA_END_CMP_TPA_SEGS_SHIFT)</div><div class='hunk'>@@ -387,6 +595,10 @@ struct rx_tpa_end_cmp {</div><div class='ctx'> struct rx_tpa_end_cmp_ext {</div><div class='ctx'> 	__le32 rx_tpa_end_cmp_dup_acks;</div><div class='ctx'> 	#define RX_TPA_END_CMP_TPA_DUP_ACKS			(0xf &lt;&lt; 0)</div><div class='add'>+	#define RX_TPA_END_CMP_PAYLOAD_OFFSET_P5		(0xff &lt;&lt; 16)</div><div class='add'>+	 #define RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT_P5		 16</div><div class='add'>+	#define RX_TPA_END_CMP_AGG_BUFS_P5			(0xff &lt;&lt; 24)</div><div class='add'>+	 #define RX_TPA_END_CMP_AGG_BUFS_SHIFT_P5		 24</div><div class='ctx'> </div><div class='ctx'> 	__le32 rx_tpa_end_cmp_seg_len;</div><div class='ctx'> 	#define RX_TPA_END_CMP_TPA_SEG_LEN			(0xffff &lt;&lt; 0)</div><div class='hunk'>@@ -394,7 +606,13 @@ struct rx_tpa_end_cmp_ext {</div><div class='ctx'> 	__le32 rx_tpa_end_cmp_errors_v2;</div><div class='ctx'> 	#define RX_TPA_END_CMP_V2				(0x1 &lt;&lt; 0)</div><div class='ctx'> 	#define RX_TPA_END_CMP_ERRORS				(0x3 &lt;&lt; 1)</div><div class='add'>+	#define RX_TPA_END_CMP_ERRORS_P5			(0x7 &lt;&lt; 1)</div><div class='ctx'> 	#define RX_TPA_END_CMPL_ERRORS_SHIFT			 1</div><div class='add'>+	 #define RX_TPA_END_CMP_ERRORS_BUFFER_ERROR_NO_BUFFER	 (0x0 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_END_CMP_ERRORS_BUFFER_ERROR_NOT_ON_CHIP	 (0x2 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_END_CMP_ERRORS_BUFFER_ERROR_BAD_FORMAT	 (0x3 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_END_CMP_ERRORS_BUFFER_ERROR_RSV_ERROR	 (0x4 &lt;&lt; 1)</div><div class='add'>+	 #define RX_TPA_END_CMP_ERRORS_BUFFER_ERROR_FLUSH	 (0x5 &lt;&lt; 1)</div><div class='ctx'> </div><div class='ctx'> 	u32 rx_tpa_end_cmp_start_opaque;</div><div class='ctx'> };</div><div class='hunk'>@@ -403,12 +621,55 @@ struct rx_tpa_end_cmp_ext {</div><div class='ctx'> 	((rx_tpa_end_ext)-&gt;rx_tpa_end_cmp_errors_v2 &amp;			\</div><div class='ctx'> 	 cpu_to_le32(RX_TPA_END_CMP_ERRORS))</div><div class='ctx'> </div><div class='add'>+#define TPA_END_PAYLOAD_OFF_P5(rx_tpa_end_ext)				\</div><div class='add'>+	((le32_to_cpu((rx_tpa_end_ext)-&gt;rx_tpa_end_cmp_dup_acks) &amp;	\</div><div class='add'>+	 RX_TPA_END_CMP_PAYLOAD_OFFSET_P5) &gt;&gt;				\</div><div class='add'>+	RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT_P5)</div><div class='add'>+</div><div class='add'>+#define TPA_END_AGG_BUFS_P5(rx_tpa_end_ext)				\</div><div class='add'>+	((le32_to_cpu((rx_tpa_end_ext)-&gt;rx_tpa_end_cmp_dup_acks) &amp;	\</div><div class='add'>+	 RX_TPA_END_CMP_AGG_BUFS_P5) &gt;&gt; RX_TPA_END_CMP_AGG_BUFS_SHIFT_P5)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA1_RESET_NOTIFY_FATAL(data1)				\</div><div class='add'>+	(((data1) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK) ==\</div><div class='add'>+	 ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA1_RESET_NOTIFY_FW_ACTIVATION(data1)			\</div><div class='add'>+	(((data1) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK) ==\</div><div class='add'>+	ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_ACTIVATION)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA2_RESET_NOTIFY_FW_STATUS_CODE(data2)			\</div><div class='add'>+	((data2) &amp;							\</div><div class='add'>+	ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA2_FW_STATUS_CODE_MASK)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA1_RECOVERY_MASTER_FUNC(data1)				\</div><div class='add'>+	!!((data1) &amp;							\</div><div class='add'>+	   ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASTER_FUNC)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA1_RECOVERY_ENABLED(data1)				\</div><div class='add'>+	!!((data1) &amp;							\</div><div class='add'>+	   ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_ERROR_REPORT_TYPE(data1)				\</div><div class='add'>+	(((data1) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_EVENT_INVALID_SIGNAL_DATA(data2)				\</div><div class='add'>+	(((data2) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_SFT)</div><div class='add'>+</div><div class='ctx'> struct nqe_cn {</div><div class='ctx'> 	__le16	type;</div><div class='ctx'> 	#define NQ_CN_TYPE_MASK           0x3fUL</div><div class='ctx'> 	#define NQ_CN_TYPE_SFT            0</div><div class='ctx'> 	#define NQ_CN_TYPE_CQ_NOTIFICATION  0x30UL</div><div class='ctx'> 	#define NQ_CN_TYPE_LAST            NQ_CN_TYPE_CQ_NOTIFICATION</div><div class='add'>+	#define NQ_CN_TOGGLE_MASK         0xc0UL</div><div class='add'>+	#define NQ_CN_TOGGLE_SFT          6</div><div class='ctx'> 	__le16	reserved16;</div><div class='ctx'> 	__le32	cq_handle_low;</div><div class='ctx'> 	__le32	v;</div><div class='hunk'>@@ -416,6 +677,23 @@ struct nqe_cn {</div><div class='ctx'> 	__le32	cq_handle_high;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_NQ_HDL_IDX_MASK	0x00ffffff</div><div class='add'>+#define BNXT_NQ_HDL_TYPE_MASK	0xff000000</div><div class='add'>+#define BNXT_NQ_HDL_TYPE_SHIFT	24</div><div class='add'>+#define BNXT_NQ_HDL_TYPE_RX	0x00</div><div class='add'>+#define BNXT_NQ_HDL_TYPE_TX	0x01</div><div class='add'>+</div><div class='add'>+#define BNXT_NQ_HDL_IDX(hdl)	((hdl) &amp; BNXT_NQ_HDL_IDX_MASK)</div><div class='add'>+#define BNXT_NQ_HDL_TYPE(hdl)	(((hdl) &amp; BNXT_NQ_HDL_TYPE_MASK) &gt;&gt;	\</div><div class='add'>+				 BNXT_NQ_HDL_TYPE_SHIFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_SET_NQ_HDL(cpr)						\</div><div class='add'>+	(((cpr)-&gt;cp_ring_type &lt;&lt; BNXT_NQ_HDL_TYPE_SHIFT) | (cpr)-&gt;cp_idx)</div><div class='add'>+</div><div class='add'>+#define NQE_CN_TYPE(type)	((type) &amp; NQ_CN_TYPE_MASK)</div><div class='add'>+#define NQE_CN_TOGGLE(type)	(((type) &amp; NQ_CN_TOGGLE_MASK) &gt;&gt;	\</div><div class='add'>+				 NQ_CN_TOGGLE_SFT)</div><div class='add'>+</div><div class='ctx'> #define DB_IDX_MASK						0xffffff</div><div class='ctx'> #define DB_IDX_VALID						(0x1 &lt;&lt; 26)</div><div class='ctx'> #define DB_IRQ_DIS						(0x1 &lt;&lt; 27)</div><div class='hunk'>@@ -431,9 +709,14 @@ struct nqe_cn {</div><div class='ctx'> </div><div class='ctx'> /* 64-bit doorbell */</div><div class='ctx'> #define DBR_INDEX_MASK					0x0000000000ffffffULL</div><div class='add'>+#define DBR_EPOCH_MASK					0x01000000UL</div><div class='add'>+#define DBR_EPOCH_SFT					24</div><div class='add'>+#define DBR_TOGGLE_MASK					0x06000000UL</div><div class='add'>+#define DBR_TOGGLE_SFT					25</div><div class='ctx'> #define DBR_XID_MASK					0x000fffff00000000ULL</div><div class='ctx'> #define DBR_XID_SFT					32</div><div class='ctx'> #define DBR_PATH_L2					(0x1ULL &lt;&lt; 56)</div><div class='add'>+#define DBR_VALID					(0x1ULL &lt;&lt; 58)</div><div class='ctx'> #define DBR_TYPE_SQ					(0x0ULL &lt;&lt; 60)</div><div class='ctx'> #define DBR_TYPE_RQ					(0x1ULL &lt;&lt; 60)</div><div class='ctx'> #define DBR_TYPE_SRQ					(0x2ULL &lt;&lt; 60)</div><div class='hunk'>@@ -446,8 +729,12 @@ struct nqe_cn {</div><div class='ctx'> #define DBR_TYPE_CQ_CUTOFF_ACK				(0x9ULL &lt;&lt; 60)</div><div class='ctx'> #define DBR_TYPE_NQ					(0xaULL &lt;&lt; 60)</div><div class='ctx'> #define DBR_TYPE_NQ_ARM					(0xbULL &lt;&lt; 60)</div><div class='add'>+#define DBR_TYPE_NQ_MASK				(0xeULL &lt;&lt; 60)</div><div class='ctx'> #define DBR_TYPE_NULL					(0xfULL &lt;&lt; 60)</div><div class='ctx'> </div><div class='add'>+#define DB_PF_OFFSET_P5					0x10000</div><div class='add'>+#define DB_VF_OFFSET_P5					0x4000</div><div class='add'>+</div><div class='ctx'> #define INVALID_HW_RING_ID	((u16)-1)</div><div class='ctx'> </div><div class='ctx'> /* The hardware supports certain page sizes.  Use the supported page sizes</div><div class='hunk'>@@ -475,9 +762,20 @@ struct nqe_cn {</div><div class='ctx'> #define BNXT_RX_PAGE_SIZE (1 &lt;&lt; BNXT_RX_PAGE_SHIFT)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_MAX_MTU		9500</div><div class='del'>-#define BNXT_MAX_PAGE_MODE_MTU	\</div><div class='add'>+</div><div class='add'>+/* First RX buffer page in XDP multi-buf mode</div><div class='add'>+ *</div><div class='add'>+ * +-------------------------------------------------------------------------+</div><div class='add'>+ * | XDP_PACKET_HEADROOM | bp-&gt;rx_buf_use_size              | skb_shared_info|</div><div class='add'>+ * | (bp-&gt;rx_dma_offset) |                                  |                |</div><div class='add'>+ * +-------------------------------------------------------------------------+</div><div class='add'>+ */</div><div class='add'>+#define BNXT_MAX_PAGE_MODE_MTU_SBUF \</div><div class='ctx'> 	((unsigned int)PAGE_SIZE - VLAN_ETH_HLEN - NET_IP_ALIGN -	\</div><div class='ctx'> 	 XDP_PACKET_HEADROOM)</div><div class='add'>+#define BNXT_MAX_PAGE_MODE_MTU	\</div><div class='add'>+	(BNXT_MAX_PAGE_MODE_MTU_SBUF - \</div><div class='add'>+	 SKB_DATA_ALIGN((unsigned int)sizeof(struct skb_shared_info)))</div><div class='ctx'> </div><div class='ctx'> #define BNXT_MIN_PKT_SIZE	52</div><div class='ctx'> </div><div class='hunk'>@@ -485,17 +783,22 @@ struct nqe_cn {</div><div class='ctx'> #define BNXT_DEFAULT_TX_RING_SIZE	511</div><div class='ctx'> </div><div class='ctx'> #define MAX_TPA		64</div><div class='add'>+#define MAX_TPA_P5	256</div><div class='add'>+#define MAX_TPA_P5_MASK	(MAX_TPA_P5 - 1)</div><div class='add'>+#define MAX_TPA_SEGS_P5	0x3f</div><div class='ctx'> </div><div class='ctx'> #if (BNXT_PAGE_SHIFT == 16)</div><div class='del'>-#define MAX_RX_PAGES	1</div><div class='add'>+#define MAX_RX_PAGES_AGG_ENA	1</div><div class='add'>+#define MAX_RX_PAGES	4</div><div class='ctx'> #define MAX_RX_AGG_PAGES	4</div><div class='ctx'> #define MAX_TX_PAGES	1</div><div class='del'>-#define MAX_CP_PAGES	8</div><div class='add'>+#define MAX_CP_PAGES	16</div><div class='ctx'> #else</div><div class='del'>-#define MAX_RX_PAGES	8</div><div class='add'>+#define MAX_RX_PAGES_AGG_ENA	8</div><div class='add'>+#define MAX_RX_PAGES	32</div><div class='ctx'> #define MAX_RX_AGG_PAGES	32</div><div class='ctx'> #define MAX_TX_PAGES	8</div><div class='del'>-#define MAX_CP_PAGES	64</div><div class='add'>+#define MAX_CP_PAGES	128</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #define RX_DESC_CNT (BNXT_PAGE_SIZE / sizeof(struct rx_bd))</div><div class='hunk'>@@ -513,13 +816,21 @@ struct nqe_cn {</div><div class='ctx'> #define HW_CMPD_RING_SIZE (sizeof(struct tx_cmp) * CP_DESC_CNT)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_MAX_RX_DESC_CNT		(RX_DESC_CNT * MAX_RX_PAGES - 1)</div><div class='add'>+#define BNXT_MAX_RX_DESC_CNT_JUM_ENA	(RX_DESC_CNT * MAX_RX_PAGES_AGG_ENA - 1)</div><div class='ctx'> #define BNXT_MAX_RX_JUM_DESC_CNT	(RX_DESC_CNT * MAX_RX_AGG_PAGES - 1)</div><div class='ctx'> #define BNXT_MAX_TX_DESC_CNT		(TX_DESC_CNT * MAX_TX_PAGES - 1)</div><div class='ctx'> </div><div class='del'>-#define RX_RING(x)	(((x) &amp; ~(RX_DESC_CNT - 1)) &gt;&gt; (BNXT_PAGE_SHIFT - 4))</div><div class='add'>+/* Minimum TX BDs for a TX packet with MAX_SKB_FRAGS + 1.  We need one extra</div><div class='add'>+ * BD because the first TX BD is always a long BD.</div><div class='add'>+ */</div><div class='add'>+#define BNXT_MIN_TX_DESC_CNT		(MAX_SKB_FRAGS + 2)</div><div class='add'>+</div><div class='add'>+#define RX_RING(bp, x)	(((x) &amp; (bp)-&gt;rx_ring_mask) &gt;&gt; (BNXT_PAGE_SHIFT - 4))</div><div class='add'>+#define RX_AGG_RING(bp, x)	(((x) &amp; (bp)-&gt;rx_agg_ring_mask) &gt;&gt;	\</div><div class='add'>+				 (BNXT_PAGE_SHIFT - 4))</div><div class='ctx'> #define RX_IDX(x)	((x) &amp; (RX_DESC_CNT - 1))</div><div class='ctx'> </div><div class='del'>-#define TX_RING(x)	(((x) &amp; ~(TX_DESC_CNT - 1)) &gt;&gt; (BNXT_PAGE_SHIFT - 4))</div><div class='add'>+#define TX_RING(bp, x)	(((x) &amp; (bp)-&gt;tx_ring_mask) &gt;&gt; (BNXT_PAGE_SHIFT - 4))</div><div class='ctx'> #define TX_IDX(x)	((x) &amp; (TX_DESC_CNT - 1))</div><div class='ctx'> </div><div class='ctx'> #define CP_RING(x)	(((x) &amp; ~(CP_DESC_CNT - 1)) &gt;&gt; (BNXT_PAGE_SHIFT - 4))</div><div class='hunk'>@@ -546,59 +857,43 @@ struct nqe_cn {</div><div class='ctx'> #define RX_CMP_TYPE(rxcmp)					\</div><div class='ctx'> 	(le32_to_cpu((rxcmp)-&gt;rx_cmp_len_flags_type) &amp; RX_CMP_CMP_TYPE)</div><div class='ctx'> </div><div class='del'>-#define NEXT_RX(idx)		(((idx) + 1) &amp; bp-&gt;rx_ring_mask)</div><div class='add'>+#define RING_RX(bp, idx)	((idx) &amp; (bp)-&gt;rx_ring_mask)</div><div class='add'>+#define NEXT_RX(idx)		((idx) + 1)</div><div class='ctx'> </div><div class='del'>-#define NEXT_RX_AGG(idx)	(((idx) + 1) &amp; bp-&gt;rx_agg_ring_mask)</div><div class='add'>+#define RING_RX_AGG(bp, idx)	((idx) &amp; (bp)-&gt;rx_agg_ring_mask)</div><div class='add'>+#define NEXT_RX_AGG(idx)	((idx) + 1)</div><div class='ctx'> </div><div class='del'>-#define NEXT_TX(idx)		(((idx) + 1) &amp; bp-&gt;tx_ring_mask)</div><div class='add'>+#define RING_TX(bp, idx)	((idx) &amp; (bp)-&gt;tx_ring_mask)</div><div class='add'>+#define NEXT_TX(idx)		((idx) + 1)</div><div class='ctx'> </div><div class='ctx'> #define ADV_RAW_CMP(idx, n)	((idx) + (n))</div><div class='ctx'> #define NEXT_RAW_CMP(idx)	ADV_RAW_CMP(idx, 1)</div><div class='ctx'> #define RING_CMP(idx)		((idx) &amp; bp-&gt;cp_ring_mask)</div><div class='ctx'> #define NEXT_CMP(idx)		RING_CMP(ADV_RAW_CMP(idx, 1))</div><div class='ctx'> </div><div class='del'>-#define BNXT_HWRM_MAX_REQ_LEN		(bp-&gt;hwrm_max_req_len)</div><div class='del'>-#define BNXT_HWRM_SHORT_REQ_LEN		sizeof(struct hwrm_short_input)</div><div class='ctx'> #define DFLT_HWRM_CMD_TIMEOUT		500</div><div class='del'>-#define HWRM_CMD_TIMEOUT		(bp-&gt;hwrm_cmd_timeout)</div><div class='del'>-#define HWRM_RESET_TIMEOUT		((HWRM_CMD_TIMEOUT) * 4)</div><div class='del'>-#define HWRM_RESP_ERR_CODE_MASK		0xffff</div><div class='del'>-#define HWRM_RESP_LEN_OFFSET		4</div><div class='del'>-#define HWRM_RESP_LEN_MASK		0xffff0000</div><div class='del'>-#define HWRM_RESP_LEN_SFT		16</div><div class='del'>-#define HWRM_RESP_VALID_MASK		0xff000000</div><div class='del'>-#define BNXT_HWRM_REQ_MAX_SIZE		128</div><div class='del'>-#define BNXT_HWRM_REQS_PER_PAGE		(BNXT_PAGE_SIZE /	\</div><div class='del'>-					 BNXT_HWRM_REQ_MAX_SIZE)</div><div class='del'>-#define HWRM_SHORT_MIN_TIMEOUT		3</div><div class='del'>-#define HWRM_SHORT_MAX_TIMEOUT		10</div><div class='del'>-#define HWRM_SHORT_TIMEOUT_COUNTER	5</div><div class='del'>-</div><div class='del'>-#define HWRM_MIN_TIMEOUT		25</div><div class='del'>-#define HWRM_MAX_TIMEOUT		40</div><div class='del'>-</div><div class='del'>-#define HWRM_TOTAL_TIMEOUT(n)	(((n) &lt;= HWRM_SHORT_TIMEOUT_COUNTER) ?	\</div><div class='del'>-	((n) * HWRM_SHORT_MIN_TIMEOUT) :				\</div><div class='del'>-	(HWRM_SHORT_TIMEOUT_COUNTER * HWRM_SHORT_MIN_TIMEOUT +		\</div><div class='del'>-	 ((n) - HWRM_SHORT_TIMEOUT_COUNTER) * HWRM_MIN_TIMEOUT))</div><div class='del'>-</div><div class='del'>-#define HWRM_VALID_BIT_DELAY_USEC	150</div><div class='del'>-</div><div class='del'>-#define BNXT_HWRM_CHNL_CHIMP	0</div><div class='del'>-#define BNXT_HWRM_CHNL_KONG	1</div><div class='del'>-</div><div class='del'>-#define BNXT_RX_EVENT	1</div><div class='del'>-#define BNXT_AGG_EVENT	2</div><div class='del'>-#define BNXT_TX_EVENT	4</div><div class='add'>+</div><div class='add'>+#define BNXT_RX_EVENT		1</div><div class='add'>+#define BNXT_AGG_EVENT		2</div><div class='add'>+#define BNXT_TX_EVENT		4</div><div class='add'>+#define BNXT_REDIRECT_EVENT	8</div><div class='add'>+#define BNXT_TX_CMP_EVENT	0x10</div><div class='ctx'> </div><div class='ctx'> struct bnxt_sw_tx_bd {</div><div class='del'>-	struct sk_buff		*skb;</div><div class='add'>+	union {</div><div class='add'>+		struct sk_buff		*skb;</div><div class='add'>+		struct xdp_frame	*xdpf;</div><div class='add'>+	};</div><div class='ctx'> 	DEFINE_DMA_UNMAP_ADDR(mapping);</div><div class='del'>-	u8			is_gso;</div><div class='add'>+	DEFINE_DMA_UNMAP_LEN(len);</div><div class='add'>+	struct page		*page;</div><div class='add'>+	u8			is_ts_pkt;</div><div class='ctx'> 	u8			is_push;</div><div class='add'>+	u8			action;</div><div class='add'>+	unsigned short		nr_frags;</div><div class='ctx'> 	union {</div><div class='del'>-		unsigned short		nr_frags;</div><div class='ctx'> 		u16			rx_prod;</div><div class='add'>+		u16			txts_prod;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -609,7 +904,7 @@ struct bnxt_sw_rx_bd {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_sw_rx_agg_bd {</div><div class='del'>-	struct page		*page;</div><div class='add'>+	netmem_ref		netmem;</div><div class='ctx'> 	unsigned int		offset;</div><div class='ctx'> 	dma_addr_t		mapping;</div><div class='ctx'> };</div><div class='hunk'>@@ -623,6 +918,7 @@ struct bnxt_ring_mem_info {</div><div class='ctx'> #define BNXT_RMEM_USE_FULL_PAGE_FLAG	4</div><div class='ctx'> </div><div class='ctx'> 	u16			depth;</div><div class='add'>+	struct bnxt_ctx_mem_type	*ctx_mem;</div><div class='ctx'> </div><div class='ctx'> 	void			**pg_arr;</div><div class='ctx'> 	dma_addr_t		*dma_arr;</div><div class='hunk'>@@ -664,13 +960,28 @@ struct bnxt_db_info {</div><div class='ctx'> 		u64		db_key64;</div><div class='ctx'> 		u32		db_key32;</div><div class='ctx'> 	};</div><div class='add'>+	u32			db_ring_mask;</div><div class='add'>+	u32			db_epoch_mask;</div><div class='add'>+	u8			db_epoch_shift;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DB_EPOCH(db, idx)	(((idx) &amp; (db)-&gt;db_epoch_mask) &lt;&lt;	\</div><div class='add'>+				 ((db)-&gt;db_epoch_shift))</div><div class='add'>+</div><div class='add'>+#define DB_TOGGLE(tgl)		((tgl) &lt;&lt; DBR_TOGGLE_SFT)</div><div class='add'>+</div><div class='add'>+#define DB_RING_IDX(db, idx)	(((idx) &amp; (db)-&gt;db_ring_mask) |		\</div><div class='add'>+				 DB_EPOCH(db, idx))</div><div class='add'>+</div><div class='ctx'> struct bnxt_tx_ring_info {</div><div class='ctx'> 	struct bnxt_napi	*bnapi;</div><div class='add'>+	struct bnxt_cp_ring_info	*tx_cpr;</div><div class='ctx'> 	u16			tx_prod;</div><div class='ctx'> 	u16			tx_cons;</div><div class='add'>+	u16			tx_hw_cons;</div><div class='ctx'> 	u16			txq_index;</div><div class='add'>+	u8			tx_napi_idx;</div><div class='add'>+	u8			kick_pending;</div><div class='ctx'> 	struct bnxt_db_info	tx_db;</div><div class='ctx'> </div><div class='ctx'> 	struct tx_bd		*tx_desc_ring[MAX_TX_PAGES];</div><div class='hunk'>@@ -686,6 +997,8 @@ struct bnxt_tx_ring_info {</div><div class='ctx'> 	u32			dev_state;</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_ring_struct	tx_ring_struct;</div><div class='add'>+	/* Synchronize simultaneous xdp_xmit on same ring */</div><div class='add'>+	spinlock_t		xdp_tx_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BNXT_LEGACY_COAL_CMPL_PARAMS					\</div><div class='hunk'>@@ -733,6 +1046,7 @@ struct bnxt_coal {</div><div class='ctx'> 	u16			idle_thresh;</div><div class='ctx'> 	u8			bufs_per_record;</div><div class='ctx'> 	u8			budget;</div><div class='add'>+	u16			flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_tpa_info {</div><div class='hunk'>@@ -760,10 +1074,22 @@ struct bnxt_tpa_info {</div><div class='ctx'> 	((hdr_info) &amp; 0x1ff)</div><div class='ctx'> </div><div class='ctx'> 	u16			cfa_code; /* cfa_code in TPA start compl */</div><div class='add'>+	u8			agg_count;</div><div class='add'>+	u8			vlan_valid:1;</div><div class='add'>+	u8			cfa_code_valid:1;</div><div class='add'>+	struct rx_agg_cmp	*agg_arr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_AGG_IDX_BMAP_SIZE	(MAX_TPA_P5 / BITS_PER_LONG)</div><div class='add'>+</div><div class='add'>+struct bnxt_tpa_idx_map {</div><div class='add'>+	u16		agg_id_tbl[1024];</div><div class='add'>+	unsigned long	agg_idx_bmap[BNXT_AGG_IDX_BMAP_SIZE];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_rx_ring_info {</div><div class='ctx'> 	struct bnxt_napi	*bnapi;</div><div class='add'>+	struct bnxt_cp_ring_info	*rx_cpr;</div><div class='ctx'> 	u16			rx_prod;</div><div class='ctx'> 	u16			rx_agg_prod;</div><div class='ctx'> 	u16			rx_sw_agg_prod;</div><div class='hunk'>@@ -781,18 +1107,61 @@ struct bnxt_rx_ring_info {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		*rx_agg_bmap;</div><div class='ctx'> 	u16			rx_agg_bmap_size;</div><div class='del'>-</div><div class='del'>-	struct page		*rx_page;</div><div class='del'>-	unsigned int		rx_page_offset;</div><div class='add'>+	bool                    need_head_pool;</div><div class='ctx'> </div><div class='ctx'> 	dma_addr_t		rx_desc_mapping[MAX_RX_PAGES];</div><div class='ctx'> 	dma_addr_t		rx_agg_desc_mapping[MAX_RX_AGG_PAGES];</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_tpa_info	*rx_tpa;</div><div class='add'>+	struct bnxt_tpa_idx_map *rx_tpa_idx_map;</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_ring_struct	rx_ring_struct;</div><div class='ctx'> 	struct bnxt_ring_struct	rx_agg_ring_struct;</div><div class='ctx'> 	struct xdp_rxq_info	xdp_rxq;</div><div class='add'>+	struct page_pool	*page_pool;</div><div class='add'>+	struct page_pool	*head_pool;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_rx_sw_stats {</div><div class='add'>+	u64			rx_l4_csum_errors;</div><div class='add'>+	u64			rx_resets;</div><div class='add'>+	u64			rx_buf_errors;</div><div class='add'>+	u64			rx_oom_discards;</div><div class='add'>+	u64			rx_netpoll_discards;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_tx_sw_stats {</div><div class='add'>+	u64			tx_resets;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_cmn_sw_stats {</div><div class='add'>+	u64			missed_irqs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_sw_stats {</div><div class='add'>+	struct bnxt_rx_sw_stats rx;</div><div class='add'>+	struct bnxt_tx_sw_stats tx;</div><div class='add'>+	struct bnxt_cmn_sw_stats cmn;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_total_ring_err_stats {</div><div class='add'>+	u64			rx_total_l4_csum_errors;</div><div class='add'>+	u64			rx_total_resets;</div><div class='add'>+	u64			rx_total_buf_errors;</div><div class='add'>+	u64			rx_total_oom_discards;</div><div class='add'>+	u64			rx_total_netpoll_discards;</div><div class='add'>+	u64			rx_total_ring_discards;</div><div class='add'>+	u64			tx_total_resets;</div><div class='add'>+	u64			tx_total_ring_discards;</div><div class='add'>+	u64			total_missed_irqs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_stats_mem {</div><div class='add'>+	u64		*sw_stats;</div><div class='add'>+	u64		*hw_masks;</div><div class='add'>+	void		*hw_stats;</div><div class='add'>+	dma_addr_t	hw_stats_map;</div><div class='add'>+	int		len;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_cp_ring_info {</div><div class='hunk'>@@ -802,6 +1171,11 @@ struct bnxt_cp_ring_info {</div><div class='ctx'> </div><div class='ctx'> 	u8			had_work_done:1;</div><div class='ctx'> 	u8			has_more_work:1;</div><div class='add'>+	u8			had_nqe_notify:1;</div><div class='add'>+	u8			toggle;</div><div class='add'>+</div><div class='add'>+	u8			cp_ring_type;</div><div class='add'>+	u8			cp_idx;</div><div class='ctx'> </div><div class='ctx'> 	u32			last_cp_raw_cons;</div><div class='ctx'> </div><div class='hunk'>@@ -810,28 +1184,34 @@ struct bnxt_cp_ring_info {</div><div class='ctx'> 	u64			rx_bytes;</div><div class='ctx'> 	u64			event_ctr;</div><div class='ctx'> </div><div class='del'>-	struct net_dim		dim;</div><div class='add'>+	struct dim		dim;</div><div class='ctx'> </div><div class='ctx'> 	union {</div><div class='del'>-		struct tx_cmp	*cp_desc_ring[MAX_CP_PAGES];</div><div class='del'>-		struct nqe_cn	*nq_desc_ring[MAX_CP_PAGES];</div><div class='add'>+		struct tx_cmp	**cp_desc_ring;</div><div class='add'>+		struct nqe_cn	**nq_desc_ring;</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	dma_addr_t		cp_desc_mapping[MAX_CP_PAGES];</div><div class='add'>+	dma_addr_t		*cp_desc_mapping;</div><div class='ctx'> </div><div class='del'>-	struct ctx_hw_stats	*hw_stats;</div><div class='del'>-	dma_addr_t		hw_stats_map;</div><div class='add'>+	struct bnxt_stats_mem	stats;</div><div class='ctx'> 	u32			hw_stats_ctx_id;</div><div class='del'>-	u64			rx_l4_csum_errors;</div><div class='del'>-	u64			missed_irqs;</div><div class='add'>+</div><div class='add'>+	struct bnxt_sw_stats	*sw_stats;</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_ring_struct	cp_ring_struct;</div><div class='ctx'> </div><div class='del'>-	struct bnxt_cp_ring_info *cp_ring_arr[2];</div><div class='del'>-#define BNXT_RX_HDL	0</div><div class='del'>-#define BNXT_TX_HDL	1</div><div class='add'>+	int			cp_ring_count;</div><div class='add'>+	struct bnxt_cp_ring_info *cp_ring_arr;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_MAX_QUEUE		8</div><div class='add'>+#define BNXT_MAX_TXR_PER_NAPI	BNXT_MAX_QUEUE</div><div class='add'>+</div><div class='add'>+#define bnxt_for_each_napi_tx(iter, bnapi, txr)		\</div><div class='add'>+	for (iter = 0, txr = (bnapi)-&gt;tx_ring[0]; txr;	\</div><div class='add'>+	     txr = (iter &lt; BNXT_MAX_TXR_PER_NAPI - 1) ?	\</div><div class='add'>+	     (bnapi)-&gt;tx_ring[++iter] : NULL)</div><div class='add'>+</div><div class='ctx'> struct bnxt_napi {</div><div class='ctx'> 	struct napi_struct	napi;</div><div class='ctx'> 	struct bnxt		*bp;</div><div class='hunk'>@@ -839,12 +1219,12 @@ struct bnxt_napi {</div><div class='ctx'> 	int			index;</div><div class='ctx'> 	struct bnxt_cp_ring_info	cp_ring;</div><div class='ctx'> 	struct bnxt_rx_ring_info	*rx_ring;</div><div class='del'>-	struct bnxt_tx_ring_info	*tx_ring;</div><div class='add'>+	struct bnxt_tx_ring_info	*tx_ring[BNXT_MAX_TXR_PER_NAPI];</div><div class='ctx'> </div><div class='ctx'> 	void			(*tx_int)(struct bnxt *, struct bnxt_napi *,</div><div class='del'>-					  int);</div><div class='del'>-	int			tx_pkts;</div><div class='add'>+					  int budget);</div><div class='ctx'> 	u8			events;</div><div class='add'>+	u8			tx_fault:1;</div><div class='ctx'> </div><div class='ctx'> 	u32			flags;</div><div class='ctx'> #define BNXT_NAPI_FLAG_XDP	0x1</div><div class='hunk'>@@ -852,13 +1232,21 @@ struct bnxt_napi {</div><div class='ctx'> 	bool			in_reset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* "TxRx", 2 hypens, plus maximum integer */</div><div class='add'>+#define BNXT_IRQ_NAME_EXTRA	17</div><div class='add'>+</div><div class='ctx'> struct bnxt_irq {</div><div class='ctx'> 	irq_handler_t	handler;</div><div class='ctx'> 	unsigned int	vector;</div><div class='ctx'> 	u8		requested:1;</div><div class='ctx'> 	u8		have_cpumask:1;</div><div class='del'>-	char		name[IFNAMSIZ + 2];</div><div class='add'>+	char		name[IFNAMSIZ + BNXT_IRQ_NAME_EXTRA];</div><div class='ctx'> 	cpumask_var_t	cpu_mask;</div><div class='add'>+</div><div class='add'>+	struct bnxt	*bp;</div><div class='add'>+	int		msix_nr;</div><div class='add'>+	int		ring_nr;</div><div class='add'>+	struct irq_affinity_notify affinity_notify;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define HWRM_RING_ALLOC_TX	0x1</div><div class='hunk'>@@ -877,13 +1265,17 @@ struct bnxt_ring_grp_info {</div><div class='ctx'> 	u16	cp_fw_ring_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_VNIC_DEFAULT	0</div><div class='add'>+#define BNXT_VNIC_NTUPLE	1</div><div class='add'>+</div><div class='ctx'> struct bnxt_vnic_info {</div><div class='ctx'> 	u16		fw_vnic_id; /* returned by Chimp during alloc */</div><div class='ctx'> #define BNXT_MAX_CTX_PER_VNIC	8</div><div class='ctx'> 	u16		fw_rss_cos_lb_ctx[BNXT_MAX_CTX_PER_VNIC];</div><div class='ctx'> 	u16		fw_l2_ctx_id;</div><div class='add'>+	u16		mru;</div><div class='ctx'> #define BNXT_MAX_UC_ADDRS	4</div><div class='del'>-	__le64		fw_l2_filter_id[BNXT_MAX_UC_ADDRS];</div><div class='add'>+	struct bnxt_l2_filter *l2_filters[BNXT_MAX_UC_ADDRS];</div><div class='ctx'> 				/* index 0 always dev_addr */</div><div class='ctx'> 	u16		uc_filter_count;</div><div class='ctx'> 	u8		*uc_list;</div><div class='hunk'>@@ -893,6 +1285,15 @@ struct bnxt_vnic_info {</div><div class='ctx'> 	__le16		*rss_table;</div><div class='ctx'> 	dma_addr_t	rss_hash_key_dma_addr;</div><div class='ctx'> 	u64		*rss_hash_key;</div><div class='add'>+	int		rss_table_size;</div><div class='add'>+#define BNXT_RSS_TABLE_ENTRIES_P5	64</div><div class='add'>+#define BNXT_RSS_TABLE_SIZE_P5		(BNXT_RSS_TABLE_ENTRIES_P5 * 4)</div><div class='add'>+#define BNXT_RSS_TABLE_MAX_TBL_P5	8</div><div class='add'>+#define BNXT_MAX_RSS_TABLE_SIZE_P5				\</div><div class='add'>+	(BNXT_RSS_TABLE_SIZE_P5 * BNXT_RSS_TABLE_MAX_TBL_P5)</div><div class='add'>+#define BNXT_MAX_RSS_TABLE_ENTRIES_P5				\</div><div class='add'>+	(BNXT_RSS_TABLE_ENTRIES_P5 * BNXT_RSS_TABLE_MAX_TBL_P5)</div><div class='add'>+</div><div class='ctx'> 	u32		rx_mask;</div><div class='ctx'> </div><div class='ctx'> 	u8		*mc_list;</div><div class='hunk'>@@ -907,11 +1308,35 @@ struct bnxt_vnic_info {</div><div class='ctx'> #define BNXT_VNIC_MCAST_FLAG	4</div><div class='ctx'> #define BNXT_VNIC_UCAST_FLAG	8</div><div class='ctx'> #define BNXT_VNIC_RFS_NEW_RSS_FLAG	0x10</div><div class='add'>+#define BNXT_VNIC_NTUPLE_FLAG		0x20</div><div class='add'>+#define BNXT_VNIC_RSSCTX_FLAG		0x40</div><div class='add'>+	struct ethtool_rxfh_context *rss_ctx;</div><div class='add'>+	u32		vnic_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_rss_ctx {</div><div class='add'>+	struct bnxt_vnic_info vnic;</div><div class='add'>+	u8	index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_MAX_ETH_RSS_CTX	32</div><div class='add'>+#define BNXT_VNIC_ID_INVALID	0xffffffff</div><div class='add'>+</div><div class='add'>+struct bnxt_hw_rings {</div><div class='add'>+	int tx;</div><div class='add'>+	int rx;</div><div class='add'>+	int grp;</div><div class='add'>+	int cp;</div><div class='add'>+	int cp_p5;</div><div class='add'>+	int stat;</div><div class='add'>+	int vnic;</div><div class='add'>+	int rss_ctx;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_hw_resc {</div><div class='ctx'> 	u16	min_rsscos_ctxs;</div><div class='ctx'> 	u16	max_rsscos_ctxs;</div><div class='add'>+	u16	resv_rsscos_ctxs;</div><div class='ctx'> 	u16	min_cp_rings;</div><div class='ctx'> 	u16	max_cp_rings;</div><div class='ctx'> 	u16	resv_cp_rings;</div><div class='hunk'>@@ -936,6 +1361,12 @@ struct bnxt_hw_resc {</div><div class='ctx'> 	u16	max_nqs;</div><div class='ctx'> 	u16	max_irqs;</div><div class='ctx'> 	u16	resv_irqs;</div><div class='add'>+	u32	max_encap_records;</div><div class='add'>+	u32	max_decap_records;</div><div class='add'>+	u32	max_tx_em_flows;</div><div class='add'>+	u32	max_tx_wm_flows;</div><div class='add'>+	u32	max_rx_em_flows;</div><div class='add'>+	u32	max_rx_wm_flows;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #if defined(CONFIG_BNXT_SRIOV)</div><div class='hunk'>@@ -948,12 +1379,10 @@ struct bnxt_vf_info {</div><div class='ctx'> 	u16	vlan;</div><div class='ctx'> 	u16	func_qcfg_flags;</div><div class='ctx'> 	u32	flags;</div><div class='del'>-#define BNXT_VF_QOS		0x1</div><div class='ctx'> #define BNXT_VF_SPOOFCHK	0x2</div><div class='ctx'> #define BNXT_VF_LINK_FORCED	0x4</div><div class='ctx'> #define BNXT_VF_LINK_UP		0x8</div><div class='ctx'> #define BNXT_VF_TRUST		0x10</div><div class='del'>-	u32	func_flags; /* func cfg flags */</div><div class='ctx'> 	u32	min_tx_rate;</div><div class='ctx'> 	u32	max_tx_rate;</div><div class='ctx'> 	void	*hwrm_cmd_req_addr;</div><div class='hunk'>@@ -969,13 +1398,8 @@ struct bnxt_pf_info {</div><div class='ctx'> 	u8	mac_addr[ETH_ALEN];</div><div class='ctx'> 	u32	first_vf_id;</div><div class='ctx'> 	u16	active_vfs;</div><div class='add'>+	u16	registered_vfs;</div><div class='ctx'> 	u16	max_vfs;</div><div class='del'>-	u32	max_encap_records;</div><div class='del'>-	u32	max_decap_records;</div><div class='del'>-	u32	max_tx_em_flows;</div><div class='del'>-	u32	max_tx_wm_flows;</div><div class='del'>-	u32	max_rx_em_flows;</div><div class='del'>-	u32	max_rx_wm_flows;</div><div class='ctx'> 	unsigned long	*vf_event_bmap;</div><div class='ctx'> 	u16	hwrm_cmd_req_pages;</div><div class='ctx'> 	u8	vf_resv_strategy;</div><div class='hunk'>@@ -987,19 +1411,127 @@ struct bnxt_pf_info {</div><div class='ctx'> 	struct bnxt_vf_info	*vf;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct bnxt_ntuple_filter {</div><div class='add'>+struct bnxt_filter_base {</div><div class='ctx'> 	struct hlist_node	hash;</div><div class='del'>-	u8			dst_mac_addr[ETH_ALEN];</div><div class='del'>-	u8			src_mac_addr[ETH_ALEN];</div><div class='del'>-	struct flow_keys	fkeys;</div><div class='add'>+	struct list_head	list;</div><div class='ctx'> 	__le64			filter_id;</div><div class='add'>+	u8			type;</div><div class='add'>+#define BNXT_FLTR_TYPE_NTUPLE	1</div><div class='add'>+#define BNXT_FLTR_TYPE_L2	2</div><div class='add'>+	u8			flags;</div><div class='add'>+#define BNXT_ACT_DROP		1</div><div class='add'>+#define BNXT_ACT_RING_DST	2</div><div class='add'>+#define BNXT_ACT_FUNC_DST	4</div><div class='add'>+#define BNXT_ACT_NO_AGING	8</div><div class='add'>+#define BNXT_ACT_RSS_CTX	0x10</div><div class='ctx'> 	u16			sw_id;</div><div class='del'>-	u8			l2_fltr_idx;</div><div class='ctx'> 	u16			rxq;</div><div class='del'>-	u32			flow_id;</div><div class='add'>+	u16			fw_vnic_id;</div><div class='add'>+	u16			vf_idx;</div><div class='ctx'> 	unsigned long		state;</div><div class='ctx'> #define BNXT_FLTR_VALID		0</div><div class='del'>-#define BNXT_FLTR_UPDATE	1</div><div class='add'>+#define BNXT_FLTR_INSERTED	1</div><div class='add'>+#define BNXT_FLTR_FW_DELETED	2</div><div class='add'>+</div><div class='add'>+	struct rcu_head         rcu;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_flow_masks {</div><div class='add'>+	struct flow_dissector_key_ports ports;</div><div class='add'>+	struct flow_dissector_key_addrs addrs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct bnxt_flow_masks BNXT_FLOW_MASK_NONE;</div><div class='add'>+extern const struct bnxt_flow_masks BNXT_FLOW_IPV6_MASK_ALL;</div><div class='add'>+extern const struct bnxt_flow_masks BNXT_FLOW_IPV4_MASK_ALL;</div><div class='add'>+</div><div class='add'>+struct bnxt_ntuple_filter {</div><div class='add'>+	/* base filter must be the first member */</div><div class='add'>+	struct bnxt_filter_base	base;</div><div class='add'>+	struct flow_keys	fkeys;</div><div class='add'>+	struct bnxt_flow_masks	fmasks;</div><div class='add'>+	struct bnxt_l2_filter	*l2_fltr;</div><div class='add'>+	u32			flow_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_l2_key {</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u8	dst_mac_addr[ETH_ALEN];</div><div class='add'>+			u16	vlan;</div><div class='add'>+		};</div><div class='add'>+		u32	filter_key;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_ipv4_tuple {</div><div class='add'>+	struct flow_dissector_key_ipv4_addrs v4addrs;</div><div class='add'>+	struct flow_dissector_key_ports ports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_ipv6_tuple {</div><div class='add'>+	struct flow_dissector_key_ipv6_addrs v6addrs;</div><div class='add'>+	struct flow_dissector_key_ports ports;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_L2_KEY_SIZE	(sizeof(struct bnxt_l2_key) / 4)</div><div class='add'>+</div><div class='add'>+struct bnxt_l2_filter {</div><div class='add'>+	/* base filter must be the first member */</div><div class='add'>+	struct bnxt_filter_base	base;</div><div class='add'>+	struct bnxt_l2_key	l2_key;</div><div class='add'>+	atomic_t		refcnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Compat version of hwrm_port_phy_qcfg_output capped at 96 bytes.  The</div><div class='add'>+ * first 95 bytes are identical to hwrm_port_phy_qcfg_output in bnxt_hsi.h.</div><div class='add'>+ * The last valid byte in the compat version is different.</div><div class='add'>+ */</div><div class='add'>+struct hwrm_port_phy_qcfg_output_compat {</div><div class='add'>+	__le16	error_code;</div><div class='add'>+	__le16	req_type;</div><div class='add'>+	__le16	seq_id;</div><div class='add'>+	__le16	resp_len;</div><div class='add'>+	u8	link;</div><div class='add'>+	u8	active_fec_signal_mode;</div><div class='add'>+	__le16	link_speed;</div><div class='add'>+	u8	duplex_cfg;</div><div class='add'>+	u8	pause;</div><div class='add'>+	__le16	support_speeds;</div><div class='add'>+	__le16	force_link_speed;</div><div class='add'>+	u8	auto_mode;</div><div class='add'>+	u8	auto_pause;</div><div class='add'>+	__le16	auto_link_speed;</div><div class='add'>+	__le16	auto_link_speed_mask;</div><div class='add'>+	u8	wirespeed;</div><div class='add'>+	u8	lpbk;</div><div class='add'>+	u8	force_pause;</div><div class='add'>+	u8	module_status;</div><div class='add'>+	__le32	preemphasis;</div><div class='add'>+	u8	phy_maj;</div><div class='add'>+	u8	phy_min;</div><div class='add'>+	u8	phy_bld;</div><div class='add'>+	u8	phy_type;</div><div class='add'>+	u8	media_type;</div><div class='add'>+	u8	xcvr_pkg_type;</div><div class='add'>+	u8	eee_config_phy_addr;</div><div class='add'>+	u8	parallel_detect;</div><div class='add'>+	__le16	link_partner_adv_speeds;</div><div class='add'>+	u8	link_partner_adv_auto_mode;</div><div class='add'>+	u8	link_partner_adv_pause;</div><div class='add'>+	__le16	adv_eee_link_speed_mask;</div><div class='add'>+	__le16	link_partner_adv_eee_link_speed_mask;</div><div class='add'>+	__le32	xcvr_identifier_type_tx_lpi_timer;</div><div class='add'>+	__le16	fec_cfg;</div><div class='add'>+	u8	duplex_state;</div><div class='add'>+	u8	option_flags;</div><div class='add'>+	char	phy_vendor_name[16];</div><div class='add'>+	char	phy_vendor_partnumber[16];</div><div class='add'>+	__le16	support_pam4_speeds;</div><div class='add'>+	__le16	force_pam4_link_speed;</div><div class='add'>+	__le16	auto_pam4_link_speed_mask;</div><div class='add'>+	u8	link_partner_pam4_adv_speeds;</div><div class='add'>+	u8	valid;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_link_info {</div><div class='hunk'>@@ -1012,8 +1544,16 @@ struct bnxt_link_info {</div><div class='ctx'> #define BNXT_LINK_SIGNAL	PORT_PHY_QCFG_RESP_LINK_SIGNAL</div><div class='ctx'> #define BNXT_LINK_LINK		PORT_PHY_QCFG_RESP_LINK_LINK</div><div class='ctx'> 	u8			wire_speed;</div><div class='del'>-	u8			loop_back;</div><div class='del'>-	u8			link_up;</div><div class='add'>+	u8			phy_state;</div><div class='add'>+#define BNXT_PHY_STATE_ENABLED		0</div><div class='add'>+#define BNXT_PHY_STATE_DISABLED		1</div><div class='add'>+</div><div class='add'>+	u8			link_state;</div><div class='add'>+#define BNXT_LINK_STATE_UNKNOWN	0</div><div class='add'>+#define BNXT_LINK_STATE_DOWN	1</div><div class='add'>+#define BNXT_LINK_STATE_UP	2</div><div class='add'>+#define BNXT_LINK_IS_UP(bp)	((bp)-&gt;link_info.link_state == BNXT_LINK_STATE_UP)</div><div class='add'>+	u8			active_lanes;</div><div class='ctx'> 	u8			duplex;</div><div class='ctx'> #define BNXT_LINK_DUPLEX_HALF	PORT_PHY_QCFG_RESP_DUPLEX_STATE_HALF</div><div class='ctx'> #define BNXT_LINK_DUPLEX_FULL	PORT_PHY_QCFG_RESP_DUPLEX_STATE_FULL</div><div class='hunk'>@@ -1047,7 +1587,12 @@ struct bnxt_link_info {</div><div class='ctx'> #define BNXT_LINK_SPEED_40GB	PORT_PHY_QCFG_RESP_LINK_SPEED_40GB</div><div class='ctx'> #define BNXT_LINK_SPEED_50GB	PORT_PHY_QCFG_RESP_LINK_SPEED_50GB</div><div class='ctx'> #define BNXT_LINK_SPEED_100GB	PORT_PHY_QCFG_RESP_LINK_SPEED_100GB</div><div class='add'>+#define BNXT_LINK_SPEED_200GB	PORT_PHY_QCFG_RESP_LINK_SPEED_200GB</div><div class='add'>+#define BNXT_LINK_SPEED_400GB	PORT_PHY_QCFG_RESP_LINK_SPEED_400GB</div><div class='ctx'> 	u16			support_speeds;</div><div class='add'>+	u16			support_pam4_speeds;</div><div class='add'>+	u16			support_speeds2;</div><div class='add'>+</div><div class='ctx'> 	u16			auto_link_speeds;	/* fw adv setting */</div><div class='ctx'> #define BNXT_LINK_SPEED_MSK_100MB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100MB</div><div class='ctx'> #define BNXT_LINK_SPEED_MSK_1GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_1GB</div><div class='hunk'>@@ -1059,24 +1604,93 @@ struct bnxt_link_info {</div><div class='ctx'> #define BNXT_LINK_SPEED_MSK_40GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_40GB</div><div class='ctx'> #define BNXT_LINK_SPEED_MSK_50GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_50GB</div><div class='ctx'> #define BNXT_LINK_SPEED_MSK_100GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100GB</div><div class='add'>+	u16			auto_pam4_link_speeds;</div><div class='add'>+#define BNXT_LINK_PAM4_SPEED_MSK_50GB PORT_PHY_QCFG_RESP_SUPPORT_PAM4_SPEEDS_50G</div><div class='add'>+#define BNXT_LINK_PAM4_SPEED_MSK_100GB PORT_PHY_QCFG_RESP_SUPPORT_PAM4_SPEEDS_100G</div><div class='add'>+#define BNXT_LINK_PAM4_SPEED_MSK_200GB PORT_PHY_QCFG_RESP_SUPPORT_PAM4_SPEEDS_200G</div><div class='add'>+	u16			auto_link_speeds2;</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_1GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_1GB</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_10GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_10GB</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_25GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_25GB</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_40GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_40GB</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_50GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_50GB</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_100GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_100GB</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_50GB_PAM4	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_50GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_100GB_PAM4	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_100GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_200GB_PAM4	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_200GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_400GB_PAM4	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_400GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_100GB_PAM4_112	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_100GB_PAM4_112</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_200GB_PAM4_112	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_200GB_PAM4_112</div><div class='add'>+#define BNXT_LINK_SPEEDS2_MSK_400GB_PAM4_112	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS2_400GB_PAM4_112</div><div class='add'>+</div><div class='ctx'> 	u16			support_auto_speeds;</div><div class='add'>+	u16			support_pam4_auto_speeds;</div><div class='add'>+	u16			support_auto_speeds2;</div><div class='add'>+</div><div class='ctx'> 	u16			lp_auto_link_speeds;</div><div class='add'>+	u16			lp_auto_pam4_link_speeds;</div><div class='ctx'> 	u16			force_link_speed;</div><div class='add'>+	u16			force_pam4_link_speed;</div><div class='add'>+	u16			force_link_speed2;</div><div class='add'>+#define BNXT_LINK_SPEED_50GB_PAM4	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_50GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEED_100GB_PAM4	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_100GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEED_200GB_PAM4	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_200GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEED_400GB_PAM4	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_400GB_PAM4_56</div><div class='add'>+#define BNXT_LINK_SPEED_100GB_PAM4_112	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_100GB_PAM4_112</div><div class='add'>+#define BNXT_LINK_SPEED_200GB_PAM4_112	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_200GB_PAM4_112</div><div class='add'>+#define BNXT_LINK_SPEED_400GB_PAM4_112	\</div><div class='add'>+	PORT_PHY_CFG_REQ_FORCE_LINK_SPEEDS2_400GB_PAM4_112</div><div class='add'>+</div><div class='ctx'> 	u32			preemphasis;</div><div class='ctx'> 	u8			module_status;</div><div class='add'>+	u8			active_fec_sig_mode;</div><div class='ctx'> 	u16			fec_cfg;</div><div class='add'>+#define BNXT_FEC_NONE		PORT_PHY_QCFG_RESP_FEC_CFG_FEC_NONE_SUPPORTED</div><div class='add'>+#define BNXT_FEC_AUTONEG_CAP	PORT_PHY_QCFG_RESP_FEC_CFG_FEC_AUTONEG_SUPPORTED</div><div class='ctx'> #define BNXT_FEC_AUTONEG	PORT_PHY_QCFG_RESP_FEC_CFG_FEC_AUTONEG_ENABLED</div><div class='add'>+#define BNXT_FEC_ENC_BASE_R_CAP	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE74_SUPPORTED</div><div class='ctx'> #define BNXT_FEC_ENC_BASE_R	PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE74_ENABLED</div><div class='del'>-#define BNXT_FEC_ENC_RS		PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_ENABLED</div><div class='add'>+#define BNXT_FEC_ENC_RS_CAP	\</div><div class='add'>+	PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_SUPPORTED</div><div class='add'>+#define BNXT_FEC_ENC_LLRS_CAP	\</div><div class='add'>+	(PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_1XN_SUPPORTED |	\</div><div class='add'>+	 PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_IEEE_SUPPORTED)</div><div class='add'>+#define BNXT_FEC_ENC_RS		\</div><div class='add'>+	(PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_ENABLED |	\</div><div class='add'>+	 PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS544_1XN_ENABLED |	\</div><div class='add'>+	 PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS544_IEEE_ENABLED)</div><div class='add'>+#define BNXT_FEC_ENC_LLRS	\</div><div class='add'>+	(PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_1XN_ENABLED |	\</div><div class='add'>+	 PORT_PHY_QCFG_RESP_FEC_CFG_FEC_RS272_IEEE_ENABLED)</div><div class='ctx'> </div><div class='ctx'> 	/* copy of requested setting from ethtool cmd */</div><div class='ctx'> 	u8			autoneg;</div><div class='ctx'> #define BNXT_AUTONEG_SPEED		1</div><div class='ctx'> #define BNXT_AUTONEG_FLOW_CTRL		2</div><div class='add'>+	u8			req_signal_mode;</div><div class='add'>+#define BNXT_SIG_MODE_NRZ	PORT_PHY_QCFG_RESP_SIGNAL_MODE_NRZ</div><div class='add'>+#define BNXT_SIG_MODE_PAM4	PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4</div><div class='add'>+#define BNXT_SIG_MODE_PAM4_112	PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4_112</div><div class='add'>+#define BNXT_SIG_MODE_MAX	(PORT_PHY_QCFG_RESP_SIGNAL_MODE_LAST + 1)</div><div class='ctx'> 	u8			req_duplex;</div><div class='ctx'> 	u8			req_flow_ctrl;</div><div class='ctx'> 	u16			req_link_speed;</div><div class='ctx'> 	u16			advertising;	/* user adv setting */</div><div class='add'>+	u16			advertising_pam4;</div><div class='ctx'> 	bool			force_link_chng;</div><div class='ctx'> </div><div class='ctx'> 	bool			phy_retry;</div><div class='hunk'>@@ -1088,7 +1702,48 @@ struct bnxt_link_info {</div><div class='ctx'> 	struct hwrm_port_phy_qcfg_output phy_qcfg_resp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define BNXT_MAX_QUEUE	8</div><div class='add'>+#define BNXT_FEC_RS544_ON					\</div><div class='add'>+	 (PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_1XN_ENABLE |		\</div><div class='add'>+	  PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_IEEE_ENABLE)</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_RS544_OFF					\</div><div class='add'>+	 (PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_1XN_DISABLE |	\</div><div class='add'>+	  PORT_PHY_CFG_REQ_FLAGS_FEC_RS544_IEEE_DISABLE)</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_RS272_ON					\</div><div class='add'>+	 (PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_1XN_ENABLE |		\</div><div class='add'>+	  PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_IEEE_ENABLE)</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_RS272_OFF					\</div><div class='add'>+	 (PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_1XN_DISABLE |	\</div><div class='add'>+	  PORT_PHY_CFG_REQ_FLAGS_FEC_RS272_IEEE_DISABLE)</div><div class='add'>+</div><div class='add'>+#define BNXT_PAM4_SUPPORTED(link_info)				\</div><div class='add'>+	((link_info)-&gt;support_pam4_speeds)</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_RS_ON(link_info)				\</div><div class='add'>+	(PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_ENABLE |		\</div><div class='add'>+	 PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE |		\</div><div class='add'>+	 (BNXT_PAM4_SUPPORTED(link_info) ?			\</div><div class='add'>+	  (BNXT_FEC_RS544_ON | BNXT_FEC_RS272_OFF) : 0))</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_LLRS_ON					\</div><div class='add'>+	(PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_ENABLE |		\</div><div class='add'>+	 PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE |		\</div><div class='add'>+	 BNXT_FEC_RS272_ON | BNXT_FEC_RS544_OFF)</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_RS_OFF(link_info)				\</div><div class='add'>+	(PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_DISABLE |		\</div><div class='add'>+	 (BNXT_PAM4_SUPPORTED(link_info) ?			\</div><div class='add'>+	  (BNXT_FEC_RS544_OFF | BNXT_FEC_RS272_OFF) : 0))</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_BASE_R_ON(link_info)				\</div><div class='add'>+	(PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_ENABLE |		\</div><div class='add'>+	 BNXT_FEC_RS_OFF(link_info))</div><div class='add'>+</div><div class='add'>+#define BNXT_FEC_ALL_OFF(link_info)				\</div><div class='add'>+	(PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE |		\</div><div class='add'>+	 BNXT_FEC_RS_OFF(link_info))</div><div class='ctx'> </div><div class='ctx'> struct bnxt_queue_info {</div><div class='ctx'> 	u8	queue_id;</div><div class='hunk'>@@ -1113,26 +1768,44 @@ struct bnxt_led_info {</div><div class='ctx'> </div><div class='ctx'> struct bnxt_test_info {</div><div class='ctx'> 	u8 offline_mask;</div><div class='del'>-	u8 flags;</div><div class='del'>-#define BNXT_TEST_FL_EXT_LPBK	0x1</div><div class='ctx'> 	u16 timeout;</div><div class='ctx'> 	char string[BNXT_MAX_TEST][ETH_GSTRING_LEN];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CHIMP_REG_VIEW_ADDR				\</div><div class='add'>+	((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) ? 0x80000000 : 0xb1000000)</div><div class='add'>+</div><div class='ctx'> #define BNXT_GRCPF_REG_CHIMP_COMM		0x0</div><div class='ctx'> #define BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER	0x100</div><div class='ctx'> #define BNXT_GRCPF_REG_WINDOW_BASE_OUT		0x400</div><div class='del'>-#define BNXT_CAG_REG_LEGACY_INT_STATUS		0x4014</div><div class='del'>-#define BNXT_CAG_REG_BASE			0x300000</div><div class='add'>+</div><div class='add'>+#define BNXT_GRC_REG_STATUS_P5			0x520</div><div class='ctx'> </div><div class='ctx'> #define BNXT_GRCPF_REG_KONG_COMM		0xA00</div><div class='ctx'> #define BNXT_GRCPF_REG_KONG_COMM_TRIGGER	0xB00</div><div class='ctx'> </div><div class='add'>+#define BNXT_GRC_REG_CHIP_NUM			0x48</div><div class='add'>+#define BNXT_GRC_REG_BASE			0x260000</div><div class='add'>+</div><div class='add'>+#define BNXT_TS_REG_TIMESYNC_TS0_LOWER		0x640180c</div><div class='add'>+#define BNXT_TS_REG_TIMESYNC_TS0_UPPER		0x6401810</div><div class='add'>+</div><div class='add'>+#define BNXT_GRC_BASE_MASK			0xfffff000</div><div class='add'>+#define BNXT_GRC_OFFSET_MASK			0x00000ffc</div><div class='add'>+</div><div class='ctx'> struct bnxt_tc_flow_stats {</div><div class='ctx'> 	u64		packets;</div><div class='ctx'> 	u64		bytes;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_BNXT_FLOWER_OFFLOAD</div><div class='add'>+struct bnxt_flower_indr_block_cb_priv {</div><div class='add'>+	struct net_device *tunnel_netdev;</div><div class='add'>+	struct bnxt *bp;</div><div class='add'>+	struct list_head list;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> struct bnxt_tc_info {</div><div class='ctx'> 	bool				enabled;</div><div class='ctx'> </div><div class='hunk'>@@ -1195,6 +1868,8 @@ struct bnxt_vf_rep {</div><div class='ctx'> </div><div class='ctx'> #define MAX_CTX_PAGES	(BNXT_PAGE_SIZE / 8)</div><div class='ctx'> #define MAX_CTX_TOTAL_PAGES	(MAX_CTX_PAGES * MAX_CTX_PAGES)</div><div class='add'>+#define MAX_CTX_BYTES		((size_t)MAX_CTX_TOTAL_PAGES * BNXT_PAGE_SIZE)</div><div class='add'>+#define MAX_CTX_BYTES_MASK	(MAX_CTX_BYTES - 1)</div><div class='ctx'> </div><div class='ctx'> struct bnxt_ctx_pg_info {</div><div class='ctx'> 	u32		entries;</div><div class='hunk'>@@ -1205,45 +1880,282 @@ struct bnxt_ctx_pg_info {</div><div class='ctx'> 	struct bnxt_ctx_pg_info **ctx_pg_tbl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_MAX_TQM_SP_RINGS		1</div><div class='add'>+#define BNXT_MAX_TQM_FP_RINGS		8</div><div class='add'>+#define BNXT_MAX_TQM_RINGS		\</div><div class='add'>+	(BNXT_MAX_TQM_SP_RINGS + BNXT_MAX_TQM_FP_RINGS)</div><div class='add'>+</div><div class='add'>+#define BNXT_BACKING_STORE_CFG_LEGACY_LEN	256</div><div class='add'>+</div><div class='add'>+#define BNXT_SET_CTX_PAGE_ATTR(attr)					\</div><div class='add'>+do {									\</div><div class='add'>+	if (BNXT_PAGE_SIZE == 0x2000)					\</div><div class='add'>+		attr = FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8K;	\</div><div class='add'>+	else if (BNXT_PAGE_SIZE == 0x10000)				\</div><div class='add'>+		attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_64K;	\</div><div class='add'>+	else								\</div><div class='add'>+		attr = FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_4K;	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+struct bnxt_ctx_mem_type {</div><div class='add'>+	u16	type;</div><div class='add'>+	u16	entry_size;</div><div class='add'>+	u32	flags;</div><div class='add'>+#define BNXT_CTX_MEM_TYPE_VALID FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_TYPE_VALID</div><div class='add'>+#define BNXT_CTX_MEM_FW_TRACE		\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_FW_DBG_TRACE</div><div class='add'>+#define BNXT_CTX_MEM_FW_BIN_TRACE	\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_FW_BIN_DBG_TRACE</div><div class='add'>+#define BNXT_CTX_MEM_PERSIST		\</div><div class='add'>+	FUNC_BACKING_STORE_QCAPS_V2_RESP_FLAGS_NEXT_BS_OFFSET</div><div class='add'>+</div><div class='add'>+	u32	instance_bmap;</div><div class='add'>+	u8	init_value;</div><div class='add'>+	u8	entry_multiple;</div><div class='add'>+	u16	init_offset;</div><div class='add'>+#define	BNXT_CTX_INIT_INVALID_OFFSET	0xffff</div><div class='add'>+	u32	max_entries;</div><div class='add'>+	u32	min_entries;</div><div class='add'>+	u8	last:1;</div><div class='add'>+	u8	mem_valid:1;</div><div class='add'>+	u8	split_entry_cnt;</div><div class='add'>+#define BNXT_MAX_SPLIT_ENTRY	4</div><div class='add'>+	union {</div><div class='add'>+		struct {</div><div class='add'>+			u32	qp_l2_entries;</div><div class='add'>+			u32	qp_qp1_entries;</div><div class='add'>+			u32	qp_fast_qpmd_entries;</div><div class='add'>+		};</div><div class='add'>+		u32	srq_l2_entries;</div><div class='add'>+		u32	cq_l2_entries;</div><div class='add'>+		u32	vnic_entries;</div><div class='add'>+		struct {</div><div class='add'>+			u32	mrav_av_entries;</div><div class='add'>+			u32	mrav_num_entries_units;</div><div class='add'>+		};</div><div class='add'>+		u32	split[BNXT_MAX_SPLIT_ENTRY];</div><div class='add'>+	};</div><div class='add'>+	struct bnxt_ctx_pg_info	*pg_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_MRAV_AV_SPLIT_ENTRY	0</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_QP	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_QP</div><div class='add'>+#define BNXT_CTX_SRQ	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRQ</div><div class='add'>+#define BNXT_CTX_CQ	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CQ</div><div class='add'>+#define BNXT_CTX_VNIC	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_VNIC</div><div class='add'>+#define BNXT_CTX_STAT	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_STAT</div><div class='add'>+#define BNXT_CTX_STQM	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SP_TQM_RING</div><div class='add'>+#define BNXT_CTX_FTQM	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_FP_TQM_RING</div><div class='add'>+#define BNXT_CTX_MRAV	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_MRAV</div><div class='add'>+#define BNXT_CTX_TIM	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TIM</div><div class='add'>+#define BNXT_CTX_TCK	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TX_CK</div><div class='add'>+#define BNXT_CTX_RCK	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RX_CK</div><div class='add'>+#define BNXT_CTX_MTQM	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_MP_TQM_RING</div><div class='add'>+#define BNXT_CTX_SQDBS	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SQ_DB_SHADOW</div><div class='add'>+#define BNXT_CTX_RQDBS	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RQ_DB_SHADOW</div><div class='add'>+#define BNXT_CTX_SRQDBS	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRQ_DB_SHADOW</div><div class='add'>+#define BNXT_CTX_CQDBS	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CQ_DB_SHADOW</div><div class='add'>+#define BNXT_CTX_TBLSC	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_TBL_SCOPE</div><div class='add'>+#define BNXT_CTX_XPAR	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_XID_PARTITION</div><div class='add'>+#define BNXT_CTX_SRT	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRT_TRACE</div><div class='add'>+#define BNXT_CTX_SRT2	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_SRT2_TRACE</div><div class='add'>+#define BNXT_CTX_CRT	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CRT_TRACE</div><div class='add'>+#define BNXT_CTX_CRT2	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CRT2_TRACE</div><div class='add'>+#define BNXT_CTX_RIGP0	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RIGP0_TRACE</div><div class='add'>+#define BNXT_CTX_L2HWRM	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_L2_HWRM_TRACE</div><div class='add'>+#define BNXT_CTX_REHWRM	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ROCE_HWRM_TRACE</div><div class='add'>+#define BNXT_CTX_CA0	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA0_TRACE</div><div class='add'>+#define BNXT_CTX_CA1	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA1_TRACE</div><div class='add'>+#define BNXT_CTX_CA2	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_CA2_TRACE</div><div class='add'>+#define BNXT_CTX_RIGP1	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_RIGP1_TRACE</div><div class='add'>+#define BNXT_CTX_KONG	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_AFM_KONG_HWRM_TRACE</div><div class='add'>+#define BNXT_CTX_QPC	FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_ERR_QPC_TRACE</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_MAX	(BNXT_CTX_TIM + 1)</div><div class='add'>+#define BNXT_CTX_L2_MAX	(BNXT_CTX_FTQM + 1)</div><div class='add'>+#define BNXT_CTX_V2_MAX (BNXT_CTX_QPC + 1)</div><div class='add'>+#define BNXT_CTX_INV	((u16)-1)</div><div class='add'>+</div><div class='ctx'> struct bnxt_ctx_mem_info {</div><div class='del'>-	u32	qp_max_entries;</div><div class='del'>-	u16	qp_min_qp1_entries;</div><div class='del'>-	u16	qp_max_l2_entries;</div><div class='del'>-	u16	qp_entry_size;</div><div class='del'>-	u16	srq_max_l2_entries;</div><div class='del'>-	u32	srq_max_entries;</div><div class='del'>-	u16	srq_entry_size;</div><div class='del'>-	u16	cq_max_l2_entries;</div><div class='del'>-	u32	cq_max_entries;</div><div class='del'>-	u16	cq_entry_size;</div><div class='del'>-	u16	vnic_max_vnic_entries;</div><div class='del'>-	u16	vnic_max_ring_table_entries;</div><div class='del'>-	u16	vnic_entry_size;</div><div class='del'>-	u32	stat_max_entries;</div><div class='del'>-	u16	stat_entry_size;</div><div class='del'>-	u16	tqm_entry_size;</div><div class='del'>-	u32	tqm_min_entries_per_ring;</div><div class='del'>-	u32	tqm_max_entries_per_ring;</div><div class='del'>-	u32	mrav_max_entries;</div><div class='del'>-	u16	mrav_entry_size;</div><div class='del'>-	u16	tim_entry_size;</div><div class='del'>-	u32	tim_max_entries;</div><div class='del'>-	u16	mrav_num_entries_units;</div><div class='del'>-	u8	tqm_entries_multiple;</div><div class='add'>+	u8	tqm_fp_rings_count;</div><div class='ctx'> </div><div class='ctx'> 	u32	flags;</div><div class='ctx'> 	#define BNXT_CTX_FLAG_INITED	0x01</div><div class='add'>+	struct bnxt_ctx_mem_type	ctx_arr[BNXT_CTX_V2_MAX];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnxt_health_severity {</div><div class='add'>+	SEVERITY_NORMAL = 0,</div><div class='add'>+	SEVERITY_WARNING,</div><div class='add'>+	SEVERITY_RECOVERABLE,</div><div class='add'>+	SEVERITY_FATAL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnxt_health_remedy {</div><div class='add'>+	REMEDY_DEVLINK_RECOVER,</div><div class='add'>+	REMEDY_POWER_CYCLE_DEVICE,</div><div class='add'>+	REMEDY_POWER_CYCLE_HOST,</div><div class='add'>+	REMEDY_FW_UPDATE,</div><div class='add'>+	REMEDY_HW_REPLACE,</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	struct bnxt_ctx_pg_info qp_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info srq_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info cq_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info vnic_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info stat_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info mrav_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info tim_mem;</div><div class='del'>-	struct bnxt_ctx_pg_info *tqm_mem[9];</div><div class='add'>+struct bnxt_fw_health {</div><div class='add'>+	u32 flags;</div><div class='add'>+	u32 polling_dsecs;</div><div class='add'>+	u32 master_func_wait_dsecs;</div><div class='add'>+	u32 normal_func_wait_dsecs;</div><div class='add'>+	u32 post_reset_wait_dsecs;</div><div class='add'>+	u32 post_reset_max_wait_dsecs;</div><div class='add'>+	u32 regs[4];</div><div class='add'>+	u32 mapped_regs[4];</div><div class='add'>+#define BNXT_FW_HEALTH_REG		0</div><div class='add'>+#define BNXT_FW_HEARTBEAT_REG		1</div><div class='add'>+#define BNXT_FW_RESET_CNT_REG		2</div><div class='add'>+#define BNXT_FW_RESET_INPROG_REG	3</div><div class='add'>+	u32 fw_reset_inprog_reg_mask;</div><div class='add'>+	u32 last_fw_heartbeat;</div><div class='add'>+	u32 last_fw_reset_cnt;</div><div class='add'>+	u8 enabled:1;</div><div class='add'>+	u8 primary:1;</div><div class='add'>+	u8 status_reliable:1;</div><div class='add'>+	u8 resets_reliable:1;</div><div class='add'>+	u8 tmr_multiplier;</div><div class='add'>+	u8 tmr_counter;</div><div class='add'>+	u8 fw_reset_seq_cnt;</div><div class='add'>+	u32 fw_reset_seq_regs[16];</div><div class='add'>+	u32 fw_reset_seq_vals[16];</div><div class='add'>+	u32 fw_reset_seq_delay_msec[16];</div><div class='add'>+	u32 echo_req_data1;</div><div class='add'>+	u32 echo_req_data2;</div><div class='add'>+	struct devlink_health_reporter	*fw_reporter;</div><div class='add'>+	/* Protects severity and remedy */</div><div class='add'>+	struct mutex lock;</div><div class='add'>+	enum bnxt_health_severity severity;</div><div class='add'>+	enum bnxt_health_remedy remedy;</div><div class='add'>+	u32 arrests;</div><div class='add'>+	u32 discoveries;</div><div class='add'>+	u32 survivals;</div><div class='add'>+	u32 fatalities;</div><div class='add'>+	u32 diagnoses;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_FW_HEALTH_REG_TYPE_MASK	3</div><div class='add'>+#define BNXT_FW_HEALTH_REG_TYPE_CFG	0</div><div class='add'>+#define BNXT_FW_HEALTH_REG_TYPE_GRC	1</div><div class='add'>+#define BNXT_FW_HEALTH_REG_TYPE_BAR0	2</div><div class='add'>+#define BNXT_FW_HEALTH_REG_TYPE_BAR1	3</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_HEALTH_REG_TYPE(reg)	((reg) &amp; BNXT_FW_HEALTH_REG_TYPE_MASK)</div><div class='add'>+#define BNXT_FW_HEALTH_REG_OFF(reg)	((reg) &amp; ~BNXT_FW_HEALTH_REG_TYPE_MASK)</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_HEALTH_WIN_BASE		0x3000</div><div class='add'>+#define BNXT_FW_HEALTH_WIN_MAP_OFF	8</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_HEALTH_WIN_OFF(reg)	(BNXT_FW_HEALTH_WIN_BASE +	\</div><div class='add'>+					 ((reg) &amp; BNXT_GRC_OFFSET_MASK))</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_STATUS_HEALTH_MSK	0xffff</div><div class='add'>+#define BNXT_FW_STATUS_HEALTHY		0x8000</div><div class='add'>+#define BNXT_FW_STATUS_SHUTDOWN		0x100000</div><div class='add'>+#define BNXT_FW_STATUS_RECOVERING	0x400000</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_IS_HEALTHY(sts)		(((sts) &amp; BNXT_FW_STATUS_HEALTH_MSK) ==\</div><div class='add'>+					 BNXT_FW_STATUS_HEALTHY)</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_IS_BOOTING(sts)		(((sts) &amp; BNXT_FW_STATUS_HEALTH_MSK) &lt; \</div><div class='add'>+					 BNXT_FW_STATUS_HEALTHY)</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_IS_ERR(sts)		(((sts) &amp; BNXT_FW_STATUS_HEALTH_MSK) &gt; \</div><div class='add'>+					 BNXT_FW_STATUS_HEALTHY)</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_IS_RECOVERING(sts)	(BNXT_FW_IS_ERR(sts) &amp;&amp;		       \</div><div class='add'>+					 ((sts) &amp; BNXT_FW_STATUS_RECOVERING))</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_RETRY			5</div><div class='add'>+#define BNXT_FW_IF_RETRY		10</div><div class='add'>+#define BNXT_FW_SLOT_RESET_RETRY	4</div><div class='add'>+</div><div class='add'>+struct bnxt_aux_priv {</div><div class='add'>+	struct auxiliary_device aux_dev;</div><div class='add'>+	struct bnxt_en_dev *edev;</div><div class='add'>+	int id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum board_idx {</div><div class='add'>+	BCM57301,</div><div class='add'>+	BCM57302,</div><div class='add'>+	BCM57304,</div><div class='add'>+	BCM57417_NPAR,</div><div class='add'>+	BCM58700,</div><div class='add'>+	BCM57311,</div><div class='add'>+	BCM57312,</div><div class='add'>+	BCM57402,</div><div class='add'>+	BCM57404,</div><div class='add'>+	BCM57406,</div><div class='add'>+	BCM57402_NPAR,</div><div class='add'>+	BCM57407,</div><div class='add'>+	BCM57412,</div><div class='add'>+	BCM57414,</div><div class='add'>+	BCM57416,</div><div class='add'>+	BCM57417,</div><div class='add'>+	BCM57412_NPAR,</div><div class='add'>+	BCM57314,</div><div class='add'>+	BCM57417_SFP,</div><div class='add'>+	BCM57416_SFP,</div><div class='add'>+	BCM57404_NPAR,</div><div class='add'>+	BCM57406_NPAR,</div><div class='add'>+	BCM57407_SFP,</div><div class='add'>+	BCM57407_NPAR,</div><div class='add'>+	BCM57414_NPAR,</div><div class='add'>+	BCM57416_NPAR,</div><div class='add'>+	BCM57452,</div><div class='add'>+	BCM57454,</div><div class='add'>+	BCM5745x_NPAR,</div><div class='add'>+	BCM57508,</div><div class='add'>+	BCM57504,</div><div class='add'>+	BCM57502,</div><div class='add'>+	BCM57508_NPAR,</div><div class='add'>+	BCM57504_NPAR,</div><div class='add'>+	BCM57502_NPAR,</div><div class='add'>+	BCM57608,</div><div class='add'>+	BCM57604,</div><div class='add'>+	BCM57602,</div><div class='add'>+	BCM57601,</div><div class='add'>+	BCM58802,</div><div class='add'>+	BCM58804,</div><div class='add'>+	BCM58808,</div><div class='add'>+	NETXTREME_E_VF,</div><div class='add'>+	NETXTREME_C_VF,</div><div class='add'>+	NETXTREME_S_VF,</div><div class='add'>+	NETXTREME_C_VF_HV,</div><div class='add'>+	NETXTREME_E_VF_HV,</div><div class='add'>+	NETXTREME_E_P5_VF,</div><div class='add'>+	NETXTREME_E_P5_VF_HV,</div><div class='add'>+	NETXTREME_E_P7_VF,</div><div class='add'>+	NETXTREME_E_P7_VF_HV,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_TRACE_BUF_MAGIC_BYTE ((u8)0xbc)</div><div class='add'>+#define BNXT_TRACE_MAX 11</div><div class='add'>+</div><div class='add'>+struct bnxt_bs_trace_info {</div><div class='add'>+	u8 *magic_byte;</div><div class='add'>+	u32 last_offset;</div><div class='add'>+	u8 wrapped:1;</div><div class='add'>+	u16 ctx_type;</div><div class='add'>+	u16 trace_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void bnxt_bs_trace_check_wrap(struct bnxt_bs_trace_info *bs_trace,</div><div class='add'>+					    u32 offset)</div><div class='add'>+{</div><div class='add'>+	if (!bs_trace-&gt;wrapped &amp;&amp; bs_trace-&gt;magic_byte &amp;&amp;</div><div class='add'>+	    *bs_trace-&gt;magic_byte != BNXT_TRACE_BUF_MAGIC_BYTE)</div><div class='add'>+		bs_trace-&gt;wrapped = 1;</div><div class='add'>+	bs_trace-&gt;last_offset = offset;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> struct bnxt {</div><div class='ctx'> 	void __iomem		*bar0;</div><div class='ctx'> 	void __iomem		*bar1;</div><div class='hunk'>@@ -1272,13 +2184,21 @@ struct bnxt {</div><div class='ctx'> #define CHIP_NUM_57414L		0x16db</div><div class='ctx'> </div><div class='ctx'> #define CHIP_NUM_5745X		0xd730</div><div class='add'>+#define CHIP_NUM_57452		0xc452</div><div class='add'>+#define CHIP_NUM_57454		0xc454</div><div class='add'>+</div><div class='add'>+#define CHIP_NUM_57508		0x1750</div><div class='add'>+#define CHIP_NUM_57504		0x1751</div><div class='add'>+#define CHIP_NUM_57502		0x1752</div><div class='ctx'> </div><div class='del'>-#define CHIP_NUM_57500		0x1750</div><div class='add'>+#define CHIP_NUM_57608		0x1760</div><div class='ctx'> </div><div class='ctx'> #define CHIP_NUM_58802		0xd802</div><div class='ctx'> #define CHIP_NUM_58804		0xd804</div><div class='ctx'> #define CHIP_NUM_58808		0xd808</div><div class='ctx'> </div><div class='add'>+	u8			chip_rev;</div><div class='add'>+</div><div class='ctx'> #define BNXT_CHIP_NUM_5730X(chip_num)		\</div><div class='ctx'> 	((chip_num) &gt;= CHIP_NUM_57301 &amp;&amp;	\</div><div class='ctx'> 	 (chip_num) &lt;= CHIP_NUM_57304)</div><div class='hunk'>@@ -1302,7 +2222,10 @@ struct bnxt {</div><div class='ctx'> 	 ((chip_num) == CHIP_NUM_58700)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_CHIP_NUM_5745X(chip_num)		\</div><div class='del'>-	 ((chip_num) == CHIP_NUM_5745X)</div><div class='add'>+	((chip_num) == CHIP_NUM_5745X ||	\</div><div class='add'>+	 (chip_num) == CHIP_NUM_57452 ||	\</div><div class='add'>+	 (chip_num) == CHIP_NUM_57454)</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> #define BNXT_CHIP_NUM_57X0X(chip_num)		\</div><div class='ctx'> 	(BNXT_CHIP_NUM_5730X(chip_num) || BNXT_CHIP_NUM_5740X(chip_num))</div><div class='hunk'>@@ -1315,13 +2238,17 @@ struct bnxt {</div><div class='ctx'> 	 (chip_num) == CHIP_NUM_58804 ||        \</div><div class='ctx'> 	 (chip_num) == CHIP_NUM_58808)</div><div class='ctx'> </div><div class='add'>+#define BNXT_VPD_FLD_LEN	32</div><div class='add'>+	char			board_partno[BNXT_VPD_FLD_LEN];</div><div class='add'>+	char			board_serialno[BNXT_VPD_FLD_LEN];</div><div class='add'>+</div><div class='ctx'> 	struct net_device	*dev;</div><div class='ctx'> 	struct pci_dev		*pdev;</div><div class='ctx'> </div><div class='ctx'> 	atomic_t		intr_sem;</div><div class='ctx'> </div><div class='ctx'> 	u32			flags;</div><div class='del'>-	#define BNXT_FLAG_CHIP_P5	0x1</div><div class='add'>+	#define BNXT_FLAG_CHIP_P5_PLUS	0x1</div><div class='ctx'> 	#define BNXT_FLAG_VF		0x2</div><div class='ctx'> 	#define BNXT_FLAG_LRO		0x4</div><div class='ctx'> #ifdef CONFIG_INET</div><div class='hunk'>@@ -1333,16 +2260,9 @@ struct bnxt {</div><div class='ctx'> 	#define BNXT_FLAG_TPA		(BNXT_FLAG_LRO | BNXT_FLAG_GRO)</div><div class='ctx'> 	#define BNXT_FLAG_JUMBO		0x10</div><div class='ctx'> 	#define BNXT_FLAG_STRIP_VLAN	0x20</div><div class='del'>-	#define BNXT_FLAG_AGG_RINGS	(BNXT_FLAG_JUMBO | BNXT_FLAG_GRO | \</div><div class='del'>-					 BNXT_FLAG_LRO)</div><div class='del'>-	#define BNXT_FLAG_USING_MSIX	0x40</div><div class='del'>-	#define BNXT_FLAG_MSIX_CAP	0x80</div><div class='ctx'> 	#define BNXT_FLAG_RFS		0x100</div><div class='ctx'> 	#define BNXT_FLAG_SHARED_RINGS	0x200</div><div class='ctx'> 	#define BNXT_FLAG_PORT_STATS	0x400</div><div class='del'>-	#define BNXT_FLAG_UDP_RSS_CAP	0x800</div><div class='del'>-	#define BNXT_FLAG_EEE_CAP	0x1000</div><div class='del'>-	#define BNXT_FLAG_NEW_RSS_CAP	0x2000</div><div class='ctx'> 	#define BNXT_FLAG_WOL_CAP	0x4000</div><div class='ctx'> 	#define BNXT_FLAG_ROCEV1_CAP	0x8000</div><div class='ctx'> 	#define BNXT_FLAG_ROCEV2_CAP	0x10000</div><div class='hunk'>@@ -1350,13 +2270,19 @@ struct bnxt {</div><div class='ctx'> 					 BNXT_FLAG_ROCEV2_CAP)</div><div class='ctx'> 	#define BNXT_FLAG_NO_AGG_RINGS	0x20000</div><div class='ctx'> 	#define BNXT_FLAG_RX_PAGE_MODE	0x40000</div><div class='add'>+	#define BNXT_FLAG_CHIP_P7	0x80000</div><div class='ctx'> 	#define BNXT_FLAG_MULTI_HOST	0x100000</div><div class='add'>+	#define BNXT_FLAG_DSN_VALID	0x200000</div><div class='ctx'> 	#define BNXT_FLAG_DOUBLE_DB	0x400000</div><div class='add'>+	#define BNXT_FLAG_UDP_GSO_CAP	0x800000</div><div class='ctx'> 	#define BNXT_FLAG_CHIP_NITRO_A0	0x1000000</div><div class='ctx'> 	#define BNXT_FLAG_DIM		0x2000000</div><div class='ctx'> 	#define BNXT_FLAG_ROCE_MIRROR_CAP	0x4000000</div><div class='add'>+	#define BNXT_FLAG_TX_COAL_CMPL	0x8000000</div><div class='ctx'> 	#define BNXT_FLAG_PORT_STATS_EXT	0x10000000</div><div class='del'>-	#define BNXT_FLAG_PCIE_STATS	0x40000000</div><div class='add'>+	#define BNXT_FLAG_HDS		0x20000000</div><div class='add'>+	#define BNXT_FLAG_AGG_RINGS	(BNXT_FLAG_JUMBO | BNXT_FLAG_GRO | \</div><div class='add'>+					 BNXT_FLAG_LRO | BNXT_FLAG_HDS)</div><div class='ctx'> </div><div class='ctx'> 	#define BNXT_FLAG_ALL_CONFIG_FEATS (BNXT_FLAG_TPA |		\</div><div class='ctx'> 					    BNXT_FLAG_RFS |		\</div><div class='hunk'>@@ -1364,18 +2290,37 @@ struct bnxt {</div><div class='ctx'> </div><div class='ctx'> #define BNXT_PF(bp)		(!((bp)-&gt;flags &amp; BNXT_FLAG_VF))</div><div class='ctx'> #define BNXT_VF(bp)		((bp)-&gt;flags &amp; BNXT_FLAG_VF)</div><div class='add'>+#ifdef CONFIG_BNXT_SRIOV</div><div class='add'>+#define	BNXT_VF_IS_TRUSTED(bp)	((bp)-&gt;vf.flags &amp; BNXT_VF_TRUST)</div><div class='add'>+#else</div><div class='add'>+#define	BNXT_VF_IS_TRUSTED(bp)	0</div><div class='add'>+#endif</div><div class='ctx'> #define BNXT_NPAR(bp)		((bp)-&gt;port_partition_type)</div><div class='ctx'> #define BNXT_MH(bp)		((bp)-&gt;flags &amp; BNXT_FLAG_MULTI_HOST)</div><div class='ctx'> #define BNXT_SINGLE_PF(bp)	(BNXT_PF(bp) &amp;&amp; !BNXT_NPAR(bp) &amp;&amp; !BNXT_MH(bp))</div><div class='add'>+#define BNXT_SH_PORT_CFG_OK(bp)	(BNXT_PF(bp) &amp;&amp;				\</div><div class='add'>+				 ((bp)-&gt;phy_flags &amp; BNXT_PHY_FL_SHARED_PORT_CFG))</div><div class='add'>+#define BNXT_PHY_CFG_ABLE(bp)	((BNXT_SINGLE_PF(bp) ||			\</div><div class='add'>+				  BNXT_SH_PORT_CFG_OK(bp)) &amp;&amp;		\</div><div class='add'>+				 (bp)-&gt;link_info.phy_state == BNXT_PHY_STATE_ENABLED)</div><div class='ctx'> #define BNXT_CHIP_TYPE_NITRO_A0(bp) ((bp)-&gt;flags &amp; BNXT_FLAG_CHIP_NITRO_A0)</div><div class='ctx'> #define BNXT_RX_PAGE_MODE(bp)	((bp)-&gt;flags &amp; BNXT_FLAG_RX_PAGE_MODE)</div><div class='ctx'> #define BNXT_SUPPORTS_TPA(bp)	(!BNXT_CHIP_TYPE_NITRO_A0(bp) &amp;&amp;	\</div><div class='del'>-				 !(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) &amp;&amp;	\</div><div class='del'>-				 !is_kdump_kernel())</div><div class='add'>+				 (!((bp)-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) ||\</div><div class='add'>+				  (bp)-&gt;max_tpa_v2) &amp;&amp; !is_kdump_kernel())</div><div class='add'>+#define BNXT_RX_JUMBO_MODE(bp)	((bp)-&gt;flags &amp; BNXT_FLAG_JUMBO)</div><div class='add'>+</div><div class='add'>+#define BNXT_CHIP_P7(bp)			\</div><div class='add'>+	((bp)-&gt;chip_num == CHIP_NUM_57608)</div><div class='ctx'> </div><div class='del'>-/* Chip class phase 5 */</div><div class='ctx'> #define BNXT_CHIP_P5(bp)			\</div><div class='del'>-	((bp)-&gt;chip_num == CHIP_NUM_57500)</div><div class='add'>+	((bp)-&gt;chip_num == CHIP_NUM_57508 ||	\</div><div class='add'>+	 (bp)-&gt;chip_num == CHIP_NUM_57504 ||	\</div><div class='add'>+	 (bp)-&gt;chip_num == CHIP_NUM_57502)</div><div class='add'>+</div><div class='add'>+/* Chip class phase 5 */</div><div class='add'>+#define BNXT_CHIP_P5_PLUS(bp)			\</div><div class='add'>+	(BNXT_CHIP_P5(bp) || BNXT_CHIP_P7(bp))</div><div class='ctx'> </div><div class='ctx'> /* Chip class phase 4.x */</div><div class='ctx'> #define BNXT_CHIP_P4(bp)			\</div><div class='hunk'>@@ -1385,11 +2330,19 @@ struct bnxt {</div><div class='ctx'> 	 (BNXT_CHIP_NUM_58700((bp)-&gt;chip_num) &amp;&amp;	\</div><div class='ctx'> 	  !BNXT_CHIP_TYPE_NITRO_A0(bp)))</div><div class='ctx'> </div><div class='add'>+/* Chip class phase 3.x */</div><div class='add'>+#define BNXT_CHIP_P3(bp)			\</div><div class='add'>+	(BNXT_CHIP_NUM_57X0X((bp)-&gt;chip_num) ||	\</div><div class='add'>+	 BNXT_CHIP_TYPE_NITRO_A0(bp))</div><div class='add'>+</div><div class='ctx'> #define BNXT_CHIP_P4_PLUS(bp)			\</div><div class='del'>-	(BNXT_CHIP_P4(bp) || BNXT_CHIP_P5(bp))</div><div class='add'>+	(BNXT_CHIP_P4(bp) || BNXT_CHIP_P5_PLUS(bp))</div><div class='ctx'> </div><div class='add'>+#define BNXT_CHIP_P5_AND_MINUS(bp)		\</div><div class='add'>+	(BNXT_CHIP_P3(bp) || BNXT_CHIP_P4(bp) || BNXT_CHIP_P5(bp))</div><div class='add'>+</div><div class='add'>+	struct bnxt_aux_priv	*aux_priv;</div><div class='ctx'> 	struct bnxt_en_dev	*edev;</div><div class='del'>-	struct bnxt_en_dev *	(*ulp_probe)(struct net_device *);</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_napi	**bnapi;</div><div class='ctx'> </div><div class='hunk'>@@ -1405,6 +2358,8 @@ struct bnxt {</div><div class='ctx'> 					       u16, void *, u8 *, dma_addr_t,</div><div class='ctx'> 					       unsigned int);</div><div class='ctx'> </div><div class='add'>+	u16			max_tpa_v2;</div><div class='add'>+	u16			max_tpa;</div><div class='ctx'> 	u32			rx_buf_size;</div><div class='ctx'> 	u32			rx_buf_use_size;	/* useable size */</div><div class='ctx'> 	u16			rx_offset;</div><div class='hunk'>@@ -1412,7 +2367,7 @@ struct bnxt {</div><div class='ctx'> 	enum dma_data_direction	rx_dir;</div><div class='ctx'> 	u32			rx_ring_size;</div><div class='ctx'> 	u32			rx_agg_ring_size;</div><div class='del'>-	u32			rx_copy_thresh;</div><div class='add'>+	u32			rx_copybreak;</div><div class='ctx'> 	u32			rx_ring_mask;</div><div class='ctx'> 	u32			rx_agg_ring_mask;</div><div class='ctx'> 	int			rx_nr_pages;</div><div class='hunk'>@@ -1440,16 +2395,42 @@ struct bnxt {</div><div class='ctx'> 	/* grp_info indexed by completion ring index */</div><div class='ctx'> 	struct bnxt_ring_grp_info	*grp_info;</div><div class='ctx'> 	struct bnxt_vnic_info	*vnic_info;</div><div class='add'>+	u32			num_rss_ctx;</div><div class='ctx'> 	int			nr_vnics;</div><div class='add'>+	u32			*rss_indir_tbl;</div><div class='add'>+	u16			rss_indir_tbl_entries;</div><div class='ctx'> 	u32			rss_hash_cfg;</div><div class='add'>+	u32			rss_hash_delta;</div><div class='add'>+	u32			rss_cap;</div><div class='add'>+#define BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA	BIT(0)</div><div class='add'>+#define BNXT_RSS_CAP_UDP_RSS_CAP		BIT(1)</div><div class='add'>+#define BNXT_RSS_CAP_NEW_RSS_CAP		BIT(2)</div><div class='add'>+#define BNXT_RSS_CAP_RSS_TCAM			BIT(3)</div><div class='add'>+#define BNXT_RSS_CAP_AH_V4_RSS_CAP		BIT(4)</div><div class='add'>+#define BNXT_RSS_CAP_AH_V6_RSS_CAP		BIT(5)</div><div class='add'>+#define BNXT_RSS_CAP_ESP_V4_RSS_CAP		BIT(6)</div><div class='add'>+#define BNXT_RSS_CAP_ESP_V6_RSS_CAP		BIT(7)</div><div class='add'>+#define BNXT_RSS_CAP_MULTI_RSS_CTX		BIT(8)</div><div class='add'>+#define BNXT_RSS_CAP_IPV6_FLOW_LABEL_RSS_CAP	BIT(9)</div><div class='add'>+</div><div class='add'>+	u8			rss_hash_key[HW_HASH_KEY_SIZE];</div><div class='add'>+	u8			rss_hash_key_valid:1;</div><div class='add'>+	u8			rss_hash_key_updated:1;</div><div class='ctx'> </div><div class='ctx'> 	u16			max_mtu;</div><div class='add'>+	u16			tso_max_segs;</div><div class='ctx'> 	u8			max_tc;</div><div class='ctx'> 	u8			max_lltc;	/* lossless TCs */</div><div class='ctx'> 	struct bnxt_queue_info	q_info[BNXT_MAX_QUEUE];</div><div class='ctx'> 	u8			tc_to_qidx[BNXT_MAX_QUEUE];</div><div class='ctx'> 	u8			q_ids[BNXT_MAX_QUEUE];</div><div class='ctx'> 	u8			max_q;</div><div class='add'>+	u8			cos0_cos1_shared;</div><div class='add'>+	u8			num_tc;</div><div class='add'>+</div><div class='add'>+	u16			max_pfcwd_tmo_ms;</div><div class='add'>+</div><div class='add'>+	u8			tph_mode;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		current_interval;</div><div class='ctx'> #define BNXT_TIMER_INTERVAL	HZ</div><div class='hunk'>@@ -1460,9 +2441,27 @@ struct bnxt {</div><div class='ctx'> #define BNXT_STATE_OPEN		0</div><div class='ctx'> #define BNXT_STATE_IN_SP_TASK	1</div><div class='ctx'> #define BNXT_STATE_READ_STATS	2</div><div class='add'>+#define BNXT_STATE_FW_RESET_DET 3</div><div class='add'>+#define BNXT_STATE_IN_FW_RESET	4</div><div class='add'>+#define BNXT_STATE_ABORT_ERR	5</div><div class='add'>+#define BNXT_STATE_FW_FATAL_COND	6</div><div class='add'>+#define BNXT_STATE_DRV_REGISTERED	7</div><div class='add'>+#define BNXT_STATE_PCI_CHANNEL_IO_FROZEN	8</div><div class='add'>+#define BNXT_STATE_NAPI_DISABLED	9</div><div class='add'>+#define BNXT_STATE_L2_FILTER_RETRY	10</div><div class='add'>+#define BNXT_STATE_FW_ACTIVATE		11</div><div class='add'>+#define BNXT_STATE_RECOVER		12</div><div class='add'>+#define BNXT_STATE_FW_NON_FATAL_COND	13</div><div class='add'>+#define BNXT_STATE_FW_ACTIVATE_RESET	14</div><div class='add'>+#define BNXT_STATE_HALF_OPEN		15	/* For offline ethtool tests */</div><div class='add'>+</div><div class='add'>+#define BNXT_NO_FW_ACCESS(bp)					\</div><div class='add'>+	(test_bit(BNXT_STATE_FW_FATAL_COND, &amp;(bp)-&gt;state) ||	\</div><div class='add'>+	 pci_channel_offline((bp)-&gt;pdev))</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_irq	*irq_tbl;</div><div class='ctx'> 	int			total_irqs;</div><div class='add'>+	int			ulp_num_msix_want;</div><div class='ctx'> 	u8			mac_addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BNXT_DCB</div><div class='hunk'>@@ -1475,65 +2474,119 @@ struct bnxt {</div><div class='ctx'> </div><div class='ctx'> 	u32			msg_enable;</div><div class='ctx'> </div><div class='del'>-	u32			fw_cap;</div><div class='del'>-	#define BNXT_FW_CAP_SHORT_CMD			0x00000001</div><div class='del'>-	#define BNXT_FW_CAP_LLDP_AGENT			0x00000002</div><div class='del'>-	#define BNXT_FW_CAP_DCBX_AGENT			0x00000004</div><div class='del'>-	#define BNXT_FW_CAP_NEW_RM			0x00000008</div><div class='del'>-	#define BNXT_FW_CAP_IF_CHANGE			0x00000010</div><div class='del'>-	#define BNXT_FW_CAP_KONG_MB_CHNL		0x00000080</div><div class='del'>-	#define BNXT_FW_CAP_OVS_64BIT_HANDLE		0x00000400</div><div class='del'>-	#define BNXT_FW_CAP_TRUSTED_VF			0x00000800</div><div class='del'>-	#define BNXT_FW_CAP_PKG_VER			0x00004000</div><div class='del'>-	#define BNXT_FW_CAP_CFA_ADV_FLOW		0x00008000</div><div class='del'>-	#define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX	0x00010000</div><div class='del'>-	#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED	0x00020000</div><div class='del'>-	#define BNXT_FW_CAP_EXT_STATS_SUPPORTED		0x00040000</div><div class='add'>+	u64			fw_cap;</div><div class='add'>+	#define BNXT_FW_CAP_SHORT_CMD			BIT_ULL(0)</div><div class='add'>+	#define BNXT_FW_CAP_LLDP_AGENT			BIT_ULL(1)</div><div class='add'>+	#define BNXT_FW_CAP_DCBX_AGENT			BIT_ULL(2)</div><div class='add'>+	#define BNXT_FW_CAP_NEW_RM			BIT_ULL(3)</div><div class='add'>+	#define BNXT_FW_CAP_IF_CHANGE			BIT_ULL(4)</div><div class='add'>+	#define BNXT_FW_CAP_ENABLE_RDMA_SRIOV           BIT_ULL(5)</div><div class='add'>+	#define BNXT_FW_CAP_ROCE_VF_RESC_MGMT_SUPPORTED	BIT_ULL(6)</div><div class='add'>+	#define BNXT_FW_CAP_KONG_MB_CHNL		BIT_ULL(7)</div><div class='add'>+	#define BNXT_FW_CAP_ROCE_VF_DYN_ALLOC_SUPPORT	BIT_ULL(8)</div><div class='add'>+	#define BNXT_FW_CAP_LINK_ADMIN			BIT_ULL(9)</div><div class='add'>+	#define BNXT_FW_CAP_OVS_64BIT_HANDLE		BIT_ULL(10)</div><div class='add'>+	#define BNXT_FW_CAP_TRUSTED_VF			BIT_ULL(11)</div><div class='add'>+	#define BNXT_FW_CAP_ERROR_RECOVERY		BIT_ULL(13)</div><div class='add'>+	#define BNXT_FW_CAP_PKG_VER			BIT_ULL(14)</div><div class='add'>+	#define BNXT_FW_CAP_CFA_ADV_FLOW		BIT_ULL(15)</div><div class='add'>+	#define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2	BIT_ULL(16)</div><div class='add'>+	#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED	BIT_ULL(17)</div><div class='add'>+	#define BNXT_FW_CAP_EXT_STATS_SUPPORTED		BIT_ULL(18)</div><div class='add'>+	#define BNXT_FW_CAP_TX_TS_CMP			BIT_ULL(19)</div><div class='add'>+	#define BNXT_FW_CAP_ERR_RECOVER_RELOAD		BIT_ULL(20)</div><div class='add'>+	#define BNXT_FW_CAP_HOT_RESET			BIT_ULL(21)</div><div class='add'>+	#define BNXT_FW_CAP_PTP_RTC			BIT_ULL(22)</div><div class='add'>+	#define BNXT_FW_CAP_RX_ALL_PKT_TS		BIT_ULL(23)</div><div class='add'>+	#define BNXT_FW_CAP_VLAN_RX_STRIP		BIT_ULL(24)</div><div class='add'>+	#define BNXT_FW_CAP_VLAN_TX_INSERT		BIT_ULL(25)</div><div class='add'>+	#define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED	BIT_ULL(26)</div><div class='add'>+	#define BNXT_FW_CAP_LIVEPATCH			BIT_ULL(27)</div><div class='add'>+	#define BNXT_FW_CAP_PTP_PPS			BIT_ULL(28)</div><div class='add'>+	#define BNXT_FW_CAP_HOT_RESET_IF		BIT_ULL(29)</div><div class='add'>+	#define BNXT_FW_CAP_RING_MONITOR		BIT_ULL(30)</div><div class='add'>+	#define BNXT_FW_CAP_DBG_QCAPS			BIT_ULL(31)</div><div class='add'>+	#define BNXT_FW_CAP_PTP				BIT_ULL(32)</div><div class='add'>+	#define BNXT_FW_CAP_THRESHOLD_TEMP_SUPPORTED	BIT_ULL(33)</div><div class='add'>+	#define BNXT_FW_CAP_DFLT_VLAN_TPID_PCP		BIT_ULL(34)</div><div class='add'>+	#define BNXT_FW_CAP_PRE_RESV_VNICS		BIT_ULL(35)</div><div class='add'>+	#define BNXT_FW_CAP_BACKING_STORE_V2		BIT_ULL(36)</div><div class='add'>+	#define BNXT_FW_CAP_VNIC_TUNNEL_TPA		BIT_ULL(37)</div><div class='add'>+	#define BNXT_FW_CAP_CFA_NTUPLE_RX_EXT_IP_PROTO	BIT_ULL(38)</div><div class='add'>+	#define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V3	BIT_ULL(39)</div><div class='add'>+	#define BNXT_FW_CAP_VNIC_RE_FLUSH		BIT_ULL(40)</div><div class='add'>+	#define BNXT_FW_CAP_SW_MAX_RESOURCE_LIMITS	BIT_ULL(41)</div><div class='add'>+	#define BNXT_FW_CAP_NPAR_1_2			BIT_ULL(42)</div><div class='add'>+	#define BNXT_FW_CAP_MIRROR_ON_ROCE		BIT_ULL(43)</div><div class='add'>+</div><div class='add'>+	u32			fw_dbg_cap;</div><div class='ctx'> </div><div class='ctx'> #define BNXT_NEW_RM(bp)		((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_NEW_RM)</div><div class='add'>+#define BNXT_PTP_USE_RTC(bp)	(!BNXT_MH(bp) &amp;&amp; \</div><div class='add'>+				 ((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_PTP_RTC))</div><div class='add'>+#define BNXT_SUPPORTS_NTUPLE_VNIC(bp)	\</div><div class='add'>+	(BNXT_PF(bp) &amp;&amp; ((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V3))</div><div class='add'>+</div><div class='add'>+#define BNXT_SUPPORTS_MULTI_RSS_CTX(bp)				\</div><div class='add'>+	(BNXT_PF(bp) &amp;&amp; BNXT_SUPPORTS_NTUPLE_VNIC(bp) &amp;&amp;	\</div><div class='add'>+	 ((bp)-&gt;rss_cap &amp; BNXT_RSS_CAP_MULTI_RSS_CTX))</div><div class='add'>+#define BNXT_ROCE_VF_DYN_ALLOC_CAP(bp)				\</div><div class='add'>+	((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_ROCE_VF_DYN_ALLOC_SUPPORT)</div><div class='add'>+#define BNXT_SUPPORTS_QUEUE_API(bp)				\</div><div class='add'>+	(BNXT_PF(bp) &amp;&amp; BNXT_SUPPORTS_NTUPLE_VNIC(bp) &amp;&amp;	\</div><div class='add'>+	 ((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_VNIC_RE_FLUSH))</div><div class='add'>+#define BNXT_RDMA_SRIOV_EN(bp)		\</div><div class='add'>+	((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_ENABLE_RDMA_SRIOV)</div><div class='add'>+#define BNXT_ROCE_VF_RESC_CAP(bp)	\</div><div class='add'>+	((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_ROCE_VF_RESC_MGMT_SUPPORTED)</div><div class='add'>+#define BNXT_SW_RES_LMT(bp)		\</div><div class='add'>+	((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_SW_MAX_RESOURCE_LIMITS)</div><div class='add'>+#define BNXT_MIRROR_ON_ROCE_CAP(bp)	\</div><div class='add'>+	((bp)-&gt;fw_cap &amp; BNXT_FW_CAP_MIRROR_ON_ROCE)</div><div class='add'>+</div><div class='ctx'> 	u32			hwrm_spec_code;</div><div class='ctx'> 	u16			hwrm_cmd_seq;</div><div class='ctx'> 	u16                     hwrm_cmd_kong_seq;</div><div class='del'>-	u16			hwrm_intr_seq_id;</div><div class='del'>-	void			*hwrm_short_cmd_req_addr;</div><div class='del'>-	dma_addr_t		hwrm_short_cmd_req_dma_addr;</div><div class='del'>-	void			*hwrm_cmd_resp_addr;</div><div class='del'>-	dma_addr_t		hwrm_cmd_resp_dma_addr;</div><div class='del'>-	void			*hwrm_cmd_kong_resp_addr;</div><div class='del'>-	dma_addr_t		hwrm_cmd_kong_resp_dma_addr;</div><div class='add'>+	struct dma_pool		*hwrm_dma_pool;</div><div class='add'>+	struct hlist_head	hwrm_pending_list;</div><div class='ctx'> </div><div class='ctx'> 	struct rtnl_link_stats64	net_stats_prev;</div><div class='del'>-	struct rx_port_stats	*hw_rx_port_stats;</div><div class='del'>-	struct tx_port_stats	*hw_tx_port_stats;</div><div class='del'>-	struct rx_port_stats_ext	*hw_rx_port_stats_ext;</div><div class='del'>-	struct tx_port_stats_ext	*hw_tx_port_stats_ext;</div><div class='del'>-	struct pcie_ctx_hw_stats	*hw_pcie_stats;</div><div class='del'>-	dma_addr_t		hw_rx_port_stats_map;</div><div class='del'>-	dma_addr_t		hw_tx_port_stats_map;</div><div class='del'>-	dma_addr_t		hw_rx_port_stats_ext_map;</div><div class='del'>-	dma_addr_t		hw_tx_port_stats_ext_map;</div><div class='del'>-	dma_addr_t		hw_pcie_stats_map;</div><div class='del'>-	int			hw_port_stats_size;</div><div class='add'>+	struct bnxt_stats_mem	port_stats;</div><div class='add'>+	struct bnxt_stats_mem	rx_port_stats_ext;</div><div class='add'>+	struct bnxt_stats_mem	tx_port_stats_ext;</div><div class='ctx'> 	u16			fw_rx_stats_ext_size;</div><div class='ctx'> 	u16			fw_tx_stats_ext_size;</div><div class='del'>-	u8			pri2cos[8];</div><div class='add'>+	u16			hw_ring_stats_size;</div><div class='add'>+	u16			pcie_stat_len;</div><div class='add'>+	u8			pri2cos_idx[8];</div><div class='ctx'> 	u8			pri2cos_valid;</div><div class='ctx'> </div><div class='add'>+	struct bnxt_total_ring_err_stats ring_err_stats_prev;</div><div class='add'>+</div><div class='ctx'> 	u16			hwrm_max_req_len;</div><div class='ctx'> 	u16			hwrm_max_ext_req_len;</div><div class='del'>-	int			hwrm_cmd_timeout;</div><div class='add'>+	unsigned int		hwrm_cmd_timeout;</div><div class='add'>+	unsigned int		hwrm_cmd_max_timeout;</div><div class='ctx'> 	struct mutex		hwrm_cmd_lock;	/* serialize hwrm messages */</div><div class='ctx'> 	struct hwrm_ver_get_output	ver_resp;</div><div class='ctx'> #define FW_VER_STR_LEN		32</div><div class='ctx'> #define BC_HWRM_STR_LEN		21</div><div class='ctx'> #define PHY_VER_STR_LEN         (FW_VER_STR_LEN - BC_HWRM_STR_LEN)</div><div class='ctx'> 	char			fw_ver_str[FW_VER_STR_LEN];</div><div class='add'>+	char			hwrm_ver_supp[FW_VER_STR_LEN];</div><div class='add'>+	char			nvm_cfg_ver[FW_VER_STR_LEN];</div><div class='add'>+	u64			fw_ver_code;</div><div class='add'>+#define BNXT_FW_VER_CODE(maj, min, bld, rsv)			\</div><div class='add'>+	((u64)(maj) &lt;&lt; 48 | (u64)(min) &lt;&lt; 32 | (u64)(bld) &lt;&lt; 16 | (rsv))</div><div class='add'>+#define BNXT_FW_MAJ(bp)		((bp)-&gt;fw_ver_code &gt;&gt; 48)</div><div class='add'>+#define BNXT_FW_BLD(bp)		(((bp)-&gt;fw_ver_code &gt;&gt; 16) &amp; 0xffff)</div><div class='add'>+</div><div class='add'>+	u16			vxlan_fw_dst_port_id;</div><div class='add'>+	u16			nge_fw_dst_port_id;</div><div class='add'>+	u16			vxlan_gpe_fw_dst_port_id;</div><div class='ctx'> 	__be16			vxlan_port;</div><div class='del'>-	u8			vxlan_port_cnt;</div><div class='del'>-	__le16			vxlan_fw_dst_port_id;</div><div class='ctx'> 	__be16			nge_port;</div><div class='del'>-	u8			nge_port_cnt;</div><div class='del'>-	__le16			nge_fw_dst_port_id;</div><div class='add'>+	__be16			vxlan_gpe_port;</div><div class='ctx'> 	u8			port_partition_type;</div><div class='ctx'> 	u8			port_count;</div><div class='ctx'> 	u16			br_mode;</div><div class='hunk'>@@ -1553,20 +2606,40 @@ struct bnxt {</div><div class='ctx'> #define BNXT_RX_NTP_FLTR_SP_EVENT	1</div><div class='ctx'> #define BNXT_LINK_CHNG_SP_EVENT		2</div><div class='ctx'> #define BNXT_HWRM_EXEC_FWD_REQ_SP_EVENT	3</div><div class='del'>-#define BNXT_VXLAN_ADD_PORT_SP_EVENT	4</div><div class='del'>-#define BNXT_VXLAN_DEL_PORT_SP_EVENT	5</div><div class='ctx'> #define BNXT_RESET_TASK_SP_EVENT	6</div><div class='ctx'> #define BNXT_RST_RING_SP_EVENT		7</div><div class='ctx'> #define BNXT_HWRM_PF_UNLOAD_SP_EVENT	8</div><div class='ctx'> #define BNXT_PERIODIC_STATS_SP_EVENT	9</div><div class='ctx'> #define BNXT_HWRM_PORT_MODULE_SP_EVENT	10</div><div class='ctx'> #define BNXT_RESET_TASK_SILENT_SP_EVENT	11</div><div class='del'>-#define BNXT_GENEVE_ADD_PORT_SP_EVENT	12</div><div class='del'>-#define BNXT_GENEVE_DEL_PORT_SP_EVENT	13</div><div class='ctx'> #define BNXT_LINK_SPEED_CHNG_SP_EVENT	14</div><div class='ctx'> #define BNXT_FLOW_STATS_SP_EVENT	15</div><div class='ctx'> #define BNXT_UPDATE_PHY_SP_EVENT	16</div><div class='ctx'> #define BNXT_RING_COAL_NOW_SP_EVENT	17</div><div class='add'>+#define BNXT_FW_RESET_NOTIFY_SP_EVENT	18</div><div class='add'>+#define BNXT_FW_EXCEPTION_SP_EVENT	19</div><div class='add'>+#define BNXT_LINK_CFG_CHANGE_SP_EVENT	21</div><div class='add'>+#define BNXT_THERMAL_THRESHOLD_SP_EVENT	22</div><div class='add'>+#define BNXT_FW_ECHO_REQUEST_SP_EVENT	23</div><div class='add'>+#define BNXT_RESTART_ULP_SP_EVENT	24</div><div class='add'>+</div><div class='add'>+	struct delayed_work	fw_reset_task;</div><div class='add'>+	int			fw_reset_state;</div><div class='add'>+#define BNXT_FW_RESET_STATE_POLL_VF	1</div><div class='add'>+#define BNXT_FW_RESET_STATE_RESET_FW	2</div><div class='add'>+#define BNXT_FW_RESET_STATE_ENABLE_DEV	3</div><div class='add'>+#define BNXT_FW_RESET_STATE_POLL_FW	4</div><div class='add'>+#define BNXT_FW_RESET_STATE_OPENING	5</div><div class='add'>+#define BNXT_FW_RESET_STATE_POLL_FW_DOWN	6</div><div class='add'>+#define BNXT_FW_RESET_STATE_ABORT	7</div><div class='add'>+</div><div class='add'>+	u16			fw_reset_min_dsecs;</div><div class='add'>+#define BNXT_DFLT_FW_RST_MIN_DSECS	20</div><div class='add'>+	u16			fw_reset_max_dsecs;</div><div class='add'>+#define BNXT_DFLT_FW_RST_MAX_DSECS	60</div><div class='add'>+	unsigned long		fw_reset_timestamp;</div><div class='add'>+</div><div class='add'>+	struct bnxt_fw_health	*fw_health;</div><div class='ctx'> </div><div class='ctx'> 	struct bnxt_hw_resc	hw_resc;</div><div class='ctx'> 	struct bnxt_pf_info	pf;</div><div class='hunk'>@@ -1577,20 +2650,17 @@ struct bnxt {</div><div class='ctx'> 	wait_queue_head_t	sriov_cfg_wait;</div><div class='ctx'> 	bool			sriov_cfg;</div><div class='ctx'> #define BNXT_SRIOV_CFG_WAIT_TMO	msecs_to_jiffies(10000)</div><div class='del'>-</div><div class='del'>-	/* lock to protect VF-rep creation/cleanup via</div><div class='del'>-	 * multiple paths such as -&gt;sriov_configure() and</div><div class='del'>-	 * devlink -&gt;eswitch_mode_set()</div><div class='del'>-	 */</div><div class='del'>-	struct mutex		sriov_lock;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='ctx'> 	/* ensure atomic 64-bit doorbell writes on 32-bit systems. */</div><div class='ctx'> 	spinlock_t		db_lock;</div><div class='ctx'> #endif</div><div class='add'>+	int			db_offset;	/* db_offset within db_size */</div><div class='add'>+	int			db_size;</div><div class='ctx'> </div><div class='ctx'> #define BNXT_NTP_FLTR_MAX_FLTR	4096</div><div class='add'>+#define BNXT_MAX_FLTR		(BNXT_NTP_FLTR_MAX_FLTR + BNXT_L2_FLTR_MAX_FLTR)</div><div class='ctx'> #define BNXT_NTP_FLTR_HASH_SIZE	512</div><div class='ctx'> #define BNXT_NTP_FLTR_HASH_MASK	(BNXT_NTP_FLTR_HASH_SIZE - 1)</div><div class='ctx'> 	struct hlist_head	ntp_fltr_hash_tbl[BNXT_NTP_FLTR_HASH_SIZE];</div><div class='hunk'>@@ -1598,16 +2668,47 @@ struct bnxt {</div><div class='ctx'> </div><div class='ctx'> 	unsigned long		*ntp_fltr_bmap;</div><div class='ctx'> 	int			ntp_fltr_count;</div><div class='add'>+	int			max_fltr;</div><div class='add'>+</div><div class='add'>+#define BNXT_L2_FLTR_MAX_FLTR	1024</div><div class='add'>+#define BNXT_L2_FLTR_HASH_SIZE	32</div><div class='add'>+#define BNXT_L2_FLTR_HASH_MASK	(BNXT_L2_FLTR_HASH_SIZE - 1)</div><div class='add'>+	struct hlist_head	l2_fltr_hash_tbl[BNXT_L2_FLTR_HASH_SIZE];</div><div class='add'>+</div><div class='add'>+	u32			hash_seed;</div><div class='add'>+	u64			toeplitz_prefix;</div><div class='add'>+</div><div class='add'>+	struct list_head	usr_fltr_list;</div><div class='ctx'> </div><div class='ctx'> 	/* To protect link related settings during link changes and</div><div class='ctx'> 	 * ethtool settings changes.</div><div class='ctx'> 	 */</div><div class='ctx'> 	struct mutex		link_lock;</div><div class='ctx'> 	struct bnxt_link_info	link_info;</div><div class='del'>-	struct ethtool_eee	eee;</div><div class='add'>+	struct ethtool_keee	eee;</div><div class='ctx'> 	u32			lpi_tmr_lo;</div><div class='ctx'> 	u32			lpi_tmr_hi;</div><div class='ctx'> </div><div class='add'>+	/* copied from flags and flags2 in hwrm_port_phy_qcaps_output */</div><div class='add'>+	u32			phy_flags;</div><div class='add'>+#define BNXT_PHY_FL_EEE_CAP		PORT_PHY_QCAPS_RESP_FLAGS_EEE_SUPPORTED</div><div class='add'>+#define BNXT_PHY_FL_EXT_LPBK		PORT_PHY_QCAPS_RESP_FLAGS_EXTERNAL_LPBK_SUPPORTED</div><div class='add'>+#define BNXT_PHY_FL_AN_PHY_LPBK		PORT_PHY_QCAPS_RESP_FLAGS_AUTONEG_LPBK_SUPPORTED</div><div class='add'>+#define BNXT_PHY_FL_SHARED_PORT_CFG	PORT_PHY_QCAPS_RESP_FLAGS_SHARED_PHY_CFG_SUPPORTED</div><div class='add'>+#define BNXT_PHY_FL_PORT_STATS_NO_RESET	PORT_PHY_QCAPS_RESP_FLAGS_CUMULATIVE_COUNTERS_ON_RESET</div><div class='add'>+#define BNXT_PHY_FL_NO_PHY_LPBK		PORT_PHY_QCAPS_RESP_FLAGS_LOCAL_LPBK_NOT_SUPPORTED</div><div class='add'>+#define BNXT_PHY_FL_FW_MANAGED_LKDN	PORT_PHY_QCAPS_RESP_FLAGS_FW_MANAGED_LINK_DOWN</div><div class='add'>+#define BNXT_PHY_FL_NO_FCS		PORT_PHY_QCAPS_RESP_FLAGS_NO_FCS</div><div class='add'>+#define BNXT_PHY_FL_NO_PAUSE		(PORT_PHY_QCAPS_RESP_FLAGS2_PAUSE_UNSUPPORTED &lt;&lt; 8)</div><div class='add'>+#define BNXT_PHY_FL_NO_PFC		(PORT_PHY_QCAPS_RESP_FLAGS2_PFC_UNSUPPORTED &lt;&lt; 8)</div><div class='add'>+#define BNXT_PHY_FL_BANK_SEL		(PORT_PHY_QCAPS_RESP_FLAGS2_BANK_ADDR_SUPPORTED &lt;&lt; 8)</div><div class='add'>+#define BNXT_PHY_FL_SPEEDS2		(PORT_PHY_QCAPS_RESP_FLAGS2_SPEEDS2_SUPPORTED &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+	/* copied from flags in hwrm_port_mac_qcaps_output */</div><div class='add'>+	u8			mac_flags;</div><div class='add'>+#define BNXT_MAC_FL_NO_MAC_LPBK		\</div><div class='add'>+	PORT_MAC_QCAPS_RESP_FLAGS_LOCAL_LPBK_NOT_SUPPORTED</div><div class='add'>+</div><div class='ctx'> 	u8			num_tests;</div><div class='ctx'> 	struct bnxt_test_info	*test_info;</div><div class='ctx'> </div><div class='hunk'>@@ -1616,37 +2717,91 @@ struct bnxt {</div><div class='ctx'> </div><div class='ctx'> 	u8			num_leds;</div><div class='ctx'> 	struct bnxt_led_info	leds[BNXT_MAX_LED];</div><div class='add'>+	u16			dump_flag;</div><div class='add'>+#define BNXT_DUMP_LIVE		0</div><div class='add'>+#define BNXT_DUMP_CRASH		1</div><div class='add'>+#define BNXT_DUMP_DRIVER	2</div><div class='add'>+#define BNXT_DUMP_LIVE_WITH_CTX_L1_CACHE	3</div><div class='ctx'> </div><div class='ctx'> 	struct bpf_prog		*xdp_prog;</div><div class='ctx'> </div><div class='add'>+	struct bnxt_ptp_cfg	*ptp_cfg;</div><div class='add'>+	u8			ptp_all_rx_tstamp;</div><div class='add'>+</div><div class='ctx'> 	/* devlink interface and vf-rep structs */</div><div class='ctx'> 	struct devlink		*dl;</div><div class='ctx'> 	struct devlink_port	dl_port;</div><div class='ctx'> 	enum devlink_eswitch_mode eswitch_mode;</div><div class='ctx'> 	struct bnxt_vf_rep	**vf_reps; /* array of vf-rep ptrs */</div><div class='ctx'> 	u16			*cfa_code_map; /* cfa_code -&gt; vf_idx map */</div><div class='del'>-	u8			switch_id[8];</div><div class='add'>+	u8			dsn[8];</div><div class='ctx'> 	struct bnxt_tc_info	*tc_info;</div><div class='add'>+	struct list_head	tc_indr_block_list;</div><div class='ctx'> 	struct dentry		*debugfs_pdev;</div><div class='del'>-	struct dentry		*debugfs_dim;</div><div class='add'>+#ifdef CONFIG_BNXT_HWMON</div><div class='ctx'> 	struct device		*hwmon_dev;</div><div class='add'>+	u8			warn_thresh_temp;</div><div class='add'>+	u8			crit_thresh_temp;</div><div class='add'>+	u8			fatal_thresh_temp;</div><div class='add'>+	u8			shutdown_thresh_temp;</div><div class='add'>+#endif</div><div class='add'>+	u32			thermal_threshold_type;</div><div class='add'>+	enum board_idx		board_idx;</div><div class='add'>+</div><div class='add'>+	struct bnxt_ctx_pg_info	*fw_crash_mem;</div><div class='add'>+	u32			fw_crash_len;</div><div class='add'>+	struct bnxt_bs_trace_info bs_trace[BNXT_TRACE_MAX];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define BNXT_NUM_RX_RING_STATS			8</div><div class='add'>+#define BNXT_NUM_TX_RING_STATS			8</div><div class='add'>+#define BNXT_NUM_TPA_RING_STATS			4</div><div class='add'>+#define BNXT_NUM_TPA_RING_STATS_P5		5</div><div class='add'>+#define BNXT_NUM_TPA_RING_STATS_P7		6</div><div class='add'>+</div><div class='add'>+#define BNXT_RING_STATS_SIZE_P5					\</div><div class='add'>+	((BNXT_NUM_RX_RING_STATS + BNXT_NUM_TX_RING_STATS +	\</div><div class='add'>+	  BNXT_NUM_TPA_RING_STATS_P5) * 8)</div><div class='add'>+</div><div class='add'>+#define BNXT_RING_STATS_SIZE_P7					\</div><div class='add'>+	((BNXT_NUM_RX_RING_STATS + BNXT_NUM_TX_RING_STATS +	\</div><div class='add'>+	  BNXT_NUM_TPA_RING_STATS_P7) * 8)</div><div class='add'>+</div><div class='add'>+#define BNXT_GET_RING_STATS64(sw, counter)		\</div><div class='add'>+	(*((sw) + offsetof(struct ctx_hw_stats, counter) / 8))</div><div class='add'>+</div><div class='add'>+#define BNXT_GET_RX_PORT_STATS64(sw, counter)		\</div><div class='add'>+	(*((sw) + offsetof(struct rx_port_stats, counter) / 8))</div><div class='add'>+</div><div class='add'>+#define BNXT_GET_TX_PORT_STATS64(sw, counter)		\</div><div class='add'>+	(*((sw) + offsetof(struct tx_port_stats, counter) / 8))</div><div class='add'>+</div><div class='add'>+#define BNXT_PORT_STATS_SIZE				\</div><div class='add'>+	(sizeof(struct rx_port_stats) + sizeof(struct tx_port_stats) + 1024)</div><div class='add'>+</div><div class='add'>+#define BNXT_TX_PORT_STATS_BYTE_OFFSET			\</div><div class='add'>+	(sizeof(struct rx_port_stats) + 512)</div><div class='add'>+</div><div class='ctx'> #define BNXT_RX_STATS_OFFSET(counter)			\</div><div class='ctx'> 	(offsetof(struct rx_port_stats, counter) / 8)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_TX_STATS_OFFSET(counter)			\</div><div class='ctx'> 	((offsetof(struct tx_port_stats, counter) +	\</div><div class='del'>-	  sizeof(struct rx_port_stats) + 512) / 8)</div><div class='add'>+	  BNXT_TX_PORT_STATS_BYTE_OFFSET) / 8)</div><div class='ctx'> </div><div class='ctx'> #define BNXT_RX_STATS_EXT_OFFSET(counter)		\</div><div class='ctx'> 	(offsetof(struct rx_port_stats_ext, counter) / 8)</div><div class='ctx'> </div><div class='add'>+#define BNXT_RX_STATS_EXT_NUM_LEGACY                   \</div><div class='add'>+	BNXT_RX_STATS_EXT_OFFSET(rx_fec_corrected_blocks)</div><div class='add'>+</div><div class='ctx'> #define BNXT_TX_STATS_EXT_OFFSET(counter)		\</div><div class='ctx'> 	(offsetof(struct tx_port_stats_ext, counter) / 8)</div><div class='ctx'> </div><div class='del'>-#define BNXT_PCIE_STATS_OFFSET(counter)			\</div><div class='del'>-	(offsetof(struct pcie_ctx_hw_stats, counter) / 8)</div><div class='add'>+#define BNXT_HW_FEATURE_VLAN_ALL_RX				\</div><div class='add'>+	(NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)</div><div class='add'>+#define BNXT_HW_FEATURE_VLAN_ALL_TX				\</div><div class='add'>+	(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX)</div><div class='ctx'> </div><div class='ctx'> #define I2C_DEV_ADDR_A0				0xa0</div><div class='ctx'> #define I2C_DEV_ADDR_A2				0xa2</div><div class='hunk'>@@ -1657,35 +2812,49 @@ struct bnxt {</div><div class='ctx'> #define SFF_MODULE_ID_QSFP28			0x11</div><div class='ctx'> #define BNXT_MAX_PHY_I2C_RESP_SIZE		64</div><div class='ctx'> </div><div class='del'>-static inline u32 bnxt_tx_avail(struct bnxt *bp, struct bnxt_tx_ring_info *txr)</div><div class='add'>+#define BNXT_HDS_THRESHOLD_MAX			1023</div><div class='add'>+</div><div class='add'>+static inline u32 bnxt_tx_avail(struct bnxt *bp,</div><div class='add'>+				const struct bnxt_tx_ring_info *txr)</div><div class='ctx'> {</div><div class='del'>-	/* Tell compiler to fetch tx indices from memory. */</div><div class='del'>-	barrier();</div><div class='add'>+	u32 used = READ_ONCE(txr-&gt;tx_prod) - READ_ONCE(txr-&gt;tx_cons);</div><div class='ctx'> </div><div class='del'>-	return bp-&gt;tx_ring_size -</div><div class='del'>-		((txr-&gt;tx_prod - txr-&gt;tx_cons) &amp; bp-&gt;tx_ring_mask);</div><div class='add'>+	return bp-&gt;tx_ring_size - (used &amp; bp-&gt;tx_ring_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void bnxt_writeq(struct bnxt *bp, u64 val,</div><div class='add'>+			       volatile void __iomem *addr)</div><div class='add'>+{</div><div class='ctx'> #if BITS_PER_LONG == 32</div><div class='del'>-#define writeq(val64, db)			\</div><div class='del'>-do {						\</div><div class='del'>-	spin_lock(&amp;bp-&gt;db_lock);		\</div><div class='del'>-	writel((val64) &amp; 0xffffffff, db);	\</div><div class='del'>-	writel((val64) &gt;&gt; 32, (db) + 4);	\</div><div class='del'>-	spin_unlock(&amp;bp-&gt;db_lock);		\</div><div class='del'>-} while (0)</div><div class='add'>+	spin_lock(&amp;bp-&gt;db_lock);</div><div class='add'>+	lo_hi_writeq(val, addr);</div><div class='add'>+	spin_unlock(&amp;bp-&gt;db_lock);</div><div class='add'>+#else</div><div class='add'>+	writeq(val, addr);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-#define writeq_relaxed writeq</div><div class='add'>+static inline void bnxt_writeq_relaxed(struct bnxt *bp, u64 val,</div><div class='add'>+				       volatile void __iomem *addr)</div><div class='add'>+{</div><div class='add'>+#if BITS_PER_LONG == 32</div><div class='add'>+	spin_lock(&amp;bp-&gt;db_lock);</div><div class='add'>+	lo_hi_writeq_relaxed(val, addr);</div><div class='add'>+	spin_unlock(&amp;bp-&gt;db_lock);</div><div class='add'>+#else</div><div class='add'>+	writeq_relaxed(val, addr);</div><div class='ctx'> #endif</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> /* For TX and RX ring doorbells with no ordering guarantee*/</div><div class='ctx'> static inline void bnxt_db_write_relaxed(struct bnxt *bp,</div><div class='ctx'> 					 struct bnxt_db_info *db, u32 idx)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		writeq_relaxed(db-&gt;db_key64 | idx, db-&gt;doorbell);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		bnxt_writeq_relaxed(bp, db-&gt;db_key64 | DB_RING_IDX(db, idx),</div><div class='add'>+				    db-&gt;doorbell);</div><div class='ctx'> 	} else {</div><div class='del'>-		u32 db_val = db-&gt;db_key32 | idx;</div><div class='add'>+		u32 db_val = db-&gt;db_key32 | DB_RING_IDX(db, idx);</div><div class='ctx'> </div><div class='ctx'> 		writel_relaxed(db_val, db-&gt;doorbell);</div><div class='ctx'> 		if (bp-&gt;flags &amp; BNXT_FLAG_DOUBLE_DB)</div><div class='hunk'>@@ -1697,10 +2866,11 @@ static inline void bnxt_db_write_relaxed(struct bnxt *bp,</div><div class='ctx'> static inline void bnxt_db_write(struct bnxt *bp, struct bnxt_db_info *db,</div><div class='ctx'> 				 u32 idx)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='del'>-		writeq(db-&gt;db_key64 | idx, db-&gt;doorbell);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		bnxt_writeq(bp, db-&gt;db_key64 | DB_RING_IDX(db, idx),</div><div class='add'>+			    db-&gt;doorbell);</div><div class='ctx'> 	} else {</div><div class='del'>-		u32 db_val = db-&gt;db_key32 | idx;</div><div class='add'>+		u32 db_val = db-&gt;db_key32 | DB_RING_IDX(db, idx);</div><div class='ctx'> </div><div class='ctx'> 		writel(db_val, db-&gt;doorbell);</div><div class='ctx'> 		if (bp-&gt;flags &amp; BNXT_FLAG_DOUBLE_DB)</div><div class='hunk'>@@ -1708,111 +2878,114 @@ static inline void bnxt_db_write(struct bnxt *bp, struct bnxt_db_info *db,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline bool bnxt_cfa_hwrm_message(u16 req_type)</div><div class='add'>+/* Must hold rtnl_lock */</div><div class='add'>+static inline bool bnxt_sriov_cfg(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	switch (req_type) {</div><div class='del'>-	case HWRM_CFA_ENCAP_RECORD_ALLOC:</div><div class='del'>-	case HWRM_CFA_ENCAP_RECORD_FREE:</div><div class='del'>-	case HWRM_CFA_DECAP_FILTER_ALLOC:</div><div class='del'>-	case HWRM_CFA_DECAP_FILTER_FREE:</div><div class='del'>-	case HWRM_CFA_NTUPLE_FILTER_ALLOC:</div><div class='del'>-	case HWRM_CFA_NTUPLE_FILTER_FREE:</div><div class='del'>-	case HWRM_CFA_NTUPLE_FILTER_CFG:</div><div class='del'>-	case HWRM_CFA_EM_FLOW_ALLOC:</div><div class='del'>-	case HWRM_CFA_EM_FLOW_FREE:</div><div class='del'>-	case HWRM_CFA_EM_FLOW_CFG:</div><div class='del'>-	case HWRM_CFA_FLOW_ALLOC:</div><div class='del'>-	case HWRM_CFA_FLOW_FREE:</div><div class='del'>-	case HWRM_CFA_FLOW_INFO:</div><div class='del'>-	case HWRM_CFA_FLOW_FLUSH:</div><div class='del'>-	case HWRM_CFA_FLOW_STATS:</div><div class='del'>-	case HWRM_CFA_METER_PROFILE_ALLOC:</div><div class='del'>-	case HWRM_CFA_METER_PROFILE_FREE:</div><div class='del'>-	case HWRM_CFA_METER_PROFILE_CFG:</div><div class='del'>-	case HWRM_CFA_METER_INSTANCE_ALLOC:</div><div class='del'>-	case HWRM_CFA_METER_INSTANCE_FREE:</div><div class='del'>-		return true;</div><div class='del'>-	default:</div><div class='del'>-		return false;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bnxt_kong_hwrm_message(struct bnxt *bp, struct input *req)</div><div class='del'>-{</div><div class='del'>-	return (bp-&gt;fw_cap &amp; BNXT_FW_CAP_KONG_MB_CHNL &amp;&amp;</div><div class='del'>-		bnxt_cfa_hwrm_message(le16_to_cpu(req-&gt;req_type)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline bool bnxt_hwrm_kong_chnl(struct bnxt *bp, struct input *req)</div><div class='del'>-{</div><div class='del'>-	return (bp-&gt;fw_cap &amp; BNXT_FW_CAP_KONG_MB_CHNL &amp;&amp;</div><div class='del'>-		req-&gt;resp_addr == cpu_to_le64(bp-&gt;hwrm_cmd_kong_resp_dma_addr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void *bnxt_get_hwrm_resp_addr(struct bnxt *bp, void *req)</div><div class='del'>-{</div><div class='del'>-	if (bnxt_hwrm_kong_chnl(bp, (struct input *)req))</div><div class='del'>-		return bp-&gt;hwrm_cmd_kong_resp_addr;</div><div class='del'>-	else</div><div class='del'>-		return bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 bnxt_get_hwrm_seq_id(struct bnxt *bp, u16 dst)</div><div class='del'>-{</div><div class='del'>-	u16 seq_id;</div><div class='del'>-</div><div class='del'>-	if (dst == BNXT_HWRM_CHNL_CHIMP)</div><div class='del'>-		seq_id = bp-&gt;hwrm_cmd_seq++;</div><div class='del'>-	else</div><div class='del'>-		seq_id = bp-&gt;hwrm_cmd_kong_seq++;</div><div class='del'>-	return seq_id;</div><div class='add'>+#if defined(CONFIG_BNXT_SRIOV)</div><div class='add'>+	return BNXT_PF(bp) &amp;&amp; (bp-&gt;pf.active_vfs || bp-&gt;sriov_cfg);</div><div class='add'>+#else</div><div class='add'>+	return false;</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+extern const u16 bnxt_bstore_to_trace[];</div><div class='ctx'> extern const u16 bnxt_lhint_arr[];</div><div class='ctx'> </div><div class='ctx'> int bnxt_alloc_rx_data(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='ctx'> 		       u16 prod, gfp_t gfp);</div><div class='ctx'> void bnxt_reuse_rx_data(struct bnxt_rx_ring_info *rxr, u16 cons, void *data);</div><div class='add'>+u32 bnxt_fw_health_readl(struct bnxt *bp, int reg_idx);</div><div class='add'>+bool bnxt_bs_trace_avail(struct bnxt *bp, u16 type);</div><div class='ctx'> void bnxt_set_tpa_flags(struct bnxt *bp);</div><div class='ctx'> void bnxt_set_ring_params(struct bnxt *);</div><div class='del'>-int bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode);</div><div class='del'>-void bnxt_hwrm_cmd_hdr_init(struct bnxt *, void *, u16, u16, u16);</div><div class='del'>-int _hwrm_send_message(struct bnxt *, void *, u32, int);</div><div class='del'>-int _hwrm_send_message_silent(struct bnxt *bp, void *msg, u32 len, int timeout);</div><div class='del'>-int hwrm_send_message(struct bnxt *, void *, u32, int);</div><div class='del'>-int hwrm_send_message_silent(struct bnxt *, void *, u32, int);</div><div class='del'>-int bnxt_hwrm_func_rgtr_async_events(struct bnxt *bp, unsigned long *bmap,</div><div class='del'>-				     int bmap_size);</div><div class='del'>-int bnxt_hwrm_vnic_cfg(struct bnxt *bp, u16 vnic_id);</div><div class='add'>+void bnxt_set_rx_skb_mode(struct bnxt *bp, bool page_mode);</div><div class='add'>+void bnxt_insert_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr);</div><div class='add'>+void bnxt_del_one_usr_fltr(struct bnxt *bp, struct bnxt_filter_base *fltr);</div><div class='add'>+int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp, unsigned long *bmap,</div><div class='add'>+			    int bmap_size, bool async_only);</div><div class='add'>+int bnxt_hwrm_func_drv_unrgtr(struct bnxt *bp);</div><div class='add'>+void bnxt_del_l2_filter(struct bnxt *bp, struct bnxt_l2_filter *fltr);</div><div class='add'>+struct bnxt_l2_filter *bnxt_alloc_new_l2_filter(struct bnxt *bp,</div><div class='add'>+						struct bnxt_l2_key *key,</div><div class='add'>+						u16 flags);</div><div class='add'>+int bnxt_hwrm_l2_filter_free(struct bnxt *bp, struct bnxt_l2_filter *fltr);</div><div class='add'>+int bnxt_hwrm_l2_filter_alloc(struct bnxt *bp, struct bnxt_l2_filter *fltr);</div><div class='add'>+int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_ntuple_filter *fltr);</div><div class='add'>+int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,</div><div class='add'>+				      struct bnxt_ntuple_filter *fltr);</div><div class='add'>+int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+			   u32 tpa_flags);</div><div class='add'>+void bnxt_fill_ipv6_mask(__be32 mask[4]);</div><div class='add'>+void bnxt_set_dflt_rss_indir_tbl(struct bnxt *bp,</div><div class='add'>+				 struct ethtool_rxfh_context *rss_ctx);</div><div class='add'>+int bnxt_get_nr_rss_ctxs(struct bnxt *bp, int rx_rings);</div><div class='add'>+int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic);</div><div class='add'>+int bnxt_hwrm_vnic_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+			 unsigned int start_rx_ring_idx,</div><div class='add'>+			 unsigned int nr_rings);</div><div class='ctx'> int __bnxt_hwrm_get_tx_rings(struct bnxt *bp, u16 fid, int *tx_rings);</div><div class='ctx'> int bnxt_nq_rings_in_use(struct bnxt *bp);</div><div class='ctx'> int bnxt_hwrm_set_coal(struct bnxt *);</div><div class='add'>+size_t bnxt_copy_ctx_mem(struct bnxt *bp, struct bnxt_ctx_mem_type *ctxm,</div><div class='add'>+			 void *buf, size_t offset);</div><div class='add'>+void bnxt_free_ctx_mem(struct bnxt *bp, bool force);</div><div class='add'>+int bnxt_num_tx_to_cp(struct bnxt *bp, int tx);</div><div class='ctx'> unsigned int bnxt_get_max_func_stat_ctxs(struct bnxt *bp);</div><div class='ctx'> unsigned int bnxt_get_avail_stat_ctxs_for_en(struct bnxt *bp);</div><div class='ctx'> unsigned int bnxt_get_max_func_cp_rings(struct bnxt *bp);</div><div class='ctx'> unsigned int bnxt_get_avail_cp_rings_for_en(struct bnxt *bp);</div><div class='del'>-int bnxt_get_avail_msix(struct bnxt *bp, int num);</div><div class='ctx'> int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init);</div><div class='ctx'> void bnxt_tx_disable(struct bnxt *bp);</div><div class='ctx'> void bnxt_tx_enable(struct bnxt *bp);</div><div class='add'>+void bnxt_sched_reset_txr(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='add'>+			  u16 curr);</div><div class='add'>+void bnxt_report_link(struct bnxt *bp);</div><div class='add'>+int bnxt_update_link(struct bnxt *bp, bool chng_link_state);</div><div class='ctx'> int bnxt_hwrm_set_pause(struct bnxt *);</div><div class='ctx'> int bnxt_hwrm_set_link_setting(struct bnxt *, bool, bool);</div><div class='add'>+void bnxt_clear_reservations(struct bnxt *bp, bool fw_reset);</div><div class='add'>+int bnxt_cancel_reservations(struct bnxt *bp, bool fw_reset);</div><div class='ctx'> int bnxt_hwrm_alloc_wol_fltr(struct bnxt *bp);</div><div class='ctx'> int bnxt_hwrm_free_wol_fltr(struct bnxt *bp);</div><div class='ctx'> int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp, bool all);</div><div class='add'>+int bnxt_hwrm_func_qcaps(struct bnxt *bp);</div><div class='ctx'> int bnxt_hwrm_fw_set_time(struct bnxt *);</div><div class='add'>+int bnxt_hwrm_vnic_update(struct bnxt *bp, struct bnxt_vnic_info *vnic,</div><div class='add'>+			  u8 valid);</div><div class='add'>+int bnxt_hwrm_vnic_rss_cfg_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic);</div><div class='add'>+int __bnxt_setup_vnic_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic);</div><div class='add'>+void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,</div><div class='add'>+			  bool all);</div><div class='ctx'> int bnxt_open_nic(struct bnxt *, bool, bool);</div><div class='ctx'> int bnxt_half_open_nic(struct bnxt *bp);</div><div class='ctx'> void bnxt_half_close_nic(struct bnxt *bp);</div><div class='del'>-int bnxt_close_nic(struct bnxt *, bool, bool);</div><div class='add'>+void bnxt_reenable_sriov(struct bnxt *bp);</div><div class='add'>+void bnxt_close_nic(struct bnxt *, bool, bool);</div><div class='add'>+void bnxt_get_ring_err_stats(struct bnxt *bp,</div><div class='add'>+			     struct bnxt_total_ring_err_stats *stats);</div><div class='add'>+bool bnxt_rfs_capable(struct bnxt *bp, bool new_rss_ctx);</div><div class='add'>+int bnxt_dbg_hwrm_rd_reg(struct bnxt *bp, u32 reg_off, u16 num_words,</div><div class='add'>+			 u32 *reg_buf);</div><div class='add'>+void bnxt_fw_exception(struct bnxt *bp);</div><div class='add'>+void bnxt_fw_reset(struct bnxt *bp);</div><div class='ctx'> int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs,</div><div class='ctx'> 		     int tx_xdp);</div><div class='add'>+int bnxt_fw_init_one(struct bnxt *bp);</div><div class='add'>+bool bnxt_hwrm_reset_permitted(struct bnxt *bp);</div><div class='ctx'> int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);</div><div class='add'>+struct bnxt_ntuple_filter *bnxt_lookup_ntp_filter_from_idx(struct bnxt *bp,</div><div class='add'>+				struct bnxt_ntuple_filter *fltr, u32 idx);</div><div class='add'>+u32 bnxt_get_ntp_filter_idx(struct bnxt *bp, struct flow_keys *fkeys,</div><div class='add'>+			    const struct sk_buff *skb);</div><div class='add'>+int bnxt_insert_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr,</div><div class='add'>+			   u32 idx);</div><div class='add'>+void bnxt_del_ntp_filter(struct bnxt *bp, struct bnxt_ntuple_filter *fltr);</div><div class='ctx'> int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);</div><div class='ctx'> int bnxt_restore_pf_fw_resources(struct bnxt *bp);</div><div class='ctx'> int bnxt_get_port_parent_id(struct net_device *dev,</div><div class='ctx'> 			    struct netdev_phys_item_id *ppid);</div><div class='ctx'> void bnxt_dim_work(struct work_struct *work);</div><div class='ctx'> int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi);</div><div class='del'>-</div><div class='add'>+void bnxt_print_device_info(struct bnxt *bp);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c<br/>new file mode 100644<br/>index 000000000000..ccb8b509662d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c</a></div><div class='hunk'>@@ -0,0 +1,677 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2021 Broadcom Limited</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+#include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='add'>+#include "bnxt_coredump.h"</div><div class='add'>+</div><div class='add'>+static const u16 bnxt_bstore_to_seg_id[] = {</div><div class='add'>+	[BNXT_CTX_QP]			= BNXT_CTX_MEM_SEG_QP,</div><div class='add'>+	[BNXT_CTX_SRQ]			= BNXT_CTX_MEM_SEG_SRQ,</div><div class='add'>+	[BNXT_CTX_CQ]			= BNXT_CTX_MEM_SEG_CQ,</div><div class='add'>+	[BNXT_CTX_VNIC]			= BNXT_CTX_MEM_SEG_VNIC,</div><div class='add'>+	[BNXT_CTX_STAT]			= BNXT_CTX_MEM_SEG_STAT,</div><div class='add'>+	[BNXT_CTX_STQM]			= BNXT_CTX_MEM_SEG_STQM,</div><div class='add'>+	[BNXT_CTX_FTQM]			= BNXT_CTX_MEM_SEG_FTQM,</div><div class='add'>+	[BNXT_CTX_MRAV]			= BNXT_CTX_MEM_SEG_MRAV,</div><div class='add'>+	[BNXT_CTX_TIM]			= BNXT_CTX_MEM_SEG_TIM,</div><div class='add'>+	[BNXT_CTX_SRT]			= BNXT_CTX_MEM_SEG_SRT,</div><div class='add'>+	[BNXT_CTX_SRT2]			= BNXT_CTX_MEM_SEG_SRT2,</div><div class='add'>+	[BNXT_CTX_CRT]			= BNXT_CTX_MEM_SEG_CRT,</div><div class='add'>+	[BNXT_CTX_CRT2]			= BNXT_CTX_MEM_SEG_CRT2,</div><div class='add'>+	[BNXT_CTX_RIGP0]		= BNXT_CTX_MEM_SEG_RIGP0,</div><div class='add'>+	[BNXT_CTX_L2HWRM]		= BNXT_CTX_MEM_SEG_L2HWRM,</div><div class='add'>+	[BNXT_CTX_REHWRM]		= BNXT_CTX_MEM_SEG_REHWRM,</div><div class='add'>+	[BNXT_CTX_CA0]			= BNXT_CTX_MEM_SEG_CA0,</div><div class='add'>+	[BNXT_CTX_CA1]			= BNXT_CTX_MEM_SEG_CA1,</div><div class='add'>+	[BNXT_CTX_CA2]			= BNXT_CTX_MEM_SEG_CA2,</div><div class='add'>+	[BNXT_CTX_RIGP1]		= BNXT_CTX_MEM_SEG_RIGP1,</div><div class='add'>+	[BNXT_CTX_KONG]			= BNXT_CTX_MEM_SEG_KONG,</div><div class='add'>+	[BNXT_CTX_QPC]			= BNXT_CTX_MEM_SEG_QPC,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bnxt_dbg_hwrm_log_buffer_flush(struct bnxt *bp, u16 type, u32 flags,</div><div class='add'>+					  u32 *offset)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_log_buffer_flush_output *resp;</div><div class='add'>+	struct hwrm_dbg_log_buffer_flush_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_LOG_BUFFER_FLUSH);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	req-&gt;type = cpu_to_le16(type);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		*offset = le32_to_cpu(resp-&gt;current_buffer_offset);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_dbg_dma_data(struct bnxt *bp, void *msg,</div><div class='add'>+				  struct bnxt_hwrm_dbg_dma_info *info)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_cmn_input *cmn_req = msg;</div><div class='add'>+	__le16 *seq_ptr = msg + info-&gt;seq_off;</div><div class='add'>+	struct hwrm_dbg_cmn_output *cmn_resp;</div><div class='add'>+	u16 seq = 0, len, segs_off;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+	void *dma_buf, *resp;</div><div class='add'>+	int rc, off = 0;</div><div class='add'>+</div><div class='add'>+	dma_buf = hwrm_req_dma_slice(bp, msg, info-&gt;dma_len, &amp;dma_handle);</div><div class='add'>+	if (!dma_buf) {</div><div class='add'>+		hwrm_req_drop(bp, msg);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwrm_req_timeout(bp, msg, bp-&gt;hwrm_cmd_max_timeout);</div><div class='add'>+	cmn_resp = hwrm_req_hold(bp, msg);</div><div class='add'>+	resp = cmn_resp;</div><div class='add'>+</div><div class='add'>+	segs_off = offsetof(struct hwrm_dbg_coredump_list_output,</div><div class='add'>+			    total_segments);</div><div class='add'>+	cmn_req-&gt;host_dest_addr = cpu_to_le64(dma_handle);</div><div class='add'>+	cmn_req-&gt;host_buf_len = cpu_to_le32(info-&gt;dma_len);</div><div class='add'>+	while (1) {</div><div class='add'>+		*seq_ptr = cpu_to_le16(seq);</div><div class='add'>+		rc = hwrm_req_send(bp, msg);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		len = le16_to_cpu(*((__le16 *)(resp + info-&gt;data_len_off)));</div><div class='add'>+		if (!seq &amp;&amp;</div><div class='add'>+		    cmn_req-&gt;req_type == cpu_to_le16(HWRM_DBG_COREDUMP_LIST)) {</div><div class='add'>+			info-&gt;segs = le16_to_cpu(*((__le16 *)(resp +</div><div class='add'>+							      segs_off)));</div><div class='add'>+			if (!info-&gt;segs) {</div><div class='add'>+				rc = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			info-&gt;dest_buf_size = info-&gt;segs *</div><div class='add'>+					sizeof(struct coredump_segment_record);</div><div class='add'>+			info-&gt;dest_buf = kmalloc(info-&gt;dest_buf_size,</div><div class='add'>+						 GFP_KERNEL);</div><div class='add'>+			if (!info-&gt;dest_buf) {</div><div class='add'>+				rc = -ENOMEM;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (cmn_req-&gt;req_type ==</div><div class='add'>+				cpu_to_le16(HWRM_DBG_COREDUMP_RETRIEVE))</div><div class='add'>+			info-&gt;dest_buf_size += len;</div><div class='add'>+</div><div class='add'>+		if (info-&gt;dest_buf) {</div><div class='add'>+			if ((info-&gt;seg_start + off + len) &lt;=</div><div class='add'>+			    BNXT_COREDUMP_BUF_LEN(info-&gt;buf_len)) {</div><div class='add'>+				u16 copylen = min_t(u16, len,</div><div class='add'>+						    info-&gt;dest_buf_size - off);</div><div class='add'>+</div><div class='add'>+				memcpy(info-&gt;dest_buf + off, dma_buf, copylen);</div><div class='add'>+				if (copylen &lt; len)</div><div class='add'>+					break;</div><div class='add'>+			} else {</div><div class='add'>+				rc = -ENOBUFS;</div><div class='add'>+				if (cmn_req-&gt;req_type ==</div><div class='add'>+				    cpu_to_le16(HWRM_DBG_COREDUMP_LIST)) {</div><div class='add'>+					kfree(info-&gt;dest_buf);</div><div class='add'>+					info-&gt;dest_buf = NULL;</div><div class='add'>+				}</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!(cmn_resp-&gt;flags &amp; HWRM_DBG_CMN_FLAGS_MORE))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		seq++;</div><div class='add'>+		off += len;</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, msg);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_dbg_coredump_list(struct bnxt *bp,</div><div class='add'>+				       struct bnxt_coredump *coredump)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_dbg_dma_info info = {NULL};</div><div class='add'>+	struct hwrm_dbg_coredump_list_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_COREDUMP_LIST);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	info.dma_len = COREDUMP_LIST_BUF_LEN;</div><div class='add'>+	info.seq_off = offsetof(struct hwrm_dbg_coredump_list_input, seq_no);</div><div class='add'>+	info.data_len_off = offsetof(struct hwrm_dbg_coredump_list_output,</div><div class='add'>+				     data_len);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_dbg_dma_data(bp, req, &amp;info);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		coredump-&gt;data = info.dest_buf;</div><div class='add'>+		coredump-&gt;data_size = info.dest_buf_size;</div><div class='add'>+		coredump-&gt;total_segs = info.segs;</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_dbg_coredump_initiate(struct bnxt *bp, u16 dump_type,</div><div class='add'>+					   u16 component_id, u16 segment_id)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_coredump_initiate_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_COREDUMP_INITIATE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	hwrm_req_timeout(bp, req, bp-&gt;hwrm_cmd_max_timeout);</div><div class='add'>+	req-&gt;component_id = cpu_to_le16(component_id);</div><div class='add'>+	req-&gt;segment_id = cpu_to_le16(segment_id);</div><div class='add'>+	if (dump_type == BNXT_DUMP_LIVE_WITH_CTX_L1_CACHE)</div><div class='add'>+		req-&gt;seg_flags = DBG_COREDUMP_INITIATE_REQ_SEG_FLAGS_COLLECT_CTX_L1_CACHE;</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_dbg_coredump_retrieve(struct bnxt *bp, u16 component_id,</div><div class='add'>+					   u16 segment_id, u32 *seg_len,</div><div class='add'>+					   void *buf, u32 buf_len, u32 offset)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_coredump_retrieve_input *req;</div><div class='add'>+	struct bnxt_hwrm_dbg_dma_info info = {NULL};</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_COREDUMP_RETRIEVE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;component_id = cpu_to_le16(component_id);</div><div class='add'>+	req-&gt;segment_id = cpu_to_le16(segment_id);</div><div class='add'>+</div><div class='add'>+	info.dma_len = COREDUMP_RETRIEVE_BUF_LEN;</div><div class='add'>+	info.seq_off = offsetof(struct hwrm_dbg_coredump_retrieve_input,</div><div class='add'>+				seq_no);</div><div class='add'>+	info.data_len_off = offsetof(struct hwrm_dbg_coredump_retrieve_output,</div><div class='add'>+				     data_len);</div><div class='add'>+	if (buf) {</div><div class='add'>+		info.dest_buf = buf + offset;</div><div class='add'>+		info.buf_len = buf_len;</div><div class='add'>+		info.seg_start = offset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_dbg_dma_data(bp, req, &amp;info);</div><div class='add'>+	if (!rc)</div><div class='add'>+		*seg_len = info.dest_buf_size;</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+bnxt_fill_coredump_seg_hdr(struct bnxt *bp,</div><div class='add'>+			   struct bnxt_coredump_segment_hdr *seg_hdr,</div><div class='add'>+			   struct coredump_segment_record *seg_rec, u32 seg_len,</div><div class='add'>+			   int status, u32 duration, u32 instance, u32 comp_id,</div><div class='add'>+			   u32 seg_id)</div><div class='add'>+{</div><div class='add'>+	memset(seg_hdr, 0, sizeof(*seg_hdr));</div><div class='add'>+	memcpy(seg_hdr-&gt;signature, "sEgM", 4);</div><div class='add'>+	if (seg_rec) {</div><div class='add'>+		seg_hdr-&gt;component_id = (__force __le32)seg_rec-&gt;component_id;</div><div class='add'>+		seg_hdr-&gt;segment_id = (__force __le32)seg_rec-&gt;segment_id;</div><div class='add'>+		seg_hdr-&gt;low_version = seg_rec-&gt;version_low;</div><div class='add'>+		seg_hdr-&gt;high_version = seg_rec-&gt;version_hi;</div><div class='add'>+		seg_hdr-&gt;flags = cpu_to_le32(seg_rec-&gt;compress_flags);</div><div class='add'>+	} else {</div><div class='add'>+		seg_hdr-&gt;component_id = cpu_to_le32(comp_id);</div><div class='add'>+		seg_hdr-&gt;segment_id = cpu_to_le32(seg_id);</div><div class='add'>+	}</div><div class='add'>+	seg_hdr-&gt;function_id = cpu_to_le16(bp-&gt;pdev-&gt;devfn);</div><div class='add'>+	seg_hdr-&gt;length = cpu_to_le32(seg_len);</div><div class='add'>+	seg_hdr-&gt;status = cpu_to_le32(status);</div><div class='add'>+	seg_hdr-&gt;duration = cpu_to_le32(duration);</div><div class='add'>+	seg_hdr-&gt;data_offset = cpu_to_le32(sizeof(*seg_hdr));</div><div class='add'>+	seg_hdr-&gt;instance = cpu_to_le32(instance);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fill_cmdline(struct bnxt_coredump_record *record)</div><div class='add'>+{</div><div class='add'>+	struct mm_struct *mm = current-&gt;mm;</div><div class='add'>+	int i, len, last = 0;</div><div class='add'>+</div><div class='add'>+	if (mm) {</div><div class='add'>+		len = min_t(int, mm-&gt;arg_end - mm-&gt;arg_start,</div><div class='add'>+			    sizeof(record-&gt;commandline) - 1);</div><div class='add'>+		if (len &amp;&amp; !copy_from_user(record-&gt;commandline,</div><div class='add'>+					   (char __user *)mm-&gt;arg_start, len)) {</div><div class='add'>+			for (i = 0; i &lt; len; i++) {</div><div class='add'>+				if (record-&gt;commandline[i])</div><div class='add'>+					last = i;</div><div class='add'>+				else</div><div class='add'>+					record-&gt;commandline[i] = ' ';</div><div class='add'>+			}</div><div class='add'>+			record-&gt;commandline[last + 1] = 0;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	strscpy(record-&gt;commandline, current-&gt;comm, TASK_COMM_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_fill_coredump_record(struct bnxt *bp, struct bnxt_coredump_record *record,</div><div class='add'>+			  time64_t start, s16 start_utc, u16 total_segs,</div><div class='add'>+			  int status)</div><div class='add'>+{</div><div class='add'>+	time64_t end = ktime_get_real_seconds();</div><div class='add'>+	u32 os_ver_major = 0, os_ver_minor = 0;</div><div class='add'>+	struct tm tm;</div><div class='add'>+</div><div class='add'>+	time64_to_tm(start, 0, &amp;tm);</div><div class='add'>+	memset(record, 0, sizeof(*record));</div><div class='add'>+	memcpy(record-&gt;signature, "cOrE", 4);</div><div class='add'>+	record-&gt;flags = 0;</div><div class='add'>+	record-&gt;low_version = 0;</div><div class='add'>+	record-&gt;high_version = 1;</div><div class='add'>+	record-&gt;asic_state = 0;</div><div class='add'>+	strscpy(record-&gt;system_name, utsname()-&gt;nodename,</div><div class='add'>+		sizeof(record-&gt;system_name));</div><div class='add'>+	record-&gt;year = cpu_to_le16(tm.tm_year + 1900);</div><div class='add'>+	record-&gt;month = cpu_to_le16(tm.tm_mon + 1);</div><div class='add'>+	record-&gt;day = cpu_to_le16(tm.tm_mday);</div><div class='add'>+	record-&gt;hour = cpu_to_le16(tm.tm_hour);</div><div class='add'>+	record-&gt;minute = cpu_to_le16(tm.tm_min);</div><div class='add'>+	record-&gt;second = cpu_to_le16(tm.tm_sec);</div><div class='add'>+	record-&gt;utc_bias = cpu_to_le16(start_utc);</div><div class='add'>+	bnxt_fill_cmdline(record);</div><div class='add'>+	record-&gt;total_segments = cpu_to_le32(total_segs);</div><div class='add'>+</div><div class='add'>+	if (sscanf(utsname()-&gt;release, "%u.%u", &amp;os_ver_major, &amp;os_ver_minor) != 2)</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Unknown OS release in coredump\n");</div><div class='add'>+	record-&gt;os_ver_major = cpu_to_le32(os_ver_major);</div><div class='add'>+	record-&gt;os_ver_minor = cpu_to_le32(os_ver_minor);</div><div class='add'>+</div><div class='add'>+	strscpy(record-&gt;os_name, utsname()-&gt;sysname, sizeof(record-&gt;os_name));</div><div class='add'>+	time64_to_tm(end, 0, &amp;tm);</div><div class='add'>+	record-&gt;end_year = cpu_to_le16(tm.tm_year + 1900);</div><div class='add'>+	record-&gt;end_month = cpu_to_le16(tm.tm_mon + 1);</div><div class='add'>+	record-&gt;end_day = cpu_to_le16(tm.tm_mday);</div><div class='add'>+	record-&gt;end_hour = cpu_to_le16(tm.tm_hour);</div><div class='add'>+	record-&gt;end_minute = cpu_to_le16(tm.tm_min);</div><div class='add'>+	record-&gt;end_second = cpu_to_le16(tm.tm_sec);</div><div class='add'>+	record-&gt;end_utc_bias = cpu_to_le16(sys_tz.tz_minuteswest * 60);</div><div class='add'>+	record-&gt;asic_id1 = cpu_to_le32(bp-&gt;chip_num &lt;&lt; 16 |</div><div class='add'>+				       bp-&gt;ver_resp.chip_rev &lt;&lt; 8 |</div><div class='add'>+				       bp-&gt;ver_resp.chip_metal);</div><div class='add'>+	record-&gt;asic_id2 = 0;</div><div class='add'>+	record-&gt;coredump_status = cpu_to_le32(status);</div><div class='add'>+	record-&gt;ioctl_low_version = 0;</div><div class='add'>+	record-&gt;ioctl_high_version = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_fill_drv_seg_record(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_driver_segment_record *record,</div><div class='add'>+				     struct bnxt_ctx_mem_type *ctxm, u16 type)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_bs_trace_info *bs_trace = &amp;bp-&gt;bs_trace[type];</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	record-&gt;max_entries = cpu_to_le32(ctxm-&gt;max_entries);</div><div class='add'>+	record-&gt;entry_size = cpu_to_le32(ctxm-&gt;entry_size);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_dbg_hwrm_log_buffer_flush(bp, type, 0, &amp;offset);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bnxt_bs_trace_check_wrap(bs_trace, offset);</div><div class='add'>+	record-&gt;offset = cpu_to_le32(bs_trace-&gt;last_offset);</div><div class='add'>+	record-&gt;wrapped = bs_trace-&gt;wrapped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bnxt_get_ctx_coredump(struct bnxt *bp, void *buf, u32 offset,</div><div class='add'>+				 u32 *segs)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_driver_segment_record record = {};</div><div class='add'>+	struct bnxt_coredump_segment_hdr seg_hdr;</div><div class='add'>+	struct bnxt_ctx_mem_info *ctx = bp-&gt;ctx;</div><div class='add'>+	u32 comp_id = BNXT_DRV_COMP_ID;</div><div class='add'>+	void *data = NULL;</div><div class='add'>+	size_t len = 0;</div><div class='add'>+	u16 type;</div><div class='add'>+</div><div class='add'>+	*segs = 0;</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (buf)</div><div class='add'>+		buf += offset;</div><div class='add'>+	for (type = 0; type &lt; BNXT_CTX_V2_MAX; type++) {</div><div class='add'>+		struct bnxt_ctx_mem_type *ctxm = &amp;ctx-&gt;ctx_arr[type];</div><div class='add'>+		bool trace = bnxt_bs_trace_avail(bp, type);</div><div class='add'>+		u32 seg_id = bnxt_bstore_to_seg_id[type];</div><div class='add'>+		size_t seg_len, extra_hlen = 0;</div><div class='add'>+</div><div class='add'>+		if (!ctxm-&gt;mem_valid || !seg_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (trace) {</div><div class='add'>+			extra_hlen = BNXT_SEG_RCD_LEN;</div><div class='add'>+			if (buf) {</div><div class='add'>+				u16 trace_type = bnxt_bstore_to_trace[type];</div><div class='add'>+</div><div class='add'>+				bnxt_fill_drv_seg_record(bp, &amp;record, ctxm,</div><div class='add'>+							 trace_type);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (buf)</div><div class='add'>+			data = buf + BNXT_SEG_HDR_LEN + extra_hlen;</div><div class='add'>+</div><div class='add'>+		seg_len = bnxt_copy_ctx_mem(bp, ctxm, data, 0) + extra_hlen;</div><div class='add'>+		if (buf) {</div><div class='add'>+			bnxt_fill_coredump_seg_hdr(bp, &amp;seg_hdr, NULL, seg_len,</div><div class='add'>+						   0, 0, 0, comp_id, seg_id);</div><div class='add'>+			memcpy(buf, &amp;seg_hdr, BNXT_SEG_HDR_LEN);</div><div class='add'>+			buf += BNXT_SEG_HDR_LEN;</div><div class='add'>+			if (trace)</div><div class='add'>+				memcpy(buf, &amp;record, BNXT_SEG_RCD_LEN);</div><div class='add'>+			buf += seg_len;</div><div class='add'>+		}</div><div class='add'>+		len += BNXT_SEG_HDR_LEN + seg_len;</div><div class='add'>+		*segs += 1;</div><div class='add'>+	}</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bnxt_get_coredump(struct bnxt *bp, u16 dump_type, void *buf,</div><div class='add'>+			       u32 *dump_len)</div><div class='add'>+{</div><div class='add'>+	u32 ver_get_resp_len = sizeof(struct hwrm_ver_get_output);</div><div class='add'>+	u32 offset = 0, seg_hdr_len, seg_record_len, buf_len = 0;</div><div class='add'>+	struct coredump_segment_record *seg_record = NULL;</div><div class='add'>+	struct bnxt_coredump_segment_hdr seg_hdr;</div><div class='add'>+	struct bnxt_coredump coredump = {NULL};</div><div class='add'>+	time64_t start_time;</div><div class='add'>+	u16 start_utc;</div><div class='add'>+	int rc = 0, i;</div><div class='add'>+</div><div class='add'>+	if (buf)</div><div class='add'>+		buf_len = *dump_len;</div><div class='add'>+</div><div class='add'>+	start_time = ktime_get_real_seconds();</div><div class='add'>+	start_utc = sys_tz.tz_minuteswest * 60;</div><div class='add'>+	seg_hdr_len = sizeof(seg_hdr);</div><div class='add'>+</div><div class='add'>+	/* First segment should be hwrm_ver_get response.</div><div class='add'>+	 * For hwrm_ver_get response Component id = 2 and Segment id = 0.</div><div class='add'>+	 */</div><div class='add'>+	*dump_len = seg_hdr_len + ver_get_resp_len;</div><div class='add'>+	if (buf) {</div><div class='add'>+		bnxt_fill_coredump_seg_hdr(bp, &amp;seg_hdr, NULL, ver_get_resp_len,</div><div class='add'>+					   0, 0, 0, BNXT_VER_GET_COMP_ID, 0);</div><div class='add'>+		memcpy(buf + offset, &amp;seg_hdr, seg_hdr_len);</div><div class='add'>+		offset += seg_hdr_len;</div><div class='add'>+		memcpy(buf + offset, &amp;bp-&gt;ver_resp, ver_get_resp_len);</div><div class='add'>+		offset += ver_get_resp_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump_type == BNXT_DUMP_DRIVER) {</div><div class='add'>+		u32 drv_len, segs = 0;</div><div class='add'>+</div><div class='add'>+		drv_len = bnxt_get_ctx_coredump(bp, buf, offset, &amp;segs);</div><div class='add'>+		*dump_len += drv_len;</div><div class='add'>+		offset += drv_len;</div><div class='add'>+		if (buf)</div><div class='add'>+			coredump.total_segs += segs;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	seg_record_len = sizeof(*seg_record);</div><div class='add'>+	rc = bnxt_hwrm_dbg_coredump_list(bp, &amp;coredump);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "Failed to get coredump segment list\n");</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*dump_len += seg_hdr_len * coredump.total_segs;</div><div class='add'>+</div><div class='add'>+	seg_record = (struct coredump_segment_record *)coredump.data;</div><div class='add'>+	seg_record_len = sizeof(*seg_record);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; coredump.total_segs; i++) {</div><div class='add'>+		u16 comp_id = le16_to_cpu(seg_record-&gt;component_id);</div><div class='add'>+		u16 seg_id = le16_to_cpu(seg_record-&gt;segment_id);</div><div class='add'>+		u32 duration = 0, seg_len = 0;</div><div class='add'>+		unsigned long start, end;</div><div class='add'>+</div><div class='add'>+		if (buf &amp;&amp; ((offset + seg_hdr_len) &gt;</div><div class='add'>+			    BNXT_COREDUMP_BUF_LEN(buf_len))) {</div><div class='add'>+			rc = -ENOBUFS;</div><div class='add'>+			goto err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		start = jiffies;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_hwrm_dbg_coredump_initiate(bp, dump_type, comp_id,</div><div class='add'>+						     seg_id);</div><div class='add'>+		if (rc) {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "Failed to initiate coredump for seg = %d\n",</div><div class='add'>+				   seg_record-&gt;segment_id);</div><div class='add'>+			goto next_seg;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Write segment data into the buffer */</div><div class='add'>+		rc = bnxt_hwrm_dbg_coredump_retrieve(bp, comp_id, seg_id,</div><div class='add'>+						     &amp;seg_len, buf, buf_len,</div><div class='add'>+						     offset + seg_hdr_len);</div><div class='add'>+		if (rc &amp;&amp; rc == -ENOBUFS)</div><div class='add'>+			goto err;</div><div class='add'>+		else if (rc)</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "Failed to retrieve coredump for seg = %d\n",</div><div class='add'>+				   seg_record-&gt;segment_id);</div><div class='add'>+</div><div class='add'>+next_seg:</div><div class='add'>+		end = jiffies;</div><div class='add'>+		duration = jiffies_to_msecs(end - start);</div><div class='add'>+		bnxt_fill_coredump_seg_hdr(bp, &amp;seg_hdr, seg_record, seg_len,</div><div class='add'>+					   rc, duration, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+		if (buf) {</div><div class='add'>+			/* Write segment header into the buffer */</div><div class='add'>+			memcpy(buf + offset, &amp;seg_hdr, seg_hdr_len);</div><div class='add'>+			offset += seg_hdr_len + seg_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*dump_len += seg_len;</div><div class='add'>+		seg_record =</div><div class='add'>+			(struct coredump_segment_record *)((u8 *)seg_record +</div><div class='add'>+							   seg_record_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	if (buf)</div><div class='add'>+		bnxt_fill_coredump_record(bp, buf + offset, start_time,</div><div class='add'>+					  start_utc, coredump.total_segs + 1,</div><div class='add'>+					  rc);</div><div class='add'>+	kfree(coredump.data);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		*dump_len += sizeof(struct bnxt_coredump_record);</div><div class='add'>+		/* The actual coredump length can be smaller than the FW</div><div class='add'>+		 * reported length earlier.  Use the ethtool provided length.</div><div class='add'>+		 */</div><div class='add'>+		if (buf_len)</div><div class='add'>+			*dump_len = buf_len;</div><div class='add'>+	} else if (rc == -ENOBUFS) {</div><div class='add'>+		netdev_err(bp-&gt;dev, "Firmware returned large coredump buffer\n");</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bnxt_copy_crash_data(struct bnxt_ring_mem_info *rmem, void *buf,</div><div class='add'>+				u32 dump_len)</div><div class='add'>+{</div><div class='add'>+	u32 data_copied = 0;</div><div class='add'>+	u32 data_len;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='add'>+		data_len = rmem-&gt;page_size;</div><div class='add'>+		if (data_copied + data_len &gt; dump_len)</div><div class='add'>+			data_len = dump_len - data_copied;</div><div class='add'>+		memcpy(buf + data_copied, rmem-&gt;pg_arr[i], data_len);</div><div class='add'>+		data_copied += data_len;</div><div class='add'>+		if (data_copied &gt;= dump_len)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return data_copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_copy_crash_dump(struct bnxt *bp, void *buf, u32 dump_len)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ring_mem_info *rmem;</div><div class='add'>+	u32 offset = 0;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;fw_crash_mem)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	rmem = &amp;bp-&gt;fw_crash_mem-&gt;ring_mem;</div><div class='add'>+</div><div class='add'>+	if (rmem-&gt;depth &gt; 1) {</div><div class='add'>+		int i;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; rmem-&gt;nr_pages; i++) {</div><div class='add'>+			struct bnxt_ctx_pg_info *pg_tbl;</div><div class='add'>+</div><div class='add'>+			pg_tbl = bp-&gt;fw_crash_mem-&gt;ctx_pg_tbl[i];</div><div class='add'>+			offset += bnxt_copy_crash_data(&amp;pg_tbl-&gt;ring_mem,</div><div class='add'>+						       buf + offset,</div><div class='add'>+						       dump_len - offset);</div><div class='add'>+			if (offset &gt;= dump_len)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		bnxt_copy_crash_data(rmem, buf, dump_len);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_crash_dump_avail(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u32 sig = 0;</div><div class='add'>+</div><div class='add'>+	/* First 4 bytes(signature) of crash dump is always non-zero */</div><div class='add'>+	bnxt_copy_crash_dump(bp, &amp;sig, sizeof(sig));</div><div class='add'>+	return !!sig;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_get_coredump(struct bnxt *bp, u16 dump_type, void *buf, u32 *dump_len)</div><div class='add'>+{</div><div class='add'>+	if (dump_type == BNXT_DUMP_CRASH) {</div><div class='add'>+		if (bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR)</div><div class='add'>+			return bnxt_copy_crash_dump(bp, buf, *dump_len);</div><div class='add'>+#ifdef CONFIG_TEE_BNXT_FW</div><div class='add'>+		else if (bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_SOC_DDR)</div><div class='add'>+			return tee_bnxt_copy_coredump(buf, 0, *dump_len);</div><div class='add'>+#endif</div><div class='add'>+		else</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	} else {</div><div class='add'>+		return __bnxt_get_coredump(bp, dump_type, buf, dump_len);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_hwrm_get_dump_len(struct bnxt *bp, u16 dump_type, u32 *dump_len)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_dbg_qcfg_output *resp;</div><div class='add'>+	struct hwrm_dbg_qcfg_input *req;</div><div class='add'>+	int rc, hdr_len = 0;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_DBG_QCAPS))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (dump_type == BNXT_DUMP_CRASH &amp;&amp;</div><div class='add'>+	    !(bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_SOC_DDR ||</div><div class='add'>+	     (bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_DBG_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	if (dump_type == BNXT_DUMP_CRASH) {</div><div class='add'>+		if (bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_SOC_DDR)</div><div class='add'>+			req-&gt;flags = cpu_to_le16(BNXT_DBG_FL_CR_DUMP_SIZE_SOC);</div><div class='add'>+		else</div><div class='add'>+			req-&gt;flags = cpu_to_le16(BNXT_DBG_FL_CR_DUMP_SIZE_HOST);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto get_dump_len_exit;</div><div class='add'>+</div><div class='add'>+	if (dump_type == BNXT_DUMP_CRASH) {</div><div class='add'>+		if (bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_SOC_DDR)</div><div class='add'>+			*dump_len = BNXT_CRASH_DUMP_LEN;</div><div class='add'>+		else</div><div class='add'>+			*dump_len = le32_to_cpu(resp-&gt;crashdump_size);</div><div class='add'>+	} else {</div><div class='add'>+		/* Driver adds coredump header and "HWRM_VER_GET response"</div><div class='add'>+		 * segment additionally to coredump.</div><div class='add'>+		 */</div><div class='add'>+		hdr_len = sizeof(struct bnxt_coredump_segment_hdr) +</div><div class='add'>+		sizeof(struct hwrm_ver_get_output) +</div><div class='add'>+		sizeof(struct bnxt_coredump_record);</div><div class='add'>+		*dump_len = le32_to_cpu(resp-&gt;coredump_size) + hdr_len;</div><div class='add'>+	}</div><div class='add'>+	if (*dump_len &lt;= hdr_len)</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+</div><div class='add'>+get_dump_len_exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 bnxt_get_coredump_length(struct bnxt *bp, u16 dump_type)</div><div class='add'>+{</div><div class='add'>+	u32 len = 0;</div><div class='add'>+</div><div class='add'>+	if (dump_type == BNXT_DUMP_CRASH &amp;&amp;</div><div class='add'>+	    bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR &amp;&amp;</div><div class='add'>+	    bp-&gt;fw_crash_mem) {</div><div class='add'>+		if (!bnxt_crash_dump_avail(bp))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		return bp-&gt;fw_crash_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dump_type != BNXT_DUMP_DRIVER) {</div><div class='add'>+		if (!bnxt_hwrm_get_dump_len(bp, dump_type, &amp;len))</div><div class='add'>+			return len;</div><div class='add'>+	}</div><div class='add'>+	if (dump_type != BNXT_DUMP_CRASH)</div><div class='add'>+		__bnxt_get_coredump(bp, dump_type, NULL, &amp;len);</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h<br/>index 09c22f8fe399..c087df88154a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h</a></div><div class='hunk'>@@ -10,6 +10,10 @@</div><div class='ctx'> #ifndef BNXT_COREDUMP_H</div><div class='ctx'> #define BNXT_COREDUMP_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/utsname.h&gt;</div><div class='add'>+#include &lt;linux/time.h&gt;</div><div class='add'>+#include &lt;linux/rtc.h&gt;</div><div class='add'>+</div><div class='ctx'> struct bnxt_coredump_segment_hdr {</div><div class='ctx'> 	__u8 signature[4];</div><div class='ctx'> 	__le32 component_id;</div><div class='hunk'>@@ -63,4 +67,104 @@ struct bnxt_coredump_record {</div><div class='ctx'> 	__u8 ioctl_high_version;</div><div class='ctx'> 	__le16 rsvd3[313];</div><div class='ctx'> };</div><div class='add'>+</div><div class='add'>+struct bnxt_driver_segment_record {</div><div class='add'>+	__le32 max_entries;</div><div class='add'>+	__le32 entry_size;</div><div class='add'>+	__le32 offset;</div><div class='add'>+	__u8 wrapped:1;</div><div class='add'>+	__u8 unused[3];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_VER_GET_COMP_ID	2</div><div class='add'>+#define BNXT_DRV_COMP_ID	0xd</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_MEM_SEG_ID_START  0x200</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_MEM_SEG_QP	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_QP)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_SRQ	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_SRQ)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_CQ	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_CQ)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_VNIC	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_VNIC)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_STAT	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_STAT)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_STQM	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_STQM)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_FTQM	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_FTQM)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_MRAV	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_MRAV)</div><div class='add'>+#define BNXT_CTX_MEM_SEG_TIM	(BNXT_CTX_MEM_SEG_ID_START + BNXT_CTX_TIM)</div><div class='add'>+</div><div class='add'>+#define BNXT_CTX_MEM_SEG_SRT	0x1</div><div class='add'>+#define BNXT_CTX_MEM_SEG_SRT2	0x2</div><div class='add'>+#define BNXT_CTX_MEM_SEG_CRT	0x3</div><div class='add'>+#define BNXT_CTX_MEM_SEG_CRT2	0x4</div><div class='add'>+#define BNXT_CTX_MEM_SEG_RIGP0	0x5</div><div class='add'>+#define BNXT_CTX_MEM_SEG_L2HWRM	0x6</div><div class='add'>+#define BNXT_CTX_MEM_SEG_REHWRM	0x7</div><div class='add'>+#define BNXT_CTX_MEM_SEG_CA0	0x8</div><div class='add'>+#define BNXT_CTX_MEM_SEG_CA1	0x9</div><div class='add'>+#define BNXT_CTX_MEM_SEG_CA2	0xa</div><div class='add'>+#define BNXT_CTX_MEM_SEG_RIGP1	0xb</div><div class='add'>+#define BNXT_CTX_MEM_SEG_QPC	0xc</div><div class='add'>+#define BNXT_CTX_MEM_SEG_KONG	0xd</div><div class='add'>+</div><div class='add'>+#define BNXT_CRASH_DUMP_LEN	(8 &lt;&lt; 20)</div><div class='add'>+</div><div class='add'>+#define COREDUMP_LIST_BUF_LEN		2048</div><div class='add'>+#define COREDUMP_RETRIEVE_BUF_LEN	4096</div><div class='add'>+</div><div class='add'>+#define BNXT_SEG_HDR_LEN	sizeof(struct bnxt_coredump_segment_hdr)</div><div class='add'>+#define BNXT_SEG_RCD_LEN	sizeof(struct bnxt_driver_segment_record)</div><div class='add'>+</div><div class='add'>+struct bnxt_coredump {</div><div class='add'>+	void		*data;</div><div class='add'>+	int		data_size;</div><div class='add'>+	u16		total_segs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_COREDUMP_BUF_LEN(len) ((len) - sizeof(struct bnxt_coredump_record))</div><div class='add'>+</div><div class='add'>+struct bnxt_hwrm_dbg_dma_info {</div><div class='add'>+	void *dest_buf;</div><div class='add'>+	int dest_buf_size;</div><div class='add'>+	u16 dma_len;</div><div class='add'>+	u16 seq_off;</div><div class='add'>+	u16 data_len_off;</div><div class='add'>+	u16 segs;</div><div class='add'>+	u32 seg_start;</div><div class='add'>+	u32 buf_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hwrm_dbg_cmn_input {</div><div class='add'>+	__le16 req_type;</div><div class='add'>+	__le16 cmpl_ring;</div><div class='add'>+	__le16 seq_id;</div><div class='add'>+	__le16 target_id;</div><div class='add'>+	__le64 resp_addr;</div><div class='add'>+	__le64 host_dest_addr;</div><div class='add'>+	__le32 host_buf_len;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct hwrm_dbg_cmn_output {</div><div class='add'>+	__le16 error_code;</div><div class='add'>+	__le16 req_type;</div><div class='add'>+	__le16 seq_id;</div><div class='add'>+	__le16 resp_len;</div><div class='add'>+	u8 flags;</div><div class='add'>+	#define HWRM_DBG_CMN_FLAGS_MORE	1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_DBG_FL_CR_DUMP_SIZE_SOC	\</div><div class='add'>+	DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_DEST_SOC_DDR</div><div class='add'>+#define BNXT_DBG_FL_CR_DUMP_SIZE_HOST	\</div><div class='add'>+	DBG_QCFG_REQ_FLAGS_CRASHDUMP_SIZE_FOR_DEST_DEST_HOST_DDR</div><div class='add'>+#define BNXT_DBG_CR_DUMP_MDM_CFG_DDR	\</div><div class='add'>+	DBG_CRASHDUMP_MEDIUM_CFG_REQ_TYPE_DDR</div><div class='add'>+</div><div class='add'>+void bnxt_fill_coredump_seg_hdr(struct bnxt *bp,</div><div class='add'>+				struct bnxt_coredump_segment_hdr *seg_hdr,</div><div class='add'>+				struct coredump_segment_record *seg_rec,</div><div class='add'>+				u32 seg_len, int status, u32 duration,</div><div class='add'>+				u32 instance, u32 comp_id, u32 seg_id);</div><div class='add'>+int bnxt_get_coredump(struct bnxt *bp, u16 dump_type, void *buf, u32 *dump_len);</div><div class='add'>+int bnxt_hwrm_get_dump_len(struct bnxt *bp, u16 dump_type, u32 *dump_len);</div><div class='add'>+u32 bnxt_get_coredump_length(struct bnxt *bp, u16 dump_type);</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c<br/>index 70775158c8c4..a00b67334f9b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c</a></div><div class='hunk'>@@ -16,8 +16,9 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;rdma/ib_verbs.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_dcb.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_BNXT_DCB</div><div class='hunk'>@@ -38,39 +39,43 @@ static int bnxt_queue_to_tc(struct bnxt *bp, u8 queue_id)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_pri2cos_cfg(struct bnxt *bp, struct ieee_ets *ets)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_pri2cos_cfg_input req = {0};</div><div class='del'>-	int rc = 0, i;</div><div class='add'>+	struct hwrm_queue_pri2cos_cfg_input *req;</div><div class='ctx'> 	u8 *pri2cos;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PRI2COS_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_PRI2COS_CFG, -1, -1);</div><div class='del'>-	req.flags = cpu_to_le32(QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_BIDIR |</div><div class='del'>-				QUEUE_PRI2COS_CFG_REQ_FLAGS_IVLAN);</div><div class='add'>+	req-&gt;flags = cpu_to_le32(QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_BIDIR |</div><div class='add'>+				 QUEUE_PRI2COS_CFG_REQ_FLAGS_IVLAN);</div><div class='ctx'> </div><div class='del'>-	pri2cos = &amp;req.pri0_cos_queue_id;</div><div class='add'>+	pri2cos = &amp;req-&gt;pri0_cos_queue_id;</div><div class='ctx'> 	for (i = 0; i &lt; IEEE_8021QAZ_MAX_TCS; i++) {</div><div class='ctx'> 		u8 qidx;</div><div class='ctx'> </div><div class='del'>-		req.enables |= cpu_to_le32(</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(</div><div class='ctx'> 			QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI0_COS_QUEUE_ID &lt;&lt; i);</div><div class='ctx'> </div><div class='ctx'> 		qidx = bp-&gt;tc_to_qidx[ets-&gt;prio_tc[i]];</div><div class='ctx'> 		pri2cos[i] = bp-&gt;q_info[qidx].queue_id;</div><div class='ctx'> 	}</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	return rc;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_pri2cos_qcfg(struct bnxt *bp, struct ieee_ets *ets)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_pri2cos_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_queue_pri2cos_qcfg_input req = {0};</div><div class='del'>-	int rc = 0;</div><div class='add'>+	struct hwrm_queue_pri2cos_qcfg_output *resp;</div><div class='add'>+	struct hwrm_queue_pri2cos_qcfg_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_PRI2COS_QCFG, -1, -1);</div><div class='del'>-	req.flags = cpu_to_le32(QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PRI2COS_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;flags = cpu_to_le32(QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		u8 *pri2cos = &amp;resp-&gt;pri0_cos_queue_id;</div><div class='ctx'> 		int i;</div><div class='hunk'>@@ -84,23 +89,25 @@ static int bnxt_hwrm_queue_pri2cos_qcfg(struct bnxt *bp, struct ieee_ets *ets)</div><div class='ctx'> 				ets-&gt;prio_tc[i] = tc;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets,</div><div class='ctx'> 				      u8 max_tc)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_cos2bw_cfg_input req = {0};</div><div class='add'>+	struct hwrm_queue_cos2bw_cfg_input *req;</div><div class='ctx'> 	struct bnxt_cos2bw_cfg cos2bw;</div><div class='del'>-	int rc = 0, i;</div><div class='del'>-	void *data;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_COS2BW_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_COS2BW_CFG, -1, -1);</div><div class='ctx'> 	for (i = 0; i &lt; max_tc; i++) {</div><div class='ctx'> 		u8 qidx = bp-&gt;tc_to_qidx[i];</div><div class='ctx'> </div><div class='del'>-		req.enables |= cpu_to_le32(</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(</div><div class='ctx'> 			QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID &lt;&lt;</div><div class='ctx'> 			qidx);</div><div class='ctx'> </div><div class='hunk'>@@ -121,41 +128,51 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets,</div><div class='ctx'> 				cpu_to_le32((ets-&gt;tc_tx_bw[i] * 100) |</div><div class='ctx'> 					    BW_VALUE_UNIT_PERCENT1_100);</div><div class='ctx'> 		}</div><div class='del'>-		data = &amp;req.unused_0 + qidx * (sizeof(cos2bw) - 4);</div><div class='del'>-		memcpy(data, &amp;cos2bw.queue_id, sizeof(cos2bw) - 4);</div><div class='ctx'> 		if (qidx == 0) {</div><div class='del'>-			req.queue_id0 = cos2bw.queue_id;</div><div class='del'>-			req.unused_0 = 0;</div><div class='add'>+			req-&gt;queue_id0 = cos2bw.queue_id;</div><div class='add'>+			req-&gt;queue_id0_min_bw = cos2bw.min_bw;</div><div class='add'>+			req-&gt;queue_id0_max_bw = cos2bw.max_bw;</div><div class='add'>+			req-&gt;queue_id0_tsa_assign = cos2bw.tsa;</div><div class='add'>+			req-&gt;queue_id0_pri_lvl = cos2bw.pri_lvl;</div><div class='add'>+			req-&gt;queue_id0_bw_weight = cos2bw.bw_weight;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(&amp;req-&gt;cfg[i - 1], &amp;cos2bw.cfg, sizeof(cos2bw.cfg));</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	return rc;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_cos2bw_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_queue_cos2bw_qcfg_input req = {0};</div><div class='add'>+	struct hwrm_queue_cos2bw_qcfg_output *resp;</div><div class='add'>+	struct hwrm_queue_cos2bw_qcfg_input *req;</div><div class='ctx'> 	struct bnxt_cos2bw_cfg cos2bw;</div><div class='del'>-	void *data;</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_COS2BW_QCFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_COS2BW_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	data = &amp;resp-&gt;queue_id0 + offsetof(struct bnxt_cos2bw_cfg, queue_id);</div><div class='del'>-	for (i = 0; i &lt; bp-&gt;max_tc; i++, data += sizeof(cos2bw) - 4) {</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;max_tc; i++) {</div><div class='ctx'> 		int tc;</div><div class='ctx'> </div><div class='del'>-		memcpy(&amp;cos2bw.queue_id, data, sizeof(cos2bw) - 4);</div><div class='del'>-		if (i == 0)</div><div class='add'>+		if (i == 0) {</div><div class='ctx'> 			cos2bw.queue_id = resp-&gt;queue_id0;</div><div class='add'>+			cos2bw.min_bw = resp-&gt;queue_id0_min_bw;</div><div class='add'>+			cos2bw.max_bw = resp-&gt;queue_id0_max_bw;</div><div class='add'>+			cos2bw.tsa = resp-&gt;queue_id0_tsa_assign;</div><div class='add'>+			cos2bw.pri_lvl = resp-&gt;queue_id0_pri_lvl;</div><div class='add'>+			cos2bw.bw_weight = resp-&gt;queue_id0_bw_weight;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(&amp;cos2bw.cfg, &amp;resp-&gt;cfg[i - 1], sizeof(cos2bw.cfg));</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		tc = bnxt_queue_to_tc(bp, cos2bw.queue_id);</div><div class='ctx'> 		if (tc &lt; 0)</div><div class='hunk'>@@ -169,7 +186,7 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)</div><div class='ctx'> 			ets-&gt;tc_tx_bw[tc] = cos2bw.bw_weight;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -211,7 +228,7 @@ static int bnxt_queue_remap(struct bnxt *bp, unsigned int lltc_mask)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bp-&gt;ieee_ets) {</div><div class='del'>-		int tc = netdev_get_num_tc(bp-&gt;dev);</div><div class='add'>+		int tc = bp-&gt;num_tc;</div><div class='ctx'> </div><div class='ctx'> 		if (!tc)</div><div class='ctx'> 			tc = 1;</div><div class='hunk'>@@ -231,7 +248,7 @@ static int bnxt_queue_remap(struct bnxt *bp, unsigned int lltc_mask)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_pfc_cfg(struct bnxt *bp, struct ieee_pfc *pfc)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_pfcenable_cfg_input req = {0};</div><div class='add'>+	struct hwrm_queue_pfcenable_cfg_input *req;</div><div class='ctx'> 	struct ieee_ets *my_ets = bp-&gt;ieee_ets;</div><div class='ctx'> 	unsigned int tc_mask = 0, pri_mask = 0;</div><div class='ctx'> 	u8 i, pri, lltc_count = 0;</div><div class='hunk'>@@ -267,44 +284,45 @@ static int bnxt_hwrm_queue_pfc_cfg(struct bnxt *bp, struct ieee_pfc *pfc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (need_q_remap)</div><div class='del'>-		rc = bnxt_queue_remap(bp, tc_mask);</div><div class='add'>+		bnxt_queue_remap(bp, tc_mask);</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_PFCENABLE_CFG, -1, -1);</div><div class='del'>-	req.flags = cpu_to_le32(pri_mask);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PFCENABLE_CFG);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='add'>+	req-&gt;flags = cpu_to_le32(pri_mask);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_pfc_qcfg(struct bnxt *bp, struct ieee_pfc *pfc)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_pfcenable_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_queue_pfcenable_qcfg_input req = {0};</div><div class='add'>+	struct hwrm_queue_pfcenable_qcfg_output *resp;</div><div class='add'>+	struct hwrm_queue_pfcenable_qcfg_input *req;</div><div class='ctx'> 	u8 pri_mask;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_PFCENABLE_QCFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PFCENABLE_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	pri_mask = le32_to_cpu(resp-&gt;flags);</div><div class='ctx'> 	pfc-&gt;pfc_en = pri_mask;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_set_dcbx_app(struct bnxt *bp, struct dcb_app *app,</div><div class='ctx'> 				  bool add)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_fw_set_structured_data_input set = {0};</div><div class='del'>-	struct hwrm_fw_get_structured_data_input get = {0};</div><div class='add'>+	struct hwrm_fw_set_structured_data_input *set;</div><div class='add'>+	struct hwrm_fw_get_structured_data_input *get;</div><div class='ctx'> 	struct hwrm_struct_data_dcbx_app *fw_app;</div><div class='ctx'> 	struct hwrm_struct_hdr *data;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='hunk'>@@ -314,19 +332,26 @@ static int bnxt_hwrm_set_dcbx_app(struct bnxt *bp, struct dcb_app *app,</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10601)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	rc = hwrm_req_init(bp, get, HWRM_FW_GET_STRUCTURED_DATA);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, get);</div><div class='add'>+	hwrm_req_alloc_flags(bp, get, GFP_KERNEL | __GFP_ZERO);</div><div class='add'>+</div><div class='ctx'> 	n = IEEE_8021QAZ_MAX_TCS;</div><div class='ctx'> 	data_len = sizeof(*data) + sizeof(*fw_app) * n;</div><div class='del'>-	data = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, data_len, &amp;mapping,</div><div class='del'>-				  GFP_KERNEL);</div><div class='del'>-	if (!data)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	data = hwrm_req_dma_slice(bp, get, data_len, &amp;mapping);</div><div class='add'>+	if (!data) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto set_app_exit;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;get, HWRM_FW_GET_STRUCTURED_DATA, -1, -1);</div><div class='del'>-	get.dest_data_addr = cpu_to_le64(mapping);</div><div class='del'>-	get.structure_id = cpu_to_le16(STRUCT_HDR_STRUCT_ID_DCBX_APP);</div><div class='del'>-	get.subtype = cpu_to_le16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL);</div><div class='del'>-	get.count = 0;</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;get, sizeof(get), HWRM_CMD_TIMEOUT);</div><div class='add'>+	get-&gt;dest_data_addr = cpu_to_le64(mapping);</div><div class='add'>+	get-&gt;structure_id = cpu_to_le16(STRUCT_HDR_STRUCT_ID_DCBX_APP);</div><div class='add'>+	get-&gt;subtype = cpu_to_le16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL);</div><div class='add'>+	get-&gt;count = 0;</div><div class='add'>+	rc = hwrm_req_send(bp, get);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto set_app_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -372,45 +397,49 @@ static int bnxt_hwrm_set_dcbx_app(struct bnxt *bp, struct dcb_app *app,</div><div class='ctx'> 	data-&gt;len = cpu_to_le16(sizeof(*fw_app) * n);</div><div class='ctx'> 	data-&gt;subtype = cpu_to_le16(HWRM_STRUCT_DATA_SUBTYPE_HOST_OPERATIONAL);</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;set, HWRM_FW_SET_STRUCTURED_DATA, -1, -1);</div><div class='del'>-	set.src_data_addr = cpu_to_le64(mapping);</div><div class='del'>-	set.data_len = cpu_to_le16(sizeof(*data) + sizeof(*fw_app) * n);</div><div class='del'>-	set.hdr_cnt = 1;</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;set, sizeof(set), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, set, HWRM_FW_SET_STRUCTURED_DATA);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='add'>+		goto set_app_exit;</div><div class='add'>+</div><div class='add'>+	set-&gt;src_data_addr = cpu_to_le64(mapping);</div><div class='add'>+	set-&gt;data_len = cpu_to_le16(sizeof(*data) + sizeof(*fw_app) * n);</div><div class='add'>+	set-&gt;hdr_cnt = 1;</div><div class='add'>+	rc = hwrm_req_send(bp, set);</div><div class='ctx'> </div><div class='ctx'> set_app_exit:</div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, data_len, data, mapping);</div><div class='add'>+	hwrm_req_drop(bp, get); /* dropping get request and associated slice */</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_dscp_qcaps(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_dscp_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_queue_dscp_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_queue_dscp_qcaps_output *resp;</div><div class='add'>+	struct hwrm_queue_dscp_qcaps_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	bp-&gt;max_dscp_value = 0;</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10800 || BNXT_VF(bp))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_DSCP_QCAPS, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_DSCP_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		bp-&gt;max_dscp_value = (1 &lt;&lt; resp-&gt;num_dscp_bits) - 1;</div><div class='ctx'> 		if (bp-&gt;max_dscp_value &lt; 0x3f)</div><div class='ctx'> 			bp-&gt;max_dscp_value = 0;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_queue_dscp2pri_cfg(struct bnxt *bp, struct dcb_app *app,</div><div class='ctx'> 					bool add)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_queue_dscp2pri_cfg_input req = {0};</div><div class='add'>+	struct hwrm_queue_dscp2pri_cfg_input *req;</div><div class='ctx'> 	struct bnxt_dscp2pri_entry *dscp2pri;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -418,31 +447,32 @@ static int bnxt_hwrm_queue_dscp2pri_cfg(struct bnxt *bp, struct dcb_app *app,</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10800)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_QUEUE_DSCP2PRI_CFG, -1, -1);</div><div class='del'>-	dscp2pri = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, sizeof(*dscp2pri),</div><div class='del'>-				      &amp;mapping, GFP_KERNEL);</div><div class='del'>-	if (!dscp2pri)</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_DSCP2PRI_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	dscp2pri = hwrm_req_dma_slice(bp, req, sizeof(*dscp2pri), &amp;mapping);</div><div class='add'>+	if (!dscp2pri) {</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	req.src_data_addr = cpu_to_le64(mapping);</div><div class='add'>+	req-&gt;src_data_addr = cpu_to_le64(mapping);</div><div class='ctx'> 	dscp2pri-&gt;dscp = app-&gt;protocol;</div><div class='ctx'> 	if (add)</div><div class='ctx'> 		dscp2pri-&gt;mask = 0x3f;</div><div class='ctx'> 	else</div><div class='ctx'> 		dscp2pri-&gt;mask = 0;</div><div class='ctx'> 	dscp2pri-&gt;pri = app-&gt;priority;</div><div class='del'>-	req.entry_cnt = cpu_to_le16(1);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, sizeof(*dscp2pri), dscp2pri,</div><div class='del'>-			  mapping);</div><div class='add'>+	req-&gt;entry_cnt = cpu_to_le16(1);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_ets_validate(struct bnxt *bp, struct ieee_ets *ets, u8 *tc)</div><div class='ctx'> {</div><div class='ctx'> 	int total_ets_bw = 0;</div><div class='add'>+	bool zero = false;</div><div class='ctx'> 	u8 max_tc = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -457,19 +487,28 @@ static int bnxt_ets_validate(struct bnxt *bp, struct ieee_ets *ets, u8 *tc)</div><div class='ctx'> </div><div class='ctx'> 		if ((ets-&gt;tc_tx_bw[i] || ets-&gt;tc_tsa[i]) &amp;&amp; i &gt; bp-&gt;max_tc)</div><div class='ctx'> 			return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	for (i = 0; i &lt; max_tc; i++) {</div><div class='ctx'> 		switch (ets-&gt;tc_tsa[i]) {</div><div class='ctx'> 		case IEEE_8021QAZ_TSA_STRICT:</div><div class='ctx'> 			break;</div><div class='ctx'> 		case IEEE_8021QAZ_TSA_ETS:</div><div class='ctx'> 			total_ets_bw += ets-&gt;tc_tx_bw[i];</div><div class='add'>+			zero = zero || !ets-&gt;tc_tx_bw[i];</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			return -ENOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (total_ets_bw &gt; 100)</div><div class='add'>+	if (total_ets_bw &gt; 100) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "rejecting ETS config exceeding available bandwidth\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (zero &amp;&amp; total_ets_bw == 100) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "rejecting ETS config starving a TC\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (max_tc &gt;= bp-&gt;max_tc)</div><div class='ctx'> 		*tc = bp-&gt;max_tc;</div><div class='hunk'>@@ -482,24 +521,26 @@ static int bnxt_dcbnl_ieee_getets(struct net_device *dev, struct ieee_ets *ets)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct ieee_ets *my_ets = bp-&gt;ieee_ets;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	ets-&gt;ets_cap = bp-&gt;max_tc;</div><div class='ctx'> </div><div class='ctx'> 	if (!my_ets) {</div><div class='del'>-		int rc;</div><div class='del'>-</div><div class='ctx'> 		if (bp-&gt;dcbx_cap &amp; DCB_CAP_DCBX_HOST)</div><div class='ctx'> 			return 0;</div><div class='ctx'> </div><div class='ctx'> 		my_ets = kzalloc(sizeof(*my_ets), GFP_KERNEL);</div><div class='ctx'> 		if (!my_ets)</div><div class='del'>-			return 0;</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 		rc = bnxt_hwrm_queue_cos2bw_qcfg(bp, my_ets);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			return 0;</div><div class='add'>+			goto error;</div><div class='ctx'> 		rc = bnxt_hwrm_queue_pri2cos_qcfg(bp, my_ets);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			return 0;</div><div class='add'>+			goto error;</div><div class='add'>+</div><div class='add'>+		/* cache result */</div><div class='add'>+		bp-&gt;ieee_ets = my_ets;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ets-&gt;cbs = my_ets-&gt;cbs;</div><div class='hunk'>@@ -508,6 +549,9 @@ static int bnxt_dcbnl_ieee_getets(struct net_device *dev, struct ieee_ets *ets)</div><div class='ctx'> 	memcpy(ets-&gt;tc_tsa, my_ets-&gt;tc_tsa, sizeof(ets-&gt;tc_tsa));</div><div class='ctx'> 	memcpy(ets-&gt;prio_tc, my_ets-&gt;prio_tc, sizeof(ets-&gt;prio_tc));</div><div class='ctx'> 	return 0;</div><div class='add'>+error:</div><div class='add'>+	kfree(my_ets);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)</div><div class='hunk'>@@ -549,7 +593,7 @@ static int bnxt_dcbnl_ieee_setets(struct net_device *dev, struct ieee_ets *ets)</div><div class='ctx'> static int bnxt_dcbnl_ieee_getpfc(struct net_device *dev, struct ieee_pfc *pfc)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	__le64 *stats = (__le64 *)bp-&gt;hw_rx_port_stats;</div><div class='add'>+	__le64 *stats = bp-&gt;port_stats.hw_stats;</div><div class='ctx'> 	struct ieee_pfc *my_pfc = bp-&gt;ieee_pfc;</div><div class='ctx'> 	long rx_off, tx_off;</div><div class='ctx'> 	int i, rc;</div><div class='hunk'>@@ -593,7 +637,8 @@ static int bnxt_dcbnl_ieee_setpfc(struct net_device *dev, struct ieee_pfc *pfc)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;dcbx_cap &amp; DCB_CAP_DCBX_VER_IEEE) ||</div><div class='del'>-	    !(bp-&gt;dcbx_cap &amp; DCB_CAP_DCBX_HOST))</div><div class='add'>+	    !(bp-&gt;dcbx_cap &amp; DCB_CAP_DCBX_HOST) ||</div><div class='add'>+	    (bp-&gt;phy_flags &amp; BNXT_PHY_FL_NO_PAUSE))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!my_pfc) {</div><div class='hunk'>@@ -722,6 +767,7 @@ static const struct dcbnl_rtnl_ops dcbnl_ops = {</div><div class='ctx'> </div><div class='ctx'> void bnxt_dcb_init(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	bp-&gt;dcbx_cap = 0;</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10501)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h<br/>index 6eed231de565..5b2a6f678244 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h</a></div><div class='hunk'>@@ -23,13 +23,16 @@ struct bnxt_dcb {</div><div class='ctx'> </div><div class='ctx'> struct bnxt_cos2bw_cfg {</div><div class='ctx'> 	u8			pad[3];</div><div class='del'>-	u8			queue_id;</div><div class='del'>-	__le32			min_bw;</div><div class='del'>-	__le32			max_bw;</div><div class='add'>+	struct_group_attr(cfg, __packed,</div><div class='add'>+		u8		queue_id;</div><div class='add'>+		__le32		min_bw;</div><div class='add'>+		__le32		max_bw;</div><div class='add'>+		u8		tsa;</div><div class='add'>+		u8		pri_lvl;</div><div class='add'>+		u8		bw_weight;</div><div class='add'>+	);</div><div class='add'>+/* for min_bw / max_bw */</div><div class='ctx'> #define BW_VALUE_UNIT_PERCENT1_100		(0x1UL &lt;&lt; 29)</div><div class='del'>-	u8			tsa;</div><div class='del'>-	u8			pri_lvl;</div><div class='del'>-	u8			bw_weight;</div><div class='ctx'> 	u8			unused;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c<br/>index 94e208e9789f..3324afbb3bec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c</a></div><div class='hunk'>@@ -10,8 +10,8 @@</div><div class='ctx'> #include &lt;linux/debugfs.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='del'>-#include &lt;linux/net_dim.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='ctx'> #include "bnxt_debugfs.h"</div><div class='ctx'> </div><div class='hunk'>@@ -21,7 +21,7 @@ static ssize_t debugfs_dim_read(struct file *filep,</div><div class='ctx'> 				char __user *buffer,</div><div class='ctx'> 				size_t count, loff_t *ppos)</div><div class='ctx'> {</div><div class='del'>-	struct net_dim *dim = filep-&gt;private_data;</div><div class='add'>+	struct dim *dim = filep-&gt;private_data;</div><div class='ctx'> 	int len;</div><div class='ctx'> 	char *buf;</div><div class='ctx'> </div><div class='hunk'>@@ -61,45 +61,30 @@ static const struct file_operations debugfs_dim_fops = {</div><div class='ctx'> 	.read = debugfs_dim_read,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct dentry *debugfs_dim_ring_init(struct net_dim *dim, int ring_idx,</div><div class='del'>-					    struct dentry *dd)</div><div class='add'>+static void debugfs_dim_ring_init(struct dim *dim, int ring_idx,</div><div class='add'>+				  struct dentry *dd)</div><div class='ctx'> {</div><div class='del'>-	static char qname[16];</div><div class='add'>+	static char qname[12];</div><div class='ctx'> </div><div class='del'>-	snprintf(qname, 10, "%d", ring_idx);</div><div class='del'>-	return debugfs_create_file(qname, 0600, dd,</div><div class='del'>-				   dim, &amp;debugfs_dim_fops);</div><div class='add'>+	snprintf(qname, sizeof(qname), "%d", ring_idx);</div><div class='add'>+	debugfs_create_file(qname, 0600, dd, dim, &amp;debugfs_dim_fops);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnxt_debug_dev_init(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	const char *pname = pci_name(bp-&gt;pdev);</div><div class='del'>-	struct dentry *pdevf;</div><div class='add'>+	struct dentry *dir;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;debugfs_pdev = debugfs_create_dir(pname, bnxt_debug_mnt);</div><div class='del'>-	if (bp-&gt;debugfs_pdev) {</div><div class='del'>-		pdevf = debugfs_create_dir("dim", bp-&gt;debugfs_pdev);</div><div class='del'>-		if (!pdevf) {</div><div class='del'>-			pr_err("failed to create debugfs entry %s/dim\n",</div><div class='del'>-			       pname);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		bp-&gt;debugfs_dim = pdevf;</div><div class='del'>-		/* create files for each rx ring */</div><div class='del'>-		for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='del'>-			struct bnxt_cp_ring_info *cpr = &amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='add'>+	dir = debugfs_create_dir("dim", bp-&gt;debugfs_pdev);</div><div class='ctx'> </div><div class='del'>-			if (cpr &amp;&amp; bp-&gt;bnapi[i]-&gt;rx_ring) {</div><div class='del'>-				pdevf = debugfs_dim_ring_init(&amp;cpr-&gt;dim, i,</div><div class='del'>-							      bp-&gt;debugfs_dim);</div><div class='del'>-				if (!pdevf)</div><div class='del'>-					pr_err("failed to create debugfs entry %s/dim/%d\n",</div><div class='del'>-					       pname, i);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		pr_err("failed to create debugfs entry %s\n", pname);</div><div class='add'>+	/* create files for each rx ring */</div><div class='add'>+	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='add'>+		struct bnxt_cp_ring_info *cpr = &amp;bp-&gt;bnapi[i]-&gt;cp_ring;</div><div class='add'>+</div><div class='add'>+		if (cpr &amp;&amp; bp-&gt;bnapi[i]-&gt;rx_ring)</div><div class='add'>+			debugfs_dim_ring_init(&amp;cpr-&gt;dim, i, dir);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -114,8 +99,6 @@ void bnxt_debug_dev_exit(struct bnxt *bp)</div><div class='ctx'> void bnxt_debug_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	bnxt_debug_mnt = debugfs_create_dir("bnxt_en", NULL);</div><div class='del'>-	if (!bnxt_debug_mnt)</div><div class='del'>-		pr_err("failed to init bnxt_en debugfs\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnxt_debug_exit(void)</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h<br/>index d0bb4887acd0..a0a8d687dd99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h</a></div><div class='hunk'>@@ -7,7 +7,7 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c<br/>index 549c90d3e465..15de802bbac4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c</a></div><div class='hunk'>@@ -9,19 +9,656 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/vmalloc.h&gt;</div><div class='ctx'> #include &lt;net/devlink.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_vfr.h"</div><div class='ctx'> #include "bnxt_devlink.h"</div><div class='add'>+#include "bnxt_ethtool.h"</div><div class='add'>+#include "bnxt_ulp.h"</div><div class='add'>+#include "bnxt_ptp.h"</div><div class='add'>+#include "bnxt_coredump.h"</div><div class='add'>+#include "bnxt_nvm_defs.h"</div><div class='add'>+</div><div class='add'>+static void __bnxt_fw_recover(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state) ||</div><div class='add'>+	    test_bit(BNXT_STATE_FW_NON_FATAL_COND, &amp;bp-&gt;state))</div><div class='add'>+		bnxt_fw_reset(bp);</div><div class='add'>+	else</div><div class='add'>+		bnxt_fw_exception(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_dl_flash_update(struct devlink *dl,</div><div class='add'>+		     struct devlink_flash_update_params *params,</div><div class='add'>+		     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	devlink_flash_update_status_notify(dl, "Preparing to flash", NULL, 0, 0);</div><div class='add'>+	rc = bnxt_flash_package_from_fw_obj(bp-&gt;dev, params-&gt;fw, 0, extack);</div><div class='add'>+	if (!rc)</div><div class='add'>+		devlink_flash_update_status_notify(dl, "Flashing done", NULL, 0, 0);</div><div class='add'>+	else</div><div class='add'>+		devlink_flash_update_status_notify(dl, "Flashing failed", NULL, 0, 0);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_remote_dev_reset_set(struct bnxt *bp, bool remote_reset)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET_IF)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_HOT_RESET_IF_SUPPORT);</div><div class='add'>+	if (remote_reset)</div><div class='add'>+		req-&gt;flags = cpu_to_le32(FUNC_CFG_REQ_FLAGS_HOT_RESET_IF_EN_DIS);</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *bnxt_health_severity_str(enum bnxt_health_severity severity)</div><div class='add'>+{</div><div class='add'>+	switch (severity) {</div><div class='add'>+	case SEVERITY_NORMAL: return "normal";</div><div class='add'>+	case SEVERITY_WARNING: return "warning";</div><div class='add'>+	case SEVERITY_RECOVERABLE: return "recoverable";</div><div class='add'>+	case SEVERITY_FATAL: return "fatal";</div><div class='add'>+	default: return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char *bnxt_health_remedy_str(enum bnxt_health_remedy remedy)</div><div class='add'>+{</div><div class='add'>+	switch (remedy) {</div><div class='add'>+	case REMEDY_DEVLINK_RECOVER: return "devlink recover";</div><div class='add'>+	case REMEDY_POWER_CYCLE_DEVICE: return "device power cycle";</div><div class='add'>+	case REMEDY_POWER_CYCLE_HOST: return "host power cycle";</div><div class='add'>+	case REMEDY_FW_UPDATE: return "update firmware";</div><div class='add'>+	case REMEDY_HW_REPLACE: return "replace hardware";</div><div class='add'>+	default: return "unknown";</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_fw_diagnose(struct devlink_health_reporter *reporter,</div><div class='add'>+			    struct devlink_fmsg *fmsg,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = devlink_health_reporter_priv(reporter);</div><div class='add'>+	struct bnxt_fw_health *h = bp-&gt;fw_health;</div><div class='add'>+	u32 fw_status, fw_resets;</div><div class='add'>+</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "recovering");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!h-&gt;status_reliable) {</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "unknown");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;h-&gt;lock);</div><div class='add'>+	fw_status = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);</div><div class='add'>+	if (BNXT_FW_IS_BOOTING(fw_status)) {</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "initializing");</div><div class='add'>+	} else if (h-&gt;severity || fw_status != BNXT_FW_STATUS_HEALTHY) {</div><div class='add'>+		if (!h-&gt;severity) {</div><div class='add'>+			h-&gt;severity = SEVERITY_FATAL;</div><div class='add'>+			h-&gt;remedy = REMEDY_POWER_CYCLE_DEVICE;</div><div class='add'>+			h-&gt;diagnoses++;</div><div class='add'>+			devlink_health_report(h-&gt;fw_reporter,</div><div class='add'>+					      "FW error diagnosed", h);</div><div class='add'>+		}</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "error");</div><div class='add'>+		devlink_fmsg_u32_pair_put(fmsg, "Syndrome", fw_status);</div><div class='add'>+	} else {</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Status", "healthy");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	devlink_fmsg_string_pair_put(fmsg, "Severity",</div><div class='add'>+				     bnxt_health_severity_str(h-&gt;severity));</div><div class='add'>+</div><div class='add'>+	if (h-&gt;severity) {</div><div class='add'>+		devlink_fmsg_string_pair_put(fmsg, "Remedy",</div><div class='add'>+					     bnxt_health_remedy_str(h-&gt;remedy));</div><div class='add'>+		if (h-&gt;remedy == REMEDY_DEVLINK_RECOVER)</div><div class='add'>+			devlink_fmsg_string_pair_put(fmsg, "Impact",</div><div class='add'>+						     "traffic+ntuple_cfg");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;h-&gt;lock);</div><div class='add'>+	if (!h-&gt;resets_reliable)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	fw_resets = bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Resets", fw_resets);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Arrests", h-&gt;arrests);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Survivals", h-&gt;survivals);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Discoveries", h-&gt;discoveries);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Fatalities", h-&gt;fatalities);</div><div class='add'>+	devlink_fmsg_u32_pair_put(fmsg, "Diagnoses", h-&gt;diagnoses);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_fw_dump(struct devlink_health_reporter *reporter,</div><div class='add'>+			struct devlink_fmsg *fmsg, void *priv_ctx,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = devlink_health_reporter_priv(reporter);</div><div class='add'>+	u32 dump_len;</div><div class='add'>+	void *data;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* TODO: no firmware dump support in devlink_health_report() context */</div><div class='add'>+	if (priv_ctx)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	dump_len = bnxt_get_coredump_length(bp, BNXT_DUMP_LIVE);</div><div class='add'>+	if (!dump_len)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	data = vmalloc(dump_len);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_get_coredump(bp, BNXT_DUMP_LIVE, data, &amp;dump_len);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		devlink_fmsg_pair_nest_start(fmsg, "core");</div><div class='add'>+		devlink_fmsg_binary_pair_put(fmsg, "data", data, dump_len);</div><div class='add'>+		devlink_fmsg_u32_pair_put(fmsg, "size", dump_len);</div><div class='add'>+		devlink_fmsg_pair_nest_end(fmsg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vfree(data);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_fw_recover(struct devlink_health_reporter *reporter,</div><div class='add'>+			   void *priv_ctx,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = devlink_health_reporter_priv(reporter);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_health-&gt;severity == SEVERITY_FATAL)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	set_bit(BNXT_STATE_RECOVER, &amp;bp-&gt;state);</div><div class='add'>+	__bnxt_fw_recover(bp);</div><div class='add'>+</div><div class='add'>+	return -EINPROGRESS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_health_reporter_ops bnxt_dl_fw_reporter_ops = {</div><div class='add'>+	.name = "fw",</div><div class='add'>+	.diagnose = bnxt_fw_diagnose,</div><div class='add'>+	.dump = bnxt_fw_dump,</div><div class='add'>+	.recover = bnxt_fw_recover,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct devlink_health_reporter *</div><div class='add'>+__bnxt_dl_reporter_create(struct bnxt *bp,</div><div class='add'>+			  const struct devlink_health_reporter_ops *ops)</div><div class='add'>+{</div><div class='add'>+	struct devlink_health_reporter *reporter;</div><div class='add'>+</div><div class='add'>+	reporter = devlink_health_reporter_create(bp-&gt;dl, ops, bp);</div><div class='add'>+	if (IS_ERR(reporter)) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Failed to create %s health reporter, rc = %ld\n",</div><div class='add'>+			    ops-&gt;name, PTR_ERR(reporter));</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return reporter;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_dl_fw_reporters_create(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+</div><div class='add'>+	if (fw_health &amp;&amp; !fw_health-&gt;fw_reporter)</div><div class='add'>+		fw_health-&gt;fw_reporter = __bnxt_dl_reporter_create(bp, &amp;bnxt_dl_fw_reporter_ops);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_dl_fw_reporters_destroy(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+</div><div class='add'>+	if (fw_health &amp;&amp; fw_health-&gt;fw_reporter) {</div><div class='add'>+		devlink_health_reporter_destroy(fw_health-&gt;fw_reporter);</div><div class='add'>+		fw_health-&gt;fw_reporter = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_devlink_health_fw_report(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!fw_health)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!fw_health-&gt;fw_reporter) {</div><div class='add'>+		__bnxt_fw_recover(bp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fw_health-&gt;lock);</div><div class='add'>+	fw_health-&gt;severity = SEVERITY_RECOVERABLE;</div><div class='add'>+	fw_health-&gt;remedy = REMEDY_DEVLINK_RECOVER;</div><div class='add'>+	mutex_unlock(&amp;fw_health-&gt;lock);</div><div class='add'>+	rc = devlink_health_report(fw_health-&gt;fw_reporter, "FW error reported",</div><div class='add'>+				   fw_health);</div><div class='add'>+	if (rc == -ECANCELED)</div><div class='add'>+		__bnxt_fw_recover(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_dl_health_fw_status_update(struct bnxt *bp, bool healthy)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_fw_health *fw_health = bp-&gt;fw_health;</div><div class='add'>+	u8 state;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;fw_health-&gt;lock);</div><div class='add'>+	if (healthy) {</div><div class='add'>+		fw_health-&gt;severity = SEVERITY_NORMAL;</div><div class='add'>+		state = DEVLINK_HEALTH_REPORTER_STATE_HEALTHY;</div><div class='add'>+	} else {</div><div class='add'>+		fw_health-&gt;severity = SEVERITY_FATAL;</div><div class='add'>+		fw_health-&gt;remedy = REMEDY_POWER_CYCLE_DEVICE;</div><div class='add'>+		state = DEVLINK_HEALTH_REPORTER_STATE_ERROR;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;fw_health-&gt;lock);</div><div class='add'>+	devlink_health_reporter_state_update(fw_health-&gt;fw_reporter, state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_dl_health_fw_recovery_done(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_dl *dl = devlink_priv(bp-&gt;dl);</div><div class='add'>+</div><div class='add'>+	devlink_health_reporter_recovery_done(bp-&gt;fw_health-&gt;fw_reporter);</div><div class='add'>+	bnxt_hwrm_remote_dev_reset_set(bp, dl-&gt;remote_reset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,</div><div class='add'>+			    struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_dl_livepatch_report_err(struct bnxt *bp, struct netlink_ext_ack *extack,</div><div class='add'>+			     struct hwrm_fw_livepatch_output *resp)</div><div class='add'>+{</div><div class='add'>+	int err = ((struct hwrm_err_output *)resp)-&gt;cmd_err;</div><div class='add'>+</div><div class='add'>+	switch (err) {</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_INVALID_OPCODE:</div><div class='add'>+		netdev_err(bp-&gt;dev, "Illegal live patch opcode");</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Invalid opcode");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_NOT_SUPPORTED:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Live patch operation not supported");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_NOT_INSTALLED:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Live patch not found");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_NOT_PATCHED:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Live patch deactivation failed. Firmware not patched.");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_AUTH_FAIL:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Live patch not authenticated");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_INVALID_HEADER:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Incompatible live patch");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_INVALID_SIZE:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Live patch has invalid size");</div><div class='add'>+		break;</div><div class='add'>+	case FW_LIVEPATCH_CMD_ERR_CODE_ALREADY_PATCHED:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Live patch already applied");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(bp-&gt;dev, "Unexpected live patch error: %d\n", err);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to activate live patch");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Live patch status in NVM */</div><div class='add'>+#define BNXT_LIVEPATCH_NOT_INSTALLED	0</div><div class='add'>+#define BNXT_LIVEPATCH_INSTALLED	FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_INSTALL</div><div class='add'>+#define BNXT_LIVEPATCH_REMOVED		FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_ACTIVE</div><div class='add'>+#define BNXT_LIVEPATCH_MASK		(FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_INSTALL | \</div><div class='add'>+					 FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_ACTIVE)</div><div class='add'>+#define BNXT_LIVEPATCH_ACTIVATED	BNXT_LIVEPATCH_MASK</div><div class='add'>+</div><div class='add'>+#define BNXT_LIVEPATCH_STATE(flags)	((flags) &amp; BNXT_LIVEPATCH_MASK)</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_dl_livepatch_activate(struct bnxt *bp, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_fw_livepatch_query_output *query_resp;</div><div class='add'>+	struct hwrm_fw_livepatch_query_input *query_req;</div><div class='add'>+	struct hwrm_fw_livepatch_output *patch_resp;</div><div class='add'>+	struct hwrm_fw_livepatch_input *patch_req;</div><div class='add'>+	u16 flags, live_patch_state;</div><div class='add'>+	bool activated = false;</div><div class='add'>+	u32 installed = 0;</div><div class='add'>+	u8 target;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_LIVEPATCH) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Device does not support live patch");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, query_req, HWRM_FW_LIVEPATCH_QUERY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	query_resp = hwrm_req_hold(bp, query_req);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, patch_req, HWRM_FW_LIVEPATCH);</div><div class='add'>+	if (rc) {</div><div class='add'>+		hwrm_req_drop(bp, query_req);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	patch_req-&gt;loadtype = FW_LIVEPATCH_REQ_LOADTYPE_NVM_INSTALL;</div><div class='add'>+	patch_resp = hwrm_req_hold(bp, patch_req);</div><div class='add'>+</div><div class='add'>+	for (target = 1; target &lt;= FW_LIVEPATCH_REQ_FW_TARGET_LAST; target++) {</div><div class='add'>+		query_req-&gt;fw_target = target;</div><div class='add'>+		rc = hwrm_req_send(bp, query_req);</div><div class='add'>+		if (rc) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Failed to query packages");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flags = le16_to_cpu(query_resp-&gt;status_flags);</div><div class='add'>+		live_patch_state = BNXT_LIVEPATCH_STATE(flags);</div><div class='add'>+</div><div class='add'>+		if (live_patch_state == BNXT_LIVEPATCH_NOT_INSTALLED)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (live_patch_state == BNXT_LIVEPATCH_ACTIVATED) {</div><div class='add'>+			activated = true;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (live_patch_state == BNXT_LIVEPATCH_INSTALLED)</div><div class='add'>+			patch_req-&gt;opcode = FW_LIVEPATCH_REQ_OPCODE_ACTIVATE;</div><div class='add'>+		else if (live_patch_state == BNXT_LIVEPATCH_REMOVED)</div><div class='add'>+			patch_req-&gt;opcode = FW_LIVEPATCH_REQ_OPCODE_DEACTIVATE;</div><div class='add'>+</div><div class='add'>+		patch_req-&gt;fw_target = target;</div><div class='add'>+		rc = hwrm_req_send(bp, patch_req);</div><div class='add'>+		if (rc) {</div><div class='add'>+			bnxt_dl_livepatch_report_err(bp, extack, patch_resp);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		installed++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rc &amp;&amp; !installed) {</div><div class='add'>+		if (activated) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Live patch already activated");</div><div class='add'>+			rc = -EEXIST;</div><div class='add'>+		} else {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "No live patches found");</div><div class='add'>+			rc = -ENOENT;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, query_req);</div><div class='add'>+	hwrm_req_drop(bp, patch_req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_reload_down(struct devlink *dl, bool netns_change,</div><div class='add'>+			       enum devlink_reload_action action,</div><div class='add'>+			       enum devlink_reload_limit limit,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT: {</div><div class='add'>+		bnxt_ulp_stop(bp);</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		netdev_lock(bp-&gt;dev);</div><div class='add'>+		if (bnxt_sriov_cfg(bp)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "reload is unsupported while VFs are allocated or being configured");</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+			bnxt_ulp_start(bp, 0);</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (bp-&gt;dev-&gt;reg_state == NETREG_UNREGISTERED) {</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+			bnxt_ulp_start(bp, 0);</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		if (netif_running(bp-&gt;dev))</div><div class='add'>+			bnxt_close_nic(bp, true, true);</div><div class='add'>+		bnxt_vf_reps_free(bp);</div><div class='add'>+		rc = bnxt_hwrm_func_drv_unrgtr(bp);</div><div class='add'>+		if (rc) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Failed to deregister");</div><div class='add'>+			if (netif_running(bp-&gt;dev))</div><div class='add'>+				netif_close(bp-&gt;dev);</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		bnxt_clear_reservations(bp, false);</div><div class='add'>+		bnxt_free_ctx_mem(bp, false);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DEVLINK_RELOAD_ACTION_FW_ACTIVATE: {</div><div class='add'>+		if (limit == DEVLINK_RELOAD_LIMIT_NO_RESET)</div><div class='add'>+			return bnxt_dl_livepatch_activate(bp, extack);</div><div class='add'>+		if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Device not capable, requires reboot");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (!bnxt_hwrm_reset_permitted(bp)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Reset denied by firmware, it may be inhibited by remote driver");</div><div class='add'>+			return -EPERM;</div><div class='add'>+		}</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		netdev_lock(bp-&gt;dev);</div><div class='add'>+		if (bp-&gt;dev-&gt;reg_state == NETREG_UNREGISTERED) {</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+			return -ENODEV;</div><div class='add'>+		}</div><div class='add'>+		if (netif_running(bp-&gt;dev))</div><div class='add'>+			set_bit(BNXT_STATE_FW_ACTIVATE, &amp;bp-&gt;state);</div><div class='add'>+		rc = bnxt_hwrm_firmware_reset(bp-&gt;dev,</div><div class='add'>+					      FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP,</div><div class='add'>+					      FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP,</div><div class='add'>+					      FW_RESET_REQ_FLAGS_RESET_GRACEFUL |</div><div class='add'>+					      FW_RESET_REQ_FLAGS_FW_ACTIVATION);</div><div class='add'>+		if (rc) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Failed to activate firmware");</div><div class='add'>+			clear_bit(BNXT_STATE_FW_ACTIVATE, &amp;bp-&gt;state);</div><div class='add'>+			netdev_unlock(bp-&gt;dev);</div><div class='add'>+			rtnl_unlock();</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		rc = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_reload_up(struct devlink *dl, enum devlink_reload_action action,</div><div class='add'>+			     enum devlink_reload_limit limit, u32 *actions_performed,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	netdev_assert_locked(bp-&gt;dev);</div><div class='add'>+</div><div class='add'>+	*actions_performed = 0;</div><div class='add'>+	switch (action) {</div><div class='add'>+	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT: {</div><div class='add'>+		bnxt_fw_init_one(bp);</div><div class='add'>+		bnxt_vf_reps_alloc(bp);</div><div class='add'>+		if (netif_running(bp-&gt;dev))</div><div class='add'>+			rc = bnxt_open_nic(bp, true, true);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			bnxt_reenable_sriov(bp);</div><div class='add'>+			bnxt_ptp_reapply_pps(bp);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case DEVLINK_RELOAD_ACTION_FW_ACTIVATE: {</div><div class='add'>+		unsigned long start = jiffies;</div><div class='add'>+		unsigned long timeout = start + BNXT_DFLT_FW_RST_MAX_DSECS * HZ / 10;</div><div class='add'>+</div><div class='add'>+		if (limit == DEVLINK_RELOAD_LIMIT_NO_RESET)</div><div class='add'>+			break;</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_ERROR_RECOVERY)</div><div class='add'>+			timeout = start + bp-&gt;fw_health-&gt;normal_func_wait_dsecs * HZ / 10;</div><div class='add'>+		if (!netif_running(bp-&gt;dev))</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Device is closed, not waiting for reset notice that will never come");</div><div class='add'>+		netdev_unlock(bp-&gt;dev);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		while (test_bit(BNXT_STATE_FW_ACTIVATE, &amp;bp-&gt;state)) {</div><div class='add'>+			if (time_after(jiffies, timeout)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "Activation incomplete");</div><div class='add'>+				rc = -ETIMEDOUT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (test_bit(BNXT_STATE_ABORT_ERR, &amp;bp-&gt;state)) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "Activation aborted");</div><div class='add'>+				rc = -ENODEV;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			msleep(50);</div><div class='add'>+		}</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		netdev_lock(bp-&gt;dev);</div><div class='add'>+		if (!rc)</div><div class='add'>+			*actions_performed |= BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT);</div><div class='add'>+		clear_bit(BNXT_STATE_FW_ACTIVATE, &amp;bp-&gt;state);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!rc) {</div><div class='add'>+		bnxt_print_device_info(bp);</div><div class='add'>+		if (netif_running(bp-&gt;dev)) {</div><div class='add'>+			mutex_lock(&amp;bp-&gt;link_lock);</div><div class='add'>+			bnxt_report_link(bp);</div><div class='add'>+			mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='add'>+		}</div><div class='add'>+		*actions_performed |= BIT(action);</div><div class='add'>+	} else if (netif_running(bp-&gt;dev)) {</div><div class='add'>+		netif_close(bp-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+	netdev_unlock(bp-&gt;dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (action == DEVLINK_RELOAD_ACTION_DRIVER_REINIT)</div><div class='add'>+		bnxt_ulp_start(bp, rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	bool rc = false;</div><div class='add'>+	u32 datalen;</div><div class='add'>+	u16 index;</div><div class='add'>+	u8 *buf;</div><div class='add'>+</div><div class='add'>+	if (bnxt_find_nvram_item(bp-&gt;dev, BNX_DIR_TYPE_VPD,</div><div class='add'>+				 BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE,</div><div class='add'>+				 &amp;index, NULL, &amp;datalen) || !datalen) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd entry error");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf = kzalloc(datalen, GFP_KERNEL);</div><div class='add'>+	if (!buf) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "insufficient memory for nvm test");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bnxt_get_nvram_item(bp-&gt;dev, index, 0, datalen, buf)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd read error");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bnxt_flash_nvram(bp-&gt;dev, BNX_DIR_TYPE_VPD, BNX_DIR_ORDINAL_FIRST,</div><div class='add'>+			     BNX_DIR_EXT_NONE, 0, 0, buf, datalen)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd write error");</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = true;</div><div class='add'>+</div><div class='add'>+done:</div><div class='add'>+	kfree(buf);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_dl_selftest_check(struct devlink *dl, unsigned int id,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	return id == DEVLINK_ATTR_SELFTEST_ID_FLASH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum devlink_selftest_status bnxt_dl_selftest_run(struct devlink *dl,</div><div class='add'>+							 unsigned int id,</div><div class='add'>+							 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+</div><div class='add'>+	if (id == DEVLINK_ATTR_SELFTEST_ID_FLASH)</div><div class='add'>+		return bnxt_nvm_test(bp, extack) ?</div><div class='add'>+				DEVLINK_SELFTEST_STATUS_PASS :</div><div class='add'>+				DEVLINK_SELFTEST_STATUS_FAIL;</div><div class='add'>+</div><div class='add'>+	return DEVLINK_SELFTEST_STATUS_SKIP;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static const struct devlink_ops bnxt_dl_ops = {</div><div class='ctx'> #ifdef CONFIG_BNXT_SRIOV</div><div class='ctx'> 	.eswitch_mode_set = bnxt_dl_eswitch_mode_set,</div><div class='ctx'> 	.eswitch_mode_get = bnxt_dl_eswitch_mode_get,</div><div class='ctx'> #endif /* CONFIG_BNXT_SRIOV */</div><div class='add'>+	.info_get	  = bnxt_dl_info_get,</div><div class='add'>+	.flash_update	  = bnxt_dl_flash_update,</div><div class='add'>+	.reload_actions	  = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |</div><div class='add'>+			    BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE),</div><div class='add'>+	.reload_limits	  = BIT(DEVLINK_RELOAD_LIMIT_NO_RESET),</div><div class='add'>+	.reload_down	  = bnxt_dl_reload_down,</div><div class='add'>+	.reload_up	  = bnxt_dl_reload_up,</div><div class='add'>+	.selftest_check	  = bnxt_dl_selftest_check,</div><div class='add'>+	.selftest_run	  = bnxt_dl_selftest_run,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct devlink_ops bnxt_vf_dl_ops;</div><div class='add'>+</div><div class='ctx'> enum bnxt_dl_param_id {</div><div class='ctx'> 	BNXT_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,</div><div class='ctx'> 	BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK,</div><div class='hunk'>@@ -29,120 +666,486 @@ enum bnxt_dl_param_id {</div><div class='ctx'> </div><div class='ctx'> static const struct bnxt_dl_nvm_param nvm_params[] = {</div><div class='ctx'> 	{DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV, NVM_OFF_ENABLE_SRIOV,</div><div class='del'>-	 BNXT_NVM_SHARED_CFG, 1},</div><div class='add'>+	 BNXT_NVM_SHARED_CFG, 1, 1},</div><div class='ctx'> 	{DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI, NVM_OFF_IGNORE_ARI,</div><div class='del'>-	 BNXT_NVM_SHARED_CFG, 1},</div><div class='add'>+	 BNXT_NVM_SHARED_CFG, 1, 1},</div><div class='ctx'> 	{DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,</div><div class='del'>-	 NVM_OFF_MSIX_VEC_PER_PF_MAX, BNXT_NVM_SHARED_CFG, 10},</div><div class='add'>+	 NVM_OFF_MSIX_VEC_PER_PF_MAX, BNXT_NVM_SHARED_CFG, 10, 4},</div><div class='ctx'> 	{DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,</div><div class='del'>-	 NVM_OFF_MSIX_VEC_PER_PF_MIN, BNXT_NVM_SHARED_CFG, 7},</div><div class='add'>+	 NVM_OFF_MSIX_VEC_PER_PF_MIN, BNXT_NVM_SHARED_CFG, 7, 4},</div><div class='add'>+	{DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE, NVM_OFF_SUPPORT_RDMA,</div><div class='add'>+	 BNXT_NVM_FUNC_CFG, 1, 1},</div><div class='ctx'> 	{BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK, NVM_OFF_DIS_GRE_VER_CHECK,</div><div class='del'>-	 BNXT_NVM_SHARED_CFG, 1},</div><div class='add'>+	 BNXT_NVM_SHARED_CFG, 1, 1},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,</div><div class='del'>-			     int msg_len, union devlink_param_value *val)</div><div class='add'>+union bnxt_nvm_data {</div><div class='add'>+	u8	val8;</div><div class='add'>+	__le32	val32;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bnxt_copy_to_nvm_data(union bnxt_nvm_data *dst,</div><div class='add'>+				  union devlink_param_value *src,</div><div class='add'>+				  int nvm_num_bits, int dl_num_bytes)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_nvm_get_variable_input *req = msg;</div><div class='del'>-	void *data_addr = NULL, *buf = NULL;</div><div class='del'>-	struct bnxt_dl_nvm_param nvm_param;</div><div class='del'>-	int bytesize, idx = 0, rc, i;</div><div class='add'>+	u32 val32 = 0;</div><div class='add'>+</div><div class='add'>+	if (nvm_num_bits == 1) {</div><div class='add'>+		dst-&gt;val8 = src-&gt;vbool;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (dl_num_bytes == 4)</div><div class='add'>+		val32 = src-&gt;vu32;</div><div class='add'>+	else if (dl_num_bytes == 2)</div><div class='add'>+		val32 = (u32)src-&gt;vu16;</div><div class='add'>+	else if (dl_num_bytes == 1)</div><div class='add'>+		val32 = (u32)src-&gt;vu8;</div><div class='add'>+	dst-&gt;val32 = cpu_to_le32(val32);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_copy_from_nvm_data(union devlink_param_value *dst,</div><div class='add'>+				    union bnxt_nvm_data *src,</div><div class='add'>+				    int nvm_num_bits, int dl_num_bytes)</div><div class='add'>+{</div><div class='add'>+	u32 val32;</div><div class='add'>+</div><div class='add'>+	if (nvm_num_bits == 1) {</div><div class='add'>+		dst-&gt;vbool = src-&gt;val8;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	val32 = le32_to_cpu(src-&gt;val32);</div><div class='add'>+	if (dl_num_bytes == 4)</div><div class='add'>+		dst-&gt;vu32 = val32;</div><div class='add'>+	else if (dl_num_bytes == 2)</div><div class='add'>+		dst-&gt;vu16 = (u16)val32;</div><div class='add'>+	else if (dl_num_bytes == 1)</div><div class='add'>+		dst-&gt;vu8 = (u8)val32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_get_nvm_cfg_ver(struct bnxt *bp, u32 *nvm_cfg_ver)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_variable_input *req;</div><div class='add'>+	u16 bytes = BNXT_NVM_CFG_VER_BYTES;</div><div class='add'>+	u16 bits = BNXT_NVM_CFG_VER_BITS;</div><div class='add'>+	union devlink_param_value ver;</div><div class='add'>+	union bnxt_nvm_data *data;</div><div class='ctx'> 	dma_addr_t data_dma_addr;</div><div class='add'>+	int rc, i = 2;</div><div class='add'>+	u16 dim = 1;</div><div class='ctx'> </div><div class='del'>-	/* Get/Set NVM CFG parameter is supported only on PFs */</div><div class='del'>-	if (BNXT_VF(bp))</div><div class='del'>-		return -EPERM;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_VARIABLE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(nvm_params); i++) {</div><div class='del'>-		if (nvm_params[i].id == param_id) {</div><div class='del'>-			nvm_param = nvm_params[i];</div><div class='del'>-			break;</div><div class='add'>+	data = hwrm_req_dma_slice(bp, req, sizeof(*data), &amp;data_dma_addr);</div><div class='add'>+	if (!data) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* earlier devices present as an array of raw bytes */</div><div class='add'>+	if (!BNXT_CHIP_P5_PLUS(bp)) {</div><div class='add'>+		dim = 0;</div><div class='add'>+		i = 0;</div><div class='add'>+		bits *= 3;  /* array of 3 version components */</div><div class='add'>+		bytes *= 4; /* copy whole word */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='add'>+	req-&gt;dest_data_addr = cpu_to_le64(data_dma_addr);</div><div class='add'>+	req-&gt;data_len = cpu_to_le16(bits);</div><div class='add'>+	req-&gt;option_num = cpu_to_le16(NVM_OFF_NVM_CFG_VER);</div><div class='add'>+	req-&gt;dimensions = cpu_to_le16(dim);</div><div class='add'>+</div><div class='add'>+	while (i &gt;= 0) {</div><div class='add'>+		req-&gt;index_0 = cpu_to_le16(i--);</div><div class='add'>+		rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit;</div><div class='add'>+		bnxt_copy_from_nvm_data(&amp;ver, data, bits, bytes);</div><div class='add'>+</div><div class='add'>+		if (BNXT_CHIP_P5_PLUS(bp)) {</div><div class='add'>+			*nvm_cfg_ver &lt;&lt;= 8;</div><div class='add'>+			*nvm_cfg_ver |= ver.vu8;</div><div class='add'>+		} else {</div><div class='add'>+			*nvm_cfg_ver = ver.vu32;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (i == ARRAY_SIZE(nvm_params))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+exit:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_info_put(struct bnxt *bp, struct devlink_info_req *req,</div><div class='add'>+			    enum bnxt_dl_version_type type, const char *key,</div><div class='add'>+			    char *buf)</div><div class='add'>+{</div><div class='add'>+	if (!strlen(buf))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if ((bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) &amp;&amp;</div><div class='add'>+	    (!strcmp(key, DEVLINK_INFO_VERSION_GENERIC_FW_NCSI) ||</div><div class='add'>+	     !strcmp(key, DEVLINK_INFO_VERSION_GENERIC_FW_ROCE)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case BNXT_VERSION_FIXED:</div><div class='add'>+		return devlink_info_version_fixed_put(req, key, buf);</div><div class='add'>+	case BNXT_VERSION_RUNNING:</div><div class='add'>+		return devlink_info_version_running_put(req, key, buf);</div><div class='add'>+	case BNXT_VERSION_STORED:</div><div class='add'>+		return devlink_info_version_stored_put(req, key, buf);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_SRT_PATCH	"fw.srt.patch"</div><div class='add'>+#define BNXT_FW_CRT_PATCH	"fw.crt.patch"</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_livepatch_info_put(struct bnxt *bp,</div><div class='add'>+				      struct devlink_info_req *req,</div><div class='add'>+				      const char *key)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_fw_livepatch_query_input *query;</div><div class='add'>+	struct hwrm_fw_livepatch_query_output *resp;</div><div class='add'>+	u16 flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_LIVEPATCH)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, query, HWRM_FW_LIVEPATCH_QUERY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (!strcmp(key, BNXT_FW_SRT_PATCH))</div><div class='add'>+		query-&gt;fw_target = FW_LIVEPATCH_QUERY_REQ_FW_TARGET_SECURE_FW;</div><div class='add'>+	else if (!strcmp(key, BNXT_FW_CRT_PATCH))</div><div class='add'>+		query-&gt;fw_target = FW_LIVEPATCH_QUERY_REQ_FW_TARGET_COMMON_FW;</div><div class='add'>+	else</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, query);</div><div class='add'>+	rc = hwrm_req_send(bp, query);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	flags = le16_to_cpu(resp-&gt;status_flags);</div><div class='add'>+	if (flags &amp; FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_ACTIVE) {</div><div class='add'>+		resp-&gt;active_ver[sizeof(resp-&gt;active_ver) - 1] = '\0';</div><div class='add'>+		rc = devlink_info_version_running_put(req, key, resp-&gt;active_ver);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; FW_LIVEPATCH_QUERY_RESP_STATUS_FLAGS_INSTALL) {</div><div class='add'>+		resp-&gt;install_ver[sizeof(resp-&gt;install_ver) - 1] = '\0';</div><div class='add'>+		rc = devlink_info_version_stored_put(req, key, resp-&gt;install_ver);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+exit:</div><div class='add'>+	hwrm_req_drop(bp, query);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define HWRM_FW_VER_STR_LEN	16</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_info_get(struct devlink *dl, struct devlink_info_req *req,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_dev_info_output nvm_dev_info;</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	struct hwrm_ver_get_output *ver_resp;</div><div class='add'>+	char mgmt_ver[FW_VER_STR_LEN];</div><div class='add'>+	char roce_ver[FW_VER_STR_LEN];</div><div class='add'>+	char ncsi_ver[FW_VER_STR_LEN];</div><div class='add'>+	char buf[32];</div><div class='add'>+	u32 ver = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; (bp-&gt;flags &amp; BNXT_FLAG_DSN_VALID)) {</div><div class='add'>+		sprintf(buf, "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X",</div><div class='add'>+			bp-&gt;dsn[7], bp-&gt;dsn[6], bp-&gt;dsn[5], bp-&gt;dsn[4],</div><div class='add'>+			bp-&gt;dsn[3], bp-&gt;dsn[2], bp-&gt;dsn[1], bp-&gt;dsn[0]);</div><div class='add'>+		rc = devlink_info_serial_number_put(req, buf);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (strlen(bp-&gt;board_serialno)) {</div><div class='add'>+		rc = devlink_info_board_serial_number_put(req, bp-&gt;board_serialno);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_FIXED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_BOARD_ID,</div><div class='add'>+			      bp-&gt;board_partno);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	sprintf(buf, "%X", bp-&gt;chip_num);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_FIXED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_ASIC_ID, buf);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ver_resp = &amp;bp-&gt;ver_resp;</div><div class='add'>+	sprintf(buf, "%c%d", 'A' + ver_resp-&gt;chip_rev, ver_resp-&gt;chip_metal);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_FIXED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_ASIC_REV, buf);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,</div><div class='add'>+			      bp-&gt;nvm_cfg_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	strncat(buf, ver_resp-&gt;active_pkg_name, HWRM_FW_VER_STR_LEN);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; !bnxt_hwrm_get_nvm_cfg_ver(bp, &amp;ver)) {</div><div class='add'>+		sprintf(buf, "%d.%d.%d", (ver &gt;&gt; 16) &amp; 0xff, (ver &gt;&gt; 8) &amp; 0xff,</div><div class='add'>+			ver &amp; 0xff);</div><div class='add'>+		rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,</div><div class='add'>+				      DEVLINK_INFO_VERSION_GENERIC_FW_PSID,</div><div class='add'>+				      buf);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ver_resp-&gt;flags &amp; VER_GET_RESP_FLAGS_EXT_VER_AVAIL) {</div><div class='add'>+		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_major, ver_resp-&gt;hwrm_fw_minor,</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_build, ver_resp-&gt;hwrm_fw_patch);</div><div class='add'>+</div><div class='add'>+		snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_major, ver_resp-&gt;mgmt_fw_minor,</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_build, ver_resp-&gt;mgmt_fw_patch);</div><div class='add'>+</div><div class='add'>+		snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;roce_fw_major, ver_resp-&gt;roce_fw_minor,</div><div class='add'>+			 ver_resp-&gt;roce_fw_build, ver_resp-&gt;roce_fw_patch);</div><div class='add'>+	} else {</div><div class='add'>+		snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_maj_8b, ver_resp-&gt;hwrm_fw_min_8b,</div><div class='add'>+			 ver_resp-&gt;hwrm_fw_bld_8b, ver_resp-&gt;hwrm_fw_rsvd_8b);</div><div class='add'>+</div><div class='add'>+		snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_maj_8b, ver_resp-&gt;mgmt_fw_min_8b,</div><div class='add'>+			 ver_resp-&gt;mgmt_fw_bld_8b, ver_resp-&gt;mgmt_fw_rsvd_8b);</div><div class='add'>+</div><div class='add'>+		snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+			 ver_resp-&gt;roce_fw_maj_8b, ver_resp-&gt;roce_fw_min_8b,</div><div class='add'>+			 ver_resp-&gt;roce_fw_bld_8b, ver_resp-&gt;roce_fw_rsvd_8b);</div><div class='add'>+	}</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT_API,</div><div class='add'>+			      bp-&gt;hwrm_ver_supp);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_RUNNING,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_nvm_get_dev_info(bp, &amp;nvm_dev_info);</div><div class='add'>+	if (rc ||</div><div class='add'>+	    !(nvm_dev_info.flags &amp; NVM_GET_DEV_INFO_RESP_FLAGS_FW_VER_VALID)) {</div><div class='add'>+		if (!bnxt_get_pkginfo(bp-&gt;dev, buf, sizeof(buf)))</div><div class='add'>+			return bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,</div><div class='add'>+						DEVLINK_INFO_VERSION_GENERIC_FW,</div><div class='add'>+						buf);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buf[0] = 0;</div><div class='add'>+	strncat(buf, nvm_dev_info.pkg_name, HWRM_FW_VER_STR_LEN);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW, buf);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	snprintf(mgmt_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 nvm_dev_info.hwrm_fw_major, nvm_dev_info.hwrm_fw_minor,</div><div class='add'>+		 nvm_dev_info.hwrm_fw_build, nvm_dev_info.hwrm_fw_patch);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, mgmt_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	snprintf(ncsi_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 nvm_dev_info.mgmt_fw_major, nvm_dev_info.mgmt_fw_minor,</div><div class='add'>+		 nvm_dev_info.mgmt_fw_build, nvm_dev_info.mgmt_fw_patch);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_NCSI, ncsi_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	if (nvm_param.dir_type == BNXT_NVM_PORT_CFG)</div><div class='add'>+	snprintf(roce_ver, FW_VER_STR_LEN, "%d.%d.%d.%d",</div><div class='add'>+		 nvm_dev_info.roce_fw_major, nvm_dev_info.roce_fw_minor,</div><div class='add'>+		 nvm_dev_info.roce_fw_build, nvm_dev_info.roce_fw_patch);</div><div class='add'>+	rc = bnxt_dl_info_put(bp, req, BNXT_VERSION_STORED,</div><div class='add'>+			      DEVLINK_INFO_VERSION_GENERIC_FW_ROCE, roce_ver);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_CHIP_P5_PLUS(bp)) {</div><div class='add'>+		rc = bnxt_dl_livepatch_info_put(bp, req, BNXT_FW_SRT_PATCH);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	return bnxt_dl_livepatch_info_put(bp, req, BNXT_FW_CRT_PATCH);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bnxt_hwrm_nvm_req(struct bnxt *bp,</div><div class='add'>+			       const struct bnxt_dl_nvm_param *nvm, void *msg,</div><div class='add'>+			       union devlink_param_value *val)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_variable_input *req = msg;</div><div class='add'>+	struct hwrm_err_output *resp;</div><div class='add'>+	union bnxt_nvm_data *data;</div><div class='add'>+	dma_addr_t data_dma_addr;</div><div class='add'>+	int idx = 0, rc;</div><div class='add'>+</div><div class='add'>+	if (nvm-&gt;dir_type == BNXT_NVM_PORT_CFG)</div><div class='ctx'> 		idx = bp-&gt;pf.port_id;</div><div class='del'>-	else if (nvm_param.dir_type == BNXT_NVM_FUNC_CFG)</div><div class='add'>+	else if (nvm-&gt;dir_type == BNXT_NVM_FUNC_CFG)</div><div class='ctx'> 		idx = bp-&gt;pf.fw_fid - BNXT_FIRST_PF_FID;</div><div class='ctx'> </div><div class='del'>-	bytesize = roundup(nvm_param.num_bits, BITS_PER_BYTE) / BITS_PER_BYTE;</div><div class='del'>-	switch (bytesize) {</div><div class='del'>-	case 1:</div><div class='del'>-		if (nvm_param.num_bits == 1)</div><div class='del'>-			buf = &amp;val-&gt;vbool;</div><div class='del'>-		else</div><div class='del'>-			buf = &amp;val-&gt;vu8;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		buf = &amp;val-&gt;vu16;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		buf = &amp;val-&gt;vu32;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	}</div><div class='add'>+	data = hwrm_req_dma_slice(bp, req, sizeof(*data), &amp;data_dma_addr);</div><div class='ctx'> </div><div class='del'>-	data_addr = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, bytesize,</div><div class='del'>-				       &amp;data_dma_addr, GFP_KERNEL);</div><div class='del'>-	if (!data_addr)</div><div class='add'>+	if (!data) {</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	req-&gt;dest_data_addr = cpu_to_le64(data_dma_addr);</div><div class='del'>-	req-&gt;data_len = cpu_to_le16(nvm_param.num_bits);</div><div class='del'>-	req-&gt;option_num = cpu_to_le16(nvm_param.offset);</div><div class='add'>+	req-&gt;data_len = cpu_to_le16(nvm-&gt;nvm_num_bits);</div><div class='add'>+	req-&gt;option_num = cpu_to_le16(nvm-&gt;offset);</div><div class='ctx'> 	req-&gt;index_0 = cpu_to_le16(idx);</div><div class='ctx'> 	if (idx)</div><div class='ctx'> 		req-&gt;dimensions = cpu_to_le16(1);</div><div class='ctx'> </div><div class='del'>-	if (req-&gt;req_type == cpu_to_le16(HWRM_NVM_SET_VARIABLE))</div><div class='del'>-		memcpy(data_addr, buf, bytesize);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	if (req-&gt;req_type == cpu_to_le16(HWRM_NVM_SET_VARIABLE)) {</div><div class='add'>+		bnxt_copy_to_nvm_data(data, val, nvm-&gt;nvm_num_bits,</div><div class='add'>+				      nvm-&gt;dl_num_bytes);</div><div class='add'>+		rc = hwrm_req_send(bp, msg);</div><div class='add'>+	} else {</div><div class='add'>+		rc = hwrm_req_send_silent(bp, msg);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			bnxt_copy_from_nvm_data(val, data,</div><div class='add'>+						nvm-&gt;nvm_num_bits,</div><div class='add'>+						nvm-&gt;dl_num_bytes);</div><div class='add'>+		} else {</div><div class='add'>+			if (resp-&gt;cmd_err ==</div><div class='add'>+				NVM_GET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST)</div><div class='add'>+				rc = -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (rc == -EACCES)</div><div class='add'>+		netdev_err(bp-&gt;dev, "PF does not have admin privileges to modify NVM config\n");</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, msg, msg_len, HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc &amp;&amp; req-&gt;req_type == cpu_to_le16(HWRM_NVM_GET_VARIABLE))</div><div class='del'>-		memcpy(buf, data_addr, bytesize);</div><div class='add'>+static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,</div><div class='add'>+			     union devlink_param_value *val)</div><div class='add'>+{</div><div class='add'>+	const struct bnxt_dl_nvm_param *nvm_param;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, bytesize, data_addr, data_dma_addr);</div><div class='del'>-	if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "PF does not have admin privileges to modify NVM config\n");</div><div class='del'>-		return -EACCES;</div><div class='del'>-	} else if (rc) {</div><div class='del'>-		return -EIO;</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(nvm_params); i++) {</div><div class='add'>+		nvm_param = &amp;nvm_params[i];</div><div class='add'>+		if (nvm_param-&gt;id == param_id)</div><div class='add'>+			return __bnxt_hwrm_nvm_req(bp, nvm_param, msg, val);</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_dl_nvm_param_get(struct devlink *dl, u32 id,</div><div class='del'>-				 struct devlink_param_gset_ctx *ctx)</div><div class='add'>+				 struct devlink_param_gset_ctx *ctx,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_nvm_get_variable_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	struct hwrm_nvm_get_variable_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_GET_VARIABLE, -1, -1);</div><div class='del'>-	rc = bnxt_hwrm_nvm_req(bp, id, &amp;req, sizeof(req), &amp;ctx-&gt;val);</div><div class='del'>-	if (!rc)</div><div class='del'>-		if (id == BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK)</div><div class='del'>-			ctx-&gt;val.vbool = !ctx-&gt;val.vbool;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_VARIABLE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_nvm_req(bp, id, req, &amp;ctx-&gt;val);</div><div class='add'>+	if (!rc &amp;&amp; id == BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK)</div><div class='add'>+		ctx-&gt;val.vbool = !ctx-&gt;val.vbool;</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_dl_nvm_param_set(struct devlink *dl, u32 id,</div><div class='del'>-				 struct devlink_param_gset_ctx *ctx)</div><div class='add'>+				 struct devlink_param_gset_ctx *ctx,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_nvm_set_variable_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	struct hwrm_nvm_set_variable_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_SET_VARIABLE, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_SET_VARIABLE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	if (id == BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK)</div><div class='ctx'> 		ctx-&gt;val.vbool = !ctx-&gt;val.vbool;</div><div class='ctx'> </div><div class='del'>-	return bnxt_hwrm_nvm_req(bp, id, &amp;req, sizeof(req), &amp;ctx-&gt;val);</div><div class='add'>+	return bnxt_hwrm_nvm_req(bp, id, req, &amp;ctx-&gt;val);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_dl_roce_validate(struct devlink *dl, u32 id,</div><div class='add'>+				 union devlink_param_value val,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct bnxt_dl_nvm_param nvm_roce_cap = {0, NVM_OFF_RDMA_CAPABLE,</div><div class='add'>+		BNXT_NVM_SHARED_CFG, 1, 1};</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	struct hwrm_nvm_get_variable_input *req;</div><div class='add'>+	union devlink_param_value roce_cap;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_VARIABLE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (__bnxt_hwrm_nvm_req(bp, &amp;nvm_roce_cap, req, &amp;roce_cap)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to verify if device is RDMA Capable");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!roce_cap.vbool) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Device does not support RDMA");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_dl_msix_validate(struct devlink *dl, u32 id,</div><div class='hunk'>@@ -165,6 +1168,34 @@ static int bnxt_dl_msix_validate(struct devlink *dl, u32 id,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_remote_dev_reset_get(struct devlink *dl, u32 id,</div><div class='add'>+				     struct devlink_param_gset_ctx *ctx,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET_IF)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;val.vbool = bnxt_dl_get_remote_reset(dl);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_remote_dev_reset_set(struct devlink *dl, u32 id,</div><div class='add'>+				     struct devlink_param_gset_ctx *ctx,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = bnxt_get_bp_from_dl(dl);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_remote_dev_reset_set(bp, ctx-&gt;val.vbool);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	bnxt_dl_set_remote_reset(dl, ctx-&gt;val.vbool);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct devlink_param bnxt_dl_params[] = {</div><div class='ctx'> 	DEVLINK_PARAM_GENERIC(ENABLE_SRIOV,</div><div class='ctx'> 			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),</div><div class='hunk'>@@ -182,83 +1213,107 @@ static const struct devlink_param bnxt_dl_params[] = {</div><div class='ctx'> 			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),</div><div class='ctx'> 			      bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,</div><div class='ctx'> 			      bnxt_dl_msix_validate),</div><div class='add'>+	DEVLINK_PARAM_GENERIC(ENABLE_ROCE,</div><div class='add'>+			      BIT(DEVLINK_PARAM_CMODE_PERMANENT),</div><div class='add'>+			      bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,</div><div class='add'>+			      bnxt_dl_roce_validate),</div><div class='ctx'> 	DEVLINK_PARAM_DRIVER(BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK,</div><div class='ctx'> 			     "gre_ver_check", DEVLINK_PARAM_TYPE_BOOL,</div><div class='ctx'> 			     BIT(DEVLINK_PARAM_CMODE_PERMANENT),</div><div class='ctx'> 			     bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,</div><div class='ctx'> 			     NULL),</div><div class='add'>+	/* keep REMOTE_DEV_RESET last, it is excluded based on caps */</div><div class='add'>+	DEVLINK_PARAM_GENERIC(ENABLE_REMOTE_DEV_RESET,</div><div class='add'>+			      BIT(DEVLINK_PARAM_CMODE_RUNTIME),</div><div class='add'>+			      bnxt_remote_dev_reset_get,</div><div class='add'>+			      bnxt_remote_dev_reset_set, NULL),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct devlink_param bnxt_dl_port_params[] = {</div><div class='del'>-};</div><div class='add'>+static int bnxt_dl_params_register(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int num_params = ARRAY_SIZE(bnxt_dl_params);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10600)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET_IF)</div><div class='add'>+		num_params--;</div><div class='add'>+</div><div class='add'>+	rc = devlink_params_register(bp-&gt;dl, bnxt_dl_params, num_params);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_warn(bp-&gt;dev, "devlink_params_register failed. rc=%d\n",</div><div class='add'>+			    rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_dl_params_unregister(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int num_params = ARRAY_SIZE(bnxt_dl_params);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10600)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (~bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET_IF)</div><div class='add'>+		num_params--;</div><div class='add'>+</div><div class='add'>+	devlink_params_unregister(bp-&gt;dl, bnxt_dl_params, num_params);</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> int bnxt_dl_register(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	const struct devlink_ops *devlink_ops;</div><div class='add'>+	struct devlink_port_attrs attrs = {};</div><div class='add'>+	struct bnxt_dl *bp_dl;</div><div class='ctx'> 	struct devlink *dl;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_spec_code &lt; 0x10600) {</div><div class='del'>-		netdev_warn(bp-&gt;dev, "Firmware does not support NVM params");</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	if (BNXT_PF(bp))</div><div class='add'>+		devlink_ops = &amp;bnxt_dl_ops;</div><div class='add'>+	else</div><div class='add'>+		devlink_ops = &amp;bnxt_vf_dl_ops;</div><div class='ctx'> </div><div class='del'>-	dl = devlink_alloc(&amp;bnxt_dl_ops, sizeof(struct bnxt_dl));</div><div class='add'>+	dl = devlink_alloc(devlink_ops, sizeof(struct bnxt_dl), &amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (!dl) {</div><div class='del'>-		netdev_warn(bp-&gt;dev, "devlink_alloc failed");</div><div class='add'>+		netdev_warn(bp-&gt;dev, "devlink_alloc failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bnxt_link_bp_to_dl(bp, dl);</div><div class='add'>+	bp-&gt;dl = dl;</div><div class='add'>+	bp_dl = devlink_priv(dl);</div><div class='add'>+	bp_dl-&gt;bp = bp;</div><div class='add'>+	bnxt_dl_set_remote_reset(dl, true);</div><div class='ctx'> </div><div class='ctx'> 	/* Add switchdev eswitch mode setting, if SRIOV supported */</div><div class='ctx'> 	if (pci_find_ext_capability(bp-&gt;pdev, PCI_EXT_CAP_ID_SRIOV) &amp;&amp;</div><div class='ctx'> 	    bp-&gt;hwrm_spec_code &gt; 0x10803)</div><div class='ctx'> 		bp-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;</div><div class='ctx'> </div><div class='del'>-	rc = devlink_register(dl, &amp;bp-&gt;pdev-&gt;dev);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_warn(bp-&gt;dev, "devlink_register failed. rc=%d", rc);</div><div class='del'>-		goto err_dl_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rc = devlink_params_register(dl, bnxt_dl_params,</div><div class='del'>-				     ARRAY_SIZE(bnxt_dl_params));</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_warn(bp-&gt;dev, "devlink_params_register failed. rc=%d",</div><div class='del'>-			    rc);</div><div class='del'>-		goto err_dl_unreg;</div><div class='del'>-	}</div><div class='add'>+	if (!BNXT_PF(bp))</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	devlink_port_attrs_set(&amp;bp-&gt;dl_port, DEVLINK_PORT_FLAVOUR_PHYSICAL,</div><div class='del'>-			       bp-&gt;pf.port_id, false, 0,</div><div class='del'>-			       bp-&gt;switch_id, sizeof(bp-&gt;switch_id));</div><div class='add'>+	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;</div><div class='add'>+	attrs.phys.port_number = bp-&gt;pf.port_id;</div><div class='add'>+	memcpy(attrs.switch_id.id, bp-&gt;dsn, sizeof(bp-&gt;dsn));</div><div class='add'>+	attrs.switch_id.id_len = sizeof(bp-&gt;dsn);</div><div class='add'>+	devlink_port_attrs_set(&amp;bp-&gt;dl_port, &amp;attrs);</div><div class='ctx'> 	rc = devlink_port_register(dl, &amp;bp-&gt;dl_port, bp-&gt;pf.port_id);</div><div class='ctx'> 	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "devlink_port_register failed");</div><div class='del'>-		goto err_dl_param_unreg;</div><div class='add'>+		netdev_err(bp-&gt;dev, "devlink_port_register failed\n");</div><div class='add'>+		goto err_dl_free;</div><div class='ctx'> 	}</div><div class='del'>-	devlink_port_type_eth_set(&amp;bp-&gt;dl_port, bp-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	rc = devlink_port_params_register(&amp;bp-&gt;dl_port, bnxt_dl_port_params,</div><div class='del'>-					  ARRAY_SIZE(bnxt_dl_port_params));</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "devlink_port_params_register failed");</div><div class='add'>+	rc = bnxt_dl_params_register(bp);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		goto err_dl_port_unreg;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	devlink_params_publish(dl);</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	devlink_register(dl);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_dl_port_unreg:</div><div class='ctx'> 	devlink_port_unregister(&amp;bp-&gt;dl_port);</div><div class='del'>-err_dl_param_unreg:</div><div class='del'>-	devlink_params_unregister(dl, bnxt_dl_params,</div><div class='del'>-				  ARRAY_SIZE(bnxt_dl_params));</div><div class='del'>-err_dl_unreg:</div><div class='del'>-	devlink_unregister(dl);</div><div class='ctx'> err_dl_free:</div><div class='del'>-	bnxt_link_bp_to_dl(bp, NULL);</div><div class='ctx'> 	devlink_free(dl);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -267,14 +1322,10 @@ void bnxt_dl_unregister(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct devlink *dl = bp-&gt;dl;</div><div class='ctx'> </div><div class='del'>-	if (!dl)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	devlink_port_params_unregister(&amp;bp-&gt;dl_port, bnxt_dl_port_params,</div><div class='del'>-				       ARRAY_SIZE(bnxt_dl_port_params));</div><div class='del'>-	devlink_port_unregister(&amp;bp-&gt;dl_port);</div><div class='del'>-	devlink_params_unregister(dl, bnxt_dl_params,</div><div class='del'>-				  ARRAY_SIZE(bnxt_dl_params));</div><div class='ctx'> 	devlink_unregister(dl);</div><div class='add'>+	if (BNXT_PF(bp)) {</div><div class='add'>+		bnxt_dl_params_unregister(bp);</div><div class='add'>+		devlink_port_unregister(&amp;bp-&gt;dl_port);</div><div class='add'>+	}</div><div class='ctx'> 	devlink_free(dl);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h<br/>index 5b6b2c7d97cf..7f45dcd7b287 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h</a></div><div class='hunk'>@@ -13,6 +13,7 @@</div><div class='ctx'> /* Struct to hold housekeeping info needed by devlink interface */</div><div class='ctx'> struct bnxt_dl {</div><div class='ctx'> 	struct bnxt *bp;	/* back ptr to the controlling dev */</div><div class='add'>+	bool remote_reset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct bnxt *bnxt_get_bp_from_dl(struct devlink *dl)</div><div class='hunk'>@@ -20,26 +21,36 @@ static inline struct bnxt *bnxt_get_bp_from_dl(struct devlink *dl)</div><div class='ctx'> 	return ((struct bnxt_dl *)devlink_priv(dl))-&gt;bp;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* To clear devlink pointer from bp, pass NULL dl */</div><div class='del'>-static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl)</div><div class='add'>+static inline void bnxt_dl_remote_reload(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	bp-&gt;dl = dl;</div><div class='add'>+	devlink_remote_reload_actions_performed(bp-&gt;dl, 0,</div><div class='add'>+						BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |</div><div class='add'>+						BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE));</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* add a back pointer in dl to bp */</div><div class='del'>-	if (dl) {</div><div class='del'>-		struct bnxt_dl *bp_dl = devlink_priv(dl);</div><div class='add'>+static inline bool bnxt_dl_get_remote_reset(struct devlink *dl)</div><div class='add'>+{</div><div class='add'>+	return ((struct bnxt_dl *)devlink_priv(dl))-&gt;remote_reset;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		bp_dl-&gt;bp = bp;</div><div class='del'>-	}</div><div class='add'>+static inline void bnxt_dl_set_remote_reset(struct devlink *dl, bool value)</div><div class='add'>+{</div><div class='add'>+	((struct bnxt_dl *)devlink_priv(dl))-&gt;remote_reset = value;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define NVM_OFF_MSIX_VEC_PER_PF_MAX	108</div><div class='ctx'> #define NVM_OFF_MSIX_VEC_PER_PF_MIN	114</div><div class='ctx'> #define NVM_OFF_IGNORE_ARI		164</div><div class='add'>+#define NVM_OFF_RDMA_CAPABLE		161</div><div class='ctx'> #define NVM_OFF_DIS_GRE_VER_CHECK	171</div><div class='ctx'> #define NVM_OFF_ENABLE_SRIOV		401</div><div class='add'>+#define NVM_OFF_SUPPORT_RDMA		506</div><div class='add'>+#define NVM_OFF_NVM_CFG_VER		602</div><div class='ctx'> </div><div class='del'>-#define BNXT_MSIX_VEC_MAX	1280</div><div class='add'>+#define BNXT_NVM_CFG_VER_BITS		8</div><div class='add'>+#define BNXT_NVM_CFG_VER_BYTES		1</div><div class='add'>+</div><div class='add'>+#define BNXT_MSIX_VEC_MAX	512</div><div class='ctx'> #define BNXT_MSIX_VEC_MIN_MAX	128</div><div class='ctx'> </div><div class='ctx'> enum bnxt_nvm_dir_type {</div><div class='hunk'>@@ -52,9 +63,21 @@ struct bnxt_dl_nvm_param {</div><div class='ctx'> 	u16 id;</div><div class='ctx'> 	u16 offset;</div><div class='ctx'> 	u16 dir_type;</div><div class='del'>-	u16 num_bits;</div><div class='add'>+	u16 nvm_num_bits;</div><div class='add'>+	u8 dl_num_bytes;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnxt_dl_version_type {</div><div class='add'>+	BNXT_VERSION_FIXED,</div><div class='add'>+	BNXT_VERSION_RUNNING,</div><div class='add'>+	BNXT_VERSION_STORED,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void bnxt_devlink_health_fw_report(struct bnxt *bp);</div><div class='add'>+void bnxt_dl_health_fw_status_update(struct bnxt *bp, bool healthy);</div><div class='add'>+void bnxt_dl_health_fw_recovery_done(struct bnxt *bp);</div><div class='add'>+void bnxt_dl_fw_reporters_create(struct bnxt *bp);</div><div class='add'>+void bnxt_dl_fw_reporters_destroy(struct bnxt *bp);</div><div class='ctx'> int bnxt_dl_register(struct bnxt *bp);</div><div class='ctx'> void bnxt_dl_unregister(struct bnxt *bp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c<br/>index afa97c8bb081..53a3bcb0efe0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c</a></div><div class='hunk'>@@ -7,26 +7,25 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/net_dim.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='ctx'> </div><div class='ctx'> void bnxt_dim_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct net_dim *dim = container_of(work, struct net_dim,</div><div class='del'>-					   work);</div><div class='add'>+	struct dim *dim = container_of(work, struct dim, work);</div><div class='ctx'> 	struct bnxt_cp_ring_info *cpr = container_of(dim,</div><div class='ctx'> 						     struct bnxt_cp_ring_info,</div><div class='ctx'> 						     dim);</div><div class='ctx'> 	struct bnxt_napi *bnapi = container_of(cpr,</div><div class='ctx'> 					       struct bnxt_napi,</div><div class='ctx'> 					       cp_ring);</div><div class='del'>-	struct net_dim_cq_moder cur_moder =</div><div class='add'>+	struct dim_cq_moder cur_moder =</div><div class='ctx'> 		net_dim_get_rx_moderation(dim-&gt;mode, dim-&gt;profile_ix);</div><div class='ctx'> </div><div class='ctx'> 	cpr-&gt;rx_ring_coal.coal_ticks = cur_moder.usec;</div><div class='ctx'> 	cpr-&gt;rx_ring_coal.coal_bufs = cur_moder.pkts;</div><div class='ctx'> </div><div class='ctx'> 	bnxt_hwrm_set_ring_coal(bnapi-&gt;bp, bnapi);</div><div class='del'>-	dim-&gt;state = NET_DIM_START_MEASURE;</div><div class='add'>+	dim-&gt;state = DIM_START_MEASURE;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c<br/>index a6c7baf38036..068e191ede19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c</a></div><div class='hunk'>@@ -8,9 +8,12 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/ctype.h&gt;</div><div class='ctx'> #include &lt;linux/stringify.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/ethtool_netlink.h&gt;</div><div class='add'>+#include &lt;linux/linkmode.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='hunk'>@@ -18,16 +21,28 @@</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/utsname.h&gt;</div><div class='ctx'> #include &lt;linux/time.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include &lt;net/netlink.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='add'>+#include "bnxt_ulp.h"</div><div class='ctx'> #include "bnxt_xdp.h"</div><div class='add'>+#include "bnxt_ptp.h"</div><div class='ctx'> #include "bnxt_ethtool.h"</div><div class='ctx'> #include "bnxt_nvm_defs.h"	/* NVRAM content constant and structure defs */</div><div class='ctx'> #include "bnxt_fw_hdr.h"	/* Firmware hdr constant and structure defs */</div><div class='ctx'> #include "bnxt_coredump.h"</div><div class='del'>-#define FLASH_NVRAM_TIMEOUT	((HWRM_CMD_TIMEOUT) * 100)</div><div class='del'>-#define FLASH_PACKAGE_TIMEOUT	((HWRM_CMD_TIMEOUT) * 200)</div><div class='del'>-#define INSTALL_PACKAGE_TIMEOUT	((HWRM_CMD_TIMEOUT) * 200)</div><div class='add'>+</div><div class='add'>+#define BNXT_NVM_ERR_MSG(dev, extack, msg)			\</div><div class='add'>+	do {							\</div><div class='add'>+		if (extack)					\</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, msg);	\</div><div class='add'>+		netdev_err(dev, "%s\n", msg);			\</div><div class='add'>+	} while (0)</div><div class='ctx'> </div><div class='ctx'> static u32 bnxt_get_msglevel(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -44,7 +59,9 @@ static void bnxt_set_msglevel(struct net_device *dev, u32 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_coalesce(struct net_device *dev,</div><div class='del'>-			     struct ethtool_coalesce *coal)</div><div class='add'>+			     struct ethtool_coalesce *coal,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_coal *hw_coal;</div><div class='hunk'>@@ -60,6 +77,9 @@ static int bnxt_get_coalesce(struct net_device *dev,</div><div class='ctx'> 	coal-&gt;rx_max_coalesced_frames = hw_coal-&gt;coal_bufs / mult;</div><div class='ctx'> 	coal-&gt;rx_coalesce_usecs_irq = hw_coal-&gt;coal_ticks_irq;</div><div class='ctx'> 	coal-&gt;rx_max_coalesced_frames_irq = hw_coal-&gt;coal_bufs_irq / mult;</div><div class='add'>+	if (hw_coal-&gt;flags &amp;</div><div class='add'>+	    RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET)</div><div class='add'>+		kernel_coal-&gt;use_cqe_mode_rx = true;</div><div class='ctx'> </div><div class='ctx'> 	hw_coal = &amp;bp-&gt;tx_coal;</div><div class='ctx'> 	mult = hw_coal-&gt;bufs_per_record;</div><div class='hunk'>@@ -67,6 +87,9 @@ static int bnxt_get_coalesce(struct net_device *dev,</div><div class='ctx'> 	coal-&gt;tx_max_coalesced_frames = hw_coal-&gt;coal_bufs / mult;</div><div class='ctx'> 	coal-&gt;tx_coalesce_usecs_irq = hw_coal-&gt;coal_ticks_irq;</div><div class='ctx'> 	coal-&gt;tx_max_coalesced_frames_irq = hw_coal-&gt;coal_bufs_irq / mult;</div><div class='add'>+	if (hw_coal-&gt;flags &amp;</div><div class='add'>+	    RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET)</div><div class='add'>+		kernel_coal-&gt;use_cqe_mode_tx = true;</div><div class='ctx'> </div><div class='ctx'> 	coal-&gt;stats_block_coalesce_usecs = bp-&gt;stats_coal_ticks;</div><div class='ctx'> </div><div class='hunk'>@@ -74,7 +97,9 @@ static int bnxt_get_coalesce(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_set_coalesce(struct net_device *dev,</div><div class='del'>-			     struct ethtool_coalesce *coal)</div><div class='add'>+			     struct ethtool_coalesce *coal,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	bool update_stats = false;</div><div class='hunk'>@@ -91,12 +116,22 @@ static int bnxt_set_coalesce(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((kernel_coal-&gt;use_cqe_mode_rx || kernel_coal-&gt;use_cqe_mode_tx) &amp;&amp;</div><div class='add'>+	    !(bp-&gt;coal_cap.cmpl_params &amp;</div><div class='add'>+	      RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_TIMER_RESET))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	hw_coal = &amp;bp-&gt;rx_coal;</div><div class='ctx'> 	mult = hw_coal-&gt;bufs_per_record;</div><div class='ctx'> 	hw_coal-&gt;coal_ticks = coal-&gt;rx_coalesce_usecs;</div><div class='ctx'> 	hw_coal-&gt;coal_bufs = coal-&gt;rx_max_coalesced_frames * mult;</div><div class='ctx'> 	hw_coal-&gt;coal_ticks_irq = coal-&gt;rx_coalesce_usecs_irq;</div><div class='ctx'> 	hw_coal-&gt;coal_bufs_irq = coal-&gt;rx_max_coalesced_frames_irq * mult;</div><div class='add'>+	hw_coal-&gt;flags &amp;=</div><div class='add'>+		~RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET;</div><div class='add'>+	if (kernel_coal-&gt;use_cqe_mode_rx)</div><div class='add'>+		hw_coal-&gt;flags |=</div><div class='add'>+			RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET;</div><div class='ctx'> </div><div class='ctx'> 	hw_coal = &amp;bp-&gt;tx_coal;</div><div class='ctx'> 	mult = hw_coal-&gt;bufs_per_record;</div><div class='hunk'>@@ -104,6 +139,11 @@ static int bnxt_set_coalesce(struct net_device *dev,</div><div class='ctx'> 	hw_coal-&gt;coal_bufs = coal-&gt;tx_max_coalesced_frames * mult;</div><div class='ctx'> 	hw_coal-&gt;coal_ticks_irq = coal-&gt;tx_coalesce_usecs_irq;</div><div class='ctx'> 	hw_coal-&gt;coal_bufs_irq = coal-&gt;tx_max_coalesced_frames_irq * mult;</div><div class='add'>+	hw_coal-&gt;flags &amp;=</div><div class='add'>+		~RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET;</div><div class='add'>+	if (kernel_coal-&gt;use_cqe_mode_tx)</div><div class='add'>+		hw_coal-&gt;flags |=</div><div class='add'>+			RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;stats_coal_ticks != coal-&gt;stats_block_coalesce_usecs) {</div><div class='ctx'> 		u32 stats_ticks = coal-&gt;stats_block_coalesce_usecs;</div><div class='hunk'>@@ -124,11 +164,10 @@ static int bnxt_set_coalesce(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> reset_coalesce:</div><div class='del'>-	if (netif_running(dev)) {</div><div class='add'>+	if (test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state)) {</div><div class='ctx'> 		if (update_stats) {</div><div class='del'>-			rc = bnxt_close_nic(bp, true, false);</div><div class='del'>-			if (!rc)</div><div class='del'>-				rc = bnxt_open_nic(bp, true, false);</div><div class='add'>+			bnxt_close_nic(bp, true, false);</div><div class='add'>+			rc = bnxt_open_nic(bp, true, false);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			rc = bnxt_hwrm_set_coal(bp);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -137,7 +176,53 @@ reset_coalesce:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BNXT_NUM_STATS	22</div><div class='add'>+static const char * const bnxt_ring_rx_stats_str[] = {</div><div class='add'>+	"rx_ucast_packets",</div><div class='add'>+	"rx_mcast_packets",</div><div class='add'>+	"rx_bcast_packets",</div><div class='add'>+	"rx_discards",</div><div class='add'>+	"rx_errors",</div><div class='add'>+	"rx_ucast_bytes",</div><div class='add'>+	"rx_mcast_bytes",</div><div class='add'>+	"rx_bcast_bytes",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const bnxt_ring_tx_stats_str[] = {</div><div class='add'>+	"tx_ucast_packets",</div><div class='add'>+	"tx_mcast_packets",</div><div class='add'>+	"tx_bcast_packets",</div><div class='add'>+	"tx_errors",</div><div class='add'>+	"tx_discards",</div><div class='add'>+	"tx_ucast_bytes",</div><div class='add'>+	"tx_mcast_bytes",</div><div class='add'>+	"tx_bcast_bytes",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const bnxt_ring_tpa_stats_str[] = {</div><div class='add'>+	"tpa_packets",</div><div class='add'>+	"tpa_bytes",</div><div class='add'>+	"tpa_events",</div><div class='add'>+	"tpa_aborts",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const bnxt_ring_tpa2_stats_str[] = {</div><div class='add'>+	"rx_tpa_eligible_pkt",</div><div class='add'>+	"rx_tpa_eligible_bytes",</div><div class='add'>+	"rx_tpa_pkt",</div><div class='add'>+	"rx_tpa_bytes",</div><div class='add'>+	"rx_tpa_errors",</div><div class='add'>+	"rx_tpa_events",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const bnxt_rx_sw_stats_str[] = {</div><div class='add'>+	"rx_l4_csum_errors",</div><div class='add'>+	"rx_resets",</div><div class='add'>+	"rx_buf_errors",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const bnxt_cmn_sw_stats_str[] = {</div><div class='add'>+	"missed_irqs",</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define BNXT_RX_STATS_ENTRY(counter)	\</div><div class='ctx'> 	{ BNXT_RX_STATS_OFFSET(counter), __stringify(counter) }</div><div class='hunk'>@@ -207,6 +292,20 @@ reset_coalesce:</div><div class='ctx'> 	BNXT_TX_STATS_EXT_COS_ENTRY(6),				\</div><div class='ctx'> 	BNXT_TX_STATS_EXT_COS_ENTRY(7)				\</div><div class='ctx'> </div><div class='add'>+#define BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(n)			\</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_discard_bytes_cos##n),	\</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_discard_packets_cos##n)</div><div class='add'>+</div><div class='add'>+#define BNXT_RX_STATS_EXT_DISCARD_COS_ENTRIES				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(0),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(1),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(2),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(3),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(4),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(5),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(6),				\</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRY(7)</div><div class='add'>+</div><div class='ctx'> #define BNXT_RX_STATS_PRI_ENTRY(counter, n)		\</div><div class='ctx'> 	{ BNXT_RX_STATS_EXT_OFFSET(counter##_cos0),	\</div><div class='ctx'> 	  __stringify(counter##_pri##n) }</div><div class='hunk'>@@ -235,22 +334,29 @@ reset_coalesce:</div><div class='ctx'> 	BNXT_TX_STATS_PRI_ENTRY(counter, 6),		\</div><div class='ctx'> 	BNXT_TX_STATS_PRI_ENTRY(counter, 7)</div><div class='ctx'> </div><div class='del'>-#define BNXT_PCIE_STATS_ENTRY(counter)	\</div><div class='del'>-	{ BNXT_PCIE_STATS_OFFSET(counter), __stringify(counter) }</div><div class='del'>-</div><div class='ctx'> enum {</div><div class='ctx'> 	RX_TOTAL_DISCARDS,</div><div class='ctx'> 	TX_TOTAL_DISCARDS,</div><div class='add'>+	RX_NETPOLL_DISCARDS,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct {</div><div class='del'>-	u64			counter;</div><div class='del'>-	char			string[ETH_GSTRING_LEN];</div><div class='del'>-} bnxt_sw_func_stats[] = {</div><div class='del'>-	{0, "rx_total_discard_pkts"},</div><div class='del'>-	{0, "tx_total_discard_pkts"},</div><div class='add'>+static const char *const bnxt_ring_err_stats_arr[] = {</div><div class='add'>+	"rx_total_l4_csum_errors",</div><div class='add'>+	"rx_total_resets",</div><div class='add'>+	"rx_total_buf_errors",</div><div class='add'>+	"rx_total_oom_discards",</div><div class='add'>+	"rx_total_netpoll_discards",</div><div class='add'>+	"rx_total_ring_discards",</div><div class='add'>+	"tx_total_resets",</div><div class='add'>+	"tx_total_ring_discards",</div><div class='add'>+	"total_missed_irqs",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define NUM_RING_RX_SW_STATS		ARRAY_SIZE(bnxt_rx_sw_stats_str)</div><div class='add'>+#define NUM_RING_CMN_SW_STATS		ARRAY_SIZE(bnxt_cmn_sw_stats_str)</div><div class='add'>+#define NUM_RING_RX_HW_STATS		ARRAY_SIZE(bnxt_ring_rx_stats_str)</div><div class='add'>+#define NUM_RING_TX_HW_STATS		ARRAY_SIZE(bnxt_ring_tx_stats_str)</div><div class='add'>+</div><div class='ctx'> static const struct {</div><div class='ctx'> 	long offset;</div><div class='ctx'> 	char string[ETH_GSTRING_LEN];</div><div class='hunk'>@@ -352,6 +458,10 @@ static const struct {</div><div class='ctx'> 	BNXT_RX_STATS_EXT_ENTRY(rx_buffer_passed_threshold),</div><div class='ctx'> 	BNXT_RX_STATS_EXT_ENTRY(rx_pcs_symbol_err),</div><div class='ctx'> 	BNXT_RX_STATS_EXT_ENTRY(rx_corrected_bits),</div><div class='add'>+	BNXT_RX_STATS_EXT_DISCARD_COS_ENTRIES,</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_fec_corrected_blocks),</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_fec_uncorrectable_blocks),</div><div class='add'>+	BNXT_RX_STATS_EXT_ENTRY(rx_filter_miss),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct {</div><div class='hunk'>@@ -390,52 +500,61 @@ static const struct {</div><div class='ctx'> 	BNXT_TX_STATS_PRI_ENTRIES(tx_packets),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const struct {</div><div class='del'>-	long offset;</div><div class='del'>-	char string[ETH_GSTRING_LEN];</div><div class='del'>-} bnxt_pcie_stats_arr[] = {</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_pl_signal_integrity),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_dl_signal_integrity),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_tl_signal_integrity),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_link_integrity),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_tx_traffic_rate),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_rx_traffic_rate),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_tx_dllp_statistics),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_rx_dllp_statistics),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_equalization_time),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_ltssm_histogram[0]),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_ltssm_histogram[2]),</div><div class='del'>-	BNXT_PCIE_STATS_ENTRY(pcie_recovery_histogram),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BNXT_NUM_SW_FUNC_STATS	ARRAY_SIZE(bnxt_sw_func_stats)</div><div class='add'>+#define BNXT_NUM_RING_ERR_STATS	ARRAY_SIZE(bnxt_ring_err_stats_arr)</div><div class='ctx'> #define BNXT_NUM_PORT_STATS ARRAY_SIZE(bnxt_port_stats_arr)</div><div class='ctx'> #define BNXT_NUM_STATS_PRI			\</div><div class='ctx'> 	(ARRAY_SIZE(bnxt_rx_bytes_pri_arr) +	\</div><div class='ctx'> 	 ARRAY_SIZE(bnxt_rx_pkts_pri_arr) +	\</div><div class='ctx'> 	 ARRAY_SIZE(bnxt_tx_bytes_pri_arr) +	\</div><div class='ctx'> 	 ARRAY_SIZE(bnxt_tx_pkts_pri_arr))</div><div class='del'>-#define BNXT_NUM_PCIE_STATS ARRAY_SIZE(bnxt_pcie_stats_arr)</div><div class='add'>+</div><div class='add'>+static int bnxt_get_num_tpa_ring_stats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (BNXT_SUPPORTS_TPA(bp)) {</div><div class='add'>+		if (bp-&gt;max_tpa_v2) {</div><div class='add'>+			if (BNXT_CHIP_P5(bp))</div><div class='add'>+				return BNXT_NUM_TPA_RING_STATS_P5;</div><div class='add'>+			return BNXT_NUM_TPA_RING_STATS_P7;</div><div class='add'>+		}</div><div class='add'>+		return BNXT_NUM_TPA_RING_STATS;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_num_ring_stats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	int rx, tx, cmn;</div><div class='add'>+</div><div class='add'>+	rx = NUM_RING_RX_HW_STATS + NUM_RING_RX_SW_STATS +</div><div class='add'>+	     bnxt_get_num_tpa_ring_stats(bp);</div><div class='add'>+	tx = NUM_RING_TX_HW_STATS;</div><div class='add'>+	cmn = NUM_RING_CMN_SW_STATS;</div><div class='add'>+	return rx * bp-&gt;rx_nr_rings +</div><div class='add'>+	       tx * (bp-&gt;tx_nr_rings_xdp + bp-&gt;tx_nr_rings_per_tc) +</div><div class='add'>+	       cmn * bp-&gt;cp_nr_rings;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_num_stats(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	int num_stats = BNXT_NUM_STATS * bp-&gt;cp_nr_rings;</div><div class='add'>+	int num_stats = bnxt_get_num_ring_stats(bp);</div><div class='add'>+	int len;</div><div class='ctx'> </div><div class='del'>-	num_stats += BNXT_NUM_SW_FUNC_STATS;</div><div class='add'>+	num_stats += BNXT_NUM_RING_ERR_STATS;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS)</div><div class='ctx'> 		num_stats += BNXT_NUM_PORT_STATS;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT) {</div><div class='del'>-		num_stats += bp-&gt;fw_rx_stats_ext_size +</div><div class='del'>-			     bp-&gt;fw_tx_stats_ext_size;</div><div class='add'>+		len = min_t(int, bp-&gt;fw_rx_stats_ext_size,</div><div class='add'>+			    ARRAY_SIZE(bnxt_port_stats_ext_arr));</div><div class='add'>+		num_stats += len;</div><div class='add'>+		len = min_t(int, bp-&gt;fw_tx_stats_ext_size,</div><div class='add'>+			    ARRAY_SIZE(bnxt_tx_port_stats_ext_arr));</div><div class='add'>+		num_stats += len;</div><div class='ctx'> 		if (bp-&gt;pri2cos_valid)</div><div class='ctx'> 			num_stats += BNXT_NUM_STATS_PRI;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS)</div><div class='del'>-		num_stats += BNXT_NUM_PCIE_STATS;</div><div class='del'>-</div><div class='ctx'> 	return num_stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -455,208 +574,243 @@ static int bnxt_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool is_rx_ring(struct bnxt *bp, int ring_num)</div><div class='add'>+{</div><div class='add'>+	return ring_num &lt; bp-&gt;rx_nr_rings;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_tx_ring(struct bnxt *bp, int ring_num)</div><div class='add'>+{</div><div class='add'>+	int tx_base = 0;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS))</div><div class='add'>+		tx_base = bp-&gt;rx_nr_rings;</div><div class='add'>+</div><div class='add'>+	if (ring_num &gt;= tx_base &amp;&amp; ring_num &lt; (tx_base + bp-&gt;tx_nr_rings))</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 				   struct ethtool_stats *stats, u64 *buf)</div><div class='ctx'> {</div><div class='del'>-	u32 i, j = 0;</div><div class='add'>+	struct bnxt_total_ring_err_stats ring_err_stats = {0};</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	u32 stat_fields = sizeof(struct ctx_hw_stats) / 8;</div><div class='add'>+	u64 *curr, *prev;</div><div class='add'>+	u32 tpa_stats;</div><div class='add'>+	u32 i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;bnapi) {</div><div class='del'>-		j += BNXT_NUM_STATS * bp-&gt;cp_nr_rings + BNXT_NUM_SW_FUNC_STATS;</div><div class='add'>+		j += bnxt_get_num_ring_stats(bp);</div><div class='ctx'> 		goto skip_ring_stats;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_NUM_SW_FUNC_STATS; i++)</div><div class='del'>-		bnxt_sw_func_stats[i].counter = 0;</div><div class='del'>-</div><div class='add'>+	tpa_stats = bnxt_get_num_tpa_ring_stats(bp);</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='ctx'> 		struct bnxt_napi *bnapi = bp-&gt;bnapi[i];</div><div class='ctx'> 		struct bnxt_cp_ring_info *cpr = &amp;bnapi-&gt;cp_ring;</div><div class='del'>-		__le64 *hw_stats = (__le64 *)cpr-&gt;hw_stats;</div><div class='add'>+		u64 *sw_stats = cpr-&gt;stats.sw_stats;</div><div class='add'>+		u64 *sw;</div><div class='ctx'> 		int k;</div><div class='ctx'> </div><div class='del'>-		for (k = 0; k &lt; stat_fields; j++, k++)</div><div class='del'>-			buf[j] = le64_to_cpu(hw_stats[k]);</div><div class='del'>-		buf[j++] = cpr-&gt;rx_l4_csum_errors;</div><div class='del'>-		buf[j++] = cpr-&gt;missed_irqs;</div><div class='add'>+		if (is_rx_ring(bp, i)) {</div><div class='add'>+			for (k = 0; k &lt; NUM_RING_RX_HW_STATS; j++, k++)</div><div class='add'>+				buf[j] = sw_stats[k];</div><div class='add'>+		}</div><div class='add'>+		if (is_tx_ring(bp, i)) {</div><div class='add'>+			k = NUM_RING_RX_HW_STATS;</div><div class='add'>+			for (; k &lt; NUM_RING_RX_HW_STATS + NUM_RING_TX_HW_STATS;</div><div class='add'>+			       j++, k++)</div><div class='add'>+				buf[j] = sw_stats[k];</div><div class='add'>+		}</div><div class='add'>+		if (!tpa_stats || !is_rx_ring(bp, i))</div><div class='add'>+			goto skip_tpa_ring_stats;</div><div class='add'>+</div><div class='add'>+		k = NUM_RING_RX_HW_STATS + NUM_RING_TX_HW_STATS;</div><div class='add'>+		for (; k &lt; NUM_RING_RX_HW_STATS + NUM_RING_TX_HW_STATS +</div><div class='add'>+			   tpa_stats; j++, k++)</div><div class='add'>+			buf[j] = sw_stats[k];</div><div class='add'>+</div><div class='add'>+skip_tpa_ring_stats:</div><div class='add'>+		sw = (u64 *)&amp;cpr-&gt;sw_stats-&gt;rx;</div><div class='add'>+		if (is_rx_ring(bp, i)) {</div><div class='add'>+			for (k = 0; k &lt; NUM_RING_RX_SW_STATS; j++, k++)</div><div class='add'>+				buf[j] = sw[k];</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		bnxt_sw_func_stats[RX_TOTAL_DISCARDS].counter +=</div><div class='del'>-			le64_to_cpu(cpr-&gt;hw_stats-&gt;rx_discard_pkts);</div><div class='del'>-		bnxt_sw_func_stats[TX_TOTAL_DISCARDS].counter +=</div><div class='del'>-			le64_to_cpu(cpr-&gt;hw_stats-&gt;tx_discard_pkts);</div><div class='add'>+		sw = (u64 *)&amp;cpr-&gt;sw_stats-&gt;cmn;</div><div class='add'>+		for (k = 0; k &lt; NUM_RING_CMN_SW_STATS; j++, k++)</div><div class='add'>+			buf[j] = sw[k];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_NUM_SW_FUNC_STATS; i++, j++)</div><div class='del'>-		buf[j] = bnxt_sw_func_stats[i].counter;</div><div class='add'>+	bnxt_get_ring_err_stats(bp, &amp;ring_err_stats);</div><div class='ctx'> </div><div class='ctx'> skip_ring_stats:</div><div class='add'>+	curr = &amp;ring_err_stats.rx_total_l4_csum_errors;</div><div class='add'>+	prev = &amp;bp-&gt;ring_err_stats_prev.rx_total_l4_csum_errors;</div><div class='add'>+	for (i = 0; i &lt; BNXT_NUM_RING_ERR_STATS; i++, j++, curr++, prev++)</div><div class='add'>+		buf[j] = *curr + *prev;</div><div class='add'>+</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS) {</div><div class='del'>-		__le64 *port_stats = (__le64 *)bp-&gt;hw_rx_port_stats;</div><div class='add'>+		u64 *port_stats = bp-&gt;port_stats.sw_stats;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; BNXT_NUM_PORT_STATS; i++, j++) {</div><div class='del'>-			buf[j] = le64_to_cpu(*(port_stats +</div><div class='del'>-					       bnxt_port_stats_arr[i].offset));</div><div class='del'>-		}</div><div class='add'>+		for (i = 0; i &lt; BNXT_NUM_PORT_STATS; i++, j++)</div><div class='add'>+			buf[j] = *(port_stats + bnxt_port_stats_arr[i].offset);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT) {</div><div class='del'>-		__le64 *rx_port_stats_ext = (__le64 *)bp-&gt;hw_rx_port_stats_ext;</div><div class='del'>-		__le64 *tx_port_stats_ext = (__le64 *)bp-&gt;hw_tx_port_stats_ext;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; bp-&gt;fw_rx_stats_ext_size; i++, j++) {</div><div class='del'>-			buf[j] = le64_to_cpu(*(rx_port_stats_ext +</div><div class='del'>-					    bnxt_port_stats_ext_arr[i].offset));</div><div class='add'>+		u64 *rx_port_stats_ext = bp-&gt;rx_port_stats_ext.sw_stats;</div><div class='add'>+		u64 *tx_port_stats_ext = bp-&gt;tx_port_stats_ext.sw_stats;</div><div class='add'>+		u32 len;</div><div class='add'>+</div><div class='add'>+		len = min_t(u32, bp-&gt;fw_rx_stats_ext_size,</div><div class='add'>+			    ARRAY_SIZE(bnxt_port_stats_ext_arr));</div><div class='add'>+		for (i = 0; i &lt; len; i++, j++) {</div><div class='add'>+			buf[j] = *(rx_port_stats_ext +</div><div class='add'>+				   bnxt_port_stats_ext_arr[i].offset);</div><div class='ctx'> 		}</div><div class='del'>-		for (i = 0; i &lt; bp-&gt;fw_tx_stats_ext_size; i++, j++) {</div><div class='del'>-			buf[j] = le64_to_cpu(*(tx_port_stats_ext +</div><div class='del'>-					bnxt_tx_port_stats_ext_arr[i].offset));</div><div class='add'>+		len = min_t(u32, bp-&gt;fw_tx_stats_ext_size,</div><div class='add'>+			    ARRAY_SIZE(bnxt_tx_port_stats_ext_arr));</div><div class='add'>+		for (i = 0; i &lt; len; i++, j++) {</div><div class='add'>+			buf[j] = *(tx_port_stats_ext +</div><div class='add'>+				   bnxt_tx_port_stats_ext_arr[i].offset);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (bp-&gt;pri2cos_valid) {</div><div class='ctx'> 			for (i = 0; i &lt; 8; i++, j++) {</div><div class='ctx'> 				long n = bnxt_rx_bytes_pri_arr[i].base_off +</div><div class='del'>-					 bp-&gt;pri2cos[i];</div><div class='add'>+					 bp-&gt;pri2cos_idx[i];</div><div class='ctx'> </div><div class='del'>-				buf[j] = le64_to_cpu(*(rx_port_stats_ext + n));</div><div class='add'>+				buf[j] = *(rx_port_stats_ext + n);</div><div class='ctx'> 			}</div><div class='ctx'> 			for (i = 0; i &lt; 8; i++, j++) {</div><div class='ctx'> 				long n = bnxt_rx_pkts_pri_arr[i].base_off +</div><div class='del'>-					 bp-&gt;pri2cos[i];</div><div class='add'>+					 bp-&gt;pri2cos_idx[i];</div><div class='ctx'> </div><div class='del'>-				buf[j] = le64_to_cpu(*(rx_port_stats_ext + n));</div><div class='add'>+				buf[j] = *(rx_port_stats_ext + n);</div><div class='ctx'> 			}</div><div class='ctx'> 			for (i = 0; i &lt; 8; i++, j++) {</div><div class='del'>-				long n = bnxt_tx_bytes_pri_arr[i].base_off +</div><div class='del'>-					 bp-&gt;pri2cos[i];</div><div class='add'>+				u8 cos_idx = bp-&gt;pri2cos_idx[i];</div><div class='add'>+				long n;</div><div class='ctx'> </div><div class='del'>-				buf[j] = le64_to_cpu(*(tx_port_stats_ext + n));</div><div class='add'>+				n = bnxt_tx_bytes_pri_arr[i].base_off + cos_idx;</div><div class='add'>+				buf[j] = *(tx_port_stats_ext + n);</div><div class='add'>+				if (bp-&gt;cos0_cos1_shared &amp;&amp; !cos_idx)</div><div class='add'>+					buf[j] += *(tx_port_stats_ext + n + 1);</div><div class='ctx'> 			}</div><div class='ctx'> 			for (i = 0; i &lt; 8; i++, j++) {</div><div class='del'>-				long n = bnxt_tx_pkts_pri_arr[i].base_off +</div><div class='del'>-					 bp-&gt;pri2cos[i];</div><div class='add'>+				u8 cos_idx = bp-&gt;pri2cos_idx[i];</div><div class='add'>+				long n;</div><div class='ctx'> </div><div class='del'>-				buf[j] = le64_to_cpu(*(tx_port_stats_ext + n));</div><div class='add'>+				n = bnxt_tx_pkts_pri_arr[i].base_off + cos_idx;</div><div class='add'>+				buf[j] = *(tx_port_stats_ext + n);</div><div class='add'>+				if (bp-&gt;cos0_cos1_shared &amp;&amp; !cos_idx)</div><div class='add'>+					buf[j] += *(tx_port_stats_ext + n + 1);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS) {</div><div class='del'>-		__le64 *pcie_stats = (__le64 *)bp-&gt;hw_pcie_stats;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; BNXT_NUM_PCIE_STATS; i++, j++) {</div><div class='del'>-			buf[j] = le64_to_cpu(*(pcie_stats +</div><div class='del'>-					       bnxt_pcie_stats_arr[i].offset));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	u32 i;</div><div class='add'>+	u32 i, j, num_str;</div><div class='add'>+	const char *str;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='del'>-	/* The number of strings must match BNXT_NUM_STATS defined above. */</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='ctx'> 		for (i = 0; i &lt; bp-&gt;cp_nr_rings; i++) {</div><div class='del'>-			sprintf(buf, "[%d]: rx_ucast_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_mcast_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_bcast_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_discards", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_drops", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_ucast_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_mcast_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_bcast_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_ucast_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_mcast_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_bcast_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_discards", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_drops", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_ucast_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_mcast_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tx_bcast_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tpa_packets", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tpa_bytes", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tpa_events", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: tpa_aborts", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: rx_l4_csum_errors", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-			sprintf(buf, "[%d]: missed_irqs", i);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; BNXT_NUM_SW_FUNC_STATS; i++) {</div><div class='del'>-			strcpy(buf, bnxt_sw_func_stats[i].string);</div><div class='del'>-			buf += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS) {</div><div class='del'>-			for (i = 0; i &lt; BNXT_NUM_PORT_STATS; i++) {</div><div class='del'>-				strcpy(buf, bnxt_port_stats_arr[i].string);</div><div class='del'>-				buf += ETH_GSTRING_LEN;</div><div class='add'>+			if (is_rx_ring(bp, i))</div><div class='add'>+				for (j = 0; j &lt; NUM_RING_RX_HW_STATS; j++) {</div><div class='add'>+					str = bnxt_ring_rx_stats_str[j];</div><div class='add'>+					ethtool_sprintf(&amp;buf, "[%d]: %s", i,</div><div class='add'>+							str);</div><div class='add'>+				}</div><div class='add'>+			if (is_tx_ring(bp, i))</div><div class='add'>+				for (j = 0; j &lt; NUM_RING_TX_HW_STATS; j++) {</div><div class='add'>+					str = bnxt_ring_tx_stats_str[j];</div><div class='add'>+					ethtool_sprintf(&amp;buf, "[%d]: %s", i,</div><div class='add'>+							str);</div><div class='add'>+				}</div><div class='add'>+			num_str = bnxt_get_num_tpa_ring_stats(bp);</div><div class='add'>+			if (!num_str || !is_rx_ring(bp, i))</div><div class='add'>+				goto skip_tpa_stats;</div><div class='add'>+</div><div class='add'>+			if (bp-&gt;max_tpa_v2)</div><div class='add'>+				for (j = 0; j &lt; num_str; j++) {</div><div class='add'>+					str = bnxt_ring_tpa2_stats_str[j];</div><div class='add'>+					ethtool_sprintf(&amp;buf, "[%d]: %s", i,</div><div class='add'>+							str);</div><div class='add'>+				}</div><div class='add'>+			else</div><div class='add'>+				for (j = 0; j &lt; num_str; j++) {</div><div class='add'>+					str = bnxt_ring_tpa_stats_str[j];</div><div class='add'>+					ethtool_sprintf(&amp;buf, "[%d]: %s", i,</div><div class='add'>+							str);</div><div class='add'>+				}</div><div class='add'>+skip_tpa_stats:</div><div class='add'>+			if (is_rx_ring(bp, i))</div><div class='add'>+				for (j = 0; j &lt; NUM_RING_RX_SW_STATS; j++) {</div><div class='add'>+					str = bnxt_rx_sw_stats_str[j];</div><div class='add'>+					ethtool_sprintf(&amp;buf, "[%d]: %s", i,</div><div class='add'>+							str);</div><div class='add'>+				}</div><div class='add'>+			for (j = 0; j &lt; NUM_RING_CMN_SW_STATS; j++) {</div><div class='add'>+				str = bnxt_cmn_sw_stats_str[j];</div><div class='add'>+				ethtool_sprintf(&amp;buf, "[%d]: %s", i, str);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='add'>+		for (i = 0; i &lt; BNXT_NUM_RING_ERR_STATS; i++)</div><div class='add'>+			ethtool_puts(&amp;buf, bnxt_ring_err_stats_arr[i]);</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS)</div><div class='add'>+			for (i = 0; i &lt; BNXT_NUM_PORT_STATS; i++) {</div><div class='add'>+				str = bnxt_port_stats_arr[i].string;</div><div class='add'>+				ethtool_puts(&amp;buf, str);</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 		if (bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT) {</div><div class='del'>-			for (i = 0; i &lt; bp-&gt;fw_rx_stats_ext_size; i++) {</div><div class='del'>-				strcpy(buf, bnxt_port_stats_ext_arr[i].string);</div><div class='del'>-				buf += ETH_GSTRING_LEN;</div><div class='add'>+			u32 len;</div><div class='add'>+</div><div class='add'>+			len = min_t(u32, bp-&gt;fw_rx_stats_ext_size,</div><div class='add'>+				    ARRAY_SIZE(bnxt_port_stats_ext_arr));</div><div class='add'>+			for (i = 0; i &lt; len; i++) {</div><div class='add'>+				str = bnxt_port_stats_ext_arr[i].string;</div><div class='add'>+				ethtool_puts(&amp;buf, str);</div><div class='ctx'> 			}</div><div class='del'>-			for (i = 0; i &lt; bp-&gt;fw_tx_stats_ext_size; i++) {</div><div class='del'>-				strcpy(buf,</div><div class='del'>-				       bnxt_tx_port_stats_ext_arr[i].string);</div><div class='del'>-				buf += ETH_GSTRING_LEN;</div><div class='add'>+</div><div class='add'>+			len = min_t(u32, bp-&gt;fw_tx_stats_ext_size,</div><div class='add'>+				    ARRAY_SIZE(bnxt_tx_port_stats_ext_arr));</div><div class='add'>+			for (i = 0; i &lt; len; i++) {</div><div class='add'>+				str = bnxt_tx_port_stats_ext_arr[i].string;</div><div class='add'>+				ethtool_puts(&amp;buf, str);</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='ctx'> 			if (bp-&gt;pri2cos_valid) {</div><div class='ctx'> 				for (i = 0; i &lt; 8; i++) {</div><div class='del'>-					strcpy(buf,</div><div class='del'>-					       bnxt_rx_bytes_pri_arr[i].string);</div><div class='del'>-					buf += ETH_GSTRING_LEN;</div><div class='add'>+					str = bnxt_rx_bytes_pri_arr[i].string;</div><div class='add'>+					ethtool_puts(&amp;buf, str);</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='ctx'> 				for (i = 0; i &lt; 8; i++) {</div><div class='del'>-					strcpy(buf,</div><div class='del'>-					       bnxt_rx_pkts_pri_arr[i].string);</div><div class='del'>-					buf += ETH_GSTRING_LEN;</div><div class='add'>+					str = bnxt_rx_pkts_pri_arr[i].string;</div><div class='add'>+					ethtool_puts(&amp;buf, str);</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='ctx'> 				for (i = 0; i &lt; 8; i++) {</div><div class='del'>-					strcpy(buf,</div><div class='del'>-					       bnxt_tx_bytes_pri_arr[i].string);</div><div class='del'>-					buf += ETH_GSTRING_LEN;</div><div class='add'>+					str = bnxt_tx_bytes_pri_arr[i].string;</div><div class='add'>+					ethtool_puts(&amp;buf, str);</div><div class='ctx'> 				}</div><div class='add'>+</div><div class='ctx'> 				for (i = 0; i &lt; 8; i++) {</div><div class='del'>-					strcpy(buf,</div><div class='del'>-					       bnxt_tx_pkts_pri_arr[i].string);</div><div class='del'>-					buf += ETH_GSTRING_LEN;</div><div class='add'>+					str = bnxt_tx_pkts_pri_arr[i].string;</div><div class='add'>+					ethtool_puts(&amp;buf, str);</div><div class='ctx'> 				}</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_PCIE_STATS) {</div><div class='del'>-			for (i = 0; i &lt; BNXT_NUM_PCIE_STATS; i++) {</div><div class='del'>-				strcpy(buf, bnxt_pcie_stats_arr[i].string);</div><div class='del'>-				buf += ETH_GSTRING_LEN;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETH_SS_TEST:</div><div class='ctx'> 		if (bp-&gt;num_tests)</div><div class='del'>-			memcpy(buf, bp-&gt;test_info-&gt;string,</div><div class='del'>-			       bp-&gt;num_tests * ETH_GSTRING_LEN);</div><div class='add'>+			for (i = 0; i &lt; bp-&gt;num_tests; i++)</div><div class='add'>+				ethtool_puts(&amp;buf, bp-&gt;test_info-&gt;string[i]);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "bnxt_get_strings invalid request %x\n",</div><div class='hunk'>@@ -666,32 +820,64 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_get_ringparam(struct net_device *dev,</div><div class='del'>-			       struct ethtool_ringparam *ering)</div><div class='add'>+			       struct ethtool_ringparam *ering,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	ering-&gt;rx_max_pending = BNXT_MAX_RX_DESC_CNT;</div><div class='del'>-	ering-&gt;rx_jumbo_max_pending = BNXT_MAX_RX_JUM_DESC_CNT;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_AGG_RINGS) {</div><div class='add'>+		ering-&gt;rx_max_pending = BNXT_MAX_RX_DESC_CNT_JUM_ENA;</div><div class='add'>+		ering-&gt;rx_jumbo_max_pending = BNXT_MAX_RX_JUM_DESC_CNT;</div><div class='add'>+		kernel_ering-&gt;tcp_data_split = ETHTOOL_TCP_DATA_SPLIT_ENABLED;</div><div class='add'>+	} else {</div><div class='add'>+		ering-&gt;rx_max_pending = BNXT_MAX_RX_DESC_CNT;</div><div class='add'>+		ering-&gt;rx_jumbo_max_pending = 0;</div><div class='add'>+		kernel_ering-&gt;tcp_data_split = ETHTOOL_TCP_DATA_SPLIT_DISABLED;</div><div class='add'>+	}</div><div class='ctx'> 	ering-&gt;tx_max_pending = BNXT_MAX_TX_DESC_CNT;</div><div class='ctx'> </div><div class='ctx'> 	ering-&gt;rx_pending = bp-&gt;rx_ring_size;</div><div class='ctx'> 	ering-&gt;rx_jumbo_pending = bp-&gt;rx_agg_ring_size;</div><div class='ctx'> 	ering-&gt;tx_pending = bp-&gt;tx_ring_size;</div><div class='add'>+</div><div class='add'>+	kernel_ering-&gt;hds_thresh_max = BNXT_HDS_THRESHOLD_MAX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_set_ringparam(struct net_device *dev,</div><div class='del'>-			      struct ethtool_ringparam *ering)</div><div class='add'>+			      struct ethtool_ringparam *ering,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	u8 tcp_data_split = kernel_ering-&gt;tcp_data_split;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u8 hds_config_mod;</div><div class='ctx'> </div><div class='ctx'> 	if ((ering-&gt;rx_pending &gt; BNXT_MAX_RX_DESC_CNT) ||</div><div class='ctx'> 	    (ering-&gt;tx_pending &gt; BNXT_MAX_TX_DESC_CNT) ||</div><div class='del'>-	    (ering-&gt;tx_pending &lt;= MAX_SKB_FRAGS))</div><div class='add'>+	    (ering-&gt;tx_pending &lt; BNXT_MIN_TX_DESC_CNT))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hds_config_mod = tcp_data_split != dev-&gt;cfg-&gt;hds_config;</div><div class='add'>+	if (tcp_data_split == ETHTOOL_TCP_DATA_SPLIT_DISABLED &amp;&amp; hds_config_mod)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (tcp_data_split == ETHTOOL_TCP_DATA_SPLIT_ENABLED &amp;&amp;</div><div class='add'>+	    hds_config_mod &amp;&amp; BNXT_RX_PAGE_MODE(bp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "tcp-data-split is disallowed when XDP is attached");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		bnxt_close_nic(bp, false, false);</div><div class='ctx'> </div><div class='add'>+	if (hds_config_mod) {</div><div class='add'>+		if (tcp_data_split == ETHTOOL_TCP_DATA_SPLIT_ENABLED)</div><div class='add'>+			bp-&gt;flags |= BNXT_FLAG_HDS;</div><div class='add'>+		else if (tcp_data_split == ETHTOOL_TCP_DATA_SPLIT_UNKNOWN)</div><div class='add'>+			bp-&gt;flags &amp;= ~BNXT_FLAG_HDS;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	bp-&gt;rx_ring_size = ering-&gt;rx_pending;</div><div class='ctx'> 	bp-&gt;tx_ring_size = ering-&gt;tx_pending;</div><div class='ctx'> 	bnxt_set_ring_params(bp);</div><div class='hunk'>@@ -708,16 +894,22 @@ static void bnxt_get_channels(struct net_device *dev,</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='ctx'> 	int max_rx_rings, max_tx_rings, tcs;</div><div class='del'>-	int max_tx_sch_inputs;</div><div class='add'>+	int max_tx_sch_inputs, tx_grps;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the most up-to-date max_tx_sch_inputs. */</div><div class='del'>-	if (BNXT_NEW_RM(bp))</div><div class='add'>+	if (netif_running(dev) &amp;&amp; BNXT_NEW_RM(bp))</div><div class='ctx'> 		bnxt_hwrm_func_resc_qcaps(bp, false);</div><div class='ctx'> 	max_tx_sch_inputs = hw_resc-&gt;max_tx_sch_inputs;</div><div class='ctx'> </div><div class='ctx'> 	bnxt_get_max_rings(bp, &amp;max_rx_rings, &amp;max_tx_rings, true);</div><div class='ctx'> 	if (max_tx_sch_inputs)</div><div class='ctx'> 		max_tx_rings = min_t(int, max_tx_rings, max_tx_sch_inputs);</div><div class='add'>+</div><div class='add'>+	tcs = bp-&gt;num_tc;</div><div class='add'>+	tx_grps = max(tcs, 1);</div><div class='add'>+	if (bp-&gt;tx_nr_rings_xdp)</div><div class='add'>+		tx_grps++;</div><div class='add'>+	max_tx_rings /= tx_grps;</div><div class='ctx'> 	channel-&gt;max_combined = min_t(int, max_rx_rings, max_tx_rings);</div><div class='ctx'> </div><div class='ctx'> 	if (bnxt_get_max_rings(bp, &amp;max_rx_rings, &amp;max_tx_rings, false)) {</div><div class='hunk'>@@ -727,7 +919,6 @@ static void bnxt_get_channels(struct net_device *dev,</div><div class='ctx'> 	if (max_tx_sch_inputs)</div><div class='ctx'> 		max_tx_rings = min_t(int, max_tx_rings, max_tx_sch_inputs);</div><div class='ctx'> </div><div class='del'>-	tcs = netdev_get_num_tc(dev);</div><div class='ctx'> 	if (tcs &gt; 1)</div><div class='ctx'> 		max_tx_rings /= tcs;</div><div class='ctx'> </div><div class='hunk'>@@ -754,6 +945,7 @@ static int bnxt_set_channels(struct net_device *dev,</div><div class='ctx'> 	bool sh = false;</div><div class='ctx'> 	int tx_xdp = 0;</div><div class='ctx'> 	int rc = 0;</div><div class='add'>+	int tx_cp;</div><div class='ctx'> </div><div class='ctx'> 	if (channel-&gt;other_count)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -773,7 +965,7 @@ static int bnxt_set_channels(struct net_device *dev,</div><div class='ctx'> 	if (channel-&gt;combined_count)</div><div class='ctx'> 		sh = true;</div><div class='ctx'> </div><div class='del'>-	tcs = netdev_get_num_tc(dev);</div><div class='add'>+	tcs = bp-&gt;num_tc;</div><div class='ctx'> </div><div class='ctx'> 	req_tx_rings = sh ? channel-&gt;combined_count : channel-&gt;tx_count;</div><div class='ctx'> 	req_rx_rings = sh ? channel-&gt;combined_count : channel-&gt;rx_count;</div><div class='hunk'>@@ -784,6 +976,14 @@ static int bnxt_set_channels(struct net_device *dev,</div><div class='ctx'> 		}</div><div class='ctx'> 		tx_xdp = req_rx_rings;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (bnxt_get_nr_rss_ctxs(bp, req_rx_rings) !=</div><div class='add'>+	    bnxt_get_nr_rss_ctxs(bp, bp-&gt;rx_nr_rings) &amp;&amp;</div><div class='add'>+	    netif_is_rxfh_configured(dev)) {</div><div class='add'>+		netdev_warn(dev, "RSS table size change required, RSS table entries must be default to proceed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	rc = bnxt_check_rings(bp, req_tx_rings, req_rx_rings, sh, tcs, tx_xdp);</div><div class='ctx'> 	if (rc) {</div><div class='ctx'> 		netdev_warn(dev, "Unable to allocate the requested rings\n");</div><div class='hunk'>@@ -796,12 +996,7 @@ static int bnxt_set_channels(struct net_device *dev,</div><div class='ctx'> 			 * before PF unload</div><div class='ctx'> 			 */</div><div class='ctx'> 		}</div><div class='del'>-		rc = bnxt_close_nic(bp, true, false);</div><div class='del'>-		if (rc) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "Set channel failure rc :%x\n",</div><div class='del'>-				   rc);</div><div class='del'>-			return rc;</div><div class='del'>-		}</div><div class='add'>+		bnxt_close_nic(bp, true, false);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (sh) {</div><div class='hunk'>@@ -818,8 +1013,9 @@ static int bnxt_set_channels(struct net_device *dev,</div><div class='ctx'> 	if (tcs &gt; 1)</div><div class='ctx'> 		bp-&gt;tx_nr_rings = bp-&gt;tx_nr_rings_per_tc * tcs + tx_xdp;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;cp_nr_rings = sh ? max_t(int, bp-&gt;tx_nr_rings, bp-&gt;rx_nr_rings) :</div><div class='del'>-			       bp-&gt;tx_nr_rings + bp-&gt;rx_nr_rings;</div><div class='add'>+	tx_cp = bnxt_num_tx_to_cp(bp, bp-&gt;tx_nr_rings);</div><div class='add'>+	bp-&gt;cp_nr_rings = sh ? max_t(int, tx_cp, bp-&gt;rx_nr_rings) :</div><div class='add'>+			       tx_cp + bp-&gt;rx_nr_rings;</div><div class='ctx'> </div><div class='ctx'> 	/* After changing number of rx channels, update NTUPLE feature. */</div><div class='ctx'> 	netdev_update_features(dev);</div><div class='hunk'>@@ -837,29 +1033,66 @@ static int bnxt_set_channels(struct net_device *dev,</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-static int bnxt_grxclsrlall(struct bnxt *bp, struct ethtool_rxnfc *cmd,</div><div class='del'>-			    u32 *rule_locs)</div><div class='add'>+static u32 bnxt_get_all_fltr_ids_rcu(struct bnxt *bp, struct hlist_head tbl[],</div><div class='add'>+				     int tbl_size, u32 *ids, u32 start,</div><div class='add'>+				     u32 id_cnt)</div><div class='ctx'> {</div><div class='del'>-	int i, j = 0;</div><div class='add'>+	int i, j = start;</div><div class='ctx'> </div><div class='del'>-	cmd-&gt;data = bp-&gt;ntp_fltr_count;</div><div class='del'>-	for (i = 0; i &lt; BNXT_NTP_FLTR_HASH_SIZE; i++) {</div><div class='add'>+	if (j &gt;= id_cnt)</div><div class='add'>+		return j;</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++) {</div><div class='ctx'> 		struct hlist_head *head;</div><div class='del'>-		struct bnxt_ntuple_filter *fltr;</div><div class='add'>+		struct bnxt_filter_base *fltr;</div><div class='ctx'> </div><div class='del'>-		head = &amp;bp-&gt;ntp_fltr_hash_tbl[i];</div><div class='del'>-		rcu_read_lock();</div><div class='add'>+		head = &amp;tbl[i];</div><div class='ctx'> 		hlist_for_each_entry_rcu(fltr, head, hash) {</div><div class='del'>-			if (j == cmd-&gt;rule_cnt)</div><div class='del'>-				break;</div><div class='del'>-			rule_locs[j++] = fltr-&gt;sw_id;</div><div class='add'>+			if (!fltr-&gt;flags ||</div><div class='add'>+			    test_bit(BNXT_FLTR_FW_DELETED, &amp;fltr-&gt;state))</div><div class='add'>+				continue;</div><div class='add'>+			ids[j++] = fltr-&gt;sw_id;</div><div class='add'>+			if (j == id_cnt)</div><div class='add'>+				return j;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return j;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnxt_filter_base *bnxt_get_one_fltr_rcu(struct bnxt *bp,</div><div class='add'>+						      struct hlist_head tbl[],</div><div class='add'>+						      int tbl_size, u32 id)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tbl_size; i++) {</div><div class='add'>+		struct hlist_head *head;</div><div class='add'>+		struct bnxt_filter_base *fltr;</div><div class='add'>+</div><div class='add'>+		head = &amp;tbl[i];</div><div class='add'>+		hlist_for_each_entry_rcu(fltr, head, hash) {</div><div class='add'>+			if (fltr-&gt;flags &amp;&amp; fltr-&gt;sw_id == id)</div><div class='add'>+				return fltr;</div><div class='ctx'> 		}</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		if (j == cmd-&gt;rule_cnt)</div><div class='del'>-			break;</div><div class='ctx'> 	}</div><div class='del'>-	cmd-&gt;rule_cnt = j;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_grxclsrlall(struct bnxt *bp, struct ethtool_rxnfc *cmd,</div><div class='add'>+			    u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	u32 count;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data = bp-&gt;ntp_fltr_count;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	count = bnxt_get_all_fltr_ids_rcu(bp, bp-&gt;l2_fltr_hash_tbl,</div><div class='add'>+					  BNXT_L2_FLTR_HASH_SIZE, rule_locs, 0,</div><div class='add'>+					  cmd-&gt;rule_cnt);</div><div class='add'>+	cmd-&gt;rule_cnt = bnxt_get_all_fltr_ids_rcu(bp, bp-&gt;ntp_fltr_hash_tbl,</div><div class='add'>+						  BNXT_NTP_FLTR_HASH_SIZE,</div><div class='add'>+						  rule_locs, count,</div><div class='add'>+						  cmd-&gt;rule_cnt);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -867,73 +1100,129 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethtool_rx_flow_spec *fs =</div><div class='ctx'> 		(struct ethtool_rx_flow_spec *)&amp;cmd-&gt;fs;</div><div class='add'>+	struct bnxt_filter_base *fltr_base;</div><div class='ctx'> 	struct bnxt_ntuple_filter *fltr;</div><div class='add'>+	struct bnxt_flow_masks *fmasks;</div><div class='ctx'> 	struct flow_keys *fkeys;</div><div class='del'>-	int i, rc = -EINVAL;</div><div class='add'>+	int rc = -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (fs-&gt;location &gt;= BNXT_NTP_FLTR_MAX_FLTR)</div><div class='add'>+	if (fs-&gt;location &gt;= bp-&gt;max_fltr)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_NTP_FLTR_HASH_SIZE; i++) {</div><div class='del'>-		struct hlist_head *head;</div><div class='del'>-</div><div class='del'>-		head = &amp;bp-&gt;ntp_fltr_hash_tbl[i];</div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		hlist_for_each_entry_rcu(fltr, head, hash) {</div><div class='del'>-			if (fltr-&gt;sw_id == fs-&gt;location)</div><div class='del'>-				goto fltr_found;</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fltr_base = bnxt_get_one_fltr_rcu(bp, bp-&gt;l2_fltr_hash_tbl,</div><div class='add'>+					  BNXT_L2_FLTR_HASH_SIZE,</div><div class='add'>+					  fs-&gt;location);</div><div class='add'>+	if (fltr_base) {</div><div class='add'>+		struct ethhdr *h_ether = &amp;fs-&gt;h_u.ether_spec;</div><div class='add'>+		struct ethhdr *m_ether = &amp;fs-&gt;m_u.ether_spec;</div><div class='add'>+		struct bnxt_l2_filter *l2_fltr;</div><div class='add'>+		struct bnxt_l2_key *l2_key;</div><div class='add'>+</div><div class='add'>+		l2_fltr = container_of(fltr_base, struct bnxt_l2_filter, base);</div><div class='add'>+		l2_key = &amp;l2_fltr-&gt;l2_key;</div><div class='add'>+		fs-&gt;flow_type = ETHER_FLOW;</div><div class='add'>+		ether_addr_copy(h_ether-&gt;h_dest, l2_key-&gt;dst_mac_addr);</div><div class='add'>+		eth_broadcast_addr(m_ether-&gt;h_dest);</div><div class='add'>+		if (l2_key-&gt;vlan) {</div><div class='add'>+			struct ethtool_flow_ext *m_ext = &amp;fs-&gt;m_ext;</div><div class='add'>+			struct ethtool_flow_ext *h_ext = &amp;fs-&gt;h_ext;</div><div class='add'>+</div><div class='add'>+			fs-&gt;flow_type |= FLOW_EXT;</div><div class='add'>+			m_ext-&gt;vlan_tci = htons(0xfff);</div><div class='add'>+			h_ext-&gt;vlan_tci = htons(l2_key-&gt;vlan);</div><div class='ctx'> 		}</div><div class='add'>+		if (fltr_base-&gt;flags &amp; BNXT_ACT_RING_DST)</div><div class='add'>+			fs-&gt;ring_cookie = fltr_base-&gt;rxq;</div><div class='add'>+		if (fltr_base-&gt;flags &amp; BNXT_ACT_FUNC_DST)</div><div class='add'>+			fs-&gt;ring_cookie = (u64)(fltr_base-&gt;vf_idx + 1) &lt;&lt;</div><div class='add'>+					  ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF;</div><div class='ctx'> 		rcu_read_unlock();</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	return rc;</div><div class='add'>+	fltr_base = bnxt_get_one_fltr_rcu(bp, bp-&gt;ntp_fltr_hash_tbl,</div><div class='add'>+					  BNXT_NTP_FLTR_HASH_SIZE,</div><div class='add'>+					  fs-&gt;location);</div><div class='add'>+	if (!fltr_base) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	fltr = container_of(fltr_base, struct bnxt_ntuple_filter, base);</div><div class='ctx'> </div><div class='del'>-fltr_found:</div><div class='ctx'> 	fkeys = &amp;fltr-&gt;fkeys;</div><div class='add'>+	fmasks = &amp;fltr-&gt;fmasks;</div><div class='ctx'> 	if (fkeys-&gt;basic.n_proto == htons(ETH_P_IP)) {</div><div class='del'>-		if (fkeys-&gt;basic.ip_proto == IPPROTO_TCP)</div><div class='add'>+		if (fkeys-&gt;basic.ip_proto == BNXT_IP_PROTO_WILDCARD) {</div><div class='add'>+			fs-&gt;flow_type = IP_USER_FLOW;</div><div class='add'>+			fs-&gt;h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;</div><div class='add'>+			fs-&gt;h_u.usr_ip4_spec.proto = BNXT_IP_PROTO_WILDCARD;</div><div class='add'>+			fs-&gt;m_u.usr_ip4_spec.proto = 0;</div><div class='add'>+		} else if (fkeys-&gt;basic.ip_proto == IPPROTO_ICMP) {</div><div class='add'>+			fs-&gt;flow_type = IP_USER_FLOW;</div><div class='add'>+			fs-&gt;h_u.usr_ip4_spec.ip_ver = ETH_RX_NFC_IP4;</div><div class='add'>+			fs-&gt;h_u.usr_ip4_spec.proto = IPPROTO_ICMP;</div><div class='add'>+			fs-&gt;m_u.usr_ip4_spec.proto = BNXT_IP_PROTO_FULL_MASK;</div><div class='add'>+		} else if (fkeys-&gt;basic.ip_proto == IPPROTO_TCP) {</div><div class='ctx'> 			fs-&gt;flow_type = TCP_V4_FLOW;</div><div class='del'>-		else if (fkeys-&gt;basic.ip_proto == IPPROTO_UDP)</div><div class='add'>+		} else if (fkeys-&gt;basic.ip_proto == IPPROTO_UDP) {</div><div class='ctx'> 			fs-&gt;flow_type = UDP_V4_FLOW;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			goto fltr_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		fs-&gt;h_u.tcp_ip4_spec.ip4src = fkeys-&gt;addrs.v4addrs.src;</div><div class='del'>-		fs-&gt;m_u.tcp_ip4_spec.ip4src = cpu_to_be32(~0);</div><div class='del'>-</div><div class='add'>+		fs-&gt;m_u.tcp_ip4_spec.ip4src = fmasks-&gt;addrs.v4addrs.src;</div><div class='ctx'> 		fs-&gt;h_u.tcp_ip4_spec.ip4dst = fkeys-&gt;addrs.v4addrs.dst;</div><div class='del'>-		fs-&gt;m_u.tcp_ip4_spec.ip4dst = cpu_to_be32(~0);</div><div class='del'>-</div><div class='del'>-		fs-&gt;h_u.tcp_ip4_spec.psrc = fkeys-&gt;ports.src;</div><div class='del'>-		fs-&gt;m_u.tcp_ip4_spec.psrc = cpu_to_be16(~0);</div><div class='del'>-</div><div class='del'>-		fs-&gt;h_u.tcp_ip4_spec.pdst = fkeys-&gt;ports.dst;</div><div class='del'>-		fs-&gt;m_u.tcp_ip4_spec.pdst = cpu_to_be16(~0);</div><div class='add'>+		fs-&gt;m_u.tcp_ip4_spec.ip4dst = fmasks-&gt;addrs.v4addrs.dst;</div><div class='add'>+		if (fs-&gt;flow_type == TCP_V4_FLOW ||</div><div class='add'>+		    fs-&gt;flow_type == UDP_V4_FLOW) {</div><div class='add'>+			fs-&gt;h_u.tcp_ip4_spec.psrc = fkeys-&gt;ports.src;</div><div class='add'>+			fs-&gt;m_u.tcp_ip4_spec.psrc = fmasks-&gt;ports.src;</div><div class='add'>+			fs-&gt;h_u.tcp_ip4_spec.pdst = fkeys-&gt;ports.dst;</div><div class='add'>+			fs-&gt;m_u.tcp_ip4_spec.pdst = fmasks-&gt;ports.dst;</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (fkeys-&gt;basic.ip_proto == IPPROTO_TCP)</div><div class='add'>+		if (fkeys-&gt;basic.ip_proto == BNXT_IP_PROTO_WILDCARD) {</div><div class='add'>+			fs-&gt;flow_type = IPV6_USER_FLOW;</div><div class='add'>+			fs-&gt;h_u.usr_ip6_spec.l4_proto = BNXT_IP_PROTO_WILDCARD;</div><div class='add'>+			fs-&gt;m_u.usr_ip6_spec.l4_proto = 0;</div><div class='add'>+		} else if (fkeys-&gt;basic.ip_proto == IPPROTO_ICMPV6) {</div><div class='add'>+			fs-&gt;flow_type = IPV6_USER_FLOW;</div><div class='add'>+			fs-&gt;h_u.usr_ip6_spec.l4_proto = IPPROTO_ICMPV6;</div><div class='add'>+			fs-&gt;m_u.usr_ip6_spec.l4_proto = BNXT_IP_PROTO_FULL_MASK;</div><div class='add'>+		} else if (fkeys-&gt;basic.ip_proto == IPPROTO_TCP) {</div><div class='ctx'> 			fs-&gt;flow_type = TCP_V6_FLOW;</div><div class='del'>-		else if (fkeys-&gt;basic.ip_proto == IPPROTO_UDP)</div><div class='add'>+		} else if (fkeys-&gt;basic.ip_proto == IPPROTO_UDP) {</div><div class='ctx'> 			fs-&gt;flow_type = UDP_V6_FLOW;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			goto fltr_err;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		*(struct in6_addr *)&amp;fs-&gt;h_u.tcp_ip6_spec.ip6src[0] =</div><div class='ctx'> 			fkeys-&gt;addrs.v6addrs.src;</div><div class='add'>+		*(struct in6_addr *)&amp;fs-&gt;m_u.tcp_ip6_spec.ip6src[0] =</div><div class='add'>+			fmasks-&gt;addrs.v6addrs.src;</div><div class='ctx'> 		*(struct in6_addr *)&amp;fs-&gt;h_u.tcp_ip6_spec.ip6dst[0] =</div><div class='ctx'> 			fkeys-&gt;addrs.v6addrs.dst;</div><div class='del'>-		for (i = 0; i &lt; 4; i++) {</div><div class='del'>-			fs-&gt;m_u.tcp_ip6_spec.ip6src[i] = cpu_to_be32(~0);</div><div class='del'>-			fs-&gt;m_u.tcp_ip6_spec.ip6dst[i] = cpu_to_be32(~0);</div><div class='add'>+		*(struct in6_addr *)&amp;fs-&gt;m_u.tcp_ip6_spec.ip6dst[0] =</div><div class='add'>+			fmasks-&gt;addrs.v6addrs.dst;</div><div class='add'>+		if (fs-&gt;flow_type == TCP_V6_FLOW ||</div><div class='add'>+		    fs-&gt;flow_type == UDP_V6_FLOW) {</div><div class='add'>+			fs-&gt;h_u.tcp_ip6_spec.psrc = fkeys-&gt;ports.src;</div><div class='add'>+			fs-&gt;m_u.tcp_ip6_spec.psrc = fmasks-&gt;ports.src;</div><div class='add'>+			fs-&gt;h_u.tcp_ip6_spec.pdst = fkeys-&gt;ports.dst;</div><div class='add'>+			fs-&gt;m_u.tcp_ip6_spec.pdst = fmasks-&gt;ports.dst;</div><div class='ctx'> 		}</div><div class='del'>-		fs-&gt;h_u.tcp_ip6_spec.psrc = fkeys-&gt;ports.src;</div><div class='del'>-		fs-&gt;m_u.tcp_ip6_spec.psrc = cpu_to_be16(~0);</div><div class='del'>-</div><div class='del'>-		fs-&gt;h_u.tcp_ip6_spec.pdst = fkeys-&gt;ports.dst;</div><div class='del'>-		fs-&gt;m_u.tcp_ip6_spec.pdst = cpu_to_be16(~0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fs-&gt;ring_cookie = fltr-&gt;rxq;</div><div class='add'>+	if (fltr-&gt;base.flags &amp; BNXT_ACT_DROP) {</div><div class='add'>+		fs-&gt;ring_cookie = RX_CLS_FLOW_DISC;</div><div class='add'>+	} else if (fltr-&gt;base.flags &amp; BNXT_ACT_RSS_CTX) {</div><div class='add'>+		fs-&gt;flow_type |= FLOW_RSS;</div><div class='add'>+		cmd-&gt;rss_context = fltr-&gt;base.fw_vnic_id;</div><div class='add'>+	} else {</div><div class='add'>+		fs-&gt;ring_cookie = fltr-&gt;base.rxq;</div><div class='add'>+	}</div><div class='ctx'> 	rc = 0;</div><div class='ctx'> </div><div class='ctx'> fltr_err:</div><div class='hunk'>@@ -941,7 +1230,354 @@ fltr_err:</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static struct bnxt_rss_ctx *bnxt_get_rss_ctx_from_index(struct bnxt *bp,</div><div class='add'>+							u32 index)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rxfh_context *ctx;</div><div class='add'>+</div><div class='add'>+	ctx = xa_load(&amp;bp-&gt;dev-&gt;ethtool-&gt;rss_ctx, index);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+	return ethtool_rxfh_context_priv(ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_vnic_rss_table(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_vnic_info *vnic)</div><div class='add'>+{</div><div class='add'>+	int size = L1_CACHE_ALIGN(BNXT_MAX_RSS_TABLE_SIZE_P5);</div><div class='add'>+</div><div class='add'>+	vnic-&gt;rss_table_size = size + HW_HASH_KEY_SIZE;</div><div class='add'>+	vnic-&gt;rss_table = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+					     vnic-&gt;rss_table_size,</div><div class='add'>+					     &amp;vnic-&gt;rss_table_dma_addr,</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+	if (!vnic-&gt;rss_table)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	vnic-&gt;rss_hash_key = ((void *)vnic-&gt;rss_table) + size;</div><div class='add'>+	vnic-&gt;rss_hash_key_dma_addr = vnic-&gt;rss_table_dma_addr + size;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_add_l2_cls_rule(struct bnxt *bp,</div><div class='add'>+				struct ethtool_rx_flow_spec *fs)</div><div class='add'>+{</div><div class='add'>+	u32 ring = ethtool_get_flow_spec_ring(fs-&gt;ring_cookie);</div><div class='add'>+	u8 vf = ethtool_get_flow_spec_ring_vf(fs-&gt;ring_cookie);</div><div class='add'>+	struct ethhdr *h_ether = &amp;fs-&gt;h_u.ether_spec;</div><div class='add'>+	struct ethhdr *m_ether = &amp;fs-&gt;m_u.ether_spec;</div><div class='add'>+	struct bnxt_l2_filter *fltr;</div><div class='add'>+	struct bnxt_l2_key key;</div><div class='add'>+	u16 vnic_id;</div><div class='add'>+	u8 flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_CHIP_P5_PLUS(bp))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!is_broadcast_ether_addr(m_ether-&gt;h_dest))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	ether_addr_copy(key.dst_mac_addr, h_ether-&gt;h_dest);</div><div class='add'>+	key.vlan = 0;</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+		struct ethtool_flow_ext *m_ext = &amp;fs-&gt;m_ext;</div><div class='add'>+		struct ethtool_flow_ext *h_ext = &amp;fs-&gt;h_ext;</div><div class='add'>+</div><div class='add'>+		if (m_ext-&gt;vlan_tci != htons(0xfff) || !h_ext-&gt;vlan_tci)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		key.vlan = ntohs(h_ext-&gt;vlan_tci);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vf) {</div><div class='add'>+		flags = BNXT_ACT_FUNC_DST;</div><div class='add'>+		vnic_id = 0xffff;</div><div class='add'>+		vf--;</div><div class='add'>+	} else {</div><div class='add'>+		flags = BNXT_ACT_RING_DST;</div><div class='add'>+		vnic_id = bp-&gt;vnic_info[ring + 1].fw_vnic_id;</div><div class='add'>+	}</div><div class='add'>+	fltr = bnxt_alloc_new_l2_filter(bp, &amp;key, flags);</div><div class='add'>+	if (IS_ERR(fltr))</div><div class='add'>+		return PTR_ERR(fltr);</div><div class='add'>+</div><div class='add'>+	fltr-&gt;base.fw_vnic_id = vnic_id;</div><div class='add'>+	fltr-&gt;base.rxq = ring;</div><div class='add'>+	fltr-&gt;base.vf_idx = vf;</div><div class='add'>+	rc = bnxt_hwrm_l2_filter_alloc(bp, fltr);</div><div class='add'>+	if (rc)</div><div class='add'>+		bnxt_del_l2_filter(bp, fltr);</div><div class='add'>+	else</div><div class='add'>+		fs-&gt;location = fltr-&gt;base.sw_id;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_verify_ntuple_ip4_flow(struct ethtool_usrip4_spec *ip_spec,</div><div class='add'>+					struct ethtool_usrip4_spec *ip_mask)</div><div class='add'>+{</div><div class='add'>+	u8 mproto = ip_mask-&gt;proto;</div><div class='add'>+	u8 sproto = ip_spec-&gt;proto;</div><div class='add'>+</div><div class='add'>+	if (ip_mask-&gt;l4_4_bytes || ip_mask-&gt;tos ||</div><div class='add'>+	    ip_spec-&gt;ip_ver != ETH_RX_NFC_IP4 ||</div><div class='add'>+	    (mproto &amp;&amp; (mproto != BNXT_IP_PROTO_FULL_MASK || sproto != IPPROTO_ICMP)))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_verify_ntuple_ip6_flow(struct ethtool_usrip6_spec *ip_spec,</div><div class='add'>+					struct ethtool_usrip6_spec *ip_mask)</div><div class='add'>+{</div><div class='add'>+	u8 mproto = ip_mask-&gt;l4_proto;</div><div class='add'>+	u8 sproto = ip_spec-&gt;l4_proto;</div><div class='add'>+</div><div class='add'>+	if (ip_mask-&gt;l4_4_bytes || ip_mask-&gt;tclass ||</div><div class='add'>+	    (mproto &amp;&amp; (mproto != BNXT_IP_PROTO_FULL_MASK || sproto != IPPROTO_ICMPV6)))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_add_ntuple_cls_rule(struct bnxt *bp,</div><div class='add'>+				    struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;cmd-&gt;fs;</div><div class='add'>+	struct bnxt_ntuple_filter *new_fltr, *fltr;</div><div class='add'>+	u32 flow_type = fs-&gt;flow_type &amp; 0xff;</div><div class='add'>+	struct bnxt_l2_filter *l2_fltr;</div><div class='add'>+	struct bnxt_flow_masks *fmasks;</div><div class='add'>+	struct flow_keys *fkeys;</div><div class='add'>+	u32 idx, ring;</div><div class='add'>+	int rc;</div><div class='add'>+	u8 vf;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;vnic_info)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	vf = ethtool_get_flow_spec_ring_vf(fs-&gt;ring_cookie);</div><div class='add'>+	ring = ethtool_get_flow_spec_ring(fs-&gt;ring_cookie);</div><div class='add'>+	if ((fs-&gt;flow_type &amp; (FLOW_MAC_EXT | FLOW_EXT)) || vf)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_type == IP_USER_FLOW) {</div><div class='add'>+		if (!bnxt_verify_ntuple_ip4_flow(&amp;fs-&gt;h_u.usr_ip4_spec,</div><div class='add'>+						 &amp;fs-&gt;m_u.usr_ip4_spec))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_type == IPV6_USER_FLOW) {</div><div class='add'>+		if (!bnxt_verify_ntuple_ip6_flow(&amp;fs-&gt;h_u.usr_ip6_spec,</div><div class='add'>+						 &amp;fs-&gt;m_u.usr_ip6_spec))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	new_fltr = kzalloc(sizeof(*new_fltr), GFP_KERNEL);</div><div class='add'>+	if (!new_fltr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	l2_fltr = bp-&gt;vnic_info[BNXT_VNIC_DEFAULT].l2_filters[0];</div><div class='add'>+	atomic_inc(&amp;l2_fltr-&gt;refcnt);</div><div class='add'>+	new_fltr-&gt;l2_fltr = l2_fltr;</div><div class='add'>+	fmasks = &amp;new_fltr-&gt;fmasks;</div><div class='add'>+	fkeys = &amp;new_fltr-&gt;fkeys;</div><div class='add'>+</div><div class='add'>+	rc = -EOPNOTSUPP;</div><div class='add'>+	switch (flow_type) {</div><div class='add'>+	case IP_USER_FLOW: {</div><div class='add'>+		struct ethtool_usrip4_spec *ip_spec = &amp;fs-&gt;h_u.usr_ip4_spec;</div><div class='add'>+		struct ethtool_usrip4_spec *ip_mask = &amp;fs-&gt;m_u.usr_ip4_spec;</div><div class='add'>+</div><div class='add'>+		fkeys-&gt;basic.ip_proto = ip_mask-&gt;proto ? ip_spec-&gt;proto</div><div class='add'>+						       : BNXT_IP_PROTO_WILDCARD;</div><div class='add'>+		fkeys-&gt;basic.n_proto = htons(ETH_P_IP);</div><div class='add'>+		fkeys-&gt;addrs.v4addrs.src = ip_spec-&gt;ip4src;</div><div class='add'>+		fmasks-&gt;addrs.v4addrs.src = ip_mask-&gt;ip4src;</div><div class='add'>+		fkeys-&gt;addrs.v4addrs.dst = ip_spec-&gt;ip4dst;</div><div class='add'>+		fmasks-&gt;addrs.v4addrs.dst = ip_mask-&gt;ip4dst;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+	case UDP_V4_FLOW: {</div><div class='add'>+		struct ethtool_tcpip4_spec *ip_spec = &amp;fs-&gt;h_u.tcp_ip4_spec;</div><div class='add'>+		struct ethtool_tcpip4_spec *ip_mask = &amp;fs-&gt;m_u.tcp_ip4_spec;</div><div class='add'>+</div><div class='add'>+		fkeys-&gt;basic.ip_proto = IPPROTO_TCP;</div><div class='add'>+		if (flow_type == UDP_V4_FLOW)</div><div class='add'>+			fkeys-&gt;basic.ip_proto = IPPROTO_UDP;</div><div class='add'>+		fkeys-&gt;basic.n_proto = htons(ETH_P_IP);</div><div class='add'>+		fkeys-&gt;addrs.v4addrs.src = ip_spec-&gt;ip4src;</div><div class='add'>+		fmasks-&gt;addrs.v4addrs.src = ip_mask-&gt;ip4src;</div><div class='add'>+		fkeys-&gt;addrs.v4addrs.dst = ip_spec-&gt;ip4dst;</div><div class='add'>+		fmasks-&gt;addrs.v4addrs.dst = ip_mask-&gt;ip4dst;</div><div class='add'>+		fkeys-&gt;ports.src = ip_spec-&gt;psrc;</div><div class='add'>+		fmasks-&gt;ports.src = ip_mask-&gt;psrc;</div><div class='add'>+		fkeys-&gt;ports.dst = ip_spec-&gt;pdst;</div><div class='add'>+		fmasks-&gt;ports.dst = ip_mask-&gt;pdst;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case IPV6_USER_FLOW: {</div><div class='add'>+		struct ethtool_usrip6_spec *ip_spec = &amp;fs-&gt;h_u.usr_ip6_spec;</div><div class='add'>+		struct ethtool_usrip6_spec *ip_mask = &amp;fs-&gt;m_u.usr_ip6_spec;</div><div class='add'>+</div><div class='add'>+		fkeys-&gt;basic.ip_proto = ip_mask-&gt;l4_proto ? ip_spec-&gt;l4_proto</div><div class='add'>+							  : BNXT_IP_PROTO_WILDCARD;</div><div class='add'>+		fkeys-&gt;basic.n_proto = htons(ETH_P_IPV6);</div><div class='add'>+		fkeys-&gt;addrs.v6addrs.src = *(struct in6_addr *)&amp;ip_spec-&gt;ip6src;</div><div class='add'>+		fmasks-&gt;addrs.v6addrs.src = *(struct in6_addr *)&amp;ip_mask-&gt;ip6src;</div><div class='add'>+		fkeys-&gt;addrs.v6addrs.dst = *(struct in6_addr *)&amp;ip_spec-&gt;ip6dst;</div><div class='add'>+		fmasks-&gt;addrs.v6addrs.dst = *(struct in6_addr *)&amp;ip_mask-&gt;ip6dst;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+	case UDP_V6_FLOW: {</div><div class='add'>+		struct ethtool_tcpip6_spec *ip_spec = &amp;fs-&gt;h_u.tcp_ip6_spec;</div><div class='add'>+		struct ethtool_tcpip6_spec *ip_mask = &amp;fs-&gt;m_u.tcp_ip6_spec;</div><div class='add'>+</div><div class='add'>+		fkeys-&gt;basic.ip_proto = IPPROTO_TCP;</div><div class='add'>+		if (flow_type == UDP_V6_FLOW)</div><div class='add'>+			fkeys-&gt;basic.ip_proto = IPPROTO_UDP;</div><div class='add'>+		fkeys-&gt;basic.n_proto = htons(ETH_P_IPV6);</div><div class='add'>+</div><div class='add'>+		fkeys-&gt;addrs.v6addrs.src = *(struct in6_addr *)&amp;ip_spec-&gt;ip6src;</div><div class='add'>+		fmasks-&gt;addrs.v6addrs.src = *(struct in6_addr *)&amp;ip_mask-&gt;ip6src;</div><div class='add'>+		fkeys-&gt;addrs.v6addrs.dst = *(struct in6_addr *)&amp;ip_spec-&gt;ip6dst;</div><div class='add'>+		fmasks-&gt;addrs.v6addrs.dst = *(struct in6_addr *)&amp;ip_mask-&gt;ip6dst;</div><div class='add'>+		fkeys-&gt;ports.src = ip_spec-&gt;psrc;</div><div class='add'>+		fmasks-&gt;ports.src = ip_mask-&gt;psrc;</div><div class='add'>+		fkeys-&gt;ports.dst = ip_spec-&gt;pdst;</div><div class='add'>+		fmasks-&gt;ports.dst = ip_mask-&gt;pdst;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		rc = -EOPNOTSUPP;</div><div class='add'>+		goto ntuple_err;</div><div class='add'>+	}</div><div class='add'>+	if (!memcmp(&amp;BNXT_FLOW_MASK_NONE, fmasks, sizeof(*fmasks)))</div><div class='add'>+		goto ntuple_err;</div><div class='add'>+</div><div class='add'>+	idx = bnxt_get_ntp_filter_idx(bp, fkeys, NULL);</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fltr = bnxt_lookup_ntp_filter_from_idx(bp, new_fltr, idx);</div><div class='add'>+	if (fltr) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		rc = -EEXIST;</div><div class='add'>+		goto ntuple_err;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+</div><div class='add'>+	new_fltr-&gt;base.flags = BNXT_ACT_NO_AGING;</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_RSS) {</div><div class='add'>+		struct bnxt_rss_ctx *rss_ctx;</div><div class='add'>+</div><div class='add'>+		new_fltr-&gt;base.fw_vnic_id = 0;</div><div class='add'>+		new_fltr-&gt;base.flags |= BNXT_ACT_RSS_CTX;</div><div class='add'>+		rss_ctx = bnxt_get_rss_ctx_from_index(bp, cmd-&gt;rss_context);</div><div class='add'>+		if (rss_ctx) {</div><div class='add'>+			new_fltr-&gt;base.fw_vnic_id = rss_ctx-&gt;index;</div><div class='add'>+		} else {</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto ntuple_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (fs-&gt;ring_cookie == RX_CLS_FLOW_DISC)</div><div class='add'>+		new_fltr-&gt;base.flags |= BNXT_ACT_DROP;</div><div class='add'>+	else</div><div class='add'>+		new_fltr-&gt;base.rxq = ring;</div><div class='add'>+	__set_bit(BNXT_FLTR_VALID, &amp;new_fltr-&gt;base.state);</div><div class='add'>+	rc = bnxt_insert_ntp_filter(bp, new_fltr, idx);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		rc = bnxt_hwrm_cfa_ntuple_filter_alloc(bp, new_fltr);</div><div class='add'>+		if (rc) {</div><div class='add'>+			bnxt_del_ntp_filter(bp, new_fltr);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+		fs-&gt;location = new_fltr-&gt;base.sw_id;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+ntuple_err:</div><div class='add'>+	atomic_dec(&amp;l2_fltr-&gt;refcnt);</div><div class='add'>+	kfree(new_fltr);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_srxclsrlins(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;cmd-&gt;fs;</div><div class='add'>+	u32 ring, flow_type;</div><div class='add'>+	int rc;</div><div class='add'>+	u8 vf;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(bp-&gt;dev))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_RFS))</div><div class='add'>+		return -EPERM;</div><div class='add'>+	if (fs-&gt;location != RX_CLS_LOC_ANY)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	flow_type = fs-&gt;flow_type;</div><div class='add'>+	if ((flow_type == IP_USER_FLOW ||</div><div class='add'>+	     flow_type == IPV6_USER_FLOW) &amp;&amp;</div><div class='add'>+	    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_CFA_NTUPLE_RX_EXT_IP_PROTO))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	if (flow_type &amp; FLOW_MAC_EXT)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	flow_type &amp;= ~FLOW_EXT;</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;ring_cookie == RX_CLS_FLOW_DISC &amp;&amp; flow_type != ETHER_FLOW)</div><div class='add'>+		return bnxt_add_ntuple_cls_rule(bp, cmd);</div><div class='add'>+</div><div class='add'>+	ring = ethtool_get_flow_spec_ring(fs-&gt;ring_cookie);</div><div class='add'>+	vf = ethtool_get_flow_spec_ring_vf(fs-&gt;ring_cookie);</div><div class='add'>+	if (BNXT_VF(bp) &amp;&amp; vf)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; vf &gt; bp-&gt;pf.active_vfs)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (!vf &amp;&amp; ring &gt;= bp-&gt;rx_nr_rings)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flow_type == ETHER_FLOW)</div><div class='add'>+		rc = bnxt_add_l2_cls_rule(bp, fs);</div><div class='add'>+	else</div><div class='add'>+		rc = bnxt_add_ntuple_cls_rule(bp, cmd);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_srxclsrldel(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;cmd-&gt;fs;</div><div class='add'>+	struct bnxt_filter_base *fltr_base;</div><div class='add'>+	struct bnxt_ntuple_filter *fltr;</div><div class='add'>+	u32 id = fs-&gt;location;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	fltr_base = bnxt_get_one_fltr_rcu(bp, bp-&gt;l2_fltr_hash_tbl,</div><div class='add'>+					  BNXT_L2_FLTR_HASH_SIZE, id);</div><div class='add'>+	if (fltr_base) {</div><div class='add'>+		struct bnxt_l2_filter *l2_fltr;</div><div class='add'>+</div><div class='add'>+		l2_fltr = container_of(fltr_base, struct bnxt_l2_filter, base);</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		bnxt_hwrm_l2_filter_free(bp, l2_fltr);</div><div class='add'>+		bnxt_del_l2_filter(bp, l2_fltr);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	fltr_base = bnxt_get_one_fltr_rcu(bp, bp-&gt;ntp_fltr_hash_tbl,</div><div class='add'>+					  BNXT_NTP_FLTR_HASH_SIZE, id);</div><div class='add'>+	if (!fltr_base) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fltr = container_of(fltr_base, struct bnxt_ntuple_filter, base);</div><div class='add'>+	if (!(fltr-&gt;base.flags &amp; BNXT_ACT_NO_AGING)) {</div><div class='add'>+		rcu_read_unlock();</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	bnxt_hwrm_cfa_ntuple_filter_free(bp, fltr);</div><div class='add'>+	bnxt_del_ntp_filter(bp, fltr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static u64 get_ethtool_ipv4_rss(struct bnxt *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -954,11 +1590,16 @@ static u64 get_ethtool_ipv6_rss(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	if (bp-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6)</div><div class='ctx'> 		return RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+	if (bp-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6_FLOW_LABEL)</div><div class='add'>+		return RXH_IP_SRC | RXH_IP_DST | RXH_IP6_FL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_grxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='add'>+static int bnxt_get_rxfh_fields(struct net_device *dev,</div><div class='add'>+				struct ethtool_rxfh_fields *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 	cmd-&gt;data = 0;</div><div class='ctx'> 	switch (cmd-&gt;flow_type) {</div><div class='ctx'> 	case TCP_V4_FLOW:</div><div class='hunk'>@@ -971,9 +1612,15 @@ static int bnxt_grxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 		if (bp-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4)</div><div class='ctx'> 			cmd-&gt;data |= RXH_IP_SRC | RXH_IP_DST |</div><div class='ctx'> 				     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case SCTP_V4_FLOW:</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case AH_ESP_V4_FLOW:</div><div class='add'>+		if (bp-&gt;rss_hash_cfg &amp;</div><div class='add'>+		    (VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV4 |</div><div class='add'>+		     VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV4))</div><div class='add'>+			cmd-&gt;data |= RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+				     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case SCTP_V4_FLOW:</div><div class='ctx'> 	case AH_V4_FLOW:</div><div class='ctx'> 	case ESP_V4_FLOW:</div><div class='ctx'> 	case IPV4_FLOW:</div><div class='hunk'>@@ -990,9 +1637,15 @@ static int bnxt_grxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 		if (bp-&gt;rss_hash_cfg &amp; VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6)</div><div class='ctx'> 			cmd-&gt;data |= RXH_IP_SRC | RXH_IP_DST |</div><div class='ctx'> 				     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-		/* fall through */</div><div class='del'>-	case SCTP_V6_FLOW:</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case AH_ESP_V6_FLOW:</div><div class='add'>+		if (bp-&gt;rss_hash_cfg &amp;</div><div class='add'>+		    (VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV6 |</div><div class='add'>+		     VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV6))</div><div class='add'>+			cmd-&gt;data |= RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+				     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		fallthrough;</div><div class='add'>+	case SCTP_V6_FLOW:</div><div class='ctx'> 	case AH_V6_FLOW:</div><div class='ctx'> 	case ESP_V6_FLOW:</div><div class='ctx'> 	case IPV6_FLOW:</div><div class='hunk'>@@ -1005,26 +1658,36 @@ static int bnxt_grxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> #define RXH_4TUPLE (RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 | RXH_L4_B_2_3)</div><div class='ctx'> #define RXH_2TUPLE (RXH_IP_SRC | RXH_IP_DST)</div><div class='ctx'> </div><div class='del'>-static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='add'>+static int bnxt_set_rxfh_fields(struct net_device *dev,</div><div class='add'>+				const struct ethtool_rxfh_fields *cmd,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	u32 rss_hash_cfg = bp-&gt;rss_hash_cfg;</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int tuple, rc = 0;</div><div class='add'>+	u32 rss_hash_cfg;</div><div class='add'>+</div><div class='add'>+	rss_hash_cfg = bp-&gt;rss_hash_cfg;</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;data == RXH_4TUPLE)</div><div class='ctx'> 		tuple = 4;</div><div class='del'>-	else if (cmd-&gt;data == RXH_2TUPLE)</div><div class='add'>+	else if (cmd-&gt;data == RXH_2TUPLE ||</div><div class='add'>+		 cmd-&gt;data == (RXH_2TUPLE | RXH_IP6_FL))</div><div class='ctx'> 		tuple = 2;</div><div class='ctx'> 	else if (!cmd-&gt;data)</div><div class='ctx'> 		tuple = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='add'>+	if (cmd-&gt;data &amp; RXH_IP6_FL &amp;&amp;</div><div class='add'>+	    !(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_IPV6_FLOW_LABEL_RSS_CAP))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	if (cmd-&gt;flow_type == TCP_V4_FLOW) {</div><div class='ctx'> 		rss_hash_cfg &amp;= ~VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4;</div><div class='ctx'> 		if (tuple == 4)</div><div class='ctx'> 			rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4;</div><div class='ctx'> 	} else if (cmd-&gt;flow_type == UDP_V4_FLOW) {</div><div class='del'>-		if (tuple == 4 &amp;&amp; !(bp-&gt;flags &amp; BNXT_FLAG_UDP_RSS_CAP))</div><div class='add'>+		if (tuple == 4 &amp;&amp; !(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_UDP_RSS_CAP))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		rss_hash_cfg &amp;= ~VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4;</div><div class='ctx'> 		if (tuple == 4)</div><div class='hunk'>@@ -1034,11 +1697,29 @@ static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 		if (tuple == 4)</div><div class='ctx'> 			rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6;</div><div class='ctx'> 	} else if (cmd-&gt;flow_type == UDP_V6_FLOW) {</div><div class='del'>-		if (tuple == 4 &amp;&amp; !(bp-&gt;flags &amp; BNXT_FLAG_UDP_RSS_CAP))</div><div class='add'>+		if (tuple == 4 &amp;&amp; !(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_UDP_RSS_CAP))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		rss_hash_cfg &amp;= ~VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;</div><div class='ctx'> 		if (tuple == 4)</div><div class='ctx'> 			rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6;</div><div class='add'>+	} else if (cmd-&gt;flow_type == AH_ESP_V4_FLOW) {</div><div class='add'>+		if (tuple == 4 &amp;&amp; (!(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_AH_V4_RSS_CAP) ||</div><div class='add'>+				   !(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_ESP_V4_RSS_CAP)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		rss_hash_cfg &amp;= ~(VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV4 |</div><div class='add'>+				  VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV4);</div><div class='add'>+		if (tuple == 4)</div><div class='add'>+			rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV4 |</div><div class='add'>+					VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV4;</div><div class='add'>+	} else if (cmd-&gt;flow_type == AH_ESP_V6_FLOW) {</div><div class='add'>+		if (tuple == 4 &amp;&amp; (!(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_AH_V6_RSS_CAP) ||</div><div class='add'>+				   !(bp-&gt;rss_cap &amp; BNXT_RSS_CAP_ESP_V6_RSS_CAP)))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		rss_hash_cfg &amp;= ~(VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV6 |</div><div class='add'>+				  VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV6);</div><div class='add'>+		if (tuple == 4)</div><div class='add'>+			rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_AH_SPI_IPV6 |</div><div class='add'>+					VNIC_RSS_CFG_REQ_HASH_TYPE_ESP_SPI_IPV6;</div><div class='ctx'> 	} else if (tuple == 4) {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1064,16 +1745,23 @@ static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 	case AH_V6_FLOW:</div><div class='ctx'> 	case ESP_V6_FLOW:</div><div class='ctx'> 	case IPV6_FLOW:</div><div class='del'>-		if (tuple == 2)</div><div class='add'>+		rss_hash_cfg &amp;= ~(VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |</div><div class='add'>+				  VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6_FLOW_LABEL);</div><div class='add'>+		if (!tuple)</div><div class='add'>+			break;</div><div class='add'>+		if (cmd-&gt;data &amp; RXH_IP6_FL)</div><div class='add'>+			rss_hash_cfg |=</div><div class='add'>+				VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6_FLOW_LABEL;</div><div class='add'>+		else if (tuple == 2)</div><div class='ctx'> 			rss_hash_cfg |= VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6;</div><div class='del'>-		else if (!tuple)</div><div class='del'>-			rss_hash_cfg &amp;= ~VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;rss_hash_cfg == rss_hash_cfg)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;rss_cap &amp; BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA)</div><div class='add'>+		bp-&gt;rss_hash_delta = bp-&gt;rss_hash_cfg ^ rss_hash_cfg;</div><div class='ctx'> 	bp-&gt;rss_hash_cfg = rss_hash_cfg;</div><div class='ctx'> 	if (netif_running(bp-&gt;dev)) {</div><div class='ctx'> 		bnxt_close_nic(bp, false, false);</div><div class='hunk'>@@ -1082,6 +1770,13 @@ static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 bnxt_get_rx_ring_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return bp-&gt;rx_nr_rings;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 			  u32 *rule_locs)</div><div class='ctx'> {</div><div class='hunk'>@@ -1089,14 +1784,9 @@ static int bnxt_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd-&gt;cmd) {</div><div class='del'>-#ifdef CONFIG_RFS_ACCEL</div><div class='del'>-	case ETHTOOL_GRXRINGS:</div><div class='del'>-		cmd-&gt;data = bp-&gt;rx_nr_rings;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLCNT:</div><div class='ctx'> 		cmd-&gt;rule_cnt = bp-&gt;ntp_fltr_count;</div><div class='del'>-		cmd-&gt;data = BNXT_NTP_FLTR_MAX_FLTR;</div><div class='add'>+		cmd-&gt;data = bp-&gt;max_fltr | RX_CLS_LOC_SPECIAL;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case ETHTOOL_GRXCLSRLALL:</div><div class='hunk'>@@ -1106,11 +1796,6 @@ static int bnxt_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 	case ETHTOOL_GRXCLSRULE:</div><div class='ctx'> 		rc = bnxt_grxclsrule(bp, cmd);</div><div class='ctx'> 		break;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		rc = bnxt_grxfh(bp, cmd);</div><div class='del'>-		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='ctx'> 		rc = -EOPNOTSUPP;</div><div class='hunk'>@@ -1126,8 +1811,12 @@ static int bnxt_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		rc = bnxt_srxfh(bp, cmd);</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		rc = bnxt_srxclsrlins(bp, cmd);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		rc = bnxt_srxclsrldel(bp, cmd);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1137,8 +1826,13 @@ static int bnxt_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bnxt_get_rxfh_indir_size(struct net_device *dev)</div><div class='add'>+u32 bnxt_get_rxfh_indir_size(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		return bnxt_get_nr_rss_ctxs(bp, bp-&gt;rx_nr_rings) *</div><div class='add'>+		       BNXT_RSS_TABLE_ENTRIES_P5;</div><div class='ctx'> 	return HW_HASH_INDEX_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1147,29 +1841,214 @@ static u32 bnxt_get_rxfh_key_size(struct net_device *dev)</div><div class='ctx'> 	return HW_HASH_KEY_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_get_rxfh(struct net_device *dev, u32 *indir, u8 *key,</div><div class='del'>-			 u8 *hfunc)</div><div class='add'>+static int bnxt_get_rxfh(struct net_device *dev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_rss_ctx *rss_ctx = NULL;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u32 *indir_tbl = bp-&gt;rss_indir_tbl;</div><div class='ctx'> 	struct bnxt_vnic_info *vnic;</div><div class='del'>-	int i = 0;</div><div class='add'>+	u32 i, tbl_size;</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;vnic_info)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	vnic = &amp;bp-&gt;vnic_info[0];</div><div class='del'>-	if (indir &amp;&amp; vnic-&gt;rss_table) {</div><div class='del'>-		for (i = 0; i &lt; HW_HASH_INDEX_SIZE; i++)</div><div class='del'>-			indir[i] = le16_to_cpu(vnic-&gt;rss_table[i]);</div><div class='add'>+	vnic = &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT];</div><div class='add'>+	if (rxfh-&gt;rss_context) {</div><div class='add'>+		struct ethtool_rxfh_context *ctx;</div><div class='add'>+</div><div class='add'>+		ctx = xa_load(&amp;bp-&gt;dev-&gt;ethtool-&gt;rss_ctx, rxfh-&gt;rss_context);</div><div class='add'>+		if (!ctx)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		indir_tbl = ethtool_rxfh_context_indir(ctx);</div><div class='add'>+		rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+		vnic = &amp;rss_ctx-&gt;vnic;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxfh-&gt;indir &amp;&amp; indir_tbl) {</div><div class='add'>+		tbl_size = bnxt_get_rxfh_indir_size(dev);</div><div class='add'>+		for (i = 0; i &lt; tbl_size; i++)</div><div class='add'>+			rxfh-&gt;indir[i] = indir_tbl[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rxfh-&gt;key &amp;&amp; vnic-&gt;rss_hash_key)</div><div class='add'>+		memcpy(rxfh-&gt;key, vnic-&gt;rss_hash_key, HW_HASH_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_modify_rss(struct bnxt *bp, struct ethtool_rxfh_context *ctx,</div><div class='add'>+			    struct bnxt_rss_ctx *rss_ctx,</div><div class='add'>+			    const struct ethtool_rxfh_param *rxfh)</div><div class='add'>+{</div><div class='add'>+	if (rxfh-&gt;key) {</div><div class='add'>+		if (rss_ctx) {</div><div class='add'>+			memcpy(rss_ctx-&gt;vnic.rss_hash_key, rxfh-&gt;key,</div><div class='add'>+			       HW_HASH_KEY_SIZE);</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(bp-&gt;rss_hash_key, rxfh-&gt;key, HW_HASH_KEY_SIZE);</div><div class='add'>+			bp-&gt;rss_hash_key_updated = true;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='add'>+		u32 i, pad, tbl_size = bnxt_get_rxfh_indir_size(bp-&gt;dev);</div><div class='add'>+		u32 *indir_tbl = bp-&gt;rss_indir_tbl;</div><div class='add'>+</div><div class='add'>+		if (rss_ctx)</div><div class='add'>+			indir_tbl = ethtool_rxfh_context_indir(ctx);</div><div class='add'>+		for (i = 0; i &lt; tbl_size; i++)</div><div class='add'>+			indir_tbl[i] = rxfh-&gt;indir[i];</div><div class='add'>+		pad = bp-&gt;rss_indir_tbl_entries - tbl_size;</div><div class='add'>+		if (pad)</div><div class='add'>+			memset(&amp;indir_tbl[i], 0, pad * sizeof(*indir_tbl));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_rxfh_context_check(struct bnxt *bp,</div><div class='add'>+				   const struct ethtool_rxfh_param *rxfh,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (rxfh-&gt;hfunc &amp;&amp; rxfh-&gt;hfunc != ETH_RSS_HASH_TOP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "RSS hash function not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!BNXT_SUPPORTS_MULTI_RSS_CTX(bp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "RSS contexts not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!netif_running(bp-&gt;dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to set RSS contexts when interface is down");</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_create_rxfh_context(struct net_device *dev,</div><div class='add'>+				    struct ethtool_rxfh_context *ctx,</div><div class='add'>+				    const struct ethtool_rxfh_param *rxfh,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_rss_ctx *rss_ctx;</div><div class='add'>+	struct bnxt_vnic_info *vnic;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_rxfh_context_check(bp, rxfh, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;num_rss_ctx &gt;= BNXT_MAX_ETH_RSS_CTX) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack, "Out of RSS contexts, maximum %u",</div><div class='add'>+				       BNXT_MAX_ETH_RSS_CTX);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (key &amp;&amp; vnic-&gt;rss_hash_key)</div><div class='del'>-		memcpy(key, vnic-&gt;rss_hash_key, HW_HASH_KEY_SIZE);</div><div class='add'>+	if (!bnxt_rfs_capable(bp, true)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Out hardware resources");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+</div><div class='add'>+	bp-&gt;num_rss_ctx++;</div><div class='add'>+</div><div class='add'>+	vnic = &amp;rss_ctx-&gt;vnic;</div><div class='add'>+	vnic-&gt;rss_ctx = ctx;</div><div class='add'>+	vnic-&gt;flags |= BNXT_VNIC_RSSCTX_FLAG;</div><div class='add'>+	vnic-&gt;vnic_id = BNXT_VNIC_ID_INVALID;</div><div class='add'>+	rc = bnxt_alloc_vnic_rss_table(bp, vnic);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Populate defaults in the context */</div><div class='add'>+	bnxt_set_dflt_rss_indir_tbl(bp, ctx);</div><div class='add'>+	ctx-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	memcpy(vnic-&gt;rss_hash_key, bp-&gt;rss_hash_key, HW_HASH_KEY_SIZE);</div><div class='add'>+	memcpy(ethtool_rxfh_context_key(ctx),</div><div class='add'>+	       bp-&gt;rss_hash_key, HW_HASH_KEY_SIZE);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_vnic_alloc(bp, vnic, 0, bp-&gt;rx_nr_rings);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to allocate VNIC");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	rc = bnxt_hwrm_vnic_set_tpa(bp, vnic, bp-&gt;flags &amp; BNXT_FLAG_TPA);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to setup TPA");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	bnxt_modify_rss(bp, ctx, rss_ctx, rxfh);</div><div class='add'>+</div><div class='add'>+	rc = __bnxt_setup_vnic_p5(bp, vnic);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unable to setup TPA");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rss_ctx-&gt;index = rxfh-&gt;rss_context;</div><div class='ctx'> 	return 0;</div><div class='add'>+out:</div><div class='add'>+	bnxt_del_one_rss_ctx(bp, rss_ctx, true);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_modify_rxfh_context(struct net_device *dev,</div><div class='add'>+				    struct ethtool_rxfh_context *ctx,</div><div class='add'>+				    const struct ethtool_rxfh_param *rxfh,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_rss_ctx *rss_ctx;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_rxfh_context_check(bp, rxfh, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+</div><div class='add'>+	bnxt_modify_rss(bp, ctx, rss_ctx, rxfh);</div><div class='add'>+</div><div class='add'>+	return bnxt_hwrm_vnic_rss_cfg_p5(bp, &amp;rss_ctx-&gt;vnic);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_remove_rxfh_context(struct net_device *dev,</div><div class='add'>+				    struct ethtool_rxfh_context *ctx,</div><div class='add'>+				    u32 rss_context,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_rss_ctx *rss_ctx;</div><div class='add'>+</div><div class='add'>+	rss_ctx = ethtool_rxfh_context_priv(ctx);</div><div class='add'>+</div><div class='add'>+	bnxt_del_one_rss_ctx(bp, rss_ctx, true);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_rxfh(struct net_device *dev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (rxfh-&gt;hfunc &amp;&amp; rxfh-&gt;hfunc != ETH_RSS_HASH_TOP)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	bnxt_modify_rss(bp, NULL, NULL, rxfh);</div><div class='add'>+</div><div class='add'>+	if (netif_running(bp-&gt;dev)) {</div><div class='add'>+		bnxt_close_nic(bp, false, false);</div><div class='add'>+		rc = bnxt_open_nic(bp, false, false);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_get_drvinfo(struct net_device *dev,</div><div class='hunk'>@@ -1177,10 +2056,9 @@ static void bnxt_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, bp-&gt;fw_ver_str, sizeof(info-&gt;fw_version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;fw_version, bp-&gt;fw_ver_str, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(bp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;n_stats = bnxt_get_num_stats(bp);</div><div class='ctx'> 	info-&gt;testinfo_len = bp-&gt;num_tests;</div><div class='ctx'> 	/* TODO CHIMP_FW: eeprom dump details */</div><div class='hunk'>@@ -1189,6 +2067,101 @@ static void bnxt_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 	info-&gt;regdump_len = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_get_regs_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!BNXT_PF(bp))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return BNXT_PXP_REG_LEN + bp-&gt;pcie_stat_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *</div><div class='add'>+__bnxt_hwrm_pcie_qstats(struct bnxt *bp, struct hwrm_pcie_qstats_input *req)</div><div class='add'>+{</div><div class='add'>+	struct pcie_ctx_hw_stats_v2 *hw_pcie_stats;</div><div class='add'>+	dma_addr_t hw_pcie_stats_addr;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	hw_pcie_stats = hwrm_req_dma_slice(bp, req, sizeof(*hw_pcie_stats),</div><div class='add'>+					   &amp;hw_pcie_stats_addr);</div><div class='add'>+	if (!hw_pcie_stats)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	req-&gt;pcie_stat_size = cpu_to_le16(sizeof(*hw_pcie_stats));</div><div class='add'>+	req-&gt;pcie_stat_host_addr = cpu_to_le64(hw_pcie_stats_addr);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+</div><div class='add'>+	return rc ? NULL : hw_pcie_stats;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNXT_PCIE_32B_ENTRY(start, end)			\</div><div class='add'>+	 { offsetof(struct pcie_ctx_hw_stats_v2, start),\</div><div class='add'>+	   offsetof(struct pcie_ctx_hw_stats_v2, end) }</div><div class='add'>+</div><div class='add'>+static const struct {</div><div class='add'>+	u16 start;</div><div class='add'>+	u16 end;</div><div class='add'>+} bnxt_pcie_32b_entries[] = {</div><div class='add'>+	BNXT_PCIE_32B_ENTRY(pcie_ltssm_histogram[0], pcie_ltssm_histogram[3]),</div><div class='add'>+	BNXT_PCIE_32B_ENTRY(pcie_tl_credit_nph_histogram[0], unused_1),</div><div class='add'>+	BNXT_PCIE_32B_ENTRY(pcie_rd_latency_histogram[0], unused_2),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bnxt_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='add'>+			  void *_p)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_pcie_qstats_output *resp;</div><div class='add'>+	struct hwrm_pcie_qstats_input *req;</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u8 *src;</div><div class='add'>+</div><div class='add'>+	regs-&gt;version = 0;</div><div class='add'>+	if (!(bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_REG_ACCESS_RESTRICTED))</div><div class='add'>+		bnxt_dbg_hwrm_rd_reg(bp, 0, BNXT_PXP_REG_LEN / 4, _p);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PCIE_STATS_SUPPORTED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_PCIE_QSTATS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	src = __bnxt_hwrm_pcie_qstats(bp, req);</div><div class='add'>+	if (src) {</div><div class='add'>+		u8 *dst = (u8 *)(_p + BNXT_PXP_REG_LEN);</div><div class='add'>+		int i, j, len;</div><div class='add'>+</div><div class='add'>+		len = min(bp-&gt;pcie_stat_len, le16_to_cpu(resp-&gt;pcie_stat_size));</div><div class='add'>+		if (len &lt;= sizeof(struct pcie_ctx_hw_stats))</div><div class='add'>+			regs-&gt;version = 1;</div><div class='add'>+		else if (len &lt; sizeof(struct pcie_ctx_hw_stats_v2))</div><div class='add'>+			regs-&gt;version = 2;</div><div class='add'>+		else</div><div class='add'>+			regs-&gt;version = 3;</div><div class='add'>+</div><div class='add'>+		for (i = 0, j = 0; i &lt; len; ) {</div><div class='add'>+			if (i &gt;= bnxt_pcie_32b_entries[j].start &amp;&amp;</div><div class='add'>+			    i &lt;= bnxt_pcie_32b_entries[j].end) {</div><div class='add'>+				u32 *dst32 = (u32 *)(dst + i);</div><div class='add'>+</div><div class='add'>+				*dst32 = le32_to_cpu(*(__le32 *)(src + i));</div><div class='add'>+				i += 4;</div><div class='add'>+				if (i &gt; bnxt_pcie_32b_entries[j].end &amp;&amp;</div><div class='add'>+				    j &lt; ARRAY_SIZE(bnxt_pcie_32b_entries) - 1)</div><div class='add'>+					j++;</div><div class='add'>+			} else {</div><div class='add'>+				u64 *dst64 = (u64 *)(dst + i);</div><div class='add'>+</div><div class='add'>+				*dst64 = le64_to_cpu(*(__le64 *)(src + i));</div><div class='add'>+				i += 8;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='hunk'>@@ -1228,136 +2201,628 @@ static int bnxt_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u32 _bnxt_fw_to_ethtool_adv_spds(u16 fw_speeds, u8 fw_pause)</div><div class='add'>+/* TODO: support 25GB, 40GB, 50GB with different cable type */</div><div class='add'>+void _bnxt_fw_to_linkmode(unsigned long *mode, u16 fw_speeds)</div><div class='ctx'> {</div><div class='del'>-	u32 speed_mask = 0;</div><div class='add'>+	linkmode_zero(mode);</div><div class='ctx'> </div><div class='del'>-	/* TODO: support 25GB, 40GB, 50GB with different cable type */</div><div class='del'>-	/* set the advertised speeds */</div><div class='ctx'> 	if (fw_speeds &amp; BNXT_LINK_SPEED_MSK_100MB)</div><div class='del'>-		speed_mask |= ADVERTISED_100baseT_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mode);</div><div class='ctx'> 	if (fw_speeds &amp; BNXT_LINK_SPEED_MSK_1GB)</div><div class='del'>-		speed_mask |= ADVERTISED_1000baseT_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, mode);</div><div class='ctx'> 	if (fw_speeds &amp; BNXT_LINK_SPEED_MSK_2_5GB)</div><div class='del'>-		speed_mask |= ADVERTISED_2500baseX_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT, mode);</div><div class='ctx'> 	if (fw_speeds &amp; BNXT_LINK_SPEED_MSK_10GB)</div><div class='del'>-		speed_mask |= ADVERTISED_10000baseT_Full;</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, mode);</div><div class='ctx'> 	if (fw_speeds &amp; BNXT_LINK_SPEED_MSK_40GB)</div><div class='del'>-		speed_mask |= ADVERTISED_40000baseCR4_Full;</div><div class='del'>-</div><div class='del'>-	if ((fw_pause &amp; BNXT_LINK_PAUSE_BOTH) == BNXT_LINK_PAUSE_BOTH)</div><div class='del'>-		speed_mask |= ADVERTISED_Pause;</div><div class='del'>-	else if (fw_pause &amp; BNXT_LINK_PAUSE_TX)</div><div class='del'>-		speed_mask |= ADVERTISED_Asym_Pause;</div><div class='del'>-	else if (fw_pause &amp; BNXT_LINK_PAUSE_RX)</div><div class='del'>-		speed_mask |= ADVERTISED_Pause | ADVERTISED_Asym_Pause;</div><div class='del'>-</div><div class='del'>-	return speed_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BNXT_FW_TO_ETHTOOL_SPDS(fw_speeds, fw_pause, lk_ksettings, name)\</div><div class='del'>-{									\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_100MB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     100baseT_Full);	\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_1GB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     1000baseT_Full);	\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_10GB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     10000baseT_Full);	\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_25GB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     25000baseCR_Full);	\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_40GB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     40000baseCR4_Full);\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_50GB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     50000baseCR2_Full);\</div><div class='del'>-	if ((fw_speeds) &amp; BNXT_LINK_SPEED_MSK_100GB)			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     100000baseCR4_Full);\</div><div class='del'>-	if ((fw_pause) &amp; BNXT_LINK_PAUSE_RX) {				\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     Pause);		\</div><div class='del'>-		if (!((fw_pause) &amp; BNXT_LINK_PAUSE_TX))			\</div><div class='del'>-			ethtool_link_ksettings_add_link_mode(		\</div><div class='del'>-					lk_ksettings, name, Asym_Pause);\</div><div class='del'>-	} else if ((fw_pause) &amp; BNXT_LINK_PAUSE_TX) {			\</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, name,\</div><div class='del'>-						     Asym_Pause);	\</div><div class='del'>-	}								\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BNXT_ETHTOOL_TO_FW_SPDS(fw_speeds, lk_ksettings, name)		\</div><div class='del'>-{									\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  100baseT_Full) ||	\</div><div class='del'>-	    ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  100baseT_Half))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_100MB;		\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  1000baseT_Full) ||	\</div><div class='del'>-	    ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  1000baseT_Half))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_1GB;			\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  10000baseT_Full))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_10GB;		\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  25000baseCR_Full))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_25GB;		\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  40000baseCR4_Full))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_40GB;		\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  50000baseCR2_Full))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_50GB;		\</div><div class='del'>-	if (ethtool_link_ksettings_test_link_mode(lk_ksettings, name,	\</div><div class='del'>-						  100000baseCR4_Full))	\</div><div class='del'>-		(fw_speeds) |= BNXT_LINK_SPEED_MSK_100GB;		\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bnxt_fw_to_ethtool_advertised_spds(struct bnxt_link_info *link_info,</div><div class='del'>-				struct ethtool_link_ksettings *lk_ksettings)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT, mode);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+enum bnxt_media_type {</div><div class='add'>+	BNXT_MEDIA_UNKNOWN = 0,</div><div class='add'>+	BNXT_MEDIA_TP,</div><div class='add'>+	BNXT_MEDIA_CR,</div><div class='add'>+	BNXT_MEDIA_SR,</div><div class='add'>+	BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	BNXT_MEDIA_KR,</div><div class='add'>+	BNXT_MEDIA_KX,</div><div class='add'>+	BNXT_MEDIA_X,</div><div class='add'>+	__BNXT_MEDIA_END,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const enum bnxt_media_type bnxt_phy_types[] = {</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASECR] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR4] =  BNXT_MEDIA_KR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASELR] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASESR] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR2] = BNXT_MEDIA_KR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKX] = BNXT_MEDIA_KX,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR] = BNXT_MEDIA_KR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASET] = BNXT_MEDIA_TP,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_BASETE] = BNXT_MEDIA_TP,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_L] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_S] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_N] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASESR] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR4] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR4] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR10] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASECR4] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASESR4] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASELR4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASEER4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_40G_ACTIVE_CABLE] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASET] = BNXT_MEDIA_TP,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASESX] = BNXT_MEDIA_X,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASECX] = BNXT_MEDIA_X,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASECR4] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASESR4] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASELR4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASECR] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASESR] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASELR] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_50G_BASEER] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR2] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR2] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR2] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER2] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASECR2] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASESR2] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASELR2] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER2] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASECR8] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASESR8] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASELR8] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASEER8] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASECR4] = BNXT_MEDIA_CR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASESR4] = BNXT_MEDIA_SR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASELR4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+	[PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASEER4] = BNXT_MEDIA_LR_ER_FR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum bnxt_media_type</div><div class='add'>+bnxt_get_media(struct bnxt_link_info *link_info)</div><div class='ctx'> {</div><div class='del'>-	u16 fw_speeds = link_info-&gt;advertising;</div><div class='del'>-	u8 fw_pause = 0;</div><div class='add'>+	switch (link_info-&gt;media_type) {</div><div class='add'>+	case PORT_PHY_QCFG_RESP_MEDIA_TYPE_TP:</div><div class='add'>+		return BNXT_MEDIA_TP;</div><div class='add'>+	case PORT_PHY_QCFG_RESP_MEDIA_TYPE_DAC:</div><div class='add'>+		return BNXT_MEDIA_CR;</div><div class='add'>+	default:</div><div class='add'>+		if (link_info-&gt;phy_type &lt; ARRAY_SIZE(bnxt_phy_types))</div><div class='add'>+			return bnxt_phy_types[link_info-&gt;phy_type];</div><div class='add'>+		return BNXT_MEDIA_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (link_info-&gt;autoneg &amp; BNXT_AUTONEG_FLOW_CTRL)</div><div class='del'>-		fw_pause = link_info-&gt;auto_pause_setting;</div><div class='add'>+enum bnxt_link_speed_indices {</div><div class='add'>+	BNXT_LINK_SPEED_UNKNOWN = 0,</div><div class='add'>+	BNXT_LINK_SPEED_100MB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_1GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_10GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_25GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_40GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_50GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_100GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_200GB_IDX,</div><div class='add'>+	BNXT_LINK_SPEED_400GB_IDX,</div><div class='add'>+	__BNXT_LINK_SPEED_END</div><div class='add'>+};</div><div class='ctx'> </div><div class='del'>-	BNXT_FW_TO_ETHTOOL_SPDS(fw_speeds, fw_pause, lk_ksettings, advertising);</div><div class='add'>+static enum bnxt_link_speed_indices bnxt_fw_speed_idx(u16 speed)</div><div class='add'>+{</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case BNXT_LINK_SPEED_100MB: return BNXT_LINK_SPEED_100MB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_1GB: return BNXT_LINK_SPEED_1GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_10GB: return BNXT_LINK_SPEED_10GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_25GB: return BNXT_LINK_SPEED_25GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_40GB: return BNXT_LINK_SPEED_40GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_50GB:</div><div class='add'>+	case BNXT_LINK_SPEED_50GB_PAM4:</div><div class='add'>+		return BNXT_LINK_SPEED_50GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_100GB:</div><div class='add'>+	case BNXT_LINK_SPEED_100GB_PAM4:</div><div class='add'>+	case BNXT_LINK_SPEED_100GB_PAM4_112:</div><div class='add'>+		return BNXT_LINK_SPEED_100GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_200GB:</div><div class='add'>+	case BNXT_LINK_SPEED_200GB_PAM4:</div><div class='add'>+	case BNXT_LINK_SPEED_200GB_PAM4_112:</div><div class='add'>+		return BNXT_LINK_SPEED_200GB_IDX;</div><div class='add'>+	case BNXT_LINK_SPEED_400GB:</div><div class='add'>+	case BNXT_LINK_SPEED_400GB_PAM4:</div><div class='add'>+	case BNXT_LINK_SPEED_400GB_PAM4_112:</div><div class='add'>+		return BNXT_LINK_SPEED_400GB_IDX;</div><div class='add'>+	default: return BNXT_LINK_SPEED_UNKNOWN;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_fw_to_ethtool_lp_adv(struct bnxt_link_info *link_info,</div><div class='add'>+static const enum ethtool_link_mode_bit_indices</div><div class='add'>+bnxt_link_modes[__BNXT_LINK_SPEED_END][BNXT_SIG_MODE_MAX][__BNXT_MEDIA_END] = {</div><div class='add'>+	[BNXT_LINK_SPEED_100MB_IDX] = {</div><div class='add'>+		{</div><div class='add'>+			[BNXT_MEDIA_TP] = ETHTOOL_LINK_MODE_100baseT_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_1GB_IDX] = {</div><div class='add'>+		{</div><div class='add'>+			[BNXT_MEDIA_TP] = ETHTOOL_LINK_MODE_1000baseT_Full_BIT,</div><div class='add'>+			/* historically baseT, but DAC is more correctly baseX */</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_1000baseX_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KX] = ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_X] = ETHTOOL_LINK_MODE_1000baseX_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_10GB_IDX] = {</div><div class='add'>+		{</div><div class='add'>+			[BNXT_MEDIA_TP] = ETHTOOL_LINK_MODE_10000baseT_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_10000baseCR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KX] = ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_25GB_IDX] = {</div><div class='add'>+		{</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_25000baseCR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_25000baseSR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_25000baseKR_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_40GB_IDX] = {</div><div class='add'>+		{</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_40000baseSR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_40000baseLR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_50GB_IDX] = {</div><div class='add'>+		[BNXT_SIG_MODE_NRZ] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_50000baseSR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+		[BNXT_SIG_MODE_PAM4] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_50000baseCR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_50000baseSR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_50000baseKR_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_100GB_IDX] = {</div><div class='add'>+		[BNXT_SIG_MODE_NRZ] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_100000baseSR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+		[BNXT_SIG_MODE_PAM4] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+		[BNXT_SIG_MODE_PAM4_112] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_100000baseCR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_100000baseSR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_100000baseKR_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_200GB_IDX] = {</div><div class='add'>+		[BNXT_SIG_MODE_PAM4] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+		[BNXT_SIG_MODE_PAM4_112] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	[BNXT_LINK_SPEED_400GB_IDX] = {</div><div class='add'>+		[BNXT_SIG_MODE_PAM4] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_400000baseKR8_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_400000baseSR8_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+		[BNXT_SIG_MODE_PAM4_112] = {</div><div class='add'>+			[BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT,</div><div class='add'>+			[BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT,</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_LINK_MODE_UNKNOWN -1</div><div class='add'>+</div><div class='add'>+static enum ethtool_link_mode_bit_indices</div><div class='add'>+bnxt_get_link_mode(struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	enum ethtool_link_mode_bit_indices link_mode;</div><div class='add'>+	enum bnxt_link_speed_indices speed;</div><div class='add'>+	enum bnxt_media_type media;</div><div class='add'>+	u8 sig_mode;</div><div class='add'>+</div><div class='add'>+	if (link_info-&gt;phy_link_status != BNXT_LINK_LINK)</div><div class='add'>+		return BNXT_LINK_MODE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	media = bnxt_get_media(link_info);</div><div class='add'>+	if (BNXT_AUTO_MODE(link_info-&gt;auto_mode)) {</div><div class='add'>+		speed = bnxt_fw_speed_idx(link_info-&gt;link_speed);</div><div class='add'>+		sig_mode = link_info-&gt;active_fec_sig_mode &amp;</div><div class='add'>+			PORT_PHY_QCFG_RESP_SIGNAL_MODE_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		speed = bnxt_fw_speed_idx(link_info-&gt;req_link_speed);</div><div class='add'>+		sig_mode = link_info-&gt;req_signal_mode;</div><div class='add'>+	}</div><div class='add'>+	if (sig_mode &gt;= BNXT_SIG_MODE_MAX)</div><div class='add'>+		return BNXT_LINK_MODE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	/* Note ETHTOOL_LINK_MODE_10baseT_Half_BIT == 0 is a legal Linux</div><div class='add'>+	 * link mode, but since no such devices exist, the zeroes in the</div><div class='add'>+	 * map can be conveniently used to represent unknown link modes.</div><div class='add'>+	 */</div><div class='add'>+	link_mode = bnxt_link_modes[speed][sig_mode][media];</div><div class='add'>+	if (!link_mode)</div><div class='add'>+		return BNXT_LINK_MODE_UNKNOWN;</div><div class='add'>+</div><div class='add'>+	switch (link_mode) {</div><div class='add'>+	case ETHTOOL_LINK_MODE_100baseT_Full_BIT:</div><div class='add'>+		if (~link_info-&gt;duplex &amp; BNXT_LINK_DUPLEX_FULL)</div><div class='add'>+			link_mode = ETHTOOL_LINK_MODE_100baseT_Half_BIT;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_LINK_MODE_1000baseT_Full_BIT:</div><div class='add'>+		if (~link_info-&gt;duplex &amp; BNXT_LINK_DUPLEX_FULL)</div><div class='add'>+			link_mode = ETHTOOL_LINK_MODE_1000baseT_Half_BIT;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return link_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_ethtool_modes(struct bnxt_link_info *link_info,</div><div class='add'>+				   struct ethtool_link_ksettings *lk_ksettings)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;phy_flags &amp; BNXT_PHY_FL_NO_PAUSE)) {</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_info-&gt;support_auto_speeds || link_info-&gt;support_auto_speeds2 ||</div><div class='add'>+	    link_info-&gt;support_pam4_auto_speeds)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+</div><div class='add'>+	if (~link_info-&gt;autoneg &amp; BNXT_AUTONEG_FLOW_CTRL)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (link_info-&gt;auto_pause_setting &amp; BNXT_LINK_PAUSE_RX)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	if (hweight8(link_info-&gt;auto_pause_setting &amp; BNXT_LINK_PAUSE_BOTH) == 1)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	if (link_info-&gt;lp_pause &amp; BNXT_LINK_PAUSE_RX)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.lp_advertising);</div><div class='add'>+	if (hweight8(link_info-&gt;lp_pause &amp; BNXT_LINK_PAUSE_BOTH) == 1)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.lp_advertising);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const u16 bnxt_nrz_speed_masks[] = {</div><div class='add'>+	[BNXT_LINK_SPEED_100MB_IDX] = BNXT_LINK_SPEED_MSK_100MB,</div><div class='add'>+	[BNXT_LINK_SPEED_1GB_IDX] = BNXT_LINK_SPEED_MSK_1GB,</div><div class='add'>+	[BNXT_LINK_SPEED_10GB_IDX] = BNXT_LINK_SPEED_MSK_10GB,</div><div class='add'>+	[BNXT_LINK_SPEED_25GB_IDX] = BNXT_LINK_SPEED_MSK_25GB,</div><div class='add'>+	[BNXT_LINK_SPEED_40GB_IDX] = BNXT_LINK_SPEED_MSK_40GB,</div><div class='add'>+	[BNXT_LINK_SPEED_50GB_IDX] = BNXT_LINK_SPEED_MSK_50GB,</div><div class='add'>+	[BNXT_LINK_SPEED_100GB_IDX] = BNXT_LINK_SPEED_MSK_100GB,</div><div class='add'>+	[__BNXT_LINK_SPEED_END - 1] = 0 /* make any legal speed a valid index */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 bnxt_pam4_speed_masks[] = {</div><div class='add'>+	[BNXT_LINK_SPEED_50GB_IDX] = BNXT_LINK_PAM4_SPEED_MSK_50GB,</div><div class='add'>+	[BNXT_LINK_SPEED_100GB_IDX] = BNXT_LINK_PAM4_SPEED_MSK_100GB,</div><div class='add'>+	[BNXT_LINK_SPEED_200GB_IDX] = BNXT_LINK_PAM4_SPEED_MSK_200GB,</div><div class='add'>+	[__BNXT_LINK_SPEED_END - 1] = 0 /* make any legal speed a valid index */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 bnxt_nrz_speeds2_masks[] = {</div><div class='add'>+	[BNXT_LINK_SPEED_1GB_IDX] = BNXT_LINK_SPEEDS2_MSK_1GB,</div><div class='add'>+	[BNXT_LINK_SPEED_10GB_IDX] = BNXT_LINK_SPEEDS2_MSK_10GB,</div><div class='add'>+	[BNXT_LINK_SPEED_25GB_IDX] = BNXT_LINK_SPEEDS2_MSK_25GB,</div><div class='add'>+	[BNXT_LINK_SPEED_40GB_IDX] = BNXT_LINK_SPEEDS2_MSK_40GB,</div><div class='add'>+	[BNXT_LINK_SPEED_50GB_IDX] = BNXT_LINK_SPEEDS2_MSK_50GB,</div><div class='add'>+	[BNXT_LINK_SPEED_100GB_IDX] = BNXT_LINK_SPEEDS2_MSK_100GB,</div><div class='add'>+	[__BNXT_LINK_SPEED_END - 1] = 0 /* make any legal speed a valid index */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 bnxt_pam4_speeds2_masks[] = {</div><div class='add'>+	[BNXT_LINK_SPEED_50GB_IDX] = BNXT_LINK_SPEEDS2_MSK_50GB_PAM4,</div><div class='add'>+	[BNXT_LINK_SPEED_100GB_IDX] = BNXT_LINK_SPEEDS2_MSK_100GB_PAM4,</div><div class='add'>+	[BNXT_LINK_SPEED_200GB_IDX] = BNXT_LINK_SPEEDS2_MSK_200GB_PAM4,</div><div class='add'>+	[BNXT_LINK_SPEED_400GB_IDX] = BNXT_LINK_SPEEDS2_MSK_400GB_PAM4,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u16 bnxt_pam4_112_speeds2_masks[] = {</div><div class='add'>+	[BNXT_LINK_SPEED_100GB_IDX] = BNXT_LINK_SPEEDS2_MSK_100GB_PAM4_112,</div><div class='add'>+	[BNXT_LINK_SPEED_200GB_IDX] = BNXT_LINK_SPEEDS2_MSK_200GB_PAM4_112,</div><div class='add'>+	[BNXT_LINK_SPEED_400GB_IDX] = BNXT_LINK_SPEEDS2_MSK_400GB_PAM4_112,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static enum bnxt_link_speed_indices</div><div class='add'>+bnxt_encoding_speed_idx(u8 sig_mode, u16 phy_flags, u16 speed_msk)</div><div class='add'>+{</div><div class='add'>+	const u16 *speeds;</div><div class='add'>+	int idx, len;</div><div class='add'>+</div><div class='add'>+	switch (sig_mode) {</div><div class='add'>+	case BNXT_SIG_MODE_NRZ:</div><div class='add'>+		if (phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+			speeds = bnxt_nrz_speeds2_masks;</div><div class='add'>+			len = ARRAY_SIZE(bnxt_nrz_speeds2_masks);</div><div class='add'>+		} else {</div><div class='add'>+			speeds = bnxt_nrz_speed_masks;</div><div class='add'>+			len = ARRAY_SIZE(bnxt_nrz_speed_masks);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case BNXT_SIG_MODE_PAM4:</div><div class='add'>+		if (phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+			speeds = bnxt_pam4_speeds2_masks;</div><div class='add'>+			len = ARRAY_SIZE(bnxt_pam4_speeds2_masks);</div><div class='add'>+		} else {</div><div class='add'>+			speeds = bnxt_pam4_speed_masks;</div><div class='add'>+			len = ARRAY_SIZE(bnxt_pam4_speed_masks);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case BNXT_SIG_MODE_PAM4_112:</div><div class='add'>+		speeds = bnxt_pam4_112_speeds2_masks;</div><div class='add'>+		len = ARRAY_SIZE(bnxt_pam4_112_speeds2_masks);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return BNXT_LINK_SPEED_UNKNOWN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (idx = 0; idx &lt; len; idx++) {</div><div class='add'>+		if (speeds[idx] == speed_msk)</div><div class='add'>+			return idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return BNXT_LINK_SPEED_UNKNOWN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNXT_FW_SPEED_MSK_BITS 16</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__bnxt_get_ethtool_speeds(unsigned long fw_mask, enum bnxt_media_type media,</div><div class='add'>+			  u8 sig_mode, u16 phy_flags, unsigned long *et_mask)</div><div class='add'>+{</div><div class='add'>+	enum ethtool_link_mode_bit_indices link_mode;</div><div class='add'>+	enum bnxt_link_speed_indices speed;</div><div class='add'>+	u8 bit;</div><div class='add'>+</div><div class='add'>+	for_each_set_bit(bit, &amp;fw_mask, BNXT_FW_SPEED_MSK_BITS) {</div><div class='add'>+		speed = bnxt_encoding_speed_idx(sig_mode, phy_flags, 1 &lt;&lt; bit);</div><div class='add'>+		if (!speed)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		link_mode = bnxt_link_modes[speed][sig_mode][media];</div><div class='add'>+		if (!link_mode)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		linkmode_set_bit(link_mode, et_mask);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_get_ethtool_speeds(unsigned long fw_mask, enum bnxt_media_type media,</div><div class='add'>+			u8 sig_mode, u16 phy_flags, unsigned long *et_mask)</div><div class='add'>+{</div><div class='add'>+	if (media) {</div><div class='add'>+		__bnxt_get_ethtool_speeds(fw_mask, media, sig_mode, phy_flags,</div><div class='add'>+					  et_mask);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* list speeds for all media if unknown */</div><div class='add'>+	for (media = 1; media &lt; __BNXT_MEDIA_END; media++)</div><div class='add'>+		__bnxt_get_ethtool_speeds(fw_mask, media, sig_mode, phy_flags,</div><div class='add'>+					  et_mask);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_get_all_ethtool_support_speeds(struct bnxt_link_info *link_info,</div><div class='add'>+				    enum bnxt_media_type media,</div><div class='add'>+				    struct ethtool_link_ksettings *lk_ksettings)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+	u16 sp_nrz, sp_pam4, sp_pam4_112 = 0;</div><div class='add'>+	u16 phy_flags = bp-&gt;phy_flags;</div><div class='add'>+</div><div class='add'>+	if (phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		sp_nrz = link_info-&gt;support_speeds2;</div><div class='add'>+		sp_pam4 = link_info-&gt;support_speeds2;</div><div class='add'>+		sp_pam4_112 = link_info-&gt;support_speeds2;</div><div class='add'>+	} else {</div><div class='add'>+		sp_nrz = link_info-&gt;support_speeds;</div><div class='add'>+		sp_pam4 = link_info-&gt;support_pam4_speeds;</div><div class='add'>+	}</div><div class='add'>+	bnxt_get_ethtool_speeds(sp_nrz, media, BNXT_SIG_MODE_NRZ, phy_flags,</div><div class='add'>+				lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+	bnxt_get_ethtool_speeds(sp_pam4, media, BNXT_SIG_MODE_PAM4, phy_flags,</div><div class='add'>+				lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+	bnxt_get_ethtool_speeds(sp_pam4_112, media, BNXT_SIG_MODE_PAM4_112,</div><div class='add'>+				phy_flags, lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_get_all_ethtool_adv_speeds(struct bnxt_link_info *link_info,</div><div class='add'>+				enum bnxt_media_type media,</div><div class='ctx'> 				struct ethtool_link_ksettings *lk_ksettings)</div><div class='ctx'> {</div><div class='del'>-	u16 fw_speeds = link_info-&gt;lp_auto_link_speeds;</div><div class='del'>-	u8 fw_pause = 0;</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+	u16 sp_nrz, sp_pam4, sp_pam4_112 = 0;</div><div class='add'>+	u16 phy_flags = bp-&gt;phy_flags;</div><div class='add'>+</div><div class='add'>+	sp_nrz = link_info-&gt;advertising;</div><div class='add'>+	if (phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		sp_pam4 = link_info-&gt;advertising;</div><div class='add'>+		sp_pam4_112 = link_info-&gt;advertising;</div><div class='add'>+	} else {</div><div class='add'>+		sp_pam4 = link_info-&gt;advertising_pam4;</div><div class='add'>+	}</div><div class='add'>+	bnxt_get_ethtool_speeds(sp_nrz, media, BNXT_SIG_MODE_NRZ, phy_flags,</div><div class='add'>+				lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	bnxt_get_ethtool_speeds(sp_pam4, media, BNXT_SIG_MODE_PAM4, phy_flags,</div><div class='add'>+				lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	bnxt_get_ethtool_speeds(sp_pam4_112, media, BNXT_SIG_MODE_PAM4_112,</div><div class='add'>+				phy_flags, lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+bnxt_get_all_ethtool_lp_speeds(struct bnxt_link_info *link_info,</div><div class='add'>+			       enum bnxt_media_type media,</div><div class='add'>+			       struct ethtool_link_ksettings *lk_ksettings)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+	u16 phy_flags = bp-&gt;phy_flags;</div><div class='add'>+</div><div class='add'>+	bnxt_get_ethtool_speeds(link_info-&gt;lp_auto_link_speeds, media,</div><div class='add'>+				BNXT_SIG_MODE_NRZ, phy_flags,</div><div class='add'>+				lk_ksettings-&gt;link_modes.lp_advertising);</div><div class='add'>+	bnxt_get_ethtool_speeds(link_info-&gt;lp_auto_pam4_link_speeds, media,</div><div class='add'>+				BNXT_SIG_MODE_PAM4, phy_flags,</div><div class='add'>+				lk_ksettings-&gt;link_modes.lp_advertising);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (link_info-&gt;autoneg &amp; BNXT_AUTONEG_FLOW_CTRL)</div><div class='del'>-		fw_pause = link_info-&gt;lp_pause;</div><div class='add'>+static void bnxt_update_speed(u32 *delta, bool installed_media, u16 *speeds,</div><div class='add'>+			      u16 speed_msk, const unsigned long *et_mask,</div><div class='add'>+			      enum ethtool_link_mode_bit_indices mode)</div><div class='add'>+{</div><div class='add'>+	bool mode_desired = linkmode_test_bit(mode, et_mask);</div><div class='ctx'> </div><div class='del'>-	BNXT_FW_TO_ETHTOOL_SPDS(fw_speeds, fw_pause, lk_ksettings,</div><div class='del'>-				lp_advertising);</div><div class='add'>+	if (!mode)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* enabled speeds for installed media should override */</div><div class='add'>+	if (installed_media &amp;&amp; mode_desired) {</div><div class='add'>+		*speeds |= speed_msk;</div><div class='add'>+		*delta |= speed_msk;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* many to one mapping, only allow one change per fw_speed bit */</div><div class='add'>+	if (!(*delta &amp; speed_msk) &amp;&amp; (mode_desired == !(*speeds &amp; speed_msk))) {</div><div class='add'>+		*speeds ^= speed_msk;</div><div class='add'>+		*delta |= speed_msk;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_ethtool_speeds(struct bnxt_link_info *link_info,</div><div class='add'>+				    const unsigned long *et_mask)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = container_of(link_info, struct bnxt, link_info);</div><div class='add'>+	u16 const *sp_msks, *sp_pam4_msks, *sp_pam4_112_msks;</div><div class='add'>+	enum bnxt_media_type media = bnxt_get_media(link_info);</div><div class='add'>+	u16 *adv, *adv_pam4, *adv_pam4_112 = NULL;</div><div class='add'>+	u32 delta_pam4_112 = 0;</div><div class='add'>+	u32 delta_pam4 = 0;</div><div class='add'>+	u32 delta_nrz = 0;</div><div class='add'>+	int i, m;</div><div class='add'>+</div><div class='add'>+	adv = &amp;link_info-&gt;advertising;</div><div class='add'>+	if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_SPEEDS2) {</div><div class='add'>+		adv_pam4 = &amp;link_info-&gt;advertising;</div><div class='add'>+		adv_pam4_112 = &amp;link_info-&gt;advertising;</div><div class='add'>+		sp_msks = bnxt_nrz_speeds2_masks;</div><div class='add'>+		sp_pam4_msks = bnxt_pam4_speeds2_masks;</div><div class='add'>+		sp_pam4_112_msks = bnxt_pam4_112_speeds2_masks;</div><div class='add'>+	} else {</div><div class='add'>+		adv_pam4 = &amp;link_info-&gt;advertising_pam4;</div><div class='add'>+		sp_msks = bnxt_nrz_speed_masks;</div><div class='add'>+		sp_pam4_msks = bnxt_pam4_speed_masks;</div><div class='add'>+	}</div><div class='add'>+	for (i = 1; i &lt; __BNXT_LINK_SPEED_END; i++) {</div><div class='add'>+		/* accept any legal media from user */</div><div class='add'>+		for (m = 1; m &lt; __BNXT_MEDIA_END; m++) {</div><div class='add'>+			bnxt_update_speed(&amp;delta_nrz, m == media,</div><div class='add'>+					  adv, sp_msks[i], et_mask,</div><div class='add'>+					  bnxt_link_modes[i][BNXT_SIG_MODE_NRZ][m]);</div><div class='add'>+			bnxt_update_speed(&amp;delta_pam4, m == media,</div><div class='add'>+					  adv_pam4, sp_pam4_msks[i], et_mask,</div><div class='add'>+					  bnxt_link_modes[i][BNXT_SIG_MODE_PAM4][m]);</div><div class='add'>+			if (!adv_pam4_112)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			bnxt_update_speed(&amp;delta_pam4_112, m == media,</div><div class='add'>+					  adv_pam4_112, sp_pam4_112_msks[i], et_mask,</div><div class='add'>+					  bnxt_link_modes[i][BNXT_SIG_MODE_PAM4_112][m]);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_fw_to_ethtool_support_spds(struct bnxt_link_info *link_info,</div><div class='add'>+static void bnxt_fw_to_ethtool_advertised_fec(struct bnxt_link_info *link_info,</div><div class='ctx'> 				struct ethtool_link_ksettings *lk_ksettings)</div><div class='ctx'> {</div><div class='del'>-	u16 fw_speeds = link_info-&gt;support_speeds;</div><div class='add'>+	u16 fec_cfg = link_info-&gt;fec_cfg;</div><div class='ctx'> </div><div class='del'>-	BNXT_FW_TO_ETHTOOL_SPDS(fw_speeds, 0, lk_ksettings, supported);</div><div class='add'>+	if ((fec_cfg &amp; BNXT_FEC_NONE) || !(fec_cfg &amp; BNXT_FEC_AUTONEG)) {</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_BASE_R)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_BASER_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_RS)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_LLRS)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_LLRS_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ethtool_link_ksettings_add_link_mode(lk_ksettings, supported, Pause);</div><div class='del'>-	ethtool_link_ksettings_add_link_mode(lk_ksettings, supported,</div><div class='del'>-					     Asym_Pause);</div><div class='add'>+static void bnxt_fw_to_ethtool_support_fec(struct bnxt_link_info *link_info,</div><div class='add'>+				struct ethtool_link_ksettings *lk_ksettings)</div><div class='add'>+{</div><div class='add'>+	u16 fec_cfg = link_info-&gt;fec_cfg;</div><div class='ctx'> </div><div class='del'>-	if (link_info-&gt;support_auto_speeds)</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, supported,</div><div class='del'>-						     Autoneg);</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_NONE) {</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_NONE_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_BASE_R_CAP)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_BASER_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_RS_CAP)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_RS_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_LLRS_CAP)</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FEC_LLRS_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed)</div><div class='hunk'>@@ -1378,68 +2843,105 @@ u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed)</div><div class='ctx'> 	case BNXT_LINK_SPEED_40GB:</div><div class='ctx'> 		return SPEED_40000;</div><div class='ctx'> 	case BNXT_LINK_SPEED_50GB:</div><div class='add'>+	case BNXT_LINK_SPEED_50GB_PAM4:</div><div class='ctx'> 		return SPEED_50000;</div><div class='ctx'> 	case BNXT_LINK_SPEED_100GB:</div><div class='add'>+	case BNXT_LINK_SPEED_100GB_PAM4:</div><div class='add'>+	case BNXT_LINK_SPEED_100GB_PAM4_112:</div><div class='ctx'> 		return SPEED_100000;</div><div class='add'>+	case BNXT_LINK_SPEED_200GB:</div><div class='add'>+	case BNXT_LINK_SPEED_200GB_PAM4:</div><div class='add'>+	case BNXT_LINK_SPEED_200GB_PAM4_112:</div><div class='add'>+		return SPEED_200000;</div><div class='add'>+	case BNXT_LINK_SPEED_400GB:</div><div class='add'>+	case BNXT_LINK_SPEED_400GB_PAM4:</div><div class='add'>+	case BNXT_LINK_SPEED_400GB_PAM4_112:</div><div class='add'>+		return SPEED_400000;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return SPEED_UNKNOWN;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_get_default_speeds(struct ethtool_link_ksettings *lk_ksettings,</div><div class='add'>+				    struct bnxt_link_info *link_info)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_link_settings *base = &amp;lk_ksettings-&gt;base;</div><div class='add'>+</div><div class='add'>+	if (link_info-&gt;link_state == BNXT_LINK_STATE_UP) {</div><div class='add'>+		base-&gt;speed = bnxt_fw_to_ethtool_speed(link_info-&gt;link_speed);</div><div class='add'>+		base-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+		if (link_info-&gt;duplex &amp; BNXT_LINK_DUPLEX_FULL)</div><div class='add'>+			base-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+		lk_ksettings-&gt;lanes = link_info-&gt;active_lanes;</div><div class='add'>+	} else if (!link_info-&gt;autoneg) {</div><div class='add'>+		base-&gt;speed = bnxt_fw_to_ethtool_speed(link_info-&gt;req_link_speed);</div><div class='add'>+		base-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+		if (link_info-&gt;req_duplex == BNXT_LINK_DUPLEX_FULL)</div><div class='add'>+			base-&gt;duplex = DUPLEX_FULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 				   struct ethtool_link_ksettings *lk_ksettings)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> 	struct ethtool_link_settings *base = &amp;lk_ksettings-&gt;base;</div><div class='del'>-	u32 ethtool_speed;</div><div class='add'>+	enum ethtool_link_mode_bit_indices link_mode;</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_link_info *link_info;</div><div class='add'>+	enum bnxt_media_type media;</div><div class='ctx'> </div><div class='add'>+	ethtool_link_ksettings_zero_link_mode(lk_ksettings, lp_advertising);</div><div class='add'>+	ethtool_link_ksettings_zero_link_mode(lk_ksettings, advertising);</div><div class='ctx'> 	ethtool_link_ksettings_zero_link_mode(lk_ksettings, supported);</div><div class='add'>+	base-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='add'>+	base-&gt;speed = SPEED_UNKNOWN;</div><div class='add'>+	link_info = &amp;bp-&gt;link_info;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;bp-&gt;link_lock);</div><div class='del'>-	bnxt_fw_to_ethtool_support_spds(link_info, lk_ksettings);</div><div class='add'>+	bnxt_get_ethtool_modes(link_info, lk_ksettings);</div><div class='add'>+	media = bnxt_get_media(link_info);</div><div class='add'>+	bnxt_get_all_ethtool_support_speeds(link_info, media, lk_ksettings);</div><div class='add'>+	bnxt_fw_to_ethtool_support_fec(link_info, lk_ksettings);</div><div class='add'>+	link_mode = bnxt_get_link_mode(link_info);</div><div class='add'>+	if (link_mode != BNXT_LINK_MODE_UNKNOWN)</div><div class='add'>+		ethtool_params_from_link_mode(lk_ksettings, link_mode);</div><div class='add'>+	else</div><div class='add'>+		bnxt_get_default_speeds(lk_ksettings, link_info);</div><div class='ctx'> </div><div class='del'>-	ethtool_link_ksettings_zero_link_mode(lk_ksettings, advertising);</div><div class='ctx'> 	if (link_info-&gt;autoneg) {</div><div class='del'>-		bnxt_fw_to_ethtool_advertised_spds(link_info, lk_ksettings);</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings,</div><div class='del'>-						     advertising, Autoneg);</div><div class='add'>+		bnxt_fw_to_ethtool_advertised_fec(link_info, lk_ksettings);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='ctx'> 		base-&gt;autoneg = AUTONEG_ENABLE;</div><div class='add'>+		bnxt_get_all_ethtool_adv_speeds(link_info, media, lk_ksettings);</div><div class='ctx'> 		if (link_info-&gt;phy_link_status == BNXT_LINK_LINK)</div><div class='del'>-			bnxt_fw_to_ethtool_lp_adv(link_info, lk_ksettings);</div><div class='del'>-		ethtool_speed = bnxt_fw_to_ethtool_speed(link_info-&gt;link_speed);</div><div class='del'>-		if (!netif_carrier_ok(dev))</div><div class='del'>-			base-&gt;duplex = DUPLEX_UNKNOWN;</div><div class='del'>-		else if (link_info-&gt;duplex &amp; BNXT_LINK_DUPLEX_FULL)</div><div class='del'>-			base-&gt;duplex = DUPLEX_FULL;</div><div class='del'>-		else</div><div class='del'>-			base-&gt;duplex = DUPLEX_HALF;</div><div class='add'>+			bnxt_get_all_ethtool_lp_speeds(link_info, media,</div><div class='add'>+						       lk_ksettings);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		base-&gt;autoneg = AUTONEG_DISABLE;</div><div class='del'>-		ethtool_speed =</div><div class='del'>-			bnxt_fw_to_ethtool_speed(link_info-&gt;req_link_speed);</div><div class='del'>-		base-&gt;duplex = DUPLEX_HALF;</div><div class='del'>-		if (link_info-&gt;req_duplex == BNXT_LINK_DUPLEX_FULL)</div><div class='del'>-			base-&gt;duplex = DUPLEX_FULL;</div><div class='ctx'> 	}</div><div class='del'>-	base-&gt;speed = ethtool_speed;</div><div class='ctx'> </div><div class='ctx'> 	base-&gt;port = PORT_NONE;</div><div class='del'>-	if (link_info-&gt;media_type == PORT_PHY_QCFG_RESP_MEDIA_TYPE_TP) {</div><div class='add'>+	if (media == BNXT_MEDIA_TP) {</div><div class='ctx'> 		base-&gt;port = PORT_TP;</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, supported,</div><div class='del'>-						     TP);</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, advertising,</div><div class='del'>-						     TP);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_TP_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_TP_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='add'>+	} else if (media == BNXT_MEDIA_KR) {</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_Backplane_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='ctx'> 	} else {</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, supported,</div><div class='del'>-						     FIBRE);</div><div class='del'>-		ethtool_link_ksettings_add_link_mode(lk_ksettings, advertising,</div><div class='del'>-						     FIBRE);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT,</div><div class='add'>+				 lk_ksettings-&gt;link_modes.advertising);</div><div class='ctx'> </div><div class='del'>-		if (link_info-&gt;media_type == PORT_PHY_QCFG_RESP_MEDIA_TYPE_DAC)</div><div class='add'>+		if (media == BNXT_MEDIA_CR)</div><div class='ctx'> 			base-&gt;port = PORT_DA;</div><div class='del'>-		else if (link_info-&gt;media_type ==</div><div class='del'>-			 PORT_PHY_QCFG_RESP_MEDIA_TYPE_FIBRE)</div><div class='add'>+		else</div><div class='ctx'> 			base-&gt;port = PORT_FIBRE;</div><div class='ctx'> 	}</div><div class='ctx'> 	base-&gt;phy_address = link_info-&gt;phy_addr;</div><div class='hunk'>@@ -1448,74 +2950,160 @@ static int bnxt_get_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 bnxt_get_fw_speed(struct net_device *dev, u32 ethtool_speed)</div><div class='add'>+static int</div><div class='add'>+bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='add'>+	u16 support_pam4_spds = link_info-&gt;support_pam4_speeds;</div><div class='add'>+	u16 support_spds2 = link_info-&gt;support_speeds2;</div><div class='ctx'> 	u16 support_spds = link_info-&gt;support_speeds;</div><div class='del'>-	u32 fw_speed = 0;</div><div class='add'>+	u8 sig_mode = BNXT_SIG_MODE_NRZ;</div><div class='add'>+	u32 lanes_needed = 1;</div><div class='add'>+	u16 fw_speed = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (ethtool_speed) {</div><div class='ctx'> 	case SPEED_100:</div><div class='ctx'> 		if (support_spds &amp; BNXT_LINK_SPEED_MSK_100MB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_100MB;</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100MB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_1000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_1GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_1GB;</div><div class='add'>+		if ((support_spds &amp; BNXT_LINK_SPEED_MSK_1GB) ||</div><div class='add'>+		    (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_1GB))</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_2500:</div><div class='ctx'> 		if (support_spds &amp; BNXT_LINK_SPEED_MSK_2_5GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_2_5GB;</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_2_5GB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_10000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_10GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10GB;</div><div class='add'>+		if ((support_spds &amp; BNXT_LINK_SPEED_MSK_10GB) ||</div><div class='add'>+		    (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_10GB))</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_20000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_20GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_20GB;</div><div class='add'>+		if (support_spds &amp; BNXT_LINK_SPEED_MSK_20GB) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_20GB;</div><div class='add'>+			lanes_needed = 2;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_25000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_25GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_25GB;</div><div class='add'>+		if ((support_spds &amp; BNXT_LINK_SPEED_MSK_25GB) ||</div><div class='add'>+		    (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_25GB))</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_25GB;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_40000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_40GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_40GB;</div><div class='add'>+		if ((support_spds &amp; BNXT_LINK_SPEED_MSK_40GB) ||</div><div class='add'>+		    (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_40GB)) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_40GB;</div><div class='add'>+			lanes_needed = 4;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_50000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_50GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_50GB;</div><div class='add'>+		if (((support_spds &amp; BNXT_LINK_SPEED_MSK_50GB) ||</div><div class='add'>+		     (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_50GB)) &amp;&amp;</div><div class='add'>+		    lanes != 1) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_50GB;</div><div class='add'>+			lanes_needed = 2;</div><div class='add'>+		} else if (support_pam4_spds &amp; BNXT_LINK_PAM4_SPEED_MSK_50GB) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_50GB;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+		} else if (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_50GB_PAM4) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_50GB_PAM4;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SPEED_100000:</div><div class='del'>-		if (support_spds &amp; BNXT_LINK_SPEED_MSK_100GB)</div><div class='del'>-			fw_speed = PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_100GB;</div><div class='add'>+		if (((support_spds &amp; BNXT_LINK_SPEED_MSK_100GB) ||</div><div class='add'>+		     (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_100GB)) &amp;&amp;</div><div class='add'>+		    lanes != 2 &amp;&amp; lanes != 1) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100GB;</div><div class='add'>+			lanes_needed = 4;</div><div class='add'>+		} else if (support_pam4_spds &amp; BNXT_LINK_PAM4_SPEED_MSK_100GB) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_100GB;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+			lanes_needed = 2;</div><div class='add'>+		} else if ((support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_100GB_PAM4) &amp;&amp;</div><div class='add'>+			   lanes != 1) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_100GB_PAM4;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+			lanes_needed = 2;</div><div class='add'>+		} else if (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_100GB_PAM4_112) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_100GB_PAM4_112;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4_112;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='del'>-	default:</div><div class='del'>-		netdev_err(dev, "unsupported speed!\n");</div><div class='add'>+	case SPEED_200000:</div><div class='add'>+		if (support_pam4_spds &amp; BNXT_LINK_PAM4_SPEED_MSK_200GB) {</div><div class='add'>+			fw_speed = PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_200GB;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+			lanes_needed = 4;</div><div class='add'>+		} else if ((support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_200GB_PAM4) &amp;&amp;</div><div class='add'>+			   lanes != 2) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_200GB_PAM4;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+			lanes_needed = 4;</div><div class='add'>+		} else if (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_200GB_PAM4_112) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_200GB_PAM4_112;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4_112;</div><div class='add'>+			lanes_needed = 2;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_400000:</div><div class='add'>+		if ((support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_400GB_PAM4) &amp;&amp;</div><div class='add'>+		    lanes != 4) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_400GB_PAM4;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4;</div><div class='add'>+			lanes_needed = 8;</div><div class='add'>+		} else if (support_spds2 &amp; BNXT_LINK_SPEEDS2_MSK_400GB_PAM4_112) {</div><div class='add'>+			fw_speed = BNXT_LINK_SPEED_400GB_PAM4_112;</div><div class='add'>+			sig_mode = BNXT_SIG_MODE_PAM4_112;</div><div class='add'>+			lanes_needed = 4;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-	return fw_speed;</div><div class='add'>+</div><div class='add'>+	if (!fw_speed) {</div><div class='add'>+		netdev_err(dev, "unsupported speed!\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (lanes &amp;&amp; lanes != lanes_needed) {</div><div class='add'>+		netdev_err(dev, "unsupported number of lanes for speed\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (link_info-&gt;req_link_speed == fw_speed &amp;&amp;</div><div class='add'>+	    link_info-&gt;req_signal_mode == sig_mode &amp;&amp;</div><div class='add'>+	    link_info-&gt;autoneg == 0)</div><div class='add'>+		return -EALREADY;</div><div class='add'>+</div><div class='add'>+	link_info-&gt;req_link_speed = fw_speed;</div><div class='add'>+	link_info-&gt;req_signal_mode = sig_mode;</div><div class='add'>+	link_info-&gt;req_duplex = BNXT_LINK_DUPLEX_FULL;</div><div class='add'>+	link_info-&gt;autoneg = 0;</div><div class='add'>+	link_info-&gt;advertising = 0;</div><div class='add'>+	link_info-&gt;advertising_pam4 = 0;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-u16 bnxt_get_fw_auto_link_speeds(u32 advertising)</div><div class='add'>+u16 bnxt_get_fw_auto_link_speeds(const unsigned long *mode)</div><div class='ctx'> {</div><div class='ctx'> 	u16 fw_speed_mask = 0;</div><div class='ctx'> </div><div class='del'>-	/* only support autoneg at speed 100, 1000, and 10000 */</div><div class='del'>-	if (advertising &amp; (ADVERTISED_100baseT_Full |</div><div class='del'>-			   ADVERTISED_100baseT_Half)) {</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, mode) ||</div><div class='add'>+	    linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, mode))</div><div class='ctx'> 		fw_speed_mask |= BNXT_LINK_SPEED_MSK_100MB;</div><div class='del'>-	}</div><div class='del'>-	if (advertising &amp; (ADVERTISED_1000baseT_Full |</div><div class='del'>-			   ADVERTISED_1000baseT_Half)) {</div><div class='add'>+</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, mode) ||</div><div class='add'>+	    linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, mode))</div><div class='ctx'> 		fw_speed_mask |= BNXT_LINK_SPEED_MSK_1GB;</div><div class='del'>-	}</div><div class='del'>-	if (advertising &amp; ADVERTISED_10000baseT_Full)</div><div class='add'>+</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, mode))</div><div class='ctx'> 		fw_speed_mask |= BNXT_LINK_SPEED_MSK_10GB;</div><div class='ctx'> </div><div class='del'>-	if (advertising &amp; ADVERTISED_40000baseCR4_Full)</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_40000baseCR4_Full_BIT, mode))</div><div class='ctx'> 		fw_speed_mask |= BNXT_LINK_SPEED_MSK_40GB;</div><div class='ctx'> </div><div class='ctx'> 	return fw_speed_mask;</div><div class='hunk'>@@ -1528,28 +3116,28 @@ static int bnxt_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> 	const struct ethtool_link_settings *base = &amp;lk_ksettings-&gt;base;</div><div class='ctx'> 	bool set_pause = false;</div><div class='del'>-	u16 fw_advertising = 0;</div><div class='del'>-	u32 speed;</div><div class='add'>+	u32 speed, lanes = 0;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	if (!BNXT_SINGLE_PF(bp))</div><div class='add'>+	if (!BNXT_PHY_CFG_ABLE(bp))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	if (base-&gt;autoneg == AUTONEG_ENABLE) {</div><div class='del'>-		BNXT_ETHTOOL_TO_FW_SPDS(fw_advertising, lk_ksettings,</div><div class='del'>-					advertising);</div><div class='add'>+		bnxt_set_ethtool_speeds(link_info,</div><div class='add'>+					lk_ksettings-&gt;link_modes.advertising);</div><div class='ctx'> 		link_info-&gt;autoneg |= BNXT_AUTONEG_SPEED;</div><div class='del'>-		if (!fw_advertising)</div><div class='add'>+		if (!link_info-&gt;advertising &amp;&amp; !link_info-&gt;advertising_pam4) {</div><div class='ctx'> 			link_info-&gt;advertising = link_info-&gt;support_auto_speeds;</div><div class='del'>-		else</div><div class='del'>-			link_info-&gt;advertising = fw_advertising;</div><div class='add'>+			link_info-&gt;advertising_pam4 =</div><div class='add'>+				link_info-&gt;support_pam4_auto_speeds;</div><div class='add'>+		}</div><div class='ctx'> 		/* any change to autoneg will cause link change, therefore the</div><div class='ctx'> 		 * driver should put back the original pause setting in autoneg</div><div class='ctx'> 		 */</div><div class='del'>-		set_pause = true;</div><div class='add'>+		if (!(bp-&gt;phy_flags &amp; BNXT_PHY_FL_NO_PAUSE))</div><div class='add'>+			set_pause = true;</div><div class='ctx'> 	} else {</div><div class='del'>-		u16 fw_speed;</div><div class='ctx'> 		u8 phy_type = link_info-&gt;phy_type;</div><div class='ctx'> </div><div class='ctx'> 		if (phy_type == PORT_PHY_QCFG_RESP_PHY_TYPE_BASET  ||</div><div class='hunk'>@@ -1565,15 +3153,13 @@ static int bnxt_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 			goto set_setting_exit;</div><div class='ctx'> 		}</div><div class='ctx'> 		speed = base-&gt;speed;</div><div class='del'>-		fw_speed = bnxt_get_fw_speed(dev, speed);</div><div class='del'>-		if (!fw_speed) {</div><div class='del'>-			rc = -EINVAL;</div><div class='add'>+		lanes = lk_ksettings-&gt;lanes;</div><div class='add'>+		rc = bnxt_force_link_speed(dev, speed, lanes);</div><div class='add'>+		if (rc) {</div><div class='add'>+			if (rc == -EALREADY)</div><div class='add'>+				rc = 0;</div><div class='ctx'> 			goto set_setting_exit;</div><div class='ctx'> 		}</div><div class='del'>-		link_info-&gt;req_link_speed = fw_speed;</div><div class='del'>-		link_info-&gt;req_duplex = BNXT_LINK_DUPLEX_FULL;</div><div class='del'>-		link_info-&gt;autoneg = 0;</div><div class='del'>-		link_info-&gt;advertising = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='hunk'>@@ -1584,6 +3170,138 @@ set_setting_exit:</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_get_fecparam(struct net_device *dev,</div><div class='add'>+			     struct ethtool_fecparam *fec)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_link_info *link_info;</div><div class='add'>+	u8 active_fec;</div><div class='add'>+	u16 fec_cfg;</div><div class='add'>+</div><div class='add'>+	link_info = &amp;bp-&gt;link_info;</div><div class='add'>+	fec_cfg = link_info-&gt;fec_cfg;</div><div class='add'>+	active_fec = link_info-&gt;active_fec_sig_mode &amp;</div><div class='add'>+		     PORT_PHY_QCFG_RESP_ACTIVE_FEC_MASK;</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_NONE) {</div><div class='add'>+		fec-&gt;fec = ETHTOOL_FEC_NONE;</div><div class='add'>+		fec-&gt;active_fec = ETHTOOL_FEC_NONE;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_AUTONEG)</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_AUTO;</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_BASE_R)</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_BASER;</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_RS)</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_RS;</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_ENC_LLRS)</div><div class='add'>+		fec-&gt;fec |= ETHTOOL_FEC_LLRS;</div><div class='add'>+</div><div class='add'>+	switch (active_fec) {</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_CLAUSE74_ACTIVE:</div><div class='add'>+		fec-&gt;active_fec |= ETHTOOL_FEC_BASER;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_CLAUSE91_ACTIVE:</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS544_1XN_ACTIVE:</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS544_IEEE_ACTIVE:</div><div class='add'>+		fec-&gt;active_fec |= ETHTOOL_FEC_RS;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_1XN_ACTIVE:</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_RS272_IEEE_ACTIVE:</div><div class='add'>+		fec-&gt;active_fec |= ETHTOOL_FEC_LLRS;</div><div class='add'>+		break;</div><div class='add'>+	case PORT_PHY_QCFG_RESP_ACTIVE_FEC_FEC_NONE_ACTIVE:</div><div class='add'>+		fec-&gt;active_fec |= ETHTOOL_FEC_OFF;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_fec_stats(struct net_device *dev,</div><div class='add'>+			       struct ethtool_fec_stats *fec_stats,</div><div class='add'>+			       struct ethtool_fec_hist *hist)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;rx_port_stats_ext.sw_stats;</div><div class='add'>+	fec_stats-&gt;corrected_bits.total =</div><div class='add'>+		*(rx + BNXT_RX_STATS_EXT_OFFSET(rx_corrected_bits));</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_rx_stats_ext_size &lt;= BNXT_RX_STATS_EXT_NUM_LEGACY)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	fec_stats-&gt;corrected_blocks.total =</div><div class='add'>+		*(rx + BNXT_RX_STATS_EXT_OFFSET(rx_fec_corrected_blocks));</div><div class='add'>+	fec_stats-&gt;uncorrectable_blocks.total =</div><div class='add'>+		*(rx + BNXT_RX_STATS_EXT_OFFSET(rx_fec_uncorrectable_blocks));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bnxt_ethtool_forced_fec_to_fw(struct bnxt_link_info *link_info,</div><div class='add'>+					 u32 fec)</div><div class='add'>+{</div><div class='add'>+	u32 fw_fec = PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_DISABLE;</div><div class='add'>+</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_BASER)</div><div class='add'>+		fw_fec |= BNXT_FEC_BASE_R_ON(link_info);</div><div class='add'>+	else if (fec &amp; ETHTOOL_FEC_RS)</div><div class='add'>+		fw_fec |= BNXT_FEC_RS_ON(link_info);</div><div class='add'>+	else if (fec &amp; ETHTOOL_FEC_LLRS)</div><div class='add'>+		fw_fec |= BNXT_FEC_LLRS_ON;</div><div class='add'>+	return fw_fec;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_fecparam(struct net_device *dev,</div><div class='add'>+			     struct ethtool_fecparam *fecparam)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_phy_cfg_input *req;</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_link_info *link_info;</div><div class='add'>+	u32 new_cfg, fec = fecparam-&gt;fec;</div><div class='add'>+	u16 fec_cfg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	link_info = &amp;bp-&gt;link_info;</div><div class='add'>+	fec_cfg = link_info-&gt;fec_cfg;</div><div class='add'>+	if (fec_cfg &amp; BNXT_FEC_NONE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_OFF) {</div><div class='add'>+		new_cfg = PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_DISABLE |</div><div class='add'>+			  BNXT_FEC_ALL_OFF(link_info);</div><div class='add'>+		goto apply_fec;</div><div class='add'>+	}</div><div class='add'>+	if (((fec &amp; ETHTOOL_FEC_AUTO) &amp;&amp; !(fec_cfg &amp; BNXT_FEC_AUTONEG_CAP)) ||</div><div class='add'>+	    ((fec &amp; ETHTOOL_FEC_RS) &amp;&amp; !(fec_cfg &amp; BNXT_FEC_ENC_RS_CAP)) ||</div><div class='add'>+	    ((fec &amp; ETHTOOL_FEC_LLRS) &amp;&amp; !(fec_cfg &amp; BNXT_FEC_ENC_LLRS_CAP)) ||</div><div class='add'>+	    ((fec &amp; ETHTOOL_FEC_BASER) &amp;&amp; !(fec_cfg &amp; BNXT_FEC_ENC_BASE_R_CAP)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (fec &amp; ETHTOOL_FEC_AUTO) {</div><div class='add'>+		if (!link_info-&gt;autoneg)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		new_cfg = PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_ENABLE;</div><div class='add'>+	} else {</div><div class='add'>+		new_cfg = bnxt_ethtool_forced_fec_to_fw(link_info, fec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+apply_fec:</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	req-&gt;flags = cpu_to_le32(new_cfg | PORT_PHY_CFG_REQ_FLAGS_RESET_PHY);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	/* update current settings */</div><div class='add'>+	if (!rc) {</div><div class='add'>+		mutex_lock(&amp;bp-&gt;link_lock);</div><div class='add'>+		bnxt_update_link(bp, false);</div><div class='add'>+		mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void bnxt_get_pauseparam(struct net_device *dev,</div><div class='ctx'> 				struct ethtool_pauseparam *epause)</div><div class='ctx'> {</div><div class='hunk'>@@ -1597,6 +3315,22 @@ static void bnxt_get_pauseparam(struct net_device *dev,</div><div class='ctx'> 	epause-&gt;tx_pause = !!(link_info-&gt;req_flow_ctrl &amp; BNXT_LINK_PAUSE_TX);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnxt_get_pause_stats(struct net_device *dev,</div><div class='add'>+				 struct ethtool_pause_stats *epstat)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx, *tx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;port_stats.sw_stats;</div><div class='add'>+	tx = bp-&gt;port_stats.sw_stats + BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+</div><div class='add'>+	epstat-&gt;rx_pause_frames = BNXT_GET_RX_PORT_STATS64(rx, rx_pause_frames);</div><div class='add'>+	epstat-&gt;tx_pause_frames = BNXT_GET_TX_PORT_STATS64(tx, tx_pause_frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 			       struct ethtool_pauseparam *epause)</div><div class='ctx'> {</div><div class='hunk'>@@ -1604,17 +3338,18 @@ static int bnxt_set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> </div><div class='del'>-	if (!BNXT_SINGLE_PF(bp))</div><div class='add'>+	if (!BNXT_PHY_CFG_ABLE(bp) || (bp-&gt;phy_flags &amp; BNXT_PHY_FL_NO_PAUSE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	if (epause-&gt;autoneg) {</div><div class='del'>-		if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED))</div><div class='del'>-			return -EINVAL;</div><div class='add'>+		if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED)) {</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto pause_exit;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		link_info-&gt;autoneg |= BNXT_AUTONEG_FLOW_CTRL;</div><div class='del'>-		if (bp-&gt;hwrm_spec_code &gt;= 0x10201)</div><div class='del'>-			link_info-&gt;req_flow_ctrl =</div><div class='del'>-				PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE;</div><div class='add'>+		link_info-&gt;req_flow_ctrl = 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* when transition from auto pause to force pause,</div><div class='ctx'> 		 * force a link change</div><div class='hunk'>@@ -1632,6 +3367,9 @@ static int bnxt_set_pauseparam(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		rc = bnxt_hwrm_set_pause(bp);</div><div class='add'>+</div><div class='add'>+pause_exit:</div><div class='add'>+	mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1640,66 +3378,117 @@ static u32 bnxt_get_link(struct net_device *dev)</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: handle MF, VF, driver close case */</div><div class='del'>-	return bp-&gt;link_info.link_up;</div><div class='add'>+	return BNXT_LINK_IS_UP(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='del'>-				u16 ext, u16 *index, u32 *item_length,</div><div class='del'>-				u32 *data_length);</div><div class='add'>+int bnxt_hwrm_nvm_get_dev_info(struct bnxt *bp,</div><div class='add'>+			       struct hwrm_nvm_get_dev_info_output *nvm_dev_info)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_get_dev_info_output *resp;</div><div class='add'>+	struct hwrm_nvm_get_dev_info_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_DEV_INFO);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		memcpy(nvm_dev_info, resp, sizeof(*resp));</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-static int bnxt_flash_nvram(struct net_device *dev,</div><div class='del'>-			    u16 dir_type,</div><div class='del'>-			    u16 dir_ordinal,</div><div class='del'>-			    u16 dir_ext,</div><div class='del'>-			    u16 dir_attr,</div><div class='del'>-			    const u8 *data,</div><div class='del'>-			    size_t data_len)</div><div class='add'>+static void bnxt_print_admin_err(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	netdev_info(bp-&gt;dev, "PF does not have admin privileges to flash or reset the device\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='add'>+			 u16 ext, u16 *index, u32 *item_length,</div><div class='add'>+			 u32 *data_length);</div><div class='add'>+</div><div class='add'>+int bnxt_flash_nvram(struct net_device *dev, u16 dir_type,</div><div class='add'>+		     u16 dir_ordinal, u16 dir_ext, u16 dir_attr,</div><div class='add'>+		     u32 dir_item_len, const u8 *data,</div><div class='add'>+		     size_t data_len)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct hwrm_nvm_write_input *req;</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct hwrm_nvm_write_input req = {0};</div><div class='del'>-	dma_addr_t dma_handle;</div><div class='del'>-	u8 *kmem;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_WRITE, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_WRITE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (data_len &amp;&amp; data) {</div><div class='add'>+		dma_addr_t dma_handle;</div><div class='add'>+		u8 *kmem;</div><div class='add'>+</div><div class='add'>+		kmem = hwrm_req_dma_slice(bp, req, data_len, &amp;dma_handle);</div><div class='add'>+		if (!kmem) {</div><div class='add'>+			hwrm_req_drop(bp, req);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	req.dir_type = cpu_to_le16(dir_type);</div><div class='del'>-	req.dir_ordinal = cpu_to_le16(dir_ordinal);</div><div class='del'>-	req.dir_ext = cpu_to_le16(dir_ext);</div><div class='del'>-	req.dir_attr = cpu_to_le16(dir_attr);</div><div class='del'>-	req.dir_data_length = cpu_to_le32(data_len);</div><div class='add'>+		req-&gt;dir_data_length = cpu_to_le32(data_len);</div><div class='ctx'> </div><div class='del'>-	kmem = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, data_len, &amp;dma_handle,</div><div class='del'>-				  GFP_KERNEL);</div><div class='del'>-	if (!kmem) {</div><div class='del'>-		netdev_err(dev, "dma_alloc_coherent failure, length = %u\n",</div><div class='del'>-			   (unsigned)data_len);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+		memcpy(kmem, data, data_len);</div><div class='add'>+		req-&gt;host_src_addr = cpu_to_le64(dma_handle);</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(kmem, data, data_len);</div><div class='del'>-	req.host_src_addr = cpu_to_le64(dma_handle);</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), FLASH_NVRAM_TIMEOUT);</div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, data_len, kmem, dma_handle);</div><div class='add'>+	hwrm_req_timeout(bp, req, bp-&gt;hwrm_cmd_max_timeout);</div><div class='add'>+	req-&gt;dir_type = cpu_to_le16(dir_type);</div><div class='add'>+	req-&gt;dir_ordinal = cpu_to_le16(dir_ordinal);</div><div class='add'>+	req-&gt;dir_ext = cpu_to_le16(dir_ext);</div><div class='add'>+	req-&gt;dir_attr = cpu_to_le16(dir_attr);</div><div class='add'>+	req-&gt;dir_item_length = cpu_to_le32(dir_item_len);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> </div><div class='del'>-	if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {</div><div class='del'>-		netdev_info(dev,</div><div class='del'>-			    "PF does not have admin privileges to flash the device\n");</div><div class='del'>-		rc = -EACCES;</div><div class='del'>-	} else if (rc) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	}</div><div class='add'>+	if (rc == -EACCES)</div><div class='add'>+		bnxt_print_admin_err(bp);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_firmware_reset(struct net_device *dev,</div><div class='del'>-			       u16 dir_type)</div><div class='add'>+int bnxt_hwrm_firmware_reset(struct net_device *dev, u8 proc_type,</div><div class='add'>+			     u8 self_reset, u8 flags)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_fw_reset_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct hwrm_fw_reset_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FW_RESET, -1, -1);</div><div class='add'>+	if (!bnxt_hwrm_reset_permitted(bp)) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Reset denied by firmware, it may be inhibited by remote driver");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FW_RESET);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;embedded_proc_type = proc_type;</div><div class='add'>+	req-&gt;selfrst_status = self_reset;</div><div class='add'>+	req-&gt;flags = flags;</div><div class='add'>+</div><div class='add'>+	if (proc_type == FW_RESET_REQ_EMBEDDED_PROC_TYPE_AP) {</div><div class='add'>+		rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	} else {</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc == -EACCES)</div><div class='add'>+			bnxt_print_admin_err(bp);</div><div class='add'>+	}</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_firmware_reset(struct net_device *dev,</div><div class='add'>+			       enum bnxt_nvm_directory_type dir_type)</div><div class='add'>+{</div><div class='add'>+	u8 self_reset = FW_RESET_REQ_SELFRST_STATUS_SELFRSTNONE;</div><div class='add'>+	u8 proc_type, flags = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* TODO: Address self-reset of APE/KONG/BONO/TANG or ungraceful reset */</div><div class='ctx'> 	/*       (e.g. when firmware isn't already running) */</div><div class='hunk'>@@ -1707,45 +3496,50 @@ static int bnxt_firmware_reset(struct net_device *dev,</div><div class='ctx'> 	case BNX_DIR_TYPE_CHIMP_PATCH:</div><div class='ctx'> 	case BNX_DIR_TYPE_BOOTCODE:</div><div class='ctx'> 	case BNX_DIR_TYPE_BOOTCODE_2:</div><div class='del'>-		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_BOOT;</div><div class='add'>+		proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_BOOT;</div><div class='ctx'> 		/* Self-reset ChiMP upon next PCIe reset: */</div><div class='del'>-		req.selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST;</div><div class='add'>+		self_reset = FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BNX_DIR_TYPE_APE_FW:</div><div class='ctx'> 	case BNX_DIR_TYPE_APE_PATCH:</div><div class='del'>-		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_MGMT;</div><div class='add'>+		proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_MGMT;</div><div class='ctx'> 		/* Self-reset APE upon next PCIe reset: */</div><div class='del'>-		req.selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST;</div><div class='add'>+		self_reset = FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BNX_DIR_TYPE_KONG_FW:</div><div class='ctx'> 	case BNX_DIR_TYPE_KONG_PATCH:</div><div class='del'>-		req.embedded_proc_type =</div><div class='del'>-			FW_RESET_REQ_EMBEDDED_PROC_TYPE_NETCTRL;</div><div class='add'>+		proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_NETCTRL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case BNX_DIR_TYPE_BONO_FW:</div><div class='ctx'> 	case BNX_DIR_TYPE_BONO_PATCH:</div><div class='del'>-		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_ROCE;</div><div class='del'>-		break;</div><div class='del'>-	case BNXT_FW_RESET_CHIP:</div><div class='del'>-		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP;</div><div class='del'>-		req.selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP;</div><div class='del'>-		break;</div><div class='del'>-	case BNXT_FW_RESET_AP:</div><div class='del'>-		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_AP;</div><div class='add'>+		proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_ROCE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {</div><div class='del'>-		netdev_info(dev,</div><div class='del'>-			    "PF does not have admin privileges to reset the device\n");</div><div class='del'>-		rc = -EACCES;</div><div class='del'>-	} else if (rc) {</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='add'>+	return bnxt_hwrm_firmware_reset(dev, proc_type, self_reset, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_firmware_reset_chip(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u8 flags = 0;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET)</div><div class='add'>+		flags = FW_RESET_REQ_FLAGS_RESET_GRACEFUL;</div><div class='add'>+</div><div class='add'>+	return bnxt_hwrm_firmware_reset(dev,</div><div class='add'>+					FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP,</div><div class='add'>+					FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP,</div><div class='add'>+					flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_firmware_reset_ap(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return bnxt_hwrm_firmware_reset(dev, FW_RESET_REQ_EMBEDDED_PROC_TYPE_AP,</div><div class='add'>+					FW_RESET_REQ_SELFRST_STATUS_SELFRSTNONE,</div><div class='add'>+					0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_flash_firmware(struct net_device *dev,</div><div class='hunk'>@@ -1821,7 +3615,7 @@ static int bnxt_flash_firmware(struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = bnxt_flash_nvram(dev, dir_type, BNX_DIR_ORDINAL_FIRST,</div><div class='del'>-			      0, 0, fw_data, fw_size);</div><div class='add'>+			      0, 0, 0, fw_data, fw_size);</div><div class='ctx'> 	if (rc == 0)	/* Firmware update successful */</div><div class='ctx'> 		rc = bnxt_firmware_reset(dev, dir_type);</div><div class='ctx'> </div><div class='hunk'>@@ -1874,7 +3668,7 @@ static int bnxt_flash_microcode(struct net_device *dev,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	rc = bnxt_flash_nvram(dev, dir_type, BNX_DIR_ORDINAL_FIRST,</div><div class='del'>-			      0, 0, fw_data, fw_size);</div><div class='add'>+			      0, 0, 0, fw_data, fw_size);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1934,120 +3728,278 @@ static int bnxt_flash_firmware_from_file(struct net_device *dev,</div><div class='ctx'> 			   rc, filename);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='del'>-	if (bnxt_dir_type_is_ape_bin_format(dir_type) == true)</div><div class='add'>+	if (bnxt_dir_type_is_ape_bin_format(dir_type))</div><div class='ctx'> 		rc = bnxt_flash_firmware(dev, dir_type, fw-&gt;data, fw-&gt;size);</div><div class='del'>-	else if (bnxt_dir_type_is_other_exec_format(dir_type) == true)</div><div class='add'>+	else if (bnxt_dir_type_is_other_exec_format(dir_type))</div><div class='ctx'> 		rc = bnxt_flash_microcode(dev, dir_type, fw-&gt;data, fw-&gt;size);</div><div class='ctx'> 	else</div><div class='ctx'> 		rc = bnxt_flash_nvram(dev, dir_type, BNX_DIR_ORDINAL_FIRST,</div><div class='del'>-				      0, 0, fw-&gt;data, fw-&gt;size);</div><div class='add'>+				      0, 0, 0, fw-&gt;data, fw-&gt;size);</div><div class='ctx'> 	release_firmware(fw);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_flash_package_from_file(struct net_device *dev,</div><div class='del'>-					char *filename, u32 install_type)</div><div class='add'>+#define MSG_INTEGRITY_ERR "PKG install error : Data integrity on NVM"</div><div class='add'>+#define MSG_INVALID_PKG "PKG install error : Invalid package"</div><div class='add'>+#define MSG_AUTHENTICATION_ERR "PKG install error : Authentication error"</div><div class='add'>+#define MSG_INVALID_DEV "PKG install error : Invalid device"</div><div class='add'>+#define MSG_INTERNAL_ERR "PKG install error : Internal error"</div><div class='add'>+#define MSG_NO_PKG_UPDATE_AREA_ERR "PKG update area not created in nvram"</div><div class='add'>+#define MSG_NO_SPACE_ERR "PKG insufficient update area in nvram"</div><div class='add'>+#define MSG_RESIZE_UPDATE_ERR "Resize UPDATE entry error"</div><div class='add'>+#define MSG_ANTI_ROLLBACK_ERR "HWRM_NVM_INSTALL_UPDATE failure due to Anti-rollback detected"</div><div class='add'>+#define MSG_GENERIC_FAILURE_ERR "HWRM_NVM_INSTALL_UPDATE failure"</div><div class='add'>+</div><div class='add'>+static int nvm_update_err_to_stderr(struct net_device *dev, u8 result,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	switch (result) {</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_TYPE_PARAMETER:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_INDEX_PARAMETER:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INSTALL_DATA_ERROR:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INSTALL_CHECKSUM_ERROR:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_ITEM_NOT_FOUND:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_ITEM_LOCKED:</div><div class='add'>+		BNXT_NVM_ERR_MSG(dev, extack, MSG_INTEGRITY_ERR);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_PREREQUISITE:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_FILE_HEADER:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_SIGNATURE:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_PROP_STREAM:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_PROP_LENGTH:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_MANIFEST:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_TRAILER:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_CHECKSUM:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_ITEM_CHECKSUM:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_DATA_LENGTH:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INVALID_DIRECTIVE:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_DUPLICATE_ITEM:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_ZERO_LENGTH_ITEM:</div><div class='add'>+		BNXT_NVM_ERR_MSG(dev, extack, MSG_INVALID_PKG);</div><div class='add'>+		return -ENOPKG;</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_INSTALL_AUTHENTICATION_ERROR:</div><div class='add'>+		BNXT_NVM_ERR_MSG(dev, extack, MSG_AUTHENTICATION_ERR);</div><div class='add'>+		return -EPERM;</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_CHIP_REV:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_DEVICE_ID:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_SUBSYS_VENDOR:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_SUBSYS_ID:</div><div class='add'>+	case NVM_INSTALL_UPDATE_RESP_RESULT_UNSUPPORTED_PLATFORM:</div><div class='add'>+		BNXT_NVM_ERR_MSG(dev, extack, MSG_INVALID_DEV);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	default:</div><div class='add'>+		BNXT_NVM_ERR_MSG(dev, extack, MSG_INTERNAL_ERR);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define BNXT_PKG_DMA_SIZE	0x40000</div><div class='add'>+#define BNXT_NVM_MORE_FLAG	(cpu_to_le16(NVM_MODIFY_REQ_FLAGS_BATCH_MODE))</div><div class='add'>+#define BNXT_NVM_LAST_FLAG	(cpu_to_le16(NVM_MODIFY_REQ_FLAGS_BATCH_LAST))</div><div class='add'>+</div><div class='add'>+static int bnxt_resize_update_entry(struct net_device *dev, size_t fw_size,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	u32 item_len;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_find_nvram_item(dev, BNX_DIR_TYPE_UPDATE,</div><div class='add'>+				  BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE, NULL,</div><div class='add'>+				  &amp;item_len, NULL);</div><div class='add'>+	if (rc) {</div><div class='add'>+		BNXT_NVM_ERR_MSG(dev, extack, MSG_NO_PKG_UPDATE_AREA_ERR);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fw_size &gt; item_len) {</div><div class='add'>+		rc = bnxt_flash_nvram(dev, BNX_DIR_TYPE_UPDATE,</div><div class='add'>+				      BNX_DIR_ORDINAL_FIRST, 0, 1,</div><div class='add'>+				      round_up(fw_size, 4096), NULL, 0);</div><div class='add'>+		if (rc) {</div><div class='add'>+			BNXT_NVM_ERR_MSG(dev, extack, MSG_RESIZE_UPDATE_ERR);</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware *fw,</div><div class='add'>+				   u32 install_type, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_nvm_install_update_input *install;</div><div class='add'>+	struct hwrm_nvm_install_update_output *resp;</div><div class='add'>+	struct hwrm_nvm_modify_input *modify;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct hwrm_nvm_install_update_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_nvm_install_update_input install = {0};</div><div class='del'>-	const struct firmware *fw;</div><div class='del'>-	int rc, hwrm_err = 0;</div><div class='add'>+	bool defrag_attempted = false;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+	u8 *kmem = NULL;</div><div class='add'>+	u32 modify_len;</div><div class='ctx'> 	u32 item_len;</div><div class='add'>+	u8 cmd_err;</div><div class='ctx'> 	u16 index;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* resize before flashing larger image than available space */</div><div class='add'>+	rc = bnxt_resize_update_entry(dev, fw-&gt;size, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	bnxt_hwrm_fw_set_time(bp);</div><div class='ctx'> </div><div class='del'>-	if (bnxt_find_nvram_item(dev, BNX_DIR_TYPE_UPDATE,</div><div class='del'>-				 BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE,</div><div class='del'>-				 &amp;index, &amp;item_len, NULL) != 0) {</div><div class='del'>-		netdev_err(dev, "PKG update area not created in nvram\n");</div><div class='del'>-		return -ENOBUFS;</div><div class='add'>+	rc = hwrm_req_init(bp, modify, HWRM_NVM_MODIFY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Try allocating a large DMA buffer first.  Older fw will</div><div class='add'>+	 * cause excessive NVRAM erases when using small blocks.</div><div class='add'>+	 */</div><div class='add'>+	modify_len = roundup_pow_of_two(fw-&gt;size);</div><div class='add'>+	modify_len = min_t(u32, modify_len, BNXT_PKG_DMA_SIZE);</div><div class='add'>+	while (1) {</div><div class='add'>+		kmem = hwrm_req_dma_slice(bp, modify, modify_len, &amp;dma_handle);</div><div class='add'>+		if (!kmem &amp;&amp; modify_len &gt; PAGE_SIZE)</div><div class='add'>+			modify_len /= 2;</div><div class='add'>+		else</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	if (!kmem) {</div><div class='add'>+		hwrm_req_drop(bp, modify);</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	rc = request_firmware(&amp;fw, filename, &amp;dev-&gt;dev);</div><div class='del'>-	if (rc != 0) {</div><div class='del'>-		netdev_err(dev, "PKG error %d requesting file: %s\n",</div><div class='del'>-			   rc, filename);</div><div class='add'>+	rc = hwrm_req_init(bp, install, HWRM_NVM_INSTALL_UPDATE);</div><div class='add'>+	if (rc) {</div><div class='add'>+		hwrm_req_drop(bp, modify);</div><div class='ctx'> 		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (fw-&gt;size &gt; item_len) {</div><div class='del'>-		netdev_err(dev, "PKG insufficient update area in nvram: %lu",</div><div class='del'>-			   (unsigned long)fw-&gt;size);</div><div class='del'>-		rc = -EFBIG;</div><div class='del'>-	} else {</div><div class='del'>-		dma_addr_t dma_handle;</div><div class='del'>-		u8 *kmem;</div><div class='del'>-		struct hwrm_nvm_modify_input modify = {0};</div><div class='add'>+	hwrm_req_timeout(bp, modify, bp-&gt;hwrm_cmd_max_timeout);</div><div class='add'>+	hwrm_req_timeout(bp, install, bp-&gt;hwrm_cmd_max_timeout);</div><div class='ctx'> </div><div class='del'>-		bnxt_hwrm_cmd_hdr_init(bp, &amp;modify, HWRM_NVM_MODIFY, -1, -1);</div><div class='add'>+	hwrm_req_hold(bp, modify);</div><div class='add'>+	modify-&gt;host_src_addr = cpu_to_le64(dma_handle);</div><div class='ctx'> </div><div class='del'>-		modify.dir_idx = cpu_to_le16(index);</div><div class='del'>-		modify.len = cpu_to_le32(fw-&gt;size);</div><div class='add'>+	resp = hwrm_req_hold(bp, install);</div><div class='add'>+	if ((install_type &amp; 0xffff) == 0)</div><div class='add'>+		install_type &gt;&gt;= 16;</div><div class='add'>+	install-&gt;install_type = cpu_to_le32(install_type);</div><div class='ctx'> </div><div class='del'>-		kmem = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, fw-&gt;size,</div><div class='del'>-					  &amp;dma_handle, GFP_KERNEL);</div><div class='del'>-		if (!kmem) {</div><div class='del'>-			netdev_err(dev,</div><div class='del'>-				   "dma_alloc_coherent failure, length = %u\n",</div><div class='del'>-				   (unsigned int)fw-&gt;size);</div><div class='del'>-			rc = -ENOMEM;</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(kmem, fw-&gt;data, fw-&gt;size);</div><div class='del'>-			modify.host_src_addr = cpu_to_le64(dma_handle);</div><div class='add'>+	do {</div><div class='add'>+		u32 copied = 0, len = modify_len;</div><div class='ctx'> </div><div class='del'>-			hwrm_err = hwrm_send_message(bp, &amp;modify,</div><div class='del'>-						     sizeof(modify),</div><div class='del'>-						     FLASH_PACKAGE_TIMEOUT);</div><div class='del'>-			dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, fw-&gt;size, kmem,</div><div class='del'>-					  dma_handle);</div><div class='add'>+		rc = bnxt_find_nvram_item(dev, BNX_DIR_TYPE_UPDATE,</div><div class='add'>+					  BNX_DIR_ORDINAL_FIRST,</div><div class='add'>+					  BNX_DIR_EXT_NONE,</div><div class='add'>+					  &amp;index, &amp;item_len, NULL);</div><div class='add'>+		if (rc) {</div><div class='add'>+			BNXT_NVM_ERR_MSG(dev, extack, MSG_NO_PKG_UPDATE_AREA_ERR);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (fw-&gt;size &gt; item_len) {</div><div class='add'>+			BNXT_NVM_ERR_MSG(dev, extack, MSG_NO_SPACE_ERR);</div><div class='add'>+			rc = -EFBIG;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='del'>-	release_firmware(fw);</div><div class='del'>-	if (rc || hwrm_err)</div><div class='del'>-		goto err_exit;</div><div class='ctx'> </div><div class='del'>-	if ((install_type &amp; 0xffff) == 0)</div><div class='del'>-		install_type &gt;&gt;= 16;</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;install, HWRM_NVM_INSTALL_UPDATE, -1, -1);</div><div class='del'>-	install.install_type = cpu_to_le32(install_type);</div><div class='add'>+		modify-&gt;dir_idx = cpu_to_le16(index);</div><div class='add'>+</div><div class='add'>+		if (fw-&gt;size &gt; modify_len)</div><div class='add'>+			modify-&gt;flags = BNXT_NVM_MORE_FLAG;</div><div class='add'>+		while (copied &lt; fw-&gt;size) {</div><div class='add'>+			u32 balance = fw-&gt;size - copied;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	hwrm_err = _hwrm_send_message(bp, &amp;install, sizeof(install),</div><div class='del'>-				      INSTALL_PACKAGE_TIMEOUT);</div><div class='del'>-	if (hwrm_err)</div><div class='del'>-		goto flash_pkg_exit;</div><div class='add'>+			if (balance &lt;= modify_len) {</div><div class='add'>+				len = balance;</div><div class='add'>+				if (copied)</div><div class='add'>+					modify-&gt;flags |= BNXT_NVM_LAST_FLAG;</div><div class='add'>+			}</div><div class='add'>+			memcpy(kmem, fw-&gt;data + copied, len);</div><div class='add'>+			modify-&gt;len = cpu_to_le32(len);</div><div class='add'>+			modify-&gt;offset = cpu_to_le32(copied);</div><div class='add'>+			rc = hwrm_req_send(bp, modify);</div><div class='add'>+			if (rc)</div><div class='add'>+				goto pkg_abort;</div><div class='add'>+			copied += len;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	if (resp-&gt;error_code) {</div><div class='del'>-		u8 error_code = ((struct hwrm_err_output *)resp)-&gt;cmd_err;</div><div class='add'>+		rc = hwrm_req_send_silent(bp, install);</div><div class='add'>+		if (!rc)</div><div class='add'>+			break;</div><div class='ctx'> </div><div class='del'>-		if (error_code == NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR) {</div><div class='del'>-			install.flags |= cpu_to_le16(</div><div class='del'>-			       NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);</div><div class='del'>-			hwrm_err = _hwrm_send_message(bp, &amp;install,</div><div class='del'>-						      sizeof(install),</div><div class='del'>-						      INSTALL_PACKAGE_TIMEOUT);</div><div class='del'>-			if (hwrm_err)</div><div class='del'>-				goto flash_pkg_exit;</div><div class='add'>+		if (defrag_attempted) {</div><div class='add'>+			/* We have tried to defragment already in the previous</div><div class='add'>+			 * iteration. Return with the result for INSTALL_UPDATE</div><div class='add'>+			 */</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+		cmd_err = ((struct hwrm_err_output *)resp)-&gt;cmd_err;</div><div class='add'>+</div><div class='add'>+		switch (cmd_err) {</div><div class='add'>+		case NVM_INSTALL_UPDATE_CMD_ERR_CODE_ANTI_ROLLBACK:</div><div class='add'>+			BNXT_NVM_ERR_MSG(dev, extack, MSG_ANTI_ROLLBACK_ERR);</div><div class='add'>+			rc = -EALREADY;</div><div class='add'>+			break;</div><div class='add'>+		case NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR:</div><div class='add'>+			install-&gt;flags =</div><div class='add'>+				cpu_to_le16(NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG);</div><div class='add'>+</div><div class='add'>+			rc = hwrm_req_send_silent(bp, install);</div><div class='add'>+			if (!rc)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			cmd_err = ((struct hwrm_err_output *)resp)-&gt;cmd_err;</div><div class='add'>+</div><div class='add'>+			if (cmd_err == NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_SPACE) {</div><div class='add'>+				/* FW has cleared NVM area, driver will create</div><div class='add'>+				 * UPDATE directory and try the flash again</div><div class='add'>+				 */</div><div class='add'>+				defrag_attempted = true;</div><div class='add'>+				install-&gt;flags = 0;</div><div class='add'>+				rc = bnxt_flash_nvram(bp-&gt;dev,</div><div class='add'>+						      BNX_DIR_TYPE_UPDATE,</div><div class='add'>+						      BNX_DIR_ORDINAL_FIRST,</div><div class='add'>+						      0, 0, item_len, NULL, 0);</div><div class='add'>+				if (!rc)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+			fallthrough;</div><div class='add'>+		default:</div><div class='add'>+			BNXT_NVM_ERR_MSG(dev, extack, MSG_GENERIC_FAILURE_ERR);</div><div class='add'>+		}</div><div class='add'>+	} while (defrag_attempted &amp;&amp; !rc);</div><div class='add'>+</div><div class='add'>+pkg_abort:</div><div class='add'>+	hwrm_req_drop(bp, modify);</div><div class='add'>+	hwrm_req_drop(bp, install);</div><div class='ctx'> </div><div class='ctx'> 	if (resp-&gt;result) {</div><div class='ctx'> 		netdev_err(dev, "PKG install error = %d, problem_item = %d\n",</div><div class='ctx'> 			   (s8)resp-&gt;result, (int)resp-&gt;problem_item);</div><div class='del'>-		rc = -ENOPKG;</div><div class='add'>+		rc = nvm_update_err_to_stderr(dev, resp-&gt;result, extack);</div><div class='ctx'> 	}</div><div class='del'>-flash_pkg_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-err_exit:</div><div class='del'>-	if (hwrm_err == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {</div><div class='del'>-		netdev_info(dev,</div><div class='del'>-			    "PF does not have admin privileges to flash the device\n");</div><div class='del'>-		rc = -EACCES;</div><div class='del'>-	} else if (hwrm_err) {</div><div class='del'>-		rc = -EOPNOTSUPP;</div><div class='add'>+	if (rc == -EACCES)</div><div class='add'>+		bnxt_print_admin_err(bp);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_flash_package_from_file(struct net_device *dev, const char *filename,</div><div class='add'>+					u32 install_type, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	const struct firmware *fw;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = request_firmware(&amp;fw, filename, &amp;dev-&gt;dev);</div><div class='add'>+	if (rc != 0) {</div><div class='add'>+		netdev_err(dev, "PKG error %d requesting file: %s\n",</div><div class='add'>+			   rc, filename);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_flash_package_from_fw_obj(dev, fw, install_type, extack);</div><div class='add'>+</div><div class='add'>+	release_firmware(fw);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2062,27 +4014,29 @@ static int bnxt_flash_device(struct net_device *dev,</div><div class='ctx'> 	if (flash-&gt;region == ETHTOOL_FLASH_ALL_REGIONS ||</div><div class='ctx'> 	    flash-&gt;region &gt; 0xffff)</div><div class='ctx'> 		return bnxt_flash_package_from_file(dev, flash-&gt;data,</div><div class='del'>-						    flash-&gt;region);</div><div class='add'>+						    flash-&gt;region, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return bnxt_flash_firmware_from_file(dev, flash-&gt;region, flash-&gt;data);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nvm_get_dir_info(struct net_device *dev, u32 *entries, u32 *length)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_nvm_get_dir_info_output *output;</div><div class='add'>+	struct hwrm_nvm_get_dir_info_input *req;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct hwrm_nvm_get_dir_info_input req = {0};</div><div class='del'>-	struct hwrm_nvm_get_dir_info_output *output = bp-&gt;hwrm_cmd_resp_addr;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_GET_DIR_INFO, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_DIR_INFO);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	output = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		*entries = le32_to_cpu(output-&gt;entries);</div><div class='ctx'> 		*length = le32_to_cpu(output-&gt;entry_length);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2108,12 +4062,15 @@ static int bnxt_get_nvram_directory(struct net_device *dev, u32 len, u8 *data)</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> 	size_t buflen;</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='del'>-	struct hwrm_nvm_get_dir_entries_input req = {0};</div><div class='add'>+	struct hwrm_nvm_get_dir_entries_input *req;</div><div class='ctx'> </div><div class='ctx'> 	rc = nvm_get_dir_info(dev, &amp;dir_entries, &amp;entry_length);</div><div class='ctx'> 	if (rc != 0)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='add'>+	if (!dir_entries || !entry_length)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='ctx'> 	/* Insert 2 bytes of directory info (count and size of entries) */</div><div class='ctx'> 	if (len &lt; 2)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -2123,73 +4080,82 @@ static int bnxt_get_nvram_directory(struct net_device *dev, u32 len, u8 *data)</div><div class='ctx'> 	len -= 2;</div><div class='ctx'> 	memset(data, 0xff, len);</div><div class='ctx'> </div><div class='del'>-	buflen = dir_entries * entry_length;</div><div class='del'>-	buf = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, buflen, &amp;dma_handle,</div><div class='del'>-				 GFP_KERNEL);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_GET_DIR_ENTRIES);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	buflen = mul_u32_u32(dir_entries, entry_length);</div><div class='add'>+	buf = hwrm_req_dma_slice(bp, req, buflen, &amp;dma_handle);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		netdev_err(dev, "dma_alloc_coherent failure, length = %u\n",</div><div class='del'>-			   (unsigned)buflen);</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_GET_DIR_ENTRIES, -1, -1);</div><div class='del'>-	req.host_dest_addr = cpu_to_le64(dma_handle);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;host_dest_addr = cpu_to_le64(dma_handle);</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req); /* hold the slice */</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc == 0)</div><div class='ctx'> 		memcpy(data, buf, len &gt; buflen ? buflen : len);</div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, buflen, buf, dma_handle);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,</div><div class='del'>-			       u32 length, u8 *data)</div><div class='add'>+int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,</div><div class='add'>+			u32 length, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> 	dma_addr_t dma_handle;</div><div class='del'>-	struct hwrm_nvm_read_input req = {0};</div><div class='add'>+	struct hwrm_nvm_read_input *req;</div><div class='ctx'> </div><div class='ctx'> 	if (!length)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	buf = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, length, &amp;dma_handle,</div><div class='del'>-				 GFP_KERNEL);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_READ);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	buf = hwrm_req_dma_slice(bp, req, length, &amp;dma_handle);</div><div class='ctx'> 	if (!buf) {</div><div class='del'>-		netdev_err(dev, "dma_alloc_coherent failure, length = %u\n",</div><div class='del'>-			   (unsigned)length);</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_READ, -1, -1);</div><div class='del'>-	req.host_dest_addr = cpu_to_le64(dma_handle);</div><div class='del'>-	req.dir_idx = cpu_to_le16(index);</div><div class='del'>-	req.offset = cpu_to_le32(offset);</div><div class='del'>-	req.len = cpu_to_le32(length);</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;host_dest_addr = cpu_to_le64(dma_handle);</div><div class='add'>+	req-&gt;dir_idx = cpu_to_le16(index);</div><div class='add'>+	req-&gt;offset = cpu_to_le32(offset);</div><div class='add'>+	req-&gt;len = cpu_to_le32(length);</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req); /* hold the slice */</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (rc == 0)</div><div class='ctx'> 		memcpy(data, buf, length);</div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, length, buf, dma_handle);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='del'>-				u16 ext, u16 *index, u32 *item_length,</div><div class='del'>-				u32 *data_length)</div><div class='add'>+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='add'>+			 u16 ext, u16 *index, u32 *item_length,</div><div class='add'>+			 u32 *data_length)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_nvm_find_dir_entry_output *output;</div><div class='add'>+	struct hwrm_nvm_find_dir_entry_input *req;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='del'>-	struct hwrm_nvm_find_dir_entry_input req = {0};</div><div class='del'>-	struct hwrm_nvm_find_dir_entry_output *output = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_FIND_DIR_ENTRY, -1, -1);</div><div class='del'>-	req.enables = 0;</div><div class='del'>-	req.dir_idx = 0;</div><div class='del'>-	req.dir_type = cpu_to_le16(type);</div><div class='del'>-	req.dir_ordinal = cpu_to_le16(ordinal);</div><div class='del'>-	req.dir_ext = cpu_to_le16(ext);</div><div class='del'>-	req.opt_ordinal = NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_EQ;</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message_silent(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_FIND_DIR_ENTRY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = 0;</div><div class='add'>+	req-&gt;dir_idx = 0;</div><div class='add'>+	req-&gt;dir_type = cpu_to_le16(type);</div><div class='add'>+	req-&gt;dir_ordinal = cpu_to_le16(ordinal);</div><div class='add'>+	req-&gt;dir_ext = cpu_to_le16(ext);</div><div class='add'>+	req-&gt;opt_ordinal = NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_EQ;</div><div class='add'>+	output = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='ctx'> 	if (rc == 0) {</div><div class='ctx'> 		if (index)</div><div class='ctx'> 			*index = le16_to_cpu(output-&gt;dir_idx);</div><div class='hunk'>@@ -2198,7 +4164,7 @@ static int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='ctx'> 		if (data_length)</div><div class='ctx'> 			*data_length = le32_to_cpu(output-&gt;dir_data_length);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2235,39 +4201,56 @@ static char *bnxt_parse_pkglog(int desired_field, u8 *data, size_t datalen)</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_get_pkgver(struct net_device *dev)</div><div class='add'>+int bnxt_get_pkginfo(struct net_device *dev, char *ver, int size)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	u16 index = 0;</div><div class='ctx'> 	char *pkgver;</div><div class='ctx'> 	u32 pkglen;</div><div class='ctx'> 	u8 *pkgbuf;</div><div class='del'>-	int len;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (bnxt_find_nvram_item(dev, BNX_DIR_TYPE_PKG_LOG,</div><div class='del'>-				 BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE,</div><div class='del'>-				 &amp;index, NULL, &amp;pkglen) != 0)</div><div class='del'>-		return;</div><div class='add'>+	rc = bnxt_find_nvram_item(dev, BNX_DIR_TYPE_PKG_LOG,</div><div class='add'>+				  BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE,</div><div class='add'>+				  &amp;index, NULL, &amp;pkglen);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	pkgbuf = kzalloc(pkglen, GFP_KERNEL);</div><div class='ctx'> 	if (!pkgbuf) {</div><div class='ctx'> 		dev_err(&amp;bp-&gt;pdev-&gt;dev, "Unable to allocate memory for pkg version, length = %u\n",</div><div class='ctx'> 			pkglen);</div><div class='del'>-		return;</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bnxt_get_nvram_item(dev, index, 0, pkglen, pkgbuf))</div><div class='add'>+	rc = bnxt_get_nvram_item(dev, index, 0, pkglen, pkgbuf);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='ctx'> 	pkgver = bnxt_parse_pkglog(BNX_PKG_LOG_FIELD_IDX_PKG_VERSION, pkgbuf,</div><div class='ctx'> 				   pkglen);</div><div class='del'>-	if (pkgver &amp;&amp; *pkgver != 0 &amp;&amp; isdigit(*pkgver)) {</div><div class='del'>-		len = strlen(bp-&gt;fw_ver_str);</div><div class='del'>-		snprintf(bp-&gt;fw_ver_str + len, FW_VER_STR_LEN - len - 1,</div><div class='del'>-			 "/pkg %s", pkgver);</div><div class='del'>-	}</div><div class='add'>+	if (pkgver &amp;&amp; *pkgver != 0 &amp;&amp; isdigit(*pkgver))</div><div class='add'>+		strscpy(ver, pkgver, size);</div><div class='add'>+	else</div><div class='add'>+		rc = -ENOENT;</div><div class='add'>+</div><div class='ctx'> err:</div><div class='ctx'> 	kfree(pkgbuf);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_pkgver(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	char buf[FW_VER_STR_LEN - 5];</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	if (!bnxt_get_pkginfo(dev, buf, sizeof(buf))) {</div><div class='add'>+		len = strlen(bp-&gt;fw_ver_str);</div><div class='add'>+		snprintf(bp-&gt;fw_ver_str + len, FW_VER_STR_LEN - len,</div><div class='add'>+			 "/pkg %s", buf);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_eeprom(struct net_device *dev,</div><div class='hunk'>@@ -2293,12 +4276,16 @@ static int bnxt_get_eeprom(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> static int bnxt_erase_nvram_directory(struct net_device *dev, u8 index)</div><div class='ctx'> {</div><div class='add'>+	struct hwrm_nvm_erase_dir_entry_input *req;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct hwrm_nvm_erase_dir_entry_input req = {0};</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_NVM_ERASE_DIR_ENTRY, -1, -1);</div><div class='del'>-	req.dir_idx = cpu_to_le16(index);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_NVM_ERASE_DIR_ENTRY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;dir_idx = cpu_to_le16(index);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_set_eeprom(struct net_device *dev,</div><div class='hunk'>@@ -2332,57 +4319,61 @@ static int bnxt_set_eeprom(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create or re-write an NVM item: */</div><div class='del'>-	if (bnxt_dir_type_is_executable(type) == true)</div><div class='add'>+	if (bnxt_dir_type_is_executable(type))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	ext = eeprom-&gt;magic &amp; 0xffff;</div><div class='ctx'> 	ordinal = eeprom-&gt;offset &gt;&gt; 16;</div><div class='ctx'> 	attr = eeprom-&gt;offset &amp; 0xffff;</div><div class='ctx'> </div><div class='del'>-	return bnxt_flash_nvram(dev, type, ordinal, ext, attr, data,</div><div class='add'>+	return bnxt_flash_nvram(dev, type, ordinal, ext, attr, 0, data,</div><div class='ctx'> 				eeprom-&gt;len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='add'>+static int bnxt_set_eee(struct net_device *dev, struct ethtool_keee *edata)</div><div class='ctx'> {</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);</div><div class='add'>+	__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct ethtool_eee *eee = &amp;bp-&gt;eee;</div><div class='add'>+	struct ethtool_keee *eee = &amp;bp-&gt;eee;</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='del'>-	u32 advertising =</div><div class='del'>-		 _bnxt_fw_to_ethtool_adv_spds(link_info-&gt;advertising, 0);</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	if (!BNXT_SINGLE_PF(bp))</div><div class='add'>+	if (!BNXT_PHY_CFG_ABLE(bp))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_EEE_CAP))</div><div class='add'>+	if (!(bp-&gt;phy_flags &amp; BNXT_PHY_FL_EEE_CAP))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='add'>+	mutex_lock(&amp;bp-&gt;link_lock);</div><div class='add'>+	_bnxt_fw_to_linkmode(advertising, link_info-&gt;advertising);</div><div class='ctx'> 	if (!edata-&gt;eee_enabled)</div><div class='ctx'> 		goto eee_ok;</div><div class='ctx'> </div><div class='ctx'> 	if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED)) {</div><div class='ctx'> 		netdev_warn(dev, "EEE requires autoneg\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto eee_exit;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (edata-&gt;tx_lpi_enabled) {</div><div class='ctx'> 		if (bp-&gt;lpi_tmr_hi &amp;&amp; (edata-&gt;tx_lpi_timer &gt; bp-&gt;lpi_tmr_hi ||</div><div class='ctx'> 				       edata-&gt;tx_lpi_timer &lt; bp-&gt;lpi_tmr_lo)) {</div><div class='ctx'> 			netdev_warn(dev, "Valid LPI timer range is %d and %d microsecs\n",</div><div class='ctx'> 				    bp-&gt;lpi_tmr_lo, bp-&gt;lpi_tmr_hi);</div><div class='del'>-			return -EINVAL;</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto eee_exit;</div><div class='ctx'> 		} else if (!bp-&gt;lpi_tmr_hi) {</div><div class='ctx'> 			edata-&gt;tx_lpi_timer = eee-&gt;tx_lpi_timer;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	if (!edata-&gt;advertised) {</div><div class='del'>-		edata-&gt;advertised = advertising &amp; eee-&gt;supported;</div><div class='del'>-	} else if (edata-&gt;advertised &amp; ~advertising) {</div><div class='del'>-		netdev_warn(dev, "EEE advertised %x must be a subset of autoneg advertised speeds %x\n",</div><div class='del'>-			    edata-&gt;advertised, advertising);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (linkmode_empty(edata-&gt;advertised)) {</div><div class='add'>+		linkmode_and(edata-&gt;advertised, advertising, eee-&gt;supported);</div><div class='add'>+	} else if (linkmode_andnot(tmp, edata-&gt;advertised, advertising)) {</div><div class='add'>+		netdev_warn(dev, "EEE advertised must be a subset of autoneg advertised speeds\n");</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto eee_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	eee-&gt;advertised = edata-&gt;advertised;</div><div class='add'>+	linkmode_copy(eee-&gt;advertised, edata-&gt;advertised);</div><div class='ctx'> 	eee-&gt;tx_lpi_enabled = edata-&gt;tx_lpi_enabled;</div><div class='ctx'> 	eee-&gt;tx_lpi_timer = edata-&gt;tx_lpi_timer;</div><div class='ctx'> eee_ok:</div><div class='hunk'>@@ -2391,14 +4382,16 @@ eee_ok:</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		rc = bnxt_hwrm_set_link_setting(bp, false, true);</div><div class='ctx'> </div><div class='add'>+eee_exit:</div><div class='add'>+	mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='add'>+static int bnxt_get_eee(struct net_device *dev, struct ethtool_keee *edata)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_EEE_CAP))</div><div class='add'>+	if (!(bp-&gt;phy_flags &amp; BNXT_PHY_FL_EEE_CAP))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	*edata = bp-&gt;eee;</div><div class='hunk'>@@ -2406,45 +4399,135 @@ static int bnxt_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> 		/* Preserve tx_lpi_timer so that the last value will be used</div><div class='ctx'> 		 * by default when it is re-enabled.</div><div class='ctx'> 		 */</div><div class='del'>-		edata-&gt;advertised = 0;</div><div class='add'>+		linkmode_zero(edata-&gt;advertised);</div><div class='ctx'> 		edata-&gt;tx_lpi_enabled = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;eee.eee_active)</div><div class='del'>-		edata-&gt;lp_advertised = 0;</div><div class='add'>+		linkmode_zero(edata-&gt;lp_advertised);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_pfcwd_qcfg(struct bnxt *bp, u16 *val)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_queue_pfcwd_timeout_qcfg_output *resp;</div><div class='add'>+	struct hwrm_queue_pfcwd_timeout_qcfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PFCWD_TIMEOUT_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		*val = le16_to_cpu(resp-&gt;pfcwd_timeout_value);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_pfcwd_cfg(struct bnxt *bp, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_queue_pfcwd_timeout_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_QUEUE_PFCWD_TIMEOUT_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	req-&gt;pfcwd_timeout_value = cpu_to_le16(val);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_tunable(struct net_device *dev,</div><div class='add'>+			    const struct ethtool_tunable *tuna,</div><div class='add'>+			    const void *data)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u32 rx_copybreak, val;</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_RX_COPYBREAK:</div><div class='add'>+		rx_copybreak = *(u32 *)data;</div><div class='add'>+		if (rx_copybreak &gt; BNXT_MAX_RX_COPYBREAK)</div><div class='add'>+			return -ERANGE;</div><div class='add'>+		if (rx_copybreak != bp-&gt;rx_copybreak) {</div><div class='add'>+			if (netif_running(dev))</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			bp-&gt;rx_copybreak = rx_copybreak;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	case ETHTOOL_PFC_PREVENTION_TOUT:</div><div class='add'>+		if (BNXT_VF(bp) || !bp-&gt;max_pfcwd_tmo_ms)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		val = *(u16 *)data;</div><div class='add'>+		if (val &gt; bp-&gt;max_pfcwd_tmo_ms &amp;&amp;</div><div class='add'>+		    val != PFC_STORM_PREVENTION_AUTO)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		return bnxt_hwrm_pfcwd_cfg(bp, val);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_tunable(struct net_device *dev,</div><div class='add'>+			    const struct ethtool_tunable *tuna, void *data)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_RX_COPYBREAK:</div><div class='add'>+		*(u32 *)data = bp-&gt;rx_copybreak;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_PFC_PREVENTION_TOUT:</div><div class='add'>+		if (!bp-&gt;max_pfcwd_tmo_ms)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		return bnxt_hwrm_pfcwd_qcfg(bp, data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_read_sfp_module_eeprom_info(struct bnxt *bp, u16 i2c_addr,</div><div class='del'>-					    u16 page_number, u16 start_addr,</div><div class='del'>-					    u16 data_length, u8 *buf)</div><div class='add'>+					    u16 page_number, u8 bank,</div><div class='add'>+					    u16 start_addr, u16 data_length,</div><div class='add'>+					    u8 *buf)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_i2c_read_input req = {0};</div><div class='del'>-	struct hwrm_port_phy_i2c_read_output *output = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_port_phy_i2c_read_output *output;</div><div class='add'>+	struct hwrm_port_phy_i2c_read_input *req;</div><div class='ctx'> 	int rc, byte_offset = 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_I2C_READ, -1, -1);</div><div class='del'>-	req.i2c_slave_addr = i2c_addr;</div><div class='del'>-	req.page_number = cpu_to_le16(page_number);</div><div class='del'>-	req.port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_I2C_READ);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	output = hwrm_req_hold(bp, req);</div><div class='add'>+	req-&gt;i2c_slave_addr = i2c_addr;</div><div class='add'>+	req-&gt;page_number = cpu_to_le16(page_number);</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='ctx'> 	do {</div><div class='ctx'> 		u16 xfer_size;</div><div class='ctx'> </div><div class='ctx'> 		xfer_size = min_t(u16, data_length, BNXT_MAX_PHY_I2C_RESP_SIZE);</div><div class='ctx'> 		data_length -= xfer_size;</div><div class='del'>-		req.page_offset = cpu_to_le16(start_addr + byte_offset);</div><div class='del'>-		req.data_length = xfer_size;</div><div class='del'>-		req.enables = cpu_to_le32(start_addr + byte_offset ?</div><div class='del'>-				 PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET : 0);</div><div class='del'>-		mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='add'>+		req-&gt;page_offset = cpu_to_le16(start_addr + byte_offset);</div><div class='add'>+		req-&gt;data_length = xfer_size;</div><div class='add'>+		req-&gt;enables =</div><div class='add'>+			cpu_to_le32((start_addr + byte_offset ?</div><div class='add'>+				     PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET :</div><div class='add'>+				     0) |</div><div class='add'>+				    (bank ?</div><div class='add'>+				     PORT_PHY_I2C_READ_REQ_ENABLES_BANK_NUMBER :</div><div class='add'>+				     0));</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 		if (!rc)</div><div class='ctx'> 			memcpy(buf + byte_offset, output-&gt;data, xfer_size);</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 		byte_offset += xfer_size;</div><div class='ctx'> 	} while (!rc &amp;&amp; data_length &gt; 0);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='hunk'>@@ -2456,6 +4539,9 @@ static int bnxt_get_module_info(struct net_device *dev,</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='add'>+	if (BNXT_VF(bp) &amp;&amp; !BNXT_VF_IS_TRUSTED(bp))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	/* No point in going further if phy status indicates</div><div class='ctx'> 	 * module is not inserted or if it is powered down or</div><div class='ctx'> 	 * if it is of type 10GBase-T</div><div class='hunk'>@@ -2468,7 +4554,7 @@ static int bnxt_get_module_info(struct net_device *dev,</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10202)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0,</div><div class='add'>+	rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0, 0,</div><div class='ctx'> 					      SFF_DIAG_SUPPORT_OFFSET + 1,</div><div class='ctx'> 					      data);</div><div class='ctx'> 	if (!rc) {</div><div class='hunk'>@@ -2507,13 +4593,16 @@ static int bnxt_get_module_eeprom(struct net_device *dev,</div><div class='ctx'> 	u16  start = eeprom-&gt;offset, length = eeprom-&gt;len;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='add'>+	if (BNXT_VF(bp) &amp;&amp; !BNXT_VF_IS_TRUSTED(bp))</div><div class='add'>+		return -EPERM;</div><div class='add'>+</div><div class='ctx'> 	memset(data, 0, eeprom-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* Read A0 portion of the EEPROM */</div><div class='ctx'> 	if (start &lt; ETH_MODULE_SFF_8436_LEN) {</div><div class='ctx'> 		if (start + eeprom-&gt;len &gt; ETH_MODULE_SFF_8436_LEN)</div><div class='ctx'> 			length = ETH_MODULE_SFF_8436_LEN - start;</div><div class='del'>-		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0,</div><div class='add'>+		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0,</div><div class='ctx'> 						      start, length, data);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			return rc;</div><div class='hunk'>@@ -2525,12 +4614,148 @@ static int bnxt_get_module_eeprom(struct net_device *dev,</div><div class='ctx'> 	/* Read A2 portion of the EEPROM */</div><div class='ctx'> 	if (length) {</div><div class='ctx'> 		start -= ETH_MODULE_SFF_8436_LEN;</div><div class='del'>-		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 1,</div><div class='add'>+		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 0, 0,</div><div class='ctx'> 						      start, length, data);</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_get_module_status(struct bnxt *bp, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;link_info.module_status &lt;=</div><div class='add'>+	    PORT_PHY_QCFG_RESP_MODULE_STATUS_WARNINGMSG)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;link_info.phy_type == PORT_PHY_QCFG_RESP_PHY_TYPE_BASET ||</div><div class='add'>+	    bp-&gt;link_info.phy_type == PORT_PHY_QCFG_RESP_PHY_TYPE_BASETE){</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Operation not supported as PHY type is Base-T");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	switch (bp-&gt;link_info.module_status) {</div><div class='add'>+	case PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Transceiver module is powering down");</div><div class='add'>+		break;</div><div class='add'>+	case PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTINSERTED:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Transceiver module not inserted");</div><div class='add'>+		break;</div><div class='add'>+	case PORT_PHY_QCFG_RESP_MODULE_STATUS_CURRENTFAULT:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Transceiver module disabled due to current fault");</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unknown error");</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_mod_eeprom_by_page_precheck(struct bnxt *bp,</div><div class='add'>+				 const struct ethtool_module_eeprom *page_data,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) &amp;&amp; !BNXT_VF_IS_TRUSTED(bp)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Module read/write not permitted on untrusted VF");</div><div class='add'>+		return -EPERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = bnxt_get_module_status(bp, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10202) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Firmware version too old");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (page_data-&gt;bank &amp;&amp; !(bp-&gt;phy_flags &amp; BNXT_PHY_FL_BANK_SEL)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Firmware not capable for bank selection");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_module_eeprom_by_page(struct net_device *dev,</div><div class='add'>+					  const struct ethtool_module_eeprom *page_data,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_mod_eeprom_by_page_precheck(bp, page_data, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_read_sfp_module_eeprom_info(bp, page_data-&gt;i2c_address &lt;&lt; 1,</div><div class='add'>+					      page_data-&gt;page, page_data-&gt;bank,</div><div class='add'>+					      page_data-&gt;offset,</div><div class='add'>+					      page_data-&gt;length,</div><div class='add'>+					      page_data-&gt;data);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Module`s eeprom read failed");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	return page_data-&gt;length;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_write_sfp_module_eeprom_info(struct bnxt *bp,</div><div class='add'>+					     const struct ethtool_module_eeprom *page)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_phy_i2c_write_input *req;</div><div class='add'>+	int bytes_written = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_I2C_WRITE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='add'>+	req-&gt;i2c_slave_addr = page-&gt;i2c_address &lt;&lt; 1;</div><div class='add'>+	req-&gt;page_number = cpu_to_le16(page-&gt;page);</div><div class='add'>+	req-&gt;bank_number = page-&gt;bank;</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(bp-&gt;pf.port_id);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(PORT_PHY_I2C_WRITE_REQ_ENABLES_PAGE_OFFSET |</div><div class='add'>+				   PORT_PHY_I2C_WRITE_REQ_ENABLES_BANK_NUMBER);</div><div class='add'>+</div><div class='add'>+	while (bytes_written &lt; page-&gt;length) {</div><div class='add'>+		u16 xfer_size;</div><div class='add'>+</div><div class='add'>+		xfer_size = min_t(u16, page-&gt;length - bytes_written,</div><div class='add'>+				  BNXT_MAX_PHY_I2C_RESP_SIZE);</div><div class='add'>+		req-&gt;page_offset = cpu_to_le16(page-&gt;offset + bytes_written);</div><div class='add'>+		req-&gt;data_length = xfer_size;</div><div class='add'>+		memcpy(req-&gt;data, page-&gt;data + bytes_written, xfer_size);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+		bytes_written += xfer_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_set_module_eeprom_by_page(struct net_device *dev,</div><div class='add'>+					  const struct ethtool_module_eeprom *page_data,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_mod_eeprom_by_page_precheck(bp, page_data, extack);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_write_sfp_module_eeprom_info(bp, page_data);</div><div class='add'>+	if (rc) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Module`s eeprom write failed");</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	return page_data-&gt;length;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_nway_reset(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0;</div><div class='hunk'>@@ -2538,7 +4763,7 @@ static int bnxt_nway_reset(struct net_device *dev)</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_link_info *link_info = &amp;bp-&gt;link_info;</div><div class='ctx'> </div><div class='del'>-	if (!BNXT_SINGLE_PF(bp))</div><div class='add'>+	if (!BNXT_PHY_CFG_ABLE(bp))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (!(link_info-&gt;autoneg &amp; BNXT_AUTONEG_SPEED))</div><div class='hunk'>@@ -2553,13 +4778,13 @@ static int bnxt_nway_reset(struct net_device *dev)</div><div class='ctx'> static int bnxt_set_phys_id(struct net_device *dev,</div><div class='ctx'> 			    enum ethtool_phys_id_state state)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_led_cfg_input req = {0};</div><div class='add'>+	struct hwrm_port_led_cfg_input *req;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> 	struct bnxt_led_cfg *led_cfg;</div><div class='ctx'> 	u8 led_state;</div><div class='ctx'> 	__le16 duration;</div><div class='del'>-	int i, rc;</div><div class='add'>+	int rc, i;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;num_leds || BNXT_VF(bp))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -2573,30 +4798,35 @@ static int bnxt_set_phys_id(struct net_device *dev,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_LED_CFG, -1, -1);</div><div class='del'>-	req.port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='del'>-	req.num_leds = bp-&gt;num_leds;</div><div class='del'>-	led_cfg = (struct bnxt_led_cfg *)&amp;req.led0_id;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_LED_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;port_id = cpu_to_le16(pf-&gt;port_id);</div><div class='add'>+	req-&gt;num_leds = bp-&gt;num_leds;</div><div class='add'>+	led_cfg = (struct bnxt_led_cfg *)&amp;req-&gt;led0_id;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;num_leds; i++, led_cfg++) {</div><div class='del'>-		req.enables |= BNXT_LED_DFLT_ENABLES(i);</div><div class='add'>+		req-&gt;enables |= BNXT_LED_DFLT_ENABLES(i);</div><div class='ctx'> 		led_cfg-&gt;led_id = bp-&gt;leds[i].led_id;</div><div class='ctx'> 		led_cfg-&gt;led_state = led_state;</div><div class='ctx'> 		led_cfg-&gt;led_blink_on = duration;</div><div class='ctx'> 		led_cfg-&gt;led_blink_off = duration;</div><div class='ctx'> 		led_cfg-&gt;led_group_id = bp-&gt;leds[i].led_group_id;</div><div class='ctx'> 	}</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='del'>-	return rc;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_selftest_irq(struct bnxt *bp, u16 cmpl_ring)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_selftest_irq_input req = {0};</div><div class='add'>+	struct hwrm_selftest_irq_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_SELFTEST_IRQ, cmpl_ring, -1);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_SELFTEST_IRQ);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;cmpl_ring = cpu_to_le16(cmpl_ring);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_test_irq(struct bnxt *bp)</div><div class='hunk'>@@ -2616,31 +4846,37 @@ static int bnxt_test_irq(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_mac_loopback(struct bnxt *bp, bool enable)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_mac_cfg_input req = {0};</div><div class='add'>+	struct hwrm_port_mac_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_MAC_CFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	req.enables = cpu_to_le32(PORT_MAC_CFG_REQ_ENABLES_LPBK);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(PORT_MAC_CFG_REQ_ENABLES_LPBK);</div><div class='ctx'> 	if (enable)</div><div class='del'>-		req.lpbk = PORT_MAC_CFG_REQ_LPBK_LOCAL;</div><div class='add'>+		req-&gt;lpbk = PORT_MAC_CFG_REQ_LPBK_LOCAL;</div><div class='ctx'> 	else</div><div class='del'>-		req.lpbk = PORT_MAC_CFG_REQ_LPBK_NONE;</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+		req-&gt;lpbk = PORT_MAC_CFG_REQ_LPBK_NONE;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_query_force_speeds(struct bnxt *bp, u16 *force_speeds)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_port_phy_qcaps_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_qcaps_output *resp;</div><div class='add'>+	struct hwrm_port_phy_qcaps_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_QCAPS, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc)</div><div class='ctx'> 		*force_speeds = le16_to_cpu(resp-&gt;supported_speeds_force_mode);</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2652,7 +4888,8 @@ static int bnxt_disable_an_for_lpbk(struct bnxt *bp,</div><div class='ctx'> 	u16 fw_speed;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (!link_info-&gt;autoneg)</div><div class='add'>+	if (!link_info-&gt;autoneg ||</div><div class='add'>+	    (bp-&gt;phy_flags &amp; BNXT_PHY_FL_AN_PHY_LPBK))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_query_force_speeds(bp, &amp;fw_advertising);</div><div class='hunk'>@@ -2660,7 +4897,7 @@ static int bnxt_disable_an_for_lpbk(struct bnxt *bp,</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='ctx'> 	fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB;</div><div class='del'>-	if (netif_carrier_ok(bp-&gt;dev))</div><div class='add'>+	if (BNXT_LINK_IS_UP(bp))</div><div class='ctx'> 		fw_speed = bp-&gt;link_info.link_speed;</div><div class='ctx'> 	else if (fw_advertising &amp; BNXT_LINK_SPEED_MSK_10GB)</div><div class='ctx'> 		fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB;</div><div class='hunk'>@@ -2674,7 +4911,7 @@ static int bnxt_disable_an_for_lpbk(struct bnxt *bp,</div><div class='ctx'> 	req-&gt;force_link_speed = cpu_to_le16(fw_speed);</div><div class='ctx'> 	req-&gt;flags |= cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE |</div><div class='ctx'> 				  PORT_PHY_CFG_REQ_FLAGS_RESET_PHY);</div><div class='del'>-	rc = hwrm_send_message(bp, req, sizeof(*req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	req-&gt;flags = 0;</div><div class='ctx'> 	req-&gt;force_link_speed = cpu_to_le16(0);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -2682,21 +4919,29 @@ static int bnxt_disable_an_for_lpbk(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_phy_loopback(struct bnxt *bp, bool enable, bool ext)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_port_phy_cfg_input req = {0};</div><div class='add'>+	struct hwrm_port_phy_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_PORT_PHY_CFG, -1, -1);</div><div class='add'>+	/* prevent bnxt_disable_an_for_lpbk() from consuming the request */</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='ctx'> </div><div class='ctx'> 	if (enable) {</div><div class='del'>-		bnxt_disable_an_for_lpbk(bp, &amp;req);</div><div class='add'>+		bnxt_disable_an_for_lpbk(bp, req);</div><div class='ctx'> 		if (ext)</div><div class='del'>-			req.lpbk = PORT_PHY_CFG_REQ_LPBK_EXTERNAL;</div><div class='add'>+			req-&gt;lpbk = PORT_PHY_CFG_REQ_LPBK_EXTERNAL;</div><div class='ctx'> 		else</div><div class='del'>-			req.lpbk = PORT_PHY_CFG_REQ_LPBK_LOCAL;</div><div class='add'>+			req-&gt;lpbk = PORT_PHY_CFG_REQ_LPBK_LOCAL;</div><div class='ctx'> 	} else {</div><div class='del'>-		req.lpbk = PORT_PHY_CFG_REQ_LPBK_NONE;</div><div class='add'>+		req-&gt;lpbk = PORT_PHY_CFG_REQ_LPBK_NONE;</div><div class='ctx'> 	}</div><div class='del'>-	req.enables = cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_LPBK);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_LPBK);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_rx_loopback(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='hunk'>@@ -2755,7 +5000,8 @@ static int bnxt_poll_loopback(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,</div><div class='ctx'> 		 * reading any further.</div><div class='ctx'> 		 */</div><div class='ctx'> 		dma_rmb();</div><div class='del'>-		if (TX_CMP_TYPE(txcmp) == CMP_TYPE_RX_L2_CMP) {</div><div class='add'>+		if (TX_CMP_TYPE(txcmp) == CMP_TYPE_RX_L2_CMP ||</div><div class='add'>+		    TX_CMP_TYPE(txcmp) == CMP_TYPE_RX_L2_V3_CMP) {</div><div class='ctx'> 			rc = bnxt_rx_loopback(bp, cpr, raw_cons, pkt_size);</div><div class='ctx'> 			raw_cons = NEXT_RAW_CMP(raw_cons);</div><div class='ctx'> 			raw_cons = NEXT_RAW_CMP(raw_cons);</div><div class='hunk'>@@ -2779,14 +5025,15 @@ static int bnxt_run_loopback(struct bnxt *bp)</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	cpr = &amp;rxr-&gt;bnapi-&gt;cp_ring;</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-		cpr = cpr-&gt;cp_ring_arr[BNXT_RX_HDL];</div><div class='del'>-	pkt_size = min(bp-&gt;dev-&gt;mtu + ETH_HLEN, bp-&gt;rx_copy_thresh);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		cpr = rxr-&gt;rx_cpr;</div><div class='add'>+	pkt_size = min(bp-&gt;dev-&gt;mtu + ETH_HLEN, max(BNXT_DEFAULT_RX_COPYBREAK,</div><div class='add'>+						    bp-&gt;rx_copybreak));</div><div class='ctx'> 	skb = netdev_alloc_skb(bp-&gt;dev, pkt_size);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	data = skb_put(skb, pkt_size);</div><div class='del'>-	eth_broadcast_addr(data);</div><div class='add'>+	ether_addr_copy(&amp;data[i], bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	i += ETH_ALEN;</div><div class='ctx'> 	ether_addr_copy(&amp;data[i], bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	i += ETH_ALEN;</div><div class='hunk'>@@ -2794,12 +5041,12 @@ static int bnxt_run_loopback(struct bnxt *bp)</div><div class='ctx'> 		data[i] = (u8)(i &amp; 0xff);</div><div class='ctx'> </div><div class='ctx'> 	map = dma_map_single(&amp;bp-&gt;pdev-&gt;dev, skb-&gt;data, pkt_size,</div><div class='del'>-			     PCI_DMA_TODEVICE);</div><div class='add'>+			     DMA_TO_DEVICE);</div><div class='ctx'> 	if (dma_mapping_error(&amp;bp-&gt;pdev-&gt;dev, map)) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_xmit_xdp(bp, txr, map, pkt_size, 0);</div><div class='add'>+	bnxt_xmit_bd(bp, txr, map, pkt_size, NULL);</div><div class='ctx'> </div><div class='ctx'> 	/* Sync BD data before updating doorbell */</div><div class='ctx'> 	wmb();</div><div class='hunk'>@@ -2807,24 +5054,28 @@ static int bnxt_run_loopback(struct bnxt *bp)</div><div class='ctx'> 	bnxt_db_write(bp, &amp;txr-&gt;tx_db, txr-&gt;tx_prod);</div><div class='ctx'> 	rc = bnxt_poll_loopback(bp, cpr, pkt_size);</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, map, pkt_size, PCI_DMA_TODEVICE);</div><div class='add'>+	dma_unmap_single(&amp;bp-&gt;pdev-&gt;dev, map, pkt_size, DMA_TO_DEVICE);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_run_fw_tests(struct bnxt *bp, u8 test_mask, u8 *test_results)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_selftest_exec_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_selftest_exec_input req = {0};</div><div class='add'>+	struct hwrm_selftest_exec_output *resp;</div><div class='add'>+	struct hwrm_selftest_exec_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_SELFTEST_EXEC, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	resp-&gt;test_success = 0;</div><div class='del'>-	req.flags = test_mask;</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), bp-&gt;test_info-&gt;timeout);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_SELFTEST_EXEC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	hwrm_req_timeout(bp, req, bp-&gt;test_info-&gt;timeout);</div><div class='add'>+	req-&gt;flags = test_mask;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	*test_results = resp-&gt;test_success;</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2842,24 +5093,32 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,</div><div class='ctx'> 	bool offline = false;</div><div class='ctx'> 	u8 test_results = 0;</div><div class='ctx'> 	u8 test_mask = 0;</div><div class='del'>-	int rc, i;</div><div class='add'>+	int rc = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (!bp-&gt;num_tests || !BNXT_SINGLE_PF(bp))</div><div class='add'>+	if (!bp-&gt;num_tests || !BNXT_PF(bp))</div><div class='ctx'> 		return;</div><div class='add'>+</div><div class='ctx'> 	memset(buf, 0, sizeof(u64) * bp-&gt;num_tests);</div><div class='add'>+	if (etest-&gt;flags &amp; ETH_TEST_FL_OFFLINE &amp;&amp;</div><div class='add'>+	    bnxt_ulp_registered(bp-&gt;edev)) {</div><div class='add'>+		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		netdev_warn(dev, "Offline tests cannot be run with RoCE driver loaded\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((etest-&gt;flags &amp; ETH_TEST_FL_EXTERNAL_LB) &amp;&amp;</div><div class='del'>-	    (bp-&gt;test_info-&gt;flags &amp; BNXT_TEST_FL_EXT_LPBK))</div><div class='add'>+	    (bp-&gt;phy_flags &amp; BNXT_PHY_FL_EXT_LPBK))</div><div class='ctx'> 		do_ext_lpbk = true;</div><div class='ctx'> </div><div class='ctx'> 	if (etest-&gt;flags &amp; ETH_TEST_FL_OFFLINE) {</div><div class='del'>-		if (bp-&gt;pf.active_vfs) {</div><div class='add'>+		if (bp-&gt;pf.active_vfs || !BNXT_SINGLE_PF(bp)) {</div><div class='ctx'> 			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='del'>-			netdev_warn(dev, "Offline tests cannot be run with active VFs\n");</div><div class='add'>+			netdev_warn(dev, "Offline tests cannot be run with active VFs or on shared PF\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		offline = true;</div><div class='hunk'>@@ -2876,46 +5135,53 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,</div><div class='ctx'> 	if (!offline) {</div><div class='ctx'> 		bnxt_run_fw_tests(bp, test_mask, &amp;test_results);</div><div class='ctx'> 	} else {</div><div class='del'>-		rc = bnxt_close_nic(bp, false, false);</div><div class='del'>-		if (rc)</div><div class='del'>-			return;</div><div class='add'>+		bnxt_close_nic(bp, true, false);</div><div class='ctx'> 		bnxt_run_fw_tests(bp, test_mask, &amp;test_results);</div><div class='ctx'> </div><div class='del'>-		buf[BNXT_MACLPBK_TEST_IDX] = 1;</div><div class='del'>-		bnxt_hwrm_mac_loopback(bp, true);</div><div class='del'>-		msleep(250);</div><div class='ctx'> 		rc = bnxt_half_open_nic(bp);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			bnxt_hwrm_mac_loopback(bp, false);</div><div class='ctx'> 			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+		buf[BNXT_MACLPBK_TEST_IDX] = 1;</div><div class='add'>+		if (bp-&gt;mac_flags &amp; BNXT_MAC_FL_NO_MAC_LPBK)</div><div class='add'>+			goto skip_mac_loopback;</div><div class='add'>+</div><div class='add'>+		bnxt_hwrm_mac_loopback(bp, true);</div><div class='add'>+		msleep(250);</div><div class='ctx'> 		if (bnxt_run_loopback(bp))</div><div class='ctx'> 			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 		else</div><div class='ctx'> 			buf[BNXT_MACLPBK_TEST_IDX] = 0;</div><div class='ctx'> </div><div class='ctx'> 		bnxt_hwrm_mac_loopback(bp, false);</div><div class='add'>+skip_mac_loopback:</div><div class='add'>+		buf[BNXT_PHYLPBK_TEST_IDX] = 1;</div><div class='add'>+		if (bp-&gt;phy_flags &amp; BNXT_PHY_FL_NO_PHY_LPBK)</div><div class='add'>+			goto skip_phy_loopback;</div><div class='add'>+</div><div class='ctx'> 		bnxt_hwrm_phy_loopback(bp, true, false);</div><div class='ctx'> 		msleep(1000);</div><div class='del'>-		if (bnxt_run_loopback(bp)) {</div><div class='del'>-			buf[BNXT_PHYLPBK_TEST_IDX] = 1;</div><div class='add'>+		if (bnxt_run_loopback(bp))</div><div class='ctx'> 			etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			buf[BNXT_PHYLPBK_TEST_IDX] = 0;</div><div class='add'>+skip_phy_loopback:</div><div class='add'>+		buf[BNXT_EXTLPBK_TEST_IDX] = 1;</div><div class='ctx'> 		if (do_ext_lpbk) {</div><div class='ctx'> 			etest-&gt;flags |= ETH_TEST_FL_EXTERNAL_LB_DONE;</div><div class='ctx'> 			bnxt_hwrm_phy_loopback(bp, true, true);</div><div class='ctx'> 			msleep(1000);</div><div class='del'>-			if (bnxt_run_loopback(bp)) {</div><div class='del'>-				buf[BNXT_EXTLPBK_TEST_IDX] = 1;</div><div class='add'>+			if (bnxt_run_loopback(bp))</div><div class='ctx'> 				etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='del'>-			}</div><div class='add'>+			else</div><div class='add'>+				buf[BNXT_EXTLPBK_TEST_IDX] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 		bnxt_hwrm_phy_loopback(bp, false, false);</div><div class='ctx'> 		bnxt_half_close_nic(bp);</div><div class='del'>-		bnxt_open_nic(bp, false, true);</div><div class='add'>+		rc = bnxt_open_nic(bp, true, true);</div><div class='ctx'> 	}</div><div class='del'>-	if (bnxt_test_irq(bp)) {</div><div class='add'>+	if (rc || bnxt_test_irq(bp)) {</div><div class='ctx'> 		buf[BNXT_IRQ_TEST_IDX] = 1;</div><div class='ctx'> 		etest-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2932,341 +5198,81 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,</div><div class='ctx'> static int bnxt_reset(struct net_device *dev, u32 *flags)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	int rc = 0;</div><div class='add'>+	bool reload = false;</div><div class='add'>+	u32 req = *flags;</div><div class='add'>+</div><div class='add'>+	if (!req)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!BNXT_PF(bp)) {</div><div class='ctx'> 		netdev_err(dev, "Reset is not supported from a VF\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (pci_vfs_assigned(bp-&gt;pdev)) {</div><div class='add'>+	if (pci_vfs_assigned(bp-&gt;pdev) &amp;&amp;</div><div class='add'>+	    !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET)) {</div><div class='ctx'> 		netdev_err(dev,</div><div class='ctx'> 			   "Reset not allowed when VFs are assigned to VMs\n");</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (*flags == ETH_RESET_ALL) {</div><div class='del'>-		/* This feature is not supported in older firmware versions */</div><div class='del'>-		if (bp-&gt;hwrm_spec_code &lt; 0x10803)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		rc = bnxt_firmware_reset(dev, BNXT_FW_RESET_CHIP);</div><div class='del'>-		if (!rc) {</div><div class='del'>-			netdev_info(dev, "Reset request successful. Reload driver to complete reset\n");</div><div class='del'>-			*flags = 0;</div><div class='del'>-		}</div><div class='del'>-	} else if (*flags == ETH_RESET_AP) {</div><div class='add'>+	if ((req &amp; BNXT_FW_RESET_CHIP) == BNXT_FW_RESET_CHIP) {</div><div class='ctx'> 		/* This feature is not supported in older firmware versions */</div><div class='del'>-		if (bp-&gt;hwrm_spec_code &lt; 0x10803)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-		rc = bnxt_firmware_reset(dev, BNXT_FW_RESET_AP);</div><div class='del'>-		if (!rc) {</div><div class='del'>-			netdev_info(dev, "Reset Application Processor request successful.\n");</div><div class='del'>-			*flags = 0;</div><div class='add'>+		if (bp-&gt;hwrm_spec_code &gt;= 0x10803) {</div><div class='add'>+			if (!bnxt_firmware_reset_chip(dev)) {</div><div class='add'>+				netdev_info(dev, "Firmware reset request successful.\n");</div><div class='add'>+				if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_HOT_RESET))</div><div class='add'>+					reload = true;</div><div class='add'>+				*flags &amp;= ~BNXT_FW_RESET_CHIP;</div><div class='add'>+			}</div><div class='add'>+		} else if (req == BNXT_FW_RESET_CHIP) {</div><div class='add'>+			return -EOPNOTSUPP; /* only request, fail hard */</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		rc = -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bnxt_hwrm_dbg_dma_data(struct bnxt *bp, void *msg, int msg_len,</div><div class='del'>-				  struct bnxt_hwrm_dbg_dma_info *info)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_dbg_cmn_output *cmn_resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_dbg_cmn_input *cmn_req = msg;</div><div class='del'>-	__le16 *seq_ptr = msg + info-&gt;seq_off;</div><div class='del'>-	u16 seq = 0, len, segs_off;</div><div class='del'>-	void *resp = cmn_resp;</div><div class='del'>-	dma_addr_t dma_handle;</div><div class='del'>-	int rc, off = 0;</div><div class='del'>-	void *dma_buf;</div><div class='del'>-</div><div class='del'>-	dma_buf = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, info-&gt;dma_len, &amp;dma_handle,</div><div class='del'>-				     GFP_KERNEL);</div><div class='del'>-	if (!dma_buf)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	segs_off = offsetof(struct hwrm_dbg_coredump_list_output,</div><div class='del'>-			    total_segments);</div><div class='del'>-	cmn_req-&gt;host_dest_addr = cpu_to_le64(dma_handle);</div><div class='del'>-	cmn_req-&gt;host_buf_len = cpu_to_le32(info-&gt;dma_len);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	while (1) {</div><div class='del'>-		*seq_ptr = cpu_to_le16(seq);</div><div class='del'>-		rc = _hwrm_send_message(bp, msg, msg_len, HWRM_CMD_TIMEOUT);</div><div class='del'>-		if (rc)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		len = le16_to_cpu(*((__le16 *)(resp + info-&gt;data_len_off)));</div><div class='del'>-		if (!seq &amp;&amp;</div><div class='del'>-		    cmn_req-&gt;req_type == cpu_to_le16(HWRM_DBG_COREDUMP_LIST)) {</div><div class='del'>-			info-&gt;segs = le16_to_cpu(*((__le16 *)(resp +</div><div class='del'>-							      segs_off)));</div><div class='del'>-			if (!info-&gt;segs) {</div><div class='del'>-				rc = -EIO;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			info-&gt;dest_buf_size = info-&gt;segs *</div><div class='del'>-					sizeof(struct coredump_segment_record);</div><div class='del'>-			info-&gt;dest_buf = kmalloc(info-&gt;dest_buf_size,</div><div class='del'>-						 GFP_KERNEL);</div><div class='del'>-			if (!info-&gt;dest_buf) {</div><div class='del'>-				rc = -ENOMEM;</div><div class='del'>-				break;</div><div class='add'>+	if (!BNXT_CHIP_P4_PLUS(bp) &amp;&amp; (req &amp; BNXT_FW_RESET_AP)) {</div><div class='add'>+		/* This feature is not supported in older firmware versions */</div><div class='add'>+		if (bp-&gt;hwrm_spec_code &gt;= 0x10803) {</div><div class='add'>+			if (!bnxt_firmware_reset_ap(dev)) {</div><div class='add'>+				netdev_info(dev, "Reset application processor successful.\n");</div><div class='add'>+				reload = true;</div><div class='add'>+				*flags &amp;= ~BNXT_FW_RESET_AP;</div><div class='ctx'> 			}</div><div class='add'>+		} else if (req == BNXT_FW_RESET_AP) {</div><div class='add'>+			return -EOPNOTSUPP; /* only request, fail hard */</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		if (info-&gt;dest_buf)</div><div class='del'>-			memcpy(info-&gt;dest_buf + off, dma_buf, len);</div><div class='del'>-</div><div class='del'>-		if (cmn_req-&gt;req_type ==</div><div class='del'>-				cpu_to_le16(HWRM_DBG_COREDUMP_RETRIEVE))</div><div class='del'>-			info-&gt;dest_buf_size += len;</div><div class='del'>-</div><div class='del'>-		if (!(cmn_resp-&gt;flags &amp; HWRM_DBG_CMN_FLAGS_MORE))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		seq++;</div><div class='del'>-		off += len;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, info-&gt;dma_len, dma_buf, dma_handle);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bnxt_hwrm_dbg_coredump_list(struct bnxt *bp,</div><div class='del'>-				       struct bnxt_coredump *coredump)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_dbg_coredump_list_input req = {0};</div><div class='del'>-	struct bnxt_hwrm_dbg_dma_info info = {NULL};</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_DBG_COREDUMP_LIST, -1, -1);</div><div class='del'>-</div><div class='del'>-	info.dma_len = COREDUMP_LIST_BUF_LEN;</div><div class='del'>-	info.seq_off = offsetof(struct hwrm_dbg_coredump_list_input, seq_no);</div><div class='del'>-	info.data_len_off = offsetof(struct hwrm_dbg_coredump_list_output,</div><div class='del'>-				     data_len);</div><div class='del'>-</div><div class='del'>-	rc = bnxt_hwrm_dbg_dma_data(bp, &amp;req, sizeof(req), &amp;info);</div><div class='del'>-	if (!rc) {</div><div class='del'>-		coredump-&gt;data = info.dest_buf;</div><div class='del'>-		coredump-&gt;data_size = info.dest_buf_size;</div><div class='del'>-		coredump-&gt;total_segs = info.segs;</div><div class='del'>-	}</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_dbg_coredump_initiate(struct bnxt *bp, u16 component_id,</div><div class='del'>-					   u16 segment_id)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_dbg_coredump_initiate_input req = {0};</div><div class='add'>+	if (reload)</div><div class='add'>+		netdev_info(dev, "Reload driver to complete reset\n");</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_DBG_COREDUMP_INITIATE, -1, -1);</div><div class='del'>-	req.component_id = cpu_to_le16(component_id);</div><div class='del'>-	req.segment_id = cpu_to_le16(segment_id);</div><div class='del'>-</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_hwrm_dbg_coredump_retrieve(struct bnxt *bp, u16 component_id,</div><div class='del'>-					   u16 segment_id, u32 *seg_len,</div><div class='del'>-					   void *buf, u32 offset)</div><div class='add'>+static int bnxt_set_dump(struct net_device *dev, struct ethtool_dump *dump)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_dbg_coredump_retrieve_input req = {0};</div><div class='del'>-	struct bnxt_hwrm_dbg_dma_info info = {NULL};</div><div class='del'>-	int rc;</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_DBG_COREDUMP_RETRIEVE, -1, -1);</div><div class='del'>-	req.component_id = cpu_to_le16(component_id);</div><div class='del'>-	req.segment_id = cpu_to_le16(segment_id);</div><div class='del'>-</div><div class='del'>-	info.dma_len = COREDUMP_RETRIEVE_BUF_LEN;</div><div class='del'>-	info.seq_off = offsetof(struct hwrm_dbg_coredump_retrieve_input,</div><div class='del'>-				seq_no);</div><div class='del'>-	info.data_len_off = offsetof(struct hwrm_dbg_coredump_retrieve_output,</div><div class='del'>-				     data_len);</div><div class='del'>-	if (buf)</div><div class='del'>-		info.dest_buf = buf + offset;</div><div class='del'>-</div><div class='del'>-	rc = bnxt_hwrm_dbg_dma_data(bp, &amp;req, sizeof(req), &amp;info);</div><div class='del'>-	if (!rc)</div><div class='del'>-		*seg_len = info.dest_buf_size;</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-bnxt_fill_coredump_seg_hdr(struct bnxt *bp,</div><div class='del'>-			   struct bnxt_coredump_segment_hdr *seg_hdr,</div><div class='del'>-			   struct coredump_segment_record *seg_rec, u32 seg_len,</div><div class='del'>-			   int status, u32 duration, u32 instance)</div><div class='del'>-{</div><div class='del'>-	memset(seg_hdr, 0, sizeof(*seg_hdr));</div><div class='del'>-	memcpy(seg_hdr-&gt;signature, "sEgM", 4);</div><div class='del'>-	if (seg_rec) {</div><div class='del'>-		seg_hdr-&gt;component_id = (__force __le32)seg_rec-&gt;component_id;</div><div class='del'>-		seg_hdr-&gt;segment_id = (__force __le32)seg_rec-&gt;segment_id;</div><div class='del'>-		seg_hdr-&gt;low_version = seg_rec-&gt;version_low;</div><div class='del'>-		seg_hdr-&gt;high_version = seg_rec-&gt;version_hi;</div><div class='del'>-	} else {</div><div class='del'>-		/* For hwrm_ver_get response Component id = 2</div><div class='del'>-		 * and Segment id = 0</div><div class='del'>-		 */</div><div class='del'>-		seg_hdr-&gt;component_id = cpu_to_le32(2);</div><div class='del'>-		seg_hdr-&gt;segment_id = 0;</div><div class='del'>-	}</div><div class='del'>-	seg_hdr-&gt;function_id = cpu_to_le16(bp-&gt;pdev-&gt;devfn);</div><div class='del'>-	seg_hdr-&gt;length = cpu_to_le32(seg_len);</div><div class='del'>-	seg_hdr-&gt;status = cpu_to_le32(status);</div><div class='del'>-	seg_hdr-&gt;duration = cpu_to_le32(duration);</div><div class='del'>-	seg_hdr-&gt;data_offset = cpu_to_le32(sizeof(*seg_hdr));</div><div class='del'>-	seg_hdr-&gt;instance = cpu_to_le32(instance);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-bnxt_fill_coredump_record(struct bnxt *bp, struct bnxt_coredump_record *record,</div><div class='del'>-			  time64_t start, s16 start_utc, u16 total_segs,</div><div class='del'>-			  int status)</div><div class='del'>-{</div><div class='del'>-	time64_t end = ktime_get_real_seconds();</div><div class='del'>-	u32 os_ver_major = 0, os_ver_minor = 0;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	time64_to_tm(start, 0, &amp;tm);</div><div class='del'>-	memset(record, 0, sizeof(*record));</div><div class='del'>-	memcpy(record-&gt;signature, "cOrE", 4);</div><div class='del'>-	record-&gt;flags = 0;</div><div class='del'>-	record-&gt;low_version = 0;</div><div class='del'>-	record-&gt;high_version = 1;</div><div class='del'>-	record-&gt;asic_state = 0;</div><div class='del'>-	strlcpy(record-&gt;system_name, utsname()-&gt;nodename,</div><div class='del'>-		sizeof(record-&gt;system_name));</div><div class='del'>-	record-&gt;year = cpu_to_le16(tm.tm_year + 1900);</div><div class='del'>-	record-&gt;month = cpu_to_le16(tm.tm_mon + 1);</div><div class='del'>-	record-&gt;day = cpu_to_le16(tm.tm_mday);</div><div class='del'>-	record-&gt;hour = cpu_to_le16(tm.tm_hour);</div><div class='del'>-	record-&gt;minute = cpu_to_le16(tm.tm_min);</div><div class='del'>-	record-&gt;second = cpu_to_le16(tm.tm_sec);</div><div class='del'>-	record-&gt;utc_bias = cpu_to_le16(start_utc);</div><div class='del'>-	strcpy(record-&gt;commandline, "ethtool -w");</div><div class='del'>-	record-&gt;total_segments = cpu_to_le32(total_segs);</div><div class='del'>-</div><div class='del'>-	sscanf(utsname()-&gt;release, "%u.%u", &amp;os_ver_major, &amp;os_ver_minor);</div><div class='del'>-	record-&gt;os_ver_major = cpu_to_le32(os_ver_major);</div><div class='del'>-	record-&gt;os_ver_minor = cpu_to_le32(os_ver_minor);</div><div class='del'>-</div><div class='del'>-	strlcpy(record-&gt;os_name, utsname()-&gt;sysname, 32);</div><div class='del'>-	time64_to_tm(end, 0, &amp;tm);</div><div class='del'>-	record-&gt;end_year = cpu_to_le16(tm.tm_year + 1900);</div><div class='del'>-	record-&gt;end_month = cpu_to_le16(tm.tm_mon + 1);</div><div class='del'>-	record-&gt;end_day = cpu_to_le16(tm.tm_mday);</div><div class='del'>-	record-&gt;end_hour = cpu_to_le16(tm.tm_hour);</div><div class='del'>-	record-&gt;end_minute = cpu_to_le16(tm.tm_min);</div><div class='del'>-	record-&gt;end_second = cpu_to_le16(tm.tm_sec);</div><div class='del'>-	record-&gt;end_utc_bias = cpu_to_le16(sys_tz.tz_minuteswest * 60);</div><div class='del'>-	record-&gt;asic_id1 = cpu_to_le32(bp-&gt;chip_num &lt;&lt; 16 |</div><div class='del'>-				       bp-&gt;ver_resp.chip_rev &lt;&lt; 8 |</div><div class='del'>-				       bp-&gt;ver_resp.chip_metal);</div><div class='del'>-	record-&gt;asic_id2 = 0;</div><div class='del'>-	record-&gt;coredump_status = cpu_to_le32(status);</div><div class='del'>-	record-&gt;ioctl_low_version = 0;</div><div class='del'>-	record-&gt;ioctl_high_version = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bnxt_get_coredump(struct bnxt *bp, void *buf, u32 *dump_len)</div><div class='del'>-{</div><div class='del'>-	u32 ver_get_resp_len = sizeof(struct hwrm_ver_get_output);</div><div class='del'>-	struct coredump_segment_record *seg_record = NULL;</div><div class='del'>-	u32 offset = 0, seg_hdr_len, seg_record_len;</div><div class='del'>-	struct bnxt_coredump_segment_hdr seg_hdr;</div><div class='del'>-	struct bnxt_coredump coredump = {NULL};</div><div class='del'>-	time64_t start_time;</div><div class='del'>-	u16 start_utc;</div><div class='del'>-	int rc = 0, i;</div><div class='del'>-</div><div class='del'>-	start_time = ktime_get_real_seconds();</div><div class='del'>-	start_utc = sys_tz.tz_minuteswest * 60;</div><div class='del'>-	seg_hdr_len = sizeof(seg_hdr);</div><div class='del'>-</div><div class='del'>-	/* First segment should be hwrm_ver_get response */</div><div class='del'>-	*dump_len = seg_hdr_len + ver_get_resp_len;</div><div class='del'>-	if (buf) {</div><div class='del'>-		bnxt_fill_coredump_seg_hdr(bp, &amp;seg_hdr, NULL, ver_get_resp_len,</div><div class='del'>-					   0, 0, 0);</div><div class='del'>-		memcpy(buf + offset, &amp;seg_hdr, seg_hdr_len);</div><div class='del'>-		offset += seg_hdr_len;</div><div class='del'>-		memcpy(buf + offset, &amp;bp-&gt;ver_resp, ver_get_resp_len);</div><div class='del'>-		offset += ver_get_resp_len;</div><div class='del'>-	}</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	rc = bnxt_hwrm_dbg_coredump_list(bp, &amp;coredump);</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "Failed to get coredump segment list\n");</div><div class='del'>-		goto err;</div><div class='add'>+	if (dump-&gt;flag &gt; BNXT_DUMP_LIVE_WITH_CTX_L1_CACHE) {</div><div class='add'>+		netdev_info(dev,</div><div class='add'>+			    "Supports only Live(0), Crash(1), Driver(2), Live with cached context(3) dumps.\n");</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*dump_len += seg_hdr_len * coredump.total_segs;</div><div class='del'>-</div><div class='del'>-	seg_record = (struct coredump_segment_record *)coredump.data;</div><div class='del'>-	seg_record_len = sizeof(*seg_record);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; coredump.total_segs; i++) {</div><div class='del'>-		u16 comp_id = le16_to_cpu(seg_record-&gt;component_id);</div><div class='del'>-		u16 seg_id = le16_to_cpu(seg_record-&gt;segment_id);</div><div class='del'>-		u32 duration = 0, seg_len = 0;</div><div class='del'>-		unsigned long start, end;</div><div class='del'>-</div><div class='del'>-		start = jiffies;</div><div class='del'>-</div><div class='del'>-		rc = bnxt_hwrm_dbg_coredump_initiate(bp, comp_id, seg_id);</div><div class='del'>-		if (rc) {</div><div class='del'>-			netdev_err(bp-&gt;dev,</div><div class='del'>-				   "Failed to initiate coredump for seg = %d\n",</div><div class='del'>-				   seg_record-&gt;segment_id);</div><div class='del'>-			goto next_seg;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Write segment data into the buffer */</div><div class='del'>-		rc = bnxt_hwrm_dbg_coredump_retrieve(bp, comp_id, seg_id,</div><div class='del'>-						     &amp;seg_len, buf,</div><div class='del'>-						     offset + seg_hdr_len);</div><div class='del'>-		if (rc)</div><div class='del'>-			netdev_err(bp-&gt;dev,</div><div class='del'>-				   "Failed to retrieve coredump for seg = %d\n",</div><div class='del'>-				   seg_record-&gt;segment_id);</div><div class='del'>-</div><div class='del'>-next_seg:</div><div class='del'>-		end = jiffies;</div><div class='del'>-		duration = jiffies_to_msecs(end - start);</div><div class='del'>-		bnxt_fill_coredump_seg_hdr(bp, &amp;seg_hdr, seg_record, seg_len,</div><div class='del'>-					   rc, duration, 0);</div><div class='del'>-</div><div class='del'>-		if (buf) {</div><div class='del'>-			/* Write segment header into the buffer */</div><div class='del'>-			memcpy(buf + offset, &amp;seg_hdr, seg_hdr_len);</div><div class='del'>-			offset += seg_hdr_len + seg_len;</div><div class='add'>+	if (dump-&gt;flag == BNXT_DUMP_CRASH) {</div><div class='add'>+		if (bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_SOC_DDR &amp;&amp;</div><div class='add'>+		    (!IS_ENABLED(CONFIG_TEE_BNXT_FW))) {</div><div class='add'>+			netdev_info(dev,</div><div class='add'>+				    "Cannot collect crash dump as TEE_BNXT_FW config option is not enabled.\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		} else if (!(bp-&gt;fw_dbg_cap &amp; DBG_QCAPS_RESP_FLAGS_CRASHDUMP_HOST_DDR)) {</div><div class='add'>+			netdev_info(dev, "Crash dump collection from host memory is not supported on this interface.\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		*dump_len += seg_len;</div><div class='del'>-		seg_record =</div><div class='del'>-			(struct coredump_segment_record *)((u8 *)seg_record +</div><div class='del'>-							   seg_record_len);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-err:</div><div class='del'>-	if (buf)</div><div class='del'>-		bnxt_fill_coredump_record(bp, buf + offset, start_time,</div><div class='del'>-					  start_utc, coredump.total_segs + 1,</div><div class='del'>-					  rc);</div><div class='del'>-	kfree(coredump.data);</div><div class='del'>-	*dump_len += sizeof(struct bnxt_coredump_record);</div><div class='del'>-</div><div class='del'>-	return rc;</div><div class='add'>+	bp-&gt;dump_flag = dump-&gt;flag;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_dump_flag(struct net_device *dev, struct ethtool_dump *dump)</div><div class='hunk'>@@ -3281,7 +5287,9 @@ static int bnxt_get_dump_flag(struct net_device *dev, struct ethtool_dump *dump)</div><div class='ctx'> 			bp-&gt;ver_resp.hwrm_fw_bld_8b &lt;&lt; 8 |</div><div class='ctx'> 			bp-&gt;ver_resp.hwrm_fw_rsvd_8b;</div><div class='ctx'> </div><div class='del'>-	return bnxt_get_coredump(bp, NULL, &amp;dump-&gt;len);</div><div class='add'>+	dump-&gt;flag = bp-&gt;dump_flag;</div><div class='add'>+	dump-&gt;len = bnxt_get_coredump_length(bp, bp-&gt;dump_flag);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_get_dump_data(struct net_device *dev, struct ethtool_dump *dump,</div><div class='hunk'>@@ -3294,34 +5302,91 @@ static int bnxt_get_dump_data(struct net_device *dev, struct ethtool_dump *dump,</div><div class='ctx'> </div><div class='ctx'> 	memset(buf, 0, dump-&gt;len);</div><div class='ctx'> </div><div class='del'>-	return bnxt_get_coredump(bp, buf, &amp;dump-&gt;len);</div><div class='add'>+	dump-&gt;flag = bp-&gt;dump_flag;</div><div class='add'>+	return bnxt_get_coredump(bp, dump-&gt;flag, buf, &amp;dump-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_ts_info(struct net_device *dev,</div><div class='add'>+			    struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ptp_cfg *ptp;</div><div class='add'>+</div><div class='add'>+	ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='add'>+</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+				 SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+				 SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+	if (ptp-&gt;ptp_clock)</div><div class='add'>+		info-&gt;phc_index = ptp_clock_index(ptp-&gt;ptp_clock);</div><div class='add'>+</div><div class='add'>+	info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) | (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='add'>+</div><div class='add'>+	info-&gt;rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='add'>+			   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |</div><div class='add'>+			   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L4_EVENT);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_RX_ALL_PKT_TS)</div><div class='add'>+		info-&gt;rx_filters |= (1 &lt;&lt; HWTSTAMP_FILTER_ALL);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_pcie_qstats(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_pcie_qstats_output *resp;</div><div class='add'>+	struct hwrm_pcie_qstats_input *req;</div><div class='add'>+</div><div class='add'>+	bp-&gt;pcie_stat_len = 0;</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PCIE_STATS_SUPPORTED))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_PCIE_QSTATS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	if (__bnxt_hwrm_pcie_qstats(bp, req))</div><div class='add'>+		bp-&gt;pcie_stat_len = min_t(u16,</div><div class='add'>+					  le16_to_cpu(resp-&gt;pcie_stat_size),</div><div class='add'>+					  sizeof(struct pcie_ctx_hw_stats_v2));</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnxt_ethtool_init(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_selftest_qlist_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_selftest_qlist_input req = {0};</div><div class='add'>+	struct hwrm_selftest_qlist_output *resp;</div><div class='add'>+	struct hwrm_selftest_qlist_input *req;</div><div class='ctx'> 	struct bnxt_test_info *test_info;</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='add'>+	bnxt_hwrm_pcie_qstats(bp);</div><div class='ctx'> 	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PKG_VER))</div><div class='ctx'> 		bnxt_get_pkgver(dev);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_spec_code &lt; 0x10704 || !BNXT_SINGLE_PF(bp))</div><div class='add'>+	bp-&gt;num_tests = 0;</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10704 || !BNXT_PF(bp))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_SELFTEST_QLIST, -1, -1);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		goto ethtool_init_exit;</div><div class='add'>+	test_info = bp-&gt;test_info;</div><div class='add'>+	if (!test_info) {</div><div class='add'>+		test_info = kzalloc(sizeof(*bp-&gt;test_info), GFP_KERNEL);</div><div class='add'>+		if (!test_info)</div><div class='add'>+			return;</div><div class='add'>+		bp-&gt;test_info = test_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_SELFTEST_QLIST))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	test_info = kzalloc(sizeof(*bp-&gt;test_info), GFP_KERNEL);</div><div class='del'>-	if (!test_info)</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (rc)</div><div class='ctx'> 		goto ethtool_init_exit;</div><div class='ctx'> </div><div class='del'>-	bp-&gt;test_info = test_info;</div><div class='ctx'> 	bp-&gt;num_tests = resp-&gt;num_tests + BNXT_DRV_TESTS;</div><div class='ctx'> 	if (bp-&gt;num_tests &gt; BNXT_MAX_TEST)</div><div class='ctx'> 		bp-&gt;num_tests = BNXT_MAX_TEST;</div><div class='hunk'>@@ -3332,7 +5397,7 @@ void bnxt_ethtool_init(struct bnxt *bp)</div><div class='ctx'> 		test_info-&gt;timeout = HWRM_CMD_TIMEOUT;</div><div class='ctx'> 	for (i = 0; i &lt; bp-&gt;num_tests; i++) {</div><div class='ctx'> 		char *str = test_info-&gt;string[i];</div><div class='del'>-		char *fw_str = resp-&gt;test0_name + i * 32;</div><div class='add'>+		char *fw_str = resp-&gt;test_name[i];</div><div class='ctx'> </div><div class='ctx'> 		if (i == BNXT_MACLPBK_TEST_IDX) {</div><div class='ctx'> 			strcpy(str, "Mac loopback test (offline)");</div><div class='hunk'>@@ -3343,19 +5408,168 @@ void bnxt_ethtool_init(struct bnxt *bp)</div><div class='ctx'> 		} else if (i == BNXT_IRQ_TEST_IDX) {</div><div class='ctx'> 			strcpy(str, "Interrupt_test (offline)");</div><div class='ctx'> 		} else {</div><div class='del'>-			strlcpy(str, fw_str, ETH_GSTRING_LEN);</div><div class='del'>-			strncat(str, " test", ETH_GSTRING_LEN - strlen(str));</div><div class='del'>-			if (test_info-&gt;offline_mask &amp; (1 &lt;&lt; i))</div><div class='del'>-				strncat(str, " (offline)",</div><div class='del'>-					ETH_GSTRING_LEN - strlen(str));</div><div class='del'>-			else</div><div class='del'>-				strncat(str, " (online)",</div><div class='del'>-					ETH_GSTRING_LEN - strlen(str));</div><div class='add'>+			snprintf(str, ETH_GSTRING_LEN, "%s test (%s)",</div><div class='add'>+				 fw_str, test_info-&gt;offline_mask &amp; (1 &lt;&lt; i) ?</div><div class='add'>+					"offline" : "online");</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> ethtool_init_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_eth_phy_stats(struct net_device *dev,</div><div class='add'>+				   struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;rx_port_stats_ext.sw_stats;</div><div class='add'>+	phy_stats-&gt;SymbolErrorDuringCarrier =</div><div class='add'>+		*(rx + BNXT_RX_STATS_EXT_OFFSET(rx_pcs_symbol_err));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_eth_mac_stats(struct net_device *dev,</div><div class='add'>+				   struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx, *tx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;port_stats.sw_stats;</div><div class='add'>+	tx = bp-&gt;port_stats.sw_stats + BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_good_frames);</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_good_frames);</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_fcs_err_frames);</div><div class='add'>+	mac_stats-&gt;AlignmentErrors =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_align_err_frames);</div><div class='add'>+	mac_stats-&gt;OutOfRangeLengthField =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_oor_len_frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_eth_ctrl_stats(struct net_device *dev,</div><div class='add'>+				    struct ethtool_eth_ctrl_stats *ctrl_stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;port_stats.sw_stats;</div><div class='add'>+	ctrl_stats-&gt;MACControlFramesReceived =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_ctrl_frames);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range bnxt_rmon_ranges[] = {</div><div class='add'>+	{    0,    64 },</div><div class='add'>+	{   65,   127 },</div><div class='add'>+	{  128,   255 },</div><div class='add'>+	{  256,   511 },</div><div class='add'>+	{  512,  1023 },</div><div class='add'>+	{ 1024,  1518 },</div><div class='add'>+	{ 1519,  2047 },</div><div class='add'>+	{ 2048,  4095 },</div><div class='add'>+	{ 4096,  9216 },</div><div class='add'>+	{ 9217, 16383 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void bnxt_get_rmon_stats(struct net_device *dev,</div><div class='add'>+				struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx, *tx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;port_stats.sw_stats;</div><div class='add'>+	tx = bp-&gt;port_stats.sw_stats + BNXT_TX_PORT_STATS_BYTE_OFFSET / 8;</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;jabbers =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_jbr_frames);</div><div class='add'>+	rmon_stats-&gt;oversize_pkts =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_ovrsz_frames);</div><div class='add'>+	rmon_stats-&gt;undersize_pkts =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_undrsz_frames);</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;hist[0] = BNXT_GET_RX_PORT_STATS64(rx, rx_64b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[1] = BNXT_GET_RX_PORT_STATS64(rx, rx_65b_127b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[2] = BNXT_GET_RX_PORT_STATS64(rx, rx_128b_255b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[3] = BNXT_GET_RX_PORT_STATS64(rx, rx_256b_511b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[4] =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_512b_1023b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[5] =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_1024b_1518b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[6] =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_1519b_2047b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[7] =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_2048b_4095b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[8] =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_4096b_9216b_frames);</div><div class='add'>+	rmon_stats-&gt;hist[9] =</div><div class='add'>+		BNXT_GET_RX_PORT_STATS64(rx, rx_9217b_16383b_frames);</div><div class='add'>+</div><div class='add'>+	rmon_stats-&gt;hist_tx[0] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_64b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[1] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_65b_127b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[2] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_128b_255b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[3] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_256b_511b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[4] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_512b_1023b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[5] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_1024b_1518b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[6] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_1519b_2047b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[7] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_2048b_4095b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[8] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_4096b_9216b_frames);</div><div class='add'>+	rmon_stats-&gt;hist_tx[9] =</div><div class='add'>+		BNXT_GET_TX_PORT_STATS64(tx, tx_9217b_16383b_frames);</div><div class='add'>+</div><div class='add'>+	*ranges = bnxt_rmon_ranges;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_ptp_stats(struct net_device *dev,</div><div class='add'>+			       struct ethtool_ts_stats *ts_stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	if (ptp) {</div><div class='add'>+		ts_stats-&gt;pkts = ptp-&gt;stats.ts_pkts;</div><div class='add'>+		ts_stats-&gt;lost = ptp-&gt;stats.ts_lost;</div><div class='add'>+		ts_stats-&gt;err = atomic64_read(&amp;ptp-&gt;stats.ts_err);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_get_link_ext_stats(struct net_device *dev,</div><div class='add'>+				    struct ethtool_link_ext_stats *stats)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	u64 *rx;</div><div class='add'>+</div><div class='add'>+	if (BNXT_VF(bp) || !(bp-&gt;flags &amp; BNXT_FLAG_PORT_STATS_EXT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rx = bp-&gt;rx_port_stats_ext.sw_stats;</div><div class='add'>+	stats-&gt;link_down_events =</div><div class='add'>+		*(rx + BNXT_RX_STATS_EXT_OFFSET(link_down_events));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnxt_ethtool_free(struct bnxt *bp)</div><div class='hunk'>@@ -3365,11 +5579,31 @@ void bnxt_ethtool_free(struct bnxt *bp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ethtool_ops bnxt_ethtool_ops = {</div><div class='add'>+	.cap_link_lanes_supported	= 1,</div><div class='add'>+	.rxfh_per_ctx_key		= 1,</div><div class='add'>+	.rxfh_max_num_contexts		= BNXT_MAX_ETH_RSS_CTX + 1,</div><div class='add'>+	.rxfh_indir_space		= BNXT_MAX_RSS_TABLE_ENTRIES_P5,</div><div class='add'>+	.rxfh_priv_size			= sizeof(struct bnxt_rss_ctx),</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_USECS_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_STATS_BLOCK_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_CQE,</div><div class='add'>+	.supported_ring_params	= ETHTOOL_RING_USE_TCP_DATA_SPLIT |</div><div class='add'>+				  ETHTOOL_RING_USE_HDS_THRS,</div><div class='ctx'> 	.get_link_ksettings	= bnxt_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings	= bnxt_set_link_ksettings,</div><div class='add'>+	.get_fec_stats		= bnxt_get_fec_stats,</div><div class='add'>+	.get_fecparam		= bnxt_get_fecparam,</div><div class='add'>+	.set_fecparam		= bnxt_set_fecparam,</div><div class='add'>+	.get_pause_stats	= bnxt_get_pause_stats,</div><div class='ctx'> 	.get_pauseparam		= bnxt_get_pauseparam,</div><div class='ctx'> 	.set_pauseparam		= bnxt_set_pauseparam,</div><div class='ctx'> 	.get_drvinfo		= bnxt_get_drvinfo,</div><div class='add'>+	.get_regs_len		= bnxt_get_regs_len,</div><div class='add'>+	.get_regs		= bnxt_get_regs,</div><div class='ctx'> 	.get_wol		= bnxt_get_wol,</div><div class='ctx'> 	.set_wol		= bnxt_set_wol,</div><div class='ctx'> 	.get_coalesce		= bnxt_get_coalesce,</div><div class='hunk'>@@ -3385,22 +5619,41 @@ const struct ethtool_ops bnxt_ethtool_ops = {</div><div class='ctx'> 	.set_channels		= bnxt_set_channels,</div><div class='ctx'> 	.get_rxnfc		= bnxt_get_rxnfc,</div><div class='ctx'> 	.set_rxnfc		= bnxt_set_rxnfc,</div><div class='add'>+	.get_rx_ring_count	= bnxt_get_rx_ring_count,</div><div class='ctx'> 	.get_rxfh_indir_size    = bnxt_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh_key_size      = bnxt_get_rxfh_key_size,</div><div class='ctx'> 	.get_rxfh               = bnxt_get_rxfh,</div><div class='add'>+	.set_rxfh		= bnxt_set_rxfh,</div><div class='add'>+	.get_rxfh_fields        = bnxt_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields        = bnxt_set_rxfh_fields,</div><div class='add'>+	.create_rxfh_context	= bnxt_create_rxfh_context,</div><div class='add'>+	.modify_rxfh_context	= bnxt_modify_rxfh_context,</div><div class='add'>+	.remove_rxfh_context	= bnxt_remove_rxfh_context,</div><div class='ctx'> 	.flash_device		= bnxt_flash_device,</div><div class='ctx'> 	.get_eeprom_len         = bnxt_get_eeprom_len,</div><div class='ctx'> 	.get_eeprom             = bnxt_get_eeprom,</div><div class='ctx'> 	.set_eeprom		= bnxt_set_eeprom,</div><div class='ctx'> 	.get_link		= bnxt_get_link,</div><div class='add'>+	.get_link_ext_stats	= bnxt_get_link_ext_stats,</div><div class='ctx'> 	.get_eee		= bnxt_get_eee,</div><div class='ctx'> 	.set_eee		= bnxt_set_eee,</div><div class='add'>+	.get_tunable		= bnxt_get_tunable,</div><div class='add'>+	.set_tunable		= bnxt_set_tunable,</div><div class='ctx'> 	.get_module_info	= bnxt_get_module_info,</div><div class='ctx'> 	.get_module_eeprom	= bnxt_get_module_eeprom,</div><div class='add'>+	.get_module_eeprom_by_page = bnxt_get_module_eeprom_by_page,</div><div class='add'>+	.set_module_eeprom_by_page = bnxt_set_module_eeprom_by_page,</div><div class='ctx'> 	.nway_reset		= bnxt_nway_reset,</div><div class='ctx'> 	.set_phys_id		= bnxt_set_phys_id,</div><div class='ctx'> 	.self_test		= bnxt_self_test,</div><div class='add'>+	.get_ts_info		= bnxt_get_ts_info,</div><div class='ctx'> 	.reset			= bnxt_reset,</div><div class='add'>+	.set_dump		= bnxt_set_dump,</div><div class='ctx'> 	.get_dump_flag		= bnxt_get_dump_flag,</div><div class='ctx'> 	.get_dump_data		= bnxt_get_dump_data,</div><div class='add'>+	.get_eth_phy_stats	= bnxt_get_eth_phy_stats,</div><div class='add'>+	.get_eth_mac_stats	= bnxt_get_eth_mac_stats,</div><div class='add'>+	.get_eth_ctrl_stats	= bnxt_get_eth_ctrl_stats,</div><div class='add'>+	.get_rmon_stats		= bnxt_get_rmon_stats,</div><div class='add'>+	.get_ts_stats		= bnxt_get_ptp_stats,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h<br/>index b5b65b3f8534..33b86ede1ce5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h</a></div><div class='hunk'>@@ -22,43 +22,6 @@ struct bnxt_led_cfg {</div><div class='ctx'> 	u8 rsvd;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define COREDUMP_LIST_BUF_LEN		2048</div><div class='del'>-#define COREDUMP_RETRIEVE_BUF_LEN	4096</div><div class='del'>-</div><div class='del'>-struct bnxt_coredump {</div><div class='del'>-	void		*data;</div><div class='del'>-	int		data_size;</div><div class='del'>-	u16		total_segs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct bnxt_hwrm_dbg_dma_info {</div><div class='del'>-	void *dest_buf;</div><div class='del'>-	int dest_buf_size;</div><div class='del'>-	u16 dma_len;</div><div class='del'>-	u16 seq_off;</div><div class='del'>-	u16 data_len_off;</div><div class='del'>-	u16 segs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hwrm_dbg_cmn_input {</div><div class='del'>-	__le16 req_type;</div><div class='del'>-	__le16 cmpl_ring;</div><div class='del'>-	__le16 seq_id;</div><div class='del'>-	__le16 target_id;</div><div class='del'>-	__le64 resp_addr;</div><div class='del'>-	__le64 host_dest_addr;</div><div class='del'>-	__le32 host_buf_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct hwrm_dbg_cmn_output {</div><div class='del'>-	__le16 error_code;</div><div class='del'>-	__le16 req_type;</div><div class='del'>-	__le16 seq_id;</div><div class='del'>-	__le16 resp_len;</div><div class='del'>-	u8 flags;</div><div class='del'>-	#define HWRM_DBG_CMN_FLAGS_MORE	1</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define BNXT_LED_DFLT_ENA				\</div><div class='ctx'> 	(PORT_LED_CFG_REQ_ENABLES_LED0_ID |		\</div><div class='ctx'> 	 PORT_LED_CFG_REQ_ENABLES_LED0_STATE |		\</div><div class='hunk'>@@ -71,15 +34,44 @@ struct hwrm_dbg_cmn_output {</div><div class='ctx'> #define BNXT_LED_DFLT_ENABLES(x)			\</div><div class='ctx'> 	cpu_to_le32(BNXT_LED_DFLT_ENA &lt;&lt; (BNXT_LED_DFLT_ENA_SHIFT * (x)))</div><div class='ctx'> </div><div class='del'>-#define BNXT_FW_RESET_AP	0xfffe</div><div class='del'>-#define BNXT_FW_RESET_CHIP	0xffff</div><div class='add'>+#define BNXT_FW_RESET_AP	(ETH_RESET_AP &lt;&lt; ETH_RESET_SHARED_SHIFT)</div><div class='add'>+#define BNXT_FW_RESET_CHIP	((ETH_RESET_MGMT | ETH_RESET_IRQ |	\</div><div class='add'>+				  ETH_RESET_DMA | ETH_RESET_FILTER |	\</div><div class='add'>+				  ETH_RESET_OFFLOAD | ETH_RESET_MAC |	\</div><div class='add'>+				  ETH_RESET_PHY | ETH_RESET_RAM)	\</div><div class='add'>+				 &lt;&lt; ETH_RESET_SHARED_SHIFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_PXP_REG_LEN	0x3110</div><div class='add'>+</div><div class='add'>+#define BNXT_IP_PROTO_FULL_MASK	0xFF</div><div class='add'>+#define BNXT_IP_PROTO_WILDCARD	0x0</div><div class='ctx'> </div><div class='ctx'> extern const struct ethtool_ops bnxt_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-u32 _bnxt_fw_to_ethtool_adv_spds(u16, u8);</div><div class='add'>+u32 bnxt_get_rxfh_indir_size(struct net_device *dev);</div><div class='add'>+void _bnxt_fw_to_linkmode(unsigned long *mode, u16 fw_speeds);</div><div class='ctx'> u32 bnxt_fw_to_ethtool_speed(u16);</div><div class='del'>-u16 bnxt_get_fw_auto_link_speeds(u32);</div><div class='add'>+u16 bnxt_get_fw_auto_link_speeds(const unsigned long *mode);</div><div class='add'>+int bnxt_hwrm_nvm_get_dev_info(struct bnxt *bp,</div><div class='add'>+			       struct hwrm_nvm_get_dev_info_output *nvm_dev_info);</div><div class='add'>+int bnxt_hwrm_firmware_reset(struct net_device *dev, u8 proc_type,</div><div class='add'>+			     u8 self_reset, u8 flags);</div><div class='add'>+int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware *fw,</div><div class='add'>+				   u32 install_type, struct netlink_ext_ack *extack);</div><div class='add'>+int bnxt_get_pkginfo(struct net_device *dev, char *ver, int size);</div><div class='ctx'> void bnxt_ethtool_init(struct bnxt *bp);</div><div class='ctx'> void bnxt_ethtool_free(struct bnxt *bp);</div><div class='add'>+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='add'>+			 u16 ext, u16 *index, u32 *item_length,</div><div class='add'>+			 u32 *data_length);</div><div class='add'>+int bnxt_find_nvram_item(struct net_device *dev, u16 type, u16 ordinal,</div><div class='add'>+			 u16 ext, u16 *index, u32 *item_length,</div><div class='add'>+			 u32 *data_length);</div><div class='add'>+int bnxt_flash_nvram(struct net_device *dev, u16 dir_type,</div><div class='add'>+		     u16 dir_ordinal, u16 dir_ext, u16 dir_attr,</div><div class='add'>+		     u32 dir_item_len, const u8 *data,</div><div class='add'>+		     size_t data_len);</div><div class='add'>+int bnxt_get_nvram_item(struct net_device *dev, u32 index, u32 offset,</div><div class='add'>+			u32 length, u8 *data);</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h<br/>deleted file mode 100644<br/>index 12bbb2a207d0..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7860 +0,0 @@</div><div class='del'>-/* Broadcom NetXtreme-C/E network driver.</div><div class='del'>- *</div><div class='del'>- * Copyright (c) 2014-2016 Broadcom Corporation</div><div class='del'>- * Copyright (c) 2016-2019 Broadcom Limited</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * DO NOT MODIFY!!! This file is automatically generated.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _BNXT_HSI_H_</div><div class='del'>-#define _BNXT_HSI_H_</div><div class='del'>-</div><div class='del'>-/* hwrm_cmd_hdr (size:128b/16B) */</div><div class='del'>-struct hwrm_cmd_hdr {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_resp_hdr (size:64b/8B) */</div><div class='del'>-struct hwrm_resp_hdr {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CMD_DISCR_TLV_ENCAP 0x8000UL</div><div class='del'>-#define CMD_DISCR_LAST     CMD_DISCR_TLV_ENCAP</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TLV_TYPE_HWRM_REQUEST                    0x1UL</div><div class='del'>-#define TLV_TYPE_HWRM_RESPONSE                   0x2UL</div><div class='del'>-#define TLV_TYPE_ROCE_SP_COMMAND                 0x3UL</div><div class='del'>-#define TLV_TYPE_QUERY_ROCE_CC_GEN1              0x4UL</div><div class='del'>-#define TLV_TYPE_MODIFY_ROCE_CC_GEN1             0x5UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_DEVICE_SERIAL_NUMBER 0x8001UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_NONCE                0x8002UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_IV                   0x8003UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_AUTH_TAG             0x8004UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_CIPHERTEXT           0x8005UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_ALGORITHMS           0x8006UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_ECC_PUBLIC_KEY       0x8007UL</div><div class='del'>-#define TLV_TYPE_ENGINE_CKV_ECDSA_SIGNATURE      0x8008UL</div><div class='del'>-#define TLV_TYPE_LAST                           TLV_TYPE_ENGINE_CKV_ECDSA_SIGNATURE</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* tlv (size:64b/8B) */</div><div class='del'>-struct tlv {</div><div class='del'>-	__le16	cmd_discr;</div><div class='del'>-	u8	reserved_8b;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define TLV_FLAGS_MORE         0x1UL</div><div class='del'>-	#define TLV_FLAGS_MORE_LAST      0x0UL</div><div class='del'>-	#define TLV_FLAGS_MORE_NOT_LAST  0x1UL</div><div class='del'>-	#define TLV_FLAGS_REQUIRED     0x2UL</div><div class='del'>-	#define TLV_FLAGS_REQUIRED_NO    (0x0UL &lt;&lt; 1)</div><div class='del'>-	#define TLV_FLAGS_REQUIRED_YES   (0x1UL &lt;&lt; 1)</div><div class='del'>-	#define TLV_FLAGS_REQUIRED_LAST TLV_FLAGS_REQUIRED_YES</div><div class='del'>-	__le16	tlv_type;</div><div class='del'>-	__le16	length;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* input (size:128b/16B) */</div><div class='del'>-struct input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* output (size:64b/8B) */</div><div class='del'>-struct output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_short_input (size:128b/16B) */</div><div class='del'>-struct hwrm_short_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	signature;</div><div class='del'>-	#define SHORT_REQ_SIGNATURE_SHORT_CMD 0x4321UL</div><div class='del'>-	#define SHORT_REQ_SIGNATURE_LAST     SHORT_REQ_SIGNATURE_SHORT_CMD</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	#define SHORT_REQ_TARGET_ID_DEFAULT 0x0UL</div><div class='del'>-	#define SHORT_REQ_TARGET_ID_TOOLS   0xfffdUL</div><div class='del'>-	#define SHORT_REQ_TARGET_ID_LAST   SHORT_REQ_TARGET_ID_TOOLS</div><div class='del'>-	__le16	size;</div><div class='del'>-	__le64	req_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* cmd_nums (size:64b/8B) */</div><div class='del'>-struct cmd_nums {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	#define HWRM_VER_GET                              0x0UL</div><div class='del'>-	#define HWRM_ERROR_RECOVERY_QCFG                  0xcUL</div><div class='del'>-	#define HWRM_FUNC_DRV_IF_CHANGE                   0xdUL</div><div class='del'>-	#define HWRM_FUNC_BUF_UNRGTR                      0xeUL</div><div class='del'>-	#define HWRM_FUNC_VF_CFG                          0xfUL</div><div class='del'>-	#define HWRM_RESERVED1                            0x10UL</div><div class='del'>-	#define HWRM_FUNC_RESET                           0x11UL</div><div class='del'>-	#define HWRM_FUNC_GETFID                          0x12UL</div><div class='del'>-	#define HWRM_FUNC_VF_ALLOC                        0x13UL</div><div class='del'>-	#define HWRM_FUNC_VF_FREE                         0x14UL</div><div class='del'>-	#define HWRM_FUNC_QCAPS                           0x15UL</div><div class='del'>-	#define HWRM_FUNC_QCFG                            0x16UL</div><div class='del'>-	#define HWRM_FUNC_CFG                             0x17UL</div><div class='del'>-	#define HWRM_FUNC_QSTATS                          0x18UL</div><div class='del'>-	#define HWRM_FUNC_CLR_STATS                       0x19UL</div><div class='del'>-	#define HWRM_FUNC_DRV_UNRGTR                      0x1aUL</div><div class='del'>-	#define HWRM_FUNC_VF_RESC_FREE                    0x1bUL</div><div class='del'>-	#define HWRM_FUNC_VF_VNIC_IDS_QUERY               0x1cUL</div><div class='del'>-	#define HWRM_FUNC_DRV_RGTR                        0x1dUL</div><div class='del'>-	#define HWRM_FUNC_DRV_QVER                        0x1eUL</div><div class='del'>-	#define HWRM_FUNC_BUF_RGTR                        0x1fUL</div><div class='del'>-	#define HWRM_PORT_PHY_CFG                         0x20UL</div><div class='del'>-	#define HWRM_PORT_MAC_CFG                         0x21UL</div><div class='del'>-	#define HWRM_PORT_TS_QUERY                        0x22UL</div><div class='del'>-	#define HWRM_PORT_QSTATS                          0x23UL</div><div class='del'>-	#define HWRM_PORT_LPBK_QSTATS                     0x24UL</div><div class='del'>-	#define HWRM_PORT_CLR_STATS                       0x25UL</div><div class='del'>-	#define HWRM_PORT_LPBK_CLR_STATS                  0x26UL</div><div class='del'>-	#define HWRM_PORT_PHY_QCFG                        0x27UL</div><div class='del'>-	#define HWRM_PORT_MAC_QCFG                        0x28UL</div><div class='del'>-	#define HWRM_PORT_MAC_PTP_QCFG                    0x29UL</div><div class='del'>-	#define HWRM_PORT_PHY_QCAPS                       0x2aUL</div><div class='del'>-	#define HWRM_PORT_PHY_I2C_WRITE                   0x2bUL</div><div class='del'>-	#define HWRM_PORT_PHY_I2C_READ                    0x2cUL</div><div class='del'>-	#define HWRM_PORT_LED_CFG                         0x2dUL</div><div class='del'>-	#define HWRM_PORT_LED_QCFG                        0x2eUL</div><div class='del'>-	#define HWRM_PORT_LED_QCAPS                       0x2fUL</div><div class='del'>-	#define HWRM_QUEUE_QPORTCFG                       0x30UL</div><div class='del'>-	#define HWRM_QUEUE_QCFG                           0x31UL</div><div class='del'>-	#define HWRM_QUEUE_CFG                            0x32UL</div><div class='del'>-	#define HWRM_FUNC_VLAN_CFG                        0x33UL</div><div class='del'>-	#define HWRM_FUNC_VLAN_QCFG                       0x34UL</div><div class='del'>-	#define HWRM_QUEUE_PFCENABLE_QCFG                 0x35UL</div><div class='del'>-	#define HWRM_QUEUE_PFCENABLE_CFG                  0x36UL</div><div class='del'>-	#define HWRM_QUEUE_PRI2COS_QCFG                   0x37UL</div><div class='del'>-	#define HWRM_QUEUE_PRI2COS_CFG                    0x38UL</div><div class='del'>-	#define HWRM_QUEUE_COS2BW_QCFG                    0x39UL</div><div class='del'>-	#define HWRM_QUEUE_COS2BW_CFG                     0x3aUL</div><div class='del'>-	#define HWRM_QUEUE_DSCP_QCAPS                     0x3bUL</div><div class='del'>-	#define HWRM_QUEUE_DSCP2PRI_QCFG                  0x3cUL</div><div class='del'>-	#define HWRM_QUEUE_DSCP2PRI_CFG                   0x3dUL</div><div class='del'>-	#define HWRM_VNIC_ALLOC                           0x40UL</div><div class='del'>-	#define HWRM_VNIC_FREE                            0x41UL</div><div class='del'>-	#define HWRM_VNIC_CFG                             0x42UL</div><div class='del'>-	#define HWRM_VNIC_QCFG                            0x43UL</div><div class='del'>-	#define HWRM_VNIC_TPA_CFG                         0x44UL</div><div class='del'>-	#define HWRM_VNIC_TPA_QCFG                        0x45UL</div><div class='del'>-	#define HWRM_VNIC_RSS_CFG                         0x46UL</div><div class='del'>-	#define HWRM_VNIC_RSS_QCFG                        0x47UL</div><div class='del'>-	#define HWRM_VNIC_PLCMODES_CFG                    0x48UL</div><div class='del'>-	#define HWRM_VNIC_PLCMODES_QCFG                   0x49UL</div><div class='del'>-	#define HWRM_VNIC_QCAPS                           0x4aUL</div><div class='del'>-	#define HWRM_RING_ALLOC                           0x50UL</div><div class='del'>-	#define HWRM_RING_FREE                            0x51UL</div><div class='del'>-	#define HWRM_RING_CMPL_RING_QAGGINT_PARAMS        0x52UL</div><div class='del'>-	#define HWRM_RING_CMPL_RING_CFG_AGGINT_PARAMS     0x53UL</div><div class='del'>-	#define HWRM_RING_AGGINT_QCAPS                    0x54UL</div><div class='del'>-	#define HWRM_RING_RESET                           0x5eUL</div><div class='del'>-	#define HWRM_RING_GRP_ALLOC                       0x60UL</div><div class='del'>-	#define HWRM_RING_GRP_FREE                        0x61UL</div><div class='del'>-	#define HWRM_RESERVED5                            0x64UL</div><div class='del'>-	#define HWRM_RESERVED6                            0x65UL</div><div class='del'>-	#define HWRM_VNIC_RSS_COS_LB_CTX_ALLOC            0x70UL</div><div class='del'>-	#define HWRM_VNIC_RSS_COS_LB_CTX_FREE             0x71UL</div><div class='del'>-	#define HWRM_CFA_L2_FILTER_ALLOC                  0x90UL</div><div class='del'>-	#define HWRM_CFA_L2_FILTER_FREE                   0x91UL</div><div class='del'>-	#define HWRM_CFA_L2_FILTER_CFG                    0x92UL</div><div class='del'>-	#define HWRM_CFA_L2_SET_RX_MASK                   0x93UL</div><div class='del'>-	#define HWRM_CFA_VLAN_ANTISPOOF_CFG               0x94UL</div><div class='del'>-	#define HWRM_CFA_TUNNEL_FILTER_ALLOC              0x95UL</div><div class='del'>-	#define HWRM_CFA_TUNNEL_FILTER_FREE               0x96UL</div><div class='del'>-	#define HWRM_CFA_ENCAP_RECORD_ALLOC               0x97UL</div><div class='del'>-	#define HWRM_CFA_ENCAP_RECORD_FREE                0x98UL</div><div class='del'>-	#define HWRM_CFA_NTUPLE_FILTER_ALLOC              0x99UL</div><div class='del'>-	#define HWRM_CFA_NTUPLE_FILTER_FREE               0x9aUL</div><div class='del'>-	#define HWRM_CFA_NTUPLE_FILTER_CFG                0x9bUL</div><div class='del'>-	#define HWRM_CFA_EM_FLOW_ALLOC                    0x9cUL</div><div class='del'>-	#define HWRM_CFA_EM_FLOW_FREE                     0x9dUL</div><div class='del'>-	#define HWRM_CFA_EM_FLOW_CFG                      0x9eUL</div><div class='del'>-	#define HWRM_TUNNEL_DST_PORT_QUERY                0xa0UL</div><div class='del'>-	#define HWRM_TUNNEL_DST_PORT_ALLOC                0xa1UL</div><div class='del'>-	#define HWRM_TUNNEL_DST_PORT_FREE                 0xa2UL</div><div class='del'>-	#define HWRM_STAT_CTX_ENG_QUERY                   0xafUL</div><div class='del'>-	#define HWRM_STAT_CTX_ALLOC                       0xb0UL</div><div class='del'>-	#define HWRM_STAT_CTX_FREE                        0xb1UL</div><div class='del'>-	#define HWRM_STAT_CTX_QUERY                       0xb2UL</div><div class='del'>-	#define HWRM_STAT_CTX_CLR_STATS                   0xb3UL</div><div class='del'>-	#define HWRM_PORT_QSTATS_EXT                      0xb4UL</div><div class='del'>-	#define HWRM_PORT_PHY_MDIO_WRITE                  0xb5UL</div><div class='del'>-	#define HWRM_PORT_PHY_MDIO_READ                   0xb6UL</div><div class='del'>-	#define HWRM_FW_RESET                             0xc0UL</div><div class='del'>-	#define HWRM_FW_QSTATUS                           0xc1UL</div><div class='del'>-	#define HWRM_FW_HEALTH_CHECK                      0xc2UL</div><div class='del'>-	#define HWRM_FW_SYNC                              0xc3UL</div><div class='del'>-	#define HWRM_FW_SET_TIME                          0xc8UL</div><div class='del'>-	#define HWRM_FW_GET_TIME                          0xc9UL</div><div class='del'>-	#define HWRM_FW_SET_STRUCTURED_DATA               0xcaUL</div><div class='del'>-	#define HWRM_FW_GET_STRUCTURED_DATA               0xcbUL</div><div class='del'>-	#define HWRM_FW_IPC_MAILBOX                       0xccUL</div><div class='del'>-	#define HWRM_EXEC_FWD_RESP                        0xd0UL</div><div class='del'>-	#define HWRM_REJECT_FWD_RESP                      0xd1UL</div><div class='del'>-	#define HWRM_FWD_RESP                             0xd2UL</div><div class='del'>-	#define HWRM_FWD_ASYNC_EVENT_CMPL                 0xd3UL</div><div class='del'>-	#define HWRM_OEM_CMD                              0xd4UL</div><div class='del'>-	#define HWRM_PORT_PRBS_TEST                       0xd5UL</div><div class='del'>-	#define HWRM_TEMP_MONITOR_QUERY                   0xe0UL</div><div class='del'>-	#define HWRM_WOL_FILTER_ALLOC                     0xf0UL</div><div class='del'>-	#define HWRM_WOL_FILTER_FREE                      0xf1UL</div><div class='del'>-	#define HWRM_WOL_FILTER_QCFG                      0xf2UL</div><div class='del'>-	#define HWRM_WOL_REASON_QCFG                      0xf3UL</div><div class='del'>-	#define HWRM_CFA_METER_QCAPS                      0xf4UL</div><div class='del'>-	#define HWRM_CFA_METER_PROFILE_ALLOC              0xf5UL</div><div class='del'>-	#define HWRM_CFA_METER_PROFILE_FREE               0xf6UL</div><div class='del'>-	#define HWRM_CFA_METER_PROFILE_CFG                0xf7UL</div><div class='del'>-	#define HWRM_CFA_METER_INSTANCE_ALLOC             0xf8UL</div><div class='del'>-	#define HWRM_CFA_METER_INSTANCE_FREE              0xf9UL</div><div class='del'>-	#define HWRM_CFA_METER_INSTANCE_CFG               0xfaUL</div><div class='del'>-	#define HWRM_CFA_VFR_ALLOC                        0xfdUL</div><div class='del'>-	#define HWRM_CFA_VFR_FREE                         0xfeUL</div><div class='del'>-	#define HWRM_CFA_VF_PAIR_ALLOC                    0x100UL</div><div class='del'>-	#define HWRM_CFA_VF_PAIR_FREE                     0x101UL</div><div class='del'>-	#define HWRM_CFA_VF_PAIR_INFO                     0x102UL</div><div class='del'>-	#define HWRM_CFA_FLOW_ALLOC                       0x103UL</div><div class='del'>-	#define HWRM_CFA_FLOW_FREE                        0x104UL</div><div class='del'>-	#define HWRM_CFA_FLOW_FLUSH                       0x105UL</div><div class='del'>-	#define HWRM_CFA_FLOW_STATS                       0x106UL</div><div class='del'>-	#define HWRM_CFA_FLOW_INFO                        0x107UL</div><div class='del'>-	#define HWRM_CFA_DECAP_FILTER_ALLOC               0x108UL</div><div class='del'>-	#define HWRM_CFA_DECAP_FILTER_FREE                0x109UL</div><div class='del'>-	#define HWRM_CFA_VLAN_ANTISPOOF_QCFG              0x10aUL</div><div class='del'>-	#define HWRM_CFA_REDIRECT_TUNNEL_TYPE_ALLOC       0x10bUL</div><div class='del'>-	#define HWRM_CFA_REDIRECT_TUNNEL_TYPE_FREE        0x10cUL</div><div class='del'>-	#define HWRM_CFA_PAIR_ALLOC                       0x10dUL</div><div class='del'>-	#define HWRM_CFA_PAIR_FREE                        0x10eUL</div><div class='del'>-	#define HWRM_CFA_PAIR_INFO                        0x10fUL</div><div class='del'>-	#define HWRM_FW_IPC_MSG                           0x110UL</div><div class='del'>-	#define HWRM_CFA_REDIRECT_TUNNEL_TYPE_INFO        0x111UL</div><div class='del'>-	#define HWRM_CFA_REDIRECT_QUERY_TUNNEL_TYPE       0x112UL</div><div class='del'>-	#define HWRM_CFA_FLOW_AGING_TIMER_RESET           0x113UL</div><div class='del'>-	#define HWRM_CFA_FLOW_AGING_CFG                   0x114UL</div><div class='del'>-	#define HWRM_CFA_FLOW_AGING_QCFG                  0x115UL</div><div class='del'>-	#define HWRM_CFA_FLOW_AGING_QCAPS                 0x116UL</div><div class='del'>-	#define HWRM_CFA_CTX_MEM_RGTR                     0x117UL</div><div class='del'>-	#define HWRM_CFA_CTX_MEM_UNRGTR                   0x118UL</div><div class='del'>-	#define HWRM_CFA_CTX_MEM_QCTX                     0x119UL</div><div class='del'>-	#define HWRM_CFA_CTX_MEM_QCAPS                    0x11aUL</div><div class='del'>-	#define HWRM_CFA_COUNTER_QCAPS                    0x11bUL</div><div class='del'>-	#define HWRM_CFA_COUNTER_CFG                      0x11cUL</div><div class='del'>-	#define HWRM_CFA_COUNTER_QCFG                     0x11dUL</div><div class='del'>-	#define HWRM_CFA_COUNTER_QSTATS                   0x11eUL</div><div class='del'>-	#define HWRM_CFA_TCP_FLAG_PROCESS_QCFG            0x11fUL</div><div class='del'>-	#define HWRM_CFA_EEM_QCAPS                        0x120UL</div><div class='del'>-	#define HWRM_CFA_EEM_CFG                          0x121UL</div><div class='del'>-	#define HWRM_CFA_EEM_QCFG                         0x122UL</div><div class='del'>-	#define HWRM_CFA_EEM_OP                           0x123UL</div><div class='del'>-	#define HWRM_CFA_ADV_FLOW_MGNT_QCAPS              0x124UL</div><div class='del'>-	#define HWRM_CFA_TFLIB                            0x125UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_HELLO                     0x12dUL</div><div class='del'>-	#define HWRM_ENGINE_CKV_STATUS                    0x12eUL</div><div class='del'>-	#define HWRM_ENGINE_CKV_CKEK_ADD                  0x12fUL</div><div class='del'>-	#define HWRM_ENGINE_CKV_CKEK_DELETE               0x130UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_KEY_ADD                   0x131UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_KEY_DELETE                0x132UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_FLUSH                     0x133UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_RNG_GET                   0x134UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_KEY_GEN                   0x135UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_KEY_LABEL_CFG             0x136UL</div><div class='del'>-	#define HWRM_ENGINE_CKV_KEY_LABEL_QCFG            0x137UL</div><div class='del'>-	#define HWRM_ENGINE_QG_CONFIG_QUERY               0x13cUL</div><div class='del'>-	#define HWRM_ENGINE_QG_QUERY                      0x13dUL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_PROFILE_CONFIG_QUERY 0x13eUL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_PROFILE_QUERY        0x13fUL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_PROFILE_ALLOC        0x140UL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_PROFILE_FREE         0x141UL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_QUERY                0x142UL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_BIND                 0x143UL</div><div class='del'>-	#define HWRM_ENGINE_QG_METER_UNBIND               0x144UL</div><div class='del'>-	#define HWRM_ENGINE_QG_FUNC_BIND                  0x145UL</div><div class='del'>-	#define HWRM_ENGINE_SG_CONFIG_QUERY               0x146UL</div><div class='del'>-	#define HWRM_ENGINE_SG_QUERY                      0x147UL</div><div class='del'>-	#define HWRM_ENGINE_SG_METER_QUERY                0x148UL</div><div class='del'>-	#define HWRM_ENGINE_SG_METER_CONFIG               0x149UL</div><div class='del'>-	#define HWRM_ENGINE_SG_QG_BIND                    0x14aUL</div><div class='del'>-	#define HWRM_ENGINE_QG_SG_UNBIND                  0x14bUL</div><div class='del'>-	#define HWRM_ENGINE_CONFIG_QUERY                  0x154UL</div><div class='del'>-	#define HWRM_ENGINE_STATS_CONFIG                  0x155UL</div><div class='del'>-	#define HWRM_ENGINE_STATS_CLEAR                   0x156UL</div><div class='del'>-	#define HWRM_ENGINE_STATS_QUERY                   0x157UL</div><div class='del'>-	#define HWRM_ENGINE_RQ_ALLOC                      0x15eUL</div><div class='del'>-	#define HWRM_ENGINE_RQ_FREE                       0x15fUL</div><div class='del'>-	#define HWRM_ENGINE_CQ_ALLOC                      0x160UL</div><div class='del'>-	#define HWRM_ENGINE_CQ_FREE                       0x161UL</div><div class='del'>-	#define HWRM_ENGINE_NQ_ALLOC                      0x162UL</div><div class='del'>-	#define HWRM_ENGINE_NQ_FREE                       0x163UL</div><div class='del'>-	#define HWRM_ENGINE_ON_DIE_RQE_CREDITS            0x164UL</div><div class='del'>-	#define HWRM_ENGINE_FUNC_QCFG                     0x165UL</div><div class='del'>-	#define HWRM_FUNC_RESOURCE_QCAPS                  0x190UL</div><div class='del'>-	#define HWRM_FUNC_VF_RESOURCE_CFG                 0x191UL</div><div class='del'>-	#define HWRM_FUNC_BACKING_STORE_QCAPS             0x192UL</div><div class='del'>-	#define HWRM_FUNC_BACKING_STORE_CFG               0x193UL</div><div class='del'>-	#define HWRM_FUNC_BACKING_STORE_QCFG              0x194UL</div><div class='del'>-	#define HWRM_FUNC_VF_BW_CFG                       0x195UL</div><div class='del'>-	#define HWRM_FUNC_VF_BW_QCFG                      0x196UL</div><div class='del'>-	#define HWRM_SELFTEST_QLIST                       0x200UL</div><div class='del'>-	#define HWRM_SELFTEST_EXEC                        0x201UL</div><div class='del'>-	#define HWRM_SELFTEST_IRQ                         0x202UL</div><div class='del'>-	#define HWRM_SELFTEST_RETRIEVE_SERDES_DATA        0x203UL</div><div class='del'>-	#define HWRM_PCIE_QSTATS                          0x204UL</div><div class='del'>-	#define HWRM_MFG_FRU_WRITE_CONTROL                0x205UL</div><div class='del'>-	#define HWRM_MFG_TIMERS_QUERY                     0x206UL</div><div class='del'>-	#define HWRM_MFG_OTP_CFG                          0x207UL</div><div class='del'>-	#define HWRM_MFG_OTP_QCFG                         0x208UL</div><div class='del'>-	#define HWRM_MFG_HDMA_TEST                        0x209UL</div><div class='del'>-	#define HWRM_DBG_READ_DIRECT                      0xff10UL</div><div class='del'>-	#define HWRM_DBG_READ_INDIRECT                    0xff11UL</div><div class='del'>-	#define HWRM_DBG_WRITE_DIRECT                     0xff12UL</div><div class='del'>-	#define HWRM_DBG_WRITE_INDIRECT                   0xff13UL</div><div class='del'>-	#define HWRM_DBG_DUMP                             0xff14UL</div><div class='del'>-	#define HWRM_DBG_ERASE_NVM                        0xff15UL</div><div class='del'>-	#define HWRM_DBG_CFG                              0xff16UL</div><div class='del'>-	#define HWRM_DBG_COREDUMP_LIST                    0xff17UL</div><div class='del'>-	#define HWRM_DBG_COREDUMP_INITIATE                0xff18UL</div><div class='del'>-	#define HWRM_DBG_COREDUMP_RETRIEVE                0xff19UL</div><div class='del'>-	#define HWRM_DBG_FW_CLI                           0xff1aUL</div><div class='del'>-	#define HWRM_DBG_I2C_CMD                          0xff1bUL</div><div class='del'>-	#define HWRM_DBG_RING_INFO_GET                    0xff1cUL</div><div class='del'>-	#define HWRM_DBG_CRASHDUMP_HEADER                 0xff1dUL</div><div class='del'>-	#define HWRM_DBG_CRASHDUMP_ERASE                  0xff1eUL</div><div class='del'>-	#define HWRM_NVM_FACTORY_DEFAULTS                 0xffeeUL</div><div class='del'>-	#define HWRM_NVM_VALIDATE_OPTION                  0xffefUL</div><div class='del'>-	#define HWRM_NVM_FLUSH                            0xfff0UL</div><div class='del'>-	#define HWRM_NVM_GET_VARIABLE                     0xfff1UL</div><div class='del'>-	#define HWRM_NVM_SET_VARIABLE                     0xfff2UL</div><div class='del'>-	#define HWRM_NVM_INSTALL_UPDATE                   0xfff3UL</div><div class='del'>-	#define HWRM_NVM_MODIFY                           0xfff4UL</div><div class='del'>-	#define HWRM_NVM_VERIFY_UPDATE                    0xfff5UL</div><div class='del'>-	#define HWRM_NVM_GET_DEV_INFO                     0xfff6UL</div><div class='del'>-	#define HWRM_NVM_ERASE_DIR_ENTRY                  0xfff7UL</div><div class='del'>-	#define HWRM_NVM_MOD_DIR_ENTRY                    0xfff8UL</div><div class='del'>-	#define HWRM_NVM_FIND_DIR_ENTRY                   0xfff9UL</div><div class='del'>-	#define HWRM_NVM_GET_DIR_ENTRIES                  0xfffaUL</div><div class='del'>-	#define HWRM_NVM_GET_DIR_INFO                     0xfffbUL</div><div class='del'>-	#define HWRM_NVM_RAW_DUMP                         0xfffcUL</div><div class='del'>-	#define HWRM_NVM_READ                             0xfffdUL</div><div class='del'>-	#define HWRM_NVM_WRITE                            0xfffeUL</div><div class='del'>-	#define HWRM_NVM_RAW_WRITE_BLK                    0xffffUL</div><div class='del'>-	#define HWRM_LAST                                HWRM_NVM_RAW_WRITE_BLK</div><div class='del'>-	__le16	unused_0[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ret_codes (size:64b/8B) */</div><div class='del'>-struct ret_codes {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	#define HWRM_ERR_CODE_SUCCESS                      0x0UL</div><div class='del'>-	#define HWRM_ERR_CODE_FAIL                         0x1UL</div><div class='del'>-	#define HWRM_ERR_CODE_INVALID_PARAMS               0x2UL</div><div class='del'>-	#define HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED       0x3UL</div><div class='del'>-	#define HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR         0x4UL</div><div class='del'>-	#define HWRM_ERR_CODE_INVALID_FLAGS                0x5UL</div><div class='del'>-	#define HWRM_ERR_CODE_INVALID_ENABLES              0x6UL</div><div class='del'>-	#define HWRM_ERR_CODE_UNSUPPORTED_TLV              0x7UL</div><div class='del'>-	#define HWRM_ERR_CODE_NO_BUFFER                    0x8UL</div><div class='del'>-	#define HWRM_ERR_CODE_UNSUPPORTED_OPTION_ERR       0x9UL</div><div class='del'>-	#define HWRM_ERR_CODE_HOT_RESET_PROGRESS           0xaUL</div><div class='del'>-	#define HWRM_ERR_CODE_HOT_RESET_FAIL               0xbUL</div><div class='del'>-	#define HWRM_ERR_CODE_NO_FLOW_COUNTER_DURING_ALLOC 0xcUL</div><div class='del'>-	#define HWRM_ERR_CODE_KEY_HASH_COLLISION           0xdUL</div><div class='del'>-	#define HWRM_ERR_CODE_KEY_ALREADY_EXISTS           0xeUL</div><div class='del'>-	#define HWRM_ERR_CODE_HWRM_ERROR                   0xfUL</div><div class='del'>-	#define HWRM_ERR_CODE_TLV_ENCAPSULATED_RESPONSE    0x8000UL</div><div class='del'>-	#define HWRM_ERR_CODE_UNKNOWN_ERR                  0xfffeUL</div><div class='del'>-	#define HWRM_ERR_CODE_CMD_NOT_SUPPORTED            0xffffUL</div><div class='del'>-	#define HWRM_ERR_CODE_LAST                        HWRM_ERR_CODE_CMD_NOT_SUPPORTED</div><div class='del'>-	__le16	unused_0[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_err_output (size:128b/16B) */</div><div class='del'>-struct hwrm_err_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	opaque_0;</div><div class='del'>-	__le16	opaque_1;</div><div class='del'>-	u8	cmd_err;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-#define HWRM_NA_SIGNATURE ((__le32)(-1))</div><div class='del'>-#define HWRM_MAX_REQ_LEN 128</div><div class='del'>-#define HWRM_MAX_RESP_LEN 704</div><div class='del'>-#define HW_HASH_INDEX_SIZE 0x80</div><div class='del'>-#define HW_HASH_KEY_SIZE 40</div><div class='del'>-#define HWRM_RESP_VALID_KEY 1</div><div class='del'>-#define HWRM_TARGET_ID_BONO 0xFFF8</div><div class='del'>-#define HWRM_TARGET_ID_KONG 0xFFF9</div><div class='del'>-#define HWRM_TARGET_ID_APE 0xFFFA</div><div class='del'>-#define HWRM_TARGET_ID_TOOLS 0xFFFD</div><div class='del'>-#define HWRM_VERSION_MAJOR 1</div><div class='del'>-#define HWRM_VERSION_MINOR 10</div><div class='del'>-#define HWRM_VERSION_UPDATE 0</div><div class='del'>-#define HWRM_VERSION_RSVD 69</div><div class='del'>-#define HWRM_VERSION_STR "1.10.0.69"</div><div class='del'>-</div><div class='del'>-/* hwrm_ver_get_input (size:192b/24B) */</div><div class='del'>-struct hwrm_ver_get_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	hwrm_intf_maj;</div><div class='del'>-	u8	hwrm_intf_min;</div><div class='del'>-	u8	hwrm_intf_upd;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ver_get_output (size:1408b/176B) */</div><div class='del'>-struct hwrm_ver_get_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	hwrm_intf_maj_8b;</div><div class='del'>-	u8	hwrm_intf_min_8b;</div><div class='del'>-	u8	hwrm_intf_upd_8b;</div><div class='del'>-	u8	hwrm_intf_rsvd_8b;</div><div class='del'>-	u8	hwrm_fw_maj_8b;</div><div class='del'>-	u8	hwrm_fw_min_8b;</div><div class='del'>-	u8	hwrm_fw_bld_8b;</div><div class='del'>-	u8	hwrm_fw_rsvd_8b;</div><div class='del'>-	u8	mgmt_fw_maj_8b;</div><div class='del'>-	u8	mgmt_fw_min_8b;</div><div class='del'>-	u8	mgmt_fw_bld_8b;</div><div class='del'>-	u8	mgmt_fw_rsvd_8b;</div><div class='del'>-	u8	netctrl_fw_maj_8b;</div><div class='del'>-	u8	netctrl_fw_min_8b;</div><div class='del'>-	u8	netctrl_fw_bld_8b;</div><div class='del'>-	u8	netctrl_fw_rsvd_8b;</div><div class='del'>-	__le32	dev_caps_cfg;</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_SECURE_FW_UPD_SUPPORTED                  0x1UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_FW_DCBX_AGENT_SUPPORTED                  0x2UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_SUPPORTED                      0x4UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_SHORT_CMD_REQUIRED                       0x8UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_KONG_MB_CHNL_SUPPORTED                   0x10UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_FLOW_HANDLE_64BIT_SUPPORTED              0x20UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_L2_FILTER_TYPES_ROCE_OR_L2_SUPPORTED     0x40UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_VIRTIO_VSWITCH_OFFLOAD_SUPPORTED         0x80UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_TRUSTED_VF_SUPPORTED                     0x100UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_FLOW_AGING_SUPPORTED                     0x200UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_ADV_FLOW_COUNTERS_SUPPORTED              0x400UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_EEM_SUPPORTED                        0x800UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_ADV_FLOW_MGNT_SUPPORTED              0x1000UL</div><div class='del'>-	#define VER_GET_RESP_DEV_CAPS_CFG_CFA_TFLIB_SUPPORTED                      0x2000UL</div><div class='del'>-	u8	roce_fw_maj_8b;</div><div class='del'>-	u8	roce_fw_min_8b;</div><div class='del'>-	u8	roce_fw_bld_8b;</div><div class='del'>-	u8	roce_fw_rsvd_8b;</div><div class='del'>-	char	hwrm_fw_name[16];</div><div class='del'>-	char	mgmt_fw_name[16];</div><div class='del'>-	char	netctrl_fw_name[16];</div><div class='del'>-	char	active_pkg_name[16];</div><div class='del'>-	char	roce_fw_name[16];</div><div class='del'>-	__le16	chip_num;</div><div class='del'>-	u8	chip_rev;</div><div class='del'>-	u8	chip_metal;</div><div class='del'>-	u8	chip_bond_id;</div><div class='del'>-	u8	chip_platform_type;</div><div class='del'>-	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_ASIC      0x0UL</div><div class='del'>-	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_FPGA      0x1UL</div><div class='del'>-	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_PALLADIUM 0x2UL</div><div class='del'>-	#define VER_GET_RESP_CHIP_PLATFORM_TYPE_LAST     VER_GET_RESP_CHIP_PLATFORM_TYPE_PALLADIUM</div><div class='del'>-	__le16	max_req_win_len;</div><div class='del'>-	__le16	max_resp_len;</div><div class='del'>-	__le16	def_req_timeout;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define VER_GET_RESP_FLAGS_DEV_NOT_RDY       0x1UL</div><div class='del'>-	#define VER_GET_RESP_FLAGS_EXT_VER_AVAIL     0x2UL</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	u8	always_1;</div><div class='del'>-	__le16	hwrm_intf_major;</div><div class='del'>-	__le16	hwrm_intf_minor;</div><div class='del'>-	__le16	hwrm_intf_build;</div><div class='del'>-	__le16	hwrm_intf_patch;</div><div class='del'>-	__le16	hwrm_fw_major;</div><div class='del'>-	__le16	hwrm_fw_minor;</div><div class='del'>-	__le16	hwrm_fw_build;</div><div class='del'>-	__le16	hwrm_fw_patch;</div><div class='del'>-	__le16	mgmt_fw_major;</div><div class='del'>-	__le16	mgmt_fw_minor;</div><div class='del'>-	__le16	mgmt_fw_build;</div><div class='del'>-	__le16	mgmt_fw_patch;</div><div class='del'>-	__le16	netctrl_fw_major;</div><div class='del'>-	__le16	netctrl_fw_minor;</div><div class='del'>-	__le16	netctrl_fw_build;</div><div class='del'>-	__le16	netctrl_fw_patch;</div><div class='del'>-	__le16	roce_fw_major;</div><div class='del'>-	__le16	roce_fw_minor;</div><div class='del'>-	__le16	roce_fw_build;</div><div class='del'>-	__le16	roce_fw_patch;</div><div class='del'>-	__le16	max_ext_req_len;</div><div class='del'>-	u8	unused_1[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* eject_cmpl (size:128b/16B) */</div><div class='del'>-struct eject_cmpl {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define EJECT_CMPL_TYPE_MASK       0x3fUL</div><div class='del'>-	#define EJECT_CMPL_TYPE_SFT        0</div><div class='del'>-	#define EJECT_CMPL_TYPE_STAT_EJECT   0x1aUL</div><div class='del'>-	#define EJECT_CMPL_TYPE_LAST        EJECT_CMPL_TYPE_STAT_EJECT</div><div class='del'>-	#define EJECT_CMPL_FLAGS_MASK      0xffc0UL</div><div class='del'>-	#define EJECT_CMPL_FLAGS_SFT       6</div><div class='del'>-	#define EJECT_CMPL_FLAGS_ERROR      0x40UL</div><div class='del'>-	__le16	len;</div><div class='del'>-	__le32	opaque;</div><div class='del'>-	__le16	v;</div><div class='del'>-	#define EJECT_CMPL_V                              0x1UL</div><div class='del'>-	#define EJECT_CMPL_ERRORS_MASK                    0xfffeUL</div><div class='del'>-	#define EJECT_CMPL_ERRORS_SFT                     1</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_MASK        0xeUL</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_SFT         1</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_NO_BUFFER     (0x0UL &lt;&lt; 1)</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_DID_NOT_FIT   (0x1UL &lt;&lt; 1)</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_BAD_FORMAT    (0x3UL &lt;&lt; 1)</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_FLUSH         (0x5UL &lt;&lt; 1)</div><div class='del'>-	#define EJECT_CMPL_ERRORS_BUFFER_ERROR_LAST         EJECT_CMPL_ERRORS_BUFFER_ERROR_FLUSH</div><div class='del'>-	__le16	reserved16;</div><div class='del'>-	__le32	unused_2;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cmpl (size:128b/16B) */</div><div class='del'>-struct hwrm_cmpl {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define CMPL_TYPE_MASK     0x3fUL</div><div class='del'>-	#define CMPL_TYPE_SFT      0</div><div class='del'>-	#define CMPL_TYPE_HWRM_DONE  0x20UL</div><div class='del'>-	#define CMPL_TYPE_LAST      CMPL_TYPE_HWRM_DONE</div><div class='del'>-	__le16	sequence_id;</div><div class='del'>-	__le32	unused_1;</div><div class='del'>-	__le32	v;</div><div class='del'>-	#define CMPL_V     0x1UL</div><div class='del'>-	__le32	unused_3;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fwd_req_cmpl (size:128b/16B) */</div><div class='del'>-struct hwrm_fwd_req_cmpl {</div><div class='del'>-	__le16	req_len_type;</div><div class='del'>-	#define FWD_REQ_CMPL_TYPE_MASK        0x3fUL</div><div class='del'>-	#define FWD_REQ_CMPL_TYPE_SFT         0</div><div class='del'>-	#define FWD_REQ_CMPL_TYPE_HWRM_FWD_REQ  0x22UL</div><div class='del'>-	#define FWD_REQ_CMPL_TYPE_LAST         FWD_REQ_CMPL_TYPE_HWRM_FWD_REQ</div><div class='del'>-	#define FWD_REQ_CMPL_REQ_LEN_MASK     0xffc0UL</div><div class='del'>-	#define FWD_REQ_CMPL_REQ_LEN_SFT      6</div><div class='del'>-	__le16	source_id;</div><div class='del'>-	__le32	unused0;</div><div class='del'>-	__le32	req_buf_addr_v[2];</div><div class='del'>-	#define FWD_REQ_CMPL_V                0x1UL</div><div class='del'>-	#define FWD_REQ_CMPL_REQ_BUF_ADDR_MASK 0xfffffffeUL</div><div class='del'>-	#define FWD_REQ_CMPL_REQ_BUF_ADDR_SFT 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fwd_resp_cmpl (size:128b/16B) */</div><div class='del'>-struct hwrm_fwd_resp_cmpl {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define FWD_RESP_CMPL_TYPE_MASK         0x3fUL</div><div class='del'>-	#define FWD_RESP_CMPL_TYPE_SFT          0</div><div class='del'>-	#define FWD_RESP_CMPL_TYPE_HWRM_FWD_RESP  0x24UL</div><div class='del'>-	#define FWD_RESP_CMPL_TYPE_LAST          FWD_RESP_CMPL_TYPE_HWRM_FWD_RESP</div><div class='del'>-	__le16	source_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	unused_1;</div><div class='del'>-	__le32	resp_buf_addr_v[2];</div><div class='del'>-	#define FWD_RESP_CMPL_V                 0x1UL</div><div class='del'>-	#define FWD_RESP_CMPL_RESP_BUF_ADDR_MASK 0xfffffffeUL</div><div class='del'>-	#define FWD_RESP_CMPL_RESP_BUF_ADDR_SFT 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_TYPE_LAST             ASYNC_EVENT_CMPL_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE         0x0UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_MTU_CHANGE            0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CHANGE          0x2UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_DCB_CONFIG_CHANGE          0x3UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_PORT_CONN_NOT_ALLOWED      0x4UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_NOT_ALLOWED 0x5UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE      0x6UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_PORT_PHY_CFG_CHANGE        0x7UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY               0x8UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY             0x9UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_FUNC_DRVR_UNLOAD           0x10UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_FUNC_DRVR_LOAD             0x11UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_FUNC_FLR_PROC_CMPLT        0x12UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD             0x20UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_LOAD               0x21UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_FLR                     0x30UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_MAC_ADDR_CHANGE         0x31UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_PF_VF_COMM_STATUS_CHANGE   0x32UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_VF_CFG_CHANGE              0x33UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LLFC_PFC_CHANGE            0x34UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_DEFAULT_VNIC_CHANGE        0x35UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_HW_FLOW_AGED               0x36UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION         0x37UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_CACHE_FLUSH_REQ        0x38UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_CACHE_FLUSH_DONE       0x39UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_TCP_FLAG_ACTION_CHANGE     0x3aUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_FLOW_ACTIVE            0x3bUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_EEM_CFG_CHANGE             0x3cUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_FW_TRACE_MSG               0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_HWRM_ERROR                 0xffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EVENT_ID_LAST                      ASYNC_EVENT_CMPL_EVENT_ID_HWRM_ERROR</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_link_status_change (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_link_status_change {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_ID_LINK_STATUS_CHANGE 0x0UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_ID_LAST              ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_ID_LINK_STATUS_CHANGE</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE     0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_DOWN  0x0UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_UP    0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_LAST ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_LINK_CHANGE_UP</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_MASK       0xeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_SFT        1</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_ID_MASK    0xffff0UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PORT_ID_SFT     4</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PF_ID_MASK      0xff00000UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_STATUS_CHANGE_EVENT_DATA1_PF_ID_SFT       20</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_port_conn_not_allowed (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_port_conn_not_allowed {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_LAST             ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_ID_PORT_CONN_NOT_ALLOWED 0x4UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_ID_LAST                 ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_ID_PORT_CONN_NOT_ALLOWED</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_MASK                 0xffffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_SFT                  0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_MASK      0xff0000UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_SFT       16</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_NONE        (0x0UL &lt;&lt; 16)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_DISABLETX   (0x1UL &lt;&lt; 16)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_WARNINGMSG  (0x2UL &lt;&lt; 16)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_PWRDOWN     (0x3UL &lt;&lt; 16)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_LAST       ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_PWRDOWN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_link_speed_cfg_change (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_link_speed_cfg_change {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_ID_LINK_SPEED_CFG_CHANGE 0x6UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_ID_LAST                 ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_ID_LINK_SPEED_CFG_CHANGE</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_PORT_ID_MASK                     0xffffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_PORT_ID_SFT                      0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_SUPPORTED_LINK_SPEEDS_CHANGE     0x10000UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_LINK_SPEED_CFG_CHANGE_EVENT_DATA1_ILLEGAL_LINK_SPEED_CFG           0x20000UL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_reset_notify (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_reset_notify {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_LAST             ASYNC_EVENT_CMPL_RESET_NOTIFY_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_ID_RESET_NOTIFY 0x8UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_ID_LAST        ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_ID_RESET_NOTIFY</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_MASK                  0xffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_SFT                   0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_DRIVER_STOP_TX_QUEUE    0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_DRIVER_IFDOWN           0x2UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_LAST                   ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DRIVER_ACTION_DRIVER_IFDOWN</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MASK                    0xff00UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_SFT                     8</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_MANAGEMENT_RESET_REQUEST  (0x1UL &lt;&lt; 8)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_FATAL        (0x2UL &lt;&lt; 8)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_NON_FATAL    (0x3UL &lt;&lt; 8)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_LAST                     ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_REASON_CODE_FW_EXCEPTION_NON_FATAL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DELAY_IN_100MS_TICKS_MASK           0xffff0000UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_RESET_NOTIFY_EVENT_DATA1_DELAY_IN_100MS_TICKS_SFT            16</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_error_recovery (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_error_recovery {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_LAST             ASYNC_EVENT_CMPL_ERROR_RECOVERY_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_ID_ERROR_RECOVERY 0x9UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_ID_LAST          ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_ID_ERROR_RECOVERY</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASK                 0xffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_SFT                  0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_MASTER_FUNC           0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED      0x2UL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_vf_cfg_change (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_vf_cfg_change {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_LAST             ASYNC_EVENT_CMPL_VF_CFG_CHANGE_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_ID_VF_CFG_CHANGE 0x33UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_ID_LAST         ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_ID_VF_CFG_CHANGE</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_MTU_CHANGE                0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_MRU_CHANGE                0x2UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_DFLT_MAC_ADDR_CHANGE      0x4UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_DFLT_VLAN_CHANGE          0x8UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_VF_CFG_CHANGE_EVENT_DATA1_TRUSTED_VF_CFG_CHANGE     0x10UL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_hw_flow_aged (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_hw_flow_aged {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_LAST             ASYNC_EVENT_CMPL_HW_FLOW_AGED_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_ID_HW_FLOW_AGED 0x36UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_ID_LAST        ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_ID_HW_FLOW_AGED</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_ID_MASK       0x7fffffffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_ID_SFT        0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION     0x80000000UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_RX    (0x0UL &lt;&lt; 31)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_TX    (0x1UL &lt;&lt; 31)</div><div class='del'>-	#define ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_LAST ASYNC_EVENT_CMPL_HW_FLOW_AGED_EVENT_DATA1_FLOW_DIRECTION_TX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_eem_cache_flush_req (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_eem_cache_flush_req {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_LAST             ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_EVENT_ID_EEM_CACHE_FLUSH_REQ 0x38UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_EVENT_ID_LAST               ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_EVENT_ID_EEM_CACHE_FLUSH_REQ</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_REQ_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_async_event_cmpl_eem_cache_flush_done (size:128b/16B) */</div><div class='del'>-struct hwrm_async_event_cmpl_eem_cache_flush_done {</div><div class='del'>-	__le16	type;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_MASK            0x3fUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_SFT             0</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_HWRM_ASYNC_EVENT  0x2eUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_LAST             ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_TYPE_HWRM_ASYNC_EVENT</div><div class='del'>-	__le16	event_id;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_ID_EEM_CACHE_FLUSH_DONE 0x39UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_ID_LAST                ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_ID_EEM_CACHE_FLUSH_DONE</div><div class='del'>-	__le32	event_data2;</div><div class='del'>-	u8	opaque_v;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_V          0x1UL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_OPAQUE_MASK 0xfeUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_OPAQUE_SFT 1</div><div class='del'>-	u8	timestamp_lo;</div><div class='del'>-	__le16	timestamp_hi;</div><div class='del'>-	__le32	event_data1;</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_DATA1_FID_MASK 0xffffUL</div><div class='del'>-	#define ASYNC_EVENT_CMPL_EEM_CACHE_FLUSH_DONE_EVENT_DATA1_FID_SFT 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_reset_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_reset_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_RESET_REQ_ENABLES_VF_ID_VALID     0x1UL</div><div class='del'>-	__le16	vf_id;</div><div class='del'>-	u8	func_reset_level;</div><div class='del'>-	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETALL      0x0UL</div><div class='del'>-	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETME       0x1UL</div><div class='del'>-	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETCHILDREN 0x2UL</div><div class='del'>-	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETVF       0x3UL</div><div class='del'>-	#define FUNC_RESET_REQ_FUNC_RESET_LEVEL_LAST         FUNC_RESET_REQ_FUNC_RESET_LEVEL_RESETVF</div><div class='del'>-	u8	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_reset_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_reset_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_getfid_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_getfid_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_GETFID_REQ_ENABLES_PCI_ID     0x1UL</div><div class='del'>-	__le16	pci_id;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_getfid_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_getfid_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_alloc_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_vf_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_VF_ALLOC_REQ_ENABLES_FIRST_VF_ID     0x1UL</div><div class='del'>-	__le16	first_vf_id;</div><div class='del'>-	__le16	num_vfs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_vf_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	first_vf_id;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_vf_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_VF_FREE_REQ_ENABLES_FIRST_VF_ID     0x1UL</div><div class='del'>-	__le16	first_vf_id;</div><div class='del'>-	__le16	num_vfs;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_vf_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_cfg_input (size:448b/56B) */</div><div class='del'>-struct hwrm_func_vf_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_MTU                  0x1UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_GUEST_VLAN           0x2UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_ASYNC_EVENT_CR       0x4UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_DFLT_MAC_ADDR        0x8UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS      0x10UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_CMPL_RINGS       0x20UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_TX_RINGS         0x40UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_RX_RINGS         0x80UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_L2_CTXS          0x100UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS            0x200UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_STAT_CTXS        0x400UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_ENABLES_NUM_HW_RING_GRPS     0x800UL</div><div class='del'>-	__le16	mtu;</div><div class='del'>-	__le16	guest_vlan;</div><div class='del'>-	__le16	async_event_cr;</div><div class='del'>-	u8	dflt_mac_addr[6];</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_TX_ASSETS_TEST             0x1UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_RX_ASSETS_TEST             0x2UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_CMPL_ASSETS_TEST           0x4UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST     0x8UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST       0x10UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST       0x20UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_VNIC_ASSETS_TEST           0x40UL</div><div class='del'>-	#define FUNC_VF_CFG_REQ_FLAGS_L2_CTX_ASSETS_TEST         0x80UL</div><div class='del'>-	__le16	num_rsscos_ctxs;</div><div class='del'>-	__le16	num_cmpl_rings;</div><div class='del'>-	__le16	num_tx_rings;</div><div class='del'>-	__le16	num_rx_rings;</div><div class='del'>-	__le16	num_l2_ctxs;</div><div class='del'>-	__le16	num_vnics;</div><div class='del'>-	__le16	num_stat_ctxs;</div><div class='del'>-	__le16	num_hw_ring_grps;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_vf_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_qcaps_output (size:640b/80B) */</div><div class='del'>-struct hwrm_func_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED             0x1UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_GLOBAL_MSIX_AUTOMASKING         0x2UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED                   0x4UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_ROCE_V1_SUPPORTED               0x8UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_ROCE_V2_SUPPORTED               0x10UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_WOL_MAGICPKT_SUPPORTED          0x20UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_WOL_BMP_SUPPORTED               0x40UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_TX_RING_RL_SUPPORTED            0x80UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_TX_BW_CFG_SUPPORTED             0x100UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_VF_TX_RING_RL_SUPPORTED         0x200UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_VF_BW_CFG_SUPPORTED             0x400UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_STD_TX_RING_MODE_SUPPORTED      0x800UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_GENEVE_TUN_FLAGS_SUPPORTED      0x1000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_NVGRE_TUN_FLAGS_SUPPORTED       0x2000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_GRE_TUN_FLAGS_SUPPORTED         0x4000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_MPLS_TUN_FLAGS_SUPPORTED        0x8000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_PCIE_STATS_SUPPORTED            0x10000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_ADOPTED_PF_SUPPORTED            0x20000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_ADMIN_PF_SUPPORTED              0x40000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_LINK_ADMIN_STATUS_SUPPORTED     0x80000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_WCB_PUSH_MODE                   0x100000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_DYNAMIC_TX_RING_ALLOC           0x200000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_HOT_RESET_CAPABLE               0x400000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_ERROR_RECOVERY_CAPABLE          0x800000UL</div><div class='del'>-	#define FUNC_QCAPS_RESP_FLAGS_EXT_STATS_SUPPORTED             0x1000000UL</div><div class='del'>-	u8	mac_address[6];</div><div class='del'>-	__le16	max_rsscos_ctx;</div><div class='del'>-	__le16	max_cmpl_rings;</div><div class='del'>-	__le16	max_tx_rings;</div><div class='del'>-	__le16	max_rx_rings;</div><div class='del'>-	__le16	max_l2_ctxs;</div><div class='del'>-	__le16	max_vnics;</div><div class='del'>-	__le16	first_vf_id;</div><div class='del'>-	__le16	max_vfs;</div><div class='del'>-	__le16	max_stat_ctx;</div><div class='del'>-	__le32	max_encap_records;</div><div class='del'>-	__le32	max_decap_records;</div><div class='del'>-	__le32	max_tx_em_flows;</div><div class='del'>-	__le32	max_tx_wm_flows;</div><div class='del'>-	__le32	max_rx_em_flows;</div><div class='del'>-	__le32	max_rx_wm_flows;</div><div class='del'>-	__le32	max_mcast_filters;</div><div class='del'>-	__le32	max_flow_id;</div><div class='del'>-	__le32	max_hw_ring_grps;</div><div class='del'>-	__le16	max_sp_tx_rings;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_qcfg_output (size:704b/88B) */</div><div class='del'>-struct hwrm_func_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	__le16	vlan;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_OOB_WOL_MAGICPKT_ENABLED     0x1UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_OOB_WOL_BMP_ENABLED          0x2UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_FW_DCBX_AGENT_ENABLED        0x4UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_STD_TX_RING_MODE_ENABLED     0x8UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_FW_LLDP_AGENT_ENABLED        0x10UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_MULTI_HOST                   0x20UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_TRUSTED_VF                   0x40UL</div><div class='del'>-	#define FUNC_QCFG_RESP_FLAGS_SECURE_MODE_ENABLED          0x80UL</div><div class='del'>-	u8	mac_address[6];</div><div class='del'>-	__le16	pci_id;</div><div class='del'>-	__le16	alloc_rsscos_ctx;</div><div class='del'>-	__le16	alloc_cmpl_rings;</div><div class='del'>-	__le16	alloc_tx_rings;</div><div class='del'>-	__le16	alloc_rx_rings;</div><div class='del'>-	__le16	alloc_l2_ctx;</div><div class='del'>-	__le16	alloc_vnics;</div><div class='del'>-	__le16	mtu;</div><div class='del'>-	__le16	mru;</div><div class='del'>-	__le16	stat_ctx_id;</div><div class='del'>-	u8	port_partition_type;</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_SPF     0x0UL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_MPFS    0x1UL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_0 0x2UL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR1_5 0x3UL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_NPAR2_0 0x4UL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_UNKNOWN 0xffUL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PARTITION_TYPE_LAST   FUNC_QCFG_RESP_PORT_PARTITION_TYPE_UNKNOWN</div><div class='del'>-	u8	port_pf_cnt;</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PF_CNT_UNAVAIL 0x0UL</div><div class='del'>-	#define FUNC_QCFG_RESP_PORT_PF_CNT_LAST   FUNC_QCFG_RESP_PORT_PF_CNT_UNAVAIL</div><div class='del'>-	__le16	dflt_vnic_id;</div><div class='del'>-	__le16	max_mtu_configured;</div><div class='del'>-	__le32	min_bw;</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_SCALE_LAST                 FUNC_QCFG_RESP_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_LAST         FUNC_QCFG_RESP_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	max_bw;</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_SCALE_LAST                 FUNC_QCFG_RESP_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_LAST         FUNC_QCFG_RESP_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	evb_mode;</div><div class='del'>-	#define FUNC_QCFG_RESP_EVB_MODE_NO_EVB 0x0UL</div><div class='del'>-	#define FUNC_QCFG_RESP_EVB_MODE_VEB    0x1UL</div><div class='del'>-	#define FUNC_QCFG_RESP_EVB_MODE_VEPA   0x2UL</div><div class='del'>-	#define FUNC_QCFG_RESP_EVB_MODE_LAST  FUNC_QCFG_RESP_EVB_MODE_VEPA</div><div class='del'>-	u8	options;</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_MASK         0x3UL</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SFT          0</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SIZE_64        0x0UL</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SIZE_128       0x1UL</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_LAST          FUNC_QCFG_RESP_OPTIONS_CACHE_LINESIZE_SIZE_128</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_MASK       0xcUL</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_SFT        2</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_FORCED_DOWN  (0x0UL &lt;&lt; 2)</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_FORCED_UP    (0x1UL &lt;&lt; 2)</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_AUTO         (0x2UL &lt;&lt; 2)</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_LAST        FUNC_QCFG_RESP_OPTIONS_LINK_ADMIN_STATE_AUTO</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_RSVD_MASK                   0xf0UL</div><div class='del'>-	#define FUNC_QCFG_RESP_OPTIONS_RSVD_SFT                    4</div><div class='del'>-	__le16	alloc_vfs;</div><div class='del'>-	__le32	alloc_mcast_filters;</div><div class='del'>-	__le32	alloc_hw_ring_grps;</div><div class='del'>-	__le16	alloc_sp_tx_rings;</div><div class='del'>-	__le16	alloc_stat_ctx;</div><div class='del'>-	__le16	alloc_msix;</div><div class='del'>-	__le16	registered_vfs;</div><div class='del'>-	u8	unused_1[3];</div><div class='del'>-	u8	always_1;</div><div class='del'>-	__le32	reset_addr_poll;</div><div class='del'>-	u8	unused_2[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_cfg_input (size:704b/88B) */</div><div class='del'>-struct hwrm_func_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	__le16	num_msix;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE     0x1UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE      0x2UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_RSVD_MASK                      0x1fcUL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_RSVD_SFT                       2</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_STD_TX_RING_MODE_ENABLE        0x200UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_STD_TX_RING_MODE_DISABLE       0x400UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_VIRT_MAC_PERSIST               0x800UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_NO_AUTOCLEAR_STATISTIC         0x1000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_TX_ASSETS_TEST                 0x2000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_RX_ASSETS_TEST                 0x4000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_CMPL_ASSETS_TEST               0x8000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_RSSCOS_CTX_ASSETS_TEST         0x10000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_RING_GRP_ASSETS_TEST           0x20000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_STAT_CTX_ASSETS_TEST           0x40000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_VNIC_ASSETS_TEST               0x80000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_L2_CTX_ASSETS_TEST             0x100000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE              0x200000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_DYNAMIC_TX_RING_ALLOC          0x400000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_NQ_ASSETS_TEST                 0x800000UL</div><div class='del'>-	#define FUNC_CFG_REQ_FLAGS_TRUSTED_VF_DISABLE             0x1000000UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_MTU                     0x1UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_MRU                     0x2UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS         0x4UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS          0x8UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS            0x10UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS            0x20UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_L2_CTXS             0x40UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_VNICS               0x80UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS           0x100UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR           0x200UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_DFLT_VLAN               0x400UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_DFLT_IP_ADDR            0x800UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_MIN_BW                  0x1000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_MAX_BW                  0x2000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_ASYNC_EVENT_CR          0x4000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_VLAN_ANTISPOOF_MODE     0x8000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_ALLOWED_VLAN_PRIS       0x10000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_EVB_MODE                0x20000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_MCAST_FILTERS       0x40000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS        0x80000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_CACHE_LINESIZE          0x100000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_NUM_MSIX                0x200000UL</div><div class='del'>-	#define FUNC_CFG_REQ_ENABLES_ADMIN_LINK_STATE        0x400000UL</div><div class='del'>-	__le16	mtu;</div><div class='del'>-	__le16	mru;</div><div class='del'>-	__le16	num_rsscos_ctxs;</div><div class='del'>-	__le16	num_cmpl_rings;</div><div class='del'>-	__le16	num_tx_rings;</div><div class='del'>-	__le16	num_rx_rings;</div><div class='del'>-	__le16	num_l2_ctxs;</div><div class='del'>-	__le16	num_vnics;</div><div class='del'>-	__le16	num_stat_ctxs;</div><div class='del'>-	__le16	num_hw_ring_grps;</div><div class='del'>-	u8	dflt_mac_addr[6];</div><div class='del'>-	__le16	dflt_vlan;</div><div class='del'>-	__be32	dflt_ip_addr[4];</div><div class='del'>-	__le32	min_bw;</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_SCALE_LAST                 FUNC_CFG_REQ_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_LAST         FUNC_CFG_REQ_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	max_bw;</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_SCALE_LAST                 FUNC_CFG_REQ_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_LAST         FUNC_CFG_REQ_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le16	async_event_cr;</div><div class='del'>-	u8	vlan_antispoof_mode;</div><div class='del'>-	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_NOCHECK                 0x0UL</div><div class='del'>-	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_VALIDATE_VLAN           0x1UL</div><div class='del'>-	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_INSERT_IF_VLANDNE       0x2UL</div><div class='del'>-	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_INSERT_OR_OVERRIDE_VLAN 0x3UL</div><div class='del'>-	#define FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_LAST                   FUNC_CFG_REQ_VLAN_ANTISPOOF_MODE_INSERT_OR_OVERRIDE_VLAN</div><div class='del'>-	u8	allowed_vlan_pris;</div><div class='del'>-	u8	evb_mode;</div><div class='del'>-	#define FUNC_CFG_REQ_EVB_MODE_NO_EVB 0x0UL</div><div class='del'>-	#define FUNC_CFG_REQ_EVB_MODE_VEB    0x1UL</div><div class='del'>-	#define FUNC_CFG_REQ_EVB_MODE_VEPA   0x2UL</div><div class='del'>-	#define FUNC_CFG_REQ_EVB_MODE_LAST  FUNC_CFG_REQ_EVB_MODE_VEPA</div><div class='del'>-	u8	options;</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_MASK         0x3UL</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SFT          0</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_64        0x0UL</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_128       0x1UL</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_LAST          FUNC_CFG_REQ_OPTIONS_CACHE_LINESIZE_SIZE_128</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_MASK       0xcUL</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_SFT        2</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_FORCED_DOWN  (0x0UL &lt;&lt; 2)</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_FORCED_UP    (0x1UL &lt;&lt; 2)</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_AUTO         (0x2UL &lt;&lt; 2)</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_LAST        FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_AUTO</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_RSVD_MASK                   0xf0UL</div><div class='del'>-	#define FUNC_CFG_REQ_OPTIONS_RSVD_SFT                    4</div><div class='del'>-	__le16	num_mcast_filters;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_qstats_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_qstats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_qstats_output (size:1408b/176B) */</div><div class='del'>-struct hwrm_func_qstats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	tx_ucast_pkts;</div><div class='del'>-	__le64	tx_mcast_pkts;</div><div class='del'>-	__le64	tx_bcast_pkts;</div><div class='del'>-	__le64	tx_discard_pkts;</div><div class='del'>-	__le64	tx_drop_pkts;</div><div class='del'>-	__le64	tx_ucast_bytes;</div><div class='del'>-	__le64	tx_mcast_bytes;</div><div class='del'>-	__le64	tx_bcast_bytes;</div><div class='del'>-	__le64	rx_ucast_pkts;</div><div class='del'>-	__le64	rx_mcast_pkts;</div><div class='del'>-	__le64	rx_bcast_pkts;</div><div class='del'>-	__le64	rx_discard_pkts;</div><div class='del'>-	__le64	rx_drop_pkts;</div><div class='del'>-	__le64	rx_ucast_bytes;</div><div class='del'>-	__le64	rx_mcast_bytes;</div><div class='del'>-	__le64	rx_bcast_bytes;</div><div class='del'>-	__le64	rx_agg_pkts;</div><div class='del'>-	__le64	rx_agg_bytes;</div><div class='del'>-	__le64	rx_agg_events;</div><div class='del'>-	__le64	rx_agg_aborts;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_clr_stats_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_clr_stats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_clr_stats_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_clr_stats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_resc_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_vf_resc_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	vf_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_resc_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_vf_resc_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_rgtr_input (size:896b/112B) */</div><div class='del'>-struct hwrm_func_drv_rgtr_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_FLAGS_FWD_ALL_MODE               0x1UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_FLAGS_FWD_NONE_MODE              0x2UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_FLAGS_16BIT_VER_MODE             0x4UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_FLAGS_FLOW_HANDLE_64BIT_MODE     0x8UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_FLAGS_HOT_RESET_SUPPORT          0x10UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_FLAGS_ERROR_RECOVERY_SUPPORT     0x20UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_ENABLES_OS_TYPE             0x1UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_ENABLES_VER                 0x2UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_ENABLES_TIMESTAMP           0x4UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_ENABLES_VF_REQ_FWD          0x8UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_ENABLES_ASYNC_EVENT_FWD     0x10UL</div><div class='del'>-	__le16	os_type;</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_UNKNOWN   0x0UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_OTHER     0x1UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_MSDOS     0xeUL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WINDOWS   0x12UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_SOLARIS   0x1dUL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_LINUX     0x24UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_FREEBSD   0x2aUL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_ESXI      0x68UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN864    0x73UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_WIN2012R2 0x74UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_UEFI      0x8000UL</div><div class='del'>-	#define FUNC_DRV_RGTR_REQ_OS_TYPE_LAST     FUNC_DRV_RGTR_REQ_OS_TYPE_UEFI</div><div class='del'>-	u8	ver_maj_8b;</div><div class='del'>-	u8	ver_min_8b;</div><div class='del'>-	u8	ver_upd_8b;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	__le32	timestamp;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-	__le32	vf_req_fwd[8];</div><div class='del'>-	__le32	async_event_fwd[8];</div><div class='del'>-	__le16	ver_maj;</div><div class='del'>-	__le16	ver_min;</div><div class='del'>-	__le16	ver_upd;</div><div class='del'>-	__le16	ver_patch;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_rgtr_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_drv_rgtr_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_DRV_RGTR_RESP_FLAGS_IF_CHANGE_SUPPORTED     0x1UL</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_unrgtr_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_drv_unrgtr_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_DRV_UNRGTR_REQ_FLAGS_PREPARE_FOR_SHUTDOWN     0x1UL</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_unrgtr_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_drv_unrgtr_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_buf_rgtr_input (size:1024b/128B) */</div><div class='del'>-struct hwrm_func_buf_rgtr_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_ENABLES_VF_ID            0x1UL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_ENABLES_ERR_BUF_ADDR     0x2UL</div><div class='del'>-	__le16	vf_id;</div><div class='del'>-	__le16	req_buf_num_pages;</div><div class='del'>-	__le16	req_buf_page_size;</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_16B 0x4UL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_4K  0xcUL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_8K  0xdUL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_64K 0x10UL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_2M  0x15UL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_4M  0x16UL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_1G  0x1eUL</div><div class='del'>-	#define FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_LAST FUNC_BUF_RGTR_REQ_REQ_BUF_PAGE_SIZE_1G</div><div class='del'>-	__le16	req_buf_len;</div><div class='del'>-	__le16	resp_buf_len;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le64	req_buf_page_addr0;</div><div class='del'>-	__le64	req_buf_page_addr1;</div><div class='del'>-	__le64	req_buf_page_addr2;</div><div class='del'>-	__le64	req_buf_page_addr3;</div><div class='del'>-	__le64	req_buf_page_addr4;</div><div class='del'>-	__le64	req_buf_page_addr5;</div><div class='del'>-	__le64	req_buf_page_addr6;</div><div class='del'>-	__le64	req_buf_page_addr7;</div><div class='del'>-	__le64	req_buf_page_addr8;</div><div class='del'>-	__le64	req_buf_page_addr9;</div><div class='del'>-	__le64	error_buf_addr;</div><div class='del'>-	__le64	resp_buf_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_buf_rgtr_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_buf_rgtr_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_qver_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_drv_qver_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	reserved;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_qver_output (size:256b/32B) */</div><div class='del'>-struct hwrm_func_drv_qver_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	os_type;</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_UNKNOWN   0x0UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_OTHER     0x1UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_MSDOS     0xeUL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_WINDOWS   0x12UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_SOLARIS   0x1dUL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_LINUX     0x24UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_FREEBSD   0x2aUL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_ESXI      0x68UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_WIN864    0x73UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_WIN2012R2 0x74UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_UEFI      0x8000UL</div><div class='del'>-	#define FUNC_DRV_QVER_RESP_OS_TYPE_LAST     FUNC_DRV_QVER_RESP_OS_TYPE_UEFI</div><div class='del'>-	u8	ver_maj_8b;</div><div class='del'>-	u8	ver_min_8b;</div><div class='del'>-	u8	ver_upd_8b;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	__le16	ver_maj;</div><div class='del'>-	__le16	ver_min;</div><div class='del'>-	__le16	ver_upd;</div><div class='del'>-	__le16	ver_patch;</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_resource_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_resource_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	fid;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_resource_qcaps_output (size:448b/56B) */</div><div class='del'>-struct hwrm_func_resource_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	max_vfs;</div><div class='del'>-	__le16	max_msix;</div><div class='del'>-	__le16	vf_reservation_strategy;</div><div class='del'>-	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MAXIMAL        0x0UL</div><div class='del'>-	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MINIMAL        0x1UL</div><div class='del'>-	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MINIMAL_STATIC 0x2UL</div><div class='del'>-	#define FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_LAST          FUNC_RESOURCE_QCAPS_RESP_VF_RESERVATION_STRATEGY_MINIMAL_STATIC</div><div class='del'>-	__le16	min_rsscos_ctx;</div><div class='del'>-	__le16	max_rsscos_ctx;</div><div class='del'>-	__le16	min_cmpl_rings;</div><div class='del'>-	__le16	max_cmpl_rings;</div><div class='del'>-	__le16	min_tx_rings;</div><div class='del'>-	__le16	max_tx_rings;</div><div class='del'>-	__le16	min_rx_rings;</div><div class='del'>-	__le16	max_rx_rings;</div><div class='del'>-	__le16	min_l2_ctxs;</div><div class='del'>-	__le16	max_l2_ctxs;</div><div class='del'>-	__le16	min_vnics;</div><div class='del'>-	__le16	max_vnics;</div><div class='del'>-	__le16	min_stat_ctx;</div><div class='del'>-	__le16	max_stat_ctx;</div><div class='del'>-	__le16	min_hw_ring_grps;</div><div class='del'>-	__le16	max_hw_ring_grps;</div><div class='del'>-	__le16	max_tx_scheduler_inputs;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define FUNC_RESOURCE_QCAPS_RESP_FLAGS_MIN_GUARANTEED     0x1UL</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_resource_cfg_input (size:448b/56B) */</div><div class='del'>-struct hwrm_func_vf_resource_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	vf_id;</div><div class='del'>-	__le16	max_msix;</div><div class='del'>-	__le16	min_rsscos_ctx;</div><div class='del'>-	__le16	max_rsscos_ctx;</div><div class='del'>-	__le16	min_cmpl_rings;</div><div class='del'>-	__le16	max_cmpl_rings;</div><div class='del'>-	__le16	min_tx_rings;</div><div class='del'>-	__le16	max_tx_rings;</div><div class='del'>-	__le16	min_rx_rings;</div><div class='del'>-	__le16	max_rx_rings;</div><div class='del'>-	__le16	min_l2_ctxs;</div><div class='del'>-	__le16	max_l2_ctxs;</div><div class='del'>-	__le16	min_vnics;</div><div class='del'>-	__le16	max_vnics;</div><div class='del'>-	__le16	min_stat_ctx;</div><div class='del'>-	__le16	max_stat_ctx;</div><div class='del'>-	__le16	min_hw_ring_grps;</div><div class='del'>-	__le16	max_hw_ring_grps;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define FUNC_VF_RESOURCE_CFG_REQ_FLAGS_MIN_GUARANTEED     0x1UL</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_vf_resource_cfg_output (size:256b/32B) */</div><div class='del'>-struct hwrm_func_vf_resource_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	reserved_rsscos_ctx;</div><div class='del'>-	__le16	reserved_cmpl_rings;</div><div class='del'>-	__le16	reserved_tx_rings;</div><div class='del'>-	__le16	reserved_rx_rings;</div><div class='del'>-	__le16	reserved_l2_ctxs;</div><div class='del'>-	__le16	reserved_vnics;</div><div class='del'>-	__le16	reserved_stat_ctx;</div><div class='del'>-	__le16	reserved_hw_ring_grps;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_backing_store_qcaps_input (size:128b/16B) */</div><div class='del'>-struct hwrm_func_backing_store_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_backing_store_qcaps_output (size:576b/72B) */</div><div class='del'>-struct hwrm_func_backing_store_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	qp_max_entries;</div><div class='del'>-	__le16	qp_min_qp1_entries;</div><div class='del'>-	__le16	qp_max_l2_entries;</div><div class='del'>-	__le16	qp_entry_size;</div><div class='del'>-	__le16	srq_max_l2_entries;</div><div class='del'>-	__le32	srq_max_entries;</div><div class='del'>-	__le16	srq_entry_size;</div><div class='del'>-	__le16	cq_max_l2_entries;</div><div class='del'>-	__le32	cq_max_entries;</div><div class='del'>-	__le16	cq_entry_size;</div><div class='del'>-	__le16	vnic_max_vnic_entries;</div><div class='del'>-	__le16	vnic_max_ring_table_entries;</div><div class='del'>-	__le16	vnic_entry_size;</div><div class='del'>-	__le32	stat_max_entries;</div><div class='del'>-	__le16	stat_entry_size;</div><div class='del'>-	__le16	tqm_entry_size;</div><div class='del'>-	__le32	tqm_min_entries_per_ring;</div><div class='del'>-	__le32	tqm_max_entries_per_ring;</div><div class='del'>-	__le32	mrav_max_entries;</div><div class='del'>-	__le16	mrav_entry_size;</div><div class='del'>-	__le16	tim_entry_size;</div><div class='del'>-	__le32	tim_max_entries;</div><div class='del'>-	__le16	mrav_num_entries_units;</div><div class='del'>-	u8	tqm_entries_multiple;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_backing_store_cfg_input (size:2048b/256B) */</div><div class='del'>-struct hwrm_func_backing_store_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_PREBOOT_MODE               0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_FLAGS_MRAV_RESERVATION_SPLIT     0x2UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_QP            0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_SRQ           0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_CQ            0x4UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_VNIC          0x8UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_STAT          0x10UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_SP        0x20UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING0     0x40UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING1     0x80UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING2     0x100UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING3     0x200UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING4     0x400UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING5     0x800UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING6     0x1000UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TQM_RING7     0x2000UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_MRAV          0x4000UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM           0x8000UL</div><div class='del'>-	u8	qpc_pg_size_qpc_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_QPC_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_QPC_PG_SIZE_PG_1G</div><div class='del'>-	u8	srq_pg_size_srq_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_SRQ_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_SRQ_PG_SIZE_PG_1G</div><div class='del'>-	u8	cq_pg_size_cq_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_CQ_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_CQ_PG_SIZE_PG_1G</div><div class='del'>-	u8	vnic_pg_size_vnic_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_VNIC_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_VNIC_PG_SIZE_PG_1G</div><div class='del'>-	u8	stat_pg_size_stat_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_STAT_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_STAT_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_sp_pg_size_tqm_sp_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_SP_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_SP_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring0_pg_size_tqm_ring0_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING0_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring1_pg_size_tqm_ring1_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING1_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring2_pg_size_tqm_ring2_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING2_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring3_pg_size_tqm_ring3_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING3_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring4_pg_size_tqm_ring4_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING4_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring5_pg_size_tqm_ring5_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING5_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring6_pg_size_tqm_ring6_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING6_PG_SIZE_PG_1G</div><div class='del'>-	u8	tqm_ring7_pg_size_tqm_ring7_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TQM_RING7_PG_SIZE_PG_1G</div><div class='del'>-	u8	mrav_pg_size_mrav_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_MRAV_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_MRAV_PG_SIZE_PG_1G</div><div class='del'>-	u8	tim_pg_size_tim_lvl;</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_MASK      0xfUL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_SFT       0</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_0       0x0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_1       0x1UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_2       0x2UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LAST       FUNC_BACKING_STORE_CFG_REQ_TIM_LVL_LVL_2</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_MASK  0xf0UL</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_SFT   4</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_4K   (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_8K   (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_64K  (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_2M   (0x3UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_8M   (0x4UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_1G   (0x5UL &lt;&lt; 4)</div><div class='del'>-	#define FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_LAST   FUNC_BACKING_STORE_CFG_REQ_TIM_PG_SIZE_PG_1G</div><div class='del'>-	__le64	qpc_page_dir;</div><div class='del'>-	__le64	srq_page_dir;</div><div class='del'>-	__le64	cq_page_dir;</div><div class='del'>-	__le64	vnic_page_dir;</div><div class='del'>-	__le64	stat_page_dir;</div><div class='del'>-	__le64	tqm_sp_page_dir;</div><div class='del'>-	__le64	tqm_ring0_page_dir;</div><div class='del'>-	__le64	tqm_ring1_page_dir;</div><div class='del'>-	__le64	tqm_ring2_page_dir;</div><div class='del'>-	__le64	tqm_ring3_page_dir;</div><div class='del'>-	__le64	tqm_ring4_page_dir;</div><div class='del'>-	__le64	tqm_ring5_page_dir;</div><div class='del'>-	__le64	tqm_ring6_page_dir;</div><div class='del'>-	__le64	tqm_ring7_page_dir;</div><div class='del'>-	__le64	mrav_page_dir;</div><div class='del'>-	__le64	tim_page_dir;</div><div class='del'>-	__le32	qp_num_entries;</div><div class='del'>-	__le32	srq_num_entries;</div><div class='del'>-	__le32	cq_num_entries;</div><div class='del'>-	__le32	stat_num_entries;</div><div class='del'>-	__le32	tqm_sp_num_entries;</div><div class='del'>-	__le32	tqm_ring0_num_entries;</div><div class='del'>-	__le32	tqm_ring1_num_entries;</div><div class='del'>-	__le32	tqm_ring2_num_entries;</div><div class='del'>-	__le32	tqm_ring3_num_entries;</div><div class='del'>-	__le32	tqm_ring4_num_entries;</div><div class='del'>-	__le32	tqm_ring5_num_entries;</div><div class='del'>-	__le32	tqm_ring6_num_entries;</div><div class='del'>-	__le32	tqm_ring7_num_entries;</div><div class='del'>-	__le32	mrav_num_entries;</div><div class='del'>-	__le32	tim_num_entries;</div><div class='del'>-	__le16	qp_num_qp1_entries;</div><div class='del'>-	__le16	qp_num_l2_entries;</div><div class='del'>-	__le16	qp_entry_size;</div><div class='del'>-	__le16	srq_num_l2_entries;</div><div class='del'>-	__le16	srq_entry_size;</div><div class='del'>-	__le16	cq_num_l2_entries;</div><div class='del'>-	__le16	cq_entry_size;</div><div class='del'>-	__le16	vnic_num_vnic_entries;</div><div class='del'>-	__le16	vnic_num_ring_table_entries;</div><div class='del'>-	__le16	vnic_entry_size;</div><div class='del'>-	__le16	stat_entry_size;</div><div class='del'>-	__le16	tqm_entry_size;</div><div class='del'>-	__le16	mrav_entry_size;</div><div class='del'>-	__le16	tim_entry_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_backing_store_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_backing_store_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_error_recovery_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_error_recovery_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	unused_0[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_error_recovery_qcfg_output (size:1664b/208B) */</div><div class='del'>-struct hwrm_error_recovery_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FLAGS_HOST       0x1UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU     0x2UL</div><div class='del'>-	__le32	driver_polling_freq;</div><div class='del'>-	__le32	master_func_wait_period;</div><div class='del'>-	__le32	normal_func_wait_period;</div><div class='del'>-	__le32	master_func_wait_period_after_reset;</div><div class='del'>-	__le32	max_bailout_time_after_reset;</div><div class='del'>-	__le32	fw_health_status_reg;</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_MASK    0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_SFT     0</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_GRC       0x1UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SPACE_BAR1</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_MASK          0xfffffffcUL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEALTH_STATUS_REG_ADDR_SFT           2</div><div class='del'>-	__le32	fw_heartbeat_reg;</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_MASK    0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_SFT     0</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_GRC       0x1UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SPACE_BAR1</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_MASK          0xfffffffcUL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_HEARTBEAT_REG_ADDR_SFT           2</div><div class='del'>-	__le32	fw_reset_cnt_reg;</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_MASK    0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_SFT     0</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_GRC       0x1UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SPACE_BAR1</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_MASK          0xfffffffcUL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_FW_RESET_CNT_REG_ADDR_SFT           2</div><div class='del'>-	__le32	reset_inprogress_reg;</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_MASK    0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_SFT     0</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_GRC       0x1UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SPACE_BAR1</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_MASK          0xfffffffcUL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_INPROGRESS_REG_ADDR_SFT           2</div><div class='del'>-	__le32	reset_inprogress_reg_mask;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	reg_array_cnt;</div><div class='del'>-	__le32	reset_reg[16];</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_MASK    0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_SFT     0</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_PCIE_CFG  0x0UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_GRC       0x1UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_BAR0      0x2UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_BAR1      0x3UL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_LAST     ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SPACE_BAR1</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_MASK          0xfffffffcUL</div><div class='del'>-	#define ERROR_RECOVERY_QCFG_RESP_RESET_REG_ADDR_SFT           2</div><div class='del'>-	__le32	reset_reg_val[16];</div><div class='del'>-	u8	delay_after_reset[16];</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_if_change_input (size:192b/24B) */</div><div class='del'>-struct hwrm_func_drv_if_change_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_DRV_IF_CHANGE_REQ_FLAGS_UP     0x1UL</div><div class='del'>-	__le32	unused;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_func_drv_if_change_output (size:128b/16B) */</div><div class='del'>-struct hwrm_func_drv_if_change_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define FUNC_DRV_IF_CHANGE_RESP_FLAGS_RESC_CHANGE           0x1UL</div><div class='del'>-	#define FUNC_DRV_IF_CHANGE_RESP_FLAGS_HOT_FW_RESET_DONE     0x2UL</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_cfg_input (size:448b/56B) */</div><div class='del'>-struct hwrm_port_phy_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_RESET_PHY                0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_DEPRECATED               0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FORCE                    0x4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG          0x8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_EEE_ENABLE               0x10UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_EEE_DISABLE              0x20UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_EEE_TX_LPI_ENABLE        0x40UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_EEE_TX_LPI_DISABLE       0x80UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_ENABLE       0x100UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FEC_AUTONEG_DISABLE      0x200UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_ENABLE      0x400UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE74_DISABLE     0x800UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_ENABLE      0x1000UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FEC_CLAUSE91_DISABLE     0x2000UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FLAGS_FORCE_LINK_DWN           0x4000UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_MODE                0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_DUPLEX              0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_PAUSE               0x4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED          0x8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED_MASK     0x10UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_WIRESPEED                0x20UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_LPBK                     0x40UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_PREEMPHASIS              0x80UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_FORCE_PAUSE              0x100UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_EEE_LINK_SPEED_MASK      0x200UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_ENABLES_TX_LPI_TIMER             0x400UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	__le16	force_link_speed;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100MB 0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB   0xaUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_2GB   0x14UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_2_5GB 0x19UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB  0x64UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_20GB  0xc8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_25GB  0xfaUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_40GB  0x190UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_50GB  0x1f4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100GB 0x3e8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_200GB 0x7d0UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10MB  0xffffUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_LAST PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10MB</div><div class='del'>-	u8	auto_mode;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_MODE_NONE         0x0UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_MODE_ALL_SPEEDS   0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_MODE_ONE_SPEED    0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_MODE_ONE_OR_BELOW 0x3UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK   0x4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_MODE_LAST        PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK</div><div class='del'>-	u8	auto_duplex;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_HALF 0x0UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_FULL 0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_BOTH 0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_DUPLEX_LAST PORT_PHY_CFG_REQ_AUTO_DUPLEX_BOTH</div><div class='del'>-	u8	auto_pause;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_PAUSE_TX                0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_PAUSE_RX                0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE     0x4UL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	auto_link_speed;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_100MB 0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_1GB   0xaUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_2GB   0x14UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_2_5GB 0x19UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10GB  0x64UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_20GB  0xc8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_25GB  0xfaUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_40GB  0x190UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_50GB  0x1f4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_100GB 0x3e8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_200GB 0x7d0UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10MB  0xffffUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_LAST PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_10MB</div><div class='del'>-	__le16	auto_link_speed_mask;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_100MBHD     0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_100MB       0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_1GBHD       0x4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_1GB         0x8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_2GB         0x10UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_2_5GB       0x20UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_10GB        0x40UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_20GB        0x80UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_25GB        0x100UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_40GB        0x200UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_50GB        0x400UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_100GB       0x800UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_10MBHD      0x1000UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_10MB        0x2000UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_AUTO_LINK_SPEED_MASK_200GB       0x4000UL</div><div class='del'>-	u8	wirespeed;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_WIRESPEED_OFF 0x0UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_WIRESPEED_ON  0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_WIRESPEED_LAST PORT_PHY_CFG_REQ_WIRESPEED_ON</div><div class='del'>-	u8	lpbk;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_LPBK_NONE     0x0UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_LPBK_LOCAL    0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_LPBK_REMOTE   0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_LPBK_EXTERNAL 0x3UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_LPBK_LAST    PORT_PHY_CFG_REQ_LPBK_EXTERNAL</div><div class='del'>-	u8	force_pause;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_PAUSE_TX     0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_FORCE_PAUSE_RX     0x2UL</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	__le32	preemphasis;</div><div class='del'>-	__le16	eee_link_speed_mask;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD1     0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_100MB     0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD2     0x4UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_1GB       0x8UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD3     0x10UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_RSVD4     0x20UL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_EEE_LINK_SPEED_MASK_10GB      0x40UL</div><div class='del'>-	u8	unused_2[2];</div><div class='del'>-	__le32	tx_lpi_timer;</div><div class='del'>-	#define PORT_PHY_CFG_REQ_TX_LPI_TIMER_MASK 0xffffffUL</div><div class='del'>-	#define PORT_PHY_CFG_REQ_TX_LPI_TIMER_SFT 0</div><div class='del'>-	__le32	unused_3;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_phy_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_cfg_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_port_phy_cfg_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define PORT_PHY_CFG_CMD_ERR_CODE_UNKNOWN       0x0UL</div><div class='del'>-	#define PORT_PHY_CFG_CMD_ERR_CODE_ILLEGAL_SPEED 0x1UL</div><div class='del'>-	#define PORT_PHY_CFG_CMD_ERR_CODE_RETRY         0x2UL</div><div class='del'>-	#define PORT_PHY_CFG_CMD_ERR_CODE_LAST         PORT_PHY_CFG_CMD_ERR_CODE_RETRY</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_phy_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_qcfg_output (size:768b/96B) */</div><div class='del'>-struct hwrm_port_phy_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	link;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_NO_LINK 0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SIGNAL  0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_LINK    0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_LAST   PORT_PHY_QCFG_RESP_LINK_LINK</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	link_speed;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_100MB 0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_1GB   0xaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_2GB   0x14UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_2_5GB 0x19UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_10GB  0x64UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_20GB  0xc8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_25GB  0xfaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_40GB  0x190UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_50GB  0x1f4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_100GB 0x3e8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_200GB 0x7d0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_10MB  0xffffUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_LINK_SPEED_10MB</div><div class='del'>-	u8	duplex_cfg;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_DUPLEX_CFG_HALF 0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_DUPLEX_CFG_FULL 0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_DUPLEX_CFG_LAST PORT_PHY_QCFG_RESP_DUPLEX_CFG_FULL</div><div class='del'>-	u8	pause;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PAUSE_TX     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PAUSE_RX     0x2UL</div><div class='del'>-	__le16	support_speeds;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100MBHD     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100MB       0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_1GBHD       0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_1GB         0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_2GB         0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_2_5GB       0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_10GB        0x40UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_20GB        0x80UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_25GB        0x100UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_40GB        0x200UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_50GB        0x400UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_100GB       0x800UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_10MBHD      0x1000UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_10MB        0x2000UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_200GB       0x4000UL</div><div class='del'>-	__le16	force_link_speed;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_100MB 0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_1GB   0xaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_2GB   0x14UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_2_5GB 0x19UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_10GB  0x64UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_20GB  0xc8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_25GB  0xfaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_40GB  0x190UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_50GB  0x1f4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_100GB 0x3e8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_200GB 0x7d0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_10MB  0xffffUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_FORCE_LINK_SPEED_10MB</div><div class='del'>-	u8	auto_mode;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_MODE_NONE         0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_MODE_ALL_SPEEDS   0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_MODE_ONE_SPEED    0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_MODE_ONE_OR_BELOW 0x3UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_MODE_SPEED_MASK   0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_MODE_LAST        PORT_PHY_QCFG_RESP_AUTO_MODE_SPEED_MASK</div><div class='del'>-	u8	auto_pause;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_PAUSE_TX                0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_PAUSE_RX                0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_PAUSE_AUTONEG_PAUSE     0x4UL</div><div class='del'>-	__le16	auto_link_speed;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_100MB 0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_1GB   0xaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_2GB   0x14UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_2_5GB 0x19UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_10GB  0x64UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_20GB  0xc8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_25GB  0xfaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_40GB  0x190UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_50GB  0x1f4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_100GB 0x3e8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_200GB 0x7d0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_10MB  0xffffUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_LAST PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_10MB</div><div class='del'>-	__le16	auto_link_speed_mask;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_100MBHD     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_100MB       0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_1GBHD       0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_1GB         0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_2GB         0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_2_5GB       0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_10GB        0x40UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_20GB        0x80UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_25GB        0x100UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_40GB        0x200UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_50GB        0x400UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_100GB       0x800UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_10MBHD      0x1000UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_10MB        0x2000UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_AUTO_LINK_SPEED_MASK_200GB       0x4000UL</div><div class='del'>-	u8	wirespeed;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_WIRESPEED_OFF 0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_WIRESPEED_ON  0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_WIRESPEED_LAST PORT_PHY_QCFG_RESP_WIRESPEED_ON</div><div class='del'>-	u8	lpbk;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LPBK_NONE     0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LPBK_LOCAL    0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LPBK_REMOTE   0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LPBK_EXTERNAL 0x3UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LPBK_LAST    PORT_PHY_QCFG_RESP_LPBK_EXTERNAL</div><div class='del'>-	u8	force_pause;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_PAUSE_TX     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FORCE_PAUSE_RX     0x2UL</div><div class='del'>-	u8	module_status;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_NONE          0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_DISABLETX     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_WARNINGMSG    0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN       0x3UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTINSERTED   0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTAPPLICABLE 0xffUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MODULE_STATUS_LAST         PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTAPPLICABLE</div><div class='del'>-	__le32	preemphasis;</div><div class='del'>-	u8	phy_maj;</div><div class='del'>-	u8	phy_min;</div><div class='del'>-	u8	phy_bld;</div><div class='del'>-	u8	phy_type;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_UNKNOWN          0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASECR           0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR4          0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASELR           0x3UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASESR           0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR2          0x5UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKX           0x6UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASEKR           0x7UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASET            0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_BASETE           0x9UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_SGMIIEXTPHY      0xaUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_L  0xbUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_S  0xcUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASECR_CA_N  0xdUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_25G_BASESR       0xeUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR4     0xfUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR4     0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR4     0x11UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER4     0x12UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR10    0x13UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASECR4      0x14UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASESR4      0x15UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASELR4      0x16UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_BASEER4      0x17UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_40G_ACTIVE_CABLE 0x18UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASET         0x19UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASESX        0x1aUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_1G_BASECX        0x1bUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASECR4     0x1cUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASESR4     0x1dUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASELR4     0x1eUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER4     0x1fUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_TYPE_LAST            PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER4</div><div class='del'>-	u8	media_type;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_UNKNOWN 0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_TP      0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_DAC     0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_FIBRE   0x3UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_MEDIA_TYPE_LAST   PORT_PHY_QCFG_RESP_MEDIA_TYPE_FIBRE</div><div class='del'>-	u8	xcvr_pkg_type;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_INTERNAL 0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_EXTERNAL 0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_LAST         PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_EXTERNAL</div><div class='del'>-	u8	eee_config_phy_addr;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_ADDR_MASK              0x1fUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PHY_ADDR_SFT               0</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_MASK            0xe0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_SFT             5</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_ENABLED      0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_ACTIVE       0x40UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_EEE_CONFIG_EEE_TX_LPI       0x80UL</div><div class='del'>-	u8	parallel_detect;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_PARALLEL_DETECT     0x1UL</div><div class='del'>-	__le16	link_partner_adv_speeds;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_100MBHD     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_100MB       0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_1GBHD       0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_1GB         0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_2GB         0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_2_5GB       0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_10GB        0x40UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_20GB        0x80UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_25GB        0x100UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_40GB        0x200UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_50GB        0x400UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_100GB       0x800UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_10MBHD      0x1000UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_SPEEDS_10MB        0x2000UL</div><div class='del'>-	u8	link_partner_adv_auto_mode;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_NONE         0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_ALL_SPEEDS   0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_ONE_SPEED    0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_ONE_OR_BELOW 0x3UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_SPEED_MASK   0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_LAST        PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_AUTO_MODE_SPEED_MASK</div><div class='del'>-	u8	link_partner_adv_pause;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_PAUSE_TX     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_PAUSE_RX     0x2UL</div><div class='del'>-	__le16	adv_eee_link_speed_mask;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD1     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_100MB     0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD2     0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_1GB       0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD3     0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_RSVD4     0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_ADV_EEE_LINK_SPEED_MASK_10GB      0x40UL</div><div class='del'>-	__le16	link_partner_adv_eee_link_speed_mask;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD1     0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_100MB     0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD2     0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_1GB       0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD3     0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_RSVD4     0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_LINK_PARTNER_ADV_EEE_LINK_SPEED_MASK_10GB      0x40UL</div><div class='del'>-	__le32	xcvr_identifier_type_tx_lpi_timer;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_TX_LPI_TIMER_MASK            0xffffffUL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_TX_LPI_TIMER_SFT             0</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_MASK    0xff000000UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_SFT     24</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_UNKNOWN   (0x0UL &lt;&lt; 24)</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_SFP       (0x3UL &lt;&lt; 24)</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFP      (0xcUL &lt;&lt; 24)</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFPPLUS  (0xdUL &lt;&lt; 24)</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFP28    (0x11UL &lt;&lt; 24)</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_LAST     PORT_PHY_QCFG_RESP_XCVR_IDENTIFIER_TYPE_QSFP28</div><div class='del'>-	__le16	fec_cfg;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_NONE_SUPPORTED         0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_AUTONEG_SUPPORTED      0x2UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_AUTONEG_ENABLED        0x4UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE74_SUPPORTED     0x8UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE74_ENABLED       0x10UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_SUPPORTED     0x20UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_FEC_CFG_FEC_CLAUSE91_ENABLED       0x40UL</div><div class='del'>-	u8	duplex_state;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_DUPLEX_STATE_HALF 0x0UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_DUPLEX_STATE_FULL 0x1UL</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_DUPLEX_STATE_LAST PORT_PHY_QCFG_RESP_DUPLEX_STATE_FULL</div><div class='del'>-	u8	option_flags;</div><div class='del'>-	#define PORT_PHY_QCFG_RESP_OPTION_FLAGS_MEDIA_AUTO_DETECT     0x1UL</div><div class='del'>-	char	phy_vendor_name[16];</div><div class='del'>-	char	phy_vendor_partnumber[16];</div><div class='del'>-	u8	unused_2[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_mac_cfg_input (size:384b/48B) */</div><div class='del'>-struct hwrm_port_mac_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_MATCH_LINK                    0x1UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_VLAN_PRI2COS_ENABLE           0x2UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_TUNNEL_PRI2COS_ENABLE         0x4UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_IP_DSCP2COS_ENABLE            0x8UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_PTP_RX_TS_CAPTURE_ENABLE      0x10UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_PTP_RX_TS_CAPTURE_DISABLE     0x20UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_PTP_TX_TS_CAPTURE_ENABLE      0x40UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_PTP_TX_TS_CAPTURE_DISABLE     0x80UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_OOB_WOL_ENABLE                0x100UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_OOB_WOL_DISABLE               0x200UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_VLAN_PRI2COS_DISABLE          0x400UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_TUNNEL_PRI2COS_DISABLE        0x800UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_IP_DSCP2COS_DISABLE           0x1000UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_FLAGS_PTP_ONE_STEP_TX_TS            0x2000UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_IPG                            0x1UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_LPBK                           0x2UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_VLAN_PRI2COS_MAP_PRI           0x4UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_TUNNEL_PRI2COS_MAP_PRI         0x10UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_DSCP2COS_MAP_PRI               0x20UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_RX_TS_CAPTURE_PTP_MSG_TYPE     0x40UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_TX_TS_CAPTURE_PTP_MSG_TYPE     0x80UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_COS_FIELD_CFG                  0x100UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_ENABLES_PTP_FREQ_ADJ_PPB               0x200UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	ipg;</div><div class='del'>-	u8	lpbk;</div><div class='del'>-	#define PORT_MAC_CFG_REQ_LPBK_NONE   0x0UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_LPBK_LOCAL  0x1UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_LPBK_REMOTE 0x2UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_LPBK_LAST  PORT_MAC_CFG_REQ_LPBK_REMOTE</div><div class='del'>-	u8	vlan_pri2cos_map_pri;</div><div class='del'>-	u8	reserved1;</div><div class='del'>-	u8	tunnel_pri2cos_map_pri;</div><div class='del'>-	u8	dscp2pri_map_pri;</div><div class='del'>-	__le16	rx_ts_capture_ptp_msg_type;</div><div class='del'>-	__le16	tx_ts_capture_ptp_msg_type;</div><div class='del'>-	u8	cos_field_cfg;</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_RSVD1                     0x1UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_MASK         0x6UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_SFT          1</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_INNERMOST      (0x0UL &lt;&lt; 1)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_OUTER          (0x1UL &lt;&lt; 1)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_OUTERMOST      (0x2UL &lt;&lt; 1)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_UNSPECIFIED    (0x3UL &lt;&lt; 1)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_LAST          PORT_MAC_CFG_REQ_COS_FIELD_CFG_VLAN_PRI_SEL_UNSPECIFIED</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_MASK       0x18UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_SFT        3</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_INNERMOST    (0x0UL &lt;&lt; 3)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_OUTER        (0x1UL &lt;&lt; 3)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_OUTERMOST    (0x2UL &lt;&lt; 3)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_UNSPECIFIED  (0x3UL &lt;&lt; 3)</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_LAST        PORT_MAC_CFG_REQ_COS_FIELD_CFG_T_VLAN_PRI_SEL_UNSPECIFIED</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_DEFAULT_COS_MASK          0xe0UL</div><div class='del'>-	#define PORT_MAC_CFG_REQ_COS_FIELD_CFG_DEFAULT_COS_SFT           5</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	__s32	ptp_freq_adj_ppb;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_mac_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_mac_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	mru;</div><div class='del'>-	__le16	mtu;</div><div class='del'>-	u8	ipg;</div><div class='del'>-	u8	lpbk;</div><div class='del'>-	#define PORT_MAC_CFG_RESP_LPBK_NONE   0x0UL</div><div class='del'>-	#define PORT_MAC_CFG_RESP_LPBK_LOCAL  0x1UL</div><div class='del'>-	#define PORT_MAC_CFG_RESP_LPBK_REMOTE 0x2UL</div><div class='del'>-	#define PORT_MAC_CFG_RESP_LPBK_LAST  PORT_MAC_CFG_RESP_LPBK_REMOTE</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_mac_ptp_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_mac_ptp_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_mac_ptp_qcfg_output (size:640b/80B) */</div><div class='del'>-struct hwrm_port_mac_ptp_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_DIRECT_ACCESS      0x1UL</div><div class='del'>-	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_HWRM_ACCESS        0x2UL</div><div class='del'>-	#define PORT_MAC_PTP_QCFG_RESP_FLAGS_ONE_STEP_TX_TS     0x4UL</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	__le32	rx_ts_reg_off_lower;</div><div class='del'>-	__le32	rx_ts_reg_off_upper;</div><div class='del'>-	__le32	rx_ts_reg_off_seq_id;</div><div class='del'>-	__le32	rx_ts_reg_off_src_id_0;</div><div class='del'>-	__le32	rx_ts_reg_off_src_id_1;</div><div class='del'>-	__le32	rx_ts_reg_off_src_id_2;</div><div class='del'>-	__le32	rx_ts_reg_off_domain_id;</div><div class='del'>-	__le32	rx_ts_reg_off_fifo;</div><div class='del'>-	__le32	rx_ts_reg_off_fifo_adv;</div><div class='del'>-	__le32	rx_ts_reg_off_granularity;</div><div class='del'>-	__le32	tx_ts_reg_off_lower;</div><div class='del'>-	__le32	tx_ts_reg_off_upper;</div><div class='del'>-	__le32	tx_ts_reg_off_seq_id;</div><div class='del'>-	__le32	tx_ts_reg_off_fifo;</div><div class='del'>-	__le32	tx_ts_reg_off_granularity;</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* tx_port_stats (size:3264b/408B) */</div><div class='del'>-struct tx_port_stats {</div><div class='del'>-	__le64	tx_64b_frames;</div><div class='del'>-	__le64	tx_65b_127b_frames;</div><div class='del'>-	__le64	tx_128b_255b_frames;</div><div class='del'>-	__le64	tx_256b_511b_frames;</div><div class='del'>-	__le64	tx_512b_1023b_frames;</div><div class='del'>-	__le64	tx_1024b_1518b_frames;</div><div class='del'>-	__le64	tx_good_vlan_frames;</div><div class='del'>-	__le64	tx_1519b_2047b_frames;</div><div class='del'>-	__le64	tx_2048b_4095b_frames;</div><div class='del'>-	__le64	tx_4096b_9216b_frames;</div><div class='del'>-	__le64	tx_9217b_16383b_frames;</div><div class='del'>-	__le64	tx_good_frames;</div><div class='del'>-	__le64	tx_total_frames;</div><div class='del'>-	__le64	tx_ucast_frames;</div><div class='del'>-	__le64	tx_mcast_frames;</div><div class='del'>-	__le64	tx_bcast_frames;</div><div class='del'>-	__le64	tx_pause_frames;</div><div class='del'>-	__le64	tx_pfc_frames;</div><div class='del'>-	__le64	tx_jabber_frames;</div><div class='del'>-	__le64	tx_fcs_err_frames;</div><div class='del'>-	__le64	tx_control_frames;</div><div class='del'>-	__le64	tx_oversz_frames;</div><div class='del'>-	__le64	tx_single_dfrl_frames;</div><div class='del'>-	__le64	tx_multi_dfrl_frames;</div><div class='del'>-	__le64	tx_single_coll_frames;</div><div class='del'>-	__le64	tx_multi_coll_frames;</div><div class='del'>-	__le64	tx_late_coll_frames;</div><div class='del'>-	__le64	tx_excessive_coll_frames;</div><div class='del'>-	__le64	tx_frag_frames;</div><div class='del'>-	__le64	tx_err;</div><div class='del'>-	__le64	tx_tagged_frames;</div><div class='del'>-	__le64	tx_dbl_tagged_frames;</div><div class='del'>-	__le64	tx_runt_frames;</div><div class='del'>-	__le64	tx_fifo_underruns;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri0;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri1;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri2;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri3;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri4;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri5;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri6;</div><div class='del'>-	__le64	tx_pfc_ena_frames_pri7;</div><div class='del'>-	__le64	tx_eee_lpi_events;</div><div class='del'>-	__le64	tx_eee_lpi_duration;</div><div class='del'>-	__le64	tx_llfc_logical_msgs;</div><div class='del'>-	__le64	tx_hcfc_msgs;</div><div class='del'>-	__le64	tx_total_collisions;</div><div class='del'>-	__le64	tx_bytes;</div><div class='del'>-	__le64	tx_xthol_frames;</div><div class='del'>-	__le64	tx_stat_discard;</div><div class='del'>-	__le64	tx_stat_error;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* rx_port_stats (size:4224b/528B) */</div><div class='del'>-struct rx_port_stats {</div><div class='del'>-	__le64	rx_64b_frames;</div><div class='del'>-	__le64	rx_65b_127b_frames;</div><div class='del'>-	__le64	rx_128b_255b_frames;</div><div class='del'>-	__le64	rx_256b_511b_frames;</div><div class='del'>-	__le64	rx_512b_1023b_frames;</div><div class='del'>-	__le64	rx_1024b_1518b_frames;</div><div class='del'>-	__le64	rx_good_vlan_frames;</div><div class='del'>-	__le64	rx_1519b_2047b_frames;</div><div class='del'>-	__le64	rx_2048b_4095b_frames;</div><div class='del'>-	__le64	rx_4096b_9216b_frames;</div><div class='del'>-	__le64	rx_9217b_16383b_frames;</div><div class='del'>-	__le64	rx_total_frames;</div><div class='del'>-	__le64	rx_ucast_frames;</div><div class='del'>-	__le64	rx_mcast_frames;</div><div class='del'>-	__le64	rx_bcast_frames;</div><div class='del'>-	__le64	rx_fcs_err_frames;</div><div class='del'>-	__le64	rx_ctrl_frames;</div><div class='del'>-	__le64	rx_pause_frames;</div><div class='del'>-	__le64	rx_pfc_frames;</div><div class='del'>-	__le64	rx_unsupported_opcode_frames;</div><div class='del'>-	__le64	rx_unsupported_da_pausepfc_frames;</div><div class='del'>-	__le64	rx_wrong_sa_frames;</div><div class='del'>-	__le64	rx_align_err_frames;</div><div class='del'>-	__le64	rx_oor_len_frames;</div><div class='del'>-	__le64	rx_code_err_frames;</div><div class='del'>-	__le64	rx_false_carrier_frames;</div><div class='del'>-	__le64	rx_ovrsz_frames;</div><div class='del'>-	__le64	rx_jbr_frames;</div><div class='del'>-	__le64	rx_mtu_err_frames;</div><div class='del'>-	__le64	rx_match_crc_frames;</div><div class='del'>-	__le64	rx_promiscuous_frames;</div><div class='del'>-	__le64	rx_tagged_frames;</div><div class='del'>-	__le64	rx_double_tagged_frames;</div><div class='del'>-	__le64	rx_trunc_frames;</div><div class='del'>-	__le64	rx_good_frames;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri0;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri1;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri2;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri3;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri4;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri5;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri6;</div><div class='del'>-	__le64	rx_pfc_xon2xoff_frames_pri7;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri0;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri1;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri2;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri3;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri4;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri5;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri6;</div><div class='del'>-	__le64	rx_pfc_ena_frames_pri7;</div><div class='del'>-	__le64	rx_sch_crc_err_frames;</div><div class='del'>-	__le64	rx_undrsz_frames;</div><div class='del'>-	__le64	rx_frag_frames;</div><div class='del'>-	__le64	rx_eee_lpi_events;</div><div class='del'>-	__le64	rx_eee_lpi_duration;</div><div class='del'>-	__le64	rx_llfc_physical_msgs;</div><div class='del'>-	__le64	rx_llfc_logical_msgs;</div><div class='del'>-	__le64	rx_llfc_msgs_with_crc_err;</div><div class='del'>-	__le64	rx_hcfc_msgs;</div><div class='del'>-	__le64	rx_hcfc_msgs_with_crc_err;</div><div class='del'>-	__le64	rx_bytes;</div><div class='del'>-	__le64	rx_runt_bytes;</div><div class='del'>-	__le64	rx_runt_frames;</div><div class='del'>-	__le64	rx_stat_discard;</div><div class='del'>-	__le64	rx_stat_err;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_qstats_input (size:320b/40B) */</div><div class='del'>-struct hwrm_port_qstats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	__le64	tx_stat_host_addr;</div><div class='del'>-	__le64	rx_stat_host_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_qstats_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_qstats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	tx_stat_size;</div><div class='del'>-	__le16	rx_stat_size;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* tx_port_stats_ext (size:2048b/256B) */</div><div class='del'>-struct tx_port_stats_ext {</div><div class='del'>-	__le64	tx_bytes_cos0;</div><div class='del'>-	__le64	tx_bytes_cos1;</div><div class='del'>-	__le64	tx_bytes_cos2;</div><div class='del'>-	__le64	tx_bytes_cos3;</div><div class='del'>-	__le64	tx_bytes_cos4;</div><div class='del'>-	__le64	tx_bytes_cos5;</div><div class='del'>-	__le64	tx_bytes_cos6;</div><div class='del'>-	__le64	tx_bytes_cos7;</div><div class='del'>-	__le64	tx_packets_cos0;</div><div class='del'>-	__le64	tx_packets_cos1;</div><div class='del'>-	__le64	tx_packets_cos2;</div><div class='del'>-	__le64	tx_packets_cos3;</div><div class='del'>-	__le64	tx_packets_cos4;</div><div class='del'>-	__le64	tx_packets_cos5;</div><div class='del'>-	__le64	tx_packets_cos6;</div><div class='del'>-	__le64	tx_packets_cos7;</div><div class='del'>-	__le64	pfc_pri0_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri0_tx_transitions;</div><div class='del'>-	__le64	pfc_pri1_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri1_tx_transitions;</div><div class='del'>-	__le64	pfc_pri2_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri2_tx_transitions;</div><div class='del'>-	__le64	pfc_pri3_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri3_tx_transitions;</div><div class='del'>-	__le64	pfc_pri4_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri4_tx_transitions;</div><div class='del'>-	__le64	pfc_pri5_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri5_tx_transitions;</div><div class='del'>-	__le64	pfc_pri6_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri6_tx_transitions;</div><div class='del'>-	__le64	pfc_pri7_tx_duration_us;</div><div class='del'>-	__le64	pfc_pri7_tx_transitions;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* rx_port_stats_ext (size:2624b/328B) */</div><div class='del'>-struct rx_port_stats_ext {</div><div class='del'>-	__le64	link_down_events;</div><div class='del'>-	__le64	continuous_pause_events;</div><div class='del'>-	__le64	resume_pause_events;</div><div class='del'>-	__le64	continuous_roce_pause_events;</div><div class='del'>-	__le64	resume_roce_pause_events;</div><div class='del'>-	__le64	rx_bytes_cos0;</div><div class='del'>-	__le64	rx_bytes_cos1;</div><div class='del'>-	__le64	rx_bytes_cos2;</div><div class='del'>-	__le64	rx_bytes_cos3;</div><div class='del'>-	__le64	rx_bytes_cos4;</div><div class='del'>-	__le64	rx_bytes_cos5;</div><div class='del'>-	__le64	rx_bytes_cos6;</div><div class='del'>-	__le64	rx_bytes_cos7;</div><div class='del'>-	__le64	rx_packets_cos0;</div><div class='del'>-	__le64	rx_packets_cos1;</div><div class='del'>-	__le64	rx_packets_cos2;</div><div class='del'>-	__le64	rx_packets_cos3;</div><div class='del'>-	__le64	rx_packets_cos4;</div><div class='del'>-	__le64	rx_packets_cos5;</div><div class='del'>-	__le64	rx_packets_cos6;</div><div class='del'>-	__le64	rx_packets_cos7;</div><div class='del'>-	__le64	pfc_pri0_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri0_rx_transitions;</div><div class='del'>-	__le64	pfc_pri1_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri1_rx_transitions;</div><div class='del'>-	__le64	pfc_pri2_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri2_rx_transitions;</div><div class='del'>-	__le64	pfc_pri3_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri3_rx_transitions;</div><div class='del'>-	__le64	pfc_pri4_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri4_rx_transitions;</div><div class='del'>-	__le64	pfc_pri5_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri5_rx_transitions;</div><div class='del'>-	__le64	pfc_pri6_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri6_rx_transitions;</div><div class='del'>-	__le64	pfc_pri7_rx_duration_us;</div><div class='del'>-	__le64	pfc_pri7_rx_transitions;</div><div class='del'>-	__le64	rx_bits;</div><div class='del'>-	__le64	rx_buffer_passed_threshold;</div><div class='del'>-	__le64	rx_pcs_symbol_err;</div><div class='del'>-	__le64	rx_corrected_bits;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_qstats_ext_input (size:320b/40B) */</div><div class='del'>-struct hwrm_port_qstats_ext_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	__le16	tx_stat_size;</div><div class='del'>-	__le16	rx_stat_size;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le64	tx_stat_host_addr;</div><div class='del'>-	__le64	rx_stat_host_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_qstats_ext_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_qstats_ext_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	tx_stat_size;</div><div class='del'>-	__le16	rx_stat_size;</div><div class='del'>-	__le16	total_active_cos_queues;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define PORT_QSTATS_EXT_RESP_FLAGS_CLEAR_ROCE_COUNTERS_SUPPORTED     0x1UL</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_lpbk_qstats_input (size:128b/16B) */</div><div class='del'>-struct hwrm_port_lpbk_qstats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_lpbk_qstats_output (size:768b/96B) */</div><div class='del'>-struct hwrm_port_lpbk_qstats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	lpbk_ucast_frames;</div><div class='del'>-	__le64	lpbk_mcast_frames;</div><div class='del'>-	__le64	lpbk_bcast_frames;</div><div class='del'>-	__le64	lpbk_ucast_bytes;</div><div class='del'>-	__le64	lpbk_mcast_bytes;</div><div class='del'>-	__le64	lpbk_bcast_bytes;</div><div class='del'>-	__le64	tx_stat_discard;</div><div class='del'>-	__le64	tx_stat_error;</div><div class='del'>-	__le64	rx_stat_discard;</div><div class='del'>-	__le64	rx_stat_error;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_clr_stats_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_clr_stats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define PORT_CLR_STATS_REQ_FLAGS_ROCE_COUNTERS     0x1UL</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_clr_stats_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_clr_stats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_lpbk_clr_stats_input (size:128b/16B) */</div><div class='del'>-struct hwrm_port_lpbk_clr_stats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_lpbk_clr_stats_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_lpbk_clr_stats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_ts_query_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_ts_query_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define PORT_TS_QUERY_REQ_FLAGS_PATH             0x1UL</div><div class='del'>-	#define PORT_TS_QUERY_REQ_FLAGS_PATH_TX            0x0UL</div><div class='del'>-	#define PORT_TS_QUERY_REQ_FLAGS_PATH_RX            0x1UL</div><div class='del'>-	#define PORT_TS_QUERY_REQ_FLAGS_PATH_LAST         PORT_TS_QUERY_REQ_FLAGS_PATH_RX</div><div class='del'>-	#define PORT_TS_QUERY_REQ_FLAGS_CURRENT_TIME     0x2UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_ts_query_output (size:192b/24B) */</div><div class='del'>-struct hwrm_port_ts_query_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	ptp_msg_ts;</div><div class='del'>-	__le16	ptp_msg_seqid;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_phy_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_qcaps_output (size:192b/24B) */</div><div class='del'>-struct hwrm_port_phy_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_FLAGS_EEE_SUPPORTED               0x1UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_FLAGS_EXTERNAL_LPBK_SUPPORTED     0x2UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_FLAGS_RSVD1_MASK                  0xfcUL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_FLAGS_RSVD1_SFT                   2</div><div class='del'>-	u8	port_cnt;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_PORT_CNT_UNKNOWN 0x0UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_PORT_CNT_1       0x1UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_PORT_CNT_2       0x2UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_PORT_CNT_3       0x3UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_PORT_CNT_4       0x4UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_PORT_CNT_LAST   PORT_PHY_QCAPS_RESP_PORT_CNT_4</div><div class='del'>-	__le16	supported_speeds_force_mode;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_100MBHD     0x1UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_100MB       0x2UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_1GBHD       0x4UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_1GB         0x8UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_2GB         0x10UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_2_5GB       0x20UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_10GB        0x40UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_20GB        0x80UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_25GB        0x100UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_40GB        0x200UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_50GB        0x400UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_100GB       0x800UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_10MBHD      0x1000UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_10MB        0x2000UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_FORCE_MODE_200GB       0x4000UL</div><div class='del'>-	__le16	supported_speeds_auto_mode;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_100MBHD     0x1UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_100MB       0x2UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_1GBHD       0x4UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_1GB         0x8UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_2GB         0x10UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_2_5GB       0x20UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_10GB        0x40UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_20GB        0x80UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_25GB        0x100UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_40GB        0x200UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_50GB        0x400UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_100GB       0x800UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_10MBHD      0x1000UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_10MB        0x2000UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_AUTO_MODE_200GB       0x4000UL</div><div class='del'>-	__le16	supported_speeds_eee_mode;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD1     0x1UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_100MB     0x2UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD2     0x4UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_1GB       0x8UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD3     0x10UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_RSVD4     0x20UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_SUPPORTED_SPEEDS_EEE_MODE_10GB      0x40UL</div><div class='del'>-	__le32	tx_lpi_timer_low;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_MASK 0xffffffUL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_SFT 0</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_RSVD2_MASK           0xff000000UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_RSVD2_SFT            24</div><div class='del'>-	__le32	valid_tx_lpi_timer_high;</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK 0xffffffUL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_SFT 0</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_VALID_MASK            0xff000000UL</div><div class='del'>-	#define PORT_PHY_QCAPS_RESP_VALID_SFT             24</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_i2c_read_input (size:320b/40B) */</div><div class='del'>-struct hwrm_port_phy_i2c_read_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET     0x1UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	i2c_slave_addr;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	page_number;</div><div class='del'>-	__le16	page_offset;</div><div class='del'>-	u8	data_length;</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_i2c_read_output (size:640b/80B) */</div><div class='del'>-struct hwrm_port_phy_i2c_read_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	data[16];</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_mdio_write_input (size:320b/40B) */</div><div class='del'>-struct hwrm_port_phy_mdio_write_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	unused_0[2];</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	phy_addr;</div><div class='del'>-	u8	dev_addr;</div><div class='del'>-	__le16	reg_addr;</div><div class='del'>-	__le16	reg_data;</div><div class='del'>-	u8	cl45_mdio;</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_mdio_write_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_phy_mdio_write_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_mdio_read_input (size:256b/32B) */</div><div class='del'>-struct hwrm_port_phy_mdio_read_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	unused_0[2];</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	phy_addr;</div><div class='del'>-	u8	dev_addr;</div><div class='del'>-	__le16	reg_addr;</div><div class='del'>-	u8	cl45_mdio;</div><div class='del'>-	u8	unused_1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_phy_mdio_read_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_phy_mdio_read_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	reg_data;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_led_cfg_input (size:512b/64B) */</div><div class='del'>-struct hwrm_port_led_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED0_ID            0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED0_STATE         0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED0_COLOR         0x4UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED0_BLINK_ON      0x8UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED0_BLINK_OFF     0x10UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED0_GROUP_ID      0x20UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED1_ID            0x40UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED1_STATE         0x80UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED1_COLOR         0x100UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED1_BLINK_ON      0x200UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED1_BLINK_OFF     0x400UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED1_GROUP_ID      0x800UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED2_ID            0x1000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED2_STATE         0x2000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED2_COLOR         0x4000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED2_BLINK_ON      0x8000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED2_BLINK_OFF     0x10000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED2_GROUP_ID      0x20000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED3_ID            0x40000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED3_STATE         0x80000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED3_COLOR         0x100000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED3_BLINK_ON      0x200000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED3_BLINK_OFF     0x400000UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_ENABLES_LED3_GROUP_ID      0x800000UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	num_leds;</div><div class='del'>-	u8	rsvd;</div><div class='del'>-	u8	led0_id;</div><div class='del'>-	u8	led0_state;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_STATE_LAST    PORT_LED_CFG_REQ_LED0_STATE_BLINKALT</div><div class='del'>-	u8	led0_color;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED0_COLOR_LAST      PORT_LED_CFG_REQ_LED0_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	led0_blink_on;</div><div class='del'>-	__le16	led0_blink_off;</div><div class='del'>-	u8	led0_group_id;</div><div class='del'>-	u8	rsvd0;</div><div class='del'>-	u8	led1_id;</div><div class='del'>-	u8	led1_state;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_STATE_LAST    PORT_LED_CFG_REQ_LED1_STATE_BLINKALT</div><div class='del'>-	u8	led1_color;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED1_COLOR_LAST      PORT_LED_CFG_REQ_LED1_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	__le16	led1_blink_on;</div><div class='del'>-	__le16	led1_blink_off;</div><div class='del'>-	u8	led1_group_id;</div><div class='del'>-	u8	rsvd1;</div><div class='del'>-	u8	led2_id;</div><div class='del'>-	u8	led2_state;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_STATE_LAST    PORT_LED_CFG_REQ_LED2_STATE_BLINKALT</div><div class='del'>-	u8	led2_color;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED2_COLOR_LAST      PORT_LED_CFG_REQ_LED2_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_2;</div><div class='del'>-	__le16	led2_blink_on;</div><div class='del'>-	__le16	led2_blink_off;</div><div class='del'>-	u8	led2_group_id;</div><div class='del'>-	u8	rsvd2;</div><div class='del'>-	u8	led3_id;</div><div class='del'>-	u8	led3_state;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_STATE_LAST    PORT_LED_CFG_REQ_LED3_STATE_BLINKALT</div><div class='del'>-	u8	led3_color;</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_CFG_REQ_LED3_COLOR_LAST      PORT_LED_CFG_REQ_LED3_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_3;</div><div class='del'>-	__le16	led3_blink_on;</div><div class='del'>-	__le16	led3_blink_off;</div><div class='del'>-	u8	led3_group_id;</div><div class='del'>-	u8	rsvd3;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_led_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_port_led_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_led_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_led_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_led_qcfg_output (size:448b/56B) */</div><div class='del'>-struct hwrm_port_led_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	num_leds;</div><div class='del'>-	u8	led0_id;</div><div class='del'>-	u8	led0_type;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_TYPE_LAST    PORT_LED_QCFG_RESP_LED0_TYPE_INVALID</div><div class='del'>-	u8	led0_state;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_STATE_LAST    PORT_LED_QCFG_RESP_LED0_STATE_BLINKALT</div><div class='del'>-	u8	led0_color;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED0_COLOR_LAST      PORT_LED_QCFG_RESP_LED0_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	led0_blink_on;</div><div class='del'>-	__le16	led0_blink_off;</div><div class='del'>-	u8	led0_group_id;</div><div class='del'>-	u8	led1_id;</div><div class='del'>-	u8	led1_type;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_TYPE_LAST    PORT_LED_QCFG_RESP_LED1_TYPE_INVALID</div><div class='del'>-	u8	led1_state;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_STATE_LAST    PORT_LED_QCFG_RESP_LED1_STATE_BLINKALT</div><div class='del'>-	u8	led1_color;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED1_COLOR_LAST      PORT_LED_QCFG_RESP_LED1_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	__le16	led1_blink_on;</div><div class='del'>-	__le16	led1_blink_off;</div><div class='del'>-	u8	led1_group_id;</div><div class='del'>-	u8	led2_id;</div><div class='del'>-	u8	led2_type;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_TYPE_LAST    PORT_LED_QCFG_RESP_LED2_TYPE_INVALID</div><div class='del'>-	u8	led2_state;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_STATE_LAST    PORT_LED_QCFG_RESP_LED2_STATE_BLINKALT</div><div class='del'>-	u8	led2_color;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED2_COLOR_LAST      PORT_LED_QCFG_RESP_LED2_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_2;</div><div class='del'>-	__le16	led2_blink_on;</div><div class='del'>-	__le16	led2_blink_off;</div><div class='del'>-	u8	led2_group_id;</div><div class='del'>-	u8	led3_id;</div><div class='del'>-	u8	led3_type;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_TYPE_LAST    PORT_LED_QCFG_RESP_LED3_TYPE_INVALID</div><div class='del'>-	u8	led3_state;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_STATE_DEFAULT  0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_STATE_OFF      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_STATE_ON       0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_STATE_BLINK    0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_STATE_BLINKALT 0x4UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_STATE_LAST    PORT_LED_QCFG_RESP_LED3_STATE_BLINKALT</div><div class='del'>-	u8	led3_color;</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_COLOR_DEFAULT    0x0UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_COLOR_AMBER      0x1UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_COLOR_GREEN      0x2UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_COLOR_GREENAMBER 0x3UL</div><div class='del'>-	#define PORT_LED_QCFG_RESP_LED3_COLOR_LAST      PORT_LED_QCFG_RESP_LED3_COLOR_GREENAMBER</div><div class='del'>-	u8	unused_3;</div><div class='del'>-	__le16	led3_blink_on;</div><div class='del'>-	__le16	led3_blink_off;</div><div class='del'>-	u8	led3_group_id;</div><div class='del'>-	u8	unused_4[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_led_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_port_led_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_port_led_qcaps_output (size:384b/48B) */</div><div class='del'>-struct hwrm_port_led_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	num_leds;</div><div class='del'>-	u8	unused[3];</div><div class='del'>-	u8	led0_id;</div><div class='del'>-	u8	led0_type;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_TYPE_LAST    PORT_LED_QCAPS_RESP_LED0_TYPE_INVALID</div><div class='del'>-	u8	led0_group_id;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	led0_state_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_ENABLED                 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='del'>-	__le16	led0_color_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_RSVD                0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_AMBER_SUPPORTED     0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED0_COLOR_CAPS_GREEN_SUPPORTED     0x4UL</div><div class='del'>-	u8	led1_id;</div><div class='del'>-	u8	led1_type;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_TYPE_LAST    PORT_LED_QCAPS_RESP_LED1_TYPE_INVALID</div><div class='del'>-	u8	led1_group_id;</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	__le16	led1_state_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_ENABLED                 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='del'>-	__le16	led1_color_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_RSVD                0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_AMBER_SUPPORTED     0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED1_COLOR_CAPS_GREEN_SUPPORTED     0x4UL</div><div class='del'>-	u8	led2_id;</div><div class='del'>-	u8	led2_type;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_TYPE_LAST    PORT_LED_QCAPS_RESP_LED2_TYPE_INVALID</div><div class='del'>-	u8	led2_group_id;</div><div class='del'>-	u8	unused_2;</div><div class='del'>-	__le16	led2_state_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_ENABLED                 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='del'>-	__le16	led2_color_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_RSVD                0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_AMBER_SUPPORTED     0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED2_COLOR_CAPS_GREEN_SUPPORTED     0x4UL</div><div class='del'>-	u8	led3_id;</div><div class='del'>-	u8	led3_type;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_TYPE_SPEED    0x0UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_TYPE_ACTIVITY 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_TYPE_INVALID  0xffUL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_TYPE_LAST    PORT_LED_QCAPS_RESP_LED3_TYPE_INVALID</div><div class='del'>-	u8	led3_group_id;</div><div class='del'>-	u8	unused_3;</div><div class='del'>-	__le16	led3_state_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_ENABLED                 0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_OFF_SUPPORTED           0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_ON_SUPPORTED            0x4UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_BLINK_SUPPORTED         0x8UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_STATE_CAPS_BLINK_ALT_SUPPORTED     0x10UL</div><div class='del'>-	__le16	led3_color_caps;</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_RSVD                0x1UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_AMBER_SUPPORTED     0x2UL</div><div class='del'>-	#define PORT_LED_QCAPS_RESP_LED3_COLOR_CAPS_GREEN_SUPPORTED     0x4UL</div><div class='del'>-	u8	unused_4[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_qportcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_qportcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH     0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH_TX    0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH_RX    0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_FLAGS_PATH_LAST QUEUE_QPORTCFG_REQ_FLAGS_PATH_RX</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	drv_qmap_cap;</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_DISABLED 0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_ENABLED  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_LAST    QUEUE_QPORTCFG_REQ_DRV_QMAP_CAP_ENABLED</div><div class='del'>-	u8	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_qportcfg_output (size:256b/32B) */</div><div class='del'>-struct hwrm_queue_qportcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	max_configurable_queues;</div><div class='del'>-	u8	max_configurable_lossless_queues;</div><div class='del'>-	u8	queue_cfg_allowed;</div><div class='del'>-	u8	queue_cfg_info;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_CFG_INFO_ASYM_CFG     0x1UL</div><div class='del'>-	u8	queue_pfcenable_cfg_allowed;</div><div class='del'>-	u8	queue_pri2cos_cfg_allowed;</div><div class='del'>-	u8	queue_cos2bw_cfg_allowed;</div><div class='del'>-	u8	queue_id0;</div><div class='del'>-	u8	queue_id0_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID0_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id1;</div><div class='del'>-	u8	queue_id1_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID1_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id2;</div><div class='del'>-	u8	queue_id2_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID2_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id3;</div><div class='del'>-	u8	queue_id3_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID3_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id4;</div><div class='del'>-	u8	queue_id4_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID4_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id5;</div><div class='del'>-	u8	queue_id5_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID5_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id6;</div><div class='del'>-	u8	queue_id6_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID6_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	queue_id7;</div><div class='del'>-	u8	queue_id7_service_profile;</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSY          0x0UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSLESS       0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSLESS_ROCE  0x1UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSY_ROCE_CNP 0x2UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LOSSLESS_NIC   0x3UL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_UNKNOWN        0xffUL</div><div class='del'>-	#define QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_LAST          QUEUE_QPORTCFG_RESP_QUEUE_ID7_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_queue_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_CFG_REQ_FLAGS_PATH_MASK 0x3UL</div><div class='del'>-	#define QUEUE_CFG_REQ_FLAGS_PATH_SFT  0</div><div class='del'>-	#define QUEUE_CFG_REQ_FLAGS_PATH_TX     0x0UL</div><div class='del'>-	#define QUEUE_CFG_REQ_FLAGS_PATH_RX     0x1UL</div><div class='del'>-	#define QUEUE_CFG_REQ_FLAGS_PATH_BIDIR  0x2UL</div><div class='del'>-	#define QUEUE_CFG_REQ_FLAGS_PATH_LAST  QUEUE_CFG_REQ_FLAGS_PATH_BIDIR</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define QUEUE_CFG_REQ_ENABLES_DFLT_LEN            0x1UL</div><div class='del'>-	#define QUEUE_CFG_REQ_ENABLES_SERVICE_PROFILE     0x2UL</div><div class='del'>-	__le32	queue_id;</div><div class='del'>-	__le32	dflt_len;</div><div class='del'>-	u8	service_profile;</div><div class='del'>-	#define QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSY    0x0UL</div><div class='del'>-	#define QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSLESS 0x1UL</div><div class='del'>-	#define QUEUE_CFG_REQ_SERVICE_PROFILE_UNKNOWN  0xffUL</div><div class='del'>-	#define QUEUE_CFG_REQ_SERVICE_PROFILE_LAST    QUEUE_CFG_REQ_SERVICE_PROFILE_UNKNOWN</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pfcenable_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_pfcenable_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pfcenable_qcfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_pfcenable_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI0_PFC_ENABLED     0x1UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI1_PFC_ENABLED     0x2UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI2_PFC_ENABLED     0x4UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI3_PFC_ENABLED     0x8UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI4_PFC_ENABLED     0x10UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI5_PFC_ENABLED     0x20UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI6_PFC_ENABLED     0x40UL</div><div class='del'>-	#define QUEUE_PFCENABLE_QCFG_RESP_FLAGS_PRI7_PFC_ENABLED     0x80UL</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pfcenable_cfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_pfcenable_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI0_PFC_ENABLED     0x1UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI1_PFC_ENABLED     0x2UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI2_PFC_ENABLED     0x4UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI3_PFC_ENABLED     0x8UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI4_PFC_ENABLED     0x10UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI5_PFC_ENABLED     0x20UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI6_PFC_ENABLED     0x40UL</div><div class='del'>-	#define QUEUE_PFCENABLE_CFG_REQ_FLAGS_PRI7_PFC_ENABLED     0x80UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pfcenable_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_pfcenable_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pri2cos_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_pri2cos_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH      0x1UL</div><div class='del'>-	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_TX     0x0UL</div><div class='del'>-	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_RX     0x1UL</div><div class='del'>-	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_LAST  QUEUE_PRI2COS_QCFG_REQ_FLAGS_PATH_RX</div><div class='del'>-	#define QUEUE_PRI2COS_QCFG_REQ_FLAGS_IVLAN     0x2UL</div><div class='del'>-	u8	port_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pri2cos_qcfg_output (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_pri2cos_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	pri0_cos_queue_id;</div><div class='del'>-	u8	pri1_cos_queue_id;</div><div class='del'>-	u8	pri2_cos_queue_id;</div><div class='del'>-	u8	pri3_cos_queue_id;</div><div class='del'>-	u8	pri4_cos_queue_id;</div><div class='del'>-	u8	pri5_cos_queue_id;</div><div class='del'>-	u8	pri6_cos_queue_id;</div><div class='del'>-	u8	pri7_cos_queue_id;</div><div class='del'>-	u8	queue_cfg_info;</div><div class='del'>-	#define QUEUE_PRI2COS_QCFG_RESP_QUEUE_CFG_INFO_ASYM_CFG     0x1UL</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pri2cos_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_queue_pri2cos_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_MASK 0x3UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_SFT  0</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_TX     0x0UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_RX     0x1UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_BIDIR  0x2UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_LAST  QUEUE_PRI2COS_CFG_REQ_FLAGS_PATH_BIDIR</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_FLAGS_IVLAN     0x4UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI0_COS_QUEUE_ID     0x1UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI1_COS_QUEUE_ID     0x2UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI2_COS_QUEUE_ID     0x4UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI3_COS_QUEUE_ID     0x8UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI4_COS_QUEUE_ID     0x10UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI5_COS_QUEUE_ID     0x20UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI6_COS_QUEUE_ID     0x40UL</div><div class='del'>-	#define QUEUE_PRI2COS_CFG_REQ_ENABLES_PRI7_COS_QUEUE_ID     0x80UL</div><div class='del'>-	u8	port_id;</div><div class='del'>-	u8	pri0_cos_queue_id;</div><div class='del'>-	u8	pri1_cos_queue_id;</div><div class='del'>-	u8	pri2_cos_queue_id;</div><div class='del'>-	u8	pri3_cos_queue_id;</div><div class='del'>-	u8	pri4_cos_queue_id;</div><div class='del'>-	u8	pri5_cos_queue_id;</div><div class='del'>-	u8	pri6_cos_queue_id;</div><div class='del'>-	u8	pri7_cos_queue_id;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_pri2cos_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_pri2cos_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_cos2bw_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_cos2bw_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_cos2bw_qcfg_output (size:896b/112B) */</div><div class='del'>-struct hwrm_queue_cos2bw_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	queue_id0;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	unused_1;</div><div class='del'>-	__le32	queue_id0_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id0_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id0_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID0_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id0_pri_lvl;</div><div class='del'>-	u8	queue_id0_bw_weight;</div><div class='del'>-	u8	queue_id1;</div><div class='del'>-	__le32	queue_id1_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id1_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id1_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID1_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id1_pri_lvl;</div><div class='del'>-	u8	queue_id1_bw_weight;</div><div class='del'>-	u8	queue_id2;</div><div class='del'>-	__le32	queue_id2_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id2_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id2_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID2_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id2_pri_lvl;</div><div class='del'>-	u8	queue_id2_bw_weight;</div><div class='del'>-	u8	queue_id3;</div><div class='del'>-	__le32	queue_id3_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id3_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id3_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID3_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id3_pri_lvl;</div><div class='del'>-	u8	queue_id3_bw_weight;</div><div class='del'>-	u8	queue_id4;</div><div class='del'>-	__le32	queue_id4_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id4_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id4_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID4_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id4_pri_lvl;</div><div class='del'>-	u8	queue_id4_bw_weight;</div><div class='del'>-	u8	queue_id5;</div><div class='del'>-	__le32	queue_id5_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id5_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id5_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID5_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id5_pri_lvl;</div><div class='del'>-	u8	queue_id5_bw_weight;</div><div class='del'>-	u8	queue_id6;</div><div class='del'>-	__le32	queue_id6_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id6_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id6_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID6_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id6_pri_lvl;</div><div class='del'>-	u8	queue_id6_bw_weight;</div><div class='del'>-	u8	queue_id7;</div><div class='del'>-	__le32	queue_id7_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id7_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id7_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_QCFG_RESP_QUEUE_ID7_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id7_pri_lvl;</div><div class='del'>-	u8	queue_id7_bw_weight;</div><div class='del'>-	u8	unused_2[4];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_cos2bw_cfg_input (size:1024b/128B) */</div><div class='del'>-struct hwrm_queue_cos2bw_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID     0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID1_VALID     0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID2_VALID     0x4UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID3_VALID     0x8UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID4_VALID     0x10UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID5_VALID     0x20UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID6_VALID     0x40UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID7_VALID     0x80UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	queue_id0;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le32	queue_id0_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id0_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id0_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID0_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id0_pri_lvl;</div><div class='del'>-	u8	queue_id0_bw_weight;</div><div class='del'>-	u8	queue_id1;</div><div class='del'>-	__le32	queue_id1_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id1_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id1_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID1_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id1_pri_lvl;</div><div class='del'>-	u8	queue_id1_bw_weight;</div><div class='del'>-	u8	queue_id2;</div><div class='del'>-	__le32	queue_id2_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id2_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id2_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID2_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id2_pri_lvl;</div><div class='del'>-	u8	queue_id2_bw_weight;</div><div class='del'>-	u8	queue_id3;</div><div class='del'>-	__le32	queue_id3_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id3_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id3_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID3_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id3_pri_lvl;</div><div class='del'>-	u8	queue_id3_bw_weight;</div><div class='del'>-	u8	queue_id4;</div><div class='del'>-	__le32	queue_id4_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id4_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id4_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID4_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id4_pri_lvl;</div><div class='del'>-	u8	queue_id4_bw_weight;</div><div class='del'>-	u8	queue_id5;</div><div class='del'>-	__le32	queue_id5_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id5_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id5_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID5_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id5_pri_lvl;</div><div class='del'>-	u8	queue_id5_bw_weight;</div><div class='del'>-	u8	queue_id6;</div><div class='del'>-	__le32	queue_id6_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id6_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id6_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID6_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id6_pri_lvl;</div><div class='del'>-	u8	queue_id6_bw_weight;</div><div class='del'>-	u8	queue_id7;</div><div class='del'>-	__le32	queue_id7_min_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MIN_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	__le32	queue_id7_max_bw;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_SCALE_LAST                 QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_LAST         QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	queue_id7_tsa_assign;</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_TSA_ASSIGN_SP             0x0UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_TSA_ASSIGN_ETS            0x1UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_TSA_ASSIGN_RESERVED_FIRST 0x2UL</div><div class='del'>-	#define QUEUE_COS2BW_CFG_REQ_QUEUE_ID7_TSA_ASSIGN_RESERVED_LAST  0xffUL</div><div class='del'>-	u8	queue_id7_pri_lvl;</div><div class='del'>-	u8	queue_id7_bw_weight;</div><div class='del'>-	u8	unused_1[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_cos2bw_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_cos2bw_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_dscp_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_queue_dscp_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	port_id;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_dscp_qcaps_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_dscp_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	num_dscp_bits;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	max_entries;</div><div class='del'>-	u8	unused_1[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_dscp2pri_qcfg_input (size:256b/32B) */</div><div class='del'>-struct hwrm_queue_dscp2pri_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	dest_data_addr;</div><div class='del'>-	u8	port_id;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	dest_data_buffer_size;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_dscp2pri_qcfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_dscp2pri_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	entry_cnt;</div><div class='del'>-	u8	default_pri;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_dscp2pri_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_queue_dscp2pri_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	src_data_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define QUEUE_DSCP2PRI_CFG_REQ_FLAGS_USE_HW_DEFAULT_PRI     0x1UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define QUEUE_DSCP2PRI_CFG_REQ_ENABLES_DEFAULT_PRI     0x1UL</div><div class='del'>-	u8	port_id;</div><div class='del'>-	u8	default_pri;</div><div class='del'>-	__le16	entry_cnt;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_queue_dscp2pri_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_queue_dscp2pri_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_alloc_input (size:192b/24B) */</div><div class='del'>-struct hwrm_vnic_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define VNIC_ALLOC_REQ_FLAGS_DEFAULT     0x1UL</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	vnic_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_vnic_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	vnic_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_vnic_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_DEFAULT                              0x1UL</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_VLAN_STRIP_MODE                      0x2UL</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_BD_STALL_MODE                        0x4UL</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_ROCE_DUAL_VNIC_MODE                  0x8UL</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_ROCE_ONLY_VNIC_MODE                  0x10UL</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_RSS_DFLT_CR_MODE                     0x20UL</div><div class='del'>-	#define VNIC_CFG_REQ_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_MODE     0x40UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_DFLT_RING_GRP            0x1UL</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_RSS_RULE                 0x2UL</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_COS_RULE                 0x4UL</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_LB_RULE                  0x8UL</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_MRU                      0x10UL</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_DEFAULT_RX_RING_ID       0x20UL</div><div class='del'>-	#define VNIC_CFG_REQ_ENABLES_DEFAULT_CMPL_RING_ID     0x40UL</div><div class='del'>-	__le16	vnic_id;</div><div class='del'>-	__le16	dflt_ring_grp;</div><div class='del'>-	__le16	rss_rule;</div><div class='del'>-	__le16	cos_rule;</div><div class='del'>-	__le16	lb_rule;</div><div class='del'>-	__le16	mru;</div><div class='del'>-	__le16	default_rx_ring_id;</div><div class='del'>-	__le16	default_cmpl_ring_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_vnic_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_qcaps_output (size:192b/24B) */</div><div class='del'>-struct hwrm_vnic_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	mru;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_UNUSED                              0x1UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_VLAN_STRIP_CAP                      0x2UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_BD_STALL_CAP                        0x4UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_ROCE_DUAL_VNIC_CAP                  0x8UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_ROCE_ONLY_VNIC_CAP                  0x10UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_RSS_DFLT_CR_CAP                     0x20UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_CAP     0x40UL</div><div class='del'>-	#define VNIC_QCAPS_RESP_FLAGS_OUTERMOST_RSS_CAP                   0x80UL</div><div class='del'>-	__le16	max_aggs_supported;</div><div class='del'>-	u8	unused_1[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_tpa_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_vnic_tpa_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_TPA                       0x1UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_ENCAP_TPA                 0x2UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_RSC_WND_UPDATE            0x4UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_GRO                       0x8UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_WITH_ECN              0x10UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_WITH_SAME_GRE_SEQ     0x20UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_GRO_IPID_CHECK            0x40UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_GRO_TTL_CHECK             0x80UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_FLAGS_AGG_PACK_AS_GRO           0x100UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_SEGS      0x1UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGGS          0x2UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_TIMER     0x4UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_ENABLES_MIN_AGG_LEN       0x8UL</div><div class='del'>-	__le16	vnic_id;</div><div class='del'>-	__le16	max_agg_segs;</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_1   0x0UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_2   0x1UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_4   0x2UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_8   0x3UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_MAX 0x1fUL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_LAST VNIC_TPA_CFG_REQ_MAX_AGG_SEGS_MAX</div><div class='del'>-	__le16	max_aggs;</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_1   0x0UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_2   0x1UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_4   0x2UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_8   0x3UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_16  0x4UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_MAX 0x7UL</div><div class='del'>-	#define VNIC_TPA_CFG_REQ_MAX_AGGS_LAST VNIC_TPA_CFG_REQ_MAX_AGGS_MAX</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le32	max_agg_timer;</div><div class='del'>-	__le32	min_agg_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_tpa_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_tpa_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_tpa_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_vnic_tpa_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	vnic_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_tpa_qcfg_output (size:256b/32B) */</div><div class='del'>-struct hwrm_vnic_tpa_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_TPA                       0x1UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_ENCAP_TPA                 0x2UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_RSC_WND_UPDATE            0x4UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_GRO                       0x8UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_AGG_WITH_ECN              0x10UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_AGG_WITH_SAME_GRE_SEQ     0x20UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_GRO_IPID_CHECK            0x40UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_FLAGS_GRO_TTL_CHECK             0x80UL</div><div class='del'>-	__le16	max_agg_segs;</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_1   0x0UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_2   0x1UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_4   0x2UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_8   0x3UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_MAX 0x1fUL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_LAST VNIC_TPA_QCFG_RESP_MAX_AGG_SEGS_MAX</div><div class='del'>-	__le16	max_aggs;</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_1   0x0UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_2   0x1UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_4   0x2UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_8   0x3UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_16  0x4UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_MAX 0x7UL</div><div class='del'>-	#define VNIC_TPA_QCFG_RESP_MAX_AGGS_LAST VNIC_TPA_QCFG_RESP_MAX_AGGS_MAX</div><div class='del'>-	__le32	max_agg_timer;</div><div class='del'>-	__le32	min_agg_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_rss_cfg_input (size:384b/48B) */</div><div class='del'>-struct hwrm_vnic_rss_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	hash_type;</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4         0x1UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4     0x2UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4     0x4UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6         0x8UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6     0x10UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6     0x20UL</div><div class='del'>-	__le16	vnic_id;</div><div class='del'>-	u8	ring_table_pair_index;</div><div class='del'>-	u8	hash_mode_flags;</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_DEFAULT         0x1UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_INNERMOST_4     0x2UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_INNERMOST_2     0x4UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_OUTERMOST_4     0x8UL</div><div class='del'>-	#define VNIC_RSS_CFG_REQ_HASH_MODE_FLAGS_OUTERMOST_2     0x10UL</div><div class='del'>-	__le64	ring_grp_tbl_addr;</div><div class='del'>-	__le64	hash_key_tbl_addr;</div><div class='del'>-	__le16	rss_ctx_idx;</div><div class='del'>-	u8	unused_1[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_rss_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_rss_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_plcmodes_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_vnic_plcmodes_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_FLAGS_REGULAR_PLACEMENT     0x1UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_FLAGS_JUMBO_PLACEMENT       0x2UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV4              0x4UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_IPV6              0x8UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_FCOE              0x10UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_FLAGS_HDS_ROCE              0x20UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_ENABLES_JUMBO_THRESH_VALID      0x1UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_OFFSET_VALID        0x2UL</div><div class='del'>-	#define VNIC_PLCMODES_CFG_REQ_ENABLES_HDS_THRESHOLD_VALID     0x4UL</div><div class='del'>-	__le32	vnic_id;</div><div class='del'>-	__le16	jumbo_thresh;</div><div class='del'>-	__le16	hds_offset;</div><div class='del'>-	__le16	hds_threshold;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_plcmodes_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_plcmodes_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_rss_cos_lb_ctx_alloc_input (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_rss_cos_lb_ctx_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_rss_cos_lb_ctx_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_rss_cos_lb_ctx_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	rss_cos_lb_ctx_id;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_rss_cos_lb_ctx_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_vnic_rss_cos_lb_ctx_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	rss_cos_lb_ctx_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vnic_rss_cos_lb_ctx_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_vnic_rss_cos_lb_ctx_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_alloc_input (size:704b/88B) */</div><div class='del'>-struct hwrm_ring_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define RING_ALLOC_REQ_ENABLES_RING_ARB_CFG          0x2UL</div><div class='del'>-	#define RING_ALLOC_REQ_ENABLES_STAT_CTX_ID_VALID     0x8UL</div><div class='del'>-	#define RING_ALLOC_REQ_ENABLES_MAX_BW_VALID          0x20UL</div><div class='del'>-	#define RING_ALLOC_REQ_ENABLES_RX_RING_ID_VALID      0x40UL</div><div class='del'>-	#define RING_ALLOC_REQ_ENABLES_NQ_RING_ID_VALID      0x80UL</div><div class='del'>-	#define RING_ALLOC_REQ_ENABLES_RX_BUF_SIZE_VALID     0x100UL</div><div class='del'>-	u8	ring_type;</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_L2_CMPL   0x0UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_TX        0x1UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_RX        0x2UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_ROCE_CMPL 0x3UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_RX_AGG    0x4UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_NQ        0x5UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_TYPE_LAST     RING_ALLOC_REQ_RING_TYPE_NQ</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define RING_ALLOC_REQ_FLAGS_RX_SOP_PAD     0x1UL</div><div class='del'>-	__le64	page_tbl_addr;</div><div class='del'>-	__le32	fbo;</div><div class='del'>-	u8	page_size;</div><div class='del'>-	u8	page_tbl_depth;</div><div class='del'>-	u8	unused_1[2];</div><div class='del'>-	__le32	length;</div><div class='del'>-	__le16	logical_id;</div><div class='del'>-	__le16	cmpl_ring_id;</div><div class='del'>-	__le16	queue_id;</div><div class='del'>-	__le16	rx_buf_size;</div><div class='del'>-	__le16	rx_ring_id;</div><div class='del'>-	__le16	nq_ring_id;</div><div class='del'>-	__le16	ring_arb_cfg;</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_MASK      0xfUL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_SFT       0</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_SP          0x1UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_WFQ         0x2UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_LAST       RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_WFQ</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_RSVD_MASK            0xf0UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_RSVD_SFT             4</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_PARAM_MASK 0xff00UL</div><div class='del'>-	#define RING_ALLOC_REQ_RING_ARB_CFG_ARB_POLICY_PARAM_SFT 8</div><div class='del'>-	__le16	unused_3;</div><div class='del'>-	__le32	reserved3;</div><div class='del'>-	__le32	stat_ctx_id;</div><div class='del'>-	__le32	reserved4;</div><div class='del'>-	__le32	max_bw;</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_MASK             0xfffffffUL</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_SFT              0</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_SCALE                     0x10000000UL</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_SCALE_BITS                  (0x0UL &lt;&lt; 28)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_SCALE_BYTES                 (0x1UL &lt;&lt; 28)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_SCALE_LAST                 RING_ALLOC_REQ_MAX_BW_SCALE_BYTES</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_MASK        0xe0000000UL</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_SFT         29</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_MEGA          (0x0UL &lt;&lt; 29)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_KILO          (0x2UL &lt;&lt; 29)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_BASE          (0x4UL &lt;&lt; 29)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_GIGA          (0x6UL &lt;&lt; 29)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_PERCENT1_100  (0x1UL &lt;&lt; 29)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_INVALID       (0x7UL &lt;&lt; 29)</div><div class='del'>-	#define RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_LAST         RING_ALLOC_REQ_MAX_BW_BW_VALUE_UNIT_INVALID</div><div class='del'>-	u8	int_mode;</div><div class='del'>-	#define RING_ALLOC_REQ_INT_MODE_LEGACY 0x0UL</div><div class='del'>-	#define RING_ALLOC_REQ_INT_MODE_RSVD   0x1UL</div><div class='del'>-	#define RING_ALLOC_REQ_INT_MODE_MSIX   0x2UL</div><div class='del'>-	#define RING_ALLOC_REQ_INT_MODE_POLL   0x3UL</div><div class='del'>-	#define RING_ALLOC_REQ_INT_MODE_LAST  RING_ALLOC_REQ_INT_MODE_POLL</div><div class='del'>-	u8	unused_4[3];</div><div class='del'>-	__le64	cq_handle;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	ring_id;</div><div class='del'>-	__le16	logical_ring_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_ring_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	ring_type;</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_L2_CMPL   0x0UL</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_TX        0x1UL</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_RX        0x2UL</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_ROCE_CMPL 0x3UL</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_RX_AGG    0x4UL</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_NQ        0x5UL</div><div class='del'>-	#define RING_FREE_REQ_RING_TYPE_LAST     RING_FREE_REQ_RING_TYPE_NQ</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	ring_id;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_reset_input (size:192b/24B) */</div><div class='del'>-struct hwrm_ring_reset_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	ring_type;</div><div class='del'>-	#define RING_RESET_REQ_RING_TYPE_L2_CMPL   0x0UL</div><div class='del'>-	#define RING_RESET_REQ_RING_TYPE_TX        0x1UL</div><div class='del'>-	#define RING_RESET_REQ_RING_TYPE_RX        0x2UL</div><div class='del'>-	#define RING_RESET_REQ_RING_TYPE_ROCE_CMPL 0x3UL</div><div class='del'>-	#define RING_RESET_REQ_RING_TYPE_LAST     RING_RESET_REQ_RING_TYPE_ROCE_CMPL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	ring_id;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_reset_output (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_reset_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	u8	consumer_idx[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_aggint_qcaps_input (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_aggint_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_aggint_qcaps_output (size:384b/48B) */</div><div class='del'>-struct hwrm_ring_aggint_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	cmpl_params;</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_INT_LAT_TMR_MIN                  0x1UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_INT_LAT_TMR_MAX                  0x2UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_TIMER_RESET                      0x4UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_RING_IDLE                        0x8UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_NUM_CMPL_DMA_AGGR                0x10UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_NUM_CMPL_DMA_AGGR_DURING_INT     0x20UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_CMPL_AGGR_DMA_TMR                0x40UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_CMPL_AGGR_DMA_TMR_DURING_INT     0x80UL</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_CMPL_PARAMS_NUM_CMPL_AGGR_INT                0x100UL</div><div class='del'>-	__le32	nq_params;</div><div class='del'>-	#define RING_AGGINT_QCAPS_RESP_NQ_PARAMS_INT_LAT_TMR_MIN     0x1UL</div><div class='del'>-	__le16	num_cmpl_dma_aggr_min;</div><div class='del'>-	__le16	num_cmpl_dma_aggr_max;</div><div class='del'>-	__le16	num_cmpl_dma_aggr_during_int_min;</div><div class='del'>-	__le16	num_cmpl_dma_aggr_during_int_max;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr_min;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr_max;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr_during_int_min;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr_during_int_max;</div><div class='del'>-	__le16	int_lat_tmr_min_min;</div><div class='del'>-	__le16	int_lat_tmr_min_max;</div><div class='del'>-	__le16	int_lat_tmr_max_min;</div><div class='del'>-	__le16	int_lat_tmr_max_max;</div><div class='del'>-	__le16	num_cmpl_aggr_int_min;</div><div class='del'>-	__le16	num_cmpl_aggr_int_max;</div><div class='del'>-	__le16	timer_units;</div><div class='del'>-	u8	unused_0[1];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_cmpl_ring_qaggint_params_input (size:192b/24B) */</div><div class='del'>-struct hwrm_ring_cmpl_ring_qaggint_params_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	ring_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_cmpl_ring_qaggint_params_output (size:256b/32B) */</div><div class='del'>-struct hwrm_ring_cmpl_ring_qaggint_params_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define RING_CMPL_RING_QAGGINT_PARAMS_RESP_FLAGS_TIMER_RESET     0x1UL</div><div class='del'>-	#define RING_CMPL_RING_QAGGINT_PARAMS_RESP_FLAGS_RING_IDLE       0x2UL</div><div class='del'>-	__le16	num_cmpl_dma_aggr;</div><div class='del'>-	__le16	num_cmpl_dma_aggr_during_int;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr_during_int;</div><div class='del'>-	__le16	int_lat_tmr_min;</div><div class='del'>-	__le16	int_lat_tmr_max;</div><div class='del'>-	__le16	num_cmpl_aggr_int;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_cmpl_ring_cfg_aggint_params_input (size:320b/40B) */</div><div class='del'>-struct hwrm_ring_cmpl_ring_cfg_aggint_params_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	ring_id;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_TIMER_RESET     0x1UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_RING_IDLE       0x2UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_FLAGS_IS_NQ           0x4UL</div><div class='del'>-	__le16	num_cmpl_dma_aggr;</div><div class='del'>-	__le16	num_cmpl_dma_aggr_during_int;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr;</div><div class='del'>-	__le16	cmpl_aggr_dma_tmr_during_int;</div><div class='del'>-	__le16	int_lat_tmr_min;</div><div class='del'>-	__le16	int_lat_tmr_max;</div><div class='del'>-	__le16	num_cmpl_aggr_int;</div><div class='del'>-	__le16	enables;</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_NUM_CMPL_DMA_AGGR                0x1UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_NUM_CMPL_DMA_AGGR_DURING_INT     0x2UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_CMPL_AGGR_DMA_TMR                0x4UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_INT_LAT_TMR_MIN                  0x8UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_INT_LAT_TMR_MAX                  0x10UL</div><div class='del'>-	#define RING_CMPL_RING_CFG_AGGINT_PARAMS_REQ_ENABLES_NUM_CMPL_AGGR_INT                0x20UL</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_cmpl_ring_cfg_aggint_params_output (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_cmpl_ring_cfg_aggint_params_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_grp_alloc_input (size:192b/24B) */</div><div class='del'>-struct hwrm_ring_grp_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	cr;</div><div class='del'>-	__le16	rr;</div><div class='del'>-	__le16	ar;</div><div class='del'>-	__le16	sc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_grp_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_grp_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	ring_group_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_grp_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_ring_grp_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	ring_group_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_ring_grp_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_ring_grp_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-#define DEFAULT_FLOW_ID 0xFFFFFFFFUL</div><div class='del'>-#define ROCEV1_FLOW_ID 0xFFFFFFFEUL</div><div class='del'>-#define ROCEV2_FLOW_ID 0xFFFFFFFDUL</div><div class='del'>-#define ROCEV2_CNP_FLOW_ID 0xFFFFFFFCUL</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_filter_alloc_input (size:768b/96B) */</div><div class='del'>-struct hwrm_cfa_l2_filter_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH              0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_TX             0x0UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX             0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_LAST          CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_LOOPBACK          0x2UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_DROP              0x4UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_OUTERMOST         0x8UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_MASK      0x30UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_SFT       4</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_NO_ROCE_L2  (0x0UL &lt;&lt; 4)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_L2          (0x1UL &lt;&lt; 4)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_ROCE        (0x2UL &lt;&lt; 4)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_LAST       CFA_L2_FILTER_ALLOC_REQ_FLAGS_TRAFFIC_ROCE</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_XDP_DISABLE       0x40UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_FLAGS_SOURCE_VALID      0x80UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR             0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK        0x2UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_OVLAN            0x4UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_OVLAN_MASK       0x8UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN            0x10UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN_MASK       0x20UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_ADDR           0x40UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_ADDR_MASK      0x80UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_OVLAN          0x100UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_OVLAN_MASK     0x200UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_IVLAN          0x400UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_L2_IVLAN_MASK     0x800UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_SRC_TYPE            0x1000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_SRC_ID              0x2000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE         0x4000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID              0x8000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID      0x10000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_NUM_VLANS           0x20000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_ENABLES_T_NUM_VLANS         0x40000UL</div><div class='del'>-	u8	l2_addr[6];</div><div class='del'>-	u8	num_vlans;</div><div class='del'>-	u8	t_num_vlans;</div><div class='del'>-	u8	l2_addr_mask[6];</div><div class='del'>-	__le16	l2_ovlan;</div><div class='del'>-	__le16	l2_ovlan_mask;</div><div class='del'>-	__le16	l2_ivlan;</div><div class='del'>-	__le16	l2_ivlan_mask;</div><div class='del'>-	u8	unused_1[2];</div><div class='del'>-	u8	t_l2_addr[6];</div><div class='del'>-	u8	unused_2[2];</div><div class='del'>-	u8	t_l2_addr_mask[6];</div><div class='del'>-	__le16	t_l2_ovlan;</div><div class='del'>-	__le16	t_l2_ovlan_mask;</div><div class='del'>-	__le16	t_l2_ivlan;</div><div class='del'>-	__le16	t_l2_ivlan_mask;</div><div class='del'>-	u8	src_type;</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_NPORT 0x0UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_PF    0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_VF    0x2UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_VNIC  0x3UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_KONG  0x4UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_APE   0x5UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_BONO  0x6UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_TANG  0x7UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_LAST CFA_L2_FILTER_ALLOC_REQ_SRC_TYPE_TANG</div><div class='del'>-	u8	unused_3;</div><div class='del'>-	__le32	src_id;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_L2_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='del'>-	u8	unused_4;</div><div class='del'>-	__le16	dst_id;</div><div class='del'>-	__le16	mirror_vnic_id;</div><div class='del'>-	u8	pri_hint;</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_NO_PREFER    0x0UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_ABOVE_FILTER 0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_BELOW_FILTER 0x2UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_MAX          0x3UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_MIN          0x4UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_LAST        CFA_L2_FILTER_ALLOC_REQ_PRI_HINT_MIN</div><div class='del'>-	u8	unused_5;</div><div class='del'>-	__le32	unused_6;</div><div class='del'>-	__le64	l2_filter_id_hint;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_filter_alloc_output (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_l2_filter_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	l2_filter_id;</div><div class='del'>-	__le32	flow_id;</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_L2_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_filter_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_l2_filter_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	l2_filter_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_filter_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_l2_filter_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_filter_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_cfa_l2_filter_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH              0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_TX             0x0UL</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_RX             0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_LAST          CFA_L2_FILTER_CFG_REQ_FLAGS_PATH_RX</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_DROP              0x2UL</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_MASK      0xcUL</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_SFT       2</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_NO_ROCE_L2  (0x0UL &lt;&lt; 2)</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_L2          (0x1UL &lt;&lt; 2)</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_ROCE        (0x2UL &lt;&lt; 2)</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_LAST       CFA_L2_FILTER_CFG_REQ_FLAGS_TRAFFIC_ROCE</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_ENABLES_DST_ID                 0x1UL</div><div class='del'>-	#define CFA_L2_FILTER_CFG_REQ_ENABLES_NEW_MIRROR_VNIC_ID     0x2UL</div><div class='del'>-	__le64	l2_filter_id;</div><div class='del'>-	__le32	dst_id;</div><div class='del'>-	__le32	new_mirror_vnic_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_filter_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_l2_filter_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_set_rx_mask_input (size:448b/56B) */</div><div class='del'>-struct hwrm_cfa_l2_set_rx_mask_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	vnic_id;</div><div class='del'>-	__le32	mask;</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_MCAST               0x2UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_ALL_MCAST           0x4UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_BCAST               0x8UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_PROMISCUOUS         0x10UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_OUTERMOST           0x20UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_VLANONLY            0x40UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_VLAN_NONVLAN        0x80UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_REQ_MASK_ANYVLAN_NONVLAN     0x100UL</div><div class='del'>-	__le64	mc_tbl_addr;</div><div class='del'>-	__le32	num_mc_entries;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	__le64	vlan_tag_tbl_addr;</div><div class='del'>-	__le32	num_vlan_tags;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_set_rx_mask_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_l2_set_rx_mask_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_l2_set_rx_mask_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_cfa_l2_set_rx_mask_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_UNKNOWN                    0x0UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_NTUPLE_FILTER_CONFLICT_ERR 0x1UL</div><div class='del'>-	#define CFA_L2_SET_RX_MASK_CMD_ERR_CODE_LAST                      CFA_L2_SET_RX_MASK_CMD_ERR_CODE_NTUPLE_FILTER_CONFLICT_ERR</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_tunnel_filter_alloc_input (size:704b/88B) */</div><div class='del'>-struct hwrm_cfa_tunnel_filter_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_FLAGS_LOOPBACK     0x1UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L2_FILTER_ID       0x1UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L2_ADDR            0x2UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L2_IVLAN           0x4UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L3_ADDR            0x8UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_L3_ADDR_TYPE       0x10UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_T_L3_ADDR_TYPE     0x20UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_T_L3_ADDR          0x40UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE        0x80UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_VNI                0x100UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_DST_VNIC_ID        0x200UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID     0x400UL</div><div class='del'>-	__le64	l2_filter_id;</div><div class='del'>-	u8	l2_addr[6];</div><div class='del'>-	__le16	l2_ivlan;</div><div class='del'>-	__le32	l3_addr[4];</div><div class='del'>-	__le32	t_l3_addr[4];</div><div class='del'>-	u8	l3_addr_type;</div><div class='del'>-	u8	t_l3_addr_type;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='del'>-	u8	tunnel_flags;</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_FLAGS_TUN_FLAGS_OAM_CHECKSUM_EXPLHDR     0x1UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_FLAGS_TUN_FLAGS_CRITICAL_OPT_S1          0x2UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_REQ_TUNNEL_FLAGS_TUN_FLAGS_EXTHDR_SEQNUM_S0         0x4UL</div><div class='del'>-	__le32	vni;</div><div class='del'>-	__le32	dst_vnic_id;</div><div class='del'>-	__le32	mirror_vnic_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_tunnel_filter_alloc_output (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_tunnel_filter_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	tunnel_filter_id;</div><div class='del'>-	__le32	flow_id;</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_TUNNEL_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_tunnel_filter_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_tunnel_filter_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	tunnel_filter_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_tunnel_filter_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_tunnel_filter_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vxlan_ipv4_hdr (size:128b/16B) */</div><div class='del'>-struct hwrm_vxlan_ipv4_hdr {</div><div class='del'>-	u8	ver_hlen;</div><div class='del'>-	#define VXLAN_IPV4_HDR_VER_HLEN_HEADER_LENGTH_MASK 0xfUL</div><div class='del'>-	#define VXLAN_IPV4_HDR_VER_HLEN_HEADER_LENGTH_SFT 0</div><div class='del'>-	#define VXLAN_IPV4_HDR_VER_HLEN_VERSION_MASK      0xf0UL</div><div class='del'>-	#define VXLAN_IPV4_HDR_VER_HLEN_VERSION_SFT       4</div><div class='del'>-	u8	tos;</div><div class='del'>-	__be16	ip_id;</div><div class='del'>-	__be16	flags_frag_offset;</div><div class='del'>-	u8	ttl;</div><div class='del'>-	u8	protocol;</div><div class='del'>-	__be32	src_ip_addr;</div><div class='del'>-	__be32	dest_ip_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_vxlan_ipv6_hdr (size:320b/40B) */</div><div class='del'>-struct hwrm_vxlan_ipv6_hdr {</div><div class='del'>-	__be32	ver_tc_flow_label;</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_VER_SFT         0x1cUL</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_VER_MASK        0xf0000000UL</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_TC_SFT          0x14UL</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_TC_MASK         0xff00000UL</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_FLOW_LABEL_SFT  0x0UL</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_FLOW_LABEL_MASK 0xfffffUL</div><div class='del'>-	#define VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_LAST           VXLAN_IPV6_HDR_VER_TC_FLOW_LABEL_FLOW_LABEL_MASK</div><div class='del'>-	__be16	payload_len;</div><div class='del'>-	u8	next_hdr;</div><div class='del'>-	u8	ttl;</div><div class='del'>-	__be32	src_ip_addr[4];</div><div class='del'>-	__be32	dest_ip_addr[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_encap_data_vxlan (size:640b/80B) */</div><div class='del'>-struct hwrm_cfa_encap_data_vxlan {</div><div class='del'>-	u8	src_mac_addr[6];</div><div class='del'>-	__le16	unused_0;</div><div class='del'>-	u8	dst_mac_addr[6];</div><div class='del'>-	u8	num_vlan_tags;</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	__be16	ovlan_tpid;</div><div class='del'>-	__be16	ovlan_tci;</div><div class='del'>-	__be16	ivlan_tpid;</div><div class='del'>-	__be16	ivlan_tci;</div><div class='del'>-	__le32	l3[10];</div><div class='del'>-	#define CFA_ENCAP_DATA_VXLAN_L3_VER_MASK 0xfUL</div><div class='del'>-	#define CFA_ENCAP_DATA_VXLAN_L3_VER_IPV4 0x4UL</div><div class='del'>-	#define CFA_ENCAP_DATA_VXLAN_L3_VER_IPV6 0x6UL</div><div class='del'>-	#define CFA_ENCAP_DATA_VXLAN_L3_LAST    CFA_ENCAP_DATA_VXLAN_L3_VER_IPV6</div><div class='del'>-	__be16	src_port;</div><div class='del'>-	__be16	dst_port;</div><div class='del'>-	__be32	vni;</div><div class='del'>-	u8	hdr_rsvd0[3];</div><div class='del'>-	u8	hdr_rsvd1;</div><div class='del'>-	u8	hdr_flags;</div><div class='del'>-	u8	unused[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_encap_record_alloc_input (size:832b/104B) */</div><div class='del'>-struct hwrm_cfa_encap_record_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_FLAGS_LOOPBACK     0x1UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_FLAGS_EXTERNAL     0x2UL</div><div class='del'>-	u8	encap_type;</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_NVGRE        0x2UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_L2GRE        0x3UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_IPIP         0x4UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_MPLS         0x6UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VLAN         0x7UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_IPGRE        0x8UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_LAST        CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN_GPE_V6</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	__le32	encap_data[20];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_encap_record_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_encap_record_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	encap_record_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_encap_record_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_encap_record_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	encap_record_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_encap_record_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_encap_record_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_alloc_input (size:1088b/136B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_LOOPBACK     0x1UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DROP         0x2UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_METER        0x4UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_FID     0x8UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_L2_FILTER_ID         0x1UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_ETHERTYPE            0x2UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE          0x4UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_MACADDR          0x8UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_IPADDR_TYPE          0x10UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR           0x20UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR_MASK      0x40UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR           0x80UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR_MASK      0x100UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_IP_PROTOCOL          0x200UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_PORT             0x400UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_PORT_MASK        0x800UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_PORT             0x1000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_PORT_MASK        0x2000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_PRI_HINT             0x4000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_NTUPLE_FILTER_ID     0x8000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_ID               0x10000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID       0x20000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_MACADDR          0x40000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_RFS_RING_TBL_IDX     0x80000UL</div><div class='del'>-	__le64	l2_filter_id;</div><div class='del'>-	u8	src_macaddr[6];</div><div class='del'>-	__be16	ethertype;</div><div class='del'>-	u8	ip_addr_type;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_UNKNOWN 0x0UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4    0x4UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6    0x6UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_LAST   CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6</div><div class='del'>-	u8	ip_protocol;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_UNKNOWN 0x0UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_TCP     0x6UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP     0x11UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_LAST   CFA_NTUPLE_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP</div><div class='del'>-	__le16	dst_id;</div><div class='del'>-	__le16	mirror_vnic_id;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='del'>-	u8	pri_hint;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_NO_PREFER 0x0UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_ABOVE     0x1UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_BELOW     0x2UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_HIGHEST   0x3UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_LOWEST    0x4UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_LAST     CFA_NTUPLE_FILTER_ALLOC_REQ_PRI_HINT_LOWEST</div><div class='del'>-	__be32	src_ipaddr[4];</div><div class='del'>-	__be32	src_ipaddr_mask[4];</div><div class='del'>-	__be32	dst_ipaddr[4];</div><div class='del'>-	__be32	dst_ipaddr_mask[4];</div><div class='del'>-	__be16	src_port;</div><div class='del'>-	__be16	src_port_mask;</div><div class='del'>-	__be16	dst_port;</div><div class='del'>-	__be16	dst_port_mask;</div><div class='del'>-	__le64	ntuple_filter_id_hint;</div><div class='del'>-	__le16	rfs_ring_tbl_idx;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_alloc_output (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	ntuple_filter_id;</div><div class='del'>-	__le32	flow_id;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_NTUPLE_FILTER_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_alloc_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_alloc_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_UNKNOWN                   0x0UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_RX_MASK_VLAN_CONFLICT_ERR 0x1UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_LAST                     CFA_NTUPLE_FILTER_ALLOC_CMD_ERR_CODE_RX_MASK_VLAN_CONFLICT_ERR</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	ntuple_filter_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_cfg_input (size:384b/48B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_CFG_REQ_ENABLES_NEW_DST_ID                0x1UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_CFG_REQ_ENABLES_NEW_MIRROR_VNIC_ID        0x2UL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_CFG_REQ_ENABLES_NEW_METER_INSTANCE_ID     0x4UL</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_CFG_REQ_FLAGS_DEST_FID     0x1UL</div><div class='del'>-	__le64	ntuple_filter_id;</div><div class='del'>-	__le32	new_dst_id;</div><div class='del'>-	__le32	new_mirror_vnic_id;</div><div class='del'>-	__le16	new_meter_instance_id;</div><div class='del'>-	#define CFA_NTUPLE_FILTER_CFG_REQ_NEW_METER_INSTANCE_ID_INVALID 0xffffUL</div><div class='del'>-	#define CFA_NTUPLE_FILTER_CFG_REQ_NEW_METER_INSTANCE_ID_LAST   CFA_NTUPLE_FILTER_CFG_REQ_NEW_METER_INSTANCE_ID_INVALID</div><div class='del'>-	u8	unused_1[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_ntuple_filter_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_ntuple_filter_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_decap_filter_alloc_input (size:832b/104B) */</div><div class='del'>-struct hwrm_cfa_decap_filter_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_FLAGS_OVS_TUNNEL     0x1UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE        0x1UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_TUNNEL_ID          0x2UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_MACADDR        0x4UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_MACADDR        0x8UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_OVLAN_VID          0x10UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IVLAN_VID          0x20UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_T_OVLAN_VID        0x40UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_T_IVLAN_VID        0x80UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_ETHERTYPE          0x100UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR         0x200UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR         0x400UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IPADDR_TYPE        0x800UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IP_PROTOCOL        0x1000UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_PORT           0x2000UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_PORT           0x4000UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_ID             0x8000UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_MIRROR_VNIC_ID     0x10000UL</div><div class='del'>-	__be32	tunnel_id;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	unused_1;</div><div class='del'>-	u8	src_macaddr[6];</div><div class='del'>-	u8	unused_2[2];</div><div class='del'>-	u8	dst_macaddr[6];</div><div class='del'>-	__be16	ovlan_vid;</div><div class='del'>-	__be16	ivlan_vid;</div><div class='del'>-	__be16	t_ovlan_vid;</div><div class='del'>-	__be16	t_ivlan_vid;</div><div class='del'>-	__be16	ethertype;</div><div class='del'>-	u8	ip_addr_type;</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_UNKNOWN 0x0UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4    0x4UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6    0x6UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_LAST   CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV6</div><div class='del'>-	u8	ip_protocol;</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UNKNOWN 0x0UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_TCP     0x6UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP     0x11UL</div><div class='del'>-	#define CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_LAST   CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP</div><div class='del'>-	__le16	unused_3;</div><div class='del'>-	__le32	unused_4;</div><div class='del'>-	__be32	src_ipaddr[4];</div><div class='del'>-	__be32	dst_ipaddr[4];</div><div class='del'>-	__be16	src_port;</div><div class='del'>-	__be16	dst_port;</div><div class='del'>-	__le16	dst_id;</div><div class='del'>-	__le16	l2_ctxt_ref_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_decap_filter_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_decap_filter_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	decap_filter_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_decap_filter_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_decap_filter_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	decap_filter_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_decap_filter_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_decap_filter_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_alloc_input (size:1024b/128B) */</div><div class='del'>-struct hwrm_cfa_flow_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_TUNNEL                 0x1UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_MASK          0x6UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_SFT           1</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_NONE            (0x0UL &lt;&lt; 1)</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_ONE             (0x1UL &lt;&lt; 1)</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_TWO             (0x2UL &lt;&lt; 1)</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_LAST           CFA_FLOW_ALLOC_REQ_FLAGS_NUM_VLAN_TWO</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_MASK          0x38UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_SFT           3</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_L2              (0x0UL &lt;&lt; 3)</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV4            (0x1UL &lt;&lt; 3)</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV6            (0x2UL &lt;&lt; 3)</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_LAST           CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV6</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_PATH_TX                0x40UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_PATH_RX                0x80UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_MATCH_VXLAN_IP_VNI     0x100UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_FLAGS_VHOST_ID_USE_VLAN      0x200UL</div><div class='del'>-	__le16	src_fid;</div><div class='del'>-	__le32	tunnel_handle;</div><div class='del'>-	__le16	action_flags;</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FWD                       0x1UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_RECYCLE                   0x2UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_DROP                      0x4UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_METER                     0x8UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL                    0x10UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_SRC                   0x20UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_DEST                  0x40UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_IPV4_ADDRESS          0x80UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_L2_HEADER_REWRITE         0x100UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TTL_DECREMENT             0x200UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL_IP                 0x400UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FLOW_AGING_ENABLED        0x800UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_PRI_HINT                  0x1000UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NO_FLOW_COUNTER_ALLOC     0x2000UL</div><div class='del'>-	__le16	dst_fid;</div><div class='del'>-	__be16	l2_rewrite_vlan_tpid;</div><div class='del'>-	__be16	l2_rewrite_vlan_tci;</div><div class='del'>-	__le16	act_meter_id;</div><div class='del'>-	__le16	ref_flow_handle;</div><div class='del'>-	__be16	ethertype;</div><div class='del'>-	__be16	outer_vlan_tci;</div><div class='del'>-	__be16	dmac[3];</div><div class='del'>-	__be16	inner_vlan_tci;</div><div class='del'>-	__be16	smac[3];</div><div class='del'>-	u8	ip_dst_mask_len;</div><div class='del'>-	u8	ip_src_mask_len;</div><div class='del'>-	__be32	ip_dst[4];</div><div class='del'>-	__be32	ip_src[4];</div><div class='del'>-	__be16	l4_src_port;</div><div class='del'>-	__be16	l4_src_port_mask;</div><div class='del'>-	__be16	l4_dst_port;</div><div class='del'>-	__be16	l4_dst_port_mask;</div><div class='del'>-	__be32	nat_ip_address[4];</div><div class='del'>-	__be16	l2_rewrite_dmac[3];</div><div class='del'>-	__be16	nat_port;</div><div class='del'>-	__be16	l2_rewrite_smac[3];</div><div class='del'>-	u8	ip_proto;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_NONTUNNEL    0x0UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_NVGRE        0x2UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_L2GRE        0x3UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_IPIP         0x4UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_MPLS         0x6UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_STT          0x7UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_IPGRE        0x8UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL    0xffUL</div><div class='del'>-	#define CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_LAST        CFA_FLOW_ALLOC_REQ_TUNNEL_TYPE_ANYTUNNEL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_alloc_output (size:256b/32B) */</div><div class='del'>-struct hwrm_cfa_flow_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	flow_handle;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le32	flow_id;</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_VALUE_MASK 0x3fffffffUL</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_VALUE_SFT 0</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE      0x40000000UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_INT    (0x0UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_EXT    (0x1UL &lt;&lt; 30)</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_LAST  CFA_FLOW_ALLOC_RESP_FLOW_ID_TYPE_EXT</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR       0x80000000UL</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_RX      (0x0UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_TX      (0x1UL &lt;&lt; 31)</div><div class='del'>-	#define CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_LAST   CFA_FLOW_ALLOC_RESP_FLOW_ID_DIR_TX</div><div class='del'>-	__le64	ext_flow_handle;</div><div class='del'>-	__le32	flow_counter_id;</div><div class='del'>-	u8	unused_1[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_free_input (size:256b/32B) */</div><div class='del'>-struct hwrm_cfa_flow_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	flow_handle;</div><div class='del'>-	__le16	unused_0;</div><div class='del'>-	__le32	flow_counter_id;</div><div class='del'>-	__le64	ext_flow_handle;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_free_output (size:256b/32B) */</div><div class='del'>-struct hwrm_cfa_flow_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	packet;</div><div class='del'>-	__le64	byte;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_info_input (size:256b/32B) */</div><div class='del'>-struct hwrm_cfa_flow_info_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	flow_handle;</div><div class='del'>-	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_MAX_MASK       0xfffUL</div><div class='del'>-	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_MAX_SFT        0</div><div class='del'>-	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_CNP_CNT        0x1000UL</div><div class='del'>-	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV1_CNT     0x2000UL</div><div class='del'>-	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_ROCEV2_CNT     0x4000UL</div><div class='del'>-	#define CFA_FLOW_INFO_REQ_FLOW_HANDLE_DIR_RX         0x8000UL</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	__le64	ext_flow_handle;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_info_output (size:5632b/704B) */</div><div class='del'>-struct hwrm_cfa_flow_info_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define CFA_FLOW_INFO_RESP_FLAGS_PATH_TX     0x1UL</div><div class='del'>-	#define CFA_FLOW_INFO_RESP_FLAGS_PATH_RX     0x2UL</div><div class='del'>-	u8	profile;</div><div class='del'>-	__le16	src_fid;</div><div class='del'>-	__le16	dst_fid;</div><div class='del'>-	__le16	l2_ctxt_id;</div><div class='del'>-	__le64	em_info;</div><div class='del'>-	__le64	tcam_info;</div><div class='del'>-	__le64	vfp_tcam_info;</div><div class='del'>-	__le16	ar_id;</div><div class='del'>-	__le16	flow_handle;</div><div class='del'>-	__le32	tunnel_handle;</div><div class='del'>-	__le16	flow_timer;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	__le32	flow_key_data[130];</div><div class='del'>-	__le32	flow_action_info[30];</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_stats_input (size:640b/80B) */</div><div class='del'>-struct hwrm_cfa_flow_stats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	num_flows;</div><div class='del'>-	__le16	flow_handle_0;</div><div class='del'>-	__le16	flow_handle_1;</div><div class='del'>-	__le16	flow_handle_2;</div><div class='del'>-	__le16	flow_handle_3;</div><div class='del'>-	__le16	flow_handle_4;</div><div class='del'>-	__le16	flow_handle_5;</div><div class='del'>-	__le16	flow_handle_6;</div><div class='del'>-	__le16	flow_handle_7;</div><div class='del'>-	__le16	flow_handle_8;</div><div class='del'>-	__le16	flow_handle_9;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le32	flow_id_0;</div><div class='del'>-	__le32	flow_id_1;</div><div class='del'>-	__le32	flow_id_2;</div><div class='del'>-	__le32	flow_id_3;</div><div class='del'>-	__le32	flow_id_4;</div><div class='del'>-	__le32	flow_id_5;</div><div class='del'>-	__le32	flow_id_6;</div><div class='del'>-	__le32	flow_id_7;</div><div class='del'>-	__le32	flow_id_8;</div><div class='del'>-	__le32	flow_id_9;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_flow_stats_output (size:1408b/176B) */</div><div class='del'>-struct hwrm_cfa_flow_stats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	packet_0;</div><div class='del'>-	__le64	packet_1;</div><div class='del'>-	__le64	packet_2;</div><div class='del'>-	__le64	packet_3;</div><div class='del'>-	__le64	packet_4;</div><div class='del'>-	__le64	packet_5;</div><div class='del'>-	__le64	packet_6;</div><div class='del'>-	__le64	packet_7;</div><div class='del'>-	__le64	packet_8;</div><div class='del'>-	__le64	packet_9;</div><div class='del'>-	__le64	byte_0;</div><div class='del'>-	__le64	byte_1;</div><div class='del'>-	__le64	byte_2;</div><div class='del'>-	__le64	byte_3;</div><div class='del'>-	__le64	byte_4;</div><div class='del'>-	__le64	byte_5;</div><div class='del'>-	__le64	byte_6;</div><div class='del'>-	__le64	byte_7;</div><div class='del'>-	__le64	byte_8;</div><div class='del'>-	__le64	byte_9;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_vfr_alloc_input (size:448b/56B) */</div><div class='del'>-struct hwrm_cfa_vfr_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	vf_id;</div><div class='del'>-	__le16	reserved;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	char	vfr_name[32];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_vfr_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_vfr_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	rx_cfa_code;</div><div class='del'>-	__le16	tx_cfa_action;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_vfr_free_input (size:384b/48B) */</div><div class='del'>-struct hwrm_cfa_vfr_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	char	vfr_name[32];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_vfr_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_vfr_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_qcaps_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_eem_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_EEM_QCAPS_REQ_FLAGS_PATH_TX               0x1UL</div><div class='del'>-	#define CFA_EEM_QCAPS_REQ_FLAGS_PATH_RX               0x2UL</div><div class='del'>-	#define CFA_EEM_QCAPS_REQ_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='del'>-	__le32	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_qcaps_output (size:256b/32B) */</div><div class='del'>-struct hwrm_cfa_eem_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_FLAGS_PATH_TX                                         0x1UL</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_FLAGS_PATH_RX                                         0x2UL</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_FLAGS_CENTRALIZED_MEMORY_MODEL_SUPPORTED              0x4UL</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_FLAGS_DETACHED_CENTRALIZED_MEMORY_MODEL_SUPPORTED     0x8UL</div><div class='del'>-	__le32	unused_0;</div><div class='del'>-	__le32	supported;</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_SUPPORTED_KEY0_TABLE                       0x1UL</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_SUPPORTED_KEY1_TABLE                       0x2UL</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_SUPPORTED_EXTERNAL_RECORD_TABLE            0x4UL</div><div class='del'>-	#define CFA_EEM_QCAPS_RESP_SUPPORTED_EXTERNAL_FLOW_COUNTERS_TABLE     0x8UL</div><div class='del'>-	__le32	max_entries_supported;</div><div class='del'>-	__le16	key_entry_size;</div><div class='del'>-	__le16	record_entry_size;</div><div class='del'>-	__le16	efc_entry_size;</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_cfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_cfa_eem_cfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_EEM_CFG_REQ_FLAGS_PATH_TX               0x1UL</div><div class='del'>-	#define CFA_EEM_CFG_REQ_FLAGS_PATH_RX               0x2UL</div><div class='del'>-	#define CFA_EEM_CFG_REQ_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='del'>-	#define CFA_EEM_CFG_REQ_FLAGS_SECONDARY_PF          0x8UL</div><div class='del'>-	__le16	group_id;</div><div class='del'>-	__le16	unused_0;</div><div class='del'>-	__le32	num_entries;</div><div class='del'>-	__le32	unused_1;</div><div class='del'>-	__le16	key0_ctx_id;</div><div class='del'>-	__le16	key1_ctx_id;</div><div class='del'>-	__le16	record_ctx_id;</div><div class='del'>-	__le16	efc_ctx_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_cfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_eem_cfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_qcfg_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_eem_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_EEM_QCFG_REQ_FLAGS_PATH_TX     0x1UL</div><div class='del'>-	#define CFA_EEM_QCFG_REQ_FLAGS_PATH_RX     0x2UL</div><div class='del'>-	__le32	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_qcfg_output (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_eem_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_EEM_QCFG_RESP_FLAGS_PATH_TX               0x1UL</div><div class='del'>-	#define CFA_EEM_QCFG_RESP_FLAGS_PATH_RX               0x2UL</div><div class='del'>-	#define CFA_EEM_QCFG_RESP_FLAGS_PREFERRED_OFFLOAD     0x4UL</div><div class='del'>-	__le32	num_entries;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_op_input (size:192b/24B) */</div><div class='del'>-struct hwrm_cfa_eem_op_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_EEM_OP_REQ_FLAGS_PATH_TX     0x1UL</div><div class='del'>-	#define CFA_EEM_OP_REQ_FLAGS_PATH_RX     0x2UL</div><div class='del'>-	__le16	unused_0;</div><div class='del'>-	__le16	op;</div><div class='del'>-	#define CFA_EEM_OP_REQ_OP_RESERVED    0x0UL</div><div class='del'>-	#define CFA_EEM_OP_REQ_OP_EEM_DISABLE 0x1UL</div><div class='del'>-	#define CFA_EEM_OP_REQ_OP_EEM_ENABLE  0x2UL</div><div class='del'>-	#define CFA_EEM_OP_REQ_OP_EEM_CLEANUP 0x3UL</div><div class='del'>-	#define CFA_EEM_OP_REQ_OP_LAST       CFA_EEM_OP_REQ_OP_EEM_CLEANUP</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_eem_op_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_eem_op_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_adv_flow_mgnt_qcaps_input (size:256b/32B) */</div><div class='del'>-struct hwrm_cfa_adv_flow_mgnt_qcaps_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_cfa_adv_flow_mgnt_qcaps_output (size:128b/16B) */</div><div class='del'>-struct hwrm_cfa_adv_flow_mgnt_qcaps_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_HND_16BIT_SUPPORTED              0x1UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_HND_64BIT_SUPPORTED              0x2UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_BATCH_DELETE_SUPPORTED           0x4UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_RESET_ALL_SUPPORTED              0x8UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_NTUPLE_FLOW_DEST_FUNC_SUPPORTED       0x10UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_TX_EEM_FLOW_SUPPORTED                 0x20UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RX_EEM_FLOW_SUPPORTED                 0x40UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_FLOW_COUNTER_ALLOC_SUPPORTED          0x80UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_RFS_RING_TBL_IDX_SUPPORTED            0x100UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_UNTAGGED_VLAN_SUPPORTED               0x200UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_XDP_SUPPORTED                         0x400UL</div><div class='del'>-	#define CFA_ADV_FLOW_MGNT_QCAPS_RESP_FLAGS_L2_HEADER_SOURCE_FIELDS_SUPPORTED     0x800UL</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_tunnel_dst_port_query_input (size:192b/24B) */</div><div class='del'>-struct hwrm_tunnel_dst_port_query_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_LAST        TUNNEL_DST_PORT_QUERY_REQ_TUNNEL_TYPE_VXLAN_GPE_V6</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_tunnel_dst_port_query_output (size:128b/16B) */</div><div class='del'>-struct hwrm_tunnel_dst_port_query_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	tunnel_dst_port_id;</div><div class='del'>-	__be16	tunnel_dst_port_val;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_tunnel_dst_port_alloc_input (size:192b/24B) */</div><div class='del'>-struct hwrm_tunnel_dst_port_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_LAST        TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN_GPE_V6</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__be16	tunnel_dst_port_val;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_tunnel_dst_port_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_tunnel_dst_port_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	tunnel_dst_port_id;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_tunnel_dst_port_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_tunnel_dst_port_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	tunnel_type;</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN        0x1UL</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_GENEVE       0x5UL</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_V4     0x9UL</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_IPGRE_V1     0xaUL</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_L2_ETYPE     0xbUL</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE_V6 0xcUL</div><div class='del'>-	#define TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_LAST        TUNNEL_DST_PORT_FREE_REQ_TUNNEL_TYPE_VXLAN_GPE_V6</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	tunnel_dst_port_id;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_tunnel_dst_port_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_tunnel_dst_port_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ctx_hw_stats (size:1280b/160B) */</div><div class='del'>-struct ctx_hw_stats {</div><div class='del'>-	__le64	rx_ucast_pkts;</div><div class='del'>-	__le64	rx_mcast_pkts;</div><div class='del'>-	__le64	rx_bcast_pkts;</div><div class='del'>-	__le64	rx_discard_pkts;</div><div class='del'>-	__le64	rx_drop_pkts;</div><div class='del'>-	__le64	rx_ucast_bytes;</div><div class='del'>-	__le64	rx_mcast_bytes;</div><div class='del'>-	__le64	rx_bcast_bytes;</div><div class='del'>-	__le64	tx_ucast_pkts;</div><div class='del'>-	__le64	tx_mcast_pkts;</div><div class='del'>-	__le64	tx_bcast_pkts;</div><div class='del'>-	__le64	tx_discard_pkts;</div><div class='del'>-	__le64	tx_drop_pkts;</div><div class='del'>-	__le64	tx_ucast_bytes;</div><div class='del'>-	__le64	tx_mcast_bytes;</div><div class='del'>-	__le64	tx_bcast_bytes;</div><div class='del'>-	__le64	tpa_pkts;</div><div class='del'>-	__le64	tpa_bytes;</div><div class='del'>-	__le64	tpa_events;</div><div class='del'>-	__le64	tpa_aborts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_alloc_input (size:256b/32B) */</div><div class='del'>-struct hwrm_stat_ctx_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	stats_dma_addr;</div><div class='del'>-	__le32	update_period_ms;</div><div class='del'>-	u8	stat_ctx_flags;</div><div class='del'>-	#define STAT_CTX_ALLOC_REQ_STAT_CTX_FLAGS_ROCE     0x1UL</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_stat_ctx_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	stat_ctx_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_free_input (size:192b/24B) */</div><div class='del'>-struct hwrm_stat_ctx_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	stat_ctx_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_stat_ctx_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	stat_ctx_id;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_query_input (size:192b/24B) */</div><div class='del'>-struct hwrm_stat_ctx_query_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	stat_ctx_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_query_output (size:1408b/176B) */</div><div class='del'>-struct hwrm_stat_ctx_query_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	tx_ucast_pkts;</div><div class='del'>-	__le64	tx_mcast_pkts;</div><div class='del'>-	__le64	tx_bcast_pkts;</div><div class='del'>-	__le64	tx_err_pkts;</div><div class='del'>-	__le64	tx_drop_pkts;</div><div class='del'>-	__le64	tx_ucast_bytes;</div><div class='del'>-	__le64	tx_mcast_bytes;</div><div class='del'>-	__le64	tx_bcast_bytes;</div><div class='del'>-	__le64	rx_ucast_pkts;</div><div class='del'>-	__le64	rx_mcast_pkts;</div><div class='del'>-	__le64	rx_bcast_pkts;</div><div class='del'>-	__le64	rx_err_pkts;</div><div class='del'>-	__le64	rx_drop_pkts;</div><div class='del'>-	__le64	rx_ucast_bytes;</div><div class='del'>-	__le64	rx_mcast_bytes;</div><div class='del'>-	__le64	rx_bcast_bytes;</div><div class='del'>-	__le64	rx_agg_pkts;</div><div class='del'>-	__le64	rx_agg_bytes;</div><div class='del'>-	__le64	rx_agg_events;</div><div class='del'>-	__le64	rx_agg_aborts;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_clr_stats_input (size:192b/24B) */</div><div class='del'>-struct hwrm_stat_ctx_clr_stats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	stat_ctx_id;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_stat_ctx_clr_stats_output (size:128b/16B) */</div><div class='del'>-struct hwrm_stat_ctx_clr_stats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_pcie_qstats_input (size:256b/32B) */</div><div class='del'>-struct hwrm_pcie_qstats_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	pcie_stat_size;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	__le64	pcie_stat_host_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_pcie_qstats_output (size:128b/16B) */</div><div class='del'>-struct hwrm_pcie_qstats_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	pcie_stat_size;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* pcie_ctx_hw_stats (size:768b/96B) */</div><div class='del'>-struct pcie_ctx_hw_stats {</div><div class='del'>-	__le64	pcie_pl_signal_integrity;</div><div class='del'>-	__le64	pcie_dl_signal_integrity;</div><div class='del'>-	__le64	pcie_tl_signal_integrity;</div><div class='del'>-	__le64	pcie_link_integrity;</div><div class='del'>-	__le64	pcie_tx_traffic_rate;</div><div class='del'>-	__le64	pcie_rx_traffic_rate;</div><div class='del'>-	__le64	pcie_tx_dllp_statistics;</div><div class='del'>-	__le64	pcie_rx_dllp_statistics;</div><div class='del'>-	__le64	pcie_equalization_time;</div><div class='del'>-	__le32	pcie_ltssm_histogram[4];</div><div class='del'>-	__le64	pcie_recovery_histogram;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_reset_input (size:192b/24B) */</div><div class='del'>-struct hwrm_fw_reset_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	embedded_proc_type;</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_BOOT                 0x0UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_MGMT                 0x1UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_NETCTRL              0x2UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_ROCE                 0x3UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_HOST                 0x4UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_AP                   0x5UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP                 0x6UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_HOST_RESOURCE_REINIT 0x7UL</div><div class='del'>-	#define FW_RESET_REQ_EMBEDDED_PROC_TYPE_LAST                FW_RESET_REQ_EMBEDDED_PROC_TYPE_HOST_RESOURCE_REINIT</div><div class='del'>-	u8	selfrst_status;</div><div class='del'>-	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTNONE      0x0UL</div><div class='del'>-	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP      0x1UL</div><div class='del'>-	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTPCIERST   0x2UL</div><div class='del'>-	#define FW_RESET_REQ_SELFRST_STATUS_SELFRSTIMMEDIATE 0x3UL</div><div class='del'>-	#define FW_RESET_REQ_SELFRST_STATUS_LAST            FW_RESET_REQ_SELFRST_STATUS_SELFRSTIMMEDIATE</div><div class='del'>-	u8	host_idx;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define FW_RESET_REQ_FLAGS_RESET_GRACEFUL     0x1UL</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_reset_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fw_reset_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	selfrst_status;</div><div class='del'>-	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTNONE      0x0UL</div><div class='del'>-	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTASAP      0x1UL</div><div class='del'>-	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTPCIERST   0x2UL</div><div class='del'>-	#define FW_RESET_RESP_SELFRST_STATUS_SELFRSTIMMEDIATE 0x3UL</div><div class='del'>-	#define FW_RESET_RESP_SELFRST_STATUS_LAST            FW_RESET_RESP_SELFRST_STATUS_SELFRSTIMMEDIATE</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_qstatus_input (size:192b/24B) */</div><div class='del'>-struct hwrm_fw_qstatus_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	embedded_proc_type;</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_BOOT    0x0UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_MGMT    0x1UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_NETCTRL 0x2UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_ROCE    0x3UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_HOST    0x4UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_AP      0x5UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_CHIP    0x6UL</div><div class='del'>-	#define FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_LAST   FW_QSTATUS_REQ_EMBEDDED_PROC_TYPE_CHIP</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_qstatus_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fw_qstatus_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	selfrst_status;</div><div class='del'>-	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTNONE    0x0UL</div><div class='del'>-	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTASAP    0x1UL</div><div class='del'>-	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPCIERST 0x2UL</div><div class='del'>-	#define FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPOWER   0x3UL</div><div class='del'>-	#define FW_QSTATUS_RESP_SELFRST_STATUS_LAST          FW_QSTATUS_RESP_SELFRST_STATUS_SELFRSTPOWER</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_set_time_input (size:256b/32B) */</div><div class='del'>-struct hwrm_fw_set_time_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	year;</div><div class='del'>-	#define FW_SET_TIME_REQ_YEAR_UNKNOWN 0x0UL</div><div class='del'>-	#define FW_SET_TIME_REQ_YEAR_LAST   FW_SET_TIME_REQ_YEAR_UNKNOWN</div><div class='del'>-	u8	month;</div><div class='del'>-	u8	day;</div><div class='del'>-	u8	hour;</div><div class='del'>-	u8	minute;</div><div class='del'>-	u8	second;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	millisecond;</div><div class='del'>-	__le16	zone;</div><div class='del'>-	#define FW_SET_TIME_REQ_ZONE_UTC     0</div><div class='del'>-	#define FW_SET_TIME_REQ_ZONE_UNKNOWN 65535</div><div class='del'>-	#define FW_SET_TIME_REQ_ZONE_LAST   FW_SET_TIME_REQ_ZONE_UNKNOWN</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_set_time_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fw_set_time_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_struct_hdr (size:128b/16B) */</div><div class='del'>-struct hwrm_struct_hdr {</div><div class='del'>-	__le16	struct_id;</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_LLDP_CFG           0x41bUL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_DCBX_ETS           0x41dUL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_DCBX_PFC           0x41fUL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_DCBX_APP           0x421UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_DCBX_FEATURE_STATE 0x422UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_LLDP_GENERIC       0x424UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_LLDP_DEVICE        0x426UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_POWER_BKUP         0x427UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_AFM_OPAQUE         0x1UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_PORT_DESCRIPTION   0xaUL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_RSS_V2             0x64UL</div><div class='del'>-	#define STRUCT_HDR_STRUCT_ID_LAST              STRUCT_HDR_STRUCT_ID_RSS_V2</div><div class='del'>-	__le16	len;</div><div class='del'>-	u8	version;</div><div class='del'>-	u8	count;</div><div class='del'>-	__le16	subtype;</div><div class='del'>-	__le16	next_offset;</div><div class='del'>-	#define STRUCT_HDR_NEXT_OFFSET_LAST 0x0UL</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_struct_data_dcbx_app (size:64b/8B) */</div><div class='del'>-struct hwrm_struct_data_dcbx_app {</div><div class='del'>-	__be16	protocol_id;</div><div class='del'>-	u8	protocol_selector;</div><div class='del'>-	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_ETHER_TYPE   0x1UL</div><div class='del'>-	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_TCP_PORT     0x2UL</div><div class='del'>-	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_UDP_PORT     0x3UL</div><div class='del'>-	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_TCP_UDP_PORT 0x4UL</div><div class='del'>-	#define STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_LAST        STRUCT_DATA_DCBX_APP_PROTOCOL_SELECTOR_TCP_UDP_PORT</div><div class='del'>-	u8	priority;</div><div class='del'>-	u8	valid;</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_set_structured_data_input (size:256b/32B) */</div><div class='del'>-struct hwrm_fw_set_structured_data_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	src_data_addr;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	u8	hdr_cnt;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_set_structured_data_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fw_set_structured_data_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_set_structured_data_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_fw_set_structured_data_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_UNKNOWN     0x0UL</div><div class='del'>-	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_HDR_CNT 0x1UL</div><div class='del'>-	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_FMT     0x2UL</div><div class='del'>-	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID      0x3UL</div><div class='del'>-	#define FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_LAST       FW_SET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_get_structured_data_input (size:256b/32B) */</div><div class='del'>-struct hwrm_fw_get_structured_data_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	dest_data_addr;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	__le16	structure_id;</div><div class='del'>-	__le16	subtype;</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_UNUSED                  0x0UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_ALL                     0xffffUL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_ADMIN       0x100UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_PEER        0x101UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NEAR_BRIDGE_OPERATIONAL 0x102UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_ADMIN          0x200UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_PEER           0x201UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_NON_TPMR_OPERATIONAL    0x202UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_HOST_OPERATIONAL        0x300UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_LAST                   FW_GET_STRUCTURED_DATA_REQ_SUBTYPE_HOST_OPERATIONAL</div><div class='del'>-	u8	count;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_get_structured_data_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fw_get_structured_data_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	hdr_cnt;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fw_get_structured_data_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_fw_get_structured_data_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_UNKNOWN 0x0UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID  0x3UL</div><div class='del'>-	#define FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_LAST   FW_GET_STRUCTURED_DATA_CMD_ERR_CODE_BAD_ID</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_exec_fwd_resp_input (size:1024b/128B) */</div><div class='del'>-struct hwrm_exec_fwd_resp_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	encap_request[26];</div><div class='del'>-	__le16	encap_resp_target_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_exec_fwd_resp_output (size:128b/16B) */</div><div class='del'>-struct hwrm_exec_fwd_resp_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_reject_fwd_resp_input (size:1024b/128B) */</div><div class='del'>-struct hwrm_reject_fwd_resp_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	encap_request[26];</div><div class='del'>-	__le16	encap_resp_target_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_reject_fwd_resp_output (size:128b/16B) */</div><div class='del'>-struct hwrm_reject_fwd_resp_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fwd_resp_input (size:1024b/128B) */</div><div class='del'>-struct hwrm_fwd_resp_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	encap_resp_target_id;</div><div class='del'>-	__le16	encap_resp_cmpl_ring;</div><div class='del'>-	__le16	encap_resp_len;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	__le64	encap_resp_addr;</div><div class='del'>-	__le32	encap_resp[24];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fwd_resp_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fwd_resp_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fwd_async_event_cmpl_input (size:320b/40B) */</div><div class='del'>-struct hwrm_fwd_async_event_cmpl_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	encap_async_event_target_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	__le32	encap_async_event_cmpl[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_fwd_async_event_cmpl_output (size:128b/16B) */</div><div class='del'>-struct hwrm_fwd_async_event_cmpl_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_temp_monitor_query_input (size:128b/16B) */</div><div class='del'>-struct hwrm_temp_monitor_query_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_temp_monitor_query_output (size:128b/16B) */</div><div class='del'>-struct hwrm_temp_monitor_query_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	temp;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_filter_alloc_input (size:512b/64B) */</div><div class='del'>-struct hwrm_wol_filter_alloc_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_ENABLES_MAC_ADDRESS           0x1UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_OFFSET        0x2UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_BUF_SIZE      0x4UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_BUF_ADDR      0x8UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_MASK_ADDR     0x10UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_ENABLES_PATTERN_MASK_SIZE     0x20UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	wol_type;</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_MAGICPKT 0x0UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_BMP      0x1UL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_INVALID  0xffUL</div><div class='del'>-	#define WOL_FILTER_ALLOC_REQ_WOL_TYPE_LAST    WOL_FILTER_ALLOC_REQ_WOL_TYPE_INVALID</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	mac_address[6];</div><div class='del'>-	__le16	pattern_offset;</div><div class='del'>-	__le16	pattern_buf_size;</div><div class='del'>-	__le16	pattern_mask_size;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-	__le64	pattern_buf_addr;</div><div class='del'>-	__le64	pattern_mask_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_filter_alloc_output (size:128b/16B) */</div><div class='del'>-struct hwrm_wol_filter_alloc_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	wol_filter_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_filter_free_input (size:256b/32B) */</div><div class='del'>-struct hwrm_wol_filter_free_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	flags;</div><div class='del'>-	#define WOL_FILTER_FREE_REQ_FLAGS_FREE_ALL_WOL_FILTERS     0x1UL</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define WOL_FILTER_FREE_REQ_ENABLES_WOL_FILTER_ID     0x1UL</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	wol_filter_id;</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_filter_free_output (size:128b/16B) */</div><div class='del'>-struct hwrm_wol_filter_free_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_filter_qcfg_input (size:448b/56B) */</div><div class='del'>-struct hwrm_wol_filter_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	__le16	handle;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	__le64	pattern_buf_addr;</div><div class='del'>-	__le16	pattern_buf_size;</div><div class='del'>-	u8	unused_1[6];</div><div class='del'>-	__le64	pattern_mask_addr;</div><div class='del'>-	__le16	pattern_mask_size;</div><div class='del'>-	u8	unused_2[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_filter_qcfg_output (size:256b/32B) */</div><div class='del'>-struct hwrm_wol_filter_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	next_handle;</div><div class='del'>-	u8	wol_filter_id;</div><div class='del'>-	u8	wol_type;</div><div class='del'>-	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_MAGICPKT 0x0UL</div><div class='del'>-	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_BMP      0x1UL</div><div class='del'>-	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_INVALID  0xffUL</div><div class='del'>-	#define WOL_FILTER_QCFG_RESP_WOL_TYPE_LAST    WOL_FILTER_QCFG_RESP_WOL_TYPE_INVALID</div><div class='del'>-	__le32	unused_0;</div><div class='del'>-	u8	mac_address[6];</div><div class='del'>-	__le16	pattern_offset;</div><div class='del'>-	__le16	pattern_size;</div><div class='del'>-	__le16	pattern_mask_size;</div><div class='del'>-	u8	unused_1[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_reason_qcfg_input (size:320b/40B) */</div><div class='del'>-struct hwrm_wol_reason_qcfg_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	port_id;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-	__le64	wol_pkt_buf_addr;</div><div class='del'>-	__le16	wol_pkt_buf_size;</div><div class='del'>-	u8	unused_1[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_wol_reason_qcfg_output (size:128b/16B) */</div><div class='del'>-struct hwrm_wol_reason_qcfg_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	wol_filter_id;</div><div class='del'>-	u8	wol_reason;</div><div class='del'>-	#define WOL_REASON_QCFG_RESP_WOL_REASON_MAGICPKT 0x0UL</div><div class='del'>-	#define WOL_REASON_QCFG_RESP_WOL_REASON_BMP      0x1UL</div><div class='del'>-	#define WOL_REASON_QCFG_RESP_WOL_REASON_INVALID  0xffUL</div><div class='del'>-	#define WOL_REASON_QCFG_RESP_WOL_REASON_LAST    WOL_REASON_QCFG_RESP_WOL_REASON_INVALID</div><div class='del'>-	u8	wol_pkt_len;</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* coredump_segment_record (size:128b/16B) */</div><div class='del'>-struct coredump_segment_record {</div><div class='del'>-	__le16	component_id;</div><div class='del'>-	__le16	segment_id;</div><div class='del'>-	__le16	max_instances;</div><div class='del'>-	u8	version_hi;</div><div class='del'>-	u8	version_low;</div><div class='del'>-	u8	seg_flags;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_coredump_list_input (size:256b/32B) */</div><div class='del'>-struct hwrm_dbg_coredump_list_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	host_dest_addr;</div><div class='del'>-	__le32	host_buf_len;</div><div class='del'>-	__le16	seq_no;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define DBG_COREDUMP_LIST_REQ_FLAGS_CRASHDUMP     0x1UL</div><div class='del'>-	u8	unused_0[1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_coredump_list_output (size:128b/16B) */</div><div class='del'>-struct hwrm_dbg_coredump_list_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define DBG_COREDUMP_LIST_RESP_FLAGS_MORE     0x1UL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	total_segments;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	u8	unused_1;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_coredump_initiate_input (size:256b/32B) */</div><div class='del'>-struct hwrm_dbg_coredump_initiate_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	component_id;</div><div class='del'>-	__le16	segment_id;</div><div class='del'>-	__le16	instance;</div><div class='del'>-	__le16	unused_0;</div><div class='del'>-	u8	seg_flags;</div><div class='del'>-	u8	unused_1[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_coredump_initiate_output (size:128b/16B) */</div><div class='del'>-struct hwrm_dbg_coredump_initiate_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* coredump_data_hdr (size:128b/16B) */</div><div class='del'>-struct coredump_data_hdr {</div><div class='del'>-	__le32	address;</div><div class='del'>-	__le32	flags_length;</div><div class='del'>-	__le32	instance;</div><div class='del'>-	__le32	next_offset;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_coredump_retrieve_input (size:448b/56B) */</div><div class='del'>-struct hwrm_dbg_coredump_retrieve_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	host_dest_addr;</div><div class='del'>-	__le32	host_buf_len;</div><div class='del'>-	__le32	unused_0;</div><div class='del'>-	__le16	component_id;</div><div class='del'>-	__le16	segment_id;</div><div class='del'>-	__le16	instance;</div><div class='del'>-	__le16	unused_1;</div><div class='del'>-	u8	seg_flags;</div><div class='del'>-	u8	unused_2;</div><div class='del'>-	__le16	unused_3;</div><div class='del'>-	__le32	unused_4;</div><div class='del'>-	__le32	seq_no;</div><div class='del'>-	__le32	unused_5;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_coredump_retrieve_output (size:128b/16B) */</div><div class='del'>-struct hwrm_dbg_coredump_retrieve_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define DBG_COREDUMP_RETRIEVE_RESP_FLAGS_MORE     0x1UL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	u8	unused_1[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_ring_info_get_input (size:192b/24B) */</div><div class='del'>-struct hwrm_dbg_ring_info_get_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	ring_type;</div><div class='del'>-	#define DBG_RING_INFO_GET_REQ_RING_TYPE_L2_CMPL 0x0UL</div><div class='del'>-	#define DBG_RING_INFO_GET_REQ_RING_TYPE_TX      0x1UL</div><div class='del'>-	#define DBG_RING_INFO_GET_REQ_RING_TYPE_RX      0x2UL</div><div class='del'>-	#define DBG_RING_INFO_GET_REQ_RING_TYPE_LAST   DBG_RING_INFO_GET_REQ_RING_TYPE_RX</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	__le32	fw_ring_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_dbg_ring_info_get_output (size:192b/24B) */</div><div class='del'>-struct hwrm_dbg_ring_info_get_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	producer_index;</div><div class='del'>-	__le32	consumer_index;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_read_input (size:320b/40B) */</div><div class='del'>-struct hwrm_nvm_read_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	host_dest_addr;</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le32	offset;</div><div class='del'>-	__le32	len;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_read_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_read_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_dir_entries_input (size:192b/24B) */</div><div class='del'>-struct hwrm_nvm_get_dir_entries_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	host_dest_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_dir_entries_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_get_dir_entries_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_dir_info_input (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_get_dir_info_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_dir_info_output (size:192b/24B) */</div><div class='del'>-struct hwrm_nvm_get_dir_info_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	entries;</div><div class='del'>-	__le32	entry_length;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_write_input (size:384b/48B) */</div><div class='del'>-struct hwrm_nvm_write_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	host_src_addr;</div><div class='del'>-	__le16	dir_type;</div><div class='del'>-	__le16	dir_ordinal;</div><div class='del'>-	__le16	dir_ext;</div><div class='del'>-	__le16	dir_attr;</div><div class='del'>-	__le32	dir_data_length;</div><div class='del'>-	__le16	option;</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define NVM_WRITE_REQ_FLAGS_KEEP_ORIG_ACTIVE_IMG     0x1UL</div><div class='del'>-	__le32	dir_item_length;</div><div class='del'>-	__le32	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_write_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_write_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	dir_item_length;</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_write_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_nvm_write_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define NVM_WRITE_CMD_ERR_CODE_UNKNOWN  0x0UL</div><div class='del'>-	#define NVM_WRITE_CMD_ERR_CODE_FRAG_ERR 0x1UL</div><div class='del'>-	#define NVM_WRITE_CMD_ERR_CODE_NO_SPACE 0x2UL</div><div class='del'>-	#define NVM_WRITE_CMD_ERR_CODE_LAST    NVM_WRITE_CMD_ERR_CODE_NO_SPACE</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_modify_input (size:320b/40B) */</div><div class='del'>-struct hwrm_nvm_modify_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	host_src_addr;</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-	__le32	offset;</div><div class='del'>-	__le32	len;</div><div class='del'>-	u8	unused_1[4];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_modify_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_modify_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_find_dir_entry_input (size:256b/32B) */</div><div class='del'>-struct hwrm_nvm_find_dir_entry_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_ENABLES_DIR_IDX_VALID     0x1UL</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	__le16	dir_type;</div><div class='del'>-	__le16	dir_ordinal;</div><div class='del'>-	__le16	dir_ext;</div><div class='del'>-	u8	opt_ordinal;</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_MASK 0x3UL</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_SFT 0</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_EQ    0x0UL</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_GE    0x1UL</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_GT    0x2UL</div><div class='del'>-	#define NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_LAST NVM_FIND_DIR_ENTRY_REQ_OPT_ORDINAL_GT</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_find_dir_entry_output (size:256b/32B) */</div><div class='del'>-struct hwrm_nvm_find_dir_entry_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le32	dir_item_length;</div><div class='del'>-	__le32	dir_data_length;</div><div class='del'>-	__le32	fw_ver;</div><div class='del'>-	__le16	dir_ordinal;</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_erase_dir_entry_input (size:192b/24B) */</div><div class='del'>-struct hwrm_nvm_erase_dir_entry_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	u8	unused_0[6];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_erase_dir_entry_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_erase_dir_entry_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_dev_info_input (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_get_dev_info_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_dev_info_output (size:256b/32B) */</div><div class='del'>-struct hwrm_nvm_get_dev_info_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	manufacturer_id;</div><div class='del'>-	__le16	device_id;</div><div class='del'>-	__le32	sector_size;</div><div class='del'>-	__le32	nvram_size;</div><div class='del'>-	__le32	reserved_size;</div><div class='del'>-	__le32	available_size;</div><div class='del'>-	u8	nvm_cfg_ver_maj;</div><div class='del'>-	u8	nvm_cfg_ver_min;</div><div class='del'>-	u8	nvm_cfg_ver_upd;</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_mod_dir_entry_input (size:256b/32B) */</div><div class='del'>-struct hwrm_nvm_mod_dir_entry_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	enables;</div><div class='del'>-	#define NVM_MOD_DIR_ENTRY_REQ_ENABLES_CHECKSUM     0x1UL</div><div class='del'>-	__le16	dir_idx;</div><div class='del'>-	__le16	dir_ordinal;</div><div class='del'>-	__le16	dir_ext;</div><div class='del'>-	__le16	dir_attr;</div><div class='del'>-	__le32	checksum;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_mod_dir_entry_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_mod_dir_entry_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_verify_update_input (size:192b/24B) */</div><div class='del'>-struct hwrm_nvm_verify_update_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le16	dir_type;</div><div class='del'>-	__le16	dir_ordinal;</div><div class='del'>-	__le16	dir_ext;</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_verify_update_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_verify_update_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_install_update_input (size:192b/24B) */</div><div class='del'>-struct hwrm_nvm_install_update_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le32	install_type;</div><div class='del'>-	#define NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_NORMAL 0x0UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_ALL    0xffffffffUL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_LAST  NVM_INSTALL_UPDATE_REQ_INSTALL_TYPE_ALL</div><div class='del'>-	__le16	flags;</div><div class='del'>-	#define NVM_INSTALL_UPDATE_REQ_FLAGS_ERASE_UNUSED_SPACE     0x1UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_REQ_FLAGS_REMOVE_UNUSED_PKG      0x2UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_REQ_FLAGS_ALLOWED_TO_DEFRAG      0x4UL</div><div class='del'>-	u8	unused_0[2];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_install_update_output (size:192b/24B) */</div><div class='del'>-struct hwrm_nvm_install_update_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le64	installed_items;</div><div class='del'>-	u8	result;</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_RESULT_SUCCESS 0x0UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_RESULT_LAST   NVM_INSTALL_UPDATE_RESP_RESULT_SUCCESS</div><div class='del'>-	u8	problem_item;</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_NONE    0x0UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_PACKAGE 0xffUL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_LAST   NVM_INSTALL_UPDATE_RESP_PROBLEM_ITEM_PACKAGE</div><div class='del'>-	u8	reset_required;</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_NONE  0x0UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_PCI   0x1UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_POWER 0x2UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_LAST NVM_INSTALL_UPDATE_RESP_RESET_REQUIRED_POWER</div><div class='del'>-	u8	unused_0[4];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_install_update_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_nvm_install_update_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_UNKNOWN  0x0UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_FRAG_ERR 0x1UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_SPACE 0x2UL</div><div class='del'>-	#define NVM_INSTALL_UPDATE_CMD_ERR_CODE_LAST    NVM_INSTALL_UPDATE_CMD_ERR_CODE_NO_SPACE</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_variable_input (size:320b/40B) */</div><div class='del'>-struct hwrm_nvm_get_variable_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	dest_data_addr;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	__le16	option_num;</div><div class='del'>-	#define NVM_GET_VARIABLE_REQ_OPTION_NUM_RSVD_0    0x0UL</div><div class='del'>-	#define NVM_GET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF 0xffffUL</div><div class='del'>-	#define NVM_GET_VARIABLE_REQ_OPTION_NUM_LAST     NVM_GET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF</div><div class='del'>-	__le16	dimensions;</div><div class='del'>-	__le16	index_0;</div><div class='del'>-	__le16	index_1;</div><div class='del'>-	__le16	index_2;</div><div class='del'>-	__le16	index_3;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define NVM_GET_VARIABLE_REQ_FLAGS_FACTORY_DFLT     0x1UL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_variable_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_get_variable_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	__le16	option_num;</div><div class='del'>-	#define NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_0    0x0UL</div><div class='del'>-	#define NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_FFFF 0xffffUL</div><div class='del'>-	#define NVM_GET_VARIABLE_RESP_OPTION_NUM_LAST     NVM_GET_VARIABLE_RESP_OPTION_NUM_RSVD_FFFF</div><div class='del'>-	u8	unused_0[3];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_get_variable_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_nvm_get_variable_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define NVM_GET_VARIABLE_CMD_ERR_CODE_UNKNOWN       0x0UL</div><div class='del'>-	#define NVM_GET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST 0x1UL</div><div class='del'>-	#define NVM_GET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR   0x2UL</div><div class='del'>-	#define NVM_GET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT 0x3UL</div><div class='del'>-	#define NVM_GET_VARIABLE_CMD_ERR_CODE_LAST         NVM_GET_VARIABLE_CMD_ERR_CODE_LEN_TOO_SHORT</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_set_variable_input (size:320b/40B) */</div><div class='del'>-struct hwrm_nvm_set_variable_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	__le64	src_data_addr;</div><div class='del'>-	__le16	data_len;</div><div class='del'>-	__le16	option_num;</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_OPTION_NUM_RSVD_0    0x0UL</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF 0xffffUL</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_OPTION_NUM_LAST     NVM_SET_VARIABLE_REQ_OPTION_NUM_RSVD_FFFF</div><div class='del'>-	__le16	dimensions;</div><div class='del'>-	__le16	index_0;</div><div class='del'>-	__le16	index_1;</div><div class='del'>-	__le16	index_2;</div><div class='del'>-	__le16	index_3;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_FORCE_FLUSH                0x1UL</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_MASK          0xeUL</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_SFT           1</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_NONE            (0x0UL &lt;&lt; 1)</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_HMAC_SHA1       (0x1UL &lt;&lt; 1)</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_AES256          (0x2UL &lt;&lt; 1)</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_HMAC_SHA1_AUTH  (0x3UL &lt;&lt; 1)</div><div class='del'>-	#define NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_LAST           NVM_SET_VARIABLE_REQ_FLAGS_ENCRYPT_MODE_HMAC_SHA1_AUTH</div><div class='del'>-	u8	unused_0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_set_variable_output (size:128b/16B) */</div><div class='del'>-struct hwrm_nvm_set_variable_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_nvm_set_variable_cmd_err (size:64b/8B) */</div><div class='del'>-struct hwrm_nvm_set_variable_cmd_err {</div><div class='del'>-	u8	code;</div><div class='del'>-	#define NVM_SET_VARIABLE_CMD_ERR_CODE_UNKNOWN       0x0UL</div><div class='del'>-	#define NVM_SET_VARIABLE_CMD_ERR_CODE_VAR_NOT_EXIST 0x1UL</div><div class='del'>-	#define NVM_SET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR   0x2UL</div><div class='del'>-	#define NVM_SET_VARIABLE_CMD_ERR_CODE_LAST         NVM_SET_VARIABLE_CMD_ERR_CODE_CORRUPT_VAR</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_selftest_qlist_input (size:128b/16B) */</div><div class='del'>-struct hwrm_selftest_qlist_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_selftest_qlist_output (size:2240b/280B) */</div><div class='del'>-struct hwrm_selftest_qlist_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	num_tests;</div><div class='del'>-	u8	available_tests;</div><div class='del'>-	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_NVM_TEST                 0x1UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_LINK_TEST                0x2UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_REGISTER_TEST            0x4UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_MEMORY_TEST              0x8UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_PCIE_SERDES_TEST         0x10UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_AVAILABLE_TESTS_ETHERNET_SERDES_TEST     0x20UL</div><div class='del'>-	u8	offline_tests;</div><div class='del'>-	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_NVM_TEST                 0x1UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_LINK_TEST                0x2UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_REGISTER_TEST            0x4UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_MEMORY_TEST              0x8UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_PCIE_SERDES_TEST         0x10UL</div><div class='del'>-	#define SELFTEST_QLIST_RESP_OFFLINE_TESTS_ETHERNET_SERDES_TEST     0x20UL</div><div class='del'>-	u8	unused_0;</div><div class='del'>-	__le16	test_timeout;</div><div class='del'>-	u8	unused_1[2];</div><div class='del'>-	char	test0_name[32];</div><div class='del'>-	char	test1_name[32];</div><div class='del'>-	char	test2_name[32];</div><div class='del'>-	char	test3_name[32];</div><div class='del'>-	char	test4_name[32];</div><div class='del'>-	char	test5_name[32];</div><div class='del'>-	char	test6_name[32];</div><div class='del'>-	char	test7_name[32];</div><div class='del'>-	u8	unused_2[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_selftest_exec_input (size:192b/24B) */</div><div class='del'>-struct hwrm_selftest_exec_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-	u8	flags;</div><div class='del'>-	#define SELFTEST_EXEC_REQ_FLAGS_NVM_TEST                 0x1UL</div><div class='del'>-	#define SELFTEST_EXEC_REQ_FLAGS_LINK_TEST                0x2UL</div><div class='del'>-	#define SELFTEST_EXEC_REQ_FLAGS_REGISTER_TEST            0x4UL</div><div class='del'>-	#define SELFTEST_EXEC_REQ_FLAGS_MEMORY_TEST              0x8UL</div><div class='del'>-	#define SELFTEST_EXEC_REQ_FLAGS_PCIE_SERDES_TEST         0x10UL</div><div class='del'>-	#define SELFTEST_EXEC_REQ_FLAGS_ETHERNET_SERDES_TEST     0x20UL</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_selftest_exec_output (size:128b/16B) */</div><div class='del'>-struct hwrm_selftest_exec_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	requested_tests;</div><div class='del'>-	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_NVM_TEST                 0x1UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_LINK_TEST                0x2UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_REGISTER_TEST            0x4UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_MEMORY_TEST              0x8UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_PCIE_SERDES_TEST         0x10UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_REQUESTED_TESTS_ETHERNET_SERDES_TEST     0x20UL</div><div class='del'>-	u8	test_success;</div><div class='del'>-	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_NVM_TEST                 0x1UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_LINK_TEST                0x2UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_REGISTER_TEST            0x4UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_MEMORY_TEST              0x8UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_PCIE_SERDES_TEST         0x10UL</div><div class='del'>-	#define SELFTEST_EXEC_RESP_TEST_SUCCESS_ETHERNET_SERDES_TEST     0x20UL</div><div class='del'>-	u8	unused_0[5];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_selftest_irq_input (size:128b/16B) */</div><div class='del'>-struct hwrm_selftest_irq_input {</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	cmpl_ring;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	target_id;</div><div class='del'>-	__le64	resp_addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hwrm_selftest_irq_output (size:128b/16B) */</div><div class='del'>-struct hwrm_selftest_irq_output {</div><div class='del'>-	__le16	error_code;</div><div class='del'>-	__le16	req_type;</div><div class='del'>-	__le16	seq_id;</div><div class='del'>-	__le16	resp_len;</div><div class='del'>-	u8	unused_0[7];</div><div class='del'>-	u8	valid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* _BNXT_HSI_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c<br/>new file mode 100644<br/>index 000000000000..de3427c6c6aa<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c</a></div><div class='hunk'>@@ -0,0 +1,241 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 Broadcom Limited</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/dev_printk.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/hwmon.h&gt;</div><div class='add'>+#include &lt;linux/hwmon-sysfs.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='add'>+#include "bnxt_hwmon.h"</div><div class='add'>+</div><div class='add'>+void bnxt_hwmon_notify_event(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u32 attr;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;hwmon_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	switch (bp-&gt;thermal_threshold_type) {</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_WARN:</div><div class='add'>+		attr = hwmon_temp_max_alarm;</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_CRITICAL:</div><div class='add'>+		attr = hwmon_temp_crit_alarm;</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_FATAL:</div><div class='add'>+	case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_SHUTDOWN:</div><div class='add'>+		attr = hwmon_temp_emergency_alarm;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	hwmon_notify_event(&amp;bp-&gt;pdev-&gt;dev, hwmon_temp, attr, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_temp_query(struct bnxt *bp, u8 *temp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_temp_monitor_query_output *resp;</div><div class='add'>+	struct hwrm_temp_monitor_query_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_TEMP_MONITOR_QUERY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto drop_req;</div><div class='add'>+</div><div class='add'>+	if (temp) {</div><div class='add'>+		*temp = resp-&gt;temp;</div><div class='add'>+	} else if (resp-&gt;flags &amp;</div><div class='add'>+		   TEMP_MONITOR_QUERY_RESP_FLAGS_THRESHOLD_VALUES_AVAILABLE) {</div><div class='add'>+		bp-&gt;fw_cap |= BNXT_FW_CAP_THRESHOLD_TEMP_SUPPORTED;</div><div class='add'>+		bp-&gt;warn_thresh_temp = resp-&gt;warn_threshold;</div><div class='add'>+		bp-&gt;crit_thresh_temp = resp-&gt;critical_threshold;</div><div class='add'>+		bp-&gt;fatal_thresh_temp = resp-&gt;fatal_threshold;</div><div class='add'>+		bp-&gt;shutdown_thresh_temp = resp-&gt;shutdown_threshold;</div><div class='add'>+	}</div><div class='add'>+drop_req:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static umode_t bnxt_hwmon_is_visible(const void *_data, enum hwmon_sensor_types type,</div><div class='add'>+				     u32 attr, int channel)</div><div class='add'>+{</div><div class='add'>+	const struct bnxt *bp = _data;</div><div class='add'>+</div><div class='add'>+	if (type != hwmon_temp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case hwmon_temp_input:</div><div class='add'>+		return 0444;</div><div class='add'>+	case hwmon_temp_max:</div><div class='add'>+	case hwmon_temp_crit:</div><div class='add'>+	case hwmon_temp_emergency:</div><div class='add'>+	case hwmon_temp_max_alarm:</div><div class='add'>+	case hwmon_temp_crit_alarm:</div><div class='add'>+	case hwmon_temp_emergency_alarm:</div><div class='add'>+		if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_THRESHOLD_TEMP_SUPPORTED))</div><div class='add'>+			return 0;</div><div class='add'>+		return 0444;</div><div class='add'>+	default:</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,</div><div class='add'>+			   int channel, long *val)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = dev_get_drvdata(dev);</div><div class='add'>+	u8 temp = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	switch (attr) {</div><div class='add'>+	case hwmon_temp_input:</div><div class='add'>+		rc = bnxt_hwrm_temp_query(bp, &amp;temp);</div><div class='add'>+		if (!rc)</div><div class='add'>+			*val = temp * 1000;</div><div class='add'>+		return rc;</div><div class='add'>+	case hwmon_temp_max:</div><div class='add'>+		*val = bp-&gt;warn_thresh_temp * 1000;</div><div class='add'>+		return 0;</div><div class='add'>+	case hwmon_temp_crit:</div><div class='add'>+		*val = bp-&gt;crit_thresh_temp * 1000;</div><div class='add'>+		return 0;</div><div class='add'>+	case hwmon_temp_emergency:</div><div class='add'>+		*val = bp-&gt;fatal_thresh_temp * 1000;</div><div class='add'>+		return 0;</div><div class='add'>+	case hwmon_temp_max_alarm:</div><div class='add'>+		rc = bnxt_hwrm_temp_query(bp, &amp;temp);</div><div class='add'>+		if (!rc)</div><div class='add'>+			*val = temp &gt;= bp-&gt;warn_thresh_temp;</div><div class='add'>+		return rc;</div><div class='add'>+	case hwmon_temp_crit_alarm:</div><div class='add'>+		rc = bnxt_hwrm_temp_query(bp, &amp;temp);</div><div class='add'>+		if (!rc)</div><div class='add'>+			*val = temp &gt;= bp-&gt;crit_thresh_temp;</div><div class='add'>+		return rc;</div><div class='add'>+	case hwmon_temp_emergency_alarm:</div><div class='add'>+		rc = bnxt_hwrm_temp_query(bp, &amp;temp);</div><div class='add'>+		if (!rc)</div><div class='add'>+			*val = temp &gt;= bp-&gt;fatal_thresh_temp;</div><div class='add'>+		return rc;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct hwmon_channel_info *bnxt_hwmon_info[] = {</div><div class='add'>+	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT |</div><div class='add'>+			   HWMON_T_EMERGENCY | HWMON_T_MAX_ALARM |</div><div class='add'>+			   HWMON_T_CRIT_ALARM | HWMON_T_EMERGENCY_ALARM),</div><div class='add'>+	NULL</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_ops bnxt_hwmon_ops = {</div><div class='add'>+	.is_visible     = bnxt_hwmon_is_visible,</div><div class='add'>+	.read           = bnxt_hwmon_read,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct hwmon_chip_info bnxt_hwmon_chip_info = {</div><div class='add'>+	.ops    = &amp;bnxt_hwmon_ops,</div><div class='add'>+	.info   = bnxt_hwmon_info,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static ssize_t temp1_shutdown_show(struct device *dev,</div><div class='add'>+				   struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%u\n", bp-&gt;shutdown_thresh_temp * 1000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ssize_t temp1_shutdown_alarm_show(struct device *dev,</div><div class='add'>+					 struct device_attribute *attr, char *buf)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = dev_get_drvdata(dev);</div><div class='add'>+	u8 temp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_temp_query(bp, &amp;temp);</div><div class='add'>+	if (rc)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return sysfs_emit(buf, "%u\n", temp &gt;= bp-&gt;shutdown_thresh_temp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DEVICE_ATTR_RO(temp1_shutdown);</div><div class='add'>+static DEVICE_ATTR_RO(temp1_shutdown_alarm);</div><div class='add'>+</div><div class='add'>+static struct attribute *bnxt_temp_extra_attrs[] = {</div><div class='add'>+	&amp;dev_attr_temp1_shutdown.attr,</div><div class='add'>+	&amp;dev_attr_temp1_shutdown_alarm.attr,</div><div class='add'>+	NULL,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static umode_t bnxt_temp_extra_attrs_visible(struct kobject *kobj,</div><div class='add'>+					     struct attribute *attr, int index)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = kobj_to_dev(kobj);</div><div class='add'>+	struct bnxt *bp = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	/* Shutdown temperature setting in NVM is optional */</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_THRESHOLD_TEMP_SUPPORTED) ||</div><div class='add'>+	    !bp-&gt;shutdown_thresh_temp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return attr-&gt;mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct attribute_group bnxt_temp_extra_group = {</div><div class='add'>+	.attrs		= bnxt_temp_extra_attrs,</div><div class='add'>+	.is_visible	= bnxt_temp_extra_attrs_visible,</div><div class='add'>+};</div><div class='add'>+__ATTRIBUTE_GROUPS(bnxt_temp_extra);</div><div class='add'>+</div><div class='add'>+void bnxt_hwmon_uninit(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;hwmon_dev) {</div><div class='add'>+		hwmon_device_unregister(bp-&gt;hwmon_dev);</div><div class='add'>+		bp-&gt;hwmon_dev = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_hwmon_init(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* temp1_xxx is only sensor, ensure not registered if it will fail */</div><div class='add'>+	rc = bnxt_hwrm_temp_query(bp, NULL);</div><div class='add'>+	if (rc == -EACCES || rc == -EOPNOTSUPP) {</div><div class='add'>+		bnxt_hwmon_uninit(bp);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwmon_dev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	bp-&gt;hwmon_dev = hwmon_device_register_with_info(&amp;pdev-&gt;dev,</div><div class='add'>+							DRV_MODULE_NAME, bp,</div><div class='add'>+							&amp;bnxt_hwmon_chip_info,</div><div class='add'>+							bnxt_temp_extra_groups);</div><div class='add'>+	if (IS_ERR(bp-&gt;hwmon_dev)) {</div><div class='add'>+		bp-&gt;hwmon_dev = NULL;</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "Cannot register hwmon device\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h<br/>new file mode 100644<br/>index 000000000000..de54a562e06a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h</a></div><div class='hunk'>@@ -0,0 +1,30 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2023 Broadcom Limited</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef BNXT_HWMON_H</div><div class='add'>+#define BNXT_HWMON_H</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_BNXT_HWMON</div><div class='add'>+void bnxt_hwmon_notify_event(struct bnxt *bp);</div><div class='add'>+void bnxt_hwmon_uninit(struct bnxt *bp);</div><div class='add'>+void bnxt_hwmon_init(struct bnxt *bp);</div><div class='add'>+#else</div><div class='add'>+static inline void bnxt_hwmon_notify_event(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bnxt_hwmon_uninit(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bnxt_hwmon_init(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c<br/>new file mode 100644<br/>index 000000000000..5ce190f50120<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c</a></div><div class='hunk'>@@ -0,0 +1,819 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2020 Broadcom Limited</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;asm/byteorder.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/dmapool.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+</div><div class='add'>+#include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='add'>+</div><div class='add'>+static u64 hwrm_calc_sentinel(struct bnxt_hwrm_ctx *ctx, u16 req_type)</div><div class='add'>+{</div><div class='add'>+	return (((uintptr_t)ctx) + req_type) ^ BNXT_HWRM_SENTINEL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * __hwrm_req_init() - Initialize an HWRM request.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: A pointer to the request pointer to initialize.</div><div class='add'>+ * @req_type: The request type. This will be converted to the little endian</div><div class='add'>+ *	before being written to the req_type field of the returned request.</div><div class='add'>+ * @req_len: The length of the request to be allocated.</div><div class='add'>+ *</div><div class='add'>+ * Allocate DMA resources and initialize a new HWRM request object of the</div><div class='add'>+ * given type. The response address field in the request is configured with</div><div class='add'>+ * the DMA bus address that has been mapped for the response and the passed</div><div class='add'>+ * request is pointed to kernel virtual memory mapped for the request (such</div><div class='add'>+ * that short_input indirection can be accomplished without copying). The</div><div class='add'>+ * request’s target and completion ring are initialized to default values and</div><div class='add'>+ * can be overridden by writing to the returned request object directly.</div><div class='add'>+ *</div><div class='add'>+ * The initialized request can be further customized by writing to its fields</div><div class='add'>+ * directly, taking care to covert such fields to little endian. The request</div><div class='add'>+ * object will be consumed (and all its associated resources release) upon</div><div class='add'>+ * passing it to hwrm_req_send() unless ownership of the request has been</div><div class='add'>+ * claimed by the caller via a call to hwrm_req_hold(). If the request is not</div><div class='add'>+ * consumed, either because it is never sent or because ownership has been</div><div class='add'>+ * claimed, then it must be released by a call to hwrm_req_drop().</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, negative error code otherwise:</div><div class='add'>+ *	E2BIG: the type of request pointer is too large to fit.</div><div class='add'>+ *	ENOMEM: an allocation failure occurred.</div><div class='add'>+ */</div><div class='add'>+int __hwrm_req_init(struct bnxt *bp, void **req, u16 req_type, u32 req_len)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+	u8 *req_addr;</div><div class='add'>+</div><div class='add'>+	if (req_len &gt; BNXT_HWRM_CTX_OFFSET)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	req_addr = dma_pool_alloc(bp-&gt;hwrm_dma_pool, GFP_KERNEL | __GFP_ZERO,</div><div class='add'>+				  &amp;dma_handle);</div><div class='add'>+	if (!req_addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ctx = (struct bnxt_hwrm_ctx *)(req_addr + BNXT_HWRM_CTX_OFFSET);</div><div class='add'>+	/* safety first, sentinel used to check for invalid requests */</div><div class='add'>+	ctx-&gt;sentinel = hwrm_calc_sentinel(ctx, req_type);</div><div class='add'>+	ctx-&gt;req_len = req_len;</div><div class='add'>+	ctx-&gt;req = (struct input *)req_addr;</div><div class='add'>+	ctx-&gt;resp = (struct output *)(req_addr + BNXT_HWRM_RESP_OFFSET);</div><div class='add'>+	ctx-&gt;dma_handle = dma_handle;</div><div class='add'>+	ctx-&gt;flags = 0; /* __GFP_ZERO, but be explicit regarding ownership */</div><div class='add'>+	ctx-&gt;timeout = bp-&gt;hwrm_cmd_timeout ?: DFLT_HWRM_CMD_TIMEOUT;</div><div class='add'>+	ctx-&gt;allocated = BNXT_HWRM_DMA_SIZE - BNXT_HWRM_CTX_OFFSET;</div><div class='add'>+	ctx-&gt;gfp = GFP_KERNEL;</div><div class='add'>+	ctx-&gt;slice_addr = NULL;</div><div class='add'>+</div><div class='add'>+	/* initialize common request fields */</div><div class='add'>+	ctx-&gt;req-&gt;req_type = cpu_to_le16(req_type);</div><div class='add'>+	ctx-&gt;req-&gt;resp_addr = cpu_to_le64(dma_handle + BNXT_HWRM_RESP_OFFSET);</div><div class='add'>+	ctx-&gt;req-&gt;cmpl_ring = cpu_to_le16(BNXT_HWRM_NO_CMPL_RING);</div><div class='add'>+	ctx-&gt;req-&gt;target_id = cpu_to_le16(BNXT_HWRM_TARGET);</div><div class='add'>+	*req = ctx-&gt;req;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnxt_hwrm_ctx *__hwrm_ctx(struct bnxt *bp, u8 *req_addr)</div><div class='add'>+{</div><div class='add'>+	void *ctx_addr = req_addr + BNXT_HWRM_CTX_OFFSET;</div><div class='add'>+	struct input *req = (struct input *)req_addr;</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = ctx_addr;</div><div class='add'>+	u64 sentinel;</div><div class='add'>+</div><div class='add'>+	if (!req) {</div><div class='add'>+		/* can only be due to software bug, be loud */</div><div class='add'>+		netdev_err(bp-&gt;dev, "null HWRM request");</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* HWRM API has no type safety, verify sentinel to validate address */</div><div class='add'>+	sentinel = hwrm_calc_sentinel(ctx, le16_to_cpu(req-&gt;req_type));</div><div class='add'>+	if (ctx-&gt;sentinel != sentinel) {</div><div class='add'>+		/* can only be due to software bug, be loud */</div><div class='add'>+		netdev_err(bp-&gt;dev, "HWRM sentinel mismatch, req_type = %u\n",</div><div class='add'>+			   (u32)le16_to_cpu(req-&gt;req_type));</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_timeout() - Set the completion timeout for the request.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request to set the timeout.</div><div class='add'>+ * @timeout: The timeout in milliseconds.</div><div class='add'>+ *</div><div class='add'>+ * Set the timeout associated with the request for subsequent calls to</div><div class='add'>+ * hwrm_req_send(). Some requests are long running and require a different</div><div class='add'>+ * timeout than the default.</div><div class='add'>+ */</div><div class='add'>+void hwrm_req_timeout(struct bnxt *bp, void *req, unsigned int timeout)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		ctx-&gt;timeout = timeout;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_alloc_flags() - Sets GFP allocation flags for slices.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request for which calls to hwrm_req_dma_slice() will have altered</div><div class='add'>+ *	allocation flags.</div><div class='add'>+ * @gfp: A bitmask of GFP flags. These flags are passed to dma_alloc_coherent()</div><div class='add'>+ *	whenever it is used to allocate backing memory for slices. Note that</div><div class='add'>+ *	calls to hwrm_req_dma_slice() will not always result in new allocations,</div><div class='add'>+ *	however, memory suballocated from the request buffer is already</div><div class='add'>+ *	__GFP_ZERO.</div><div class='add'>+ *</div><div class='add'>+ * Sets the GFP allocation flags associated with the request for subsequent</div><div class='add'>+ * calls to hwrm_req_dma_slice(). This can be useful for specifying __GFP_ZERO</div><div class='add'>+ * for slice allocations.</div><div class='add'>+ */</div><div class='add'>+void hwrm_req_alloc_flags(struct bnxt *bp, void *req, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		ctx-&gt;gfp = gfp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_replace() - Replace request data.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request to modify. A call to hwrm_req_replace() is conceptually</div><div class='add'>+ *	an assignment of new_req to req. Subsequent calls to HWRM API functions,</div><div class='add'>+ *	such as hwrm_req_send(), should thus use req and not new_req (in fact,</div><div class='add'>+ *	calls to HWRM API functions will fail if non-managed request objects</div><div class='add'>+ *	are passed).</div><div class='add'>+ * @len: The length of new_req.</div><div class='add'>+ * @new_req: The pre-built request to copy or reference.</div><div class='add'>+ *</div><div class='add'>+ * Replaces the request data in req with that of new_req. This is useful in</div><div class='add'>+ * scenarios where a request object has already been constructed by a third</div><div class='add'>+ * party prior to creating a resource managed request using hwrm_req_init().</div><div class='add'>+ * Depending on the length, hwrm_req_replace() will either copy the new</div><div class='add'>+ * request data into the DMA memory allocated for req, or it will simply</div><div class='add'>+ * reference the new request and use it in lieu of req during subsequent</div><div class='add'>+ * calls to hwrm_req_send(). The resource management is associated with</div><div class='add'>+ * req and is independent of and does not apply to new_req. The caller must</div><div class='add'>+ * ensure that the lifetime of new_req is least as long as req. Any slices</div><div class='add'>+ * that may have been associated with the original request are released.</div><div class='add'>+ *</div><div class='add'>+ * Return: zero on success, negative error code otherwise:</div><div class='add'>+ *     E2BIG: Request is too large.</div><div class='add'>+ *     EINVAL: Invalid request to modify.</div><div class='add'>+ */</div><div class='add'>+int hwrm_req_replace(struct bnxt *bp, void *req, void *new_req, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+	struct input *internal_req = req;</div><div class='add'>+	u16 req_type;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (len &gt; BNXT_HWRM_CTX_OFFSET)</div><div class='add'>+		return -E2BIG;</div><div class='add'>+</div><div class='add'>+	/* free any existing slices */</div><div class='add'>+	ctx-&gt;allocated = BNXT_HWRM_DMA_SIZE - BNXT_HWRM_CTX_OFFSET;</div><div class='add'>+	if (ctx-&gt;slice_addr) {</div><div class='add'>+		dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, ctx-&gt;slice_size,</div><div class='add'>+				  ctx-&gt;slice_addr, ctx-&gt;slice_handle);</div><div class='add'>+		ctx-&gt;slice_addr = NULL;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;gfp = GFP_KERNEL;</div><div class='add'>+</div><div class='add'>+	if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_SHORT_CMD) || len &gt; BNXT_HWRM_MAX_REQ_LEN) {</div><div class='add'>+		memcpy(internal_req, new_req, len);</div><div class='add'>+	} else {</div><div class='add'>+		internal_req-&gt;req_type = ((struct input *)new_req)-&gt;req_type;</div><div class='add'>+		ctx-&gt;req = new_req;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;req_len = len;</div><div class='add'>+	ctx-&gt;req-&gt;resp_addr = cpu_to_le64(ctx-&gt;dma_handle +</div><div class='add'>+					  BNXT_HWRM_RESP_OFFSET);</div><div class='add'>+</div><div class='add'>+	/* update sentinel for potentially new request type */</div><div class='add'>+	req_type = le16_to_cpu(internal_req-&gt;req_type);</div><div class='add'>+	ctx-&gt;sentinel = hwrm_calc_sentinel(ctx, req_type);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_flags() - Set non internal flags of the ctx</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request containing the HWRM command</div><div class='add'>+ * @flags: ctx flags that don't have BNXT_HWRM_INTERNAL_FLAG set</div><div class='add'>+ *</div><div class='add'>+ * ctx flags can be used by the callers to instruct how the subsequent</div><div class='add'>+ * hwrm_req_send() should behave. Example: callers can use hwrm_req_flags</div><div class='add'>+ * with BNXT_HWRM_CTX_SILENT to omit kernel prints of errors of hwrm_req_send()</div><div class='add'>+ * or with BNXT_HWRM_FULL_WAIT enforce hwrm_req_send() to wait for full timeout</div><div class='add'>+ * even if FW is not responding.</div><div class='add'>+ * This generic function can be used to set any flag that is not an internal flag</div><div class='add'>+ * of the HWRM module.</div><div class='add'>+ */</div><div class='add'>+void hwrm_req_flags(struct bnxt *bp, void *req, enum bnxt_hwrm_ctx_flags flags)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		ctx-&gt;flags |= (flags &amp; HWRM_API_FLAGS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_hold() - Claim ownership of the request's resources.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: A pointer to the request to own. The request will no longer be</div><div class='add'>+ *	consumed by calls to hwrm_req_send().</div><div class='add'>+ *</div><div class='add'>+ * Take ownership of the request. Ownership places responsibility on the</div><div class='add'>+ * caller to free the resources associated with the request via a call to</div><div class='add'>+ * hwrm_req_drop(). The caller taking ownership implies that a subsequent</div><div class='add'>+ * call to hwrm_req_send() will not consume the request (ie. sending will</div><div class='add'>+ * not free the associated resources if the request is owned by the caller).</div><div class='add'>+ * Taking ownership returns a reference to the response. Retaining and</div><div class='add'>+ * accessing the response data is the most common reason to take ownership</div><div class='add'>+ * of the request. Ownership can also be acquired in order to reuse the same</div><div class='add'>+ * request object across multiple invocations of hwrm_req_send().</div><div class='add'>+ *</div><div class='add'>+ * Return: A pointer to the response object.</div><div class='add'>+ *</div><div class='add'>+ * The resources associated with the response will remain available to the</div><div class='add'>+ * caller until ownership of the request is relinquished via a call to</div><div class='add'>+ * hwrm_req_drop(). It is not possible for hwrm_req_hold() to return NULL if</div><div class='add'>+ * a valid request is provided. A returned NULL value would imply a driver</div><div class='add'>+ * bug and the implementation will complain loudly in the logs to aid in</div><div class='add'>+ * detection. It should not be necessary to check the result for NULL.</div><div class='add'>+ */</div><div class='add'>+void *hwrm_req_hold(struct bnxt *bp, void *req)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+	struct input *input = (struct input *)req;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flags &amp; BNXT_HWRM_INTERNAL_CTX_OWNED) {</div><div class='add'>+		/* can only be due to software bug, be loud */</div><div class='add'>+		netdev_err(bp-&gt;dev, "HWRM context already owned, req_type = %u\n",</div><div class='add'>+			   (u32)le16_to_cpu(input-&gt;req_type));</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ctx-&gt;flags |= BNXT_HWRM_INTERNAL_CTX_OWNED;</div><div class='add'>+	return ((u8 *)req) + BNXT_HWRM_RESP_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __hwrm_ctx_drop(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	void *addr = ((u8 *)ctx) - BNXT_HWRM_CTX_OFFSET;</div><div class='add'>+	dma_addr_t dma_handle = ctx-&gt;dma_handle; /* save before invalidate */</div><div class='add'>+</div><div class='add'>+	/* unmap any auxiliary DMA slice */</div><div class='add'>+	if (ctx-&gt;slice_addr)</div><div class='add'>+		dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, ctx-&gt;slice_size,</div><div class='add'>+				  ctx-&gt;slice_addr, ctx-&gt;slice_handle);</div><div class='add'>+</div><div class='add'>+	/* invalidate, ensure ownership, sentinel and dma_handle are cleared */</div><div class='add'>+	memset(ctx, 0, sizeof(struct bnxt_hwrm_ctx));</div><div class='add'>+</div><div class='add'>+	/* return the buffer to the DMA pool */</div><div class='add'>+	if (dma_handle)</div><div class='add'>+		dma_pool_free(bp-&gt;hwrm_dma_pool, addr, dma_handle);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_drop() - Release all resources associated with the request.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request to consume, releasing the associated resources. The</div><div class='add'>+ *	request object, any slices, and its associated response are no</div><div class='add'>+ *	longer valid.</div><div class='add'>+ *</div><div class='add'>+ * It is legal to call hwrm_req_drop() on an unowned request, provided it</div><div class='add'>+ * has not already been consumed by hwrm_req_send() (for example, to release</div><div class='add'>+ * an aborted request). A given request should not be dropped more than once,</div><div class='add'>+ * nor should it be dropped after having been consumed by hwrm_req_send(). To</div><div class='add'>+ * do so is an error (the context will not be found and a stack trace will be</div><div class='add'>+ * rendered in the kernel log).</div><div class='add'>+ */</div><div class='add'>+void hwrm_req_drop(struct bnxt *bp, void *req)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+</div><div class='add'>+	if (ctx)</div><div class='add'>+		__hwrm_ctx_drop(bp, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __hwrm_to_stderr(u32 hwrm_err)</div><div class='add'>+{</div><div class='add'>+	switch (hwrm_err) {</div><div class='add'>+	case HWRM_ERR_CODE_SUCCESS:</div><div class='add'>+		return 0;</div><div class='add'>+	case HWRM_ERR_CODE_RESOURCE_LOCKED:</div><div class='add'>+		return -EROFS;</div><div class='add'>+	case HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED:</div><div class='add'>+		return -EACCES;</div><div class='add'>+	case HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR:</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	case HWRM_ERR_CODE_INVALID_PARAMS:</div><div class='add'>+	case HWRM_ERR_CODE_INVALID_FLAGS:</div><div class='add'>+	case HWRM_ERR_CODE_INVALID_ENABLES:</div><div class='add'>+	case HWRM_ERR_CODE_UNSUPPORTED_TLV:</div><div class='add'>+	case HWRM_ERR_CODE_UNSUPPORTED_OPTION_ERR:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	case HWRM_ERR_CODE_NO_BUFFER:</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	case HWRM_ERR_CODE_HOT_RESET_PROGRESS:</div><div class='add'>+	case HWRM_ERR_CODE_BUSY:</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+	case HWRM_ERR_CODE_CMD_NOT_SUPPORTED:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	case HWRM_ERR_CODE_PF_UNAVAILABLE:</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	default:</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnxt_hwrm_wait_token *</div><div class='add'>+__hwrm_acquire_token(struct bnxt *bp, enum bnxt_hwrm_chnl dst)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_wait_token *token;</div><div class='add'>+</div><div class='add'>+	token = kzalloc(sizeof(*token), GFP_KERNEL);</div><div class='add'>+	if (!token)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+</div><div class='add'>+	token-&gt;dst = dst;</div><div class='add'>+	token-&gt;state = BNXT_HWRM_PENDING;</div><div class='add'>+	if (dst == BNXT_HWRM_CHNL_CHIMP) {</div><div class='add'>+		token-&gt;seq_id = bp-&gt;hwrm_cmd_seq++;</div><div class='add'>+		hlist_add_head_rcu(&amp;token-&gt;node, &amp;bp-&gt;hwrm_pending_list);</div><div class='add'>+	} else {</div><div class='add'>+		token-&gt;seq_id = bp-&gt;hwrm_cmd_kong_seq++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return token;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void</div><div class='add'>+__hwrm_release_token(struct bnxt *bp, struct bnxt_hwrm_wait_token *token)</div><div class='add'>+{</div><div class='add'>+	if (token-&gt;dst == BNXT_HWRM_CHNL_CHIMP) {</div><div class='add'>+		hlist_del_rcu(&amp;token-&gt;node);</div><div class='add'>+		kfree_rcu(token, rcu);</div><div class='add'>+	} else {</div><div class='add'>+		kfree(token);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void</div><div class='add'>+hwrm_update_token(struct bnxt *bp, u16 seq_id, enum bnxt_hwrm_wait_state state)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_wait_token *token;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	hlist_for_each_entry_rcu(token, &amp;bp-&gt;hwrm_pending_list, node) {</div><div class='add'>+		if (token-&gt;seq_id == seq_id) {</div><div class='add'>+			WRITE_ONCE(token-&gt;state, state);</div><div class='add'>+			rcu_read_unlock();</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	netdev_err(bp-&gt;dev, "Invalid hwrm seq id %d\n", seq_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void hwrm_req_dbg(struct bnxt *bp, struct input *req)</div><div class='add'>+{</div><div class='add'>+	u32 ring = le16_to_cpu(req-&gt;cmpl_ring);</div><div class='add'>+	u32 type = le16_to_cpu(req-&gt;req_type);</div><div class='add'>+	u32 tgt = le16_to_cpu(req-&gt;target_id);</div><div class='add'>+	u32 seq = le16_to_cpu(req-&gt;seq_id);</div><div class='add'>+	char opt[32] = "\n";</div><div class='add'>+</div><div class='add'>+	if (unlikely(ring != (u16)BNXT_HWRM_NO_CMPL_RING))</div><div class='add'>+		snprintf(opt, 16, " ring %d\n", ring);</div><div class='add'>+</div><div class='add'>+	if (unlikely(tgt != BNXT_HWRM_TARGET))</div><div class='add'>+		snprintf(opt + strlen(opt) - 1, 16, " tgt 0x%x\n", tgt);</div><div class='add'>+</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "sent hwrm req_type 0x%x seq id 0x%x%s",</div><div class='add'>+		   type, seq, opt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define hwrm_err(bp, ctx, fmt, ...)				       \</div><div class='add'>+	do {							       \</div><div class='add'>+		if ((ctx)-&gt;flags &amp; BNXT_HWRM_CTX_SILENT)	       \</div><div class='add'>+			netdev_dbg((bp)-&gt;dev, fmt, __VA_ARGS__);       \</div><div class='add'>+		else						       \</div><div class='add'>+			netdev_err((bp)-&gt;dev, fmt, __VA_ARGS__);       \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+static bool hwrm_wait_must_abort(struct bnxt *bp, u32 req_type, u32 *fw_status)</div><div class='add'>+{</div><div class='add'>+	if (req_type == HWRM_VER_GET)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;fw_health || !bp-&gt;fw_health-&gt;status_reliable)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	*fw_status = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG);</div><div class='add'>+	return *fw_status &amp;&amp; !BNXT_FW_IS_HEALTHY(*fw_status);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)</div><div class='add'>+{</div><div class='add'>+	u32 doorbell_offset = BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER;</div><div class='add'>+	enum bnxt_hwrm_chnl dst = BNXT_HWRM_CHNL_CHIMP;</div><div class='add'>+	u32 bar_offset = BNXT_GRCPF_REG_CHIMP_COMM;</div><div class='add'>+	struct bnxt_hwrm_wait_token *token = NULL;</div><div class='add'>+	struct hwrm_short_input short_input = {0};</div><div class='add'>+	u16 max_req_len = BNXT_HWRM_MAX_REQ_LEN;</div><div class='add'>+	unsigned int i, timeout, tmo_count;</div><div class='add'>+	u32 *data = (u32 *)ctx-&gt;req;</div><div class='add'>+	u32 msg_len = ctx-&gt;req_len;</div><div class='add'>+	u32 req_type, sts;</div><div class='add'>+	int rc = -EBUSY;</div><div class='add'>+	u16 len = 0;</div><div class='add'>+	u8 *valid;</div><div class='add'>+</div><div class='add'>+	if (ctx-&gt;flags &amp; BNXT_HWRM_INTERNAL_RESP_DIRTY)</div><div class='add'>+		memset(ctx-&gt;resp, 0, PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+	req_type = le16_to_cpu(ctx-&gt;req-&gt;req_type);</div><div class='add'>+	if (BNXT_NO_FW_ACCESS(bp) &amp;&amp;</div><div class='add'>+	    (req_type != HWRM_FUNC_RESET &amp;&amp; req_type != HWRM_VER_GET)) {</div><div class='add'>+		netdev_dbg(bp-&gt;dev, "hwrm req_type 0x%x skipped, FW channel down\n",</div><div class='add'>+			   req_type);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (msg_len &gt; BNXT_HWRM_MAX_REQ_LEN &amp;&amp;</div><div class='add'>+	    msg_len &gt; bp-&gt;hwrm_max_ext_req_len) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "oversized hwrm request, req_type 0x%x",</div><div class='add'>+			    req_type);</div><div class='add'>+		rc = -E2BIG;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (bnxt_kong_hwrm_message(bp, ctx-&gt;req)) {</div><div class='add'>+		dst = BNXT_HWRM_CHNL_KONG;</div><div class='add'>+		bar_offset = BNXT_GRCPF_REG_KONG_COMM;</div><div class='add'>+		doorbell_offset = BNXT_GRCPF_REG_KONG_COMM_TRIGGER;</div><div class='add'>+		if (le16_to_cpu(ctx-&gt;req-&gt;cmpl_ring) != INVALID_HW_RING_ID) {</div><div class='add'>+			netdev_err(bp-&gt;dev, "Ring completions not supported for KONG commands, req_type = %d\n",</div><div class='add'>+				   req_type);</div><div class='add'>+			rc = -EINVAL;</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	token = __hwrm_acquire_token(bp, dst);</div><div class='add'>+	if (!token) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+	ctx-&gt;req-&gt;seq_id = cpu_to_le16(token-&gt;seq_id);</div><div class='add'>+</div><div class='add'>+	if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_SHORT_CMD) ||</div><div class='add'>+	    msg_len &gt; BNXT_HWRM_MAX_REQ_LEN) {</div><div class='add'>+		short_input.req_type = ctx-&gt;req-&gt;req_type;</div><div class='add'>+		short_input.signature =</div><div class='add'>+				cpu_to_le16(SHORT_REQ_SIGNATURE_SHORT_CMD);</div><div class='add'>+		short_input.size = cpu_to_le16(msg_len);</div><div class='add'>+		short_input.req_addr = cpu_to_le64(ctx-&gt;dma_handle);</div><div class='add'>+</div><div class='add'>+		data = (u32 *)&amp;short_input;</div><div class='add'>+		msg_len = sizeof(short_input);</div><div class='add'>+</div><div class='add'>+		max_req_len = BNXT_HWRM_SHORT_REQ_LEN;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Ensure any associated DMA buffers are written before doorbell */</div><div class='add'>+	wmb();</div><div class='add'>+</div><div class='add'>+	/* Write request msg to hwrm channel */</div><div class='add'>+	__iowrite32_copy(bp-&gt;bar0 + bar_offset, data, msg_len / 4);</div><div class='add'>+</div><div class='add'>+	for (i = msg_len; i &lt; max_req_len; i += 4)</div><div class='add'>+		writel(0, bp-&gt;bar0 + bar_offset + i);</div><div class='add'>+</div><div class='add'>+	/* Ring channel doorbell */</div><div class='add'>+	writel(1, bp-&gt;bar0 + doorbell_offset);</div><div class='add'>+</div><div class='add'>+	hwrm_req_dbg(bp, ctx-&gt;req);</div><div class='add'>+</div><div class='add'>+	if (!pci_is_enabled(bp-&gt;pdev)) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Limit timeout to an upper limit */</div><div class='add'>+	timeout = min(ctx-&gt;timeout, bp-&gt;hwrm_cmd_max_timeout ?: HWRM_CMD_MAX_TIMEOUT);</div><div class='add'>+	/* convert timeout to usec */</div><div class='add'>+	timeout *= 1000;</div><div class='add'>+</div><div class='add'>+	i = 0;</div><div class='add'>+	/* Short timeout for the first few iterations:</div><div class='add'>+	 * number of loops = number of loops for short timeout +</div><div class='add'>+	 * number of loops for standard timeout.</div><div class='add'>+	 */</div><div class='add'>+	tmo_count = HWRM_SHORT_TIMEOUT_COUNTER;</div><div class='add'>+	timeout = timeout - HWRM_SHORT_MIN_TIMEOUT * HWRM_SHORT_TIMEOUT_COUNTER;</div><div class='add'>+	tmo_count += DIV_ROUND_UP(timeout, HWRM_MIN_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(ctx-&gt;req-&gt;cmpl_ring) != INVALID_HW_RING_ID) {</div><div class='add'>+		/* Wait until hwrm response cmpl interrupt is processed */</div><div class='add'>+		while (READ_ONCE(token-&gt;state) &lt; BNXT_HWRM_COMPLETE &amp;&amp;</div><div class='add'>+		       i++ &lt; tmo_count) {</div><div class='add'>+			/* Abort the wait for completion if the FW health</div><div class='add'>+			 * check has failed.</div><div class='add'>+			 */</div><div class='add'>+			if (test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state))</div><div class='add'>+				goto exit;</div><div class='add'>+			/* on first few passes, just barely sleep */</div><div class='add'>+			if (i &lt; HWRM_SHORT_TIMEOUT_COUNTER) {</div><div class='add'>+				usleep_range(HWRM_SHORT_MIN_TIMEOUT,</div><div class='add'>+					     HWRM_SHORT_MAX_TIMEOUT);</div><div class='add'>+			} else {</div><div class='add'>+				if (hwrm_wait_must_abort(bp, req_type, &amp;sts)) {</div><div class='add'>+					hwrm_err(bp, ctx, "Resp cmpl intr abandoning msg: 0x%x due to firmware status: 0x%x\n",</div><div class='add'>+						 req_type, sts);</div><div class='add'>+					goto exit;</div><div class='add'>+				}</div><div class='add'>+				usleep_range(HWRM_MIN_TIMEOUT,</div><div class='add'>+					     HWRM_MAX_TIMEOUT);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(token-&gt;state) != BNXT_HWRM_COMPLETE) {</div><div class='add'>+			hwrm_err(bp, ctx, "Resp cmpl intr err msg: 0x%x\n",</div><div class='add'>+				 req_type);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+		len = le16_to_cpu(READ_ONCE(ctx-&gt;resp-&gt;resp_len));</div><div class='add'>+		valid = ((u8 *)ctx-&gt;resp) + len - 1;</div><div class='add'>+	} else {</div><div class='add'>+		__le16 seen_out_of_seq = ctx-&gt;req-&gt;seq_id; /* will never see */</div><div class='add'>+		int j;</div><div class='add'>+</div><div class='add'>+		/* Check if response len is updated */</div><div class='add'>+		for (i = 0; i &lt; tmo_count; i++) {</div><div class='add'>+			/* Abort the wait for completion if the FW health</div><div class='add'>+			 * check has failed.</div><div class='add'>+			 */</div><div class='add'>+			if (test_bit(BNXT_STATE_FW_FATAL_COND, &amp;bp-&gt;state))</div><div class='add'>+				goto exit;</div><div class='add'>+</div><div class='add'>+			if (token &amp;&amp;</div><div class='add'>+			    READ_ONCE(token-&gt;state) == BNXT_HWRM_DEFERRED) {</div><div class='add'>+				__hwrm_release_token(bp, token);</div><div class='add'>+				token = NULL;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			len = le16_to_cpu(READ_ONCE(ctx-&gt;resp-&gt;resp_len));</div><div class='add'>+			if (len) {</div><div class='add'>+				__le16 resp_seq = READ_ONCE(ctx-&gt;resp-&gt;seq_id);</div><div class='add'>+</div><div class='add'>+				if (resp_seq == ctx-&gt;req-&gt;seq_id)</div><div class='add'>+					break;</div><div class='add'>+				if (resp_seq != seen_out_of_seq) {</div><div class='add'>+					netdev_warn(bp-&gt;dev, "Discarding out of seq response: 0x%x for msg {0x%x 0x%x}\n",</div><div class='add'>+						    le16_to_cpu(resp_seq),</div><div class='add'>+						    req_type,</div><div class='add'>+						    le16_to_cpu(ctx-&gt;req-&gt;seq_id));</div><div class='add'>+					seen_out_of_seq = resp_seq;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* on first few passes, just barely sleep */</div><div class='add'>+			if (i &lt; HWRM_SHORT_TIMEOUT_COUNTER) {</div><div class='add'>+				usleep_range(HWRM_SHORT_MIN_TIMEOUT,</div><div class='add'>+					     HWRM_SHORT_MAX_TIMEOUT);</div><div class='add'>+			} else {</div><div class='add'>+				if (hwrm_wait_must_abort(bp, req_type, &amp;sts)) {</div><div class='add'>+					hwrm_err(bp, ctx, "Abandoning msg {0x%x 0x%x} len: %d due to firmware status: 0x%x\n",</div><div class='add'>+						 req_type,</div><div class='add'>+						 le16_to_cpu(ctx-&gt;req-&gt;seq_id),</div><div class='add'>+						 len, sts);</div><div class='add'>+					goto exit;</div><div class='add'>+				}</div><div class='add'>+				usleep_range(HWRM_MIN_TIMEOUT,</div><div class='add'>+					     HWRM_MAX_TIMEOUT);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (i &gt;= tmo_count) {</div><div class='add'>+			hwrm_err(bp, ctx, "Error (timeout: %u) msg {0x%x 0x%x} len:%d\n",</div><div class='add'>+				 hwrm_total_timeout(i), req_type,</div><div class='add'>+				 le16_to_cpu(ctx-&gt;req-&gt;seq_id), len);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Last byte of resp contains valid bit */</div><div class='add'>+		valid = ((u8 *)ctx-&gt;resp) + len - 1;</div><div class='add'>+		for (j = 0; j &lt; HWRM_VALID_BIT_DELAY_USEC; ) {</div><div class='add'>+			/* make sure we read from updated DMA memory */</div><div class='add'>+			dma_rmb();</div><div class='add'>+			if (*valid)</div><div class='add'>+				break;</div><div class='add'>+			if (j &lt; 10) {</div><div class='add'>+				udelay(1);</div><div class='add'>+				j++;</div><div class='add'>+			} else {</div><div class='add'>+				usleep_range(20, 30);</div><div class='add'>+				j += 20;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (j &gt;= HWRM_VALID_BIT_DELAY_USEC) {</div><div class='add'>+			hwrm_err(bp, ctx, "Error (timeout: %u) msg {0x%x 0x%x} len:%d v:%d\n",</div><div class='add'>+				 hwrm_total_timeout(i) + j, req_type,</div><div class='add'>+				 le16_to_cpu(ctx-&gt;req-&gt;seq_id), len, *valid);</div><div class='add'>+			goto exit;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Zero valid bit for compatibility.  Valid bit in an older spec</div><div class='add'>+	 * may become a new field in a newer spec.  We must make sure that</div><div class='add'>+	 * a new field not implemented by old spec will read zero.</div><div class='add'>+	 */</div><div class='add'>+	*valid = 0;</div><div class='add'>+	rc = le16_to_cpu(ctx-&gt;resp-&gt;error_code);</div><div class='add'>+	if (rc == HWRM_ERR_CODE_BUSY &amp;&amp; !(ctx-&gt;flags &amp; BNXT_HWRM_CTX_SILENT))</div><div class='add'>+		netdev_warn(bp-&gt;dev, "FW returned busy, hwrm req_type 0x%x\n",</div><div class='add'>+			    req_type);</div><div class='add'>+	else if (rc &amp;&amp; rc != HWRM_ERR_CODE_PF_UNAVAILABLE)</div><div class='add'>+		hwrm_err(bp, ctx, "hwrm req_type 0x%x seq id 0x%x error 0x%x\n",</div><div class='add'>+			 req_type, le16_to_cpu(ctx-&gt;req-&gt;seq_id), rc);</div><div class='add'>+	rc = __hwrm_to_stderr(rc);</div><div class='add'>+exit:</div><div class='add'>+	if (token)</div><div class='add'>+		__hwrm_release_token(bp, token);</div><div class='add'>+	if (ctx-&gt;flags &amp; BNXT_HWRM_INTERNAL_CTX_OWNED)</div><div class='add'>+		ctx-&gt;flags |= BNXT_HWRM_INTERNAL_RESP_DIRTY;</div><div class='add'>+	else</div><div class='add'>+		__hwrm_ctx_drop(bp, ctx);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_send() - Execute an HWRM command.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: A pointer to the request to send. The DMA resources associated with</div><div class='add'>+ *	the request will be released (ie. the request will be consumed) unless</div><div class='add'>+ *	ownership of the request has been assumed by the caller via a call to</div><div class='add'>+ *	hwrm_req_hold().</div><div class='add'>+ *</div><div class='add'>+ * Send an HWRM request to the device and wait for a response. The request is</div><div class='add'>+ * consumed if it is not owned by the caller. This function will block until</div><div class='add'>+ * the request has either completed or times out due to an error.</div><div class='add'>+ *</div><div class='add'>+ * Return: A result code.</div><div class='add'>+ *</div><div class='add'>+ * The result is zero on success, otherwise the negative error code indicates</div><div class='add'>+ * one of the following errors:</div><div class='add'>+ *	E2BIG: The request was too large.</div><div class='add'>+ *	EBUSY: The firmware is in a fatal state or the request timed out</div><div class='add'>+ *	EACCESS: HWRM access denied.</div><div class='add'>+ *	ENOSPC: HWRM resource allocation error.</div><div class='add'>+ *	EINVAL: Request parameters are invalid.</div><div class='add'>+ *	ENOMEM: HWRM has no buffers.</div><div class='add'>+ *	EAGAIN: HWRM busy or reset in progress.</div><div class='add'>+ *	EOPNOTSUPP: Invalid request type.</div><div class='add'>+ *	EIO: Any other error.</div><div class='add'>+ * Error handling is orthogonal to request ownership. An unowned request will</div><div class='add'>+ * still be consumed on error. If the caller owns the request, then the caller</div><div class='add'>+ * is responsible for releasing the resources. Otherwise, hwrm_req_send() will</div><div class='add'>+ * always consume the request.</div><div class='add'>+ */</div><div class='add'>+int hwrm_req_send(struct bnxt *bp, void *req)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return __hwrm_send(bp, ctx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_send_silent() - A silent version of hwrm_req_send().</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request to send without logging.</div><div class='add'>+ *</div><div class='add'>+ * The same as hwrm_req_send(), except that the request is silenced using</div><div class='add'>+ * hwrm_req_silence() prior the call. This version of the function is</div><div class='add'>+ * provided solely to preserve the legacy API’s flavor for this functionality.</div><div class='add'>+ *</div><div class='add'>+ * Return: A result code, see hwrm_req_send().</div><div class='add'>+ */</div><div class='add'>+int hwrm_req_send_silent(struct bnxt *bp, void *req)</div><div class='add'>+{</div><div class='add'>+	hwrm_req_flags(bp, req, BNXT_HWRM_CTX_SILENT);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * hwrm_req_dma_slice() - Allocate a slice of DMA mapped memory.</div><div class='add'>+ * @bp: The driver context.</div><div class='add'>+ * @req: The request for which indirect data will be associated.</div><div class='add'>+ * @size: The size of the allocation.</div><div class='add'>+ * @dma_handle: The bus address associated with the allocation. The HWRM API has</div><div class='add'>+ *	no knowledge about the type of the request and so cannot infer how the</div><div class='add'>+ *	caller intends to use the indirect data. Thus, the caller is</div><div class='add'>+ *	responsible for configuring the request object appropriately to</div><div class='add'>+ *	point to the associated indirect memory. Note, DMA handle has the</div><div class='add'>+ *	same definition as it does in dma_alloc_coherent(), the caller is</div><div class='add'>+ *	responsible for endian conversions via cpu_to_le64() before assigning</div><div class='add'>+ *	this address.</div><div class='add'>+ *</div><div class='add'>+ * Allocates DMA mapped memory for indirect data related to a request. The</div><div class='add'>+ * lifetime of the DMA resources will be bound to that of the request (ie.</div><div class='add'>+ * they will be automatically released when the request is either consumed by</div><div class='add'>+ * hwrm_req_send() or dropped by hwrm_req_drop()). Small allocations are</div><div class='add'>+ * efficiently suballocated out of the request buffer space, hence the name</div><div class='add'>+ * slice, while larger requests are satisfied via an underlying call to</div><div class='add'>+ * dma_alloc_coherent(). Multiple suballocations are supported, however, only</div><div class='add'>+ * one externally mapped region is.</div><div class='add'>+ *</div><div class='add'>+ * Return: The kernel virtual address of the DMA mapping.</div><div class='add'>+ */</div><div class='add'>+void *</div><div class='add'>+hwrm_req_dma_slice(struct bnxt *bp, void *req, u32 size, dma_addr_t *dma_handle)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_hwrm_ctx *ctx = __hwrm_ctx(bp, req);</div><div class='add'>+	u8 *end = ((u8 *)req) + BNXT_HWRM_DMA_SIZE;</div><div class='add'>+	struct input *input = req;</div><div class='add'>+	u8 *addr, *req_addr = req;</div><div class='add'>+	u32 max_offset, offset;</div><div class='add'>+</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	max_offset = BNXT_HWRM_DMA_SIZE - ctx-&gt;allocated;</div><div class='add'>+	offset = max_offset - size;</div><div class='add'>+	offset = ALIGN_DOWN(offset, BNXT_HWRM_DMA_ALIGN);</div><div class='add'>+	addr = req_addr + offset;</div><div class='add'>+</div><div class='add'>+	if (addr &lt; req_addr + max_offset &amp;&amp; req_addr + ctx-&gt;req_len &lt;= addr) {</div><div class='add'>+		ctx-&gt;allocated = end - addr;</div><div class='add'>+		*dma_handle = ctx-&gt;dma_handle + offset;</div><div class='add'>+		return addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* could not suballocate from ctx buffer, try create a new mapping */</div><div class='add'>+	if (ctx-&gt;slice_addr) {</div><div class='add'>+		/* if one exists, can only be due to software bug, be loud */</div><div class='add'>+		netdev_err(bp-&gt;dev, "HWRM refusing to reallocate DMA slice, req_type = %u\n",</div><div class='add'>+			   (u32)le16_to_cpu(input-&gt;req_type));</div><div class='add'>+		dump_stack();</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	addr = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, size, dma_handle, ctx-&gt;gfp);</div><div class='add'>+</div><div class='add'>+	if (!addr)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	ctx-&gt;slice_addr = addr;</div><div class='add'>+	ctx-&gt;slice_size = size;</div><div class='add'>+	ctx-&gt;slice_handle = *dma_handle;</div><div class='add'>+</div><div class='add'>+	return addr;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h<br/>new file mode 100644<br/>index 000000000000..791b3a0cdb83<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.h</a></div><div class='hunk'>@@ -0,0 +1,154 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2020 Broadcom Limited</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef BNXT_HWRM_H</div><div class='add'>+#define BNXT_HWRM_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+</div><div class='add'>+enum bnxt_hwrm_ctx_flags {</div><div class='add'>+	/* Update the HWRM_API_FLAGS right below for any new non-internal bit added here */</div><div class='add'>+	BNXT_HWRM_INTERNAL_CTX_OWNED	= BIT(0), /* caller owns the context */</div><div class='add'>+	BNXT_HWRM_INTERNAL_RESP_DIRTY	= BIT(1), /* response contains data */</div><div class='add'>+	BNXT_HWRM_CTX_SILENT		= BIT(2), /* squelch firmware errors */</div><div class='add'>+	BNXT_HWRM_FULL_WAIT		= BIT(3), /* wait for full timeout of HWRM command */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define HWRM_API_FLAGS (BNXT_HWRM_CTX_SILENT | BNXT_HWRM_FULL_WAIT)</div><div class='add'>+</div><div class='add'>+struct bnxt_hwrm_ctx {</div><div class='add'>+	u64 sentinel;</div><div class='add'>+	dma_addr_t dma_handle;</div><div class='add'>+	struct output *resp;</div><div class='add'>+	struct input *req;</div><div class='add'>+	dma_addr_t slice_handle;</div><div class='add'>+	void *slice_addr;</div><div class='add'>+	u32 slice_size;</div><div class='add'>+	u32 req_len;</div><div class='add'>+	enum bnxt_hwrm_ctx_flags flags;</div><div class='add'>+	unsigned int timeout;</div><div class='add'>+	u32 allocated;</div><div class='add'>+	gfp_t gfp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnxt_hwrm_wait_state {</div><div class='add'>+	BNXT_HWRM_PENDING,</div><div class='add'>+	BNXT_HWRM_DEFERRED,</div><div class='add'>+	BNXT_HWRM_COMPLETE,</div><div class='add'>+	BNXT_HWRM_CANCELLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum bnxt_hwrm_chnl { BNXT_HWRM_CHNL_CHIMP, BNXT_HWRM_CHNL_KONG };</div><div class='add'>+</div><div class='add'>+struct bnxt_hwrm_wait_token {</div><div class='add'>+	struct rcu_head rcu;</div><div class='add'>+	struct hlist_node node;</div><div class='add'>+	enum bnxt_hwrm_wait_state state;</div><div class='add'>+	enum bnxt_hwrm_chnl dst;</div><div class='add'>+	u16 seq_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void hwrm_update_token(struct bnxt *bp, u16 seq, enum bnxt_hwrm_wait_state s);</div><div class='add'>+</div><div class='add'>+#define BNXT_HWRM_MAX_REQ_LEN		(bp-&gt;hwrm_max_req_len)</div><div class='add'>+#define BNXT_HWRM_SHORT_REQ_LEN		sizeof(struct hwrm_short_input)</div><div class='add'>+#define HWRM_CMD_MAX_TIMEOUT		60000U</div><div class='add'>+#define SHORT_HWRM_CMD_TIMEOUT		20</div><div class='add'>+#define HWRM_CMD_TIMEOUT		(bp-&gt;hwrm_cmd_timeout)</div><div class='add'>+#define HWRM_RESET_TIMEOUT		((HWRM_CMD_TIMEOUT) * 4)</div><div class='add'>+#define BNXT_HWRM_TARGET		0xffff</div><div class='add'>+#define BNXT_HWRM_NO_CMPL_RING		-1</div><div class='add'>+#define BNXT_HWRM_REQ_MAX_SIZE		128</div><div class='add'>+#define BNXT_HWRM_DMA_SIZE		(2 * PAGE_SIZE) /* space for req+resp */</div><div class='add'>+#define BNXT_HWRM_RESP_RESERVED		PAGE_SIZE</div><div class='add'>+#define BNXT_HWRM_RESP_OFFSET		(BNXT_HWRM_DMA_SIZE -		\</div><div class='add'>+					 BNXT_HWRM_RESP_RESERVED)</div><div class='add'>+#define BNXT_HWRM_CTX_OFFSET		(BNXT_HWRM_RESP_OFFSET -	\</div><div class='add'>+					 sizeof(struct bnxt_hwrm_ctx))</div><div class='add'>+#define BNXT_HWRM_DMA_ALIGN		16</div><div class='add'>+#define BNXT_HWRM_SENTINEL		0xb6e1f68a12e9a7eb /* arbitrary value */</div><div class='add'>+#define BNXT_HWRM_REQS_PER_PAGE		(BNXT_PAGE_SIZE /	\</div><div class='add'>+					 BNXT_HWRM_REQ_MAX_SIZE)</div><div class='add'>+#define HWRM_SHORT_MIN_TIMEOUT		3</div><div class='add'>+#define HWRM_SHORT_MAX_TIMEOUT		10</div><div class='add'>+#define HWRM_SHORT_TIMEOUT_COUNTER	5</div><div class='add'>+</div><div class='add'>+#define HWRM_MIN_TIMEOUT		25</div><div class='add'>+#define HWRM_MAX_TIMEOUT		40</div><div class='add'>+</div><div class='add'>+static inline unsigned int hwrm_total_timeout(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	return n &lt;= HWRM_SHORT_TIMEOUT_COUNTER ? n * HWRM_SHORT_MIN_TIMEOUT :</div><div class='add'>+		HWRM_SHORT_TIMEOUT_COUNTER * HWRM_SHORT_MIN_TIMEOUT +</div><div class='add'>+		(n - HWRM_SHORT_TIMEOUT_COUNTER) * HWRM_MIN_TIMEOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+#define HWRM_VALID_BIT_DELAY_USEC	50000</div><div class='add'>+</div><div class='add'>+static inline bool bnxt_cfa_hwrm_message(u16 req_type)</div><div class='add'>+{</div><div class='add'>+	switch (req_type) {</div><div class='add'>+	case HWRM_CFA_ENCAP_RECORD_ALLOC:</div><div class='add'>+	case HWRM_CFA_ENCAP_RECORD_FREE:</div><div class='add'>+	case HWRM_CFA_DECAP_FILTER_ALLOC:</div><div class='add'>+	case HWRM_CFA_DECAP_FILTER_FREE:</div><div class='add'>+	case HWRM_CFA_EM_FLOW_ALLOC:</div><div class='add'>+	case HWRM_CFA_EM_FLOW_FREE:</div><div class='add'>+	case HWRM_CFA_EM_FLOW_CFG:</div><div class='add'>+	case HWRM_CFA_FLOW_ALLOC:</div><div class='add'>+	case HWRM_CFA_FLOW_FREE:</div><div class='add'>+	case HWRM_CFA_FLOW_INFO:</div><div class='add'>+	case HWRM_CFA_FLOW_FLUSH:</div><div class='add'>+	case HWRM_CFA_FLOW_STATS:</div><div class='add'>+	case HWRM_CFA_METER_PROFILE_ALLOC:</div><div class='add'>+	case HWRM_CFA_METER_PROFILE_FREE:</div><div class='add'>+	case HWRM_CFA_METER_PROFILE_CFG:</div><div class='add'>+	case HWRM_CFA_METER_INSTANCE_ALLOC:</div><div class='add'>+	case HWRM_CFA_METER_INSTANCE_FREE:</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bnxt_kong_hwrm_message(struct bnxt *bp, struct input *req)</div><div class='add'>+{</div><div class='add'>+	return (bp-&gt;fw_cap &amp; BNXT_FW_CAP_KONG_MB_CHNL &amp;&amp;</div><div class='add'>+		(bnxt_cfa_hwrm_message(le16_to_cpu(req-&gt;req_type)) ||</div><div class='add'>+		 le16_to_cpu(req-&gt;target_id) == HWRM_TARGET_ID_KONG));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int __hwrm_req_init(struct bnxt *bp, void **req, u16 req_type, u32 req_len);</div><div class='add'>+#define hwrm_req_init(bp, req, req_type) \</div><div class='add'>+	__hwrm_req_init((bp), (void **)&amp;(req), (req_type), sizeof(*(req)))</div><div class='add'>+void *hwrm_req_hold(struct bnxt *bp, void *req);</div><div class='add'>+void hwrm_req_drop(struct bnxt *bp, void *req);</div><div class='add'>+void hwrm_req_flags(struct bnxt *bp, void *req, enum bnxt_hwrm_ctx_flags flags);</div><div class='add'>+void hwrm_req_timeout(struct bnxt *bp, void *req, unsigned int timeout);</div><div class='add'>+int hwrm_req_send(struct bnxt *bp, void *req);</div><div class='add'>+int hwrm_req_send_silent(struct bnxt *bp, void *req);</div><div class='add'>+int hwrm_req_replace(struct bnxt *bp, void *req, void *new_req, u32 len);</div><div class='add'>+void hwrm_req_alloc_flags(struct bnxt *bp, void *req, gfp_t flags);</div><div class='add'>+void *hwrm_req_dma_slice(struct bnxt *bp, void *req, u32 size, dma_addr_t *dma);</div><div class='add'>+</div><div class='add'>+/* Older devices can only support req length of 128.</div><div class='add'>+ * HWRM_FUNC_CFG requests which don't need fields starting at</div><div class='add'>+ * num_quic_tx_key_ctxs can use this helper to avoid getting -E2BIG.</div><div class='add'>+ */</div><div class='add'>+static inline int</div><div class='add'>+bnxt_hwrm_func_cfg_short_req_init(struct bnxt *bp,</div><div class='add'>+				  struct hwrm_func_cfg_input **req)</div><div class='add'>+{</div><div class='add'>+	u32 req_len;</div><div class='add'>+</div><div class='add'>+	req_len = min_t(u32, sizeof(**req), bp-&gt;hwrm_max_ext_req_len);</div><div class='add'>+	return __hwrm_req_init(bp, (void **)req, HWRM_FUNC_CFG, req_len);</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c<br/>new file mode 100644<br/>index 000000000000..a8a74f07bb54<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c</a></div><div class='hunk'>@@ -0,0 +1,1139 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2021 Broadcom Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/errno.h&gt;</div><div class='add'>+#include &lt;linux/pci.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/timekeeping.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/clocksource.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='add'>+#include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='add'>+#include "bnxt_ptp.h"</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_cfg_settime(struct bnxt *bp, u64 time)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_ptp_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_PTP_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = cpu_to_le16(FUNC_PTP_CFG_REQ_ENABLES_PTP_SET_TIME);</div><div class='add'>+	req-&gt;ptp_set_time = cpu_to_le64(time);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_ptp_parse(struct sk_buff *skb, u16 *seq_id, u16 *hdr_off)</div><div class='add'>+{</div><div class='add'>+	unsigned int ptp_class;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+</div><div class='add'>+	ptp_class = ptp_classify_raw(skb);</div><div class='add'>+</div><div class='add'>+	switch (ptp_class &amp; PTP_CLASS_VMASK) {</div><div class='add'>+	case PTP_CLASS_V1:</div><div class='add'>+	case PTP_CLASS_V2:</div><div class='add'>+		hdr = ptp_parse_header(skb, ptp_class);</div><div class='add'>+		if (!hdr)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+</div><div class='add'>+		*hdr_off = (u8 *)hdr - skb-&gt;data;</div><div class='add'>+		*seq_id	 = ntohs(hdr-&gt;sequence_id);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_settime(struct ptp_clock_info *ptp_info,</div><div class='add'>+			    const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	u64 ns = timespec64_to_ns(ts);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (BNXT_PTP_USE_RTC(ptp-&gt;bp))</div><div class='add'>+		return bnxt_ptp_cfg_settime(ptp-&gt;bp, ns);</div><div class='add'>+</div><div class='add'>+	write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	timecounter_init(&amp;ptp-&gt;tc, &amp;ptp-&gt;cc, ns);</div><div class='add'>+	write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller holds ptp_lock */</div><div class='add'>+static int __bnxt_refclk_read(struct bnxt *bp, struct ptp_system_timestamp *sts,</div><div class='add'>+			      u64 *ns)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u32 high_before, high_now, low;</div><div class='add'>+</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state))</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	high_before = readl(bp-&gt;bar0 + ptp-&gt;refclk_mapped_regs[1]);</div><div class='add'>+	ptp_read_system_prets(sts);</div><div class='add'>+	low = readl(bp-&gt;bar0 + ptp-&gt;refclk_mapped_regs[0]);</div><div class='add'>+	ptp_read_system_postts(sts);</div><div class='add'>+	high_now = readl(bp-&gt;bar0 + ptp-&gt;refclk_mapped_regs[1]);</div><div class='add'>+	if (high_now != high_before) {</div><div class='add'>+		ptp_read_system_prets(sts);</div><div class='add'>+		low = readl(bp-&gt;bar0 + ptp-&gt;refclk_mapped_regs[0]);</div><div class='add'>+		ptp_read_system_postts(sts);</div><div class='add'>+	}</div><div class='add'>+	*ns = ((u64)high_now &lt;&lt; 32) | low;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_refclk_read(struct bnxt *bp, struct ptp_system_timestamp *sts,</div><div class='add'>+			    u64 *ns)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* We have to serialize reg access and FW reset */</div><div class='add'>+	read_seqlock_excl_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	rc = __bnxt_refclk_read(bp, sts, ns);</div><div class='add'>+	read_sequnlock_excl_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_refclk_read_low(struct bnxt *bp, struct ptp_system_timestamp *sts,</div><div class='add'>+				u32 *low)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	/* We have to serialize reg access and FW reset */</div><div class='add'>+	read_seqlock_excl_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		read_sequnlock_excl_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptp_read_system_prets(sts);</div><div class='add'>+	*low = readl(bp-&gt;bar0 + ptp-&gt;refclk_mapped_regs[0]);</div><div class='add'>+	ptp_read_system_postts(sts);</div><div class='add'>+</div><div class='add'>+	read_sequnlock_excl_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_ptp_get_current_time(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return;</div><div class='add'>+	WRITE_ONCE(ptp-&gt;old_time, ptp-&gt;current_time &gt;&gt; BNXT_HI_TIMER_SHIFT);</div><div class='add'>+	bnxt_refclk_read(bp, NULL, &amp;ptp-&gt;current_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_port_ts_query(struct bnxt *bp, u32 flags, u64 *ts,</div><div class='add'>+				   u32 txts_tmo, int slot)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_ts_query_output *resp;</div><div class='add'>+	struct hwrm_port_ts_query_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_TS_QUERY);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(flags);</div><div class='add'>+	if ((flags &amp; PORT_TS_QUERY_REQ_FLAGS_PATH) ==</div><div class='add'>+	    PORT_TS_QUERY_REQ_FLAGS_PATH_TX) {</div><div class='add'>+		struct bnxt_ptp_tx_req *txts_req = &amp;bp-&gt;ptp_cfg-&gt;txts_req[slot];</div><div class='add'>+		u32 tmo_us = txts_tmo * 1000;</div><div class='add'>+</div><div class='add'>+		req-&gt;enables = cpu_to_le16(BNXT_PTP_QTS_TX_ENABLES);</div><div class='add'>+		req-&gt;ptp_seq_id = cpu_to_le32(txts_req-&gt;tx_seqid);</div><div class='add'>+		req-&gt;ptp_hdr_offset = cpu_to_le16(txts_req-&gt;tx_hdr_off);</div><div class='add'>+		if (!tmo_us)</div><div class='add'>+			tmo_us = BNXT_PTP_QTS_TIMEOUT;</div><div class='add'>+		tmo_us = min(tmo_us, BNXT_PTP_QTS_MAX_TMO_US);</div><div class='add'>+		req-&gt;ts_req_timeout = cpu_to_le16(tmo_us);</div><div class='add'>+	}</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		*ts = le64_to_cpu(resp-&gt;ptp_msg_ts);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_gettimex(struct ptp_clock_info *ptp_info,</div><div class='add'>+			     struct timespec64 *ts,</div><div class='add'>+			     struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	u64 ns, cycles;</div><div class='add'>+	u32 low;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_refclk_read_low(ptp-&gt;bp, sts, &amp;low);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	cycles = bnxt_extend_cycles_32b_to_48b(ptp, low);</div><div class='add'>+	ns = bnxt_timecounter_cyc2time(ptp, cycles);</div><div class='add'>+	*ts = ns_to_timespec64(ns);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_ptp_update_current_time(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	bnxt_refclk_read(ptp-&gt;bp, NULL, &amp;ptp-&gt;current_time);</div><div class='add'>+	WRITE_ONCE(ptp-&gt;old_time, ptp-&gt;current_time &gt;&gt; BNXT_HI_TIMER_SHIFT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_adjphc(struct bnxt_ptp_cfg *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_port_mac_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(ptp-&gt;bp, req, HWRM_PORT_MAC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = cpu_to_le32(PORT_MAC_CFG_REQ_ENABLES_PTP_ADJ_PHASE);</div><div class='add'>+	req-&gt;ptp_adj_phase = cpu_to_le64(delta);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_send(ptp-&gt;bp, req);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_err(ptp-&gt;bp-&gt;dev, "ptp adjphc failed. rc = %x\n", rc);</div><div class='add'>+	} else {</div><div class='add'>+		bnxt_ptp_update_current_time(ptp-&gt;bp);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_adjtime(struct ptp_clock_info *ptp_info, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (BNXT_PTP_USE_RTC(ptp-&gt;bp))</div><div class='add'>+		return bnxt_ptp_adjphc(ptp, delta);</div><div class='add'>+</div><div class='add'>+	write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	timecounter_adjtime(&amp;ptp-&gt;tc, delta);</div><div class='add'>+	write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_adjfine_rtc(struct bnxt *bp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	s32 ppb = scaled_ppm_to_ppb(scaled_ppm);</div><div class='add'>+	struct hwrm_port_mac_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;ptp_freq_adj_ppb = cpu_to_le32(ppb);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(PORT_MAC_CFG_REQ_ENABLES_PTP_FREQ_ADJ_PPB);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev,</div><div class='add'>+			   "ptp adjfine failed. rc = %d\n", rc);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_adjfine(struct ptp_clock_info *ptp_info, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	struct bnxt *bp = ptp-&gt;bp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!BNXT_MH(bp))</div><div class='add'>+		return bnxt_ptp_adjfine_rtc(bp, scaled_ppm);</div><div class='add'>+</div><div class='add'>+	write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	timecounter_read(&amp;ptp-&gt;tc);</div><div class='add'>+	ptp-&gt;cc.mult = adjust_by_scaled_ppm(ptp-&gt;cmult, scaled_ppm);</div><div class='add'>+	write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_ptp_pps_event(struct bnxt *bp, u32 data1, u32 data2)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	struct ptp_clock_event event;</div><div class='add'>+	u64 ns, pps_ts;</div><div class='add'>+</div><div class='add'>+	pps_ts = EVENT_PPS_TS(data2, data1);</div><div class='add'>+	ns = bnxt_timecounter_cyc2time(ptp, pps_ts);</div><div class='add'>+</div><div class='add'>+	switch (EVENT_DATA2_PPS_EVENT_TYPE(data2)) {</div><div class='add'>+	case ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_INTERNAL:</div><div class='add'>+		event.pps_times.ts_real = ns_to_timespec64(ns);</div><div class='add'>+		event.type = PTP_CLOCK_PPSUSR;</div><div class='add'>+		event.index = EVENT_DATA2_PPS_PIN_NUM(data2);</div><div class='add'>+		break;</div><div class='add'>+	case ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_EXTERNAL:</div><div class='add'>+		event.timestamp = ns;</div><div class='add'>+		event.type = PTP_CLOCK_EXTTS;</div><div class='add'>+		event.index = EVENT_DATA2_PPS_PIN_NUM(data2);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptp_clock_event(bp-&gt;ptp_cfg-&gt;ptp_clock, &amp;event);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_cfg_pin(struct bnxt *bp, u8 pin, u8 usage)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_ptp_pin_cfg_input *req;</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u8 state = usage != BNXT_PPS_PIN_NONE;</div><div class='add'>+	u8 *pin_state, *pin_usg;</div><div class='add'>+	u32 enables;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!TSIO_PIN_VALID(pin)) {</div><div class='add'>+		netdev_err(ptp-&gt;bp-&gt;dev, "1PPS: Invalid pin. Check pin-function configuration\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(ptp-&gt;bp, req, HWRM_FUNC_PTP_PIN_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	enables = (FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN0_STATE |</div><div class='add'>+		   FUNC_PTP_PIN_CFG_REQ_ENABLES_PIN0_USAGE) &lt;&lt; (pin * 2);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(enables);</div><div class='add'>+</div><div class='add'>+	pin_state = &amp;req-&gt;pin0_state;</div><div class='add'>+	pin_usg = &amp;req-&gt;pin0_usage;</div><div class='add'>+</div><div class='add'>+	*(pin_state + (pin * 2)) = state;</div><div class='add'>+	*(pin_usg + (pin * 2)) = usage;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_send(ptp-&gt;bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	ptp-&gt;pps_info.pins[pin].usage = usage;</div><div class='add'>+	ptp-&gt;pps_info.pins[pin].state = state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_cfg_event(struct bnxt *bp, u8 event)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_ptp_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_PTP_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = cpu_to_le16(FUNC_PTP_CFG_REQ_ENABLES_PTP_PPS_EVENT);</div><div class='add'>+	req-&gt;ptp_pps_event = event;</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_ptp_cfg_tstamp_filters(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	struct hwrm_port_mac_cfg_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!ptp || !ptp-&gt;tstamp_filters)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_RX_ALL_PKT_TS) &amp;&amp; (ptp-&gt;tstamp_filters &amp;</div><div class='add'>+	    (PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_ENABLE |</div><div class='add'>+	     PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_DISABLE))) {</div><div class='add'>+		ptp-&gt;tstamp_filters &amp;= ~(PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_ENABLE |</div><div class='add'>+					 PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_DISABLE);</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Unsupported FW for all RX pkts timestamp filter\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	req-&gt;flags = cpu_to_le32(ptp-&gt;tstamp_filters);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(PORT_MAC_CFG_REQ_ENABLES_RX_TS_CAPTURE_PTP_MSG_TYPE);</div><div class='add'>+	req-&gt;rx_ts_capture_ptp_msg_type = cpu_to_le16(ptp-&gt;rxctl);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		bp-&gt;ptp_all_rx_tstamp = !!(ptp-&gt;tstamp_filters &amp;</div><div class='add'>+					   PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_ENABLE);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	ptp-&gt;tstamp_filters = 0;</div><div class='add'>+out:</div><div class='add'>+	bp-&gt;ptp_all_rx_tstamp = 0;</div><div class='add'>+	netdev_warn(bp-&gt;dev, "Failed to configure HW packet timestamp filters\n");</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_ptp_reapply_pps(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	struct bnxt_pps *pps;</div><div class='add'>+	u32 pin = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!ptp || !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PTP_PPS) ||</div><div class='add'>+	    !(ptp-&gt;ptp_info.pin_config))</div><div class='add'>+		return;</div><div class='add'>+	pps = &amp;ptp-&gt;pps_info;</div><div class='add'>+	for (pin = 0; pin &lt; BNXT_MAX_TSIO_PINS; pin++) {</div><div class='add'>+		if (pps-&gt;pins[pin].state) {</div><div class='add'>+			rc = bnxt_ptp_cfg_pin(bp, pin, pps-&gt;pins[pin].usage);</div><div class='add'>+			if (!rc &amp;&amp; pps-&gt;pins[pin].event)</div><div class='add'>+				rc = bnxt_ptp_cfg_event(bp,</div><div class='add'>+							pps-&gt;pins[pin].event);</div><div class='add'>+			if (rc)</div><div class='add'>+				netdev_err(bp-&gt;dev, "1PPS: Failed to configure pin%d\n",</div><div class='add'>+					   pin);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_get_target_cycles(struct bnxt_ptp_cfg *ptp, u64 target_ns,</div><div class='add'>+				  u64 *cycles_delta)</div><div class='add'>+{</div><div class='add'>+	u64 cycles_now;</div><div class='add'>+	u64 nsec_now, nsec_delta;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_refclk_read(ptp-&gt;bp, NULL, &amp;cycles_now);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	nsec_now = bnxt_timecounter_cyc2time(ptp, cycles_now);</div><div class='add'>+</div><div class='add'>+	nsec_delta = target_ns - nsec_now;</div><div class='add'>+	*cycles_delta = div64_u64(nsec_delta &lt;&lt; ptp-&gt;cc.shift, ptp-&gt;cc.mult);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_perout_cfg(struct bnxt_ptp_cfg *ptp,</div><div class='add'>+			       struct ptp_clock_request *rq)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_ptp_cfg_input *req;</div><div class='add'>+	struct bnxt *bp = ptp-&gt;bp;</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+	u64 target_ns, delta;</div><div class='add'>+	u16 enables;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	ts.tv_sec = rq-&gt;perout.start.sec;</div><div class='add'>+	ts.tv_nsec = rq-&gt;perout.start.nsec;</div><div class='add'>+	target_ns = timespec64_to_ns(&amp;ts);</div><div class='add'>+</div><div class='add'>+	rc = bnxt_get_target_cycles(ptp, target_ns, &amp;delta);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_PTP_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	enables = FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_EXT_PERIOD |</div><div class='add'>+		  FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_EXT_UP |</div><div class='add'>+		  FUNC_PTP_CFG_REQ_ENABLES_PTP_FREQ_ADJ_EXT_PHASE;</div><div class='add'>+	req-&gt;enables = cpu_to_le16(enables);</div><div class='add'>+	req-&gt;ptp_pps_event = 0;</div><div class='add'>+	req-&gt;ptp_freq_adj_dll_source = 0;</div><div class='add'>+	req-&gt;ptp_freq_adj_dll_phase = 0;</div><div class='add'>+	req-&gt;ptp_freq_adj_ext_period = cpu_to_le32(NSEC_PER_SEC);</div><div class='add'>+	req-&gt;ptp_freq_adj_ext_up = 0;</div><div class='add'>+	req-&gt;ptp_freq_adj_ext_phase_lower = cpu_to_le32(delta);</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_enable(struct ptp_clock_info *ptp_info,</div><div class='add'>+			   struct ptp_clock_request *rq, int on)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	struct bnxt *bp = ptp-&gt;bp;</div><div class='add'>+	int pin_id;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	switch (rq-&gt;type) {</div><div class='add'>+	case PTP_CLK_REQ_EXTTS:</div><div class='add'>+		/* Configure an External PPS IN */</div><div class='add'>+		pin_id = ptp_find_pin(ptp-&gt;ptp_clock, PTP_PF_EXTTS,</div><div class='add'>+				      rq-&gt;extts.index);</div><div class='add'>+		if (!TSIO_PIN_VALID(pin_id))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (!on)</div><div class='add'>+			break;</div><div class='add'>+		rc = bnxt_ptp_cfg_pin(bp, pin_id, BNXT_PPS_PIN_PPS_IN);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		rc = bnxt_ptp_cfg_event(bp, BNXT_PPS_EVENT_EXTERNAL);</div><div class='add'>+		if (!rc)</div><div class='add'>+			ptp-&gt;pps_info.pins[pin_id].event = BNXT_PPS_EVENT_EXTERNAL;</div><div class='add'>+		return rc;</div><div class='add'>+	case PTP_CLK_REQ_PEROUT:</div><div class='add'>+		/* Configure a Periodic PPS OUT */</div><div class='add'>+		pin_id = ptp_find_pin(ptp-&gt;ptp_clock, PTP_PF_PEROUT,</div><div class='add'>+				      rq-&gt;perout.index);</div><div class='add'>+		if (!TSIO_PIN_VALID(pin_id))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		if (!on)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_ptp_cfg_pin(bp, pin_id, BNXT_PPS_PIN_PPS_OUT);</div><div class='add'>+		if (!rc)</div><div class='add'>+			rc = bnxt_ptp_perout_cfg(ptp, rq);</div><div class='add'>+</div><div class='add'>+		return rc;</div><div class='add'>+	case PTP_CLK_REQ_PPS:</div><div class='add'>+		/* Configure PHC PPS IN */</div><div class='add'>+		rc = bnxt_ptp_cfg_pin(bp, 0, BNXT_PPS_PIN_PPS_IN);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		rc = bnxt_ptp_cfg_event(bp, BNXT_PPS_EVENT_INTERNAL);</div><div class='add'>+		if (!rc)</div><div class='add'>+			ptp-&gt;pps_info.pins[0].event = BNXT_PPS_EVENT_INTERNAL;</div><div class='add'>+		return rc;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(ptp-&gt;bp-&gt;dev, "Unrecognized PIN function\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return bnxt_ptp_cfg_pin(bp, pin_id, BNXT_PPS_PIN_NONE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_hwrm_ptp_cfg(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u32 flags = 0;</div><div class='add'>+</div><div class='add'>+	switch (ptp-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_ALL:</div><div class='add'>+		flags = PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_ENABLE;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		flags = PORT_MAC_CFG_REQ_FLAGS_PTP_RX_TS_CAPTURE_DISABLE;</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_RX_ALL_PKT_TS)</div><div class='add'>+			flags |= PORT_MAC_CFG_REQ_FLAGS_ALL_RX_TS_CAPTURE_DISABLE;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='add'>+		flags = PORT_MAC_CFG_REQ_FLAGS_PTP_RX_TS_CAPTURE_ENABLE;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ptp-&gt;tx_tstamp_en)</div><div class='add'>+		flags |= PORT_MAC_CFG_REQ_FLAGS_PTP_TX_TS_CAPTURE_ENABLE;</div><div class='add'>+	else</div><div class='add'>+		flags |= PORT_MAC_CFG_REQ_FLAGS_PTP_TX_TS_CAPTURE_DISABLE;</div><div class='add'>+</div><div class='add'>+	ptp-&gt;tstamp_filters = flags;</div><div class='add'>+</div><div class='add'>+	return bnxt_ptp_cfg_tstamp_filters(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_hwtstamp_set(struct net_device *dev,</div><div class='add'>+		      struct kernel_hwtstamp_config *stmpconf,</div><div class='add'>+		      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ptp_cfg *ptp;</div><div class='add'>+	u16 old_rxctl;</div><div class='add'>+	int old_rx_filter, rc;</div><div class='add'>+	u8 old_tx_tstamp_en;</div><div class='add'>+</div><div class='add'>+	ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (stmpconf-&gt;tx_type != HWTSTAMP_TX_ON &amp;&amp;</div><div class='add'>+	    stmpconf-&gt;tx_type != HWTSTAMP_TX_OFF)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	old_rx_filter = ptp-&gt;rx_filter;</div><div class='add'>+	old_rxctl = ptp-&gt;rxctl;</div><div class='add'>+	old_tx_tstamp_en = ptp-&gt;tx_tstamp_en;</div><div class='add'>+	switch (stmpconf-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		ptp-&gt;rxctl = 0;</div><div class='add'>+		ptp-&gt;rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_ALL:</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_RX_ALL_PKT_TS) {</div><div class='add'>+			ptp-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+		ptp-&gt;rxctl = BNXT_PTP_MSG_EVENTS;</div><div class='add'>+		ptp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+		ptp-&gt;rxctl = BNXT_PTP_MSG_SYNC;</div><div class='add'>+		ptp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_SYNC;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='add'>+		ptp-&gt;rxctl = BNXT_PTP_MSG_DELAY_REQ;</div><div class='add'>+		ptp-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_DELAY_REQ;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (stmpconf-&gt;tx_type == HWTSTAMP_TX_ON)</div><div class='add'>+		ptp-&gt;tx_tstamp_en = 1;</div><div class='add'>+	else</div><div class='add'>+		ptp-&gt;tx_tstamp_en = 0;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_ptp_cfg(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto ts_set_err;</div><div class='add'>+</div><div class='add'>+	stmpconf-&gt;rx_filter = ptp-&gt;rx_filter;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+ts_set_err:</div><div class='add'>+	ptp-&gt;rx_filter = old_rx_filter;</div><div class='add'>+	ptp-&gt;rxctl = old_rxctl;</div><div class='add'>+	ptp-&gt;tx_tstamp_en = old_tx_tstamp_en;</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_hwtstamp_get(struct net_device *dev,</div><div class='add'>+		      struct kernel_hwtstamp_config *stmpconf)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ptp_cfg *ptp;</div><div class='add'>+</div><div class='add'>+	ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	stmpconf-&gt;flags = 0;</div><div class='add'>+	stmpconf-&gt;tx_type = ptp-&gt;tx_tstamp_en ? HWTSTAMP_TX_ON</div><div class='add'>+					      : HWTSTAMP_TX_OFF;</div><div class='add'>+</div><div class='add'>+	stmpconf-&gt;rx_filter = ptp-&gt;rx_filter;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_map_regs(struct bnxt *bp, u32 *reg_arr, int count, int reg_win)</div><div class='add'>+{</div><div class='add'>+	u32 reg_base = *reg_arr &amp; BNXT_GRC_BASE_MASK;</div><div class='add'>+	u32 win_off;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		if ((reg_arr[i] &amp; BNXT_GRC_BASE_MASK) != reg_base)</div><div class='add'>+			return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+	win_off = BNXT_GRCPF_REG_WINDOW_BASE_OUT + (reg_win - 1) * 4;</div><div class='add'>+	writel(reg_base, bp-&gt;bar0 + win_off);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_map_ptp_regs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u32 *reg_arr;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	reg_arr = ptp-&gt;refclk_regs;</div><div class='add'>+	if (BNXT_CHIP_P5(bp)) {</div><div class='add'>+		rc = bnxt_map_regs(bp, reg_arr, 2, BNXT_PTP_GRC_WIN);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+		for (i = 0; i &lt; 2; i++)</div><div class='add'>+			ptp-&gt;refclk_mapped_regs[i] = BNXT_PTP_GRC_WIN_BASE +</div><div class='add'>+				(ptp-&gt;refclk_regs[i] &amp; BNXT_GRC_OFFSET_MASK);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P7) {</div><div class='add'>+		for (i = 0; i &lt; 2; i++) {</div><div class='add'>+			if (reg_arr[i] &amp; BNXT_GRC_BASE_MASK)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			ptp-&gt;refclk_mapped_regs[i] = reg_arr[i];</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_unmap_ptp_regs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	writel(0, bp-&gt;bar0 + BNXT_GRCPF_REG_WINDOW_BASE_OUT +</div><div class='add'>+		  (BNXT_PTP_GRC_WIN - 1) * 4);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 bnxt_cc_read(struct cyclecounter *cc)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(cc, struct bnxt_ptp_cfg, cc);</div><div class='add'>+	u64 ns = 0;</div><div class='add'>+</div><div class='add'>+	__bnxt_refclk_read(ptp-&gt;bp, NULL, &amp;ns);</div><div class='add'>+	return ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_stamp_tx_skb(struct bnxt *bp, int slot)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	struct skb_shared_hwtstamps timestamp;</div><div class='add'>+	struct bnxt_ptp_tx_req *txts_req;</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	u64 ts = 0, ns = 0;</div><div class='add'>+	u32 tmo = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	txts_req = &amp;ptp-&gt;txts_req[slot];</div><div class='add'>+	/* make sure bnxt_get_tx_ts_p5() has updated abs_txts_tmo */</div><div class='add'>+	smp_rmb();</div><div class='add'>+	if (!time_after_eq(now, txts_req-&gt;abs_txts_tmo))</div><div class='add'>+		tmo = jiffies_to_msecs(txts_req-&gt;abs_txts_tmo - now);</div><div class='add'>+	rc = bnxt_hwrm_port_ts_query(bp, PORT_TS_QUERY_REQ_FLAGS_PATH_TX, &amp;ts,</div><div class='add'>+				     tmo, slot);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		memset(&amp;timestamp, 0, sizeof(timestamp));</div><div class='add'>+		ns = bnxt_timecounter_cyc2time(ptp, ts);</div><div class='add'>+		timestamp.hwtstamp = ns_to_ktime(ns);</div><div class='add'>+		skb_tstamp_tx(txts_req-&gt;tx_skb, &amp;timestamp);</div><div class='add'>+		ptp-&gt;stats.ts_pkts++;</div><div class='add'>+	} else {</div><div class='add'>+		if (!time_after_eq(jiffies, txts_req-&gt;abs_txts_tmo))</div><div class='add'>+			return -EAGAIN;</div><div class='add'>+</div><div class='add'>+		ptp-&gt;stats.ts_lost++;</div><div class='add'>+		netdev_warn_once(bp-&gt;dev,</div><div class='add'>+				 "TS query for TX timer failed rc = %x\n", rc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb_any(txts_req-&gt;tx_skb);</div><div class='add'>+	txts_req-&gt;tx_skb = NULL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long bnxt_ptp_ts_aux_work(struct ptp_clock_info *ptp_info)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	unsigned long now = jiffies;</div><div class='add'>+	struct bnxt *bp = ptp-&gt;bp;</div><div class='add'>+	u16 cons = ptp-&gt;txts_cons;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 num_requests;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	num_requests = BNXT_MAX_TX_TS - READ_ONCE(ptp-&gt;tx_avail);</div><div class='add'>+	while (num_requests--) {</div><div class='add'>+		if (IS_ERR(ptp-&gt;txts_req[cons].tx_skb))</div><div class='add'>+			goto next_slot;</div><div class='add'>+		if (!ptp-&gt;txts_req[cons].tx_skb)</div><div class='add'>+			break;</div><div class='add'>+		rc = bnxt_stamp_tx_skb(bp, cons);</div><div class='add'>+		if (rc == -EAGAIN)</div><div class='add'>+			break;</div><div class='add'>+next_slot:</div><div class='add'>+		BNXT_PTP_INC_TX_AVAIL(ptp);</div><div class='add'>+		cons = NEXT_TXTS(cons);</div><div class='add'>+	}</div><div class='add'>+	ptp-&gt;txts_cons = cons;</div><div class='add'>+</div><div class='add'>+	if (!time_after_eq(now, ptp-&gt;next_period)) {</div><div class='add'>+		if (rc == -EAGAIN)</div><div class='add'>+			return 0;</div><div class='add'>+		return ptp-&gt;next_period - now;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bnxt_ptp_get_current_time(bp);</div><div class='add'>+	ptp-&gt;next_period = now + HZ;</div><div class='add'>+	if (time_after_eq(now, ptp-&gt;next_overflow_check)) {</div><div class='add'>+		write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+		timecounter_read(&amp;ptp-&gt;tc);</div><div class='add'>+		write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+		ptp-&gt;next_overflow_check = now + BNXT_PHC_OVERFLOW_PERIOD;</div><div class='add'>+	}</div><div class='add'>+	if (rc == -EAGAIN)</div><div class='add'>+		return 0;</div><div class='add'>+	return HZ;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_ptp_free_txts_skbs(struct bnxt_ptp_cfg *ptp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_tx_req *txts_req;</div><div class='add'>+	u16 cons = ptp-&gt;txts_cons;</div><div class='add'>+</div><div class='add'>+	/* make sure ptp aux worker finished with</div><div class='add'>+	 * possible BNXT_STATE_OPEN set</div><div class='add'>+	 */</div><div class='add'>+	ptp_cancel_worker_sync(ptp-&gt;ptp_clock);</div><div class='add'>+</div><div class='add'>+	ptp-&gt;tx_avail = BNXT_MAX_TX_TS;</div><div class='add'>+	while (cons != ptp-&gt;txts_prod) {</div><div class='add'>+		txts_req = &amp;ptp-&gt;txts_req[cons];</div><div class='add'>+		if (!IS_ERR_OR_NULL(txts_req-&gt;tx_skb))</div><div class='add'>+			dev_kfree_skb_any(txts_req-&gt;tx_skb);</div><div class='add'>+		cons = NEXT_TXTS(cons);</div><div class='add'>+	}</div><div class='add'>+	ptp-&gt;txts_cons = cons;</div><div class='add'>+	ptp_schedule_worker(ptp-&gt;ptp_clock, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_ptp_get_txts_prod(struct bnxt_ptp_cfg *ptp, u16 *prod)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;ptp-&gt;ptp_tx_lock);</div><div class='add'>+	if (ptp-&gt;tx_avail) {</div><div class='add'>+		*prod = ptp-&gt;txts_prod;</div><div class='add'>+		ptp-&gt;txts_prod = NEXT_TXTS(*prod);</div><div class='add'>+		ptp-&gt;tx_avail--;</div><div class='add'>+		spin_unlock_bh(&amp;ptp-&gt;ptp_tx_lock);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;ptp-&gt;ptp_tx_lock);</div><div class='add'>+	atomic64_inc(&amp;ptp-&gt;stats.ts_err);</div><div class='add'>+	return -ENOSPC;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_get_tx_ts_p5(struct bnxt *bp, struct sk_buff *skb, u16 prod)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	struct bnxt_ptp_tx_req *txts_req;</div><div class='add'>+</div><div class='add'>+	txts_req = &amp;ptp-&gt;txts_req[prod];</div><div class='add'>+	txts_req-&gt;abs_txts_tmo = jiffies + msecs_to_jiffies(ptp-&gt;txts_tmo);</div><div class='add'>+	/* make sure abs_txts_tmo is written first */</div><div class='add'>+	smp_wmb();</div><div class='add'>+	txts_req-&gt;tx_skb = skb;</div><div class='add'>+	ptp_schedule_worker(ptp-&gt;ptp_clock, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_get_rx_ts_p5(struct bnxt *bp, u64 *ts, u32 pkt_ts)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	*ts = bnxt_extend_cycles_32b_to_48b(ptp, pkt_ts);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_tx_ts_cmp(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='add'>+		    struct tx_ts_cmp *tscmp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_hwtstamps timestamp = {};</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	u32 opaque = tscmp-&gt;tx_ts_cmp_opaque;</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	struct bnxt_sw_tx_bd *tx_buf;</div><div class='add'>+	u64 ts, ns;</div><div class='add'>+	u16 cons;</div><div class='add'>+</div><div class='add'>+	txr = bnapi-&gt;tx_ring[TX_OPAQUE_RING(opaque)];</div><div class='add'>+	ts = BNXT_GET_TX_TS_48B_NS(tscmp);</div><div class='add'>+	cons = TX_OPAQUE_IDX(opaque);</div><div class='add'>+	tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, cons)];</div><div class='add'>+	if (tx_buf-&gt;is_ts_pkt) {</div><div class='add'>+		if (BNXT_TX_TS_ERR(tscmp)) {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "timestamp completion error 0x%x 0x%x\n",</div><div class='add'>+				   le32_to_cpu(tscmp-&gt;tx_ts_cmp_flags_type),</div><div class='add'>+				   le32_to_cpu(tscmp-&gt;tx_ts_cmp_errors_v));</div><div class='add'>+		} else {</div><div class='add'>+			ns = bnxt_timecounter_cyc2time(ptp, ts);</div><div class='add'>+			timestamp.hwtstamp = ns_to_ktime(ns);</div><div class='add'>+			skb_tstamp_tx(tx_buf-&gt;skb, &amp;timestamp);</div><div class='add'>+		}</div><div class='add'>+		tx_buf-&gt;is_ts_pkt = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ptp_clock_info bnxt_ptp_caps = {</div><div class='add'>+	.owner		= THIS_MODULE,</div><div class='add'>+	.name		= "bnxt clock",</div><div class='add'>+	.max_adj	= BNXT_MAX_PHC_DRIFT,</div><div class='add'>+	.n_alarm	= 0,</div><div class='add'>+	.n_ext_ts	= 0,</div><div class='add'>+	.n_per_out	= 0,</div><div class='add'>+	.n_pins		= 0,</div><div class='add'>+	.pps		= 0,</div><div class='add'>+	.adjfine	= bnxt_ptp_adjfine,</div><div class='add'>+	.adjtime	= bnxt_ptp_adjtime,</div><div class='add'>+	.do_aux_work	= bnxt_ptp_ts_aux_work,</div><div class='add'>+	.gettimex64	= bnxt_ptp_gettimex,</div><div class='add'>+	.settime64	= bnxt_ptp_settime,</div><div class='add'>+	.enable		= bnxt_ptp_enable,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_verify(struct ptp_clock_info *ptp_info, unsigned int pin,</div><div class='add'>+			   enum ptp_pin_function func, unsigned int chan)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,</div><div class='add'>+						ptp_info);</div><div class='add'>+	/* Allow only PPS pin function configuration */</div><div class='add'>+	if (ptp-&gt;pps_info.pins[pin].usage &lt;= BNXT_PPS_PIN_PPS_OUT &amp;&amp;</div><div class='add'>+	    func != PTP_PF_PHYSYNC)</div><div class='add'>+		return 0;</div><div class='add'>+	else</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_ptp_pps_init(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_ptp_pin_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_ptp_pin_qcfg_input *req;</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	struct ptp_clock_info *ptp_info;</div><div class='add'>+	struct bnxt_pps *pps_info;</div><div class='add'>+	u8 *pin_usg;</div><div class='add'>+	u32 i, rc;</div><div class='add'>+</div><div class='add'>+	/* Query current/default PIN CFG */</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_PTP_PIN_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc || !resp-&gt;num_pins) {</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptp_info = &amp;ptp-&gt;ptp_info;</div><div class='add'>+	pps_info = &amp;ptp-&gt;pps_info;</div><div class='add'>+	pps_info-&gt;num_pins = resp-&gt;num_pins;</div><div class='add'>+	ptp_info-&gt;n_pins = pps_info-&gt;num_pins;</div><div class='add'>+	ptp_info-&gt;pin_config = kcalloc(ptp_info-&gt;n_pins,</div><div class='add'>+				       sizeof(*ptp_info-&gt;pin_config),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!ptp_info-&gt;pin_config) {</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Report the TSIO capability to kernel */</div><div class='add'>+	pin_usg = &amp;resp-&gt;pin0_usage;</div><div class='add'>+	for (i = 0; i &lt; pps_info-&gt;num_pins; i++, pin_usg++) {</div><div class='add'>+		snprintf(ptp_info-&gt;pin_config[i].name,</div><div class='add'>+			 sizeof(ptp_info-&gt;pin_config[i].name), "bnxt_pps%d", i);</div><div class='add'>+		ptp_info-&gt;pin_config[i].index = i;</div><div class='add'>+		if (*pin_usg == BNXT_PPS_PIN_PPS_IN)</div><div class='add'>+			ptp_info-&gt;pin_config[i].func = PTP_PF_EXTTS;</div><div class='add'>+		else if (*pin_usg == BNXT_PPS_PIN_PPS_OUT)</div><div class='add'>+			ptp_info-&gt;pin_config[i].func = PTP_PF_PEROUT;</div><div class='add'>+		else</div><div class='add'>+			ptp_info-&gt;pin_config[i].func = PTP_PF_NONE;</div><div class='add'>+</div><div class='add'>+		pps_info-&gt;pins[i].usage = *pin_usg;</div><div class='add'>+	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+</div><div class='add'>+	/* Only 1 each of ext_ts and per_out pins is available in HW */</div><div class='add'>+	ptp_info-&gt;n_ext_ts = 1;</div><div class='add'>+	ptp_info-&gt;n_per_out = 1;</div><div class='add'>+	ptp_info-&gt;pps = 1;</div><div class='add'>+	ptp_info-&gt;verify = bnxt_ptp_verify;</div><div class='add'>+	ptp_info-&gt;supported_extts_flags = PTP_RISING_EDGE | PTP_STRICT_FLAGS;</div><div class='add'>+	ptp_info-&gt;supported_perout_flags = PTP_PEROUT_DUTY_CYCLE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_pps_config_ok(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	return !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_PTP_PPS) == !ptp-&gt;ptp_info.pin_config;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_ptp_timecounter_init(struct bnxt *bp, bool init_tc)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	if (!ptp-&gt;ptp_clock) {</div><div class='add'>+		memset(&amp;ptp-&gt;cc, 0, sizeof(ptp-&gt;cc));</div><div class='add'>+		ptp-&gt;cc.read = bnxt_cc_read;</div><div class='add'>+		ptp-&gt;cc.mask = CYCLECOUNTER_MASK(48);</div><div class='add'>+		if (BNXT_MH(bp)) {</div><div class='add'>+			/* Use timecounter based non-real time mode */</div><div class='add'>+			ptp-&gt;cc.shift = BNXT_CYCLES_SHIFT;</div><div class='add'>+			ptp-&gt;cc.mult = clocksource_khz2mult(BNXT_DEVCLK_FREQ, ptp-&gt;cc.shift);</div><div class='add'>+			ptp-&gt;cmult = ptp-&gt;cc.mult;</div><div class='add'>+		} else {</div><div class='add'>+			ptp-&gt;cc.shift = 0;</div><div class='add'>+			ptp-&gt;cc.mult = 1;</div><div class='add'>+		}</div><div class='add'>+		ptp-&gt;next_overflow_check = jiffies + BNXT_PHC_OVERFLOW_PERIOD;</div><div class='add'>+	}</div><div class='add'>+	if (init_tc) {</div><div class='add'>+		write_seqlock_irqsave(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+		timecounter_init(&amp;ptp-&gt;tc, &amp;ptp-&gt;cc, ktime_to_ns(ktime_get_real()));</div><div class='add'>+		write_sequnlock_irqrestore(&amp;ptp-&gt;ptp_lock, flags);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Caller holds ptp_lock */</div><div class='add'>+void bnxt_ptp_rtc_timecounter_init(struct bnxt_ptp_cfg *ptp, u64 ns)</div><div class='add'>+{</div><div class='add'>+	timecounter_init(&amp;ptp-&gt;tc, &amp;ptp-&gt;cc, ns);</div><div class='add'>+	/* For RTC, cycle_last must be in sync with the timecounter value. */</div><div class='add'>+	ptp-&gt;tc.cycle_last = ns &amp; ptp-&gt;cc.mask;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_ptp_init_rtc(struct bnxt *bp, bool phc_cfg)</div><div class='add'>+{</div><div class='add'>+	struct timespec64 tsp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u64 ns;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;ptp_cfg || !BNXT_PTP_USE_RTC(bp))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!phc_cfg) {</div><div class='add'>+		ktime_get_real_ts64(&amp;tsp);</div><div class='add'>+		ns = timespec64_to_ns(&amp;tsp);</div><div class='add'>+		rc = bnxt_ptp_cfg_settime(bp, ns);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	} else {</div><div class='add'>+		rc = bnxt_hwrm_port_ts_query(bp, PORT_TS_QUERY_REQ_FLAGS_CURRENT_TIME,</div><div class='add'>+					     &amp;ns, 0, 0);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+	write_seqlock_irqsave(&amp;bp-&gt;ptp_cfg-&gt;ptp_lock, flags);</div><div class='add'>+	bnxt_ptp_rtc_timecounter_init(bp-&gt;ptp_cfg, ns);</div><div class='add'>+	write_sequnlock_irqrestore(&amp;bp-&gt;ptp_cfg-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_ptp_free(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	if (ptp-&gt;ptp_clock) {</div><div class='add'>+		ptp_clock_unregister(ptp-&gt;ptp_clock);</div><div class='add'>+		ptp-&gt;ptp_clock = NULL;</div><div class='add'>+	}</div><div class='add'>+	kfree(ptp-&gt;ptp_info.pin_config);</div><div class='add'>+	ptp-&gt;ptp_info.pin_config = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int bnxt_ptp_init(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_map_ptp_regs(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	if (ptp-&gt;ptp_clock &amp;&amp; bnxt_pps_config_ok(bp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	bnxt_ptp_free(bp);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(ptp-&gt;tx_avail, BNXT_MAX_TX_TS);</div><div class='add'>+	seqlock_init(&amp;ptp-&gt;ptp_lock);</div><div class='add'>+	spin_lock_init(&amp;ptp-&gt;ptp_tx_lock);</div><div class='add'>+</div><div class='add'>+	if (BNXT_PTP_USE_RTC(bp)) {</div><div class='add'>+		bnxt_ptp_timecounter_init(bp, false);</div><div class='add'>+		rc = bnxt_ptp_init_rtc(bp, ptp-&gt;rtc_configured);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out;</div><div class='add'>+	} else {</div><div class='add'>+		bnxt_ptp_timecounter_init(bp, true);</div><div class='add'>+		bnxt_ptp_adjfine_rtc(bp, 0);</div><div class='add'>+	}</div><div class='add'>+	bnxt_hwrm_func_drv_rgtr(bp, NULL, 0, true);</div><div class='add'>+</div><div class='add'>+	ptp-&gt;ptp_info = bnxt_ptp_caps;</div><div class='add'>+	if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_PTP_PPS)) {</div><div class='add'>+		if (bnxt_ptp_pps_init(bp))</div><div class='add'>+			netdev_err(bp-&gt;dev, "1pps not initialized, continuing without 1pps support\n");</div><div class='add'>+	}</div><div class='add'>+	ptp-&gt;ptp_clock = ptp_clock_register(&amp;ptp-&gt;ptp_info, &amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(ptp-&gt;ptp_clock)) {</div><div class='add'>+		int err = PTR_ERR(ptp-&gt;ptp_clock);</div><div class='add'>+</div><div class='add'>+		ptp-&gt;ptp_clock = NULL;</div><div class='add'>+		rc = err;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ptp-&gt;stats.ts_pkts = 0;</div><div class='add'>+	ptp-&gt;stats.ts_lost = 0;</div><div class='add'>+	atomic64_set(&amp;ptp-&gt;stats.ts_err, 0);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='add'>+		bnxt_refclk_read(bp, NULL, &amp;ptp-&gt;current_time);</div><div class='add'>+		WRITE_ONCE(ptp-&gt;old_time, ptp-&gt;current_time &gt;&gt; BNXT_HI_TIMER_SHIFT);</div><div class='add'>+		ptp_schedule_worker(ptp-&gt;ptp_clock, 0);</div><div class='add'>+	}</div><div class='add'>+	ptp-&gt;txts_tmo = BNXT_PTP_DFLT_TX_TMO;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bnxt_ptp_free(bp);</div><div class='add'>+	bnxt_unmap_ptp_regs(bp);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_ptp_clear(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_ptp_cfg *ptp = bp-&gt;ptp_cfg;</div><div class='add'>+</div><div class='add'>+	if (!ptp)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (ptp-&gt;ptp_clock)</div><div class='add'>+		ptp_clock_unregister(ptp-&gt;ptp_clock);</div><div class='add'>+</div><div class='add'>+	ptp-&gt;ptp_clock = NULL;</div><div class='add'>+	kfree(ptp-&gt;ptp_info.pin_config);</div><div class='add'>+	ptp-&gt;ptp_info.pin_config = NULL;</div><div class='add'>+</div><div class='add'>+	bnxt_unmap_ptp_regs(bp);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h<br/>new file mode 100644<br/>index 000000000000..8cc2fae47644<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h</a></div><div class='hunk'>@@ -0,0 +1,201 @@</div><div class='add'>+/* Broadcom NetXtreme-C/E network driver.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2021 Broadcom Inc.</div><div class='add'>+ *</div><div class='add'>+ * This program is free software; you can redistribute it and/or modify</div><div class='add'>+ * it under the terms of the GNU General Public License as published by</div><div class='add'>+ * the Free Software Foundation.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef BNXT_PTP_H</div><div class='add'>+#define BNXT_PTP_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/timecounter.h&gt;</div><div class='add'>+</div><div class='add'>+#define BNXT_PTP_GRC_WIN	6</div><div class='add'>+#define BNXT_PTP_GRC_WIN_BASE	0x6000</div><div class='add'>+</div><div class='add'>+#define BNXT_MAX_PHC_DRIFT	31000000</div><div class='add'>+#define BNXT_CYCLES_SHIFT	23</div><div class='add'>+#define BNXT_DEVCLK_FREQ	1000000</div><div class='add'>+#define BNXT_LO_TIMER_MASK	0x0000ffffffffUL</div><div class='add'>+#define BNXT_HI_TIMER_MASK	0xffff00000000UL</div><div class='add'>+#define BNXT_HI_TIMER_SHIFT	24</div><div class='add'>+</div><div class='add'>+#define BNXT_PTP_DFLT_TX_TMO	1000 /* ms */</div><div class='add'>+#define BNXT_PTP_QTS_TIMEOUT	1000</div><div class='add'>+#define BNXT_PTP_QTS_MAX_TMO_US	65535U</div><div class='add'>+#define BNXT_PTP_QTS_TX_ENABLES	(PORT_TS_QUERY_REQ_ENABLES_PTP_SEQ_ID |	\</div><div class='add'>+				 PORT_TS_QUERY_REQ_ENABLES_TS_REQ_TIMEOUT | \</div><div class='add'>+				 PORT_TS_QUERY_REQ_ENABLES_PTP_HDR_OFFSET)</div><div class='add'>+</div><div class='add'>+struct pps_pin {</div><div class='add'>+	u8 event;</div><div class='add'>+	u8 usage;</div><div class='add'>+	u8 state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSIO_PIN_VALID(pin) ((pin) &gt;= 0 &amp;&amp; (pin) &lt; (BNXT_MAX_TSIO_PINS))</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA2_PPS_EVENT_TYPE(data2)				\</div><div class='add'>+	((data2) &amp; ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE)</div><div class='add'>+</div><div class='add'>+#define EVENT_DATA2_PPS_PIN_NUM(data2)					\</div><div class='add'>+	(((data2) &amp;							\</div><div class='add'>+	  ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PIN_NUMBER_MASK) &gt;&gt;\</div><div class='add'>+	 ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PIN_NUMBER_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_DATA2_UPPER_MSK						\</div><div class='add'>+	ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PPS_TIMESTAMP_UPPER_MASK</div><div class='add'>+</div><div class='add'>+#define BNXT_DATA2_UPPER_SFT						\</div><div class='add'>+	(32 -								\</div><div class='add'>+	 ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PPS_TIMESTAMP_UPPER_SFT)</div><div class='add'>+</div><div class='add'>+#define BNXT_DATA1_LOWER_MSK						\</div><div class='add'>+	ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA1_PPS_TIMESTAMP_LOWER_MASK</div><div class='add'>+</div><div class='add'>+#define BNXT_DATA1_LOWER_SFT						\</div><div class='add'>+	  ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA1_PPS_TIMESTAMP_LOWER_SFT</div><div class='add'>+</div><div class='add'>+#define EVENT_PPS_TS(data2, data1)					\</div><div class='add'>+	(((u64)((data2) &amp; BNXT_DATA2_UPPER_MSK) &lt;&lt; BNXT_DATA2_UPPER_SFT) |\</div><div class='add'>+	 (((data1) &amp; BNXT_DATA1_LOWER_MSK) &gt;&gt; BNXT_DATA1_LOWER_SFT))</div><div class='add'>+</div><div class='add'>+#define BNXT_PPS_PIN_DISABLE	0</div><div class='add'>+#define BNXT_PPS_PIN_ENABLE	1</div><div class='add'>+#define BNXT_PPS_PIN_NONE	0</div><div class='add'>+#define BNXT_PPS_PIN_PPS_IN	1</div><div class='add'>+#define BNXT_PPS_PIN_PPS_OUT	2</div><div class='add'>+#define BNXT_PPS_PIN_SYNC_IN	3</div><div class='add'>+#define BNXT_PPS_PIN_SYNC_OUT	4</div><div class='add'>+</div><div class='add'>+#define BNXT_PPS_EVENT_INTERNAL	1</div><div class='add'>+#define BNXT_PPS_EVENT_EXTERNAL	2</div><div class='add'>+</div><div class='add'>+struct bnxt_pps {</div><div class='add'>+	u8 num_pins;</div><div class='add'>+#define BNXT_MAX_TSIO_PINS	4</div><div class='add'>+	struct pps_pin pins[BNXT_MAX_TSIO_PINS];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_ptp_stats {</div><div class='add'>+	u64		ts_pkts;</div><div class='add'>+	u64		ts_lost;</div><div class='add'>+	atomic64_t	ts_err;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_MAX_TX_TS		4</div><div class='add'>+#define NEXT_TXTS(idx)		(((idx) + 1) &amp; (BNXT_MAX_TX_TS - 1))</div><div class='add'>+</div><div class='add'>+struct bnxt_ptp_tx_req {</div><div class='add'>+	struct sk_buff		*tx_skb;</div><div class='add'>+	u16			tx_seqid;</div><div class='add'>+	u16			tx_hdr_off;</div><div class='add'>+	unsigned long		abs_txts_tmo;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bnxt_ptp_cfg {</div><div class='add'>+	struct ptp_clock_info	ptp_info;</div><div class='add'>+	struct ptp_clock	*ptp_clock;</div><div class='add'>+	struct cyclecounter	cc;</div><div class='add'>+	struct timecounter	tc;</div><div class='add'>+	struct bnxt_pps		pps_info;</div><div class='add'>+	/* serialize timecounter access */</div><div class='add'>+	seqlock_t		ptp_lock;</div><div class='add'>+	/* serialize ts tx request queuing */</div><div class='add'>+	spinlock_t		ptp_tx_lock;</div><div class='add'>+	u64			current_time;</div><div class='add'>+	unsigned long		next_period;</div><div class='add'>+	unsigned long		next_overflow_check;</div><div class='add'>+	u32			cmult;</div><div class='add'>+	/* cache of upper 24 bits of cyclecoutner. 8 bits are used to check for roll-over */</div><div class='add'>+	u32			old_time;</div><div class='add'>+	/* a 23b shift cyclecounter will overflow in ~36 mins.  Check overflow every 18 mins. */</div><div class='add'>+	#define BNXT_PHC_OVERFLOW_PERIOD	(18 * 60 * HZ)</div><div class='add'>+</div><div class='add'>+	struct bnxt_ptp_tx_req	txts_req[BNXT_MAX_TX_TS];</div><div class='add'>+</div><div class='add'>+	struct bnxt		*bp;</div><div class='add'>+	u32			tx_avail;</div><div class='add'>+	u16			rxctl;</div><div class='add'>+#define BNXT_PTP_MSG_SYNC			(1 &lt;&lt; 0)</div><div class='add'>+#define BNXT_PTP_MSG_DELAY_REQ			(1 &lt;&lt; 1)</div><div class='add'>+#define BNXT_PTP_MSG_PDELAY_REQ			(1 &lt;&lt; 2)</div><div class='add'>+#define BNXT_PTP_MSG_PDELAY_RESP		(1 &lt;&lt; 3)</div><div class='add'>+#define BNXT_PTP_MSG_FOLLOW_UP			(1 &lt;&lt; 8)</div><div class='add'>+#define BNXT_PTP_MSG_DELAY_RESP			(1 &lt;&lt; 9)</div><div class='add'>+#define BNXT_PTP_MSG_PDELAY_RESP_FOLLOW_UP	(1 &lt;&lt; 10)</div><div class='add'>+#define BNXT_PTP_MSG_ANNOUNCE			(1 &lt;&lt; 11)</div><div class='add'>+#define BNXT_PTP_MSG_SIGNALING			(1 &lt;&lt; 12)</div><div class='add'>+#define BNXT_PTP_MSG_MANAGEMENT			(1 &lt;&lt; 13)</div><div class='add'>+#define BNXT_PTP_MSG_EVENTS		(BNXT_PTP_MSG_SYNC |		\</div><div class='add'>+					 BNXT_PTP_MSG_DELAY_REQ |	\</div><div class='add'>+					 BNXT_PTP_MSG_PDELAY_REQ |	\</div><div class='add'>+					 BNXT_PTP_MSG_PDELAY_RESP)</div><div class='add'>+	u8			tx_tstamp_en:1;</div><div class='add'>+	u8			rtc_configured:1;</div><div class='add'>+	int			rx_filter;</div><div class='add'>+	u32			tstamp_filters;</div><div class='add'>+</div><div class='add'>+	u32			refclk_regs[2];</div><div class='add'>+	u32			refclk_mapped_regs[2];</div><div class='add'>+	u32			txts_tmo;</div><div class='add'>+	u16			txts_prod;</div><div class='add'>+	u16			txts_cons;</div><div class='add'>+</div><div class='add'>+	struct bnxt_ptp_stats	stats;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define BNXT_PTP_INC_TX_AVAIL(ptp)		\</div><div class='add'>+do {						\</div><div class='add'>+	spin_lock_bh(&amp;(ptp)-&gt;ptp_tx_lock);	\</div><div class='add'>+	(ptp)-&gt;tx_avail++;			\</div><div class='add'>+	spin_unlock_bh(&amp;(ptp)-&gt;ptp_tx_lock);	\</div><div class='add'>+} while (0)</div><div class='add'>+</div><div class='add'>+int bnxt_ptp_parse(struct sk_buff *skb, u16 *seq_id, u16 *hdr_off);</div><div class='add'>+void bnxt_ptp_update_current_time(struct bnxt *bp);</div><div class='add'>+void bnxt_ptp_pps_event(struct bnxt *bp, u32 data1, u32 data2);</div><div class='add'>+int bnxt_ptp_cfg_tstamp_filters(struct bnxt *bp);</div><div class='add'>+void bnxt_ptp_reapply_pps(struct bnxt *bp);</div><div class='add'>+int bnxt_hwtstamp_set(struct net_device *dev,</div><div class='add'>+		      struct kernel_hwtstamp_config *stmpconf,</div><div class='add'>+		      struct netlink_ext_ack *extack);</div><div class='add'>+int bnxt_hwtstamp_get(struct net_device *dev,</div><div class='add'>+		      struct kernel_hwtstamp_config *stmpconf);</div><div class='add'>+void bnxt_ptp_free_txts_skbs(struct bnxt_ptp_cfg *ptp);</div><div class='add'>+int bnxt_ptp_get_txts_prod(struct bnxt_ptp_cfg *ptp, u16 *prod);</div><div class='add'>+void bnxt_get_tx_ts_p5(struct bnxt *bp, struct sk_buff *skb, u16 prod);</div><div class='add'>+int bnxt_get_rx_ts_p5(struct bnxt *bp, u64 *ts, u32 pkt_ts);</div><div class='add'>+void bnxt_tx_ts_cmp(struct bnxt *bp, struct bnxt_napi *bnapi,</div><div class='add'>+		    struct tx_ts_cmp *tscmp);</div><div class='add'>+void bnxt_ptp_rtc_timecounter_init(struct bnxt_ptp_cfg *ptp, u64 ns);</div><div class='add'>+int bnxt_ptp_init_rtc(struct bnxt *bp, bool phc_cfg);</div><div class='add'>+int bnxt_ptp_init(struct bnxt *bp);</div><div class='add'>+void bnxt_ptp_clear(struct bnxt *bp);</div><div class='add'>+static inline u64 bnxt_timecounter_cyc2time(struct bnxt_ptp_cfg *ptp, u64 ts)</div><div class='add'>+{</div><div class='add'>+	unsigned int seq;</div><div class='add'>+	u64 ns;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		seq = read_seqbegin(&amp;ptp-&gt;ptp_lock);</div><div class='add'>+		ns = timecounter_cyc2time(&amp;ptp-&gt;tc, ts);</div><div class='add'>+	} while (read_seqretry(&amp;ptp-&gt;ptp_lock, seq));</div><div class='add'>+</div><div class='add'>+	return ns;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 bnxt_extend_cycles_32b_to_48b(struct bnxt_ptp_cfg *ptp, u32 ts)</div><div class='add'>+{</div><div class='add'>+	u64 time, cycles;</div><div class='add'>+</div><div class='add'>+	time = (u64)READ_ONCE(ptp-&gt;old_time) &lt;&lt; BNXT_HI_TIMER_SHIFT;</div><div class='add'>+	cycles = (time &amp; BNXT_HI_TIMER_MASK) | ts;</div><div class='add'>+	if (ts &lt; (time &amp; BNXT_LO_TIMER_MASK))</div><div class='add'>+		cycles += BNXT_LO_TIMER_MASK + 1;</div><div class='add'>+	return cycles;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c<br/>index 2b90a2bb1a1d..be7deb9cc410 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c</a></div><div class='hunk'>@@ -8,14 +8,17 @@</div><div class='ctx'>  * the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;net/dcbnl.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_ulp.h"</div><div class='ctx'> #include "bnxt_sriov.h"</div><div class='ctx'> #include "bnxt_vfr.h"</div><div class='hunk'>@@ -25,47 +28,34 @@</div><div class='ctx'> static int bnxt_hwrm_fwd_async_event_cmpl(struct bnxt *bp,</div><div class='ctx'> 					  struct bnxt_vf_info *vf, u16 event_id)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_fwd_async_event_cmpl_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_fwd_async_event_cmpl_input req = {0};</div><div class='add'>+	struct hwrm_fwd_async_event_cmpl_input *req;</div><div class='ctx'> 	struct hwrm_async_event_cmpl *async_cmpl;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FWD_ASYNC_EVENT_CMPL, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FWD_ASYNC_EVENT_CMPL);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='ctx'> 	if (vf)</div><div class='del'>-		req.encap_async_event_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;encap_async_event_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='ctx'> 	else</div><div class='ctx'> 		/* broadcast this async event to all VFs */</div><div class='del'>-		req.encap_async_event_target_id = cpu_to_le16(0xffff);</div><div class='del'>-	async_cmpl = (struct hwrm_async_event_cmpl *)req.encap_async_event_cmpl;</div><div class='add'>+		req-&gt;encap_async_event_target_id = cpu_to_le16(0xffff);</div><div class='add'>+	async_cmpl =</div><div class='add'>+		(struct hwrm_async_event_cmpl *)req-&gt;encap_async_event_cmpl;</div><div class='ctx'> 	async_cmpl-&gt;type = cpu_to_le16(ASYNC_EVENT_CMPL_TYPE_HWRM_ASYNC_EVENT);</div><div class='ctx'> 	async_cmpl-&gt;event_id = cpu_to_le16(event_id);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+exit:</div><div class='add'>+	if (rc)</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "hwrm_fwd_async_event_cmpl failed. rc:%d\n",</div><div class='ctx'> 			   rc);</div><div class='del'>-		goto fwd_async_event_cmpl_exit;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (resp-&gt;error_code) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_fwd_async_event_cmpl error %d\n",</div><div class='del'>-			   resp-&gt;error_code);</div><div class='del'>-		rc = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fwd_async_event_cmpl_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_vf_ndo_prep(struct bnxt *bp, int vf_id)</div><div class='ctx'> {</div><div class='del'>-	if (!test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state)) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "vf ndo called though PF is down\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='ctx'> 	if (!bp-&gt;pf.active_vfs) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "vf ndo called though sriov is disabled\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -79,10 +69,10 @@ static int bnxt_vf_ndo_prep(struct bnxt *bp, int vf_id)</div><div class='ctx'> </div><div class='ctx'> int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct bnxt_vf_info *vf;</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	bool old_setting = false;</div><div class='add'>+	struct bnxt_vf_info *vf;</div><div class='ctx'> 	u32 func_flags;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -99,50 +89,50 @@ int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting)</div><div class='ctx'> 	if (old_setting == setting)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	func_flags = vf-&gt;func_flags;</div><div class='ctx'> 	if (setting)</div><div class='del'>-		func_flags |= FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE;</div><div class='add'>+		func_flags = FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE;</div><div class='ctx'> 	else</div><div class='del'>-		func_flags |= FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE;</div><div class='add'>+		func_flags = FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE;</div><div class='ctx'> 	/*TODO: if the driver supports VLAN filter on guest VLAN,</div><div class='ctx'> 	 * the spoof check should also include vlan anti-spoofing</div><div class='ctx'> 	 */</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.flags = cpu_to_le32(func_flags);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		vf-&gt;func_flags = func_flags;</div><div class='del'>-		if (setting)</div><div class='del'>-			vf-&gt;flags |= BNXT_VF_SPOOFCHK;</div><div class='del'>-		else</div><div class='del'>-			vf-&gt;flags &amp;= ~BNXT_VF_SPOOFCHK;</div><div class='add'>+		req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;flags = cpu_to_le32(func_flags);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			if (setting)</div><div class='add'>+				vf-&gt;flags |= BNXT_VF_SPOOFCHK;</div><div class='add'>+			else</div><div class='add'>+				vf-&gt;flags &amp;= ~BNXT_VF_SPOOFCHK;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_qcfg_flags(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_func_qcfg_input req = {0};</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc) {</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	vf-&gt;func_qcfg_flags = le16_to_cpu(resp-&gt;flags);</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return 0;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(BNXT_PF(bp) ? vf-&gt;fw_fid : 0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (!rc)</div><div class='add'>+		vf-&gt;func_qcfg_flags = le16_to_cpu(resp-&gt;flags);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool bnxt_is_trusted_vf(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='add'>+bool bnxt_is_trusted_vf(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='ctx'> {</div><div class='del'>-	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_TRUSTED_VF))</div><div class='add'>+	if (BNXT_PF(bp) &amp;&amp; !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_TRUSTED_VF))</div><div class='ctx'> 		return !!(vf-&gt;flags &amp; BNXT_VF_TRUST);</div><div class='ctx'> </div><div class='ctx'> 	bnxt_hwrm_func_qcfg_flags(bp, vf);</div><div class='hunk'>@@ -151,22 +141,22 @@ static bool bnxt_is_trusted_vf(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_set_trusted_vf(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_TRUSTED_VF))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='ctx'> 	if (vf-&gt;flags &amp; BNXT_VF_TRUST)</div><div class='del'>-		req.flags = cpu_to_le32(FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE);</div><div class='add'>+		req-&gt;flags = cpu_to_le32(FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE);</div><div class='ctx'> 	else</div><div class='del'>-		req.flags = cpu_to_le32(FUNC_CFG_REQ_FLAGS_TRUSTED_VF_DISABLE);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (rc)</div><div class='del'>-		return -EIO;</div><div class='del'>-	return 0;</div><div class='add'>+		req-&gt;flags = cpu_to_le32(FUNC_CFG_REQ_FLAGS_TRUSTED_VF_DISABLE);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_set_vf_trust(struct net_device *dev, int vf_id, bool trusted)</div><div class='hunk'>@@ -207,11 +197,8 @@ int bnxt_get_vf_config(struct net_device *dev, int vf_id,</div><div class='ctx'> 		memcpy(&amp;ivi-&gt;mac, vf-&gt;vf_mac_addr, ETH_ALEN);</div><div class='ctx'> 	ivi-&gt;max_tx_rate = vf-&gt;max_tx_rate;</div><div class='ctx'> 	ivi-&gt;min_tx_rate = vf-&gt;min_tx_rate;</div><div class='del'>-	ivi-&gt;vlan = vf-&gt;vlan;</div><div class='del'>-	if (vf-&gt;flags &amp; BNXT_VF_QOS)</div><div class='del'>-		ivi-&gt;qos = vf-&gt;vlan &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='del'>-	else</div><div class='del'>-		ivi-&gt;qos = 0;</div><div class='add'>+	ivi-&gt;vlan = vf-&gt;vlan &amp; VLAN_VID_MASK;</div><div class='add'>+	ivi-&gt;qos = vf-&gt;vlan &gt;&gt; VLAN_PRIO_SHIFT;</div><div class='ctx'> 	ivi-&gt;spoofchk = !!(vf-&gt;flags &amp; BNXT_VF_SPOOFCHK);</div><div class='ctx'> 	ivi-&gt;trusted = bnxt_is_trusted_vf(bp, vf);</div><div class='ctx'> 	if (!(vf-&gt;flags &amp; BNXT_VF_LINK_FORCED))</div><div class='hunk'>@@ -226,8 +213,8 @@ int bnxt_get_vf_config(struct net_device *dev, int vf_id,</div><div class='ctx'> </div><div class='ctx'> int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	struct bnxt_vf_info *vf;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='hunk'>@@ -243,20 +230,23 @@ int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac)</div><div class='ctx'> 	}</div><div class='ctx'> 	vf = &amp;bp-&gt;pf.vf[vf_id];</div><div class='ctx'> </div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='ctx'> 	memcpy(vf-&gt;mac_addr, mac, ETH_ALEN);</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.flags = cpu_to_le32(vf-&gt;func_flags);</div><div class='del'>-	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR);</div><div class='del'>-	memcpy(req.dflt_mac_addr, mac, ETH_ALEN);</div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR);</div><div class='add'>+	memcpy(req-&gt;dflt_mac_addr, mac, ETH_ALEN);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,</div><div class='ctx'> 		     __be16 vlan_proto)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	struct bnxt_vf_info *vf;</div><div class='ctx'> 	u16 vlan_tag;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -264,40 +254,45 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,</div><div class='ctx'> 	if (bp-&gt;hwrm_spec_code &lt; 0x10201)</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (vlan_proto != htons(ETH_P_8021Q))</div><div class='add'>+	if (vlan_proto != htons(ETH_P_8021Q) &amp;&amp;</div><div class='add'>+	    (vlan_proto != htons(ETH_P_8021AD) ||</div><div class='add'>+	     !(bp-&gt;fw_cap &amp; BNXT_FW_CAP_DFLT_VLAN_TPID_PCP)))</div><div class='ctx'> 		return -EPROTONOSUPPORT;</div><div class='ctx'> </div><div class='ctx'> 	rc = bnxt_vf_ndo_prep(bp, vf_id);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	/* TODO: needed to implement proper handling of user priority,</div><div class='del'>-	 * currently fail the command if there is valid priority</div><div class='del'>-	 */</div><div class='del'>-	if (vlan_id &gt; 4095 || qos)</div><div class='add'>+	if (vlan_id &gt;= VLAN_N_VID || qos &gt;= IEEE_8021Q_MAX_PRIORITIES ||</div><div class='add'>+	    (!vlan_id &amp;&amp; qos))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	vf = &amp;bp-&gt;pf.vf[vf_id];</div><div class='del'>-	vlan_tag = vlan_id;</div><div class='add'>+	vlan_tag = vlan_id | (u16)qos &lt;&lt; VLAN_PRIO_SHIFT;</div><div class='ctx'> 	if (vlan_tag == vf-&gt;vlan)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.flags = cpu_to_le32(vf-&gt;func_flags);</div><div class='del'>-	req.dflt_vlan = cpu_to_le16(vlan_tag);</div><div class='del'>-	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_VLAN);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc)</div><div class='del'>-		vf-&gt;vlan = vlan_tag;</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;dflt_vlan = cpu_to_le16(vlan_tag);</div><div class='add'>+		req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_VLAN);</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_DFLT_VLAN_TPID_PCP) {</div><div class='add'>+			req-&gt;enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_TPID);</div><div class='add'>+			req-&gt;tpid = vlan_proto;</div><div class='add'>+		}</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (!rc)</div><div class='add'>+			vf-&gt;vlan = vlan_tag;</div><div class='add'>+	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_set_vf_bw(struct net_device *dev, int vf_id, int min_tx_rate,</div><div class='ctx'> 		   int max_tx_rate)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	struct bnxt_vf_info *vf;</div><div class='ctx'> 	u32 pf_link_speed;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -314,28 +309,61 @@ int bnxt_set_vf_bw(struct net_device *dev, int vf_id, int min_tx_rate,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (min_tx_rate &gt; pf_link_speed || min_tx_rate &gt; max_tx_rate) {</div><div class='add'>+	if (min_tx_rate &gt; pf_link_speed) {</div><div class='ctx'> 		netdev_info(bp-&gt;dev, "min tx rate %d is invalid for VF %d\n",</div><div class='ctx'> 			    min_tx_rate, vf_id);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (min_tx_rate == vf-&gt;min_tx_rate &amp;&amp; max_tx_rate == vf-&gt;max_tx_rate)</div><div class='ctx'> 		return 0;</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.flags = cpu_to_le32(vf-&gt;func_flags);</div><div class='del'>-	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_MAX_BW);</div><div class='del'>-	req.max_bw = cpu_to_le32(max_tx_rate);</div><div class='del'>-	req.enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_MIN_BW);</div><div class='del'>-	req.min_bw = cpu_to_le32(min_tx_rate);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		vf-&gt;min_tx_rate = min_tx_rate;</div><div class='del'>-		vf-&gt;max_tx_rate = max_tx_rate;</div><div class='add'>+		req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_MAX_BW |</div><div class='add'>+					   FUNC_CFG_REQ_ENABLES_MIN_BW);</div><div class='add'>+		req-&gt;max_bw = cpu_to_le32(max_tx_rate);</div><div class='add'>+		req-&gt;min_bw = cpu_to_le32(min_tx_rate);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			vf-&gt;min_tx_rate = min_tx_rate;</div><div class='add'>+			vf-&gt;max_tx_rate = max_tx_rate;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_set_vf_link_admin_state(struct bnxt *bp, int vf_id)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	struct bnxt_vf_info *vf;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;fw_cap &amp; BNXT_FW_CAP_LINK_ADMIN))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	vf = &amp;bp-&gt;pf.vf[vf_id];</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+	switch (vf-&gt;flags &amp; (BNXT_VF_LINK_FORCED | BNXT_VF_LINK_UP)) {</div><div class='add'>+	case BNXT_VF_LINK_FORCED:</div><div class='add'>+		req-&gt;options =</div><div class='add'>+			FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_FORCED_DOWN;</div><div class='add'>+		break;</div><div class='add'>+	case (BNXT_VF_LINK_FORCED | BNXT_VF_LINK_UP):</div><div class='add'>+		req-&gt;options = FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_FORCED_UP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		req-&gt;options = FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_AUTO;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_ADMIN_LINK_STATE);</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bnxt_set_vf_link_state(struct net_device *dev, int vf_id, int link)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='hunk'>@@ -361,10 +389,11 @@ int bnxt_set_vf_link_state(struct net_device *dev, int vf_id, int link)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "Invalid link option\n");</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		break;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (vf-&gt;flags &amp; (BNXT_VF_LINK_UP | BNXT_VF_LINK_FORCED))</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_LINK_ADMIN)</div><div class='add'>+		rc = bnxt_set_vf_link_admin_state(bp, vf_id);</div><div class='add'>+	else if (vf-&gt;flags &amp; (BNXT_VF_LINK_UP | BNXT_VF_LINK_FORCED))</div><div class='ctx'> 		rc = bnxt_hwrm_fwd_async_event_cmpl(bp, vf,</div><div class='ctx'> 			ASYNC_EVENT_CMPL_EVENT_ID_LINK_STATUS_CHANGE);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -384,21 +413,22 @@ static int bnxt_set_vf_attr(struct bnxt *bp, int num_vfs)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_vf_resource_free(struct bnxt *bp, int num_vfs)</div><div class='ctx'> {</div><div class='del'>-	int i, rc = 0;</div><div class='add'>+	struct hwrm_func_vf_resc_free_input *req;</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='del'>-	struct hwrm_func_vf_resc_free_input req = {0};</div><div class='add'>+	int i, rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_VF_RESC_FREE, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_VF_RESC_FREE);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = pf-&gt;first_vf_id; i &lt; pf-&gt;first_vf_id + num_vfs; i++) {</div><div class='del'>-		req.vf_id = cpu_to_le16(i);</div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='add'>+		req-&gt;vf_id = cpu_to_le16(i);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -419,6 +449,7 @@ static void bnxt_free_vf_resources(struct bnxt *bp)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bp-&gt;pf.active_vfs = 0;</div><div class='ctx'> 	kfree(bp-&gt;pf.vf);</div><div class='ctx'> 	bp-&gt;pf.vf = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -471,37 +502,133 @@ static int bnxt_alloc_vf_resources(struct bnxt *bp, int num_vfs)</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_func_buf_rgtr(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_buf_rgtr_input req = {0};</div><div class='add'>+	struct hwrm_func_buf_rgtr_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_BUF_RGTR, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_BUF_RGTR);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;req_buf_num_pages = cpu_to_le16(bp-&gt;pf.hwrm_cmd_req_pages);</div><div class='add'>+	req-&gt;req_buf_page_size = cpu_to_le16(BNXT_PAGE_SHIFT);</div><div class='add'>+	req-&gt;req_buf_len = cpu_to_le16(BNXT_HWRM_REQ_MAX_SIZE);</div><div class='add'>+	req-&gt;req_buf_page_addr0 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[0]);</div><div class='add'>+	req-&gt;req_buf_page_addr1 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[1]);</div><div class='add'>+	req-&gt;req_buf_page_addr2 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[2]);</div><div class='add'>+	req-&gt;req_buf_page_addr3 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[3]);</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __bnxt_set_vf_params(struct bnxt *bp, int vf_id)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='add'>+	struct bnxt_vf_info *vf;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	vf = &amp;bp-&gt;pf.vf[vf_id];</div><div class='add'>+	req-&gt;fid = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(vf-&gt;mac_addr)) {</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR);</div><div class='add'>+		memcpy(req-&gt;dflt_mac_addr, vf-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+	}</div><div class='add'>+	if (vf-&gt;vlan) {</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_VLAN);</div><div class='add'>+		req-&gt;dflt_vlan = cpu_to_le16(vf-&gt;vlan);</div><div class='add'>+	}</div><div class='add'>+	if (vf-&gt;max_tx_rate) {</div><div class='add'>+		req-&gt;enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_MAX_BW |</div><div class='add'>+					    FUNC_CFG_REQ_ENABLES_MIN_BW);</div><div class='add'>+		req-&gt;max_bw = cpu_to_le32(vf-&gt;max_tx_rate);</div><div class='add'>+		req-&gt;min_bw = cpu_to_le32(vf-&gt;min_tx_rate);</div><div class='add'>+	}</div><div class='add'>+	if (vf-&gt;flags &amp; BNXT_VF_TRUST)</div><div class='add'>+		req-&gt;flags |= cpu_to_le32(FUNC_CFG_REQ_FLAGS_TRUSTED_VF_ENABLE);</div><div class='add'>+</div><div class='add'>+	return hwrm_req_send(bp, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_hwrm_roce_sriov_cfg(struct bnxt *bp, int num_vfs)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_qcaps_output *resp;</div><div class='add'>+	struct hwrm_func_cfg_input *cfg_req;</div><div class='add'>+	struct hwrm_func_qcaps_input *req;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCAPS);</div><div class='add'>+	if (rc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	req.req_buf_num_pages = cpu_to_le16(bp-&gt;pf.hwrm_cmd_req_pages);</div><div class='del'>-	req.req_buf_page_size = cpu_to_le16(BNXT_PAGE_SHIFT);</div><div class='del'>-	req.req_buf_len = cpu_to_le16(BNXT_HWRM_REQ_MAX_SIZE);</div><div class='del'>-	req.req_buf_page_addr0 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[0]);</div><div class='del'>-	req.req_buf_page_addr1 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[1]);</div><div class='del'>-	req.req_buf_page_addr2 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[2]);</div><div class='del'>-	req.req_buf_page_addr3 = cpu_to_le64(bp-&gt;pf.hwrm_cmd_req_dma_addr[3]);</div><div class='add'>+	rc = hwrm_req_init(bp, cfg_req, HWRM_FUNC_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='del'>-	return hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	/* In case of VF Dynamic resource allocation, driver will provision</div><div class='add'>+	 * maximum resources to all the VFs. FW will dynamically allocate</div><div class='add'>+	 * resources to VFs on the fly, so always divide the resources by 1.</div><div class='add'>+	 */</div><div class='add'>+	if (BNXT_ROCE_VF_DYN_ALLOC_CAP(bp))</div><div class='add'>+		num_vfs = 1;</div><div class='add'>+</div><div class='add'>+	cfg_req-&gt;fid = cpu_to_le16(0xffff);</div><div class='add'>+	cfg_req-&gt;enables2 =</div><div class='add'>+		cpu_to_le32(FUNC_CFG_REQ_ENABLES2_ROCE_MAX_AV_PER_VF |</div><div class='add'>+			    FUNC_CFG_REQ_ENABLES2_ROCE_MAX_CQ_PER_VF |</div><div class='add'>+			    FUNC_CFG_REQ_ENABLES2_ROCE_MAX_MRW_PER_VF |</div><div class='add'>+			    FUNC_CFG_REQ_ENABLES2_ROCE_MAX_QP_PER_VF |</div><div class='add'>+			    FUNC_CFG_REQ_ENABLES2_ROCE_MAX_SRQ_PER_VF |</div><div class='add'>+			    FUNC_CFG_REQ_ENABLES2_ROCE_MAX_GID_PER_VF);</div><div class='add'>+	cfg_req-&gt;roce_max_av_per_vf =</div><div class='add'>+		cpu_to_le32(le32_to_cpu(resp-&gt;roce_vf_max_av) / num_vfs);</div><div class='add'>+	cfg_req-&gt;roce_max_cq_per_vf =</div><div class='add'>+		cpu_to_le32(le32_to_cpu(resp-&gt;roce_vf_max_cq) / num_vfs);</div><div class='add'>+	cfg_req-&gt;roce_max_mrw_per_vf =</div><div class='add'>+		cpu_to_le32(le32_to_cpu(resp-&gt;roce_vf_max_mrw) / num_vfs);</div><div class='add'>+	cfg_req-&gt;roce_max_qp_per_vf =</div><div class='add'>+		cpu_to_le32(le32_to_cpu(resp-&gt;roce_vf_max_qp) / num_vfs);</div><div class='add'>+	cfg_req-&gt;roce_max_srq_per_vf =</div><div class='add'>+		cpu_to_le32(le32_to_cpu(resp-&gt;roce_vf_max_srq) / num_vfs);</div><div class='add'>+	cfg_req-&gt;roce_max_gid_per_vf =</div><div class='add'>+		cpu_to_le32(le32_to_cpu(resp-&gt;roce_vf_max_gid) / num_vfs);</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_send(bp, cfg_req);</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "RoCE sriov configuration failed\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Only called by PF to reserve resources for VFs, returns actual number of</div><div class='ctx'>  * VFs configured, or &lt; 0 on error.</div><div class='ctx'>  */</div><div class='del'>-static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs)</div><div class='add'>+static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs, bool reset)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_vf_resource_cfg_input req = {0};</div><div class='add'>+	struct hwrm_func_vf_resource_cfg_input *req;</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='ctx'> 	u16 vf_tx_rings, vf_rx_rings, vf_cp_rings;</div><div class='ctx'> 	u16 vf_stat_ctx, vf_vnics, vf_ring_grps;</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='ctx'> 	int i, rc = 0, min = 1;</div><div class='ctx'> 	u16 vf_msix = 0;</div><div class='add'>+	u16 vf_rss;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_VF_RESOURCE_CFG, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_VF_RESOURCE_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5) {</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS) {</div><div class='ctx'> 		vf_msix = hw_resc-&gt;max_nqs - bnxt_nq_rings_in_use(bp);</div><div class='ctx'> 		vf_ring_grps = 0;</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -515,79 +642,98 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs)</div><div class='ctx'> 		vf_rx_rings = hw_resc-&gt;max_rx_rings - bp-&gt;rx_nr_rings;</div><div class='ctx'> 	vf_tx_rings = hw_resc-&gt;max_tx_rings - bp-&gt;tx_nr_rings;</div><div class='ctx'> 	vf_vnics = hw_resc-&gt;max_vnics - bp-&gt;nr_vnics;</div><div class='del'>-	vf_vnics = min_t(u16, vf_vnics, vf_rx_rings);</div><div class='add'>+	vf_rss = hw_resc-&gt;max_rsscos_ctxs - bp-&gt;rsscos_nr_ctxs;</div><div class='ctx'> </div><div class='del'>-	req.min_rsscos_ctx = cpu_to_le16(BNXT_VF_MIN_RSS_CTX);</div><div class='del'>-	req.max_rsscos_ctx = cpu_to_le16(BNXT_VF_MAX_RSS_CTX);</div><div class='add'>+	req-&gt;min_rsscos_ctx = cpu_to_le16(BNXT_VF_MIN_RSS_CTX);</div><div class='ctx'> 	if (pf-&gt;vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL_STATIC) {</div><div class='ctx'> 		min = 0;</div><div class='del'>-		req.min_rsscos_ctx = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_rsscos_ctx = cpu_to_le16(min);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (pf-&gt;vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL ||</div><div class='ctx'> 	    pf-&gt;vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL_STATIC) {</div><div class='del'>-		req.min_cmpl_rings = cpu_to_le16(min);</div><div class='del'>-		req.min_tx_rings = cpu_to_le16(min);</div><div class='del'>-		req.min_rx_rings = cpu_to_le16(min);</div><div class='del'>-		req.min_l2_ctxs = cpu_to_le16(min);</div><div class='del'>-		req.min_vnics = cpu_to_le16(min);</div><div class='del'>-		req.min_stat_ctx = cpu_to_le16(min);</div><div class='del'>-		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5))</div><div class='del'>-			req.min_hw_ring_grps = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_cmpl_rings = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_tx_rings = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_rx_rings = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_l2_ctxs = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_vnics = cpu_to_le16(min);</div><div class='add'>+		req-&gt;min_stat_ctx = cpu_to_le16(min);</div><div class='add'>+		if (!(bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS))</div><div class='add'>+			req-&gt;min_hw_ring_grps = cpu_to_le16(min);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		vf_cp_rings /= num_vfs;</div><div class='ctx'> 		vf_tx_rings /= num_vfs;</div><div class='ctx'> 		vf_rx_rings /= num_vfs;</div><div class='del'>-		vf_vnics /= num_vfs;</div><div class='add'>+		if ((bp-&gt;fw_cap &amp; BNXT_FW_CAP_PRE_RESV_VNICS) &amp;&amp;</div><div class='add'>+		    vf_vnics &gt;= pf-&gt;max_vfs) {</div><div class='add'>+			/* Take into account that FW has pre-reserved 1 VNIC for</div><div class='add'>+			 * each pf-&gt;max_vfs.</div><div class='add'>+			 */</div><div class='add'>+			vf_vnics = (vf_vnics - pf-&gt;max_vfs + num_vfs) / num_vfs;</div><div class='add'>+		} else {</div><div class='add'>+			vf_vnics /= num_vfs;</div><div class='add'>+		}</div><div class='ctx'> 		vf_stat_ctx /= num_vfs;</div><div class='ctx'> 		vf_ring_grps /= num_vfs;</div><div class='del'>-</div><div class='del'>-		req.min_cmpl_rings = cpu_to_le16(vf_cp_rings);</div><div class='del'>-		req.min_tx_rings = cpu_to_le16(vf_tx_rings);</div><div class='del'>-		req.min_rx_rings = cpu_to_le16(vf_rx_rings);</div><div class='del'>-		req.min_l2_ctxs = cpu_to_le16(BNXT_VF_MAX_L2_CTX);</div><div class='del'>-		req.min_vnics = cpu_to_le16(vf_vnics);</div><div class='del'>-		req.min_stat_ctx = cpu_to_le16(vf_stat_ctx);</div><div class='del'>-		req.min_hw_ring_grps = cpu_to_le16(vf_ring_grps);</div><div class='add'>+		vf_rss /= num_vfs;</div><div class='add'>+</div><div class='add'>+		vf_vnics = min_t(u16, vf_vnics, vf_rx_rings);</div><div class='add'>+		req-&gt;min_cmpl_rings = cpu_to_le16(vf_cp_rings);</div><div class='add'>+		req-&gt;min_tx_rings = cpu_to_le16(vf_tx_rings);</div><div class='add'>+		req-&gt;min_rx_rings = cpu_to_le16(vf_rx_rings);</div><div class='add'>+		req-&gt;min_l2_ctxs = cpu_to_le16(BNXT_VF_MAX_L2_CTX);</div><div class='add'>+		req-&gt;min_vnics = cpu_to_le16(vf_vnics);</div><div class='add'>+		req-&gt;min_stat_ctx = cpu_to_le16(vf_stat_ctx);</div><div class='add'>+		req-&gt;min_hw_ring_grps = cpu_to_le16(vf_ring_grps);</div><div class='add'>+		req-&gt;min_rsscos_ctx = cpu_to_le16(vf_rss);</div><div class='ctx'> 	}</div><div class='del'>-	req.max_cmpl_rings = cpu_to_le16(vf_cp_rings);</div><div class='del'>-	req.max_tx_rings = cpu_to_le16(vf_tx_rings);</div><div class='del'>-	req.max_rx_rings = cpu_to_le16(vf_rx_rings);</div><div class='del'>-	req.max_l2_ctxs = cpu_to_le16(BNXT_VF_MAX_L2_CTX);</div><div class='del'>-	req.max_vnics = cpu_to_le16(vf_vnics);</div><div class='del'>-	req.max_stat_ctx = cpu_to_le16(vf_stat_ctx);</div><div class='del'>-	req.max_hw_ring_grps = cpu_to_le16(vf_ring_grps);</div><div class='del'>-	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-		req.max_msix = cpu_to_le16(vf_msix / num_vfs);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	req-&gt;max_cmpl_rings = cpu_to_le16(vf_cp_rings);</div><div class='add'>+	req-&gt;max_tx_rings = cpu_to_le16(vf_tx_rings);</div><div class='add'>+	req-&gt;max_rx_rings = cpu_to_le16(vf_rx_rings);</div><div class='add'>+	req-&gt;max_l2_ctxs = cpu_to_le16(BNXT_VF_MAX_L2_CTX);</div><div class='add'>+	req-&gt;max_vnics = cpu_to_le16(vf_vnics);</div><div class='add'>+	req-&gt;max_stat_ctx = cpu_to_le16(vf_stat_ctx);</div><div class='add'>+	req-&gt;max_hw_ring_grps = cpu_to_le16(vf_ring_grps);</div><div class='add'>+	req-&gt;max_rsscos_ctx = cpu_to_le16(vf_rss);</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+		req-&gt;max_msix = cpu_to_le16(vf_msix / num_vfs);</div><div class='add'>+</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = 0; i &lt; num_vfs; i++) {</div><div class='del'>-		req.vf_id = cpu_to_le16(pf-&gt;first_vf_id + i);</div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='del'>-		if (rc) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='add'>+		struct bnxt_vf_info *vf = &amp;pf-&gt;vf[i];</div><div class='add'>+</div><div class='add'>+		vf-&gt;fw_fid = pf-&gt;first_vf_id + i;</div><div class='add'>+		rc = bnxt_set_vf_link_admin_state(bp, i);</div><div class='add'>+		if (rc)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (reset)</div><div class='add'>+			__bnxt_set_vf_params(bp, i);</div><div class='add'>+</div><div class='add'>+		req-&gt;vf_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (rc)</div><div class='ctx'> 			break;</div><div class='del'>-		}</div><div class='ctx'> 		pf-&gt;active_vfs = i + 1;</div><div class='del'>-		pf-&gt;vf[i].fw_fid = pf-&gt;first_vf_id + i;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+</div><div class='ctx'> 	if (pf-&gt;active_vfs) {</div><div class='ctx'> 		u16 n = pf-&gt;active_vfs;</div><div class='ctx'> </div><div class='del'>-		hw_resc-&gt;max_tx_rings -= le16_to_cpu(req.min_tx_rings) * n;</div><div class='del'>-		hw_resc-&gt;max_rx_rings -= le16_to_cpu(req.min_rx_rings) * n;</div><div class='del'>-		hw_resc-&gt;max_hw_ring_grps -= le16_to_cpu(req.min_hw_ring_grps) *</div><div class='del'>-					     n;</div><div class='del'>-		hw_resc-&gt;max_cp_rings -= le16_to_cpu(req.min_cmpl_rings) * n;</div><div class='del'>-		hw_resc-&gt;max_rsscos_ctxs -= pf-&gt;active_vfs;</div><div class='del'>-		hw_resc-&gt;max_stat_ctxs -= le16_to_cpu(req.min_stat_ctx) * n;</div><div class='del'>-		hw_resc-&gt;max_vnics -= le16_to_cpu(req.min_vnics) * n;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5)</div><div class='del'>-			hw_resc-&gt;max_irqs -= vf_msix * n;</div><div class='add'>+		hw_resc-&gt;max_tx_rings -= le16_to_cpu(req-&gt;min_tx_rings) * n;</div><div class='add'>+		hw_resc-&gt;max_rx_rings -= le16_to_cpu(req-&gt;min_rx_rings) * n;</div><div class='add'>+		hw_resc-&gt;max_hw_ring_grps -=</div><div class='add'>+			le16_to_cpu(req-&gt;min_hw_ring_grps) * n;</div><div class='add'>+		hw_resc-&gt;max_cp_rings -= le16_to_cpu(req-&gt;min_cmpl_rings) * n;</div><div class='add'>+		hw_resc-&gt;max_rsscos_ctxs -=</div><div class='add'>+			le16_to_cpu(req-&gt;min_rsscos_ctx) * n;</div><div class='add'>+		hw_resc-&gt;max_stat_ctxs -= le16_to_cpu(req-&gt;min_stat_ctx) * n;</div><div class='add'>+		hw_resc-&gt;max_vnics -= le16_to_cpu(req-&gt;min_vnics) * n;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			hw_resc-&gt;max_nqs -= vf_msix;</div><div class='ctx'> </div><div class='ctx'> 		rc = pf-&gt;active_vfs;</div><div class='ctx'> 	}</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -596,15 +742,18 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs)</div><div class='ctx'>  */</div><div class='ctx'> static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)</div><div class='ctx'> {</div><div class='del'>-	u32 rc = 0, mtu, i;</div><div class='ctx'> 	u16 vf_tx_rings, vf_rx_rings, vf_cp_rings, vf_stat_ctx, vf_vnics;</div><div class='ctx'> 	struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='del'>-	struct hwrm_func_cfg_input req = {0};</div><div class='ctx'> 	struct bnxt_pf_info *pf = &amp;bp-&gt;pf;</div><div class='add'>+	struct hwrm_func_cfg_input *req;</div><div class='ctx'> 	int total_vf_tx_rings = 0;</div><div class='ctx'> 	u16 vf_ring_grps;</div><div class='add'>+	u32 mtu, i;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_CFG, -1, -1);</div><div class='add'>+	rc = bnxt_hwrm_func_cfg_short_req_init(bp, &amp;req);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Remaining rings are distributed equally amongs VF's for now */</div><div class='ctx'> 	vf_cp_rings = bnxt_get_avail_cp_rings_for_en(bp) / num_vfs;</div><div class='hunk'>@@ -620,52 +769,55 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)</div><div class='ctx'> 	vf_vnics = (hw_resc-&gt;max_vnics - bp-&gt;nr_vnics) / num_vfs;</div><div class='ctx'> 	vf_vnics = min_t(u16, vf_vnics, vf_rx_rings);</div><div class='ctx'> </div><div class='del'>-	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_MTU |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_MRU |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_L2_CTXS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_VNICS |</div><div class='del'>-				  FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS);</div><div class='del'>-</div><div class='del'>-	mtu = bp-&gt;dev-&gt;mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;</div><div class='del'>-	req.mru = cpu_to_le16(mtu);</div><div class='del'>-	req.mtu = cpu_to_le16(mtu);</div><div class='del'>-</div><div class='del'>-	req.num_rsscos_ctxs = cpu_to_le16(1);</div><div class='del'>-	req.num_cmpl_rings = cpu_to_le16(vf_cp_rings);</div><div class='del'>-	req.num_tx_rings = cpu_to_le16(vf_tx_rings);</div><div class='del'>-	req.num_rx_rings = cpu_to_le16(vf_rx_rings);</div><div class='del'>-	req.num_hw_ring_grps = cpu_to_le16(vf_ring_grps);</div><div class='del'>-	req.num_l2_ctxs = cpu_to_le16(4);</div><div class='del'>-</div><div class='del'>-	req.num_vnics = cpu_to_le16(vf_vnics);</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_ADMIN_MTU |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_MRU |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_RSSCOS_CTXS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_CMPL_RINGS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_TX_RINGS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_RX_RINGS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_L2_CTXS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_VNICS |</div><div class='add'>+				   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_LINK_ADMIN) {</div><div class='add'>+		req-&gt;options = FUNC_CFG_REQ_OPTIONS_LINK_ADMIN_STATE_AUTO;</div><div class='add'>+		req-&gt;enables |=</div><div class='add'>+			cpu_to_le32(FUNC_CFG_REQ_ENABLES_ADMIN_LINK_STATE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mtu = bp-&gt;dev-&gt;mtu + VLAN_ETH_HLEN;</div><div class='add'>+	req-&gt;mru = cpu_to_le16(mtu);</div><div class='add'>+	req-&gt;admin_mtu = cpu_to_le16(mtu);</div><div class='add'>+</div><div class='add'>+	req-&gt;num_rsscos_ctxs = cpu_to_le16(1);</div><div class='add'>+	req-&gt;num_cmpl_rings = cpu_to_le16(vf_cp_rings);</div><div class='add'>+	req-&gt;num_tx_rings = cpu_to_le16(vf_tx_rings);</div><div class='add'>+	req-&gt;num_rx_rings = cpu_to_le16(vf_rx_rings);</div><div class='add'>+	req-&gt;num_hw_ring_grps = cpu_to_le16(vf_ring_grps);</div><div class='add'>+	req-&gt;num_l2_ctxs = cpu_to_le16(4);</div><div class='add'>+</div><div class='add'>+	req-&gt;num_vnics = cpu_to_le16(vf_vnics);</div><div class='ctx'> 	/* FIXME spec currently uses 1 bit for stats ctx */</div><div class='del'>-	req.num_stat_ctxs = cpu_to_le16(vf_stat_ctx);</div><div class='add'>+	req-&gt;num_stat_ctxs = cpu_to_le16(vf_stat_ctx);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_hold(bp, req);</div><div class='ctx'> 	for (i = 0; i &lt; num_vfs; i++) {</div><div class='ctx'> 		int vf_tx_rsvd = vf_tx_rings;</div><div class='ctx'> </div><div class='del'>-		req.fid = cpu_to_le16(pf-&gt;first_vf_id + i);</div><div class='del'>-		rc = _hwrm_send_message(bp, &amp;req, sizeof(req),</div><div class='del'>-					HWRM_CMD_TIMEOUT);</div><div class='add'>+		req-&gt;fid = cpu_to_le16(pf-&gt;first_vf_id + i);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> 		pf-&gt;active_vfs = i + 1;</div><div class='del'>-		pf-&gt;vf[i].fw_fid = le16_to_cpu(req.fid);</div><div class='add'>+		pf-&gt;vf[i].fw_fid = le16_to_cpu(req-&gt;fid);</div><div class='ctx'> 		rc = __bnxt_hwrm_get_tx_rings(bp, pf-&gt;vf[i].fw_fid,</div><div class='ctx'> 					      &amp;vf_tx_rsvd);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			break;</div><div class='ctx'> 		total_vf_tx_rings += vf_tx_rsvd;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -ENOMEM;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	if (pf-&gt;active_vfs) {</div><div class='ctx'> 		hw_resc-&gt;max_tx_rings -= total_vf_tx_rings;</div><div class='ctx'> 		hw_resc-&gt;max_rx_rings -= vf_rx_rings * num_vfs;</div><div class='hunk'>@@ -679,14 +831,42 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_func_cfg(struct bnxt *bp, int num_vfs)</div><div class='add'>+static int bnxt_func_cfg(struct bnxt *bp, int num_vfs, bool reset)</div><div class='ctx'> {</div><div class='ctx'> 	if (BNXT_NEW_RM(bp))</div><div class='del'>-		return bnxt_hwrm_func_vf_resc_cfg(bp, num_vfs);</div><div class='add'>+		return bnxt_hwrm_func_vf_resc_cfg(bp, num_vfs, reset);</div><div class='ctx'> 	else</div><div class='ctx'> 		return bnxt_hwrm_func_cfg(bp, num_vfs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs, bool reset)</div><div class='add'>+{</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	/* Register buffers for VFs */</div><div class='add'>+	rc = bnxt_hwrm_func_buf_rgtr(bp);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	/* Reserve resources for VFs */</div><div class='add'>+	rc = bnxt_func_cfg(bp, *num_vfs, reset);</div><div class='add'>+	if (rc != *num_vfs) {</div><div class='add'>+		if (rc &lt;= 0) {</div><div class='add'>+			netdev_warn(bp-&gt;dev, "Unable to reserve resources for SRIOV.\n");</div><div class='add'>+			*num_vfs = 0;</div><div class='add'>+			return rc;</div><div class='add'>+		}</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Only able to reserve resources for %d VFs.\n",</div><div class='add'>+			    rc);</div><div class='add'>+		*num_vfs = rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (BNXT_RDMA_SRIOV_EN(bp) &amp;&amp; BNXT_ROCE_VF_RESC_CAP(bp))</div><div class='add'>+		bnxt_hwrm_roce_sriov_cfg(bp, *num_vfs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0, vfs_supported;</div><div class='hunk'>@@ -695,7 +875,7 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)</div><div class='ctx'> 	int tx_ok = 0, rx_ok = 0, rss_ok = 0;</div><div class='ctx'> 	int avail_cp, avail_stat;</div><div class='ctx'> </div><div class='del'>-	/* Check if we can enable requested num of vf's. At a mininum</div><div class='add'>+	/* Check if we can enable requested num of vf's. At a minimum</div><div class='ctx'> 	 * we require 1 RX 1 TX rings for each VF. In this minimum conf</div><div class='ctx'> 	 * features like TPA will not be available.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -752,42 +932,46 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out1;</div><div class='ctx'> </div><div class='del'>-	/* Reserve resources for VFs */</div><div class='del'>-	rc = bnxt_func_cfg(bp, *num_vfs);</div><div class='del'>-	if (rc != *num_vfs) {</div><div class='del'>-		if (rc &lt;= 0) {</div><div class='del'>-			netdev_warn(bp-&gt;dev, "Unable to reserve resources for SRIOV.\n");</div><div class='del'>-			*num_vfs = 0;</div><div class='del'>-			goto err_out2;</div><div class='del'>-		}</div><div class='del'>-		netdev_warn(bp-&gt;dev, "Only able to reserve resources for %d VFs.\n", rc);</div><div class='del'>-		*num_vfs = rc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register buffers for VFs */</div><div class='del'>-	rc = bnxt_hwrm_func_buf_rgtr(bp);</div><div class='add'>+	rc = bnxt_cfg_hw_sriov(bp, num_vfs, false);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out2;</div><div class='ctx'> </div><div class='del'>-	bnxt_ulp_sriov_cfg(bp, *num_vfs);</div><div class='del'>-</div><div class='ctx'> 	rc = pci_enable_sriov(bp-&gt;pdev, *num_vfs);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		goto err_out2;</div><div class='ctx'> </div><div class='add'>+	if (bp-&gt;eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Create representors for VFs in switchdev mode */</div><div class='add'>+	devl_lock(bp-&gt;dl);</div><div class='add'>+	rc = bnxt_vf_reps_create(bp);</div><div class='add'>+	devl_unlock(bp-&gt;dl);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_info(bp-&gt;dev, "Cannot enable VFS as representors cannot be created\n");</div><div class='add'>+		goto err_out3;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_out3:</div><div class='add'>+	/* Disable SR-IOV */</div><div class='add'>+	pci_disable_sriov(bp-&gt;pdev);</div><div class='add'>+</div><div class='ctx'> err_out2:</div><div class='ctx'> 	/* Free the resources reserved for various VF's */</div><div class='ctx'> 	bnxt_hwrm_func_vf_resource_free(bp, *num_vfs);</div><div class='ctx'> </div><div class='add'>+	/* Restore the max resources */</div><div class='add'>+	bnxt_hwrm_func_qcaps(bp);</div><div class='add'>+</div><div class='ctx'> err_out1:</div><div class='ctx'> 	bnxt_free_vf_resources(bp);</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bnxt_sriov_disable(struct bnxt *bp)</div><div class='add'>+void __bnxt_sriov_disable(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u16 num_vfs = pci_num_vf(bp-&gt;pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -795,7 +979,7 @@ void bnxt_sriov_disable(struct bnxt *bp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	/* synchronize VF and VF-rep create and destroy */</div><div class='del'>-	mutex_lock(&amp;bp-&gt;sriov_lock);</div><div class='add'>+	devl_lock(bp-&gt;dl);</div><div class='ctx'> 	bnxt_vf_reps_destroy(bp);</div><div class='ctx'> </div><div class='ctx'> 	if (pci_vfs_assigned(bp-&gt;pdev)) {</div><div class='hunk'>@@ -808,17 +992,24 @@ void bnxt_sriov_disable(struct bnxt *bp)</div><div class='ctx'> 		/* Free the HW resources reserved for various VF's */</div><div class='ctx'> 		bnxt_hwrm_func_vf_resource_free(bp, num_vfs);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;sriov_lock);</div><div class='add'>+	devl_unlock(bp-&gt;dl);</div><div class='ctx'> </div><div class='ctx'> 	bnxt_free_vf_resources(bp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_sriov_disable(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (!pci_num_vf(bp-&gt;pdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__bnxt_sriov_disable(bp);</div><div class='ctx'> </div><div class='del'>-	bp-&gt;pf.active_vfs = 0;</div><div class='ctx'> 	/* Reclaim all resources for the PF. */</div><div class='ctx'> 	rtnl_lock();</div><div class='add'>+	netdev_lock(bp-&gt;dev);</div><div class='ctx'> 	bnxt_restore_pf_fw_resources(bp);</div><div class='add'>+	netdev_unlock(bp-&gt;dev);</div><div class='ctx'> 	rtnl_unlock();</div><div class='del'>-</div><div class='del'>-	bnxt_ulp_sriov_cfg(bp, 0);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_sriov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='hunk'>@@ -826,18 +1017,22 @@ int bnxt_sriov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX)) {</div><div class='del'>-		netdev_warn(dev, "Not allow SRIOV if the irq mode is not MSIX\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	rtnl_lock();</div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	if (!netif_running(dev)) {</div><div class='ctx'> 		netdev_warn(dev, "Reject SRIOV config request since if is down!\n");</div><div class='add'>+		netdev_unlock(dev);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	if (test_bit(BNXT_STATE_IN_FW_RESET, &amp;bp-&gt;state)) {</div><div class='add'>+		netdev_warn(dev, "Reject SRIOV config request when FW reset is in progress\n");</div><div class='add'>+		netdev_unlock(dev);</div><div class='ctx'> 		rtnl_unlock();</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;sriov_cfg = true;</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> </div><div class='ctx'> 	if (pci_vfs_assigned(bp-&gt;pdev)) {</div><div class='hunk'>@@ -868,109 +1063,75 @@ static int bnxt_hwrm_fwd_resp(struct bnxt *bp, struct bnxt_vf_info *vf,</div><div class='ctx'> 			      void *encap_resp, __le64 encap_resp_addr,</div><div class='ctx'> 			      __le16 encap_resp_cpr, u32 msg_size)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct hwrm_fwd_resp_input req = {0};</div><div class='del'>-	struct hwrm_fwd_resp_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_fwd_resp_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	if (BNXT_FWD_RESP_SIZE_ERR(msg_size))</div><div class='add'>+	if (BNXT_FWD_RESP_SIZE_ERR(msg_size)) {</div><div class='add'>+		netdev_warn_once(bp-&gt;dev, "HWRM fwd response too big (%d bytes)\n",</div><div class='add'>+				 msg_size);</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FWD_RESP, -1, -1);</div><div class='del'>-</div><div class='del'>-	/* Set the new target id */</div><div class='del'>-	req.target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.encap_resp_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.encap_resp_len = cpu_to_le16(msg_size);</div><div class='del'>-	req.encap_resp_addr = encap_resp_addr;</div><div class='del'>-	req.encap_resp_cmpl_ring = encap_resp_cpr;</div><div class='del'>-	memcpy(req.encap_resp, encap_resp, msg_size);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_fwd_resp failed. rc:%d\n", rc);</div><div class='del'>-		goto fwd_resp_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (resp-&gt;error_code) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_fwd_resp error %d\n",</div><div class='del'>-			   resp-&gt;error_code);</div><div class='del'>-		rc = -1;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FWD_RESP);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		/* Set the new target id */</div><div class='add'>+		req-&gt;target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;encap_resp_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;encap_resp_len = cpu_to_le16(msg_size);</div><div class='add'>+		req-&gt;encap_resp_addr = encap_resp_addr;</div><div class='add'>+		req-&gt;encap_resp_cmpl_ring = encap_resp_cpr;</div><div class='add'>+		memcpy(req-&gt;encap_resp, encap_resp, msg_size);</div><div class='add'>+</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-fwd_resp_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm_fwd_resp failed. rc:%d\n", rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_fwd_err_resp(struct bnxt *bp, struct bnxt_vf_info *vf,</div><div class='ctx'> 				  u32 msg_size)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct hwrm_reject_fwd_resp_input req = {0};</div><div class='del'>-	struct hwrm_reject_fwd_resp_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_reject_fwd_resp_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_REJ_FWD_RESP_SIZE_ERR(msg_size))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_REJECT_FWD_RESP, -1, -1);</div><div class='del'>-	/* Set the new target id */</div><div class='del'>-	req.target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.encap_resp_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	memcpy(req.encap_request, vf-&gt;hwrm_cmd_req_addr, msg_size);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_fwd_err_resp failed. rc:%d\n", rc);</div><div class='del'>-		goto fwd_err_resp_exit;</div><div class='del'>-	}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_REJECT_FWD_RESP);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		/* Set the new target id */</div><div class='add'>+		req-&gt;target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;encap_resp_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		memcpy(req-&gt;encap_request, vf-&gt;hwrm_cmd_req_addr, msg_size);</div><div class='ctx'> </div><div class='del'>-	if (resp-&gt;error_code) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_fwd_err_resp error %d\n",</div><div class='del'>-			   resp-&gt;error_code);</div><div class='del'>-		rc = -1;</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-fwd_err_resp_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm_fwd_err_resp failed. rc:%d\n", rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, struct bnxt_vf_info *vf,</div><div class='ctx'> 				   u32 msg_size)</div><div class='ctx'> {</div><div class='del'>-	int rc = 0;</div><div class='del'>-	struct hwrm_exec_fwd_resp_input req = {0};</div><div class='del'>-	struct hwrm_exec_fwd_resp_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_exec_fwd_resp_input *req;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	if (BNXT_EXEC_FWD_RESP_SIZE_ERR(msg_size))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_EXEC_FWD_RESP, -1, -1);</div><div class='del'>-	/* Set the new target id */</div><div class='del'>-	req.target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	req.encap_resp_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='del'>-	memcpy(req.encap_request, vf-&gt;hwrm_cmd_req_addr, msg_size);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-</div><div class='del'>-	if (rc) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_exec_fw_resp failed. rc:%d\n", rc);</div><div class='del'>-		goto exec_fwd_resp_exit;</div><div class='del'>-	}</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_EXEC_FWD_RESP);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		/* Set the new target id */</div><div class='add'>+		req-&gt;target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		req-&gt;encap_resp_target_id = cpu_to_le16(vf-&gt;fw_fid);</div><div class='add'>+		memcpy(req-&gt;encap_request, vf-&gt;hwrm_cmd_req_addr, msg_size);</div><div class='ctx'> </div><div class='del'>-	if (resp-&gt;error_code) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "hwrm_exec_fw_resp error %d\n",</div><div class='del'>-			   resp-&gt;error_code);</div><div class='del'>-		rc = -1;</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-exec_fwd_resp_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_err(bp-&gt;dev, "hwrm_exec_fw_resp failed. rc:%d\n", rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1024,7 +1185,7 @@ static int bnxt_vf_validate_set_mac(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='ctx'> 		/* There are two cases:</div><div class='ctx'> 		 * 1.If firmware spec &lt; 0x10202,VF MAC address is not forwarded</div><div class='ctx'> 		 *   to the PF and so it doesn't have to match</div><div class='del'>-		 * 2.Allow VF to modify it's own MAC when PF has not assigned a</div><div class='add'>+		 * 2.Allow VF to modify its own MAC when PF has not assigned a</div><div class='ctx'> 		 *   valid MAC address and firmware spec &gt;= 0x10202</div><div class='ctx'> 		 */</div><div class='ctx'> 		mac_ok = true;</div><div class='hunk'>@@ -1043,17 +1204,22 @@ static int bnxt_vf_set_link(struct bnxt *bp, struct bnxt_vf_info *vf)</div><div class='ctx'> 		rc = bnxt_hwrm_exec_fwd_resp(</div><div class='ctx'> 			bp, vf, sizeof(struct hwrm_port_phy_qcfg_input));</div><div class='ctx'> 	} else {</div><div class='del'>-		struct hwrm_port_phy_qcfg_output phy_qcfg_resp;</div><div class='add'>+		struct hwrm_port_phy_qcfg_output_compat phy_qcfg_resp = {};</div><div class='ctx'> 		struct hwrm_port_phy_qcfg_input *phy_qcfg_req;</div><div class='ctx'> </div><div class='ctx'> 		phy_qcfg_req =</div><div class='ctx'> 		(struct hwrm_port_phy_qcfg_input *)vf-&gt;hwrm_cmd_req_addr;</div><div class='del'>-		mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		mutex_lock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 		memcpy(&amp;phy_qcfg_resp, &amp;bp-&gt;link_info.phy_qcfg_resp,</div><div class='ctx'> 		       sizeof(phy_qcfg_resp));</div><div class='del'>-		mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+		mutex_unlock(&amp;bp-&gt;link_lock);</div><div class='ctx'> 		phy_qcfg_resp.resp_len = cpu_to_le16(sizeof(phy_qcfg_resp));</div><div class='ctx'> 		phy_qcfg_resp.seq_id = phy_qcfg_req-&gt;seq_id;</div><div class='add'>+		/* New SPEEDS2 fields are beyond the legacy structure, so</div><div class='add'>+		 * clear the SPEEDS2_SUPPORTED flag.</div><div class='add'>+		 */</div><div class='add'>+		phy_qcfg_resp.option_flags &amp;=</div><div class='add'>+			~PORT_PHY_QCAPS_RESP_FLAGS2_SPEEDS2_SUPPORTED;</div><div class='ctx'> 		phy_qcfg_resp.valid = 1;</div><div class='ctx'> </div><div class='ctx'> 		if (vf-&gt;flags &amp; BNXT_VF_LINK_UP) {</div><div class='hunk'>@@ -1133,16 +1299,52 @@ void bnxt_hwrm_exec_fwd_req(struct bnxt *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int bnxt_approve_mac(struct bnxt *bp, const u8 *mac, bool strict)</div><div class='add'>+{</div><div class='add'>+	struct hwrm_func_vf_cfg_input *req;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	if (!BNXT_VF(bp))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10202) {</div><div class='add'>+		if (is_valid_ether_addr(bp-&gt;vf.mac_addr))</div><div class='add'>+			rc = -EADDRNOTAVAIL;</div><div class='add'>+		goto mac_done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_VF_CFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto mac_done;</div><div class='add'>+</div><div class='add'>+	req-&gt;enables = cpu_to_le32(FUNC_VF_CFG_REQ_ENABLES_DFLT_MAC_ADDR);</div><div class='add'>+	memcpy(req-&gt;dflt_mac_addr, mac, ETH_ALEN);</div><div class='add'>+	if (!strict)</div><div class='add'>+		hwrm_req_flags(bp, req, BNXT_HWRM_CTX_SILENT);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+mac_done:</div><div class='add'>+	if (rc &amp;&amp; strict) {</div><div class='add'>+		rc = -EADDRNOTAVAIL;</div><div class='add'>+		netdev_warn(bp-&gt;dev, "VF MAC address %pM not approved by the PF\n",</div><div class='add'>+			    mac);</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void bnxt_update_vf_mac(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_qcaps_input req = {0};</div><div class='del'>-	struct hwrm_func_qcaps_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='add'>+	struct hwrm_func_qcaps_output *resp;</div><div class='add'>+	struct hwrm_func_qcaps_input *req;</div><div class='add'>+	bool inform_pf = false;</div><div class='add'>+</div><div class='add'>+	if (hwrm_req_init(bp, req, HWRM_FUNC_QCAPS))</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCAPS, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(0xffff);</div><div class='add'>+	req-&gt;fid = cpu_to_le16(0xffff);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	if (_hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT))</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	if (hwrm_req_send(bp, req))</div><div class='ctx'> 		goto update_vf_mac_exit;</div><div class='ctx'> </div><div class='ctx'> 	/* Store MAC address from the firmware.  There are 2 cases:</div><div class='hunk'>@@ -1152,45 +1354,34 @@ void bnxt_update_vf_mac(struct bnxt *bp)</div><div class='ctx'> 	 *    default but the stored zero MAC will allow the VF user to change</div><div class='ctx'> 	 *    the random MAC address using ndo_set_mac_address() if he wants.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!ether_addr_equal(resp-&gt;mac_address, bp-&gt;vf.mac_addr))</div><div class='add'>+	if (!ether_addr_equal(resp-&gt;mac_address, bp-&gt;vf.mac_addr)) {</div><div class='ctx'> 		memcpy(bp-&gt;vf.mac_addr, resp-&gt;mac_address, ETH_ALEN);</div><div class='add'>+		/* This means we are now using our own MAC address, let</div><div class='add'>+		 * the PF know about this MAC address.</div><div class='add'>+		 */</div><div class='add'>+		if (!is_valid_ether_addr(bp-&gt;vf.mac_addr))</div><div class='add'>+			inform_pf = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* overwrite netdev dev_addr with admin VF MAC */</div><div class='ctx'> 	if (is_valid_ether_addr(bp-&gt;vf.mac_addr))</div><div class='del'>-		memcpy(bp-&gt;dev-&gt;dev_addr, bp-&gt;vf.mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, bp-&gt;vf.mac_addr);</div><div class='ctx'> update_vf_mac_exit:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	if (inform_pf)</div><div class='add'>+		bnxt_approve_mac(bp, bp-&gt;dev-&gt;dev_addr, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnxt_approve_mac(struct bnxt *bp, u8 *mac, bool strict)</div><div class='del'>-{</div><div class='del'>-	struct hwrm_func_vf_cfg_input req = {0};</div><div class='del'>-	int rc = 0;</div><div class='del'>-</div><div class='del'>-	if (!BNXT_VF(bp))</div><div class='del'>-		return 0;</div><div class='add'>+#else</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_spec_code &lt; 0x10202) {</div><div class='del'>-		if (is_valid_ether_addr(bp-&gt;vf.mac_addr))</div><div class='del'>-			rc = -EADDRNOTAVAIL;</div><div class='del'>-		goto mac_done;</div><div class='del'>-	}</div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_VF_CFG, -1, -1);</div><div class='del'>-	req.enables = cpu_to_le32(FUNC_VF_CFG_REQ_ENABLES_DFLT_MAC_ADDR);</div><div class='del'>-	memcpy(req.dflt_mac_addr, mac, ETH_ALEN);</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-mac_done:</div><div class='del'>-	if (rc &amp;&amp; strict) {</div><div class='del'>-		rc = -EADDRNOTAVAIL;</div><div class='del'>-		netdev_warn(bp-&gt;dev, "VF MAC address %pM not approved by the PF\n",</div><div class='del'>-			    mac);</div><div class='del'>-		return rc;</div><div class='del'>-	}</div><div class='add'>+int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs, bool reset)</div><div class='add'>+{</div><div class='add'>+	if (*num_vfs)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='ctx'> </div><div class='del'>-void bnxt_sriov_disable(struct bnxt *bp)</div><div class='add'>+void __bnxt_sriov_disable(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1203,7 +1394,7 @@ void bnxt_update_vf_mac(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int bnxt_approve_mac(struct bnxt *bp, u8 *mac, bool strict)</div><div class='add'>+int bnxt_approve_mac(struct bnxt *bp, const u8 *mac, bool strict)</div><div class='ctx'> {</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h<br/>index 2eed9eda1195..e4979d729312 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h</a></div><div class='hunk'>@@ -34,10 +34,12 @@ int bnxt_set_vf_vlan(struct net_device *, int, u16, u8, __be16);</div><div class='ctx'> int bnxt_set_vf_bw(struct net_device *, int, int, int);</div><div class='ctx'> int bnxt_set_vf_link_state(struct net_device *, int, int);</div><div class='ctx'> int bnxt_set_vf_spoofchk(struct net_device *, int, bool);</div><div class='add'>+bool bnxt_is_trusted_vf(struct bnxt *bp, struct bnxt_vf_info *vf);</div><div class='ctx'> int bnxt_set_vf_trust(struct net_device *dev, int vf_id, bool trust);</div><div class='ctx'> int bnxt_sriov_configure(struct pci_dev *pdev, int num_vfs);</div><div class='del'>-void bnxt_sriov_disable(struct bnxt *);</div><div class='add'>+int bnxt_cfg_hw_sriov(struct bnxt *bp, int *num_vfs, bool reset);</div><div class='add'>+void __bnxt_sriov_disable(struct bnxt *bp);</div><div class='ctx'> void bnxt_hwrm_exec_fwd_req(struct bnxt *);</div><div class='ctx'> void bnxt_update_vf_mac(struct bnxt *);</div><div class='del'>-int bnxt_approve_mac(struct bnxt *, u8 *, bool);</div><div class='add'>+int bnxt_approve_mac(struct bnxt *, const u8 *, bool);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c<br/>index 44d6c5743fb9..2d66bf59cd64 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c</a></div><div class='hunk'>@@ -16,10 +16,13 @@</div><div class='ctx'> #include &lt;net/tc_act/tc_skbedit.h&gt;</div><div class='ctx'> #include &lt;net/tc_act/tc_mirred.h&gt;</div><div class='ctx'> #include &lt;net/tc_act/tc_vlan.h&gt;</div><div class='add'>+#include &lt;net/tc_act/tc_pedit.h&gt;</div><div class='ctx'> #include &lt;net/tc_act/tc_tunnel_key.h&gt;</div><div class='add'>+#include &lt;net/vxlan.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bnxt_hsi.h"</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_sriov.h"</div><div class='ctx'> #include "bnxt_tc.h"</div><div class='ctx'> #include "bnxt_vfr.h"</div><div class='hunk'>@@ -36,6 +39,8 @@</div><div class='ctx'> #define is_vid_exactmatch(vlan_tci_mask)	\</div><div class='ctx'> 	((ntohs(vlan_tci_mask) &amp; VLAN_VID_MASK) == VLAN_VID_MASK)</div><div class='ctx'> </div><div class='add'>+static bool is_wildcard(void *mask, int len);</div><div class='add'>+static bool is_exactmatch(void *mask, int len);</div><div class='ctx'> /* Return the dst fid of the func for flow forwarding</div><div class='ctx'>  * For PFs: src_fid is the fid of the PF</div><div class='ctx'>  * For VF-reps: src_fid the fid of the VF</div><div class='hunk'>@@ -46,7 +51,7 @@ static u16 bnxt_flow_get_dst_fid(struct bnxt *pf_bp, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* check if dev belongs to the same switch */</div><div class='ctx'> 	if (!netdev_port_same_parent_id(pf_bp-&gt;dev, dev)) {</div><div class='del'>-		netdev_info(pf_bp-&gt;dev, "dev(ifindex=%d) not on same switch",</div><div class='add'>+		netdev_info(pf_bp-&gt;dev, "dev(ifindex=%d) not on same switch\n",</div><div class='ctx'> 			    dev-&gt;ifindex);</div><div class='ctx'> 		return BNXT_FID_INVALID;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -66,7 +71,7 @@ static int bnxt_tc_parse_redir(struct bnxt *bp,</div><div class='ctx'> 	struct net_device *dev = act-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "no dev in mirred action");</div><div class='add'>+		netdev_info(bp-&gt;dev, "no dev in mirred action\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +107,7 @@ static int bnxt_tc_parse_tunnel_set(struct bnxt *bp,</div><div class='ctx'> 	const struct ip_tunnel_key *tun_key = &amp;tun_info-&gt;key;</div><div class='ctx'> </div><div class='ctx'> 	if (ip_tunnel_info_af(tun_info) != AF_INET) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "only IPv4 tunnel-encap is supported");</div><div class='add'>+		netdev_info(bp-&gt;dev, "only IPv4 tunnel-encap is supported\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -111,18 +116,194 @@ static int bnxt_tc_parse_tunnel_set(struct bnxt *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Key &amp; Mask from the stack comes unaligned in multiple iterations of 4 bytes</div><div class='add'>+ * each(u32).</div><div class='add'>+ * This routine consolidates such multiple unaligned values into one</div><div class='add'>+ * field each for Key &amp; Mask (for src and dst macs separately)</div><div class='add'>+ * For example,</div><div class='add'>+ *			Mask/Key	Offset	Iteration</div><div class='add'>+ *			==========	======	=========</div><div class='add'>+ *	dst mac		0xffffffff	0	1</div><div class='add'>+ *	dst mac		0x0000ffff	4	2</div><div class='add'>+ *</div><div class='add'>+ *	src mac		0xffff0000	4	1</div><div class='add'>+ *	src mac		0xffffffff	8	2</div><div class='add'>+ *</div><div class='add'>+ * The above combination coming from the stack will be consolidated as</div><div class='add'>+ *			Mask/Key</div><div class='add'>+ *			==============</div><div class='add'>+ *	src mac:	0xffffffffffff</div><div class='add'>+ *	dst mac:	0xffffffffffff</div><div class='add'>+ */</div><div class='add'>+static void bnxt_set_l2_key_mask(u32 part_key, u32 part_mask,</div><div class='add'>+				 u8 *actual_key, u8 *actual_mask)</div><div class='add'>+{</div><div class='add'>+	u32 key = get_unaligned((u32 *)actual_key);</div><div class='add'>+	u32 mask = get_unaligned((u32 *)actual_mask);</div><div class='add'>+</div><div class='add'>+	part_key &amp;= part_mask;</div><div class='add'>+	part_key |= key &amp; ~part_mask;</div><div class='add'>+</div><div class='add'>+	put_unaligned(mask | part_mask, (u32 *)actual_mask);</div><div class='add'>+	put_unaligned(part_key, (u32 *)actual_key);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_fill_l2_rewrite_fields(struct bnxt_tc_actions *actions,</div><div class='add'>+			    u16 *eth_addr, u16 *eth_addr_mask)</div><div class='add'>+{</div><div class='add'>+	u16 *p;</div><div class='add'>+	int j;</div><div class='add'>+</div><div class='add'>+	if (unlikely(bnxt_eth_addr_key_mask_invalid(eth_addr, eth_addr_mask)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!is_wildcard(&amp;eth_addr_mask[0], ETH_ALEN)) {</div><div class='add'>+		if (!is_exactmatch(&amp;eth_addr_mask[0], ETH_ALEN))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* FW expects dmac to be in u16 array format */</div><div class='add'>+		p = eth_addr;</div><div class='add'>+		for (j = 0; j &lt; 3; j++)</div><div class='add'>+			actions-&gt;l2_rewrite_dmac[j] = cpu_to_be16(*(p + j));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_wildcard(&amp;eth_addr_mask[ETH_ALEN / 2], ETH_ALEN)) {</div><div class='add'>+		if (!is_exactmatch(&amp;eth_addr_mask[ETH_ALEN / 2], ETH_ALEN))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* FW expects smac to be in u16 array format */</div><div class='add'>+		p = &amp;eth_addr[ETH_ALEN / 2];</div><div class='add'>+		for (j = 0; j &lt; 3; j++)</div><div class='add'>+			actions-&gt;l2_rewrite_smac[j] = cpu_to_be16(*(p + j));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+bnxt_tc_parse_pedit(struct bnxt *bp, struct bnxt_tc_actions *actions,</div><div class='add'>+		    struct flow_action_entry *act, int act_idx, u8 *eth_addr,</div><div class='add'>+		    u8 *eth_addr_mask)</div><div class='add'>+{</div><div class='add'>+	size_t offset_of_ip6_daddr = offsetof(struct ipv6hdr, daddr);</div><div class='add'>+	size_t offset_of_ip6_saddr = offsetof(struct ipv6hdr, saddr);</div><div class='add'>+	u32 mask, val, offset, idx;</div><div class='add'>+	u8 htype;</div><div class='add'>+</div><div class='add'>+	offset = act-&gt;mangle.offset;</div><div class='add'>+	htype = act-&gt;mangle.htype;</div><div class='add'>+	mask = ~act-&gt;mangle.mask;</div><div class='add'>+	val = act-&gt;mangle.val;</div><div class='add'>+</div><div class='add'>+	switch (htype) {</div><div class='add'>+	case FLOW_ACT_MANGLE_HDR_TYPE_ETH:</div><div class='add'>+		if (offset &gt; PEDIT_OFFSET_SMAC_LAST_4_BYTES) {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "%s: eth_hdr: Invalid pedit field\n",</div><div class='add'>+				   __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		actions-&gt;flags |= BNXT_TC_ACTION_FLAG_L2_REWRITE;</div><div class='add'>+</div><div class='add'>+		bnxt_set_l2_key_mask(val, mask, &amp;eth_addr[offset],</div><div class='add'>+				     &amp;eth_addr_mask[offset]);</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_ACT_MANGLE_HDR_TYPE_IP4:</div><div class='add'>+		actions-&gt;flags |= BNXT_TC_ACTION_FLAG_NAT_XLATE;</div><div class='add'>+		actions-&gt;nat.l3_is_ipv4 = true;</div><div class='add'>+		if (offset ==  offsetof(struct iphdr, saddr)) {</div><div class='add'>+			actions-&gt;nat.src_xlate = true;</div><div class='add'>+			actions-&gt;nat.l3.ipv4.saddr.s_addr = htonl(val);</div><div class='add'>+		} else if (offset ==  offsetof(struct iphdr, daddr)) {</div><div class='add'>+			actions-&gt;nat.src_xlate = false;</div><div class='add'>+			actions-&gt;nat.l3.ipv4.daddr.s_addr = htonl(val);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "%s: IPv4_hdr: Invalid pedit field\n",</div><div class='add'>+				   __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		netdev_dbg(bp-&gt;dev, "nat.src_xlate = %d src IP: %pI4 dst ip : %pI4\n",</div><div class='add'>+			   actions-&gt;nat.src_xlate, &amp;actions-&gt;nat.l3.ipv4.saddr,</div><div class='add'>+			   &amp;actions-&gt;nat.l3.ipv4.daddr);</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case FLOW_ACT_MANGLE_HDR_TYPE_IP6:</div><div class='add'>+		actions-&gt;flags |= BNXT_TC_ACTION_FLAG_NAT_XLATE;</div><div class='add'>+		actions-&gt;nat.l3_is_ipv4 = false;</div><div class='add'>+		if (offset &gt;= offsetof(struct ipv6hdr, saddr) &amp;&amp;</div><div class='add'>+		    offset &lt; offset_of_ip6_daddr) {</div><div class='add'>+			/* 16 byte IPv6 address comes in 4 iterations of</div><div class='add'>+			 * 4byte chunks each</div><div class='add'>+			 */</div><div class='add'>+			actions-&gt;nat.src_xlate = true;</div><div class='add'>+			idx = (offset - offset_of_ip6_saddr) / 4;</div><div class='add'>+			/* First 4bytes will be copied to idx 0 and so on */</div><div class='add'>+			actions-&gt;nat.l3.ipv6.saddr.s6_addr32[idx] = htonl(val);</div><div class='add'>+		} else if (offset &gt;= offset_of_ip6_daddr &amp;&amp;</div><div class='add'>+			   offset &lt; offset_of_ip6_daddr + 16) {</div><div class='add'>+			actions-&gt;nat.src_xlate = false;</div><div class='add'>+			idx = (offset - offset_of_ip6_daddr) / 4;</div><div class='add'>+			actions-&gt;nat.l3.ipv6.daddr.s6_addr32[idx] = htonl(val);</div><div class='add'>+		} else {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "%s: IPv6_hdr: Invalid pedit field\n",</div><div class='add'>+				   __func__);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_ACT_MANGLE_HDR_TYPE_TCP:</div><div class='add'>+	case FLOW_ACT_MANGLE_HDR_TYPE_UDP:</div><div class='add'>+		/* HW does not support L4 rewrite alone without L3</div><div class='add'>+		 * rewrite</div><div class='add'>+		 */</div><div class='add'>+		if (!(actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_NAT_XLATE)) {</div><div class='add'>+			netdev_err(bp-&gt;dev,</div><div class='add'>+				   "Need to specify L3 rewrite as well\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (actions-&gt;nat.src_xlate)</div><div class='add'>+			actions-&gt;nat.l4.ports.sport = htons(val);</div><div class='add'>+		else</div><div class='add'>+			actions-&gt;nat.l4.ports.dport = htons(val);</div><div class='add'>+		netdev_dbg(bp-&gt;dev, "actions-&gt;nat.sport = %d dport = %d\n",</div><div class='add'>+			   actions-&gt;nat.l4.ports.sport,</div><div class='add'>+			   actions-&gt;nat.l4.ports.dport);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(bp-&gt;dev, "%s: Unsupported pedit hdr type\n",</div><div class='add'>+			   __func__);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_tc_parse_actions(struct bnxt *bp,</div><div class='ctx'> 				 struct bnxt_tc_actions *actions,</div><div class='del'>-				 struct flow_action *flow_action)</div><div class='add'>+				 struct flow_action *flow_action,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='add'>+	/* Used to store the L2 rewrite mask for dmac (6 bytes) followed by</div><div class='add'>+	 * smac (6 bytes) if rewrite of both is specified, otherwise either</div><div class='add'>+	 * dmac or smac</div><div class='add'>+	 */</div><div class='add'>+	u16 eth_addr_mask[ETH_ALEN] = { 0 };</div><div class='add'>+	/* Used to store the L2 rewrite key for dmac (6 bytes) followed by</div><div class='add'>+	 * smac (6 bytes) if rewrite of both is specified, otherwise either</div><div class='add'>+	 * dmac or smac</div><div class='add'>+	 */</div><div class='add'>+	u16 eth_addr[ETH_ALEN] = { 0 };</div><div class='ctx'> 	struct flow_action_entry *act;</div><div class='ctx'> 	int i, rc;</div><div class='ctx'> </div><div class='ctx'> 	if (!flow_action_has_entries(flow_action)) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "no actions");</div><div class='add'>+		netdev_info(bp-&gt;dev, "no actions\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (!flow_action_basic_hw_stats_check(flow_action, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	flow_action_for_each(i, act, flow_action) {</div><div class='ctx'> 		switch (act-&gt;id) {</div><div class='ctx'> 		case FLOW_ACTION_DROP:</div><div class='hunk'>@@ -148,11 +329,26 @@ static int bnxt_tc_parse_actions(struct bnxt *bp,</div><div class='ctx'> 		case FLOW_ACTION_TUNNEL_DECAP:</div><div class='ctx'> 			actions-&gt;flags |= BNXT_TC_ACTION_FLAG_TUNNEL_DECAP;</div><div class='ctx'> 			break;</div><div class='add'>+		/* Packet edit: L2 rewrite, NAT, NAPT */</div><div class='add'>+		case FLOW_ACTION_MANGLE:</div><div class='add'>+			rc = bnxt_tc_parse_pedit(bp, actions, act, i,</div><div class='add'>+						 (u8 *)eth_addr,</div><div class='add'>+						 (u8 *)eth_addr_mask);</div><div class='add'>+			if (rc)</div><div class='add'>+				return rc;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_L2_REWRITE) {</div><div class='add'>+		rc = bnxt_fill_l2_rewrite_fields(actions, eth_addr,</div><div class='add'>+						 eth_addr_mask);</div><div class='add'>+		if (rc)</div><div class='add'>+			return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_FWD) {</div><div class='ctx'> 		if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_TUNNEL_ENCAP) {</div><div class='ctx'> 			/* dst_fid is PF's fid */</div><div class='hunk'>@@ -170,20 +366,24 @@ static int bnxt_tc_parse_actions(struct bnxt *bp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_tc_parse_flow(struct bnxt *bp,</div><div class='del'>-			      struct tc_cls_flower_offload *tc_flow_cmd,</div><div class='add'>+			      struct flow_cls_offload *tc_flow_cmd,</div><div class='ctx'> 			      struct bnxt_tc_flow *flow)</div><div class='ctx'> {</div><div class='del'>-	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(tc_flow_cmd);</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(tc_flow_cmd);</div><div class='add'>+	struct netlink_ext_ack *extack = tc_flow_cmd-&gt;common.extack;</div><div class='ctx'> 	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='ctx'> </div><div class='ctx'> 	/* KEY_CONTROL and KEY_BASIC are needed for forming a meaningful key */</div><div class='del'>-	if ((dissector-&gt;used_keys &amp; BIT(FLOW_DISSECTOR_KEY_CONTROL)) == 0 ||</div><div class='del'>-	    (dissector-&gt;used_keys &amp; BIT(FLOW_DISSECTOR_KEY_BASIC)) == 0) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "cannot form TC key: used_keys = 0x%x",</div><div class='add'>+	if ((dissector-&gt;used_keys &amp; BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL)) == 0 ||</div><div class='add'>+	    (dissector-&gt;used_keys &amp; BIT_ULL(FLOW_DISSECTOR_KEY_BASIC)) == 0) {</div><div class='add'>+		netdev_info(bp-&gt;dev, "cannot form TC key: used_keys = 0x%llx\n",</div><div class='ctx'> 			    dissector-&gt;used_keys);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (flow_rule_match_has_control_flags(rule, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='ctx'> 		struct flow_match_basic match;</div><div class='ctx'> </div><div class='hunk'>@@ -300,27 +500,28 @@ static int bnxt_tc_parse_flow(struct bnxt *bp,</div><div class='ctx'> 		flow-&gt;tun_mask.tp_src = match.mask-&gt;src;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return bnxt_tc_parse_actions(bp, &amp;flow-&gt;actions, &amp;rule-&gt;action);</div><div class='add'>+	return bnxt_tc_parse_actions(bp, &amp;flow-&gt;actions, &amp;rule-&gt;action,</div><div class='add'>+				     tc_flow_cmd-&gt;common.extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_cfa_flow_free(struct bnxt *bp,</div><div class='ctx'> 				   struct bnxt_tc_flow_node *flow_node)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_flow_free_input req = { 0 };</div><div class='add'>+	struct hwrm_cfa_flow_free_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_FLOW_FREE, -1, -1);</div><div class='del'>-	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_OVS_64BIT_HANDLE)</div><div class='del'>-		req.ext_flow_handle = flow_node-&gt;ext_flow_handle;</div><div class='del'>-	else</div><div class='del'>-		req.flow_handle = flow_node-&gt;flow_handle;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_FLOW_FREE);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_OVS_64BIT_HANDLE)</div><div class='add'>+			req-&gt;ext_flow_handle = flow_node-&gt;ext_flow_handle;</div><div class='add'>+		else</div><div class='add'>+			req-&gt;flow_handle = flow_node-&gt;flow_handle;</div><div class='ctx'> </div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+	}</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s: Error rc=%d", __func__, rc);</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s: Error rc=%d\n", __func__, rc);</div><div class='ctx'> </div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -393,29 +594,101 @@ static int bnxt_hwrm_cfa_flow_alloc(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> 	struct bnxt_tc_actions *actions = &amp;flow-&gt;actions;</div><div class='ctx'> 	struct bnxt_tc_l3_key *l3_mask = &amp;flow-&gt;l3_mask;</div><div class='ctx'> 	struct bnxt_tc_l3_key *l3_key = &amp;flow-&gt;l3_key;</div><div class='del'>-	struct hwrm_cfa_flow_alloc_input req = { 0 };</div><div class='ctx'> 	struct hwrm_cfa_flow_alloc_output *resp;</div><div class='add'>+	struct hwrm_cfa_flow_alloc_input *req;</div><div class='ctx'> 	u16 flow_flags = 0, action_flags = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_FLOW_ALLOC, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_FLOW_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='add'>+</div><div class='add'>+	req-&gt;src_fid = cpu_to_le16(flow-&gt;src_fid);</div><div class='add'>+	req-&gt;ref_flow_handle = ref_flow_handle;</div><div class='ctx'> </div><div class='del'>-	req.src_fid = cpu_to_le16(flow-&gt;src_fid);</div><div class='del'>-	req.ref_flow_handle = ref_flow_handle;</div><div class='add'>+	if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_L2_REWRITE) {</div><div class='add'>+		memcpy(req-&gt;l2_rewrite_dmac, actions-&gt;l2_rewrite_dmac,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		memcpy(req-&gt;l2_rewrite_smac, actions-&gt;l2_rewrite_smac,</div><div class='add'>+		       ETH_ALEN);</div><div class='add'>+		action_flags |=</div><div class='add'>+			CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_L2_HEADER_REWRITE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_NAT_XLATE) {</div><div class='add'>+		if (actions-&gt;nat.l3_is_ipv4) {</div><div class='add'>+			action_flags |=</div><div class='add'>+				CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_IPV4_ADDRESS;</div><div class='add'>+</div><div class='add'>+			if (actions-&gt;nat.src_xlate) {</div><div class='add'>+				action_flags |=</div><div class='add'>+					CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_SRC;</div><div class='add'>+				/* L3 source rewrite */</div><div class='add'>+				req-&gt;nat_ip_address[0] =</div><div class='add'>+					actions-&gt;nat.l3.ipv4.saddr.s_addr;</div><div class='add'>+				/* L4 source port */</div><div class='add'>+				if (actions-&gt;nat.l4.ports.sport)</div><div class='add'>+					req-&gt;nat_port =</div><div class='add'>+						actions-&gt;nat.l4.ports.sport;</div><div class='add'>+			} else {</div><div class='add'>+				action_flags |=</div><div class='add'>+					CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_DEST;</div><div class='add'>+				/* L3 destination rewrite */</div><div class='add'>+				req-&gt;nat_ip_address[0] =</div><div class='add'>+					actions-&gt;nat.l3.ipv4.daddr.s_addr;</div><div class='add'>+				/* L4 destination port */</div><div class='add'>+				if (actions-&gt;nat.l4.ports.dport)</div><div class='add'>+					req-&gt;nat_port =</div><div class='add'>+						actions-&gt;nat.l4.ports.dport;</div><div class='add'>+			}</div><div class='add'>+			netdev_dbg(bp-&gt;dev,</div><div class='add'>+				   "req-&gt;nat_ip_address: %pI4 src_xlate: %d req-&gt;nat_port: %x\n",</div><div class='add'>+				   req-&gt;nat_ip_address, actions-&gt;nat.src_xlate,</div><div class='add'>+				   req-&gt;nat_port);</div><div class='add'>+		} else {</div><div class='add'>+			if (actions-&gt;nat.src_xlate) {</div><div class='add'>+				action_flags |=</div><div class='add'>+					CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_SRC;</div><div class='add'>+				/* L3 source rewrite */</div><div class='add'>+				memcpy(req-&gt;nat_ip_address,</div><div class='add'>+				       actions-&gt;nat.l3.ipv6.saddr.s6_addr32,</div><div class='add'>+				       sizeof(req-&gt;nat_ip_address));</div><div class='add'>+				/* L4 source port */</div><div class='add'>+				if (actions-&gt;nat.l4.ports.sport)</div><div class='add'>+					req-&gt;nat_port =</div><div class='add'>+						actions-&gt;nat.l4.ports.sport;</div><div class='add'>+			} else {</div><div class='add'>+				action_flags |=</div><div class='add'>+					CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_NAT_DEST;</div><div class='add'>+				/* L3 destination rewrite */</div><div class='add'>+				memcpy(req-&gt;nat_ip_address,</div><div class='add'>+				       actions-&gt;nat.l3.ipv6.daddr.s6_addr32,</div><div class='add'>+				       sizeof(req-&gt;nat_ip_address));</div><div class='add'>+				/* L4 destination port */</div><div class='add'>+				if (actions-&gt;nat.l4.ports.dport)</div><div class='add'>+					req-&gt;nat_port =</div><div class='add'>+						actions-&gt;nat.l4.ports.dport;</div><div class='add'>+			}</div><div class='add'>+			netdev_dbg(bp-&gt;dev,</div><div class='add'>+				   "req-&gt;nat_ip_address: %pI6 src_xlate: %d req-&gt;nat_port: %x\n",</div><div class='add'>+				   req-&gt;nat_ip_address, actions-&gt;nat.src_xlate,</div><div class='add'>+				   req-&gt;nat_port);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_TUNNEL_DECAP ||</div><div class='ctx'> 	    actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_TUNNEL_ENCAP) {</div><div class='del'>-		req.tunnel_handle = tunnel_handle;</div><div class='add'>+		req-&gt;tunnel_handle = tunnel_handle;</div><div class='ctx'> 		flow_flags |= CFA_FLOW_ALLOC_REQ_FLAGS_TUNNEL;</div><div class='ctx'> 		action_flags |= CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_TUNNEL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	req.ethertype = flow-&gt;l2_key.ether_type;</div><div class='del'>-	req.ip_proto = flow-&gt;l4_key.ip_proto;</div><div class='add'>+	req-&gt;ethertype = flow-&gt;l2_key.ether_type;</div><div class='add'>+	req-&gt;ip_proto = flow-&gt;l4_key.ip_proto;</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_ETH_ADDRS) {</div><div class='del'>-		memcpy(req.dmac, flow-&gt;l2_key.dmac, ETH_ALEN);</div><div class='del'>-		memcpy(req.smac, flow-&gt;l2_key.smac, ETH_ALEN);</div><div class='add'>+		memcpy(req-&gt;dmac, flow-&gt;l2_key.dmac, ETH_ALEN);</div><div class='add'>+		memcpy(req-&gt;smac, flow-&gt;l2_key.smac, ETH_ALEN);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;l2_key.num_vlans &gt; 0) {</div><div class='hunk'>@@ -424,7 +697,7 @@ static int bnxt_hwrm_cfa_flow_alloc(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> 		 * in outer_vlan_tci when num_vlans is 1 (which is</div><div class='ctx'> 		 * always the case in TC.)</div><div class='ctx'> 		 */</div><div class='del'>-		req.outer_vlan_tci = flow-&gt;l2_key.inner_vlan_tci;</div><div class='add'>+		req-&gt;outer_vlan_tci = flow-&gt;l2_key.inner_vlan_tci;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If all IP and L4 fields are wildcarded then this is an L2 flow */</div><div class='hunk'>@@ -437,68 +710,67 @@ static int bnxt_hwrm_cfa_flow_alloc(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> 				CFA_FLOW_ALLOC_REQ_FLAGS_FLOWTYPE_IPV6;</div><div class='ctx'> </div><div class='ctx'> 		if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_IPV4_ADDRS) {</div><div class='del'>-			req.ip_dst[0] = l3_key-&gt;ipv4.daddr.s_addr;</div><div class='del'>-			req.ip_dst_mask_len =</div><div class='add'>+			req-&gt;ip_dst[0] = l3_key-&gt;ipv4.daddr.s_addr;</div><div class='add'>+			req-&gt;ip_dst_mask_len =</div><div class='ctx'> 				inet_mask_len(l3_mask-&gt;ipv4.daddr.s_addr);</div><div class='del'>-			req.ip_src[0] = l3_key-&gt;ipv4.saddr.s_addr;</div><div class='del'>-			req.ip_src_mask_len =</div><div class='add'>+			req-&gt;ip_src[0] = l3_key-&gt;ipv4.saddr.s_addr;</div><div class='add'>+			req-&gt;ip_src_mask_len =</div><div class='ctx'> 				inet_mask_len(l3_mask-&gt;ipv4.saddr.s_addr);</div><div class='ctx'> 		} else if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_IPV6_ADDRS) {</div><div class='del'>-			memcpy(req.ip_dst, l3_key-&gt;ipv6.daddr.s6_addr32,</div><div class='del'>-			       sizeof(req.ip_dst));</div><div class='del'>-			req.ip_dst_mask_len =</div><div class='add'>+			memcpy(req-&gt;ip_dst, l3_key-&gt;ipv6.daddr.s6_addr32,</div><div class='add'>+			       sizeof(req-&gt;ip_dst));</div><div class='add'>+			req-&gt;ip_dst_mask_len =</div><div class='ctx'> 					ipv6_mask_len(&amp;l3_mask-&gt;ipv6.daddr);</div><div class='del'>-			memcpy(req.ip_src, l3_key-&gt;ipv6.saddr.s6_addr32,</div><div class='del'>-			       sizeof(req.ip_src));</div><div class='del'>-			req.ip_src_mask_len =</div><div class='add'>+			memcpy(req-&gt;ip_src, l3_key-&gt;ipv6.saddr.s6_addr32,</div><div class='add'>+			       sizeof(req-&gt;ip_src));</div><div class='add'>+			req-&gt;ip_src_mask_len =</div><div class='ctx'> 					ipv6_mask_len(&amp;l3_mask-&gt;ipv6.saddr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_PORTS) {</div><div class='del'>-		req.l4_src_port = flow-&gt;l4_key.ports.sport;</div><div class='del'>-		req.l4_src_port_mask = flow-&gt;l4_mask.ports.sport;</div><div class='del'>-		req.l4_dst_port = flow-&gt;l4_key.ports.dport;</div><div class='del'>-		req.l4_dst_port_mask = flow-&gt;l4_mask.ports.dport;</div><div class='add'>+		req-&gt;l4_src_port = flow-&gt;l4_key.ports.sport;</div><div class='add'>+		req-&gt;l4_src_port_mask = flow-&gt;l4_mask.ports.sport;</div><div class='add'>+		req-&gt;l4_dst_port = flow-&gt;l4_key.ports.dport;</div><div class='add'>+		req-&gt;l4_dst_port_mask = flow-&gt;l4_mask.ports.dport;</div><div class='ctx'> 	} else if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_ICMP) {</div><div class='ctx'> 		/* l4 ports serve as type/code when ip_proto is ICMP */</div><div class='del'>-		req.l4_src_port = htons(flow-&gt;l4_key.icmp.type);</div><div class='del'>-		req.l4_src_port_mask = htons(flow-&gt;l4_mask.icmp.type);</div><div class='del'>-		req.l4_dst_port = htons(flow-&gt;l4_key.icmp.code);</div><div class='del'>-		req.l4_dst_port_mask = htons(flow-&gt;l4_mask.icmp.code);</div><div class='add'>+		req-&gt;l4_src_port = htons(flow-&gt;l4_key.icmp.type);</div><div class='add'>+		req-&gt;l4_src_port_mask = htons(flow-&gt;l4_mask.icmp.type);</div><div class='add'>+		req-&gt;l4_dst_port = htons(flow-&gt;l4_key.icmp.code);</div><div class='add'>+		req-&gt;l4_dst_port_mask = htons(flow-&gt;l4_mask.icmp.code);</div><div class='ctx'> 	}</div><div class='del'>-	req.flags = cpu_to_le16(flow_flags);</div><div class='add'>+	req-&gt;flags = cpu_to_le16(flow_flags);</div><div class='ctx'> </div><div class='ctx'> 	if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_DROP) {</div><div class='ctx'> 		action_flags |= CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_DROP;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_FWD) {</div><div class='ctx'> 			action_flags |= CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_FWD;</div><div class='del'>-			req.dst_fid = cpu_to_le16(actions-&gt;dst_fid);</div><div class='add'>+			req-&gt;dst_fid = cpu_to_le16(actions-&gt;dst_fid);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_PUSH_VLAN) {</div><div class='ctx'> 			action_flags |=</div><div class='ctx'> 			    CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_L2_HEADER_REWRITE;</div><div class='del'>-			req.l2_rewrite_vlan_tpid = actions-&gt;push_vlan_tpid;</div><div class='del'>-			req.l2_rewrite_vlan_tci = actions-&gt;push_vlan_tci;</div><div class='del'>-			memcpy(&amp;req.l2_rewrite_dmac, &amp;req.dmac, ETH_ALEN);</div><div class='del'>-			memcpy(&amp;req.l2_rewrite_smac, &amp;req.smac, ETH_ALEN);</div><div class='add'>+			req-&gt;l2_rewrite_vlan_tpid = actions-&gt;push_vlan_tpid;</div><div class='add'>+			req-&gt;l2_rewrite_vlan_tci = actions-&gt;push_vlan_tci;</div><div class='add'>+			memcpy(&amp;req-&gt;l2_rewrite_dmac, &amp;req-&gt;dmac, ETH_ALEN);</div><div class='add'>+			memcpy(&amp;req-&gt;l2_rewrite_smac, &amp;req-&gt;smac, ETH_ALEN);</div><div class='ctx'> 		}</div><div class='ctx'> 		if (actions-&gt;flags &amp; BNXT_TC_ACTION_FLAG_POP_VLAN) {</div><div class='ctx'> 			action_flags |=</div><div class='ctx'> 			    CFA_FLOW_ALLOC_REQ_ACTION_FLAGS_L2_HEADER_REWRITE;</div><div class='ctx'> 			/* Rewrite config with tpid = 0 implies vlan pop */</div><div class='del'>-			req.l2_rewrite_vlan_tpid = 0;</div><div class='del'>-			memcpy(&amp;req.l2_rewrite_dmac, &amp;req.dmac, ETH_ALEN);</div><div class='del'>-			memcpy(&amp;req.l2_rewrite_smac, &amp;req.smac, ETH_ALEN);</div><div class='add'>+			req-&gt;l2_rewrite_vlan_tpid = 0;</div><div class='add'>+			memcpy(&amp;req-&gt;l2_rewrite_dmac, &amp;req-&gt;dmac, ETH_ALEN);</div><div class='add'>+			memcpy(&amp;req-&gt;l2_rewrite_smac, &amp;req-&gt;smac, ETH_ALEN);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	req.action_flags = cpu_to_le16(action_flags);</div><div class='add'>+	req-&gt;action_flags = cpu_to_le16(action_flags);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		resp = bnxt_get_hwrm_resp_addr(bp, &amp;req);</div><div class='ctx'> 		/* CFA_FLOW_ALLOC response interpretation:</div><div class='ctx'> 		 *		    fw with	     fw with</div><div class='ctx'> 		 *		    16-bit	     64-bit</div><div class='hunk'>@@ -514,12 +786,7 @@ static int bnxt_hwrm_cfa_flow_alloc(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> 			flow_node-&gt;flow_id = resp-&gt;flow_id;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-</div><div class='del'>-	if (rc == HWRM_ERR_CODE_RESOURCE_ALLOC_ERROR)</div><div class='del'>-		rc = -ENOSPC;</div><div class='del'>-	else if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -529,88 +796,87 @@ static int hwrm_cfa_decap_filter_alloc(struct bnxt *bp,</div><div class='ctx'> 				       __le32 ref_decap_handle,</div><div class='ctx'> 				       __le32 *decap_filter_handle)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_decap_filter_alloc_input req = { 0 };</div><div class='ctx'> 	struct hwrm_cfa_decap_filter_alloc_output *resp;</div><div class='ctx'> 	struct ip_tunnel_key *tun_key = &amp;flow-&gt;tun_key;</div><div class='add'>+	struct hwrm_cfa_decap_filter_alloc_input *req;</div><div class='ctx'> 	u32 enables = 0;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_DECAP_FILTER_ALLOC, -1, -1);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_DECAP_FILTER_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='del'>-	req.flags = cpu_to_le32(CFA_DECAP_FILTER_ALLOC_REQ_FLAGS_OVS_TUNNEL);</div><div class='add'>+	req-&gt;flags = cpu_to_le32(CFA_DECAP_FILTER_ALLOC_REQ_FLAGS_OVS_TUNNEL);</div><div class='ctx'> 	enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_TUNNEL_TYPE |</div><div class='ctx'> 		   CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IP_PROTOCOL;</div><div class='del'>-	req.tunnel_type = CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN;</div><div class='del'>-	req.ip_protocol = CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP;</div><div class='add'>+	req-&gt;tunnel_type = CFA_DECAP_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN;</div><div class='add'>+	req-&gt;ip_protocol = CFA_DECAP_FILTER_ALLOC_REQ_IP_PROTOCOL_UDP;</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_TUNL_ID) {</div><div class='ctx'> 		enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_TUNNEL_ID;</div><div class='ctx'> 		/* tunnel_id is wrongly defined in hsi defn. as __le32 */</div><div class='del'>-		req.tunnel_id = tunnel_id_to_key32(tun_key-&gt;tun_id);</div><div class='add'>+		req-&gt;tunnel_id = tunnel_id_to_key32(tun_key-&gt;tun_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_TUNL_ETH_ADDRS) {</div><div class='ctx'> 		enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_MACADDR;</div><div class='del'>-		ether_addr_copy(req.dst_macaddr, l2_info-&gt;dmac);</div><div class='add'>+		ether_addr_copy(req-&gt;dst_macaddr, l2_info-&gt;dmac);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (l2_info-&gt;num_vlans) {</div><div class='ctx'> 		enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_T_IVLAN_VID;</div><div class='del'>-		req.t_ivlan_vid = l2_info-&gt;inner_vlan_tci;</div><div class='add'>+		req-&gt;t_ivlan_vid = l2_info-&gt;inner_vlan_tci;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_ETHERTYPE;</div><div class='del'>-	req.ethertype = htons(ETH_P_IP);</div><div class='add'>+	req-&gt;ethertype = htons(ETH_P_IP);</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_TUNL_IPV4_ADDRS) {</div><div class='ctx'> 		enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_SRC_IPADDR |</div><div class='ctx'> 			   CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_IPADDR |</div><div class='ctx'> 			   CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_IPADDR_TYPE;</div><div class='del'>-		req.ip_addr_type = CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;</div><div class='del'>-		req.dst_ipaddr[0] = tun_key-&gt;u.ipv4.dst;</div><div class='del'>-		req.src_ipaddr[0] = tun_key-&gt;u.ipv4.src;</div><div class='add'>+		req-&gt;ip_addr_type =</div><div class='add'>+			CFA_DECAP_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;</div><div class='add'>+		req-&gt;dst_ipaddr[0] = tun_key-&gt;u.ipv4.dst;</div><div class='add'>+		req-&gt;src_ipaddr[0] = tun_key-&gt;u.ipv4.src;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_TUNL_PORTS) {</div><div class='ctx'> 		enables |= CFA_DECAP_FILTER_ALLOC_REQ_ENABLES_DST_PORT;</div><div class='del'>-		req.dst_port = tun_key-&gt;tp_dst;</div><div class='add'>+		req-&gt;dst_port = tun_key-&gt;tp_dst;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Eventhough the decap_handle returned by hwrm_cfa_decap_filter_alloc</div><div class='ctx'> 	 * is defined as __le32, l2_ctxt_ref_id is defined in HSI as __le16.</div><div class='ctx'> 	 */</div><div class='del'>-	req.l2_ctxt_ref_id = (__force __le16)ref_decap_handle;</div><div class='del'>-	req.enables = cpu_to_le32(enables);</div><div class='add'>+	req-&gt;l2_ctxt_ref_id = (__force __le16)ref_decap_handle;</div><div class='add'>+	req-&gt;enables = cpu_to_le32(enables);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc) {</div><div class='del'>-		resp = bnxt_get_hwrm_resp_addr(bp, &amp;req);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (!rc)</div><div class='ctx'> 		*decap_filter_handle = resp-&gt;decap_filter_id;</div><div class='del'>-	} else {</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s: Error rc=%d", __func__, rc);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+exit:</div><div class='ctx'> 	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s: Error rc=%d\n", __func__, rc);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hwrm_cfa_decap_filter_free(struct bnxt *bp,</div><div class='ctx'> 				      __le32 decap_filter_handle)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_decap_filter_free_input req = { 0 };</div><div class='add'>+	struct hwrm_cfa_decap_filter_free_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_DECAP_FILTER_FREE, -1, -1);</div><div class='del'>-	req.decap_filter_id = decap_filter_handle;</div><div class='del'>-</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_DECAP_FILTER_FREE);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		req-&gt;decap_filter_id = decap_filter_handle;</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+	}</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s: Error rc=%d", __func__, rc);</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s: Error rc=%d\n", __func__, rc);</div><div class='ctx'> </div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -619,18 +885,18 @@ static int hwrm_cfa_encap_record_alloc(struct bnxt *bp,</div><div class='ctx'> 				       struct bnxt_tc_l2_key *l2_info,</div><div class='ctx'> 				       __le32 *encap_record_handle)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_encap_record_alloc_input req = { 0 };</div><div class='ctx'> 	struct hwrm_cfa_encap_record_alloc_output *resp;</div><div class='del'>-	struct hwrm_cfa_encap_data_vxlan *encap =</div><div class='del'>-			(struct hwrm_cfa_encap_data_vxlan *)&amp;req.encap_data;</div><div class='del'>-	struct hwrm_vxlan_ipv4_hdr *encap_ipv4 =</div><div class='del'>-				(struct hwrm_vxlan_ipv4_hdr *)encap-&gt;l3;</div><div class='add'>+	struct hwrm_cfa_encap_record_alloc_input *req;</div><div class='add'>+	struct hwrm_cfa_encap_data_vxlan *encap;</div><div class='add'>+	struct hwrm_vxlan_ipv4_hdr *encap_ipv4;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_ENCAP_RECORD_ALLOC, -1, -1);</div><div class='del'>-</div><div class='del'>-	req.encap_type = CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN;</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_ENCAP_RECORD_ALLOC);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='ctx'> </div><div class='add'>+	encap = (struct hwrm_cfa_encap_data_vxlan *)&amp;req-&gt;encap_data;</div><div class='add'>+	req-&gt;encap_type = CFA_ENCAP_RECORD_ALLOC_REQ_ENCAP_TYPE_VXLAN;</div><div class='ctx'> 	ether_addr_copy(encap-&gt;dst_mac_addr, l2_info-&gt;dmac);</div><div class='ctx'> 	ether_addr_copy(encap-&gt;src_mac_addr, l2_info-&gt;smac);</div><div class='ctx'> 	if (l2_info-&gt;num_vlans) {</div><div class='hunk'>@@ -639,6 +905,7 @@ static int hwrm_cfa_encap_record_alloc(struct bnxt *bp,</div><div class='ctx'> 		encap-&gt;ovlan_tpid = l2_info-&gt;inner_vlan_tpid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	encap_ipv4 = (struct hwrm_vxlan_ipv4_hdr *)encap-&gt;l3;</div><div class='ctx'> 	encap_ipv4-&gt;ver_hlen = 4 &lt;&lt; VXLAN_IPV4_HDR_VER_HLEN_VERSION_SFT;</div><div class='ctx'> 	encap_ipv4-&gt;ver_hlen |= 5 &lt;&lt; VXLAN_IPV4_HDR_VER_HLEN_HEADER_LENGTH_SFT;</div><div class='ctx'> 	encap_ipv4-&gt;ttl = encap_key-&gt;ttl;</div><div class='hunk'>@@ -650,36 +917,32 @@ static int hwrm_cfa_encap_record_alloc(struct bnxt *bp,</div><div class='ctx'> 	encap-&gt;dst_port = encap_key-&gt;tp_dst;</div><div class='ctx'> 	encap-&gt;vni = tunnel_id_to_key32(encap_key-&gt;tun_id);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='del'>-	if (!rc) {</div><div class='del'>-		resp = bnxt_get_hwrm_resp_addr(bp, &amp;req);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send_silent(bp, req);</div><div class='add'>+	if (!rc)</div><div class='ctx'> 		*encap_record_handle = resp-&gt;encap_record_id;</div><div class='del'>-	} else {</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s: Error rc=%d", __func__, rc);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+exit:</div><div class='ctx'> 	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s: Error rc=%d\n", __func__, rc);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hwrm_cfa_encap_record_free(struct bnxt *bp,</div><div class='ctx'> 				      __le32 encap_record_handle)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_encap_record_free_input req = { 0 };</div><div class='add'>+	struct hwrm_cfa_encap_record_free_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_ENCAP_RECORD_FREE, -1, -1);</div><div class='del'>-	req.encap_record_id = encap_record_handle;</div><div class='del'>-</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_ENCAP_RECORD_FREE);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		req-&gt;encap_record_id = encap_record_handle;</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+	}</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s: Error rc=%d", __func__, rc);</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s: Error rc=%d\n", __func__, rc);</div><div class='ctx'> </div><div class='del'>-	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -697,7 +960,7 @@ static int bnxt_tc_put_l2_node(struct bnxt *bp,</div><div class='ctx'> 					     tc_info-&gt;l2_ht_params);</div><div class='ctx'> 		if (rc)</div><div class='ctx'> 			netdev_err(bp-&gt;dev,</div><div class='del'>-				   "Error: %s: rhashtable_remove_fast: %d",</div><div class='add'>+				   "Error: %s: rhashtable_remove_fast: %d\n",</div><div class='ctx'> 				   __func__, rc);</div><div class='ctx'> 		kfree_rcu(l2_node, rcu);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -726,7 +989,7 @@ bnxt_tc_get_l2_node(struct bnxt *bp, struct rhashtable *l2_table,</div><div class='ctx'> 		if (rc) {</div><div class='ctx'> 			kfree_rcu(l2_node, rcu);</div><div class='ctx'> 			netdev_err(bp-&gt;dev,</div><div class='del'>-				   "Error: %s: rhashtable_insert_fast: %d",</div><div class='add'>+				   "Error: %s: rhashtable_insert_fast: %d\n",</div><div class='ctx'> 				   __func__, rc);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -785,7 +1048,7 @@ static bool bnxt_tc_can_offload(struct bnxt *bp, struct bnxt_tc_flow *flow)</div><div class='ctx'> 	if ((flow-&gt;flags &amp; BNXT_TC_FLOW_FLAGS_PORTS) &amp;&amp;</div><div class='ctx'> 	    (flow-&gt;l4_key.ip_proto != IPPROTO_TCP &amp;&amp;</div><div class='ctx'> 	     flow-&gt;l4_key.ip_proto != IPPROTO_UDP)) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "Cannot offload non-TCP/UDP (%d) ports",</div><div class='add'>+		netdev_info(bp-&gt;dev, "Cannot offload non-TCP/UDP (%d) ports\n",</div><div class='ctx'> 			    flow-&gt;l4_key.ip_proto);</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -842,7 +1105,7 @@ static int bnxt_tc_put_tunnel_node(struct bnxt *bp,</div><div class='ctx'> 		rc =  rhashtable_remove_fast(tunnel_table, &amp;tunnel_node-&gt;node,</div><div class='ctx'> 					     *ht_params);</div><div class='ctx'> 		if (rc) {</div><div class='del'>-			netdev_err(bp-&gt;dev, "rhashtable_remove_fast rc=%d", rc);</div><div class='add'>+			netdev_err(bp-&gt;dev, "rhashtable_remove_fast rc=%d\n", rc);</div><div class='ctx'> 			rc = -1;</div><div class='ctx'> 		}</div><div class='ctx'> 		kfree_rcu(tunnel_node, rcu);</div><div class='hunk'>@@ -883,7 +1146,7 @@ bnxt_tc_get_tunnel_node(struct bnxt *bp, struct rhashtable *tunnel_table,</div><div class='ctx'> 	tunnel_node-&gt;refcount++;</div><div class='ctx'> 	return tunnel_node;</div><div class='ctx'> err:</div><div class='del'>-	netdev_info(bp-&gt;dev, "error rc=%d", rc);</div><div class='add'>+	netdev_info(bp-&gt;dev, "error rc=%d\n", rc);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -941,7 +1204,7 @@ static void bnxt_tc_put_decap_l2_node(struct bnxt *bp,</div><div class='ctx'> 					     &amp;decap_l2_node-&gt;node,</div><div class='ctx'> 					     tc_info-&gt;decap_l2_ht_params);</div><div class='ctx'> 		if (rc)</div><div class='del'>-			netdev_err(bp-&gt;dev, "rhashtable_remove_fast rc=%d", rc);</div><div class='add'>+			netdev_err(bp-&gt;dev, "rhashtable_remove_fast rc=%d\n", rc);</div><div class='ctx'> 		kfree_rcu(decap_l2_node, rcu);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -981,7 +1244,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> 	rt = ip_route_output_key(dev_net(real_dst_dev), &amp;flow);</div><div class='ctx'> 	if (IS_ERR(rt)) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "no route to %pI4b", &amp;flow.daddr);</div><div class='add'>+		netdev_info(bp-&gt;dev, "no route to %pI4b\n", &amp;flow.daddr);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -995,7 +1258,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> 		if (vlan-&gt;real_dev != real_dst_dev) {</div><div class='ctx'> 			netdev_info(bp-&gt;dev,</div><div class='del'>-				    "dst_dev(%s) doesn't use PF-if(%s)",</div><div class='add'>+				    "dst_dev(%s) doesn't use PF-if(%s)\n",</div><div class='ctx'> 				    netdev_name(dst_dev),</div><div class='ctx'> 				    netdev_name(real_dst_dev));</div><div class='ctx'> 			rc = -EOPNOTSUPP;</div><div class='hunk'>@@ -1007,7 +1270,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp,</div><div class='ctx'> #endif</div><div class='ctx'> 	} else if (dst_dev != real_dst_dev) {</div><div class='ctx'> 		netdev_info(bp-&gt;dev,</div><div class='del'>-			    "dst_dev(%s) for %pI4b is not PF-if(%s)",</div><div class='add'>+			    "dst_dev(%s) for %pI4b is not PF-if(%s)\n",</div><div class='ctx'> 			    netdev_name(dst_dev), &amp;flow.daddr,</div><div class='ctx'> 			    netdev_name(real_dst_dev));</div><div class='ctx'> 		rc = -EOPNOTSUPP;</div><div class='hunk'>@@ -1016,7 +1279,7 @@ static int bnxt_tc_resolve_tunnel_hdrs(struct bnxt *bp,</div><div class='ctx'> </div><div class='ctx'> 	nbr = dst_neigh_lookup(&amp;rt-&gt;dst, &amp;flow.daddr);</div><div class='ctx'> 	if (!nbr) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "can't lookup neighbor for %pI4b",</div><div class='add'>+		netdev_info(bp-&gt;dev, "can't lookup neighbor for %pI4b\n",</div><div class='ctx'> 			    &amp;flow.daddr);</div><div class='ctx'> 		rc = -EOPNOTSUPP;</div><div class='ctx'> 		goto put_rt;</div><div class='hunk'>@@ -1053,7 +1316,7 @@ static int bnxt_tc_get_decap_handle(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> </div><div class='ctx'> 	/* Check if there's another flow using the same tunnel decap.</div><div class='ctx'> 	 * If not, add this tunnel to the table and resolve the other</div><div class='del'>-	 * tunnel header fileds. Ignore src_port in the tunnel_key,</div><div class='add'>+	 * tunnel header fields. Ignore src_port in the tunnel_key,</div><div class='ctx'> 	 * since it is not required for decap filters.</div><div class='ctx'> 	 */</div><div class='ctx'> 	decap_key-&gt;tp_src = 0;</div><div class='hunk'>@@ -1147,7 +1410,7 @@ static int bnxt_tc_get_encap_handle(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> </div><div class='ctx'> 	/* Check if there's another flow using the same tunnel encap.</div><div class='ctx'> 	 * If not, add this tunnel to the table and resolve the other</div><div class='del'>-	 * tunnel header fileds</div><div class='add'>+	 * tunnel header fields</div><div class='ctx'> 	 */</div><div class='ctx'> 	encap_node = bnxt_tc_get_tunnel_node(bp, &amp;tc_info-&gt;encap_table,</div><div class='ctx'> 					     &amp;tc_info-&gt;encap_ht_params,</div><div class='hunk'>@@ -1226,7 +1489,7 @@ static int __bnxt_tc_del_flow(struct bnxt *bp,</div><div class='ctx'> 	rc = rhashtable_remove_fast(&amp;tc_info-&gt;flow_table, &amp;flow_node-&gt;node,</div><div class='ctx'> 				    tc_info-&gt;flow_ht_params);</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_err(bp-&gt;dev, "Error: %s: rhashtable_remove_fast rc=%d",</div><div class='add'>+		netdev_err(bp-&gt;dev, "Error: %s: rhashtable_remove_fast rc=%d\n",</div><div class='ctx'> 			   __func__, rc);</div><div class='ctx'> </div><div class='ctx'> 	kfree_rcu(flow_node, rcu);</div><div class='hunk'>@@ -1236,7 +1499,7 @@ static int __bnxt_tc_del_flow(struct bnxt *bp,</div><div class='ctx'> static void bnxt_tc_set_flow_dir(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'> 				 u16 src_fid)</div><div class='ctx'> {</div><div class='del'>-	flow-&gt;dir = (bp-&gt;pf.fw_fid == src_fid) ? BNXT_DIR_RX : BNXT_DIR_TX;</div><div class='add'>+	flow-&gt;l2_key.dir = (bp-&gt;pf.fw_fid == src_fid) ? BNXT_DIR_RX : BNXT_DIR_TX;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bnxt_tc_set_src_fid(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='hunk'>@@ -1262,7 +1525,7 @@ static void bnxt_tc_set_src_fid(struct bnxt *bp, struct bnxt_tc_flow *flow,</div><div class='ctx'>  * The hash-tables are already protected by the rhashtable API.</div><div class='ctx'>  */</div><div class='ctx'> static int bnxt_tc_add_flow(struct bnxt *bp, u16 src_fid,</div><div class='del'>-			    struct tc_cls_flower_offload *tc_flow_cmd)</div><div class='add'>+			    struct flow_cls_offload *tc_flow_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_tc_flow_node *new_node, *old_node;</div><div class='ctx'> 	struct bnxt_tc_info *tc_info = bp-&gt;tc_info;</div><div class='hunk'>@@ -1285,13 +1548,12 @@ static int bnxt_tc_add_flow(struct bnxt *bp, u16 src_fid,</div><div class='ctx'> 		goto free_node;</div><div class='ctx'> </div><div class='ctx'> 	bnxt_tc_set_src_fid(bp, flow, src_fid);</div><div class='del'>-</div><div class='del'>-	if (bp-&gt;fw_cap &amp; BNXT_FW_CAP_OVS_64BIT_HANDLE)</div><div class='del'>-		bnxt_tc_set_flow_dir(bp, flow, src_fid);</div><div class='add'>+	bnxt_tc_set_flow_dir(bp, flow, flow-&gt;src_fid);</div><div class='ctx'> </div><div class='ctx'> 	if (!bnxt_tc_can_offload(bp, flow)) {</div><div class='ctx'> 		rc = -EOPNOTSUPP;</div><div class='del'>-		goto free_node;</div><div class='add'>+		kfree_rcu(new_node, rcu);</div><div class='add'>+		return rc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If a flow exists with the same cookie, delete it */</div><div class='hunk'>@@ -1342,13 +1604,13 @@ unlock:</div><div class='ctx'> free_node:</div><div class='ctx'> 	kfree_rcu(new_node, rcu);</div><div class='ctx'> done:</div><div class='del'>-	netdev_err(bp-&gt;dev, "Error: %s: cookie=0x%lx error=%d",</div><div class='add'>+	netdev_err(bp-&gt;dev, "Error: %s: cookie=0x%lx error=%d\n",</div><div class='ctx'> 		   __func__, tc_flow_cmd-&gt;cookie, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_tc_del_flow(struct bnxt *bp,</div><div class='del'>-			    struct tc_cls_flower_offload *tc_flow_cmd)</div><div class='add'>+			    struct flow_cls_offload *tc_flow_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_tc_info *tc_info = bp-&gt;tc_info;</div><div class='ctx'> 	struct bnxt_tc_flow_node *flow_node;</div><div class='hunk'>@@ -1363,7 +1625,7 @@ static int bnxt_tc_del_flow(struct bnxt *bp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_tc_get_flow_stats(struct bnxt *bp,</div><div class='del'>-				  struct tc_cls_flower_offload *tc_flow_cmd)</div><div class='add'>+				  struct flow_cls_offload *tc_flow_cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_tc_flow_stats stats, *curr_stats, *prev_stats;</div><div class='ctx'> 	struct bnxt_tc_info *tc_info = bp-&gt;tc_info;</div><div class='hunk'>@@ -1388,8 +1650,8 @@ static int bnxt_tc_get_flow_stats(struct bnxt *bp,</div><div class='ctx'> 	lastused = flow-&gt;lastused;</div><div class='ctx'> 	spin_unlock(&amp;flow-&gt;stats_lock);</div><div class='ctx'> </div><div class='del'>-	flow_stats_update(&amp;tc_flow_cmd-&gt;stats, stats.bytes, stats.packets,</div><div class='del'>-			  lastused);</div><div class='add'>+	flow_stats_update(&amp;tc_flow_cmd-&gt;stats, stats.bytes, stats.packets, 0,</div><div class='add'>+			  lastused, FLOW_ACTION_HW_STATS_DELAYED);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1407,7 +1669,7 @@ static void bnxt_fill_cfa_stats_req(struct bnxt *bp,</div><div class='ctx'> 		 * 2. 15th bit of flow_handle must specify the flow</div><div class='ctx'> 		 *    direction (TX/RX).</div><div class='ctx'> 		 */</div><div class='del'>-		if (flow_node-&gt;flow.dir == BNXT_DIR_RX)</div><div class='add'>+		if (flow_node-&gt;flow.l2_key.dir == BNXT_DIR_RX)</div><div class='ctx'> 			handle = CFA_FLOW_INFO_REQ_FLOW_HANDLE_DIR_RX |</div><div class='ctx'> 				 CFA_FLOW_INFO_REQ_FLOW_HANDLE_MAX_MASK;</div><div class='ctx'> 		else</div><div class='hunk'>@@ -1423,14 +1685,20 @@ static int</div><div class='ctx'> bnxt_hwrm_cfa_flow_stats_get(struct bnxt *bp, int num_flows,</div><div class='ctx'> 			     struct bnxt_tc_stats_batch stats_batch[])</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_flow_stats_input req = { 0 };</div><div class='ctx'> 	struct hwrm_cfa_flow_stats_output *resp;</div><div class='del'>-	__le16 *req_flow_handles = &amp;req.flow_handle_0;</div><div class='del'>-	__le32 *req_flow_ids = &amp;req.flow_id_0;</div><div class='add'>+	struct hwrm_cfa_flow_stats_input *req;</div><div class='add'>+	__le16 *req_flow_handles;</div><div class='add'>+	__le32 *req_flow_ids;</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_FLOW_STATS, -1, -1);</div><div class='del'>-	req.num_flows = cpu_to_le16(num_flows);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_FLOW_STATS);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	req_flow_handles = &amp;req-&gt;flow_handle_0;</div><div class='add'>+	req_flow_ids = &amp;req-&gt;flow_id_0;</div><div class='add'>+</div><div class='add'>+	req-&gt;num_flows = cpu_to_le16(num_flows);</div><div class='ctx'> 	for (i = 0; i &lt; num_flows; i++) {</div><div class='ctx'> 		struct bnxt_tc_flow_node *flow_node = stats_batch[i].flow_node;</div><div class='ctx'> </div><div class='hunk'>@@ -1438,13 +1706,12 @@ bnxt_hwrm_cfa_flow_stats_get(struct bnxt *bp, int num_flows,</div><div class='ctx'> 					&amp;req_flow_handles[i], &amp;req_flow_ids[i]);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		__le64 *resp_packets;</div><div class='ctx'> 		__le64 *resp_bytes;</div><div class='ctx'> </div><div class='del'>-		resp = bnxt_get_hwrm_resp_addr(bp, &amp;req);</div><div class='ctx'> 		resp_packets = &amp;resp-&gt;packet_0;</div><div class='ctx'> 		resp_bytes = &amp;resp-&gt;byte_0;</div><div class='ctx'> </div><div class='hunk'>@@ -1454,13 +1721,12 @@ bnxt_hwrm_cfa_flow_stats_get(struct bnxt *bp, int num_flows,</div><div class='ctx'> 			stats_batch[i].hw_stats.bytes =</div><div class='ctx'> 						le64_to_cpu(resp_bytes[i]);</div><div class='ctx'> 		}</div><div class='del'>-	} else {</div><div class='del'>-		netdev_info(bp-&gt;dev, "error rc=%d", rc);</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+exit:</div><div class='ctx'> 	if (rc)</div><div class='del'>-		rc = -EIO;</div><div class='add'>+		netdev_info(bp-&gt;dev, "error rc=%d\n", rc);</div><div class='add'>+</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1585,20 +1851,134 @@ void bnxt_tc_flow_stats_work(struct bnxt *bp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,</div><div class='del'>-			 struct tc_cls_flower_offload *cls_flower)</div><div class='add'>+			 struct flow_cls_offload *cls_flower)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cls_flower-&gt;command) {</div><div class='del'>-	case TC_CLSFLOWER_REPLACE:</div><div class='add'>+	case FLOW_CLS_REPLACE:</div><div class='ctx'> 		return bnxt_tc_add_flow(bp, src_fid, cls_flower);</div><div class='del'>-	case TC_CLSFLOWER_DESTROY:</div><div class='add'>+	case FLOW_CLS_DESTROY:</div><div class='ctx'> 		return bnxt_tc_del_flow(bp, cls_flower);</div><div class='del'>-	case TC_CLSFLOWER_STATS:</div><div class='add'>+	case FLOW_CLS_STATS:</div><div class='ctx'> 		return bnxt_tc_get_flow_stats(bp, cls_flower);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bnxt_tc_setup_indr_block_cb(enum tc_setup_type type,</div><div class='add'>+				       void *type_data, void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_flower_indr_block_cb_priv *priv = cb_priv;</div><div class='add'>+	struct flow_cls_offload *flower = type_data;</div><div class='add'>+	struct bnxt *bp = priv-&gt;bp;</div><div class='add'>+</div><div class='add'>+	if (!tc_cls_can_offload_and_chain0(bp-&gt;dev, type_data))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_CLSFLOWER:</div><div class='add'>+		return bnxt_tc_setup_flower(bp, bp-&gt;pf.fw_fid, flower);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct bnxt_flower_indr_block_cb_priv *</div><div class='add'>+bnxt_tc_indr_block_cb_lookup(struct bnxt *bp, struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_flower_indr_block_cb_priv *cb_priv;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(cb_priv, &amp;bp-&gt;tc_indr_block_list, list)</div><div class='add'>+		if (cb_priv-&gt;tunnel_netdev == netdev)</div><div class='add'>+			return cb_priv;</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_tc_setup_indr_rel(void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_flower_indr_block_cb_priv *priv = cb_priv;</div><div class='add'>+</div><div class='add'>+	list_del(&amp;priv-&gt;list);</div><div class='add'>+	kfree(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_tc_setup_indr_block(struct net_device *netdev, struct Qdisc *sch, struct bnxt *bp,</div><div class='add'>+				    struct flow_block_offload *f, void *data,</div><div class='add'>+				    void (*cleanup)(struct flow_block_cb *block_cb))</div><div class='add'>+{</div><div class='add'>+	struct bnxt_flower_indr_block_cb_priv *cb_priv;</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+</div><div class='add'>+	if (f-&gt;binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_BLOCK_BIND:</div><div class='add'>+		cb_priv = kmalloc(sizeof(*cb_priv), GFP_KERNEL);</div><div class='add'>+		if (!cb_priv)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		cb_priv-&gt;tunnel_netdev = netdev;</div><div class='add'>+		cb_priv-&gt;bp = bp;</div><div class='add'>+		list_add(&amp;cb_priv-&gt;list, &amp;bp-&gt;tc_indr_block_list);</div><div class='add'>+</div><div class='add'>+		block_cb = flow_indr_block_cb_alloc(bnxt_tc_setup_indr_block_cb,</div><div class='add'>+						    cb_priv, cb_priv,</div><div class='add'>+						    bnxt_tc_setup_indr_rel, f,</div><div class='add'>+						    netdev, sch, data, bp, cleanup);</div><div class='add'>+		if (IS_ERR(block_cb)) {</div><div class='add'>+			list_del(&amp;cb_priv-&gt;list);</div><div class='add'>+			kfree(cb_priv);</div><div class='add'>+			return PTR_ERR(block_cb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		flow_block_cb_add(block_cb, f);</div><div class='add'>+		list_add_tail(&amp;block_cb-&gt;driver_list, &amp;bnxt_block_cb_list);</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_BLOCK_UNBIND:</div><div class='add'>+		cb_priv = bnxt_tc_indr_block_cb_lookup(bp, netdev);</div><div class='add'>+		if (!cb_priv)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		block_cb = flow_block_cb_lookup(f-&gt;block,</div><div class='add'>+						bnxt_tc_setup_indr_block_cb,</div><div class='add'>+						cb_priv);</div><div class='add'>+		if (!block_cb)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		flow_indr_block_cb_remove(block_cb, f);</div><div class='add'>+		list_del(&amp;block_cb-&gt;driver_list);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool bnxt_is_netdev_indr_offload(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return netif_is_vxlan(netdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_tc_setup_indr_cb(struct net_device *netdev, struct Qdisc *sch, void *cb_priv,</div><div class='add'>+				 enum tc_setup_type type, void *type_data,</div><div class='add'>+				 void *data,</div><div class='add'>+				 void (*cleanup)(struct flow_block_cb *block_cb))</div><div class='add'>+{</div><div class='add'>+	if (!netdev || !bnxt_is_netdev_indr_offload(netdev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_BLOCK:</div><div class='add'>+		return bnxt_tc_setup_indr_block(netdev, sch, cb_priv, type_data, data, cleanup);</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct rhashtable_params bnxt_tc_flow_ht_params = {</div><div class='ctx'> 	.head_offset = offsetof(struct bnxt_tc_flow_node, node),</div><div class='ctx'> 	.key_offset = offsetof(struct bnxt_tc_flow_node, cookie),</div><div class='hunk'>@@ -1635,11 +2015,8 @@ int bnxt_init_tc(struct bnxt *bp)</div><div class='ctx'> 	struct bnxt_tc_info *tc_info;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hwrm_spec_code &lt; 0x10803) {</div><div class='del'>-		netdev_warn(bp-&gt;dev,</div><div class='del'>-			    "Firmware does not support TC flower offload.\n");</div><div class='del'>-		return -ENOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	if (bp-&gt;hwrm_spec_code &lt; 0x10803)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	tc_info = kzalloc(sizeof(*tc_info), GFP_KERNEL);</div><div class='ctx'> 	if (!tc_info)</div><div class='hunk'>@@ -1682,7 +2059,15 @@ int bnxt_init_tc(struct bnxt *bp)</div><div class='ctx'> 	bp-&gt;dev-&gt;hw_features |= NETIF_F_HW_TC;</div><div class='ctx'> 	bp-&gt;dev-&gt;features |= NETIF_F_HW_TC;</div><div class='ctx'> 	bp-&gt;tc_info = tc_info;</div><div class='del'>-	return 0;</div><div class='add'>+</div><div class='add'>+	/* init indirect block notifications */</div><div class='add'>+	INIT_LIST_HEAD(&amp;bp-&gt;tc_indr_block_list);</div><div class='add'>+</div><div class='add'>+	rc = flow_indr_dev_register(bnxt_tc_setup_indr_cb, bp);</div><div class='add'>+	if (!rc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	rhashtable_destroy(&amp;tc_info-&gt;encap_table);</div><div class='ctx'> </div><div class='ctx'> destroy_decap_table:</div><div class='ctx'> 	rhashtable_destroy(&amp;tc_info-&gt;decap_table);</div><div class='hunk'>@@ -1694,6 +2079,7 @@ destroy_flow_table:</div><div class='ctx'> 	rhashtable_destroy(&amp;tc_info-&gt;flow_table);</div><div class='ctx'> free_tc_info:</div><div class='ctx'> 	kfree(tc_info);</div><div class='add'>+	bp-&gt;tc_info = NULL;</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1704,6 +2090,8 @@ void bnxt_shutdown_tc(struct bnxt *bp)</div><div class='ctx'> 	if (!bnxt_tc_flower_enabled(bp))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	flow_indr_dev_unregister(bnxt_tc_setup_indr_cb, bp,</div><div class='add'>+				 bnxt_tc_setup_indr_rel);</div><div class='ctx'> 	rhashtable_destroy(&amp;tc_info-&gt;flow_table);</div><div class='ctx'> 	rhashtable_destroy(&amp;tc_info-&gt;l2_table);</div><div class='ctx'> 	rhashtable_destroy(&amp;tc_info-&gt;decap_l2_table);</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h<br/>index 8a0968967bc5..10c62b094914 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h</a></div><div class='hunk'>@@ -23,6 +23,9 @@ struct bnxt_tc_l2_key {</div><div class='ctx'> 	__be16		inner_vlan_tci;</div><div class='ctx'> 	__be16		ether_type;</div><div class='ctx'> 	u8		num_vlans;</div><div class='add'>+	u8		dir;</div><div class='add'>+#define BNXT_DIR_RX	1</div><div class='add'>+#define BNXT_DIR_TX	0</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_tc_l3_key {</div><div class='hunk'>@@ -59,6 +62,12 @@ struct bnxt_tc_tunnel_key {</div><div class='ctx'> 	__be32			id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define bnxt_eth_addr_key_mask_invalid(eth_addr, eth_addr_mask)		\</div><div class='add'>+	((is_wildcard(&amp;(eth_addr)[0], ETH_ALEN) &amp;&amp;			\</div><div class='add'>+	 is_wildcard(&amp;(eth_addr)[ETH_ALEN / 2], ETH_ALEN)) ||		\</div><div class='add'>+	(is_wildcard(&amp;(eth_addr_mask)[0], ETH_ALEN) &amp;&amp;			\</div><div class='add'>+	 is_wildcard(&amp;(eth_addr_mask)[ETH_ALEN / 2], ETH_ALEN)))</div><div class='add'>+</div><div class='ctx'> struct bnxt_tc_actions {</div><div class='ctx'> 	u32				flags;</div><div class='ctx'> #define BNXT_TC_ACTION_FLAG_FWD			BIT(0)</div><div class='hunk'>@@ -68,6 +77,8 @@ struct bnxt_tc_actions {</div><div class='ctx'> #define BNXT_TC_ACTION_FLAG_DROP		BIT(5)</div><div class='ctx'> #define BNXT_TC_ACTION_FLAG_TUNNEL_ENCAP	BIT(6)</div><div class='ctx'> #define BNXT_TC_ACTION_FLAG_TUNNEL_DECAP	BIT(7)</div><div class='add'>+#define BNXT_TC_ACTION_FLAG_L2_REWRITE		BIT(8)</div><div class='add'>+#define BNXT_TC_ACTION_FLAG_NAT_XLATE		BIT(9)</div><div class='ctx'> </div><div class='ctx'> 	u16				dst_fid;</div><div class='ctx'> 	struct net_device		*dst_dev;</div><div class='hunk'>@@ -76,6 +87,18 @@ struct bnxt_tc_actions {</div><div class='ctx'> </div><div class='ctx'> 	/* tunnel encap */</div><div class='ctx'> 	struct ip_tunnel_key		tun_encap_key;</div><div class='add'>+#define	PEDIT_OFFSET_SMAC_LAST_4_BYTES		0x8</div><div class='add'>+	__be16				l2_rewrite_dmac[3];</div><div class='add'>+	__be16				l2_rewrite_smac[3];</div><div class='add'>+	struct {</div><div class='add'>+		bool src_xlate;  /* true =&gt; translate src,</div><div class='add'>+				  * false =&gt; translate dst</div><div class='add'>+				  * Mutually exclusive, i.e cannot set both</div><div class='add'>+				  */</div><div class='add'>+		bool l3_is_ipv4; /* false means L3 is ipv6 */</div><div class='add'>+		struct bnxt_tc_l3_key l3;</div><div class='add'>+		struct bnxt_tc_l4_key l4;</div><div class='add'>+	} nat;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_tc_flow {</div><div class='hunk'>@@ -98,9 +121,6 @@ struct bnxt_tc_flow {</div><div class='ctx'> </div><div class='ctx'> 	/* flow applicable to pkts ingressing on this fid */</div><div class='ctx'> 	u16				src_fid;</div><div class='del'>-	u8				dir;</div><div class='del'>-#define BNXT_DIR_RX	1</div><div class='del'>-#define BNXT_DIR_TX	0</div><div class='ctx'> 	struct bnxt_tc_l2_key		l2_key;</div><div class='ctx'> 	struct bnxt_tc_l2_key		l2_mask;</div><div class='ctx'> 	struct bnxt_tc_l3_key		l3_key;</div><div class='hunk'>@@ -196,7 +216,7 @@ struct bnxt_tc_flow_node {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,</div><div class='del'>-			 struct tc_cls_flower_offload *cls_flower);</div><div class='add'>+			 struct flow_cls_offload *cls_flower);</div><div class='ctx'> int bnxt_init_tc(struct bnxt *bp);</div><div class='ctx'> void bnxt_shutdown_tc(struct bnxt *bp);</div><div class='ctx'> void bnxt_tc_flow_stats_work(struct bnxt *bp);</div><div class='hunk'>@@ -209,7 +229,7 @@ static inline bool bnxt_tc_flower_enabled(struct bnxt *bp)</div><div class='ctx'> #else /* CONFIG_BNXT_FLOWER_OFFLOAD */</div><div class='ctx'> </div><div class='ctx'> static inline int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,</div><div class='del'>-				       struct tc_cls_flower_offload *cls_flower)</div><div class='add'>+				       struct flow_cls_offload *cls_flower)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c<br/>index bfa342a98d08..927971c362f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c</a></div><div class='hunk'>@@ -19,339 +19,297 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> #include &lt;linux/bitmap.h&gt;</div><div class='add'>+#include &lt;linux/auxiliary_bus.h&gt;</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bnxt_hsi.h"</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_ulp.h"</div><div class='ctx'> </div><div class='del'>-static int bnxt_register_dev(struct bnxt_en_dev *edev, int ulp_id,</div><div class='del'>-			     struct bnxt_ulp_ops *ulp_ops, void *handle)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev = edev-&gt;net;</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct bnxt_ulp *ulp;</div><div class='del'>-</div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	if (ulp_id &gt;= BNXT_MAX_ULP)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+static DEFINE_IDA(bnxt_aux_dev_ids);</div><div class='ctx'> </div><div class='del'>-	ulp = &amp;edev-&gt;ulp_tbl[ulp_id];</div><div class='del'>-	if (rcu_access_pointer(ulp-&gt;ulp_ops)) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "ulp id %d already registered\n", ulp_id);</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	}</div><div class='del'>-	if (ulp_id == BNXT_ROCE_ULP) {</div><div class='del'>-		unsigned int max_stat_ctxs;</div><div class='add'>+static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *ent)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='add'>+	int num_msix, i;</div><div class='ctx'> </div><div class='del'>-		max_stat_ctxs = bnxt_get_max_func_stat_ctxs(bp);</div><div class='del'>-		if (max_stat_ctxs &lt;= BNXT_MIN_ROCE_STAT_CTXS ||</div><div class='del'>-		    bp-&gt;cp_nr_rings == max_stat_ctxs)</div><div class='del'>-			return -ENOMEM;</div><div class='add'>+	if (!edev-&gt;ulp_tbl-&gt;msix_requested) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Requested MSI-X vectors insufficient\n");</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	atomic_set(&amp;ulp-&gt;ref_count, 0);</div><div class='del'>-	ulp-&gt;handle = handle;</div><div class='del'>-	rcu_assign_pointer(ulp-&gt;ulp_ops, ulp_ops);</div><div class='del'>-</div><div class='del'>-	if (ulp_id == BNXT_ROCE_ULP) {</div><div class='del'>-		if (test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state))</div><div class='del'>-			bnxt_hwrm_vnic_cfg(bp, 0);</div><div class='add'>+	num_msix = edev-&gt;ulp_tbl-&gt;msix_requested;</div><div class='add'>+	for (i = 0; i &lt; num_msix; i++) {</div><div class='add'>+		ent[i].vector = bp-&gt;irq_tbl[i].vector;</div><div class='add'>+		ent[i].ring_idx = i;</div><div class='add'>+		if (bp-&gt;flags &amp; BNXT_FLAG_CHIP_P5_PLUS)</div><div class='add'>+			ent[i].db_offset = bp-&gt;db_offset;</div><div class='add'>+		else</div><div class='add'>+			ent[i].db_offset = i * 0x80;</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+int bnxt_get_ulp_msix_num(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;edev)</div><div class='add'>+		return bp-&gt;edev-&gt;ulp_num_msix_vec;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_unregister_dev(struct bnxt_en_dev *edev, int ulp_id)</div><div class='add'>+void bnxt_set_ulp_msix_num(struct bnxt *bp, int num)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = edev-&gt;net;</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	struct bnxt_ulp *ulp;</div><div class='del'>-	int i = 0;</div><div class='add'>+	if (bp-&gt;edev)</div><div class='add'>+		bp-&gt;edev-&gt;ulp_num_msix_vec = num;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	if (ulp_id &gt;= BNXT_MAX_ULP)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+int bnxt_get_ulp_msix_num_in_use(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bnxt_ulp_registered(bp-&gt;edev))</div><div class='add'>+		return bp-&gt;edev-&gt;ulp_num_msix_vec;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	ulp = &amp;edev-&gt;ulp_tbl[ulp_id];</div><div class='del'>-	if (!rcu_access_pointer(ulp-&gt;ulp_ops)) {</div><div class='del'>-		netdev_err(bp-&gt;dev, "ulp id %d not registered\n", ulp_id);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-	if (ulp_id == BNXT_ROCE_ULP &amp;&amp; ulp-&gt;msix_requested)</div><div class='del'>-		edev-&gt;en_ops-&gt;bnxt_free_msix(edev, ulp_id);</div><div class='add'>+int bnxt_get_ulp_stat_ctxs(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;edev)</div><div class='add'>+		return bp-&gt;edev-&gt;ulp_num_ctxs;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (ulp-&gt;max_async_event_id)</div><div class='del'>-		bnxt_hwrm_func_rgtr_async_events(bp, NULL, 0);</div><div class='add'>+void bnxt_set_ulp_stat_ctxs(struct bnxt *bp, int num_ulp_ctx)</div><div class='add'>+{</div><div class='add'>+	if (bp-&gt;edev)</div><div class='add'>+		bp-&gt;edev-&gt;ulp_num_ctxs = num_ulp_ctx;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	RCU_INIT_POINTER(ulp-&gt;ulp_ops, NULL);</div><div class='del'>-	synchronize_rcu();</div><div class='del'>-	ulp-&gt;max_async_event_id = 0;</div><div class='del'>-	ulp-&gt;async_events_bmap = NULL;</div><div class='del'>-	while (atomic_read(&amp;ulp-&gt;ref_count) != 0 &amp;&amp; i &lt; 10) {</div><div class='del'>-		msleep(100);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='add'>+int bnxt_get_ulp_stat_ctxs_in_use(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	if (bnxt_ulp_registered(bp-&gt;edev))</div><div class='add'>+		return bp-&gt;edev-&gt;ulp_num_ctxs;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *ent)</div><div class='add'>+void bnxt_set_dflt_ulp_stat_ctxs(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='del'>-	int num_msix, idx, i;</div><div class='del'>-</div><div class='del'>-	num_msix = edev-&gt;ulp_tbl[BNXT_ROCE_ULP].msix_requested;</div><div class='del'>-	idx = edev-&gt;ulp_tbl[BNXT_ROCE_ULP].msix_base;</div><div class='del'>-	for (i = 0; i &lt; num_msix; i++) {</div><div class='del'>-		ent[i].vector = bp-&gt;irq_tbl[idx + i].vector;</div><div class='del'>-		ent[i].ring_idx = idx + i;</div><div class='del'>-		ent[i].db_offset = (idx + i) * 0x80;</div><div class='add'>+	if (bp-&gt;edev) {</div><div class='add'>+		bp-&gt;edev-&gt;ulp_num_ctxs = BNXT_MIN_ROCE_STAT_CTXS;</div><div class='add'>+		/* Reserve one additional stat_ctx for PF0 (except</div><div class='add'>+		 * on 1-port NICs) as it also creates one stat_ctx</div><div class='add'>+		 * for PF1 in case of RoCE bonding.</div><div class='add'>+		 */</div><div class='add'>+		if (BNXT_PF(bp) &amp;&amp; !bp-&gt;pf.port_id &amp;&amp;</div><div class='add'>+		    bp-&gt;port_count &gt; 1)</div><div class='add'>+			bp-&gt;edev-&gt;ulp_num_ctxs++;</div><div class='add'>+</div><div class='add'>+		/* Reserve one additional stat_ctx when the device is capable</div><div class='add'>+		 * of supporting port mirroring on RDMA device.</div><div class='add'>+		 */</div><div class='add'>+		if (BNXT_MIRROR_ON_ROCE_CAP(bp))</div><div class='add'>+			bp-&gt;edev-&gt;ulp_num_ctxs++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_req_msix_vecs(struct bnxt_en_dev *edev, int ulp_id,</div><div class='del'>-			      struct bnxt_msix_entry *ent, int num_msix)</div><div class='add'>+int bnxt_register_dev(struct bnxt_en_dev *edev,</div><div class='add'>+		      struct bnxt_ulp_ops *ulp_ops,</div><div class='add'>+		      void *handle)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = edev-&gt;net;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='del'>-	int max_idx, max_cp_rings;</div><div class='del'>-	int avail_msix, idx;</div><div class='add'>+	unsigned int max_stat_ctxs;</div><div class='add'>+	struct bnxt_ulp *ulp;</div><div class='ctx'> 	int rc = 0;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	if (ulp_id != BNXT_ROCE_ULP)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!(bp-&gt;flags &amp; BNXT_FLAG_USING_MSIX))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	if (edev-&gt;ulp_tbl[ulp_id].msix_requested)</div><div class='del'>-		return -EAGAIN;</div><div class='del'>-</div><div class='del'>-	max_cp_rings = bnxt_get_max_func_cp_rings(bp);</div><div class='del'>-	avail_msix = bnxt_get_avail_msix(bp, num_msix);</div><div class='del'>-	if (!avail_msix)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	if (avail_msix &gt; num_msix)</div><div class='del'>-		avail_msix = num_msix;</div><div class='del'>-</div><div class='del'>-	if (BNXT_NEW_RM(bp)) {</div><div class='del'>-		idx = bp-&gt;cp_nr_rings;</div><div class='del'>-	} else {</div><div class='del'>-		max_idx = min_t(int, bp-&gt;total_irqs, max_cp_rings);</div><div class='del'>-		idx = max_idx - avail_msix;</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	mutex_lock(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+	if (!bp-&gt;irq_tbl) {</div><div class='add'>+		rc = -ENODEV;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='del'>-	edev-&gt;ulp_tbl[ulp_id].msix_base = idx;</div><div class='del'>-	edev-&gt;ulp_tbl[ulp_id].msix_requested = avail_msix;</div><div class='del'>-	if (bp-&gt;total_irqs &lt; (idx + avail_msix)) {</div><div class='del'>-		if (netif_running(dev)) {</div><div class='del'>-			bnxt_close_nic(bp, true, false);</div><div class='del'>-			rc = bnxt_open_nic(bp, true, false);</div><div class='del'>-		} else {</div><div class='del'>-			rc = bnxt_reserve_rings(bp, true);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (rc) {</div><div class='del'>-		edev-&gt;ulp_tbl[ulp_id].msix_requested = 0;</div><div class='del'>-		return -EAGAIN;</div><div class='add'>+	max_stat_ctxs = bnxt_get_max_func_stat_ctxs(bp);</div><div class='add'>+	if (max_stat_ctxs &lt;= BNXT_MIN_ROCE_STAT_CTXS ||</div><div class='add'>+	    bp-&gt;cp_nr_rings == max_stat_ctxs) {</div><div class='add'>+		rc = -ENOMEM;</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (BNXT_NEW_RM(bp)) {</div><div class='del'>-		struct bnxt_hw_resc *hw_resc = &amp;bp-&gt;hw_resc;</div><div class='add'>+	ulp = edev-&gt;ulp_tbl;</div><div class='add'>+	ulp-&gt;handle = handle;</div><div class='add'>+	rcu_assign_pointer(ulp-&gt;ulp_ops, ulp_ops);</div><div class='ctx'> </div><div class='del'>-		avail_msix = hw_resc-&gt;resv_irqs - bp-&gt;cp_nr_rings;</div><div class='del'>-		edev-&gt;ulp_tbl[ulp_id].msix_requested = avail_msix;</div><div class='del'>-	}</div><div class='del'>-	bnxt_fill_msix_vecs(bp, ent);</div><div class='del'>-	edev-&gt;flags |= BNXT_EN_FLAG_MSIX_REQUESTED;</div><div class='del'>-	return avail_msix;</div><div class='add'>+	if (test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state))</div><div class='add'>+		bnxt_hwrm_vnic_cfg(bp, &amp;bp-&gt;vnic_info[BNXT_VNIC_DEFAULT]);</div><div class='add'>+</div><div class='add'>+	edev-&gt;ulp_tbl-&gt;msix_requested = bnxt_get_ulp_msix_num(bp);</div><div class='add'>+</div><div class='add'>+	bnxt_fill_msix_vecs(bp, bp-&gt;edev-&gt;msix_entries);</div><div class='add'>+exit:</div><div class='add'>+	mutex_unlock(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(bnxt_register_dev);</div><div class='ctx'> </div><div class='del'>-static int bnxt_free_msix_vecs(struct bnxt_en_dev *edev, int ulp_id)</div><div class='add'>+void bnxt_unregister_dev(struct bnxt_en_dev *edev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = edev-&gt;net;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bnxt_ulp *ulp;</div><div class='ctx'> </div><div class='del'>-	ASSERT_RTNL();</div><div class='del'>-	if (ulp_id != BNXT_ROCE_ULP)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!(edev-&gt;flags &amp; BNXT_EN_FLAG_MSIX_REQUESTED))</div><div class='del'>-		return 0;</div><div class='add'>+	ulp = edev-&gt;ulp_tbl;</div><div class='add'>+	netdev_lock(dev);</div><div class='add'>+	mutex_lock(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+	edev-&gt;ulp_tbl-&gt;msix_requested = 0;</div><div class='ctx'> </div><div class='del'>-	edev-&gt;ulp_tbl[ulp_id].msix_requested = 0;</div><div class='del'>-	edev-&gt;flags &amp;= ~BNXT_EN_FLAG_MSIX_REQUESTED;</div><div class='del'>-	if (netif_running(dev)) {</div><div class='del'>-		bnxt_close_nic(bp, true, false);</div><div class='del'>-		bnxt_open_nic(bp, true, false);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int bnxt_get_ulp_msix_num(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	if (bnxt_ulp_registered(bp-&gt;edev, BNXT_ROCE_ULP)) {</div><div class='del'>-		struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='add'>+	if (ulp-&gt;max_async_event_id)</div><div class='add'>+		bnxt_hwrm_func_drv_rgtr(bp, NULL, 0, true);</div><div class='ctx'> </div><div class='del'>-		return edev-&gt;ulp_tbl[BNXT_ROCE_ULP].msix_requested;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	RCU_INIT_POINTER(ulp-&gt;ulp_ops, NULL);</div><div class='add'>+	synchronize_rcu();</div><div class='add'>+	ulp-&gt;max_async_event_id = 0;</div><div class='add'>+	ulp-&gt;async_events_bmap = NULL;</div><div class='add'>+	mutex_unlock(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+	netdev_unlock(dev);</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(bnxt_unregister_dev);</div><div class='ctx'> </div><div class='del'>-int bnxt_get_ulp_msix_base(struct bnxt *bp)</div><div class='add'>+static int bnxt_set_dflt_ulp_msix(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	if (bnxt_ulp_registered(bp-&gt;edev, BNXT_ROCE_ULP)) {</div><div class='del'>-		struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='del'>-</div><div class='del'>-		if (edev-&gt;ulp_tbl[BNXT_ROCE_ULP].msix_requested)</div><div class='del'>-			return edev-&gt;ulp_tbl[BNXT_ROCE_ULP].msix_base;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	int roce_msix = BNXT_MAX_ROCE_MSIX;</div><div class='ctx'> </div><div class='del'>-int bnxt_get_ulp_stat_ctxs(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	if (bnxt_ulp_registered(bp-&gt;edev, BNXT_ROCE_ULP))</div><div class='del'>-		return BNXT_MIN_ROCE_STAT_CTXS;</div><div class='add'>+	if (BNXT_VF(bp))</div><div class='add'>+		roce_msix = BNXT_MAX_ROCE_MSIX_VF;</div><div class='add'>+	else if (bp-&gt;port_partition_type)</div><div class='add'>+		roce_msix = BNXT_MAX_ROCE_MSIX_NPAR_PF;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	/* NQ MSIX vectors should match the number of CPUs plus 1 more for</div><div class='add'>+	 * the CREQ MSIX, up to the default.</div><div class='add'>+	 */</div><div class='add'>+	return min_t(int, roce_msix, num_online_cpus() + 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_send_msg(struct bnxt_en_dev *edev, int ulp_id,</div><div class='add'>+int bnxt_send_msg(struct bnxt_en_dev *edev,</div><div class='ctx'> 			 struct bnxt_fw_msg *fw_msg)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = edev-&gt;net;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct output *resp;</div><div class='ctx'> 	struct input *req;</div><div class='add'>+	u32 resp_len;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	req = fw_msg-&gt;msg;</div><div class='del'>-	req-&gt;resp_addr = cpu_to_le64(bp-&gt;hwrm_cmd_resp_dma_addr);</div><div class='del'>-	rc = _hwrm_send_message(bp, fw_msg-&gt;msg, fw_msg-&gt;msg_len,</div><div class='del'>-				fw_msg-&gt;timeout);</div><div class='del'>-	if (!rc) {</div><div class='del'>-		struct output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-		u32 len = le16_to_cpu(resp-&gt;resp_len);</div><div class='add'>+	if (bp-&gt;fw_reset_state)</div><div class='add'>+		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-		if (fw_msg-&gt;resp_max_len &lt; len)</div><div class='del'>-			len = fw_msg-&gt;resp_max_len;</div><div class='add'>+	rc = hwrm_req_init(bp, req, 0 /* don't care */);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-		memcpy(fw_msg-&gt;resp, resp, len);</div><div class='del'>-	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='add'>+	rc = hwrm_req_replace(bp, req, fw_msg-&gt;msg, fw_msg-&gt;msg_len);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto drop_req;</div><div class='ctx'> </div><div class='del'>-static void bnxt_ulp_get(struct bnxt_ulp *ulp)</div><div class='del'>-{</div><div class='del'>-	atomic_inc(&amp;ulp-&gt;ref_count);</div><div class='del'>-}</div><div class='add'>+	hwrm_req_timeout(bp, req, fw_msg-&gt;timeout);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='add'>+	resp_len = le16_to_cpu(resp-&gt;resp_len);</div><div class='add'>+	if (resp_len) {</div><div class='add'>+		if (fw_msg-&gt;resp_max_len &lt; resp_len)</div><div class='add'>+			resp_len = fw_msg-&gt;resp_max_len;</div><div class='ctx'> </div><div class='del'>-static void bnxt_ulp_put(struct bnxt_ulp *ulp)</div><div class='del'>-{</div><div class='del'>-	atomic_dec(&amp;ulp-&gt;ref_count);</div><div class='add'>+		memcpy(fw_msg-&gt;resp, resp, resp_len);</div><div class='add'>+	}</div><div class='add'>+drop_req:</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL(bnxt_send_msg);</div><div class='ctx'> </div><div class='ctx'> void bnxt_ulp_stop(struct bnxt *bp)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_aux_priv *aux_priv = bp-&gt;aux_priv;</div><div class='ctx'> 	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='del'>-	struct bnxt_ulp_ops *ops;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (!edev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_MAX_ULP; i++) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[i];</div><div class='add'>+	mutex_lock(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+	if (!bnxt_ulp_registered(edev) ||</div><div class='add'>+	    (edev-&gt;flags &amp; BNXT_EN_FLAG_ULP_STOPPED))</div><div class='add'>+		goto ulp_stop_exit;</div><div class='ctx'> </div><div class='del'>-		ops = rtnl_dereference(ulp-&gt;ulp_ops);</div><div class='del'>-		if (!ops || !ops-&gt;ulp_stop)</div><div class='del'>-			continue;</div><div class='del'>-		ops-&gt;ulp_stop(ulp-&gt;handle);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+	edev-&gt;flags |= BNXT_EN_FLAG_ULP_STOPPED;</div><div class='add'>+	if (aux_priv) {</div><div class='add'>+		struct auxiliary_device *adev;</div><div class='ctx'> </div><div class='del'>-void bnxt_ulp_start(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='del'>-	struct bnxt_ulp_ops *ops;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!edev)</div><div class='del'>-		return;</div><div class='add'>+		adev = &amp;aux_priv-&gt;aux_dev;</div><div class='add'>+		if (adev-&gt;dev.driver) {</div><div class='add'>+			const struct auxiliary_driver *adrv;</div><div class='add'>+			pm_message_t pm = {};</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_MAX_ULP; i++) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[i];</div><div class='del'>-</div><div class='del'>-		ops = rtnl_dereference(ulp-&gt;ulp_ops);</div><div class='del'>-		if (!ops || !ops-&gt;ulp_start)</div><div class='del'>-			continue;</div><div class='del'>-		ops-&gt;ulp_start(ulp-&gt;handle);</div><div class='add'>+			adrv = to_auxiliary_drv(adev-&gt;dev.driver);</div><div class='add'>+			edev-&gt;en_state = bp-&gt;state;</div><div class='add'>+			adrv-&gt;suspend(adev, pm);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+ulp_stop_exit:</div><div class='add'>+	mutex_unlock(&amp;edev-&gt;en_dev_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs)</div><div class='add'>+void bnxt_ulp_start(struct bnxt *bp, int err)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_aux_priv *aux_priv = bp-&gt;aux_priv;</div><div class='ctx'> 	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='del'>-	struct bnxt_ulp_ops *ops;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='del'>-	if (!edev)</div><div class='add'>+	if (!edev || err)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_MAX_ULP; i++) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[i];</div><div class='add'>+	mutex_lock(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+	if (!bnxt_ulp_registered(edev) ||</div><div class='add'>+	    !(edev-&gt;flags &amp; BNXT_EN_FLAG_ULP_STOPPED))</div><div class='add'>+		goto ulp_start_exit;</div><div class='ctx'> </div><div class='del'>-		rcu_read_lock();</div><div class='del'>-		ops = rcu_dereference(ulp-&gt;ulp_ops);</div><div class='del'>-		if (!ops || !ops-&gt;ulp_sriov_config) {</div><div class='del'>-			rcu_read_unlock();</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		bnxt_ulp_get(ulp);</div><div class='del'>-		rcu_read_unlock();</div><div class='del'>-		ops-&gt;ulp_sriov_config(ulp-&gt;handle, num_vfs);</div><div class='del'>-		bnxt_ulp_put(ulp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void bnxt_ulp_shutdown(struct bnxt *bp)</div><div class='del'>-{</div><div class='del'>-	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='del'>-	struct bnxt_ulp_ops *ops;</div><div class='del'>-	int i;</div><div class='add'>+	if (edev-&gt;ulp_tbl-&gt;msix_requested)</div><div class='add'>+		bnxt_fill_msix_vecs(bp, edev-&gt;msix_entries);</div><div class='ctx'> </div><div class='del'>-	if (!edev)</div><div class='del'>-		return;</div><div class='add'>+	if (aux_priv) {</div><div class='add'>+		struct auxiliary_device *adev;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; BNXT_MAX_ULP; i++) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[i];</div><div class='add'>+		adev = &amp;aux_priv-&gt;aux_dev;</div><div class='add'>+		if (adev-&gt;dev.driver) {</div><div class='add'>+			const struct auxiliary_driver *adrv;</div><div class='ctx'> </div><div class='del'>-		ops = rtnl_dereference(ulp-&gt;ulp_ops);</div><div class='del'>-		if (!ops || !ops-&gt;ulp_shutdown)</div><div class='del'>-			continue;</div><div class='del'>-		ops-&gt;ulp_shutdown(ulp-&gt;handle);</div><div class='add'>+			adrv = to_auxiliary_drv(adev-&gt;dev.driver);</div><div class='add'>+			edev-&gt;en_state = bp-&gt;state;</div><div class='add'>+			adrv-&gt;resume(adev);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='add'>+ulp_start_exit:</div><div class='add'>+	edev-&gt;flags &amp;= ~BNXT_EN_FLAG_ULP_STOPPED;</div><div class='add'>+	mutex_unlock(&amp;edev-&gt;en_dev_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void bnxt_ulp_irq_stop(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='ctx'> 	struct bnxt_ulp_ops *ops;</div><div class='add'>+	bool reset = false;</div><div class='ctx'> </div><div class='del'>-	if (!edev || !(edev-&gt;flags &amp; BNXT_EN_FLAG_MSIX_REQUESTED))</div><div class='add'>+	if (!edev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (bnxt_ulp_registered(bp-&gt;edev, BNXT_ROCE_ULP)) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[BNXT_ROCE_ULP];</div><div class='add'>+	if (bnxt_ulp_registered(bp-&gt;edev)) {</div><div class='add'>+		struct bnxt_ulp *ulp = edev-&gt;ulp_tbl;</div><div class='ctx'> </div><div class='ctx'> 		if (!ulp-&gt;msix_requested)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		ops = rtnl_dereference(ulp-&gt;ulp_ops);</div><div class='add'>+		ops = netdev_lock_dereference(ulp-&gt;ulp_ops, bp-&gt;dev);</div><div class='ctx'> 		if (!ops || !ops-&gt;ulp_irq_stop)</div><div class='ctx'> 			return;</div><div class='del'>-		ops-&gt;ulp_irq_stop(ulp-&gt;handle);</div><div class='add'>+		if (test_bit(BNXT_STATE_FW_RESET_DET, &amp;bp-&gt;state))</div><div class='add'>+			reset = true;</div><div class='add'>+		ops-&gt;ulp_irq_stop(ulp-&gt;handle, reset);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -360,17 +318,17 @@ void bnxt_ulp_irq_restart(struct bnxt *bp, int err)</div><div class='ctx'> 	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='ctx'> 	struct bnxt_ulp_ops *ops;</div><div class='ctx'> </div><div class='del'>-	if (!edev || !(edev-&gt;flags &amp; BNXT_EN_FLAG_MSIX_REQUESTED))</div><div class='add'>+	if (!edev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (bnxt_ulp_registered(bp-&gt;edev, BNXT_ROCE_ULP)) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[BNXT_ROCE_ULP];</div><div class='add'>+	if (bnxt_ulp_registered(bp-&gt;edev)) {</div><div class='add'>+		struct bnxt_ulp *ulp = edev-&gt;ulp_tbl;</div><div class='ctx'> 		struct bnxt_msix_entry *ent = NULL;</div><div class='ctx'> </div><div class='ctx'> 		if (!ulp-&gt;msix_requested)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='del'>-		ops = rtnl_dereference(ulp-&gt;ulp_ops);</div><div class='add'>+		ops = netdev_lock_dereference(ulp-&gt;ulp_ops, bp-&gt;dev);</div><div class='ctx'> 		if (!ops || !ops-&gt;ulp_irq_restart)</div><div class='ctx'> 			return;</div><div class='ctx'> </div><div class='hunk'>@@ -391,76 +349,185 @@ void bnxt_ulp_async_events(struct bnxt *bp, struct hwrm_async_event_cmpl *cmpl)</div><div class='ctx'> 	u16 event_id = le16_to_cpu(cmpl-&gt;event_id);</div><div class='ctx'> 	struct bnxt_en_dev *edev = bp-&gt;edev;</div><div class='ctx'> 	struct bnxt_ulp_ops *ops;</div><div class='del'>-	int i;</div><div class='add'>+	struct bnxt_ulp *ulp;</div><div class='ctx'> </div><div class='del'>-	if (!edev)</div><div class='add'>+	if (!bnxt_ulp_registered(edev))</div><div class='ctx'> 		return;</div><div class='add'>+	ulp = edev-&gt;ulp_tbl;</div><div class='ctx'> </div><div class='ctx'> 	rcu_read_lock();</div><div class='del'>-	for (i = 0; i &lt; BNXT_MAX_ULP; i++) {</div><div class='del'>-		struct bnxt_ulp *ulp = &amp;edev-&gt;ulp_tbl[i];</div><div class='del'>-</div><div class='del'>-		ops = rcu_dereference(ulp-&gt;ulp_ops);</div><div class='del'>-		if (!ops || !ops-&gt;ulp_async_notifier)</div><div class='del'>-			continue;</div><div class='del'>-		if (!ulp-&gt;async_events_bmap ||</div><div class='del'>-		    event_id &gt; ulp-&gt;max_async_event_id)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Read max_async_event_id first before testing the bitmap. */</div><div class='del'>-		smp_rmb();</div><div class='del'>-		if (test_bit(event_id, ulp-&gt;async_events_bmap))</div><div class='del'>-			ops-&gt;ulp_async_notifier(ulp-&gt;handle, cmpl);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	ops = rcu_dereference(ulp-&gt;ulp_ops);</div><div class='add'>+	if (!ops || !ops-&gt;ulp_async_notifier)</div><div class='add'>+		goto exit_unlock_rcu;</div><div class='add'>+	if (!ulp-&gt;async_events_bmap || event_id &gt; ulp-&gt;max_async_event_id)</div><div class='add'>+		goto exit_unlock_rcu;</div><div class='add'>+</div><div class='add'>+	/* Read max_async_event_id first before testing the bitmap. */</div><div class='add'>+	smp_rmb();</div><div class='add'>+</div><div class='add'>+	if (test_bit(event_id, ulp-&gt;async_events_bmap))</div><div class='add'>+		ops-&gt;ulp_async_notifier(ulp-&gt;handle, cmpl);</div><div class='add'>+exit_unlock_rcu:</div><div class='ctx'> 	rcu_read_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_register_async_events(struct bnxt_en_dev *edev, int ulp_id,</div><div class='del'>-				      unsigned long *events_bmap, u16 max_id)</div><div class='add'>+void bnxt_register_async_events(struct bnxt_en_dev *edev,</div><div class='add'>+				unsigned long *events_bmap, u16 max_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = edev-&gt;net;</div><div class='ctx'> 	struct bnxt *bp = netdev_priv(dev);</div><div class='ctx'> 	struct bnxt_ulp *ulp;</div><div class='ctx'> </div><div class='del'>-	if (ulp_id &gt;= BNXT_MAX_ULP)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	ulp = &amp;edev-&gt;ulp_tbl[ulp_id];</div><div class='add'>+	ulp = edev-&gt;ulp_tbl;</div><div class='ctx'> 	ulp-&gt;async_events_bmap = events_bmap;</div><div class='ctx'> 	/* Make sure bnxt_ulp_async_events() sees this order */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> 	ulp-&gt;max_async_event_id = max_id;</div><div class='del'>-	bnxt_hwrm_func_rgtr_async_events(bp, events_bmap, max_id + 1);</div><div class='del'>-	return 0;</div><div class='add'>+	bnxt_hwrm_func_drv_rgtr(bp, events_bmap, max_id + 1, true);</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(bnxt_register_async_events);</div><div class='add'>+</div><div class='add'>+void bnxt_rdma_aux_device_uninit(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_aux_priv *aux_priv;</div><div class='add'>+	struct auxiliary_device *adev;</div><div class='add'>+</div><div class='add'>+	/* Skip if no auxiliary device init was done. */</div><div class='add'>+	if (!bp-&gt;aux_priv)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aux_priv = bp-&gt;aux_priv;</div><div class='add'>+	adev = &amp;aux_priv-&gt;aux_dev;</div><div class='add'>+	auxiliary_device_uninit(adev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct bnxt_en_ops bnxt_en_ops_tbl = {</div><div class='del'>-	.bnxt_register_device	= bnxt_register_dev,</div><div class='del'>-	.bnxt_unregister_device	= bnxt_unregister_dev,</div><div class='del'>-	.bnxt_request_msix	= bnxt_req_msix_vecs,</div><div class='del'>-	.bnxt_free_msix		= bnxt_free_msix_vecs,</div><div class='del'>-	.bnxt_send_fw_msg	= bnxt_send_msg,</div><div class='del'>-	.bnxt_register_fw_async_events	= bnxt_register_async_events,</div><div class='del'>-};</div><div class='add'>+static void bnxt_aux_dev_release(struct device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_aux_priv *aux_priv =</div><div class='add'>+		container_of(dev, struct bnxt_aux_priv, aux_dev.dev);</div><div class='add'>+	struct bnxt *bp = netdev_priv(aux_priv-&gt;edev-&gt;net);</div><div class='add'>+</div><div class='add'>+	ida_free(&amp;bnxt_aux_dev_ids, aux_priv-&gt;id);</div><div class='add'>+	kfree(aux_priv-&gt;edev-&gt;ulp_tbl);</div><div class='add'>+	bp-&gt;edev = NULL;</div><div class='add'>+	kfree(aux_priv-&gt;edev);</div><div class='add'>+	kfree(aux_priv);</div><div class='add'>+	bp-&gt;aux_priv = NULL;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-struct bnxt_en_dev *bnxt_ulp_probe(struct net_device *dev)</div><div class='add'>+void bnxt_rdma_aux_device_del(struct bnxt *bp)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	if (!bp-&gt;edev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	auxiliary_device_delete(&amp;bp-&gt;aux_priv-&gt;aux_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	edev-&gt;net = bp-&gt;dev;</div><div class='add'>+	edev-&gt;pdev = bp-&gt;pdev;</div><div class='add'>+	edev-&gt;l2_db_size = bp-&gt;db_size;</div><div class='add'>+	edev-&gt;l2_db_size_nc = bp-&gt;db_size;</div><div class='add'>+	edev-&gt;l2_db_offset = bp-&gt;db_offset;</div><div class='add'>+	mutex_init(&amp;edev-&gt;en_dev_lock);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_ROCEV1_CAP)</div><div class='add'>+		edev-&gt;flags |= BNXT_EN_FLAG_ROCEV1_CAP;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_ROCEV2_CAP)</div><div class='add'>+		edev-&gt;flags |= BNXT_EN_FLAG_ROCEV2_CAP;</div><div class='add'>+	if (bp-&gt;flags &amp; BNXT_FLAG_VF)</div><div class='add'>+		edev-&gt;flags |= BNXT_EN_FLAG_VF;</div><div class='add'>+	if (BNXT_ROCE_VF_RESC_CAP(bp))</div><div class='add'>+		edev-&gt;flags |= BNXT_EN_FLAG_ROCE_VF_RES_MGMT;</div><div class='add'>+	if (BNXT_SW_RES_LMT(bp))</div><div class='add'>+		edev-&gt;flags |= BNXT_EN_FLAG_SW_RES_LMT;</div><div class='add'>+</div><div class='add'>+	edev-&gt;chip_num = bp-&gt;chip_num;</div><div class='add'>+	edev-&gt;hw_ring_stats_size = bp-&gt;hw_ring_stats_size;</div><div class='add'>+	edev-&gt;pf_port_id = bp-&gt;pf.port_id;</div><div class='add'>+	edev-&gt;en_state = bp-&gt;state;</div><div class='add'>+	edev-&gt;bar0 = bp-&gt;bar0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_rdma_aux_device_add(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct auxiliary_device *aux_dev;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;edev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aux_dev = &amp;bp-&gt;aux_priv-&gt;aux_dev;</div><div class='add'>+	rc = auxiliary_device_add(aux_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		netdev_warn(bp-&gt;dev, "Failed to add auxiliary device for ROCE\n");</div><div class='add'>+		auxiliary_device_uninit(aux_dev);</div><div class='add'>+		bp-&gt;flags &amp;= ~BNXT_FLAG_ROCE_CAP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_rdma_aux_device_init(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	struct auxiliary_device *aux_dev;</div><div class='add'>+	struct bnxt_aux_priv *aux_priv;</div><div class='ctx'> 	struct bnxt_en_dev *edev;</div><div class='add'>+	struct bnxt_ulp *ulp;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_ROCE_CAP))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	aux_priv = kzalloc(sizeof(*bp-&gt;aux_priv), GFP_KERNEL);</div><div class='add'>+	if (!aux_priv)</div><div class='add'>+		goto exit;</div><div class='add'>+</div><div class='add'>+	aux_priv-&gt;id = ida_alloc(&amp;bnxt_aux_dev_ids, GFP_KERNEL);</div><div class='add'>+	if (aux_priv-&gt;id &lt; 0) {</div><div class='add'>+		netdev_warn(bp-&gt;dev,</div><div class='add'>+			    "ida alloc failed for ROCE auxiliary device\n");</div><div class='add'>+		kfree(aux_priv);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	aux_dev = &amp;aux_priv-&gt;aux_dev;</div><div class='add'>+	aux_dev-&gt;id = aux_priv-&gt;id;</div><div class='add'>+	aux_dev-&gt;name = "rdma";</div><div class='add'>+	aux_dev-&gt;dev.parent = &amp;bp-&gt;pdev-&gt;dev;</div><div class='add'>+	aux_dev-&gt;dev.release = bnxt_aux_dev_release;</div><div class='ctx'> </div><div class='del'>-	edev = bp-&gt;edev;</div><div class='del'>-	if (!edev) {</div><div class='del'>-		edev = kzalloc(sizeof(*edev), GFP_KERNEL);</div><div class='del'>-		if (!edev)</div><div class='del'>-			return ERR_PTR(-ENOMEM);</div><div class='del'>-		edev-&gt;en_ops = &amp;bnxt_en_ops_tbl;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_ROCEV1_CAP)</div><div class='del'>-			edev-&gt;flags |= BNXT_EN_FLAG_ROCEV1_CAP;</div><div class='del'>-		if (bp-&gt;flags &amp; BNXT_FLAG_ROCEV2_CAP)</div><div class='del'>-			edev-&gt;flags |= BNXT_EN_FLAG_ROCEV2_CAP;</div><div class='del'>-		edev-&gt;net = dev;</div><div class='del'>-		edev-&gt;pdev = bp-&gt;pdev;</div><div class='del'>-		bp-&gt;edev = edev;</div><div class='add'>+	rc = auxiliary_device_init(aux_dev);</div><div class='add'>+	if (rc) {</div><div class='add'>+		ida_free(&amp;bnxt_aux_dev_ids, aux_priv-&gt;id);</div><div class='add'>+		kfree(aux_priv);</div><div class='add'>+		goto exit;</div><div class='ctx'> 	}</div><div class='del'>-	return bp-&gt;edev;</div><div class='add'>+	bp-&gt;aux_priv = aux_priv;</div><div class='add'>+</div><div class='add'>+	/* From this point, all cleanup will happen via the .release callback &amp;</div><div class='add'>+	 * any error unwinding will need to include a call to</div><div class='add'>+	 * auxiliary_device_uninit.</div><div class='add'>+	 */</div><div class='add'>+	edev = kzalloc(sizeof(*edev), GFP_KERNEL);</div><div class='add'>+	if (!edev)</div><div class='add'>+		goto aux_dev_uninit;</div><div class='add'>+</div><div class='add'>+	aux_priv-&gt;edev = edev;</div><div class='add'>+</div><div class='add'>+	ulp = kzalloc(sizeof(*ulp), GFP_KERNEL);</div><div class='add'>+	if (!ulp)</div><div class='add'>+		goto aux_dev_uninit;</div><div class='add'>+</div><div class='add'>+	edev-&gt;ulp_tbl = ulp;</div><div class='add'>+	bp-&gt;edev = edev;</div><div class='add'>+	bnxt_set_edev_info(edev, bp);</div><div class='add'>+	bp-&gt;ulp_num_msix_want = bnxt_set_dflt_ulp_msix(bp);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+aux_dev_uninit:</div><div class='add'>+	auxiliary_device_uninit(aux_dev);</div><div class='add'>+exit:</div><div class='add'>+	bp-&gt;flags &amp;= ~BNXT_FLAG_ROCE_CAP;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h<br/>index cd78453d0bf0..3c5b8a53f715 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h</a></div><div class='hunk'>@@ -10,13 +10,13 @@</div><div class='ctx'> #ifndef BNXT_ULP_H</div><div class='ctx'> #define BNXT_ULP_H</div><div class='ctx'> </div><div class='del'>-#define BNXT_ROCE_ULP	0</div><div class='del'>-#define BNXT_OTHER_ULP	1</div><div class='del'>-#define BNXT_MAX_ULP	2</div><div class='del'>-</div><div class='ctx'> #define BNXT_MIN_ROCE_CP_RINGS	2</div><div class='ctx'> #define BNXT_MIN_ROCE_STAT_CTXS	1</div><div class='ctx'> </div><div class='add'>+#define BNXT_MAX_ROCE_MSIX_VF		2</div><div class='add'>+#define BNXT_MAX_ROCE_MSIX_NPAR_PF	5</div><div class='add'>+#define BNXT_MAX_ROCE_MSIX		64</div><div class='add'>+</div><div class='ctx'> struct hwrm_async_event_cmpl;</div><div class='ctx'> struct bnxt;</div><div class='ctx'> </div><div class='hunk'>@@ -29,11 +29,7 @@ struct bnxt_msix_entry {</div><div class='ctx'> struct bnxt_ulp_ops {</div><div class='ctx'> 	/* async_notifier() cannot sleep (in BH context) */</div><div class='ctx'> 	void (*ulp_async_notifier)(void *, struct hwrm_async_event_cmpl *);</div><div class='del'>-	void (*ulp_stop)(void *);</div><div class='del'>-	void (*ulp_start)(void *);</div><div class='del'>-	void (*ulp_sriov_config)(void *, int);</div><div class='del'>-	void (*ulp_shutdown)(void *);</div><div class='del'>-	void (*ulp_irq_stop)(void *);</div><div class='add'>+	void (*ulp_irq_stop)(void *, bool);</div><div class='ctx'> 	void (*ulp_irq_restart)(void *, struct bnxt_msix_entry *);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -51,53 +47,82 @@ struct bnxt_ulp {</div><div class='ctx'> 	unsigned long	*async_events_bmap;</div><div class='ctx'> 	u16		max_async_event_id;</div><div class='ctx'> 	u16		msix_requested;</div><div class='del'>-	u16		msix_base;</div><div class='del'>-	atomic_t	ref_count;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bnxt_en_dev {</div><div class='ctx'> 	struct net_device *net;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='add'>+	struct bnxt_msix_entry			msix_entries[BNXT_MAX_ROCE_MSIX];</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	#define BNXT_EN_FLAG_ROCEV1_CAP		0x1</div><div class='ctx'> 	#define BNXT_EN_FLAG_ROCEV2_CAP		0x2</div><div class='ctx'> 	#define BNXT_EN_FLAG_ROCE_CAP		(BNXT_EN_FLAG_ROCEV1_CAP | \</div><div class='ctx'> 						 BNXT_EN_FLAG_ROCEV2_CAP)</div><div class='del'>-	#define BNXT_EN_FLAG_MSIX_REQUESTED	0x4</div><div class='del'>-	const struct bnxt_en_ops	*en_ops;</div><div class='del'>-	struct bnxt_ulp			ulp_tbl[BNXT_MAX_ULP];</div><div class='del'>-};</div><div class='add'>+	#define BNXT_EN_FLAG_ULP_STOPPED	0x8</div><div class='add'>+	#define BNXT_EN_FLAG_VF			0x10</div><div class='add'>+#define BNXT_EN_VF(edev)	((edev)-&gt;flags &amp; BNXT_EN_FLAG_VF)</div><div class='add'>+	#define BNXT_EN_FLAG_ROCE_VF_RES_MGMT	0x20</div><div class='add'>+	#define BNXT_EN_FLAG_SW_RES_LMT		0x40</div><div class='add'>+#define BNXT_EN_SW_RES_LMT(edev) ((edev)-&gt;flags &amp; BNXT_EN_FLAG_SW_RES_LMT)</div><div class='ctx'> </div><div class='del'>-struct bnxt_en_ops {</div><div class='del'>-	int (*bnxt_register_device)(struct bnxt_en_dev *, int,</div><div class='del'>-				    struct bnxt_ulp_ops *, void *);</div><div class='del'>-	int (*bnxt_unregister_device)(struct bnxt_en_dev *, int);</div><div class='del'>-	int (*bnxt_request_msix)(struct bnxt_en_dev *, int,</div><div class='del'>-				 struct bnxt_msix_entry *, int);</div><div class='del'>-	int (*bnxt_free_msix)(struct bnxt_en_dev *, int);</div><div class='del'>-	int (*bnxt_send_fw_msg)(struct bnxt_en_dev *, int,</div><div class='del'>-				struct bnxt_fw_msg *);</div><div class='del'>-	int (*bnxt_register_fw_async_events)(struct bnxt_en_dev *, int,</div><div class='del'>-					     unsigned long *, u16);</div><div class='add'>+	struct bnxt_ulp			*ulp_tbl;</div><div class='add'>+	int				l2_db_size;	/* Doorbell BAR size in</div><div class='add'>+							 * bytes mapped by L2</div><div class='add'>+							 * driver.</div><div class='add'>+							 */</div><div class='add'>+	int				l2_db_size_nc;	/* Doorbell BAR size in</div><div class='add'>+							 * bytes mapped as non-</div><div class='add'>+							 * cacheable.</div><div class='add'>+							 */</div><div class='add'>+	int				l2_db_offset;	/* Doorbell offset in</div><div class='add'>+							 * bytes within</div><div class='add'>+							 * l2_db_size_nc.</div><div class='add'>+							 */</div><div class='add'>+	u16				chip_num;</div><div class='add'>+	u16				hw_ring_stats_size;</div><div class='add'>+	u16				pf_port_id;</div><div class='add'>+	unsigned long			en_state;	/* Could be checked in</div><div class='add'>+							 * RoCE driver suspend</div><div class='add'>+							 * mode only. Will be</div><div class='add'>+							 * updated in resume.</div><div class='add'>+							 */</div><div class='add'>+	void __iomem                    *bar0;</div><div class='add'>+</div><div class='add'>+	u16				ulp_num_msix_vec;</div><div class='add'>+	u16				ulp_num_ctxs;</div><div class='add'>+</div><div class='add'>+					/* serialize ulp operations */</div><div class='add'>+	struct mutex			en_dev_lock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline bool bnxt_ulp_registered(struct bnxt_en_dev *edev, int ulp_id)</div><div class='add'>+static inline bool bnxt_ulp_registered(struct bnxt_en_dev *edev)</div><div class='ctx'> {</div><div class='del'>-	if (edev &amp;&amp; rcu_access_pointer(edev-&gt;ulp_tbl[ulp_id].ulp_ops))</div><div class='add'>+	if (edev &amp;&amp; rcu_access_pointer(edev-&gt;ulp_tbl-&gt;ulp_ops))</div><div class='ctx'> 		return true;</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bnxt_get_ulp_msix_num(struct bnxt *bp);</div><div class='del'>-int bnxt_get_ulp_msix_base(struct bnxt *bp);</div><div class='add'>+int bnxt_get_ulp_msix_num_in_use(struct bnxt *bp);</div><div class='add'>+void bnxt_set_ulp_msix_num(struct bnxt *bp, int num);</div><div class='ctx'> int bnxt_get_ulp_stat_ctxs(struct bnxt *bp);</div><div class='add'>+void bnxt_set_ulp_stat_ctxs(struct bnxt *bp, int num_ctxs);</div><div class='add'>+int bnxt_get_ulp_stat_ctxs_in_use(struct bnxt *bp);</div><div class='add'>+void bnxt_set_dflt_ulp_stat_ctxs(struct bnxt *bp);</div><div class='ctx'> void bnxt_ulp_stop(struct bnxt *bp);</div><div class='del'>-void bnxt_ulp_start(struct bnxt *bp);</div><div class='add'>+void bnxt_ulp_start(struct bnxt *bp, int err);</div><div class='ctx'> void bnxt_ulp_sriov_cfg(struct bnxt *bp, int num_vfs);</div><div class='del'>-void bnxt_ulp_shutdown(struct bnxt *bp);</div><div class='ctx'> void bnxt_ulp_irq_stop(struct bnxt *bp);</div><div class='ctx'> void bnxt_ulp_irq_restart(struct bnxt *bp, int err);</div><div class='ctx'> void bnxt_ulp_async_events(struct bnxt *bp, struct hwrm_async_event_cmpl *cmpl);</div><div class='del'>-struct bnxt_en_dev *bnxt_ulp_probe(struct net_device *dev);</div><div class='del'>-</div><div class='add'>+void bnxt_rdma_aux_device_uninit(struct bnxt *bp);</div><div class='add'>+void bnxt_rdma_aux_device_del(struct bnxt *bp);</div><div class='add'>+void bnxt_rdma_aux_device_add(struct bnxt *bp);</div><div class='add'>+void bnxt_rdma_aux_device_init(struct bnxt *bp);</div><div class='add'>+int bnxt_register_dev(struct bnxt_en_dev *edev, struct bnxt_ulp_ops *ulp_ops,</div><div class='add'>+		      void *handle);</div><div class='add'>+void bnxt_unregister_dev(struct bnxt_en_dev *edev);</div><div class='add'>+int bnxt_send_msg(struct bnxt_en_dev *edev, struct bnxt_fw_msg *fw_msg);</div><div class='add'>+void bnxt_register_async_events(struct bnxt_en_dev *edev,</div><div class='add'>+				unsigned long *events_bmap, u16 max_id);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c<br/>index f760921389a3..bd116fd578d8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c</a></div><div class='hunk'>@@ -12,9 +12,10 @@</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/jhash.h&gt;</div><div class='ctx'> #include &lt;net/pkt_cls.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> </div><div class='del'>-#include "bnxt_hsi.h"</div><div class='ctx'> #include "bnxt.h"</div><div class='add'>+#include "bnxt_hwrm.h"</div><div class='ctx'> #include "bnxt_vfr.h"</div><div class='ctx'> #include "bnxt_devlink.h"</div><div class='ctx'> #include "bnxt_tc.h"</div><div class='hunk'>@@ -27,57 +28,60 @@</div><div class='ctx'> static int hwrm_cfa_vfr_alloc(struct bnxt *bp, u16 vf_idx,</div><div class='ctx'> 			      u16 *tx_cfa_action, u16 *rx_cfa_code)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_vfr_alloc_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_cfa_vfr_alloc_input req = { 0 };</div><div class='add'>+	struct hwrm_cfa_vfr_alloc_output *resp;</div><div class='add'>+	struct hwrm_cfa_vfr_alloc_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_VFR_ALLOC, -1, -1);</div><div class='del'>-	req.vf_id = cpu_to_le16(vf_idx);</div><div class='del'>-	sprintf(req.vfr_name, "vfr%d", vf_idx);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_VFR_ALLOC);</div><div class='ctx'> 	if (!rc) {</div><div class='del'>-		*tx_cfa_action = le16_to_cpu(resp-&gt;tx_cfa_action);</div><div class='del'>-		*rx_cfa_code = le16_to_cpu(resp-&gt;rx_cfa_code);</div><div class='del'>-		netdev_dbg(bp-&gt;dev, "tx_cfa_action=0x%x, rx_cfa_code=0x%x",</div><div class='del'>-			   *tx_cfa_action, *rx_cfa_code);</div><div class='del'>-	} else {</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s error rc=%d", __func__, rc);</div><div class='add'>+		req-&gt;vf_id = cpu_to_le16(vf_idx);</div><div class='add'>+		sprintf(req-&gt;vfr_name, "vfr%d", vf_idx);</div><div class='add'>+</div><div class='add'>+		resp = hwrm_req_hold(bp, req);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+		if (!rc) {</div><div class='add'>+			*tx_cfa_action = le16_to_cpu(resp-&gt;tx_cfa_action);</div><div class='add'>+			*rx_cfa_code = le16_to_cpu(resp-&gt;rx_cfa_code);</div><div class='add'>+			netdev_dbg(bp-&gt;dev, "tx_cfa_action=0x%x, rx_cfa_code=0x%x",</div><div class='add'>+				   *tx_cfa_action, *rx_cfa_code);</div><div class='add'>+		}</div><div class='add'>+		hwrm_req_drop(bp, req);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	if (rc)</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s error rc=%d\n", __func__, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int hwrm_cfa_vfr_free(struct bnxt *bp, u16 vf_idx)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_cfa_vfr_free_input req = { 0 };</div><div class='add'>+	struct hwrm_cfa_vfr_free_input *req;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_CFA_VFR_FREE, -1, -1);</div><div class='del'>-	sprintf(req.vfr_name, "vfr%d", vf_idx);</div><div class='del'>-</div><div class='del'>-	rc = hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_CFA_VFR_FREE);</div><div class='add'>+	if (!rc) {</div><div class='add'>+		sprintf(req-&gt;vfr_name, "vfr%d", vf_idx);</div><div class='add'>+		rc = hwrm_req_send(bp, req);</div><div class='add'>+	}</div><div class='ctx'> 	if (rc)</div><div class='del'>-		netdev_info(bp-&gt;dev, "%s error rc=%d", __func__, rc);</div><div class='add'>+		netdev_info(bp-&gt;dev, "%s error rc=%d\n", __func__, rc);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_hwrm_vfr_qcfg(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,</div><div class='ctx'> 			      u16 *max_mtu)</div><div class='ctx'> {</div><div class='del'>-	struct hwrm_func_qcfg_output *resp = bp-&gt;hwrm_cmd_resp_addr;</div><div class='del'>-	struct hwrm_func_qcfg_input req = {0};</div><div class='add'>+	struct hwrm_func_qcfg_output *resp;</div><div class='add'>+	struct hwrm_func_qcfg_input *req;</div><div class='ctx'> 	u16 mtu;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	bnxt_hwrm_cmd_hdr_init(bp, &amp;req, HWRM_FUNC_QCFG, -1, -1);</div><div class='del'>-	req.fid = cpu_to_le16(bp-&gt;pf.vf[vf_rep-&gt;vf_idx].fw_fid);</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	rc = hwrm_req_init(bp, req, HWRM_FUNC_QCFG);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='del'>-	rc = _hwrm_send_message(bp, &amp;req, sizeof(req), HWRM_CMD_TIMEOUT);</div><div class='add'>+	req-&gt;fid = cpu_to_le16(bp-&gt;pf.vf[vf_rep-&gt;vf_idx].fw_fid);</div><div class='add'>+	resp = hwrm_req_hold(bp, req);</div><div class='add'>+	rc = hwrm_req_send(bp, req);</div><div class='ctx'> 	if (!rc) {</div><div class='ctx'> 		mtu = le16_to_cpu(resp-&gt;max_mtu_configured);</div><div class='ctx'> 		if (!mtu)</div><div class='hunk'>@@ -85,7 +89,7 @@ static int bnxt_hwrm_vfr_qcfg(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,</div><div class='ctx'> 		else</div><div class='ctx'> 			*max_mtu = mtu;</div><div class='ctx'> 	}</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;hwrm_cmd_lock);</div><div class='add'>+	hwrm_req_drop(bp, req);</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -161,34 +165,19 @@ static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_vf_rep_setup_tc_block(struct net_device *dev,</div><div class='del'>-				      struct tc_block_offload *f)</div><div class='del'>-{</div><div class='del'>-	struct bnxt_vf_rep *vf_rep = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (f-&gt;command) {</div><div class='del'>-	case TC_BLOCK_BIND:</div><div class='del'>-		return tcf_block_cb_register(f-&gt;block,</div><div class='del'>-					     bnxt_vf_rep_setup_tc_block_cb,</div><div class='del'>-					     vf_rep, vf_rep, f-&gt;extack);</div><div class='del'>-	case TC_BLOCK_UNBIND:</div><div class='del'>-		tcf_block_cb_unregister(f-&gt;block,</div><div class='del'>-					bnxt_vf_rep_setup_tc_block_cb, vf_rep);</div><div class='del'>-		return 0;</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='add'>+static LIST_HEAD(bnxt_vf_block_cb_list);</div><div class='ctx'> </div><div class='ctx'> static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='ctx'> 				void *type_data)</div><div class='ctx'> {</div><div class='add'>+	struct bnxt_vf_rep *vf_rep = netdev_priv(dev);</div><div class='add'>+</div><div class='ctx'> 	switch (type) {</div><div class='ctx'> 	case TC_SETUP_BLOCK:</div><div class='del'>-		return bnxt_vf_rep_setup_tc_block(dev, type_data);</div><div class='add'>+		return flow_block_cb_setup_simple(type_data,</div><div class='add'>+						  &amp;bnxt_vf_block_cb_list,</div><div class='add'>+						  bnxt_vf_rep_setup_tc_block_cb,</div><div class='add'>+						  vf_rep, vf_rep, true);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -233,8 +222,7 @@ static int bnxt_vf_rep_get_phys_port_name(struct net_device *dev, char *buf,</div><div class='ctx'> static void bnxt_vf_rep_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bnxt_vf_rep_get_port_parent_id(struct net_device *dev,</div><div class='hunk'>@@ -269,8 +257,7 @@ bool bnxt_dev_is_vf_rep(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> /* Called when the parent PF interface is closed:</div><div class='ctx'>  * As the mode transition from SWITCHDEV to LEGACY</div><div class='del'>- * happens under the rtnl_lock() this routine is safe</div><div class='del'>- * under the rtnl_lock()</div><div class='add'>+ * happens under the netdev instance lock this routine is safe</div><div class='ctx'>  */</div><div class='ctx'> void bnxt_vf_reps_close(struct bnxt *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -290,8 +277,7 @@ void bnxt_vf_reps_close(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> /* Called when the parent PF interface is opened (re-opened):</div><div class='ctx'>  * As the mode transition from SWITCHDEV to LEGACY</div><div class='del'>- * happen under the rtnl_lock() this routine is safe</div><div class='del'>- * under the rtnl_lock()</div><div class='add'>+ * happen under the netdev instance lock this routine is safe</div><div class='ctx'>  */</div><div class='ctx'> void bnxt_vf_reps_open(struct bnxt *bp)</div><div class='ctx'> {</div><div class='hunk'>@@ -300,8 +286,26 @@ void bnxt_vf_reps_open(struct bnxt *bp)</div><div class='ctx'> 	if (bp-&gt;eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; pci_num_vf(bp-&gt;pdev); i++)</div><div class='del'>-		bnxt_vf_rep_open(bp-&gt;vf_reps[i]-&gt;dev);</div><div class='add'>+	for (i = 0; i &lt; pci_num_vf(bp-&gt;pdev); i++) {</div><div class='add'>+		/* Open the VF-Rep only if it is allocated in the FW */</div><div class='add'>+		if (bp-&gt;vf_reps[i]-&gt;tx_cfa_action != CFA_HANDLE_INVALID)</div><div class='add'>+			bnxt_vf_rep_open(bp-&gt;vf_reps[i]-&gt;dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bnxt_free_one_vf_rep(struct bnxt *bp, struct bnxt_vf_rep *vf_rep)</div><div class='add'>+{</div><div class='add'>+	if (!vf_rep)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (vf_rep-&gt;dst) {</div><div class='add'>+		dst_release((struct dst_entry *)vf_rep-&gt;dst);</div><div class='add'>+		vf_rep-&gt;dst = NULL;</div><div class='add'>+	}</div><div class='add'>+	if (vf_rep-&gt;tx_cfa_action != CFA_HANDLE_INVALID) {</div><div class='add'>+		hwrm_cfa_vfr_free(bp, vf_rep-&gt;vf_idx);</div><div class='add'>+		vf_rep-&gt;tx_cfa_action = CFA_HANDLE_INVALID;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __bnxt_vf_reps_destroy(struct bnxt *bp)</div><div class='hunk'>@@ -313,11 +317,7 @@ static void __bnxt_vf_reps_destroy(struct bnxt *bp)</div><div class='ctx'> 	for (i = 0; i &lt; num_vfs; i++) {</div><div class='ctx'> 		vf_rep = bp-&gt;vf_reps[i];</div><div class='ctx'> 		if (vf_rep) {</div><div class='del'>-			dst_release((struct dst_entry *)vf_rep-&gt;dst);</div><div class='del'>-</div><div class='del'>-			if (vf_rep-&gt;tx_cfa_action != CFA_HANDLE_INVALID)</div><div class='del'>-				hwrm_cfa_vfr_free(bp, vf_rep-&gt;vf_idx);</div><div class='del'>-</div><div class='add'>+			__bnxt_free_one_vf_rep(bp, vf_rep);</div><div class='ctx'> 			if (vf_rep-&gt;dev) {</div><div class='ctx'> 				/* if register_netdev failed, then netdev_ops</div><div class='ctx'> 				 * would have been set to NULL</div><div class='hunk'>@@ -346,7 +346,7 @@ void bnxt_vf_reps_destroy(struct bnxt *bp)</div><div class='ctx'> 	/* Ensure that parent PF's and VF-reps' RX/TX has been quiesced</div><div class='ctx'> 	 * before proceeding with VF-rep cleanup.</div><div class='ctx'> 	 */</div><div class='del'>-	rtnl_lock();</div><div class='add'>+	netdev_lock(bp-&gt;dev);</div><div class='ctx'> 	if (netif_running(bp-&gt;dev)) {</div><div class='ctx'> 		bnxt_close_nic(bp, false, false);</div><div class='ctx'> 		closed = true;</div><div class='hunk'>@@ -354,18 +354,97 @@ void bnxt_vf_reps_destroy(struct bnxt *bp)</div><div class='ctx'> 	/* un-publish cfa_code_map so that RX path can't see it anymore */</div><div class='ctx'> 	kfree(bp-&gt;cfa_code_map);</div><div class='ctx'> 	bp-&gt;cfa_code_map = NULL;</div><div class='del'>-	bp-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;</div><div class='ctx'> </div><div class='del'>-	if (closed)</div><div class='add'>+	if (closed) {</div><div class='add'>+		/* Temporarily set legacy mode to avoid re-opening</div><div class='add'>+		 * representors and restore switchdev mode after that.</div><div class='add'>+		 */</div><div class='add'>+		bp-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;</div><div class='ctx'> 		bnxt_open_nic(bp, false, false);</div><div class='del'>-	rtnl_unlock();</div><div class='add'>+		bp-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;</div><div class='add'>+	}</div><div class='add'>+	netdev_unlock(bp-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	/* Need to call vf_reps_destroy() outside of rntl_lock</div><div class='del'>-	 * as unregister_netdev takes rtnl_lock</div><div class='add'>+	/* Need to call vf_reps_destroy() outside of netdev instance lock</div><div class='add'>+	 * as unregister_netdev takes it</div><div class='ctx'> 	 */</div><div class='ctx'> 	__bnxt_vf_reps_destroy(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Free the VF-Reps in firmware, during firmware hot-reset processing.</div><div class='add'>+ * Note that the VF-Rep netdevs are still active (not unregistered) during</div><div class='add'>+ * this process. As the mode transition from SWITCHDEV to LEGACY happens</div><div class='add'>+ * under the netdev instance lock this routine is safe.</div><div class='add'>+ */</div><div class='add'>+void bnxt_vf_reps_free(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u16 num_vfs = pci_num_vf(bp-&gt;pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_vfs; i++)</div><div class='add'>+		__bnxt_free_one_vf_rep(bp, bp-&gt;vf_reps[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bnxt_alloc_vf_rep(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,</div><div class='add'>+			     u16 *cfa_code_map)</div><div class='add'>+{</div><div class='add'>+	/* get cfa handles from FW */</div><div class='add'>+	if (hwrm_cfa_vfr_alloc(bp, vf_rep-&gt;vf_idx, &amp;vf_rep-&gt;tx_cfa_action,</div><div class='add'>+			       &amp;vf_rep-&gt;rx_cfa_code))</div><div class='add'>+		return -ENOLINK;</div><div class='add'>+</div><div class='add'>+	cfa_code_map[vf_rep-&gt;rx_cfa_code] = vf_rep-&gt;vf_idx;</div><div class='add'>+	vf_rep-&gt;dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX, GFP_KERNEL);</div><div class='add'>+	if (!vf_rep-&gt;dst)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* only cfa_action is needed to mux a packet while TXing */</div><div class='add'>+	vf_rep-&gt;dst-&gt;u.port_info.port_id = vf_rep-&gt;tx_cfa_action;</div><div class='add'>+	vf_rep-&gt;dst-&gt;u.port_info.lower_dev = bp-&gt;dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Allocate the VF-Reps in firmware, during firmware hot-reset processing.</div><div class='add'>+ * Note that the VF-Rep netdevs are still active (not unregistered) during</div><div class='add'>+ * this process. As the mode transition from SWITCHDEV to LEGACY happens</div><div class='add'>+ * under the netdev instance lock this routine is safe.</div><div class='add'>+ */</div><div class='add'>+int bnxt_vf_reps_alloc(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	u16 *cfa_code_map = bp-&gt;cfa_code_map, num_vfs = pci_num_vf(bp-&gt;pdev);</div><div class='add'>+	struct bnxt_vf_rep *vf_rep;</div><div class='add'>+	int rc, i;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!cfa_code_map)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; MAX_CFA_CODE; i++)</div><div class='add'>+		cfa_code_map[i] = VF_IDX_INVALID;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_vfs; i++) {</div><div class='add'>+		vf_rep = bp-&gt;vf_reps[i];</div><div class='add'>+		vf_rep-&gt;vf_idx = i;</div><div class='add'>+</div><div class='add'>+		rc = bnxt_alloc_vf_rep(bp, vf_rep, cfa_code_map);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	netdev_info(bp-&gt;dev, "%s error=%d\n", __func__, rc);</div><div class='add'>+	bnxt_vf_reps_free(bp);</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Use the OUI of the PF's perm addr and report the same mac addr</div><div class='ctx'>  * for the same VF-rep each time</div><div class='ctx'>  */</div><div class='hunk'>@@ -387,6 +466,7 @@ static void bnxt_vf_rep_netdev_init(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,</div><div class='ctx'> 	struct net_device *pf_dev = bp-&gt;dev;</div><div class='ctx'> 	u16 max_mtu;</div><div class='ctx'> </div><div class='add'>+	SET_NETDEV_DEV(dev, &amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;bnxt_vf_rep_netdev_ops;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;bnxt_vf_rep_ethtool_ops;</div><div class='ctx'> 	/* Just inherit all the featues of the parent PF as the VF-R</div><div class='hunk'>@@ -399,20 +479,23 @@ static void bnxt_vf_rep_netdev_init(struct bnxt *bp, struct bnxt_vf_rep *vf_rep,</div><div class='ctx'> 	dev-&gt;features |= pf_dev-&gt;features;</div><div class='ctx'> 	bnxt_vf_rep_eth_addr_gen(bp-&gt;pf.mac_addr, vf_rep-&gt;vf_idx,</div><div class='ctx'> 				 dev-&gt;perm_addr);</div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, dev-&gt;perm_addr);</div><div class='add'>+	eth_hw_addr_set(dev, dev-&gt;perm_addr);</div><div class='ctx'> 	/* Set VF-Rep's max-mtu to the corresponding VF's max-mtu */</div><div class='ctx'> 	if (!bnxt_hwrm_vfr_qcfg(bp, vf_rep, &amp;max_mtu))</div><div class='ctx'> 		dev-&gt;max_mtu = max_mtu;</div><div class='ctx'> 	dev-&gt;min_mtu = ETH_ZLEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bnxt_vf_reps_create(struct bnxt *bp)</div><div class='add'>+int bnxt_vf_reps_create(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u16 *cfa_code_map = NULL, num_vfs = pci_num_vf(bp-&gt;pdev);</div><div class='ctx'> 	struct bnxt_vf_rep *vf_rep;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	int rc, i;</div><div class='ctx'> </div><div class='add'>+	if (!(bp-&gt;flags &amp; BNXT_FLAG_DSN_VALID))</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='ctx'> 	bp-&gt;vf_reps = kcalloc(num_vfs, sizeof(vf_rep), GFP_KERNEL);</div><div class='ctx'> 	if (!bp-&gt;vf_reps)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -441,25 +524,9 @@ static int bnxt_vf_reps_create(struct bnxt *bp)</div><div class='ctx'> 		vf_rep-&gt;vf_idx = i;</div><div class='ctx'> 		vf_rep-&gt;tx_cfa_action = CFA_HANDLE_INVALID;</div><div class='ctx'> </div><div class='del'>-		/* get cfa handles from FW */</div><div class='del'>-		rc = hwrm_cfa_vfr_alloc(bp, vf_rep-&gt;vf_idx,</div><div class='del'>-					&amp;vf_rep-&gt;tx_cfa_action,</div><div class='del'>-					&amp;vf_rep-&gt;rx_cfa_code);</div><div class='del'>-		if (rc) {</div><div class='del'>-			rc = -ENOLINK;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-		cfa_code_map[vf_rep-&gt;rx_cfa_code] = vf_rep-&gt;vf_idx;</div><div class='del'>-</div><div class='del'>-		vf_rep-&gt;dst = metadata_dst_alloc(0, METADATA_HW_PORT_MUX,</div><div class='del'>-						 GFP_KERNEL);</div><div class='del'>-		if (!vf_rep-&gt;dst) {</div><div class='del'>-			rc = -ENOMEM;</div><div class='add'>+		rc = bnxt_alloc_vf_rep(bp, vf_rep, cfa_code_map);</div><div class='add'>+		if (rc)</div><div class='ctx'> 			goto err;</div><div class='del'>-		}</div><div class='del'>-		/* only cfa_action is needed to mux a packet while TXing */</div><div class='del'>-		vf_rep-&gt;dst-&gt;u.port_info.port_id = vf_rep-&gt;tx_cfa_action;</div><div class='del'>-		vf_rep-&gt;dst-&gt;u.port_info.lower_dev = bp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 		bnxt_vf_rep_netdev_init(bp, vf_rep, dev);</div><div class='ctx'> 		rc = register_netdev(dev);</div><div class='hunk'>@@ -472,12 +539,11 @@ static int bnxt_vf_reps_create(struct bnxt *bp)</div><div class='ctx'> </div><div class='ctx'> 	/* publish cfa_code_map only after all VF-reps have been initialized */</div><div class='ctx'> 	bp-&gt;cfa_code_map = cfa_code_map;</div><div class='del'>-	bp-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;</div><div class='ctx'> 	netif_keep_dst(bp-&gt;dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	netdev_info(bp-&gt;dev, "%s error=%d", __func__, rc);</div><div class='add'>+	netdev_info(bp-&gt;dev, "%s error=%d\n", __func__, rc);</div><div class='ctx'> 	kfree(cfa_code_map);</div><div class='ctx'> 	__bnxt_vf_reps_destroy(bp);</div><div class='ctx'> 	return rc;</div><div class='hunk'>@@ -496,15 +562,13 @@ int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode,</div><div class='ctx'> 			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnxt *bp = bnxt_get_bp_from_dl(devlink);</div><div class='del'>-	int rc = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;bp-&gt;sriov_lock);</div><div class='ctx'> 	if (bp-&gt;eswitch_mode == mode) {</div><div class='del'>-		netdev_info(bp-&gt;dev, "already in %s eswitch mode",</div><div class='add'>+		netdev_info(bp-&gt;dev, "already in %s eswitch mode\n",</div><div class='ctx'> 			    mode == DEVLINK_ESWITCH_MODE_LEGACY ?</div><div class='ctx'> 			    "legacy" : "switchdev");</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto done;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='hunk'>@@ -515,25 +579,22 @@ int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode,</div><div class='ctx'> 	case DEVLINK_ESWITCH_MODE_SWITCHDEV:</div><div class='ctx'> 		if (bp-&gt;hwrm_spec_code &lt; 0x10803) {</div><div class='ctx'> 			netdev_warn(bp-&gt;dev, "FW does not support SRIOV E-Switch SWITCHDEV mode\n");</div><div class='del'>-			rc = -ENOTSUPP;</div><div class='del'>-			goto done;</div><div class='add'>+			return -ENOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (pci_num_vf(bp-&gt;pdev) == 0) {</div><div class='del'>-			netdev_info(bp-&gt;dev, "Enable VFs before setting switchdev mode");</div><div class='del'>-			rc = -EPERM;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		rc = bnxt_vf_reps_create(bp);</div><div class='add'>+		/* Create representors for existing VFs */</div><div class='add'>+		if (pci_num_vf(bp-&gt;pdev) &gt; 0)</div><div class='add'>+			ret = bnxt_vf_reps_create(bp);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		rc = -EINVAL;</div><div class='del'>-		goto done;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-done:</div><div class='del'>-	mutex_unlock(&amp;bp-&gt;sriov_lock);</div><div class='del'>-	return rc;</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		bp-&gt;eswitch_mode = mode;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h<br/>index d7287651422f..33a965631d0b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h</a></div><div class='hunk'>@@ -14,11 +14,14 @@</div><div class='ctx'> </div><div class='ctx'> #define	MAX_CFA_CODE			65536</div><div class='ctx'> </div><div class='add'>+int bnxt_vf_reps_create(struct bnxt *bp);</div><div class='ctx'> void bnxt_vf_reps_destroy(struct bnxt *bp);</div><div class='ctx'> void bnxt_vf_reps_close(struct bnxt *bp);</div><div class='ctx'> void bnxt_vf_reps_open(struct bnxt *bp);</div><div class='ctx'> void bnxt_vf_rep_rx(struct bnxt *bp, struct sk_buff *skb);</div><div class='ctx'> struct net_device *bnxt_get_vf_rep(struct bnxt *bp, u16 cfa_code);</div><div class='add'>+int bnxt_vf_reps_alloc(struct bnxt *bp);</div><div class='add'>+void bnxt_vf_reps_free(struct bnxt *bp);</div><div class='ctx'> </div><div class='ctx'> static inline u16 bnxt_vf_rep_get_fid(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -35,6 +38,11 @@ int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode,</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+static inline int bnxt_vf_reps_create(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void bnxt_vf_reps_close(struct bnxt *bp)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='hunk'>@@ -61,5 +69,15 @@ static inline bool bnxt_dev_is_vf_rep(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	return false;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+static inline int bnxt_vf_reps_alloc(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void bnxt_vf_reps_free(struct bnxt *bp)</div><div class='add'>+{</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif /* CONFIG_BNXT_SRIOV */</div><div class='ctx'> #endif /* BNXT_VFR_H */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c<br/>index 0184ef6f05a7..3e77a96e5a3e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c</a></div><div class='hunk'>@@ -15,55 +15,206 @@</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/bpf_trace.h&gt;</div><div class='ctx'> #include &lt;linux/filter.h&gt;</div><div class='del'>-#include "bnxt_hsi.h"</div><div class='add'>+#include &lt;net/netdev_lock.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;linux/bnxt/hsi.h&gt;</div><div class='ctx'> #include "bnxt.h"</div><div class='ctx'> #include "bnxt_xdp.h"</div><div class='ctx'> </div><div class='del'>-void bnxt_xmit_xdp(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='del'>-		   dma_addr_t mapping, u32 len, u16 rx_prod)</div><div class='add'>+DEFINE_STATIC_KEY_FALSE(bnxt_xdp_locking_key);</div><div class='add'>+</div><div class='add'>+struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_tx_ring_info *txr,</div><div class='add'>+				   dma_addr_t mapping, u32 len,</div><div class='add'>+				   struct xdp_buff *xdp)</div><div class='ctx'> {</div><div class='add'>+	struct skb_shared_info *sinfo;</div><div class='ctx'> 	struct bnxt_sw_tx_bd *tx_buf;</div><div class='ctx'> 	struct tx_bd *txbd;</div><div class='add'>+	int num_frags = 0;</div><div class='ctx'> 	u32 flags;</div><div class='ctx'> 	u16 prod;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (xdp &amp;&amp; xdp_buff_has_frags(xdp)) {</div><div class='add'>+		sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+		num_frags = sinfo-&gt;nr_frags;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='add'>+	/* fill up the first buffer */</div><div class='ctx'> 	prod = txr-&gt;tx_prod;</div><div class='del'>-	tx_buf = &amp;txr-&gt;tx_buf_ring[prod];</div><div class='del'>-	tx_buf-&gt;rx_prod = rx_prod;</div><div class='add'>+	tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, prod)];</div><div class='add'>+	tx_buf-&gt;nr_frags = num_frags;</div><div class='add'>+	if (xdp)</div><div class='add'>+		tx_buf-&gt;page = virt_to_head_page(xdp-&gt;data);</div><div class='ctx'> </div><div class='del'>-	txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];</div><div class='del'>-	flags = (len &lt;&lt; TX_BD_LEN_SHIFT) | (1 &lt;&lt; TX_BD_FLAGS_BD_CNT_SHIFT) |</div><div class='del'>-		TX_BD_FLAGS_PACKET_END | bnxt_lhint_arr[len &gt;&gt; 9];</div><div class='add'>+	txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];</div><div class='add'>+	flags = (len &lt;&lt; TX_BD_LEN_SHIFT) | TX_BD_CNT(num_frags + 1) |</div><div class='add'>+		bnxt_lhint_arr[len &gt;&gt; 9];</div><div class='ctx'> 	txbd-&gt;tx_bd_len_flags_type = cpu_to_le32(flags);</div><div class='del'>-	txbd-&gt;tx_bd_opaque = prod;</div><div class='add'>+	txbd-&gt;tx_bd_opaque = SET_TX_OPAQUE(bp, txr, prod, 1 + num_frags);</div><div class='ctx'> 	txbd-&gt;tx_bd_haddr = cpu_to_le64(mapping);</div><div class='ctx'> </div><div class='add'>+	/* now let us fill up the frags into the next buffers */</div><div class='add'>+	for (i = 0; i &lt; num_frags ; i++) {</div><div class='add'>+		skb_frag_t *frag = &amp;sinfo-&gt;frags[i];</div><div class='add'>+		struct bnxt_sw_tx_bd *frag_tx_buf;</div><div class='add'>+		dma_addr_t frag_mapping;</div><div class='add'>+		int frag_len;</div><div class='add'>+</div><div class='add'>+		prod = NEXT_TX(prod);</div><div class='add'>+		WRITE_ONCE(txr-&gt;tx_prod, prod);</div><div class='add'>+</div><div class='add'>+		/* first fill up the first buffer */</div><div class='add'>+		frag_tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, prod)];</div><div class='add'>+		frag_tx_buf-&gt;page = skb_frag_page(frag);</div><div class='add'>+</div><div class='add'>+		txbd = &amp;txr-&gt;tx_desc_ring[TX_RING(bp, prod)][TX_IDX(prod)];</div><div class='add'>+</div><div class='add'>+		frag_len = skb_frag_size(frag);</div><div class='add'>+		flags = frag_len &lt;&lt; TX_BD_LEN_SHIFT;</div><div class='add'>+		txbd-&gt;tx_bd_len_flags_type = cpu_to_le32(flags);</div><div class='add'>+		frag_mapping = page_pool_get_dma_addr(skb_frag_page(frag)) +</div><div class='add'>+			       skb_frag_off(frag);</div><div class='add'>+		txbd-&gt;tx_bd_haddr = cpu_to_le64(frag_mapping);</div><div class='add'>+</div><div class='add'>+		len = frag_len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flags &amp;= ~TX_BD_LEN;</div><div class='add'>+	txbd-&gt;tx_bd_len_flags_type = cpu_to_le32(((len) &lt;&lt; TX_BD_LEN_SHIFT) | flags |</div><div class='add'>+			TX_BD_FLAGS_PACKET_END);</div><div class='add'>+	/* Sync TX BD */</div><div class='add'>+	wmb();</div><div class='ctx'> 	prod = NEXT_TX(prod);</div><div class='del'>-	txr-&gt;tx_prod = prod;</div><div class='add'>+	WRITE_ONCE(txr-&gt;tx_prod, prod);</div><div class='add'>+</div><div class='add'>+	return tx_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bnxt_xmit_xdp(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='add'>+			    dma_addr_t mapping, u32 len, u16 rx_prod,</div><div class='add'>+			    struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_sw_tx_bd *tx_buf;</div><div class='add'>+</div><div class='add'>+	tx_buf = bnxt_xmit_bd(bp, txr, mapping, len, xdp);</div><div class='add'>+	tx_buf-&gt;rx_prod = rx_prod;</div><div class='add'>+	tx_buf-&gt;action = XDP_TX;</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __bnxt_xmit_xdp_redirect(struct bnxt *bp,</div><div class='add'>+				     struct bnxt_tx_ring_info *txr,</div><div class='add'>+				     dma_addr_t mapping, u32 len,</div><div class='add'>+				     struct xdp_frame *xdpf)</div><div class='add'>+{</div><div class='add'>+	struct bnxt_sw_tx_bd *tx_buf;</div><div class='add'>+</div><div class='add'>+	tx_buf = bnxt_xmit_bd(bp, txr, mapping, len, NULL);</div><div class='add'>+	tx_buf-&gt;action = XDP_REDIRECT;</div><div class='add'>+	tx_buf-&gt;xdpf = xdpf;</div><div class='add'>+	dma_unmap_addr_set(tx_buf, mapping, mapping);</div><div class='add'>+	dma_unmap_len_set(tx_buf, len, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts)</div><div class='add'>+void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct bnxt_tx_ring_info *txr = bnapi-&gt;tx_ring;</div><div class='add'>+	struct bnxt_tx_ring_info *txr = bnapi-&gt;tx_ring[0];</div><div class='ctx'> 	struct bnxt_rx_ring_info *rxr = bnapi-&gt;rx_ring;</div><div class='add'>+	u16 tx_hw_cons = txr-&gt;tx_hw_cons;</div><div class='add'>+	bool rx_doorbell_needed = false;</div><div class='ctx'> 	struct bnxt_sw_tx_bd *tx_buf;</div><div class='ctx'> 	u16 tx_cons = txr-&gt;tx_cons;</div><div class='ctx'> 	u16 last_tx_cons = tx_cons;</div><div class='del'>-	u16 rx_prod;</div><div class='del'>-	int i;</div><div class='add'>+	int j, frags;</div><div class='add'>+</div><div class='add'>+	if (!budget)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	while (RING_TX(bp, tx_cons) != tx_hw_cons) {</div><div class='add'>+		tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, tx_cons)];</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; nr_pkts; i++) {</div><div class='del'>-		last_tx_cons = tx_cons;</div><div class='add'>+		if (tx_buf-&gt;action == XDP_REDIRECT) {</div><div class='add'>+			struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+</div><div class='add'>+			dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='add'>+					 dma_unmap_addr(tx_buf, mapping),</div><div class='add'>+					 dma_unmap_len(tx_buf, len),</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+			xdp_return_frame(tx_buf-&gt;xdpf);</div><div class='add'>+			tx_buf-&gt;action = 0;</div><div class='add'>+			tx_buf-&gt;xdpf = NULL;</div><div class='add'>+		} else if (tx_buf-&gt;action == XDP_TX) {</div><div class='add'>+			tx_buf-&gt;action = 0;</div><div class='add'>+			rx_doorbell_needed = true;</div><div class='add'>+			last_tx_cons = tx_cons;</div><div class='add'>+</div><div class='add'>+			frags = tx_buf-&gt;nr_frags;</div><div class='add'>+			for (j = 0; j &lt; frags; j++) {</div><div class='add'>+				tx_cons = NEXT_TX(tx_cons);</div><div class='add'>+				tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, tx_cons)];</div><div class='add'>+				page_pool_recycle_direct(rxr-&gt;page_pool, tx_buf-&gt;page);</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			bnxt_sched_reset_txr(bp, txr, tx_cons);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		tx_cons = NEXT_TX(tx_cons);</div><div class='ctx'> 	}</div><div class='del'>-	txr-&gt;tx_cons = tx_cons;</div><div class='del'>-	if (bnxt_tx_avail(bp, txr) == bp-&gt;tx_ring_size) {</div><div class='del'>-		rx_prod = rxr-&gt;rx_prod;</div><div class='del'>-	} else {</div><div class='del'>-		tx_buf = &amp;txr-&gt;tx_buf_ring[last_tx_cons];</div><div class='del'>-		rx_prod = tx_buf-&gt;rx_prod;</div><div class='add'>+</div><div class='add'>+	bnapi-&gt;events &amp;= ~BNXT_TX_CMP_EVENT;</div><div class='add'>+	WRITE_ONCE(txr-&gt;tx_cons, tx_cons);</div><div class='add'>+	if (rx_doorbell_needed) {</div><div class='add'>+		tx_buf = &amp;txr-&gt;tx_buf_ring[RING_TX(bp, last_tx_cons)];</div><div class='add'>+		bnxt_db_write(bp, &amp;rxr-&gt;rx_db, tx_buf-&gt;rx_prod);</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool bnxt_xdp_attached(struct bnxt *bp, struct bnxt_rx_ring_info *rxr)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *xdp_prog = READ_ONCE(rxr-&gt;xdp_prog);</div><div class='add'>+</div><div class='add'>+	return !!xdp_prog;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_xdp_buff_init(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='add'>+			u16 cons, u8 *data_ptr, unsigned int len,</div><div class='add'>+			struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	u32 buflen = BNXT_RX_PAGE_SIZE;</div><div class='add'>+	struct bnxt_sw_rx_bd *rx_buf;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	u32 offset;</div><div class='add'>+</div><div class='add'>+	pdev = bp-&gt;pdev;</div><div class='add'>+	rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='add'>+	offset = bp-&gt;rx_offset;</div><div class='add'>+</div><div class='add'>+	mapping = rx_buf-&gt;mapping - bp-&gt;rx_dma_offset;</div><div class='add'>+	dma_sync_single_for_cpu(&amp;pdev-&gt;dev, mapping + offset, len, bp-&gt;rx_dir);</div><div class='add'>+</div><div class='add'>+	xdp_init_buff(xdp, buflen, &amp;rxr-&gt;xdp_rxq);</div><div class='add'>+	xdp_prepare_buff(xdp, data_ptr - offset, offset, len, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void bnxt_xdp_buff_frags_free(struct bnxt_rx_ring_info *rxr,</div><div class='add'>+			      struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!xdp || !xdp_buff_has_frags(xdp))</div><div class='add'>+		return;</div><div class='add'>+	shinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+	for (i = 0; i &lt; shinfo-&gt;nr_frags; i++) {</div><div class='add'>+		struct page *page = skb_frag_page(&amp;shinfo-&gt;frags[i]);</div><div class='add'>+</div><div class='add'>+		page_pool_recycle_direct(rxr-&gt;page_pool, page);</div><div class='ctx'> 	}</div><div class='del'>-	bnxt_db_write(bp, &amp;rxr-&gt;rx_db, rx_prod);</div><div class='add'>+	shinfo-&gt;nr_frags = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* returns the following:</div><div class='hunk'>@@ -71,14 +222,15 @@ void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts)</div><div class='ctx'>  * false   - packet should be passed to the stack.</div><div class='ctx'>  */</div><div class='ctx'> bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,</div><div class='del'>-		 struct page *page, u8 **data_ptr, unsigned int *len, u8 *event)</div><div class='add'>+		 struct xdp_buff *xdp, struct page *page, u8 **data_ptr,</div><div class='add'>+		 unsigned int *len, u8 *event)</div><div class='ctx'> {</div><div class='ctx'> 	struct bpf_prog *xdp_prog = READ_ONCE(rxr-&gt;xdp_prog);</div><div class='ctx'> 	struct bnxt_tx_ring_info *txr;</div><div class='ctx'> 	struct bnxt_sw_rx_bd *rx_buf;</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='del'>-	struct xdp_buff xdp;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='add'>+	u32 tx_needed = 1;</div><div class='ctx'> 	void *orig_data;</div><div class='ctx'> 	u32 tx_avail;</div><div class='ctx'> 	u32 offset;</div><div class='hunk'>@@ -88,23 +240,13 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	pdev = bp-&gt;pdev;</div><div class='del'>-	txr = rxr-&gt;bnapi-&gt;tx_ring;</div><div class='del'>-	rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='ctx'> 	offset = bp-&gt;rx_offset;</div><div class='ctx'> </div><div class='del'>-	xdp.data_hard_start = *data_ptr - offset;</div><div class='del'>-	xdp.data = *data_ptr;</div><div class='del'>-	xdp_set_data_meta_invalid(&amp;xdp);</div><div class='del'>-	xdp.data_end = *data_ptr + *len;</div><div class='del'>-	xdp.rxq = &amp;rxr-&gt;xdp_rxq;</div><div class='del'>-	orig_data = xdp.data;</div><div class='del'>-	mapping = rx_buf-&gt;mapping - bp-&gt;rx_dma_offset;</div><div class='del'>-</div><div class='del'>-	dma_sync_single_for_cpu(&amp;pdev-&gt;dev, mapping + offset, *len, bp-&gt;rx_dir);</div><div class='add'>+	txr = rxr-&gt;bnapi-&gt;tx_ring[0];</div><div class='add'>+	/* BNXT_RX_PAGE_MODE(bp) when XDP enabled */</div><div class='add'>+	orig_data = xdp-&gt;data;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='del'>-	act = bpf_prog_run_xdp(xdp_prog, &amp;xdp);</div><div class='del'>-	rcu_read_unlock();</div><div class='add'>+	act = bpf_prog_run_xdp(xdp_prog, xdp);</div><div class='ctx'> </div><div class='ctx'> 	tx_avail = bnxt_tx_avail(bp, txr);</div><div class='ctx'> 	/* If the tx ring is not full, we must not update the rx producer yet</div><div class='hunk'>@@ -113,54 +255,151 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,</div><div class='ctx'> 	if (tx_avail != bp-&gt;tx_ring_size)</div><div class='ctx'> 		*event &amp;= ~BNXT_RX_EVENT;</div><div class='ctx'> </div><div class='del'>-	*len = xdp.data_end - xdp.data;</div><div class='del'>-	if (orig_data != xdp.data) {</div><div class='del'>-		offset = xdp.data - xdp.data_hard_start;</div><div class='del'>-		*data_ptr = xdp.data_hard_start + offset;</div><div class='add'>+	*len = xdp-&gt;data_end - xdp-&gt;data;</div><div class='add'>+	if (orig_data != xdp-&gt;data) {</div><div class='add'>+		offset = xdp-&gt;data - xdp-&gt;data_hard_start;</div><div class='add'>+		*data_ptr = xdp-&gt;data_hard_start + offset;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	switch (act) {</div><div class='ctx'> 	case XDP_PASS:</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='ctx'> 	case XDP_TX:</div><div class='del'>-		if (tx_avail &lt; 1) {</div><div class='add'>+		rx_buf = &amp;rxr-&gt;rx_buf_ring[cons];</div><div class='add'>+		mapping = rx_buf-&gt;mapping - bp-&gt;rx_dma_offset;</div><div class='add'>+		*event &amp;= BNXT_TX_CMP_EVENT;</div><div class='add'>+</div><div class='add'>+		if (unlikely(xdp_buff_has_frags(xdp))) {</div><div class='add'>+			struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+</div><div class='add'>+			tx_needed += sinfo-&gt;nr_frags;</div><div class='add'>+			*event = BNXT_AGG_EVENT;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tx_avail &lt; tx_needed) {</div><div class='ctx'> 			trace_xdp_exception(bp-&gt;dev, xdp_prog, act);</div><div class='add'>+			bnxt_xdp_buff_frags_free(rxr, xdp);</div><div class='ctx'> 			bnxt_reuse_rx_data(rxr, cons, page);</div><div class='ctx'> 			return true;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		*event = BNXT_TX_EVENT;</div><div class='ctx'> 		dma_sync_single_for_device(&amp;pdev-&gt;dev, mapping + offset, *len,</div><div class='ctx'> 					   bp-&gt;rx_dir);</div><div class='del'>-		bnxt_xmit_xdp(bp, txr, mapping + offset, *len,</div><div class='del'>-			      NEXT_RX(rxr-&gt;rx_prod));</div><div class='add'>+</div><div class='add'>+		*event |= BNXT_TX_EVENT;</div><div class='add'>+		__bnxt_xmit_xdp(bp, txr, mapping + offset, *len,</div><div class='add'>+				NEXT_RX(rxr-&gt;rx_prod), xdp);</div><div class='ctx'> 		bnxt_reuse_rx_data(rxr, cons, page);</div><div class='ctx'> 		return true;</div><div class='add'>+	case XDP_REDIRECT:</div><div class='add'>+		/* if we are calling this here then we know that the</div><div class='add'>+		 * redirect is coming from a frame received by the</div><div class='add'>+		 * bnxt_en driver.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		/* if we are unable to allocate a new buffer, abort and reuse */</div><div class='add'>+		if (bnxt_alloc_rx_data(bp, rxr, rxr-&gt;rx_prod, GFP_ATOMIC)) {</div><div class='add'>+			trace_xdp_exception(bp-&gt;dev, xdp_prog, act);</div><div class='add'>+			bnxt_xdp_buff_frags_free(rxr, xdp);</div><div class='add'>+			bnxt_reuse_rx_data(rxr, cons, page);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (xdp_do_redirect(bp-&gt;dev, xdp, xdp_prog)) {</div><div class='add'>+			trace_xdp_exception(bp-&gt;dev, xdp_prog, act);</div><div class='add'>+			page_pool_recycle_direct(rxr-&gt;page_pool, page);</div><div class='add'>+			return true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*event |= BNXT_REDIRECT_EVENT;</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='del'>-		bpf_warn_invalid_xdp_action(act);</div><div class='del'>-		/* Fall thru */</div><div class='add'>+		bpf_warn_invalid_xdp_action(bp-&gt;dev, xdp_prog, act);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_ABORTED:</div><div class='ctx'> 		trace_xdp_exception(bp-&gt;dev, xdp_prog, act);</div><div class='del'>-		/* Fall thru */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_DROP:</div><div class='add'>+		bnxt_xdp_buff_frags_free(rxr, xdp);</div><div class='ctx'> 		bnxt_reuse_rx_data(rxr, cons, page);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Under rtnl_lock */</div><div class='add'>+int bnxt_xdp_xmit(struct net_device *dev, int num_frames,</div><div class='add'>+		  struct xdp_frame **frames, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct bnxt *bp = netdev_priv(dev);</div><div class='add'>+	struct bpf_prog *xdp_prog = READ_ONCE(bp-&gt;xdp_prog);</div><div class='add'>+	struct pci_dev *pdev = bp-&gt;pdev;</div><div class='add'>+	struct bnxt_tx_ring_info *txr;</div><div class='add'>+	dma_addr_t mapping;</div><div class='add'>+	int nxmit = 0;</div><div class='add'>+	int ring;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(BNXT_STATE_OPEN, &amp;bp-&gt;state) ||</div><div class='add'>+	    !bp-&gt;tx_nr_rings_xdp ||</div><div class='add'>+	    !xdp_prog)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ring = smp_processor_id() % bp-&gt;tx_nr_rings_xdp;</div><div class='add'>+	txr = &amp;bp-&gt;tx_ring[ring];</div><div class='add'>+</div><div class='add'>+	if (READ_ONCE(txr-&gt;dev_state) == BNXT_DEV_STATE_CLOSING)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;bnxt_xdp_locking_key))</div><div class='add'>+		spin_lock(&amp;txr-&gt;xdp_tx_lock);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_frames; i++) {</div><div class='add'>+		struct xdp_frame *xdp = frames[i];</div><div class='add'>+</div><div class='add'>+		if (!bnxt_tx_avail(bp, txr))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		mapping = dma_map_single(&amp;pdev-&gt;dev, xdp-&gt;data, xdp-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		if (dma_mapping_error(&amp;pdev-&gt;dev, mapping))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		__bnxt_xmit_xdp_redirect(bp, txr, mapping, xdp-&gt;len, xdp);</div><div class='add'>+		nxmit++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; XDP_XMIT_FLUSH) {</div><div class='add'>+		/* Sync BD data before updating doorbell */</div><div class='add'>+		wmb();</div><div class='add'>+		bnxt_db_write(bp, &amp;txr-&gt;tx_db, txr-&gt;tx_prod);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (static_branch_unlikely(&amp;bnxt_xdp_locking_key))</div><div class='add'>+		spin_unlock(&amp;txr-&gt;xdp_tx_lock);</div><div class='add'>+</div><div class='add'>+	return nxmit;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='del'>-	int tx_xdp = 0, rc, tc;</div><div class='add'>+	int tx_xdp = 0, tx_cp, rc, tc;</div><div class='ctx'> 	struct bpf_prog *old;</div><div class='ctx'> </div><div class='del'>-	if (prog &amp;&amp; bp-&gt;dev-&gt;mtu &gt; BNXT_MAX_PAGE_MODE_MTU) {</div><div class='del'>-		netdev_warn(dev, "MTU %d larger than largest XDP supported MTU %d.\n",</div><div class='add'>+	netdev_assert_locked(dev);</div><div class='add'>+</div><div class='add'>+	if (prog &amp;&amp; !prog-&gt;aux-&gt;xdp_has_frags &amp;&amp;</div><div class='add'>+	    bp-&gt;dev-&gt;mtu &gt; BNXT_MAX_PAGE_MODE_MTU) {</div><div class='add'>+		netdev_warn(dev, "MTU %d larger than %d without XDP frag support.\n",</div><div class='ctx'> 			    bp-&gt;dev-&gt;mtu, BNXT_MAX_PAGE_MODE_MTU);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='add'>+	if (prog &amp;&amp; bp-&gt;flags &amp; BNXT_FLAG_HDS) {</div><div class='add'>+		netdev_warn(dev, "XDP is disallowed when HDS is enabled.\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> 	if (!(bp-&gt;flags &amp; BNXT_FLAG_SHARED_RINGS)) {</div><div class='ctx'> 		netdev_warn(dev, "ethtool rx/tx channels must be combined to support XDP.\n");</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -168,7 +407,7 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog)</div><div class='ctx'> 	if (prog)</div><div class='ctx'> 		tx_xdp = bp-&gt;rx_nr_rings;</div><div class='ctx'> </div><div class='del'>-	tc = netdev_get_num_tc(dev);</div><div class='add'>+	tc = bp-&gt;num_tc;</div><div class='ctx'> 	if (!tc)</div><div class='ctx'> 		tc = 1;</div><div class='ctx'> 	rc = bnxt_check_rings(bp, bp-&gt;tx_nr_rings_per_tc, bp-&gt;rx_nr_rings,</div><div class='hunk'>@@ -186,19 +425,15 @@ static int bnxt_xdp_set(struct bnxt *bp, struct bpf_prog *prog)</div><div class='ctx'> </div><div class='ctx'> 	if (prog) {</div><div class='ctx'> 		bnxt_set_rx_skb_mode(bp, true);</div><div class='add'>+		xdp_features_set_redirect_target_locked(dev, true);</div><div class='ctx'> 	} else {</div><div class='del'>-		int rx, tx;</div><div class='del'>-</div><div class='add'>+		xdp_features_clear_redirect_target_locked(dev);</div><div class='ctx'> 		bnxt_set_rx_skb_mode(bp, false);</div><div class='del'>-		bnxt_get_max_rings(bp, &amp;rx, &amp;tx, true);</div><div class='del'>-		if (rx &gt; 1) {</div><div class='del'>-			bp-&gt;flags &amp;= ~BNXT_FLAG_NO_AGG_RINGS;</div><div class='del'>-			bp-&gt;dev-&gt;hw_features |= NETIF_F_LRO;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;tx_nr_rings_xdp = tx_xdp;</div><div class='ctx'> 	bp-&gt;tx_nr_rings = bp-&gt;tx_nr_rings_per_tc * tc + tx_xdp;</div><div class='del'>-	bp-&gt;cp_nr_rings = max_t(int, bp-&gt;tx_nr_rings, bp-&gt;rx_nr_rings);</div><div class='add'>+	tx_cp = bnxt_num_tx_to_cp(bp, bp-&gt;tx_nr_rings);</div><div class='add'>+	bp-&gt;cp_nr_rings = max_t(int, tx_cp, bp-&gt;rx_nr_rings);</div><div class='ctx'> 	bnxt_set_tpa_flags(bp);</div><div class='ctx'> 	bnxt_set_ring_params(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -217,13 +452,24 @@ int bnxt_xdp(struct net_device *dev, struct netdev_bpf *xdp)</div><div class='ctx'> 	case XDP_SETUP_PROG:</div><div class='ctx'> 		rc = bnxt_xdp_set(bp, xdp-&gt;prog);</div><div class='ctx'> 		break;</div><div class='del'>-	case XDP_QUERY_PROG:</div><div class='del'>-		xdp-&gt;prog_id = bp-&gt;xdp_prog ? bp-&gt;xdp_prog-&gt;aux-&gt;id : 0;</div><div class='del'>-		rc = 0;</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		rc = -EINVAL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	return rc;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+struct sk_buff *</div><div class='add'>+bnxt_xdp_build_skb(struct bnxt *bp, struct sk_buff *skb, u8 num_frags,</div><div class='add'>+		   struct page_pool *pool, struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	xdp_update_skb_frags_info(skb, num_frags, sinfo-&gt;xdp_frags_size,</div><div class='add'>+				  BNXT_RX_PAGE_SIZE * num_frags,</div><div class='add'>+				  xdp_buff_get_skb_flags(xdp));</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h<br/>index 414b748038ca..220285e190fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h</a></div><div class='hunk'>@@ -10,12 +10,28 @@</div><div class='ctx'> #ifndef BNXT_XDP_H</div><div class='ctx'> #define BNXT_XDP_H</div><div class='ctx'> </div><div class='del'>-void bnxt_xmit_xdp(struct bnxt *bp, struct bnxt_tx_ring_info *txr,</div><div class='del'>-		   dma_addr_t mapping, u32 len, u16 rx_prod);</div><div class='del'>-void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int nr_pkts);</div><div class='add'>+DECLARE_STATIC_KEY_FALSE(bnxt_xdp_locking_key);</div><div class='add'>+</div><div class='add'>+struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp,</div><div class='add'>+				   struct bnxt_tx_ring_info *txr,</div><div class='add'>+				   dma_addr_t mapping, u32 len,</div><div class='add'>+				   struct xdp_buff *xdp);</div><div class='add'>+void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget);</div><div class='ctx'> bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,</div><div class='del'>-		 struct page *page, u8 **data_ptr, unsigned int *len,</div><div class='del'>-		 u8 *event);</div><div class='add'>+		 struct xdp_buff *xdp, struct page *page, u8 **data_ptr,</div><div class='add'>+		 unsigned int *len, u8 *event);</div><div class='ctx'> int bnxt_xdp(struct net_device *dev, struct netdev_bpf *xdp);</div><div class='add'>+int bnxt_xdp_xmit(struct net_device *dev, int num_frames,</div><div class='add'>+		  struct xdp_frame **frames, u32 flags);</div><div class='add'>+</div><div class='add'>+bool bnxt_xdp_attached(struct bnxt *bp, struct bnxt_rx_ring_info *rxr);</div><div class='ctx'> </div><div class='add'>+void bnxt_xdp_buff_init(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,</div><div class='add'>+			u16 cons, u8 *data_ptr, unsigned int len,</div><div class='add'>+			struct xdp_buff *xdp);</div><div class='add'>+void bnxt_xdp_buff_frags_free(struct bnxt_rx_ring_info *rxr,</div><div class='add'>+			      struct xdp_buff *xdp);</div><div class='add'>+struct sk_buff *bnxt_xdp_build_skb(struct bnxt *bp, struct sk_buff *skb,</div><div class='add'>+				   u8 num_frags, struct page_pool *pool,</div><div class='add'>+				   struct xdp_buff *xdp);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c<br/>index 57dc3cbff36e..6e97a5a7daaf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/cnic.c</a></div><div class='hunk'>@@ -31,6 +31,7 @@</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/random.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> #if IS_ENABLED(CONFIG_VLAN_8021Q)</div><div class='ctx'> #define BCM_VLAN 1</div><div class='ctx'> #endif</div><div class='hunk'>@@ -660,7 +661,7 @@ static int cnic_init_id_tbl(struct cnic_id_tbl *id_tbl, u32 size, u32 start_id,</div><div class='ctx'> 	id_tbl-&gt;max = size;</div><div class='ctx'> 	id_tbl-&gt;next = next;</div><div class='ctx'> 	spin_lock_init(&amp;id_tbl-&gt;lock);</div><div class='del'>-	id_tbl-&gt;table = kcalloc(BITS_TO_LONGS(size), sizeof(long), GFP_KERNEL);</div><div class='add'>+	id_tbl-&gt;table = bitmap_zalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!id_tbl-&gt;table)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -669,7 +670,7 @@ static int cnic_init_id_tbl(struct cnic_id_tbl *id_tbl, u32 size, u32 start_id,</div><div class='ctx'> </div><div class='ctx'> static void cnic_free_id_tbl(struct cnic_id_tbl *id_tbl)</div><div class='ctx'> {</div><div class='del'>-	kfree(id_tbl-&gt;table);</div><div class='add'>+	bitmap_free(id_tbl-&gt;table);</div><div class='ctx'> 	id_tbl-&gt;table = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1027,16 +1028,14 @@ static int __cnic_alloc_uio_rings(struct cnic_uio_dev *udev, int pages)</div><div class='ctx'> </div><div class='ctx'> 	udev-&gt;l2_ring_size = pages * CNIC_PAGE_SIZE;</div><div class='ctx'> 	udev-&gt;l2_ring = dma_alloc_coherent(&amp;udev-&gt;pdev-&gt;dev, udev-&gt;l2_ring_size,</div><div class='del'>-					   &amp;udev-&gt;l2_ring_map,</div><div class='del'>-					   GFP_KERNEL | __GFP_COMP);</div><div class='add'>+					   &amp;udev-&gt;l2_ring_map, GFP_KERNEL);</div><div class='ctx'> 	if (!udev-&gt;l2_ring)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	udev-&gt;l2_buf_size = (cp-&gt;l2_rx_ring_size + 1) * cp-&gt;l2_single_buf_size;</div><div class='ctx'> 	udev-&gt;l2_buf_size = CNIC_PAGE_ALIGN(udev-&gt;l2_buf_size);</div><div class='ctx'> 	udev-&gt;l2_buf = dma_alloc_coherent(&amp;udev-&gt;pdev-&gt;dev, udev-&gt;l2_buf_size,</div><div class='del'>-					  &amp;udev-&gt;l2_buf_map,</div><div class='del'>-					  GFP_KERNEL | __GFP_COMP);</div><div class='add'>+					  &amp;udev-&gt;l2_buf_map, GFP_KERNEL);</div><div class='ctx'> 	if (!udev-&gt;l2_buf) {</div><div class='ctx'> 		__cnic_free_uio_rings(udev);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -1109,10 +1108,11 @@ static int cnic_init_uio(struct cnic_dev *dev)</div><div class='ctx'> 						     TX_MAX_TSS_RINGS + 1);</div><div class='ctx'> 		uinfo-&gt;mem[1].addr = (unsigned long) cp-&gt;status_blk.gen &amp;</div><div class='ctx'> 					CNIC_PAGE_MASK;</div><div class='add'>+		uinfo-&gt;mem[1].dma_addr = cp-&gt;status_blk_map;</div><div class='ctx'> 		if (cp-&gt;ethdev-&gt;drv_state &amp; CNIC_DRV_STATE_USING_MSIX)</div><div class='del'>-			uinfo-&gt;mem[1].size = BNX2_SBLK_MSIX_ALIGN_SIZE * 9;</div><div class='add'>+			uinfo-&gt;mem[1].size = PAGE_ALIGN(BNX2_SBLK_MSIX_ALIGN_SIZE * 9);</div><div class='ctx'> 		else</div><div class='del'>-			uinfo-&gt;mem[1].size = BNX2_SBLK_MSIX_ALIGN_SIZE;</div><div class='add'>+			uinfo-&gt;mem[1].size = PAGE_ALIGN(BNX2_SBLK_MSIX_ALIGN_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		uinfo-&gt;name = "bnx2_cnic";</div><div class='ctx'> 	} else if (test_bit(CNIC_F_BNX2X_CLASS, &amp;dev-&gt;flags)) {</div><div class='hunk'>@@ -1120,20 +1120,26 @@ static int cnic_init_uio(struct cnic_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 		uinfo-&gt;mem[1].addr = (unsigned long) cp-&gt;bnx2x_def_status_blk &amp;</div><div class='ctx'> 			CNIC_PAGE_MASK;</div><div class='del'>-		uinfo-&gt;mem[1].size = sizeof(*cp-&gt;bnx2x_def_status_blk);</div><div class='add'>+		uinfo-&gt;mem[1].dma_addr = cp-&gt;status_blk_map;</div><div class='add'>+		uinfo-&gt;mem[1].size = PAGE_ALIGN(sizeof(*cp-&gt;bnx2x_def_status_blk));</div><div class='ctx'> </div><div class='ctx'> 		uinfo-&gt;name = "bnx2x_cnic";</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	uinfo-&gt;mem[1].memtype = UIO_MEM_LOGICAL;</div><div class='add'>+	uinfo-&gt;mem[1].dma_device = &amp;dev-&gt;pcidev-&gt;dev;</div><div class='add'>+	uinfo-&gt;mem[1].memtype = UIO_MEM_DMA_COHERENT;</div><div class='ctx'> </div><div class='ctx'> 	uinfo-&gt;mem[2].addr = (unsigned long) udev-&gt;l2_ring;</div><div class='del'>-	uinfo-&gt;mem[2].size = udev-&gt;l2_ring_size;</div><div class='del'>-	uinfo-&gt;mem[2].memtype = UIO_MEM_LOGICAL;</div><div class='add'>+	uinfo-&gt;mem[2].dma_addr = udev-&gt;l2_ring_map;</div><div class='add'>+	uinfo-&gt;mem[2].size = PAGE_ALIGN(udev-&gt;l2_ring_size);</div><div class='add'>+	uinfo-&gt;mem[2].dma_device = &amp;dev-&gt;pcidev-&gt;dev;</div><div class='add'>+	uinfo-&gt;mem[2].memtype = UIO_MEM_DMA_COHERENT;</div><div class='ctx'> </div><div class='ctx'> 	uinfo-&gt;mem[3].addr = (unsigned long) udev-&gt;l2_buf;</div><div class='del'>-	uinfo-&gt;mem[3].size = udev-&gt;l2_buf_size;</div><div class='del'>-	uinfo-&gt;mem[3].memtype = UIO_MEM_LOGICAL;</div><div class='add'>+	uinfo-&gt;mem[3].dma_addr = udev-&gt;l2_buf_map;</div><div class='add'>+	uinfo-&gt;mem[3].size = PAGE_ALIGN(udev-&gt;l2_buf_size);</div><div class='add'>+	uinfo-&gt;mem[3].dma_device = &amp;dev-&gt;pcidev-&gt;dev;</div><div class='add'>+	uinfo-&gt;mem[3].memtype = UIO_MEM_DMA_COHERENT;</div><div class='ctx'> </div><div class='ctx'> 	uinfo-&gt;version = CNIC_MODULE_VERSION;</div><div class='ctx'> 	uinfo-&gt;irq = UIO_IRQ_CUSTOM;</div><div class='hunk'>@@ -1315,6 +1321,7 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	cp-&gt;bnx2x_def_status_blk = cp-&gt;ethdev-&gt;irq_arr[1].status_blk;</div><div class='add'>+	cp-&gt;status_blk_map = cp-&gt;ethdev-&gt;irq_arr[1].status_blk_map;</div><div class='ctx'> </div><div class='ctx'> 	cp-&gt;l2_rx_ring_size = 15;</div><div class='ctx'> </div><div class='hunk'>@@ -1918,7 +1925,6 @@ static int cnic_bnx2x_iscsi_ofld1(struct cnic_dev *dev, struct kwqe *wqes[],</div><div class='ctx'> 	ret = cnic_alloc_bnx2x_conn_resc(dev, l5_cid);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		atomic_dec(&amp;cp-&gt;iscsi_conn);</div><div class='del'>-		ret = 0;</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='ctx'> 	ret = cnic_setup_bnx2x_ctx(dev, wqes, num);</div><div class='hunk'>@@ -3010,10 +3016,10 @@ static int cnic_service_bnx2(void *data, void *status_blk)</div><div class='ctx'> 	return cnic_service_bnx2_queues(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cnic_service_bnx2_msix(unsigned long data)</div><div class='add'>+static void cnic_service_bnx2_msix(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct cnic_dev *dev = (struct cnic_dev *) data;</div><div class='del'>-	struct cnic_local *cp = dev-&gt;cnic_priv;</div><div class='add'>+	struct cnic_local *cp = from_work(cp, work, cnic_irq_bh_work);</div><div class='add'>+	struct cnic_dev *dev = cp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	cp-&gt;last_status_idx = cnic_service_bnx2_queues(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3031,7 +3037,7 @@ static void cnic_doirq(struct cnic_dev *dev)</div><div class='ctx'> 		prefetch(cp-&gt;status_blk.gen);</div><div class='ctx'> 		prefetch(&amp;cp-&gt;kcq1.kcq[KCQ_PG(prod)][KCQ_IDX(prod)]);</div><div class='ctx'> </div><div class='del'>-		tasklet_schedule(&amp;cp-&gt;cnic_irq_task);</div><div class='add'>+		queue_work(system_bh_wq, &amp;cp-&gt;cnic_irq_bh_work);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3135,10 +3141,10 @@ static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info)</div><div class='ctx'> 	return last_status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cnic_service_bnx2x_bh(unsigned long data)</div><div class='add'>+static void cnic_service_bnx2x_bh_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct cnic_dev *dev = (struct cnic_dev *) data;</div><div class='del'>-	struct cnic_local *cp = dev-&gt;cnic_priv;</div><div class='add'>+	struct cnic_local *cp = from_work(cp, work, cnic_irq_bh_work);</div><div class='add'>+	struct cnic_dev *dev = cp-&gt;dev;</div><div class='ctx'> 	struct bnx2x *bp = netdev_priv(dev-&gt;netdev);</div><div class='ctx'> 	u32 status_idx, new_status_idx;</div><div class='ctx'> </div><div class='hunk'>@@ -3312,7 +3318,7 @@ static int cnic_ctl(void *data, struct cnic_ctl_info *info)</div><div class='ctx'> 	}</div><div class='ctx'> 	case CNIC_CTL_FCOE_STATS_GET_CMD:</div><div class='ctx'> 		ulp_type = CNIC_ULP_FCOE;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case CNIC_CTL_ISCSI_STATS_GET_CMD:</div><div class='ctx'> 		cnic_hold(dev);</div><div class='ctx'> 		cnic_copy_ulp_stats(dev, ulp_type);</div><div class='hunk'>@@ -3677,7 +3683,8 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr,</div><div class='ctx'> #if defined(CONFIG_INET)</div><div class='ctx'> 	struct rtable *rt;</div><div class='ctx'> </div><div class='del'>-	rt = ip_route_output(&amp;init_net, dst_addr-&gt;sin_addr.s_addr, 0, 0, 0);</div><div class='add'>+	rt = ip_route_output(&amp;init_net, dst_addr-&gt;sin_addr.s_addr, 0, 0, 0,</div><div class='add'>+			     RT_SCOPE_UNIVERSE);</div><div class='ctx'> 	if (!IS_ERR(rt)) {</div><div class='ctx'> 		*dst = &amp;rt-&gt;dst;</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -4045,7 +4052,7 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe)</div><div class='ctx'> 			    l4kcqe-&gt;status, l5kcqe-&gt;completion_status);</div><div class='ctx'> 		opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;</div><div class='ctx'> 	}</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED:</div><div class='ctx'> 	case L4_KCQE_OPCODE_VALUE_CLOSE_COMP:</div><div class='ctx'> 	case L4_KCQE_OPCODE_VALUE_RESET_COMP:</div><div class='hunk'>@@ -4096,14 +4103,17 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct cnic_local *cp = dev-&gt;cnic_priv;</div><div class='ctx'> 	u32 port_id;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	cp-&gt;csk_tbl = kvcalloc(MAX_CM_SK_TBL_SZ, sizeof(struct cnic_sock),</div><div class='ctx'> 			       GFP_KERNEL);</div><div class='ctx'> 	if (!cp-&gt;csk_tbl)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	port_id = prandom_u32();</div><div class='del'>-	port_id %= CNIC_LOCAL_PORT_RANGE;</div><div class='add'>+	for (i = 0; i &lt; MAX_CM_SK_TBL_SZ; i++)</div><div class='add'>+		atomic_set(&amp;cp-&gt;csk_tbl[i].ref_count, 0);</div><div class='add'>+</div><div class='add'>+	port_id = get_random_u32_below(CNIC_LOCAL_PORT_RANGE);</div><div class='ctx'> 	if (cnic_init_id_tbl(&amp;cp-&gt;csk_port_tbl, CNIC_LOCAL_PORT_RANGE,</div><div class='ctx'> 			     CNIC_LOCAL_PORT_MIN, port_id)) {</div><div class='ctx'> 		cnic_cm_free_mem(dev);</div><div class='hunk'>@@ -4162,7 +4172,7 @@ static int cnic_cm_init_bnx2_hw(struct cnic_dev *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 seed;</div><div class='ctx'> </div><div class='del'>-	seed = prandom_u32();</div><div class='add'>+	seed = get_random_u32();</div><div class='ctx'> 	cnic_ctx_wr(dev, 45, 0, seed);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4220,8 +4230,7 @@ static void cnic_cm_stop_bnx2x_hw(struct cnic_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	cnic_bnx2x_delete_wait(dev, 0);</div><div class='ctx'> </div><div class='del'>-	cancel_delayed_work(&amp;cp-&gt;delete_task);</div><div class='del'>-	flush_workqueue(cnic_wq);</div><div class='add'>+	cancel_delayed_work_sync(&amp;cp-&gt;delete_task);</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;cp-&gt;iscsi_conn) != 0)</div><div class='ctx'> 		netdev_warn(dev-&gt;netdev, "%d iSCSI connections not destroyed\n",</div><div class='hunk'>@@ -4419,7 +4428,7 @@ static void cnic_free_irq(struct cnic_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (ethdev-&gt;drv_state &amp; CNIC_DRV_STATE_USING_MSIX) {</div><div class='ctx'> 		cp-&gt;disable_int_sync(dev);</div><div class='del'>-		tasklet_kill(&amp;cp-&gt;cnic_irq_task);</div><div class='add'>+		cancel_work_sync(&amp;cp-&gt;cnic_irq_bh_work);</div><div class='ctx'> 		free_irq(ethdev-&gt;irq_arr[0].vector, dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -4432,7 +4441,7 @@ static int cnic_request_irq(struct cnic_dev *dev)</div><div class='ctx'> </div><div class='ctx'> 	err = request_irq(ethdev-&gt;irq_arr[0].vector, cnic_irq, 0, "cnic", dev);</div><div class='ctx'> 	if (err)</div><div class='del'>-		tasklet_disable(&amp;cp-&gt;cnic_irq_task);</div><div class='add'>+		disable_work_sync(&amp;cp-&gt;cnic_irq_bh_work);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -4455,8 +4464,7 @@ static int cnic_init_bnx2_irq(struct cnic_dev *dev)</div><div class='ctx'> 		CNIC_WR(dev, base + BNX2_HC_CMD_TICKS_OFF, (64 &lt;&lt; 16) | 220);</div><div class='ctx'> </div><div class='ctx'> 		cp-&gt;last_status_idx = cp-&gt;status_blk.bnx2-&gt;status_idx;</div><div class='del'>-		tasklet_init(&amp;cp-&gt;cnic_irq_task, cnic_service_bnx2_msix,</div><div class='del'>-			     (unsigned long) dev);</div><div class='add'>+		INIT_WORK(&amp;cp-&gt;cnic_irq_bh_work, cnic_service_bnx2_msix);</div><div class='ctx'> 		err = cnic_request_irq(dev);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='hunk'>@@ -4865,8 +4873,7 @@ static int cnic_init_bnx2x_irq(struct cnic_dev *dev)</div><div class='ctx'> 	struct cnic_eth_dev *ethdev = cp-&gt;ethdev;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;cp-&gt;cnic_irq_task, cnic_service_bnx2x_bh,</div><div class='del'>-		     (unsigned long) dev);</div><div class='add'>+	INIT_WORK(&amp;cp-&gt;cnic_irq_bh_work, cnic_service_bnx2x_bh_work);</div><div class='ctx'> 	if (ethdev-&gt;drv_state &amp; CNIC_DRV_STATE_USING_MSIX)</div><div class='ctx'> 		err = cnic_request_irq(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -5204,6 +5211,8 @@ static void cnic_init_rings(struct cnic_dev *dev)</div><div class='ctx'> 		cnic_init_bnx2x_tx_ring(dev, data);</div><div class='ctx'> 		cnic_init_bnx2x_rx_ring(dev, data);</div><div class='ctx'> </div><div class='add'>+		data-&gt;general.fp_hsi_ver =  ETH_FP_HSI_VERSION;</div><div class='add'>+</div><div class='ctx'> 		l5_data.phy_address.lo = udev-&gt;l2_buf_map &amp; 0xffffffff;</div><div class='ctx'> 		l5_data.phy_address.hi = (u64) udev-&gt;l2_buf_map &gt;&gt; 32;</div><div class='ctx'> </div><div class='hunk'>@@ -5323,6 +5332,7 @@ static int cnic_start_hw(struct cnic_dev *dev)</div><div class='ctx'> 	pci_dev_get(dev-&gt;pcidev);</div><div class='ctx'> 	cp-&gt;func = PCI_FUNC(dev-&gt;pcidev-&gt;devfn);</div><div class='ctx'> 	cp-&gt;status_blk.gen = ethdev-&gt;irq_arr[0].status_blk;</div><div class='add'>+	cp-&gt;status_blk_map = ethdev-&gt;irq_arr[0].status_blk_map;</div><div class='ctx'> 	cp-&gt;status_blk_num = ethdev-&gt;irq_arr[0].status_blk_num;</div><div class='ctx'> </div><div class='ctx'> 	err = cp-&gt;alloc_resc(dev);</div><div class='hunk'>@@ -5480,6 +5490,7 @@ static struct cnic_dev *cnic_alloc_dev(struct net_device *dev,</div><div class='ctx'> 	cdev-&gt;unregister_device = cnic_unregister_device;</div><div class='ctx'> 	cdev-&gt;iscsi_nl_msg_recv = cnic_iscsi_nl_msg_recv;</div><div class='ctx'> 	cdev-&gt;get_fc_npiv_tbl = cnic_get_fc_npiv_tbl;</div><div class='add'>+	atomic_set(&amp;cdev-&gt;ref_count, 0);</div><div class='ctx'> </div><div class='ctx'> 	cp = cdev-&gt;cnic_priv;</div><div class='ctx'> 	cp-&gt;dev = cdev;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h<br/>index 4baea81bae7a..1a314a75d2d2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/cnic.h</a></div><div class='hunk'>@@ -260,6 +260,7 @@ struct cnic_local {</div><div class='ctx'> 		#define SM_RX_ID		0</div><div class='ctx'> 		#define SM_TX_ID		1</div><div class='ctx'> 	} status_blk;</div><div class='add'>+	dma_addr_t status_blk_map;</div><div class='ctx'> </div><div class='ctx'> 	struct host_sp_status_block	*bnx2x_def_status_blk;</div><div class='ctx'> </div><div class='hunk'>@@ -267,7 +268,7 @@ struct cnic_local {</div><div class='ctx'> 	u32				bnx2x_igu_sb_id;</div><div class='ctx'> 	u32				int_num;</div><div class='ctx'> 	u32				last_status_idx;</div><div class='del'>-	struct tasklet_struct		cnic_irq_task;</div><div class='add'>+	struct work_struct		cnic_irq_bh_work;</div><div class='ctx'> </div><div class='ctx'> 	struct kcqe		*completed_kcq[MAX_COMPLETED_KCQE];</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h<br/>index b38499774071..99e2c6d4d8c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/cnic_defs.h</a></div><div class='hunk'>@@ -543,13 +543,13 @@ struct l4_kwq_update_pg {</div><div class='ctx'> #define L4_KWQ_UPDATE_PG_RESERVERD2_SHIFT 2</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(__BIG_ENDIAN)</div><div class='del'>-	u16 reserverd3;</div><div class='add'>+	u16 reserved3;</div><div class='ctx'> 	u8 da0;</div><div class='ctx'> 	u8 da1;</div><div class='ctx'> #elif defined(__LITTLE_ENDIAN)</div><div class='ctx'> 	u8 da1;</div><div class='ctx'> 	u8 da0;</div><div class='del'>-	u16 reserverd3;</div><div class='add'>+	u16 reserved3;</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(__BIG_ENDIAN)</div><div class='ctx'> 	u8 da2;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h<br/>index 789e5c7e9311..49a11ec80b36 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic_if.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/cnic_if.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/cnic_if.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/cnic_if.h</a></div><div class='hunk'>@@ -190,6 +190,7 @@ struct cnic_ops {</div><div class='ctx'> struct cnic_irq {</div><div class='ctx'> 	unsigned int	vector;</div><div class='ctx'> 	void		*status_blk;</div><div class='add'>+	dma_addr_t	status_blk_map;</div><div class='ctx'> 	u32		status_blk_num;</div><div class='ctx'> 	u32		status_blk_num2;</div><div class='ctx'> 	u32		irq_flags;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c<br/>index 374b9ff05c88..05512aa10c20 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmgenet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/genet/bcmgenet.c</a></div><div class='hunk'>@@ -1,15 +1,13 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Broadcom GENET (Gigabit Ethernet) controller driver</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2014-2017 Broadcom</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (c) 2014-2025 Broadcom</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt)				"bcmgenet: " fmt</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='hunk'>@@ -25,11 +23,6 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='del'>-#include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='hunk'>@@ -42,21 +35,18 @@</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/bcmgenet.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bcmgenet.h"</div><div class='ctx'> </div><div class='del'>-/* Maximum number of hardware queues, downsized if needed */</div><div class='del'>-#define GENET_MAX_MQ_CNT	4</div><div class='del'>-</div><div class='ctx'> /* Default highest priority queue for multi queue support */</div><div class='del'>-#define GENET_Q0_PRIORITY	0</div><div class='add'>+#define GENET_Q1_PRIORITY	0</div><div class='add'>+#define GENET_Q0_PRIORITY	1</div><div class='ctx'> </div><div class='del'>-#define GENET_Q16_RX_BD_CNT	\</div><div class='add'>+#define GENET_Q0_RX_BD_CNT	\</div><div class='ctx'> 	(TOTAL_DESC - priv-&gt;hw_params-&gt;rx_queues * priv-&gt;hw_params-&gt;rx_bds_per_q)</div><div class='del'>-#define GENET_Q16_TX_BD_CNT	\</div><div class='add'>+#define GENET_Q0_TX_BD_CNT	\</div><div class='ctx'> 	(TOTAL_DESC - priv-&gt;hw_params-&gt;tx_queues * priv-&gt;hw_params-&gt;tx_bds_per_q)</div><div class='ctx'> </div><div class='ctx'> #define RX_BUF_LENGTH		2048</div><div class='hunk'>@@ -72,6 +62,9 @@</div><div class='ctx'> #define GENET_RDMA_REG_OFF	(priv-&gt;hw_params-&gt;rdma_offset + \</div><div class='ctx'> 				TOTAL_DESC * DMA_DESC_SIZE)</div><div class='ctx'> </div><div class='add'>+/* Forward declarations */</div><div class='add'>+static void bcmgenet_set_rx_mode(struct net_device *dev);</div><div class='add'>+</div><div class='ctx'> static inline void bcmgenet_writel(u32 value, void __iomem *offset)</div><div class='ctx'> {</div><div class='ctx'> 	/* MIPS chips strapped for BE will automagically configure the</div><div class='hunk'>@@ -97,12 +90,6 @@ static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv,</div><div class='ctx'> 	bcmgenet_writel(value, d + DMA_DESC_LENGTH_STATUS);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u32 dmadesc_get_length_status(struct bcmgenet_priv *priv,</div><div class='del'>-					    void __iomem *d)</div><div class='del'>-{</div><div class='del'>-	return bcmgenet_readl(d + DMA_DESC_LENGTH_STATUS);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void dmadesc_set_addr(struct bcmgenet_priv *priv,</div><div class='ctx'> 				    void __iomem *d,</div><div class='ctx'> 				    dma_addr_t addr)</div><div class='hunk'>@@ -114,7 +101,7 @@ static inline void dmadesc_set_addr(struct bcmgenet_priv *priv,</div><div class='ctx'> 	 * the platform is explicitly configured for 64-bits/LPAE.</div><div class='ctx'> 	 */</div><div class='ctx'> #ifdef CONFIG_PHYS_ADDR_T_64BIT</div><div class='del'>-	if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_40BITS)</div><div class='add'>+	if (bcmgenet_has_40bits(priv))</div><div class='ctx'> 		bcmgenet_writel(upper_32_bits(addr), d + DMA_DESC_ADDRESS_HI);</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='hunk'>@@ -127,24 +114,6 @@ static inline void dmadesc_set(struct bcmgenet_priv *priv,</div><div class='ctx'> 	dmadesc_set_length_status(priv, d, val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline dma_addr_t dmadesc_get_addr(struct bcmgenet_priv *priv,</div><div class='del'>-					  void __iomem *d)</div><div class='del'>-{</div><div class='del'>-	dma_addr_t addr;</div><div class='del'>-</div><div class='del'>-	addr = bcmgenet_readl(d + DMA_DESC_ADDRESS_LO);</div><div class='del'>-</div><div class='del'>-	/* Register writes to GISB bus can take couple hundred nanoseconds</div><div class='del'>-	 * and are done for each packet, save these expensive writes unless</div><div class='del'>-	 * the platform is explicitly configured for 64-bits/LPAE.</div><div class='del'>-	 */</div><div class='del'>-#ifdef CONFIG_PHYS_ADDR_T_64BIT</div><div class='del'>-	if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_40BITS)</div><div class='del'>-		addr |= (u64)bcmgenet_readl(d + DMA_DESC_ADDRESS_HI) &lt;&lt; 32;</div><div class='del'>-#endif</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #define GENET_VER_FMT	"%1d.%1d EPHY: 0x%04x"</div><div class='ctx'> </div><div class='ctx'> #define GENET_MSG_DEFAULT	(NETIF_MSG_DRV | NETIF_MSG_PROBE | \</div><div class='hunk'>@@ -469,6 +438,316 @@ static inline void bcmgenet_rdma_ring_writel(struct bcmgenet_priv *priv,</div><div class='ctx'> 			genet_dma_ring_regs[r]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bcmgenet_hfb_enable_filter(struct bcmgenet_priv *priv, u32 f_index)</div><div class='add'>+{</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (GENET_IS_V1(priv) || GENET_IS_V2(priv)) {</div><div class='add'>+		reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+		reg |= (1 &lt;&lt; ((f_index % 32) + RBUF_HFB_FILTER_EN_SHIFT)) |</div><div class='add'>+			RBUF_HFB_EN;</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='add'>+	} else {</div><div class='add'>+		offset = HFB_FLT_ENABLE_V3PLUS + (f_index &lt; 32) * sizeof(u32);</div><div class='add'>+		reg = bcmgenet_hfb_reg_readl(priv, offset);</div><div class='add'>+		reg |= (1 &lt;&lt; (f_index % 32));</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, reg, offset);</div><div class='add'>+		reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+		reg |= RBUF_HFB_EN;</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_hfb_disable_filter(struct bcmgenet_priv *priv, u32 f_index)</div><div class='add'>+{</div><div class='add'>+	u32 offset, reg, reg1;</div><div class='add'>+</div><div class='add'>+	if (GENET_IS_V1(priv) || GENET_IS_V2(priv)) {</div><div class='add'>+		reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+		reg &amp;= ~(1 &lt;&lt; ((f_index % 32) + RBUF_HFB_FILTER_EN_SHIFT));</div><div class='add'>+		if (!(reg &amp; RBUF_HFB_FILTER_EN_MASK))</div><div class='add'>+			reg &amp;= ~RBUF_HFB_EN;</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='add'>+	} else {</div><div class='add'>+		offset = HFB_FLT_ENABLE_V3PLUS;</div><div class='add'>+		reg = bcmgenet_hfb_reg_readl(priv, offset);</div><div class='add'>+		reg1 = bcmgenet_hfb_reg_readl(priv, offset + sizeof(u32));</div><div class='add'>+		if  (f_index &lt; 32) {</div><div class='add'>+			reg1 &amp;= ~(1 &lt;&lt; (f_index % 32));</div><div class='add'>+			bcmgenet_hfb_reg_writel(priv, reg1, offset + sizeof(u32));</div><div class='add'>+		} else {</div><div class='add'>+			reg &amp;= ~(1 &lt;&lt; (f_index % 32));</div><div class='add'>+			bcmgenet_hfb_reg_writel(priv, reg, offset);</div><div class='add'>+		}</div><div class='add'>+		if (!reg &amp;&amp; !reg1) {</div><div class='add'>+			reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+			reg &amp;= ~RBUF_HFB_EN;</div><div class='add'>+			bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_hfb_set_filter_rx_queue_mapping(struct bcmgenet_priv *priv,</div><div class='add'>+						     u32 f_index, u32 rx_queue)</div><div class='add'>+{</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (GENET_IS_V1(priv) || GENET_IS_V2(priv))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	offset = f_index / 8;</div><div class='add'>+	reg = bcmgenet_rdma_readl(priv, DMA_INDEX2RING_0 + offset);</div><div class='add'>+	reg &amp;= ~(0xF &lt;&lt; (4 * (f_index % 8)));</div><div class='add'>+	reg |= ((rx_queue &amp; 0xF) &lt;&lt; (4 * (f_index % 8)));</div><div class='add'>+	bcmgenet_rdma_writel(priv, reg, DMA_INDEX2RING_0 + offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_hfb_set_filter_length(struct bcmgenet_priv *priv,</div><div class='add'>+					   u32 f_index, u32 f_length)</div><div class='add'>+{</div><div class='add'>+	u32 offset;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (GENET_IS_V1(priv) || GENET_IS_V2(priv))</div><div class='add'>+		offset = HFB_FLT_LEN_V2;</div><div class='add'>+	else</div><div class='add'>+		offset = HFB_FLT_LEN_V3PLUS;</div><div class='add'>+</div><div class='add'>+	offset += sizeof(u32) *</div><div class='add'>+		  ((priv-&gt;hw_params-&gt;hfb_filter_cnt - 1 - f_index) / 4);</div><div class='add'>+	reg = bcmgenet_hfb_reg_readl(priv, offset);</div><div class='add'>+	reg &amp;= ~(0xFF &lt;&lt; (8 * (f_index % 4)));</div><div class='add'>+	reg |= ((f_length &amp; 0xFF) &lt;&lt; (8 * (f_index % 4)));</div><div class='add'>+	bcmgenet_hfb_reg_writel(priv, reg, offset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_hfb_validate_mask(void *mask, size_t size)</div><div class='add'>+{</div><div class='add'>+	while (size) {</div><div class='add'>+		switch (*(unsigned char *)mask++) {</div><div class='add'>+		case 0x00:</div><div class='add'>+		case 0x0f:</div><div class='add'>+		case 0xf0:</div><div class='add'>+		case 0xff:</div><div class='add'>+			size--;</div><div class='add'>+			continue;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define VALIDATE_MASK(x) \</div><div class='add'>+	bcmgenet_hfb_validate_mask(&amp;(x), sizeof(x))</div><div class='add'>+</div><div class='add'>+static int bcmgenet_hfb_insert_data(struct bcmgenet_priv *priv, u32 f_index,</div><div class='add'>+				    u32 offset, void *val, void *mask,</div><div class='add'>+				    size_t size)</div><div class='add'>+{</div><div class='add'>+	u32 index, tmp;</div><div class='add'>+</div><div class='add'>+	index = f_index * priv-&gt;hw_params-&gt;hfb_filter_size + offset / 2;</div><div class='add'>+	tmp = bcmgenet_hfb_readl(priv, index * sizeof(u32));</div><div class='add'>+</div><div class='add'>+	while (size--) {</div><div class='add'>+		if (offset++ &amp; 1) {</div><div class='add'>+			tmp &amp;= ~0x300FF;</div><div class='add'>+			tmp |= (*(unsigned char *)val++);</div><div class='add'>+			switch ((*(unsigned char *)mask++)) {</div><div class='add'>+			case 0xFF:</div><div class='add'>+				tmp |= 0x30000;</div><div class='add'>+				break;</div><div class='add'>+			case 0xF0:</div><div class='add'>+				tmp |= 0x20000;</div><div class='add'>+				break;</div><div class='add'>+			case 0x0F:</div><div class='add'>+				tmp |= 0x10000;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			bcmgenet_hfb_writel(priv, tmp, index++ * sizeof(u32));</div><div class='add'>+			if (size)</div><div class='add'>+				tmp = bcmgenet_hfb_readl(priv,</div><div class='add'>+							 index * sizeof(u32));</div><div class='add'>+		} else {</div><div class='add'>+			tmp &amp;= ~0xCFF00;</div><div class='add'>+			tmp |= (*(unsigned char *)val++) &lt;&lt; 8;</div><div class='add'>+			switch ((*(unsigned char *)mask++)) {</div><div class='add'>+			case 0xFF:</div><div class='add'>+				tmp |= 0xC0000;</div><div class='add'>+				break;</div><div class='add'>+			case 0xF0:</div><div class='add'>+				tmp |= 0x80000;</div><div class='add'>+				break;</div><div class='add'>+			case 0x0F:</div><div class='add'>+				tmp |= 0x40000;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!size)</div><div class='add'>+				bcmgenet_hfb_writel(priv, tmp, index * sizeof(u32));</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_hfb_create_rxnfc_filter(struct bcmgenet_priv *priv,</div><div class='add'>+					     struct bcmgenet_rxnfc_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fs = &amp;rule-&gt;fs;</div><div class='add'>+	u32 offset = 0, f_length = 0, f, q;</div><div class='add'>+	u8 val_8, mask_8;</div><div class='add'>+	__be16 val_16;</div><div class='add'>+	u16 mask_16;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	f = fs-&gt;location + 1;</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_MAC_EXT) {</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, 0,</div><div class='add'>+					 &amp;fs-&gt;h_ext.h_dest, &amp;fs-&gt;m_ext.h_dest,</div><div class='add'>+					 sizeof(fs-&gt;h_ext.h_dest));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='add'>+		if (fs-&gt;m_ext.vlan_etype ||</div><div class='add'>+		    fs-&gt;m_ext.vlan_tci) {</div><div class='add'>+			bcmgenet_hfb_insert_data(priv, f, 12,</div><div class='add'>+						 &amp;fs-&gt;h_ext.vlan_etype,</div><div class='add'>+						 &amp;fs-&gt;m_ext.vlan_etype,</div><div class='add'>+						 sizeof(fs-&gt;h_ext.vlan_etype));</div><div class='add'>+			bcmgenet_hfb_insert_data(priv, f, 14,</div><div class='add'>+						 &amp;fs-&gt;h_ext.vlan_tci,</div><div class='add'>+						 &amp;fs-&gt;m_ext.vlan_tci,</div><div class='add'>+						 sizeof(fs-&gt;h_ext.vlan_tci));</div><div class='add'>+			offset += VLAN_HLEN;</div><div class='add'>+			f_length += DIV_ROUND_UP(VLAN_HLEN, 2);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (fs-&gt;flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT)) {</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+		f_length += DIV_ROUND_UP(ETH_HLEN, 2);</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, 0,</div><div class='add'>+					 &amp;fs-&gt;h_u.ether_spec.h_dest,</div><div class='add'>+					 &amp;fs-&gt;m_u.ether_spec.h_dest,</div><div class='add'>+					 sizeof(fs-&gt;h_u.ether_spec.h_dest));</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, ETH_ALEN,</div><div class='add'>+					 &amp;fs-&gt;h_u.ether_spec.h_source,</div><div class='add'>+					 &amp;fs-&gt;m_u.ether_spec.h_source,</div><div class='add'>+					 sizeof(fs-&gt;h_u.ether_spec.h_source));</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, (2 * ETH_ALEN) + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.ether_spec.h_proto,</div><div class='add'>+					 &amp;fs-&gt;m_u.ether_spec.h_proto,</div><div class='add'>+					 sizeof(fs-&gt;h_u.ether_spec.h_proto));</div><div class='add'>+		break;</div><div class='add'>+	case IP_USER_FLOW:</div><div class='add'>+		f_length += DIV_ROUND_UP(ETH_HLEN + 20, 2);</div><div class='add'>+		/* Specify IP Ether Type */</div><div class='add'>+		val_16 = htons(ETH_P_IP);</div><div class='add'>+		mask_16 = 0xFFFF;</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, (2 * ETH_ALEN) + offset,</div><div class='add'>+					 &amp;val_16, &amp;mask_16, sizeof(val_16));</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, 15 + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.tos,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.tos,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.tos));</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, 23 + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.proto,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.proto,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.proto));</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, 26 + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.ip4src,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.ip4src,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.ip4src));</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, 30 + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.ip4dst,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.ip4dst,</div><div class='add'>+					 sizeof(fs-&gt;h_u.usr_ip4_spec.ip4dst));</div><div class='add'>+		if (!fs-&gt;m_u.usr_ip4_spec.l4_4_bytes)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Only supports 20 byte IPv4 header */</div><div class='add'>+		val_8 = 0x45;</div><div class='add'>+		mask_8 = 0xFF;</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f, ETH_HLEN + offset,</div><div class='add'>+					 &amp;val_8, &amp;mask_8,</div><div class='add'>+					 sizeof(val_8));</div><div class='add'>+		size = sizeof(fs-&gt;h_u.usr_ip4_spec.l4_4_bytes);</div><div class='add'>+		bcmgenet_hfb_insert_data(priv, f,</div><div class='add'>+					 ETH_HLEN + 20 + offset,</div><div class='add'>+					 &amp;fs-&gt;h_u.usr_ip4_spec.l4_4_bytes,</div><div class='add'>+					 &amp;fs-&gt;m_u.usr_ip4_spec.l4_4_bytes,</div><div class='add'>+					 size);</div><div class='add'>+		f_length += DIV_ROUND_UP(size, 2);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcmgenet_hfb_set_filter_length(priv, f, 2 * f_length);</div><div class='add'>+	if (fs-&gt;ring_cookie == RX_CLS_FLOW_WAKE)</div><div class='add'>+		q = 0;</div><div class='add'>+	else if (fs-&gt;ring_cookie == RX_CLS_FLOW_DISC)</div><div class='add'>+		q = priv-&gt;hw_params-&gt;rx_queues + 1;</div><div class='add'>+	else</div><div class='add'>+		/* Other Rx rings are direct mapped here */</div><div class='add'>+		q = fs-&gt;ring_cookie;</div><div class='add'>+	bcmgenet_hfb_set_filter_rx_queue_mapping(priv, f, q);</div><div class='add'>+	bcmgenet_hfb_enable_filter(priv, f);</div><div class='add'>+	rule-&gt;state = BCMGENET_RXNFC_STATE_ENABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* bcmgenet_hfb_clear</div><div class='add'>+ *</div><div class='add'>+ * Clear Hardware Filter Block and disable all filtering.</div><div class='add'>+ */</div><div class='add'>+static void bcmgenet_hfb_clear_filter(struct bcmgenet_priv *priv, u32 f_index)</div><div class='add'>+{</div><div class='add'>+	u32 base, i;</div><div class='add'>+</div><div class='add'>+	bcmgenet_hfb_set_filter_length(priv, f_index, 0);</div><div class='add'>+	base = f_index * priv-&gt;hw_params-&gt;hfb_filter_size;</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;hw_params-&gt;hfb_filter_size; i++)</div><div class='add'>+		bcmgenet_hfb_writel(priv, 0x0, (base + i) * sizeof(u32));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_hfb_clear(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	bcmgenet_hfb_reg_writel(priv, 0, HFB_CTRL);</div><div class='add'>+</div><div class='add'>+	if (!GENET_IS_V1(priv) &amp;&amp; !GENET_IS_V2(priv)) {</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, 0,</div><div class='add'>+					HFB_FLT_ENABLE_V3PLUS);</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, 0,</div><div class='add'>+					HFB_FLT_ENABLE_V3PLUS + 4);</div><div class='add'>+		for (i = DMA_INDEX2RING_0; i &lt;= DMA_INDEX2RING_7; i++)</div><div class='add'>+			bcmgenet_rdma_writel(priv, 0, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;hw_params-&gt;hfb_filter_cnt; i++)</div><div class='add'>+		bcmgenet_hfb_clear_filter(priv, i);</div><div class='add'>+</div><div class='add'>+	/* Enable filter 0 to send default flow to ring 0 */</div><div class='add'>+	bcmgenet_hfb_set_filter_length(priv, 0, 4);</div><div class='add'>+	bcmgenet_hfb_enable_filter(priv, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_hfb_init(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	INIT_LIST_HEAD(&amp;priv-&gt;rxnfc_list);</div><div class='add'>+	for (i = 0; i &lt; MAX_NUM_OF_FS_RULES; i++) {</div><div class='add'>+		INIT_LIST_HEAD(&amp;priv-&gt;rxnfc_rules[i].list);</div><div class='add'>+		priv-&gt;rxnfc_rules[i].state = BCMGENET_RXNFC_STATE_UNUSED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bcmgenet_hfb_clear(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bcmgenet_begin(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -511,76 +790,22 @@ static int bcmgenet_set_link_ksettings(struct net_device *dev,</div><div class='ctx'> 	return phy_ethtool_ksettings_set(dev-&gt;phydev, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcmgenet_set_rx_csum(struct net_device *dev,</div><div class='del'>-				netdev_features_t wanted)</div><div class='del'>-{</div><div class='del'>-	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 rbuf_chk_ctrl;</div><div class='del'>-	bool rx_csum_en;</div><div class='del'>-</div><div class='del'>-	rx_csum_en = !!(wanted &amp; NETIF_F_RXCSUM);</div><div class='del'>-</div><div class='del'>-	rbuf_chk_ctrl = bcmgenet_rbuf_readl(priv, RBUF_CHK_CTRL);</div><div class='del'>-</div><div class='del'>-	/* enable rx checksumming */</div><div class='del'>-	if (rx_csum_en)</div><div class='del'>-		rbuf_chk_ctrl |= RBUF_RXCHK_EN;</div><div class='del'>-	else</div><div class='del'>-		rbuf_chk_ctrl &amp;= ~RBUF_RXCHK_EN;</div><div class='del'>-	priv-&gt;desc_rxchk_en = rx_csum_en;</div><div class='del'>-</div><div class='del'>-	/* If UniMAC forwards CRC, we need to skip over it to get</div><div class='del'>-	 * a valid CHK bit to be set in the per-packet status word</div><div class='del'>-	*/</div><div class='del'>-	if (rx_csum_en &amp;&amp; priv-&gt;crc_fwd_en)</div><div class='del'>-		rbuf_chk_ctrl |= RBUF_SKIP_FCS;</div><div class='del'>-	else</div><div class='del'>-		rbuf_chk_ctrl &amp;= ~RBUF_SKIP_FCS;</div><div class='del'>-</div><div class='del'>-	bcmgenet_rbuf_writel(priv, rbuf_chk_ctrl, RBUF_CHK_CTRL);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int bcmgenet_set_tx_csum(struct net_device *dev,</div><div class='del'>-				netdev_features_t wanted)</div><div class='add'>+static int bcmgenet_set_features(struct net_device *dev,</div><div class='add'>+				 netdev_features_t features)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	bool desc_64b_en;</div><div class='del'>-	u32 tbuf_ctrl, rbuf_ctrl;</div><div class='del'>-</div><div class='del'>-	tbuf_ctrl = bcmgenet_tbuf_ctrl_get(priv);</div><div class='del'>-	rbuf_ctrl = bcmgenet_rbuf_readl(priv, RBUF_CTRL);</div><div class='del'>-</div><div class='del'>-	desc_64b_en = !!(wanted &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM));</div><div class='del'>-</div><div class='del'>-	/* enable 64 bytes descriptor in both directions (RBUF and TBUF) */</div><div class='del'>-	if (desc_64b_en) {</div><div class='del'>-		tbuf_ctrl |= RBUF_64B_EN;</div><div class='del'>-		rbuf_ctrl |= RBUF_64B_EN;</div><div class='del'>-	} else {</div><div class='del'>-		tbuf_ctrl &amp;= ~RBUF_64B_EN;</div><div class='del'>-		rbuf_ctrl &amp;= ~RBUF_64B_EN;</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;desc_64b_en = desc_64b_en;</div><div class='del'>-</div><div class='del'>-	bcmgenet_tbuf_ctrl_set(priv, tbuf_ctrl);</div><div class='del'>-	bcmgenet_rbuf_writel(priv, rbuf_ctrl, RBUF_CTRL);</div><div class='add'>+	u32 reg;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	ret = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-static int bcmgenet_set_features(struct net_device *dev,</div><div class='del'>-				 netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	netdev_features_t changed = features ^ dev-&gt;features;</div><div class='del'>-	netdev_features_t wanted = dev-&gt;wanted_features;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	/* Make sure we reflect the value of CRC_CMD_FWD */</div><div class='add'>+	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='add'>+	priv-&gt;crc_fwd_en = !!(reg &amp; CMD_CRC_FWD);</div><div class='ctx'> </div><div class='del'>-	if (changed &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM))</div><div class='del'>-		ret = bcmgenet_set_tx_csum(dev, wanted);</div><div class='del'>-	if (changed &amp; (NETIF_F_RXCSUM))</div><div class='del'>-		ret = bcmgenet_set_rx_csum(dev, wanted);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -600,27 +825,25 @@ static void bcmgenet_set_msglevel(struct net_device *dev, u32 level)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcmgenet_get_coalesce(struct net_device *dev,</div><div class='del'>-				 struct ethtool_coalesce *ec)</div><div class='add'>+				 struct ethtool_coalesce *ec,</div><div class='add'>+				 struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct bcmgenet_rx_ring *ring;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	ec-&gt;tx_max_coalesced_frames =</div><div class='del'>-		bcmgenet_tdma_ring_readl(priv, DESC_INDEX,</div><div class='del'>-					 DMA_MBUF_DONE_THRESH);</div><div class='add'>+		bcmgenet_tdma_ring_readl(priv, 0, DMA_MBUF_DONE_THRESH);</div><div class='ctx'> 	ec-&gt;rx_max_coalesced_frames =</div><div class='del'>-		bcmgenet_rdma_ring_readl(priv, DESC_INDEX,</div><div class='del'>-					 DMA_MBUF_DONE_THRESH);</div><div class='add'>+		bcmgenet_rdma_ring_readl(priv, 0, DMA_MBUF_DONE_THRESH);</div><div class='ctx'> 	ec-&gt;rx_coalesce_usecs =</div><div class='del'>-		bcmgenet_rdma_readl(priv, DMA_RING16_TIMEOUT) * 8192 / 1000;</div><div class='add'>+		bcmgenet_rdma_readl(priv, DMA_RING0_TIMEOUT) * 8192 / 1000;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; i++) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; i++) {</div><div class='ctx'> 		ring = &amp;priv-&gt;rx_rings[i];</div><div class='ctx'> 		ec-&gt;use_adaptive_rx_coalesce |= ring-&gt;dim.use_dim;</div><div class='ctx'> 	}</div><div class='del'>-	ring = &amp;priv-&gt;rx_rings[DESC_INDEX];</div><div class='del'>-	ec-&gt;use_adaptive_rx_coalesce |= ring-&gt;dim.use_dim;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -643,7 +866,7 @@ static void bcmgenet_set_rx_coalesce(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> static void bcmgenet_set_ring_rx_coalesce(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 					  struct ethtool_coalesce *ec)</div><div class='ctx'> {</div><div class='del'>-	struct net_dim_cq_moder moder;</div><div class='add'>+	struct dim_cq_moder moder;</div><div class='ctx'> 	u32 usecs, pkts;</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;rx_coalesce_usecs = ec-&gt;rx_coalesce_usecs;</div><div class='hunk'>@@ -662,7 +885,9 @@ static void bcmgenet_set_ring_rx_coalesce(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcmgenet_set_coalesce(struct net_device *dev,</div><div class='del'>-				 struct ethtool_coalesce *ec)</div><div class='add'>+				 struct ethtool_coalesce *ec,</div><div class='add'>+				 struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -684,37 +909,72 @@ static int bcmgenet_set_coalesce(struct net_device *dev,</div><div class='ctx'> 	 * always generate an interrupt either after MBDONE packets have been</div><div class='ctx'> 	 * transmitted, or when the ring is empty.</div><div class='ctx'> 	 */</div><div class='del'>-	if (ec-&gt;tx_coalesce_usecs || ec-&gt;tx_coalesce_usecs_high ||</div><div class='del'>-	    ec-&gt;tx_coalesce_usecs_irq || ec-&gt;tx_coalesce_usecs_low ||</div><div class='del'>-	    ec-&gt;use_adaptive_tx_coalesce)</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* Program all TX queues with the same values, as there is no</div><div class='ctx'> 	 * ethtool knob to do coalescing on a per-queue basis</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; i++)</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; i++)</div><div class='ctx'> 		bcmgenet_tdma_ring_writel(priv, i,</div><div class='ctx'> 					  ec-&gt;tx_max_coalesced_frames,</div><div class='ctx'> 					  DMA_MBUF_DONE_THRESH);</div><div class='del'>-	bcmgenet_tdma_ring_writel(priv, DESC_INDEX,</div><div class='del'>-				  ec-&gt;tx_max_coalesced_frames,</div><div class='del'>-				  DMA_MBUF_DONE_THRESH);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; i++)</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; i++)</div><div class='ctx'> 		bcmgenet_set_ring_rx_coalesce(&amp;priv-&gt;rx_rings[i], ec);</div><div class='del'>-	bcmgenet_set_ring_rx_coalesce(&amp;priv-&gt;rx_rings[DESC_INDEX], ec);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bcmgenet_get_pauseparam(struct net_device *dev,</div><div class='add'>+				    struct ethtool_pauseparam *epause)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv;</div><div class='add'>+	u32 umac_cmd;</div><div class='add'>+</div><div class='add'>+	priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	epause-&gt;autoneg = priv-&gt;autoneg_pause;</div><div class='add'>+</div><div class='add'>+	if (netif_carrier_ok(dev)) {</div><div class='add'>+		/* report active state when link is up */</div><div class='add'>+		umac_cmd = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='add'>+		epause-&gt;tx_pause = !(umac_cmd &amp; CMD_TX_PAUSE_IGNORE);</div><div class='add'>+		epause-&gt;rx_pause = !(umac_cmd &amp; CMD_RX_PAUSE_IGNORE);</div><div class='add'>+	} else {</div><div class='add'>+		/* otherwise report stored settings */</div><div class='add'>+		epause-&gt;tx_pause = priv-&gt;tx_pause;</div><div class='add'>+		epause-&gt;rx_pause = priv-&gt;rx_pause;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_set_pauseparam(struct net_device *dev,</div><div class='add'>+				   struct ethtool_pauseparam *epause)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!dev-&gt;phydev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	if (!phy_validate_pause(dev-&gt;phydev, epause))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	priv-&gt;autoneg_pause = !!epause-&gt;autoneg;</div><div class='add'>+	priv-&gt;tx_pause = !!epause-&gt;tx_pause;</div><div class='add'>+	priv-&gt;rx_pause = !!epause-&gt;rx_pause;</div><div class='add'>+</div><div class='add'>+	bcmgenet_phy_pause_set(dev, priv-&gt;rx_pause, priv-&gt;tx_pause);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* standard ethtool support functions. */</div><div class='ctx'> enum bcmgenet_stat_type {</div><div class='del'>-	BCMGENET_STAT_NETDEV = -1,</div><div class='add'>+	BCMGENET_STAT_RTNL = -1,</div><div class='ctx'> 	BCMGENET_STAT_MIB_RX,</div><div class='ctx'> 	BCMGENET_STAT_MIB_TX,</div><div class='ctx'> 	BCMGENET_STAT_RUNT,</div><div class='ctx'> 	BCMGENET_STAT_MISC,</div><div class='ctx'> 	BCMGENET_STAT_SOFT,</div><div class='add'>+	BCMGENET_STAT_SOFT64,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcmgenet_stats {</div><div class='hunk'>@@ -724,13 +984,15 @@ struct bcmgenet_stats {</div><div class='ctx'> 	enum bcmgenet_stat_type type;</div><div class='ctx'> 	/* reg offset from UMAC base for misc counters */</div><div class='ctx'> 	u16 reg_offset;</div><div class='add'>+	/* sync for u64 stats counters */</div><div class='add'>+	int syncp_offset;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define STAT_NETDEV(m) { \</div><div class='add'>+#define STAT_RTNL(m) { \</div><div class='ctx'> 	.stat_string = __stringify(m), \</div><div class='del'>-	.stat_sizeof = sizeof(((struct net_device_stats *)0)-&gt;m), \</div><div class='del'>-	.stat_offset = offsetof(struct net_device_stats, m), \</div><div class='del'>-	.type = BCMGENET_STAT_NETDEV, \</div><div class='add'>+	.stat_sizeof = sizeof(((struct rtnl_link_stats64 *)0)-&gt;m), \</div><div class='add'>+	.stat_offset = offsetof(struct rtnl_link_stats64, m), \</div><div class='add'>+	.type = BCMGENET_STAT_RTNL, \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define STAT_GENET_MIB(str, m, _type) { \</div><div class='hunk'>@@ -740,6 +1002,14 @@ struct bcmgenet_stats {</div><div class='ctx'> 	.type = _type, \</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define STAT_GENET_SOFT_MIB64(str, s, m) { \</div><div class='add'>+	.stat_string = str, \</div><div class='add'>+	.stat_sizeof = sizeof(((struct bcmgenet_priv *)0)-&gt;s.m), \</div><div class='add'>+	.stat_offset = offsetof(struct bcmgenet_priv, s.m), \</div><div class='add'>+	.type = BCMGENET_STAT_SOFT64, \</div><div class='add'>+	.syncp_offset = offsetof(struct bcmgenet_priv, s.syncp), \</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define STAT_GENET_MIB_RX(str, m) STAT_GENET_MIB(str, m, BCMGENET_STAT_MIB_RX)</div><div class='ctx'> #define STAT_GENET_MIB_TX(str, m) STAT_GENET_MIB(str, m, BCMGENET_STAT_MIB_TX)</div><div class='ctx'> #define STAT_GENET_RUNT(str, m) STAT_GENET_MIB(str, m, BCMGENET_STAT_RUNT)</div><div class='hunk'>@@ -754,18 +1024,38 @@ struct bcmgenet_stats {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define STAT_GENET_Q(num) \</div><div class='del'>-	STAT_GENET_SOFT_MIB("txq" __stringify(num) "_packets", \</div><div class='del'>-			tx_rings[num].packets), \</div><div class='del'>-	STAT_GENET_SOFT_MIB("txq" __stringify(num) "_bytes", \</div><div class='del'>-			tx_rings[num].bytes), \</div><div class='del'>-	STAT_GENET_SOFT_MIB("rxq" __stringify(num) "_bytes", \</div><div class='del'>-			rx_rings[num].bytes),	 \</div><div class='del'>-	STAT_GENET_SOFT_MIB("rxq" __stringify(num) "_packets", \</div><div class='del'>-			rx_rings[num].packets), \</div><div class='del'>-	STAT_GENET_SOFT_MIB("rxq" __stringify(num) "_errors", \</div><div class='del'>-			rx_rings[num].errors), \</div><div class='del'>-	STAT_GENET_SOFT_MIB("rxq" __stringify(num) "_dropped", \</div><div class='del'>-			rx_rings[num].dropped)</div><div class='add'>+	STAT_GENET_SOFT_MIB64("txq" __stringify(num) "_packets", \</div><div class='add'>+			tx_rings[num].stats64, packets), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("txq" __stringify(num) "_bytes", \</div><div class='add'>+			tx_rings[num].stats64, bytes), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("txq" __stringify(num) "_errors", \</div><div class='add'>+			tx_rings[num].stats64, errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("txq" __stringify(num) "_dropped", \</div><div class='add'>+			tx_rings[num].stats64, dropped), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_bytes", \</div><div class='add'>+			rx_rings[num].stats64, bytes),	 \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_packets", \</div><div class='add'>+			rx_rings[num].stats64, packets), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_errors", \</div><div class='add'>+			rx_rings[num].stats64, errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_dropped", \</div><div class='add'>+			rx_rings[num].stats64, dropped), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_multicast", \</div><div class='add'>+			rx_rings[num].stats64, multicast), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_missed", \</div><div class='add'>+			rx_rings[num].stats64, missed), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_length_errors", \</div><div class='add'>+			rx_rings[num].stats64, length_errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_over_errors", \</div><div class='add'>+			rx_rings[num].stats64, over_errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_crc_errors", \</div><div class='add'>+			rx_rings[num].stats64, crc_errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_frame_errors", \</div><div class='add'>+			rx_rings[num].stats64, frame_errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_fragmented_errors", \</div><div class='add'>+			rx_rings[num].stats64, fragmented_errors), \</div><div class='add'>+	STAT_GENET_SOFT_MIB64("rxq" __stringify(num) "_broadcast", \</div><div class='add'>+			rx_rings[num].stats64, broadcast)</div><div class='ctx'> </div><div class='ctx'> /* There is a 0xC gap between the end of RX and beginning of TX stats and then</div><div class='ctx'>  * between the end of TX stats and the beginning of the RX RUNT</div><div class='hunk'>@@ -777,15 +1067,20 @@ struct bcmgenet_stats {</div><div class='ctx'>  */</div><div class='ctx'> static const struct bcmgenet_stats bcmgenet_gstrings_stats[] = {</div><div class='ctx'> 	/* general stats */</div><div class='del'>-	STAT_NETDEV(rx_packets),</div><div class='del'>-	STAT_NETDEV(tx_packets),</div><div class='del'>-	STAT_NETDEV(rx_bytes),</div><div class='del'>-	STAT_NETDEV(tx_bytes),</div><div class='del'>-	STAT_NETDEV(rx_errors),</div><div class='del'>-	STAT_NETDEV(tx_errors),</div><div class='del'>-	STAT_NETDEV(rx_dropped),</div><div class='del'>-	STAT_NETDEV(tx_dropped),</div><div class='del'>-	STAT_NETDEV(multicast),</div><div class='add'>+	STAT_RTNL(rx_packets),</div><div class='add'>+	STAT_RTNL(tx_packets),</div><div class='add'>+	STAT_RTNL(rx_bytes),</div><div class='add'>+	STAT_RTNL(tx_bytes),</div><div class='add'>+	STAT_RTNL(rx_errors),</div><div class='add'>+	STAT_RTNL(tx_errors),</div><div class='add'>+	STAT_RTNL(rx_dropped),</div><div class='add'>+	STAT_RTNL(tx_dropped),</div><div class='add'>+	STAT_RTNL(multicast),</div><div class='add'>+	STAT_RTNL(rx_missed_errors),</div><div class='add'>+	STAT_RTNL(rx_length_errors),</div><div class='add'>+	STAT_RTNL(rx_over_errors),</div><div class='add'>+	STAT_RTNL(rx_crc_errors),</div><div class='add'>+	STAT_RTNL(rx_frame_errors),</div><div class='ctx'> 	/* UniMAC RSV counters */</div><div class='ctx'> 	STAT_GENET_MIB_RX("rx_64_octets", mib.rx.pkt_cnt.cnt_64),</div><div class='ctx'> 	STAT_GENET_MIB_RX("rx_65_127_oct", mib.rx.pkt_cnt.cnt_127),</div><div class='hunk'>@@ -860,21 +1155,37 @@ static const struct bcmgenet_stats bcmgenet_gstrings_stats[] = {</div><div class='ctx'> 	STAT_GENET_SOFT_MIB("alloc_rx_buff_failed", mib.alloc_rx_buff_failed),</div><div class='ctx'> 	STAT_GENET_SOFT_MIB("rx_dma_failed", mib.rx_dma_failed),</div><div class='ctx'> 	STAT_GENET_SOFT_MIB("tx_dma_failed", mib.tx_dma_failed),</div><div class='add'>+	STAT_GENET_SOFT_MIB("tx_realloc_tsb", mib.tx_realloc_tsb),</div><div class='add'>+	STAT_GENET_SOFT_MIB("tx_realloc_tsb_failed",</div><div class='add'>+			    mib.tx_realloc_tsb_failed),</div><div class='ctx'> 	/* Per TX queues */</div><div class='ctx'> 	STAT_GENET_Q(0),</div><div class='ctx'> 	STAT_GENET_Q(1),</div><div class='ctx'> 	STAT_GENET_Q(2),</div><div class='ctx'> 	STAT_GENET_Q(3),</div><div class='del'>-	STAT_GENET_Q(16),</div><div class='add'>+	STAT_GENET_Q(4),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BCMGENET_STATS_LEN	ARRAY_SIZE(bcmgenet_gstrings_stats)</div><div class='ctx'> </div><div class='add'>+#define BCMGENET_STATS64_ADD(stats, m, v) \</div><div class='add'>+	do { \</div><div class='add'>+		u64_stats_update_begin(&amp;stats-&gt;syncp); \</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;m, v); \</div><div class='add'>+		u64_stats_update_end(&amp;stats-&gt;syncp); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+#define BCMGENET_STATS64_INC(stats, m) \</div><div class='add'>+	do { \</div><div class='add'>+		u64_stats_update_begin(&amp;stats-&gt;syncp); \</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;m); \</div><div class='add'>+		u64_stats_update_end(&amp;stats-&gt;syncp); \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='ctx'> static void bcmgenet_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				 struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, "bcmgenet", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, "v2.0", sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, "bcmgenet", sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int bcmgenet_get_sset_count(struct net_device *dev, int string_set)</div><div class='hunk'>@@ -890,14 +1201,14 @@ static int bcmgenet_get_sset_count(struct net_device *dev, int string_set)</div><div class='ctx'> static void bcmgenet_get_strings(struct net_device *dev, u32 stringset,</div><div class='ctx'> 				 u8 *data)</div><div class='ctx'> {</div><div class='add'>+	const char *str;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='ctx'> 		for (i = 0; i &lt; BCMGENET_STATS_LEN; i++) {</div><div class='del'>-			memcpy(data + i * ETH_GSTRING_LEN,</div><div class='del'>-			       bcmgenet_gstrings_stats[i].stat_string,</div><div class='del'>-			       ETH_GSTRING_LEN);</div><div class='add'>+			str = bcmgenet_gstrings_stats[i].stat_string;</div><div class='add'>+			ethtool_puts(&amp;data, str);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -954,15 +1265,16 @@ static void bcmgenet_update_mib_counters(struct bcmgenet_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 		s = &amp;bcmgenet_gstrings_stats[i];</div><div class='ctx'> 		switch (s-&gt;type) {</div><div class='del'>-		case BCMGENET_STAT_NETDEV:</div><div class='add'>+		case BCMGENET_STAT_RTNL:</div><div class='ctx'> 		case BCMGENET_STAT_SOFT:</div><div class='add'>+		case BCMGENET_STAT_SOFT64:</div><div class='ctx'> 			continue;</div><div class='ctx'> 		case BCMGENET_STAT_RUNT:</div><div class='ctx'> 			offset += BCMGENET_STAT_OFFSET;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case BCMGENET_STAT_MIB_TX:</div><div class='ctx'> 			offset += BCMGENET_STAT_OFFSET;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case BCMGENET_STAT_MIB_RX:</div><div class='ctx'> 			val = bcmgenet_umac_readl(priv,</div><div class='ctx'> 						  UMAC_MIB_START + j + offset);</div><div class='hunk'>@@ -993,30 +1305,45 @@ static void bcmgenet_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 				       u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct rtnl_link_stats64 stats64;</div><div class='add'>+	struct u64_stats_sync *syncp;</div><div class='add'>+	unsigned int start;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		bcmgenet_update_mib_counters(priv);</div><div class='ctx'> </div><div class='add'>+	dev_get_stats(dev, &amp;stats64);</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; BCMGENET_STATS_LEN; i++) {</div><div class='ctx'> 		const struct bcmgenet_stats *s;</div><div class='ctx'> 		char *p;</div><div class='ctx'> </div><div class='ctx'> 		s = &amp;bcmgenet_gstrings_stats[i];</div><div class='del'>-		if (s-&gt;type == BCMGENET_STAT_NETDEV)</div><div class='del'>-			p = (char *)&amp;dev-&gt;stats;</div><div class='del'>-		else</div><div class='del'>-			p = (char *)priv;</div><div class='del'>-		p += s-&gt;stat_offset;</div><div class='del'>-		if (sizeof(unsigned long) != sizeof(u32) &amp;&amp;</div><div class='del'>-		    s-&gt;stat_sizeof == sizeof(unsigned long))</div><div class='del'>-			data[i] = *(unsigned long *)p;</div><div class='del'>-		else</div><div class='del'>-			data[i] = *(u32 *)p;</div><div class='add'>+		p = (char *)priv;</div><div class='add'>+</div><div class='add'>+		if (s-&gt;type == BCMGENET_STAT_SOFT64) {</div><div class='add'>+			syncp = (struct u64_stats_sync *)(p + s-&gt;syncp_offset);</div><div class='add'>+			do {</div><div class='add'>+				start = u64_stats_fetch_begin(syncp);</div><div class='add'>+				data[i] = u64_stats_read((u64_stats_t *)(p + s-&gt;stat_offset));</div><div class='add'>+			} while (u64_stats_fetch_retry(syncp, start));</div><div class='add'>+		} else {</div><div class='add'>+			if (s-&gt;type == BCMGENET_STAT_RTNL)</div><div class='add'>+				p = (char *)&amp;stats64;</div><div class='add'>+</div><div class='add'>+			p += s-&gt;stat_offset;</div><div class='add'>+			if (sizeof(unsigned long) != sizeof(u32) &amp;&amp;</div><div class='add'>+				s-&gt;stat_sizeof == sizeof(unsigned long))</div><div class='add'>+				data[i] = *(unsigned long *)p;</div><div class='add'>+			else</div><div class='add'>+				data[i] = *(u32 *)p;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcmgenet_eee_enable_set(struct net_device *dev, bool enable)</div><div class='add'>+void bcmgenet_eee_enable_set(struct net_device *dev, bool enable,</div><div class='add'>+			     bool tx_lpi_enabled)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 off = priv-&gt;hw_params-&gt;tbuf_offset + TBUF_ENERGY_CTRL;</div><div class='hunk'>@@ -1036,7 +1363,7 @@ static void bcmgenet_eee_enable_set(struct net_device *dev, bool enable)</div><div class='ctx'> </div><div class='ctx'> 	/* Enable EEE and switch to a 27Mhz clock automatically */</div><div class='ctx'> 	reg = bcmgenet_readl(priv-&gt;base + off);</div><div class='del'>-	if (enable)</div><div class='add'>+	if (tx_lpi_enabled)</div><div class='ctx'> 		reg |= TBUF_EEE_EN | TBUF_PM_EN;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~(TBUF_EEE_EN | TBUF_PM_EN);</div><div class='hunk'>@@ -1056,13 +1383,13 @@ static void bcmgenet_eee_enable_set(struct net_device *dev, bool enable)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;eee.eee_enabled = enable;</div><div class='del'>-	priv-&gt;eee.eee_active = enable;</div><div class='add'>+	priv-&gt;eee.tx_lpi_enabled = tx_lpi_enabled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcmgenet_get_eee(struct net_device *dev, struct ethtool_eee *e)</div><div class='add'>+static int bcmgenet_get_eee(struct net_device *dev, struct ethtool_keee *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct ethtool_eee *p = &amp;priv-&gt;eee;</div><div class='add'>+	struct ethtool_keee *p = &amp;priv-&gt;eee;</div><div class='ctx'> </div><div class='ctx'> 	if (GENET_IS_V1(priv))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1070,18 +1397,17 @@ static int bcmgenet_get_eee(struct net_device *dev, struct ethtool_eee *e)</div><div class='ctx'> 	if (!dev-&gt;phydev)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	e-&gt;eee_enabled = p-&gt;eee_enabled;</div><div class='del'>-	e-&gt;eee_active = p-&gt;eee_active;</div><div class='add'>+	e-&gt;tx_lpi_enabled = p-&gt;tx_lpi_enabled;</div><div class='ctx'> 	e-&gt;tx_lpi_timer = bcmgenet_umac_readl(priv, UMAC_EEE_LPI_TIMER);</div><div class='ctx'> </div><div class='ctx'> 	return phy_ethtool_get_eee(dev-&gt;phydev, e);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcmgenet_set_eee(struct net_device *dev, struct ethtool_eee *e)</div><div class='add'>+static int bcmgenet_set_eee(struct net_device *dev, struct ethtool_keee *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct ethtool_eee *p = &amp;priv-&gt;eee;</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct ethtool_keee *p = &amp;priv-&gt;eee;</div><div class='add'>+	bool active;</div><div class='ctx'> </div><div class='ctx'> 	if (GENET_IS_V1(priv))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -1092,23 +1418,271 @@ static int bcmgenet_set_eee(struct net_device *dev, struct ethtool_eee *e)</div><div class='ctx'> 	p-&gt;eee_enabled = e-&gt;eee_enabled;</div><div class='ctx'> </div><div class='ctx'> 	if (!p-&gt;eee_enabled) {</div><div class='del'>-		bcmgenet_eee_enable_set(dev, false);</div><div class='add'>+		bcmgenet_eee_enable_set(dev, false, false);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = phy_init_eee(dev-&gt;phydev, 0);</div><div class='del'>-		if (ret) {</div><div class='del'>-			netif_err(priv, hw, dev, "EEE initialization failed\n");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='del'>-</div><div class='add'>+		active = phy_init_eee(dev-&gt;phydev, false) &gt;= 0;</div><div class='ctx'> 		bcmgenet_umac_writel(priv, e-&gt;tx_lpi_timer, UMAC_EEE_LPI_TIMER);</div><div class='del'>-		bcmgenet_eee_enable_set(dev, true);</div><div class='add'>+		bcmgenet_eee_enable_set(dev, active, e-&gt;tx_lpi_enabled);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return phy_ethtool_set_eee(dev-&gt;phydev, e);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bcmgenet_validate_flow(struct net_device *dev,</div><div class='add'>+				  struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_usrip4_spec *l4_mask;</div><div class='add'>+	struct ethhdr *eth_mask;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.location &gt;= MAX_NUM_OF_FS_RULES &amp;&amp;</div><div class='add'>+	    cmd-&gt;fs.location != RX_CLS_LOC_ANY) {</div><div class='add'>+		netdev_err(dev, "rxnfc: Invalid location (%d)\n",</div><div class='add'>+			   cmd-&gt;fs.location);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;fs.flow_type &amp; ~(FLOW_EXT | FLOW_MAC_EXT)) {</div><div class='add'>+	case IP_USER_FLOW:</div><div class='add'>+		l4_mask = &amp;cmd-&gt;fs.m_u.usr_ip4_spec;</div><div class='add'>+		/* don't allow mask which isn't valid */</div><div class='add'>+		if (VALIDATE_MASK(l4_mask-&gt;ip4src) ||</div><div class='add'>+		    VALIDATE_MASK(l4_mask-&gt;ip4dst) ||</div><div class='add'>+		    VALIDATE_MASK(l4_mask-&gt;l4_4_bytes) ||</div><div class='add'>+		    VALIDATE_MASK(l4_mask-&gt;proto) ||</div><div class='add'>+		    VALIDATE_MASK(l4_mask-&gt;ip_ver) ||</div><div class='add'>+		    VALIDATE_MASK(l4_mask-&gt;tos)) {</div><div class='add'>+			netdev_err(dev, "rxnfc: Unsupported mask\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ETHER_FLOW:</div><div class='add'>+		eth_mask = &amp;cmd-&gt;fs.m_u.ether_spec;</div><div class='add'>+		/* don't allow mask which isn't valid */</div><div class='add'>+		if (VALIDATE_MASK(eth_mask-&gt;h_dest) ||</div><div class='add'>+		    VALIDATE_MASK(eth_mask-&gt;h_source) ||</div><div class='add'>+		    VALIDATE_MASK(eth_mask-&gt;h_proto)) {</div><div class='add'>+			netdev_err(dev, "rxnfc: Unsupported mask\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_err(dev, "rxnfc: Unsupported flow type (0x%x)\n",</div><div class='add'>+			   cmd-&gt;fs.flow_type);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cmd-&gt;fs.flow_type &amp; FLOW_EXT)) {</div><div class='add'>+		/* don't allow mask which isn't valid */</div><div class='add'>+		if (VALIDATE_MASK(cmd-&gt;fs.m_ext.vlan_etype) ||</div><div class='add'>+		    VALIDATE_MASK(cmd-&gt;fs.m_ext.vlan_tci)) {</div><div class='add'>+			netdev_err(dev, "rxnfc: Unsupported mask\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (cmd-&gt;fs.m_ext.data[0] || cmd-&gt;fs.m_ext.data[1]) {</div><div class='add'>+			netdev_err(dev, "rxnfc: user-def not supported\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((cmd-&gt;fs.flow_type &amp; FLOW_MAC_EXT)) {</div><div class='add'>+		/* don't allow mask which isn't valid */</div><div class='add'>+		if (VALIDATE_MASK(cmd-&gt;fs.m_ext.h_dest)) {</div><div class='add'>+			netdev_err(dev, "rxnfc: Unsupported mask\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_insert_flow(struct net_device *dev,</div><div class='add'>+				struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct bcmgenet_rxnfc_rule *loc_rule;</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;hw_params-&gt;hfb_filter_size &lt; 128) {</div><div class='add'>+		netdev_err(dev, "rxnfc: Not supported by this device\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.ring_cookie &gt; priv-&gt;hw_params-&gt;rx_queues &amp;&amp;</div><div class='add'>+	    cmd-&gt;fs.ring_cookie != RX_CLS_FLOW_WAKE &amp;&amp;</div><div class='add'>+	    cmd-&gt;fs.ring_cookie != RX_CLS_FLOW_DISC) {</div><div class='add'>+		netdev_err(dev, "rxnfc: Unsupported action (%llu)\n",</div><div class='add'>+			   cmd-&gt;fs.ring_cookie);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = bcmgenet_validate_flow(dev, cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.location == RX_CLS_LOC_ANY) {</div><div class='add'>+		list_for_each_entry(loc_rule, &amp;priv-&gt;rxnfc_list, list) {</div><div class='add'>+			cmd-&gt;fs.location = loc_rule-&gt;fs.location;</div><div class='add'>+			err = memcmp(&amp;loc_rule-&gt;fs, &amp;cmd-&gt;fs,</div><div class='add'>+				     sizeof(struct ethtool_rx_flow_spec));</div><div class='add'>+			if (!err)</div><div class='add'>+				/* rule exists so return current location */</div><div class='add'>+				return 0;</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; MAX_NUM_OF_FS_RULES; i++) {</div><div class='add'>+			loc_rule = &amp;priv-&gt;rxnfc_rules[i];</div><div class='add'>+			if (loc_rule-&gt;state == BCMGENET_RXNFC_STATE_UNUSED) {</div><div class='add'>+				cmd-&gt;fs.location = i;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (i == MAX_NUM_OF_FS_RULES) {</div><div class='add'>+			cmd-&gt;fs.location = RX_CLS_LOC_ANY;</div><div class='add'>+			return -ENOSPC;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		loc_rule = &amp;priv-&gt;rxnfc_rules[cmd-&gt;fs.location];</div><div class='add'>+	}</div><div class='add'>+	if (loc_rule-&gt;state == BCMGENET_RXNFC_STATE_ENABLED)</div><div class='add'>+		bcmgenet_hfb_disable_filter(priv, cmd-&gt;fs.location + 1);</div><div class='add'>+	if (loc_rule-&gt;state != BCMGENET_RXNFC_STATE_UNUSED) {</div><div class='add'>+		list_del(&amp;loc_rule-&gt;list);</div><div class='add'>+		bcmgenet_hfb_clear_filter(priv, cmd-&gt;fs.location + 1);</div><div class='add'>+	}</div><div class='add'>+	loc_rule-&gt;state = BCMGENET_RXNFC_STATE_UNUSED;</div><div class='add'>+	memcpy(&amp;loc_rule-&gt;fs, &amp;cmd-&gt;fs,</div><div class='add'>+	       sizeof(struct ethtool_rx_flow_spec));</div><div class='add'>+</div><div class='add'>+	bcmgenet_hfb_create_rxnfc_filter(priv, loc_rule);</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;loc_rule-&gt;list, &amp;priv-&gt;rxnfc_list);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_delete_flow(struct net_device *dev,</div><div class='add'>+				struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct bcmgenet_rxnfc_rule *rule;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.location &gt;= MAX_NUM_OF_FS_RULES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rule = &amp;priv-&gt;rxnfc_rules[cmd-&gt;fs.location];</div><div class='add'>+	if (rule-&gt;state == BCMGENET_RXNFC_STATE_UNUSED) {</div><div class='add'>+		err =  -ENOENT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;state == BCMGENET_RXNFC_STATE_ENABLED)</div><div class='add'>+		bcmgenet_hfb_disable_filter(priv, cmd-&gt;fs.location + 1);</div><div class='add'>+	if (rule-&gt;state != BCMGENET_RXNFC_STATE_UNUSED) {</div><div class='add'>+		list_del(&amp;rule-&gt;list);</div><div class='add'>+		bcmgenet_hfb_clear_filter(priv, cmd-&gt;fs.location + 1);</div><div class='add'>+	}</div><div class='add'>+	rule-&gt;state = BCMGENET_RXNFC_STATE_UNUSED;</div><div class='add'>+	memset(&amp;rule-&gt;fs, 0, sizeof(struct ethtool_rx_flow_spec));</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		err = bcmgenet_insert_flow(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		err = bcmgenet_delete_flow(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		netdev_warn(priv-&gt;dev, "Unsupported ethtool command. (%d)\n",</div><div class='add'>+			    cmd-&gt;cmd);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_get_flow(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='add'>+			     int loc)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct bcmgenet_rxnfc_rule *rule;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (loc &lt; 0 || loc &gt;= MAX_NUM_OF_FS_RULES)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	rule = &amp;priv-&gt;rxnfc_rules[loc];</div><div class='add'>+	if (rule-&gt;state == BCMGENET_RXNFC_STATE_UNUSED)</div><div class='add'>+		err = -ENOENT;</div><div class='add'>+	else</div><div class='add'>+		memcpy(&amp;cmd-&gt;fs, &amp;rule-&gt;fs,</div><div class='add'>+		       sizeof(struct ethtool_rx_flow_spec));</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_get_num_flows(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct list_head *pos;</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each(pos, &amp;priv-&gt;rxnfc_list)</div><div class='add'>+		res++;</div><div class='add'>+</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 bcmgenet_get_rx_ring_count(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;hw_params-&gt;rx_queues ?: 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='add'>+			      u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct bcmgenet_rxnfc_rule *rule;</div><div class='add'>+	int err = 0;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		cmd-&gt;rule_cnt = bcmgenet_get_num_flows(priv);</div><div class='add'>+		cmd-&gt;data = MAX_NUM_OF_FS_RULES | RX_CLS_LOC_SPECIAL;</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		err = bcmgenet_get_flow(dev, cmd, cmd-&gt;fs.location);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		list_for_each_entry(rule, &amp;priv-&gt;rxnfc_list, list)</div><div class='add'>+			if (i &lt; cmd-&gt;rule_cnt)</div><div class='add'>+				rule_locs[i++] = rule-&gt;fs.location;</div><div class='add'>+		cmd-&gt;rule_cnt = i;</div><div class='add'>+		cmd-&gt;data = MAX_NUM_OF_FS_RULES;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* standard ethtool support functions. */</div><div class='ctx'> static const struct ethtool_ops bcmgenet_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,</div><div class='ctx'> 	.begin			= bcmgenet_begin,</div><div class='ctx'> 	.complete		= bcmgenet_complete,</div><div class='ctx'> 	.get_strings		= bcmgenet_get_strings,</div><div class='hunk'>@@ -1127,6 +1701,12 @@ static const struct ethtool_ops bcmgenet_ethtool_ops = {</div><div class='ctx'> 	.set_coalesce		= bcmgenet_set_coalesce,</div><div class='ctx'> 	.get_link_ksettings	= bcmgenet_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings	= bcmgenet_set_link_ksettings,</div><div class='add'>+	.get_ts_info		= ethtool_op_get_ts_info,</div><div class='add'>+	.get_rxnfc		= bcmgenet_get_rxnfc,</div><div class='add'>+	.set_rxnfc		= bcmgenet_set_rxnfc,</div><div class='add'>+	.get_rx_ring_count	= bcmgenet_get_rx_ring_count,</div><div class='add'>+	.get_pauseparam		= bcmgenet_get_pauseparam,</div><div class='add'>+	.set_pauseparam		= bcmgenet_set_pauseparam,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Power down the unimac, based on mode. */</div><div class='hunk'>@@ -1147,9 +1727,9 @@ static int bcmgenet_power_down(struct bcmgenet_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	case GENET_POWER_PASSIVE:</div><div class='ctx'> 		/* Power down LED */</div><div class='del'>-		if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_EXT) {</div><div class='add'>+		if (bcmgenet_has_ext(priv)) {</div><div class='ctx'> 			reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);</div><div class='del'>-			if (GENET_IS_V5(priv))</div><div class='add'>+			if (GENET_IS_V5(priv) &amp;&amp; !bcmgenet_has_ephy_16nm(priv))</div><div class='ctx'> 				reg |= EXT_PWR_DOWN_PHY_EN |</div><div class='ctx'> 				       EXT_PWR_DOWN_PHY_RD |</div><div class='ctx'> 				       EXT_PWR_DOWN_PHY_SD |</div><div class='hunk'>@@ -1172,20 +1752,22 @@ static int bcmgenet_power_down(struct bcmgenet_priv *priv,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcmgenet_power_up(struct bcmgenet_priv *priv,</div><div class='del'>-			      enum bcmgenet_power_mode mode)</div><div class='add'>+static int bcmgenet_power_up(struct bcmgenet_priv *priv,</div><div class='add'>+			     enum bcmgenet_power_mode mode)</div><div class='ctx'> {</div><div class='add'>+	int ret = 0;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	if (!(priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_EXT))</div><div class='del'>-		return;</div><div class='add'>+	if (!bcmgenet_has_ext(priv))</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);</div><div class='ctx'> </div><div class='ctx'> 	switch (mode) {</div><div class='ctx'> 	case GENET_POWER_PASSIVE:</div><div class='del'>-		reg &amp;= ~(EXT_PWR_DOWN_DLL | EXT_PWR_DOWN_BIAS);</div><div class='del'>-		if (GENET_IS_V5(priv)) {</div><div class='add'>+		reg &amp;= ~(EXT_PWR_DOWN_DLL | EXT_PWR_DOWN_BIAS |</div><div class='add'>+			 EXT_ENERGY_DET_MASK);</div><div class='add'>+		if (GENET_IS_V5(priv) &amp;&amp; !bcmgenet_has_ephy_16nm(priv)) {</div><div class='ctx'> 			reg &amp;= ~(EXT_PWR_DOWN_PHY_EN |</div><div class='ctx'> 				 EXT_PWR_DOWN_PHY_RD |</div><div class='ctx'> 				 EXT_PWR_DOWN_PHY_SD |</div><div class='hunk'>@@ -1213,23 +1795,13 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case GENET_POWER_WOL_MAGIC:</div><div class='del'>-		bcmgenet_wol_power_up_cfg(priv, mode);</div><div class='del'>-		return;</div><div class='add'>+		ret = bcmgenet_wol_power_up_cfg(priv, mode);</div><div class='add'>+		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ioctl handle special commands that are not present in ethtool. */</div><div class='del'>-static int bcmgenet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!dev-&gt;phydev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return phy_mii_ioctl(dev-&gt;phydev, rq, cmd);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct enet_cb *bcmgenet_get_txcb(struct bcmgenet_priv *priv,</div><div class='hunk'>@@ -1266,18 +1838,6 @@ static struct enet_cb *bcmgenet_put_txcb(struct bcmgenet_priv *priv,</div><div class='ctx'> 	return tx_cb_ptr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bcmgenet_rx_ring16_int_disable(struct bcmgenet_rx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	bcmgenet_intrl2_0_writel(ring-&gt;priv, UMAC_IRQ_RXDMA_DONE,</div><div class='del'>-				 INTRL2_CPU_MASK_SET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bcmgenet_rx_ring16_int_enable(struct bcmgenet_rx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	bcmgenet_intrl2_0_writel(ring-&gt;priv, UMAC_IRQ_RXDMA_DONE,</div><div class='del'>-				 INTRL2_CPU_MASK_CLEAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void bcmgenet_rx_ring_int_disable(struct bcmgenet_rx_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	bcmgenet_intrl2_1_writel(ring-&gt;priv,</div><div class='hunk'>@@ -1292,18 +1852,6 @@ static inline void bcmgenet_rx_ring_int_enable(struct bcmgenet_rx_ring *ring)</div><div class='ctx'> 				 INTRL2_CPU_MASK_CLEAR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void bcmgenet_tx_ring16_int_disable(struct bcmgenet_tx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	bcmgenet_intrl2_0_writel(ring-&gt;priv, UMAC_IRQ_TXDMA_DONE,</div><div class='del'>-				 INTRL2_CPU_MASK_SET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void bcmgenet_tx_ring16_int_enable(struct bcmgenet_tx_ring *ring)</div><div class='del'>-{</div><div class='del'>-	bcmgenet_intrl2_0_writel(ring-&gt;priv, UMAC_IRQ_TXDMA_DONE,</div><div class='del'>-				 INTRL2_CPU_MASK_CLEAR);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline void bcmgenet_tx_ring_int_enable(struct bcmgenet_tx_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	bcmgenet_intrl2_1_writel(ring-&gt;priv, 1 &lt;&lt; ring-&gt;index,</div><div class='hunk'>@@ -1375,6 +1923,7 @@ static struct sk_buff *bcmgenet_free_rx_cb(struct device *dev,</div><div class='ctx'> static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,</div><div class='ctx'> 					  struct bcmgenet_tx_ring *ring)</div><div class='ctx'> {</div><div class='add'>+	struct bcmgenet_tx_stats64 *stats = &amp;ring-&gt;stats64;</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	unsigned int txbds_processed = 0;</div><div class='ctx'> 	unsigned int bytes_compl = 0;</div><div class='hunk'>@@ -1384,12 +1933,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	/* Clear status before servicing to reduce spurious interrupts */</div><div class='del'>-	if (ring-&gt;index == DESC_INDEX)</div><div class='del'>-		bcmgenet_intrl2_0_writel(priv, UMAC_IRQ_TXDMA_DONE,</div><div class='del'>-					 INTRL2_CPU_CLEAR);</div><div class='del'>-	else</div><div class='del'>-		bcmgenet_intrl2_1_writel(priv, (1 &lt;&lt; ring-&gt;index),</div><div class='del'>-					 INTRL2_CPU_CLEAR);</div><div class='add'>+	bcmgenet_intrl2_1_writel(priv, (1 &lt;&lt; ring-&gt;index), INTRL2_CPU_CLEAR);</div><div class='ctx'> </div><div class='ctx'> 	/* Compute how many buffers are transmitted since last xmit call */</div><div class='ctx'> 	c_index = bcmgenet_tdma_ring_readl(priv, ring-&gt;index, TDMA_CONS_INDEX)</div><div class='hunk'>@@ -1420,22 +1964,51 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev,</div><div class='ctx'> 	ring-&gt;free_bds += txbds_processed;</div><div class='ctx'> 	ring-&gt;c_index = c_index;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;packets += pkts_compl;</div><div class='del'>-	ring-&gt;bytes += bytes_compl;</div><div class='add'>+	u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+	u64_stats_add(&amp;stats-&gt;packets, pkts_compl);</div><div class='add'>+	u64_stats_add(&amp;stats-&gt;bytes, bytes_compl);</div><div class='add'>+	u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='ctx'> </div><div class='del'>-	netdev_tx_completed_queue(netdev_get_tx_queue(dev, ring-&gt;queue),</div><div class='add'>+	netdev_tx_completed_queue(netdev_get_tx_queue(dev, ring-&gt;index),</div><div class='ctx'> 				  pkts_compl, bytes_compl);</div><div class='ctx'> </div><div class='ctx'> 	return txbds_processed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int bcmgenet_tx_reclaim(struct net_device *dev,</div><div class='del'>-				struct bcmgenet_tx_ring *ring)</div><div class='add'>+				struct bcmgenet_tx_ring *ring,</div><div class='add'>+				bool all)</div><div class='ctx'> {</div><div class='del'>-	unsigned int released;</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	unsigned int released, drop, wr_ptr;</div><div class='add'>+	struct enet_cb *cb_ptr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;ring-&gt;lock);</div><div class='ctx'> 	released = __bcmgenet_tx_reclaim(dev, ring);</div><div class='add'>+	if (all) {</div><div class='add'>+		skb = NULL;</div><div class='add'>+		drop = (ring-&gt;prod_index - ring-&gt;c_index) &amp; DMA_C_INDEX_MASK;</div><div class='add'>+		released += drop;</div><div class='add'>+		ring-&gt;prod_index = ring-&gt;c_index &amp; DMA_C_INDEX_MASK;</div><div class='add'>+		while (drop--) {</div><div class='add'>+			cb_ptr = bcmgenet_put_txcb(priv, ring);</div><div class='add'>+			skb = cb_ptr-&gt;skb;</div><div class='add'>+			bcmgenet_free_tx_cb(kdev, cb_ptr);</div><div class='add'>+			if (skb &amp;&amp; cb_ptr == GENET_CB(skb)-&gt;first_cb) {</div><div class='add'>+				dev_consume_skb_any(skb);</div><div class='add'>+				skb = NULL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (skb)</div><div class='add'>+			dev_consume_skb_any(skb);</div><div class='add'>+		bcmgenet_tdma_ring_writel(priv, ring-&gt;index,</div><div class='add'>+					  ring-&gt;prod_index, TDMA_PROD_INDEX);</div><div class='add'>+		wr_ptr = ring-&gt;write_ptr * WORDS_PER_BD(priv);</div><div class='add'>+		bcmgenet_tdma_ring_writel(priv, ring-&gt;index, wr_ptr,</div><div class='add'>+					  TDMA_WRITE_PTR);</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_bh(&amp;ring-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return released;</div><div class='hunk'>@@ -1451,14 +2024,14 @@ static int bcmgenet_tx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	spin_lock(&amp;ring-&gt;lock);</div><div class='ctx'> 	work_done = __bcmgenet_tx_reclaim(ring-&gt;priv-&gt;dev, ring);</div><div class='ctx'> 	if (ring-&gt;free_bds &gt; (MAX_SKB_FRAGS + 1)) {</div><div class='del'>-		txq = netdev_get_tx_queue(ring-&gt;priv-&gt;dev, ring-&gt;queue);</div><div class='add'>+		txq = netdev_get_tx_queue(ring-&gt;priv-&gt;dev, ring-&gt;index);</div><div class='ctx'> 		netif_tx_wake_queue(txq);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock(&amp;ring-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (work_done == 0) {</div><div class='ctx'> 		napi_complete(napi);</div><div class='del'>-		ring-&gt;int_enable(ring);</div><div class='add'>+		bcmgenet_tx_ring_int_enable(ring);</div><div class='ctx'> </div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1469,22 +2042,22 @@ static int bcmgenet_tx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> static void bcmgenet_tx_reclaim_all(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (netif_is_multiqueue(dev)) {</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; i++)</div><div class='del'>-			bcmgenet_tx_reclaim(dev, &amp;priv-&gt;tx_rings[i]);</div><div class='del'>-	}</div><div class='add'>+	int i = 0;</div><div class='ctx'> </div><div class='del'>-	bcmgenet_tx_reclaim(dev, &amp;priv-&gt;tx_rings[DESC_INDEX]);</div><div class='add'>+	do {</div><div class='add'>+		bcmgenet_tx_reclaim(dev, &amp;priv-&gt;tx_rings[i++], true);</div><div class='add'>+	} while (i &lt;= priv-&gt;hw_params-&gt;tx_queues &amp;&amp; netif_is_multiqueue(dev));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Reallocate the SKB to put enough headroom in front of it and insert</div><div class='ctx'>  * the transmit checksum offsets in the descriptors</div><div class='ctx'>  */</div><div class='del'>-static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,</div><div class='del'>-					    struct sk_buff *skb)</div><div class='add'>+static struct sk_buff *bcmgenet_add_tsb(struct net_device *dev,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					struct bcmgenet_tx_ring *ring)</div><div class='ctx'> {</div><div class='add'>+	struct bcmgenet_tx_stats64 *stats = &amp;ring-&gt;stats64;</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct status_64 *status = NULL;</div><div class='ctx'> 	struct sk_buff *new_skb;</div><div class='ctx'> 	u16 offset;</div><div class='hunk'>@@ -1497,12 +2070,15 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,</div><div class='ctx'> 		 * enough headroom for us to insert 64B status block.</div><div class='ctx'> 		 */</div><div class='ctx'> 		new_skb = skb_realloc_headroom(skb, sizeof(*status));</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='ctx'> 		if (!new_skb) {</div><div class='del'>-			dev-&gt;stats.tx_dropped++;</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			priv-&gt;mib.tx_realloc_tsb_failed++;</div><div class='add'>+			BCMGENET_STATS64_INC(stats, dropped);</div><div class='ctx'> 			return NULL;</div><div class='ctx'> 		}</div><div class='add'>+		dev_consume_skb_any(skb);</div><div class='ctx'> 		skb = new_skb;</div><div class='add'>+		priv-&gt;mib.tx_realloc_tsb++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_push(skb, sizeof(*status));</div><div class='hunk'>@@ -1518,24 +2094,19 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,</div><div class='ctx'> 			ip_proto = ipv6_hdr(skb)-&gt;nexthdr;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			return skb;</div><div class='add'>+			/* don't use UDP flag */</div><div class='add'>+			ip_proto = 0;</div><div class='add'>+			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		offset = skb_checksum_start_offset(skb) - sizeof(*status);</div><div class='ctx'> 		tx_csum_info = (offset &lt;&lt; STATUS_TX_CSUM_START_SHIFT) |</div><div class='del'>-				(offset + skb-&gt;csum_offset);</div><div class='add'>+				(offset + skb-&gt;csum_offset) |</div><div class='add'>+				STATUS_TX_CSUM_LV;</div><div class='ctx'> </div><div class='del'>-		/* Set the length valid bit for TCP and UDP and just set</div><div class='del'>-		 * the special UDP flag for IPv4, else just set to 0.</div><div class='del'>-		 */</div><div class='del'>-		if (ip_proto == IPPROTO_TCP || ip_proto == IPPROTO_UDP) {</div><div class='del'>-			tx_csum_info |= STATUS_TX_CSUM_LV;</div><div class='del'>-			if (ip_proto == IPPROTO_UDP &amp;&amp;</div><div class='del'>-			    ip_ver == htons(ETH_P_IP))</div><div class='del'>-				tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP;</div><div class='del'>-		} else {</div><div class='del'>-			tx_csum_info = 0;</div><div class='del'>-		}</div><div class='add'>+		/* Set the special UDP flag for UDP */</div><div class='add'>+		if (ip_proto == IPPROTO_UDP)</div><div class='add'>+			tx_csum_info |= STATUS_TX_CSUM_PROTO_UDP;</div><div class='ctx'> </div><div class='ctx'> 		status-&gt;tx_csum_info = tx_csum_info;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1543,6 +2114,11 @@ static struct sk_buff *bcmgenet_put_tx_csum(struct net_device *dev,</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bcmgenet_hide_tsb(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	__skb_pull(skb, sizeof(struct status_64));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='hunk'>@@ -1560,51 +2136,35 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	index = skb_get_queue_mapping(skb);</div><div class='ctx'> 	/* Mapping strategy:</div><div class='del'>-	 * queue_mapping = 0, unclassified, packet xmited through ring16</div><div class='del'>-	 * queue_mapping = 1, goes to ring 0. (highest priority queue</div><div class='del'>-	 * queue_mapping = 2, goes to ring 1.</div><div class='del'>-	 * queue_mapping = 3, goes to ring 2.</div><div class='del'>-	 * queue_mapping = 4, goes to ring 3.</div><div class='add'>+	 * queue_mapping = 0, unclassified, packet xmited through ring 0</div><div class='add'>+	 * queue_mapping = 1, goes to ring 1. (highest priority queue)</div><div class='add'>+	 * queue_mapping = 2, goes to ring 2.</div><div class='add'>+	 * queue_mapping = 3, goes to ring 3.</div><div class='add'>+	 * queue_mapping = 4, goes to ring 4.</div><div class='ctx'> 	 */</div><div class='del'>-	if (index == 0)</div><div class='del'>-		index = DESC_INDEX;</div><div class='del'>-	else</div><div class='del'>-		index -= 1;</div><div class='del'>-</div><div class='ctx'> 	ring = &amp;priv-&gt;tx_rings[index];</div><div class='del'>-	txq = netdev_get_tx_queue(dev, ring-&gt;queue);</div><div class='add'>+	txq = netdev_get_tx_queue(dev, index);</div><div class='ctx'> </div><div class='ctx'> 	nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ring-&gt;lock);</div><div class='ctx'> 	if (ring-&gt;free_bds &lt;= (nr_frags + 1)) {</div><div class='del'>-		if (!netif_tx_queue_stopped(txq)) {</div><div class='add'>+		if (!netif_tx_queue_stopped(txq))</div><div class='ctx'> 			netif_tx_stop_queue(txq);</div><div class='del'>-			netdev_err(dev,</div><div class='del'>-				   "%s: tx ring %d full when queue %d awake\n",</div><div class='del'>-				   __func__, index, ring-&gt;queue);</div><div class='del'>-		}</div><div class='ctx'> 		ret = NETDEV_TX_BUSY;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb_padto(skb, ETH_ZLEN)) {</div><div class='del'>-		ret = NETDEV_TX_OK;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Retain how many bytes will be sent on the wire, without TSB inserted</div><div class='ctx'> 	 * by transmit checksum offload</div><div class='ctx'> 	 */</div><div class='ctx'> 	GENET_CB(skb)-&gt;bytes_sent = skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-	/* set the SKB transmit checksum */</div><div class='del'>-	if (priv-&gt;desc_64b_en) {</div><div class='del'>-		skb = bcmgenet_put_tx_csum(dev, skb);</div><div class='del'>-		if (!skb) {</div><div class='del'>-			ret = NETDEV_TX_OK;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='add'>+	/* add the Transmit Status Block */</div><div class='add'>+	skb = bcmgenet_add_tsb(dev, skb, ring);</div><div class='add'>+	if (!skb) {</div><div class='add'>+		ret = NETDEV_TX_OK;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;= nr_frags; i++) {</div><div class='hunk'>@@ -1641,8 +2201,13 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		len_stat = (size &lt;&lt; DMA_BUFLENGTH_SHIFT) |</div><div class='ctx'> 			   (priv-&gt;hw_params-&gt;qtag_mask &lt;&lt; DMA_TX_QTAG_SHIFT);</div><div class='ctx'> </div><div class='add'>+		/* Note: if we ever change from DMA_TX_APPEND_CRC below we</div><div class='add'>+		 * will need to restore software padding of "runt" packets</div><div class='add'>+		 */</div><div class='add'>+		len_stat |= DMA_TX_APPEND_CRC;</div><div class='add'>+</div><div class='ctx'> 		if (!i) {</div><div class='del'>-			len_stat |= DMA_TX_APPEND_CRC | DMA_SOP;</div><div class='add'>+			len_stat |= DMA_SOP;</div><div class='ctx'> 			if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 				len_stat |= DMA_TX_DO_CSUM;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1653,6 +2218,8 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	GENET_CB(skb)-&gt;last_cb = tx_cb_ptr;</div><div class='add'>+</div><div class='add'>+	bcmgenet_hide_tsb(skb);</div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* Decrement total BD count and advance our write pointer */</div><div class='hunk'>@@ -1697,7 +2264,8 @@ static struct sk_buff *bcmgenet_rx_refill(struct bcmgenet_priv *priv,</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate a new Rx skb */</div><div class='del'>-	skb = netdev_alloc_skb(priv-&gt;dev, priv-&gt;rx_buf_len + SKB_ALIGNMENT);</div><div class='add'>+	skb = __netdev_alloc_skb(priv-&gt;dev, priv-&gt;rx_buf_len + SKB_ALIGNMENT,</div><div class='add'>+				 GFP_ATOMIC | __GFP_NOWARN);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		priv-&gt;mib.alloc_rx_buff_failed++;</div><div class='ctx'> 		netif_err(priv, rx_err, priv-&gt;dev,</div><div class='hunk'>@@ -1735,6 +2303,7 @@ static struct sk_buff *bcmgenet_rx_refill(struct bcmgenet_priv *priv,</div><div class='ctx'> static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 				     unsigned int budget)</div><div class='ctx'> {</div><div class='add'>+	struct bcmgenet_rx_stats64 *stats = &amp;ring-&gt;stats64;</div><div class='ctx'> 	struct bcmgenet_priv *priv = ring-&gt;priv;</div><div class='ctx'> 	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	struct enet_cb *cb;</div><div class='hunk'>@@ -1746,18 +2315,10 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 	unsigned int bytes_processed = 0;</div><div class='ctx'> 	unsigned int p_index, mask;</div><div class='ctx'> 	unsigned int discards;</div><div class='del'>-	unsigned int chksum_ok = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Clear status before servicing to reduce spurious interrupts */</div><div class='del'>-	if (ring-&gt;index == DESC_INDEX) {</div><div class='del'>-		bcmgenet_intrl2_0_writel(priv, UMAC_IRQ_RXDMA_DONE,</div><div class='del'>-					 INTRL2_CPU_CLEAR);</div><div class='del'>-	} else {</div><div class='del'>-		mask = 1 &lt;&lt; (UMAC_IRQ1_RX_INTR_SHIFT + ring-&gt;index);</div><div class='del'>-		bcmgenet_intrl2_1_writel(priv,</div><div class='del'>-					 mask,</div><div class='del'>-					 INTRL2_CPU_CLEAR);</div><div class='del'>-	}</div><div class='add'>+	mask = 1 &lt;&lt; (UMAC_IRQ1_RX_INTR_SHIFT + ring-&gt;index);</div><div class='add'>+	bcmgenet_intrl2_1_writel(priv, mask, INTRL2_CPU_CLEAR);</div><div class='ctx'> </div><div class='ctx'> 	p_index = bcmgenet_rdma_ring_readl(priv, ring-&gt;index, RDMA_PROD_INDEX);</div><div class='ctx'> </div><div class='hunk'>@@ -1765,7 +2326,7 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 		   DMA_P_INDEX_DISCARD_CNT_MASK;</div><div class='ctx'> 	if (discards &gt; ring-&gt;old_discards) {</div><div class='ctx'> 		discards = discards - ring-&gt;old_discards;</div><div class='del'>-		ring-&gt;errors += discards;</div><div class='add'>+		BCMGENET_STATS64_ADD(stats, missed, discards);</div><div class='ctx'> 		ring-&gt;old_discards += discards;</div><div class='ctx'> </div><div class='ctx'> 		/* Clear HW register when we reach 75% of maximum 0xFFFF */</div><div class='hunk'>@@ -1784,22 +2345,25 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> </div><div class='ctx'> 	while ((rxpktprocessed &lt; rxpkttoprocess) &amp;&amp;</div><div class='ctx'> 	       (rxpktprocessed &lt; budget)) {</div><div class='add'>+		struct status_64 *status;</div><div class='add'>+		__be16 rx_csum;</div><div class='add'>+</div><div class='ctx'> 		cb = &amp;priv-&gt;rx_cbs[ring-&gt;read_ptr];</div><div class='ctx'> 		skb = bcmgenet_rx_refill(priv, cb);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(!skb)) {</div><div class='del'>-			ring-&gt;dropped++;</div><div class='add'>+			BCMGENET_STATS64_INC(stats, dropped);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (!priv-&gt;desc_64b_en) {</div><div class='del'>-			dma_length_status =</div><div class='del'>-				dmadesc_get_length_status(priv, cb-&gt;bd_addr);</div><div class='del'>-		} else {</div><div class='del'>-			struct status_64 *status;</div><div class='del'>-</div><div class='del'>-			status = (struct status_64 *)skb-&gt;data;</div><div class='del'>-			dma_length_status = status-&gt;length_status;</div><div class='add'>+		status = (struct status_64 *)skb-&gt;data;</div><div class='add'>+		dma_length_status = status-&gt;length_status;</div><div class='add'>+		if (dev-&gt;features &amp; NETIF_F_RXCSUM) {</div><div class='add'>+			rx_csum = (__force __be16)(status-&gt;rx_csum &amp; 0xffff);</div><div class='add'>+			if (rx_csum) {</div><div class='add'>+				skb-&gt;csum = (__force __wsum)ntohs(rx_csum);</div><div class='add'>+				skb-&gt;ip_summed = CHECKSUM_COMPLETE;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* DMA flags and length are still valid no matter how</div><div class='hunk'>@@ -1813,10 +2377,17 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 			  __func__, p_index, ring-&gt;c_index,</div><div class='ctx'> 			  ring-&gt;read_ptr, dma_length_status);</div><div class='ctx'> </div><div class='add'>+		if (unlikely(len &gt; RX_BUF_LENGTH)) {</div><div class='add'>+			netif_err(priv, rx_status, dev, "oversized packet\n");</div><div class='add'>+			BCMGENET_STATS64_INC(stats, length_errors);</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			goto next;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (unlikely(!(dma_flag &amp; DMA_EOP) || !(dma_flag &amp; DMA_SOP))) {</div><div class='ctx'> 			netif_err(priv, rx_status, dev,</div><div class='ctx'> 				  "dropping fragmented packet!\n");</div><div class='del'>-			ring-&gt;errors++;</div><div class='add'>+			BCMGENET_STATS64_INC(stats, fragmented_errors);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1829,34 +2400,31 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 						DMA_RX_RXER))) {</div><div class='ctx'> 			netif_err(priv, rx_status, dev, "dma_flag=0x%x\n",</div><div class='ctx'> 				  (unsigned int)dma_flag);</div><div class='add'>+			u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='ctx'> 			if (dma_flag &amp; DMA_RX_CRC_ERROR)</div><div class='del'>-				dev-&gt;stats.rx_crc_errors++;</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;crc_errors);</div><div class='ctx'> 			if (dma_flag &amp; DMA_RX_OV)</div><div class='del'>-				dev-&gt;stats.rx_over_errors++;</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;over_errors);</div><div class='ctx'> 			if (dma_flag &amp; DMA_RX_NO)</div><div class='del'>-				dev-&gt;stats.rx_frame_errors++;</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;frame_errors);</div><div class='ctx'> 			if (dma_flag &amp; DMA_RX_LG)</div><div class='del'>-				dev-&gt;stats.rx_length_errors++;</div><div class='del'>-			dev-&gt;stats.rx_errors++;</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;length_errors);</div><div class='add'>+			if ((dma_flag &amp; (DMA_RX_CRC_ERROR |</div><div class='add'>+						DMA_RX_OV |</div><div class='add'>+						DMA_RX_NO |</div><div class='add'>+						DMA_RX_LG |</div><div class='add'>+						DMA_RX_RXER)) == DMA_RX_RXER)</div><div class='add'>+				u64_stats_inc(&amp;stats-&gt;errors);</div><div class='add'>+			u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		} /* error packet */</div><div class='ctx'> </div><div class='del'>-		chksum_ok = (dma_flag &amp; priv-&gt;dma_rx_chk_bit) &amp;&amp;</div><div class='del'>-			     priv-&gt;desc_rxchk_en;</div><div class='del'>-</div><div class='ctx'> 		skb_put(skb, len);</div><div class='del'>-		if (priv-&gt;desc_64b_en) {</div><div class='del'>-			skb_pull(skb, 64);</div><div class='del'>-			len -= 64;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='del'>-		if (likely(chksum_ok))</div><div class='del'>-			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-</div><div class='del'>-		/* remove hardware 2bytes added for IP alignment */</div><div class='del'>-		skb_pull(skb, 2);</div><div class='del'>-		len -= 2;</div><div class='add'>+		/* remove RSB and hardware 2bytes added for IP alignment */</div><div class='add'>+		skb_pull(skb, 66);</div><div class='add'>+		len -= 66;</div><div class='ctx'> </div><div class='ctx'> 		if (priv-&gt;crc_fwd_en) {</div><div class='ctx'> 			skb_trim(skb, len - ETH_FCS_LEN);</div><div class='hunk'>@@ -1867,10 +2435,15 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> </div><div class='ctx'> 		/*Finish setting up the received SKB and send it to the kernel*/</div><div class='ctx'> 		skb-&gt;protocol = eth_type_trans(skb, priv-&gt;dev);</div><div class='del'>-		ring-&gt;packets++;</div><div class='del'>-		ring-&gt;bytes += len;</div><div class='add'>+</div><div class='add'>+		u64_stats_update_begin(&amp;stats-&gt;syncp);</div><div class='add'>+		u64_stats_inc(&amp;stats-&gt;packets);</div><div class='add'>+		u64_stats_add(&amp;stats-&gt;bytes, len);</div><div class='ctx'> 		if (dma_flag &amp; DMA_RX_MULT)</div><div class='del'>-			dev-&gt;stats.multicast++;</div><div class='add'>+			u64_stats_inc(&amp;stats-&gt;multicast);</div><div class='add'>+		else if (dma_flag &amp; DMA_RX_BRDCAST)</div><div class='add'>+			u64_stats_inc(&amp;stats-&gt;broadcast);</div><div class='add'>+		u64_stats_update_end(&amp;stats-&gt;syncp);</div><div class='ctx'> </div><div class='ctx'> 		/* Notify kernel */</div><div class='ctx'> 		napi_gro_receive(&amp;ring-&gt;napi, skb);</div><div class='hunk'>@@ -1898,20 +2471,18 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_rx_ring *ring = container_of(napi,</div><div class='ctx'> 			struct bcmgenet_rx_ring, napi);</div><div class='del'>-	struct net_dim_sample dim_sample;</div><div class='add'>+	struct dim_sample dim_sample = {};</div><div class='ctx'> 	unsigned int work_done;</div><div class='ctx'> </div><div class='ctx'> 	work_done = bcmgenet_desc_rx(ring, budget);</div><div class='ctx'> </div><div class='del'>-	if (work_done &lt; budget) {</div><div class='del'>-		napi_complete_done(napi, work_done);</div><div class='del'>-		ring-&gt;int_enable(ring);</div><div class='del'>-	}</div><div class='add'>+	if (work_done &lt; budget &amp;&amp; napi_complete_done(napi, work_done))</div><div class='add'>+		bcmgenet_rx_ring_int_enable(ring);</div><div class='ctx'> </div><div class='ctx'> 	if (ring-&gt;dim.use_dim) {</div><div class='del'>-		net_dim_sample(ring-&gt;dim.event_ctr, ring-&gt;dim.packets,</div><div class='del'>-			       ring-&gt;dim.bytes, &amp;dim_sample);</div><div class='del'>-		net_dim(&amp;ring-&gt;dim.dim, dim_sample);</div><div class='add'>+		dim_update_sample(ring-&gt;dim.event_ctr, ring-&gt;dim.packets,</div><div class='add'>+				  ring-&gt;dim.bytes, &amp;dim_sample);</div><div class='add'>+		net_dim(&amp;ring-&gt;dim.dim, &amp;dim_sample);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='hunk'>@@ -1919,16 +2490,16 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_dim_work(struct work_struct *work)</div><div class='ctx'> {</div><div class='del'>-	struct net_dim *dim = container_of(work, struct net_dim, work);</div><div class='add'>+	struct dim *dim = container_of(work, struct dim, work);</div><div class='ctx'> 	struct bcmgenet_net_dim *ndim =</div><div class='ctx'> 			container_of(dim, struct bcmgenet_net_dim, dim);</div><div class='ctx'> 	struct bcmgenet_rx_ring *ring =</div><div class='ctx'> 			container_of(ndim, struct bcmgenet_rx_ring, dim);</div><div class='del'>-	struct net_dim_cq_moder cur_profile =</div><div class='add'>+	struct dim_cq_moder cur_profile =</div><div class='ctx'> 			net_dim_get_rx_moderation(dim-&gt;mode, dim-&gt;profile_ix);</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_set_rx_coalesce(ring, cur_profile.usec, cur_profile.pkts);</div><div class='del'>-	dim-&gt;state = NET_DIM_START_MEASURE;</div><div class='add'>+	dim-&gt;state = DIM_START_MEASURE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Assign skb to RX DMA descriptor. */</div><div class='hunk'>@@ -1973,12 +2544,18 @@ static void umac_enable_set(struct bcmgenet_priv *priv, u32 mask, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='add'>+	if (reg &amp; CMD_SW_RESET) {</div><div class='add'>+		spin_unlock_bh(&amp;priv-&gt;reg_lock);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> 	if (enable)</div><div class='ctx'> 		reg |= mask;</div><div class='ctx'> 	else</div><div class='ctx'> 		reg &amp;= ~mask;</div><div class='ctx'> 	bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* UniMAC stops on a packet boundary, wait for a full-size packet</div><div class='ctx'> 	 * to be processed</div><div class='hunk'>@@ -1993,13 +2570,11 @@ static void reset_umac(struct bcmgenet_priv *priv)</div><div class='ctx'> 	bcmgenet_rbuf_ctrl_set(priv, 0);</div><div class='ctx'> 	udelay(10);</div><div class='ctx'> </div><div class='del'>-	/* disable MAC while updating its registers */</div><div class='del'>-	bcmgenet_umac_writel(priv, 0, UMAC_CMD);</div><div class='del'>-</div><div class='del'>-	/* issue soft reset with (rg)mii loopback to ensure a stable rxclk */</div><div class='del'>-	bcmgenet_umac_writel(priv, CMD_SW_RESET | CMD_LCL_LOOP_EN, UMAC_CMD);</div><div class='add'>+	/* issue soft reset and disable MAC while updating its registers */</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;reg_lock);</div><div class='add'>+	bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);</div><div class='ctx'> 	udelay(2);</div><div class='del'>-	bcmgenet_umac_writel(priv, 0, UMAC_CMD);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_intr_disable(struct bcmgenet_priv *priv)</div><div class='hunk'>@@ -2020,10 +2595,12 @@ static void bcmgenet_link_intr_enable(struct bcmgenet_priv *priv)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;internal_phy) {</div><div class='ctx'> 		int0_enable |= UMAC_IRQ_LINK_EVENT;</div><div class='add'>+		if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv))</div><div class='add'>+			int0_enable |= UMAC_IRQ_PHY_DET_R;</div><div class='ctx'> 	} else if (priv-&gt;ext_phy) {</div><div class='ctx'> 		int0_enable |= UMAC_IRQ_LINK_EVENT;</div><div class='ctx'> 	} else if (priv-&gt;phy_interface == PHY_INTERFACE_MODE_MOCA) {</div><div class='del'>-		if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_MOCA_LINK_DET)</div><div class='add'>+		if (bcmgenet_has_moca_link_det(priv))</div><div class='ctx'> 			int0_enable |= UMAC_IRQ_LINK_EVENT;</div><div class='ctx'> 	}</div><div class='ctx'> 	bcmgenet_intrl2_0_writel(priv, int0_enable, INTRL2_CPU_MASK_CLEAR);</div><div class='hunk'>@@ -2047,11 +2624,28 @@ static void init_umac(struct bcmgenet_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_umac_writel(priv, ENET_MAX_MTU_SIZE, UMAC_MAX_FRAME_LEN);</div><div class='ctx'> </div><div class='del'>-	/* init rx registers, enable ip header optimization */</div><div class='add'>+	/* init tx registers, enable TSB */</div><div class='add'>+	reg = bcmgenet_tbuf_ctrl_get(priv);</div><div class='add'>+	reg |= TBUF_64B_EN;</div><div class='add'>+	bcmgenet_tbuf_ctrl_set(priv, reg);</div><div class='add'>+</div><div class='add'>+	/* init rx registers, enable ip header optimization and RSB */</div><div class='ctx'> 	reg = bcmgenet_rbuf_readl(priv, RBUF_CTRL);</div><div class='del'>-	reg |= RBUF_ALIGN_2B;</div><div class='add'>+	reg |= RBUF_ALIGN_2B | RBUF_64B_EN;</div><div class='ctx'> 	bcmgenet_rbuf_writel(priv, reg, RBUF_CTRL);</div><div class='ctx'> </div><div class='add'>+	/* enable rx checksumming */</div><div class='add'>+	reg = bcmgenet_rbuf_readl(priv, RBUF_CHK_CTRL);</div><div class='add'>+	reg |= RBUF_RXCHK_EN | RBUF_L3_PARSE_DIS;</div><div class='add'>+	/* If UniMAC forwards CRC, we need to skip over it to get</div><div class='add'>+	 * a valid CHK bit to be set in the per-packet status word</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;crc_fwd_en)</div><div class='add'>+		reg |= RBUF_SKIP_FCS;</div><div class='add'>+	else</div><div class='add'>+		reg &amp;= ~RBUF_SKIP_FCS;</div><div class='add'>+	bcmgenet_rbuf_writel(priv, reg, RBUF_CHK_CTRL);</div><div class='add'>+</div><div class='ctx'> 	if (!GENET_IS_V1(priv) &amp;&amp; !GENET_IS_V2(priv))</div><div class='ctx'> 		bcmgenet_rbuf_writel(priv, 1, RBUF_TBUF_SIZE_CTRL);</div><div class='ctx'> </div><div class='hunk'>@@ -2071,8 +2665,8 @@ static void init_umac(struct bcmgenet_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable MDIO interrupts on GENET v3+ */</div><div class='del'>-	if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_MDIO_INTR)</div><div class='del'>-		int0_enable |= (UMAC_IRQ_MDIO_DONE | UMAC_IRQ_MDIO_ERROR);</div><div class='add'>+	if (bcmgenet_has_mdio_intr(priv))</div><div class='add'>+		int0_enable |= UMAC_IRQ_MDIO_EVENT;</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_intrl2_0_writel(priv, int0_enable, INTRL2_CPU_MASK_CLEAR);</div><div class='ctx'> </div><div class='hunk'>@@ -2085,7 +2679,7 @@ static void bcmgenet_init_dim(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> 	struct bcmgenet_net_dim *dim = &amp;ring-&gt;dim;</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;dim-&gt;dim.work, cb);</div><div class='del'>-	dim-&gt;dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='add'>+	dim-&gt;dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;</div><div class='ctx'> 	dim-&gt;event_ctr = 0;</div><div class='ctx'> 	dim-&gt;packets = 0;</div><div class='ctx'> 	dim-&gt;bytes = 0;</div><div class='hunk'>@@ -2094,7 +2688,7 @@ static void bcmgenet_init_dim(struct bcmgenet_rx_ring *ring,</div><div class='ctx'> static void bcmgenet_init_rx_coalesce(struct bcmgenet_rx_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_net_dim *dim = &amp;ring-&gt;dim;</div><div class='del'>-	struct net_dim_cq_moder moder;</div><div class='add'>+	struct dim_cq_moder moder;</div><div class='ctx'> 	u32 usecs, pkts;</div><div class='ctx'> </div><div class='ctx'> 	usecs = ring-&gt;rx_coalesce_usecs;</div><div class='hunk'>@@ -2122,15 +2716,6 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv,</div><div class='ctx'> 	spin_lock_init(&amp;ring-&gt;lock);</div><div class='ctx'> 	ring-&gt;priv = priv;</div><div class='ctx'> 	ring-&gt;index = index;</div><div class='del'>-	if (index == DESC_INDEX) {</div><div class='del'>-		ring-&gt;queue = 0;</div><div class='del'>-		ring-&gt;int_enable = bcmgenet_tx_ring16_int_enable;</div><div class='del'>-		ring-&gt;int_disable = bcmgenet_tx_ring16_int_disable;</div><div class='del'>-	} else {</div><div class='del'>-		ring-&gt;queue = index + 1;</div><div class='del'>-		ring-&gt;int_enable = bcmgenet_tx_ring_int_enable;</div><div class='del'>-		ring-&gt;int_disable = bcmgenet_tx_ring_int_disable;</div><div class='del'>-	}</div><div class='ctx'> 	ring-&gt;cbs = priv-&gt;tx_cbs + start_ptr;</div><div class='ctx'> 	ring-&gt;size = size;</div><div class='ctx'> 	ring-&gt;clean_ptr = start_ptr;</div><div class='hunk'>@@ -2141,8 +2726,8 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv,</div><div class='ctx'> 	ring-&gt;end_ptr = end_ptr - 1;</div><div class='ctx'> 	ring-&gt;prod_index = 0;</div><div class='ctx'> </div><div class='del'>-	/* Set flow period for ring != 16 */</div><div class='del'>-	if (index != DESC_INDEX)</div><div class='add'>+	/* Set flow period for ring != 0 */</div><div class='add'>+	if (index)</div><div class='ctx'> 		flow_period_val = ENET_MAX_MTU_SIZE &lt;&lt; 16;</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);</div><div class='hunk'>@@ -2166,8 +2751,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv,</div><div class='ctx'> 				  DMA_END_ADDR);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Tx NAPI */</div><div class='del'>-	netif_napi_add(priv-&gt;dev, &amp;ring-&gt;napi, bcmgenet_tx_poll,</div><div class='del'>-		       NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add_tx(priv-&gt;dev, &amp;ring-&gt;napi, bcmgenet_tx_poll);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize a RDMA ring */</div><div class='hunk'>@@ -2181,13 +2765,6 @@ static int bcmgenet_init_rx_ring(struct bcmgenet_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;priv = priv;</div><div class='ctx'> 	ring-&gt;index = index;</div><div class='del'>-	if (index == DESC_INDEX) {</div><div class='del'>-		ring-&gt;int_enable = bcmgenet_rx_ring16_int_enable;</div><div class='del'>-		ring-&gt;int_disable = bcmgenet_rx_ring16_int_disable;</div><div class='del'>-	} else {</div><div class='del'>-		ring-&gt;int_enable = bcmgenet_rx_ring_int_enable;</div><div class='del'>-		ring-&gt;int_disable = bcmgenet_rx_ring_int_disable;</div><div class='del'>-	}</div><div class='ctx'> 	ring-&gt;cbs = priv-&gt;rx_cbs + start_ptr;</div><div class='ctx'> 	ring-&gt;size = size;</div><div class='ctx'> 	ring-&gt;c_index = 0;</div><div class='hunk'>@@ -2203,8 +2780,7 @@ static int bcmgenet_init_rx_ring(struct bcmgenet_priv *priv,</div><div class='ctx'> 	bcmgenet_init_rx_coalesce(ring);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Rx NAPI */</div><div class='del'>-	netif_napi_add(priv-&gt;dev, &amp;ring-&gt;napi, bcmgenet_rx_poll,</div><div class='del'>-		       NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add(priv-&gt;dev, &amp;ring-&gt;napi, bcmgenet_rx_poll);</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_PROD_INDEX);</div><div class='ctx'> 	bcmgenet_rdma_ring_writel(priv, index, 0, RDMA_CONS_INDEX);</div><div class='hunk'>@@ -2234,15 +2810,11 @@ static void bcmgenet_enable_tx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct bcmgenet_tx_ring *ring;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; ++i) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; ++i) {</div><div class='ctx'> 		ring = &amp;priv-&gt;tx_rings[i];</div><div class='ctx'> 		napi_enable(&amp;ring-&gt;napi);</div><div class='del'>-		ring-&gt;int_enable(ring);</div><div class='add'>+		bcmgenet_tx_ring_int_enable(ring);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ring = &amp;priv-&gt;tx_rings[DESC_INDEX];</div><div class='del'>-	napi_enable(&amp;ring-&gt;napi);</div><div class='del'>-	ring-&gt;int_enable(ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_disable_tx_napi(struct bcmgenet_priv *priv)</div><div class='hunk'>@@ -2250,13 +2822,10 @@ static void bcmgenet_disable_tx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct bcmgenet_tx_ring *ring;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; ++i) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; ++i) {</div><div class='ctx'> 		ring = &amp;priv-&gt;tx_rings[i];</div><div class='ctx'> 		napi_disable(&amp;ring-&gt;napi);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ring = &amp;priv-&gt;tx_rings[DESC_INDEX];</div><div class='del'>-	napi_disable(&amp;ring-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_fini_tx_napi(struct bcmgenet_priv *priv)</div><div class='hunk'>@@ -2264,82 +2833,104 @@ static void bcmgenet_fini_tx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct bcmgenet_tx_ring *ring;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; ++i) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; ++i) {</div><div class='ctx'> 		ring = &amp;priv-&gt;tx_rings[i];</div><div class='ctx'> 		netif_napi_del(&amp;ring-&gt;napi);</div><div class='ctx'> 	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_tdma_disable(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int timeout = 0;</div><div class='add'>+	u32 reg, mask;</div><div class='add'>+</div><div class='add'>+	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='add'>+	mask = (1 &lt;&lt; (priv-&gt;hw_params-&gt;tx_queues + 1)) - 1;</div><div class='add'>+	mask = (mask &lt;&lt; DMA_RING_BUF_EN_SHIFT) | DMA_EN;</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='add'>+</div><div class='add'>+	/* Check DMA status register to confirm DMA is disabled */</div><div class='add'>+	while (timeout++ &lt; DMA_TIMEOUT_VAL) {</div><div class='add'>+		reg = bcmgenet_tdma_readl(priv, DMA_STATUS);</div><div class='add'>+		if ((reg &amp; mask) == mask)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -ETIMEDOUT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_rdma_disable(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int timeout = 0;</div><div class='add'>+	u32 reg, mask;</div><div class='add'>+</div><div class='add'>+	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='add'>+	mask = (1 &lt;&lt; (priv-&gt;hw_params-&gt;rx_queues + 1)) - 1;</div><div class='add'>+	mask = (mask &lt;&lt; DMA_RING_BUF_EN_SHIFT) | DMA_EN;</div><div class='add'>+	reg &amp;= ~mask;</div><div class='add'>+	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);</div><div class='add'>+</div><div class='add'>+	/* Check DMA status register to confirm DMA is disabled */</div><div class='add'>+	while (timeout++ &lt; DMA_TIMEOUT_VAL) {</div><div class='add'>+		reg = bcmgenet_rdma_readl(priv, DMA_STATUS);</div><div class='add'>+		if ((reg &amp; mask) == mask)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		udelay(1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ring = &amp;priv-&gt;tx_rings[DESC_INDEX];</div><div class='del'>-	netif_napi_del(&amp;ring-&gt;napi);</div><div class='add'>+	return -ETIMEDOUT;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize Tx queues</div><div class='ctx'>  *</div><div class='del'>- * Queues 0-3 are priority-based, each one has 32 descriptors,</div><div class='del'>- * with queue 0 being the highest priority queue.</div><div class='add'>+ * Queues 1-4 are priority-based, each one has 32 descriptors,</div><div class='add'>+ * with queue 1 being the highest priority queue.</div><div class='ctx'>  *</div><div class='del'>- * Queue 16 is the default Tx queue with</div><div class='del'>- * GENET_Q16_TX_BD_CNT = 256 - 4 * 32 = 128 descriptors.</div><div class='add'>+ * Queue 0 is the default Tx queue with</div><div class='add'>+ * GENET_Q0_TX_BD_CNT = 256 - 4 * 32 = 128 descriptors.</div><div class='ctx'>  *</div><div class='ctx'>  * The transmit control block pool is then partitioned as follows:</div><div class='del'>- * - Tx queue 0 uses tx_cbs[0..31]</div><div class='del'>- * - Tx queue 1 uses tx_cbs[32..63]</div><div class='del'>- * - Tx queue 2 uses tx_cbs[64..95]</div><div class='del'>- * - Tx queue 3 uses tx_cbs[96..127]</div><div class='del'>- * - Tx queue 16 uses tx_cbs[128..255]</div><div class='add'>+ * - Tx queue 0 uses tx_cbs[0..127]</div><div class='add'>+ * - Tx queue 1 uses tx_cbs[128..159]</div><div class='add'>+ * - Tx queue 2 uses tx_cbs[160..191]</div><div class='add'>+ * - Tx queue 3 uses tx_cbs[192..223]</div><div class='add'>+ * - Tx queue 4 uses tx_cbs[224..255]</div><div class='ctx'>  */</div><div class='ctx'> static void bcmgenet_init_tx_queues(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 i, dma_enable;</div><div class='del'>-	u32 dma_ctrl, ring_cfg;</div><div class='del'>-	u32 dma_priority[3] = {0, 0, 0};</div><div class='del'>-</div><div class='del'>-	dma_ctrl = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='del'>-	dma_enable = dma_ctrl &amp; DMA_EN;</div><div class='del'>-	dma_ctrl &amp;= ~DMA_EN;</div><div class='del'>-	bcmgenet_tdma_writel(priv, dma_ctrl, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	dma_ctrl = 0;</div><div class='del'>-	ring_cfg = 0;</div><div class='add'>+	unsigned int start = 0, end = GENET_Q0_TX_BD_CNT;</div><div class='add'>+	u32 i, ring_mask, dma_priority[3] = {0, 0, 0};</div><div class='ctx'> </div><div class='ctx'> 	/* Enable strict priority arbiter mode */</div><div class='ctx'> 	bcmgenet_tdma_writel(priv, DMA_ARBITER_SP, DMA_ARB_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Tx priority queues */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; i++) {</div><div class='del'>-		bcmgenet_init_tx_ring(priv, i, priv-&gt;hw_params-&gt;tx_bds_per_q,</div><div class='del'>-				      i * priv-&gt;hw_params-&gt;tx_bds_per_q,</div><div class='del'>-				      (i + 1) * priv-&gt;hw_params-&gt;tx_bds_per_q);</div><div class='del'>-		ring_cfg |= (1 &lt;&lt; i);</div><div class='del'>-		dma_ctrl |= (1 &lt;&lt; (i + DMA_RING_BUF_EN_SHIFT));</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; i++) {</div><div class='add'>+		bcmgenet_init_tx_ring(priv, i, end - start, start, end);</div><div class='add'>+		start = end;</div><div class='add'>+		end += priv-&gt;hw_params-&gt;tx_bds_per_q;</div><div class='ctx'> 		dma_priority[DMA_PRIO_REG_INDEX(i)] |=</div><div class='del'>-			((GENET_Q0_PRIORITY + i) &lt;&lt; DMA_PRIO_REG_SHIFT(i));</div><div class='add'>+			(i ? GENET_Q1_PRIORITY : GENET_Q0_PRIORITY)</div><div class='add'>+			&lt;&lt; DMA_PRIO_REG_SHIFT(i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize Tx default queue 16 */</div><div class='del'>-	bcmgenet_init_tx_ring(priv, DESC_INDEX, GENET_Q16_TX_BD_CNT,</div><div class='del'>-			      priv-&gt;hw_params-&gt;tx_queues *</div><div class='del'>-			      priv-&gt;hw_params-&gt;tx_bds_per_q,</div><div class='del'>-			      TOTAL_DESC);</div><div class='del'>-	ring_cfg |= (1 &lt;&lt; DESC_INDEX);</div><div class='del'>-	dma_ctrl |= (1 &lt;&lt; (DESC_INDEX + DMA_RING_BUF_EN_SHIFT));</div><div class='del'>-	dma_priority[DMA_PRIO_REG_INDEX(DESC_INDEX)] |=</div><div class='del'>-		((GENET_Q0_PRIORITY + priv-&gt;hw_params-&gt;tx_queues) &lt;&lt;</div><div class='del'>-		 DMA_PRIO_REG_SHIFT(DESC_INDEX));</div><div class='del'>-</div><div class='ctx'> 	/* Set Tx queue priorities */</div><div class='ctx'> 	bcmgenet_tdma_writel(priv, dma_priority[0], DMA_PRIORITY_0);</div><div class='ctx'> 	bcmgenet_tdma_writel(priv, dma_priority[1], DMA_PRIORITY_1);</div><div class='ctx'> 	bcmgenet_tdma_writel(priv, dma_priority[2], DMA_PRIORITY_2);</div><div class='ctx'> </div><div class='del'>-	/* Enable Tx queues */</div><div class='del'>-	bcmgenet_tdma_writel(priv, ring_cfg, DMA_RING_CFG);</div><div class='add'>+	/* Configure Tx queues as descriptor rings */</div><div class='add'>+	ring_mask = (1 &lt;&lt; (priv-&gt;hw_params-&gt;tx_queues + 1)) - 1;</div><div class='add'>+	bcmgenet_tdma_writel(priv, ring_mask, DMA_RING_CFG);</div><div class='ctx'> </div><div class='del'>-	/* Enable Tx DMA */</div><div class='del'>-	if (dma_enable)</div><div class='del'>-		dma_ctrl |= DMA_EN;</div><div class='del'>-	bcmgenet_tdma_writel(priv, dma_ctrl, DMA_CTRL);</div><div class='add'>+	/* Enable Tx rings */</div><div class='add'>+	ring_mask &lt;&lt;= DMA_RING_BUF_EN_SHIFT;</div><div class='add'>+	bcmgenet_tdma_writel(priv, ring_mask, DMA_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_enable_rx_napi(struct bcmgenet_priv *priv)</div><div class='hunk'>@@ -2347,15 +2938,11 @@ static void bcmgenet_enable_rx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct bcmgenet_rx_ring *ring;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; ++i) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; ++i) {</div><div class='ctx'> 		ring = &amp;priv-&gt;rx_rings[i];</div><div class='ctx'> 		napi_enable(&amp;ring-&gt;napi);</div><div class='del'>-		ring-&gt;int_enable(ring);</div><div class='add'>+		bcmgenet_rx_ring_int_enable(ring);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ring = &amp;priv-&gt;rx_rings[DESC_INDEX];</div><div class='del'>-	napi_enable(&amp;ring-&gt;napi);</div><div class='del'>-	ring-&gt;int_enable(ring);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_disable_rx_napi(struct bcmgenet_priv *priv)</div><div class='hunk'>@@ -2363,15 +2950,11 @@ static void bcmgenet_disable_rx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct bcmgenet_rx_ring *ring;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; ++i) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; ++i) {</div><div class='ctx'> 		ring = &amp;priv-&gt;rx_rings[i];</div><div class='ctx'> 		napi_disable(&amp;ring-&gt;napi);</div><div class='ctx'> 		cancel_work_sync(&amp;ring-&gt;dim.dim.work);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ring = &amp;priv-&gt;rx_rings[DESC_INDEX];</div><div class='del'>-	napi_disable(&amp;ring-&gt;napi);</div><div class='del'>-	cancel_work_sync(&amp;ring-&gt;dim.dim.work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_fini_rx_napi(struct bcmgenet_priv *priv)</div><div class='hunk'>@@ -2379,13 +2962,10 @@ static void bcmgenet_fini_rx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct bcmgenet_rx_ring *ring;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; ++i) {</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; ++i) {</div><div class='ctx'> 		ring = &amp;priv-&gt;rx_rings[i];</div><div class='ctx'> 		netif_napi_del(&amp;ring-&gt;napi);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	ring = &amp;priv-&gt;rx_rings[DESC_INDEX];</div><div class='del'>-	netif_napi_del(&amp;ring-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize Rx queues</div><div class='hunk'>@@ -2393,57 +2973,32 @@ static void bcmgenet_fini_rx_napi(struct bcmgenet_priv *priv)</div><div class='ctx'>  * Queues 0-15 are priority queues. Hardware Filtering Block (HFB) can be</div><div class='ctx'>  * used to direct traffic to these queues.</div><div class='ctx'>  *</div><div class='del'>- * Queue 16 is the default Rx queue with GENET_Q16_RX_BD_CNT descriptors.</div><div class='add'>+ * Queue 0 is also the default Rx queue with GENET_Q0_RX_BD_CNT descriptors.</div><div class='ctx'>  */</div><div class='ctx'> static int bcmgenet_init_rx_queues(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 i;</div><div class='del'>-	u32 dma_enable;</div><div class='del'>-	u32 dma_ctrl;</div><div class='del'>-	u32 ring_cfg;</div><div class='add'>+	unsigned int start = 0, end = GENET_Q0_RX_BD_CNT;</div><div class='add'>+	u32 i, ring_mask;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	dma_ctrl = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='del'>-	dma_enable = dma_ctrl &amp; DMA_EN;</div><div class='del'>-	dma_ctrl &amp;= ~DMA_EN;</div><div class='del'>-	bcmgenet_rdma_writel(priv, dma_ctrl, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	dma_ctrl = 0;</div><div class='del'>-	ring_cfg = 0;</div><div class='del'>-</div><div class='ctx'> 	/* Initialize Rx priority queues */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; i++) {</div><div class='del'>-		ret = bcmgenet_init_rx_ring(priv, i,</div><div class='del'>-					    priv-&gt;hw_params-&gt;rx_bds_per_q,</div><div class='del'>-					    i * priv-&gt;hw_params-&gt;rx_bds_per_q,</div><div class='del'>-					    (i + 1) *</div><div class='del'>-					    priv-&gt;hw_params-&gt;rx_bds_per_q);</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; i++) {</div><div class='add'>+		ret = bcmgenet_init_rx_ring(priv, i, end - start, start, end);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		ring_cfg |= (1 &lt;&lt; i);</div><div class='del'>-		dma_ctrl |= (1 &lt;&lt; (i + DMA_RING_BUF_EN_SHIFT));</div><div class='add'>+		start = end;</div><div class='add'>+		end += priv-&gt;hw_params-&gt;rx_bds_per_q;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Initialize Rx default queue 16 */</div><div class='del'>-	ret = bcmgenet_init_rx_ring(priv, DESC_INDEX, GENET_Q16_RX_BD_CNT,</div><div class='del'>-				    priv-&gt;hw_params-&gt;rx_queues *</div><div class='del'>-				    priv-&gt;hw_params-&gt;rx_bds_per_q,</div><div class='del'>-				    TOTAL_DESC);</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	ring_cfg |= (1 &lt;&lt; DESC_INDEX);</div><div class='del'>-	dma_ctrl |= (1 &lt;&lt; (DESC_INDEX + DMA_RING_BUF_EN_SHIFT));</div><div class='del'>-</div><div class='del'>-	/* Enable rings */</div><div class='del'>-	bcmgenet_rdma_writel(priv, ring_cfg, DMA_RING_CFG);</div><div class='add'>+	/* Configure Rx queues as descriptor rings */</div><div class='add'>+	ring_mask = (1 &lt;&lt; (priv-&gt;hw_params-&gt;rx_queues + 1)) - 1;</div><div class='add'>+	bcmgenet_rdma_writel(priv, ring_mask, DMA_RING_CFG);</div><div class='ctx'> </div><div class='del'>-	/* Configure ring as descriptor ring and re-enable DMA if enabled */</div><div class='del'>-	if (dma_enable)</div><div class='del'>-		dma_ctrl |= DMA_EN;</div><div class='del'>-	bcmgenet_rdma_writel(priv, dma_ctrl, DMA_CTRL);</div><div class='add'>+	/* Enable Rx rings */</div><div class='add'>+	ring_mask &lt;&lt;= DMA_RING_BUF_EN_SHIFT;</div><div class='add'>+	bcmgenet_rdma_writel(priv, ring_mask, DMA_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2451,26 +3006,9 @@ static int bcmgenet_init_rx_queues(struct net_device *dev)</div><div class='ctx'> static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = 0;</div><div class='del'>-	int timeout = 0;</div><div class='del'>-	u32 reg;</div><div class='del'>-	u32 dma_ctrl;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable TDMA to stop add more frames in TX DMA */</div><div class='del'>-	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg &amp;= ~DMA_EN;</div><div class='del'>-	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	/* Check TDMA status register to confirm TDMA is disabled */</div><div class='del'>-	while (timeout++ &lt; DMA_TIMEOUT_VAL) {</div><div class='del'>-		reg = bcmgenet_tdma_readl(priv, DMA_STATUS);</div><div class='del'>-		if (reg &amp; DMA_DISABLED)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (timeout == DMA_TIMEOUT_VAL) {</div><div class='add'>+	if (-ETIMEDOUT == bcmgenet_tdma_disable(priv)) {</div><div class='ctx'> 		netdev_warn(priv-&gt;dev, "Timed out while disabling TX DMA\n");</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2479,81 +3017,69 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv)</div><div class='ctx'> 	usleep_range(10000, 20000);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable RDMA */</div><div class='del'>-	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg &amp;= ~DMA_EN;</div><div class='del'>-	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	timeout = 0;</div><div class='del'>-	/* Check RDMA status register to confirm RDMA is disabled */</div><div class='del'>-	while (timeout++ &lt; DMA_TIMEOUT_VAL) {</div><div class='del'>-		reg = bcmgenet_rdma_readl(priv, DMA_STATUS);</div><div class='del'>-		if (reg &amp; DMA_DISABLED)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		udelay(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (timeout == DMA_TIMEOUT_VAL) {</div><div class='add'>+	if (-ETIMEDOUT == bcmgenet_rdma_disable(priv)) {</div><div class='ctx'> 		netdev_warn(priv-&gt;dev, "Timed out while disabling RX DMA\n");</div><div class='ctx'> 		ret = -ETIMEDOUT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dma_ctrl = 0;</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; i++)</div><div class='del'>-		dma_ctrl |= (1 &lt;&lt; (i + DMA_RING_BUF_EN_SHIFT));</div><div class='del'>-	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg &amp;= ~dma_ctrl;</div><div class='del'>-	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	dma_ctrl = 0;</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; i++)</div><div class='del'>-		dma_ctrl |= (1 &lt;&lt; (i + DMA_RING_BUF_EN_SHIFT));</div><div class='del'>-	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg &amp;= ~dma_ctrl;</div><div class='del'>-	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct enet_cb *cb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_fini_rx_napi(priv);</div><div class='ctx'> 	bcmgenet_fini_tx_napi(priv);</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; priv-&gt;num_tx_bds; i++) {</div><div class='del'>-		cb = priv-&gt;tx_cbs + i;</div><div class='del'>-		skb = bcmgenet_free_tx_cb(&amp;priv-&gt;pdev-&gt;dev, cb);</div><div class='del'>-		if (skb)</div><div class='del'>-			dev_kfree_skb(skb);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;tx_queues; i++) {</div><div class='del'>-		txq = netdev_get_tx_queue(priv-&gt;dev, priv-&gt;tx_rings[i].queue);</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; i++) {</div><div class='add'>+		txq = netdev_get_tx_queue(priv-&gt;dev, i);</div><div class='ctx'> 		netdev_tx_reset_queue(txq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txq = netdev_get_tx_queue(priv-&gt;dev, priv-&gt;tx_rings[DESC_INDEX].queue);</div><div class='del'>-	netdev_tx_reset_queue(txq);</div><div class='del'>-</div><div class='ctx'> 	bcmgenet_free_rx_buffers(priv);</div><div class='ctx'> 	kfree(priv-&gt;rx_cbs);</div><div class='ctx'> 	kfree(priv-&gt;tx_cbs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* init_edma: Initialize DMA control register */</div><div class='del'>-static int bcmgenet_init_dma(struct bcmgenet_priv *priv)</div><div class='add'>+static int bcmgenet_init_dma(struct bcmgenet_priv *priv, bool flush_rx)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int i;</div><div class='ctx'> 	struct enet_cb *cb;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, hw, priv-&gt;dev, "%s\n", __func__);</div><div class='ctx'> </div><div class='add'>+	/* Disable TX DMA */</div><div class='add'>+	ret = bcmgenet_tdma_disable(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(priv-&gt;dev, "failed to halt Tx DMA\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Disable RX DMA */</div><div class='add'>+	ret = bcmgenet_rdma_disable(priv);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(priv-&gt;dev, "failed to halt Rx DMA\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Flush TX queues */</div><div class='add'>+	bcmgenet_umac_writel(priv, 1, UMAC_TX_FLUSH);</div><div class='add'>+	udelay(10);</div><div class='add'>+	bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);</div><div class='add'>+</div><div class='add'>+	if (flush_rx) {</div><div class='add'>+		reg = bcmgenet_rbuf_ctrl_get(priv);</div><div class='add'>+		bcmgenet_rbuf_ctrl_set(priv, reg | BIT(0));</div><div class='add'>+		udelay(10);</div><div class='add'>+		bcmgenet_rbuf_ctrl_set(priv, reg);</div><div class='add'>+		udelay(10);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Initialize common Rx ring structures */</div><div class='ctx'> 	priv-&gt;rx_bds = priv-&gt;base + priv-&gt;hw_params-&gt;rdma_offset;</div><div class='ctx'> 	priv-&gt;num_rx_bds = TOTAL_DESC;</div><div class='hunk'>@@ -2583,7 +3109,8 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init rDma */</div><div class='del'>-	bcmgenet_rdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);</div><div class='add'>+	bcmgenet_rdma_writel(priv, priv-&gt;dma_max_burst_length,</div><div class='add'>+			     DMA_SCB_BURST_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Rx queues */</div><div class='ctx'> 	ret = bcmgenet_init_rx_queues(priv-&gt;dev);</div><div class='hunk'>@@ -2596,11 +3123,21 @@ static int bcmgenet_init_dma(struct bcmgenet_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init tDma */</div><div class='del'>-	bcmgenet_tdma_writel(priv, DMA_MAX_BURST_LENGTH, DMA_SCB_BURST_SIZE);</div><div class='add'>+	bcmgenet_tdma_writel(priv, priv-&gt;dma_max_burst_length,</div><div class='add'>+			     DMA_SCB_BURST_SIZE);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize Tx queues */</div><div class='ctx'> 	bcmgenet_init_tx_queues(priv-&gt;dev);</div><div class='ctx'> </div><div class='add'>+	/* Enable RX/TX DMA */</div><div class='add'>+	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='add'>+	reg |= DMA_EN;</div><div class='add'>+	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);</div><div class='add'>+</div><div class='add'>+	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='add'>+	reg |= DMA_EN;</div><div class='add'>+	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2618,14 +3155,19 @@ static void bcmgenet_irq_task(struct work_struct *work)</div><div class='ctx'> 	priv-&gt;irq0_stat = 0;</div><div class='ctx'> 	spin_unlock_irq(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	if (status &amp; UMAC_IRQ_PHY_DET_R &amp;&amp;</div><div class='add'>+	    priv-&gt;dev-&gt;phydev-&gt;autoneg != AUTONEG_ENABLE) {</div><div class='add'>+		phy_init_hw(priv-&gt;dev-&gt;phydev);</div><div class='add'>+		genphy_config_aneg(priv-&gt;dev-&gt;phydev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Link UP/DOWN event */</div><div class='del'>-	if (status &amp; UMAC_IRQ_LINK_EVENT) {</div><div class='del'>-		priv-&gt;dev-&gt;phydev-&gt;link = !!(status &amp; UMAC_IRQ_LINK_UP);</div><div class='add'>+	if (status &amp; UMAC_IRQ_LINK_EVENT)</div><div class='ctx'> 		phy_mac_interrupt(priv-&gt;dev-&gt;phydev);</div><div class='del'>-	}</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* bcmgenet_isr1: handle Rx and Tx priority queues */</div><div class='add'>+/* bcmgenet_isr1: handle Rx and Tx queues */</div><div class='ctx'> static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = dev_id;</div><div class='hunk'>@@ -2644,7 +3186,7 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)</div><div class='ctx'> 		  "%s: IRQ=0x%x\n", __func__, status);</div><div class='ctx'> </div><div class='ctx'> 	/* Check Rx priority queue interrupts */</div><div class='del'>-	for (index = 0; index &lt; priv-&gt;hw_params-&gt;rx_queues; index++) {</div><div class='add'>+	for (index = 0; index &lt;= priv-&gt;hw_params-&gt;rx_queues; index++) {</div><div class='ctx'> 		if (!(status &amp; BIT(UMAC_IRQ1_RX_INTR_SHIFT + index)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='hunk'>@@ -2652,20 +3194,20 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)</div><div class='ctx'> 		rx_ring-&gt;dim.event_ctr++;</div><div class='ctx'> </div><div class='ctx'> 		if (likely(napi_schedule_prep(&amp;rx_ring-&gt;napi))) {</div><div class='del'>-			rx_ring-&gt;int_disable(rx_ring);</div><div class='add'>+			bcmgenet_rx_ring_int_disable(rx_ring);</div><div class='ctx'> 			__napi_schedule_irqoff(&amp;rx_ring-&gt;napi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check Tx priority queue interrupts */</div><div class='del'>-	for (index = 0; index &lt; priv-&gt;hw_params-&gt;tx_queues; index++) {</div><div class='add'>+	for (index = 0; index &lt;= priv-&gt;hw_params-&gt;tx_queues; index++) {</div><div class='ctx'> 		if (!(status &amp; BIT(index)))</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		tx_ring = &amp;priv-&gt;tx_rings[index];</div><div class='ctx'> </div><div class='ctx'> 		if (likely(napi_schedule_prep(&amp;tx_ring-&gt;napi))) {</div><div class='del'>-			tx_ring-&gt;int_disable(tx_ring);</div><div class='add'>+			bcmgenet_tx_ring_int_disable(tx_ring);</div><div class='ctx'> 			__napi_schedule_irqoff(&amp;tx_ring-&gt;napi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2673,12 +3215,10 @@ static irqreturn_t bcmgenet_isr1(int irq, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* bcmgenet_isr0: handle Rx and Tx default queues + other stuff */</div><div class='add'>+/* bcmgenet_isr0: handle other stuff */</div><div class='ctx'> static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = dev_id;</div><div class='del'>-	struct bcmgenet_rx_ring *rx_ring;</div><div class='del'>-	struct bcmgenet_tx_ring *tx_ring;</div><div class='ctx'> 	unsigned int status;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -2692,32 +3232,11 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)</div><div class='ctx'> 	netif_dbg(priv, intr, priv-&gt;dev,</div><div class='ctx'> 		  "IRQ=0x%x\n", status);</div><div class='ctx'> </div><div class='del'>-	if (status &amp; UMAC_IRQ_RXDMA_DONE) {</div><div class='del'>-		rx_ring = &amp;priv-&gt;rx_rings[DESC_INDEX];</div><div class='del'>-		rx_ring-&gt;dim.event_ctr++;</div><div class='del'>-</div><div class='del'>-		if (likely(napi_schedule_prep(&amp;rx_ring-&gt;napi))) {</div><div class='del'>-			rx_ring-&gt;int_disable(rx_ring);</div><div class='del'>-			__napi_schedule_irqoff(&amp;rx_ring-&gt;napi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status &amp; UMAC_IRQ_TXDMA_DONE) {</div><div class='del'>-		tx_ring = &amp;priv-&gt;tx_rings[DESC_INDEX];</div><div class='del'>-</div><div class='del'>-		if (likely(napi_schedule_prep(&amp;tx_ring-&gt;napi))) {</div><div class='del'>-			tx_ring-&gt;int_disable(tx_ring);</div><div class='del'>-			__napi_schedule_irqoff(&amp;tx_ring-&gt;napi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_MDIO_INTR) &amp;&amp;</div><div class='del'>-		status &amp; (UMAC_IRQ_MDIO_DONE | UMAC_IRQ_MDIO_ERROR)) {</div><div class='add'>+	if (bcmgenet_has_mdio_intr(priv) &amp;&amp; status &amp; UMAC_IRQ_MDIO_EVENT)</div><div class='ctx'> 		wake_up(&amp;priv-&gt;wq);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* all other interested interrupts handled in bottom half */</div><div class='del'>-	status &amp;= UMAC_IRQ_LINK_EVENT;</div><div class='add'>+	status &amp;= (UMAC_IRQ_LINK_EVENT | UMAC_IRQ_PHY_DET_R);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		/* Save irq status for bottom-half processing. */</div><div class='ctx'> 		spin_lock_irqsave(&amp;priv-&gt;lock, flags);</div><div class='hunk'>@@ -2732,30 +3251,10 @@ static irqreturn_t bcmgenet_isr0(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t bcmgenet_wol_isr(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	struct bcmgenet_priv *priv = dev_id;</div><div class='del'>-</div><div class='del'>-	pm_wakeup_event(&amp;priv-&gt;pdev-&gt;dev, 0);</div><div class='del'>-</div><div class='add'>+	/* Acknowledge the interrupt */</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-static void bcmgenet_poll_controller(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	/* Invoke the main RX/TX interrupt handler */</div><div class='del'>-	disable_irq(priv-&gt;irq0);</div><div class='del'>-	bcmgenet_isr0(priv-&gt;irq0, priv);</div><div class='del'>-	enable_irq(priv-&gt;irq0);</div><div class='del'>-</div><div class='del'>-	/* And the interrupt handler for RX/TX priority queues */</div><div class='del'>-	disable_irq(priv-&gt;irq1);</div><div class='del'>-	bcmgenet_isr1(priv-&gt;irq1, priv);</div><div class='del'>-	enable_irq(priv-&gt;irq1);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> static void bcmgenet_umac_reset(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg;</div><div class='hunk'>@@ -2771,79 +3270,21 @@ static void bcmgenet_umac_reset(struct bcmgenet_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_set_hw_addr(struct bcmgenet_priv *priv,</div><div class='del'>-				 unsigned char *addr)</div><div class='add'>+				 const unsigned char *addr)</div><div class='ctx'> {</div><div class='del'>-	bcmgenet_umac_writel(priv, (addr[0] &lt;&lt; 24) | (addr[1] &lt;&lt; 16) |</div><div class='del'>-			(addr[2] &lt;&lt; 8) | addr[3], UMAC_MAC0);</div><div class='del'>-	bcmgenet_umac_writel(priv, (addr[4] &lt;&lt; 8) | addr[5], UMAC_MAC1);</div><div class='add'>+	bcmgenet_umac_writel(priv, get_unaligned_be32(&amp;addr[0]), UMAC_MAC0);</div><div class='add'>+	bcmgenet_umac_writel(priv, get_unaligned_be16(&amp;addr[4]), UMAC_MAC1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Returns a reusable dma control register value */</div><div class='del'>-static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-	u32 dma_ctrl;</div><div class='del'>-</div><div class='del'>-	/* disable DMA */</div><div class='del'>-	dma_ctrl = 1 &lt;&lt; (DESC_INDEX + DMA_RING_BUF_EN_SHIFT) | DMA_EN;</div><div class='del'>-	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg &amp;= ~dma_ctrl;</div><div class='del'>-	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg &amp;= ~dma_ctrl;</div><div class='del'>-	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	bcmgenet_umac_writel(priv, 1, UMAC_TX_FLUSH);</div><div class='del'>-	udelay(10);</div><div class='del'>-	bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH);</div><div class='del'>-</div><div class='del'>-	return dma_ctrl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bcmgenet_enable_dma(struct bcmgenet_priv *priv, u32 dma_ctrl)</div><div class='del'>-{</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	reg = bcmgenet_rdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg |= dma_ctrl;</div><div class='del'>-	bcmgenet_rdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-</div><div class='del'>-	reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='del'>-	reg |= dma_ctrl;</div><div class='del'>-	bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* bcmgenet_hfb_clear</div><div class='del'>- *</div><div class='del'>- * Clear Hardware Filter Block and disable all filtering.</div><div class='del'>- */</div><div class='del'>-static void bcmgenet_hfb_clear(struct bcmgenet_priv *priv)</div><div class='del'>-{</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	bcmgenet_hfb_reg_writel(priv, 0x0, HFB_CTRL);</div><div class='del'>-	bcmgenet_hfb_reg_writel(priv, 0x0, HFB_FLT_ENABLE_V3PLUS);</div><div class='del'>-	bcmgenet_hfb_reg_writel(priv, 0x0, HFB_FLT_ENABLE_V3PLUS + 4);</div><div class='del'>-</div><div class='del'>-	for (i = DMA_INDEX2RING_0; i &lt;= DMA_INDEX2RING_7; i++)</div><div class='del'>-		bcmgenet_rdma_writel(priv, 0x0, i);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (priv-&gt;hw_params-&gt;hfb_filter_cnt / 4); i++)</div><div class='del'>-		bcmgenet_hfb_reg_writel(priv, 0x0,</div><div class='del'>-					HFB_FLT_LEN_V3PLUS + i * sizeof(u32));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;hfb_filter_cnt *</div><div class='del'>-			priv-&gt;hw_params-&gt;hfb_filter_size; i++)</div><div class='del'>-		bcmgenet_hfb_writel(priv, 0x0, i * sizeof(u32));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void bcmgenet_hfb_init(struct bcmgenet_priv *priv)</div><div class='add'>+static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv,</div><div class='add'>+				 unsigned char *addr)</div><div class='ctx'> {</div><div class='del'>-	if (GENET_IS_V1(priv) || GENET_IS_V2(priv))</div><div class='del'>-		return;</div><div class='add'>+	u32 addr_tmp;</div><div class='ctx'> </div><div class='del'>-	bcmgenet_hfb_clear(priv);</div><div class='add'>+	addr_tmp = bcmgenet_umac_readl(priv, UMAC_MAC0);</div><div class='add'>+	put_unaligned_be32(addr_tmp, &amp;addr[0]);</div><div class='add'>+	addr_tmp = bcmgenet_umac_readl(priv, UMAC_MAC1);</div><div class='add'>+	put_unaligned_be16(addr_tmp, &amp;addr[4]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_netif_start(struct net_device *dev)</div><div class='hunk'>@@ -2851,6 +3292,9 @@ static void bcmgenet_netif_start(struct net_device *dev)</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Start the network engine */</div><div class='add'>+	netif_addr_lock_bh(dev);</div><div class='add'>+	bcmgenet_set_rx_mode(dev);</div><div class='add'>+	netif_addr_unlock_bh(dev);</div><div class='ctx'> 	bcmgenet_enable_rx_napi(priv);</div><div class='ctx'> </div><div class='ctx'> 	umac_enable_set(priv, CMD_TX_EN | CMD_RX_EN, true);</div><div class='hunk'>@@ -2866,8 +3310,6 @@ static void bcmgenet_netif_start(struct net_device *dev)</div><div class='ctx'> static int bcmgenet_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long dma_ctrl;</div><div class='del'>-	u32 reg;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, ifup, dev, "bcmgenet_open\n");</div><div class='hunk'>@@ -2886,34 +3328,23 @@ static int bcmgenet_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	init_umac(priv);</div><div class='ctx'> </div><div class='del'>-	/* Make sure we reflect the value of CRC_CMD_FWD */</div><div class='del'>-	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='del'>-	priv-&gt;crc_fwd_en = !!(reg &amp; CMD_CRC_FWD);</div><div class='add'>+	/* Apply features again in case we changed them while interface was</div><div class='add'>+	 * down</div><div class='add'>+	 */</div><div class='add'>+	bcmgenet_set_features(dev, dev-&gt;features);</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_set_hw_addr(priv, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;internal_phy) {</div><div class='del'>-		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);</div><div class='del'>-		reg |= EXT_ENERGY_DET_MASK;</div><div class='del'>-		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Disable RX/TX DMA and flush TX queues */</div><div class='del'>-	dma_ctrl = bcmgenet_dma_disable(priv);</div><div class='add'>+	/* HFB init */</div><div class='add'>+	bcmgenet_hfb_init(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Reinitialize TDMA and RDMA and SW housekeeping */</div><div class='del'>-	ret = bcmgenet_init_dma(priv);</div><div class='add'>+	ret = bcmgenet_init_dma(priv, true);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		netdev_err(dev, "failed to initialize DMA\n");</div><div class='ctx'> 		goto err_clk_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Always enable ring 16 - descriptor ring */</div><div class='del'>-	bcmgenet_enable_dma(priv, dma_ctrl);</div><div class='del'>-</div><div class='del'>-	/* HFB init */</div><div class='del'>-	bcmgenet_hfb_init(priv);</div><div class='del'>-</div><div class='ctx'> 	ret = request_irq(priv-&gt;irq0, bcmgenet_isr0, IRQF_SHARED,</div><div class='ctx'> 			  dev-&gt;name, priv);</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='hunk'>@@ -2934,6 +3365,8 @@ static int bcmgenet_open(struct net_device *dev)</div><div class='ctx'> 		goto err_irq1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bcmgenet_phy_pause_set(dev, priv-&gt;rx_pause, priv-&gt;tx_pause);</div><div class='add'>+</div><div class='ctx'> 	bcmgenet_netif_start(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(dev);</div><div class='hunk'>@@ -2954,22 +3387,25 @@ err_clk_disable:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcmgenet_netif_stop(struct net_device *dev)</div><div class='add'>+static void bcmgenet_netif_stop(struct net_device *dev, bool stop_phy)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	bcmgenet_disable_tx_napi(priv);</div><div class='ctx'> 	netif_tx_disable(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable MAC receive */</div><div class='add'>+	bcmgenet_hfb_reg_writel(priv, 0, HFB_CTRL);</div><div class='ctx'> 	umac_enable_set(priv, CMD_RX_EN, false);</div><div class='ctx'> </div><div class='add'>+	if (stop_phy)</div><div class='add'>+		phy_stop(dev-&gt;phydev);</div><div class='add'>+</div><div class='ctx'> 	bcmgenet_dma_teardown(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable MAC transmit. TX DMA disabled must be done before this */</div><div class='ctx'> 	umac_enable_set(priv, CMD_TX_EN, false);</div><div class='ctx'> </div><div class='del'>-	phy_stop(dev-&gt;phydev);</div><div class='add'>+	bcmgenet_disable_tx_napi(priv);</div><div class='ctx'> 	bcmgenet_disable_rx_napi(priv);</div><div class='ctx'> 	bcmgenet_intr_disable(priv);</div><div class='ctx'> </div><div class='hunk'>@@ -2978,11 +3414,6 @@ static void bcmgenet_netif_stop(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;bcmgenet_irq_work);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;old_link = -1;</div><div class='del'>-	priv-&gt;old_speed = -1;</div><div class='del'>-	priv-&gt;old_duplex = -1;</div><div class='del'>-	priv-&gt;old_pause = -1;</div><div class='del'>-</div><div class='ctx'> 	/* tx reclaim */</div><div class='ctx'> 	bcmgenet_tx_reclaim_all(dev);</div><div class='ctx'> 	bcmgenet_fini_dma(priv);</div><div class='hunk'>@@ -2995,7 +3426,7 @@ static int bcmgenet_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, ifdown, dev, "bcmgenet_close\n");</div><div class='ctx'> </div><div class='del'>-	bcmgenet_netif_stop(dev);</div><div class='add'>+	bcmgenet_netif_stop(dev, false);</div><div class='ctx'> </div><div class='ctx'> 	/* Really kill the PHY state machine and disconnect from it */</div><div class='ctx'> 	phy_disconnect(dev-&gt;phydev);</div><div class='hunk'>@@ -3022,16 +3453,11 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring)</div><div class='ctx'> 	if (!netif_msg_tx_err(priv))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	txq = netdev_get_tx_queue(priv-&gt;dev, ring-&gt;queue);</div><div class='add'>+	txq = netdev_get_tx_queue(priv-&gt;dev, ring-&gt;index);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;ring-&gt;lock);</div><div class='del'>-	if (ring-&gt;index == DESC_INDEX) {</div><div class='del'>-		intsts = ~bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_MASK_STATUS);</div><div class='del'>-		intmsk = UMAC_IRQ_TXDMA_DONE | UMAC_IRQ_TXDMA_MBDONE;</div><div class='del'>-	} else {</div><div class='del'>-		intsts = ~bcmgenet_intrl2_1_readl(priv, INTRL2_CPU_MASK_STATUS);</div><div class='del'>-		intmsk = 1 &lt;&lt; ring-&gt;index;</div><div class='del'>-	}</div><div class='add'>+	intsts = ~bcmgenet_intrl2_1_readl(priv, INTRL2_CPU_MASK_STATUS);</div><div class='add'>+	intmsk = 1 &lt;&lt; ring-&gt;index;</div><div class='ctx'> 	c_index = bcmgenet_tdma_ring_readl(priv, ring-&gt;index, TDMA_CONS_INDEX);</div><div class='ctx'> 	p_index = bcmgenet_tdma_ring_readl(priv, ring-&gt;index, TDMA_PROD_INDEX);</div><div class='ctx'> 	txq_stopped = netif_tx_queue_stopped(txq);</div><div class='hunk'>@@ -3045,7 +3471,7 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring)</div><div class='ctx'> 		  "(sw)c_index: %d (hw)c_index: %d\n"</div><div class='ctx'> 		  "(sw)clean_p: %d (sw)write_p: %d\n"</div><div class='ctx'> 		  "(sw)cb_ptr: %d (sw)end_ptr: %d\n",</div><div class='del'>-		  ring-&gt;index, ring-&gt;queue,</div><div class='add'>+		  ring-&gt;index, ring-&gt;index,</div><div class='ctx'> 		  txq_stopped ? "stopped" : "active",</div><div class='ctx'> 		  intsts &amp; intmsk ? "enabled" : "disabled",</div><div class='ctx'> 		  free_bds, ring-&gt;size,</div><div class='hunk'>@@ -3055,105 +3481,98 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring)</div><div class='ctx'> 		  ring-&gt;cb_ptr, ring-&gt;end_ptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcmgenet_timeout(struct net_device *dev)</div><div class='add'>+static void bcmgenet_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 int0_enable = 0;</div><div class='ctx'> 	u32 int1_enable = 0;</div><div class='ctx'> 	unsigned int q;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, tx_err, dev, "bcmgenet_timeout\n");</div><div class='ctx'> </div><div class='del'>-	for (q = 0; q &lt; priv-&gt;hw_params-&gt;tx_queues; q++)</div><div class='add'>+	for (q = 0; q &lt;= priv-&gt;hw_params-&gt;tx_queues; q++)</div><div class='ctx'> 		bcmgenet_dump_tx_queue(&amp;priv-&gt;tx_rings[q]);</div><div class='del'>-	bcmgenet_dump_tx_queue(&amp;priv-&gt;tx_rings[DESC_INDEX]);</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_tx_reclaim_all(dev);</div><div class='ctx'> </div><div class='del'>-	for (q = 0; q &lt; priv-&gt;hw_params-&gt;tx_queues; q++)</div><div class='add'>+	for (q = 0; q &lt;= priv-&gt;hw_params-&gt;tx_queues; q++)</div><div class='ctx'> 		int1_enable |= (1 &lt;&lt; q);</div><div class='ctx'> </div><div class='del'>-	int0_enable = UMAC_IRQ_TXDMA_DONE;</div><div class='del'>-</div><div class='ctx'> 	/* Re-enable TX interrupts if disabled */</div><div class='del'>-	bcmgenet_intrl2_0_writel(priv, int0_enable, INTRL2_CPU_MASK_CLEAR);</div><div class='ctx'> 	bcmgenet_intrl2_1_writel(priv, int1_enable, INTRL2_CPU_MASK_CLEAR);</div><div class='ctx'> </div><div class='ctx'> 	netif_trans_update(dev);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='add'>+	BCMGENET_STATS64_INC((&amp;priv-&gt;tx_rings[txqueue].stats64), errors);</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_wake_all_queues(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define MAX_MC_COUNT	16</div><div class='add'>+#define MAX_MDF_FILTER	17</div><div class='ctx'> </div><div class='ctx'> static inline void bcmgenet_set_mdf_addr(struct bcmgenet_priv *priv,</div><div class='del'>-					 unsigned char *addr,</div><div class='del'>-					 int *i,</div><div class='del'>-					 int *mc)</div><div class='add'>+					 const unsigned char *addr,</div><div class='add'>+					 int *i)</div><div class='ctx'> {</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='ctx'> 	bcmgenet_umac_writel(priv, addr[0] &lt;&lt; 8 | addr[1],</div><div class='ctx'> 			     UMAC_MDF_ADDR + (*i * 4));</div><div class='ctx'> 	bcmgenet_umac_writel(priv, addr[2] &lt;&lt; 24 | addr[3] &lt;&lt; 16 |</div><div class='ctx'> 			     addr[4] &lt;&lt; 8 | addr[5],</div><div class='ctx'> 			     UMAC_MDF_ADDR + ((*i + 1) * 4));</div><div class='del'>-	reg = bcmgenet_umac_readl(priv, UMAC_MDF_CTRL);</div><div class='del'>-	reg |= (1 &lt;&lt; (MAX_MC_COUNT - *mc));</div><div class='del'>-	bcmgenet_umac_writel(priv, reg, UMAC_MDF_CTRL);</div><div class='ctx'> 	*i += 2;</div><div class='del'>-	(*mc)++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_set_rx_mode(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='del'>-	int i, mc;</div><div class='add'>+	int i, nfilter;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, hw, dev, "%s: %08X\n", __func__, dev-&gt;flags);</div><div class='ctx'> </div><div class='del'>-	/* Promiscuous mode */</div><div class='add'>+	/* Number of filters needed */</div><div class='add'>+	nfilter = netdev_uc_count(dev) + netdev_mc_count(dev) + 2;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Turn on promicuous mode for three scenarios</div><div class='add'>+	 * 1. IFF_PROMISC flag is set</div><div class='add'>+	 * 2. IFF_ALLMULTI flag is set</div><div class='add'>+	 * 3. The number of filters needed exceeds the number filters</div><div class='add'>+	 *    supported by the hardware.</div><div class='add'>+	*/</div><div class='add'>+	spin_lock(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+	if ((dev-&gt;flags &amp; (IFF_PROMISC | IFF_ALLMULTI)) ||</div><div class='add'>+	    (nfilter &gt; MAX_MDF_FILTER)) {</div><div class='ctx'> 		reg |= CMD_PROMISC;</div><div class='ctx'> 		bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='add'>+		spin_unlock(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 		bcmgenet_umac_writel(priv, 0, UMAC_MDF_CTRL);</div><div class='ctx'> 		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		reg &amp;= ~CMD_PROMISC;</div><div class='ctx'> 		bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* UniMac doesn't support ALLMULTI */</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='del'>-		netdev_warn(dev, "ALLMULTI is not supported\n");</div><div class='del'>-		return;</div><div class='add'>+		spin_unlock(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* update MDF filter */</div><div class='ctx'> 	i = 0;</div><div class='del'>-	mc = 0;</div><div class='ctx'> 	/* Broadcast */</div><div class='del'>-	bcmgenet_set_mdf_addr(priv, dev-&gt;broadcast, &amp;i, &amp;mc);</div><div class='add'>+	bcmgenet_set_mdf_addr(priv, dev-&gt;broadcast, &amp;i);</div><div class='ctx'> 	/* my own address.*/</div><div class='del'>-	bcmgenet_set_mdf_addr(priv, dev-&gt;dev_addr, &amp;i, &amp;mc);</div><div class='del'>-	/* Unicast list*/</div><div class='del'>-	if (netdev_uc_count(dev) &gt; (MAX_MC_COUNT - mc))</div><div class='del'>-		return;</div><div class='add'>+	bcmgenet_set_mdf_addr(priv, dev-&gt;dev_addr, &amp;i);</div><div class='ctx'> </div><div class='del'>-	if (!netdev_uc_empty(dev))</div><div class='del'>-		netdev_for_each_uc_addr(ha, dev)</div><div class='del'>-			bcmgenet_set_mdf_addr(priv, ha-&gt;addr, &amp;i, &amp;mc);</div><div class='del'>-	/* Multicast */</div><div class='del'>-	if (netdev_mc_empty(dev) || netdev_mc_count(dev) &gt;= (MAX_MC_COUNT - mc))</div><div class='del'>-		return;</div><div class='add'>+	/* Unicast */</div><div class='add'>+	netdev_for_each_uc_addr(ha, dev)</div><div class='add'>+		bcmgenet_set_mdf_addr(priv, ha-&gt;addr, &amp;i);</div><div class='ctx'> </div><div class='add'>+	/* Multicast */</div><div class='ctx'> 	netdev_for_each_mc_addr(ha, dev)</div><div class='del'>-		bcmgenet_set_mdf_addr(priv, ha-&gt;addr, &amp;i, &amp;mc);</div><div class='add'>+		bcmgenet_set_mdf_addr(priv, ha-&gt;addr, &amp;i);</div><div class='add'>+</div><div class='add'>+	/* Enable filters */</div><div class='add'>+	reg = GENMASK(MAX_MDF_FILTER - 1, MAX_MDF_FILTER - nfilter);</div><div class='add'>+	bcmgenet_umac_writel(priv, reg, UMAC_MDF_CTRL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set the hardware MAC address. */</div><div class='hunk'>@@ -3167,51 +3586,93 @@ static int bcmgenet_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, addr-&gt;sa_data);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_stats *bcmgenet_get_stats(struct net_device *dev)</div><div class='add'>+static void bcmgenet_get_stats64(struct net_device *dev,</div><div class='add'>+				 struct rtnl_link_stats64 *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long tx_bytes = 0, tx_packets = 0;</div><div class='del'>-	unsigned long rx_bytes = 0, rx_packets = 0;</div><div class='del'>-	unsigned long rx_errors = 0, rx_dropped = 0;</div><div class='del'>-	struct bcmgenet_tx_ring *tx_ring;</div><div class='del'>-	struct bcmgenet_rx_ring *rx_ring;</div><div class='add'>+	struct bcmgenet_tx_stats64 *tx_stats;</div><div class='add'>+	struct bcmgenet_rx_stats64 *rx_stats;</div><div class='add'>+	u64 rx_length_errors, rx_over_errors;</div><div class='add'>+	u64 rx_missed, rx_fragmented_errors;</div><div class='add'>+	u64 rx_crc_errors, rx_frame_errors;</div><div class='add'>+	u64 tx_errors, tx_dropped;</div><div class='add'>+	u64 rx_errors, rx_dropped;</div><div class='add'>+	u64 tx_bytes, tx_packets;</div><div class='add'>+	u64 rx_bytes, rx_packets;</div><div class='add'>+	unsigned int start;</div><div class='ctx'> 	unsigned int q;</div><div class='add'>+	u64 multicast;</div><div class='add'>+</div><div class='add'>+	for (q = 0; q &lt;= priv-&gt;hw_params-&gt;tx_queues; q++) {</div><div class='add'>+		tx_stats = &amp;priv-&gt;tx_rings[q].stats64;</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;tx_stats-&gt;syncp);</div><div class='add'>+			tx_bytes = u64_stats_read(&amp;tx_stats-&gt;bytes);</div><div class='add'>+			tx_packets = u64_stats_read(&amp;tx_stats-&gt;packets);</div><div class='add'>+			tx_errors = u64_stats_read(&amp;tx_stats-&gt;errors);</div><div class='add'>+			tx_dropped = u64_stats_read(&amp;tx_stats-&gt;dropped);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;tx_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		stats-&gt;tx_bytes += tx_bytes;</div><div class='add'>+		stats-&gt;tx_packets += tx_packets;</div><div class='add'>+		stats-&gt;tx_errors += tx_errors;</div><div class='add'>+		stats-&gt;tx_dropped += tx_dropped;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	for (q = 0; q &lt; priv-&gt;hw_params-&gt;tx_queues; q++) {</div><div class='del'>-		tx_ring = &amp;priv-&gt;tx_rings[q];</div><div class='del'>-		tx_bytes += tx_ring-&gt;bytes;</div><div class='del'>-		tx_packets += tx_ring-&gt;packets;</div><div class='add'>+	for (q = 0; q &lt;= priv-&gt;hw_params-&gt;rx_queues; q++) {</div><div class='add'>+		rx_stats = &amp;priv-&gt;rx_rings[q].stats64;</div><div class='add'>+		do {</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;rx_stats-&gt;syncp);</div><div class='add'>+			rx_bytes = u64_stats_read(&amp;rx_stats-&gt;bytes);</div><div class='add'>+			rx_packets = u64_stats_read(&amp;rx_stats-&gt;packets);</div><div class='add'>+			rx_errors = u64_stats_read(&amp;rx_stats-&gt;errors);</div><div class='add'>+			rx_dropped = u64_stats_read(&amp;rx_stats-&gt;dropped);</div><div class='add'>+			rx_missed = u64_stats_read(&amp;rx_stats-&gt;missed);</div><div class='add'>+			rx_length_errors = u64_stats_read(&amp;rx_stats-&gt;length_errors);</div><div class='add'>+			rx_over_errors = u64_stats_read(&amp;rx_stats-&gt;over_errors);</div><div class='add'>+			rx_crc_errors = u64_stats_read(&amp;rx_stats-&gt;crc_errors);</div><div class='add'>+			rx_frame_errors = u64_stats_read(&amp;rx_stats-&gt;frame_errors);</div><div class='add'>+			rx_fragmented_errors = u64_stats_read(&amp;rx_stats-&gt;fragmented_errors);</div><div class='add'>+			multicast = u64_stats_read(&amp;rx_stats-&gt;multicast);</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;rx_stats-&gt;syncp, start));</div><div class='add'>+</div><div class='add'>+		rx_errors += rx_length_errors;</div><div class='add'>+		rx_errors += rx_crc_errors;</div><div class='add'>+		rx_errors += rx_frame_errors;</div><div class='add'>+		rx_errors += rx_fragmented_errors;</div><div class='add'>+</div><div class='add'>+		stats-&gt;rx_bytes += rx_bytes;</div><div class='add'>+		stats-&gt;rx_packets += rx_packets;</div><div class='add'>+		stats-&gt;rx_errors += rx_errors;</div><div class='add'>+		stats-&gt;rx_dropped += rx_dropped;</div><div class='add'>+		stats-&gt;rx_missed_errors += rx_missed;</div><div class='add'>+		stats-&gt;rx_length_errors += rx_length_errors;</div><div class='add'>+		stats-&gt;rx_over_errors += rx_over_errors;</div><div class='add'>+		stats-&gt;rx_crc_errors += rx_crc_errors;</div><div class='add'>+		stats-&gt;rx_frame_errors += rx_frame_errors;</div><div class='add'>+		stats-&gt;multicast += multicast;</div><div class='ctx'> 	}</div><div class='del'>-	tx_ring = &amp;priv-&gt;tx_rings[DESC_INDEX];</div><div class='del'>-	tx_bytes += tx_ring-&gt;bytes;</div><div class='del'>-	tx_packets += tx_ring-&gt;packets;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (q = 0; q &lt; priv-&gt;hw_params-&gt;rx_queues; q++) {</div><div class='del'>-		rx_ring = &amp;priv-&gt;rx_rings[q];</div><div class='add'>+static int bcmgenet_change_carrier(struct net_device *dev, bool new_carrier)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-		rx_bytes += rx_ring-&gt;bytes;</div><div class='del'>-		rx_packets += rx_ring-&gt;packets;</div><div class='del'>-		rx_errors += rx_ring-&gt;errors;</div><div class='del'>-		rx_dropped += rx_ring-&gt;dropped;</div><div class='del'>-	}</div><div class='del'>-	rx_ring = &amp;priv-&gt;rx_rings[DESC_INDEX];</div><div class='del'>-	rx_bytes += rx_ring-&gt;bytes;</div><div class='del'>-	rx_packets += rx_ring-&gt;packets;</div><div class='del'>-	rx_errors += rx_ring-&gt;errors;</div><div class='del'>-	rx_dropped += rx_ring-&gt;dropped;</div><div class='add'>+	if (!dev-&gt;phydev || !phy_is_pseudo_fixed_link(dev-&gt;phydev) ||</div><div class='add'>+	    priv-&gt;phy_interface != PHY_INTERFACE_MODE_MOCA)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;stats.tx_bytes = tx_bytes;</div><div class='del'>-	dev-&gt;stats.tx_packets = tx_packets;</div><div class='del'>-	dev-&gt;stats.rx_bytes = rx_bytes;</div><div class='del'>-	dev-&gt;stats.rx_packets = rx_packets;</div><div class='del'>-	dev-&gt;stats.rx_errors = rx_errors;</div><div class='del'>-	dev-&gt;stats.rx_missed_errors = rx_errors;</div><div class='del'>-	return &amp;dev-&gt;stats;</div><div class='add'>+	if (new_carrier)</div><div class='add'>+		netif_carrier_on(dev);</div><div class='add'>+	else</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops bcmgenet_netdev_ops = {</div><div class='hunk'>@@ -3221,140 +3682,115 @@ static const struct net_device_ops bcmgenet_netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= bcmgenet_timeout,</div><div class='ctx'> 	.ndo_set_rx_mode	= bcmgenet_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= bcmgenet_set_mac_addr,</div><div class='del'>-	.ndo_do_ioctl		= bcmgenet_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl_running,</div><div class='ctx'> 	.ndo_set_features	= bcmgenet_set_features,</div><div class='del'>-#ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='del'>-	.ndo_poll_controller	= bcmgenet_poll_controller,</div><div class='del'>-#endif</div><div class='del'>-	.ndo_get_stats		= bcmgenet_get_stats,</div><div class='add'>+	.ndo_get_stats64	= bcmgenet_get_stats64,</div><div class='add'>+	.ndo_change_carrier	= bcmgenet_change_carrier,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* Array of GENET hardware parameters/characteristics */</div><div class='del'>-static struct bcmgenet_hw_params bcmgenet_hw_params[] = {</div><div class='del'>-	[GENET_V1] = {</div><div class='del'>-		.tx_queues = 0,</div><div class='del'>-		.tx_bds_per_q = 0,</div><div class='del'>-		.rx_queues = 0,</div><div class='del'>-		.rx_bds_per_q = 0,</div><div class='del'>-		.bp_in_en_shift = 16,</div><div class='del'>-		.bp_in_mask = 0xffff,</div><div class='del'>-		.hfb_filter_cnt = 16,</div><div class='del'>-		.qtag_mask = 0x1F,</div><div class='del'>-		.hfb_offset = 0x1000,</div><div class='del'>-		.rdma_offset = 0x2000,</div><div class='del'>-		.tdma_offset = 0x3000,</div><div class='del'>-		.words_per_bd = 2,</div><div class='del'>-	},</div><div class='del'>-	[GENET_V2] = {</div><div class='del'>-		.tx_queues = 4,</div><div class='del'>-		.tx_bds_per_q = 32,</div><div class='del'>-		.rx_queues = 0,</div><div class='del'>-		.rx_bds_per_q = 0,</div><div class='del'>-		.bp_in_en_shift = 16,</div><div class='del'>-		.bp_in_mask = 0xffff,</div><div class='del'>-		.hfb_filter_cnt = 16,</div><div class='del'>-		.qtag_mask = 0x1F,</div><div class='del'>-		.tbuf_offset = 0x0600,</div><div class='del'>-		.hfb_offset = 0x1000,</div><div class='del'>-		.hfb_reg_offset = 0x2000,</div><div class='del'>-		.rdma_offset = 0x3000,</div><div class='del'>-		.tdma_offset = 0x4000,</div><div class='del'>-		.words_per_bd = 2,</div><div class='del'>-		.flags = GENET_HAS_EXT,</div><div class='del'>-	},</div><div class='del'>-	[GENET_V3] = {</div><div class='del'>-		.tx_queues = 4,</div><div class='del'>-		.tx_bds_per_q = 32,</div><div class='del'>-		.rx_queues = 0,</div><div class='del'>-		.rx_bds_per_q = 0,</div><div class='del'>-		.bp_in_en_shift = 17,</div><div class='del'>-		.bp_in_mask = 0x1ffff,</div><div class='del'>-		.hfb_filter_cnt = 48,</div><div class='del'>-		.hfb_filter_size = 128,</div><div class='del'>-		.qtag_mask = 0x3F,</div><div class='del'>-		.tbuf_offset = 0x0600,</div><div class='del'>-		.hfb_offset = 0x8000,</div><div class='del'>-		.hfb_reg_offset = 0xfc00,</div><div class='del'>-		.rdma_offset = 0x10000,</div><div class='del'>-		.tdma_offset = 0x11000,</div><div class='del'>-		.words_per_bd = 2,</div><div class='del'>-		.flags = GENET_HAS_EXT | GENET_HAS_MDIO_INTR |</div><div class='del'>-			 GENET_HAS_MOCA_LINK_DET,</div><div class='del'>-	},</div><div class='del'>-	[GENET_V4] = {</div><div class='del'>-		.tx_queues = 4,</div><div class='del'>-		.tx_bds_per_q = 32,</div><div class='del'>-		.rx_queues = 0,</div><div class='del'>-		.rx_bds_per_q = 0,</div><div class='del'>-		.bp_in_en_shift = 17,</div><div class='del'>-		.bp_in_mask = 0x1ffff,</div><div class='del'>-		.hfb_filter_cnt = 48,</div><div class='del'>-		.hfb_filter_size = 128,</div><div class='del'>-		.qtag_mask = 0x3F,</div><div class='del'>-		.tbuf_offset = 0x0600,</div><div class='del'>-		.hfb_offset = 0x8000,</div><div class='del'>-		.hfb_reg_offset = 0xfc00,</div><div class='del'>-		.rdma_offset = 0x2000,</div><div class='del'>-		.tdma_offset = 0x4000,</div><div class='del'>-		.words_per_bd = 3,</div><div class='del'>-		.flags = GENET_HAS_40BITS | GENET_HAS_EXT |</div><div class='del'>-			 GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET,</div><div class='del'>-	},</div><div class='del'>-	[GENET_V5] = {</div><div class='del'>-		.tx_queues = 4,</div><div class='del'>-		.tx_bds_per_q = 32,</div><div class='del'>-		.rx_queues = 0,</div><div class='del'>-		.rx_bds_per_q = 0,</div><div class='del'>-		.bp_in_en_shift = 17,</div><div class='del'>-		.bp_in_mask = 0x1ffff,</div><div class='del'>-		.hfb_filter_cnt = 48,</div><div class='del'>-		.hfb_filter_size = 128,</div><div class='del'>-		.qtag_mask = 0x3F,</div><div class='del'>-		.tbuf_offset = 0x0600,</div><div class='del'>-		.hfb_offset = 0x8000,</div><div class='del'>-		.hfb_reg_offset = 0xfc00,</div><div class='del'>-		.rdma_offset = 0x2000,</div><div class='del'>-		.tdma_offset = 0x4000,</div><div class='del'>-		.words_per_bd = 3,</div><div class='del'>-		.flags = GENET_HAS_40BITS | GENET_HAS_EXT |</div><div class='del'>-			 GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET,</div><div class='del'>-	},</div><div class='add'>+/* GENET hardware parameters/characteristics */</div><div class='add'>+static const struct bcmgenet_hw_params bcmgenet_hw_params_v1 = {</div><div class='add'>+	.tx_queues = 0,</div><div class='add'>+	.tx_bds_per_q = 0,</div><div class='add'>+	.rx_queues = 0,</div><div class='add'>+	.rx_bds_per_q = 0,</div><div class='add'>+	.bp_in_en_shift = 16,</div><div class='add'>+	.bp_in_mask = 0xffff,</div><div class='add'>+	.hfb_filter_cnt = 16,</div><div class='add'>+	.hfb_filter_size = 64,</div><div class='add'>+	.qtag_mask = 0x1F,</div><div class='add'>+	.hfb_offset = 0x1000,</div><div class='add'>+	.hfb_reg_offset = GENET_RBUF_OFF + RBUF_HFB_CTRL_V1,</div><div class='add'>+	.rdma_offset = 0x2000,</div><div class='add'>+	.tdma_offset = 0x3000,</div><div class='add'>+	.words_per_bd = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_hw_params bcmgenet_hw_params_v2 = {</div><div class='add'>+	.tx_queues = 4,</div><div class='add'>+	.tx_bds_per_q = 32,</div><div class='add'>+	.rx_queues = 0,</div><div class='add'>+	.rx_bds_per_q = 0,</div><div class='add'>+	.bp_in_en_shift = 16,</div><div class='add'>+	.bp_in_mask = 0xffff,</div><div class='add'>+	.hfb_filter_cnt = 16,</div><div class='add'>+	.hfb_filter_size = 64,</div><div class='add'>+	.qtag_mask = 0x1F,</div><div class='add'>+	.tbuf_offset = 0x0600,</div><div class='add'>+	.hfb_offset = 0x1000,</div><div class='add'>+	.hfb_reg_offset = 0x2000,</div><div class='add'>+	.rdma_offset = 0x3000,</div><div class='add'>+	.tdma_offset = 0x4000,</div><div class='add'>+	.words_per_bd = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_hw_params bcmgenet_hw_params_v3 = {</div><div class='add'>+	.tx_queues = 4,</div><div class='add'>+	.tx_bds_per_q = 32,</div><div class='add'>+	.rx_queues = 0,</div><div class='add'>+	.rx_bds_per_q = 0,</div><div class='add'>+	.bp_in_en_shift = 17,</div><div class='add'>+	.bp_in_mask = 0x1ffff,</div><div class='add'>+	.hfb_filter_cnt = 48,</div><div class='add'>+	.hfb_filter_size = 128,</div><div class='add'>+	.qtag_mask = 0x3F,</div><div class='add'>+	.tbuf_offset = 0x0600,</div><div class='add'>+	.hfb_offset = 0x8000,</div><div class='add'>+	.hfb_reg_offset = 0xfc00,</div><div class='add'>+	.rdma_offset = 0x10000,</div><div class='add'>+	.tdma_offset = 0x11000,</div><div class='add'>+	.words_per_bd = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_hw_params bcmgenet_hw_params_v4 = {</div><div class='add'>+	.tx_queues = 4,</div><div class='add'>+	.tx_bds_per_q = 32,</div><div class='add'>+	.rx_queues = 0,</div><div class='add'>+	.rx_bds_per_q = 0,</div><div class='add'>+	.bp_in_en_shift = 17,</div><div class='add'>+	.bp_in_mask = 0x1ffff,</div><div class='add'>+	.hfb_filter_cnt = 48,</div><div class='add'>+	.hfb_filter_size = 128,</div><div class='add'>+	.qtag_mask = 0x3F,</div><div class='add'>+	.tbuf_offset = 0x0600,</div><div class='add'>+	.hfb_offset = 0x8000,</div><div class='add'>+	.hfb_reg_offset = 0xfc00,</div><div class='add'>+	.rdma_offset = 0x2000,</div><div class='add'>+	.tdma_offset = 0x4000,</div><div class='add'>+	.words_per_bd = 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Infer hardware parameters from the detected GENET version */</div><div class='ctx'> static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct bcmgenet_hw_params *params;</div><div class='add'>+	const struct bcmgenet_hw_params *params;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> 	u8 major;</div><div class='ctx'> 	u16 gphy_rev;</div><div class='ctx'> </div><div class='del'>-	if (GENET_IS_V5(priv) || GENET_IS_V4(priv)) {</div><div class='del'>-		bcmgenet_dma_regs = bcmgenet_dma_regs_v3plus;</div><div class='del'>-		genet_dma_ring_regs = genet_dma_ring_regs_v4;</div><div class='del'>-		priv-&gt;dma_rx_chk_bit = DMA_RX_CHK_V3PLUS;</div><div class='del'>-	} else if (GENET_IS_V3(priv)) {</div><div class='add'>+	/* default to latest values */</div><div class='add'>+	params = &amp;bcmgenet_hw_params_v4;</div><div class='add'>+	bcmgenet_dma_regs = bcmgenet_dma_regs_v3plus;</div><div class='add'>+	genet_dma_ring_regs = genet_dma_ring_regs_v4;</div><div class='add'>+	if (GENET_IS_V3(priv)) {</div><div class='add'>+		params = &amp;bcmgenet_hw_params_v3;</div><div class='ctx'> 		bcmgenet_dma_regs = bcmgenet_dma_regs_v3plus;</div><div class='ctx'> 		genet_dma_ring_regs = genet_dma_ring_regs_v123;</div><div class='del'>-		priv-&gt;dma_rx_chk_bit = DMA_RX_CHK_V3PLUS;</div><div class='ctx'> 	} else if (GENET_IS_V2(priv)) {</div><div class='add'>+		params = &amp;bcmgenet_hw_params_v2;</div><div class='ctx'> 		bcmgenet_dma_regs = bcmgenet_dma_regs_v2;</div><div class='ctx'> 		genet_dma_ring_regs = genet_dma_ring_regs_v123;</div><div class='del'>-		priv-&gt;dma_rx_chk_bit = DMA_RX_CHK_V12;</div><div class='ctx'> 	} else if (GENET_IS_V1(priv)) {</div><div class='add'>+		params = &amp;bcmgenet_hw_params_v1;</div><div class='ctx'> 		bcmgenet_dma_regs = bcmgenet_dma_regs_v1;</div><div class='ctx'> 		genet_dma_ring_regs = genet_dma_ring_regs_v123;</div><div class='del'>-		priv-&gt;dma_rx_chk_bit = DMA_RX_CHK_V12;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	/* enum genet_version starts at 1 */</div><div class='del'>-	priv-&gt;hw_params = &amp;bcmgenet_hw_params[priv-&gt;version];</div><div class='del'>-	params = priv-&gt;hw_params;</div><div class='add'>+	priv-&gt;hw_params = params;</div><div class='ctx'> </div><div class='ctx'> 	/* Read GENET HW version */</div><div class='ctx'> 	reg = bcmgenet_sys_readl(priv, SYS_REV_CTRL);</div><div class='ctx'> 	major = (reg &gt;&gt; 24 &amp; 0x0f);</div><div class='del'>-	if (major == 6)</div><div class='add'>+	if (major == 6 || major == 7)</div><div class='ctx'> 		major = 5;</div><div class='ctx'> 	else if (major == 5)</div><div class='ctx'> 		major = 4;</div><div class='hunk'>@@ -3405,7 +3841,7 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PHYS_ADDR_T_64BIT</div><div class='del'>-	if (!(params-&gt;flags &amp; GENET_HAS_40BITS))</div><div class='add'>+	if (!bcmgenet_has_40bits(priv))</div><div class='ctx'> 		pr_warn("GENET does not support 40-bits PA\n");</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -3427,28 +3863,78 @@ static void bcmgenet_set_hw_params(struct bcmgenet_priv *priv)</div><div class='ctx'> 		params-&gt;words_per_bd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct bcmgenet_plat_data {</div><div class='add'>+	enum bcmgenet_version version;</div><div class='add'>+	u32 dma_max_burst_length;</div><div class='add'>+	u32 flags;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data v1_plat_data = {</div><div class='add'>+	.version = GENET_V1,</div><div class='add'>+	.dma_max_burst_length = DMA_MAX_BURST_LENGTH,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data v2_plat_data = {</div><div class='add'>+	.version = GENET_V2,</div><div class='add'>+	.dma_max_burst_length = DMA_MAX_BURST_LENGTH,</div><div class='add'>+	.flags = GENET_HAS_EXT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data v3_plat_data = {</div><div class='add'>+	.version = GENET_V3,</div><div class='add'>+	.dma_max_burst_length = DMA_MAX_BURST_LENGTH,</div><div class='add'>+	.flags = GENET_HAS_EXT | GENET_HAS_MDIO_INTR |</div><div class='add'>+		 GENET_HAS_MOCA_LINK_DET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data v4_plat_data = {</div><div class='add'>+	.version = GENET_V4,</div><div class='add'>+	.dma_max_burst_length = DMA_MAX_BURST_LENGTH,</div><div class='add'>+	.flags = GENET_HAS_40BITS | GENET_HAS_EXT |</div><div class='add'>+		 GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data v5_plat_data = {</div><div class='add'>+	.version = GENET_V5,</div><div class='add'>+	.dma_max_burst_length = DMA_MAX_BURST_LENGTH,</div><div class='add'>+	.flags = GENET_HAS_40BITS | GENET_HAS_EXT |</div><div class='add'>+		 GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data bcm2711_plat_data = {</div><div class='add'>+	.version = GENET_V5,</div><div class='add'>+	.dma_max_burst_length = 0x08,</div><div class='add'>+	.flags = GENET_HAS_40BITS | GENET_HAS_EXT |</div><div class='add'>+		 GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct bcmgenet_plat_data bcm7712_plat_data = {</div><div class='add'>+	.version = GENET_V5,</div><div class='add'>+	.dma_max_burst_length = DMA_MAX_BURST_LENGTH,</div><div class='add'>+	.flags = GENET_HAS_40BITS | GENET_HAS_EXT |</div><div class='add'>+		 GENET_HAS_MDIO_INTR | GENET_HAS_MOCA_LINK_DET |</div><div class='add'>+		 GENET_HAS_EPHY_16NM,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct of_device_id bcmgenet_match[] = {</div><div class='del'>-	{ .compatible = "brcm,genet-v1", .data = (void *)GENET_V1 },</div><div class='del'>-	{ .compatible = "brcm,genet-v2", .data = (void *)GENET_V2 },</div><div class='del'>-	{ .compatible = "brcm,genet-v3", .data = (void *)GENET_V3 },</div><div class='del'>-	{ .compatible = "brcm,genet-v4", .data = (void *)GENET_V4 },</div><div class='del'>-	{ .compatible = "brcm,genet-v5", .data = (void *)GENET_V5 },</div><div class='add'>+	{ .compatible = "brcm,genet-v1", .data = &amp;v1_plat_data },</div><div class='add'>+	{ .compatible = "brcm,genet-v2", .data = &amp;v2_plat_data },</div><div class='add'>+	{ .compatible = "brcm,genet-v3", .data = &amp;v3_plat_data },</div><div class='add'>+	{ .compatible = "brcm,genet-v4", .data = &amp;v4_plat_data },</div><div class='add'>+	{ .compatible = "brcm,genet-v5", .data = &amp;v5_plat_data },</div><div class='add'>+	{ .compatible = "brcm,bcm2711-genet-v5", .data = &amp;bcm2711_plat_data },</div><div class='add'>+	{ .compatible = "brcm,bcm7712-genet-v5", .data = &amp;bcm7712_plat_data },</div><div class='ctx'> 	{ },</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, bcmgenet_match);</div><div class='ctx'> </div><div class='ctx'> static int bcmgenet_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct bcmgenet_platform_data *pd = pdev-&gt;dev.platform_data;</div><div class='del'>-	struct device_node *dn = pdev-&gt;dev.of_node;</div><div class='del'>-	const struct of_device_id *of_id = NULL;</div><div class='add'>+	const struct bcmgenet_plat_data *pdata;</div><div class='ctx'> 	struct bcmgenet_priv *priv;</div><div class='ctx'> 	struct net_device *dev;</div><div class='del'>-	const void *macaddr;</div><div class='del'>-	struct resource *r;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err = -EIO;</div><div class='del'>-	const char *phy_mode_str;</div><div class='ctx'> </div><div class='ctx'> 	/* Up to GENET_MAX_MQ_CNT + 1 TX queues and RX queues */</div><div class='ctx'> 	dev = alloc_etherdev_mqs(sizeof(*priv), GENET_MAX_MQ_CNT + 1,</div><div class='hunk'>@@ -3458,127 +3944,156 @@ static int bcmgenet_probe(struct platform_device *pdev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (dn) {</div><div class='del'>-		of_id = of_match_node(bcmgenet_match, dn);</div><div class='del'>-		if (!of_id)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	priv = netdev_priv(dev);</div><div class='ctx'> 	priv-&gt;irq0 = platform_get_irq(pdev, 0);</div><div class='add'>+	if (priv-&gt;irq0 &lt; 0) {</div><div class='add'>+		err = priv-&gt;irq0;</div><div class='add'>+		goto err;</div><div class='add'>+	}</div><div class='ctx'> 	priv-&gt;irq1 = platform_get_irq(pdev, 1);</div><div class='del'>-	priv-&gt;wol_irq = platform_get_irq(pdev, 2);</div><div class='del'>-	if (!priv-&gt;irq0 || !priv-&gt;irq1) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "can't find IRQs\n");</div><div class='del'>-		err = -EINVAL;</div><div class='add'>+	if (priv-&gt;irq1 &lt; 0) {</div><div class='add'>+		err = priv-&gt;irq1;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (dn) {</div><div class='del'>-		macaddr = of_get_mac_address(dn);</div><div class='del'>-		if (IS_ERR(macaddr)) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "can't find MAC address\n");</div><div class='del'>-			err = -EINVAL;</div><div class='del'>-			goto err;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		macaddr = pd-&gt;mac_address;</div><div class='add'>+	priv-&gt;wol_irq = platform_get_irq_optional(pdev, 2);</div><div class='add'>+	if (priv-&gt;wol_irq == -EPROBE_DEFER) {</div><div class='add'>+		err = priv-&gt;wol_irq;</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	priv-&gt;base = devm_ioremap_resource(&amp;pdev-&gt;dev, r);</div><div class='add'>+	priv-&gt;base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;base)) {</div><div class='ctx'> 		err = PTR_ERR(priv-&gt;base);</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	spin_lock_init(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='add'>+	/* Set default pause parameters */</div><div class='add'>+	priv-&gt;autoneg_pause = 1;</div><div class='add'>+	priv-&gt;tx_pause = 1;</div><div class='add'>+	priv-&gt;rx_pause = 1;</div><div class='add'>+</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	dev_set_drvdata(&amp;pdev-&gt;dev, dev);</div><div class='del'>-	ether_addr_copy(dev-&gt;dev_addr, macaddr);</div><div class='ctx'> 	dev-&gt;watchdog_timeo = 2 * HZ;</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;bcmgenet_ethtool_ops;</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;bcmgenet_netdev_ops;</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;msg_enable = netif_msg_init(-1, GENET_MSG_DEFAULT);</div><div class='ctx'> </div><div class='del'>-	/* Set hardware features */</div><div class='del'>-	dev-&gt;hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM |</div><div class='del'>-		NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM;</div><div class='add'>+	/* Set default features */</div><div class='add'>+	dev-&gt;features |= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM |</div><div class='add'>+			 NETIF_F_RXCSUM;</div><div class='add'>+	dev-&gt;hw_features |= dev-&gt;features;</div><div class='add'>+	dev-&gt;vlan_features |= dev-&gt;features;</div><div class='add'>+</div><div class='add'>+	netdev_sw_irq_coalesce_default_on(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Request the WOL interrupt and advertise suspend if available */</div><div class='ctx'> 	priv-&gt;wol_irq_disabled = true;</div><div class='del'>-	err = devm_request_irq(&amp;pdev-&gt;dev, priv-&gt;wol_irq, bcmgenet_wol_isr, 0,</div><div class='del'>-			       dev-&gt;name, priv);</div><div class='del'>-	if (!err)</div><div class='del'>-		device_set_wakeup_capable(&amp;pdev-&gt;dev, 1);</div><div class='add'>+	if (priv-&gt;wol_irq &gt; 0) {</div><div class='add'>+		err = devm_request_irq(&amp;pdev-&gt;dev, priv-&gt;wol_irq,</div><div class='add'>+				       bcmgenet_wol_isr, 0, dev-&gt;name, priv);</div><div class='add'>+		if (!err)</div><div class='add'>+			device_set_wakeup_capable(&amp;pdev-&gt;dev, 1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set the needed headroom to account for any possible</div><div class='ctx'> 	 * features enabling/disabling at runtime</div><div class='ctx'> 	 */</div><div class='ctx'> 	dev-&gt;needed_headroom += 64;</div><div class='ctx'> </div><div class='del'>-	netdev_boot_setup_check(dev);</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;dev = dev;</div><div class='ctx'> 	priv-&gt;pdev = pdev;</div><div class='del'>-	if (of_id)</div><div class='del'>-		priv-&gt;version = (enum bcmgenet_version)of_id-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;version = pd-&gt;genet_version;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk = devm_clk_get(&amp;priv-&gt;pdev-&gt;dev, "enet");</div><div class='add'>+	pdata = device_get_match_data(&amp;pdev-&gt;dev);</div><div class='add'>+	if (pdata) {</div><div class='add'>+		priv-&gt;version = pdata-&gt;version;</div><div class='add'>+		priv-&gt;dma_max_burst_length = pdata-&gt;dma_max_burst_length;</div><div class='add'>+		priv-&gt;flags = pdata-&gt;flags;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;clk = devm_clk_get_optional(&amp;priv-&gt;pdev-&gt;dev, "enet");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;clk)) {</div><div class='del'>-		dev_warn(&amp;priv-&gt;pdev-&gt;dev, "failed to get enet clock\n");</div><div class='del'>-		priv-&gt;clk = NULL;</div><div class='add'>+		dev_dbg(&amp;priv-&gt;pdev-&gt;dev, "failed to get enet clock\n");</div><div class='add'>+		err = PTR_ERR(priv-&gt;clk);</div><div class='add'>+		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	err = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err;</div><div class='ctx'> </div><div class='ctx'> 	bcmgenet_set_hw_params(priv);</div><div class='ctx'> </div><div class='add'>+	err = -EIO;</div><div class='add'>+	if (bcmgenet_has_40bits(priv))</div><div class='add'>+		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(40));</div><div class='add'>+	if (err)</div><div class='add'>+		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_clk_disable;</div><div class='add'>+</div><div class='ctx'> 	/* Mii wait queue */</div><div class='ctx'> 	init_waitqueue_head(&amp;priv-&gt;wq);</div><div class='ctx'> 	/* Always use RX_BUF_LENGTH (2KB) buffer for all chips */</div><div class='ctx'> 	priv-&gt;rx_buf_len = RX_BUF_LENGTH;</div><div class='ctx'> 	INIT_WORK(&amp;priv-&gt;bcmgenet_irq_work, bcmgenet_irq_task);</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk_wol = devm_clk_get(&amp;priv-&gt;pdev-&gt;dev, "enet-wol");</div><div class='add'>+	priv-&gt;clk_wol = devm_clk_get_optional(&amp;priv-&gt;pdev-&gt;dev, "enet-wol");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;clk_wol)) {</div><div class='del'>-		dev_warn(&amp;priv-&gt;pdev-&gt;dev, "failed to get enet-wol clock\n");</div><div class='del'>-		priv-&gt;clk_wol = NULL;</div><div class='add'>+		dev_dbg(&amp;priv-&gt;pdev-&gt;dev, "failed to get enet-wol clock\n");</div><div class='add'>+		err = PTR_ERR(priv-&gt;clk_wol);</div><div class='add'>+		goto err_clk_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;clk_eee = devm_clk_get(&amp;priv-&gt;pdev-&gt;dev, "enet-eee");</div><div class='add'>+	priv-&gt;clk_eee = devm_clk_get_optional(&amp;priv-&gt;pdev-&gt;dev, "enet-eee");</div><div class='ctx'> 	if (IS_ERR(priv-&gt;clk_eee)) {</div><div class='del'>-		dev_warn(&amp;priv-&gt;pdev-&gt;dev, "failed to get enet-eee clock\n");</div><div class='del'>-		priv-&gt;clk_eee = NULL;</div><div class='add'>+		dev_dbg(&amp;priv-&gt;pdev-&gt;dev, "failed to get enet-eee clock\n");</div><div class='add'>+		err = PTR_ERR(priv-&gt;clk_eee);</div><div class='add'>+		goto err_clk_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If this is an internal GPHY, power it on now, before UniMAC is</div><div class='ctx'> 	 * brought out of reset as absolutely no UniMAC activity is allowed</div><div class='ctx'> 	 */</div><div class='del'>-	if (dn &amp;&amp; !of_property_read_string(dn, "phy-mode", &amp;phy_mode_str) &amp;&amp;</div><div class='del'>-	    !strcasecmp(phy_mode_str, "internal"))</div><div class='add'>+	if (device_get_phy_mode(&amp;pdev-&gt;dev) == PHY_INTERFACE_MODE_INTERNAL)</div><div class='ctx'> 		bcmgenet_power_up(priv, GENET_POWER_PASSIVE);</div><div class='ctx'> </div><div class='add'>+	if (device_get_ethdev_address(&amp;pdev-&gt;dev, dev))</div><div class='add'>+		if (has_acpi_companion(&amp;pdev-&gt;dev)) {</div><div class='add'>+			u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+			bcmgenet_get_hw_addr(priv, addr);</div><div class='add'>+			eth_hw_addr_set(dev, addr);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(dev-&gt;dev_addr)) {</div><div class='add'>+		dev_warn(&amp;pdev-&gt;dev, "using random Ethernet MAC\n");</div><div class='add'>+		eth_hw_addr_random(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	reset_umac(priv);</div><div class='ctx'> </div><div class='ctx'> 	err = bcmgenet_mii_init(dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_clk_disable;</div><div class='ctx'> </div><div class='del'>-	/* setup number of real queues  + 1 (GENET_V1 has 0 hardware queues</div><div class='del'>-	 * just the ring 16 descriptor based TX</div><div class='del'>-	 */</div><div class='add'>+	/* setup number of real queues + 1 */</div><div class='ctx'> 	netif_set_real_num_tx_queues(priv-&gt;dev, priv-&gt;hw_params-&gt;tx_queues + 1);</div><div class='ctx'> 	netif_set_real_num_rx_queues(priv-&gt;dev, priv-&gt;hw_params-&gt;rx_queues + 1);</div><div class='ctx'> </div><div class='ctx'> 	/* Set default coalescing parameters */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;hw_params-&gt;rx_queues; i++)</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; i++)</div><div class='ctx'> 		priv-&gt;rx_rings[i].rx_max_coalesced_frames = 1;</div><div class='del'>-	priv-&gt;rx_rings[DESC_INDEX].rx_max_coalesced_frames = 1;</div><div class='add'>+</div><div class='add'>+	/* Initialize u64 stats seq counter for 32bit machines */</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;rx_queues; i++)</div><div class='add'>+		u64_stats_init(&amp;priv-&gt;rx_rings[i].stats64.syncp);</div><div class='add'>+	for (i = 0; i &lt;= priv-&gt;hw_params-&gt;tx_queues; i++)</div><div class='add'>+		u64_stats_init(&amp;priv-&gt;tx_rings[i].stats64.syncp);</div><div class='ctx'> </div><div class='ctx'> 	/* libphy will determine the link state */</div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='hunk'>@@ -3587,8 +4102,10 @@ static int bcmgenet_probe(struct platform_device *pdev)</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(dev);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		bcmgenet_mii_exit(dev);</div><div class='ctx'> 		goto err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3599,7 +4116,7 @@ err:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcmgenet_remove(struct platform_device *pdev)</div><div class='add'>+static void bcmgenet_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = dev_to_priv(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -3607,16 +4124,18 @@ static int bcmgenet_remove(struct platform_device *pdev)</div><div class='ctx'> 	unregister_netdev(priv-&gt;dev);</div><div class='ctx'> 	bcmgenet_mii_exit(priv-&gt;dev);</div><div class='ctx'> 	free_netdev(priv-&gt;dev);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+static void bcmgenet_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	bcmgenet_remove(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='del'>-static int bcmgenet_resume(struct device *d)</div><div class='add'>+static int bcmgenet_resume_noirq(struct device *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_get_drvdata(d);</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	unsigned long dma_ctrl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='hunk'>@@ -3628,55 +4147,111 @@ static int bcmgenet_resume(struct device *d)</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='add'>+	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts) {</div><div class='add'>+		/* Account for Wake-on-LAN events and clear those events</div><div class='add'>+		 * (Some devices need more time between enabling the clocks</div><div class='add'>+		 *  and the interrupt register reflecting the wake event so</div><div class='add'>+		 *  read the register twice)</div><div class='add'>+		 */</div><div class='add'>+		reg = bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_STAT);</div><div class='add'>+		reg = bcmgenet_intrl2_0_readl(priv, INTRL2_CPU_STAT);</div><div class='add'>+		if (reg &amp; UMAC_IRQ_WAKE_EVENT)</div><div class='add'>+			pm_wakeup_event(&amp;priv-&gt;pdev-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+		/* From WOL-enabled suspend, switch to regular clock */</div><div class='add'>+		if (!bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC))</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		/* Failed so fall through to reset MAC */</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If this is an internal GPHY, power it back on now, before UniMAC is</div><div class='ctx'> 	 * brought out of reset as absolutely no UniMAC activity is allowed</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;internal_phy)</div><div class='ctx'> 		bcmgenet_power_up(priv, GENET_POWER_PASSIVE);</div><div class='ctx'> </div><div class='add'>+	/* take MAC out of reset */</div><div class='ctx'> 	bcmgenet_umac_reset(priv);</div><div class='ctx'> </div><div class='del'>-	init_umac(priv);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* From WOL-enabled suspend, switch to regular clock */</div><div class='del'>-	if (priv-&gt;wolopts)</div><div class='del'>-		clk_disable_unprepare(priv-&gt;clk_wol);</div><div class='add'>+static int bcmgenet_resume(struct device *d)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct bcmgenet_rxnfc_rule *rule;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts) {</div><div class='add'>+		reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='add'>+		if (reg &amp; CMD_RX_EN) {</div><div class='add'>+			/* Successfully exited WoL, just resume data flows */</div><div class='add'>+			list_for_each_entry(rule, &amp;priv-&gt;rxnfc_list, list)</div><div class='add'>+				if (rule-&gt;state == BCMGENET_RXNFC_STATE_ENABLED)</div><div class='add'>+					bcmgenet_hfb_enable_filter(priv,</div><div class='add'>+							rule-&gt;fs.location + 1);</div><div class='add'>+			bcmgenet_hfb_enable_filter(priv, 0);</div><div class='add'>+			bcmgenet_set_rx_mode(dev);</div><div class='add'>+			bcmgenet_enable_rx_napi(priv);</div><div class='add'>+</div><div class='add'>+			/* Reinitialize Tx flows */</div><div class='add'>+			bcmgenet_tdma_disable(priv);</div><div class='add'>+			bcmgenet_init_tx_queues(priv-&gt;dev);</div><div class='add'>+			reg = bcmgenet_tdma_readl(priv, DMA_CTRL);</div><div class='add'>+			reg |= DMA_EN;</div><div class='add'>+			bcmgenet_tdma_writel(priv, reg, DMA_CTRL);</div><div class='add'>+			bcmgenet_enable_tx_napi(priv);</div><div class='add'>+</div><div class='add'>+			bcmgenet_link_intr_enable(priv);</div><div class='add'>+			phy_start_machine(dev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+			netif_device_attach(dev);</div><div class='add'>+			enable_irq(priv-&gt;irq1);</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+		/* MAC was reset so complete bcmgenet_netif_stop() */</div><div class='add'>+		umac_enable_set(priv, CMD_RX_EN | CMD_TX_EN, false);</div><div class='add'>+		bcmgenet_rdma_disable(priv);</div><div class='add'>+		bcmgenet_intr_disable(priv);</div><div class='add'>+		bcmgenet_fini_dma(priv);</div><div class='add'>+		enable_irq(priv-&gt;irq1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init_umac(priv);</div><div class='ctx'> </div><div class='ctx'> 	phy_init_hw(dev-&gt;phydev);</div><div class='ctx'> </div><div class='ctx'> 	/* Speed settings must be restored */</div><div class='add'>+	genphy_config_aneg(dev-&gt;phydev);</div><div class='ctx'> 	bcmgenet_mii_config(priv-&gt;dev, false);</div><div class='ctx'> </div><div class='del'>-	bcmgenet_set_hw_addr(priv, dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;internal_phy) {</div><div class='del'>-		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);</div><div class='del'>-		reg |= EXT_ENERGY_DET_MASK;</div><div class='del'>-		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);</div><div class='del'>-	}</div><div class='add'>+	/* Restore enabled features */</div><div class='add'>+	bcmgenet_set_features(dev, dev-&gt;features);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;wolopts)</div><div class='del'>-		bcmgenet_power_up(priv, GENET_POWER_WOL_MAGIC);</div><div class='add'>+	bcmgenet_set_hw_addr(priv, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	/* Disable RX/TX DMA and flush TX queues */</div><div class='del'>-	dma_ctrl = bcmgenet_dma_disable(priv);</div><div class='add'>+	/* Restore hardware filters */</div><div class='add'>+	bcmgenet_hfb_clear(priv);</div><div class='add'>+	list_for_each_entry(rule, &amp;priv-&gt;rxnfc_list, list)</div><div class='add'>+		if (rule-&gt;state != BCMGENET_RXNFC_STATE_UNUSED)</div><div class='add'>+			bcmgenet_hfb_create_rxnfc_filter(priv, rule);</div><div class='ctx'> </div><div class='ctx'> 	/* Reinitialize TDMA and RDMA and SW housekeeping */</div><div class='del'>-	ret = bcmgenet_init_dma(priv);</div><div class='add'>+	ret = bcmgenet_init_dma(priv, false);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		netdev_err(dev, "failed to initialize DMA\n");</div><div class='ctx'> 		goto out_clk_disable;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Always enable ring 16 - descriptor ring */</div><div class='del'>-	bcmgenet_enable_dma(priv, dma_ctrl);</div><div class='del'>-</div><div class='ctx'> 	if (!device_may_wakeup(d))</div><div class='ctx'> 		phy_resume(dev-&gt;phydev);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;eee.eee_enabled)</div><div class='del'>-		bcmgenet_eee_enable_set(dev, true);</div><div class='del'>-</div><div class='ctx'> 	bcmgenet_netif_start(dev);</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(dev);</div><div class='hunk'>@@ -3694,45 +4269,109 @@ static int bcmgenet_suspend(struct device *d)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = dev_get_drvdata(d);</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct bcmgenet_rxnfc_rule *rule;</div><div class='add'>+	u32 reg, hfb_enable = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> </div><div class='del'>-	bcmgenet_netif_stop(dev);</div><div class='add'>+	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts) {</div><div class='add'>+		netif_tx_disable(dev);</div><div class='add'>+</div><div class='add'>+		/* Suspend non-wake Rx data flows */</div><div class='add'>+		if (priv-&gt;wolopts &amp; WAKE_FILTER)</div><div class='add'>+			list_for_each_entry(rule, &amp;priv-&gt;rxnfc_list, list)</div><div class='add'>+				if (rule-&gt;fs.ring_cookie == RX_CLS_FLOW_WAKE &amp;&amp;</div><div class='add'>+				    rule-&gt;state == BCMGENET_RXNFC_STATE_ENABLED)</div><div class='add'>+					hfb_enable |= 1 &lt;&lt; rule-&gt;fs.location;</div><div class='add'>+		reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+		if (GENET_IS_V1(priv) || GENET_IS_V2(priv)) {</div><div class='add'>+			reg &amp;= ~RBUF_HFB_FILTER_EN_MASK;</div><div class='add'>+			reg |= hfb_enable &lt;&lt; (RBUF_HFB_FILTER_EN_SHIFT + 1);</div><div class='add'>+		} else {</div><div class='add'>+			bcmgenet_hfb_reg_writel(priv, hfb_enable &lt;&lt; 1,</div><div class='add'>+						HFB_FLT_ENABLE_V3PLUS + 4);</div><div class='add'>+		}</div><div class='add'>+		if (!hfb_enable)</div><div class='add'>+			reg &amp;= ~RBUF_HFB_EN;</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='add'>+</div><div class='add'>+		/* Clear any old filter matches so only new matches wake */</div><div class='add'>+		bcmgenet_intrl2_0_writel(priv, 0xFFFFFFFF, INTRL2_CPU_MASK_SET);</div><div class='add'>+		bcmgenet_intrl2_0_writel(priv, 0xFFFFFFFF, INTRL2_CPU_CLEAR);</div><div class='add'>+</div><div class='add'>+		if (-ETIMEDOUT == bcmgenet_tdma_disable(priv))</div><div class='add'>+			netdev_warn(priv-&gt;dev,</div><div class='add'>+				    "Timed out while disabling TX DMA\n");</div><div class='add'>+</div><div class='add'>+		bcmgenet_disable_tx_napi(priv);</div><div class='add'>+		bcmgenet_disable_rx_napi(priv);</div><div class='add'>+		disable_irq(priv-&gt;irq1);</div><div class='add'>+		bcmgenet_tx_reclaim_all(dev);</div><div class='add'>+		bcmgenet_fini_tx_napi(priv);</div><div class='add'>+	} else {</div><div class='add'>+		/* Teardown the interface */</div><div class='add'>+		bcmgenet_netif_stop(dev, true);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (!device_may_wakeup(d))</div><div class='del'>-		phy_suspend(dev-&gt;phydev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int bcmgenet_suspend_noirq(struct device *d)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(d);</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Prepare the device for Wake-on-LAN and switch to the slow clock */</div><div class='del'>-	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts) {</div><div class='add'>+	if (device_may_wakeup(d) &amp;&amp; priv-&gt;wolopts)</div><div class='ctx'> 		ret = bcmgenet_power_down(priv, GENET_POWER_WOL_MAGIC);</div><div class='del'>-		clk_prepare_enable(priv-&gt;clk_wol);</div><div class='del'>-	} else if (priv-&gt;internal_phy) {</div><div class='add'>+	else if (priv-&gt;internal_phy)</div><div class='ctx'> 		ret = bcmgenet_power_down(priv, GENET_POWER_PASSIVE);</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	/* Let the framework handle resumption and leave the clocks on */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Turn off the clocks */</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='del'>-	if (ret)</div><div class='del'>-		bcmgenet_resume(d);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='add'>+#else</div><div class='add'>+#define bcmgenet_suspend	NULL</div><div class='add'>+#define bcmgenet_suspend_noirq	NULL</div><div class='add'>+#define bcmgenet_resume		NULL</div><div class='add'>+#define bcmgenet_resume_noirq	NULL</div><div class='ctx'> #endif /* CONFIG_PM_SLEEP */</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(bcmgenet_pm_ops, bcmgenet_suspend, bcmgenet_resume);</div><div class='add'>+static const struct dev_pm_ops bcmgenet_pm_ops = {</div><div class='add'>+	.suspend	= bcmgenet_suspend,</div><div class='add'>+	.suspend_noirq	= bcmgenet_suspend_noirq,</div><div class='add'>+	.resume		= bcmgenet_resume,</div><div class='add'>+	.resume_noirq	= bcmgenet_resume_noirq,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct acpi_device_id genet_acpi_match[] = {</div><div class='add'>+	{ "BCM6E4E", (kernel_ulong_t)&amp;bcm2711_plat_data },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(acpi, genet_acpi_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver bcmgenet_driver = {</div><div class='ctx'> 	.probe	= bcmgenet_probe,</div><div class='del'>-	.remove	= bcmgenet_remove,</div><div class='add'>+	.remove = bcmgenet_remove,</div><div class='add'>+	.shutdown = bcmgenet_shutdown,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name	= "bcmgenet",</div><div class='ctx'> 		.of_match_table = bcmgenet_match,</div><div class='ctx'> 		.pm	= &amp;bcmgenet_pm_ops,</div><div class='add'>+		.acpi_match_table = genet_acpi_match,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> module_platform_driver(bcmgenet_driver);</div><div class='hunk'>@@ -3741,3 +4380,4 @@ MODULE_AUTHOR("Broadcom Corporation");</div><div class='ctx'> MODULE_DESCRIPTION("Broadcom GENET Ethernet controller driver");</div><div class='ctx'> MODULE_ALIAS("platform:bcmgenet");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_SOFTDEP("pre: mdio-bcm-unimac");</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h<br/>index 14b49612aa86..5ec3979779ec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmgenet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/genet/bcmgenet.h</a></div><div class='hunk'>@@ -1,9 +1,6 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='del'>- * Copyright (c) 2014-2017 Broadcom</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (c) 2014-2025 Broadcom</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __BCMGENET_H__</div><div class='hunk'>@@ -16,7 +13,13 @@</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='del'>-#include &lt;linux/net_dim.h&gt;</div><div class='add'>+#include &lt;linux/dim.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#include "../unimac.h"</div><div class='add'>+</div><div class='add'>+/* Maximum number of hardware queues, downsized if needed */</div><div class='add'>+#define GENET_MAX_MQ_CNT	4</div><div class='ctx'> </div><div class='ctx'> /* total number of Buffer Descriptors, same for Rx/Tx */</div><div class='ctx'> #define TOTAL_DESC				256</div><div class='hunk'>@@ -34,6 +37,7 @@</div><div class='ctx'> #define DMA_MAX_BURST_LENGTH    0x10</div><div class='ctx'> </div><div class='ctx'> /* misc. configuration */</div><div class='add'>+#define MAX_NUM_OF_FS_RULES		16</div><div class='ctx'> #define CLEAR_ALL_HFB			0xFF</div><div class='ctx'> #define DMA_FC_THRESH_HI		(TOTAL_DESC &gt;&gt; 4)</div><div class='ctx'> #define DMA_FC_THRESH_LO		5</div><div class='hunk'>@@ -147,64 +151,33 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> 	u32	alloc_rx_buff_failed;</div><div class='ctx'> 	u32	rx_dma_failed;</div><div class='ctx'> 	u32	tx_dma_failed;</div><div class='add'>+	u32	tx_realloc_tsb;</div><div class='add'>+	u32	tx_realloc_tsb_failed;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmgenet_tx_stats64 {</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+	u64_stats_t	packets;</div><div class='add'>+	u64_stats_t	bytes;</div><div class='add'>+	u64_stats_t	errors;</div><div class='add'>+	u64_stats_t	dropped;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define UMAC_HD_BKP_CTRL		0x004</div><div class='del'>-#define	 HD_FC_EN			(1 &lt;&lt; 0)</div><div class='del'>-#define  HD_FC_BKOFF_OK			(1 &lt;&lt; 1)</div><div class='del'>-#define  IPG_CONFIG_RX_SHIFT		2</div><div class='del'>-#define  IPG_CONFIG_RX_MASK		0x1F</div><div class='del'>-</div><div class='del'>-#define UMAC_CMD			0x008</div><div class='del'>-#define  CMD_TX_EN			(1 &lt;&lt; 0)</div><div class='del'>-#define  CMD_RX_EN			(1 &lt;&lt; 1)</div><div class='del'>-#define  UMAC_SPEED_10			0</div><div class='del'>-#define  UMAC_SPEED_100			1</div><div class='del'>-#define  UMAC_SPEED_1000		2</div><div class='del'>-#define  UMAC_SPEED_2500		3</div><div class='del'>-#define  CMD_SPEED_SHIFT		2</div><div class='del'>-#define  CMD_SPEED_MASK			3</div><div class='del'>-#define  CMD_PROMISC			(1 &lt;&lt; 4)</div><div class='del'>-#define  CMD_PAD_EN			(1 &lt;&lt; 5)</div><div class='del'>-#define  CMD_CRC_FWD			(1 &lt;&lt; 6)</div><div class='del'>-#define  CMD_PAUSE_FWD			(1 &lt;&lt; 7)</div><div class='del'>-#define  CMD_RX_PAUSE_IGNORE		(1 &lt;&lt; 8)</div><div class='del'>-#define  CMD_TX_ADDR_INS		(1 &lt;&lt; 9)</div><div class='del'>-#define  CMD_HD_EN			(1 &lt;&lt; 10)</div><div class='del'>-#define  CMD_SW_RESET			(1 &lt;&lt; 13)</div><div class='del'>-#define  CMD_LCL_LOOP_EN		(1 &lt;&lt; 15)</div><div class='del'>-#define  CMD_AUTO_CONFIG		(1 &lt;&lt; 22)</div><div class='del'>-#define  CMD_CNTL_FRM_EN		(1 &lt;&lt; 23)</div><div class='del'>-#define  CMD_NO_LEN_CHK			(1 &lt;&lt; 24)</div><div class='del'>-#define  CMD_RMT_LOOP_EN		(1 &lt;&lt; 25)</div><div class='del'>-#define  CMD_PRBL_EN			(1 &lt;&lt; 27)</div><div class='del'>-#define  CMD_TX_PAUSE_IGNORE		(1 &lt;&lt; 28)</div><div class='del'>-#define  CMD_TX_RX_EN			(1 &lt;&lt; 29)</div><div class='del'>-#define  CMD_RUNT_FILTER_DIS		(1 &lt;&lt; 30)</div><div class='del'>-</div><div class='del'>-#define UMAC_MAC0			0x00C</div><div class='del'>-#define UMAC_MAC1			0x010</div><div class='del'>-#define UMAC_MAX_FRAME_LEN		0x014</div><div class='del'>-</div><div class='del'>-#define UMAC_MODE			0x44</div><div class='del'>-#define  MODE_LINK_STATUS		(1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-#define UMAC_EEE_CTRL			0x064</div><div class='del'>-#define  EN_LPI_RX_PAUSE		(1 &lt;&lt; 0)</div><div class='del'>-#define  EN_LPI_TX_PFC			(1 &lt;&lt; 1)</div><div class='del'>-#define  EN_LPI_TX_PAUSE		(1 &lt;&lt; 2)</div><div class='del'>-#define  EEE_EN				(1 &lt;&lt; 3)</div><div class='del'>-#define  RX_FIFO_CHECK			(1 &lt;&lt; 4)</div><div class='del'>-#define  EEE_TX_CLK_DIS			(1 &lt;&lt; 5)</div><div class='del'>-#define  DIS_EEE_10M			(1 &lt;&lt; 6)</div><div class='del'>-#define  LP_IDLE_PREDICTION_MODE	(1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-#define UMAC_EEE_LPI_TIMER		0x068</div><div class='del'>-#define UMAC_EEE_WAKE_TIMER		0x06C</div><div class='del'>-#define UMAC_EEE_REF_COUNT		0x070</div><div class='del'>-#define  EEE_REFERENCE_COUNT_MASK	0xffff</div><div class='del'>-</div><div class='del'>-#define UMAC_TX_FLUSH			0x334</div><div class='add'>+struct bcmgenet_rx_stats64 {</div><div class='add'>+	struct u64_stats_sync syncp;</div><div class='add'>+	u64_stats_t	bytes;</div><div class='add'>+	u64_stats_t	packets;</div><div class='add'>+	u64_stats_t	errors;</div><div class='add'>+	u64_stats_t	dropped;</div><div class='add'>+	u64_stats_t	multicast;</div><div class='add'>+	u64_stats_t	broadcast;</div><div class='add'>+	u64_stats_t	missed;</div><div class='add'>+	u64_stats_t	length_errors;</div><div class='add'>+	u64_stats_t	over_errors;</div><div class='add'>+	u64_stats_t	crc_errors;</div><div class='add'>+	u64_stats_t	frame_errors;</div><div class='add'>+	u64_stats_t	fragmented_errors;</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> #define UMAC_MIB_START			0x400</div><div class='ctx'> </div><div class='hunk'>@@ -254,6 +227,7 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> #define RBUF_CHK_CTRL			0x14</div><div class='ctx'> #define  RBUF_RXCHK_EN			(1 &lt;&lt; 0)</div><div class='ctx'> #define  RBUF_SKIP_FCS			(1 &lt;&lt; 4)</div><div class='add'>+#define  RBUF_L3_PARSE_DIS		(1 &lt;&lt; 5)</div><div class='ctx'> </div><div class='ctx'> #define RBUF_ENERGY_CTRL		0x9c</div><div class='ctx'> #define  RBUF_EEE_EN			(1 &lt;&lt; 0)</div><div class='hunk'>@@ -273,6 +247,7 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> #define  RBUF_FLTR_LEN_SHIFT		8</div><div class='ctx'> </div><div class='ctx'> #define TBUF_CTRL			0x00</div><div class='add'>+#define  TBUF_64B_EN			(1 &lt;&lt; 0)</div><div class='ctx'> #define TBUF_BP_MC			0x0C</div><div class='ctx'> #define TBUF_ENERGY_CTRL		0x14</div><div class='ctx'> #define  TBUF_EEE_EN			(1 &lt;&lt; 0)</div><div class='hunk'>@@ -309,6 +284,8 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> #define UMAC_IRQ_HFB_SM			(1 &lt;&lt; 10)</div><div class='ctx'> #define UMAC_IRQ_HFB_MM			(1 &lt;&lt; 11)</div><div class='ctx'> #define UMAC_IRQ_MPD_R			(1 &lt;&lt; 12)</div><div class='add'>+#define UMAC_IRQ_WAKE_EVENT		(UMAC_IRQ_HFB_SM | UMAC_IRQ_HFB_MM | \</div><div class='add'>+					 UMAC_IRQ_MPD_R)</div><div class='ctx'> #define UMAC_IRQ_RXDMA_MBDONE		(1 &lt;&lt; 13)</div><div class='ctx'> #define UMAC_IRQ_RXDMA_PDONE		(1 &lt;&lt; 14)</div><div class='ctx'> #define UMAC_IRQ_RXDMA_BDONE		(1 &lt;&lt; 15)</div><div class='hunk'>@@ -321,6 +298,8 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> /* Only valid for GENETv3+ */</div><div class='ctx'> #define UMAC_IRQ_MDIO_DONE		(1 &lt;&lt; 23)</div><div class='ctx'> #define UMAC_IRQ_MDIO_ERROR		(1 &lt;&lt; 24)</div><div class='add'>+#define UMAC_IRQ_MDIO_EVENT		(UMAC_IRQ_MDIO_DONE | \</div><div class='add'>+					 UMAC_IRQ_MDIO_ERROR)</div><div class='ctx'> </div><div class='ctx'> /* INTRL2 instance 1 definitions */</div><div class='ctx'> #define UMAC_IRQ1_TX_INTR_MASK		0xFFFF</div><div class='hunk'>@@ -369,6 +348,7 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> #define  EXT_PWR_DOWN_PHY_EN		(1 &lt;&lt; 20)</div><div class='ctx'> </div><div class='ctx'> #define EXT_RGMII_OOB_CTRL		0x0C</div><div class='add'>+#define  RGMII_MODE_EN_V123		(1 &lt;&lt; 0)</div><div class='ctx'> #define  RGMII_LINK			(1 &lt;&lt; 4)</div><div class='ctx'> #define  OOB_DISABLE			(1 &lt;&lt; 5)</div><div class='ctx'> #define  RGMII_MODE_EN			(1 &lt;&lt; 6)</div><div class='hunk'>@@ -378,6 +358,7 @@ struct bcmgenet_mib_counters {</div><div class='ctx'> #define  EXT_CFG_IDDQ_BIAS		(1 &lt;&lt; 0)</div><div class='ctx'> #define  EXT_CFG_PWR_DOWN		(1 &lt;&lt; 1)</div><div class='ctx'> #define  EXT_CK25_DIS			(1 &lt;&lt; 4)</div><div class='add'>+#define  EXT_CFG_IDDQ_GLOBAL_PWR	(1 &lt;&lt; 3)</div><div class='ctx'> #define  EXT_GPHY_RESET			(1 &lt;&lt; 5)</div><div class='ctx'> </div><div class='ctx'> /* DMA rings size */</div><div class='hunk'>@@ -524,6 +505,7 @@ enum bcmgenet_version {</div><div class='ctx'> #define GENET_HAS_EXT		(1 &lt;&lt; 1)</div><div class='ctx'> #define GENET_HAS_MDIO_INTR	(1 &lt;&lt; 2)</div><div class='ctx'> #define GENET_HAS_MOCA_LINK_DET	(1 &lt;&lt; 3)</div><div class='add'>+#define GENET_HAS_EPHY_16NM	(1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='ctx'> /* BCMGENET hardware parameters, keep this structure nicely aligned</div><div class='ctx'>  * since it is going to be used in hot paths</div><div class='hunk'>@@ -544,7 +526,6 @@ struct bcmgenet_hw_params {</div><div class='ctx'> 	u32		rdma_offset;</div><div class='ctx'> 	u32		tdma_offset;</div><div class='ctx'> 	u32		words_per_bd;</div><div class='del'>-	u32		flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcmgenet_skb_cb {</div><div class='hunk'>@@ -558,10 +539,8 @@ struct bcmgenet_skb_cb {</div><div class='ctx'> struct bcmgenet_tx_ring {</div><div class='ctx'> 	spinlock_t	lock;		/* ring lock */</div><div class='ctx'> 	struct napi_struct napi;	/* NAPI per tx queue */</div><div class='del'>-	unsigned long	packets;</div><div class='del'>-	unsigned long	bytes;</div><div class='add'>+	struct bcmgenet_tx_stats64 stats64;</div><div class='ctx'> 	unsigned int	index;		/* ring index */</div><div class='del'>-	unsigned int	queue;		/* queue index */</div><div class='ctx'> 	struct enet_cb	*cbs;		/* tx ring buffer control block*/</div><div class='ctx'> 	unsigned int	size;		/* size of each tx ring */</div><div class='ctx'> 	unsigned int    clean_ptr;      /* Tx ring clean pointer */</div><div class='hunk'>@@ -571,8 +550,6 @@ struct bcmgenet_tx_ring {</div><div class='ctx'> 	unsigned int	prod_index;	/* Tx ring producer index SW copy */</div><div class='ctx'> 	unsigned int	cb_ptr;		/* Tx ring initial CB ptr */</div><div class='ctx'> 	unsigned int	end_ptr;	/* Tx ring end CB ptr */</div><div class='del'>-	void (*int_enable)(struct bcmgenet_tx_ring *);</div><div class='del'>-	void (*int_disable)(struct bcmgenet_tx_ring *);</div><div class='ctx'> 	struct bcmgenet_priv *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -581,15 +558,12 @@ struct bcmgenet_net_dim {</div><div class='ctx'> 	u16		event_ctr;</div><div class='ctx'> 	unsigned long	packets;</div><div class='ctx'> 	unsigned long	bytes;</div><div class='del'>-	struct net_dim	dim;</div><div class='add'>+	struct dim	dim;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct bcmgenet_rx_ring {</div><div class='ctx'> 	struct napi_struct napi;	/* Rx NAPI struct */</div><div class='del'>-	unsigned long	bytes;</div><div class='del'>-	unsigned long	packets;</div><div class='del'>-	unsigned long	errors;</div><div class='del'>-	unsigned long	dropped;</div><div class='add'>+	struct bcmgenet_rx_stats64 stats64;</div><div class='ctx'> 	unsigned int	index;		/* Rx ring index */</div><div class='ctx'> 	struct enet_cb	*cbs;		/* Rx ring buffer control block */</div><div class='ctx'> 	unsigned int	size;		/* Rx ring size */</div><div class='hunk'>@@ -601,14 +575,26 @@ struct bcmgenet_rx_ring {</div><div class='ctx'> 	struct bcmgenet_net_dim dim;</div><div class='ctx'> 	u32		rx_max_coalesced_frames;</div><div class='ctx'> 	u32		rx_coalesce_usecs;</div><div class='del'>-	void (*int_enable)(struct bcmgenet_rx_ring *);</div><div class='del'>-	void (*int_disable)(struct bcmgenet_rx_ring *);</div><div class='ctx'> 	struct bcmgenet_priv *priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum bcmgenet_rxnfc_state {</div><div class='add'>+	BCMGENET_RXNFC_STATE_UNUSED = 0,</div><div class='add'>+	BCMGENET_RXNFC_STATE_DISABLED,</div><div class='add'>+	BCMGENET_RXNFC_STATE_ENABLED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct bcmgenet_rxnfc_rule {</div><div class='add'>+	struct	list_head list;</div><div class='add'>+	struct ethtool_rx_flow_spec	fs;</div><div class='add'>+	enum bcmgenet_rxnfc_state state;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* device context */</div><div class='ctx'> struct bcmgenet_priv {</div><div class='ctx'> 	void __iomem *base;</div><div class='add'>+	/* reg_lock: lock to serialize access to shared registers */</div><div class='add'>+	spinlock_t reg_lock;</div><div class='ctx'> 	enum bcmgenet_version version;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> </div><div class='hunk'>@@ -617,18 +603,24 @@ struct bcmgenet_priv {</div><div class='ctx'> 	struct enet_cb *tx_cbs;</div><div class='ctx'> 	unsigned int num_tx_bds;</div><div class='ctx'> </div><div class='del'>-	struct bcmgenet_tx_ring tx_rings[DESC_INDEX + 1];</div><div class='add'>+	struct bcmgenet_tx_ring tx_rings[GENET_MAX_MQ_CNT + 1];</div><div class='ctx'> </div><div class='ctx'> 	/* receive variables */</div><div class='ctx'> 	void __iomem *rx_bds;</div><div class='ctx'> 	struct enet_cb *rx_cbs;</div><div class='ctx'> 	unsigned int num_rx_bds;</div><div class='ctx'> 	unsigned int rx_buf_len;</div><div class='add'>+	struct bcmgenet_rxnfc_rule rxnfc_rules[MAX_NUM_OF_FS_RULES];</div><div class='add'>+	struct list_head rxnfc_list;</div><div class='ctx'> </div><div class='del'>-	struct bcmgenet_rx_ring rx_rings[DESC_INDEX + 1];</div><div class='add'>+	struct bcmgenet_rx_ring rx_rings[GENET_MAX_MQ_CNT + 1];</div><div class='ctx'> </div><div class='ctx'> 	/* other misc variables */</div><div class='del'>-	struct bcmgenet_hw_params *hw_params;</div><div class='add'>+	const struct bcmgenet_hw_params *hw_params;</div><div class='add'>+	u32 flags;</div><div class='add'>+	unsigned autoneg_pause:1;</div><div class='add'>+	unsigned tx_pause:1;</div><div class='add'>+	unsigned rx_pause:1;</div><div class='ctx'> </div><div class='ctx'> 	/* MDIO bus variables */</div><div class='ctx'> 	wait_queue_head_t wq;</div><div class='hunk'>@@ -641,10 +633,6 @@ struct bcmgenet_priv {</div><div class='ctx'> 	bool clk_eee_enabled;</div><div class='ctx'> </div><div class='ctx'> 	/* PHY device variables */</div><div class='del'>-	int old_link;</div><div class='del'>-	int old_speed;</div><div class='del'>-	int old_duplex;</div><div class='del'>-	int old_pause;</div><div class='ctx'> 	phy_interface_t phy_interface;</div><div class='ctx'> 	int phy_addr;</div><div class='ctx'> 	int ext_phy;</div><div class='hunk'>@@ -661,11 +649,9 @@ struct bcmgenet_priv {</div><div class='ctx'> 	unsigned int irq0_stat;</div><div class='ctx'> </div><div class='ctx'> 	/* HW descriptors/checksum variables */</div><div class='del'>-	bool desc_64b_en;</div><div class='del'>-	bool desc_rxchk_en;</div><div class='ctx'> 	bool crc_fwd_en;</div><div class='ctx'> </div><div class='del'>-	unsigned int dma_rx_chk_bit;</div><div class='add'>+	u32 dma_max_burst_length;</div><div class='ctx'> </div><div class='ctx'> 	u32 msg_enable;</div><div class='ctx'> </div><div class='hunk'>@@ -676,12 +662,38 @@ struct bcmgenet_priv {</div><div class='ctx'> 	/* WOL */</div><div class='ctx'> 	struct clk *clk_wol;</div><div class='ctx'> 	u32 wolopts;</div><div class='add'>+	u8 sopass[SOPASS_MAX];</div><div class='ctx'> </div><div class='ctx'> 	struct bcmgenet_mib_counters mib;</div><div class='ctx'> </div><div class='del'>-	struct ethtool_eee eee;</div><div class='add'>+	struct ethtool_keee eee;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static inline bool bcmgenet_has_40bits(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return !!(priv-&gt;flags &amp; GENET_HAS_40BITS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bcmgenet_has_ext(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return !!(priv-&gt;flags &amp; GENET_HAS_EXT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bcmgenet_has_mdio_intr(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return !!(priv-&gt;flags &amp; GENET_HAS_MDIO_INTR);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bcmgenet_has_moca_link_det(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return !!(priv-&gt;flags &amp; GENET_HAS_MOCA_LINK_DET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool bcmgenet_has_ephy_16nm(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	return !!(priv-&gt;flags &amp; GENET_HAS_EPHY_16NM);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define GENET_IO_MACRO(name, offset)					\</div><div class='ctx'> static inline u32 bcmgenet_##name##_readl(struct bcmgenet_priv *priv,	\</div><div class='ctx'> 					u32 off)			\</div><div class='hunk'>@@ -725,6 +737,7 @@ int bcmgenet_mii_init(struct net_device *dev);</div><div class='ctx'> int bcmgenet_mii_config(struct net_device *dev, bool init);</div><div class='ctx'> int bcmgenet_mii_probe(struct net_device *dev);</div><div class='ctx'> void bcmgenet_mii_exit(struct net_device *dev);</div><div class='add'>+void bcmgenet_phy_pause_set(struct net_device *dev, bool rx, bool tx);</div><div class='ctx'> void bcmgenet_phy_power_set(struct net_device *dev, bool enable);</div><div class='ctx'> void bcmgenet_mii_setup(struct net_device *dev);</div><div class='ctx'> </div><div class='hunk'>@@ -733,7 +746,10 @@ void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol);</div><div class='ctx'> int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol);</div><div class='ctx'> int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv,</div><div class='ctx'> 				enum bcmgenet_power_mode mode);</div><div class='del'>-void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,</div><div class='del'>-			       enum bcmgenet_power_mode mode);</div><div class='add'>+int bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,</div><div class='add'>+			      enum bcmgenet_power_mode mode);</div><div class='add'>+</div><div class='add'>+void bcmgenet_eee_enable_set(struct net_device *dev, bool enable,</div><div class='add'>+			     bool tx_lpi_enabled);</div><div class='ctx'> </div><div class='ctx'> #endif /* __BCMGENET_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c b/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c<br/>index 57582efa362d..8fb551288298 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c</a></div><div class='hunk'>@@ -1,11 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Broadcom GENET (Gigabit Ethernet) Wake-on-LAN support</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2014-2017 Broadcom</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (c) 2014-2025 Broadcom</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt)				"bcmgenet_wol: " fmt</div><div class='hunk'>@@ -21,7 +18,6 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/pm.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='del'>-#include &lt;linux/version.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;net/arp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -44,18 +40,30 @@</div><div class='ctx'> void bcmgenet_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	wol-&gt;supported = WAKE_MAGIC | WAKE_MAGICSECURE;</div><div class='del'>-	wol-&gt;wolopts = priv-&gt;wolopts;</div><div class='del'>-	memset(wol-&gt;sopass, 0, sizeof(wol-&gt;sopass));</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	u32 phy_wolopts = 0;</div><div class='ctx'> </div><div class='del'>-	if (wol-&gt;wolopts &amp; WAKE_MAGICSECURE) {</div><div class='del'>-		reg = bcmgenet_umac_readl(priv, UMAC_MPD_PW_MS);</div><div class='del'>-		put_unaligned_be16(reg, &amp;wol-&gt;sopass[0]);</div><div class='del'>-		reg = bcmgenet_umac_readl(priv, UMAC_MPD_PW_LS);</div><div class='del'>-		put_unaligned_be32(reg, &amp;wol-&gt;sopass[2]);</div><div class='add'>+	if (dev-&gt;phydev) {</div><div class='add'>+		phy_ethtool_get_wol(dev-&gt;phydev, wol);</div><div class='add'>+		phy_wolopts = wol-&gt;wolopts;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	/* MAC is not wake-up capable, return what the PHY does */</div><div class='add'>+	if (!device_can_wakeup(kdev))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Overlay MAC capabilities with that of the PHY queried before */</div><div class='add'>+	wol-&gt;supported |= WAKE_MAGIC | WAKE_MAGICSECURE | WAKE_FILTER;</div><div class='add'>+	wol-&gt;wolopts |= priv-&gt;wolopts;</div><div class='add'>+</div><div class='add'>+	/* Return the PHY configured magic password */</div><div class='add'>+	if (phy_wolopts &amp; WAKE_MAGICSECURE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Otherwise the MAC one */</div><div class='add'>+	memset(wol-&gt;sopass, 0, sizeof(wol-&gt;sopass));</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGICSECURE)</div><div class='add'>+		memcpy(wol-&gt;sopass, priv-&gt;sopass, sizeof(priv-&gt;sopass));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* ethtool function - set WOL (Wake on LAN) settings.</div><div class='hunk'>@@ -65,38 +73,40 @@ int bcmgenet_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='del'>-	u32 reg;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Try Wake-on-LAN from the PHY first */</div><div class='add'>+	if (dev-&gt;phydev) {</div><div class='add'>+		ret = phy_ethtool_set_wol(dev-&gt;phydev, wol);</div><div class='add'>+		if (ret != -EOPNOTSUPP &amp;&amp; wol-&gt;wolopts)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (!device_can_wakeup(kdev))</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (wol-&gt;wolopts &amp; ~(WAKE_MAGIC | WAKE_MAGICSECURE))</div><div class='add'>+	if (wol-&gt;wolopts &amp; ~(WAKE_MAGIC | WAKE_MAGICSECURE | WAKE_FILTER))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);</div><div class='del'>-	if (wol-&gt;wolopts &amp; WAKE_MAGICSECURE) {</div><div class='del'>-		bcmgenet_umac_writel(priv, get_unaligned_be16(&amp;wol-&gt;sopass[0]),</div><div class='del'>-				     UMAC_MPD_PW_MS);</div><div class='del'>-		bcmgenet_umac_writel(priv, get_unaligned_be32(&amp;wol-&gt;sopass[2]),</div><div class='del'>-				     UMAC_MPD_PW_LS);</div><div class='del'>-		reg |= MPD_PW_EN;</div><div class='del'>-	} else {</div><div class='del'>-		reg &amp;= ~MPD_PW_EN;</div><div class='del'>-	}</div><div class='del'>-	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);</div><div class='add'>+	if (wol-&gt;wolopts &amp; WAKE_MAGICSECURE)</div><div class='add'>+		memcpy(priv-&gt;sopass, wol-&gt;sopass, sizeof(priv-&gt;sopass));</div><div class='ctx'> </div><div class='ctx'> 	/* Flag the device and relevant IRQ as wakeup capable */</div><div class='ctx'> 	if (wol-&gt;wolopts) {</div><div class='ctx'> 		device_set_wakeup_enable(kdev, 1);</div><div class='ctx'> 		/* Avoid unbalanced enable_irq_wake calls */</div><div class='del'>-		if (priv-&gt;wol_irq_disabled)</div><div class='add'>+		if (priv-&gt;wol_irq_disabled) {</div><div class='ctx'> 			enable_irq_wake(priv-&gt;wol_irq);</div><div class='add'>+			enable_irq_wake(priv-&gt;irq0);</div><div class='add'>+		}</div><div class='ctx'> 		priv-&gt;wol_irq_disabled = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		device_set_wakeup_enable(kdev, 0);</div><div class='ctx'> 		/* Avoid unbalanced disable_irq_wake calls */</div><div class='del'>-		if (!priv-&gt;wol_irq_disabled)</div><div class='add'>+		if (!priv-&gt;wol_irq_disabled) {</div><div class='ctx'> 			disable_irq_wake(priv-&gt;wol_irq);</div><div class='add'>+			disable_irq_wake(priv-&gt;irq0);</div><div class='add'>+		}</div><div class='ctx'> 		priv-&gt;wol_irq_disabled = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -123,77 +133,135 @@ static int bcmgenet_poll_wol_status(struct bcmgenet_priv *priv)</div><div class='ctx'> 	return retries;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bcmgenet_set_mpd_password(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	bcmgenet_umac_writel(priv, get_unaligned_be16(&amp;priv-&gt;sopass[0]),</div><div class='add'>+			     UMAC_MPD_PW_MS);</div><div class='add'>+	bcmgenet_umac_writel(priv, get_unaligned_be32(&amp;priv-&gt;sopass[2]),</div><div class='add'>+			     UMAC_MPD_PW_LS);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int bcmgenet_wol_power_down_cfg(struct bcmgenet_priv *priv,</div><div class='ctx'> 				enum bcmgenet_power_mode mode)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = priv-&gt;dev;</div><div class='add'>+	u32 reg, hfb_ctrl_reg;</div><div class='ctx'> 	int retries = 0;</div><div class='del'>-	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (mode != GENET_POWER_WOL_MAGIC) {</div><div class='ctx'> 		netif_err(priv, wol, dev, "unsupported mode: %d\n", mode);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* disable RX */</div><div class='del'>-	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='del'>-	reg &amp;= ~CMD_RX_EN;</div><div class='del'>-	bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='del'>-	mdelay(10);</div><div class='add'>+	if (priv-&gt;wolopts &amp; (WAKE_MAGIC | WAKE_MAGICSECURE)) {</div><div class='add'>+		reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);</div><div class='add'>+		reg |= MPD_EN;</div><div class='add'>+		if (priv-&gt;wolopts &amp; WAKE_MAGICSECURE) {</div><div class='add'>+			bcmgenet_set_mpd_password(priv);</div><div class='add'>+			reg |= MPD_PW_EN;</div><div class='add'>+		}</div><div class='add'>+		bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);</div><div class='del'>-	reg |= MPD_EN;</div><div class='del'>-	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);</div><div class='add'>+	hfb_ctrl_reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+	reg = hfb_ctrl_reg | RBUF_ACPI_EN;</div><div class='add'>+	bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Do not leave UniMAC in MPD mode only */</div><div class='ctx'> 	retries = bcmgenet_poll_wol_status(priv);</div><div class='ctx'> 	if (retries &lt; 0) {</div><div class='ctx'> 		reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);</div><div class='del'>-		reg &amp;= ~MPD_EN;</div><div class='add'>+		reg &amp;= ~(MPD_EN | MPD_PW_EN);</div><div class='ctx'> 		bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);</div><div class='add'>+		bcmgenet_hfb_reg_writel(priv, hfb_ctrl_reg, HFB_CTRL);</div><div class='ctx'> 		return retries;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(priv, wol, dev, "MPD WOL-ready status set after %d msec\n",</div><div class='ctx'> 		  retries);</div><div class='ctx'> </div><div class='add'>+	/* Disable phy status updates while suspending */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;phydev-&gt;lock);</div><div class='add'>+	dev-&gt;phydev-&gt;state = PHY_READY;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	clk_prepare_enable(priv-&gt;clk_wol);</div><div class='add'>+</div><div class='ctx'> 	/* Enable CRC forward */</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='ctx'> 	priv-&gt;crc_fwd_en = 1;</div><div class='ctx'> 	reg |= CMD_CRC_FWD;</div><div class='ctx'> </div><div class='add'>+	/* Can't suspend with WoL if MAC is still in reset */</div><div class='add'>+	if (reg &amp; CMD_SW_RESET)</div><div class='add'>+		reg &amp;= ~CMD_SW_RESET;</div><div class='add'>+</div><div class='ctx'> 	/* Receiver must be enabled for WOL MP detection */</div><div class='ctx'> 	reg |= CMD_RX_EN;</div><div class='ctx'> 	bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_EXT) {</div><div class='del'>-		reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);</div><div class='del'>-		reg &amp;= ~EXT_ENERGY_DET_MASK;</div><div class='del'>-		bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);</div><div class='del'>-	}</div><div class='add'>+	reg = UMAC_IRQ_MPD_R;</div><div class='add'>+	if (hfb_ctrl_reg &amp; RBUF_HFB_EN)</div><div class='add'>+		reg |=  UMAC_IRQ_HFB_SM | UMAC_IRQ_HFB_MM;</div><div class='add'>+</div><div class='add'>+	bcmgenet_intrl2_0_writel(priv, reg, INTRL2_CPU_MASK_CLEAR);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-void bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,</div><div class='del'>-			       enum bcmgenet_power_mode mode)</div><div class='add'>+int bcmgenet_wol_power_up_cfg(struct bcmgenet_priv *priv,</div><div class='add'>+			      enum bcmgenet_power_mode mode)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = priv-&gt;dev;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	if (mode != GENET_POWER_WOL_MAGIC) {</div><div class='ctx'> 		netif_err(priv, wol, priv-&gt;dev, "invalid mode: %d\n", mode);</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk_wol);</div><div class='add'>+	priv-&gt;crc_fwd_en = 0;</div><div class='add'>+</div><div class='add'>+	bcmgenet_intrl2_0_writel(priv, UMAC_IRQ_WAKE_EVENT,</div><div class='add'>+				 INTRL2_CPU_MASK_SET);</div><div class='add'>+	if (bcmgenet_has_mdio_intr(priv))</div><div class='add'>+		bcmgenet_intrl2_0_writel(priv,</div><div class='add'>+					 UMAC_IRQ_MDIO_EVENT,</div><div class='add'>+					 INTRL2_CPU_MASK_CLEAR);</div><div class='add'>+</div><div class='add'>+	/* Disable Magic Packet Detection */</div><div class='add'>+	if (priv-&gt;wolopts &amp; (WAKE_MAGIC | WAKE_MAGICSECURE)) {</div><div class='add'>+		reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);</div><div class='add'>+		if (!(reg &amp; MPD_EN))</div><div class='add'>+			return -EPERM;	/* already reset so skip the rest */</div><div class='add'>+		reg &amp;= ~(MPD_EN | MPD_PW_EN);</div><div class='add'>+		bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reg = bcmgenet_umac_readl(priv, UMAC_MPD_CTRL);</div><div class='del'>-	if (!(reg &amp; MPD_EN))</div><div class='del'>-		return;	/* already powered up so skip the rest */</div><div class='del'>-	reg &amp;= ~MPD_EN;</div><div class='del'>-	bcmgenet_umac_writel(priv, reg, UMAC_MPD_CTRL);</div><div class='add'>+	/* Disable ACPI mode */</div><div class='add'>+	reg = bcmgenet_hfb_reg_readl(priv, HFB_CTRL);</div><div class='add'>+	if (!(reg &amp; RBUF_ACPI_EN))</div><div class='add'>+		return -EPERM;	/* already reset so skip the rest */</div><div class='add'>+	reg &amp;= ~RBUF_ACPI_EN;</div><div class='add'>+	bcmgenet_hfb_reg_writel(priv, reg, HFB_CTRL);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable CRC Forward */</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> 	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='ctx'> 	reg &amp;= ~CMD_CRC_FWD;</div><div class='ctx'> 	bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='del'>-	priv-&gt;crc_fwd_en = 0;</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;reg_lock);</div><div class='add'>+</div><div class='add'>+	/* Resume link status tracking */</div><div class='add'>+	mutex_lock(&amp;dev-&gt;phydev-&gt;lock);</div><div class='add'>+	if (dev-&gt;phydev-&gt;link)</div><div class='add'>+		dev-&gt;phydev-&gt;state = PHY_RUNNING;</div><div class='add'>+	else</div><div class='add'>+		dev-&gt;phydev-&gt;state = PHY_NOLINK;</div><div class='add'>+	mutex_unlock(&amp;dev-&gt;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c<br/>index 51880d83131a..38f854b94a79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmmii.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/genet/bcmmii.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/genet/bcmmii.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/genet/bcmmii.c</a></div><div class='hunk'>@@ -1,14 +1,11 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Broadcom GENET MDIO routines</div><div class='ctx'>  *</div><div class='del'>- * Copyright (c) 2014-2017 Broadcom</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='add'>+ * Copyright (c) 2014-2025 Broadcom</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/wait.h&gt;</div><div class='hunk'>@@ -23,89 +20,97 @@</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/bcmgenet.h&gt;</div><div class='ctx'> #include &lt;linux/platform_data/mdio-bcm-unimac.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bcmgenet.h"</div><div class='ctx'> </div><div class='del'>-/* setup netdev link state when PHY link status change and</div><div class='del'>- * update UMAC and RGMII block when link up</div><div class='del'>- */</div><div class='del'>-void bcmgenet_mii_setup(struct net_device *dev)</div><div class='add'>+static void bcmgenet_mac_config(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct phy_device *phydev = dev-&gt;phydev;</div><div class='ctx'> 	u32 reg, cmd_bits = 0;</div><div class='del'>-	bool status_changed = false;</div><div class='add'>+	bool active;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;old_link != phydev-&gt;link) {</div><div class='del'>-		status_changed = true;</div><div class='del'>-		priv-&gt;old_link = phydev-&gt;link;</div><div class='del'>-	}</div><div class='add'>+	/* speed */</div><div class='add'>+	if (phydev-&gt;speed == SPEED_1000)</div><div class='add'>+		cmd_bits = CMD_SPEED_1000;</div><div class='add'>+	else if (phydev-&gt;speed == SPEED_100)</div><div class='add'>+		cmd_bits = CMD_SPEED_100;</div><div class='add'>+	else</div><div class='add'>+		cmd_bits = CMD_SPEED_10;</div><div class='add'>+	cmd_bits &lt;&lt;= CMD_SPEED_SHIFT;</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;link) {</div><div class='del'>-		/* check speed/duplex/pause changes */</div><div class='del'>-		if (priv-&gt;old_speed != phydev-&gt;speed) {</div><div class='del'>-			status_changed = true;</div><div class='del'>-			priv-&gt;old_speed = phydev-&gt;speed;</div><div class='del'>-		}</div><div class='add'>+	/* duplex */</div><div class='add'>+	if (phydev-&gt;duplex != DUPLEX_FULL) {</div><div class='add'>+		cmd_bits |= CMD_HD_EN |</div><div class='add'>+			CMD_RX_PAUSE_IGNORE | CMD_TX_PAUSE_IGNORE;</div><div class='add'>+	} else {</div><div class='add'>+		/* pause capability defaults to Symmetric */</div><div class='add'>+		if (priv-&gt;autoneg_pause) {</div><div class='add'>+			bool tx_pause = 0, rx_pause = 0;</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;old_duplex != phydev-&gt;duplex) {</div><div class='del'>-			status_changed = true;</div><div class='del'>-			priv-&gt;old_duplex = phydev-&gt;duplex;</div><div class='del'>-		}</div><div class='add'>+			if (phydev-&gt;autoneg)</div><div class='add'>+				phy_get_pause(phydev, &amp;tx_pause, &amp;rx_pause);</div><div class='ctx'> </div><div class='del'>-		if (priv-&gt;old_pause != phydev-&gt;pause) {</div><div class='del'>-			status_changed = true;</div><div class='del'>-			priv-&gt;old_pause = phydev-&gt;pause;</div><div class='add'>+			if (!tx_pause)</div><div class='add'>+				cmd_bits |= CMD_TX_PAUSE_IGNORE;</div><div class='add'>+			if (!rx_pause)</div><div class='add'>+				cmd_bits |= CMD_RX_PAUSE_IGNORE;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* done if nothing has changed */</div><div class='del'>-		if (!status_changed)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* speed */</div><div class='del'>-		if (phydev-&gt;speed == SPEED_1000)</div><div class='del'>-			cmd_bits = UMAC_SPEED_1000;</div><div class='del'>-		else if (phydev-&gt;speed == SPEED_100)</div><div class='del'>-			cmd_bits = UMAC_SPEED_100;</div><div class='del'>-		else</div><div class='del'>-			cmd_bits = UMAC_SPEED_10;</div><div class='del'>-		cmd_bits &lt;&lt;= CMD_SPEED_SHIFT;</div><div class='del'>-</div><div class='del'>-		/* duplex */</div><div class='del'>-		if (phydev-&gt;duplex != DUPLEX_FULL)</div><div class='del'>-			cmd_bits |= CMD_HD_EN;</div><div class='del'>-</div><div class='del'>-		/* pause capability */</div><div class='del'>-		if (!phydev-&gt;pause)</div><div class='del'>-			cmd_bits |= CMD_RX_PAUSE_IGNORE | CMD_TX_PAUSE_IGNORE;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Program UMAC and RGMII block based on established</div><div class='del'>-		 * link speed, duplex, and pause. The speed set in</div><div class='del'>-		 * umac-&gt;cmd tell RGMII block which clock to use for</div><div class='del'>-		 * transmit -- 25MHz(100Mbps) or 125MHz(1Gbps).</div><div class='del'>-		 * Receive clock is provided by the PHY.</div><div class='del'>-		 */</div><div class='del'>-		reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);</div><div class='del'>-		reg &amp;= ~OOB_DISABLE;</div><div class='del'>-		reg |= RGMII_LINK;</div><div class='del'>-		bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);</div><div class='add'>+		/* Manual override */</div><div class='add'>+		if (!priv-&gt;rx_pause)</div><div class='add'>+			cmd_bits |= CMD_RX_PAUSE_IGNORE;</div><div class='add'>+		if (!priv-&gt;tx_pause)</div><div class='add'>+			cmd_bits |= CMD_TX_PAUSE_IGNORE;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='del'>-		reg &amp;= ~((CMD_SPEED_MASK &lt;&lt; CMD_SPEED_SHIFT) |</div><div class='del'>-			       CMD_HD_EN |</div><div class='del'>-			       CMD_RX_PAUSE_IGNORE | CMD_TX_PAUSE_IGNORE);</div><div class='del'>-		reg |= cmd_bits;</div><div class='add'>+	/* Program UMAC and RGMII block based on established</div><div class='add'>+	 * link speed, duplex, and pause. The speed set in</div><div class='add'>+	 * umac-&gt;cmd tell RGMII block which clock to use for</div><div class='add'>+	 * transmit -- 25MHz(100Mbps) or 125MHz(1Gbps).</div><div class='add'>+	 * Receive clock is provided by the PHY.</div><div class='add'>+	 */</div><div class='add'>+	reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);</div><div class='add'>+	reg |= RGMII_LINK;</div><div class='add'>+	bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;priv-&gt;reg_lock);</div><div class='add'>+	reg = bcmgenet_umac_readl(priv, UMAC_CMD);</div><div class='add'>+	reg &amp;= ~((CMD_SPEED_MASK &lt;&lt; CMD_SPEED_SHIFT) |</div><div class='add'>+		       CMD_HD_EN |</div><div class='add'>+		       CMD_RX_PAUSE_IGNORE | CMD_TX_PAUSE_IGNORE);</div><div class='add'>+	reg |= cmd_bits;</div><div class='add'>+	if (reg &amp; CMD_SW_RESET) {</div><div class='add'>+		reg &amp;= ~CMD_SW_RESET;</div><div class='ctx'> 		bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='del'>-	} else {</div><div class='del'>-		/* done if nothing has changed */</div><div class='del'>-		if (!status_changed)</div><div class='del'>-			return;</div><div class='add'>+		udelay(2);</div><div class='add'>+		reg |= CMD_TX_EN | CMD_RX_EN;</div><div class='add'>+	}</div><div class='add'>+	bcmgenet_umac_writel(priv, reg, UMAC_CMD);</div><div class='add'>+	spin_unlock_bh(&amp;priv-&gt;reg_lock);</div><div class='ctx'> </div><div class='del'>-		/* needed for MoCA fixed PHY to reflect correct link status */</div><div class='del'>-		netif_carrier_off(dev);</div><div class='add'>+	active = phy_init_eee(phydev, 0) &gt;= 0;</div><div class='add'>+	bcmgenet_eee_enable_set(dev,</div><div class='add'>+				priv-&gt;eee.eee_enabled &amp;&amp; active,</div><div class='add'>+				priv-&gt;eee.tx_lpi_enabled);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* setup netdev link state when PHY link status change and</div><div class='add'>+ * update UMAC and RGMII block when link up</div><div class='add'>+ */</div><div class='add'>+void bcmgenet_mii_setup(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link) {</div><div class='add'>+		bcmgenet_mac_config(dev);</div><div class='add'>+	} else {</div><div class='add'>+		reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);</div><div class='add'>+		reg &amp;= ~RGMII_LINK;</div><div class='add'>+		bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	phy_print_status(phydev);</div><div class='hunk'>@@ -127,30 +132,51 @@ static int bcmgenet_fixed_phy_link_update(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void bcmgenet_phy_pause_set(struct net_device *dev, bool rx, bool tx)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev = dev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev-&gt;advertising, rx);</div><div class='add'>+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev-&gt;advertising,</div><div class='add'>+			 rx | tx);</div><div class='add'>+	phy_start_aneg(phydev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+	if (phydev-&gt;link)</div><div class='add'>+		bcmgenet_mac_config(dev);</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void bcmgenet_phy_power_set(struct net_device *dev, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 reg = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* EXT_GPHY_CTRL is only valid for GENETv4 and onward */</div><div class='del'>-	if (GENET_IS_V4(priv)) {</div><div class='add'>+	if (GENET_IS_V4(priv) || bcmgenet_has_ephy_16nm(priv)) {</div><div class='ctx'> 		reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL);</div><div class='ctx'> 		if (enable) {</div><div class='ctx'> 			reg &amp;= ~EXT_CK25_DIS;</div><div class='ctx'> 			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);</div><div class='ctx'> 			mdelay(1);</div><div class='ctx'> </div><div class='del'>-			reg &amp;= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN);</div><div class='add'>+			reg &amp;= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN |</div><div class='add'>+				 EXT_CFG_IDDQ_GLOBAL_PWR);</div><div class='ctx'> 			reg |= EXT_GPHY_RESET;</div><div class='ctx'> 			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);</div><div class='ctx'> 			mdelay(1);</div><div class='ctx'> </div><div class='ctx'> 			reg &amp;= ~EXT_GPHY_RESET;</div><div class='ctx'> 		} else {</div><div class='add'>+			reg |= EXT_GPHY_RESET;</div><div class='add'>+			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);</div><div class='add'>+			mdelay(1);</div><div class='add'>+</div><div class='ctx'> 			reg |= EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN |</div><div class='del'>-			       EXT_GPHY_RESET;</div><div class='add'>+			       EXT_CFG_IDDQ_GLOBAL_PWR;</div><div class='ctx'> 			bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);</div><div class='ctx'> 			mdelay(1);</div><div class='add'>+</div><div class='ctx'> 			reg |= EXT_CK25_DIS;</div><div class='ctx'> 		}</div><div class='ctx'> 		bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);</div><div class='hunk'>@@ -162,16 +188,7 @@ void bcmgenet_phy_power_set(struct net_device *dev, bool enable)</div><div class='ctx'> </div><div class='ctx'> static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	u32 reg;</div><div class='del'>-</div><div class='del'>-	if (!GENET_IS_V5(priv)) {</div><div class='del'>-		/* Speed settings are set in bcmgenet_mii_setup() */</div><div class='del'>-		reg = bcmgenet_sys_readl(priv, SYS_PORT_CTRL);</div><div class='del'>-		reg |= LED_ACT_SOURCE_MAC;</div><div class='del'>-		bcmgenet_sys_writel(priv, reg, SYS_PORT_CTRL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;hw_params-&gt;flags &amp; GENET_HAS_MOCA_LINK_DET)</div><div class='add'>+	if (bcmgenet_has_moca_link_det(priv))</div><div class='ctx'> 		fixed_phy_set_link_update(priv-&gt;dev-&gt;phydev,</div><div class='ctx'> 					  bcmgenet_fixed_phy_link_update);</div><div class='ctx'> }</div><div class='hunk'>@@ -186,11 +203,10 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)</div><div class='ctx'> 	u32 port_ctrl;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;ext_phy = !priv-&gt;internal_phy &amp;&amp;</div><div class='del'>-			(priv-&gt;phy_interface != PHY_INTERFACE_MODE_MOCA);</div><div class='del'>-</div><div class='ctx'> 	switch (priv-&gt;phy_interface) {</div><div class='ctx'> 	case PHY_INTERFACE_MODE_INTERNAL:</div><div class='add'>+		phy_name = "internal PHY";</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_MOCA:</div><div class='ctx'> 		/* Irrespective of the actually configured PHY speed (100 or</div><div class='ctx'> 		 * 1000) GENETv4 only has an internal GPHY so we will just end</div><div class='hunk'>@@ -202,12 +218,10 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)</div><div class='ctx'> 		else</div><div class='ctx'> 			port_ctrl = PORT_MODE_INT_EPHY;</div><div class='ctx'> </div><div class='del'>-		bcmgenet_sys_writel(priv, port_ctrl, SYS_PORT_CTRL);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;internal_phy) {</div><div class='del'>-			phy_name = "internal PHY";</div><div class='del'>-		} else if (priv-&gt;phy_interface == PHY_INTERFACE_MODE_MOCA) {</div><div class='add'>+		if (!phy_name) {</div><div class='ctx'> 			phy_name = "MoCA";</div><div class='add'>+			if (!GENET_IS_V5(priv))</div><div class='add'>+				port_ctrl |= LED_ACT_SOURCE_MAC;</div><div class='ctx'> 			bcmgenet_moca_phy_setup(priv);</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -215,8 +229,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)</div><div class='ctx'> 	case PHY_INTERFACE_MODE_MII:</div><div class='ctx'> 		phy_name = "external MII";</div><div class='ctx'> 		phy_set_max_speed(phydev, SPEED_100);</div><div class='del'>-		bcmgenet_sys_writel(priv,</div><div class='del'>-				    PORT_MODE_EXT_EPHY, SYS_PORT_CTRL);</div><div class='add'>+		port_ctrl = PORT_MODE_EXT_EPHY;</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PHY_INTERFACE_MODE_REVMII:</div><div class='hunk'>@@ -231,39 +244,56 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)</div><div class='ctx'> 			port_ctrl = PORT_MODE_EXT_RVMII_50;</div><div class='ctx'> 		else</div><div class='ctx'> 			port_ctrl = PORT_MODE_EXT_RVMII_25;</div><div class='del'>-		bcmgenet_sys_writel(priv, port_ctrl, SYS_PORT_CTRL);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case PHY_INTERFACE_MODE_RGMII:</div><div class='ctx'> 		/* RGMII_NO_ID: TXC transitions at the same time as TXD</div><div class='ctx'> 		 *		(requires PCB or receiver-side delay)</div><div class='del'>-		 * RGMII:	Add 2ns delay on TXC (90 degree shift)</div><div class='ctx'> 		 *</div><div class='ctx'> 		 * ID is implicitly disabled for 100Mbps (RG)MII operation.</div><div class='ctx'> 		 */</div><div class='add'>+		phy_name = "external RGMII (no delay)";</div><div class='ctx'> 		id_mode_dis = BIT(16);</div><div class='del'>-		/* fall through */</div><div class='add'>+		port_ctrl = PORT_MODE_EXT_GPHY;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='ctx'> 	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='del'>-		if (id_mode_dis)</div><div class='del'>-			phy_name = "external RGMII (no delay)";</div><div class='del'>-		else</div><div class='del'>-			phy_name = "external RGMII (TX delay)";</div><div class='del'>-		bcmgenet_sys_writel(priv,</div><div class='del'>-				    PORT_MODE_EXT_GPHY, SYS_PORT_CTRL);</div><div class='add'>+		/* RGMII_TXID:	Add 2ns delay on TXC (90 degree shift) */</div><div class='add'>+		phy_name = "external RGMII (TX delay)";</div><div class='add'>+		port_ctrl = PORT_MODE_EXT_GPHY;</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+		phy_name = "external RGMII (RX delay)";</div><div class='add'>+		port_ctrl = PORT_MODE_EXT_GPHY;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		dev_err(kdev, "unknown phy mode: %d\n", priv-&gt;phy_interface);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bcmgenet_sys_writel(priv, port_ctrl, SYS_PORT_CTRL);</div><div class='add'>+</div><div class='add'>+	priv-&gt;ext_phy = !priv-&gt;internal_phy &amp;&amp;</div><div class='add'>+			(priv-&gt;phy_interface != PHY_INTERFACE_MODE_MOCA);</div><div class='add'>+</div><div class='ctx'> 	/* This is an external PHY (xMII), so we need to enable the RGMII</div><div class='del'>-	 * block for the interface to work</div><div class='add'>+	 * block for the interface to work, unconditionally clear the</div><div class='add'>+	 * Out-of-band disable since we do not need it.</div><div class='ctx'> 	 */</div><div class='add'>+	mutex_lock(&amp;phydev-&gt;lock);</div><div class='add'>+	reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);</div><div class='add'>+	reg &amp;= ~OOB_DISABLE;</div><div class='ctx'> 	if (priv-&gt;ext_phy) {</div><div class='del'>-		reg = bcmgenet_ext_readl(priv, EXT_RGMII_OOB_CTRL);</div><div class='del'>-		reg |= RGMII_MODE_EN | id_mode_dis;</div><div class='del'>-		bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);</div><div class='add'>+		reg &amp;= ~ID_MODE_DIS;</div><div class='add'>+		reg |= id_mode_dis;</div><div class='add'>+		if (GENET_IS_V1(priv) || GENET_IS_V2(priv) || GENET_IS_V3(priv))</div><div class='add'>+			reg |= RGMII_MODE_EN_V123;</div><div class='add'>+		else</div><div class='add'>+			reg |= RGMII_MODE_EN;</div><div class='ctx'> 	}</div><div class='add'>+	bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);</div><div class='add'>+	mutex_unlock(&amp;phydev-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (init)</div><div class='ctx'> 		dev_info(kdev, "configuring instance for %s\n", phy_name);</div><div class='hunk'>@@ -274,33 +304,85 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)</div><div class='ctx'> int bcmgenet_mii_probe(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct device_node *dn = priv-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	struct device_node *dn = kdev-&gt;of_node;</div><div class='add'>+	phy_interface_t phy_iface = priv-&gt;phy_interface;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	u32 phy_flags;</div><div class='add'>+	u32 phy_flags = PHY_BRCM_AUTO_PWRDWN_ENABLE |</div><div class='add'>+			PHY_BRCM_DIS_TXCRXC_NOENRGY |</div><div class='add'>+			PHY_BRCM_IDDQ_SUSPEND;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Communicate the integrated PHY revision */</div><div class='del'>-	phy_flags = priv-&gt;gphy_rev;</div><div class='del'>-</div><div class='del'>-	/* Initialize link state variables that bcmgenet_mii_setup() uses */</div><div class='del'>-	priv-&gt;old_link = -1;</div><div class='del'>-	priv-&gt;old_speed = -1;</div><div class='del'>-	priv-&gt;old_duplex = -1;</div><div class='del'>-	priv-&gt;old_pause = -1;</div><div class='add'>+	if (priv-&gt;internal_phy)</div><div class='add'>+		phy_flags = priv-&gt;gphy_rev;</div><div class='add'>+</div><div class='add'>+	/* This is an ugly quirk but we have not been correctly interpreting</div><div class='add'>+	 * the phy_interface values and we have done that across different</div><div class='add'>+	 * drivers, so at least we are consistent in our mistakes.</div><div class='add'>+	 *</div><div class='add'>+	 * When the Generic PHY driver is in use either the PHY has been</div><div class='add'>+	 * strapped or programmed correctly by the boot loader so we should</div><div class='add'>+	 * stick to our incorrect interpretation since we have validated it.</div><div class='add'>+	 *</div><div class='add'>+	 * Now when a dedicated PHY driver is in use, we need to reverse the</div><div class='add'>+	 * meaning of the phy_interface_mode values to something that the PHY</div><div class='add'>+	 * driver will interpret and act on such that we have two mistakes</div><div class='add'>+	 * canceling themselves so to speak. We only do this for the two</div><div class='add'>+	 * modes that GENET driver officially supports on Broadcom STB chips:</div><div class='add'>+	 * PHY_INTERFACE_MODE_RGMII and PHY_INTERFACE_MODE_RGMII_TXID. Other</div><div class='add'>+	 * modes are not *officially* supported with the boot loader and the</div><div class='add'>+	 * scripted environment generating Device Tree blobs for those</div><div class='add'>+	 * platforms.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that internal PHY, MoCA and fixed-link configurations are not</div><div class='add'>+	 * affected because they use different phy_interface_t values or the</div><div class='add'>+	 * Generic PHY driver.</div><div class='add'>+	 */</div><div class='add'>+	switch (priv-&gt;phy_interface) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+		phy_iface = PHY_INTERFACE_MODE_RGMII_ID;</div><div class='add'>+		break;</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		phy_iface = PHY_INTERFACE_MODE_RGMII_RXID;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (dn) {</div><div class='ctx'> 		phydev = of_phy_connect(dev, priv-&gt;phy_dn, bcmgenet_mii_setup,</div><div class='del'>-					phy_flags, priv-&gt;phy_interface);</div><div class='add'>+					phy_flags, phy_iface);</div><div class='ctx'> 		if (!phydev) {</div><div class='ctx'> 			pr_err("could not attach to PHY\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-		phydev = dev-&gt;phydev;</div><div class='add'>+		if (has_acpi_companion(kdev)) {</div><div class='add'>+			char mdio_bus_id[MII_BUS_ID_SIZE];</div><div class='add'>+			struct mii_bus *unimacbus;</div><div class='add'>+</div><div class='add'>+			snprintf(mdio_bus_id, MII_BUS_ID_SIZE, "%s-%d",</div><div class='add'>+				 UNIMAC_MDIO_DRV_NAME, priv-&gt;pdev-&gt;id);</div><div class='add'>+</div><div class='add'>+			unimacbus = mdio_find_bus(mdio_bus_id);</div><div class='add'>+			if (!unimacbus) {</div><div class='add'>+				pr_err("Unable to find mii\n");</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+			phydev = phy_find_first(unimacbus);</div><div class='add'>+			put_device(&amp;unimacbus-&gt;dev);</div><div class='add'>+			if (!phydev) {</div><div class='add'>+				pr_err("Unable to find PHY\n");</div><div class='add'>+				return -ENODEV;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			phydev = dev-&gt;phydev;</div><div class='add'>+		}</div><div class='ctx'> 		phydev-&gt;dev_flags = phy_flags;</div><div class='ctx'> </div><div class='ctx'> 		ret = phy_connect_direct(dev, phydev, bcmgenet_mii_setup,</div><div class='del'>-					 priv-&gt;phy_interface);</div><div class='add'>+					 phy_iface);</div><div class='ctx'> 		if (ret) {</div><div class='ctx'> 			pr_err("could not attach to PHY\n");</div><div class='ctx'> 			return -ENODEV;</div><div class='hunk'>@@ -318,8 +400,6 @@ int bcmgenet_mii_probe(struct net_device *dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	linkmode_copy(phydev-&gt;advertising, phydev-&gt;supported);</div><div class='del'>-</div><div class='ctx'> 	/* The internal PHY has its link interrupts routed to the</div><div class='ctx'> 	 * Ethernet MAC ISRs. On GENETv5 there is a hardware issue</div><div class='ctx'> 	 * that prevents the signaling of link UP interrupts when</div><div class='hunk'>@@ -327,7 +407,10 @@ int bcmgenet_mii_probe(struct net_device *dev)</div><div class='ctx'> 	 * those versions of GENET.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (priv-&gt;internal_phy &amp;&amp; !GENET_IS_V5(priv))</div><div class='del'>-		dev-&gt;phydev-&gt;irq = PHY_IGNORE_INTERRUPT;</div><div class='add'>+		dev-&gt;phydev-&gt;irq = PHY_MAC_INTERRUPT;</div><div class='add'>+</div><div class='add'>+	/* Indicate that the MAC is responsible for PHY PM */</div><div class='add'>+	dev-&gt;phydev-&gt;mac_managed_pm = true;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -352,23 +435,6 @@ static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)</div><div class='ctx'> 	return priv-&gt;mdio_dn;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void bcmgenet_mii_pdata_init(struct bcmgenet_priv *priv,</div><div class='del'>-				    struct unimac_mdio_pdata *ppd)</div><div class='del'>-{</div><div class='del'>-	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='del'>-	struct bcmgenet_platform_data *pd = kdev-&gt;platform_data;</div><div class='del'>-</div><div class='del'>-	if (pd-&gt;phy_interface != PHY_INTERFACE_MODE_MOCA &amp;&amp; pd-&gt;mdio_enabled) {</div><div class='del'>-		/*</div><div class='del'>-		 * Internal or external PHY with MDIO access</div><div class='del'>-		 */</div><div class='del'>-		if (pd-&gt;phy_address &gt;= 0 &amp;&amp; pd-&gt;phy_address &lt; PHY_MAX_ADDR)</div><div class='del'>-			ppd-&gt;phy_mask = 1 &lt;&lt; pd-&gt;phy_address;</div><div class='del'>-		else</div><div class='del'>-			ppd-&gt;phy_mask = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bcmgenet_mii_wait(void *wait_func_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct bcmgenet_priv *priv = wait_func_data;</div><div class='hunk'>@@ -383,7 +449,6 @@ static int bcmgenet_mii_wait(void *wait_func_data)</div><div class='ctx'> static int bcmgenet_mii_register(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct platform_device *pdev = priv-&gt;pdev;</div><div class='del'>-	struct bcmgenet_platform_data *pdata = pdev-&gt;dev.platform_data;</div><div class='ctx'> 	struct device_node *dn = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct unimac_mdio_pdata ppd;</div><div class='ctx'> 	struct platform_device *ppdev;</div><div class='hunk'>@@ -391,12 +456,20 @@ static int bcmgenet_mii_register(struct bcmgenet_priv *priv)</div><div class='ctx'> 	int id, ret;</div><div class='ctx'> </div><div class='ctx'> 	pres = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+	if (!pres) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Invalid resource\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> 	memset(&amp;res, 0, sizeof(res));</div><div class='ctx'> 	memset(&amp;ppd, 0, sizeof(ppd));</div><div class='ctx'> </div><div class='ctx'> 	ppd.wait_func = bcmgenet_mii_wait;</div><div class='ctx'> 	ppd.wait_func_data = priv;</div><div class='ctx'> 	ppd.bus_name = "bcmgenet MII bus";</div><div class='add'>+	/* Pass a reference to our "main" clock which is used for MDIO</div><div class='add'>+	 * transfers</div><div class='add'>+	 */</div><div class='add'>+	ppd.clk = priv-&gt;clk;</div><div class='ctx'> </div><div class='ctx'> 	/* Unimac MDIO bus controller starts at UniMAC offset + MDIO_CMD</div><div class='ctx'> 	 * and is 2 * 32-bits word long, 8 bytes total.</div><div class='hunk'>@@ -417,9 +490,10 @@ static int bcmgenet_mii_register(struct bcmgenet_priv *priv)</div><div class='ctx'> 	/* Retain this platform_device pointer for later cleanup */</div><div class='ctx'> 	priv-&gt;mii_pdev = ppdev;</div><div class='ctx'> 	ppdev-&gt;dev.parent = &amp;pdev-&gt;dev;</div><div class='del'>-	ppdev-&gt;dev.of_node = bcmgenet_mii_of_find_mdio(priv);</div><div class='del'>-	if (pdata)</div><div class='del'>-		bcmgenet_mii_pdata_init(priv, &amp;ppd);</div><div class='add'>+	if (dn)</div><div class='add'>+		ppdev-&gt;dev.of_node = bcmgenet_mii_of_find_mdio(priv);</div><div class='add'>+	else</div><div class='add'>+		ppd.phy_mask = ~0;</div><div class='ctx'> </div><div class='ctx'> 	ret = platform_device_add_resources(ppdev, &amp;res, 1);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -439,12 +513,33 @@ out:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int bcmgenet_phy_interface_init(struct bcmgenet_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	int phy_mode = device_get_phy_mode(kdev);</div><div class='add'>+</div><div class='add'>+	if (phy_mode &lt; 0) {</div><div class='add'>+		dev_err(kdev, "invalid PHY mode property\n");</div><div class='add'>+		return phy_mode;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;phy_interface = phy_mode;</div><div class='add'>+</div><div class='add'>+	/* We need to specifically look up whether this PHY interface is</div><div class='add'>+	 * internal or not *before* we even try to probe the PHY driver</div><div class='add'>+	 * over MDIO as we may have shut down the internal PHY for power</div><div class='add'>+	 * saving purposes.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;phy_interface == PHY_INTERFACE_MODE_INTERNAL)</div><div class='add'>+		priv-&gt;internal_phy = true;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct device_node *dn = priv-&gt;pdev-&gt;dev.of_node;</div><div class='del'>-	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='del'>-	int phy_mode;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Fetch the PHY phandle */</div><div class='hunk'>@@ -462,23 +557,12 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the link mode */</div><div class='del'>-	phy_mode = of_get_phy_mode(dn);</div><div class='del'>-	if (phy_mode &lt; 0) {</div><div class='del'>-		dev_err(kdev, "invalid PHY mode property\n");</div><div class='del'>-		return phy_mode;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;phy_interface = phy_mode;</div><div class='del'>-</div><div class='del'>-	/* We need to specifically look up whether this PHY interface is internal</div><div class='del'>-	 * or not *before* we even try to probe the PHY driver over MDIO as we</div><div class='del'>-	 * may have shut down the internal PHY for power saving purposes.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;phy_interface == PHY_INTERFACE_MODE_INTERNAL)</div><div class='del'>-		priv-&gt;internal_phy = true;</div><div class='add'>+	ret = bcmgenet_phy_interface_init(priv);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we initialize MoCA PHYs with a link down */</div><div class='del'>-	if (phy_mode == PHY_INTERFACE_MODE_MOCA) {</div><div class='add'>+	if (priv-&gt;phy_interface == PHY_INTERFACE_MODE_MOCA) {</div><div class='ctx'> 		phydev = of_phy_find_device(dn);</div><div class='ctx'> 		if (phydev) {</div><div class='ctx'> 			phydev-&gt;link = 0;</div><div class='hunk'>@@ -489,66 +573,17 @@ static int bcmgenet_mii_of_init(struct bcmgenet_priv *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)</div><div class='del'>-{</div><div class='del'>-	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='del'>-	struct bcmgenet_platform_data *pd = kdev-&gt;platform_data;</div><div class='del'>-	char phy_name[MII_BUS_ID_SIZE + 3];</div><div class='del'>-	char mdio_bus_id[MII_BUS_ID_SIZE];</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-</div><div class='del'>-	snprintf(mdio_bus_id, MII_BUS_ID_SIZE, "%s-%d",</div><div class='del'>-		 UNIMAC_MDIO_DRV_NAME, priv-&gt;pdev-&gt;id);</div><div class='del'>-</div><div class='del'>-	if (pd-&gt;phy_interface != PHY_INTERFACE_MODE_MOCA &amp;&amp; pd-&gt;mdio_enabled) {</div><div class='del'>-		snprintf(phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT,</div><div class='del'>-			 mdio_bus_id, pd-&gt;phy_address);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Internal or external PHY with MDIO access</div><div class='del'>-		 */</div><div class='del'>-		phydev = phy_attach(priv-&gt;dev, phy_name, pd-&gt;phy_interface);</div><div class='del'>-		if (!phydev) {</div><div class='del'>-			dev_err(kdev, "failed to register PHY device\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/*</div><div class='del'>-		 * MoCA port or no MDIO access.</div><div class='del'>-		 * Use fixed PHY to represent the link layer.</div><div class='del'>-		 */</div><div class='del'>-		struct fixed_phy_status fphy_status = {</div><div class='del'>-			.link = 1,</div><div class='del'>-			.speed = pd-&gt;phy_speed,</div><div class='del'>-			.duplex = pd-&gt;phy_duplex,</div><div class='del'>-			.pause = 0,</div><div class='del'>-			.asym_pause = 0,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		phydev = fixed_phy_register(PHY_POLL, &amp;fphy_status, NULL);</div><div class='del'>-		if (!phydev || IS_ERR(phydev)) {</div><div class='del'>-			dev_err(kdev, "failed to register fixed PHY device\n");</div><div class='del'>-			return -ENODEV;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Make sure we initialize MoCA PHYs with a link down */</div><div class='del'>-		phydev-&gt;link = 0;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;phy_interface = pd-&gt;phy_interface;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *dn = priv-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+	struct device *kdev = &amp;priv-&gt;pdev-&gt;dev;</div><div class='add'>+	struct device_node *dn = kdev-&gt;of_node;</div><div class='ctx'> </div><div class='ctx'> 	if (dn)</div><div class='ctx'> 		return bcmgenet_mii_of_init(priv);</div><div class='add'>+	else if (has_acpi_companion(kdev))</div><div class='add'>+		return bcmgenet_phy_interface_init(priv);</div><div class='ctx'> 	else</div><div class='del'>-		return bcmgenet_mii_pd_init(priv);</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int bcmgenet_mii_init(struct net_device *dev)</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c<br/>index 1604ad32e920..30865fe03eeb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/sb1250-mac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/sb1250-mac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/sb1250-mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/sb1250-mac.c</a></div><div class='hunk'>@@ -73,7 +73,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value");</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/sibyte/board.h&gt;</div><div class='ctx'> #include &lt;asm/sibyte/sb1250.h&gt;</div><div class='del'>-#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)</div><div class='add'>+#if defined(CONFIG_SIBYTE_BCM1x80)</div><div class='ctx'> #include &lt;asm/sibyte/bcm1480_regs.h&gt;</div><div class='ctx'> #include &lt;asm/sibyte/bcm1480_int.h&gt;</div><div class='ctx'> #define R_MAC_DMA_OODPKTLOST_RX	R_MAC_DMA_OODPKTLOST</div><div class='hunk'>@@ -87,7 +87,7 @@ MODULE_PARM_DESC(int_timeout_rx, "RX timeout value");</div><div class='ctx'> #include &lt;asm/sibyte/sb1250_mac.h&gt;</div><div class='ctx'> #include &lt;asm/sibyte/sb1250_dma.h&gt;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)</div><div class='add'>+#if defined(CONFIG_SIBYTE_BCM1x80)</div><div class='ctx'> #define UNIT_INT(n)		(K_BCM1480_INT_MAC_0 + ((n) * 2))</div><div class='ctx'> #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)</div><div class='ctx'> #define UNIT_INT(n)		(K_INT_MAC_0 + (n))</div><div class='hunk'>@@ -294,7 +294,7 @@ static int sbmac_set_duplex(struct sbmac_softc *s, enum sbmac_duplex duplex,</div><div class='ctx'> 			    enum sbmac_fc fc);</div><div class='ctx'> </div><div class='ctx'> static int sbmac_open(struct net_device *dev);</div><div class='del'>-static void sbmac_tx_timeout (struct net_device *dev);</div><div class='add'>+static void sbmac_tx_timeout (struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void sbmac_set_rx_mode(struct net_device *dev);</div><div class='ctx'> static int sbmac_mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='ctx'> static int sbmac_close(struct net_device *dev);</div><div class='hunk'>@@ -1527,7 +1527,7 @@ static void sbmac_channel_start(struct sbmac_softc *s)</div><div class='ctx'> 	 * Turn on the rest of the bits in the enable register</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)</div><div class='add'>+#if defined(CONFIG_SIBYTE_BCM1x80)</div><div class='ctx'> 	__raw_writeq(M_MAC_RXDMA_EN0 |</div><div class='ctx'> 		       M_MAC_TXDMA_EN0, s-&gt;sbm_macenable);</div><div class='ctx'> #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)</div><div class='hunk'>@@ -2136,7 +2136,7 @@ static const struct net_device_ops sbmac_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= sbmac_start_tx,</div><div class='ctx'> 	.ndo_set_rx_mode	= sbmac_set_rx_mode,</div><div class='ctx'> 	.ndo_tx_timeout		= sbmac_tx_timeout,</div><div class='del'>-	.ndo_do_ioctl		= sbmac_mii_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= sbmac_mii_ioctl,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -2183,9 +2183,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)</div><div class='ctx'> 		ea_reg &gt;&gt;= 8;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; 6; i++) {</div><div class='del'>-		dev-&gt;dev_addr[i] = eaddr[i];</div><div class='del'>-	}</div><div class='add'>+	eth_hw_addr_set(dev, eaddr);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize context (get pointers to registers and stuff), then</div><div class='hunk'>@@ -2205,7 +2203,7 @@ static int sbmac_init(struct platform_device *pldev, long long base)</div><div class='ctx'> 	dev-&gt;min_mtu = 0;</div><div class='ctx'> 	dev-&gt;max_mtu = ENET_PACKET_SIZE;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;sc-&gt;napi, sbmac_poll, 16);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;sc-&gt;napi, sbmac_poll, 16);</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq		= UNIT_INT(idx);</div><div class='ctx'> </div><div class='hunk'>@@ -2419,7 +2417,7 @@ static void sbmac_mii_poll(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void sbmac_tx_timeout (struct net_device *dev)</div><div class='add'>+static void sbmac_tx_timeout (struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct sbmac_softc *sc = netdev_priv(dev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -2536,8 +2534,13 @@ static int sbmac_probe(struct platform_device *pldev)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pldev, IORESOURCE_MEM, 0);</div><div class='del'>-	BUG_ON(!res);</div><div class='del'>-	sbm_base = ioremap_nocache(res-&gt;start, resource_size(res));</div><div class='add'>+	if (!res) {</div><div class='add'>+		printk(KERN_ERR "%s: failed to get resource\n",</div><div class='add'>+		       dev_name(&amp;pldev-&gt;dev));</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_out;</div><div class='add'>+	}</div><div class='add'>+	sbm_base = ioremap(res-&gt;start, resource_size(res));</div><div class='ctx'> 	if (!sbm_base) {</div><div class='ctx'> 		printk(KERN_ERR "%s: unable to map device registers\n",</div><div class='ctx'> 		       dev_name(&amp;pldev-&gt;dev));</div><div class='hunk'>@@ -2590,7 +2593,7 @@ out_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sbmac_remove(struct platform_device *pldev)</div><div class='add'>+static void sbmac_remove(struct platform_device *pldev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pldev);</div><div class='ctx'> 	struct sbmac_softc *sc = netdev_priv(dev);</div><div class='hunk'>@@ -2601,8 +2604,6 @@ static int sbmac_remove(struct platform_device *pldev)</div><div class='ctx'> 	mdiobus_free(sc-&gt;mii_bus);</div><div class='ctx'> 	iounmap(sc-&gt;sbm_base);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver sbmac_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c<br/>index 6d1f9c822548..75f66587983d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/tg3.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/tg3.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/tg3.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/tg3.c</a></div><div class='hunk'>@@ -54,9 +54,11 @@</div><div class='ctx'> #include &lt;linux/ssb/ssb_driver_gige.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon.h&gt;</div><div class='ctx'> #include &lt;linux/hwmon-sysfs.h&gt;</div><div class='del'>-#include &lt;linux/crc32poly.h&gt;</div><div class='add'>+#include &lt;linux/crc32.h&gt;</div><div class='add'>+#include &lt;linux/dmi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;net/checksum.h&gt;</div><div class='add'>+#include &lt;net/gso.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -96,11 +98,9 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)</div><div class='ctx'> 	_tg3_flag_clear(TG3_FLAG_##flag, (tp)-&gt;tg3_flags)</div><div class='ctx'> </div><div class='ctx'> #define DRV_MODULE_NAME		"tg3"</div><div class='add'>+/* DO NOT UPDATE TG3_*_NUM defines */</div><div class='ctx'> #define TG3_MAJ_NUM			3</div><div class='ctx'> #define TG3_MIN_NUM			137</div><div class='del'>-#define DRV_MODULE_VERSION	\</div><div class='del'>-	__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)</div><div class='del'>-#define DRV_MODULE_RELDATE	"May 11, 2014"</div><div class='ctx'> </div><div class='ctx'> #define RESET_KIND_SHUTDOWN	0</div><div class='ctx'> #define RESET_KIND_INIT		1</div><div class='hunk'>@@ -222,14 +222,11 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)</div><div class='ctx'> #define FIRMWARE_TG3TSO		"tigon/tg3_tso.bin"</div><div class='ctx'> #define FIRMWARE_TG3TSO5	"tigon/tg3_tso5.bin"</div><div class='ctx'> </div><div class='del'>-static char version[] =</div><div class='del'>-	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")";</div><div class='del'>-</div><div class='del'>-MODULE_AUTHOR("David S. Miller (davem@redhat.com) and Jeff Garzik (jgarzik@pobox.com)");</div><div class='add'>+MODULE_AUTHOR("David S. Miller &lt;davem@redhat.com&gt; and Jeff Garzik &lt;jgarzik@pobox.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Broadcom Tigon3 ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_MODULE_VERSION);</div><div class='ctx'> MODULE_FIRMWARE(FIRMWARE_TG3);</div><div class='add'>+MODULE_FIRMWARE(FIRMWARE_TG357766);</div><div class='ctx'> MODULE_FIRMWARE(FIRMWARE_TG3TSO);</div><div class='ctx'> MODULE_FIRMWARE(FIRMWARE_TG3TSO5);</div><div class='ctx'> </div><div class='hunk'>@@ -721,7 +718,7 @@ static int tg3_ape_lock(struct tg3 *tp, int locknum)</div><div class='ctx'> 	case TG3_APE_LOCK_GPIO:</div><div class='ctx'> 		if (tg3_asic_rev(tp) == ASIC_REV_5761)</div><div class='ctx'> 			return 0;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TG3_APE_LOCK_GRC:</div><div class='ctx'> 	case TG3_APE_LOCK_MEM:</div><div class='ctx'> 		if (!tp-&gt;pci_fn)</div><div class='hunk'>@@ -782,7 +779,7 @@ static void tg3_ape_unlock(struct tg3 *tp, int locknum)</div><div class='ctx'> 	case TG3_APE_LOCK_GPIO:</div><div class='ctx'> 		if (tg3_asic_rev(tp) == ASIC_REV_5761)</div><div class='ctx'> 			return;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case TG3_APE_LOCK_GRC:</div><div class='ctx'> 	case TG3_APE_LOCK_MEM:</div><div class='ctx'> 		if (!tp-&gt;pci_fn)</div><div class='hunk'>@@ -1543,8 +1540,7 @@ static int tg3_mdio_init(struct tg3 *tp)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;mdio_bus-&gt;name     = "tg3 mdio bus";</div><div class='del'>-	snprintf(tp-&gt;mdio_bus-&gt;id, MII_BUS_ID_SIZE, "%x",</div><div class='del'>-		 (tp-&gt;pdev-&gt;bus-&gt;number &lt;&lt; 8) | tp-&gt;pdev-&gt;devfn);</div><div class='add'>+	snprintf(tp-&gt;mdio_bus-&gt;id, MII_BUS_ID_SIZE, "%x", pci_dev_id(tp-&gt;pdev));</div><div class='ctx'> 	tp-&gt;mdio_bus-&gt;priv     = tp;</div><div class='ctx'> 	tp-&gt;mdio_bus-&gt;parent   = &amp;tp-&gt;pdev-&gt;dev;</div><div class='ctx'> 	tp-&gt;mdio_bus-&gt;read     = &amp;tg3_mdio_read;</div><div class='hunk'>@@ -1586,13 +1582,7 @@ static int tg3_mdio_init(struct tg3 *tp)</div><div class='ctx'> 				     PHY_BRCM_RX_REFCLK_UNUSED |</div><div class='ctx'> 				     PHY_BRCM_DIS_TXCRXC_NOENRGY |</div><div class='ctx'> 				     PHY_BRCM_AUTO_PWRDWN_ENABLE;</div><div class='del'>-		if (tg3_flag(tp, RGMII_INBAND_DISABLE))</div><div class='del'>-			phydev-&gt;dev_flags |= PHY_BRCM_STD_IBND_DISABLE;</div><div class='del'>-		if (tg3_flag(tp, RGMII_EXT_IBND_RX_EN))</div><div class='del'>-			phydev-&gt;dev_flags |= PHY_BRCM_EXT_IBND_RX_ENABLE;</div><div class='del'>-		if (tg3_flag(tp, RGMII_EXT_IBND_TX_EN))</div><div class='del'>-			phydev-&gt;dev_flags |= PHY_BRCM_EXT_IBND_TX_ENABLE;</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PHY_ID_RTL8211C:</div><div class='ctx'> 		phydev-&gt;interface = PHY_INTERFACE_MODE_RGMII;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2120,7 +2110,7 @@ static int tg3_phy_init(struct tg3 *tp)</div><div class='ctx'> 			phy_support_asym_pause(phydev);</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_MII:</div><div class='ctx'> 		phy_set_max_speed(phydev, SPEED_100);</div><div class='ctx'> 		phy_support_asym_pause(phydev);</div><div class='hunk'>@@ -2349,10 +2339,10 @@ static void tg3_phy_apply_otp(struct tg3 *tp)</div><div class='ctx'> 	tg3_phy_toggle_auxctl_smdsp(tp, false);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_eee *eee)</div><div class='add'>+static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_keee *eee)</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='del'>-	struct ethtool_eee *dest = &amp;tp-&gt;eee;</div><div class='add'>+	struct ethtool_keee *dest = &amp;tp-&gt;eee;</div><div class='ctx'> </div><div class='ctx'> 	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_EEE_CAP))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2373,13 +2363,13 @@ static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_eee *eee)</div><div class='ctx'> 	/* Pull lp advertised settings */</div><div class='ctx'> 	if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE, &amp;val))</div><div class='ctx'> 		return;</div><div class='del'>-	dest-&gt;lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val);</div><div class='add'>+	mii_eee_cap1_mod_linkmode_t(dest-&gt;lp_advertised, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Pull advertised and eee_enabled settings */</div><div class='ctx'> 	if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, &amp;val))</div><div class='ctx'> 		return;</div><div class='ctx'> 	dest-&gt;eee_enabled = !!val;</div><div class='del'>-	dest-&gt;advertised = mmd_eee_adv_to_ethtool_adv_t(val);</div><div class='add'>+	mii_eee_cap1_mod_linkmode_t(dest-&gt;advertised, val);</div><div class='ctx'> </div><div class='ctx'> 	/* Pull tx_lpi_enabled */</div><div class='ctx'> 	val = tr32(TG3_CPMU_EEE_MODE);</div><div class='hunk'>@@ -3748,7 +3738,7 @@ static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		u32 *fw_data = (u32 *)(fw_hdr + 1);</div><div class='add'>+		__be32 *fw_data = (__be32 *)(fw_hdr + 1);</div><div class='ctx'> 		for (i = 0; i &lt; tg3_fw_data_len(tp, fw_hdr); i++)</div><div class='ctx'> 			write_op(tp, cpu_scratch_base +</div><div class='ctx'> 				     (be32_to_cpu(fw_hdr-&gt;base_addr) &amp; 0xffff) +</div><div class='hunk'>@@ -3954,7 +3944,8 @@ static int tg3_load_tso_firmware(struct tg3 *tp)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* tp-&gt;lock is held. */</div><div class='del'>-static void __tg3_set_one_mac_addr(struct tg3 *tp, u8 *mac_addr, int index)</div><div class='add'>+static void __tg3_set_one_mac_addr(struct tg3 *tp, const u8 *mac_addr,</div><div class='add'>+				   int index)</div><div class='ctx'> {</div><div class='ctx'> 	u32 addr_high, addr_low;</div><div class='ctx'> </div><div class='hunk'>@@ -4029,7 +4020,7 @@ static int tg3_power_up(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static int tg3_setup_phy(struct tg3 *, bool);</div><div class='ctx'> </div><div class='del'>-static int tg3_power_down_prepare(struct tg3 *tp)</div><div class='add'>+static void tg3_power_down_prepare(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	u32 misc_host_ctrl;</div><div class='ctx'> 	bool device_should_wake, do_low_power;</div><div class='hunk'>@@ -4273,7 +4264,7 @@ static int tg3_power_down_prepare(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	tg3_ape_driver_state_change(tp, RESET_KIND_SHUTDOWN);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_power_down(struct tg3 *tp)</div><div class='hunk'>@@ -4364,23 +4355,12 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)</div><div class='ctx'> 	if (!err) {</div><div class='ctx'> 		u32 err2;</div><div class='ctx'> </div><div class='del'>-		val = 0;</div><div class='del'>-		/* Advertise 100-BaseTX EEE ability */</div><div class='del'>-		if (advertise &amp; ADVERTISED_100baseT_Full)</div><div class='del'>-			val |= MDIO_AN_EEE_ADV_100TX;</div><div class='del'>-		/* Advertise 1000-BaseT EEE ability */</div><div class='del'>-		if (advertise &amp; ADVERTISED_1000baseT_Full)</div><div class='del'>-			val |= MDIO_AN_EEE_ADV_1000T;</div><div class='del'>-</div><div class='del'>-		if (!tp-&gt;eee.eee_enabled) {</div><div class='add'>+		if (!tp-&gt;eee.eee_enabled)</div><div class='ctx'> 			val = 0;</div><div class='del'>-			tp-&gt;eee.advertised = 0;</div><div class='del'>-		} else {</div><div class='del'>-			tp-&gt;eee.advertised = advertise &amp;</div><div class='del'>-					     (ADVERTISED_100baseT_Full |</div><div class='del'>-					      ADVERTISED_1000baseT_Full);</div><div class='del'>-		}</div><div class='add'>+		else</div><div class='add'>+			val = ethtool_adv_to_mmd_eee_adv_t(advertise);</div><div class='ctx'> </div><div class='add'>+		mii_eee_cap1_mod_linkmode_t(tp-&gt;eee.advertised, val);</div><div class='ctx'> 		err = tg3_phy_cl45_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			val = 0;</div><div class='hunk'>@@ -4396,7 +4376,7 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)</div><div class='ctx'> 				      MII_TG3_DSP_TAP26_RMRXSTO |</div><div class='ctx'> 				      MII_TG3_DSP_TAP26_OPCSINPT;</div><div class='ctx'> 			tg3_phydsp_write(tp, MII_TG3_DSP_TAP26, val);</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case ASIC_REV_5720:</div><div class='ctx'> 		case ASIC_REV_5762:</div><div class='ctx'> 			if (!tg3_phydsp_read(tp, MII_TG3_DSP_CH34TP2, &amp;val))</div><div class='hunk'>@@ -4544,7 +4524,7 @@ static int tg3_phy_pull_config(struct tg3 *tp)</div><div class='ctx'> 				tp-&gt;link_config.speed = SPEED_1000;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		default:</div><div class='ctx'> 			goto done;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -4628,7 +4608,7 @@ static int tg3_init_5401phy_dsp(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static bool tg3_phy_eee_config_ok(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	struct ethtool_eee eee;</div><div class='add'>+	struct ethtool_keee eee = {};</div><div class='ctx'> </div><div class='ctx'> 	if (!(tp-&gt;phy_flags &amp; TG3_PHYFLG_EEE_CAP))</div><div class='ctx'> 		return true;</div><div class='hunk'>@@ -4636,13 +4616,13 @@ static bool tg3_phy_eee_config_ok(struct tg3 *tp)</div><div class='ctx'> 	tg3_eee_pull_config(tp, &amp;eee);</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;eee.eee_enabled) {</div><div class='del'>-		if (tp-&gt;eee.advertised != eee.advertised ||</div><div class='add'>+		if (!linkmode_equal(tp-&gt;eee.advertised, eee.advertised) ||</div><div class='ctx'> 		    tp-&gt;eee.tx_lpi_timer != eee.tx_lpi_timer ||</div><div class='ctx'> 		    tp-&gt;eee.tx_lpi_enabled != eee.tx_lpi_enabled)</div><div class='ctx'> 			return false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* EEE is disabled but we're advertising */</div><div class='del'>-		if (eee.advertised)</div><div class='add'>+		if (!linkmode_empty(eee.advertised))</div><div class='ctx'> 			return false;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5215,7 +5195,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp,</div><div class='ctx'> 		if (ap-&gt;flags &amp; (MR_AN_ENABLE | MR_RESTART_AN))</div><div class='ctx'> 			ap-&gt;state = ANEG_STATE_AN_ENABLE;</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ANEG_STATE_AN_ENABLE:</div><div class='ctx'> 		ap-&gt;flags &amp;= ~(MR_AN_COMPLETE | MR_PAGE_RX);</div><div class='ctx'> 		if (ap-&gt;flags &amp; MR_AN_ENABLE) {</div><div class='hunk'>@@ -5245,7 +5225,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp,</div><div class='ctx'> 		ret = ANEG_TIMER_ENAB;</div><div class='ctx'> 		ap-&gt;state = ANEG_STATE_RESTART;</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ANEG_STATE_RESTART:</div><div class='ctx'> 		delta = ap-&gt;cur_time - ap-&gt;link_time;</div><div class='ctx'> 		if (delta &gt; ANEG_STATE_SETTLE_TIME)</div><div class='hunk'>@@ -5288,7 +5268,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp,</div><div class='ctx'> </div><div class='ctx'> 		ap-&gt;state = ANEG_STATE_ACK_DETECT;</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ANEG_STATE_ACK_DETECT:</div><div class='ctx'> 		if (ap-&gt;ack_match != 0) {</div><div class='ctx'> 			if ((ap-&gt;rxconfig &amp; ~ANEG_CFG_ACK) ==</div><div class='hunk'>@@ -5514,7 +5494,6 @@ static bool tg3_setup_fiber_hw_autoneg(struct tg3 *tp, u32 mac_status)</div><div class='ctx'> 	int workaround, port_a;</div><div class='ctx'> </div><div class='ctx'> 	serdes_cfg = 0;</div><div class='del'>-	expected_sg_dig_ctrl = 0;</div><div class='ctx'> 	workaround = 0;</div><div class='ctx'> 	port_a = 1;</div><div class='ctx'> 	current_link_up = false;</div><div class='hunk'>@@ -5758,7 +5737,6 @@ static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset)</div><div class='ctx'> 	tw32_f(MAC_EVENT, MAC_EVENT_LNKSTATE_CHANGED);</div><div class='ctx'> 	udelay(40);</div><div class='ctx'> </div><div class='del'>-	current_link_up = false;</div><div class='ctx'> 	tp-&gt;link_config.rmt_adv = 0;</div><div class='ctx'> 	mac_status = tr32(MAC_STATUS);</div><div class='ctx'> </div><div class='hunk'>@@ -5825,7 +5803,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset)</div><div class='ctx'> 	u32 current_speed = SPEED_UNKNOWN;</div><div class='ctx'> 	u8 current_duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> 	bool current_link_up = false;</div><div class='del'>-	u32 local_adv, remote_adv, sgsr;</div><div class='add'>+	u32 local_adv = 0, remote_adv = 0, sgsr;</div><div class='ctx'> </div><div class='ctx'> 	if ((tg3_asic_rev(tp) == ASIC_REV_5719 ||</div><div class='ctx'> 	     tg3_asic_rev(tp) == ASIC_REV_5720) &amp;&amp;</div><div class='hunk'>@@ -5966,9 +5944,6 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset)</div><div class='ctx'> 		else</div><div class='ctx'> 			current_duplex = DUPLEX_HALF;</div><div class='ctx'> </div><div class='del'>-		local_adv = 0;</div><div class='del'>-		remote_adv = 0;</div><div class='del'>-</div><div class='ctx'> 		if (bmcr &amp; BMCR_ANENABLE) {</div><div class='ctx'> 			u32 common;</div><div class='ctx'> </div><div class='hunk'>@@ -6164,13 +6139,11 @@ static void tg3_refclk_write(struct tg3 *tp, u64 newval)</div><div class='ctx'> </div><div class='ctx'> static inline void tg3_full_lock(struct tg3 *tp, int irq_sync);</div><div class='ctx'> static inline void tg3_full_unlock(struct tg3 *tp);</div><div class='del'>-static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)</div><div class='add'>+static int tg3_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-				SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-				SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, PTP_CAPABLE)) {</div><div class='ctx'> 		info-&gt;so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='hunk'>@@ -6180,8 +6153,6 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;ptp_clock)</div><div class='ctx'> 		info-&gt;phc_index = ptp_clock_index(tp-&gt;ptp_clock);</div><div class='del'>-	else</div><div class='del'>-		info-&gt;phc_index = -1;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) | (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='ctx'> </div><div class='hunk'>@@ -6192,34 +6163,26 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='add'>+static int tg3_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = container_of(ptp, struct tg3, ptp_info);</div><div class='del'>-	bool neg_adj = false;</div><div class='del'>-	u32 correction = 0;</div><div class='del'>-</div><div class='del'>-	if (ppb &lt; 0) {</div><div class='del'>-		neg_adj = true;</div><div class='del'>-		ppb = -ppb;</div><div class='del'>-	}</div><div class='add'>+	u64 correction;</div><div class='add'>+	bool neg_adj;</div><div class='ctx'> </div><div class='ctx'> 	/* Frequency adjustment is performed using hardware with a 24 bit</div><div class='ctx'> 	 * accumulator and a programmable correction value. On each clk, the</div><div class='ctx'> 	 * correction value gets added to the accumulator and when it</div><div class='ctx'> 	 * overflows, the time counter is incremented/decremented.</div><div class='del'>-	 *</div><div class='del'>-	 * So conversion from ppb to correction value is</div><div class='del'>-	 *		ppb * (1 &lt;&lt; 24) / 1000000000</div><div class='ctx'> 	 */</div><div class='del'>-	correction = div_u64((u64)ppb * (1 &lt;&lt; 24), 1000000000ULL) &amp;</div><div class='del'>-		     TG3_EAV_REF_CLK_CORRECT_MASK;</div><div class='add'>+	neg_adj = diff_by_scaled_ppm(1 &lt;&lt; 24, scaled_ppm, &amp;correction);</div><div class='ctx'> </div><div class='ctx'> 	tg3_full_lock(tp, 0);</div><div class='ctx'> </div><div class='ctx'> 	if (correction)</div><div class='ctx'> 		tw32(TG3_EAV_REF_CLK_CORRECT_CTL,</div><div class='ctx'> 		     TG3_EAV_REF_CLK_CORRECT_EN |</div><div class='del'>-		     (neg_adj ? TG3_EAV_REF_CLK_CORRECT_NEG : 0) | correction);</div><div class='add'>+		     (neg_adj ? TG3_EAV_REF_CLK_CORRECT_NEG : 0) |</div><div class='add'>+		     ((u32)correction &amp; TG3_EAV_REF_CLK_CORRECT_MASK));</div><div class='ctx'> 	else</div><div class='ctx'> 		tw32(TG3_EAV_REF_CLK_CORRECT_CTL, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -6280,6 +6243,10 @@ static int tg3_ptp_enable(struct ptp_clock_info *ptp,</div><div class='ctx'> </div><div class='ctx'> 	switch (rq-&gt;type) {</div><div class='ctx'> 	case PTP_CLK_REQ_PEROUT:</div><div class='add'>+		/* Reject requests with unsupported flags */</div><div class='add'>+		if (rq-&gt;perout.flags)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 		if (rq-&gt;perout.index != 0)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -6330,6 +6297,46 @@ err_out:</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void tg3_hwclock_to_timestamp(struct tg3 *tp, u64 hwclock,</div><div class='add'>+				     struct skb_shared_hwtstamps *timestamp)</div><div class='add'>+{</div><div class='add'>+	memset(timestamp, 0, sizeof(struct skb_shared_hwtstamps));</div><div class='add'>+	timestamp-&gt;hwtstamp  = ns_to_ktime((hwclock &amp; TG3_TSTAMP_MASK) +</div><div class='add'>+					   tp-&gt;ptp_adjust);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tg3_read_tx_tstamp(struct tg3 *tp, u64 *hwclock)</div><div class='add'>+{</div><div class='add'>+	*hwclock = tr32(TG3_TX_TSTAMP_LSB);</div><div class='add'>+	*hwclock |= (u64)tr32(TG3_TX_TSTAMP_MSB) &lt;&lt; 32;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static long tg3_ptp_ts_aux_work(struct ptp_clock_info *ptp)</div><div class='add'>+{</div><div class='add'>+	struct tg3 *tp = container_of(ptp, struct tg3, ptp_info);</div><div class='add'>+	struct skb_shared_hwtstamps timestamp;</div><div class='add'>+	u64 hwclock;</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;ptp_txts_retrycnt &gt; 2)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	tg3_read_tx_tstamp(tp, &amp;hwclock);</div><div class='add'>+</div><div class='add'>+	if (hwclock != tp-&gt;pre_tx_ts) {</div><div class='add'>+		tg3_hwclock_to_timestamp(tp, hwclock, &amp;timestamp);</div><div class='add'>+		skb_tstamp_tx(tp-&gt;tx_tstamp_skb, &amp;timestamp);</div><div class='add'>+		goto done;</div><div class='add'>+	}</div><div class='add'>+	tp-&gt;ptp_txts_retrycnt++;</div><div class='add'>+	return HZ / 10;</div><div class='add'>+done:</div><div class='add'>+	dev_consume_skb_any(tp-&gt;tx_tstamp_skb);</div><div class='add'>+	tp-&gt;tx_tstamp_skb = NULL;</div><div class='add'>+	tp-&gt;ptp_txts_retrycnt = 0;</div><div class='add'>+	tp-&gt;pre_tx_ts = 0;</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ptp_clock_info tg3_ptp_caps = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "tg3 clock",</div><div class='hunk'>@@ -6339,21 +6346,14 @@ static const struct ptp_clock_info tg3_ptp_caps = {</div><div class='ctx'> 	.n_per_out	= 1,</div><div class='ctx'> 	.n_pins		= 0,</div><div class='ctx'> 	.pps		= 0,</div><div class='del'>-	.adjfreq	= tg3_ptp_adjfreq,</div><div class='add'>+	.adjfine	= tg3_ptp_adjfine,</div><div class='ctx'> 	.adjtime	= tg3_ptp_adjtime,</div><div class='add'>+	.do_aux_work	= tg3_ptp_ts_aux_work,</div><div class='ctx'> 	.gettimex64	= tg3_ptp_gettimex,</div><div class='ctx'> 	.settime64	= tg3_ptp_settime,</div><div class='ctx'> 	.enable		= tg3_ptp_enable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void tg3_hwclock_to_timestamp(struct tg3 *tp, u64 hwclock,</div><div class='del'>-				     struct skb_shared_hwtstamps *timestamp)</div><div class='del'>-{</div><div class='del'>-	memset(timestamp, 0, sizeof(struct skb_shared_hwtstamps));</div><div class='del'>-	timestamp-&gt;hwtstamp  = ns_to_ktime((hwclock &amp; TG3_TSTAMP_MASK) +</div><div class='del'>-					   tp-&gt;ptp_adjust);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* tp-&gt;lock must be held */</div><div class='ctx'> static void tg3_ptp_init(struct tg3 *tp)</div><div class='ctx'> {</div><div class='hunk'>@@ -6384,6 +6384,8 @@ static void tg3_ptp_fini(struct tg3 *tp)</div><div class='ctx'> 	ptp_clock_unregister(tp-&gt;ptp_clock);</div><div class='ctx'> 	tp-&gt;ptp_clock = NULL;</div><div class='ctx'> 	tp-&gt;ptp_adjust = 0;</div><div class='add'>+	dev_consume_skb_any(tp-&gt;tx_tstamp_skb);</div><div class='add'>+	tp-&gt;tx_tstamp_skb = NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int tg3_irq_sync(struct tg3 *tp)</div><div class='hunk'>@@ -6455,6 +6457,14 @@ static void tg3_dump_state(struct tg3 *tp)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 *regs;</div><div class='ctx'> </div><div class='add'>+	/* If it is a PCI error, all registers will be 0xffff,</div><div class='add'>+	 * we don't dump them out, just report the error and return</div><div class='add'>+	 */</div><div class='add'>+	if (tp-&gt;pdev-&gt;error_state != pci_channel_io_normal) {</div><div class='add'>+		netdev_err(tp-&gt;dev, "PCI channel ERROR!\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	regs = kzalloc(TG3_REG_BLK_SIZE, GFP_ATOMIC);</div><div class='ctx'> 	if (!regs)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -6554,6 +6564,7 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> </div><div class='ctx'> 	while (sw_idx != hw_idx) {</div><div class='ctx'> 		struct tg3_tx_ring_info *ri = &amp;tnapi-&gt;tx_buffers[sw_idx];</div><div class='add'>+		bool complete_skb_later = false;</div><div class='ctx'> 		struct sk_buff *skb = ri-&gt;skb;</div><div class='ctx'> 		int i, tx_bug = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -6564,18 +6575,21 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> </div><div class='ctx'> 		if (tnapi-&gt;tx_ring[sw_idx].len_flags &amp; TXD_FLAG_HWTSTAMP) {</div><div class='ctx'> 			struct skb_shared_hwtstamps timestamp;</div><div class='del'>-			u64 hwclock = tr32(TG3_TX_TSTAMP_LSB);</div><div class='del'>-			hwclock |= (u64)tr32(TG3_TX_TSTAMP_MSB) &lt;&lt; 32;</div><div class='add'>+			u64 hwclock;</div><div class='ctx'> </div><div class='del'>-			tg3_hwclock_to_timestamp(tp, hwclock, &amp;timestamp);</div><div class='del'>-</div><div class='del'>-			skb_tstamp_tx(skb, &amp;timestamp);</div><div class='add'>+			tg3_read_tx_tstamp(tp, &amp;hwclock);</div><div class='add'>+			if (hwclock != tp-&gt;pre_tx_ts) {</div><div class='add'>+				tg3_hwclock_to_timestamp(tp, hwclock, &amp;timestamp);</div><div class='add'>+				skb_tstamp_tx(skb, &amp;timestamp);</div><div class='add'>+				tp-&gt;pre_tx_ts = 0;</div><div class='add'>+			} else {</div><div class='add'>+				tp-&gt;tx_tstamp_skb = skb;</div><div class='add'>+				complete_skb_later = true;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(tp-&gt;pdev,</div><div class='del'>-				 dma_unmap_addr(ri, mapping),</div><div class='del'>-				 skb_headlen(skb),</div><div class='del'>-				 PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, dma_unmap_addr(ri, mapping),</div><div class='add'>+				 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		ri-&gt;skb = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -6592,10 +6606,10 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> 			if (unlikely(ri-&gt;skb != NULL || sw_idx == hw_idx))</div><div class='ctx'> 				tx_bug = 1;</div><div class='ctx'> </div><div class='del'>-			pci_unmap_page(tp-&gt;pdev,</div><div class='add'>+			dma_unmap_page(&amp;tp-&gt;pdev-&gt;dev,</div><div class='ctx'> 				       dma_unmap_addr(ri, mapping),</div><div class='ctx'> 				       skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[i]),</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='add'>+				       DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			while (ri-&gt;fragmented) {</div><div class='ctx'> 				ri-&gt;fragmented = false;</div><div class='hunk'>@@ -6609,7 +6623,10 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> 		pkts_compl++;</div><div class='ctx'> 		bytes_compl += skb-&gt;len;</div><div class='ctx'> </div><div class='del'>-		dev_consume_skb_any(skb);</div><div class='add'>+		if (!complete_skb_later)</div><div class='add'>+			dev_consume_skb_any(skb);</div><div class='add'>+		else</div><div class='add'>+			ptp_schedule_worker(tp-&gt;ptp_clock, 0);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(tx_bug)) {</div><div class='ctx'> 			tg3_tx_recover(tp);</div><div class='hunk'>@@ -6621,9 +6638,9 @@ static void tg3_tx(struct tg3_napi *tnapi)</div><div class='ctx'> </div><div class='ctx'> 	tnapi-&gt;tx_cons = sw_idx;</div><div class='ctx'> </div><div class='del'>-	/* Need to make the tx_cons update visible to tg3_start_xmit()</div><div class='add'>+	/* Need to make the tx_cons update visible to __tg3_start_xmit()</div><div class='ctx'> 	 * before checking for netif_queue_stopped().  Without the</div><div class='del'>-	 * memory barrier, there is a small possibility that tg3_start_xmit()</div><div class='add'>+	 * memory barrier, there is a small possibility that __tg3_start_xmit()</div><div class='ctx'> 	 * will miss it and cause the queue to be stopped forever.</div><div class='ctx'> 	 */</div><div class='ctx'> 	smp_mb();</div><div class='hunk'>@@ -6654,8 +6671,8 @@ static void tg3_rx_data_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)</div><div class='ctx'> 	if (!ri-&gt;data)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	pci_unmap_single(tp-&gt;pdev, dma_unmap_addr(ri, mapping),</div><div class='del'>-			 map_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, dma_unmap_addr(ri, mapping), map_sz,</div><div class='add'>+			 DMA_FROM_DEVICE);</div><div class='ctx'> 	tg3_frag_free(skb_size &lt;= PAGE_SIZE, ri-&gt;data);</div><div class='ctx'> 	ri-&gt;data = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -6666,7 +6683,7 @@ static void tg3_rx_data_free(struct tg3 *tp, struct ring_info *ri, u32 map_sz)</div><div class='ctx'>  * We only need to fill in the address because the other members</div><div class='ctx'>  * of the RX descriptor are invariant, see tg3_init_rings.</div><div class='ctx'>  *</div><div class='del'>- * Note the purposeful assymetry of cpu vs. chip accesses.  For</div><div class='add'>+ * Note the purposeful asymmetry of cpu vs. chip accesses.  For</div><div class='ctx'>  * posting buffers we only dirty the first cache line of the RX</div><div class='ctx'>  * descriptor (containing the address).  Whereas for the RX status</div><div class='ctx'>  * buffers the cpu only reads the last cacheline of the RX descriptor</div><div class='hunk'>@@ -6710,7 +6727,7 @@ static int tg3_alloc_rx_data(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,</div><div class='ctx'> 	skb_size = SKB_DATA_ALIGN(data_size + TG3_RX_OFFSET(tp)) +</div><div class='ctx'> 		   SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='ctx'> 	if (skb_size &lt;= PAGE_SIZE) {</div><div class='del'>-		data = netdev_alloc_frag(skb_size);</div><div class='add'>+		data = napi_alloc_frag(skb_size);</div><div class='ctx'> 		*frag_size = skb_size;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		data = kmalloc(skb_size, GFP_ATOMIC);</div><div class='hunk'>@@ -6719,11 +6736,9 @@ static int tg3_alloc_rx_data(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,</div><div class='ctx'> 	if (!data)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_single(tp-&gt;pdev,</div><div class='del'>-				 data + TG3_RX_OFFSET(tp),</div><div class='del'>-				 data_size,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='del'>-	if (unlikely(pci_dma_mapping_error(tp-&gt;pdev, mapping))) {</div><div class='add'>+	mapping = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, data + TG3_RX_OFFSET(tp),</div><div class='add'>+				 data_size, DMA_FROM_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;tp-&gt;pdev-&gt;dev, mapping))) {</div><div class='ctx'> 		tg3_frag_free(skb_size &lt;= PAGE_SIZE, data);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -6865,7 +6880,7 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> 				       desc_idx, *post_ptr);</div><div class='ctx'> 		drop_it_no_recycle:</div><div class='ctx'> 			/* Other statistics kept track of by card. */</div><div class='del'>-			tp-&gt;rx_dropped++;</div><div class='add'>+			tnapi-&gt;rx_dropped++;</div><div class='ctx'> 			goto next_pkt;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -6890,8 +6905,8 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> 			if (skb_size &lt; 0)</div><div class='ctx'> 				goto drop_it;</div><div class='ctx'> </div><div class='del'>-			pci_unmap_single(tp-&gt;pdev, dma_addr, skb_size,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, dma_addr, skb_size,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			/* Ensure that the update to the data happens</div><div class='ctx'> 			 * after the usage of the old DMA mapping.</div><div class='hunk'>@@ -6900,7 +6915,10 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> </div><div class='ctx'> 			ri-&gt;data = NULL;</div><div class='ctx'> </div><div class='del'>-			skb = build_skb(data, frag_size);</div><div class='add'>+			if (frag_size)</div><div class='add'>+				skb = build_skb(data, frag_size);</div><div class='add'>+			else</div><div class='add'>+				skb = slab_build_skb(data);</div><div class='ctx'> 			if (!skb) {</div><div class='ctx'> 				tg3_frag_free(frag_size != 0, data);</div><div class='ctx'> 				goto drop_it_no_recycle;</div><div class='hunk'>@@ -6916,11 +6934,13 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)</div><div class='ctx'> 				goto drop_it_no_recycle;</div><div class='ctx'> </div><div class='ctx'> 			skb_reserve(skb, TG3_RAW_IP_ALIGN);</div><div class='del'>-			pci_dma_sync_single_for_cpu(tp-&gt;pdev, dma_addr, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;tp-&gt;pdev-&gt;dev, dma_addr, len,</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='ctx'> 			memcpy(skb-&gt;data,</div><div class='ctx'> 			       data + TG3_RX_OFFSET(tp),</div><div class='ctx'> 			       len);</div><div class='del'>-			pci_dma_sync_single_for_device(tp-&gt;pdev, dma_addr, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;tp-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+						   len, DMA_FROM_DEVICE);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		skb_put(skb, len);</div><div class='hunk'>@@ -7223,8 +7243,8 @@ static inline void tg3_reset_task_schedule(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static inline void tg3_reset_task_cancel(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	cancel_work_sync(&amp;tp-&gt;reset_task);</div><div class='del'>-	tg3_flag_clear(tp, RESET_TASK_PENDING);</div><div class='add'>+	if (test_and_clear_bit(TG3_FLAG_RESET_TASK_PENDING, tp-&gt;tg3_flags))</div><div class='add'>+		cancel_work_sync(&amp;tp-&gt;reset_task);</div><div class='ctx'> 	tg3_flag_clear(tp, TX_RECOVERY_PENDING);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -7373,27 +7393,61 @@ tx_recovery:</div><div class='ctx'> </div><div class='ctx'> static void tg3_napi_disable(struct tg3 *tp)</div><div class='ctx'> {</div><div class='add'>+	int txq_idx = tp-&gt;txq_cnt - 1;</div><div class='add'>+	int rxq_idx = tp-&gt;rxq_cnt - 1;</div><div class='add'>+	struct tg3_napi *tnapi;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = tp-&gt;irq_cnt - 1; i &gt;= 0; i--)</div><div class='del'>-		napi_disable(&amp;tp-&gt;napi[i].napi);</div><div class='add'>+	for (i = tp-&gt;irq_cnt - 1; i &gt;= 0; i--) {</div><div class='add'>+		tnapi = &amp;tp-&gt;napi[i];</div><div class='add'>+		if (tnapi-&gt;tx_buffers) {</div><div class='add'>+			netif_queue_set_napi(tp-&gt;dev, txq_idx,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_TX, NULL);</div><div class='add'>+			txq_idx--;</div><div class='add'>+		}</div><div class='add'>+		if (tnapi-&gt;rx_rcb) {</div><div class='add'>+			netif_queue_set_napi(tp-&gt;dev, rxq_idx,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_RX, NULL);</div><div class='add'>+			rxq_idx--;</div><div class='add'>+		}</div><div class='add'>+		napi_disable(&amp;tnapi-&gt;napi);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_napi_enable(struct tg3 *tp)</div><div class='ctx'> {</div><div class='add'>+	int txq_idx = 0, rxq_idx = 0;</div><div class='add'>+	struct tg3_napi *tnapi;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; tp-&gt;irq_cnt; i++)</div><div class='del'>-		napi_enable(&amp;tp-&gt;napi[i].napi);</div><div class='add'>+	for (i = 0; i &lt; tp-&gt;irq_cnt; i++) {</div><div class='add'>+		tnapi = &amp;tp-&gt;napi[i];</div><div class='add'>+		napi_enable_locked(&amp;tnapi-&gt;napi);</div><div class='add'>+		if (tnapi-&gt;tx_buffers) {</div><div class='add'>+			netif_queue_set_napi(tp-&gt;dev, txq_idx,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_TX,</div><div class='add'>+					     &amp;tnapi-&gt;napi);</div><div class='add'>+			txq_idx++;</div><div class='add'>+		}</div><div class='add'>+		if (tnapi-&gt;rx_rcb) {</div><div class='add'>+			netif_queue_set_napi(tp-&gt;dev, rxq_idx,</div><div class='add'>+					     NETDEV_QUEUE_TYPE_RX,</div><div class='add'>+					     &amp;tnapi-&gt;napi);</div><div class='add'>+			rxq_idx++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_napi_init(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(tp-&gt;dev, &amp;tp-&gt;napi[0].napi, tg3_poll, 64);</div><div class='del'>-	for (i = 1; i &lt; tp-&gt;irq_cnt; i++)</div><div class='del'>-		netif_napi_add(tp-&gt;dev, &amp;tp-&gt;napi[i].napi, tg3_poll_msix, 64);</div><div class='add'>+	for (i = 0; i &lt; tp-&gt;irq_cnt; i++) {</div><div class='add'>+		netif_napi_add_locked(tp-&gt;dev, &amp;tp-&gt;napi[i].napi,</div><div class='add'>+				      i ? tg3_poll_msix : tg3_poll);</div><div class='add'>+		netif_napi_set_irq_locked(&amp;tp-&gt;napi[i].napi,</div><div class='add'>+					  tp-&gt;napi[i].irq_vec);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_napi_fini(struct tg3 *tp)</div><div class='hunk'>@@ -7641,7 +7695,7 @@ static void tg3_poll_controller(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void tg3_tx_timeout(struct net_device *dev)</div><div class='add'>+static void tg3_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -7770,10 +7824,8 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last)</div><div class='ctx'> 	skb = txb-&gt;skb;</div><div class='ctx'> 	txb-&gt;skb = NULL;</div><div class='ctx'> </div><div class='del'>-	pci_unmap_single(tnapi-&gt;tp-&gt;pdev,</div><div class='del'>-			 dma_unmap_addr(txb, mapping),</div><div class='del'>-			 skb_headlen(skb),</div><div class='del'>-			 PCI_DMA_TODEVICE);</div><div class='add'>+	dma_unmap_single(&amp;tnapi-&gt;tp-&gt;pdev-&gt;dev, dma_unmap_addr(txb, mapping),</div><div class='add'>+			 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	while (txb-&gt;fragmented) {</div><div class='ctx'> 		txb-&gt;fragmented = false;</div><div class='hunk'>@@ -7787,9 +7839,9 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last)</div><div class='ctx'> 		entry = NEXT_TX(entry);</div><div class='ctx'> 		txb = &amp;tnapi-&gt;tx_buffers[entry];</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page(tnapi-&gt;tp-&gt;pdev,</div><div class='add'>+		dma_unmap_page(&amp;tnapi-&gt;tp-&gt;pdev-&gt;dev,</div><div class='ctx'> 			       dma_unmap_addr(txb, mapping),</div><div class='del'>-			       skb_frag_size(frag), PCI_DMA_TODEVICE);</div><div class='add'>+			       skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		while (txb-&gt;fragmented) {</div><div class='ctx'> 			txb-&gt;fragmented = false;</div><div class='hunk'>@@ -7824,10 +7876,10 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi,</div><div class='ctx'> 		ret = -1;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* New SKB is guaranteed to be linear. */</div><div class='del'>-		new_addr = pci_map_single(tp-&gt;pdev, new_skb-&gt;data, new_skb-&gt;len,</div><div class='del'>-					  PCI_DMA_TODEVICE);</div><div class='add'>+		new_addr = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, new_skb-&gt;data,</div><div class='add'>+					  new_skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 		/* Make sure the mapping succeeded */</div><div class='del'>-		if (pci_dma_mapping_error(tp-&gt;pdev, new_addr)) {</div><div class='add'>+		if (dma_mapping_error(&amp;tp-&gt;pdev-&gt;dev, new_addr)) {</div><div class='ctx'> 			dev_kfree_skb_any(new_skb);</div><div class='ctx'> 			ret = -1;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -7862,7 +7914,7 @@ static bool tg3_tso_bug_gso_check(struct tg3_napi *tnapi, struct sk_buff *skb)</div><div class='ctx'> 	return skb_shinfo(skb)-&gt;gso_segs &lt; tnapi-&gt;tx_pending / 3;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static netdev_tx_t tg3_start_xmit(struct sk_buff *, struct net_device *);</div><div class='add'>+static netdev_tx_t __tg3_start_xmit(struct sk_buff *, struct net_device *);</div><div class='ctx'> </div><div class='ctx'> /* Use GSO to workaround all TSO packets that meet HW bug conditions</div><div class='ctx'>  * indicated in tg3_tx_frag_set()</div><div class='hunk'>@@ -7870,8 +7922,8 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *, struct net_device *);</div><div class='ctx'> static int tg3_tso_bug(struct tg3 *tp, struct tg3_napi *tnapi,</div><div class='ctx'> 		       struct netdev_queue *txq, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *segs, *nskb;</div><div class='ctx'> 	u32 frag_cnt_est = skb_shinfo(skb)-&gt;gso_segs * 3;</div><div class='add'>+	struct sk_buff *segs, *seg, *next;</div><div class='ctx'> </div><div class='ctx'> 	/* Estimate the number of fragments in the worst case */</div><div class='ctx'> 	if (unlikely(tg3_tx_avail(tnapi) &lt;= frag_cnt_est)) {</div><div class='hunk'>@@ -7891,15 +7943,15 @@ static int tg3_tso_bug(struct tg3 *tp, struct tg3_napi *tnapi,</div><div class='ctx'> </div><div class='ctx'> 	segs = skb_gso_segment(skb, tp-&gt;dev-&gt;features &amp;</div><div class='ctx'> 				    ~(NETIF_F_TSO | NETIF_F_TSO6));</div><div class='del'>-	if (IS_ERR(segs) || !segs)</div><div class='add'>+	if (IS_ERR(segs) || !segs) {</div><div class='add'>+		tnapi-&gt;tx_dropped++;</div><div class='ctx'> 		goto tg3_tso_bug_end;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	do {</div><div class='del'>-		nskb = segs;</div><div class='del'>-		segs = segs-&gt;next;</div><div class='del'>-		nskb-&gt;next = NULL;</div><div class='del'>-		tg3_start_xmit(nskb, tp-&gt;dev);</div><div class='del'>-	} while (segs);</div><div class='add'>+	skb_list_walk_safe(segs, seg, next) {</div><div class='add'>+		skb_mark_not_on_list(seg);</div><div class='add'>+		__tg3_start_xmit(seg, tp-&gt;dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> tg3_tso_bug_end:</div><div class='ctx'> 	dev_consume_skb_any(skb);</div><div class='hunk'>@@ -7908,7 +7960,7 @@ tg3_tso_bug_end:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* hard_start_xmit for all devices */</div><div class='del'>-static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+static netdev_tx_t __tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> 	u32 len, entry, base_flags, mss, vlan = 0;</div><div class='hunk'>@@ -7959,7 +8011,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		iph = ip_hdr(skb);</div><div class='ctx'> 		tcp_opt_len = tcp_optlen(skb);</div><div class='ctx'> </div><div class='del'>-		hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb) - ETH_HLEN;</div><div class='add'>+		hdr_len = skb_tcp_all_headers(skb) - ETH_HLEN;</div><div class='ctx'> </div><div class='ctx'> 		/* HW/FW can not correctly segment packets that have been</div><div class='ctx'> 		 * vlan encapsulated.</div><div class='hunk'>@@ -8047,14 +8099,20 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if ((unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)) &amp;&amp;</div><div class='ctx'> 	    tg3_flag(tp, TX_TSTAMP_EN)) {</div><div class='del'>-		skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='del'>-		base_flags |= TXD_FLAG_HWTSTAMP;</div><div class='add'>+		tg3_full_lock(tp, 0);</div><div class='add'>+		if (!tp-&gt;pre_tx_ts) {</div><div class='add'>+			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+			base_flags |= TXD_FLAG_HWTSTAMP;</div><div class='add'>+			tg3_read_tx_tstamp(tp, &amp;tp-&gt;pre_tx_ts);</div><div class='add'>+		}</div><div class='add'>+		tg3_full_unlock(tp);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='del'>-	if (pci_dma_mapping_error(tp-&gt;pdev, mapping))</div><div class='add'>+	mapping = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, skb-&gt;data, len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;tp-&gt;pdev-&gt;dev, mapping))</div><div class='ctx'> 		goto drop;</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -8151,11 +8209,6 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 			netif_tx_wake_queue(txq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!netdev_xmit_more() || netif_xmit_stopped(txq)) {</div><div class='del'>-		/* Packets are ready, update Tx producer idx on card. */</div><div class='del'>-		tw32_tx_mbox(tnapi-&gt;prodmbox, entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> dma_error:</div><div class='hunk'>@@ -8164,10 +8217,46 @@ dma_error:</div><div class='ctx'> drop:</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> drop_nofree:</div><div class='del'>-	tp-&gt;tx_dropped++;</div><div class='add'>+	tnapi-&gt;tx_dropped++;</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	u16 skb_queue_mapping;</div><div class='add'>+	netdev_tx_t ret;</div><div class='add'>+</div><div class='add'>+	skb_queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+	txq = netdev_get_tx_queue(dev, skb_queue_mapping);</div><div class='add'>+</div><div class='add'>+	ret = __tg3_start_xmit(skb, dev);</div><div class='add'>+</div><div class='add'>+	/* Notify the hardware that packets are ready by updating the TX ring</div><div class='add'>+	 * tail pointer. We respect netdev_xmit_more() thus avoiding poking</div><div class='add'>+	 * the hardware for every packet. To guarantee forward progress the TX</div><div class='add'>+	 * ring must be drained when it is full as indicated by</div><div class='add'>+	 * netif_xmit_stopped(). This needs to happen even when the current</div><div class='add'>+	 * skb was dropped or rejected with NETDEV_TX_BUSY. Otherwise packets</div><div class='add'>+	 * queued by previous __tg3_start_xmit() calls might get stuck in</div><div class='add'>+	 * the queue forever.</div><div class='add'>+	 */</div><div class='add'>+	if (!netdev_xmit_more() || netif_xmit_stopped(txq)) {</div><div class='add'>+		struct tg3_napi *tnapi;</div><div class='add'>+		struct tg3 *tp;</div><div class='add'>+</div><div class='add'>+		tp = netdev_priv(dev);</div><div class='add'>+		tnapi = &amp;tp-&gt;napi[skb_queue_mapping];</div><div class='add'>+</div><div class='add'>+		if (tg3_flag(tp, ENABLE_TSS))</div><div class='add'>+			tnapi++;</div><div class='add'>+</div><div class='add'>+		tw32_tx_mbox(tnapi-&gt;prodmbox, tnapi-&gt;tx_prod);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void tg3_mac_loopback(struct tg3 *tp, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	if (enable) {</div><div class='hunk'>@@ -9343,7 +9432,7 @@ static void __tg3_set_rx_mode(struct net_device *);</div><div class='ctx'> /* tp-&gt;lock is held. */</div><div class='ctx'> static int tg3_halt(struct tg3 *tp, int kind, bool silent)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='add'>+	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	tg3_stop_fw(tp);</div><div class='ctx'> </div><div class='hunk'>@@ -9364,6 +9453,13 @@ static int tg3_halt(struct tg3 *tp, int kind, bool silent)</div><div class='ctx'> </div><div class='ctx'> 		/* And make sure the next sample is new data */</div><div class='ctx'> 		memset(tp-&gt;hw_stats, 0, sizeof(struct tg3_hw_stats));</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; TG3_IRQ_MAX_VECS; ++i) {</div><div class='add'>+			struct tg3_napi *tnapi = &amp;tp-&gt;napi[i];</div><div class='add'>+</div><div class='add'>+			tnapi-&gt;rx_dropped = 0;</div><div class='add'>+			tnapi-&gt;tx_dropped = 0;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -9379,7 +9475,7 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -9710,26 +9806,7 @@ static void tg3_setup_rxbd_thresholds(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static inline u32 calc_crc(unsigned char *buf, int len)</div><div class='ctx'> {</div><div class='del'>-	u32 reg;</div><div class='del'>-	u32 tmp;</div><div class='del'>-	int j, k;</div><div class='del'>-</div><div class='del'>-	reg = 0xffffffff;</div><div class='del'>-</div><div class='del'>-	for (j = 0; j &lt; len; j++) {</div><div class='del'>-		reg ^= buf[j];</div><div class='del'>-</div><div class='del'>-		for (k = 0; k &lt; 8; k++) {</div><div class='del'>-			tmp = reg &amp; 0x01;</div><div class='del'>-</div><div class='del'>-			reg &gt;&gt;= 1;</div><div class='del'>-</div><div class='del'>-			if (tmp)</div><div class='del'>-				reg ^= CRC32_POLY_LE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ~reg;</div><div class='add'>+	return ~crc32(~0, buf, len);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_set_multi(struct tg3 *tp, unsigned int accept_all)</div><div class='hunk'>@@ -10065,7 +10142,7 @@ static int tg3_reset_hw(struct tg3 *tp, bool reset_phy)</div><div class='ctx'> 	tp-&gt;grc_mode |= GRC_MODE_HOST_SENDBDS;</div><div class='ctx'> </div><div class='ctx'> 	/* Pseudo-header checksum is done by hardware logic and not</div><div class='del'>-	 * the offload processers, so make the chip do the pseudo-</div><div class='add'>+	 * the offload processors, so make the chip do the pseudo-</div><div class='ctx'> 	 * header checksums on receive.  For transmit it is more</div><div class='ctx'> 	 * convenient to do the pseudo-header checksum in software</div><div class='ctx'> 	 * as Linux does that on transmit for us in all cases.</div><div class='hunk'>@@ -10286,8 +10363,7 @@ static int tg3_reset_hw(struct tg3 *tp, bool reset_phy)</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_asic_rev(tp) == ASIC_REV_5705 &amp;&amp;</div><div class='ctx'> 	    tg3_chip_rev_id(tp) != CHIPREV_ID_5705_A0) {</div><div class='del'>-		if (tg3_flag(tp, TSO_CAPABLE) &amp;&amp;</div><div class='del'>-		    tg3_asic_rev(tp) == ASIC_REV_5705) {</div><div class='add'>+		if (tg3_flag(tp, TSO_CAPABLE)) {</div><div class='ctx'> 			rdmac_mode |= RDMAC_MODE_FIFO_SIZE_128;</div><div class='ctx'> 		} else if (!(tr32(TG3PCI_PCISTATE) &amp; PCISTATE_BUS_SPEED_HIGH) &amp;&amp;</div><div class='ctx'> 			   !tg3_flag(tp, IS_5788)) {</div><div class='hunk'>@@ -10724,40 +10800,40 @@ static int tg3_reset_hw(struct tg3 *tp, bool reset_phy)</div><div class='ctx'> 	switch (limit) {</div><div class='ctx'> 	case 16:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_15,  0); tw32(MAC_RCV_VALUE_15,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 15:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_14,  0); tw32(MAC_RCV_VALUE_14,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 14:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_13,  0); tw32(MAC_RCV_VALUE_13,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 13:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_12,  0); tw32(MAC_RCV_VALUE_12,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 12:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_11,  0); tw32(MAC_RCV_VALUE_11,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 11:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_10,  0); tw32(MAC_RCV_VALUE_10,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 10:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_9,  0); tw32(MAC_RCV_VALUE_9,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 9:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_8,  0); tw32(MAC_RCV_VALUE_8,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 8:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_7,  0); tw32(MAC_RCV_VALUE_7,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 7:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_6,  0); tw32(MAC_RCV_VALUE_6,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 6:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_5,  0); tw32(MAC_RCV_VALUE_5,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 5:</div><div class='ctx'> 		tw32(MAC_RCV_RULE_4,  0); tw32(MAC_RCV_VALUE_4,  0);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 4:</div><div class='ctx'> 		/* tw32(MAC_RCV_RULE_3,  0); tw32(MAC_RCV_VALUE_3,  0); */</div><div class='ctx'> 	case 3:</div><div class='hunk'>@@ -10801,17 +10877,15 @@ static int tg3_init_hw(struct tg3 *tp, bool reset_phy)</div><div class='ctx'> #ifdef CONFIG_TIGON3_HWMON</div><div class='ctx'> static void tg3_sd_scan_scratchpad(struct tg3 *tp, struct tg3_ocir *ocir)</div><div class='ctx'> {</div><div class='add'>+	u32 off, len = TG3_OCIR_LEN;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; TG3_SD_NUM_RECS; i++, ocir++) {</div><div class='del'>-		u32 off = i * TG3_OCIR_LEN, len = TG3_OCIR_LEN;</div><div class='del'>-</div><div class='add'>+	for (i = 0, off = 0; i &lt; TG3_SD_NUM_RECS; i++, ocir++, off += len) {</div><div class='ctx'> 		tg3_ape_scratchpad_read(tp, (u32 *) ocir, off, len);</div><div class='del'>-		off += len;</div><div class='ctx'> </div><div class='ctx'> 		if (ocir-&gt;signature != TG3_OCIR_SIG_MAGIC ||</div><div class='ctx'> 		    !(ocir-&gt;version_flags &amp; TG3_OCIR_FLAG_ACTIVE))</div><div class='del'>-			memset(ocir, 0, TG3_OCIR_LEN);</div><div class='add'>+			memset(ocir, 0, len);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -10985,7 +11059,7 @@ static void tg3_chk_missed_msi(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static void tg3_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tg3 *tp = from_timer(tp, t, timer);</div><div class='add'>+	struct tg3 *tp = timer_container_of(tp, t, timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;tp-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -11156,7 +11230,7 @@ static void tg3_timer_start(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> static void tg3_timer_stop(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;tp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Restart hardware after configuration changes, self-test, etc.</div><div class='hunk'>@@ -11165,6 +11239,8 @@ static void tg3_timer_stop(struct tg3 *tp)</div><div class='ctx'> static int tg3_restart_hw(struct tg3 *tp, bool reset_phy)</div><div class='ctx'> 	__releases(tp-&gt;lock)</div><div class='ctx'> 	__acquires(tp-&gt;lock)</div><div class='add'>+	__releases(tp-&gt;dev-&gt;lock)</div><div class='add'>+	__acquires(tp-&gt;dev-&gt;lock)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -11177,7 +11253,9 @@ static int tg3_restart_hw(struct tg3 *tp, bool reset_phy)</div><div class='ctx'> 		tg3_timer_stop(tp);</div><div class='ctx'> 		tp-&gt;irq_sync = 0;</div><div class='ctx'> 		tg3_napi_enable(tp);</div><div class='add'>+		netdev_unlock(tp-&gt;dev);</div><div class='ctx'> 		dev_close(tp-&gt;dev);</div><div class='add'>+		netdev_lock(tp-&gt;dev);</div><div class='ctx'> 		tg3_full_lock(tp, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -11191,7 +11269,8 @@ static void tg3_reset_task(struct work_struct *work)</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	tg3_full_lock(tp, 0);</div><div class='ctx'> </div><div class='del'>-	if (!netif_running(tp-&gt;dev)) {</div><div class='add'>+	if (tp-&gt;pcierr_recovery || !netif_running(tp-&gt;dev) ||</div><div class='add'>+	    tp-&gt;pdev-&gt;error_state != pci_channel_io_normal) {</div><div class='ctx'> 		tg3_flag_clear(tp, RESET_TASK_PENDING);</div><div class='ctx'> 		tg3_full_unlock(tp);</div><div class='ctx'> 		rtnl_unlock();</div><div class='hunk'>@@ -11204,6 +11283,7 @@ static void tg3_reset_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	tg3_netif_stop(tp);</div><div class='ctx'> </div><div class='add'>+	netdev_lock(tp-&gt;dev);</div><div class='ctx'> 	tg3_full_lock(tp, 1);</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, TX_RECOVERY_PENDING)) {</div><div class='hunk'>@@ -11215,18 +11295,25 @@ static void tg3_reset_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	tg3_halt(tp, RESET_KIND_SHUTDOWN, 0);</div><div class='ctx'> 	err = tg3_init_hw(tp, true);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		tg3_full_unlock(tp);</div><div class='add'>+		tp-&gt;irq_sync = 0;</div><div class='add'>+		tg3_napi_enable(tp);</div><div class='add'>+		/* Clear this flag so that tg3_reset_task_cancel() will not</div><div class='add'>+		 * call cancel_work_sync() and wait forever.</div><div class='add'>+		 */</div><div class='add'>+		tg3_flag_clear(tp, RESET_TASK_PENDING);</div><div class='add'>+		netdev_unlock(tp-&gt;dev);</div><div class='add'>+		dev_close(tp-&gt;dev);</div><div class='ctx'> 		goto out;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	tg3_netif_start(tp);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='del'>-		tg3_phy_start(tp);</div><div class='del'>-</div><div class='add'>+	netdev_unlock(tp-&gt;dev);</div><div class='add'>+	tg3_phy_start(tp);</div><div class='ctx'> 	tg3_flag_clear(tp, RESET_TASK_PENDING);</div><div class='add'>+out:</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -11242,18 +11329,17 @@ static int tg3_request_irq(struct tg3 *tp, int irq_num)</div><div class='ctx'> 	else {</div><div class='ctx'> 		name = &amp;tnapi-&gt;irq_lbl[0];</div><div class='ctx'> 		if (tnapi-&gt;tx_buffers &amp;&amp; tnapi-&gt;rx_rcb)</div><div class='del'>-			snprintf(name, IFNAMSIZ,</div><div class='add'>+			snprintf(name, sizeof(tnapi-&gt;irq_lbl),</div><div class='ctx'> 				 "%s-txrx-%d", tp-&gt;dev-&gt;name, irq_num);</div><div class='ctx'> 		else if (tnapi-&gt;tx_buffers)</div><div class='del'>-			snprintf(name, IFNAMSIZ,</div><div class='add'>+			snprintf(name, sizeof(tnapi-&gt;irq_lbl),</div><div class='ctx'> 				 "%s-tx-%d", tp-&gt;dev-&gt;name, irq_num);</div><div class='ctx'> 		else if (tnapi-&gt;rx_rcb)</div><div class='del'>-			snprintf(name, IFNAMSIZ,</div><div class='add'>+			snprintf(name, sizeof(tnapi-&gt;irq_lbl),</div><div class='ctx'> 				 "%s-rx-%d", tp-&gt;dev-&gt;name, irq_num);</div><div class='ctx'> 		else</div><div class='del'>-			snprintf(name, IFNAMSIZ,</div><div class='add'>+			snprintf(name, sizeof(tnapi-&gt;irq_lbl),</div><div class='ctx'> 				 "%s-%d", tp-&gt;dev-&gt;name, irq_num);</div><div class='del'>-		name[IFNAMSIZ-1] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, USING_MSI) || tg3_flag(tp, USING_MSIX)) {</div><div class='hunk'>@@ -11584,9 +11670,11 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_ints_fini;</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	tg3_napi_init(tp);</div><div class='ctx'> </div><div class='ctx'> 	tg3_napi_enable(tp);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; tp-&gt;irq_cnt; i++) {</div><div class='ctx'> 		err = tg3_request_irq(tp, i);</div><div class='hunk'>@@ -11911,6 +11999,9 @@ static void tg3_get_nstats(struct tg3 *tp, struct rtnl_link_stats64 *stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct rtnl_link_stats64 *old_stats = &amp;tp-&gt;net_stats_prev;</div><div class='ctx'> 	struct tg3_hw_stats *hw_stats = tp-&gt;hw_stats;</div><div class='add'>+	unsigned long rx_dropped;</div><div class='add'>+	unsigned long tx_dropped;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	stats-&gt;rx_packets = old_stats-&gt;rx_packets +</div><div class='ctx'> 		get_stat64(&amp;hw_stats-&gt;rx_ucast_packets) +</div><div class='hunk'>@@ -11957,8 +12048,26 @@ static void tg3_get_nstats(struct tg3 *tp, struct rtnl_link_stats64 *stats)</div><div class='ctx'> 	stats-&gt;rx_missed_errors = old_stats-&gt;rx_missed_errors +</div><div class='ctx'> 		get_stat64(&amp;hw_stats-&gt;rx_discards);</div><div class='ctx'> </div><div class='del'>-	stats-&gt;rx_dropped = tp-&gt;rx_dropped;</div><div class='del'>-	stats-&gt;tx_dropped = tp-&gt;tx_dropped;</div><div class='add'>+	/* Aggregate per-queue counters. The per-queue counters are updated</div><div class='add'>+	 * by a single writer, race-free. The result computed by this loop</div><div class='add'>+	 * might not be 100% accurate (counters can be updated in the middle of</div><div class='add'>+	 * the loop) but the next tg3_get_nstats() will recompute the current</div><div class='add'>+	 * value so it is acceptable.</div><div class='add'>+	 *</div><div class='add'>+	 * Note that these counters wrap around at 4G on 32bit machines.</div><div class='add'>+	 */</div><div class='add'>+	rx_dropped = (unsigned long)(old_stats-&gt;rx_dropped);</div><div class='add'>+	tx_dropped = (unsigned long)(old_stats-&gt;tx_dropped);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tp-&gt;irq_cnt; i++) {</div><div class='add'>+		struct tg3_napi *tnapi = &amp;tp-&gt;napi[i];</div><div class='add'>+</div><div class='add'>+		rx_dropped += tnapi-&gt;rx_dropped;</div><div class='add'>+		tx_dropped += tnapi-&gt;tx_dropped;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stats-&gt;rx_dropped = rx_dropped;</div><div class='add'>+	stats-&gt;tx_dropped = tx_dropped;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tg3_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -12314,10 +12423,9 @@ static void tg3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, tp-&gt;fw_ver, sizeof(info-&gt;fw_version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(tp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;fw_version, tp-&gt;fw_ver, sizeof(info-&gt;fw_version));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(tp-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void tg3_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='hunk'>@@ -12403,7 +12511,10 @@ static int tg3_nway_reset(struct net_device *dev)</div><div class='ctx'> 	return r;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)</div><div class='add'>+static void tg3_get_ringparam(struct net_device *dev,</div><div class='add'>+			      struct ethtool_ringparam *ering,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -12424,7 +12535,10 @@ static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam *</div><div class='ctx'> 	ering-&gt;tx_pending = tp-&gt;napi[0].tx_pending;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *ering)</div><div class='add'>+static int tg3_set_ringparam(struct net_device *dev,</div><div class='add'>+			     struct ethtool_ringparam *ering,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> 	int i, irq_sync = 0, err = 0;</div><div class='hunk'>@@ -12444,6 +12558,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e</div><div class='ctx'> 		irq_sync = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	tg3_full_lock(tp, irq_sync);</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;rx_pending = ering-&gt;rx_pending;</div><div class='hunk'>@@ -12472,6 +12587,7 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (irq_sync &amp;&amp; !err)</div><div class='ctx'> 		tg3_phy_start(tp);</div><div class='hunk'>@@ -12553,6 +12669,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam</div><div class='ctx'> 			irq_sync = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		netdev_lock(dev);</div><div class='ctx'> 		tg3_full_lock(tp, irq_sync);</div><div class='ctx'> </div><div class='ctx'> 		if (epause-&gt;autoneg)</div><div class='hunk'>@@ -12582,6 +12699,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tg3_full_unlock(tp);</div><div class='add'>+		netdev_unlock(dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;phy_flags |= TG3_PHYFLG_USER_CONFIGURED;</div><div class='hunk'>@@ -12601,29 +12719,17 @@ static int tg3_get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,</div><div class='del'>-			 u32 *rules __always_unused)</div><div class='add'>+static u32 tg3_get_rx_ring_count(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!tg3_flag(tp, SUPPORT_MSIX))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXRINGS:</div><div class='del'>-		if (netif_running(tp-&gt;dev))</div><div class='del'>-			info-&gt;data = tp-&gt;rxq_cnt;</div><div class='del'>-		else {</div><div class='del'>-			info-&gt;data = num_online_cpus();</div><div class='del'>-			if (info-&gt;data &gt; TG3_RSS_MAX_NUM_QS)</div><div class='del'>-				info-&gt;data = TG3_RSS_MAX_NUM_QS;</div><div class='del'>-		}</div><div class='add'>+		return 1;</div><div class='ctx'> </div><div class='del'>-		return 0;</div><div class='add'>+	if (netif_running(tp-&gt;dev))</div><div class='add'>+		return tp-&gt;rxq_cnt;</div><div class='ctx'> </div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	return min_t(u32, netif_get_num_default_rss_queues(), tp-&gt;rxq_max);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 tg3_get_rxfh_indir_size(struct net_device *dev)</div><div class='hunk'>@@ -12637,24 +12743,23 @@ static u32 tg3_get_rxfh_indir_size(struct net_device *dev)</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, u8 *hfunc)</div><div class='add'>+static int tg3_get_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='del'>-	if (!indir)</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i++)</div><div class='del'>-		indir[i] = tp-&gt;rss_ind_tbl[i];</div><div class='add'>+		rxfh-&gt;indir[i] = tp-&gt;rss_ind_tbl[i];</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_set_rxfh(struct net_device *dev, const u32 *indir, const u8 *key,</div><div class='del'>-			const u8 hfunc)</div><div class='add'>+static int tg3_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> 	size_t i;</div><div class='hunk'>@@ -12662,15 +12767,16 @@ static int tg3_set_rxfh(struct net_device *dev, const u32 *indir, const u8 *key,</div><div class='ctx'> 	/* We require at least one supported parameter to be changed and no</div><div class='ctx'> 	 * change in any of the unsupported parameters</div><div class='ctx'> 	 */</div><div class='del'>-	if (key ||</div><div class='del'>-	    (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP))</div><div class='add'>+	if (rxfh-&gt;key ||</div><div class='add'>+	    (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	     rxfh-&gt;hfunc != ETH_RSS_HASH_TOP))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (!indir)</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; TG3_RSS_INDIR_TBL_SIZE; i++)</div><div class='del'>-		tp-&gt;rss_ind_tbl[i] = indir[i];</div><div class='add'>+		tp-&gt;rss_ind_tbl[i] = rxfh-&gt;indir[i];</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev) || !tg3_flag(tp, ENABLE_RSS))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -12795,7 +12901,7 @@ static void tg3_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 		memset(tmp_stats, 0, sizeof(struct tg3_ethtool_stats));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static __be32 *tg3_vpd_readblock(struct tg3 *tp, u32 *vpdlen)</div><div class='add'>+static __be32 *tg3_vpd_readblock(struct tg3 *tp, unsigned int *vpdlen)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	__be32 *buf;</div><div class='hunk'>@@ -12824,18 +12930,16 @@ static __be32 *tg3_vpd_readblock(struct tg3 *tp, u32 *vpdlen)</div><div class='ctx'> </div><div class='ctx'> 			offset = tg3_nvram_logical_addr(tp, offset);</div><div class='ctx'> 		}</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (!offset || !len) {</div><div class='del'>-		offset = TG3_NVM_VPD_OFF;</div><div class='del'>-		len = TG3_NVM_VPD_LEN;</div><div class='del'>-	}</div><div class='add'>+		if (!offset || !len) {</div><div class='add'>+			offset = TG3_NVM_VPD_OFF;</div><div class='add'>+			len = TG3_NVM_VPD_LEN;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-	buf = kmalloc(len, GFP_KERNEL);</div><div class='del'>-	if (buf == NULL)</div><div class='del'>-		return NULL;</div><div class='add'>+		buf = kmalloc(len, GFP_KERNEL);</div><div class='add'>+		if (!buf)</div><div class='add'>+			return NULL;</div><div class='ctx'> </div><div class='del'>-	if (magic == TG3_EEPROM_MAGIC) {</div><div class='ctx'> 		for (i = 0; i &lt; len; i += 4) {</div><div class='ctx'> 			/* The data is in little-endian format in NVRAM.</div><div class='ctx'> 			 * Use the big-endian read routines to preserve</div><div class='hunk'>@@ -12844,26 +12948,13 @@ static __be32 *tg3_vpd_readblock(struct tg3 *tp, u32 *vpdlen)</div><div class='ctx'> 			if (tg3_nvram_read_be32(tp, offset + i, &amp;buf[i/4]))</div><div class='ctx'> 				goto error;</div><div class='ctx'> 		}</div><div class='add'>+		*vpdlen = len;</div><div class='ctx'> 	} else {</div><div class='del'>-		u8 *ptr;</div><div class='del'>-		ssize_t cnt;</div><div class='del'>-		unsigned int pos = 0;</div><div class='del'>-</div><div class='del'>-		ptr = (u8 *)&amp;buf[0];</div><div class='del'>-		for (i = 0; pos &lt; len &amp;&amp; i &lt; 3; i++, pos += cnt, ptr += cnt) {</div><div class='del'>-			cnt = pci_read_vpd(tp-&gt;pdev, pos,</div><div class='del'>-					   len - pos, ptr);</div><div class='del'>-			if (cnt == -ETIMEDOUT || cnt == -EINTR)</div><div class='del'>-				cnt = 0;</div><div class='del'>-			else if (cnt &lt; 0)</div><div class='del'>-				goto error;</div><div class='del'>-		}</div><div class='del'>-		if (pos != len)</div><div class='del'>-			goto error;</div><div class='add'>+		buf = pci_vpd_alloc(tp-&gt;pdev, vpdlen);</div><div class='add'>+		if (IS_ERR(buf))</div><div class='add'>+			return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*vpdlen = len;</div><div class='del'>-</div><div class='ctx'> 	return buf;</div><div class='ctx'> </div><div class='ctx'> error:</div><div class='hunk'>@@ -12883,9 +12974,10 @@ error:</div><div class='ctx'> </div><div class='ctx'> static int tg3_test_nvram(struct tg3 *tp)</div><div class='ctx'> {</div><div class='del'>-	u32 csum, magic, len;</div><div class='add'>+	u32 csum, magic;</div><div class='ctx'> 	__be32 *buf;</div><div class='ctx'> 	int i, j, k, err = 0, size;</div><div class='add'>+	unsigned int len;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, NO_NVRAM))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -13014,12 +13106,16 @@ static int tg3_test_nvram(struct tg3 *tp)</div><div class='ctx'> </div><div class='ctx'> 	/* Bootstrap checksum at offset 0x10 */</div><div class='ctx'> 	csum = calc_crc((unsigned char *) buf, 0x10);</div><div class='del'>-	if (csum != le32_to_cpu(buf[0x10/4]))</div><div class='add'>+</div><div class='add'>+	/* The type of buf is __be32 *, but this value is __le32 */</div><div class='add'>+	if (csum != le32_to_cpu((__force __le32)buf[0x10 / 4]))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	/* Manufacturing block starts at offset 0x74, checksum at 0xfc */</div><div class='del'>-	csum = calc_crc((unsigned char *) &amp;buf[0x74/4], 0x88);</div><div class='del'>-	if (csum != le32_to_cpu(buf[0xfc/4]))</div><div class='add'>+	csum = calc_crc((unsigned char *)&amp;buf[0x74 / 4], 0x88);</div><div class='add'>+</div><div class='add'>+	/* The type of buf is __be32 *, but this value is __le32 */</div><div class='add'>+	if (csum != le32_to_cpu((__force __le32)buf[0xfc / 4]))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	kfree(buf);</div><div class='hunk'>@@ -13028,33 +13124,10 @@ static int tg3_test_nvram(struct tg3 *tp)</div><div class='ctx'> 	if (!buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	i = pci_vpd_find_tag((u8 *)buf, 0, len, PCI_VPD_LRDT_RO_DATA);</div><div class='del'>-	if (i &gt; 0) {</div><div class='del'>-		j = pci_vpd_lrdt_size(&amp;((u8 *)buf)[i]);</div><div class='del'>-		if (j &lt; 0)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (i + PCI_VPD_LRDT_TAG_SIZE + j &gt; len)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		i += PCI_VPD_LRDT_TAG_SIZE;</div><div class='del'>-		j = pci_vpd_find_info_keyword((u8 *)buf, i, j,</div><div class='del'>-					      PCI_VPD_RO_KEYWORD_CHKSUM);</div><div class='del'>-		if (j &gt; 0) {</div><div class='del'>-			u8 csum8 = 0;</div><div class='del'>-</div><div class='del'>-			j += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt;= j; i++)</div><div class='del'>-				csum8 += ((u8 *)buf)[i];</div><div class='del'>-</div><div class='del'>-			if (csum8)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-</div><div class='add'>+	err = pci_vpd_check_csum(buf, len);</div><div class='add'>+	/* go on if no checksum found */</div><div class='add'>+	if (err == 1)</div><div class='add'>+		err = 0;</div><div class='ctx'> out:</div><div class='ctx'> 	kfree(buf);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -13511,8 +13584,8 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)</div><div class='ctx'> 	for (i = data_off; i &lt; tx_len; i++)</div><div class='ctx'> 		tx_data[i] = (u8) (i &amp; 0xff);</div><div class='ctx'> </div><div class='del'>-	map = pci_map_single(tp-&gt;pdev, skb-&gt;data, tx_len, PCI_DMA_TODEVICE);</div><div class='del'>-	if (pci_dma_mapping_error(tp-&gt;pdev, map)) {</div><div class='add'>+	map = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, skb-&gt;data, tx_len, DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;tp-&gt;pdev-&gt;dev, map)) {</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -13610,8 +13683,8 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)</div><div class='ctx'> 		} else</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='del'>-		pci_dma_sync_single_for_cpu(tp-&gt;pdev, map, rx_len,</div><div class='del'>-					    PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_sync_single_for_cpu(&amp;tp-&gt;pdev-&gt;dev, map, rx_len,</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		rx_data += TG3_RX_OFFSET(tp);</div><div class='ctx'> 		for (i = data_off; i &lt; rx_len; i++, val++) {</div><div class='hunk'>@@ -13819,6 +13892,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,</div><div class='ctx'> 			data[TG3_INTERRUPT_TEST] = 1;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		netdev_lock(dev);</div><div class='ctx'> 		tg3_full_lock(tp, 0);</div><div class='ctx'> </div><div class='ctx'> 		tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);</div><div class='hunk'>@@ -13830,6 +13904,7 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		tg3_full_unlock(tp);</div><div class='add'>+		netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 		if (irq_sync &amp;&amp; !err2)</div><div class='ctx'> 			tg3_phy_start(tp);</div><div class='hunk'>@@ -13839,25 +13914,20 @@ static void tg3_self_test(struct net_device *dev, struct ethtool_test *etest,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_hwtstamp_set(struct net_device *dev, struct ifreq *ifr)</div><div class='add'>+static int tg3_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			    struct kernel_hwtstamp_config *stmpconf,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	struct hwtstamp_config stmpconf;</div><div class='ctx'> </div><div class='ctx'> 	if (!tg3_flag(tp, PTP_CAPABLE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;stmpconf, ifr-&gt;ifr_data, sizeof(stmpconf)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (stmpconf.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (stmpconf.tx_type != HWTSTAMP_TX_ON &amp;&amp;</div><div class='del'>-	    stmpconf.tx_type != HWTSTAMP_TX_OFF)</div><div class='add'>+	if (stmpconf-&gt;tx_type != HWTSTAMP_TX_ON &amp;&amp;</div><div class='add'>+	    stmpconf-&gt;tx_type != HWTSTAMP_TX_OFF)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	switch (stmpconf.rx_filter) {</div><div class='add'>+	switch (stmpconf-&gt;rx_filter) {</div><div class='ctx'> 	case HWTSTAMP_FILTER_NONE:</div><div class='ctx'> 		tp-&gt;rxptpctl = 0;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -13917,74 +13987,72 @@ static int tg3_hwtstamp_set(struct net_device *dev, struct ifreq *ifr)</div><div class='ctx'> 		tw32(TG3_RX_PTP_CTL,</div><div class='ctx'> 		     tp-&gt;rxptpctl | TG3_RX_PTP_CTL_HWTS_INTERLOCK);</div><div class='ctx'> </div><div class='del'>-	if (stmpconf.tx_type == HWTSTAMP_TX_ON)</div><div class='add'>+	if (stmpconf-&gt;tx_type == HWTSTAMP_TX_ON)</div><div class='ctx'> 		tg3_flag_set(tp, TX_TSTAMP_EN);</div><div class='ctx'> 	else</div><div class='ctx'> 		tg3_flag_clear(tp, TX_TSTAMP_EN);</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, &amp;stmpconf, sizeof(stmpconf)) ?</div><div class='del'>-		-EFAULT : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_hwtstamp_get(struct net_device *dev, struct ifreq *ifr)</div><div class='add'>+static int tg3_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			    struct kernel_hwtstamp_config *stmpconf)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	struct hwtstamp_config stmpconf;</div><div class='ctx'> </div><div class='ctx'> 	if (!tg3_flag(tp, PTP_CAPABLE))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	stmpconf.flags = 0;</div><div class='del'>-	stmpconf.tx_type = (tg3_flag(tp, TX_TSTAMP_EN) ?</div><div class='del'>-			    HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF);</div><div class='add'>+	stmpconf-&gt;flags = 0;</div><div class='add'>+	stmpconf-&gt;tx_type = tg3_flag(tp, TX_TSTAMP_EN) ?</div><div class='add'>+			    HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;</div><div class='ctx'> </div><div class='ctx'> 	switch (tp-&gt;rxptpctl) {</div><div class='ctx'> 	case 0:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V1_EN | TG3_RX_PTP_CTL_ALL_V1_EVENTS:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V1_EN | TG3_RX_PTP_CTL_SYNC_EVNT:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_SYNC;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_SYNC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V1_EN | TG3_RX_PTP_CTL_DELAY_REQ:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_EN | TG3_RX_PTP_CTL_ALL_V2_EVENTS:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_L2_EN | TG3_RX_PTP_CTL_ALL_V2_EVENTS:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_L4_EN | TG3_RX_PTP_CTL_ALL_V2_EVENTS:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_EN | TG3_RX_PTP_CTL_SYNC_EVNT:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_SYNC;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_SYNC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_L2_EN | TG3_RX_PTP_CTL_SYNC_EVNT:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_SYNC;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_SYNC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_L4_EN | TG3_RX_PTP_CTL_SYNC_EVNT:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_SYNC;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_SYNC;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_EN | TG3_RX_PTP_CTL_DELAY_REQ:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_DELAY_REQ;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_DELAY_REQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_L2_EN | TG3_RX_PTP_CTL_DELAY_REQ:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TG3_RX_PTP_CTL_RX_PTP_V2_L4_EN | TG3_RX_PTP_CTL_DELAY_REQ:</div><div class='del'>-		stmpconf.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ;</div><div class='add'>+		stmpconf-&gt;rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		WARN_ON_ONCE(1);</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, &amp;stmpconf, sizeof(stmpconf)) ?</div><div class='del'>-		-EFAULT : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='hunk'>@@ -14005,7 +14073,7 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		data-&gt;phy_id = tp-&gt;phy_addr;</div><div class='ctx'> </div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIREG: {</div><div class='ctx'> 		u32 mii_regval;</div><div class='ctx'> </div><div class='hunk'>@@ -14039,12 +14107,6 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> </div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		return tg3_hwtstamp_set(dev, ifr);</div><div class='del'>-</div><div class='del'>-	case SIOCGHWTSTAMP:</div><div class='del'>-		return tg3_hwtstamp_get(dev, ifr);</div><div class='del'>-</div><div class='ctx'> 	default:</div><div class='ctx'> 		/* do nothing */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -14052,7 +14114,10 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)</div><div class='add'>+static int tg3_get_coalesce(struct net_device *dev,</div><div class='add'>+			    struct ethtool_coalesce *ec,</div><div class='add'>+			    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -14060,7 +14125,10 @@ static int tg3_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)</div><div class='add'>+static int tg3_set_coalesce(struct net_device *dev,</div><div class='add'>+			    struct ethtool_coalesce *ec,</div><div class='add'>+			    struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> 	u32 max_rxcoal_tick_int = 0, max_txcoal_tick_int = 0;</div><div class='hunk'>@@ -14106,7 +14174,7 @@ static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='add'>+static int tg3_set_eee(struct net_device *dev, struct ethtool_keee *edata)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -14115,7 +14183,7 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (edata-&gt;advertised != tp-&gt;eee.advertised) {</div><div class='add'>+	if (!linkmode_equal(edata-&gt;advertised, tp-&gt;eee.advertised)) {</div><div class='ctx'> 		netdev_warn(tp-&gt;dev,</div><div class='ctx'> 			    "Direct manipulation of EEE advertisement is not supported\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -14128,7 +14196,9 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tp-&gt;eee = *edata;</div><div class='add'>+	tp-&gt;eee.eee_enabled = edata-&gt;eee_enabled;</div><div class='add'>+	tp-&gt;eee.tx_lpi_enabled = edata-&gt;tx_lpi_enabled;</div><div class='add'>+	tp-&gt;eee.tx_lpi_timer = edata-&gt;tx_lpi_timer;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;phy_flags |= TG3_PHYFLG_USER_CONFIGURED;</div><div class='ctx'> 	tg3_warn_mgmt_link_flap(tp);</div><div class='hunk'>@@ -14143,7 +14213,7 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='add'>+static int tg3_get_eee(struct net_device *dev, struct ethtool_keee *edata)</div><div class='ctx'> {</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -14158,6 +14228,11 @@ static int tg3_get_eee(struct net_device *dev, struct ethtool_eee *edata)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops tg3_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_USECS_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_STATS_BLOCK_USECS,</div><div class='ctx'> 	.get_drvinfo		= tg3_get_drvinfo,</div><div class='ctx'> 	.get_regs_len		= tg3_get_regs_len,</div><div class='ctx'> 	.get_regs		= tg3_get_regs,</div><div class='hunk'>@@ -14181,7 +14256,7 @@ static const struct ethtool_ops tg3_ethtool_ops = {</div><div class='ctx'> 	.get_coalesce		= tg3_get_coalesce,</div><div class='ctx'> 	.set_coalesce		= tg3_set_coalesce,</div><div class='ctx'> 	.get_sset_count		= tg3_get_sset_count,</div><div class='del'>-	.get_rxnfc		= tg3_get_rxnfc,</div><div class='add'>+	.get_rx_ring_count	= tg3_get_rx_ring_count,</div><div class='ctx'> 	.get_rxfh_indir_size    = tg3_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh		= tg3_get_rxfh,</div><div class='ctx'> 	.set_rxfh		= tg3_set_rxfh,</div><div class='hunk'>@@ -14225,7 +14300,7 @@ static void tg3_set_rx_mode(struct net_device *dev)</div><div class='ctx'> static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,</div><div class='ctx'> 			       int new_mtu)</div><div class='ctx'> {</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (new_mtu &gt; ETH_DATA_LEN) {</div><div class='ctx'> 		if (tg3_flag(tp, 5780_CLASS)) {</div><div class='hunk'>@@ -14263,6 +14338,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	tg3_set_mtu(dev, tp, new_mtu);</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	tg3_full_lock(tp, 1);</div><div class='ctx'> </div><div class='ctx'> 	tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);</div><div class='hunk'>@@ -14282,6 +14358,7 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		tg3_netif_start(tp);</div><div class='ctx'> </div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		tg3_phy_start(tp);</div><div class='hunk'>@@ -14297,7 +14374,7 @@ static const struct net_device_ops tg3_netdev_ops = {</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= tg3_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= tg3_set_mac_addr,</div><div class='del'>-	.ndo_do_ioctl		= tg3_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= tg3_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= tg3_tx_timeout,</div><div class='ctx'> 	.ndo_change_mtu		= tg3_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= tg3_fix_features,</div><div class='hunk'>@@ -14305,6 +14382,8 @@ static const struct net_device_ops tg3_netdev_ops = {</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= tg3_poll_controller,</div><div class='ctx'> #endif</div><div class='add'>+	.ndo_hwtstamp_get	= tg3_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= tg3_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void tg3_get_eeprom_size(struct tg3 *tp)</div><div class='hunk'>@@ -15576,10 +15655,13 @@ static int tg3_phy_probe(struct tg3 *tp)</div><div class='ctx'> 	      tg3_chip_rev_id(tp) != CHIPREV_ID_57765_A0))) {</div><div class='ctx'> 		tp-&gt;phy_flags |= TG3_PHYFLG_EEE_CAP;</div><div class='ctx'> </div><div class='del'>-		tp-&gt;eee.supported = SUPPORTED_100baseT_Full |</div><div class='del'>-				    SUPPORTED_1000baseT_Full;</div><div class='del'>-		tp-&gt;eee.advertised = ADVERTISED_100baseT_Full |</div><div class='del'>-				     ADVERTISED_1000baseT_Full;</div><div class='add'>+		linkmode_zero(tp-&gt;eee.supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,</div><div class='add'>+				 tp-&gt;eee.supported);</div><div class='add'>+		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,</div><div class='add'>+				 tp-&gt;eee.supported);</div><div class='add'>+		linkmode_copy(tp-&gt;eee.advertised, tp-&gt;eee.supported);</div><div class='add'>+</div><div class='ctx'> 		tp-&gt;eee.eee_enabled = 1;</div><div class='ctx'> 		tp-&gt;eee.tx_lpi_enabled = 1;</div><div class='ctx'> 		tp-&gt;eee.tx_lpi_timer = TG3_CPMU_DBTMR1_LNKIDLE_2047US;</div><div class='hunk'>@@ -15628,64 +15710,36 @@ skip_phy_reset:</div><div class='ctx'> static void tg3_read_vpd(struct tg3 *tp)</div><div class='ctx'> {</div><div class='ctx'> 	u8 *vpd_data;</div><div class='del'>-	unsigned int block_end, rosize, len;</div><div class='del'>-	u32 vpdlen;</div><div class='del'>-	int j, i = 0;</div><div class='add'>+	unsigned int len, vpdlen;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	vpd_data = (u8 *)tg3_vpd_readblock(tp, &amp;vpdlen);</div><div class='ctx'> 	if (!vpd_data)</div><div class='ctx'> 		goto out_no_vpd;</div><div class='ctx'> </div><div class='del'>-	i = pci_vpd_find_tag(vpd_data, 0, vpdlen, PCI_VPD_LRDT_RO_DATA);</div><div class='add'>+	i = pci_vpd_find_ro_info_keyword(vpd_data, vpdlen,</div><div class='add'>+					 PCI_VPD_RO_KEYWORD_MFR_ID, &amp;len);</div><div class='ctx'> 	if (i &lt; 0)</div><div class='del'>-		goto out_not_found;</div><div class='add'>+		goto partno;</div><div class='ctx'> </div><div class='del'>-	rosize = pci_vpd_lrdt_size(&amp;vpd_data[i]);</div><div class='del'>-	block_end = i + PCI_VPD_LRDT_TAG_SIZE + rosize;</div><div class='del'>-	i += PCI_VPD_LRDT_TAG_SIZE;</div><div class='del'>-</div><div class='del'>-	if (block_end &gt; vpdlen)</div><div class='del'>-		goto out_not_found;</div><div class='add'>+	if (len != 4 || memcmp(vpd_data + i, "1028", 4))</div><div class='add'>+		goto partno;</div><div class='ctx'> </div><div class='del'>-	j = pci_vpd_find_info_keyword(vpd_data, i, rosize,</div><div class='del'>-				      PCI_VPD_RO_KEYWORD_MFR_ID);</div><div class='del'>-	if (j &gt; 0) {</div><div class='del'>-		len = pci_vpd_info_field_size(&amp;vpd_data[j]);</div><div class='del'>-</div><div class='del'>-		j += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-		if (j + len &gt; block_end || len != 4 ||</div><div class='del'>-		    memcmp(&amp;vpd_data[j], "1028", 4))</div><div class='del'>-			goto partno;</div><div class='del'>-</div><div class='del'>-		j = pci_vpd_find_info_keyword(vpd_data, i, rosize,</div><div class='del'>-					      PCI_VPD_RO_KEYWORD_VENDOR0);</div><div class='del'>-		if (j &lt; 0)</div><div class='del'>-			goto partno;</div><div class='del'>-</div><div class='del'>-		len = pci_vpd_info_field_size(&amp;vpd_data[j]);</div><div class='del'>-</div><div class='del'>-		j += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-		if (j + len &gt; block_end)</div><div class='del'>-			goto partno;</div><div class='add'>+	i = pci_vpd_find_ro_info_keyword(vpd_data, vpdlen,</div><div class='add'>+					 PCI_VPD_RO_KEYWORD_VENDOR0, &amp;len);</div><div class='add'>+	if (i &lt; 0)</div><div class='add'>+		goto partno;</div><div class='ctx'> </div><div class='del'>-		if (len &gt;= sizeof(tp-&gt;fw_ver))</div><div class='del'>-			len = sizeof(tp-&gt;fw_ver) - 1;</div><div class='del'>-		memset(tp-&gt;fw_ver, 0, sizeof(tp-&gt;fw_ver));</div><div class='del'>-		snprintf(tp-&gt;fw_ver, sizeof(tp-&gt;fw_ver), "%.*s bc ", len,</div><div class='del'>-			 &amp;vpd_data[j]);</div><div class='del'>-	}</div><div class='add'>+	memset(tp-&gt;fw_ver, 0, sizeof(tp-&gt;fw_ver));</div><div class='add'>+	snprintf(tp-&gt;fw_ver, sizeof(tp-&gt;fw_ver), "%.*s bc ", len, vpd_data + i);</div><div class='ctx'> </div><div class='ctx'> partno:</div><div class='del'>-	i = pci_vpd_find_info_keyword(vpd_data, i, rosize,</div><div class='del'>-				      PCI_VPD_RO_KEYWORD_PARTNO);</div><div class='add'>+	i = pci_vpd_find_ro_info_keyword(vpd_data, vpdlen,</div><div class='add'>+					 PCI_VPD_RO_KEYWORD_PARTNO, &amp;len);</div><div class='ctx'> 	if (i &lt; 0)</div><div class='ctx'> 		goto out_not_found;</div><div class='ctx'> </div><div class='del'>-	len = pci_vpd_info_field_size(&amp;vpd_data[i]);</div><div class='del'>-</div><div class='del'>-	i += PCI_VPD_INFO_FLD_HDR_SIZE;</div><div class='del'>-	if (len &gt; TG3_BPN_SIZE ||</div><div class='del'>-	    (len + i) &gt; vpdlen)</div><div class='add'>+	if (len &gt; TG3_BPN_SIZE)</div><div class='ctx'> 		goto out_not_found;</div><div class='ctx'> </div><div class='ctx'> 	memcpy(tp-&gt;board_part_number, &amp;vpd_data[i], len);</div><div class='hunk'>@@ -16533,7 +16587,7 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 			tg3_flag_set(tp, PCIX_TARGET_HWBUG);</div><div class='ctx'> </div><div class='del'>-			/* The chip can have it's power management PCI config</div><div class='add'>+			/* The chip can have its power management PCI config</div><div class='ctx'> 			 * space registers clobbered due to this bug.</div><div class='ctx'> 			 * So explicitly force the chip into D0 here.</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -16976,19 +17030,18 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int tg3_get_device_address(struct tg3 *tp)</div><div class='add'>+static int tg3_get_device_address(struct tg3 *tp, u8 *addr)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = tp-&gt;dev;</div><div class='ctx'> 	u32 hi, lo, mac_offset;</div><div class='ctx'> 	int addr_ok = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!eth_platform_get_mac_address(&amp;tp-&gt;pdev-&gt;dev, dev-&gt;dev_addr))</div><div class='add'>+	if (!eth_platform_get_mac_address(&amp;tp-&gt;pdev-&gt;dev, addr))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (tg3_flag(tp, IS_SSB_CORE)) {</div><div class='del'>-		err = ssb_gige_get_macaddr(tp-&gt;pdev, &amp;dev-&gt;dev_addr[0]);</div><div class='del'>-		if (!err &amp;&amp; is_valid_ether_addr(&amp;dev-&gt;dev_addr[0]))</div><div class='add'>+		err = ssb_gige_get_macaddr(tp-&gt;pdev, addr);</div><div class='add'>+		if (!err &amp;&amp; is_valid_ether_addr(addr))</div><div class='ctx'> 			return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -17012,41 +17065,43 @@ static int tg3_get_device_address(struct tg3 *tp)</div><div class='ctx'> 	/* First try to get it from MAC address mailbox. */</div><div class='ctx'> 	tg3_read_mem(tp, NIC_SRAM_MAC_ADDR_HIGH_MBOX, &amp;hi);</div><div class='ctx'> 	if ((hi &gt;&gt; 16) == 0x484b) {</div><div class='del'>-		dev-&gt;dev_addr[0] = (hi &gt;&gt;  8) &amp; 0xff;</div><div class='del'>-		dev-&gt;dev_addr[1] = (hi &gt;&gt;  0) &amp; 0xff;</div><div class='add'>+		addr[0] = (hi &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		addr[1] = (hi &gt;&gt;  0) &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 		tg3_read_mem(tp, NIC_SRAM_MAC_ADDR_LOW_MBOX, &amp;lo);</div><div class='del'>-		dev-&gt;dev_addr[2] = (lo &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-		dev-&gt;dev_addr[3] = (lo &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-		dev-&gt;dev_addr[4] = (lo &gt;&gt;  8) &amp; 0xff;</div><div class='del'>-		dev-&gt;dev_addr[5] = (lo &gt;&gt;  0) &amp; 0xff;</div><div class='add'>+		addr[2] = (lo &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+		addr[3] = (lo &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+		addr[4] = (lo &gt;&gt;  8) &amp; 0xff;</div><div class='add'>+		addr[5] = (lo &gt;&gt;  0) &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 		/* Some old bootcode may report a 0 MAC address in SRAM */</div><div class='del'>-		addr_ok = is_valid_ether_addr(&amp;dev-&gt;dev_addr[0]);</div><div class='add'>+		addr_ok = is_valid_ether_addr(addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!addr_ok) {</div><div class='add'>+		__be32 be_hi, be_lo;</div><div class='add'>+</div><div class='ctx'> 		/* Next, try NVRAM. */</div><div class='ctx'> 		if (!tg3_flag(tp, NO_NVRAM) &amp;&amp;</div><div class='del'>-		    !tg3_nvram_read_be32(tp, mac_offset + 0, &amp;hi) &amp;&amp;</div><div class='del'>-		    !tg3_nvram_read_be32(tp, mac_offset + 4, &amp;lo)) {</div><div class='del'>-			memcpy(&amp;dev-&gt;dev_addr[0], ((char *)&amp;hi) + 2, 2);</div><div class='del'>-			memcpy(&amp;dev-&gt;dev_addr[2], (char *)&amp;lo, sizeof(lo));</div><div class='add'>+		    !tg3_nvram_read_be32(tp, mac_offset + 0, &amp;be_hi) &amp;&amp;</div><div class='add'>+		    !tg3_nvram_read_be32(tp, mac_offset + 4, &amp;be_lo)) {</div><div class='add'>+			memcpy(&amp;addr[0], ((char *)&amp;be_hi) + 2, 2);</div><div class='add'>+			memcpy(&amp;addr[2], (char *)&amp;be_lo, sizeof(be_lo));</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Finally just fetch it out of the MAC control regs. */</div><div class='ctx'> 		else {</div><div class='ctx'> 			hi = tr32(MAC_ADDR_0_HIGH);</div><div class='ctx'> 			lo = tr32(MAC_ADDR_0_LOW);</div><div class='ctx'> </div><div class='del'>-			dev-&gt;dev_addr[5] = lo &amp; 0xff;</div><div class='del'>-			dev-&gt;dev_addr[4] = (lo &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-			dev-&gt;dev_addr[3] = (lo &gt;&gt; 16) &amp; 0xff;</div><div class='del'>-			dev-&gt;dev_addr[2] = (lo &gt;&gt; 24) &amp; 0xff;</div><div class='del'>-			dev-&gt;dev_addr[1] = hi &amp; 0xff;</div><div class='del'>-			dev-&gt;dev_addr[0] = (hi &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			addr[5] = lo &amp; 0xff;</div><div class='add'>+			addr[4] = (lo &gt;&gt; 8) &amp; 0xff;</div><div class='add'>+			addr[3] = (lo &gt;&gt; 16) &amp; 0xff;</div><div class='add'>+			addr[2] = (lo &gt;&gt; 24) &amp; 0xff;</div><div class='add'>+			addr[1] = hi &amp; 0xff;</div><div class='add'>+			addr[0] = (hi &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!is_valid_ether_addr(&amp;dev-&gt;dev_addr[0]))</div><div class='add'>+	if (!is_valid_ether_addr(addr))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -17074,7 +17129,7 @@ static u32 tg3_calc_dma_bndry(struct tg3 *tp, u32 val)</div><div class='ctx'> 	    !tg3_flag(tp, PCI_EXPRESS))</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-#if defined(CONFIG_PPC64) || defined(CONFIG_IA64) || defined(CONFIG_PARISC)</div><div class='add'>+#if defined(CONFIG_PPC64) || defined(CONFIG_PARISC)</div><div class='ctx'> 	goal = BOUNDARY_MULTI_CACHELINE;</div><div class='ctx'> #else</div><div class='ctx'> #if defined(CONFIG_SPARC64) || defined(CONFIG_ALPHA)</div><div class='hunk'>@@ -17138,7 +17193,7 @@ static u32 tg3_calc_dma_bndry(struct tg3 *tp, u32 val)</div><div class='ctx'> 				val |= DMA_RWCTRL_WRITE_BNDRY_64_PCIE;</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* fallthrough */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 128:</div><div class='ctx'> 		default:</div><div class='ctx'> 			val &amp;= ~DMA_RWCTRL_WRITE_BNDRY_DISAB_PCIE;</div><div class='hunk'>@@ -17153,28 +17208,28 @@ static u32 tg3_calc_dma_bndry(struct tg3 *tp, u32 val)</div><div class='ctx'> 					DMA_RWCTRL_WRITE_BNDRY_16);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* fallthrough */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 32:</div><div class='ctx'> 			if (goal == BOUNDARY_SINGLE_CACHELINE) {</div><div class='ctx'> 				val |= (DMA_RWCTRL_READ_BNDRY_32 |</div><div class='ctx'> 					DMA_RWCTRL_WRITE_BNDRY_32);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* fallthrough */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 64:</div><div class='ctx'> 			if (goal == BOUNDARY_SINGLE_CACHELINE) {</div><div class='ctx'> 				val |= (DMA_RWCTRL_READ_BNDRY_64 |</div><div class='ctx'> 					DMA_RWCTRL_WRITE_BNDRY_64);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* fallthrough */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 128:</div><div class='ctx'> 			if (goal == BOUNDARY_SINGLE_CACHELINE) {</div><div class='ctx'> 				val |= (DMA_RWCTRL_READ_BNDRY_128 |</div><div class='ctx'> 					DMA_RWCTRL_WRITE_BNDRY_128);</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='del'>-			/* fallthrough */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 256:</div><div class='ctx'> 			val |= (DMA_RWCTRL_READ_BNDRY_256 |</div><div class='ctx'> 				DMA_RWCTRL_WRITE_BNDRY_256);</div><div class='hunk'>@@ -17622,8 +17677,7 @@ static int tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	char str[40];</div><div class='ctx'> 	u64 dma_mask, persist_dma_mask;</div><div class='ctx'> 	netdev_features_t features = 0;</div><div class='del'>-</div><div class='del'>-	printk_once(KERN_INFO "%s\n", version);</div><div class='add'>+	u8 addr[ETH_ALEN] __aligned(2);</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -17750,7 +17804,7 @@ static int tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	 * device behind the EPB cannot support DMA addresses &gt; 40-bit.</div><div class='ctx'> 	 * On 64-bit systems with IOMMU, use 40-bit dma_mask.</div><div class='ctx'> 	 * On 64-bit systems without IOMMU, use 64-bit dma_mask and</div><div class='del'>-	 * do DMA address check in tg3_start_xmit().</div><div class='add'>+	 * do DMA address check in __tg3_start_xmit().</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (tg3_flag(tp, IS_5788))</div><div class='ctx'> 		persist_dma_mask = dma_mask = DMA_BIT_MASK(32);</div><div class='hunk'>@@ -17762,13 +17816,16 @@ static int tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	} else</div><div class='ctx'> 		persist_dma_mask = dma_mask = DMA_BIT_MASK(64);</div><div class='ctx'> </div><div class='add'>+	if (tg3_asic_rev(tp) == ASIC_REV_57766)</div><div class='add'>+		persist_dma_mask = DMA_BIT_MASK(31);</div><div class='add'>+</div><div class='ctx'> 	/* Configure DMA attributes. */</div><div class='ctx'> 	if (dma_mask &gt; DMA_BIT_MASK(32)) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, dma_mask);</div><div class='add'>+		err = dma_set_mask(&amp;pdev-&gt;dev, dma_mask);</div><div class='ctx'> 		if (!err) {</div><div class='ctx'> 			features |= NETIF_F_HIGHDMA;</div><div class='del'>-			err = pci_set_consistent_dma_mask(pdev,</div><div class='del'>-							  persist_dma_mask);</div><div class='add'>+			err = dma_set_coherent_mask(&amp;pdev-&gt;dev,</div><div class='add'>+						    persist_dma_mask);</div><div class='ctx'> 			if (err &lt; 0) {</div><div class='ctx'> 				dev_err(&amp;pdev-&gt;dev, "Unable to obtain 64 bit "</div><div class='ctx'> 					"DMA for consistent allocations\n");</div><div class='hunk'>@@ -17777,7 +17834,7 @@ static int tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (err || dma_mask == DMA_BIT_MASK(32)) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+		err = dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 				"No usable DMA configuration, aborting\n");</div><div class='hunk'>@@ -17846,12 +17903,13 @@ static int tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		tp-&gt;rx_pending = 63;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = tg3_get_device_address(tp);</div><div class='add'>+	err = tg3_get_device_address(tp, addr);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 			"Could not obtain valid ethernet address, aborting\n");</div><div class='ctx'> 		goto err_out_apeunmap;</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	intmbx = MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW;</div><div class='ctx'> 	rcvmbx = MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW;</div><div class='hunk'>@@ -17863,10 +17921,7 @@ static int tg3_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		tnapi-&gt;tx_pending = TG3_DEF_TX_RING_PENDING;</div><div class='ctx'> </div><div class='ctx'> 		tnapi-&gt;int_mbox = intmbx;</div><div class='del'>-		if (i &lt;= 4)</div><div class='del'>-			intmbx += 0x8;</div><div class='del'>-		else</div><div class='del'>-			intmbx += 0x4;</div><div class='add'>+		intmbx += 0x8;</div><div class='ctx'> </div><div class='ctx'> 		tnapi-&gt;consmbox = rcvmbx;</div><div class='ctx'> 		tnapi-&gt;prodmbox = sndmbx;</div><div class='hunk'>@@ -18041,10 +18096,8 @@ static void tg3_remove_one(struct pci_dev *pdev)</div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='ctx'> static int tg3_suspend(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='del'>-	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='hunk'>@@ -18068,38 +18121,16 @@ static int tg3_suspend(struct device *device)</div><div class='ctx'> 	tg3_flag_clear(tp, INIT_COMPLETE);</div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='ctx'> </div><div class='del'>-	err = tg3_power_down_prepare(tp);</div><div class='del'>-	if (err) {</div><div class='del'>-		int err2;</div><div class='del'>-</div><div class='del'>-		tg3_full_lock(tp, 0);</div><div class='del'>-</div><div class='del'>-		tg3_flag_set(tp, INIT_COMPLETE);</div><div class='del'>-		err2 = tg3_restart_hw(tp, true);</div><div class='del'>-		if (err2)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		tg3_timer_start(tp);</div><div class='del'>-</div><div class='del'>-		netif_device_attach(dev);</div><div class='del'>-		tg3_netif_start(tp);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-		tg3_full_unlock(tp);</div><div class='del'>-</div><div class='del'>-		if (!err2)</div><div class='del'>-			tg3_phy_start(tp);</div><div class='del'>-	}</div><div class='add'>+	tg3_power_down_prepare(tp);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='ctx'> 	rtnl_unlock();</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int tg3_resume(struct device *device)</div><div class='ctx'> {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev(device);</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(device);</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -18110,6 +18141,7 @@ static int tg3_resume(struct device *device)</div><div class='ctx'> </div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='add'>+	netdev_lock(dev);</div><div class='ctx'> 	tg3_full_lock(tp, 0);</div><div class='ctx'> </div><div class='ctx'> 	tg3_ape_driver_state_change(tp, RESET_KIND_INIT);</div><div class='hunk'>@@ -18126,6 +18158,7 @@ static int tg3_resume(struct device *device)</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='add'>+	netdev_unlock(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		tg3_phy_start(tp);</div><div class='hunk'>@@ -18138,12 +18171,59 @@ unlock:</div><div class='ctx'> </div><div class='ctx'> static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume);</div><div class='ctx'> </div><div class='add'>+/* Systems where ACPI _PTS (Prepare To Sleep) S5 will result in a fatal</div><div class='add'>+ * PCIe AER event on the tg3 device if the tg3 device is not, or cannot</div><div class='add'>+ * be, powered down.</div><div class='add'>+ */</div><div class='add'>+static const struct dmi_system_id tg3_restart_aer_quirk_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R440"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R540"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R640"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R650"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R740"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.matches = {</div><div class='add'>+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),</div><div class='add'>+			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge R750"),</div><div class='add'>+		},</div><div class='add'>+	},</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void tg3_shutdown(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct tg3 *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	tg3_reset_task_cancel(tp);</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='add'>+</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='hunk'>@@ -18151,8 +18231,23 @@ static void tg3_shutdown(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (system_state == SYSTEM_POWER_OFF)</div><div class='ctx'> 		tg3_power_down(tp);</div><div class='add'>+	else if (system_state == SYSTEM_RESTART &amp;&amp;</div><div class='add'>+		 dmi_first_match(tg3_restart_aer_quirk_table) &amp;&amp;</div><div class='add'>+		 pdev-&gt;current_state != PCI_D3cold &amp;&amp;</div><div class='add'>+		 pdev-&gt;current_state != PCI_UNKNOWN) {</div><div class='add'>+		/* Disable PCIe AER on the tg3 to avoid a fatal</div><div class='add'>+		 * error during this system restart.</div><div class='add'>+		 */</div><div class='add'>+		pcie_capability_clear_word(pdev, PCI_EXP_DEVCTL,</div><div class='add'>+					   PCI_EXP_DEVCTL_CERE |</div><div class='add'>+					   PCI_EXP_DEVCTL_NFERE |</div><div class='add'>+					   PCI_EXP_DEVCTL_FERE |</div><div class='add'>+					   PCI_EXP_DEVCTL_URRE);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	pci_disable_device(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -18172,10 +18267,13 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(netdev, "PCI I/O error detected\n");</div><div class='ctx'> </div><div class='add'>+	/* Want to make sure that the reset task doesn't run */</div><div class='add'>+	tg3_reset_task_cancel(tp);</div><div class='add'>+</div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='del'>-	/* We probably don't have netdev yet */</div><div class='del'>-	if (!netdev || !netif_running(netdev))</div><div class='add'>+	/* Could be second call or maybe we don't have netdev yet */</div><div class='add'>+	if (!netdev || tp-&gt;pcierr_recovery || !netif_running(netdev))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='ctx'> 	/* We needn't recover from permanent error */</div><div class='hunk'>@@ -18188,9 +18286,6 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	tg3_timer_stop(tp);</div><div class='ctx'> </div><div class='del'>-	/* Want to make sure that the reset task doesn't run */</div><div class='del'>-	tg3_reset_task_cancel(tp);</div><div class='del'>-</div><div class='ctx'> 	netif_device_detach(netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Clean up software state, even if MMIO is blocked */</div><div class='hunk'>@@ -18201,7 +18296,9 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev,</div><div class='ctx'> done:</div><div class='ctx'> 	if (state == pci_channel_io_perm_failure) {</div><div class='ctx'> 		if (netdev) {</div><div class='add'>+			netdev_lock(netdev);</div><div class='ctx'> 			tg3_napi_enable(tp);</div><div class='add'>+			netdev_unlock(netdev);</div><div class='ctx'> 			dev_close(netdev);</div><div class='ctx'> 		}</div><div class='ctx'> 		err = PCI_ERS_RESULT_DISCONNECT;</div><div class='hunk'>@@ -18219,7 +18316,7 @@ done:</div><div class='ctx'>  * @pdev: Pointer to PCI device</div><div class='ctx'>  *</div><div class='ctx'>  * Restart the card from scratch, as if from a cold-boot.</div><div class='del'>- * At this point, the card has exprienced a hard reset,</div><div class='add'>+ * At this point, the card has experienced a hard reset,</div><div class='ctx'>  * followed by fixups by BIOS, and has its config space</div><div class='ctx'>  * set up identically to what it was at cold boot.</div><div class='ctx'>  */</div><div class='hunk'>@@ -18240,7 +18337,6 @@ static pci_ers_result_t tg3_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='del'>-	pci_save_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netdev || !netif_running(netdev)) {</div><div class='ctx'> 		rc = PCI_ERS_RESULT_RECOVERED;</div><div class='hunk'>@@ -18255,7 +18351,9 @@ static pci_ers_result_t tg3_io_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> done:</div><div class='ctx'> 	if (rc != PCI_ERS_RESULT_RECOVERED &amp;&amp; netdev &amp;&amp; netif_running(netdev)) {</div><div class='add'>+		netdev_lock(netdev);</div><div class='ctx'> 		tg3_napi_enable(tp);</div><div class='add'>+		netdev_unlock(netdev);</div><div class='ctx'> 		dev_close(netdev);</div><div class='ctx'> 	}</div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -18281,12 +18379,14 @@ static void tg3_io_resume(struct pci_dev *pdev)</div><div class='ctx'> 	if (!netdev || !netif_running(netdev))</div><div class='ctx'> 		goto done;</div><div class='ctx'> </div><div class='add'>+	netdev_lock(netdev);</div><div class='ctx'> 	tg3_full_lock(tp, 0);</div><div class='ctx'> 	tg3_ape_driver_state_change(tp, RESET_KIND_INIT);</div><div class='ctx'> 	tg3_flag_set(tp, INIT_COMPLETE);</div><div class='ctx'> 	err = tg3_restart_hw(tp, true);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		tg3_full_unlock(tp);</div><div class='add'>+		netdev_unlock(netdev);</div><div class='ctx'> 		netdev_err(netdev, "Cannot restart hardware after reset.\n");</div><div class='ctx'> 		goto done;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -18298,6 +18398,7 @@ static void tg3_io_resume(struct pci_dev *pdev)</div><div class='ctx'> 	tg3_netif_start(tp);</div><div class='ctx'> </div><div class='ctx'> 	tg3_full_unlock(tp);</div><div class='add'>+	netdev_unlock(netdev);</div><div class='ctx'> </div><div class='ctx'> 	tg3_phy_start(tp);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h<br/>index 6953d0546acb..a9e7f88fa26d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/tg3.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/broadcom/tg3.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/tg3.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/tg3.h</a></div><div class='hunk'>@@ -2390,7 +2390,7 @@</div><div class='ctx'> #define TG3_CL45_D7_EEERES_STAT_LP_1000T	0x0004</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-/* Fast Ethernet Tranceiver definitions */</div><div class='add'>+/* Fast Ethernet Transceiver definitions */</div><div class='ctx'> #define MII_TG3_FET_PTEST		0x17</div><div class='ctx'> #define  MII_TG3_FET_PTEST_TRIM_SEL	0x0010</div><div class='ctx'> #define  MII_TG3_FET_PTEST_TRIM_2	0x0002</div><div class='hunk'>@@ -2847,7 +2847,7 @@ struct tg3_ocir {</div><div class='ctx'> 	u32				port1_flags;</div><div class='ctx'> 	u32				port2_flags;</div><div class='ctx'> 	u32				port3_flags;</div><div class='del'>-	u32				reserved2[1];</div><div class='add'>+	u32				reserved2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -3018,6 +3018,7 @@ struct tg3_napi {</div><div class='ctx'> 	u16				*rx_rcb_prod_idx;</div><div class='ctx'> 	struct tg3_rx_prodring_set	prodring;</div><div class='ctx'> 	struct tg3_rx_buffer_desc	*rx_rcb;</div><div class='add'>+	unsigned long			rx_dropped;</div><div class='ctx'> </div><div class='ctx'> 	u32				tx_prod	____cacheline_aligned;</div><div class='ctx'> 	u32				tx_cons;</div><div class='hunk'>@@ -3026,12 +3027,13 @@ struct tg3_napi {</div><div class='ctx'> 	u32				prodmbox;</div><div class='ctx'> 	struct tg3_tx_buffer_desc	*tx_ring;</div><div class='ctx'> 	struct tg3_tx_ring_info		*tx_buffers;</div><div class='add'>+	unsigned long			tx_dropped;</div><div class='ctx'> </div><div class='ctx'> 	dma_addr_t			status_mapping;</div><div class='ctx'> 	dma_addr_t			rx_rcb_mapping;</div><div class='ctx'> 	dma_addr_t			tx_desc_mapping;</div><div class='ctx'> </div><div class='del'>-	char				irq_lbl[IFNAMSIZ];</div><div class='add'>+	char				irq_lbl[IFNAMSIZ + 6 + 10]; /* name + "-txrx-" + %d */</div><div class='ctx'> 	unsigned int			irq_vec;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -3190,6 +3192,7 @@ struct tg3 {</div><div class='ctx'> 	struct ptp_clock_info		ptp_info;</div><div class='ctx'> 	struct ptp_clock		*ptp_clock;</div><div class='ctx'> 	s64				ptp_adjust;</div><div class='add'>+	u8				ptp_txts_retrycnt;</div><div class='ctx'> </div><div class='ctx'> 	/* begin "tx thread" cacheline section */</div><div class='ctx'> 	void				(*write32_tx_mbox) (struct tg3 *, u32,</div><div class='hunk'>@@ -3219,8 +3222,6 @@ struct tg3 {</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* begin "everything else" cacheline(s) section */</div><div class='del'>-	unsigned long			rx_dropped;</div><div class='del'>-	unsigned long			tx_dropped;</div><div class='ctx'> 	struct rtnl_link_stats64	net_stats_prev;</div><div class='ctx'> 	struct tg3_ethtool_stats	estats_prev;</div><div class='ctx'> </div><div class='hunk'>@@ -3372,6 +3373,8 @@ struct tg3 {</div><div class='ctx'> 	struct tg3_hw_stats		*hw_stats;</div><div class='ctx'> 	dma_addr_t			stats_mapping;</div><div class='ctx'> 	struct work_struct		reset_task;</div><div class='add'>+	struct sk_buff			*tx_tstamp_skb;</div><div class='add'>+	u64				pre_tx_ts;</div><div class='ctx'> </div><div class='ctx'> 	int				nvram_lock_cnt;</div><div class='ctx'> 	u32				nvram_size;</div><div class='hunk'>@@ -3416,7 +3419,7 @@ struct tg3 {</div><div class='ctx'> 	unsigned int			irq_cnt;</div><div class='ctx'> </div><div class='ctx'> 	struct ethtool_coalesce		coal;</div><div class='del'>-	struct ethtool_eee		eee;</div><div class='add'>+	struct ethtool_keee		eee;</div><div class='ctx'> </div><div class='ctx'> 	/* firmware info */</div><div class='ctx'> 	const char			*fw_needed;</div><div class='head'>diff --git a/drivers/net/ethernet/broadcom/unimac.h b/drivers/net/ethernet/broadcom/unimac.h<br/>new file mode 100644<br/>index 000000000000..585a85286257<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/broadcom/unimac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/broadcom/unimac.h</a></div><div class='hunk'>@@ -0,0 +1,68 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+#ifndef __UNIMAC_H</div><div class='add'>+#define __UNIMAC_H</div><div class='add'>+</div><div class='add'>+#define UMAC_HD_BKP_CTRL		0x004</div><div class='add'>+#define  HD_FC_EN			(1 &lt;&lt; 0)</div><div class='add'>+#define  HD_FC_BKOFF_OK			(1 &lt;&lt; 1)</div><div class='add'>+#define  IPG_CONFIG_RX_SHIFT		2</div><div class='add'>+#define  IPG_CONFIG_RX_MASK		0x1F</div><div class='add'>+#define UMAC_CMD			0x008</div><div class='add'>+#define  CMD_TX_EN			(1 &lt;&lt; 0)</div><div class='add'>+#define  CMD_RX_EN			(1 &lt;&lt; 1)</div><div class='add'>+#define  CMD_SPEED_10			0</div><div class='add'>+#define  CMD_SPEED_100			1</div><div class='add'>+#define  CMD_SPEED_1000			2</div><div class='add'>+#define  CMD_SPEED_2500			3</div><div class='add'>+#define  CMD_SPEED_SHIFT		2</div><div class='add'>+#define  CMD_SPEED_MASK			3</div><div class='add'>+#define  CMD_PROMISC			(1 &lt;&lt; 4)</div><div class='add'>+#define  CMD_PAD_EN			(1 &lt;&lt; 5)</div><div class='add'>+#define  CMD_CRC_FWD			(1 &lt;&lt; 6)</div><div class='add'>+#define  CMD_PAUSE_FWD			(1 &lt;&lt; 7)</div><div class='add'>+#define  CMD_RX_PAUSE_IGNORE		(1 &lt;&lt; 8)</div><div class='add'>+#define  CMD_TX_ADDR_INS		(1 &lt;&lt; 9)</div><div class='add'>+#define  CMD_HD_EN			(1 &lt;&lt; 10)</div><div class='add'>+#define  CMD_SW_RESET_OLD		(1 &lt;&lt; 11)</div><div class='add'>+#define  CMD_SW_RESET			(1 &lt;&lt; 13)</div><div class='add'>+#define  CMD_LCL_LOOP_EN		(1 &lt;&lt; 15)</div><div class='add'>+#define  CMD_AUTO_CONFIG		(1 &lt;&lt; 22)</div><div class='add'>+#define  CMD_CNTL_FRM_EN		(1 &lt;&lt; 23)</div><div class='add'>+#define  CMD_NO_LEN_CHK			(1 &lt;&lt; 24)</div><div class='add'>+#define  CMD_RMT_LOOP_EN		(1 &lt;&lt; 25)</div><div class='add'>+#define  CMD_RX_ERR_DISC		(1 &lt;&lt; 26)</div><div class='add'>+#define  CMD_PRBL_EN			(1 &lt;&lt; 27)</div><div class='add'>+#define  CMD_TX_PAUSE_IGNORE		(1 &lt;&lt; 28)</div><div class='add'>+#define  CMD_TX_RX_EN			(1 &lt;&lt; 29)</div><div class='add'>+#define  CMD_RUNT_FILTER_DIS		(1 &lt;&lt; 30)</div><div class='add'>+#define UMAC_MAC0			0x00c</div><div class='add'>+#define UMAC_MAC1			0x010</div><div class='add'>+#define UMAC_MAX_FRAME_LEN		0x014</div><div class='add'>+#define UMAC_PAUSE_QUANTA		0x018</div><div class='add'>+#define UMAC_MODE			0x044</div><div class='add'>+#define  MODE_LINK_STATUS		(1 &lt;&lt; 5)</div><div class='add'>+#define UMAC_FRM_TAG0			0x048		/* outer tag */</div><div class='add'>+#define UMAC_FRM_TAG1			0x04c		/* inner tag */</div><div class='add'>+#define UMAC_TX_IPG_LEN			0x05c</div><div class='add'>+#define UMAC_EEE_CTRL			0x064</div><div class='add'>+#define  EN_LPI_RX_PAUSE		(1 &lt;&lt; 0)</div><div class='add'>+#define  EN_LPI_TX_PFC			(1 &lt;&lt; 1)</div><div class='add'>+#define  EN_LPI_TX_PAUSE		(1 &lt;&lt; 2)</div><div class='add'>+#define  EEE_EN				(1 &lt;&lt; 3)</div><div class='add'>+#define  RX_FIFO_CHECK			(1 &lt;&lt; 4)</div><div class='add'>+#define  EEE_TX_CLK_DIS			(1 &lt;&lt; 5)</div><div class='add'>+#define  DIS_EEE_10M			(1 &lt;&lt; 6)</div><div class='add'>+#define  LP_IDLE_PREDICTION_MODE	(1 &lt;&lt; 7)</div><div class='add'>+#define UMAC_EEE_LPI_TIMER		0x068</div><div class='add'>+#define UMAC_EEE_WAKE_TIMER		0x06C</div><div class='add'>+#define UMAC_EEE_REF_COUNT		0x070</div><div class='add'>+#define  EEE_REFERENCE_COUNT_MASK	0xffff</div><div class='add'>+#define UMAC_RX_IPG_INV			0x078</div><div class='add'>+#define UMAC_MACSEC_PROG_TX_CRC		0x310</div><div class='add'>+#define UMAC_MACSEC_CTRL		0x314</div><div class='add'>+#define UMAC_PAUSE_CTRL			0x330</div><div class='add'>+#define UMAC_TX_FLUSH			0x334</div><div class='add'>+#define UMAC_RX_FIFO_STATUS		0x338</div><div class='add'>+#define UMAC_TX_FIFO_STATUS		0x33c</div><div class='add'>+</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/Kconfig b/drivers/net/ethernet/brocade/Kconfig<br/>index d4564c7a279c..fb4c3cdf7233 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_BROCADE</div><div class='ctx'> 	bool "QLogic BR-series devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/Kconfig b/drivers/net/ethernet/brocade/bna/Kconfig<br/>index b124a628f86a..0a48ad93ed6c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config BNA</div><div class='ctx'> 	tristate "QLogic BR-series 1010/1020/1860 10Gb Ethernet Driver support"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports QLogic BR-series 1010/1020/1860 10Gb CEE capable</div><div class='ctx'> 	  Ethernet cards.</div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c<br/>index 09fb9315d1ae..eeb05e31713f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_cee.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_cee.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_cee.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfa_cee.c</a></div><div class='hunk'>@@ -82,7 +82,7 @@ bfa_cee_get_attr_isr(struct bfa_cee *cee, enum bfa_status status)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bfa_cee_get_attr_isr - CEE ISR for get-stats responses from f/w</div><div class='add'>+ * bfa_cee_get_stats_isr - CEE ISR for get-stats responses from f/w</div><div class='ctx'>  *</div><div class='ctx'>  * @cee: Pointer to the CEE module</div><div class='ctx'>  * @status: Return status from the f/w</div><div class='hunk'>@@ -102,14 +102,10 @@ bfa_cee_get_stats_isr(struct bfa_cee *cee, enum bfa_status status)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bfa_cee_get_attr_isr()</div><div class='add'>+ * bfa_cee_reset_stats_isr - CEE ISR for reset-stats responses from f/w</div><div class='ctx'>  *</div><div class='del'>- * @brief CEE ISR for reset-stats responses from f/w</div><div class='del'>- *</div><div class='del'>- * @param[in] cee - Pointer to the CEE module</div><div class='del'>- *            status - Return status from the f/w</div><div class='del'>- *</div><div class='del'>- * @return void</div><div class='add'>+ * @cee: Input Pointer to the CEE module</div><div class='add'>+ * @status: Return status from the f/w</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='ctx'> bfa_cee_reset_stats_isr(struct bfa_cee *cee, enum bfa_status status)</div><div class='hunk'>@@ -148,9 +144,12 @@ bfa_nw_cee_mem_claim(struct bfa_cee *cee, u8 *dma_kva, u64 dma_pa)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bfa_cee_get_attr - Send the request to the f/w to fetch CEE attributes.</div><div class='add'>+ * bfa_nw_cee_get_attr - Send the request to the f/w to fetch CEE attributes.</div><div class='ctx'>  *</div><div class='ctx'>  * @cee: Pointer to the CEE module data structure.</div><div class='add'>+ * @attr: attribute requested</div><div class='add'>+ * @cbfn: function pointer</div><div class='add'>+ * @cbarg: function pointer arguments</div><div class='ctx'>  *</div><div class='ctx'>  * Return: status</div><div class='ctx'>  */</div><div class='hunk'>@@ -181,7 +180,9 @@ bfa_nw_cee_get_attr(struct bfa_cee *cee, struct bfa_cee_attr *attr,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * bfa_cee_isrs - Handles Mail-box interrupts for CEE module.</div><div class='add'>+ * bfa_cee_isr - Handles Mail-box interrupts for CEE module.</div><div class='add'>+ * @cbarg: argument passed containing pointer to the CEE module data structure.</div><div class='add'>+ * @m: message pointer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -210,6 +211,7 @@ bfa_cee_isr(void *cbarg, struct bfi_mbmsg *m)</div><div class='ctx'> /**</div><div class='ctx'>  * bfa_cee_notify - CEE module heart-beat failure handler.</div><div class='ctx'>  *</div><div class='add'>+ * @arg: argument passed containing pointer to the CEE module data structure.</div><div class='ctx'>  * @event: IOC event type</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_cs.h b/drivers/net/ethernet/brocade/bna/bfa_cs.h<br/>index 8f0ac7b99973..858c92129451 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_cs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_cs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_cs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfa_cs.h</a></div><div class='hunk'>@@ -18,15 +18,43 @@</div><div class='ctx'> </div><div class='ctx'> /* BFA state machine interfaces */</div><div class='ctx'> </div><div class='del'>-typedef void (*bfa_sm_t)(void *sm, int event);</div><div class='del'>-</div><div class='ctx'> /* For converting from state machine function to state encoding. */</div><div class='del'>-struct bfa_sm_table {</div><div class='del'>-	bfa_sm_t	sm;	/*!&lt; state machine function	*/</div><div class='del'>-	int		state;	/*!&lt; state machine encoding	*/</div><div class='del'>-	char		*name;	/*!&lt; state name for display	*/</div><div class='del'>-};</div><div class='del'>-#define BFA_SM(_sm)		((bfa_sm_t)(_sm))</div><div class='add'>+#define BFA_SM_TABLE(n, s, e, t)				\</div><div class='add'>+struct s;							\</div><div class='add'>+enum e;								\</div><div class='add'>+typedef void (*t)(struct s *, enum e);				\</div><div class='add'>+								\</div><div class='add'>+struct n ## _sm_table_s {					\</div><div class='add'>+	t		sm;	/* state machine function */	\</div><div class='add'>+	int		state;	/* state machine encoding */	\</div><div class='add'>+	char		*name;	/* state name for display */	\</div><div class='add'>+};								\</div><div class='add'>+								\</div><div class='add'>+static inline int						\</div><div class='add'>+n ## _sm_to_state(struct n ## _sm_table_s *smt, t sm)		\</div><div class='add'>+{								\</div><div class='add'>+	int	i = 0;						\</div><div class='add'>+								\</div><div class='add'>+	while (smt[i].sm &amp;&amp; smt[i].sm != sm)			\</div><div class='add'>+		i++;						\</div><div class='add'>+	return smt[i].state;					\</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+BFA_SM_TABLE(iocpf,	bfa_iocpf,	iocpf_event,	bfa_fsm_iocpf_t)</div><div class='add'>+BFA_SM_TABLE(ioc,	bfa_ioc,	ioc_event,	bfa_fsm_ioc_t)</div><div class='add'>+BFA_SM_TABLE(cmdq,	bfa_msgq_cmdq,	cmdq_event,	bfa_fsm_msgq_cmdq_t)</div><div class='add'>+BFA_SM_TABLE(rspq,	bfa_msgq_rspq,	rspq_event,	bfa_fsm_msgq_rspq_t)</div><div class='add'>+</div><div class='add'>+BFA_SM_TABLE(ioceth,	bna_ioceth,	bna_ioceth_event, bna_fsm_ioceth_t)</div><div class='add'>+BFA_SM_TABLE(enet,	bna_enet,	bna_enet_event, bna_fsm_enet_t)</div><div class='add'>+BFA_SM_TABLE(ethport,	bna_ethport,	bna_ethport_event, bna_fsm_ethport_t)</div><div class='add'>+BFA_SM_TABLE(tx,	bna_tx,		bna_tx_event,	bna_fsm_tx_t)</div><div class='add'>+BFA_SM_TABLE(rxf,	bna_rxf,	bna_rxf_event, bna_fsm_rxf_t)</div><div class='add'>+BFA_SM_TABLE(rx,	bna_rx,		bna_rx_event,	bna_fsm_rx_t)</div><div class='add'>+</div><div class='add'>+#undef BFA_SM_TABLE</div><div class='add'>+</div><div class='add'>+#define BFA_SM(_sm)	(_sm)</div><div class='ctx'> </div><div class='ctx'> /* State machine with entry actions. */</div><div class='ctx'> typedef void (*bfa_fsm_t)(void *fsm, int event);</div><div class='hunk'>@@ -41,24 +69,12 @@ typedef void (*bfa_fsm_t)(void *fsm, int event);</div><div class='ctx'> 	static void oc ## _sm_ ## st ## _entry(otype * fsm)</div><div class='ctx'> </div><div class='ctx'> #define bfa_fsm_set_state(_fsm, _state) do {				\</div><div class='del'>-	(_fsm)-&gt;fsm = (bfa_fsm_t)(_state);				\</div><div class='add'>+	(_fsm)-&gt;fsm = (_state);						\</div><div class='ctx'> 	_state ## _entry(_fsm);						\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='ctx'> #define bfa_fsm_send_event(_fsm, _event)	((_fsm)-&gt;fsm((_fsm), (_event)))</div><div class='del'>-#define bfa_fsm_cmp_state(_fsm, _state)					\</div><div class='del'>-	((_fsm)-&gt;fsm == (bfa_fsm_t)(_state))</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-bfa_sm_to_state(const struct bfa_sm_table *smt, bfa_sm_t sm)</div><div class='del'>-{</div><div class='del'>-	int	i = 0;</div><div class='del'>-</div><div class='del'>-	while (smt[i].sm &amp;&amp; smt[i].sm != sm)</div><div class='del'>-		i++;</div><div class='del'>-	return smt[i].state;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+#define bfa_fsm_cmp_state(_fsm, _state)		((_fsm)-&gt;fsm == (_state))</div><div class='ctx'> /* Generic wait counter. */</div><div class='ctx'> </div><div class='ctx'> typedef void (*bfa_wc_resume_t) (void *cbarg);</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c<br/>index 4042c2185e98..92c7639d1fc7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_ioc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfa_ioc.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ bfa_fsm_state_decl(bfa_ioc, disabling, struct bfa_ioc, enum ioc_event);</div><div class='ctx'> bfa_fsm_state_decl(bfa_ioc, disabled, struct bfa_ioc, enum ioc_event);</div><div class='ctx'> bfa_fsm_state_decl(bfa_ioc, hwfail, struct bfa_ioc, enum ioc_event);</div><div class='ctx'> </div><div class='del'>-static struct bfa_sm_table ioc_sm_table[] = {</div><div class='add'>+static struct ioc_sm_table_s ioc_sm_table[] = {</div><div class='ctx'> 	{BFA_SM(bfa_ioc_sm_uninit), BFA_IOC_UNINIT},</div><div class='ctx'> 	{BFA_SM(bfa_ioc_sm_reset), BFA_IOC_RESET},</div><div class='ctx'> 	{BFA_SM(bfa_ioc_sm_enabling), BFA_IOC_ENABLING},</div><div class='hunk'>@@ -183,7 +183,7 @@ bfa_fsm_state_decl(bfa_iocpf, disabling_sync, struct bfa_iocpf,</div><div class='ctx'> 						enum iocpf_event);</div><div class='ctx'> bfa_fsm_state_decl(bfa_iocpf, disabled, struct bfa_iocpf, enum iocpf_event);</div><div class='ctx'> </div><div class='del'>-static struct bfa_sm_table iocpf_sm_table[] = {</div><div class='add'>+static struct iocpf_sm_table_s iocpf_sm_table[] = {</div><div class='ctx'> 	{BFA_SM(bfa_iocpf_sm_reset), BFA_IOCPF_RESET},</div><div class='ctx'> 	{BFA_SM(bfa_iocpf_sm_fwcheck), BFA_IOCPF_FWMISMATCH},</div><div class='ctx'> 	{BFA_SM(bfa_iocpf_sm_mismatch), BFA_IOCPF_FWMISMATCH},</div><div class='hunk'>@@ -269,7 +269,7 @@ bfa_ioc_sm_enabling(struct bfa_ioc *ioc, enum ioc_event event)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOC_E_PFFAILED:</div><div class='del'>-		/* !!! fall through !!! */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case IOC_E_HWERROR:</div><div class='ctx'> 		ioc-&gt;cbfn-&gt;enable_cbfn(ioc-&gt;bfa, BFA_STATUS_IOC_FAILURE);</div><div class='ctx'> 		bfa_fsm_set_state(ioc, bfa_ioc_sm_fail);</div><div class='hunk'>@@ -314,14 +314,14 @@ bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event)</div><div class='ctx'> {</div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case IOC_E_FWRSP_GETATTR:</div><div class='del'>-		del_timer(&amp;ioc-&gt;ioc_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;ioc_timer);</div><div class='ctx'> 		bfa_fsm_set_state(ioc, bfa_ioc_sm_op);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOC_E_PFFAILED:</div><div class='ctx'> 	case IOC_E_HWERROR:</div><div class='del'>-		del_timer(&amp;ioc-&gt;ioc_timer);</div><div class='del'>-		/* fall through */</div><div class='add'>+		timer_delete(&amp;ioc-&gt;ioc_timer);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case IOC_E_TIMEOUT:</div><div class='ctx'> 		ioc-&gt;cbfn-&gt;enable_cbfn(ioc-&gt;bfa, BFA_STATUS_IOC_FAILURE);</div><div class='ctx'> 		bfa_fsm_set_state(ioc, bfa_ioc_sm_fail);</div><div class='hunk'>@@ -330,7 +330,7 @@ bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOC_E_DISABLE:</div><div class='del'>-		del_timer(&amp;ioc-&gt;ioc_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;ioc_timer);</div><div class='ctx'> 		bfa_fsm_set_state(ioc, bfa_ioc_sm_disabling);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -365,7 +365,8 @@ bfa_ioc_sm_op(struct bfa_ioc *ioc, enum ioc_event event)</div><div class='ctx'> 	case IOC_E_PFFAILED:</div><div class='ctx'> 	case IOC_E_HWERROR:</div><div class='ctx'> 		bfa_ioc_hb_stop(ioc);</div><div class='del'>-		/* !!! fall through !!! */</div><div class='add'>+		fallthrough;</div><div class='add'>+</div><div class='ctx'> 	case IOC_E_HBFAIL:</div><div class='ctx'> 		if (ioc-&gt;iocpf.auto_recover)</div><div class='ctx'> 			bfa_fsm_set_state(ioc, bfa_ioc_sm_fail_retry);</div><div class='hunk'>@@ -658,13 +659,13 @@ bfa_iocpf_sm_mismatch(struct bfa_iocpf *iocpf, enum iocpf_event event)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_DISABLE:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='ctx'> 		bfa_fsm_set_state(iocpf, bfa_iocpf_sm_reset);</div><div class='ctx'> 		bfa_ioc_pf_disabled(ioc);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_STOP:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='ctx'> 		bfa_fsm_set_state(iocpf, bfa_iocpf_sm_reset);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -740,7 +741,7 @@ bfa_iocpf_sm_hwinit(struct bfa_iocpf *iocpf, enum iocpf_event event)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_DISABLE:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='ctx'> 		bfa_ioc_sync_leave(ioc);</div><div class='ctx'> 		bfa_nw_ioc_hw_sem_release(ioc);</div><div class='ctx'> 		bfa_fsm_set_state(iocpf, bfa_iocpf_sm_disabled);</div><div class='hunk'>@@ -773,14 +774,14 @@ bfa_iocpf_sm_enabling(struct bfa_iocpf *iocpf, enum iocpf_event event)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case IOCPF_E_FWRSP_ENABLE:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='ctx'> 		bfa_nw_ioc_hw_sem_release(ioc);</div><div class='ctx'> 		bfa_fsm_set_state(iocpf, bfa_iocpf_sm_ready);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_INITFAIL:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='del'>-		/* fall through */</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_TIMEOUT:</div><div class='ctx'> 		bfa_nw_ioc_hw_sem_release(ioc);</div><div class='hunk'>@@ -790,7 +791,7 @@ bfa_iocpf_sm_enabling(struct bfa_iocpf *iocpf, enum iocpf_event event)</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_DISABLE:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='ctx'> 		bfa_nw_ioc_hw_sem_release(ioc);</div><div class='ctx'> 		bfa_fsm_set_state(iocpf, bfa_iocpf_sm_disabling);</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -843,13 +844,13 @@ bfa_iocpf_sm_disabling(struct bfa_iocpf *iocpf, enum iocpf_event event)</div><div class='ctx'> </div><div class='ctx'> 	switch (event) {</div><div class='ctx'> 	case IOCPF_E_FWRSP_DISABLE:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='ctx'> 		bfa_fsm_set_state(iocpf, bfa_iocpf_sm_disabling_sync);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_FAIL:</div><div class='del'>-		del_timer(&amp;ioc-&gt;iocpf_timer);</div><div class='del'>-		/* fall through*/</div><div class='add'>+		timer_delete(&amp;ioc-&gt;iocpf_timer);</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case IOCPF_E_TIMEOUT:</div><div class='ctx'> 		bfa_ioc_set_cur_ioc_fwstate(ioc, BFI_IOC_FAIL);</div><div class='hunk'>@@ -1124,11 +1125,10 @@ bfa_nw_ioc_sem_release(void __iomem *sem_reg)</div><div class='ctx'> static void</div><div class='ctx'> bfa_ioc_fwver_clear(struct bfa_ioc *ioc)</div><div class='ctx'> {</div><div class='del'>-	u32 pgnum, pgoff, loff = 0;</div><div class='add'>+	u32 pgnum, loff = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	pgnum = PSS_SMEM_PGNUM(ioc-&gt;ioc_regs.smem_pg0, loff);</div><div class='del'>-	pgoff = PSS_SMEM_PGOFF(loff);</div><div class='ctx'> 	writel(pgnum, ioc-&gt;ioc_regs.host_page_num_fn);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; (sizeof(struct bfi_ioc_image_hdr) / sizeof(u32)); i++) {</div><div class='hunk'>@@ -1210,7 +1210,7 @@ bfa_nw_ioc_hw_sem_release(struct bfa_ioc *ioc)</div><div class='ctx'> static void</div><div class='ctx'> bfa_ioc_hw_sem_get_cancel(struct bfa_ioc *ioc)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ioc-&gt;sem_timer);</div><div class='add'>+	timer_delete(&amp;ioc-&gt;sem_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initialize LPU local memory (aka secondary memory / SRAM) */</div><div class='hunk'>@@ -1536,7 +1536,6 @@ static int</div><div class='ctx'> bfa_flash_fifo_flush(void __iomem *pci_bar)</div><div class='ctx'> {</div><div class='ctx'> 	u32 i;</div><div class='del'>-	u32 t;</div><div class='ctx'> 	union bfa_flash_dev_status_reg dev_status;</div><div class='ctx'> </div><div class='ctx'> 	dev_status.i = readl(pci_bar + FLI_DEV_STATUS_REG);</div><div class='hunk'>@@ -1546,7 +1545,7 @@ bfa_flash_fifo_flush(void __iomem *pci_bar)</div><div class='ctx'> </div><div class='ctx'> 	/* fifo counter in terms of words */</div><div class='ctx'> 	for (i = 0; i &lt; dev_status.r.fifo_cnt; i++)</div><div class='del'>-		t = readl(pci_bar + FLI_RDDATA_REG);</div><div class='add'>+		readl(pci_bar + FLI_RDDATA_REG);</div><div class='ctx'> </div><div class='ctx'> 	/* Check the device status. It may take some time. */</div><div class='ctx'> 	for (i = 0; i &lt; BFA_FLASH_CHECK_MAX; i++) {</div><div class='hunk'>@@ -1765,7 +1764,7 @@ bfa_ioc_flash_fwver_cmp(struct bfa_ioc *ioc,</div><div class='ctx'> 		return BFI_IOC_IMG_VER_INCOMP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Returns TRUE if driver is willing to work with current smem f/w version.</div><div class='ctx'>  */</div><div class='ctx'> bool</div><div class='hunk'>@@ -1983,7 +1982,7 @@ bfa_ioc_hb_monitor(struct bfa_ioc *ioc)</div><div class='ctx'> static void</div><div class='ctx'> bfa_ioc_hb_stop(struct bfa_ioc *ioc)</div><div class='ctx'> {</div><div class='del'>-	del_timer(&amp;ioc-&gt;hb_timer);</div><div class='add'>+	timer_delete(&amp;ioc-&gt;hb_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Initiate a full firmware download. */</div><div class='hunk'>@@ -2471,6 +2470,7 @@ bfa_ioc_isr(struct bfa_ioc *ioc, struct bfi_mbmsg *m)</div><div class='ctx'>  *</div><div class='ctx'>  * @ioc:	memory for IOC</div><div class='ctx'>  * @bfa:	driver instance structure</div><div class='add'>+ * @cbfn:	callback function</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> bfa_nw_ioc_attach(struct bfa_ioc *ioc, void *bfa, struct bfa_ioc_cbfn *cbfn)</div><div class='hunk'>@@ -2502,7 +2502,9 @@ bfa_nw_ioc_detach(struct bfa_ioc *ioc)</div><div class='ctx'> /**</div><div class='ctx'>  * bfa_nw_ioc_pci_init - Setup IOC PCI properties.</div><div class='ctx'>  *</div><div class='add'>+ * @ioc:	memory for IOC</div><div class='ctx'>  * @pcidev:	PCI device information for this IOC</div><div class='add'>+ * @clscode:	class code</div><div class='ctx'>  */</div><div class='ctx'> void</div><div class='ctx'> bfa_nw_ioc_pci_init(struct bfa_ioc *ioc, struct bfa_pcidev *pcidev,</div><div class='hunk'>@@ -2571,6 +2573,7 @@ bfa_nw_ioc_pci_init(struct bfa_ioc *ioc, struct bfa_pcidev *pcidev,</div><div class='ctx'> /**</div><div class='ctx'>  * bfa_nw_ioc_mem_claim - Initialize IOC dma memory</div><div class='ctx'>  *</div><div class='add'>+ * @ioc:	memory for IOC</div><div class='ctx'>  * @dm_kva:	kernel virtual address of IOC dma memory</div><div class='ctx'>  * @dm_pa:	physical address of IOC dma memory</div><div class='ctx'>  */</div><div class='hunk'>@@ -2638,6 +2641,8 @@ bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc,</div><div class='ctx'>  *</div><div class='ctx'>  * @ioc:	IOC instance</div><div class='ctx'>  * @cmd:	Mailbox command</div><div class='add'>+ * @cbfn:	callback function</div><div class='add'>+ * @cbarg:	arguments to callback</div><div class='ctx'>  *</div><div class='ctx'>  * Waits if mailbox is busy. Responsibility of caller to serialize</div><div class='ctx'>  */</div><div class='hunk'>@@ -2834,7 +2839,7 @@ bfa_ioc_get_adapter_optrom_ver(struct bfa_ioc *ioc, char *optrom_ver)</div><div class='ctx'> static void</div><div class='ctx'> bfa_ioc_get_adapter_manufacturer(struct bfa_ioc *ioc, char *manufacturer)</div><div class='ctx'> {</div><div class='del'>-	strncpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN);</div><div class='add'>+	strscpy_pad(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -2855,12 +2860,12 @@ static enum bfa_ioc_state</div><div class='ctx'> bfa_ioc_get_state(struct bfa_ioc *ioc)</div><div class='ctx'> {</div><div class='ctx'> 	enum bfa_iocpf_state iocpf_st;</div><div class='del'>-	enum bfa_ioc_state ioc_st = bfa_sm_to_state(ioc_sm_table, ioc-&gt;fsm);</div><div class='add'>+	enum bfa_ioc_state ioc_st = ioc_sm_to_state(ioc_sm_table, ioc-&gt;fsm);</div><div class='ctx'> </div><div class='ctx'> 	if (ioc_st == BFA_IOC_ENABLING ||</div><div class='ctx'> 		ioc_st == BFA_IOC_FAIL || ioc_st == BFA_IOC_INITFAIL) {</div><div class='ctx'> </div><div class='del'>-		iocpf_st = bfa_sm_to_state(iocpf_sm_table, ioc-&gt;iocpf.fsm);</div><div class='add'>+		iocpf_st = iocpf_sm_to_state(iocpf_sm_table, ioc-&gt;iocpf.fsm);</div><div class='ctx'> </div><div class='ctx'> 		switch (iocpf_st) {</div><div class='ctx'> 		case BFA_IOCPF_SEMWAIT:</div><div class='hunk'>@@ -2978,7 +2983,7 @@ bfa_nw_iocpf_timeout(struct bfa_ioc *ioc)</div><div class='ctx'> {</div><div class='ctx'> 	enum bfa_iocpf_state iocpf_st;</div><div class='ctx'> </div><div class='del'>-	iocpf_st = bfa_sm_to_state(iocpf_sm_table, ioc-&gt;iocpf.fsm);</div><div class='add'>+	iocpf_st = iocpf_sm_to_state(iocpf_sm_table, ioc-&gt;iocpf.fsm);</div><div class='ctx'> </div><div class='ctx'> 	if (iocpf_st == BFA_IOCPF_HWINIT)</div><div class='ctx'> 		bfa_ioc_poll_fwinit(ioc);</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.h b/drivers/net/ethernet/brocade/bna/bfa_ioc.h<br/>index edd0ed5b5332..f30d06ec4ffe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_ioc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_ioc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfa_ioc.h</a></div><div class='hunk'>@@ -147,16 +147,20 @@ struct bfa_ioc_notify {</div><div class='ctx'> 	(__notify)-&gt;cbarg = (__cbarg);				\</div><div class='ctx'> } while (0)</div><div class='ctx'> </div><div class='add'>+enum iocpf_event;</div><div class='add'>+</div><div class='ctx'> struct bfa_iocpf {</div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bfa_iocpf *s, enum iocpf_event e);</div><div class='ctx'> 	struct bfa_ioc		*ioc;</div><div class='ctx'> 	bool			fw_mismatch_notified;</div><div class='ctx'> 	bool			auto_recover;</div><div class='ctx'> 	u32			poll_time;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum ioc_event;</div><div class='add'>+</div><div class='ctx'> struct bfa_ioc {</div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bfa_ioc *s, enum ioc_event e);</div><div class='ctx'> 	struct bfa		*bfa;</div><div class='ctx'> 	struct bfa_pcidev	pcidev;</div><div class='ctx'> 	struct timer_list	ioc_timer;</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_msgq.c b/drivers/net/ethernet/brocade/bna/bfa_msgq.c<br/>index 47125f419530..fa40d5ec6f1c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_msgq.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_msgq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_msgq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfa_msgq.c</a></div><div class='hunk'>@@ -202,7 +202,6 @@ static void</div><div class='ctx'> __cmd_copy(struct bfa_msgq_cmdq *cmdq, struct bfa_msgq_cmd_entry *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	size_t len = cmd-&gt;msg_size;</div><div class='del'>-	int num_entries = 0;</div><div class='ctx'> 	size_t to_copy;</div><div class='ctx'> 	u8 *src, *dst;</div><div class='ctx'> </div><div class='hunk'>@@ -219,7 +218,6 @@ __cmd_copy(struct bfa_msgq_cmdq *cmdq, struct bfa_msgq_cmd_entry *cmd)</div><div class='ctx'> 		BFA_MSGQ_INDX_ADD(cmdq-&gt;producer_index, 1, cmdq-&gt;depth);</div><div class='ctx'> 		dst = (u8 *)cmdq-&gt;addr.kva;</div><div class='ctx'> 		dst += (cmdq-&gt;producer_index * BFI_MSGQ_CMD_ENTRY_SIZE);</div><div class='del'>-		num_entries++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfa_msgq.h b/drivers/net/ethernet/brocade/bna/bfa_msgq.h<br/>index 75343b535798..170a4b4bed96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_msgq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfa_msgq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfa_msgq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfa_msgq.h</a></div><div class='hunk'>@@ -55,8 +55,10 @@ enum bfa_msgq_cmdq_flags {</div><div class='ctx'> 	BFA_MSGQ_CMDQ_F_DB_UPDATE	= 1,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum cmdq_event;</div><div class='add'>+</div><div class='ctx'> struct bfa_msgq_cmdq {</div><div class='del'>-	bfa_fsm_t			fsm;</div><div class='add'>+	void (*fsm)(struct bfa_msgq_cmdq *s, enum cmdq_event e);</div><div class='ctx'> 	enum bfa_msgq_cmdq_flags flags;</div><div class='ctx'> </div><div class='ctx'> 	u16			producer_index;</div><div class='hunk'>@@ -81,8 +83,10 @@ enum bfa_msgq_rspq_flags {</div><div class='ctx'> </div><div class='ctx'> typedef void (*bfa_msgq_mcfunc_t)(void *cbarg, struct bfi_msgq_mhdr *mhdr);</div><div class='ctx'> </div><div class='add'>+enum rspq_event;</div><div class='add'>+</div><div class='ctx'> struct bfa_msgq_rspq {</div><div class='del'>-	bfa_fsm_t			fsm;</div><div class='add'>+	void (*fsm)(struct bfa_msgq_rspq *s, enum rspq_event e);</div><div class='ctx'> 	enum bfa_msgq_rspq_flags flags;</div><div class='ctx'> </div><div class='ctx'> 	u16			producer_index;</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h<br/>index 09c912e984fe..f780d42c946d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfi.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bfi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bfi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bfi.h</a></div><div class='hunk'>@@ -389,7 +389,7 @@ struct bfi_msgq_mhdr {</div><div class='ctx'> 	u16	msg_token;</div><div class='ctx'> 	u16	num_entries;</div><div class='ctx'> 	u8	enet_id;</div><div class='del'>-	u8	rsvd[1];</div><div class='add'>+	u8	rsvd;</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define bfi_msgq_mhdr_set(_mh, _mc, _mid, _tok, _enet_id) do {	\</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c<br/>index 40107a9bd120..883de0ac8de4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_enet.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_enet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_enet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bna_enet.c</a></div><div class='hunk'>@@ -1084,7 +1084,7 @@ bna_enet_sm_cfg_wait(struct bna_enet *enet,</div><div class='ctx'> </div><div class='ctx'> 	case ENET_E_CHLD_STOPPED:</div><div class='ctx'> 		bna_enet_rx_start(enet);</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ENET_E_FWRESP_PAUSE:</div><div class='ctx'> 		if (enet-&gt;flags &amp; BNA_ENET_F_PAUSE_CHANGED) {</div><div class='ctx'> 			enet-&gt;flags &amp;= ~BNA_ENET_F_PAUSE_CHANGED;</div><div class='hunk'>@@ -1257,7 +1257,7 @@ bna_enet_mtu_get(struct bna_enet *enet)</div><div class='ctx'> void</div><div class='ctx'> bna_enet_enable(struct bna_enet *enet)</div><div class='ctx'> {</div><div class='del'>-	if (enet-&gt;fsm != (bfa_sm_t)bna_enet_sm_stopped)</div><div class='add'>+	if (enet-&gt;fsm != bna_enet_sm_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	enet-&gt;flags |= BNA_ENET_F_ENABLED;</div><div class='hunk'>@@ -1751,12 +1751,12 @@ bna_ioceth_uninit(struct bna_ioceth *ioceth)</div><div class='ctx'> void</div><div class='ctx'> bna_ioceth_enable(struct bna_ioceth *ioceth)</div><div class='ctx'> {</div><div class='del'>-	if (ioceth-&gt;fsm == (bfa_fsm_t)bna_ioceth_sm_ready) {</div><div class='add'>+	if (ioceth-&gt;fsm == bna_ioceth_sm_ready) {</div><div class='ctx'> 		bnad_cb_ioceth_ready(ioceth-&gt;bna-&gt;bnad);</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ioceth-&gt;fsm == (bfa_fsm_t)bna_ioceth_sm_stopped)</div><div class='add'>+	if (ioceth-&gt;fsm == bna_ioceth_sm_stopped)</div><div class='ctx'> 		bfa_fsm_send_event(ioceth, IOCETH_E_ENABLE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bna_hw_defs.h b/drivers/net/ethernet/brocade/bna/bna_hw_defs.h<br/>index f335b7115c1b..dc34e38f97c7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_hw_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_hw_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_hw_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bna_hw_defs.h</a></div><div class='hunk'>@@ -218,17 +218,17 @@ do {									\</div><div class='ctx'> </div><div class='ctx'> /* Set the coalescing timer for the given ib */</div><div class='ctx'> #define bna_ib_coalescing_timer_set(_i_dbell, _cls_timer)		\</div><div class='del'>-	((_i_dbell)-&gt;doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0));</div><div class='add'>+	((_i_dbell)-&gt;doorbell_ack = BNA_DOORBELL_IB_INT_ACK((_cls_timer), 0))</div><div class='ctx'> </div><div class='ctx'> /* Acks 'events' # of events for a given ib while disabling interrupts */</div><div class='ctx'> #define bna_ib_ack_disable_irq(_i_dbell, _events)			\</div><div class='del'>-	(writel(BNA_DOORBELL_IB_INT_ACK(0, (_events)), \</div><div class='del'>-		(_i_dbell)-&gt;doorbell_addr));</div><div class='add'>+	(writel(BNA_DOORBELL_IB_INT_ACK(0, (_events)),			\</div><div class='add'>+		(_i_dbell)-&gt;doorbell_addr))</div><div class='ctx'> </div><div class='ctx'> /* Acks 'events' # of events for a given ib */</div><div class='ctx'> #define bna_ib_ack(_i_dbell, _events)					\</div><div class='del'>-	(writel(((_i_dbell)-&gt;doorbell_ack | (_events)), \</div><div class='del'>-		(_i_dbell)-&gt;doorbell_addr));</div><div class='add'>+	(writel(((_i_dbell)-&gt;doorbell_ack | (_events)),		\</div><div class='add'>+		(_i_dbell)-&gt;doorbell_addr))</div><div class='ctx'> </div><div class='ctx'> #define bna_ib_start(_bna, _ib, _is_regular)				\</div><div class='ctx'> {									\</div><div class='hunk'>@@ -259,12 +259,12 @@ do {									\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #define bna_txq_prod_indx_doorbell(_tcb)				\</div><div class='del'>-	(writel(BNA_DOORBELL_Q_PRD_IDX((_tcb)-&gt;producer_index), \</div><div class='del'>-		(_tcb)-&gt;q_dbell));</div><div class='add'>+	(writel(BNA_DOORBELL_Q_PRD_IDX((_tcb)-&gt;producer_index),		\</div><div class='add'>+		(_tcb)-&gt;q_dbell))</div><div class='ctx'> </div><div class='ctx'> #define bna_rxq_prod_indx_doorbell(_rcb)				\</div><div class='del'>-	(writel(BNA_DOORBELL_Q_PRD_IDX((_rcb)-&gt;producer_index), \</div><div class='del'>-		(_rcb)-&gt;q_dbell));</div><div class='add'>+	(writel(BNA_DOORBELL_Q_PRD_IDX((_rcb)-&gt;producer_index),		\</div><div class='add'>+		(_rcb)-&gt;q_dbell))</div><div class='ctx'> </div><div class='ctx'> /* TxQ, RxQ, CQ related bits, offsets, macros */</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bna_tx_rx.c b/drivers/net/ethernet/brocade/bna/bna_tx_rx.c<br/>index b5ecbfe13ab0..c05dc7a1c4a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_tx_rx.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_tx_rx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_tx_rx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bna_tx_rx.c</a></div><div class='hunk'>@@ -1636,7 +1636,7 @@ bna_bfi_rx_enet_start(struct bna_rx *rx)</div><div class='ctx'> 						&amp;q1-&gt;qpt);</div><div class='ctx'> 			cfg_req-&gt;q_cfg[i].qs.rx_buffer_size =</div><div class='ctx'> 				htons((u16)q1-&gt;buffer_size);</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> </div><div class='ctx'> 		case BNA_RXP_SINGLE:</div><div class='ctx'> 			/* Large/Single RxQ */</div><div class='hunk'>@@ -1956,7 +1956,7 @@ static void</div><div class='ctx'> bna_rx_stop(struct bna_rx *rx)</div><div class='ctx'> {</div><div class='ctx'> 	rx-&gt;rx_flags &amp;= ~BNA_RX_F_ENET_STARTED;</div><div class='del'>-	if (rx-&gt;fsm == (bfa_fsm_t) bna_rx_sm_stopped)</div><div class='add'>+	if (rx-&gt;fsm == bna_rx_sm_stopped)</div><div class='ctx'> 		bna_rx_mod_cb_rx_stopped(&amp;rx-&gt;bna-&gt;rx_mod, rx);</div><div class='ctx'> 	else {</div><div class='ctx'> 		rx-&gt;stop_cbfn = bna_rx_mod_cb_rx_stopped;</div><div class='hunk'>@@ -2535,7 +2535,7 @@ bna_rx_destroy(struct bna_rx *rx)</div><div class='ctx'> void</div><div class='ctx'> bna_rx_enable(struct bna_rx *rx)</div><div class='ctx'> {</div><div class='del'>-	if (rx-&gt;fsm != (bfa_sm_t)bna_rx_sm_stopped)</div><div class='add'>+	if (rx-&gt;fsm != bna_rx_sm_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	rx-&gt;rx_flags |= BNA_RX_F_ENABLED;</div><div class='hunk'>@@ -3523,7 +3523,7 @@ bna_tx_destroy(struct bna_tx *tx)</div><div class='ctx'> void</div><div class='ctx'> bna_tx_enable(struct bna_tx *tx)</div><div class='ctx'> {</div><div class='del'>-	if (tx-&gt;fsm != (bfa_sm_t)bna_tx_sm_stopped)</div><div class='add'>+	if (tx-&gt;fsm != bna_tx_sm_stopped)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	tx-&gt;flags |= BNA_TX_F_ENABLED;</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h<br/>index 666b6922e24d..986f43d27711 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_types.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bna_types.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bna_types.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bna_types.h</a></div><div class='hunk'>@@ -312,8 +312,10 @@ struct bna_attr {</div><div class='ctx'> </div><div class='ctx'> /* IOCEth */</div><div class='ctx'> </div><div class='add'>+enum bna_ioceth_event;</div><div class='add'>+</div><div class='ctx'> struct bna_ioceth {</div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bna_ioceth *s, enum bna_ioceth_event e);</div><div class='ctx'> 	struct bfa_ioc ioc;</div><div class='ctx'> </div><div class='ctx'> 	struct bna_attr attr;</div><div class='hunk'>@@ -334,8 +336,10 @@ struct bna_pause_config {</div><div class='ctx'> 	enum bna_status rx_pause;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum bna_enet_event;</div><div class='add'>+</div><div class='ctx'> struct bna_enet {</div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bna_enet *s, enum bna_enet_event e);</div><div class='ctx'> 	enum bna_enet_flags flags;</div><div class='ctx'> </div><div class='ctx'> 	enum bna_enet_type type;</div><div class='hunk'>@@ -360,8 +364,10 @@ struct bna_enet {</div><div class='ctx'> </div><div class='ctx'> /* Ethport */</div><div class='ctx'> </div><div class='add'>+enum bna_ethport_event;</div><div class='add'>+</div><div class='ctx'> struct bna_ethport {</div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bna_ethport *s, enum bna_ethport_event e);</div><div class='ctx'> 	enum bna_ethport_flags flags;</div><div class='ctx'> </div><div class='ctx'> 	enum bna_link_status link_status;</div><div class='hunk'>@@ -410,7 +416,7 @@ struct bna_ib {</div><div class='ctx'> /* Tx object */</div><div class='ctx'> </div><div class='ctx'> /* Tx datapath control structure */</div><div class='del'>-#define BNA_Q_NAME_SIZE		16</div><div class='add'>+#define BNA_Q_NAME_SIZE		(IFNAMSIZ + 6)</div><div class='ctx'> struct bna_tcb {</div><div class='ctx'> 	/* Fast path */</div><div class='ctx'> 	void			**sw_qpt;</div><div class='hunk'>@@ -454,13 +460,16 @@ struct bna_txq {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Tx object */</div><div class='add'>+</div><div class='add'>+enum bna_tx_event;</div><div class='add'>+</div><div class='ctx'> struct bna_tx {</div><div class='ctx'> 	/* This should be the first one */</div><div class='ctx'> 	struct list_head			qe;</div><div class='ctx'> 	int			rid;</div><div class='ctx'> 	int			hw_id;</div><div class='ctx'> </div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bna_tx *s, enum bna_tx_event e);</div><div class='ctx'> 	enum bna_tx_flags flags;</div><div class='ctx'> </div><div class='ctx'> 	enum bna_tx_type type;</div><div class='hunk'>@@ -698,8 +707,11 @@ struct bna_rxp {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* RxF structure (hardware Rx Function) */</div><div class='add'>+</div><div class='add'>+enum bna_rxf_event;</div><div class='add'>+</div><div class='ctx'> struct bna_rxf {</div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bna_rxf *s, enum bna_rxf_event e);</div><div class='ctx'> </div><div class='ctx'> 	struct bfa_msgq_cmd_entry msgq_cmd;</div><div class='ctx'> 	union {</div><div class='hunk'>@@ -769,13 +781,16 @@ struct bna_rxf {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Rx object */</div><div class='add'>+</div><div class='add'>+enum bna_rx_event;</div><div class='add'>+</div><div class='ctx'> struct bna_rx {</div><div class='ctx'> 	/* This should be the first one */</div><div class='ctx'> 	struct list_head			qe;</div><div class='ctx'> 	int			rid;</div><div class='ctx'> 	int			hw_id;</div><div class='ctx'> </div><div class='del'>-	bfa_fsm_t		fsm;</div><div class='add'>+	void (*fsm)(struct bna_rx *s, enum bna_rx_event e);</div><div class='ctx'> </div><div class='ctx'> 	enum bna_rx_type type;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c<br/>index 7767ae6fa1fd..9bed33295839 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bnad.c</a></div><div class='hunk'>@@ -19,6 +19,7 @@</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/prefetch.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "bnad.h"</div><div class='ctx'> #include "bna.h"</div><div class='hunk'>@@ -875,7 +876,7 @@ bnad_set_netdev_perm_addr(struct bnad *bnad)</div><div class='ctx'> </div><div class='ctx'> 	ether_addr_copy(netdev-&gt;perm_addr, bnad-&gt;perm_addr);</div><div class='ctx'> 	if (is_zero_ether_addr(netdev-&gt;dev_addr))</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, bnad-&gt;perm_addr);</div><div class='add'>+		eth_hw_addr_set(netdev, bnad-&gt;perm_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Control Path Handlers */</div><div class='hunk'>@@ -1037,8 +1038,7 @@ bnad_cb_ccb_destroy(struct bnad *bnad, struct bna_ccb *ccb)</div><div class='ctx'> static void</div><div class='ctx'> bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx)</div><div class='ctx'> {</div><div class='del'>-	struct bnad_tx_info *tx_info =</div><div class='del'>-			(struct bnad_tx_info *)tx-&gt;priv;</div><div class='add'>+	struct bnad_tx_info *tx_info = tx-&gt;priv;</div><div class='ctx'> 	struct bna_tcb *tcb;</div><div class='ctx'> 	u32 txq_id;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1056,7 +1056,7 @@ bnad_cb_tx_stall(struct bnad *bnad, struct bna_tx *tx)</div><div class='ctx'> static void</div><div class='ctx'> bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)</div><div class='ctx'> {</div><div class='del'>-	struct bnad_tx_info *tx_info = (struct bnad_tx_info *)tx-&gt;priv;</div><div class='add'>+	struct bnad_tx_info *tx_info = tx-&gt;priv;</div><div class='ctx'> 	struct bna_tcb *tcb;</div><div class='ctx'> 	u32 txq_id;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1092,10 +1092,10 @@ bnad_cb_tx_resume(struct bnad *bnad, struct bna_tx *tx)</div><div class='ctx'>  * Free all TxQs buffers and then notify TX_E_CLEANUP_DONE to Tx fsm.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-bnad_tx_cleanup(struct delayed_work *work)</div><div class='add'>+bnad_tx_cleanup(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnad_tx_info *tx_info =</div><div class='del'>-		container_of(work, struct bnad_tx_info, tx_cleanup_work);</div><div class='add'>+		container_of(work, struct bnad_tx_info, tx_cleanup_work.work);</div><div class='ctx'> 	struct bnad *bnad = NULL;</div><div class='ctx'> 	struct bna_tcb *tcb;</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1133,7 +1133,7 @@ bnad_tx_cleanup(struct delayed_work *work)</div><div class='ctx'> static void</div><div class='ctx'> bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx)</div><div class='ctx'> {</div><div class='del'>-	struct bnad_tx_info *tx_info = (struct bnad_tx_info *)tx-&gt;priv;</div><div class='add'>+	struct bnad_tx_info *tx_info = tx-&gt;priv;</div><div class='ctx'> 	struct bna_tcb *tcb;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1149,7 +1149,7 @@ bnad_cb_tx_cleanup(struct bnad *bnad, struct bna_tx *tx)</div><div class='ctx'> static void</div><div class='ctx'> bnad_cb_rx_stall(struct bnad *bnad, struct bna_rx *rx)</div><div class='ctx'> {</div><div class='del'>-	struct bnad_rx_info *rx_info = (struct bnad_rx_info *)rx-&gt;priv;</div><div class='add'>+	struct bnad_rx_info *rx_info = rx-&gt;priv;</div><div class='ctx'> 	struct bna_ccb *ccb;</div><div class='ctx'> 	struct bnad_rx_ctrl *rx_ctrl;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1171,7 +1171,7 @@ bnad_cb_rx_stall(struct bnad *bnad, struct bna_rx *rx)</div><div class='ctx'>  * Free all RxQs buffers and then notify RX_E_CLEANUP_DONE to Rx fsm.</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-bnad_rx_cleanup(void *work)</div><div class='add'>+bnad_rx_cleanup(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnad_rx_info *rx_info =</div><div class='ctx'> 		container_of(work, struct bnad_rx_info, rx_cleanup_work);</div><div class='hunk'>@@ -1208,7 +1208,7 @@ bnad_rx_cleanup(void *work)</div><div class='ctx'> static void</div><div class='ctx'> bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)</div><div class='ctx'> {</div><div class='del'>-	struct bnad_rx_info *rx_info = (struct bnad_rx_info *)rx-&gt;priv;</div><div class='add'>+	struct bnad_rx_info *rx_info = rx-&gt;priv;</div><div class='ctx'> 	struct bna_ccb *ccb;</div><div class='ctx'> 	struct bnad_rx_ctrl *rx_ctrl;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1231,7 +1231,7 @@ bnad_cb_rx_cleanup(struct bnad *bnad, struct bna_rx *rx)</div><div class='ctx'> static void</div><div class='ctx'> bnad_cb_rx_post(struct bnad *bnad, struct bna_rx *rx)</div><div class='ctx'> {</div><div class='del'>-	struct bnad_rx_info *rx_info = (struct bnad_rx_info *)rx-&gt;priv;</div><div class='add'>+	struct bnad_rx_info *rx_info = rx-&gt;priv;</div><div class='ctx'> 	struct bna_ccb *ccb;</div><div class='ctx'> 	struct bna_rcb *rcb;</div><div class='ctx'> 	struct bnad_rx_ctrl *rx_ctrl;</div><div class='hunk'>@@ -1535,8 +1535,9 @@ bnad_tx_msix_register(struct bnad *bnad, struct bnad_tx_info *tx_info,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_txqs; i++) {</div><div class='ctx'> 		vector_num = tx_info-&gt;tcb[i]-&gt;intr_vector;</div><div class='del'>-		sprintf(tx_info-&gt;tcb[i]-&gt;name, "%s TXQ %d", bnad-&gt;netdev-&gt;name,</div><div class='del'>-				tx_id + tx_info-&gt;tcb[i]-&gt;id);</div><div class='add'>+		snprintf(tx_info-&gt;tcb[i]-&gt;name, BNA_Q_NAME_SIZE, "%s TXQ %d",</div><div class='add'>+			 bnad-&gt;netdev-&gt;name,</div><div class='add'>+			 tx_id + tx_info-&gt;tcb[i]-&gt;id);</div><div class='ctx'> 		err = request_irq(bnad-&gt;msix_table[vector_num].vector,</div><div class='ctx'> 				  (irq_handler_t)bnad_msix_tx, 0,</div><div class='ctx'> 				  tx_info-&gt;tcb[i]-&gt;name,</div><div class='hunk'>@@ -1586,9 +1587,9 @@ bnad_rx_msix_register(struct bnad *bnad, struct bnad_rx_info *rx_info,</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_rxps; i++) {</div><div class='ctx'> 		vector_num = rx_info-&gt;rx_ctrl[i].ccb-&gt;intr_vector;</div><div class='del'>-		sprintf(rx_info-&gt;rx_ctrl[i].ccb-&gt;name, "%s CQ %d",</div><div class='del'>-			bnad-&gt;netdev-&gt;name,</div><div class='del'>-			rx_id + rx_info-&gt;rx_ctrl[i].ccb-&gt;id);</div><div class='add'>+		snprintf(rx_info-&gt;rx_ctrl[i].ccb-&gt;name, BNA_Q_NAME_SIZE,</div><div class='add'>+			 "%s CQ %d", bnad-&gt;netdev-&gt;name,</div><div class='add'>+			 rx_id + rx_info-&gt;rx_ctrl[i].ccb-&gt;id);</div><div class='ctx'> 		err = request_irq(bnad-&gt;msix_table[vector_num].vector,</div><div class='ctx'> 				  (irq_handler_t)bnad_msix_rx, 0,</div><div class='ctx'> 				  rx_info-&gt;rx_ctrl[i].ccb-&gt;name,</div><div class='hunk'>@@ -1687,7 +1688,8 @@ err_return:</div><div class='ctx'> static void</div><div class='ctx'> bnad_ioc_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.ioc_timer);</div><div class='add'>+	struct bnad *bnad = timer_container_of(bnad, t,</div><div class='add'>+					       bna.ioceth.ioc.ioc_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='hunk'>@@ -1698,7 +1700,8 @@ bnad_ioc_timeout(struct timer_list *t)</div><div class='ctx'> static void</div><div class='ctx'> bnad_ioc_hb_check(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.hb_timer);</div><div class='add'>+	struct bnad *bnad = timer_container_of(bnad, t,</div><div class='add'>+					       bna.ioceth.ioc.hb_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='hunk'>@@ -1709,7 +1712,8 @@ bnad_ioc_hb_check(struct timer_list *t)</div><div class='ctx'> static void</div><div class='ctx'> bnad_iocpf_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.iocpf_timer);</div><div class='add'>+	struct bnad *bnad = timer_container_of(bnad, t,</div><div class='add'>+					       bna.ioceth.ioc.iocpf_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='hunk'>@@ -1720,7 +1724,8 @@ bnad_iocpf_timeout(struct timer_list *t)</div><div class='ctx'> static void</div><div class='ctx'> bnad_iocpf_sem_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnad *bnad = from_timer(bnad, t, bna.ioceth.ioc.sem_timer);</div><div class='add'>+	struct bnad *bnad = timer_container_of(bnad, t,</div><div class='add'>+					       bna.ioceth.ioc.sem_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='hunk'>@@ -1734,7 +1739,7 @@ bnad_iocpf_sem_timeout(struct timer_list *t)</div><div class='ctx'>  *	Time	CPU m	CPU n</div><div class='ctx'>  *	0       1 = test_bit</div><div class='ctx'>  *	1			clear_bit</div><div class='del'>- *	2			del_timer_sync</div><div class='add'>+ *	2			timer_delete_sync</div><div class='ctx'>  *	3	mod_timer</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -1742,7 +1747,7 @@ bnad_iocpf_sem_timeout(struct timer_list *t)</div><div class='ctx'> static void</div><div class='ctx'> bnad_dim_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnad *bnad = from_timer(bnad, t, dim_timer);</div><div class='add'>+	struct bnad *bnad = timer_container_of(bnad, t, dim_timer);</div><div class='ctx'> 	struct bnad_rx_info *rx_info;</div><div class='ctx'> 	struct bnad_rx_ctrl *rx_ctrl;</div><div class='ctx'> 	int i, j;</div><div class='hunk'>@@ -1764,7 +1769,7 @@ bnad_dim_timeout(struct timer_list *t)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check for BNAD_CF_DIM_ENABLED, does not eleminate a race */</div><div class='add'>+	/* Check for BNAD_CF_DIM_ENABLED, does not eliminate a race */</div><div class='ctx'> 	if (test_bit(BNAD_RF_DIM_TIMER_RUNNING, &amp;bnad-&gt;run_flags))</div><div class='ctx'> 		mod_timer(&amp;bnad-&gt;dim_timer,</div><div class='ctx'> 			  jiffies + msecs_to_jiffies(BNAD_DIM_TIMER_FREQ));</div><div class='hunk'>@@ -1775,7 +1780,7 @@ bnad_dim_timeout(struct timer_list *t)</div><div class='ctx'> static void</div><div class='ctx'> bnad_stats_timeout(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct bnad *bnad = from_timer(bnad, t, stats_timer);</div><div class='add'>+	struct bnad *bnad = timer_container_of(bnad, t, stats_timer);</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(bnad-&gt;netdev) ||</div><div class='hunk'>@@ -1836,7 +1841,7 @@ bnad_stats_timer_stop(struct bnad *bnad)</div><div class='ctx'> 		to_del = 1;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 	if (to_del)</div><div class='del'>-		del_timer_sync(&amp;bnad-&gt;stats_timer);</div><div class='add'>+		timer_delete_sync(&amp;bnad-&gt;stats_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Utilities */</div><div class='hunk'>@@ -1881,7 +1886,6 @@ poll_exit:</div><div class='ctx'> 	return rcvd;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define BNAD_NAPI_POLL_QUOTA		64</div><div class='ctx'> static void</div><div class='ctx'> bnad_napi_add(struct bnad *bnad, u32 rx_id)</div><div class='ctx'> {</div><div class='hunk'>@@ -1892,7 +1896,7 @@ bnad_napi_add(struct bnad *bnad, u32 rx_id)</div><div class='ctx'> 	for (i = 0; i &lt;	bnad-&gt;num_rxp_per_rx; i++) {</div><div class='ctx'> 		rx_ctrl = &amp;bnad-&gt;rx_info[rx_id].rx_ctrl[i];</div><div class='ctx'> 		netif_napi_add(bnad-&gt;netdev, &amp;rx_ctrl-&gt;napi,</div><div class='del'>-			       bnad_napi_poll_rx, BNAD_NAPI_POLL_QUOTA);</div><div class='add'>+			       bnad_napi_poll_rx);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1993,8 +1997,7 @@ bnad_setup_tx(struct bnad *bnad, u32 tx_id)</div><div class='ctx'> 	}</div><div class='ctx'> 	tx_info-&gt;tx = tx;</div><div class='ctx'> </div><div class='del'>-	INIT_DELAYED_WORK(&amp;tx_info-&gt;tx_cleanup_work,</div><div class='del'>-			(work_func_t)bnad_tx_cleanup);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;tx_info-&gt;tx_cleanup_work, bnad_tx_cleanup);</div><div class='ctx'> </div><div class='ctx'> 	/* Register ISR for the Tx object */</div><div class='ctx'> 	if (intr_info-&gt;intr_type == BNA_INTR_T_MSIX) {</div><div class='hunk'>@@ -2161,7 +2164,7 @@ bnad_destroy_rx(struct bnad *bnad, u32 rx_id)</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 		if (to_del)</div><div class='del'>-			del_timer_sync(&amp;bnad-&gt;dim_timer);</div><div class='add'>+			timer_delete_sync(&amp;bnad-&gt;dim_timer);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	init_completion(&amp;bnad-&gt;bnad_completions.rx_comp);</div><div class='hunk'>@@ -2250,8 +2253,7 @@ bnad_setup_rx(struct bnad *bnad, u32 rx_id)</div><div class='ctx'> 	rx_info-&gt;rx = rx;</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> </div><div class='del'>-	INIT_WORK(&amp;rx_info-&gt;rx_cleanup_work,</div><div class='del'>-			(work_func_t)(bnad_rx_cleanup));</div><div class='add'>+	INIT_WORK(&amp;rx_info-&gt;rx_cleanup_work, bnad_rx_cleanup);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Init NAPI, so that state is set to NAPI_STATE_SCHED,</div><div class='hunk'>@@ -2504,12 +2506,7 @@ bnad_tso_prepare(struct bnad *bnad, struct sk_buff *skb)</div><div class='ctx'> 					   IPPROTO_TCP, 0);</div><div class='ctx'> 		BNAD_UPDATE_CTR(bnad, tso4);</div><div class='ctx'> 	} else {</div><div class='del'>-		struct ipv6hdr *ipv6h = ipv6_hdr(skb);</div><div class='del'>-</div><div class='del'>-		ipv6h-&gt;payload_len = 0;</div><div class='del'>-		tcp_hdr(skb)-&gt;check =</div><div class='del'>-			~csum_ipv6_magic(&amp;ipv6h-&gt;saddr, &amp;ipv6h-&gt;daddr, 0,</div><div class='del'>-					 IPPROTO_TCP, 0);</div><div class='add'>+		tcp_v6_gso_csum_prep(skb);</div><div class='ctx'> 		BNAD_UPDATE_CTR(bnad, tso6);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2829,8 +2826,7 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,</div><div class='ctx'> 			BNAD_UPDATE_CTR(bnad, tx_skb_mss_too_long);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely((gso_size + skb_transport_offset(skb) +</div><div class='del'>-			      tcp_hdrlen(skb)) &gt;= skb-&gt;len)) {</div><div class='add'>+		if (unlikely((gso_size + skb_tcp_all_headers(skb)) &gt;= skb-&gt;len)) {</div><div class='ctx'> 			txqent-&gt;hdr.wi.opcode = htons(BNA_TXQ_WI_SEND);</div><div class='ctx'> 			txqent-&gt;hdr.wi.lso_mss = 0;</div><div class='ctx'> 			BNAD_UPDATE_CTR(bnad, tx_skb_tso_too_short);</div><div class='hunk'>@@ -2878,8 +2874,7 @@ bnad_txq_wi_prepare(struct bnad *bnad, struct bna_tcb *tcb,</div><div class='ctx'> 				BNAD_UPDATE_CTR(bnad, tcpcsum_offload);</div><div class='ctx'> </div><div class='ctx'> 				if (unlikely(skb_headlen(skb) &lt;</div><div class='del'>-					    skb_transport_offset(skb) +</div><div class='del'>-				    tcp_hdrlen(skb))) {</div><div class='add'>+					    skb_tcp_all_headers(skb))) {</div><div class='ctx'> 					BNAD_UPDATE_CTR(bnad, tx_skb_tcp_hdr);</div><div class='ctx'> 					return -EINVAL;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -3032,7 +3027,7 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	head_unmap-&gt;nvecs++;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0, vect_id = 0; i &lt; vectors - 1; i++) {</div><div class='del'>-		const struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 		u32		size = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(size == 0)) {</div><div class='hunk'>@@ -3254,7 +3249,7 @@ bnad_set_mac_address(struct net_device *netdev, void *addr)</div><div class='ctx'> </div><div class='ctx'> 	err = bnad_mac_addr_set_locked(bnad, sa-&gt;sa_data);</div><div class='ctx'> 	if (!err)</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, sa-&gt;sa_data);</div><div class='add'>+		eth_hw_addr_set(netdev, sa-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -3282,12 +3277,12 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	int err, mtu;</div><div class='ctx'> 	struct bnad *bnad = netdev_priv(netdev);</div><div class='del'>-	u32 rx_count = 0, frame, new_frame;</div><div class='add'>+	u32 frame, new_frame;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='ctx'> </div><div class='ctx'> 	mtu = netdev-&gt;mtu;</div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	frame = BNAD_FRAME_SIZE(mtu);</div><div class='ctx'> 	new_frame = BNAD_FRAME_SIZE(new_mtu);</div><div class='hunk'>@@ -3298,12 +3293,9 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 		/* only when transition is over 4K */</div><div class='ctx'> 		if ((frame &lt;= 4096 &amp;&amp; new_frame &gt; 4096) ||</div><div class='ctx'> 		    (frame &gt; 4096 &amp;&amp; new_frame &lt;= 4096))</div><div class='del'>-			rx_count = bnad_reinit_rx(bnad);</div><div class='add'>+			bnad_reinit_rx(bnad);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* rx_count &gt; 0 - new rx created</div><div class='del'>-	 *	- Linux set err = 0 and return</div><div class='del'>-	 */</div><div class='ctx'> 	err = bnad_mtu_set(bnad, new_frame);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		err = -EBUSY;</div><div class='hunk'>@@ -3429,7 +3421,7 @@ static const struct net_device_ops bnad_netdev_ops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-bnad_netdev_init(struct bnad *bnad, bool using_dac)</div><div class='add'>+bnad_netdev_init(struct bnad *bnad)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = bnad-&gt;netdev;</div><div class='ctx'> </div><div class='hunk'>@@ -3442,10 +3434,8 @@ bnad_netdev_init(struct bnad *bnad, bool using_dac)</div><div class='ctx'> 		NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='ctx'> 		NETIF_F_TSO | NETIF_F_TSO6;</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;features |= netdev-&gt;hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='del'>-</div><div class='del'>-	if (using_dac)</div><div class='del'>-		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+	netdev-&gt;features |= netdev-&gt;hw_features | NETIF_F_HW_VLAN_CTAG_FILTER |</div><div class='add'>+			    NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;mem_start = bnad-&gt;mmio_start;</div><div class='ctx'> 	netdev-&gt;mem_end = bnad-&gt;mmio_start + bnad-&gt;mmio_len - 1;</div><div class='hunk'>@@ -3477,7 +3467,7 @@ bnad_init(struct bnad *bnad,</div><div class='ctx'> 	bnad-&gt;pcidev = pdev;</div><div class='ctx'> 	bnad-&gt;mmio_start = pci_resource_start(pdev, 0);</div><div class='ctx'> 	bnad-&gt;mmio_len = pci_resource_len(pdev, 0);</div><div class='del'>-	bnad-&gt;bar0 = ioremap_nocache(bnad-&gt;mmio_start, bnad-&gt;mmio_len);</div><div class='add'>+	bnad-&gt;bar0 = ioremap(bnad-&gt;mmio_start, bnad-&gt;mmio_len);</div><div class='ctx'> 	if (!bnad-&gt;bar0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "ioremap for bar0 failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3523,7 +3513,6 @@ static void</div><div class='ctx'> bnad_uninit(struct bnad *bnad)</div><div class='ctx'> {</div><div class='ctx'> 	if (bnad-&gt;work_q) {</div><div class='del'>-		flush_workqueue(bnad-&gt;work_q);</div><div class='ctx'> 		destroy_workqueue(bnad-&gt;work_q);</div><div class='ctx'> 		bnad-&gt;work_q = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3553,8 +3542,7 @@ bnad_lock_uninit(struct bnad *bnad)</div><div class='ctx'> </div><div class='ctx'> /* PCI Initialization */</div><div class='ctx'> static int</div><div class='del'>-bnad_pci_init(struct bnad *bnad,</div><div class='del'>-	      struct pci_dev *pdev, bool *using_dac)</div><div class='add'>+bnad_pci_init(struct bnad *bnad, struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -3564,14 +3552,9 @@ bnad_pci_init(struct bnad *bnad,</div><div class='ctx'> 	err = pci_request_regions(pdev, BNAD_NAME);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto disable_device;</div><div class='del'>-	if (!dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64))) {</div><div class='del'>-		*using_dac = true;</div><div class='del'>-	} else {</div><div class='del'>-		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='del'>-		if (err)</div><div class='del'>-			goto release_regions;</div><div class='del'>-		*using_dac = false;</div><div class='del'>-	}</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (err)</div><div class='add'>+		goto release_regions;</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3594,7 +3577,6 @@ static int</div><div class='ctx'> bnad_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		const struct pci_device_id *pcidev_id)</div><div class='ctx'> {</div><div class='del'>-	bool	using_dac;</div><div class='ctx'> 	int	err;</div><div class='ctx'> 	struct bnad *bnad;</div><div class='ctx'> 	struct bna *bna;</div><div class='hunk'>@@ -3624,13 +3606,8 @@ bnad_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	bnad-&gt;id = atomic_inc_return(&amp;bna_id) - 1;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='del'>-	/*</div><div class='del'>-	 * PCI initialization</div><div class='del'>-	 *	Output : using_dac = 1 for 64 bit DMA</div><div class='del'>-	 *			   = 0 for 32 bit DMA</div><div class='del'>-	 */</div><div class='del'>-	using_dac = false;</div><div class='del'>-	err = bnad_pci_init(bnad, pdev, &amp;using_dac);</div><div class='add'>+	/* PCI initialization */</div><div class='add'>+	err = bnad_pci_init(bnad, pdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto unlock_mutex;</div><div class='ctx'> </div><div class='hunk'>@@ -3643,7 +3620,7 @@ bnad_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		goto pci_uninit;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize netdev structure, set up ethtool ops */</div><div class='del'>-	bnad_netdev_init(bnad, using_dac);</div><div class='add'>+	bnad_netdev_init(bnad);</div><div class='ctx'> </div><div class='ctx'> 	/* Set link to down state */</div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='hunk'>@@ -3753,9 +3730,9 @@ probe_uninit:</div><div class='ctx'> 	bnad_res_free(bnad, &amp;bnad-&gt;mod_res_info[0], BNA_MOD_RES_T_MAX);</div><div class='ctx'> disable_ioceth:</div><div class='ctx'> 	bnad_ioceth_disable(bnad);</div><div class='del'>-	del_timer_sync(&amp;bnad-&gt;bna.ioceth.ioc.ioc_timer);</div><div class='del'>-	del_timer_sync(&amp;bnad-&gt;bna.ioceth.ioc.sem_timer);</div><div class='del'>-	del_timer_sync(&amp;bnad-&gt;bna.ioceth.ioc.hb_timer);</div><div class='add'>+	timer_delete_sync(&amp;bnad-&gt;bna.ioceth.ioc.ioc_timer);</div><div class='add'>+	timer_delete_sync(&amp;bnad-&gt;bna.ioceth.ioc.sem_timer);</div><div class='add'>+	timer_delete_sync(&amp;bnad-&gt;bna.ioceth.ioc.hb_timer);</div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 	bna_uninit(bna);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='hunk'>@@ -3796,9 +3773,9 @@ bnad_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='ctx'> 	bnad_ioceth_disable(bnad);</div><div class='del'>-	del_timer_sync(&amp;bnad-&gt;bna.ioceth.ioc.ioc_timer);</div><div class='del'>-	del_timer_sync(&amp;bnad-&gt;bna.ioceth.ioc.sem_timer);</div><div class='del'>-	del_timer_sync(&amp;bnad-&gt;bna.ioceth.ioc.hb_timer);</div><div class='add'>+	timer_delete_sync(&amp;bnad-&gt;bna.ioceth.ioc.ioc_timer);</div><div class='add'>+	timer_delete_sync(&amp;bnad-&gt;bna.ioceth.ioc.sem_timer);</div><div class='add'>+	timer_delete_sync(&amp;bnad-&gt;bna.ioceth.ioc.hb_timer);</div><div class='ctx'> 	spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 	bna_uninit(bna);</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='hunk'>@@ -3847,9 +3824,6 @@ bnad_module_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	pr_info("bna: QLogic BR-series 10G Ethernet driver - version: %s\n",</div><div class='del'>-		BNAD_VERSION);</div><div class='del'>-</div><div class='ctx'> 	bfa_nw_ioc_auto_recover(bnad_ioc_auto_recover);</div><div class='ctx'> </div><div class='ctx'> 	err = pci_register_driver(&amp;bnad_pci_driver);</div><div class='hunk'>@@ -3874,6 +3848,5 @@ module_exit(bnad_module_exit);</div><div class='ctx'> MODULE_AUTHOR("Brocade");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_DESCRIPTION("QLogic BR-series 10G PCIe Ethernet driver");</div><div class='del'>-MODULE_VERSION(BNAD_VERSION);</div><div class='ctx'> MODULE_FIRMWARE(CNA_FW_FILE_CT);</div><div class='ctx'> MODULE_FIRMWARE(CNA_FW_FILE_CT2);</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h<br/>index 492a02d54f14..4396997c59d0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bnad.h</a></div><div class='hunk'>@@ -19,7 +19,6 @@</div><div class='ctx'> #include &lt;linux/firmware.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> </div><div class='del'>-/* Fix for IA64 */</div><div class='ctx'> #include &lt;asm/checksum.h&gt;</div><div class='ctx'> #include &lt;net/ip6_checksum.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -64,8 +63,6 @@ struct bnad_rx_ctrl {</div><div class='ctx'> #define BNAD_NAME			"bna"</div><div class='ctx'> #define BNAD_NAME_LEN			64</div><div class='ctx'> </div><div class='del'>-#define BNAD_VERSION			"3.2.25.1"</div><div class='del'>-</div><div class='ctx'> #define BNAD_MAILBOX_MSIX_INDEX		0</div><div class='ctx'> #define BNAD_MAILBOX_MSIX_VECTORS	1</div><div class='ctx'> #define BNAD_INTX_TX_IB_BITMASK		0x1</div><div class='hunk'>@@ -253,7 +250,7 @@ struct bnad_rx_unmap_q {</div><div class='ctx'> 	int			alloc_order;</div><div class='ctx'> 	u32			map_size;</div><div class='ctx'> 	enum bnad_rxbuf_type	type;</div><div class='del'>-	struct bnad_rx_unmap	unmap[0] ____cacheline_aligned;</div><div class='add'>+	struct bnad_rx_unmap	unmap[] ____cacheline_aligned;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define BNAD_PCI_DEV_IS_CAT2(_bnad) \</div><div class='hunk'>@@ -354,7 +351,6 @@ struct bnad {</div><div class='ctx'> 	/* debugfs specific data */</div><div class='ctx'> 	char	*regdata;</div><div class='ctx'> 	u32	reglen;</div><div class='del'>-	struct dentry *bnad_dentry_files[5];</div><div class='ctx'> 	struct dentry *port_debugfs_root;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad_debugfs.c b/drivers/net/ethernet/brocade/bna/bnad_debugfs.c<br/>index 04ad0f2b9677..8f0972e6737c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad_debugfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bnad_debugfs.c</a></div><div class='hunk'>@@ -312,7 +312,7 @@ bnad_debugfs_write_regrd(struct file *file, const char __user *buf,</div><div class='ctx'> 	void *kern_buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the user space buf */</div><div class='del'>-	kern_buf = memdup_user(buf, nbytes);</div><div class='add'>+	kern_buf = memdup_user_nul(buf, nbytes);</div><div class='ctx'> 	if (IS_ERR(kern_buf))</div><div class='ctx'> 		return PTR_ERR(kern_buf);</div><div class='ctx'> </div><div class='hunk'>@@ -372,7 +372,7 @@ bnad_debugfs_write_regwr(struct file *file, const char __user *buf,</div><div class='ctx'> 	void *kern_buf;</div><div class='ctx'> </div><div class='ctx'> 	/* Copy the user space buf */</div><div class='del'>-	kern_buf = memdup_user(buf, nbytes);</div><div class='add'>+	kern_buf = memdup_user_nul(buf, nbytes);</div><div class='ctx'> 	if (IS_ERR(kern_buf))</div><div class='ctx'> 		return PTR_ERR(kern_buf);</div><div class='ctx'> </div><div class='hunk'>@@ -500,11 +500,6 @@ bnad_debugfs_init(struct bnad *bnad)</div><div class='ctx'> 	if (!bna_debugfs_root) {</div><div class='ctx'> 		bna_debugfs_root = debugfs_create_dir("bna", NULL);</div><div class='ctx'> 		atomic_set(&amp;bna_debugfs_port_count, 0);</div><div class='del'>-		if (!bna_debugfs_root) {</div><div class='del'>-			netdev_warn(bnad-&gt;netdev,</div><div class='del'>-				    "debugfs root dir creation failed\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the pci_dev debugfs directory for the port */</div><div class='hunk'>@@ -512,28 +507,16 @@ bnad_debugfs_init(struct bnad *bnad)</div><div class='ctx'> 	if (!bnad-&gt;port_debugfs_root) {</div><div class='ctx'> 		bnad-&gt;port_debugfs_root =</div><div class='ctx'> 			debugfs_create_dir(name, bna_debugfs_root);</div><div class='del'>-		if (!bnad-&gt;port_debugfs_root) {</div><div class='del'>-			netdev_warn(bnad-&gt;netdev,</div><div class='del'>-				    "debugfs root dir creation failed\n");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		atomic_inc(&amp;bna_debugfs_port_count);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(bnad_debugfs_files); i++) {</div><div class='ctx'> 			file = &amp;bnad_debugfs_files[i];</div><div class='del'>-			bnad-&gt;bnad_dentry_files[i] =</div><div class='del'>-					debugfs_create_file(file-&gt;name,</div><div class='del'>-							file-&gt;mode,</div><div class='del'>-							bnad-&gt;port_debugfs_root,</div><div class='del'>-							bnad,</div><div class='del'>-							file-&gt;fops);</div><div class='del'>-			if (!bnad-&gt;bnad_dentry_files[i]) {</div><div class='del'>-				netdev_warn(bnad-&gt;netdev,</div><div class='del'>-					    "create %s entry failed\n",</div><div class='del'>-					    file-&gt;name);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='add'>+			debugfs_create_file(file-&gt;name,</div><div class='add'>+					    file-&gt;mode,</div><div class='add'>+					    bnad-&gt;port_debugfs_root,</div><div class='add'>+					    bnad,</div><div class='add'>+					    file-&gt;fops);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -542,15 +525,6 @@ bnad_debugfs_init(struct bnad *bnad)</div><div class='ctx'> void</div><div class='ctx'> bnad_debugfs_uninit(struct bnad *bnad)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(bnad_debugfs_files); i++) {</div><div class='del'>-		if (bnad-&gt;bnad_dentry_files[i]) {</div><div class='del'>-			debugfs_remove(bnad-&gt;bnad_dentry_files[i]);</div><div class='del'>-			bnad-&gt;bnad_dentry_files[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* Remove the pci_dev debugfs directory for the port */</div><div class='ctx'> 	if (bnad-&gt;port_debugfs_root) {</div><div class='ctx'> 		debugfs_remove(bnad-&gt;port_debugfs_root);</div><div class='head'>diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c<br/>index b764c9ff9ad1..216e25f26dbb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/brocade/bna/bnad_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/brocade/bna/bnad_ethtool.c</a></div><div class='hunk'>@@ -114,7 +114,7 @@ static const char *bnad_net_stats_strings[] = {</div><div class='ctx'> 	"mac_tx_deferral",</div><div class='ctx'> 	"mac_tx_excessive_deferral",</div><div class='ctx'> 	"mac_tx_single_collision",</div><div class='del'>-	"mac_tx_muliple_collision",</div><div class='add'>+	"mac_tx_multiple_collision",</div><div class='ctx'> 	"mac_tx_late_collision",</div><div class='ctx'> 	"mac_tx_excessive_collision",</div><div class='ctx'> 	"mac_tx_total_collision",</div><div class='hunk'>@@ -235,13 +235,18 @@ static int</div><div class='ctx'> bnad_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 			struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='del'>-	u32 supported, advertising;</div><div class='del'>-</div><div class='del'>-	supported = SUPPORTED_10000baseT_Full;</div><div class='del'>-	advertising = ADVERTISED_10000baseT_Full;</div><div class='add'>+	ethtool_link_ksettings_zero_link_mode(cmd, supported);</div><div class='add'>+	ethtool_link_ksettings_zero_link_mode(cmd, advertising);</div><div class='add'>+</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseCR_Full);</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseSR_Full);</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, supported, 10000baseLR_Full);</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseCR_Full);</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseSR_Full);</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, advertising, 10000baseLR_Full);</div><div class='ctx'> 	cmd-&gt;base.autoneg = AUTONEG_DISABLE;</div><div class='del'>-	supported |= SUPPORTED_FIBRE;</div><div class='del'>-	advertising |= ADVERTISED_FIBRE;</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE);</div><div class='add'>+	ethtool_link_ksettings_add_link_mode(cmd, advertising, FIBRE);</div><div class='ctx'> 	cmd-&gt;base.port = PORT_FIBRE;</div><div class='ctx'> 	cmd-&gt;base.phy_address = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -253,11 +258,6 @@ bnad_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> 		cmd-&gt;base.duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ethtool_convert_legacy_u32_to_link_mode(cmd-&gt;link_modes.supported,</div><div class='del'>-						supported);</div><div class='del'>-	ethtool_convert_legacy_u32_to_link_mode(cmd-&gt;link_modes.advertising,</div><div class='del'>-						advertising);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,8 +283,7 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	struct bfa_ioc_attr *ioc_attr;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, BNAD_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, BNAD_VERSION, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strscpy(drvinfo-&gt;driver, BNAD_NAME, sizeof(drvinfo-&gt;driver));</div><div class='ctx'> </div><div class='ctx'> 	ioc_attr = kzalloc(sizeof(*ioc_attr), GFP_KERNEL);</div><div class='ctx'> 	if (ioc_attr) {</div><div class='hunk'>@@ -292,12 +291,12 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 		bfa_nw_ioc_get_attr(&amp;bnad-&gt;bna.ioceth.ioc, ioc_attr);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> </div><div class='del'>-		strlcpy(drvinfo-&gt;fw_version, ioc_attr-&gt;adapter_attr.fw_ver,</div><div class='add'>+		strscpy(drvinfo-&gt;fw_version, ioc_attr-&gt;adapter_attr.fw_ver,</div><div class='ctx'> 			sizeof(drvinfo-&gt;fw_version));</div><div class='ctx'> 		kfree(ioc_attr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(bnad-&gt;pcidev),</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(bnad-&gt;pcidev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -308,8 +307,10 @@ bnad_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wolinfo)</div><div class='ctx'> 	wolinfo-&gt;wolopts = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bnad_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)</div><div class='add'>+static int bnad_get_coalesce(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_coalesce *coalesce,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnad *bnad = netdev_priv(netdev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -329,8 +330,10 @@ bnad_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-bnad_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)</div><div class='add'>+static int bnad_set_coalesce(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_coalesce *coalesce,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnad *bnad = netdev_priv(netdev);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -370,7 +373,7 @@ bnad_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock_irqrestore(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 			if (to_del)</div><div class='del'>-				del_timer_sync(&amp;bnad-&gt;dim_timer);</div><div class='add'>+				timer_delete_sync(&amp;bnad-&gt;dim_timer);</div><div class='ctx'> 			spin_lock_irqsave(&amp;bnad-&gt;bna_lock, flags);</div><div class='ctx'> 			bnad_rx_coalescing_timeo_set(bnad);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -402,7 +405,9 @@ bnad_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> bnad_get_ringparam(struct net_device *netdev,</div><div class='del'>-		   struct ethtool_ringparam *ringparam)</div><div class='add'>+		   struct ethtool_ringparam *ringparam,</div><div class='add'>+		   struct kernel_ethtool_ringparam *kernel_ringparam,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct bnad *bnad = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -415,7 +420,9 @@ bnad_get_ringparam(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='ctx'> bnad_set_ringparam(struct net_device *netdev,</div><div class='del'>-		   struct ethtool_ringparam *ringparam)</div><div class='add'>+		   struct ethtool_ringparam *ringparam,</div><div class='add'>+		   struct kernel_ethtool_ringparam *kernel_ringparam,</div><div class='add'>+		   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int i, current_err, err = 0;</div><div class='ctx'> 	struct bnad *bnad = netdev_priv(netdev);</div><div class='hunk'>@@ -525,6 +532,68 @@ bnad_set_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void bnad_get_txf_strings(u8 **string, int f_num)</div><div class='add'>+{</div><div class='add'>+	ethtool_sprintf(string, "txf%d_ucast_octets", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_ucast", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_ucast_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_mcast_octets", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_mcast", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_mcast_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_bcast_octets", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_bcast", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_bcast_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_errors", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_filter_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "txf%d_filter_mac_sa", f_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnad_get_rxf_strings(u8 **string, int f_num)</div><div class='add'>+{</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_ucast_octets", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_ucast", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_ucast_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_mcast_octets", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_mcast", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_mcast_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_bcast_octets", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_bcast", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_bcast_vlan", f_num);</div><div class='add'>+	ethtool_sprintf(string, "rxf%d_frame_drops", f_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnad_get_cq_strings(u8 **string, int q_num)</div><div class='add'>+{</div><div class='add'>+	ethtool_sprintf(string, "cq%d_producer_index", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_consumer_index", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_hw_producer_index", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_intr", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_poll", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_schedule", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_keep_poll", q_num);</div><div class='add'>+	ethtool_sprintf(string, "cq%d_complete", q_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnad_get_rxq_strings(u8 **string, int q_num)</div><div class='add'>+{</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_packets", q_num);</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_bytes", q_num);</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_packets_with_error", q_num);</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_allocbuf_failed", q_num);</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_mapbuf_failed", q_num);</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_producer_index", q_num);</div><div class='add'>+	ethtool_sprintf(string, "rxq%d_consumer_index", q_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bnad_get_txq_strings(u8 **string, int q_num)</div><div class='add'>+{</div><div class='add'>+	ethtool_sprintf(string, "txq%d_packets", q_num);</div><div class='add'>+	ethtool_sprintf(string, "txq%d_bytes", q_num);</div><div class='add'>+	ethtool_sprintf(string, "txq%d_producer_index", q_num);</div><div class='add'>+	ethtool_sprintf(string, "txq%d_consumer_index", q_num);</div><div class='add'>+	ethtool_sprintf(string, "txq%d_hw_consumer_index", q_num);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void</div><div class='ctx'> bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)</div><div class='ctx'> {</div><div class='hunk'>@@ -532,175 +601,57 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)</div><div class='ctx'> 	int i, j, q_num;</div><div class='ctx'> 	u32 bmap;</div><div class='ctx'> </div><div class='add'>+	if (stringset != ETH_SS_STATS)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;bnad-&gt;conf_mutex);</div><div class='ctx'> </div><div class='del'>-	switch (stringset) {</div><div class='del'>-	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; BNAD_ETHTOOL_STATS_NUM; i++) {</div><div class='del'>-			BUG_ON(!(strlen(bnad_net_stats_strings[i]) &lt;</div><div class='del'>-				   ETH_GSTRING_LEN));</div><div class='del'>-			strncpy(string, bnad_net_stats_strings[i],</div><div class='del'>-				ETH_GSTRING_LEN);</div><div class='del'>-			string += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		bmap = bna_tx_rid_mask(&amp;bnad-&gt;bna);</div><div class='del'>-		for (i = 0; bmap; i++) {</div><div class='del'>-			if (bmap &amp; 1) {</div><div class='del'>-				sprintf(string, "txf%d_ucast_octets", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_ucast", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_ucast_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_mcast_octets", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_mcast", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_mcast_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_bcast_octets", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_bcast", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_bcast_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_errors", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_filter_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txf%d_filter_mac_sa", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-			}</div><div class='del'>-			bmap &gt;&gt;= 1;</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; BNAD_ETHTOOL_STATS_NUM; i++) {</div><div class='add'>+		BUG_ON(!(strlen(bnad_net_stats_strings[i]) &lt; ETH_GSTRING_LEN));</div><div class='add'>+		ethtool_puts(&amp;string, bnad_net_stats_strings[i]);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		bmap = bna_rx_rid_mask(&amp;bnad-&gt;bna);</div><div class='del'>-		for (i = 0; bmap; i++) {</div><div class='del'>-			if (bmap &amp; 1) {</div><div class='del'>-				sprintf(string, "rxf%d_ucast_octets", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_ucast", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_ucast_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_mcast_octets", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_mcast", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_mcast_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_bcast_octets", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_bcast", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_bcast_vlan", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxf%d_frame_drops", i);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-			}</div><div class='del'>-			bmap &gt;&gt;= 1;</div><div class='del'>-		}</div><div class='add'>+	bmap = bna_tx_rid_mask(&amp;bnad-&gt;bna);</div><div class='add'>+	for (i = 0; bmap; i++) {</div><div class='add'>+		if (bmap &amp; 1)</div><div class='add'>+			bnad_get_txf_strings(&amp;string, i);</div><div class='add'>+		bmap &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		q_num = 0;</div><div class='del'>-		for (i = 0; i &lt; bnad-&gt;num_rx; i++) {</div><div class='del'>-			if (!bnad-&gt;rx_info[i].rx)</div><div class='del'>-				continue;</div><div class='del'>-			for (j = 0; j &lt; bnad-&gt;num_rxp_per_rx; j++) {</div><div class='del'>-				sprintf(string, "cq%d_producer_index", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_consumer_index", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_hw_producer_index",</div><div class='del'>-					q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_intr", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_poll", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_schedule", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_keep_poll", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "cq%d_complete", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				q_num++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	bmap = bna_rx_rid_mask(&amp;bnad-&gt;bna);</div><div class='add'>+	for (i = 0; bmap; i++, bmap &gt;&gt;= 1) {</div><div class='add'>+		if (bmap &amp; 1)</div><div class='add'>+			bnad_get_rxf_strings(&amp;string, i);</div><div class='add'>+		bmap &gt;&gt;= 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		q_num = 0;</div><div class='del'>-		for (i = 0; i &lt; bnad-&gt;num_rx; i++) {</div><div class='del'>-			if (!bnad-&gt;rx_info[i].rx)</div><div class='del'>-				continue;</div><div class='del'>-			for (j = 0; j &lt; bnad-&gt;num_rxp_per_rx; j++) {</div><div class='del'>-				sprintf(string, "rxq%d_packets", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxq%d_bytes", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxq%d_packets_with_error",</div><div class='del'>-								q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxq%d_allocbuf_failed", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxq%d_mapbuf_failed", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxq%d_producer_index", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "rxq%d_consumer_index", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				q_num++;</div><div class='del'>-				if (bnad-&gt;rx_info[i].rx_ctrl[j].ccb &amp;&amp;</div><div class='del'>-					bnad-&gt;rx_info[i].rx_ctrl[j].ccb-&gt;</div><div class='del'>-					rcb[1] &amp;&amp;</div><div class='del'>-					bnad-&gt;rx_info[i].rx_ctrl[j].ccb-&gt;</div><div class='del'>-					rcb[1]-&gt;rxq) {</div><div class='del'>-					sprintf(string, "rxq%d_packets", q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					sprintf(string, "rxq%d_bytes", q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					sprintf(string,</div><div class='del'>-					"rxq%d_packets_with_error", q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					sprintf(string, "rxq%d_allocbuf_failed",</div><div class='del'>-								q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					sprintf(string, "rxq%d_mapbuf_failed",</div><div class='del'>-						q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					sprintf(string, "rxq%d_producer_index",</div><div class='del'>-								q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					sprintf(string, "rxq%d_consumer_index",</div><div class='del'>-								q_num);</div><div class='del'>-					string += ETH_GSTRING_LEN;</div><div class='del'>-					q_num++;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	q_num = 0;</div><div class='add'>+	for (i = 0; i &lt; bnad-&gt;num_rx; i++) {</div><div class='add'>+		if (!bnad-&gt;rx_info[i].rx)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; bnad-&gt;num_rxp_per_rx; j++)</div><div class='add'>+			bnad_get_cq_strings(&amp;string, q_num++);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		q_num = 0;</div><div class='del'>-		for (i = 0; i &lt; bnad-&gt;num_tx; i++) {</div><div class='del'>-			if (!bnad-&gt;tx_info[i].tx)</div><div class='del'>-				continue;</div><div class='del'>-			for (j = 0; j &lt; bnad-&gt;num_txq_per_tx; j++) {</div><div class='del'>-				sprintf(string, "txq%d_packets", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txq%d_bytes", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txq%d_producer_index", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txq%d_consumer_index", q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				sprintf(string, "txq%d_hw_consumer_index",</div><div class='del'>-									q_num);</div><div class='del'>-				string += ETH_GSTRING_LEN;</div><div class='del'>-				q_num++;</div><div class='del'>-			}</div><div class='add'>+	q_num = 0;</div><div class='add'>+	for (i = 0; i &lt; bnad-&gt;num_rx; i++) {</div><div class='add'>+		if (!bnad-&gt;rx_info[i].rx)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; bnad-&gt;num_rxp_per_rx; j++) {</div><div class='add'>+			bnad_get_rxq_strings(&amp;string, q_num++);</div><div class='add'>+			if (bnad-&gt;rx_info[i].rx_ctrl[j].ccb &amp;&amp;</div><div class='add'>+			    bnad-&gt;rx_info[i].rx_ctrl[j].ccb-&gt;rcb[1] &amp;&amp;</div><div class='add'>+			    bnad-&gt;rx_info[i].rx_ctrl[j].ccb-&gt;rcb[1]-&gt;rxq)</div><div class='add'>+				bnad_get_rxq_strings(&amp;string, q_num++);</div><div class='ctx'> 		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='add'>+	q_num = 0;</div><div class='add'>+	for (i = 0; i &lt; bnad-&gt;num_tx; i++) {</div><div class='add'>+		if (!bnad-&gt;tx_info[i].tx)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; bnad-&gt;num_txq_per_tx; j++)</div><div class='add'>+			bnad_get_txq_strings(&amp;string, q_num++);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_unlock(&amp;bnad-&gt;conf_mutex);</div><div class='hunk'>@@ -1116,6 +1067,9 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops bnad_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_TX_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,</div><div class='ctx'> 	.get_drvinfo = bnad_get_drvinfo,</div><div class='ctx'> 	.get_wol = bnad_get_wol,</div><div class='ctx'> 	.get_link = ethtool_op_get_link,</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig<br/>index 1766697c9c5a..5b2a461dfd28 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cadence/Kconfig</a></div><div class='hunk'>@@ -1,29 +1,31 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> #</div><div class='del'>-# Atmel device configuration</div><div class='add'>+# Cadence device configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> config NET_VENDOR_CADENCE</div><div class='ctx'> 	bool "Cadence devices"</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  If unsure, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='del'>-	  kernel: saying N will just cause the configurator to skip all</div><div class='del'>-	  the remaining Atmel network card questions. If you say Y, you will be</div><div class='add'>+	  kernel: saying N will just cause the configurator to skip all the</div><div class='add'>+	  remaining Cadence network card questions. If you say Y, you will be</div><div class='ctx'> 	  asked for your specific card in the following questions.</div><div class='ctx'> </div><div class='ctx'> if NET_VENDOR_CADENCE</div><div class='ctx'> </div><div class='ctx'> config MACB</div><div class='ctx'> 	tristate "Cadence MACB/GEM support"</div><div class='del'>-	depends on HAS_DMA</div><div class='del'>-	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	depends on HAS_DMA &amp;&amp; COMMON_CLK</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select PHYLINK</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='ctx'> 	  The Cadence MACB ethernet interface is found on many Atmel AT32 and</div><div class='ctx'> 	  AT91 parts.  This driver also supports the Cadence GEM (Gigabit</div><div class='ctx'> 	  Ethernet MAC found in some ARM SoC devices).  Say Y to include</div><div class='hunk'>@@ -35,15 +37,15 @@ config MACB</div><div class='ctx'> config MACB_USE_HWSTAMP</div><div class='ctx'> 	bool "Use IEEE 1588 hwstamp"</div><div class='ctx'> 	depends on MACB</div><div class='add'>+	depends on PTP_1588_CLOCK</div><div class='ctx'> 	default y</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable IEEE 1588 Precision Time Protocol (PTP) support for MACB.</div><div class='ctx'> </div><div class='ctx'> config MACB_PCI</div><div class='ctx'> 	tristate "Cadence PCI MACB/GEM support"</div><div class='del'>-	depends on MACB &amp;&amp; PCI &amp;&amp; COMMON_CLK</div><div class='del'>-	---help---</div><div class='add'>+	depends on MACB &amp;&amp; PCI</div><div class='add'>+	help</div><div class='ctx'> 	  This is PCI wrapper for MACB driver.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here: the module</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h<br/>index 00ee5e8e0ff0..87414a2ddf6e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cadence/macb.h</a></div><div class='hunk'>@@ -1,23 +1,19 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Atmel MACB Ethernet Controller driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004-2006 Atmel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _MACB_H</div><div class='ctx'> #define _MACB_H</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='ctx'> #include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-</div><div class='del'>-#if defined(CONFIG_ARCH_DMA_ADDR_T_64BIT) || defined(CONFIG_MACB_USE_HWSTAMP)</div><div class='del'>-#define MACB_EXT_DESC</div><div class='del'>-#endif</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define MACB_GREGS_NBR 16</div><div class='ctx'> #define MACB_GREGS_VERSION 2</div><div class='hunk'>@@ -79,10 +75,13 @@</div><div class='ctx'> #define MACB_RBQPH		0x04D4</div><div class='ctx'> </div><div class='ctx'> /* GEM register offsets. */</div><div class='add'>+#define GEM_NCR			0x0000 /* Network Control */</div><div class='ctx'> #define GEM_NCFGR		0x0004 /* Network Config */</div><div class='ctx'> #define GEM_USRIO		0x000c /* User IO */</div><div class='ctx'> #define GEM_DMACFG		0x0010 /* DMA Configuration */</div><div class='add'>+#define GEM_PBUFRXCUT		0x0044 /* RX Partial Store and Forward */</div><div class='ctx'> #define GEM_JML			0x0048 /* Jumbo Max Length */</div><div class='add'>+#define GEM_HS_MAC_CONFIG	0x0050 /* GEM high speed config */</div><div class='ctx'> #define GEM_HRB			0x0080 /* Hash Bottom */</div><div class='ctx'> #define GEM_HRT			0x0084 /* Hash Top */</div><div class='ctx'> #define GEM_SA1B		0x0088 /* Specific1 Bottom */</div><div class='hunk'>@@ -93,6 +92,9 @@</div><div class='ctx'> #define GEM_SA3T		0x009C /* Specific3 Top */</div><div class='ctx'> #define GEM_SA4B		0x00A0 /* Specific4 Bottom */</div><div class='ctx'> #define GEM_SA4T		0x00A4 /* Specific4 Top */</div><div class='add'>+#define GEM_WOL			0x00b8 /* Wake on LAN */</div><div class='add'>+#define GEM_RXPTPUNI		0x00D4 /* PTP RX Unicast address */</div><div class='add'>+#define GEM_TXPTPUNI		0x00D8 /* PTP TX Unicast address */</div><div class='ctx'> #define GEM_EFTSH		0x00e8 /* PTP Event Frame Transmitted Seconds Register 47:32 */</div><div class='ctx'> #define GEM_EFRSH		0x00ec /* PTP Event Frame Received Seconds Register 47:32 */</div><div class='ctx'> #define GEM_PEFTSH		0x00f0 /* PTP Peer Event Frame Transmitted Seconds Register 47:32 */</div><div class='hunk'>@@ -158,6 +160,16 @@</div><div class='ctx'> #define GEM_PEFTN		0x01f4 /* PTP Peer Event Frame Tx Ns */</div><div class='ctx'> #define GEM_PEFRSL		0x01f8 /* PTP Peer Event Frame Rx Sec Low */</div><div class='ctx'> #define GEM_PEFRN		0x01fc /* PTP Peer Event Frame Rx Ns */</div><div class='add'>+#define GEM_PCSCNTRL		0x0200 /* PCS Control */</div><div class='add'>+#define GEM_PCSSTS		0x0204 /* PCS Status */</div><div class='add'>+#define GEM_PCSPHYTOPID		0x0208 /* PCS PHY Top ID */</div><div class='add'>+#define GEM_PCSPHYBOTID		0x020c /* PCS PHY Bottom ID */</div><div class='add'>+#define GEM_PCSANADV		0x0210 /* PCS AN Advertisement */</div><div class='add'>+#define GEM_PCSANLPBASE		0x0214 /* PCS AN Link Partner Base */</div><div class='add'>+#define GEM_PCSANEXP		0x0218 /* PCS AN Expansion */</div><div class='add'>+#define GEM_PCSANNPTX		0x021c /* PCS AN Next Page TX */</div><div class='add'>+#define GEM_PCSANNPLP		0x0220 /* PCS AN Next Page LP */</div><div class='add'>+#define GEM_PCSANEXTSTS		0x023c /* PCS AN Extended Status */</div><div class='ctx'> #define GEM_DCFG1		0x0280 /* Design Config 1 */</div><div class='ctx'> #define GEM_DCFG2		0x0284 /* Design Config 2 */</div><div class='ctx'> #define GEM_DCFG3		0x0288 /* Design Config 3 */</div><div class='hunk'>@@ -167,6 +179,16 @@</div><div class='ctx'> #define GEM_DCFG7		0x0298 /* Design Config 7 */</div><div class='ctx'> #define GEM_DCFG8		0x029C /* Design Config 8 */</div><div class='ctx'> #define GEM_DCFG10		0x02A4 /* Design Config 10 */</div><div class='add'>+#define GEM_DCFG12		0x02AC /* Design Config 12 */</div><div class='add'>+#define GEM_ENST_START_TIME_Q0	0x0800 /* ENST Q0 start time */</div><div class='add'>+#define GEM_ENST_START_TIME_Q1	0x0804 /* ENST Q1 start time */</div><div class='add'>+#define GEM_ENST_ON_TIME_Q0	0x0820 /* ENST Q0 on time */</div><div class='add'>+#define GEM_ENST_ON_TIME_Q1	0x0824 /* ENST Q1 on time */</div><div class='add'>+#define GEM_ENST_OFF_TIME_Q0	0x0840 /* ENST Q0 off time */</div><div class='add'>+#define GEM_ENST_OFF_TIME_Q1	0x0844 /* ENST Q1 off time */</div><div class='add'>+#define GEM_ENST_CONTROL	0x0880 /* ENST control register */</div><div class='add'>+#define GEM_USX_CONTROL		0x0A80 /* High speed PCS control register */</div><div class='add'>+#define GEM_USX_STATUS		0x0A88 /* High speed PCS status register */</div><div class='ctx'> </div><div class='ctx'> #define GEM_TXBDCTRL	0x04cc /* TX Buffer Descriptor control register */</div><div class='ctx'> #define GEM_RXBDCTRL	0x04d0 /* RX Buffer Descriptor control register */</div><div class='hunk'>@@ -194,14 +216,19 @@</div><div class='ctx'> </div><div class='ctx'> #define GEM_ISR(hw_q)		(0x0400 + ((hw_q) &lt;&lt; 2))</div><div class='ctx'> #define GEM_TBQP(hw_q)		(0x0440 + ((hw_q) &lt;&lt; 2))</div><div class='del'>-#define GEM_TBQPH(hw_q)		(0x04C8)</div><div class='ctx'> #define GEM_RBQP(hw_q)		(0x0480 + ((hw_q) &lt;&lt; 2))</div><div class='ctx'> #define GEM_RBQS(hw_q)		(0x04A0 + ((hw_q) &lt;&lt; 2))</div><div class='del'>-#define GEM_RBQPH(hw_q)		(0x04D4)</div><div class='ctx'> #define GEM_IER(hw_q)		(0x0600 + ((hw_q) &lt;&lt; 2))</div><div class='ctx'> #define GEM_IDR(hw_q)		(0x0620 + ((hw_q) &lt;&lt; 2))</div><div class='ctx'> #define GEM_IMR(hw_q)		(0x0640 + ((hw_q) &lt;&lt; 2))</div><div class='ctx'> </div><div class='add'>+#define GEM_ENST_START_TIME(hw_q)	(0x0800 + ((hw_q) &lt;&lt; 2))</div><div class='add'>+#define GEM_ENST_ON_TIME(hw_q)		(0x0820 + ((hw_q) &lt;&lt; 2))</div><div class='add'>+#define GEM_ENST_OFF_TIME(hw_q)		(0x0840 + ((hw_q) &lt;&lt; 2))</div><div class='add'>+</div><div class='add'>+/* Bitfields in ENST_CONTROL */</div><div class='add'>+#define GEM_ENST_DISABLE_QUEUE_OFFSET	16</div><div class='add'>+</div><div class='ctx'> /* Bitfields in NCR */</div><div class='ctx'> #define MACB_LB_OFFSET		0 /* reserved */</div><div class='ctx'> #define MACB_LB_SIZE		1</div><div class='hunk'>@@ -229,9 +256,13 @@</div><div class='ctx'> #define MACB_NCR_TPF_SIZE	1</div><div class='ctx'> #define MACB_TZQ_OFFSET		12 /* Transmit zero quantum pause frame */</div><div class='ctx'> #define MACB_TZQ_SIZE		1</div><div class='del'>-#define MACB_SRTSM_OFFSET	15</div><div class='del'>-#define MACB_OSSMODE_OFFSET 24 /* Enable One Step Synchro Mode */</div><div class='add'>+#define MACB_SRTSM_OFFSET	15 /* Store Receive Timestamp to Memory */</div><div class='add'>+#define MACB_PTPUNI_OFFSET	20 /* PTP Unicast packet enable */</div><div class='add'>+#define MACB_PTPUNI_SIZE	1</div><div class='add'>+#define MACB_OSSMODE_OFFSET	24 /* Enable One Step Synchro Mode */</div><div class='ctx'> #define MACB_OSSMODE_SIZE	1</div><div class='add'>+#define MACB_MIIONRGMII_OFFSET	28 /* MII Usage on RGMII Interface */</div><div class='add'>+#define MACB_MIIONRGMII_SIZE	1</div><div class='ctx'> </div><div class='ctx'> /* Bitfields in NCFGR */</div><div class='ctx'> #define MACB_SPD_OFFSET		0 /* Speed */</div><div class='hunk'>@@ -273,11 +304,19 @@</div><div class='ctx'> #define MACB_IRXFCS_OFFSET	19</div><div class='ctx'> #define MACB_IRXFCS_SIZE	1</div><div class='ctx'> </div><div class='add'>+/* GEM specific NCR bitfields. */</div><div class='add'>+#define GEM_ENABLE_HS_MAC_OFFSET	31</div><div class='add'>+#define GEM_ENABLE_HS_MAC_SIZE		1</div><div class='add'>+</div><div class='ctx'> /* GEM specific NCFGR bitfields. */</div><div class='add'>+#define GEM_FD_OFFSET		1 /* Full duplex */</div><div class='add'>+#define GEM_FD_SIZE		1</div><div class='ctx'> #define GEM_GBE_OFFSET		10 /* Gigabit mode enable */</div><div class='ctx'> #define GEM_GBE_SIZE		1</div><div class='ctx'> #define GEM_PCSSEL_OFFSET	11</div><div class='ctx'> #define GEM_PCSSEL_SIZE		1</div><div class='add'>+#define GEM_PAE_OFFSET		13 /* Pause enable */</div><div class='add'>+#define GEM_PAE_SIZE		1</div><div class='ctx'> #define GEM_CLK_OFFSET		18 /* MDC clock division */</div><div class='ctx'> #define GEM_CLK_SIZE		3</div><div class='ctx'> #define GEM_DBW_OFFSET		21 /* Data bus width */</div><div class='hunk'>@@ -318,6 +357,10 @@</div><div class='ctx'> #define GEM_ADDR64_SIZE		1</div><div class='ctx'> </div><div class='ctx'> </div><div class='add'>+/* Bitfields in PBUFRXCUT */</div><div class='add'>+#define GEM_ENCUTTHRU_OFFSET	31 /* Enable RX partial store and forward */</div><div class='add'>+#define GEM_ENCUTTHRU_SIZE	1</div><div class='add'>+</div><div class='ctx'> /* Bitfields in NSR */</div><div class='ctx'> #define MACB_NSR_LINK_OFFSET	0 /* pcs_link_state */</div><div class='ctx'> #define MACB_NSR_LINK_SIZE	1</div><div class='hunk'>@@ -367,6 +410,8 @@</div><div class='ctx'> #define MACB_ISR_RLE_SIZE	1</div><div class='ctx'> #define MACB_TXERR_OFFSET	6 /* EN TX frame corrupt from error interrupt */</div><div class='ctx'> #define MACB_TXERR_SIZE		1</div><div class='add'>+#define MACB_RM9200_TBRE_OFFSET	6 /* EN may send new frame interrupt (RM9200) */</div><div class='add'>+#define MACB_RM9200_TBRE_SIZE	1</div><div class='ctx'> #define MACB_TCOMP_OFFSET	7 /* Enable transmit complete interrupt */</div><div class='ctx'> #define MACB_TCOMP_SIZE		1</div><div class='ctx'> #define MACB_ISR_LINK_OFFSET	9 /* Enable link change interrupt */</div><div class='hunk'>@@ -399,6 +444,8 @@</div><div class='ctx'> #define MACB_PDRSFT_SIZE	1</div><div class='ctx'> #define MACB_SRI_OFFSET		26 /* TSU Seconds Register Increment */</div><div class='ctx'> #define MACB_SRI_SIZE		1</div><div class='add'>+#define GEM_WOL_OFFSET		28 /* Enable wake-on-lan interrupt */</div><div class='add'>+#define GEM_WOL_SIZE		1</div><div class='ctx'> </div><div class='ctx'> /* Timer increment fields */</div><div class='ctx'> #define MACB_TI_CNS_OFFSET	0</div><div class='hunk'>@@ -458,11 +505,21 @@</div><div class='ctx'> #define MACB_REV_OFFSET				0</div><div class='ctx'> #define MACB_REV_SIZE				16</div><div class='ctx'> </div><div class='add'>+/* Bitfield in HS_MAC_CONFIG */</div><div class='add'>+#define GEM_HS_MAC_SPEED_OFFSET			0</div><div class='add'>+#define GEM_HS_MAC_SPEED_SIZE			3</div><div class='add'>+</div><div class='add'>+/* Bitfields in PCSCNTRL */</div><div class='add'>+#define GEM_PCSAUTONEG_OFFSET			12</div><div class='add'>+#define GEM_PCSAUTONEG_SIZE			1</div><div class='add'>+</div><div class='ctx'> /* Bitfields in DCFG1. */</div><div class='ctx'> #define GEM_IRQCOR_OFFSET			23</div><div class='ctx'> #define GEM_IRQCOR_SIZE				1</div><div class='ctx'> #define GEM_DBWDEF_OFFSET			25</div><div class='ctx'> #define GEM_DBWDEF_SIZE				3</div><div class='add'>+#define GEM_NO_PCS_OFFSET			0</div><div class='add'>+#define GEM_NO_PCS_SIZE				1</div><div class='ctx'> </div><div class='ctx'> /* Bitfields in DCFG2. */</div><div class='ctx'> #define GEM_RX_PKT_BUFF_OFFSET			20</div><div class='hunk'>@@ -470,6 +527,8 @@</div><div class='ctx'> #define GEM_TX_PKT_BUFF_OFFSET			21</div><div class='ctx'> #define GEM_TX_PKT_BUFF_SIZE			1</div><div class='ctx'> </div><div class='add'>+#define GEM_RX_PBUF_ADDR_OFFSET			22</div><div class='add'>+#define GEM_RX_PBUF_ADDR_SIZE			4</div><div class='ctx'> </div><div class='ctx'> /* Bitfields in DCFG5. */</div><div class='ctx'> #define GEM_TSU_OFFSET				8</div><div class='hunk'>@@ -478,6 +537,10 @@</div><div class='ctx'> /* Bitfields in DCFG6. */</div><div class='ctx'> #define GEM_PBUF_LSO_OFFSET			27</div><div class='ctx'> #define GEM_PBUF_LSO_SIZE			1</div><div class='add'>+#define GEM_PBUF_RSC_OFFSET			26</div><div class='add'>+#define GEM_PBUF_RSC_SIZE			1</div><div class='add'>+#define GEM_PBUF_CUTTHRU_OFFSET			25</div><div class='add'>+#define GEM_PBUF_CUTTHRU_SIZE			1</div><div class='ctx'> #define GEM_DAW64_OFFSET			23</div><div class='ctx'> #define GEM_DAW64_SIZE				1</div><div class='ctx'> </div><div class='hunk'>@@ -497,9 +560,52 @@</div><div class='ctx'> #define GEM_RXBD_RDBUFF_OFFSET			8</div><div class='ctx'> #define GEM_RXBD_RDBUFF_SIZE			4</div><div class='ctx'> </div><div class='add'>+/* Bitfields in DCFG12. */</div><div class='add'>+#define GEM_HIGH_SPEED_OFFSET			26</div><div class='add'>+#define GEM_HIGH_SPEED_SIZE			1</div><div class='add'>+</div><div class='add'>+/* Bitfields in ENST_START_TIME_Qx. */</div><div class='add'>+#define GEM_START_TIME_SEC_OFFSET		30</div><div class='add'>+#define GEM_START_TIME_SEC_SIZE			2</div><div class='add'>+#define GEM_START_TIME_NSEC_OFFSET		0</div><div class='add'>+#define GEM_START_TIME_NSEC_SIZE		30</div><div class='add'>+</div><div class='add'>+/* Bitfields in ENST_ON_TIME_Qx. */</div><div class='add'>+#define GEM_ON_TIME_OFFSET			0</div><div class='add'>+#define GEM_ON_TIME_SIZE			17</div><div class='add'>+</div><div class='add'>+/* Bitfields in ENST_OFF_TIME_Qx. */</div><div class='add'>+#define GEM_OFF_TIME_OFFSET			0</div><div class='add'>+#define GEM_OFF_TIME_SIZE			17</div><div class='add'>+</div><div class='add'>+/* Hardware ENST timing registers granularity */</div><div class='add'>+#define ENST_TIME_GRANULARITY_NS		8</div><div class='add'>+</div><div class='add'>+/* Bitfields in USX_CONTROL. */</div><div class='add'>+#define GEM_USX_CTRL_SPEED_OFFSET		14</div><div class='add'>+#define GEM_USX_CTRL_SPEED_SIZE			3</div><div class='add'>+#define GEM_SERDES_RATE_OFFSET			12</div><div class='add'>+#define GEM_SERDES_RATE_SIZE			2</div><div class='add'>+#define GEM_RX_SCR_BYPASS_OFFSET		9</div><div class='add'>+#define GEM_RX_SCR_BYPASS_SIZE			1</div><div class='add'>+#define GEM_TX_SCR_BYPASS_OFFSET		8</div><div class='add'>+#define GEM_TX_SCR_BYPASS_SIZE			1</div><div class='add'>+#define GEM_TX_EN_OFFSET			1</div><div class='add'>+#define GEM_TX_EN_SIZE				1</div><div class='add'>+#define GEM_SIGNAL_OK_OFFSET			0</div><div class='add'>+#define GEM_SIGNAL_OK_SIZE			1</div><div class='add'>+</div><div class='add'>+/* Bitfields in USX_STATUS. */</div><div class='add'>+#define GEM_USX_BLOCK_LOCK_OFFSET		0</div><div class='add'>+#define GEM_USX_BLOCK_LOCK_SIZE			1</div><div class='add'>+</div><div class='ctx'> /* Bitfields in TISUBN */</div><div class='ctx'> #define GEM_SUBNSINCR_OFFSET			0</div><div class='del'>-#define GEM_SUBNSINCR_SIZE			16</div><div class='add'>+#define GEM_SUBNSINCRL_OFFSET			24</div><div class='add'>+#define GEM_SUBNSINCRL_SIZE			8</div><div class='add'>+#define GEM_SUBNSINCRH_OFFSET			0</div><div class='add'>+#define GEM_SUBNSINCRH_SIZE			16</div><div class='add'>+#define GEM_SUBNSINCR_SIZE			24</div><div class='ctx'> </div><div class='ctx'> /* Bitfields in TI */</div><div class='ctx'> #define GEM_NSINCR_OFFSET			0</div><div class='hunk'>@@ -567,6 +673,10 @@</div><div class='ctx'> #define GEM_T2OFST_OFFSET			0 /* offset value */</div><div class='ctx'> #define GEM_T2OFST_SIZE				7</div><div class='ctx'> </div><div class='add'>+/* Bitfields in queue pointer registers */</div><div class='add'>+#define MACB_QUEUE_DISABLE_OFFSET		0 /* disable queue */</div><div class='add'>+#define MACB_QUEUE_DISABLE_SIZE			1</div><div class='add'>+</div><div class='ctx'> /* Offset for screener type 2 compare values (T2CMPOFST).</div><div class='ctx'>  * Note the offset is applied after the specified point,</div><div class='ctx'>  * e.g. GEM_T2COMPOFST_ETYPE denotes the EtherType field, so an offset</div><div class='hunk'>@@ -627,27 +737,48 @@</div><div class='ctx'> #define GEM_CLK_DIV48				3</div><div class='ctx'> #define GEM_CLK_DIV64				4</div><div class='ctx'> #define GEM_CLK_DIV96				5</div><div class='add'>+#define GEM_CLK_DIV128				6</div><div class='add'>+#define GEM_CLK_DIV224				7</div><div class='ctx'> </div><div class='ctx'> /* Constants for MAN register */</div><div class='del'>-#define MACB_MAN_SOF				1</div><div class='del'>-#define MACB_MAN_WRITE				1</div><div class='del'>-#define MACB_MAN_READ				2</div><div class='del'>-#define MACB_MAN_CODE				2</div><div class='add'>+#define MACB_MAN_C22_SOF			1</div><div class='add'>+#define MACB_MAN_C22_WRITE			1</div><div class='add'>+#define MACB_MAN_C22_READ			2</div><div class='add'>+#define MACB_MAN_C22_CODE			2</div><div class='add'>+</div><div class='add'>+#define MACB_MAN_C45_SOF			0</div><div class='add'>+#define MACB_MAN_C45_ADDR			0</div><div class='add'>+#define MACB_MAN_C45_WRITE			1</div><div class='add'>+#define MACB_MAN_C45_POST_READ_INCR		2</div><div class='add'>+#define MACB_MAN_C45_READ			3</div><div class='add'>+#define MACB_MAN_C45_CODE			2</div><div class='ctx'> </div><div class='ctx'> /* Capability mask bits */</div><div class='del'>-#define MACB_CAPS_ISR_CLEAR_ON_WRITE		0x00000001</div><div class='del'>-#define MACB_CAPS_USRIO_HAS_CLKEN		0x00000002</div><div class='del'>-#define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII	0x00000004</div><div class='del'>-#define MACB_CAPS_NO_GIGABIT_HALF		0x00000008</div><div class='del'>-#define MACB_CAPS_USRIO_DISABLED		0x00000010</div><div class='del'>-#define MACB_CAPS_JUMBO				0x00000020</div><div class='del'>-#define MACB_CAPS_GEM_HAS_PTP			0x00000040</div><div class='del'>-#define MACB_CAPS_BD_RD_PREFETCH		0x00000080</div><div class='del'>-#define MACB_CAPS_NEEDS_RSTONUBR		0x00000100</div><div class='del'>-#define MACB_CAPS_FIFO_MODE			0x10000000</div><div class='del'>-#define MACB_CAPS_GIGABIT_MODE_AVAILABLE	0x20000000</div><div class='del'>-#define MACB_CAPS_SG_DISABLED			0x40000000</div><div class='del'>-#define MACB_CAPS_MACB_IS_GEM			0x80000000</div><div class='add'>+#define MACB_CAPS_ISR_CLEAR_ON_WRITE		BIT(0)</div><div class='add'>+#define MACB_CAPS_USRIO_HAS_CLKEN		BIT(1)</div><div class='add'>+#define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII	BIT(2)</div><div class='add'>+#define MACB_CAPS_NO_GIGABIT_HALF		BIT(3)</div><div class='add'>+#define MACB_CAPS_USRIO_DISABLED		BIT(4)</div><div class='add'>+#define MACB_CAPS_JUMBO				BIT(5)</div><div class='add'>+#define MACB_CAPS_GEM_HAS_PTP			BIT(6)</div><div class='add'>+#define MACB_CAPS_BD_RD_PREFETCH		BIT(7)</div><div class='add'>+#define MACB_CAPS_NEEDS_RSTONUBR		BIT(8)</div><div class='add'>+#define MACB_CAPS_MIIONRGMII			BIT(9)</div><div class='add'>+#define MACB_CAPS_NEED_TSUCLK			BIT(10)</div><div class='add'>+#define MACB_CAPS_QUEUE_DISABLE			BIT(11)</div><div class='add'>+#define MACB_CAPS_QBV				BIT(12)</div><div class='add'>+#define MACB_CAPS_PCS				BIT(13)</div><div class='add'>+#define MACB_CAPS_HIGH_SPEED			BIT(14)</div><div class='add'>+#define MACB_CAPS_CLK_HW_CHG			BIT(15)</div><div class='add'>+#define MACB_CAPS_MACB_IS_EMAC			BIT(16)</div><div class='add'>+#define MACB_CAPS_FIFO_MODE			BIT(17)</div><div class='add'>+#define MACB_CAPS_GIGABIT_MODE_AVAILABLE	BIT(18)</div><div class='add'>+#define MACB_CAPS_SG_DISABLED			BIT(19)</div><div class='add'>+#define MACB_CAPS_MACB_IS_GEM			BIT(20)</div><div class='add'>+#define MACB_CAPS_DMA_64B			BIT(21)</div><div class='add'>+#define MACB_CAPS_DMA_PTP			BIT(22)</div><div class='add'>+#define MACB_CAPS_RSC				BIT(23)</div><div class='add'>+#define MACB_CAPS_NO_LSO			BIT(24)</div><div class='ctx'> </div><div class='ctx'> /* LSO settings */</div><div class='ctx'> #define MACB_LSO_UFO_ENABLE			0x01</div><div class='hunk'>@@ -690,8 +821,6 @@</div><div class='ctx'> #define gem_readl_n(port, reg, idx)		(port)-&gt;macb_reg_readl((port), GEM_##reg + idx * 4)</div><div class='ctx'> #define gem_writel_n(port, reg, idx, value)	(port)-&gt;macb_reg_writel((port), GEM_##reg + idx * 4, (value))</div><div class='ctx'> </div><div class='del'>-#define PTP_TS_BUFFER_SIZE		128 /* must be power of 2 */</div><div class='del'>-</div><div class='ctx'> /* Conditional GEM/MACB macros.  These perform the operation to the correct</div><div class='ctx'>  * register dependent on whether the device is a GEM or a MACB.  For registers</div><div class='ctx'>  * and bitfields that are common across both devices, use macb_{read,write}l</div><div class='hunk'>@@ -726,12 +855,6 @@ struct macb_dma_desc {</div><div class='ctx'> 	u32	ctrl;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#ifdef MACB_EXT_DESC</div><div class='del'>-#define HW_DMA_CAP_32B		0</div><div class='del'>-#define HW_DMA_CAP_64B		(1 &lt;&lt; 0)</div><div class='del'>-#define HW_DMA_CAP_PTP		(1 &lt;&lt; 1)</div><div class='del'>-#define HW_DMA_CAP_64B_PTP	(HW_DMA_CAP_64B | HW_DMA_CAP_PTP)</div><div class='del'>-</div><div class='ctx'> struct macb_dma_desc_64 {</div><div class='ctx'> 	u32 addrh;</div><div class='ctx'> 	u32 resvd;</div><div class='hunk'>@@ -742,12 +865,6 @@ struct macb_dma_desc_ptp {</div><div class='ctx'> 	u32	ts_2;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct gem_tx_ts {</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct macb_dma_desc_ptp desc_ptp;</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> /* DMA descriptor bitfields */</div><div class='ctx'> #define MACB_RX_USED_OFFSET			0</div><div class='ctx'> #define MACB_RX_USED_SIZE			1</div><div class='hunk'>@@ -837,6 +954,9 @@ struct gem_tx_ts {</div><div class='ctx'> /* limit RX checksum offload to TCP and UDP packets */</div><div class='ctx'> #define GEM_RX_CSUM_CHECKED_MASK		2</div><div class='ctx'> </div><div class='add'>+/* Scaled PPM fraction */</div><div class='add'>+#define PPM_FRACTION	16</div><div class='add'>+</div><div class='ctx'> /* struct macb_tx_skb - data about an skb which is being transmitted</div><div class='ctx'>  * @skb: skb currently being transmitted, only set for the last buffer</div><div class='ctx'>  *       of the frame</div><div class='hunk'>@@ -856,75 +976,73 @@ struct macb_tx_skb {</div><div class='ctx'>  * device stats by a periodic timer.</div><div class='ctx'>  */</div><div class='ctx'> struct macb_stats {</div><div class='del'>-	u32	rx_pause_frames;</div><div class='del'>-	u32	tx_ok;</div><div class='del'>-	u32	tx_single_cols;</div><div class='del'>-	u32	tx_multiple_cols;</div><div class='del'>-	u32	rx_ok;</div><div class='del'>-	u32	rx_fcs_errors;</div><div class='del'>-	u32	rx_align_errors;</div><div class='del'>-	u32	tx_deferred;</div><div class='del'>-	u32	tx_late_cols;</div><div class='del'>-	u32	tx_excessive_cols;</div><div class='del'>-	u32	tx_underruns;</div><div class='del'>-	u32	tx_carrier_errors;</div><div class='del'>-	u32	rx_resource_errors;</div><div class='del'>-	u32	rx_overruns;</div><div class='del'>-	u32	rx_symbol_errors;</div><div class='del'>-	u32	rx_oversize_pkts;</div><div class='del'>-	u32	rx_jabbers;</div><div class='del'>-	u32	rx_undersize_pkts;</div><div class='del'>-	u32	sqe_test_errors;</div><div class='del'>-	u32	rx_length_mismatch;</div><div class='del'>-	u32	tx_pause_frames;</div><div class='add'>+	u64	rx_pause_frames;</div><div class='add'>+	u64	tx_ok;</div><div class='add'>+	u64	tx_single_cols;</div><div class='add'>+	u64	tx_multiple_cols;</div><div class='add'>+	u64	rx_ok;</div><div class='add'>+	u64	rx_fcs_errors;</div><div class='add'>+	u64	rx_align_errors;</div><div class='add'>+	u64	tx_deferred;</div><div class='add'>+	u64	tx_late_cols;</div><div class='add'>+	u64	tx_excessive_cols;</div><div class='add'>+	u64	tx_underruns;</div><div class='add'>+	u64	tx_carrier_errors;</div><div class='add'>+	u64	rx_resource_errors;</div><div class='add'>+	u64	rx_overruns;</div><div class='add'>+	u64	rx_symbol_errors;</div><div class='add'>+	u64	rx_oversize_pkts;</div><div class='add'>+	u64	rx_jabbers;</div><div class='add'>+	u64	rx_undersize_pkts;</div><div class='add'>+	u64	sqe_test_errors;</div><div class='add'>+	u64	rx_length_mismatch;</div><div class='add'>+	u64	tx_pause_frames;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct gem_stats {</div><div class='del'>-	u32	tx_octets_31_0;</div><div class='del'>-	u32	tx_octets_47_32;</div><div class='del'>-	u32	tx_frames;</div><div class='del'>-	u32	tx_broadcast_frames;</div><div class='del'>-	u32	tx_multicast_frames;</div><div class='del'>-	u32	tx_pause_frames;</div><div class='del'>-	u32	tx_64_byte_frames;</div><div class='del'>-	u32	tx_65_127_byte_frames;</div><div class='del'>-	u32	tx_128_255_byte_frames;</div><div class='del'>-	u32	tx_256_511_byte_frames;</div><div class='del'>-	u32	tx_512_1023_byte_frames;</div><div class='del'>-	u32	tx_1024_1518_byte_frames;</div><div class='del'>-	u32	tx_greater_than_1518_byte_frames;</div><div class='del'>-	u32	tx_underrun;</div><div class='del'>-	u32	tx_single_collision_frames;</div><div class='del'>-	u32	tx_multiple_collision_frames;</div><div class='del'>-	u32	tx_excessive_collisions;</div><div class='del'>-	u32	tx_late_collisions;</div><div class='del'>-	u32	tx_deferred_frames;</div><div class='del'>-	u32	tx_carrier_sense_errors;</div><div class='del'>-	u32	rx_octets_31_0;</div><div class='del'>-	u32	rx_octets_47_32;</div><div class='del'>-	u32	rx_frames;</div><div class='del'>-	u32	rx_broadcast_frames;</div><div class='del'>-	u32	rx_multicast_frames;</div><div class='del'>-	u32	rx_pause_frames;</div><div class='del'>-	u32	rx_64_byte_frames;</div><div class='del'>-	u32	rx_65_127_byte_frames;</div><div class='del'>-	u32	rx_128_255_byte_frames;</div><div class='del'>-	u32	rx_256_511_byte_frames;</div><div class='del'>-	u32	rx_512_1023_byte_frames;</div><div class='del'>-	u32	rx_1024_1518_byte_frames;</div><div class='del'>-	u32	rx_greater_than_1518_byte_frames;</div><div class='del'>-	u32	rx_undersized_frames;</div><div class='del'>-	u32	rx_oversize_frames;</div><div class='del'>-	u32	rx_jabbers;</div><div class='del'>-	u32	rx_frame_check_sequence_errors;</div><div class='del'>-	u32	rx_length_field_frame_errors;</div><div class='del'>-	u32	rx_symbol_errors;</div><div class='del'>-	u32	rx_alignment_errors;</div><div class='del'>-	u32	rx_resource_errors;</div><div class='del'>-	u32	rx_overruns;</div><div class='del'>-	u32	rx_ip_header_checksum_errors;</div><div class='del'>-	u32	rx_tcp_checksum_errors;</div><div class='del'>-	u32	rx_udp_checksum_errors;</div><div class='add'>+	u64	tx_octets;</div><div class='add'>+	u64	tx_frames;</div><div class='add'>+	u64	tx_broadcast_frames;</div><div class='add'>+	u64	tx_multicast_frames;</div><div class='add'>+	u64	tx_pause_frames;</div><div class='add'>+	u64	tx_64_byte_frames;</div><div class='add'>+	u64	tx_65_127_byte_frames;</div><div class='add'>+	u64	tx_128_255_byte_frames;</div><div class='add'>+	u64	tx_256_511_byte_frames;</div><div class='add'>+	u64	tx_512_1023_byte_frames;</div><div class='add'>+	u64	tx_1024_1518_byte_frames;</div><div class='add'>+	u64	tx_greater_than_1518_byte_frames;</div><div class='add'>+	u64	tx_underrun;</div><div class='add'>+	u64	tx_single_collision_frames;</div><div class='add'>+	u64	tx_multiple_collision_frames;</div><div class='add'>+	u64	tx_excessive_collisions;</div><div class='add'>+	u64	tx_late_collisions;</div><div class='add'>+	u64	tx_deferred_frames;</div><div class='add'>+	u64	tx_carrier_sense_errors;</div><div class='add'>+	u64	rx_octets;</div><div class='add'>+	u64	rx_frames;</div><div class='add'>+	u64	rx_broadcast_frames;</div><div class='add'>+	u64	rx_multicast_frames;</div><div class='add'>+	u64	rx_pause_frames;</div><div class='add'>+	u64	rx_64_byte_frames;</div><div class='add'>+	u64	rx_65_127_byte_frames;</div><div class='add'>+	u64	rx_128_255_byte_frames;</div><div class='add'>+	u64	rx_256_511_byte_frames;</div><div class='add'>+	u64	rx_512_1023_byte_frames;</div><div class='add'>+	u64	rx_1024_1518_byte_frames;</div><div class='add'>+	u64	rx_greater_than_1518_byte_frames;</div><div class='add'>+	u64	rx_undersized_frames;</div><div class='add'>+	u64	rx_oversize_frames;</div><div class='add'>+	u64	rx_jabbers;</div><div class='add'>+	u64	rx_frame_check_sequence_errors;</div><div class='add'>+	u64	rx_length_field_frame_errors;</div><div class='add'>+	u64	rx_symbol_errors;</div><div class='add'>+	u64	rx_alignment_errors;</div><div class='add'>+	u64	rx_resource_errors;</div><div class='add'>+	u64	rx_overruns;</div><div class='add'>+	u64	rx_ip_header_checksum_errors;</div><div class='add'>+	u64	rx_tcp_checksum_errors;</div><div class='add'>+	u64	rx_udp_checksum_errors;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Describes the name and offset of an individual statistic register, as</div><div class='hunk'>@@ -932,7 +1050,7 @@ struct gem_stats {</div><div class='ctx'>  * this register should contribute to.</div><div class='ctx'>  */</div><div class='ctx'> struct gem_statistic {</div><div class='del'>-	char stat_string[ETH_GSTRING_LEN];</div><div class='add'>+	char stat_string[ETH_GSTRING_LEN] __nonstring;</div><div class='ctx'> 	int offset;</div><div class='ctx'> 	u32 stat_bits;</div><div class='ctx'> };</div><div class='hunk'>@@ -1063,7 +1181,8 @@ struct macb_or_gem_ops {</div><div class='ctx'> 	int	(*mog_alloc_rx_buffers)(struct macb *bp);</div><div class='ctx'> 	void	(*mog_free_rx_buffers)(struct macb *bp);</div><div class='ctx'> 	void	(*mog_init_rings)(struct macb *bp);</div><div class='del'>-	int	(*mog_rx)(struct macb_queue *queue, int budget);</div><div class='add'>+	int	(*mog_rx)(struct macb_queue *queue, struct napi_struct *napi,</div><div class='add'>+			  int budget);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* MACB-PTP interface: adapt to platform needs. */</div><div class='hunk'>@@ -1073,11 +1192,12 @@ struct macb_ptp_info {</div><div class='ctx'> 	s32 (*get_ptp_max_adj)(void);</div><div class='ctx'> 	unsigned int (*get_tsu_rate)(struct macb *bp);</div><div class='ctx'> 	int (*get_ts_info)(struct net_device *dev,</div><div class='del'>-			   struct ethtool_ts_info *info);</div><div class='add'>+			   struct kernel_ethtool_ts_info *info);</div><div class='ctx'> 	int (*get_hwtst)(struct net_device *netdev,</div><div class='del'>-			 struct ifreq *ifr);</div><div class='add'>+			 struct kernel_hwtstamp_config *tstamp_config);</div><div class='ctx'> 	int (*set_hwtst)(struct net_device *netdev,</div><div class='del'>-			 struct ifreq *ifr, int cmd);</div><div class='add'>+			 struct kernel_hwtstamp_config *tstamp_config,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct macb_pm_data {</div><div class='hunk'>@@ -1085,6 +1205,14 @@ struct macb_pm_data {</div><div class='ctx'> 	u32 usrio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct macb_usrio_config {</div><div class='add'>+	u32 mii;</div><div class='add'>+	u32 rmii;</div><div class='add'>+	u32 rgmii;</div><div class='add'>+	u32 refclk;</div><div class='add'>+	u32 hdfctlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct macb_config {</div><div class='ctx'> 	u32			caps;</div><div class='ctx'> 	unsigned int		dma_burst_length;</div><div class='hunk'>@@ -1092,7 +1220,9 @@ struct macb_config {</div><div class='ctx'> 			    struct clk **hclk, struct clk **tx_clk,</div><div class='ctx'> 			    struct clk **rx_clk, struct clk **tsu_clk);</div><div class='ctx'> 	int	(*init)(struct platform_device *pdev);</div><div class='add'>+	unsigned int		max_tx_length;</div><div class='ctx'> 	int	jumbo_max_len;</div><div class='add'>+	const struct macb_usrio_config *usrio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct tsu_incr {</div><div class='hunk'>@@ -1109,16 +1239,23 @@ struct macb_queue {</div><div class='ctx'> 	unsigned int		IDR;</div><div class='ctx'> 	unsigned int		IMR;</div><div class='ctx'> 	unsigned int		TBQP;</div><div class='del'>-	unsigned int		TBQPH;</div><div class='ctx'> 	unsigned int		RBQS;</div><div class='ctx'> 	unsigned int		RBQP;</div><div class='del'>-	unsigned int		RBQPH;</div><div class='ctx'> </div><div class='add'>+	/* ENST register offsets for this queue */</div><div class='add'>+	unsigned int		ENST_START_TIME;</div><div class='add'>+	unsigned int		ENST_ON_TIME;</div><div class='add'>+	unsigned int		ENST_OFF_TIME;</div><div class='add'>+</div><div class='add'>+	/* Lock to protect tx_head and tx_tail */</div><div class='add'>+	spinlock_t		tx_ptr_lock;</div><div class='ctx'> 	unsigned int		tx_head, tx_tail;</div><div class='ctx'> 	struct macb_dma_desc	*tx_ring;</div><div class='ctx'> 	struct macb_tx_skb	*tx_skb;</div><div class='ctx'> 	dma_addr_t		tx_ring_dma;</div><div class='ctx'> 	struct work_struct	tx_error_task;</div><div class='add'>+	bool			txubr_pending;</div><div class='add'>+	struct napi_struct	napi_tx;</div><div class='ctx'> </div><div class='ctx'> 	dma_addr_t		rx_ring_dma;</div><div class='ctx'> 	dma_addr_t		rx_buffers_dma;</div><div class='hunk'>@@ -1127,14 +1264,8 @@ struct macb_queue {</div><div class='ctx'> 	struct macb_dma_desc	*rx_ring;</div><div class='ctx'> 	struct sk_buff		**rx_skbuff;</div><div class='ctx'> 	void			*rx_buffers;</div><div class='del'>-	struct napi_struct	napi;</div><div class='add'>+	struct napi_struct	napi_rx;</div><div class='ctx'> 	struct queue_stats stats;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_MACB_USE_HWSTAMP</div><div class='del'>-	struct work_struct	tx_ts_task;</div><div class='del'>-	unsigned int		tx_ts_head, tx_ts_tail;</div><div class='del'>-	struct gem_tx_ts	tx_timestamps[PTP_TS_BUFFER_SIZE];</div><div class='del'>-#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ethtool_rx_fs_item {</div><div class='hunk'>@@ -1155,13 +1286,14 @@ struct macb {</div><div class='ctx'> 	u32	(*macb_reg_readl)(struct macb *bp, int offset);</div><div class='ctx'> 	void	(*macb_reg_writel)(struct macb *bp, int offset, u32 value);</div><div class='ctx'> </div><div class='add'>+	struct macb_dma_desc	*rx_ring_tieoff;</div><div class='add'>+	dma_addr_t		rx_ring_tieoff_dma;</div><div class='ctx'> 	size_t			rx_buffer_size;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		rx_ring_size;</div><div class='ctx'> 	unsigned int		tx_ring_size;</div><div class='ctx'> </div><div class='ctx'> 	unsigned int		num_queues;</div><div class='del'>-	unsigned int		queue_mask;</div><div class='ctx'> 	struct macb_queue	queues[MACB_MAX_QUEUES];</div><div class='ctx'> </div><div class='ctx'> 	spinlock_t		lock;</div><div class='hunk'>@@ -1172,6 +1304,8 @@ struct macb {</div><div class='ctx'> 	struct clk		*rx_clk;</div><div class='ctx'> 	struct clk		*tsu_clk;</div><div class='ctx'> 	struct net_device	*dev;</div><div class='add'>+	/* Protects hw_stats and ethtool_stats */</div><div class='add'>+	spinlock_t		stats_lock;</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct macb_stats	macb;</div><div class='ctx'> 		struct gem_stats	gem;</div><div class='hunk'>@@ -1180,20 +1314,18 @@ struct macb {</div><div class='ctx'> 	struct macb_or_gem_ops	macbgem_ops;</div><div class='ctx'> </div><div class='ctx'> 	struct mii_bus		*mii_bus;</div><div class='del'>-	struct device_node	*phy_node;</div><div class='del'>-	int 			link;</div><div class='del'>-	int 			speed;</div><div class='del'>-	int 			duplex;</div><div class='add'>+	struct phylink		*phylink;</div><div class='add'>+	struct phylink_config	phylink_config;</div><div class='add'>+	struct phylink_pcs	phylink_usx_pcs;</div><div class='add'>+	struct phylink_pcs	phylink_sgmii_pcs;</div><div class='ctx'> </div><div class='ctx'> 	u32			caps;</div><div class='ctx'> 	unsigned int		dma_burst_length;</div><div class='ctx'> </div><div class='ctx'> 	phy_interface_t		phy_interface;</div><div class='ctx'> </div><div class='del'>-	/* AT91RM9200 transmit */</div><div class='del'>-	struct sk_buff *skb;			/* holds skb until xmit interrupt completes */</div><div class='del'>-	dma_addr_t skb_physaddr;		/* phys addr from pci_map_single */</div><div class='del'>-	int skb_length;				/* saved skb length for pci_unmap_single */</div><div class='add'>+	/* AT91RM9200 transmit queue (1 on wire + 1 queued) */</div><div class='add'>+	struct macb_tx_skb	rm9200_txq[2];</div><div class='ctx'> 	unsigned int		max_tx_length;</div><div class='ctx'> </div><div class='ctx'> 	u64			ethtool_stats[GEM_STATS_LEN + QUEUE_STATS_LEN * MACB_MAX_QUEUES];</div><div class='hunk'>@@ -1202,24 +1334,28 @@ struct macb {</div><div class='ctx'> 	unsigned int		jumbo_max_len;</div><div class='ctx'> </div><div class='ctx'> 	u32			wol;</div><div class='add'>+	u32			wolopts;</div><div class='add'>+</div><div class='add'>+	/* holds value of rx watermark value for pbuf_rxcutthru register */</div><div class='add'>+	u32			rx_watermark;</div><div class='ctx'> </div><div class='ctx'> 	struct macb_ptp_info	*ptp_info;	/* macb-ptp interface */</div><div class='del'>-#ifdef MACB_EXT_DESC</div><div class='del'>-	uint8_t hw_dma_cap;</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+	struct phy		*phy;</div><div class='add'>+</div><div class='ctx'> 	spinlock_t tsu_clk_lock; /* gem tsu clock locking */</div><div class='ctx'> 	unsigned int tsu_rate;</div><div class='ctx'> 	struct ptp_clock *ptp_clock;</div><div class='ctx'> 	struct ptp_clock_info ptp_clock_info;</div><div class='ctx'> 	struct tsu_incr tsu_incr;</div><div class='del'>-	struct hwtstamp_config tstamp_config;</div><div class='add'>+	struct kernel_hwtstamp_config tstamp_config;</div><div class='ctx'> </div><div class='ctx'> 	/* RX queue filer rule set*/</div><div class='ctx'> 	struct ethtool_rx_fs_list rx_fs_list;</div><div class='ctx'> 	spinlock_t rx_fs_lock;</div><div class='ctx'> 	unsigned int max_tuples;</div><div class='ctx'> </div><div class='del'>-	struct tasklet_struct	hresp_err_tasklet;</div><div class='add'>+	struct work_struct	hresp_err_bh_work;</div><div class='ctx'> </div><div class='ctx'> 	int	rx_bd_rd_prefetch;</div><div class='ctx'> 	int	tx_bd_rd_prefetch;</div><div class='hunk'>@@ -1227,6 +1363,7 @@ struct macb {</div><div class='ctx'> 	u32	rx_intr_mask;</div><div class='ctx'> </div><div class='ctx'> 	struct macb_pm_data pm_data;</div><div class='add'>+	const struct macb_usrio_config *usrio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_MACB_USE_HWSTAMP</div><div class='hunk'>@@ -1243,14 +1380,14 @@ enum macb_bd_control {</div><div class='ctx'> </div><div class='ctx'> void gem_ptp_init(struct net_device *ndev);</div><div class='ctx'> void gem_ptp_remove(struct net_device *ndev);</div><div class='del'>-int gem_ptp_txstamp(struct macb_queue *queue, struct sk_buff *skb, struct macb_dma_desc *des);</div><div class='add'>+void gem_ptp_txstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc);</div><div class='ctx'> void gem_ptp_rxstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc);</div><div class='del'>-static inline int gem_ptp_do_txstamp(struct macb_queue *queue, struct sk_buff *skb, struct macb_dma_desc *desc)</div><div class='add'>+static inline void gem_ptp_do_txstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	if (queue-&gt;bp-&gt;tstamp_config.tx_type == TSTAMP_DISABLED)</div><div class='del'>-		return -ENOTSUPP;</div><div class='add'>+	if (bp-&gt;tstamp_config.tx_type == TSTAMP_DISABLED)</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='del'>-	return gem_ptp_txstamp(queue, skb, desc);</div><div class='add'>+	gem_ptp_txstamp(bp, skb, desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void gem_ptp_do_rxstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc)</div><div class='hunk'>@@ -1260,17 +1397,17 @@ static inline void gem_ptp_do_rxstamp(struct macb *bp, struct sk_buff *skb, stru</div><div class='ctx'> </div><div class='ctx'> 	gem_ptp_rxstamp(bp, skb, desc);</div><div class='ctx'> }</div><div class='del'>-int gem_get_hwtst(struct net_device *dev, struct ifreq *rq);</div><div class='del'>-int gem_set_hwtst(struct net_device *dev, struct ifreq *ifr, int cmd);</div><div class='add'>+</div><div class='add'>+int gem_get_hwtst(struct net_device *dev,</div><div class='add'>+		  struct kernel_hwtstamp_config *tstamp_config);</div><div class='add'>+int gem_set_hwtst(struct net_device *dev,</div><div class='add'>+		  struct kernel_hwtstamp_config *tstamp_config,</div><div class='add'>+		  struct netlink_ext_ack *extack);</div><div class='ctx'> #else</div><div class='ctx'> static inline void gem_ptp_init(struct net_device *ndev) { }</div><div class='ctx'> static inline void gem_ptp_remove(struct net_device *ndev) { }</div><div class='ctx'> </div><div class='del'>-static inline int gem_ptp_do_txstamp(struct macb_queue *queue, struct sk_buff *skb, struct macb_dma_desc *desc)</div><div class='del'>-{</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='add'>+static inline void gem_ptp_do_txstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc) { }</div><div class='ctx'> static inline void gem_ptp_do_rxstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc) { }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -1281,7 +1418,59 @@ static inline bool macb_is_gem(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> static inline bool gem_has_ptp(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	return !!(bp-&gt;caps &amp; MACB_CAPS_GEM_HAS_PTP);</div><div class='add'>+	return IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) &amp;&amp; (bp-&gt;caps &amp; MACB_CAPS_GEM_HAS_PTP);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ENST Helper functions */</div><div class='add'>+static inline u64 enst_ns_to_hw_units(size_t ns, u32 speed_mbps)</div><div class='add'>+{</div><div class='add'>+	return DIV_ROUND_UP((ns) * (speed_mbps),</div><div class='add'>+			    (ENST_TIME_GRANULARITY_NS * 1000));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u64 enst_max_hw_interval(u32 speed_mbps)</div><div class='add'>+{</div><div class='add'>+	return DIV_ROUND_UP(GENMASK(GEM_ON_TIME_SIZE - 1, 0) *</div><div class='add'>+			    ENST_TIME_GRANULARITY_NS * 1000, (speed_mbps));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool macb_dma64(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &amp;&amp;</div><div class='add'>+	       bp-&gt;caps &amp; MACB_CAPS_DMA_64B;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool macb_dma_ptp(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	return IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) &amp;&amp;</div><div class='add'>+	       bp-&gt;caps &amp; MACB_CAPS_DMA_PTP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct macb_platform_data - platform data for MACB Ethernet used for PCI registration</div><div class='add'>+ * @pclk:		platform clock</div><div class='add'>+ * @hclk:		AHB clock</div><div class='add'>+ */</div><div class='add'>+struct macb_platform_data {</div><div class='add'>+	struct clk	*pclk;</div><div class='add'>+	struct clk	*hclk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct macb_queue_enst_config - Configuration for Enhanced Scheduled Traffic</div><div class='add'>+ * @start_time_mask:  Bitmask representing the start time for the queue</div><div class='add'>+ * @on_time_bytes:    "on" time nsec expressed in bytes</div><div class='add'>+ * @off_time_bytes:   "off" time nsec expressed in bytes</div><div class='add'>+ * @queue_id:         Identifier for the queue</div><div class='add'>+ *</div><div class='add'>+ * This structure holds the configuration parameters for an ENST queue,</div><div class='add'>+ * used to control time-based transmission scheduling in the MACB driver.</div><div class='add'>+ */</div><div class='add'>+struct macb_queue_enst_config {</div><div class='add'>+	u32 start_time_mask;</div><div class='add'>+	u32 on_time_bytes;</div><div class='add'>+	u32 off_time_bytes;</div><div class='add'>+	u8 queue_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* _MACB_H */</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c<br/>index f825e3960540..e461f5072884 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cadence/macb_main.c</a></div><div class='hunk'>@@ -1,59 +1,61 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Cadence MACB/GEM Ethernet Controller driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2004-2006 Atmel Corporation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+#include &lt;linux/circ_buf.h&gt;</div><div class='add'>+#include &lt;linux/clk-provider.h&gt;</div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/circ_buf.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/firmware/xlnx-zynqmp.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/io.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/io.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/moduleparam.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/macb.h&gt;</div><div class='del'>-#include &lt;linux/platform_device.h&gt;</div><div class='del'>-#include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='del'>-#include &lt;linux/of_gpio.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/ip.h&gt;</div><div class='del'>-#include &lt;linux/udp.h&gt;</div><div class='del'>-#include &lt;linux/tcp.h&gt;</div><div class='del'>-#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/pm_runtime.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='add'>+#include &lt;linux/slab.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+#include &lt;linux/udp.h&gt;</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='ctx'> #include "macb.h"</div><div class='ctx'> </div><div class='add'>+/* This structure is only used for MACB on SiFive FU540 devices */</div><div class='add'>+struct sifive_fu540_macb_mgmt {</div><div class='add'>+	void __iomem *reg;</div><div class='add'>+	unsigned long rate;</div><div class='add'>+	struct clk_hw hw;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define MACB_RX_BUFFER_SIZE	128</div><div class='ctx'> #define RX_BUFFER_MULTIPLE	64  /* bytes */</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_RX_RING_SIZE	512 /* must be power of 2 */</div><div class='ctx'> #define MIN_RX_RING_SIZE	64</div><div class='ctx'> #define MAX_RX_RING_SIZE	8192</div><div class='del'>-#define RX_RING_BYTES(bp)	(macb_dma_desc_get_size(bp)	\</div><div class='del'>-				 * (bp)-&gt;rx_ring_size)</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_TX_RING_SIZE	512 /* must be power of 2 */</div><div class='ctx'> #define MIN_TX_RING_SIZE	64</div><div class='ctx'> #define MAX_TX_RING_SIZE	4096</div><div class='del'>-#define TX_RING_BYTES(bp)	(macb_dma_desc_get_size(bp)	\</div><div class='del'>-				 * (bp)-&gt;tx_ring_size)</div><div class='ctx'> </div><div class='ctx'> /* level of occupied TX descriptors under which we wake up TX process */</div><div class='ctx'> #define MACB_TX_WAKEUP_THRESH(bp)	(3 * (bp)-&gt;tx_ring_size / 4)</div><div class='hunk'>@@ -68,19 +70,24 @@</div><div class='ctx'> /* Max length of transmit frame must be a multiple of 8 bytes */</div><div class='ctx'> #define MACB_TX_LEN_ALIGN	8</div><div class='ctx'> #define MACB_MAX_TX_LEN		((unsigned int)((1 &lt;&lt; MACB_TX_FRMLEN_SIZE) - 1) &amp; ~((unsigned int)(MACB_TX_LEN_ALIGN - 1)))</div><div class='del'>-#define GEM_MAX_TX_LEN		((unsigned int)((1 &lt;&lt; GEM_TX_FRMLEN_SIZE) - 1) &amp; ~((unsigned int)(MACB_TX_LEN_ALIGN - 1)))</div><div class='add'>+/* Limit maximum TX length as per Cadence TSO errata. This is to avoid a</div><div class='add'>+ * false amba_error in TX path from the DMA assuming there is not enough</div><div class='add'>+ * space in the SRAM (16KB) even when there is.</div><div class='add'>+ */</div><div class='add'>+#define GEM_MAX_TX_LEN		(unsigned int)(0x3FC0)</div><div class='ctx'> </div><div class='ctx'> #define GEM_MTU_MIN_SIZE	ETH_MIN_MTU</div><div class='ctx'> #define MACB_NETIF_LSO		NETIF_F_TSO</div><div class='ctx'> </div><div class='del'>-#define MACB_WOL_HAS_MAGIC_PACKET	(0x1 &lt;&lt; 0)</div><div class='del'>-#define MACB_WOL_ENABLED		(0x1 &lt;&lt; 1)</div><div class='add'>+#define MACB_WOL_ENABLED		BIT(0)</div><div class='add'>+</div><div class='add'>+#define HS_SPEED_10000M			4</div><div class='add'>+#define MACB_SERDES_RATE_10G		1</div><div class='ctx'> </div><div class='ctx'> /* Graceful stop timeouts in us. We should allow up to</div><div class='ctx'>  * 1 frame time (10 Mbits/s, full-duplex, ignoring collisions)</div><div class='ctx'>  */</div><div class='del'>-#define MACB_HALT_TIMEOUT	1230</div><div class='del'>-</div><div class='add'>+#define MACB_HALT_TIMEOUT	14000</div><div class='ctx'> #define MACB_PM_TIMEOUT  100 /* ms */</div><div class='ctx'> </div><div class='ctx'> #define MACB_MDIO_TIMEOUT	1000000 /* in usecs */</div><div class='hunk'>@@ -114,57 +121,26 @@</div><div class='ctx'>  */</div><div class='ctx'> static unsigned int macb_dma_desc_get_size(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-#ifdef MACB_EXT_DESC</div><div class='del'>-	unsigned int desc_size;</div><div class='add'>+	unsigned int desc_size = sizeof(struct macb_dma_desc);</div><div class='add'>+</div><div class='add'>+	if (macb_dma64(bp))</div><div class='add'>+		desc_size += sizeof(struct macb_dma_desc_64);</div><div class='add'>+	if (macb_dma_ptp(bp))</div><div class='add'>+		desc_size += sizeof(struct macb_dma_desc_ptp);</div><div class='ctx'> </div><div class='del'>-	switch (bp-&gt;hw_dma_cap) {</div><div class='del'>-	case HW_DMA_CAP_64B:</div><div class='del'>-		desc_size = sizeof(struct macb_dma_desc)</div><div class='del'>-			+ sizeof(struct macb_dma_desc_64);</div><div class='del'>-		break;</div><div class='del'>-	case HW_DMA_CAP_PTP:</div><div class='del'>-		desc_size = sizeof(struct macb_dma_desc)</div><div class='del'>-			+ sizeof(struct macb_dma_desc_ptp);</div><div class='del'>-		break;</div><div class='del'>-	case HW_DMA_CAP_64B_PTP:</div><div class='del'>-		desc_size = sizeof(struct macb_dma_desc)</div><div class='del'>-			+ sizeof(struct macb_dma_desc_64)</div><div class='del'>-			+ sizeof(struct macb_dma_desc_ptp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		desc_size = sizeof(struct macb_dma_desc);</div><div class='del'>-	}</div><div class='ctx'> 	return desc_size;</div><div class='del'>-#endif</div><div class='del'>-	return sizeof(struct macb_dma_desc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static unsigned int macb_adj_dma_desc_idx(struct macb *bp, unsigned int desc_idx)</div><div class='ctx'> {</div><div class='del'>-#ifdef MACB_EXT_DESC</div><div class='del'>-	switch (bp-&gt;hw_dma_cap) {</div><div class='del'>-	case HW_DMA_CAP_64B:</div><div class='del'>-	case HW_DMA_CAP_PTP:</div><div class='del'>-		desc_idx &lt;&lt;= 1;</div><div class='del'>-		break;</div><div class='del'>-	case HW_DMA_CAP_64B_PTP:</div><div class='del'>-		desc_idx *= 3;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return desc_idx;</div><div class='add'>+	return desc_idx * (1 + macb_dma64(bp) + macb_dma_ptp(bp));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='ctx'> static struct macb_dma_desc_64 *macb_64b_desc(struct macb *bp, struct macb_dma_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='del'>-		return (struct macb_dma_desc_64 *)((void *)desc + sizeof(struct macb_dma_desc));</div><div class='del'>-	return NULL;</div><div class='add'>+	return (struct macb_dma_desc_64 *)((void *)desc</div><div class='add'>+		+ sizeof(struct macb_dma_desc));</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /* Ring buffer accessors */</div><div class='ctx'> static unsigned int macb_tx_ring_wrap(struct macb *bp, unsigned int index)</div><div class='hunk'>@@ -269,11 +245,16 @@ static void macb_set_hwaddr(struct macb *bp)</div><div class='ctx'> 	u32 bottom;</div><div class='ctx'> 	u16 top;</div><div class='ctx'> </div><div class='del'>-	bottom = cpu_to_le32(*((u32 *)bp-&gt;dev-&gt;dev_addr));</div><div class='add'>+	bottom = get_unaligned_le32(bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	macb_or_gem_writel(bp, SA1B, bottom);</div><div class='del'>-	top = cpu_to_le16(*((u16 *)(bp-&gt;dev-&gt;dev_addr + 4)));</div><div class='add'>+	top = get_unaligned_le16(bp-&gt;dev-&gt;dev_addr + 4);</div><div class='ctx'> 	macb_or_gem_writel(bp, SA1T, top);</div><div class='ctx'> </div><div class='add'>+	if (gem_has_ptp(bp)) {</div><div class='add'>+		gem_writel(bp, RXPTPUNI, bottom);</div><div class='add'>+		gem_writel(bp, TXPTPUNI, bottom);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Clear unused address register sets */</div><div class='ctx'> 	macb_or_gem_writel(bp, SA2B, 0);</div><div class='ctx'> 	macb_or_gem_writel(bp, SA2T, 0);</div><div class='hunk'>@@ -303,7 +284,7 @@ static void macb_get_hwaddr(struct macb *bp)</div><div class='ctx'> 		addr[5] = (top &gt;&gt; 8) &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 		if (is_valid_ether_addr(addr)) {</div><div class='del'>-			memcpy(bp-&gt;dev-&gt;dev_addr, addr, sizeof(addr));</div><div class='add'>+			eth_hw_addr_set(bp-&gt;dev, addr);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -320,12 +301,12 @@ static int macb_mdio_wait_for_idle(struct macb *bp)</div><div class='ctx'> 				  1, MACB_MDIO_TIMEOUT);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)</div><div class='add'>+static int macb_mdio_read_c22(struct mii_bus *bus, int mii_id, int regnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = bus-&gt;priv;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	status = pm_runtime_get_sync(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	status = pm_runtime_resume_and_get(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto mdio_pm_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -333,11 +314,11 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto mdio_read_exit;</div><div class='ctx'> </div><div class='del'>-	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF)</div><div class='del'>-			      | MACB_BF(RW, MACB_MAN_READ)</div><div class='add'>+	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF)</div><div class='add'>+			      | MACB_BF(RW, MACB_MAN_C22_READ)</div><div class='ctx'> 			      | MACB_BF(PHYA, mii_id)</div><div class='ctx'> 			      | MACB_BF(REGA, regnum)</div><div class='del'>-			      | MACB_BF(CODE, MACB_MAN_CODE)));</div><div class='add'>+			      | MACB_BF(CODE, MACB_MAN_C22_CODE)));</div><div class='ctx'> </div><div class='ctx'> 	status = macb_mdio_wait_for_idle(bp);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='hunk'>@@ -346,19 +327,63 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)</div><div class='ctx'> 	status = MACB_BFEXT(DATA, macb_readl(bp, MAN));</div><div class='ctx'> </div><div class='ctx'> mdio_read_exit:</div><div class='del'>-	pm_runtime_mark_last_busy(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_put_autosuspend(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> mdio_pm_exit:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum,</div><div class='del'>-			   u16 value)</div><div class='add'>+static int macb_mdio_read_c45(struct mii_bus *bus, int mii_id, int devad,</div><div class='add'>+			      int regnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = bus-&gt;priv;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	status = pm_runtime_get_sync(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		pm_runtime_put_noidle(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+		goto mdio_pm_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = macb_mdio_wait_for_idle(bp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto mdio_read_exit;</div><div class='add'>+</div><div class='add'>+	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)</div><div class='add'>+			      | MACB_BF(RW, MACB_MAN_C45_ADDR)</div><div class='add'>+			      | MACB_BF(PHYA, mii_id)</div><div class='add'>+			      | MACB_BF(REGA, devad &amp; 0x1F)</div><div class='add'>+			      | MACB_BF(DATA, regnum &amp; 0xFFFF)</div><div class='add'>+			      | MACB_BF(CODE, MACB_MAN_C45_CODE)));</div><div class='add'>+</div><div class='add'>+	status = macb_mdio_wait_for_idle(bp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto mdio_read_exit;</div><div class='add'>+</div><div class='add'>+	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)</div><div class='add'>+			      | MACB_BF(RW, MACB_MAN_C45_READ)</div><div class='add'>+			      | MACB_BF(PHYA, mii_id)</div><div class='add'>+			      | MACB_BF(REGA, devad &amp; 0x1F)</div><div class='add'>+			      | MACB_BF(CODE, MACB_MAN_C45_CODE)));</div><div class='add'>+</div><div class='add'>+	status = macb_mdio_wait_for_idle(bp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto mdio_read_exit;</div><div class='add'>+</div><div class='add'>+	status = MACB_BFEXT(DATA, macb_readl(bp, MAN));</div><div class='add'>+</div><div class='add'>+mdio_read_exit:</div><div class='add'>+	pm_runtime_put_autosuspend(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+mdio_pm_exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_mdio_write_c22(struct mii_bus *bus, int mii_id, int regnum,</div><div class='add'>+			       u16 value)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = bus-&gt;priv;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = pm_runtime_resume_and_get(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto mdio_pm_exit;</div><div class='ctx'> </div><div class='hunk'>@@ -366,11 +391,56 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum,</div><div class='ctx'> 	if (status &lt; 0)</div><div class='ctx'> 		goto mdio_write_exit;</div><div class='ctx'> </div><div class='del'>-	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF)</div><div class='del'>-			      | MACB_BF(RW, MACB_MAN_WRITE)</div><div class='add'>+	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF)</div><div class='add'>+			      | MACB_BF(RW, MACB_MAN_C22_WRITE)</div><div class='ctx'> 			      | MACB_BF(PHYA, mii_id)</div><div class='ctx'> 			      | MACB_BF(REGA, regnum)</div><div class='del'>-			      | MACB_BF(CODE, MACB_MAN_CODE)</div><div class='add'>+			      | MACB_BF(CODE, MACB_MAN_C22_CODE)</div><div class='add'>+			      | MACB_BF(DATA, value)));</div><div class='add'>+</div><div class='add'>+	status = macb_mdio_wait_for_idle(bp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto mdio_write_exit;</div><div class='add'>+</div><div class='add'>+mdio_write_exit:</div><div class='add'>+	pm_runtime_put_autosuspend(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+mdio_pm_exit:</div><div class='add'>+	return status;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_mdio_write_c45(struct mii_bus *bus, int mii_id,</div><div class='add'>+			       int devad, int regnum,</div><div class='add'>+			       u16 value)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = bus-&gt;priv;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	status = pm_runtime_get_sync(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	if (status &lt; 0) {</div><div class='add'>+		pm_runtime_put_noidle(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+		goto mdio_pm_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	status = macb_mdio_wait_for_idle(bp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto mdio_write_exit;</div><div class='add'>+</div><div class='add'>+	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)</div><div class='add'>+			      | MACB_BF(RW, MACB_MAN_C45_ADDR)</div><div class='add'>+			      | MACB_BF(PHYA, mii_id)</div><div class='add'>+			      | MACB_BF(REGA, devad &amp; 0x1F)</div><div class='add'>+			      | MACB_BF(DATA, regnum &amp; 0xFFFF)</div><div class='add'>+			      | MACB_BF(CODE, MACB_MAN_C45_CODE)));</div><div class='add'>+</div><div class='add'>+	status = macb_mdio_wait_for_idle(bp);</div><div class='add'>+	if (status &lt; 0)</div><div class='add'>+		goto mdio_write_exit;</div><div class='add'>+</div><div class='add'>+	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)</div><div class='add'>+			      | MACB_BF(RW, MACB_MAN_C45_WRITE)</div><div class='add'>+			      | MACB_BF(PHYA, mii_id)</div><div class='add'>+			      | MACB_BF(REGA, devad &amp; 0x1F)</div><div class='add'>+			      | MACB_BF(CODE, MACB_MAN_C45_CODE)</div><div class='ctx'> 			      | MACB_BF(DATA, value)));</div><div class='ctx'> </div><div class='ctx'> 	status = macb_mdio_wait_for_idle(bp);</div><div class='hunk'>@@ -378,40 +448,51 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum,</div><div class='ctx'> 		goto mdio_write_exit;</div><div class='ctx'> </div><div class='ctx'> mdio_write_exit:</div><div class='del'>-	pm_runtime_mark_last_busy(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_put_autosuspend(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> mdio_pm_exit:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void macb_init_buffers(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	unsigned int q;</div><div class='add'>+</div><div class='add'>+	/* Single register for all queues' high 32 bits. */</div><div class='add'>+	if (macb_dma64(bp)) {</div><div class='add'>+		macb_writel(bp, RBQPH,</div><div class='add'>+			    upper_32_bits(bp-&gt;queues[0].rx_ring_dma));</div><div class='add'>+		macb_writel(bp, TBQPH,</div><div class='add'>+			    upper_32_bits(bp-&gt;queues[0].tx_ring_dma));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='add'>+		queue_writel(queue, RBQP, lower_32_bits(queue-&gt;rx_ring_dma));</div><div class='add'>+		queue_writel(queue, TBQP, lower_32_bits(queue-&gt;tx_ring_dma));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * macb_set_tx_clk() - Set a clock to a new frequency</div><div class='del'>- * @clk		Pointer to the clock to change</div><div class='del'>- * @rate	New frequency in Hz</div><div class='del'>- * @dev		Pointer to the struct net_device</div><div class='add'>+ * @bp:		pointer to struct macb</div><div class='add'>+ * @speed:	New frequency in Hz</div><div class='ctx'>  */</div><div class='del'>-static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev)</div><div class='add'>+static void macb_set_tx_clk(struct macb *bp, int speed)</div><div class='ctx'> {</div><div class='ctx'> 	long ferr, rate, rate_rounded;</div><div class='ctx'> </div><div class='del'>-	if (!clk)</div><div class='add'>+	if (!bp-&gt;tx_clk || (bp-&gt;caps &amp; MACB_CAPS_CLK_HW_CHG))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	switch (speed) {</div><div class='del'>-	case SPEED_10:</div><div class='del'>-		rate = 2500000;</div><div class='del'>-		break;</div><div class='del'>-	case SPEED_100:</div><div class='del'>-		rate = 25000000;</div><div class='del'>-		break;</div><div class='del'>-	case SPEED_1000:</div><div class='del'>-		rate = 125000000;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='add'>+	/* In case of MII the PHY is the clock master */</div><div class='add'>+	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_MII)</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	rate_rounded = clk_round_rate(clk, rate);</div><div class='add'>+	rate = rgmii_clock(speed);</div><div class='add'>+	if (rate &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	rate_rounded = clk_round_rate(bp-&gt;tx_clk, rate);</div><div class='ctx'> 	if (rate_rounded &lt; 0)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='hunk'>@@ -421,122 +502,280 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev)</div><div class='ctx'> 	ferr = abs(rate_rounded - rate);</div><div class='ctx'> 	ferr = DIV_ROUND_UP(ferr, rate / 100000);</div><div class='ctx'> 	if (ferr &gt; 5)</div><div class='del'>-		netdev_warn(dev, "unable to generate target frequency: %ld Hz\n",</div><div class='add'>+		netdev_warn(bp-&gt;dev,</div><div class='add'>+			    "unable to generate target frequency: %ld Hz\n",</div><div class='ctx'> 			    rate);</div><div class='ctx'> </div><div class='del'>-	if (clk_set_rate(clk, rate_rounded))</div><div class='del'>-		netdev_err(dev, "adjusting tx_clk failed.\n");</div><div class='add'>+	if (clk_set_rate(bp-&gt;tx_clk, rate_rounded))</div><div class='add'>+		netdev_err(bp-&gt;dev, "adjusting tx_clk failed.\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macb_handle_link_change(struct net_device *dev)</div><div class='add'>+static void macb_usx_pcs_link_up(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+				 phy_interface_t interface, int speed,</div><div class='add'>+				 int duplex)</div><div class='ctx'> {</div><div class='del'>-	struct macb *bp = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	int status_change = 0;</div><div class='add'>+	struct macb *bp = container_of(pcs, struct macb, phylink_usx_pcs);</div><div class='add'>+	u32 config;</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='add'>+	config = gem_readl(bp, USX_CONTROL);</div><div class='add'>+	config = GEM_BFINS(SERDES_RATE, MACB_SERDES_RATE_10G, config);</div><div class='add'>+	config = GEM_BFINS(USX_CTRL_SPEED, HS_SPEED_10000M, config);</div><div class='add'>+	config &amp;= ~(GEM_BIT(TX_SCR_BYPASS) | GEM_BIT(RX_SCR_BYPASS));</div><div class='add'>+	config |= GEM_BIT(TX_EN);</div><div class='add'>+	gem_writel(bp, USX_CONTROL, config);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;link) {</div><div class='del'>-		if ((bp-&gt;speed != phydev-&gt;speed) ||</div><div class='del'>-		    (bp-&gt;duplex != phydev-&gt;duplex)) {</div><div class='del'>-			u32 reg;</div><div class='add'>+static void macb_usx_pcs_get_state(struct phylink_pcs *pcs,</div><div class='add'>+				   unsigned int neg_mode,</div><div class='add'>+				   struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = container_of(pcs, struct macb, phylink_usx_pcs);</div><div class='add'>+	u32 val;</div><div class='ctx'> </div><div class='del'>-			reg = macb_readl(bp, NCFGR);</div><div class='del'>-			reg &amp;= ~(MACB_BIT(SPD) | MACB_BIT(FD));</div><div class='del'>-			if (macb_is_gem(bp))</div><div class='del'>-				reg &amp;= ~GEM_BIT(GBE);</div><div class='add'>+	state-&gt;speed = SPEED_10000;</div><div class='add'>+	state-&gt;duplex = 1;</div><div class='add'>+	state-&gt;an_complete = 1;</div><div class='add'>+</div><div class='add'>+	val = gem_readl(bp, USX_STATUS);</div><div class='add'>+	state-&gt;link = !!(val &amp; GEM_BIT(USX_BLOCK_LOCK));</div><div class='add'>+	val = gem_readl(bp, NCFGR);</div><div class='add'>+	if (val &amp; GEM_BIT(PAE))</div><div class='add'>+		state-&gt;pause = MLO_PAUSE_RX;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_usx_pcs_config(struct phylink_pcs *pcs,</div><div class='add'>+			       unsigned int neg_mode,</div><div class='add'>+			       phy_interface_t interface,</div><div class='add'>+			       const unsigned long *advertising,</div><div class='add'>+			       bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = container_of(pcs, struct macb, phylink_usx_pcs);</div><div class='add'>+</div><div class='add'>+	gem_writel(bp, USX_CONTROL, gem_readl(bp, USX_CONTROL) |</div><div class='add'>+		   GEM_BIT(SIGNAL_OK));</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			if (phydev-&gt;duplex)</div><div class='del'>-				reg |= MACB_BIT(FD);</div><div class='del'>-			if (phydev-&gt;speed == SPEED_100)</div><div class='del'>-				reg |= MACB_BIT(SPD);</div><div class='del'>-			if (phydev-&gt;speed == SPEED_1000 &amp;&amp;</div><div class='del'>-			    bp-&gt;caps &amp; MACB_CAPS_GIGABIT_MODE_AVAILABLE)</div><div class='del'>-				reg |= GEM_BIT(GBE);</div><div class='add'>+static void macb_pcs_get_state(struct phylink_pcs *pcs, unsigned int neg_mode,</div><div class='add'>+			       struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	state-&gt;link = 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			macb_or_gem_writel(bp, NCFGR, reg);</div><div class='add'>+static void macb_pcs_an_restart(struct phylink_pcs *pcs)</div><div class='add'>+{</div><div class='add'>+	/* Not supported */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_pcs_config(struct phylink_pcs *pcs,</div><div class='add'>+			   unsigned int neg_mode,</div><div class='add'>+			   phy_interface_t interface,</div><div class='add'>+			   const unsigned long *advertising,</div><div class='add'>+			   bool permit_pause_to_mac)</div><div class='add'>+{</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-			bp-&gt;speed = phydev-&gt;speed;</div><div class='del'>-			bp-&gt;duplex = phydev-&gt;duplex;</div><div class='del'>-			status_change = 1;</div><div class='add'>+static const struct phylink_pcs_ops macb_phylink_usx_pcs_ops = {</div><div class='add'>+	.pcs_get_state = macb_usx_pcs_get_state,</div><div class='add'>+	.pcs_config = macb_usx_pcs_config,</div><div class='add'>+	.pcs_link_up = macb_usx_pcs_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct phylink_pcs_ops macb_phylink_pcs_ops = {</div><div class='add'>+	.pcs_get_state = macb_pcs_get_state,</div><div class='add'>+	.pcs_an_restart = macb_pcs_an_restart,</div><div class='add'>+	.pcs_config = macb_pcs_config,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void macb_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			    const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 old_ctrl, ctrl;</div><div class='add'>+	u32 old_ncr, ncr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	old_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR);</div><div class='add'>+	old_ncr = ncr = macb_or_gem_readl(bp, NCR);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;caps &amp; MACB_CAPS_MACB_IS_EMAC) {</div><div class='add'>+		if (state-&gt;interface == PHY_INTERFACE_MODE_RMII)</div><div class='add'>+			ctrl |= MACB_BIT(RM9200_RMII);</div><div class='add'>+	} else if (macb_is_gem(bp)) {</div><div class='add'>+		ctrl &amp;= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));</div><div class='add'>+		ncr &amp;= ~GEM_BIT(ENABLE_HS_MAC);</div><div class='add'>+</div><div class='add'>+		if (state-&gt;interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+			ctrl |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL);</div><div class='add'>+		} else if (state-&gt;interface == PHY_INTERFACE_MODE_10GBASER) {</div><div class='add'>+			ctrl |= GEM_BIT(PCSSEL);</div><div class='add'>+			ncr |= GEM_BIT(ENABLE_HS_MAC);</div><div class='add'>+		} else if (bp-&gt;caps &amp; MACB_CAPS_MIIONRGMII &amp;&amp;</div><div class='add'>+			   bp-&gt;phy_interface == PHY_INTERFACE_MODE_MII) {</div><div class='add'>+			ncr |= MACB_BIT(MIIONRGMII);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (phydev-&gt;link != bp-&gt;link) {</div><div class='del'>-		if (!phydev-&gt;link) {</div><div class='del'>-			bp-&gt;speed = 0;</div><div class='del'>-			bp-&gt;duplex = -1;</div><div class='del'>-		}</div><div class='del'>-		bp-&gt;link = phydev-&gt;link;</div><div class='add'>+	/* Apply the new configuration, if any */</div><div class='add'>+	if (old_ctrl ^ ctrl)</div><div class='add'>+		macb_or_gem_writel(bp, NCFGR, ctrl);</div><div class='add'>+</div><div class='add'>+	if (old_ncr ^ ncr)</div><div class='add'>+		macb_or_gem_writel(bp, NCR, ncr);</div><div class='add'>+</div><div class='add'>+	/* Disable AN for SGMII fixed link configuration, enable otherwise.</div><div class='add'>+	 * Must be written after PCSSEL is set in NCFGR,</div><div class='add'>+	 * otherwise writes will not take effect.</div><div class='add'>+	 */</div><div class='add'>+	if (macb_is_gem(bp) &amp;&amp; state-&gt;interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		u32 pcsctrl, old_pcsctrl;</div><div class='ctx'> </div><div class='del'>-		status_change = 1;</div><div class='add'>+		old_pcsctrl = gem_readl(bp, PCSCNTRL);</div><div class='add'>+		if (mode == MLO_AN_FIXED)</div><div class='add'>+			pcsctrl = old_pcsctrl &amp; ~GEM_BIT(PCSAUTONEG);</div><div class='add'>+		else</div><div class='add'>+			pcsctrl = old_pcsctrl | GEM_BIT(PCSAUTONEG);</div><div class='add'>+		if (old_pcsctrl != pcsctrl)</div><div class='add'>+			gem_writel(bp, PCSCNTRL, pcsctrl);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	if (status_change) {</div><div class='del'>-		if (phydev-&gt;link) {</div><div class='del'>-			/* Update the TX clock rate if and only if the link is</div><div class='del'>-			 * up and there has been a link change.</div><div class='del'>-			 */</div><div class='del'>-			macb_set_tx_clk(bp-&gt;tx_clk, phydev-&gt;speed, dev);</div><div class='add'>+static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			       phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	unsigned int q;</div><div class='add'>+	u32 ctrl;</div><div class='ctx'> </div><div class='del'>-			netif_carrier_on(dev);</div><div class='del'>-			netdev_info(dev, "link up (%d/%s)\n",</div><div class='del'>-				    phydev-&gt;speed,</div><div class='del'>-				    phydev-&gt;duplex == DUPLEX_FULL ?</div><div class='del'>-				    "Full" : "Half");</div><div class='del'>-		} else {</div><div class='del'>-			netif_carrier_off(dev);</div><div class='del'>-			netdev_info(dev, "link down\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_MACB_IS_EMAC))</div><div class='add'>+		for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue)</div><div class='add'>+			queue_writel(queue, IDR,</div><div class='add'>+				     bp-&gt;rx_intr_mask | MACB_TX_INT_FLAGS | MACB_BIT(HRESP));</div><div class='add'>+</div><div class='add'>+	/* Disable Rx and Tx */</div><div class='add'>+	ctrl = macb_readl(bp, NCR) &amp; ~(MACB_BIT(RE) | MACB_BIT(TE));</div><div class='add'>+	macb_writel(bp, NCR, ctrl);</div><div class='add'>+</div><div class='add'>+	netif_tx_stop_all_queues(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* based on au1000_eth. c*/</div><div class='del'>-static int macb_mii_probe(struct net_device *dev)</div><div class='add'>+static void macb_mac_link_up(struct phylink_config *config,</div><div class='add'>+			     struct phy_device *phy,</div><div class='add'>+			     unsigned int mode, phy_interface_t interface,</div><div class='add'>+			     int speed, int duplex,</div><div class='add'>+			     bool tx_pause, bool rx_pause)</div><div class='ctx'> {</div><div class='del'>-	struct macb *bp = netdev_priv(dev);</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	struct device_node *np;</div><div class='del'>-	int ret, i;</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int q;</div><div class='add'>+	u32 ctrl;</div><div class='ctx'> </div><div class='del'>-	np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='del'>-	ret = 0;</div><div class='add'>+	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	if (np) {</div><div class='del'>-		if (of_phy_is_fixed_link(np)) {</div><div class='del'>-			bp-&gt;phy_node = of_node_get(np);</div><div class='del'>-		} else {</div><div class='del'>-			bp-&gt;phy_node = of_parse_phandle(np, "phy-handle", 0);</div><div class='del'>-			/* fallback to standard phy registration if no</div><div class='del'>-			 * phy-handle was found nor any phy found during</div><div class='del'>-			 * dt phy registration</div><div class='del'>-			 */</div><div class='del'>-			if (!bp-&gt;phy_node &amp;&amp; !phy_find_first(bp-&gt;mii_bus)) {</div><div class='del'>-				for (i = 0; i &lt; PHY_MAX_ADDR; i++) {</div><div class='del'>-					phydev = mdiobus_scan(bp-&gt;mii_bus, i);</div><div class='del'>-					if (IS_ERR(phydev) &amp;&amp;</div><div class='del'>-					    PTR_ERR(phydev) != -ENODEV) {</div><div class='del'>-						ret = PTR_ERR(phydev);</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (ret)</div><div class='del'>-					return -ENODEV;</div><div class='del'>-			}</div><div class='add'>+	ctrl = macb_or_gem_readl(bp, NCFGR);</div><div class='add'>+</div><div class='add'>+	ctrl &amp;= ~(MACB_BIT(SPD) | MACB_BIT(FD));</div><div class='add'>+</div><div class='add'>+	if (speed == SPEED_100)</div><div class='add'>+		ctrl |= MACB_BIT(SPD);</div><div class='add'>+</div><div class='add'>+	if (duplex)</div><div class='add'>+		ctrl |= MACB_BIT(FD);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_MACB_IS_EMAC)) {</div><div class='add'>+		ctrl &amp;= ~MACB_BIT(PAE);</div><div class='add'>+		if (macb_is_gem(bp)) {</div><div class='add'>+			ctrl &amp;= ~GEM_BIT(GBE);</div><div class='add'>+</div><div class='add'>+			if (speed == SPEED_1000)</div><div class='add'>+				ctrl |= GEM_BIT(GBE);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (rx_pause)</div><div class='add'>+			ctrl |= MACB_BIT(PAE);</div><div class='add'>+</div><div class='add'>+		/* Initialize rings &amp; buffers as clearing MACB_BIT(TE) in link down</div><div class='add'>+		 * cleared the pipeline and control registers.</div><div class='add'>+		 */</div><div class='add'>+		bp-&gt;macbgem_ops.mog_init_rings(bp);</div><div class='add'>+		macb_init_buffers(bp);</div><div class='add'>+</div><div class='add'>+		for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue)</div><div class='add'>+			queue_writel(queue, IER,</div><div class='add'>+				     bp-&gt;rx_intr_mask | MACB_TX_INT_FLAGS | MACB_BIT(HRESP));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;phy_node) {</div><div class='del'>-		phydev = of_phy_connect(dev, bp-&gt;phy_node,</div><div class='del'>-					&amp;macb_handle_link_change, 0,</div><div class='del'>-					bp-&gt;phy_interface);</div><div class='del'>-		if (!phydev)</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	} else {</div><div class='add'>+	macb_or_gem_writel(bp, NCFGR, ctrl);</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_10GBASER)</div><div class='add'>+		gem_writel(bp, HS_MAC_CONFIG, GEM_BFINS(HS_MAC_SPEED, HS_SPEED_10000M,</div><div class='add'>+							gem_readl(bp, HS_MAC_CONFIG)));</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_MACB_IS_EMAC))</div><div class='add'>+		macb_set_tx_clk(bp, speed);</div><div class='add'>+</div><div class='add'>+	/* Enable Rx and Tx; Enable PTP unicast */</div><div class='add'>+	ctrl = macb_readl(bp, NCR);</div><div class='add'>+	if (gem_has_ptp(bp))</div><div class='add'>+		ctrl |= MACB_BIT(PTPUNI);</div><div class='add'>+</div><div class='add'>+	macb_writel(bp, NCR, ctrl | MACB_BIT(RE) | MACB_BIT(TE));</div><div class='add'>+</div><div class='add'>+	netif_tx_wake_all_queues(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *macb_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+					       phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	if (interface == PHY_INTERFACE_MODE_10GBASER)</div><div class='add'>+		return &amp;bp-&gt;phylink_usx_pcs;</div><div class='add'>+	else if (interface == PHY_INTERFACE_MODE_SGMII)</div><div class='add'>+		return &amp;bp-&gt;phylink_sgmii_pcs;</div><div class='add'>+	else</div><div class='add'>+		return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops macb_phylink_ops = {</div><div class='add'>+	.mac_select_pcs = macb_mac_select_pcs,</div><div class='add'>+	.mac_config = macb_mac_config,</div><div class='add'>+	.mac_link_down = macb_mac_link_down,</div><div class='add'>+	.mac_link_up = macb_mac_link_up,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static bool macb_phy_handle_exists(struct device_node *dn)</div><div class='add'>+{</div><div class='add'>+	dn = of_parse_phandle(dn, "phy-handle", 0);</div><div class='add'>+	of_node_put(dn);</div><div class='add'>+	return dn != NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_phylink_connect(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	struct device_node *dn = bp-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+	struct net_device *dev = bp-&gt;dev;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (dn)</div><div class='add'>+		ret = phylink_of_phy_connect(bp-&gt;phylink, dn, 0);</div><div class='add'>+</div><div class='add'>+	if (!dn || (ret &amp;&amp; !macb_phy_handle_exists(dn))) {</div><div class='ctx'> 		phydev = phy_find_first(bp-&gt;mii_bus);</div><div class='ctx'> 		if (!phydev) {</div><div class='ctx'> 			netdev_err(dev, "no PHY found\n");</div><div class='hunk'>@@ -544,36 +783,126 @@ static int macb_mii_probe(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* attach the mac to the phy */</div><div class='del'>-		ret = phy_connect_direct(dev, phydev, &amp;macb_handle_link_change,</div><div class='del'>-					 bp-&gt;phy_interface);</div><div class='del'>-		if (ret) {</div><div class='del'>-			netdev_err(dev, "Could not attach to PHY\n");</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		ret = phylink_connect_phy(bp-&gt;phylink, phydev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* mask with MAC supported features */</div><div class='del'>-	if (macb_is_gem(bp) &amp;&amp; bp-&gt;caps &amp; MACB_CAPS_GIGABIT_MODE_AVAILABLE)</div><div class='del'>-		phy_set_max_speed(phydev, SPEED_1000);</div><div class='del'>-	else</div><div class='del'>-		phy_set_max_speed(phydev, SPEED_100);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(dev, "Could not attach PHY (%d)\n", ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;caps &amp; MACB_CAPS_NO_GIGABIT_HALF)</div><div class='del'>-		phy_remove_link_mode(phydev,</div><div class='del'>-				     ETHTOOL_LINK_MODE_1000baseT_Half_BIT);</div><div class='add'>+	phylink_start(bp-&gt;phylink);</div><div class='ctx'> </div><div class='del'>-	bp-&gt;link = 0;</div><div class='del'>-	bp-&gt;speed = 0;</div><div class='del'>-	bp-&gt;duplex = -1;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macb_get_pcs_fixed_state(struct phylink_config *config,</div><div class='add'>+				     struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = to_net_dev(config-&gt;dev);</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	state-&gt;link = (macb_readl(bp, NSR) &amp; MACB_BIT(NSR_LINK)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* based on au1000_eth. c*/</div><div class='add'>+static int macb_mii_probe(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	bp-&gt;phylink_sgmii_pcs.ops = &amp;macb_phylink_pcs_ops;</div><div class='add'>+	bp-&gt;phylink_usx_pcs.ops = &amp;macb_phylink_usx_pcs_ops;</div><div class='add'>+</div><div class='add'>+	bp-&gt;phylink_config.dev = &amp;dev-&gt;dev;</div><div class='add'>+	bp-&gt;phylink_config.type = PHYLINK_NETDEV;</div><div class='add'>+	bp-&gt;phylink_config.mac_managed_pm = true;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		bp-&gt;phylink_config.poll_fixed_state = true;</div><div class='add'>+		bp-&gt;phylink_config.get_fixed_state = macb_get_pcs_fixed_state;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bp-&gt;phylink_config.mac_capabilities = MAC_ASYM_PAUSE |</div><div class='add'>+		MAC_10 | MAC_100;</div><div class='add'>+</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_MII,</div><div class='add'>+		  bp-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	__set_bit(PHY_INTERFACE_MODE_RMII,</div><div class='add'>+		  bp-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+	/* Determine what modes are supported */</div><div class='add'>+	if (macb_is_gem(bp) &amp;&amp; (bp-&gt;caps &amp; MACB_CAPS_GIGABIT_MODE_AVAILABLE)) {</div><div class='add'>+		bp-&gt;phylink_config.mac_capabilities |= MAC_1000FD;</div><div class='add'>+		if (!(bp-&gt;caps &amp; MACB_CAPS_NO_GIGABIT_HALF))</div><div class='add'>+			bp-&gt;phylink_config.mac_capabilities |= MAC_1000HD;</div><div class='add'>+</div><div class='add'>+		__set_bit(PHY_INTERFACE_MODE_GMII,</div><div class='add'>+			  bp-&gt;phylink_config.supported_interfaces);</div><div class='add'>+		phy_interface_set_rgmii(bp-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;caps &amp; MACB_CAPS_PCS)</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+				  bp-&gt;phylink_config.supported_interfaces);</div><div class='add'>+</div><div class='add'>+		if (bp-&gt;caps &amp; MACB_CAPS_HIGH_SPEED) {</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_10GBASER,</div><div class='add'>+				  bp-&gt;phylink_config.supported_interfaces);</div><div class='add'>+			bp-&gt;phylink_config.mac_capabilities |= MAC_10000FD;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	bp-&gt;phylink = phylink_create(&amp;bp-&gt;phylink_config, bp-&gt;pdev-&gt;dev.fwnode,</div><div class='add'>+				     bp-&gt;phy_interface, &amp;macb_phylink_ops);</div><div class='add'>+	if (IS_ERR(bp-&gt;phylink)) {</div><div class='add'>+		netdev_err(dev, "Could not create a phylink instance (%ld)\n",</div><div class='add'>+			   PTR_ERR(bp-&gt;phylink));</div><div class='add'>+		return PTR_ERR(bp-&gt;phylink);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int macb_mdiobus_register(struct macb *bp, struct device_node *mdio_np)</div><div class='add'>+{</div><div class='add'>+	struct device_node *child, *np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+</div><div class='add'>+	/* If we have a child named mdio, probe it instead of looking for PHYs</div><div class='add'>+	 * directly under the MAC node</div><div class='add'>+	 */</div><div class='add'>+	if (mdio_np)</div><div class='add'>+		return of_mdiobus_register(bp-&gt;mii_bus, mdio_np);</div><div class='add'>+</div><div class='add'>+	/* Only create the PHY from the device tree if at least one PHY is</div><div class='add'>+	 * described. Otherwise scan the entire MDIO bus. We do this to support</div><div class='add'>+	 * old device tree that did not follow the best practices and did not</div><div class='add'>+	 * describe their network PHYs.</div><div class='add'>+	 */</div><div class='add'>+	for_each_available_child_of_node(np, child)</div><div class='add'>+		if (of_mdiobus_child_is_phy(child)) {</div><div class='add'>+			/* The loop increments the child refcount,</div><div class='add'>+			 * decrement it before returning.</div><div class='add'>+			 */</div><div class='add'>+			of_node_put(child);</div><div class='add'>+</div><div class='add'>+			return of_mdiobus_register(bp-&gt;mii_bus, np);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	return mdiobus_register(bp-&gt;mii_bus);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int macb_mii_init(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	struct device_node *np;</div><div class='add'>+	struct device_node *mdio_np, *np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='ctx'> 	int err = -ENXIO;</div><div class='ctx'> </div><div class='add'>+	/* With fixed-link, we don't need to register the MDIO bus,</div><div class='add'>+	 * except if we have a child named "mdio" in the device tree.</div><div class='add'>+	 * In that case, some devices may be attached to the MACB's MDIO bus.</div><div class='add'>+	 */</div><div class='add'>+	mdio_np = of_get_child_by_name(np, "mdio");</div><div class='add'>+	if (!mdio_np &amp;&amp; of_phy_is_fixed_link(np))</div><div class='add'>+		return macb_mii_probe(bp-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	/* Enable management port */</div><div class='ctx'> 	macb_writel(bp, NCR, MACB_BIT(MPE));</div><div class='ctx'> </div><div class='hunk'>@@ -584,8 +913,10 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;mii_bus-&gt;name = "MACB_mii_bus";</div><div class='del'>-	bp-&gt;mii_bus-&gt;read = &amp;macb_mdio_read;</div><div class='del'>-	bp-&gt;mii_bus-&gt;write = &amp;macb_mdio_write;</div><div class='add'>+	bp-&gt;mii_bus-&gt;read = &amp;macb_mdio_read_c22;</div><div class='add'>+	bp-&gt;mii_bus-&gt;write = &amp;macb_mdio_write_c22;</div><div class='add'>+	bp-&gt;mii_bus-&gt;read_c45 = &amp;macb_mdio_read_c45;</div><div class='add'>+	bp-&gt;mii_bus-&gt;write_c45 = &amp;macb_mdio_write_c45;</div><div class='ctx'> 	snprintf(bp-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%x",</div><div class='ctx'> 		 bp-&gt;pdev-&gt;name, bp-&gt;pdev-&gt;id);</div><div class='ctx'> 	bp-&gt;mii_bus-&gt;priv = bp;</div><div class='hunk'>@@ -593,21 +924,9 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(&amp;bp-&gt;dev-&gt;dev, bp-&gt;mii_bus);</div><div class='ctx'> </div><div class='del'>-	np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='del'>-	if (np &amp;&amp; of_phy_is_fixed_link(np)) {</div><div class='del'>-		if (of_phy_register_fixed_link(np) &lt; 0) {</div><div class='del'>-			dev_err(&amp;bp-&gt;pdev-&gt;dev,</div><div class='del'>-				"broken fixed-link specification %pOF\n", np);</div><div class='del'>-			goto err_out_free_mdiobus;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		err = mdiobus_register(bp-&gt;mii_bus);</div><div class='del'>-	} else {</div><div class='del'>-		err = of_mdiobus_register(bp-&gt;mii_bus, np);</div><div class='del'>-	}</div><div class='del'>-</div><div class='add'>+	err = macb_mdiobus_register(bp, mdio_np);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_out_free_fixed_link;</div><div class='add'>+		goto err_out_free_mdiobus;</div><div class='ctx'> </div><div class='ctx'> 	err = macb_mii_probe(bp-&gt;dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -617,20 +936,18 @@ static int macb_mii_init(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> err_out_unregister_bus:</div><div class='ctx'> 	mdiobus_unregister(bp-&gt;mii_bus);</div><div class='del'>-err_out_free_fixed_link:</div><div class='del'>-	if (np &amp;&amp; of_phy_is_fixed_link(np))</div><div class='del'>-		of_phy_deregister_fixed_link(np);</div><div class='ctx'> err_out_free_mdiobus:</div><div class='del'>-	of_node_put(bp-&gt;phy_node);</div><div class='ctx'> 	mdiobus_free(bp-&gt;mii_bus);</div><div class='ctx'> err_out:</div><div class='add'>+	of_node_put(mdio_np);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void macb_update_stats(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	u32 *p = &amp;bp-&gt;hw_stats.macb.rx_pause_frames;</div><div class='del'>-	u32 *end = &amp;bp-&gt;hw_stats.macb.tx_pause_frames + 1;</div><div class='add'>+	u64 *p = &amp;bp-&gt;hw_stats.macb.rx_pause_frames;</div><div class='add'>+	u64 *end = &amp;bp-&gt;hw_stats.macb.tx_pause_frames + 1;</div><div class='ctx'> 	int offset = MACB_PFR;</div><div class='ctx'> </div><div class='ctx'> 	WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4);</div><div class='hunk'>@@ -641,25 +958,18 @@ static void macb_update_stats(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> static int macb_halt_tx(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	unsigned long	halt_time, timeout;</div><div class='del'>-	u32		status;</div><div class='add'>+	u32 status;</div><div class='ctx'> </div><div class='ctx'> 	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(THALT));</div><div class='ctx'> </div><div class='del'>-	timeout = jiffies + usecs_to_jiffies(MACB_HALT_TIMEOUT);</div><div class='del'>-	do {</div><div class='del'>-		halt_time = jiffies;</div><div class='del'>-		status = macb_readl(bp, TSR);</div><div class='del'>-		if (!(status &amp; MACB_BIT(TGO)))</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		udelay(250);</div><div class='del'>-	} while (time_before(halt_time, timeout));</div><div class='del'>-</div><div class='del'>-	return -ETIMEDOUT;</div><div class='add'>+	/* Poll TSR until TGO is cleared or timeout. */</div><div class='add'>+	return read_poll_timeout_atomic(macb_readl, status,</div><div class='add'>+					!(status &amp; MACB_BIT(TGO)),</div><div class='add'>+					250, MACB_HALT_TIMEOUT, false,</div><div class='add'>+					bp, TSR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb)</div><div class='add'>+static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	if (tx_skb-&gt;mapping) {</div><div class='ctx'> 		if (tx_skb-&gt;mapped_as_page)</div><div class='hunk'>@@ -672,17 +982,16 @@ static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tx_skb-&gt;skb) {</div><div class='del'>-		dev_kfree_skb_any(tx_skb-&gt;skb);</div><div class='add'>+		napi_consume_skb(tx_skb-&gt;skb, budget);</div><div class='ctx'> 		tx_skb-&gt;skb = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_t addr)</div><div class='ctx'> {</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-	struct macb_dma_desc_64 *desc_64;</div><div class='add'>+	if (macb_dma64(bp)) {</div><div class='add'>+		struct macb_dma_desc_64 *desc_64;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B) {</div><div class='ctx'> 		desc_64 = macb_64b_desc(bp, desc);</div><div class='ctx'> 		desc_64-&gt;addrh = upper_32_bits(addr);</div><div class='ctx'> 		/* The low bits of RX address contain the RX_USED bit, clearing</div><div class='hunk'>@@ -691,22 +1000,23 @@ static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_</div><div class='ctx'> 		 */</div><div class='ctx'> 		dma_wmb();</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='add'>+</div><div class='ctx'> 	desc-&gt;addr = lower_32_bits(addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static dma_addr_t macb_get_addr(struct macb *bp, struct macb_dma_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t addr = 0;</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-	struct macb_dma_desc_64 *desc_64;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B) {</div><div class='add'>+	if (macb_dma64(bp)) {</div><div class='add'>+		struct macb_dma_desc_64 *desc_64;</div><div class='add'>+</div><div class='ctx'> 		desc_64 = macb_64b_desc(bp, desc);</div><div class='ctx'> 		addr = ((u64)(desc_64-&gt;addrh) &lt;&lt; 32);</div><div class='ctx'> 	}</div><div class='del'>-#endif</div><div class='ctx'> 	addr |= MACB_BF(RX_WADDR, MACB_BFEXT(RX_WADDR, desc-&gt;addr));</div><div class='add'>+	if (macb_dma_ptp(bp))</div><div class='add'>+		addr &amp;= ~GEM_BIT(DMA_RXVALID);</div><div class='ctx'> 	return addr;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -714,23 +1024,28 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb_queue	*queue = container_of(work, struct macb_queue,</div><div class='ctx'> 						      tx_error_task);</div><div class='add'>+	bool			halt_timeout = false;</div><div class='ctx'> 	struct macb		*bp = queue-&gt;bp;</div><div class='add'>+	u32			queue_index;</div><div class='add'>+	u32			packets = 0;</div><div class='add'>+	u32			bytes = 0;</div><div class='ctx'> 	struct macb_tx_skb	*tx_skb;</div><div class='ctx'> 	struct macb_dma_desc	*desc;</div><div class='ctx'> 	struct sk_buff		*skb;</div><div class='ctx'> 	unsigned int		tail;</div><div class='ctx'> 	unsigned long		flags;</div><div class='ctx'> </div><div class='add'>+	queue_index = queue - bp-&gt;queues;</div><div class='ctx'> 	netdev_vdbg(bp-&gt;dev, "macb_tx_error_task: q = %u, t = %u, h = %u\n",</div><div class='del'>-		    (unsigned int)(queue - bp-&gt;queues),</div><div class='del'>-		    queue-&gt;tx_tail, queue-&gt;tx_head);</div><div class='add'>+		    queue_index, queue-&gt;tx_tail, queue-&gt;tx_head);</div><div class='ctx'> </div><div class='del'>-	/* Prevent the queue IRQ handlers from running: each of them may call</div><div class='del'>-	 * macb_tx_interrupt(), which in turn may call netif_wake_subqueue().</div><div class='add'>+	/* Prevent the queue NAPI TX poll from running, as it calls</div><div class='add'>+	 * macb_tx_complete(), which in turn may call netif_wake_subqueue().</div><div class='ctx'> 	 * As explained below, we have to halt the transmission before updating</div><div class='ctx'> 	 * TBQP registers so we call netif_tx_stop_all_queues() to notify the</div><div class='ctx'> 	 * network engine about the macb/gem being halted.</div><div class='ctx'> 	 */</div><div class='add'>+	napi_disable(&amp;queue-&gt;napi_tx);</div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure nobody is trying to queue up new packets */</div><div class='hunk'>@@ -740,9 +1055,11 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> 	 * (in case we have just queued new packets)</div><div class='ctx'> 	 * macb/gem must be halted to write TBQP register</div><div class='ctx'> 	 */</div><div class='del'>-	if (macb_halt_tx(bp))</div><div class='del'>-		/* Just complain for now, reinitializing TX path can be good */</div><div class='add'>+	if (macb_halt_tx(bp)) {</div><div class='ctx'> 		netdev_err(bp-&gt;dev, "BUG: halt tx timed out\n");</div><div class='add'>+		macb_writel(bp, NCR, macb_readl(bp, NCR) &amp; (~MACB_BIT(TE)));</div><div class='add'>+		halt_timeout = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Treat frames in TX queue including the ones that caused the error.</div><div class='ctx'> 	 * Free transmit buffers in upper layer.</div><div class='hunk'>@@ -758,7 +1075,7 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> 		if (ctrl &amp; MACB_BIT(TX_USED)) {</div><div class='ctx'> 			/* skb is set for the last buffer of the frame */</div><div class='ctx'> 			while (!skb) {</div><div class='del'>-				macb_tx_unmap(bp, tx_skb);</div><div class='add'>+				macb_tx_unmap(bp, tx_skb, 0);</div><div class='ctx'> 				tail++;</div><div class='ctx'> 				tx_skb = macb_tx_skb(queue, tail);</div><div class='ctx'> 				skb = tx_skb-&gt;skb;</div><div class='hunk'>@@ -773,8 +1090,10 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> 					    skb-&gt;data);</div><div class='ctx'> 				bp-&gt;dev-&gt;stats.tx_packets++;</div><div class='ctx'> 				queue-&gt;stats.tx_packets++;</div><div class='add'>+				packets++;</div><div class='ctx'> 				bp-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 				queue-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+				bytes += skb-&gt;len;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* "Buffers exhausted mid-frame" errors may only happen</div><div class='hunk'>@@ -788,9 +1107,12 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> 			desc-&gt;ctrl = ctrl | MACB_BIT(TX_USED);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		macb_tx_unmap(bp, tx_skb);</div><div class='add'>+		macb_tx_unmap(bp, tx_skb, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_completed_queue(netdev_get_tx_queue(bp-&gt;dev, queue_index),</div><div class='add'>+				  packets, bytes);</div><div class='add'>+</div><div class='ctx'> 	/* Set end of TX queue */</div><div class='ctx'> 	desc = macb_tx_desc(queue, 0);</div><div class='ctx'> 	macb_set_addr(bp, desc, 0);</div><div class='hunk'>@@ -801,10 +1123,6 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	/* Reinitialize the TX desc queue */</div><div class='ctx'> 	queue_writel(queue, TBQP, lower_32_bits(queue-&gt;tx_ring_dma));</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-	if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='del'>-		queue_writel(queue, TBQPH, upper_32_bits(queue-&gt;tx_ring_dma));</div><div class='del'>-#endif</div><div class='ctx'> 	/* Make TX ring reflect state of hardware */</div><div class='ctx'> 	queue-&gt;tx_head = 0;</div><div class='ctx'> 	queue-&gt;tx_tail = 0;</div><div class='hunk'>@@ -813,32 +1131,60 @@ static void macb_tx_error_task(struct work_struct *work)</div><div class='ctx'> 	macb_writel(bp, TSR, macb_readl(bp, TSR));</div><div class='ctx'> 	queue_writel(queue, IER, MACB_TX_INT_FLAGS);</div><div class='ctx'> </div><div class='add'>+	if (halt_timeout)</div><div class='add'>+		macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TE));</div><div class='add'>+</div><div class='ctx'> 	/* Now we are ready to start transmission again */</div><div class='ctx'> 	netif_tx_start_all_queues(bp-&gt;dev);</div><div class='ctx'> 	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+	napi_enable(&amp;queue-&gt;napi_tx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macb_tx_interrupt(struct macb_queue *queue)</div><div class='add'>+static bool ptp_one_step_sync(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tail;</div><div class='del'>-	unsigned int head;</div><div class='del'>-	u32 status;</div><div class='del'>-	struct macb *bp = queue-&gt;bp;</div><div class='del'>-	u16 queue_index = queue - bp-&gt;queues;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+	unsigned int ptp_class;</div><div class='add'>+	u8 msgtype;</div><div class='ctx'> </div><div class='del'>-	status = macb_readl(bp, TSR);</div><div class='del'>-	macb_writel(bp, TSR, status);</div><div class='add'>+	/* No need to parse packet if PTP TS is not involved */</div><div class='add'>+	if (likely(!(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)))</div><div class='add'>+		goto not_oss;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='del'>-		queue_writel(queue, ISR, MACB_BIT(TCOMP));</div><div class='add'>+	/* Identify and return whether PTP one step sync is being processed */</div><div class='add'>+	ptp_class = ptp_classify_raw(skb);</div><div class='add'>+	if (ptp_class == PTP_CLASS_NONE)</div><div class='add'>+		goto not_oss;</div><div class='ctx'> </div><div class='del'>-	netdev_vdbg(bp-&gt;dev, "macb_tx_interrupt status = 0x%03lx\n",</div><div class='del'>-		    (unsigned long)status);</div><div class='add'>+	hdr = ptp_parse_header(skb, ptp_class);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		goto not_oss;</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;flag_field[0] &amp; PTP_FLAG_TWOSTEP)</div><div class='add'>+		goto not_oss;</div><div class='add'>+</div><div class='add'>+	msgtype = ptp_get_msgtype(hdr, ptp_class);</div><div class='add'>+	if (msgtype == PTP_MSGTYPE_SYNC)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+not_oss:</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='ctx'> </div><div class='add'>+static int macb_tx_complete(struct macb_queue *queue, int budget)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = queue-&gt;bp;</div><div class='add'>+	u16 queue_index = queue - bp-&gt;queues;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	unsigned int tail;</div><div class='add'>+	unsigned int head;</div><div class='add'>+	int packets = 0;</div><div class='add'>+	u32 bytes = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='ctx'> 	head = queue-&gt;tx_head;</div><div class='del'>-	for (tail = queue-&gt;tx_tail; tail != head; tail++) {</div><div class='add'>+	for (tail = queue-&gt;tx_tail; tail != head &amp;&amp; packets &lt; budget; tail++) {</div><div class='ctx'> 		struct macb_tx_skb	*tx_skb;</div><div class='ctx'> 		struct sk_buff		*skb;</div><div class='ctx'> 		struct macb_dma_desc	*desc;</div><div class='hunk'>@@ -864,14 +1210,10 @@ static void macb_tx_interrupt(struct macb_queue *queue)</div><div class='ctx'> </div><div class='ctx'> 			/* First, update TX stats if needed */</div><div class='ctx'> 			if (skb) {</div><div class='del'>-				if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp;</div><div class='del'>-					     SKBTX_HW_TSTAMP) &amp;&amp;</div><div class='del'>-				    gem_ptp_do_txstamp(queue, skb, desc) == 0) {</div><div class='del'>-					/* skb now belongs to timestamp buffer</div><div class='del'>-					 * and will be removed later</div><div class='del'>-					 */</div><div class='del'>-					tx_skb-&gt;skb = NULL;</div><div class='del'>-				}</div><div class='add'>+				if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) &amp;&amp;</div><div class='add'>+				    !ptp_one_step_sync(skb))</div><div class='add'>+					gem_ptp_do_txstamp(bp, skb, desc);</div><div class='add'>+</div><div class='ctx'> 				netdev_vdbg(bp-&gt;dev, "skb %u (data %p) TX complete\n",</div><div class='ctx'> 					    macb_tx_ring_wrap(bp, tail),</div><div class='ctx'> 					    skb-&gt;data);</div><div class='hunk'>@@ -879,10 +1221,12 @@ static void macb_tx_interrupt(struct macb_queue *queue)</div><div class='ctx'> 				queue-&gt;stats.tx_packets++;</div><div class='ctx'> 				bp-&gt;dev-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='ctx'> 				queue-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='add'>+				packets++;</div><div class='add'>+				bytes += skb-&gt;len;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Now we can safely release resources */</div><div class='del'>-			macb_tx_unmap(bp, tx_skb);</div><div class='add'>+			macb_tx_unmap(bp, tx_skb, budget);</div><div class='ctx'> </div><div class='ctx'> 			/* skb is set only for the last buffer of the frame.</div><div class='ctx'> 			 * WARNING: at this point skb has been freed by</div><div class='hunk'>@@ -893,11 +1237,17 @@ static void macb_tx_interrupt(struct macb_queue *queue)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_tx_completed_queue(netdev_get_tx_queue(bp-&gt;dev, queue_index),</div><div class='add'>+				  packets, bytes);</div><div class='add'>+</div><div class='ctx'> 	queue-&gt;tx_tail = tail;</div><div class='ctx'> 	if (__netif_subqueue_stopped(bp-&gt;dev, queue_index) &amp;&amp;</div><div class='ctx'> 	    CIRC_CNT(queue-&gt;tx_head, queue-&gt;tx_tail,</div><div class='ctx'> 		     bp-&gt;tx_ring_size) &lt;= MACB_TX_WAKEUP_THRESH(bp))</div><div class='ctx'> 		netif_wake_subqueue(bp-&gt;dev, queue_index);</div><div class='add'>+	spin_unlock_irqrestore(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='add'>+</div><div class='add'>+	return packets;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gem_rx_refill(struct macb_queue *queue)</div><div class='hunk'>@@ -915,7 +1265,6 @@ static void gem_rx_refill(struct macb_queue *queue)</div><div class='ctx'> 		/* Make hw descriptor updates visible to CPU */</div><div class='ctx'> 		rmb();</div><div class='ctx'> </div><div class='del'>-		queue-&gt;rx_prepared_head++;</div><div class='ctx'> 		desc = macb_rx_desc(queue, entry);</div><div class='ctx'> </div><div class='ctx'> 		if (!queue-&gt;rx_skbuff[entry]) {</div><div class='hunk'>@@ -947,13 +1296,25 @@ static void gem_rx_refill(struct macb_queue *queue)</div><div class='ctx'> 			dma_wmb();</div><div class='ctx'> 			macb_set_addr(bp, desc, paddr);</div><div class='ctx'> </div><div class='del'>-			/* properly align Ethernet header */</div><div class='del'>-			skb_reserve(skb, NET_IP_ALIGN);</div><div class='add'>+			/* Properly align Ethernet header.</div><div class='add'>+			 *</div><div class='add'>+			 * Hardware can add dummy bytes if asked using the RBOF</div><div class='add'>+			 * field inside the NCFGR register. That feature isn't</div><div class='add'>+			 * available if hardware is RSC capable.</div><div class='add'>+			 *</div><div class='add'>+			 * We cannot fallback to doing the 2-byte shift before</div><div class='add'>+			 * DMA mapping because the address field does not allow</div><div class='add'>+			 * setting the low 2/3 bits.</div><div class='add'>+			 * It is 3 bits if HW_DMA_CAP_PTP, else 2 bits.</div><div class='add'>+			 */</div><div class='add'>+			if (!(bp-&gt;caps &amp; MACB_CAPS_RSC))</div><div class='add'>+				skb_reserve(skb, NET_IP_ALIGN);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			desc-&gt;ctrl = 0;</div><div class='ctx'> 			dma_wmb();</div><div class='ctx'> 			desc-&gt;addr &amp;= ~MACB_BIT(RX_USED);</div><div class='ctx'> 		}</div><div class='add'>+		queue-&gt;rx_prepared_head++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Make descriptor updates visible to hardware */</div><div class='hunk'>@@ -984,7 +1345,8 @@ static void discard_partial_frame(struct macb_queue *queue, unsigned int begin,</div><div class='ctx'> 	 */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gem_rx(struct macb_queue *queue, int budget)</div><div class='add'>+static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,</div><div class='add'>+		  int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = queue-&gt;bp;</div><div class='ctx'> 	unsigned int		len;</div><div class='hunk'>@@ -1066,7 +1428,7 @@ static int gem_rx(struct macb_queue *queue, int budget)</div><div class='ctx'> 			       skb-&gt;data, 32, true);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-		netif_receive_skb(skb);</div><div class='add'>+		napi_gro_receive(napi, skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gem_rx_refill(queue);</div><div class='hunk'>@@ -1074,8 +1436,8 @@ static int gem_rx(struct macb_queue *queue, int budget)</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int macb_rx_frame(struct macb_queue *queue, unsigned int first_frag,</div><div class='del'>-			 unsigned int last_frag)</div><div class='add'>+static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,</div><div class='add'>+			 unsigned int first_frag, unsigned int last_frag)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	unsigned int frag;</div><div class='hunk'>@@ -1151,7 +1513,7 @@ static int macb_rx_frame(struct macb_queue *queue, unsigned int first_frag,</div><div class='ctx'> 	bp-&gt;dev-&gt;stats.rx_bytes += skb-&gt;len;</div><div class='ctx'> 	netdev_vdbg(bp-&gt;dev, "received skb of length %u, csum: %08x\n",</div><div class='ctx'> 		    skb-&gt;len, skb-&gt;csum);</div><div class='del'>-	netif_receive_skb(skb);</div><div class='add'>+	napi_gro_receive(napi, skb);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1174,7 +1536,8 @@ static inline void macb_init_rx_ring(struct macb_queue *queue)</div><div class='ctx'> 	queue-&gt;rx_tail = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int macb_rx(struct macb_queue *queue, int budget)</div><div class='add'>+static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,</div><div class='add'>+		   int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = queue-&gt;bp;</div><div class='ctx'> 	bool reset_rx_queue = false;</div><div class='hunk'>@@ -1211,7 +1574,7 @@ static int macb_rx(struct macb_queue *queue, int budget)</div><div class='ctx'> 				continue;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			dropped = macb_rx_frame(queue, first_frag, tail);</div><div class='add'>+			dropped = macb_rx_frame(queue, napi, first_frag, tail);</div><div class='ctx'> 			first_frag = -1;</div><div class='ctx'> 			if (unlikely(dropped &lt; 0)) {</div><div class='ctx'> 				reset_rx_queue = true;</div><div class='hunk'>@@ -1252,31 +1615,51 @@ static int macb_rx(struct macb_queue *queue, int budget)</div><div class='ctx'> 	return received;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int macb_poll(struct napi_struct *napi, int budget)</div><div class='add'>+static bool macb_rx_pending(struct macb_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = queue-&gt;bp;</div><div class='add'>+	unsigned int		entry;</div><div class='add'>+	struct macb_dma_desc	*desc;</div><div class='add'>+</div><div class='add'>+	entry = macb_rx_ring_wrap(bp, queue-&gt;rx_tail);</div><div class='add'>+	desc = macb_rx_desc(queue, entry);</div><div class='add'>+</div><div class='add'>+	/* Make hw descriptor updates visible to CPU */</div><div class='add'>+	rmb();</div><div class='add'>+</div><div class='add'>+	return (desc-&gt;addr &amp; MACB_BIT(RX_USED)) != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_rx_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='del'>-	struct macb_queue *queue = container_of(napi, struct macb_queue, napi);</div><div class='add'>+	struct macb_queue *queue = container_of(napi, struct macb_queue, napi_rx);</div><div class='ctx'> 	struct macb *bp = queue-&gt;bp;</div><div class='ctx'> 	int work_done;</div><div class='del'>-	u32 status;</div><div class='ctx'> </div><div class='del'>-	status = macb_readl(bp, RSR);</div><div class='del'>-	macb_writel(bp, RSR, status);</div><div class='add'>+	work_done = bp-&gt;macbgem_ops.mog_rx(queue, napi, budget);</div><div class='ctx'> </div><div class='del'>-	netdev_vdbg(bp-&gt;dev, "poll: status = %08lx, budget = %d\n",</div><div class='del'>-		    (unsigned long)status, budget);</div><div class='add'>+	netdev_vdbg(bp-&gt;dev, "RX poll: queue = %u, work_done = %d, budget = %d\n",</div><div class='add'>+		    (unsigned int)(queue - bp-&gt;queues), work_done, budget);</div><div class='ctx'> </div><div class='del'>-	work_done = bp-&gt;macbgem_ops.mog_rx(queue, budget);</div><div class='del'>-	if (work_done &lt; budget) {</div><div class='del'>-		napi_complete_done(napi, work_done);</div><div class='add'>+	if (work_done &lt; budget &amp;&amp; napi_complete_done(napi, work_done)) {</div><div class='add'>+		queue_writel(queue, IER, bp-&gt;rx_intr_mask);</div><div class='ctx'> </div><div class='del'>-		/* Packets received while interrupts were disabled */</div><div class='del'>-		status = macb_readl(bp, RSR);</div><div class='del'>-		if (status) {</div><div class='add'>+		/* Packet completions only seem to propagate to raise</div><div class='add'>+		 * interrupts when interrupts are enabled at the time, so if</div><div class='add'>+		 * packets were received while interrupts were disabled,</div><div class='add'>+		 * they will not cause another interrupt to be generated when</div><div class='add'>+		 * interrupts are re-enabled.</div><div class='add'>+		 * Check for this case here to avoid losing a wakeup. This can</div><div class='add'>+		 * potentially race with the interrupt handler doing the same</div><div class='add'>+		 * actions if an interrupt is raised just after enabling them,</div><div class='add'>+		 * but this should be harmless.</div><div class='add'>+		 */</div><div class='add'>+		if (macb_rx_pending(queue)) {</div><div class='add'>+			queue_writel(queue, IDR, bp-&gt;rx_intr_mask);</div><div class='ctx'> 			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='ctx'> 				queue_writel(queue, ISR, MACB_BIT(RCOMP));</div><div class='del'>-			napi_reschedule(napi);</div><div class='del'>-		} else {</div><div class='del'>-			queue_writel(queue, IER, bp-&gt;rx_intr_mask);</div><div class='add'>+			netdev_vdbg(bp-&gt;dev, "poll: packets pending, reschedule\n");</div><div class='add'>+			napi_schedule(napi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1285,11 +1668,97 @@ static int macb_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macb_hresp_error_task(unsigned long data)</div><div class='add'>+static void macb_tx_restart(struct macb_queue *queue)</div><div class='ctx'> {</div><div class='del'>-	struct macb *bp = (struct macb *)data;</div><div class='add'>+	struct macb *bp = queue-&gt;bp;</div><div class='add'>+	unsigned int head_idx, tbqp;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;tx_head == queue-&gt;tx_tail)</div><div class='add'>+		goto out_tx_ptr_unlock;</div><div class='add'>+</div><div class='add'>+	tbqp = queue_readl(queue, TBQP) / macb_dma_desc_get_size(bp);</div><div class='add'>+	tbqp = macb_adj_dma_desc_idx(bp, macb_tx_ring_wrap(bp, tbqp));</div><div class='add'>+	head_idx = macb_adj_dma_desc_idx(bp, macb_tx_ring_wrap(bp, queue-&gt;tx_head));</div><div class='add'>+</div><div class='add'>+	if (tbqp == head_idx)</div><div class='add'>+		goto out_tx_ptr_unlock;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bp-&gt;lock);</div><div class='add'>+	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));</div><div class='add'>+	spin_unlock(&amp;bp-&gt;lock);</div><div class='add'>+</div><div class='add'>+out_tx_ptr_unlock:</div><div class='add'>+	spin_unlock_irqrestore(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool macb_tx_complete_pending(struct macb_queue *queue)</div><div class='add'>+{</div><div class='add'>+	bool retval = false;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='add'>+	if (queue-&gt;tx_head != queue-&gt;tx_tail) {</div><div class='add'>+		/* Make hw descriptor updates visible to CPU */</div><div class='add'>+		rmb();</div><div class='add'>+</div><div class='add'>+		if (macb_tx_desc(queue, queue-&gt;tx_tail)-&gt;ctrl &amp; MACB_BIT(TX_USED))</div><div class='add'>+			retval = true;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_irqrestore(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_tx_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct macb_queue *queue = container_of(napi, struct macb_queue, napi_tx);</div><div class='add'>+	struct macb *bp = queue-&gt;bp;</div><div class='add'>+	int work_done;</div><div class='add'>+</div><div class='add'>+	work_done = macb_tx_complete(queue, budget);</div><div class='add'>+</div><div class='add'>+	rmb(); // ensure txubr_pending is up to date</div><div class='add'>+	if (queue-&gt;txubr_pending) {</div><div class='add'>+		queue-&gt;txubr_pending = false;</div><div class='add'>+		netdev_vdbg(bp-&gt;dev, "poll: tx restart\n");</div><div class='add'>+		macb_tx_restart(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_vdbg(bp-&gt;dev, "TX poll: queue = %u, work_done = %d, budget = %d\n",</div><div class='add'>+		    (unsigned int)(queue - bp-&gt;queues), work_done, budget);</div><div class='add'>+</div><div class='add'>+	if (work_done &lt; budget &amp;&amp; napi_complete_done(napi, work_done)) {</div><div class='add'>+		queue_writel(queue, IER, MACB_BIT(TCOMP));</div><div class='add'>+</div><div class='add'>+		/* Packet completions only seem to propagate to raise</div><div class='add'>+		 * interrupts when interrupts are enabled at the time, so if</div><div class='add'>+		 * packets were sent while interrupts were disabled,</div><div class='add'>+		 * they will not cause another interrupt to be generated when</div><div class='add'>+		 * interrupts are re-enabled.</div><div class='add'>+		 * Check for this case here to avoid losing a wakeup. This can</div><div class='add'>+		 * potentially race with the interrupt handler doing the same</div><div class='add'>+		 * actions if an interrupt is raised just after enabling them,</div><div class='add'>+		 * but this should be harmless.</div><div class='add'>+		 */</div><div class='add'>+		if (macb_tx_complete_pending(queue)) {</div><div class='add'>+			queue_writel(queue, IDR, MACB_BIT(TCOMP));</div><div class='add'>+			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='add'>+				queue_writel(queue, ISR, MACB_BIT(TCOMP));</div><div class='add'>+			netdev_vdbg(bp-&gt;dev, "TX poll: packets pending, reschedule\n");</div><div class='add'>+			napi_schedule(napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macb_hresp_error_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = from_work(bp, work, hresp_err_bh_work);</div><div class='ctx'> 	struct net_device *dev = bp-&gt;dev;</div><div class='del'>-	struct macb_queue *queue = bp-&gt;queues;</div><div class='add'>+	struct macb_queue *queue;</div><div class='ctx'> 	unsigned int q;</div><div class='ctx'> 	u32 ctrl;</div><div class='ctx'> </div><div class='hunk'>@@ -1308,26 +1777,14 @@ static void macb_hresp_error_task(unsigned long data)</div><div class='ctx'> 	bp-&gt;macbgem_ops.mog_init_rings(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize TX and RX buffers */</div><div class='del'>-	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='del'>-		queue_writel(queue, RBQP, lower_32_bits(queue-&gt;rx_ring_dma));</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-		if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='del'>-			queue_writel(queue, RBQPH,</div><div class='del'>-				     upper_32_bits(queue-&gt;rx_ring_dma));</div><div class='del'>-#endif</div><div class='del'>-		queue_writel(queue, TBQP, lower_32_bits(queue-&gt;tx_ring_dma));</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-		if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='del'>-			queue_writel(queue, TBQPH,</div><div class='del'>-				     upper_32_bits(queue-&gt;tx_ring_dma));</div><div class='del'>-#endif</div><div class='add'>+	macb_init_buffers(bp);</div><div class='ctx'> </div><div class='del'>-		/* Enable interrupts */</div><div class='add'>+	/* Enable interrupts */</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue)</div><div class='ctx'> 		queue_writel(queue, IER,</div><div class='ctx'> 			     bp-&gt;rx_intr_mask |</div><div class='ctx'> 			     MACB_TX_INT_FLAGS |</div><div class='ctx'> 			     MACB_BIT(HRESP));</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	ctrl |= MACB_BIT(RE) | MACB_BIT(TE);</div><div class='ctx'> 	macb_writel(bp, NCR, ctrl);</div><div class='hunk'>@@ -1336,19 +1793,62 @@ static void macb_hresp_error_task(unsigned long data)</div><div class='ctx'> 	netif_tx_start_all_queues(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macb_tx_restart(struct macb_queue *queue)</div><div class='add'>+static irqreturn_t macb_wol_interrupt(int irq, void *dev_id)</div><div class='ctx'> {</div><div class='del'>-	unsigned int head = queue-&gt;tx_head;</div><div class='del'>-	unsigned int tail = queue-&gt;tx_tail;</div><div class='add'>+	struct macb_queue *queue = dev_id;</div><div class='ctx'> 	struct macb *bp = queue-&gt;bp;</div><div class='add'>+	u32 status;</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='del'>-		queue_writel(queue, ISR, MACB_BIT(TXUBR));</div><div class='add'>+	status = queue_readl(queue, ISR);</div><div class='ctx'> </div><div class='del'>-	if (head == tail)</div><div class='del'>-		return;</div><div class='add'>+	if (unlikely(!status))</div><div class='add'>+		return IRQ_NONE;</div><div class='ctx'> </div><div class='del'>-	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));</div><div class='add'>+	spin_lock(&amp;bp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (status &amp; MACB_BIT(WOL)) {</div><div class='add'>+		queue_writel(queue, IDR, MACB_BIT(WOL));</div><div class='add'>+		macb_writel(bp, WOL, 0);</div><div class='add'>+		netdev_vdbg(bp-&gt;dev, "MACB WoL: queue = %u, isr = 0x%08lx\n",</div><div class='add'>+			    (unsigned int)(queue - bp-&gt;queues),</div><div class='add'>+			    (unsigned long)status);</div><div class='add'>+		if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='add'>+			queue_writel(queue, ISR, MACB_BIT(WOL));</div><div class='add'>+		pm_wakeup_event(&amp;bp-&gt;pdev-&gt;dev, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;bp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t gem_wol_interrupt(int irq, void *dev_id)</div><div class='add'>+{</div><div class='add'>+	struct macb_queue *queue = dev_id;</div><div class='add'>+	struct macb *bp = queue-&gt;bp;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	status = queue_readl(queue, ISR);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!status))</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;bp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (status &amp; GEM_BIT(WOL)) {</div><div class='add'>+		queue_writel(queue, IDR, GEM_BIT(WOL));</div><div class='add'>+		gem_writel(bp, WOL, 0);</div><div class='add'>+		netdev_vdbg(bp-&gt;dev, "GEM WoL: queue = %u, isr = 0x%08lx\n",</div><div class='add'>+			    (unsigned int)(queue - bp-&gt;queues),</div><div class='add'>+			    (unsigned long)status);</div><div class='add'>+		if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='add'>+			queue_writel(queue, ISR, GEM_BIT(WOL));</div><div class='add'>+		pm_wakeup_event(&amp;bp-&gt;pdev-&gt;dev, 0);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;bp-&gt;lock);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static irqreturn_t macb_interrupt(int irq, void *dev_id)</div><div class='hunk'>@@ -1389,9 +1889,27 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='ctx'> 				queue_writel(queue, ISR, MACB_BIT(RCOMP));</div><div class='ctx'> </div><div class='del'>-			if (napi_schedule_prep(&amp;queue-&gt;napi)) {</div><div class='add'>+			if (napi_schedule_prep(&amp;queue-&gt;napi_rx)) {</div><div class='ctx'> 				netdev_vdbg(bp-&gt;dev, "scheduling RX softirq\n");</div><div class='del'>-				__napi_schedule(&amp;queue-&gt;napi);</div><div class='add'>+				__napi_schedule(&amp;queue-&gt;napi_rx);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (status &amp; (MACB_BIT(TCOMP) |</div><div class='add'>+			      MACB_BIT(TXUBR))) {</div><div class='add'>+			queue_writel(queue, IDR, MACB_BIT(TCOMP));</div><div class='add'>+			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='add'>+				queue_writel(queue, ISR, MACB_BIT(TCOMP) |</div><div class='add'>+							 MACB_BIT(TXUBR));</div><div class='add'>+</div><div class='add'>+			if (status &amp; MACB_BIT(TXUBR)) {</div><div class='add'>+				queue-&gt;txubr_pending = true;</div><div class='add'>+				wmb(); // ensure softirq can see update</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (napi_schedule_prep(&amp;queue-&gt;napi_tx)) {</div><div class='add'>+				netdev_vdbg(bp-&gt;dev, "scheduling TX softirq\n");</div><div class='add'>+				__napi_schedule(&amp;queue-&gt;napi_tx);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1405,12 +1923,6 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (status &amp; MACB_BIT(TCOMP))</div><div class='del'>-			macb_tx_interrupt(queue);</div><div class='del'>-</div><div class='del'>-		if (status &amp; MACB_BIT(TXUBR))</div><div class='del'>-			macb_tx_restart(queue);</div><div class='del'>-</div><div class='ctx'> 		/* Link change detection isn't possible with RMII, so we'll</div><div class='ctx'> 		 * add that if/when we get our hands on a full-blown MII PHY.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -1434,17 +1946,19 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; MACB_BIT(ISR_ROVR)) {</div><div class='ctx'> 			/* We missed at least one packet */</div><div class='add'>+			spin_lock(&amp;bp-&gt;stats_lock);</div><div class='ctx'> 			if (macb_is_gem(bp))</div><div class='ctx'> 				bp-&gt;hw_stats.gem.rx_overruns++;</div><div class='ctx'> 			else</div><div class='ctx'> 				bp-&gt;hw_stats.macb.rx_overruns++;</div><div class='add'>+			spin_unlock(&amp;bp-&gt;stats_lock);</div><div class='ctx'> </div><div class='ctx'> 			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='ctx'> 				queue_writel(queue, ISR, MACB_BIT(ISR_ROVR));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; MACB_BIT(HRESP)) {</div><div class='del'>-			tasklet_schedule(&amp;bp-&gt;hresp_err_tasklet);</div><div class='add'>+			queue_work(system_bh_wq, &amp;bp-&gt;hresp_err_bh_work);</div><div class='ctx'> 			netdev_err(dev, "DMA bus error: HRESP not OK\n");</div><div class='ctx'> </div><div class='ctx'> 			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='hunk'>@@ -1481,14 +1995,14 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> 				struct sk_buff *skb,</div><div class='ctx'> 				unsigned int hdrlen)</div><div class='ctx'> {</div><div class='del'>-	dma_addr_t mapping;</div><div class='del'>-	unsigned int len, entry, i, tx_head = queue-&gt;tx_head;</div><div class='del'>-	struct macb_tx_skb *tx_skb = NULL;</div><div class='del'>-	struct macb_dma_desc *desc;</div><div class='del'>-	unsigned int offset, size, count = 0;</div><div class='ctx'> 	unsigned int f, nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-	unsigned int eof = 1, mss_mfs = 0;</div><div class='add'>+	unsigned int len, i, tx_head = queue-&gt;tx_head;</div><div class='ctx'> 	u32 ctrl, lso_ctrl = 0, seq_ctrl = 0;</div><div class='add'>+	unsigned int eof = 1, mss_mfs = 0;</div><div class='add'>+	struct macb_tx_skb *tx_skb = NULL;</div><div class='add'>+	struct macb_dma_desc *desc;</div><div class='add'>+	unsigned int offset, size;</div><div class='add'>+	dma_addr_t mapping;</div><div class='ctx'> </div><div class='ctx'> 	/* LSO */</div><div class='ctx'> 	if (skb_shinfo(skb)-&gt;gso_size != 0) {</div><div class='hunk'>@@ -1508,8 +2022,7 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> </div><div class='ctx'> 	offset = 0;</div><div class='ctx'> 	while (len) {</div><div class='del'>-		entry = macb_tx_ring_wrap(bp, tx_head);</div><div class='del'>-		tx_skb = &amp;queue-&gt;tx_skb[entry];</div><div class='add'>+		tx_skb = macb_tx_skb(queue, tx_head);</div><div class='ctx'> </div><div class='ctx'> 		mapping = dma_map_single(&amp;bp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 skb-&gt;data + offset,</div><div class='hunk'>@@ -1525,10 +2038,9 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> </div><div class='ctx'> 		len -= size;</div><div class='ctx'> 		offset += size;</div><div class='del'>-		count++;</div><div class='ctx'> 		tx_head++;</div><div class='ctx'> </div><div class='del'>-		size = min(len, bp-&gt;max_tx_length);</div><div class='add'>+		size = umin(len, bp-&gt;max_tx_length);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Then, map paged data from fragments */</div><div class='hunk'>@@ -1538,9 +2050,8 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> 		len = skb_frag_size(frag);</div><div class='ctx'> 		offset = 0;</div><div class='ctx'> 		while (len) {</div><div class='del'>-			size = min(len, bp-&gt;max_tx_length);</div><div class='del'>-			entry = macb_tx_ring_wrap(bp, tx_head);</div><div class='del'>-			tx_skb = &amp;queue-&gt;tx_skb[entry];</div><div class='add'>+			size = umin(len, bp-&gt;max_tx_length);</div><div class='add'>+			tx_skb = macb_tx_skb(queue, tx_head);</div><div class='ctx'> </div><div class='ctx'> 			mapping = skb_frag_dma_map(&amp;bp-&gt;pdev-&gt;dev, frag,</div><div class='ctx'> 						   offset, size, DMA_TO_DEVICE);</div><div class='hunk'>@@ -1555,7 +2066,6 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> </div><div class='ctx'> 			len -= size;</div><div class='ctx'> 			offset += size;</div><div class='del'>-			count++;</div><div class='ctx'> 			tx_head++;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1577,9 +2087,8 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> 	 * to set the end of TX queue</div><div class='ctx'> 	 */</div><div class='ctx'> 	i = tx_head;</div><div class='del'>-	entry = macb_tx_ring_wrap(bp, i);</div><div class='ctx'> 	ctrl = MACB_BIT(TX_USED);</div><div class='del'>-	desc = macb_tx_desc(queue, entry);</div><div class='add'>+	desc = macb_tx_desc(queue, i);</div><div class='ctx'> 	desc-&gt;ctrl = ctrl;</div><div class='ctx'> </div><div class='ctx'> 	if (lso_ctrl) {</div><div class='hunk'>@@ -1599,16 +2108,15 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		i--;</div><div class='del'>-		entry = macb_tx_ring_wrap(bp, i);</div><div class='del'>-		tx_skb = &amp;queue-&gt;tx_skb[entry];</div><div class='del'>-		desc = macb_tx_desc(queue, entry);</div><div class='add'>+		tx_skb = macb_tx_skb(queue, i);</div><div class='add'>+		desc = macb_tx_desc(queue, i);</div><div class='ctx'> </div><div class='ctx'> 		ctrl = (u32)tx_skb-&gt;size;</div><div class='ctx'> 		if (eof) {</div><div class='ctx'> 			ctrl |= MACB_BIT(TX_LAST);</div><div class='ctx'> 			eof = 0;</div><div class='ctx'> 		}</div><div class='del'>-		if (unlikely(entry == (bp-&gt;tx_ring_size - 1)))</div><div class='add'>+		if (unlikely(macb_tx_ring_wrap(bp, i) == bp-&gt;tx_ring_size - 1))</div><div class='ctx'> 			ctrl |= MACB_BIT(TX_WRAP);</div><div class='ctx'> </div><div class='ctx'> 		/* First descriptor is header descriptor */</div><div class='hunk'>@@ -1616,7 +2124,8 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> 			ctrl |= MACB_BF(TX_LSO, lso_ctrl);</div><div class='ctx'> 			ctrl |= MACB_BF(TX_TCP_SEQ_SRC, seq_ctrl);</div><div class='ctx'> 			if ((bp-&gt;dev-&gt;features &amp; NETIF_F_HW_CSUM) &amp;&amp;</div><div class='del'>-			    skb-&gt;ip_summed != CHECKSUM_PARTIAL &amp;&amp; !lso_ctrl)</div><div class='add'>+			    skb-&gt;ip_summed != CHECKSUM_PARTIAL &amp;&amp; !lso_ctrl &amp;&amp;</div><div class='add'>+			    !ptp_one_step_sync(skb))</div><div class='ctx'> 				ctrl |= MACB_BIT(TX_NOCRC);</div><div class='ctx'> 		} else</div><div class='ctx'> 			/* Only set MSS/MFS on payload descriptors</div><div class='hunk'>@@ -1635,7 +2144,7 @@ static unsigned int macb_tx_map(struct macb *bp,</div><div class='ctx'> </div><div class='ctx'> 	queue-&gt;tx_head = tx_head;</div><div class='ctx'> </div><div class='del'>-	return count;</div><div class='add'>+	return 0;</div><div class='ctx'> </div><div class='ctx'> dma_error:</div><div class='ctx'> 	netdev_err(bp-&gt;dev, "TX DMA map failed\n");</div><div class='hunk'>@@ -1643,10 +2152,10 @@ dma_error:</div><div class='ctx'> 	for (i = queue-&gt;tx_head; i != tx_head; i++) {</div><div class='ctx'> 		tx_skb = macb_tx_skb(queue, i);</div><div class='ctx'> </div><div class='del'>-		macb_tx_unmap(bp, tx_skb);</div><div class='add'>+		macb_tx_unmap(bp, tx_skb, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static netdev_features_t macb_features_check(struct sk_buff *skb,</div><div class='hunk'>@@ -1658,16 +2167,14 @@ static netdev_features_t macb_features_check(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	/* Validate LSO compatibility */</div><div class='ctx'> </div><div class='del'>-	/* there is only one buffer */</div><div class='del'>-	if (!skb_is_nonlinear(skb))</div><div class='add'>+	/* there is only one buffer or protocol is not UDP */</div><div class='add'>+	if (!skb_is_nonlinear(skb) || (ip_hdr(skb)-&gt;protocol != IPPROTO_UDP))</div><div class='ctx'> 		return features;</div><div class='ctx'> </div><div class='ctx'> 	/* length of header */</div><div class='ctx'> 	hdrlen = skb_transport_offset(skb);</div><div class='del'>-	if (ip_hdr(skb)-&gt;protocol == IPPROTO_TCP)</div><div class='del'>-		hdrlen += tcp_hdrlen(skb);</div><div class='ctx'> </div><div class='del'>-	/* For LSO:</div><div class='add'>+	/* For UFO only:</div><div class='ctx'> 	 * When software supplies two or more payload buffers all payload buffers</div><div class='ctx'> 	 * apart from the last must be a multiple of 8 bytes in size.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1706,25 +2213,22 @@ static inline int macb_clear_csum(struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)</div><div class='ctx'> {</div><div class='del'>-	bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb);</div><div class='add'>+	bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb) ||</div><div class='add'>+		      skb_is_nonlinear(*skb);</div><div class='ctx'> 	int padlen = ETH_ZLEN - (*skb)-&gt;len;</div><div class='del'>-	int headroom = skb_headroom(*skb);</div><div class='ctx'> 	int tailroom = skb_tailroom(*skb);</div><div class='ctx'> 	struct sk_buff *nskb;</div><div class='ctx'> 	u32 fcs;</div><div class='ctx'> </div><div class='ctx'> 	if (!(ndev-&gt;features &amp; NETIF_F_HW_CSUM) ||</div><div class='ctx'> 	    !((*skb)-&gt;ip_summed != CHECKSUM_PARTIAL) ||</div><div class='del'>-	    skb_shinfo(*skb)-&gt;gso_size)	/* Not available for GSO */</div><div class='add'>+	    skb_shinfo(*skb)-&gt;gso_size || ptp_one_step_sync(*skb))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (padlen &lt;= 0) {</div><div class='ctx'> 		/* FCS could be appeded to tailroom. */</div><div class='ctx'> 		if (tailroom &gt;= ETH_FCS_LEN)</div><div class='ctx'> 			goto add_fcs;</div><div class='del'>-		/* FCS could be appeded by moving data to headroom. */</div><div class='del'>-		else if (!cloned &amp;&amp; headroom + tailroom &gt;= ETH_FCS_LEN)</div><div class='del'>-			padlen = 0;</div><div class='ctx'> 		/* No room for FCS, need to reallocate skb. */</div><div class='ctx'> 		else</div><div class='ctx'> 			padlen = ETH_FCS_LEN;</div><div class='hunk'>@@ -1733,10 +2237,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev)</div><div class='ctx'> 		padlen += ETH_FCS_LEN;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!cloned &amp;&amp; headroom + tailroom &gt;= padlen) {</div><div class='del'>-		(*skb)-&gt;data = memmove((*skb)-&gt;head, (*skb)-&gt;data, (*skb)-&gt;len);</div><div class='del'>-		skb_set_tail_pointer(*skb, (*skb)-&gt;len);</div><div class='del'>-	} else {</div><div class='add'>+	if (cloned || tailroom &lt; padlen) {</div><div class='ctx'> 		nskb = skb_copy_expand(*skb, 0, padlen, GFP_ATOMIC);</div><div class='ctx'> 		if (!nskb)</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -1766,10 +2267,10 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	u16 queue_index = skb_get_queue_mapping(skb);</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	struct macb_queue *queue = &amp;bp-&gt;queues[queue_index];</div><div class='del'>-	unsigned long flags;</div><div class='ctx'> 	unsigned int desc_cnt, nr_frags, frag_size, f;</div><div class='ctx'> 	unsigned int hdrlen;</div><div class='del'>-	bool is_lso, is_udp = 0;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	bool is_lso;</div><div class='ctx'> 	netdev_tx_t ret = NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> 	if (macb_clear_csum(skb)) {</div><div class='hunk'>@@ -1782,24 +2283,26 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (macb_dma_ptp(bp) &amp;&amp;</div><div class='add'>+	    (skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP))</div><div class='add'>+		skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+</div><div class='ctx'> 	is_lso = (skb_shinfo(skb)-&gt;gso_size != 0);</div><div class='ctx'> </div><div class='ctx'> 	if (is_lso) {</div><div class='del'>-		is_udp = !!(ip_hdr(skb)-&gt;protocol == IPPROTO_UDP);</div><div class='del'>-</div><div class='ctx'> 		/* length of headers */</div><div class='del'>-		if (is_udp)</div><div class='add'>+		if (ip_hdr(skb)-&gt;protocol == IPPROTO_UDP)</div><div class='ctx'> 			/* only queue eth + ip headers separately for UDP */</div><div class='ctx'> 			hdrlen = skb_transport_offset(skb);</div><div class='ctx'> 		else</div><div class='del'>-			hdrlen = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+			hdrlen = skb_tcp_all_headers(skb);</div><div class='ctx'> 		if (skb_headlen(skb) &lt; hdrlen) {</div><div class='ctx'> 			netdev_err(bp-&gt;dev, "Error - LSO headers fragmented!!!\n");</div><div class='ctx'> 			/* if this is required, would need to copy to single buffer */</div><div class='ctx'> 			return NETDEV_TX_BUSY;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else</div><div class='del'>-		hdrlen = min(skb_headlen(skb), bp-&gt;max_tx_length);</div><div class='add'>+		hdrlen = umin(skb_headlen(skb), bp-&gt;max_tx_length);</div><div class='ctx'> </div><div class='ctx'> #if defined(DEBUG) &amp;&amp; defined(VERBOSE_DEBUG)</div><div class='ctx'> 	netdev_vdbg(bp-&gt;dev,</div><div class='hunk'>@@ -1825,20 +2328,20 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		desc_cnt += DIV_ROUND_UP(frag_size, bp-&gt;max_tx_length);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='add'>+	spin_lock_irqsave(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	/* This is a hard error, log it. */</div><div class='ctx'> 	if (CIRC_SPACE(queue-&gt;tx_head, queue-&gt;tx_tail,</div><div class='ctx'> 		       bp-&gt;tx_ring_size) &lt; desc_cnt) {</div><div class='ctx'> 		netif_stop_subqueue(dev, queue_index);</div><div class='del'>-		spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='ctx'> 		netdev_dbg(bp-&gt;dev, "tx_head = %u, tx_tail = %u\n",</div><div class='ctx'> 			   queue-&gt;tx_head, queue-&gt;tx_tail);</div><div class='del'>-		return NETDEV_TX_BUSY;</div><div class='add'>+		ret = NETDEV_TX_BUSY;</div><div class='add'>+		goto unlock;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Map socket buffer for DMA transfer */</div><div class='del'>-	if (!macb_tx_map(bp, queue, skb, hdrlen)) {</div><div class='add'>+	if (macb_tx_map(bp, queue, skb, hdrlen)) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1846,14 +2349,18 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Make newly initialized descriptor visible to hardware */</div><div class='ctx'> 	wmb();</div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='add'>+	netdev_tx_sent_queue(netdev_get_tx_queue(bp-&gt;dev, queue_index),</div><div class='add'>+			     skb-&gt;len);</div><div class='ctx'> </div><div class='add'>+	spin_lock(&amp;bp-&gt;lock);</div><div class='ctx'> 	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));</div><div class='add'>+	spin_unlock(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	if (CIRC_SPACE(queue-&gt;tx_head, queue-&gt;tx_tail, bp-&gt;tx_ring_size) &lt; 1)</div><div class='ctx'> 		netif_stop_subqueue(dev, queue_index);</div><div class='ctx'> </div><div class='ctx'> unlock:</div><div class='del'>-	spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+	spin_unlock_irqrestore(&amp;queue-&gt;tx_ptr_lock, flags);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1923,29 +2430,42 @@ static void macb_free_rx_buffers(struct macb *bp)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static unsigned int macb_tx_ring_size_per_queue(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	return macb_dma_desc_get_size(bp) * bp-&gt;tx_ring_size + bp-&gt;tx_bd_rd_prefetch;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int macb_rx_ring_size_per_queue(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	return macb_dma_desc_get_size(bp) * bp-&gt;rx_ring_size + bp-&gt;rx_bd_rd_prefetch;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void macb_free_consistent(struct macb *bp)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;bp-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct macb_queue *queue;</div><div class='ctx'> 	unsigned int q;</div><div class='del'>-	int size;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;rx_ring_tieoff) {</div><div class='add'>+		dma_free_coherent(dev, macb_dma_desc_get_size(bp),</div><div class='add'>+				  bp-&gt;rx_ring_tieoff, bp-&gt;rx_ring_tieoff_dma);</div><div class='add'>+		bp-&gt;rx_ring_tieoff = NULL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;macbgem_ops.mog_free_rx_buffers(bp);</div><div class='ctx'> </div><div class='add'>+	size = bp-&gt;num_queues * macb_tx_ring_size_per_queue(bp);</div><div class='add'>+	dma_free_coherent(dev, size, bp-&gt;queues[0].tx_ring, bp-&gt;queues[0].tx_ring_dma);</div><div class='add'>+</div><div class='add'>+	size = bp-&gt;num_queues * macb_rx_ring_size_per_queue(bp);</div><div class='add'>+	dma_free_coherent(dev, size, bp-&gt;queues[0].rx_ring, bp-&gt;queues[0].rx_ring_dma);</div><div class='add'>+</div><div class='ctx'> 	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='ctx'> 		kfree(queue-&gt;tx_skb);</div><div class='ctx'> 		queue-&gt;tx_skb = NULL;</div><div class='del'>-		if (queue-&gt;tx_ring) {</div><div class='del'>-			size = TX_RING_BYTES(bp) + bp-&gt;tx_bd_rd_prefetch;</div><div class='del'>-			dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, size,</div><div class='del'>-					  queue-&gt;tx_ring, queue-&gt;tx_ring_dma);</div><div class='del'>-			queue-&gt;tx_ring = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (queue-&gt;rx_ring) {</div><div class='del'>-			size = RX_RING_BYTES(bp) + bp-&gt;rx_bd_rd_prefetch;</div><div class='del'>-			dma_free_coherent(&amp;bp-&gt;pdev-&gt;dev, size,</div><div class='del'>-					  queue-&gt;rx_ring, queue-&gt;rx_ring_dma);</div><div class='del'>-			queue-&gt;rx_ring = NULL;</div><div class='del'>-		}</div><div class='add'>+		queue-&gt;tx_ring = NULL;</div><div class='add'>+		queue-&gt;rx_ring = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1987,39 +2507,59 @@ static int macb_alloc_rx_buffers(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> static int macb_alloc_consistent(struct macb *bp)</div><div class='ctx'> {</div><div class='add'>+	struct device *dev = &amp;bp-&gt;pdev-&gt;dev;</div><div class='add'>+	dma_addr_t tx_dma, rx_dma;</div><div class='ctx'> 	struct macb_queue *queue;</div><div class='ctx'> 	unsigned int q;</div><div class='del'>-	int size;</div><div class='add'>+	void *tx, *rx;</div><div class='add'>+	size_t size;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Upper 32-bits of Tx/Rx DMA descriptor for each queues much match!</div><div class='add'>+	 * We cannot enforce this guarantee, the best we can do is do a single</div><div class='add'>+	 * allocation and hope it will land into alloc_pages() that guarantees</div><div class='add'>+	 * natural alignment of physical addresses.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	size = bp-&gt;num_queues * macb_tx_ring_size_per_queue(bp);</div><div class='add'>+	tx = dma_alloc_coherent(dev, size, &amp;tx_dma, GFP_KERNEL);</div><div class='add'>+	if (!tx || upper_32_bits(tx_dma) != upper_32_bits(tx_dma + size - 1))</div><div class='add'>+		goto out_err;</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "Allocated %zu bytes for %u TX rings at %08lx (mapped %p)\n",</div><div class='add'>+		   size, bp-&gt;num_queues, (unsigned long)tx_dma, tx);</div><div class='add'>+</div><div class='add'>+	size = bp-&gt;num_queues * macb_rx_ring_size_per_queue(bp);</div><div class='add'>+	rx = dma_alloc_coherent(dev, size, &amp;rx_dma, GFP_KERNEL);</div><div class='add'>+	if (!rx || upper_32_bits(rx_dma) != upper_32_bits(rx_dma + size - 1))</div><div class='add'>+		goto out_err;</div><div class='add'>+	netdev_dbg(bp-&gt;dev, "Allocated %zu bytes for %u RX rings at %08lx (mapped %p)\n",</div><div class='add'>+		   size, bp-&gt;num_queues, (unsigned long)rx_dma, rx);</div><div class='ctx'> </div><div class='ctx'> 	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='del'>-		size = TX_RING_BYTES(bp) + bp-&gt;tx_bd_rd_prefetch;</div><div class='del'>-		queue-&gt;tx_ring = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, size,</div><div class='del'>-						    &amp;queue-&gt;tx_ring_dma,</div><div class='del'>-						    GFP_KERNEL);</div><div class='del'>-		if (!queue-&gt;tx_ring)</div><div class='del'>-			goto out_err;</div><div class='del'>-		netdev_dbg(bp-&gt;dev,</div><div class='del'>-			   "Allocated TX ring for queue %u of %d bytes at %08lx (mapped %p)\n",</div><div class='del'>-			   q, size, (unsigned long)queue-&gt;tx_ring_dma,</div><div class='del'>-			   queue-&gt;tx_ring);</div><div class='add'>+		queue-&gt;tx_ring = tx + macb_tx_ring_size_per_queue(bp) * q;</div><div class='add'>+		queue-&gt;tx_ring_dma = tx_dma + macb_tx_ring_size_per_queue(bp) * q;</div><div class='add'>+</div><div class='add'>+		queue-&gt;rx_ring = rx + macb_rx_ring_size_per_queue(bp) * q;</div><div class='add'>+		queue-&gt;rx_ring_dma = rx_dma + macb_rx_ring_size_per_queue(bp) * q;</div><div class='ctx'> </div><div class='ctx'> 		size = bp-&gt;tx_ring_size * sizeof(struct macb_tx_skb);</div><div class='ctx'> 		queue-&gt;tx_skb = kmalloc(size, GFP_KERNEL);</div><div class='ctx'> 		if (!queue-&gt;tx_skb)</div><div class='ctx'> 			goto out_err;</div><div class='del'>-</div><div class='del'>-		size = RX_RING_BYTES(bp) + bp-&gt;rx_bd_rd_prefetch;</div><div class='del'>-		queue-&gt;rx_ring = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev, size,</div><div class='del'>-						 &amp;queue-&gt;rx_ring_dma, GFP_KERNEL);</div><div class='del'>-		if (!queue-&gt;rx_ring)</div><div class='del'>-			goto out_err;</div><div class='del'>-		netdev_dbg(bp-&gt;dev,</div><div class='del'>-			   "Allocated RX ring of %d bytes at %08lx (mapped %p)\n",</div><div class='del'>-			   size, (unsigned long)queue-&gt;rx_ring_dma, queue-&gt;rx_ring);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (bp-&gt;macbgem_ops.mog_alloc_rx_buffers(bp))</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='add'>+	/* Required for tie off descriptor for PM cases */</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_QUEUE_DISABLE)) {</div><div class='add'>+		bp-&gt;rx_ring_tieoff = dma_alloc_coherent(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+							macb_dma_desc_get_size(bp),</div><div class='add'>+							&amp;bp-&gt;rx_ring_tieoff_dma,</div><div class='add'>+							GFP_KERNEL);</div><div class='add'>+		if (!bp-&gt;rx_ring_tieoff)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> out_err:</div><div class='hunk'>@@ -2027,6 +2567,19 @@ out_err:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void macb_init_tieoff(struct macb *bp)</div><div class='add'>+{</div><div class='add'>+	struct macb_dma_desc *desc = bp-&gt;rx_ring_tieoff;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;caps &amp; MACB_CAPS_QUEUE_DISABLE)</div><div class='add'>+		return;</div><div class='add'>+	/* Setup a wrapping descriptor with no free slots</div><div class='add'>+	 * (WRAP and USED) to tie off/disable unused RX queues.</div><div class='add'>+	 */</div><div class='add'>+	macb_set_addr(bp, desc, MACB_BIT(RX_WRAP) | MACB_BIT(RX_USED));</div><div class='add'>+	desc-&gt;ctrl = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gem_init_rings(struct macb *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb_queue *queue;</div><div class='hunk'>@@ -2050,6 +2603,7 @@ static void gem_init_rings(struct macb *bp)</div><div class='ctx'> 		gem_rx_refill(queue);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	macb_init_tieoff(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void macb_init_rings(struct macb *bp)</div><div class='hunk'>@@ -2067,6 +2621,8 @@ static void macb_init_rings(struct macb *bp)</div><div class='ctx'> 	bp-&gt;queues[0].tx_head = 0;</div><div class='ctx'> 	bp-&gt;queues[0].tx_tail = 0;</div><div class='ctx'> 	desc-&gt;ctrl |= MACB_BIT(TX_WRAP);</div><div class='add'>+</div><div class='add'>+	macb_init_tieoff(bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void macb_reset_hw(struct macb *bp)</div><div class='hunk'>@@ -2089,6 +2645,9 @@ static void macb_reset_hw(struct macb *bp)</div><div class='ctx'> 	macb_writel(bp, TSR, -1);</div><div class='ctx'> 	macb_writel(bp, RSR, -1);</div><div class='ctx'> </div><div class='add'>+	/* Disable RX partial store and forward and reset watermark value */</div><div class='add'>+	gem_writel(bp, PBUFRXCUT, 0);</div><div class='add'>+</div><div class='ctx'> 	/* Disable all interrupts */</div><div class='ctx'> 	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='ctx'> 		queue_writel(queue, IDR, -1);</div><div class='hunk'>@@ -2113,8 +2672,12 @@ static u32 gem_mdc_clk_div(struct macb *bp)</div><div class='ctx'> 		config = GEM_BF(CLK, GEM_CLK_DIV48);</div><div class='ctx'> 	else if (pclk_hz &lt;= 160000000)</div><div class='ctx'> 		config = GEM_BF(CLK, GEM_CLK_DIV64);</div><div class='del'>-	else</div><div class='add'>+	else if (pclk_hz &lt;= 240000000)</div><div class='ctx'> 		config = GEM_BF(CLK, GEM_CLK_DIV96);</div><div class='add'>+	else if (pclk_hz &lt;= 320000000)</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV128);</div><div class='add'>+	else</div><div class='add'>+		config = GEM_BF(CLK, GEM_CLK_DIV224);</div><div class='ctx'> </div><div class='ctx'> 	return config;</div><div class='ctx'> }</div><div class='hunk'>@@ -2199,14 +2762,10 @@ static void macb_configure_dma(struct macb *bp)</div><div class='ctx'> 			dmacfg &amp;= ~GEM_BIT(TXCOEN);</div><div class='ctx'> </div><div class='ctx'> 		dmacfg &amp;= ~GEM_BIT(ADDR64);</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-		if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='add'>+		if (macb_dma64(bp))</div><div class='ctx'> 			dmacfg |= GEM_BIT(ADDR64);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_MACB_USE_HWSTAMP</div><div class='del'>-		if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_PTP)</div><div class='add'>+		if (macb_dma_ptp(bp))</div><div class='ctx'> 			dmacfg |= GEM_BIT(RXEXT) | GEM_BIT(TXEXT);</div><div class='del'>-#endif</div><div class='ctx'> 		netdev_dbg(bp-&gt;dev, "Cadence configure DMA with 0x%08x\n",</div><div class='ctx'> 			   dmacfg);</div><div class='ctx'> 		gem_writel(bp, DMACFG, dmacfg);</div><div class='hunk'>@@ -2215,19 +2774,17 @@ static void macb_configure_dma(struct macb *bp)</div><div class='ctx'> </div><div class='ctx'> static void macb_init_hw(struct macb *bp)</div><div class='ctx'> {</div><div class='del'>-	struct macb_queue *queue;</div><div class='del'>-	unsigned int q;</div><div class='del'>-</div><div class='ctx'> 	u32 config;</div><div class='ctx'> </div><div class='ctx'> 	macb_reset_hw(bp);</div><div class='ctx'> 	macb_set_hwaddr(bp);</div><div class='ctx'> </div><div class='ctx'> 	config = macb_mdc_clk_div(bp);</div><div class='del'>-	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_SGMII)</div><div class='del'>-		config |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL);</div><div class='del'>-	config |= MACB_BF(RBOF, NET_IP_ALIGN);	/* Make eth data aligned */</div><div class='del'>-	config |= MACB_BIT(PAE);		/* PAuse Enable */</div><div class='add'>+	/* Make eth data aligned.</div><div class='add'>+	 * If RSC capable, that offset is ignored by HW.</div><div class='add'>+	 */</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_RSC))</div><div class='add'>+		config |= MACB_BF(RBOF, NET_IP_ALIGN);</div><div class='ctx'> 	config |= MACB_BIT(DRFCS);		/* Discard Rx FCS */</div><div class='ctx'> 	if (bp-&gt;caps &amp; MACB_CAPS_JUMBO)</div><div class='ctx'> 		config |= MACB_BIT(JFRAME);	/* Enable jumbo frames */</div><div class='hunk'>@@ -2243,36 +2800,15 @@ static void macb_init_hw(struct macb *bp)</div><div class='ctx'> 	macb_writel(bp, NCFGR, config);</div><div class='ctx'> 	if ((bp-&gt;caps &amp; MACB_CAPS_JUMBO) &amp;&amp; bp-&gt;jumbo_max_len)</div><div class='ctx'> 		gem_writel(bp, JML, bp-&gt;jumbo_max_len);</div><div class='del'>-	bp-&gt;speed = SPEED_10;</div><div class='del'>-	bp-&gt;duplex = DUPLEX_HALF;</div><div class='ctx'> 	bp-&gt;rx_frm_len_mask = MACB_RX_FRMLEN_MASK;</div><div class='ctx'> 	if (bp-&gt;caps &amp; MACB_CAPS_JUMBO)</div><div class='ctx'> 		bp-&gt;rx_frm_len_mask = MACB_RX_JFRMLEN_MASK;</div><div class='ctx'> </div><div class='ctx'> 	macb_configure_dma(bp);</div><div class='ctx'> </div><div class='del'>-	/* Initialize TX and RX buffers */</div><div class='del'>-	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='del'>-		queue_writel(queue, RBQP, lower_32_bits(queue-&gt;rx_ring_dma));</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-		if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='del'>-			queue_writel(queue, RBQPH, upper_32_bits(queue-&gt;rx_ring_dma));</div><div class='del'>-#endif</div><div class='del'>-		queue_writel(queue, TBQP, lower_32_bits(queue-&gt;tx_ring_dma));</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-		if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B)</div><div class='del'>-			queue_writel(queue, TBQPH, upper_32_bits(queue-&gt;tx_ring_dma));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* Enable interrupts */</div><div class='del'>-		queue_writel(queue, IER,</div><div class='del'>-			     bp-&gt;rx_intr_mask |</div><div class='del'>-			     MACB_TX_INT_FLAGS |</div><div class='del'>-			     MACB_BIT(HRESP));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Enable TX and RX */</div><div class='del'>-	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE));</div><div class='add'>+	/* Enable RX partial store and forward and set watermark */</div><div class='add'>+	if (bp-&gt;rx_watermark)</div><div class='add'>+		gem_writel(bp, PBUFRXCUT, (bp-&gt;rx_watermark | GEM_BIT(ENCUTTHRU)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* The hash address register is 64 bits long and takes up two</div><div class='hunk'>@@ -2396,26 +2932,17 @@ static void macb_set_rx_mode(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int macb_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	size_t bufsz = dev-&gt;mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN;</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	struct macb_queue *queue;</div><div class='ctx'> 	unsigned int q;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(bp-&gt;dev, "open\n");</div><div class='ctx'> </div><div class='del'>-	err = pm_runtime_get_sync(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	err = pm_runtime_resume_and_get(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		goto pm_exit;</div><div class='del'>-</div><div class='del'>-	/* carrier starts down */</div><div class='del'>-	netif_carrier_off(dev);</div><div class='del'>-</div><div class='del'>-	/* if the phy is not yet register, retry later*/</div><div class='del'>-	if (!dev-&gt;phydev) {</div><div class='del'>-		err = -EAGAIN;</div><div class='del'>-		goto pm_exit;</div><div class='del'>-	}</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='ctx'> 	/* RX buffers initialization */</div><div class='ctx'> 	macb_init_rx_buffer_size(bp, bufsz);</div><div class='hunk'>@@ -2427,26 +2954,45 @@ static int macb_open(struct net_device *dev)</div><div class='ctx'> 		goto pm_exit;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue)</div><div class='del'>-		napi_enable(&amp;queue-&gt;napi);</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='add'>+		napi_enable(&amp;queue-&gt;napi_rx);</div><div class='add'>+		napi_enable(&amp;queue-&gt;napi_tx);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;macbgem_ops.mog_init_rings(bp);</div><div class='ctx'> 	macb_init_hw(bp);</div><div class='ctx'> </div><div class='del'>-	/* schedule a link state check */</div><div class='del'>-	phy_start(dev-&gt;phydev);</div><div class='add'>+	err = phy_set_mode_ext(bp-&gt;phy, PHY_MODE_ETHERNET, bp-&gt;phy_interface);</div><div class='add'>+	if (err)</div><div class='add'>+		goto reset_hw;</div><div class='add'>+</div><div class='add'>+	err = phy_power_on(bp-&gt;phy);</div><div class='add'>+	if (err)</div><div class='add'>+		goto reset_hw;</div><div class='add'>+</div><div class='add'>+	err = macb_phylink_connect(bp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto phy_off;</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;ptp_info)</div><div class='ctx'> 		bp-&gt;ptp_info-&gt;ptp_init(dev);</div><div class='ctx'> </div><div class='del'>-pm_exit:</div><div class='del'>-	if (err) {</div><div class='del'>-		pm_runtime_put_sync(&amp;bp-&gt;pdev-&gt;dev);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+phy_off:</div><div class='add'>+	phy_power_off(bp-&gt;phy);</div><div class='add'>+</div><div class='add'>+reset_hw:</div><div class='add'>+	macb_reset_hw(bp);</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='add'>+		napi_disable(&amp;queue-&gt;napi_rx);</div><div class='add'>+		napi_disable(&amp;queue-&gt;napi_tx);</div><div class='add'>+	}</div><div class='add'>+	macb_free_consistent(bp);</div><div class='add'>+pm_exit:</div><div class='add'>+	pm_runtime_put_sync(&amp;bp-&gt;pdev-&gt;dev);</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int macb_close(struct net_device *dev)</div><div class='hunk'>@@ -2458,11 +3004,16 @@ static int macb_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_stop_all_queues(dev);</div><div class='ctx'> </div><div class='del'>-	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue)</div><div class='del'>-		napi_disable(&amp;queue-&gt;napi);</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='add'>+		napi_disable(&amp;queue-&gt;napi_rx);</div><div class='add'>+		napi_disable(&amp;queue-&gt;napi_tx);</div><div class='add'>+		netdev_tx_reset_queue(netdev_get_tx_queue(dev, q));</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (dev-&gt;phydev)</div><div class='del'>-		phy_stop(dev-&gt;phydev);</div><div class='add'>+	phylink_stop(bp-&gt;phylink);</div><div class='add'>+	phylink_disconnect_phy(bp-&gt;phylink);</div><div class='add'>+</div><div class='add'>+	phy_power_off(bp-&gt;phy);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> 	macb_reset_hw(bp);</div><div class='hunk'>@@ -2484,8 +3035,20 @@ static int macb_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_set_mac_addr(struct net_device *dev, void *addr)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = eth_mac_addr(dev, addr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return err;</div><div class='ctx'> </div><div class='add'>+	macb_set_hwaddr(netdev_priv(dev));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2495,7 +3058,7 @@ static void gem_update_stats(struct macb *bp)</div><div class='ctx'> 	unsigned int i, q, idx;</div><div class='ctx'> 	unsigned long *stat;</div><div class='ctx'> </div><div class='del'>-	u32 *p = &amp;bp-&gt;hw_stats.gem.tx_octets_31_0;</div><div class='add'>+	u64 *p = &amp;bp-&gt;hw_stats.gem.tx_octets;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; GEM_STATS_LEN; ++i, ++p) {</div><div class='ctx'> 		u32 offset = gem_statistics[i].offset;</div><div class='hunk'>@@ -2508,7 +3071,7 @@ static void gem_update_stats(struct macb *bp)</div><div class='ctx'> 			/* Add GEM_OCTTXH, GEM_OCTRXH */</div><div class='ctx'> 			val = bp-&gt;macb_reg_readl(bp, offset + 4);</div><div class='ctx'> 			bp-&gt;ethtool_stats[i] += ((u64)val) &lt;&lt; 32;</div><div class='del'>-			*(++p) += val;</div><div class='add'>+			*p += ((u64)val) &lt;&lt; 32;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2518,12 +3081,13 @@ static void gem_update_stats(struct macb *bp)</div><div class='ctx'> 			bp-&gt;ethtool_stats[idx++] = *stat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_stats *gem_get_stats(struct macb *bp)</div><div class='add'>+static void gem_get_stats(struct macb *bp, struct rtnl_link_stats64 *nstat)</div><div class='ctx'> {</div><div class='ctx'> 	struct gem_stats *hwstat = &amp;bp-&gt;hw_stats.gem;</div><div class='del'>-	struct net_device_stats *nstat = &amp;bp-&gt;dev-&gt;stats;</div><div class='ctx'> </div><div class='del'>-	gem_update_stats(bp);</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	if (netif_running(bp-&gt;dev))</div><div class='add'>+		gem_update_stats(bp);</div><div class='ctx'> </div><div class='ctx'> 	nstat-&gt;rx_errors = (hwstat-&gt;rx_frame_check_sequence_errors +</div><div class='ctx'> 			    hwstat-&gt;rx_alignment_errors +</div><div class='hunk'>@@ -2552,19 +3116,19 @@ static struct net_device_stats *gem_get_stats(struct macb *bp)</div><div class='ctx'> 	nstat-&gt;tx_aborted_errors = hwstat-&gt;tx_excessive_collisions;</div><div class='ctx'> 	nstat-&gt;tx_carrier_errors = hwstat-&gt;tx_carrier_sense_errors;</div><div class='ctx'> 	nstat-&gt;tx_fifo_errors = hwstat-&gt;tx_underrun;</div><div class='del'>-</div><div class='del'>-	return nstat;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gem_get_ethtool_stats(struct net_device *dev,</div><div class='ctx'> 				  struct ethtool_stats *stats, u64 *data)</div><div class='ctx'> {</div><div class='del'>-	struct macb *bp;</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	bp = netdev_priv(dev);</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='ctx'> 	gem_update_stats(bp);</div><div class='ctx'> 	memcpy(data, &amp;bp-&gt;ethtool_stats, sizeof(u64)</div><div class='ctx'> 			* (GEM_STATS_LEN + QUEUE_STATS_LEN * MACB_MAX_QUEUES));</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gem_get_sset_count(struct net_device *dev, int sset)</div><div class='hunk'>@@ -2604,16 +3168,20 @@ static void gem_get_ethtool_strings(struct net_device *dev, u32 sset, u8 *p)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct net_device_stats *macb_get_stats(struct net_device *dev)</div><div class='add'>+static void macb_get_stats(struct net_device *dev,</div><div class='add'>+			   struct rtnl_link_stats64 *nstat)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='del'>-	struct net_device_stats *nstat = &amp;bp-&gt;dev-&gt;stats;</div><div class='ctx'> 	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats.macb;</div><div class='ctx'> </div><div class='del'>-	if (macb_is_gem(bp))</div><div class='del'>-		return gem_get_stats(bp);</div><div class='add'>+	netdev_stats_to_stats64(nstat, &amp;bp-&gt;dev-&gt;stats);</div><div class='add'>+	if (macb_is_gem(bp)) {</div><div class='add'>+		gem_get_stats(bp, nstat);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* read stats from hardware */</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='ctx'> 	macb_update_stats(bp);</div><div class='ctx'> </div><div class='ctx'> 	/* Convert HW stats into netdevice stats */</div><div class='hunk'>@@ -2647,8 +3215,171 @@ static struct net_device_stats *macb_get_stats(struct net_device *dev)</div><div class='ctx'> 	nstat-&gt;tx_carrier_errors = hwstat-&gt;tx_carrier_errors;</div><div class='ctx'> 	nstat-&gt;tx_fifo_errors = hwstat-&gt;tx_underruns;</div><div class='ctx'> 	/* Don't know about heartbeat or window errors... */</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macb_get_pause_stats(struct net_device *dev,</div><div class='add'>+				 struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats.macb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	macb_update_stats(bp);</div><div class='add'>+	pause_stats-&gt;tx_pause_frames = hwstat-&gt;tx_pause_frames;</div><div class='add'>+	pause_stats-&gt;rx_pause_frames = hwstat-&gt;rx_pause_frames;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gem_get_pause_stats(struct net_device *dev,</div><div class='add'>+				struct ethtool_pause_stats *pause_stats)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct gem_stats *hwstat = &amp;bp-&gt;hw_stats.gem;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	gem_update_stats(bp);</div><div class='add'>+	pause_stats-&gt;tx_pause_frames = hwstat-&gt;tx_pause_frames;</div><div class='add'>+	pause_stats-&gt;rx_pause_frames = hwstat-&gt;rx_pause_frames;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macb_get_eth_mac_stats(struct net_device *dev,</div><div class='add'>+				   struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats.macb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	macb_update_stats(bp);</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK = hwstat-&gt;tx_ok;</div><div class='add'>+	mac_stats-&gt;SingleCollisionFrames = hwstat-&gt;tx_single_cols;</div><div class='add'>+	mac_stats-&gt;MultipleCollisionFrames = hwstat-&gt;tx_multiple_cols;</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK = hwstat-&gt;rx_ok;</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors = hwstat-&gt;rx_fcs_errors;</div><div class='add'>+	mac_stats-&gt;AlignmentErrors = hwstat-&gt;rx_align_errors;</div><div class='add'>+	mac_stats-&gt;FramesWithDeferredXmissions = hwstat-&gt;tx_deferred;</div><div class='add'>+	mac_stats-&gt;LateCollisions = hwstat-&gt;tx_late_cols;</div><div class='add'>+	mac_stats-&gt;FramesAbortedDueToXSColls = hwstat-&gt;tx_excessive_cols;</div><div class='add'>+	mac_stats-&gt;FramesLostDueToIntMACXmitError = hwstat-&gt;tx_underruns;</div><div class='add'>+	mac_stats-&gt;CarrierSenseErrors = hwstat-&gt;tx_carrier_errors;</div><div class='add'>+	mac_stats-&gt;FramesLostDueToIntMACRcvError = hwstat-&gt;rx_overruns;</div><div class='add'>+	mac_stats-&gt;InRangeLengthErrors = hwstat-&gt;rx_length_mismatch;</div><div class='add'>+	mac_stats-&gt;FrameTooLongErrors = hwstat-&gt;rx_oversize_pkts;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	return nstat;</div><div class='add'>+static void gem_get_eth_mac_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_eth_mac_stats *mac_stats)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct gem_stats *hwstat = &amp;bp-&gt;hw_stats.gem;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	gem_update_stats(bp);</div><div class='add'>+	mac_stats-&gt;FramesTransmittedOK = hwstat-&gt;tx_frames;</div><div class='add'>+	mac_stats-&gt;SingleCollisionFrames = hwstat-&gt;tx_single_collision_frames;</div><div class='add'>+	mac_stats-&gt;MultipleCollisionFrames =</div><div class='add'>+		hwstat-&gt;tx_multiple_collision_frames;</div><div class='add'>+	mac_stats-&gt;FramesReceivedOK = hwstat-&gt;rx_frames;</div><div class='add'>+	mac_stats-&gt;FrameCheckSequenceErrors =</div><div class='add'>+		hwstat-&gt;rx_frame_check_sequence_errors;</div><div class='add'>+	mac_stats-&gt;AlignmentErrors = hwstat-&gt;rx_alignment_errors;</div><div class='add'>+	mac_stats-&gt;OctetsTransmittedOK = hwstat-&gt;tx_octets;</div><div class='add'>+	mac_stats-&gt;FramesWithDeferredXmissions = hwstat-&gt;tx_deferred_frames;</div><div class='add'>+	mac_stats-&gt;LateCollisions = hwstat-&gt;tx_late_collisions;</div><div class='add'>+	mac_stats-&gt;FramesAbortedDueToXSColls = hwstat-&gt;tx_excessive_collisions;</div><div class='add'>+	mac_stats-&gt;FramesLostDueToIntMACXmitError = hwstat-&gt;tx_underrun;</div><div class='add'>+	mac_stats-&gt;CarrierSenseErrors = hwstat-&gt;tx_carrier_sense_errors;</div><div class='add'>+	mac_stats-&gt;OctetsReceivedOK = hwstat-&gt;rx_octets;</div><div class='add'>+	mac_stats-&gt;MulticastFramesXmittedOK = hwstat-&gt;tx_multicast_frames;</div><div class='add'>+	mac_stats-&gt;BroadcastFramesXmittedOK = hwstat-&gt;tx_broadcast_frames;</div><div class='add'>+	mac_stats-&gt;MulticastFramesReceivedOK = hwstat-&gt;rx_multicast_frames;</div><div class='add'>+	mac_stats-&gt;BroadcastFramesReceivedOK = hwstat-&gt;rx_broadcast_frames;</div><div class='add'>+	mac_stats-&gt;InRangeLengthErrors = hwstat-&gt;rx_length_field_frame_errors;</div><div class='add'>+	mac_stats-&gt;FrameTooLongErrors = hwstat-&gt;rx_oversize_frames;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TODO: Report SQE test errors when added to phy_stats */</div><div class='add'>+static void macb_get_eth_phy_stats(struct net_device *dev,</div><div class='add'>+				   struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats.macb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	macb_update_stats(bp);</div><div class='add'>+	phy_stats-&gt;SymbolErrorDuringCarrier = hwstat-&gt;rx_symbol_errors;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void gem_get_eth_phy_stats(struct net_device *dev,</div><div class='add'>+				  struct ethtool_eth_phy_stats *phy_stats)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct gem_stats *hwstat = &amp;bp-&gt;hw_stats.gem;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	gem_update_stats(bp);</div><div class='add'>+	phy_stats-&gt;SymbolErrorDuringCarrier = hwstat-&gt;rx_symbol_errors;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macb_get_rmon_stats(struct net_device *dev,</div><div class='add'>+				struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+				const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct macb_stats *hwstat = &amp;bp-&gt;hw_stats.macb;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	macb_update_stats(bp);</div><div class='add'>+	rmon_stats-&gt;undersize_pkts = hwstat-&gt;rx_undersize_pkts;</div><div class='add'>+	rmon_stats-&gt;oversize_pkts = hwstat-&gt;rx_oversize_pkts;</div><div class='add'>+	rmon_stats-&gt;jabbers = hwstat-&gt;rx_jabbers;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_rmon_hist_range gem_rmon_ranges[] = {</div><div class='add'>+	{   64,    64 },</div><div class='add'>+	{   65,   127 },</div><div class='add'>+	{  128,   255 },</div><div class='add'>+	{  256,   511 },</div><div class='add'>+	{  512,  1023 },</div><div class='add'>+	{ 1024,  1518 },</div><div class='add'>+	{ 1519, 16384 },</div><div class='add'>+	{ },</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void gem_get_rmon_stats(struct net_device *dev,</div><div class='add'>+			       struct ethtool_rmon_stats *rmon_stats,</div><div class='add'>+			       const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	struct gem_stats *hwstat = &amp;bp-&gt;hw_stats.gem;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	gem_update_stats(bp);</div><div class='add'>+	rmon_stats-&gt;undersize_pkts = hwstat-&gt;rx_undersized_frames;</div><div class='add'>+	rmon_stats-&gt;oversize_pkts = hwstat-&gt;rx_oversize_frames;</div><div class='add'>+	rmon_stats-&gt;jabbers = hwstat-&gt;rx_jabbers;</div><div class='add'>+	rmon_stats-&gt;hist[0] = hwstat-&gt;rx_64_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist[1] = hwstat-&gt;rx_65_127_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist[2] = hwstat-&gt;rx_128_255_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist[3] = hwstat-&gt;rx_256_511_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist[4] = hwstat-&gt;rx_512_1023_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist[5] = hwstat-&gt;rx_1024_1518_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist[6] = hwstat-&gt;rx_greater_than_1518_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[0] = hwstat-&gt;tx_64_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[1] = hwstat-&gt;tx_65_127_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[2] = hwstat-&gt;tx_128_255_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[3] = hwstat-&gt;tx_256_511_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[4] = hwstat-&gt;tx_512_1023_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[5] = hwstat-&gt;tx_1024_1518_byte_frames;</div><div class='add'>+	rmon_stats-&gt;hist_tx[6] = hwstat-&gt;tx_greater_than_1518_byte_frames;</div><div class='add'>+	spin_unlock_irq(&amp;bp-&gt;stats_lock);</div><div class='add'>+	*ranges = gem_rmon_ranges;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int macb_get_regs_len(struct net_device *netdev)</div><div class='hunk'>@@ -2693,37 +3424,53 @@ static void macb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	wol-&gt;supported = 0;</div><div class='del'>-	wol-&gt;wolopts = 0;</div><div class='add'>+	phylink_ethtool_get_wol(bp-&gt;phylink, wol);</div><div class='add'>+	wol-&gt;supported |= (WAKE_MAGIC | WAKE_ARP);</div><div class='ctx'> </div><div class='del'>-	if (bp-&gt;wol &amp; MACB_WOL_HAS_MAGIC_PACKET) {</div><div class='del'>-		wol-&gt;supported = WAKE_MAGIC;</div><div class='del'>-</div><div class='del'>-		if (bp-&gt;wol &amp; MACB_WOL_ENABLED)</div><div class='del'>-			wol-&gt;wolopts |= WAKE_MAGIC;</div><div class='del'>-	}</div><div class='add'>+	/* Add macb wolopts to phy wolopts */</div><div class='add'>+	wol-&gt;wolopts |= bp-&gt;wolopts;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!(bp-&gt;wol &amp; MACB_WOL_HAS_MAGIC_PACKET) ||</div><div class='del'>-	    (wol-&gt;wolopts &amp; ~WAKE_MAGIC))</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+	/* Pass the order to phylink layer */</div><div class='add'>+	ret = phylink_ethtool_set_wol(bp-&gt;phylink, wol);</div><div class='add'>+	/* Don't manage WoL on MAC, if PHY set_wol() fails */</div><div class='add'>+	if (ret &amp;&amp; ret != -EOPNOTSUPP)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='del'>-	if (wol-&gt;wolopts &amp; WAKE_MAGIC)</div><div class='del'>-		bp-&gt;wol |= MACB_WOL_ENABLED;</div><div class='del'>-	else</div><div class='del'>-		bp-&gt;wol &amp;= ~MACB_WOL_ENABLED;</div><div class='add'>+	bp-&gt;wolopts = (wol-&gt;wolopts &amp; WAKE_MAGIC) ? WAKE_MAGIC : 0;</div><div class='add'>+	bp-&gt;wolopts |= (wol-&gt;wolopts &amp; WAKE_ARP) ? WAKE_ARP : 0;</div><div class='add'>+	bp-&gt;wol = (wol-&gt;wolopts) ? MACB_WOL_ENABLED : 0;</div><div class='ctx'> </div><div class='del'>-	device_set_wakeup_enable(&amp;bp-&gt;pdev-&gt;dev, bp-&gt;wol &amp; MACB_WOL_ENABLED);</div><div class='add'>+	device_set_wakeup_enable(&amp;bp-&gt;pdev-&gt;dev, bp-&gt;wol);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int macb_get_link_ksettings(struct net_device *netdev,</div><div class='add'>+				   struct ethtool_link_ksettings *kset)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_get(bp-&gt;phylink, kset);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_set_link_ksettings(struct net_device *netdev,</div><div class='add'>+				   const struct ethtool_link_ksettings *kset)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return phylink_ethtool_ksettings_set(bp-&gt;phylink, kset);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void macb_get_ringparam(struct net_device *netdev,</div><div class='del'>-			       struct ethtool_ringparam *ring)</div><div class='add'>+			       struct ethtool_ringparam *ring,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2735,7 +3482,9 @@ static void macb_get_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int macb_set_ringparam(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_ringparam *ring)</div><div class='add'>+			      struct ethtool_ringparam *ring,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> 	u32 new_rx_size, new_tx_size;</div><div class='hunk'>@@ -2796,19 +3545,17 @@ static s32 gem_get_ptp_max_adj(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gem_get_ts_info(struct net_device *dev,</div><div class='del'>-			   struct ethtool_ts_info *info)</div><div class='add'>+			   struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	if ((bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_PTP) == 0) {</div><div class='add'>+	if (!macb_dma_ptp(bp)) {</div><div class='ctx'> 		ethtool_op_get_ts_info(dev, info);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;so_timestamping =</div><div class='ctx'> 		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_SOFTWARE |</div><div class='ctx'> 		SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='ctx'> 		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='ctx'> 		SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='hunk'>@@ -2820,7 +3567,8 @@ static int gem_get_ts_info(struct net_device *dev,</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='ctx'> 		(1 &lt;&lt; HWTSTAMP_FILTER_ALL);</div><div class='ctx'> </div><div class='del'>-	info-&gt;phc_index = bp-&gt;ptp_clock ? ptp_clock_index(bp-&gt;ptp_clock) : -1;</div><div class='add'>+	if (bp-&gt;ptp_clock)</div><div class='add'>+		info-&gt;phc_index = ptp_clock_index(bp-&gt;ptp_clock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2837,7 +3585,7 @@ static struct macb_ptp_info gem_ptp_info = {</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> static int macb_get_ts_info(struct net_device *netdev,</div><div class='del'>-			    struct ethtool_ts_info *info)</div><div class='add'>+			    struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2902,6 +3650,9 @@ static void gem_prog_cmp_regs(struct macb *bp, struct ethtool_rx_flow_spec *fs)</div><div class='ctx'> 	bool cmp_b = false;</div><div class='ctx'> 	bool cmp_c = false;</div><div class='ctx'> </div><div class='add'>+	if (!macb_is_gem(bp))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	tp4sp_v = &amp;(fs-&gt;h_u.tcp_ip4_spec);</div><div class='ctx'> 	tp4sp_m = &amp;(fs-&gt;m_u.tcp_ip4_spec);</div><div class='ctx'> </div><div class='hunk'>@@ -2993,7 +3744,8 @@ static int gem_add_flow_filter(struct net_device *netdev,</div><div class='ctx'> 			fs-&gt;flow_type, (int)fs-&gt;ring_cookie, fs-&gt;location,</div><div class='ctx'> 			htonl(fs-&gt;h_u.tcp_ip4_spec.ip4src),</div><div class='ctx'> 			htonl(fs-&gt;h_u.tcp_ip4_spec.ip4dst),</div><div class='del'>-			htons(fs-&gt;h_u.tcp_ip4_spec.psrc), htons(fs-&gt;h_u.tcp_ip4_spec.pdst));</div><div class='add'>+			be16_to_cpu(fs-&gt;h_u.tcp_ip4_spec.psrc),</div><div class='add'>+			be16_to_cpu(fs-&gt;h_u.tcp_ip4_spec.pdst));</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;rx_fs_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -3046,8 +3798,8 @@ static int gem_del_flow_filter(struct net_device *netdev,</div><div class='ctx'> 					fs-&gt;flow_type, (int)fs-&gt;ring_cookie, fs-&gt;location,</div><div class='ctx'> 					htonl(fs-&gt;h_u.tcp_ip4_spec.ip4src),</div><div class='ctx'> 					htonl(fs-&gt;h_u.tcp_ip4_spec.ip4dst),</div><div class='del'>-					htons(fs-&gt;h_u.tcp_ip4_spec.psrc),</div><div class='del'>-					htons(fs-&gt;h_u.tcp_ip4_spec.pdst));</div><div class='add'>+					be16_to_cpu(fs-&gt;h_u.tcp_ip4_spec.psrc),</div><div class='add'>+					be16_to_cpu(fs-&gt;h_u.tcp_ip4_spec.pdst));</div><div class='ctx'> </div><div class='ctx'> 			gem_writel_n(bp, SCRT2, fs-&gt;location, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -3156,10 +3908,14 @@ static const struct ethtool_ops macb_ethtool_ops = {</div><div class='ctx'> 	.get_regs		= macb_get_regs,</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='ctx'> 	.get_ts_info		= ethtool_op_get_ts_info,</div><div class='add'>+	.get_pause_stats	= macb_get_pause_stats,</div><div class='add'>+	.get_eth_mac_stats	= macb_get_eth_mac_stats,</div><div class='add'>+	.get_eth_phy_stats	= macb_get_eth_phy_stats,</div><div class='add'>+	.get_rmon_stats		= macb_get_rmon_stats,</div><div class='ctx'> 	.get_wol		= macb_get_wol,</div><div class='ctx'> 	.set_wol		= macb_set_wol,</div><div class='del'>-	.get_link_ksettings     = phy_ethtool_get_link_ksettings,</div><div class='del'>-	.set_link_ksettings     = phy_ethtool_set_link_ksettings,</div><div class='add'>+	.get_link_ksettings     = macb_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings     = macb_set_link_ksettings,</div><div class='ctx'> 	.get_ringparam		= macb_get_ringparam,</div><div class='ctx'> 	.set_ringparam		= macb_set_ringparam,</div><div class='ctx'> };</div><div class='hunk'>@@ -3167,13 +3923,19 @@ static const struct ethtool_ops macb_ethtool_ops = {</div><div class='ctx'> static const struct ethtool_ops gem_ethtool_ops = {</div><div class='ctx'> 	.get_regs_len		= macb_get_regs_len,</div><div class='ctx'> 	.get_regs		= macb_get_regs,</div><div class='add'>+	.get_wol		= macb_get_wol,</div><div class='add'>+	.set_wol		= macb_set_wol,</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='ctx'> 	.get_ts_info		= macb_get_ts_info,</div><div class='ctx'> 	.get_ethtool_stats	= gem_get_ethtool_stats,</div><div class='ctx'> 	.get_strings		= gem_get_ethtool_strings,</div><div class='ctx'> 	.get_sset_count		= gem_get_sset_count,</div><div class='del'>-	.get_link_ksettings     = phy_ethtool_get_link_ksettings,</div><div class='del'>-	.set_link_ksettings     = phy_ethtool_set_link_ksettings,</div><div class='add'>+	.get_pause_stats	= gem_get_pause_stats,</div><div class='add'>+	.get_eth_mac_stats	= gem_get_eth_mac_stats,</div><div class='add'>+	.get_eth_phy_stats	= gem_get_eth_phy_stats,</div><div class='add'>+	.get_rmon_stats		= gem_get_rmon_stats,</div><div class='add'>+	.get_link_ksettings     = macb_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings     = macb_set_link_ksettings,</div><div class='ctx'> 	.get_ringparam		= macb_get_ringparam,</div><div class='ctx'> 	.set_ringparam		= macb_set_ringparam,</div><div class='ctx'> 	.get_rxnfc			= gem_get_rxnfc,</div><div class='hunk'>@@ -3182,26 +3944,41 @@ static const struct ethtool_ops gem_ethtool_ops = {</div><div class='ctx'> </div><div class='ctx'> static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> {</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (!phydev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+	return phylink_mii_ioctl(bp-&gt;phylink, rq, cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *cfg)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	if (!bp-&gt;ptp_info)</div><div class='del'>-		return phy_mii_ioctl(phydev, rq, cmd);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		return bp-&gt;ptp_info-&gt;set_hwtst(dev, rq, cmd);</div><div class='del'>-	case SIOCGHWTSTAMP:</div><div class='del'>-		return bp-&gt;ptp_info-&gt;get_hwtst(dev, rq);</div><div class='del'>-	default:</div><div class='del'>-		return phy_mii_ioctl(phydev, rq, cmd);</div><div class='del'>-	}</div><div class='add'>+	return bp-&gt;ptp_info-&gt;get_hwtst(dev, cfg);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *cfg,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!netif_running(dev))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!bp-&gt;ptp_info)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return bp-&gt;ptp_info-&gt;set_hwtst(dev, cfg, extack);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void macb_set_txcsum_feature(struct macb *bp,</div><div class='hunk'>@@ -3273,6 +4050,7 @@ static void macb_restore_features(struct macb *bp)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = bp-&gt;dev;</div><div class='ctx'> 	netdev_features_t features = netdev-&gt;features;</div><div class='add'>+	struct ethtool_rx_fs_item *item;</div><div class='ctx'> </div><div class='ctx'> 	/* TX checksum offload */</div><div class='ctx'> 	macb_set_txcsum_feature(bp, features);</div><div class='hunk'>@@ -3281,24 +4059,252 @@ static void macb_restore_features(struct macb *bp)</div><div class='ctx'> 	macb_set_rxcsum_feature(bp, features);</div><div class='ctx'> </div><div class='ctx'> 	/* RX Flow Filters */</div><div class='add'>+	list_for_each_entry(item, &amp;bp-&gt;rx_fs_list.list, list)</div><div class='add'>+		gem_prog_cmp_regs(bp, &amp;item-&gt;fs);</div><div class='add'>+</div><div class='ctx'> 	macb_set_rxflow_feature(bp, features);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int macb_taprio_setup_replace(struct net_device *ndev,</div><div class='add'>+				     struct tc_taprio_qopt_offload *conf)</div><div class='add'>+{</div><div class='add'>+	u64 total_on_time = 0, start_time_sec = 0, start_time = conf-&gt;base_time;</div><div class='add'>+	u32 configured_queues = 0, speed = 0, start_time_nsec;</div><div class='add'>+	struct macb_queue_enst_config *enst_queue;</div><div class='add'>+	struct tc_taprio_sched_entry *entry;</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+	struct ethtool_link_ksettings kset;</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	u32 queue_mask;</div><div class='add'>+	u8 queue_id;</div><div class='add'>+	size_t i;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;num_entries &gt; bp-&gt;num_queues) {</div><div class='add'>+		netdev_err(ndev, "Too many TAPRIO entries: %zu &gt; %d queues\n",</div><div class='add'>+			   conf-&gt;num_entries, bp-&gt;num_queues);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (conf-&gt;base_time &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "Invalid base_time: must be 0 or positive, got %lld\n",</div><div class='add'>+			   conf-&gt;base_time);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get the current link speed */</div><div class='add'>+	err = phylink_ethtool_ksettings_get(bp-&gt;phylink, &amp;kset);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		netdev_err(ndev, "Failed to get link settings: %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	speed = kset.base.speed;</div><div class='add'>+	if (unlikely(speed &lt;= 0)) {</div><div class='add'>+		netdev_err(ndev, "Invalid speed: %d\n", speed);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	enst_queue = kcalloc(conf-&gt;num_entries, sizeof(*enst_queue), GFP_KERNEL);</div><div class='add'>+	if (unlikely(!enst_queue))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Pre-validate all entries before making any hardware changes */</div><div class='add'>+	for (i = 0; i &lt; conf-&gt;num_entries; i++) {</div><div class='add'>+		entry = &amp;conf-&gt;entries[i];</div><div class='add'>+</div><div class='add'>+		if (entry-&gt;command != TC_TAPRIO_CMD_SET_GATES) {</div><div class='add'>+			netdev_err(ndev, "Entry %zu: unsupported command %d\n",</div><div class='add'>+				   i, entry-&gt;command);</div><div class='add'>+			err = -EOPNOTSUPP;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Validate gate_mask: must be nonzero, single queue, and within range */</div><div class='add'>+		if (!is_power_of_2(entry-&gt;gate_mask)) {</div><div class='add'>+			netdev_err(ndev, "Entry %zu: gate_mask 0x%x is not a power of 2 (only one queue per entry allowed)\n",</div><div class='add'>+				   i, entry-&gt;gate_mask);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* gate_mask must not select queues outside the valid queues */</div><div class='add'>+		queue_id = order_base_2(entry-&gt;gate_mask);</div><div class='add'>+		if (queue_id &gt;= bp-&gt;num_queues) {</div><div class='add'>+			netdev_err(ndev, "Entry %zu: gate_mask 0x%x exceeds queue range (max_queues=%d)\n",</div><div class='add'>+				   i, entry-&gt;gate_mask, bp-&gt;num_queues);</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for start time limits */</div><div class='add'>+		start_time_sec = start_time;</div><div class='add'>+		start_time_nsec = do_div(start_time_sec, NSEC_PER_SEC);</div><div class='add'>+		if (start_time_sec &gt; GENMASK(GEM_START_TIME_SEC_SIZE - 1, 0)) {</div><div class='add'>+			netdev_err(ndev, "Entry %zu: Start time %llu s exceeds hardware limit\n",</div><div class='add'>+				   i, start_time_sec);</div><div class='add'>+			err = -ERANGE;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for on time limit */</div><div class='add'>+		if (entry-&gt;interval &gt; enst_max_hw_interval(speed)) {</div><div class='add'>+			netdev_err(ndev, "Entry %zu: interval %u ns exceeds hardware limit %llu ns\n",</div><div class='add'>+				   i, entry-&gt;interval, enst_max_hw_interval(speed));</div><div class='add'>+			err = -ERANGE;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Check for off time limit*/</div><div class='add'>+		if ((conf-&gt;cycle_time - entry-&gt;interval) &gt; enst_max_hw_interval(speed)) {</div><div class='add'>+			netdev_err(ndev, "Entry %zu: off_time %llu ns exceeds hardware limit %llu ns\n",</div><div class='add'>+				   i, conf-&gt;cycle_time - entry-&gt;interval,</div><div class='add'>+				   enst_max_hw_interval(speed));</div><div class='add'>+			err = -ERANGE;</div><div class='add'>+			goto cleanup;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		enst_queue[i].queue_id = queue_id;</div><div class='add'>+		enst_queue[i].start_time_mask =</div><div class='add'>+			(start_time_sec &lt;&lt; GEM_START_TIME_SEC_OFFSET) |</div><div class='add'>+			start_time_nsec;</div><div class='add'>+		enst_queue[i].on_time_bytes =</div><div class='add'>+			enst_ns_to_hw_units(entry-&gt;interval, speed);</div><div class='add'>+		enst_queue[i].off_time_bytes =</div><div class='add'>+			enst_ns_to_hw_units(conf-&gt;cycle_time - entry-&gt;interval, speed);</div><div class='add'>+</div><div class='add'>+		configured_queues |= entry-&gt;gate_mask;</div><div class='add'>+		total_on_time += entry-&gt;interval;</div><div class='add'>+		start_time += entry-&gt;interval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check total interval doesn't exceed cycle time */</div><div class='add'>+	if (total_on_time &gt; conf-&gt;cycle_time) {</div><div class='add'>+		netdev_err(ndev, "Total ON %llu ns exceeds cycle time %llu ns\n",</div><div class='add'>+			   total_on_time, conf-&gt;cycle_time);</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto cleanup;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ndev, "TAPRIO setup: %zu entries, base_time=%lld ns, cycle_time=%llu ns\n",</div><div class='add'>+		   conf-&gt;num_entries, conf-&gt;base_time, conf-&gt;cycle_time);</div><div class='add'>+</div><div class='add'>+	/* All validations passed - proceed with hardware configuration */</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;bp-&gt;lock) {</div><div class='add'>+		/* Disable ENST queues if running before configuring */</div><div class='add'>+		queue_mask = BIT_U32(bp-&gt;num_queues) - 1;</div><div class='add'>+		gem_writel(bp, ENST_CONTROL,</div><div class='add'>+			   queue_mask &lt;&lt; GEM_ENST_DISABLE_QUEUE_OFFSET);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; conf-&gt;num_entries; i++) {</div><div class='add'>+			queue = &amp;bp-&gt;queues[enst_queue[i].queue_id];</div><div class='add'>+			/* Configure queue timing registers */</div><div class='add'>+			queue_writel(queue, ENST_START_TIME,</div><div class='add'>+				     enst_queue[i].start_time_mask);</div><div class='add'>+			queue_writel(queue, ENST_ON_TIME,</div><div class='add'>+				     enst_queue[i].on_time_bytes);</div><div class='add'>+			queue_writel(queue, ENST_OFF_TIME,</div><div class='add'>+				     enst_queue[i].off_time_bytes);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Enable ENST for all configured queues in one write */</div><div class='add'>+		gem_writel(bp, ENST_CONTROL, configured_queues);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_info(ndev, "TAPRIO configuration completed successfully: %zu entries, %d queues configured\n",</div><div class='add'>+		    conf-&gt;num_entries, hweight32(configured_queues));</div><div class='add'>+</div><div class='add'>+cleanup:</div><div class='add'>+	kfree(enst_queue);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void macb_taprio_destroy(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	u32 queue_mask;</div><div class='add'>+	unsigned int q;</div><div class='add'>+</div><div class='add'>+	netdev_reset_tc(ndev);</div><div class='add'>+	queue_mask = BIT_U32(bp-&gt;num_queues) - 1;</div><div class='add'>+</div><div class='add'>+	scoped_guard(spinlock_irqsave, &amp;bp-&gt;lock) {</div><div class='add'>+		/* Single disable command for all queues */</div><div class='add'>+		gem_writel(bp, ENST_CONTROL,</div><div class='add'>+			   queue_mask &lt;&lt; GEM_ENST_DISABLE_QUEUE_OFFSET);</div><div class='add'>+</div><div class='add'>+		/* Clear all queue ENST registers in batch */</div><div class='add'>+		for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='add'>+			queue_writel(queue, ENST_START_TIME, 0);</div><div class='add'>+			queue_writel(queue, ENST_ON_TIME, 0);</div><div class='add'>+			queue_writel(queue, ENST_OFF_TIME, 0);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	netdev_info(ndev, "TAPRIO destroy: All gates disabled\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_setup_taprio(struct net_device *ndev,</div><div class='add'>+			     struct tc_taprio_qopt_offload *taprio)</div><div class='add'>+{</div><div class='add'>+	struct macb *bp = netdev_priv(ndev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!(ndev-&gt;hw_features &amp; NETIF_F_HW_TC)))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Check if Device is in runtime suspend */</div><div class='add'>+	if (unlikely(pm_runtime_suspended(&amp;bp-&gt;pdev-&gt;dev))) {</div><div class='add'>+		netdev_err(ndev, "Device is in runtime suspend\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (taprio-&gt;cmd) {</div><div class='add'>+	case TAPRIO_CMD_REPLACE:</div><div class='add'>+		err = macb_taprio_setup_replace(ndev, taprio);</div><div class='add'>+		break;</div><div class='add'>+	case TAPRIO_CMD_DESTROY:</div><div class='add'>+		macb_taprio_destroy(ndev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int macb_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='add'>+			 void *type_data)</div><div class='add'>+{</div><div class='add'>+	if (!dev || !type_data)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO:</div><div class='add'>+		return macb_setup_taprio(dev, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops macb_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= macb_open,</div><div class='ctx'> 	.ndo_stop		= macb_close,</div><div class='ctx'> 	.ndo_start_xmit		= macb_start_xmit,</div><div class='ctx'> 	.ndo_set_rx_mode	= macb_set_rx_mode,</div><div class='del'>-	.ndo_get_stats		= macb_get_stats,</div><div class='del'>-	.ndo_do_ioctl		= macb_ioctl,</div><div class='add'>+	.ndo_get_stats64	= macb_get_stats,</div><div class='add'>+	.ndo_eth_ioctl		= macb_ioctl,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_change_mtu		= macb_change_mtu,</div><div class='del'>-	.ndo_set_mac_address	= eth_mac_addr,</div><div class='add'>+	.ndo_set_mac_address	= macb_set_mac_addr,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= macb_poll_controller,</div><div class='ctx'> #endif</div><div class='ctx'> 	.ndo_set_features	= macb_set_features,</div><div class='ctx'> 	.ndo_features_check	= macb_features_check,</div><div class='add'>+	.ndo_hwtstamp_set	= macb_hwtstamp_set,</div><div class='add'>+	.ndo_hwtstamp_get	= macb_hwtstamp_get,</div><div class='add'>+	.ndo_setup_tc		= macb_setup_tc,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Configure peripheral capabilities according to device tree</div><div class='hunk'>@@ -3307,8 +4313,12 @@ static const struct net_device_ops macb_netdev_ops = {</div><div class='ctx'> static void macb_configure_caps(struct macb *bp,</div><div class='ctx'> 				const struct macb_config *dt_conf)</div><div class='ctx'> {</div><div class='add'>+	struct device_node *np = bp-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+	bool refclk_ext;</div><div class='ctx'> 	u32 dcfg;</div><div class='ctx'> </div><div class='add'>+	refclk_ext = of_property_read_bool(np, "cdns,refclk-ext");</div><div class='add'>+</div><div class='ctx'> 	if (dt_conf)</div><div class='ctx'> 		bp-&gt;caps = dt_conf-&gt;caps;</div><div class='ctx'> </div><div class='hunk'>@@ -3318,51 +4328,68 @@ static void macb_configure_caps(struct macb *bp,</div><div class='ctx'> 		dcfg = gem_readl(bp, DCFG1);</div><div class='ctx'> 		if (GEM_BFEXT(IRQCOR, dcfg) == 0)</div><div class='ctx'> 			bp-&gt;caps |= MACB_CAPS_ISR_CLEAR_ON_WRITE;</div><div class='add'>+		if (GEM_BFEXT(NO_PCS, dcfg) == 0)</div><div class='add'>+			bp-&gt;caps |= MACB_CAPS_PCS;</div><div class='add'>+		dcfg = gem_readl(bp, DCFG12);</div><div class='add'>+		if (GEM_BFEXT(HIGH_SPEED, dcfg) == 1)</div><div class='add'>+			bp-&gt;caps |= MACB_CAPS_HIGH_SPEED;</div><div class='ctx'> 		dcfg = gem_readl(bp, DCFG2);</div><div class='ctx'> 		if ((dcfg &amp; (GEM_BIT(RX_PKT_BUFF) | GEM_BIT(TX_PKT_BUFF))) == 0)</div><div class='ctx'> 			bp-&gt;caps |= MACB_CAPS_FIFO_MODE;</div><div class='del'>-#ifdef CONFIG_MACB_USE_HWSTAMP</div><div class='add'>+		if (GEM_BFEXT(PBUF_RSC, gem_readl(bp, DCFG6)))</div><div class='add'>+			bp-&gt;caps |= MACB_CAPS_RSC;</div><div class='ctx'> 		if (gem_has_ptp(bp)) {</div><div class='ctx'> 			if (!GEM_BFEXT(TSU, gem_readl(bp, DCFG5)))</div><div class='del'>-				pr_err("GEM doesn't support hardware ptp.\n");</div><div class='add'>+				dev_err(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+					"GEM doesn't support hardware ptp.\n");</div><div class='ctx'> 			else {</div><div class='del'>-				bp-&gt;hw_dma_cap |= HW_DMA_CAP_PTP;</div><div class='add'>+#ifdef CONFIG_MACB_USE_HWSTAMP</div><div class='add'>+				bp-&gt;caps |= MACB_CAPS_DMA_PTP;</div><div class='ctx'> 				bp-&gt;ptp_info = &amp;gem_ptp_info;</div><div class='add'>+#endif</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-#endif</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (refclk_ext)</div><div class='add'>+		bp-&gt;caps |= MACB_CAPS_USRIO_HAS_CLKEN;</div><div class='add'>+</div><div class='ctx'> 	dev_dbg(&amp;bp-&gt;pdev-&gt;dev, "Cadence caps 0x%08x\n", bp-&gt;caps);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void macb_probe_queues(void __iomem *mem,</div><div class='del'>-			      bool native_io,</div><div class='del'>-			      unsigned int *queue_mask,</div><div class='del'>-			      unsigned int *num_queues)</div><div class='add'>+static int macb_probe_queues(struct device *dev, void __iomem *mem, bool native_io)</div><div class='ctx'> {</div><div class='del'>-	unsigned int hw_q;</div><div class='del'>-</div><div class='del'>-	*queue_mask = 0x1;</div><div class='del'>-	*num_queues = 1;</div><div class='add'>+	/* BIT(0) is never set but queue 0 always exists. */</div><div class='add'>+	unsigned int queue_mask = 0x1;</div><div class='ctx'> </div><div class='del'>-	/* is it macb or gem ?</div><div class='del'>-	 *</div><div class='del'>-	 * We need to read directly from the hardware here because</div><div class='del'>-	 * we are early in the probe process and don't have the</div><div class='del'>-	 * MACB_CAPS_MACB_IS_GEM flag positioned</div><div class='del'>-	 */</div><div class='del'>-	if (!hw_is_gem(mem, native_io))</div><div class='del'>-		return;</div><div class='add'>+	/* Use hw_is_gem() as MACB_CAPS_MACB_IS_GEM is not yet positioned. */</div><div class='add'>+	if (hw_is_gem(mem, native_io)) {</div><div class='add'>+		if (native_io)</div><div class='add'>+			queue_mask |= __raw_readl(mem + GEM_DCFG6) &amp; 0xFF;</div><div class='add'>+		else</div><div class='add'>+			queue_mask |= readl_relaxed(mem + GEM_DCFG6) &amp; 0xFF;</div><div class='ctx'> </div><div class='del'>-	/* bit 0 is never set but queue 0 always exists */</div><div class='del'>-	*queue_mask = readl_relaxed(mem + GEM_DCFG6) &amp; 0xff;</div><div class='add'>+		if (fls(queue_mask) != ffz(queue_mask)) {</div><div class='add'>+			dev_err(dev, "queue mask %#x has a hole\n", queue_mask);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	*queue_mask |= 0x1;</div><div class='add'>+	return hweight32(queue_mask);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	for (hw_q = 1; hw_q &lt; MACB_MAX_QUEUES; ++hw_q)</div><div class='del'>-		if (*queue_mask &amp; (1 &lt;&lt; hw_q))</div><div class='del'>-			(*num_queues)++;</div><div class='add'>+static void macb_clks_disable(struct clk *pclk, struct clk *hclk, struct clk *tx_clk,</div><div class='add'>+			      struct clk *rx_clk, struct clk *tsu_clk)</div><div class='add'>+{</div><div class='add'>+	struct clk_bulk_data clks[] = {</div><div class='add'>+		{ .clk = tsu_clk, },</div><div class='add'>+		{ .clk = rx_clk, },</div><div class='add'>+		{ .clk = pclk, },</div><div class='add'>+		{ .clk = hclk, },</div><div class='add'>+		{ .clk = tx_clk },</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	clk_bulk_disable_unprepare(ARRAY_SIZE(clks), clks);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,</div><div class='hunk'>@@ -3381,35 +4408,27 @@ static int macb_clk_init(struct platform_device *pdev, struct clk **pclk,</div><div class='ctx'> 		*hclk = devm_clk_get(&amp;pdev-&gt;dev, "hclk");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_OR_NULL(*pclk)) {</div><div class='del'>-		err = PTR_ERR(*pclk);</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -ENODEV;</div><div class='add'>+	if (IS_ERR_OR_NULL(*pclk))</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev,</div><div class='add'>+				     IS_ERR(*pclk) ? PTR_ERR(*pclk) : -ENODEV,</div><div class='add'>+				     "failed to get pclk\n");</div><div class='ctx'> </div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to get macb_clk (%d)\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (IS_ERR_OR_NULL(*hclk))</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev,</div><div class='add'>+				     IS_ERR(*hclk) ? PTR_ERR(*hclk) : -ENODEV,</div><div class='add'>+				     "failed to get hclk\n");</div><div class='ctx'> </div><div class='del'>-	if (IS_ERR_OR_NULL(*hclk)) {</div><div class='del'>-		err = PTR_ERR(*hclk);</div><div class='del'>-		if (!err)</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "failed to get hclk (%d)\n", err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*tx_clk = devm_clk_get(&amp;pdev-&gt;dev, "tx_clk");</div><div class='add'>+	*tx_clk = devm_clk_get_optional(&amp;pdev-&gt;dev, "tx_clk");</div><div class='ctx'> 	if (IS_ERR(*tx_clk))</div><div class='del'>-		*tx_clk = NULL;</div><div class='add'>+		return PTR_ERR(*tx_clk);</div><div class='ctx'> </div><div class='del'>-	*rx_clk = devm_clk_get(&amp;pdev-&gt;dev, "rx_clk");</div><div class='add'>+	*rx_clk = devm_clk_get_optional(&amp;pdev-&gt;dev, "rx_clk");</div><div class='ctx'> 	if (IS_ERR(*rx_clk))</div><div class='del'>-		*rx_clk = NULL;</div><div class='add'>+		return PTR_ERR(*rx_clk);</div><div class='ctx'> </div><div class='del'>-	*tsu_clk = devm_clk_get(&amp;pdev-&gt;dev, "tsu_clk");</div><div class='add'>+	*tsu_clk = devm_clk_get_optional(&amp;pdev-&gt;dev, "tsu_clk");</div><div class='ctx'> 	if (IS_ERR(*tsu_clk))</div><div class='del'>-		*tsu_clk = NULL;</div><div class='add'>+		return PTR_ERR(*tsu_clk);</div><div class='ctx'> </div><div class='ctx'> 	err = clk_prepare_enable(*pclk);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -3474,13 +4493,12 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 	 * register mapping but we don't want to test the queue index then</div><div class='ctx'> 	 * compute the corresponding register offset at run time.</div><div class='ctx'> 	 */</div><div class='del'>-	for (hw_q = 0, q = 0; hw_q &lt; MACB_MAX_QUEUES; ++hw_q) {</div><div class='del'>-		if (!(bp-&gt;queue_mask &amp; (1 &lt;&lt; hw_q)))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='add'>+	for (hw_q = 0, q = 0; hw_q &lt; bp-&gt;num_queues; ++hw_q) {</div><div class='ctx'> 		queue = &amp;bp-&gt;queues[q];</div><div class='ctx'> 		queue-&gt;bp = bp;</div><div class='del'>-		netif_napi_add(dev, &amp;queue-&gt;napi, macb_poll, 64);</div><div class='add'>+		spin_lock_init(&amp;queue-&gt;tx_ptr_lock);</div><div class='add'>+		netif_napi_add(dev, &amp;queue-&gt;napi_rx, macb_rx_poll);</div><div class='add'>+		netif_napi_add(dev, &amp;queue-&gt;napi_tx, macb_tx_poll);</div><div class='ctx'> 		if (hw_q) {</div><div class='ctx'> 			queue-&gt;ISR  = GEM_ISR(hw_q - 1);</div><div class='ctx'> 			queue-&gt;IER  = GEM_IER(hw_q - 1);</div><div class='hunk'>@@ -3489,12 +4507,6 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 			queue-&gt;TBQP = GEM_TBQP(hw_q - 1);</div><div class='ctx'> 			queue-&gt;RBQP = GEM_RBQP(hw_q - 1);</div><div class='ctx'> 			queue-&gt;RBQS = GEM_RBQS(hw_q - 1);</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-			if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B) {</div><div class='del'>-				queue-&gt;TBQPH = GEM_TBQPH(hw_q - 1);</div><div class='del'>-				queue-&gt;RBQPH = GEM_RBQPH(hw_q - 1);</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* queue0 uses legacy registers */</div><div class='ctx'> 			queue-&gt;ISR  = MACB_ISR;</div><div class='hunk'>@@ -3503,14 +4515,12 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 			queue-&gt;IMR  = MACB_IMR;</div><div class='ctx'> 			queue-&gt;TBQP = MACB_TBQP;</div><div class='ctx'> 			queue-&gt;RBQP = MACB_RBQP;</div><div class='del'>-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='del'>-			if (bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_64B) {</div><div class='del'>-				queue-&gt;TBQPH = MACB_TBQPH;</div><div class='del'>-				queue-&gt;RBQPH = MACB_RBQPH;</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='add'>+		queue-&gt;ENST_START_TIME = GEM_ENST_START_TIME(hw_q);</div><div class='add'>+		queue-&gt;ENST_ON_TIME = GEM_ENST_ON_TIME(hw_q);</div><div class='add'>+		queue-&gt;ENST_OFF_TIME = GEM_ENST_OFF_TIME(hw_q);</div><div class='add'>+</div><div class='ctx'> 		/* get irq: here we use the linux queue index, not the hardware</div><div class='ctx'> 		 * queue index. the queue irq definitions in the device tree</div><div class='ctx'> 		 * must remove the optional gaps that could exist in the</div><div class='hunk'>@@ -3534,14 +4544,12 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* setup appropriated routines according to adapter type */</div><div class='ctx'> 	if (macb_is_gem(bp)) {</div><div class='del'>-		bp-&gt;max_tx_length = GEM_MAX_TX_LEN;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_init_rings = gem_init_rings;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_rx = gem_rx;</div><div class='ctx'> 		dev-&gt;ethtool_ops = &amp;gem_ethtool_ops;</div><div class='ctx'> 	} else {</div><div class='del'>-		bp-&gt;max_tx_length = MACB_MAX_TX_LEN;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;</div><div class='ctx'> 		bp-&gt;macbgem_ops.mog_init_rings = macb_init_rings;</div><div class='hunk'>@@ -3549,11 +4557,18 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 		dev-&gt;ethtool_ops = &amp;macb_ethtool_ops;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	netdev_sw_irq_coalesce_default_on(dev);</div><div class='add'>+</div><div class='add'>+	dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='add'>+</div><div class='ctx'> 	/* Set features */</div><div class='ctx'> 	dev-&gt;hw_features = NETIF_F_SG;</div><div class='ctx'> </div><div class='del'>-	/* Check LSO capability */</div><div class='del'>-	if (GEM_BFEXT(PBUF_LSO, gem_readl(bp, DCFG6)))</div><div class='add'>+	/* Check LSO capability; runtime detection can be overridden by a cap</div><div class='add'>+	 * flag if the hardware is known to be buggy</div><div class='add'>+	 */</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_NO_LSO) &amp;&amp;</div><div class='add'>+	    GEM_BFEXT(PBUF_LSO, gem_readl(bp, DCFG6)))</div><div class='ctx'> 		dev-&gt;hw_features |= MACB_NETIF_LSO;</div><div class='ctx'> </div><div class='ctx'> 	/* Checksum offload is only available on gem with packet buffer */</div><div class='hunk'>@@ -3561,6 +4576,10 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 		dev-&gt;hw_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;</div><div class='ctx'> 	if (bp-&gt;caps &amp; MACB_CAPS_SG_DISABLED)</div><div class='ctx'> 		dev-&gt;hw_features &amp;= ~NETIF_F_SG;</div><div class='add'>+	/* Enable HW_TC if hardware supports QBV */</div><div class='add'>+	if (bp-&gt;caps &amp; MACB_CAPS_QBV)</div><div class='add'>+		dev-&gt;hw_features |= NETIF_F_HW_TC;</div><div class='add'>+</div><div class='ctx'> 	dev-&gt;features = dev-&gt;hw_features;</div><div class='ctx'> </div><div class='ctx'> 	/* Check RX Flow Filters support.</div><div class='hunk'>@@ -3568,8 +4587,9 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 	 * each 4-tuple define requires 1 T2 screener reg + 3 compare regs</div><div class='ctx'> 	 */</div><div class='ctx'> 	reg = gem_readl(bp, DCFG8);</div><div class='del'>-	bp-&gt;max_tuples = min((GEM_BFEXT(SCR2CMP, reg) / 3),</div><div class='del'>-			GEM_BFEXT(T2SCR, reg));</div><div class='add'>+	bp-&gt;max_tuples = umin((GEM_BFEXT(SCR2CMP, reg) / 3),</div><div class='add'>+			      GEM_BFEXT(T2SCR, reg));</div><div class='add'>+	INIT_LIST_HEAD(&amp;bp-&gt;rx_fs_list.list);</div><div class='ctx'> 	if (bp-&gt;max_tuples &gt; 0) {</div><div class='ctx'> 		/* also needs one ethtype match to check IPv4 */</div><div class='ctx'> 		if (GEM_BFEXT(SCR2ETH, reg) &gt; 0) {</div><div class='hunk'>@@ -3580,7 +4600,6 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 			/* Filtering is supported in hw but don't enable it in kernel now */</div><div class='ctx'> 			dev-&gt;hw_features |= NETIF_F_NTUPLE;</div><div class='ctx'> 			/* init Rx flow definitions */</div><div class='del'>-			INIT_LIST_HEAD(&amp;bp-&gt;rx_fs_list.list);</div><div class='ctx'> 			bp-&gt;rx_fs_list.count = 0;</div><div class='ctx'> 			spin_lock_init(&amp;bp-&gt;rx_fs_lock);</div><div class='ctx'> 		} else</div><div class='hunk'>@@ -3589,16 +4608,16 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (!(bp-&gt;caps &amp; MACB_CAPS_USRIO_DISABLED)) {</div><div class='ctx'> 		val = 0;</div><div class='del'>-		if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_RGMII)</div><div class='del'>-			val = GEM_BIT(RGMII);</div><div class='add'>+		if (phy_interface_mode_is_rgmii(bp-&gt;phy_interface))</div><div class='add'>+			val = bp-&gt;usrio-&gt;rgmii;</div><div class='ctx'> 		else if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_RMII &amp;&amp;</div><div class='ctx'> 			 (bp-&gt;caps &amp; MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII))</div><div class='del'>-			val = MACB_BIT(RMII);</div><div class='add'>+			val = bp-&gt;usrio-&gt;rmii;</div><div class='ctx'> 		else if (!(bp-&gt;caps &amp; MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII))</div><div class='del'>-			val = MACB_BIT(MII);</div><div class='add'>+			val = bp-&gt;usrio-&gt;mii;</div><div class='ctx'> </div><div class='ctx'> 		if (bp-&gt;caps &amp; MACB_CAPS_USRIO_HAS_CLKEN)</div><div class='del'>-			val |= MACB_BIT(CLKEN);</div><div class='add'>+			val |= bp-&gt;usrio-&gt;refclk;</div><div class='ctx'> </div><div class='ctx'> 		macb_or_gem_writel(bp, USRIO, val);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3613,21 +4632,24 @@ static int macb_init(struct platform_device *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct macb_usrio_config macb_default_usrio = {</div><div class='add'>+	.mii = MACB_BIT(MII),</div><div class='add'>+	.rmii = MACB_BIT(RMII),</div><div class='add'>+	.rgmii = GEM_BIT(RGMII),</div><div class='add'>+	.refclk = MACB_BIT(CLKEN),</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #if defined(CONFIG_OF)</div><div class='ctx'> /* 1518 rounded up */</div><div class='ctx'> #define AT91ETHER_MAX_RBUFF_SZ	0x600</div><div class='ctx'> /* max number of receive buffers */</div><div class='ctx'> #define AT91ETHER_MAX_RX_DESCR	9</div><div class='ctx'> </div><div class='del'>-/* Initialize and start the Receiver and Transmit subsystems */</div><div class='del'>-static int at91ether_start(struct net_device *dev)</div><div class='add'>+static struct sifive_fu540_macb_mgmt *mgmt;</div><div class='add'>+</div><div class='add'>+static int at91ether_alloc_coherent(struct macb *lp)</div><div class='ctx'> {</div><div class='del'>-	struct macb *lp = netdev_priv(dev);</div><div class='ctx'> 	struct macb_queue *q = &amp;lp-&gt;queues[0];</div><div class='del'>-	struct macb_dma_desc *desc;</div><div class='del'>-	dma_addr_t addr;</div><div class='del'>-	u32 ctl;</div><div class='del'>-	int i;</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;rx_ring = dma_alloc_coherent(&amp;lp-&gt;pdev-&gt;dev,</div><div class='ctx'> 					 (AT91ETHER_MAX_RX_DESCR *</div><div class='hunk'>@@ -3649,6 +4671,43 @@ static int at91ether_start(struct net_device *dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void at91ether_free_coherent(struct macb *lp)</div><div class='add'>+{</div><div class='add'>+	struct macb_queue *q = &amp;lp-&gt;queues[0];</div><div class='add'>+</div><div class='add'>+	if (q-&gt;rx_ring) {</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pdev-&gt;dev,</div><div class='add'>+				  AT91ETHER_MAX_RX_DESCR *</div><div class='add'>+				  macb_dma_desc_get_size(lp),</div><div class='add'>+				  q-&gt;rx_ring, q-&gt;rx_ring_dma);</div><div class='add'>+		q-&gt;rx_ring = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (q-&gt;rx_buffers) {</div><div class='add'>+		dma_free_coherent(&amp;lp-&gt;pdev-&gt;dev,</div><div class='add'>+				  AT91ETHER_MAX_RX_DESCR *</div><div class='add'>+				  AT91ETHER_MAX_RBUFF_SZ,</div><div class='add'>+				  q-&gt;rx_buffers, q-&gt;rx_buffers_dma);</div><div class='add'>+		q-&gt;rx_buffers = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Initialize and start the Receiver and Transmit subsystems */</div><div class='add'>+static int at91ether_start(struct macb *lp)</div><div class='add'>+{</div><div class='add'>+	struct macb_queue *q = &amp;lp-&gt;queues[0];</div><div class='add'>+	struct macb_dma_desc *desc;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	u32 ctl;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	ret = at91ether_alloc_coherent(lp);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	addr = q-&gt;rx_buffers_dma;</div><div class='ctx'> 	for (i = 0; i &lt; AT91ETHER_MAX_RX_DESCR; i++) {</div><div class='ctx'> 		desc = macb_rx_desc(q, i);</div><div class='hunk'>@@ -3670,9 +4729,39 @@ static int at91ether_start(struct net_device *dev)</div><div class='ctx'> 	ctl = macb_readl(lp, NCR);</div><div class='ctx'> 	macb_writel(lp, NCR, ctl | MACB_BIT(RE) | MACB_BIT(TE));</div><div class='ctx'> </div><div class='add'>+	/* Enable MAC interrupts */</div><div class='add'>+	macb_writel(lp, IER, MACB_BIT(RCOMP)	|</div><div class='add'>+			     MACB_BIT(RXUBR)	|</div><div class='add'>+			     MACB_BIT(ISR_TUND)	|</div><div class='add'>+			     MACB_BIT(ISR_RLE)	|</div><div class='add'>+			     MACB_BIT(TCOMP)	|</div><div class='add'>+			     MACB_BIT(ISR_ROVR)	|</div><div class='add'>+			     MACB_BIT(HRESP));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void at91ether_stop(struct macb *lp)</div><div class='add'>+{</div><div class='add'>+	u32 ctl;</div><div class='add'>+</div><div class='add'>+	/* Disable MAC interrupts */</div><div class='add'>+	macb_writel(lp, IDR, MACB_BIT(RCOMP)	|</div><div class='add'>+			     MACB_BIT(RXUBR)	|</div><div class='add'>+			     MACB_BIT(ISR_TUND)	|</div><div class='add'>+			     MACB_BIT(ISR_RLE)	|</div><div class='add'>+			     MACB_BIT(TCOMP)	|</div><div class='add'>+			     MACB_BIT(ISR_ROVR) |</div><div class='add'>+			     MACB_BIT(HRESP));</div><div class='add'>+</div><div class='add'>+	/* Disable Receiver and Transmitter */</div><div class='add'>+	ctl = macb_readl(lp, NCR);</div><div class='add'>+	macb_writel(lp, NCR, ctl &amp; ~(MACB_BIT(TE) | MACB_BIT(RE)));</div><div class='add'>+</div><div class='add'>+	/* Free resources. */</div><div class='add'>+	at91ether_free_coherent(lp);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Open the ethernet interface */</div><div class='ctx'> static int at91ether_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -3680,67 +4769,48 @@ static int at91ether_open(struct net_device *dev)</div><div class='ctx'> 	u32 ctl;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	ret = pm_runtime_resume_and_get(&amp;lp-&gt;pdev-&gt;dev);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	/* Clear internal statistics */</div><div class='ctx'> 	ctl = macb_readl(lp, NCR);</div><div class='ctx'> 	macb_writel(lp, NCR, ctl | MACB_BIT(CLRSTAT));</div><div class='ctx'> </div><div class='ctx'> 	macb_set_hwaddr(lp);</div><div class='ctx'> </div><div class='del'>-	ret = at91ether_start(dev);</div><div class='add'>+	ret = at91ether_start(lp);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='del'>-	/* Enable MAC interrupts */</div><div class='del'>-	macb_writel(lp, IER, MACB_BIT(RCOMP)	|</div><div class='del'>-			     MACB_BIT(RXUBR)	|</div><div class='del'>-			     MACB_BIT(ISR_TUND)	|</div><div class='del'>-			     MACB_BIT(ISR_RLE)	|</div><div class='del'>-			     MACB_BIT(TCOMP)	|</div><div class='del'>-			     MACB_BIT(ISR_ROVR)	|</div><div class='del'>-			     MACB_BIT(HRESP));</div><div class='add'>+		goto pm_exit;</div><div class='ctx'> </div><div class='del'>-	/* schedule a link state check */</div><div class='del'>-	phy_start(dev-&gt;phydev);</div><div class='add'>+	ret = macb_phylink_connect(lp);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto stop;</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+stop:</div><div class='add'>+	at91ether_stop(lp);</div><div class='add'>+pm_exit:</div><div class='add'>+	pm_runtime_put_sync(&amp;lp-&gt;pdev-&gt;dev);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Close the interface */</div><div class='ctx'> static int at91ether_close(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *lp = netdev_priv(dev);</div><div class='del'>-	struct macb_queue *q = &amp;lp-&gt;queues[0];</div><div class='del'>-	u32 ctl;</div><div class='del'>-</div><div class='del'>-	/* Disable Receiver and Transmitter */</div><div class='del'>-	ctl = macb_readl(lp, NCR);</div><div class='del'>-	macb_writel(lp, NCR, ctl &amp; ~(MACB_BIT(TE) | MACB_BIT(RE)));</div><div class='del'>-</div><div class='del'>-	/* Disable MAC interrupts */</div><div class='del'>-	macb_writel(lp, IDR, MACB_BIT(RCOMP)	|</div><div class='del'>-			     MACB_BIT(RXUBR)	|</div><div class='del'>-			     MACB_BIT(ISR_TUND)	|</div><div class='del'>-			     MACB_BIT(ISR_RLE)	|</div><div class='del'>-			     MACB_BIT(TCOMP)	|</div><div class='del'>-			     MACB_BIT(ISR_ROVR) |</div><div class='del'>-			     MACB_BIT(HRESP));</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(&amp;lp-&gt;pdev-&gt;dev,</div><div class='del'>-			  AT91ETHER_MAX_RX_DESCR *</div><div class='del'>-			  macb_dma_desc_get_size(lp),</div><div class='del'>-			  q-&gt;rx_ring, q-&gt;rx_ring_dma);</div><div class='del'>-	q-&gt;rx_ring = NULL;</div><div class='add'>+	phylink_stop(lp-&gt;phylink);</div><div class='add'>+	phylink_disconnect_phy(lp-&gt;phylink);</div><div class='ctx'> </div><div class='del'>-	dma_free_coherent(&amp;lp-&gt;pdev-&gt;dev,</div><div class='del'>-			  AT91ETHER_MAX_RX_DESCR * AT91ETHER_MAX_RBUFF_SZ,</div><div class='del'>-			  q-&gt;rx_buffers, q-&gt;rx_buffers_dma);</div><div class='del'>-	q-&gt;rx_buffers = NULL;</div><div class='add'>+	at91ether_stop(lp);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return pm_runtime_put(&amp;lp-&gt;pdev-&gt;dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Transmit packet */</div><div class='hunk'>@@ -3750,14 +4820,16 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	struct macb *lp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (macb_readl(lp, TSR) &amp; MACB_BIT(RM9200_BNQ)) {</div><div class='add'>+		int desc = 0;</div><div class='add'>+</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 		/* Store packet information (to free when Tx completed) */</div><div class='del'>-		lp-&gt;skb = skb;</div><div class='del'>-		lp-&gt;skb_length = skb-&gt;len;</div><div class='del'>-		lp-&gt;skb_physaddr = dma_map_single(&amp;lp-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='del'>-						  skb-&gt;len, DMA_TO_DEVICE);</div><div class='del'>-		if (dma_mapping_error(&amp;lp-&gt;pdev-&gt;dev, lp-&gt;skb_physaddr)) {</div><div class='add'>+		lp-&gt;rm9200_txq[desc].skb = skb;</div><div class='add'>+		lp-&gt;rm9200_txq[desc].size = skb-&gt;len;</div><div class='add'>+		lp-&gt;rm9200_txq[desc].mapping = dma_map_single(&amp;lp-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+							      skb-&gt;len, DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;lp-&gt;pdev-&gt;dev, lp-&gt;rm9200_txq[desc].mapping)) {</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			dev-&gt;stats.tx_dropped++;</div><div class='ctx'> 			netdev_err(dev, "%s: DMA mapping error\n", __func__);</div><div class='hunk'>@@ -3765,7 +4837,7 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* Set address of the data in the Transmit Address register */</div><div class='del'>-		macb_writel(lp, TAR, lp-&gt;skb_physaddr);</div><div class='add'>+		macb_writel(lp, TAR, lp-&gt;rm9200_txq[desc].mapping);</div><div class='ctx'> 		/* Set length of the packet in the Transmit Control register */</div><div class='ctx'> 		macb_writel(lp, TCR, skb-&gt;len);</div><div class='ctx'> </div><div class='hunk'>@@ -3828,6 +4900,7 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)</div><div class='ctx'> 	struct net_device *dev = dev_id;</div><div class='ctx'> 	struct macb *lp = netdev_priv(dev);</div><div class='ctx'> 	u32 intstatus, ctl;</div><div class='add'>+	unsigned int desc;</div><div class='ctx'> </div><div class='ctx'> 	/* MAC Interrupt Status register indicates what interrupts are pending.</div><div class='ctx'> 	 * It is automatically cleared once read.</div><div class='hunk'>@@ -3844,13 +4917,14 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id)</div><div class='ctx'> 		if (intstatus &amp; (MACB_BIT(ISR_TUND) | MACB_BIT(ISR_RLE)))</div><div class='ctx'> 			dev-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='del'>-		if (lp-&gt;skb) {</div><div class='del'>-			dev_consume_skb_irq(lp-&gt;skb);</div><div class='del'>-			lp-&gt;skb = NULL;</div><div class='del'>-			dma_unmap_single(&amp;lp-&gt;pdev-&gt;dev, lp-&gt;skb_physaddr,</div><div class='del'>-					 lp-&gt;skb_length, DMA_TO_DEVICE);</div><div class='add'>+		desc = 0;</div><div class='add'>+		if (lp-&gt;rm9200_txq[desc].skb) {</div><div class='add'>+			dev_consume_skb_irq(lp-&gt;rm9200_txq[desc].skb);</div><div class='add'>+			lp-&gt;rm9200_txq[desc].skb = NULL;</div><div class='add'>+			dma_unmap_single(&amp;lp-&gt;pdev-&gt;dev, lp-&gt;rm9200_txq[desc].mapping,</div><div class='add'>+					 lp-&gt;rm9200_txq[desc].size, DMA_TO_DEVICE);</div><div class='ctx'> 			dev-&gt;stats.tx_packets++;</div><div class='del'>-			dev-&gt;stats.tx_bytes += lp-&gt;skb_length;</div><div class='add'>+			dev-&gt;stats.tx_bytes += lp-&gt;rm9200_txq[desc].size;</div><div class='ctx'> 		}</div><div class='ctx'> 		netif_wake_queue(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3884,14 +4958,16 @@ static const struct net_device_ops at91ether_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= at91ether_open,</div><div class='ctx'> 	.ndo_stop		= at91ether_close,</div><div class='ctx'> 	.ndo_start_xmit		= at91ether_start_xmit,</div><div class='del'>-	.ndo_get_stats		= macb_get_stats,</div><div class='add'>+	.ndo_get_stats64	= macb_get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= macb_set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='del'>-	.ndo_do_ioctl		= macb_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= macb_ioctl,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller	= at91ether_poll_controller,</div><div class='ctx'> #endif</div><div class='add'>+	.ndo_hwtstamp_set	= macb_hwtstamp_set,</div><div class='add'>+	.ndo_hwtstamp_get	= macb_hwtstamp_get,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int at91ether_clk_init(struct platform_device *pdev, struct clk **pclk,</div><div class='hunk'>@@ -3923,7 +4999,6 @@ static int at91ether_init(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='del'>-	u32 reg;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;queues[0].bp = bp;</div><div class='ctx'> </div><div class='hunk'>@@ -3937,26 +5012,236 @@ static int at91ether_init(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	macb_writel(bp, NCR, 0);</div><div class='ctx'> </div><div class='del'>-	reg = MACB_BF(CLK, MACB_CLK_DIV32) | MACB_BIT(BIG);</div><div class='del'>-	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_RMII)</div><div class='del'>-		reg |= MACB_BIT(RM9200_RMII);</div><div class='add'>+	macb_writel(bp, NCFGR, MACB_BF(CLK, MACB_CLK_DIV32) | MACB_BIT(BIG));</div><div class='ctx'> </div><div class='del'>-	macb_writel(bp, NCFGR, reg);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned long fu540_macb_tx_recalc_rate(struct clk_hw *hw,</div><div class='add'>+					       unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	return mgmt-&gt;rate;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fu540_macb_tx_determine_rate(struct clk_hw *hw,</div><div class='add'>+					struct clk_rate_request *req)</div><div class='add'>+{</div><div class='add'>+	if (WARN_ON(req-&gt;rate &lt; 2500000))</div><div class='add'>+		req-&gt;rate = 2500000;</div><div class='add'>+	else if (req-&gt;rate == 2500000)</div><div class='add'>+		req-&gt;rate = 2500000;</div><div class='add'>+	else if (WARN_ON(req-&gt;rate &lt; 13750000))</div><div class='add'>+		req-&gt;rate = 2500000;</div><div class='add'>+	else if (WARN_ON(req-&gt;rate &lt; 25000000))</div><div class='add'>+		req-&gt;rate = 25000000;</div><div class='add'>+	else if (req-&gt;rate == 25000000)</div><div class='add'>+		req-&gt;rate = 25000000;</div><div class='add'>+	else if (WARN_ON(req-&gt;rate &lt; 75000000))</div><div class='add'>+		req-&gt;rate = 25000000;</div><div class='add'>+	else if (WARN_ON(req-&gt;rate &lt; 125000000))</div><div class='add'>+		req-&gt;rate = 125000000;</div><div class='add'>+	else if (req-&gt;rate == 125000000)</div><div class='add'>+		req-&gt;rate = 125000000;</div><div class='add'>+	else if (WARN_ON(req-&gt;rate &gt; 125000000))</div><div class='add'>+		req-&gt;rate = 125000000;</div><div class='add'>+	else</div><div class='add'>+		req-&gt;rate = 125000000;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int fu540_macb_tx_set_rate(struct clk_hw *hw, unsigned long rate,</div><div class='add'>+				  unsigned long parent_rate)</div><div class='add'>+{</div><div class='add'>+	struct clk_rate_request req;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	clk_hw_init_rate_request(hw, &amp;req, rate);</div><div class='add'>+	ret = fu540_macb_tx_determine_rate(hw, &amp;req);</div><div class='add'>+	if (ret != 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (req.rate != 125000000)</div><div class='add'>+		iowrite32(1, mgmt-&gt;reg);</div><div class='add'>+	else</div><div class='add'>+		iowrite32(0, mgmt-&gt;reg);</div><div class='add'>+	mgmt-&gt;rate = rate;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct clk_ops fu540_c000_ops = {</div><div class='add'>+	.recalc_rate = fu540_macb_tx_recalc_rate,</div><div class='add'>+	.determine_rate = fu540_macb_tx_determine_rate,</div><div class='add'>+	.set_rate = fu540_macb_tx_set_rate,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int fu540_c000_clk_init(struct platform_device *pdev, struct clk **pclk,</div><div class='add'>+			       struct clk **hclk, struct clk **tx_clk,</div><div class='add'>+			       struct clk **rx_clk, struct clk **tsu_clk)</div><div class='add'>+{</div><div class='add'>+	struct clk_init_data init;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	err = macb_clk_init(pdev, pclk, hclk, tx_clk, rx_clk, tsu_clk);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	mgmt = devm_kzalloc(&amp;pdev-&gt;dev, sizeof(*mgmt), GFP_KERNEL);</div><div class='add'>+	if (!mgmt) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_disable_clks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	init.name = "sifive-gemgxl-mgmt";</div><div class='add'>+	init.ops = &amp;fu540_c000_ops;</div><div class='add'>+	init.flags = 0;</div><div class='add'>+	init.num_parents = 0;</div><div class='add'>+</div><div class='add'>+	mgmt-&gt;rate = 0;</div><div class='add'>+	mgmt-&gt;hw.init = &amp;init;</div><div class='add'>+</div><div class='add'>+	*tx_clk = devm_clk_register(&amp;pdev-&gt;dev, &amp;mgmt-&gt;hw);</div><div class='add'>+	if (IS_ERR(*tx_clk)) {</div><div class='add'>+		err = PTR_ERR(*tx_clk);</div><div class='add'>+		goto err_disable_clks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = clk_prepare_enable(*tx_clk);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "failed to enable tx_clk (%u)\n", err);</div><div class='add'>+		*tx_clk = NULL;</div><div class='add'>+		goto err_disable_clks;</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(&amp;pdev-&gt;dev, "Registered clk switch '%s'\n", init.name);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_disable_clks:</div><div class='add'>+	macb_clks_disable(*pclk, *hclk, *tx_clk, *rx_clk, *tsu_clk);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int fu540_c000_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	mgmt-&gt;reg = devm_platform_ioremap_resource(pdev, 1);</div><div class='add'>+	if (IS_ERR(mgmt-&gt;reg))</div><div class='add'>+		return PTR_ERR(mgmt-&gt;reg);</div><div class='add'>+</div><div class='add'>+	return macb_init(pdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int init_reset_optional(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='add'>+	struct macb *bp = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (bp-&gt;phy_interface == PHY_INTERFACE_MODE_SGMII) {</div><div class='add'>+		/* Ensure PHY device used in SGMII mode is ready */</div><div class='add'>+		bp-&gt;phy = devm_phy_optional_get(&amp;pdev-&gt;dev, NULL);</div><div class='add'>+</div><div class='add'>+		if (IS_ERR(bp-&gt;phy))</div><div class='add'>+			return dev_err_probe(&amp;pdev-&gt;dev, PTR_ERR(bp-&gt;phy),</div><div class='add'>+					     "failed to get SGMII PHY\n");</div><div class='add'>+</div><div class='add'>+		ret = phy_init(bp-&gt;phy);</div><div class='add'>+		if (ret)</div><div class='add'>+			return dev_err_probe(&amp;pdev-&gt;dev, ret,</div><div class='add'>+					     "failed to init SGMII PHY\n");</div><div class='add'>+</div><div class='add'>+		ret = zynqmp_pm_is_function_supported(PM_IOCTL, IOCTL_SET_GEM_CONFIG);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			u32 pm_info[2];</div><div class='add'>+</div><div class='add'>+			ret = of_property_read_u32_array(pdev-&gt;dev.of_node, "power-domains",</div><div class='add'>+							 pm_info, ARRAY_SIZE(pm_info));</div><div class='add'>+			if (ret) {</div><div class='add'>+				dev_err(&amp;pdev-&gt;dev, "Failed to read power management information\n");</div><div class='add'>+				goto err_out_phy_exit;</div><div class='add'>+			}</div><div class='add'>+			ret = zynqmp_pm_set_gem_config(pm_info[1], GEM_CONFIG_FIXED, 0);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_out_phy_exit;</div><div class='add'>+</div><div class='add'>+			ret = zynqmp_pm_set_gem_config(pm_info[1], GEM_CONFIG_SGMII_MODE, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto err_out_phy_exit;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fully reset controller at hardware level if mapped in device tree */</div><div class='add'>+	ret = device_reset_optional(&amp;pdev-&gt;dev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		phy_exit(bp-&gt;phy);</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, ret, "failed to reset controller");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = macb_init(pdev);</div><div class='add'>+</div><div class='add'>+err_out_phy_exit:</div><div class='add'>+	if (ret)</div><div class='add'>+		phy_exit(bp-&gt;phy);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int eyeq5_init(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = platform_get_drvdata(pdev);</div><div class='add'>+	struct macb *bp = netdev_priv(netdev);</div><div class='add'>+	struct device *dev = &amp;pdev-&gt;dev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	bp-&gt;phy = devm_phy_get(dev, NULL);</div><div class='add'>+	if (IS_ERR(bp-&gt;phy))</div><div class='add'>+		return dev_err_probe(dev, PTR_ERR(bp-&gt;phy),</div><div class='add'>+				     "failed to get PHY\n");</div><div class='add'>+</div><div class='add'>+	ret = phy_init(bp-&gt;phy);</div><div class='add'>+	if (ret)</div><div class='add'>+		return dev_err_probe(dev, ret, "failed to init PHY\n");</div><div class='add'>+</div><div class='add'>+	ret = macb_init(pdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		phy_exit(bp-&gt;phy);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct macb_usrio_config sama7g5_usrio = {</div><div class='add'>+	.mii = 0,</div><div class='add'>+	.rmii = 1,</div><div class='add'>+	.rgmii = 2,</div><div class='add'>+	.refclk = BIT(2),</div><div class='add'>+	.hdfctlen = BIT(6),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config fu540_c000_config = {</div><div class='add'>+	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = fu540_c000_clk_init,</div><div class='add'>+	.init = fu540_c000_init,</div><div class='add'>+	.jumbo_max_len = 10240,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const struct macb_config at91sam9260_config = {</div><div class='ctx'> 	.caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config sama5d3macb_config = {</div><div class='del'>-	.caps = MACB_CAPS_SG_DISABLED</div><div class='del'>-	      | MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,</div><div class='add'>+	.caps = MACB_CAPS_SG_DISABLED |</div><div class='add'>+		MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config pc302gem_config = {</div><div class='hunk'>@@ -3964,22 +5249,34 @@ static const struct macb_config pc302gem_config = {</div><div class='ctx'> 	.dma_burst_length = 16,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config sama5d2_config = {</div><div class='del'>-	.caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,</div><div class='add'>+	.caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_JUMBO,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = macb_init,</div><div class='add'>+	.jumbo_max_len = 10240,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config sama5d29_config = {</div><div class='add'>+	.caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_GEM_HAS_PTP,</div><div class='ctx'> 	.dma_burst_length = 16,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config sama5d3_config = {</div><div class='del'>-	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE</div><div class='del'>-	      | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_JUMBO,</div><div class='add'>+	.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE |</div><div class='add'>+		MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | MACB_CAPS_JUMBO,</div><div class='ctx'> 	.dma_burst_length = 16,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='ctx'> 	.jumbo_max_len = 10240,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config sama5d4_config = {</div><div class='hunk'>@@ -3987,28 +5284,32 @@ static const struct macb_config sama5d4_config = {</div><div class='ctx'> 	.dma_burst_length = 4,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config emac_config = {</div><div class='del'>-	.caps = MACB_CAPS_NEEDS_RSTONUBR,</div><div class='add'>+	.caps = MACB_CAPS_NEEDS_RSTONUBR | MACB_CAPS_MACB_IS_EMAC,</div><div class='ctx'> 	.clk_init = at91ether_clk_init,</div><div class='ctx'> 	.init = at91ether_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config np4_config = {</div><div class='ctx'> 	.caps = MACB_CAPS_USRIO_DISABLED,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config zynqmp_config = {</div><div class='ctx'> 	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |</div><div class='del'>-			MACB_CAPS_JUMBO |</div><div class='del'>-			MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH,</div><div class='add'>+		MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH,</div><div class='ctx'> 	.dma_burst_length = 16,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='del'>-	.init = macb_init,</div><div class='add'>+	.init = init_reset_optional,</div><div class='ctx'> 	.jumbo_max_len = 10240,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config zynq_config = {</div><div class='hunk'>@@ -4017,10 +5318,76 @@ static const struct macb_config zynq_config = {</div><div class='ctx'> 	.dma_burst_length = 16,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config mpfs_config = {</div><div class='add'>+	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |</div><div class='add'>+		MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = init_reset_optional,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+	.max_tx_length = 4040, /* Cadence Erratum 1686 */</div><div class='add'>+	.jumbo_max_len = 4040,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config sama7g5_gem_config = {</div><div class='add'>+	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_CLK_HW_CHG |</div><div class='add'>+		MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII |</div><div class='add'>+		MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = macb_init,</div><div class='add'>+	.usrio = &amp;sama7g5_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config sama7g5_emac_config = {</div><div class='add'>+	.caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII |</div><div class='add'>+		MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = macb_init,</div><div class='add'>+	.usrio = &amp;sama7g5_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config versal_config = {</div><div class='add'>+	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH |</div><div class='add'>+		MACB_CAPS_NEED_TSUCLK | MACB_CAPS_QUEUE_DISABLE |</div><div class='add'>+		MACB_CAPS_QBV,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = init_reset_optional,</div><div class='add'>+	.jumbo_max_len = 10240,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config eyeq5_config = {</div><div class='add'>+	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_QUEUE_DISABLE |</div><div class='add'>+		MACB_CAPS_NO_LSO,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = eyeq5_init,</div><div class='add'>+	.jumbo_max_len = 10240,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct macb_config raspberrypi_rp1_config = {</div><div class='add'>+	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_CLK_HW_CHG |</div><div class='add'>+		MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP,</div><div class='add'>+	.dma_burst_length = 16,</div><div class='add'>+	.clk_init = macb_clk_init,</div><div class='add'>+	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='add'>+	.jumbo_max_len = 10240,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id macb_dt_ids[] = {</div><div class='del'>-	{ .compatible = "cdns,at32ap7000-macb" },</div><div class='ctx'> 	{ .compatible = "cdns,at91sam9260-macb", .data = &amp;at91sam9260_config },</div><div class='ctx'> 	{ .compatible = "cdns,macb" },</div><div class='ctx'> 	{ .compatible = "cdns,np4-macb", .data = &amp;np4_config },</div><div class='hunk'>@@ -4028,13 +5395,23 @@ static const struct of_device_id macb_dt_ids[] = {</div><div class='ctx'> 	{ .compatible = "cdns,gem", .data = &amp;pc302gem_config },</div><div class='ctx'> 	{ .compatible = "cdns,sam9x60-macb", .data = &amp;at91sam9260_config },</div><div class='ctx'> 	{ .compatible = "atmel,sama5d2-gem", .data = &amp;sama5d2_config },</div><div class='add'>+	{ .compatible = "atmel,sama5d29-gem", .data = &amp;sama5d29_config },</div><div class='ctx'> 	{ .compatible = "atmel,sama5d3-gem", .data = &amp;sama5d3_config },</div><div class='ctx'> 	{ .compatible = "atmel,sama5d3-macb", .data = &amp;sama5d3macb_config },</div><div class='ctx'> 	{ .compatible = "atmel,sama5d4-gem", .data = &amp;sama5d4_config },</div><div class='ctx'> 	{ .compatible = "cdns,at91rm9200-emac", .data = &amp;emac_config },</div><div class='ctx'> 	{ .compatible = "cdns,emac", .data = &amp;emac_config },</div><div class='del'>-	{ .compatible = "cdns,zynqmp-gem", .data = &amp;zynqmp_config},</div><div class='del'>-	{ .compatible = "cdns,zynq-gem", .data = &amp;zynq_config },</div><div class='add'>+	{ .compatible = "cdns,zynqmp-gem", .data = &amp;zynqmp_config}, /* deprecated */</div><div class='add'>+	{ .compatible = "cdns,zynq-gem", .data = &amp;zynq_config }, /* deprecated */</div><div class='add'>+	{ .compatible = "sifive,fu540-c000-gem", .data = &amp;fu540_c000_config },</div><div class='add'>+	{ .compatible = "microchip,mpfs-macb", .data = &amp;mpfs_config },</div><div class='add'>+	{ .compatible = "microchip,sama7g5-gem", .data = &amp;sama7g5_gem_config },</div><div class='add'>+	{ .compatible = "microchip,sama7g5-emac", .data = &amp;sama7g5_emac_config },</div><div class='add'>+	{ .compatible = "mobileye,eyeq5-gem", .data = &amp;eyeq5_config },</div><div class='add'>+	{ .compatible = "raspberrypi,rp1-gem", .data = &amp;raspberrypi_rp1_config },</div><div class='add'>+	{ .compatible = "xlnx,zynqmp-gem", .data = &amp;zynqmp_config},</div><div class='add'>+	{ .compatible = "xlnx,zynq-gem", .data = &amp;zynq_config },</div><div class='add'>+	{ .compatible = "xlnx,versal-gem", .data = &amp;versal_config},</div><div class='ctx'> 	{ /* sentinel */ }</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(of, macb_dt_ids);</div><div class='hunk'>@@ -4042,36 +5419,32 @@ MODULE_DEVICE_TABLE(of, macb_dt_ids);</div><div class='ctx'> </div><div class='ctx'> static const struct macb_config default_gem_config = {</div><div class='ctx'> 	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE |</div><div class='del'>-			MACB_CAPS_JUMBO |</div><div class='del'>-			MACB_CAPS_GEM_HAS_PTP,</div><div class='add'>+		MACB_CAPS_JUMBO |</div><div class='add'>+		MACB_CAPS_GEM_HAS_PTP,</div><div class='ctx'> 	.dma_burst_length = 16,</div><div class='ctx'> 	.clk_init = macb_clk_init,</div><div class='ctx'> 	.init = macb_init,</div><div class='add'>+	.usrio = &amp;macb_default_usrio,</div><div class='ctx'> 	.jumbo_max_len = 10240,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct macb_config *macb_config = &amp;default_gem_config;</div><div class='del'>-	int (*clk_init)(struct platform_device *, struct clk **,</div><div class='del'>-			struct clk **, struct clk **,  struct clk **,</div><div class='del'>-			struct clk **) = macb_config-&gt;clk_init;</div><div class='del'>-	int (*init)(struct platform_device *) = macb_config-&gt;init;</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL;</div><div class='ctx'> 	struct clk *tsu_clk = NULL;</div><div class='del'>-	unsigned int queue_mask, num_queues;</div><div class='del'>-	bool native_io;</div><div class='del'>-	struct phy_device *phydev;</div><div class='add'>+	phy_interface_t interface;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct resource *regs;</div><div class='add'>+	u32 wtrmrk_rst_val;</div><div class='ctx'> 	void __iomem *mem;</div><div class='del'>-	const char *mac;</div><div class='ctx'> 	struct macb *bp;</div><div class='add'>+	int num_queues;</div><div class='add'>+	bool native_io;</div><div class='ctx'> 	int err, val;</div><div class='ctx'> </div><div class='del'>-	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	mem = devm_ioremap_resource(&amp;pdev-&gt;dev, regs);</div><div class='add'>+	mem = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;regs);</div><div class='ctx'> 	if (IS_ERR(mem))</div><div class='ctx'> 		return PTR_ERR(mem);</div><div class='ctx'> </div><div class='hunk'>@@ -4079,14 +5452,11 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 		const struct of_device_id *match;</div><div class='ctx'> </div><div class='ctx'> 		match = of_match_node(macb_dt_ids, np);</div><div class='del'>-		if (match &amp;&amp; match-&gt;data) {</div><div class='add'>+		if (match &amp;&amp; match-&gt;data)</div><div class='ctx'> 			macb_config = match-&gt;data;</div><div class='del'>-			clk_init = macb_config-&gt;clk_init;</div><div class='del'>-			init = macb_config-&gt;init;</div><div class='del'>-		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = clk_init(pdev, &amp;pclk, &amp;hclk, &amp;tx_clk, &amp;rx_clk, &amp;tsu_clk);</div><div class='add'>+	err = macb_config-&gt;clk_init(pdev, &amp;pclk, &amp;hclk, &amp;tx_clk, &amp;rx_clk, &amp;tsu_clk);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -4097,7 +5467,12 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 	pm_runtime_enable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	native_io = hw_is_native_io(mem);</div><div class='ctx'> </div><div class='del'>-	macb_probe_queues(mem, native_io, &amp;queue_mask, &amp;num_queues);</div><div class='add'>+	num_queues = macb_probe_queues(&amp;pdev-&gt;dev, mem, native_io);</div><div class='add'>+	if (num_queues &lt; 0) {</div><div class='add'>+		err = num_queues;</div><div class='add'>+		goto err_disable_clocks;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	dev = alloc_etherdev_mq(sizeof(*bp), num_queues);</div><div class='ctx'> 	if (!dev) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -4121,31 +5496,59 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 		bp-&gt;macb_reg_writel = hw_writel;</div><div class='ctx'> 	}</div><div class='ctx'> 	bp-&gt;num_queues = num_queues;</div><div class='del'>-	bp-&gt;queue_mask = queue_mask;</div><div class='del'>-	if (macb_config)</div><div class='del'>-		bp-&gt;dma_burst_length = macb_config-&gt;dma_burst_length;</div><div class='add'>+	bp-&gt;dma_burst_length = macb_config-&gt;dma_burst_length;</div><div class='ctx'> 	bp-&gt;pclk = pclk;</div><div class='ctx'> 	bp-&gt;hclk = hclk;</div><div class='ctx'> 	bp-&gt;tx_clk = tx_clk;</div><div class='ctx'> 	bp-&gt;rx_clk = rx_clk;</div><div class='ctx'> 	bp-&gt;tsu_clk = tsu_clk;</div><div class='del'>-	if (macb_config)</div><div class='del'>-		bp-&gt;jumbo_max_len = macb_config-&gt;jumbo_max_len;</div><div class='add'>+	bp-&gt;jumbo_max_len = macb_config-&gt;jumbo_max_len;</div><div class='add'>+</div><div class='add'>+	if (!hw_is_gem(bp-&gt;regs, bp-&gt;native_io))</div><div class='add'>+		bp-&gt;max_tx_length = MACB_MAX_TX_LEN;</div><div class='add'>+	else if (macb_config-&gt;max_tx_length)</div><div class='add'>+		bp-&gt;max_tx_length = macb_config-&gt;max_tx_length;</div><div class='add'>+	else</div><div class='add'>+		bp-&gt;max_tx_length = GEM_MAX_TX_LEN;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;wol = 0;</div><div class='del'>-	if (of_get_property(np, "magic-packet", NULL))</div><div class='del'>-		bp-&gt;wol |= MACB_WOL_HAS_MAGIC_PACKET;</div><div class='del'>-	device_init_wakeup(&amp;pdev-&gt;dev, bp-&gt;wol &amp; MACB_WOL_HAS_MAGIC_PACKET);</div><div class='add'>+	device_set_wakeup_capable(&amp;pdev-&gt;dev, 1);</div><div class='add'>+</div><div class='add'>+	bp-&gt;usrio = macb_config-&gt;usrio;</div><div class='ctx'> </div><div class='add'>+	/* By default we set to partial store and forward mode for zynqmp.</div><div class='add'>+	 * Disable if not set in devicetree.</div><div class='add'>+	 */</div><div class='add'>+	if (GEM_BFEXT(PBUF_CUTTHRU, gem_readl(bp, DCFG6))) {</div><div class='add'>+		err = of_property_read_u32(bp-&gt;pdev-&gt;dev.of_node,</div><div class='add'>+					   "cdns,rx-watermark",</div><div class='add'>+					   &amp;bp-&gt;rx_watermark);</div><div class='add'>+</div><div class='add'>+		if (!err) {</div><div class='add'>+			/* Disable partial store and forward in case of error or</div><div class='add'>+			 * invalid watermark value</div><div class='add'>+			 */</div><div class='add'>+			wtrmrk_rst_val = (1 &lt;&lt; (GEM_BFEXT(RX_PBUF_ADDR, gem_readl(bp, DCFG2)))) - 1;</div><div class='add'>+			if (bp-&gt;rx_watermark &gt; wtrmrk_rst_val || !bp-&gt;rx_watermark) {</div><div class='add'>+				dev_info(&amp;bp-&gt;pdev-&gt;dev, "Invalid watermark value\n");</div><div class='add'>+				bp-&gt;rx_watermark = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;lock);</div><div class='add'>+	spin_lock_init(&amp;bp-&gt;stats_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* setup capabilities */</div><div class='ctx'> 	macb_configure_caps(bp, macb_config);</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='ctx'> 	if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {</div><div class='del'>-		dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(44));</div><div class='del'>-		bp-&gt;hw_dma_cap |= HW_DMA_CAP_64B;</div><div class='add'>+		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(44));</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "failed to set DMA mask\n");</div><div class='add'>+			goto err_out_free_netdev;</div><div class='add'>+		}</div><div class='add'>+		bp-&gt;caps |= MACB_CAPS_DMA_64B;</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='hunk'>@@ -4156,12 +5559,12 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* MTU range: 68 - 1500 or 10240 */</div><div class='add'>+	/* MTU range: 68 - 1518 or 10240 */</div><div class='ctx'> 	dev-&gt;min_mtu = GEM_MTU_MIN_SIZE;</div><div class='del'>-	if (bp-&gt;caps &amp; MACB_CAPS_JUMBO)</div><div class='del'>-		dev-&gt;max_mtu = gem_readl(bp, JML) - ETH_HLEN - ETH_FCS_LEN;</div><div class='add'>+	if ((bp-&gt;caps &amp; MACB_CAPS_JUMBO) &amp;&amp; bp-&gt;jumbo_max_len)</div><div class='add'>+		dev-&gt;max_mtu = bp-&gt;jumbo_max_len - ETH_HLEN - ETH_FCS_LEN;</div><div class='ctx'> 	else</div><div class='del'>-		dev-&gt;max_mtu = ETH_DATA_LEN;</div><div class='add'>+		dev-&gt;max_mtu = 1536 - ETH_HLEN - ETH_FCS_LEN;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;caps &amp; MACB_CAPS_BD_RD_PREFETCH) {</div><div class='ctx'> 		val = GEM_BFEXT(RXBD_RDBUFF, gem_readl(bp, DCFG10));</div><div class='hunk'>@@ -4179,33 +5582,27 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (bp-&gt;caps &amp; MACB_CAPS_NEEDS_RSTONUBR)</div><div class='ctx'> 		bp-&gt;rx_intr_mask |= MACB_BIT(RXUBR);</div><div class='ctx'> </div><div class='del'>-	mac = of_get_mac_address(np);</div><div class='del'>-	if (PTR_ERR(mac) == -EPROBE_DEFER) {</div><div class='del'>-		err = -EPROBE_DEFER;</div><div class='add'>+	err = of_get_ethdev_address(np, bp-&gt;dev);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='del'>-	} else if (!IS_ERR(mac)) {</div><div class='del'>-		ether_addr_copy(bp-&gt;dev-&gt;dev_addr, mac);</div><div class='del'>-	} else {</div><div class='add'>+	else if (err)</div><div class='ctx'> 		macb_get_hwaddr(bp);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	err = of_get_phy_mode(np);</div><div class='del'>-	if (err &lt; 0)</div><div class='add'>+	err = of_get_phy_mode(np, &amp;interface);</div><div class='add'>+	if (err)</div><div class='ctx'> 		/* not found in DT, MII by default */</div><div class='ctx'> 		bp-&gt;phy_interface = PHY_INTERFACE_MODE_MII;</div><div class='ctx'> 	else</div><div class='del'>-		bp-&gt;phy_interface = err;</div><div class='add'>+		bp-&gt;phy_interface = interface;</div><div class='ctx'> </div><div class='ctx'> 	/* IP specific init */</div><div class='del'>-	err = init(pdev);</div><div class='add'>+	err = macb_config-&gt;init(pdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_free_netdev;</div><div class='ctx'> </div><div class='ctx'> 	err = macb_mii_init(bp);</div><div class='ctx'> 	if (err)</div><div class='del'>-		goto err_out_free_netdev;</div><div class='del'>-</div><div class='del'>-	phydev = dev-&gt;phydev;</div><div class='add'>+		goto err_out_phy_exit;</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -4215,37 +5612,28 @@ static int macb_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_out_unregister_mdio;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;bp-&gt;hresp_err_tasklet, macb_hresp_error_task,</div><div class='del'>-		     (unsigned long)bp);</div><div class='del'>-</div><div class='del'>-	phy_attached_info(phydev);</div><div class='add'>+	INIT_WORK(&amp;bp-&gt;hresp_err_bh_work, macb_hresp_error_task);</div><div class='ctx'> </div><div class='ctx'> 	netdev_info(dev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n",</div><div class='ctx'> 		    macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID),</div><div class='ctx'> 		    dev-&gt;base_addr, dev-&gt;irq, dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	pm_runtime_mark_last_busy(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_put_autosuspend(&amp;bp-&gt;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_unregister_mdio:</div><div class='del'>-	phy_disconnect(dev-&gt;phydev);</div><div class='ctx'> 	mdiobus_unregister(bp-&gt;mii_bus);</div><div class='del'>-	of_node_put(bp-&gt;phy_node);</div><div class='del'>-	if (np &amp;&amp; of_phy_is_fixed_link(np))</div><div class='del'>-		of_phy_deregister_fixed_link(np);</div><div class='ctx'> 	mdiobus_free(bp-&gt;mii_bus);</div><div class='ctx'> </div><div class='add'>+err_out_phy_exit:</div><div class='add'>+	phy_exit(bp-&gt;phy);</div><div class='add'>+</div><div class='ctx'> err_out_free_netdev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> </div><div class='ctx'> err_disable_clocks:</div><div class='del'>-	clk_disable_unprepare(tx_clk);</div><div class='del'>-	clk_disable_unprepare(hclk);</div><div class='del'>-	clk_disable_unprepare(pclk);</div><div class='del'>-	clk_disable_unprepare(rx_clk);</div><div class='del'>-	clk_disable_unprepare(tsu_clk);</div><div class='add'>+	macb_clks_disable(pclk, hclk, tx_clk, rx_clk, tsu_clk);</div><div class='ctx'> 	pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_set_suspended(&amp;pdev-&gt;dev);</div><div class='ctx'> 	pm_runtime_dont_use_autosuspend(&amp;pdev-&gt;dev);</div><div class='hunk'>@@ -4253,81 +5641,158 @@ err_disable_clocks:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int macb_remove(struct platform_device *pdev)</div><div class='add'>+static void macb_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct macb *bp;</div><div class='del'>-	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> </div><div class='ctx'> 	dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		bp = netdev_priv(dev);</div><div class='del'>-		if (dev-&gt;phydev)</div><div class='del'>-			phy_disconnect(dev-&gt;phydev);</div><div class='add'>+		unregister_netdev(dev);</div><div class='add'>+		phy_exit(bp-&gt;phy);</div><div class='ctx'> 		mdiobus_unregister(bp-&gt;mii_bus);</div><div class='del'>-		if (np &amp;&amp; of_phy_is_fixed_link(np))</div><div class='del'>-			of_phy_deregister_fixed_link(np);</div><div class='del'>-		dev-&gt;phydev = NULL;</div><div class='ctx'> 		mdiobus_free(bp-&gt;mii_bus);</div><div class='ctx'> </div><div class='del'>-		unregister_netdev(dev);</div><div class='add'>+		device_set_wakeup_enable(&amp;bp-&gt;pdev-&gt;dev, 0);</div><div class='add'>+		cancel_work_sync(&amp;bp-&gt;hresp_err_bh_work);</div><div class='ctx'> 		pm_runtime_disable(&amp;pdev-&gt;dev);</div><div class='ctx'> 		pm_runtime_dont_use_autosuspend(&amp;pdev-&gt;dev);</div><div class='del'>-		if (!pm_runtime_suspended(&amp;pdev-&gt;dev)) {</div><div class='del'>-			clk_disable_unprepare(bp-&gt;tx_clk);</div><div class='del'>-			clk_disable_unprepare(bp-&gt;hclk);</div><div class='del'>-			clk_disable_unprepare(bp-&gt;pclk);</div><div class='del'>-			clk_disable_unprepare(bp-&gt;rx_clk);</div><div class='del'>-			clk_disable_unprepare(bp-&gt;tsu_clk);</div><div class='del'>-			pm_runtime_set_suspended(&amp;pdev-&gt;dev);</div><div class='del'>-		}</div><div class='del'>-		of_node_put(bp-&gt;phy_node);</div><div class='add'>+		pm_runtime_set_suspended(&amp;pdev-&gt;dev);</div><div class='add'>+		phylink_destroy(bp-&gt;phylink);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int __maybe_unused macb_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='del'>-	struct macb_queue *queue = bp-&gt;queues;</div><div class='add'>+	struct in_ifaddr *ifa = NULL;</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	struct in_device *idev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int q;</div><div class='add'>+	int err;</div><div class='add'>+	u32 tmp;</div><div class='add'>+</div><div class='add'>+	if (!device_may_wakeup(&amp;bp-&gt;dev-&gt;dev))</div><div class='add'>+		phy_exit(bp-&gt;phy);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(netdev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-</div><div class='ctx'> 	if (bp-&gt;wol &amp; MACB_WOL_ENABLED) {</div><div class='del'>-		macb_writel(bp, IER, MACB_BIT(WOL));</div><div class='del'>-		macb_writel(bp, WOL, MACB_BIT(MAG));</div><div class='del'>-		enable_irq_wake(bp-&gt;queues[0].irq);</div><div class='del'>-		netif_device_detach(netdev);</div><div class='del'>-	} else {</div><div class='del'>-		netif_device_detach(netdev);</div><div class='add'>+		/* Check for IP address in WOL ARP mode */</div><div class='add'>+		idev = __in_dev_get_rcu(bp-&gt;dev);</div><div class='add'>+		if (idev)</div><div class='add'>+			ifa = rcu_dereference(idev-&gt;ifa_list);</div><div class='add'>+		if ((bp-&gt;wolopts &amp; WAKE_ARP) &amp;&amp; !ifa) {</div><div class='add'>+			netdev_err(netdev, "IP address not assigned as required by WoL walk ARP\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		/* Disable Tx and Rx engines before  disabling the queues,</div><div class='add'>+		 * this is mandatory as per the IP spec sheet</div><div class='add'>+		 */</div><div class='add'>+		tmp = macb_readl(bp, NCR);</div><div class='add'>+		macb_writel(bp, NCR, tmp &amp; ~(MACB_BIT(TE) | MACB_BIT(RE)));</div><div class='add'>+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='add'>+		if (!(bp-&gt;caps &amp; MACB_CAPS_QUEUE_DISABLE))</div><div class='add'>+			macb_writel(bp, RBQPH,</div><div class='add'>+				    upper_32_bits(bp-&gt;rx_ring_tieoff_dma));</div><div class='add'>+#endif</div><div class='ctx'> 		for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues;</div><div class='del'>-		     ++q, ++queue)</div><div class='del'>-			napi_disable(&amp;queue-&gt;napi);</div><div class='del'>-		phy_stop(netdev-&gt;phydev);</div><div class='del'>-		phy_suspend(netdev-&gt;phydev);</div><div class='add'>+		     ++q, ++queue) {</div><div class='add'>+			/* Disable RX queues */</div><div class='add'>+			if (bp-&gt;caps &amp; MACB_CAPS_QUEUE_DISABLE) {</div><div class='add'>+				queue_writel(queue, RBQP, MACB_BIT(QUEUE_DISABLE));</div><div class='add'>+			} else {</div><div class='add'>+				/* Tie off RX queues */</div><div class='add'>+				queue_writel(queue, RBQP,</div><div class='add'>+					     lower_32_bits(bp-&gt;rx_ring_tieoff_dma));</div><div class='add'>+			}</div><div class='add'>+			/* Disable all interrupts */</div><div class='add'>+			queue_writel(queue, IDR, -1);</div><div class='add'>+			queue_readl(queue, ISR);</div><div class='add'>+			if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='add'>+				queue_writel(queue, ISR, -1);</div><div class='add'>+		}</div><div class='add'>+		/* Enable Receive engine */</div><div class='add'>+		macb_writel(bp, NCR, tmp | MACB_BIT(RE));</div><div class='add'>+		/* Flush all status bits */</div><div class='add'>+		macb_writel(bp, TSR, -1);</div><div class='add'>+		macb_writel(bp, RSR, -1);</div><div class='add'>+</div><div class='add'>+		tmp = (bp-&gt;wolopts &amp; WAKE_MAGIC) ? MACB_BIT(MAG) : 0;</div><div class='add'>+		if (bp-&gt;wolopts &amp; WAKE_ARP) {</div><div class='add'>+			tmp |= MACB_BIT(ARP);</div><div class='add'>+			/* write IP address into register */</div><div class='add'>+			tmp |= MACB_BFEXT(IP, be32_to_cpu(ifa-&gt;ifa_local));</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Change interrupt handler and</div><div class='add'>+		 * Enable WoL IRQ on queue 0</div><div class='add'>+		 */</div><div class='add'>+		devm_free_irq(dev, bp-&gt;queues[0].irq, bp-&gt;queues);</div><div class='add'>+		if (macb_is_gem(bp)) {</div><div class='add'>+			err = devm_request_irq(dev, bp-&gt;queues[0].irq, gem_wol_interrupt,</div><div class='add'>+					       IRQF_SHARED, netdev-&gt;name, bp-&gt;queues);</div><div class='add'>+			if (err) {</div><div class='add'>+				dev_err(dev,</div><div class='add'>+					"Unable to request IRQ %d (error %d)\n",</div><div class='add'>+					bp-&gt;queues[0].irq, err);</div><div class='add'>+				spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+			queue_writel(bp-&gt;queues, IER, GEM_BIT(WOL));</div><div class='add'>+			gem_writel(bp, WOL, tmp);</div><div class='add'>+		} else {</div><div class='add'>+			err = devm_request_irq(dev, bp-&gt;queues[0].irq, macb_wol_interrupt,</div><div class='add'>+					       IRQF_SHARED, netdev-&gt;name, bp-&gt;queues);</div><div class='add'>+			if (err) {</div><div class='add'>+				dev_err(dev,</div><div class='add'>+					"Unable to request IRQ %d (error %d)\n",</div><div class='add'>+					bp-&gt;queues[0].irq, err);</div><div class='add'>+				spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+			queue_writel(bp-&gt;queues, IER, MACB_BIT(WOL));</div><div class='add'>+			macb_writel(bp, WOL, tmp);</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+		enable_irq_wake(bp-&gt;queues[0].irq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues;</div><div class='add'>+	     ++q, ++queue) {</div><div class='add'>+		napi_disable(&amp;queue-&gt;napi_rx);</div><div class='add'>+		napi_disable(&amp;queue-&gt;napi_tx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;wol &amp; MACB_WOL_ENABLED)) {</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		phylink_stop(bp-&gt;phylink);</div><div class='add'>+		rtnl_unlock();</div><div class='ctx'> 		spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> 		macb_reset_hw(bp);</div><div class='ctx'> 		spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		if (!(bp-&gt;caps &amp; MACB_CAPS_USRIO_DISABLED))</div><div class='del'>-			bp-&gt;pm_data.usrio = macb_or_gem_readl(bp, USRIO);</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_USRIO_DISABLED))</div><div class='add'>+		bp-&gt;pm_data.usrio = macb_or_gem_readl(bp, USRIO);</div><div class='ctx'> </div><div class='del'>-		if (netdev-&gt;hw_features &amp; NETIF_F_NTUPLE)</div><div class='del'>-			bp-&gt;pm_data.scrt2 = gem_readl_n(bp, ETHT, SCRT2_ETHT);</div><div class='del'>-	}</div><div class='add'>+	if (netdev-&gt;hw_features &amp; NETIF_F_NTUPLE)</div><div class='add'>+		bp-&gt;pm_data.scrt2 = gem_readl_n(bp, ETHT, SCRT2_ETHT);</div><div class='ctx'> </div><div class='del'>-	netif_carrier_off(netdev);</div><div class='ctx'> 	if (bp-&gt;ptp_info)</div><div class='ctx'> 		bp-&gt;ptp_info-&gt;ptp_remove(netdev);</div><div class='del'>-	pm_runtime_force_suspend(dev);</div><div class='add'>+	if (!device_may_wakeup(dev))</div><div class='add'>+		pm_runtime_force_suspend(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4336,39 +5801,78 @@ static int __maybe_unused macb_resume(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='del'>-	struct macb_queue *queue = bp-&gt;queues;</div><div class='add'>+	struct macb_queue *queue;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned int q;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!device_may_wakeup(&amp;bp-&gt;dev-&gt;dev))</div><div class='add'>+		phy_init(bp-&gt;phy);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(netdev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pm_runtime_force_resume(dev);</div><div class='add'>+	if (!device_may_wakeup(dev))</div><div class='add'>+		pm_runtime_force_resume(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;wol &amp; MACB_WOL_ENABLED) {</div><div class='del'>-		macb_writel(bp, IDR, MACB_BIT(WOL));</div><div class='del'>-		macb_writel(bp, WOL, 0);</div><div class='del'>-		disable_irq_wake(bp-&gt;queues[0].irq);</div><div class='del'>-	} else {</div><div class='del'>-		macb_writel(bp, NCR, MACB_BIT(MPE));</div><div class='add'>+		spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='add'>+		/* Disable WoL */</div><div class='add'>+		if (macb_is_gem(bp)) {</div><div class='add'>+			queue_writel(bp-&gt;queues, IDR, GEM_BIT(WOL));</div><div class='add'>+			gem_writel(bp, WOL, 0);</div><div class='add'>+		} else {</div><div class='add'>+			queue_writel(bp-&gt;queues, IDR, MACB_BIT(WOL));</div><div class='add'>+			macb_writel(bp, WOL, 0);</div><div class='add'>+		}</div><div class='add'>+		/* Clear ISR on queue 0 */</div><div class='add'>+		queue_readl(bp-&gt;queues, ISR);</div><div class='add'>+		if (bp-&gt;caps &amp; MACB_CAPS_ISR_CLEAR_ON_WRITE)</div><div class='add'>+			queue_writel(bp-&gt;queues, ISR, -1);</div><div class='add'>+		/* Replace interrupt handler on queue 0 */</div><div class='add'>+		devm_free_irq(dev, bp-&gt;queues[0].irq, bp-&gt;queues);</div><div class='add'>+		err = devm_request_irq(dev, bp-&gt;queues[0].irq, macb_interrupt,</div><div class='add'>+				       IRQF_SHARED, netdev-&gt;name, bp-&gt;queues);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev,</div><div class='add'>+				"Unable to request IRQ %d (error %d)\n",</div><div class='add'>+				bp-&gt;queues[0].irq, err);</div><div class='add'>+			spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-		if (netdev-&gt;hw_features &amp; NETIF_F_NTUPLE)</div><div class='del'>-			gem_writel_n(bp, ETHT, SCRT2_ETHT, bp-&gt;pm_data.scrt2);</div><div class='add'>+		disable_irq_wake(bp-&gt;queues[0].irq);</div><div class='ctx'> </div><div class='del'>-		if (!(bp-&gt;caps &amp; MACB_CAPS_USRIO_DISABLED))</div><div class='del'>-			macb_or_gem_writel(bp, USRIO, bp-&gt;pm_data.usrio);</div><div class='add'>+		/* Now make sure we disable phy before moving</div><div class='add'>+		 * to common restore path</div><div class='add'>+		 */</div><div class='add'>+		rtnl_lock();</div><div class='add'>+		phylink_stop(bp-&gt;phylink);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-		for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues;</div><div class='del'>-		     ++q, ++queue)</div><div class='del'>-			napi_enable(&amp;queue-&gt;napi);</div><div class='del'>-		phy_resume(netdev-&gt;phydev);</div><div class='del'>-		phy_init_hw(netdev-&gt;phydev);</div><div class='del'>-		phy_start(netdev-&gt;phydev);</div><div class='add'>+	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues;</div><div class='add'>+	     ++q, ++queue) {</div><div class='add'>+		napi_enable(&amp;queue-&gt;napi_rx);</div><div class='add'>+		napi_enable(&amp;queue-&gt;napi_tx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	bp-&gt;macbgem_ops.mog_init_rings(bp);</div><div class='add'>+	if (netdev-&gt;hw_features &amp; NETIF_F_NTUPLE)</div><div class='add'>+		gem_writel_n(bp, ETHT, SCRT2_ETHT, bp-&gt;pm_data.scrt2);</div><div class='add'>+</div><div class='add'>+	if (!(bp-&gt;caps &amp; MACB_CAPS_USRIO_DISABLED))</div><div class='add'>+		macb_or_gem_writel(bp, USRIO, bp-&gt;pm_data.usrio);</div><div class='add'>+</div><div class='add'>+	macb_writel(bp, NCR, MACB_BIT(MPE));</div><div class='ctx'> 	macb_init_hw(bp);</div><div class='ctx'> 	macb_set_rx_mode(netdev);</div><div class='ctx'> 	macb_restore_features(bp);</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	phylink_start(bp-&gt;phylink);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='ctx'> 	netif_device_attach(netdev);</div><div class='ctx'> 	if (bp-&gt;ptp_info)</div><div class='ctx'> 		bp-&gt;ptp_info-&gt;ptp_init(netdev);</div><div class='hunk'>@@ -4381,13 +5885,10 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev)</div><div class='ctx'> 	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (!(device_may_wakeup(&amp;bp-&gt;dev-&gt;dev))) {</div><div class='del'>-		clk_disable_unprepare(bp-&gt;tx_clk);</div><div class='del'>-		clk_disable_unprepare(bp-&gt;hclk);</div><div class='del'>-		clk_disable_unprepare(bp-&gt;pclk);</div><div class='del'>-		clk_disable_unprepare(bp-&gt;rx_clk);</div><div class='del'>-	}</div><div class='del'>-	clk_disable_unprepare(bp-&gt;tsu_clk);</div><div class='add'>+	if (!(device_may_wakeup(dev)))</div><div class='add'>+		macb_clks_disable(bp-&gt;pclk, bp-&gt;hclk, bp-&gt;tx_clk, bp-&gt;rx_clk, bp-&gt;tsu_clk);</div><div class='add'>+	else if (!(bp-&gt;caps &amp; MACB_CAPS_NEED_TSUCLK))</div><div class='add'>+		macb_clks_disable(NULL, NULL, NULL, NULL, bp-&gt;tsu_clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -4397,17 +5898,33 @@ static int __maybe_unused macb_runtime_resume(struct device *dev)</div><div class='ctx'> 	struct net_device *netdev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct macb *bp = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (!(device_may_wakeup(&amp;bp-&gt;dev-&gt;dev))) {</div><div class='add'>+	if (!(device_may_wakeup(dev))) {</div><div class='ctx'> 		clk_prepare_enable(bp-&gt;pclk);</div><div class='ctx'> 		clk_prepare_enable(bp-&gt;hclk);</div><div class='ctx'> 		clk_prepare_enable(bp-&gt;tx_clk);</div><div class='ctx'> 		clk_prepare_enable(bp-&gt;rx_clk);</div><div class='add'>+		clk_prepare_enable(bp-&gt;tsu_clk);</div><div class='add'>+	} else if (!(bp-&gt;caps &amp; MACB_CAPS_NEED_TSUCLK)) {</div><div class='add'>+		clk_prepare_enable(bp-&gt;tsu_clk);</div><div class='ctx'> 	}</div><div class='del'>-	clk_prepare_enable(bp-&gt;tsu_clk);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void macb_shutdown(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+</div><div class='add'>+	if (netif_running(netdev))</div><div class='add'>+		dev_close(netdev);</div><div class='add'>+</div><div class='add'>+	netif_device_detach(netdev);</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct dev_pm_ops macb_pm_ops = {</div><div class='ctx'> 	SET_SYSTEM_SLEEP_PM_OPS(macb_suspend, macb_resume)</div><div class='ctx'> 	SET_RUNTIME_PM_OPS(macb_runtime_suspend, macb_runtime_resume, NULL)</div><div class='hunk'>@@ -4421,6 +5938,7 @@ static struct platform_driver macb_driver = {</div><div class='ctx'> 		.of_match_table	= of_match_ptr(macb_dt_ids),</div><div class='ctx'> 		.pm	= &amp;macb_pm_ops,</div><div class='ctx'> 	},</div><div class='add'>+	.shutdown	= macb_shutdown,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(macb_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c<br/>index 248a8fc45069..fc4f5aee6ab3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb_pci.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb_pci.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb_pci.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cadence/macb_pci.c</a></div><div class='hunk'>@@ -1,22 +1,11 @@</div><div class='del'>-/**</div><div class='del'>- * Cadence GEM PCI wrapper.</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * DOC: Cadence GEM PCI wrapper.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com</div><div class='add'>+ * Copyright (C) 2016 Cadence Design Systems - https://www.cadence.com</div><div class='ctx'>  *</div><div class='ctx'>  * Authors: Rafal Ozieblo &lt;rafalo@cadence.com&gt;</div><div class='ctx'>  *	    Bartosz Folta &lt;bfolta@cadence.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software: you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2  of</div><div class='del'>- * the License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='hunk'>@@ -24,15 +13,13 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/platform_data/macb.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include "macb.h"</div><div class='ctx'> </div><div class='ctx'> #define PCI_DRIVER_NAME "macb_pci"</div><div class='ctx'> #define PLAT_DRIVER_NAME "macb"</div><div class='ctx'> </div><div class='del'>-#define CDNS_VENDOR_ID 0x17cd</div><div class='del'>-#define CDNS_DEVICE_ID 0xe007</div><div class='add'>+#define PCI_DEVICE_ID_CDNS_MACB 0xe007</div><div class='ctx'> </div><div class='ctx'> #define GEM_PCLK_RATE 50000000</div><div class='ctx'> #define GEM_HCLK_RATE 50000000</div><div class='hunk'>@@ -123,13 +110,13 @@ static void macb_remove(struct pci_dev *pdev)</div><div class='ctx'> 	struct platform_device *plat_dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct macb_platform_data *plat_data = dev_get_platdata(&amp;plat_dev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	platform_device_unregister(plat_dev);</div><div class='ctx'> 	clk_unregister(plat_data-&gt;pclk);</div><div class='ctx'> 	clk_unregister(plat_data-&gt;hclk);</div><div class='add'>+	platform_device_unregister(plat_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id dev_id_table[] = {</div><div class='del'>-	{ PCI_DEVICE(CDNS_VENDOR_ID, CDNS_DEVICE_ID), },</div><div class='add'>+	{ PCI_VDEVICE(CDNS, PCI_DEVICE_ID_CDNS_MACB) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c<br/>index a6dc47edc4cf..c9e77819196e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb_ptp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cadence/macb_ptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cadence/macb_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cadence/macb_ptp.c</a></div><div class='hunk'>@@ -1,22 +1,11 @@</div><div class='del'>-/**</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='ctx'>  * 1588 PTP support for Cadence GEM device.</div><div class='ctx'>  *</div><div class='del'>- * Copyright (C) 2017 Cadence Design Systems - http://www.cadence.com</div><div class='add'>+ * Copyright (C) 2017 Cadence Design Systems - https://www.cadence.com</div><div class='ctx'>  *</div><div class='ctx'>  * Authors: Rafal Ozieblo &lt;rafalo@cadence.com&gt;</div><div class='ctx'>  *          Bartosz Folta &lt;bfolta@cadence.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software: you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2  of</div><div class='del'>- * the License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -39,17 +28,20 @@</div><div class='ctx'> static struct macb_dma_desc_ptp *macb_ptp_desc(struct macb *bp,</div><div class='ctx'> 					       struct macb_dma_desc *desc)</div><div class='ctx'> {</div><div class='del'>-	if (bp-&gt;hw_dma_cap == HW_DMA_CAP_PTP)</div><div class='del'>-		return (struct macb_dma_desc_ptp *)</div><div class='del'>-				((u8 *)desc + sizeof(struct macb_dma_desc));</div><div class='del'>-	if (bp-&gt;hw_dma_cap == HW_DMA_CAP_64B_PTP)</div><div class='add'>+	if (!macb_dma_ptp(bp))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (macb_dma64(bp))</div><div class='ctx'> 		return (struct macb_dma_desc_ptp *)</div><div class='ctx'> 				((u8 *)desc + sizeof(struct macb_dma_desc)</div><div class='ctx'> 				+ sizeof(struct macb_dma_desc_64));</div><div class='del'>-	return NULL;</div><div class='add'>+	else</div><div class='add'>+		return (struct macb_dma_desc_ptp *)</div><div class='add'>+				((u8 *)desc + sizeof(struct macb_dma_desc));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gem_tsu_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='add'>+static int gem_tsu_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts,</div><div class='add'>+			    struct ptp_system_timestamp *sts)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = container_of(ptp, struct macb, ptp_clock_info);</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -57,7 +49,9 @@ static int gem_tsu_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='ctx'> 	u32 secl, sech;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;tsu_clk_lock, flags);</div><div class='add'>+	ptp_read_system_prets(sts);</div><div class='ctx'> 	first = gem_readl(bp, TN);</div><div class='add'>+	ptp_read_system_postts(sts);</div><div class='ctx'> 	secl = gem_readl(bp, TSL);</div><div class='ctx'> 	sech = gem_readl(bp, TSH);</div><div class='ctx'> 	second = gem_readl(bp, TN);</div><div class='hunk'>@@ -67,7 +61,9 @@ static int gem_tsu_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='ctx'> 		/* if so, use later read &amp; re-read seconds</div><div class='ctx'> 		 * (assume all done within 1s)</div><div class='ctx'> 		 */</div><div class='add'>+		ptp_read_system_prets(sts);</div><div class='ctx'> 		ts-&gt;tv_nsec = gem_readl(bp, TN);</div><div class='add'>+		ptp_read_system_postts(sts);</div><div class='ctx'> 		secl = gem_readl(bp, TSL);</div><div class='ctx'> 		sech = gem_readl(bp, TSH);</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -115,7 +111,10 @@ static int gem_tsu_incr_set(struct macb *bp, struct tsu_incr *incr_spec)</div><div class='ctx'> 	 * to take effect.</div><div class='ctx'> 	 */</div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;tsu_clk_lock, flags);</div><div class='del'>-	gem_writel(bp, TISUBN, GEM_BF(SUBNSINCR, incr_spec-&gt;sub_ns));</div><div class='add'>+	/* RegBit[15:0] = Subns[23:8]; RegBit[31:24] = Subns[7:0] */</div><div class='add'>+	gem_writel(bp, TISUBN, GEM_BF(SUBNSINCRL, incr_spec-&gt;sub_ns) |</div><div class='add'>+		   GEM_BF(SUBNSINCRH, (incr_spec-&gt;sub_ns &gt;&gt;</div><div class='add'>+			  GEM_SUBNSINCRL_SIZE)));</div><div class='ctx'> 	gem_writel(bp, TI, GEM_BF(NSINCR, incr_spec-&gt;ns));</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;bp-&gt;tsu_clk_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -146,7 +145,7 @@ static int gem_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='ctx'> 	 * (temp / USEC_PER_SEC) + 0.5</div><div class='ctx'> 	 */</div><div class='ctx'> 	adj += (USEC_PER_SEC &gt;&gt; 1);</div><div class='del'>-	adj &gt;&gt;= GEM_SUBNSINCR_SIZE; /* remove fractions */</div><div class='add'>+	adj &gt;&gt;= PPM_FRACTION; /* remove fractions */</div><div class='ctx'> 	adj = div_u64(adj, USEC_PER_SEC);</div><div class='ctx'> 	adj = neg_adj ? (word - adj) : (word + adj);</div><div class='ctx'> </div><div class='hunk'>@@ -169,7 +168,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (delta &gt; TSU_NSEC_MAX_VAL) {</div><div class='del'>-		gem_tsu_get_time(&amp;bp-&gt;ptp_clock_info, &amp;now);</div><div class='add'>+		gem_tsu_get_time(&amp;bp-&gt;ptp_clock_info, &amp;now, NULL);</div><div class='ctx'> 		now = timespec64_add(now, then);</div><div class='ctx'> </div><div class='ctx'> 		gem_tsu_set_time(&amp;bp-&gt;ptp_clock_info,</div><div class='hunk'>@@ -200,7 +199,7 @@ static const struct ptp_clock_info gem_ptp_caps_template = {</div><div class='ctx'> 	.pps		= 1,</div><div class='ctx'> 	.adjfine	= gem_ptp_adjfine,</div><div class='ctx'> 	.adjtime	= gem_ptp_adjtime,</div><div class='del'>-	.gettime64	= gem_tsu_get_time,</div><div class='add'>+	.gettimex64	= gem_tsu_get_time,</div><div class='ctx'> 	.settime64	= gem_tsu_set_time,</div><div class='ctx'> 	.enable		= gem_ptp_enable,</div><div class='ctx'> };</div><div class='hunk'>@@ -259,7 +258,9 @@ static int gem_hw_timestamp(struct macb *bp, u32 dma_desc_ts_1,</div><div class='ctx'> 	 * The timestamp only contains lower few bits of seconds,</div><div class='ctx'> 	 * so add value from 1588 timer</div><div class='ctx'> 	 */</div><div class='del'>-	gem_tsu_get_time(&amp;bp-&gt;ptp_clock_info, &amp;tsu);</div><div class='add'>+	gem_tsu_get_time(&amp;bp-&gt;ptp_clock_info, &amp;tsu, NULL);</div><div class='add'>+</div><div class='add'>+	ts-&gt;tv_sec |= ((~GEM_DMA_SEC_MASK) &amp; tsu.tv_sec);</div><div class='ctx'> </div><div class='ctx'> 	/* If the top bit is set in the timestamp,</div><div class='ctx'> 	 * but not in 1588 timer, it has rolled over,</div><div class='hunk'>@@ -269,8 +270,6 @@ static int gem_hw_timestamp(struct macb *bp, u32 dma_desc_ts_1,</div><div class='ctx'> 	    !(tsu.tv_sec &amp; (GEM_DMA_SEC_TOP &gt;&gt; 1)))</div><div class='ctx'> 		ts-&gt;tv_sec -= GEM_DMA_SEC_TOP;</div><div class='ctx'> </div><div class='del'>-	ts-&gt;tv_sec += ((~GEM_DMA_SEC_MASK) &amp; tsu.tv_sec);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -283,82 +282,51 @@ void gem_ptp_rxstamp(struct macb *bp, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	if (GEM_BFEXT(DMA_RXVALID, desc-&gt;addr)) {</div><div class='ctx'> 		desc_ptp = macb_ptp_desc(bp, desc);</div><div class='add'>+		/* Unlikely but check */</div><div class='add'>+		if (!desc_ptp) {</div><div class='add'>+			dev_warn_ratelimited(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+					     "Timestamp not supported in BD\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='ctx'> 		gem_hw_timestamp(bp, desc_ptp-&gt;ts_1, desc_ptp-&gt;ts_2, &amp;ts);</div><div class='ctx'> 		memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));</div><div class='ctx'> 		shhwtstamps-&gt;hwtstamp = ktime_set(ts.tv_sec, ts.tv_nsec);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gem_tstamp_tx(struct macb *bp, struct sk_buff *skb,</div><div class='del'>-			  struct macb_dma_desc_ptp *desc_ptp)</div><div class='add'>+void gem_ptp_txstamp(struct macb *bp, struct sk_buff *skb,</div><div class='add'>+		     struct macb_dma_desc *desc)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_shared_hwtstamps shhwtstamps;</div><div class='del'>-	struct timespec64 ts;</div><div class='del'>-</div><div class='del'>-	gem_hw_timestamp(bp, desc_ptp-&gt;ts_1, desc_ptp-&gt;ts_2, &amp;ts);</div><div class='del'>-	memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='del'>-	shhwtstamps.hwtstamp = ktime_set(ts.tv_sec, ts.tv_nsec);</div><div class='del'>-	skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int gem_ptp_txstamp(struct macb_queue *queue, struct sk_buff *skb,</div><div class='del'>-		    struct macb_dma_desc *desc)</div><div class='del'>-{</div><div class='del'>-	unsigned long tail = READ_ONCE(queue-&gt;tx_ts_tail);</div><div class='del'>-	unsigned long head = queue-&gt;tx_ts_head;</div><div class='ctx'> 	struct macb_dma_desc_ptp *desc_ptp;</div><div class='del'>-	struct gem_tx_ts *tx_timestamp;</div><div class='add'>+	struct timespec64 ts;</div><div class='ctx'> </div><div class='del'>-	if (!GEM_BFEXT(DMA_TXVALID, desc-&gt;ctrl))</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!GEM_BFEXT(DMA_TXVALID, desc-&gt;ctrl)) {</div><div class='add'>+		dev_warn_ratelimited(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+				     "Timestamp not set in TX BD as expected\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (CIRC_SPACE(head, tail, PTP_TS_BUFFER_SIZE) == 0)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	desc_ptp = macb_ptp_desc(bp, desc);</div><div class='add'>+	/* Unlikely but check */</div><div class='add'>+	if (!desc_ptp) {</div><div class='add'>+		dev_warn_ratelimited(&amp;bp-&gt;pdev-&gt;dev,</div><div class='add'>+				     "Timestamp not supported in BD\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='del'>-	desc_ptp = macb_ptp_desc(queue-&gt;bp, desc);</div><div class='del'>-	tx_timestamp = &amp;queue-&gt;tx_timestamps[head];</div><div class='del'>-	tx_timestamp-&gt;skb = skb;</div><div class='ctx'> 	/* ensure ts_1/ts_2 is loaded after ctrl (TX_USED check) */</div><div class='ctx'> 	dma_rmb();</div><div class='del'>-	tx_timestamp-&gt;desc_ptp.ts_1 = desc_ptp-&gt;ts_1;</div><div class='del'>-	tx_timestamp-&gt;desc_ptp.ts_2 = desc_ptp-&gt;ts_2;</div><div class='del'>-	/* move head */</div><div class='del'>-	smp_store_release(&amp;queue-&gt;tx_ts_head,</div><div class='del'>-			  (head + 1) &amp; (PTP_TS_BUFFER_SIZE - 1));</div><div class='del'>-</div><div class='del'>-	schedule_work(&amp;queue-&gt;tx_ts_task);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+	gem_hw_timestamp(bp, desc_ptp-&gt;ts_1, desc_ptp-&gt;ts_2, &amp;ts);</div><div class='ctx'> </div><div class='del'>-static void gem_tx_timestamp_flush(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct macb_queue *queue =</div><div class='del'>-			container_of(work, struct macb_queue, tx_ts_task);</div><div class='del'>-	unsigned long head, tail;</div><div class='del'>-	struct gem_tx_ts *tx_ts;</div><div class='del'>-</div><div class='del'>-	/* take current head */</div><div class='del'>-	head = smp_load_acquire(&amp;queue-&gt;tx_ts_head);</div><div class='del'>-	tail = queue-&gt;tx_ts_tail;</div><div class='del'>-</div><div class='del'>-	while (CIRC_CNT(head, tail, PTP_TS_BUFFER_SIZE)) {</div><div class='del'>-		tx_ts = &amp;queue-&gt;tx_timestamps[tail];</div><div class='del'>-		gem_tstamp_tx(queue-&gt;bp, tx_ts-&gt;skb, &amp;tx_ts-&gt;desc_ptp);</div><div class='del'>-		/* cleanup */</div><div class='del'>-		dev_kfree_skb_any(tx_ts-&gt;skb);</div><div class='del'>-		/* remove old tail */</div><div class='del'>-		smp_store_release(&amp;queue-&gt;tx_ts_tail,</div><div class='del'>-				  (tail + 1) &amp; (PTP_TS_BUFFER_SIZE - 1));</div><div class='del'>-		tail = queue-&gt;tx_ts_tail;</div><div class='del'>-	}</div><div class='add'>+	memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='add'>+	shhwtstamps.hwtstamp = ktime_set(ts.tv_sec, ts.tv_nsec);</div><div class='add'>+	skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void gem_ptp_init(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='del'>-	struct macb_queue *queue;</div><div class='del'>-	unsigned int q;</div><div class='ctx'> </div><div class='ctx'> 	bp-&gt;ptp_clock_info = gem_ptp_caps_template;</div><div class='ctx'> </div><div class='hunk'>@@ -378,11 +346,6 @@ void gem_ptp_init(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;tsu_clk_lock);</div><div class='del'>-	for (q = 0, queue = bp-&gt;queues; q &lt; bp-&gt;num_queues; ++q, ++queue) {</div><div class='del'>-		queue-&gt;tx_ts_head = 0;</div><div class='del'>-		queue-&gt;tx_ts_tail = 0;</div><div class='del'>-		INIT_WORK(&amp;queue-&gt;tx_ts_task, gem_tx_timestamp_flush);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	gem_ptp_init_tsu(bp);</div><div class='ctx'> </div><div class='hunk'>@@ -413,22 +376,19 @@ static int gem_ptp_set_ts_mode(struct macb *bp,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int gem_get_hwtst(struct net_device *dev, struct ifreq *rq)</div><div class='add'>+int gem_get_hwtst(struct net_device *dev,</div><div class='add'>+		  struct kernel_hwtstamp_config *tstamp_config)</div><div class='ctx'> {</div><div class='del'>-	struct hwtstamp_config *tstamp_config;</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	tstamp_config = &amp;bp-&gt;tstamp_config;</div><div class='del'>-	if ((bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_PTP) == 0)</div><div class='add'>+	*tstamp_config = bp-&gt;tstamp_config;</div><div class='add'>+	if (!macb_dma_ptp(bp))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(rq-&gt;ifr_data, tstamp_config, sizeof(*tstamp_config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gem_ptp_set_one_step_sync(struct macb *bp, u8 enable)</div><div class='add'>+static void gem_ptp_set_one_step_sync(struct macb *bp, u8 enable)</div><div class='ctx'> {</div><div class='ctx'> 	u32 reg_val;</div><div class='ctx'> </div><div class='hunk'>@@ -438,38 +398,29 @@ static int gem_ptp_set_one_step_sync(struct macb *bp, u8 enable)</div><div class='ctx'> 		macb_writel(bp, NCR, reg_val | MACB_BIT(OSSMODE));</div><div class='ctx'> 	else</div><div class='ctx'> 		macb_writel(bp, NCR, reg_val &amp; ~MACB_BIT(OSSMODE));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int gem_set_hwtst(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='add'>+int gem_set_hwtst(struct net_device *dev,</div><div class='add'>+		  struct kernel_hwtstamp_config *tstamp_config,</div><div class='add'>+		  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	enum macb_bd_control tx_bd_control = TSTAMP_DISABLED;</div><div class='ctx'> 	enum macb_bd_control rx_bd_control = TSTAMP_DISABLED;</div><div class='del'>-	struct hwtstamp_config *tstamp_config;</div><div class='ctx'> 	struct macb *bp = netdev_priv(dev);</div><div class='ctx'> 	u32 regval;</div><div class='ctx'> </div><div class='del'>-	tstamp_config = &amp;bp-&gt;tstamp_config;</div><div class='del'>-	if ((bp-&gt;hw_dma_cap &amp; HW_DMA_CAP_PTP) == 0)</div><div class='add'>+	if (!macb_dma_ptp(bp))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(tstamp_config, ifr-&gt;ifr_data,</div><div class='del'>-			   sizeof(*tstamp_config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* reserved for future extensions */</div><div class='del'>-	if (tstamp_config-&gt;flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	switch (tstamp_config-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_TX_ONESTEP_SYNC:</div><div class='del'>-		if (gem_ptp_set_one_step_sync(bp, 1) != 0)</div><div class='del'>-			return -ERANGE;</div><div class='del'>-		/* fall through */</div><div class='add'>+		gem_ptp_set_one_step_sync(bp, 1);</div><div class='add'>+		tx_bd_control = TSTAMP_ALL_FRAMES;</div><div class='add'>+		break;</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='add'>+		gem_ptp_set_one_step_sync(bp, 0);</div><div class='ctx'> 		tx_bd_control = TSTAMP_ALL_FRAMES;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -507,12 +458,11 @@ int gem_set_hwtst(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	bp-&gt;tstamp_config = *tstamp_config;</div><div class='add'>+</div><div class='ctx'> 	if (gem_ptp_set_ts_mode(bp, tx_bd_control, rx_bd_control) != 0)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(ifr-&gt;ifr_data, tstamp_config, sizeof(*tstamp_config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c<br/>index 11d4e91ea754..331ac6a3dc38 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/calxeda/xgmac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/calxeda/xgmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/calxeda/xgmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/calxeda/xgmac.c</a></div><div class='hunk'>@@ -607,7 +607,7 @@ static inline void xgmac_mac_disable(void __iomem *ioaddr)</div><div class='ctx'> 	writel(value, ioaddr + XGMAC_CONTROL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xgmac_set_mac_addr(void __iomem *ioaddr, unsigned char *addr,</div><div class='add'>+static void xgmac_set_mac_addr(void __iomem *ioaddr, const unsigned char *addr,</div><div class='ctx'> 			       int num)</div><div class='ctx'> {</div><div class='ctx'> 	u32 data;</div><div class='hunk'>@@ -711,7 +711,7 @@ static void xgmac_rx_refill(struct xgmac_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * init_xgmac_dma_desc_rings - init the RX/TX descriptor rings</div><div class='add'>+ * xgmac_dma_desc_rings_init - init the RX/TX descriptor rings</div><div class='ctx'>  * @dev: net device structure</div><div class='ctx'>  * Description:  this function initializes the DMA RX/TX descriptors</div><div class='ctx'>  * and allocates the socket buffers.</div><div class='hunk'>@@ -859,7 +859,7 @@ static void xgmac_free_dma_desc_rings(struct xgmac_priv *priv)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * xgmac_tx:</div><div class='add'>+ * xgmac_tx_complete:</div><div class='ctx'>  * @priv: private driver structure</div><div class='ctx'>  * Description: it reclaims resources after transmission completes.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1040,7 +1040,7 @@ static int xgmac_open(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *  xgmac_release - close entry point of the driver</div><div class='add'>+ *  xgmac_stop - close entry point of the driver</div><div class='ctx'>  *  @dev : device pointer.</div><div class='ctx'>  *  Description:</div><div class='ctx'>  *  This is the stop entry point of the driver.</div><div class='hunk'>@@ -1104,7 +1104,7 @@ static netdev_tx_t xgmac_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; nfrags; i++) {</div><div class='ctx'> 		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='del'>-		len = frag-&gt;size;</div><div class='add'>+		len = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		paddr = skb_frag_dma_map(priv-&gt;device, frag, 0, len,</div><div class='ctx'> 					 DMA_TO_DEVICE);</div><div class='hunk'>@@ -1224,7 +1224,7 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit)</div><div class='ctx'>  *  @budget : maximum number of packets that the current CPU can receive from</div><div class='ctx'>  *	      all interfaces.</div><div class='ctx'>  *  Description :</div><div class='del'>- *   This function implements the the reception process.</div><div class='add'>+ *   This function implements the reception process.</div><div class='ctx'>  *   Also it runs the TX completion thread</div><div class='ctx'>  */</div><div class='ctx'> static int xgmac_poll(struct napi_struct *napi, int budget)</div><div class='hunk'>@@ -1246,12 +1246,14 @@ static int xgmac_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> /**</div><div class='ctx'>  *  xgmac_tx_timeout</div><div class='ctx'>  *  @dev : Pointer to net device structure</div><div class='add'>+ *  @txqueue: index of the hung transmit queue</div><div class='add'>+ *</div><div class='ctx'>  *  Description: this function is called when a packet transmission fails to</div><div class='ctx'>  *   complete within a reasonable tmrate. The driver will mark the error in the</div><div class='ctx'>  *   netdev structure and arrange for the device to be reset to a sane state</div><div class='ctx'>  *   in order to transmit a new packet.</div><div class='ctx'>  */</div><div class='del'>-static void xgmac_tx_timeout(struct net_device *dev)</div><div class='add'>+static void xgmac_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct xgmac_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	schedule_work(&amp;priv-&gt;tx_timeout_work);</div><div class='hunk'>@@ -1356,7 +1358,7 @@ static int xgmac_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	/* Bring interface down, change mtu and bring interface back up */</div><div class='ctx'> 	xgmac_stop(dev);</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return xgmac_open(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1477,7 +1479,7 @@ static int xgmac_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	xgmac_set_mac_addr(ioaddr, dev-&gt;dev_addr, 0);</div><div class='ctx'> </div><div class='hunk'>@@ -1691,6 +1693,7 @@ static int xgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	struct net_device *ndev = NULL;</div><div class='ctx'> 	struct xgmac_priv *priv = NULL;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	u32 uid;</div><div class='ctx'> </div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='hunk'>@@ -1783,12 +1786,13 @@ static int xgmac_probe(struct platform_device *pdev)</div><div class='ctx'> 	ndev-&gt;max_mtu = XGMAC_MAX_MTU;</div><div class='ctx'> </div><div class='ctx'> 	/* Get the MAC address */</div><div class='del'>-	xgmac_get_mac_addr(priv-&gt;base, ndev-&gt;dev_addr, 0);</div><div class='add'>+	xgmac_get_mac_addr(priv-&gt;base, addr, 0);</div><div class='add'>+	eth_hw_addr_set(ndev, addr);</div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr))</div><div class='ctx'> 		netdev_warn(ndev, "MAC address %pM not valid",</div><div class='ctx'> 			 ndev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, xgmac_poll, 64);</div><div class='add'>+	netif_napi_add(ndev, &amp;priv-&gt;napi, xgmac_poll);</div><div class='ctx'> 	ret = register_netdev(ndev);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err_reg;</div><div class='hunk'>@@ -1810,13 +1814,13 @@ err_alloc:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * xgmac_dvr_remove</div><div class='add'>+ * xgmac_remove</div><div class='ctx'>  * @pdev: platform device pointer</div><div class='ctx'>  * Description: this function resets the TX/RX processes, disables the MAC RX/TX</div><div class='ctx'>  * changes the link status, releases the DMA descriptor rings,</div><div class='ctx'>  * unregisters the MDIO bus and unmaps the allocated memory.</div><div class='ctx'>  */</div><div class='del'>-static int xgmac_remove(struct platform_device *pdev)</div><div class='add'>+static void xgmac_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct xgmac_priv *priv = netdev_priv(ndev);</div><div class='hunk'>@@ -1836,8 +1840,6 @@ static int xgmac_remove(struct platform_device *pdev)</div><div class='ctx'> 	release_mem_region(res-&gt;start, resource_size(res));</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(ndev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM_SLEEP</div><div class='hunk'>@@ -1855,7 +1857,7 @@ static void xgmac_pmt(void __iomem *ioaddr, unsigned long mode)</div><div class='ctx'> </div><div class='ctx'> static int xgmac_suspend(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct xgmac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	u32 value;</div><div class='ctx'> </div><div class='hunk'>@@ -1881,7 +1883,7 @@ static int xgmac_suspend(struct device *dev)</div><div class='ctx'> </div><div class='ctx'> static int xgmac_resume(struct device *dev)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *ndev = platform_get_drvdata(to_platform_device(dev));</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='ctx'> 	struct xgmac_priv *priv = netdev_priv(ndev);</div><div class='ctx'> 	void __iomem *ioaddr = priv-&gt;base;</div><div class='ctx'> </div><div class='hunk'>@@ -1914,10 +1916,10 @@ static struct platform_driver xgmac_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "calxedaxgmac",</div><div class='ctx'> 		.of_match_table = xgmac_of_match,</div><div class='add'>+		.pm = &amp;xgmac_pm_ops,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = xgmac_probe,</div><div class='ctx'> 	.remove = xgmac_remove,</div><div class='del'>-	.driver.pm = &amp;xgmac_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(xgmac_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/Kconfig b/drivers/net/ethernet/cavium/Kconfig<br/>index 6a700d34019e..7dae5aad3689 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config NET_VENDOR_CAVIUM</div><div class='ctx'> 	bool "Cavium ethernet drivers"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Select this option if you want enable Cavium network support.</div><div class='ctx'> </div><div class='ctx'> 	  If you have a Cavium SoC or network adapter, say Y.</div><div class='hunk'>@@ -17,7 +17,7 @@ config THUNDER_NIC_PF</div><div class='ctx'> 	tristate "Thunder Physical function driver"</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI</div><div class='ctx'> 	select THUNDER_NIC_BGX</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Thunder's NIC physical function.</div><div class='ctx'> 	  The NIC provides the controller and DMA engines to</div><div class='ctx'> 	  move network traffic to/from the memory. The NIC</div><div class='hunk'>@@ -29,7 +29,7 @@ config THUNDER_NIC_VF</div><div class='ctx'> 	tristate "Thunder Virtual function driver"</div><div class='ctx'> 	imply CAVIUM_PTP</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Thunder's NIC virtual function</div><div class='ctx'> </div><div class='ctx'> config	THUNDER_NIC_BGX</div><div class='hunk'>@@ -38,7 +38,7 @@ config	THUNDER_NIC_BGX</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select MDIO_THUNDER if PCI</div><div class='ctx'> 	select THUNDER_NIC_RGX</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports programming and controlling of MAC</div><div class='ctx'> 	  interface from NIC physical function driver.</div><div class='ctx'> </div><div class='hunk'>@@ -47,30 +47,34 @@ config	THUNDER_NIC_RGX</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select MDIO_THUNDER if PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports configuring XCV block of RGX interface</div><div class='ctx'> 	  present on CN81XX chip.</div><div class='ctx'> </div><div class='ctx'> config CAVIUM_PTP</div><div class='ctx'> 	tristate "Cavium PTP coprocessor as PTP clock"</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='del'>-	---help---</div><div class='add'>+	depends on PTP_1588_CLOCK</div><div class='add'>+	help</div><div class='ctx'> 	  This driver adds support for the Precision Time Protocol Clocks and</div><div class='ctx'> 	  Timestamping coprocessor (PTP) found on Cavium processors.</div><div class='ctx'> 	  PTP provides timestamping mechanism that is suitable for use in IEEE 1588</div><div class='ctx'> 	  Precision Time Protocol or other purposes.  Timestamps can be used in</div><div class='ctx'> 	  BGX, TNS, GTI, and NIC blocks.</div><div class='ctx'> </div><div class='add'>+config LIQUIDIO_CORE</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='ctx'> config LIQUIDIO</div><div class='ctx'> 	tristate "Cavium LiquidIO support"</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select FW_LOADER</div><div class='del'>-	select LIBCRC32C</div><div class='add'>+	select LIQUIDIO_CORE</div><div class='ctx'> 	select NET_DEVLINK</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Cavium LiquidIO Intelligent Server Adapters</div><div class='ctx'> 	  based on CN66XX, CN68XX and CN23XX chips.</div><div class='ctx'> </div><div class='hunk'>@@ -91,8 +95,9 @@ config OCTEON_MGMT_ETHERNET</div><div class='ctx'> config LIQUIDIO_VF</div><div class='ctx'> 	tristate "Cavium LiquidIO VF support"</div><div class='ctx'> 	depends on 64BIT &amp;&amp; PCI_MSI</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='del'>-	---help---</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select LIQUIDIO_CORE</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Cavium LiquidIO Intelligent Server Adapter</div><div class='ctx'> 	  based on CN23XX chips.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.c b/drivers/net/ethernet/cavium/common/cavium_ptp.c<br/>index 73632b843749..61e261657073 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/common/cavium_ptp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/common/cavium_ptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/common/cavium_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/common/cavium_ptp.c</a></div><div class='hunk'>@@ -10,9 +10,12 @@</div><div class='ctx'> </div><div class='ctx'> #include "cavium_ptp.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_NAME	"Cavium PTP Driver"</div><div class='add'>+#define DRV_NAME "cavium_ptp"</div><div class='ctx'> </div><div class='ctx'> #define PCI_DEVICE_ID_CAVIUM_PTP	0xA00C</div><div class='add'>+#define PCI_SUBSYS_DEVID_88XX_PTP	0xA10C</div><div class='add'>+#define PCI_SUBSYS_DEVID_81XX_PTP	0XA20C</div><div class='add'>+#define PCI_SUBSYS_DEVID_83XX_PTP	0xA30C</div><div class='ctx'> #define PCI_DEVICE_ID_CAVIUM_RST	0xA00E</div><div class='ctx'> </div><div class='ctx'> #define PCI_PTP_BAR_NO	0</div><div class='hunk'>@@ -83,7 +86,7 @@ EXPORT_SYMBOL(cavium_ptp_put);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cavium_ptp_adjfine() - Adjust ptp frequency</div><div class='del'>- * @ptp: PTP clock info</div><div class='add'>+ * @ptp_info: PTP clock info</div><div class='ctx'>  * @scaled_ppm: how much to adjust by, in parts per million, but with a</div><div class='ctx'>  *              16 bit binary fractional field</div><div class='ctx'>  */</div><div class='hunk'>@@ -131,7 +134,7 @@ static int cavium_ptp_adjfine(struct ptp_clock_info *ptp_info, long scaled_ppm)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cavium_ptp_adjtime() - Adjust ptp time</div><div class='del'>- * @ptp:   PTP clock info</div><div class='add'>+ * @ptp_info:   PTP clock info</div><div class='ctx'>  * @delta: how much to adjust by, in nanosecs</div><div class='ctx'>  */</div><div class='ctx'> static int cavium_ptp_adjtime(struct ptp_clock_info *ptp_info, s64 delta)</div><div class='hunk'>@@ -152,7 +155,7 @@ static int cavium_ptp_adjtime(struct ptp_clock_info *ptp_info, s64 delta)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cavium_ptp_gettime() - Get hardware clock time with adjustment</div><div class='del'>- * @ptp: PTP clock info</div><div class='add'>+ * @ptp_info: PTP clock info</div><div class='ctx'>  * @ts:  timespec</div><div class='ctx'>  */</div><div class='ctx'> static int cavium_ptp_gettime(struct ptp_clock_info *ptp_info,</div><div class='hunk'>@@ -174,7 +177,7 @@ static int cavium_ptp_gettime(struct ptp_clock_info *ptp_info,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cavium_ptp_settime() - Set hardware clock time. Reset adjustment</div><div class='del'>- * @ptp: PTP clock info</div><div class='add'>+ * @ptp_info: PTP clock info</div><div class='ctx'>  * @ts:  timespec</div><div class='ctx'>  */</div><div class='ctx'> static int cavium_ptp_settime(struct ptp_clock_info *ptp_info,</div><div class='hunk'>@@ -196,7 +199,7 @@ static int cavium_ptp_settime(struct ptp_clock_info *ptp_info,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cavium_ptp_enable() - Request to enable or disable an ancillary feature.</div><div class='del'>- * @ptp: PTP clock info</div><div class='add'>+ * @ptp_info: PTP clock info</div><div class='ctx'>  * @rq:  request</div><div class='ctx'>  * @on:  is it on</div><div class='ctx'>  */</div><div class='hunk'>@@ -206,7 +209,7 @@ static int cavium_ptp_enable(struct ptp_clock_info *ptp_info,</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 cavium_ptp_cc_read(const struct cyclecounter *cc)</div><div class='add'>+static u64 cavium_ptp_cc_read(struct cyclecounter *cc)</div><div class='ctx'> {</div><div class='ctx'> 	struct cavium_ptp *clock =</div><div class='ctx'> 		container_of(cc, struct cavium_ptp, cycle_counter);</div><div class='hunk'>@@ -236,12 +239,11 @@ static int cavium_ptp_probe(struct pci_dev *pdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error_free;</div><div class='ctx'> </div><div class='del'>-	err = pcim_iomap_regions(pdev, 1 &lt;&lt; PCI_PTP_BAR_NO, pci_name(pdev));</div><div class='add'>+	clock-&gt;reg_base = pcim_iomap_region(pdev, PCI_PTP_BAR_NO, pci_name(pdev));</div><div class='add'>+	err = PTR_ERR_OR_ZERO(clock-&gt;reg_base);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error_free;</div><div class='ctx'> </div><div class='del'>-	clock-&gt;reg_base = pcim_iomap_table(pdev)[PCI_PTP_BAR_NO];</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;clock-&gt;spin_lock);</div><div class='ctx'> </div><div class='ctx'> 	cc = &amp;clock-&gt;cycle_counter;</div><div class='hunk'>@@ -289,7 +291,7 @@ error_stop:</div><div class='ctx'> 	clock_cfg = readq(clock-&gt;reg_base + PTP_CLOCK_CFG);</div><div class='ctx'> 	clock_cfg &amp;= ~PTP_CLOCK_CFG_PTP_EN;</div><div class='ctx'> 	writeq(clock_cfg, clock-&gt;reg_base + PTP_CLOCK_CFG);</div><div class='del'>-	pcim_iounmap_regions(pdev, 1 &lt;&lt; PCI_PTP_BAR_NO);</div><div class='add'>+	pcim_iounmap_region(pdev, PCI_PTP_BAR_NO);</div><div class='ctx'> </div><div class='ctx'> error_free:</div><div class='ctx'> 	devm_kfree(dev, clock);</div><div class='hunk'>@@ -321,7 +323,12 @@ static void cavium_ptp_remove(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct pci_device_id cavium_ptp_id_table[] = {</div><div class='del'>-	{ PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVICE_ID_CAVIUM_PTP) },</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVICE_ID_CAVIUM_PTP,</div><div class='add'>+			PCI_VENDOR_ID_CAVIUM, PCI_SUBSYS_DEVID_88XX_PTP) },</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVICE_ID_CAVIUM_PTP,</div><div class='add'>+			PCI_VENDOR_ID_CAVIUM, PCI_SUBSYS_DEVID_81XX_PTP) },</div><div class='add'>+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_CAVIUM, PCI_DEVICE_ID_CAVIUM_PTP,</div><div class='add'>+			PCI_VENDOR_ID_CAVIUM, PCI_SUBSYS_DEVID_83XX_PTP) },</div><div class='ctx'> 	{ 0, }</div><div class='ctx'> };</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cavium/common/cavium_ptp.h b/drivers/net/ethernet/cavium/common/cavium_ptp.h<br/>index be2bafc7beeb..1e0ffe8f4152 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/common/cavium_ptp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/common/cavium_ptp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/common/cavium_ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/common/cavium_ptp.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* cavium_ptp.h - PTP 1588 clock on Cavium hardware</div><div class='ctx'>  * Copyright (c) 2003-2015, 2017 Cavium, Inc.</div><div class='ctx'>  */</div><div class='hunk'>@@ -24,7 +24,7 @@ struct cavium_ptp {</div><div class='ctx'> 	struct ptp_clock *ptp_clock;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#if IS_ENABLED(CONFIG_CAVIUM_PTP)</div><div class='add'>+#if IS_REACHABLE(CONFIG_CAVIUM_PTP)</div><div class='ctx'> </div><div class='ctx'> struct cavium_ptp *cavium_ptp_get(void);</div><div class='ctx'> void cavium_ptp_put(struct cavium_ptp *ptp);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/Makefile b/drivers/net/ethernet/cavium/liquidio/Makefile<br/>index bc9937502043..4ee80af88e79 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/Makefile</a></div><div class='hunk'>@@ -3,7 +3,9 @@</div><div class='ctx'> # Cavium Liquidio ethernet device driver</div><div class='ctx'> #</div><div class='ctx'> </div><div class='del'>-common-objs :=	lio_ethtool.o		\</div><div class='add'>+obj-$(CONFIG_LIQUIDIO_CORE) += liquidio-core.o</div><div class='add'>+liquidio-core-y := \</div><div class='add'>+		lio_ethtool.o		\</div><div class='ctx'> 		lio_core.o		\</div><div class='ctx'> 		request_manager.o	\</div><div class='ctx'> 		response_manager.o	\</div><div class='hunk'>@@ -18,7 +20,7 @@ common-objs :=	lio_ethtool.o		\</div><div class='ctx'> 		octeon_nic.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LIQUIDIO) += liquidio.o</div><div class='del'>-liquidio-y := lio_main.o octeon_console.o lio_vf_rep.o $(common-objs)</div><div class='add'>+liquidio-y := lio_main.o octeon_console.o lio_vf_rep.o</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_LIQUIDIO_VF) += liquidio_vf.o</div><div class='del'>-liquidio_vf-y := lio_vf_main.o $(common-objs)</div><div class='add'>+liquidio_vf-y := lio_vf_main.o</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c<br/>index 43d11c38b38a..75f22f74774c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c</a></div><div class='hunk'>@@ -36,175 +36,6 @@</div><div class='ctx'>  */</div><div class='ctx'> #define CN23XX_INPUT_JABBER 64600</div><div class='ctx'> </div><div class='del'>-void cn23xx_dump_pf_initialized_regs(struct octeon_device *oct)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-	u32 regval = 0;</div><div class='del'>-	struct octeon_cn23xx_pf *cn23xx = (struct octeon_cn23xx_pf *)oct-&gt;chip;</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_soft_reset*/</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%llx\n",</div><div class='del'>-		"CN23XX_WIN_WR_MASK_REG", CVM_CAST64(CN23XX_WIN_WR_MASK_REG),</div><div class='del'>-		CVM_CAST64(octeon_read_csr64(oct, CN23XX_WIN_WR_MASK_REG)));</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_SLI_SCRATCH1", CVM_CAST64(CN23XX_SLI_SCRATCH1),</div><div class='del'>-		CVM_CAST64(octeon_read_csr64(oct, CN23XX_SLI_SCRATCH1)));</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_RST_SOFT_RST", CN23XX_RST_SOFT_RST,</div><div class='del'>-		lio_pci_readq(oct, CN23XX_RST_SOFT_RST));</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_set_dpi_regs*/</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_DPI_DMA_CONTROL", CN23XX_DPI_DMA_CONTROL,</div><div class='del'>-		lio_pci_readq(oct, CN23XX_DPI_DMA_CONTROL));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 6; i++) {</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_DPI_DMA_ENG_ENB", i,</div><div class='del'>-			CN23XX_DPI_DMA_ENG_ENB(i),</div><div class='del'>-			lio_pci_readq(oct, CN23XX_DPI_DMA_ENG_ENB(i)));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_DPI_DMA_ENG_BUF", i,</div><div class='del'>-			CN23XX_DPI_DMA_ENG_BUF(i),</div><div class='del'>-			lio_pci_readq(oct, CN23XX_DPI_DMA_ENG_BUF(i)));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n", "CN23XX_DPI_CTL",</div><div class='del'>-		CN23XX_DPI_CTL, lio_pci_readq(oct, CN23XX_DPI_CTL));</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_setup_pcie_mps and cn23xx_setup_pcie_mrrs */</div><div class='del'>-	pci_read_config_dword(oct-&gt;pci_dev, CN23XX_CONFIG_PCIE_DEVCTL, &amp;regval);</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_CONFIG_PCIE_DEVCTL",</div><div class='del'>-		CVM_CAST64(CN23XX_CONFIG_PCIE_DEVCTL), CVM_CAST64(regval));</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_DPI_SLI_PRTX_CFG", oct-&gt;pcie_port,</div><div class='del'>-		CN23XX_DPI_SLI_PRTX_CFG(oct-&gt;pcie_port),</div><div class='del'>-		lio_pci_readq(oct, CN23XX_DPI_SLI_PRTX_CFG(oct-&gt;pcie_port)));</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_specific_regs_setup */</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_SLI_S2M_PORTX_CTL", oct-&gt;pcie_port,</div><div class='del'>-		CVM_CAST64(CN23XX_SLI_S2M_PORTX_CTL(oct-&gt;pcie_port)),</div><div class='del'>-		CVM_CAST64(octeon_read_csr64(</div><div class='del'>-			oct, CN23XX_SLI_S2M_PORTX_CTL(oct-&gt;pcie_port))));</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_SLI_RING_RST", CVM_CAST64(CN23XX_SLI_PKT_IOQ_RING_RST),</div><div class='del'>-		(u64)octeon_read_csr64(oct, CN23XX_SLI_PKT_IOQ_RING_RST));</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_setup_global_mac_regs*/</div><div class='del'>-	for (i = 0; i &lt; CN23XX_MAX_MACS; i++) {</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_PKT_MAC_RINFO64", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_PKT_MAC_RINFO64(i, oct-&gt;pf_num)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64</div><div class='del'>-				(oct, CN23XX_SLI_PKT_MAC_RINFO64</div><div class='del'>-					(i, oct-&gt;pf_num))));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_setup_global_input_regs*/</div><div class='del'>-	for (i = 0; i &lt; CN23XX_MAX_INPUT_QUEUES; i++) {</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_IQ_PKT_CONTROL64", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_IQ_PKT_CONTROL64(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64</div><div class='del'>-				(oct, CN23XX_SLI_IQ_PKT_CONTROL64(i))));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_setup_global_output_regs*/</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_SLI_OQ_WMARK", CVM_CAST64(CN23XX_SLI_OQ_WMARK),</div><div class='del'>-		CVM_CAST64(octeon_read_csr64(oct, CN23XX_SLI_OQ_WMARK)));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CN23XX_MAX_OUTPUT_QUEUES; i++) {</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_PKT_CONTROL", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_PKT_CONTROL(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr(</div><div class='del'>-				oct, CN23XX_SLI_OQ_PKT_CONTROL(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_PKT_INT_LEVELS", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_PKT_INT_LEVELS(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_OQ_PKT_INT_LEVELS(i))));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_enable_interrupt and cn23xx_disable_interrupt*/</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"cn23xx-&gt;intr_enb_reg64",</div><div class='del'>-		CVM_CAST64((long)(cn23xx-&gt;intr_enb_reg64)),</div><div class='del'>-		CVM_CAST64(readq(cn23xx-&gt;intr_enb_reg64)));</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"cn23xx-&gt;intr_sum_reg64",</div><div class='del'>-		CVM_CAST64((long)(cn23xx-&gt;intr_sum_reg64)),</div><div class='del'>-		CVM_CAST64(readq(cn23xx-&gt;intr_sum_reg64)));</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_setup_iq_regs*/</div><div class='del'>-	for (i = 0; i &lt; CN23XX_MAX_INPUT_QUEUES; i++) {</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_IQ_BASE_ADDR64", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_IQ_BASE_ADDR64(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_IQ_BASE_ADDR64(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_IQ_SIZE", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_IQ_SIZE(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr</div><div class='del'>-				(oct, CN23XX_SLI_IQ_SIZE(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_IQ_DOORBELL", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_IQ_DOORBELL(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_IQ_DOORBELL(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_IQ_INSTR_COUNT64", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_IQ_INSTR_COUNT64(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_IQ_INSTR_COUNT64(i))));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*In cn23xx_setup_oq_regs*/</div><div class='del'>-	for (i = 0; i &lt; CN23XX_MAX_OUTPUT_QUEUES; i++) {</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_BASE_ADDR64", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_BASE_ADDR64(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_OQ_BASE_ADDR64(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_SIZE", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_SIZE(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr</div><div class='del'>-				(oct, CN23XX_SLI_OQ_SIZE(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_BUFF_INFO_SIZE", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_BUFF_INFO_SIZE(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr(</div><div class='del'>-				oct, CN23XX_SLI_OQ_BUFF_INFO_SIZE(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_PKTS_SENT", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_PKTS_SENT(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_OQ_PKTS_SENT(i))));</div><div class='del'>-		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s(%d)[%llx] : 0x%016llx\n",</div><div class='del'>-			"CN23XX_SLI_OQ_PKTS_CREDIT", i,</div><div class='del'>-			CVM_CAST64(CN23XX_SLI_OQ_PKTS_CREDIT(i)),</div><div class='del'>-			CVM_CAST64(octeon_read_csr64(</div><div class='del'>-				oct, CN23XX_SLI_OQ_PKTS_CREDIT(i))));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_SLI_PKT_TIME_INT",</div><div class='del'>-		CVM_CAST64(CN23XX_SLI_PKT_TIME_INT),</div><div class='del'>-		CVM_CAST64(octeon_read_csr64(oct, CN23XX_SLI_PKT_TIME_INT)));</div><div class='del'>-	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s[%llx] : 0x%016llx\n",</div><div class='del'>-		"CN23XX_SLI_PKT_CNT_INT",</div><div class='del'>-		CVM_CAST64(CN23XX_SLI_PKT_CNT_INT),</div><div class='del'>-		CVM_CAST64(octeon_read_csr64(oct, CN23XX_SLI_PKT_CNT_INT)));</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int cn23xx_pf_soft_reset(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	octeon_write_csr64(oct, CN23XX_WIN_WR_MASK_REG, 0xFF);</div><div class='hunk'>@@ -218,7 +49,7 @@ static int cn23xx_pf_soft_reset(struct octeon_device *oct)</div><div class='ctx'> 	lio_pci_readq(oct, CN23XX_RST_SOFT_RST);</div><div class='ctx'> 	lio_pci_writeq(oct, 1, CN23XX_RST_SOFT_RST);</div><div class='ctx'> </div><div class='del'>-	/* Wait for 100ms as Octeon resets. */</div><div class='add'>+	/* Wait for 100ms as Octeon resets */</div><div class='ctx'> 	mdelay(100);</div><div class='ctx'> </div><div class='ctx'> 	if (octeon_read_csr64(oct, CN23XX_SLI_SCRATCH1)) {</div><div class='hunk'>@@ -230,7 +61,7 @@ static int cn23xx_pf_soft_reset(struct octeon_device *oct)</div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "OCTEON[%d]: Reset completed\n",</div><div class='ctx'> 		oct-&gt;octeon_id);</div><div class='ctx'> </div><div class='del'>-	/* restore the  reset value*/</div><div class='add'>+	/* Restore the reset value */</div><div class='ctx'> 	octeon_write_csr64(oct, CN23XX_WIN_WR_MASK_REG, 0xFF);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -290,7 +121,7 @@ u32 cn23xx_pf_get_oq_ticks(struct octeon_device *oct, u32 time_intr_in_us)</div><div class='ctx'> 	oqticks_per_us /= 1024;</div><div class='ctx'> </div><div class='ctx'> 	/* time_intr is in microseconds. The next 2 steps gives the oq ticks</div><div class='del'>-	 *  corressponding to time_intr.</div><div class='add'>+	 * corresponding to time_intr.</div><div class='ctx'> 	 */</div><div class='ctx'> 	oqticks_per_us *= time_intr_in_us;</div><div class='ctx'> 	oqticks_per_us /= 1000;</div><div class='hunk'>@@ -305,11 +136,11 @@ static void cn23xx_setup_global_mac_regs(struct octeon_device *oct)</div><div class='ctx'> 	u64 reg_val;</div><div class='ctx'> 	u64 temp;</div><div class='ctx'> </div><div class='del'>-	/* programming SRN and TRS for each MAC(0..3)  */</div><div class='add'>+	/* Programming SRN and TRS for each MAC(0..3) */</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s:Using pcie port %d\n",</div><div class='ctx'> 		__func__, mac_no);</div><div class='del'>-	/* By default, mapping all 64 IOQs to  a single MACs */</div><div class='add'>+	/* By default, map all 64 IOQs to a single MAC */</div><div class='ctx'> </div><div class='ctx'> 	reg_val =</div><div class='ctx'> 	    octeon_read_csr64(oct, CN23XX_SLI_PKT_MAC_RINFO64(mac_no, pf_num));</div><div class='hunk'>@@ -333,7 +164,7 @@ static void cn23xx_setup_global_mac_regs(struct octeon_device *oct)</div><div class='ctx'> 	temp = oct-&gt;sriov_info.max_vfs &amp; 0xff;</div><div class='ctx'> 	reg_val |= (temp &lt;&lt; CN23XX_PKT_MAC_CTL_RINFO_NVFS_BIT_POS);</div><div class='ctx'> </div><div class='del'>-	/* write these settings to MAC register */</div><div class='add'>+	/* Write these settings to MAC register */</div><div class='ctx'> 	octeon_write_csr64(oct, CN23XX_SLI_PKT_MAC_RINFO64(mac_no, pf_num),</div><div class='ctx'> 			   reg_val);</div><div class='ctx'> </div><div class='hunk'>@@ -352,10 +183,10 @@ static int cn23xx_reset_io_queues(struct octeon_device *oct)</div><div class='ctx'> 	srn = oct-&gt;sriov_info.pf_srn;</div><div class='ctx'> 	ern = srn + oct-&gt;sriov_info.num_pf_rings;</div><div class='ctx'> </div><div class='del'>-	/*As per HRM reg description, s/w cant write 0 to ENB. */</div><div class='del'>-	/*to make the queue off, need to set the RST bit. */</div><div class='add'>+	/* As per HRM reg description, s/w can't write 0 to ENB. */</div><div class='add'>+	/* We need to set the RST bit, to turn the queue off. */</div><div class='ctx'> </div><div class='del'>-	/* Reset the Enable bit for all the 64 IQs.  */</div><div class='add'>+	/* Reset the enable bit for all the 64 IQs. */</div><div class='ctx'> 	for (q_no = srn; q_no &lt; ern; q_no++) {</div><div class='ctx'> 		/* set RST bit to 1. This bit applies to both IQ and OQ */</div><div class='ctx'> 		d64 = octeon_read_csr64(oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no));</div><div class='hunk'>@@ -363,7 +194,7 @@ static int cn23xx_reset_io_queues(struct octeon_device *oct)</div><div class='ctx'> 		octeon_write_csr64(oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no), d64);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*wait until the RST bit is clear or the RST and quite bits are set*/</div><div class='add'>+	/* Wait until the RST bit is clear or the RST and quiet bits are set */</div><div class='ctx'> 	for (q_no = srn; q_no &lt; ern; q_no++) {</div><div class='ctx'> 		u64 reg_val = octeon_read_csr64(oct,</div><div class='ctx'> 					CN23XX_SLI_IQ_PKT_CONTROL64(q_no));</div><div class='hunk'>@@ -414,15 +245,15 @@ static int cn23xx_pf_setup_global_input_regs(struct octeon_device *oct)</div><div class='ctx'> 	if (cn23xx_reset_io_queues(oct))</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	/** Set the MAC_NUM and PVF_NUM in IQ_PKT_CONTROL reg</div><div class='del'>-	 * for all queues.Only PF can set these bits.</div><div class='add'>+	/* Set the MAC_NUM and PVF_NUM in IQ_PKT_CONTROL reg</div><div class='add'>+	 * for all queues. Only PF can set these bits.</div><div class='ctx'> 	 * bits 29:30 indicate the MAC num.</div><div class='ctx'> 	 * bits 32:47 indicate the PVF num.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (q_no = 0; q_no &lt; ern; q_no++) {</div><div class='del'>-		reg_val = oct-&gt;pcie_port &lt;&lt; CN23XX_PKT_INPUT_CTL_MAC_NUM_POS;</div><div class='add'>+		reg_val = (u64)oct-&gt;pcie_port &lt;&lt; CN23XX_PKT_INPUT_CTL_MAC_NUM_POS;</div><div class='ctx'> </div><div class='del'>-		/* for VF assigned queues. */</div><div class='add'>+		/* For VF assigned queues. */</div><div class='ctx'> 		if (q_no &lt; oct-&gt;sriov_info.pf_srn) {</div><div class='ctx'> 			vf_num = q_no / oct-&gt;sriov_info.rings_per_vf;</div><div class='ctx'> 			vf_num += 1; /* VF1, VF2,........ */</div><div class='hunk'>@@ -437,7 +268,7 @@ static int cn23xx_pf_setup_global_input_regs(struct octeon_device *oct)</div><div class='ctx'> 				   reg_val);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Select ES, RO, NS, RDSIZE,DPTR Fomat#0 for</div><div class='add'>+	/* Select ES, RO, NS, RDSIZE,DPTR Format#0 for</div><div class='ctx'> 	 * pf queues</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (q_no = srn; q_no &lt; ern; q_no++) {</div><div class='hunk'>@@ -458,7 +289,7 @@ static int cn23xx_pf_setup_global_input_regs(struct octeon_device *oct)</div><div class='ctx'> 		octeon_write_csr64(oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no),</div><div class='ctx'> 				   reg_val);</div><div class='ctx'> </div><div class='del'>-		/* Set WMARK level for triggering PI_INT */</div><div class='add'>+		/* Set WMARK level to trigger PI_INT */</div><div class='ctx'> 		/* intr_threshold = CN23XX_DEF_IQ_INTR_THRESHOLD &amp; */</div><div class='ctx'> 		intr_threshold = CFG_GET_IQ_INTR_PKT(cn23xx-&gt;conf) &amp;</div><div class='ctx'> 				 CN23XX_PKT_IN_DONE_WMARK_MASK;</div><div class='hunk'>@@ -523,7 +354,7 @@ static void cn23xx_pf_setup_global_output_regs(struct octeon_device *oct)</div><div class='ctx'> 		/* set the ES bit */</div><div class='ctx'> 		reg_val |= (CN23XX_PKT_OUTPUT_CTL_ES);</div><div class='ctx'> </div><div class='del'>-		/* write all the selected settings */</div><div class='add'>+		/* Write all the selected settings */</div><div class='ctx'> 		octeon_write_csr(oct, CN23XX_SLI_OQ_PKT_CONTROL(q_no), reg_val);</div><div class='ctx'> </div><div class='ctx'> 		/* Enabling these interrupt in oct-&gt;fn_list.enable_interrupt()</div><div class='hunk'>@@ -542,7 +373,7 @@ static void cn23xx_pf_setup_global_output_regs(struct octeon_device *oct)</div><div class='ctx'> 	/** Setting the water mark level for pko back pressure **/</div><div class='ctx'> 	writeq(0x40, (u8 *)oct-&gt;mmio[0].hw_addr + CN23XX_SLI_OQ_WMARK);</div><div class='ctx'> </div><div class='del'>-	/** Disabling setting OQs in reset when ring has no dorebells</div><div class='add'>+	/* Disabling setting OQs in reset when ring has no doorbells</div><div class='ctx'> 	 * enabling this will cause of head of line blocking</div><div class='ctx'> 	 */</div><div class='ctx'> 	/* Do it only for pass1.1. and pass1.2 */</div><div class='hunk'>@@ -552,7 +383,7 @@ static void cn23xx_pf_setup_global_output_regs(struct octeon_device *oct)</div><div class='ctx'> 				     CN23XX_SLI_GBL_CONTROL) | 0x2,</div><div class='ctx'> 		       (u8 *)oct-&gt;mmio[0].hw_addr + CN23XX_SLI_GBL_CONTROL);</div><div class='ctx'> </div><div class='del'>-	/** Enable channel-level backpressure */</div><div class='add'>+	/** Enable channel-level backpressure **/</div><div class='ctx'> 	if (oct-&gt;pf_num)</div><div class='ctx'> 		writeq(0xffffffffffffffffULL,</div><div class='ctx'> 		       (u8 *)oct-&gt;mmio[0].hw_addr + CN23XX_SLI_OUT_BP_EN2_W1S);</div><div class='hunk'>@@ -565,7 +396,7 @@ static int cn23xx_setup_pf_device_regs(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	cn23xx_enable_error_reporting(oct);</div><div class='ctx'> </div><div class='del'>-	/* program the MAC(0..3)_RINFO before setting up input/output regs */</div><div class='add'>+	/* Program the MAC(0..3)_RINFO before setting up input/output regs */</div><div class='ctx'> 	cn23xx_setup_global_mac_regs(oct);</div><div class='ctx'> </div><div class='ctx'> 	if (cn23xx_pf_setup_global_input_regs(oct))</div><div class='hunk'>@@ -579,7 +410,7 @@ static int cn23xx_setup_pf_device_regs(struct octeon_device *oct)</div><div class='ctx'> 	octeon_write_csr64(oct, CN23XX_SLI_WINDOW_CTL,</div><div class='ctx'> 			   CN23XX_SLI_WINDOW_CTL_DEFAULT);</div><div class='ctx'> </div><div class='del'>-	/* set SLI_PKT_IN_JABBER to handle large VXLAN packets */</div><div class='add'>+	/* Set SLI_PKT_IN_JABBER to handle large VXLAN packets */</div><div class='ctx'> 	octeon_write_csr64(oct, CN23XX_SLI_PKT_IN_JABBER, CN23XX_INPUT_JABBER);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -719,12 +550,10 @@ static int cn23xx_setup_pf_mbox(struct octeon_device *oct)</div><div class='ctx'> 	for (i = 0; i &lt; oct-&gt;sriov_info.max_vfs; i++) {</div><div class='ctx'> 		q_no = i * oct-&gt;sriov_info.rings_per_vf;</div><div class='ctx'> </div><div class='del'>-		mbox = vmalloc(sizeof(*mbox));</div><div class='add'>+		mbox = vzalloc(sizeof(*mbox));</div><div class='ctx'> 		if (!mbox)</div><div class='ctx'> 			goto free_mbox;</div><div class='ctx'> </div><div class='del'>-		memset(mbox, 0, sizeof(struct octeon_mbox));</div><div class='del'>-</div><div class='ctx'> 		spin_lock_init(&amp;mbox-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 		mbox-&gt;oct_dev = oct;</div><div class='hunk'>@@ -745,7 +574,7 @@ static int cn23xx_setup_pf_mbox(struct octeon_device *oct)</div><div class='ctx'> 		mbox-&gt;mbox_read_reg = (u8 *)oct-&gt;mmio[0].hw_addr +</div><div class='ctx'> 				      CN23XX_SLI_PKT_PF_VF_MBOX_SIG(q_no, 1);</div><div class='ctx'> </div><div class='del'>-		/*Mail Box Thread creation*/</div><div class='add'>+		/* Mail Box Thread creation */</div><div class='ctx'> 		INIT_DELAYED_WORK(&amp;mbox-&gt;mbox_poll_wk.work,</div><div class='ctx'> 				  cn23xx_pf_mbox_thread);</div><div class='ctx'> 		mbox-&gt;mbox_poll_wk.ctxptr = (void *)mbox;</div><div class='hunk'>@@ -797,7 +626,7 @@ static int cn23xx_enable_io_queues(struct octeon_device *oct)</div><div class='ctx'> 	ern = srn + oct-&gt;num_iqs;</div><div class='ctx'> </div><div class='ctx'> 	for (q_no = srn; q_no &lt; ern; q_no++) {</div><div class='del'>-		/* set the corresponding IQ IS_64B bit */</div><div class='add'>+		/* Set the corresponding IQ IS_64B bit */</div><div class='ctx'> 		if (oct-&gt;io_qmask.iq64B &amp; BIT_ULL(q_no - srn)) {</div><div class='ctx'> 			reg_val = octeon_read_csr64(</div><div class='ctx'> 			    oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no));</div><div class='hunk'>@@ -806,7 +635,7 @@ static int cn23xx_enable_io_queues(struct octeon_device *oct)</div><div class='ctx'> 			    oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no), reg_val);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* set the corresponding IQ ENB bit */</div><div class='add'>+		/* Set the corresponding IQ ENB bit */</div><div class='ctx'> 		if (oct-&gt;io_qmask.iq &amp; BIT_ULL(q_no - srn)) {</div><div class='ctx'> 			/* IOQs are in reset by default in PEM2 mode,</div><div class='ctx'> 			 * clearing reset bit</div><div class='hunk'>@@ -852,7 +681,7 @@ static int cn23xx_enable_io_queues(struct octeon_device *oct)</div><div class='ctx'> 	}</div><div class='ctx'> 	for (q_no = srn; q_no &lt; ern; q_no++) {</div><div class='ctx'> 		u32 reg_val;</div><div class='del'>-		/* set the corresponding OQ ENB bit */</div><div class='add'>+		/* Set the corresponding OQ ENB bit */</div><div class='ctx'> 		if (oct-&gt;io_qmask.oq &amp; BIT_ULL(q_no - srn)) {</div><div class='ctx'> 			reg_val = octeon_read_csr(</div><div class='ctx'> 			    oct, CN23XX_SLI_OQ_PKT_CONTROL(q_no));</div><div class='hunk'>@@ -878,7 +707,7 @@ static void cn23xx_disable_io_queues(struct octeon_device *oct)</div><div class='ctx'> 	for (q_no = srn; q_no &lt; ern; q_no++) {</div><div class='ctx'> 		loop = HZ;</div><div class='ctx'> </div><div class='del'>-		/* start the Reset for a particular ring */</div><div class='add'>+		/* Start the Reset for a particular ring */</div><div class='ctx'> 		WRITE_ONCE(d64, octeon_read_csr64(</div><div class='ctx'> 			   oct, CN23XX_SLI_IQ_PKT_CONTROL64(q_no)));</div><div class='ctx'> 		WRITE_ONCE(d64, READ_ONCE(d64) &amp;</div><div class='hunk'>@@ -911,7 +740,7 @@ static void cn23xx_disable_io_queues(struct octeon_device *oct)</div><div class='ctx'> 		loop = HZ;</div><div class='ctx'> </div><div class='ctx'> 		/* Wait until hardware indicates that the particular IQ</div><div class='del'>-		 * is out of reset.It given that SLI_PKT_RING_RST is</div><div class='add'>+		 * is out of reset. Given that SLI_PKT_RING_RST is</div><div class='ctx'> 		 * common for both IQs and OQs</div><div class='ctx'> 		 */</div><div class='ctx'> 		WRITE_ONCE(d64, octeon_read_csr64(</div><div class='hunk'>@@ -931,7 +760,7 @@ static void cn23xx_disable_io_queues(struct octeon_device *oct)</div><div class='ctx'> 			schedule_timeout_uninterruptible(1);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* clear the SLI_PKT(0..63)_CNTS[CNT] reg value */</div><div class='add'>+		/* Clear the SLI_PKT(0..63)_CNTS[CNT] reg value */</div><div class='ctx'> 		WRITE_ONCE(d32, octeon_read_csr(</div><div class='ctx'> 					oct, CN23XX_SLI_OQ_PKTS_SENT(q_no)));</div><div class='ctx'> 		octeon_write_csr(oct, CN23XX_SLI_OQ_PKTS_SENT(q_no),</div><div class='hunk'>@@ -964,7 +793,7 @@ static u64 cn23xx_pf_msix_interrupt_handler(void *dev)</div><div class='ctx'> 	if (!pkts_sent || (pkts_sent == 0xFFFFFFFFFFFFFFFFULL))</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* Write count reg in sli_pkt_cnts to clear these int.*/</div><div class='add'>+	/* Write count reg in sli_pkt_cnts to clear these int. */</div><div class='ctx'> 	if ((pkts_sent &amp; CN23XX_INTR_PO_INT) ||</div><div class='ctx'> 	    (pkts_sent &amp; CN23XX_INTR_PI_INT)) {</div><div class='ctx'> 		if (pkts_sent &amp; CN23XX_INTR_PO_INT)</div><div class='hunk'>@@ -1079,7 +908,7 @@ static u32 cn23xx_bar1_idx_read(struct octeon_device *oct, u32 idx)</div><div class='ctx'> 	    oct, CN23XX_PEM_BAR1_INDEX_REG(oct-&gt;pcie_port, idx));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* always call with lock held */</div><div class='add'>+/* Always call with lock held */</div><div class='ctx'> static u32 cn23xx_update_read_index(struct octeon_instr_queue *iq)</div><div class='ctx'> {</div><div class='ctx'> 	u32 new_idx;</div><div class='hunk'>@@ -1090,7 +919,7 @@ static u32 cn23xx_update_read_index(struct octeon_instr_queue *iq)</div><div class='ctx'> 	iq-&gt;pkt_in_done = pkt_in_done;</div><div class='ctx'> </div><div class='ctx'> 	/* Modulo of the new index with the IQ size will give us</div><div class='del'>-	 * the new index.  The iq-&gt;reset_instr_cnt is always zero for</div><div class='add'>+	 * the new index. The iq-&gt;reset_instr_cnt is always zero for</div><div class='ctx'> 	 * cn23xx, so no extra adjustments are needed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	new_idx = (iq-&gt;octeon_read_index +</div><div class='hunk'>@@ -1105,8 +934,8 @@ static void cn23xx_enable_pf_interrupt(struct octeon_device *oct, u8 intr_flag)</div><div class='ctx'> 	struct octeon_cn23xx_pf *cn23xx = (struct octeon_cn23xx_pf *)oct-&gt;chip;</div><div class='ctx'> 	u64 intr_val = 0;</div><div class='ctx'> </div><div class='del'>-	/*  Divide the single write to multiple writes based on the flag. */</div><div class='del'>-	/* Enable Interrupt */</div><div class='add'>+	/* Divide the single write to multiple writes based on the flag. */</div><div class='add'>+	/* Enable Interrupts */</div><div class='ctx'> 	if (intr_flag == OCTEON_ALL_INTR) {</div><div class='ctx'> 		writeq(cn23xx-&gt;intr_mask64, cn23xx-&gt;intr_enb_reg64);</div><div class='ctx'> 	} else if (intr_flag &amp; OCTEON_OUTPUT_INTR) {</div><div class='hunk'>@@ -1161,26 +990,26 @@ static int cn23xx_get_pf_num(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	ret = 0;</div><div class='ctx'> </div><div class='del'>-	/** Read Function Dependency Link reg to get the function number */</div><div class='add'>+	/* Read Function Dependency Link reg to get the function number */</div><div class='ctx'> 	if (pci_read_config_dword(oct-&gt;pci_dev, CN23XX_PCIE_SRIOV_FDL,</div><div class='ctx'> 				  &amp;fdl_bit) == 0) {</div><div class='ctx'> 		oct-&gt;pf_num = ((fdl_bit &gt;&gt; CN23XX_PCIE_SRIOV_FDL_BIT_POS) &amp;</div><div class='ctx'> 			       CN23XX_PCIE_SRIOV_FDL_MASK);</div><div class='ctx'> 	} else {</div><div class='del'>-		ret = EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 		/* Under some virtual environments, extended PCI regs are</div><div class='ctx'> 		 * inaccessible, in which case the above read will have failed.</div><div class='ctx'> 		 * In this case, read the PF number from the</div><div class='ctx'> 		 * SLI_PKT0_INPUT_CONTROL reg (written by f/w)</div><div class='ctx'> 		 */</div><div class='del'>-		pkt0_in_ctl = octeon_read_csr64(oct,</div><div class='del'>-						CN23XX_SLI_IQ_PKT_CONTROL64(0));</div><div class='add'>+		pkt0_in_ctl =</div><div class='add'>+			octeon_read_csr64(oct, CN23XX_SLI_IQ_PKT_CONTROL64(0));</div><div class='ctx'> 		pfnum = (pkt0_in_ctl &gt;&gt; CN23XX_PKT_INPUT_CTL_PF_NUM_POS) &amp;</div><div class='ctx'> 			CN23XX_PKT_INPUT_CTL_PF_NUM_MASK;</div><div class='ctx'> 		mac = (octeon_read_csr(oct, CN23XX_SLI_MAC_NUMBER)) &amp; 0xff;</div><div class='ctx'> </div><div class='del'>-		/* validate PF num by reading RINFO; f/w writes RINFO.trs == 1*/</div><div class='add'>+		/* Validate PF num by reading RINFO; f/w writes RINFO.trs == 1 */</div><div class='ctx'> 		d64 = octeon_read_csr64(oct,</div><div class='ctx'> 					CN23XX_SLI_PKT_MAC_RINFO64(mac, pfnum));</div><div class='ctx'> 		trs = (int)(d64 &gt;&gt; CN23XX_PKT_MAC_CTL_RINFO_TRS_BIT_POS) &amp; 0xff;</div><div class='hunk'>@@ -1377,54 +1206,16 @@ int setup_cn23xx_octeon_pf_device(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-int validate_cn23xx_pf_config_info(struct octeon_device *oct,</div><div class='del'>-				   struct octeon_config *conf23xx)</div><div class='del'>-{</div><div class='del'>-	if (CFG_GET_IQ_MAX_Q(conf23xx) &gt; CN23XX_MAX_INPUT_QUEUES) {</div><div class='del'>-		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s: Num IQ (%d) exceeds Max (%d)\n",</div><div class='del'>-			__func__, CFG_GET_IQ_MAX_Q(conf23xx),</div><div class='del'>-			CN23XX_MAX_INPUT_QUEUES);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (CFG_GET_OQ_MAX_Q(conf23xx) &gt; CN23XX_MAX_OUTPUT_QUEUES) {</div><div class='del'>-		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s: Num OQ (%d) exceeds Max (%d)\n",</div><div class='del'>-			__func__, CFG_GET_OQ_MAX_Q(conf23xx),</div><div class='del'>-			CN23XX_MAX_OUTPUT_QUEUES);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (CFG_GET_IQ_INSTR_TYPE(conf23xx) != OCTEON_32BYTE_INSTR &amp;&amp;</div><div class='del'>-	    CFG_GET_IQ_INSTR_TYPE(conf23xx) != OCTEON_64BYTE_INSTR) {</div><div class='del'>-		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s: Invalid instr type for IQ\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!CFG_GET_OQ_REFILL_THRESHOLD(conf23xx)) {</div><div class='del'>-		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s: Invalid parameter for OQ\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(CFG_GET_OQ_INTR_TIME(conf23xx))) {</div><div class='del'>-		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s: Invalid parameter for OQ\n",</div><div class='del'>-			__func__);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='add'>+EXPORT_SYMBOL_GPL(setup_cn23xx_octeon_pf_device);</div><div class='ctx'> </div><div class='ctx'> int cn23xx_fw_loaded(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val;</div><div class='ctx'> </div><div class='ctx'> 	/* If there's more than one active PF on this NIC, then that</div><div class='del'>-	 * implies that the NIC firmware is loaded and running.  This check</div><div class='add'>+	 * implies that the NIC firmware is loaded and running. This check</div><div class='ctx'> 	 * prevents a rare false negative that might occur if we only relied</div><div class='del'>-	 * on checking the SCR2_BIT_FW_LOADED flag.  The false negative would</div><div class='add'>+	 * on checking the SCR2_BIT_FW_LOADED flag. The false negative would</div><div class='ctx'> 	 * happen if the PF driver sees SCR2_BIT_FW_LOADED as cleared even</div><div class='ctx'> 	 * though the firmware was already loaded but still booting and has yet</div><div class='ctx'> 	 * to set SCR2_BIT_FW_LOADED.</div><div class='hunk'>@@ -1435,6 +1226,7 @@ int cn23xx_fw_loaded(struct octeon_device *oct)</div><div class='ctx'> 	val = octeon_read_csr64(oct, CN23XX_SLI_SCRATCH2);</div><div class='ctx'> 	return (val &gt;&gt; SCR2_BIT_FW_LOADED) &amp; 1ULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn23xx_fw_loaded);</div><div class='ctx'> </div><div class='ctx'> void cn23xx_tell_vf_its_macaddr_changed(struct octeon_device *oct, int vfidx,</div><div class='ctx'> 					u8 *mac)</div><div class='hunk'>@@ -1456,6 +1248,7 @@ void cn23xx_tell_vf_its_macaddr_changed(struct octeon_device *oct, int vfidx,</div><div class='ctx'> 		octeon_mbox_write(oct, &amp;mbox_cmd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn23xx_tell_vf_its_macaddr_changed);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> cn23xx_get_vf_stats_callback(struct octeon_device *oct,</div><div class='hunk'>@@ -1489,7 +1282,7 @@ int cn23xx_get_vf_stats(struct octeon_device *oct, int vfidx,</div><div class='ctx'> 	mbox_cmd.q_no = vfidx * oct-&gt;sriov_info.rings_per_vf;</div><div class='ctx'> 	mbox_cmd.recv_len = 0;</div><div class='ctx'> 	mbox_cmd.recv_status = 0;</div><div class='del'>-	mbox_cmd.fn = (octeon_mbox_callback_t)cn23xx_get_vf_stats_callback;</div><div class='add'>+	mbox_cmd.fn = cn23xx_get_vf_stats_callback;</div><div class='ctx'> 	ctx.stats = stats;</div><div class='ctx'> 	atomic_set(&amp;ctx.status, 0);</div><div class='ctx'> 	mbox_cmd.fn_arg = (void *)&amp;ctx;</div><div class='hunk'>@@ -1510,3 +1303,4 @@ int cn23xx_get_vf_stats(struct octeon_device *oct, int vfidx,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn23xx_get_vf_stats);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h<br/>index e6f31d0d5c0b..bbe9f3133b07 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h</a></div><div class='hunk'>@@ -54,13 +54,8 @@ struct oct_vf_stats {</div><div class='ctx'> </div><div class='ctx'> int setup_cn23xx_octeon_pf_device(struct octeon_device *oct);</div><div class='ctx'> </div><div class='del'>-int validate_cn23xx_pf_config_info(struct octeon_device *oct,</div><div class='del'>-				   struct octeon_config *conf23xx);</div><div class='del'>-</div><div class='ctx'> u32 cn23xx_pf_get_oq_ticks(struct octeon_device *oct, u32 time_intr_in_us);</div><div class='ctx'> </div><div class='del'>-void cn23xx_dump_pf_initialized_regs(struct octeon_device *oct);</div><div class='del'>-</div><div class='ctx'> int cn23xx_sriov_config(struct octeon_device *oct);</div><div class='ctx'> </div><div class='ctx'> int cn23xx_fw_loaded(struct octeon_device *oct);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h<br/>index e6d4ad99cc38..a0fd32476225 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h</a></div><div class='hunk'>@@ -87,8 +87,8 @@</div><div class='ctx'>  */</div><div class='ctx'> #define    CN23XX_SLI_PKT_IN_JABBER                0x29170</div><div class='ctx'> /* The input jabber is used to determine the TSO max size.</div><div class='del'>- * Due to H/W limitation, this need to be reduced to 60000</div><div class='del'>- * in order to to H/W TSO and avoid the WQE malfarmation</div><div class='add'>+ * Due to H/W limitation, this needs to be reduced to 60000</div><div class='add'>+ * in order to use H/W TSO and avoid the WQE malformation</div><div class='ctx'>  * PKO_BUG_24989_WQE_LEN</div><div class='ctx'>  */</div><div class='ctx'> #define    CN23XX_DEFAULT_INPUT_JABBER             0xEA60 /*60000*/</div><div class='hunk'>@@ -521,7 +521,7 @@</div><div class='ctx'> #define    CN23XX_BAR1_INDEX_OFFSET                3</div><div class='ctx'> </div><div class='ctx'> #define    CN23XX_PEM_BAR1_INDEX_REG(port, idx)		\</div><div class='del'>-		(CN23XX_PEM_BAR1_INDEX_START + ((port) &lt;&lt; CN23XX_PEM_OFFSET) + \</div><div class='add'>+		(CN23XX_PEM_BAR1_INDEX_START + (((u64)port) &lt;&lt; CN23XX_PEM_OFFSET) + \</div><div class='ctx'> 		 ((idx) &lt;&lt; CN23XX_BAR1_INDEX_OFFSET))</div><div class='ctx'> </div><div class='ctx'> /*############################ DPI #########################*/</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c b/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c<br/>index fda49404968c..d2fcb3da484e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.c</a></div><div class='hunk'>@@ -279,12 +279,10 @@ static int cn23xx_setup_vf_mbox(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_mbox *mbox = NULL;</div><div class='ctx'> </div><div class='del'>-	mbox = vmalloc(sizeof(*mbox));</div><div class='add'>+	mbox = vzalloc(sizeof(*mbox));</div><div class='ctx'> 	if (!mbox)</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	memset(mbox, 0, sizeof(struct octeon_mbox));</div><div class='del'>-</div><div class='ctx'> 	spin_lock_init(&amp;mbox-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	mbox-&gt;oct_dev = oct;</div><div class='hunk'>@@ -386,6 +384,7 @@ void cn23xx_vf_ask_pf_to_do_flr(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	octeon_mbox_write(oct, &amp;mbox_cmd);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn23xx_vf_ask_pf_to_do_flr);</div><div class='ctx'> </div><div class='ctx'> static void octeon_pfvf_hs_callback(struct octeon_device *oct,</div><div class='ctx'> 				    struct octeon_mbox_cmd *cmd,</div><div class='hunk'>@@ -430,7 +429,7 @@ int cn23xx_octeon_pfvf_handshake(struct octeon_device *oct)</div><div class='ctx'> 	mbox_cmd.q_no = 0;</div><div class='ctx'> 	mbox_cmd.recv_len = 0;</div><div class='ctx'> 	mbox_cmd.recv_status = 0;</div><div class='del'>-	mbox_cmd.fn = (octeon_mbox_callback_t)octeon_pfvf_hs_callback;</div><div class='add'>+	mbox_cmd.fn = octeon_pfvf_hs_callback;</div><div class='ctx'> 	mbox_cmd.fn_arg = &amp;status;</div><div class='ctx'> </div><div class='ctx'> 	octeon_mbox_write(oct, &amp;mbox_cmd);</div><div class='hunk'>@@ -468,6 +467,7 @@ int cn23xx_octeon_pfvf_handshake(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn23xx_octeon_pfvf_handshake);</div><div class='ctx'> </div><div class='ctx'> static void cn23xx_handle_vf_mbox_intr(struct octeon_ioq_vector *ioq_vector)</div><div class='ctx'> {</div><div class='hunk'>@@ -680,3 +680,4 @@ int cn23xx_setup_octeon_vf_device(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cn23xx_setup_octeon_vf_device);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h<br/>index 2d06097d3f61..40f529d0bc4c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_device.h</a></div><div class='hunk'>@@ -43,6 +43,4 @@ int cn23xx_octeon_pfvf_handshake(struct octeon_device *oct);</div><div class='ctx'> int cn23xx_setup_octeon_vf_device(struct octeon_device *oct);</div><div class='ctx'> </div><div class='ctx'> u32 cn23xx_vf_get_oq_ticks(struct octeon_device *oct, u32 time_intr_in_us);</div><div class='del'>-</div><div class='del'>-void cn23xx_dump_vf_initialized_regs(struct octeon_device *oct);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h b/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h<br/>index d33dd8f4226f..e956109415cd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn23xx_vf_regs.h</a></div><div class='hunk'>@@ -36,8 +36,8 @@</div><div class='ctx'> #define     CN23XX_CONFIG_PCIE_FLTMSK              0x720</div><div class='ctx'> </div><div class='ctx'> /* The input jabber is used to determine the TSO max size.</div><div class='del'>- * Due to H/W limitation, this need to be reduced to 60000</div><div class='del'>- * in order to to H/W TSO and avoid the WQE malfarmation</div><div class='add'>+ * Due to H/W limitation, this needs to be reduced to 60000</div><div class='add'>+ * in order to use H/W TSO and avoid the WQE malformation</div><div class='ctx'>  * PKO_BUG_24989_WQE_LEN</div><div class='ctx'>  */</div><div class='ctx'> #define    CN23XX_DEFAULT_INPUT_JABBER             0xEA60 /*60000*/</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c<br/>index 39643be8c30a..93fccfec288d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.c</a></div><div class='hunk'>@@ -697,6 +697,7 @@ int lio_setup_cn66xx_octeon_device(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_setup_cn66xx_octeon_device);</div><div class='ctx'> </div><div class='ctx'> int lio_validate_cn6xxx_config_info(struct octeon_device *oct,</div><div class='ctx'> 				    struct octeon_config *conf6xxx)</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h b/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h<br/>index 8ed57134ee0c..129c8b84f549 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn66xx_device.h</a></div><div class='hunk'>@@ -86,7 +86,6 @@ u32</div><div class='ctx'> lio_cn6xxx_update_read_index(struct octeon_instr_queue *iq);</div><div class='ctx'> void lio_cn6xxx_enable_interrupt(struct octeon_device *oct, u8 unused);</div><div class='ctx'> void lio_cn6xxx_disable_interrupt(struct octeon_device *oct, u8 unused);</div><div class='del'>-void cn6xxx_get_pcie_qlmport(struct octeon_device *oct);</div><div class='ctx'> void lio_cn6xxx_setup_reg_address(struct octeon_device *oct, void *chip,</div><div class='ctx'> 				  struct octeon_reg_list *reg_list);</div><div class='ctx'> u32 lio_cn6xxx_coprocessor_clock(struct octeon_device *oct);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h b/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h<br/>index b248966837b4..7aad40b2aa73 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h</a></div><div class='hunk'>@@ -412,7 +412,7 @@</div><div class='ctx'> 	   | CN6XXX_INTR_M0UNWI_ERR             \</div><div class='ctx'> 	   | CN6XXX_INTR_M1UPB0_ERR             \</div><div class='ctx'> 	   | CN6XXX_INTR_M1UPWI_ERR             \</div><div class='del'>-	   | CN6XXX_INTR_M1UPB0_ERR             \</div><div class='add'>+	   | CN6XXX_INTR_M1UNB0_ERR             \</div><div class='ctx'> 	   | CN6XXX_INTR_M1UNWI_ERR             \</div><div class='ctx'> 	   | CN6XXX_INTR_INSTR_DB_OF_ERR        \</div><div class='ctx'> 	   | CN6XXX_INTR_SLIST_DB_OF_ERR        \</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c b/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c<br/>index 50b533ff58e6..b5103def3761 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/cn68xx_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/cn68xx_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/cn68xx_device.c</a></div><div class='hunk'>@@ -25,6 +25,7 @@</div><div class='ctx'> #include "octeon_main.h"</div><div class='ctx'> #include "cn66xx_regs.h"</div><div class='ctx'> #include "cn66xx_device.h"</div><div class='add'>+#include "cn68xx_device.h"</div><div class='ctx'> #include "cn68xx_regs.h"</div><div class='ctx'> </div><div class='ctx'> static void lio_cn68xx_set_dpi_regs(struct octeon_device *oct)</div><div class='hunk'>@@ -180,3 +181,4 @@ int lio_setup_cn68xx_octeon_device(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_setup_cn68xx_octeon_device);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c<br/>index 1c50c10b5a16..215dac201b4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_core.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/lio_core.c</a></div><div class='hunk'>@@ -26,14 +26,18 @@</div><div class='ctx'> #include "octeon_main.h"</div><div class='ctx'> #include "octeon_network.h"</div><div class='ctx'> </div><div class='add'>+MODULE_AUTHOR("Cavium Networks, &lt;support@cavium.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Cavium LiquidIO Intelligent Server Adapter Core");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+</div><div class='ctx'> /* OOM task polling interval */</div><div class='ctx'> #define LIO_OOM_POLL_INTERVAL_MS 250</div><div class='ctx'> </div><div class='ctx'> #define OCTNIC_MAX_SG  MAX_SKB_FRAGS</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Delete gather lists</div><div class='del'>- * @param lio per-network private data</div><div class='add'>+ * lio_delete_glists - Delete gather lists</div><div class='add'>+ * @lio: per-network private data</div><div class='ctx'>  */</div><div class='ctx'> void lio_delete_glists(struct lio *lio)</div><div class='ctx'> {</div><div class='hunk'>@@ -71,10 +75,13 @@ void lio_delete_glists(struct lio *lio)</div><div class='ctx'> 	kfree(lio-&gt;glist);</div><div class='ctx'> 	lio-&gt;glist = NULL;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_delete_glists);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Setup gather lists</div><div class='del'>- * @param lio per-network private data</div><div class='add'>+ * lio_setup_glists - Setup gather lists</div><div class='add'>+ * @oct: octeon_device</div><div class='add'>+ * @lio: per-network private data</div><div class='add'>+ * @num_iqs: count of iqs to allocate</div><div class='ctx'>  */</div><div class='ctx'> int lio_setup_glists(struct octeon_device *oct, struct lio *lio, int num_iqs)</div><div class='ctx'> {</div><div class='hunk'>@@ -152,6 +159,7 @@ int lio_setup_glists(struct octeon_device *oct, struct lio *lio, int num_iqs)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_setup_glists);</div><div class='ctx'> </div><div class='ctx'> int liquidio_set_feature(struct net_device *netdev, int cmd, u16 param1)</div><div class='ctx'> {</div><div class='hunk'>@@ -178,6 +186,7 @@ int liquidio_set_feature(struct net_device *netdev, int cmd, u16 param1)</div><div class='ctx'> 	}</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_set_feature);</div><div class='ctx'> </div><div class='ctx'> void octeon_report_tx_completion_to_bql(void *txq, unsigned int pkts_compl,</div><div class='ctx'> 					unsigned int bytes_compl)</div><div class='hunk'>@@ -393,6 +402,7 @@ void liquidio_link_ctrl_cmd_completion(void *nctrl_ptr)</div><div class='ctx'> 			nctrl-&gt;ncmd.s.cmd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_link_ctrl_cmd_completion);</div><div class='ctx'> </div><div class='ctx'> void octeon_pf_changed_vf_macaddr(struct octeon_device *oct, u8 *mac)</div><div class='ctx'> {</div><div class='hunk'>@@ -409,7 +419,7 @@ void octeon_pf_changed_vf_macaddr(struct octeon_device *oct, u8 *mac)</div><div class='ctx'> </div><div class='ctx'> 	if (!ether_addr_equal(netdev-&gt;dev_addr, mac)) {</div><div class='ctx'> 		macaddr_changed = true;</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, mac);</div><div class='add'>+		eth_hw_addr_set(netdev, mac);</div><div class='ctx'> 		ether_addr_copy(((u8 *)&amp;lio-&gt;linfo.hw_addr) + 2, mac);</div><div class='ctx'> 		call_netdevice_notifiers(NETDEV_CHANGEADDR, netdev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -462,7 +472,7 @@ int setup_rx_oom_poll_fn(struct net_device *netdev)</div><div class='ctx'> 		q_no = lio-&gt;linfo.rxpciq[q].s.q_no;</div><div class='ctx'> 		wq = &amp;lio-&gt;rxq_status_wq[q_no];</div><div class='ctx'> 		wq-&gt;wq = alloc_workqueue("rxq-oom-status",</div><div class='del'>-					 WQ_MEM_RECLAIM, 0);</div><div class='add'>+					 WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 		if (!wq-&gt;wq) {</div><div class='ctx'> 			dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "unable to create cavium rxq oom status wq\n");</div><div class='ctx'> 			return -ENOMEM;</div><div class='hunk'>@@ -476,6 +486,7 @@ int setup_rx_oom_poll_fn(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(setup_rx_oom_poll_fn);</div><div class='ctx'> </div><div class='ctx'> void cleanup_rx_oom_poll_fn(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -488,12 +499,12 @@ void cleanup_rx_oom_poll_fn(struct net_device *netdev)</div><div class='ctx'> 		wq = &amp;lio-&gt;rxq_status_wq[q_no];</div><div class='ctx'> 		if (wq-&gt;wq) {</div><div class='ctx'> 			cancel_delayed_work_sync(&amp;wq-&gt;wk.work);</div><div class='del'>-			flush_workqueue(wq-&gt;wq);</div><div class='ctx'> 			destroy_workqueue(wq-&gt;wq);</div><div class='ctx'> 			wq-&gt;wq = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(cleanup_rx_oom_poll_fn);</div><div class='ctx'> </div><div class='ctx'> /* Runs in interrupt context. */</div><div class='ctx'> static void lio_update_txq_status(struct octeon_device *oct, int iq_num)</div><div class='hunk'>@@ -521,12 +532,12 @@ static void lio_update_txq_status(struct octeon_device *oct, int iq_num)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Setup output queue</div><div class='del'>- * @param oct octeon device</div><div class='del'>- * @param q_no which queue</div><div class='del'>- * @param num_descs how many descriptors</div><div class='del'>- * @param desc_size size of each descriptor</div><div class='del'>- * @param app_ctx application context</div><div class='add'>+ * octeon_setup_droq - Setup output queue</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @q_no: which queue</div><div class='add'>+ * @num_descs: how many descriptors</div><div class='add'>+ * @desc_size: size of each descriptor</div><div class='add'>+ * @app_ctx: application context</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs,</div><div class='ctx'> 			     int desc_size, void *app_ctx)</div><div class='hunk'>@@ -555,16 +566,17 @@ static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs,</div><div class='ctx'> 	return ret_val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** Routine to push packets arriving on Octeon interface upto network layer.</div><div class='del'>- * @param oct_id   - octeon device id.</div><div class='del'>- * @param skbuff   - skbuff struct to be passed to network layer.</div><div class='del'>- * @param len      - size of total data received.</div><div class='del'>- * @param rh       - Control header associated with the packet</div><div class='del'>- * @param param    - additional control data with the packet</div><div class='del'>- * @param arg      - farg registered in droq_ops</div><div class='add'>+/**</div><div class='add'>+ * liquidio_push_packet - Routine to push packets arriving on Octeon interface upto network layer.</div><div class='add'>+ * @octeon_id:octeon device id.</div><div class='add'>+ * @skbuff:   skbuff struct to be passed to network layer.</div><div class='add'>+ * @len:      size of total data received.</div><div class='add'>+ * @rh:       Control header associated with the packet</div><div class='add'>+ * @param:    additional control data with the packet</div><div class='add'>+ * @arg:      farg registered in droq_ops</div><div class='ctx'>  */</div><div class='ctx'> static void</div><div class='del'>-liquidio_push_packet(u32 octeon_id __attribute__((unused)),</div><div class='add'>+liquidio_push_packet(u32 __maybe_unused octeon_id,</div><div class='ctx'> 		     void *skbuff,</div><div class='ctx'> 		     u32 len,</div><div class='ctx'> 		     union octeon_rh *rh,</div><div class='hunk'>@@ -698,8 +710,8 @@ liquidio_push_packet(u32 octeon_id __attribute__((unused)),</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief wrapper for calling napi_schedule</div><div class='del'>- * @param param parameters to pass to napi_schedule</div><div class='add'>+ * napi_schedule_wrapper - wrapper for calling napi_schedule</div><div class='add'>+ * @param: parameters to pass to napi_schedule</div><div class='ctx'>  *</div><div class='ctx'>  * Used when scheduling on different CPUs</div><div class='ctx'>  */</div><div class='hunk'>@@ -711,8 +723,8 @@ static void napi_schedule_wrapper(void *param)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief callback when receive interrupt occurs and we are in NAPI mode</div><div class='del'>- * @param arg pointer to octeon output queue</div><div class='add'>+ * liquidio_napi_drv_callback - callback when receive interrupt occurs and we are in NAPI mode</div><div class='add'>+ * @arg: pointer to octeon output queue</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_napi_drv_callback(void *arg)</div><div class='ctx'> {</div><div class='hunk'>@@ -726,20 +738,15 @@ static void liquidio_napi_drv_callback(void *arg)</div><div class='ctx'> 	    droq-&gt;cpu_id == this_cpu) {</div><div class='ctx'> 		napi_schedule_irqoff(&amp;droq-&gt;napi);</div><div class='ctx'> 	} else {</div><div class='del'>-		call_single_data_t *csd = &amp;droq-&gt;csd;</div><div class='del'>-</div><div class='del'>-		csd-&gt;func = napi_schedule_wrapper;</div><div class='del'>-		csd-&gt;info = &amp;droq-&gt;napi;</div><div class='del'>-		csd-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-		smp_call_function_single_async(droq-&gt;cpu_id, csd);</div><div class='add'>+		INIT_CSD(&amp;droq-&gt;csd, napi_schedule_wrapper, &amp;droq-&gt;napi);</div><div class='add'>+		smp_call_function_single_async(droq-&gt;cpu_id, &amp;droq-&gt;csd);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Entry point for NAPI polling</div><div class='del'>- * @param napi NAPI structure</div><div class='del'>- * @param budget maximum number of items to process</div><div class='add'>+ * liquidio_napi_poll - Entry point for NAPI polling</div><div class='add'>+ * @napi: NAPI structure</div><div class='add'>+ * @budget: maximum number of items to process</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='hunk'>@@ -782,7 +789,6 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	if ((work_done &lt; budget &amp;&amp; tx_done) ||</div><div class='ctx'> 	    (iq &amp;&amp; iq-&gt;pkt_in_done &gt;= MAX_REG_CNT) ||</div><div class='ctx'> 	    (droq-&gt;pkt_count &gt;= MAX_REG_CNT)) {</div><div class='del'>-		tx_done = 1;</div><div class='ctx'> 		napi_complete_done(napi, work_done);</div><div class='ctx'> </div><div class='ctx'> 		octeon_enable_irq(droq-&gt;oct_dev, droq-&gt;q_no);</div><div class='hunk'>@@ -793,9 +799,11 @@ static int liquidio_napi_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Setup input and output queues</div><div class='del'>- * @param octeon_dev octeon device</div><div class='del'>- * @param ifidx Interface index</div><div class='add'>+ * liquidio_setup_io_queues - Setup input and output queues</div><div class='add'>+ * @octeon_dev: octeon device</div><div class='add'>+ * @ifidx: Interface index</div><div class='add'>+ * @num_iqs: input io queue count</div><div class='add'>+ * @num_oqs: output io queue count</div><div class='ctx'>  *</div><div class='ctx'>  * Note: Queues are with respect to the octeon device. Thus</div><div class='ctx'>  * an input queue is for egress packets, and output queues</div><div class='hunk'>@@ -853,7 +861,7 @@ int liquidio_setup_io_queues(struct octeon_device *octeon_dev, int ifidx,</div><div class='ctx'> 		napi = &amp;droq-&gt;napi;</div><div class='ctx'> 		dev_dbg(&amp;octeon_dev-&gt;pci_dev-&gt;dev, "netif_napi_add netdev:%llx oct:%llx\n",</div><div class='ctx'> 			(u64)netdev, (u64)octeon_dev);</div><div class='del'>-		netif_napi_add(netdev, napi, liquidio_napi_poll, 64);</div><div class='add'>+		netif_napi_add(netdev, napi, liquidio_napi_poll);</div><div class='ctx'> </div><div class='ctx'> 		/* designate a CPU for this droq */</div><div class='ctx'> 		droq-&gt;cpu_id = cpu_id;</div><div class='hunk'>@@ -901,6 +909,7 @@ int liquidio_setup_io_queues(struct octeon_device *octeon_dev, int ifidx,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_setup_io_queues);</div><div class='ctx'> </div><div class='ctx'> static</div><div class='ctx'> int liquidio_schedule_msix_droq_pkt_handler(struct octeon_droq *droq, u64 ret)</div><div class='hunk'>@@ -928,7 +937,7 @@ int liquidio_schedule_msix_droq_pkt_handler(struct octeon_droq *droq, u64 ret)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> irqreturn_t</div><div class='del'>-liquidio_msix_intr_handler(int irq __attribute__((unused)), void *dev)</div><div class='add'>+liquidio_msix_intr_handler(int __maybe_unused irq, void *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_ioq_vector *ioq_vector = (struct octeon_ioq_vector *)dev;</div><div class='ctx'> 	struct octeon_device *oct = ioq_vector-&gt;oct_dev;</div><div class='hunk'>@@ -944,8 +953,8 @@ liquidio_msix_intr_handler(int irq __attribute__((unused)), void *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Droq packet processor sceduler</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * liquidio_schedule_droq_pkt_handlers - Droq packet processor sceduler</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_schedule_droq_pkt_handlers(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -964,7 +973,7 @@ static void liquidio_schedule_droq_pkt_handlers(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 			if (droq-&gt;ops.poll_mode) {</div><div class='ctx'> 				droq-&gt;ops.napi_fn(droq);</div><div class='del'>-				oct_priv-&gt;napi_mask |= (1 &lt;&lt; oq_no);</div><div class='add'>+				oct_priv-&gt;napi_mask |= BIT_ULL(oq_no);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				tasklet_schedule(&amp;oct_priv-&gt;droq_tasklet);</div><div class='ctx'> 			}</div><div class='hunk'>@@ -973,13 +982,12 @@ static void liquidio_schedule_droq_pkt_handlers(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Interrupt handler for octeon</div><div class='del'>- * @param irq unused</div><div class='del'>- * @param dev octeon device</div><div class='add'>+ * liquidio_legacy_intr_handler - Interrupt handler for octeon</div><div class='add'>+ * @irq: unused</div><div class='add'>+ * @dev: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static</div><div class='del'>-irqreturn_t liquidio_legacy_intr_handler(int irq __attribute__((unused)),</div><div class='del'>-					 void *dev)</div><div class='add'>+irqreturn_t liquidio_legacy_intr_handler(int __maybe_unused irq, void *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_device *oct = (struct octeon_device *)dev;</div><div class='ctx'> 	irqreturn_t ret;</div><div class='hunk'>@@ -1000,8 +1008,9 @@ irqreturn_t liquidio_legacy_intr_handler(int irq __attribute__((unused)),</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Setup interrupt for octeon device</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * octeon_setup_interrupt - Setup interrupt for octeon device</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @num_ioqs: number of queues</div><div class='ctx'>  *</div><div class='ctx'>  *  Enable interrupt in Octeon device as given in the PCI interrupt mask.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1084,7 +1093,7 @@ int octeon_setup_interrupt(struct octeon_device *oct, u32 num_ioqs)</div><div class='ctx'> 		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "OCTEON: Enough MSI-X interrupts are allocated...\n");</div><div class='ctx'> </div><div class='ctx'> 		num_ioq_vectors = oct-&gt;num_msix_irqs;</div><div class='del'>-		/** For PF, there is one non-ioq interrupt handler */</div><div class='add'>+		/* For PF, there is one non-ioq interrupt handler */</div><div class='ctx'> 		if (OCTEON_CN23XX_PF(oct)) {</div><div class='ctx'> 			num_ioq_vectors -= 1;</div><div class='ctx'> </div><div class='hunk'>@@ -1127,13 +1136,13 @@ int octeon_setup_interrupt(struct octeon_device *oct, u32 num_ioqs)</div><div class='ctx'> 				dev_err(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					"Request_irq failed for MSIX interrupt Error: %d\n",</div><div class='ctx'> 					irqret);</div><div class='del'>-				/** Freeing the non-ioq irq vector here . */</div><div class='add'>+				/* Freeing the non-ioq irq vector here . */</div><div class='ctx'> 				free_irq(msix_entries[num_ioq_vectors].vector,</div><div class='ctx'> 					 oct);</div><div class='ctx'> </div><div class='ctx'> 				while (i) {</div><div class='ctx'> 					i--;</div><div class='del'>-					/** clearing affinity mask. */</div><div class='add'>+					/* clearing affinity mask. */</div><div class='ctx'> 					irq_set_affinity_hint(</div><div class='ctx'> 						      msix_entries[i].vector,</div><div class='ctx'> 						      NULL);</div><div class='hunk'>@@ -1164,7 +1173,7 @@ int octeon_setup_interrupt(struct octeon_device *oct, u32 num_ioqs)</div><div class='ctx'> 			oct-&gt;flags |= LIO_FLAG_MSI_ENABLED;</div><div class='ctx'> </div><div class='ctx'> 		/* allocate storage for the names assigned to the irq */</div><div class='del'>-		oct-&gt;irq_name_storage = kcalloc(1, INTRNAMSIZ, GFP_KERNEL);</div><div class='add'>+		oct-&gt;irq_name_storage = kzalloc(INTRNAMSIZ, GFP_KERNEL);</div><div class='ctx'> 		if (!oct-&gt;irq_name_storage)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1196,10 +1205,12 @@ int octeon_setup_interrupt(struct octeon_device *oct, u32 num_ioqs)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_setup_interrupt);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device change_mtu</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_change_mtu - Net device change_mtu</div><div class='add'>+ * @netdev: network device</div><div class='add'>+ * @new_mtu: the new max transmit unit size</div><div class='ctx'>  */</div><div class='ctx'> int liquidio_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> {</div><div class='hunk'>@@ -1251,12 +1262,13 @@ int liquidio_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 	lio-&gt;mtu = new_mtu;</div><div class='ctx'> </div><div class='ctx'> 	WRITE_ONCE(sc-&gt;caller_is_done, true);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_change_mtu);</div><div class='ctx'> </div><div class='ctx'> int lio_wait_for_clean_oq(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -1280,6 +1292,7 @@ int lio_wait_for_clean_oq(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return pending_pkts;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_wait_for_clean_oq);</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> octnet_nic_stats_callback(struct octeon_device *oct_dev,</div><div class='hunk'>@@ -1510,6 +1523,7 @@ lio_fetch_stats_exit:</div><div class='ctx'> </div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_fetch_stats);</div><div class='ctx'> </div><div class='ctx'> int liquidio_set_speed(struct lio *lio, int speed)</div><div class='ctx'> {</div><div class='hunk'>@@ -1660,6 +1674,7 @@ int liquidio_get_speed(struct lio *lio)</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_get_speed);</div><div class='ctx'> </div><div class='ctx'> int liquidio_set_fec(struct lio *lio, int on_off)</div><div class='ctx'> {</div><div class='hunk'>@@ -1813,3 +1828,4 @@ int liquidio_get_fec(struct lio *lio)</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_get_fec);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c<br/>index abe5d0dac851..c849e2c871a9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/lio_ethtool.c</a></div><div class='hunk'>@@ -15,6 +15,7 @@</div><div class='ctx'>  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or</div><div class='ctx'>  * NONINFRINGEMENT.  See the GNU General Public License for more details.</div><div class='ctx'>  ***********************************************************************/</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -441,11 +442,11 @@ lio_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	oct = lio-&gt;oct_dev;</div><div class='ctx'> </div><div class='ctx'> 	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));</div><div class='del'>-	strcpy(drvinfo-&gt;driver, "liquidio");</div><div class='del'>-	strcpy(drvinfo-&gt;version, LIQUIDIO_VERSION);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, oct-&gt;fw_info.liquidio_firmware_version,</div><div class='del'>-		ETHTOOL_FWVERS_LEN);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(oct-&gt;pci_dev), 32);</div><div class='add'>+	strscpy(drvinfo-&gt;driver, "liquidio", sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;fw_version, oct-&gt;fw_info.liquidio_firmware_version,</div><div class='add'>+		sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(oct-&gt;pci_dev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -458,11 +459,11 @@ lio_get_vf_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> 	oct = lio-&gt;oct_dev;</div><div class='ctx'> </div><div class='ctx'> 	memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));</div><div class='del'>-	strcpy(drvinfo-&gt;driver, "liquidio_vf");</div><div class='del'>-	strcpy(drvinfo-&gt;version, LIQUIDIO_VERSION);</div><div class='del'>-	strncpy(drvinfo-&gt;fw_version, oct-&gt;fw_info.liquidio_firmware_version,</div><div class='del'>-		ETHTOOL_FWVERS_LEN);</div><div class='del'>-	strncpy(drvinfo-&gt;bus_info, pci_name(oct-&gt;pci_dev), 32);</div><div class='add'>+	strscpy(drvinfo-&gt;driver, "liquidio_vf", sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;fw_version, oct-&gt;fw_info.liquidio_firmware_version,</div><div class='add'>+		sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(oct-&gt;pci_dev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int</div><div class='hunk'>@@ -948,7 +949,9 @@ static int lio_set_phys_id(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='ctx'> lio_ethtool_get_ringparam(struct net_device *netdev,</div><div class='del'>-			  struct ethtool_ringparam *ering)</div><div class='add'>+			  struct ethtool_ringparam *ering,</div><div class='add'>+			  struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='hunk'>@@ -1253,8 +1256,11 @@ static int lio_reset_queues(struct net_device *netdev, uint32_t num_qs)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int lio_ethtool_set_ringparam(struct net_device *netdev,</div><div class='del'>-				     struct ethtool_ringparam *ering)</div><div class='add'>+static int</div><div class='add'>+lio_ethtool_set_ringparam(struct net_device *netdev,</div><div class='add'>+			  struct ethtool_ringparam *ering,</div><div class='add'>+			  struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	u32 rx_count, tx_count, rx_count_old, tx_count_old;</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='hunk'>@@ -2109,7 +2115,9 @@ static int octnet_set_intrmod_cfg(struct lio *lio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lio_get_intr_coalesce(struct net_device *netdev,</div><div class='del'>-				 struct ethtool_coalesce *intr_coal)</div><div class='add'>+				 struct ethtool_coalesce *intr_coal,</div><div class='add'>+				 struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='hunk'>@@ -2413,7 +2421,9 @@ oct_cfg_tx_intrcnt(struct lio *lio,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int lio_set_intr_coalesce(struct net_device *netdev,</div><div class='del'>-				 struct ethtool_coalesce *intr_coal)</div><div class='add'>+				 struct ethtool_coalesce *intr_coal,</div><div class='add'>+				 struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2486,37 +2496,31 @@ ret_intrmod:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef PTP_HARDWARE_TIMESTAMPING</div><div class='ctx'> static int lio_get_ts_info(struct net_device *netdev,</div><div class='del'>-			   struct ethtool_ts_info *info)</div><div class='add'>+			   struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;so_timestamping =</div><div class='del'>-#ifdef PTP_HARDWARE_TIMESTAMPING</div><div class='ctx'> 		SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='ctx'> 		SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='ctx'> 		SOF_TIMESTAMPING_RAW_HARDWARE |</div><div class='del'>-		SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-#endif</div><div class='del'>-		SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-		SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+		SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='ctx'> </div><div class='ctx'> 	if (lio-&gt;ptp_clock)</div><div class='ctx'> 		info-&gt;phc_index = ptp_clock_index(lio-&gt;ptp_clock);</div><div class='del'>-	else</div><div class='del'>-		info-&gt;phc_index = -1;</div><div class='ctx'> </div><div class='del'>-#ifdef PTP_HARDWARE_TIMESTAMPING</div><div class='ctx'> 	info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) | (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='ctx'> 			   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |</div><div class='ctx'> 			   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |</div><div class='ctx'> 			   (1 &lt;&lt; HWTSTAMP_FILTER_PTP_V2_L4_EVENT);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* Return register dump len. */</div><div class='ctx'> static int lio_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -3099,7 +3103,17 @@ static int lio_set_fecparam(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define LIO_ETHTOOL_COALESCE	(ETHTOOL_COALESCE_RX_USECS |		\</div><div class='add'>+				 ETHTOOL_COALESCE_MAX_FRAMES |		\</div><div class='add'>+				 ETHTOOL_COALESCE_USE_ADAPTIVE |	\</div><div class='add'>+				 ETHTOOL_COALESCE_RX_MAX_FRAMES_LOW |	\</div><div class='add'>+				 ETHTOOL_COALESCE_TX_MAX_FRAMES_LOW |	\</div><div class='add'>+				 ETHTOOL_COALESCE_RX_MAX_FRAMES_HIGH |	\</div><div class='add'>+				 ETHTOOL_COALESCE_TX_MAX_FRAMES_HIGH |	\</div><div class='add'>+				 ETHTOOL_COALESCE_PKT_RATE_RX_USECS)</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops lio_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = LIO_ETHTOOL_COALESCE,</div><div class='ctx'> 	.get_link_ksettings	= lio_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings	= lio_set_link_ksettings,</div><div class='ctx'> 	.get_fecparam		= lio_get_fecparam,</div><div class='hunk'>@@ -3126,10 +3140,13 @@ static const struct ethtool_ops lio_ethtool_ops = {</div><div class='ctx'> 	.set_coalesce		= lio_set_intr_coalesce,</div><div class='ctx'> 	.get_priv_flags		= lio_get_priv_flags,</div><div class='ctx'> 	.set_priv_flags		= lio_set_priv_flags,</div><div class='add'>+#ifdef PTP_HARDWARE_TIMESTAMPING</div><div class='ctx'> 	.get_ts_info		= lio_get_ts_info,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops lio_vf_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = LIO_ETHTOOL_COALESCE,</div><div class='ctx'> 	.get_link_ksettings	= lio_get_link_ksettings,</div><div class='ctx'> 	.get_link		= ethtool_op_get_link,</div><div class='ctx'> 	.get_drvinfo		= lio_get_vf_drvinfo,</div><div class='hunk'>@@ -3148,7 +3165,9 @@ static const struct ethtool_ops lio_vf_ethtool_ops = {</div><div class='ctx'> 	.set_coalesce		= lio_set_intr_coalesce,</div><div class='ctx'> 	.get_priv_flags		= lio_get_priv_flags,</div><div class='ctx'> 	.set_priv_flags		= lio_set_priv_flags,</div><div class='add'>+#ifdef PTP_HARDWARE_TIMESTAMPING</div><div class='ctx'> 	.get_ts_info		= lio_get_ts_info,</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void liquidio_set_ethtool_ops(struct net_device *netdev)</div><div class='hunk'>@@ -3161,3 +3180,4 @@ void liquidio_set_ethtool_ops(struct net_device *netdev)</div><div class='ctx'> 	else</div><div class='ctx'> 		netdev-&gt;ethtool_ops = &amp;lio_ethtool_ops;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(liquidio_set_ethtool_ops);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c<br/>index eab805579f96..0732440eeacd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/lio_main.c</a></div><div class='hunk'>@@ -39,7 +39,6 @@</div><div class='ctx'> MODULE_AUTHOR("Cavium Networks, &lt;support@cavium.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Cavium LiquidIO Intelligent Server Adapter Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(LIQUIDIO_VERSION);</div><div class='ctx'> MODULE_FIRMWARE(LIO_FW_DIR LIO_FW_BASE_NAME LIO_210SV_NAME</div><div class='ctx'> 		"_" LIO_FW_NAME_TYPE_NIC LIO_FW_NAME_SUFFIX);</div><div class='ctx'> MODULE_FIRMWARE(LIO_FW_DIR LIO_FW_BASE_NAME LIO_210NV_NAME</div><div class='hunk'>@@ -70,9 +69,9 @@ MODULE_PARM_DESC(console_bitmask,</div><div class='ctx'> 		 "Bitmask indicating which consoles have debug output redirected to syslog.");</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief determines if a given console has debug enabled.</div><div class='del'>- * @param console console to check</div><div class='del'>- * @returns  1 = enabled. 0 otherwise</div><div class='add'>+ * octeon_console_debug_enabled - determines if a given console has debug enabled.</div><div class='add'>+ * @console: console to check</div><div class='add'>+ * Return:  1 = enabled. 0 otherwise</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_console_debug_enabled(u32 console)</div><div class='ctx'> {</div><div class='hunk'>@@ -93,17 +92,6 @@ static int octeon_console_debug_enabled(u32 console)</div><div class='ctx'> /* time to wait for possible in-flight requests in milliseconds */</div><div class='ctx'> #define WAIT_INFLIGHT_REQUEST	msecs_to_jiffies(1000)</div><div class='ctx'> </div><div class='del'>-struct lio_trusted_vf_ctx {</div><div class='del'>-	struct completion complete;</div><div class='del'>-	int status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct oct_link_status_resp {</div><div class='del'>-	u64 rh;</div><div class='del'>-	struct oct_link_info link_info;</div><div class='del'>-	u64 status;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct oct_timestamp_resp {</div><div class='ctx'> 	u64 rh;</div><div class='ctx'> 	u64 timestamp;</div><div class='hunk'>@@ -127,7 +115,7 @@ union tx_info {</div><div class='ctx'> 	} s;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** Octeon device properties to be used by the NIC module.</div><div class='add'>+/* Octeon device properties to be used by the NIC module.</div><div class='ctx'>  * Each octeon device in the system will be represented</div><div class='ctx'>  * by this structure in the NIC module.</div><div class='ctx'>  */</div><div class='hunk'>@@ -162,13 +150,13 @@ static int liquidio_set_vf_link_state(struct net_device *netdev, int vfidx,</div><div class='ctx'> static struct handshake handshake[MAX_OCTEON_DEVICES];</div><div class='ctx'> static struct completion first_stage;</div><div class='ctx'> </div><div class='del'>-static void octeon_droq_bh(unsigned long pdev)</div><div class='add'>+static void octeon_droq_bh(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='ctx'> 	int q_no;</div><div class='ctx'> 	int reschedule = 0;</div><div class='del'>-	struct octeon_device *oct = (struct octeon_device *)pdev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = from_tasklet(oct_priv, t,</div><div class='add'>+							  droq_tasklet);</div><div class='add'>+	struct octeon_device *oct = oct_priv-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	for (q_no = 0; q_no &lt; MAX_OCTEON_OUTPUT_QUEUES(oct); q_no++) {</div><div class='ctx'> 		if (!(oct-&gt;io_qmask.oq &amp; BIT_ULL(q_no)))</div><div class='hunk'>@@ -197,8 +185,7 @@ static void octeon_droq_bh(unsigned long pdev)</div><div class='ctx'> </div><div class='ctx'> static int lio_wait_for_oq_pkts(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	int retry = 100, pkt_cnt = 0, pending_pkts = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -223,8 +210,8 @@ static int lio_wait_for_oq_pkts(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Forces all IO queues off on a given device</div><div class='del'>- * @param oct Pointer to Octeon device</div><div class='add'>+ * force_io_queues_off - Forces all IO queues off on a given device</div><div class='add'>+ * @oct: Pointer to Octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void force_io_queues_off(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -239,8 +226,8 @@ static void force_io_queues_off(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Cause device to go quiet so it can be safely removed/reset/etc</div><div class='del'>- * @param oct Pointer to Octeon device</div><div class='add'>+ * pcierror_quiesce_device - Cause device to go quiet so it can be safely removed/reset/etc</div><div class='add'>+ * @oct: Pointer to Octeon device</div><div class='ctx'>  */</div><div class='ctx'> static inline void pcierror_quiesce_device(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -284,8 +271,8 @@ static inline void pcierror_quiesce_device(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Cleanup PCI AER uncorrectable error status</div><div class='del'>- * @param dev Pointer to PCI device</div><div class='add'>+ * cleanup_aer_uncorrect_error_status - Cleanup PCI AER uncorrectable error status</div><div class='add'>+ * @dev: Pointer to PCI device</div><div class='ctx'>  */</div><div class='ctx'> static void cleanup_aer_uncorrect_error_status(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -304,8 +291,8 @@ static void cleanup_aer_uncorrect_error_status(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Stop all PCI IO to a given device</div><div class='del'>- * @param dev Pointer to Octeon device</div><div class='add'>+ * stop_pci_io - Stop all PCI IO to a given device</div><div class='add'>+ * @oct: Pointer to Octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void stop_pci_io(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -333,9 +320,9 @@ static void stop_pci_io(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief called when PCI error is detected</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='del'>- * @param state The current pci connection state</div><div class='add'>+ * liquidio_pcie_error_detected - called when PCI error is detected</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ * @state: The current pci connection state</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called after a PCI bus error affecting</div><div class='ctx'>  * this device has been detected.</div><div class='hunk'>@@ -363,11 +350,10 @@ static pci_ers_result_t liquidio_pcie_error_detected(struct pci_dev *pdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief mmio handler</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='add'>+ * liquidio_pcie_mmio_enabled - mmio handler</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='ctx'>  */</div><div class='del'>-static pci_ers_result_t liquidio_pcie_mmio_enabled(</div><div class='del'>-				struct pci_dev *pdev __attribute__((unused)))</div><div class='add'>+static pci_ers_result_t liquidio_pcie_mmio_enabled(struct pci_dev __maybe_unused *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	/* We should never hit this since we never ask for a reset for a Fatal</div><div class='ctx'> 	 * Error. We always return DISCONNECT in io_error above.</div><div class='hunk'>@@ -377,14 +363,13 @@ static pci_ers_result_t liquidio_pcie_mmio_enabled(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief called after the pci bus has been reset.</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='add'>+ * liquidio_pcie_slot_reset - called after the pci bus has been reset.</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='ctx'>  *</div><div class='ctx'>  * Restart the card from scratch, as if from a cold-boot. Implementation</div><div class='ctx'>  * resembles the first-half of the octeon_resume routine.</div><div class='ctx'>  */</div><div class='del'>-static pci_ers_result_t liquidio_pcie_slot_reset(</div><div class='del'>-				struct pci_dev *pdev __attribute__((unused)))</div><div class='add'>+static pci_ers_result_t liquidio_pcie_slot_reset(struct pci_dev __maybe_unused *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	/* We should never hit this since we never ask for a reset for a Fatal</div><div class='ctx'> 	 * Error. We always return DISCONNECT in io_error above.</div><div class='hunk'>@@ -394,39 +379,20 @@ static pci_ers_result_t liquidio_pcie_slot_reset(</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief called when traffic can start flowing again.</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='add'>+ * liquidio_pcie_resume - called when traffic can start flowing again.</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='ctx'>  *</div><div class='ctx'>  * This callback is called when the error recovery driver tells us that</div><div class='ctx'>  * its OK to resume normal operation. Implementation resembles the</div><div class='ctx'>  * second-half of the octeon_resume routine.</div><div class='ctx'>  */</div><div class='del'>-static void liquidio_pcie_resume(struct pci_dev *pdev __attribute__((unused)))</div><div class='add'>+static void liquidio_pcie_resume(struct pci_dev __maybe_unused *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	/* Nothing to be done here. */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-/**</div><div class='del'>- * \brief called when suspending</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='del'>- * @param state state to suspend to</div><div class='del'>- */</div><div class='del'>-static int liquidio_suspend(struct pci_dev *pdev __attribute__((unused)),</div><div class='del'>-			    pm_message_t state __attribute__((unused)))</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * \brief called when resuming</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='del'>- */</div><div class='del'>-static int liquidio_resume(struct pci_dev *pdev __attribute__((unused)))</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='add'>+#define liquidio_suspend NULL</div><div class='add'>+#define liquidio_resume NULL</div><div class='ctx'> </div><div class='ctx'> /* For PCI-E Advanced Error Recovery (AER) Interface */</div><div class='ctx'> static const struct pci_error_handlers liquidio_err_handler = {</div><div class='hunk'>@@ -452,24 +418,22 @@ static const struct pci_device_id liquidio_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, liquidio_pci_tbl);</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(liquidio_pm_ops, liquidio_suspend, liquidio_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver liquidio_pci_driver = {</div><div class='ctx'> 	.name		= "LiquidIO",</div><div class='ctx'> 	.id_table	= liquidio_pci_tbl,</div><div class='ctx'> 	.probe		= liquidio_probe,</div><div class='ctx'> 	.remove		= liquidio_remove,</div><div class='ctx'> 	.err_handler	= &amp;liquidio_err_handler,    /* For AER */</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= liquidio_suspend,</div><div class='del'>-	.resume		= liquidio_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver.pm	= &amp;liquidio_pm_ops,</div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='ctx'> 	.sriov_configure = liquidio_enable_sriov,</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief register PCI driver</div><div class='add'>+ * liquidio_init_pci - register PCI driver</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_init_pci(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -477,7 +441,7 @@ static int liquidio_init_pci(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief unregister PCI driver</div><div class='add'>+ * liquidio_deinit_pci - unregister PCI driver</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_deinit_pci(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -485,9 +449,9 @@ static void liquidio_deinit_pci(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Check Tx queue status, and take appropriate action</div><div class='del'>- * @param lio per-network private data</div><div class='del'>- * @returns 0 if full, number of queues woken up otherwise</div><div class='add'>+ * check_txq_status - Check Tx queue status, and take appropriate action</div><div class='add'>+ * @lio: per-network private data</div><div class='add'>+ * Return: 0 if full, number of queues woken up otherwise</div><div class='ctx'>  */</div><div class='ctx'> static inline int check_txq_status(struct lio *lio)</div><div class='ctx'> {</div><div class='hunk'>@@ -513,8 +477,8 @@ static inline int check_txq_status(struct lio *lio)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Print link information</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * print_link_info -  Print link information</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static void print_link_info(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -535,8 +499,8 @@ static void print_link_info(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Routine to notify MTU change</div><div class='del'>- * @param work work_struct data structure</div><div class='add'>+ * octnet_link_status_change - Routine to notify MTU change</div><div class='add'>+ * @work: work_struct data structure</div><div class='ctx'>  */</div><div class='ctx'> static void octnet_link_status_change(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -553,8 +517,8 @@ static void octnet_link_status_change(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Sets up the mtu status change work</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * setup_link_status_change_wq - Sets up the mtu status change work</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static inline int setup_link_status_change_wq(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -562,7 +526,8 @@ static inline int setup_link_status_change_wq(struct net_device *netdev)</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='ctx'> </div><div class='ctx'> 	lio-&gt;link_status_wq.wq = alloc_workqueue("link-status",</div><div class='del'>-						 WQ_MEM_RECLAIM, 0);</div><div class='add'>+						 WQ_MEM_RECLAIM | WQ_PERCPU,</div><div class='add'>+						 0);</div><div class='ctx'> 	if (!lio-&gt;link_status_wq.wq) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "unable to create cavium link status wq\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -585,9 +550,9 @@ static inline void cleanup_link_status_change_wq(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Update link status</div><div class='del'>- * @param netdev network device</div><div class='del'>- * @param ls link status structure</div><div class='add'>+ * update_link_status - Update link status</div><div class='add'>+ * @netdev: network device</div><div class='add'>+ * @ls: link status structure</div><div class='ctx'>  *</div><div class='ctx'>  * Called on receipt of a link status response from the core application to</div><div class='ctx'>  * update each interface's link status.</div><div class='hunk'>@@ -685,10 +650,9 @@ static void lio_sync_octeon_time(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * setup_sync_octeon_time_wq - Sets up the work to periodically update</div><div class='del'>- * local time to octeon firmware</div><div class='add'>+ * setup_sync_octeon_time_wq - prepare work to periodically update local time to octeon firmware</div><div class='ctx'>  *</div><div class='del'>- * @netdev - network device which should send time update to firmware</div><div class='add'>+ * @netdev: network device which should send time update to firmware</div><div class='ctx'>  **/</div><div class='ctx'> static inline int setup_sync_octeon_time_wq(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -696,7 +660,8 @@ static inline int setup_sync_octeon_time_wq(struct net_device *netdev)</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='ctx'> </div><div class='ctx'> 	lio-&gt;sync_octeon_time_wq.wq =</div><div class='del'>-		alloc_workqueue("update-octeon-time", WQ_MEM_RECLAIM, 0);</div><div class='add'>+		alloc_workqueue("update-octeon-time",</div><div class='add'>+				WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 	if (!lio-&gt;sync_octeon_time_wq.wq) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Unable to create wq to update octeon time\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -712,10 +677,12 @@ static inline int setup_sync_octeon_time_wq(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cleanup_sync_octeon_time_wq - stop scheduling and destroy the work created</div><div class='del'>- * to periodically update local time to octeon firmware</div><div class='add'>+ * cleanup_sync_octeon_time_wq - destroy wq</div><div class='add'>+ *</div><div class='add'>+ * @netdev: network device which should send time update to firmware</div><div class='ctx'>  *</div><div class='del'>- * @netdev - network device which should send time update to firmware</div><div class='add'>+ * Stop scheduling and destroy the work created to periodically update local</div><div class='add'>+ * time to octeon firmware.</div><div class='ctx'>  **/</div><div class='ctx'> static inline void cleanup_sync_octeon_time_wq(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -850,13 +817,12 @@ static int liquidio_watchdog(void *param)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief PCI probe handler</div><div class='del'>- * @param pdev PCI device structure</div><div class='del'>- * @param ent unused</div><div class='add'>+ * liquidio_probe - PCI probe handler</div><div class='add'>+ * @pdev: PCI device structure</div><div class='add'>+ * @ent: unused</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-liquidio_probe(struct pci_dev *pdev,</div><div class='del'>-	       const struct pci_device_id *ent __attribute__((unused)))</div><div class='add'>+liquidio_probe(struct pci_dev *pdev, const struct pci_device_id __maybe_unused *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_device *oct_dev = NULL;</div><div class='ctx'> 	struct handshake *hs;</div><div class='hunk'>@@ -916,12 +882,11 @@ liquidio_probe(struct pci_dev *pdev,</div><div class='ctx'> 			bus = pdev-&gt;bus-&gt;number;</div><div class='ctx'> 			device = PCI_SLOT(pdev-&gt;devfn);</div><div class='ctx'> 			function = PCI_FUNC(pdev-&gt;devfn);</div><div class='del'>-			oct_dev-&gt;watchdog_task = kthread_create(</div><div class='del'>-			    liquidio_watchdog, oct_dev,</div><div class='del'>-			    "liowd/%02hhx:%02hhx.%hhx", bus, device, function);</div><div class='del'>-			if (!IS_ERR(oct_dev-&gt;watchdog_task)) {</div><div class='del'>-				wake_up_process(oct_dev-&gt;watchdog_task);</div><div class='del'>-			} else {</div><div class='add'>+			oct_dev-&gt;watchdog_task = kthread_run(liquidio_watchdog,</div><div class='add'>+							     oct_dev,</div><div class='add'>+							     "liowd/%02hhx:%02hhx.%hhx",</div><div class='add'>+							     bus, device, function);</div><div class='add'>+			if (IS_ERR(oct_dev-&gt;watchdog_task)) {</div><div class='ctx'> 				oct_dev-&gt;watchdog_task = NULL;</div><div class='ctx'> 				dev_err(&amp;oct_dev-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					"failed to create kernel_thread\n");</div><div class='hunk'>@@ -946,8 +911,8 @@ static bool fw_type_is_auto(void)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief PCI FLR for each Octeon device.</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * octeon_pci_flr - PCI FLR for each Octeon device.</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void octeon_pci_flr(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -973,16 +938,14 @@ static void octeon_pci_flr(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *\brief Destroy resources associated with octeon device</div><div class='del'>- * @param pdev PCI device structure</div><div class='del'>- * @param ent unused</div><div class='add'>+ * octeon_destroy_resources - Destroy resources associated with octeon device</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	int i, refcount;</div><div class='ctx'> 	struct msix_entry *msix_entries;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> </div><div class='ctx'> 	struct handshake *hs;</div><div class='ctx'> </div><div class='hunk'>@@ -999,15 +962,14 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 		schedule_timeout_uninterruptible(HZ / 10);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_HOST_OK:</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='ctx'> 	case OCT_DEV_CONSOLE_INIT_DONE:</div><div class='ctx'> 		/* Remove any consoles */</div><div class='ctx'> 		octeon_remove_consoles(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_IO_QUEUES_DONE:</div><div class='ctx'> 		if (lio_wait_for_instr_fetch(oct))</div><div class='ctx'> 			dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "IQ had pending instructions\n");</div><div class='hunk'>@@ -1049,7 +1011,7 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 		octeon_free_sc_done_list(oct);</div><div class='ctx'> 		octeon_free_sc_zombie_list(oct);</div><div class='ctx'> </div><div class='del'>-	/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_INTR_SET_DONE:</div><div class='ctx'> 		/* Disable interrupts  */</div><div class='ctx'> 		oct-&gt;fn_list.disable_interrupt(oct, OCTEON_ALL_INTR);</div><div class='hunk'>@@ -1084,17 +1046,17 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 		kfree(oct-&gt;irq_name_storage);</div><div class='ctx'> 		oct-&gt;irq_name_storage = NULL;</div><div class='ctx'> </div><div class='del'>-	/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_MSIX_ALLOC_VECTOR_DONE:</div><div class='ctx'> 		if (OCTEON_CN23XX_PF(oct))</div><div class='ctx'> 			octeon_free_ioq_vector(oct);</div><div class='ctx'> </div><div class='del'>-	/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_MBOX_SETUP_DONE:</div><div class='ctx'> 		if (OCTEON_CN23XX_PF(oct))</div><div class='ctx'> 			oct-&gt;fn_list.free_mbox(oct);</div><div class='ctx'> </div><div class='del'>-	/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_IN_RESET:</div><div class='ctx'> 	case OCT_DEV_DROQ_INIT_DONE:</div><div class='ctx'> 		/* Wait for any pending operations */</div><div class='hunk'>@@ -1117,11 +1079,11 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_RESP_LIST_INIT_DONE:</div><div class='ctx'> 		octeon_delete_response_list(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_INSTR_QUEUE_INIT_DONE:</div><div class='ctx'> 		for (i = 0; i &lt; MAX_OCTEON_INSTR_QUEUES(oct); i++) {</div><div class='ctx'> 			if (!(oct-&gt;io_qmask.iq &amp; BIT_ULL(i)))</div><div class='hunk'>@@ -1132,16 +1094,16 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 		if (oct-&gt;sriov_info.sriov_enabled)</div><div class='ctx'> 			pci_disable_sriov(oct-&gt;pci_dev);</div><div class='ctx'> #endif</div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_SC_BUFF_POOL_INIT_DONE:</div><div class='ctx'> 		octeon_free_sc_buffer_pool(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_DISPATCH_INIT_DONE:</div><div class='ctx'> 		octeon_delete_dispatch_list(oct);</div><div class='ctx'> 		cancel_delayed_work_sync(&amp;oct-&gt;nic_poll_work.work);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_PCI_MAP_DONE:</div><div class='ctx'> 		refcount = octeon_deregister_device(oct);</div><div class='ctx'> </div><div class='hunk'>@@ -1159,13 +1121,12 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 		octeon_unmap_pci_barx(oct, 0);</div><div class='ctx'> 		octeon_unmap_pci_barx(oct, 1);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_PCI_ENABLE_DONE:</div><div class='del'>-		pci_clear_master(oct-&gt;pci_dev);</div><div class='ctx'> 		/* Disable the device, releasing the PCI INT */</div><div class='ctx'> 		pci_disable_device(oct-&gt;pci_dev);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_BEGIN_STATE:</div><div class='ctx'> 		/* Nothing to be done here either */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1175,11 +1136,11 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Send Rx control command</div><div class='del'>- * @param lio per-network private data</div><div class='del'>- * @param start_stop whether to start or stop</div><div class='add'>+ * send_rx_ctrl_cmd - Send Rx control command</div><div class='add'>+ * @lio: per-network private data</div><div class='add'>+ * @start_stop: whether to start or stop</div><div class='ctx'>  */</div><div class='del'>-static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='add'>+static int send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_soft_command *sc;</div><div class='ctx'> 	union octnet_cmd *ncmd;</div><div class='hunk'>@@ -1187,15 +1148,15 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	if (oct-&gt;props[lio-&gt;ifidx].rx_on == start_stop)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	sc = (struct octeon_soft_command *)</div><div class='ctx'> 		octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,</div><div class='ctx'> 					  16, 0);</div><div class='ctx'> 	if (!sc) {</div><div class='ctx'> 		netif_info(lio, rx_err, lio-&gt;netdev,</div><div class='del'>-			   "Failed to allocate octeon_soft_command\n");</div><div class='del'>-		return;</div><div class='add'>+			   "Failed to allocate octeon_soft_command struct\n");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ncmd = (union octnet_cmd *)sc-&gt;virtdptr;</div><div class='hunk'>@@ -1218,24 +1179,25 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> 	if (retval == IQ_SEND_FAILED) {</div><div class='ctx'> 		netif_info(lio, rx_err, lio-&gt;netdev, "Failed to send RX Control message\n");</div><div class='ctx'> 		octeon_free_soft_command(oct, sc);</div><div class='del'>-		return;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Sleep on a wait queue till the cond flag indicates that the</div><div class='ctx'> 		 * response arrived or timed-out.</div><div class='ctx'> 		 */</div><div class='ctx'> 		retval = wait_for_sc_completion_timeout(oct, sc, 0);</div><div class='ctx'> 		if (retval)</div><div class='del'>-			return;</div><div class='add'>+			return retval;</div><div class='ctx'> </div><div class='ctx'> 		oct-&gt;props[lio-&gt;ifidx].rx_on = start_stop;</div><div class='ctx'> 		WRITE_ONCE(sc-&gt;caller_is_done, true);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Destroy NIC device interface</div><div class='del'>- * @param oct octeon device</div><div class='del'>- * @param ifidx which interface to destroy</div><div class='add'>+ * liquidio_destroy_nic_device - Destroy NIC device interface</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @ifidx: which interface to destroy</div><div class='ctx'>  *</div><div class='ctx'>  * Cleanup associated with each interface for an Octeon device  when NIC</div><div class='ctx'>  * module is being unloaded or if initialization fails during load.</div><div class='hunk'>@@ -1243,8 +1205,7 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = oct-&gt;props[ifidx].netdev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct napi_struct *napi, *n;</div><div class='ctx'> 	struct lio *lio;</div><div class='ctx'> </div><div class='hunk'>@@ -1295,8 +1256,8 @@ static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Stop complete NIC functionality</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * liquidio_stop_nic_module - Stop complete NIC functionality</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_stop_nic_module(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -1304,6 +1265,14 @@ static int liquidio_stop_nic_module(struct octeon_device *oct)</div><div class='ctx'> 	struct lio *lio;</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "Stopping network interfaces\n");</div><div class='add'>+	device_lock(&amp;oct-&gt;pci_dev-&gt;dev);</div><div class='add'>+	if (oct-&gt;devlink) {</div><div class='add'>+		devlink_unregister(oct-&gt;devlink);</div><div class='add'>+		devlink_free(oct-&gt;devlink);</div><div class='add'>+		oct-&gt;devlink = NULL;</div><div class='add'>+	}</div><div class='add'>+	device_unlock(&amp;oct-&gt;pci_dev-&gt;dev);</div><div class='add'>+</div><div class='ctx'> 	if (!oct-&gt;ifcount) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Init for Octeon was not completed\n");</div><div class='ctx'> 		return 1;</div><div class='hunk'>@@ -1325,19 +1294,13 @@ static int liquidio_stop_nic_module(struct octeon_device *oct)</div><div class='ctx'> 	for (i = 0; i &lt; oct-&gt;ifcount; i++)</div><div class='ctx'> 		liquidio_destroy_nic_device(oct, i);</div><div class='ctx'> </div><div class='del'>-	if (oct-&gt;devlink) {</div><div class='del'>-		devlink_unregister(oct-&gt;devlink);</div><div class='del'>-		devlink_free(oct-&gt;devlink);</div><div class='del'>-		oct-&gt;devlink = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "Network interfaces stopped\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Cleans up resources at unload time</div><div class='del'>- * @param pdev PCI device structure</div><div class='add'>+ * liquidio_remove - Cleans up resources at unload time</div><div class='add'>+ * @pdev: PCI device structure</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1369,14 +1332,13 @@ static void liquidio_remove(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Identify the Octeon device and to map the BAR address space</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * octeon_chip_specific_setup - Identify the Octeon device and to map the BAR address space</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_chip_specific_setup(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	u32 dev_id, rev_id;</div><div class='ctx'> 	int ret = 1;</div><div class='del'>-	char *s;</div><div class='ctx'> </div><div class='ctx'> 	pci_read_config_dword(oct-&gt;pci_dev, 0, &amp;dev_id);</div><div class='ctx'> 	pci_read_config_dword(oct-&gt;pci_dev, 8, &amp;rev_id);</div><div class='hunk'>@@ -1386,13 +1348,11 @@ static int octeon_chip_specific_setup(struct octeon_device *oct)</div><div class='ctx'> 	case OCTEON_CN68XX_PCIID:</div><div class='ctx'> 		oct-&gt;chip_id = OCTEON_CN68XX;</div><div class='ctx'> 		ret = lio_setup_cn68xx_octeon_device(oct);</div><div class='del'>-		s = "CN68XX";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OCTEON_CN66XX_PCIID:</div><div class='ctx'> 		oct-&gt;chip_id = OCTEON_CN66XX;</div><div class='ctx'> 		ret = lio_setup_cn66xx_octeon_device(oct);</div><div class='del'>-		s = "CN66XX";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OCTEON_CN23XX_PCIID_PF:</div><div class='hunk'>@@ -1405,28 +1365,19 @@ static int octeon_chip_specific_setup(struct octeon_device *oct)</div><div class='ctx'> 			pci_sriov_set_totalvfs(oct-&gt;pci_dev,</div><div class='ctx'> 					       oct-&gt;sriov_info.max_vfs);</div><div class='ctx'> #endif</div><div class='del'>-		s = "CN23XX";</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='del'>-		s = "?";</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Unknown device found (dev_id: %x)\n",</div><div class='ctx'> 			dev_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!ret)</div><div class='del'>-		dev_info(&amp;oct-&gt;pci_dev-&gt;dev, "%s PASS%d.%d %s Version: %s\n", s,</div><div class='del'>-			 OCTEON_MAJOR_REV(oct),</div><div class='del'>-			 OCTEON_MINOR_REV(oct),</div><div class='del'>-			 octeon_get_conf(oct)-&gt;card_name,</div><div class='del'>-			 LIQUIDIO_VERSION);</div><div class='del'>-</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief PCI initialization for each Octeon device.</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * octeon_pci_os_setup - PCI initialization for each Octeon device.</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_pci_os_setup(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -1449,8 +1400,8 @@ static int octeon_pci_os_setup(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Unmap and free network buffer</div><div class='del'>- * @param buf buffer</div><div class='add'>+ * free_netbuf - Unmap and free network buffer</div><div class='add'>+ * @buf: buffer</div><div class='ctx'>  */</div><div class='ctx'> static void free_netbuf(void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1469,8 +1420,8 @@ static void free_netbuf(void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Unmap and free gather buffer</div><div class='del'>- * @param buf buffer</div><div class='add'>+ * free_netsgbuf - Unmap and free gather buffer</div><div class='add'>+ * @buf: buffer</div><div class='ctx'>  */</div><div class='ctx'> static void free_netsgbuf(void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1492,11 +1443,11 @@ static void free_netsgbuf(void *buf)</div><div class='ctx'> </div><div class='ctx'> 	i = 1;</div><div class='ctx'> 	while (frags--) {</div><div class='del'>-		struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page((lio-&gt;oct_dev)-&gt;pci_dev,</div><div class='add'>+		dma_unmap_page(&amp;lio-&gt;oct_dev-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 			       g-&gt;sg[(i &gt;&gt; 2)].ptr[(i &amp; 3)],</div><div class='del'>-			       frag-&gt;size, DMA_TO_DEVICE);</div><div class='add'>+			       skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1509,8 +1460,8 @@ static void free_netsgbuf(void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Unmap and free gather buffer with response</div><div class='del'>- * @param buf buffer</div><div class='add'>+ * free_netsgbuf_with_resp - Unmap and free gather buffer with response</div><div class='add'>+ * @buf: buffer</div><div class='ctx'>  */</div><div class='ctx'> static void free_netsgbuf_with_resp(void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1535,11 +1486,11 @@ static void free_netsgbuf_with_resp(void *buf)</div><div class='ctx'> </div><div class='ctx'> 	i = 1;</div><div class='ctx'> 	while (frags--) {</div><div class='del'>-		struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page((lio-&gt;oct_dev)-&gt;pci_dev,</div><div class='add'>+		dma_unmap_page(&amp;lio-&gt;oct_dev-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 			       g-&gt;sg[(i &gt;&gt; 2)].ptr[(i &amp; 3)],</div><div class='del'>-			       frag-&gt;size, DMA_TO_DEVICE);</div><div class='add'>+			       skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1553,14 +1504,17 @@ static void free_netsgbuf_with_resp(void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Adjust ptp frequency</div><div class='del'>- * @param ptp PTP clock info</div><div class='del'>- * @param ppb how much to adjust by, in parts-per-billion</div><div class='add'>+ * liquidio_ptp_adjfine - Adjust ptp frequency</div><div class='add'>+ * @ptp: PTP clock info</div><div class='add'>+ * @scaled_ppm: how much to adjust by, in scaled parts-per-million</div><div class='add'>+ *</div><div class='add'>+ * Scaled parts per million is ppm with a 16-bit binary fractional field.</div><div class='ctx'>  */</div><div class='del'>-static int liquidio_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='add'>+static int liquidio_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = container_of(ptp, struct lio, ptp_info);</div><div class='ctx'> 	struct octeon_device *oct = (struct octeon_device *)lio-&gt;oct_dev;</div><div class='add'>+	s32 ppb = scaled_ppm_to_ppb(scaled_ppm);</div><div class='ctx'> 	u64 comp, delta;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	bool neg_adj = false;</div><div class='hunk'>@@ -1590,9 +1544,9 @@ static int liquidio_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Adjust ptp time</div><div class='del'>- * @param ptp PTP clock info</div><div class='del'>- * @param delta how much to adjust by, in nanosecs</div><div class='add'>+ * liquidio_ptp_adjtime - Adjust ptp time</div><div class='add'>+ * @ptp: PTP clock info</div><div class='add'>+ * @delta: how much to adjust by, in nanosecs</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='ctx'> {</div><div class='hunk'>@@ -1607,9 +1561,9 @@ static int liquidio_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Get hardware clock time, including any adjustment</div><div class='del'>- * @param ptp PTP clock info</div><div class='del'>- * @param ts timespec</div><div class='add'>+ * liquidio_ptp_gettime - Get hardware clock time, including any adjustment</div><div class='add'>+ * @ptp: PTP clock info</div><div class='add'>+ * @ts: timespec</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_ptp_gettime(struct ptp_clock_info *ptp,</div><div class='ctx'> 				struct timespec64 *ts)</div><div class='hunk'>@@ -1630,9 +1584,9 @@ static int liquidio_ptp_gettime(struct ptp_clock_info *ptp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Set hardware clock time. Reset adjustment</div><div class='del'>- * @param ptp PTP clock info</div><div class='del'>- * @param ts timespec</div><div class='add'>+ * liquidio_ptp_settime - Set hardware clock time. Reset adjustment</div><div class='add'>+ * @ptp: PTP clock info</div><div class='add'>+ * @ts: timespec</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_ptp_settime(struct ptp_clock_info *ptp,</div><div class='ctx'> 				const struct timespec64 *ts)</div><div class='hunk'>@@ -1653,22 +1607,22 @@ static int liquidio_ptp_settime(struct ptp_clock_info *ptp,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Check if PTP is enabled</div><div class='del'>- * @param ptp PTP clock info</div><div class='del'>- * @param rq request</div><div class='del'>- * @param on is it on</div><div class='add'>+ * liquidio_ptp_enable - Check if PTP is enabled</div><div class='add'>+ * @ptp: PTP clock info</div><div class='add'>+ * @rq: request</div><div class='add'>+ * @on: is it on</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='del'>-liquidio_ptp_enable(struct ptp_clock_info *ptp __attribute__((unused)),</div><div class='del'>-		    struct ptp_clock_request *rq __attribute__((unused)),</div><div class='del'>-		    int on __attribute__((unused)))</div><div class='add'>+liquidio_ptp_enable(struct ptp_clock_info __maybe_unused *ptp,</div><div class='add'>+		    struct ptp_clock_request __maybe_unused *rq,</div><div class='add'>+		    int __maybe_unused on)</div><div class='ctx'> {</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Open PTP clock source</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * oct_ptp_open - Open PTP clock source</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static void oct_ptp_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1684,7 +1638,7 @@ static void oct_ptp_open(struct net_device *netdev)</div><div class='ctx'> 	lio-&gt;ptp_info.n_ext_ts = 0;</div><div class='ctx'> 	lio-&gt;ptp_info.n_per_out = 0;</div><div class='ctx'> 	lio-&gt;ptp_info.pps = 0;</div><div class='del'>-	lio-&gt;ptp_info.adjfreq = liquidio_ptp_adjfreq;</div><div class='add'>+	lio-&gt;ptp_info.adjfine = liquidio_ptp_adjfine;</div><div class='ctx'> 	lio-&gt;ptp_info.adjtime = liquidio_ptp_adjtime;</div><div class='ctx'> 	lio-&gt;ptp_info.gettime64 = liquidio_ptp_gettime;</div><div class='ctx'> 	lio-&gt;ptp_info.settime64 = liquidio_ptp_settime;</div><div class='hunk'>@@ -1700,8 +1654,8 @@ static void oct_ptp_open(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Init PTP clock</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * liquidio_ptp_init - Init PTP clock</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_ptp_init(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -1717,8 +1671,8 @@ static void liquidio_ptp_init(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Load firmware to device</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * load_firmware - Load firmware to device</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  *</div><div class='ctx'>  * Maps device to firmware filename, requests firmware, and downloads it</div><div class='ctx'>  */</div><div class='hunk'>@@ -1731,7 +1685,7 @@ static int load_firmware(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	if (fw_type_is_auto()) {</div><div class='ctx'> 		tmp_fw_type = LIO_FW_NAME_TYPE_NIC;</div><div class='del'>-		strncpy(fw_type, tmp_fw_type, sizeof(fw_type));</div><div class='add'>+		strscpy_pad(fw_type, tmp_fw_type, sizeof(fw_type));</div><div class='ctx'> 	} else {</div><div class='ctx'> 		tmp_fw_type = fw_type;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1756,8 +1710,8 @@ static int load_firmware(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Poll routine for checking transmit queue status</div><div class='del'>- * @param work work_struct data structure</div><div class='add'>+ * octnet_poll_check_txq_status - Poll routine for checking transmit queue status</div><div class='add'>+ * @work: work_struct data structure</div><div class='ctx'>  */</div><div class='ctx'> static void octnet_poll_check_txq_status(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -1773,8 +1727,8 @@ static void octnet_poll_check_txq_status(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Sets up the txq poll check</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * setup_tx_poll_fn - Sets up the txq poll check</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static inline int setup_tx_poll_fn(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1782,7 +1736,7 @@ static inline int setup_tx_poll_fn(struct net_device *netdev)</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='ctx'> </div><div class='ctx'> 	lio-&gt;txq_status_wq.wq = alloc_workqueue("txq-status",</div><div class='del'>-						WQ_MEM_RECLAIM, 0);</div><div class='add'>+						WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 	if (!lio-&gt;txq_status_wq.wq) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "unable to create cavium txq status wq\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -1806,16 +1760,16 @@ static inline void cleanup_tx_poll_fn(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device open for LiquidIO</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_open - Net device open for LiquidIO</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct napi_struct *napi, *n;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (oct-&gt;props[lio-&gt;ifidx].napi_enabled == 0) {</div><div class='ctx'> 		tasklet_disable(&amp;oct_priv-&gt;droq_tasklet);</div><div class='hunk'>@@ -1834,13 +1788,10 @@ static int liquidio_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	ifstate_set(lio, LIO_IFSTATE_RUNNING);</div><div class='ctx'> </div><div class='del'>-	if (OCTEON_CN23XX_PF(oct)) {</div><div class='del'>-		if (!oct-&gt;msix_on)</div><div class='del'>-			if (setup_tx_poll_fn(netdev))</div><div class='del'>-				return -1;</div><div class='del'>-	} else {</div><div class='del'>-		if (setup_tx_poll_fn(netdev))</div><div class='del'>-			return -1;</div><div class='add'>+	if (!OCTEON_CN23XX_PF(oct) || !oct-&gt;msix_on) {</div><div class='add'>+		ret = setup_tx_poll_fn(netdev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto err_poll;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(netdev);</div><div class='hunk'>@@ -1851,7 +1802,9 @@ static int liquidio_open(struct net_device *netdev)</div><div class='ctx'> 	netif_info(lio, ifup, lio-&gt;netdev, "Interface Open, ready for traffic\n");</div><div class='ctx'> </div><div class='ctx'> 	/* tell Octeon to start forwarding packets to host */</div><div class='del'>-	send_rx_ctrl_cmd(lio, 1);</div><div class='add'>+	ret = send_rx_ctrl_cmd(lio, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err_rx_ctrl;</div><div class='ctx'> </div><div class='ctx'> 	/* start periodical statistics fetch */</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;lio-&gt;stats_wk.work, lio_fetch_stats);</div><div class='hunk'>@@ -1863,19 +1816,40 @@ static int liquidio_open(struct net_device *netdev)</div><div class='ctx'> 		 netdev-&gt;name);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_rx_ctrl:</div><div class='add'>+	if (!OCTEON_CN23XX_PF(oct) || !oct-&gt;msix_on)</div><div class='add'>+		cleanup_tx_poll_fn(netdev);</div><div class='add'>+err_poll:</div><div class='add'>+	if (lio-&gt;ptp_clock) {</div><div class='add'>+		ptp_clock_unregister(lio-&gt;ptp_clock);</div><div class='add'>+		lio-&gt;ptp_clock = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (oct-&gt;props[lio-&gt;ifidx].napi_enabled == 1) {</div><div class='add'>+		list_for_each_entry_safe(napi, n, &amp;netdev-&gt;napi_list, dev_list)</div><div class='add'>+			napi_disable(napi);</div><div class='add'>+</div><div class='add'>+		oct-&gt;props[lio-&gt;ifidx].napi_enabled = 0;</div><div class='add'>+</div><div class='add'>+		if (OCTEON_CN23XX_PF(oct))</div><div class='add'>+			oct-&gt;droq[0]-&gt;ops.poll_mode = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device stop for LiquidIO</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_stop - Net device stop for LiquidIO</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_stop(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct napi_struct *napi, *n;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	ifstate_reset(lio, LIO_IFSTATE_RUNNING);</div><div class='ctx'> </div><div class='hunk'>@@ -1892,7 +1866,9 @@ static int liquidio_stop(struct net_device *netdev)</div><div class='ctx'> 	lio-&gt;link_changes++;</div><div class='ctx'> </div><div class='ctx'> 	/* Tell Octeon that nic interface is down. */</div><div class='del'>-	send_rx_ctrl_cmd(lio, 0);</div><div class='add'>+	ret = send_rx_ctrl_cmd(lio, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (OCTEON_CN23XX_PF(oct)) {</div><div class='ctx'> 		if (!oct-&gt;msix_on)</div><div class='hunk'>@@ -1927,12 +1903,12 @@ static int liquidio_stop(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;oct-&gt;pci_dev-&gt;dev, "%s interface is stopped\n", netdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Converts a mask based on net device flags</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * get_new_flags - Converts a mask based on net device flags</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  *</div><div class='ctx'>  * This routine generates a octnet_ifflags mask from the net device flags</div><div class='ctx'>  * received from the OS.</div><div class='hunk'>@@ -1964,8 +1940,8 @@ static inline enum octnet_ifflags get_new_flags(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device set_multicast_list</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_set_mcast_list - Net device set_multicast_list</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_set_mcast_list(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -2012,8 +1988,9 @@ static void liquidio_set_mcast_list(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device set_mac_address</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_set_mac - Net device set_mac_address</div><div class='add'>+ * @netdev: network device</div><div class='add'>+ * @p: pointer to sockaddr</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -2052,7 +2029,7 @@ static int liquidio_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	memcpy(((u8 *)&amp;lio-&gt;linfo.hw_addr) + 2, addr-&gt;sa_data, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2130,24 +2107,16 @@ liquidio_get_stats64(struct net_device *netdev,</div><div class='ctx'> 		lstats-&gt;tx_fifo_errors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * \brief Handler for SIOCSHWTSTAMP ioctl</div><div class='del'>- * @param netdev network device</div><div class='del'>- * @param ifr interface request</div><div class='del'>- * @param cmd command</div><div class='del'>- */</div><div class='del'>-static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)</div><div class='add'>+static int liquidio_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+				 struct kernel_hwtstamp_config *conf,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct hwtstamp_config conf;</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;conf, ifr-&gt;ifr_data, sizeof(conf)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (conf.flags)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (!lio-&gt;oct_dev-&gt;ptp_enable)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	switch (conf.tx_type) {</div><div class='add'>+	switch (conf-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -2155,7 +2124,7 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (conf.rx_filter) {</div><div class='add'>+	switch (conf-&gt;rx_filter) {</div><div class='ctx'> 	case HWTSTAMP_FILTER_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_FILTER_ALL:</div><div class='hunk'>@@ -2173,45 +2142,39 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='ctx'> 	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='del'>-		conf.rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		conf-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conf.rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='add'>+	if (conf-&gt;rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='ctx'> 		ifstate_set(lio, LIO_IFSTATE_RX_TIMESTAMP_ENABLED);</div><div class='ctx'> </div><div class='ctx'> 	else</div><div class='ctx'> 		ifstate_reset(lio, LIO_IFSTATE_RX_TIMESTAMP_ENABLED);</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, &amp;conf, sizeof(conf)) ? -EFAULT : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * \brief ioctl handler</div><div class='del'>- * @param netdev network device</div><div class='del'>- * @param ifr interface request</div><div class='del'>- * @param cmd command</div><div class='del'>- */</div><div class='del'>-static int liquidio_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='add'>+static int liquidio_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+				 struct kernel_hwtstamp_config *conf)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> </div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		if (lio-&gt;oct_dev-&gt;ptp_enable)</div><div class='del'>-			return hwtstamp_ioctl(netdev, ifr);</div><div class='del'>-		/* fall through */</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	/* TX timestamping is technically always on */</div><div class='add'>+	conf-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+	conf-&gt;rx_filter = ifstate_check(lio, LIO_IFSTATE_RX_TIMESTAMP_ENABLED) ?</div><div class='add'>+			  HWTSTAMP_FILTER_ALL : HWTSTAMP_FILTER_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief handle a Tx timestamp response</div><div class='del'>- * @param status response status</div><div class='del'>- * @param buf pointer to skb</div><div class='add'>+ * handle_timestamp - handle a Tx timestamp response</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @status: response status</div><div class='add'>+ * @buf: pointer to skb</div><div class='ctx'>  */</div><div class='ctx'> static void handle_timestamp(struct octeon_device *oct,</div><div class='ctx'> 			     u32 status,</div><div class='hunk'>@@ -2252,10 +2215,12 @@ static void handle_timestamp(struct octeon_device *oct,</div><div class='ctx'> 	tx_buffer_free(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* \brief Send a data packet that will be timestamped</div><div class='del'>- * @param oct octeon device</div><div class='del'>- * @param ndata pointer to network data</div><div class='del'>- * @param finfo pointer to private network data</div><div class='add'>+/**</div><div class='add'>+ * send_nic_timestamp_pkt - Send a data packet that will be timestamped</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @ndata: pointer to network data</div><div class='add'>+ * @finfo: pointer to private network data</div><div class='add'>+ * @xmit_more: more is coming</div><div class='ctx'>  */</div><div class='ctx'> static inline int send_nic_timestamp_pkt(struct octeon_device *oct,</div><div class='ctx'> 					 struct octnic_data_pkt *ndata,</div><div class='hunk'>@@ -2311,10 +2276,12 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** \brief Transmit networks packets to the Octeon interface</div><div class='del'>- * @param skbuff   skbuff struct to be passed to network layer.</div><div class='del'>- * @param netdev    pointer to network device</div><div class='del'>- * @returns whether the packet was transmitted to the device okay or not</div><div class='add'>+/**</div><div class='add'>+ * liquidio_xmit - Transmit networks packets to the Octeon interface</div><div class='add'>+ * @skb: skbuff struct to be passed to network layer.</div><div class='add'>+ * @netdev: pointer to network device</div><div class='add'>+ *</div><div class='add'>+ * Return: whether the packet was transmitted to the device okay or not</div><div class='ctx'>  *             (NETDEV_TX_OK or NETDEV_TX_BUSY)</div><div class='ctx'>  */</div><div class='ctx'> static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='hunk'>@@ -2424,7 +2391,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='ctx'> 		int i, frags;</div><div class='del'>-		struct skb_frag_struct *frag;</div><div class='add'>+		skb_frag_t *frag;</div><div class='ctx'> 		struct octnic_gather *g;</div><div class='ctx'> </div><div class='ctx'> 		spin_lock(&amp;lio-&gt;glist_lock[q_idx]);</div><div class='hunk'>@@ -2462,11 +2429,9 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 			frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='ctx'> 			g-&gt;sg[(i &gt;&gt; 2)].ptr[(i &amp; 3)] =</div><div class='del'>-				dma_map_page(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='del'>-					     frag-&gt;page.p,</div><div class='del'>-					     frag-&gt;page_offset,</div><div class='del'>-					     frag-&gt;size,</div><div class='del'>-					     DMA_TO_DEVICE);</div><div class='add'>+				skb_frag_dma_map(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='add'>+					         frag, 0, skb_frag_size(frag),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			if (dma_mapping_error(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					      g-&gt;sg[i &gt;&gt; 2].ptr[i &amp; 3])) {</div><div class='hunk'>@@ -2478,7 +2443,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 					frag = &amp;skb_shinfo(skb)-&gt;frags[j - 1];</div><div class='ctx'> 					dma_unmap_page(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						       g-&gt;sg[j &gt;&gt; 2].ptr[j &amp; 3],</div><div class='del'>-						       frag-&gt;size,</div><div class='add'>+						       skb_frag_size(frag),</div><div class='ctx'> 						       DMA_TO_DEVICE);</div><div class='ctx'> 				}</div><div class='ctx'> 				dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s DMA mapping error 3\n",</div><div class='hunk'>@@ -2486,7 +2451,8 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 				return NETDEV_TX_BUSY;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			add_sg_size(&amp;g-&gt;sg[(i &gt;&gt; 2)], frag-&gt;size, (i &amp; 3));</div><div class='add'>+			add_sg_size(&amp;g-&gt;sg[(i &gt;&gt; 2)], skb_frag_size(frag),</div><div class='add'>+				    (i &amp; 3));</div><div class='ctx'> 			i++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -2560,10 +2526,12 @@ lio_xmit_failed:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** \brief Network device Tx timeout</div><div class='del'>- * @param netdev    pointer to network device</div><div class='add'>+/**</div><div class='add'>+ * liquidio_tx_timeout - Network device Tx timeout</div><div class='add'>+ * @netdev:    pointer to network device</div><div class='add'>+ * @txqueue: index of the hung transmit queue</div><div class='ctx'>  */</div><div class='del'>-static void liquidio_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void liquidio_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio;</div><div class='ctx'> </div><div class='hunk'>@@ -2633,12 +2601,12 @@ static int liquidio_vlan_rx_kill_vid(struct net_device *netdev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** Sending command to enable/disable RX checksum offload</div><div class='del'>- * @param netdev                pointer to network device</div><div class='del'>- * @param command               OCTNET_CMD_TNL_RX_CSUM_CTL</div><div class='del'>- * @param rx_cmd_bit            OCTNET_CMD_RXCSUM_ENABLE/</div><div class='del'>- *                              OCTNET_CMD_RXCSUM_DISABLE</div><div class='del'>- * @returns                     SUCCESS or FAILURE</div><div class='add'>+/**</div><div class='add'>+ * liquidio_set_rxcsum_command - Sending command to enable/disable RX checksum offload</div><div class='add'>+ * @netdev:                pointer to network device</div><div class='add'>+ * @command:               OCTNET_CMD_TNL_RX_CSUM_CTL</div><div class='add'>+ * @rx_cmd:                OCTNET_CMD_RXCSUM_ENABLE/OCTNET_CMD_RXCSUM_DISABLE</div><div class='add'>+ * Returns:                SUCCESS or FAILURE</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_set_rxcsum_command(struct net_device *netdev, int command,</div><div class='ctx'> 				       u8 rx_cmd)</div><div class='hunk'>@@ -2668,13 +2636,14 @@ static int liquidio_set_rxcsum_command(struct net_device *netdev, int command,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** Sending command to add/delete VxLAN UDP port to firmware</div><div class='del'>- * @param netdev                pointer to network device</div><div class='del'>- * @param command               OCTNET_CMD_VXLAN_PORT_CONFIG</div><div class='del'>- * @param vxlan_port            VxLAN port to be added or deleted</div><div class='del'>- * @param vxlan_cmd_bit         OCTNET_CMD_VXLAN_PORT_ADD,</div><div class='add'>+/**</div><div class='add'>+ * liquidio_vxlan_port_command - Sending command to add/delete VxLAN UDP port to firmware</div><div class='add'>+ * @netdev:                pointer to network device</div><div class='add'>+ * @command:               OCTNET_CMD_VXLAN_PORT_CONFIG</div><div class='add'>+ * @vxlan_port:            VxLAN port to be added or deleted</div><div class='add'>+ * @vxlan_cmd_bit:         OCTNET_CMD_VXLAN_PORT_ADD,</div><div class='ctx'>  *                              OCTNET_CMD_VXLAN_PORT_DEL</div><div class='del'>- * @returns                     SUCCESS or FAILURE</div><div class='add'>+ * Return:                     SUCCESS or FAILURE</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_vxlan_port_command(struct net_device *netdev, int command,</div><div class='ctx'> 				       u16 vxlan_port, u8 vxlan_cmd_bit)</div><div class='hunk'>@@ -2705,10 +2674,40 @@ static int liquidio_vxlan_port_command(struct net_device *netdev, int command,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** \brief Net device fix features</div><div class='del'>- * @param netdev  pointer to network device</div><div class='del'>- * @param request features requested</div><div class='del'>- * @returns updated features list</div><div class='add'>+static int liquidio_udp_tunnel_set_port(struct net_device *netdev,</div><div class='add'>+					unsigned int table, unsigned int entry,</div><div class='add'>+					struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return liquidio_vxlan_port_command(netdev,</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='add'>+					   htons(ti-&gt;port),</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_ADD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int liquidio_udp_tunnel_unset_port(struct net_device *netdev,</div><div class='add'>+					  unsigned int table,</div><div class='add'>+					  unsigned int entry,</div><div class='add'>+					  struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return liquidio_vxlan_port_command(netdev,</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='add'>+					   htons(ti-&gt;port),</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct udp_tunnel_nic_info liquidio_udp_tunnels = {</div><div class='add'>+	.set_port	= liquidio_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= liquidio_udp_tunnel_unset_port,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1024, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * liquidio_fix_features - Net device fix features</div><div class='add'>+ * @netdev:  pointer to network device</div><div class='add'>+ * @request: features requested</div><div class='add'>+ * Return: updated features list</div><div class='ctx'>  */</div><div class='ctx'> static netdev_features_t liquidio_fix_features(struct net_device *netdev,</div><div class='ctx'> 					       netdev_features_t request)</div><div class='hunk'>@@ -2744,9 +2743,10 @@ static netdev_features_t liquidio_fix_features(struct net_device *netdev,</div><div class='ctx'> 	return request;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** \brief Net device set features</div><div class='del'>- * @param netdev  pointer to network device</div><div class='del'>- * @param features features to enable/disable</div><div class='add'>+/**</div><div class='add'>+ * liquidio_set_features - Net device set features</div><div class='add'>+ * @netdev:  pointer to network device</div><div class='add'>+ * @features: features to enable/disable</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_set_features(struct net_device *netdev,</div><div class='ctx'> 				 netdev_features_t features)</div><div class='hunk'>@@ -2793,30 +2793,6 @@ static int liquidio_set_features(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void liquidio_add_vxlan_port(struct net_device *netdev,</div><div class='del'>-				    struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	liquidio_vxlan_port_command(netdev,</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='del'>-				    htons(ti-&gt;port),</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_ADD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void liquidio_del_vxlan_port(struct net_device *netdev,</div><div class='del'>-				    struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	liquidio_vxlan_port_command(netdev,</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='del'>-				    htons(ti-&gt;port),</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_DEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int __liquidio_set_vf_mac(struct net_device *netdev, int vfidx,</div><div class='ctx'> 				 u8 *mac, bool is_admin_assigned)</div><div class='ctx'> {</div><div class='hunk'>@@ -3240,11 +3216,8 @@ static const struct net_device_ops lionetdevops = {</div><div class='ctx'> 	.ndo_vlan_rx_add_vid    = liquidio_vlan_rx_add_vid,</div><div class='ctx'> 	.ndo_vlan_rx_kill_vid   = liquidio_vlan_rx_kill_vid,</div><div class='ctx'> 	.ndo_change_mtu		= liquidio_change_mtu,</div><div class='del'>-	.ndo_do_ioctl		= liquidio_ioctl,</div><div class='ctx'> 	.ndo_fix_features	= liquidio_fix_features,</div><div class='ctx'> 	.ndo_set_features	= liquidio_set_features,</div><div class='del'>-	.ndo_udp_tunnel_add	= liquidio_add_vxlan_port,</div><div class='del'>-	.ndo_udp_tunnel_del	= liquidio_del_vxlan_port,</div><div class='ctx'> 	.ndo_set_vf_mac		= liquidio_set_vf_mac,</div><div class='ctx'> 	.ndo_set_vf_vlan	= liquidio_set_vf_vlan,</div><div class='ctx'> 	.ndo_get_vf_config	= liquidio_get_vf_config,</div><div class='hunk'>@@ -3253,9 +3226,12 @@ static const struct net_device_ops lionetdevops = {</div><div class='ctx'> 	.ndo_set_vf_link_state  = liquidio_set_vf_link_state,</div><div class='ctx'> 	.ndo_get_vf_stats	= liquidio_get_vf_stats,</div><div class='ctx'> 	.ndo_get_port_parent_id	= liquidio_get_port_parent_id,</div><div class='add'>+	.ndo_hwtstamp_get	= liquidio_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= liquidio_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/** \brief Entry point for the liquidio module</div><div class='add'>+/**</div><div class='add'>+ * liquidio_init - Entry point for the liquidio module</div><div class='ctx'>  */</div><div class='ctx'> static int __init liquidio_init(void)</div><div class='ctx'> {</div><div class='hunk'>@@ -3338,8 +3314,8 @@ nic_info_err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Setup network interfaces</div><div class='del'>- * @param octeon_dev  octeon device</div><div class='add'>+ * setup_nic_devices - Setup network interfaces</div><div class='add'>+ * @octeon_dev:  octeon device</div><div class='ctx'>  *</div><div class='ctx'>  * Called during init time for each device. It assumes the NIC</div><div class='ctx'>  * is already up and running.  The link information for each</div><div class='hunk'>@@ -3583,7 +3559,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> 					      | NETIF_F_TSO | NETIF_F_TSO6</div><div class='ctx'> 					      | NETIF_F_LRO;</div><div class='ctx'> 		}</div><div class='del'>-		netif_set_gso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);</div><div class='add'>+		netif_set_tso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		/*  Copy of transmit encapsulation capabilities:</div><div class='ctx'> 		 *  TSO, TSO6, Checksums for this device</div><div class='hunk'>@@ -3599,6 +3575,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> 		netdev-&gt;hw_enc_features = (lio-&gt;enc_dev_capability &amp;</div><div class='ctx'> 					   ~NETIF_F_LRO);</div><div class='ctx'> </div><div class='add'>+		netdev-&gt;udp_tunnel_nic_info = &amp;liquidio_udp_tunnels;</div><div class='add'>+</div><div class='ctx'> 		lio-&gt;dev_capability |= NETIF_F_GSO_UDP_TUNNEL;</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;vlan_features = lio-&gt;dev_capability;</div><div class='hunk'>@@ -3648,7 +3626,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> </div><div class='ctx'> 		/* Copy MAC Address to OS network device structure */</div><div class='ctx'> </div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, mac);</div><div class='add'>+		eth_hw_addr_set(netdev, mac);</div><div class='ctx'> </div><div class='ctx'> 		/* By default all interfaces on a single Octeon uses the same</div><div class='ctx'> 		 * tx and rx queues</div><div class='hunk'>@@ -3765,9 +3743,12 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	device_lock(&amp;octeon_dev-&gt;pci_dev-&gt;dev);</div><div class='ctx'> 	devlink = devlink_alloc(&amp;liquidio_devlink_ops,</div><div class='del'>-				sizeof(struct lio_devlink_priv));</div><div class='add'>+				sizeof(struct lio_devlink_priv),</div><div class='add'>+				&amp;octeon_dev-&gt;pci_dev-&gt;dev);</div><div class='ctx'> 	if (!devlink) {</div><div class='add'>+		device_unlock(&amp;octeon_dev-&gt;pci_dev-&gt;dev);</div><div class='ctx'> 		dev_err(&amp;octeon_dev-&gt;pci_dev-&gt;dev, "devlink alloc failed\n");</div><div class='ctx'> 		goto setup_nic_dev_free;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3775,15 +3756,10 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> 	lio_devlink = devlink_priv(devlink);</div><div class='ctx'> 	lio_devlink-&gt;oct = octeon_dev;</div><div class='ctx'> </div><div class='del'>-	if (devlink_register(devlink, &amp;octeon_dev-&gt;pci_dev-&gt;dev)) {</div><div class='del'>-		devlink_free(devlink);</div><div class='del'>-		dev_err(&amp;octeon_dev-&gt;pci_dev-&gt;dev,</div><div class='del'>-			"devlink registration failed\n");</div><div class='del'>-		goto setup_nic_dev_free;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	octeon_dev-&gt;devlink = devlink;</div><div class='ctx'> 	octeon_dev-&gt;eswitch_mode = DEVLINK_ESWITCH_MODE_LEGACY;</div><div class='add'>+	devlink_register(devlink);</div><div class='add'>+	device_unlock(&amp;octeon_dev-&gt;pci_dev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3901,8 +3877,8 @@ static int liquidio_enable_sriov(struct pci_dev *dev, int num_vfs)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief initialize the NIC</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * liquidio_init_nic_module - initialize the NIC</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  *</div><div class='ctx'>  * This initialization routine is called once the Octeon device application is</div><div class='ctx'>  * up and running</div><div class='hunk'>@@ -3957,9 +3933,10 @@ octnet_init_failure:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief starter callback that invokes the remaining initialization work after</div><div class='del'>- * the NIC is up and running.</div><div class='del'>- * @param octptr  work struct work_struct</div><div class='add'>+ * nic_starter - finish init</div><div class='add'>+ * @work:  work struct work_struct</div><div class='add'>+ *</div><div class='add'>+ * starter callback that invokes the remaining initialization work after the NIC is up and running.</div><div class='ctx'>  */</div><div class='ctx'> static void nic_starter(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -4052,8 +4029,8 @@ octeon_recv_vf_drv_notice(struct octeon_recv_info *recv_info, void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Device initialization for each Octeon device that is probed</div><div class='del'>- * @param octeon_dev  octeon device</div><div class='add'>+ * octeon_device_init - Device initialization for each Octeon device that is probed</div><div class='add'>+ * @octeon_dev:  octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_device_init(struct octeon_device *octeon_dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -4061,8 +4038,7 @@ static int octeon_device_init(struct octeon_device *octeon_dev)</div><div class='ctx'> 	char bootcmd[] = "\n";</div><div class='ctx'> 	char *dbg_enb = NULL;</div><div class='ctx'> 	enum lio_fw_state fw_state;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)octeon_dev-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = octeon_dev-&gt;priv;</div><div class='ctx'> 	atomic_set(&amp;octeon_dev-&gt;status, OCT_DEV_BEGIN_STATE);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable access to the octeon device and make its DMA capability</div><div class='hunk'>@@ -4222,8 +4198,7 @@ static int octeon_device_init(struct octeon_device *octeon_dev)</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the tasklet that handles output queue packet processing.*/</div><div class='ctx'> 	dev_dbg(&amp;octeon_dev-&gt;pci_dev-&gt;dev, "Initializing droq tasklet\n");</div><div class='del'>-	tasklet_init(&amp;oct_priv-&gt;droq_tasklet, octeon_droq_bh,</div><div class='del'>-		     (unsigned long)octeon_dev);</div><div class='add'>+	tasklet_setup(&amp;oct_priv-&gt;droq_tasklet, octeon_droq_bh);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the interrupt handler and record the INT SUM register address</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -4327,16 +4302,17 @@ static int octeon_device_init(struct octeon_device *octeon_dev)</div><div class='ctx'> 	complete(&amp;handshake[octeon_dev-&gt;octeon_id].init);</div><div class='ctx'> </div><div class='ctx'> 	atomic_set(&amp;octeon_dev-&gt;status, OCT_DEV_HOST_OK);</div><div class='add'>+	oct_priv-&gt;dev = octeon_dev;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Debug console print function</div><div class='del'>- * @param octeon_dev  octeon device</div><div class='del'>- * @param console_num console number</div><div class='del'>- * @param prefix      first portion of line to display</div><div class='del'>- * @param suffix      second portion of line to display</div><div class='add'>+ * octeon_dbg_console_print - Debug console print function</div><div class='add'>+ * @oct:  octeon device</div><div class='add'>+ * @console_num: console number</div><div class='add'>+ * @prefix:      first portion of line to display</div><div class='add'>+ * @suffix:      second portion of line to display</div><div class='ctx'>  *</div><div class='ctx'>  * The OCTEON debug console outputs entire lines (excluding '\n').</div><div class='ctx'>  * Normally, the line will be passed in the 'prefix' parameter.</div><div class='hunk'>@@ -4359,7 +4335,7 @@ static int octeon_dbg_console_print(struct octeon_device *oct, u32 console_num,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Exits the module</div><div class='add'>+ * liquidio_exit - Exits the module</div><div class='ctx'>  */</div><div class='ctx'> static void __exit liquidio_exit(void)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c<br/>index db0b90555acb..e02942dbbcce 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/lio_vf_main.c</a></div><div class='hunk'>@@ -32,7 +32,6 @@</div><div class='ctx'> MODULE_AUTHOR("Cavium Networks, &lt;support@cavium.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Cavium LiquidIO Intelligent Server Adapter Virtual Function Driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(LIQUIDIO_VERSION);</div><div class='ctx'> </div><div class='ctx'> static int debug = -1;</div><div class='ctx'> module_param(debug, int, 0644);</div><div class='hunk'>@@ -73,8 +72,7 @@ static int liquidio_stop(struct net_device *netdev);</div><div class='ctx'> </div><div class='ctx'> static int lio_wait_for_oq_pkts(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-	    (struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	int retry = MAX_IO_PENDING_PKT_COUNT;</div><div class='ctx'> 	int pkt_cnt = 0, pending_pkts;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -100,8 +98,8 @@ static int lio_wait_for_oq_pkts(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Cause device to go quiet so it can be safely removed/reset/etc</div><div class='del'>- * @param oct Pointer to Octeon device</div><div class='add'>+ * pcierror_quiesce_device - Cause device to go quiet so it can be safely removed/reset/etc</div><div class='add'>+ * @oct: Pointer to Octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void pcierror_quiesce_device(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -144,8 +142,8 @@ static void pcierror_quiesce_device(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Cleanup PCI AER uncorrectable error status</div><div class='del'>- * @param dev Pointer to PCI device</div><div class='add'>+ * cleanup_aer_uncorrect_error_status - Cleanup PCI AER uncorrectable error status</div><div class='add'>+ * @dev: Pointer to PCI device</div><div class='ctx'>  */</div><div class='ctx'> static void cleanup_aer_uncorrect_error_status(struct pci_dev *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -164,8 +162,8 @@ static void cleanup_aer_uncorrect_error_status(struct pci_dev *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Stop all PCI IO to a given device</div><div class='del'>- * @param dev Pointer to Octeon device</div><div class='add'>+ * stop_pci_io - Stop all PCI IO to a given device</div><div class='add'>+ * @oct: Pointer to Octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void stop_pci_io(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -206,9 +204,9 @@ static void stop_pci_io(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief called when PCI error is detected</div><div class='del'>- * @param pdev Pointer to PCI device</div><div class='del'>- * @param state The current pci connection state</div><div class='add'>+ * liquidio_pcie_error_detected - called when PCI error is detected</div><div class='add'>+ * @pdev: Pointer to PCI device</div><div class='add'>+ * @state: The current pci connection state</div><div class='ctx'>  *</div><div class='ctx'>  * This function is called after a PCI bus error affecting</div><div class='ctx'>  * this device has been detected.</div><div class='hunk'>@@ -257,8 +255,8 @@ static struct pci_driver liquidio_vf_pci_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Print link information</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * print_link_info - Print link information</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static void print_link_info(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -279,8 +277,8 @@ static void print_link_info(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Routine to notify MTU change</div><div class='del'>- * @param work work_struct data structure</div><div class='add'>+ * octnet_link_status_change - Routine to notify MTU change</div><div class='add'>+ * @work: work_struct data structure</div><div class='ctx'>  */</div><div class='ctx'> static void octnet_link_status_change(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -297,8 +295,8 @@ static void octnet_link_status_change(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Sets up the mtu status change work</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * setup_link_status_change_wq - Sets up the mtu status change work</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static int setup_link_status_change_wq(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -306,7 +304,8 @@ static int setup_link_status_change_wq(struct net_device *netdev)</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='ctx'> </div><div class='ctx'> 	lio-&gt;link_status_wq.wq = alloc_workqueue("link-status",</div><div class='del'>-						 WQ_MEM_RECLAIM, 0);</div><div class='add'>+						 WQ_MEM_RECLAIM | WQ_PERCPU,</div><div class='add'>+						 0);</div><div class='ctx'> 	if (!lio-&gt;link_status_wq.wq) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "unable to create cavium link status wq\n");</div><div class='ctx'> 		return -1;</div><div class='hunk'>@@ -329,9 +328,9 @@ static void cleanup_link_status_change_wq(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Update link status</div><div class='del'>- * @param netdev network device</div><div class='del'>- * @param ls link status structure</div><div class='add'>+ * update_link_status - Update link status</div><div class='add'>+ * @netdev: network device</div><div class='add'>+ * @ls: link status structure</div><div class='ctx'>  *</div><div class='ctx'>  * Called on receipt of a link status response from the core application to</div><div class='ctx'>  * update each interface's link status.</div><div class='hunk'>@@ -375,13 +374,13 @@ static void update_link_status(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief PCI probe handler</div><div class='del'>- * @param pdev PCI device structure</div><div class='del'>- * @param ent unused</div><div class='add'>+ * liquidio_vf_probe - PCI probe handler</div><div class='add'>+ * @pdev: PCI device structure</div><div class='add'>+ * @ent: unused</div><div class='ctx'>  */</div><div class='ctx'> static int</div><div class='ctx'> liquidio_vf_probe(struct pci_dev *pdev,</div><div class='del'>-		  const struct pci_device_id *ent __attribute__((unused)))</div><div class='add'>+		  const struct pci_device_id __maybe_unused *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_device *oct_dev = NULL;</div><div class='ctx'> </div><div class='hunk'>@@ -417,8 +416,8 @@ liquidio_vf_probe(struct pci_dev *pdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief PCI FLR for each Octeon device.</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * octeon_pci_flr - PCI FLR for each Octeon device.</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void octeon_pci_flr(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -438,14 +437,12 @@ static void octeon_pci_flr(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *\brief Destroy resources associated with octeon device</div><div class='del'>- * @param pdev PCI device structure</div><div class='del'>- * @param ent unused</div><div class='add'>+ * octeon_destroy_resources - Destroy resources associated with octeon device</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct msix_entry *msix_entries;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -461,9 +458,8 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 		schedule_timeout_uninterruptible(HZ / 10);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_HOST_OK:</div><div class='del'>-		/* fallthrough */</div><div class='ctx'> 	case OCT_DEV_IO_QUEUES_DONE:</div><div class='ctx'> 		if (lio_wait_for_instr_fetch(oct))</div><div class='ctx'> 			dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "IQ had pending instructions\n");</div><div class='hunk'>@@ -505,7 +501,7 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 		octeon_free_sc_done_list(oct);</div><div class='ctx'> 		octeon_free_sc_zombie_list(oct);</div><div class='ctx'> </div><div class='del'>-	/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_INTR_SET_DONE:</div><div class='ctx'> 		/* Disable interrupts  */</div><div class='ctx'> 		oct-&gt;fn_list.disable_interrupt(oct, OCTEON_ALL_INTR);</div><div class='hunk'>@@ -529,20 +525,20 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 			oct-&gt;irq_name_storage = NULL;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Soft reset the octeon device before exiting */</div><div class='del'>-		if (oct-&gt;pci_dev-&gt;reset_fn)</div><div class='add'>+		if (!pcie_reset_flr(oct-&gt;pci_dev, PCI_RESET_PROBE))</div><div class='ctx'> 			octeon_pci_flr(oct);</div><div class='ctx'> 		else</div><div class='ctx'> 			cn23xx_vf_ask_pf_to_do_flr(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_MSIX_ALLOC_VECTOR_DONE:</div><div class='ctx'> 		octeon_free_ioq_vector(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_MBOX_SETUP_DONE:</div><div class='ctx'> 		oct-&gt;fn_list.free_mbox(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_IN_RESET:</div><div class='ctx'> 	case OCT_DEV_DROQ_INIT_DONE:</div><div class='ctx'> 		mdelay(100);</div><div class='hunk'>@@ -552,11 +548,11 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 			octeon_delete_droq(oct, i);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_RESP_LIST_INIT_DONE:</div><div class='ctx'> 		octeon_delete_response_list(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_INSTR_QUEUE_INIT_DONE:</div><div class='ctx'> 		for (i = 0; i &lt; MAX_OCTEON_INSTR_QUEUES(oct); i++) {</div><div class='ctx'> 			if (!(oct-&gt;io_qmask.iq &amp; BIT_ULL(i)))</div><div class='hunk'>@@ -564,27 +560,26 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> 			octeon_delete_instr_queue(oct, i);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_SC_BUFF_POOL_INIT_DONE:</div><div class='ctx'> 		octeon_free_sc_buffer_pool(oct);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_DISPATCH_INIT_DONE:</div><div class='ctx'> 		octeon_delete_dispatch_list(oct);</div><div class='ctx'> 		cancel_delayed_work_sync(&amp;oct-&gt;nic_poll_work.work);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_PCI_MAP_DONE:</div><div class='ctx'> 		octeon_unmap_pci_barx(oct, 0);</div><div class='ctx'> 		octeon_unmap_pci_barx(oct, 1);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_PCI_ENABLE_DONE:</div><div class='del'>-		pci_clear_master(oct-&gt;pci_dev);</div><div class='ctx'> 		/* Disable the device, releasing the PCI INT */</div><div class='ctx'> 		pci_disable_device(oct-&gt;pci_dev);</div><div class='ctx'> </div><div class='del'>-		/* fallthrough */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case OCT_DEV_BEGIN_STATE:</div><div class='ctx'> 		/* Nothing to be done here either */</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -594,11 +589,11 @@ static void octeon_destroy_resources(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Send Rx control command</div><div class='del'>- * @param lio per-network private data</div><div class='del'>- * @param start_stop whether to start or stop</div><div class='add'>+ * send_rx_ctrl_cmd - Send Rx control command</div><div class='add'>+ * @lio: per-network private data</div><div class='add'>+ * @start_stop: whether to start or stop</div><div class='ctx'>  */</div><div class='del'>-static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='add'>+static int send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_device *oct = (struct octeon_device *)lio-&gt;oct_dev;</div><div class='ctx'> 	struct octeon_soft_command *sc;</div><div class='hunk'>@@ -606,11 +601,16 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	if (oct-&gt;props[lio-&gt;ifidx].rx_on == start_stop)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	sc = (struct octeon_soft_command *)</div><div class='ctx'> 		octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,</div><div class='ctx'> 					  16, 0);</div><div class='add'>+	if (!sc) {</div><div class='add'>+		netif_info(lio, rx_err, lio-&gt;netdev,</div><div class='add'>+			   "Failed to allocate octeon_soft_command struct\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	ncmd = (union octnet_cmd *)sc-&gt;virtdptr;</div><div class='ctx'> </div><div class='hunk'>@@ -638,17 +638,19 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> 		 */</div><div class='ctx'> 		retval = wait_for_sc_completion_timeout(oct, sc, 0);</div><div class='ctx'> 		if (retval)</div><div class='del'>-			return;</div><div class='add'>+			return retval;</div><div class='ctx'> </div><div class='ctx'> 		oct-&gt;props[lio-&gt;ifidx].rx_on = start_stop;</div><div class='ctx'> 		WRITE_ONCE(sc-&gt;caller_is_done, true);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Destroy NIC device interface</div><div class='del'>- * @param oct octeon device</div><div class='del'>- * @param ifidx which interface to destroy</div><div class='add'>+ * liquidio_destroy_nic_device - Destroy NIC device interface</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @ifidx: which interface to destroy</div><div class='ctx'>  *</div><div class='ctx'>  * Cleanup associated with each interface for an Octeon device  when NIC</div><div class='ctx'>  * module is being unloaded or if initialization fails during load.</div><div class='hunk'>@@ -656,8 +658,7 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)</div><div class='ctx'> static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = oct-&gt;props[ifidx].netdev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct napi_struct *napi, *n;</div><div class='ctx'> 	struct lio *lio;</div><div class='ctx'> </div><div class='hunk'>@@ -706,8 +707,8 @@ static void liquidio_destroy_nic_device(struct octeon_device *oct, int ifidx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Stop complete NIC functionality</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * liquidio_stop_nic_module - Stop complete NIC functionality</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_stop_nic_module(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -739,8 +740,8 @@ static int liquidio_stop_nic_module(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Cleans up resources at unload time</div><div class='del'>- * @param pdev PCI device structure</div><div class='add'>+ * liquidio_vf_remove - Cleans up resources at unload time</div><div class='add'>+ * @pdev: PCI device structure</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_vf_remove(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -765,8 +766,8 @@ static void liquidio_vf_remove(struct pci_dev *pdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief PCI initialization for each Octeon device.</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * octeon_pci_os_setup - PCI initialization for each Octeon device.</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_pci_os_setup(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -794,8 +795,8 @@ static int octeon_pci_os_setup(struct octeon_device *oct)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Unmap and free network buffer</div><div class='del'>- * @param buf buffer</div><div class='add'>+ * free_netbuf - Unmap and free network buffer</div><div class='add'>+ * @buf: buffer</div><div class='ctx'>  */</div><div class='ctx'> static void free_netbuf(void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -814,8 +815,8 @@ static void free_netbuf(void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Unmap and free gather buffer</div><div class='del'>- * @param buf buffer</div><div class='add'>+ * free_netsgbuf - Unmap and free gather buffer</div><div class='add'>+ * @buf: buffer</div><div class='ctx'>  */</div><div class='ctx'> static void free_netsgbuf(void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -837,11 +838,11 @@ static void free_netsgbuf(void *buf)</div><div class='ctx'> </div><div class='ctx'> 	i = 1;</div><div class='ctx'> 	while (frags--) {</div><div class='del'>-		struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page((lio-&gt;oct_dev)-&gt;pci_dev,</div><div class='add'>+		dma_unmap_page(&amp;lio-&gt;oct_dev-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 			       g-&gt;sg[(i &gt;&gt; 2)].ptr[(i &amp; 3)],</div><div class='del'>-			       frag-&gt;size, DMA_TO_DEVICE);</div><div class='add'>+			       skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -855,8 +856,8 @@ static void free_netsgbuf(void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Unmap and free gather buffer with response</div><div class='del'>- * @param buf buffer</div><div class='add'>+ * free_netsgbuf_with_resp - Unmap and free gather buffer with response</div><div class='add'>+ * @buf: buffer</div><div class='ctx'>  */</div><div class='ctx'> static void free_netsgbuf_with_resp(void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -881,11 +882,11 @@ static void free_netsgbuf_with_resp(void *buf)</div><div class='ctx'> </div><div class='ctx'> 	i = 1;</div><div class='ctx'> 	while (frags--) {</div><div class='del'>-		struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='del'>-		pci_unmap_page((lio-&gt;oct_dev)-&gt;pci_dev,</div><div class='add'>+		dma_unmap_page(&amp;lio-&gt;oct_dev-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 			       g-&gt;sg[(i &gt;&gt; 2)].ptr[(i &amp; 3)],</div><div class='del'>-			       frag-&gt;size, DMA_TO_DEVICE);</div><div class='add'>+			       skb_frag_size(frag), DMA_TO_DEVICE);</div><div class='ctx'> 		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -899,16 +900,16 @@ static void free_netsgbuf_with_resp(void *buf)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device open for LiquidIO</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_open - Net device open for LiquidIO</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct napi_struct *napi, *n;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!oct-&gt;props[lio-&gt;ifidx].napi_enabled) {</div><div class='ctx'> 		tasklet_disable(&amp;oct_priv-&gt;droq_tasklet);</div><div class='hunk'>@@ -935,27 +936,31 @@ static int liquidio_open(struct net_device *netdev)</div><div class='ctx'> 					(LIQUIDIO_NDEV_STATS_POLL_TIME_MS));</div><div class='ctx'> </div><div class='ctx'> 	/* tell Octeon to start forwarding packets to host */</div><div class='del'>-	send_rx_ctrl_cmd(lio, 1);</div><div class='add'>+	ret = send_rx_ctrl_cmd(lio, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;oct-&gt;pci_dev-&gt;dev, "%s interface is opened\n", netdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device stop for LiquidIO</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_stop - jNet device stop for LiquidIO</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_stop(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='ctx'> 	struct octeon_device *oct = lio-&gt;oct_dev;</div><div class='del'>-	struct octeon_device_priv *oct_priv =</div><div class='del'>-		(struct octeon_device_priv *)oct-&gt;priv;</div><div class='add'>+	struct octeon_device_priv *oct_priv = oct-&gt;priv;</div><div class='ctx'> 	struct napi_struct *napi, *n;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* tell Octeon to stop forwarding packets to host */</div><div class='del'>-	send_rx_ctrl_cmd(lio, 0);</div><div class='add'>+	ret = send_rx_ctrl_cmd(lio, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	netif_info(lio, ifdown, lio-&gt;netdev, "Stopping interface!\n");</div><div class='ctx'> 	/* Inform that netif carrier is down */</div><div class='hunk'>@@ -989,12 +994,12 @@ static int liquidio_stop(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(&amp;oct-&gt;pci_dev-&gt;dev, "%s interface is stopped\n", netdev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Converts a mask based on net device flags</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * get_new_flags - Converts a mask based on net device flags</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  *</div><div class='ctx'>  * This routine generates a octnet_ifflags mask from the net device flags</div><div class='ctx'>  * received from the OS.</div><div class='hunk'>@@ -1062,8 +1067,8 @@ static void liquidio_set_uc_list(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device set_multicast_list</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_set_mcast_list - Net device set_multicast_list</div><div class='add'>+ * @netdev: network device</div><div class='ctx'>  */</div><div class='ctx'> static void liquidio_set_mcast_list(struct net_device *netdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1112,8 +1117,9 @@ static void liquidio_set_mcast_list(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Net device set_mac_address</div><div class='del'>- * @param netdev network device</div><div class='add'>+ * liquidio_set_mac - Net device set_mac_address</div><div class='add'>+ * @netdev: network device</div><div class='add'>+ * @p: opaque pointer to sockaddr</div><div class='ctx'>  */</div><div class='ctx'> static int liquidio_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> {</div><div class='hunk'>@@ -1157,7 +1163,7 @@ static int liquidio_set_mac(struct net_device *netdev, void *p)</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	ether_addr_copy(((u8 *)&amp;lio-&gt;linfo.hw_addr) + 2, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1230,24 +1236,13 @@ liquidio_get_stats64(struct net_device *netdev,</div><div class='ctx'> 		lstats-&gt;tx_carrier_errors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * \brief Handler for SIOCSHWTSTAMP ioctl</div><div class='del'>- * @param netdev network device</div><div class='del'>- * @param ifr interface request</div><div class='del'>- * @param cmd command</div><div class='del'>- */</div><div class='del'>-static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)</div><div class='add'>+static int liquidio_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+				 struct kernel_hwtstamp_config *conf,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio = GET_LIO(netdev);</div><div class='del'>-	struct hwtstamp_config conf;</div><div class='del'>-</div><div class='del'>-	if (copy_from_user(&amp;conf, ifr-&gt;ifr_data, sizeof(conf)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (conf.flags)</div><div class='del'>-		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	switch (conf.tx_type) {</div><div class='add'>+	switch (conf-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1255,7 +1250,7 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (conf.rx_filter) {</div><div class='add'>+	switch (conf-&gt;rx_filter) {</div><div class='ctx'> 	case HWTSTAMP_FILTER_NONE:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case HWTSTAMP_FILTER_ALL:</div><div class='hunk'>@@ -1273,35 +1268,31 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='ctx'> 	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='del'>-		conf.rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		conf-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (conf.rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='add'>+	if (conf-&gt;rx_filter == HWTSTAMP_FILTER_ALL)</div><div class='ctx'> 		ifstate_set(lio, LIO_IFSTATE_RX_TIMESTAMP_ENABLED);</div><div class='ctx'> </div><div class='ctx'> 	else</div><div class='ctx'> 		ifstate_reset(lio, LIO_IFSTATE_RX_TIMESTAMP_ENABLED);</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(ifr-&gt;ifr_data, &amp;conf, sizeof(conf)) ? -EFAULT : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * \brief ioctl handler</div><div class='del'>- * @param netdev network device</div><div class='del'>- * @param ifr interface request</div><div class='del'>- * @param cmd command</div><div class='del'>- */</div><div class='del'>-static int liquidio_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='add'>+static int liquidio_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+				 struct kernel_hwtstamp_config *conf)</div><div class='ctx'> {</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		return hwtstamp_ioctl(netdev, ifr);</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	struct lio *lio = GET_LIO(netdev);</div><div class='add'>+</div><div class='add'>+	/* TX timestamping is techically always on */</div><div class='add'>+	conf-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+	conf-&gt;rx_filter = ifstate_check(lio, LIO_IFSTATE_RX_TIMESTAMP_ENABLED) ?</div><div class='add'>+			  HWTSTAMP_FILTER_ALL : HWTSTAMP_FILTER_NONE;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void handle_timestamp(struct octeon_device *oct, u32 status, void *buf)</div><div class='hunk'>@@ -1341,10 +1332,10 @@ static void handle_timestamp(struct octeon_device *oct, u32 status, void *buf)</div><div class='ctx'> 	tx_buffer_free(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* \brief Send a data packet that will be timestamped</div><div class='del'>- * @param oct octeon device</div><div class='del'>- * @param ndata pointer to network data</div><div class='del'>- * @param finfo pointer to private network data</div><div class='add'>+/* send_nic_timestamp_pkt - Send a data packet that will be timestamped</div><div class='add'>+ * @oct: octeon device</div><div class='add'>+ * @ndata: pointer to network data</div><div class='add'>+ * @finfo: pointer to private network data</div><div class='ctx'>  */</div><div class='ctx'> static int send_nic_timestamp_pkt(struct octeon_device *oct,</div><div class='ctx'> 				  struct octnic_data_pkt *ndata,</div><div class='hunk'>@@ -1395,9 +1386,10 @@ static int send_nic_timestamp_pkt(struct octeon_device *oct,</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** \brief Transmit networks packets to the Octeon interface</div><div class='del'>- * @param skbuff   skbuff struct to be passed to network layer.</div><div class='del'>- * @param netdev   pointer to network device</div><div class='add'>+/**</div><div class='add'>+ * liquidio_xmit - Transmit networks packets to the Octeon interface</div><div class='add'>+ * @skb: skbuff struct to be passed to network layer.</div><div class='add'>+ * @netdev: pointer to network device</div><div class='ctx'>  * @returns whether the packet was transmitted to the device okay or not</div><div class='ctx'>  *             (NETDEV_TX_OK or NETDEV_TX_BUSY)</div><div class='ctx'>  */</div><div class='hunk'>@@ -1497,7 +1489,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		ndata.reqtype = REQTYPE_NORESP_NET;</div><div class='ctx'> </div><div class='ctx'> 	} else {</div><div class='del'>-		struct skb_frag_struct *frag;</div><div class='add'>+		skb_frag_t *frag;</div><div class='ctx'> 		struct octnic_gather *g;</div><div class='ctx'> 		int i, frags;</div><div class='ctx'> </div><div class='hunk'>@@ -1535,11 +1527,9 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 			frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='ctx'> </div><div class='ctx'> 			g-&gt;sg[(i &gt;&gt; 2)].ptr[(i &amp; 3)] =</div><div class='del'>-				dma_map_page(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='del'>-					     frag-&gt;page.p,</div><div class='del'>-					     frag-&gt;page_offset,</div><div class='del'>-					     frag-&gt;size,</div><div class='del'>-					     DMA_TO_DEVICE);</div><div class='add'>+				skb_frag_dma_map(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='add'>+						 frag, 0, skb_frag_size(frag),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			if (dma_mapping_error(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 					      g-&gt;sg[i &gt;&gt; 2].ptr[i &amp; 3])) {</div><div class='ctx'> 				dma_unmap_single(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='hunk'>@@ -1550,7 +1540,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 					frag = &amp;skb_shinfo(skb)-&gt;frags[j - 1];</div><div class='ctx'> 					dma_unmap_page(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						       g-&gt;sg[j &gt;&gt; 2].ptr[j &amp; 3],</div><div class='del'>-						       frag-&gt;size,</div><div class='add'>+						       skb_frag_size(frag),</div><div class='ctx'> 						       DMA_TO_DEVICE);</div><div class='ctx'> 				}</div><div class='ctx'> 				dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "%s DMA mapping error 3\n",</div><div class='hunk'>@@ -1558,7 +1548,8 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 				return NETDEV_TX_BUSY;</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='del'>-			add_sg_size(&amp;g-&gt;sg[(i &gt;&gt; 2)], frag-&gt;size, (i &amp; 3));</div><div class='add'>+			add_sg_size(&amp;g-&gt;sg[(i &gt;&gt; 2)], skb_frag_size(frag),</div><div class='add'>+				    (i &amp; 3));</div><div class='ctx'> 			i++;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1626,10 +1617,12 @@ lio_xmit_failed:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/** \brief Network device Tx timeout</div><div class='del'>- * @param netdev    pointer to network device</div><div class='add'>+/**</div><div class='add'>+ * liquidio_tx_timeout - Network device Tx timeout</div><div class='add'>+ * @netdev: pointer to network device</div><div class='add'>+ * @txqueue: index of the hung transmit queue</div><div class='ctx'>  */</div><div class='del'>-static void liquidio_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void liquidio_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct lio *lio;</div><div class='ctx'> </div><div class='hunk'>@@ -1769,6 +1762,35 @@ static int liquidio_vxlan_port_command(struct net_device *netdev, int command,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int liquidio_udp_tunnel_set_port(struct net_device *netdev,</div><div class='add'>+					unsigned int table, unsigned int entry,</div><div class='add'>+					struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return liquidio_vxlan_port_command(netdev,</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='add'>+					   htons(ti-&gt;port),</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_ADD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int liquidio_udp_tunnel_unset_port(struct net_device *netdev,</div><div class='add'>+					  unsigned int table,</div><div class='add'>+					  unsigned int entry,</div><div class='add'>+					  struct udp_tunnel_info *ti)</div><div class='add'>+{</div><div class='add'>+	return liquidio_vxlan_port_command(netdev,</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='add'>+					   htons(ti-&gt;port),</div><div class='add'>+					   OCTNET_CMD_VXLAN_PORT_DEL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct udp_tunnel_nic_info liquidio_udp_tunnels = {</div><div class='add'>+	.set_port	= liquidio_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= liquidio_udp_tunnel_unset_port,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1024, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /** \brief Net device fix features</div><div class='ctx'>  * @param netdev  pointer to network device</div><div class='ctx'>  * @param request features requested</div><div class='hunk'>@@ -1837,30 +1859,6 @@ static int liquidio_set_features(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void liquidio_add_vxlan_port(struct net_device *netdev,</div><div class='del'>-				    struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	liquidio_vxlan_port_command(netdev,</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='del'>-				    htons(ti-&gt;port),</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_ADD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void liquidio_del_vxlan_port(struct net_device *netdev,</div><div class='del'>-				    struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	liquidio_vxlan_port_command(netdev,</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_CONFIG,</div><div class='del'>-				    htons(ti-&gt;port),</div><div class='del'>-				    OCTNET_CMD_VXLAN_PORT_DEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct net_device_ops lionetdevops = {</div><div class='ctx'> 	.ndo_open		= liquidio_open,</div><div class='ctx'> 	.ndo_stop		= liquidio_stop,</div><div class='hunk'>@@ -1872,11 +1870,10 @@ static const struct net_device_ops lionetdevops = {</div><div class='ctx'> 	.ndo_vlan_rx_add_vid    = liquidio_vlan_rx_add_vid,</div><div class='ctx'> 	.ndo_vlan_rx_kill_vid   = liquidio_vlan_rx_kill_vid,</div><div class='ctx'> 	.ndo_change_mtu		= liquidio_change_mtu,</div><div class='del'>-	.ndo_do_ioctl		= liquidio_ioctl,</div><div class='ctx'> 	.ndo_fix_features	= liquidio_fix_features,</div><div class='ctx'> 	.ndo_set_features	= liquidio_set_features,</div><div class='del'>-	.ndo_udp_tunnel_add     = liquidio_add_vxlan_port,</div><div class='del'>-	.ndo_udp_tunnel_del     = liquidio_del_vxlan_port,</div><div class='add'>+	.ndo_hwtstamp_get	= liquidio_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= liquidio_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf)</div><div class='hunk'>@@ -1915,8 +1912,8 @@ nic_info_err:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Setup network interfaces</div><div class='del'>- * @param octeon_dev  octeon device</div><div class='add'>+ * setup_nic_devices - Setup network interfaces</div><div class='add'>+ * @octeon_dev:  octeon device</div><div class='ctx'>  *</div><div class='ctx'>  * Called during init time for each device. It assumes the NIC</div><div class='ctx'>  * is already up and running.  The link information for each</div><div class='hunk'>@@ -2082,7 +2079,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> 				      | NETIF_F_TSO | NETIF_F_TSO6</div><div class='ctx'> 				      | NETIF_F_GRO</div><div class='ctx'> 				      | NETIF_F_LRO;</div><div class='del'>-		netif_set_gso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);</div><div class='add'>+		netif_set_tso_max_size(netdev, OCTNIC_GSO_MAX_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		/* Copy of transmit encapsulation capabilities:</div><div class='ctx'> 		 * TSO, TSO6, Checksums for this device</div><div class='hunk'>@@ -2097,6 +2094,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;hw_enc_features =</div><div class='ctx'> 		    (lio-&gt;enc_dev_capability &amp; ~NETIF_F_LRO);</div><div class='add'>+		netdev-&gt;udp_tunnel_nic_info = &amp;liquidio_udp_tunnels;</div><div class='add'>+</div><div class='ctx'> 		netdev-&gt;vlan_features = lio-&gt;dev_capability;</div><div class='ctx'> 		/* Add any unchangeable hw features */</div><div class='ctx'> 		lio-&gt;dev_capability |= NETIF_F_HW_VLAN_CTAG_FILTER |</div><div class='hunk'>@@ -2131,7 +2130,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)</div><div class='ctx'> 			mac[j] = *((u8 *)(((u8 *)&amp;lio-&gt;linfo.hw_addr) + 2 + j));</div><div class='ctx'> </div><div class='ctx'> 		/* Copy MAC Address to OS network device structure */</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, mac);</div><div class='add'>+		eth_hw_addr_set(netdev, mac);</div><div class='ctx'> </div><div class='ctx'> 		if (liquidio_setup_io_queues(octeon_dev, i,</div><div class='ctx'> 					     lio-&gt;linfo.num_txpciq,</div><div class='hunk'>@@ -2225,8 +2224,8 @@ setup_nic_dev_done:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief initialize the NIC</div><div class='del'>- * @param oct octeon device</div><div class='add'>+ * liquidio_init_nic_module - initialize the NIC</div><div class='add'>+ * @oct: octeon device</div><div class='ctx'>  *</div><div class='ctx'>  * This initialization routine is called once the Octeon device application is</div><div class='ctx'>  * up and running</div><div class='hunk'>@@ -2266,8 +2265,8 @@ octnet_init_failure:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * \brief Device initialization for each Octeon device that is probed</div><div class='del'>- * @param octeon_dev  octeon device</div><div class='add'>+ * octeon_device_init - Device initialization for each Octeon device that is probed</div><div class='add'>+ * @oct:  octeon device</div><div class='ctx'>  */</div><div class='ctx'> static int octeon_device_init(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -2353,8 +2352,8 @@ static int octeon_device_init(struct octeon_device *oct)</div><div class='ctx'> 	}</div><div class='ctx'> 	atomic_set(&amp;oct-&gt;status, OCT_DEV_MSIX_ALLOC_VECTOR_DONE);</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;oct-&gt;pci_dev-&gt;dev, "OCTEON_CN23XX VF Version: %s, %d ioqs\n",</div><div class='del'>-		 LIQUIDIO_VERSION, oct-&gt;sriov_info.rings_per_vf);</div><div class='add'>+	dev_info(&amp;oct-&gt;pci_dev-&gt;dev, "OCTEON_CN23XX VF: %d ioqs\n",</div><div class='add'>+		 oct-&gt;sriov_info.rings_per_vf);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the interrupt handler and record the INT SUM register address*/</div><div class='ctx'> 	if (octeon_setup_interrupt(oct, oct-&gt;sriov_info.rings_per_vf))</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c<br/>index f3f2e71431ac..989b4ddae342 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c</a></div><div class='hunk'>@@ -31,7 +31,7 @@ static int lio_vf_rep_open(struct net_device *ndev);</div><div class='ctx'> static int lio_vf_rep_stop(struct net_device *ndev);</div><div class='ctx'> static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb,</div><div class='ctx'> 				       struct net_device *ndev);</div><div class='del'>-static void lio_vf_rep_tx_timeout(struct net_device *netdev);</div><div class='add'>+static void lio_vf_rep_tx_timeout(struct net_device *netdev, unsigned int txqueue);</div><div class='ctx'> static int lio_vf_rep_phys_port_name(struct net_device *dev,</div><div class='ctx'> 				     char *buf, size_t len);</div><div class='ctx'> static void lio_vf_rep_get_stats64(struct net_device *dev,</div><div class='hunk'>@@ -172,7 +172,7 @@ lio_vf_rep_stop(struct net_device *ndev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-lio_vf_rep_tx_timeout(struct net_device *ndev)</div><div class='add'>+lio_vf_rep_tx_timeout(struct net_device *ndev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	netif_trans_update(ndev);</div><div class='ctx'> </div><div class='hunk'>@@ -218,7 +218,7 @@ lio_vf_rep_change_mtu(struct net_device *ndev, int new_mtu)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ndev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(ndev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -272,13 +272,12 @@ lio_vf_rep_copy_packet(struct octeon_device *oct,</div><div class='ctx'> 				pg_info-&gt;page_offset;</div><div class='ctx'> 			memcpy(skb-&gt;data, va, MIN_SKB_SIZE);</div><div class='ctx'> 			skb_put(skb, MIN_SKB_SIZE);</div><div class='add'>+			skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags,</div><div class='add'>+					pg_info-&gt;page,</div><div class='add'>+					pg_info-&gt;page_offset + MIN_SKB_SIZE,</div><div class='add'>+					len - MIN_SKB_SIZE,</div><div class='add'>+					LIO_RXBUFFER_SZ);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags,</div><div class='del'>-				pg_info-&gt;page,</div><div class='del'>-				pg_info-&gt;page_offset + MIN_SKB_SIZE,</div><div class='del'>-				len - MIN_SKB_SIZE,</div><div class='del'>-				LIO_RXBUFFER_SZ);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		struct octeon_skb_page_info *pg_info =</div><div class='ctx'> 			((struct octeon_skb_page_info *)(skb-&gt;cb));</div><div class='hunk'>@@ -638,7 +637,8 @@ lio_vf_rep_netdev_event(struct notifier_block *nb,</div><div class='ctx'> 	memset(&amp;rep_cfg, 0, sizeof(rep_cfg));</div><div class='ctx'> 	rep_cfg.req_type = LIO_VF_REP_REQ_DEVNAME;</div><div class='ctx'> 	rep_cfg.ifidx = vf_rep-&gt;ifidx;</div><div class='del'>-	strncpy(rep_cfg.rep_name.name, ndev-&gt;name, LIO_IF_NAME_SIZE);</div><div class='add'>+	strscpy(rep_cfg.rep_name.name, ndev-&gt;name,</div><div class='add'>+		sizeof(rep_cfg.rep_name.name));</div><div class='ctx'> </div><div class='ctx'> 	ret = lio_vf_rep_send_soft_command(oct, &amp;rep_cfg,</div><div class='ctx'> 					   sizeof(rep_cfg), NULL, 0);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h<br/>index a5e0e9f17959..4da90757cd3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/liquidio_common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/liquidio_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/liquidio_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/liquidio_common.h</a></div><div class='hunk'>@@ -25,17 +25,11 @@</div><div class='ctx'> </div><div class='ctx'> #include "octeon_config.h"</div><div class='ctx'> </div><div class='del'>-#define LIQUIDIO_PACKAGE ""</div><div class='ctx'> #define LIQUIDIO_BASE_MAJOR_VERSION 1</div><div class='ctx'> #define LIQUIDIO_BASE_MINOR_VERSION 7</div><div class='ctx'> #define LIQUIDIO_BASE_MICRO_VERSION 2</div><div class='ctx'> #define LIQUIDIO_BASE_VERSION   __stringify(LIQUIDIO_BASE_MAJOR_VERSION) "." \</div><div class='ctx'> 				__stringify(LIQUIDIO_BASE_MINOR_VERSION)</div><div class='del'>-#define LIQUIDIO_MICRO_VERSION  "." __stringify(LIQUIDIO_BASE_MICRO_VERSION)</div><div class='del'>-#define LIQUIDIO_VERSION        LIQUIDIO_PACKAGE \</div><div class='del'>-				__stringify(LIQUIDIO_BASE_MAJOR_VERSION) "." \</div><div class='del'>-				__stringify(LIQUIDIO_BASE_MINOR_VERSION) \</div><div class='del'>-				"." __stringify(LIQUIDIO_BASE_MICRO_VERSION)</div><div class='ctx'> </div><div class='ctx'> struct lio_version {</div><div class='ctx'> 	u16  major;</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c<br/>index 0cc2338d8d2a..67c3570f875f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_console.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_console.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_console.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_console.c</a></div><div class='hunk'>@@ -15,7 +15,7 @@</div><div class='ctx'>  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or</div><div class='ctx'>  * NONINFRINGEMENT.  See the GNU General Public License for more details.</div><div class='ctx'>  ***********************************************************************/</div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * @file octeon_console.c</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='hunk'>@@ -127,11 +127,11 @@ struct octeon_pci_console_desc {</div><div class='ctx'> 	u32 pad;</div><div class='ctx'> 	/* must be 64 bit aligned here... */</div><div class='ctx'> 	/* Array of addresses of octeon_pci_console structures */</div><div class='del'>-	u64 console_addr_array[0];</div><div class='add'>+	u64 console_addr_array[];</div><div class='ctx'> 	/* Implicit storage for console_addr_array */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * This function is the implementation of the get macros defined</div><div class='ctx'>  * for individual structure members. The argument are generated</div><div class='ctx'>  * by the macros inorder to read only the needed memory.</div><div class='hunk'>@@ -160,7 +160,7 @@ static inline u64 __cvmx_bootmem_desc_get(struct octeon_device *oct,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * This function retrieves the string name of a named block. It is</div><div class='ctx'>  * more complicated than a simple memcpy() since the named block</div><div class='ctx'>  * descriptor may not be directly accessible.</div><div class='hunk'>@@ -182,7 +182,7 @@ static void CVMX_BOOTMEM_NAMED_GET_NAME(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> /* See header file for descriptions of functions */</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Check the version information on the bootmem descriptor</div><div class='ctx'>  *</div><div class='ctx'>  * @param exact_match</div><div class='hunk'>@@ -205,11 +205,11 @@ static int __cvmx_bootmem_check_version(struct octeon_device *oct,</div><div class='ctx'> 	major_version = (u32)__cvmx_bootmem_desc_get(</div><div class='ctx'> 			oct, oct-&gt;bootmem_desc_addr,</div><div class='ctx'> 			offsetof(struct cvmx_bootmem_desc, major_version),</div><div class='del'>-			FIELD_SIZEOF(struct cvmx_bootmem_desc, major_version));</div><div class='add'>+			sizeof_field(struct cvmx_bootmem_desc, major_version));</div><div class='ctx'> 	minor_version = (u32)__cvmx_bootmem_desc_get(</div><div class='ctx'> 			oct, oct-&gt;bootmem_desc_addr,</div><div class='ctx'> 			offsetof(struct cvmx_bootmem_desc, minor_version),</div><div class='del'>-			FIELD_SIZEOF(struct cvmx_bootmem_desc, minor_version));</div><div class='add'>+			sizeof_field(struct cvmx_bootmem_desc, minor_version));</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "%s: major_version=%d\n", __func__,</div><div class='ctx'> 		major_version);</div><div class='hunk'>@@ -237,18 +237,17 @@ static const struct cvmx_bootmem_named_block_desc</div><div class='ctx'> 				oct, named_addr,</div><div class='ctx'> 				offsetof(struct cvmx_bootmem_named_block_desc,</div><div class='ctx'> 					 base_addr),</div><div class='del'>-				FIELD_SIZEOF(</div><div class='add'>+				sizeof_field(</div><div class='ctx'> 					struct cvmx_bootmem_named_block_desc,</div><div class='ctx'> 					base_addr));</div><div class='ctx'> 		desc-&gt;size = __cvmx_bootmem_desc_get(oct, named_addr,</div><div class='ctx'> 				offsetof(struct cvmx_bootmem_named_block_desc,</div><div class='ctx'> 					 size),</div><div class='del'>-				FIELD_SIZEOF(</div><div class='add'>+				sizeof_field(</div><div class='ctx'> 					struct cvmx_bootmem_named_block_desc,</div><div class='ctx'> 					size));</div><div class='ctx'> </div><div class='del'>-		strncpy(desc-&gt;name, name, sizeof(desc-&gt;name));</div><div class='del'>-		desc-&gt;name[sizeof(desc-&gt;name) - 1] = 0;</div><div class='add'>+		strscpy(desc-&gt;name, name, sizeof(desc-&gt;name));</div><div class='ctx'> 		return &amp;oct-&gt;bootmem_named_block_desc;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return NULL;</div><div class='hunk'>@@ -268,20 +267,20 @@ static u64 cvmx_bootmem_phy_named_block_find(struct octeon_device *oct,</div><div class='ctx'> 					oct, oct-&gt;bootmem_desc_addr,</div><div class='ctx'> 					offsetof(struct cvmx_bootmem_desc,</div><div class='ctx'> 						 named_block_array_addr),</div><div class='del'>-					FIELD_SIZEOF(struct cvmx_bootmem_desc,</div><div class='add'>+					sizeof_field(struct cvmx_bootmem_desc,</div><div class='ctx'> 						     named_block_array_addr));</div><div class='ctx'> 		u32 num_blocks = (u32)__cvmx_bootmem_desc_get(</div><div class='ctx'> 					oct, oct-&gt;bootmem_desc_addr,</div><div class='ctx'> 					offsetof(struct cvmx_bootmem_desc,</div><div class='ctx'> 						 nb_num_blocks),</div><div class='del'>-					FIELD_SIZEOF(struct cvmx_bootmem_desc,</div><div class='add'>+					sizeof_field(struct cvmx_bootmem_desc,</div><div class='ctx'> 						     nb_num_blocks));</div><div class='ctx'> </div><div class='ctx'> 		u32 name_length = (u32)__cvmx_bootmem_desc_get(</div><div class='ctx'> 					oct, oct-&gt;bootmem_desc_addr,</div><div class='ctx'> 					offsetof(struct cvmx_bootmem_desc,</div><div class='ctx'> 						 named_block_name_len),</div><div class='del'>-					FIELD_SIZEOF(struct cvmx_bootmem_desc,</div><div class='add'>+					sizeof_field(struct cvmx_bootmem_desc,</div><div class='ctx'> 						     named_block_name_len));</div><div class='ctx'> </div><div class='ctx'> 		u64 named_addr = named_block_array_addr;</div><div class='hunk'>@@ -292,7 +291,7 @@ static u64 cvmx_bootmem_phy_named_block_find(struct octeon_device *oct,</div><div class='ctx'> 					 offsetof(</div><div class='ctx'> 					struct cvmx_bootmem_named_block_desc,</div><div class='ctx'> 					size),</div><div class='del'>-					 FIELD_SIZEOF(</div><div class='add'>+					 sizeof_field(</div><div class='ctx'> 					struct cvmx_bootmem_named_block_desc,</div><div class='ctx'> 					size));</div><div class='ctx'> </div><div class='hunk'>@@ -323,7 +322,7 @@ static u64 cvmx_bootmem_phy_named_block_find(struct octeon_device *oct,</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Find a named block on the remote Octeon</div><div class='ctx'>  *</div><div class='ctx'>  * @param name      Name of block to find</div><div class='hunk'>@@ -471,8 +470,8 @@ static void output_console_line(struct octeon_device *oct,</div><div class='ctx'> 	if (line != &amp;console_buffer[bytes_read]) {</div><div class='ctx'> 		console_buffer[bytes_read] = '\0';</div><div class='ctx'> 		len = strlen(console-&gt;leftover);</div><div class='del'>-		strncpy(&amp;console-&gt;leftover[len], line,</div><div class='del'>-			sizeof(console-&gt;leftover) - len);</div><div class='add'>+		strscpy(&amp;console-&gt;leftover[len], line,</div><div class='add'>+			sizeof(console-&gt;leftover) - len + 1);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -707,7 +706,7 @@ int octeon_add_console(struct octeon_device *oct, u32 console_num,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Removes all consoles</div><div class='ctx'>  *</div><div class='ctx'>  * @param oct         octeon device</div><div class='hunk'>@@ -840,17 +839,11 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strncmp(LIQUIDIO_PACKAGE, h-&gt;version, strlen(LIQUIDIO_PACKAGE))) {</div><div class='del'>-		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Unmatched firmware package type. Expected %s, got %s.\n",</div><div class='del'>-			LIQUIDIO_PACKAGE, h-&gt;version);</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (memcmp(LIQUIDIO_BASE_VERSION, h-&gt;version + strlen(LIQUIDIO_PACKAGE),</div><div class='add'>+	if (memcmp(LIQUIDIO_BASE_VERSION, h-&gt;version,</div><div class='ctx'> 		   strlen(LIQUIDIO_BASE_VERSION))) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Unmatched firmware version. Expected %s.x, got %s.\n",</div><div class='ctx'> 			LIQUIDIO_BASE_VERSION,</div><div class='del'>-			h-&gt;version + strlen(LIQUIDIO_PACKAGE));</div><div class='add'>+			h-&gt;version);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c<br/>index 934115d18488..1753bb87dfbd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_device.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_device.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_device.c</a></div><div class='hunk'>@@ -545,7 +545,7 @@ static atomic_t adapter_fw_states[MAX_OCTEON_DEVICES];</div><div class='ctx'> </div><div class='ctx'> static u32 octeon_device_count;</div><div class='ctx'> /* locks device array (i.e. octeon_device[]) */</div><div class='del'>-static spinlock_t octeon_devices_lock;</div><div class='add'>+static DEFINE_SPINLOCK(octeon_devices_lock);</div><div class='ctx'> </div><div class='ctx'> static struct octeon_core_setup core_setup[MAX_OCTEON_DEVICES];</div><div class='ctx'> </div><div class='hunk'>@@ -563,8 +563,8 @@ void octeon_init_device_list(int conf_type)</div><div class='ctx'> 	memset(octeon_device, 0, (sizeof(void *) * MAX_OCTEON_DEVICES));</div><div class='ctx'> 	for (i = 0; i &lt;  MAX_OCTEON_DEVICES; i++)</div><div class='ctx'> 		oct_set_config_info(i, conf_type);</div><div class='del'>-	spin_lock_init(&amp;octeon_devices_lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_init_device_list);</div><div class='ctx'> </div><div class='ctx'> static void *__retrieve_octeon_config_info(struct octeon_device *oct,</div><div class='ctx'> 					   u16 card_type)</div><div class='hunk'>@@ -634,6 +634,7 @@ char *lio_get_state_string(atomic_t *state_ptr)</div><div class='ctx'> 		return oct_dev_state_str[OCT_DEV_STATE_INVALID];</div><div class='ctx'> 	return oct_dev_state_str[istate];</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_get_state_string);</div><div class='ctx'> </div><div class='ctx'> static char *get_oct_app_string(u32 app_mode)</div><div class='ctx'> {</div><div class='hunk'>@@ -662,6 +663,7 @@ void octeon_free_device_mem(struct octeon_device *oct)</div><div class='ctx'> 	octeon_device[i] = NULL;</div><div class='ctx'> 	octeon_device_count--;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_free_device_mem);</div><div class='ctx'> </div><div class='ctx'> static struct octeon_device *octeon_allocate_device_mem(u32 pci_id,</div><div class='ctx'> 							u32 priv_size)</div><div class='hunk'>@@ -748,6 +750,7 @@ struct octeon_device *octeon_allocate_device(u32 pci_id,</div><div class='ctx'> </div><div class='ctx'> 	return oct;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_allocate_device);</div><div class='ctx'> </div><div class='ctx'> /** Register a device's bus location at initialization time.</div><div class='ctx'>  *  @param octeon_dev - pointer to the octeon device structure.</div><div class='hunk'>@@ -805,6 +808,7 @@ int octeon_register_device(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	return refcount;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_register_device);</div><div class='ctx'> </div><div class='ctx'> /** Deregister a device at de-initialization time.</div><div class='ctx'>  *  @param octeon_dev - pointer to the octeon device structure.</div><div class='hunk'>@@ -822,6 +826,7 @@ int octeon_deregister_device(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return refcount;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_deregister_device);</div><div class='ctx'> </div><div class='ctx'> int</div><div class='ctx'> octeon_allocate_ioq_vector(struct octeon_device *oct, u32 num_ioqs)</div><div class='hunk'>@@ -854,12 +859,14 @@ octeon_allocate_ioq_vector(struct octeon_device *oct, u32 num_ioqs)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_allocate_ioq_vector);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> octeon_free_ioq_vector(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	vfree(oct-&gt;ioq_vector);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_free_ioq_vector);</div><div class='ctx'> </div><div class='ctx'> /* this function is only for setting up the first queue */</div><div class='ctx'> int octeon_setup_instr_queues(struct octeon_device *oct)</div><div class='hunk'>@@ -905,6 +912,7 @@ int octeon_setup_instr_queues(struct octeon_device *oct)</div><div class='ctx'> 	oct-&gt;num_iqs++;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_setup_instr_queues);</div><div class='ctx'> </div><div class='ctx'> int octeon_setup_output_queues(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -941,6 +949,7 @@ int octeon_setup_output_queues(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_setup_output_queues);</div><div class='ctx'> </div><div class='ctx'> int octeon_set_io_queues_off(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -990,6 +999,7 @@ int octeon_set_io_queues_off(struct octeon_device *oct)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_set_io_queues_off);</div><div class='ctx'> </div><div class='ctx'> void octeon_set_droq_pkt_op(struct octeon_device *oct,</div><div class='ctx'> 			    u32 q_no,</div><div class='hunk'>@@ -1028,6 +1038,7 @@ int octeon_init_dispatch_list(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_init_dispatch_list);</div><div class='ctx'> </div><div class='ctx'> void octeon_delete_dispatch_list(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -1056,9 +1067,10 @@ void octeon_delete_dispatch_list(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_safe(temp, tmp2, &amp;freelist) {</div><div class='ctx'> 		list_del(temp);</div><div class='del'>-		vfree(temp);</div><div class='add'>+		kfree(temp);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_delete_dispatch_list);</div><div class='ctx'> </div><div class='ctx'> octeon_dispatch_fn_t</div><div class='ctx'> octeon_get_dispatch(struct octeon_device *octeon_dev, u16 opcode,</div><div class='hunk'>@@ -1152,13 +1164,10 @@ octeon_register_dispatch_fn(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 		dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 			"Adding opcode to dispatch list linked list\n");</div><div class='del'>-		dispatch = (struct octeon_dispatch *)</div><div class='del'>-			   vmalloc(sizeof(struct octeon_dispatch));</div><div class='del'>-		if (!dispatch) {</div><div class='del'>-			dev_err(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='del'>-				"No memory to add dispatch function\n");</div><div class='add'>+		dispatch = kmalloc(sizeof(*dispatch), GFP_KERNEL);</div><div class='add'>+		if (!dispatch)</div><div class='ctx'> 			return 1;</div><div class='del'>-		}</div><div class='add'>+</div><div class='ctx'> 		dispatch-&gt;opcode = combined_opcode;</div><div class='ctx'> 		dispatch-&gt;dispatch_fn = fn;</div><div class='ctx'> 		dispatch-&gt;arg = fn_arg;</div><div class='hunk'>@@ -1184,6 +1193,7 @@ octeon_register_dispatch_fn(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_register_dispatch_fn);</div><div class='ctx'> </div><div class='ctx'> int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -1207,10 +1217,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf)</div><div class='ctx'> 		goto core_drv_init_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	strncpy(app_name,</div><div class='add'>+	strscpy(app_name,</div><div class='ctx'> 		get_oct_app_string(</div><div class='ctx'> 		(u32)recv_pkt-&gt;rh.r_core_drv_init.app_mode),</div><div class='del'>-		sizeof(app_name) - 1);</div><div class='add'>+		sizeof(app_name));</div><div class='ctx'> 	oct-&gt;app_mode = (u32)recv_pkt-&gt;rh.r_core_drv_init.app_mode;</div><div class='ctx'> 	if (recv_pkt-&gt;rh.r_core_drv_init.app_mode == CVM_DRV_NIC_APP) {</div><div class='ctx'> 		oct-&gt;fw_info.max_nic_ports =</div><div class='hunk'>@@ -1247,9 +1257,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf)</div><div class='ctx'> 	memcpy(cs, get_rbd(</div><div class='ctx'> 	       recv_pkt-&gt;buffer_ptr[0]) + OCT_DROQ_INFO_SIZE, sizeof(*cs));</div><div class='ctx'> </div><div class='del'>-	strncpy(oct-&gt;boardinfo.name, cs-&gt;boardname, OCT_BOARD_NAME);</div><div class='del'>-	strncpy(oct-&gt;boardinfo.serial_number, cs-&gt;board_serial_number,</div><div class='del'>-		OCT_SERIAL_LEN);</div><div class='add'>+	strscpy(oct-&gt;boardinfo.name, cs-&gt;boardname,</div><div class='add'>+		    sizeof(oct-&gt;boardinfo.name));</div><div class='add'>+	strscpy(oct-&gt;boardinfo.serial_number, cs-&gt;board_serial_number,</div><div class='add'>+		    sizeof(oct-&gt;boardinfo.serial_number));</div><div class='ctx'> </div><div class='ctx'> 	octeon_swap_8B_data((u64 *)cs, (sizeof(*cs) &gt;&gt; 3));</div><div class='ctx'> </div><div class='hunk'>@@ -1266,6 +1277,7 @@ core_drv_init_err:</div><div class='ctx'> 	octeon_free_recv_info(recv_info);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_core_drv_init);</div><div class='ctx'> </div><div class='ctx'> int octeon_get_tx_qsize(struct octeon_device *oct, u32 q_no)</div><div class='ctx'> </div><div class='hunk'>@@ -1276,6 +1288,7 @@ int octeon_get_tx_qsize(struct octeon_device *oct, u32 q_no)</div><div class='ctx'> </div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_get_tx_qsize);</div><div class='ctx'> </div><div class='ctx'> int octeon_get_rx_qsize(struct octeon_device *oct, u32 q_no)</div><div class='ctx'> {</div><div class='hunk'>@@ -1284,6 +1297,7 @@ int octeon_get_rx_qsize(struct octeon_device *oct, u32 q_no)</div><div class='ctx'> 		return oct-&gt;droq[q_no]-&gt;max_count;</div><div class='ctx'> 	return -1;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_get_rx_qsize);</div><div class='ctx'> </div><div class='ctx'> /* Retruns the host firmware handshake OCTEON specific configuration */</div><div class='ctx'> struct octeon_config *octeon_get_conf(struct octeon_device *oct)</div><div class='hunk'>@@ -1306,11 +1320,12 @@ struct octeon_config *octeon_get_conf(struct octeon_device *oct)</div><div class='ctx'> 	}</div><div class='ctx'> 	return default_oct_conf;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_get_conf);</div><div class='ctx'> </div><div class='ctx'> /* scratch register address is same in all the OCT-II and CN70XX models */</div><div class='ctx'> #define CNXX_SLI_SCRATCH1   0x3C0</div><div class='ctx'> </div><div class='del'>-/** Get the octeon device pointer.</div><div class='add'>+/* Get the octeon device pointer.</div><div class='ctx'>  *  @param octeon_id  - The id for which the octeon device pointer is required.</div><div class='ctx'>  *  @return Success: Octeon device pointer.</div><div class='ctx'>  *  @return Failure: NULL.</div><div class='hunk'>@@ -1322,12 +1337,13 @@ struct octeon_device *lio_get_device(u32 octeon_id)</div><div class='ctx'> 	else</div><div class='ctx'> 		return octeon_device[octeon_id];</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_get_device);</div><div class='ctx'> </div><div class='ctx'> u64 lio_pci_readq(struct octeon_device *oct, u64 addr)</div><div class='ctx'> {</div><div class='ctx'> 	u64 val64;</div><div class='ctx'> 	unsigned long flags;</div><div class='del'>-	u32 val32, addrhi;</div><div class='add'>+	u32 addrhi;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;oct-&gt;pci_win_lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -1342,10 +1358,10 @@ u64 lio_pci_readq(struct octeon_device *oct, u64 addr)</div><div class='ctx'> 	writel(addrhi, oct-&gt;reg_list.pci_win_rd_addr_hi);</div><div class='ctx'> </div><div class='ctx'> 	/* Read back to preserve ordering of writes */</div><div class='del'>-	val32 = readl(oct-&gt;reg_list.pci_win_rd_addr_hi);</div><div class='add'>+	readl(oct-&gt;reg_list.pci_win_rd_addr_hi);</div><div class='ctx'> </div><div class='ctx'> 	writel(addr &amp; 0xffffffff, oct-&gt;reg_list.pci_win_rd_addr_lo);</div><div class='del'>-	val32 = readl(oct-&gt;reg_list.pci_win_rd_addr_lo);</div><div class='add'>+	readl(oct-&gt;reg_list.pci_win_rd_addr_lo);</div><div class='ctx'> </div><div class='ctx'> 	val64 = readq(oct-&gt;reg_list.pci_win_rd_data);</div><div class='ctx'> </div><div class='hunk'>@@ -1353,12 +1369,12 @@ u64 lio_pci_readq(struct octeon_device *oct, u64 addr)</div><div class='ctx'> </div><div class='ctx'> 	return val64;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_pci_readq);</div><div class='ctx'> </div><div class='ctx'> void lio_pci_writeq(struct octeon_device *oct,</div><div class='ctx'> 		    u64 val,</div><div class='ctx'> 		    u64 addr)</div><div class='ctx'> {</div><div class='del'>-	u32 val32;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;oct-&gt;pci_win_lock, flags);</div><div class='hunk'>@@ -1368,12 +1384,13 @@ void lio_pci_writeq(struct octeon_device *oct,</div><div class='ctx'> 	/* The write happens when the LSB is written. So write MSB first. */</div><div class='ctx'> 	writel(val &gt;&gt; 32, oct-&gt;reg_list.pci_win_wr_data_hi);</div><div class='ctx'> 	/* Read the MSB to ensure ordering of writes. */</div><div class='del'>-	val32 = readl(oct-&gt;reg_list.pci_win_wr_data_hi);</div><div class='add'>+	readl(oct-&gt;reg_list.pci_win_wr_data_hi);</div><div class='ctx'> </div><div class='ctx'> 	writel(val &amp; 0xffffffff, oct-&gt;reg_list.pci_win_wr_data_lo);</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_irqrestore(&amp;oct-&gt;pci_win_lock, flags);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_pci_writeq);</div><div class='ctx'> </div><div class='ctx'> int octeon_mem_access_ok(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -1393,6 +1410,7 @@ int octeon_mem_access_ok(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return access_okay ? 0 : 1;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_mem_access_ok);</div><div class='ctx'> </div><div class='ctx'> int octeon_wait_for_ddr_init(struct octeon_device *oct, u32 *timeout)</div><div class='ctx'> {</div><div class='hunk'>@@ -1413,22 +1431,7 @@ int octeon_wait_for_ddr_init(struct octeon_device *oct, u32 *timeout)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-/** Get the octeon id assigned to the octeon device passed as argument.</div><div class='del'>- *  This function is exported to other modules.</div><div class='del'>- *  @param dev - octeon device pointer passed as a void *.</div><div class='del'>- *  @return octeon device id</div><div class='del'>- */</div><div class='del'>-int lio_get_device_id(void *dev)</div><div class='del'>-{</div><div class='del'>-	struct octeon_device *octeon_dev = (struct octeon_device *)dev;</div><div class='del'>-	u32 i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; MAX_OCTEON_DEVICES; i++)</div><div class='del'>-		if (octeon_device[i] == octeon_dev)</div><div class='del'>-			return octeon_dev-&gt;octeon_id;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_wait_for_ddr_init);</div><div class='ctx'> </div><div class='ctx'> void lio_enable_irq(struct octeon_droq *droq, struct octeon_instr_queue *iq)</div><div class='ctx'> {</div><div class='hunk'>@@ -1467,3 +1470,4 @@ void lio_enable_irq(struct octeon_droq *droq, struct octeon_instr_queue *iq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_enable_irq);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.h b/drivers/net/ethernet/cavium/liquidio/octeon_device.h<br/>index 3d01d3602d8f..19344b21f8fb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_device.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_device.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_device.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_device.h</a></div><div class='hunk'>@@ -705,25 +705,6 @@ octeon_get_dispatch(struct octeon_device *octeon_dev, u16 opcode,</div><div class='ctx'>  */</div><div class='ctx'> struct octeon_device *lio_get_device(u32 octeon_id);</div><div class='ctx'> </div><div class='del'>-/** Get the octeon id assigned to the octeon device passed as argument.</div><div class='del'>- *  This function is exported to other modules.</div><div class='del'>- *  @param dev - octeon device pointer passed as a void *.</div><div class='del'>- *  @return octeon device id</div><div class='del'>- */</div><div class='del'>-int lio_get_device_id(void *dev);</div><div class='del'>-</div><div class='del'>-static inline u16 OCTEON_MAJOR_REV(struct octeon_device *oct)</div><div class='del'>-{</div><div class='del'>-	u16 rev = (oct-&gt;rev_id &amp; 0xC) &gt;&gt; 2;</div><div class='del'>-</div><div class='del'>-	return (rev == 0) ? 1 : rev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline u16 OCTEON_MINOR_REV(struct octeon_device *oct)</div><div class='del'>-{</div><div class='del'>-	return oct-&gt;rev_id &amp; 0x3;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /** Read windowed register.</div><div class='ctx'>  *  @param  oct   -  pointer to the Octeon device.</div><div class='ctx'>  *  @param  addr  -  Address of the register to read.</div><div class='hunk'>@@ -816,13 +797,6 @@ int octeon_init_consoles(struct octeon_device *oct);</div><div class='ctx'> int octeon_add_console(struct octeon_device *oct, u32 console_num,</div><div class='ctx'> 		       char *dbg_enb);</div><div class='ctx'> </div><div class='del'>-/** write or read from a console */</div><div class='del'>-int octeon_console_write(struct octeon_device *oct, u32 console_num,</div><div class='del'>-			 char *buffer, u32 write_request_size, u32 flags);</div><div class='del'>-int octeon_console_write_avail(struct octeon_device *oct, u32 console_num);</div><div class='del'>-</div><div class='del'>-int octeon_console_read_avail(struct octeon_device *oct, u32 console_num);</div><div class='del'>-</div><div class='ctx'> /** Removes all attached consoles. */</div><div class='ctx'> void octeon_remove_consoles(struct octeon_device *oct);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c<br/>index 017169023cca..eef12fdd246d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_droq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_droq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_droq.c</a></div><div class='hunk'>@@ -30,11 +30,6 @@</div><div class='ctx'> #include "cn23xx_pf_device.h"</div><div class='ctx'> #include "cn23xx_vf_device.h"</div><div class='ctx'> </div><div class='del'>-struct niclist {</div><div class='del'>-	struct list_head list;</div><div class='del'>-	void *ptr;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> struct __dispatch {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> 	struct octeon_recv_info *rinfo;</div><div class='hunk'>@@ -107,6 +102,7 @@ u32 octeon_droq_check_hw_for_pkts(struct octeon_droq *droq)</div><div class='ctx'> </div><div class='ctx'> 	return last_count;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_droq_check_hw_for_pkts);</div><div class='ctx'> </div><div class='ctx'> static void octeon_droq_compute_max_packet_bufs(struct octeon_droq *droq)</div><div class='ctx'> {</div><div class='hunk'>@@ -216,6 +212,7 @@ int octeon_delete_droq(struct octeon_device *oct, u32 q_no)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_delete_droq);</div><div class='ctx'> </div><div class='ctx'> int octeon_init_droq(struct octeon_device *oct,</div><div class='ctx'> 		     u32 q_no,</div><div class='hunk'>@@ -280,13 +277,10 @@ int octeon_init_droq(struct octeon_device *oct,</div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "droq[%d]: num_desc: %d\n", q_no,</div><div class='ctx'> 		droq-&gt;max_count);</div><div class='ctx'> </div><div class='del'>-	droq-&gt;recv_buf_list = (struct octeon_recv_buffer *)</div><div class='del'>-	      vzalloc_node(array_size(droq-&gt;max_count, OCT_DROQ_RECVBUF_SIZE),</div><div class='del'>-			   numa_node);</div><div class='add'>+	droq-&gt;recv_buf_list = vzalloc_node(array_size(droq-&gt;max_count, OCT_DROQ_RECVBUF_SIZE),</div><div class='add'>+					   numa_node);</div><div class='ctx'> 	if (!droq-&gt;recv_buf_list)</div><div class='del'>-		droq-&gt;recv_buf_list = (struct octeon_recv_buffer *)</div><div class='del'>-		      vzalloc(array_size(droq-&gt;max_count,</div><div class='del'>-					 OCT_DROQ_RECVBUF_SIZE));</div><div class='add'>+		droq-&gt;recv_buf_list = vzalloc(array_size(droq-&gt;max_count, OCT_DROQ_RECVBUF_SIZE));</div><div class='ctx'> 	if (!droq-&gt;recv_buf_list) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Output queue recv buf list alloc failed\n");</div><div class='ctx'> 		goto init_droq_fail;</div><div class='hunk'>@@ -776,8 +770,9 @@ octeon_droq_process_packets(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_droq_process_packets);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='add'>+/*</div><div class='ctx'>  * Utility function to poll for packets. check_hw_for_packets must be</div><div class='ctx'>  * called before calling this routine.</div><div class='ctx'>  */</div><div class='hunk'>@@ -924,6 +919,7 @@ int octeon_unregister_droq_ops(struct octeon_device *oct, u32 q_no)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_unregister_droq_ops);</div><div class='ctx'> </div><div class='ctx'> int octeon_create_droq(struct octeon_device *oct,</div><div class='ctx'> 		       u32 q_no, u32 num_descs,</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.h b/drivers/net/ethernet/cavium/liquidio/octeon_droq.h<br/>index c9b19e624dce..232ae72c0e37 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_droq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_droq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_droq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_droq.h</a></div><div class='hunk'>@@ -395,8 +395,6 @@ int octeon_register_dispatch_fn(struct octeon_device *oct,</div><div class='ctx'> void *octeon_get_dispatch_arg(struct octeon_device *oct,</div><div class='ctx'> 			      u16 opcode, u16 subcode);</div><div class='ctx'> </div><div class='del'>-void octeon_droq_print_stats(void);</div><div class='del'>-</div><div class='ctx'> u32 octeon_droq_check_hw_for_pkts(struct octeon_droq *droq);</div><div class='ctx'> </div><div class='ctx'> int octeon_create_droq(struct octeon_device *oct, u32 q_no,</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_iq.h b/drivers/net/ethernet/cavium/liquidio/octeon_iq.h<br/>index bebf3bd349c6..a04f36a0e1a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_iq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_iq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_iq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_iq.h</a></div><div class='hunk'>@@ -378,9 +378,6 @@ int octeon_send_command(struct octeon_device *oct, u32 iq_no,</div><div class='ctx'> 			u32 force_db, void *cmd, void *buf,</div><div class='ctx'> 			u32 datasize, u32 reqtype);</div><div class='ctx'> </div><div class='del'>-void octeon_dump_soft_command(struct octeon_device *oct,</div><div class='del'>-			      struct octeon_soft_command *sc);</div><div class='del'>-</div><div class='ctx'> void octeon_prepare_soft_command(struct octeon_device *oct,</div><div class='ctx'> 				 struct octeon_soft_command *sc,</div><div class='ctx'> 				 u8 opcode, u8 subcode,</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c<br/>index 021d99cd1665..ad685f5d0a13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c</a></div><div class='hunk'>@@ -28,7 +28,7 @@</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * octeon_mbox_read:</div><div class='del'>- * @oct: Pointer mailbox</div><div class='add'>+ * @mbox: Pointer mailbox</div><div class='ctx'>  *</div><div class='ctx'>  * Reads the 8-bytes of data from the mbox register</div><div class='ctx'>  * Writes back the acknowldgement inidcating completion of read</div><div class='hunk'>@@ -260,9 +260,7 @@ static int octeon_mbox_process_cmd(struct octeon_mbox *mbox,</div><div class='ctx'> 		dev_info(&amp;oct-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 			 "got a request for FLR from VF that owns DPI ring %u\n",</div><div class='ctx'> 			 mbox-&gt;q_no);</div><div class='del'>-		pcie_capability_set_word(</div><div class='del'>-			oct-&gt;sriov_info.dpiring_to_vfpcidev_lut[mbox-&gt;q_no],</div><div class='del'>-			PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_BCR_FLR);</div><div class='add'>+		pcie_flr(oct-&gt;sriov_info.dpiring_to_vfpcidev_lut[mbox-&gt;q_no]);</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	case OCTEON_PF_CHANGED_VF_MACADDR:</div><div class='hunk'>@@ -287,7 +285,8 @@ static int octeon_mbox_process_cmd(struct octeon_mbox *mbox,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *octeon_mbox_process_message:</div><div class='add'>+ * octeon_mbox_process_message</div><div class='add'>+ * @mbox: mailbox</div><div class='ctx'>  *</div><div class='ctx'>  * Process the received mbox message.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h<br/>index d92bd7e16477..9ac85d22c615 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h</a></div><div class='hunk'>@@ -57,7 +57,10 @@ union octeon_mbox_message {</div><div class='ctx'> 	} s;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-typedef void (*octeon_mbox_callback_t)(void *, void *, void *);</div><div class='add'>+struct octeon_mbox_cmd;</div><div class='add'>+</div><div class='add'>+typedef void (*octeon_mbox_callback_t)(struct octeon_device *,</div><div class='add'>+				       struct octeon_mbox_cmd *, void *);</div><div class='ctx'> </div><div class='ctx'> struct octeon_mbox_cmd {</div><div class='ctx'> 	union octeon_mbox_message msg;</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_main.h b/drivers/net/ethernet/cavium/liquidio/octeon_main.h<br/>index 073d0647b439..953edf0c7096 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_main.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_main.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_main.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_main.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@ struct octeon_device_priv {</div><div class='ctx'> 	/** Tasklet structures for this device. */</div><div class='ctx'> 	struct tasklet_struct droq_tasklet;</div><div class='ctx'> 	unsigned long napi_mask;</div><div class='add'>+	struct octeon_device *dev;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /** This structure is used by NIC driver to store information required</div><div class='hunk'>@@ -156,7 +157,7 @@ err_release_region:</div><div class='ctx'> 	    response of the request.</div><div class='ctx'>  *          0: the request will wait until its response gets back</div><div class='ctx'>  *	       from the firmware within LIO_SC_MAX_TMO_MS milli sec.</div><div class='del'>- *	       It the response does not return within</div><div class='add'>+ *	       If the response does not return within</div><div class='ctx'>  *	       LIO_SC_MAX_TMO_MS milli sec, lio_process_ordered_list()</div><div class='ctx'>  *	       will move the request to zombie response list.</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c<br/>index 4c85ae643b7b..d70132437af3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c</a></div><div class='hunk'>@@ -22,6 +22,7 @@</div><div class='ctx'> #include "octeon_iq.h"</div><div class='ctx'> #include "response_manager.h"</div><div class='ctx'> #include "octeon_device.h"</div><div class='add'>+#include "octeon_mem_ops.h"</div><div class='ctx'> </div><div class='ctx'> #define MEMOPS_IDX   BAR1_INDEX_DYNAMIC_MAP</div><div class='ctx'> </div><div class='hunk'>@@ -163,6 +164,7 @@ octeon_pci_read_core_mem(struct octeon_device *oct,</div><div class='ctx'> {</div><div class='ctx'> 	__octeon_pci_rw_core_mem(oct, coreaddr, buf, len, 1);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_pci_read_core_mem);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> octeon_pci_write_core_mem(struct octeon_device *oct,</div><div class='hunk'>@@ -172,6 +174,7 @@ octeon_pci_write_core_mem(struct octeon_device *oct,</div><div class='ctx'> {</div><div class='ctx'> 	__octeon_pci_rw_core_mem(oct, coreaddr, (u8 *)buf, len, 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_pci_write_core_mem);</div><div class='ctx'> </div><div class='ctx'> u64 octeon_read_device_mem64(struct octeon_device *oct, u64 coreaddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -181,6 +184,7 @@ u64 octeon_read_device_mem64(struct octeon_device *oct, u64 coreaddr)</div><div class='ctx'> </div><div class='ctx'> 	return be64_to_cpu(ret);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_read_device_mem64);</div><div class='ctx'> </div><div class='ctx'> u32 octeon_read_device_mem32(struct octeon_device *oct, u64 coreaddr)</div><div class='ctx'> {</div><div class='hunk'>@@ -190,6 +194,7 @@ u32 octeon_read_device_mem32(struct octeon_device *oct, u64 coreaddr)</div><div class='ctx'> </div><div class='ctx'> 	return be32_to_cpu(ret);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_read_device_mem32);</div><div class='ctx'> </div><div class='ctx'> void octeon_write_device_mem32(struct octeon_device *oct, u64 coreaddr,</div><div class='ctx'> 			       u32 val)</div><div class='hunk'>@@ -198,3 +203,4 @@ void octeon_write_device_mem32(struct octeon_device *oct, u64 coreaddr,</div><div class='ctx'> </div><div class='ctx'> 	__octeon_pci_rw_core_mem(oct, coreaddr, (u8 *)&amp;t, 4, 0);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_write_device_mem32);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h<br/>index 50201fc86dcf..ebe56bd8849b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_network.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_network.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_network.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_network.h</a></div><div class='hunk'>@@ -612,7 +612,7 @@ static inline struct list_head *lio_list_delete_head(struct list_head *root)</div><div class='ctx'> {</div><div class='ctx'> 	struct list_head *node;</div><div class='ctx'> </div><div class='del'>-	if (root-&gt;prev == root &amp;&amp; root-&gt;next == root)</div><div class='add'>+	if (list_empty_careful(root))</div><div class='ctx'> 		node = NULL;</div><div class='ctx'> 	else</div><div class='ctx'> 		node = root-&gt;next;</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.c b/drivers/net/ethernet/cavium/liquidio/octeon_nic.c<br/>index 1a706f81bbb0..dee56ea740e7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_nic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_nic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_nic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_nic.c</a></div><div class='hunk'>@@ -79,6 +79,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,</div><div class='ctx'> </div><div class='ctx'> 	return sc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_alloc_soft_command_resp);</div><div class='ctx'> </div><div class='ctx'> int octnet_send_nic_data_pkt(struct octeon_device *oct,</div><div class='ctx'> 			     struct octnic_data_pkt *ndata,</div><div class='hunk'>@@ -90,6 +91,7 @@ int octnet_send_nic_data_pkt(struct octeon_device *oct,</div><div class='ctx'> 				   ndata-&gt;buf, ndata-&gt;datasize,</div><div class='ctx'> 				   ndata-&gt;reqtype);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octnet_send_nic_data_pkt);</div><div class='ctx'> </div><div class='ctx'> static inline struct octeon_soft_command</div><div class='ctx'> *octnic_alloc_ctrl_pkt_sc(struct octeon_device *oct,</div><div class='hunk'>@@ -196,3 +198,4 @@ octnet_send_nic_ctrl_pkt(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octnet_send_nic_ctrl_pkt);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_nic.h b/drivers/net/ethernet/cavium/liquidio/octeon_nic.h<br/>index 87dd6f89ce51..c139fc423764 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_nic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/octeon_nic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/octeon_nic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/octeon_nic.h</a></div><div class='hunk'>@@ -268,7 +268,7 @@ octeon_alloc_soft_command_resp(struct octeon_device    *oct,</div><div class='ctx'>  * @param oct - octeon device pointer</div><div class='ctx'>  * @param ndata - control structure with queueing, and buffer information</div><div class='ctx'>  *</div><div class='del'>- * @returns IQ_FAILED if it failed to add to the input queue. IQ_STOP if it the</div><div class='add'>+ * @returns IQ_FAILED if it failed to add to the input queue. IQ_STOP if the</div><div class='ctx'>  * queue should be stopped, and IQ_SEND_OK if it sent okay.</div><div class='ctx'>  */</div><div class='ctx'> int octnet_send_nic_data_pkt(struct octeon_device *oct,</div><div class='hunk'>@@ -278,7 +278,7 @@ int octnet_send_nic_data_pkt(struct octeon_device *oct,</div><div class='ctx'> /** Send a NIC control packet to the device</div><div class='ctx'>  * @param oct - octeon device pointer</div><div class='ctx'>  * @param nctrl - control structure with command, timout, and callback info</div><div class='del'>- * @returns IQ_FAILED if it failed to add to the input queue. IQ_STOP if it the</div><div class='add'>+ * @returns IQ_FAILED if it failed to add to the input queue. IQ_STOP if the</div><div class='ctx'>  * queue should be stopped, and IQ_SEND_OK if it sent okay.</div><div class='ctx'>  */</div><div class='ctx'> int</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c<br/>index fcf20a8f92d9..d7cfb20eea00 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/request_manager.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/request_manager.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/request_manager.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/request_manager.c</a></div><div class='hunk'>@@ -40,15 +40,6 @@ static void  __check_db_timeout(struct octeon_device *oct, u64 iq_no);</div><div class='ctx'> </div><div class='ctx'> static void (*reqtype_free_fn[MAX_OCTEON_DEVICES][REQTYPE_LAST + 1]) (void *);</div><div class='ctx'> </div><div class='del'>-static inline int IQ_INSTR_MODE_64B(struct octeon_device *oct, int iq_no)</div><div class='del'>-{</div><div class='del'>-	struct octeon_instr_queue *iq =</div><div class='del'>-	    (struct octeon_instr_queue *)oct-&gt;instr_queue[iq_no];</div><div class='del'>-	return iq-&gt;iqcmd_64B;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IQ_INSTR_MODE_32B(oct, iq_no)  (!IQ_INSTR_MODE_64B(oct, iq_no))</div><div class='del'>-</div><div class='ctx'> /* Define this to return the request status comaptible to old code */</div><div class='ctx'> /*#define OCTEON_USE_OLD_REQ_STATUS*/</div><div class='ctx'> </div><div class='hunk'>@@ -95,12 +86,10 @@ int octeon_init_instr_queue(struct octeon_device *oct,</div><div class='ctx'> 	/* Initialize a list to holds requests that have been posted to Octeon</div><div class='ctx'> 	 * but has yet to be fetched by octeon</div><div class='ctx'> 	 */</div><div class='del'>-	iq-&gt;request_list = vmalloc_node((sizeof(*iq-&gt;request_list) * num_descs),</div><div class='del'>-					       numa_node);</div><div class='add'>+	iq-&gt;request_list = vzalloc_node(array_size(num_descs, sizeof(*iq-&gt;request_list)),</div><div class='add'>+					numa_node);</div><div class='ctx'> 	if (!iq-&gt;request_list)</div><div class='del'>-		iq-&gt;request_list =</div><div class='del'>-			vmalloc(array_size(num_descs,</div><div class='del'>-					   sizeof(*iq-&gt;request_list)));</div><div class='add'>+		iq-&gt;request_list = vzalloc(array_size(num_descs, sizeof(*iq-&gt;request_list)));</div><div class='ctx'> 	if (!iq-&gt;request_list) {</div><div class='ctx'> 		lio_dma_free(oct, q_size, iq-&gt;base_addr, iq-&gt;base_addr_dma);</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "Alloc failed for IQ[%d] nr free list\n",</div><div class='hunk'>@@ -108,8 +97,6 @@ int octeon_init_instr_queue(struct octeon_device *oct,</div><div class='ctx'> 		return 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memset(iq-&gt;request_list, 0, sizeof(*iq-&gt;request_list) * num_descs);</div><div class='del'>-</div><div class='ctx'> 	dev_dbg(&amp;oct-&gt;pci_dev-&gt;dev, "IQ[%d]: base: %p basedma: %pad count: %d\n",</div><div class='ctx'> 		iq_no, iq-&gt;base_addr, &amp;iq-&gt;base_addr_dma, iq-&gt;max_count);</div><div class='ctx'> </div><div class='hunk'>@@ -139,13 +126,13 @@ int octeon_init_instr_queue(struct octeon_device *oct,</div><div class='ctx'> 	oct-&gt;io_qmask.iq |= BIT_ULL(iq_no);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the 32B/64B mode for each input queue */</div><div class='del'>-	oct-&gt;io_qmask.iq64B |= ((conf-&gt;instr_type == 64) &lt;&lt; iq_no);</div><div class='add'>+	oct-&gt;io_qmask.iq64B |= ((u64)(conf-&gt;instr_type == 64) &lt;&lt; iq_no);</div><div class='ctx'> 	iq-&gt;iqcmd_64B = (conf-&gt;instr_type == 64);</div><div class='ctx'> </div><div class='ctx'> 	oct-&gt;fn_list.setup_iq_regs(oct, iq_no);</div><div class='ctx'> </div><div class='ctx'> 	oct-&gt;check_db_wq[iq_no].wq = alloc_workqueue("check_iq_db",</div><div class='del'>-						     WQ_MEM_RECLAIM,</div><div class='add'>+						     WQ_MEM_RECLAIM | WQ_PERCPU,</div><div class='ctx'> 						     0);</div><div class='ctx'> 	if (!oct-&gt;check_db_wq[iq_no].wq) {</div><div class='ctx'> 		vfree(iq-&gt;request_list);</div><div class='hunk'>@@ -198,6 +185,7 @@ int octeon_delete_instr_queue(struct octeon_device *oct, u32 iq_no)</div><div class='ctx'> 	}</div><div class='ctx'> 	return 1;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_delete_instr_queue);</div><div class='ctx'> </div><div class='ctx'> /* Return 0 on success, 1 on failure */</div><div class='ctx'> int octeon_setup_iq(struct octeon_device *oct,</div><div class='hunk'>@@ -218,15 +206,13 @@ int octeon_setup_iq(struct octeon_device *oct,</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	oct-&gt;instr_queue[iq_no] =</div><div class='del'>-	    vmalloc_node(sizeof(struct octeon_instr_queue), numa_node);</div><div class='add'>+	    vzalloc_node(sizeof(struct octeon_instr_queue), numa_node);</div><div class='ctx'> 	if (!oct-&gt;instr_queue[iq_no])</div><div class='ctx'> 		oct-&gt;instr_queue[iq_no] =</div><div class='del'>-		    vmalloc(sizeof(struct octeon_instr_queue));</div><div class='add'>+		    vzalloc(sizeof(struct octeon_instr_queue));</div><div class='ctx'> 	if (!oct-&gt;instr_queue[iq_no])</div><div class='ctx'> 		return 1;</div><div class='ctx'> </div><div class='del'>-	memset(oct-&gt;instr_queue[iq_no], 0,</div><div class='del'>-	       sizeof(struct octeon_instr_queue));</div><div class='ctx'> </div><div class='ctx'> 	oct-&gt;instr_queue[iq_no]-&gt;q_index = q_index;</div><div class='ctx'> 	oct-&gt;instr_queue[iq_no]-&gt;app_ctx = app_ctx;</div><div class='hunk'>@@ -239,8 +225,10 @@ int octeon_setup_iq(struct octeon_device *oct,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	oct-&gt;num_iqs++;</div><div class='del'>-	if (oct-&gt;fn_list.enable_io_queues(oct))</div><div class='add'>+	if (oct-&gt;fn_list.enable_io_queues(oct)) {</div><div class='add'>+		octeon_delete_instr_queue(oct, iq_no);</div><div class='ctx'> 		return 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -271,6 +259,7 @@ int lio_wait_for_instr_fetch(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return instr_cnt;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_wait_for_instr_fetch);</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> ring_doorbell(struct octeon_device *oct, struct octeon_instr_queue *iq)</div><div class='hunk'>@@ -295,6 +284,7 @@ octeon_ring_doorbell_locked(struct octeon_device *oct, u32 iq_no)</div><div class='ctx'> 		ring_doorbell(oct, iq);</div><div class='ctx'> 	spin_unlock(&amp;iq-&gt;post_lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_ring_doorbell_locked);</div><div class='ctx'> </div><div class='ctx'> static inline void __copy_cmd_into_iq(struct octeon_instr_queue *iq,</div><div class='ctx'> 				      u8 *cmd)</div><div class='hunk'>@@ -358,6 +348,7 @@ octeon_register_reqtype_free_fn(struct octeon_device *oct, int reqtype,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_register_reqtype_free_fn);</div><div class='ctx'> </div><div class='ctx'> static inline void</div><div class='ctx'> __add_to_request_list(struct octeon_instr_queue *iq,</div><div class='hunk'>@@ -443,6 +434,7 @@ lio_process_iq_request_list(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	return inst_count;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_process_iq_request_list);</div><div class='ctx'> </div><div class='ctx'> /* Can only be called from process context */</div><div class='ctx'> int</div><div class='hunk'>@@ -579,6 +571,7 @@ octeon_send_command(struct octeon_device *oct, u32 iq_no,</div><div class='ctx'> </div><div class='ctx'> 	return st.status;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_send_command);</div><div class='ctx'> </div><div class='ctx'> void</div><div class='ctx'> octeon_prepare_soft_command(struct octeon_device *oct,</div><div class='hunk'>@@ -686,6 +679,7 @@ octeon_prepare_soft_command(struct octeon_device *oct,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_prepare_soft_command);</div><div class='ctx'> </div><div class='ctx'> int octeon_send_soft_command(struct octeon_device *oct,</div><div class='ctx'> 			     struct octeon_soft_command *sc)</div><div class='hunk'>@@ -739,6 +733,7 @@ int octeon_send_soft_command(struct octeon_device *oct,</div><div class='ctx'> 	return (octeon_send_command(oct, sc-&gt;iq_no, 1, &amp;sc-&gt;cmd, sc,</div><div class='ctx'> 				    len, REQTYPE_SOFT_COMMAND));</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_send_soft_command);</div><div class='ctx'> </div><div class='ctx'> int octeon_setup_sc_buffer_pool(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -768,6 +763,7 @@ int octeon_setup_sc_buffer_pool(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_setup_sc_buffer_pool);</div><div class='ctx'> </div><div class='ctx'> int octeon_free_sc_done_list(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -807,6 +803,7 @@ int octeon_free_sc_done_list(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_free_sc_done_list);</div><div class='ctx'> </div><div class='ctx'> int octeon_free_sc_zombie_list(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -831,6 +828,7 @@ int octeon_free_sc_zombie_list(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_free_sc_zombie_list);</div><div class='ctx'> </div><div class='ctx'> int octeon_free_sc_buffer_pool(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='hunk'>@@ -855,6 +853,7 @@ int octeon_free_sc_buffer_pool(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_free_sc_buffer_pool);</div><div class='ctx'> </div><div class='ctx'> struct octeon_soft_command *octeon_alloc_soft_command(struct octeon_device *oct,</div><div class='ctx'> 						      u32 datasize,</div><div class='hunk'>@@ -926,6 +925,7 @@ struct octeon_soft_command *octeon_alloc_soft_command(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	return sc;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_alloc_soft_command);</div><div class='ctx'> </div><div class='ctx'> void octeon_free_soft_command(struct octeon_device *oct,</div><div class='ctx'> 			      struct octeon_soft_command *sc)</div><div class='hunk'>@@ -938,3 +938,4 @@ void octeon_free_soft_command(struct octeon_device *oct,</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;oct-&gt;sc_buf_pool.lock);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_free_soft_command);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/liquidio/response_manager.c b/drivers/net/ethernet/cavium/liquidio/response_manager.c<br/>index ac7747ccf56a..de1a8335b545 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/response_manager.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/liquidio/response_manager.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/liquidio/response_manager.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/liquidio/response_manager.c</a></div><div class='hunk'>@@ -39,7 +39,8 @@ int octeon_setup_response_list(struct octeon_device *oct)</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_lock_init(&amp;oct-&gt;cmd_resp_wqlock);</div><div class='ctx'> </div><div class='del'>-	oct-&gt;dma_comp_wq.wq = alloc_workqueue("dma-comp", WQ_MEM_RECLAIM, 0);</div><div class='add'>+	oct-&gt;dma_comp_wq.wq = alloc_workqueue("dma-comp",</div><div class='add'>+					      WQ_MEM_RECLAIM | WQ_PERCPU, 0);</div><div class='ctx'> 	if (!oct-&gt;dma_comp_wq.wq) {</div><div class='ctx'> 		dev_err(&amp;oct-&gt;pci_dev-&gt;dev, "failed to create wq thread\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -52,12 +53,14 @@ int octeon_setup_response_list(struct octeon_device *oct)</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_setup_response_list);</div><div class='ctx'> </div><div class='ctx'> void octeon_delete_response_list(struct octeon_device *oct)</div><div class='ctx'> {</div><div class='ctx'> 	cancel_delayed_work_sync(&amp;oct-&gt;dma_comp_wq.wk.work);</div><div class='ctx'> 	destroy_workqueue(oct-&gt;dma_comp_wq.wq);</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(octeon_delete_response_list);</div><div class='ctx'> </div><div class='ctx'> int lio_process_ordered_list(struct octeon_device *octeon_dev,</div><div class='ctx'> 			     u32 force_quit)</div><div class='hunk'>@@ -219,6 +222,7 @@ int lio_process_ordered_list(struct octeon_device *octeon_dev,</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='add'>+EXPORT_SYMBOL_GPL(lio_process_ordered_list);</div><div class='ctx'> </div><div class='ctx'> static void oct_poll_req_completion(struct work_struct *work)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c<br/>index 0e5de88fd6e8..c190fc6538d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/octeon/octeon_mgmt.c</a></div><div class='hunk'>@@ -28,7 +28,6 @@</div><div class='ctx'> #include &lt;asm/octeon/cvmx-agl-defs.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "octeon_mgmt"</div><div class='del'>-#define DRV_VERSION "2.0"</div><div class='ctx'> #define DRV_DESCRIPTION \</div><div class='ctx'> 	"Cavium Networks Octeon MII (management) port Network Driver"</div><div class='ctx'> </div><div class='hunk'>@@ -235,6 +234,11 @@ static void octeon_mgmt_rx_fill_ring(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 		/* Put it in the ring.  */</div><div class='ctx'> 		p-&gt;rx_ring[p-&gt;rx_next_fill] = re.d64;</div><div class='add'>+		/* Make sure there is no reorder of filling the ring and ringing</div><div class='add'>+		 * the bell</div><div class='add'>+		 */</div><div class='add'>+		wmb();</div><div class='add'>+</div><div class='ctx'> 		dma_sync_single_for_device(p-&gt;dev, p-&gt;rx_ring_handle,</div><div class='ctx'> 					   ring_size_to_bytes(OCTEON_MGMT_RX_RING_SIZE),</div><div class='ctx'> 					   DMA_BIDIRECTIONAL);</div><div class='hunk'>@@ -311,9 +315,9 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)</div><div class='ctx'> 		netif_wake_queue(p-&gt;netdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void octeon_mgmt_clean_tx_tasklet(unsigned long arg)</div><div class='add'>+static void octeon_mgmt_clean_tx_tasklet(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct octeon_mgmt *p = (struct octeon_mgmt *)arg;</div><div class='add'>+	struct octeon_mgmt *p = from_tasklet(p, t, tx_clean_tasklet);</div><div class='ctx'> 	octeon_mgmt_clean_tx_buffers(p);</div><div class='ctx'> 	octeon_mgmt_enable_tx_irq(p);</div><div class='ctx'> }</div><div class='hunk'>@@ -544,7 +548,7 @@ struct octeon_mgmt_cam_state {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void octeon_mgmt_cam_state_add(struct octeon_mgmt_cam_state *cs,</div><div class='del'>-				      unsigned char *addr)</div><div class='add'>+				      const unsigned char *addr)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -645,7 +649,7 @@ static int octeon_mgmt_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	struct octeon_mgmt *p = netdev_priv(netdev);</div><div class='ctx'> 	int max_packet = new_mtu + ETH_HLEN + ETH_FCS_LEN;</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	/* HW lifts the limit if the frame is VLAN tagged</div><div class='ctx'> 	 * (+4 bytes per each tag, up to two tags)</div><div class='hunk'>@@ -686,22 +690,16 @@ static irqreturn_t octeon_mgmt_interrupt(int cpl, void *dev_id)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev,</div><div class='del'>-				      struct ifreq *rq, int cmd)</div><div class='add'>+static int octeon_mgmt_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+				    struct kernel_hwtstamp_config *config,</div><div class='add'>+				    struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct octeon_mgmt *p = netdev_priv(netdev);</div><div class='del'>-	struct hwtstamp_config config;</div><div class='del'>-	union cvmx_mio_ptp_clock_cfg ptp;</div><div class='ctx'> 	union cvmx_agl_gmx_rxx_frm_ctl rxx_frm_ctl;</div><div class='add'>+	union cvmx_mio_ptp_clock_cfg ptp;</div><div class='ctx'> 	bool have_hw_timestamps = false;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;config, rq-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	if (config.flags) /* reserved for future extensions */</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* Check the status of hardware for tiemstamps */</div><div class='add'>+	/* Check the status of hardware for timestamps */</div><div class='ctx'> 	if (OCTEON_IS_MODEL(OCTEON_CN6XXX)) {</div><div class='ctx'> 		/* Get the current state of the PTP clock */</div><div class='ctx'> 		ptp.u64 = cvmx_read_csr(CVMX_MIO_PTP_CLOCK_CFG);</div><div class='hunk'>@@ -732,10 +730,12 @@ static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev,</div><div class='ctx'> 		have_hw_timestamps = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!have_hw_timestamps)</div><div class='add'>+	if (!have_hw_timestamps) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "HW doesn't support timestamping");</div><div class='ctx'> 		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	switch (config.tx_type) {</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -743,7 +743,7 @@ static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev,</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (config.rx_filter) {</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='ctx'> 	case HWTSTAMP_FILTER_NONE:</div><div class='ctx'> 		p-&gt;has_rx_tstamp = false;</div><div class='ctx'> 		rxx_frm_ctl.u64 = cvmx_read_csr(p-&gt;agl + AGL_GMX_RX_FRM_CTL);</div><div class='hunk'>@@ -765,35 +765,34 @@ static int octeon_mgmt_ioctl_hwtstamp(struct net_device *netdev,</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='ctx'> 	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='del'>-		p-&gt;has_rx_tstamp = have_hw_timestamps;</div><div class='del'>-		config.rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='del'>-		if (p-&gt;has_rx_tstamp) {</div><div class='del'>-			rxx_frm_ctl.u64 = cvmx_read_csr(p-&gt;agl + AGL_GMX_RX_FRM_CTL);</div><div class='del'>-			rxx_frm_ctl.s.ptp_mode = 1;</div><div class='del'>-			cvmx_write_csr(p-&gt;agl + AGL_GMX_RX_FRM_CTL, rxx_frm_ctl.u64);</div><div class='del'>-		}</div><div class='add'>+		p-&gt;has_rx_tstamp = true;</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		rxx_frm_ctl.u64 = cvmx_read_csr(p-&gt;agl + AGL_GMX_RX_FRM_CTL);</div><div class='add'>+		rxx_frm_ctl.s.ptp_mode = 1;</div><div class='add'>+		cvmx_write_csr(p-&gt;agl + AGL_GMX_RX_FRM_CTL, rxx_frm_ctl.u64);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(rq-&gt;ifr_data, &amp;config, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int octeon_mgmt_ioctl(struct net_device *netdev,</div><div class='del'>-			     struct ifreq *rq, int cmd)</div><div class='add'>+static int octeon_mgmt_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+				    struct kernel_hwtstamp_config *config)</div><div class='ctx'> {</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		return octeon_mgmt_ioctl_hwtstamp(netdev, rq, cmd);</div><div class='del'>-	default:</div><div class='del'>-		if (netdev-&gt;phydev)</div><div class='del'>-			return phy_mii_ioctl(netdev-&gt;phydev, rq, cmd);</div><div class='add'>+	struct octeon_mgmt *p = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	/* Check the status of hardware for timestamps */</div><div class='add'>+	if (!OCTEON_IS_MODEL(OCTEON_CN6XXX))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	config-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+	config-&gt;rx_filter = p-&gt;has_rx_tstamp ?</div><div class='add'>+			    HWTSTAMP_FILTER_ALL :</div><div class='add'>+			    HWTSTAMP_FILTER_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void octeon_mgmt_disable_link(struct octeon_mgmt *p)</div><div class='hunk'>@@ -959,7 +958,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)</div><div class='ctx'> 				PHY_INTERFACE_MODE_MII);</div><div class='ctx'> </div><div class='ctx'> 	if (!phydev)</div><div class='del'>-		return -ENODEV;</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1217,7 +1216,7 @@ static int octeon_mgmt_open(struct net_device *netdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (netdev-&gt;phydev) {</div><div class='ctx'> 		netif_carrier_off(netdev);</div><div class='del'>-		phy_start_aneg(netdev-&gt;phydev);</div><div class='add'>+		phy_start(netdev-&gt;phydev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netif_wake_queue(netdev);</div><div class='hunk'>@@ -1245,8 +1244,10 @@ static int octeon_mgmt_stop(struct net_device *netdev)</div><div class='ctx'> 	napi_disable(&amp;p-&gt;napi);</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='ctx'> </div><div class='del'>-	if (netdev-&gt;phydev)</div><div class='add'>+	if (netdev-&gt;phydev) {</div><div class='add'>+		phy_stop(netdev-&gt;phydev);</div><div class='ctx'> 		phy_disconnect(netdev-&gt;phydev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1341,10 +1342,7 @@ static void octeon_mgmt_poll_controller(struct net_device *netdev)</div><div class='ctx'> static void octeon_mgmt_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 				    struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;fw_version, "N/A", sizeof(info-&gt;fw_version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, "N/A", sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int octeon_mgmt_nway_reset(struct net_device *dev)</div><div class='hunk'>@@ -1372,11 +1370,13 @@ static const struct net_device_ops octeon_mgmt_ops = {</div><div class='ctx'> 	.ndo_start_xmit =		octeon_mgmt_xmit,</div><div class='ctx'> 	.ndo_set_rx_mode =		octeon_mgmt_set_rx_filtering,</div><div class='ctx'> 	.ndo_set_mac_address =		octeon_mgmt_set_mac_address,</div><div class='del'>-	.ndo_do_ioctl =			octeon_mgmt_ioctl,</div><div class='add'>+	.ndo_eth_ioctl =		phy_do_ioctl,</div><div class='ctx'> 	.ndo_change_mtu =		octeon_mgmt_change_mtu,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller =		octeon_mgmt_poll_controller,</div><div class='ctx'> #endif</div><div class='add'>+	.ndo_hwtstamp_get =		octeon_mgmt_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set =		octeon_mgmt_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -1384,7 +1384,6 @@ static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct octeon_mgmt *p;</div><div class='ctx'> 	const __be32 *data;</div><div class='del'>-	const u8 *mac;</div><div class='ctx'> 	struct resource *res_mix;</div><div class='ctx'> 	struct resource *res_agl;</div><div class='ctx'> 	struct resource *res_agl_prt_ctl;</div><div class='hunk'>@@ -1399,8 +1398,8 @@ static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, netdev);</div><div class='ctx'> 	p = netdev_priv(netdev);</div><div class='del'>-	netif_napi_add(netdev, &amp;p-&gt;napi, octeon_mgmt_napi_poll,</div><div class='del'>-		       OCTEON_MGMT_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add_weight(netdev, &amp;p-&gt;napi, octeon_mgmt_napi_poll,</div><div class='add'>+			      OCTEON_MGMT_NAPI_WEIGHT);</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;netdev = netdev;</div><div class='ctx'> 	p-&gt;dev = &amp;pdev-&gt;dev;</div><div class='hunk'>@@ -1490,8 +1489,8 @@ static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	skb_queue_head_init(&amp;p-&gt;tx_list);</div><div class='ctx'> 	skb_queue_head_init(&amp;p-&gt;rx_list);</div><div class='del'>-	tasklet_init(&amp;p-&gt;tx_clean_tasklet,</div><div class='del'>-		     octeon_mgmt_clean_tx_tasklet, (unsigned long)p);</div><div class='add'>+	tasklet_setup(&amp;p-&gt;tx_clean_tasklet,</div><div class='add'>+		      octeon_mgmt_clean_tx_tasklet);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='ctx'> </div><div class='hunk'>@@ -1499,13 +1498,10 @@ static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='ctx'> 	netdev-&gt;ethtool_ops = &amp;octeon_mgmt_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM;</div><div class='del'>-	netdev-&gt;max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM;</div><div class='del'>-</div><div class='del'>-	mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='add'>+	netdev-&gt;max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN;</div><div class='ctx'> </div><div class='del'>-	if (!IS_ERR(mac))</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, mac);</div><div class='del'>-	else</div><div class='add'>+	result = of_get_ethdev_address(pdev-&gt;dev.of_node, netdev);</div><div class='add'>+	if (result)</div><div class='ctx'> 		eth_hw_addr_random(netdev);</div><div class='ctx'> </div><div class='ctx'> 	p-&gt;phy_np = of_parse_phandle(pdev-&gt;dev.of_node, "phy-handle", 0);</div><div class='hunk'>@@ -1519,7 +1515,6 @@ static int octeon_mgmt_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (result)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "Version " DRV_VERSION "\n");</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='hunk'>@@ -1528,7 +1523,7 @@ err:</div><div class='ctx'> 	return result;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int octeon_mgmt_remove(struct platform_device *pdev)</div><div class='add'>+static void octeon_mgmt_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct octeon_mgmt *p = netdev_priv(netdev);</div><div class='hunk'>@@ -1536,7 +1531,6 @@ static int octeon_mgmt_remove(struct platform_device *pdev)</div><div class='ctx'> 	unregister_netdev(netdev);</div><div class='ctx'> 	of_node_put(p-&gt;phy_np);</div><div class='ctx'> 	free_netdev(netdev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id octeon_mgmt_match[] = {</div><div class='hunk'>@@ -1556,24 +1550,9 @@ static struct platform_driver octeon_mgmt_driver = {</div><div class='ctx'> 	.remove		= octeon_mgmt_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-extern void octeon_mdiobus_force_mod_depencency(void);</div><div class='del'>-</div><div class='del'>-static int __init octeon_mgmt_mod_init(void)</div><div class='del'>-{</div><div class='del'>-	/* Force our mdiobus driver module to be loaded first. */</div><div class='del'>-	octeon_mdiobus_force_mod_depencency();</div><div class='del'>-	return platform_driver_register(&amp;octeon_mgmt_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit octeon_mgmt_mod_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;octeon_mgmt_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(octeon_mgmt_mod_init);</div><div class='del'>-module_exit(octeon_mgmt_mod_exit);</div><div class='add'>+module_platform_driver(octeon_mgmt_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_SOFTDEP("pre: mdio-cavium");</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='ctx'> MODULE_AUTHOR("David Daney");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c<br/>index 9361f964bb9b..0ec65ec634df 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nic_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nic_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nic_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/nic_main.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ struct nicpf {</div><div class='ctx'> </div><div class='ctx'> 	/* MSI-X */</div><div class='ctx'> 	u8			num_vec;</div><div class='del'>-	bool			irq_allocated[NIC_PF_MSIX_VECTORS];</div><div class='add'>+	unsigned int		irq_allocated[NIC_PF_MSIX_VECTORS];</div><div class='ctx'> 	char			irq_name[NIC_PF_MSIX_VECTORS][20];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1150,7 +1150,7 @@ static irqreturn_t nic_mbx_intr_handler(int irq, void *nic_irq)</div><div class='ctx'> 	u64 intr;</div><div class='ctx'> 	u8  vf;</div><div class='ctx'> </div><div class='del'>-	if (irq == pci_irq_vector(nic-&gt;pdev, NIC_PF_INTR_ID_MBOX0))</div><div class='add'>+	if (irq == nic-&gt;irq_allocated[NIC_PF_INTR_ID_MBOX0])</div><div class='ctx'> 		mbx = 0;</div><div class='ctx'> 	else</div><div class='ctx'> 		mbx = 1;</div><div class='hunk'>@@ -1176,14 +1176,14 @@ static void nic_free_all_interrupts(struct nicpf *nic)</div><div class='ctx'> </div><div class='ctx'> 	for (irq = 0; irq &lt; nic-&gt;num_vec; irq++) {</div><div class='ctx'> 		if (nic-&gt;irq_allocated[irq])</div><div class='del'>-			free_irq(pci_irq_vector(nic-&gt;pdev, irq), nic);</div><div class='del'>-		nic-&gt;irq_allocated[irq] = false;</div><div class='add'>+			free_irq(nic-&gt;irq_allocated[irq], nic);</div><div class='add'>+		nic-&gt;irq_allocated[irq] = 0;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nic_register_interrupts(struct nicpf *nic)</div><div class='ctx'> {</div><div class='del'>-	int i, ret;</div><div class='add'>+	int i, ret, irq;</div><div class='ctx'> 	nic-&gt;num_vec = pci_msix_vec_count(nic-&gt;pdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable MSI-X */</div><div class='hunk'>@@ -1193,7 +1193,7 @@ static int nic_register_interrupts(struct nicpf *nic)</div><div class='ctx'> 		dev_err(&amp;nic-&gt;pdev-&gt;dev,</div><div class='ctx'> 			"Request for #%d msix vectors failed, returned %d\n",</div><div class='ctx'> 			   nic-&gt;num_vec, ret);</div><div class='del'>-		return 1;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Register mailbox interrupt handler */</div><div class='hunk'>@@ -1201,13 +1201,13 @@ static int nic_register_interrupts(struct nicpf *nic)</div><div class='ctx'> 		sprintf(nic-&gt;irq_name[i],</div><div class='ctx'> 			"NICPF Mbox%d", (i - NIC_PF_INTR_ID_MBOX0));</div><div class='ctx'> </div><div class='del'>-		ret = request_irq(pci_irq_vector(nic-&gt;pdev, i),</div><div class='del'>-				  nic_mbx_intr_handler, 0,</div><div class='add'>+		irq = pci_irq_vector(nic-&gt;pdev, i);</div><div class='add'>+		ret = request_irq(irq, nic_mbx_intr_handler, 0,</div><div class='ctx'> 				  nic-&gt;irq_name[i], nic);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto fail;</div><div class='ctx'> </div><div class='del'>-		nic-&gt;irq_allocated[i] = true;</div><div class='add'>+		nic-&gt;irq_allocated[i] = irq;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Enable mailbox interrupt */</div><div class='hunk'>@@ -1311,9 +1311,8 @@ static int nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to enable PCI device\n");</div><div class='ctx'> 		pci_set_drvdata(pdev, NULL);</div><div class='del'>-		return err;</div><div class='add'>+		return dev_err_probe(dev, err, "Failed to enable PCI device\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRV_NAME);</div><div class='hunk'>@@ -1322,18 +1321,12 @@ static int nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_disable_device;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(48));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "Unable to get usable DMA configuration\n");</div><div class='ctx'> 		goto err_release_regions;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Unable to get 48-bit DMA for consistent allocations\n");</div><div class='del'>-		goto err_release_regions;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* MAP PF's configuration registers */</div><div class='ctx'> 	nic-&gt;reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0);</div><div class='ctx'> 	if (!nic-&gt;reg_base) {</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c<br/>index 5e0b16bb95a0..413028bdcacb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c</a></div><div class='hunk'>@@ -5,6 +5,7 @@</div><div class='ctx'> </div><div class='ctx'> /* ETHTOOL Support for VNIC_VF Device*/</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -16,7 +17,6 @@</div><div class='ctx'> #include "../common/cavium_ptp.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"nicvf"</div><div class='del'>-#define DRV_VERSION     "1.0"</div><div class='ctx'> </div><div class='ctx'> struct nicvf_stat {</div><div class='ctx'> 	char name[ETH_GSTRING_LEN];</div><div class='hunk'>@@ -191,9 +191,8 @@ static void nicvf_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(nic-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(nic-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 nicvf_get_msglevel(struct net_device *netdev)</div><div class='hunk'>@@ -457,7 +456,9 @@ static void nicvf_get_regs(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nicvf_get_coalesce(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_coalesce *cmd)</div><div class='add'>+			      struct ethtool_coalesce *cmd,</div><div class='add'>+			      struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -466,7 +467,9 @@ static int nicvf_get_coalesce(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void nicvf_get_ringparam(struct net_device *netdev,</div><div class='del'>-				struct ethtool_ringparam *ring)</div><div class='add'>+				struct ethtool_ringparam *ring,</div><div class='add'>+				struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> 	struct queue_set *qs = nic-&gt;qs;</div><div class='hunk'>@@ -478,7 +481,9 @@ static void nicvf_get_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nicvf_set_ringparam(struct net_device *netdev,</div><div class='del'>-			       struct ethtool_ringparam *ring)</div><div class='add'>+			       struct ethtool_ringparam *ring,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> 	struct queue_set *qs = nic-&gt;qs;</div><div class='hunk'>@@ -511,8 +516,8 @@ static int nicvf_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_get_rss_hash_opts(struct nicvf *nic,</div><div class='del'>-				   struct ethtool_rxnfc *info)</div><div class='add'>+static int nicvf_get_rxfh_fields(struct net_device *dev,</div><div class='add'>+				 struct ethtool_rxfh_fields *info)</div><div class='ctx'> {</div><div class='ctx'> 	info-&gt;data = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -524,7 +529,7 @@ static int nicvf_get_rss_hash_opts(struct nicvf *nic,</div><div class='ctx'> 	case SCTP_V4_FLOW:</div><div class='ctx'> 	case SCTP_V6_FLOW:</div><div class='ctx'> 		info-&gt;data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case IPV4_FLOW:</div><div class='ctx'> 	case IPV6_FLOW:</div><div class='ctx'> 		info-&gt;data |= RXH_IP_SRC | RXH_IP_DST;</div><div class='hunk'>@@ -536,36 +541,29 @@ static int nicvf_get_rss_hash_opts(struct nicvf *nic,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_get_rxnfc(struct net_device *dev,</div><div class='del'>-			   struct ethtool_rxnfc *info, u32 *rules)</div><div class='add'>+static u32 nicvf_get_rx_ring_count(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(dev);</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXRINGS:</div><div class='del'>-		info-&gt;data = nic-&gt;rx_queues;</div><div class='del'>-		ret = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		return nicvf_get_rss_hash_opts(nic, info);</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='add'>+	return nic-&gt;rx_queues;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_set_rss_hash_opts(struct nicvf *nic,</div><div class='del'>-				   struct ethtool_rxnfc *info)</div><div class='add'>+static int nicvf_set_rxfh_fields(struct net_device *dev,</div><div class='add'>+				 const struct ethtool_rxfh_fields *info,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct nicvf_rss_info *rss = &amp;nic-&gt;rss_info;</div><div class='del'>-	u64 rss_cfg = nicvf_reg_read(nic, NIC_VNIC_RSS_CFG);</div><div class='add'>+	struct nicvf *nic = netdev_priv(dev);</div><div class='add'>+	struct nicvf_rss_info *rss;</div><div class='add'>+	u64 rss_cfg;</div><div class='add'>+</div><div class='add'>+	rss = &amp;nic-&gt;rss_info;</div><div class='add'>+	rss_cfg = nicvf_reg_read(nic, NIC_VNIC_RSS_CFG);</div><div class='ctx'> </div><div class='ctx'> 	if (!rss-&gt;enable)</div><div class='ctx'> 		netdev_err(nic-&gt;netdev,</div><div class='ctx'> 			   "RSS is disabled, hash cannot be set\n");</div><div class='ctx'> </div><div class='del'>-	netdev_info(nic-&gt;netdev, "Set RSS flow type = %d, data = %lld\n",</div><div class='add'>+	netdev_info(nic-&gt;netdev, "Set RSS flow type = %d, data = %u\n",</div><div class='ctx'> 		    info-&gt;flow_type, info-&gt;data);</div><div class='ctx'> </div><div class='ctx'> 	if (!(info-&gt;data &amp; RXH_IP_SRC) || !(info-&gt;data &amp; RXH_IP_DST))</div><div class='hunk'>@@ -623,19 +621,6 @@ static int nicvf_set_rss_hash_opts(struct nicvf *nic,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info)</div><div class='del'>-{</div><div class='del'>-	struct nicvf *nic = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		return nicvf_set_rss_hash_opts(nic, info);</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u32 nicvf_get_rxfh_key_size(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	return RSS_HASH_KEY_SIZE * sizeof(u64);</div><div class='hunk'>@@ -648,35 +633,36 @@ static u32 nicvf_get_rxfh_indir_size(struct net_device *dev)</div><div class='ctx'> 	return nic-&gt;rss_info.rss_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_get_rxfh(struct net_device *dev, u32 *indir, u8 *hkey,</div><div class='del'>-			  u8 *hfunc)</div><div class='add'>+static int nicvf_get_rxfh(struct net_device *dev,</div><div class='add'>+			  struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(dev);</div><div class='ctx'> 	struct nicvf_rss_info *rss = &amp;nic-&gt;rss_info;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	if (indir) {</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='ctx'> 		for (idx = 0; idx &lt; rss-&gt;rss_size; idx++)</div><div class='del'>-			indir[idx] = rss-&gt;ind_tbl[idx];</div><div class='add'>+			rxfh-&gt;indir[idx] = rss-&gt;ind_tbl[idx];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hkey)</div><div class='del'>-		memcpy(hkey, rss-&gt;key, RSS_HASH_KEY_SIZE * sizeof(u64));</div><div class='add'>+	if (rxfh-&gt;key)</div><div class='add'>+		memcpy(rxfh-&gt;key, rss-&gt;key, RSS_HASH_KEY_SIZE * sizeof(u64));</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_set_rxfh(struct net_device *dev, const u32 *indir,</div><div class='del'>-			  const u8 *hkey, const u8 hfunc)</div><div class='add'>+static int nicvf_set_rxfh(struct net_device *dev,</div><div class='add'>+			  struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(dev);</div><div class='ctx'> 	struct nicvf_rss_info *rss = &amp;nic-&gt;rss_info;</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	if (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP)</div><div class='add'>+	if (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	    rxfh-&gt;hfunc != ETH_RSS_HASH_TOP)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	if (!rss-&gt;enable) {</div><div class='hunk'>@@ -685,13 +671,13 @@ static int nicvf_set_rxfh(struct net_device *dev, const u32 *indir,</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (indir) {</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='ctx'> 		for (idx = 0; idx &lt; rss-&gt;rss_size; idx++)</div><div class='del'>-			rss-&gt;ind_tbl[idx] = indir[idx];</div><div class='add'>+			rss-&gt;ind_tbl[idx] = rxfh-&gt;indir[idx];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hkey) {</div><div class='del'>-		memcpy(rss-&gt;key, hkey, RSS_HASH_KEY_SIZE * sizeof(u64));</div><div class='add'>+	if (rxfh-&gt;key) {</div><div class='add'>+		memcpy(rss-&gt;key, rxfh-&gt;key, RSS_HASH_KEY_SIZE * sizeof(u64));</div><div class='ctx'> 		nicvf_set_rss_key(nic);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -730,12 +716,17 @@ static int nicvf_set_channels(struct net_device *dev,</div><div class='ctx'> 	if (channel-&gt;tx_count &gt; nic-&gt;max_queues)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (nic-&gt;xdp_prog &amp;&amp;</div><div class='del'>-	    ((channel-&gt;tx_count + channel-&gt;rx_count) &gt; nic-&gt;max_queues)) {</div><div class='del'>-		netdev_err(nic-&gt;netdev,</div><div class='del'>-			   "XDP mode, RXQs + TXQs &gt; Max %d\n",</div><div class='del'>-			   nic-&gt;max_queues);</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	if (channel-&gt;tx_count + channel-&gt;rx_count &gt; nic-&gt;max_queues) {</div><div class='add'>+		if (nic-&gt;xdp_prog) {</div><div class='add'>+			netdev_err(nic-&gt;netdev,</div><div class='add'>+				   "XDP mode, RXQs + TXQs &gt; Max %d\n",</div><div class='add'>+				   nic-&gt;max_queues);</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		xdp_clear_features_flag(nic-&gt;netdev);</div><div class='add'>+	} else if (!pass1_silicon(nic-&gt;pdev)) {</div><div class='add'>+		xdp_set_features_flag(dev, NETDEV_XDP_ACT_BASIC);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (if_up)</div><div class='hunk'>@@ -825,7 +816,7 @@ static int nicvf_set_pauseparam(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int nicvf_get_ts_info(struct net_device *netdev,</div><div class='del'>-			     struct ethtool_ts_info *info)</div><div class='add'>+			     struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -833,8 +824,6 @@ static int nicvf_get_ts_info(struct net_device *netdev,</div><div class='ctx'> 		return ethtool_op_get_ts_info(netdev, info);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-				SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-				SOF_TIMESTAMPING_SOFTWARE |</div><div class='ctx'> 				SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='ctx'> 				SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='ctx'> 				SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='hunk'>@@ -862,12 +851,13 @@ static const struct ethtool_ops nicvf_ethtool_ops = {</div><div class='ctx'> 	.get_coalesce		= nicvf_get_coalesce,</div><div class='ctx'> 	.get_ringparam		= nicvf_get_ringparam,</div><div class='ctx'> 	.set_ringparam		= nicvf_set_ringparam,</div><div class='del'>-	.get_rxnfc		= nicvf_get_rxnfc,</div><div class='del'>-	.set_rxnfc		= nicvf_set_rxnfc,</div><div class='add'>+	.get_rx_ring_count	= nicvf_get_rx_ring_count,</div><div class='ctx'> 	.get_rxfh_key_size	= nicvf_get_rxfh_key_size,</div><div class='ctx'> 	.get_rxfh_indir_size	= nicvf_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh		= nicvf_get_rxfh,</div><div class='ctx'> 	.set_rxfh		= nicvf_set_rxfh,</div><div class='add'>+	.get_rxfh_fields	= nicvf_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields	= nicvf_set_rxfh_fields,</div><div class='ctx'> 	.get_channels		= nicvf_get_channels,</div><div class='ctx'> 	.set_channels		= nicvf_set_channels,</div><div class='ctx'> 	.get_pauseparam         = nicvf_get_pauseparam,</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c<br/>index 40a44dcb3d9b..0b6e30a8feb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/nicvf_main.c</a></div><div class='hunk'>@@ -126,8 +126,7 @@ static void nicvf_write_to_mbx(struct nicvf *nic, union nic_mbx *mbx)</div><div class='ctx'> </div><div class='ctx'> int nicvf_send_msg_to_pf(struct nicvf *nic, union nic_mbx *mbx)</div><div class='ctx'> {</div><div class='del'>-	int timeout = NIC_MBOX_MSG_TIMEOUT;</div><div class='del'>-	int sleep = 10;</div><div class='add'>+	unsigned long timeout;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;nic-&gt;rx_mode_mtx);</div><div class='hunk'>@@ -137,6 +136,7 @@ int nicvf_send_msg_to_pf(struct nicvf *nic, union nic_mbx *mbx)</div><div class='ctx'> </div><div class='ctx'> 	nicvf_write_to_mbx(nic, mbx);</div><div class='ctx'> </div><div class='add'>+	timeout = jiffies + msecs_to_jiffies(NIC_MBOX_MSG_TIMEOUT);</div><div class='ctx'> 	/* Wait for previous message to be acked, timeout 2sec */</div><div class='ctx'> 	while (!nic-&gt;pf_acked) {</div><div class='ctx'> 		if (nic-&gt;pf_nacked) {</div><div class='hunk'>@@ -146,11 +146,10 @@ int nicvf_send_msg_to_pf(struct nicvf *nic, union nic_mbx *mbx)</div><div class='ctx'> 			ret = -EINVAL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		msleep(sleep);</div><div class='add'>+		usleep_range(8000, 10000);</div><div class='ctx'> 		if (nic-&gt;pf_acked)</div><div class='ctx'> 			break;</div><div class='del'>-		timeout -= sleep;</div><div class='del'>-		if (!timeout) {</div><div class='add'>+		if (time_after(jiffies, timeout)) {</div><div class='ctx'> 			netdev_err(nic-&gt;netdev,</div><div class='ctx'> 				   "PF didn't ACK to mbox msg 0x%02x from VF%d\n",</div><div class='ctx'> 				   (mbx-&gt;msg.msg &amp; 0xFF), nic-&gt;vf_id);</div><div class='hunk'>@@ -222,8 +221,7 @@ static void  nicvf_handle_mbx_intr(struct nicvf *nic)</div><div class='ctx'> 		nic-&gt;tns_mode = mbx.nic_cfg.tns_mode &amp; 0x7F;</div><div class='ctx'> 		nic-&gt;node = mbx.nic_cfg.node_id;</div><div class='ctx'> 		if (!nic-&gt;set_mac_pending)</div><div class='del'>-			ether_addr_copy(nic-&gt;netdev-&gt;dev_addr,</div><div class='del'>-					mbx.nic_cfg.mac_addr);</div><div class='add'>+			eth_hw_addr_set(nic-&gt;netdev, mbx.nic_cfg.mac_addr);</div><div class='ctx'> 		nic-&gt;sqs_mode = mbx.nic_cfg.sqs_mode;</div><div class='ctx'> 		nic-&gt;loopback_supported = mbx.nic_cfg.loopback_supported;</div><div class='ctx'> 		nic-&gt;link_up = false;</div><div class='hunk'>@@ -531,6 +529,7 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog,</div><div class='ctx'> 				struct cqe_rx_t *cqe_rx, struct snd_queue *sq,</div><div class='ctx'> 				struct rcv_queue *rq, struct sk_buff **skb)</div><div class='ctx'> {</div><div class='add'>+	unsigned char *hard_start, *data;</div><div class='ctx'> 	struct xdp_buff xdp;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	u32 action;</div><div class='hunk'>@@ -548,16 +547,14 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog,</div><div class='ctx'> 	cpu_addr = (u64)phys_to_virt(cpu_addr);</div><div class='ctx'> 	page = virt_to_page((void *)cpu_addr);</div><div class='ctx'> </div><div class='del'>-	xdp.data_hard_start = page_address(page);</div><div class='del'>-	xdp.data = (void *)cpu_addr;</div><div class='del'>-	xdp_set_data_meta_invalid(&amp;xdp);</div><div class='del'>-	xdp.data_end = xdp.data + len;</div><div class='del'>-	xdp.rxq = &amp;rq-&gt;xdp_rxq;</div><div class='add'>+	xdp_init_buff(&amp;xdp, RCV_FRAG_LEN + XDP_PACKET_HEADROOM,</div><div class='add'>+		      &amp;rq-&gt;xdp_rxq);</div><div class='add'>+	hard_start = page_address(page);</div><div class='add'>+	data = (unsigned char *)cpu_addr;</div><div class='add'>+	xdp_prepare_buff(&amp;xdp, hard_start, data - hard_start, len, false);</div><div class='ctx'> 	orig_data = xdp.data;</div><div class='ctx'> </div><div class='del'>-	rcu_read_lock();</div><div class='ctx'> 	action = bpf_prog_run_xdp(prog, &amp;xdp);</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> </div><div class='ctx'> 	len = xdp.data_end - xdp.data;</div><div class='ctx'> 	/* Check if XDP program has changed headers */</div><div class='hunk'>@@ -593,11 +590,11 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog,</div><div class='ctx'> 		nicvf_xdp_sq_append_pkt(nic, sq, (u64)xdp.data, dma_addr, len);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	default:</div><div class='del'>-		bpf_warn_invalid_xdp_action(action);</div><div class='del'>-		/* fall through */</div><div class='add'>+		bpf_warn_invalid_xdp_action(nic-&gt;netdev, prog, action);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_ABORTED:</div><div class='ctx'> 		trace_xdp_exception(nic-&gt;netdev, prog, action);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_DROP:</div><div class='ctx'> 		/* Check if it's a recycled page, if not</div><div class='ctx'> 		 * unmap the DMA mapping.</div><div class='hunk'>@@ -985,9 +982,9 @@ static int nicvf_poll(struct napi_struct *napi, int budget)</div><div class='ctx'>  *</div><div class='ctx'>  * As of now only CQ errors are handled</div><div class='ctx'>  */</div><div class='del'>-static void nicvf_handle_qs_err(unsigned long data)</div><div class='add'>+static void nicvf_handle_qs_err(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct nicvf *nic = (struct nicvf *)data;</div><div class='add'>+	struct nicvf *nic = from_tasklet(nic, t, qs_err_task);</div><div class='ctx'> 	struct queue_set *qs = nic-&gt;qs;</div><div class='ctx'> 	int qidx;</div><div class='ctx'> 	u64 status;</div><div class='hunk'>@@ -1226,7 +1223,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		netdev_err(nic-&gt;netdev,</div><div class='ctx'> 			   "Req for #%d msix vectors failed\n", nic-&gt;num_vec);</div><div class='del'>-		return 1;</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	sprintf(nic-&gt;irq_name[irq], "%s Mbox", "NICVF");</div><div class='hunk'>@@ -1245,7 +1242,7 @@ static int nicvf_register_misc_interrupt(struct nicvf *nic)</div><div class='ctx'> 	if (!nicvf_check_pf_ready(nic)) {</div><div class='ctx'> 		nicvf_disable_intr(nic, NICVF_INTR_MBOX, 0);</div><div class='ctx'> 		nicvf_unregister_interrupts(nic);</div><div class='del'>-		return 1;</div><div class='add'>+		return -EIO;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1475,8 +1472,7 @@ int nicvf_open(struct net_device *netdev)</div><div class='ctx'> 		}</div><div class='ctx'> 		cq_poll-&gt;cq_idx = qidx;</div><div class='ctx'> 		cq_poll-&gt;nicvf = nic;</div><div class='del'>-		netif_napi_add(netdev, &amp;cq_poll-&gt;napi, nicvf_poll,</div><div class='del'>-			       NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(netdev, &amp;cq_poll-&gt;napi, nicvf_poll);</div><div class='ctx'> 		napi_enable(&amp;cq_poll-&gt;napi);</div><div class='ctx'> 		nic-&gt;napi[qidx] = cq_poll;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1493,12 +1489,10 @@ int nicvf_open(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init tasklet for handling Qset err interrupt */</div><div class='del'>-	tasklet_init(&amp;nic-&gt;qs_err_task, nicvf_handle_qs_err,</div><div class='del'>-		     (unsigned long)nic);</div><div class='add'>+	tasklet_setup(&amp;nic-&gt;qs_err_task, nicvf_handle_qs_err);</div><div class='ctx'> </div><div class='ctx'> 	/* Init RBDR tasklet which will refill RBDR */</div><div class='del'>-	tasklet_init(&amp;nic-&gt;rbdr_task, nicvf_rbdr_task,</div><div class='del'>-		     (unsigned long)nic);</div><div class='add'>+	tasklet_setup(&amp;nic-&gt;rbdr_task, nicvf_rbdr_task);</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;nic-&gt;rbdr_work, nicvf_rbdr_work);</div><div class='ctx'> </div><div class='ctx'> 	/* Configure CPI alorithm */</div><div class='hunk'>@@ -1584,7 +1578,6 @@ napi_del:</div><div class='ctx'> static int nicvf_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='del'>-	int orig_mtu = netdev-&gt;mtu;</div><div class='ctx'> </div><div class='ctx'> 	/* For now just support only the usual MTU sized frames,</div><div class='ctx'> 	 * plus some headroom for VLAN, QinQ.</div><div class='hunk'>@@ -1595,15 +1588,10 @@ static int nicvf_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='del'>-</div><div class='del'>-	if (!netif_running(netdev))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (nicvf_update_hw_max_frs(nic, new_mtu)) {</div><div class='del'>-		netdev-&gt;mtu = orig_mtu;</div><div class='add'>+	if (netif_running(netdev) &amp;&amp; nicvf_update_hw_max_frs(nic, new_mtu))</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1616,7 +1604,7 @@ static int nicvf_set_mac_address(struct net_device *netdev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr-&gt;sa_data, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	if (nic-&gt;pdev-&gt;msix_enabled) {</div><div class='ctx'> 		if (nicvf_hw_set_mac_addr(nic, netdev))</div><div class='hunk'>@@ -1741,7 +1729,7 @@ static void nicvf_get_stats64(struct net_device *netdev,</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void nicvf_tx_timeout(struct net_device *dev)</div><div class='add'>+static void nicvf_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1876,13 +1864,8 @@ static int nicvf_xdp_setup(struct nicvf *nic, struct bpf_prog *prog)</div><div class='ctx'> </div><div class='ctx'> 	if (nic-&gt;xdp_prog) {</div><div class='ctx'> 		/* Attach BPF program */</div><div class='del'>-		nic-&gt;xdp_prog = bpf_prog_add(nic-&gt;xdp_prog, nic-&gt;rx_queues - 1);</div><div class='del'>-		if (!IS_ERR(nic-&gt;xdp_prog)) {</div><div class='del'>-			bpf_attached = true;</div><div class='del'>-		} else {</div><div class='del'>-			ret = PTR_ERR(nic-&gt;xdp_prog);</div><div class='del'>-			nic-&gt;xdp_prog = NULL;</div><div class='del'>-		}</div><div class='add'>+		bpf_prog_add(nic-&gt;xdp_prog, nic-&gt;rx_queues - 1);</div><div class='add'>+		bpf_attached = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate Tx queues needed for XDP and network stack */</div><div class='hunk'>@@ -1911,30 +1894,23 @@ static int nicvf_xdp(struct net_device *netdev, struct netdev_bpf *xdp)</div><div class='ctx'> 	switch (xdp-&gt;command) {</div><div class='ctx'> 	case XDP_SETUP_PROG:</div><div class='ctx'> 		return nicvf_xdp_setup(nic, xdp-&gt;prog);</div><div class='del'>-	case XDP_QUERY_PROG:</div><div class='del'>-		xdp-&gt;prog_id = nic-&gt;xdp_prog ? nic-&gt;xdp_prog-&gt;aux-&gt;id : 0;</div><div class='del'>-		return 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)</div><div class='add'>+static int nicvf_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+			      struct kernel_hwtstamp_config *config,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	struct hwtstamp_config config;</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (!nic-&gt;ptp_clock)</div><div class='add'>+	if (!nic-&gt;ptp_clock) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "HW timestamping is not supported");</div><div class='ctx'> 		return -ENODEV;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;config, ifr-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='del'>-	/* reserved for future extensions */</div><div class='del'>-	if (config.flags)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	switch (config.tx_type) {</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1942,7 +1918,7 @@ static int nicvf_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	switch (config.rx_filter) {</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='ctx'> 	case HWTSTAMP_FILTER_NONE:</div><div class='ctx'> 		nic-&gt;hw_rx_tstamp = false;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -1961,7 +1937,7 @@ static int nicvf_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='ctx'> 	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='ctx'> 		nic-&gt;hw_rx_tstamp = true;</div><div class='del'>-		config.rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ERANGE;</div><div class='hunk'>@@ -1970,20 +1946,24 @@ static int nicvf_config_hwtstamp(struct net_device *netdev, struct ifreq *ifr)</div><div class='ctx'> 	if (netif_running(netdev))</div><div class='ctx'> 		nicvf_config_hw_rx_tstamp(nic, nic-&gt;hw_rx_tstamp);</div><div class='ctx'> </div><div class='del'>-	if (copy_to_user(ifr-&gt;ifr_data, &amp;config, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int nicvf_ioctl(struct net_device *netdev, struct ifreq *req, int cmd)</div><div class='add'>+static int nicvf_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+			      struct kernel_hwtstamp_config *config)</div><div class='ctx'> {</div><div class='del'>-	switch (cmd) {</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		return nicvf_config_hwtstamp(netdev, req);</div><div class='del'>-	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='del'>-	}</div><div class='add'>+	struct nicvf *nic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (!nic-&gt;ptp_clock)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+</div><div class='add'>+	/* TX timestamping is technically always on */</div><div class='add'>+	config-&gt;tx_type = HWTSTAMP_TX_ON;</div><div class='add'>+	config-&gt;rx_filter = nic-&gt;hw_rx_tstamp ?</div><div class='add'>+			    HWTSTAMP_FILTER_ALL :</div><div class='add'>+			    HWTSTAMP_FILTER_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void __nicvf_set_rx_mode_task(u8 mode, struct xcast_addr_list *mc_addrs,</div><div class='hunk'>@@ -2041,17 +2021,14 @@ static void nicvf_set_rx_mode_task(struct work_struct *work_arg)</div><div class='ctx'> 	u8 mode;</div><div class='ctx'> 	struct xcast_addr_list *mc;</div><div class='ctx'> </div><div class='del'>-	if (!vf_work)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	/* Save message data locally to prevent them from</div><div class='ctx'> 	 * being overwritten by next ndo_set_rx_mode call().</div><div class='ctx'> 	 */</div><div class='del'>-	spin_lock(&amp;nic-&gt;rx_mode_wq_lock);</div><div class='add'>+	spin_lock_bh(&amp;nic-&gt;rx_mode_wq_lock);</div><div class='ctx'> 	mode = vf_work-&gt;mode;</div><div class='ctx'> 	mc = vf_work-&gt;mc;</div><div class='ctx'> 	vf_work-&gt;mc = NULL;</div><div class='del'>-	spin_unlock(&amp;nic-&gt;rx_mode_wq_lock);</div><div class='add'>+	spin_unlock_bh(&amp;nic-&gt;rx_mode_wq_lock);</div><div class='ctx'> </div><div class='ctx'> 	__nicvf_set_rx_mode_task(mode, mc, nic);</div><div class='ctx'> }</div><div class='hunk'>@@ -2075,8 +2052,8 @@ static void nicvf_set_rx_mode(struct net_device *netdev)</div><div class='ctx'> 			mode |= BGX_XCAST_MCAST_FILTER;</div><div class='ctx'> 			/* here we need to copy mc addrs */</div><div class='ctx'> 			if (netdev_mc_count(netdev)) {</div><div class='del'>-				mc_list = kmalloc(offsetof(typeof(*mc_list),</div><div class='del'>-							   mc[netdev_mc_count(netdev)]),</div><div class='add'>+				mc_list = kmalloc(struct_size(mc_list, mc,</div><div class='add'>+							      netdev_mc_count(netdev)),</div><div class='ctx'> 						  GFP_ATOMIC);</div><div class='ctx'> 				if (unlikely(!mc_list))</div><div class='ctx'> 					return;</div><div class='hunk'>@@ -2108,8 +2085,9 @@ static const struct net_device_ops nicvf_netdev_ops = {</div><div class='ctx'> 	.ndo_fix_features       = nicvf_fix_features,</div><div class='ctx'> 	.ndo_set_features       = nicvf_set_features,</div><div class='ctx'> 	.ndo_bpf		= nicvf_xdp,</div><div class='del'>-	.ndo_do_ioctl           = nicvf_ioctl,</div><div class='ctx'> 	.ndo_set_rx_mode        = nicvf_set_rx_mode,</div><div class='add'>+	.ndo_hwtstamp_get	= nicvf_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set	= nicvf_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='hunk'>@@ -2131,10 +2109,8 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(dev, err, "Failed to enable PCI device\n");</div><div class='ctx'> </div><div class='ctx'> 	err = pci_request_regions(pdev, DRV_NAME);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -2142,18 +2118,12 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto err_disable_device;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(48));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "Unable to get usable DMA configuration\n");</div><div class='ctx'> 		goto err_release_regions;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "unable to get 48-bit DMA for consistent allocations\n");</div><div class='del'>-		goto err_release_regions;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	qcount = netif_get_num_default_rss_queues();</div><div class='ctx'> </div><div class='ctx'> 	/* Restrict multiqset support only for host bound VFs */</div><div class='hunk'>@@ -2185,6 +2155,9 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		nic-&gt;max_queues *= 2;</div><div class='ctx'> 	nic-&gt;ptp_clock = ptp_clock;</div><div class='ctx'> </div><div class='add'>+	/* Initialize mutex that serializes usage of VF's mailbox */</div><div class='add'>+	mutex_init(&amp;nic-&gt;rx_mode_mtx);</div><div class='add'>+</div><div class='ctx'> 	/* MAP VF's configuration registers */</div><div class='ctx'> 	nic-&gt;reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0);</div><div class='ctx'> 	if (!nic-&gt;reg_base) {</div><div class='hunk'>@@ -2244,6 +2217,10 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;nicvf_netdev_ops;</div><div class='ctx'> 	netdev-&gt;watchdog_timeo = NICVF_TX_TIMEOUT;</div><div class='ctx'> </div><div class='add'>+	if (!pass1_silicon(nic-&gt;pdev) &amp;&amp;</div><div class='add'>+	    nic-&gt;rx_queues + nic-&gt;tx_queues &lt;= nic-&gt;max_queues)</div><div class='add'>+		netdev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC;</div><div class='add'>+</div><div class='ctx'> 	/* MTU range: 64 - 9200 */</div><div class='ctx'> 	netdev-&gt;min_mtu = NIC_HW_MIN_FRS;</div><div class='ctx'> 	netdev-&gt;max_mtu = NIC_HW_MAX_FRS;</div><div class='hunk'>@@ -2261,12 +2238,11 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;nic-&gt;rx_mode_work.work, nicvf_set_rx_mode_task);</div><div class='ctx'> 	spin_lock_init(&amp;nic-&gt;rx_mode_wq_lock);</div><div class='del'>-	mutex_init(&amp;nic-&gt;rx_mode_mtx);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(netdev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "Failed to register netdevice\n");</div><div class='del'>-		goto err_unregister_interrupts;</div><div class='add'>+		goto err_destroy_workqueue;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	nic-&gt;msg_enable = debug;</div><div class='hunk'>@@ -2275,6 +2251,8 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_destroy_workqueue:</div><div class='add'>+	destroy_workqueue(nic-&gt;nicvf_rx_mode_wq);</div><div class='ctx'> err_unregister_interrupts:</div><div class='ctx'> 	nicvf_unregister_interrupts(nic);</div><div class='ctx'> err_free_netdev:</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c<br/>index 192bc92da881..5211759bfe47 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_queues.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_queues.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/nicvf_queues.c</a></div><div class='hunk'>@@ -10,6 +10,7 @@</div><div class='ctx'> #include &lt;linux/iommu.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/tso.h&gt;</div><div class='add'>+#include &lt;uapi/linux/bpf.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "nic_reg.h"</div><div class='ctx'> #include "nic.h"</div><div class='hunk'>@@ -460,9 +461,9 @@ void nicvf_rbdr_work(struct work_struct *work)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* In Softirq context, alloc rcv buffers in atomic mode */</div><div class='del'>-void nicvf_rbdr_task(unsigned long data)</div><div class='add'>+void nicvf_rbdr_task(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct nicvf *nic = (struct nicvf *)data;</div><div class='add'>+	struct nicvf *nic = from_tasklet(nic, t, rbdr_task);</div><div class='ctx'> </div><div class='ctx'> 	nicvf_refill_rbdr(nic, GFP_ATOMIC);</div><div class='ctx'> 	if (nic-&gt;rb_alloc_fail) {</div><div class='hunk'>@@ -770,13 +771,13 @@ static void nicvf_rcv_queue_config(struct nicvf *nic, struct queue_set *qs,</div><div class='ctx'> 	rq-&gt;caching = 1;</div><div class='ctx'> </div><div class='ctx'> 	/* Driver have no proper error path for failed XDP RX-queue info reg */</div><div class='del'>-	WARN_ON(xdp_rxq_info_reg(&amp;rq-&gt;xdp_rxq, nic-&gt;netdev, qidx) &lt; 0);</div><div class='add'>+	WARN_ON(xdp_rxq_info_reg(&amp;rq-&gt;xdp_rxq, nic-&gt;netdev, qidx, 0) &lt; 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Send a mailbox msg to PF to config RQ */</div><div class='ctx'> 	mbx.rq.msg = NIC_MBOX_MSG_RQ_CFG;</div><div class='ctx'> 	mbx.rq.qs_num = qs-&gt;vnic_id;</div><div class='ctx'> 	mbx.rq.rq_num = qidx;</div><div class='del'>-	mbx.rq.cfg = (rq-&gt;caching &lt;&lt; 26) | (rq-&gt;cq_qs &lt;&lt; 19) |</div><div class='add'>+	mbx.rq.cfg = ((u64)rq-&gt;caching &lt;&lt; 26) | (rq-&gt;cq_qs &lt;&lt; 19) |</div><div class='ctx'> 			  (rq-&gt;cq_idx &lt;&lt; 16) | (rq-&gt;cont_rbdr_qs &lt;&lt; 9) |</div><div class='ctx'> 			  (rq-&gt;cont_qs_rbdr_idx &lt;&lt; 8) |</div><div class='ctx'> 			  (rq-&gt;start_rbdr_qs &lt;&lt; 1) | (rq-&gt;start_qs_rbdr_idx);</div><div class='hunk'>@@ -1179,13 +1180,12 @@ void nicvf_sq_disable(struct nicvf *nic, int qidx)</div><div class='ctx'> void nicvf_sq_free_used_descs(struct net_device *netdev, struct snd_queue *sq,</div><div class='ctx'> 			      int qidx)</div><div class='ctx'> {</div><div class='del'>-	u64 head, tail;</div><div class='add'>+	u64 head;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	struct nicvf *nic = netdev_priv(netdev);</div><div class='ctx'> 	struct sq_hdr_subdesc *hdr;</div><div class='ctx'> </div><div class='ctx'> 	head = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_HEAD, qidx) &gt;&gt; 4;</div><div class='del'>-	tail = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_TAIL, qidx) &gt;&gt; 4;</div><div class='ctx'> 	while (sq-&gt;head != head) {</div><div class='ctx'> 		hdr = (struct sq_hdr_subdesc *)GET_SQ_DESC(sq, sq-&gt;head);</div><div class='ctx'> 		if (hdr-&gt;subdesc_type != SQ_DESC_TYPE_HEADER) {</div><div class='hunk'>@@ -1261,7 +1261,7 @@ int nicvf_xdp_sq_append_pkt(struct nicvf *nic, struct snd_queue *sq,</div><div class='ctx'> static int nicvf_tso_count_subdescs(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct skb_shared_info *sh = skb_shinfo(skb);</div><div class='del'>-	unsigned int sh_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+	unsigned int sh_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 	unsigned int data_len = skb-&gt;len - sh_len;</div><div class='ctx'> 	unsigned int p_len = sh-&gt;gso_size;</div><div class='ctx'> 	long f_id = -1;    /* id of the current fragment */</div><div class='hunk'>@@ -1382,18 +1382,16 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry,</div><div class='ctx'> </div><div class='ctx'> 	if (nic-&gt;hw_tso &amp;&amp; skb_shinfo(skb)-&gt;gso_size) {</div><div class='ctx'> 		hdr-&gt;tso = 1;</div><div class='del'>-		hdr-&gt;tso_start = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		hdr-&gt;tso_start = skb_tcp_all_headers(skb);</div><div class='ctx'> 		hdr-&gt;tso_max_paysize = skb_shinfo(skb)-&gt;gso_size;</div><div class='ctx'> 		/* For non-tunneled pkts, point this to L2 ethertype */</div><div class='ctx'> 		hdr-&gt;inner_l3_offset = skb_network_offset(skb) - 2;</div><div class='ctx'> 		this_cpu_inc(nic-&gt;pnicvf-&gt;drv_stats-&gt;tx_tso);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Check if timestamp is requested */</div><div class='del'>-	if (!(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)) {</div><div class='del'>-		skb_tx_timestamp(skb);</div><div class='add'>+	/* Check if hw timestamp is requested */</div><div class='add'>+	if (!(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP))</div><div class='ctx'> 		return;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	/* Tx timestamping not supported along with TSO, so ignore request */</div><div class='ctx'> 	if (skb_shinfo(skb)-&gt;gso_size)</div><div class='hunk'>@@ -1472,6 +1470,8 @@ static inline void nicvf_sq_doorbell(struct nicvf *nic, struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	netdev_tx_sent_queue(txq, skb-&gt;len);</div><div class='ctx'> </div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='ctx'> 	/* make sure all memory stores are done before ringing doorbell */</div><div class='ctx'> 	smp_wmb();</div><div class='ctx'> </div><div class='hunk'>@@ -1490,9 +1490,10 @@ static int nicvf_sq_append_tso(struct nicvf *nic, struct snd_queue *sq,</div><div class='ctx'> 	int seg_subdescs = 0, desc_cnt = 0;</div><div class='ctx'> 	int seg_len, total_len, data_left;</div><div class='ctx'> 	int hdr_qentry = qentry;</div><div class='del'>-	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+	int hdr_len;</div><div class='add'>+</div><div class='add'>+	hdr_len = tso_start(skb, &amp;tso);</div><div class='ctx'> </div><div class='del'>-	tso_start(skb, &amp;tso);</div><div class='ctx'> 	total_len = skb-&gt;len - hdr_len;</div><div class='ctx'> 	while (total_len &gt; 0) {</div><div class='ctx'> 		char *hdr;</div><div class='hunk'>@@ -1588,15 +1589,13 @@ int nicvf_sq_append_skb(struct nicvf *nic, struct snd_queue *sq,</div><div class='ctx'> 		goto doorbell;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-		const struct skb_frag_struct *frag;</div><div class='del'>-</div><div class='del'>-		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='ctx'> 		qentry = nicvf_get_nxt_sqentry(sq, qentry);</div><div class='ctx'> 		size = skb_frag_size(frag);</div><div class='ctx'> 		dma_addr = dma_map_page_attrs(&amp;nic-&gt;pdev-&gt;dev,</div><div class='ctx'> 					      skb_frag_page(frag),</div><div class='del'>-					      frag-&gt;page_offset, size,</div><div class='add'>+					      skb_frag_off(frag), size,</div><div class='ctx'> 					      DMA_TO_DEVICE,</div><div class='ctx'> 					      DMA_ATTR_SKIP_CPU_SYNC);</div><div class='ctx'> 		if (dma_mapping_error(&amp;nic-&gt;pdev-&gt;dev, dma_addr)) {</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h<br/>index bc2427c49b89..b7531041c56d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_queues.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/nicvf_queues.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/nicvf_queues.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/nicvf_queues.h</a></div><div class='hunk'>@@ -100,8 +100,8 @@</div><div class='ctx'>  * RED accepts pkt if unused CQE &lt; 2304 &amp; &gt;= 2560</div><div class='ctx'>  * DROPs pkts if unused CQE &lt; 2304</div><div class='ctx'>  */</div><div class='del'>-#define RQ_PASS_CQ_LVL         192ULL</div><div class='del'>-#define RQ_DROP_CQ_LVL         184ULL</div><div class='add'>+#define RQ_PASS_CQ_LVL         224ULL</div><div class='add'>+#define RQ_DROP_CQ_LVL         216ULL</div><div class='ctx'> </div><div class='ctx'> /* RED and Backpressure levels of RBDR for pkt reception</div><div class='ctx'>  * For RBDR, level is a measure of fullness i.e 0x0 means empty</div><div class='hunk'>@@ -348,7 +348,7 @@ void nicvf_xdp_sq_doorbell(struct nicvf *nic, struct snd_queue *sq, int sq_num);</div><div class='ctx'> </div><div class='ctx'> struct sk_buff *nicvf_get_rcv_skb(struct nicvf *nic,</div><div class='ctx'> 				  struct cqe_rx_t *cqe_rx, bool xdp);</div><div class='del'>-void nicvf_rbdr_task(unsigned long data);</div><div class='add'>+void nicvf_rbdr_task(struct tasklet_struct *t);</div><div class='ctx'> void nicvf_rbdr_work(struct work_struct *work);</div><div class='ctx'> </div><div class='ctx'> void nicvf_enable_intr(struct nicvf *nic, int int_type, int q_idx);</div><div class='hunk'>@@ -359,8 +359,6 @@ int nicvf_is_intr_enabled(struct nicvf *nic, int int_type, int q_idx);</div><div class='ctx'> /* Register access APIs */</div><div class='ctx'> void nicvf_reg_write(struct nicvf *nic, u64 offset, u64 val);</div><div class='ctx'> u64  nicvf_reg_read(struct nicvf *nic, u64 offset);</div><div class='del'>-void nicvf_qset_reg_write(struct nicvf *nic, u64 offset, u64 val);</div><div class='del'>-u64 nicvf_qset_reg_read(struct nicvf *nic, u64 offset);</div><div class='ctx'> void nicvf_queue_reg_write(struct nicvf *nic, u64 offset,</div><div class='ctx'> 			   u64 qidx, u64 val);</div><div class='ctx'> u64  nicvf_queue_reg_read(struct nicvf *nic,</div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c<br/>index ad22554857bf..9efb60842ad1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/thunder_bgx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/thunder_bgx.c</a></div><div class='hunk'>@@ -54,7 +54,7 @@ struct lmac {</div><div class='ctx'> 	bool			link_up;</div><div class='ctx'> 	int			lmacid; /* ID within BGX */</div><div class='ctx'> 	int			lmacid_bd; /* ID on board */</div><div class='del'>-	struct net_device       netdev;</div><div class='add'>+	struct net_device       *netdev;</div><div class='ctx'> 	struct phy_device       *phydev;</div><div class='ctx'> 	unsigned int            last_duplex;</div><div class='ctx'> 	unsigned int            last_link;</div><div class='hunk'>@@ -410,10 +410,19 @@ void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable)</div><div class='ctx'> 	lmac = &amp;bgx-&gt;lmac[lmacid];</div><div class='ctx'> </div><div class='ctx'> 	cfg = bgx_reg_read(bgx, lmacid, BGX_CMRX_CFG);</div><div class='del'>-	if (enable)</div><div class='add'>+	if (enable) {</div><div class='ctx'> 		cfg |= CMR_PKT_RX_EN | CMR_PKT_TX_EN;</div><div class='del'>-	else</div><div class='add'>+</div><div class='add'>+		/* enable TX FIFO Underflow interrupt */</div><div class='add'>+		bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1S,</div><div class='add'>+			       GMI_TXX_INT_UNDFLW);</div><div class='add'>+	} else {</div><div class='ctx'> 		cfg &amp;= ~(CMR_PKT_RX_EN | CMR_PKT_TX_EN);</div><div class='add'>+</div><div class='add'>+		/* Disable TX FIFO Underflow interrupt */</div><div class='add'>+		bgx_reg_modify(bgx, lmacid, BGX_GMP_GMI_TXX_INT_ENA_W1C,</div><div class='add'>+			       GMI_TXX_INT_UNDFLW);</div><div class='add'>+	}</div><div class='ctx'> 	bgx_reg_write(bgx, lmacid, BGX_CMRX_CFG, cfg);</div><div class='ctx'> </div><div class='ctx'> 	if (bgx-&gt;is_rgx)</div><div class='hunk'>@@ -581,13 +590,12 @@ static void bgx_sgmii_change_link_state(struct lmac *lmac)</div><div class='ctx'> </div><div class='ctx'> static void bgx_lmac_handler(struct net_device *netdev)</div><div class='ctx'> {</div><div class='del'>-	struct lmac *lmac = container_of(netdev, struct lmac, netdev);</div><div class='ctx'> 	struct phy_device *phydev;</div><div class='add'>+	struct lmac *lmac, **priv;</div><div class='ctx'> 	int link_changed = 0;</div><div class='ctx'> </div><div class='del'>-	if (!lmac)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='add'>+	priv = netdev_priv(netdev);</div><div class='add'>+	lmac = *priv;</div><div class='ctx'> 	phydev = lmac-&gt;phydev;</div><div class='ctx'> </div><div class='ctx'> 	if (!phydev-&gt;link &amp;&amp; lmac-&gt;last_link)</div><div class='hunk'>@@ -1007,14 +1015,14 @@ static void bgx_poll_for_link(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	if ((spu_link &amp; SPU_STATUS1_RCV_LNK) &amp;&amp;</div><div class='ctx'> 	    !(smu_link &amp; SMU_RX_CTL_STATUS)) {</div><div class='del'>-		lmac-&gt;link_up = 1;</div><div class='add'>+		lmac-&gt;link_up = true;</div><div class='ctx'> 		if (lmac-&gt;lmac_type == BGX_MODE_XLAUI)</div><div class='ctx'> 			lmac-&gt;last_speed = SPEED_40000;</div><div class='ctx'> 		else</div><div class='ctx'> 			lmac-&gt;last_speed = SPEED_10000;</div><div class='ctx'> 		lmac-&gt;last_duplex = DUPLEX_FULL;</div><div class='ctx'> 	} else {</div><div class='del'>-		lmac-&gt;link_up = 0;</div><div class='add'>+		lmac-&gt;link_up = false;</div><div class='ctx'> 		lmac-&gt;last_speed = SPEED_UNKNOWN;</div><div class='ctx'> 		lmac-&gt;last_duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1023,7 +1031,7 @@ static void bgx_poll_for_link(struct work_struct *work)</div><div class='ctx'> 		if (lmac-&gt;link_up) {</div><div class='ctx'> 			if (bgx_xaui_check_link(lmac)) {</div><div class='ctx'> 				/* Errors, clear link_up state */</div><div class='del'>-				lmac-&gt;link_up = 0;</div><div class='add'>+				lmac-&gt;link_up = false;</div><div class='ctx'> 				lmac-&gt;last_speed = SPEED_UNKNOWN;</div><div class='ctx'> 				lmac-&gt;last_duplex = DUPLEX_UNKNOWN;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1039,7 +1047,7 @@ static int phy_interface_mode(u8 lmac_type)</div><div class='ctx'> 	if (lmac_type == BGX_MODE_QSGMII)</div><div class='ctx'> 		return PHY_INTERFACE_MODE_QSGMII;</div><div class='ctx'> 	if (lmac_type == BGX_MODE_RGMII)</div><div class='del'>-		return PHY_INTERFACE_MODE_RGMII;</div><div class='add'>+		return PHY_INTERFACE_MODE_RGMII_RXID;</div><div class='ctx'> </div><div class='ctx'> 	return PHY_INTERFACE_MODE_SGMII;</div><div class='ctx'> }</div><div class='hunk'>@@ -1055,11 +1063,11 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)</div><div class='ctx'> 	if ((lmac-&gt;lmac_type == BGX_MODE_SGMII) ||</div><div class='ctx'> 	    (lmac-&gt;lmac_type == BGX_MODE_QSGMII) ||</div><div class='ctx'> 	    (lmac-&gt;lmac_type == BGX_MODE_RGMII)) {</div><div class='del'>-		lmac-&gt;is_sgmii = 1;</div><div class='add'>+		lmac-&gt;is_sgmii = true;</div><div class='ctx'> 		if (bgx_lmac_sgmii_init(bgx, lmac))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	} else {</div><div class='del'>-		lmac-&gt;is_sgmii = 0;</div><div class='add'>+		lmac-&gt;is_sgmii = false;</div><div class='ctx'> 		if (bgx_lmac_xaui_init(bgx, lmac))</div><div class='ctx'> 			return -1;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1110,18 +1118,17 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)</div><div class='ctx'> 		}</div><div class='ctx'> 		lmac-&gt;phydev-&gt;dev_flags = 0;</div><div class='ctx'> </div><div class='del'>-		if (phy_connect_direct(&amp;lmac-&gt;netdev, lmac-&gt;phydev,</div><div class='add'>+		if (phy_connect_direct(lmac-&gt;netdev, lmac-&gt;phydev,</div><div class='ctx'> 				       bgx_lmac_handler,</div><div class='ctx'> 				       phy_interface_mode(lmac-&gt;lmac_type)))</div><div class='ctx'> 			return -ENODEV;</div><div class='ctx'> </div><div class='del'>-		phy_start_aneg(lmac-&gt;phydev);</div><div class='add'>+		phy_start(lmac-&gt;phydev);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> poll:</div><div class='del'>-	lmac-&gt;check_link = alloc_workqueue("check_link", WQ_UNBOUND |</div><div class='del'>-					   WQ_MEM_RECLAIM, 1);</div><div class='add'>+	lmac-&gt;check_link = alloc_ordered_workqueue("check_link", WQ_MEM_RECLAIM);</div><div class='ctx'> 	if (!lmac-&gt;check_link)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	INIT_DELAYED_WORK(&amp;lmac-&gt;dwork, bgx_poll_for_link);</div><div class='hunk'>@@ -1304,7 +1311,7 @@ static void lmac_set_training(struct bgx *bgx, struct lmac *lmac, int lmacid)</div><div class='ctx'> {</div><div class='ctx'> 	if ((lmac-&gt;lmac_type != BGX_MODE_10G_KR) &amp;&amp;</div><div class='ctx'> 	    (lmac-&gt;lmac_type != BGX_MODE_40G_KR)) {</div><div class='del'>-		lmac-&gt;use_training = 0;</div><div class='add'>+		lmac-&gt;use_training = false;</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1383,22 +1390,16 @@ static int acpi_get_mac_address(struct device *dev, struct acpi_device *adev,</div><div class='ctx'> 	u8 mac[ETH_ALEN];</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = fwnode_property_read_u8_array(acpi_fwnode_handle(adev),</div><div class='del'>-					    "mac-address", mac, ETH_ALEN);</div><div class='del'>-	if (ret)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	if (!is_valid_ether_addr(mac)) {</div><div class='add'>+	ret = fwnode_get_mac_address(acpi_fwnode_handle(adev), mac);</div><div class='add'>+	if (ret) {</div><div class='ctx'> 		dev_err(dev, "MAC address invalid: %pM\n", mac);</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		goto out;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "MAC address set to: %pM\n", mac);</div><div class='ctx'> </div><div class='del'>-	memcpy(dst, mac, ETH_ALEN);</div><div class='del'>-out:</div><div class='del'>-	return ret;</div><div class='add'>+	ether_addr_copy(dst, mac);</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Currently only sets the MAC address. */</div><div class='hunk'>@@ -1409,12 +1410,13 @@ static acpi_status bgx_acpi_register_phy(acpi_handle handle,</div><div class='ctx'> 	struct device *dev = &amp;bgx-&gt;pdev-&gt;dev;</div><div class='ctx'> 	struct acpi_device *adev;</div><div class='ctx'> </div><div class='del'>-	if (acpi_bus_get_device(handle, &amp;adev))</div><div class='add'>+	adev = acpi_fetch_acpi_dev(handle);</div><div class='add'>+	if (!adev)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='ctx'> 	acpi_get_mac_address(dev, adev, bgx-&gt;lmac[bgx-&gt;acpi_lmac_idx].mac);</div><div class='ctx'> </div><div class='del'>-	SET_NETDEV_DEV(&amp;bgx-&gt;lmac[bgx-&gt;acpi_lmac_idx].netdev, dev);</div><div class='add'>+	SET_NETDEV_DEV(bgx-&gt;lmac[bgx-&gt;acpi_lmac_idx].netdev, dev);</div><div class='ctx'> </div><div class='ctx'> 	bgx-&gt;lmac[bgx-&gt;acpi_lmac_idx].lmacid = bgx-&gt;acpi_lmac_idx;</div><div class='ctx'> 	bgx-&gt;acpi_lmac_idx++; /* move to next LMAC */</div><div class='hunk'>@@ -1427,16 +1429,18 @@ static acpi_status bgx_acpi_match_id(acpi_handle handle, u32 lvl,</div><div class='ctx'> {</div><div class='ctx'> 	struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };</div><div class='ctx'> 	struct bgx *bgx = context;</div><div class='del'>-	char bgx_sel[5];</div><div class='add'>+	char bgx_sel[7];</div><div class='ctx'> </div><div class='del'>-	snprintf(bgx_sel, 5, "BGX%d", bgx-&gt;bgx_id);</div><div class='add'>+	snprintf(bgx_sel, sizeof(bgx_sel), "BGX%d", bgx-&gt;bgx_id);</div><div class='ctx'> 	if (ACPI_FAILURE(acpi_get_name(handle, ACPI_SINGLE_NAME, &amp;string))) {</div><div class='ctx'> 		pr_warn("Invalid link device\n");</div><div class='ctx'> 		return AE_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (strncmp(string.pointer, bgx_sel, 4))</div><div class='add'>+	if (strncmp(string.pointer, bgx_sel, 4)) {</div><div class='add'>+		kfree(string.pointer);</div><div class='ctx'> 		return AE_OK;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,</div><div class='ctx'> 			    bgx_acpi_register_phy, NULL, bgx, NULL);</div><div class='hunk'>@@ -1471,7 +1475,6 @@ static int bgx_init_of_phy(struct bgx *bgx)</div><div class='ctx'> 	device_for_each_child_node(&amp;bgx-&gt;pdev-&gt;dev, fwn) {</div><div class='ctx'> 		struct phy_device *pd;</div><div class='ctx'> 		struct device_node *phy_np;</div><div class='del'>-		const char *mac;</div><div class='ctx'> </div><div class='ctx'> 		/* Should always be an OF node.  But if it is not, we</div><div class='ctx'> 		 * cannot handle it, so exit the loop.</div><div class='hunk'>@@ -1480,11 +1483,9 @@ static int bgx_init_of_phy(struct bgx *bgx)</div><div class='ctx'> 		if (!node)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		mac = of_get_mac_address(node);</div><div class='del'>-		if (!IS_ERR(mac))</div><div class='del'>-			ether_addr_copy(bgx-&gt;lmac[lmac].mac, mac);</div><div class='add'>+		of_get_mac_address(node, bgx-&gt;lmac[lmac].mac);</div><div class='ctx'> </div><div class='del'>-		SET_NETDEV_DEV(&amp;bgx-&gt;lmac[lmac].netdev, &amp;bgx-&gt;pdev-&gt;dev);</div><div class='add'>+		SET_NETDEV_DEV(bgx-&gt;lmac[lmac].netdev, &amp;bgx-&gt;pdev-&gt;dev);</div><div class='ctx'> 		bgx-&gt;lmac[lmac].lmacid = lmac;</div><div class='ctx'> </div><div class='ctx'> 		phy_np = of_parse_phandle(node, "phy-handle", 0);</div><div class='hunk'>@@ -1492,13 +1493,17 @@ static int bgx_init_of_phy(struct bgx *bgx)</div><div class='ctx'> 		 * this cortina phy, for which there is no driver</div><div class='ctx'> 		 * support, ignore it.</div><div class='ctx'> 		 */</div><div class='del'>-		if (phy_np &amp;&amp;</div><div class='del'>-		    !of_device_is_compatible(phy_np, "cortina,cs4223-slice")) {</div><div class='del'>-			/* Wait until the phy drivers are available */</div><div class='del'>-			pd = of_phy_find_device(phy_np);</div><div class='del'>-			if (!pd)</div><div class='del'>-				goto defer;</div><div class='del'>-			bgx-&gt;lmac[lmac].phydev = pd;</div><div class='add'>+		if (phy_np) {</div><div class='add'>+			if (!of_device_is_compatible(phy_np, "cortina,cs4223-slice")) {</div><div class='add'>+				/* Wait until the phy drivers are available */</div><div class='add'>+				pd = of_phy_find_device(phy_np);</div><div class='add'>+				if (!pd) {</div><div class='add'>+					of_node_put(phy_np);</div><div class='add'>+					goto defer;</div><div class='add'>+				}</div><div class='add'>+				bgx-&gt;lmac[lmac].phydev = pd;</div><div class='add'>+			}</div><div class='add'>+			of_node_put(phy_np);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		lmac++;</div><div class='hunk'>@@ -1514,11 +1519,11 @@ defer:</div><div class='ctx'> 	 * for phy devices we may have already found.</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (lmac) {</div><div class='add'>+		lmac--;</div><div class='ctx'> 		if (bgx-&gt;lmac[lmac].phydev) {</div><div class='ctx'> 			put_device(&amp;bgx-&gt;lmac[lmac].phydev-&gt;mdio.dev);</div><div class='ctx'> 			bgx-&gt;lmac[lmac].phydev = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		lmac--;</div><div class='ctx'> 	}</div><div class='ctx'> 	of_node_put(node);</div><div class='ctx'> 	return -EPROBE_DEFER;</div><div class='hunk'>@@ -1541,6 +1546,48 @@ static int bgx_init_phy(struct bgx *bgx)</div><div class='ctx'> 	return bgx_init_of_phy(bgx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static irqreturn_t bgx_intr_handler(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct bgx *bgx = (struct bgx *)data;</div><div class='add'>+	u64 status, val;</div><div class='add'>+	int lmac;</div><div class='add'>+</div><div class='add'>+	for (lmac = 0; lmac &lt; bgx-&gt;lmac_count; lmac++) {</div><div class='add'>+		status = bgx_reg_read(bgx, lmac, BGX_GMP_GMI_TXX_INT);</div><div class='add'>+		if (status &amp; GMI_TXX_INT_UNDFLW) {</div><div class='add'>+			pci_err(bgx-&gt;pdev, "BGX%d lmac%d UNDFLW\n",</div><div class='add'>+				bgx-&gt;bgx_id, lmac);</div><div class='add'>+			val = bgx_reg_read(bgx, lmac, BGX_CMRX_CFG);</div><div class='add'>+			val &amp;= ~CMR_EN;</div><div class='add'>+			bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);</div><div class='add'>+			val |= CMR_EN;</div><div class='add'>+			bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);</div><div class='add'>+		}</div><div class='add'>+		/* clear interrupts */</div><div class='add'>+		bgx_reg_write(bgx, lmac, BGX_GMP_GMI_TXX_INT, status);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bgx_register_intr(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct bgx *bgx = pci_get_drvdata(pdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = pci_alloc_irq_vectors(pdev, BGX_LMAC_VEC_OFFSET,</div><div class='add'>+				    BGX_LMAC_VEC_OFFSET, PCI_IRQ_ALL_TYPES);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		pci_err(pdev, "Req for #%d msix vectors failed\n",</div><div class='add'>+			BGX_LMAC_VEC_OFFSET);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	ret = pci_request_irq(pdev, GMPX_GMI_TX_INT, bgx_intr_handler, NULL,</div><div class='add'>+			      bgx, "BGX%d", bgx-&gt;bgx_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1556,17 +1603,16 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, bgx);</div><div class='ctx'> </div><div class='del'>-	err = pci_enable_device(pdev);</div><div class='add'>+	err = pcim_enable_device(pdev);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		dev_err(dev, "Failed to enable PCI device\n");</div><div class='ctx'> 		pci_set_drvdata(pdev, NULL);</div><div class='del'>-		return err;</div><div class='add'>+		return dev_err_probe(dev, err, "Failed to enable PCI device\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = pci_request_regions(pdev, DRV_NAME);</div><div class='add'>+	err = pcim_request_all_regions(pdev, DRV_NAME);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "PCI request regions failed 0x%x\n", err);</div><div class='del'>-		goto err_disable_device;</div><div class='add'>+		goto err_zero_drv_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MAP configuration registers */</div><div class='hunk'>@@ -1574,7 +1620,7 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (!bgx-&gt;reg_base) {</div><div class='ctx'> 		dev_err(dev, "BGX: Cannot map CSR memory space, aborting\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto err_release_regions;</div><div class='add'>+		goto err_zero_drv_data;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_max_bgx_per_node(pdev);</div><div class='hunk'>@@ -1604,12 +1650,31 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	bgx_get_qlm_mode(bgx);</div><div class='ctx'> </div><div class='add'>+	for (lmac = 0; lmac &lt; bgx-&gt;lmac_count; lmac++) {</div><div class='add'>+		struct lmac *lmacp, **priv;</div><div class='add'>+</div><div class='add'>+		lmacp = &amp;bgx-&gt;lmac[lmac];</div><div class='add'>+		lmacp-&gt;netdev = alloc_netdev_dummy(sizeof(struct lmac *));</div><div class='add'>+</div><div class='add'>+		if (!lmacp-&gt;netdev) {</div><div class='add'>+			for (int i = 0; i &lt; lmac; i++)</div><div class='add'>+				free_netdev(bgx-&gt;lmac[i].netdev);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_enable;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		priv = netdev_priv(lmacp-&gt;netdev);</div><div class='add'>+		*priv = lmacp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = bgx_init_phy(bgx);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_enable;</div><div class='ctx'> </div><div class='ctx'> 	bgx_init_hw(bgx);</div><div class='ctx'> </div><div class='add'>+	bgx_register_intr(pdev);</div><div class='add'>+</div><div class='ctx'> 	/* Enable all LMACs */</div><div class='ctx'> 	for (lmac = 0; lmac &lt; bgx-&gt;lmac_count; lmac++) {</div><div class='ctx'> 		err = bgx_lmac_enable(bgx, lmac);</div><div class='hunk'>@@ -1626,10 +1691,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> err_enable:</div><div class='ctx'> 	bgx_vnic[bgx-&gt;bgx_id] = NULL;</div><div class='del'>-err_release_regions:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-err_disable_device:</div><div class='del'>-	pci_disable_device(pdev);</div><div class='add'>+	pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);</div><div class='add'>+err_zero_drv_data:</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -1640,12 +1703,14 @@ static void bgx_remove(struct pci_dev *pdev)</div><div class='ctx'> 	u8 lmac;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable all LMACs */</div><div class='del'>-	for (lmac = 0; lmac &lt; bgx-&gt;lmac_count; lmac++)</div><div class='add'>+	for (lmac = 0; lmac &lt; bgx-&gt;lmac_count; lmac++) {</div><div class='ctx'> 		bgx_lmac_disable(bgx, lmac);</div><div class='add'>+		free_netdev(bgx-&gt;lmac[lmac].netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pci_free_irq(pdev, GMPX_GMI_TX_INT, bgx);</div><div class='ctx'> </div><div class='ctx'> 	bgx_vnic[bgx-&gt;bgx_id] = NULL;</div><div class='del'>-	pci_release_regions(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='ctx'> 	pci_set_drvdata(pdev, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h<br/>index 25888706bdcd..84f16ababaee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cavium/thunder/thunder_bgx.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cavium/thunder/thunder_bgx.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cavium/thunder/thunder_bgx.h</a></div><div class='hunk'>@@ -180,6 +180,15 @@</div><div class='ctx'> #define BGX_GMP_GMI_TXX_BURST		0x38228</div><div class='ctx'> #define BGX_GMP_GMI_TXX_MIN_PKT		0x38240</div><div class='ctx'> #define BGX_GMP_GMI_TXX_SGMII_CTL	0x38300</div><div class='add'>+#define BGX_GMP_GMI_TXX_INT		0x38500</div><div class='add'>+#define BGX_GMP_GMI_TXX_INT_W1S		0x38508</div><div class='add'>+#define BGX_GMP_GMI_TXX_INT_ENA_W1C	0x38510</div><div class='add'>+#define BGX_GMP_GMI_TXX_INT_ENA_W1S	0x38518</div><div class='add'>+#define  GMI_TXX_INT_PTP_LOST			BIT_ULL(4)</div><div class='add'>+#define  GMI_TXX_INT_LATE_COL			BIT_ULL(3)</div><div class='add'>+#define  GMI_TXX_INT_XSDEF			BIT_ULL(2)</div><div class='add'>+#define  GMI_TXX_INT_XSCOL			BIT_ULL(1)</div><div class='add'>+#define  GMI_TXX_INT_UNDFLW			BIT_ULL(0)</div><div class='ctx'> </div><div class='ctx'> #define BGX_MSIX_VEC_0_29_ADDR		0x400000 /* +(0..29) &lt;&lt; 4 */</div><div class='ctx'> #define BGX_MSIX_VEC_0_29_CTL		0x400008</div><div class='hunk'>@@ -210,9 +219,7 @@</div><div class='ctx'> void bgx_set_dmac_cam_filter(int node, int bgx_idx, int lmacid, u64 mac, u8 vf);</div><div class='ctx'> void bgx_reset_xcast_mode(int node, int bgx_idx, int lmacid, u8 vf);</div><div class='ctx'> void bgx_set_xcast_mode(int node, int bgx_idx, int lmacid, u8 mode);</div><div class='del'>-void octeon_mdiobus_force_mod_depencency(void);</div><div class='ctx'> void bgx_lmac_rx_tx_enable(int node, int bgx_idx, int lmacid, bool enable);</div><div class='del'>-void bgx_add_dmac_addr(u64 dmac, int node, int bgx_idx, int lmac);</div><div class='ctx'> unsigned bgx_get_map(int node);</div><div class='ctx'> int bgx_get_lmac_count(int node, int bgx);</div><div class='ctx'> const u8 *bgx_get_lmac_mac(int node, int bgx_idx, int lmacid);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/Kconfig b/drivers/net/ethernet/chelsio/Kconfig<br/>index 9909bfda167e..c931ec8cac40 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_CHELSIO</div><div class='ctx'> 	bool "Chelsio devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -22,11 +22,11 @@ config CHELSIO_T1</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MDIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Chelsio gigabit and 10-gigabit</div><div class='ctx'> 	  Ethernet cards. More information about adapter features and</div><div class='ctx'> 	  performance tuning is in</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/chelsio/cxgb.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/networking/device_drivers/ethernet/chelsio/cxgb.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  For general information about Chelsio and our products, visit</div><div class='ctx'> 	  our website at &lt;http://www.chelsio.com&gt;.</div><div class='hunk'>@@ -42,7 +42,7 @@ config CHELSIO_T1</div><div class='ctx'> config CHELSIO_T1_1G</div><div class='ctx'> 	bool "Chelsio gigabit Ethernet support"</div><div class='ctx'> 	depends on CHELSIO_T1</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enables support for Chelsio's gigabit Ethernet PCI cards.  If you</div><div class='ctx'> 	  are using only 10G cards say 'N' here.</div><div class='ctx'> </div><div class='hunk'>@@ -51,7 +51,7 @@ config CHELSIO_T3</div><div class='ctx'> 	depends on PCI &amp;&amp; INET</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select MDIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet</div><div class='ctx'> 	  adapters.</div><div class='ctx'> </div><div class='hunk'>@@ -68,11 +68,12 @@ config CHELSIO_T3</div><div class='ctx'> </div><div class='ctx'> config CHELSIO_T4</div><div class='ctx'> 	tristate "Chelsio Communications T4/T5/T6 Ethernet support"</div><div class='del'>-	depends on PCI &amp;&amp; (IPV6 || IPV6=n)</div><div class='add'>+	depends on PCI &amp;&amp; (IPV6 || IPV6=n) &amp;&amp; (TLS || TLS=n)</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='ctx'> 	select FW_LOADER</div><div class='ctx'> 	select MDIO</div><div class='ctx'> 	select ZLIB_DEFLATE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Chelsio T4, T5 &amp; T6 based gigabit, 10Gb Ethernet</div><div class='ctx'> 	  adapter and T5/T6 based 40Gb and T6 based 25Gb, 50Gb and 100Gb</div><div class='ctx'> 	  Ethernet adapters.</div><div class='hunk'>@@ -92,7 +93,7 @@ config CHELSIO_T4_DCB</div><div class='ctx'> 	bool "Data Center Bridging (DCB) Support for Chelsio T4/T5/T6 cards"</div><div class='ctx'> 	default n</div><div class='ctx'> 	depends on CHELSIO_T4 &amp;&amp; DCB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable DCB support through rtNetlink interface.</div><div class='ctx'> 	  Say Y here if you want to enable Data Center Bridging (DCB) support</div><div class='ctx'> 	  in the driver.</div><div class='hunk'>@@ -103,7 +104,7 @@ config CHELSIO_T4_FCOE</div><div class='ctx'> 	bool "Fibre Channel over Ethernet (FCoE) Support for Chelsio T5 cards"</div><div class='ctx'> 	default n</div><div class='ctx'> 	depends on CHELSIO_T4 &amp;&amp; CHELSIO_T4_DCB &amp;&amp; FCOE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable FCoE offload features.</div><div class='ctx'> 	  Say Y here if you want to enable Fibre Channel over Ethernet (FCoE) support</div><div class='ctx'> 	  in the driver.</div><div class='hunk'>@@ -113,7 +114,7 @@ config CHELSIO_T4_FCOE</div><div class='ctx'> config CHELSIO_T4VF</div><div class='ctx'> 	tristate "Chelsio Communications T4/T5/T6 Virtual Function Ethernet support"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports Chelsio T4, T5 &amp; T6 based gigabit, 10Gb Ethernet</div><div class='ctx'> 	  adapters and T5/T6 based 40Gb and T6 based 25Gb, 50Gb and 100Gb</div><div class='ctx'> 	  Ethernet adapters with PCI-E SR-IOV Virtual Functions.</div><div class='hunk'>@@ -131,7 +132,9 @@ config CHELSIO_T4VF</div><div class='ctx'> </div><div class='ctx'> config CHELSIO_LIB</div><div class='ctx'> 	tristate</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	Common library for Chelsio drivers.</div><div class='ctx'> </div><div class='add'>+source "drivers/net/ethernet/chelsio/inline_crypto/Kconfig"</div><div class='add'>+</div><div class='ctx'> endif # NET_VENDOR_CHELSIO</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/Makefile b/drivers/net/ethernet/chelsio/Makefile<br/>index c0f978d2e8a7..1a6fd8b2bb7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/Makefile</a></div><div class='hunk'>@@ -8,3 +8,4 @@ obj-$(CONFIG_CHELSIO_T3) += cxgb3/</div><div class='ctx'> obj-$(CONFIG_CHELSIO_T4) += cxgb4/</div><div class='ctx'> obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/</div><div class='ctx'> obj-$(CONFIG_CHELSIO_LIB) += libcxgb/</div><div class='add'>+obj-$(CONFIG_CHELSIO_INLINE_CRYPTO) += inline_crypto/</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/common.h b/drivers/net/ethernet/chelsio/cxgb/common.h<br/>index 94b9482f14a5..304bb282ab03 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/common.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: common.h                                                            *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -55,7 +46,6 @@</div><div class='ctx'> </div><div class='ctx'> #define DRV_DESCRIPTION "Chelsio 10Gb Ethernet Driver"</div><div class='ctx'> #define DRV_NAME "cxgb"</div><div class='del'>-#define DRV_VERSION "2.2"</div><div class='ctx'> </div><div class='ctx'> #define CH_DEVICE(devid, ssid, idx) \</div><div class='ctx'> 	{ PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx }</div><div class='hunk'>@@ -239,7 +229,6 @@ struct adapter {</div><div class='ctx'> 	int msg_enable;</div><div class='ctx'> 	u32 mmio_len;</div><div class='ctx'> </div><div class='del'>-	struct work_struct ext_intr_handler_task;</div><div class='ctx'> 	struct adapter_params params;</div><div class='ctx'> </div><div class='ctx'> 	/* Terminator modules. */</div><div class='hunk'>@@ -258,6 +247,7 @@ struct adapter {</div><div class='ctx'> </div><div class='ctx'> 	/* guards async operations */</div><div class='ctx'> 	spinlock_t async_lock ____cacheline_aligned;</div><div class='add'>+	u32 pending_thread_intr;</div><div class='ctx'> 	u32 slow_intr_mask;</div><div class='ctx'> 	int t1powersave;</div><div class='ctx'> };</div><div class='hunk'>@@ -335,20 +325,16 @@ void t1_interrupts_enable(adapter_t *adapter);</div><div class='ctx'> void t1_interrupts_disable(adapter_t *adapter);</div><div class='ctx'> void t1_interrupts_clear(adapter_t *adapter);</div><div class='ctx'> int t1_elmer0_ext_intr_handler(adapter_t *adapter);</div><div class='del'>-void t1_elmer0_ext_intr(adapter_t *adapter);</div><div class='del'>-int t1_slow_intr_handler(adapter_t *adapter);</div><div class='add'>+irqreturn_t t1_slow_intr_handler(adapter_t *adapter);</div><div class='ctx'> </div><div class='ctx'> int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc);</div><div class='ctx'> const struct board_info *t1_get_board_info(unsigned int board_id);</div><div class='del'>-const struct board_info *t1_get_board_info_from_ids(unsigned int devid,</div><div class='del'>-						    unsigned short ssid);</div><div class='ctx'> int t1_seeprom_read(adapter_t *adapter, u32 addr, __le32 *data);</div><div class='ctx'> int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,</div><div class='ctx'> 		     struct adapter_params *p);</div><div class='ctx'> int t1_init_hw_modules(adapter_t *adapter);</div><div class='ctx'> int t1_init_sw_modules(adapter_t *adapter, const struct board_info *bi);</div><div class='ctx'> void t1_free_sw_modules(adapter_t *adapter);</div><div class='del'>-void t1_fatal_err(adapter_t *adapter);</div><div class='ctx'> void t1_link_changed(adapter_t *adapter, int port_id);</div><div class='ctx'> void t1_link_negotiated(adapter_t *adapter, int port_id, int link_stat,</div><div class='ctx'> 			    int speed, int duplex, int pause);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/cphy.h b/drivers/net/ethernet/chelsio/cxgb/cphy.h<br/>index bf43da6c6a63..12639b688ddc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/cphy.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/cphy.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/cphy.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/cphy.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: cphy.h                                                              *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h b/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h<br/>index 5249686afe71..a30fb407115d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/cpl5_cmd.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: cpl5_cmd.h                                                          *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -635,4 +626,3 @@ struct cpl_mss_change {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #endif /* _CXGB_CPL5_CMD_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c<br/>index 0ccdde366ae1..4a0e2d2eb60a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/cxgb2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/cxgb2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/cxgb2.c</a></div><div class='hunk'>@@ -211,9 +211,10 @@ static int cxgb_up(struct adapter *adapter)</div><div class='ctx'> 	t1_interrupts_clear(adapter);</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;params.has_msi = !disable_msi &amp;&amp; !pci_enable_msi(adapter-&gt;pdev);</div><div class='del'>-	err = request_irq(adapter-&gt;pdev-&gt;irq, t1_interrupt,</div><div class='del'>-			  adapter-&gt;params.has_msi ? 0 : IRQF_SHARED,</div><div class='del'>-			  adapter-&gt;name, adapter);</div><div class='add'>+	err = request_threaded_irq(adapter-&gt;pdev-&gt;irq, t1_interrupt,</div><div class='add'>+				   t1_interrupt_thread,</div><div class='add'>+				   adapter-&gt;params.has_msi ? 0 : IRQF_SHARED,</div><div class='add'>+				   adapter-&gt;name, adapter);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		if (adapter-&gt;params.has_msi)</div><div class='ctx'> 			pci_disable_msi(adapter-&gt;pdev);</div><div class='hunk'>@@ -350,7 +351,7 @@ static void set_msglevel(struct net_device *dev, u32 val)</div><div class='ctx'> 	adapter-&gt;msg_enable = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const char stats_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+static const char stats_strings[][ETH_GSTRING_LEN] __nonstring_array = {</div><div class='ctx'> 	"TxOctetsOK",</div><div class='ctx'> 	"TxOctetsBad",</div><div class='ctx'> 	"TxUnicastFramesOK",</div><div class='hunk'>@@ -428,9 +429,8 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -710,7 +710,9 @@ static int set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='add'>+static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e,</div><div class='add'>+			  struct kernel_ethtool_ringparam *kernel_e,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> 	int jumbo_fl = t1_is_T1B(adapter) ? 1 : 0;</div><div class='hunk'>@@ -724,7 +726,9 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='ctx'> 	e-&gt;tx_pending = adapter-&gt;params.sge.cmdQ_size[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='add'>+static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e,</div><div class='add'>+			 struct kernel_ethtool_ringparam *kernel_e,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> 	int jumbo_fl = t1_is_T1B(adapter) ? 1 : 0;</div><div class='hunk'>@@ -748,7 +752,9 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='add'>+static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c,</div><div class='add'>+			struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -759,7 +765,9 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='add'>+static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c,</div><div class='add'>+			struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = dev-&gt;ml_priv;</div><div class='ctx'> </div><div class='hunk'>@@ -794,6 +802,9 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops t1_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX |</div><div class='add'>+				     ETHTOOL_COALESCE_RATE_SAMPLE_INTERVAL,</div><div class='ctx'> 	.get_drvinfo       = get_drvinfo,</div><div class='ctx'> 	.get_msglevel      = get_msglevel,</div><div class='ctx'> 	.set_msglevel      = set_msglevel,</div><div class='hunk'>@@ -833,7 +844,7 @@ static int t1_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	if ((ret = mac-&gt;ops-&gt;set_mtu(mac, new_mtu)))</div><div class='ctx'> 		return ret;</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -846,7 +857,7 @@ static int t1_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!mac-&gt;ops-&gt;macaddress_set)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	mac-&gt;ops-&gt;macaddress_set(mac, dev-&gt;dev_addr);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -914,51 +925,6 @@ static void mac_stats_task(struct work_struct *work)</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;work_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Processes elmer0 external interrupts in process context.</div><div class='del'>- */</div><div class='del'>-static void ext_intr_task(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct adapter *adapter =</div><div class='del'>-		container_of(work, struct adapter, ext_intr_handler_task);</div><div class='del'>-</div><div class='del'>-	t1_elmer0_ext_intr_handler(adapter);</div><div class='del'>-</div><div class='del'>-	/* Now reenable external interrupts */</div><div class='del'>-	spin_lock_irq(&amp;adapter-&gt;async_lock);</div><div class='del'>-	adapter-&gt;slow_intr_mask |= F_PL_INTR_EXT;</div><div class='del'>-	writel(F_PL_INTR_EXT, adapter-&gt;regs + A_PL_CAUSE);</div><div class='del'>-	writel(adapter-&gt;slow_intr_mask | F_PL_INTR_SGE_DATA,</div><div class='del'>-		   adapter-&gt;regs + A_PL_ENABLE);</div><div class='del'>-	spin_unlock_irq(&amp;adapter-&gt;async_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Interrupt-context handler for elmer0 external interrupts.</div><div class='del'>- */</div><div class='del'>-void t1_elmer0_ext_intr(struct adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * Schedule a task to handle external interrupts as we require</div><div class='del'>-	 * a process context.  We disable EXT interrupts in the interim</div><div class='del'>-	 * and let the task reenable them when it's done.</div><div class='del'>-	 */</div><div class='del'>-	adapter-&gt;slow_intr_mask &amp;= ~F_PL_INTR_EXT;</div><div class='del'>-	writel(adapter-&gt;slow_intr_mask | F_PL_INTR_SGE_DATA,</div><div class='del'>-		   adapter-&gt;regs + A_PL_ENABLE);</div><div class='del'>-	schedule_work(&amp;adapter-&gt;ext_intr_handler_task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void t1_fatal_err(struct adapter *adapter)</div><div class='del'>-{</div><div class='del'>-	if (adapter-&gt;flags &amp; FULL_INIT_DONE) {</div><div class='del'>-		t1_sge_stop(adapter-&gt;sge);</div><div class='del'>-		t1_interrupts_disable(adapter);</div><div class='del'>-	}</div><div class='del'>-	pr_alert("%s: encountered fatal error, operation suspended\n",</div><div class='del'>-		 adapter-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static const struct net_device_ops cxgb_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= cxgb_open,</div><div class='ctx'> 	.ndo_stop		= cxgb_close,</div><div class='hunk'>@@ -966,7 +932,7 @@ static const struct net_device_ops cxgb_netdev_ops = {</div><div class='ctx'> 	.ndo_get_stats		= t1_get_stats,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= t1_set_rxmode,</div><div class='del'>-	.ndo_do_ioctl		= t1_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= t1_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= t1_change_mtu,</div><div class='ctx'> 	.ndo_set_mac_address	= t1_set_mac_addr,</div><div class='ctx'> 	.ndo_fix_features	= t1_fix_features,</div><div class='hunk'>@@ -978,13 +944,11 @@ static const struct net_device_ops cxgb_netdev_ops = {</div><div class='ctx'> </div><div class='ctx'> static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	int i, err, pci_using_dac = 0;</div><div class='ctx'> 	unsigned long mmio_start, mmio_len;</div><div class='ctx'> 	const struct board_info *bi;</div><div class='ctx'> 	struct adapter *adapter = NULL;</div><div class='ctx'> 	struct port_info *pi;</div><div class='del'>-</div><div class='del'>-	pr_info_once("%s - version %s\n", DRV_DESCRIPTION, DRV_VERSION);</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -997,17 +961,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_disable_pdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='del'>-		pci_using_dac = 1;</div><div class='del'>-</div><div class='del'>-		if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='del'>-			pr_err("%s: unable to obtain 64-bit DMA for "</div><div class='del'>-			       "consistent allocations\n", pci_name(pdev));</div><div class='del'>-			err = -ENODEV;</div><div class='del'>-			goto out_disable_pdev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (err) {</div><div class='ctx'> 		pr_err("%s: no usable DMA configuration\n", pci_name(pdev));</div><div class='ctx'> 		goto out_disable_pdev;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1062,8 +1017,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			spin_lock_init(&amp;adapter-&gt;async_lock);</div><div class='ctx'> 			spin_lock_init(&amp;adapter-&gt;mac_lock);</div><div class='ctx'> </div><div class='del'>-			INIT_WORK(&amp;adapter-&gt;ext_intr_handler_task,</div><div class='del'>-				  ext_intr_task);</div><div class='ctx'> 			INIT_DELAYED_WORK(&amp;adapter-&gt;stats_update_task,</div><div class='ctx'> 					  mac_stats_task);</div><div class='ctx'> </div><div class='hunk'>@@ -1081,10 +1034,9 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		netdev-&gt;hw_features |= NETIF_F_SG | NETIF_F_IP_CSUM |</div><div class='ctx'> 			NETIF_F_RXCSUM;</div><div class='ctx'> 		netdev-&gt;features |= NETIF_F_SG | NETIF_F_IP_CSUM |</div><div class='del'>-			NETIF_F_RXCSUM | NETIF_F_LLTX;</div><div class='add'>+			NETIF_F_RXCSUM | NETIF_F_HIGHDMA;</div><div class='add'>+		netdev-&gt;lltx = true;</div><div class='ctx'> </div><div class='del'>-		if (pci_using_dac)</div><div class='del'>-			netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> 		if (vlan_tso_capable(adapter)) {</div><div class='ctx'> 			netdev-&gt;features |=</div><div class='ctx'> 				NETIF_F_HW_VLAN_CTAG_TX |</div><div class='hunk'>@@ -1102,7 +1054,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		netdev-&gt;hard_header_len += (netdev-&gt;hw_features &amp; NETIF_F_TSO) ?</div><div class='ctx'> 			sizeof(struct cpl_tx_pkt_lso) : sizeof(struct cpl_tx_pkt);</div><div class='ctx'> </div><div class='del'>-		netif_napi_add(netdev, &amp;adapter-&gt;napi, t1_poll, 64);</div><div class='add'>+		netif_napi_add(netdev, &amp;adapter-&gt;napi, t1_poll);</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;ethtool_ops = &amp;t1_ethtool_ops;</div><div class='ctx'> </div><div class='hunk'>@@ -1153,6 +1105,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (!adapter-&gt;registered_device_map) {</div><div class='ctx'> 		pr_err("%s: could not register any net devices\n",</div><div class='ctx'> 		       pci_name(pdev));</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto out_release_adapter_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/elmer0.h b/drivers/net/ethernet/chelsio/cxgb/elmer0.h<br/>index 81526ad36339..0427e894c277 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/elmer0.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/elmer0.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/elmer0.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/elmer0.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: elmer0.h                                                            *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -154,4 +145,3 @@ enum {</div><div class='ctx'> #define MI1_OP_INDIRECT_READ     3</div><div class='ctx'> </div><div class='ctx'> #endif /* _CXGB_ELMER0_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/espi.c b/drivers/net/ethernet/chelsio/cxgb/espi.c<br/>index 3e182eee799e..ef70569435be 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/espi.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/espi.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/espi.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/espi.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: espi.c                                                              *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  Ethernet SPI functionality.                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/espi.h b/drivers/net/ethernet/chelsio/cxgb/espi.h<br/>index 162de5259df9..f588e9f3b37a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/espi.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/espi.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/espi.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/espi.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: espi.h                                                              *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/gmac.h b/drivers/net/ethernet/chelsio/cxgb/gmac.h<br/>index dfa77491a910..96077da1ed5e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/gmac.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/gmac.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/gmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/gmac.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: gmac.h                                                              *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  Generic MAC functionality.                                               *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -117,7 +108,7 @@ struct cmac_ops {</div><div class='ctx'> 	const struct cmac_statistics *(*statistics_update)(struct cmac *, int);</div><div class='ctx'> </div><div class='ctx'> 	int (*macaddress_get)(struct cmac *, u8 mac_addr[6]);</div><div class='del'>-	int (*macaddress_set)(struct cmac *, u8 mac_addr[6]);</div><div class='add'>+	int (*macaddress_set)(struct cmac *, const u8 mac_addr[6]);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef struct _cmac_instance cmac_instance;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c b/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c<br/>index 7ddb301bcba0..556c8ad68fa8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/mv88x201x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/mv88x201x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/mv88x201x.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: mv88x201x.c                                                         *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  Marvell PHY (mv88x201x) functionality.                                   *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/my3126.c b/drivers/net/ethernet/chelsio/cxgb/my3126.c<br/>index 20c09cc4b323..60aa45b375b6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/my3126.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/my3126.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/my3126.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/my3126.c</a></div><div class='hunk'>@@ -94,7 +94,7 @@ static int my3126_interrupt_handler(struct cphy *cphy)</div><div class='ctx'> 	return cphy_cause_link_change;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void my3216_poll(struct work_struct *work)</div><div class='add'>+static void my3126_poll(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct cphy *cphy = container_of(work, struct cphy, phy_update.work);</div><div class='ctx'> </div><div class='hunk'>@@ -177,7 +177,7 @@ static struct cphy *my3126_phy_create(struct net_device *dev,</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='ctx'> 	cphy_init(cphy, dev, phy_addr, &amp;my3126_ops, mdio_ops);</div><div class='del'>-	INIT_DELAYED_WORK(&amp;cphy-&gt;phy_update, my3216_poll);</div><div class='add'>+	INIT_DELAYED_WORK(&amp;cphy-&gt;phy_update, my3126_poll);</div><div class='ctx'> 	cphy-&gt;bmsr = 0;</div><div class='ctx'> </div><div class='ctx'> 	return cphy;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/pm3393.c b/drivers/net/ethernet/chelsio/cxgb/pm3393.c<br/>index c27908e66f5e..f3ada6e7cdc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/pm3393.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/pm3393.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/pm3393.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/pm3393.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: pm3393.c                                                            *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  PMC/SIERRA (pm3393) MAC-PHY functionality.                               *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -150,7 +141,7 @@ static int pm3393_interrupt_enable(struct cmac *cmac)</div><div class='ctx'> 	pmwrite(cmac, SUNI1x10GEXP_REG_GLOBAL_INTERRUPT_ENABLE,</div><div class='ctx'> 		0 /*SUNI1x10GEXP_BITMSK_TOP_INTE */ );</div><div class='ctx'> </div><div class='del'>-	/* TERMINATOR - PL_INTERUPTS_EXT */</div><div class='add'>+	/* TERMINATOR - PL_INTERRUPTS_EXT */</div><div class='ctx'> 	pl_intr = readl(cmac-&gt;adapter-&gt;regs + A_PL_ENABLE);</div><div class='ctx'> 	pl_intr |= F_PL_INTR_EXT;</div><div class='ctx'> 	writel(pl_intr, cmac-&gt;adapter-&gt;regs + A_PL_ENABLE);</div><div class='hunk'>@@ -188,7 +179,7 @@ static int pm3393_interrupt_disable(struct cmac *cmac)</div><div class='ctx'> 	elmer &amp;= ~ELMER0_GP_BIT1;</div><div class='ctx'> 	t1_tpi_write(cmac-&gt;adapter, A_ELMER0_INT_ENABLE, elmer);</div><div class='ctx'> </div><div class='del'>-	/* TERMINATOR - PL_INTERUPTS_EXT */</div><div class='add'>+	/* TERMINATOR - PL_INTERRUPTS_EXT */</div><div class='ctx'> 	/* DO NOT DISABLE TERMINATOR's EXTERNAL INTERRUPTS. ANOTHER CHIP</div><div class='ctx'> 	 * COULD WANT THEM ENABLED. We disable PM3393 at the ELMER level.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -231,7 +222,7 @@ static int pm3393_interrupt_clear(struct cmac *cmac)</div><div class='ctx'> 	elmer |= ELMER0_GP_BIT1;</div><div class='ctx'> 	t1_tpi_write(cmac-&gt;adapter, A_ELMER0_INT_CAUSE, elmer);</div><div class='ctx'> </div><div class='del'>-	/* TERMINATOR - PL_INTERUPTS_EXT</div><div class='add'>+	/* TERMINATOR - PL_INTERRUPTS_EXT</div><div class='ctx'> 	 */</div><div class='ctx'> 	pl_intr = readl(cmac-&gt;adapter-&gt;regs + A_PL_CAUSE);</div><div class='ctx'> 	pl_intr |= F_PL_INTR_EXT;</div><div class='hunk'>@@ -496,7 +487,7 @@ static int pm3393_macaddress_get(struct cmac *cmac, u8 mac_addr[6])</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pm3393_macaddress_set(struct cmac *cmac, u8 ma[6])</div><div class='add'>+static int pm3393_macaddress_set(struct cmac *cmac, const u8 ma[6])</div><div class='ctx'> {</div><div class='ctx'> 	u32 val, lo, mid, hi, enabled = cmac-&gt;instance-&gt;enabled;</div><div class='ctx'> </div><div class='hunk'>@@ -765,7 +756,7 @@ static int pm3393_mac_reset(adapter_t * adapter)</div><div class='ctx'> </div><div class='ctx'> 		/* ??? If this fails, might be able to software reset the XAUI part</div><div class='ctx'> 		 *     and try to recover... thus saving us from doing another HW reset */</div><div class='del'>-		/* Has the XAUI MABC PLL circuitry stablized? */</div><div class='add'>+		/* Has the XAUI MABC PLL circuitry stabilized? */</div><div class='ctx'> 		is_xaui_mabc_pll_locked =</div><div class='ctx'> 		    (val &amp; SUNI1x10GEXP_BITMSK_TOP_SXRA_EXPIRED);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/regs.h b/drivers/net/ethernet/chelsio/cxgb/regs.h<br/>index 964ce59ee169..f751e680cf7d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/regs.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: regs.h                                                              *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c<br/>index 47b5c8e2104b..5f354cf62cdd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/sge.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/sge.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: sge.c                                                               *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  DMA engine.                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -239,8 +230,10 @@ struct sched {</div><div class='ctx'> 	unsigned int	num;		/* num skbs in per port queues */</div><div class='ctx'> 	struct sched_port p[MAX_NPORTS];</div><div class='ctx'> 	struct tasklet_struct sched_tsk;/* tasklet used to run scheduler */</div><div class='add'>+	struct sge *sge;</div><div class='ctx'> };</div><div class='del'>-static void restart_sched(unsigned long);</div><div class='add'>+</div><div class='add'>+static void restart_sched(struct tasklet_struct *t);</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -378,7 +371,8 @@ static int tx_sched_init(struct sge *sge)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("tx_sched_init\n");</div><div class='del'>-	tasklet_init(&amp;s-&gt;sched_tsk, restart_sched, (unsigned long) sge);</div><div class='add'>+	tasklet_setup(&amp;s-&gt;sched_tsk, restart_sched);</div><div class='add'>+	s-&gt;sge = sge;</div><div class='ctx'> 	sge-&gt;tx_sched = s;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; MAX_NPORTS; i++) {</div><div class='hunk'>@@ -509,9 +503,8 @@ static void free_freelQ_buffers(struct pci_dev *pdev, struct freelQ *q)</div><div class='ctx'> 	while (q-&gt;credits--) {</div><div class='ctx'> 		struct freelQ_ce *ce = &amp;q-&gt;centries[cidx];</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(pdev, dma_unmap_addr(ce, dma_addr),</div><div class='del'>-				 dma_unmap_len(ce, dma_len),</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev, dma_unmap_addr(ce, dma_addr),</div><div class='add'>+				 dma_unmap_len(ce, dma_len), DMA_FROM_DEVICE);</div><div class='ctx'> 		dev_kfree_skb(ce-&gt;skb);</div><div class='ctx'> 		ce-&gt;skb = NULL;</div><div class='ctx'> 		if (++cidx == q-&gt;size)</div><div class='hunk'>@@ -529,8 +522,8 @@ static void free_rx_resources(struct sge *sge)</div><div class='ctx'> </div><div class='ctx'> 	if (sge-&gt;respQ.entries) {</div><div class='ctx'> 		size = sizeof(struct respQ_e) * sge-&gt;respQ.size;</div><div class='del'>-		pci_free_consistent(pdev, size, sge-&gt;respQ.entries,</div><div class='del'>-				    sge-&gt;respQ.dma_addr);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, size, sge-&gt;respQ.entries,</div><div class='add'>+				  sge-&gt;respQ.dma_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SGE_FREELQ_N; i++) {</div><div class='hunk'>@@ -542,8 +535,8 @@ static void free_rx_resources(struct sge *sge)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (q-&gt;entries) {</div><div class='ctx'> 			size = sizeof(struct freelQ_e) * q-&gt;size;</div><div class='del'>-			pci_free_consistent(pdev, size, q-&gt;entries,</div><div class='del'>-					    q-&gt;dma_addr);</div><div class='add'>+			dma_free_coherent(&amp;pdev-&gt;dev, size, q-&gt;entries,</div><div class='add'>+					  q-&gt;dma_addr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -564,7 +557,8 @@ static int alloc_rx_resources(struct sge *sge, struct sge_params *p)</div><div class='ctx'> 		q-&gt;size = p-&gt;freelQ_size[i];</div><div class='ctx'> 		q-&gt;dma_offset = sge-&gt;rx_pkt_pad ? 0 : NET_IP_ALIGN;</div><div class='ctx'> 		size = sizeof(struct freelQ_e) * q-&gt;size;</div><div class='del'>-		q-&gt;entries = pci_alloc_consistent(pdev, size, &amp;q-&gt;dma_addr);</div><div class='add'>+		q-&gt;entries = dma_alloc_coherent(&amp;pdev-&gt;dev, size,</div><div class='add'>+						&amp;q-&gt;dma_addr, GFP_KERNEL);</div><div class='ctx'> 		if (!q-&gt;entries)</div><div class='ctx'> 			goto err_no_mem;</div><div class='ctx'> </div><div class='hunk'>@@ -601,7 +595,8 @@ static int alloc_rx_resources(struct sge *sge, struct sge_params *p)</div><div class='ctx'> 	sge-&gt;respQ.credits = 0;</div><div class='ctx'> 	size = sizeof(struct respQ_e) * sge-&gt;respQ.size;</div><div class='ctx'> 	sge-&gt;respQ.entries =</div><div class='del'>-		pci_alloc_consistent(pdev, size, &amp;sge-&gt;respQ.dma_addr);</div><div class='add'>+		dma_alloc_coherent(&amp;pdev-&gt;dev, size, &amp;sge-&gt;respQ.dma_addr,</div><div class='add'>+				   GFP_KERNEL);</div><div class='ctx'> 	if (!sge-&gt;respQ.entries)</div><div class='ctx'> 		goto err_no_mem;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -624,9 +619,10 @@ static void free_cmdQ_buffers(struct sge *sge, struct cmdQ *q, unsigned int n)</div><div class='ctx'> 	ce = &amp;q-&gt;centries[cidx];</div><div class='ctx'> 	while (n--) {</div><div class='ctx'> 		if (likely(dma_unmap_len(ce, dma_len))) {</div><div class='del'>-			pci_unmap_single(pdev, dma_unmap_addr(ce, dma_addr),</div><div class='add'>+			dma_unmap_single(&amp;pdev-&gt;dev,</div><div class='add'>+					 dma_unmap_addr(ce, dma_addr),</div><div class='ctx'> 					 dma_unmap_len(ce, dma_len),</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			if (q-&gt;sop)</div><div class='ctx'> 				q-&gt;sop = 0;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -663,8 +659,8 @@ static void free_tx_resources(struct sge *sge)</div><div class='ctx'> 		}</div><div class='ctx'> 		if (q-&gt;entries) {</div><div class='ctx'> 			size = sizeof(struct cmdQ_e) * q-&gt;size;</div><div class='del'>-			pci_free_consistent(pdev, size, q-&gt;entries,</div><div class='del'>-					    q-&gt;dma_addr);</div><div class='add'>+			dma_free_coherent(&amp;pdev-&gt;dev, size, q-&gt;entries,</div><div class='add'>+					  q-&gt;dma_addr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -689,7 +685,8 @@ static int alloc_tx_resources(struct sge *sge, struct sge_params *p)</div><div class='ctx'> 		q-&gt;stop_thres = 0;</div><div class='ctx'> 		spin_lock_init(&amp;q-&gt;lock);</div><div class='ctx'> 		size = sizeof(struct cmdQ_e) * q-&gt;size;</div><div class='del'>-		q-&gt;entries = pci_alloc_consistent(pdev, size, &amp;q-&gt;dma_addr);</div><div class='add'>+		q-&gt;entries = dma_alloc_coherent(&amp;pdev-&gt;dev, size,</div><div class='add'>+						&amp;q-&gt;dma_addr, GFP_KERNEL);</div><div class='ctx'> 		if (!q-&gt;entries)</div><div class='ctx'> 			goto err_no_mem;</div><div class='ctx'> </div><div class='hunk'>@@ -837,8 +834,8 @@ static void refill_free_list(struct sge *sge, struct freelQ *q)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		skb_reserve(skb, q-&gt;dma_offset);</div><div class='del'>-		mapping = pci_map_single(pdev, skb-&gt;data, dma_len,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='add'>+		mapping = dma_map_single(&amp;pdev-&gt;dev, skb-&gt;data, dma_len,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 		skb_reserve(skb, sge-&gt;rx_pkt_pad);</div><div class='ctx'> </div><div class='ctx'> 		ce-&gt;skb = skb;</div><div class='hunk'>@@ -934,10 +931,11 @@ void t1_sge_intr_clear(struct sge *sge)</div><div class='ctx'> /*</div><div class='ctx'>  * SGE 'Error' interrupt handler</div><div class='ctx'>  */</div><div class='del'>-int t1_sge_intr_error_handler(struct sge *sge)</div><div class='add'>+bool t1_sge_intr_error_handler(struct sge *sge)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = sge-&gt;adapter;</div><div class='ctx'> 	u32 cause = readl(adapter-&gt;regs + A_SG_INT_CAUSE);</div><div class='add'>+	bool wake = false;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;port[0].dev-&gt;hw_features &amp; NETIF_F_TSO)</div><div class='ctx'> 		cause &amp;= ~F_PACKET_TOO_BIG;</div><div class='hunk'>@@ -961,11 +959,14 @@ int t1_sge_intr_error_handler(struct sge *sge)</div><div class='ctx'> 		sge-&gt;stats.pkt_mismatch++;</div><div class='ctx'> 		pr_alert("%s: SGE packet mismatch\n", adapter-&gt;name);</div><div class='ctx'> 	}</div><div class='del'>-	if (cause &amp; SGE_INT_FATAL)</div><div class='del'>-		t1_fatal_err(adapter);</div><div class='add'>+	if (cause &amp; SGE_INT_FATAL) {</div><div class='add'>+		t1_interrupts_disable(adapter);</div><div class='add'>+		adapter-&gt;pending_thread_intr |= F_PL_INTR_SGE_ERR;</div><div class='add'>+		wake = true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	writel(cause, adapter-&gt;regs + A_SG_INT_CAUSE);</div><div class='del'>-	return 0;</div><div class='add'>+	return wake;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct sge_intr_counts *t1_sge_get_intr_counts(const struct sge *sge)</div><div class='hunk'>@@ -1049,15 +1050,15 @@ static inline struct sk_buff *get_packet(struct adapter *adapter,</div><div class='ctx'> 			goto use_orig_buf;</div><div class='ctx'> </div><div class='ctx'> 		skb_put(skb, len);</div><div class='del'>-		pci_dma_sync_single_for_cpu(pdev,</div><div class='del'>-					    dma_unmap_addr(ce, dma_addr),</div><div class='del'>-					    dma_unmap_len(ce, dma_len),</div><div class='del'>-					    PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_sync_single_for_cpu(&amp;pdev-&gt;dev,</div><div class='add'>+					dma_unmap_addr(ce, dma_addr),</div><div class='add'>+					dma_unmap_len(ce, dma_len),</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='ctx'> 		skb_copy_from_linear_data(ce-&gt;skb, skb-&gt;data, len);</div><div class='del'>-		pci_dma_sync_single_for_device(pdev,</div><div class='del'>-					       dma_unmap_addr(ce, dma_addr),</div><div class='del'>-					       dma_unmap_len(ce, dma_len),</div><div class='del'>-					       PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_sync_single_for_device(&amp;pdev-&gt;dev,</div><div class='add'>+					   dma_unmap_addr(ce, dma_addr),</div><div class='add'>+					   dma_unmap_len(ce, dma_len),</div><div class='add'>+					   DMA_FROM_DEVICE);</div><div class='ctx'> 		recycle_fl_buf(fl, fl-&gt;cidx);</div><div class='ctx'> 		return skb;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1068,8 +1069,8 @@ use_orig_buf:</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_unmap_single(pdev, dma_unmap_addr(ce, dma_addr),</div><div class='del'>-			 dma_unmap_len(ce, dma_len), PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_unmap_single(&amp;pdev-&gt;dev, dma_unmap_addr(ce, dma_addr),</div><div class='add'>+			 dma_unmap_len(ce, dma_len), DMA_FROM_DEVICE);</div><div class='ctx'> 	skb = ce-&gt;skb;</div><div class='ctx'> 	prefetch(skb-&gt;data);</div><div class='ctx'> </div><div class='hunk'>@@ -1091,8 +1092,9 @@ static void unexpected_offload(struct adapter *adapter, struct freelQ *fl)</div><div class='ctx'> 	struct freelQ_ce *ce = &amp;fl-&gt;centries[fl-&gt;cidx];</div><div class='ctx'> 	struct sk_buff *skb = ce-&gt;skb;</div><div class='ctx'> </div><div class='del'>-	pci_dma_sync_single_for_cpu(adapter-&gt;pdev, dma_unmap_addr(ce, dma_addr),</div><div class='del'>-			    dma_unmap_len(ce, dma_len), PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+				dma_unmap_addr(ce, dma_addr),</div><div class='add'>+				dma_unmap_len(ce, dma_len), DMA_FROM_DEVICE);</div><div class='ctx'> 	pr_err("%s: unexpected offload packet, cmd %u\n",</div><div class='ctx'> 	       adapter-&gt;name, *skb-&gt;data);</div><div class='ctx'> 	recycle_fl_buf(fl, fl-&gt;cidx);</div><div class='hunk'>@@ -1209,8 +1211,8 @@ static inline void write_tx_descs(struct adapter *adapter, struct sk_buff *skb,</div><div class='ctx'> 	e = e1 = &amp;q-&gt;entries[pidx];</div><div class='ctx'> 	ce = &amp;q-&gt;centries[pidx];</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_single(adapter-&gt;pdev, skb-&gt;data,</div><div class='del'>-				 skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+	mapping = dma_map_single(&amp;adapter-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+				 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	desc_mapping = mapping;</div><div class='ctx'> 	desc_len = skb_headlen(skb);</div><div class='hunk'>@@ -1301,9 +1303,10 @@ static inline void reclaim_completed_tx(struct sge *sge, struct cmdQ *q)</div><div class='ctx'>  * Called from tasklet. Checks the scheduler for any</div><div class='ctx'>  * pending skbs that can be sent.</div><div class='ctx'>  */</div><div class='del'>-static void restart_sched(unsigned long arg)</div><div class='add'>+static void restart_sched(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct sge *sge = (struct sge *) arg;</div><div class='add'>+	struct sched *s = from_tasklet(s, t, sched_tsk);</div><div class='add'>+	struct sge *sge = s-&gt;sge;</div><div class='ctx'> 	struct adapter *adapter = sge-&gt;adapter;</div><div class='ctx'> 	struct cmdQ *q = &amp;sge-&gt;cmdQ[0];</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='hunk'>@@ -1347,7 +1350,7 @@ static void restart_sched(unsigned long arg)</div><div class='ctx'>  *	@fl: the free list that contains the packet buffer</div><div class='ctx'>  *	@len: the packet length</div><div class='ctx'>  *</div><div class='del'>- *	Process an ingress ethernet pakcet and deliver it to the stack.</div><div class='add'>+ *	Process an ingress ethernet packet and deliver it to the stack.</div><div class='ctx'>  */</div><div class='ctx'> static void sge_rx(struct sge *sge, struct freelQ *fl, unsigned int len)</div><div class='ctx'> {</div><div class='hunk'>@@ -1611,11 +1614,46 @@ int t1_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+irqreturn_t t1_interrupt_thread(int irq, void *data)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = data;</div><div class='add'>+	u32 pending_thread_intr;</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;adapter-&gt;async_lock);</div><div class='add'>+	pending_thread_intr = adapter-&gt;pending_thread_intr;</div><div class='add'>+	adapter-&gt;pending_thread_intr = 0;</div><div class='add'>+	spin_unlock_irq(&amp;adapter-&gt;async_lock);</div><div class='add'>+</div><div class='add'>+	if (!pending_thread_intr)</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+</div><div class='add'>+	if (pending_thread_intr &amp; F_PL_INTR_EXT)</div><div class='add'>+		t1_elmer0_ext_intr_handler(adapter);</div><div class='add'>+</div><div class='add'>+	/* This error is fatal, interrupts remain off */</div><div class='add'>+	if (pending_thread_intr &amp; F_PL_INTR_SGE_ERR) {</div><div class='add'>+		pr_alert("%s: encountered fatal error, operation suspended\n",</div><div class='add'>+			 adapter-&gt;name);</div><div class='add'>+		t1_sge_stop(adapter-&gt;sge);</div><div class='add'>+		return IRQ_HANDLED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock_irq(&amp;adapter-&gt;async_lock);</div><div class='add'>+	adapter-&gt;slow_intr_mask |= F_PL_INTR_EXT;</div><div class='add'>+</div><div class='add'>+	writel(F_PL_INTR_EXT, adapter-&gt;regs + A_PL_CAUSE);</div><div class='add'>+	writel(adapter-&gt;slow_intr_mask | F_PL_INTR_SGE_DATA,</div><div class='add'>+	       adapter-&gt;regs + A_PL_ENABLE);</div><div class='add'>+	spin_unlock_irq(&amp;adapter-&gt;async_lock);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> irqreturn_t t1_interrupt(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = data;</div><div class='ctx'> 	struct sge *sge = adapter-&gt;sge;</div><div class='del'>-	int handled;</div><div class='add'>+	irqreturn_t handled;</div><div class='ctx'> </div><div class='ctx'> 	if (likely(responses_pending(adapter))) {</div><div class='ctx'> 		writel(F_PL_INTR_SGE_DATA, adapter-&gt;regs + A_PL_CAUSE);</div><div class='hunk'>@@ -1637,10 +1675,10 @@ irqreturn_t t1_interrupt(int irq, void *data)</div><div class='ctx'> 	handled = t1_slow_intr_handler(adapter);</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;async_lock);</div><div class='ctx'> </div><div class='del'>-	if (!handled)</div><div class='add'>+	if (handled == IRQ_NONE)</div><div class='ctx'> 		sge-&gt;stats.unhandled_irqs++;</div><div class='ctx'> </div><div class='del'>-	return IRQ_RETVAL(handled != 0);</div><div class='add'>+	return handled;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1884,7 +1922,7 @@ send:</div><div class='ctx'> static void sge_tx_reclaim_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	struct sge *sge = from_timer(sge, t, tx_reclaim_timer);</div><div class='add'>+	struct sge *sge = timer_container_of(sge, t, tx_reclaim_timer);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; SGE_CMDQ_N; ++i) {</div><div class='ctx'> 		struct cmdQ *q = &amp;sge-&gt;cmdQ[i];</div><div class='hunk'>@@ -1946,9 +1984,9 @@ void t1_sge_stop(struct sge *sge)</div><div class='ctx'> 	readl(sge-&gt;adapter-&gt;regs + A_SG_CONTROL); /* flush */</div><div class='ctx'> </div><div class='ctx'> 	if (is_T2(sge-&gt;adapter))</div><div class='del'>-		del_timer_sync(&amp;sge-&gt;espibug_timer);</div><div class='add'>+		timer_delete_sync(&amp;sge-&gt;espibug_timer);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;sge-&gt;tx_reclaim_timer);</div><div class='add'>+	timer_delete_sync(&amp;sge-&gt;tx_reclaim_timer);</div><div class='ctx'> 	if (sge-&gt;tx_sched)</div><div class='ctx'> 		tx_sched_stop(sge);</div><div class='ctx'> </div><div class='hunk'>@@ -1979,7 +2017,7 @@ void t1_sge_start(struct sge *sge)</div><div class='ctx'>  */</div><div class='ctx'> static void espibug_workaround_t204(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct sge *sge = from_timer(sge, t, espibug_timer);</div><div class='add'>+	struct sge *sge = timer_container_of(sge, t, espibug_timer);</div><div class='ctx'> 	struct adapter *adapter = sge-&gt;adapter;</div><div class='ctx'> 	unsigned int nports = adapter-&gt;params.nports;</div><div class='ctx'> 	u32 seop[MAX_NPORTS];</div><div class='hunk'>@@ -2022,7 +2060,7 @@ static void espibug_workaround_t204(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> static void espibug_workaround(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct sge *sge = from_timer(sge, t, espibug_timer);</div><div class='add'>+	struct sge *sge = timer_container_of(sge, t, espibug_timer);</div><div class='ctx'> 	struct adapter *adapter = sge-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(adapter-&gt;port[0].dev)) {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.h b/drivers/net/ethernet/chelsio/cxgb/sge.h<br/>index a1ba591b3431..f7e6f64040ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/sge.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/sge.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/sge.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: sge.h                                                               *</div><div class='hunk'>@@ -6,16 +7,6 @@</div><div class='ctx'>  * Description:                                                              *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -74,6 +65,7 @@ struct sge *t1_sge_create(struct adapter *, struct sge_params *);</div><div class='ctx'> int t1_sge_configure(struct sge *, struct sge_params *);</div><div class='ctx'> int t1_sge_set_coalesce_params(struct sge *, struct sge_params *);</div><div class='ctx'> void t1_sge_destroy(struct sge *);</div><div class='add'>+irqreturn_t t1_interrupt_thread(int irq, void *data);</div><div class='ctx'> irqreturn_t t1_interrupt(int irq, void *cookie);</div><div class='ctx'> int t1_poll(struct napi_struct *, int);</div><div class='ctx'> </div><div class='hunk'>@@ -81,7 +73,7 @@ netdev_tx_t t1_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> void t1_vlan_mode(struct adapter *adapter, netdev_features_t features);</div><div class='ctx'> void t1_sge_start(struct sge *);</div><div class='ctx'> void t1_sge_stop(struct sge *);</div><div class='del'>-int t1_sge_intr_error_handler(struct sge *);</div><div class='add'>+bool t1_sge_intr_error_handler(struct sge *sge);</div><div class='ctx'> void t1_sge_intr_enable(struct sge *);</div><div class='ctx'> void t1_sge_intr_disable(struct sge *);</div><div class='ctx'> void t1_sge_intr_clear(struct sge *);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c<br/>index ea0f8741d7cf..367a9e4581d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/subr.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/subr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/subr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/subr.c</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: subr.c                                                              *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  Various subroutines (intr,pio,etc.) used by Chelsio 10G Ethernet driver. *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -170,7 +161,7 @@ void t1_link_changed(adapter_t *adapter, int port_id)</div><div class='ctx'> 	t1_link_negotiated(adapter, port_id, link_ok, speed, duplex, fc);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int t1_pci_intr_handler(adapter_t *adapter)</div><div class='add'>+static bool t1_pci_intr_handler(adapter_t *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pcix_cause;</div><div class='ctx'> </div><div class='hunk'>@@ -179,9 +170,13 @@ static int t1_pci_intr_handler(adapter_t *adapter)</div><div class='ctx'> 	if (pcix_cause) {</div><div class='ctx'> 		pci_write_config_dword(adapter-&gt;pdev, A_PCICFG_INTR_CAUSE,</div><div class='ctx'> 				       pcix_cause);</div><div class='del'>-		t1_fatal_err(adapter);    /* PCI errors are fatal */</div><div class='add'>+		/* PCI errors are fatal */</div><div class='add'>+		t1_interrupts_disable(adapter);</div><div class='add'>+		adapter-&gt;pending_thread_intr |= F_PL_INTR_SGE_ERR;</div><div class='add'>+		pr_alert("%s: PCI error encountered.\n", adapter-&gt;name);</div><div class='add'>+		return true;</div><div class='ctx'> 	}</div><div class='del'>-	return 0;</div><div class='add'>+	return false;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CHELSIO_T1_1G</div><div class='hunk'>@@ -210,13 +205,16 @@ static int fpga_phy_intr_handler(adapter_t *adapter)</div><div class='ctx'> /*</div><div class='ctx'>  * Slow path interrupt handler for FPGAs.</div><div class='ctx'>  */</div><div class='del'>-static int fpga_slow_intr(adapter_t *adapter)</div><div class='add'>+static irqreturn_t fpga_slow_intr(adapter_t *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cause = readl(adapter-&gt;regs + A_PL_CAUSE);</div><div class='add'>+	irqreturn_t ret = IRQ_NONE;</div><div class='ctx'> </div><div class='ctx'> 	cause &amp;= ~F_PL_INTR_SGE_DATA;</div><div class='del'>-	if (cause &amp; F_PL_INTR_SGE_ERR)</div><div class='del'>-		t1_sge_intr_error_handler(adapter-&gt;sge);</div><div class='add'>+	if (cause &amp; F_PL_INTR_SGE_ERR) {</div><div class='add'>+		if (t1_sge_intr_error_handler(adapter-&gt;sge))</div><div class='add'>+			ret = IRQ_WAKE_THREAD;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cause &amp; FPGA_PCIX_INTERRUPT_GMAC)</div><div class='ctx'> 		fpga_phy_intr_handler(adapter);</div><div class='hunk'>@@ -231,14 +229,19 @@ static int fpga_slow_intr(adapter_t *adapter)</div><div class='ctx'> 		/* Clear TP interrupt */</div><div class='ctx'> 		writel(tp_cause, adapter-&gt;regs + FPGA_TP_ADDR_INTERRUPT_CAUSE);</div><div class='ctx'> 	}</div><div class='del'>-	if (cause &amp; FPGA_PCIX_INTERRUPT_PCIX)</div><div class='del'>-		t1_pci_intr_handler(adapter);</div><div class='add'>+	if (cause &amp; FPGA_PCIX_INTERRUPT_PCIX) {</div><div class='add'>+		if (t1_pci_intr_handler(adapter))</div><div class='add'>+			ret = IRQ_WAKE_THREAD;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the interrupts just processed. */</div><div class='ctx'> 	if (cause)</div><div class='ctx'> 		writel(cause, adapter-&gt;regs + A_PL_CAUSE);</div><div class='ctx'> </div><div class='del'>-	return cause != 0;</div><div class='add'>+	if (ret != IRQ_NONE)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return cause == 0 ? IRQ_NONE : IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='hunk'>@@ -842,31 +845,45 @@ void t1_interrupts_clear(adapter_t* adapter)</div><div class='ctx'> /*</div><div class='ctx'>  * Slow path interrupt handler for ASICs.</div><div class='ctx'>  */</div><div class='del'>-static int asic_slow_intr(adapter_t *adapter)</div><div class='add'>+static irqreturn_t asic_slow_intr(adapter_t *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 cause = readl(adapter-&gt;regs + A_PL_CAUSE);</div><div class='add'>+	irqreturn_t ret = IRQ_HANDLED;</div><div class='ctx'> </div><div class='ctx'> 	cause &amp;= adapter-&gt;slow_intr_mask;</div><div class='ctx'> 	if (!cause)</div><div class='del'>-		return 0;</div><div class='del'>-	if (cause &amp; F_PL_INTR_SGE_ERR)</div><div class='del'>-		t1_sge_intr_error_handler(adapter-&gt;sge);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	if (cause &amp; F_PL_INTR_SGE_ERR) {</div><div class='add'>+		if (t1_sge_intr_error_handler(adapter-&gt;sge))</div><div class='add'>+			ret = IRQ_WAKE_THREAD;</div><div class='add'>+	}</div><div class='ctx'> 	if (cause &amp; F_PL_INTR_TP)</div><div class='ctx'> 		t1_tp_intr_handler(adapter-&gt;tp);</div><div class='ctx'> 	if (cause &amp; F_PL_INTR_ESPI)</div><div class='ctx'> 		t1_espi_intr_handler(adapter-&gt;espi);</div><div class='del'>-	if (cause &amp; F_PL_INTR_PCIX)</div><div class='del'>-		t1_pci_intr_handler(adapter);</div><div class='del'>-	if (cause &amp; F_PL_INTR_EXT)</div><div class='del'>-		t1_elmer0_ext_intr(adapter);</div><div class='add'>+	if (cause &amp; F_PL_INTR_PCIX) {</div><div class='add'>+		if (t1_pci_intr_handler(adapter))</div><div class='add'>+			ret = IRQ_WAKE_THREAD;</div><div class='add'>+	}</div><div class='add'>+	if (cause &amp; F_PL_INTR_EXT) {</div><div class='add'>+		/* Wake the threaded interrupt to handle external interrupts as</div><div class='add'>+		 * we require a process context. We disable EXT interrupts in</div><div class='add'>+		 * the interim and let the thread reenable them when it's done.</div><div class='add'>+		 */</div><div class='add'>+		adapter-&gt;pending_thread_intr |= F_PL_INTR_EXT;</div><div class='add'>+		adapter-&gt;slow_intr_mask &amp;= ~F_PL_INTR_EXT;</div><div class='add'>+		writel(adapter-&gt;slow_intr_mask | F_PL_INTR_SGE_DATA,</div><div class='add'>+		       adapter-&gt;regs + A_PL_ENABLE);</div><div class='add'>+		ret = IRQ_WAKE_THREAD;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Clear the interrupts just processed. */</div><div class='ctx'> 	writel(cause, adapter-&gt;regs + A_PL_CAUSE);</div><div class='ctx'> 	readl(adapter-&gt;regs + A_PL_CAUSE); /* flush writes */</div><div class='del'>-	return 1;</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int t1_slow_intr_handler(adapter_t *adapter)</div><div class='add'>+irqreturn_t t1_slow_intr_handler(adapter_t *adapter)</div><div class='ctx'> {</div><div class='ctx'> #ifdef CONFIG_CHELSIO_T1_1G</div><div class='ctx'> 	if (!t1_is_asic(adapter))</div><div class='hunk'>@@ -1114,7 +1131,7 @@ int t1_init_sw_modules(adapter_t *adapter, const struct board_info *bi)</div><div class='ctx'> 			       adapter-&gt;port[i].dev-&gt;name);</div><div class='ctx'> 			goto error;</div><div class='ctx'> 		}</div><div class='del'>-		memcpy(adapter-&gt;port[i].dev-&gt;dev_addr, hw_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(adapter-&gt;port[i].dev, hw_addr);</div><div class='ctx'> 		init_link_config(&amp;adapter-&gt;port[i].link_config, bi);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h b/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h<br/>index 7f79cc7ceb75..4c883170683b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/suni1x10gexp_regs.h</a></div><div class='hunk'>@@ -1,3 +1,4 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*****************************************************************************</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * File: suni1x10gexp_regs.h                                                 *</div><div class='hunk'>@@ -7,16 +8,6 @@</div><div class='ctx'>  *  PMC/SIERRA (pm3393) MAC-PHY functionality.                               *</div><div class='ctx'>  *  part of the Chelsio 10Gb Ethernet Driver.                                *</div><div class='ctx'>  *                                                                           *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify      *</div><div class='del'>- * it under the terms of the GNU General Public License, version 2, as       *</div><div class='del'>- * published by the Free Software Foundation.                                *</div><div class='del'>- *                                                                           *</div><div class='del'>- * You should have received a copy of the GNU General Public License along   *</div><div class='del'>- * with this program; if not, see &lt;http://www.gnu.org/licenses/&gt;.            *</div><div class='del'>- *                                                                           *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED    *</div><div class='del'>- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF      *</div><div class='del'>- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.                     *</div><div class='ctx'>  *                                                                           *</div><div class='ctx'>  * http://www.chelsio.com                                                    *</div><div class='ctx'>  *                                                                           *</div><div class='hunk'>@@ -1639,4 +1630,3 @@</div><div class='ctx'> #define SUNI1x10GEXP_BITMSK_PL4IDU_DIP4I       0x0002</div><div class='ctx'> </div><div class='ctx'> #endif /* _CXGB_SUNI1x10GEXP_REGS_H_ */</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/tp.h b/drivers/net/ethernet/chelsio/cxgb/tp.h<br/>index ba15675d56df..64f93dcc676b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/tp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/tp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/tp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/tp.h</a></div><div class='hunk'>@@ -65,9 +65,7 @@ void t1_tp_intr_enable(struct petp *tp);</div><div class='ctx'> void t1_tp_intr_clear(struct petp *tp);</div><div class='ctx'> int t1_tp_intr_handler(struct petp *tp);</div><div class='ctx'> </div><div class='del'>-void t1_tp_get_mib_statistics(adapter_t *adap, struct tp_mib_statistics *tps);</div><div class='ctx'> void t1_tp_set_tcp_checksum_offload(struct petp *tp, int enable);</div><div class='ctx'> void t1_tp_set_ip_checksum_offload(struct petp *tp, int enable);</div><div class='del'>-int t1_tp_set_coalescing_size(struct petp *tp, unsigned int size);</div><div class='ctx'> int t1_tp_reset(struct petp *tp, struct tp_params *p, unsigned int tp_clk);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb/vsc7326.c b/drivers/net/ethernet/chelsio/cxgb/vsc7326.c<br/>index 873c1c7b4ca0..2ad3efb550c2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/vsc7326.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb/vsc7326.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb/vsc7326.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb/vsc7326.c</a></div><div class='hunk'>@@ -379,7 +379,7 @@ static int mac_intr_clear(struct cmac *mac)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Expect MAC address to be in network byte order. */</div><div class='del'>-static int mac_set_address(struct cmac* mac, u8 addr[6])</div><div class='add'>+static int mac_set_address(struct cmac* mac, const u8 addr[6])</div><div class='ctx'> {</div><div class='ctx'> 	u32 val;</div><div class='ctx'> 	int port = mac-&gt;instance-&gt;index;</div><div class='hunk'>@@ -591,7 +591,7 @@ static void port_stats_update(struct cmac *mac)</div><div class='ctx'> 	} hw_stats[] = {</div><div class='ctx'> </div><div class='ctx'> #define HW_STAT(reg, stat_name) \</div><div class='del'>-	{ reg, (&amp;((struct cmac_statistics *)NULL)-&gt;stat_name) - (u64 *)NULL }</div><div class='add'>+	{ reg, offsetof(struct cmac_statistics, stat_name) / sizeof(u64) }</div><div class='ctx'> </div><div class='ctx'> 		/* Rx stats */</div><div class='ctx'> 		HW_STAT(RxUnicast, RxUnicastFramesOK),</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h<br/>index 087ff0ffb597..9d11e55981a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/adapter.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/adapter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/adapter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/adapter.h</a></div><div class='hunk'>@@ -178,7 +178,7 @@ struct sge_txq {		/* state for an SGE Tx queue */</div><div class='ctx'> 	unsigned int token;	/* WR token */</div><div class='ctx'> 	dma_addr_t phys_addr;	/* physical address of the ring */</div><div class='ctx'> 	struct sk_buff_head sendq;	/* List of backpressured offload packets */</div><div class='del'>-	struct tasklet_struct qresume_tsk;	/* restarts the queue */</div><div class='add'>+	struct work_struct qresume_task;	/* restarts the queue */</div><div class='ctx'> 	unsigned int cntxt_id;	/* SGE context id for the Tx q */</div><div class='ctx'> 	unsigned long stops;	/* # of times q has been stopped */</div><div class='ctx'> 	unsigned long restarts;	/* # of queue restarts */</div><div class='hunk'>@@ -237,7 +237,7 @@ struct adapter {</div><div class='ctx'> 	int msix_nvectors;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		unsigned short vec;</div><div class='del'>-		char desc[22];</div><div class='add'>+		char desc[IFNAMSIZ + 1 + 12];	/* Needs space for "%s-%d" */</div><div class='ctx'> 	} msix_info[SGE_QSETS + 1];</div><div class='ctx'> </div><div class='ctx'> 	/* T3 modules */</div><div class='hunk'>@@ -313,6 +313,7 @@ void t3_os_link_fault(struct adapter *adapter, int port_id, int state);</div><div class='ctx'> void t3_os_link_fault_handler(struct adapter *adapter, int port_id);</div><div class='ctx'> </div><div class='ctx'> void t3_sge_start(struct adapter *adap);</div><div class='add'>+void t3_sge_stop_dma(struct adapter *adap);</div><div class='ctx'> void t3_sge_stop(struct adapter *adap);</div><div class='ctx'> void t3_start_sge_timers(struct adapter *adap);</div><div class='ctx'> void t3_stop_sge_timers(struct adapter *adap);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/ael1002.c b/drivers/net/ethernet/chelsio/cxgb3/ael1002.c<br/>index dadf11e3dddb..9d591f0ddfc5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/ael1002.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/ael1002.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/ael1002.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/ael1002.c</a></div><div class='hunk'>@@ -815,17 +815,12 @@ static const struct cphy_ops ael2020_ops = {</div><div class='ctx'> int t3_ael2020_phy_prep(struct cphy *phy, struct adapter *adapter, int phy_addr,</div><div class='ctx'> 			const struct mdio_ops *mdio_ops)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='ctx'> 	cphy_init(phy, adapter, phy_addr, &amp;ael2020_ops, mdio_ops,</div><div class='ctx'> 		  SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE |</div><div class='ctx'> 		  SUPPORTED_IRQ, "10GBASE-R");</div><div class='ctx'> 	msleep(125);</div><div class='ctx'> </div><div class='del'>-	err = set_phy_regs(phy, ael2020_reset_regs);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-	return 0;</div><div class='add'>+	return set_phy_regs(phy, ael2020_reset_regs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h<br/>index 1bd7d89666c4..ecd025dda8d6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/common.h</a></div><div class='hunk'>@@ -676,8 +676,6 @@ void t3_link_changed(struct adapter *adapter, int port_id);</div><div class='ctx'> void t3_link_fault(struct adapter *adapter, int port_id);</div><div class='ctx'> int t3_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc);</div><div class='ctx'> const struct adapter_info *t3_get_adapter_info(unsigned int board_id);</div><div class='del'>-int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data);</div><div class='del'>-int t3_seeprom_write(struct adapter *adapter, u32 addr, __le32 data);</div><div class='ctx'> int t3_seeprom_wp(struct adapter *adapter, int enable);</div><div class='ctx'> int t3_get_tp_version(struct adapter *adapter, u32 *vers);</div><div class='ctx'> int t3_check_tpsram_version(struct adapter *adapter);</div><div class='hunk'>@@ -710,7 +708,7 @@ int t3_mac_enable(struct cmac *mac, int which);</div><div class='ctx'> int t3_mac_disable(struct cmac *mac, int which);</div><div class='ctx'> int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu);</div><div class='ctx'> int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev);</div><div class='del'>-int t3_mac_set_address(struct cmac *mac, unsigned int idx, u8 addr[6]);</div><div class='add'>+int t3_mac_set_address(struct cmac *mac, unsigned int idx, const u8 addr[6]);</div><div class='ctx'> int t3_mac_set_num_ucast(struct cmac *mac, int n);</div><div class='ctx'> const struct mac_stats *t3_mac_update_stats(struct cmac *mac);</div><div class='ctx'> int t3_mac_set_speed_duplex_fc(struct cmac *mac, int speed, int duplex, int fc);</div><div class='hunk'>@@ -770,4 +768,6 @@ int t3_xaui_direct_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='ctx'> 			    int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='ctx'> int t3_aq100x_phy_prep(struct cphy *phy, struct adapter *adapter,</div><div class='ctx'> 			    int phy_addr, const struct mdio_ops *mdio_ops);</div><div class='add'>+</div><div class='add'>+extern struct workqueue_struct *cxgb3_wq;</div><div class='ctx'> #endif				/* __CHELSIO_COMMON_H */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h<br/>index f04e81f33795..a08fc762a438 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h</a></div><div class='hunk'>@@ -106,6 +106,4 @@ static inline struct t3c_tid_entry *lookup_atid(const struct tid_info *t,</div><div class='ctx'> 	return &amp;e-&gt;t3c_tid;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int attach_t3cdev(struct t3cdev *dev);</div><div class='del'>-void detach_t3cdev(struct t3cdev *dev);</div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h<br/>index b19e4376ba76..401827b82aa1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_ioctl.h</a></div><div class='hunk'>@@ -79,7 +79,7 @@ struct ch_mem_range {</div><div class='ctx'> 	uint32_t addr;</div><div class='ctx'> 	uint32_t len;</div><div class='ctx'> 	uint32_t version;</div><div class='del'>-	uint8_t buf[0];</div><div class='add'>+	uint8_t buf[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ch_qset_params {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c<br/>index 1e82b9efe447..3b1321c8ed14 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c</a></div><div class='hunk'>@@ -105,7 +105,6 @@ static const struct pci_device_id cxgb3_pci_tbl[] = {</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESC);</div><div class='ctx'> MODULE_AUTHOR("Chelsio Communications");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cxgb3_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> static int dflt_msg_enable = DFLT_MSG_ENABLE;</div><div class='hunk'>@@ -149,7 +148,7 @@ struct workqueue_struct *cxgb3_wq;</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	link_report - show link status and link speed/duplex</div><div class='del'>- *	@p: the port whose settings are to be reported</div><div class='add'>+ *	@dev: the port whose settings are to be reported</div><div class='ctx'>  *</div><div class='ctx'>  *	Shows the link status, speed, and duplex of a port.</div><div class='ctx'>  */</div><div class='hunk'>@@ -305,8 +304,8 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	t3_os_phymod_changed - handle PHY module changes</div><div class='del'>- *	@phy: the PHY reporting the module change</div><div class='del'>- *	@mod_type: new module type</div><div class='add'>+ *	@adap: the adapter associated with the link change</div><div class='add'>+ *	@port_id: the port index whose limk status has changed</div><div class='ctx'>  *</div><div class='ctx'>  *	This is the OS-dependent handler for PHY module changes.  It is</div><div class='ctx'>  *	invoked when a PHY module is removed or inserted for any OS-specific</div><div class='hunk'>@@ -381,19 +380,18 @@ static irqreturn_t t3_async_intr_handler(int irq, void *cookie)</div><div class='ctx'>  */</div><div class='ctx'> static void name_msix_vecs(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	int i, j, msi_idx = 1, n = sizeof(adap-&gt;msix_info[0].desc) - 1;</div><div class='add'>+	int i, j, msi_idx = 1;</div><div class='ctx'> </div><div class='del'>-	snprintf(adap-&gt;msix_info[0].desc, n, "%s", adap-&gt;name);</div><div class='del'>-	adap-&gt;msix_info[0].desc[n] = 0;</div><div class='add'>+	strscpy(adap-&gt;msix_info[0].desc, adap-&gt;name, sizeof(adap-&gt;msix_info[0].desc));</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adap, j) {</div><div class='ctx'> 		struct net_device *d = adap-&gt;port[j];</div><div class='ctx'> 		const struct port_info *pi = netdev_priv(d);</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; pi-&gt;nqsets; i++, msi_idx++) {</div><div class='del'>-			snprintf(adap-&gt;msix_info[msi_idx].desc, n,</div><div class='add'>+			snprintf(adap-&gt;msix_info[msi_idx].desc,</div><div class='add'>+				 sizeof(adap-&gt;msix_info[0].desc),</div><div class='ctx'> 				 "%s-%d", d-&gt;name, pi-&gt;first_qset + i);</div><div class='del'>-			adap-&gt;msix_info[msi_idx].desc[n] = 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -610,8 +608,7 @@ static void init_napi(struct adapter *adap)</div><div class='ctx'> 		struct sge_qset *qs = &amp;adap-&gt;sge.qs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (qs-&gt;adap)</div><div class='del'>-			netif_napi_add(qs-&gt;netdev, &amp;qs-&gt;napi, qs-&gt;napi.poll,</div><div class='del'>-				       64);</div><div class='add'>+			netif_napi_add(qs-&gt;netdev, &amp;qs-&gt;napi, qs-&gt;napi.poll);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1201,7 +1198,7 @@ static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	cxgb_up - enable the adapter</div><div class='del'>- *	@adapter: adapter being enabled</div><div class='add'>+ *	@adap: adapter being enabled</div><div class='ctx'>  *</div><div class='ctx'>  *	Called when the first port is enabled, this function performs the</div><div class='ctx'>  *	actions necessary to make an adapter operational, such as completing</div><div class='hunk'>@@ -1274,14 +1271,14 @@ static int cxgb_up(struct adapter *adap)</div><div class='ctx'> 			free_irq(adap-&gt;msix_info[0].vec, adap);</div><div class='ctx'> 			goto irq_err;</div><div class='ctx'> 		}</div><div class='del'>-	} else if ((err = request_irq(adap-&gt;pdev-&gt;irq,</div><div class='del'>-				      t3_intr_handler(adap,</div><div class='del'>-						      adap-&gt;sge.qs[0].rspq.</div><div class='del'>-						      polling),</div><div class='del'>-				      (adap-&gt;flags &amp; USING_MSI) ?</div><div class='del'>-				       0 : IRQF_SHARED,</div><div class='del'>-				      adap-&gt;name, adap)))</div><div class='del'>-		goto irq_err;</div><div class='add'>+	} else {</div><div class='add'>+		err = request_irq(adap-&gt;pdev-&gt;irq,</div><div class='add'>+				  t3_intr_handler(adap, adap-&gt;sge.qs[0].rspq.polling),</div><div class='add'>+				  (adap-&gt;flags &amp; USING_MSI) ? 0 : IRQF_SHARED,</div><div class='add'>+				  adap-&gt;name, adap);</div><div class='add'>+		if (err)</div><div class='add'>+			goto irq_err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	enable_all_napi(adap);</div><div class='ctx'> 	t3_sge_start(adap);</div><div class='hunk'>@@ -1303,6 +1300,7 @@ static int cxgb_up(struct adapter *adap)</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			CH_ERR(adap, "failed to bind qsets, err %d\n", ret);</div><div class='ctx'> 			t3_intr_disable(adap);</div><div class='add'>+			quiesce_rx(adap);</div><div class='ctx'> 			free_irq_resources(adap);</div><div class='ctx'> 			err = ret;</div><div class='ctx'> 			goto out;</div><div class='hunk'>@@ -1628,9 +1626,8 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 	t3_get_tp_version(adapter, &amp;tp_vers);</div><div class='ctx'> 	spin_unlock(&amp;adapter-&gt;stats_lock);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> 	if (fw_vers)</div><div class='ctx'> 		snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='hunk'>@@ -1950,7 +1947,9 @@ static int set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='add'>+static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e,</div><div class='add'>+			  struct kernel_ethtool_ringparam *kernel_e,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -1966,7 +1965,9 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='ctx'> 	e-&gt;tx_pending = q-&gt;txq_size[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='add'>+static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e,</div><div class='add'>+			 struct kernel_ethtool_ringparam *kernel_e,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -1998,7 +1999,9 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='add'>+static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c,</div><div class='add'>+			struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -2019,7 +2022,9 @@ static int set_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='add'>+static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c,</div><div class='add'>+			struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -2034,20 +2039,16 @@ static int get_eeprom(struct net_device *dev, struct ethtool_eeprom *e,</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='del'>-	int i, err = 0;</div><div class='del'>-</div><div class='del'>-	u8 *buf = kmalloc(EEPROMSIZE, GFP_KERNEL);</div><div class='del'>-	if (!buf)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	int cnt;</div><div class='ctx'> </div><div class='ctx'> 	e-&gt;magic = EEPROM_MAGIC;</div><div class='del'>-	for (i = e-&gt;offset &amp; ~3; !err &amp;&amp; i &lt; e-&gt;offset + e-&gt;len; i += 4)</div><div class='del'>-		err = t3_seeprom_read(adapter, i, (__le32 *) &amp; buf[i]);</div><div class='add'>+	cnt = pci_read_vpd(adapter-&gt;pdev, e-&gt;offset, e-&gt;len, data);</div><div class='add'>+	if (cnt &lt; 0)</div><div class='add'>+		return cnt;</div><div class='ctx'> </div><div class='del'>-	if (!err)</div><div class='del'>-		memcpy(data, buf + e-&gt;offset, e-&gt;len);</div><div class='del'>-	kfree(buf);</div><div class='del'>-	return err;</div><div class='add'>+	e-&gt;len = cnt;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='hunk'>@@ -2056,7 +2057,6 @@ static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='ctx'> 	u32 aligned_offset, aligned_len;</div><div class='del'>-	__le32 *p;</div><div class='ctx'> 	u8 *buf;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2070,12 +2070,9 @@ static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 		buf = kmalloc(aligned_len, GFP_KERNEL);</div><div class='ctx'> 		if (!buf)</div><div class='ctx'> 			return -ENOMEM;</div><div class='del'>-		err = t3_seeprom_read(adapter, aligned_offset, (__le32 *) buf);</div><div class='del'>-		if (!err &amp;&amp; aligned_len &gt; 4)</div><div class='del'>-			err = t3_seeprom_read(adapter,</div><div class='del'>-					      aligned_offset + aligned_len - 4,</div><div class='del'>-					      (__le32 *) &amp; buf[aligned_len - 4]);</div><div class='del'>-		if (err)</div><div class='add'>+		err = pci_read_vpd(adapter-&gt;pdev, aligned_offset, aligned_len,</div><div class='add'>+				   buf);</div><div class='add'>+		if (err &lt; 0)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		memcpy(buf + (eeprom-&gt;offset &amp; 3), data, eeprom-&gt;len);</div><div class='ctx'> 	} else</div><div class='hunk'>@@ -2085,17 +2082,13 @@ static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	for (p = (__le32 *) buf; !err &amp;&amp; aligned_len; aligned_len -= 4, p++) {</div><div class='del'>-		err = t3_seeprom_write(adapter, aligned_offset, *p);</div><div class='del'>-		aligned_offset += 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!err)</div><div class='add'>+	err = pci_write_vpd(adapter-&gt;pdev, aligned_offset, aligned_len, buf);</div><div class='add'>+	if (err &gt;= 0)</div><div class='ctx'> 		err = t3_seeprom_wp(adapter, 1);</div><div class='ctx'> out:</div><div class='ctx'> 	if (buf != data)</div><div class='ctx'> 		kfree(buf);</div><div class='del'>-	return err;</div><div class='add'>+	return err &lt; 0 ? err : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='hunk'>@@ -2106,6 +2099,7 @@ static void get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops cxgb_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,</div><div class='ctx'> 	.get_drvinfo = get_drvinfo,</div><div class='ctx'> 	.get_msglevel = get_msglevel,</div><div class='ctx'> 	.set_msglevel = set_msglevel,</div><div class='hunk'>@@ -2131,18 +2125,23 @@ static const struct ethtool_ops cxgb_ethtool_ops = {</div><div class='ctx'> 	.set_link_ksettings = set_link_ksettings,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int in_range(int val, int lo, int hi)</div><div class='add'>+static int cxgb_in_range(int val, int lo, int hi)</div><div class='ctx'> {</div><div class='ctx'> 	return val &lt; 0 || (val &lt;= hi &amp;&amp; val &gt;= lo);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='add'>+static int cxgb_siocdevprivate(struct net_device *dev,</div><div class='add'>+			       struct ifreq *ifreq,</div><div class='add'>+			       void __user *useraddr,</div><div class='add'>+			       int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='del'>-	u32 cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	if (cmd != SIOCCHIOCTL)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='ctx'> 	if (copy_from_user(&amp;cmd, useraddr, sizeof(cmd)))</div><div class='ctx'> 		return -EFAULT;</div><div class='ctx'> </div><div class='hunk'>@@ -2162,19 +2161,19 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		if (t.qset_idx &gt;= SGE_QSETS)</div><div class='ctx'> 			return -EINVAL;</div><div class='del'>-		if (!in_range(t.intr_lat, 0, M_NEWTIMER) ||</div><div class='del'>-		    !in_range(t.cong_thres, 0, 255) ||</div><div class='del'>-		    !in_range(t.txq_size[0], MIN_TXQ_ENTRIES,</div><div class='add'>+		if (!cxgb_in_range(t.intr_lat, 0, M_NEWTIMER) ||</div><div class='add'>+		    !cxgb_in_range(t.cong_thres, 0, 255) ||</div><div class='add'>+		    !cxgb_in_range(t.txq_size[0], MIN_TXQ_ENTRIES,</div><div class='ctx'> 			      MAX_TXQ_ENTRIES) ||</div><div class='del'>-		    !in_range(t.txq_size[1], MIN_TXQ_ENTRIES,</div><div class='add'>+		    !cxgb_in_range(t.txq_size[1], MIN_TXQ_ENTRIES,</div><div class='ctx'> 			      MAX_TXQ_ENTRIES) ||</div><div class='del'>-		    !in_range(t.txq_size[2], MIN_CTRL_TXQ_ENTRIES,</div><div class='add'>+		    !cxgb_in_range(t.txq_size[2], MIN_CTRL_TXQ_ENTRIES,</div><div class='ctx'> 			      MAX_CTRL_TXQ_ENTRIES) ||</div><div class='del'>-		    !in_range(t.fl_size[0], MIN_FL_ENTRIES,</div><div class='add'>+		    !cxgb_in_range(t.fl_size[0], MIN_FL_ENTRIES,</div><div class='ctx'> 			      MAX_RX_BUFFERS) ||</div><div class='del'>-		    !in_range(t.fl_size[1], MIN_FL_ENTRIES,</div><div class='add'>+		    !cxgb_in_range(t.fl_size[1], MIN_FL_ENTRIES,</div><div class='ctx'> 			      MAX_RX_JUMBO_BUFFERS) ||</div><div class='del'>-		    !in_range(t.rspq_size, MIN_RSPQ_ENTRIES,</div><div class='add'>+		    !cxgb_in_range(t.rspq_size, MIN_RSPQ_ENTRIES,</div><div class='ctx'> 			      MAX_RSPQ_ENTRIES))</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -2448,6 +2447,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)</div><div class='ctx'> </div><div class='ctx'> 		if (!is_offload(adapter))</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='add'>+		if (!capable(CAP_NET_ADMIN))</div><div class='add'>+			return -EPERM;</div><div class='ctx'> 		if (!(adapter-&gt;flags &amp; FULL_INIT_DONE))</div><div class='ctx'> 			return -EIO;	/* need the memory controllers */</div><div class='ctx'> 		if (copy_from_user(&amp;t, useraddr, sizeof(t)))</div><div class='hunk'>@@ -2542,11 +2543,9 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)</div><div class='ctx'> 		    !(data-&gt;phy_id &amp; 0xe0e0))</div><div class='ctx'> 			data-&gt;phy_id = mdio_phy_id_c45(data-&gt;phy_id &gt;&gt; 8,</div><div class='ctx'> 						       data-&gt;phy_id &amp; 0x1f);</div><div class='del'>-		/* FALLTHRU */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case SIOCGMIIPHY:</div><div class='ctx'> 		return mdio_mii_ioctl(&amp;pi-&gt;phy.mdio, data, cmd);</div><div class='del'>-	case SIOCCHIOCTL:</div><div class='del'>-		return cxgb_extension_ioctl(dev, req-&gt;ifr_data);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2560,7 +2559,7 @@ static int cxgb_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	if ((ret = t3_mac_set_mtu(&amp;pi-&gt;mac, new_mtu)))</div><div class='ctx'> 		return ret;</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	init_port_mtus(adapter);</div><div class='ctx'> 	if (adapter-&gt;params.rev == 0 &amp;&amp; offload_running(adapter))</div><div class='ctx'> 		t3_load_mtus(adapter, adapter-&gt;params.mtus,</div><div class='hunk'>@@ -2578,7 +2577,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	t3_mac_set_address(&amp;pi-&gt;mac, LAN_MAC_IDX, dev-&gt;dev_addr);</div><div class='ctx'> 	if (offload_running(adapter))</div><div class='ctx'> 		write_smt_entry(adapter, pi-&gt;port_id);</div><div class='hunk'>@@ -2934,7 +2933,6 @@ static int t3_reenable_adapter(struct adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> 	pci_set_master(adapter-&gt;pdev);</div><div class='ctx'> 	pci_restore_state(adapter-&gt;pdev);</div><div class='del'>-	pci_save_state(adapter-&gt;pdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Free sge resources */</div><div class='ctx'> 	t3_free_sge_resources(adapter);</div><div class='hunk'>@@ -2995,7 +2993,7 @@ void t3_fatal_err(struct adapter *adapter)</div><div class='ctx'> 	unsigned int fw_status[4];</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;flags &amp; FULL_INIT_DONE) {</div><div class='del'>-		t3_sge_stop(adapter);</div><div class='add'>+		t3_sge_stop_dma(adapter);</div><div class='ctx'> 		t3_write_reg(adapter, A_XGM_TX_CTRL, 0);</div><div class='ctx'> 		t3_write_reg(adapter, A_XGM_RX_CTRL, 0);</div><div class='ctx'> 		t3_write_reg(adapter, XGM_REG(A_XGM_TX_CTRL, 1), 0);</div><div class='hunk'>@@ -3097,8 +3095,9 @@ static void set_nqsets(struct adapter *adap)</div><div class='ctx'> 			nqsets = num_cpus;</div><div class='ctx'> 		if (nqsets &lt; 1 || hwports == 4)</div><div class='ctx'> 			nqsets = 1;</div><div class='del'>-	} else</div><div class='add'>+	} else {</div><div class='ctx'> 		nqsets = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adap, i) {</div><div class='ctx'> 		struct port_info *pi = adap2pinfo(adap, i);</div><div class='hunk'>@@ -3179,7 +3178,8 @@ static const struct net_device_ops cxgb_netdev_ops = {</div><div class='ctx'> 	.ndo_get_stats		= cxgb_get_stats,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= cxgb_set_rxmode,</div><div class='del'>-	.ndo_do_ioctl		= cxgb_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= cxgb_ioctl,</div><div class='add'>+	.ndo_siocdevprivate	= cxgb_siocdevprivate,</div><div class='ctx'> 	.ndo_change_mtu		= cxgb_change_mtu,</div><div class='ctx'> 	.ndo_set_mac_address	= cxgb_set_mac_addr,</div><div class='ctx'> 	.ndo_fix_features	= cxgb_fix_features,</div><div class='hunk'>@@ -3202,14 +3202,12 @@ static void cxgb3_init_iscsi_mac(struct net_device *dev)</div><div class='ctx'> 			NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)</div><div class='ctx'> static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	int i, err, pci_using_dac = 0;</div><div class='add'>+	int i, err;</div><div class='ctx'> 	resource_size_t mmio_start, mmio_len;</div><div class='ctx'> 	const struct adapter_info *ai;</div><div class='ctx'> 	struct adapter *adapter = NULL;</div><div class='ctx'> 	struct port_info *pi;</div><div class='ctx'> </div><div class='del'>-	pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);</div><div class='del'>-</div><div class='ctx'> 	if (!cxgb3_wq) {</div><div class='ctx'> 		cxgb3_wq = create_singlethread_workqueue(DRV_NAME);</div><div class='ctx'> 		if (!cxgb3_wq) {</div><div class='hunk'>@@ -3231,15 +3229,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_disable_device;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='del'>-		pci_using_dac = 1;</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "unable to obtain 64-bit DMA for "</div><div class='del'>-			       "coherent allocations\n");</div><div class='del'>-			goto out_release_regions;</div><div class='del'>-		}</div><div class='del'>-	} else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (err) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "no usable DMA configuration\n");</div><div class='ctx'> 		goto out_release_regions;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3265,11 +3256,11 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		goto out_free_adapter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;regs = ioremap_nocache(mmio_start, mmio_len);</div><div class='add'>+	adapter-&gt;regs = ioremap(mmio_start, mmio_len);</div><div class='ctx'> 	if (!adapter-&gt;regs) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "cannot map device registers\n");</div><div class='ctx'> 		err = -ENOMEM;</div><div class='del'>-		goto out_free_adapter;</div><div class='add'>+		goto out_free_adapter_nofail;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	adapter-&gt;pdev = pdev;</div><div class='hunk'>@@ -3315,8 +3306,8 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		netdev-&gt;features |= netdev-&gt;hw_features |</div><div class='ctx'> 				    NETIF_F_HW_VLAN_CTAG_TX;</div><div class='ctx'> 		netdev-&gt;vlan_features |= netdev-&gt;features &amp; VLAN_FEAT;</div><div class='del'>-		if (pci_using_dac)</div><div class='del'>-			netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+</div><div class='add'>+		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;netdev_ops = &amp;cxgb_netdev_ops;</div><div class='ctx'> 		netdev-&gt;ethtool_ops = &amp;cxgb_ethtool_ops;</div><div class='hunk'>@@ -3356,6 +3347,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> 	if (!adapter-&gt;registered_device_map) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "could not register any net devices\n");</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> 		goto out_free_dev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3397,6 +3389,9 @@ out_free_dev:</div><div class='ctx'> 		if (adapter-&gt;port[i])</div><div class='ctx'> 			free_netdev(adapter-&gt;port[i]);</div><div class='ctx'> </div><div class='add'>+out_free_adapter_nofail:</div><div class='add'>+	kfree_skb(adapter-&gt;nofail_skb);</div><div class='add'>+</div><div class='ctx'> out_free_adapter:</div><div class='ctx'> 	kfree(adapter);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c<br/>index 84604aff53ce..5a9f6925e1fa 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c</a></div><div class='hunk'>@@ -243,7 +243,7 @@ static int cxgb_ulp_iscsi_ctl(struct adapter *adapter, unsigned int req,</div><div class='ctx'> </div><div class='ctx'> 		/*</div><div class='ctx'> 		 * on rx, the iscsi pdu has to be &lt; rx page size and the</div><div class='del'>-		 * the max rx data length programmed in TP</div><div class='add'>+		 * max rx data length programmed in TP</div><div class='ctx'> 		 */</div><div class='ctx'> 		val = min(adapter-&gt;params.tp.rx_pg_size,</div><div class='ctx'> 			  ((t3_read_reg(adapter, A_TP_PARA_REG2)) &gt;&gt;</div><div class='hunk'>@@ -515,23 +515,6 @@ void *cxgb3_free_atid(struct t3cdev *tdev, int atid)</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(cxgb3_free_atid);</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Free a server TID and return it to the free pool.</div><div class='del'>- */</div><div class='del'>-void cxgb3_free_stid(struct t3cdev *tdev, int stid)</div><div class='del'>-{</div><div class='del'>-	struct tid_info *t = &amp;(T3C_DATA(tdev))-&gt;tid_maps;</div><div class='del'>-	union listen_entry *p = stid2entry(t, stid);</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;t-&gt;stid_lock);</div><div class='del'>-	p-&gt;next = t-&gt;sfree;</div><div class='del'>-	t-&gt;sfree = p;</div><div class='del'>-	t-&gt;stids_in_use--;</div><div class='del'>-	spin_unlock_bh(&amp;t-&gt;stid_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(cxgb3_free_stid);</div><div class='del'>-</div><div class='ctx'> void cxgb3_insert_tid(struct t3cdev *tdev, struct cxgb3_client *client,</div><div class='ctx'> 		      void *ctx, unsigned int tid)</div><div class='ctx'> {</div><div class='hunk'>@@ -671,28 +654,6 @@ int cxgb3_alloc_atid(struct t3cdev *tdev, struct cxgb3_client *client,</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(cxgb3_alloc_atid);</div><div class='ctx'> </div><div class='del'>-int cxgb3_alloc_stid(struct t3cdev *tdev, struct cxgb3_client *client,</div><div class='del'>-		     void *ctx)</div><div class='del'>-{</div><div class='del'>-	int stid = -1;</div><div class='del'>-	struct tid_info *t = &amp;(T3C_DATA(tdev))-&gt;tid_maps;</div><div class='del'>-</div><div class='del'>-	spin_lock_bh(&amp;t-&gt;stid_lock);</div><div class='del'>-	if (t-&gt;sfree) {</div><div class='del'>-		union listen_entry *p = t-&gt;sfree;</div><div class='del'>-</div><div class='del'>-		stid = (p - t-&gt;stid_tab) + t-&gt;stid_base;</div><div class='del'>-		t-&gt;sfree = p-&gt;next;</div><div class='del'>-		p-&gt;t3c_tid.ctx = ctx;</div><div class='del'>-		p-&gt;t3c_tid.client = client;</div><div class='del'>-		t-&gt;stids_in_use++;</div><div class='del'>-	}</div><div class='del'>-	spin_unlock_bh(&amp;t-&gt;stid_lock);</div><div class='del'>-	return stid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(cxgb3_alloc_stid);</div><div class='del'>-</div><div class='ctx'> /* Get the t3cdev associated with a net_device */</div><div class='ctx'> struct t3cdev *dev2t3cdev(struct net_device *dev)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h<br/>index 929c298115ca..7419824f9926 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.h</a></div><div class='hunk'>@@ -95,10 +95,7 @@ struct cxgb3_client {</div><div class='ctx'>  */</div><div class='ctx'> int cxgb3_alloc_atid(struct t3cdev *dev, struct cxgb3_client *client,</div><div class='ctx'> 		     void *ctx);</div><div class='del'>-int cxgb3_alloc_stid(struct t3cdev *dev, struct cxgb3_client *client,</div><div class='del'>-		     void *ctx);</div><div class='ctx'> void *cxgb3_free_atid(struct t3cdev *dev, int atid);</div><div class='del'>-void cxgb3_free_stid(struct t3cdev *dev, int stid);</div><div class='ctx'> void cxgb3_insert_tid(struct t3cdev *dev, struct cxgb3_client *client,</div><div class='ctx'> 		      void *ctx, unsigned int tid);</div><div class='ctx'> void cxgb3_queue_tid_release(struct t3cdev *dev, unsigned int tid);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c<br/>index b3e4118a15e7..5d5f3380ecca 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/l2t.c</a></div><div class='hunk'>@@ -136,7 +136,7 @@ again:</div><div class='ctx'> 		if (e-&gt;state == L2T_STATE_STALE)</div><div class='ctx'> 			e-&gt;state = L2T_STATE_VALID;</div><div class='ctx'> 		spin_unlock_bh(&amp;e-&gt;lock);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case L2T_STATE_VALID:	/* fast-path, send the packet on */</div><div class='ctx'> 		return cxgb3_ofld_send(dev, skb);</div><div class='ctx'> 	case L2T_STATE_RESOLVING:</div><div class='hunk'>@@ -176,43 +176,6 @@ again:</div><div class='ctx'> </div><div class='ctx'> EXPORT_SYMBOL(t3_l2t_send_slow);</div><div class='ctx'> </div><div class='del'>-void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e)</div><div class='del'>-{</div><div class='del'>-again:</div><div class='del'>-	switch (e-&gt;state) {</div><div class='del'>-	case L2T_STATE_STALE:	/* entry is stale, kick off revalidation */</div><div class='del'>-		neigh_event_send(e-&gt;neigh, NULL);</div><div class='del'>-		spin_lock_bh(&amp;e-&gt;lock);</div><div class='del'>-		if (e-&gt;state == L2T_STATE_STALE) {</div><div class='del'>-			e-&gt;state = L2T_STATE_VALID;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;e-&gt;lock);</div><div class='del'>-		return;</div><div class='del'>-	case L2T_STATE_VALID:	/* fast-path, send the packet on */</div><div class='del'>-		return;</div><div class='del'>-	case L2T_STATE_RESOLVING:</div><div class='del'>-		spin_lock_bh(&amp;e-&gt;lock);</div><div class='del'>-		if (e-&gt;state != L2T_STATE_RESOLVING) {</div><div class='del'>-			/* ARP already completed */</div><div class='del'>-			spin_unlock_bh(&amp;e-&gt;lock);</div><div class='del'>-			goto again;</div><div class='del'>-		}</div><div class='del'>-		spin_unlock_bh(&amp;e-&gt;lock);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Only the first packet added to the arpq should kick off</div><div class='del'>-		 * resolution.  However, because the alloc_skb below can fail,</div><div class='del'>-		 * we allow each packet added to the arpq to retry resolution</div><div class='del'>-		 * as a way of recovering from transient memory exhaustion.</div><div class='del'>-		 * A better way would be to use a work request to retry L2T</div><div class='del'>-		 * entries when there's no memory.</div><div class='del'>-		 */</div><div class='del'>-		neigh_event_send(e-&gt;neigh, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EXPORT_SYMBOL(t3_l2t_send_event);</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * Allocate a free L2T entry.  Must be called with l2t_data.lock held.</div><div class='ctx'>  */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h<br/>index ea75f275023f..33558f177497 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/l2t.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/l2t.h</a></div><div class='hunk'>@@ -76,7 +76,7 @@ struct l2t_data {</div><div class='ctx'> 	atomic_t nfree;		/* number of free entries */</div><div class='ctx'> 	rwlock_t lock;</div><div class='ctx'> 	struct rcu_head rcu_head;	/* to handle rcu cleanup */</div><div class='del'>-	struct l2t_entry l2tab[];</div><div class='add'>+	struct l2t_entry l2tab[] __counted_by(nentries);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef void (*arp_failure_handler_func)(struct t3cdev * dev,</div><div class='hunk'>@@ -113,7 +113,6 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,</div><div class='ctx'> 			     struct net_device *dev, const void *daddr);</div><div class='ctx'> int t3_l2t_send_slow(struct t3cdev *dev, struct sk_buff *skb,</div><div class='ctx'> 		     struct l2t_entry *e);</div><div class='del'>-void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e);</div><div class='ctx'> struct l2t_data *t3_init_l2t(unsigned int l2t_capacity);</div><div class='ctx'> </div><div class='ctx'> int cxgb3_ofld_send(struct t3cdev *dev, struct sk_buff *skb);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c<br/>index 89db739b7819..b59735d0e065 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/sge.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/sge.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/sge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/sge.c</a></div><div class='hunk'>@@ -126,8 +126,10 @@ struct rsp_desc {		/* response queue descriptor */</div><div class='ctx'> 	struct rss_header rss_hdr;</div><div class='ctx'> 	__be32 flags;</div><div class='ctx'> 	__be32 len_cq;</div><div class='del'>-	u8 imm_data[47];</div><div class='del'>-	u8 intr_gen;</div><div class='add'>+	struct_group(immediate,</div><div class='add'>+		u8 imm_data[47];</div><div class='add'>+		u8 intr_gen;</div><div class='add'>+	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -164,11 +166,6 @@ static u8 flit_desc_map[] = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline struct sge_qset *fl_to_qset(const struct sge_fl *q, int qidx)</div><div class='del'>-{</div><div class='del'>-	return container_of(q, struct sge_qset, fl[qidx]);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline struct sge_qset *rspq_to_qset(const struct sge_rspq *q)</div><div class='ctx'> {</div><div class='ctx'> 	return container_of(q, struct sge_qset, rspq);</div><div class='hunk'>@@ -244,8 +241,8 @@ static inline void unmap_skb(struct sk_buff *skb, struct sge_txq *q,</div><div class='ctx'> 	frag_idx = d-&gt;fragidx;</div><div class='ctx'> </div><div class='ctx'> 	if (frag_idx == 0 &amp;&amp; skb_headlen(skb)) {</div><div class='del'>-		pci_unmap_single(pdev, be64_to_cpu(sgp-&gt;addr[0]),</div><div class='del'>-				 skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev, be64_to_cpu(sgp-&gt;addr[0]),</div><div class='add'>+				 skb_headlen(skb), DMA_TO_DEVICE);</div><div class='ctx'> 		j = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -253,9 +250,9 @@ static inline void unmap_skb(struct sk_buff *skb, struct sge_txq *q,</div><div class='ctx'> 	nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='ctx'> 	while (frag_idx &lt; nfrags &amp;&amp; curflit &lt; WR_FLITS) {</div><div class='del'>-		pci_unmap_page(pdev, be64_to_cpu(sgp-&gt;addr[j]),</div><div class='add'>+		dma_unmap_page(&amp;pdev-&gt;dev, be64_to_cpu(sgp-&gt;addr[j]),</div><div class='ctx'> 			       skb_frag_size(&amp;skb_shinfo(skb)-&gt;frags[frag_idx]),</div><div class='del'>-			       PCI_DMA_TODEVICE);</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='ctx'> 		j ^= 1;</div><div class='ctx'> 		if (j == 0) {</div><div class='ctx'> 			sgp++;</div><div class='hunk'>@@ -355,15 +352,14 @@ static void clear_rx_desc(struct pci_dev *pdev, const struct sge_fl *q,</div><div class='ctx'> 	if (q-&gt;use_pages &amp;&amp; d-&gt;pg_chunk.page) {</div><div class='ctx'> 		(*d-&gt;pg_chunk.p_cnt)--;</div><div class='ctx'> 		if (!*d-&gt;pg_chunk.p_cnt)</div><div class='del'>-			pci_unmap_page(pdev,</div><div class='del'>-				       d-&gt;pg_chunk.mapping,</div><div class='del'>-				       q-&gt;alloc_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_page(&amp;pdev-&gt;dev, d-&gt;pg_chunk.mapping,</div><div class='add'>+				       q-&gt;alloc_size, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		put_page(d-&gt;pg_chunk.page);</div><div class='ctx'> 		d-&gt;pg_chunk.page = NULL;</div><div class='ctx'> 	} else {</div><div class='del'>-		pci_unmap_single(pdev, dma_unmap_addr(d, dma_addr),</div><div class='del'>-				 q-&gt;buf_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_single(&amp;pdev-&gt;dev, dma_unmap_addr(d, dma_addr),</div><div class='add'>+				 q-&gt;buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> 		kfree_skb(d-&gt;skb);</div><div class='ctx'> 		d-&gt;skb = NULL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -372,7 +368,7 @@ static void clear_rx_desc(struct pci_dev *pdev, const struct sge_fl *q,</div><div class='ctx'> /**</div><div class='ctx'>  *	free_rx_bufs - free the Rx buffers on an SGE free list</div><div class='ctx'>  *	@pdev: the PCI device associated with the adapter</div><div class='del'>- *	@rxq: the SGE free list to clean up</div><div class='add'>+ *	@q: the SGE free list to clean up</div><div class='ctx'>  *</div><div class='ctx'>  *	Release the buffers on an SGE free-buffer Rx queue.  HW fetching from</div><div class='ctx'>  *	this queue should be stopped before calling this function.</div><div class='hunk'>@@ -414,8 +410,8 @@ static inline int add_one_rx_buf(void *va, unsigned int len,</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> </div><div class='del'>-	mapping = pci_map_single(pdev, va, len, PCI_DMA_FROMDEVICE);</div><div class='del'>-	if (unlikely(pci_dma_mapping_error(pdev, mapping)))</div><div class='add'>+	mapping = dma_map_single(&amp;pdev-&gt;dev, va, len, DMA_FROM_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;pdev-&gt;dev, mapping)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_addr_set(sd, dma_addr, mapping);</div><div class='hunk'>@@ -453,9 +449,9 @@ static int alloc_pg_chunk(struct adapter *adapter, struct sge_fl *q,</div><div class='ctx'> 		q-&gt;pg_chunk.p_cnt = q-&gt;pg_chunk.va + (PAGE_SIZE &lt;&lt; order) -</div><div class='ctx'> 				    SGE_PG_RSVD;</div><div class='ctx'> 		q-&gt;pg_chunk.offset = 0;</div><div class='del'>-		mapping = pci_map_page(adapter-&gt;pdev, q-&gt;pg_chunk.page,</div><div class='del'>-				       0, q-&gt;alloc_size, PCI_DMA_FROMDEVICE);</div><div class='del'>-		if (unlikely(pci_dma_mapping_error(adapter-&gt;pdev, mapping))) {</div><div class='add'>+		mapping = dma_map_page(&amp;adapter-&gt;pdev-&gt;dev, q-&gt;pg_chunk.page,</div><div class='add'>+				       0, q-&gt;alloc_size, DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(&amp;adapter-&gt;pdev-&gt;dev, mapping))) {</div><div class='ctx'> 			__free_pages(q-&gt;pg_chunk.page, order);</div><div class='ctx'> 			q-&gt;pg_chunk.page = NULL;</div><div class='ctx'> 			return -EIO;</div><div class='hunk'>@@ -493,7 +489,7 @@ static inline void ring_fl_db(struct adapter *adap, struct sge_fl *q)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	refill_fl - refill an SGE free-buffer list</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@q: the free-list to refill</div><div class='ctx'>  *	@n: the number of new buffers to allocate</div><div class='ctx'>  *	@gfp: the gfp flags for allocating new buffers</div><div class='hunk'>@@ -522,9 +518,9 @@ nomem:				q-&gt;alloc_failed++;</div><div class='ctx'> 			dma_unmap_addr_set(sd, dma_addr, mapping);</div><div class='ctx'> </div><div class='ctx'> 			add_one_rx_chunk(mapping, d, q-&gt;gen);</div><div class='del'>-			pci_dma_sync_single_for_device(adap-&gt;pdev, mapping,</div><div class='del'>-						q-&gt;buf_size - SGE_PG_RSVD,</div><div class='del'>-						PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;adap-&gt;pdev-&gt;dev, mapping,</div><div class='add'>+						   q-&gt;buf_size - SGE_PG_RSVD,</div><div class='add'>+						   DMA_FROM_DEVICE);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			void *buf_start;</div><div class='ctx'> </div><div class='hunk'>@@ -568,7 +564,7 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	recycle_rx_buf - recycle a receive buffer</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@q: the SGE free list</div><div class='ctx'>  *	@idx: index of buffer to recycle</div><div class='ctx'>  *</div><div class='hunk'>@@ -665,7 +661,7 @@ static void t3_reset_qset(struct sge_qset *q)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	free_qset - free the resources of an SGE queue set</div><div class='add'>+ *	t3_free_qset - free the resources of an SGE queue set</div><div class='ctx'>  *	@adapter: the adapter owning the queue set</div><div class='ctx'>  *	@q: the queue set</div><div class='ctx'>  *</div><div class='hunk'>@@ -793,13 +789,13 @@ static struct sk_buff *get_packet(struct adapter *adap, struct sge_fl *fl,</div><div class='ctx'> 		skb = alloc_skb(len, GFP_ATOMIC);</div><div class='ctx'> 		if (likely(skb != NULL)) {</div><div class='ctx'> 			__skb_put(skb, len);</div><div class='del'>-			pci_dma_sync_single_for_cpu(adap-&gt;pdev,</div><div class='del'>-					    dma_unmap_addr(sd, dma_addr), len,</div><div class='del'>-					    PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;adap-&gt;pdev-&gt;dev,</div><div class='add'>+						dma_unmap_addr(sd, dma_addr),</div><div class='add'>+						len, DMA_FROM_DEVICE);</div><div class='ctx'> 			memcpy(skb-&gt;data, sd-&gt;skb-&gt;data, len);</div><div class='del'>-			pci_dma_sync_single_for_device(adap-&gt;pdev,</div><div class='del'>-					    dma_unmap_addr(sd, dma_addr), len,</div><div class='del'>-					    PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;adap-&gt;pdev-&gt;dev,</div><div class='add'>+						   dma_unmap_addr(sd, dma_addr),</div><div class='add'>+						   len, DMA_FROM_DEVICE);</div><div class='ctx'> 		} else if (!drop_thres)</div><div class='ctx'> 			goto use_orig_buf;</div><div class='ctx'> recycle:</div><div class='hunk'>@@ -813,8 +809,8 @@ recycle:</div><div class='ctx'> 		goto recycle;</div><div class='ctx'> </div><div class='ctx'> use_orig_buf:</div><div class='del'>-	pci_unmap_single(adap-&gt;pdev, dma_unmap_addr(sd, dma_addr),</div><div class='del'>-			 fl-&gt;buf_size, PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_unmap_single(&amp;adap-&gt;pdev-&gt;dev, dma_unmap_addr(sd, dma_addr),</div><div class='add'>+			 fl-&gt;buf_size, DMA_FROM_DEVICE);</div><div class='ctx'> 	skb = sd-&gt;skb;</div><div class='ctx'> 	skb_put(skb, len);</div><div class='ctx'> 	__refill_fl(adap, fl);</div><div class='hunk'>@@ -825,6 +821,7 @@ use_orig_buf:</div><div class='ctx'>  *	get_packet_pg - return the next ingress packet buffer from a free list</div><div class='ctx'>  *	@adap: the adapter that received the packet</div><div class='ctx'>  *	@fl: the SGE free list holding the packet</div><div class='add'>+ *	@q: the queue</div><div class='ctx'>  *	@len: the packet length including any SGE padding</div><div class='ctx'>  *	@drop_thres: # of remaining buffers before we start dropping packets</div><div class='ctx'>  *</div><div class='hunk'>@@ -853,12 +850,11 @@ static struct sk_buff *get_packet_pg(struct adapter *adap, struct sge_fl *fl,</div><div class='ctx'> 		newskb = alloc_skb(len, GFP_ATOMIC);</div><div class='ctx'> 		if (likely(newskb != NULL)) {</div><div class='ctx'> 			__skb_put(newskb, len);</div><div class='del'>-			pci_dma_sync_single_for_cpu(adap-&gt;pdev, dma_addr, len,</div><div class='del'>-					    PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;adap-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+						len, DMA_FROM_DEVICE);</div><div class='ctx'> 			memcpy(newskb-&gt;data, sd-&gt;pg_chunk.va, len);</div><div class='del'>-			pci_dma_sync_single_for_device(adap-&gt;pdev, dma_addr,</div><div class='del'>-						       len,</div><div class='del'>-						       PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;adap-&gt;pdev-&gt;dev, dma_addr,</div><div class='add'>+						   len, DMA_FROM_DEVICE);</div><div class='ctx'> 		} else if (!drop_thres)</div><div class='ctx'> 			return NULL;</div><div class='ctx'> recycle:</div><div class='hunk'>@@ -882,14 +878,12 @@ recycle:</div><div class='ctx'> 		goto recycle;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_dma_sync_single_for_cpu(adap-&gt;pdev, dma_addr, len,</div><div class='del'>-				    PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;adap-&gt;pdev-&gt;dev, dma_addr, len,</div><div class='add'>+				DMA_FROM_DEVICE);</div><div class='ctx'> 	(*sd-&gt;pg_chunk.p_cnt)--;</div><div class='ctx'> 	if (!*sd-&gt;pg_chunk.p_cnt &amp;&amp; sd-&gt;pg_chunk.page != fl-&gt;pg_chunk.page)</div><div class='del'>-		pci_unmap_page(adap-&gt;pdev,</div><div class='del'>-			       sd-&gt;pg_chunk.mapping,</div><div class='del'>-			       fl-&gt;alloc_size,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_page(&amp;adap-&gt;pdev-&gt;dev, sd-&gt;pg_chunk.mapping,</div><div class='add'>+			       fl-&gt;alloc_size, DMA_FROM_DEVICE);</div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		__skb_put(newskb, SGE_RX_PULL_LEN);</div><div class='ctx'> 		memcpy(newskb-&gt;data, sd-&gt;pg_chunk.va, SGE_RX_PULL_LEN);</div><div class='hunk'>@@ -928,7 +922,8 @@ static inline struct sk_buff *get_imm_packet(const struct rsp_desc *resp)</div><div class='ctx'> </div><div class='ctx'> 	if (skb) {</div><div class='ctx'> 		__skb_put(skb, IMMED_PKT_SIZE);</div><div class='del'>-		skb_copy_to_linear_data(skb, resp-&gt;imm_data, IMMED_PKT_SIZE);</div><div class='add'>+		BUILD_BUG_ON(IMMED_PKT_SIZE != sizeof(resp-&gt;immediate));</div><div class='add'>+		skb_copy_to_linear_data(skb, &amp;resp-&gt;immediate, IMMED_PKT_SIZE);</div><div class='ctx'> 	}</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='hunk'>@@ -967,9 +962,9 @@ static int map_skb(struct pci_dev *pdev, const struct sk_buff *skb,</div><div class='ctx'> 	const struct skb_shared_info *si;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_headlen(skb)) {</div><div class='del'>-		*addr = pci_map_single(pdev, skb-&gt;data, skb_headlen(skb),</div><div class='del'>-				       PCI_DMA_TODEVICE);</div><div class='del'>-		if (pci_dma_mapping_error(pdev, *addr))</div><div class='add'>+		*addr = dma_map_single(&amp;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+				       skb_headlen(skb), DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;pdev-&gt;dev, *addr))</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 		addr++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -980,7 +975,7 @@ static int map_skb(struct pci_dev *pdev, const struct sk_buff *skb,</div><div class='ctx'> 	for (fp = si-&gt;frags; fp &lt; end; fp++) {</div><div class='ctx'> 		*addr = skb_frag_dma_map(&amp;pdev-&gt;dev, fp, 0, skb_frag_size(fp),</div><div class='ctx'> 					 DMA_TO_DEVICE);</div><div class='del'>-		if (pci_dma_mapping_error(pdev, *addr))</div><div class='add'>+		if (dma_mapping_error(&amp;pdev-&gt;dev, *addr))</div><div class='ctx'> 			goto unwind;</div><div class='ctx'> 		addr++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -991,7 +986,8 @@ unwind:</div><div class='ctx'> 		dma_unmap_page(&amp;pdev-&gt;dev, *--addr, skb_frag_size(fp),</div><div class='ctx'> 			       DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='del'>-	pci_unmap_single(pdev, addr[-1], skb_headlen(skb), PCI_DMA_TODEVICE);</div><div class='add'>+	dma_unmap_single(&amp;pdev-&gt;dev, addr[-1], skb_headlen(skb),</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='ctx'> out_err:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='hunk'>@@ -1173,6 +1169,7 @@ static void write_wr_hdr_sgl(unsigned int ndesc, struct sk_buff *skb,</div><div class='ctx'>  *	@q: the Tx queue</div><div class='ctx'>  *	@ndesc: number of descriptors the packet will occupy</div><div class='ctx'>  *	@compl: the value of the COMPL bit to use</div><div class='add'>+ *	@addr: address</div><div class='ctx'>  *</div><div class='ctx'>  *	Generate a TX_PKT work request to send the supplied packet.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1254,7 +1251,7 @@ static inline void t3_stop_tx_queue(struct netdev_queue *txq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	eth_xmit - add a packet to the Ethernet Tx queue</div><div class='add'>+ *	t3_eth_xmit - add a packet to the Ethernet Tx queue</div><div class='ctx'>  *	@skb: the packet</div><div class='ctx'>  *	@dev: the egress net device</div><div class='ctx'>  *</div><div class='hunk'>@@ -1516,14 +1513,15 @@ static int ctrl_xmit(struct adapter *adap, struct sge_txq *q,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	restart_ctrlq - restart a suspended control queue</div><div class='del'>- *	@qs: the queue set cotaining the control queue</div><div class='add'>+ *	@w: pointer to the work associated with this handler</div><div class='ctx'>  *</div><div class='ctx'>  *	Resumes transmission on a suspended Tx control queue.</div><div class='ctx'>  */</div><div class='del'>-static void restart_ctrlq(unsigned long data)</div><div class='add'>+static void restart_ctrlq(struct work_struct *w)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct sge_qset *qs = (struct sge_qset *)data;</div><div class='add'>+	struct sge_qset *qs = container_of(w, struct sge_qset,</div><div class='add'>+					   txq[TXQ_CTRL].qresume_task);</div><div class='ctx'> 	struct sge_txq *q = &amp;qs-&gt;txq[TXQ_CTRL];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;q-&gt;lock);</div><div class='hunk'>@@ -1589,13 +1587,14 @@ static void deferred_unmap_destructor(struct sk_buff *skb)</div><div class='ctx'> 	p = dui-&gt;addr;</div><div class='ctx'> </div><div class='ctx'> 	if (skb_tail_pointer(skb) - skb_transport_header(skb))</div><div class='del'>-		pci_unmap_single(dui-&gt;pdev, *p++, skb_tail_pointer(skb) -</div><div class='del'>-				 skb_transport_header(skb), PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;dui-&gt;pdev-&gt;dev, *p++,</div><div class='add'>+				 skb_tail_pointer(skb) - skb_transport_header(skb),</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	si = skb_shinfo(skb);</div><div class='ctx'> 	for (i = 0; i &lt; si-&gt;nr_frags; i++)</div><div class='del'>-		pci_unmap_page(dui-&gt;pdev, *p++, skb_frag_size(&amp;si-&gt;frags[i]),</div><div class='del'>-			       PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_page(&amp;dui-&gt;pdev-&gt;dev, *p++,</div><div class='add'>+			       skb_frag_size(&amp;si-&gt;frags[i]), DMA_TO_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void setup_deferred_unmapping(struct sk_buff *skb, struct pci_dev *pdev,</div><div class='hunk'>@@ -1622,6 +1621,7 @@ static void setup_deferred_unmapping(struct sk_buff *skb, struct pci_dev *pdev,</div><div class='ctx'>  *	@pidx: index of the first Tx descriptor to write</div><div class='ctx'>  *	@gen: the generation value to use</div><div class='ctx'>  *	@ndesc: number of descriptors the packet will occupy</div><div class='add'>+ *	@addr: the address</div><div class='ctx'>  *</div><div class='ctx'>  *	Write an offload work request to send the supplied packet.  The packet</div><div class='ctx'>  *	data already carry the work request with most fields populated.</div><div class='hunk'>@@ -1733,14 +1733,15 @@ again:	reclaim_completed_tx(adap, q, TX_RECLAIM_CHUNK);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	restart_offloadq - restart a suspended offload queue</div><div class='del'>- *	@qs: the queue set cotaining the offload queue</div><div class='add'>+ *	@w: pointer to the work associated with this handler</div><div class='ctx'>  *</div><div class='ctx'>  *	Resumes transmission on a suspended Tx offload queue.</div><div class='ctx'>  */</div><div class='del'>-static void restart_offloadq(unsigned long data)</div><div class='add'>+static void restart_offloadq(struct work_struct *w)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='del'>-	struct sge_qset *qs = (struct sge_qset *)data;</div><div class='add'>+	struct sge_qset *qs = container_of(w, struct sge_qset,</div><div class='add'>+					   txq[TXQ_OFLD].qresume_task);</div><div class='ctx'> 	struct sge_txq *q = &amp;qs-&gt;txq[TXQ_OFLD];</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(qs-&gt;netdev);</div><div class='ctx'> 	struct adapter *adap = pi-&gt;adapter;</div><div class='hunk'>@@ -1883,7 +1884,7 @@ static inline void deliver_partial_bundle(struct t3cdev *tdev,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	ofld_poll - NAPI handler for offload packets in interrupt mode</div><div class='del'>- *	@dev: the network device doing the polling</div><div class='add'>+ *	@napi: the network device doing the polling</div><div class='ctx'>  *	@budget: polling budget</div><div class='ctx'>  *</div><div class='ctx'>  *	The NAPI handler for offload packets when a response queue is serviced</div><div class='hunk'>@@ -1950,7 +1951,7 @@ static int ofld_poll(struct napi_struct *napi, int budget)</div><div class='ctx'>  *	@rx_gather: a gather list of packets if we are building a bundle</div><div class='ctx'>  *	@gather_idx: index of the next available slot in the bundle</div><div class='ctx'>  *</div><div class='del'>- *	Process an ingress offload pakcet and add it to the offload ingress</div><div class='add'>+ *	Process an ingress offload packet and add it to the offload ingress</div><div class='ctx'>  *	queue. 	Returns the index of the next available slot in the bundle.</div><div class='ctx'>  */</div><div class='ctx'> static inline int rx_offload(struct t3cdev *tdev, struct sge_rspq *rq,</div><div class='hunk'>@@ -1995,19 +1996,23 @@ static void restart_tx(struct sge_qset *qs)</div><div class='ctx'> 	    should_restart_tx(&amp;qs-&gt;txq[TXQ_OFLD]) &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(TXQ_OFLD, &amp;qs-&gt;txq_stopped)) {</div><div class='ctx'> 		qs-&gt;txq[TXQ_OFLD].restarts++;</div><div class='del'>-		tasklet_schedule(&amp;qs-&gt;txq[TXQ_OFLD].qresume_tsk);</div><div class='add'>+</div><div class='add'>+		/* The work can be quite lengthy so we use driver's own queue */</div><div class='add'>+		queue_work(cxgb3_wq, &amp;qs-&gt;txq[TXQ_OFLD].qresume_task);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (test_bit(TXQ_CTRL, &amp;qs-&gt;txq_stopped) &amp;&amp;</div><div class='ctx'> 	    should_restart_tx(&amp;qs-&gt;txq[TXQ_CTRL]) &amp;&amp;</div><div class='ctx'> 	    test_and_clear_bit(TXQ_CTRL, &amp;qs-&gt;txq_stopped)) {</div><div class='ctx'> 		qs-&gt;txq[TXQ_CTRL].restarts++;</div><div class='del'>-		tasklet_schedule(&amp;qs-&gt;txq[TXQ_CTRL].qresume_tsk);</div><div class='add'>+</div><div class='add'>+		/* The work can be quite lengthy so we use driver's own queue */</div><div class='add'>+		queue_work(cxgb3_wq, &amp;qs-&gt;txq[TXQ_CTRL].qresume_task);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	cxgb3_arp_process - process an ARP request probing a private IP address</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@pi: the port info</div><div class='ctx'>  *	@skb: the skbuff containing the ARP request</div><div class='ctx'>  *</div><div class='ctx'>  *	Check if the ARP request is probing the private IP address</div><div class='hunk'>@@ -2069,9 +2074,10 @@ static void cxgb3_process_iscsi_prov_pack(struct port_info *pi,</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *	@rq: the response queue that received the packet</div><div class='ctx'>  *	@skb: the packet</div><div class='del'>- *	@pad: amount of padding at the start of the buffer</div><div class='add'>+ *	@pad: padding</div><div class='add'>+ *	@lro: large receive offload</div><div class='ctx'>  *</div><div class='del'>- *	Process an ingress ethernet pakcet and deliver it to the stack.</div><div class='add'>+ *	Process an ingress ethernet packet and deliver it to the stack.</div><div class='ctx'>  *	The padding is 2 if the packet was delivered in an Rx buffer and 0</div><div class='ctx'>  *	if it was immediate data in a response.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2132,7 +2138,7 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs,</div><div class='ctx'> 	struct port_info *pi = netdev_priv(qs-&gt;netdev);</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct cpl_rx_pkt *cpl;</div><div class='del'>-	struct skb_frag_struct *rx_frag;</div><div class='add'>+	skb_frag_t *rx_frag;</div><div class='ctx'> 	int nr_frags;</div><div class='ctx'> 	int offset = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2143,17 +2149,14 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs,</div><div class='ctx'> </div><div class='ctx'> 	fl-&gt;credits--;</div><div class='ctx'> </div><div class='del'>-	pci_dma_sync_single_for_cpu(adap-&gt;pdev,</div><div class='del'>-				    dma_unmap_addr(sd, dma_addr),</div><div class='del'>-				    fl-&gt;buf_size - SGE_PG_RSVD,</div><div class='del'>-				    PCI_DMA_FROMDEVICE);</div><div class='add'>+	dma_sync_single_for_cpu(&amp;adap-&gt;pdev-&gt;dev,</div><div class='add'>+				dma_unmap_addr(sd, dma_addr),</div><div class='add'>+				fl-&gt;buf_size - SGE_PG_RSVD, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	(*sd-&gt;pg_chunk.p_cnt)--;</div><div class='ctx'> 	if (!*sd-&gt;pg_chunk.p_cnt &amp;&amp; sd-&gt;pg_chunk.page != fl-&gt;pg_chunk.page)</div><div class='del'>-		pci_unmap_page(adap-&gt;pdev,</div><div class='del'>-			       sd-&gt;pg_chunk.mapping,</div><div class='del'>-			       fl-&gt;alloc_size,</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_page(&amp;adap-&gt;pdev-&gt;dev, sd-&gt;pg_chunk.mapping,</div><div class='add'>+			       fl-&gt;alloc_size, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	if (!skb) {</div><div class='ctx'> 		put_page(sd-&gt;pg_chunk.page);</div><div class='hunk'>@@ -2181,9 +2184,8 @@ static void lro_add_page(struct adapter *adap, struct sge_qset *qs,</div><div class='ctx'> 	len -= offset;</div><div class='ctx'> </div><div class='ctx'> 	rx_frag += nr_frags;</div><div class='del'>-	__skb_frag_set_page(rx_frag, sd-&gt;pg_chunk.page);</div><div class='del'>-	rx_frag-&gt;page_offset = sd-&gt;pg_chunk.offset + offset;</div><div class='del'>-	skb_frag_size_set(rx_frag, len);</div><div class='add'>+	skb_frag_fill_page_desc(rx_frag, sd-&gt;pg_chunk.page,</div><div class='add'>+				sd-&gt;pg_chunk.offset + offset, len);</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;len += len;</div><div class='ctx'> 	skb-&gt;data_len += len;</div><div class='hunk'>@@ -2239,7 +2241,7 @@ static inline void handle_rsp_cntrl_info(struct sge_qset *qs, u32 flags)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	check_ring_db - check if we need to ring any doorbells</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@qs: the queue set whose Tx queues are to be examined</div><div class='ctx'>  *	@sleeping: indicates which Tx queue sent GTS</div><div class='ctx'>  *</div><div class='hunk'>@@ -2372,10 +2374,7 @@ no_mem:</div><div class='ctx'> 			if (fl-&gt;use_pages) {</div><div class='ctx'> 				void *addr = fl-&gt;sdesc[fl-&gt;cidx].pg_chunk.va;</div><div class='ctx'> </div><div class='del'>-				prefetch(addr);</div><div class='del'>-#if L1_CACHE_BYTES &lt; 128</div><div class='del'>-				prefetch(addr + L1_CACHE_BYTES);</div><div class='del'>-#endif</div><div class='add'>+				net_prefetch(addr);</div><div class='ctx'> 				__refill_fl(adap, fl);</div><div class='ctx'> 				if (lro &gt; 0) {</div><div class='ctx'> 					lro_add_page(adap, qs, fl,</div><div class='hunk'>@@ -2502,14 +2501,6 @@ static int napi_rx_handler(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Returns true if the device is already scheduled for polling.</div><div class='del'>- */</div><div class='del'>-static inline int napi_is_scheduled(struct napi_struct *napi)</div><div class='del'>-{</div><div class='del'>-	return test_bit(NAPI_STATE_SCHED, &amp;napi-&gt;state);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	process_pure_responses - process pure responses from a response queue</div><div class='ctx'>  *	@adap: the adapter</div><div class='hunk'>@@ -2675,12 +2666,7 @@ static int rspq_check_napi(struct sge_qset *qs)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge_rspq *q = &amp;qs-&gt;rspq;</div><div class='ctx'> </div><div class='del'>-	if (!napi_is_scheduled(&amp;qs-&gt;napi) &amp;&amp;</div><div class='del'>-	    is_new_response(&amp;q-&gt;desc[q-&gt;cidx], q)) {</div><div class='del'>-		napi_schedule(&amp;qs-&gt;napi);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	return is_new_response(&amp;q-&gt;desc[q-&gt;cidx], q) &amp;&amp; napi_schedule(&amp;qs-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2902,7 +2888,7 @@ void t3_sge_err_intr_handler(struct adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	sge_timer_tx - perform periodic maintenance of an SGE qset</div><div class='del'>- *	@data: the SGE queue set to maintain</div><div class='add'>+ *	@t: a timer list containing the SGE queue set to maintain</div><div class='ctx'>  *</div><div class='ctx'>  *	Runs periodically from a timer to perform maintenance of an SGE queue</div><div class='ctx'>  *	set.  It performs two tasks:</div><div class='hunk'>@@ -2920,7 +2906,7 @@ void t3_sge_err_intr_handler(struct adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static void sge_timer_tx(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct sge_qset *qs = from_timer(qs, t, tx_reclaim_timer);</div><div class='add'>+	struct sge_qset *qs = timer_container_of(qs, t, tx_reclaim_timer);</div><div class='ctx'> 	struct port_info *pi = netdev_priv(qs-&gt;netdev);</div><div class='ctx'> 	struct adapter *adap = pi-&gt;adapter;</div><div class='ctx'> 	unsigned int tbd[SGE_TXQ_PER_SET] = {0, 0};</div><div class='hunk'>@@ -2946,7 +2932,7 @@ static void sge_timer_tx(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	sge_timer_rx - perform periodic maintenance of an SGE qset</div><div class='del'>- *	@data: the SGE queue set to maintain</div><div class='add'>+ *	@t: the timer list containing the SGE queue set to maintain</div><div class='ctx'>  *</div><div class='ctx'>  *	a) Replenishes Rx queues that have run out due to memory shortage.</div><div class='ctx'>  *	Normally new Rx buffers are added when existing ones are consumed but</div><div class='hunk'>@@ -2961,7 +2947,7 @@ static void sge_timer_tx(struct timer_list *t)</div><div class='ctx'> static void sge_timer_rx(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	spinlock_t *lock;</div><div class='del'>-	struct sge_qset *qs = from_timer(qs, t, rx_reclaim_timer);</div><div class='add'>+	struct sge_qset *qs = timer_container_of(qs, t, rx_reclaim_timer);</div><div class='ctx'> 	struct port_info *pi = netdev_priv(qs-&gt;netdev);</div><div class='ctx'> 	struct adapter *adap = pi-&gt;adapter;</div><div class='ctx'> 	u32 status;</div><div class='hunk'>@@ -3024,7 +3010,7 @@ void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p)</div><div class='ctx'>  *	@irq_vec_idx: the IRQ vector index for response queue interrupts</div><div class='ctx'>  *	@p: configuration parameters for this queue set</div><div class='ctx'>  *	@ntxq: number of Tx queues for the queue set</div><div class='del'>- *	@netdev: net device associated with this queue set</div><div class='add'>+ *	@dev: net device associated with this queue set</div><div class='ctx'>  *	@netdevq: net device TX queue associated with this queue set</div><div class='ctx'>  *</div><div class='ctx'>  *	Allocate resources and initialize an SGE queue set.  A queue set</div><div class='hunk'>@@ -3084,10 +3070,8 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,</div><div class='ctx'> 		skb_queue_head_init(&amp;q-&gt;txq[i].sendq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	tasklet_init(&amp;q-&gt;txq[TXQ_OFLD].qresume_tsk, restart_offloadq,</div><div class='del'>-		     (unsigned long)q);</div><div class='del'>-	tasklet_init(&amp;q-&gt;txq[TXQ_CTRL].qresume_tsk, restart_ctrlq,</div><div class='del'>-		     (unsigned long)q);</div><div class='add'>+	INIT_WORK(&amp;q-&gt;txq[TXQ_OFLD].qresume_task, restart_offloadq);</div><div class='add'>+	INIT_WORK(&amp;q-&gt;txq[TXQ_CTRL].qresume_task, restart_ctrlq);</div><div class='ctx'> </div><div class='ctx'> 	q-&gt;fl[0].gen = q-&gt;fl[1].gen = 1;</div><div class='ctx'> 	q-&gt;fl[0].size = p-&gt;fl_size;</div><div class='hunk'>@@ -3176,6 +3160,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,</div><div class='ctx'> 			  GFP_KERNEL | __GFP_COMP);</div><div class='ctx'> 	if (!avail) {</div><div class='ctx'> 		CH_ALERT(adapter, "free list queue 0 initialization failed\n");</div><div class='add'>+		ret = -ENOMEM;</div><div class='ctx'> 		goto err;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (avail &lt; q-&gt;fl[0].size)</div><div class='hunk'>@@ -3238,9 +3223,9 @@ void t3_stop_sge_timers(struct adapter *adap)</div><div class='ctx'> 		struct sge_qset *q = &amp;adap-&gt;sge.qs[i];</div><div class='ctx'> </div><div class='ctx'> 		if (q-&gt;tx_reclaim_timer.function)</div><div class='del'>-			del_timer_sync(&amp;q-&gt;tx_reclaim_timer);</div><div class='add'>+			timer_delete_sync(&amp;q-&gt;tx_reclaim_timer);</div><div class='ctx'> 		if (q-&gt;rx_reclaim_timer.function)</div><div class='del'>-			del_timer_sync(&amp;q-&gt;rx_reclaim_timer);</div><div class='add'>+			timer_delete_sync(&amp;q-&gt;rx_reclaim_timer);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3271,30 +3256,43 @@ void t3_sge_start(struct adapter *adap)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	t3_sge_stop - disable SGE operation</div><div class='add'>+ *	t3_sge_stop_dma - Disable SGE DMA engine operation</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *</div><div class='del'>- *	Disables the DMA engine.  This can be called in emeregencies (e.g.,</div><div class='del'>- *	from error interrupts) or from normal process context.  In the latter</div><div class='del'>- *	case it also disables any pending queue restart tasklets.  Note that</div><div class='del'>- *	if it is called in interrupt context it cannot disable the restart</div><div class='del'>- *	tasklets as it cannot wait, however the tasklets will have no effect</div><div class='del'>- *	since the doorbells are disabled and the driver will call this again</div><div class='del'>- *	later from process context, at which time the tasklets will be stopped</div><div class='del'>- *	if they are still running.</div><div class='add'>+ *	Can be invoked from interrupt context e.g.  error handler.</div><div class='add'>+ *</div><div class='add'>+ *	Note that this function cannot disable the restart of works as</div><div class='add'>+ *	it cannot wait if called from interrupt context, however the</div><div class='add'>+ *	works will have no effect since the doorbells are disabled. The</div><div class='add'>+ *	driver will call tg3_sge_stop() later from process context, at</div><div class='add'>+ *	which time the works will be stopped if they are still running.</div><div class='ctx'>  */</div><div class='del'>-void t3_sge_stop(struct adapter *adap)</div><div class='add'>+void t3_sge_stop_dma(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	t3_set_reg_field(adap, A_SG_CONTROL, F_GLOBALENABLE, 0);</div><div class='del'>-	if (!in_interrupt()) {</div><div class='del'>-		int i;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; SGE_QSETS; ++i) {</div><div class='del'>-			struct sge_qset *qs = &amp;adap-&gt;sge.qs[i];</div><div class='add'>+/**</div><div class='add'>+ *	t3_sge_stop - disable SGE operation completly</div><div class='add'>+ *	@adap: the adapter</div><div class='add'>+ *</div><div class='add'>+ *	Called from process context. Disables the DMA engine and any</div><div class='add'>+ *	pending queue restart works.</div><div class='add'>+ */</div><div class='add'>+void t3_sge_stop(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='del'>-			tasklet_kill(&amp;qs-&gt;txq[TXQ_OFLD].qresume_tsk);</div><div class='del'>-			tasklet_kill(&amp;qs-&gt;txq[TXQ_CTRL].qresume_tsk);</div><div class='del'>-		}</div><div class='add'>+	t3_sge_stop_dma(adap);</div><div class='add'>+</div><div class='add'>+	/* workqueues aren't initialized otherwise */</div><div class='add'>+	if (!(adap-&gt;flags &amp; FULL_INIT_DONE))</div><div class='add'>+		return;</div><div class='add'>+	for (i = 0; i &lt; SGE_QSETS; ++i) {</div><div class='add'>+		struct sge_qset *qs = &amp;adap-&gt;sge.qs[i];</div><div class='add'>+</div><div class='add'>+		cancel_work_sync(&amp;qs-&gt;txq[TXQ_OFLD].qresume_task);</div><div class='add'>+		cancel_work_sync(&amp;qs-&gt;txq[TXQ_CTRL].qresume_task);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3361,7 +3359,7 @@ void t3_sge_prep(struct adapter *adap, struct sge_params *p)</div><div class='ctx'> 		q-&gt;coalesce_usecs = 5;</div><div class='ctx'> 		q-&gt;rspq_size = 1024;</div><div class='ctx'> 		q-&gt;fl_size = 1024;</div><div class='del'>- 		q-&gt;jumbo_size = 512;</div><div class='add'>+		q-&gt;jumbo_size = 512;</div><div class='ctx'> 		q-&gt;txq_size[TXQ_ETH] = 1024;</div><div class='ctx'> 		q-&gt;txq_size[TXQ_OFLD] = 1024;</div><div class='ctx'> 		q-&gt;txq_size[TXQ_CTRL] = 256;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h b/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h<br/>index 852c399a8b0a..68bb5f39f3f1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/t3_cpl.h</a></div><div class='hunk'>@@ -1448,7 +1448,7 @@ struct cpl_rdma_terminate {</div><div class='ctx'> #endif</div><div class='ctx'> 	__be32 msn;</div><div class='ctx'> 	__be32 mo;</div><div class='del'>-	__u8 data[0];</div><div class='add'>+	__u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* cpl_rdma_terminate.tid_len fields */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c<br/>index 0a9f2c596624..a06003bfa04b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/t3_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/t3_hw.c</a></div><div class='hunk'>@@ -29,6 +29,7 @@</div><div class='ctx'>  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include "common.h"</div><div class='ctx'> #include "regs.h"</div><div class='ctx'> #include "sge_defs.h"</div><div class='hunk'>@@ -595,81 +596,10 @@ struct t3_vpd {</div><div class='ctx'> 	u32 pad;		/* for multiple-of-4 sizing and alignment */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define EEPROM_MAX_POLL   40</div><div class='ctx'> #define EEPROM_STAT_ADDR  0x4000</div><div class='ctx'> #define VPD_BASE          0xc00</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	t3_seeprom_read - read a VPD EEPROM location</div><div class='del'>- *	@adapter: adapter to read</div><div class='del'>- *	@addr: EEPROM address</div><div class='del'>- *	@data: where to store the read data</div><div class='del'>- *</div><div class='del'>- *	Read a 32-bit word from a location in VPD EEPROM using the card's PCI</div><div class='del'>- *	VPD ROM capability.  A zero is written to the flag bit when the</div><div class='del'>- *	address is written to the control register.  The hardware device will</div><div class='del'>- *	set the flag to 1 when 4 bytes have been read into the data register.</div><div class='del'>- */</div><div class='del'>-int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	int attempts = EEPROM_MAX_POLL;</div><div class='del'>-	u32 v;</div><div class='del'>-	unsigned int base = adapter-&gt;params.pci.vpd_cap_addr;</div><div class='del'>-</div><div class='del'>-	if ((addr &gt;= EEPROMSIZE &amp;&amp; addr != EEPROM_STAT_ADDR) || (addr &amp; 3))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	pci_write_config_word(adapter-&gt;pdev, base + PCI_VPD_ADDR, addr);</div><div class='del'>-	do {</div><div class='del'>-		udelay(10);</div><div class='del'>-		pci_read_config_word(adapter-&gt;pdev, base + PCI_VPD_ADDR, &amp;val);</div><div class='del'>-	} while (!(val &amp; PCI_VPD_ADDR_F) &amp;&amp; --attempts);</div><div class='del'>-</div><div class='del'>-	if (!(val &amp; PCI_VPD_ADDR_F)) {</div><div class='del'>-		CH_ERR(adapter, "reading EEPROM address 0x%x failed\n", addr);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	pci_read_config_dword(adapter-&gt;pdev, base + PCI_VPD_DATA, &amp;v);</div><div class='del'>-	*data = cpu_to_le32(v);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- *	t3_seeprom_write - write a VPD EEPROM location</div><div class='del'>- *	@adapter: adapter to write</div><div class='del'>- *	@addr: EEPROM address</div><div class='del'>- *	@data: value to write</div><div class='del'>- *</div><div class='del'>- *	Write a 32-bit word to a location in VPD EEPROM using the card's PCI</div><div class='del'>- *	VPD ROM capability.</div><div class='del'>- */</div><div class='del'>-int t3_seeprom_write(struct adapter *adapter, u32 addr, __le32 data)</div><div class='del'>-{</div><div class='del'>-	u16 val;</div><div class='del'>-	int attempts = EEPROM_MAX_POLL;</div><div class='del'>-	unsigned int base = adapter-&gt;params.pci.vpd_cap_addr;</div><div class='del'>-</div><div class='del'>-	if ((addr &gt;= EEPROMSIZE &amp;&amp; addr != EEPROM_STAT_ADDR) || (addr &amp; 3))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	pci_write_config_dword(adapter-&gt;pdev, base + PCI_VPD_DATA,</div><div class='del'>-			       le32_to_cpu(data));</div><div class='del'>-	pci_write_config_word(adapter-&gt;pdev,base + PCI_VPD_ADDR,</div><div class='del'>-			      addr | PCI_VPD_ADDR_F);</div><div class='del'>-	do {</div><div class='del'>-		msleep(1);</div><div class='del'>-		pci_read_config_word(adapter-&gt;pdev, base + PCI_VPD_ADDR, &amp;val);</div><div class='del'>-	} while ((val &amp; PCI_VPD_ADDR_F) &amp;&amp; --attempts);</div><div class='del'>-</div><div class='del'>-	if (val &amp; PCI_VPD_ADDR_F) {</div><div class='del'>-		CH_ERR(adapter, "write to EEPROM address 0x%x failed\n", addr);</div><div class='del'>-		return -EIO;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	t3_seeprom_wp - enable/disable EEPROM write protection</div><div class='ctx'>  *	@adapter: the adapter</div><div class='ctx'>  *	@enable: 1 to enable write protection, 0 to disable it</div><div class='hunk'>@@ -678,7 +608,14 @@ int t3_seeprom_write(struct adapter *adapter, u32 addr, __le32 data)</div><div class='ctx'>  */</div><div class='ctx'> int t3_seeprom_wp(struct adapter *adapter, int enable)</div><div class='ctx'> {</div><div class='del'>-	return t3_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0);</div><div class='add'>+	u32 data = enable ? 0xc : 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* EEPROM_STAT_ADDR is outside VPD area, use pci_write_vpd_any() */</div><div class='add'>+	ret = pci_write_vpd_any(adapter-&gt;pdev, EEPROM_STAT_ADDR, sizeof(u32),</div><div class='add'>+				&amp;data);</div><div class='add'>+</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int vpdstrtouint(char *s, u8 len, unsigned int base, unsigned int *val)</div><div class='hunk'>@@ -708,24 +645,22 @@ static int vpdstrtou16(char *s, u8 len, unsigned int base, u16 *val)</div><div class='ctx'>  */</div><div class='ctx'> static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)</div><div class='ctx'> {</div><div class='del'>-	int i, addr, ret;</div><div class='ctx'> 	struct t3_vpd vpd;</div><div class='add'>+	u8 base_val = 0;</div><div class='add'>+	int addr, ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Card information is normally at VPD_BASE but some early cards had</div><div class='ctx'> 	 * it at 0.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = t3_seeprom_read(adapter, VPD_BASE, (__le32 *)&amp;vpd);</div><div class='del'>-	if (ret)</div><div class='add'>+	ret = pci_read_vpd(adapter-&gt;pdev, VPD_BASE, 1, &amp;base_val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='del'>-	addr = vpd.id_tag == 0x82 ? VPD_BASE : 0;</div><div class='add'>+	addr = base_val == PCI_VPD_LRDT_ID_STRING ? VPD_BASE : 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; sizeof(vpd); i += 4) {</div><div class='del'>-		ret = t3_seeprom_read(adapter, addr + i,</div><div class='del'>-				      (__le32 *)((u8 *)&amp;vpd + i));</div><div class='del'>-		if (ret)</div><div class='del'>-			return ret;</div><div class='del'>-	}</div><div class='add'>+	ret = pci_read_vpd(adapter-&gt;pdev, addr, sizeof(vpd), &amp;vpd);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	ret = vpdstrtouint(vpd.cclk_data, vpd.cclk_len, 10, &amp;p-&gt;cclk);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -2195,7 +2130,7 @@ static int t3_sge_write_context(struct adapter *adapter, unsigned int id,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	clear_sge_ctxt - completely clear an SGE context</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@id: the context id</div><div class='ctx'>  *	@type: the context type</div><div class='ctx'>  *</div><div class='hunk'>@@ -2484,6 +2419,7 @@ int t3_sge_disable_cqcntxt(struct adapter *adapter, unsigned int id)</div><div class='ctx'>  *	@adapter: the adapter</div><div class='ctx'>  *	@id: the context id</div><div class='ctx'>  *	@op: the operation to perform</div><div class='add'>+ *	@credits: credit value to write</div><div class='ctx'>  *</div><div class='ctx'>  *	Perform the selected operation on an SGE completion queue context.</div><div class='ctx'>  *	The caller is responsible for ensuring only one context operation</div><div class='hunk'>@@ -2885,7 +2821,7 @@ static void init_cong_ctrl(unsigned short *a, unsigned short *b)</div><div class='ctx'>  *	t3_load_mtus - write the MTU and congestion control HW tables</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *	@mtus: the unrestricted values for the MTU table</div><div class='del'>- *	@alphs: the values for the congestion control alpha parameter</div><div class='add'>+ *	@alpha: the values for the congestion control alpha parameter</div><div class='ctx'>  *	@beta: the values for the congestion control beta parameter</div><div class='ctx'>  *	@mtu_cap: the maximum permitted effective MTU</div><div class='ctx'>  *</div><div class='hunk'>@@ -2966,7 +2902,7 @@ static void ulp_config(struct adapter *adap, const struct tp_params *p)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	t3_set_proto_sram - set the contents of the protocol sram</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@data: the protocol image</div><div class='ctx'>  *</div><div class='ctx'>  *	Write the contents of the protocol SRAM.</div><div class='hunk'>@@ -3483,7 +3419,7 @@ static void get_pci_mode(struct adapter *adapter, struct pci_params *p)</div><div class='ctx'> /**</div><div class='ctx'>  *	init_link_config - initialize a link's SW state</div><div class='ctx'>  *	@lc: structure holding the link state</div><div class='del'>- *	@ai: information about the current card</div><div class='add'>+ *	@caps: information about the current card</div><div class='ctx'>  *</div><div class='ctx'>  *	Initializes the SW state maintained for each link, including the link's</div><div class='ctx'>  *	capabilities and default speed/duplex/flow-control/autonegotiation</div><div class='hunk'>@@ -3677,6 +3613,8 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,</div><div class='ctx'> 	    MAC_STATS_ACCUM_SECS : (MAC_STATS_ACCUM_SECS * 10);</div><div class='ctx'> 	adapter-&gt;params.pci.vpd_cap_addr =</div><div class='ctx'> 	    pci_find_capability(adapter-&gt;pdev, PCI_CAP_ID_VPD);</div><div class='add'>+	if (!adapter-&gt;params.pci.vpd_cap_addr)</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	ret = get_vpd_params(adapter, &amp;adapter-&gt;params.vpd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -3757,8 +3695,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,</div><div class='ctx'> 		memcpy(hw_addr, adapter-&gt;params.vpd.eth_base, 5);</div><div class='ctx'> 		hw_addr[5] = adapter-&gt;params.vpd.eth_base[5] + i;</div><div class='ctx'> </div><div class='del'>-		memcpy(adapter-&gt;port[i]-&gt;dev_addr, hw_addr,</div><div class='del'>-		       ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(adapter-&gt;port[i], hw_addr);</div><div class='ctx'> 		init_link_config(&amp;p-&gt;link_config, p-&gt;phy.caps);</div><div class='ctx'> 		p-&gt;phy.ops-&gt;power_down(&amp;p-&gt;phy, 1);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h<br/>index 165bfb91487a..b4b2547efc86 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/version.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/version.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/version.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/version.h</a></div><div class='hunk'>@@ -34,8 +34,6 @@</div><div class='ctx'> #define __CHELSIO_VERSION_H</div><div class='ctx'> #define DRV_DESC "Chelsio T3 Network Driver"</div><div class='ctx'> #define DRV_NAME "cxgb3"</div><div class='del'>-/* Driver version */</div><div class='del'>-#define DRV_VERSION "1.1.5-ko"</div><div class='ctx'> </div><div class='ctx'> /* Firmware version */</div><div class='ctx'> #define FW_VERSION_MAJOR 7</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb3/xgmac.c b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c<br/>index 3af19a550372..1bdc6cad1e49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/xgmac.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb3/xgmac.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb3/xgmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb3/xgmac.c</a></div><div class='hunk'>@@ -240,7 +240,7 @@ static void set_addr_filter(struct cmac *mac, int idx, const u8 * addr)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Set one of the station's unicast MAC addresses. */</div><div class='del'>-int t3_mac_set_address(struct cmac *mac, unsigned int idx, u8 addr[6])</div><div class='add'>+int t3_mac_set_address(struct cmac *mac, unsigned int idx, const u8 addr[6])</div><div class='ctx'> {</div><div class='ctx'> 	if (idx &gt;= mac-&gt;nucast)</div><div class='ctx'> 		return -EINVAL;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/Makefile b/drivers/net/ethernet/chelsio/cxgb4/Makefile<br/>index 91d8a885deba..a4b4d475abf8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/Makefile</a></div><div class='hunk'>@@ -7,8 +7,9 @@ obj-$(CONFIG_CHELSIO_T4) += cxgb4.o</div><div class='ctx'> </div><div class='ctx'> cxgb4-objs := cxgb4_main.o l2t.o smt.o t4_hw.o sge.o clip_tbl.o cxgb4_ethtool.o \</div><div class='ctx'> 	      cxgb4_uld.o srq.o sched.o cxgb4_filter.o cxgb4_tc_u32.o \</div><div class='del'>-	      cxgb4_ptp.o cxgb4_tc_flower.o cxgb4_cudbg.o \</div><div class='del'>-	      cudbg_common.o cudbg_lib.o cudbg_zlib.o</div><div class='add'>+	      cxgb4_ptp.o cxgb4_tc_flower.o cxgb4_cudbg.o cxgb4_mps.o \</div><div class='add'>+	      cudbg_common.o cudbg_lib.o cudbg_zlib.o cxgb4_tc_mqprio.o \</div><div class='add'>+	      cxgb4_tc_matchall.o</div><div class='ctx'> cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o</div><div class='ctx'> cxgb4-$(CONFIG_CHELSIO_T4_FCOE) +=  cxgb4_fcoe.o</div><div class='ctx'> cxgb4-$(CONFIG_DEBUG_FS) += cxgb4_debugfs.o</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c<br/>index ce28820c57c9..5060d3998889 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c</a></div><div class='hunk'>@@ -106,8 +106,7 @@ int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6)</div><div class='ctx'> 	if (!list_empty(&amp;ctbl-&gt;ce_free_head)) {</div><div class='ctx'> 		ce = list_first_entry(&amp;ctbl-&gt;ce_free_head,</div><div class='ctx'> 				      struct clip_entry, list);</div><div class='del'>-		list_del(&amp;ce-&gt;list);</div><div class='del'>-		INIT_LIST_HEAD(&amp;ce-&gt;list);</div><div class='add'>+		list_del_init(&amp;ce-&gt;list);</div><div class='ctx'> 		spin_lock_init(&amp;ce-&gt;lock);</div><div class='ctx'> 		refcount_set(&amp;ce-&gt;refcnt, 0);</div><div class='ctx'> 		atomic_dec(&amp;ctbl-&gt;nfree);</div><div class='hunk'>@@ -121,7 +120,7 @@ int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6)</div><div class='ctx'> 				write_unlock_bh(&amp;ctbl-&gt;lock);</div><div class='ctx'> 				dev_err(adap-&gt;pdev_dev,</div><div class='ctx'> 					"CLIP FW cmd failed with error %d, "</div><div class='del'>-					"Connections using %pI6c wont be "</div><div class='add'>+					"Connections using %pI6c won't be "</div><div class='ctx'> 					"offloaded",</div><div class='ctx'> 					ret, ce-&gt;addr6.sin6_addr.s6_addr);</div><div class='ctx'> 				return ret;</div><div class='hunk'>@@ -134,7 +133,7 @@ int cxgb4_clip_get(const struct net_device *dev, const u32 *lip, u8 v6)</div><div class='ctx'> 	} else {</div><div class='ctx'> 		write_unlock_bh(&amp;ctbl-&gt;lock);</div><div class='ctx'> 		dev_info(adap-&gt;pdev_dev, "CLIP table overflow, "</div><div class='del'>-			 "Connections using %pI6c wont be offloaded",</div><div class='add'>+			 "Connections using %pI6c won't be offloaded",</div><div class='ctx'> 			 (void *)lip);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -179,8 +178,7 @@ found:</div><div class='ctx'> 	write_lock_bh(&amp;ctbl-&gt;lock);</div><div class='ctx'> 	spin_lock_bh(&amp;ce-&gt;lock);</div><div class='ctx'> 	if (refcount_dec_and_test(&amp;ce-&gt;refcnt)) {</div><div class='del'>-		list_del(&amp;ce-&gt;list);</div><div class='del'>-		INIT_LIST_HEAD(&amp;ce-&gt;list);</div><div class='add'>+		list_del_init(&amp;ce-&gt;list);</div><div class='ctx'> 		list_add_tail(&amp;ce-&gt;list, &amp;ctbl-&gt;ce_free_head);</div><div class='ctx'> 		atomic_inc(&amp;ctbl-&gt;nfree);</div><div class='ctx'> 		if (v6)</div><div class='hunk'>@@ -323,8 +321,7 @@ void t4_cleanup_clip_tbl(struct adapter *adap)</div><div class='ctx'> 	struct clip_tbl *ctbl = adap-&gt;clipt;</div><div class='ctx'> </div><div class='ctx'> 	if (ctbl) {</div><div class='del'>-		if (ctbl-&gt;cl_list)</div><div class='del'>-			kvfree(ctbl-&gt;cl_list);</div><div class='add'>+		kvfree(ctbl-&gt;cl_list);</div><div class='ctx'> 		kvfree(ctbl);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h b/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h<br/>index a0e0ae19649f..847c7fc2bbd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h</a></div><div class='hunk'>@@ -29,7 +29,7 @@ struct clip_tbl {</div><div class='ctx'> 	atomic_t nfree;</div><div class='ctx'> 	struct list_head ce_free_head;</div><div class='ctx'> 	void *cl_list;</div><div class='del'>-	struct list_head hash_list[0];</div><div class='add'>+	struct list_head hash_list[] __counted_by(clipt_size);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h b/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h<br/>index 69746696a929..d5218e74284c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h</a></div><div class='hunk'>@@ -82,7 +82,7 @@ struct cudbg_ulprx_la {</div><div class='ctx'> struct cudbg_tp_la {</div><div class='ctx'> 	u32 size;</div><div class='ctx'> 	u32 mode;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const char * const cudbg_region[] = {</div><div class='hunk'>@@ -134,7 +134,7 @@ struct cudbg_meminfo {</div><div class='ctx'> </div><div class='ctx'> struct cudbg_cim_pif_la {</div><div class='ctx'> 	int size;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cudbg_clk_info {</div><div class='hunk'>@@ -220,9 +220,6 @@ struct cudbg_mps_tcam {</div><div class='ctx'> 	u8 reserved[2];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-#define CUDBG_VPD_PF_SIZE 0x800</div><div class='del'>-#define CUDBG_SCFG_VER_ADDR 0x06</div><div class='del'>-#define CUDBG_SCFG_VER_LEN 4</div><div class='ctx'> #define CUDBG_VPD_VER_ADDR 0x18c7</div><div class='ctx'> #define CUDBG_VPD_VER_LEN 2</div><div class='ctx'> </div><div class='hunk'>@@ -325,6 +322,9 @@ enum cudbg_qdesc_qtype {</div><div class='ctx'> 	CUDBG_QTYPE_CRYPTO_FLQ,</div><div class='ctx'> 	CUDBG_QTYPE_TLS_RXQ,</div><div class='ctx'> 	CUDBG_QTYPE_TLS_FLQ,</div><div class='add'>+	CUDBG_QTYPE_ETHOFLD_TXQ,</div><div class='add'>+	CUDBG_QTYPE_ETHOFLD_RXQ,</div><div class='add'>+	CUDBG_QTYPE_ETHOFLD_FLQ,</div><div class='ctx'> 	CUDBG_QTYPE_MAX,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -336,178 +336,17 @@ struct cudbg_qdesc_entry {</div><div class='ctx'> 	u32 qid;</div><div class='ctx'> 	u32 desc_size;</div><div class='ctx'> 	u32 num_desc;</div><div class='del'>-	u8 data[0]; /* Must be last */</div><div class='add'>+	u8 data[]; /* Must be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cudbg_qdesc_info {</div><div class='ctx'> 	u32 qdesc_entry_size;</div><div class='ctx'> 	u32 num_queues;</div><div class='del'>-	u8 data[0]; /* Must be last */</div><div class='add'>+	u8 data[]; /* Must be last */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define IREG_NUM_ELEM 4</div><div class='ctx'> </div><div class='del'>-static const u32 t6_tp_pio_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x7e40, 0x7e44, 0x020, 28}, /* t6_tp_pio_regs_20_to_3b */</div><div class='del'>-	{0x7e40, 0x7e44, 0x040, 10}, /* t6_tp_pio_regs_40_to_49 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x050, 10}, /* t6_tp_pio_regs_50_to_59 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x060, 14}, /* t6_tp_pio_regs_60_to_6d */</div><div class='del'>-	{0x7e40, 0x7e44, 0x06F, 1}, /* t6_tp_pio_regs_6f */</div><div class='del'>-	{0x7e40, 0x7e44, 0x070, 6}, /* t6_tp_pio_regs_70_to_75 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x130, 18}, /* t6_tp_pio_regs_130_to_141 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x145, 19}, /* t6_tp_pio_regs_145_to_157 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x160, 1}, /* t6_tp_pio_regs_160 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x230, 25}, /* t6_tp_pio_regs_230_to_248 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x24a, 3}, /* t6_tp_pio_regs_24c */</div><div class='del'>-	{0x7e40, 0x7e44, 0x8C0, 1} /* t6_tp_pio_regs_8c0 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_tp_pio_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x7e40, 0x7e44, 0x020, 28}, /* t5_tp_pio_regs_20_to_3b */</div><div class='del'>-	{0x7e40, 0x7e44, 0x040, 19}, /* t5_tp_pio_regs_40_to_52 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x054, 2}, /* t5_tp_pio_regs_54_to_55 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x060, 13}, /* t5_tp_pio_regs_60_to_6c */</div><div class='del'>-	{0x7e40, 0x7e44, 0x06F, 1}, /* t5_tp_pio_regs_6f */</div><div class='del'>-	{0x7e40, 0x7e44, 0x120, 4}, /* t5_tp_pio_regs_120_to_123 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x12b, 2}, /* t5_tp_pio_regs_12b_to_12c */</div><div class='del'>-	{0x7e40, 0x7e44, 0x12f, 21}, /* t5_tp_pio_regs_12f_to_143 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x145, 19}, /* t5_tp_pio_regs_145_to_157 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x230, 25}, /* t5_tp_pio_regs_230_to_248 */</div><div class='del'>-	{0x7e40, 0x7e44, 0x8C0, 1} /* t5_tp_pio_regs_8c0 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_tp_tm_pio_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x7e18, 0x7e1c, 0x0, 12}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_tp_tm_pio_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x7e18, 0x7e1c, 0x0, 12}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_tp_mib_index_array[6][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x7e50, 0x7e54, 0x0, 13},</div><div class='del'>-	{0x7e50, 0x7e54, 0x10, 6},</div><div class='del'>-	{0x7e50, 0x7e54, 0x18, 21},</div><div class='del'>-	{0x7e50, 0x7e54, 0x30, 32},</div><div class='del'>-	{0x7e50, 0x7e54, 0x50, 22},</div><div class='del'>-	{0x7e50, 0x7e54, 0x68, 12}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_tp_mib_index_array[9][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x7e50, 0x7e54, 0x0, 13},</div><div class='del'>-	{0x7e50, 0x7e54, 0x10, 6},</div><div class='del'>-	{0x7e50, 0x7e54, 0x18, 8},</div><div class='del'>-	{0x7e50, 0x7e54, 0x20, 13},</div><div class='del'>-	{0x7e50, 0x7e54, 0x30, 16},</div><div class='del'>-	{0x7e50, 0x7e54, 0x40, 16},</div><div class='del'>-	{0x7e50, 0x7e54, 0x50, 16},</div><div class='del'>-	{0x7e50, 0x7e54, 0x60, 6},</div><div class='del'>-	{0x7e50, 0x7e54, 0x68, 4}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_sge_dbg_index_array[2][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x10cc, 0x10d0, 0x0, 16},</div><div class='del'>-	{0x10cc, 0x10d4, 0x0, 16},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_sge_qbase_index_array[] = {</div><div class='del'>-	/* 1 addr reg SGE_QBASE_INDEX and 4 data reg SGE_QBASE_MAP[0-3] */</div><div class='del'>-	0x1250, 0x1240, 0x1244, 0x1248, 0x124c,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_pcie_pdbg_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x5a04, 0x5a0c, 0x00, 0x20}, /* t5_pcie_pdbg_regs_00_to_20 */</div><div class='del'>-	{0x5a04, 0x5a0c, 0x21, 0x20}, /* t5_pcie_pdbg_regs_21_to_40 */</div><div class='del'>-	{0x5a04, 0x5a0c, 0x41, 0x10}, /* t5_pcie_pdbg_regs_41_to_50 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_pcie_cdbg_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x5a10, 0x5a18, 0x00, 0x20}, /* t5_pcie_cdbg_regs_00_to_20 */</div><div class='del'>-	{0x5a10, 0x5a18, 0x21, 0x18}, /* t5_pcie_cdbg_regs_21_to_37 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_pm_rx_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x8FD0, 0x8FD4, 0x10000, 0x20}, /* t5_pm_rx_regs_10000_to_10020 */</div><div class='del'>-	{0x8FD0, 0x8FD4, 0x10021, 0x0D}, /* t5_pm_rx_regs_10021_to_1002c */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_pm_tx_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x8FF0, 0x8FF4, 0x10000, 0x20}, /* t5_pm_tx_regs_10000_to_10020 */</div><div class='del'>-	{0x8FF0, 0x8FF4, 0x10021, 0x1D}, /* t5_pm_tx_regs_10021_to_1003c */</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #define CUDBG_NUM_PCIE_CONFIG_REGS 0x61</div><div class='ctx'> </div><div class='del'>-static const u32 t5_pcie_config_array[][2] = {</div><div class='del'>-	{0x0, 0x34},</div><div class='del'>-	{0x3c, 0x40},</div><div class='del'>-	{0x50, 0x64},</div><div class='del'>-	{0x70, 0x80},</div><div class='del'>-	{0x94, 0xa0},</div><div class='del'>-	{0xb0, 0xb8},</div><div class='del'>-	{0xd0, 0xd4},</div><div class='del'>-	{0x100, 0x128},</div><div class='del'>-	{0x140, 0x148},</div><div class='del'>-	{0x150, 0x164},</div><div class='del'>-	{0x170, 0x178},</div><div class='del'>-	{0x180, 0x194},</div><div class='del'>-	{0x1a0, 0x1b8},</div><div class='del'>-	{0x1c0, 0x208},</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_ma_ireg_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x78f8, 0x78fc, 0xa000, 23}, /* t6_ma_regs_a000_to_a016 */</div><div class='del'>-	{0x78f8, 0x78fc, 0xa400, 30}, /* t6_ma_regs_a400_to_a41e */</div><div class='del'>-	{0x78f8, 0x78fc, 0xa800, 20} /* t6_ma_regs_a800_to_a813 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_ma_ireg_array2[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x78f8, 0x78fc, 0xe400, 17}, /* t6_ma_regs_e400_to_e600 */</div><div class='del'>-	{0x78f8, 0x78fc, 0xe640, 13} /* t6_ma_regs_e640_to_e7c0 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_up_cim_reg_array[][IREG_NUM_ELEM + 1] = {</div><div class='del'>-	{0x7b50, 0x7b54, 0x2000, 0x20, 0}, /* up_cim_2000_to_207c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x2080, 0x1d, 0}, /* up_cim_2080_to_20fc */</div><div class='del'>-	{0x7b50, 0x7b54, 0x00, 0x20, 0}, /* up_cim_00_to_7c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x80, 0x20, 0}, /* up_cim_80_to_fc */</div><div class='del'>-	{0x7b50, 0x7b54, 0x100, 0x11, 0}, /* up_cim_100_to_14c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x200, 0x10, 0}, /* up_cim_200_to_23c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x240, 0x2, 0}, /* up_cim_240_to_244 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x250, 0x2, 0}, /* up_cim_250_to_254 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x260, 0x2, 0}, /* up_cim_260_to_264 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x270, 0x2, 0}, /* up_cim_270_to_274 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x280, 0x20, 0}, /* up_cim_280_to_2fc */</div><div class='del'>-	{0x7b50, 0x7b54, 0x300, 0x20, 0}, /* up_cim_300_to_37c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x380, 0x14, 0}, /* up_cim_380_to_3cc */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4900, 0x4, 0x4}, /* up_cim_4900_to_4c60 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4904, 0x4, 0x4}, /* up_cim_4904_to_4c64 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4908, 0x4, 0x4}, /* up_cim_4908_to_4c68 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4910, 0x4, 0x4}, /* up_cim_4910_to_4c70 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4914, 0x4, 0x4}, /* up_cim_4914_to_4c74 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4920, 0x10, 0x10}, /* up_cim_4920_to_4a10 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4924, 0x10, 0x10}, /* up_cim_4924_to_4a14 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x4928, 0x10, 0x10}, /* up_cim_4928_to_4a18 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x492c, 0x10, 0x10}, /* up_cim_492c_to_4a1c */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t5_up_cim_reg_array[][IREG_NUM_ELEM + 1] = {</div><div class='del'>-	{0x7b50, 0x7b54, 0x2000, 0x20, 0}, /* up_cim_2000_to_207c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x2080, 0x19, 0}, /* up_cim_2080_to_20ec */</div><div class='del'>-	{0x7b50, 0x7b54, 0x00, 0x20, 0}, /* up_cim_00_to_7c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x80, 0x20, 0}, /* up_cim_80_to_fc */</div><div class='del'>-	{0x7b50, 0x7b54, 0x100, 0x11, 0}, /* up_cim_100_to_14c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x200, 0x10, 0}, /* up_cim_200_to_23c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x240, 0x2, 0}, /* up_cim_240_to_244 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x250, 0x2, 0}, /* up_cim_250_to_254 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x260, 0x2, 0}, /* up_cim_260_to_264 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x270, 0x2, 0}, /* up_cim_270_to_274 */</div><div class='del'>-	{0x7b50, 0x7b54, 0x280, 0x20, 0}, /* up_cim_280_to_2fc */</div><div class='del'>-	{0x7b50, 0x7b54, 0x300, 0x20, 0}, /* up_cim_300_to_37c */</div><div class='del'>-	{0x7b50, 0x7b54, 0x380, 0x14, 0}, /* up_cim_380_to_3cc */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const u32 t6_hma_ireg_array[][IREG_NUM_ELEM] = {</div><div class='del'>-	{0x51320, 0x51324, 0xa000, 32} /* t6_hma_regs_a000_to_a01f */</div><div class='del'>-};</div><div class='ctx'> #endif /* __CUDBG_ENTITY_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h b/drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h<br/>index fc3813050f0d..c84719e3ca08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h</a></div><div class='hunk'>@@ -70,7 +70,8 @@ enum cudbg_dbg_entity_type {</div><div class='ctx'> 	CUDBG_HMA_INDIRECT = 67,</div><div class='ctx'> 	CUDBG_HMA = 68,</div><div class='ctx'> 	CUDBG_QDESC = 70,</div><div class='del'>-	CUDBG_MAX_ENTITY = 71,</div><div class='add'>+	CUDBG_FLASH = 71,</div><div class='add'>+	CUDBG_MAX_ENTITY = 72,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cudbg_init {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c<br/>index a76529a7662d..557c591a6ce3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c</a></div><div class='hunk'>@@ -4,6 +4,7 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='add'>+#include &lt;linux/string.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "t4_regs.h"</div><div class='ctx'> #include "cxgb4.h"</div><div class='hunk'>@@ -13,6 +14,413 @@</div><div class='ctx'> #include "cudbg_entity.h"</div><div class='ctx'> #include "cudbg_lib.h"</div><div class='ctx'> #include "cudbg_zlib.h"</div><div class='add'>+#include "cxgb4_tc_mqprio.h"</div><div class='add'>+</div><div class='add'>+static const u32 t6_tp_pio_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x7e40, 0x7e44, 0x020, 28}, /* t6_tp_pio_regs_20_to_3b */</div><div class='add'>+	{0x7e40, 0x7e44, 0x040, 10}, /* t6_tp_pio_regs_40_to_49 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x050, 10}, /* t6_tp_pio_regs_50_to_59 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x060, 14}, /* t6_tp_pio_regs_60_to_6d */</div><div class='add'>+	{0x7e40, 0x7e44, 0x06F, 1}, /* t6_tp_pio_regs_6f */</div><div class='add'>+	{0x7e40, 0x7e44, 0x070, 6}, /* t6_tp_pio_regs_70_to_75 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x130, 18}, /* t6_tp_pio_regs_130_to_141 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x145, 19}, /* t6_tp_pio_regs_145_to_157 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x160, 1}, /* t6_tp_pio_regs_160 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x230, 25}, /* t6_tp_pio_regs_230_to_248 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x24a, 3}, /* t6_tp_pio_regs_24c */</div><div class='add'>+	{0x7e40, 0x7e44, 0x8C0, 1} /* t6_tp_pio_regs_8c0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_tp_pio_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x7e40, 0x7e44, 0x020, 28}, /* t5_tp_pio_regs_20_to_3b */</div><div class='add'>+	{0x7e40, 0x7e44, 0x040, 19}, /* t5_tp_pio_regs_40_to_52 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x054, 2}, /* t5_tp_pio_regs_54_to_55 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x060, 13}, /* t5_tp_pio_regs_60_to_6c */</div><div class='add'>+	{0x7e40, 0x7e44, 0x06F, 1}, /* t5_tp_pio_regs_6f */</div><div class='add'>+	{0x7e40, 0x7e44, 0x120, 4}, /* t5_tp_pio_regs_120_to_123 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x12b, 2}, /* t5_tp_pio_regs_12b_to_12c */</div><div class='add'>+	{0x7e40, 0x7e44, 0x12f, 21}, /* t5_tp_pio_regs_12f_to_143 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x145, 19}, /* t5_tp_pio_regs_145_to_157 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x230, 25}, /* t5_tp_pio_regs_230_to_248 */</div><div class='add'>+	{0x7e40, 0x7e44, 0x8C0, 1} /* t5_tp_pio_regs_8c0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_tp_tm_pio_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x7e18, 0x7e1c, 0x0, 12}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_tp_tm_pio_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x7e18, 0x7e1c, 0x0, 12}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_tp_mib_index_array[6][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x7e50, 0x7e54, 0x0, 13},</div><div class='add'>+	{0x7e50, 0x7e54, 0x10, 6},</div><div class='add'>+	{0x7e50, 0x7e54, 0x18, 21},</div><div class='add'>+	{0x7e50, 0x7e54, 0x30, 32},</div><div class='add'>+	{0x7e50, 0x7e54, 0x50, 22},</div><div class='add'>+	{0x7e50, 0x7e54, 0x68, 12}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_tp_mib_index_array[9][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x7e50, 0x7e54, 0x0, 13},</div><div class='add'>+	{0x7e50, 0x7e54, 0x10, 6},</div><div class='add'>+	{0x7e50, 0x7e54, 0x18, 8},</div><div class='add'>+	{0x7e50, 0x7e54, 0x20, 13},</div><div class='add'>+	{0x7e50, 0x7e54, 0x30, 16},</div><div class='add'>+	{0x7e50, 0x7e54, 0x40, 16},</div><div class='add'>+	{0x7e50, 0x7e54, 0x50, 16},</div><div class='add'>+	{0x7e50, 0x7e54, 0x60, 6},</div><div class='add'>+	{0x7e50, 0x7e54, 0x68, 4}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_sge_dbg_index_array[2][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x10cc, 0x10d0, 0x0, 16},</div><div class='add'>+	{0x10cc, 0x10d4, 0x0, 16},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_sge_qbase_index_array[] = {</div><div class='add'>+	/* 1 addr reg SGE_QBASE_INDEX and 4 data reg SGE_QBASE_MAP[0-3] */</div><div class='add'>+	0x1250, 0x1240, 0x1244, 0x1248, 0x124c,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_pcie_pdbg_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x5a04, 0x5a0c, 0x00, 0x20}, /* t5_pcie_pdbg_regs_00_to_20 */</div><div class='add'>+	{0x5a04, 0x5a0c, 0x21, 0x20}, /* t5_pcie_pdbg_regs_21_to_40 */</div><div class='add'>+	{0x5a04, 0x5a0c, 0x41, 0x10}, /* t5_pcie_pdbg_regs_41_to_50 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_pcie_cdbg_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x5a10, 0x5a18, 0x00, 0x20}, /* t5_pcie_cdbg_regs_00_to_20 */</div><div class='add'>+	{0x5a10, 0x5a18, 0x21, 0x18}, /* t5_pcie_cdbg_regs_21_to_37 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_pm_rx_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x8FD0, 0x8FD4, 0x10000, 0x20}, /* t5_pm_rx_regs_10000_to_10020 */</div><div class='add'>+	{0x8FD0, 0x8FD4, 0x10021, 0x0D}, /* t5_pm_rx_regs_10021_to_1002c */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_pm_tx_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x8FF0, 0x8FF4, 0x10000, 0x20}, /* t5_pm_tx_regs_10000_to_10020 */</div><div class='add'>+	{0x8FF0, 0x8FF4, 0x10021, 0x1D}, /* t5_pm_tx_regs_10021_to_1003c */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_pcie_config_array[][2] = {</div><div class='add'>+	{0x0, 0x34},</div><div class='add'>+	{0x3c, 0x40},</div><div class='add'>+	{0x50, 0x64},</div><div class='add'>+	{0x70, 0x80},</div><div class='add'>+	{0x94, 0xa0},</div><div class='add'>+	{0xb0, 0xb8},</div><div class='add'>+	{0xd0, 0xd4},</div><div class='add'>+	{0x100, 0x128},</div><div class='add'>+	{0x140, 0x148},</div><div class='add'>+	{0x150, 0x164},</div><div class='add'>+	{0x170, 0x178},</div><div class='add'>+	{0x180, 0x194},</div><div class='add'>+	{0x1a0, 0x1b8},</div><div class='add'>+	{0x1c0, 0x208},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_ma_ireg_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x78f8, 0x78fc, 0xa000, 23}, /* t6_ma_regs_a000_to_a016 */</div><div class='add'>+	{0x78f8, 0x78fc, 0xa400, 30}, /* t6_ma_regs_a400_to_a41e */</div><div class='add'>+	{0x78f8, 0x78fc, 0xa800, 20} /* t6_ma_regs_a800_to_a813 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_ma_ireg_array2[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x78f8, 0x78fc, 0xe400, 17}, /* t6_ma_regs_e400_to_e600 */</div><div class='add'>+	{0x78f8, 0x78fc, 0xe640, 13} /* t6_ma_regs_e640_to_e7c0 */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_up_cim_reg_array[][IREG_NUM_ELEM + 1] = {</div><div class='add'>+	{0x7b50, 0x7b54, 0x2000, 0x20, 0}, /* up_cim_2000_to_207c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x2080, 0x1d, 0}, /* up_cim_2080_to_20fc */</div><div class='add'>+	{0x7b50, 0x7b54, 0x00, 0x20, 0}, /* up_cim_00_to_7c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x80, 0x20, 0}, /* up_cim_80_to_fc */</div><div class='add'>+	{0x7b50, 0x7b54, 0x100, 0x11, 0}, /* up_cim_100_to_14c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x200, 0x10, 0}, /* up_cim_200_to_23c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x240, 0x2, 0}, /* up_cim_240_to_244 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x250, 0x2, 0}, /* up_cim_250_to_254 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x260, 0x2, 0}, /* up_cim_260_to_264 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x270, 0x2, 0}, /* up_cim_270_to_274 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x280, 0x20, 0}, /* up_cim_280_to_2fc */</div><div class='add'>+	{0x7b50, 0x7b54, 0x300, 0x20, 0}, /* up_cim_300_to_37c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x380, 0x14, 0}, /* up_cim_380_to_3cc */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4900, 0x4, 0x4}, /* up_cim_4900_to_4c60 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4904, 0x4, 0x4}, /* up_cim_4904_to_4c64 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4908, 0x4, 0x4}, /* up_cim_4908_to_4c68 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4910, 0x4, 0x4}, /* up_cim_4910_to_4c70 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4914, 0x4, 0x4}, /* up_cim_4914_to_4c74 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4920, 0x10, 0x10}, /* up_cim_4920_to_4a10 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4924, 0x10, 0x10}, /* up_cim_4924_to_4a14 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x4928, 0x10, 0x10}, /* up_cim_4928_to_4a18 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x492c, 0x10, 0x10}, /* up_cim_492c_to_4a1c */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t5_up_cim_reg_array[][IREG_NUM_ELEM + 1] = {</div><div class='add'>+	{0x7b50, 0x7b54, 0x2000, 0x20, 0}, /* up_cim_2000_to_207c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x2080, 0x19, 0}, /* up_cim_2080_to_20ec */</div><div class='add'>+	{0x7b50, 0x7b54, 0x00, 0x20, 0}, /* up_cim_00_to_7c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x80, 0x20, 0}, /* up_cim_80_to_fc */</div><div class='add'>+	{0x7b50, 0x7b54, 0x100, 0x11, 0}, /* up_cim_100_to_14c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x200, 0x10, 0}, /* up_cim_200_to_23c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x240, 0x2, 0}, /* up_cim_240_to_244 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x250, 0x2, 0}, /* up_cim_250_to_254 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x260, 0x2, 0}, /* up_cim_260_to_264 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x270, 0x2, 0}, /* up_cim_270_to_274 */</div><div class='add'>+	{0x7b50, 0x7b54, 0x280, 0x20, 0}, /* up_cim_280_to_2fc */</div><div class='add'>+	{0x7b50, 0x7b54, 0x300, 0x20, 0}, /* up_cim_300_to_37c */</div><div class='add'>+	{0x7b50, 0x7b54, 0x380, 0x14, 0}, /* up_cim_380_to_3cc */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const u32 t6_hma_ireg_array[][IREG_NUM_ELEM] = {</div><div class='add'>+	{0x51320, 0x51324, 0xa000, 32} /* t6_hma_regs_a000_to_a01f */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+u32 cudbg_get_entity_length(struct adapter *adap, u32 entity)</div><div class='add'>+{</div><div class='add'>+	struct cudbg_tcam tcam_region = { 0 };</div><div class='add'>+	u32 value, n = 0, len = 0;</div><div class='add'>+</div><div class='add'>+	switch (entity) {</div><div class='add'>+	case CUDBG_REG_DUMP:</div><div class='add'>+		switch (CHELSIO_CHIP_VERSION(adap-&gt;params.chip)) {</div><div class='add'>+		case CHELSIO_T4:</div><div class='add'>+			len = T4_REGMAP_SIZE;</div><div class='add'>+			break;</div><div class='add'>+		case CHELSIO_T5:</div><div class='add'>+		case CHELSIO_T6:</div><div class='add'>+			len = T5_REGMAP_SIZE;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_DEV_LOG:</div><div class='add'>+		len = adap-&gt;params.devlog.size;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_LA:</div><div class='add'>+		if (is_t6(adap-&gt;params.chip)) {</div><div class='add'>+			len = adap-&gt;params.cim_la_size / 10 + 1;</div><div class='add'>+			len *= 10 * sizeof(u32);</div><div class='add'>+		} else {</div><div class='add'>+			len = adap-&gt;params.cim_la_size / 8;</div><div class='add'>+			len *= 8 * sizeof(u32);</div><div class='add'>+		}</div><div class='add'>+		len += sizeof(u32); /* for reading CIM LA configuration */</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_MA_LA:</div><div class='add'>+		len = 2 * CIM_MALA_SIZE * 5 * sizeof(u32);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_QCFG:</div><div class='add'>+		len = sizeof(struct cudbg_cim_qcfg);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_IBQ_TP0:</div><div class='add'>+	case CUDBG_CIM_IBQ_TP1:</div><div class='add'>+	case CUDBG_CIM_IBQ_ULP:</div><div class='add'>+	case CUDBG_CIM_IBQ_SGE0:</div><div class='add'>+	case CUDBG_CIM_IBQ_SGE1:</div><div class='add'>+	case CUDBG_CIM_IBQ_NCSI:</div><div class='add'>+		len = CIM_IBQ_SIZE * 4 * sizeof(u32);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_ULP0:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 0);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_ULP1:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 1);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_ULP2:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 2);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_ULP3:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 3);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_SGE:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 4);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_NCSI:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 5);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_RXQ0:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 6);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_OBQ_RXQ1:</div><div class='add'>+		len = cudbg_cim_obq_size(adap, 7);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_EDC0:</div><div class='add'>+		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='add'>+		if (value &amp; EDRAM0_ENABLE_F) {</div><div class='add'>+			value = t4_read_reg(adap, MA_EDRAM0_BAR_A);</div><div class='add'>+			len = EDRAM0_SIZE_G(value);</div><div class='add'>+		}</div><div class='add'>+		len = cudbg_mbytes_to_bytes(len);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_EDC1:</div><div class='add'>+		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='add'>+		if (value &amp; EDRAM1_ENABLE_F) {</div><div class='add'>+			value = t4_read_reg(adap, MA_EDRAM1_BAR_A);</div><div class='add'>+			len = EDRAM1_SIZE_G(value);</div><div class='add'>+		}</div><div class='add'>+		len = cudbg_mbytes_to_bytes(len);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_MC0:</div><div class='add'>+		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='add'>+		if (value &amp; EXT_MEM0_ENABLE_F) {</div><div class='add'>+			value = t4_read_reg(adap, MA_EXT_MEMORY0_BAR_A);</div><div class='add'>+			len = EXT_MEM0_SIZE_G(value);</div><div class='add'>+		}</div><div class='add'>+		len = cudbg_mbytes_to_bytes(len);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_MC1:</div><div class='add'>+		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='add'>+		if (value &amp; EXT_MEM1_ENABLE_F) {</div><div class='add'>+			value = t4_read_reg(adap, MA_EXT_MEMORY1_BAR_A);</div><div class='add'>+			len = EXT_MEM1_SIZE_G(value);</div><div class='add'>+		}</div><div class='add'>+		len = cudbg_mbytes_to_bytes(len);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_RSS:</div><div class='add'>+		len = t4_chip_rss_size(adap) * sizeof(u16);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_RSS_VF_CONF:</div><div class='add'>+		len = adap-&gt;params.arch.vfcount *</div><div class='add'>+		      sizeof(struct cudbg_rss_vf_conf);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_PATH_MTU:</div><div class='add'>+		len = NMTUS * sizeof(u16);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_PM_STATS:</div><div class='add'>+		len = sizeof(struct cudbg_pm_stats);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_HW_SCHED:</div><div class='add'>+		len = sizeof(struct cudbg_hw_sched);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_TP_INDIRECT:</div><div class='add'>+		switch (CHELSIO_CHIP_VERSION(adap-&gt;params.chip)) {</div><div class='add'>+		case CHELSIO_T5:</div><div class='add'>+			n = sizeof(t5_tp_pio_array) +</div><div class='add'>+			    sizeof(t5_tp_tm_pio_array) +</div><div class='add'>+			    sizeof(t5_tp_mib_index_array);</div><div class='add'>+			break;</div><div class='add'>+		case CHELSIO_T6:</div><div class='add'>+			n = sizeof(t6_tp_pio_array) +</div><div class='add'>+			    sizeof(t6_tp_tm_pio_array) +</div><div class='add'>+			    sizeof(t6_tp_mib_index_array);</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		n = n / (IREG_NUM_ELEM * sizeof(u32));</div><div class='add'>+		len = sizeof(struct ireg_buf) * n;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_SGE_INDIRECT:</div><div class='add'>+		len = sizeof(struct ireg_buf) * 2 +</div><div class='add'>+		      sizeof(struct sge_qbase_reg_field);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_ULPRX_LA:</div><div class='add'>+		len = sizeof(struct cudbg_ulprx_la);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_TP_LA:</div><div class='add'>+		len = sizeof(struct cudbg_tp_la) + TPLA_SIZE * sizeof(u64);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_MEMINFO:</div><div class='add'>+		len = sizeof(struct cudbg_ver_hdr) +</div><div class='add'>+		      sizeof(struct cudbg_meminfo);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CIM_PIF_LA:</div><div class='add'>+		len = sizeof(struct cudbg_cim_pif_la);</div><div class='add'>+		len += 2 * CIM_PIFLA_SIZE * 6 * sizeof(u32);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CLK:</div><div class='add'>+		len = sizeof(struct cudbg_clk_info);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_PCIE_INDIRECT:</div><div class='add'>+		n = sizeof(t5_pcie_pdbg_array) / (IREG_NUM_ELEM * sizeof(u32));</div><div class='add'>+		len = sizeof(struct ireg_buf) * n * 2;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_PM_INDIRECT:</div><div class='add'>+		n = sizeof(t5_pm_rx_array) / (IREG_NUM_ELEM * sizeof(u32));</div><div class='add'>+		len = sizeof(struct ireg_buf) * n * 2;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_TID_INFO:</div><div class='add'>+		len = sizeof(struct cudbg_tid_info_region_rev1);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_PCIE_CONFIG:</div><div class='add'>+		len = sizeof(u32) * CUDBG_NUM_PCIE_CONFIG_REGS;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_DUMP_CONTEXT:</div><div class='add'>+		len = cudbg_dump_context_size(adap);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_MPS_TCAM:</div><div class='add'>+		len = sizeof(struct cudbg_mps_tcam) *</div><div class='add'>+		      adap-&gt;params.arch.mps_tcam_size;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_VPD_DATA:</div><div class='add'>+		len = sizeof(struct cudbg_vpd_data);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_LE_TCAM:</div><div class='add'>+		cudbg_fill_le_tcam_info(adap, &amp;tcam_region);</div><div class='add'>+		len = sizeof(struct cudbg_tcam) +</div><div class='add'>+		      sizeof(struct cudbg_tid_data) * tcam_region.max_tid;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_CCTRL:</div><div class='add'>+		len = sizeof(u16) * NMTUS * NCCTRL_WIN;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_MA_INDIRECT:</div><div class='add'>+		if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &gt; CHELSIO_T5) {</div><div class='add'>+			n = sizeof(t6_ma_ireg_array) /</div><div class='add'>+			    (IREG_NUM_ELEM * sizeof(u32));</div><div class='add'>+			len = sizeof(struct ireg_buf) * n * 2;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_ULPTX_LA:</div><div class='add'>+		len = sizeof(struct cudbg_ver_hdr) +</div><div class='add'>+		      sizeof(struct cudbg_ulptx_la);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_UP_CIM_INDIRECT:</div><div class='add'>+		n = 0;</div><div class='add'>+		if (is_t5(adap-&gt;params.chip))</div><div class='add'>+			n = sizeof(t5_up_cim_reg_array) /</div><div class='add'>+			    ((IREG_NUM_ELEM + 1) * sizeof(u32));</div><div class='add'>+		else if (is_t6(adap-&gt;params.chip))</div><div class='add'>+			n = sizeof(t6_up_cim_reg_array) /</div><div class='add'>+			    ((IREG_NUM_ELEM + 1) * sizeof(u32));</div><div class='add'>+		len = sizeof(struct ireg_buf) * n;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_PBT_TABLE:</div><div class='add'>+		len = sizeof(struct cudbg_pbt_tables);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_MBOX_LOG:</div><div class='add'>+		len = sizeof(struct cudbg_mbox_log) * adap-&gt;mbox_log-&gt;size;</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_HMA_INDIRECT:</div><div class='add'>+		if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &gt; CHELSIO_T5) {</div><div class='add'>+			n = sizeof(t6_hma_ireg_array) /</div><div class='add'>+			    (IREG_NUM_ELEM * sizeof(u32));</div><div class='add'>+			len = sizeof(struct ireg_buf) * n;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_HMA:</div><div class='add'>+		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='add'>+		if (value &amp; HMA_MUX_F) {</div><div class='add'>+			/* In T6, there's no MC1.  So, HMA shares MC1</div><div class='add'>+			 * address space.</div><div class='add'>+			 */</div><div class='add'>+			value = t4_read_reg(adap, MA_EXT_MEMORY1_BAR_A);</div><div class='add'>+			len = EXT_MEM1_SIZE_G(value);</div><div class='add'>+		}</div><div class='add'>+		len = cudbg_mbytes_to_bytes(len);</div><div class='add'>+		break;</div><div class='add'>+	case CUDBG_QDESC:</div><div class='add'>+		cudbg_fill_qdesc_num_and_size(adap, NULL, &amp;len);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int cudbg_do_compression(struct cudbg_init *pdbg_init,</div><div class='ctx'> 				struct cudbg_buffer *pin_buff,</div><div class='hunk'>@@ -776,24 +1184,18 @@ static int cudbg_get_mem_region(struct adapter *padap,</div><div class='ctx'> 				struct cudbg_mem_desc *mem_desc)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mc, found = 0;</div><div class='del'>-	u32 i, idx = 0;</div><div class='del'>-	int rc;</div><div class='add'>+	u32 idx = 0;</div><div class='add'>+	int rc, i;</div><div class='ctx'> </div><div class='ctx'> 	rc = cudbg_meminfo_get_mem_index(padap, meminfo, mem_type, &amp;mc);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; ARRAY_SIZE(cudbg_region); i++) {</div><div class='del'>-		if (!strcmp(cudbg_region[i], region_name)) {</div><div class='del'>-			found = 1;</div><div class='del'>-			idx = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!found)</div><div class='add'>+	i = match_string(cudbg_region, ARRAY_SIZE(cudbg_region), region_name);</div><div class='add'>+	if (i &lt; 0)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	found = 0;</div><div class='add'>+	idx = i;</div><div class='ctx'> 	for (i = 0; i &lt; meminfo-&gt;mem_c; i++) {</div><div class='ctx'> 		if (meminfo-&gt;mem[i].idx &gt;= ARRAY_SIZE(cudbg_region))</div><div class='ctx'> 			continue; /* Skip holes */</div><div class='hunk'>@@ -1054,28 +1456,48 @@ static void cudbg_t4_fwcache(struct cudbg_init *pdbg_init,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cudbg_collect_mem_region(struct cudbg_init *pdbg_init,</div><div class='del'>-				    struct cudbg_buffer *dbg_buff,</div><div class='del'>-				    struct cudbg_error *cudbg_err,</div><div class='del'>-				    u8 mem_type)</div><div class='add'>+static int cudbg_mem_region_size(struct cudbg_init *pdbg_init,</div><div class='add'>+				 struct cudbg_error *cudbg_err,</div><div class='add'>+				 u8 mem_type, unsigned long *region_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *padap = pdbg_init-&gt;adap;</div><div class='ctx'> 	struct cudbg_meminfo mem_info;</div><div class='del'>-	unsigned long size;</div><div class='ctx'> 	u8 mc_idx;</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;mem_info, 0, sizeof(struct cudbg_meminfo));</div><div class='ctx'> 	rc = cudbg_fill_meminfo(padap, &amp;mem_info);</div><div class='del'>-	if (rc)</div><div class='add'>+	if (rc) {</div><div class='add'>+		cudbg_err-&gt;sys_err = rc;</div><div class='ctx'> 		return rc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	cudbg_t4_fwcache(pdbg_init, cudbg_err);</div><div class='ctx'> 	rc = cudbg_meminfo_get_mem_index(padap, &amp;mem_info, mem_type, &amp;mc_idx);</div><div class='add'>+	if (rc) {</div><div class='add'>+		cudbg_err-&gt;sys_err = rc;</div><div class='add'>+		return rc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (region_size)</div><div class='add'>+		*region_size = mem_info.avail[mc_idx].limit -</div><div class='add'>+			       mem_info.avail[mc_idx].base;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cudbg_collect_mem_region(struct cudbg_init *pdbg_init,</div><div class='add'>+				    struct cudbg_buffer *dbg_buff,</div><div class='add'>+				    struct cudbg_error *cudbg_err,</div><div class='add'>+				    u8 mem_type)</div><div class='add'>+{</div><div class='add'>+	unsigned long size = 0;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	rc = cudbg_mem_region_size(pdbg_init, cudbg_err, mem_type, &amp;size);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	size = mem_info.avail[mc_idx].limit - mem_info.avail[mc_idx].base;</div><div class='ctx'> 	return cudbg_read_fw_mem(pdbg_init, dbg_buff, mem_type, size,</div><div class='ctx'> 				 cudbg_err);</div><div class='ctx'> }</div><div class='hunk'>@@ -1373,11 +1795,25 @@ int cudbg_collect_sge_indirect(struct cudbg_init *pdbg_init,</div><div class='ctx'> 	struct cudbg_buffer temp_buff = { 0 };</div><div class='ctx'> 	struct sge_qbase_reg_field *sge_qbase;</div><div class='ctx'> 	struct ireg_buf *ch_sge_dbg;</div><div class='add'>+	u8 padap_running = 0;</div><div class='ctx'> 	int i, rc;</div><div class='add'>+	u32 size;</div><div class='ctx'> </div><div class='del'>-	rc = cudbg_get_buff(pdbg_init, dbg_buff,</div><div class='del'>-			    sizeof(*ch_sge_dbg) * 2 + sizeof(*sge_qbase),</div><div class='del'>-			    &amp;temp_buff);</div><div class='add'>+	/* Accessing SGE_QBASE_MAP[0-3] and SGE_QBASE_INDEX regs can</div><div class='add'>+	 * lead to SGE missing doorbells under heavy traffic. So, only</div><div class='add'>+	 * collect them when adapter is idle.</div><div class='add'>+	 */</div><div class='add'>+	for_each_port(padap, i) {</div><div class='add'>+		padap_running = netif_running(padap-&gt;port[i]);</div><div class='add'>+		if (padap_running)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	size = sizeof(*ch_sge_dbg) * 2;</div><div class='add'>+	if (!padap_running)</div><div class='add'>+		size += sizeof(*sge_qbase);</div><div class='add'>+</div><div class='add'>+	rc = cudbg_get_buff(pdbg_init, dbg_buff, size, &amp;temp_buff);</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='hunk'>@@ -1399,7 +1835,8 @@ int cudbg_collect_sge_indirect(struct cudbg_init *pdbg_init,</div><div class='ctx'> 		ch_sge_dbg++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (CHELSIO_CHIP_VERSION(padap-&gt;params.chip) &gt; CHELSIO_T5) {</div><div class='add'>+	if (CHELSIO_CHIP_VERSION(padap-&gt;params.chip) &gt; CHELSIO_T5 &amp;&amp;</div><div class='add'>+	    !padap_running) {</div><div class='ctx'> 		sge_qbase = (struct sge_qbase_reg_field *)ch_sge_dbg;</div><div class='ctx'> 		/* 1 addr reg SGE_QBASE_INDEX and 4 data reg</div><div class='ctx'> 		 * SGE_QBASE_MAP[0-3]</div><div class='hunk'>@@ -1960,7 +2397,6 @@ int cudbg_collect_dump_context(struct cudbg_init *pdbg_init,</div><div class='ctx'> 	u8 mem_type[CTXT_INGRESS + 1] = { 0 };</div><div class='ctx'> 	struct cudbg_buffer temp_buff = { 0 };</div><div class='ctx'> 	struct cudbg_ch_cntxt *buff;</div><div class='del'>-	u64 *dst_off, *src_off;</div><div class='ctx'> 	u8 *ctx_buf;</div><div class='ctx'> 	u8 i, k;</div><div class='ctx'> 	int rc;</div><div class='hunk'>@@ -2029,8 +2465,11 @@ int cudbg_collect_dump_context(struct cudbg_init *pdbg_init,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; max_ctx_qid; j++) {</div><div class='add'>+			__be64 *dst_off;</div><div class='add'>+			u64 *src_off;</div><div class='add'>+</div><div class='ctx'> 			src_off = (u64 *)(ctx_buf + j * SGE_CTXT_SIZE);</div><div class='del'>-			dst_off = (u64 *)buff-&gt;data;</div><div class='add'>+			dst_off = (__be64 *)buff-&gt;data;</div><div class='ctx'> </div><div class='ctx'> 			/* The data is stored in 64-bit cpu order.  Convert it</div><div class='ctx'> 			 * to big endian before parsing.</div><div class='hunk'>@@ -2263,10 +2702,10 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init,</div><div class='ctx'> 	struct adapter *padap = pdbg_init-&gt;adap;</div><div class='ctx'> 	struct cudbg_buffer temp_buff = { 0 };</div><div class='ctx'> 	char vpd_str[CUDBG_VPD_VER_LEN + 1];</div><div class='del'>-	u32 scfg_vers, vpd_vers, fw_vers;</div><div class='ctx'> 	struct cudbg_vpd_data *vpd_data;</div><div class='ctx'> 	struct vpd_params vpd = { 0 };</div><div class='del'>-	int rc, ret;</div><div class='add'>+	u32 vpd_vers, fw_vers;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='ctx'> 	rc = t4_get_raw_vpd_params(padap, &amp;vpd);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -2276,24 +2715,6 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init,</div><div class='ctx'> 	if (rc)</div><div class='ctx'> 		return rc;</div><div class='ctx'> </div><div class='del'>-	/* Serial Configuration Version is located beyond the PF's vpd size.</div><div class='del'>-	 * Temporarily give access to entire EEPROM to get it.</div><div class='del'>-	 */</div><div class='del'>-	rc = pci_set_vpd_size(padap-&gt;pdev, EEPROMVSIZE);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	ret = cudbg_read_vpd_reg(padap, CUDBG_SCFG_VER_ADDR, CUDBG_SCFG_VER_LEN,</div><div class='del'>-				 &amp;scfg_vers);</div><div class='del'>-</div><div class='del'>-	/* Restore back to original PF's vpd size */</div><div class='del'>-	rc = pci_set_vpd_size(padap-&gt;pdev, CUDBG_VPD_PF_SIZE);</div><div class='del'>-	if (rc &lt; 0)</div><div class='del'>-		return rc;</div><div class='del'>-</div><div class='del'>-	if (ret)</div><div class='del'>-		return ret;</div><div class='del'>-</div><div class='ctx'> 	rc = cudbg_read_vpd_reg(padap, CUDBG_VPD_VER_ADDR, CUDBG_VPD_VER_LEN,</div><div class='ctx'> 				vpd_str);</div><div class='ctx'> 	if (rc)</div><div class='hunk'>@@ -2314,7 +2735,7 @@ int cudbg_collect_vpd_data(struct cudbg_init *pdbg_init,</div><div class='ctx'> 	memcpy(vpd_data-&gt;bn, vpd.pn, PN_LEN + 1);</div><div class='ctx'> 	memcpy(vpd_data-&gt;na, vpd.na, MACADDR_LEN + 1);</div><div class='ctx'> 	memcpy(vpd_data-&gt;mn, vpd.id, ID_LEN + 1);</div><div class='del'>-	vpd_data-&gt;scfg_vers = scfg_vers;</div><div class='add'>+	vpd_data-&gt;scfg_vers = t4_read_reg(padap, PCIE_STATIC_SPARE2_A);</div><div class='ctx'> 	vpd_data-&gt;vpd_vers = vpd_vers;</div><div class='ctx'> 	vpd_data-&gt;fw_major = FW_HDR_FW_VER_MAJOR_G(fw_vers);</div><div class='ctx'> 	vpd_data-&gt;fw_minor = FW_HDR_FW_VER_MINOR_G(fw_vers);</div><div class='hunk'>@@ -2923,6 +3344,10 @@ void cudbg_fill_qdesc_num_and_size(const struct adapter *padap,</div><div class='ctx'> 	tot_size += CXGB4_ULD_MAX * MAX_ULD_QSETS * SGE_MAX_IQ_SIZE *</div><div class='ctx'> 		    MAX_RXQ_DESC_SIZE;</div><div class='ctx'> </div><div class='add'>+	/* ETHOFLD TXQ, RXQ, and FLQ */</div><div class='add'>+	tot_entries += MAX_OFLD_QSETS * 3;</div><div class='add'>+	tot_size += MAX_OFLD_QSETS * MAX_TXQ_ENTRIES * MAX_TXQ_DESC_SIZE;</div><div class='add'>+</div><div class='ctx'> 	tot_size += sizeof(struct cudbg_ver_hdr) +</div><div class='ctx'> 		    sizeof(struct cudbg_qdesc_info) +</div><div class='ctx'> 		    sizeof(struct cudbg_qdesc_entry) * tot_entries;</div><div class='hunk'>@@ -3034,7 +3459,7 @@ int cudbg_collect_qdesc(struct cudbg_init *pdbg_init,</div><div class='ctx'> 			for (i = 0; i &lt; utxq-&gt;ntxq; i++)</div><div class='ctx'> 				QDESC_GET_TXQ(&amp;utxq-&gt;uldtxq[i].q,</div><div class='ctx'> 					      cudbg_uld_txq_to_qtype(j),</div><div class='del'>-					      out_unlock);</div><div class='add'>+					      out_unlock_uld);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3051,7 +3476,7 @@ int cudbg_collect_qdesc(struct cudbg_init *pdbg_init,</div><div class='ctx'> 			for (i = 0; i &lt; urxq-&gt;nrxq; i++)</div><div class='ctx'> 				QDESC_GET_RXQ(&amp;urxq-&gt;uldrxq[i].rspq,</div><div class='ctx'> 					      cudbg_uld_rxq_to_qtype(j),</div><div class='del'>-					      out_unlock);</div><div class='add'>+					      out_unlock_uld);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* ULD FLQ */</div><div class='hunk'>@@ -3063,7 +3488,7 @@ int cudbg_collect_qdesc(struct cudbg_init *pdbg_init,</div><div class='ctx'> 			for (i = 0; i &lt; urxq-&gt;nrxq; i++)</div><div class='ctx'> 				QDESC_GET_FLQ(&amp;urxq-&gt;uldrxq[i].fl,</div><div class='ctx'> 					      cudbg_uld_flq_to_qtype(j),</div><div class='del'>-					      out_unlock);</div><div class='add'>+					      out_unlock_uld);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* ULD CIQ */</div><div class='hunk'>@@ -3076,13 +3501,35 @@ int cudbg_collect_qdesc(struct cudbg_init *pdbg_init,</div><div class='ctx'> 			for (i = 0; i &lt; urxq-&gt;nciq; i++)</div><div class='ctx'> 				QDESC_GET_RXQ(&amp;urxq-&gt;uldrxq[base + i].rspq,</div><div class='ctx'> 					      cudbg_uld_ciq_to_qtype(j),</div><div class='del'>-					      out_unlock);</div><div class='add'>+					      out_unlock_uld);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-out_unlock:</div><div class='ctx'> 	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> </div><div class='add'>+	if (!padap-&gt;tc_mqprio)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;padap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+	/* ETHOFLD TXQ */</div><div class='add'>+	if (s-&gt;eohw_txq)</div><div class='add'>+		for (i = 0; i &lt; s-&gt;eoqsets; i++)</div><div class='add'>+			QDESC_GET_TXQ(&amp;s-&gt;eohw_txq[i].q,</div><div class='add'>+				      CUDBG_QTYPE_ETHOFLD_TXQ, out_unlock_mqprio);</div><div class='add'>+</div><div class='add'>+	/* ETHOFLD RXQ and FLQ */</div><div class='add'>+	if (s-&gt;eohw_rxq) {</div><div class='add'>+		for (i = 0; i &lt; s-&gt;eoqsets; i++)</div><div class='add'>+			QDESC_GET_RXQ(&amp;s-&gt;eohw_rxq[i].rspq,</div><div class='add'>+				      CUDBG_QTYPE_ETHOFLD_RXQ, out_unlock_mqprio);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; s-&gt;eoqsets; i++)</div><div class='add'>+			QDESC_GET_FLQ(&amp;s-&gt;eohw_rxq[i].fl,</div><div class='add'>+				      CUDBG_QTYPE_ETHOFLD_FLQ, out_unlock_mqprio);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_unlock_mqprio:</div><div class='add'>+	mutex_unlock(&amp;padap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+</div><div class='ctx'> out:</div><div class='ctx'> 	qdesc_info-&gt;qdesc_entry_size = sizeof(*qdesc_entry);</div><div class='ctx'> 	qdesc_info-&gt;num_queues = num_queues;</div><div class='hunk'>@@ -3110,8 +3557,7 @@ out:</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out_free:</div><div class='del'>-	if (data)</div><div class='del'>-		kvfree(data);</div><div class='add'>+	kvfree(data);</div><div class='ctx'> </div><div class='ctx'> #undef QDESC_GET_FLQ</div><div class='ctx'> #undef QDESC_GET_RXQ</div><div class='hunk'>@@ -3119,4 +3565,45 @@ out_free:</div><div class='ctx'> #undef QDESC_GET</div><div class='ctx'> </div><div class='ctx'> 	return rc;</div><div class='add'>+</div><div class='add'>+out_unlock_uld:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+	goto out;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cudbg_collect_flash(struct cudbg_init *pdbg_init,</div><div class='add'>+			struct cudbg_buffer *dbg_buff,</div><div class='add'>+			struct cudbg_error *cudbg_err)</div><div class='add'>+{</div><div class='add'>+	struct adapter *padap = pdbg_init-&gt;adap;</div><div class='add'>+	u32 count = padap-&gt;params.sf_size, n;</div><div class='add'>+	struct cudbg_buffer temp_buff = {0};</div><div class='add'>+	u32 addr, i;</div><div class='add'>+	int rc;</div><div class='add'>+</div><div class='add'>+	addr = FLASH_EXP_ROM_START;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i += SF_PAGE_SIZE) {</div><div class='add'>+		n = min_t(u32, count - i, SF_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		rc = cudbg_get_buff(pdbg_init, dbg_buff, n, &amp;temp_buff);</div><div class='add'>+		if (rc) {</div><div class='add'>+			cudbg_err-&gt;sys_warn = CUDBG_STATUS_PARTIAL_DATA;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		rc = t4_read_flash(padap, addr, n, (u32 *)temp_buff.data, 0);</div><div class='add'>+		if (rc)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		addr += (n * 4);</div><div class='add'>+		rc = cudbg_write_and_release_buff(pdbg_init, &amp;temp_buff,</div><div class='add'>+						  dbg_buff);</div><div class='add'>+		if (rc) {</div><div class='add'>+			cudbg_err-&gt;sys_warn = CUDBG_STATUS_PARTIAL_DATA;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h b/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h<br/>index 10ee6ed1d932..d6d6cd298930 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.h</a></div><div class='hunk'>@@ -162,7 +162,11 @@ int cudbg_collect_hma_meminfo(struct cudbg_init *pdbg_init,</div><div class='ctx'> int cudbg_collect_qdesc(struct cudbg_init *pdbg_init,</div><div class='ctx'> 			struct cudbg_buffer *dbg_buff,</div><div class='ctx'> 			struct cudbg_error *cudbg_err);</div><div class='add'>+int cudbg_collect_flash(struct cudbg_init *pdbg_init,</div><div class='add'>+			struct cudbg_buffer *dbg_buff,</div><div class='add'>+			struct cudbg_error *cudbg_err);</div><div class='ctx'> </div><div class='add'>+u32 cudbg_get_entity_length(struct adapter *adap, u32 entity);</div><div class='ctx'> struct cudbg_entity_hdr *cudbg_get_entity_hdr(void *outbuf, int i);</div><div class='ctx'> void cudbg_align_debug_buffer(struct cudbg_buffer *dbg_buff,</div><div class='ctx'> 			      struct cudbg_entity_hdr *entity_hdr);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h<br/>index a8fe0808823d..f20f4bc58492 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4.h</a></div><div class='hunk'>@@ -39,6 +39,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/bitops.h&gt;</div><div class='ctx'> #include &lt;linux/cache.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/list.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='hunk'>@@ -56,9 +57,11 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include "t4_chip_type.h"</div><div class='ctx'> #include "cxgb4_uld.h"</div><div class='add'>+#include "t4fw_api.h"</div><div class='ctx'> </div><div class='ctx'> #define CH_WARN(adap, fmt, ...) dev_warn(adap-&gt;pdev_dev, fmt, ## __VA_ARGS__)</div><div class='ctx'> extern struct list_head adapter_list;</div><div class='add'>+extern struct list_head uld_list;</div><div class='ctx'> extern struct mutex uld_mutex;</div><div class='ctx'> </div><div class='ctx'> /* Suspend an Ethernet Tx queue with fewer available descriptors than this.</div><div class='hunk'>@@ -68,10 +71,19 @@ extern struct mutex uld_mutex;</div><div class='ctx'> #define ETHTXQ_STOP_THRES \</div><div class='ctx'> 	(1 + DIV_ROUND_UP((3 * MAX_SKB_FRAGS) / 2 + (MAX_SKB_FRAGS &amp; 1), 8))</div><div class='ctx'> </div><div class='add'>+#define FW_PARAM_DEV(param) \</div><div class='add'>+	(FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) | \</div><div class='add'>+	 FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_##param))</div><div class='add'>+</div><div class='add'>+#define FW_PARAM_PFVF(param) \</div><div class='add'>+	(FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_PFVF) | \</div><div class='add'>+	 FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_PFVF_##param) |  \</div><div class='add'>+	 FW_PARAMS_PARAM_Y_V(0) | \</div><div class='add'>+	 FW_PARAMS_PARAM_Z_V(0))</div><div class='add'>+</div><div class='ctx'> enum {</div><div class='ctx'> 	MAX_NPORTS	= 4,     /* max # of ports */</div><div class='ctx'> 	SERNUM_LEN	= 24,    /* Serial # length */</div><div class='del'>-	EC_LEN		= 16,    /* E/C length */</div><div class='ctx'> 	ID_LEN		= 16,    /* ID length */</div><div class='ctx'> 	PN_LEN		= 16,    /* Part Number length */</div><div class='ctx'> 	MACADDR_LEN	= 12,    /* MAC Address length */</div><div class='hunk'>@@ -127,6 +139,69 @@ enum cc_fec {</div><div class='ctx'> 	FEC_BASER_RS  = 1 &lt;&lt; 2   /* BaseR/Reed-Solomon */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum {</div><div class='add'>+	CXGB4_ETHTOOL_FLASH_FW = 1,</div><div class='add'>+	CXGB4_ETHTOOL_FLASH_PHY = 2,</div><div class='add'>+	CXGB4_ETHTOOL_FLASH_BOOT = 3,</div><div class='add'>+	CXGB4_ETHTOOL_FLASH_BOOTCFG = 4</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum cxgb4_netdev_tls_ops {</div><div class='add'>+	CXGB4_TLSDEV_OPS  = 1,</div><div class='add'>+	CXGB4_XFRMDEV_OPS</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_bootcfg_data {</div><div class='add'>+	__le16 signature;</div><div class='add'>+	__u8 reserved[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_pcir_data {</div><div class='add'>+	__le32 signature;	/* Signature. The string "PCIR" */</div><div class='add'>+	__le16 vendor_id;	/* Vendor Identification */</div><div class='add'>+	__le16 device_id;	/* Device Identification */</div><div class='add'>+	__u8 vital_product[2];	/* Pointer to Vital Product Data */</div><div class='add'>+	__u8 length[2];		/* PCIR Data Structure Length */</div><div class='add'>+	__u8 revision;		/* PCIR Data Structure Revision */</div><div class='add'>+	__u8 class_code[3];	/* Class Code */</div><div class='add'>+	__u8 image_length[2];	/* Image Length. Multiple of 512B */</div><div class='add'>+	__u8 code_revision[2];	/* Revision Level of Code/Data */</div><div class='add'>+	__u8 code_type;</div><div class='add'>+	__u8 indicator;</div><div class='add'>+	__u8 reserved[2];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* BIOS boot headers */</div><div class='add'>+struct cxgb4_pci_exp_rom_header {</div><div class='add'>+	__le16 signature;	/* ROM Signature. Should be 0xaa55 */</div><div class='add'>+	__u8 reserved[22];	/* Reserved per processor Architecture data */</div><div class='add'>+	__le16 pcir_offset;	/* Offset to PCI Data Structure */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Legacy PCI Expansion ROM Header */</div><div class='add'>+struct legacy_pci_rom_hdr {</div><div class='add'>+	__u8 signature[2];	/* ROM Signature. Should be 0xaa55 */</div><div class='add'>+	__u8 size512;		/* Current Image Size in units of 512 bytes */</div><div class='add'>+	__u8 initentry_point[4];</div><div class='add'>+	__u8 cksum;		/* Checksum computed on the entire Image */</div><div class='add'>+	__u8 reserved[16];	/* Reserved */</div><div class='add'>+	__le16 pcir_offset;	/* Offset to PCI Data Struture */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define CXGB4_HDR_CODE1 0x00</div><div class='add'>+#define CXGB4_HDR_CODE2 0x03</div><div class='add'>+#define CXGB4_HDR_INDI 0x80</div><div class='add'>+</div><div class='add'>+/* BOOT constants */</div><div class='add'>+enum {</div><div class='add'>+	BOOT_CFG_SIG = 0x4243,</div><div class='add'>+	BOOT_SIZE_INC = 512,</div><div class='add'>+	BOOT_SIGNATURE = 0xaa55,</div><div class='add'>+	BOOT_MIN_SIZE = sizeof(struct cxgb4_pci_exp_rom_header),</div><div class='add'>+	BOOT_MAX_SIZE = 1024 * BOOT_SIZE_INC,</div><div class='add'>+	PCIR_SIGNATURE = 0x52494350</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct port_stats {</div><div class='ctx'> 	u64 tx_octets;            /* total # of octets in good frames */</div><div class='ctx'> 	u64 tx_frames;            /* all good frames */</div><div class='hunk'>@@ -280,6 +355,7 @@ struct tp_params {</div><div class='ctx'> 	unsigned short tx_modq[NCHAN];	/* channel to modulation queue map */</div><div class='ctx'> </div><div class='ctx'> 	u32 vlan_pri_map;               /* cached TP_VLAN_PRI_MAP */</div><div class='add'>+	u32 filter_mask;</div><div class='ctx'> 	u32 ingress_config;             /* cached TP_INGRESS_CONFIG */</div><div class='ctx'> </div><div class='ctx'> 	/* cached TP_OUT_CONFIG compressed error vector</div><div class='hunk'>@@ -314,7 +390,6 @@ struct tp_params {</div><div class='ctx'> </div><div class='ctx'> struct vpd_params {</div><div class='ctx'> 	unsigned int cclk;</div><div class='del'>-	u8 ec[EC_LEN + 1];</div><div class='ctx'> 	u8 sn[SERNUM_LEN + 1];</div><div class='ctx'> 	u8 id[ID_LEN + 1];</div><div class='ctx'> 	u8 pn[PN_LEN + 1];</div><div class='hunk'>@@ -337,7 +412,6 @@ struct pf_resources {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct pci_params {</div><div class='del'>-	unsigned int vpd_cap_addr;</div><div class='ctx'> 	unsigned char speed;</div><div class='ctx'> 	unsigned char width;</div><div class='ctx'> };</div><div class='hunk'>@@ -391,6 +465,7 @@ struct adapter_params {</div><div class='ctx'> 	struct arch_specific_params arch;  /* chip specific params */</div><div class='ctx'> 	unsigned char offload;</div><div class='ctx'> 	unsigned char crypto;		/* HW capability for crypto */</div><div class='add'>+	unsigned char ethofld;		/* QoS support */</div><div class='ctx'> </div><div class='ctx'> 	unsigned char bypass;</div><div class='ctx'> 	unsigned char hash_filter;</div><div class='hunk'>@@ -453,8 +528,6 @@ static inline struct mbox_cmd *mbox_cmd_log_entry(struct mbox_cmd_log *log,</div><div class='ctx'> 	return &amp;((struct mbox_cmd *)&amp;(log)[1])[entry_idx];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#include "t4fw_api.h"</div><div class='del'>-</div><div class='ctx'> #define FW_VERSION(chip) ( \</div><div class='ctx'> 		FW_HDR_FW_VER_MAJOR_G(chip##FW_VERSION_MAJOR) | \</div><div class='ctx'> 		FW_HDR_FW_VER_MINOR_G(chip##FW_VERSION_MINOR) | \</div><div class='hunk'>@@ -462,6 +535,12 @@ static inline struct mbox_cmd *mbox_cmd_log_entry(struct mbox_cmd_log *log,</div><div class='ctx'> 		FW_HDR_FW_VER_BUILD_G(chip##FW_VERSION_BUILD))</div><div class='ctx'> #define FW_INTFVER(chip, intf) (FW_HDR_INTFVER_##intf)</div><div class='ctx'> </div><div class='add'>+struct cxgb4_ethtool_lb_test {</div><div class='add'>+	struct completion completion;</div><div class='add'>+	int result;</div><div class='add'>+	int loopback;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct fw_info {</div><div class='ctx'> 	u8 chip;</div><div class='ctx'> 	char *fs_name;</div><div class='hunk'>@@ -480,6 +559,11 @@ struct trace_params {</div><div class='ctx'> 	unsigned char port;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cxgb4_fw_data {</div><div class='add'>+	__be32 signature;</div><div class='add'>+	__u8 reserved[4];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Firmware Port Capabilities types. */</div><div class='ctx'> </div><div class='ctx'> typedef u16 fw_port_cap16_t;	/* 16-bit Port Capabilities integral value */</div><div class='hunk'>@@ -502,6 +586,7 @@ struct link_config {</div><div class='ctx'> </div><div class='ctx'> 	enum cc_pause  requested_fc;     /* flow control user has requested */</div><div class='ctx'> 	enum cc_pause  fc;               /* actual link flow control */</div><div class='add'>+	enum cc_pause  advertised_fc;    /* actual advertised flow control */</div><div class='ctx'> </div><div class='ctx'> 	enum cc_fec    requested_fec;	 /* Forward Error Correction: */</div><div class='ctx'> 	enum cc_fec    fec;		 /* requested and actual in use */</div><div class='hunk'>@@ -589,7 +674,7 @@ struct port_info {</div><div class='ctx'> 	struct cxgb_fcoe fcoe;</div><div class='ctx'> #endif /* CONFIG_CHELSIO_T4_FCOE */</div><div class='ctx'> 	bool rxtstamp;  /* Enable TS */</div><div class='del'>-	struct hwtstamp_config tstamp_config;</div><div class='add'>+	struct kernel_hwtstamp_config tstamp_config;</div><div class='ctx'> 	bool ptp_enable;</div><div class='ctx'> 	struct sched_table *sched_tbl;</div><div class='ctx'> 	u32 eth_flags;</div><div class='hunk'>@@ -600,6 +685,16 @@ struct port_info {</div><div class='ctx'> 	u8 vin;</div><div class='ctx'> 	u8 vivld;</div><div class='ctx'> 	u8 smt_idx;</div><div class='add'>+	u8 rx_cchan;</div><div class='add'>+</div><div class='add'>+	bool tc_block_shared;</div><div class='add'>+</div><div class='add'>+	/* Mirror VI information */</div><div class='add'>+	u16 viid_mirror;</div><div class='add'>+	u16 nmirrorqsets;</div><div class='add'>+	u32 vi_mirror_count;</div><div class='add'>+	struct mutex vi_mirror_mutex; /* Sync access to Mirror VI info */</div><div class='add'>+	struct cxgb4_ethtool_lb_test ethtool_lb;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dentry;</div><div class='hunk'>@@ -623,8 +718,16 @@ enum {                                 /* adapter flags */</div><div class='ctx'> enum {</div><div class='ctx'> 	ULP_CRYPTO_LOOKASIDE = 1 &lt;&lt; 0,</div><div class='ctx'> 	ULP_CRYPTO_IPSEC_INLINE = 1 &lt;&lt; 1,</div><div class='add'>+	ULP_CRYPTO_KTLS_INLINE  = 1 &lt;&lt; 3,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CXGB4_MIRROR_RXQ_DEFAULT_DESC_NUM 1024</div><div class='add'>+#define CXGB4_MIRROR_RXQ_DEFAULT_DESC_SIZE 64</div><div class='add'>+#define CXGB4_MIRROR_RXQ_DEFAULT_INTR_USEC 5</div><div class='add'>+#define CXGB4_MIRROR_RXQ_DEFAULT_PKT_CNT 8</div><div class='add'>+</div><div class='add'>+#define CXGB4_MIRROR_FLQ_DEFAULT_DESC_NUM 72</div><div class='add'>+</div><div class='ctx'> struct rx_sw_desc;</div><div class='ctx'> </div><div class='ctx'> struct sge_fl {                     /* SGE free-buffer queue state */</div><div class='hunk'>@@ -709,6 +812,7 @@ struct sge_eth_rxq {                /* SW Ethernet Rx queue */</div><div class='ctx'> 	struct sge_rspq rspq;</div><div class='ctx'> 	struct sge_fl fl;</div><div class='ctx'> 	struct sge_eth_stats stats;</div><div class='add'>+	struct msix_info *msix;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> struct sge_ofld_stats {             /* offload queue statistics */</div><div class='hunk'>@@ -722,13 +826,19 @@ struct sge_ofld_rxq {               /* SW offload Rx queue */</div><div class='ctx'> 	struct sge_rspq rspq;</div><div class='ctx'> 	struct sge_fl fl;</div><div class='ctx'> 	struct sge_ofld_stats stats;</div><div class='add'>+	struct msix_info *msix;</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> struct tx_desc {</div><div class='ctx'> 	__be64 flit[8];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct tx_sw_desc;</div><div class='add'>+struct ulptx_sgl;</div><div class='add'>+</div><div class='add'>+struct tx_sw_desc {</div><div class='add'>+	struct sk_buff *skb; /* SKB to free after getting completion */</div><div class='add'>+	dma_addr_t addr[MAX_SKB_FRAGS + 1]; /* DMA mapped addresses */</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> struct sge_txq {</div><div class='ctx'> 	unsigned int  in_use;       /* # of in-use Tx descriptors */</div><div class='hunk'>@@ -760,6 +870,7 @@ struct sge_eth_txq {                /* state for an SGE Ethernet Tx queue */</div><div class='ctx'> 	u8 dbqt;                    /* SGE Doorbell Queue Timer in use */</div><div class='ctx'> 	unsigned int dbqtimerix;    /* SGE Doorbell Queue Timer Index */</div><div class='ctx'> 	unsigned long tso;          /* # of TSO requests */</div><div class='add'>+	unsigned long uso;          /* # of USO requests */</div><div class='ctx'> 	unsigned long tx_cso;       /* # of Tx checksum offloads */</div><div class='ctx'> 	unsigned long vlan_ins;     /* # of Tx VLAN insertions */</div><div class='ctx'> 	unsigned long mapping_err;  /* # of I/O MMU packet mapping errors */</div><div class='hunk'>@@ -786,7 +897,6 @@ struct sge_ctrl_txq {               /* state for an SGE control Tx queue */</div><div class='ctx'> struct sge_uld_rxq_info {</div><div class='ctx'> 	char name[IFNAMSIZ];	/* name of ULD driver */</div><div class='ctx'> 	struct sge_ofld_rxq *uldrxq; /* Rxq's for ULD */</div><div class='del'>-	u16 *msix_tbl;		/* msix_tbl for uld */</div><div class='ctx'> 	u16 *rspq_id;		/* response queue id's of rxq */</div><div class='ctx'> 	u16 nrxq;		/* # of ingress uld queues */</div><div class='ctx'> 	u16 nciq;		/* # of completion queues */</div><div class='hunk'>@@ -799,6 +909,58 @@ struct sge_uld_txq_info {</div><div class='ctx'> 	u16 ntxq;		/* # of egress uld queues */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* struct to maintain ULD list to reallocate ULD resources on hotplug */</div><div class='add'>+struct cxgb4_uld_list {</div><div class='add'>+	struct cxgb4_uld_info uld_info;</div><div class='add'>+	struct list_head list_node;</div><div class='add'>+	enum cxgb4_uld uld_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum sge_eosw_state {</div><div class='add'>+	CXGB4_EO_STATE_CLOSED = 0, /* Not ready to accept traffic */</div><div class='add'>+	CXGB4_EO_STATE_FLOWC_OPEN_SEND, /* Send FLOWC open request */</div><div class='add'>+	CXGB4_EO_STATE_FLOWC_OPEN_REPLY, /* Waiting for FLOWC open reply */</div><div class='add'>+	CXGB4_EO_STATE_ACTIVE, /* Ready to accept traffic */</div><div class='add'>+	CXGB4_EO_STATE_FLOWC_CLOSE_SEND, /* Send FLOWC close request */</div><div class='add'>+	CXGB4_EO_STATE_FLOWC_CLOSE_REPLY, /* Waiting for FLOWC close reply */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sge_eosw_txq {</div><div class='add'>+	spinlock_t lock; /* Per queue lock to synchronize completions */</div><div class='add'>+	enum sge_eosw_state state; /* Current ETHOFLD State */</div><div class='add'>+	struct tx_sw_desc *desc; /* Descriptor ring to hold packets */</div><div class='add'>+	u32 ndesc; /* Number of descriptors */</div><div class='add'>+	u32 pidx; /* Current Producer Index */</div><div class='add'>+	u32 last_pidx; /* Last successfully transmitted Producer Index */</div><div class='add'>+	u32 cidx; /* Current Consumer Index */</div><div class='add'>+	u32 last_cidx; /* Last successfully reclaimed Consumer Index */</div><div class='add'>+	u32 flowc_idx; /* Descriptor containing a FLOWC request */</div><div class='add'>+	u32 inuse; /* Number of packets held in ring */</div><div class='add'>+</div><div class='add'>+	u32 cred; /* Current available credits */</div><div class='add'>+	u32 ncompl; /* # of completions posted */</div><div class='add'>+	u32 last_compl; /* # of credits consumed since last completion req */</div><div class='add'>+</div><div class='add'>+	u32 eotid; /* Index into EOTID table in software */</div><div class='add'>+	u32 hwtid; /* Hardware EOTID index */</div><div class='add'>+</div><div class='add'>+	u32 hwqid; /* Underlying hardware queue index */</div><div class='add'>+	struct net_device *netdev; /* Pointer to netdevice */</div><div class='add'>+	struct tasklet_struct qresume_tsk; /* Restarts the queue */</div><div class='add'>+	struct completion completion; /* completion for FLOWC rendezvous */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct sge_eohw_txq {</div><div class='add'>+	spinlock_t lock; /* Per queue lock */</div><div class='add'>+	struct sge_txq q; /* HW Txq */</div><div class='add'>+	struct adapter *adap; /* Backpointer to adapter */</div><div class='add'>+	unsigned long tso; /* # of TSO requests */</div><div class='add'>+	unsigned long uso; /* # of USO requests */</div><div class='add'>+	unsigned long tx_cso; /* # of Tx checksum offloads */</div><div class='add'>+	unsigned long vlan_ins; /* # of Tx VLAN insertions */</div><div class='add'>+	unsigned long mapping_err; /* # of I/O MMU packet mapping errors */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct sge {</div><div class='ctx'> 	struct sge_eth_txq ethtxq[MAX_ETH_QSETS];</div><div class='ctx'> 	struct sge_eth_txq ptptxq;</div><div class='hunk'>@@ -812,11 +974,19 @@ struct sge {</div><div class='ctx'> 	struct sge_rspq intrq ____cacheline_aligned_in_smp;</div><div class='ctx'> 	spinlock_t intrq_lock;</div><div class='ctx'> </div><div class='add'>+	struct sge_eohw_txq *eohw_txq;</div><div class='add'>+	struct sge_ofld_rxq *eohw_rxq;</div><div class='add'>+</div><div class='add'>+	struct sge_eth_rxq *mirror_rxq[NCHAN];</div><div class='add'>+</div><div class='ctx'> 	u16 max_ethqsets;           /* # of available Ethernet queue sets */</div><div class='ctx'> 	u16 ethqsets;               /* # of active Ethernet queue sets */</div><div class='ctx'> 	u16 ethtxq_rover;           /* Tx queue to clean up next */</div><div class='ctx'> 	u16 ofldqsets;              /* # of active ofld queue sets */</div><div class='ctx'> 	u16 nqs_per_uld;	    /* # of Rx queues per ULD */</div><div class='add'>+	u16 eoqsets;                /* # of ETHOFLD queues */</div><div class='add'>+	u16 mirrorqsets;            /* # of Mirror queues */</div><div class='add'>+</div><div class='ctx'> 	u16 timer_val[SGE_NTIMERS];</div><div class='ctx'> 	u8 counter_val[SGE_NCOUNTERS];</div><div class='ctx'> 	u16 dbqtimer_tick;</div><div class='hunk'>@@ -839,6 +1009,9 @@ struct sge {</div><div class='ctx'> 	unsigned long *blocked_fl;</div><div class='ctx'> 	struct timer_list rx_timer; /* refills starving FLs */</div><div class='ctx'> 	struct timer_list tx_timer; /* checks Tx queues */</div><div class='add'>+</div><div class='add'>+	int fwevtq_msix_idx; /* Index to firmware event queue MSI-X info */</div><div class='add'>+	int nd_msix_idx; /* Index to non-data interrupts MSI-X info */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define for_each_ethrxq(sge, i) for (i = 0; i &lt; (sge)-&gt;ethqsets; i++)</div><div class='hunk'>@@ -868,16 +1041,17 @@ struct hash_mac_addr {</div><div class='ctx'> 	unsigned int iface_mac;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct uld_msix_bmap {</div><div class='add'>+struct msix_bmap {</div><div class='ctx'> 	unsigned long *msix_bmap;</div><div class='ctx'> 	unsigned int mapsize;</div><div class='ctx'> 	spinlock_t lock; /* lock for acquiring bitmap */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct uld_msix_info {</div><div class='add'>+struct msix_info {</div><div class='ctx'> 	unsigned short vec;</div><div class='ctx'> 	char desc[IFNAMSIZ + 10];</div><div class='ctx'> 	unsigned int idx;</div><div class='add'>+	cpumask_var_t aff_mask;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct vf_info {</div><div class='hunk'>@@ -902,18 +1076,31 @@ struct mbox_list {</div><div class='ctx'> 	struct list_head list;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct mps_encap_entry {</div><div class='del'>-	atomic_t refcnt;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> #if IS_ENABLED(CONFIG_THERMAL)</div><div class='ctx'> struct ch_thermal {</div><div class='ctx'> 	struct thermal_zone_device *tzdev;</div><div class='del'>-	int trip_temp;</div><div class='del'>-	int trip_type;</div><div class='ctx'> };</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+struct mps_entries_ref {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u8 mask[ETH_ALEN];</div><div class='add'>+	u16 idx;</div><div class='add'>+	refcount_t refcnt;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_ethtool_filter_info {</div><div class='add'>+	u32 *loc_array; /* Array holding the actual TIDs set to filters */</div><div class='add'>+	unsigned long *bmap; /* Bitmap for managing filters in use */</div><div class='add'>+	u32 in_use; /* # of filters in use */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_ethtool_filter {</div><div class='add'>+	u32 nentries; /* Adapter wide number of supported filters */</div><div class='add'>+	struct cxgb4_ethtool_filter_info *port; /* Per port entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct adapter {</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	void __iomem *bar2;</div><div class='hunk'>@@ -930,21 +1117,15 @@ struct adapter {</div><div class='ctx'> </div><div class='ctx'> 	int msg_enable;</div><div class='ctx'> 	__be16 vxlan_port;</div><div class='del'>-	u8 vxlan_port_cnt;</div><div class='ctx'> 	__be16 geneve_port;</div><div class='del'>-	u8 geneve_port_cnt;</div><div class='ctx'> </div><div class='ctx'> 	struct adapter_params params;</div><div class='ctx'> 	struct cxgb4_virt_res vres;</div><div class='ctx'> 	unsigned int swintr;</div><div class='ctx'> </div><div class='del'>-	struct {</div><div class='del'>-		unsigned short vec;</div><div class='del'>-		char desc[IFNAMSIZ + 10];</div><div class='del'>-	} msix_info[MAX_INGQ + 1];</div><div class='del'>-	struct uld_msix_info *msix_info_ulds; /* msix info for uld's */</div><div class='del'>-	struct uld_msix_bmap msix_bmap_ulds; /* msix bitmap for all uld */</div><div class='del'>-	int msi_idx;</div><div class='add'>+	/* MSI-X Info for NIC and OFLD queues */</div><div class='add'>+	struct msix_info *msix_info;</div><div class='add'>+	struct msix_bmap msix_bmap;</div><div class='ctx'> </div><div class='ctx'> 	struct doorbell_stats db_stats;</div><div class='ctx'> 	struct sge sge;</div><div class='hunk'>@@ -965,7 +1146,6 @@ struct adapter {</div><div class='ctx'> 	unsigned int rawf_start;</div><div class='ctx'> 	unsigned int rawf_cnt;</div><div class='ctx'> 	struct smt_data *smt;</div><div class='del'>-	struct mps_encap_entry *mps_encap;</div><div class='ctx'> 	struct cxgb4_uld_info *uld;</div><div class='ctx'> 	void *uld_handle[CXGB4_ULD_MAX];</div><div class='ctx'> 	unsigned int num_uld;</div><div class='hunk'>@@ -973,6 +1153,8 @@ struct adapter {</div><div class='ctx'> 	struct list_head list_node;</div><div class='ctx'> 	struct list_head rcu_node;</div><div class='ctx'> 	struct list_head mac_hlist; /* list of MAC addresses in MPS Hash */</div><div class='add'>+	struct list_head mps_ref;</div><div class='add'>+	spinlock_t mps_ref_lock; /* lock for syncing mps ref/def activities */</div><div class='ctx'> </div><div class='ctx'> 	void *iscsi_ppm;</div><div class='ctx'> </div><div class='hunk'>@@ -1013,7 +1195,14 @@ struct adapter {</div><div class='ctx'> </div><div class='ctx'> 	/* TC u32 offload */</div><div class='ctx'> 	struct cxgb4_tc_u32_table *tc_u32;</div><div class='add'>+	struct chcr_ktls chcr_ktls;</div><div class='ctx'> 	struct chcr_stats_debug chcr_stats;</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	struct ch_ktls_stats_debug ch_ktls_stats;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+	struct ch_ipsec_stats_debug ch_ipsec_stats;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* TC flower offload */</div><div class='ctx'> 	bool tc_flower_initialized;</div><div class='hunk'>@@ -1022,9 +1211,6 @@ struct adapter {</div><div class='ctx'> 	struct timer_list flower_stats_timer;</div><div class='ctx'> 	struct work_struct flower_stats_work;</div><div class='ctx'> </div><div class='del'>-	/* Ethtool Dump */</div><div class='del'>-	struct ethtool_dump eth_dump;</div><div class='del'>-</div><div class='ctx'> 	/* HMA */</div><div class='ctx'> 	struct hma_data hma;</div><div class='ctx'> </div><div class='hunk'>@@ -1035,25 +1221,39 @@ struct adapter {</div><div class='ctx'> #if IS_ENABLED(CONFIG_THERMAL)</div><div class='ctx'> 	struct ch_thermal ch_thermal;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	/* TC MQPRIO offload */</div><div class='add'>+	struct cxgb4_tc_mqprio *tc_mqprio;</div><div class='add'>+</div><div class='add'>+	/* TC MATCHALL classifier offload */</div><div class='add'>+	struct cxgb4_tc_matchall *tc_matchall;</div><div class='add'>+</div><div class='add'>+	/* Ethtool n-tuple */</div><div class='add'>+	struct cxgb4_ethtool_filter *ethtool_filters;</div><div class='add'>+</div><div class='add'>+	/* Ethtool Dump */</div><div class='add'>+	/* Must be last - ends in a flex-array member. */</div><div class='add'>+	struct ethtool_dump eth_dump;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Support for "sched-class" command to allow a TX Scheduling Class to be</div><div class='ctx'>  * programmed with various parameters.</div><div class='ctx'>  */</div><div class='ctx'> struct ch_sched_params {</div><div class='del'>-	s8   type;                     /* packet or flow */</div><div class='add'>+	u8   type;                     /* packet or flow */</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='del'>-			s8   level;    /* scheduler hierarchy level */</div><div class='del'>-			s8   mode;     /* per-class or per-flow */</div><div class='del'>-			s8   rateunit; /* bit or packet rate */</div><div class='del'>-			s8   ratemode; /* %port relative or kbps absolute */</div><div class='del'>-			s8   channel;  /* scheduler channel [0..N] */</div><div class='del'>-			s8   class;    /* scheduler class [0..N] */</div><div class='del'>-			s32  minrate;  /* minimum rate */</div><div class='del'>-			s32  maxrate;  /* maximum rate */</div><div class='del'>-			s16  weight;   /* percent weight */</div><div class='del'>-			s16  pktsize;  /* average packet size */</div><div class='add'>+			u8   level;    /* scheduler hierarchy level */</div><div class='add'>+			u8   mode;     /* per-class or per-flow */</div><div class='add'>+			u8   rateunit; /* bit or packet rate */</div><div class='add'>+			u8   ratemode; /* %port relative or kbps absolute */</div><div class='add'>+			u8   channel;  /* scheduler channel [0..N] */</div><div class='add'>+			u8   class;    /* scheduler class [0..N] */</div><div class='add'>+			u32  minrate;  /* minimum rate */</div><div class='add'>+			u32  maxrate;  /* maximum rate */</div><div class='add'>+			u16  weight;   /* percent weight */</div><div class='add'>+			u16  pktsize;  /* average packet size */</div><div class='add'>+			u16  burstsize;  /* burst buffer size */</div><div class='ctx'> 		} params;</div><div class='ctx'> 	} u;</div><div class='ctx'> };</div><div class='hunk'>@@ -1064,10 +1264,12 @@ enum {</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	SCHED_CLASS_LEVEL_CL_RL = 0,    /* class rate limiter */</div><div class='add'>+	SCHED_CLASS_LEVEL_CH_RL = 2,    /* channel rate limiter */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='ctx'> 	SCHED_CLASS_MODE_CLASS = 0,     /* per-class scheduling */</div><div class='add'>+	SCHED_CLASS_MODE_FLOW,          /* per-flow scheduling */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='hunk'>@@ -1078,11 +1280,6 @@ enum {</div><div class='ctx'> 	SCHED_CLASS_RATEMODE_ABS = 1,   /* Kb/s */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct tx_sw_desc {                /* SW state per Tx descriptor */</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct ulptx_sgl *sgl;</div><div class='del'>-};</div><div class='del'>-</div><div class='ctx'> /* Support for "sched_queue" command to allow one or more NIC TX Queues</div><div class='ctx'>  * to be bound to a TX Scheduling Class.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1091,6 +1288,14 @@ struct ch_sched_queue {</div><div class='ctx'> 	s8   class;    /* class index */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Support for "sched_flowc" command to allow one or more FLOWC</div><div class='add'>+ * to be bound to a TX Scheduling Class.</div><div class='add'>+ */</div><div class='add'>+struct ch_sched_flowc {</div><div class='add'>+	s32 tid;   /* TID to bind */</div><div class='add'>+	s8  class; /* class index */</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Defined bit width of user definable filter tuples</div><div class='ctx'>  */</div><div class='ctx'> #define ETHTYPE_BITWIDTH 16</div><div class='hunk'>@@ -1111,7 +1316,7 @@ struct ch_sched_queue {</div><div class='ctx'>  * (value, mask) tuples.  The associated ingress packet field matches the</div><div class='ctx'>  * tuple when ((field &amp; mask) == value).  (Thus a wildcard "don't care" field</div><div class='ctx'>  * rule can be constructed by specifying a tuple of (0, 0).)  A filter rule</div><div class='del'>- * matches an ingress packet when all of the individual individual field</div><div class='add'>+ * matches an ingress packet when all of the individual field</div><div class='ctx'>  * matching rules are true.</div><div class='ctx'>  *</div><div class='ctx'>  * Partial field masks are always valid, however, while it may be easy to</div><div class='hunk'>@@ -1205,8 +1410,11 @@ struct ch_filter_specification {</div><div class='ctx'> 	u16 nat_lport;		/* local port to use after NAT'ing */</div><div class='ctx'> 	u16 nat_fport;		/* foreign port to use after NAT'ing */</div><div class='ctx'> </div><div class='add'>+	u32 tc_prio;		/* TC's filter priority index */</div><div class='add'>+	u64 tc_cookie;		/* Unique cookie identifying TC rules */</div><div class='add'>+</div><div class='ctx'> 	/* reservation for future additions */</div><div class='del'>-	u8 rsvd[24];</div><div class='add'>+	u8 rsvd[12];</div><div class='ctx'> </div><div class='ctx'> 	/* Filter rule value/mask pairs.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1238,6 +1446,8 @@ enum {</div><div class='ctx'> 	NAT_MODE_ALL		/* NAT on entire 4-tuple */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CXGB4_FILTER_TYPE_MAX 2</div><div class='add'>+</div><div class='ctx'> /* Host shadow copy of ingress filter entry.  This is in host native format</div><div class='ctx'>  * and doesn't match the ordering or bit order, etc. of the hardware of the</div><div class='ctx'>  * firmware command.  The use of bit-field structure elements is purely to</div><div class='hunk'>@@ -1284,6 +1494,11 @@ static inline int is_uld(const struct adapter *adap)</div><div class='ctx'> 	return (adap-&gt;params.offload || adap-&gt;params.crypto);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int is_ethofld(const struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	return adap-&gt;params.ethofld;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline u32 t4_read_reg(struct adapter *adap, u32 reg_addr)</div><div class='ctx'> {</div><div class='ctx'> 	return readl(adap-&gt;regs + reg_addr);</div><div class='hunk'>@@ -1329,7 +1544,7 @@ static inline void t4_write_reg64(struct adapter *adap, u32 reg_addr, u64 val)</div><div class='ctx'> static inline void t4_set_hw_addr(struct adapter *adapter, int port_idx,</div><div class='ctx'> 				  u8 hw_addr[])</div><div class='ctx'> {</div><div class='del'>-	ether_addr_copy(adapter-&gt;port[port_idx]-&gt;dev_addr, hw_addr);</div><div class='add'>+	eth_hw_addr_set(adapter-&gt;port[port_idx], hw_addr);</div><div class='ctx'> 	ether_addr_copy(adapter-&gt;port[port_idx]-&gt;perm_addr, hw_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1387,17 +1602,16 @@ static inline unsigned int qtimer_val(const struct adapter *adap,</div><div class='ctx'> 	return idx &lt; SGE_NTIMERS ? adap-&gt;sge.timer_val[idx] : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* driver version &amp; name used for ethtool_drvinfo */</div><div class='add'>+/* driver name used for ethtool_drvinfo */</div><div class='ctx'> extern char cxgb4_driver_name[];</div><div class='del'>-extern const char cxgb4_driver_version[];</div><div class='ctx'> </div><div class='ctx'> void t4_os_portmod_changed(struct adapter *adap, int port_id);</div><div class='ctx'> void t4_os_link_changed(struct adapter *adap, int port_id, int link_stat);</div><div class='ctx'> </div><div class='ctx'> void t4_free_sge_resources(struct adapter *adap);</div><div class='del'>-void t4_free_ofld_rxqs(struct adapter *adap, int n, struct sge_ofld_rxq *q);</div><div class='ctx'> irq_handler_t t4_intr_handler(struct adapter *adap);</div><div class='ctx'> netdev_tx_t t4_start_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+int cxgb4_selftest_lb_pkt(struct net_device *netdev);</div><div class='ctx'> int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='ctx'> 		     const struct pkt_gl *gl);</div><div class='ctx'> int t4_mgmt_tx(struct adapter *adap, struct sk_buff *skb);</div><div class='hunk'>@@ -1417,6 +1631,9 @@ int t4_sge_mod_ctrl_txq(struct adapter *adap, unsigned int eqid,</div><div class='ctx'> int t4_sge_alloc_uld_txq(struct adapter *adap, struct sge_uld_txq *txq,</div><div class='ctx'> 			 struct net_device *dev, unsigned int iqid,</div><div class='ctx'> 			 unsigned int uld_type);</div><div class='add'>+int t4_sge_alloc_ethofld_txq(struct adapter *adap, struct sge_eohw_txq *txq,</div><div class='add'>+			     struct net_device *dev, u32 iqid);</div><div class='add'>+void t4_sge_free_ethofld_txq(struct adapter *adap, struct sge_eohw_txq *txq);</div><div class='ctx'> irqreturn_t t4_sge_intr_msix(int irq, void *cookie);</div><div class='ctx'> int t4_sge_init(struct adapter *adap);</div><div class='ctx'> void t4_sge_start(struct adapter *adap);</div><div class='hunk'>@@ -1627,8 +1844,7 @@ int t4_get_pfres(struct adapter *adapter);</div><div class='ctx'> int t4_read_flash(struct adapter *adapter, unsigned int addr,</div><div class='ctx'> 		  unsigned int nwords, u32 *data, int byte_oriented);</div><div class='ctx'> int t4_load_fw(struct adapter *adapter, const u8 *fw_data, unsigned int size);</div><div class='del'>-int t4_load_phy_fw(struct adapter *adap,</div><div class='del'>-		   int win, spinlock_t *lock,</div><div class='add'>+int t4_load_phy_fw(struct adapter *adap, int win,</div><div class='ctx'> 		   int (*phy_fw_version)(const u8 *, size_t),</div><div class='ctx'> 		   const u8 *phy_fw_data, size_t phy_fw_size);</div><div class='ctx'> int t4_phy_fw_ver(struct adapter *adap, int *phy_fw_ver);</div><div class='hunk'>@@ -1672,6 +1888,8 @@ int t4_init_rss_mode(struct adapter *adap, int mbox);</div><div class='ctx'> int t4_init_portinfo(struct port_info *pi, int mbox,</div><div class='ctx'> 		     int port, int pf, int vf, u8 mac[]);</div><div class='ctx'> int t4_port_init(struct adapter *adap, int mbox, int pf, int vf);</div><div class='add'>+int t4_init_port_mirror(struct port_info *pi, u8 mbox, u8 port, u8 pf, u8 vf,</div><div class='add'>+			u16 *mirror_viid);</div><div class='ctx'> void t4_fatal_err(struct adapter *adapter);</div><div class='ctx'> unsigned int t4_chip_rss_size(struct adapter *adapter);</div><div class='ctx'> int t4_config_rss_range(struct adapter *adapter, int mbox, unsigned int viid,</div><div class='hunk'>@@ -1740,11 +1958,6 @@ void t4_ulprx_read_la(struct adapter *adap, u32 *la_buf);</div><div class='ctx'> void t4_get_chan_txrate(struct adapter *adap, u64 *nic_rate, u64 *ofld_rate);</div><div class='ctx'> void t4_mk_filtdelwr(unsigned int ftid, struct fw_filter_wr *wr, int qid);</div><div class='ctx'> </div><div class='del'>-void t4_wol_magic_enable(struct adapter *adap, unsigned int port,</div><div class='del'>-			 const u8 *addr);</div><div class='del'>-int t4_wol_pat_enable(struct adapter *adap, unsigned int port, unsigned int map,</div><div class='del'>-		      u64 mask0, u64 mask1, unsigned int crc, bool enable);</div><div class='del'>-</div><div class='ctx'> int t4_fw_hello(struct adapter *adap, unsigned int mbox, unsigned int evt_mbox,</div><div class='ctx'> 		enum dev_master master, enum dev_state *state);</div><div class='ctx'> int t4_fw_bye(struct adapter *adap, unsigned int mbox);</div><div class='hunk'>@@ -1781,8 +1994,8 @@ int t4_free_vi(struct adapter *adap, unsigned int mbox,</div><div class='ctx'> 	       unsigned int pf, unsigned int vf,</div><div class='ctx'> 	       unsigned int viid);</div><div class='ctx'> int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,</div><div class='del'>-		int mtu, int promisc, int all_multi, int bcast, int vlanex,</div><div class='del'>-		bool sleep_ok);</div><div class='add'>+		  unsigned int viid_mirror, int mtu, int promisc, int all_multi,</div><div class='add'>+		  int bcast, int vlanex, bool sleep_ok);</div><div class='ctx'> int t4_free_raw_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='ctx'> 			 const u8 *addr, const u8 *mask, unsigned int idx,</div><div class='ctx'> 			 u8 lookup_type, u8 port_id, bool sleep_ok);</div><div class='hunk'>@@ -1853,9 +2066,10 @@ int t4_sge_ctxt_rd(struct adapter *adap, unsigned int mbox, unsigned int cid,</div><div class='ctx'> 		   enum ctxt_type ctype, u32 *data);</div><div class='ctx'> int t4_sge_ctxt_rd_bd(struct adapter *adap, unsigned int cid,</div><div class='ctx'> 		      enum ctxt_type ctype, u32 *data);</div><div class='del'>-int t4_sched_params(struct adapter *adapter, int type, int level, int mode,</div><div class='del'>-		    int rateunit, int ratemode, int channel, int class,</div><div class='del'>-		    int minrate, int maxrate, int weight, int pktsize);</div><div class='add'>+int t4_sched_params(struct adapter *adapter, u8 type, u8 level, u8 mode,</div><div class='add'>+		    u8 rateunit, u8 ratemode, u8 channel, u8 class,</div><div class='add'>+		    u32 minrate, u32 maxrate, u16 weight, u16 pktsize,</div><div class='add'>+		    u16 burstsize);</div><div class='ctx'> void t4_sge_decode_idma_state(struct adapter *adapter, int state);</div><div class='ctx'> void t4_idma_monitor_init(struct adapter *adapter,</div><div class='ctx'> 			  struct sge_idma_monitor_state *idma);</div><div class='hunk'>@@ -1863,7 +2077,7 @@ void t4_idma_monitor(struct adapter *adapter,</div><div class='ctx'> 		     struct sge_idma_monitor_state *idma,</div><div class='ctx'> 		     int hz, int ticks);</div><div class='ctx'> int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,</div><div class='del'>-		      unsigned int naddr, u8 *addr);</div><div class='add'>+		      u8 start, unsigned int naddr, u8 *addr);</div><div class='ctx'> void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,</div><div class='ctx'> 		    u32 start_index, bool sleep_ok);</div><div class='ctx'> void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,</div><div class='hunk'>@@ -1878,9 +2092,19 @@ void t4_register_netevent_notifier(void);</div><div class='ctx'> int t4_i2c_rd(struct adapter *adap, unsigned int mbox, int port,</div><div class='ctx'> 	      unsigned int devid, unsigned int offset,</div><div class='ctx'> 	      unsigned int len, u8 *buf);</div><div class='add'>+int t4_load_boot(struct adapter *adap, u8 *boot_data,</div><div class='add'>+		 unsigned int boot_addr, unsigned int size);</div><div class='add'>+int t4_load_bootcfg(struct adapter *adap,</div><div class='add'>+		    const u8 *cfg_data, unsigned int size);</div><div class='ctx'> void free_rspq_fl(struct adapter *adap, struct sge_rspq *rq, struct sge_fl *fl);</div><div class='ctx'> void free_tx_desc(struct adapter *adap, struct sge_txq *q,</div><div class='ctx'> 		  unsigned int n, bool unmap);</div><div class='add'>+void cxgb4_eosw_txq_free_desc(struct adapter *adap, struct sge_eosw_txq *txq,</div><div class='add'>+			      u32 ndesc);</div><div class='add'>+int cxgb4_ethofld_send_flowc(struct net_device *dev, u32 eotid, u32 tc);</div><div class='add'>+void cxgb4_ethofld_restart(struct tasklet_struct *t);</div><div class='add'>+int cxgb4_ethofld_rx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='add'>+			     const struct pkt_gl *si);</div><div class='ctx'> void free_txq(struct adapter *adap, struct sge_txq *q);</div><div class='ctx'> void cxgb4_reclaim_completed_tx(struct adapter *adap,</div><div class='ctx'> 				struct sge_txq *q, bool unmap);</div><div class='hunk'>@@ -1891,6 +2115,9 @@ void cxgb4_inline_tx_skb(const struct sk_buff *skb, const struct sge_txq *q,</div><div class='ctx'> void cxgb4_write_sgl(const struct sk_buff *skb, struct sge_txq *q,</div><div class='ctx'> 		     struct ulptx_sgl *sgl, u64 *end, unsigned int start,</div><div class='ctx'> 		     const dma_addr_t *addr);</div><div class='add'>+void cxgb4_write_partial_sgl(const struct sk_buff *skb, struct sge_txq *q,</div><div class='add'>+			     struct ulptx_sgl *sgl, u64 *end,</div><div class='add'>+			     const dma_addr_t *addr, u32 start, u32 send_len);</div><div class='ctx'> void cxgb4_ring_tx_db(struct adapter *adap, struct sge_txq *q, int n);</div><div class='ctx'> int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,</div><div class='ctx'> 		    u16 vlan);</div><div class='hunk'>@@ -1898,5 +2125,32 @@ int cxgb4_dcb_enabled(const struct net_device *dev);</div><div class='ctx'> </div><div class='ctx'> int cxgb4_thermal_init(struct adapter *adap);</div><div class='ctx'> int cxgb4_thermal_remove(struct adapter *adap);</div><div class='del'>-</div><div class='add'>+int cxgb4_set_msix_aff(struct adapter *adap, unsigned short vec,</div><div class='add'>+		       cpumask_var_t *aff_mask, int idx);</div><div class='add'>+void cxgb4_clear_msix_aff(unsigned short vec, cpumask_var_t aff_mask);</div><div class='add'>+</div><div class='add'>+int cxgb4_change_mac(struct port_info *pi, unsigned int viid,</div><div class='add'>+		     int *tcam_idx, const u8 *addr,</div><div class='add'>+		     bool persistent, u8 *smt_idx);</div><div class='add'>+</div><div class='add'>+int cxgb4_alloc_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='add'>+			 bool free, unsigned int naddr,</div><div class='add'>+			 const u8 **addr, u16 *idx,</div><div class='add'>+			 u64 *hash, bool sleep_ok);</div><div class='add'>+int cxgb4_free_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='add'>+			unsigned int naddr, const u8 **addr, bool sleep_ok);</div><div class='add'>+int cxgb4_init_mps_ref_entries(struct adapter *adap);</div><div class='add'>+void cxgb4_free_mps_ref_entries(struct adapter *adap);</div><div class='add'>+int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid,</div><div class='add'>+			  int *tcam_idx, const u8 *addr,</div><div class='add'>+			  bool persistent, u8 *smt_idx);</div><div class='add'>+int cxgb4_get_msix_idx_from_bmap(struct adapter *adap);</div><div class='add'>+void cxgb4_free_msix_idx_in_bmap(struct adapter *adap, u32 msix_idx);</div><div class='add'>+void cxgb4_enable_rx(struct adapter *adap, struct sge_rspq *q);</div><div class='add'>+void cxgb4_quiesce_rx(struct sge_rspq *q);</div><div class='add'>+int cxgb4_port_mirror_alloc(struct net_device *dev);</div><div class='add'>+void cxgb4_port_mirror_free(struct net_device *dev);</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+int cxgb4_set_ktls_feature(struct adapter *adap, bool enable);</div><div class='add'>+#endif</div><div class='ctx'> #endif /* __CXGB4_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c<br/>index e374b413d9ac..dd66b244466d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c</a></div><div class='hunk'>@@ -66,249 +66,9 @@ static const struct cxgb4_collect_entity cxgb4_collect_hw_dump[] = {</div><div class='ctx'> 	{ CUDBG_HMA_INDIRECT, cudbg_collect_hma_indirect },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static u32 cxgb4_get_entity_length(struct adapter *adap, u32 entity)</div><div class='del'>-{</div><div class='del'>-	struct cudbg_tcam tcam_region = { 0 };</div><div class='del'>-	u32 value, n = 0, len = 0;</div><div class='del'>-</div><div class='del'>-	switch (entity) {</div><div class='del'>-	case CUDBG_REG_DUMP:</div><div class='del'>-		switch (CHELSIO_CHIP_VERSION(adap-&gt;params.chip)) {</div><div class='del'>-		case CHELSIO_T4:</div><div class='del'>-			len = T4_REGMAP_SIZE;</div><div class='del'>-			break;</div><div class='del'>-		case CHELSIO_T5:</div><div class='del'>-		case CHELSIO_T6:</div><div class='del'>-			len = T5_REGMAP_SIZE;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_DEV_LOG:</div><div class='del'>-		len = adap-&gt;params.devlog.size;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_LA:</div><div class='del'>-		if (is_t6(adap-&gt;params.chip)) {</div><div class='del'>-			len = adap-&gt;params.cim_la_size / 10 + 1;</div><div class='del'>-			len *= 10 * sizeof(u32);</div><div class='del'>-		} else {</div><div class='del'>-			len = adap-&gt;params.cim_la_size / 8;</div><div class='del'>-			len *= 8 * sizeof(u32);</div><div class='del'>-		}</div><div class='del'>-		len += sizeof(u32); /* for reading CIM LA configuration */</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_MA_LA:</div><div class='del'>-		len = 2 * CIM_MALA_SIZE * 5 * sizeof(u32);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_QCFG:</div><div class='del'>-		len = sizeof(struct cudbg_cim_qcfg);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_IBQ_TP0:</div><div class='del'>-	case CUDBG_CIM_IBQ_TP1:</div><div class='del'>-	case CUDBG_CIM_IBQ_ULP:</div><div class='del'>-	case CUDBG_CIM_IBQ_SGE0:</div><div class='del'>-	case CUDBG_CIM_IBQ_SGE1:</div><div class='del'>-	case CUDBG_CIM_IBQ_NCSI:</div><div class='del'>-		len = CIM_IBQ_SIZE * 4 * sizeof(u32);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_ULP0:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 0);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_ULP1:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 1);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_ULP2:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 2);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_ULP3:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 3);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_SGE:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 4);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_NCSI:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 5);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_RXQ0:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 6);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_OBQ_RXQ1:</div><div class='del'>-		len = cudbg_cim_obq_size(adap, 7);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_EDC0:</div><div class='del'>-		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='del'>-		if (value &amp; EDRAM0_ENABLE_F) {</div><div class='del'>-			value = t4_read_reg(adap, MA_EDRAM0_BAR_A);</div><div class='del'>-			len = EDRAM0_SIZE_G(value);</div><div class='del'>-		}</div><div class='del'>-		len = cudbg_mbytes_to_bytes(len);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_EDC1:</div><div class='del'>-		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='del'>-		if (value &amp; EDRAM1_ENABLE_F) {</div><div class='del'>-			value = t4_read_reg(adap, MA_EDRAM1_BAR_A);</div><div class='del'>-			len = EDRAM1_SIZE_G(value);</div><div class='del'>-		}</div><div class='del'>-		len = cudbg_mbytes_to_bytes(len);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_MC0:</div><div class='del'>-		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='del'>-		if (value &amp; EXT_MEM0_ENABLE_F) {</div><div class='del'>-			value = t4_read_reg(adap, MA_EXT_MEMORY0_BAR_A);</div><div class='del'>-			len = EXT_MEM0_SIZE_G(value);</div><div class='del'>-		}</div><div class='del'>-		len = cudbg_mbytes_to_bytes(len);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_MC1:</div><div class='del'>-		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='del'>-		if (value &amp; EXT_MEM1_ENABLE_F) {</div><div class='del'>-			value = t4_read_reg(adap, MA_EXT_MEMORY1_BAR_A);</div><div class='del'>-			len = EXT_MEM1_SIZE_G(value);</div><div class='del'>-		}</div><div class='del'>-		len = cudbg_mbytes_to_bytes(len);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_RSS:</div><div class='del'>-		len = t4_chip_rss_size(adap) * sizeof(u16);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_RSS_VF_CONF:</div><div class='del'>-		len = adap-&gt;params.arch.vfcount *</div><div class='del'>-		      sizeof(struct cudbg_rss_vf_conf);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_PATH_MTU:</div><div class='del'>-		len = NMTUS * sizeof(u16);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_PM_STATS:</div><div class='del'>-		len = sizeof(struct cudbg_pm_stats);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_HW_SCHED:</div><div class='del'>-		len = sizeof(struct cudbg_hw_sched);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_TP_INDIRECT:</div><div class='del'>-		switch (CHELSIO_CHIP_VERSION(adap-&gt;params.chip)) {</div><div class='del'>-		case CHELSIO_T5:</div><div class='del'>-			n = sizeof(t5_tp_pio_array) +</div><div class='del'>-			    sizeof(t5_tp_tm_pio_array) +</div><div class='del'>-			    sizeof(t5_tp_mib_index_array);</div><div class='del'>-			break;</div><div class='del'>-		case CHELSIO_T6:</div><div class='del'>-			n = sizeof(t6_tp_pio_array) +</div><div class='del'>-			    sizeof(t6_tp_tm_pio_array) +</div><div class='del'>-			    sizeof(t6_tp_mib_index_array);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		n = n / (IREG_NUM_ELEM * sizeof(u32));</div><div class='del'>-		len = sizeof(struct ireg_buf) * n;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_SGE_INDIRECT:</div><div class='del'>-		len = sizeof(struct ireg_buf) * 2 +</div><div class='del'>-		      sizeof(struct sge_qbase_reg_field);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_ULPRX_LA:</div><div class='del'>-		len = sizeof(struct cudbg_ulprx_la);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_TP_LA:</div><div class='del'>-		len = sizeof(struct cudbg_tp_la) + TPLA_SIZE * sizeof(u64);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_MEMINFO:</div><div class='del'>-		len = sizeof(struct cudbg_ver_hdr) +</div><div class='del'>-		      sizeof(struct cudbg_meminfo);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CIM_PIF_LA:</div><div class='del'>-		len = sizeof(struct cudbg_cim_pif_la);</div><div class='del'>-		len += 2 * CIM_PIFLA_SIZE * 6 * sizeof(u32);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CLK:</div><div class='del'>-		len = sizeof(struct cudbg_clk_info);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_PCIE_INDIRECT:</div><div class='del'>-		n = sizeof(t5_pcie_pdbg_array) / (IREG_NUM_ELEM * sizeof(u32));</div><div class='del'>-		len = sizeof(struct ireg_buf) * n * 2;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_PM_INDIRECT:</div><div class='del'>-		n = sizeof(t5_pm_rx_array) / (IREG_NUM_ELEM * sizeof(u32));</div><div class='del'>-		len = sizeof(struct ireg_buf) * n * 2;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_TID_INFO:</div><div class='del'>-		len = sizeof(struct cudbg_tid_info_region_rev1);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_PCIE_CONFIG:</div><div class='del'>-		len = sizeof(u32) * CUDBG_NUM_PCIE_CONFIG_REGS;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_DUMP_CONTEXT:</div><div class='del'>-		len = cudbg_dump_context_size(adap);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_MPS_TCAM:</div><div class='del'>-		len = sizeof(struct cudbg_mps_tcam) *</div><div class='del'>-		      adap-&gt;params.arch.mps_tcam_size;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_VPD_DATA:</div><div class='del'>-		len = sizeof(struct cudbg_vpd_data);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_LE_TCAM:</div><div class='del'>-		cudbg_fill_le_tcam_info(adap, &amp;tcam_region);</div><div class='del'>-		len = sizeof(struct cudbg_tcam) +</div><div class='del'>-		      sizeof(struct cudbg_tid_data) * tcam_region.max_tid;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_CCTRL:</div><div class='del'>-		len = sizeof(u16) * NMTUS * NCCTRL_WIN;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_MA_INDIRECT:</div><div class='del'>-		if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &gt; CHELSIO_T5) {</div><div class='del'>-			n = sizeof(t6_ma_ireg_array) /</div><div class='del'>-			    (IREG_NUM_ELEM * sizeof(u32));</div><div class='del'>-			len = sizeof(struct ireg_buf) * n * 2;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_ULPTX_LA:</div><div class='del'>-		len = sizeof(struct cudbg_ver_hdr) +</div><div class='del'>-		      sizeof(struct cudbg_ulptx_la);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_UP_CIM_INDIRECT:</div><div class='del'>-		n = 0;</div><div class='del'>-		if (is_t5(adap-&gt;params.chip))</div><div class='del'>-			n = sizeof(t5_up_cim_reg_array) /</div><div class='del'>-			    ((IREG_NUM_ELEM + 1) * sizeof(u32));</div><div class='del'>-		else if (is_t6(adap-&gt;params.chip))</div><div class='del'>-			n = sizeof(t6_up_cim_reg_array) /</div><div class='del'>-			    ((IREG_NUM_ELEM + 1) * sizeof(u32));</div><div class='del'>-		len = sizeof(struct ireg_buf) * n;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_PBT_TABLE:</div><div class='del'>-		len = sizeof(struct cudbg_pbt_tables);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_MBOX_LOG:</div><div class='del'>-		len = sizeof(struct cudbg_mbox_log) * adap-&gt;mbox_log-&gt;size;</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_HMA_INDIRECT:</div><div class='del'>-		if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &gt; CHELSIO_T5) {</div><div class='del'>-			n = sizeof(t6_hma_ireg_array) /</div><div class='del'>-			    (IREG_NUM_ELEM * sizeof(u32));</div><div class='del'>-			len = sizeof(struct ireg_buf) * n;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_HMA:</div><div class='del'>-		value = t4_read_reg(adap, MA_TARGET_MEM_ENABLE_A);</div><div class='del'>-		if (value &amp; HMA_MUX_F) {</div><div class='del'>-			/* In T6, there's no MC1.  So, HMA shares MC1</div><div class='del'>-			 * address space.</div><div class='del'>-			 */</div><div class='del'>-			value = t4_read_reg(adap, MA_EXT_MEMORY1_BAR_A);</div><div class='del'>-			len = EXT_MEM1_SIZE_G(value);</div><div class='del'>-		}</div><div class='del'>-		len = cudbg_mbytes_to_bytes(len);</div><div class='del'>-		break;</div><div class='del'>-	case CUDBG_QDESC:</div><div class='del'>-		cudbg_fill_qdesc_num_and_size(adap, NULL, &amp;len);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='add'>+static const struct cxgb4_collect_entity cxgb4_collect_flash_dump[] = {</div><div class='add'>+	{ CUDBG_FLASH, cudbg_collect_flash },</div><div class='add'>+};</div><div class='ctx'> </div><div class='ctx'> u32 cxgb4_get_dump_length(struct adapter *adap, u32 flag)</div><div class='ctx'> {</div><div class='hunk'>@@ -319,17 +79,20 @@ u32 cxgb4_get_dump_length(struct adapter *adap, u32 flag)</div><div class='ctx'> 	if (flag &amp; CXGB4_ETH_DUMP_HW) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(cxgb4_collect_hw_dump); i++) {</div><div class='ctx'> 			entity = cxgb4_collect_hw_dump[i].entity;</div><div class='del'>-			len += cxgb4_get_entity_length(adap, entity);</div><div class='add'>+			len += cudbg_get_entity_length(adap, entity);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flag &amp; CXGB4_ETH_DUMP_MEM) {</div><div class='ctx'> 		for (i = 0; i &lt; ARRAY_SIZE(cxgb4_collect_mem_dump); i++) {</div><div class='ctx'> 			entity = cxgb4_collect_mem_dump[i].entity;</div><div class='del'>-			len += cxgb4_get_entity_length(adap, entity);</div><div class='add'>+			len += cudbg_get_entity_length(adap, entity);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (flag &amp; CXGB4_ETH_DUMP_FLASH)</div><div class='add'>+		len += adap-&gt;params.sf_size;</div><div class='add'>+</div><div class='ctx'> 	/* If compression is enabled, a smaller destination buffer is enough */</div><div class='ctx'> 	wsize = cudbg_get_workspace_size();</div><div class='ctx'> 	if (wsize &amp;&amp; len &gt; CUDBG_DUMP_BUFF_SIZE)</div><div class='hunk'>@@ -394,8 +157,7 @@ static int cudbg_alloc_compress_buff(struct cudbg_init *pdbg_init)</div><div class='ctx'> </div><div class='ctx'> static void cudbg_free_compress_buff(struct cudbg_init *pdbg_init)</div><div class='ctx'> {</div><div class='del'>-	if (pdbg_init-&gt;compress_buff)</div><div class='del'>-		vfree(pdbg_init-&gt;compress_buff);</div><div class='add'>+	vfree(pdbg_init-&gt;compress_buff);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cxgb4_cudbg_collect(struct adapter *adap, void *buf, u32 *buf_size,</div><div class='hunk'>@@ -468,6 +230,13 @@ int cxgb4_cudbg_collect(struct adapter *adap, void *buf, u32 *buf_size,</div><div class='ctx'> 					   buf,</div><div class='ctx'> 					   &amp;total_size);</div><div class='ctx'> </div><div class='add'>+	if (flag &amp; CXGB4_ETH_DUMP_FLASH)</div><div class='add'>+		cxgb4_cudbg_collect_entity(&amp;cudbg_init, &amp;dbg_buff,</div><div class='add'>+					   cxgb4_collect_flash_dump,</div><div class='add'>+					   ARRAY_SIZE(cxgb4_collect_flash_dump),</div><div class='add'>+					   buf,</div><div class='add'>+					   &amp;total_size);</div><div class='add'>+</div><div class='ctx'> 	cudbg_free_compress_buff(&amp;cudbg_init);</div><div class='ctx'> 	cudbg_hdr-&gt;data_len = total_size;</div><div class='ctx'> 	if (cudbg_init.compress_type != CUDBG_COMPRESSION_NONE)</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h<br/>index 66b805c7a92c..c04a49b6378d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h</a></div><div class='hunk'>@@ -27,6 +27,7 @@ enum CXGB4_ETHTOOL_DUMP_FLAGS {</div><div class='ctx'> 	CXGB4_ETH_DUMP_NONE = ETH_FW_DUMP_DISABLE,</div><div class='ctx'> 	CXGB4_ETH_DUMP_MEM = (1 &lt;&lt; 0), /* On-Chip Memory Dumps */</div><div class='ctx'> 	CXGB4_ETH_DUMP_HW = (1 &lt;&lt; 1), /* various FW and HW dumps */</div><div class='add'>+	CXGB4_ETH_DUMP_FLASH = (1 &lt;&lt; 2), /* Dump flash memory */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define CXGB4_ETH_DUMP_ALL (CXGB4_ETH_DUMP_MEM | CXGB4_ETH_DUMP_HW)</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c<br/>index 4a872f328fea..7d5204834ee2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c</a></div><div class='hunk'>@@ -85,7 +85,7 @@ static void cxgb4_dcb_cleanup_apps(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(adap-&gt;pdev_dev,</div><div class='del'>-				"Failed DCB Clear %s Application Priority: sel=%d, prot=%d, , err=%d\n",</div><div class='add'>+				"Failed DCB Clear %s Application Priority: sel=%d, prot=%d, err=%d\n",</div><div class='ctx'> 				dcb_ver_array[dcb-&gt;dcb_version], app.selector,</div><div class='ctx'> 				app.protocol, -err);</div><div class='ctx'> 			break;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h<br/>index d3c654b9989b..c80a93347a8c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h</a></div><div class='hunk'>@@ -122,7 +122,6 @@ void cxgb4_dcb_version_init(struct net_device *);</div><div class='ctx'> void cxgb4_dcb_reset(struct net_device *dev);</div><div class='ctx'> void cxgb4_dcb_state_fsm(struct net_device *, enum cxgb4_dcb_state_input);</div><div class='ctx'> void cxgb4_dcb_handle_fw_update(struct adapter *, const struct fw_port_cmd *);</div><div class='del'>-void cxgb4_dcb_set_caps(struct adapter *, const struct fw_port_cmd *);</div><div class='ctx'> extern const struct dcbnl_rtnl_ops cxgb4_dcb_ops;</div><div class='ctx'> </div><div class='ctx'> static inline __u8 bitswap_1(unsigned char val)</div><div class='hunk'>@@ -136,6 +135,9 @@ static inline __u8 bitswap_1(unsigned char val)</div><div class='ctx'> 	       ((val &amp; 0x02) &lt;&lt; 5) |</div><div class='ctx'> 	       ((val &amp; 0x01) &lt;&lt; 7);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+extern const char * const dcb_ver_array[];</div><div class='add'>+</div><div class='ctx'> #define CXGB4_DCB_ENABLED true</div><div class='ctx'> </div><div class='ctx'> #else /* !CONFIG_CHELSIO_T4_DCB */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c<br/>index 02959035ed3f..14e0d989c3ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c</a></div><div class='hunk'>@@ -49,6 +49,7 @@</div><div class='ctx'> #include "cudbg_lib_common.h"</div><div class='ctx'> #include "cudbg_entity.h"</div><div class='ctx'> #include "cudbg_lib.h"</div><div class='add'>+#include "cxgb4_tc_mqprio.h"</div><div class='ctx'> </div><div class='ctx'> /* generic seq_file support for showing a table of size rows x width. */</div><div class='ctx'> static void *seq_tab_get_idx(struct seq_tab *tb, loff_t pos)</div><div class='hunk'>@@ -70,8 +71,7 @@ static void *seq_tab_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> static void *seq_tab_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	v = seq_tab_get_idx(seq-&gt;private, *pos + 1);</div><div class='del'>-	if (v)</div><div class='del'>-		++*pos;</div><div class='add'>+	++(*pos);</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -985,7 +985,7 @@ static const char * const devlog_facility_strings[] = {</div><div class='ctx'> struct devlog_info {</div><div class='ctx'> 	unsigned int nentries;		/* number of entries in log[] */</div><div class='ctx'> 	unsigned int first;		/* first [temporal] entry in log[] */</div><div class='del'>-	struct fw_devlog_e log[0];	/* Firmware Device Log */</div><div class='add'>+	struct fw_devlog_e log[];	/* Firmware Device Log */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Dump a Firmaware Device Log entry.</div><div class='hunk'>@@ -1813,12 +1813,8 @@ static int mps_tcam_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			/* Inner header lookup */</div><div class='ctx'> 			if (lookup_type &amp;&amp; (lookup_type != DATALKPTYPE_M)) {</div><div class='ctx'> 				seq_printf(seq,</div><div class='del'>-					   "%3u %02x:%02x:%02x:%02x:%02x:%02x "</div><div class='del'>-					   "%012llx %06x %06x    -    -   %3c"</div><div class='del'>-					   "      'I'  %4x   "</div><div class='del'>-					   "%3c   %#x%4u%4d", idx, addr[0],</div><div class='del'>-					   addr[1], addr[2], addr[3],</div><div class='del'>-					   addr[4], addr[5],</div><div class='add'>+					   "%3u %pM %012llx %06x %06x    -    -   %3c      'I'  %4x   %3c   %#x%4u%4d",</div><div class='add'>+					   idx, addr,</div><div class='ctx'> 					   (unsigned long long)mask,</div><div class='ctx'> 					   vniy, (vnix | vniy),</div><div class='ctx'> 					   dip_hit ? 'Y' : 'N',</div><div class='hunk'>@@ -1830,10 +1826,8 @@ static int mps_tcam_show(struct seq_file *seq, void *v)</div><div class='ctx'> 					   T6_VF_G(cls_lo) : -1);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				seq_printf(seq,</div><div class='del'>-					   "%3u %02x:%02x:%02x:%02x:%02x:%02x "</div><div class='del'>-					   "%012llx    -       -   ",</div><div class='del'>-					   idx, addr[0], addr[1], addr[2],</div><div class='del'>-					   addr[3], addr[4], addr[5],</div><div class='add'>+					   "%3u %pM %012llx    -       -   ",</div><div class='add'>+					   idx, addr,</div><div class='ctx'> 					   (unsigned long long)mask);</div><div class='ctx'> </div><div class='ctx'> 				if (vlan_vld)</div><div class='hunk'>@@ -1851,10 +1845,8 @@ static int mps_tcam_show(struct seq_file *seq, void *v)</div><div class='ctx'> 					   T6_VF_G(cls_lo) : -1);</div><div class='ctx'> 			}</div><div class='ctx'> 		} else</div><div class='del'>-			seq_printf(seq, "%3u %02x:%02x:%02x:%02x:%02x:%02x "</div><div class='del'>-				   "%012llx%3c   %#x%4u%4d",</div><div class='del'>-				   idx, addr[0], addr[1], addr[2], addr[3],</div><div class='del'>-				   addr[4], addr[5], (unsigned long long)mask,</div><div class='add'>+			seq_printf(seq, "%3u %pM %012llx%3c   %#x%4u%4d",</div><div class='add'>+				   idx, addr, (unsigned long long)mask,</div><div class='ctx'> 				   (cls_lo &amp; SRAM_VLD_F) ? 'Y' : 'N',</div><div class='ctx'> 				   PORTMAP_G(cls_hi),</div><div class='ctx'> 				   PF_G(cls_lo),</div><div class='hunk'>@@ -2387,7 +2379,6 @@ static const struct file_operations rss_vf_config_debugfs_fops = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CHELSIO_T4_DCB</div><div class='del'>-extern char *dcb_ver_array[];</div><div class='ctx'> </div><div class='ctx'> /* Data Center Briging information for each port.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2658,31 +2649,20 @@ static int sge_qinfo_uld_ciq_entries(const struct adapter *adap, int uld)</div><div class='ctx'> </div><div class='ctx'> static int sge_qinfo_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='add'>+	int eth_entries, ctrl_entries, eohw_entries = 0, eosw_entries = 0;</div><div class='ctx'> 	int uld_rxq_entries[CXGB4_ULD_MAX] = { 0 };</div><div class='ctx'> 	int uld_ciq_entries[CXGB4_ULD_MAX] = { 0 };</div><div class='ctx'> 	int uld_txq_entries[CXGB4_TX_MAX] = { 0 };</div><div class='ctx'> 	const struct sge_uld_txq_info *utxq_info;</div><div class='ctx'> 	const struct sge_uld_rxq_info *urxq_info;</div><div class='add'>+	struct cxgb4_tc_port_mqprio *port_mqprio;</div><div class='ctx'> 	struct adapter *adap = seq-&gt;private;</div><div class='del'>-	int i, n, r = (uintptr_t)v - 1;</div><div class='del'>-	int eth_entries, ctrl_entries;</div><div class='add'>+	int i, j, n, r = (uintptr_t)v - 1;</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> </div><div class='ctx'> 	eth_entries = DIV_ROUND_UP(adap-&gt;sge.ethqsets, 4);</div><div class='ctx'> 	ctrl_entries = DIV_ROUND_UP(MAX_CTRL_QUEUES, 4);</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;uld_mutex);</div><div class='del'>-	if (s-&gt;uld_txq_info)</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(uld_txq_entries); i++)</div><div class='del'>-			uld_txq_entries[i] = sge_qinfo_uld_txq_entries(adap, i);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;uld_rxq_info) {</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(uld_rxq_entries); i++) {</div><div class='del'>-			uld_rxq_entries[i] = sge_qinfo_uld_rxq_entries(adap, i);</div><div class='del'>-			uld_ciq_entries[i] = sge_qinfo_uld_ciq_entries(adap, i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (r)</div><div class='ctx'> 		seq_putc(seq, '\n');</div><div class='ctx'> </div><div class='hunk'>@@ -2691,7 +2671,7 @@ do { \</div><div class='ctx'> 	seq_printf(seq, "%-12s", s); \</div><div class='ctx'> 	for (i = 0; i &lt; n; ++i) \</div><div class='ctx'> 		seq_printf(seq, " %16" fmt_spec, v); \</div><div class='del'>-		seq_putc(seq, '\n'); \</div><div class='add'>+	seq_putc(seq, '\n'); \</div><div class='ctx'> } while (0)</div><div class='ctx'> #define S(s, v) S3("s", s, v)</div><div class='ctx'> #define T3(fmt_spec, s, v) S3(fmt_spec, s, tx[i].v)</div><div class='hunk'>@@ -2746,6 +2726,7 @@ do { \</div><div class='ctx'> 		RL("RxDrops:", stats.rx_drops);</div><div class='ctx'> 		RL("RxBadPkts:", stats.bad_rx_pkts);</div><div class='ctx'> 		TL("TSO:", tso);</div><div class='add'>+		TL("USO:", uso);</div><div class='ctx'> 		TL("TxCSO:", tx_cso);</div><div class='ctx'> 		TL("VLANins:", vlan_ins);</div><div class='ctx'> 		TL("TxQFull:", q.stops);</div><div class='hunk'>@@ -2757,10 +2738,182 @@ do { \</div><div class='ctx'> 		RL("FLLow:", fl.low);</div><div class='ctx'> 		RL("FLStarving:", fl.starving);</div><div class='ctx'> </div><div class='del'>-		goto unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r -= eth_entries;</div><div class='add'>+	for_each_port(adap, j) {</div><div class='add'>+		struct port_info *pi = adap2pinfo(adap, j);</div><div class='add'>+		const struct sge_eth_rxq *rx;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+		if (!pi-&gt;vi_mirror_count) {</div><div class='add'>+			mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (r &gt;= DIV_ROUND_UP(pi-&gt;nmirrorqsets, 4)) {</div><div class='add'>+			r -= DIV_ROUND_UP(pi-&gt;nmirrorqsets, 4);</div><div class='add'>+			mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rx = &amp;s-&gt;mirror_rxq[j][r * 4];</div><div class='add'>+		n = min(4, pi-&gt;nmirrorqsets - 4 * r);</div><div class='add'>+</div><div class='add'>+		S("QType:", "Mirror-Rxq");</div><div class='add'>+		S("Interface:",</div><div class='add'>+		  rx[i].rspq.netdev ? rx[i].rspq.netdev-&gt;name : "N/A");</div><div class='add'>+		R("RspQ ID:", rspq.abs_id);</div><div class='add'>+		R("RspQ size:", rspq.size);</div><div class='add'>+		R("RspQE size:", rspq.iqe_len);</div><div class='add'>+		R("RspQ CIDX:", rspq.cidx);</div><div class='add'>+		R("RspQ Gen:", rspq.gen);</div><div class='add'>+		S3("u", "Intr delay:", qtimer_val(adap, &amp;rx[i].rspq));</div><div class='add'>+		S3("u", "Intr pktcnt:", s-&gt;counter_val[rx[i].rspq.pktcnt_idx]);</div><div class='add'>+		R("FL ID:", fl.cntxt_id);</div><div class='add'>+		R("FL size:", fl.size - 8);</div><div class='add'>+		R("FL pend:", fl.pend_cred);</div><div class='add'>+		R("FL avail:", fl.avail);</div><div class='add'>+		R("FL PIDX:", fl.pidx);</div><div class='add'>+		R("FL CIDX:", fl.cidx);</div><div class='add'>+		RL("RxPackets:", stats.pkts);</div><div class='add'>+		RL("RxCSO:", stats.rx_cso);</div><div class='add'>+		RL("VLANxtract:", stats.vlan_ex);</div><div class='add'>+		RL("LROmerged:", stats.lro_merged);</div><div class='add'>+		RL("LROpackets:", stats.lro_pkts);</div><div class='add'>+		RL("RxDrops:", stats.rx_drops);</div><div class='add'>+		RL("RxBadPkts:", stats.bad_rx_pkts);</div><div class='add'>+		RL("FLAllocErr:", fl.alloc_failed);</div><div class='add'>+		RL("FLLrgAlcErr:", fl.large_alloc_failed);</div><div class='add'>+		RL("FLMapErr:", fl.mapping_err);</div><div class='add'>+		RL("FLLow:", fl.low);</div><div class='add'>+		RL("FLStarving:", fl.starving);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!adap-&gt;tc_mqprio)</div><div class='add'>+		goto skip_mqprio;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+	if (!refcount_read(&amp;adap-&gt;tc_mqprio-&gt;refcnt)) {</div><div class='add'>+		mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+		goto skip_mqprio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eohw_entries = DIV_ROUND_UP(adap-&gt;sge.eoqsets, 4);</div><div class='add'>+	if (r &lt; eohw_entries) {</div><div class='add'>+		int base_qset = r * 4;</div><div class='add'>+		const struct sge_ofld_rxq *rx = &amp;s-&gt;eohw_rxq[base_qset];</div><div class='add'>+		const struct sge_eohw_txq *tx = &amp;s-&gt;eohw_txq[base_qset];</div><div class='add'>+</div><div class='add'>+		n = min(4, s-&gt;eoqsets - 4 * r);</div><div class='add'>+</div><div class='add'>+		S("QType:", "ETHOFLD");</div><div class='add'>+		S("Interface:",</div><div class='add'>+		  rx[i].rspq.netdev ? rx[i].rspq.netdev-&gt;name : "N/A");</div><div class='add'>+		T("TxQ ID:", q.cntxt_id);</div><div class='add'>+		T("TxQ size:", q.size);</div><div class='add'>+		T("TxQ inuse:", q.in_use);</div><div class='add'>+		T("TxQ CIDX:", q.cidx);</div><div class='add'>+		T("TxQ PIDX:", q.pidx);</div><div class='add'>+		R("RspQ ID:", rspq.abs_id);</div><div class='add'>+		R("RspQ size:", rspq.size);</div><div class='add'>+		R("RspQE size:", rspq.iqe_len);</div><div class='add'>+		R("RspQ CIDX:", rspq.cidx);</div><div class='add'>+		R("RspQ Gen:", rspq.gen);</div><div class='add'>+		S3("u", "Intr delay:", qtimer_val(adap, &amp;rx[i].rspq));</div><div class='add'>+		S3("u", "Intr pktcnt:", s-&gt;counter_val[rx[i].rspq.pktcnt_idx]);</div><div class='add'>+		R("FL ID:", fl.cntxt_id);</div><div class='add'>+		S3("u", "FL size:", rx-&gt;fl.size ? rx-&gt;fl.size - 8 : 0);</div><div class='add'>+		R("FL pend:", fl.pend_cred);</div><div class='add'>+		R("FL avail:", fl.avail);</div><div class='add'>+		R("FL PIDX:", fl.pidx);</div><div class='add'>+		R("FL CIDX:", fl.cidx);</div><div class='add'>+		RL("RxPackets:", stats.pkts);</div><div class='add'>+		RL("RxImm:", stats.imm);</div><div class='add'>+		RL("RxAN", stats.an);</div><div class='add'>+		RL("RxNoMem", stats.nomem);</div><div class='add'>+		TL("TSO:", tso);</div><div class='add'>+		TL("USO:", uso);</div><div class='add'>+		TL("TxCSO:", tx_cso);</div><div class='add'>+		TL("VLANins:", vlan_ins);</div><div class='add'>+		TL("TxQFull:", q.stops);</div><div class='add'>+		TL("TxQRestarts:", q.restarts);</div><div class='add'>+		TL("TxMapErr:", mapping_err);</div><div class='add'>+		RL("FLAllocErr:", fl.alloc_failed);</div><div class='add'>+		RL("FLLrgAlcErr:", fl.large_alloc_failed);</div><div class='add'>+		RL("FLMapErr:", fl.mapping_err);</div><div class='add'>+		RL("FLLow:", fl.low);</div><div class='add'>+		RL("FLStarving:", fl.starving);</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	r -= eohw_entries;</div><div class='add'>+	for (j = 0; j &lt; adap-&gt;params.nports; j++) {</div><div class='add'>+		int entries;</div><div class='add'>+		u8 tc;</div><div class='add'>+</div><div class='add'>+		port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[j];</div><div class='add'>+		entries = 0;</div><div class='add'>+		for (tc = 0; tc &lt; port_mqprio-&gt;mqprio.qopt.num_tc; tc++)</div><div class='add'>+			entries += port_mqprio-&gt;mqprio.qopt.count[tc];</div><div class='add'>+</div><div class='add'>+		if (!entries)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		eosw_entries = DIV_ROUND_UP(entries, 4);</div><div class='add'>+		if (r &lt; eosw_entries) {</div><div class='add'>+			const struct sge_eosw_txq *tx;</div><div class='add'>+</div><div class='add'>+			n = min(4, entries - 4 * r);</div><div class='add'>+			tx = &amp;port_mqprio-&gt;eosw_txq[4 * r];</div><div class='add'>+</div><div class='add'>+			S("QType:", "EOSW-TXQ");</div><div class='add'>+			S("Interface:",</div><div class='add'>+			  adap-&gt;port[j] ? adap-&gt;port[j]-&gt;name : "N/A");</div><div class='add'>+			T("EOTID:", hwtid);</div><div class='add'>+			T("HWQID:", hwqid);</div><div class='add'>+			T("State:", state);</div><div class='add'>+			T("Size:", ndesc);</div><div class='add'>+			T("In-Use:", inuse);</div><div class='add'>+			T("Credits:", cred);</div><div class='add'>+			T("Compl:", ncompl);</div><div class='add'>+			T("Last-Compl:", last_compl);</div><div class='add'>+			T("PIDX:", pidx);</div><div class='add'>+			T("Last-PIDX:", last_pidx);</div><div class='add'>+			T("CIDX:", cidx);</div><div class='add'>+			T("Last-CIDX:", last_cidx);</div><div class='add'>+			T("FLOWC-IDX:", flowc_idx);</div><div class='add'>+</div><div class='add'>+			mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		r -= eosw_entries;</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+</div><div class='add'>+skip_mqprio:</div><div class='add'>+	if (!is_uld(adap))</div><div class='add'>+		goto skip_uld;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;uld_mutex);</div><div class='add'>+	if (s-&gt;uld_txq_info)</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(uld_txq_entries); i++)</div><div class='add'>+			uld_txq_entries[i] = sge_qinfo_uld_txq_entries(adap, i);</div><div class='add'>+</div><div class='add'>+	if (s-&gt;uld_rxq_info) {</div><div class='add'>+		for (i = 0; i &lt; ARRAY_SIZE(uld_rxq_entries); i++) {</div><div class='add'>+			uld_rxq_entries[i] = sge_qinfo_uld_rxq_entries(adap, i);</div><div class='add'>+			uld_ciq_entries[i] = sge_qinfo_uld_ciq_entries(adap, i);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (r &lt; uld_txq_entries[CXGB4_TX_OFLD]) {</div><div class='ctx'> 		const struct sge_uld_txq *tx;</div><div class='ctx'> </div><div class='hunk'>@@ -2943,6 +3096,9 @@ do { \</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r -= uld_txq_entries[CXGB4_TX_CRYPTO];</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+</div><div class='add'>+skip_uld:</div><div class='ctx'> 	if (r &lt; ctrl_entries) {</div><div class='ctx'> 		const struct sge_ctrl_txq *tx = &amp;s-&gt;ctrlq[r * 4];</div><div class='ctx'> </div><div class='hunk'>@@ -2957,7 +3113,7 @@ do { \</div><div class='ctx'> 		TL("TxQFull:", q.stops);</div><div class='ctx'> 		TL("TxQRestarts:", q.restarts);</div><div class='ctx'> </div><div class='del'>-		goto unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	r -= ctrl_entries;</div><div class='hunk'>@@ -2975,11 +3131,9 @@ do { \</div><div class='ctx'> 		seq_printf(seq, "%-12s %16u\n", "Intr pktcnt:",</div><div class='ctx'> 			   s-&gt;counter_val[evtq-&gt;pktcnt_idx]);</div><div class='ctx'> </div><div class='del'>-		goto unlock;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-unlock:</div><div class='del'>-	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> #undef R</div><div class='ctx'> #undef RL</div><div class='ctx'> #undef T</div><div class='hunk'>@@ -2988,13 +3142,51 @@ unlock:</div><div class='ctx'> #undef R3</div><div class='ctx'> #undef T3</div><div class='ctx'> #undef S3</div><div class='add'>+out:</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sge_queue_entries(const struct adapter *adap)</div><div class='add'>+static int sge_queue_entries(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	int tot_uld_entries = 0;</div><div class='del'>-	int i;</div><div class='add'>+	int i, tot_uld_entries = 0, eohw_entries = 0, eosw_entries = 0;</div><div class='add'>+	int mirror_rxq_entries = 0;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;tc_mqprio) {</div><div class='add'>+		struct cxgb4_tc_port_mqprio *port_mqprio;</div><div class='add'>+		u8 tc;</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+		if (adap-&gt;sge.eohw_txq)</div><div class='add'>+			eohw_entries = DIV_ROUND_UP(adap-&gt;sge.eoqsets, 4);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+			u32 entries = 0;</div><div class='add'>+</div><div class='add'>+			port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[i];</div><div class='add'>+			for (tc = 0; tc &lt; port_mqprio-&gt;mqprio.qopt.num_tc; tc++)</div><div class='add'>+				entries += port_mqprio-&gt;mqprio.qopt.count[tc];</div><div class='add'>+</div><div class='add'>+			if (entries)</div><div class='add'>+				eosw_entries += DIV_ROUND_UP(entries, 4);</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_port(adap, i) {</div><div class='add'>+		struct port_info *pi = adap2pinfo(adap, i);</div><div class='add'>+</div><div class='add'>+		mutex_lock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+		if (pi-&gt;vi_mirror_count)</div><div class='add'>+			mirror_rxq_entries += DIV_ROUND_UP(pi-&gt;nmirrorqsets, 4);</div><div class='add'>+		mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_uld(adap))</div><div class='add'>+		goto lld_only;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;uld_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; CXGB4_TX_MAX; i++)</div><div class='hunk'>@@ -3006,8 +3198,9 @@ static int sge_queue_entries(const struct adapter *adap)</div><div class='ctx'> 	}</div><div class='ctx'> 	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> </div><div class='del'>-	return DIV_ROUND_UP(adap-&gt;sge.ethqsets, 4) +</div><div class='del'>-	       tot_uld_entries +</div><div class='add'>+lld_only:</div><div class='add'>+	return DIV_ROUND_UP(adap-&gt;sge.ethqsets, 4) + mirror_rxq_entries +</div><div class='add'>+	       eohw_entries + eosw_entries + tot_uld_entries +</div><div class='ctx'> 	       DIV_ROUND_UP(MAX_CTRL_QUEUES, 4) + 1;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3118,14 +3311,12 @@ static const struct file_operations mem_debugfs_fops = {</div><div class='ctx'> </div><div class='ctx'> static int tid_info_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='del'>-	unsigned int tid_start = 0;</div><div class='ctx'> 	struct adapter *adap = seq-&gt;private;</div><div class='del'>-	const struct tid_info *t = &amp;adap-&gt;tids;</div><div class='del'>-	enum chip_type chip = CHELSIO_CHIP_VERSION(adap-&gt;params.chip);</div><div class='del'>-</div><div class='del'>-	if (chip &gt; CHELSIO_T5)</div><div class='del'>-		tid_start = t4_read_reg(adap, LE_DB_ACTIVE_TABLE_START_INDEX_A);</div><div class='add'>+	const struct tid_info *t;</div><div class='add'>+	enum chip_type chip;</div><div class='ctx'> </div><div class='add'>+	t = &amp;adap-&gt;tids;</div><div class='add'>+	chip = CHELSIO_CHIP_VERSION(adap-&gt;params.chip);</div><div class='ctx'> 	if (t4_read_reg(adap, LE_DB_CONFIG_A) &amp; HASHEN_F) {</div><div class='ctx'> 		unsigned int sb;</div><div class='ctx'> 		seq_printf(seq, "Connections in use: %u\n",</div><div class='hunk'>@@ -3137,9 +3328,9 @@ static int tid_info_show(struct seq_file *seq, void *v)</div><div class='ctx'> 			sb = t4_read_reg(adap, LE_DB_SRVR_START_INDEX_A);</div><div class='ctx'> </div><div class='ctx'> 		if (sb) {</div><div class='del'>-			seq_printf(seq, "TID range: %u..%u/%u..%u", tid_start,</div><div class='add'>+			seq_printf(seq, "TID range: %u..%u/%u..%u", t-&gt;tid_base,</div><div class='ctx'> 				   sb - 1, adap-&gt;tids.hash_base,</div><div class='del'>-				   t-&gt;ntids - 1);</div><div class='add'>+				   t-&gt;tid_base + t-&gt;ntids - 1);</div><div class='ctx'> 			seq_printf(seq, ", in use: %u/%u\n",</div><div class='ctx'> 				   atomic_read(&amp;t-&gt;tids_in_use),</div><div class='ctx'> 				   atomic_read(&amp;t-&gt;hash_tids_in_use));</div><div class='hunk'>@@ -3148,14 +3339,14 @@ static int tid_info_show(struct seq_file *seq, void *v)</div><div class='ctx'> 				   t-&gt;aftid_base,</div><div class='ctx'> 				   t-&gt;aftid_end,</div><div class='ctx'> 				   adap-&gt;tids.hash_base,</div><div class='del'>-				   t-&gt;ntids - 1);</div><div class='add'>+				   t-&gt;tid_base + t-&gt;ntids - 1);</div><div class='ctx'> 			seq_printf(seq, ", in use: %u/%u\n",</div><div class='ctx'> 				   atomic_read(&amp;t-&gt;tids_in_use),</div><div class='ctx'> 				   atomic_read(&amp;t-&gt;hash_tids_in_use));</div><div class='ctx'> 		} else {</div><div class='ctx'> 			seq_printf(seq, "TID range: %u..%u",</div><div class='ctx'> 				   adap-&gt;tids.hash_base,</div><div class='del'>-				   t-&gt;ntids - 1);</div><div class='add'>+				   t-&gt;tid_base + t-&gt;ntids - 1);</div><div class='ctx'> 			seq_printf(seq, ", in use: %u\n",</div><div class='ctx'> 				   atomic_read(&amp;t-&gt;hash_tids_in_use));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -3163,8 +3354,8 @@ static int tid_info_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		seq_printf(seq, "Connections in use: %u\n",</div><div class='ctx'> 			   atomic_read(&amp;t-&gt;conns_in_use));</div><div class='ctx'> </div><div class='del'>-		seq_printf(seq, "TID range: %u..%u", tid_start,</div><div class='del'>-			   tid_start + t-&gt;ntids - 1);</div><div class='add'>+		seq_printf(seq, "TID range: %u..%u", t-&gt;tid_base,</div><div class='add'>+			   t-&gt;tid_base + t-&gt;ntids - 1);</div><div class='ctx'> 		seq_printf(seq, ", in use: %u\n",</div><div class='ctx'> 			   atomic_read(&amp;t-&gt;tids_in_use));</div><div class='ctx'> 	}</div><div class='hunk'>@@ -3187,6 +3378,13 @@ static int tid_info_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		seq_printf(seq, "SFTID range: %u..%u in use: %u\n",</div><div class='ctx'> 			   t-&gt;sftid_base, t-&gt;sftid_base + t-&gt;nsftids - 2,</div><div class='ctx'> 			   t-&gt;sftids_in_use);</div><div class='add'>+	if (t-&gt;nhpftids)</div><div class='add'>+		seq_printf(seq, "HPFTID range: %u..%u\n", t-&gt;hpftid_base,</div><div class='add'>+			   t-&gt;hpftid_base + t-&gt;nhpftids - 1);</div><div class='add'>+	if (t-&gt;neotids)</div><div class='add'>+		seq_printf(seq, "EOTID range: %u..%u, in use: %u\n",</div><div class='add'>+			   t-&gt;eotid_base, t-&gt;eotid_base + t-&gt;neotids - 1,</div><div class='add'>+			   atomic_read(&amp;t-&gt;eotids_in_use));</div><div class='ctx'> 	if (t-&gt;ntids)</div><div class='ctx'> 		seq_printf(seq, "HW TID usage: %u IP users, %u IPv6 users\n",</div><div class='ctx'> 			   t4_read_reg(adap, LE_DB_ACT_CNT_IPV4_A),</div><div class='hunk'>@@ -3220,7 +3418,7 @@ static ssize_t blocked_fl_read(struct file *filp, char __user *ubuf,</div><div class='ctx'> 		       adap-&gt;sge.egr_sz, adap-&gt;sge.blocked_fl);</div><div class='ctx'> 	len += sprintf(buf + len, "\n");</div><div class='ctx'> 	size = simple_read_from_buffer(ubuf, count, ppos, buf, len);</div><div class='del'>-	kvfree(buf);</div><div class='add'>+	kfree(buf);</div><div class='ctx'> 	return size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3231,16 +3429,18 @@ static ssize_t blocked_fl_write(struct file *filp, const char __user *ubuf,</div><div class='ctx'> 	unsigned long *t;</div><div class='ctx'> 	struct adapter *adap = filp-&gt;private_data;</div><div class='ctx'> </div><div class='del'>-	t = kcalloc(BITS_TO_LONGS(adap-&gt;sge.egr_sz), sizeof(long), GFP_KERNEL);</div><div class='add'>+	t = bitmap_zalloc(adap-&gt;sge.egr_sz, GFP_KERNEL);</div><div class='ctx'> 	if (!t)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	err = bitmap_parse_user(ubuf, count, t, adap-&gt;sge.egr_sz);</div><div class='del'>-	if (err)</div><div class='add'>+	if (err) {</div><div class='add'>+		bitmap_free(t);</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	bitmap_copy(adap-&gt;sge.blocked_fl, t, adap-&gt;sge.egr_sz);</div><div class='del'>-	kvfree(t);</div><div class='add'>+	bitmap_free(t);</div><div class='ctx'> 	return count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3327,6 +3527,10 @@ DEFINE_SHOW_ATTRIBUTE(meminfo);</div><div class='ctx'> </div><div class='ctx'> static int chcr_stats_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	struct ch_ktls_port_stats_debug *ktls_port;</div><div class='add'>+	int i = 0;</div><div class='add'>+#endif</div><div class='ctx'> 	struct adapter *adap = seq-&gt;private;</div><div class='ctx'> </div><div class='ctx'> 	seq_puts(seq, "Chelsio Crypto Accelerator Stats \n");</div><div class='hunk'>@@ -3342,8 +3546,47 @@ static int chcr_stats_show(struct seq_file *seq, void *v)</div><div class='ctx'> 		   atomic_read(&amp;adap-&gt;chcr_stats.error));</div><div class='ctx'> 	seq_printf(seq, "Fallback: %10u \n",</div><div class='ctx'> 		   atomic_read(&amp;adap-&gt;chcr_stats.fallback));</div><div class='add'>+	seq_printf(seq, "TLS PDU Tx: %10u\n",</div><div class='add'>+		   atomic_read(&amp;adap-&gt;chcr_stats.tls_pdu_tx));</div><div class='add'>+	seq_printf(seq, "TLS PDU Rx: %10u\n",</div><div class='add'>+		   atomic_read(&amp;adap-&gt;chcr_stats.tls_pdu_rx));</div><div class='add'>+	seq_printf(seq, "TLS Keys (DDR) Count: %10u\n",</div><div class='add'>+		   atomic_read(&amp;adap-&gt;chcr_stats.tls_key));</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+	seq_puts(seq, "\nChelsio Inline IPsec Crypto Accelerator Stats\n");</div><div class='ctx'> 	seq_printf(seq, "IPSec PDU: %10u\n",</div><div class='del'>-		   atomic_read(&amp;adap-&gt;chcr_stats.ipsec_cnt));</div><div class='add'>+		   atomic_read(&amp;adap-&gt;ch_ipsec_stats.ipsec_cnt));</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	seq_puts(seq, "\nChelsio KTLS Crypto Accelerator Stats\n");</div><div class='add'>+	seq_printf(seq, "Tx TLS offload refcount:          %20u\n",</div><div class='add'>+		   refcount_read(&amp;adap-&gt;chcr_ktls.ktls_refcount));</div><div class='add'>+	seq_printf(seq, "Tx records send:                  %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_send_records));</div><div class='add'>+	seq_printf(seq, "Tx partial start of records:      %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_start_pkts));</div><div class='add'>+	seq_printf(seq, "Tx partial middle of records:     %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_middle_pkts));</div><div class='add'>+	seq_printf(seq, "Tx partial end of record:         %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_end_pkts));</div><div class='add'>+	seq_printf(seq, "Tx complete records:              %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_complete_pkts));</div><div class='add'>+	seq_printf(seq, "TX trim pkts :                    %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_trimmed_pkts));</div><div class='add'>+	seq_printf(seq, "TX sw fallback :                  %20llu\n",</div><div class='add'>+		   atomic64_read(&amp;adap-&gt;ch_ktls_stats.ktls_tx_fallback));</div><div class='add'>+	while (i &lt; MAX_NPORTS) {</div><div class='add'>+		ktls_port = &amp;adap-&gt;ch_ktls_stats.ktls_port[i];</div><div class='add'>+		seq_printf(seq, "Port %d\n", i);</div><div class='add'>+		seq_printf(seq, "Tx connection created:            %20llu\n",</div><div class='add'>+			   atomic64_read(&amp;ktls_port-&gt;ktls_tx_connection_open));</div><div class='add'>+		seq_printf(seq, "Tx connection failed:             %20llu\n",</div><div class='add'>+			   atomic64_read(&amp;ktls_port-&gt;ktls_tx_connection_fail));</div><div class='add'>+		seq_printf(seq, "Tx connection closed:             %20llu\n",</div><div class='add'>+			   atomic64_read(&amp;ktls_port-&gt;ktls_tx_connection_close));</div><div class='add'>+		i++;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> DEFINE_SHOW_ATTRIBUTE(chcr_stats);</div><div class='hunk'>@@ -3529,7 +3772,6 @@ int t4_setup_debugfs(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 size = 0;</div><div class='del'>-	struct dentry *de;</div><div class='ctx'> </div><div class='ctx'> 	static struct t4_debugfs_entry t4_debugfs_files[] = {</div><div class='ctx'> 		{ "cim_la", &amp;cim_la_fops, 0400, 0 },</div><div class='hunk'>@@ -3640,8 +3882,8 @@ int t4_setup_debugfs(struct adapter *adap)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	de = debugfs_create_file_size("flash", 0400, adap-&gt;debugfs_root, adap,</div><div class='del'>-				      &amp;flash_debugfs_fops, adap-&gt;params.sf_size);</div><div class='add'>+	debugfs_create_file_size("flash", 0400, adap-&gt;debugfs_root, adap,</div><div class='add'>+				 &amp;flash_debugfs_fops, adap-&gt;params.sf_size);</div><div class='ctx'> 	debugfs_create_bool("use_backdoor", 0600,</div><div class='ctx'> 			    adap-&gt;debugfs_root, &amp;adap-&gt;use_bd);</div><div class='ctx'> 	debugfs_create_bool("trace_rss", 0600,</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h<br/>index ba95e13d52da..1471cf0deb58 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h</a></div><div class='hunk'>@@ -49,7 +49,7 @@ struct seq_tab {</div><div class='ctx'> 	unsigned int rows;        /* # of entries */</div><div class='ctx'> 	unsigned char width;      /* size in bytes of each entry */</div><div class='ctx'> 	unsigned char skip_first; /* whether the first line is a header */</div><div class='del'>-	char data[0];             /* the table data */</div><div class='add'>+	char data[];             /* the table data */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int hex2val(char c)</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c<br/>index 76538f4cd595..23326235d4ab 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c</a></div><div class='hunk'>@@ -10,6 +10,8 @@</div><div class='ctx'> #include "t4_regs.h"</div><div class='ctx'> #include "t4fw_api.h"</div><div class='ctx'> #include "cxgb4_cudbg.h"</div><div class='add'>+#include "cxgb4_filter.h"</div><div class='add'>+#include "cxgb4_tc_flower.h"</div><div class='ctx'> </div><div class='ctx'> #define EEPROM_MAGIC 0x38E2F10C</div><div class='ctx'> </div><div class='hunk'>@@ -23,6 +25,23 @@ static void set_msglevel(struct net_device *dev, u32 val)</div><div class='ctx'> 	netdev2adap(dev)-&gt;msg_enable = val;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+enum cxgb4_ethtool_tests {</div><div class='add'>+	CXGB4_ETHTOOL_LB_TEST,</div><div class='add'>+	CXGB4_ETHTOOL_MAX_TEST,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char cxgb4_selftest_strings[CXGB4_ETHTOOL_MAX_TEST][ETH_GSTRING_LEN] = {</div><div class='add'>+	"Loop back test (offline)",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char * const flash_region_strings[] = {</div><div class='add'>+	"All",</div><div class='add'>+	"Firmware",</div><div class='add'>+	"PHY Firmware",</div><div class='add'>+	"Boot",</div><div class='add'>+	"Boot CFG",</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static const char stats_strings[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"tx_octets_ok           ",</div><div class='ctx'> 	"tx_frames_ok           ",</div><div class='hunk'>@@ -91,12 +110,22 @@ static const char stats_strings[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"rx_bg3_frames_trunc    ",</div><div class='ctx'> </div><div class='ctx'> 	"tso                    ",</div><div class='add'>+	"uso                    ",</div><div class='ctx'> 	"tx_csum_offload        ",</div><div class='ctx'> 	"rx_csum_good           ",</div><div class='ctx'> 	"vlan_extractions       ",</div><div class='ctx'> 	"vlan_insertions        ",</div><div class='ctx'> 	"gro_packets            ",</div><div class='ctx'> 	"gro_merged             ",</div><div class='add'>+#if  IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	"tx_tls_encrypted_packets",</div><div class='add'>+	"tx_tls_encrypted_bytes  ",</div><div class='add'>+	"tx_tls_ctx              ",</div><div class='add'>+	"tx_tls_ooo              ",</div><div class='add'>+	"tx_tls_skip_no_sync_data",</div><div class='add'>+	"tx_tls_drop_no_sync_data",</div><div class='add'>+	"tx_tls_drop_bypass_req  ",</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static char adapter_stats_strings[][ETH_GSTRING_LEN] = {</div><div class='hunk'>@@ -146,6 +175,8 @@ static int get_sset_count(struct net_device *dev, int sset)</div><div class='ctx'> 		       ARRAY_SIZE(loopback_stats_strings);</div><div class='ctx'> 	case ETH_SS_PRIV_FLAGS:</div><div class='ctx'> 		return ARRAY_SIZE(cxgb4_priv_flags_strings);</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		return ARRAY_SIZE(cxgb4_selftest_strings);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -168,16 +199,12 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='ctx'> 	u32 exprom_vers;</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, cxgb4_driver_name, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, cxgb4_driver_version,</div><div class='del'>-		sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(info-&gt;driver, cxgb4_driver_name, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> 	info-&gt;regdump_len = get_regs_len(dev);</div><div class='ctx'> </div><div class='del'>-	if (!adapter-&gt;params.fw_vers)</div><div class='del'>-		strcpy(info-&gt;fw_version, "N/A");</div><div class='del'>-	else</div><div class='add'>+	if (adapter-&gt;params.fw_vers)</div><div class='ctx'> 		snprintf(info-&gt;fw_version, sizeof(info-&gt;fw_version),</div><div class='ctx'> 			 "%u.%u.%u.%u, TP %u.%u.%u.%u",</div><div class='ctx'> 			 FW_HDR_FW_VER_MAJOR_G(adapter-&gt;params.fw_vers),</div><div class='hunk'>@@ -212,6 +239,9 @@ static void get_strings(struct net_device *dev, u32 stringset, u8 *data)</div><div class='ctx'> 	} else if (stringset == ETH_SS_PRIV_FLAGS) {</div><div class='ctx'> 		memcpy(data, cxgb4_priv_flags_strings,</div><div class='ctx'> 		       sizeof(cxgb4_priv_flags_strings));</div><div class='add'>+	} else if (stringset == ETH_SS_TEST) {</div><div class='add'>+		memcpy(data, cxgb4_selftest_strings,</div><div class='add'>+		       sizeof(cxgb4_selftest_strings));</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -220,12 +250,22 @@ static void get_strings(struct net_device *dev, u32 stringset, u8 *data)</div><div class='ctx'>  */</div><div class='ctx'> struct queue_port_stats {</div><div class='ctx'> 	u64 tso;</div><div class='add'>+	u64 uso;</div><div class='ctx'> 	u64 tx_csum;</div><div class='ctx'> 	u64 rx_csum;</div><div class='ctx'> 	u64 vlan_ex;</div><div class='ctx'> 	u64 vlan_ins;</div><div class='ctx'> 	u64 gro_pkts;</div><div class='ctx'> 	u64 gro_merged;</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	u64 tx_tls_encrypted_packets;</div><div class='add'>+	u64 tx_tls_encrypted_bytes;</div><div class='add'>+	u64 tx_tls_ctx;</div><div class='add'>+	u64 tx_tls_ooo;</div><div class='add'>+	u64 tx_tls_skip_no_sync_data;</div><div class='add'>+	u64 tx_tls_drop_no_sync_data;</div><div class='add'>+	u64 tx_tls_drop_bypass_req;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct adapter_stats {</div><div class='hunk'>@@ -240,13 +280,18 @@ static void collect_sge_port_stats(const struct adapter *adap,</div><div class='ctx'> 				   const struct port_info *p,</div><div class='ctx'> 				   struct queue_port_stats *s)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='ctx'> 	const struct sge_eth_txq *tx = &amp;adap-&gt;sge.ethtxq[p-&gt;first_qset];</div><div class='ctx'> 	const struct sge_eth_rxq *rx = &amp;adap-&gt;sge.ethrxq[p-&gt;first_qset];</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	const struct ch_ktls_port_stats_debug *ktls_stats;</div><div class='add'>+#endif</div><div class='add'>+	struct sge_eohw_txq *eohw_tx;</div><div class='add'>+	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	memset(s, 0, sizeof(*s));</div><div class='ctx'> 	for (i = 0; i &lt; p-&gt;nqsets; i++, rx++, tx++) {</div><div class='ctx'> 		s-&gt;tso += tx-&gt;tso;</div><div class='add'>+		s-&gt;uso += tx-&gt;uso;</div><div class='ctx'> 		s-&gt;tx_csum += tx-&gt;tx_cso;</div><div class='ctx'> 		s-&gt;rx_csum += rx-&gt;stats.rx_cso;</div><div class='ctx'> 		s-&gt;vlan_ex += rx-&gt;stats.vlan_ex;</div><div class='hunk'>@@ -254,6 +299,31 @@ static void collect_sge_port_stats(const struct adapter *adap,</div><div class='ctx'> 		s-&gt;gro_pkts += rx-&gt;stats.lro_pkts;</div><div class='ctx'> 		s-&gt;gro_merged += rx-&gt;stats.lro_merged;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;sge.eohw_txq) {</div><div class='add'>+		eohw_tx = &amp;adap-&gt;sge.eohw_txq[p-&gt;first_qset];</div><div class='add'>+		for (i = 0; i &lt; p-&gt;nqsets; i++, eohw_tx++) {</div><div class='add'>+			s-&gt;tso += eohw_tx-&gt;tso;</div><div class='add'>+			s-&gt;uso += eohw_tx-&gt;uso;</div><div class='add'>+			s-&gt;tx_csum += eohw_tx-&gt;tx_cso;</div><div class='add'>+			s-&gt;vlan_ins += eohw_tx-&gt;vlan_ins;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	ktls_stats = &amp;adap-&gt;ch_ktls_stats.ktls_port[p-&gt;port_id];</div><div class='add'>+	s-&gt;tx_tls_encrypted_packets =</div><div class='add'>+		atomic64_read(&amp;ktls_stats-&gt;ktls_tx_encrypted_packets);</div><div class='add'>+	s-&gt;tx_tls_encrypted_bytes =</div><div class='add'>+		atomic64_read(&amp;ktls_stats-&gt;ktls_tx_encrypted_bytes);</div><div class='add'>+	s-&gt;tx_tls_ctx = atomic64_read(&amp;ktls_stats-&gt;ktls_tx_ctx);</div><div class='add'>+	s-&gt;tx_tls_ooo = atomic64_read(&amp;ktls_stats-&gt;ktls_tx_ooo);</div><div class='add'>+	s-&gt;tx_tls_skip_no_sync_data =</div><div class='add'>+		atomic64_read(&amp;ktls_stats-&gt;ktls_tx_skip_no_sync_data);</div><div class='add'>+	s-&gt;tx_tls_drop_no_sync_data =</div><div class='add'>+		atomic64_read(&amp;ktls_stats-&gt;ktls_tx_drop_no_sync_data);</div><div class='add'>+	s-&gt;tx_tls_drop_bypass_req =</div><div class='add'>+		atomic64_read(&amp;ktls_stats-&gt;ktls_tx_drop_bypass_req);</div><div class='add'>+#endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void collect_adapter_stats(struct adapter *adap, struct adapter_stats *s)</div><div class='hunk'>@@ -560,7 +630,7 @@ static void fw_caps_to_lmm(enum fw_port_type port_type,</div><div class='ctx'> /**</div><div class='ctx'>  *	lmm_to_fw_caps - translate ethtool Link Mode Mask to Firmware</div><div class='ctx'>  *	capabilities</div><div class='del'>- *	@et_lmm: ethtool Link Mode Mask</div><div class='add'>+ *	@link_mode_mask: ethtool Link Mode Mask</div><div class='ctx'>  *</div><div class='ctx'>  *	Translate ethtool Link Mode Mask into a Firmware Port capabilities</div><div class='ctx'>  *	value.</div><div class='hunk'>@@ -793,8 +863,8 @@ static void get_pauseparam(struct net_device *dev,</div><div class='ctx'> 	struct port_info *p = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	epause-&gt;autoneg = (p-&gt;link_cfg.requested_fc &amp; PAUSE_AUTONEG) != 0;</div><div class='del'>-	epause-&gt;rx_pause = (p-&gt;link_cfg.fc &amp; PAUSE_RX) != 0;</div><div class='del'>-	epause-&gt;tx_pause = (p-&gt;link_cfg.fc &amp; PAUSE_TX) != 0;</div><div class='add'>+	epause-&gt;rx_pause = (p-&gt;link_cfg.advertised_fc &amp; PAUSE_RX) != 0;</div><div class='add'>+	epause-&gt;tx_pause = (p-&gt;link_cfg.advertised_fc &amp; PAUSE_TX) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_pauseparam(struct net_device *dev,</div><div class='hunk'>@@ -820,7 +890,9 @@ static int set_pauseparam(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='add'>+static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e,</div><div class='add'>+			  struct kernel_ethtool_ringparam *kernel_e,</div><div class='add'>+			  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	const struct sge *s = &amp;pi-&gt;adapter-&gt;sge;</div><div class='hunk'>@@ -836,7 +908,9 @@ static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='ctx'> 	e-&gt;tx_pending = s-&gt;ethtxq[pi-&gt;first_qset].q.size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)</div><div class='add'>+static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e,</div><div class='add'>+			 struct kernel_ethtool_ringparam *kernel_e,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='hunk'>@@ -1077,7 +1151,9 @@ static int set_dbqtimer_tickval(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int set_coalesce(struct net_device *dev,</div><div class='del'>-			struct ethtool_coalesce *coalesce)</div><div class='add'>+			struct ethtool_coalesce *coalesce,</div><div class='add'>+			struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -1093,7 +1169,9 @@ static int set_coalesce(struct net_device *dev,</div><div class='ctx'> 				    coalesce-&gt;tx_coalesce_usecs);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)</div><div class='add'>+static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c,</div><div class='add'>+			struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	const struct adapter *adap = pi-&gt;adapter;</div><div class='hunk'>@@ -1207,15 +1285,225 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_flash(struct net_device *netdev, struct ethtool_flash *ef)</div><div class='add'>+static int cxgb4_ethtool_flash_bootcfg(struct net_device *netdev,</div><div class='add'>+				       const u8 *data, u32 size)</div><div class='ctx'> {</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='ctx'> 	int ret;</div><div class='del'>-	const struct firmware *fw;</div><div class='add'>+</div><div class='add'>+	ret = t4_load_bootcfg(adap, data, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Failed to load boot cfg image\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_ethtool_flash_boot(struct net_device *netdev,</div><div class='add'>+				    const u8 *bdata, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	u8 *data;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	data = kmemdup(bdata, size, GFP_KERNEL);</div><div class='add'>+	if (!data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	offset = OFFSET_G(t4_read_reg(adap, PF_REG(0, PCIE_PF_EXPROM_OFST_A)));</div><div class='add'>+</div><div class='add'>+	ret = t4_load_boot(adap, data, offset, size);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Failed to load boot image\n");</div><div class='add'>+</div><div class='add'>+	kfree(data);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CXGB4_PHY_SIG 0x130000ea</div><div class='add'>+</div><div class='add'>+static int cxgb4_validate_phy_image(const u8 *data, u32 *size)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_fw_data *header;</div><div class='add'>+</div><div class='add'>+	header = (struct cxgb4_fw_data *)data;</div><div class='add'>+	if (be32_to_cpu(header-&gt;signature) != CXGB4_PHY_SIG)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_ethtool_flash_phy(struct net_device *netdev,</div><div class='add'>+				   const u8 *data, u32 size)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_validate_phy_image(data, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "PHY signature mismatch\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We have to RESET the chip/firmware because we need the</div><div class='add'>+	 * chip in uninitialized state for loading new PHY image.</div><div class='add'>+	 * Otherwise, the running firmware will only store the PHY</div><div class='add'>+	 * image in local RAM which will be lost after next reset.</div><div class='add'>+	 */</div><div class='add'>+	ret = t4_fw_reset(adap, adap-&gt;mbox, PIORSTMODE_F | PIORST_F);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Set FW to RESET for flashing PHY FW failed. ret: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t4_load_phy_fw(adap, MEMWIN_NIC, NULL, data, size);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Failed to load PHY FW. ret: %d\n",</div><div class='add'>+			ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_ethtool_flash_fw(struct net_device *netdev,</div><div class='add'>+				  const u8 *data, u32 size)</div><div class='add'>+{</div><div class='ctx'> 	struct adapter *adap = netdev2adap(netdev);</div><div class='ctx'> 	unsigned int mbox = PCIE_FW_MASTER_M + 1;</div><div class='del'>-	u32 pcie_fw;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* If the adapter has been fully initialized then we'll go ahead and</div><div class='add'>+	 * try to get the firmware's cooperation in upgrading to the new</div><div class='add'>+	 * firmware image otherwise we'll try to do the entire job from the</div><div class='add'>+	 * host ... and we always "force" the operation in this path.</div><div class='add'>+	 */</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='add'>+		mbox = adap-&gt;mbox;</div><div class='add'>+</div><div class='add'>+	ret = t4_fw_upgrade(adap, mbox, data, size, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Failed to flash firmware\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_ethtool_flash_region(struct net_device *netdev,</div><div class='add'>+				      const u8 *data, u32 size, u32 region)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	switch (region) {</div><div class='add'>+	case CXGB4_ETHTOOL_FLASH_FW:</div><div class='add'>+		ret = cxgb4_ethtool_flash_fw(netdev, data, size);</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_ETHTOOL_FLASH_PHY:</div><div class='add'>+		ret = cxgb4_ethtool_flash_phy(netdev, data, size);</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_ETHTOOL_FLASH_BOOT:</div><div class='add'>+		ret = cxgb4_ethtool_flash_boot(netdev, data, size);</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_ETHTOOL_FLASH_BOOTCFG:</div><div class='add'>+		ret = cxgb4_ethtool_flash_bootcfg(netdev, data, size);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		ret = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ret)</div><div class='add'>+		dev_info(adap-&gt;pdev_dev,</div><div class='add'>+			 "loading %s successful, reload cxgb4 driver\n",</div><div class='add'>+			 flash_region_strings[region]);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CXGB4_FW_SIG 0x4368656c</div><div class='add'>+#define CXGB4_FW_SIG_OFFSET 0x160</div><div class='add'>+</div><div class='add'>+static int cxgb4_validate_fw_image(const u8 *data, u32 *size)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_fw_data *header;</div><div class='add'>+</div><div class='add'>+	header = (struct cxgb4_fw_data *)&amp;data[CXGB4_FW_SIG_OFFSET];</div><div class='add'>+	if (be32_to_cpu(header-&gt;signature) != CXGB4_FW_SIG)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size)</div><div class='add'>+		*size = be16_to_cpu(((struct fw_hdr *)data)-&gt;len512) * 512;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_validate_bootcfg_image(const u8 *data, u32 *size)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_bootcfg_data *header;</div><div class='add'>+</div><div class='add'>+	header = (struct cxgb4_bootcfg_data *)data;</div><div class='add'>+	if (le16_to_cpu(header-&gt;signature) != BOOT_CFG_SIG)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_validate_boot_image(const u8 *data, u32 *size)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_pci_exp_rom_header *exp_header;</div><div class='add'>+	struct cxgb4_pcir_data *pcir_header;</div><div class='add'>+	struct legacy_pci_rom_hdr *header;</div><div class='add'>+	const u8 *cur_header = data;</div><div class='add'>+	u16 pcir_offset;</div><div class='add'>+</div><div class='add'>+	exp_header = (struct cxgb4_pci_exp_rom_header *)data;</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(exp_header-&gt;signature) != BOOT_SIGNATURE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (size) {</div><div class='add'>+		do {</div><div class='add'>+			header = (struct legacy_pci_rom_hdr *)cur_header;</div><div class='add'>+			pcir_offset = le16_to_cpu(header-&gt;pcir_offset);</div><div class='add'>+			pcir_header = (struct cxgb4_pcir_data *)(cur_header +</div><div class='add'>+				      pcir_offset);</div><div class='add'>+</div><div class='add'>+			*size += header-&gt;size512 * 512;</div><div class='add'>+			cur_header += header-&gt;size512 * 512;</div><div class='add'>+		} while (!(pcir_header-&gt;indicator &amp; CXGB4_HDR_INDI));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_ethtool_get_flash_region(const u8 *data, u32 *size)</div><div class='add'>+{</div><div class='add'>+	if (!cxgb4_validate_fw_image(data, size))</div><div class='add'>+		return CXGB4_ETHTOOL_FLASH_FW;</div><div class='add'>+	if (!cxgb4_validate_boot_image(data, size))</div><div class='add'>+		return CXGB4_ETHTOOL_FLASH_BOOT;</div><div class='add'>+	if (!cxgb4_validate_phy_image(data, size))</div><div class='add'>+		return CXGB4_ETHTOOL_FLASH_PHY;</div><div class='add'>+	if (!cxgb4_validate_bootcfg_image(data, size))</div><div class='add'>+		return CXGB4_ETHTOOL_FLASH_BOOTCFG;</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_flash(struct net_device *netdev, struct ethtool_flash *ef)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='add'>+	const struct firmware *fw;</div><div class='ctx'> 	unsigned int master;</div><div class='ctx'> 	u8 master_vld = 0;</div><div class='add'>+	const u8 *fw_data;</div><div class='add'>+	size_t fw_size;</div><div class='add'>+	u32 size = 0;</div><div class='add'>+	u32 pcie_fw;</div><div class='add'>+	int region;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	pcie_fw = t4_read_reg(adap, PCIE_FW_A);</div><div class='ctx'> 	master = PCIE_FW_MASTER_G(pcie_fw);</div><div class='hunk'>@@ -1233,34 +1521,44 @@ static int set_flash(struct net_device *netdev, struct ethtool_flash *ef)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	/* If the adapter has been fully initialized then we'll go ahead and</div><div class='del'>-	 * try to get the firmware's cooperation in upgrading to the new</div><div class='del'>-	 * firmware image otherwise we'll try to do the entire job from the</div><div class='del'>-	 * host ... and we always "force" the operation in this path.</div><div class='del'>-	 */</div><div class='del'>-	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='del'>-		mbox = adap-&gt;mbox;</div><div class='add'>+	fw_data = fw-&gt;data;</div><div class='add'>+	fw_size = fw-&gt;size;</div><div class='add'>+	if (ef-&gt;region == ETHTOOL_FLASH_ALL_REGIONS) {</div><div class='add'>+		while (fw_size &gt; 0) {</div><div class='add'>+			size = 0;</div><div class='add'>+			region = cxgb4_ethtool_get_flash_region(fw_data, &amp;size);</div><div class='add'>+			if (region &lt; 0 || !size) {</div><div class='add'>+				ret = region;</div><div class='add'>+				goto out_free_fw;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			ret = cxgb4_ethtool_flash_region(netdev, fw_data, size,</div><div class='add'>+							 region);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_free_fw;</div><div class='add'>+</div><div class='add'>+			fw_data += size;</div><div class='add'>+			fw_size -= size;</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ret = cxgb4_ethtool_flash_region(netdev, fw_data, fw_size,</div><div class='add'>+						 ef-&gt;region);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	ret = t4_fw_upgrade(adap, mbox, fw-&gt;data, fw-&gt;size, 1);</div><div class='add'>+out_free_fw:</div><div class='ctx'> 	release_firmware(fw);</div><div class='del'>-	if (!ret)</div><div class='del'>-		dev_info(adap-&gt;pdev_dev,</div><div class='del'>-			 "loaded firmware %s, reload cxgb4 driver\n", ef-&gt;data);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_ts_info(struct net_device *dev, struct ethtool_ts_info *ts_info)</div><div class='add'>+static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts_info)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct  adapter *adapter = pi-&gt;adapter;</div><div class='ctx'> </div><div class='ctx'> 	ts_info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-				   SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-				   SOF_TIMESTAMPING_SOFTWARE;</div><div class='del'>-</div><div class='del'>-	ts_info-&gt;so_timestamping |= SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='del'>-				    SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='del'>-				    SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+				   SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+				   SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+				   SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='ctx'> </div><div class='ctx'> 	ts_info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) |</div><div class='ctx'> 			    (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='hunk'>@@ -1274,8 +1572,6 @@ static int get_ts_info(struct net_device *dev, struct ethtool_ts_info *ts_info)</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;ptp_clock)</div><div class='ctx'> 		ts_info-&gt;phc_index = ptp_clock_index(adapter-&gt;ptp_clock);</div><div class='del'>-	else</div><div class='del'>-		ts_info-&gt;phc_index = -1;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1287,22 +1583,23 @@ static u32 get_rss_table_size(struct net_device *dev)</div><div class='ctx'> 	return pi-&gt;rss_size;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_rss_table(struct net_device *dev, u32 *p, u8 *key, u8 *hfunc)</div><div class='add'>+static int get_rss_table(struct net_device *dev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	unsigned int n = pi-&gt;rss_size;</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='del'>-	if (!p)</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	while (n--)</div><div class='del'>-		p[n] = pi-&gt;rss[n];</div><div class='add'>+		rxfh-&gt;indir[n] = pi-&gt;rss[n];</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key,</div><div class='del'>-			 const u8 hfunc)</div><div class='add'>+static int set_rss_table(struct net_device *dev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='hunk'>@@ -1310,16 +1607,17 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key,</div><div class='ctx'> 	/* We require at least one supported parameter to be changed and no</div><div class='ctx'> 	 * change in any of the unsupported parameters</div><div class='ctx'> 	 */</div><div class='del'>-	if (key ||</div><div class='del'>-	    (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP))</div><div class='add'>+	if (rxfh-&gt;key ||</div><div class='add'>+	    (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	     rxfh-&gt;hfunc != ETH_RSS_HASH_TOP))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='del'>-	if (!p)</div><div class='add'>+	if (!rxfh-&gt;indir)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Interface must be brought up atleast once */</div><div class='ctx'> 	if (pi-&gt;adapter-&gt;flags &amp; CXGB4_FULL_INIT_DONE) {</div><div class='ctx'> 		for (i = 0; i &lt; pi-&gt;rss_size; i++)</div><div class='del'>-			pi-&gt;rss[i] = p[i];</div><div class='add'>+			pi-&gt;rss[i] = rxfh-&gt;indir[i];</div><div class='ctx'> </div><div class='ctx'> 		return cxgb4_write_rss(pi, pi-&gt;rss);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1327,69 +1625,325 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key,</div><div class='ctx'> 	return -EPERM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static struct filter_entry *cxgb4_get_filter_entry(struct adapter *adap,</div><div class='add'>+						   u32 ftid)</div><div class='add'>+{</div><div class='add'>+	struct tid_info *t = &amp;adap-&gt;tids;</div><div class='add'>+</div><div class='add'>+	if (ftid &gt;= t-&gt;hpftid_base &amp;&amp; ftid &lt; t-&gt;hpftid_base + t-&gt;nhpftids)</div><div class='add'>+		return &amp;t-&gt;hpftid_tab[ftid - t-&gt;hpftid_base];</div><div class='add'>+</div><div class='add'>+	if (ftid &gt;= t-&gt;ftid_base &amp;&amp; ftid &lt; t-&gt;ftid_base + t-&gt;nftids)</div><div class='add'>+		return &amp;t-&gt;ftid_tab[ftid - t-&gt;ftid_base];</div><div class='add'>+</div><div class='add'>+	return lookup_tid(t, ftid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_fill_filter_rule(struct ethtool_rx_flow_spec *fs,</div><div class='add'>+				   struct ch_filter_specification *dfs)</div><div class='add'>+{</div><div class='add'>+	switch (dfs-&gt;val.proto) {</div><div class='add'>+	case IPPROTO_TCP:</div><div class='add'>+		if (dfs-&gt;type)</div><div class='add'>+			fs-&gt;flow_type = TCP_V6_FLOW;</div><div class='add'>+		else</div><div class='add'>+			fs-&gt;flow_type = TCP_V4_FLOW;</div><div class='add'>+		break;</div><div class='add'>+	case IPPROTO_UDP:</div><div class='add'>+		if (dfs-&gt;type)</div><div class='add'>+			fs-&gt;flow_type = UDP_V6_FLOW;</div><div class='add'>+		else</div><div class='add'>+			fs-&gt;flow_type = UDP_V4_FLOW;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (dfs-&gt;type) {</div><div class='add'>+		fs-&gt;h_u.tcp_ip6_spec.psrc = cpu_to_be16(dfs-&gt;val.fport);</div><div class='add'>+		fs-&gt;m_u.tcp_ip6_spec.psrc = cpu_to_be16(dfs-&gt;mask.fport);</div><div class='add'>+		fs-&gt;h_u.tcp_ip6_spec.pdst = cpu_to_be16(dfs-&gt;val.lport);</div><div class='add'>+		fs-&gt;m_u.tcp_ip6_spec.pdst = cpu_to_be16(dfs-&gt;mask.lport);</div><div class='add'>+		memcpy(&amp;fs-&gt;h_u.tcp_ip6_spec.ip6src, &amp;dfs-&gt;val.fip[0],</div><div class='add'>+		       sizeof(fs-&gt;h_u.tcp_ip6_spec.ip6src));</div><div class='add'>+		memcpy(&amp;fs-&gt;m_u.tcp_ip6_spec.ip6src, &amp;dfs-&gt;mask.fip[0],</div><div class='add'>+		       sizeof(fs-&gt;m_u.tcp_ip6_spec.ip6src));</div><div class='add'>+		memcpy(&amp;fs-&gt;h_u.tcp_ip6_spec.ip6dst, &amp;dfs-&gt;val.lip[0],</div><div class='add'>+		       sizeof(fs-&gt;h_u.tcp_ip6_spec.ip6dst));</div><div class='add'>+		memcpy(&amp;fs-&gt;m_u.tcp_ip6_spec.ip6dst, &amp;dfs-&gt;mask.lip[0],</div><div class='add'>+		       sizeof(fs-&gt;m_u.tcp_ip6_spec.ip6dst));</div><div class='add'>+		fs-&gt;h_u.tcp_ip6_spec.tclass = dfs-&gt;val.tos;</div><div class='add'>+		fs-&gt;m_u.tcp_ip6_spec.tclass = dfs-&gt;mask.tos;</div><div class='add'>+	} else {</div><div class='add'>+		fs-&gt;h_u.tcp_ip4_spec.psrc = cpu_to_be16(dfs-&gt;val.fport);</div><div class='add'>+		fs-&gt;m_u.tcp_ip4_spec.psrc = cpu_to_be16(dfs-&gt;mask.fport);</div><div class='add'>+		fs-&gt;h_u.tcp_ip4_spec.pdst = cpu_to_be16(dfs-&gt;val.lport);</div><div class='add'>+		fs-&gt;m_u.tcp_ip4_spec.pdst = cpu_to_be16(dfs-&gt;mask.lport);</div><div class='add'>+		memcpy(&amp;fs-&gt;h_u.tcp_ip4_spec.ip4src, &amp;dfs-&gt;val.fip[0],</div><div class='add'>+		       sizeof(fs-&gt;h_u.tcp_ip4_spec.ip4src));</div><div class='add'>+		memcpy(&amp;fs-&gt;m_u.tcp_ip4_spec.ip4src, &amp;dfs-&gt;mask.fip[0],</div><div class='add'>+		       sizeof(fs-&gt;m_u.tcp_ip4_spec.ip4src));</div><div class='add'>+		memcpy(&amp;fs-&gt;h_u.tcp_ip4_spec.ip4dst, &amp;dfs-&gt;val.lip[0],</div><div class='add'>+		       sizeof(fs-&gt;h_u.tcp_ip4_spec.ip4dst));</div><div class='add'>+		memcpy(&amp;fs-&gt;m_u.tcp_ip4_spec.ip4dst, &amp;dfs-&gt;mask.lip[0],</div><div class='add'>+		       sizeof(fs-&gt;m_u.tcp_ip4_spec.ip4dst));</div><div class='add'>+		fs-&gt;h_u.tcp_ip4_spec.tos = dfs-&gt;val.tos;</div><div class='add'>+		fs-&gt;m_u.tcp_ip4_spec.tos = dfs-&gt;mask.tos;</div><div class='add'>+	}</div><div class='add'>+	fs-&gt;h_ext.vlan_tci = cpu_to_be16(dfs-&gt;val.ivlan);</div><div class='add'>+	fs-&gt;m_ext.vlan_tci = cpu_to_be16(dfs-&gt;mask.ivlan);</div><div class='add'>+	fs-&gt;flow_type |= FLOW_EXT;</div><div class='add'>+</div><div class='add'>+	if (dfs-&gt;action == FILTER_DROP)</div><div class='add'>+		fs-&gt;ring_cookie = RX_CLS_FLOW_DISC;</div><div class='add'>+	else</div><div class='add'>+		fs-&gt;ring_cookie = dfs-&gt;iq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_ntuple_get_filter(struct net_device *dev,</div><div class='add'>+				   struct ethtool_rxnfc *cmd,</div><div class='add'>+				   unsigned int loc)</div><div class='add'>+{</div><div class='add'>+	const struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct filter_entry *f;</div><div class='add'>+	int ftid;</div><div class='add'>+</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE))</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	/* Check for maximum filter range */</div><div class='add'>+	if (!adap-&gt;ethtool_filters)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (loc &gt;= adap-&gt;ethtool_filters-&gt;nentries)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	if (!test_bit(loc, adap-&gt;ethtool_filters-&gt;port[pi-&gt;port_id].bmap))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ftid = adap-&gt;ethtool_filters-&gt;port[pi-&gt;port_id].loc_array[loc];</div><div class='add'>+</div><div class='add'>+	/* Fetch filter_entry */</div><div class='add'>+	f = cxgb4_get_filter_entry(adap, ftid);</div><div class='add'>+</div><div class='add'>+	cxgb4_fill_filter_rule(&amp;cmd-&gt;fs, &amp;f-&gt;fs);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_get_rxfh_fields(struct net_device *dev,</div><div class='add'>+				 struct ethtool_rxfh_fields *info)</div><div class='add'>+{</div><div class='add'>+	const struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	unsigned int v = pi-&gt;rss_mode;</div><div class='add'>+</div><div class='add'>+	info-&gt;data = 0;</div><div class='add'>+	switch (info-&gt;flow_type) {</div><div class='add'>+	case TCP_V4_FLOW:</div><div class='add'>+		if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+				RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V4_FLOW:</div><div class='add'>+		if ((v &amp; FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN_F) &amp;&amp;</div><div class='add'>+		    (v &amp; FW_RSS_VI_CONFIG_CMD_UDPEN_F))</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+				RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+		break;</div><div class='add'>+	case SCTP_V4_FLOW:</div><div class='add'>+	case AH_ESP_V4_FLOW:</div><div class='add'>+	case IPV4_FLOW:</div><div class='add'>+		if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+		break;</div><div class='add'>+	case TCP_V6_FLOW:</div><div class='add'>+		if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+				RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+		break;</div><div class='add'>+	case UDP_V6_FLOW:</div><div class='add'>+		if ((v &amp; FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN_F) &amp;&amp;</div><div class='add'>+		    (v &amp; FW_RSS_VI_CONFIG_CMD_UDPEN_F))</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='add'>+				RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='add'>+		else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+		break;</div><div class='add'>+	case SCTP_V6_FLOW:</div><div class='add'>+	case AH_ESP_V6_FLOW:</div><div class='add'>+	case IPV6_FLOW:</div><div class='add'>+		if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F)</div><div class='add'>+			info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,</div><div class='ctx'> 		     u32 *rules)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	unsigned int count = 0, index = 0;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (info-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXFH: {</div><div class='del'>-		unsigned int v = pi-&gt;rss_mode;</div><div class='del'>-</div><div class='del'>-		info-&gt;data = 0;</div><div class='del'>-		switch (info-&gt;flow_type) {</div><div class='del'>-		case TCP_V4_FLOW:</div><div class='del'>-			if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='del'>-					     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-			else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='del'>-			break;</div><div class='del'>-		case UDP_V4_FLOW:</div><div class='del'>-			if ((v &amp; FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN_F) &amp;&amp;</div><div class='del'>-			    (v &amp; FW_RSS_VI_CONFIG_CMD_UDPEN_F))</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='del'>-					     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-			else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='del'>-			break;</div><div class='del'>-		case SCTP_V4_FLOW:</div><div class='del'>-		case AH_ESP_V4_FLOW:</div><div class='del'>-		case IPV4_FLOW:</div><div class='del'>-			if (v &amp; FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='del'>-			break;</div><div class='del'>-		case TCP_V6_FLOW:</div><div class='del'>-			if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='del'>-					     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-			else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='del'>-			break;</div><div class='del'>-		case UDP_V6_FLOW:</div><div class='del'>-			if ((v &amp; FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN_F) &amp;&amp;</div><div class='del'>-			    (v &amp; FW_RSS_VI_CONFIG_CMD_UDPEN_F))</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST |</div><div class='del'>-					     RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-			else if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='del'>-			break;</div><div class='del'>-		case SCTP_V6_FLOW:</div><div class='del'>-		case AH_ESP_V6_FLOW:</div><div class='del'>-		case IPV6_FLOW:</div><div class='del'>-			if (v &amp; FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F)</div><div class='del'>-				info-&gt;data = RXH_IP_SRC | RXH_IP_DST;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='ctx'> 	case ETHTOOL_GRXRINGS:</div><div class='ctx'> 		info-&gt;data = pi-&gt;nqsets;</div><div class='ctx'> 		return 0;</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		info-&gt;rule_cnt =</div><div class='add'>+		       adap-&gt;ethtool_filters-&gt;port[pi-&gt;port_id].in_use;</div><div class='add'>+		return 0;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		return cxgb4_ntuple_get_filter(dev, info, info-&gt;fs.location);</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		info-&gt;data = adap-&gt;ethtool_filters-&gt;nentries;</div><div class='add'>+		while (count &lt; info-&gt;rule_cnt) {</div><div class='add'>+			ret = cxgb4_ntuple_get_filter(dev, info, index);</div><div class='add'>+			if (!ret)</div><div class='add'>+				rules[count++] = index;</div><div class='add'>+			index++;</div><div class='add'>+		}</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxgb4_ntuple_del_filter(struct net_device *dev,</div><div class='add'>+				   struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_ethtool_filter_info *filter_info;</div><div class='add'>+	struct adapter *adapter = netdev2adap(dev);</div><div class='add'>+	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	struct filter_entry *f;</div><div class='add'>+	u32 filter_id;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(adapter-&gt;flags &amp; CXGB4_FULL_INIT_DONE))</div><div class='add'>+		return -EAGAIN;  /* can still change nfilters */</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;ethtool_filters)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.location &gt;= adapter-&gt;ethtool_filters-&gt;nentries) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"Location must be &lt; %u",</div><div class='add'>+			adapter-&gt;ethtool_filters-&gt;nentries);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	filter_info = &amp;adapter-&gt;ethtool_filters-&gt;port[pi-&gt;port_id];</div><div class='add'>+</div><div class='add'>+	if (!test_bit(cmd-&gt;fs.location, filter_info-&gt;bmap))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	filter_id = filter_info-&gt;loc_array[cmd-&gt;fs.location];</div><div class='add'>+	f = cxgb4_get_filter_entry(adapter, filter_id);</div><div class='add'>+</div><div class='add'>+	if (f-&gt;fs.prio)</div><div class='add'>+		filter_id -= adapter-&gt;tids.hpftid_base;</div><div class='add'>+	else if (!f-&gt;fs.hash)</div><div class='add'>+		filter_id -= (adapter-&gt;tids.ftid_base - adapter-&gt;tids.nhpftids);</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_flow_rule_destroy(dev, f-&gt;fs.tc_prio, &amp;f-&gt;fs, filter_id);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto err;</div><div class='add'>+</div><div class='add'>+	clear_bit(cmd-&gt;fs.location, filter_info-&gt;bmap);</div><div class='add'>+	filter_info-&gt;in_use--;</div><div class='add'>+</div><div class='add'>+err:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add Ethtool n-tuple filters. */</div><div class='add'>+static int cxgb4_ntuple_set_filter(struct net_device *netdev,</div><div class='add'>+				   struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec_input input = {};</div><div class='add'>+	struct cxgb4_ethtool_filter_info *filter_info;</div><div class='add'>+	struct adapter *adapter = netdev2adap(netdev);</div><div class='add'>+	struct port_info *pi = netdev_priv(netdev);</div><div class='add'>+	struct ch_filter_specification fs;</div><div class='add'>+	struct ethtool_rx_flow_rule *flow;</div><div class='add'>+	u32 tid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!(adapter-&gt;flags &amp; CXGB4_FULL_INIT_DONE))</div><div class='add'>+		return -EAGAIN;  /* can still change nfilters */</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;ethtool_filters)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (cmd-&gt;fs.location &gt;= adapter-&gt;ethtool_filters-&gt;nentries) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"Location must be &lt; %u",</div><div class='add'>+			adapter-&gt;ethtool_filters-&gt;nentries);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (test_bit(cmd-&gt;fs.location,</div><div class='add'>+		     adapter-&gt;ethtool_filters-&gt;port[pi-&gt;port_id].bmap))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	memset(&amp;fs, 0, sizeof(fs));</div><div class='add'>+</div><div class='add'>+	input.fs = &amp;cmd-&gt;fs;</div><div class='add'>+	flow = ethtool_rx_flow_rule_create(&amp;input);</div><div class='add'>+	if (IS_ERR(flow)) {</div><div class='add'>+		ret = PTR_ERR(flow);</div><div class='add'>+		goto exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fs.hitcnts = 1;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_flow_rule_replace(netdev, flow-&gt;rule, cmd-&gt;fs.location,</div><div class='add'>+				      NULL, &amp;fs, &amp;tid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free;</div><div class='add'>+</div><div class='add'>+	filter_info = &amp;adapter-&gt;ethtool_filters-&gt;port[pi-&gt;port_id];</div><div class='add'>+</div><div class='add'>+	if (fs.prio)</div><div class='add'>+		tid += adapter-&gt;tids.hpftid_base;</div><div class='add'>+	else if (!fs.hash)</div><div class='add'>+		tid += (adapter-&gt;tids.ftid_base - adapter-&gt;tids.nhpftids);</div><div class='add'>+</div><div class='add'>+	filter_info-&gt;loc_array[cmd-&gt;fs.location] = tid;</div><div class='add'>+	set_bit(cmd-&gt;fs.location, filter_info-&gt;bmap);</div><div class='add'>+	filter_info-&gt;in_use++;</div><div class='add'>+</div><div class='add'>+free:</div><div class='add'>+	ethtool_rx_flow_rule_destroy(flow);</div><div class='add'>+exit:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		ret = cxgb4_ntuple_set_filter(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		ret = cxgb4_ntuple_del_filter(dev, cmd);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int set_dump(struct net_device *dev, struct ethtool_dump *eth_dump)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='hunk'>@@ -1440,6 +1994,15 @@ static int get_dump_data(struct net_device *dev, struct ethtool_dump *eth_dump,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static bool cxgb4_fw_mod_type_info_available(unsigned int fw_mod_type)</div><div class='add'>+{</div><div class='add'>+	/* Read port module EEPROM as long as it is plugged-in and</div><div class='add'>+	 * safe to read.</div><div class='add'>+	 */</div><div class='add'>+	return (fw_mod_type != FW_PORT_MOD_TYPE_NONE &amp;&amp;</div><div class='add'>+		fw_mod_type != FW_PORT_MOD_TYPE_ERROR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxgb4_get_module_info(struct net_device *dev,</div><div class='ctx'> 				 struct ethtool_modinfo *modinfo)</div><div class='ctx'> {</div><div class='hunk'>@@ -1448,7 +2011,7 @@ static int cxgb4_get_module_info(struct net_device *dev,</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (!t4_is_inserted_mod_type(pi-&gt;mod_type))</div><div class='add'>+	if (!cxgb4_fw_mod_type_info_available(pi-&gt;mod_type))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='ctx'> 	switch (pi-&gt;port_type) {</div><div class='hunk'>@@ -1466,12 +2029,15 @@ static int cxgb4_get_module_info(struct net_device *dev,</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		if (!sff8472_comp || (sff_diag_type &amp; 4)) {</div><div class='add'>+		if (!sff8472_comp || (sff_diag_type &amp; SFP_DIAG_ADDRMODE)) {</div><div class='ctx'> 			modinfo-&gt;type = ETH_MODULE_SFF_8079;</div><div class='ctx'> 			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8079_LEN;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			modinfo-&gt;type = ETH_MODULE_SFF_8472;</div><div class='del'>-			modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8472_LEN;</div><div class='add'>+			if (sff_diag_type &amp; SFP_DIAG_IMPLEMENTED)</div><div class='add'>+				modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8472_LEN;</div><div class='add'>+			else</div><div class='add'>+				modinfo-&gt;eeprom_len = ETH_MODULE_SFF_8472_LEN / 2;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='hunk'>@@ -1565,7 +2131,49 @@ static int cxgb4_set_priv_flags(struct net_device *netdev, u32 flags)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cxgb4_lb_test(struct net_device *netdev, u64 *lb_status)</div><div class='add'>+{</div><div class='add'>+	int dev_state = netif_running(netdev);</div><div class='add'>+</div><div class='add'>+	if (dev_state) {</div><div class='add'>+		netif_tx_stop_all_queues(netdev);</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*lb_status = cxgb4_selftest_lb_pkt(netdev);</div><div class='add'>+</div><div class='add'>+	if (dev_state) {</div><div class='add'>+		netif_tx_start_all_queues(netdev);</div><div class='add'>+		netif_carrier_on(netdev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_self_test(struct net_device *netdev,</div><div class='add'>+			    struct ethtool_test *eth_test, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev_priv(netdev);</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+</div><div class='add'>+	memset(data, 0, sizeof(u64) * CXGB4_ETHTOOL_MAX_TEST);</div><div class='add'>+</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE) ||</div><div class='add'>+	    !(adap-&gt;flags &amp; CXGB4_FW_OK)) {</div><div class='add'>+		eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (eth_test-&gt;flags &amp; ETH_TEST_FL_OFFLINE)</div><div class='add'>+		cxgb4_lb_test(netdev, &amp;data[CXGB4_ETHTOOL_LB_TEST]);</div><div class='add'>+</div><div class='add'>+	if (data[CXGB4_ETHTOOL_LB_TEST])</div><div class='add'>+		eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops cxgb_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_RX_MAX_FRAMES |</div><div class='add'>+				     ETHTOOL_COALESCE_TX_USECS_IRQ |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,</div><div class='ctx'> 	.get_link_ksettings = get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings = set_link_ksettings,</div><div class='ctx'> 	.get_fecparam      = get_fecparam,</div><div class='hunk'>@@ -1591,9 +2199,12 @@ static const struct ethtool_ops cxgb_ethtool_ops = {</div><div class='ctx'> 	.get_regs_len      = get_regs_len,</div><div class='ctx'> 	.get_regs          = get_regs,</div><div class='ctx'> 	.get_rxnfc         = get_rxnfc,</div><div class='add'>+	.set_rxnfc         = set_rxnfc,</div><div class='ctx'> 	.get_rxfh_indir_size = get_rss_table_size,</div><div class='ctx'> 	.get_rxfh	   = get_rss_table,</div><div class='ctx'> 	.set_rxfh	   = set_rss_table,</div><div class='add'>+	.get_rxfh_fields   = cxgb4_get_rxfh_fields,</div><div class='add'>+	.self_test	   = cxgb4_self_test,</div><div class='ctx'> 	.flash_device      = set_flash,</div><div class='ctx'> 	.get_ts_info       = get_ts_info,</div><div class='ctx'> 	.set_dump          = set_dump,</div><div class='hunk'>@@ -1605,6 +2216,86 @@ static const struct ethtool_ops cxgb_ethtool_ops = {</div><div class='ctx'> 	.set_priv_flags    = cxgb4_set_priv_flags,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void cxgb4_cleanup_ethtool_filters(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_ethtool_filter_info *eth_filter_info;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (!adap-&gt;ethtool_filters)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	eth_filter_info = adap-&gt;ethtool_filters-&gt;port;</div><div class='add'>+</div><div class='add'>+	if (eth_filter_info) {</div><div class='add'>+		for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+			kvfree(eth_filter_info[i].loc_array);</div><div class='add'>+			bitmap_free(eth_filter_info[i].bmap);</div><div class='add'>+		}</div><div class='add'>+		kfree(eth_filter_info);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(adap-&gt;ethtool_filters);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_init_ethtool_filters(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_ethtool_filter_info *eth_filter_info;</div><div class='add'>+	struct cxgb4_ethtool_filter *eth_filter;</div><div class='add'>+	struct tid_info *tids = &amp;adap-&gt;tids;</div><div class='add'>+	u32 nentries, i;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	eth_filter = kzalloc(sizeof(*eth_filter), GFP_KERNEL);</div><div class='add'>+	if (!eth_filter)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	eth_filter_info = kcalloc(adap-&gt;params.nports,</div><div class='add'>+				  sizeof(*eth_filter_info),</div><div class='add'>+				  GFP_KERNEL);</div><div class='add'>+	if (!eth_filter_info) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto free_eth_filter;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eth_filter-&gt;port = eth_filter_info;</div><div class='add'>+</div><div class='add'>+	nentries = tids-&gt;nhpftids + tids-&gt;nftids;</div><div class='add'>+	if (is_hashfilter(adap))</div><div class='add'>+		nentries += tids-&gt;nhash +</div><div class='add'>+			    (adap-&gt;tids.stid_base - adap-&gt;tids.tid_base);</div><div class='add'>+	eth_filter-&gt;nentries = nentries;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+		eth_filter-&gt;port[i].loc_array = kvzalloc(nentries, GFP_KERNEL);</div><div class='add'>+		if (!eth_filter-&gt;port[i].loc_array) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto free_eth_finfo;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		eth_filter-&gt;port[i].bmap = bitmap_zalloc(nentries, GFP_KERNEL);</div><div class='add'>+		if (!eth_filter-&gt;port[i].bmap) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			kvfree(eth_filter-&gt;port[i].loc_array);</div><div class='add'>+			goto free_eth_finfo;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adap-&gt;ethtool_filters = eth_filter;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_eth_finfo:</div><div class='add'>+	while (i-- &gt; 0) {</div><div class='add'>+		bitmap_free(eth_filter-&gt;port[i].bmap);</div><div class='add'>+		kvfree(eth_filter-&gt;port[i].loc_array);</div><div class='add'>+	}</div><div class='add'>+	kfree(eth_filter_info);</div><div class='add'>+</div><div class='add'>+free_eth_filter:</div><div class='add'>+	kfree(eth_filter);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void cxgb4_set_ethtool_ops(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	netdev-&gt;ethtool_ops = &amp;cxgb_ethtool_ops;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c<br/>index 33b2c0c45509..f6f745f5c022 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_fcoe.c</a></div><div class='hunk'>@@ -81,8 +81,7 @@ int cxgb_fcoe_enable(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features |= NETIF_F_FCOE_CRC;</div><div class='ctx'> 	netdev-&gt;vlan_features |= NETIF_F_FCOE_CRC;</div><div class='del'>-	netdev-&gt;features |= NETIF_F_FCOE_MTU;</div><div class='del'>-	netdev-&gt;vlan_features |= NETIF_F_FCOE_MTU;</div><div class='add'>+	netdev-&gt;fcoe_mtu = true;</div><div class='ctx'> </div><div class='ctx'> 	netdev_features_change(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -112,8 +111,7 @@ int cxgb_fcoe_disable(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features &amp;= ~NETIF_F_FCOE_CRC;</div><div class='ctx'> 	netdev-&gt;vlan_features &amp;= ~NETIF_F_FCOE_CRC;</div><div class='del'>-	netdev-&gt;features &amp;= ~NETIF_F_FCOE_MTU;</div><div class='del'>-	netdev-&gt;vlan_features &amp;= ~NETIF_F_FCOE_MTU;</div><div class='add'>+	netdev-&gt;fcoe_mtu = false;</div><div class='ctx'> </div><div class='ctx'> 	netdev_features_change(netdev);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c<br/>index 4107007b6ec4..dd9e68465e69 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c</a></div><div class='hunk'>@@ -145,13 +145,13 @@ static int configure_filter_smac(struct adapter *adap, struct filter_entry *f)</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	/* do a set-tcb for smac-sel and CWR bit.. */</div><div class='del'>-	err = set_tcb_tflag(adap, f, f-&gt;tid, TF_CCTRL_CWR_S, 1, 1);</div><div class='del'>-	if (err)</div><div class='del'>-		goto smac_err;</div><div class='del'>-</div><div class='ctx'> 	err = set_tcb_field(adap, f, f-&gt;tid, TCB_SMAC_SEL_W,</div><div class='ctx'> 			    TCB_SMAC_SEL_V(TCB_SMAC_SEL_M),</div><div class='ctx'> 			    TCB_SMAC_SEL_V(f-&gt;smt-&gt;idx), 1);</div><div class='add'>+	if (err)</div><div class='add'>+		goto smac_err;</div><div class='add'>+</div><div class='add'>+	err = set_tcb_tflag(adap, f, f-&gt;tid, TF_CCTRL_CWR_S, 1, 1);</div><div class='ctx'> 	if (!err)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -165,37 +165,40 @@ static void set_nat_params(struct adapter *adap, struct filter_entry *f,</div><div class='ctx'> 			   unsigned int tid, bool dip, bool sip, bool dp,</div><div class='ctx'> 			   bool sp)</div><div class='ctx'> {</div><div class='add'>+	u8 *nat_lp = (u8 *)&amp;f-&gt;fs.nat_lport;</div><div class='add'>+	u8 *nat_fp = (u8 *)&amp;f-&gt;fs.nat_fport;</div><div class='add'>+</div><div class='ctx'> 	if (dip) {</div><div class='ctx'> 		if (f-&gt;fs.type) {</div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_SND_UNA_RAW_W,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_lip[15] |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[14] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[13] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_lip[12] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_lip[12] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_SND_UNA_RAW_W + 1,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_lip[11] |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[10] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[9] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_lip[8] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_lip[8] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_SND_UNA_RAW_W + 2,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_lip[7] |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[6] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[5] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_lip[4] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_lip[4] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_SND_UNA_RAW_W + 3,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_lip[3] |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[2] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[1] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_lip[0] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_lip[0] &lt;&lt; 24, 1);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_RX_FRAG3_LEN_RAW_W,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_lip[3] |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[2] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_lip[1] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_lip[0] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_lip[0] &lt;&lt; 24, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -205,25 +208,25 @@ static void set_nat_params(struct adapter *adap, struct filter_entry *f,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_fip[15] |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[14] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[13] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_fip[12] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_fip[12] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_RX_FRAG2_PTR_RAW_W + 1,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_fip[11] |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[10] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[9] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_fip[8] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_fip[8] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_RX_FRAG2_PTR_RAW_W + 2,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_fip[7] |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[6] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[5] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_fip[4] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_fip[4] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 			set_tcb_field(adap, f, tid, TCB_RX_FRAG2_PTR_RAW_W + 3,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_fip[3] |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[2] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[1] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_fip[0] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_fip[0] &lt;&lt; 24, 1);</div><div class='ctx'> </div><div class='ctx'> 		} else {</div><div class='ctx'> 			set_tcb_field(adap, f, tid,</div><div class='hunk'>@@ -231,13 +234,14 @@ static void set_nat_params(struct adapter *adap, struct filter_entry *f,</div><div class='ctx'> 				      WORD_MASK, f-&gt;fs.nat_fip[3] |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[2] &lt;&lt; 8 |</div><div class='ctx'> 				      f-&gt;fs.nat_fip[1] &lt;&lt; 16 |</div><div class='del'>-				      f-&gt;fs.nat_fip[0] &lt;&lt; 24, 1);</div><div class='add'>+				      (u64)f-&gt;fs.nat_fip[0] &lt;&lt; 24, 1);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	set_tcb_field(adap, f, tid, TCB_PDU_HDR_LEN_W, WORD_MASK,</div><div class='del'>-		      (dp ? f-&gt;fs.nat_lport : 0) |</div><div class='del'>-		      (sp ? f-&gt;fs.nat_fport &lt;&lt; 16 : 0), 1);</div><div class='add'>+		      (dp ? (nat_lp[1] | nat_lp[0] &lt;&lt; 8) : 0) |</div><div class='add'>+		      (sp ? (nat_fp[1] &lt;&lt; 16 | (u64)nat_fp[0] &lt;&lt; 24) : 0),</div><div class='add'>+		      1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Validate filter spec against configuration done on the card. */</div><div class='hunk'>@@ -248,8 +252,9 @@ static int validate_filter(struct net_device *dev,</div><div class='ctx'> 	u32 fconf, iconf;</div><div class='ctx'> </div><div class='ctx'> 	/* Check for unconfigured fields being used. */</div><div class='del'>-	fconf = adapter-&gt;params.tp.vlan_pri_map;</div><div class='ctx'> 	iconf = adapter-&gt;params.tp.ingress_config;</div><div class='add'>+	fconf = fs-&gt;hash ? adapter-&gt;params.tp.filter_mask :</div><div class='add'>+			   adapter-&gt;params.tp.vlan_pri_map;</div><div class='ctx'> </div><div class='ctx'> 	if (unsupported(fconf, FCOE_F, fs-&gt;val.fcoe, fs-&gt;mask.fcoe) ||</div><div class='ctx'> 	    unsupported(fconf, PORT_F, fs-&gt;val.iport, fs-&gt;mask.iport) ||</div><div class='hunk'>@@ -360,20 +365,22 @@ static int get_filter_count(struct adapter *adapter, unsigned int fidx,</div><div class='ctx'> </div><div class='ctx'> 	tcb_base = t4_read_reg(adapter, TP_CMM_TCB_BASE_A);</div><div class='ctx'> 	if (is_hashfilter(adapter) &amp;&amp; hash) {</div><div class='del'>-		if (fidx &lt; adapter-&gt;tids.ntids) {</div><div class='del'>-			f = adapter-&gt;tids.tid_tab[fidx];</div><div class='del'>-			if (!f)</div><div class='del'>-				return -EINVAL;</div><div class='del'>-		} else {</div><div class='add'>+		if (tid_out_of_range(&amp;adapter-&gt;tids, fidx))</div><div class='ctx'> 			return -E2BIG;</div><div class='del'>-		}</div><div class='add'>+		f = adapter-&gt;tids.tid_tab[fidx - adapter-&gt;tids.tid_base];</div><div class='add'>+		if (!f)</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 	} else {</div><div class='del'>-		if ((fidx != (adapter-&gt;tids.nftids +</div><div class='del'>-			      adapter-&gt;tids.nsftids - 1)) &amp;&amp;</div><div class='del'>-		    fidx &gt;= adapter-&gt;tids.nftids)</div><div class='add'>+		if ((fidx != (adapter-&gt;tids.nftids + adapter-&gt;tids.nsftids +</div><div class='add'>+			      adapter-&gt;tids.nhpftids - 1)) &amp;&amp;</div><div class='add'>+		    fidx &gt;= (adapter-&gt;tids.nftids + adapter-&gt;tids.nhpftids))</div><div class='ctx'> 			return -E2BIG;</div><div class='ctx'> </div><div class='del'>-		f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='add'>+		if (fidx &lt; adapter-&gt;tids.nhpftids)</div><div class='add'>+			f = &amp;adapter-&gt;tids.hpftid_tab[fidx];</div><div class='add'>+		else</div><div class='add'>+			f = &amp;adapter-&gt;tids.ftid_tab[fidx -</div><div class='add'>+						    adapter-&gt;tids.nhpftids];</div><div class='ctx'> 		if (!f-&gt;valid)</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -435,40 +442,248 @@ int cxgb4_get_filter_counters(struct net_device *dev, unsigned int fidx,</div><div class='ctx'> 	return get_filter_count(adapter, fidx, hitcnt, bytecnt, hash);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cxgb4_get_free_ftid(struct net_device *dev, int family)</div><div class='add'>+static bool cxgb4_filter_prio_in_range(struct tid_info *t, u32 idx, u8 nslots,</div><div class='add'>+				       u32 prio)</div><div class='add'>+{</div><div class='add'>+	struct filter_entry *prev_tab, *next_tab, *prev_fe, *next_fe;</div><div class='add'>+	u32 prev_ftid, next_ftid;</div><div class='add'>+</div><div class='add'>+	/* Only insert the rule if both of the following conditions</div><div class='add'>+	 * are met:</div><div class='add'>+	 * 1. The immediate previous rule has priority &lt;= @prio.</div><div class='add'>+	 * 2. The immediate next rule has priority &gt;= @prio.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* High Priority (HPFILTER) region always has higher priority</div><div class='add'>+	 * than normal FILTER region. So, all rules in HPFILTER region</div><div class='add'>+	 * must have prio value &lt;= rules in normal FILTER region.</div><div class='add'>+	 */</div><div class='add'>+	if (idx &lt; t-&gt;nhpftids) {</div><div class='add'>+		/* Don't insert if there's a rule already present at @idx</div><div class='add'>+		 * in HPFILTER region.</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(idx, t-&gt;hpftid_bmap))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		next_tab = t-&gt;hpftid_tab;</div><div class='add'>+		next_ftid = find_next_bit(t-&gt;hpftid_bmap, t-&gt;nhpftids, idx);</div><div class='add'>+		if (next_ftid &gt;= t-&gt;nhpftids) {</div><div class='add'>+			/* No next entry found in HPFILTER region.</div><div class='add'>+			 * See if there's any next entry in normal</div><div class='add'>+			 * FILTER region.</div><div class='add'>+			 */</div><div class='add'>+			next_ftid = find_first_bit(t-&gt;ftid_bmap, t-&gt;nftids);</div><div class='add'>+			if (next_ftid &gt;= t-&gt;nftids)</div><div class='add'>+				next_ftid = idx;</div><div class='add'>+			else</div><div class='add'>+				next_tab = t-&gt;ftid_tab;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Search for the closest previous filter entry in HPFILTER</div><div class='add'>+		 * region. No need to search in normal FILTER region because</div><div class='add'>+		 * there can never be any entry in normal FILTER region whose</div><div class='add'>+		 * prio value is &lt; last entry in HPFILTER region.</div><div class='add'>+		 */</div><div class='add'>+		prev_ftid = find_last_bit(t-&gt;hpftid_bmap, idx);</div><div class='add'>+		if (prev_ftid &gt;= idx)</div><div class='add'>+			prev_ftid = idx;</div><div class='add'>+</div><div class='add'>+		prev_tab = t-&gt;hpftid_tab;</div><div class='add'>+	} else {</div><div class='add'>+		idx -= t-&gt;nhpftids;</div><div class='add'>+</div><div class='add'>+		/* Don't insert if there's a rule already present at @idx</div><div class='add'>+		 * in normal FILTER region.</div><div class='add'>+		 */</div><div class='add'>+		if (test_bit(idx, t-&gt;ftid_bmap))</div><div class='add'>+			return false;</div><div class='add'>+</div><div class='add'>+		prev_tab = t-&gt;ftid_tab;</div><div class='add'>+		prev_ftid = find_last_bit(t-&gt;ftid_bmap, idx);</div><div class='add'>+		if (prev_ftid &gt;= idx) {</div><div class='add'>+			/* No previous entry found in normal FILTER</div><div class='add'>+			 * region. See if there's any previous entry</div><div class='add'>+			 * in HPFILTER region.</div><div class='add'>+			 */</div><div class='add'>+			prev_ftid = find_last_bit(t-&gt;hpftid_bmap, t-&gt;nhpftids);</div><div class='add'>+			if (prev_ftid &gt;= t-&gt;nhpftids)</div><div class='add'>+				prev_ftid = idx;</div><div class='add'>+			else</div><div class='add'>+				prev_tab = t-&gt;hpftid_tab;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Search for the closest next filter entry in normal</div><div class='add'>+		 * FILTER region. No need to search in HPFILTER region</div><div class='add'>+		 * because there can never be any entry in HPFILTER</div><div class='add'>+		 * region whose prio value is &gt; first entry in normal</div><div class='add'>+		 * FILTER region.</div><div class='add'>+		 */</div><div class='add'>+		next_ftid = find_next_bit(t-&gt;ftid_bmap, t-&gt;nftids, idx);</div><div class='add'>+		if (next_ftid &gt;= t-&gt;nftids)</div><div class='add'>+			next_ftid = idx;</div><div class='add'>+</div><div class='add'>+		next_tab = t-&gt;ftid_tab;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	next_fe = &amp;next_tab[next_ftid];</div><div class='add'>+</div><div class='add'>+	/* See if the filter entry belongs to an IPv6 rule, which</div><div class='add'>+	 * occupy 4 slots on T5 and 2 slots on T6. Adjust the</div><div class='add'>+	 * reference to the previously inserted filter entry</div><div class='add'>+	 * accordingly.</div><div class='add'>+	 */</div><div class='add'>+	prev_fe = &amp;prev_tab[prev_ftid &amp; ~(nslots - 1)];</div><div class='add'>+	if (!prev_fe-&gt;fs.type)</div><div class='add'>+		prev_fe = &amp;prev_tab[prev_ftid];</div><div class='add'>+</div><div class='add'>+	if ((prev_fe-&gt;valid &amp;&amp; prev_fe-&gt;fs.tc_prio &gt; prio) ||</div><div class='add'>+	    (next_fe-&gt;valid &amp;&amp; next_fe-&gt;fs.tc_prio &lt; prio))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_get_free_ftid(struct net_device *dev, u8 family, bool hash_en,</div><div class='add'>+			u32 tc_prio)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='ctx'> 	struct tid_info *t = &amp;adap-&gt;tids;</div><div class='del'>-	int ftid;</div><div class='add'>+	u32 bmap_ftid, max_ftid;</div><div class='add'>+	struct filter_entry *f;</div><div class='add'>+	unsigned long *bmap;</div><div class='add'>+	bool found = false;</div><div class='add'>+	u8 i, cnt, n;</div><div class='add'>+	int ftid = 0;</div><div class='add'>+</div><div class='add'>+	/* IPv4 occupy 1 slot. IPv6 occupy 2 slots on T6 and 4 slots</div><div class='add'>+	 * on T5.</div><div class='add'>+	 */</div><div class='add'>+	n = 1;</div><div class='add'>+	if (family == PF_INET6) {</div><div class='add'>+		n++;</div><div class='add'>+		if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &lt; CHELSIO_T6)</div><div class='add'>+			n += 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* There are 3 filter regions available in hardware in</div><div class='add'>+	 * following order of priority:</div><div class='add'>+	 *</div><div class='add'>+	 * 1. High Priority (HPFILTER) region (Highest Priority).</div><div class='add'>+	 * 2. HASH region.</div><div class='add'>+	 * 3. Normal FILTER region (Lowest Priority).</div><div class='add'>+	 *</div><div class='add'>+	 * Entries in HPFILTER and normal FILTER region have index</div><div class='add'>+	 * 0 as the highest priority and the rules will be scanned</div><div class='add'>+	 * in ascending order until either a rule hits or end of</div><div class='add'>+	 * the region is reached.</div><div class='add'>+	 *</div><div class='add'>+	 * All HASH region entries have same priority. The set of</div><div class='add'>+	 * fields to match in headers are pre-determined. The same</div><div class='add'>+	 * set of header match fields must be compulsorily specified</div><div class='add'>+	 * in all the rules wanting to get inserted in HASH region.</div><div class='add'>+	 * Hence, HASH region is an exact-match region. A HASH is</div><div class='add'>+	 * generated for a rule based on the values in the</div><div class='add'>+	 * pre-determined set of header match fields. The generated</div><div class='add'>+	 * HASH serves as an index into the HASH region. There can</div><div class='add'>+	 * never be 2 rules having the same HASH. Hardware will</div><div class='add'>+	 * compute a HASH for every incoming packet based on the</div><div class='add'>+	 * values in the pre-determined set of header match fields</div><div class='add'>+	 * and uses it as an index to check if there's a rule</div><div class='add'>+	 * inserted in the HASH region at the specified index. If</div><div class='add'>+	 * there's a rule inserted, then it's considered as a filter</div><div class='add'>+	 * hit. Otherwise, it's a filter miss and normal FILTER region</div><div class='add'>+	 * is scanned afterwards.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;t-&gt;ftid_lock);</div><div class='del'>-	if (family == PF_INET) {</div><div class='del'>-		ftid = find_first_zero_bit(t-&gt;ftid_bmap, t-&gt;nftids);</div><div class='del'>-		if (ftid &gt;= t-&gt;nftids)</div><div class='del'>-			ftid = -1;</div><div class='del'>-	} else {</div><div class='del'>-		if (is_t6(adap-&gt;params.chip)) {</div><div class='del'>-			ftid = bitmap_find_free_region(t-&gt;ftid_bmap,</div><div class='del'>-						       t-&gt;nftids, 1);</div><div class='del'>-			if (ftid &lt; 0)</div><div class='del'>-				goto out_unlock;</div><div class='del'>-</div><div class='del'>-			/* this is only a lookup, keep the found region</div><div class='del'>-			 * unallocated</div><div class='add'>+</div><div class='add'>+	ftid = (tc_prio &lt;= t-&gt;nhpftids) ? 0 : t-&gt;nhpftids;</div><div class='add'>+	max_ftid = t-&gt;nftids + t-&gt;nhpftids;</div><div class='add'>+	while (ftid &lt; max_ftid) {</div><div class='add'>+		if (ftid &lt; t-&gt;nhpftids) {</div><div class='add'>+			/* If the new rule wants to get inserted into</div><div class='add'>+			 * HPFILTER region, but its prio is greater</div><div class='add'>+			 * than the rule with the highest prio in HASH</div><div class='add'>+			 * region, or if there's not enough slots</div><div class='add'>+			 * available in HPFILTER region, then skip</div><div class='add'>+			 * trying to insert this rule into HPFILTER</div><div class='add'>+			 * region and directly go to the next region.</div><div class='add'>+			 */</div><div class='add'>+			if ((t-&gt;tc_hash_tids_max_prio &amp;&amp;</div><div class='add'>+			     tc_prio &gt; t-&gt;tc_hash_tids_max_prio) ||</div><div class='add'>+			     (ftid + n) &gt; t-&gt;nhpftids) {</div><div class='add'>+				ftid = t-&gt;nhpftids;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			bmap = t-&gt;hpftid_bmap;</div><div class='add'>+			bmap_ftid = ftid;</div><div class='add'>+		} else if (hash_en) {</div><div class='add'>+			/* Ensure priority is &gt;= last rule in HPFILTER</div><div class='add'>+			 * region.</div><div class='ctx'> 			 */</div><div class='del'>-			bitmap_release_region(t-&gt;ftid_bmap, ftid, 1);</div><div class='add'>+			ftid = find_last_bit(t-&gt;hpftid_bmap, t-&gt;nhpftids);</div><div class='add'>+			if (ftid &lt; t-&gt;nhpftids) {</div><div class='add'>+				f = &amp;t-&gt;hpftid_tab[ftid];</div><div class='add'>+				if (f-&gt;valid &amp;&amp; tc_prio &lt; f-&gt;fs.tc_prio)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			/* Ensure priority is &lt;= first rule in normal</div><div class='add'>+			 * FILTER region.</div><div class='add'>+			 */</div><div class='add'>+			ftid = find_first_bit(t-&gt;ftid_bmap, t-&gt;nftids);</div><div class='add'>+			if (ftid &lt; t-&gt;nftids) {</div><div class='add'>+				f = &amp;t-&gt;ftid_tab[ftid];</div><div class='add'>+				if (f-&gt;valid &amp;&amp; tc_prio &gt; f-&gt;fs.tc_prio)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			found = true;</div><div class='add'>+			ftid = t-&gt;nhpftids;</div><div class='add'>+			goto out_unlock;</div><div class='ctx'> 		} else {</div><div class='del'>-			ftid = bitmap_find_free_region(t-&gt;ftid_bmap,</div><div class='del'>-						       t-&gt;nftids, 2);</div><div class='del'>-			if (ftid &lt; 0)</div><div class='del'>-				goto out_unlock;</div><div class='add'>+			/* If the new rule wants to get inserted into</div><div class='add'>+			 * normal FILTER region, but its prio is less</div><div class='add'>+			 * than the rule with the highest prio in HASH</div><div class='add'>+			 * region, then reject the rule.</div><div class='add'>+			 */</div><div class='add'>+			if (t-&gt;tc_hash_tids_max_prio &amp;&amp;</div><div class='add'>+			    tc_prio &lt; t-&gt;tc_hash_tids_max_prio)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (ftid + n &gt; max_ftid)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			bmap = t-&gt;ftid_bmap;</div><div class='add'>+			bmap_ftid = ftid - t-&gt;nhpftids;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-			bitmap_release_region(t-&gt;ftid_bmap, ftid, 2);</div><div class='add'>+		cnt = 0;</div><div class='add'>+		for (i = 0; i &lt; n; i++) {</div><div class='add'>+			if (test_bit(bmap_ftid + i, bmap))</div><div class='add'>+				break;</div><div class='add'>+			cnt++;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (cnt == n) {</div><div class='add'>+			/* Ensure the new rule's prio doesn't conflict</div><div class='add'>+			 * with existing rules.</div><div class='add'>+			 */</div><div class='add'>+			if (cxgb4_filter_prio_in_range(t, ftid, n,</div><div class='add'>+						       tc_prio)) {</div><div class='add'>+				ftid &amp;= ~(n - 1);</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ftid += n;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> out_unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;t-&gt;ftid_lock);</div><div class='del'>-	return ftid;</div><div class='add'>+	return found ? ftid : -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxgb4_set_ftid(struct tid_info *t, int fidx, int family,</div><div class='hunk'>@@ -494,6 +709,24 @@ static int cxgb4_set_ftid(struct tid_info *t, int fidx, int family,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxgb4_set_hpftid(struct tid_info *t, int fidx, int family)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+</div><div class='add'>+	if (test_bit(fidx, t-&gt;hpftid_bmap)) {</div><div class='add'>+		spin_unlock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (family == PF_INET)</div><div class='add'>+		__set_bit(fidx, t-&gt;hpftid_bmap);</div><div class='add'>+	else</div><div class='add'>+		bitmap_allocate_region(t-&gt;hpftid_bmap, fidx, 1);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void cxgb4_clear_ftid(struct tid_info *t, int fidx, int family,</div><div class='ctx'> 			     unsigned int chip_ver)</div><div class='ctx'> {</div><div class='hunk'>@@ -509,14 +742,31 @@ static void cxgb4_clear_ftid(struct tid_info *t, int fidx, int family,</div><div class='ctx'> 	spin_unlock_bh(&amp;t-&gt;ftid_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cxgb4_clear_hpftid(struct tid_info *t, int fidx, int family)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+</div><div class='add'>+	if (family == PF_INET)</div><div class='add'>+		__clear_bit(fidx, t-&gt;hpftid_bmap);</div><div class='add'>+	else</div><div class='add'>+		bitmap_release_region(t-&gt;hpftid_bmap, fidx, 1);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Delete the filter at a specified index. */</div><div class='ctx'> static int del_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> {</div><div class='del'>-	struct filter_entry *f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='ctx'> 	struct fw_filter_wr *fwr;</div><div class='add'>+	struct filter_entry *f;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> </div><div class='add'>+	if (fidx &lt; adapter-&gt;tids.nhpftids)</div><div class='add'>+		f = &amp;adapter-&gt;tids.hpftid_tab[fidx];</div><div class='add'>+	else</div><div class='add'>+		f = &amp;adapter-&gt;tids.ftid_tab[fidx - adapter-&gt;tids.nhpftids];</div><div class='add'>+</div><div class='ctx'> 	len = sizeof(*fwr);</div><div class='ctx'> </div><div class='ctx'> 	skb = alloc_skb(len, GFP_KERNEL);</div><div class='hunk'>@@ -542,10 +792,15 @@ static int del_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'>  */</div><div class='ctx'> int set_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> {</div><div class='del'>-	struct filter_entry *f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='ctx'> 	struct fw_filter2_wr *fwr;</div><div class='add'>+	struct filter_entry *f;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+	if (fidx &lt; adapter-&gt;tids.nhpftids)</div><div class='add'>+		f = &amp;adapter-&gt;tids.hpftid_tab[fidx];</div><div class='add'>+	else</div><div class='add'>+		f = &amp;adapter-&gt;tids.ftid_tab[fidx - adapter-&gt;tids.nhpftids];</div><div class='add'>+</div><div class='ctx'> 	skb = alloc_skb(sizeof(*fwr), GFP_KERNEL);</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -607,6 +862,7 @@ int set_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> 		      FW_FILTER_WR_DIRSTEERHASH_V(f-&gt;fs.dirsteerhash) |</div><div class='ctx'> 		      FW_FILTER_WR_LPBK_V(f-&gt;fs.action == FILTER_SWITCH) |</div><div class='ctx'> 		      FW_FILTER_WR_DMAC_V(f-&gt;fs.newdmac) |</div><div class='add'>+		      FW_FILTER_WR_SMAC_V(f-&gt;fs.newsmac) |</div><div class='ctx'> 		      FW_FILTER_WR_INSVLAN_V(f-&gt;fs.newvlan == VLAN_INSERT ||</div><div class='ctx'> 					     f-&gt;fs.newvlan == VLAN_REWRITE) |</div><div class='ctx'> 		      FW_FILTER_WR_RMVLAN_V(f-&gt;fs.newvlan == VLAN_REMOVE ||</div><div class='hunk'>@@ -624,7 +880,8 @@ int set_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> 		 FW_FILTER_WR_OVLAN_VLD_V(f-&gt;fs.val.ovlan_vld) |</div><div class='ctx'> 		 FW_FILTER_WR_IVLAN_VLDM_V(f-&gt;fs.mask.ivlan_vld) |</div><div class='ctx'> 		 FW_FILTER_WR_OVLAN_VLDM_V(f-&gt;fs.mask.ovlan_vld));</div><div class='del'>-	fwr-&gt;smac_sel = 0;</div><div class='add'>+	if (f-&gt;fs.newsmac)</div><div class='add'>+		fwr-&gt;smac_sel = f-&gt;smt-&gt;idx;</div><div class='ctx'> 	fwr-&gt;rx_chan_rx_rpl_iq =</div><div class='ctx'> 		htons(FW_FILTER_WR_RX_CHAN_V(0) |</div><div class='ctx'> 		      FW_FILTER_WR_RX_RPL_IQ_V(adapter-&gt;sge.fw_evtq.abs_id));</div><div class='hunk'>@@ -655,6 +912,9 @@ int set_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> 	fwr-&gt;fpm = htons(f-&gt;fs.mask.fport);</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;params.filter2_wr_support) {</div><div class='add'>+		u8 *nat_lp = (u8 *)&amp;f-&gt;fs.nat_lport;</div><div class='add'>+		u8 *nat_fp = (u8 *)&amp;f-&gt;fs.nat_fport;</div><div class='add'>+</div><div class='ctx'> 		fwr-&gt;natmode_to_ulp_type =</div><div class='ctx'> 			FW_FILTER2_WR_ULP_TYPE_V(f-&gt;fs.nat_mode ?</div><div class='ctx'> 						 ULP_MODE_TCPDDP :</div><div class='hunk'>@@ -662,8 +922,8 @@ int set_filter_wr(struct adapter *adapter, int fidx)</div><div class='ctx'> 			FW_FILTER2_WR_NATMODE_V(f-&gt;fs.nat_mode);</div><div class='ctx'> 		memcpy(fwr-&gt;newlip, f-&gt;fs.nat_lip, sizeof(fwr-&gt;newlip));</div><div class='ctx'> 		memcpy(fwr-&gt;newfip, f-&gt;fs.nat_fip, sizeof(fwr-&gt;newfip));</div><div class='del'>-		fwr-&gt;newlport = htons(f-&gt;fs.nat_lport);</div><div class='del'>-		fwr-&gt;newfport = htons(f-&gt;fs.nat_fport);</div><div class='add'>+		fwr-&gt;newlport = htons(nat_lp[1] | nat_lp[0] &lt;&lt; 8);</div><div class='add'>+		fwr-&gt;newfport = htons(nat_fp[1] | nat_fp[0] &lt;&lt; 8);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the filter as "pending" and ship off the Filter Work Request.</div><div class='hunk'>@@ -695,10 +955,14 @@ int delete_filter(struct adapter *adapter, unsigned int fidx)</div><div class='ctx'> 	struct filter_entry *f;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	if (fidx &gt;= adapter-&gt;tids.nftids + adapter-&gt;tids.nsftids)</div><div class='add'>+	if (fidx &gt;= adapter-&gt;tids.nftids + adapter-&gt;tids.nsftids +</div><div class='add'>+		    adapter-&gt;tids.nhpftids)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='add'>+	if (fidx &lt; adapter-&gt;tids.nhpftids)</div><div class='add'>+		f = &amp;adapter-&gt;tids.hpftid_tab[fidx];</div><div class='add'>+	else</div><div class='add'>+		f = &amp;adapter-&gt;tids.ftid_tab[fidx - adapter-&gt;tids.nhpftids];</div><div class='ctx'> 	ret = writable_filter(f);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='hunk'>@@ -715,7 +979,7 @@ void clear_filter(struct adapter *adap, struct filter_entry *f)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(f-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	/* If the new or old filter have loopback rewriteing rules then we'll</div><div class='add'>+	/* If the new or old filter have loopback rewriting rules then we'll</div><div class='ctx'> 	 * need to free any existing L2T, SMT, CLIP entries of filter</div><div class='ctx'> 	 * rule.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -726,10 +990,8 @@ void clear_filter(struct adapter *adap, struct filter_entry *f)</div><div class='ctx'> 		cxgb4_smt_release(f-&gt;smt);</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;fs.val.encap_vld &amp;&amp; f-&gt;fs.val.ovlan_vld)</div><div class='del'>-		if (atomic_dec_and_test(&amp;adap-&gt;mps_encap[f-&gt;fs.val.ovlan &amp;</div><div class='del'>-							 0x1ff].refcnt))</div><div class='del'>-			t4_free_encap_mac_filt(adap, pi-&gt;viid,</div><div class='del'>-					       f-&gt;fs.val.ovlan &amp; 0x1ff, 0);</div><div class='add'>+		t4_free_encap_mac_filt(adap, pi-&gt;viid,</div><div class='add'>+				       f-&gt;fs.val.ovlan &amp; 0x1ff, 0);</div><div class='ctx'> </div><div class='ctx'> 	if ((f-&gt;fs.hash || is_t6(adap-&gt;params.chip)) &amp;&amp; f-&gt;fs.type)</div><div class='ctx'> 		cxgb4_clip_release(f-&gt;dev, (const u32 *)&amp;f-&gt;fs.val.lip, 1);</div><div class='hunk'>@@ -746,12 +1008,22 @@ void clear_all_filters(struct adapter *adapter)</div><div class='ctx'> 	struct net_device *dev = adapter-&gt;port[0];</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	if (adapter-&gt;tids.hpftid_tab) {</div><div class='add'>+		struct filter_entry *f = &amp;adapter-&gt;tids.hpftid_tab[0];</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; adapter-&gt;tids.nhpftids; i++, f++)</div><div class='add'>+			if (f-&gt;valid || f-&gt;pending)</div><div class='add'>+				cxgb4_del_filter(dev, i, &amp;f-&gt;fs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (adapter-&gt;tids.ftid_tab) {</div><div class='ctx'> 		struct filter_entry *f = &amp;adapter-&gt;tids.ftid_tab[0];</div><div class='ctx'> 		unsigned int max_ftid = adapter-&gt;tids.nftids +</div><div class='del'>-					adapter-&gt;tids.nsftids;</div><div class='add'>+					adapter-&gt;tids.nsftids +</div><div class='add'>+					adapter-&gt;tids.nhpftids;</div><div class='add'>+</div><div class='ctx'> 		/* Clear all TCAM filters */</div><div class='del'>-		for (i = 0; i &lt; max_ftid; i++, f++)</div><div class='add'>+		for (i = adapter-&gt;tids.nhpftids; i &lt; max_ftid; i++, f++)</div><div class='ctx'> 			if (f-&gt;valid || f-&gt;pending)</div><div class='ctx'> 				cxgb4_del_filter(dev, i, &amp;f-&gt;fs);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -767,15 +1039,15 @@ void clear_all_filters(struct adapter *adapter)</div><div class='ctx'> 				adapter-&gt;tids.tid_tab[i];</div><div class='ctx'> </div><div class='ctx'> 			if (f &amp;&amp; (f-&gt;valid || f-&gt;pending))</div><div class='del'>-				cxgb4_del_filter(dev, i, &amp;f-&gt;fs);</div><div class='add'>+				cxgb4_del_filter(dev, f-&gt;tid, &amp;f-&gt;fs);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		sb = t4_read_reg(adapter, LE_DB_SRVR_START_INDEX_A);</div><div class='add'>+		sb = adapter-&gt;tids.stid_base;</div><div class='ctx'> 		for (i = 0; i &lt; sb; i++) {</div><div class='ctx'> 			f = (struct filter_entry *)adapter-&gt;tids.tid_tab[i];</div><div class='ctx'> </div><div class='ctx'> 			if (f &amp;&amp; (f-&gt;valid || f-&gt;pending))</div><div class='del'>-				cxgb4_del_filter(dev, i, &amp;f-&gt;fs);</div><div class='add'>+				cxgb4_del_filter(dev, f-&gt;tid, &amp;f-&gt;fs);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -807,6 +1079,12 @@ static void fill_default_mask(struct ch_filter_specification *fs)</div><div class='ctx'> 		fs-&gt;mask.tos |= ~0;</div><div class='ctx'> 	if (fs-&gt;val.proto &amp;&amp; !fs-&gt;mask.proto)</div><div class='ctx'> 		fs-&gt;mask.proto |= ~0;</div><div class='add'>+	if (fs-&gt;val.pfvf_vld &amp;&amp; !fs-&gt;mask.pfvf_vld)</div><div class='add'>+		fs-&gt;mask.pfvf_vld |= ~0;</div><div class='add'>+	if (fs-&gt;val.pf &amp;&amp; !fs-&gt;mask.pf)</div><div class='add'>+		fs-&gt;mask.pf |= ~0;</div><div class='add'>+	if (fs-&gt;val.vf &amp;&amp; !fs-&gt;mask.vf)</div><div class='add'>+		fs-&gt;mask.vf |= ~0;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(fs-&gt;val.lip); i++) {</div><div class='ctx'> 		lip |= fs-&gt;val.lip[i];</div><div class='hunk'>@@ -833,16 +1111,16 @@ static bool is_addr_all_mask(u8 *ipmask, int family)</div><div class='ctx'> 		struct in_addr *addr;</div><div class='ctx'> </div><div class='ctx'> 		addr = (struct in_addr *)ipmask;</div><div class='del'>-		if (addr-&gt;s_addr == 0xffffffff)</div><div class='add'>+		if (addr-&gt;s_addr == htonl(0xffffffff))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	} else if (family == AF_INET6) {</div><div class='ctx'> 		struct in6_addr *addr6;</div><div class='ctx'> </div><div class='ctx'> 		addr6 = (struct in6_addr *)ipmask;</div><div class='del'>-		if (addr6-&gt;s6_addr32[0] == 0xffffffff &amp;&amp;</div><div class='del'>-		    addr6-&gt;s6_addr32[1] == 0xffffffff &amp;&amp;</div><div class='del'>-		    addr6-&gt;s6_addr32[2] == 0xffffffff &amp;&amp;</div><div class='del'>-		    addr6-&gt;s6_addr32[3] == 0xffffffff)</div><div class='add'>+		if (addr6-&gt;s6_addr32[0] == htonl(0xffffffff) &amp;&amp;</div><div class='add'>+		    addr6-&gt;s6_addr32[1] == htonl(0xffffffff) &amp;&amp;</div><div class='add'>+		    addr6-&gt;s6_addr32[2] == htonl(0xffffffff) &amp;&amp;</div><div class='add'>+		    addr6-&gt;s6_addr32[3] == htonl(0xffffffff))</div><div class='ctx'> 			return true;</div><div class='ctx'> 	}</div><div class='ctx'> 	return false;</div><div class='hunk'>@@ -880,6 +1158,11 @@ bool is_filter_exact_match(struct adapter *adap,</div><div class='ctx'> 	if (!is_hashfilter(adap))</div><div class='ctx'> 		return false;</div><div class='ctx'> </div><div class='add'>+	if ((atomic_read(&amp;adap-&gt;tids.hash_tids_in_use) +</div><div class='add'>+	     atomic_read(&amp;adap-&gt;tids.tids_in_use)) &gt;=</div><div class='add'>+	    (adap-&gt;tids.nhash + (adap-&gt;tids.stid_base - adap-&gt;tids.tid_base)))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='ctx'> 	 /* Keep tunnel VNI match disabled for hash-filters for now */</div><div class='ctx'> 	if (fs-&gt;mask.encap_vld)</div><div class='ctx'> 		return false;</div><div class='hunk'>@@ -961,7 +1244,8 @@ static u64 hash_filter_ntuple(struct ch_filter_specification *fs,</div><div class='ctx'> 	 * in the Compressed Filter Tuple.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (tp-&gt;vlan_shift &gt;= 0 &amp;&amp; fs-&gt;mask.ivlan)</div><div class='del'>-		ntuple |= (FT_VLAN_VLD_F | fs-&gt;val.ivlan) &lt;&lt; tp-&gt;vlan_shift;</div><div class='add'>+		ntuple |= (u64)(FT_VLAN_VLD_F |</div><div class='add'>+				fs-&gt;val.ivlan) &lt;&lt; tp-&gt;vlan_shift;</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;port_shift &gt;= 0 &amp;&amp; fs-&gt;mask.iport)</div><div class='ctx'> 		ntuple |= (u64)fs-&gt;val.iport &lt;&lt; tp-&gt;port_shift;</div><div class='hunk'>@@ -1041,12 +1325,9 @@ static void mk_act_open_req6(struct filter_entry *f, struct sk_buff *skb,</div><div class='ctx'> 			    RSS_QUEUE_V(f-&gt;fs.iq) |</div><div class='ctx'> 			    TX_QUEUE_V(f-&gt;fs.nat_mode) |</div><div class='ctx'> 			    T5_OPT_2_VALID_F |</div><div class='del'>-			    RX_CHANNEL_F |</div><div class='del'>-			    CONG_CNTRL_V((f-&gt;fs.action == FILTER_DROP) |</div><div class='del'>-					 (f-&gt;fs.dirsteer &lt;&lt; 1)) |</div><div class='add'>+			    RX_CHANNEL_V(cxgb4_port_e2cchan(f-&gt;dev)) |</div><div class='ctx'> 			    PACE_V((f-&gt;fs.maskhash) |</div><div class='del'>-				   ((f-&gt;fs.dirsteerhash) &lt;&lt; 1)) |</div><div class='del'>-			    CCTRL_ECN_V(f-&gt;fs.action == FILTER_SWITCH));</div><div class='add'>+				   ((f-&gt;fs.dirsteerhash) &lt;&lt; 1)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void mk_act_open_req(struct filter_entry *f, struct sk_buff *skb,</div><div class='hunk'>@@ -1081,12 +1362,9 @@ static void mk_act_open_req(struct filter_entry *f, struct sk_buff *skb,</div><div class='ctx'> 			    RSS_QUEUE_V(f-&gt;fs.iq) |</div><div class='ctx'> 			    TX_QUEUE_V(f-&gt;fs.nat_mode) |</div><div class='ctx'> 			    T5_OPT_2_VALID_F |</div><div class='del'>-			    RX_CHANNEL_F |</div><div class='del'>-			    CONG_CNTRL_V((f-&gt;fs.action == FILTER_DROP) |</div><div class='del'>-					 (f-&gt;fs.dirsteer &lt;&lt; 1)) |</div><div class='add'>+			    RX_CHANNEL_V(cxgb4_port_e2cchan(f-&gt;dev)) |</div><div class='ctx'> 			    PACE_V((f-&gt;fs.maskhash) |</div><div class='del'>-				   ((f-&gt;fs.dirsteerhash) &lt;&lt; 1)) |</div><div class='del'>-			    CCTRL_ECN_V(f-&gt;fs.action == FILTER_SWITCH));</div><div class='add'>+				   ((f-&gt;fs.dirsteerhash) &lt;&lt; 1)));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxgb4_set_hash_filter(struct net_device *dev,</div><div class='hunk'>@@ -1164,7 +1442,7 @@ static int cxgb4_set_hash_filter(struct net_device *dev,</div><div class='ctx'> 	} else if (iconf &amp; USE_ENC_IDX_F) {</div><div class='ctx'> 		if (f-&gt;fs.val.encap_vld) {</div><div class='ctx'> 			struct port_info *pi = netdev_priv(f-&gt;dev);</div><div class='del'>-			u8 match_all_mac[] = { 0, 0, 0, 0, 0, 0 };</div><div class='add'>+			static const u8 match_all_mac[] = { 0, 0, 0, 0, 0, 0 };</div><div class='ctx'> </div><div class='ctx'> 			/* allocate MPS TCAM entry */</div><div class='ctx'> 			ret = t4_alloc_encap_mac_filt(adapter, pi-&gt;viid,</div><div class='hunk'>@@ -1176,7 +1454,6 @@ static int cxgb4_set_hash_filter(struct net_device *dev,</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='ctx'> 				goto free_atid;</div><div class='ctx'> </div><div class='del'>-			atomic_inc(&amp;adapter-&gt;mps_encap[ret].refcnt);</div><div class='ctx'> 			f-&gt;fs.val.ovlan = ret;</div><div class='ctx'> 			f-&gt;fs.mask.ovlan = 0xffff;</div><div class='ctx'> 			f-&gt;fs.val.ovlan_vld = 1;</div><div class='hunk'>@@ -1249,17 +1526,17 @@ out_err:</div><div class='ctx'>  * filter specification in order to facilitate signaling completion of the</div><div class='ctx'>  * operation.</div><div class='ctx'>  */</div><div class='del'>-int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='add'>+int __cxgb4_set_filter(struct net_device *dev, int ftid,</div><div class='ctx'> 		       struct ch_filter_specification *fs,</div><div class='ctx'> 		       struct filter_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='del'>-	unsigned int chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='del'>-	unsigned int max_fidx, fidx;</div><div class='del'>-	struct filter_entry *f;</div><div class='add'>+	unsigned int max_fidx, fidx, chip_ver;</div><div class='add'>+	int iq, ret, filter_id = ftid;</div><div class='add'>+	struct filter_entry *f, *tab;</div><div class='ctx'> 	u32 iconf;</div><div class='del'>-	int iq, ret;</div><div class='ctx'> </div><div class='add'>+	chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='ctx'> 	if (fs-&gt;hash) {</div><div class='ctx'> 		if (is_hashfilter(adapter))</div><div class='ctx'> 			return cxgb4_set_hash_filter(dev, fs, ctx);</div><div class='hunk'>@@ -1268,7 +1545,7 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	max_fidx = adapter-&gt;tids.nftids;</div><div class='add'>+	max_fidx = adapter-&gt;tids.nftids + adapter-&gt;tids.nhpftids;</div><div class='ctx'> 	if (filter_id != (max_fidx + adapter-&gt;tids.nsftids - 1) &amp;&amp;</div><div class='ctx'> 	    filter_id &gt;= max_fidx)</div><div class='ctx'> 		return -E2BIG;</div><div class='hunk'>@@ -1283,6 +1560,13 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 	if (iq &lt; 0)</div><div class='ctx'> 		return iq;</div><div class='ctx'> </div><div class='add'>+	if (fs-&gt;prio) {</div><div class='add'>+		tab = &amp;adapter-&gt;tids.hpftid_tab[0];</div><div class='add'>+	} else {</div><div class='add'>+		tab = &amp;adapter-&gt;tids.ftid_tab[0];</div><div class='add'>+		filter_id = ftid - adapter-&gt;tids.nhpftids;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* IPv6 filters occupy four slots and must be aligned on</div><div class='ctx'> 	 * four-slot boundaries.  IPv4 filters only occupy a single</div><div class='ctx'> 	 * slot and have no alignment requirements but writing a new</div><div class='hunk'>@@ -1303,9 +1587,8 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 		else</div><div class='ctx'> 			fidx = filter_id &amp; ~0x1;</div><div class='ctx'> </div><div class='del'>-		if (fidx != filter_id &amp;&amp;</div><div class='del'>-		    adapter-&gt;tids.ftid_tab[fidx].fs.type) {</div><div class='del'>-			f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='add'>+		if (fidx != filter_id &amp;&amp; tab[fidx].fs.type) {</div><div class='add'>+			f = &amp;tab[fidx];</div><div class='ctx'> 			if (f-&gt;valid) {</div><div class='ctx'> 				dev_err(adapter-&gt;pdev_dev,</div><div class='ctx'> 					"Invalid location. IPv6 requires 4 slots and is occupying slots %u to %u\n",</div><div class='hunk'>@@ -1329,7 +1612,7 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 			 */</div><div class='ctx'> 			for (fidx = filter_id + 1; fidx &lt; filter_id + 4;</div><div class='ctx'> 			     fidx++) {</div><div class='del'>-				f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='add'>+				f = &amp;tab[fidx];</div><div class='ctx'> 				if (f-&gt;valid) {</div><div class='ctx'> 					dev_err(adapter-&gt;pdev_dev,</div><div class='ctx'> 						"Invalid location.  IPv6 requires 4 slots and an IPv4 filter exists at %u\n",</div><div class='hunk'>@@ -1345,7 +1628,7 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			/* Check overlapping IPv4 filter slot */</div><div class='ctx'> 			fidx = filter_id + 1;</div><div class='del'>-			f = &amp;adapter-&gt;tids.ftid_tab[fidx];</div><div class='add'>+			f = &amp;tab[fidx];</div><div class='ctx'> 			if (f-&gt;valid) {</div><div class='ctx'> 				pr_err("%s: IPv6 filter requires 2 indices. IPv4 filter already present at %d. Please remove IPv4 filter first.\n",</div><div class='ctx'> 				       __func__, fidx);</div><div class='hunk'>@@ -1357,36 +1640,35 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 	/* Check to make sure that provided filter index is not</div><div class='ctx'> 	 * already in use by someone else</div><div class='ctx'> 	 */</div><div class='del'>-	f = &amp;adapter-&gt;tids.ftid_tab[filter_id];</div><div class='add'>+	f = &amp;tab[filter_id];</div><div class='ctx'> 	if (f-&gt;valid)</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	fidx = filter_id + adapter-&gt;tids.ftid_base;</div><div class='del'>-	ret = cxgb4_set_ftid(&amp;adapter-&gt;tids, filter_id,</div><div class='del'>-			     fs-&gt;type ? PF_INET6 : PF_INET,</div><div class='del'>-			     chip_ver);</div><div class='add'>+	if (fs-&gt;prio) {</div><div class='add'>+		fidx = filter_id + adapter-&gt;tids.hpftid_base;</div><div class='add'>+		ret = cxgb4_set_hpftid(&amp;adapter-&gt;tids, filter_id,</div><div class='add'>+				       fs-&gt;type ? PF_INET6 : PF_INET);</div><div class='add'>+	} else {</div><div class='add'>+		fidx = filter_id + adapter-&gt;tids.ftid_base;</div><div class='add'>+		ret = cxgb4_set_ftid(&amp;adapter-&gt;tids, filter_id,</div><div class='add'>+				     fs-&gt;type ? PF_INET6 : PF_INET,</div><div class='add'>+				     chip_ver);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Check t  make sure the filter requested is writable ... */</div><div class='ctx'> 	ret = writable_filter(f);</div><div class='del'>-	if (ret) {</div><div class='del'>-		/* Clear the bits we have set above */</div><div class='del'>-		cxgb4_clear_ftid(&amp;adapter-&gt;tids, filter_id,</div><div class='del'>-				 fs-&gt;type ? PF_INET6 : PF_INET,</div><div class='del'>-				 chip_ver);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_tid;</div><div class='ctx'> </div><div class='ctx'> 	if (is_t6(adapter-&gt;params.chip) &amp;&amp; fs-&gt;type &amp;&amp;</div><div class='ctx'> 	    ipv6_addr_type((const struct in6_addr *)fs-&gt;val.lip) !=</div><div class='ctx'> 	    IPV6_ADDR_ANY) {</div><div class='ctx'> 		ret = cxgb4_clip_get(dev, (const u32 *)&amp;fs-&gt;val.lip, 1);</div><div class='del'>-		if (ret) {</div><div class='del'>-			cxgb4_clear_ftid(&amp;adapter-&gt;tids, filter_id, PF_INET6,</div><div class='del'>-					 chip_ver);</div><div class='del'>-			return ret;</div><div class='del'>-		}</div><div class='add'>+		if (ret)</div><div class='add'>+			goto free_tid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Convert the filter specification into our internal format.</div><div class='hunk'>@@ -1407,7 +1689,7 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 	} else if (iconf &amp; USE_ENC_IDX_F) {</div><div class='ctx'> 		if (f-&gt;fs.val.encap_vld) {</div><div class='ctx'> 			struct port_info *pi = netdev_priv(f-&gt;dev);</div><div class='del'>-			u8 match_all_mac[] = { 0, 0, 0, 0, 0, 0 };</div><div class='add'>+			static const u8 match_all_mac[] = { 0, 0, 0, 0, 0, 0 };</div><div class='ctx'> </div><div class='ctx'> 			/* allocate MPS TCAM entry */</div><div class='ctx'> 			ret = t4_alloc_encap_mac_filt(adapter, pi-&gt;viid,</div><div class='hunk'>@@ -1417,9 +1699,8 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 						      f-&gt;fs.mask.vni,</div><div class='ctx'> 						      0, 1, 1);</div><div class='ctx'> 			if (ret &lt; 0)</div><div class='del'>-				goto free_clip;</div><div class='add'>+				goto free_tid;</div><div class='ctx'> </div><div class='del'>-			atomic_inc(&amp;adapter-&gt;mps_encap[ret].refcnt);</div><div class='ctx'> 			f-&gt;fs.val.ovlan = ret;</div><div class='ctx'> 			f-&gt;fs.mask.ovlan = 0x1ff;</div><div class='ctx'> 			f-&gt;fs.val.ovlan_vld = 1;</div><div class='hunk'>@@ -1432,21 +1713,22 @@ int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 	 */</div><div class='ctx'> 	f-&gt;ctx = ctx;</div><div class='ctx'> 	f-&gt;tid = fidx; /* Save the actual tid */</div><div class='del'>-	ret = set_filter_wr(adapter, filter_id);</div><div class='del'>-	if (ret) {</div><div class='add'>+	ret = set_filter_wr(adapter, ftid);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_tid;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+</div><div class='add'>+free_tid:</div><div class='add'>+	if (f-&gt;fs.prio)</div><div class='add'>+		cxgb4_clear_hpftid(&amp;adapter-&gt;tids, filter_id,</div><div class='add'>+				   fs-&gt;type ? PF_INET6 : PF_INET);</div><div class='add'>+	else</div><div class='ctx'> 		cxgb4_clear_ftid(&amp;adapter-&gt;tids, filter_id,</div><div class='ctx'> 				 fs-&gt;type ? PF_INET6 : PF_INET,</div><div class='ctx'> 				 chip_ver);</div><div class='del'>-		clear_filter(adapter, f);</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-free_clip:</div><div class='del'>-	if (is_t6(adapter-&gt;params.chip) &amp;&amp; f-&gt;fs.type)</div><div class='del'>-		cxgb4_clip_release(f-&gt;dev, (const u32 *)&amp;f-&gt;fs.val.lip, 1);</div><div class='del'>-	cxgb4_clear_ftid(&amp;adapter-&gt;tids, filter_id,</div><div class='del'>-			 fs-&gt;type ? PF_INET6 : PF_INET, chip_ver);</div><div class='add'>+	clear_filter(adapter, f);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1468,7 +1750,7 @@ static int cxgb4_del_hash_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 	netdev_dbg(dev, "%s: filter_id = %d ; nftids = %d\n",</div><div class='ctx'> 		   __func__, filter_id, adapter-&gt;tids.nftids);</div><div class='ctx'> </div><div class='del'>-	if (filter_id &gt; adapter-&gt;tids.ntids)</div><div class='add'>+	if (tid_out_of_range(t, filter_id))</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='ctx'> 	f = lookup_tid(t, filter_id);</div><div class='hunk'>@@ -1521,11 +1803,11 @@ int __cxgb4_del_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 		       struct filter_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='del'>-	unsigned int chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='add'>+	unsigned int max_fidx, chip_ver;</div><div class='ctx'> 	struct filter_entry *f;</div><div class='del'>-	unsigned int max_fidx;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='add'>+	chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='ctx'> 	if (fs &amp;&amp; fs-&gt;hash) {</div><div class='ctx'> 		if (is_hashfilter(adapter))</div><div class='ctx'> 			return cxgb4_del_hash_filter(dev, filter_id, ctx);</div><div class='hunk'>@@ -1534,21 +1816,31 @@ int __cxgb4_del_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	max_fidx = adapter-&gt;tids.nftids;</div><div class='add'>+	max_fidx = adapter-&gt;tids.nftids + adapter-&gt;tids.nhpftids;</div><div class='ctx'> 	if (filter_id != (max_fidx + adapter-&gt;tids.nsftids - 1) &amp;&amp;</div><div class='ctx'> 	    filter_id &gt;= max_fidx)</div><div class='ctx'> 		return -E2BIG;</div><div class='ctx'> </div><div class='del'>-	f = &amp;adapter-&gt;tids.ftid_tab[filter_id];</div><div class='add'>+	if (filter_id &lt; adapter-&gt;tids.nhpftids)</div><div class='add'>+		f = &amp;adapter-&gt;tids.hpftid_tab[filter_id];</div><div class='add'>+	else</div><div class='add'>+		f = &amp;adapter-&gt;tids.ftid_tab[filter_id - adapter-&gt;tids.nhpftids];</div><div class='add'>+</div><div class='ctx'> 	ret = writable_filter(f);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;valid) {</div><div class='ctx'> 		f-&gt;ctx = ctx;</div><div class='del'>-		cxgb4_clear_ftid(&amp;adapter-&gt;tids, filter_id,</div><div class='del'>-				 f-&gt;fs.type ? PF_INET6 : PF_INET,</div><div class='del'>-				 chip_ver);</div><div class='add'>+		if (f-&gt;fs.prio)</div><div class='add'>+			cxgb4_clear_hpftid(&amp;adapter-&gt;tids,</div><div class='add'>+					   f-&gt;tid - adapter-&gt;tids.hpftid_base,</div><div class='add'>+					   f-&gt;fs.type ? PF_INET6 : PF_INET);</div><div class='add'>+		else</div><div class='add'>+			cxgb4_clear_ftid(&amp;adapter-&gt;tids,</div><div class='add'>+					 f-&gt;tid - adapter-&gt;tids.ftid_base,</div><div class='add'>+					 f-&gt;fs.type ? PF_INET6 : PF_INET,</div><div class='add'>+					 chip_ver);</div><div class='ctx'> 		return del_filter_wr(adapter, filter_id);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1613,13 +1905,16 @@ out:</div><div class='ctx'> static int configure_filter_tcb(struct adapter *adap, unsigned int tid,</div><div class='ctx'> 				struct filter_entry *f)</div><div class='ctx'> {</div><div class='del'>-	if (f-&gt;fs.hitcnts)</div><div class='add'>+	if (f-&gt;fs.hitcnts) {</div><div class='ctx'> 		set_tcb_field(adap, f, tid, TCB_TIMESTAMP_W,</div><div class='del'>-			      TCB_TIMESTAMP_V(TCB_TIMESTAMP_M) |</div><div class='add'>+			      TCB_TIMESTAMP_V(TCB_TIMESTAMP_M),</div><div class='add'>+			      TCB_TIMESTAMP_V(0ULL),</div><div class='add'>+			      1);</div><div class='add'>+		set_tcb_field(adap, f, tid, TCB_RTT_TS_RECENT_AGE_W,</div><div class='ctx'> 			      TCB_RTT_TS_RECENT_AGE_V(TCB_RTT_TS_RECENT_AGE_M),</div><div class='del'>-			      TCB_TIMESTAMP_V(0ULL) |</div><div class='ctx'> 			      TCB_RTT_TS_RECENT_AGE_V(0ULL),</div><div class='ctx'> 			      1);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (f-&gt;fs.newdmac)</div><div class='ctx'> 		set_tcb_tflag(adap, f, tid, TF_CCTRL_ECE_S, 1,</div><div class='hunk'>@@ -1741,6 +2036,20 @@ void hash_filter_rpl(struct adapter *adap, const struct cpl_act_open_rpl *rpl)</div><div class='ctx'> 			}</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='add'>+		switch (f-&gt;fs.action) {</div><div class='add'>+		case FILTER_PASS:</div><div class='add'>+			if (f-&gt;fs.dirsteer)</div><div class='add'>+				set_tcb_tflag(adap, f, tid,</div><div class='add'>+					      TF_DIRECT_STEER_S, 1, 1);</div><div class='add'>+			break;</div><div class='add'>+		case FILTER_DROP:</div><div class='add'>+			set_tcb_tflag(adap, f, tid, TF_DROP_S, 1, 1);</div><div class='add'>+			break;</div><div class='add'>+		case FILTER_SWITCH:</div><div class='add'>+			set_tcb_tflag(adap, f, tid, TF_LPBK_S, 1, 1);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		break;</div><div class='ctx'> </div><div class='ctx'> 	default:</div><div class='hunk'>@@ -1773,11 +2082,18 @@ void filter_rpl(struct adapter *adap, const struct cpl_set_tcb_rpl *rpl)</div><div class='ctx'> 	max_fidx = adap-&gt;tids.nftids + adap-&gt;tids.nsftids;</div><div class='ctx'> 	/* Get the corresponding filter entry for this tid */</div><div class='ctx'> 	if (adap-&gt;tids.ftid_tab) {</div><div class='del'>-		/* Check this in normal filter region */</div><div class='del'>-		idx = tid - adap-&gt;tids.ftid_base;</div><div class='del'>-		if (idx &gt;= max_fidx)</div><div class='del'>-			return;</div><div class='del'>-		f = &amp;adap-&gt;tids.ftid_tab[idx];</div><div class='add'>+		idx = tid - adap-&gt;tids.hpftid_base;</div><div class='add'>+		if (idx &lt; adap-&gt;tids.nhpftids) {</div><div class='add'>+			f = &amp;adap-&gt;tids.hpftid_tab[idx];</div><div class='add'>+		} else {</div><div class='add'>+			/* Check this in normal filter region */</div><div class='add'>+			idx = tid - adap-&gt;tids.ftid_base;</div><div class='add'>+			if (idx &gt;= max_fidx)</div><div class='add'>+				return;</div><div class='add'>+			f = &amp;adap-&gt;tids.ftid_tab[idx];</div><div class='add'>+			idx += adap-&gt;tids.nhpftids;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		if (f-&gt;tid != tid)</div><div class='ctx'> 			return;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1801,22 +2117,11 @@ void filter_rpl(struct adapter *adap, const struct cpl_set_tcb_rpl *rpl)</div><div class='ctx'> 			if (ctx)</div><div class='ctx'> 				ctx-&gt;result = 0;</div><div class='ctx'> 		} else if (ret == FW_FILTER_WR_FLT_ADDED) {</div><div class='del'>-			int err = 0;</div><div class='del'>-</div><div class='del'>-			if (f-&gt;fs.newsmac)</div><div class='del'>-				err = configure_filter_smac(adap, f);</div><div class='del'>-</div><div class='del'>-			if (!err) {</div><div class='del'>-				f-&gt;pending = 0;  /* async setup completed */</div><div class='del'>-				f-&gt;valid = 1;</div><div class='del'>-				if (ctx) {</div><div class='del'>-					ctx-&gt;result = 0;</div><div class='del'>-					ctx-&gt;tid = idx;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				clear_filter(adap, f);</div><div class='del'>-				if (ctx)</div><div class='del'>-					ctx-&gt;result = err;</div><div class='add'>+			f-&gt;pending = 0;  /* async setup completed */</div><div class='add'>+			f-&gt;valid = 1;</div><div class='add'>+			if (ctx) {</div><div class='add'>+				ctx-&gt;result = 0;</div><div class='add'>+				ctx-&gt;tid = idx;</div><div class='ctx'> 			}</div><div class='ctx'> 		} else {</div><div class='ctx'> 			/* Something went wrong.  Issue a warning about the</div><div class='hunk'>@@ -1833,24 +2138,38 @@ void filter_rpl(struct adapter *adap, const struct cpl_set_tcb_rpl *rpl)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int init_hash_filter(struct adapter *adap)</div><div class='add'>+void init_hash_filter(struct adapter *adap)</div><div class='ctx'> {</div><div class='add'>+	u32 reg;</div><div class='add'>+</div><div class='ctx'> 	/* On T6, verify the necessary register configs and warn the user in</div><div class='ctx'> 	 * case of improper config</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (is_t6(adap-&gt;params.chip)) {</div><div class='del'>-		if (TCAM_ACTV_HIT_G(t4_read_reg(adap, LE_DB_RSP_CODE_0_A)) != 4)</div><div class='del'>-			goto err;</div><div class='add'>+		if (is_offload(adap)) {</div><div class='add'>+			if (!(t4_read_reg(adap, TP_GLOBAL_CONFIG_A)</div><div class='add'>+			   &amp; ACTIVEFILTERCOUNTS_F)) {</div><div class='add'>+				dev_err(adap-&gt;pdev_dev, "Invalid hash filter + ofld config\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		} else {</div><div class='add'>+			reg = t4_read_reg(adap, LE_DB_RSP_CODE_0_A);</div><div class='add'>+			if (TCAM_ACTV_HIT_G(reg) != 4) {</div><div class='add'>+				dev_err(adap-&gt;pdev_dev, "Invalid hash filter config\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			reg = t4_read_reg(adap, LE_DB_RSP_CODE_1_A);</div><div class='add'>+			if (HASH_ACTV_HIT_G(reg) != 4) {</div><div class='add'>+				dev_err(adap-&gt;pdev_dev, "Invalid hash filter config\n");</div><div class='add'>+				return;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> </div><div class='del'>-		if (HASH_ACTV_HIT_G(t4_read_reg(adap, LE_DB_RSP_CODE_1_A)) != 4)</div><div class='del'>-			goto err;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "Hash filter supported only on T6\n");</div><div class='del'>-		return -EINVAL;</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	adap-&gt;params.hash_filter = 1;</div><div class='del'>-	return 0;</div><div class='del'>-err:</div><div class='del'>-	dev_warn(adap-&gt;pdev_dev, "Invalid hash filter config!\n");</div><div class='del'>-	return -EINVAL;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h<br/>index 8db5fca6dcc9..807a8dafec45 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.h</a></div><div class='hunk'>@@ -50,7 +50,9 @@ int delete_filter(struct adapter *adapter, unsigned int fidx);</div><div class='ctx'> </div><div class='ctx'> int writable_filter(struct filter_entry *f);</div><div class='ctx'> void clear_all_filters(struct adapter *adapter);</div><div class='del'>-int init_hash_filter(struct adapter *adap);</div><div class='add'>+void init_hash_filter(struct adapter *adap);</div><div class='ctx'> bool is_filter_exact_match(struct adapter *adap,</div><div class='ctx'> 			   struct ch_filter_specification *fs);</div><div class='add'>+void cxgb4_cleanup_ethtool_filters(struct adapter *adap);</div><div class='add'>+int cxgb4_init_ethtool_filters(struct adapter *adap);</div><div class='ctx'> #endif /* __CXGB4_FILTER_H */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c<br/>index 715e4edcf4a2..043733c5c812 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c</a></div><div class='hunk'>@@ -51,7 +51,6 @@</div><div class='ctx'> #include &lt;linux/mutex.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/rtnetlink.h&gt;</div><div class='ctx'> #include &lt;linux/sched.h&gt;</div><div class='ctx'> #include &lt;linux/seq_file.h&gt;</div><div class='hunk'>@@ -65,6 +64,10 @@</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;net/udp_tunnel.h&gt;</div><div class='add'>+#include &lt;net/xfrm.h&gt;</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #include "cxgb4.h"</div><div class='ctx'> #include "cxgb4_filter.h"</div><div class='hunk'>@@ -82,16 +85,13 @@</div><div class='ctx'> #include "sched.h"</div><div class='ctx'> #include "cxgb4_tc_u32.h"</div><div class='ctx'> #include "cxgb4_tc_flower.h"</div><div class='add'>+#include "cxgb4_tc_mqprio.h"</div><div class='add'>+#include "cxgb4_tc_matchall.h"</div><div class='ctx'> #include "cxgb4_ptp.h"</div><div class='ctx'> #include "cxgb4_cudbg.h"</div><div class='ctx'> </div><div class='ctx'> char cxgb4_driver_name[] = KBUILD_MODNAME;</div><div class='ctx'> </div><div class='del'>-#ifdef DRV_VERSION</div><div class='del'>-#undef DRV_VERSION</div><div class='del'>-#endif</div><div class='del'>-#define DRV_VERSION "2.0.0-ko"</div><div class='del'>-const char cxgb4_driver_version[] = DRV_VERSION;</div><div class='ctx'> #define DRV_DESC "Chelsio T4/T5/T6 Network Driver"</div><div class='ctx'> </div><div class='ctx'> #define DFLT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | \</div><div class='hunk'>@@ -134,7 +134,6 @@ const char cxgb4_driver_version[] = DRV_VERSION;</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESC);</div><div class='ctx'> MODULE_AUTHOR("Chelsio Communications");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cxgb4_pci_tbl);</div><div class='ctx'> MODULE_FIRMWARE(FW4_FNAME);</div><div class='ctx'> MODULE_FIRMWARE(FW5_FNAME);</div><div class='hunk'>@@ -183,6 +182,9 @@ static struct dentry *cxgb4_debugfs_root;</div><div class='ctx'> </div><div class='ctx'> LIST_HEAD(adapter_list);</div><div class='ctx'> DEFINE_MUTEX(uld_mutex);</div><div class='add'>+LIST_HEAD(uld_list);</div><div class='add'>+</div><div class='add'>+static int cfg_queues(struct adapter *adap);</div><div class='ctx'> </div><div class='ctx'> static void link_report(struct net_device *dev)</div><div class='ctx'> {</div><div class='hunk'>@@ -366,13 +368,19 @@ static int cxgb4_mac_sync(struct net_device *netdev, const u8 *mac_addr)</div><div class='ctx'> 	int ret;</div><div class='ctx'> 	u64 mhash = 0;</div><div class='ctx'> 	u64 uhash = 0;</div><div class='add'>+	/* idx stores the index of allocated filters,</div><div class='add'>+	 * its size should be modified based on the number of</div><div class='add'>+	 * MAC addresses that we allocate filters for</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	u16 idx[1] = {};</div><div class='ctx'> 	bool free = false;</div><div class='ctx'> 	bool ucast = is_unicast_ether_addr(mac_addr);</div><div class='ctx'> 	const u8 *maclist[1] = {mac_addr};</div><div class='ctx'> 	struct hash_mac_addr *new_entry;</div><div class='ctx'> </div><div class='del'>-	ret = t4_alloc_mac_filt(adap, adap-&gt;mbox, pi-&gt;viid, free, 1, maclist,</div><div class='del'>-				NULL, ucast ? &amp;uhash : &amp;mhash, false);</div><div class='add'>+	ret = cxgb4_alloc_mac_filt(adap, pi-&gt;viid, free, 1, maclist,</div><div class='add'>+				   idx, ucast ? &amp;uhash : &amp;mhash, false);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	/* if hash != 0, then add the addr to hash addr list</div><div class='hunk'>@@ -410,7 +418,7 @@ static int cxgb4_mac_unsync(struct net_device *netdev, const u8 *mac_addr)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = t4_free_mac_filt(adap, adap-&gt;mbox, pi-&gt;viid, 1, maclist, false);</div><div class='add'>+	ret = cxgb4_free_mac_filt(adap, pi-&gt;viid, 1, maclist, false);</div><div class='ctx'> 	return ret &lt; 0 ? -EINVAL : 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -426,8 +434,8 @@ static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)</div><div class='ctx'> 	__dev_uc_sync(dev, cxgb4_mac_sync, cxgb4_mac_unsync);</div><div class='ctx'> 	__dev_mc_sync(dev, cxgb4_mac_sync, cxgb4_mac_unsync);</div><div class='ctx'> </div><div class='del'>-	return t4_set_rxmode(adapter, adapter-&gt;mbox, pi-&gt;viid, mtu,</div><div class='del'>-			     (dev-&gt;flags &amp; IFF_PROMISC) ? 1 : 0,</div><div class='add'>+	return t4_set_rxmode(adapter, adapter-&gt;mbox, pi-&gt;viid, pi-&gt;viid_mirror,</div><div class='add'>+			     mtu, (dev-&gt;flags &amp; IFF_PROMISC) ? 1 : 0,</div><div class='ctx'> 			     (dev-&gt;flags &amp; IFF_ALLMULTI) ? 1 : 0, 1, -1,</div><div class='ctx'> 			     sleep_ok);</div><div class='ctx'> }</div><div class='hunk'>@@ -440,7 +448,7 @@ static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)</div><div class='ctx'>  *		   or -1</div><div class='ctx'>  *	@addr: the new MAC address value</div><div class='ctx'>  *	@persist: whether a new MAC allocation should be persistent</div><div class='del'>- *	@add_smt: if true also add the address to the HW SMT</div><div class='add'>+ *	@smt_idx: the destination to store the new SMT index.</div><div class='ctx'>  *</div><div class='ctx'>  *	Modifies an MPS filter and sets it to the new MAC address if</div><div class='ctx'>  *	@tcam_idx &gt;= 0, or adds the MAC address to a new filter if</div><div class='hunk'>@@ -449,9 +457,9 @@ static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)</div><div class='ctx'>  *	Addresses are programmed to hash region, if tcam runs out of entries.</div><div class='ctx'>  *</div><div class='ctx'>  */</div><div class='del'>-static int cxgb4_change_mac(struct port_info *pi, unsigned int viid,</div><div class='del'>-			    int *tcam_idx, const u8 *addr, bool persist,</div><div class='del'>-			    u8 *smt_idx)</div><div class='add'>+int cxgb4_change_mac(struct port_info *pi, unsigned int viid,</div><div class='add'>+		     int *tcam_idx, const u8 *addr, bool persist,</div><div class='add'>+		     u8 *smt_idx)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='ctx'> 	struct hash_mac_addr *entry, *new_entry;</div><div class='hunk'>@@ -494,19 +502,20 @@ set_hash:</div><div class='ctx'>  */</div><div class='ctx'> static int link_start(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='del'>-	unsigned int mb = pi-&gt;adapter-&gt;pf;</div><div class='add'>+	unsigned int mb = pi-&gt;adapter-&gt;mbox;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * We do not set address filters and promiscuity here, the stack does</div><div class='ctx'> 	 * that step explicitly.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = t4_set_rxmode(pi-&gt;adapter, mb, pi-&gt;viid, dev-&gt;mtu, -1, -1, -1,</div><div class='add'>+	ret = t4_set_rxmode(pi-&gt;adapter, mb, pi-&gt;viid, pi-&gt;viid_mirror,</div><div class='add'>+			    dev-&gt;mtu, -1, -1, -1,</div><div class='ctx'> 			    !!(dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX), true);</div><div class='ctx'> 	if (ret == 0)</div><div class='del'>-		ret = cxgb4_change_mac(pi, pi-&gt;viid, &amp;pi-&gt;xact_addr_filt,</div><div class='del'>-				       dev-&gt;dev_addr, true, &amp;pi-&gt;smt_idx);</div><div class='add'>+		ret = cxgb4_update_mac_filt(pi, pi-&gt;viid, &amp;pi-&gt;xact_addr_filt,</div><div class='add'>+					    dev-&gt;dev_addr, true, &amp;pi-&gt;smt_idx);</div><div class='ctx'> 	if (ret == 0)</div><div class='ctx'> 		ret = t4_link_l1cfg(pi-&gt;adapter, mb, pi-&gt;tx_chan,</div><div class='ctx'> 				    &amp;pi-&gt;link_cfg);</div><div class='hunk'>@@ -677,69 +686,165 @@ static irqreturn_t t4_nondata_intr(int irq, void *cookie)</div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Name the MSI-X interrupts.</div><div class='del'>- */</div><div class='del'>-static void name_msix_vecs(struct adapter *adap)</div><div class='add'>+int cxgb4_set_msix_aff(struct adapter *adap, unsigned short vec,</div><div class='add'>+		       cpumask_var_t *aff_mask, int idx)</div><div class='ctx'> {</div><div class='del'>-	int i, j, msi_idx = 2, n = sizeof(adap-&gt;msix_info[0].desc);</div><div class='add'>+	int rv;</div><div class='ctx'> </div><div class='del'>-	/* non-data interrupts */</div><div class='del'>-	snprintf(adap-&gt;msix_info[0].desc, n, "%s", adap-&gt;port[0]-&gt;name);</div><div class='add'>+	if (!zalloc_cpumask_var(aff_mask, GFP_KERNEL)) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "alloc_cpumask_var failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	/* FW events */</div><div class='del'>-	snprintf(adap-&gt;msix_info[1].desc, n, "%s-FWeventq",</div><div class='del'>-		 adap-&gt;port[0]-&gt;name);</div><div class='add'>+	cpumask_set_cpu(cpumask_local_spread(idx, dev_to_node(adap-&gt;pdev_dev)),</div><div class='add'>+			*aff_mask);</div><div class='ctx'> </div><div class='del'>-	/* Ethernet queues */</div><div class='del'>-	for_each_port(adap, j) {</div><div class='del'>-		struct net_device *d = adap-&gt;port[j];</div><div class='del'>-		const struct port_info *pi = netdev_priv(d);</div><div class='add'>+	rv = irq_set_affinity_hint(vec, *aff_mask);</div><div class='add'>+	if (rv)</div><div class='add'>+		dev_warn(adap-&gt;pdev_dev,</div><div class='add'>+			 "irq_set_affinity_hint %u failed %d\n",</div><div class='add'>+			 vec, rv);</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; pi-&gt;nqsets; i++, msi_idx++)</div><div class='del'>-			snprintf(adap-&gt;msix_info[msi_idx].desc, n, "%s-Rx%d",</div><div class='del'>-				 d-&gt;name, i);</div><div class='del'>-	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_clear_msix_aff(unsigned short vec, cpumask_var_t aff_mask)</div><div class='add'>+{</div><div class='add'>+	irq_set_affinity_hint(vec, NULL);</div><div class='add'>+	free_cpumask_var(aff_mask);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int request_msix_queue_irqs(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	struct msix_info *minfo;</div><div class='ctx'> 	int err, ethqidx;</div><div class='del'>-	int msi_index = 2;</div><div class='ctx'> </div><div class='del'>-	err = request_irq(adap-&gt;msix_info[1].vec, t4_sge_intr_msix, 0,</div><div class='del'>-			  adap-&gt;msix_info[1].desc, &amp;s-&gt;fw_evtq);</div><div class='add'>+	if (s-&gt;fwevtq_msix_idx &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = request_irq(adap-&gt;msix_info[s-&gt;fwevtq_msix_idx].vec,</div><div class='add'>+			  t4_sge_intr_msix, 0,</div><div class='add'>+			  adap-&gt;msix_info[s-&gt;fwevtq_msix_idx].desc,</div><div class='add'>+			  &amp;s-&gt;fw_evtq);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	for_each_ethrxq(s, ethqidx) {</div><div class='del'>-		err = request_irq(adap-&gt;msix_info[msi_index].vec,</div><div class='add'>+		minfo = s-&gt;ethrxq[ethqidx].msix;</div><div class='add'>+		err = request_irq(minfo-&gt;vec,</div><div class='ctx'> 				  t4_sge_intr_msix, 0,</div><div class='del'>-				  adap-&gt;msix_info[msi_index].desc,</div><div class='add'>+				  minfo-&gt;desc,</div><div class='ctx'> 				  &amp;s-&gt;ethrxq[ethqidx].rspq);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unwind;</div><div class='del'>-		msi_index++;</div><div class='add'>+</div><div class='add'>+		cxgb4_set_msix_aff(adap, minfo-&gt;vec,</div><div class='add'>+				   &amp;minfo-&gt;aff_mask, ethqidx);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> unwind:</div><div class='del'>-	while (--ethqidx &gt;= 0)</div><div class='del'>-		free_irq(adap-&gt;msix_info[--msi_index].vec,</div><div class='del'>-			 &amp;s-&gt;ethrxq[ethqidx].rspq);</div><div class='del'>-	free_irq(adap-&gt;msix_info[1].vec, &amp;s-&gt;fw_evtq);</div><div class='add'>+	while (--ethqidx &gt;= 0) {</div><div class='add'>+		minfo = s-&gt;ethrxq[ethqidx].msix;</div><div class='add'>+		cxgb4_clear_msix_aff(minfo-&gt;vec, minfo-&gt;aff_mask);</div><div class='add'>+		free_irq(minfo-&gt;vec, &amp;s-&gt;ethrxq[ethqidx].rspq);</div><div class='add'>+	}</div><div class='add'>+	free_irq(adap-&gt;msix_info[s-&gt;fwevtq_msix_idx].vec, &amp;s-&gt;fw_evtq);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_msix_queue_irqs(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	int i, msi_index = 2;</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	struct msix_info *minfo;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	free_irq(adap-&gt;msix_info[s-&gt;fwevtq_msix_idx].vec, &amp;s-&gt;fw_evtq);</div><div class='add'>+	for_each_ethrxq(s, i) {</div><div class='add'>+		minfo = s-&gt;ethrxq[i].msix;</div><div class='add'>+		cxgb4_clear_msix_aff(minfo-&gt;vec, minfo-&gt;aff_mask);</div><div class='add'>+		free_irq(minfo-&gt;vec, &amp;s-&gt;ethrxq[i].rspq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int setup_ppod_edram(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	unsigned int param, val;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Driver sends FW_PARAMS_PARAM_DEV_PPOD_EDRAM read command to check</div><div class='add'>+	 * if firmware supports ppod edram feature or not. If firmware</div><div class='add'>+	 * returns 1, then driver can enable this feature by sending</div><div class='add'>+	 * FW_PARAMS_PARAM_DEV_PPOD_EDRAM write command with value 1 to</div><div class='add'>+	 * enable ppod edram feature.</div><div class='add'>+	 */</div><div class='add'>+	param = (FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) |</div><div class='add'>+		FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_PPOD_EDRAM));</div><div class='add'>+</div><div class='add'>+	ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1, &amp;param, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_warn(adap-&gt;pdev_dev,</div><div class='add'>+			 "querying PPOD_EDRAM support failed: %d\n",</div><div class='add'>+			 ret);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (val != 1)</div><div class='add'>+		return -1;</div><div class='ctx'> </div><div class='del'>-	free_irq(adap-&gt;msix_info[1].vec, &amp;s-&gt;fw_evtq);</div><div class='del'>-	for_each_ethrxq(s, i)</div><div class='del'>-		free_irq(adap-&gt;msix_info[msi_index++].vec, &amp;s-&gt;ethrxq[i].rspq);</div><div class='add'>+	ret = t4_set_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1, &amp;param, &amp;val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"setting PPOD_EDRAM failed: %d\n", ret);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void adap_config_hpfilter(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 param, val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* Enable HP filter region. Older fw will fail this request and</div><div class='add'>+	 * it is fine.</div><div class='add'>+	 */</div><div class='add'>+	param = FW_PARAM_DEV(HPFILTER_REGION_SUPPORT);</div><div class='add'>+	ret = t4_set_params(adapter, adapter-&gt;mbox, adapter-&gt;pf, 0,</div><div class='add'>+			    1, &amp;param, &amp;val);</div><div class='add'>+</div><div class='add'>+	/* An error means FW doesn't know about HP filter support,</div><div class='add'>+	 * it's not a problem, don't return an error.</div><div class='add'>+	 */</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"HP filter region isn't supported by FW\n");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_config_rss(const struct port_info *pi, u16 *rss,</div><div class='add'>+			    u16 rss_size, u16 viid)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = t4_config_rss_range(adap, adap-&gt;mbox, viid, 0, rss_size, rss,</div><div class='add'>+				  rss_size);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* If Tunnel All Lookup isn't specified in the global RSS</div><div class='add'>+	 * Configuration, then we need to specify a default Ingress</div><div class='add'>+	 * Queue for any ingress packets which aren't hashed.  We'll</div><div class='add'>+	 * use our first ingress queue ...</div><div class='add'>+	 */</div><div class='add'>+	return t4_config_vi_rss(adap, adap-&gt;mbox, viid,</div><div class='add'>+				FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN_F |</div><div class='add'>+				FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F |</div><div class='add'>+				FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN_F |</div><div class='add'>+				FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F |</div><div class='add'>+				FW_RSS_VI_CONFIG_CMD_UDPEN_F,</div><div class='add'>+				rss[0]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -753,10 +858,10 @@ static void free_msix_queue_irqs(struct adapter *adap)</div><div class='ctx'>  */</div><div class='ctx'> int cxgb4_write_rss(const struct port_info *pi, const u16 *queues)</div><div class='ctx'> {</div><div class='del'>-	u16 *rss;</div><div class='del'>-	int i, err;</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='ctx'> 	const struct sge_eth_rxq *rxq;</div><div class='add'>+	int i, err;</div><div class='add'>+	u16 *rss;</div><div class='ctx'> </div><div class='ctx'> 	rxq = &amp;adapter-&gt;sge.ethrxq[pi-&gt;first_qset];</div><div class='ctx'> 	rss = kmalloc_array(pi-&gt;rss_size, sizeof(u16), GFP_KERNEL);</div><div class='hunk'>@@ -767,21 +872,7 @@ int cxgb4_write_rss(const struct port_info *pi, const u16 *queues)</div><div class='ctx'> 	for (i = 0; i &lt; pi-&gt;rss_size; i++, queues++)</div><div class='ctx'> 		rss[i] = rxq[*queues].rspq.abs_id;</div><div class='ctx'> </div><div class='del'>-	err = t4_config_rss_range(adapter, adapter-&gt;pf, pi-&gt;viid, 0,</div><div class='del'>-				  pi-&gt;rss_size, rss, pi-&gt;rss_size);</div><div class='del'>-	/* If Tunnel All Lookup isn't specified in the global RSS</div><div class='del'>-	 * Configuration, then we need to specify a default Ingress</div><div class='del'>-	 * Queue for any ingress packets which aren't hashed.  We'll</div><div class='del'>-	 * use our first ingress queue ...</div><div class='del'>-	 */</div><div class='del'>-	if (!err)</div><div class='del'>-		err = t4_config_vi_rss(adapter, adapter-&gt;mbox, pi-&gt;viid,</div><div class='del'>-				       FW_RSS_VI_CONFIG_CMD_IP6FOURTUPEN_F |</div><div class='del'>-				       FW_RSS_VI_CONFIG_CMD_IP6TWOTUPEN_F |</div><div class='del'>-				       FW_RSS_VI_CONFIG_CMD_IP4FOURTUPEN_F |</div><div class='del'>-				       FW_RSS_VI_CONFIG_CMD_IP4TWOTUPEN_F |</div><div class='del'>-				       FW_RSS_VI_CONFIG_CMD_UDPEN_F,</div><div class='del'>-				       rss[0]);</div><div class='add'>+	err = cxgb4_config_rss(pi, rss, pi-&gt;rss_size, pi-&gt;viid);</div><div class='ctx'> 	kfree(rss);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -819,6 +910,12 @@ static unsigned int rxq_to_chan(const struct sge *p, unsigned int qid)</div><div class='ctx'> 	return netdev2pinfo(p-&gt;ingr_map[qid]-&gt;netdev)-&gt;tx_chan;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void cxgb4_quiesce_rx(struct sge_rspq *q)</div><div class='add'>+{</div><div class='add'>+	if (q-&gt;handler)</div><div class='add'>+		napi_disable(&amp;q-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Wait until all NAPI handlers are descheduled.</div><div class='ctx'>  */</div><div class='hunk'>@@ -829,19 +926,24 @@ static void quiesce_rx(struct adapter *adap)</div><div class='ctx'> 	for (i = 0; i &lt; adap-&gt;sge.ingr_sz; i++) {</div><div class='ctx'> 		struct sge_rspq *q = adap-&gt;sge.ingr_map[i];</div><div class='ctx'> </div><div class='del'>-		if (q &amp;&amp; q-&gt;handler)</div><div class='del'>-			napi_disable(&amp;q-&gt;napi);</div><div class='add'>+		if (!q)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cxgb4_quiesce_rx(q);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Disable interrupt and napi handler */</div><div class='ctx'> static void disable_interrupts(struct adapter *adap)</div><div class='ctx'> {</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+</div><div class='ctx'> 	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE) {</div><div class='ctx'> 		t4_intr_disable(adap);</div><div class='ctx'> 		if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='ctx'> 			free_msix_queue_irqs(adap);</div><div class='del'>-			free_irq(adap-&gt;msix_info[0].vec, adap);</div><div class='add'>+			free_irq(adap-&gt;msix_info[s-&gt;nd_msix_idx].vec,</div><div class='add'>+				 adap);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			free_irq(adap-&gt;pdev-&gt;irq, adap);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -849,6 +951,17 @@ static void disable_interrupts(struct adapter *adap)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void cxgb4_enable_rx(struct adapter *adap, struct sge_rspq *q)</div><div class='add'>+{</div><div class='add'>+	if (q-&gt;handler)</div><div class='add'>+		napi_enable(&amp;q-&gt;napi);</div><div class='add'>+</div><div class='add'>+	/* 0-increment GTS to start the timer and enable interrupts */</div><div class='add'>+	t4_write_reg(adap, MYPF_REG(SGE_PF_GTS_A),</div><div class='add'>+		     SEINTARM_V(q-&gt;intr_params) |</div><div class='add'>+		     INGRESSQID_V(q-&gt;cntxt_id));</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Enable NAPI scheduling and interrupt generation for all Rx queues.</div><div class='ctx'>  */</div><div class='hunk'>@@ -861,37 +974,63 @@ static void enable_rx(struct adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 		if (!q)</div><div class='ctx'> 			continue;</div><div class='del'>-		if (q-&gt;handler)</div><div class='del'>-			napi_enable(&amp;q-&gt;napi);</div><div class='ctx'> </div><div class='del'>-		/* 0-increment GTS to start the timer and enable interrupts */</div><div class='del'>-		t4_write_reg(adap, MYPF_REG(SGE_PF_GTS_A),</div><div class='del'>-			     SEINTARM_V(q-&gt;intr_params) |</div><div class='del'>-			     INGRESSQID_V(q-&gt;cntxt_id));</div><div class='add'>+		cxgb4_enable_rx(adap, q);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int setup_non_data_intr(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	int msix;</div><div class='add'>+</div><div class='add'>+	adap-&gt;sge.nd_msix_idx = -1;</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_USING_MSIX))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Request MSI-X vector for non-data interrupt */</div><div class='add'>+	msix = cxgb4_get_msix_idx_from_bmap(adap);</div><div class='add'>+	if (msix &lt; 0)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	snprintf(adap-&gt;msix_info[msix].desc,</div><div class='add'>+		 sizeof(adap-&gt;msix_info[msix].desc),</div><div class='add'>+		 "%s", adap-&gt;port[0]-&gt;name);</div><div class='add'>+</div><div class='add'>+	adap-&gt;sge.nd_msix_idx = msix;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static int setup_fw_sge_queues(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='del'>-	int err = 0;</div><div class='add'>+	int msix, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	bitmap_zero(s-&gt;starving_fl, s-&gt;egr_sz);</div><div class='ctx'> 	bitmap_zero(s-&gt;txq_maperr, s-&gt;egr_sz);</div><div class='ctx'> </div><div class='del'>-	if (adap-&gt;flags &amp; CXGB4_USING_MSIX)</div><div class='del'>-		adap-&gt;msi_idx = 1;         /* vector 0 is for non-queue interrupts */</div><div class='del'>-	else {</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+		s-&gt;fwevtq_msix_idx = -1;</div><div class='add'>+		msix = cxgb4_get_msix_idx_from_bmap(adap);</div><div class='add'>+		if (msix &lt; 0)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		snprintf(adap-&gt;msix_info[msix].desc,</div><div class='add'>+			 sizeof(adap-&gt;msix_info[msix].desc),</div><div class='add'>+			 "%s-FWeventq", adap-&gt;port[0]-&gt;name);</div><div class='add'>+	} else {</div><div class='ctx'> 		err = t4_sge_alloc_rxq(adap, &amp;s-&gt;intrq, false, adap-&gt;port[0], 0,</div><div class='ctx'> 				       NULL, NULL, NULL, -1);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='del'>-		adap-&gt;msi_idx = -((int)s-&gt;intrq.abs_id + 1);</div><div class='add'>+		msix = -((int)s-&gt;intrq.abs_id + 1);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = t4_sge_alloc_rxq(adap, &amp;s-&gt;fw_evtq, true, adap-&gt;port[0],</div><div class='del'>-			       adap-&gt;msi_idx, NULL, fwevtq_handler, NULL, -1);</div><div class='add'>+			       msix, NULL, fwevtq_handler, NULL, -1);</div><div class='add'>+	if (err &amp;&amp; msix &gt;= 0)</div><div class='add'>+		cxgb4_free_msix_idx_in_bmap(adap, msix);</div><div class='add'>+</div><div class='add'>+	s-&gt;fwevtq_msix_idx = msix;</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -905,14 +1044,17 @@ static int setup_fw_sge_queues(struct adapter *adap)</div><div class='ctx'>  */</div><div class='ctx'> static int setup_sge_queues(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	int err, i, j;</div><div class='del'>-	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 	struct sge_uld_rxq_info *rxq_info = NULL;</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 	unsigned int cmplqid = 0;</div><div class='add'>+	int err, i, j, msix = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (is_uld(adap))</div><div class='ctx'> 		rxq_info = s-&gt;uld_rxq_info[CXGB4_ULD_RDMA];</div><div class='ctx'> </div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_USING_MSIX))</div><div class='add'>+		msix = -((int)s-&gt;intrq.abs_id + 1);</div><div class='add'>+</div><div class='ctx'> 	for_each_port(adap, i) {</div><div class='ctx'> 		struct net_device *dev = adap-&gt;port[i];</div><div class='ctx'> 		struct port_info *pi = netdev_priv(dev);</div><div class='hunk'>@@ -920,10 +1062,21 @@ static int setup_sge_queues(struct adapter *adap)</div><div class='ctx'> 		struct sge_eth_txq *t = &amp;s-&gt;ethtxq[pi-&gt;first_qset];</div><div class='ctx'> </div><div class='ctx'> 		for (j = 0; j &lt; pi-&gt;nqsets; j++, q++) {</div><div class='del'>-			if (adap-&gt;msi_idx &gt; 0)</div><div class='del'>-				adap-&gt;msi_idx++;</div><div class='add'>+			if (msix &gt;= 0) {</div><div class='add'>+				msix = cxgb4_get_msix_idx_from_bmap(adap);</div><div class='add'>+				if (msix &lt; 0) {</div><div class='add'>+					err = msix;</div><div class='add'>+					goto freeout;</div><div class='add'>+				}</div><div class='add'>+</div><div class='add'>+				snprintf(adap-&gt;msix_info[msix].desc,</div><div class='add'>+					 sizeof(adap-&gt;msix_info[msix].desc),</div><div class='add'>+					 "%s-Rx%d", dev-&gt;name, j);</div><div class='add'>+				q-&gt;msix = &amp;adap-&gt;msix_info[msix];</div><div class='add'>+			}</div><div class='add'>+</div><div class='ctx'> 			err = t4_sge_alloc_rxq(adap, &amp;q-&gt;rspq, false, dev,</div><div class='del'>-					       adap-&gt;msi_idx, &amp;q-&gt;fl,</div><div class='add'>+					       msix, &amp;q-&gt;fl,</div><div class='ctx'> 					       t4_ethrx_handler,</div><div class='ctx'> 					       NULL,</div><div class='ctx'> 					       t4_get_tp_ch_map(adap,</div><div class='hunk'>@@ -1010,6 +1163,25 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* CONFIG_CHELSIO_T4_DCB */</div><div class='ctx'> </div><div class='add'>+	if (dev-&gt;num_tc) {</div><div class='add'>+		struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+		u8 ver, proto;</div><div class='add'>+</div><div class='add'>+		ver = ip_hdr(skb)-&gt;version;</div><div class='add'>+		proto = (ver == 6) ? ipv6_hdr(skb)-&gt;nexthdr :</div><div class='add'>+				     ip_hdr(skb)-&gt;protocol;</div><div class='add'>+</div><div class='add'>+		/* Send unsupported traffic pattern to normal NIC queues. */</div><div class='add'>+		txq = netdev_pick_tx(dev, skb, sb_dev);</div><div class='add'>+		if (xfrm_offload(skb) || is_ptp_enabled(skb, dev) ||</div><div class='add'>+		    skb-&gt;encapsulation ||</div><div class='add'>+		    tls_is_skb_tx_device_offloaded(skb) ||</div><div class='add'>+		    (proto != IPPROTO_TCP &amp;&amp; proto != IPPROTO_UDP))</div><div class='add'>+			txq = txq % pi-&gt;nqsets;</div><div class='add'>+</div><div class='add'>+		return txq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (select_queue) {</div><div class='ctx'> 		txq = (skb_rx_queue_recorded(skb)</div><div class='ctx'> 			? skb_get_rx_queue(skb)</div><div class='hunk'>@@ -1099,15 +1271,15 @@ int cxgb4_set_rspq_intr_params(struct sge_rspq *q,</div><div class='ctx'> </div><div class='ctx'> static int cxgb_set_features(struct net_device *dev, netdev_features_t features)</div><div class='ctx'> {</div><div class='del'>-	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	netdev_features_t changed = dev-&gt;features ^ features;</div><div class='add'>+	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!(changed &amp; NETIF_F_HW_VLAN_CTAG_RX))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = t4_set_rxmode(pi-&gt;adapter, pi-&gt;adapter-&gt;pf, pi-&gt;viid, -1,</div><div class='del'>-			    -1, -1, -1,</div><div class='add'>+	err = t4_set_rxmode(pi-&gt;adapter, pi-&gt;adapter-&gt;mbox, pi-&gt;viid,</div><div class='add'>+			    pi-&gt;viid_mirror, -1, -1, -1, -1,</div><div class='ctx'> 			    !!(features &amp; NETIF_F_HW_VLAN_CTAG_RX), true);</div><div class='ctx'> 	if (unlikely(err))</div><div class='ctx'> 		dev-&gt;features = features ^ NETIF_F_HW_VLAN_CTAG_RX;</div><div class='hunk'>@@ -1125,6 +1297,292 @@ static int setup_debugfs(struct adapter *adap)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void cxgb4_port_mirror_free_rxq(struct adapter *adap,</div><div class='add'>+				       struct sge_eth_rxq *mirror_rxq)</div><div class='add'>+{</div><div class='add'>+	if ((adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE) &amp;&amp;</div><div class='add'>+	    !(adap-&gt;flags &amp; CXGB4_SHUTTING_DOWN))</div><div class='add'>+		cxgb4_quiesce_rx(&amp;mirror_rxq-&gt;rspq);</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+		cxgb4_clear_msix_aff(mirror_rxq-&gt;msix-&gt;vec,</div><div class='add'>+				     mirror_rxq-&gt;msix-&gt;aff_mask);</div><div class='add'>+		free_irq(mirror_rxq-&gt;msix-&gt;vec, &amp;mirror_rxq-&gt;rspq);</div><div class='add'>+		cxgb4_free_msix_idx_in_bmap(adap, mirror_rxq-&gt;msix-&gt;idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_rspq_fl(adap, &amp;mirror_rxq-&gt;rspq, &amp;mirror_rxq-&gt;fl);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_port_mirror_alloc_queues(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_eth_rxq *mirror_rxq;</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	int ret = 0, msix = 0;</div><div class='add'>+	u16 i, rxqid;</div><div class='add'>+	u16 *rss;</div><div class='add'>+</div><div class='add'>+	if (!pi-&gt;vi_mirror_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;mirror_rxq[pi-&gt;port_id])</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	mirror_rxq = kcalloc(pi-&gt;nmirrorqsets, sizeof(*mirror_rxq), GFP_KERNEL);</div><div class='add'>+	if (!mirror_rxq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	s-&gt;mirror_rxq[pi-&gt;port_id] = mirror_rxq;</div><div class='add'>+</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_USING_MSIX))</div><div class='add'>+		msix = -((int)adap-&gt;sge.intrq.abs_id + 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0, rxqid = 0; i &lt; pi-&gt;nmirrorqsets; i++, rxqid++) {</div><div class='add'>+		mirror_rxq = &amp;s-&gt;mirror_rxq[pi-&gt;port_id][i];</div><div class='add'>+</div><div class='add'>+		/* Allocate Mirror Rxqs */</div><div class='add'>+		if (msix &gt;= 0) {</div><div class='add'>+			msix = cxgb4_get_msix_idx_from_bmap(adap);</div><div class='add'>+			if (msix &lt; 0) {</div><div class='add'>+				ret = msix;</div><div class='add'>+				goto out_free_queues;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			mirror_rxq-&gt;msix = &amp;adap-&gt;msix_info[msix];</div><div class='add'>+			snprintf(mirror_rxq-&gt;msix-&gt;desc,</div><div class='add'>+				 sizeof(mirror_rxq-&gt;msix-&gt;desc),</div><div class='add'>+				 "%s-mirrorrxq%d", dev-&gt;name, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		init_rspq(adap, &amp;mirror_rxq-&gt;rspq,</div><div class='add'>+			  CXGB4_MIRROR_RXQ_DEFAULT_INTR_USEC,</div><div class='add'>+			  CXGB4_MIRROR_RXQ_DEFAULT_PKT_CNT,</div><div class='add'>+			  CXGB4_MIRROR_RXQ_DEFAULT_DESC_NUM,</div><div class='add'>+			  CXGB4_MIRROR_RXQ_DEFAULT_DESC_SIZE);</div><div class='add'>+</div><div class='add'>+		mirror_rxq-&gt;fl.size = CXGB4_MIRROR_FLQ_DEFAULT_DESC_NUM;</div><div class='add'>+</div><div class='add'>+		ret = t4_sge_alloc_rxq(adap, &amp;mirror_rxq-&gt;rspq, false,</div><div class='add'>+				       dev, msix, &amp;mirror_rxq-&gt;fl,</div><div class='add'>+				       t4_ethrx_handler, NULL, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_msix_idx;</div><div class='add'>+</div><div class='add'>+		/* Setup MSI-X vectors for Mirror Rxqs */</div><div class='add'>+		if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+			ret = request_irq(mirror_rxq-&gt;msix-&gt;vec,</div><div class='add'>+					  t4_sge_intr_msix, 0,</div><div class='add'>+					  mirror_rxq-&gt;msix-&gt;desc,</div><div class='add'>+					  &amp;mirror_rxq-&gt;rspq);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_free_rxq;</div><div class='add'>+</div><div class='add'>+			cxgb4_set_msix_aff(adap, mirror_rxq-&gt;msix-&gt;vec,</div><div class='add'>+					   &amp;mirror_rxq-&gt;msix-&gt;aff_mask, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Start NAPI for Mirror Rxqs */</div><div class='add'>+		cxgb4_enable_rx(adap, &amp;mirror_rxq-&gt;rspq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup RSS for Mirror Rxqs */</div><div class='add'>+	rss = kcalloc(pi-&gt;rss_size, sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (!rss) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_queues;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mirror_rxq = &amp;s-&gt;mirror_rxq[pi-&gt;port_id][0];</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;rss_size; i++)</div><div class='add'>+		rss[i] = mirror_rxq[i % pi-&gt;nmirrorqsets].rspq.abs_id;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_config_rss(pi, rss, pi-&gt;rss_size, pi-&gt;viid_mirror);</div><div class='add'>+	kfree(rss);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_queues;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_rxq:</div><div class='add'>+	free_rspq_fl(adap, &amp;mirror_rxq-&gt;rspq, &amp;mirror_rxq-&gt;fl);</div><div class='add'>+</div><div class='add'>+out_free_msix_idx:</div><div class='add'>+	cxgb4_free_msix_idx_in_bmap(adap, mirror_rxq-&gt;msix-&gt;idx);</div><div class='add'>+</div><div class='add'>+out_free_queues:</div><div class='add'>+	while (rxqid-- &gt; 0)</div><div class='add'>+		cxgb4_port_mirror_free_rxq(adap,</div><div class='add'>+					   &amp;s-&gt;mirror_rxq[pi-&gt;port_id][rxqid]);</div><div class='add'>+</div><div class='add'>+	kfree(s-&gt;mirror_rxq[pi-&gt;port_id]);</div><div class='add'>+	s-&gt;mirror_rxq[pi-&gt;port_id] = NULL;</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_port_mirror_free_queues(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	if (!pi-&gt;vi_mirror_count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!s-&gt;mirror_rxq[pi-&gt;port_id])</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nmirrorqsets; i++)</div><div class='add'>+		cxgb4_port_mirror_free_rxq(adap,</div><div class='add'>+					   &amp;s-&gt;mirror_rxq[pi-&gt;port_id][i]);</div><div class='add'>+</div><div class='add'>+	kfree(s-&gt;mirror_rxq[pi-&gt;port_id]);</div><div class='add'>+	s-&gt;mirror_rxq[pi-&gt;port_id] = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_port_mirror_start(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret, idx = -1;</div><div class='add'>+</div><div class='add'>+	if (!pi-&gt;vi_mirror_count)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Mirror VIs can be created dynamically after stack had</div><div class='add'>+	 * already setup Rx modes like MTU, promisc, allmulti, etc.</div><div class='add'>+	 * on main VI. So, parse what the stack had setup on the</div><div class='add'>+	 * main VI and update the same on the mirror VI.</div><div class='add'>+	 */</div><div class='add'>+	ret = t4_set_rxmode(adap, adap-&gt;mbox, pi-&gt;viid, pi-&gt;viid_mirror,</div><div class='add'>+			    dev-&gt;mtu, (dev-&gt;flags &amp; IFF_PROMISC) ? 1 : 0,</div><div class='add'>+			    (dev-&gt;flags &amp; IFF_ALLMULTI) ? 1 : 0, 1,</div><div class='add'>+			    !!(dev-&gt;features &amp; NETIF_F_HW_VLAN_CTAG_RX), true);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Failed start up Rx mode for Mirror VI 0x%x, ret: %d\n",</div><div class='add'>+			pi-&gt;viid_mirror, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enable replication bit for the device's MAC address</div><div class='add'>+	 * in MPS TCAM, so that the packets for the main VI are</div><div class='add'>+	 * replicated to mirror VI.</div><div class='add'>+	 */</div><div class='add'>+	ret = cxgb4_update_mac_filt(pi, pi-&gt;viid_mirror, &amp;idx,</div><div class='add'>+				    dev-&gt;dev_addr, true, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Failed updating MAC filter for Mirror VI 0x%x, ret: %d\n",</div><div class='add'>+			pi-&gt;viid_mirror, ret);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enabling a Virtual Interface can result in an interrupt</div><div class='add'>+	 * during the processing of the VI Enable command and, in some</div><div class='add'>+	 * paths, result in an attempt to issue another command in the</div><div class='add'>+	 * interrupt context. Thus, we disable interrupts during the</div><div class='add'>+	 * course of the VI Enable command ...</div><div class='add'>+	 */</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	ret = t4_enable_vi_params(adap, adap-&gt;mbox, pi-&gt;viid_mirror, true, true,</div><div class='add'>+				  false);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Failed starting Mirror VI 0x%x, ret: %d\n",</div><div class='add'>+			pi-&gt;viid_mirror, ret);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_port_mirror_stop(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	if (!pi-&gt;vi_mirror_count)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	t4_enable_vi_params(adap, adap-&gt;mbox, pi-&gt;viid_mirror, false, false,</div><div class='add'>+			    false);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_port_mirror_alloc(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (!pi-&gt;nmirrorqsets)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	if (pi-&gt;viid_mirror) {</div><div class='add'>+		pi-&gt;vi_mirror_count++;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t4_init_port_mirror(pi, adap-&gt;mbox, pi-&gt;port_id, adap-&gt;pf, 0,</div><div class='add'>+				  &amp;pi-&gt;viid_mirror);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	pi-&gt;vi_mirror_count = 1;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE) {</div><div class='add'>+		ret = cxgb4_port_mirror_alloc_queues(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_vi;</div><div class='add'>+</div><div class='add'>+		ret = cxgb4_port_mirror_start(dev);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_queues;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_queues:</div><div class='add'>+	cxgb4_port_mirror_free_queues(dev);</div><div class='add'>+</div><div class='add'>+out_free_vi:</div><div class='add'>+	pi-&gt;vi_mirror_count = 0;</div><div class='add'>+	t4_free_vi(adap, adap-&gt;mbox, adap-&gt;pf, 0, pi-&gt;viid_mirror);</div><div class='add'>+	pi-&gt;viid_mirror = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_port_mirror_free(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	if (!pi-&gt;viid_mirror)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	if (pi-&gt;vi_mirror_count &gt; 1) {</div><div class='add'>+		pi-&gt;vi_mirror_count--;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_port_mirror_stop(dev);</div><div class='add'>+	cxgb4_port_mirror_free_queues(dev);</div><div class='add'>+</div><div class='add'>+	pi-&gt;vi_mirror_count = 0;</div><div class='add'>+	t4_free_vi(adap, adap-&gt;mbox, adap-&gt;pf, 0, pi-&gt;viid_mirror);</div><div class='add'>+	pi-&gt;viid_mirror = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * upper-layer driver support</div><div class='ctx'>  */</div><div class='hunk'>@@ -1285,8 +1743,8 @@ static void mk_tid_release(struct sk_buff *skb, unsigned int chan,</div><div class='ctx'> static void cxgb4_queue_tid_release(struct tid_info *t, unsigned int chan,</div><div class='ctx'> 				    unsigned int tid)</div><div class='ctx'> {</div><div class='del'>-	void **p = &amp;t-&gt;tid_tab[tid];</div><div class='ctx'> 	struct adapter *adap = container_of(t, struct adapter, tids);</div><div class='add'>+	void **p = &amp;t-&gt;tid_tab[tid - t-&gt;tid_base];</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;adap-&gt;tid_release_lock);</div><div class='ctx'> 	*p = adap-&gt;tid_release_head;</div><div class='hunk'>@@ -1338,13 +1796,16 @@ static void process_tid_release_list(struct work_struct *work)</div><div class='ctx'> void cxgb4_remove_tid(struct tid_info *t, unsigned int chan, unsigned int tid,</div><div class='ctx'> 		      unsigned short family)</div><div class='ctx'> {</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> 	struct adapter *adap = container_of(t, struct adapter, tids);</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> </div><div class='del'>-	WARN_ON(tid &gt;= t-&gt;ntids);</div><div class='add'>+	if (tid_out_of_range(&amp;adap-&gt;tids, tid)) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "tid %d out of range\n", tid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (t-&gt;tid_tab[tid]) {</div><div class='del'>-		t-&gt;tid_tab[tid] = NULL;</div><div class='add'>+	if (t-&gt;tid_tab[tid - adap-&gt;tids.tid_base]) {</div><div class='add'>+		t-&gt;tid_tab[tid - adap-&gt;tids.tid_base] = NULL;</div><div class='ctx'> 		atomic_dec(&amp;t-&gt;conns_in_use);</div><div class='ctx'> 		if (t-&gt;hash_base &amp;&amp; (tid &gt;= t-&gt;hash_base)) {</div><div class='ctx'> 			if (family == AF_INET6)</div><div class='hunk'>@@ -1376,19 +1837,27 @@ static int tid_init(struct tid_info *t)</div><div class='ctx'> 	struct adapter *adap = container_of(t, struct adapter, tids);</div><div class='ctx'> 	unsigned int max_ftids = t-&gt;nftids + t-&gt;nsftids;</div><div class='ctx'> 	unsigned int natids = t-&gt;natids;</div><div class='add'>+	unsigned int hpftid_bmap_size;</div><div class='add'>+	unsigned int eotid_bmap_size;</div><div class='ctx'> 	unsigned int stid_bmap_size;</div><div class='ctx'> 	unsigned int ftid_bmap_size;</div><div class='ctx'> 	size_t size;</div><div class='ctx'> </div><div class='ctx'> 	stid_bmap_size = BITS_TO_LONGS(t-&gt;nstids + t-&gt;nsftids);</div><div class='ctx'> 	ftid_bmap_size = BITS_TO_LONGS(t-&gt;nftids);</div><div class='add'>+	hpftid_bmap_size = BITS_TO_LONGS(t-&gt;nhpftids);</div><div class='add'>+	eotid_bmap_size = BITS_TO_LONGS(t-&gt;neotids);</div><div class='ctx'> 	size = t-&gt;ntids * sizeof(*t-&gt;tid_tab) +</div><div class='ctx'> 	       natids * sizeof(*t-&gt;atid_tab) +</div><div class='ctx'> 	       t-&gt;nstids * sizeof(*t-&gt;stid_tab) +</div><div class='ctx'> 	       t-&gt;nsftids * sizeof(*t-&gt;stid_tab) +</div><div class='ctx'> 	       stid_bmap_size * sizeof(long) +</div><div class='add'>+	       t-&gt;nhpftids * sizeof(*t-&gt;hpftid_tab) +</div><div class='add'>+	       hpftid_bmap_size * sizeof(long) +</div><div class='ctx'> 	       max_ftids * sizeof(*t-&gt;ftid_tab) +</div><div class='del'>-	       ftid_bmap_size * sizeof(long);</div><div class='add'>+	       ftid_bmap_size * sizeof(long) +</div><div class='add'>+	       t-&gt;neotids * sizeof(*t-&gt;eotid_tab) +</div><div class='add'>+	       eotid_bmap_size * sizeof(long);</div><div class='ctx'> </div><div class='ctx'> 	t-&gt;tid_tab = kvzalloc(size, GFP_KERNEL);</div><div class='ctx'> 	if (!t-&gt;tid_tab)</div><div class='hunk'>@@ -1397,8 +1866,12 @@ static int tid_init(struct tid_info *t)</div><div class='ctx'> 	t-&gt;atid_tab = (union aopen_entry *)&amp;t-&gt;tid_tab[t-&gt;ntids];</div><div class='ctx'> 	t-&gt;stid_tab = (struct serv_entry *)&amp;t-&gt;atid_tab[natids];</div><div class='ctx'> 	t-&gt;stid_bmap = (unsigned long *)&amp;t-&gt;stid_tab[t-&gt;nstids + t-&gt;nsftids];</div><div class='del'>-	t-&gt;ftid_tab = (struct filter_entry *)&amp;t-&gt;stid_bmap[stid_bmap_size];</div><div class='add'>+	t-&gt;hpftid_tab = (struct filter_entry *)&amp;t-&gt;stid_bmap[stid_bmap_size];</div><div class='add'>+	t-&gt;hpftid_bmap = (unsigned long *)&amp;t-&gt;hpftid_tab[t-&gt;nhpftids];</div><div class='add'>+	t-&gt;ftid_tab = (struct filter_entry *)&amp;t-&gt;hpftid_bmap[hpftid_bmap_size];</div><div class='ctx'> 	t-&gt;ftid_bmap = (unsigned long *)&amp;t-&gt;ftid_tab[max_ftids];</div><div class='add'>+	t-&gt;eotid_tab = (struct eotid_entry *)&amp;t-&gt;ftid_bmap[ftid_bmap_size];</div><div class='add'>+	t-&gt;eotid_bmap = (unsigned long *)&amp;t-&gt;eotid_tab[t-&gt;neotids];</div><div class='ctx'> 	spin_lock_init(&amp;t-&gt;stid_lock);</div><div class='ctx'> 	spin_lock_init(&amp;t-&gt;atid_lock);</div><div class='ctx'> 	spin_lock_init(&amp;t-&gt;ftid_lock);</div><div class='hunk'>@@ -1411,6 +1884,7 @@ static int tid_init(struct tid_info *t)</div><div class='ctx'> 	atomic_set(&amp;t-&gt;tids_in_use, 0);</div><div class='ctx'> 	atomic_set(&amp;t-&gt;conns_in_use, 0);</div><div class='ctx'> 	atomic_set(&amp;t-&gt;hash_tids_in_use, 0);</div><div class='add'>+	atomic_set(&amp;t-&gt;eotids_in_use, 0);</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the free list for atid_tab and clear the stid bitmap. */</div><div class='ctx'> 	if (natids) {</div><div class='hunk'>@@ -1425,8 +1899,13 @@ static int tid_init(struct tid_info *t)</div><div class='ctx'> 		if (!t-&gt;stid_base &amp;&amp;</div><div class='ctx'> 		    CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &lt;= CHELSIO_T5)</div><div class='ctx'> 			__set_bit(0, t-&gt;stid_bmap);</div><div class='add'>+</div><div class='add'>+		if (t-&gt;neotids)</div><div class='add'>+			bitmap_zero(t-&gt;eotid_bmap, t-&gt;neotids);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (t-&gt;nhpftids)</div><div class='add'>+		bitmap_zero(t-&gt;hpftid_bmap, t-&gt;nhpftids);</div><div class='ctx'> 	bitmap_zero(t-&gt;ftid_bmap, t-&gt;nftids);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1437,6 +1916,7 @@ static int tid_init(struct tid_info *t)</div><div class='ctx'>  *	@stid: the server TID</div><div class='ctx'>  *	@sip: local IP address to bind server to</div><div class='ctx'>  *	@sport: the server's TCP port</div><div class='add'>+ *	@vlan: the VLAN header information</div><div class='ctx'>  *	@queue: queue to direct messages from this server to</div><div class='ctx'>  *</div><div class='ctx'>  *	Create an IP server for the given port and address.</div><div class='hunk'>@@ -1646,6 +2126,18 @@ unsigned int cxgb4_port_chan(const struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxgb4_port_chan);</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *      cxgb4_port_e2cchan - get the HW c-channel of a port</div><div class='add'>+ *      @dev: the net device for the port</div><div class='add'>+ *</div><div class='add'>+ *      Return the HW RX c-channel of the given port.</div><div class='add'>+ */</div><div class='add'>+unsigned int cxgb4_port_e2cchan(const struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return netdev2pinfo(dev)-&gt;rx_cchan;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cxgb4_port_e2cchan);</div><div class='add'>+</div><div class='ctx'> unsigned int cxgb4_dbfifo_count(const struct net_device *dev, int lpfifo)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='hunk'>@@ -1699,18 +2191,6 @@ void cxgb4_get_tcp_stats(struct pci_dev *pdev, struct tp_tcp_stats *v4,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxgb4_get_tcp_stats);</div><div class='ctx'> </div><div class='del'>-void cxgb4_iscsi_init(struct net_device *dev, unsigned int tag_mask,</div><div class='del'>-		      const unsigned int *pgsz_order)</div><div class='del'>-{</div><div class='del'>-	struct adapter *adap = netdev2adap(dev);</div><div class='del'>-</div><div class='del'>-	t4_write_reg(adap, ULP_RX_ISCSI_TAGMASK_A, tag_mask);</div><div class='del'>-	t4_write_reg(adap, ULP_RX_ISCSI_PSZ_A, HPZ0_V(pgsz_order[0]) |</div><div class='del'>-		     HPZ1_V(pgsz_order[1]) | HPZ2_V(pgsz_order[2]) |</div><div class='del'>-		     HPZ3_V(pgsz_order[3]));</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cxgb4_iscsi_init);</div><div class='del'>-</div><div class='ctx'> int cxgb4_flush_eq_cache(struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='hunk'>@@ -2153,6 +2633,9 @@ static void detach_ulds(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	if (!is_uld(adap))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;uld_mutex);</div><div class='ctx'> 	list_del(&amp;adap-&gt;list_node);</div><div class='ctx'> </div><div class='hunk'>@@ -2269,6 +2752,7 @@ static void update_clip(const struct adapter *adap)</div><div class='ctx'>  */</div><div class='ctx'> static int cxgb_up(struct adapter *adap)</div><div class='ctx'> {</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	mutex_lock(&amp;uld_mutex);</div><div class='hunk'>@@ -2280,16 +2764,20 @@ static int cxgb_up(struct adapter *adap)</div><div class='ctx'> 		goto freeq;</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='del'>-		name_msix_vecs(adap);</div><div class='del'>-		err = request_irq(adap-&gt;msix_info[0].vec, t4_nondata_intr, 0,</div><div class='del'>-				  adap-&gt;msix_info[0].desc, adap);</div><div class='add'>+		if (s-&gt;nd_msix_idx &lt; 0) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto irq_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = request_irq(adap-&gt;msix_info[s-&gt;nd_msix_idx].vec,</div><div class='add'>+				  t4_nondata_intr, 0,</div><div class='add'>+				  adap-&gt;msix_info[s-&gt;nd_msix_idx].desc, adap);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto irq_err;</div><div class='add'>+</div><div class='ctx'> 		err = request_msix_queue_irqs(adap);</div><div class='del'>-		if (err) {</div><div class='del'>-			free_irq(adap-&gt;msix_info[0].vec, adap);</div><div class='del'>-			goto irq_err;</div><div class='del'>-		}</div><div class='add'>+		if (err)</div><div class='add'>+			goto irq_err_free_nd_msix;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		err = request_irq(adap-&gt;pdev-&gt;irq, t4_intr_handler(adap),</div><div class='ctx'> 				  (adap-&gt;flags &amp; CXGB4_USING_MSI) ? 0</div><div class='hunk'>@@ -2311,11 +2799,13 @@ static int cxgb_up(struct adapter *adap)</div><div class='ctx'> #endif</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='del'>- irq_err:</div><div class='add'>+irq_err_free_nd_msix:</div><div class='add'>+	free_irq(adap-&gt;msix_info[s-&gt;nd_msix_idx].vec, adap);</div><div class='add'>+irq_err:</div><div class='ctx'> 	dev_err(adap-&gt;pdev_dev, "request_irq failed, err %d\n", err);</div><div class='del'>- freeq:</div><div class='add'>+freeq:</div><div class='ctx'> 	t4_free_sge_resources(adap);</div><div class='del'>- rel_lock:</div><div class='add'>+rel_lock:</div><div class='ctx'> 	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2339,9 +2829,9 @@ static void cxgb_down(struct adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static int cxgb_open(struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2359,8 +2849,29 @@ static int cxgb_open(struct net_device *dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	err = link_start(dev);</div><div class='del'>-	if (!err)</div><div class='del'>-		netif_tx_start_all_queues(dev);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (pi-&gt;nmirrorqsets) {</div><div class='add'>+		mutex_lock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+		err = cxgb4_port_mirror_alloc_queues(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+</div><div class='add'>+		err = cxgb4_port_mirror_start(dev);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_free_queues;</div><div class='add'>+		mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_tx_start_all_queues(dev);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_queues:</div><div class='add'>+	cxgb4_port_mirror_free_queues(dev);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2378,7 +2889,17 @@ static int cxgb_close(struct net_device *dev)</div><div class='ctx'> 	cxgb4_dcb_reset(dev);</div><div class='ctx'> 	dcb_tx_queue_prio_enable(dev, false);</div><div class='ctx'> #endif</div><div class='del'>-	return ret;</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (pi-&gt;nmirrorqsets) {</div><div class='add'>+		mutex_lock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+		cxgb4_port_mirror_stop(dev);</div><div class='add'>+		cxgb4_port_mirror_free_queues(dev);</div><div class='add'>+		mutex_unlock(&amp;pi-&gt;vi_mirror_mutex);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cxgb4_create_server_filter(const struct net_device *dev, unsigned int stid,</div><div class='hunk'>@@ -2412,7 +2933,7 @@ int cxgb4_create_server_filter(const struct net_device *dev, unsigned int stid,</div><div class='ctx'> </div><div class='ctx'> 	/* Clear out filter specifications */</div><div class='ctx'> 	memset(&amp;f-&gt;fs, 0, sizeof(struct ch_filter_specification));</div><div class='del'>-	f-&gt;fs.val.lport = cpu_to_be16(sport);</div><div class='add'>+	f-&gt;fs.val.lport = be16_to_cpu(sport);</div><div class='ctx'> 	f-&gt;fs.mask.lport  = ~0;</div><div class='ctx'> 	val = (u8 *)&amp;sip;</div><div class='ctx'> 	if ((val[0] | val[1] | val[2] | val[3]) != 0) {</div><div class='hunk'>@@ -2521,12 +3042,87 @@ static void cxgb_get_stats(struct net_device *dev,</div><div class='ctx'> 		ns-&gt;rx_length_errors + stats.rx_len_err + ns-&gt;rx_fifo_errors;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxgb_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	*config = pi-&gt;tstamp_config;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *config,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	struct adapter *adapter = pi-&gt;adapter;</div><div class='add'>+</div><div class='add'>+	if (is_t4(adapter-&gt;params.chip)) {</div><div class='add'>+		/* For T4 Adapters */</div><div class='add'>+		switch (config-&gt;rx_filter) {</div><div class='add'>+		case HWTSTAMP_FILTER_NONE:</div><div class='add'>+			pi-&gt;rxtstamp = false;</div><div class='add'>+			break;</div><div class='add'>+		case HWTSTAMP_FILTER_ALL:</div><div class='add'>+			pi-&gt;rxtstamp = true;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -ERANGE;</div><div class='add'>+		}</div><div class='add'>+		pi-&gt;tstamp_config = *config;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		pi-&gt;rxtstamp = false;</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+		cxgb4_ptprx_timestamping(pi, pi-&gt;port_id, PTP_TS_L4);</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+		cxgb4_ptprx_timestamping(pi, pi-&gt;port_id, PTP_TS_L2_L4);</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_ALL:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='add'>+		pi-&gt;rxtstamp = true;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (config-&gt;tx_type == HWTSTAMP_TX_OFF &amp;&amp;</div><div class='add'>+	    config-&gt;rx_filter == HWTSTAMP_FILTER_NONE) {</div><div class='add'>+		if (cxgb4_ptp_txtype(adapter, pi-&gt;port_id) &gt;= 0)</div><div class='add'>+			pi-&gt;ptp_enable = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (config-&gt;rx_filter != HWTSTAMP_FILTER_NONE) {</div><div class='add'>+		if (cxgb4_ptp_redirect_rx_packet(adapter, pi) &gt;= 0)</div><div class='add'>+			pi-&gt;ptp_enable = true;</div><div class='add'>+	}</div><div class='add'>+	pi-&gt;tstamp_config = *config;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mbox;</div><div class='ctx'> 	int ret = 0, prtad, devad;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='del'>-	struct adapter *adapter = pi-&gt;adapter;</div><div class='ctx'> 	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&amp;req-&gt;ifr_data;</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd) {</div><div class='hunk'>@@ -2555,81 +3151,6 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)</div><div class='ctx'> 			ret = t4_mdio_wr(pi-&gt;adapter, mbox, prtad, devad,</div><div class='ctx'> 					 data-&gt;reg_num, data-&gt;val_in);</div><div class='ctx'> 		break;</div><div class='del'>-	case SIOCGHWTSTAMP:</div><div class='del'>-		return copy_to_user(req-&gt;ifr_data, &amp;pi-&gt;tstamp_config,</div><div class='del'>-				    sizeof(pi-&gt;tstamp_config)) ?</div><div class='del'>-			-EFAULT : 0;</div><div class='del'>-	case SIOCSHWTSTAMP:</div><div class='del'>-		if (copy_from_user(&amp;pi-&gt;tstamp_config, req-&gt;ifr_data,</div><div class='del'>-				   sizeof(pi-&gt;tstamp_config)))</div><div class='del'>-			return -EFAULT;</div><div class='del'>-</div><div class='del'>-		if (!is_t4(adapter-&gt;params.chip)) {</div><div class='del'>-			switch (pi-&gt;tstamp_config.tx_type) {</div><div class='del'>-			case HWTSTAMP_TX_OFF:</div><div class='del'>-			case HWTSTAMP_TX_ON:</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return -ERANGE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			switch (pi-&gt;tstamp_config.rx_filter) {</div><div class='del'>-			case HWTSTAMP_FILTER_NONE:</div><div class='del'>-				pi-&gt;rxtstamp = false;</div><div class='del'>-				break;</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='del'>-				cxgb4_ptprx_timestamping(pi, pi-&gt;port_id,</div><div class='del'>-							 PTP_TS_L4);</div><div class='del'>-				break;</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='del'>-				cxgb4_ptprx_timestamping(pi, pi-&gt;port_id,</div><div class='del'>-							 PTP_TS_L2_L4);</div><div class='del'>-				break;</div><div class='del'>-			case HWTSTAMP_FILTER_ALL:</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='del'>-			case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='del'>-				pi-&gt;rxtstamp = true;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				pi-&gt;tstamp_config.rx_filter =</div><div class='del'>-					HWTSTAMP_FILTER_NONE;</div><div class='del'>-				return -ERANGE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if ((pi-&gt;tstamp_config.tx_type == HWTSTAMP_TX_OFF) &amp;&amp;</div><div class='del'>-			    (pi-&gt;tstamp_config.rx_filter ==</div><div class='del'>-				HWTSTAMP_FILTER_NONE)) {</div><div class='del'>-				if (cxgb4_ptp_txtype(adapter, pi-&gt;port_id) &gt;= 0)</div><div class='del'>-					pi-&gt;ptp_enable = false;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (pi-&gt;tstamp_config.rx_filter !=</div><div class='del'>-				HWTSTAMP_FILTER_NONE) {</div><div class='del'>-				if (cxgb4_ptp_redirect_rx_packet(adapter,</div><div class='del'>-								 pi) &gt;= 0)</div><div class='del'>-					pi-&gt;ptp_enable = true;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* For T4 Adapters */</div><div class='del'>-			switch (pi-&gt;tstamp_config.rx_filter) {</div><div class='del'>-			case HWTSTAMP_FILTER_NONE:</div><div class='del'>-			pi-&gt;rxtstamp = false;</div><div class='del'>-			break;</div><div class='del'>-			case HWTSTAMP_FILTER_ALL:</div><div class='del'>-			pi-&gt;rxtstamp = true;</div><div class='del'>-			break;</div><div class='del'>-			default:</div><div class='del'>-			pi-&gt;tstamp_config.rx_filter =</div><div class='del'>-			HWTSTAMP_FILTER_NONE;</div><div class='del'>-			return -ERANGE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return copy_to_user(req-&gt;ifr_data, &amp;pi-&gt;tstamp_config,</div><div class='del'>-				    sizeof(pi-&gt;tstamp_config)) ?</div><div class='del'>-			-EFAULT : 0;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2644,13 +3165,13 @@ static void cxgb_set_rxmode(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static int cxgb_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='del'>-	ret = t4_set_rxmode(pi-&gt;adapter, pi-&gt;adapter-&gt;pf, pi-&gt;viid, new_mtu, -1,</div><div class='del'>-			    -1, -1, -1, true);</div><div class='add'>+	ret = t4_set_rxmode(pi-&gt;adapter, pi-&gt;adapter-&gt;mbox, pi-&gt;viid,</div><div class='add'>+			    pi-&gt;viid_mirror, new_mtu, -1, -1, -1, -1, true);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		dev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2673,8 +3194,6 @@ static void cxgb4_mgmt_fill_vf_station_mac_addr(struct adapter *adap)</div><div class='ctx'> 	int err;</div><div class='ctx'> 	u8 *na;</div><div class='ctx'> </div><div class='del'>-	adap-&gt;params.pci.vpd_cap_addr = pci_find_capability(adap-&gt;pdev,</div><div class='del'>-							    PCI_CAP_ID_VPD);</div><div class='ctx'> 	err = t4_get_raw_vpd_params(adap, &amp;adap-&gt;params.vpd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -2718,7 +3237,7 @@ static int cxgb4_mgmt_set_vf_mac(struct net_device *dev, int vf, u8 *mac)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(pi-&gt;adapter-&gt;pdev_dev,</div><div class='ctx'> 		 "Setting MAC %pM on VF %d\n", mac, vf);</div><div class='del'>-	ret = t4_set_vf_mac_acl(adap, vf + 1, 1, mac);</div><div class='add'>+	ret = t4_set_vf_mac_acl(adap, vf + 1, pi-&gt;lport, 1, mac);</div><div class='ctx'> 	if (!ret)</div><div class='ctx'> 		ether_addr_copy(adap-&gt;vfinfo[vf].vf_mac_addr, mac);</div><div class='ctx'> 	return ret;</div><div class='hunk'>@@ -2778,7 +3297,7 @@ static int cxgb4_mgmt_set_vf_rate(struct net_device *dev, int vf,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (max_tx_rate == 0) {</div><div class='del'>-		/* unbind VF to to any Traffic Class */</div><div class='add'>+		/* unbind VF to any Traffic Class */</div><div class='ctx'> 		fw_pfvf =</div><div class='ctx'> 		    (FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_PFVF) |</div><div class='ctx'> 		     FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_PFVF_SCHEDCLASS_ETH));</div><div class='hunk'>@@ -2829,7 +3348,7 @@ static int cxgb4_mgmt_set_vf_rate(struct net_device *dev, int vf,</div><div class='ctx'> 			      SCHED_CLASS_RATEUNIT_BITS,</div><div class='ctx'> 			      SCHED_CLASS_RATEMODE_ABS,</div><div class='ctx'> 			      pi-&gt;tx_chan, class_id, 0,</div><div class='del'>-			      max_tx_rate * 1000, 0, pktsize);</div><div class='add'>+			      max_tx_rate * 1000, 0, pktsize, 0);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "Err %d for Traffic Class config\n",</div><div class='ctx'> 			ret);</div><div class='hunk'>@@ -2934,13 +3453,12 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p)</div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	ret = cxgb4_change_mac(pi, pi-&gt;viid, &amp;pi-&gt;xact_addr_filt,</div><div class='del'>-			       addr-&gt;sa_data, true, &amp;pi-&gt;smt_idx);</div><div class='add'>+	ret = cxgb4_update_mac_filt(pi, pi-&gt;viid, &amp;pi-&gt;xact_addr_filt,</div><div class='add'>+				    addr-&gt;sa_data, true, &amp;pi-&gt;smt_idx);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='del'>-	pi-&gt;xact_addr_filt = ret;</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2965,9 +3483,9 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adap = pi-&gt;adapter;</div><div class='del'>-	struct sched_class *e;</div><div class='del'>-	struct ch_sched_params p;</div><div class='del'>-	struct ch_sched_queue qe;</div><div class='add'>+	struct ch_sched_queue qe = { 0 };</div><div class='add'>+	struct ch_sched_params p = { 0 };</div><div class='add'>+	struct ch_sched_class *e;</div><div class='ctx'> 	u32 req_rate;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2984,6 +3502,15 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	qe.queue = index;</div><div class='add'>+	e = cxgb4_sched_queue_lookup(dev, &amp;qe);</div><div class='add'>+	if (e &amp;&amp; e-&gt;info.u.params.level != SCHED_CLASS_LEVEL_CL_RL) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Queue %u already bound to class %u of type: %u\n",</div><div class='add'>+			index, e-&gt;idx, e-&gt;info.u.params.level);</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Convert from Mbps to Kbps */</div><div class='ctx'> 	req_rate = rate * 1000;</div><div class='ctx'> </div><div class='hunk'>@@ -3013,7 +3540,6 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Fetch any available unused or matching scheduling class */</div><div class='del'>-	memset(&amp;p, 0, sizeof(p));</div><div class='ctx'> 	p.type = SCHED_CLASS_TYPE_PACKET;</div><div class='ctx'> 	p.u.params.level    = SCHED_CLASS_LEVEL_CL_RL;</div><div class='ctx'> 	p.u.params.mode     = SCHED_CLASS_MODE_CLASS;</div><div class='hunk'>@@ -3043,14 +3569,14 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxgb_setup_tc_flower(struct net_device *dev,</div><div class='del'>-				struct tc_cls_flower_offload *cls_flower)</div><div class='add'>+				struct flow_cls_offload *cls_flower)</div><div class='ctx'> {</div><div class='ctx'> 	switch (cls_flower-&gt;command) {</div><div class='del'>-	case TC_CLSFLOWER_REPLACE:</div><div class='add'>+	case FLOW_CLS_REPLACE:</div><div class='ctx'> 		return cxgb4_tc_flower_replace(dev, cls_flower);</div><div class='del'>-	case TC_CLSFLOWER_DESTROY:</div><div class='add'>+	case FLOW_CLS_DESTROY:</div><div class='ctx'> 		return cxgb4_tc_flower_destroy(dev, cls_flower);</div><div class='del'>-	case TC_CLSFLOWER_STATS:</div><div class='add'>+	case FLOW_CLS_STATS:</div><div class='ctx'> 		return cxgb4_tc_flower_stats(dev, cls_flower);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -3071,8 +3597,33 @@ static int cxgb_setup_tc_cls_u32(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data,</div><div class='del'>-				  void *cb_priv)</div><div class='add'>+static int cxgb_setup_tc_matchall(struct net_device *dev,</div><div class='add'>+				  struct tc_cls_matchall_offload *cls_matchall,</div><div class='add'>+				  bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	if (!adap-&gt;tc_matchall)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	switch (cls_matchall-&gt;command) {</div><div class='add'>+	case TC_CLSMATCHALL_REPLACE:</div><div class='add'>+		return cxgb4_tc_matchall_replace(dev, cls_matchall, ingress);</div><div class='add'>+	case TC_CLSMATCHALL_DESTROY:</div><div class='add'>+		return cxgb4_tc_matchall_destroy(dev, cls_matchall, ingress);</div><div class='add'>+	case TC_CLSMATCHALL_STATS:</div><div class='add'>+		if (ingress)</div><div class='add'>+			return cxgb4_tc_matchall_stats(dev, cls_matchall);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb_setup_tc_block_ingress_cb(enum tc_setup_type type,</div><div class='add'>+					  void *type_data, void *cb_priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = cb_priv;</div><div class='ctx'> 	struct port_info *pi = netdev2pinfo(dev);</div><div class='hunk'>@@ -3093,35 +3644,79 @@ static int cxgb_setup_tc_block_cb(enum tc_setup_type type, void *type_data,</div><div class='ctx'> 		return cxgb_setup_tc_cls_u32(dev, type_data);</div><div class='ctx'> 	case TC_SETUP_CLSFLOWER:</div><div class='ctx'> 		return cxgb_setup_tc_flower(dev, type_data);</div><div class='add'>+	case TC_SETUP_CLSMATCHALL:</div><div class='add'>+		return cxgb_setup_tc_matchall(dev, type_data, true);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb_setup_tc_block(struct net_device *dev,</div><div class='del'>-			       struct tc_block_offload *f)</div><div class='add'>+static int cxgb_setup_tc_block_egress_cb(enum tc_setup_type type,</div><div class='add'>+					 void *type_data, void *cb_priv)</div><div class='ctx'> {</div><div class='add'>+	struct net_device *dev = cb_priv;</div><div class='ctx'> 	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='ctx'> </div><div class='del'>-	if (f-&gt;binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"Failed to setup tc on port %d. Link Down?\n",</div><div class='add'>+			pi-&gt;port_id);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!tc_cls_can_offload_and_chain0(dev, type_data))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	switch (f-&gt;command) {</div><div class='del'>-	case TC_BLOCK_BIND:</div><div class='del'>-		return tcf_block_cb_register(f-&gt;block, cxgb_setup_tc_block_cb,</div><div class='del'>-					     pi, dev, f-&gt;extack);</div><div class='del'>-	case TC_BLOCK_UNBIND:</div><div class='del'>-		tcf_block_cb_unregister(f-&gt;block, cxgb_setup_tc_block_cb, pi);</div><div class='del'>-		return 0;</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_CLSMATCHALL:</div><div class='add'>+		return cxgb_setup_tc_matchall(dev, type_data, false);</div><div class='ctx'> 	default:</div><div class='del'>-		return -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb_setup_tc_mqprio(struct net_device *dev,</div><div class='add'>+				struct tc_mqprio_qopt_offload *mqprio)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	if (!is_ethofld(adap) || !adap-&gt;tc_mqprio)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	return cxgb4_setup_tc_mqprio(dev, mqprio);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(cxgb_block_cb_list);</div><div class='add'>+</div><div class='add'>+static int cxgb_setup_tc_block(struct net_device *dev,</div><div class='add'>+			       struct flow_block_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	flow_setup_cb_t *cb;</div><div class='add'>+	bool ingress_only;</div><div class='add'>+</div><div class='add'>+	pi-&gt;tc_block_shared = f-&gt;block_shared;</div><div class='add'>+	if (f-&gt;binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS) {</div><div class='add'>+		cb = cxgb_setup_tc_block_egress_cb;</div><div class='add'>+		ingress_only = false;</div><div class='add'>+	} else {</div><div class='add'>+		cb = cxgb_setup_tc_block_ingress_cb;</div><div class='add'>+		ingress_only = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flow_block_cb_setup_simple(f, &amp;cxgb_block_cb_list,</div><div class='add'>+					  cb, pi, dev, ingress_only);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='ctx'> 			 void *type_data)</div><div class='ctx'> {</div><div class='ctx'> 	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_MQPRIO:</div><div class='add'>+		return cxgb_setup_tc_mqprio(dev, type_data);</div><div class='ctx'> 	case TC_SETUP_BLOCK:</div><div class='ctx'> 		return cxgb_setup_tc_block(dev, type_data);</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -3129,131 +3724,71 @@ static int cxgb_setup_tc(struct net_device *dev, enum tc_setup_type type,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cxgb_del_udp_tunnel(struct net_device *netdev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='add'>+static int cxgb_udp_tunnel_unset_port(struct net_device *netdev,</div><div class='add'>+				      unsigned int table, unsigned int entry,</div><div class='add'>+				      struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(netdev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='del'>-	unsigned int chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='ctx'> 	u8 match_all_mac[] = { 0, 0, 0, 0, 0, 0 };</div><div class='ctx'> 	int ret = 0, i;</div><div class='ctx'> </div><div class='del'>-	if (chip_ver &lt; CHELSIO_T6)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	switch (ti-&gt;type) {</div><div class='ctx'> 	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		if (!adapter-&gt;vxlan_port_cnt ||</div><div class='del'>-		    adapter-&gt;vxlan_port != ti-&gt;port)</div><div class='del'>-			return; /* Invalid VxLAN destination port */</div><div class='del'>-</div><div class='del'>-		adapter-&gt;vxlan_port_cnt--;</div><div class='del'>-		if (adapter-&gt;vxlan_port_cnt)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='ctx'> 		adapter-&gt;vxlan_port = 0;</div><div class='ctx'> 		t4_write_reg(adapter, MPS_RX_VXLAN_TYPE_A, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		if (!adapter-&gt;geneve_port_cnt ||</div><div class='del'>-		    adapter-&gt;geneve_port != ti-&gt;port)</div><div class='del'>-			return; /* Invalid GENEVE destination port */</div><div class='del'>-</div><div class='del'>-		adapter-&gt;geneve_port_cnt--;</div><div class='del'>-		if (adapter-&gt;geneve_port_cnt)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='ctx'> 		adapter-&gt;geneve_port = 0;</div><div class='ctx'> 		t4_write_reg(adapter, MPS_RX_GENEVE_TYPE_A, 0);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Matchall mac entries can be deleted only after all tunnel ports</div><div class='ctx'> 	 * are brought down or removed.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (!adapter-&gt;rawf_cnt)</div><div class='del'>-		return;</div><div class='add'>+		return 0;</div><div class='ctx'> 	for_each_port(adapter, i) {</div><div class='ctx'> 		pi = adap2pinfo(adapter, i);</div><div class='ctx'> 		ret = t4_free_raw_mac_filt(adapter, pi-&gt;viid,</div><div class='ctx'> 					   match_all_mac, match_all_mac,</div><div class='del'>-					   adapter-&gt;rawf_start +</div><div class='del'>-					    pi-&gt;port_id,</div><div class='add'>+					   adapter-&gt;rawf_start + pi-&gt;port_id,</div><div class='ctx'> 					   1, pi-&gt;port_id, false);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			netdev_info(netdev, "Failed to free mac filter entry, for port %d\n",</div><div class='ctx'> 				    i);</div><div class='del'>-			return;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		atomic_dec(&amp;adapter-&gt;mps_encap[adapter-&gt;rawf_start +</div><div class='del'>-			   pi-&gt;port_id].refcnt);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cxgb_add_udp_tunnel(struct net_device *netdev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='add'>+static int cxgb_udp_tunnel_set_port(struct net_device *netdev,</div><div class='add'>+				    unsigned int table, unsigned int entry,</div><div class='add'>+				    struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(netdev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='del'>-	unsigned int chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='ctx'> 	u8 match_all_mac[] = { 0, 0, 0, 0, 0, 0 };</div><div class='ctx'> 	int i, ret;</div><div class='ctx'> </div><div class='del'>-	if (chip_ver &lt; CHELSIO_T6 || !adapter-&gt;rawf_cnt)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	switch (ti-&gt;type) {</div><div class='ctx'> 	case UDP_TUNNEL_TYPE_VXLAN:</div><div class='del'>-		/* Callback for adding vxlan port can be called with the same</div><div class='del'>-		 * port for both IPv4 and IPv6. We should not disable the</div><div class='del'>-		 * offloading when the same port for both protocols is added</div><div class='del'>-		 * and later one of them is removed.</div><div class='del'>-		 */</div><div class='del'>-		if (adapter-&gt;vxlan_port_cnt &amp;&amp;</div><div class='del'>-		    adapter-&gt;vxlan_port == ti-&gt;port) {</div><div class='del'>-			adapter-&gt;vxlan_port_cnt++;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* We will support only one VxLAN port */</div><div class='del'>-		if (adapter-&gt;vxlan_port_cnt) {</div><div class='del'>-			netdev_info(netdev, "UDP port %d already offloaded, not adding port %d\n",</div><div class='del'>-				    be16_to_cpu(adapter-&gt;vxlan_port),</div><div class='del'>-				    be16_to_cpu(ti-&gt;port));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		adapter-&gt;vxlan_port = ti-&gt;port;</div><div class='del'>-		adapter-&gt;vxlan_port_cnt = 1;</div><div class='del'>-</div><div class='ctx'> 		t4_write_reg(adapter, MPS_RX_VXLAN_TYPE_A,</div><div class='ctx'> 			     VXLAN_V(be16_to_cpu(ti-&gt;port)) | VXLAN_EN_F);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UDP_TUNNEL_TYPE_GENEVE:</div><div class='del'>-		if (adapter-&gt;geneve_port_cnt &amp;&amp;</div><div class='del'>-		    adapter-&gt;geneve_port == ti-&gt;port) {</div><div class='del'>-			adapter-&gt;geneve_port_cnt++;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* We will support only one GENEVE port */</div><div class='del'>-		if (adapter-&gt;geneve_port_cnt) {</div><div class='del'>-			netdev_info(netdev, "UDP port %d already offloaded, not adding port %d\n",</div><div class='del'>-				    be16_to_cpu(adapter-&gt;geneve_port),</div><div class='del'>-				    be16_to_cpu(ti-&gt;port));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='ctx'> 		adapter-&gt;geneve_port = ti-&gt;port;</div><div class='del'>-		adapter-&gt;geneve_port_cnt = 1;</div><div class='del'>-</div><div class='ctx'> 		t4_write_reg(adapter, MPS_RX_GENEVE_TYPE_A,</div><div class='ctx'> 			     GENEVE_V(be16_to_cpu(ti-&gt;port)) | GENEVE_EN_F);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		return;</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Create a 'match all' mac filter entry for inner mac,</div><div class='hunk'>@@ -3268,19 +3803,27 @@ static void cxgb_add_udp_tunnel(struct net_device *netdev,</div><div class='ctx'> 		ret = t4_alloc_raw_mac_filt(adapter, pi-&gt;viid,</div><div class='ctx'> 					    match_all_mac,</div><div class='ctx'> 					    match_all_mac,</div><div class='del'>-					    adapter-&gt;rawf_start +</div><div class='del'>-					    pi-&gt;port_id,</div><div class='add'>+					    adapter-&gt;rawf_start + pi-&gt;port_id,</div><div class='ctx'> 					    1, pi-&gt;port_id, false);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='ctx'> 			netdev_info(netdev, "Failed to allocate a mac filter entry, not adding port %d\n",</div><div class='ctx'> 				    be16_to_cpu(ti-&gt;port));</div><div class='del'>-			cxgb_del_udp_tunnel(netdev, ti);</div><div class='del'>-			return;</div><div class='add'>+			return ret;</div><div class='ctx'> 		}</div><div class='del'>-		atomic_inc(&amp;adapter-&gt;mps_encap[ret].refcnt);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct udp_tunnel_nic_info cxgb_udp_tunnels = {</div><div class='add'>+	.set_port	= cxgb_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= cxgb_udp_tunnel_unset_port,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN,  },</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_GENEVE, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static netdev_features_t cxgb_features_check(struct sk_buff *skb,</div><div class='ctx'> 					     struct net_device *dev,</div><div class='ctx'> 					     netdev_features_t features)</div><div class='hunk'>@@ -3319,7 +3862,7 @@ static const struct net_device_ops cxgb4_netdev_ops = {</div><div class='ctx'> 	.ndo_set_mac_address  = cxgb_set_mac_addr,</div><div class='ctx'> 	.ndo_set_features     = cxgb_set_features,</div><div class='ctx'> 	.ndo_validate_addr    = eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl         = cxgb_ioctl,</div><div class='add'>+	.ndo_eth_ioctl         = cxgb_ioctl,</div><div class='ctx'> 	.ndo_change_mtu       = cxgb_change_mtu,</div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='ctx'> 	.ndo_poll_controller  = cxgb_netpoll,</div><div class='hunk'>@@ -3330,10 +3873,10 @@ static const struct net_device_ops cxgb4_netdev_ops = {</div><div class='ctx'> #endif /* CONFIG_CHELSIO_T4_FCOE */</div><div class='ctx'> 	.ndo_set_tx_maxrate   = cxgb_set_tx_maxrate,</div><div class='ctx'> 	.ndo_setup_tc         = cxgb_setup_tc,</div><div class='del'>-	.ndo_udp_tunnel_add   = cxgb_add_udp_tunnel,</div><div class='del'>-	.ndo_udp_tunnel_del   = cxgb_del_udp_tunnel,</div><div class='ctx'> 	.ndo_features_check   = cxgb_features_check,</div><div class='ctx'> 	.ndo_fix_features     = cxgb_fix_features,</div><div class='add'>+	.ndo_hwtstamp_get     = cxgb_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set     = cxgb_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PCI_IOV</div><div class='hunk'>@@ -3346,23 +3889,21 @@ static const struct net_device_ops cxgb4_mgmt_netdev_ops = {</div><div class='ctx'> 	.ndo_set_vf_vlan        = cxgb4_mgmt_set_vf_vlan,</div><div class='ctx'> 	.ndo_set_vf_link_state	= cxgb4_mgmt_set_vf_link_state,</div><div class='ctx'> };</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> static void cxgb4_mgmt_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 				   struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, cxgb4_driver_name, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, cxgb4_driver_version,</div><div class='del'>-		sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(info-&gt;driver, cxgb4_driver_name, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops cxgb4_mgmt_ethtool_ops = {</div><div class='ctx'> 	.get_drvinfo       = cxgb4_mgmt_get_drvinfo,</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static void notify_fatal_err(struct work_struct *work)</div><div class='ctx'> {</div><div class='hunk'>@@ -3459,7 +4000,7 @@ static void adap_free_hma_mem(struct adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;hma.flags &amp; HMA_DMA_MAPPED_FLAG) {</div><div class='ctx'> 		dma_unmap_sg(adapter-&gt;pdev_dev, adapter-&gt;hma.sgt-&gt;sgl,</div><div class='del'>-			     adapter-&gt;hma.sgt-&gt;nents, PCI_DMA_BIDIRECTIONAL);</div><div class='add'>+			     adapter-&gt;hma.sgt-&gt;nents, DMA_BIDIRECTIONAL);</div><div class='ctx'> 		adapter-&gt;hma.flags &amp;= ~HMA_DMA_MAPPED_FLAG;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3878,8 +4419,7 @@ static int adap_init0_phy(struct adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 	/* Load PHY Firmware onto adapter.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = t4_load_phy_fw(adap, MEMWIN_NIC, &amp;adap-&gt;win0_lock,</div><div class='del'>-			     phy_info-&gt;phy_fw_version,</div><div class='add'>+	ret = t4_load_phy_fw(adap, MEMWIN_NIC, phy_info-&gt;phy_fw_version,</div><div class='ctx'> 			     (u8 *)phyf-&gt;data, phyf-&gt;size);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "PHY Firmware transfer error %d\n",</div><div class='hunk'>@@ -3905,14 +4445,14 @@ static int adap_init0_phy(struct adapter *adap)</div><div class='ctx'>  */</div><div class='ctx'> static int adap_init0_config(struct adapter *adapter, int reset)</div><div class='ctx'> {</div><div class='add'>+	char *fw_config_file, fw_config_file_path[256];</div><div class='add'>+	u32 finiver, finicsum, cfcsum, param, val;</div><div class='ctx'> 	struct fw_caps_config_cmd caps_cmd;</div><div class='del'>-	const struct firmware *cf;</div><div class='ctx'> 	unsigned long mtype = 0, maddr = 0;</div><div class='del'>-	u32 finiver, finicsum, cfcsum;</div><div class='del'>-	int ret;</div><div class='del'>-	int config_issued = 0;</div><div class='del'>-	char *fw_config_file, fw_config_file_path[256];</div><div class='add'>+	const struct firmware *cf;</div><div class='ctx'> 	char *config_name = NULL;</div><div class='add'>+	int config_issued = 0;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reset device if necessary.</div><div class='hunk'>@@ -4020,6 +4560,24 @@ static int adap_init0_config(struct adapter *adapter, int reset)</div><div class='ctx'> 			goto bye;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	val = 0;</div><div class='add'>+</div><div class='add'>+	/* Ofld + Hash filter is supported. Older fw will fail this request and</div><div class='add'>+	 * it is fine.</div><div class='add'>+	 */</div><div class='add'>+	param = (FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) |</div><div class='add'>+		 FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_HASHFILTER_WITH_OFLD));</div><div class='add'>+	ret = t4_set_params(adapter, adapter-&gt;mbox, adapter-&gt;pf, 0,</div><div class='add'>+			    1, &amp;param, &amp;val);</div><div class='add'>+</div><div class='add'>+	/* FW doesn't know about Hash filter + ofld support,</div><div class='add'>+	 * it's not a problem, don't return an error.</div><div class='add'>+	 */</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_warn(adapter-&gt;pdev_dev,</div><div class='add'>+			 "Hash filter with ofld is not supported by FW\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Issue a Capability Configuration command to the firmware to get it</div><div class='ctx'> 	 * to parse the Configuration File.  We don't use t4_fw_config_file()</div><div class='hunk'>@@ -4096,6 +4654,14 @@ static int adap_init0_config(struct adapter *adapter, int reset)</div><div class='ctx'> 		dev_err(adapter-&gt;pdev_dev,</div><div class='ctx'> 			"HMA configuration failed with error %d\n", ret);</div><div class='ctx'> </div><div class='add'>+	if (is_t6(adapter-&gt;params.chip)) {</div><div class='add'>+		adap_config_hpfilter(adapter);</div><div class='add'>+		ret = setup_ppod_edram(adapter);</div><div class='add'>+		if (!ret)</div><div class='add'>+			dev_info(adapter-&gt;pdev_dev, "Successfully enabled "</div><div class='add'>+				 "ppod edram feature\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * And finally tell the firmware to initialize itself using the</div><div class='ctx'> 	 * parameters from the Configuration File.</div><div class='hunk'>@@ -4185,14 +4751,14 @@ static struct fw_info *find_fw_info(int chip)</div><div class='ctx'> /*</div><div class='ctx'>  * Phase 0 of initialization: contact FW, obtain config, perform basic init.</div><div class='ctx'>  */</div><div class='del'>-static int adap_init0(struct adapter *adap)</div><div class='add'>+static int adap_init0(struct adapter *adap, int vpd_skip)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	u32 v, port_vec;</div><div class='del'>-	enum dev_state state;</div><div class='del'>-	u32 params[7], val[7];</div><div class='ctx'> 	struct fw_caps_config_cmd caps_cmd;</div><div class='add'>+	u32 params[7], val[7];</div><div class='add'>+	enum dev_state state;</div><div class='add'>+	u32 v, port_vec;</div><div class='ctx'> 	int reset = 1;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Grab Firmware Device Log parameters as early as possible so we have</div><div class='ctx'> 	 * access to it for debugging, etc.</div><div class='hunk'>@@ -4252,7 +4818,7 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 			goto bye;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		/* Get FW from from /lib/firmware/ */</div><div class='add'>+		/* Get FW from /lib/firmware/ */</div><div class='ctx'> 		ret = request_firmware(&amp;fw, fw_info-&gt;fw_mod_name,</div><div class='ctx'> 				       adap-&gt;pdev_dev);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='hunk'>@@ -4347,9 +4913,11 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 	 * could have FLASHed a new VPD which won't be read by the firmware</div><div class='ctx'> 	 * until we do the RESET ...</div><div class='ctx'> 	 */</div><div class='del'>-	ret = t4_get_vpd_params(adap, &amp;adap-&gt;params.vpd);</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto bye;</div><div class='add'>+	if (!vpd_skip) {</div><div class='add'>+		ret = t4_get_vpd_params(adap, &amp;adap-&gt;params.vpd);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto bye;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Find out what ports are available to us.  Note that we need to do</div><div class='ctx'> 	 * this before calling adap_init0_no_config() since it needs nports</div><div class='hunk'>@@ -4397,16 +4965,6 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Grab some of our basic fundamental operating parameters.</div><div class='ctx'> 	 */</div><div class='del'>-#define FW_PARAM_DEV(param) \</div><div class='del'>-	(FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) | \</div><div class='del'>-	FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_##param))</div><div class='del'>-</div><div class='del'>-#define FW_PARAM_PFVF(param) \</div><div class='del'>-	FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_PFVF) | \</div><div class='del'>-	FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_PFVF_##param)|  \</div><div class='del'>-	FW_PARAMS_PARAM_Y_V(0) | \</div><div class='del'>-	FW_PARAMS_PARAM_Z_V(0)</div><div class='del'>-</div><div class='ctx'> 	params[0] = FW_PARAM_PFVF(EQ_START);</div><div class='ctx'> 	params[1] = FW_PARAM_PFVF(L2T_START);</div><div class='ctx'> 	params[2] = FW_PARAM_PFVF(L2T_END);</div><div class='hunk'>@@ -4424,6 +4982,16 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 	adap-&gt;sge.ingr_start = val[5];</div><div class='ctx'> </div><div class='ctx'> 	if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &gt; CHELSIO_T5) {</div><div class='add'>+		params[0] = FW_PARAM_PFVF(HPFILTER_START);</div><div class='add'>+		params[1] = FW_PARAM_PFVF(HPFILTER_END);</div><div class='add'>+		ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 2,</div><div class='add'>+				      params, val);</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto bye;</div><div class='add'>+</div><div class='add'>+		adap-&gt;tids.hpftid_base = val[0];</div><div class='add'>+		adap-&gt;tids.nhpftids = val[1] - val[0] + 1;</div><div class='add'>+</div><div class='ctx'> 		/* Read the raw mps entries. In T6, the last 2 tcam entries</div><div class='ctx'> 		 * are reserved for raw mac addresses (rawf = 2, one per port).</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -4435,6 +5003,9 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 			adap-&gt;rawf_start = val[0];</div><div class='ctx'> 			adap-&gt;rawf_cnt = val[1] - val[0] + 1;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		adap-&gt;tids.tid_base =</div><div class='add'>+			t4_read_reg(adap, LE_DB_ACTIVE_TABLE_START_INDEX_A);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* qids (ingress/egress) returned from firmware can be anywhere</div><div class='hunk'>@@ -4468,23 +5039,20 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 	/* Allocate the memory for the vaious egress queue bitmaps</div><div class='ctx'> 	 * ie starving_fl, txq_maperr and blocked_fl.</div><div class='ctx'> 	 */</div><div class='del'>-	adap-&gt;sge.starving_fl =	kcalloc(BITS_TO_LONGS(adap-&gt;sge.egr_sz),</div><div class='del'>-					sizeof(long), GFP_KERNEL);</div><div class='add'>+	adap-&gt;sge.starving_fl = bitmap_zalloc(adap-&gt;sge.egr_sz, GFP_KERNEL);</div><div class='ctx'> 	if (!adap-&gt;sge.starving_fl) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto bye;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adap-&gt;sge.txq_maperr = kcalloc(BITS_TO_LONGS(adap-&gt;sge.egr_sz),</div><div class='del'>-				       sizeof(long), GFP_KERNEL);</div><div class='add'>+	adap-&gt;sge.txq_maperr = bitmap_zalloc(adap-&gt;sge.egr_sz, GFP_KERNEL);</div><div class='ctx'> 	if (!adap-&gt;sge.txq_maperr) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto bye;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='del'>-	adap-&gt;sge.blocked_fl = kcalloc(BITS_TO_LONGS(adap-&gt;sge.egr_sz),</div><div class='del'>-				       sizeof(long), GFP_KERNEL);</div><div class='add'>+	adap-&gt;sge.blocked_fl = bitmap_zalloc(adap-&gt;sge.egr_sz, GFP_KERNEL);</div><div class='ctx'> 	if (!adap-&gt;sge.blocked_fl) {</div><div class='ctx'> 		ret = -ENOMEM;</div><div class='ctx'> 		goto bye;</div><div class='hunk'>@@ -4499,11 +5067,18 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 	adap-&gt;clipt_start = val[0];</div><div class='ctx'> 	adap-&gt;clipt_end = val[1];</div><div class='ctx'> </div><div class='del'>-	/* We don't yet have a PARAMs calls to retrieve the number of Traffic</div><div class='del'>-	 * Classes supported by the hardware/firmware so we hard code it here</div><div class='del'>-	 * for now.</div><div class='del'>-	 */</div><div class='del'>-	adap-&gt;params.nsched_cls = is_t4(adap-&gt;params.chip) ? 15 : 16;</div><div class='add'>+	/* Get the supported number of traffic classes */</div><div class='add'>+	params[0] = FW_PARAM_DEV(NUM_TM_CLASS);</div><div class='add'>+	ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1, params, val);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		/* We couldn't retrieve the number of Traffic Classes</div><div class='add'>+		 * supported by the hardware/firmware. So we hard</div><div class='add'>+		 * code it here.</div><div class='add'>+		 */</div><div class='add'>+		adap-&gt;params.nsched_cls = is_t4(adap-&gt;params.chip) ? 15 : 16;</div><div class='add'>+	} else {</div><div class='add'>+		adap-&gt;params.nsched_cls = val[0];</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* query params related to active filter region */</div><div class='ctx'> 	params[0] = FW_PARAM_PFVF(ACTIVE_FILTER_START);</div><div class='hunk'>@@ -4550,7 +5125,7 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> </div><div class='ctx'> 	/* See if FW supports FW_FILTER2 work request */</div><div class='ctx'> 	if (is_t4(adap-&gt;params.chip)) {</div><div class='del'>-		adap-&gt;params.filter2_wr_support = 0;</div><div class='add'>+		adap-&gt;params.filter2_wr_support = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		params[0] = FW_PARAM_DEV(FILTER2_WR);</div><div class='ctx'> 		ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0,</div><div class='hunk'>@@ -4580,8 +5155,16 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto bye;</div><div class='ctx'> </div><div class='add'>+	/* hash filter has some mandatory register settings to be tested and for</div><div class='add'>+	 * that it needs to test whether offload is enabled or not, hence</div><div class='add'>+	 * checking and setting it here.</div><div class='add'>+	 */</div><div class='add'>+	if (caps_cmd.ofldcaps)</div><div class='add'>+		adap-&gt;params.offload = 1;</div><div class='add'>+</div><div class='ctx'> 	if (caps_cmd.ofldcaps ||</div><div class='del'>-	    (caps_cmd.niccaps &amp; htons(FW_CAPS_CONFIG_NIC_HASHFILTER))) {</div><div class='add'>+	    (caps_cmd.niccaps &amp; htons(FW_CAPS_CONFIG_NIC_HASHFILTER)) ||</div><div class='add'>+	    (caps_cmd.niccaps &amp; htons(FW_CAPS_CONFIG_NIC_ETHOFLD))) {</div><div class='ctx'> 		/* query offload-related parameters */</div><div class='ctx'> 		params[0] = FW_PARAM_DEV(NTID);</div><div class='ctx'> 		params[1] = FW_PARAM_PFVF(SERVER_START);</div><div class='hunk'>@@ -4619,13 +5202,23 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 		adap-&gt;params.ofldq_wr_cred = val[5];</div><div class='ctx'> </div><div class='ctx'> 		if (caps_cmd.niccaps &amp; htons(FW_CAPS_CONFIG_NIC_HASHFILTER)) {</div><div class='del'>-			ret = init_hash_filter(adap);</div><div class='del'>-			if (ret &lt; 0)</div><div class='del'>-				goto bye;</div><div class='add'>+			init_hash_filter(adap);</div><div class='ctx'> 		} else {</div><div class='del'>-			adap-&gt;params.offload = 1;</div><div class='ctx'> 			adap-&gt;num_ofld_uld += 1;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		if (caps_cmd.niccaps &amp; htons(FW_CAPS_CONFIG_NIC_ETHOFLD)) {</div><div class='add'>+			params[0] = FW_PARAM_PFVF(ETHOFLD_START);</div><div class='add'>+			params[1] = FW_PARAM_PFVF(ETHOFLD_END);</div><div class='add'>+			ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 2,</div><div class='add'>+					      params, val);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				adap-&gt;tids.eotid_base = val[0];</div><div class='add'>+				adap-&gt;tids.neotids = min_t(u32, MAX_ATIDS,</div><div class='add'>+							   val[1] - val[0] + 1);</div><div class='add'>+				adap-&gt;params.ethofld = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	if (caps_cmd.rdmacaps) {</div><div class='ctx'> 		params[0] = FW_PARAM_PFVF(STAG_START);</div><div class='hunk'>@@ -4715,6 +5308,22 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 			goto bye;</div><div class='ctx'> 		adap-&gt;vres.iscsi.start = val[0];</div><div class='ctx'> 		adap-&gt;vres.iscsi.size = val[1] - val[0] + 1;</div><div class='add'>+		if (is_t6(adap-&gt;params.chip)) {</div><div class='add'>+			params[0] = FW_PARAM_PFVF(PPOD_EDRAM_START);</div><div class='add'>+			params[1] = FW_PARAM_PFVF(PPOD_EDRAM_END);</div><div class='add'>+			ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 2,</div><div class='add'>+					      params, val);</div><div class='add'>+			if (!ret) {</div><div class='add'>+				adap-&gt;vres.ppod_edram.start = val[0];</div><div class='add'>+				adap-&gt;vres.ppod_edram.size =</div><div class='add'>+					val[1] - val[0] + 1;</div><div class='add'>+</div><div class='add'>+				dev_info(adap-&gt;pdev_dev,</div><div class='add'>+					 "ppod edram start 0x%x end 0x%x size 0x%x\n",</div><div class='add'>+					 val[0], val[1],</div><div class='add'>+					 adap-&gt;vres.ppod_edram.size);</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		/* LIO target and cxgb4i initiaitor */</div><div class='ctx'> 		adap-&gt;num_ofld_uld += 2;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4746,8 +5355,6 @@ static int adap_init0(struct adapter *adap)</div><div class='ctx'> 		}</div><div class='ctx'> 		adap-&gt;params.crypto = ntohs(caps_cmd.cryptocaps);</div><div class='ctx'> 	}</div><div class='del'>-#undef FW_PARAM_PFVF</div><div class='del'>-#undef FW_PARAM_DEV</div><div class='ctx'> </div><div class='ctx'> 	/* The MTU/MSS Table is initialized by now, so load their values.  If</div><div class='ctx'> 	 * we're initializing the adapter, then we'll make any modifications</div><div class='hunk'>@@ -4798,10 +5405,10 @@ bye:</div><div class='ctx'> 	adap_free_hma_mem(adap);</div><div class='ctx'> 	kfree(adap-&gt;sge.egr_map);</div><div class='ctx'> 	kfree(adap-&gt;sge.ingr_map);</div><div class='del'>-	kfree(adap-&gt;sge.starving_fl);</div><div class='del'>-	kfree(adap-&gt;sge.txq_maperr);</div><div class='add'>+	bitmap_free(adap-&gt;sge.starving_fl);</div><div class='add'>+	bitmap_free(adap-&gt;sge.txq_maperr);</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='del'>-	kfree(adap-&gt;sge.blocked_fl);</div><div class='add'>+	bitmap_free(adap-&gt;sge.blocked_fl);</div><div class='ctx'> #endif</div><div class='ctx'> 	if (ret != -ETIMEDOUT &amp;&amp; ret != -EIO)</div><div class='ctx'> 		t4_fw_bye(adap, adap-&gt;mbox);</div><div class='hunk'>@@ -4851,7 +5458,6 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	if (!adap) {</div><div class='ctx'> 		pci_restore_state(pdev);</div><div class='del'>-		pci_save_state(pdev);</div><div class='ctx'> 		return PCI_ERS_RESULT_RECOVERED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -4866,7 +5472,6 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	pci_restore_state(pdev);</div><div class='del'>-	pci_save_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (t4_wait_dev_ready(adap-&gt;regs) &lt; 0)</div><div class='ctx'> 		return PCI_ERS_RESULT_DISCONNECT;</div><div class='hunk'>@@ -4929,10 +5534,93 @@ static void eeh_resume(struct pci_dev *pdev)</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void eeh_reset_prepare(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = pci_get_drvdata(pdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;pf != 4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;flags &amp;= ~CXGB4_FW_OK;</div><div class='add'>+</div><div class='add'>+	notify_ulds(adapter, CXGB4_STATE_DOWN);</div><div class='add'>+</div><div class='add'>+	for_each_port(adapter, i)</div><div class='add'>+		if (adapter-&gt;port[i]-&gt;reg_state == NETREG_REGISTERED)</div><div class='add'>+			cxgb_close(adapter-&gt;port[i]);</div><div class='add'>+</div><div class='add'>+	disable_interrupts(adapter);</div><div class='add'>+	cxgb4_free_mps_ref_entries(adapter);</div><div class='add'>+</div><div class='add'>+	adap_free_hma_mem(adapter);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='add'>+		cxgb_down(adapter);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eeh_reset_done(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adapter = pci_get_drvdata(pdev);</div><div class='add'>+	int err, i;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;pf != 4)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	err = t4_wait_dev_ready(adapter-&gt;regs);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"Device not ready, err %d", err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setup_memwin(adapter);</div><div class='add'>+</div><div class='add'>+	err = adap_init0(adapter, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"Adapter init failed, err %d", err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	setup_memwin_rdma(adapter);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;flags &amp; CXGB4_FW_OK) {</div><div class='add'>+		err = t4_port_init(adapter, adapter-&gt;pf, adapter-&gt;pf, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+				"Port init failed, err %d", err);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = cfg_queues(adapter);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"Config queues failed, err %d", err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_init_mps_ref_entries(adapter);</div><div class='add'>+</div><div class='add'>+	err = setup_fw_sge_queues(adapter);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"FW sge queue allocation failed, err %d", err);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for_each_port(adapter, i)</div><div class='add'>+		if (adapter-&gt;port[i]-&gt;reg_state == NETREG_REGISTERED)</div><div class='add'>+			cxgb_open(adapter-&gt;port[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct pci_error_handlers cxgb4_eeh = {</div><div class='ctx'> 	.error_detected = eeh_err_detected,</div><div class='ctx'> 	.slot_reset     = eeh_slot_reset,</div><div class='ctx'> 	.resume         = eeh_resume,</div><div class='add'>+	.reset_prepare  = eeh_reset_prepare,</div><div class='add'>+	.reset_done     = eeh_reset_done,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Return true if the Link Configuration supports "High Speeds" (those greater</div><div class='hunk'>@@ -4949,26 +5637,24 @@ static inline bool is_x_10g_port(const struct link_config *lc)</div><div class='ctx'> 	return high_speeds != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Perform default configuration of DMA queues depending on the number and type</div><div class='add'>+/* Perform default configuration of DMA queues depending on the number and type</div><div class='ctx'>  * of ports we found and the number of available CPUs.  Most settings can be</div><div class='ctx'>  * modified by the admin prior to actual use.</div><div class='ctx'>  */</div><div class='ctx'> static int cfg_queues(struct adapter *adap)</div><div class='ctx'> {</div><div class='add'>+	u32 avail_qsets, avail_eth_qsets, avail_uld_qsets;</div><div class='add'>+	u32 ncpus = num_online_cpus();</div><div class='add'>+	u32 niqflint, neq, num_ulds;</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='del'>-	int i, n10g = 0, qidx = 0;</div><div class='del'>-	int niqflint, neq, avail_eth_qsets;</div><div class='del'>-	int max_eth_qsets = 32;</div><div class='del'>-#ifndef CONFIG_CHELSIO_T4_DCB</div><div class='del'>-	int q10g = 0;</div><div class='del'>-#endif</div><div class='add'>+	u32 i, n10g = 0, qidx = 0;</div><div class='add'>+	u32 q10g = 0, q1g;</div><div class='ctx'> </div><div class='del'>-	/* Reduce memory usage in kdump environment, disable all offload.</div><div class='del'>-	 */</div><div class='add'>+	/* Reduce memory usage in kdump environment, disable all offload. */</div><div class='ctx'> 	if (is_kdump_kernel() || (is_uld(adap) &amp;&amp; t4_uld_mem_alloc(adap))) {</div><div class='ctx'> 		adap-&gt;params.offload = 0;</div><div class='ctx'> 		adap-&gt;params.crypto = 0;</div><div class='add'>+		adap-&gt;params.ethofld = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate the number of Ethernet Queue Sets available based on</div><div class='hunk'>@@ -4987,14 +5673,11 @@ static int cfg_queues(struct adapter *adap)</div><div class='ctx'> 	if (!(adap-&gt;flags &amp; CXGB4_USING_MSIX))</div><div class='ctx'> 		niqflint--;</div><div class='ctx'> 	neq = adap-&gt;params.pfres.neq / 2;</div><div class='del'>-	avail_eth_qsets = min(niqflint, neq);</div><div class='add'>+	avail_qsets = min(niqflint, neq);</div><div class='ctx'> </div><div class='del'>-	if (avail_eth_qsets &gt; max_eth_qsets)</div><div class='del'>-		avail_eth_qsets = max_eth_qsets;</div><div class='del'>-</div><div class='del'>-	if (avail_eth_qsets &lt; adap-&gt;params.nports) {</div><div class='add'>+	if (avail_qsets &lt; adap-&gt;params.nports) {</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "avail_eth_qsets=%d &lt; nports=%d\n",</div><div class='del'>-			avail_eth_qsets, adap-&gt;params.nports);</div><div class='add'>+			avail_qsets, adap-&gt;params.nports);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -5002,63 +5685,103 @@ static int cfg_queues(struct adapter *adap)</div><div class='ctx'> 	for_each_port(adap, i)</div><div class='ctx'> 		n10g += is_x_10g_port(&amp;adap2pinfo(adap, i)-&gt;link_cfg);</div><div class='ctx'> </div><div class='add'>+	avail_eth_qsets = min_t(u32, avail_qsets, MAX_ETH_QSETS);</div><div class='add'>+</div><div class='add'>+	/* We default to 1 queue per non-10G port and up to # of cores queues</div><div class='add'>+	 * per 10G port.</div><div class='add'>+	 */</div><div class='add'>+	if (n10g)</div><div class='add'>+		q10g = (avail_eth_qsets - (adap-&gt;params.nports - n10g)) / n10g;</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_CHELSIO_T4_DCB</div><div class='ctx'> 	/* For Data Center Bridging support we need to be able to support up</div><div class='ctx'> 	 * to 8 Traffic Priorities; each of which will be assigned to its</div><div class='ctx'> 	 * own TX Queue in order to prevent Head-Of-Line Blocking.</div><div class='ctx'> 	 */</div><div class='add'>+	q1g = 8;</div><div class='ctx'> 	if (adap-&gt;params.nports * 8 &gt; avail_eth_qsets) {</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "DCB avail_eth_qsets=%d &lt; %d!\n",</div><div class='ctx'> 			avail_eth_qsets, adap-&gt;params.nports * 8);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for_each_port(adap, i) {</div><div class='del'>-		struct port_info *pi = adap2pinfo(adap, i);</div><div class='add'>+	if (adap-&gt;params.nports * ncpus &lt; avail_eth_qsets)</div><div class='add'>+		q10g = max(8U, ncpus);</div><div class='add'>+	else</div><div class='add'>+		q10g = max(8U, q10g);</div><div class='ctx'> </div><div class='del'>-		pi-&gt;first_qset = qidx;</div><div class='del'>-		pi-&gt;nqsets = is_kdump_kernel() ? 1 : 8;</div><div class='del'>-		qidx += pi-&gt;nqsets;</div><div class='del'>-	}</div><div class='del'>-#else /* !CONFIG_CHELSIO_T4_DCB */</div><div class='del'>-	/*</div><div class='del'>-	 * We default to 1 queue per non-10G port and up to # of cores queues</div><div class='del'>-	 * per 10G port.</div><div class='del'>-	 */</div><div class='del'>-	if (n10g)</div><div class='del'>-		q10g = (avail_eth_qsets - (adap-&gt;params.nports - n10g)) / n10g;</div><div class='del'>-	if (q10g &gt; netif_get_num_default_rss_queues())</div><div class='del'>-		q10g = netif_get_num_default_rss_queues();</div><div class='add'>+	while ((q10g * n10g) &gt;</div><div class='add'>+	       (avail_eth_qsets - (adap-&gt;params.nports - n10g) * q1g))</div><div class='add'>+		q10g--;</div><div class='ctx'> </div><div class='del'>-	if (is_kdump_kernel())</div><div class='add'>+#else /* !CONFIG_CHELSIO_T4_DCB */</div><div class='add'>+	q1g = 1;</div><div class='add'>+	q10g = min(q10g, ncpus);</div><div class='add'>+#endif /* !CONFIG_CHELSIO_T4_DCB */</div><div class='add'>+	if (is_kdump_kernel()) {</div><div class='ctx'> 		q10g = 1;</div><div class='add'>+		q1g = 1;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adap, i) {</div><div class='ctx'> 		struct port_info *pi = adap2pinfo(adap, i);</div><div class='ctx'> </div><div class='ctx'> 		pi-&gt;first_qset = qidx;</div><div class='del'>-		pi-&gt;nqsets = is_x_10g_port(&amp;pi-&gt;link_cfg) ? q10g : 1;</div><div class='add'>+		pi-&gt;nqsets = is_x_10g_port(&amp;pi-&gt;link_cfg) ? q10g : q1g;</div><div class='ctx'> 		qidx += pi-&gt;nqsets;</div><div class='ctx'> 	}</div><div class='del'>-#endif /* !CONFIG_CHELSIO_T4_DCB */</div><div class='ctx'> </div><div class='ctx'> 	s-&gt;ethqsets = qidx;</div><div class='ctx'> 	s-&gt;max_ethqsets = qidx;   /* MSI-X may lower it later */</div><div class='add'>+	avail_qsets -= qidx;</div><div class='ctx'> </div><div class='ctx'> 	if (is_uld(adap)) {</div><div class='del'>-		/*</div><div class='del'>-		 * For offload we use 1 queue/channel if all ports are up to 1G,</div><div class='add'>+		/* For offload we use 1 queue/channel if all ports are up to 1G,</div><div class='ctx'> 		 * otherwise we divide all available queues amongst the channels</div><div class='ctx'> 		 * capped by the number of available cores.</div><div class='ctx'> 		 */</div><div class='del'>-		if (n10g) {</div><div class='del'>-			i = min_t(int, MAX_OFLD_QSETS, num_online_cpus());</div><div class='del'>-			s-&gt;ofldqsets = roundup(i, adap-&gt;params.nports);</div><div class='del'>-		} else {</div><div class='add'>+		num_ulds = adap-&gt;num_uld + adap-&gt;num_ofld_uld;</div><div class='add'>+		i = min_t(u32, MAX_OFLD_QSETS, ncpus);</div><div class='add'>+		avail_uld_qsets = roundup(i, adap-&gt;params.nports);</div><div class='add'>+		if (avail_qsets &lt; num_ulds * adap-&gt;params.nports) {</div><div class='add'>+			adap-&gt;params.offload = 0;</div><div class='add'>+			adap-&gt;params.crypto = 0;</div><div class='add'>+			s-&gt;ofldqsets = 0;</div><div class='add'>+		} else if (avail_qsets &lt; num_ulds * avail_uld_qsets || !n10g) {</div><div class='ctx'> 			s-&gt;ofldqsets = adap-&gt;params.nports;</div><div class='add'>+		} else {</div><div class='add'>+			s-&gt;ofldqsets = avail_uld_qsets;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		avail_qsets -= num_ulds * s-&gt;ofldqsets;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* ETHOFLD Queues used for QoS offload should follow same</div><div class='add'>+	 * allocation scheme as normal Ethernet Queues.</div><div class='add'>+	 */</div><div class='add'>+	if (is_ethofld(adap)) {</div><div class='add'>+		if (avail_qsets &lt; s-&gt;max_ethqsets) {</div><div class='add'>+			adap-&gt;params.ethofld = 0;</div><div class='add'>+			s-&gt;eoqsets = 0;</div><div class='add'>+		} else {</div><div class='add'>+			s-&gt;eoqsets = s-&gt;max_ethqsets;</div><div class='add'>+		}</div><div class='add'>+		avail_qsets -= s-&gt;eoqsets;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Mirror queues must follow same scheme as normal Ethernet</div><div class='add'>+	 * Queues, when there are enough queues available. Otherwise,</div><div class='add'>+	 * allocate at least 1 queue per port. If even 1 queue is not</div><div class='add'>+	 * available, then disable mirror queues support.</div><div class='add'>+	 */</div><div class='add'>+	if (avail_qsets &gt;= s-&gt;max_ethqsets)</div><div class='add'>+		s-&gt;mirrorqsets = s-&gt;max_ethqsets;</div><div class='add'>+	else if (avail_qsets &gt;= adap-&gt;params.nports)</div><div class='add'>+		s-&gt;mirrorqsets = adap-&gt;params.nports;</div><div class='add'>+	else</div><div class='add'>+		s-&gt;mirrorqsets = 0;</div><div class='add'>+	avail_qsets -= s-&gt;mirrorqsets;</div><div class='add'>+</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(s-&gt;ethrxq); i++) {</div><div class='ctx'> 		struct sge_eth_rxq *r = &amp;s-&gt;ethrxq[i];</div><div class='ctx'> </div><div class='hunk'>@@ -5109,42 +5832,61 @@ static void reduce_ethqs(struct adapter *adap, int n)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int get_msix_info(struct adapter *adap)</div><div class='add'>+static int alloc_msix_info(struct adapter *adap, u32 num_vec)</div><div class='ctx'> {</div><div class='del'>-	struct uld_msix_info *msix_info;</div><div class='del'>-	unsigned int max_ingq = 0;</div><div class='del'>-</div><div class='del'>-	if (is_offload(adap))</div><div class='del'>-		max_ingq += MAX_OFLD_QSETS * adap-&gt;num_ofld_uld;</div><div class='del'>-	if (is_pci_uld(adap))</div><div class='del'>-		max_ingq += MAX_OFLD_QSETS * adap-&gt;num_uld;</div><div class='add'>+	struct msix_info *msix_info;</div><div class='ctx'> </div><div class='del'>-	if (!max_ingq)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	msix_info = kcalloc(max_ingq, sizeof(*msix_info), GFP_KERNEL);</div><div class='add'>+	msix_info = kcalloc(num_vec, sizeof(*msix_info), GFP_KERNEL);</div><div class='ctx'> 	if (!msix_info)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	adap-&gt;msix_bmap_ulds.msix_bmap = kcalloc(BITS_TO_LONGS(max_ingq),</div><div class='del'>-						 sizeof(long), GFP_KERNEL);</div><div class='del'>-	if (!adap-&gt;msix_bmap_ulds.msix_bmap) {</div><div class='add'>+	adap-&gt;msix_bmap.msix_bmap = bitmap_zalloc(num_vec, GFP_KERNEL);</div><div class='add'>+	if (!adap-&gt;msix_bmap.msix_bmap) {</div><div class='ctx'> 		kfree(msix_info);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	spin_lock_init(&amp;adap-&gt;msix_bmap_ulds.lock);</div><div class='del'>-	adap-&gt;msix_info_ulds = msix_info;</div><div class='del'>-out:</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;adap-&gt;msix_bmap.lock);</div><div class='add'>+	adap-&gt;msix_bmap.mapsize = num_vec;</div><div class='add'>+</div><div class='add'>+	adap-&gt;msix_info = msix_info;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void free_msix_info(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	if (!(adap-&gt;num_uld &amp;&amp; adap-&gt;num_ofld_uld))</div><div class='del'>-		return;</div><div class='add'>+	bitmap_free(adap-&gt;msix_bmap.msix_bmap);</div><div class='add'>+	kfree(adap-&gt;msix_info);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_get_msix_idx_from_bmap(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct msix_bmap *bmap = &amp;adap-&gt;msix_bmap;</div><div class='add'>+	unsigned int msix_idx;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;bmap-&gt;lock, flags);</div><div class='add'>+	msix_idx = find_first_zero_bit(bmap-&gt;msix_bmap, bmap-&gt;mapsize);</div><div class='add'>+	if (msix_idx &lt; bmap-&gt;mapsize) {</div><div class='add'>+		__set_bit(msix_idx, bmap-&gt;msix_bmap);</div><div class='add'>+	} else {</div><div class='add'>+		spin_unlock_irqrestore(&amp;bmap-&gt;lock, flags);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;bmap-&gt;lock, flags);</div><div class='add'>+	return msix_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_free_msix_idx_in_bmap(struct adapter *adap,</div><div class='add'>+				 unsigned int msix_idx)</div><div class='add'>+{</div><div class='add'>+	struct msix_bmap *bmap = &amp;adap-&gt;msix_bmap;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='del'>-	kfree(adap-&gt;msix_info_ulds);</div><div class='del'>-	kfree(adap-&gt;msix_bmap_ulds.msix_bmap);</div><div class='add'>+	spin_lock_irqsave(&amp;bmap-&gt;lock, flags);</div><div class='add'>+	__clear_bit(msix_idx, bmap-&gt;msix_bmap);</div><div class='add'>+	spin_unlock_irqrestore(&amp;bmap-&gt;lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* 2 MSI-X vectors needed for the FW queue and non-data interrupts */</div><div class='hunk'>@@ -5152,88 +5894,194 @@ static void free_msix_info(struct adapter *adap)</div><div class='ctx'> </div><div class='ctx'> static int enable_msix(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	int ofld_need = 0, uld_need = 0;</div><div class='del'>-	int i, j, want, need, allocated;</div><div class='add'>+	u32 eth_need, uld_need = 0, ethofld_need = 0, mirror_need = 0;</div><div class='add'>+	u32 ethqsets = 0, ofldqsets = 0, eoqsets = 0, mirrorqsets = 0;</div><div class='add'>+	u8 num_uld = 0, nchan = adap-&gt;params.nports;</div><div class='add'>+	u32 i, want, need, num_vec;</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='del'>-	unsigned int nchan = adap-&gt;params.nports;</div><div class='ctx'> 	struct msix_entry *entries;</div><div class='del'>-	int max_ingq = MAX_INGQ;</div><div class='del'>-</div><div class='del'>-	if (is_pci_uld(adap))</div><div class='del'>-		max_ingq += (MAX_OFLD_QSETS * adap-&gt;num_uld);</div><div class='del'>-	if (is_offload(adap))</div><div class='del'>-		max_ingq += (MAX_OFLD_QSETS * adap-&gt;num_ofld_uld);</div><div class='del'>-	entries = kmalloc_array(max_ingq + 1, sizeof(*entries),</div><div class='del'>-				GFP_KERNEL);</div><div class='del'>-	if (!entries)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	/* map for msix */</div><div class='del'>-	if (get_msix_info(adap)) {</div><div class='del'>-		adap-&gt;params.offload = 0;</div><div class='del'>-		adap-&gt;params.crypto = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_ingq + 1; ++i)</div><div class='del'>-		entries[i].entry = i;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	int allocated, ret;</div><div class='ctx'> </div><div class='del'>-	want = s-&gt;max_ethqsets + EXTRA_VECS;</div><div class='del'>-	if (is_offload(adap)) {</div><div class='del'>-		want += adap-&gt;num_ofld_uld * s-&gt;ofldqsets;</div><div class='del'>-		ofld_need = adap-&gt;num_ofld_uld * nchan;</div><div class='del'>-	}</div><div class='del'>-	if (is_pci_uld(adap)) {</div><div class='del'>-		want += adap-&gt;num_uld * s-&gt;ofldqsets;</div><div class='del'>-		uld_need = adap-&gt;num_uld * nchan;</div><div class='del'>-	}</div><div class='add'>+	want = s-&gt;max_ethqsets;</div><div class='ctx'> #ifdef CONFIG_CHELSIO_T4_DCB</div><div class='ctx'> 	/* For Data Center Bridging we need 8 Ethernet TX Priority Queues for</div><div class='ctx'> 	 * each port.</div><div class='ctx'> 	 */</div><div class='del'>-	need = 8 * adap-&gt;params.nports + EXTRA_VECS + ofld_need + uld_need;</div><div class='add'>+	need = 8 * nchan;</div><div class='ctx'> #else</div><div class='del'>-	need = adap-&gt;params.nports + EXTRA_VECS + ofld_need + uld_need;</div><div class='add'>+	need = nchan;</div><div class='ctx'> #endif</div><div class='add'>+	eth_need = need;</div><div class='add'>+	if (is_uld(adap)) {</div><div class='add'>+		num_uld = adap-&gt;num_ofld_uld + adap-&gt;num_uld;</div><div class='add'>+		want += num_uld * s-&gt;ofldqsets;</div><div class='add'>+		uld_need = num_uld * nchan;</div><div class='add'>+		need += uld_need;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_ethofld(adap)) {</div><div class='add'>+		want += s-&gt;eoqsets;</div><div class='add'>+		ethofld_need = eth_need;</div><div class='add'>+		need += ethofld_need;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (s-&gt;mirrorqsets) {</div><div class='add'>+		want += s-&gt;mirrorqsets;</div><div class='add'>+		mirror_need = nchan;</div><div class='add'>+		need += mirror_need;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	want += EXTRA_VECS;</div><div class='add'>+	need += EXTRA_VECS;</div><div class='add'>+</div><div class='add'>+	entries = kmalloc_array(want, sizeof(*entries), GFP_KERNEL);</div><div class='add'>+	if (!entries)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; want; i++)</div><div class='add'>+		entries[i].entry = i;</div><div class='add'>+</div><div class='ctx'> 	allocated = pci_enable_msix_range(adap-&gt;pdev, entries, need, want);</div><div class='ctx'> 	if (allocated &lt; 0) {</div><div class='del'>-		dev_info(adap-&gt;pdev_dev, "not enough MSI-X vectors left,"</div><div class='del'>-			 " not using MSI-X\n");</div><div class='del'>-		kfree(entries);</div><div class='del'>-		return allocated;</div><div class='add'>+		/* Disable offload and attempt to get vectors for NIC</div><div class='add'>+		 * only mode.</div><div class='add'>+		 */</div><div class='add'>+		want = s-&gt;max_ethqsets + EXTRA_VECS;</div><div class='add'>+		need = eth_need + EXTRA_VECS;</div><div class='add'>+		allocated = pci_enable_msix_range(adap-&gt;pdev, entries,</div><div class='add'>+						  need, want);</div><div class='add'>+		if (allocated &lt; 0) {</div><div class='add'>+			dev_info(adap-&gt;pdev_dev,</div><div class='add'>+				 "Disabling MSI-X due to insufficient MSI-X vectors\n");</div><div class='add'>+			ret = allocated;</div><div class='add'>+			goto out_free;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dev_info(adap-&gt;pdev_dev,</div><div class='add'>+			 "Disabling offload due to insufficient MSI-X vectors\n");</div><div class='add'>+		adap-&gt;params.offload = 0;</div><div class='add'>+		adap-&gt;params.crypto = 0;</div><div class='add'>+		adap-&gt;params.ethofld = 0;</div><div class='add'>+		s-&gt;ofldqsets = 0;</div><div class='add'>+		s-&gt;eoqsets = 0;</div><div class='add'>+		s-&gt;mirrorqsets = 0;</div><div class='add'>+		uld_need = 0;</div><div class='add'>+		ethofld_need = 0;</div><div class='add'>+		mirror_need = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	num_vec = allocated;</div><div class='add'>+	if (num_vec &lt; want) {</div><div class='add'>+		/* Distribute available vectors to the various queue groups.</div><div class='add'>+		 * Every group gets its minimum requirement and NIC gets top</div><div class='add'>+		 * priority for leftovers.</div><div class='add'>+		 */</div><div class='add'>+		ethqsets = eth_need;</div><div class='add'>+		if (is_uld(adap))</div><div class='add'>+			ofldqsets = nchan;</div><div class='add'>+		if (is_ethofld(adap))</div><div class='add'>+			eoqsets = ethofld_need;</div><div class='add'>+		if (s-&gt;mirrorqsets)</div><div class='add'>+			mirrorqsets = mirror_need;</div><div class='add'>+</div><div class='add'>+		num_vec -= need;</div><div class='add'>+		while (num_vec) {</div><div class='add'>+			if (num_vec &lt; eth_need + ethofld_need ||</div><div class='add'>+			    ethqsets &gt; s-&gt;max_ethqsets)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			for_each_port(adap, i) {</div><div class='add'>+				pi = adap2pinfo(adap, i);</div><div class='add'>+				if (pi-&gt;nqsets &lt; 2)</div><div class='add'>+					continue;</div><div class='add'>+</div><div class='add'>+				ethqsets++;</div><div class='add'>+				num_vec--;</div><div class='add'>+				if (ethofld_need) {</div><div class='add'>+					eoqsets++;</div><div class='add'>+					num_vec--;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (is_uld(adap)) {</div><div class='add'>+			while (num_vec) {</div><div class='add'>+				if (num_vec &lt; uld_need ||</div><div class='add'>+				    ofldqsets &gt; s-&gt;ofldqsets)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				ofldqsets++;</div><div class='add'>+				num_vec -= uld_need;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (s-&gt;mirrorqsets) {</div><div class='add'>+			while (num_vec) {</div><div class='add'>+				if (num_vec &lt; mirror_need ||</div><div class='add'>+				    mirrorqsets &gt; s-&gt;mirrorqsets)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				mirrorqsets++;</div><div class='add'>+				num_vec -= mirror_need;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		ethqsets = s-&gt;max_ethqsets;</div><div class='add'>+		if (is_uld(adap))</div><div class='add'>+			ofldqsets = s-&gt;ofldqsets;</div><div class='add'>+		if (is_ethofld(adap))</div><div class='add'>+			eoqsets = s-&gt;eoqsets;</div><div class='add'>+		if (s-&gt;mirrorqsets)</div><div class='add'>+			mirrorqsets = s-&gt;mirrorqsets;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Distribute available vectors to the various queue groups.</div><div class='del'>-	 * Every group gets its minimum requirement and NIC gets top</div><div class='del'>-	 * priority for leftovers.</div><div class='del'>-	 */</div><div class='del'>-	i = allocated - EXTRA_VECS - ofld_need - uld_need;</div><div class='del'>-	if (i &lt; s-&gt;max_ethqsets) {</div><div class='del'>-		s-&gt;max_ethqsets = i;</div><div class='del'>-		if (i &lt; s-&gt;ethqsets)</div><div class='del'>-			reduce_ethqs(adap, i);</div><div class='add'>+	if (ethqsets &lt; s-&gt;max_ethqsets) {</div><div class='add'>+		s-&gt;max_ethqsets = ethqsets;</div><div class='add'>+		reduce_ethqs(adap, ethqsets);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='ctx'> 	if (is_uld(adap)) {</div><div class='del'>-		if (allocated &lt; want)</div><div class='del'>-			s-&gt;nqs_per_uld = nchan;</div><div class='del'>-		else</div><div class='del'>-			s-&gt;nqs_per_uld = s-&gt;ofldqsets;</div><div class='add'>+		s-&gt;ofldqsets = ofldqsets;</div><div class='add'>+		s-&gt;nqs_per_uld = s-&gt;ofldqsets;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; (s-&gt;max_ethqsets + EXTRA_VECS); ++i)</div><div class='del'>-		adap-&gt;msix_info[i].vec = entries[i].vector;</div><div class='del'>-	if (is_uld(adap)) {</div><div class='del'>-		for (j = 0 ; i &lt; allocated; ++i, j++) {</div><div class='del'>-			adap-&gt;msix_info_ulds[j].vec = entries[i].vector;</div><div class='del'>-			adap-&gt;msix_info_ulds[j].idx = i;</div><div class='add'>+	if (is_ethofld(adap))</div><div class='add'>+		s-&gt;eoqsets = eoqsets;</div><div class='add'>+</div><div class='add'>+	if (s-&gt;mirrorqsets) {</div><div class='add'>+		s-&gt;mirrorqsets = mirrorqsets;</div><div class='add'>+		for_each_port(adap, i) {</div><div class='add'>+			pi = adap2pinfo(adap, i);</div><div class='add'>+			pi-&gt;nmirrorqsets = s-&gt;mirrorqsets / nchan;</div><div class='add'>+			mutex_init(&amp;pi-&gt;vi_mirror_mutex);</div><div class='ctx'> 		}</div><div class='del'>-		adap-&gt;msix_bmap_ulds.mapsize = j;</div><div class='ctx'> 	}</div><div class='del'>-	dev_info(adap-&gt;pdev_dev, "%d MSI-X vectors allocated, "</div><div class='del'>-		 "nic %d per uld %d\n",</div><div class='del'>-		 allocated, s-&gt;max_ethqsets, s-&gt;nqs_per_uld);</div><div class='add'>+</div><div class='add'>+	/* map for msix */</div><div class='add'>+	ret = alloc_msix_info(adap, allocated);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_disable_msix;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; allocated; i++) {</div><div class='add'>+		adap-&gt;msix_info[i].vec = entries[i].vector;</div><div class='add'>+		adap-&gt;msix_info[i].idx = i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(adap-&gt;pdev_dev,</div><div class='add'>+		 "%d MSI-X vectors allocated, nic %d eoqsets %d per uld %d mirrorqsets %d\n",</div><div class='add'>+		 allocated, s-&gt;max_ethqsets, s-&gt;eoqsets, s-&gt;nqs_per_uld,</div><div class='add'>+		 s-&gt;mirrorqsets);</div><div class='ctx'> </div><div class='ctx'> 	kfree(entries);</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out_disable_msix:</div><div class='add'>+	pci_disable_msix(adap-&gt;pdev);</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	kfree(entries);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #undef EXTRA_VECS</div><div class='hunk'>@@ -5300,8 +6148,7 @@ static void print_port_info(const struct net_device *dev)</div><div class='ctx'> 		--bufp;</div><div class='ctx'> 	sprintf(bufp, "BASE-%s", t4_get_port_type_description(pi-&gt;port_type));</div><div class='ctx'> </div><div class='del'>-	netdev_info(dev, "%s: Chelsio %s (%s) %s\n",</div><div class='del'>-		    dev-&gt;name, adap-&gt;params.vpd.id, adap-&gt;name, buf);</div><div class='add'>+	netdev_info(dev, "Chelsio %s %s\n", adap-&gt;params.vpd.id, buf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -5315,20 +6162,22 @@ static void free_some_resources(struct adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	kvfree(adapter-&gt;mps_encap);</div><div class='ctx'> 	kvfree(adapter-&gt;smt);</div><div class='ctx'> 	kvfree(adapter-&gt;l2t);</div><div class='ctx'> 	kvfree(adapter-&gt;srq);</div><div class='ctx'> 	t4_cleanup_sched(adapter);</div><div class='ctx'> 	kvfree(adapter-&gt;tids.tid_tab);</div><div class='add'>+	cxgb4_cleanup_tc_matchall(adapter);</div><div class='add'>+	cxgb4_cleanup_tc_mqprio(adapter);</div><div class='ctx'> 	cxgb4_cleanup_tc_flower(adapter);</div><div class='ctx'> 	cxgb4_cleanup_tc_u32(adapter);</div><div class='add'>+	cxgb4_cleanup_ethtool_filters(adapter);</div><div class='ctx'> 	kfree(adapter-&gt;sge.egr_map);</div><div class='ctx'> 	kfree(adapter-&gt;sge.ingr_map);</div><div class='del'>-	kfree(adapter-&gt;sge.starving_fl);</div><div class='del'>-	kfree(adapter-&gt;sge.txq_maperr);</div><div class='add'>+	bitmap_free(adapter-&gt;sge.starving_fl);</div><div class='add'>+	bitmap_free(adapter-&gt;sge.txq_maperr);</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='del'>-	kfree(adapter-&gt;sge.blocked_fl);</div><div class='add'>+	bitmap_free(adapter-&gt;sge.blocked_fl);</div><div class='ctx'> #endif</div><div class='ctx'> 	disable_msi(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -5346,7 +6195,8 @@ static void free_some_resources(struct adapter *adapter)</div><div class='ctx'> 		t4_fw_bye(adapter, adapter-&gt;pf);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)</div><div class='add'>+#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN | \</div><div class='add'>+		   NETIF_F_GSO_UDP_L4)</div><div class='ctx'> #define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \</div><div class='ctx'> 		   NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)</div><div class='ctx'> #define SEGMENT_SIZE 128</div><div class='hunk'>@@ -5441,7 +6291,6 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> 		char name[IFNAMSIZ];</div><div class='ctx'> 		u32 devcap2;</div><div class='ctx'> 		u16 flags;</div><div class='del'>-		int pos;</div><div class='ctx'> </div><div class='ctx'> 		/* If we want to instantiate Virtual Functions, then our</div><div class='ctx'> 		 * parent bridge's PCI-E needs to support Alternative Routing</div><div class='hunk'>@@ -5449,9 +6298,8 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> 		 * and above.</div><div class='ctx'> 		 */</div><div class='ctx'> 		pbridge = pdev-&gt;bus-&gt;self;</div><div class='del'>-		pos = pci_find_capability(pbridge, PCI_CAP_ID_EXP);</div><div class='del'>-		pci_read_config_word(pbridge, pos + PCI_EXP_FLAGS, &amp;flags);</div><div class='del'>-		pci_read_config_dword(pbridge, pos + PCI_EXP_DEVCAP2, &amp;devcap2);</div><div class='add'>+		pcie_capability_read_word(pbridge, PCI_EXP_FLAGS, &amp;flags);</div><div class='add'>+		pcie_capability_read_dword(pbridge, PCI_EXP_DEVCAP2, &amp;devcap2);</div><div class='ctx'> </div><div class='ctx'> 		if ((flags &amp; PCI_EXP_FLAGS_VERS) &lt; 2 ||</div><div class='ctx'> 		    !(devcap2 &amp; PCI_EXP_DEVCAP2_ARI)) {</div><div class='hunk'>@@ -5531,6 +6379,197 @@ static int cxgb4_iov_configure(struct pci_dev *pdev, int num_vfs)</div><div class='ctx'> }</div><div class='ctx'> #endif /* CONFIG_PCI_IOV */</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE) || IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+</div><div class='add'>+static int chcr_offload_state(struct adapter *adap,</div><div class='add'>+			      enum cxgb4_netdev_tls_ops op_val)</div><div class='add'>+{</div><div class='add'>+	switch (op_val) {</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	case CXGB4_TLSDEV_OPS:</div><div class='add'>+		if (!adap-&gt;uld[CXGB4_ULD_KTLS].handle) {</div><div class='add'>+			dev_dbg(adap-&gt;pdev_dev, "ch_ktls driver is not loaded\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (!adap-&gt;uld[CXGB4_ULD_KTLS].tlsdev_ops) {</div><div class='add'>+			dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+				"ch_ktls driver has no registered tlsdev_ops\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#endif /* CONFIG_CHELSIO_TLS_DEVICE */</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+	case CXGB4_XFRMDEV_OPS:</div><div class='add'>+		if (!adap-&gt;uld[CXGB4_ULD_IPSEC].handle) {</div><div class='add'>+			dev_dbg(adap-&gt;pdev_dev, "chipsec driver is not loaded\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		if (!adap-&gt;uld[CXGB4_ULD_IPSEC].xfrmdev_ops) {</div><div class='add'>+			dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+				"chipsec driver has no registered xfrmdev_ops\n");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+#endif /* CONFIG_CHELSIO_IPSEC_INLINE */</div><div class='add'>+	default:</div><div class='add'>+		dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+			"driver has no support for offload %d\n", op_val);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_CHELSIO_TLS_DEVICE || CONFIG_CHELSIO_IPSEC_INLINE */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+</div><div class='add'>+static int cxgb4_ktls_dev_add(struct net_device *netdev, struct sock *sk,</div><div class='add'>+			      enum tls_offload_ctx_dir direction,</div><div class='add'>+			      struct tls_crypto_info *crypto_info,</div><div class='add'>+			      u32 tcp_sn)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;uld_mutex);</div><div class='add'>+	ret = chcr_offload_state(adap, CXGB4_TLSDEV_OPS);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_set_ktls_feature(adap, FW_PARAMS_PARAM_DEV_KTLS_HW_ENABLE);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = adap-&gt;uld[CXGB4_ULD_KTLS].tlsdev_ops-&gt;tls_dev_add(netdev, sk,</div><div class='add'>+								direction,</div><div class='add'>+								crypto_info,</div><div class='add'>+								tcp_sn);</div><div class='add'>+	/* if there is a failure, clear the refcount */</div><div class='add'>+	if (ret)</div><div class='add'>+		cxgb4_set_ktls_feature(adap,</div><div class='add'>+				       FW_PARAMS_PARAM_DEV_KTLS_HW_DISABLE);</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_ktls_dev_del(struct net_device *netdev,</div><div class='add'>+			       struct tls_context *tls_ctx,</div><div class='add'>+			       enum tls_offload_ctx_dir direction)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(netdev);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;uld_mutex);</div><div class='add'>+	if (chcr_offload_state(adap, CXGB4_TLSDEV_OPS))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	adap-&gt;uld[CXGB4_ULD_KTLS].tlsdev_ops-&gt;tls_dev_del(netdev, tls_ctx,</div><div class='add'>+							  direction);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	cxgb4_set_ktls_feature(adap, FW_PARAMS_PARAM_DEV_KTLS_HW_DISABLE);</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tlsdev_ops cxgb4_ktls_ops = {</div><div class='add'>+	.tls_dev_add = cxgb4_ktls_dev_add,</div><div class='add'>+	.tls_dev_del = cxgb4_ktls_dev_del,</div><div class='add'>+};</div><div class='add'>+#endif /* CONFIG_CHELSIO_TLS_DEVICE */</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+</div><div class='add'>+static int cxgb4_xfrm_add_state(struct net_device *dev,</div><div class='add'>+				struct xfrm_state *x,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;uld_mutex)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "crypto uld critical resource is under use");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+	ret = chcr_offload_state(adap, CXGB4_XFRMDEV_OPS);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = adap-&gt;uld[CXGB4_ULD_IPSEC].xfrmdev_ops-&gt;xdo_dev_state_add(dev, x,</div><div class='add'>+									extack);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_xfrm_del_state(struct net_device *dev, struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;uld_mutex)) {</div><div class='add'>+		dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+			"crypto uld critical resource is under use\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (chcr_offload_state(adap, CXGB4_XFRMDEV_OPS))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	adap-&gt;uld[CXGB4_ULD_IPSEC].xfrmdev_ops-&gt;xdo_dev_state_delete(dev, x);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_xfrm_free_state(struct net_device *dev, struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;uld_mutex)) {</div><div class='add'>+		dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+			"crypto uld critical resource is under use\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (chcr_offload_state(adap, CXGB4_XFRMDEV_OPS))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	adap-&gt;uld[CXGB4_ULD_IPSEC].xfrmdev_ops-&gt;xdo_dev_state_free(dev, x);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_advance_esn_state(struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(x-&gt;xso.dev);</div><div class='add'>+</div><div class='add'>+	if (x-&gt;xso.dir != XFRM_DEV_OFFLOAD_IN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (!mutex_trylock(&amp;uld_mutex)) {</div><div class='add'>+		dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+			"crypto uld critical resource is under use\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+	if (chcr_offload_state(adap, CXGB4_XFRMDEV_OPS))</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	adap-&gt;uld[CXGB4_ULD_IPSEC].xfrmdev_ops-&gt;xdo_dev_state_advance_esn(x);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct xfrmdev_ops cxgb4_xfrmdev_ops = {</div><div class='add'>+	.xdo_dev_state_add      = cxgb4_xfrm_add_state,</div><div class='add'>+	.xdo_dev_state_delete   = cxgb4_xfrm_del_state,</div><div class='add'>+	.xdo_dev_state_free     = cxgb4_xfrm_free_state,</div><div class='add'>+	.xdo_dev_state_advance_esn = cxgb4_advance_esn_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* CONFIG_CHELSIO_IPSEC_INLINE */</div><div class='add'>+</div><div class='ctx'> static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='hunk'>@@ -5538,7 +6577,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	static int adap_idx = 1;</div><div class='ctx'> 	int s_qpp, qpp, num_seg;</div><div class='ctx'> 	struct port_info *pi;</div><div class='del'>-	bool highdma = false;</div><div class='ctx'> 	enum chip_type chip;</div><div class='ctx'> 	void __iomem *regs;</div><div class='ctx'> 	int func, chip_ver;</div><div class='hunk'>@@ -5546,8 +6584,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int i, err;</div><div class='ctx'> 	u32 whoami;</div><div class='ctx'> </div><div class='del'>-	printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);</div><div class='del'>-</div><div class='ctx'> 	err = pci_request_regions(pdev, KBUILD_MODNAME);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		/* Just info, some other driver may have claimed the device. */</div><div class='hunk'>@@ -5583,7 +6619,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	whoami = t4_read_reg(adapter, PL_WHOAMI_A);</div><div class='ctx'> 	pci_read_config_word(pdev, PCI_DEVICE_ID, &amp;device_id);</div><div class='ctx'> 	chip = t4_get_chip_type(adapter, CHELSIO_PCI_ID_VER(device_id));</div><div class='del'>-	if (chip &lt; 0) {</div><div class='add'>+	if ((int)chip &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "Device %d is not supported\n", device_id);</div><div class='ctx'> 		err = chip;</div><div class='ctx'> 		goto out_free_adapter;</div><div class='hunk'>@@ -5619,23 +6655,12 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {</div><div class='del'>-		highdma = true;</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "unable to obtain 64-bit DMA for "</div><div class='del'>-				"coherent allocations\n");</div><div class='del'>-			goto out_free_adapter;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "no usable DMA configuration\n");</div><div class='del'>-			goto out_free_adapter;</div><div class='del'>-		}</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no usable DMA configuration\n");</div><div class='add'>+		goto out_free_adapter;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	pci_enable_pcie_error_reporting(pdev);</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	pci_save_state(pdev);</div><div class='ctx'> 	adap_idx++;</div><div class='hunk'>@@ -5719,14 +6744,12 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	setup_memwin(adapter);</div><div class='del'>-	err = adap_init0(adapter);</div><div class='del'>-#ifdef CONFIG_DEBUG_FS</div><div class='del'>-	bitmap_zero(adapter-&gt;sge.blocked_fl, adapter-&gt;sge.egr_sz);</div><div class='del'>-#endif</div><div class='del'>-	setup_memwin_rdma(adapter);</div><div class='add'>+	err = adap_init0(adapter, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_unmap_bar;</div><div class='ctx'> </div><div class='add'>+	setup_memwin_rdma(adapter);</div><div class='add'>+</div><div class='ctx'> 	/* configure SGE_STAT_CFG_A to read WC stats */</div><div class='ctx'> 	if (!is_t4(adapter-&gt;params.chip))</div><div class='ctx'> 		t4_write_reg(adapter, SGE_STAT_CFG_A, STATSOURCE_T5_V(7) |</div><div class='hunk'>@@ -5737,8 +6760,14 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;adapter-&gt;mac_hlist);</div><div class='ctx'> </div><div class='ctx'> 	for_each_port(adapter, i) {</div><div class='add'>+		/* For supporting MQPRIO Offload, need some extra</div><div class='add'>+		 * queues for each ETHOFLD TIDs. Keep it equal to</div><div class='add'>+		 * MAX_ATIDs for now. Once we connect to firmware</div><div class='add'>+		 * later and query the EOTID params, we'll come to</div><div class='add'>+		 * know the actual # of EOTIDs supported.</div><div class='add'>+		 */</div><div class='ctx'> 		netdev = alloc_etherdev_mq(sizeof(struct port_info),</div><div class='del'>-					   MAX_ETH_QSETS);</div><div class='add'>+					   MAX_ETH_QSETS + MAX_ATIDS);</div><div class='ctx'> 		if (!netdev) {</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto out_free_dev;</div><div class='hunk'>@@ -5757,7 +6786,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='ctx'> 			NETIF_F_RXCSUM | NETIF_F_RXHASH | NETIF_F_GRO |</div><div class='ctx'> 			NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |</div><div class='del'>-			NETIF_F_HW_TC;</div><div class='add'>+			NETIF_F_HW_TC | NETIF_F_NTUPLE | NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 		if (chip_ver &gt; CHELSIO_T5) {</div><div class='ctx'> 			netdev-&gt;hw_enc_features |= NETIF_F_IP_CSUM |</div><div class='hunk'>@@ -5770,12 +6799,28 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			netdev-&gt;hw_features |= NETIF_F_GSO_UDP_TUNNEL |</div><div class='ctx'> 					       NETIF_F_GSO_UDP_TUNNEL_CSUM |</div><div class='ctx'> 					       NETIF_F_HW_TLS_RECORD;</div><div class='add'>+</div><div class='add'>+			if (adapter-&gt;rawf_cnt)</div><div class='add'>+				netdev-&gt;udp_tunnel_nic_info = &amp;cxgb_udp_tunnels;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (highdma)</div><div class='del'>-			netdev-&gt;hw_features |= NETIF_F_HIGHDMA;</div><div class='ctx'> 		netdev-&gt;features |= netdev-&gt;hw_features;</div><div class='ctx'> 		netdev-&gt;vlan_features = netdev-&gt;features &amp; VLAN_FEAT;</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+		if (pi-&gt;adapter-&gt;params.crypto &amp; FW_CAPS_CONFIG_TLS_HW) {</div><div class='add'>+			netdev-&gt;hw_features |= NETIF_F_HW_TLS_TX;</div><div class='add'>+			netdev-&gt;tlsdev_ops = &amp;cxgb4_ktls_ops;</div><div class='add'>+			/* initialize the refcount */</div><div class='add'>+			refcount_set(&amp;pi-&gt;adapter-&gt;chcr_ktls.ktls_refcount, 0);</div><div class='add'>+		}</div><div class='add'>+#endif /* CONFIG_CHELSIO_TLS_DEVICE */</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+		if (pi-&gt;adapter-&gt;params.crypto &amp; FW_CAPS_CONFIG_IPSEC_INLINE) {</div><div class='add'>+			netdev-&gt;hw_enc_features |= NETIF_F_HW_ESP;</div><div class='add'>+			netdev-&gt;features |= NETIF_F_HW_ESP;</div><div class='add'>+			netdev-&gt;xfrmdev_ops = &amp;cxgb4_xfrmdev_ops;</div><div class='add'>+		}</div><div class='add'>+#endif /* CONFIG_CHELSIO_IPSEC_INLINE */</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='ctx'> </div><div class='hunk'>@@ -5841,12 +6886,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		adapter-&gt;params.offload = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	adapter-&gt;mps_encap = kvcalloc(adapter-&gt;params.arch.mps_tcam_size,</div><div class='del'>-				      sizeof(struct mps_encap_entry),</div><div class='del'>-				      GFP_KERNEL);</div><div class='del'>-	if (!adapter-&gt;mps_encap)</div><div class='del'>-		dev_warn(&amp;pdev-&gt;dev, "could not allocate MPS Encap entries, continuing\n");</div><div class='del'>-</div><div class='ctx'> #if IS_ENABLED(CONFIG_IPV6)</div><div class='ctx'> 	if (chip_ver &lt;= CHELSIO_T5 &amp;&amp;</div><div class='ctx'> 	    (!(t4_read_reg(adapter, LE_DB_CONFIG_A) &amp; ASLIPCOMPEN_F))) {</div><div class='hunk'>@@ -5879,6 +6918,24 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 				 i);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (is_offload(adapter) || is_hashfilter(adapter)) {</div><div class='add'>+		if (t4_read_reg(adapter, LE_DB_CONFIG_A) &amp; HASHEN_F) {</div><div class='add'>+			u32 v;</div><div class='add'>+</div><div class='add'>+			v = t4_read_reg(adapter, LE_DB_HASH_CONFIG_A);</div><div class='add'>+			if (chip_ver &lt;= CHELSIO_T5) {</div><div class='add'>+				adapter-&gt;tids.nhash = 1 &lt;&lt; HASHTIDSIZE_G(v);</div><div class='add'>+				v = t4_read_reg(adapter, LE_DB_TID_HASHBASE_A);</div><div class='add'>+				adapter-&gt;tids.hash_base = v / 4;</div><div class='add'>+			} else {</div><div class='add'>+				adapter-&gt;tids.nhash = HASHTBLSIZE_G(v) &lt;&lt; 3;</div><div class='add'>+				v = t4_read_reg(adapter,</div><div class='add'>+						T6_LE_DB_HASH_TID_BASE_A);</div><div class='add'>+				adapter-&gt;tids.hash_base = v;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (tid_init(&amp;adapter-&gt;tids) &lt; 0) {</div><div class='ctx'> 		dev_warn(&amp;pdev-&gt;dev, "could not allocate TID table, "</div><div class='ctx'> 			 "continuing\n");</div><div class='hunk'>@@ -5892,22 +6949,17 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		if (cxgb4_init_tc_flower(adapter))</div><div class='ctx'> 			dev_warn(&amp;pdev-&gt;dev,</div><div class='ctx'> 				 "could not offload tc flower, continuing\n");</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	if (is_offload(adapter) || is_hashfilter(adapter)) {</div><div class='del'>-		if (t4_read_reg(adapter, LE_DB_CONFIG_A) &amp; HASHEN_F) {</div><div class='del'>-			u32 hash_base, hash_reg;</div><div class='add'>+		if (cxgb4_init_tc_mqprio(adapter))</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+				 "could not offload tc mqprio, continuing\n");</div><div class='ctx'> </div><div class='del'>-			if (chip_ver &lt;= CHELSIO_T5) {</div><div class='del'>-				hash_reg = LE_DB_TID_HASHBASE_A;</div><div class='del'>-				hash_base = t4_read_reg(adapter, hash_reg);</div><div class='del'>-				adapter-&gt;tids.hash_base = hash_base / 4;</div><div class='del'>-			} else {</div><div class='del'>-				hash_reg = T6_LE_DB_HASH_TID_BASE_A;</div><div class='del'>-				hash_base = t4_read_reg(adapter, hash_reg);</div><div class='del'>-				adapter-&gt;tids.hash_base = hash_base;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+		if (cxgb4_init_tc_matchall(adapter))</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+				 "could not offload tc matchall, continuing\n");</div><div class='add'>+		if (cxgb4_init_ethtool_filters(adapter))</div><div class='add'>+			dev_warn(&amp;pdev-&gt;dev,</div><div class='add'>+				 "could not initialize ethtool filters, continuing\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* See what interrupts we'll be using */</div><div class='hunk'>@@ -5922,10 +6974,19 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	/* check for PCI Express bandwidth capabiltites */</div><div class='ctx'> 	pcie_print_link_status(pdev);</div><div class='ctx'> </div><div class='add'>+	cxgb4_init_mps_ref_entries(adapter);</div><div class='add'>+</div><div class='ctx'> 	err = init_rss(adapter);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_free_dev;</div><div class='ctx'> </div><div class='add'>+	err = setup_non_data_intr(adapter);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev,</div><div class='add'>+			"Non Data interrupt allocation failed, err: %d\n", err);</div><div class='add'>+		goto out_free_dev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	err = setup_fw_sge_queues(adapter);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(adapter-&gt;pdev_dev,</div><div class='hunk'>@@ -5972,11 +7033,8 @@ fw_attach_fail:</div><div class='ctx'> 	/* PCIe EEH recovery on powerpc platforms needs fundamental reset */</div><div class='ctx'> 	pdev-&gt;needs_freset = 1;</div><div class='ctx'> </div><div class='del'>-	if (is_uld(adapter)) {</div><div class='del'>-		mutex_lock(&amp;uld_mutex);</div><div class='del'>-		list_add_tail(&amp;adapter-&gt;list_node, &amp;adapter_list);</div><div class='del'>-		mutex_unlock(&amp;uld_mutex);</div><div class='del'>-	}</div><div class='add'>+	if (is_uld(adapter))</div><div class='add'>+		cxgb4_uld_enable(adapter);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_t4(adapter-&gt;params.chip))</div><div class='ctx'> 		cxgb4_ptp_init(adapter);</div><div class='hunk'>@@ -6007,7 +7065,6 @@ fw_attach_fail:</div><div class='ctx'>  out_unmap_bar0:</div><div class='ctx'> 	iounmap(regs);</div><div class='ctx'>  out_disable_device:</div><div class='del'>-	pci_disable_pcie_error_reporting(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'>  out_release_regions:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='hunk'>@@ -6039,18 +7096,19 @@ static void remove_one(struct pci_dev *pdev)</div><div class='ctx'> 		 */</div><div class='ctx'> 		destroy_workqueue(adapter-&gt;workq);</div><div class='ctx'> </div><div class='del'>-		if (is_uld(adapter)) {</div><div class='del'>-			detach_ulds(adapter);</div><div class='del'>-			t4_uld_clean_up(adapter);</div><div class='del'>-		}</div><div class='add'>+		detach_ulds(adapter);</div><div class='add'>+</div><div class='add'>+		for_each_port(adapter, i)</div><div class='add'>+			if (adapter-&gt;port[i]-&gt;reg_state == NETREG_REGISTERED)</div><div class='add'>+				unregister_netdev(adapter-&gt;port[i]);</div><div class='add'>+</div><div class='add'>+		t4_uld_clean_up(adapter);</div><div class='ctx'> </div><div class='ctx'> 		adap_free_hma_mem(adapter);</div><div class='ctx'> </div><div class='ctx'> 		disable_interrupts(adapter);</div><div class='ctx'> </div><div class='del'>-		for_each_port(adapter, i)</div><div class='del'>-			if (adapter-&gt;port[i]-&gt;reg_state == NETREG_REGISTERED)</div><div class='del'>-				unregister_netdev(adapter-&gt;port[i]);</div><div class='add'>+		cxgb4_free_mps_ref_entries(adapter);</div><div class='ctx'> </div><div class='ctx'> 		debugfs_remove_recursive(adapter-&gt;debugfs_root);</div><div class='ctx'> </div><div class='hunk'>@@ -6085,7 +7143,6 @@ static void remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> #endif</div><div class='ctx'> 	iounmap(adapter-&gt;regs);</div><div class='del'>-	pci_disable_pcie_error_reporting(pdev);</div><div class='ctx'> 	if ((adapter-&gt;flags &amp; CXGB4_DEV_ENABLED)) {</div><div class='ctx'> 		pci_disable_device(pdev);</div><div class='ctx'> 		adapter-&gt;flags &amp;= ~CXGB4_DEV_ENABLED;</div><div class='hunk'>@@ -6123,6 +7180,10 @@ static void shutdown_one(struct pci_dev *pdev)</div><div class='ctx'> 			if (adapter-&gt;port[i]-&gt;reg_state == NETREG_REGISTERED)</div><div class='ctx'> 				cxgb_close(adapter-&gt;port[i]);</div><div class='ctx'> </div><div class='add'>+		rtnl_lock();</div><div class='add'>+		cxgb4_mqprio_stop_offload(adapter);</div><div class='add'>+		rtnl_unlock();</div><div class='add'>+</div><div class='ctx'> 		if (is_uld(adapter)) {</div><div class='ctx'> 			detach_ulds(adapter);</div><div class='ctx'> 			t4_uld_clean_up(adapter);</div><div class='hunk'>@@ -6153,10 +7214,7 @@ static int __init cxgb4_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* Debugfs support is optional, just warn if this fails */</div><div class='ctx'> 	cxgb4_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);</div><div class='del'>-	if (!cxgb4_debugfs_root)</div><div class='del'>-		pr_warn("could not create debugfs entry, continuing\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_register_driver(&amp;cxgb4_driver);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c<br/>new file mode 100644<br/>index 000000000000..60f4d5b5eb3a<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c</a></div><div class='hunk'>@@ -0,0 +1,143 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (c) 2019 Chelsio Communications, Inc. All rights reserved. */</div><div class='add'>+</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+</div><div class='add'>+static int cxgb4_mps_ref_dec_by_mac(struct adapter *adap,</div><div class='add'>+				    const u8 *addr, const u8 *mask)</div><div class='add'>+{</div><div class='add'>+	u8 bitmask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='add'>+	struct mps_entries_ref *mps_entry, *tmp;</div><div class='add'>+	int ret = -EINVAL;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+	list_for_each_entry_safe(mps_entry, tmp, &amp;adap-&gt;mps_ref, list) {</div><div class='add'>+		if (ether_addr_equal(mps_entry-&gt;addr, addr) &amp;&amp;</div><div class='add'>+		    ether_addr_equal(mps_entry-&gt;mask, mask ? mask : bitmask)) {</div><div class='add'>+			if (!refcount_dec_and_test(&amp;mps_entry-&gt;refcnt)) {</div><div class='add'>+				spin_unlock_bh(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+				return -EBUSY;</div><div class='add'>+			}</div><div class='add'>+			list_del(&amp;mps_entry-&gt;list);</div><div class='add'>+			kfree(mps_entry);</div><div class='add'>+			ret = 0;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_mps_ref_inc(struct adapter *adap, const u8 *mac_addr,</div><div class='add'>+			     u16 idx, const u8 *mask)</div><div class='add'>+{</div><div class='add'>+	u8 bitmask[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };</div><div class='add'>+	struct mps_entries_ref *mps_entry;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+	list_for_each_entry(mps_entry, &amp;adap-&gt;mps_ref, list) {</div><div class='add'>+		if (mps_entry-&gt;idx == idx) {</div><div class='add'>+			refcount_inc(&amp;mps_entry-&gt;refcnt);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mps_entry = kzalloc(sizeof(*mps_entry), GFP_ATOMIC);</div><div class='add'>+	if (!mps_entry) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto unlock;</div><div class='add'>+	}</div><div class='add'>+	ether_addr_copy(mps_entry-&gt;mask, mask ? mask : bitmask);</div><div class='add'>+	ether_addr_copy(mps_entry-&gt;addr, mac_addr);</div><div class='add'>+	mps_entry-&gt;idx = idx;</div><div class='add'>+	refcount_set(&amp;mps_entry-&gt;refcnt, 1);</div><div class='add'>+	list_add_tail(&amp;mps_entry-&gt;list, &amp;adap-&gt;mps_ref);</div><div class='add'>+unlock:</div><div class='add'>+	spin_unlock_bh(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_free_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='add'>+			unsigned int naddr, const u8 **addr, bool sleep_ok)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; naddr; i++) {</div><div class='add'>+		if (!cxgb4_mps_ref_dec_by_mac(adap, addr[i], NULL)) {</div><div class='add'>+			ret = t4_free_mac_filt(adap, adap-&gt;mbox, viid,</div><div class='add'>+					       1, &amp;addr[i], sleep_ok);</div><div class='add'>+			if (ret &lt; 0)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* return number of filters freed */</div><div class='add'>+	return naddr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_alloc_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='add'>+			 bool free, unsigned int naddr, const u8 **addr,</div><div class='add'>+			 u16 *idx, u64 *hash, bool sleep_ok)</div><div class='add'>+{</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	ret = t4_alloc_mac_filt(adap, adap-&gt;mbox, viid, free,</div><div class='add'>+				naddr, addr, idx, hash, sleep_ok);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; naddr; i++) {</div><div class='add'>+		if (idx[i] != 0xffff) {</div><div class='add'>+			if (cxgb4_mps_ref_inc(adap, addr[i], idx[i], NULL)) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto error;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	goto out;</div><div class='add'>+error:</div><div class='add'>+	cxgb4_free_mac_filt(adap, viid, naddr, addr, sleep_ok);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	/* Returns a negative error number or the number of filters allocated */</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid,</div><div class='add'>+			  int *tcam_idx, const u8 *addr,</div><div class='add'>+			  bool persistent, u8 *smt_idx)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_change_mac(pi, viid, tcam_idx,</div><div class='add'>+			       addr, persistent, smt_idx);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	cxgb4_mps_ref_inc(pi-&gt;adapter, addr, *tcam_idx, NULL);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_init_mps_ref_entries(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	spin_lock_init(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;adap-&gt;mps_ref);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_free_mps_ref_entries(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct mps_entries_ref *mps_entry, *tmp;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;adap-&gt;mps_ref))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+	list_for_each_entry_safe(mps_entry, tmp, &amp;adap-&gt;mps_ref, list) {</div><div class='add'>+		list_del(&amp;mps_entry-&gt;list);</div><div class='add'>+		kfree(mps_entry);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock(&amp;adap-&gt;mps_ref_lock);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c<br/>index 58a039c3224a..cbd06d9b95d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c</a></div><div class='hunk'>@@ -194,16 +194,20 @@ int cxgb4_ptp_redirect_rx_packet(struct adapter *adapter, struct port_info *pi)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cxgb4_ptp_adjfine - Adjust frequency of PHC cycle counter</div><div class='ctx'>  * @ptp: ptp clock structure</div><div class='del'>- * @ppb: Desired frequency change in parts per billion</div><div class='add'>+ * @scaled_ppm: Desired frequency in scaled parts per billion</div><div class='ctx'>  *</div><div class='del'>- * Adjust the frequency of the PHC cycle counter by the indicated ppb from</div><div class='add'>+ * Adjust the frequency of the PHC cycle counter by the indicated amount from</div><div class='ctx'>  * the base frequency.</div><div class='add'>+ *</div><div class='add'>+ * Scaled parts per million is ppm with a 16-bit binary fractional field.</div><div class='ctx'>  */</div><div class='del'>-static int cxgb4_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='add'>+static int cxgb4_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = (struct adapter *)container_of(ptp,</div><div class='ctx'> 				   struct adapter, ptp_clock_info);</div><div class='add'>+	s32 ppb = scaled_ppm_to_ppb(scaled_ppm);</div><div class='ctx'> 	struct fw_ptp_cmd c;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -229,7 +233,7 @@ static int cxgb4_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * cxgb4_ptp_fineadjtime - Shift the time of the hardware clock</div><div class='del'>- * @ptp: ptp clock structure</div><div class='add'>+ * @adapter: board private structure</div><div class='ctx'>  * @delta: Desired change in nanoseconds</div><div class='ctx'>  *</div><div class='ctx'>  * Adjust the timer by resetting the timecounter structure.</div><div class='hunk'>@@ -246,6 +250,9 @@ static int  cxgb4_ptp_fineadjtime(struct adapter *adapter, s64 delta)</div><div class='ctx'> 			     FW_PTP_CMD_PORTID_V(0));</div><div class='ctx'> 	c.retval_len16 = cpu_to_be32(FW_CMD_LEN16_V(sizeof(c) / 16));</div><div class='ctx'> 	c.u.ts.sc = FW_PTP_SC_ADJ_FTIME;</div><div class='add'>+	c.u.ts.sign = (delta &lt; 0) ? 1 : 0;</div><div class='add'>+	if (delta &lt; 0)</div><div class='add'>+		delta = -delta;</div><div class='ctx'> 	c.u.ts.tm = cpu_to_be64(delta);</div><div class='ctx'> </div><div class='ctx'> 	err = t4_wr_mbox(adapter, adapter-&gt;mbox, &amp;c, sizeof(c), NULL);</div><div class='hunk'>@@ -308,32 +315,17 @@ static int cxgb4_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='ctx'>  */</div><div class='ctx'> static int cxgb4_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adapter = (struct adapter *)container_of(ptp,</div><div class='del'>-				   struct adapter, ptp_clock_info);</div><div class='del'>-	struct fw_ptp_cmd c;</div><div class='add'>+	struct adapter *adapter = container_of(ptp, struct adapter,</div><div class='add'>+					       ptp_clock_info);</div><div class='ctx'> 	u64 ns;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	memset(&amp;c, 0, sizeof(c));</div><div class='del'>-	c.op_to_portid = cpu_to_be32(FW_CMD_OP_V(FW_PTP_CMD) |</div><div class='del'>-				     FW_CMD_REQUEST_F |</div><div class='del'>-				     FW_CMD_READ_F |</div><div class='del'>-				     FW_PTP_CMD_PORTID_V(0));</div><div class='del'>-	c.retval_len16 = cpu_to_be32(FW_CMD_LEN16_V(sizeof(c) / 16));</div><div class='del'>-	c.u.ts.sc = FW_PTP_SC_GET_TIME;</div><div class='ctx'> </div><div class='del'>-	err = t4_wr_mbox(adapter, adapter-&gt;mbox, &amp;c, sizeof(c), &amp;c);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev,</div><div class='del'>-			"PTP: %s error %d\n", __func__, -err);</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	ns = t4_read_reg(adapter, T5_PORT_REG(0, MAC_PORT_PTP_SUM_LO_A));</div><div class='add'>+	ns |= (u64)t4_read_reg(adapter,</div><div class='add'>+			       T5_PORT_REG(0, MAC_PORT_PTP_SUM_HI_A)) &lt;&lt; 32;</div><div class='ctx'> </div><div class='ctx'> 	/* convert to timespec*/</div><div class='del'>-	ns = be64_to_cpu(c.u.ts.tm);</div><div class='ctx'> 	*ts = ns_to_timespec64(ns);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -415,7 +407,7 @@ static const struct ptp_clock_info cxgb4_ptp_clock_info = {</div><div class='ctx'> 	.n_ext_ts       = 0,</div><div class='ctx'> 	.n_per_out      = 0,</div><div class='ctx'> 	.pps            = 0,</div><div class='del'>-	.adjfreq        = cxgb4_ptp_adjfreq,</div><div class='add'>+	.adjfine        = cxgb4_ptp_adjfine,</div><div class='ctx'> 	.adjtime        = cxgb4_ptp_adjtime,</div><div class='ctx'> 	.gettime64      = cxgb4_ptp_gettime,</div><div class='ctx'> 	.settime64      = cxgb4_ptp_settime,</div><div class='hunk'>@@ -457,7 +449,7 @@ void cxgb4_ptp_init(struct adapter *adapter)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * cxgb4_ptp_remove - disable PTP device and stop the overflow check</div><div class='add'>+ * cxgb4_ptp_stop - disable PTP device and stop the overflow check</div><div class='ctx'>  * @adapter: board private structure</div><div class='ctx'>  *</div><div class='ctx'>  * Stop the PTP support.</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c<br/>index cfaf8f618d1f..e2b5554531b5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c</a></div><div class='hunk'>@@ -58,16 +58,96 @@ static struct ch_tc_pedit_fields pedits[] = {</div><div class='ctx'> 	PEDIT_FIELDS(IP6_, DST_63_32, 4, nat_lip, 4),</div><div class='ctx'> 	PEDIT_FIELDS(IP6_, DST_95_64, 4, nat_lip, 8),</div><div class='ctx'> 	PEDIT_FIELDS(IP6_, DST_127_96, 4, nat_lip, 12),</div><div class='del'>-	PEDIT_FIELDS(TCP_, SPORT, 2, nat_fport, 0),</div><div class='del'>-	PEDIT_FIELDS(TCP_, DPORT, 2, nat_lport, 0),</div><div class='del'>-	PEDIT_FIELDS(UDP_, SPORT, 2, nat_fport, 0),</div><div class='del'>-	PEDIT_FIELDS(UDP_, DPORT, 2, nat_lport, 0),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct cxgb4_natmode_config cxgb4_natmode_config_array[] = {</div><div class='add'>+	/* Default supported NAT modes */</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_NONE,</div><div class='add'>+		.natmode = NAT_MODE_NONE,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP,</div><div class='add'>+		.natmode = NAT_MODE_DIP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT,</div><div class='add'>+		.natmode = NAT_MODE_DIP_DP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT |</div><div class='add'>+			 CXGB4_ACTION_NATMODE_SIP,</div><div class='add'>+		.natmode = NAT_MODE_DIP_DP_SIP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT |</div><div class='add'>+			 CXGB4_ACTION_NATMODE_SPORT,</div><div class='add'>+		.natmode = NAT_MODE_DIP_DP_SP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_SIP | CXGB4_ACTION_NATMODE_SPORT,</div><div class='add'>+		.natmode = NAT_MODE_SIP_SP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP |</div><div class='add'>+			 CXGB4_ACTION_NATMODE_SPORT,</div><div class='add'>+		.natmode = NAT_MODE_DIP_SIP_SP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T5,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP |</div><div class='add'>+			 CXGB4_ACTION_NATMODE_DPORT |</div><div class='add'>+			 CXGB4_ACTION_NATMODE_SPORT,</div><div class='add'>+		.natmode = NAT_MODE_ALL,</div><div class='add'>+	},</div><div class='add'>+	/* T6+ can ignore L4 ports when they're disabled. */</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T6,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_SIP,</div><div class='add'>+		.natmode = NAT_MODE_SIP_SP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T6,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SPORT,</div><div class='add'>+		.natmode = NAT_MODE_DIP_DP_SP,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		.chip = CHELSIO_T6,</div><div class='add'>+		.flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP,</div><div class='add'>+		.natmode = NAT_MODE_ALL,</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void cxgb4_action_natmode_tweak(struct ch_filter_specification *fs,</div><div class='add'>+				       u8 natmode_flags)</div><div class='add'>+{</div><div class='add'>+	u8 i = 0;</div><div class='add'>+</div><div class='add'>+	/* Translate the enabled NAT 4-tuple fields to one of the</div><div class='add'>+	 * hardware supported NAT mode configurations. This ensures</div><div class='add'>+	 * that we pick a valid combination, where the disabled fields</div><div class='add'>+	 * do not get overwritten to 0.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cxgb4_natmode_config_array); i++) {</div><div class='add'>+		if (cxgb4_natmode_config_array[i].flags == natmode_flags) {</div><div class='add'>+			fs-&gt;nat_mode = cxgb4_natmode_config_array[i].natmode;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static struct ch_tc_flower_entry *allocate_flower_entry(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct ch_tc_flower_entry *new = kzalloc(sizeof(*new), GFP_KERNEL);</div><div class='del'>-	spin_lock_init(&amp;new-&gt;lock);</div><div class='add'>+	if (new)</div><div class='add'>+		spin_lock_init(&amp;new-&gt;lock);</div><div class='ctx'> 	return new;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -80,18 +160,10 @@ static struct ch_tc_flower_entry *ch_flower_lookup(struct adapter *adap,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void cxgb4_process_flow_match(struct net_device *dev,</div><div class='del'>-				     struct tc_cls_flower_offload *cls,</div><div class='add'>+				     struct flow_rule *rule,</div><div class='add'>+				     u16 addr_type,</div><div class='ctx'> 				     struct ch_filter_specification *fs)</div><div class='ctx'> {</div><div class='del'>-	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);</div><div class='del'>-	u16 addr_type = 0;</div><div class='del'>-</div><div class='del'>-	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {</div><div class='del'>-		struct flow_match_control match;</div><div class='del'>-</div><div class='del'>-		flow_rule_match_control(rule, &amp;match);</div><div class='del'>-		addr_type = match.key-&gt;addr_type;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='ctx'> 		struct flow_match_basic match;</div><div class='hunk'>@@ -155,14 +227,14 @@ static void cxgb4_process_flow_match(struct net_device *dev,</div><div class='ctx'> 		struct flow_match_ports match;</div><div class='ctx'> </div><div class='ctx'> 		flow_rule_match_ports(rule, &amp;match);</div><div class='del'>-		fs-&gt;val.lport = cpu_to_be16(match.key-&gt;dst);</div><div class='del'>-		fs-&gt;mask.lport = cpu_to_be16(match.mask-&gt;dst);</div><div class='del'>-		fs-&gt;val.fport = cpu_to_be16(match.key-&gt;src);</div><div class='del'>-		fs-&gt;mask.fport = cpu_to_be16(match.mask-&gt;src);</div><div class='add'>+		fs-&gt;val.lport = be16_to_cpu(match.key-&gt;dst);</div><div class='add'>+		fs-&gt;mask.lport = be16_to_cpu(match.mask-&gt;dst);</div><div class='add'>+		fs-&gt;val.fport = be16_to_cpu(match.key-&gt;src);</div><div class='add'>+		fs-&gt;mask.fport = be16_to_cpu(match.mask-&gt;src);</div><div class='ctx'> </div><div class='ctx'> 		/* also initialize nat_lport/fport to same values */</div><div class='del'>-		fs-&gt;nat_lport = cpu_to_be16(match.key-&gt;dst);</div><div class='del'>-		fs-&gt;nat_fport = cpu_to_be16(match.key-&gt;src);</div><div class='add'>+		fs-&gt;nat_lport = fs-&gt;val.lport;</div><div class='add'>+		fs-&gt;nat_fport = fs-&gt;val.fport;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IP)) {</div><div class='hunk'>@@ -222,25 +294,25 @@ static void cxgb4_process_flow_match(struct net_device *dev,</div><div class='ctx'> 	fs-&gt;mask.iport = ~0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb4_validate_flow_match(struct net_device *dev,</div><div class='del'>-				     struct tc_cls_flower_offload *cls)</div><div class='add'>+static int cxgb4_validate_flow_match(struct netlink_ext_ack *extack,</div><div class='add'>+				     struct flow_rule *rule)</div><div class='ctx'> {</div><div class='del'>-	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);</div><div class='ctx'> 	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='ctx'> 	u16 ethtype_mask = 0;</div><div class='ctx'> 	u16 ethtype_key = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (dissector-&gt;used_keys &amp;</div><div class='del'>-	    ~(BIT(FLOW_DISSECTOR_KEY_CONTROL) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_PORTS) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_ENC_KEYID) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_VLAN) |</div><div class='del'>-	      BIT(FLOW_DISSECTOR_KEY_IP))) {</div><div class='del'>-		netdev_warn(dev, "Unsupported key used: 0x%x\n",</div><div class='del'>-			    dissector-&gt;used_keys);</div><div class='add'>+	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_PORTS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_ENC_KEYID) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_IP))) {</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack,</div><div class='add'>+				       "Unsupported key used: 0x%llx",</div><div class='add'>+				       dissector-&gt;used_keys);</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -257,13 +329,15 @@ static int cxgb4_validate_flow_match(struct net_device *dev,</div><div class='ctx'> 		struct flow_match_ip match;</div><div class='ctx'> </div><div class='ctx'> 		if (eth_ip_type != ETH_P_IP &amp;&amp; eth_ip_type != ETH_P_IPV6) {</div><div class='del'>-			netdev_err(dev, "IP Key supported only with IPv4/v6");</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "IP Key supported only with IPv4/v6");</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		flow_rule_match_ip(rule, &amp;match);</div><div class='ctx'> 		if (match.mask-&gt;ttl) {</div><div class='del'>-			netdev_warn(dev, "ttl match unsupported for offload");</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "ttl match unsupported for offload");</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -290,7 +364,8 @@ static void offload_pedit(struct ch_filter_specification *fs, u32 val, u32 mask,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void process_pedit_field(struct ch_filter_specification *fs, u32 val,</div><div class='del'>-				u32 mask, u32 offset, u8 htype)</div><div class='add'>+				u32 mask, u32 offset, u8 htype,</div><div class='add'>+				u8 *natmode_flags)</div><div class='ctx'> {</div><div class='ctx'> 	switch (htype) {</div><div class='ctx'> 	case FLOW_ACT_MANGLE_HDR_TYPE_ETH:</div><div class='hunk'>@@ -315,77 +390,105 @@ static void process_pedit_field(struct ch_filter_specification *fs, u32 val,</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_IP4_SRC:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP4_SRC);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP4_DST:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP4_DST);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 		}</div><div class='del'>-		fs-&gt;nat_mode = NAT_MODE_ALL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLOW_ACT_MANGLE_HDR_TYPE_IP6:</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_IP6_SRC_31_0:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_SRC_31_0);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_SRC_63_32:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_SRC_63_32);</div><div class='add'>+			*natmode_flags |=  CXGB4_ACTION_NATMODE_SIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_SRC_95_64:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_SRC_95_64);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_SRC_127_96:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_SRC_127_96);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_DST_31_0:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_DST_31_0);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_DST_63_32:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_DST_63_32);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_DST_95_64:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_DST_95_64);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case PEDIT_IP6_DST_127_96:</div><div class='ctx'> 			offload_pedit(fs, val, mask, IP6_DST_127_96);</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 		}</div><div class='del'>-		fs-&gt;nat_mode = NAT_MODE_ALL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLOW_ACT_MANGLE_HDR_TYPE_TCP:</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_TCP_SPORT_DPORT:</div><div class='del'>-			if (~mask &amp; PEDIT_TCP_UDP_SPORT_MASK)</div><div class='del'>-				offload_pedit(fs, cpu_to_be32(val) &gt;&gt; 16,</div><div class='del'>-					      cpu_to_be32(mask) &gt;&gt; 16,</div><div class='del'>-					      TCP_SPORT);</div><div class='del'>-			else</div><div class='del'>-				offload_pedit(fs, cpu_to_be32(val),</div><div class='del'>-					      cpu_to_be32(mask), TCP_DPORT);</div><div class='add'>+			if (~mask &amp; PEDIT_TCP_UDP_SPORT_MASK) {</div><div class='add'>+				fs-&gt;nat_fport = val;</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;</div><div class='add'>+			} else {</div><div class='add'>+				fs-&gt;nat_lport = val &gt;&gt; 16;</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		fs-&gt;nat_mode = NAT_MODE_ALL;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLOW_ACT_MANGLE_HDR_TYPE_UDP:</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_UDP_SPORT_DPORT:</div><div class='del'>-			if (~mask &amp; PEDIT_TCP_UDP_SPORT_MASK)</div><div class='del'>-				offload_pedit(fs, cpu_to_be32(val) &gt;&gt; 16,</div><div class='del'>-					      cpu_to_be32(mask) &gt;&gt; 16,</div><div class='del'>-					      UDP_SPORT);</div><div class='del'>-			else</div><div class='del'>-				offload_pedit(fs, cpu_to_be32(val),</div><div class='del'>-					      cpu_to_be32(mask), UDP_DPORT);</div><div class='add'>+			if (~mask &amp; PEDIT_TCP_UDP_SPORT_MASK) {</div><div class='add'>+				fs-&gt;nat_fport = val;</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;</div><div class='add'>+			} else {</div><div class='add'>+				fs-&gt;nat_lport = val &gt;&gt; 16;</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='del'>-		fs-&gt;nat_mode = NAT_MODE_ALL;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void cxgb4_process_flow_actions(struct net_device *in,</div><div class='del'>-				       struct tc_cls_flower_offload *cls,</div><div class='del'>-				       struct ch_filter_specification *fs)</div><div class='add'>+static int cxgb4_action_natmode_validate(struct adapter *adap, u8 natmode_flags,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	u8 i = 0;</div><div class='add'>+</div><div class='add'>+	/* Extract the NAT mode to enable based on what 4-tuple fields</div><div class='add'>+	 * are enabled to be overwritten. This ensures that the</div><div class='add'>+	 * disabled fields don't get overwritten to 0.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(cxgb4_natmode_config_array); i++) {</div><div class='add'>+		const struct cxgb4_natmode_config *c;</div><div class='add'>+</div><div class='add'>+		c = &amp;cxgb4_natmode_config_array[i];</div><div class='add'>+		if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip) &gt;= c-&gt;chip &amp;&amp;</div><div class='add'>+		    natmode_flags == c-&gt;flags)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack, "Unsupported NAT mode 4-tuple combination");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_process_flow_actions(struct net_device *in,</div><div class='add'>+				struct flow_action *actions,</div><div class='add'>+				struct ch_filter_specification *fs)</div><div class='ctx'> {</div><div class='del'>-	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);</div><div class='ctx'> 	struct flow_action_entry *act;</div><div class='add'>+	u8 natmode_flags = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	flow_action_for_each(i, act, &amp;rule-&gt;action) {</div><div class='add'>+	flow_action_for_each(i, act, actions) {</div><div class='ctx'> 		switch (act-&gt;id) {</div><div class='ctx'> 		case FLOW_ACTION_ACCEPT:</div><div class='ctx'> 			fs-&gt;action = FILTER_PASS;</div><div class='hunk'>@@ -393,6 +496,7 @@ static void cxgb4_process_flow_actions(struct net_device *in,</div><div class='ctx'> 		case FLOW_ACTION_DROP:</div><div class='ctx'> 			fs-&gt;action = FILTER_DROP;</div><div class='ctx'> 			break;</div><div class='add'>+		case FLOW_ACTION_MIRRED:</div><div class='ctx'> 		case FLOW_ACTION_REDIRECT: {</div><div class='ctx'> 			struct net_device *out = act-&gt;dev;</div><div class='ctx'> 			struct port_info *pi = netdev_priv(out);</div><div class='hunk'>@@ -433,13 +537,22 @@ static void cxgb4_process_flow_actions(struct net_device *in,</div><div class='ctx'> 			val = act-&gt;mangle.val;</div><div class='ctx'> 			offset = act-&gt;mangle.offset;</div><div class='ctx'> </div><div class='del'>-			process_pedit_field(fs, val, mask, offset, htype);</div><div class='add'>+			process_pedit_field(fs, val, mask, offset, htype,</div><div class='add'>+					    &amp;natmode_flags);</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='add'>+		case FLOW_ACTION_QUEUE:</div><div class='add'>+			fs-&gt;action = FILTER_PASS;</div><div class='add'>+			fs-&gt;dirsteer = 1;</div><div class='add'>+			fs-&gt;iq = act-&gt;queue.index;</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='add'>+	if (natmode_flags)</div><div class='add'>+		cxgb4_action_natmode_tweak(fs, natmode_flags);</div><div class='add'>+</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool valid_l4_mask(u32 mask)</div><div class='hunk'>@@ -455,8 +568,9 @@ static bool valid_l4_mask(u32 mask)</div><div class='ctx'> 	return hi &amp;&amp; lo ? false : true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool valid_pedit_action(struct net_device *dev,</div><div class='del'>-			       const struct flow_action_entry *act)</div><div class='add'>+static bool valid_pedit_action(struct netlink_ext_ack *extack,</div><div class='add'>+			       const struct flow_action_entry *act,</div><div class='add'>+			       u8 *natmode_flags)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask, offset;</div><div class='ctx'> 	u8 htype;</div><div class='hunk'>@@ -473,19 +587,20 @@ static bool valid_pedit_action(struct net_device *dev,</div><div class='ctx'> 		case PEDIT_ETH_SMAC_47_16:</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(dev, "%s: Unsupported pedit field\n",</div><div class='del'>-				   __func__);</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FLOW_ACT_MANGLE_HDR_TYPE_IP4:</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_IP4_SRC:</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;</div><div class='add'>+			break;</div><div class='ctx'> 		case PEDIT_IP4_DST:</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(dev, "%s: Unsupported pedit field\n",</div><div class='del'>-				   __func__);</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -495,14 +610,16 @@ static bool valid_pedit_action(struct net_device *dev,</div><div class='ctx'> 		case PEDIT_IP6_SRC_63_32:</div><div class='ctx'> 		case PEDIT_IP6_SRC_95_64:</div><div class='ctx'> 		case PEDIT_IP6_SRC_127_96:</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_SIP;</div><div class='add'>+			break;</div><div class='ctx'> 		case PEDIT_IP6_DST_31_0:</div><div class='ctx'> 		case PEDIT_IP6_DST_63_32:</div><div class='ctx'> 		case PEDIT_IP6_DST_95_64:</div><div class='ctx'> 		case PEDIT_IP6_DST_127_96:</div><div class='add'>+			*natmode_flags |= CXGB4_ACTION_NATMODE_DIP;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(dev, "%s: Unsupported pedit field\n",</div><div class='del'>-				   __func__);</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -510,14 +627,17 @@ static bool valid_pedit_action(struct net_device *dev,</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_TCP_SPORT_DPORT:</div><div class='ctx'> 			if (!valid_l4_mask(~mask)) {</div><div class='del'>-				netdev_err(dev, "%s: Unsupported mask for TCP L4 ports\n",</div><div class='del'>-					   __func__);</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Unsupported mask for TCP L4 ports");</div><div class='ctx'> 				return false;</div><div class='ctx'> 			}</div><div class='add'>+			if (~mask &amp; PEDIT_TCP_UDP_SPORT_MASK)</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;</div><div class='add'>+			else</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(dev, "%s: Unsupported pedit field\n",</div><div class='del'>-				   __func__);</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -525,45 +645,61 @@ static bool valid_pedit_action(struct net_device *dev,</div><div class='ctx'> 		switch (offset) {</div><div class='ctx'> 		case PEDIT_UDP_SPORT_DPORT:</div><div class='ctx'> 			if (!valid_l4_mask(~mask)) {</div><div class='del'>-				netdev_err(dev, "%s: Unsupported mask for UDP L4 ports\n",</div><div class='del'>-					   __func__);</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Unsupported mask for UDP L4 ports");</div><div class='ctx'> 				return false;</div><div class='ctx'> 			}</div><div class='add'>+			if (~mask &amp; PEDIT_TCP_UDP_SPORT_MASK)</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_SPORT;</div><div class='add'>+			else</div><div class='add'>+				*natmode_flags |= CXGB4_ACTION_NATMODE_DPORT;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(dev, "%s: Unsupported pedit field\n",</div><div class='del'>-				   __func__);</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit field");</div><div class='ctx'> 			return false;</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		netdev_err(dev, "%s: Unsupported pedit type\n", __func__);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unsupported pedit type");</div><div class='ctx'> 		return false;</div><div class='ctx'> 	}</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb4_validate_flow_actions(struct net_device *dev,</div><div class='del'>-				       struct tc_cls_flower_offload *cls)</div><div class='add'>+int cxgb4_validate_flow_actions(struct net_device *dev,</div><div class='add'>+				struct flow_action *actions,</div><div class='add'>+				struct netlink_ext_ack *extack,</div><div class='add'>+				u8 matchall_filter)</div><div class='ctx'> {</div><div class='del'>-	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='ctx'> 	struct flow_action_entry *act;</div><div class='ctx'> 	bool act_redir = false;</div><div class='ctx'> 	bool act_pedit = false;</div><div class='ctx'> 	bool act_vlan = false;</div><div class='add'>+	u8 natmode_flags = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	flow_action_for_each(i, act, &amp;rule-&gt;action) {</div><div class='add'>+	if (!flow_action_basic_hw_stats_check(actions, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, act, actions) {</div><div class='ctx'> 		switch (act-&gt;id) {</div><div class='ctx'> 		case FLOW_ACTION_ACCEPT:</div><div class='ctx'> 		case FLOW_ACTION_DROP:</div><div class='ctx'> 			/* Do nothing */</div><div class='ctx'> 			break;</div><div class='add'>+		case FLOW_ACTION_MIRRED:</div><div class='ctx'> 		case FLOW_ACTION_REDIRECT: {</div><div class='del'>-			struct adapter *adap = netdev2adap(dev);</div><div class='ctx'> 			struct net_device *n_dev, *target_dev;</div><div class='del'>-			unsigned int i;</div><div class='ctx'> 			bool found = false;</div><div class='add'>+			unsigned int i;</div><div class='add'>+</div><div class='add'>+			if (act-&gt;id == FLOW_ACTION_MIRRED &amp;&amp;</div><div class='add'>+			    !matchall_filter) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Egress mirror action is only supported for tc-matchall");</div><div class='add'>+				return -EOPNOTSUPP;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='ctx'> 			target_dev = act-&gt;dev;</div><div class='ctx'> 			for_each_port(adap, i) {</div><div class='hunk'>@@ -578,8 +714,7 @@ static int cxgb4_validate_flow_actions(struct net_device *dev,</div><div class='ctx'> 			 * the provided output port is not valid</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (!found) {</div><div class='del'>-				netdev_err(dev, "%s: Out port invalid\n",</div><div class='del'>-					   __func__);</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack, "Out port invalid");</div><div class='ctx'> 				return -EINVAL;</div><div class='ctx'> 			}</div><div class='ctx'> 			act_redir = true;</div><div class='hunk'>@@ -596,103 +731,231 @@ static int cxgb4_validate_flow_actions(struct net_device *dev,</div><div class='ctx'> 			case FLOW_ACTION_VLAN_PUSH:</div><div class='ctx'> 			case FLOW_ACTION_VLAN_MANGLE:</div><div class='ctx'> 				if (proto != ETH_P_8021Q) {</div><div class='del'>-					netdev_err(dev, "%s: Unsupported vlan proto\n",</div><div class='del'>-						   __func__);</div><div class='add'>+					NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+							   "Unsupported vlan proto");</div><div class='ctx'> 					return -EOPNOTSUPP;</div><div class='ctx'> 				}</div><div class='ctx'> 				break;</div><div class='ctx'> 			default:</div><div class='del'>-				netdev_err(dev, "%s: Unsupported vlan action\n",</div><div class='del'>-					   __func__);</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Unsupported vlan action");</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			}</div><div class='ctx'> 			act_vlan = true;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FLOW_ACTION_MANGLE: {</div><div class='del'>-			bool pedit_valid = valid_pedit_action(dev, act);</div><div class='add'>+			bool pedit_valid = valid_pedit_action(extack, act,</div><div class='add'>+							      &amp;natmode_flags);</div><div class='ctx'> </div><div class='ctx'> 			if (!pedit_valid)</div><div class='ctx'> 				return -EOPNOTSUPP;</div><div class='ctx'> 			act_pedit = true;</div><div class='ctx'> 			}</div><div class='ctx'> 			break;</div><div class='add'>+		case FLOW_ACTION_QUEUE:</div><div class='add'>+			/* Do nothing. cxgb4_set_filter will validate */</div><div class='add'>+			break;</div><div class='ctx'> 		default:</div><div class='del'>-			netdev_err(dev, "%s: Unsupported action\n", __func__);</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack, "Unsupported action");</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if ((act_pedit || act_vlan) &amp;&amp; !act_redir) {</div><div class='del'>-		netdev_err(dev, "%s: pedit/vlan rewrite invalid without egress redirect\n",</div><div class='del'>-			   __func__);</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "pedit/vlan rewrite invalid without egress redirect");</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (act_pedit) {</div><div class='add'>+		int ret;</div><div class='add'>+</div><div class='add'>+		ret = cxgb4_action_natmode_validate(adap, natmode_flags,</div><div class='add'>+						    extack);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int cxgb4_tc_flower_replace(struct net_device *dev,</div><div class='del'>-			    struct tc_cls_flower_offload *cls)</div><div class='add'>+static void cxgb4_tc_flower_hash_prio_add(struct adapter *adap, u32 tc_prio)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;adap-&gt;tids.ftid_lock);</div><div class='add'>+	if (adap-&gt;tids.tc_hash_tids_max_prio &lt; tc_prio)</div><div class='add'>+		adap-&gt;tids.tc_hash_tids_max_prio = tc_prio;</div><div class='add'>+	spin_unlock_bh(&amp;adap-&gt;tids.ftid_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_tc_flower_hash_prio_del(struct adapter *adap, u32 tc_prio)</div><div class='add'>+{</div><div class='add'>+	struct tid_info *t = &amp;adap-&gt;tids;</div><div class='add'>+	struct ch_tc_flower_entry *fe;</div><div class='add'>+	struct rhashtable_iter iter;</div><div class='add'>+	u32 found = 0;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+	/* Bail if the current rule is not the one with the max</div><div class='add'>+	 * prio.</div><div class='add'>+	 */</div><div class='add'>+	if (t-&gt;tc_hash_tids_max_prio != tc_prio)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* Search for the next rule having the same or next lower</div><div class='add'>+	 * max prio.</div><div class='add'>+	 */</div><div class='add'>+	rhashtable_walk_enter(&amp;adap-&gt;flower_tbl, &amp;iter);</div><div class='add'>+	do {</div><div class='add'>+		rhashtable_walk_start(&amp;iter);</div><div class='add'>+</div><div class='add'>+		fe = rhashtable_walk_next(&amp;iter);</div><div class='add'>+		while (!IS_ERR_OR_NULL(fe)) {</div><div class='add'>+			if (fe-&gt;fs.hash &amp;&amp;</div><div class='add'>+			    fe-&gt;fs.tc_prio &lt;= t-&gt;tc_hash_tids_max_prio) {</div><div class='add'>+				t-&gt;tc_hash_tids_max_prio = fe-&gt;fs.tc_prio;</div><div class='add'>+				found++;</div><div class='add'>+</div><div class='add'>+				/* Bail if we found another rule</div><div class='add'>+				 * having the same prio as the</div><div class='add'>+				 * current max one.</div><div class='add'>+				 */</div><div class='add'>+				if (fe-&gt;fs.tc_prio == tc_prio)</div><div class='add'>+					break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			fe = rhashtable_walk_next(&amp;iter);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rhashtable_walk_stop(&amp;iter);</div><div class='add'>+	} while (fe == ERR_PTR(-EAGAIN));</div><div class='add'>+	rhashtable_walk_exit(&amp;iter);</div><div class='add'>+</div><div class='add'>+	if (!found)</div><div class='add'>+		t-&gt;tc_hash_tids_max_prio = 0;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;t-&gt;ftid_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_flow_rule_replace(struct net_device *dev, struct flow_rule *rule,</div><div class='add'>+			    u32 tc_prio, struct netlink_ext_ack *extack,</div><div class='add'>+			    struct ch_filter_specification *fs, u32 *tid)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='del'>-	struct ch_tc_flower_entry *ch_flower;</div><div class='del'>-	struct ch_filter_specification *fs;</div><div class='ctx'> 	struct filter_ctx ctx;</div><div class='del'>-	int fidx;</div><div class='del'>-	int ret;</div><div class='add'>+	u16 addr_type = 0;</div><div class='add'>+	u8 inet_family;</div><div class='add'>+	int fidx, ret;</div><div class='ctx'> </div><div class='del'>-	if (cxgb4_validate_flow_actions(dev, cls))</div><div class='add'>+	if (cxgb4_validate_flow_actions(dev, &amp;rule-&gt;action, extack, 0))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (cxgb4_validate_flow_match(dev, cls))</div><div class='add'>+	if (cxgb4_validate_flow_match(extack, rule))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	ch_flower = allocate_flower_entry();</div><div class='del'>-	if (!ch_flower) {</div><div class='del'>-		netdev_err(dev, "%s: ch_flower alloc failed.\n", __func__);</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {</div><div class='add'>+		struct flow_match_control match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_control(rule, &amp;match);</div><div class='add'>+		addr_type = match.key-&gt;addr_type;</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;flags &amp; FLOW_DIS_IS_FRAGMENT) {</div><div class='add'>+			fs-&gt;val.frag = match.key-&gt;flags &amp; FLOW_DIS_IS_FRAGMENT;</div><div class='add'>+			fs-&gt;mask.frag = true;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!flow_rule_is_supp_control_flags(FLOW_DIS_IS_FRAGMENT,</div><div class='add'>+						     match.mask-&gt;flags, extack))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	} else if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) {</div><div class='add'>+		addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;</div><div class='add'>+	} else if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV6_ADDRS)) {</div><div class='add'>+		addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	fs = &amp;ch_flower-&gt;fs;</div><div class='del'>-	fs-&gt;hitcnts = 1;</div><div class='del'>-	cxgb4_process_flow_match(dev, cls, fs);</div><div class='del'>-	cxgb4_process_flow_actions(dev, cls, fs);</div><div class='add'>+	cxgb4_process_flow_match(dev, rule, addr_type, fs);</div><div class='add'>+	cxgb4_process_flow_actions(dev, &amp;rule-&gt;action, fs);</div><div class='ctx'> </div><div class='ctx'> 	fs-&gt;hash = is_filter_exact_match(adap, fs);</div><div class='del'>-	if (fs-&gt;hash) {</div><div class='del'>-		fidx = 0;</div><div class='del'>-	} else {</div><div class='del'>-		fidx = cxgb4_get_free_ftid(dev, fs-&gt;type ? PF_INET6 : PF_INET);</div><div class='del'>-		if (fidx &lt; 0) {</div><div class='del'>-			netdev_err(dev, "%s: No fidx for offload.\n", __func__);</div><div class='del'>-			ret = -ENOMEM;</div><div class='del'>-			goto free_entry;</div><div class='del'>-		}</div><div class='add'>+	inet_family = fs-&gt;type ? PF_INET6 : PF_INET;</div><div class='add'>+</div><div class='add'>+	/* Get a free filter entry TID, where we can insert this new</div><div class='add'>+	 * rule. Only insert rule if its prio doesn't conflict with</div><div class='add'>+	 * existing rules.</div><div class='add'>+	 */</div><div class='add'>+	fidx = cxgb4_get_free_ftid(dev, inet_family, fs-&gt;hash,</div><div class='add'>+				   tc_prio);</div><div class='add'>+	if (fidx &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "No free LETCAM index available");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fidx &lt; adap-&gt;tids.nhpftids) {</div><div class='add'>+		fs-&gt;prio = 1;</div><div class='add'>+		fs-&gt;hash = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If the rule can be inserted into HASH region, then ignore</div><div class='add'>+	 * the index to normal FILTER region.</div><div class='add'>+	 */</div><div class='add'>+	if (fs-&gt;hash)</div><div class='add'>+		fidx = 0;</div><div class='add'>+</div><div class='add'>+	fs-&gt;tc_prio = tc_prio;</div><div class='add'>+</div><div class='ctx'> 	init_completion(&amp;ctx.completion);</div><div class='ctx'> 	ret = __cxgb4_set_filter(dev, fidx, fs, &amp;ctx);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		netdev_err(dev, "%s: filter creation err %d\n",</div><div class='del'>-			   __func__, ret);</div><div class='del'>-		goto free_entry;</div><div class='add'>+		NL_SET_ERR_MSG_FMT_MOD(extack, "filter creation err %d", ret);</div><div class='add'>+		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Wait for reply */</div><div class='ctx'> 	ret = wait_for_completion_timeout(&amp;ctx.completion, 10 * HZ);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		ret = -ETIMEDOUT;</div><div class='del'>-		goto free_entry;</div><div class='del'>-	}</div><div class='add'>+	if (!ret)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='ctx'> </div><div class='del'>-	ret = ctx.result;</div><div class='ctx'> 	/* Check if hw returned error for filter creation */</div><div class='add'>+	if (ctx.result)</div><div class='add'>+		return ctx.result;</div><div class='add'>+</div><div class='add'>+	*tid = ctx.tid;</div><div class='add'>+</div><div class='add'>+	if (fs-&gt;hash)</div><div class='add'>+		cxgb4_tc_flower_hash_prio_add(adap, tc_prio);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_tc_flower_replace(struct net_device *dev,</div><div class='add'>+			    struct flow_cls_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct ch_tc_flower_entry *ch_flower;</div><div class='add'>+	struct ch_filter_specification *fs;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ch_flower = allocate_flower_entry();</div><div class='add'>+	if (!ch_flower) {</div><div class='add'>+		netdev_err(dev, "%s: ch_flower alloc failed.\n", __func__);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fs = &amp;ch_flower-&gt;fs;</div><div class='add'>+	fs-&gt;hitcnts = 1;</div><div class='add'>+	fs-&gt;tc_cookie = cls-&gt;cookie;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_flow_rule_replace(dev, rule, cls-&gt;common.prio, extack, fs,</div><div class='add'>+				      &amp;ch_flower-&gt;filter_id);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto free_entry;</div><div class='ctx'> </div><div class='ctx'> 	ch_flower-&gt;tc_flower_cookie = cls-&gt;cookie;</div><div class='del'>-	ch_flower-&gt;filter_id = ctx.tid;</div><div class='ctx'> 	ret = rhashtable_insert_fast(&amp;adap-&gt;flower_tbl, &amp;ch_flower-&gt;node,</div><div class='ctx'> 				     adap-&gt;flower_ht_params);</div><div class='ctx'> 	if (ret)</div><div class='hunk'>@@ -701,6 +964,9 @@ int cxgb4_tc_flower_replace(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> del_filter:</div><div class='add'>+	if (fs-&gt;hash)</div><div class='add'>+		cxgb4_tc_flower_hash_prio_del(adap, cls-&gt;common.prio);</div><div class='add'>+</div><div class='ctx'> 	cxgb4_del_filter(dev, ch_flower-&gt;filter_id, &amp;ch_flower-&gt;fs);</div><div class='ctx'> </div><div class='ctx'> free_entry:</div><div class='hunk'>@@ -708,8 +974,27 @@ free_entry:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int cxgb4_flow_rule_destroy(struct net_device *dev, u32 tc_prio,</div><div class='add'>+			    struct ch_filter_specification *fs, int tid)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	u8 hash;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	hash = fs-&gt;hash;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_del_filter(dev, tid, fs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (hash)</div><div class='add'>+		cxgb4_tc_flower_hash_prio_del(adap, tc_prio);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int cxgb4_tc_flower_destroy(struct net_device *dev,</div><div class='del'>-			    struct tc_cls_flower_offload *cls)</div><div class='add'>+			    struct flow_cls_offload *cls)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='ctx'> 	struct ch_tc_flower_entry *ch_flower;</div><div class='hunk'>@@ -719,19 +1004,16 @@ int cxgb4_tc_flower_destroy(struct net_device *dev,</div><div class='ctx'> 	if (!ch_flower)</div><div class='ctx'> 		return -ENOENT;</div><div class='ctx'> </div><div class='del'>-	ret = cxgb4_del_filter(dev, ch_flower-&gt;filter_id, &amp;ch_flower-&gt;fs);</div><div class='add'>+	rhashtable_remove_fast(&amp;adap-&gt;flower_tbl, &amp;ch_flower-&gt;node,</div><div class='add'>+			       adap-&gt;flower_ht_params);</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_flow_rule_destroy(dev, ch_flower-&gt;fs.tc_prio,</div><div class='add'>+				      &amp;ch_flower-&gt;fs, ch_flower-&gt;filter_id);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		goto err;</div><div class='add'>+		netdev_err(dev, "Flow rule destroy failed for tid: %u, ret: %d",</div><div class='add'>+			   ch_flower-&gt;filter_id, ret);</div><div class='ctx'> </div><div class='del'>-	ret = rhashtable_remove_fast(&amp;adap-&gt;flower_tbl, &amp;ch_flower-&gt;node,</div><div class='del'>-				     adap-&gt;flower_ht_params);</div><div class='del'>-	if (ret) {</div><div class='del'>-		netdev_err(dev, "Flow remove from rhashtable failed");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='ctx'> 	kfree_rcu(ch_flower, rcu);</div><div class='del'>-</div><div class='del'>-err:</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -777,13 +1059,13 @@ static void ch_flower_stats_handler(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static void ch_flower_stats_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adap = from_timer(adap, t, flower_stats_timer);</div><div class='add'>+	struct adapter *adap = timer_container_of(adap, t, flower_stats_timer);</div><div class='ctx'> </div><div class='ctx'> 	schedule_work(&amp;adap-&gt;flower_stats_work);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cxgb4_tc_flower_stats(struct net_device *dev,</div><div class='del'>-			  struct tc_cls_flower_offload *cls)</div><div class='add'>+			  struct flow_cls_offload *cls)</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = netdev2adap(dev);</div><div class='ctx'> 	struct ch_tc_flower_stats *ofld_stats;</div><div class='hunk'>@@ -810,8 +1092,9 @@ int cxgb4_tc_flower_stats(struct net_device *dev,</div><div class='ctx'> 		if (ofld_stats-&gt;prev_packet_count != packets)</div><div class='ctx'> 			ofld_stats-&gt;last_used = jiffies;</div><div class='ctx'> 		flow_stats_update(&amp;cls-&gt;stats, bytes - ofld_stats-&gt;byte_count,</div><div class='del'>-				  packets - ofld_stats-&gt;packet_count,</div><div class='del'>-				  ofld_stats-&gt;last_used);</div><div class='add'>+				  packets - ofld_stats-&gt;packet_count, 0,</div><div class='add'>+				  ofld_stats-&gt;last_used,</div><div class='add'>+				  FLOW_ACTION_HW_STATS_IMMEDIATE);</div><div class='ctx'> </div><div class='ctx'> 		ofld_stats-&gt;packet_count = packets;</div><div class='ctx'> 		ofld_stats-&gt;byte_count = bytes;</div><div class='hunk'>@@ -859,7 +1142,7 @@ void cxgb4_cleanup_tc_flower(struct adapter *adap)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;flower_stats_timer.function)</div><div class='del'>-		del_timer_sync(&amp;adap-&gt;flower_stats_timer);</div><div class='add'>+		timer_shutdown_sync(&amp;adap-&gt;flower_stats_timer);</div><div class='ctx'> 	cancel_work_sync(&amp;adap-&gt;flower_stats_work);</div><div class='ctx'> 	rhashtable_destroy(&amp;adap-&gt;flower_tbl);</div><div class='ctx'> 	adap-&gt;tc_flower_initialized = false;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h<br/>index 050c8a50ae41..3a2fa00c8cde 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h</a></div><div class='hunk'>@@ -108,12 +108,40 @@ struct ch_tc_pedit_fields {</div><div class='ctx'> #define PEDIT_TCP_SPORT_DPORT		0x0</div><div class='ctx'> #define PEDIT_UDP_SPORT_DPORT		0x0</div><div class='ctx'> </div><div class='add'>+enum cxgb4_action_natmode_flags {</div><div class='add'>+	CXGB4_ACTION_NATMODE_NONE = 0,</div><div class='add'>+	CXGB4_ACTION_NATMODE_DIP = (1 &lt;&lt; 0),</div><div class='add'>+	CXGB4_ACTION_NATMODE_SIP = (1 &lt;&lt; 1),</div><div class='add'>+	CXGB4_ACTION_NATMODE_DPORT = (1 &lt;&lt; 2),</div><div class='add'>+	CXGB4_ACTION_NATMODE_SPORT = (1 &lt;&lt; 3),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* TC PEDIT action to NATMODE translation entry */</div><div class='add'>+struct cxgb4_natmode_config {</div><div class='add'>+	enum chip_type chip;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 natmode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void cxgb4_process_flow_actions(struct net_device *in,</div><div class='add'>+				struct flow_action *actions,</div><div class='add'>+				struct ch_filter_specification *fs);</div><div class='add'>+int cxgb4_validate_flow_actions(struct net_device *dev,</div><div class='add'>+				struct flow_action *actions,</div><div class='add'>+				struct netlink_ext_ack *extack,</div><div class='add'>+				u8 matchall_filter);</div><div class='add'>+</div><div class='ctx'> int cxgb4_tc_flower_replace(struct net_device *dev,</div><div class='del'>-			    struct tc_cls_flower_offload *cls);</div><div class='add'>+			    struct flow_cls_offload *cls);</div><div class='ctx'> int cxgb4_tc_flower_destroy(struct net_device *dev,</div><div class='del'>-			    struct tc_cls_flower_offload *cls);</div><div class='add'>+			    struct flow_cls_offload *cls);</div><div class='ctx'> int cxgb4_tc_flower_stats(struct net_device *dev,</div><div class='del'>-			  struct tc_cls_flower_offload *cls);</div><div class='add'>+			  struct flow_cls_offload *cls);</div><div class='add'>+int cxgb4_flow_rule_replace(struct net_device *dev, struct flow_rule *rule,</div><div class='add'>+			    u32 tc_prio, struct netlink_ext_ack *extack,</div><div class='add'>+			    struct ch_filter_specification *fs, u32 *tid);</div><div class='add'>+int cxgb4_flow_rule_destroy(struct net_device *dev, u32 tc_prio,</div><div class='add'>+			    struct ch_filter_specification *fs, int tid);</div><div class='ctx'> </div><div class='ctx'> int cxgb4_init_tc_flower(struct adapter *adap);</div><div class='ctx'> void cxgb4_cleanup_tc_flower(struct adapter *adap);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c<br/>new file mode 100644<br/>index 000000000000..f8dcf0b4abcd<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c</a></div><div class='hunk'>@@ -0,0 +1,571 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2019 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+#include "cxgb4_tc_matchall.h"</div><div class='add'>+#include "sched.h"</div><div class='add'>+#include "cxgb4_uld.h"</div><div class='add'>+#include "cxgb4_filter.h"</div><div class='add'>+#include "cxgb4_tc_flower.h"</div><div class='add'>+</div><div class='add'>+static int cxgb4_policer_validate(const struct flow_action *action,</div><div class='add'>+				  const struct flow_action_entry *act,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (act-&gt;police.exceed.act_id != FLOW_ACTION_DROP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when exceed action is not drop");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.notexceed.act_id != FLOW_ACTION_PIPE &amp;&amp;</div><div class='add'>+	    act-&gt;police.notexceed.act_id != FLOW_ACTION_ACCEPT) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when conform action is not pipe or ok");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.notexceed.act_id == FLOW_ACTION_ACCEPT &amp;&amp;</div><div class='add'>+	    !flow_action_is_last_entry(action, act)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when conform action is ok, but action is not last");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.peakrate_bytes_ps ||</div><div class='add'>+	    act-&gt;police.avrate || act-&gt;police.overhead) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Offload not supported when peakrate/avrate/overhead is configured");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (act-&gt;police.rate_pkt_ps) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "QoS offload not support packets per second");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_egress_validate(struct net_device *dev,</div><div class='add'>+					  struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct flow_action *actions = &amp;cls-&gt;rule-&gt;action;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct flow_action_entry *entry;</div><div class='add'>+	struct ch_sched_queue qe;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='add'>+	u64 max_link_rate;</div><div class='add'>+	u32 i, speed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (!flow_action_has_entries(actions)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Egress MATCHALL offload needs at least 1 policing action");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (!flow_offload_has_one_action(actions)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Egress MATCHALL offload only supports 1 policing action");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (pi-&gt;tc_block_shared) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Egress MATCHALL offload not supported with shared blocks");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t4_get_link_params(pi, NULL, &amp;speed, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Failed to get max speed supported by the link");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convert from Mbps to bps */</div><div class='add'>+	max_link_rate = (u64)speed * 1000 * 1000;</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, entry, actions) {</div><div class='add'>+		switch (entry-&gt;id) {</div><div class='add'>+		case FLOW_ACTION_POLICE:</div><div class='add'>+			ret = cxgb4_policer_validate(actions, entry, extack);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+</div><div class='add'>+			/* Convert bytes per second to bits per second */</div><div class='add'>+			if (entry-&gt;police.rate_bytes_ps * 8 &gt; max_link_rate) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Specified policing max rate is larger than underlying link speed");</div><div class='add'>+				return -ERANGE;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Only policing action supported with Egress MATCHALL offload");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nqsets; i++) {</div><div class='add'>+		memset(&amp;qe, 0, sizeof(qe));</div><div class='add'>+		qe.queue = i;</div><div class='add'>+</div><div class='add'>+		e = cxgb4_sched_queue_lookup(dev, &amp;qe);</div><div class='add'>+		if (e &amp;&amp; e-&gt;info.u.params.level != SCHED_CLASS_LEVEL_CH_RL) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Some queues are already bound to different class");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_tc_bind_queues(struct net_device *dev, u32 tc)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct ch_sched_queue qe;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nqsets; i++) {</div><div class='add'>+		qe.queue = i;</div><div class='add'>+		qe.class = tc;</div><div class='add'>+		ret = cxgb4_sched_class_bind(dev, &amp;qe, SCHED_QUEUE);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	while (i--) {</div><div class='add'>+		qe.queue = i;</div><div class='add'>+		qe.class = SCHED_CLS_NONE;</div><div class='add'>+		cxgb4_sched_class_unbind(dev, &amp;qe, SCHED_QUEUE);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_matchall_tc_unbind_queues(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct ch_sched_queue qe;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nqsets; i++) {</div><div class='add'>+		qe.queue = i;</div><div class='add'>+		qe.class = SCHED_CLS_NONE;</div><div class='add'>+		cxgb4_sched_class_unbind(dev, &amp;qe, SCHED_QUEUE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_alloc_tc(struct net_device *dev,</div><div class='add'>+				   struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct ch_sched_params p = {</div><div class='add'>+		.type = SCHED_CLASS_TYPE_PACKET,</div><div class='add'>+		.u.params.level = SCHED_CLASS_LEVEL_CH_RL,</div><div class='add'>+		.u.params.mode = SCHED_CLASS_MODE_CLASS,</div><div class='add'>+		.u.params.rateunit = SCHED_CLASS_RATEUNIT_BITS,</div><div class='add'>+		.u.params.ratemode = SCHED_CLASS_RATEMODE_ABS,</div><div class='add'>+		.u.params.class = SCHED_CLS_NONE,</div><div class='add'>+		.u.params.minrate = 0,</div><div class='add'>+		.u.params.weight = 0,</div><div class='add'>+		.u.params.pktsize = dev-&gt;mtu,</div><div class='add'>+	};</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct flow_action_entry *entry;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+</div><div class='add'>+	flow_action_for_each(i, entry, &amp;cls-&gt;rule-&gt;action)</div><div class='add'>+		if (entry-&gt;id == FLOW_ACTION_POLICE)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_policer_validate(&amp;cls-&gt;rule-&gt;action, entry, extack);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* Convert from bytes per second to Kbps */</div><div class='add'>+	p.u.params.maxrate = div_u64(entry-&gt;police.rate_bytes_ps * 8, 1000);</div><div class='add'>+	p.u.params.channel = pi-&gt;tx_chan;</div><div class='add'>+	e = cxgb4_sched_class_alloc(dev, &amp;p);</div><div class='add'>+	if (!e) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "No free traffic class available for policing action");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_matchall_tc_bind_queues(dev, e-&gt;idx);</div><div class='add'>+	if (ret) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Could not bind queues to traffic class");</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tc_port_matchall-&gt;egress.hwtc = e-&gt;idx;</div><div class='add'>+	tc_port_matchall-&gt;egress.cookie = cls-&gt;cookie;</div><div class='add'>+	tc_port_matchall-&gt;egress.state = CXGB4_MATCHALL_STATE_ENABLED;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	cxgb4_sched_class_free(dev, e-&gt;idx);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_matchall_free_tc(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	cxgb4_matchall_tc_unbind_queues(dev);</div><div class='add'>+	cxgb4_sched_class_free(dev, tc_port_matchall-&gt;egress.hwtc);</div><div class='add'>+</div><div class='add'>+	tc_port_matchall-&gt;egress.hwtc = SCHED_CLS_NONE;</div><div class='add'>+	tc_port_matchall-&gt;egress.cookie = 0;</div><div class='add'>+	tc_port_matchall-&gt;egress.state = CXGB4_MATCHALL_STATE_DISABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_mirror_alloc(struct net_device *dev,</div><div class='add'>+				       struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	int ret;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	flow_action_for_each(i, act, &amp;cls-&gt;rule-&gt;action) {</div><div class='add'>+		if (act-&gt;id == FLOW_ACTION_MIRRED) {</div><div class='add'>+			ret = cxgb4_port_mirror_alloc(dev);</div><div class='add'>+			if (ret) {</div><div class='add'>+				NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+						   "Couldn't allocate mirror");</div><div class='add'>+				return ret;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			tc_port_matchall-&gt;ingress.viid_mirror = pi-&gt;viid_mirror;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_matchall_mirror_free(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	if (!tc_port_matchall-&gt;ingress.viid_mirror)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	cxgb4_port_mirror_free(dev);</div><div class='add'>+	tc_port_matchall-&gt;ingress.viid_mirror = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_del_filter(struct net_device *dev, u8 filter_type)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	ret = cxgb4_del_filter(dev, tc_port_matchall-&gt;ingress.tid[filter_type],</div><div class='add'>+			       &amp;tc_port_matchall-&gt;ingress.fs[filter_type]);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall-&gt;ingress.tid[filter_type] = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_add_filter(struct net_device *dev,</div><div class='add'>+				     struct tc_cls_matchall_offload *cls,</div><div class='add'>+				     u8 filter_type)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct ch_filter_specification *fs;</div><div class='add'>+	int ret, fidx;</div><div class='add'>+</div><div class='add'>+	/* Get a free filter entry TID, where we can insert this new</div><div class='add'>+	 * rule. Only insert rule if its prio doesn't conflict with</div><div class='add'>+	 * existing rules.</div><div class='add'>+	 */</div><div class='add'>+	fidx = cxgb4_get_free_ftid(dev, filter_type ? PF_INET6 : PF_INET,</div><div class='add'>+				   false, cls-&gt;common.prio);</div><div class='add'>+	if (fidx &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "No free LETCAM index available");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	fs = &amp;tc_port_matchall-&gt;ingress.fs[filter_type];</div><div class='add'>+	memset(fs, 0, sizeof(*fs));</div><div class='add'>+</div><div class='add'>+	if (fidx &lt; adap-&gt;tids.nhpftids)</div><div class='add'>+		fs-&gt;prio = 1;</div><div class='add'>+	fs-&gt;tc_prio = cls-&gt;common.prio;</div><div class='add'>+	fs-&gt;tc_cookie = cls-&gt;cookie;</div><div class='add'>+	fs-&gt;type = filter_type;</div><div class='add'>+	fs-&gt;hitcnts = 1;</div><div class='add'>+</div><div class='add'>+	fs-&gt;val.pfvf_vld = 1;</div><div class='add'>+	fs-&gt;val.pf = adap-&gt;pf;</div><div class='add'>+	fs-&gt;val.vf = pi-&gt;vin;</div><div class='add'>+</div><div class='add'>+	cxgb4_process_flow_actions(dev, &amp;cls-&gt;rule-&gt;action, fs);</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_set_filter(dev, fidx, fs);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall-&gt;ingress.tid[filter_type] = fidx;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_alloc_filter(struct net_device *dev,</div><div class='add'>+				       struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret, i;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_matchall_mirror_alloc(dev, cls);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CXGB4_FILTER_TYPE_MAX; i++) {</div><div class='add'>+		ret = cxgb4_matchall_add_filter(dev, cls, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tc_port_matchall-&gt;ingress.state = CXGB4_MATCHALL_STATE_ENABLED;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	while (i-- &gt; 0)</div><div class='add'>+		cxgb4_matchall_del_filter(dev, i);</div><div class='add'>+</div><div class='add'>+	cxgb4_matchall_mirror_free(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_matchall_free_filter(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; CXGB4_FILTER_TYPE_MAX; i++) {</div><div class='add'>+		ret = cxgb4_matchall_del_filter(dev, i);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_matchall_mirror_free(dev);</div><div class='add'>+</div><div class='add'>+	tc_port_matchall-&gt;ingress.packets = 0;</div><div class='add'>+	tc_port_matchall-&gt;ingress.bytes = 0;</div><div class='add'>+	tc_port_matchall-&gt;ingress.last_used = 0;</div><div class='add'>+	tc_port_matchall-&gt;ingress.state = CXGB4_MATCHALL_STATE_DISABLED;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_tc_matchall_replace(struct net_device *dev,</div><div class='add'>+			      struct tc_cls_matchall_offload *cls_matchall,</div><div class='add'>+			      bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls_matchall-&gt;common.extack;</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	if (ingress) {</div><div class='add'>+		if (tc_port_matchall-&gt;ingress.state ==</div><div class='add'>+		    CXGB4_MATCHALL_STATE_ENABLED) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Only 1 Ingress MATCHALL can be offloaded");</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = cxgb4_validate_flow_actions(dev,</div><div class='add'>+						  &amp;cls_matchall-&gt;rule-&gt;action,</div><div class='add'>+						  extack, 1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		return cxgb4_matchall_alloc_filter(dev, cls_matchall);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tc_port_matchall-&gt;egress.state == CXGB4_MATCHALL_STATE_ENABLED) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Only 1 Egress MATCHALL can be offloaded");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_matchall_egress_validate(dev, cls_matchall);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return cxgb4_matchall_alloc_tc(dev, cls_matchall);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_tc_matchall_destroy(struct net_device *dev,</div><div class='add'>+			      struct tc_cls_matchall_offload *cls_matchall,</div><div class='add'>+			      bool ingress)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	if (ingress) {</div><div class='add'>+		/* All the filter types of this matchall rule save the</div><div class='add'>+		 * same cookie. So, checking for the first one is</div><div class='add'>+		 * enough.</div><div class='add'>+		 */</div><div class='add'>+		if (cls_matchall-&gt;cookie !=</div><div class='add'>+		    tc_port_matchall-&gt;ingress.fs[0].tc_cookie)</div><div class='add'>+			return -ENOENT;</div><div class='add'>+</div><div class='add'>+		return cxgb4_matchall_free_filter(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cls_matchall-&gt;cookie != tc_port_matchall-&gt;egress.cookie)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	cxgb4_matchall_free_tc(dev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_tc_matchall_stats(struct net_device *dev,</div><div class='add'>+			    struct tc_cls_matchall_offload *cls_matchall)</div><div class='add'>+{</div><div class='add'>+	u64 tmp_packets, tmp_bytes, packets = 0, bytes = 0;</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct cxgb4_matchall_ingress_entry *ingress;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	if (tc_port_matchall-&gt;ingress.state == CXGB4_MATCHALL_STATE_DISABLED)</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	ingress = &amp;tc_port_matchall-&gt;ingress;</div><div class='add'>+	for (i = 0; i &lt; CXGB4_FILTER_TYPE_MAX; i++) {</div><div class='add'>+		ret = cxgb4_get_filter_counters(dev, ingress-&gt;tid[i],</div><div class='add'>+						&amp;tmp_packets, &amp;tmp_bytes,</div><div class='add'>+						ingress-&gt;fs[i].hash);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		packets += tmp_packets;</div><div class='add'>+		bytes += tmp_bytes;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tc_port_matchall-&gt;ingress.packets != packets) {</div><div class='add'>+		flow_stats_update(&amp;cls_matchall-&gt;stats,</div><div class='add'>+				  bytes - tc_port_matchall-&gt;ingress.bytes,</div><div class='add'>+				  packets - tc_port_matchall-&gt;ingress.packets,</div><div class='add'>+				  0, tc_port_matchall-&gt;ingress.last_used,</div><div class='add'>+				  FLOW_ACTION_HW_STATS_IMMEDIATE);</div><div class='add'>+</div><div class='add'>+		tc_port_matchall-&gt;ingress.packets = packets;</div><div class='add'>+		tc_port_matchall-&gt;ingress.bytes = bytes;</div><div class='add'>+		tc_port_matchall-&gt;ingress.last_used = jiffies;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_matchall_disable_offload(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = &amp;adap-&gt;tc_matchall-&gt;port_matchall[pi-&gt;port_id];</div><div class='add'>+	if (tc_port_matchall-&gt;egress.state == CXGB4_MATCHALL_STATE_ENABLED)</div><div class='add'>+		cxgb4_matchall_free_tc(dev);</div><div class='add'>+</div><div class='add'>+	if (tc_port_matchall-&gt;ingress.state == CXGB4_MATCHALL_STATE_ENABLED)</div><div class='add'>+		cxgb4_matchall_free_filter(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_init_tc_matchall(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_matchall *tc_port_matchall;</div><div class='add'>+	struct cxgb4_tc_matchall *tc_matchall;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	tc_matchall = kzalloc(sizeof(*tc_matchall), GFP_KERNEL);</div><div class='add'>+	if (!tc_matchall)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tc_port_matchall = kcalloc(adap-&gt;params.nports,</div><div class='add'>+				   sizeof(*tc_port_matchall),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!tc_port_matchall) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_matchall;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tc_matchall-&gt;port_matchall = tc_port_matchall;</div><div class='add'>+	adap-&gt;tc_matchall = tc_matchall;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_matchall:</div><div class='add'>+	kfree(tc_matchall);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_cleanup_tc_matchall(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;tc_matchall) {</div><div class='add'>+		if (adap-&gt;tc_matchall-&gt;port_matchall) {</div><div class='add'>+			for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+				struct net_device *dev = adap-&gt;port[i];</div><div class='add'>+</div><div class='add'>+				if (dev)</div><div class='add'>+					cxgb4_matchall_disable_offload(dev);</div><div class='add'>+			}</div><div class='add'>+			kfree(adap-&gt;tc_matchall-&gt;port_matchall);</div><div class='add'>+		}</div><div class='add'>+		kfree(adap-&gt;tc_matchall);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h<br/>new file mode 100644<br/>index 000000000000..fe7ec423a4c9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.h</a></div><div class='hunk'>@@ -0,0 +1,51 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2019 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef __CXGB4_TC_MATCHALL_H__</div><div class='add'>+#define __CXGB4_TC_MATCHALL_H__</div><div class='add'>+</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+</div><div class='add'>+enum cxgb4_matchall_state {</div><div class='add'>+	CXGB4_MATCHALL_STATE_DISABLED = 0,</div><div class='add'>+	CXGB4_MATCHALL_STATE_ENABLED,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_matchall_egress_entry {</div><div class='add'>+	enum cxgb4_matchall_state state; /* Current MATCHALL offload state */</div><div class='add'>+	u8 hwtc; /* Traffic class bound to port */</div><div class='add'>+	u64 cookie; /* Used to identify the MATCHALL rule offloaded */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_matchall_ingress_entry {</div><div class='add'>+	enum cxgb4_matchall_state state; /* Current MATCHALL offload state */</div><div class='add'>+	u32 tid[CXGB4_FILTER_TYPE_MAX]; /* Index to hardware filter entries */</div><div class='add'>+	/* Filter entries */</div><div class='add'>+	struct ch_filter_specification fs[CXGB4_FILTER_TYPE_MAX];</div><div class='add'>+	u16 viid_mirror; /* Identifier for allocated Mirror VI */</div><div class='add'>+	u64 bytes; /* # of bytes hitting the filter */</div><div class='add'>+	u64 packets; /* # of packets hitting the filter */</div><div class='add'>+	u64 last_used; /* Last updated jiffies time */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_tc_port_matchall {</div><div class='add'>+	struct cxgb4_matchall_egress_entry egress; /* Egress offload info */</div><div class='add'>+	struct cxgb4_matchall_ingress_entry ingress; /* Ingress offload info */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_tc_matchall {</div><div class='add'>+	struct cxgb4_tc_port_matchall *port_matchall; /* Per port entry */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cxgb4_tc_matchall_replace(struct net_device *dev,</div><div class='add'>+			      struct tc_cls_matchall_offload *cls_matchall,</div><div class='add'>+			      bool ingress);</div><div class='add'>+int cxgb4_tc_matchall_destroy(struct net_device *dev,</div><div class='add'>+			      struct tc_cls_matchall_offload *cls_matchall,</div><div class='add'>+			      bool ingress);</div><div class='add'>+int cxgb4_tc_matchall_stats(struct net_device *dev,</div><div class='add'>+			    struct tc_cls_matchall_offload *cls_matchall);</div><div class='add'>+</div><div class='add'>+int cxgb4_init_tc_matchall(struct adapter *adap);</div><div class='add'>+void cxgb4_cleanup_tc_matchall(struct adapter *adap);</div><div class='add'>+#endif /* __CXGB4_TC_MATCHALL_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c<br/>new file mode 100644<br/>index 000000000000..a2dcd2e24263<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c</a></div><div class='hunk'>@@ -0,0 +1,722 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2019 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+#include "cxgb4_tc_mqprio.h"</div><div class='add'>+#include "sched.h"</div><div class='add'>+</div><div class='add'>+static int cxgb4_mqprio_validate(struct net_device *dev,</div><div class='add'>+				 struct tc_mqprio_qopt_offload *mqprio)</div><div class='add'>+{</div><div class='add'>+	u64 min_rate = 0, max_rate = 0, max_link_rate;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	u32 speed, qcount = 0, qoffset = 0;</div><div class='add'>+	u32 start_a, start_b, end_a, end_b;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i, j;</div><div class='add'>+</div><div class='add'>+	if (!mqprio-&gt;qopt.num_tc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (mqprio-&gt;qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS) {</div><div class='add'>+		netdev_err(dev, "Only full TC hardware offload is supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (mqprio-&gt;mode != TC_MQPRIO_MODE_CHANNEL) {</div><div class='add'>+		netdev_err(dev, "Only channel mode offload is supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (mqprio-&gt;shaper != TC_MQPRIO_SHAPER_BW_RATE) {</div><div class='add'>+		netdev_err(dev,	"Only bandwidth rate shaper supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	} else if (mqprio-&gt;qopt.num_tc &gt; adap-&gt;params.nsched_cls) {</div><div class='add'>+		netdev_err(dev,</div><div class='add'>+			   "Only %u traffic classes supported by hardware\n",</div><div class='add'>+			   adap-&gt;params.nsched_cls);</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t4_get_link_params(pi, NULL, &amp;speed, NULL);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(dev, "Failed to get link speed, ret: %d\n", ret);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Convert from Mbps to bps */</div><div class='add'>+	max_link_rate = (u64)speed * 1000 * 1000;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; mqprio-&gt;qopt.num_tc; i++) {</div><div class='add'>+		qoffset = max_t(u16, mqprio-&gt;qopt.offset[i], qoffset);</div><div class='add'>+		qcount += mqprio-&gt;qopt.count[i];</div><div class='add'>+</div><div class='add'>+		start_a = mqprio-&gt;qopt.offset[i];</div><div class='add'>+		end_a = start_a + mqprio-&gt;qopt.count[i] - 1;</div><div class='add'>+		for (j = i + 1; j &lt; mqprio-&gt;qopt.num_tc; j++) {</div><div class='add'>+			start_b = mqprio-&gt;qopt.offset[j];</div><div class='add'>+			end_b = start_b + mqprio-&gt;qopt.count[j] - 1;</div><div class='add'>+</div><div class='add'>+			/* If queue count is 0, then the traffic</div><div class='add'>+			 * belonging to this class will not use</div><div class='add'>+			 * ETHOFLD queues. So, no need to validate</div><div class='add'>+			 * further.</div><div class='add'>+			 */</div><div class='add'>+			if (!mqprio-&gt;qopt.count[i])</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (!mqprio-&gt;qopt.count[j])</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			if (max_t(u32, start_a, start_b) &lt;=</div><div class='add'>+			    min_t(u32, end_a, end_b)) {</div><div class='add'>+				netdev_err(dev,</div><div class='add'>+					   "Queues can't overlap across tc\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Convert byte per second to bits per second */</div><div class='add'>+		min_rate += (mqprio-&gt;min_rate[i] * 8);</div><div class='add'>+		max_rate += (mqprio-&gt;max_rate[i] * 8);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qoffset &gt;= adap-&gt;tids.neotids || qcount &gt; adap-&gt;tids.neotids)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (min_rate &gt; max_link_rate || max_rate &gt; max_link_rate) {</div><div class='add'>+		netdev_err(dev,</div><div class='add'>+			   "Total Min/Max (%llu/%llu) Rate &gt; supported (%llu)\n",</div><div class='add'>+			   min_rate, max_rate, max_link_rate);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_init_eosw_txq(struct net_device *dev,</div><div class='add'>+			       struct sge_eosw_txq *eosw_txq,</div><div class='add'>+			       u32 eotid, u32 hwqid)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct tx_sw_desc *ring;</div><div class='add'>+</div><div class='add'>+	memset(eosw_txq, 0, sizeof(*eosw_txq));</div><div class='add'>+</div><div class='add'>+	ring = kcalloc(CXGB4_EOSW_TXQ_DEFAULT_DESC_NUM,</div><div class='add'>+		       sizeof(*ring), GFP_KERNEL);</div><div class='add'>+	if (!ring)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	eosw_txq-&gt;desc = ring;</div><div class='add'>+	eosw_txq-&gt;ndesc = CXGB4_EOSW_TXQ_DEFAULT_DESC_NUM;</div><div class='add'>+	spin_lock_init(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	eosw_txq-&gt;state = CXGB4_EO_STATE_CLOSED;</div><div class='add'>+	eosw_txq-&gt;eotid = eotid;</div><div class='add'>+	eosw_txq-&gt;hwtid = adap-&gt;tids.eotid_base + eosw_txq-&gt;eotid;</div><div class='add'>+	eosw_txq-&gt;cred = adap-&gt;params.ofldq_wr_cred;</div><div class='add'>+	eosw_txq-&gt;hwqid = hwqid;</div><div class='add'>+	eosw_txq-&gt;netdev = dev;</div><div class='add'>+	tasklet_setup(&amp;eosw_txq-&gt;qresume_tsk, cxgb4_ethofld_restart);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_clean_eosw_txq(struct net_device *dev,</div><div class='add'>+				 struct sge_eosw_txq *eosw_txq)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+</div><div class='add'>+	cxgb4_eosw_txq_free_desc(adap, eosw_txq, eosw_txq-&gt;ndesc);</div><div class='add'>+	eosw_txq-&gt;pidx = 0;</div><div class='add'>+	eosw_txq-&gt;last_pidx = 0;</div><div class='add'>+	eosw_txq-&gt;cidx = 0;</div><div class='add'>+	eosw_txq-&gt;last_cidx = 0;</div><div class='add'>+	eosw_txq-&gt;flowc_idx = 0;</div><div class='add'>+	eosw_txq-&gt;inuse = 0;</div><div class='add'>+	eosw_txq-&gt;cred = adap-&gt;params.ofldq_wr_cred;</div><div class='add'>+	eosw_txq-&gt;ncompl = 0;</div><div class='add'>+	eosw_txq-&gt;last_compl = 0;</div><div class='add'>+	eosw_txq-&gt;state = CXGB4_EO_STATE_CLOSED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_free_eosw_txq(struct net_device *dev,</div><div class='add'>+				struct sge_eosw_txq *eosw_txq)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	cxgb4_clean_eosw_txq(dev, eosw_txq);</div><div class='add'>+	kfree(eosw_txq-&gt;desc);</div><div class='add'>+	spin_unlock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	tasklet_kill(&amp;eosw_txq-&gt;qresume_tsk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_mqprio_alloc_hw_resources(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_ofld_rxq *eorxq;</div><div class='add'>+	struct sge_eohw_txq *eotxq;</div><div class='add'>+	int ret, msix = 0;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	/* Allocate ETHOFLD hardware queue structures if not done already */</div><div class='add'>+	if (!refcount_read(&amp;adap-&gt;tc_mqprio-&gt;refcnt)) {</div><div class='add'>+		adap-&gt;sge.eohw_rxq = kcalloc(adap-&gt;sge.eoqsets,</div><div class='add'>+					     sizeof(struct sge_ofld_rxq),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+		if (!adap-&gt;sge.eohw_rxq)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		adap-&gt;sge.eohw_txq = kcalloc(adap-&gt;sge.eoqsets,</div><div class='add'>+					     sizeof(struct sge_eohw_txq),</div><div class='add'>+					     GFP_KERNEL);</div><div class='add'>+		if (!adap-&gt;sge.eohw_txq) {</div><div class='add'>+			kfree(adap-&gt;sge.eohw_rxq);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		refcount_set(&amp;adap-&gt;tc_mqprio-&gt;refcnt, 1);</div><div class='add'>+	} else {</div><div class='add'>+		refcount_inc(&amp;adap-&gt;tc_mqprio-&gt;refcnt);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_USING_MSIX))</div><div class='add'>+		msix = -((int)adap-&gt;sge.intrq.abs_id + 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nqsets; i++) {</div><div class='add'>+		eorxq = &amp;adap-&gt;sge.eohw_rxq[pi-&gt;first_qset + i];</div><div class='add'>+		eotxq = &amp;adap-&gt;sge.eohw_txq[pi-&gt;first_qset + i];</div><div class='add'>+</div><div class='add'>+		/* Allocate Rxqs for receiving ETHOFLD Tx completions */</div><div class='add'>+		if (msix &gt;= 0) {</div><div class='add'>+			msix = cxgb4_get_msix_idx_from_bmap(adap);</div><div class='add'>+			if (msix &lt; 0) {</div><div class='add'>+				ret = msix;</div><div class='add'>+				goto out_free_queues;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			eorxq-&gt;msix = &amp;adap-&gt;msix_info[msix];</div><div class='add'>+			snprintf(eorxq-&gt;msix-&gt;desc,</div><div class='add'>+				 sizeof(eorxq-&gt;msix-&gt;desc),</div><div class='add'>+				 "%s-eorxq%d", dev-&gt;name, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		init_rspq(adap, &amp;eorxq-&gt;rspq,</div><div class='add'>+			  CXGB4_EOHW_RXQ_DEFAULT_INTR_USEC,</div><div class='add'>+			  CXGB4_EOHW_RXQ_DEFAULT_PKT_CNT,</div><div class='add'>+			  CXGB4_EOHW_RXQ_DEFAULT_DESC_NUM,</div><div class='add'>+			  CXGB4_EOHW_RXQ_DEFAULT_DESC_SIZE);</div><div class='add'>+</div><div class='add'>+		eorxq-&gt;fl.size = CXGB4_EOHW_FLQ_DEFAULT_DESC_NUM;</div><div class='add'>+</div><div class='add'>+		ret = t4_sge_alloc_rxq(adap, &amp;eorxq-&gt;rspq, false,</div><div class='add'>+				       dev, msix, &amp;eorxq-&gt;fl,</div><div class='add'>+				       cxgb4_ethofld_rx_handler,</div><div class='add'>+				       NULL, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_queues;</div><div class='add'>+</div><div class='add'>+		/* Allocate ETHOFLD hardware Txqs */</div><div class='add'>+		eotxq-&gt;q.size = CXGB4_EOHW_TXQ_DEFAULT_DESC_NUM;</div><div class='add'>+		ret = t4_sge_alloc_ethofld_txq(adap, eotxq, dev,</div><div class='add'>+					       eorxq-&gt;rspq.cntxt_id);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_free_queues;</div><div class='add'>+</div><div class='add'>+		/* Allocate IRQs, set IRQ affinity, and start Rx */</div><div class='add'>+		if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+			ret = request_irq(eorxq-&gt;msix-&gt;vec, t4_sge_intr_msix, 0,</div><div class='add'>+					  eorxq-&gt;msix-&gt;desc, &amp;eorxq-&gt;rspq);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_free_msix;</div><div class='add'>+</div><div class='add'>+			cxgb4_set_msix_aff(adap, eorxq-&gt;msix-&gt;vec,</div><div class='add'>+					   &amp;eorxq-&gt;msix-&gt;aff_mask, i);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='add'>+			cxgb4_enable_rx(adap, &amp;eorxq-&gt;rspq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_msix:</div><div class='add'>+	while (i-- &gt; 0) {</div><div class='add'>+		eorxq = &amp;adap-&gt;sge.eohw_rxq[pi-&gt;first_qset + i];</div><div class='add'>+</div><div class='add'>+		if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='add'>+			cxgb4_quiesce_rx(&amp;eorxq-&gt;rspq);</div><div class='add'>+</div><div class='add'>+		if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+			cxgb4_clear_msix_aff(eorxq-&gt;msix-&gt;vec,</div><div class='add'>+					     eorxq-&gt;msix-&gt;aff_mask);</div><div class='add'>+			free_irq(eorxq-&gt;msix-&gt;vec, &amp;eorxq-&gt;rspq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_free_queues:</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nqsets; i++) {</div><div class='add'>+		eorxq = &amp;adap-&gt;sge.eohw_rxq[pi-&gt;first_qset + i];</div><div class='add'>+		eotxq = &amp;adap-&gt;sge.eohw_txq[pi-&gt;first_qset + i];</div><div class='add'>+</div><div class='add'>+		if (eorxq-&gt;rspq.desc)</div><div class='add'>+			free_rspq_fl(adap, &amp;eorxq-&gt;rspq, &amp;eorxq-&gt;fl);</div><div class='add'>+		if (eorxq-&gt;msix)</div><div class='add'>+			cxgb4_free_msix_idx_in_bmap(adap, eorxq-&gt;msix-&gt;idx);</div><div class='add'>+		t4_sge_free_ethofld_txq(adap, eotxq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (refcount_dec_and_test(&amp;adap-&gt;tc_mqprio-&gt;refcnt)) {</div><div class='add'>+		kfree(adap-&gt;sge.eohw_txq);</div><div class='add'>+		kfree(adap-&gt;sge.eohw_rxq);</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_mqprio_free_hw_resources(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_ofld_rxq *eorxq;</div><div class='add'>+	struct sge_eohw_txq *eotxq;</div><div class='add'>+	u32 i;</div><div class='add'>+</div><div class='add'>+	/* Return if no ETHOFLD structures have been allocated yet */</div><div class='add'>+	if (!refcount_read(&amp;adap-&gt;tc_mqprio-&gt;refcnt))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Return if no hardware queues have been allocated */</div><div class='add'>+	if (!adap-&gt;sge.eohw_rxq[pi-&gt;first_qset].rspq.desc)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; pi-&gt;nqsets; i++) {</div><div class='add'>+		eorxq = &amp;adap-&gt;sge.eohw_rxq[pi-&gt;first_qset + i];</div><div class='add'>+		eotxq = &amp;adap-&gt;sge.eohw_txq[pi-&gt;first_qset + i];</div><div class='add'>+</div><div class='add'>+		/* Device removal path will already disable NAPI</div><div class='add'>+		 * before unregistering netdevice. So, only disable</div><div class='add'>+		 * NAPI if we're not in device removal path</div><div class='add'>+		 */</div><div class='add'>+		if (!(adap-&gt;flags &amp; CXGB4_SHUTTING_DOWN))</div><div class='add'>+			cxgb4_quiesce_rx(&amp;eorxq-&gt;rspq);</div><div class='add'>+</div><div class='add'>+		if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+			cxgb4_clear_msix_aff(eorxq-&gt;msix-&gt;vec,</div><div class='add'>+					     eorxq-&gt;msix-&gt;aff_mask);</div><div class='add'>+			free_irq(eorxq-&gt;msix-&gt;vec, &amp;eorxq-&gt;rspq);</div><div class='add'>+			cxgb4_free_msix_idx_in_bmap(adap, eorxq-&gt;msix-&gt;idx);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		free_rspq_fl(adap, &amp;eorxq-&gt;rspq, &amp;eorxq-&gt;fl);</div><div class='add'>+		t4_sge_free_ethofld_txq(adap, eotxq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Free up ETHOFLD structures if there are no users */</div><div class='add'>+	if (refcount_dec_and_test(&amp;adap-&gt;tc_mqprio-&gt;refcnt)) {</div><div class='add'>+		kfree(adap-&gt;sge.eohw_txq);</div><div class='add'>+		kfree(adap-&gt;sge.eohw_rxq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_mqprio_alloc_tc(struct net_device *dev,</div><div class='add'>+				 struct tc_mqprio_qopt_offload *mqprio)</div><div class='add'>+{</div><div class='add'>+	struct ch_sched_params p = {</div><div class='add'>+		.type = SCHED_CLASS_TYPE_PACKET,</div><div class='add'>+		.u.params.level = SCHED_CLASS_LEVEL_CL_RL,</div><div class='add'>+		.u.params.mode = SCHED_CLASS_MODE_FLOW,</div><div class='add'>+		.u.params.rateunit = SCHED_CLASS_RATEUNIT_BITS,</div><div class='add'>+		.u.params.ratemode = SCHED_CLASS_RATEMODE_ABS,</div><div class='add'>+		.u.params.class = SCHED_CLS_NONE,</div><div class='add'>+		.u.params.weight = 0,</div><div class='add'>+		.u.params.pktsize = dev-&gt;mtu,</div><div class='add'>+	};</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct ch_sched_class *e;</div><div class='add'>+	int ret;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[pi-&gt;port_id];</div><div class='add'>+	p.u.params.channel = pi-&gt;tx_chan;</div><div class='add'>+	for (i = 0; i &lt; mqprio-&gt;qopt.num_tc; i++) {</div><div class='add'>+		/* Convert from bytes per second to Kbps */</div><div class='add'>+		p.u.params.minrate = div_u64(mqprio-&gt;min_rate[i] * 8, 1000);</div><div class='add'>+		p.u.params.maxrate = div_u64(mqprio-&gt;max_rate[i] * 8, 1000);</div><div class='add'>+</div><div class='add'>+		/* Request larger burst buffer for smaller MTU, so</div><div class='add'>+		 * that hardware can work on more data per burst</div><div class='add'>+		 * cycle.</div><div class='add'>+		 */</div><div class='add'>+		if (dev-&gt;mtu &lt;= ETH_DATA_LEN)</div><div class='add'>+			p.u.params.burstsize = 8 * dev-&gt;mtu;</div><div class='add'>+</div><div class='add'>+		e = cxgb4_sched_class_alloc(dev, &amp;p);</div><div class='add'>+		if (!e) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tc_port_mqprio-&gt;tc_hwtc_map[i] = e-&gt;idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	while (i--)</div><div class='add'>+		cxgb4_sched_class_free(dev, tc_port_mqprio-&gt;tc_hwtc_map[i]);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_mqprio_free_tc(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[pi-&gt;port_id];</div><div class='add'>+	for (i = 0; i &lt; tc_port_mqprio-&gt;mqprio.qopt.num_tc; i++)</div><div class='add'>+		cxgb4_sched_class_free(dev, tc_port_mqprio-&gt;tc_hwtc_map[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_mqprio_class_bind(struct net_device *dev,</div><div class='add'>+				   struct sge_eosw_txq *eosw_txq,</div><div class='add'>+				   u8 tc)</div><div class='add'>+{</div><div class='add'>+	struct ch_sched_flowc fe;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;eosw_txq-&gt;completion);</div><div class='add'>+</div><div class='add'>+	fe.tid = eosw_txq-&gt;eotid;</div><div class='add'>+	fe.class = tc;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_sched_class_bind(dev, &amp;fe, SCHED_FLOWC);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;eosw_txq-&gt;completion,</div><div class='add'>+					  CXGB4_FLOWC_WAIT_TIMEOUT);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return -ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_mqprio_class_unbind(struct net_device *dev,</div><div class='add'>+				      struct sge_eosw_txq *eosw_txq,</div><div class='add'>+				      u8 tc)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct ch_sched_flowc fe;</div><div class='add'>+</div><div class='add'>+	/* If we're shutting down, interrupts are disabled and no completions</div><div class='add'>+	 * come back. So, skip waiting for completions in this scenario.</div><div class='add'>+	 */</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_SHUTTING_DOWN))</div><div class='add'>+		init_completion(&amp;eosw_txq-&gt;completion);</div><div class='add'>+</div><div class='add'>+	fe.tid = eosw_txq-&gt;eotid;</div><div class='add'>+	fe.class = tc;</div><div class='add'>+	cxgb4_sched_class_unbind(dev, &amp;fe, SCHED_FLOWC);</div><div class='add'>+</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_SHUTTING_DOWN))</div><div class='add'>+		wait_for_completion_timeout(&amp;eosw_txq-&gt;completion,</div><div class='add'>+					    CXGB4_FLOWC_WAIT_TIMEOUT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int cxgb4_mqprio_enable_offload(struct net_device *dev,</div><div class='add'>+				       struct tc_mqprio_qopt_offload *mqprio)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;</div><div class='add'>+	u32 qoffset, qcount, tot_qcount, qid, hwqid;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_eosw_txq *eosw_txq;</div><div class='add'>+	int eotid, ret;</div><div class='add'>+	u16 i, j;</div><div class='add'>+	u8 hwtc;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_mqprio_alloc_hw_resources(dev);</div><div class='add'>+	if (ret)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[pi-&gt;port_id];</div><div class='add'>+	for (i = 0; i &lt; mqprio-&gt;qopt.num_tc; i++) {</div><div class='add'>+		qoffset = mqprio-&gt;qopt.offset[i];</div><div class='add'>+		qcount = mqprio-&gt;qopt.count[i];</div><div class='add'>+		for (j = 0; j &lt; qcount; j++) {</div><div class='add'>+			eotid = cxgb4_get_free_eotid(&amp;adap-&gt;tids);</div><div class='add'>+			if (eotid &lt; 0) {</div><div class='add'>+				ret = -ENOMEM;</div><div class='add'>+				goto out_free_eotids;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			qid = qoffset + j;</div><div class='add'>+			hwqid = pi-&gt;first_qset + (eotid % pi-&gt;nqsets);</div><div class='add'>+			eosw_txq = &amp;tc_port_mqprio-&gt;eosw_txq[qid];</div><div class='add'>+			ret = cxgb4_init_eosw_txq(dev, eosw_txq,</div><div class='add'>+						  eotid, hwqid);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_free_eotids;</div><div class='add'>+</div><div class='add'>+			cxgb4_alloc_eotid(&amp;adap-&gt;tids, eotid, eosw_txq);</div><div class='add'>+</div><div class='add'>+			hwtc = tc_port_mqprio-&gt;tc_hwtc_map[i];</div><div class='add'>+			ret = cxgb4_mqprio_class_bind(dev, eosw_txq, hwtc);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto out_free_eotids;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;tc_port_mqprio-&gt;mqprio, mqprio,</div><div class='add'>+	       sizeof(struct tc_mqprio_qopt_offload));</div><div class='add'>+</div><div class='add'>+	/* Inform the stack about the configured tc params.</div><div class='add'>+	 *</div><div class='add'>+	 * Set the correct queue map. If no queue count has been</div><div class='add'>+	 * specified, then send the traffic through default NIC</div><div class='add'>+	 * queues; instead of ETHOFLD queues.</div><div class='add'>+	 */</div><div class='add'>+	ret = netdev_set_num_tc(dev, mqprio-&gt;qopt.num_tc);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_eotids;</div><div class='add'>+</div><div class='add'>+	tot_qcount = pi-&gt;nqsets;</div><div class='add'>+	for (i = 0; i &lt; mqprio-&gt;qopt.num_tc; i++) {</div><div class='add'>+		qcount = mqprio-&gt;qopt.count[i];</div><div class='add'>+		if (qcount) {</div><div class='add'>+			qoffset = mqprio-&gt;qopt.offset[i] + pi-&gt;nqsets;</div><div class='add'>+		} else {</div><div class='add'>+			qcount = pi-&gt;nqsets;</div><div class='add'>+			qoffset = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = netdev_set_tc_queue(dev, i, qcount, qoffset);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_reset_tc;</div><div class='add'>+</div><div class='add'>+		tot_qcount += mqprio-&gt;qopt.count[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = netif_set_real_num_tx_queues(dev, tot_qcount);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_reset_tc;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio-&gt;state = CXGB4_MQPRIO_STATE_ACTIVE;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_reset_tc:</div><div class='add'>+	netdev_reset_tc(dev);</div><div class='add'>+	i = mqprio-&gt;qopt.num_tc;</div><div class='add'>+</div><div class='add'>+out_free_eotids:</div><div class='add'>+	while (i-- &gt; 0) {</div><div class='add'>+		qoffset = mqprio-&gt;qopt.offset[i];</div><div class='add'>+		qcount = mqprio-&gt;qopt.count[i];</div><div class='add'>+		for (j = 0; j &lt; qcount; j++) {</div><div class='add'>+			eosw_txq = &amp;tc_port_mqprio-&gt;eosw_txq[qoffset + j];</div><div class='add'>+</div><div class='add'>+			hwtc = tc_port_mqprio-&gt;tc_hwtc_map[i];</div><div class='add'>+			cxgb4_mqprio_class_unbind(dev, eosw_txq, hwtc);</div><div class='add'>+</div><div class='add'>+			cxgb4_free_eotid(&amp;adap-&gt;tids, eosw_txq-&gt;eotid);</div><div class='add'>+			cxgb4_free_eosw_txq(dev, eosw_txq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_mqprio_free_hw_resources(dev);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cxgb4_mqprio_disable_offload(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_eosw_txq *eosw_txq;</div><div class='add'>+	u32 qoffset, qcount;</div><div class='add'>+	u16 i, j;</div><div class='add'>+	u8 hwtc;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[pi-&gt;port_id];</div><div class='add'>+	if (tc_port_mqprio-&gt;state != CXGB4_MQPRIO_STATE_ACTIVE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	netdev_reset_tc(dev);</div><div class='add'>+	netif_set_real_num_tx_queues(dev, pi-&gt;nqsets);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tc_port_mqprio-&gt;mqprio.qopt.num_tc; i++) {</div><div class='add'>+		qoffset = tc_port_mqprio-&gt;mqprio.qopt.offset[i];</div><div class='add'>+		qcount = tc_port_mqprio-&gt;mqprio.qopt.count[i];</div><div class='add'>+		for (j = 0; j &lt; qcount; j++) {</div><div class='add'>+			eosw_txq = &amp;tc_port_mqprio-&gt;eosw_txq[qoffset + j];</div><div class='add'>+</div><div class='add'>+			hwtc = tc_port_mqprio-&gt;tc_hwtc_map[i];</div><div class='add'>+			cxgb4_mqprio_class_unbind(dev, eosw_txq, hwtc);</div><div class='add'>+</div><div class='add'>+			cxgb4_free_eotid(&amp;adap-&gt;tids, eosw_txq-&gt;eotid);</div><div class='add'>+			cxgb4_free_eosw_txq(dev, eosw_txq);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_mqprio_free_hw_resources(dev);</div><div class='add'>+</div><div class='add'>+	/* Free up the traffic classes */</div><div class='add'>+	cxgb4_mqprio_free_tc(dev);</div><div class='add'>+</div><div class='add'>+	memset(&amp;tc_port_mqprio-&gt;mqprio, 0,</div><div class='add'>+	       sizeof(struct tc_mqprio_qopt_offload));</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio-&gt;state = CXGB4_MQPRIO_STATE_DISABLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_setup_tc_mqprio(struct net_device *dev,</div><div class='add'>+			  struct tc_mqprio_qopt_offload *mqprio)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	bool needs_bring_up = false;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_mqprio_validate(dev, mqprio);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+</div><div class='add'>+	/* To configure tc params, the current allocated EOTIDs must</div><div class='add'>+	 * be freed up. However, they can't be freed up if there's</div><div class='add'>+	 * traffic running on the interface. So, ensure interface is</div><div class='add'>+	 * down before configuring tc params.</div><div class='add'>+	 */</div><div class='add'>+	if (netif_running(dev)) {</div><div class='add'>+		netif_tx_stop_all_queues(dev);</div><div class='add'>+		netif_carrier_off(dev);</div><div class='add'>+		needs_bring_up = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_mqprio_disable_offload(dev);</div><div class='add'>+</div><div class='add'>+	/* If requested for clear, then just return since resources are</div><div class='add'>+	 * already freed up by now.</div><div class='add'>+	 */</div><div class='add'>+	if (!mqprio-&gt;qopt.num_tc)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* Allocate free available traffic classes and configure</div><div class='add'>+	 * their rate parameters.</div><div class='add'>+	 */</div><div class='add'>+	ret = cxgb4_mqprio_alloc_tc(dev, mqprio);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_mqprio_enable_offload(dev, mqprio);</div><div class='add'>+	if (ret) {</div><div class='add'>+		cxgb4_mqprio_free_tc(dev);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (needs_bring_up) {</div><div class='add'>+		netif_tx_start_all_queues(dev);</div><div class='add'>+		netif_carrier_on(dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_mqprio_stop_offload(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (!adap-&gt;tc_mqprio || !adap-&gt;tc_mqprio-&gt;port_mqprio)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+	for_each_port(adap, i) {</div><div class='add'>+		dev = adap-&gt;port[i];</div><div class='add'>+		if (!dev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		tc_port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[i];</div><div class='add'>+		if (!tc_port_mqprio-&gt;mqprio.qopt.num_tc)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		cxgb4_mqprio_disable_offload(dev);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int cxgb4_init_tc_mqprio(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio, *port_mqprio;</div><div class='add'>+	struct cxgb4_tc_mqprio *tc_mqprio;</div><div class='add'>+	struct sge_eosw_txq *eosw_txq;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	tc_mqprio = kzalloc(sizeof(*tc_mqprio), GFP_KERNEL);</div><div class='add'>+	if (!tc_mqprio)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio = kcalloc(adap-&gt;params.nports, sizeof(*tc_port_mqprio),</div><div class='add'>+				 GFP_KERNEL);</div><div class='add'>+	if (!tc_port_mqprio) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_free_mqprio;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+</div><div class='add'>+	tc_mqprio-&gt;port_mqprio = tc_port_mqprio;</div><div class='add'>+	for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+		port_mqprio = &amp;tc_mqprio-&gt;port_mqprio[i];</div><div class='add'>+		eosw_txq = kcalloc(adap-&gt;tids.neotids, sizeof(*eosw_txq),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+		if (!eosw_txq) {</div><div class='add'>+			ret = -ENOMEM;</div><div class='add'>+			goto out_free_ports;</div><div class='add'>+		}</div><div class='add'>+		port_mqprio-&gt;eosw_txq = eosw_txq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adap-&gt;tc_mqprio = tc_mqprio;</div><div class='add'>+	refcount_set(&amp;adap-&gt;tc_mqprio-&gt;refcnt, 0);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_ports:</div><div class='add'>+	for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+		port_mqprio = &amp;tc_mqprio-&gt;port_mqprio[i];</div><div class='add'>+		kfree(port_mqprio-&gt;eosw_txq);</div><div class='add'>+	}</div><div class='add'>+	kfree(tc_port_mqprio);</div><div class='add'>+</div><div class='add'>+out_free_mqprio:</div><div class='add'>+	kfree(tc_mqprio);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_cleanup_tc_mqprio(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *port_mqprio;</div><div class='add'>+	u8 i;</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;tc_mqprio) {</div><div class='add'>+		mutex_lock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+		if (adap-&gt;tc_mqprio-&gt;port_mqprio) {</div><div class='add'>+			for (i = 0; i &lt; adap-&gt;params.nports; i++) {</div><div class='add'>+				struct net_device *dev = adap-&gt;port[i];</div><div class='add'>+</div><div class='add'>+				if (dev)</div><div class='add'>+					cxgb4_mqprio_disable_offload(dev);</div><div class='add'>+				port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[i];</div><div class='add'>+				kfree(port_mqprio-&gt;eosw_txq);</div><div class='add'>+			}</div><div class='add'>+			kfree(adap-&gt;tc_mqprio-&gt;port_mqprio);</div><div class='add'>+		}</div><div class='add'>+		mutex_unlock(&amp;adap-&gt;tc_mqprio-&gt;mqprio_mutex);</div><div class='add'>+		kfree(adap-&gt;tc_mqprio);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h<br/>new file mode 100644<br/>index 000000000000..d4a862a9fd7d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.h</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2019 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef __CXGB4_TC_MQPRIO_H__</div><div class='add'>+#define __CXGB4_TC_MQPRIO_H__</div><div class='add'>+</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+</div><div class='add'>+#define CXGB4_EOSW_TXQ_DEFAULT_DESC_NUM 128</div><div class='add'>+</div><div class='add'>+#define CXGB4_EOHW_TXQ_DEFAULT_DESC_NUM 1024</div><div class='add'>+</div><div class='add'>+#define CXGB4_EOHW_RXQ_DEFAULT_DESC_NUM 1024</div><div class='add'>+#define CXGB4_EOHW_RXQ_DEFAULT_DESC_SIZE 64</div><div class='add'>+#define CXGB4_EOHW_RXQ_DEFAULT_INTR_USEC 5</div><div class='add'>+#define CXGB4_EOHW_RXQ_DEFAULT_PKT_CNT 8</div><div class='add'>+</div><div class='add'>+#define CXGB4_EOHW_FLQ_DEFAULT_DESC_NUM 72</div><div class='add'>+</div><div class='add'>+#define CXGB4_FLOWC_WAIT_TIMEOUT (5 * HZ)</div><div class='add'>+</div><div class='add'>+enum cxgb4_mqprio_state {</div><div class='add'>+	CXGB4_MQPRIO_STATE_DISABLED = 0,</div><div class='add'>+	CXGB4_MQPRIO_STATE_ACTIVE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_tc_port_mqprio {</div><div class='add'>+	enum cxgb4_mqprio_state state; /* Current MQPRIO offload state */</div><div class='add'>+	struct tc_mqprio_qopt_offload mqprio; /* MQPRIO offload params */</div><div class='add'>+	struct sge_eosw_txq *eosw_txq; /* Netdev SW Tx queue array */</div><div class='add'>+	u8 tc_hwtc_map[TC_QOPT_MAX_QUEUE]; /* MQPRIO tc to hardware tc map */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct cxgb4_tc_mqprio {</div><div class='add'>+	refcount_t refcnt; /* Refcount for adapter-wide resources */</div><div class='add'>+	struct mutex mqprio_mutex; /* Lock for accessing MQPRIO info */</div><div class='add'>+	struct cxgb4_tc_port_mqprio *port_mqprio; /* Per port MQPRIO info */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int cxgb4_setup_tc_mqprio(struct net_device *dev,</div><div class='add'>+			  struct tc_mqprio_qopt_offload *mqprio);</div><div class='add'>+void cxgb4_mqprio_stop_offload(struct adapter *adap);</div><div class='add'>+int cxgb4_init_tc_mqprio(struct adapter *adap);</div><div class='add'>+void cxgb4_cleanup_tc_mqprio(struct adapter *adap);</div><div class='add'>+#endif /* __CXGB4_TC_MQPRIO_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c<br/>index 02fc63fa7f25..8524246fd67e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c</a></div><div class='hunk'>@@ -36,6 +36,7 @@</div><div class='ctx'> #include &lt;net/tc_act/tc_mirred.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cxgb4.h"</div><div class='add'>+#include "cxgb4_filter.h"</div><div class='ctx'> #include "cxgb4_tc_u32_parse.h"</div><div class='ctx'> #include "cxgb4_tc_u32.h"</div><div class='ctx'> </div><div class='hunk'>@@ -47,7 +48,7 @@ static int fill_match_fields(struct adapter *adap,</div><div class='ctx'> 			     bool next_header)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i, j;</div><div class='del'>-	u32 val, mask;</div><div class='add'>+	__be32 val, mask;</div><div class='ctx'> 	int off, err;</div><div class='ctx'> 	bool found;</div><div class='ctx'> </div><div class='hunk'>@@ -148,14 +149,16 @@ static int fill_action_fields(struct adapter *adap,</div><div class='ctx'> int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> {</div><div class='ctx'> 	const struct cxgb4_match_field *start, *link_start = NULL;</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='ctx'> 	__be16 protocol = cls-&gt;common.protocol;</div><div class='ctx'> 	struct ch_filter_specification fs;</div><div class='ctx'> 	struct cxgb4_tc_u32_table *t;</div><div class='ctx'> 	struct cxgb4_link *link;</div><div class='del'>-	unsigned int filter_id;</div><div class='ctx'> 	u32 uhtid, link_uhtid;</div><div class='ctx'> 	bool is_ipv6 = false;</div><div class='add'>+	u8 inet_family;</div><div class='add'>+	int filter_id;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!can_tc_u32_offload(dev))</div><div class='hunk'>@@ -164,14 +167,18 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> 	if (protocol != htons(ETH_P_IP) &amp;&amp; protocol != htons(ETH_P_IPV6))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* Fetch the location to insert the filter. */</div><div class='del'>-	filter_id = cls-&gt;knode.handle &amp; 0xFFFFF;</div><div class='add'>+	inet_family = (protocol == htons(ETH_P_IPV6)) ? PF_INET6 : PF_INET;</div><div class='ctx'> </div><div class='del'>-	if (filter_id &gt; adapter-&gt;tids.nftids) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev,</div><div class='del'>-			"Location %d out of range for insertion. Max: %d\n",</div><div class='del'>-			filter_id, adapter-&gt;tids.nftids);</div><div class='del'>-		return -ERANGE;</div><div class='add'>+	/* Get a free filter entry TID, where we can insert this new</div><div class='add'>+	 * rule. Only insert rule if its prio doesn't conflict with</div><div class='add'>+	 * existing rules.</div><div class='add'>+	 */</div><div class='add'>+	filter_id = cxgb4_get_free_ftid(dev, inet_family, false,</div><div class='add'>+					TC_U32_NODE(cls-&gt;knode.handle));</div><div class='add'>+	if (filter_id &lt; 0) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "No free LETCAM index available");</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	t = adapter-&gt;tc_u32;</div><div class='hunk'>@@ -179,7 +186,7 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> 	link_uhtid = TC_U32_USERHTID(cls-&gt;knode.link_handle);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that uhtid is either root u32 (i.e. 0x800)</div><div class='del'>-	 * or a a valid linked bucket.</div><div class='add'>+	 * or a valid linked bucket.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (uhtid != 0x800 &amp;&amp; uhtid &gt;= t-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -190,6 +197,11 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;fs, 0, sizeof(fs));</div><div class='ctx'> </div><div class='add'>+	if (filter_id &lt; adapter-&gt;tids.nhpftids)</div><div class='add'>+		fs.prio = 1;</div><div class='add'>+	fs.tc_prio = cls-&gt;common.prio;</div><div class='add'>+	fs.tc_cookie = cls-&gt;knode.handle;</div><div class='add'>+</div><div class='ctx'> 	if (protocol == htons(ETH_P_IPV6)) {</div><div class='ctx'> 		start = cxgb4_ipv6_fields;</div><div class='ctx'> 		is_ipv6 = true;</div><div class='hunk'>@@ -216,7 +228,7 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> 		const struct cxgb4_next_header *next;</div><div class='ctx'> 		bool found = false;</div><div class='ctx'> 		unsigned int i, j;</div><div class='del'>-		u32 val, mask;</div><div class='add'>+		__be32 val, mask;</div><div class='ctx'> 		int off;</div><div class='ctx'> </div><div class='ctx'> 		if (t-&gt;table[link_uhtid - 1].link_handle) {</div><div class='hunk'>@@ -230,10 +242,10 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> </div><div class='ctx'> 		/* Try to find matches that allow jumps to next header. */</div><div class='ctx'> 		for (i = 0; next[i].jump; i++) {</div><div class='del'>-			if (next[i].offoff != cls-&gt;knode.sel-&gt;offoff ||</div><div class='del'>-			    next[i].shift != cls-&gt;knode.sel-&gt;offshift ||</div><div class='del'>-			    next[i].mask != cls-&gt;knode.sel-&gt;offmask ||</div><div class='del'>-			    next[i].offset != cls-&gt;knode.sel-&gt;off)</div><div class='add'>+			if (next[i].sel.offoff != cls-&gt;knode.sel-&gt;offoff ||</div><div class='add'>+			    next[i].sel.offshift != cls-&gt;knode.sel-&gt;offshift ||</div><div class='add'>+			    next[i].sel.offmask != cls-&gt;knode.sel-&gt;offmask ||</div><div class='add'>+			    next[i].sel.off != cls-&gt;knode.sel-&gt;off)</div><div class='ctx'> 				continue;</div><div class='ctx'> </div><div class='ctx'> 			/* Found a possible candidate.  Find a key that</div><div class='hunk'>@@ -245,9 +257,9 @@ int cxgb4_config_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> 				val = cls-&gt;knode.sel-&gt;keys[j].val;</div><div class='ctx'> 				mask = cls-&gt;knode.sel-&gt;keys[j].mask;</div><div class='ctx'> </div><div class='del'>-				if (next[i].match_off == off &amp;&amp;</div><div class='del'>-				    next[i].match_val == val &amp;&amp;</div><div class='del'>-				    next[i].match_mask == mask) {</div><div class='add'>+				if (next[i].key.off == off &amp;&amp;</div><div class='add'>+				    next[i].key.val == val &amp;&amp;</div><div class='add'>+				    next[i].key.mask == mask) {</div><div class='ctx'> 					found = true;</div><div class='ctx'> 					break;</div><div class='ctx'> 				}</div><div class='hunk'>@@ -343,28 +355,74 @@ int cxgb4_delete_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> 	unsigned int filter_id, max_tids, i, j;</div><div class='ctx'> 	struct cxgb4_link *link = NULL;</div><div class='ctx'> 	struct cxgb4_tc_u32_table *t;</div><div class='add'>+	struct filter_entry *f;</div><div class='add'>+	bool found = false;</div><div class='ctx'> 	u32 handle, uhtid;</div><div class='add'>+	u8 nslots;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!can_tc_u32_offload(dev))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	/* Fetch the location to delete the filter. */</div><div class='del'>-	filter_id = cls-&gt;knode.handle &amp; 0xFFFFF;</div><div class='add'>+	max_tids = adapter-&gt;tids.nhpftids + adapter-&gt;tids.nftids;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;tids.ftid_lock);</div><div class='add'>+	filter_id = 0;</div><div class='add'>+	while (filter_id &lt; max_tids) {</div><div class='add'>+		if (filter_id &lt; adapter-&gt;tids.nhpftids) {</div><div class='add'>+			i = filter_id;</div><div class='add'>+			f = &amp;adapter-&gt;tids.hpftid_tab[i];</div><div class='add'>+			if (f-&gt;valid &amp;&amp; f-&gt;fs.tc_cookie == cls-&gt;knode.handle) {</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='ctx'> </div><div class='del'>-	if (filter_id &gt; adapter-&gt;tids.nftids) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev,</div><div class='del'>-			"Location %d out of range for deletion. Max: %d\n",</div><div class='del'>-			filter_id, adapter-&gt;tids.nftids);</div><div class='del'>-		return -ERANGE;</div><div class='add'>+			i = find_next_bit(adapter-&gt;tids.hpftid_bmap,</div><div class='add'>+					  adapter-&gt;tids.nhpftids, i + 1);</div><div class='add'>+			if (i &gt;= adapter-&gt;tids.nhpftids) {</div><div class='add'>+				filter_id = adapter-&gt;tids.nhpftids;</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			filter_id = i;</div><div class='add'>+		} else {</div><div class='add'>+			i = filter_id - adapter-&gt;tids.nhpftids;</div><div class='add'>+			f = &amp;adapter-&gt;tids.ftid_tab[i];</div><div class='add'>+			if (f-&gt;valid &amp;&amp; f-&gt;fs.tc_cookie == cls-&gt;knode.handle) {</div><div class='add'>+				found = true;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			i = find_next_bit(adapter-&gt;tids.ftid_bmap,</div><div class='add'>+					  adapter-&gt;tids.nftids, i + 1);</div><div class='add'>+			if (i &gt;= adapter-&gt;tids.nftids)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			filter_id = i + adapter-&gt;tids.nhpftids;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		nslots = 0;</div><div class='add'>+		if (f-&gt;fs.type) {</div><div class='add'>+			nslots++;</div><div class='add'>+			if (CHELSIO_CHIP_VERSION(adapter-&gt;params.chip) &lt;</div><div class='add'>+			    CHELSIO_T6)</div><div class='add'>+				nslots += 2;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		filter_id += nslots;</div><div class='ctx'> 	}</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;tids.ftid_lock);</div><div class='add'>+</div><div class='add'>+	if (!found)</div><div class='add'>+		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	t = adapter-&gt;tc_u32;</div><div class='ctx'> 	handle = cls-&gt;knode.handle;</div><div class='ctx'> 	uhtid = TC_U32_USERHTID(cls-&gt;knode.handle);</div><div class='ctx'> </div><div class='ctx'> 	/* Ensure that uhtid is either root u32 (i.e. 0x800)</div><div class='del'>-	 * or a a valid linked bucket.</div><div class='add'>+	 * or a valid linked bucket.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (uhtid != 0x800 &amp;&amp; uhtid &gt;= t-&gt;size)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -389,7 +447,6 @@ int cxgb4_delete_knode(struct net_device *dev, struct tc_cls_u32_offload *cls)</div><div class='ctx'> 	/* If a link is being deleted, then delete all filters</div><div class='ctx'> 	 * associated with the link.</div><div class='ctx'> 	 */</div><div class='del'>-	max_tids = adapter-&gt;tids.nftids;</div><div class='ctx'> 	for (i = 0; i &lt; t-&gt;size; i++) {</div><div class='ctx'> 		link = &amp;t-&gt;table[i];</div><div class='ctx'> </div><div class='hunk'>@@ -437,7 +494,7 @@ void cxgb4_cleanup_tc_u32(struct adapter *adap)</div><div class='ctx'> </div><div class='ctx'> struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	unsigned int max_tids = adap-&gt;tids.nftids;</div><div class='add'>+	unsigned int max_tids = adap-&gt;tids.nftids + adap-&gt;tids.nhpftids;</div><div class='ctx'> 	struct cxgb4_tc_u32_table *t;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -467,13 +524,9 @@ struct cxgb4_tc_u32_table *cxgb4_init_tc_u32(struct adapter *adap)</div><div class='ctx'> out_no_mem:</div><div class='ctx'> 	for (i = 0; i &lt; t-&gt;size; i++) {</div><div class='ctx'> 		struct cxgb4_link *link = &amp;t-&gt;table[i];</div><div class='del'>-</div><div class='del'>-		if (link-&gt;tid_map)</div><div class='del'>-			kvfree(link-&gt;tid_map);</div><div class='add'>+		kvfree(link-&gt;tid_map);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	if (t)</div><div class='del'>-		kvfree(t);</div><div class='add'>+	kvfree(t);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h<br/>index a4b99edcc339..64663112cad8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h</a></div><div class='hunk'>@@ -38,12 +38,12 @@</div><div class='ctx'> struct cxgb4_match_field {</div><div class='ctx'> 	int off; /* Offset from the beginning of the header to match */</div><div class='ctx'> 	/* Fill the value/mask pair in the spec if matched */</div><div class='del'>-	int (*val)(struct ch_filter_specification *f, u32 val, u32 mask);</div><div class='add'>+	int (*val)(struct ch_filter_specification *f, __be32 val, __be32 mask);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* IPv4 match fields */</div><div class='ctx'> static inline int cxgb4_fill_ipv4_tos(struct ch_filter_specification *f,</div><div class='del'>-				      u32 val, u32 mask)</div><div class='add'>+				      __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	f-&gt;val.tos  = (ntohl(val)  &gt;&gt; 16) &amp; 0x000000FF;</div><div class='ctx'> 	f-&gt;mask.tos = (ntohl(mask) &gt;&gt; 16) &amp; 0x000000FF;</div><div class='hunk'>@@ -52,7 +52,7 @@ static inline int cxgb4_fill_ipv4_tos(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv4_frag(struct ch_filter_specification *f,</div><div class='del'>-				       u32 val, u32 mask)</div><div class='add'>+				       __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	u32 mask_val;</div><div class='ctx'> 	u8 frag_val;</div><div class='hunk'>@@ -74,7 +74,7 @@ static inline int cxgb4_fill_ipv4_frag(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv4_proto(struct ch_filter_specification *f,</div><div class='del'>-					u32 val, u32 mask)</div><div class='add'>+					__be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	f-&gt;val.proto  = (ntohl(val)  &gt;&gt; 16) &amp; 0x000000FF;</div><div class='ctx'> 	f-&gt;mask.proto = (ntohl(mask) &gt;&gt; 16) &amp; 0x000000FF;</div><div class='hunk'>@@ -83,7 +83,7 @@ static inline int cxgb4_fill_ipv4_proto(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv4_src_ip(struct ch_filter_specification *f,</div><div class='del'>-					 u32 val, u32 mask)</div><div class='add'>+					 __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.fip[0],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.fip[0], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -92,7 +92,7 @@ static inline int cxgb4_fill_ipv4_src_ip(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv4_dst_ip(struct ch_filter_specification *f,</div><div class='del'>-					 u32 val, u32 mask)</div><div class='add'>+					 __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.lip[0],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.lip[0], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -111,7 +111,7 @@ static const struct cxgb4_match_field cxgb4_ipv4_fields[] = {</div><div class='ctx'> </div><div class='ctx'> /* IPv6 match fields */</div><div class='ctx'> static inline int cxgb4_fill_ipv6_tos(struct ch_filter_specification *f,</div><div class='del'>-				      u32 val, u32 mask)</div><div class='add'>+				      __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	f-&gt;val.tos  = (ntohl(val)  &gt;&gt; 20) &amp; 0x000000FF;</div><div class='ctx'> 	f-&gt;mask.tos = (ntohl(mask) &gt;&gt; 20) &amp; 0x000000FF;</div><div class='hunk'>@@ -120,7 +120,7 @@ static inline int cxgb4_fill_ipv6_tos(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_proto(struct ch_filter_specification *f,</div><div class='del'>-					u32 val, u32 mask)</div><div class='add'>+					__be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	f-&gt;val.proto  = (ntohl(val)  &gt;&gt; 8) &amp; 0x000000FF;</div><div class='ctx'> 	f-&gt;mask.proto = (ntohl(mask) &gt;&gt; 8) &amp; 0x000000FF;</div><div class='hunk'>@@ -129,7 +129,7 @@ static inline int cxgb4_fill_ipv6_proto(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_src_ip0(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.fip[0],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.fip[0], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -138,7 +138,7 @@ static inline int cxgb4_fill_ipv6_src_ip0(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_src_ip1(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.fip[4],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.fip[4], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -147,7 +147,7 @@ static inline int cxgb4_fill_ipv6_src_ip1(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_src_ip2(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.fip[8],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.fip[8], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -156,7 +156,7 @@ static inline int cxgb4_fill_ipv6_src_ip2(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_src_ip3(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.fip[12],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.fip[12], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -165,7 +165,7 @@ static inline int cxgb4_fill_ipv6_src_ip3(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_dst_ip0(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.lip[0],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.lip[0], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -174,7 +174,7 @@ static inline int cxgb4_fill_ipv6_dst_ip0(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_dst_ip1(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.lip[4],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.lip[4], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -183,7 +183,7 @@ static inline int cxgb4_fill_ipv6_dst_ip1(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_dst_ip2(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.lip[8],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.lip[8], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -192,7 +192,7 @@ static inline int cxgb4_fill_ipv6_dst_ip2(struct ch_filter_specification *f,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int cxgb4_fill_ipv6_dst_ip3(struct ch_filter_specification *f,</div><div class='del'>-					  u32 val, u32 mask)</div><div class='add'>+					  __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	memcpy(&amp;f-&gt;val.lip[12],  &amp;val,  sizeof(u32));</div><div class='ctx'> 	memcpy(&amp;f-&gt;mask.lip[12], &amp;mask, sizeof(u32));</div><div class='hunk'>@@ -216,7 +216,7 @@ static const struct cxgb4_match_field cxgb4_ipv6_fields[] = {</div><div class='ctx'> </div><div class='ctx'> /* TCP/UDP match */</div><div class='ctx'> static inline int cxgb4_fill_l4_ports(struct ch_filter_specification *f,</div><div class='del'>-				      u32 val, u32 mask)</div><div class='add'>+				      __be32 val, __be32 mask)</div><div class='ctx'> {</div><div class='ctx'> 	f-&gt;val.fport  = ntohl(val)  &gt;&gt; 16;</div><div class='ctx'> 	f-&gt;mask.fport = ntohl(mask) &gt;&gt; 16;</div><div class='hunk'>@@ -237,19 +237,13 @@ static const struct cxgb4_match_field cxgb4_udp_fields[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cxgb4_next_header {</div><div class='del'>-	unsigned int offset; /* Offset to next header */</div><div class='del'>-	/* offset, shift, and mask added to offset above</div><div class='add'>+	/* Offset, shift, and mask added to beginning of the header</div><div class='ctx'> 	 * to get to next header.  Useful when using a header</div><div class='ctx'> 	 * field's value to jump to next header such as IHL field</div><div class='ctx'> 	 * in IPv4 header.</div><div class='ctx'> 	 */</div><div class='del'>-	unsigned int offoff;</div><div class='del'>-	u32 shift;</div><div class='del'>-	u32 mask;</div><div class='del'>-	/* match criteria to make this jump */</div><div class='del'>-	unsigned int match_off;</div><div class='del'>-	u32 match_val;</div><div class='del'>-	u32 match_mask;</div><div class='add'>+	struct tc_u32_sel_hdr sel;</div><div class='add'>+	struct tc_u32_key key;</div><div class='ctx'> 	/* location of jump to make */</div><div class='ctx'> 	const struct cxgb4_match_field *jump;</div><div class='ctx'> };</div><div class='hunk'>@@ -258,26 +252,74 @@ struct cxgb4_next_header {</div><div class='ctx'>  * IPv4 header.</div><div class='ctx'>  */</div><div class='ctx'> static const struct cxgb4_next_header cxgb4_ipv4_jumps[] = {</div><div class='del'>-	{ .offset = 0, .offoff = 0, .shift = 6, .mask = 0xF,</div><div class='del'>-	  .match_off = 8, .match_val = 0x600, .match_mask = 0xFF00,</div><div class='del'>-	  .jump = cxgb4_tcp_fields },</div><div class='del'>-	{ .offset = 0, .offoff = 0, .shift = 6, .mask = 0xF,</div><div class='del'>-	  .match_off = 8, .match_val = 0x1100, .match_mask = 0xFF00,</div><div class='del'>-	  .jump = cxgb4_udp_fields },</div><div class='del'>-	{ .jump = NULL }</div><div class='add'>+	{</div><div class='add'>+		/* TCP Jump */</div><div class='add'>+		.sel = {</div><div class='add'>+			.off = 0,</div><div class='add'>+			.offoff = 0,</div><div class='add'>+			.offshift = 6,</div><div class='add'>+			.offmask = cpu_to_be16(0x0f00),</div><div class='add'>+		},</div><div class='add'>+		.key = {</div><div class='add'>+			.off = 8,</div><div class='add'>+			.val = cpu_to_be32(0x00060000),</div><div class='add'>+			.mask = cpu_to_be32(0x00ff0000),</div><div class='add'>+		},</div><div class='add'>+		.jump = cxgb4_tcp_fields,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* UDP Jump */</div><div class='add'>+		.sel = {</div><div class='add'>+			.off = 0,</div><div class='add'>+			.offoff = 0,</div><div class='add'>+			.offshift = 6,</div><div class='add'>+			.offmask = cpu_to_be16(0x0f00),</div><div class='add'>+		},</div><div class='add'>+		.key = {</div><div class='add'>+			.off = 8,</div><div class='add'>+			.val = cpu_to_be32(0x00110000),</div><div class='add'>+			.mask = cpu_to_be32(0x00ff0000),</div><div class='add'>+		},</div><div class='add'>+		.jump = cxgb4_udp_fields,</div><div class='add'>+	},</div><div class='add'>+	{ .jump = NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Accept a rule with a jump directly past the 40 Bytes of IPv6 fixed header</div><div class='ctx'>  * to get to transport layer header.</div><div class='ctx'>  */</div><div class='ctx'> static const struct cxgb4_next_header cxgb4_ipv6_jumps[] = {</div><div class='del'>-	{ .offset = 0x28, .offoff = 0, .shift = 0, .mask = 0,</div><div class='del'>-	  .match_off = 4, .match_val = 0x60000, .match_mask = 0xFF0000,</div><div class='del'>-	  .jump = cxgb4_tcp_fields },</div><div class='del'>-	{ .offset = 0x28, .offoff = 0, .shift = 0, .mask = 0,</div><div class='del'>-	  .match_off = 4, .match_val = 0x110000, .match_mask = 0xFF0000,</div><div class='del'>-	  .jump = cxgb4_udp_fields },</div><div class='del'>-	{ .jump = NULL }</div><div class='add'>+	{</div><div class='add'>+		/* TCP Jump */</div><div class='add'>+		.sel = {</div><div class='add'>+			.off = 40,</div><div class='add'>+			.offoff = 0,</div><div class='add'>+			.offshift = 0,</div><div class='add'>+			.offmask = 0,</div><div class='add'>+		},</div><div class='add'>+		.key = {</div><div class='add'>+			.off = 4,</div><div class='add'>+			.val = cpu_to_be32(0x00000600),</div><div class='add'>+			.mask = cpu_to_be32(0x0000ff00),</div><div class='add'>+		},</div><div class='add'>+		.jump = cxgb4_tcp_fields,</div><div class='add'>+	},</div><div class='add'>+	{</div><div class='add'>+		/* UDP Jump */</div><div class='add'>+		.sel = {</div><div class='add'>+			.off = 40,</div><div class='add'>+			.offoff = 0,</div><div class='add'>+			.offshift = 0,</div><div class='add'>+			.offmask = 0,</div><div class='add'>+		},</div><div class='add'>+		.key = {</div><div class='add'>+			.off = 4,</div><div class='add'>+			.val = cpu_to_be32(0x00001100),</div><div class='add'>+			.mask = cpu_to_be32(0x0000ff00),</div><div class='add'>+		},</div><div class='add'>+		.jump = cxgb4_udp_fields,</div><div class='add'>+	},</div><div class='add'>+	{ .jump = NULL },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct cxgb4_link {</div><div class='hunk'>@@ -289,6 +331,6 @@ struct cxgb4_link {</div><div class='ctx'> </div><div class='ctx'> struct cxgb4_tc_u32_table {</div><div class='ctx'> 	unsigned int size;          /* number of entries in table */</div><div class='del'>-	struct cxgb4_link table[0]; /* Jump table */</div><div class='add'>+	struct cxgb4_link table[] __counted_by(size); /* Jump table */</div><div class='ctx'> };</div><div class='ctx'> #endif /* __CXGB4_TC_U32_PARSE_H */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c<br/>index 3de8a5e83b6c..7bab8da8f6e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'> static int cxgb4_thermal_get_temp(struct thermal_zone_device *tzdev,</div><div class='ctx'> 				  int *temp)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adap = tzdev-&gt;devdata;</div><div class='add'>+	struct adapter *adap = thermal_zone_device_priv(tzdev);</div><div class='ctx'> 	u32 param, val;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -29,39 +29,16 @@ static int cxgb4_thermal_get_temp(struct thermal_zone_device *tzdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cxgb4_thermal_get_trip_type(struct thermal_zone_device *tzdev,</div><div class='del'>-				       int trip, enum thermal_trip_type *type)</div><div class='del'>-{</div><div class='del'>-	struct adapter *adap = tzdev-&gt;devdata;</div><div class='del'>-</div><div class='del'>-	if (!adap-&gt;ch_thermal.trip_temp)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	*type = adap-&gt;ch_thermal.trip_type;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int cxgb4_thermal_get_trip_temp(struct thermal_zone_device *tzdev,</div><div class='del'>-				       int trip, int *temp)</div><div class='del'>-{</div><div class='del'>-	struct adapter *adap = tzdev-&gt;devdata;</div><div class='del'>-</div><div class='del'>-	if (!adap-&gt;ch_thermal.trip_temp)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	*temp = adap-&gt;ch_thermal.trip_temp;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct thermal_zone_device_ops cxgb4_thermal_ops = {</div><div class='add'>+static const struct thermal_zone_device_ops cxgb4_thermal_ops = {</div><div class='ctx'> 	.get_temp = cxgb4_thermal_get_temp,</div><div class='del'>-	.get_trip_type = cxgb4_thermal_get_trip_type,</div><div class='del'>-	.get_trip_temp = cxgb4_thermal_get_trip_temp,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static struct thermal_trip trip = { .type = THERMAL_TRIP_CRITICAL } ;</div><div class='add'>+</div><div class='ctx'> int cxgb4_thermal_init(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	struct ch_thermal *ch_thermal = &amp;adap-&gt;ch_thermal;</div><div class='add'>+	char ch_tz_name[THERMAL_NAME_LENGTH];</div><div class='ctx'> 	int num_trip = CXGB4_NUM_TRIPS;</div><div class='ctx'> 	u32 param, val;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -78,26 +55,36 @@ int cxgb4_thermal_init(struct adapter *adap)</div><div class='ctx'> 	if (ret &lt; 0) {</div><div class='ctx'> 		num_trip = 0; /* could not get trip temperature */</div><div class='ctx'> 	} else {</div><div class='del'>-		ch_thermal-&gt;trip_temp = val * 1000;</div><div class='del'>-		ch_thermal-&gt;trip_type = THERMAL_TRIP_CRITICAL;</div><div class='add'>+		trip.temperature = val * 1000;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ch_thermal-&gt;tzdev = thermal_zone_device_register("cxgb4", num_trip,</div><div class='del'>-							 0, adap,</div><div class='del'>-							 &amp;cxgb4_thermal_ops,</div><div class='del'>-							 NULL, 0, 0);</div><div class='add'>+	snprintf(ch_tz_name, sizeof(ch_tz_name), "cxgb4_%s", adap-&gt;name);</div><div class='add'>+	ch_thermal-&gt;tzdev = thermal_zone_device_register_with_trips(ch_tz_name, &amp;trip, num_trip,</div><div class='add'>+								    adap,</div><div class='add'>+								    &amp;cxgb4_thermal_ops,</div><div class='add'>+								    NULL, 0, 0);</div><div class='ctx'> 	if (IS_ERR(ch_thermal-&gt;tzdev)) {</div><div class='ctx'> 		ret = PTR_ERR(ch_thermal-&gt;tzdev);</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "Failed to register thermal zone\n");</div><div class='ctx'> 		ch_thermal-&gt;tzdev = NULL;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	ret = thermal_zone_device_enable(ch_thermal-&gt;tzdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Failed to enable thermal zone\n");</div><div class='add'>+		thermal_zone_device_unregister(adap-&gt;ch_thermal.tzdev);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int cxgb4_thermal_remove(struct adapter *adap)</div><div class='ctx'> {</div><div class='del'>-	if (adap-&gt;ch_thermal.tzdev)</div><div class='add'>+	if (adap-&gt;ch_thermal.tzdev) {</div><div class='ctx'> 		thermal_zone_device_unregister(adap-&gt;ch_thermal.tzdev);</div><div class='add'>+		adap-&gt;ch_thermal.tzdev = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c<br/>index 6c685b920713..5c13bcb4550d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c</a></div><div class='hunk'>@@ -53,35 +53,6 @@</div><div class='ctx'> </div><div class='ctx'> #define for_each_uldrxq(m, i) for (i = 0; i &lt; ((m)-&gt;nrxq + (m)-&gt;nciq); i++)</div><div class='ctx'> </div><div class='del'>-static int get_msix_idx_from_bmap(struct adapter *adap)</div><div class='del'>-{</div><div class='del'>-	struct uld_msix_bmap *bmap = &amp;adap-&gt;msix_bmap_ulds;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-	unsigned int msix_idx;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;bmap-&gt;lock, flags);</div><div class='del'>-	msix_idx = find_first_zero_bit(bmap-&gt;msix_bmap, bmap-&gt;mapsize);</div><div class='del'>-	if (msix_idx &lt; bmap-&gt;mapsize) {</div><div class='del'>-		__set_bit(msix_idx, bmap-&gt;msix_bmap);</div><div class='del'>-	} else {</div><div class='del'>-		spin_unlock_irqrestore(&amp;bmap-&gt;lock, flags);</div><div class='del'>-		return -ENOSPC;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	spin_unlock_irqrestore(&amp;bmap-&gt;lock, flags);</div><div class='del'>-	return msix_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_msix_idx_in_bmap(struct adapter *adap, unsigned int msix_idx)</div><div class='del'>-{</div><div class='del'>-	struct uld_msix_bmap *bmap = &amp;adap-&gt;msix_bmap_ulds;</div><div class='del'>-	unsigned long flags;</div><div class='del'>-</div><div class='del'>-	spin_lock_irqsave(&amp;bmap-&gt;lock, flags);</div><div class='del'>-	__clear_bit(msix_idx, bmap-&gt;msix_bmap);</div><div class='del'>-	spin_unlock_irqrestore(&amp;bmap-&gt;lock, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /* Flush the aggregated lro sessions */</div><div class='ctx'> static void uldrx_flush_handler(struct sge_rspq *q)</div><div class='ctx'> {</div><div class='hunk'>@@ -137,13 +108,12 @@ static int uldrx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='ctx'> static int alloc_uld_rxqs(struct adapter *adap,</div><div class='ctx'> 			  struct sge_uld_rxq_info *rxq_info, bool lro)</div><div class='ctx'> {</div><div class='del'>-	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 	unsigned int nq = rxq_info-&gt;nrxq + rxq_info-&gt;nciq;</div><div class='ctx'> 	struct sge_ofld_rxq *q = rxq_info-&gt;uldrxq;</div><div class='ctx'> 	unsigned short *ids = rxq_info-&gt;rspq_id;</div><div class='del'>-	unsigned int bmap_idx = 0;</div><div class='del'>-	unsigned int per_chan;</div><div class='ctx'> 	int i, err, msi_idx, que_idx = 0;</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	unsigned int per_chan;</div><div class='ctx'> </div><div class='ctx'> 	per_chan = rxq_info-&gt;nrxq / adap-&gt;params.nports;</div><div class='ctx'> </div><div class='hunk'>@@ -160,8 +130,18 @@ static int alloc_uld_rxqs(struct adapter *adap,</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (msi_idx &gt;= 0) {</div><div class='del'>-			bmap_idx = get_msix_idx_from_bmap(adap);</div><div class='del'>-			msi_idx = adap-&gt;msix_info_ulds[bmap_idx].idx;</div><div class='add'>+			msi_idx = cxgb4_get_msix_idx_from_bmap(adap);</div><div class='add'>+			if (msi_idx &lt; 0) {</div><div class='add'>+				err = -ENOSPC;</div><div class='add'>+				goto freeout;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			snprintf(adap-&gt;msix_info[msi_idx].desc,</div><div class='add'>+				 sizeof(adap-&gt;msix_info[msi_idx].desc),</div><div class='add'>+				 "%s-%s%d",</div><div class='add'>+				 adap-&gt;port[0]-&gt;name, rxq_info-&gt;name, i);</div><div class='add'>+</div><div class='add'>+			q-&gt;msix = &amp;adap-&gt;msix_info[msi_idx];</div><div class='ctx'> 		}</div><div class='ctx'> 		err = t4_sge_alloc_rxq(adap, &amp;q-&gt;rspq, false,</div><div class='ctx'> 				       adap-&gt;port[que_idx++ / per_chan],</div><div class='hunk'>@@ -172,8 +152,7 @@ static int alloc_uld_rxqs(struct adapter *adap,</div><div class='ctx'> 				       0);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto freeout;</div><div class='del'>-		if (msi_idx &gt;= 0)</div><div class='del'>-			rxq_info-&gt;msix_tbl[i] = bmap_idx;</div><div class='add'>+</div><div class='ctx'> 		memset(&amp;q-&gt;stats, 0, sizeof(q-&gt;stats));</div><div class='ctx'> 		if (ids)</div><div class='ctx'> 			ids[i] = q-&gt;rspq.abs_id;</div><div class='hunk'>@@ -185,6 +164,8 @@ freeout:</div><div class='ctx'> 		if (q-&gt;rspq.desc)</div><div class='ctx'> 			free_rspq_fl(adap, &amp;q-&gt;rspq,</div><div class='ctx'> 				     q-&gt;fl.size ? &amp;q-&gt;fl : NULL);</div><div class='add'>+		if (q-&gt;msix)</div><div class='add'>+			cxgb4_free_msix_idx_in_bmap(adap, q-&gt;msix-&gt;idx);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -193,21 +174,14 @@ static int</div><div class='ctx'> setup_sge_queues_uld(struct adapter *adap, unsigned int uld_type, bool lro)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge_uld_rxq_info *rxq_info = adap-&gt;sge.uld_rxq_info[uld_type];</div><div class='del'>-	int i, ret = 0;</div><div class='add'>+	int i, ret;</div><div class='ctx'> </div><div class='del'>-	if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='del'>-		rxq_info-&gt;msix_tbl = kcalloc((rxq_info-&gt;nrxq + rxq_info-&gt;nciq),</div><div class='del'>-					     sizeof(unsigned short),</div><div class='del'>-					     GFP_KERNEL);</div><div class='del'>-		if (!rxq_info-&gt;msix_tbl)</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = !(!alloc_uld_rxqs(adap, rxq_info, lro));</div><div class='add'>+	ret = alloc_uld_rxqs(adap, rxq_info, lro);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Tell uP to route control queue completions to rdma rspq */</div><div class='del'>-	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE &amp;&amp;</div><div class='del'>-	    !ret &amp;&amp; uld_type == CXGB4_ULD_RDMA) {</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE &amp;&amp; uld_type == CXGB4_ULD_RDMA) {</div><div class='ctx'> 		struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 		unsigned int cmplqid;</div><div class='ctx'> 		u32 param, cmdop;</div><div class='hunk'>@@ -258,8 +232,6 @@ static void free_sge_queues_uld(struct adapter *adap, unsigned int uld_type)</div><div class='ctx'> 		t4_free_uld_rxqs(adap, rxq_info-&gt;nciq,</div><div class='ctx'> 				 rxq_info-&gt;uldrxq + rxq_info-&gt;nrxq);</div><div class='ctx'> 	t4_free_uld_rxqs(adap, rxq_info-&gt;nrxq, rxq_info-&gt;uldrxq);</div><div class='del'>-	if (adap-&gt;flags &amp; CXGB4_USING_MSIX)</div><div class='del'>-		kfree(rxq_info-&gt;msix_tbl);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int cfg_queues_uld(struct adapter *adap, unsigned int uld_type,</div><div class='hunk'>@@ -352,25 +324,30 @@ static int</div><div class='ctx'> request_msix_queue_irqs_uld(struct adapter *adap, unsigned int uld_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge_uld_rxq_info *rxq_info = adap-&gt;sge.uld_rxq_info[uld_type];</div><div class='add'>+	struct msix_info *minfo;</div><div class='add'>+	unsigned int idx;</div><div class='ctx'> 	int err = 0;</div><div class='del'>-	unsigned int idx, bmap_idx;</div><div class='ctx'> </div><div class='ctx'> 	for_each_uldrxq(rxq_info, idx) {</div><div class='del'>-		bmap_idx = rxq_info-&gt;msix_tbl[idx];</div><div class='del'>-		err = request_irq(adap-&gt;msix_info_ulds[bmap_idx].vec,</div><div class='add'>+		minfo = rxq_info-&gt;uldrxq[idx].msix;</div><div class='add'>+		err = request_irq(minfo-&gt;vec,</div><div class='ctx'> 				  t4_sge_intr_msix, 0,</div><div class='del'>-				  adap-&gt;msix_info_ulds[bmap_idx].desc,</div><div class='add'>+				  minfo-&gt;desc,</div><div class='ctx'> 				  &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto unwind;</div><div class='add'>+</div><div class='add'>+		cxgb4_set_msix_aff(adap, minfo-&gt;vec,</div><div class='add'>+				   &amp;minfo-&gt;aff_mask, idx);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='ctx'> unwind:</div><div class='ctx'> 	while (idx-- &gt; 0) {</div><div class='del'>-		bmap_idx = rxq_info-&gt;msix_tbl[idx];</div><div class='del'>-		free_msix_idx_in_bmap(adap, bmap_idx);</div><div class='del'>-		free_irq(adap-&gt;msix_info_ulds[bmap_idx].vec,</div><div class='del'>-			 &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='add'>+		minfo = rxq_info-&gt;uldrxq[idx].msix;</div><div class='add'>+		cxgb4_clear_msix_aff(minfo-&gt;vec, minfo-&gt;aff_mask);</div><div class='add'>+		cxgb4_free_msix_idx_in_bmap(adap, minfo-&gt;idx);</div><div class='add'>+		free_irq(minfo-&gt;vec, &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -379,67 +356,45 @@ static void</div><div class='ctx'> free_msix_queue_irqs_uld(struct adapter *adap, unsigned int uld_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge_uld_rxq_info *rxq_info = adap-&gt;sge.uld_rxq_info[uld_type];</div><div class='del'>-	unsigned int idx, bmap_idx;</div><div class='add'>+	struct msix_info *minfo;</div><div class='add'>+	unsigned int idx;</div><div class='ctx'> </div><div class='ctx'> 	for_each_uldrxq(rxq_info, idx) {</div><div class='del'>-		bmap_idx = rxq_info-&gt;msix_tbl[idx];</div><div class='del'>-</div><div class='del'>-		free_msix_idx_in_bmap(adap, bmap_idx);</div><div class='del'>-		free_irq(adap-&gt;msix_info_ulds[bmap_idx].vec,</div><div class='del'>-			 &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='add'>+		minfo = rxq_info-&gt;uldrxq[idx].msix;</div><div class='add'>+		cxgb4_clear_msix_aff(minfo-&gt;vec, minfo-&gt;aff_mask);</div><div class='add'>+		cxgb4_free_msix_idx_in_bmap(adap, minfo-&gt;idx);</div><div class='add'>+		free_irq(minfo-&gt;vec, &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void name_msix_vecs_uld(struct adapter *adap, unsigned int uld_type)</div><div class='add'>+static void enable_rx_uld(struct adapter *adap, unsigned int uld_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge_uld_rxq_info *rxq_info = adap-&gt;sge.uld_rxq_info[uld_type];</div><div class='del'>-	int n = sizeof(adap-&gt;msix_info_ulds[0].desc);</div><div class='del'>-	unsigned int idx, bmap_idx;</div><div class='add'>+	int idx;</div><div class='ctx'> </div><div class='ctx'> 	for_each_uldrxq(rxq_info, idx) {</div><div class='del'>-		bmap_idx = rxq_info-&gt;msix_tbl[idx];</div><div class='add'>+		struct sge_rspq *q = &amp;rxq_info-&gt;uldrxq[idx].rspq;</div><div class='ctx'> </div><div class='del'>-		snprintf(adap-&gt;msix_info_ulds[bmap_idx].desc, n, "%s-%s%d",</div><div class='del'>-			 adap-&gt;port[0]-&gt;name, rxq_info-&gt;name, idx);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enable_rx(struct adapter *adap, struct sge_rspq *q)</div><div class='del'>-{</div><div class='del'>-	if (!q)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (q-&gt;handler)</div><div class='del'>-		napi_enable(&amp;q-&gt;napi);</div><div class='del'>-</div><div class='del'>-	/* 0-increment GTS to start the timer and enable interrupts */</div><div class='del'>-	t4_write_reg(adap, MYPF_REG(SGE_PF_GTS_A),</div><div class='del'>-		     SEINTARM_V(q-&gt;intr_params) |</div><div class='del'>-		     INGRESSQID_V(q-&gt;cntxt_id));</div><div class='del'>-}</div><div class='add'>+		if (!q)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-static void quiesce_rx(struct adapter *adap, struct sge_rspq *q)</div><div class='del'>-{</div><div class='del'>-	if (q &amp;&amp; q-&gt;handler)</div><div class='del'>-		napi_disable(&amp;q-&gt;napi);</div><div class='add'>+		cxgb4_enable_rx(adap, q);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enable_rx_uld(struct adapter *adap, unsigned int uld_type)</div><div class='add'>+static void quiesce_rx_uld(struct adapter *adap, unsigned int uld_type)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge_uld_rxq_info *rxq_info = adap-&gt;sge.uld_rxq_info[uld_type];</div><div class='ctx'> 	int idx;</div><div class='ctx'> </div><div class='del'>-	for_each_uldrxq(rxq_info, idx)</div><div class='del'>-		enable_rx(adap, &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='del'>-}</div><div class='add'>+	for_each_uldrxq(rxq_info, idx) {</div><div class='add'>+		struct sge_rspq *q = &amp;rxq_info-&gt;uldrxq[idx].rspq;</div><div class='ctx'> </div><div class='del'>-static void quiesce_rx_uld(struct adapter *adap, unsigned int uld_type)</div><div class='del'>-{</div><div class='del'>-	struct sge_uld_rxq_info *rxq_info = adap-&gt;sge.uld_rxq_info[uld_type];</div><div class='del'>-	int idx;</div><div class='add'>+		if (!q)</div><div class='add'>+			continue;</div><div class='ctx'> </div><div class='del'>-	for_each_uldrxq(rxq_info, idx)</div><div class='del'>-		quiesce_rx(adap, &amp;rxq_info-&gt;uldrxq[idx].rspq);</div><div class='add'>+		cxgb4_quiesce_rx(q);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='hunk'>@@ -451,7 +406,7 @@ free_sge_txq_uld(struct adapter *adap, struct sge_uld_txq_info *txq_info)</div><div class='ctx'> 	for (i = 0; i &lt; nq; i++) {</div><div class='ctx'> 		struct sge_uld_txq *txq = &amp;txq_info-&gt;uldtxq[i];</div><div class='ctx'> </div><div class='del'>-		if (txq &amp;&amp; txq-&gt;q.desc) {</div><div class='add'>+		if (txq-&gt;q.desc) {</div><div class='ctx'> 			tasklet_kill(&amp;txq-&gt;qresume_tsk);</div><div class='ctx'> 			t4_ofld_eq_free(adap, adap-&gt;mbox, adap-&gt;pf, 0,</div><div class='ctx'> 					txq-&gt;q.cntxt_id);</div><div class='hunk'>@@ -626,6 +581,9 @@ void t4_uld_clean_up(struct adapter *adap)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='add'>+	if (!is_uld(adap))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='ctx'> 	mutex_lock(&amp;uld_mutex);</div><div class='ctx'> 	for (i = 0; i &lt; CXGB4_ULD_MAX; i++) {</div><div class='ctx'> 		if (!adap-&gt;uld[i].handle)</div><div class='hunk'>@@ -683,10 +641,10 @@ static void uld_init(struct adapter *adap, struct cxgb4_lld_info *lld)</div><div class='ctx'> 	lld-&gt;write_cmpl_support = adap-&gt;params.write_cmpl_support;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void uld_attach(struct adapter *adap, unsigned int uld)</div><div class='add'>+static int uld_attach(struct adapter *adap, unsigned int uld)</div><div class='ctx'> {</div><div class='del'>-	void *handle;</div><div class='ctx'> 	struct cxgb4_lld_info lli;</div><div class='add'>+	void *handle;</div><div class='ctx'> </div><div class='ctx'> 	uld_init(adap, &amp;lli);</div><div class='ctx'> 	uld_queue_init(adap, uld, &amp;lli);</div><div class='hunk'>@@ -696,7 +654,7 @@ static void uld_attach(struct adapter *adap, unsigned int uld)</div><div class='ctx'> 		dev_warn(adap-&gt;pdev_dev,</div><div class='ctx'> 			 "could not attach to the %s driver, error %ld\n",</div><div class='ctx'> 			 adap-&gt;uld[uld].name, PTR_ERR(handle));</div><div class='del'>-		return;</div><div class='add'>+		return PTR_ERR(handle);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	adap-&gt;uld[uld].handle = handle;</div><div class='hunk'>@@ -704,68 +662,160 @@ static void uld_attach(struct adapter *adap, unsigned int uld)</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='ctx'> 		adap-&gt;uld[uld].state_change(handle, CXGB4_STATE_UP);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *	cxgb4_register_uld - register an upper-layer driver</div><div class='del'>- *	@type: the ULD type</div><div class='del'>- *	@p: the ULD methods</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+static bool cxgb4_uld_in_use(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	const struct tid_info *t = &amp;adap-&gt;tids;</div><div class='add'>+</div><div class='add'>+	return (atomic_read(&amp;t-&gt;conns_in_use) || t-&gt;stids_in_use);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cxgb4_set_ktls_feature: request FW to enable/disable ktls settings.</div><div class='add'>+ * @adap: adapter info</div><div class='add'>+ * @enable: 1 to enable / 0 to disable ktls settings.</div><div class='add'>+ */</div><div class='add'>+int cxgb4_set_ktls_feature(struct adapter *adap, bool enable)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+	u32 params =</div><div class='add'>+		FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) |</div><div class='add'>+		FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_KTLS_HW) |</div><div class='add'>+		FW_PARAMS_PARAM_Y_V(enable) |</div><div class='add'>+		FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_KTLS_HW_USER_ENABLE);</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		if (!refcount_read(&amp;adap-&gt;chcr_ktls.ktls_refcount)) {</div><div class='add'>+			/* At this moment if ULD connection are up means, other</div><div class='add'>+			 * ULD is/are already active, return failure.</div><div class='add'>+			 */</div><div class='add'>+			if (cxgb4_uld_in_use(adap)) {</div><div class='add'>+				dev_dbg(adap-&gt;pdev_dev,</div><div class='add'>+					"ULD connections (tid/stid) active. Can't enable kTLS\n");</div><div class='add'>+				return -EINVAL;</div><div class='add'>+			}</div><div class='add'>+			ret = t4_set_params(adap, adap-&gt;mbox, adap-&gt;pf,</div><div class='add'>+					    0, 1, &amp;params, &amp;params);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			refcount_set(&amp;adap-&gt;chcr_ktls.ktls_refcount, 1);</div><div class='add'>+			pr_debug("kTLS has been enabled. Restrictions placed on ULD support\n");</div><div class='add'>+		} else {</div><div class='add'>+			/* ktls settings already up, just increment refcount. */</div><div class='add'>+			refcount_inc(&amp;adap-&gt;chcr_ktls.ktls_refcount);</div><div class='add'>+		}</div><div class='add'>+	} else {</div><div class='add'>+		/* return failure if refcount is already 0. */</div><div class='add'>+		if (!refcount_read(&amp;adap-&gt;chcr_ktls.ktls_refcount))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		/* decrement refcount and test, if 0, disable ktls feature,</div><div class='add'>+		 * else return command success.</div><div class='add'>+		 */</div><div class='add'>+		if (refcount_dec_and_test(&amp;adap-&gt;chcr_ktls.ktls_refcount)) {</div><div class='add'>+			ret = t4_set_params(adap, adap-&gt;mbox, adap-&gt;pf,</div><div class='add'>+					    0, 1, &amp;params, &amp;params);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			pr_debug("kTLS is disabled. Restrictions on ULD support removed\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+static void cxgb4_uld_alloc_resources(struct adapter *adap,</div><div class='add'>+				      enum cxgb4_uld type,</div><div class='add'>+				      const struct cxgb4_uld_info *p)</div><div class='add'>+{</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if ((type == CXGB4_ULD_CRYPTO &amp;&amp; !is_pci_uld(adap)) ||</div><div class='add'>+	    (type != CXGB4_ULD_CRYPTO &amp;&amp; !is_offload(adap)))</div><div class='add'>+		return;</div><div class='add'>+	if (type == CXGB4_ULD_ISCSIT &amp;&amp; is_t4(adap-&gt;params.chip))</div><div class='add'>+		return;</div><div class='add'>+	ret = cfg_queues_uld(adap, type, p);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+	ret = setup_sge_queues_uld(adap, type, p-&gt;lro);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_queues;</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='add'>+		ret = request_msix_queue_irqs_uld(adap, type);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto free_rxq;</div><div class='add'>+	}</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='add'>+		enable_rx_uld(adap, type);</div><div class='add'>+	if (adap-&gt;uld[type].add)</div><div class='add'>+		goto free_irq;</div><div class='add'>+	ret = setup_sge_txq_uld(adap, type, p);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_irq;</div><div class='add'>+	adap-&gt;uld[type] = *p;</div><div class='add'>+	ret = uld_attach(adap, type);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto free_txq;</div><div class='add'>+	return;</div><div class='add'>+free_txq:</div><div class='add'>+	release_sge_txq_uld(adap, type);</div><div class='add'>+free_irq:</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='add'>+		quiesce_rx_uld(adap, type);</div><div class='add'>+	if (adap-&gt;flags &amp; CXGB4_USING_MSIX)</div><div class='add'>+		free_msix_queue_irqs_uld(adap, type);</div><div class='add'>+free_rxq:</div><div class='add'>+	free_sge_queues_uld(adap, type);</div><div class='add'>+free_queues:</div><div class='add'>+	free_queues_uld(adap, type);</div><div class='add'>+out:</div><div class='add'>+	dev_warn(adap-&gt;pdev_dev,</div><div class='add'>+		 "ULD registration failed for uld type %d\n", type);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_uld_enable(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_uld_list *uld_entry;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;uld_mutex);</div><div class='add'>+	list_add_tail(&amp;adap-&gt;list_node, &amp;adapter_list);</div><div class='add'>+	list_for_each_entry(uld_entry, &amp;uld_list, list_node)</div><div class='add'>+		cxgb4_uld_alloc_resources(adap, uld_entry-&gt;uld_type,</div><div class='add'>+					  &amp;uld_entry-&gt;uld_info);</div><div class='add'>+	mutex_unlock(&amp;uld_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cxgb4_register_uld - register an upper-layer driver</div><div class='add'>+ * @type: the ULD type</div><div class='add'>+ * @p: the ULD methods</div><div class='ctx'>  *</div><div class='del'>- *	Registers an upper-layer driver with this driver and notifies the ULD</div><div class='del'>- *	about any presently available devices that support its type.  Returns</div><div class='del'>- *	%-EBUSY if a ULD of the same type is already registered.</div><div class='add'>+ * Registers an upper-layer driver with this driver and notifies the ULD</div><div class='add'>+ * about any presently available devices that support its type.</div><div class='ctx'>  */</div><div class='ctx'> void cxgb4_register_uld(enum cxgb4_uld type,</div><div class='ctx'> 			const struct cxgb4_uld_info *p)</div><div class='ctx'> {</div><div class='del'>-	int ret = 0;</div><div class='add'>+	struct cxgb4_uld_list *uld_entry;</div><div class='ctx'> 	struct adapter *adap;</div><div class='ctx'> </div><div class='ctx'> 	if (type &gt;= CXGB4_ULD_MAX)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='add'>+	uld_entry = kzalloc(sizeof(*uld_entry), GFP_KERNEL);</div><div class='add'>+	if (!uld_entry)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;uld_entry-&gt;uld_info, p, sizeof(struct cxgb4_uld_info));</div><div class='ctx'> 	mutex_lock(&amp;uld_mutex);</div><div class='del'>-	list_for_each_entry(adap, &amp;adapter_list, list_node) {</div><div class='del'>-		if ((type == CXGB4_ULD_CRYPTO &amp;&amp; !is_pci_uld(adap)) ||</div><div class='del'>-		    (type != CXGB4_ULD_CRYPTO &amp;&amp; !is_offload(adap)))</div><div class='del'>-			continue;</div><div class='del'>-		if (type == CXGB4_ULD_ISCSIT &amp;&amp; is_t4(adap-&gt;params.chip))</div><div class='del'>-			continue;</div><div class='del'>-		ret = cfg_queues_uld(adap, type, p);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto out;</div><div class='del'>-		ret = setup_sge_queues_uld(adap, type, p-&gt;lro);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto free_queues;</div><div class='del'>-		if (adap-&gt;flags &amp; CXGB4_USING_MSIX) {</div><div class='del'>-			name_msix_vecs_uld(adap, type);</div><div class='del'>-			ret = request_msix_queue_irqs_uld(adap, type);</div><div class='del'>-			if (ret)</div><div class='del'>-				goto free_rxq;</div><div class='del'>-		}</div><div class='del'>-		if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='del'>-			enable_rx_uld(adap, type);</div><div class='del'>-		if (adap-&gt;uld[type].add)</div><div class='del'>-			goto free_irq;</div><div class='del'>-		ret = setup_sge_txq_uld(adap, type, p);</div><div class='del'>-		if (ret)</div><div class='del'>-			goto free_irq;</div><div class='del'>-		adap-&gt;uld[type] = *p;</div><div class='del'>-		uld_attach(adap, type);</div><div class='del'>-		continue;</div><div class='del'>-free_irq:</div><div class='del'>-		if (adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE)</div><div class='del'>-			quiesce_rx_uld(adap, type);</div><div class='del'>-		if (adap-&gt;flags &amp; CXGB4_USING_MSIX)</div><div class='del'>-			free_msix_queue_irqs_uld(adap, type);</div><div class='del'>-free_rxq:</div><div class='del'>-		free_sge_queues_uld(adap, type);</div><div class='del'>-free_queues:</div><div class='del'>-		free_queues_uld(adap, type);</div><div class='del'>-out:</div><div class='del'>-		dev_warn(adap-&gt;pdev_dev,</div><div class='del'>-			 "ULD registration failed for uld type %d\n", type);</div><div class='del'>-	}</div><div class='add'>+	list_for_each_entry(adap, &amp;adapter_list, list_node)</div><div class='add'>+		cxgb4_uld_alloc_resources(adap, type, p);</div><div class='add'>+</div><div class='add'>+	uld_entry-&gt;uld_type = type;</div><div class='add'>+	list_add_tail(&amp;uld_entry-&gt;list_node, &amp;uld_list);</div><div class='ctx'> 	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> 	return;</div><div class='ctx'> }</div><div class='hunk'>@@ -779,6 +829,7 @@ EXPORT_SYMBOL(cxgb4_register_uld);</div><div class='ctx'>  */</div><div class='ctx'> int cxgb4_unregister_uld(enum cxgb4_uld type)</div><div class='ctx'> {</div><div class='add'>+	struct cxgb4_uld_list *uld_entry, *tmp;</div><div class='ctx'> 	struct adapter *adap;</div><div class='ctx'> </div><div class='ctx'> 	if (type &gt;= CXGB4_ULD_MAX)</div><div class='hunk'>@@ -794,6 +845,13 @@ int cxgb4_unregister_uld(enum cxgb4_uld type)</div><div class='ctx'> </div><div class='ctx'> 		cxgb4_shutdown_uld_adapter(adap, type);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(uld_entry, tmp, &amp;uld_list, list_node) {</div><div class='add'>+		if (uld_entry-&gt;uld_type == type) {</div><div class='add'>+			list_del(&amp;uld_entry-&gt;list_node);</div><div class='add'>+			kfree(uld_entry);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	mutex_unlock(&amp;uld_mutex);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h<br/>index 21da34a4ca24..d7713038386c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h</a></div><div class='hunk'>@@ -40,9 +40,14 @@</div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/inetdevice.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='ctx'> #include "cxgb4.h"</div><div class='ctx'> </div><div class='ctx'> #define MAX_ULD_QSETS 16</div><div class='add'>+#define MAX_ULD_NPORTS 4</div><div class='add'>+</div><div class='add'>+/* ulp_mem_io + ulptx_idata + payload + padding */</div><div class='add'>+#define MAX_IMM_ULPTX_WR_LEN (32 + 8 + 256 + 8)</div><div class='ctx'> </div><div class='ctx'> /* CPL message priority levels */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -89,24 +94,36 @@ union aopen_entry {</div><div class='ctx'> 	union aopen_entry *next;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct eotid_entry {</div><div class='add'>+	void *data;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * Holds the size, base address, free list start, etc of the TID, server TID,</div><div class='ctx'>  * and active-open TID tables.  The tables themselves are allocated dynamically.</div><div class='ctx'>  */</div><div class='ctx'> struct tid_info {</div><div class='ctx'> 	void **tid_tab;</div><div class='add'>+	unsigned int tid_base;</div><div class='ctx'> 	unsigned int ntids;</div><div class='ctx'> </div><div class='ctx'> 	struct serv_entry *stid_tab;</div><div class='ctx'> 	unsigned long *stid_bmap;</div><div class='ctx'> 	unsigned int nstids;</div><div class='ctx'> 	unsigned int stid_base;</div><div class='add'>+</div><div class='add'>+	unsigned int nhash;</div><div class='ctx'> 	unsigned int hash_base;</div><div class='ctx'> </div><div class='ctx'> 	union aopen_entry *atid_tab;</div><div class='ctx'> 	unsigned int natids;</div><div class='ctx'> 	unsigned int atid_base;</div><div class='ctx'> </div><div class='add'>+	struct filter_entry *hpftid_tab;</div><div class='add'>+	unsigned long *hpftid_bmap;</div><div class='add'>+	unsigned int nhpftids;</div><div class='add'>+	unsigned int hpftid_base;</div><div class='add'>+</div><div class='ctx'> 	struct filter_entry *ftid_tab;</div><div class='ctx'> 	unsigned long *ftid_bmap;</div><div class='ctx'> 	unsigned int nftids;</div><div class='hunk'>@@ -126,20 +143,37 @@ struct tid_info {</div><div class='ctx'> 	unsigned int v6_stids_in_use;</div><div class='ctx'> 	unsigned int sftids_in_use;</div><div class='ctx'> </div><div class='add'>+	/* ETHOFLD range */</div><div class='add'>+	struct eotid_entry *eotid_tab;</div><div class='add'>+	unsigned long *eotid_bmap;</div><div class='add'>+	unsigned int eotid_base;</div><div class='add'>+	unsigned int neotids;</div><div class='add'>+</div><div class='ctx'> 	/* TIDs in the TCAM */</div><div class='ctx'> 	atomic_t tids_in_use;</div><div class='ctx'> 	/* TIDs in the HASH */</div><div class='ctx'> 	atomic_t hash_tids_in_use;</div><div class='ctx'> 	atomic_t conns_in_use;</div><div class='add'>+	/* ETHOFLD TIDs used for rate limiting */</div><div class='add'>+	atomic_t eotids_in_use;</div><div class='add'>+</div><div class='ctx'> 	/* lock for setting/clearing filter bitmap */</div><div class='ctx'> 	spinlock_t ftid_lock;</div><div class='add'>+</div><div class='add'>+	unsigned int tc_hash_tids_max_prio;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline void *lookup_tid(const struct tid_info *t, unsigned int tid)</div><div class='ctx'> {</div><div class='add'>+	tid -= t-&gt;tid_base;</div><div class='ctx'> 	return tid &lt; t-&gt;ntids ? t-&gt;tid_tab[tid] : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool tid_out_of_range(const struct tid_info *t, unsigned int tid)</div><div class='add'>+{</div><div class='add'>+	return ((tid - t-&gt;tid_base) &gt;= t-&gt;ntids);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void *lookup_atid(const struct tid_info *t, unsigned int atid)</div><div class='ctx'> {</div><div class='ctx'> 	return atid &lt; t-&gt;natids ? t-&gt;atid_tab[atid].data : NULL;</div><div class='hunk'>@@ -161,7 +195,7 @@ static inline void *lookup_stid(const struct tid_info *t, unsigned int stid)</div><div class='ctx'> static inline void cxgb4_insert_tid(struct tid_info *t, void *data,</div><div class='ctx'> 				    unsigned int tid, unsigned short family)</div><div class='ctx'> {</div><div class='del'>-	t-&gt;tid_tab[tid] = data;</div><div class='add'>+	t-&gt;tid_tab[tid - t-&gt;tid_base] = data;</div><div class='ctx'> 	if (t-&gt;hash_base &amp;&amp; (tid &gt;= t-&gt;hash_base)) {</div><div class='ctx'> 		if (family == AF_INET6)</div><div class='ctx'> 			atomic_add(2, &amp;t-&gt;hash_tids_in_use);</div><div class='hunk'>@@ -176,6 +210,37 @@ static inline void cxgb4_insert_tid(struct tid_info *t, void *data,</div><div class='ctx'> 	atomic_inc(&amp;t-&gt;conns_in_use);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct eotid_entry *cxgb4_lookup_eotid(struct tid_info *t,</div><div class='add'>+						     u32 eotid)</div><div class='add'>+{</div><div class='add'>+	return eotid &lt; t-&gt;neotids ? &amp;t-&gt;eotid_tab[eotid] : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int cxgb4_get_free_eotid(struct tid_info *t)</div><div class='add'>+{</div><div class='add'>+	int eotid;</div><div class='add'>+</div><div class='add'>+	eotid = find_first_zero_bit(t-&gt;eotid_bmap, t-&gt;neotids);</div><div class='add'>+	if (eotid &gt;= t-&gt;neotids)</div><div class='add'>+		eotid = -1;</div><div class='add'>+</div><div class='add'>+	return eotid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cxgb4_alloc_eotid(struct tid_info *t, u32 eotid, void *data)</div><div class='add'>+{</div><div class='add'>+	set_bit(eotid, t-&gt;eotid_bmap);</div><div class='add'>+	t-&gt;eotid_tab[eotid].data = data;</div><div class='add'>+	atomic_inc(&amp;t-&gt;eotids_in_use);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void cxgb4_free_eotid(struct tid_info *t, u32 eotid)</div><div class='add'>+{</div><div class='add'>+	clear_bit(eotid, t-&gt;eotid_bmap);</div><div class='add'>+	t-&gt;eotid_tab[eotid].data = NULL;</div><div class='add'>+	atomic_dec(&amp;t-&gt;eotids_in_use);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int cxgb4_alloc_atid(struct tid_info *t, void *data);</div><div class='ctx'> int cxgb4_alloc_stid(struct tid_info *t, int family, void *data);</div><div class='ctx'> int cxgb4_alloc_sftid(struct tid_info *t, int family, void *data);</div><div class='hunk'>@@ -210,9 +275,14 @@ struct filter_ctx {</div><div class='ctx'> 	u32 tid;			/* to store tid */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct chcr_ktls {</div><div class='add'>+	refcount_t ktls_refcount;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ch_filter_specification;</div><div class='ctx'> </div><div class='del'>-int cxgb4_get_free_ftid(struct net_device *dev, int family);</div><div class='add'>+int cxgb4_get_free_ftid(struct net_device *dev, u8 family, bool hash_en,</div><div class='add'>+			u32 tc_prio);</div><div class='ctx'> int __cxgb4_set_filter(struct net_device *dev, int filter_id,</div><div class='ctx'> 		       struct ch_filter_specification *fs,</div><div class='ctx'> 		       struct filter_ctx *ctx);</div><div class='hunk'>@@ -237,7 +307,9 @@ enum cxgb4_uld {</div><div class='ctx'> 	CXGB4_ULD_ISCSI,</div><div class='ctx'> 	CXGB4_ULD_ISCSIT,</div><div class='ctx'> 	CXGB4_ULD_CRYPTO,</div><div class='add'>+	CXGB4_ULD_IPSEC,</div><div class='ctx'> 	CXGB4_ULD_TLS,</div><div class='add'>+	CXGB4_ULD_KTLS,</div><div class='ctx'> 	CXGB4_ULD_MAX</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -268,6 +340,7 @@ enum cxgb4_control {</div><div class='ctx'> 	CXGB4_CONTROL_DB_DROP,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct adapter;</div><div class='ctx'> struct pci_dev;</div><div class='ctx'> struct l2t_data;</div><div class='ctx'> struct net_device;</div><div class='hunk'>@@ -292,7 +365,35 @@ struct cxgb4_virt_res {                      /* virtualized HW resources */</div><div class='ctx'> 	struct cxgb4_range ocq;</div><div class='ctx'> 	struct cxgb4_range key;</div><div class='ctx'> 	unsigned int ncrypto_fc;</div><div class='add'>+	struct cxgb4_range ppod_edram;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+struct ch_ktls_port_stats_debug {</div><div class='add'>+	atomic64_t ktls_tx_connection_open;</div><div class='add'>+	atomic64_t ktls_tx_connection_fail;</div><div class='add'>+	atomic64_t ktls_tx_connection_close;</div><div class='add'>+	atomic64_t ktls_tx_encrypted_packets;</div><div class='add'>+	atomic64_t ktls_tx_encrypted_bytes;</div><div class='add'>+	atomic64_t ktls_tx_ctx;</div><div class='add'>+	atomic64_t ktls_tx_ooo;</div><div class='add'>+	atomic64_t ktls_tx_skip_no_sync_data;</div><div class='add'>+	atomic64_t ktls_tx_drop_no_sync_data;</div><div class='add'>+	atomic64_t ktls_tx_drop_bypass_req;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ch_ktls_stats_debug {</div><div class='add'>+	struct ch_ktls_port_stats_debug ktls_port[MAX_ULD_NPORTS];</div><div class='add'>+	atomic64_t ktls_tx_send_records;</div><div class='add'>+	atomic64_t ktls_tx_end_pkts;</div><div class='add'>+	atomic64_t ktls_tx_start_pkts;</div><div class='add'>+	atomic64_t ktls_tx_middle_pkts;</div><div class='add'>+	atomic64_t ktls_tx_retransmit_pkts;</div><div class='add'>+	atomic64_t ktls_tx_complete_pkts;</div><div class='add'>+	atomic64_t ktls_tx_trimmed_pkts;</div><div class='add'>+	atomic64_t ktls_tx_fallback;</div><div class='ctx'> };</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> struct chcr_stats_debug {</div><div class='ctx'> 	atomic_t cipher_rqst;</div><div class='hunk'>@@ -301,12 +402,17 @@ struct chcr_stats_debug {</div><div class='ctx'> 	atomic_t complete;</div><div class='ctx'> 	atomic_t error;</div><div class='ctx'> 	atomic_t fallback;</div><div class='del'>-	atomic_t ipsec_cnt;</div><div class='ctx'> 	atomic_t tls_pdu_tx;</div><div class='ctx'> 	atomic_t tls_pdu_rx;</div><div class='ctx'> 	atomic_t tls_key;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='add'>+struct ch_ipsec_stats_debug {</div><div class='add'>+	atomic_t ipsec_cnt;</div><div class='add'>+};</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> #define OCQ_WIN_OFFSET(pdev, vres) \</div><div class='ctx'> 	(pci_resource_len((pdev), 2) - roundup_pow_of_two((vres)-&gt;ocq.size))</div><div class='ctx'> </div><div class='hunk'>@@ -383,8 +489,15 @@ struct cxgb4_uld_info {</div><div class='ctx'> 			      struct napi_struct *napi);</div><div class='ctx'> 	void (*lro_flush)(struct t4_lro_mgr *);</div><div class='ctx'> 	int (*tx_handler)(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	const struct tlsdev_ops *tlsdev_ops;</div><div class='add'>+#endif</div><div class='add'>+#if IS_ENABLED(CONFIG_XFRM_OFFLOAD)</div><div class='add'>+	const struct xfrmdev_ops *xfrmdev_ops;</div><div class='add'>+#endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+void cxgb4_uld_enable(struct adapter *adap);</div><div class='ctx'> void cxgb4_register_uld(enum cxgb4_uld type, const struct cxgb4_uld_info *p);</div><div class='ctx'> int cxgb4_unregister_uld(enum cxgb4_uld type);</div><div class='ctx'> int cxgb4_ofld_send(struct net_device *dev, struct sk_buff *skb);</div><div class='hunk'>@@ -393,8 +506,8 @@ int cxgb4_immdata_send(struct net_device *dev, unsigned int idx,</div><div class='ctx'> int cxgb4_crypto_send(struct net_device *dev, struct sk_buff *skb);</div><div class='ctx'> unsigned int cxgb4_dbfifo_count(const struct net_device *dev, int lpfifo);</div><div class='ctx'> unsigned int cxgb4_port_chan(const struct net_device *dev);</div><div class='add'>+unsigned int cxgb4_port_e2cchan(const struct net_device *dev);</div><div class='ctx'> unsigned int cxgb4_port_viid(const struct net_device *dev);</div><div class='del'>-unsigned int cxgb4_tp_smt_idx(enum chip_type chip, unsigned int viid);</div><div class='ctx'> unsigned int cxgb4_port_idx(const struct net_device *dev);</div><div class='ctx'> unsigned int cxgb4_best_mtu(const unsigned short *mtus, unsigned short mtu,</div><div class='ctx'> 			    unsigned int *idx);</div><div class='hunk'>@@ -405,8 +518,6 @@ unsigned int cxgb4_best_aligned_mtu(const unsigned short *mtus,</div><div class='ctx'> 				    unsigned int *mtu_idxp);</div><div class='ctx'> void cxgb4_get_tcp_stats(struct pci_dev *pdev, struct tp_tcp_stats *v4,</div><div class='ctx'> 			 struct tp_tcp_stats *v6);</div><div class='del'>-void cxgb4_iscsi_init(struct net_device *dev, unsigned int tag_mask,</div><div class='del'>-		      const unsigned int *pgsz_order);</div><div class='ctx'> struct sk_buff *cxgb4_pktgl_to_skb(const struct pkt_gl *gl,</div><div class='ctx'> 				   unsigned int skb_len, unsigned int pull_len);</div><div class='ctx'> int cxgb4_sync_txq_pidx(struct net_device *dev, u16 qid, u16 pidx, u16 size);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.c b/drivers/net/ethernet/chelsio/cxgb4/l2t.c<br/>index 1a407d3c1d67..c02b4e9c06b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/l2t.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/l2t.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/l2t.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/l2t.c</a></div><div class='hunk'>@@ -59,7 +59,7 @@ struct l2t_data {</div><div class='ctx'> 	rwlock_t lock;</div><div class='ctx'> 	atomic_t nfree;             /* number of free entries */</div><div class='ctx'> 	struct l2t_entry *rover;    /* starting point for next allocation */</div><div class='del'>-	struct l2t_entry l2tab[0];  /* MUST BE LAST */</div><div class='add'>+	struct l2t_entry l2tab[] __counted_by(l2t_size);  /* MUST BE LAST */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int vlan_prio(const struct l2t_entry *e)</div><div class='hunk'>@@ -231,7 +231,7 @@ again:</div><div class='ctx'> 		if (e-&gt;state == L2T_STATE_STALE)</div><div class='ctx'> 			e-&gt;state = L2T_STATE_VALID;</div><div class='ctx'> 		spin_unlock_bh(&amp;e-&gt;lock);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case L2T_STATE_VALID:     /* fast-path, send the packet on */</div><div class='ctx'> 		return t4_ofld_send(adap, skb);</div><div class='ctx'> 	case L2T_STATE_RESOLVING:</div><div class='hunk'>@@ -351,15 +351,13 @@ exists:</div><div class='ctx'> static void _t4_l2e_free(struct l2t_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2t_data *d;</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	if (atomic_read(&amp;e-&gt;refcnt) == 0) {  /* hasn't been recycled */</div><div class='ctx'> 		if (e-&gt;neigh) {</div><div class='ctx'> 			neigh_release(e-&gt;neigh);</div><div class='ctx'> 			e-&gt;neigh = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		while ((skb = __skb_dequeue(&amp;e-&gt;arpq)) != NULL)</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+		__skb_queue_purge(&amp;e-&gt;arpq);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	d = container_of(e, struct l2t_data, l2tab[e-&gt;idx]);</div><div class='hunk'>@@ -370,7 +368,6 @@ static void _t4_l2e_free(struct l2t_entry *e)</div><div class='ctx'> static void t4_l2e_free(struct l2t_entry *e)</div><div class='ctx'> {</div><div class='ctx'> 	struct l2t_data *d;</div><div class='del'>-	struct sk_buff *skb;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;e-&gt;lock);</div><div class='ctx'> 	if (atomic_read(&amp;e-&gt;refcnt) == 0) {  /* hasn't been recycled */</div><div class='hunk'>@@ -378,8 +375,7 @@ static void t4_l2e_free(struct l2t_entry *e)</div><div class='ctx'> 			neigh_release(e-&gt;neigh);</div><div class='ctx'> 			e-&gt;neigh = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		while ((skb = __skb_dequeue(&amp;e-&gt;arpq)) != NULL)</div><div class='del'>-			kfree_skb(skb);</div><div class='add'>+		__skb_queue_purge(&amp;e-&gt;arpq);</div><div class='ctx'> 	}</div><div class='ctx'> 	spin_unlock_bh(&amp;e-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -507,40 +503,19 @@ u64 cxgb4_select_ntuple(struct net_device *dev,</div><div class='ctx'> EXPORT_SYMBOL(cxgb4_select_ntuple);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='del'>- * Called when address resolution fails for an L2T entry to handle packets</div><div class='del'>- * on the arpq head.  If a packet specifies a failure handler it is invoked,</div><div class='del'>- * otherwise the packet is sent to the device.</div><div class='del'>- */</div><div class='del'>-static void handle_failed_resolution(struct adapter *adap, struct l2t_entry *e)</div><div class='del'>-{</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-</div><div class='del'>-	while ((skb = __skb_dequeue(&amp;e-&gt;arpq)) != NULL) {</div><div class='del'>-		const struct l2t_skb_cb *cb = L2T_SKB_CB(skb);</div><div class='del'>-</div><div class='del'>-		spin_unlock(&amp;e-&gt;lock);</div><div class='del'>-		if (cb-&gt;arp_err_handler)</div><div class='del'>-			cb-&gt;arp_err_handler(cb-&gt;handle, skb);</div><div class='del'>-		else</div><div class='del'>-			t4_ofld_send(adap, skb);</div><div class='del'>-		spin_lock(&amp;e-&gt;lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='ctx'>  * Called when the host's neighbor layer makes a change to some entry that is</div><div class='ctx'>  * loaded into the HW L2 table.</div><div class='ctx'>  */</div><div class='ctx'> void t4_l2t_update(struct adapter *adap, struct neighbour *neigh)</div><div class='ctx'> {</div><div class='del'>-	struct l2t_entry *e;</div><div class='del'>-	struct sk_buff_head *arpq = NULL;</div><div class='del'>-	struct l2t_data *d = adap-&gt;l2t;</div><div class='ctx'> 	unsigned int addr_len = neigh-&gt;tbl-&gt;key_len;</div><div class='ctx'> 	u32 *addr = (u32 *) neigh-&gt;primary_key;</div><div class='del'>-	int ifidx = neigh-&gt;dev-&gt;ifindex;</div><div class='del'>-	int hash = addr_hash(d, addr, addr_len, ifidx);</div><div class='add'>+	int hash, ifidx = neigh-&gt;dev-&gt;ifindex;</div><div class='add'>+	struct sk_buff_head *arpq = NULL;</div><div class='add'>+	struct l2t_data *d = adap-&gt;l2t;</div><div class='add'>+	struct l2t_entry *e;</div><div class='ctx'> </div><div class='add'>+	hash = addr_hash(d, addr, addr_len, ifidx);</div><div class='ctx'> 	read_lock_bh(&amp;d-&gt;lock);</div><div class='ctx'> 	for (e = d-&gt;l2tab[hash].first; e; e = e-&gt;next)</div><div class='ctx'> 		if (!addreq(e, addr) &amp;&amp; e-&gt;ifindex == ifidx) {</div><div class='hunk'>@@ -573,8 +548,25 @@ void t4_l2t_update(struct adapter *adap, struct neighbour *neigh)</div><div class='ctx'> 			write_l2e(adap, e, 0);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (arpq)</div><div class='del'>-		handle_failed_resolution(adap, e);</div><div class='add'>+	if (arpq) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		/* Called when address resolution fails for an L2T</div><div class='add'>+		 * entry to handle packets on the arpq head. If a</div><div class='add'>+		 * packet specifies a failure handler it is invoked,</div><div class='add'>+		 * otherwise the packet is sent to the device.</div><div class='add'>+		 */</div><div class='add'>+		while ((skb = __skb_dequeue(&amp;e-&gt;arpq)) != NULL) {</div><div class='add'>+			const struct l2t_skb_cb *cb = L2T_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+			spin_unlock(&amp;e-&gt;lock);</div><div class='add'>+			if (cb-&gt;arp_err_handler)</div><div class='add'>+				cb-&gt;arp_err_handler(cb-&gt;handle, skb);</div><div class='add'>+			else</div><div class='add'>+				t4_ofld_send(adap, skb);</div><div class='add'>+			spin_lock(&amp;e-&gt;lock);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> 	spin_unlock_bh(&amp;e-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -616,24 +608,6 @@ struct l2t_entry *t4_l2t_alloc_switching(struct adapter *adap, u16 vlan,</div><div class='ctx'> 	return e;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * @dev: net_device pointer</div><div class='del'>- * @vlan: VLAN Id</div><div class='del'>- * @port: Associated port</div><div class='del'>- * @dmac: Destination MAC address to add to L2T</div><div class='del'>- * Returns pointer to the allocated l2t entry</div><div class='del'>- *</div><div class='del'>- * Allocates an L2T entry for use by switching rule of a filter</div><div class='del'>- */</div><div class='del'>-struct l2t_entry *cxgb4_l2t_alloc_switching(struct net_device *dev, u16 vlan,</div><div class='del'>-					    u8 port, u8 *dmac)</div><div class='del'>-{</div><div class='del'>-	struct adapter *adap = netdev2adap(dev);</div><div class='del'>-</div><div class='del'>-	return t4_l2t_alloc_switching(adap, vlan, port, dmac);</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cxgb4_l2t_alloc_switching);</div><div class='del'>-</div><div class='ctx'> struct l2t_data *t4_init_l2t(unsigned int l2t_start, unsigned int l2t_end)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int l2t_size;</div><div class='hunk'>@@ -682,8 +656,7 @@ static void *l2t_seq_start(struct seq_file *seq, loff_t *pos)</div><div class='ctx'> static void *l2t_seq_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> {</div><div class='ctx'> 	v = l2t_get_idx(seq, *pos);</div><div class='del'>-	if (v)</div><div class='del'>-		++*pos;</div><div class='add'>+	++(*pos);</div><div class='ctx'> 	return v;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -705,6 +678,17 @@ static char l2e_state(const struct l2t_entry *e)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+bool cxgb4_check_l2t_valid(struct l2t_entry *e)</div><div class='add'>+{</div><div class='add'>+	bool valid;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;e-&gt;lock);</div><div class='add'>+	valid = (e-&gt;state == L2T_STATE_VALID);</div><div class='add'>+	spin_unlock(&amp;e-&gt;lock);</div><div class='add'>+	return valid;</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cxgb4_check_l2t_valid);</div><div class='add'>+</div><div class='ctx'> static int l2t_seq_show(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> 	if (v == SEQ_START_TOKEN)</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/l2t.h b/drivers/net/ethernet/chelsio/cxgb4/l2t.h<br/>index 79665bd8f881..8aad7e9dee6d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/l2t.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/l2t.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/l2t.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/l2t.h</a></div><div class='hunk'>@@ -115,13 +115,12 @@ struct l2t_entry *cxgb4_l2t_get(struct l2t_data *d, struct neighbour *neigh,</div><div class='ctx'> 				unsigned int priority);</div><div class='ctx'> u64 cxgb4_select_ntuple(struct net_device *dev,</div><div class='ctx'> 			const struct l2t_entry *l2t);</div><div class='del'>-struct l2t_entry *cxgb4_l2t_alloc_switching(struct net_device *dev, u16 vlan,</div><div class='del'>-					    u8 port, u8 *dmac);</div><div class='ctx'> void t4_l2t_update(struct adapter *adap, struct neighbour *neigh);</div><div class='ctx'> struct l2t_entry *t4_l2t_alloc_switching(struct adapter *adap, u16 vlan,</div><div class='ctx'> 					 u8 port, u8 *dmac);</div><div class='ctx'> struct l2t_data *t4_init_l2t(unsigned int l2t_start, unsigned int l2t_end);</div><div class='ctx'> void do_l2t_write_rpl(struct adapter *p, const struct cpl_l2t_write_rpl *rpl);</div><div class='add'>+bool cxgb4_check_l2t_valid(struct l2t_entry *e);</div><div class='ctx'> </div><div class='ctx'> extern const struct file_operations t4_l2t_fops;</div><div class='ctx'> #endif  /* __CXGB4_L2T_H */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/sched.c b/drivers/net/ethernet/chelsio/cxgb4/sched.c<br/>index ba6c153ee45c..38a30aeee122 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/sched.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/sched.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/sched.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/sched.c</a></div><div class='hunk'>@@ -44,19 +44,21 @@ static int t4_sched_class_fw_cmd(struct port_info *pi,</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adap = pi-&gt;adapter;</div><div class='ctx'> 	struct sched_table *s = pi-&gt;sched_tbl;</div><div class='del'>-	struct sched_class *e;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	e = &amp;s-&gt;tab[p-&gt;u.params.class];</div><div class='ctx'> 	switch (op) {</div><div class='ctx'> 	case SCHED_FW_OP_ADD:</div><div class='add'>+	case SCHED_FW_OP_DEL:</div><div class='ctx'> 		err = t4_sched_params(adap, p-&gt;type,</div><div class='ctx'> 				      p-&gt;u.params.level, p-&gt;u.params.mode,</div><div class='ctx'> 				      p-&gt;u.params.rateunit,</div><div class='ctx'> 				      p-&gt;u.params.ratemode,</div><div class='ctx'> 				      p-&gt;u.params.channel, e-&gt;idx,</div><div class='ctx'> 				      p-&gt;u.params.minrate, p-&gt;u.params.maxrate,</div><div class='del'>-				      p-&gt;u.params.weight, p-&gt;u.params.pktsize);</div><div class='add'>+				      p-&gt;u.params.weight, p-&gt;u.params.pktsize,</div><div class='add'>+				      p-&gt;u.params.burstsize);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOTSUPP;</div><div class='hunk'>@@ -92,45 +94,69 @@ static int t4_sched_bind_unbind_op(struct port_info *pi, void *arg,</div><div class='ctx'> </div><div class='ctx'> 		pf = adap-&gt;pf;</div><div class='ctx'> 		vf = 0;</div><div class='add'>+</div><div class='add'>+		err = t4_set_params(adap, adap-&gt;mbox, pf, vf, 1,</div><div class='add'>+				    &amp;fw_param, &amp;fw_class);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case SCHED_FLOWC: {</div><div class='add'>+		struct sched_flowc_entry *fe;</div><div class='add'>+</div><div class='add'>+		fe = (struct sched_flowc_entry *)arg;</div><div class='add'>+</div><div class='add'>+		fw_class = bind ? fe-&gt;param.class : FW_SCHED_CLS_NONE;</div><div class='add'>+		err = cxgb4_ethofld_send_flowc(adap-&gt;port[pi-&gt;port_id],</div><div class='add'>+					       fe-&gt;param.tid, fw_class);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOTSUPP;</div><div class='del'>-		goto out;</div><div class='add'>+		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = t4_set_params(adap, adap-&gt;mbox, pf, vf, 1, &amp;fw_param, &amp;fw_class);</div><div class='del'>-</div><div class='del'>-out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sched_class *t4_sched_queue_lookup(struct port_info *pi,</div><div class='del'>-						 const unsigned int qid,</div><div class='del'>-						 int *index)</div><div class='add'>+static void *t4_sched_entry_lookup(struct port_info *pi,</div><div class='add'>+				   enum sched_bind_type type,</div><div class='add'>+				   const u32 val)</div><div class='ctx'> {</div><div class='ctx'> 	struct sched_table *s = pi-&gt;sched_tbl;</div><div class='del'>-	struct sched_class *e, *end;</div><div class='del'>-	struct sched_class *found = NULL;</div><div class='del'>-	int i;</div><div class='add'>+	struct ch_sched_class *e, *end;</div><div class='add'>+	void *found = NULL;</div><div class='ctx'> </div><div class='del'>-	/* Look for a class with matching bound queue parameters */</div><div class='add'>+	/* Look for an entry with matching @val */</div><div class='ctx'> 	end = &amp;s-&gt;tab[s-&gt;sched_size];</div><div class='ctx'> 	for (e = &amp;s-&gt;tab[0]; e != end; ++e) {</div><div class='del'>-		struct sched_queue_entry *qe;</div><div class='del'>-</div><div class='del'>-		i = 0;</div><div class='del'>-		if (e-&gt;state == SCHED_STATE_UNUSED)</div><div class='add'>+		if (e-&gt;state == SCHED_STATE_UNUSED ||</div><div class='add'>+		    e-&gt;bind_type != type)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(qe, &amp;e-&gt;queue_list, list) {</div><div class='del'>-			if (qe-&gt;cntxt_id == qid) {</div><div class='del'>-				found = e;</div><div class='del'>-				if (index)</div><div class='del'>-					*index = i;</div><div class='del'>-				break;</div><div class='add'>+		switch (type) {</div><div class='add'>+		case SCHED_QUEUE: {</div><div class='add'>+			struct sched_queue_entry *qe;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry(qe, &amp;e-&gt;entry_list, list) {</div><div class='add'>+				if (qe-&gt;cntxt_id == val) {</div><div class='add'>+					found = qe;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		case SCHED_FLOWC: {</div><div class='add'>+			struct sched_flowc_entry *fe;</div><div class='add'>+</div><div class='add'>+			list_for_each_entry(fe, &amp;e-&gt;entry_list, list) {</div><div class='add'>+				if (fe-&gt;param.tid == val) {</div><div class='add'>+					found = fe;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='ctx'> 			}</div><div class='del'>-			i++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		default:</div><div class='add'>+			return NULL;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (found)</div><div class='hunk'>@@ -140,54 +166,59 @@ static struct sched_class *t4_sched_queue_lookup(struct port_info *pi,</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int t4_sched_queue_unbind(struct port_info *pi, struct ch_sched_queue *p)</div><div class='add'>+struct ch_sched_class *cxgb4_sched_queue_lookup(struct net_device *dev,</div><div class='add'>+						struct ch_sched_queue *p)</div><div class='ctx'> {</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct sched_queue_entry *qe = NULL;</div><div class='ctx'> 	struct adapter *adap = pi-&gt;adapter;</div><div class='del'>-	struct sched_class *e;</div><div class='add'>+	struct sge_eth_txq *txq;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;queue &lt; 0 || p-&gt;queue &gt;= pi-&gt;nqsets)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	txq = &amp;adap-&gt;sge.ethtxq[pi-&gt;first_qset + p-&gt;queue];</div><div class='add'>+	qe = t4_sched_entry_lookup(pi, SCHED_QUEUE, txq-&gt;q.cntxt_id);</div><div class='add'>+	return qe ? &amp;pi-&gt;sched_tbl-&gt;tab[qe-&gt;param.class] : NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int t4_sched_queue_unbind(struct port_info *pi, struct ch_sched_queue *p)</div><div class='add'>+{</div><div class='ctx'> 	struct sched_queue_entry *qe = NULL;</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='ctx'> 	struct sge_eth_txq *txq;</div><div class='del'>-	unsigned int qid;</div><div class='del'>-	int index = -1;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (p-&gt;queue &lt; 0 || p-&gt;queue &gt;= pi-&gt;nqsets)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> </div><div class='ctx'> 	txq = &amp;adap-&gt;sge.ethtxq[pi-&gt;first_qset + p-&gt;queue];</div><div class='del'>-	qid = txq-&gt;q.cntxt_id;</div><div class='del'>-</div><div class='del'>-	/* Find the existing class that the queue is bound to */</div><div class='del'>-	e = t4_sched_queue_lookup(pi, qid, &amp;index);</div><div class='del'>-	if (e &amp;&amp; index &gt;= 0) {</div><div class='del'>-		int i = 0;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(qe, &amp;e-&gt;queue_list, list) {</div><div class='del'>-			if (i == index)</div><div class='del'>-				break;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='add'>+	/* Find the existing entry that the queue is bound to */</div><div class='add'>+	qe = t4_sched_entry_lookup(pi, SCHED_QUEUE, txq-&gt;q.cntxt_id);</div><div class='add'>+	if (qe) {</div><div class='ctx'> 		err = t4_sched_bind_unbind_op(pi, (void *)qe, SCHED_QUEUE,</div><div class='ctx'> 					      false);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='add'>+		e = &amp;pi-&gt;sched_tbl-&gt;tab[qe-&gt;param.class];</div><div class='ctx'> 		list_del(&amp;qe-&gt;list);</div><div class='ctx'> 		kvfree(qe);</div><div class='del'>-		if (atomic_dec_and_test(&amp;e-&gt;refcnt)) {</div><div class='del'>-			e-&gt;state = SCHED_STATE_UNUSED;</div><div class='del'>-			memset(&amp;e-&gt;info, 0, sizeof(e-&gt;info));</div><div class='del'>-		}</div><div class='add'>+		if (atomic_dec_and_test(&amp;e-&gt;refcnt))</div><div class='add'>+			cxgb4_sched_class_free(adap-&gt;port[pi-&gt;port_id], e-&gt;idx);</div><div class='ctx'> 	}</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int t4_sched_queue_bind(struct port_info *pi, struct ch_sched_queue *p)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adap = pi-&gt;adapter;</div><div class='ctx'> 	struct sched_table *s = pi-&gt;sched_tbl;</div><div class='del'>-	struct sched_class *e;</div><div class='ctx'> 	struct sched_queue_entry *qe = NULL;</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='ctx'> 	struct sge_eth_txq *txq;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='ctx'> 	unsigned int qid;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -207,7 +238,6 @@ static int t4_sched_queue_bind(struct port_info *pi, struct ch_sched_queue *p)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	/* Bind queue to specified class */</div><div class='del'>-	memset(qe, 0, sizeof(*qe));</div><div class='ctx'> 	qe-&gt;cntxt_id = qid;</div><div class='ctx'> 	memcpy(&amp;qe-&gt;param, p, sizeof(qe-&gt;param));</div><div class='ctx'> </div><div class='hunk'>@@ -216,7 +246,8 @@ static int t4_sched_queue_bind(struct port_info *pi, struct ch_sched_queue *p)</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;qe-&gt;list, &amp;e-&gt;queue_list);</div><div class='add'>+	list_add_tail(&amp;qe-&gt;list, &amp;e-&gt;entry_list);</div><div class='add'>+	e-&gt;bind_type = SCHED_QUEUE;</div><div class='ctx'> 	atomic_inc(&amp;e-&gt;refcnt);</div><div class='ctx'> 	return err;</div><div class='ctx'> </div><div class='hunk'>@@ -225,8 +256,73 @@ out_err:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int t4_sched_flowc_unbind(struct port_info *pi, struct ch_sched_flowc *p)</div><div class='add'>+{</div><div class='add'>+	struct sched_flowc_entry *fe = NULL;</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;tid &lt; 0 || p-&gt;tid &gt;= adap-&gt;tids.neotids)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	/* Find the existing entry that the flowc is bound to */</div><div class='add'>+	fe = t4_sched_entry_lookup(pi, SCHED_FLOWC, p-&gt;tid);</div><div class='add'>+	if (fe) {</div><div class='add'>+		err = t4_sched_bind_unbind_op(pi, (void *)fe, SCHED_FLOWC,</div><div class='add'>+					      false);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		e = &amp;pi-&gt;sched_tbl-&gt;tab[fe-&gt;param.class];</div><div class='add'>+		list_del(&amp;fe-&gt;list);</div><div class='add'>+		kvfree(fe);</div><div class='add'>+		if (atomic_dec_and_test(&amp;e-&gt;refcnt))</div><div class='add'>+			cxgb4_sched_class_free(adap-&gt;port[pi-&gt;port_id], e-&gt;idx);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int t4_sched_flowc_bind(struct port_info *pi, struct ch_sched_flowc *p)</div><div class='add'>+{</div><div class='add'>+	struct sched_table *s = pi-&gt;sched_tbl;</div><div class='add'>+	struct sched_flowc_entry *fe = NULL;</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;tid &lt; 0 || p-&gt;tid &gt;= adap-&gt;tids.neotids)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	fe = kvzalloc(sizeof(*fe), GFP_KERNEL);</div><div class='add'>+	if (!fe)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Unbind flowc from any existing class */</div><div class='add'>+	err = t4_sched_flowc_unbind(pi, p);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	/* Bind flowc to specified class */</div><div class='add'>+	memcpy(&amp;fe-&gt;param, p, sizeof(fe-&gt;param));</div><div class='add'>+</div><div class='add'>+	e = &amp;s-&gt;tab[fe-&gt;param.class];</div><div class='add'>+	err = t4_sched_bind_unbind_op(pi, (void *)fe, SCHED_FLOWC, true);</div><div class='add'>+	if (err)</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;fe-&gt;list, &amp;e-&gt;entry_list);</div><div class='add'>+	e-&gt;bind_type = SCHED_FLOWC;</div><div class='add'>+	atomic_inc(&amp;e-&gt;refcnt);</div><div class='add'>+	return err;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	kvfree(fe);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void t4_sched_class_unbind_all(struct port_info *pi,</div><div class='del'>-				      struct sched_class *e,</div><div class='add'>+				      struct ch_sched_class *e,</div><div class='ctx'> 				      enum sched_bind_type type)</div><div class='ctx'> {</div><div class='ctx'> 	if (!e)</div><div class='hunk'>@@ -236,10 +332,17 @@ static void t4_sched_class_unbind_all(struct port_info *pi,</div><div class='ctx'> 	case SCHED_QUEUE: {</div><div class='ctx'> 		struct sched_queue_entry *qe;</div><div class='ctx'> </div><div class='del'>-		list_for_each_entry(qe, &amp;e-&gt;queue_list, list)</div><div class='add'>+		list_for_each_entry(qe, &amp;e-&gt;entry_list, list)</div><div class='ctx'> 			t4_sched_queue_unbind(pi, &amp;qe-&gt;param);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SCHED_FLOWC: {</div><div class='add'>+		struct sched_flowc_entry *fe;</div><div class='add'>+</div><div class='add'>+		list_for_each_entry(fe, &amp;e-&gt;entry_list, list)</div><div class='add'>+			t4_sched_flowc_unbind(pi, &amp;fe-&gt;param);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -263,6 +366,15 @@ static int t4_sched_class_bind_unbind_op(struct port_info *pi, void *arg,</div><div class='ctx'> 			err = t4_sched_queue_unbind(pi, qe);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SCHED_FLOWC: {</div><div class='add'>+		struct ch_sched_flowc *fe = (struct ch_sched_flowc *)arg;</div><div class='add'>+</div><div class='add'>+		if (bind)</div><div class='add'>+			err = t4_sched_flowc_bind(pi, fe);</div><div class='add'>+		else</div><div class='add'>+			err = t4_sched_flowc_unbind(pi, fe);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -ENOTSUPP;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -300,6 +412,12 @@ int cxgb4_sched_class_bind(struct net_device *dev, void *arg,</div><div class='ctx'> 		class_id = qe-&gt;class;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SCHED_FLOWC: {</div><div class='add'>+		struct ch_sched_flowc *fe = (struct ch_sched_flowc *)arg;</div><div class='add'>+</div><div class='add'>+		class_id = fe-&gt;class;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -341,6 +459,12 @@ int cxgb4_sched_class_unbind(struct net_device *dev, void *arg,</div><div class='ctx'> 		class_id = qe-&gt;class;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='add'>+	case SCHED_FLOWC: {</div><div class='add'>+		struct ch_sched_flowc *fe = (struct ch_sched_flowc *)arg;</div><div class='add'>+</div><div class='add'>+		class_id = fe-&gt;class;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ENOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -352,12 +476,12 @@ int cxgb4_sched_class_unbind(struct net_device *dev, void *arg,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* If @p is NULL, fetch any available unused class */</div><div class='del'>-static struct sched_class *t4_sched_class_lookup(struct port_info *pi,</div><div class='del'>-						const struct ch_sched_params *p)</div><div class='add'>+static struct ch_sched_class *t4_sched_class_lookup(struct port_info *pi,</div><div class='add'>+						    const struct ch_sched_params *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct sched_table *s = pi-&gt;sched_tbl;</div><div class='del'>-	struct sched_class *e, *end;</div><div class='del'>-	struct sched_class *found = NULL;</div><div class='add'>+	struct ch_sched_class *found = NULL;</div><div class='add'>+	struct ch_sched_class *e, *end;</div><div class='ctx'> </div><div class='ctx'> 	if (!p) {</div><div class='ctx'> 		/* Get any available unused class */</div><div class='hunk'>@@ -398,10 +522,10 @@ static struct sched_class *t4_sched_class_lookup(struct port_info *pi,</div><div class='ctx'> 	return found;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct sched_class *t4_sched_class_alloc(struct port_info *pi,</div><div class='del'>-						struct ch_sched_params *p)</div><div class='add'>+static struct ch_sched_class *t4_sched_class_alloc(struct port_info *pi,</div><div class='add'>+						   struct ch_sched_params *p)</div><div class='ctx'> {</div><div class='del'>-	struct sched_class *e;</div><div class='add'>+	struct ch_sched_class *e = NULL;</div><div class='ctx'> 	u8 class_id;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -416,10 +540,13 @@ static struct sched_class *t4_sched_class_alloc(struct port_info *pi,</div><div class='ctx'> 	if (class_id != SCHED_CLS_NONE)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	/* See if there's an exisiting class with same</div><div class='del'>-	 * requested sched params</div><div class='add'>+	/* See if there's an exisiting class with same requested sched</div><div class='add'>+	 * params. Classes can only be shared among FLOWC types. For</div><div class='add'>+	 * other types, always request a new class.</div><div class='ctx'> 	 */</div><div class='del'>-	e = t4_sched_class_lookup(pi, p);</div><div class='add'>+	if (p-&gt;u.params.mode == SCHED_CLASS_MODE_FLOW)</div><div class='add'>+		e = t4_sched_class_lookup(pi, p);</div><div class='add'>+</div><div class='ctx'> 	if (!e) {</div><div class='ctx'> 		struct ch_sched_params np;</div><div class='ctx'> </div><div class='hunk'>@@ -452,8 +579,8 @@ static struct sched_class *t4_sched_class_alloc(struct port_info *pi,</div><div class='ctx'>  * scheduling class with matching @p is found, then the matching class is</div><div class='ctx'>  * returned.</div><div class='ctx'>  */</div><div class='del'>-struct sched_class *cxgb4_sched_class_alloc(struct net_device *dev,</div><div class='del'>-					    struct ch_sched_params *p)</div><div class='add'>+struct ch_sched_class *cxgb4_sched_class_alloc(struct net_device *dev,</div><div class='add'>+					       struct ch_sched_params *p)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev2pinfo(dev);</div><div class='ctx'> 	u8 class_id;</div><div class='hunk'>@@ -468,9 +595,57 @@ struct sched_class *cxgb4_sched_class_alloc(struct net_device *dev,</div><div class='ctx'> 	return t4_sched_class_alloc(pi, p);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void t4_sched_class_free(struct port_info *pi, struct sched_class *e)</div><div class='add'>+/**</div><div class='add'>+ * cxgb4_sched_class_free - free a scheduling class</div><div class='add'>+ * @dev: net_device pointer</div><div class='add'>+ * @classid: scheduling class id to free</div><div class='add'>+ *</div><div class='add'>+ * Frees a scheduling class if there are no users.</div><div class='add'>+ */</div><div class='add'>+void cxgb4_sched_class_free(struct net_device *dev, u8 classid)</div><div class='ctx'> {</div><div class='del'>-	t4_sched_class_unbind_all(pi, e, SCHED_QUEUE);</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct sched_table *s = pi-&gt;sched_tbl;</div><div class='add'>+	struct ch_sched_params p;</div><div class='add'>+	struct ch_sched_class *e;</div><div class='add'>+	u32 speed;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	e = &amp;s-&gt;tab[classid];</div><div class='add'>+	if (!atomic_read(&amp;e-&gt;refcnt) &amp;&amp; e-&gt;state != SCHED_STATE_UNUSED) {</div><div class='add'>+		/* Port based rate limiting needs explicit reset back</div><div class='add'>+		 * to max rate. But, we'll do explicit reset for all</div><div class='add'>+		 * types, instead of just port based type, to be on</div><div class='add'>+		 * the safer side.</div><div class='add'>+		 */</div><div class='add'>+		memcpy(&amp;p, &amp;e-&gt;info, sizeof(p));</div><div class='add'>+		/* Always reset mode to 0. Otherwise, FLOWC mode will</div><div class='add'>+		 * still be enabled even after resetting the traffic</div><div class='add'>+		 * class.</div><div class='add'>+		 */</div><div class='add'>+		p.u.params.mode = 0;</div><div class='add'>+		p.u.params.minrate = 0;</div><div class='add'>+		p.u.params.pktsize = 0;</div><div class='add'>+</div><div class='add'>+		ret = t4_get_link_params(pi, NULL, &amp;speed, NULL);</div><div class='add'>+		if (!ret)</div><div class='add'>+			p.u.params.maxrate = speed * 1000; /* Mbps to Kbps */</div><div class='add'>+		else</div><div class='add'>+			p.u.params.maxrate = SCHED_MAX_RATE_KBPS;</div><div class='add'>+</div><div class='add'>+		t4_sched_class_fw_cmd(pi, &amp;p, SCHED_FW_OP_DEL);</div><div class='add'>+</div><div class='add'>+		e-&gt;state = SCHED_STATE_UNUSED;</div><div class='add'>+		memset(&amp;e-&gt;info, 0, sizeof(e-&gt;info));</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void t4_sched_class_free(struct net_device *dev, struct ch_sched_class *e)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+</div><div class='add'>+	t4_sched_class_unbind_all(pi, e, e-&gt;bind_type);</div><div class='add'>+	cxgb4_sched_class_free(dev, e-&gt;idx);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> struct sched_table *t4_init_sched(unsigned int sched_size)</div><div class='hunk'>@@ -485,10 +660,10 @@ struct sched_table *t4_init_sched(unsigned int sched_size)</div><div class='ctx'> 	s-&gt;sched_size = sched_size;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; s-&gt;sched_size; i++) {</div><div class='del'>-		memset(&amp;s-&gt;tab[i], 0, sizeof(struct sched_class));</div><div class='add'>+		memset(&amp;s-&gt;tab[i], 0, sizeof(struct ch_sched_class));</div><div class='ctx'> 		s-&gt;tab[i].idx = i;</div><div class='ctx'> 		s-&gt;tab[i].state = SCHED_STATE_UNUSED;</div><div class='del'>-		INIT_LIST_HEAD(&amp;s-&gt;tab[i].queue_list);</div><div class='add'>+		INIT_LIST_HEAD(&amp;s-&gt;tab[i].entry_list);</div><div class='ctx'> 		atomic_set(&amp;s-&gt;tab[i].refcnt, 0);</div><div class='ctx'> 	}</div><div class='ctx'> 	return s;</div><div class='hunk'>@@ -507,11 +682,11 @@ void t4_cleanup_sched(struct adapter *adap)</div><div class='ctx'> 			continue;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; s-&gt;sched_size; i++) {</div><div class='del'>-			struct sched_class *e;</div><div class='add'>+			struct ch_sched_class *e;</div><div class='ctx'> </div><div class='ctx'> 			e = &amp;s-&gt;tab[i];</div><div class='ctx'> 			if (e-&gt;state == SCHED_STATE_ACTIVE)</div><div class='del'>-				t4_sched_class_free(pi, e);</div><div class='add'>+				t4_sched_class_free(adap-&gt;port[j], e);</div><div class='ctx'> 		}</div><div class='ctx'> 		kvfree(s);</div><div class='ctx'> 	}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/sched.h b/drivers/net/ethernet/chelsio/cxgb4/sched.h<br/>index 168fb4ce3759..4d3b5a757536 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/sched.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/sched.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/sched.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/sched.h</a></div><div class='hunk'>@@ -52,10 +52,12 @@ enum {</div><div class='ctx'> </div><div class='ctx'> enum sched_fw_ops {</div><div class='ctx'> 	SCHED_FW_OP_ADD,</div><div class='add'>+	SCHED_FW_OP_DEL,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum sched_bind_type {</div><div class='ctx'> 	SCHED_QUEUE,</div><div class='add'>+	SCHED_FLOWC,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sched_queue_entry {</div><div class='hunk'>@@ -64,17 +66,23 @@ struct sched_queue_entry {</div><div class='ctx'> 	struct ch_sched_queue param;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct sched_class {</div><div class='add'>+struct sched_flowc_entry {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct ch_sched_flowc param;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ch_sched_class {</div><div class='ctx'> 	u8 state;</div><div class='ctx'> 	u8 idx;</div><div class='ctx'> 	struct ch_sched_params info;</div><div class='del'>-	struct list_head queue_list;</div><div class='add'>+	enum sched_bind_type bind_type;</div><div class='add'>+	struct list_head entry_list;</div><div class='ctx'> 	atomic_t refcnt;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct sched_table {      /* per port scheduling table */</div><div class='ctx'> 	u8 sched_size;</div><div class='del'>-	struct sched_class tab[0];</div><div class='add'>+	struct ch_sched_class tab[] __counted_by(sched_size);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline bool can_sched(struct net_device *dev)</div><div class='hunk'>@@ -95,13 +103,16 @@ static inline bool valid_class_id(struct net_device *dev, u8 class_id)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct ch_sched_class *cxgb4_sched_queue_lookup(struct net_device *dev,</div><div class='add'>+						struct ch_sched_queue *p);</div><div class='ctx'> int cxgb4_sched_class_bind(struct net_device *dev, void *arg,</div><div class='ctx'> 			   enum sched_bind_type type);</div><div class='ctx'> int cxgb4_sched_class_unbind(struct net_device *dev, void *arg,</div><div class='ctx'> 			     enum sched_bind_type type);</div><div class='ctx'> </div><div class='del'>-struct sched_class *cxgb4_sched_class_alloc(struct net_device *dev,</div><div class='del'>-					    struct ch_sched_params *p);</div><div class='add'>+struct ch_sched_class *cxgb4_sched_class_alloc(struct net_device *dev,</div><div class='add'>+					       struct ch_sched_params *p);</div><div class='add'>+void cxgb4_sched_class_free(struct net_device *dev, u8 classid);</div><div class='ctx'> </div><div class='ctx'> struct sched_table *t4_init_sched(unsigned int size);</div><div class='ctx'> void t4_cleanup_sched(struct adapter *adap);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c<br/>index b3da81e90132..9fccb8ea9bcd 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/sge.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/sge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/sge.c</a></div><div class='hunk'>@@ -55,6 +55,8 @@</div><div class='ctx'> #include "t4fw_api.h"</div><div class='ctx'> #include "cxgb4_ptp.h"</div><div class='ctx'> #include "cxgb4_uld.h"</div><div class='add'>+#include "cxgb4_tc_mqprio.h"</div><div class='add'>+#include "sched.h"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Rx buffer size.  We use largish buffers if possible but settle for single</div><div class='hunk'>@@ -161,7 +163,7 @@ static inline unsigned int fl_mtu_bufsize(struct adapter *adapter,</div><div class='ctx'>  * for DMA, but this is of course never sent to the hardware and is only used</div><div class='ctx'>  * to prevent double unmappings.  All of the above requires that the Free List</div><div class='ctx'>  * Buffers which we allocate have the bottom 5 bits free (0) -- i.e. are</div><div class='del'>- * 32-byte or or a power of 2 greater in alignment.  Since the SGE's minimal</div><div class='add'>+ * 32-byte or a power of 2 greater in alignment.  Since the SGE's minimal</div><div class='ctx'>  * Free List Buffer alignment is 32 bytes, this works out for us ...</div><div class='ctx'>  */</div><div class='ctx'> enum {</div><div class='hunk'>@@ -269,7 +271,6 @@ out_err:</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxgb4_map_skb);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_NEED_DMA_MAP_STATE</div><div class='ctx'> static void unmap_skb(struct device *dev, const struct sk_buff *skb,</div><div class='ctx'> 		      const dma_addr_t *addr)</div><div class='ctx'> {</div><div class='hunk'>@@ -284,6 +285,7 @@ static void unmap_skb(struct device *dev, const struct sk_buff *skb,</div><div class='ctx'> 		dma_unmap_page(dev, *addr++, skb_frag_size(fp), DMA_TO_DEVICE);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_NEED_DMA_MAP_STATE</div><div class='ctx'> /**</div><div class='ctx'>  *	deferred_unmap_destructor - unmap a packet when it is freed</div><div class='ctx'>  *	@skb: the packet</div><div class='hunk'>@@ -298,68 +300,9 @@ static void deferred_unmap_destructor(struct sk_buff *skb)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static void unmap_sgl(struct device *dev, const struct sk_buff *skb,</div><div class='del'>-		      const struct ulptx_sgl *sgl, const struct sge_txq *q)</div><div class='del'>-{</div><div class='del'>-	const struct ulptx_sge_pair *p;</div><div class='del'>-	unsigned int nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-</div><div class='del'>-	if (likely(skb_headlen(skb)))</div><div class='del'>-		dma_unmap_single(dev, be64_to_cpu(sgl-&gt;addr0), ntohl(sgl-&gt;len0),</div><div class='del'>-				 DMA_TO_DEVICE);</div><div class='del'>-	else {</div><div class='del'>-		dma_unmap_page(dev, be64_to_cpu(sgl-&gt;addr0), ntohl(sgl-&gt;len0),</div><div class='del'>-			       DMA_TO_DEVICE);</div><div class='del'>-		nfrags--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * the complexity below is because of the possibility of a wrap-around</div><div class='del'>-	 * in the middle of an SGL</div><div class='del'>-	 */</div><div class='del'>-	for (p = sgl-&gt;sge; nfrags &gt;= 2; nfrags -= 2) {</div><div class='del'>-		if (likely((u8 *)(p + 1) &lt;= (u8 *)q-&gt;stat)) {</div><div class='del'>-unmap:			dma_unmap_page(dev, be64_to_cpu(p-&gt;addr[0]),</div><div class='del'>-				       ntohl(p-&gt;len[0]), DMA_TO_DEVICE);</div><div class='del'>-			dma_unmap_page(dev, be64_to_cpu(p-&gt;addr[1]),</div><div class='del'>-				       ntohl(p-&gt;len[1]), DMA_TO_DEVICE);</div><div class='del'>-			p++;</div><div class='del'>-		} else if ((u8 *)p == (u8 *)q-&gt;stat) {</div><div class='del'>-			p = (const struct ulptx_sge_pair *)q-&gt;desc;</div><div class='del'>-			goto unmap;</div><div class='del'>-		} else if ((u8 *)p + 8 == (u8 *)q-&gt;stat) {</div><div class='del'>-			const __be64 *addr = (const __be64 *)q-&gt;desc;</div><div class='del'>-</div><div class='del'>-			dma_unmap_page(dev, be64_to_cpu(addr[0]),</div><div class='del'>-				       ntohl(p-&gt;len[0]), DMA_TO_DEVICE);</div><div class='del'>-			dma_unmap_page(dev, be64_to_cpu(addr[1]),</div><div class='del'>-				       ntohl(p-&gt;len[1]), DMA_TO_DEVICE);</div><div class='del'>-			p = (const struct ulptx_sge_pair *)&amp;addr[2];</div><div class='del'>-		} else {</div><div class='del'>-			const __be64 *addr = (const __be64 *)q-&gt;desc;</div><div class='del'>-</div><div class='del'>-			dma_unmap_page(dev, be64_to_cpu(p-&gt;addr[0]),</div><div class='del'>-				       ntohl(p-&gt;len[0]), DMA_TO_DEVICE);</div><div class='del'>-			dma_unmap_page(dev, be64_to_cpu(addr[0]),</div><div class='del'>-				       ntohl(p-&gt;len[1]), DMA_TO_DEVICE);</div><div class='del'>-			p = (const struct ulptx_sge_pair *)&amp;addr[1];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (nfrags) {</div><div class='del'>-		__be64 addr;</div><div class='del'>-</div><div class='del'>-		if ((u8 *)p == (u8 *)q-&gt;stat)</div><div class='del'>-			p = (const struct ulptx_sge_pair *)q-&gt;desc;</div><div class='del'>-		addr = (u8 *)p + 16 &lt;= (u8 *)q-&gt;stat ? p-&gt;addr[0] :</div><div class='del'>-						       *(const __be64 *)q-&gt;desc;</div><div class='del'>-		dma_unmap_page(dev, be64_to_cpu(addr), ntohl(p-&gt;len[0]),</div><div class='del'>-			       DMA_TO_DEVICE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> /**</div><div class='ctx'>  *	free_tx_desc - reclaims Tx descriptors and their buffers</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@q: the Tx queue to reclaim descriptors from</div><div class='ctx'>  *	@n: the number of descriptors to reclaim</div><div class='ctx'>  *	@unmap: whether the buffers should be unmapped for DMA</div><div class='hunk'>@@ -370,15 +313,16 @@ unmap:			dma_unmap_page(dev, be64_to_cpu(p-&gt;addr[0]),</div><div class='ctx'> void free_tx_desc(struct adapter *adap, struct sge_txq *q,</div><div class='ctx'> 		  unsigned int n, bool unmap)</div><div class='ctx'> {</div><div class='del'>-	struct tx_sw_desc *d;</div><div class='ctx'> 	unsigned int cidx = q-&gt;cidx;</div><div class='del'>-	struct device *dev = adap-&gt;pdev_dev;</div><div class='add'>+	struct tx_sw_desc *d;</div><div class='ctx'> </div><div class='ctx'> 	d = &amp;q-&gt;sdesc[cidx];</div><div class='ctx'> 	while (n--) {</div><div class='ctx'> 		if (d-&gt;skb) {                       /* an SGL is present */</div><div class='del'>-			if (unmap)</div><div class='del'>-				unmap_sgl(dev, d-&gt;skb, d-&gt;sgl, q);</div><div class='add'>+			if (unmap &amp;&amp; d-&gt;addr[0]) {</div><div class='add'>+				unmap_skb(adap-&gt;pdev_dev, d-&gt;skb, d-&gt;addr);</div><div class='add'>+				memset(d-&gt;addr, 0, sizeof(d-&gt;addr));</div><div class='add'>+			}</div><div class='ctx'> 			dev_consume_skb_any(d-&gt;skb);</div><div class='ctx'> 			d-&gt;skb = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -499,7 +443,7 @@ static void free_rx_bufs(struct adapter *adap, struct sge_fl *q, int n)</div><div class='ctx'> 		if (is_buf_mapped(d))</div><div class='ctx'> 			dma_unmap_page(adap-&gt;pdev_dev, get_buf_addr(d),</div><div class='ctx'> 				       get_buf_size(adap, d),</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 		put_page(d-&gt;page);</div><div class='ctx'> 		d-&gt;page = NULL;</div><div class='ctx'> 		if (++q-&gt;cidx == q-&gt;size)</div><div class='hunk'>@@ -525,7 +469,7 @@ static void unmap_rx_buf(struct adapter *adap, struct sge_fl *q)</div><div class='ctx'> </div><div class='ctx'> 	if (is_buf_mapped(d))</div><div class='ctx'> 		dma_unmap_page(adap-&gt;pdev_dev, get_buf_addr(d),</div><div class='del'>-			       get_buf_size(adap, d), PCI_DMA_FROMDEVICE);</div><div class='add'>+			       get_buf_size(adap, d), DMA_FROM_DEVICE);</div><div class='ctx'> 	d-&gt;page = NULL;</div><div class='ctx'> 	if (++q-&gt;cidx == q-&gt;size)</div><div class='ctx'> 		q-&gt;cidx = 0;</div><div class='hunk'>@@ -622,7 +566,7 @@ static unsigned int refill_fl(struct adapter *adap, struct sge_fl *q, int n,</div><div class='ctx'> </div><div class='ctx'> 		mapping = dma_map_page(adap-&gt;pdev_dev, pg, 0,</div><div class='ctx'> 				       PAGE_SIZE &lt;&lt; s-&gt;fl_pg_order,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(adap-&gt;pdev_dev, mapping))) {</div><div class='ctx'> 			__free_pages(pg, s-&gt;fl_pg_order);</div><div class='ctx'> 			q-&gt;mapping_err++;</div><div class='hunk'>@@ -652,7 +596,7 @@ alloc_small_pages:</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		mapping = dma_map_page(adap-&gt;pdev_dev, pg, 0, PAGE_SIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(adap-&gt;pdev_dev, mapping))) {</div><div class='ctx'> 			put_page(pg);</div><div class='ctx'> 			q-&gt;mapping_err++;</div><div class='hunk'>@@ -778,6 +722,7 @@ static inline unsigned int flits_to_desc(unsigned int n)</div><div class='ctx'> /**</div><div class='ctx'>  *	is_eth_imm - can an Ethernet packet be sent as immediate data?</div><div class='ctx'>  *	@skb: the packet</div><div class='add'>+ *	@chip_ver: chip version</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns whether an Ethernet packet is small enough to fit as</div><div class='ctx'>  *	immediate data. Return value corresponds to headroom required.</div><div class='hunk'>@@ -790,6 +735,8 @@ static inline int is_eth_imm(const struct sk_buff *skb, unsigned int chip_ver)</div><div class='ctx'> 	    chip_ver &gt; CHELSIO_T5) {</div><div class='ctx'> 		hdrlen = sizeof(struct cpl_tx_tnl_lso);</div><div class='ctx'> 		hdrlen += sizeof(struct cpl_tx_pkt_core);</div><div class='add'>+	} else if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4) {</div><div class='add'>+		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		hdrlen = skb_shinfo(skb)-&gt;gso_size ?</div><div class='ctx'> 			 sizeof(struct cpl_tx_pkt_lso_core) : 0;</div><div class='hunk'>@@ -803,6 +750,7 @@ static inline int is_eth_imm(const struct sk_buff *skb, unsigned int chip_ver)</div><div class='ctx'> /**</div><div class='ctx'>  *	calc_tx_flits - calculate the number of flits for a packet Tx WR</div><div class='ctx'>  *	@skb: the packet</div><div class='add'>+ *	@chip_ver: chip version</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns the number of flits needed for a Tx WR for the given Ethernet</div><div class='ctx'>  *	packet, including the needed WR and CPL headers.</div><div class='hunk'>@@ -831,12 +779,20 @@ static inline unsigned int calc_tx_flits(const struct sk_buff *skb,</div><div class='ctx'> 	 */</div><div class='ctx'> 	flits = sgl_len(skb_shinfo(skb)-&gt;nr_frags + 1);</div><div class='ctx'> 	if (skb_shinfo(skb)-&gt;gso_size) {</div><div class='del'>-		if (skb-&gt;encapsulation &amp;&amp; chip_ver &gt; CHELSIO_T5)</div><div class='add'>+		if (skb-&gt;encapsulation &amp;&amp; chip_ver &gt; CHELSIO_T5) {</div><div class='ctx'> 			hdrlen = sizeof(struct fw_eth_tx_pkt_wr) +</div><div class='ctx'> 				 sizeof(struct cpl_tx_tnl_lso);</div><div class='del'>-		else</div><div class='add'>+		} else if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4) {</div><div class='add'>+			u32 pkt_hdrlen;</div><div class='add'>+</div><div class='add'>+			pkt_hdrlen = eth_get_headlen(skb-&gt;dev, skb-&gt;data,</div><div class='add'>+						     skb_headlen(skb));</div><div class='add'>+			hdrlen = sizeof(struct fw_eth_tx_eo_wr) +</div><div class='add'>+				 round_up(pkt_hdrlen, 16);</div><div class='add'>+		} else {</div><div class='ctx'> 			hdrlen = sizeof(struct fw_eth_tx_pkt_wr) +</div><div class='ctx'> 				 sizeof(struct cpl_tx_pkt_lso_core);</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		hdrlen += sizeof(struct cpl_tx_pkt_core);</div><div class='ctx'> 		flits += (hdrlen / sizeof(__be64));</div><div class='hunk'>@@ -848,19 +804,6 @@ static inline unsigned int calc_tx_flits(const struct sk_buff *skb,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	calc_tx_descs - calculate the number of Tx descriptors for a packet</div><div class='del'>- *	@skb: the packet</div><div class='del'>- *</div><div class='del'>- *	Returns the number of Tx descriptors needed for the given Ethernet</div><div class='del'>- *	packet, including the needed WR and CPL headers.</div><div class='del'>- */</div><div class='del'>-static inline unsigned int calc_tx_descs(const struct sk_buff *skb,</div><div class='del'>-					 unsigned int chip_ver)</div><div class='del'>-{</div><div class='del'>-	return flits_to_desc(calc_tx_flits(skb, chip_ver));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='ctx'>  *	cxgb4_write_sgl - populate a scatter/gather list for a packet</div><div class='ctx'>  *	@skb: the packet</div><div class='ctx'>  *	@q: the Tx queue we are writing into</div><div class='hunk'>@@ -933,6 +876,114 @@ void cxgb4_write_sgl(const struct sk_buff *skb, struct sge_txq *q,</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxgb4_write_sgl);</div><div class='ctx'> </div><div class='add'>+/*	cxgb4_write_partial_sgl - populate SGL for partial packet</div><div class='add'>+ *	@skb: the packet</div><div class='add'>+ *	@q: the Tx queue we are writing into</div><div class='add'>+ *	@sgl: starting location for writing the SGL</div><div class='add'>+ *	@end: points right after the end of the SGL</div><div class='add'>+ *	@addr: the list of bus addresses for the SGL elements</div><div class='add'>+ *	@start: start offset in the SKB where partial data starts</div><div class='add'>+ *	@len: length of data from @start to send out</div><div class='add'>+ *</div><div class='add'>+ *	This API will handle sending out partial data of a skb if required.</div><div class='add'>+ *	Unlike cxgb4_write_sgl, @start can be any offset into the skb data,</div><div class='add'>+ *	and @len will decide how much data after @start offset to send out.</div><div class='add'>+ */</div><div class='add'>+void cxgb4_write_partial_sgl(const struct sk_buff *skb, struct sge_txq *q,</div><div class='add'>+			     struct ulptx_sgl *sgl, u64 *end,</div><div class='add'>+			     const dma_addr_t *addr, u32 start, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct ulptx_sge_pair buf[MAX_SKB_FRAGS / 2 + 1] = {0}, *to;</div><div class='add'>+	u32 frag_size, skb_linear_data_len = skb_headlen(skb);</div><div class='add'>+	struct skb_shared_info *si = skb_shinfo(skb);</div><div class='add'>+	u8 i = 0, frag_idx = 0, nfrags = 0;</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+	/* Fill the first SGL either from linear data or from partial</div><div class='add'>+	 * frag based on @start.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(start &lt; skb_linear_data_len)) {</div><div class='add'>+		frag_size = min(len, skb_linear_data_len - start);</div><div class='add'>+		sgl-&gt;len0 = htonl(frag_size);</div><div class='add'>+		sgl-&gt;addr0 = cpu_to_be64(addr[0] + start);</div><div class='add'>+		len -= frag_size;</div><div class='add'>+		nfrags++;</div><div class='add'>+	} else {</div><div class='add'>+		start -= skb_linear_data_len;</div><div class='add'>+		frag = &amp;si-&gt;frags[frag_idx];</div><div class='add'>+		frag_size = skb_frag_size(frag);</div><div class='add'>+		/* find the first frag */</div><div class='add'>+		while (start &gt;= frag_size) {</div><div class='add'>+			start -= frag_size;</div><div class='add'>+			frag_idx++;</div><div class='add'>+			frag = &amp;si-&gt;frags[frag_idx];</div><div class='add'>+			frag_size = skb_frag_size(frag);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		frag_size = min(len, skb_frag_size(frag) - start);</div><div class='add'>+		sgl-&gt;len0 = cpu_to_be32(frag_size);</div><div class='add'>+		sgl-&gt;addr0 = cpu_to_be64(addr[frag_idx + 1] + start);</div><div class='add'>+		len -= frag_size;</div><div class='add'>+		nfrags++;</div><div class='add'>+		frag_idx++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If the entire partial data fit in one SGL, then send it out</div><div class='add'>+	 * now.</div><div class='add'>+	 */</div><div class='add'>+	if (!len)</div><div class='add'>+		goto done;</div><div class='add'>+</div><div class='add'>+	/* Most of the complexity below deals with the possibility we hit the</div><div class='add'>+	 * end of the queue in the middle of writing the SGL.  For this case</div><div class='add'>+	 * only we create the SGL in a temporary buffer and then copy it.</div><div class='add'>+	 */</div><div class='add'>+	to = (u8 *)end &gt; (u8 *)q-&gt;stat ? buf : sgl-&gt;sge;</div><div class='add'>+</div><div class='add'>+	/* If the skb couldn't fit in first SGL completely, fill the</div><div class='add'>+	 * rest of the frags in subsequent SGLs. Note that each SGL</div><div class='add'>+	 * pair can store 2 frags.</div><div class='add'>+	 */</div><div class='add'>+	while (len) {</div><div class='add'>+		frag_size = min(len, skb_frag_size(&amp;si-&gt;frags[frag_idx]));</div><div class='add'>+		to-&gt;len[i &amp; 1] = cpu_to_be32(frag_size);</div><div class='add'>+		to-&gt;addr[i &amp; 1] = cpu_to_be64(addr[frag_idx + 1]);</div><div class='add'>+		if (i &amp;&amp; (i &amp; 1))</div><div class='add'>+			to++;</div><div class='add'>+		nfrags++;</div><div class='add'>+		frag_idx++;</div><div class='add'>+		i++;</div><div class='add'>+		len -= frag_size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If we ended in an odd boundary, then set the second SGL's</div><div class='add'>+	 * length in the pair to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (i &amp; 1)</div><div class='add'>+		to-&gt;len[1] = cpu_to_be32(0);</div><div class='add'>+</div><div class='add'>+	/* Copy from temporary buffer to Tx ring, in case we hit the</div><div class='add'>+	 * end of the queue in the middle of writing the SGL.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely((u8 *)end &gt; (u8 *)q-&gt;stat)) {</div><div class='add'>+		u32 part0 = (u8 *)q-&gt;stat - (u8 *)sgl-&gt;sge, part1;</div><div class='add'>+</div><div class='add'>+		if (likely(part0))</div><div class='add'>+			memcpy(sgl-&gt;sge, buf, part0);</div><div class='add'>+		part1 = (u8 *)end - (u8 *)q-&gt;stat;</div><div class='add'>+		memcpy(q-&gt;desc, (u8 *)buf + part0, part1);</div><div class='add'>+		end = (void *)q-&gt;desc + part1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* 0-pad to multiple of 16 */</div><div class='add'>+	if ((uintptr_t)end &amp; 8)</div><div class='add'>+		*end = 0;</div><div class='add'>+done:</div><div class='add'>+	sgl-&gt;cmd_nsge = htonl(ULPTX_CMD_V(ULP_TX_SC_DSGL) |</div><div class='add'>+			ULPTX_NSGE_V(nfrags));</div><div class='add'>+}</div><div class='add'>+EXPORT_SYMBOL(cxgb4_write_partial_sgl);</div><div class='add'>+</div><div class='ctx'> /* This function copies 64 byte coalesced work request to</div><div class='ctx'>  * memory mapped BAR2 space. For coalesced WR SGE fetches</div><div class='ctx'>  * data from the FIFO instead of from Host.</div><div class='hunk'>@@ -1309,6 +1360,35 @@ static inline void t6_fill_tnl_lso(struct sk_buff *skb,</div><div class='ctx'> 	tnl_lso-&gt;EthLenOffset_Size = htonl(CPL_TX_TNL_LSO_SIZE_V(skb-&gt;len));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline void *write_tso_wr(struct adapter *adap, struct sk_buff *skb,</div><div class='add'>+				 struct cpl_tx_pkt_lso_core *lso)</div><div class='add'>+{</div><div class='add'>+	int eth_xtra_len = skb_network_offset(skb) - ETH_HLEN;</div><div class='add'>+	int l3hdr_len = skb_network_header_len(skb);</div><div class='add'>+	const struct skb_shared_info *ssi;</div><div class='add'>+	bool ipv6 = false;</div><div class='add'>+</div><div class='add'>+	ssi = skb_shinfo(skb);</div><div class='add'>+	if (ssi-&gt;gso_type &amp; SKB_GSO_TCPV6)</div><div class='add'>+		ipv6 = true;</div><div class='add'>+</div><div class='add'>+	lso-&gt;lso_ctrl = htonl(LSO_OPCODE_V(CPL_TX_PKT_LSO) |</div><div class='add'>+			      LSO_FIRST_SLICE_F | LSO_LAST_SLICE_F |</div><div class='add'>+			      LSO_IPV6_V(ipv6) |</div><div class='add'>+			      LSO_ETHHDR_LEN_V(eth_xtra_len / 4) |</div><div class='add'>+			      LSO_IPHDR_LEN_V(l3hdr_len / 4) |</div><div class='add'>+			      LSO_TCPHDR_LEN_V(tcp_hdr(skb)-&gt;doff));</div><div class='add'>+	lso-&gt;ipid_ofst = htons(0);</div><div class='add'>+	lso-&gt;mss = htons(ssi-&gt;gso_size);</div><div class='add'>+	lso-&gt;seqno_offset = htonl(0);</div><div class='add'>+	if (is_t4(adap-&gt;params.chip))</div><div class='add'>+		lso-&gt;len = htonl(skb-&gt;len);</div><div class='add'>+	else</div><div class='add'>+		lso-&gt;len = htonl(LSO_T5_XFER_SIZE_V(skb-&gt;len));</div><div class='add'>+</div><div class='add'>+	return (void *)(lso + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	t4_sge_eth_txq_egress_update - handle Ethernet TX Queue update</div><div class='ctx'>  *	@adap: the adapter</div><div class='hunk'>@@ -1324,8 +1404,9 @@ static inline void t6_fill_tnl_lso(struct sk_buff *skb,</div><div class='ctx'> int t4_sge_eth_txq_egress_update(struct adapter *adap, struct sge_eth_txq *eq,</div><div class='ctx'> 				 int maxreclaim)</div><div class='ctx'> {</div><div class='add'>+	unsigned int reclaimed, hw_cidx;</div><div class='ctx'> 	struct sge_txq *q = &amp;eq-&gt;q;</div><div class='del'>-	unsigned int reclaimed;</div><div class='add'>+	int hw_in_use;</div><div class='ctx'> </div><div class='ctx'> 	if (!q-&gt;in_use || !__netif_tx_trylock(eq-&gt;txq))</div><div class='ctx'> 		return 0;</div><div class='hunk'>@@ -1333,12 +1414,17 @@ int t4_sge_eth_txq_egress_update(struct adapter *adap, struct sge_eth_txq *eq,</div><div class='ctx'> 	/* Reclaim pending completed TX Descriptors. */</div><div class='ctx'> 	reclaimed = reclaim_completed_tx(adap, &amp;eq-&gt;q, maxreclaim, true);</div><div class='ctx'> </div><div class='add'>+	hw_cidx = ntohs(READ_ONCE(q-&gt;stat-&gt;cidx));</div><div class='add'>+	hw_in_use = q-&gt;pidx - hw_cidx;</div><div class='add'>+	if (hw_in_use &lt; 0)</div><div class='add'>+		hw_in_use += q-&gt;size;</div><div class='add'>+</div><div class='ctx'> 	/* If the TX Queue is currently stopped and there's now more than half</div><div class='ctx'> 	 * the queue available, restart it.  Otherwise bail out since the rest</div><div class='ctx'> 	 * of what we want do here is with the possibility of shipping any</div><div class='ctx'> 	 * currently buffered Coalesced TX Work Request.</div><div class='ctx'> 	 */</div><div class='del'>-	if (netif_tx_queue_stopped(eq-&gt;txq) &amp;&amp; txq_avail(q) &gt; (q-&gt;size / 2)) {</div><div class='add'>+	if (netif_tx_queue_stopped(eq-&gt;txq) &amp;&amp; hw_in_use &lt; (q-&gt;size / 2)) {</div><div class='ctx'> 		netif_tx_wake_queue(eq-&gt;txq);</div><div class='ctx'> 		eq-&gt;q.restarts++;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1347,6 +1433,50 @@ int t4_sge_eth_txq_egress_update(struct adapter *adap, struct sge_eth_txq *eq,</div><div class='ctx'> 	return reclaimed;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline int cxgb4_validate_skb(struct sk_buff *skb,</div><div class='add'>+				     struct net_device *dev,</div><div class='add'>+				     u32 min_pkt_len)</div><div class='add'>+{</div><div class='add'>+	u32 max_pkt_len;</div><div class='add'>+</div><div class='add'>+	/* The chip min packet length is 10 octets but some firmware</div><div class='add'>+	 * commands have a minimum packet length requirement. So, play</div><div class='add'>+	 * safe and reject anything shorter than @min_pkt_len.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(skb-&gt;len &lt; min_pkt_len))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Discard the packet if the length is greater than mtu */</div><div class='add'>+	max_pkt_len = ETH_HLEN + dev-&gt;mtu;</div><div class='add'>+</div><div class='add'>+	if (skb_vlan_tagged(skb))</div><div class='add'>+		max_pkt_len += VLAN_HLEN;</div><div class='add'>+</div><div class='add'>+	if (!skb_shinfo(skb)-&gt;gso_size &amp;&amp; (unlikely(skb-&gt;len &gt; max_pkt_len)))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *write_eo_udp_wr(struct sk_buff *skb, struct fw_eth_tx_eo_wr *wr,</div><div class='add'>+			     u32 hdr_len)</div><div class='add'>+{</div><div class='add'>+	wr-&gt;u.udpseg.type = FW_ETH_TX_EO_TYPE_UDPSEG;</div><div class='add'>+	wr-&gt;u.udpseg.ethlen = skb_network_offset(skb);</div><div class='add'>+	wr-&gt;u.udpseg.iplen = cpu_to_be16(skb_network_header_len(skb));</div><div class='add'>+	wr-&gt;u.udpseg.udplen = sizeof(struct udphdr);</div><div class='add'>+	wr-&gt;u.udpseg.rtplen = 0;</div><div class='add'>+	wr-&gt;u.udpseg.r4 = 0;</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_size)</div><div class='add'>+		wr-&gt;u.udpseg.mss = cpu_to_be16(skb_shinfo(skb)-&gt;gso_size);</div><div class='add'>+	else</div><div class='add'>+		wr-&gt;u.udpseg.mss = cpu_to_be16(skb-&gt;len - hdr_len);</div><div class='add'>+	wr-&gt;u.udpseg.schedpktsize = wr-&gt;u.udpseg.mss;</div><div class='add'>+	wr-&gt;u.udpseg.plen = cpu_to_be32(skb-&gt;len - hdr_len);</div><div class='add'>+</div><div class='add'>+	return (void *)(wr + 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	cxgb4_eth_xmit - add a packet to an Ethernet Tx queue</div><div class='ctx'>  *	@skb: the packet</div><div class='hunk'>@@ -1356,77 +1486,61 @@ int t4_sge_eth_txq_egress_update(struct adapter *adap, struct sge_eth_txq *eq,</div><div class='ctx'>  */</div><div class='ctx'> static netdev_tx_t cxgb4_eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	u32 wr_mid, ctrl0, op;</div><div class='del'>-	u64 cntrl, *end, *sgl;</div><div class='del'>-	int qidx, credits;</div><div class='del'>-	unsigned int flits, ndesc;</div><div class='del'>-	struct adapter *adap;</div><div class='del'>-	struct sge_eth_txq *q;</div><div class='del'>-	const struct port_info *pi;</div><div class='add'>+	enum cpl_tx_tnl_lso_type tnl_type = TX_TNL_TYPE_OPAQUE;</div><div class='add'>+	bool ptp_enabled = is_ptp_enabled(skb, dev);</div><div class='add'>+	unsigned int last_desc, flits, ndesc;</div><div class='add'>+	u32 wr_mid, ctrl0, op, sgl_off = 0;</div><div class='add'>+	const struct skb_shared_info *ssi;</div><div class='add'>+	int len, qidx, credits, ret, left;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='add'>+	struct fw_eth_tx_eo_wr *eowr;</div><div class='ctx'> 	struct fw_eth_tx_pkt_wr *wr;</div><div class='ctx'> 	struct cpl_tx_pkt_core *cpl;</div><div class='del'>-	const struct skb_shared_info *ssi;</div><div class='del'>-	dma_addr_t addr[MAX_SKB_FRAGS + 1];</div><div class='add'>+	const struct port_info *pi;</div><div class='ctx'> 	bool immediate = false;</div><div class='del'>-	int len, max_pkt_len;</div><div class='del'>-	bool ptp_enabled = is_ptp_enabled(skb, dev);</div><div class='add'>+	u64 cntrl, *end, *sgl;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='ctx'> 	unsigned int chip_ver;</div><div class='del'>-	enum cpl_tx_tnl_lso_type tnl_type = TX_TNL_TYPE_OPAQUE;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_CHELSIO_T4_FCOE</div><div class='del'>-	int err;</div><div class='del'>-#endif /* CONFIG_CHELSIO_T4_FCOE */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The chip min packet length is 10 octets but play safe and reject</div><div class='del'>-	 * anything shorter than an Ethernet header.</div><div class='del'>-	 */</div><div class='del'>-	if (unlikely(skb-&gt;len &lt; ETH_HLEN)) {</div><div class='del'>-out_free:	dev_kfree_skb_any(skb);</div><div class='del'>-		return NETDEV_TX_OK;</div><div class='del'>-	}</div><div class='add'>+	struct adapter *adap;</div><div class='ctx'> </div><div class='del'>-	/* Discard the packet if the length is greater than mtu */</div><div class='del'>-	max_pkt_len = ETH_HLEN + dev-&gt;mtu;</div><div class='del'>-	if (skb_vlan_tagged(skb))</div><div class='del'>-		max_pkt_len += VLAN_HLEN;</div><div class='del'>-	if (!skb_shinfo(skb)-&gt;gso_size &amp;&amp; (unlikely(skb-&gt;len &gt; max_pkt_len)))</div><div class='add'>+	ret = cxgb4_validate_skb(skb, dev, ETH_HLEN);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	pi = netdev_priv(dev);</div><div class='ctx'> 	adap = pi-&gt;adapter;</div><div class='ctx'> 	ssi = skb_shinfo(skb);</div><div class='del'>-#ifdef CONFIG_CHELSIO_IPSEC_INLINE</div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_IPSEC_INLINE)</div><div class='ctx'> 	if (xfrm_offload(skb) &amp;&amp; !ssi-&gt;gso_size)</div><div class='del'>-		return adap-&gt;uld[CXGB4_ULD_CRYPTO].tx_handler(skb, dev);</div><div class='add'>+		return adap-&gt;uld[CXGB4_ULD_IPSEC].tx_handler(skb, dev);</div><div class='ctx'> #endif /* CHELSIO_IPSEC_INLINE */</div><div class='ctx'> </div><div class='add'>+#if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)</div><div class='add'>+	if (tls_is_skb_tx_device_offloaded(skb) &amp;&amp;</div><div class='add'>+	    (skb-&gt;len - skb_tcp_all_headers(skb)))</div><div class='add'>+		return adap-&gt;uld[CXGB4_ULD_KTLS].tx_handler(skb, dev);</div><div class='add'>+#endif /* CHELSIO_TLS_DEVICE */</div><div class='add'>+</div><div class='ctx'> 	qidx = skb_get_queue_mapping(skb);</div><div class='ctx'> 	if (ptp_enabled) {</div><div class='del'>-		spin_lock(&amp;adap-&gt;ptp_lock);</div><div class='ctx'> 		if (!(adap-&gt;ptp_tx_skb)) {</div><div class='ctx'> 			skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='ctx'> 			adap-&gt;ptp_tx_skb = skb_get(skb);</div><div class='ctx'> 		} else {</div><div class='del'>-			spin_unlock(&amp;adap-&gt;ptp_lock);</div><div class='ctx'> 			goto out_free;</div><div class='ctx'> 		}</div><div class='ctx'> 		q = &amp;adap-&gt;sge.ptptxq;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		q = &amp;adap-&gt;sge.ethtxq[qidx + pi-&gt;first_qset];</div><div class='ctx'> 	}</div><div class='del'>-	skb_tx_timestamp(skb);</div><div class='ctx'> </div><div class='ctx'> 	reclaim_completed_tx(adap, &amp;q-&gt;q, -1, true);</div><div class='ctx'> 	cntrl = TXPKT_L4CSUM_DIS_F | TXPKT_IPCSUM_DIS_F;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_CHELSIO_T4_FCOE</div><div class='del'>-	err = cxgb_fcoe_offload(skb, adap, pi, &amp;cntrl);</div><div class='del'>-	if (unlikely(err == -ENOTSUPP)) {</div><div class='del'>-		if (ptp_enabled)</div><div class='del'>-			spin_unlock(&amp;adap-&gt;ptp_lock);</div><div class='add'>+	ret = cxgb_fcoe_offload(skb, adap, pi, &amp;cntrl);</div><div class='add'>+	if (unlikely(ret == -EOPNOTSUPP))</div><div class='ctx'> 		goto out_free;</div><div class='del'>-	}</div><div class='ctx'> #endif /* CONFIG_CHELSIO_T4_FCOE */</div><div class='ctx'> </div><div class='ctx'> 	chip_ver = CHELSIO_CHIP_VERSION(adap-&gt;params.chip);</div><div class='hunk'>@@ -1439,8 +1553,6 @@ out_free:	dev_kfree_skb_any(skb);</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev,</div><div class='ctx'> 			"%s: Tx ring %u full while queue awake!\n",</div><div class='ctx'> 			dev-&gt;name, qidx);</div><div class='del'>-		if (ptp_enabled)</div><div class='del'>-			spin_unlock(&amp;adap-&gt;ptp_lock);</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1450,11 +1562,15 @@ out_free:	dev_kfree_skb_any(skb);</div><div class='ctx'> 	if (skb-&gt;encapsulation &amp;&amp; chip_ver &gt; CHELSIO_T5)</div><div class='ctx'> 		tnl_type = cxgb_encap_offload_supported(skb);</div><div class='ctx'> </div><div class='add'>+	last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= q-&gt;q.size)</div><div class='add'>+		last_desc -= q-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;q-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='ctx'> 	if (!immediate &amp;&amp;</div><div class='del'>-	    unlikely(cxgb4_map_skb(adap-&gt;pdev_dev, skb, addr) &lt; 0)) {</div><div class='add'>+	    unlikely(cxgb4_map_skb(adap-&gt;pdev_dev, skb, sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='ctx'> 		q-&gt;mapping_err++;</div><div class='del'>-		if (ptp_enabled)</div><div class='del'>-			spin_unlock(&amp;adap-&gt;ptp_lock);</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1469,30 +1585,23 @@ out_free:	dev_kfree_skb_any(skb);</div><div class='ctx'> 		 * has opened up.</div><div class='ctx'> 		 */</div><div class='ctx'> 		eth_txq_stop(q);</div><div class='del'>-</div><div class='del'>-		/* If we're using the SGE Doorbell Queue Timer facility, we</div><div class='del'>-		 * don't need to ask the Firmware to send us Egress Queue CIDX</div><div class='del'>-		 * Updates: the Hardware will do this automatically.  And</div><div class='del'>-		 * since we send the Ingress Queue CIDX Updates to the</div><div class='del'>-		 * corresponding Ethernet Response Queue, we'll get them very</div><div class='del'>-		 * quickly.</div><div class='del'>-		 */</div><div class='del'>-		if (!q-&gt;dbqt)</div><div class='add'>+		if (chip_ver &gt; CHELSIO_T5)</div><div class='ctx'> 			wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	wr = (void *)&amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	eowr = (void *)&amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='ctx'> 	wr-&gt;equiq_to_len16 = htonl(wr_mid);</div><div class='ctx'> 	wr-&gt;r3 = cpu_to_be64(0);</div><div class='del'>-	end = (u64 *)wr + flits;</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4)</div><div class='add'>+		end = (u64 *)eowr + flits;</div><div class='add'>+	else</div><div class='add'>+		end = (u64 *)wr + flits;</div><div class='ctx'> </div><div class='ctx'> 	len = immediate ? skb-&gt;len : 0;</div><div class='ctx'> 	len += sizeof(*cpl);</div><div class='del'>-	if (ssi-&gt;gso_size) {</div><div class='add'>+	if (ssi-&gt;gso_size &amp;&amp; !(ssi-&gt;gso_type &amp; SKB_GSO_UDP_L4)) {</div><div class='ctx'> 		struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1);</div><div class='del'>-		bool v6 = (ssi-&gt;gso_type &amp; SKB_GSO_TCPV6) != 0;</div><div class='del'>-		int l3hdr_len = skb_network_header_len(skb);</div><div class='del'>-		int eth_xtra_len = skb_network_offset(skb) - ETH_HLEN;</div><div class='ctx'> 		struct cpl_tx_tnl_lso *tnl_lso = (void *)(wr + 1);</div><div class='ctx'> </div><div class='ctx'> 		if (tnl_type)</div><div class='hunk'>@@ -1513,52 +1622,38 @@ out_free:	dev_kfree_skb_any(skb);</div><div class='ctx'> 			if (iph-&gt;version == 4) {</div><div class='ctx'> 				iph-&gt;check = 0;</div><div class='ctx'> 				iph-&gt;tot_len = 0;</div><div class='del'>-				iph-&gt;check = (u16)(~ip_fast_csum((u8 *)iph,</div><div class='del'>-								 iph-&gt;ihl));</div><div class='add'>+				iph-&gt;check = ~ip_fast_csum((u8 *)iph, iph-&gt;ihl);</div><div class='ctx'> 			}</div><div class='ctx'> 			if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 				cntrl = hwcsum(adap-&gt;params.chip, skb);</div><div class='ctx'> 		} else {</div><div class='del'>-			lso-&gt;lso_ctrl = htonl(LSO_OPCODE_V(CPL_TX_PKT_LSO) |</div><div class='del'>-					LSO_FIRST_SLICE_F | LSO_LAST_SLICE_F |</div><div class='del'>-					LSO_IPV6_V(v6) |</div><div class='del'>-					LSO_ETHHDR_LEN_V(eth_xtra_len / 4) |</div><div class='del'>-					LSO_IPHDR_LEN_V(l3hdr_len / 4) |</div><div class='del'>-					LSO_TCPHDR_LEN_V(tcp_hdr(skb)-&gt;doff));</div><div class='del'>-			lso-&gt;ipid_ofst = htons(0);</div><div class='del'>-			lso-&gt;mss = htons(ssi-&gt;gso_size);</div><div class='del'>-			lso-&gt;seqno_offset = htonl(0);</div><div class='del'>-			if (is_t4(adap-&gt;params.chip))</div><div class='del'>-				lso-&gt;len = htonl(skb-&gt;len);</div><div class='del'>-			else</div><div class='del'>-				lso-&gt;len = htonl(LSO_T5_XFER_SIZE_V(skb-&gt;len));</div><div class='del'>-			cpl = (void *)(lso + 1);</div><div class='del'>-</div><div class='del'>-			if (CHELSIO_CHIP_VERSION(adap-&gt;params.chip)</div><div class='del'>-			    &lt;= CHELSIO_T5)</div><div class='del'>-				cntrl =	TXPKT_ETHHDR_LEN_V(eth_xtra_len);</div><div class='del'>-			else</div><div class='del'>-				cntrl = T6_TXPKT_ETHHDR_LEN_V(eth_xtra_len);</div><div class='del'>-</div><div class='del'>-			cntrl |= TXPKT_CSUM_TYPE_V(v6 ?</div><div class='del'>-				 TX_CSUM_TCPIP6 : TX_CSUM_TCPIP) |</div><div class='del'>-				 TXPKT_IPHDR_LEN_V(l3hdr_len);</div><div class='add'>+			cpl = write_tso_wr(adap, skb, lso);</div><div class='add'>+			cntrl = hwcsum(adap-&gt;params.chip, skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		sgl = (u64 *)(cpl + 1); /* sgl start here */</div><div class='del'>-		if (unlikely((u8 *)sgl &gt;= (u8 *)q-&gt;q.stat)) {</div><div class='del'>-			/* If current position is already at the end of the</div><div class='del'>-			 * txq, reset the current to point to start of the queue</div><div class='del'>-			 * and update the end ptr as well.</div><div class='del'>-			 */</div><div class='del'>-			if (sgl == (u64 *)q-&gt;q.stat) {</div><div class='del'>-				int left = (u8 *)end - (u8 *)q-&gt;q.stat;</div><div class='del'>-</div><div class='del'>-				end = (void *)q-&gt;q.desc + left;</div><div class='del'>-				sgl = (void *)q-&gt;q.desc;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='ctx'> 		q-&gt;tso++;</div><div class='ctx'> 		q-&gt;tx_cso += ssi-&gt;gso_segs;</div><div class='add'>+	} else if (ssi-&gt;gso_size) {</div><div class='add'>+		u64 *start;</div><div class='add'>+		u32 hdrlen;</div><div class='add'>+</div><div class='add'>+		hdrlen = eth_get_headlen(dev, skb-&gt;data, skb_headlen(skb));</div><div class='add'>+		len += hdrlen;</div><div class='add'>+		wr-&gt;op_immdlen = cpu_to_be32(FW_WR_OP_V(FW_ETH_TX_EO_WR) |</div><div class='add'>+					     FW_ETH_TX_EO_WR_IMMDLEN_V(len));</div><div class='add'>+		cpl = write_eo_udp_wr(skb, eowr, hdrlen);</div><div class='add'>+		cntrl = hwcsum(adap-&gt;params.chip, skb);</div><div class='add'>+</div><div class='add'>+		start = (u64 *)(cpl + 1);</div><div class='add'>+		sgl = (u64 *)inline_tx_skb_header(skb, &amp;q-&gt;q, (void *)start,</div><div class='add'>+						  hdrlen);</div><div class='add'>+		if (unlikely(start &gt; sgl)) {</div><div class='add'>+			left = (u8 *)end - (u8 *)q-&gt;q.stat;</div><div class='add'>+			end = (void *)q-&gt;q.desc + left;</div><div class='add'>+		}</div><div class='add'>+		sgl_off = hdrlen;</div><div class='add'>+		q-&gt;uso++;</div><div class='add'>+		q-&gt;tx_cso += ssi-&gt;gso_segs;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		if (ptp_enabled)</div><div class='ctx'> 			op = FW_PTP_TX_PKT_WR;</div><div class='hunk'>@@ -1575,6 +1670,16 @@ out_free:	dev_kfree_skb_any(skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (unlikely((u8 *)sgl &gt;= (u8 *)q-&gt;q.stat)) {</div><div class='add'>+		/* If current position is already at the end of the</div><div class='add'>+		 * txq, reset the current to point to start of the queue</div><div class='add'>+		 * and update the end ptr as well.</div><div class='add'>+		 */</div><div class='add'>+		left = (u8 *)end - (u8 *)q-&gt;q.stat;</div><div class='add'>+		end = (void *)q-&gt;q.desc + left;</div><div class='add'>+		sgl = (void *)q-&gt;q.desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (skb_vlan_tag_present(skb)) {</div><div class='ctx'> 		q-&gt;vlan_ins++;</div><div class='ctx'> 		cntrl |= TXPKT_VLAN_VLD_F | TXPKT_VLAN_V(skb_vlan_tag_get(skb));</div><div class='hunk'>@@ -1600,27 +1705,25 @@ out_free:	dev_kfree_skb_any(skb);</div><div class='ctx'> 	cpl-&gt;len = htons(skb-&gt;len);</div><div class='ctx'> 	cpl-&gt;ctrl1 = cpu_to_be64(cntrl);</div><div class='ctx'> </div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='ctx'> 	if (immediate) {</div><div class='ctx'> 		cxgb4_inline_tx_skb(skb, &amp;q-&gt;q, sgl);</div><div class='ctx'> 		dev_consume_skb_any(skb);</div><div class='ctx'> 	} else {</div><div class='del'>-		int last_desc;</div><div class='del'>-</div><div class='del'>-		cxgb4_write_sgl(skb, &amp;q-&gt;q, (void *)sgl, end, 0, addr);</div><div class='add'>+		cxgb4_write_sgl(skb, &amp;q-&gt;q, (void *)sgl, end, sgl_off,</div><div class='add'>+				sgl_sdesc-&gt;addr);</div><div class='ctx'> 		skb_orphan(skb);</div><div class='del'>-</div><div class='del'>-		last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='del'>-		if (last_desc &gt;= q-&gt;q.size)</div><div class='del'>-			last_desc -= q-&gt;q.size;</div><div class='del'>-		q-&gt;q.sdesc[last_desc].skb = skb;</div><div class='del'>-		q-&gt;q.sdesc[last_desc].sgl = (struct ulptx_sgl *)sgl;</div><div class='add'>+		sgl_sdesc-&gt;skb = skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	txq_advance(&amp;q-&gt;q, ndesc);</div><div class='ctx'> </div><div class='ctx'> 	cxgb4_ring_tx_db(adap, &amp;q-&gt;q, ndesc);</div><div class='del'>-	if (ptp_enabled)</div><div class='del'>-		spin_unlock(&amp;adap-&gt;ptp_lock);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+out_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1707,35 +1810,31 @@ static inline unsigned int t4vf_calc_tx_flits(const struct sk_buff *skb)</div><div class='ctx'> static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 				     struct net_device *dev)</div><div class='ctx'> {</div><div class='del'>-	dma_addr_t addr[MAX_SKB_FRAGS + 1];</div><div class='add'>+	unsigned int last_desc, flits, ndesc;</div><div class='ctx'> 	const struct skb_shared_info *ssi;</div><div class='ctx'> 	struct fw_eth_tx_pkt_vm_wr *wr;</div><div class='del'>-	int qidx, credits, max_pkt_len;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='ctx'> 	struct cpl_tx_pkt_core *cpl;</div><div class='ctx'> 	const struct port_info *pi;</div><div class='del'>-	unsigned int flits, ndesc;</div><div class='ctx'> 	struct sge_eth_txq *txq;</div><div class='ctx'> 	struct adapter *adapter;</div><div class='add'>+	int qidx, credits, ret;</div><div class='add'>+	size_t fw_hdr_copy_len;</div><div class='add'>+	unsigned int chip_ver;</div><div class='ctx'> 	u64 cntrl, *end;</div><div class='ctx'> 	u32 wr_mid;</div><div class='del'>-	const size_t fw_hdr_copy_len = sizeof(wr-&gt;ethmacdst) +</div><div class='del'>-				       sizeof(wr-&gt;ethmacsrc) +</div><div class='del'>-				       sizeof(wr-&gt;ethtype) +</div><div class='del'>-				       sizeof(wr-&gt;vlantci);</div><div class='ctx'> </div><div class='ctx'> 	/* The chip minimum packet length is 10 octets but the firmware</div><div class='ctx'> 	 * command that we are using requires that we copy the Ethernet header</div><div class='ctx'> 	 * (including the VLAN tag) into the header so we reject anything</div><div class='ctx'> 	 * smaller than that ...</div><div class='ctx'> 	 */</div><div class='del'>-	if (unlikely(skb-&gt;len &lt; fw_hdr_copy_len))</div><div class='del'>-		goto out_free;</div><div class='del'>-</div><div class='del'>-	/* Discard the packet if the length is greater than mtu */</div><div class='del'>-	max_pkt_len = ETH_HLEN + dev-&gt;mtu;</div><div class='del'>-	if (skb_vlan_tag_present(skb))</div><div class='del'>-		max_pkt_len += VLAN_HLEN;</div><div class='del'>-	if (!skb_shinfo(skb)-&gt;gso_size &amp;&amp; (unlikely(skb-&gt;len &gt; max_pkt_len)))</div><div class='add'>+	BUILD_BUG_ON(sizeof(wr-&gt;firmware) !=</div><div class='add'>+		     (sizeof(wr-&gt;ethmacdst) + sizeof(wr-&gt;ethmacsrc) +</div><div class='add'>+		      sizeof(wr-&gt;ethtype) + sizeof(wr-&gt;vlantci)));</div><div class='add'>+	fw_hdr_copy_len = sizeof(wr-&gt;firmware);</div><div class='add'>+	ret = cxgb4_validate_skb(skb, dev, fw_hdr_copy_len);</div><div class='add'>+	if (ret)</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> </div><div class='ctx'> 	/* Figure out which TX Queue we're going to use. */</div><div class='hunk'>@@ -1771,16 +1870,24 @@ static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	last_desc = txq-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= txq-&gt;q.size)</div><div class='add'>+		last_desc -= txq-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;txq-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='ctx'> 	if (!t4vf_is_eth_imm(skb) &amp;&amp;</div><div class='del'>-	    unlikely(cxgb4_map_skb(adapter-&gt;pdev_dev, skb, addr) &lt; 0)) {</div><div class='add'>+	    unlikely(cxgb4_map_skb(adapter-&gt;pdev_dev, skb,</div><div class='add'>+				   sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='ctx'> 		/* We need to map the skb into PCI DMA space (because it can't</div><div class='ctx'> 		 * be in-lined directly into the Work Request) and the mapping</div><div class='ctx'> 		 * operation failed.  Record the error and drop the packet.</div><div class='ctx'> 		 */</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='ctx'> 		txq-&gt;mapping_err++;</div><div class='ctx'> 		goto out_free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	chip_ver = CHELSIO_CHIP_VERSION(adapter-&gt;params.chip);</div><div class='ctx'> 	wr_mid = FW_WR_LEN16_V(DIV_ROUND_UP(flits, 2));</div><div class='ctx'> 	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='ctx'> 		/* After we're done injecting the Work Request for this</div><div class='hunk'>@@ -1792,15 +1899,7 @@ static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 		 * has opened up.</div><div class='ctx'> 		 */</div><div class='ctx'> 		eth_txq_stop(txq);</div><div class='del'>-</div><div class='del'>-		/* If we're using the SGE Doorbell Queue Timer facility, we</div><div class='del'>-		 * don't need to ask the Firmware to send us Egress Queue CIDX</div><div class='del'>-		 * Updates: the Hardware will do this automatically.  And</div><div class='del'>-		 * since we send the Ingress Queue CIDX Updates to the</div><div class='del'>-		 * corresponding Ethernet Response Queue, we'll get them very</div><div class='del'>-		 * quickly.</div><div class='del'>-		 */</div><div class='del'>-		if (!txq-&gt;dbqt)</div><div class='add'>+		if (chip_ver &gt; CHELSIO_T5)</div><div class='ctx'> 			wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1814,7 +1913,7 @@ static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 	wr-&gt;equiq_to_len16 = cpu_to_be32(wr_mid);</div><div class='ctx'> 	wr-&gt;r3[0] = cpu_to_be32(0);</div><div class='ctx'> 	wr-&gt;r3[1] = cpu_to_be32(0);</div><div class='del'>-	skb_copy_from_linear_data(skb, (void *)wr-&gt;ethmacdst, fw_hdr_copy_len);</div><div class='add'>+	skb_copy_from_linear_data(skb, &amp;wr-&gt;firmware, fw_hdr_copy_len);</div><div class='ctx'> 	end = (u64 *)wr + flits;</div><div class='ctx'> </div><div class='ctx'> 	/* If this is a Large Send Offload packet we'll put in an LSO CPL</div><div class='hunk'>@@ -1854,7 +1953,7 @@ static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		cpl = (void *)(lso + 1);</div><div class='ctx'> </div><div class='del'>-		if (CHELSIO_CHIP_VERSION(adapter-&gt;params.chip) &lt;= CHELSIO_T5)</div><div class='add'>+		if (chip_ver &lt;= CHELSIO_T5)</div><div class='ctx'> 			cntrl = TXPKT_ETHHDR_LEN_V(eth_xtra_len);</div><div class='ctx'> 		else</div><div class='ctx'> 			cntrl = T6_TXPKT_ETHHDR_LEN_V(eth_xtra_len);</div><div class='hunk'>@@ -1951,7 +2050,6 @@ static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 		 */</div><div class='ctx'> 		struct ulptx_sgl *sgl = (struct ulptx_sgl *)(cpl + 1);</div><div class='ctx'> 		struct sge_txq *tq = &amp;txq-&gt;q;</div><div class='del'>-		int last_desc;</div><div class='ctx'> </div><div class='ctx'> 		/* If the Work Request header was an exact multiple of our TX</div><div class='ctx'> 		 * Descriptor length, then it's possible that the starting SGL</div><div class='hunk'>@@ -1965,14 +2063,9 @@ static netdev_tx_t cxgb4_vf_eth_xmit(struct sk_buff *skb,</div><div class='ctx'> 				       ((void *)end - (void *)tq-&gt;stat));</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		cxgb4_write_sgl(skb, tq, sgl, end, 0, addr);</div><div class='add'>+		cxgb4_write_sgl(skb, tq, sgl, end, 0, sgl_sdesc-&gt;addr);</div><div class='ctx'> 		skb_orphan(skb);</div><div class='del'>-</div><div class='del'>-		last_desc = tq-&gt;pidx + ndesc - 1;</div><div class='del'>-		if (last_desc &gt;= tq-&gt;size)</div><div class='del'>-			last_desc -= tq-&gt;size;</div><div class='del'>-		tq-&gt;sdesc[last_desc].skb = skb;</div><div class='del'>-		tq-&gt;sdesc[last_desc].sgl = sgl;</div><div class='add'>+		sgl_sdesc-&gt;skb = skb;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Advance our internal TX Queue state, tell the hardware about</div><div class='hunk'>@@ -1991,34 +2084,536 @@ out_free:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ * reclaim_completed_tx_imm - reclaim completed control-queue Tx descs</div><div class='add'>+ * @q: the SGE control Tx queue</div><div class='add'>+ *</div><div class='add'>+ * This is a variant of cxgb4_reclaim_completed_tx() that is used</div><div class='add'>+ * for Tx queues that send only immediate data (presently just</div><div class='add'>+ * the control queues) and	thus do not have any sk_buffs to release.</div><div class='add'>+ */</div><div class='add'>+static inline void reclaim_completed_tx_imm(struct sge_txq *q)</div><div class='add'>+{</div><div class='add'>+	int hw_cidx = ntohs(READ_ONCE(q-&gt;stat-&gt;cidx));</div><div class='add'>+	int reclaim = hw_cidx - q-&gt;cidx;</div><div class='add'>+</div><div class='add'>+	if (reclaim &lt; 0)</div><div class='add'>+		reclaim += q-&gt;size;</div><div class='add'>+</div><div class='add'>+	q-&gt;in_use -= reclaim;</div><div class='add'>+	q-&gt;cidx = hw_cidx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void eosw_txq_advance_index(u32 *idx, u32 n, u32 max)</div><div class='add'>+{</div><div class='add'>+	u32 val = *idx + n;</div><div class='add'>+</div><div class='add'>+	if (val &gt;= max)</div><div class='add'>+		val -= max;</div><div class='add'>+</div><div class='add'>+	*idx = val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void cxgb4_eosw_txq_free_desc(struct adapter *adap,</div><div class='add'>+			      struct sge_eosw_txq *eosw_txq, u32 ndesc)</div><div class='add'>+{</div><div class='add'>+	struct tx_sw_desc *d;</div><div class='add'>+</div><div class='add'>+	d = &amp;eosw_txq-&gt;desc[eosw_txq-&gt;last_cidx];</div><div class='add'>+	while (ndesc--) {</div><div class='add'>+		if (d-&gt;skb) {</div><div class='add'>+			if (d-&gt;addr[0]) {</div><div class='add'>+				unmap_skb(adap-&gt;pdev_dev, d-&gt;skb, d-&gt;addr);</div><div class='add'>+				memset(d-&gt;addr, 0, sizeof(d-&gt;addr));</div><div class='add'>+			}</div><div class='add'>+			dev_consume_skb_any(d-&gt;skb);</div><div class='add'>+			d-&gt;skb = NULL;</div><div class='add'>+		}</div><div class='add'>+		eosw_txq_advance_index(&amp;eosw_txq-&gt;last_cidx, 1,</div><div class='add'>+				       eosw_txq-&gt;ndesc);</div><div class='add'>+		d = &amp;eosw_txq-&gt;desc[eosw_txq-&gt;last_cidx];</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void eosw_txq_advance(struct sge_eosw_txq *eosw_txq, u32 n)</div><div class='add'>+{</div><div class='add'>+	eosw_txq_advance_index(&amp;eosw_txq-&gt;pidx, n, eosw_txq-&gt;ndesc);</div><div class='add'>+	eosw_txq-&gt;inuse += n;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int eosw_txq_enqueue(struct sge_eosw_txq *eosw_txq,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (eosw_txq-&gt;inuse == eosw_txq-&gt;ndesc)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	eosw_txq-&gt;desc[eosw_txq-&gt;pidx].skb = skb;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sk_buff *eosw_txq_peek(struct sge_eosw_txq *eosw_txq)</div><div class='add'>+{</div><div class='add'>+	return eosw_txq-&gt;desc[eosw_txq-&gt;last_pidx].skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline u8 ethofld_calc_tx_flits(struct adapter *adap,</div><div class='add'>+				       struct sk_buff *skb, u32 hdr_len)</div><div class='add'>+{</div><div class='add'>+	u8 flits, nsgl = 0;</div><div class='add'>+	u32 wrlen;</div><div class='add'>+</div><div class='add'>+	wrlen = sizeof(struct fw_eth_tx_eo_wr) + sizeof(struct cpl_tx_pkt_core);</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_size &amp;&amp;</div><div class='add'>+	    !(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4))</div><div class='add'>+		wrlen += sizeof(struct cpl_tx_pkt_lso_core);</div><div class='add'>+</div><div class='add'>+	wrlen += roundup(hdr_len, 16);</div><div class='add'>+</div><div class='add'>+	/* Packet headers + WR + CPLs */</div><div class='add'>+	flits = DIV_ROUND_UP(wrlen, 8);</div><div class='add'>+</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags &gt; 0) {</div><div class='add'>+		if (skb_headlen(skb) - hdr_len)</div><div class='add'>+			nsgl = sgl_len(skb_shinfo(skb)-&gt;nr_frags + 1);</div><div class='add'>+		else</div><div class='add'>+			nsgl = sgl_len(skb_shinfo(skb)-&gt;nr_frags);</div><div class='add'>+	} else if (skb-&gt;len - hdr_len) {</div><div class='add'>+		nsgl = sgl_len(1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return flits + nsgl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *write_eo_wr(struct adapter *adap, struct sge_eosw_txq *eosw_txq,</div><div class='add'>+			 struct sk_buff *skb, struct fw_eth_tx_eo_wr *wr,</div><div class='add'>+			 u32 hdr_len, u32 wrlen)</div><div class='add'>+{</div><div class='add'>+	const struct skb_shared_info *ssi = skb_shinfo(skb);</div><div class='add'>+	struct cpl_tx_pkt_core *cpl;</div><div class='add'>+	u32 immd_len, wrlen16;</div><div class='add'>+	bool compl = false;</div><div class='add'>+	u8 ver, proto;</div><div class='add'>+</div><div class='add'>+	ver = ip_hdr(skb)-&gt;version;</div><div class='add'>+	proto = (ver == 6) ? ipv6_hdr(skb)-&gt;nexthdr : ip_hdr(skb)-&gt;protocol;</div><div class='add'>+</div><div class='add'>+	wrlen16 = DIV_ROUND_UP(wrlen, 16);</div><div class='add'>+	immd_len = sizeof(struct cpl_tx_pkt_core);</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_size &amp;&amp;</div><div class='add'>+	    !(skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4))</div><div class='add'>+		immd_len += sizeof(struct cpl_tx_pkt_lso_core);</div><div class='add'>+	immd_len += hdr_len;</div><div class='add'>+</div><div class='add'>+	if (!eosw_txq-&gt;ncompl ||</div><div class='add'>+	    (eosw_txq-&gt;last_compl + wrlen16) &gt;=</div><div class='add'>+	    (adap-&gt;params.ofldq_wr_cred / 2)) {</div><div class='add'>+		compl = true;</div><div class='add'>+		eosw_txq-&gt;ncompl++;</div><div class='add'>+		eosw_txq-&gt;last_compl = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wr-&gt;op_immdlen = cpu_to_be32(FW_WR_OP_V(FW_ETH_TX_EO_WR) |</div><div class='add'>+				     FW_ETH_TX_EO_WR_IMMDLEN_V(immd_len) |</div><div class='add'>+				     FW_WR_COMPL_V(compl));</div><div class='add'>+	wr-&gt;equiq_to_len16 = cpu_to_be32(FW_WR_LEN16_V(wrlen16) |</div><div class='add'>+					 FW_WR_FLOWID_V(eosw_txq-&gt;hwtid));</div><div class='add'>+	wr-&gt;r3 = 0;</div><div class='add'>+	if (proto == IPPROTO_UDP) {</div><div class='add'>+		cpl = write_eo_udp_wr(skb, wr, hdr_len);</div><div class='add'>+	} else {</div><div class='add'>+		wr-&gt;u.tcpseg.type = FW_ETH_TX_EO_TYPE_TCPSEG;</div><div class='add'>+		wr-&gt;u.tcpseg.ethlen = skb_network_offset(skb);</div><div class='add'>+		wr-&gt;u.tcpseg.iplen = cpu_to_be16(skb_network_header_len(skb));</div><div class='add'>+		wr-&gt;u.tcpseg.tcplen = tcp_hdrlen(skb);</div><div class='add'>+		wr-&gt;u.tcpseg.tsclk_tsoff = 0;</div><div class='add'>+		wr-&gt;u.tcpseg.r4 = 0;</div><div class='add'>+		wr-&gt;u.tcpseg.r5 = 0;</div><div class='add'>+		wr-&gt;u.tcpseg.plen = cpu_to_be32(skb-&gt;len - hdr_len);</div><div class='add'>+</div><div class='add'>+		if (ssi-&gt;gso_size) {</div><div class='add'>+			struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1);</div><div class='add'>+</div><div class='add'>+			wr-&gt;u.tcpseg.mss = cpu_to_be16(ssi-&gt;gso_size);</div><div class='add'>+			cpl = write_tso_wr(adap, skb, lso);</div><div class='add'>+		} else {</div><div class='add'>+			wr-&gt;u.tcpseg.mss = cpu_to_be16(0xffff);</div><div class='add'>+			cpl = (void *)(wr + 1);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eosw_txq-&gt;cred -= wrlen16;</div><div class='add'>+	eosw_txq-&gt;last_compl += wrlen16;</div><div class='add'>+	return cpl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ethofld_hard_xmit(struct net_device *dev,</div><div class='add'>+			     struct sge_eosw_txq *eosw_txq)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	u32 wrlen, wrlen16, hdr_len, data_len;</div><div class='add'>+	enum sge_eosw_state next_state;</div><div class='add'>+	u64 cntrl, *start, *end, *sgl;</div><div class='add'>+	struct sge_eohw_txq *eohw_txq;</div><div class='add'>+	struct cpl_tx_pkt_core *cpl;</div><div class='add'>+	struct fw_eth_tx_eo_wr *wr;</div><div class='add'>+	bool skip_eotx_wr = false;</div><div class='add'>+	struct tx_sw_desc *d;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int left, ret = 0;</div><div class='add'>+	u8 flits, ndesc;</div><div class='add'>+</div><div class='add'>+	eohw_txq = &amp;adap-&gt;sge.eohw_txq[eosw_txq-&gt;hwqid];</div><div class='add'>+	spin_lock(&amp;eohw_txq-&gt;lock);</div><div class='add'>+	reclaim_completed_tx_imm(&amp;eohw_txq-&gt;q);</div><div class='add'>+</div><div class='add'>+	d = &amp;eosw_txq-&gt;desc[eosw_txq-&gt;last_pidx];</div><div class='add'>+	skb = d-&gt;skb;</div><div class='add'>+</div><div class='add'>+	wr = (struct fw_eth_tx_eo_wr *)&amp;eohw_txq-&gt;q.desc[eohw_txq-&gt;q.pidx];</div><div class='add'>+	if (unlikely(eosw_txq-&gt;state != CXGB4_EO_STATE_ACTIVE &amp;&amp;</div><div class='add'>+		     eosw_txq-&gt;last_pidx == eosw_txq-&gt;flowc_idx)) {</div><div class='add'>+		hdr_len = skb-&gt;len;</div><div class='add'>+		data_len = 0;</div><div class='add'>+		flits = DIV_ROUND_UP(hdr_len, 8);</div><div class='add'>+		if (eosw_txq-&gt;state == CXGB4_EO_STATE_FLOWC_OPEN_SEND)</div><div class='add'>+			next_state = CXGB4_EO_STATE_FLOWC_OPEN_REPLY;</div><div class='add'>+		else</div><div class='add'>+			next_state = CXGB4_EO_STATE_FLOWC_CLOSE_REPLY;</div><div class='add'>+		skip_eotx_wr = true;</div><div class='add'>+	} else {</div><div class='add'>+		hdr_len = eth_get_headlen(dev, skb-&gt;data, skb_headlen(skb));</div><div class='add'>+		data_len = skb-&gt;len - hdr_len;</div><div class='add'>+		flits = ethofld_calc_tx_flits(adap, skb, hdr_len);</div><div class='add'>+	}</div><div class='add'>+	ndesc = flits_to_desc(flits);</div><div class='add'>+	wrlen = flits * 8;</div><div class='add'>+	wrlen16 = DIV_ROUND_UP(wrlen, 16);</div><div class='add'>+</div><div class='add'>+	left = txq_avail(&amp;eohw_txq-&gt;q) - ndesc;</div><div class='add'>+</div><div class='add'>+	/* If there are no descriptors left in hardware queues or no</div><div class='add'>+	 * CPL credits left in software queues, then wait for them</div><div class='add'>+	 * to come back and retry again. Note that we always request</div><div class='add'>+	 * for credits update via interrupt for every half credits</div><div class='add'>+	 * consumed. So, the interrupt will eventually restore the</div><div class='add'>+	 * credits and invoke the Tx path again.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(left &lt; 0 || wrlen16 &gt; eosw_txq-&gt;cred)) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_unlock;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(skip_eotx_wr)) {</div><div class='add'>+		start = (u64 *)wr;</div><div class='add'>+		eosw_txq-&gt;state = next_state;</div><div class='add'>+		eosw_txq-&gt;cred -= wrlen16;</div><div class='add'>+		eosw_txq-&gt;ncompl++;</div><div class='add'>+		eosw_txq-&gt;last_compl = 0;</div><div class='add'>+		goto write_wr_headers;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpl = write_eo_wr(adap, eosw_txq, skb, wr, hdr_len, wrlen);</div><div class='add'>+	cntrl = hwcsum(adap-&gt;params.chip, skb);</div><div class='add'>+	if (skb_vlan_tag_present(skb))</div><div class='add'>+		cntrl |= TXPKT_VLAN_VLD_F | TXPKT_VLAN_V(skb_vlan_tag_get(skb));</div><div class='add'>+</div><div class='add'>+	cpl-&gt;ctrl0 = cpu_to_be32(TXPKT_OPCODE_V(CPL_TX_PKT_XT) |</div><div class='add'>+				 TXPKT_INTF_V(pi-&gt;tx_chan) |</div><div class='add'>+				 TXPKT_PF_V(adap-&gt;pf));</div><div class='add'>+	cpl-&gt;pack = 0;</div><div class='add'>+	cpl-&gt;len = cpu_to_be16(skb-&gt;len);</div><div class='add'>+	cpl-&gt;ctrl1 = cpu_to_be64(cntrl);</div><div class='add'>+</div><div class='add'>+	start = (u64 *)(cpl + 1);</div><div class='add'>+</div><div class='add'>+write_wr_headers:</div><div class='add'>+	sgl = (u64 *)inline_tx_skb_header(skb, &amp;eohw_txq-&gt;q, (void *)start,</div><div class='add'>+					  hdr_len);</div><div class='add'>+	if (data_len) {</div><div class='add'>+		ret = cxgb4_map_skb(adap-&gt;pdev_dev, skb, d-&gt;addr);</div><div class='add'>+		if (unlikely(ret)) {</div><div class='add'>+			memset(d-&gt;addr, 0, sizeof(d-&gt;addr));</div><div class='add'>+			eohw_txq-&gt;mapping_err++;</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		end = (u64 *)wr + flits;</div><div class='add'>+		if (unlikely(start &gt; sgl)) {</div><div class='add'>+			left = (u8 *)end - (u8 *)eohw_txq-&gt;q.stat;</div><div class='add'>+			end = (void *)eohw_txq-&gt;q.desc + left;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (unlikely((u8 *)sgl &gt;= (u8 *)eohw_txq-&gt;q.stat)) {</div><div class='add'>+			/* If current position is already at the end of the</div><div class='add'>+			 * txq, reset the current to point to start of the queue</div><div class='add'>+			 * and update the end ptr as well.</div><div class='add'>+			 */</div><div class='add'>+			left = (u8 *)end - (u8 *)eohw_txq-&gt;q.stat;</div><div class='add'>+</div><div class='add'>+			end = (void *)eohw_txq-&gt;q.desc + left;</div><div class='add'>+			sgl = (void *)eohw_txq-&gt;q.desc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		cxgb4_write_sgl(skb, &amp;eohw_txq-&gt;q, (void *)sgl, end, hdr_len,</div><div class='add'>+				d-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_shinfo(skb)-&gt;gso_size) {</div><div class='add'>+		if (skb_shinfo(skb)-&gt;gso_type &amp; SKB_GSO_UDP_L4)</div><div class='add'>+			eohw_txq-&gt;uso++;</div><div class='add'>+		else</div><div class='add'>+			eohw_txq-&gt;tso++;</div><div class='add'>+		eohw_txq-&gt;tx_cso += skb_shinfo(skb)-&gt;gso_segs;</div><div class='add'>+	} else if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+		eohw_txq-&gt;tx_cso++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (skb_vlan_tag_present(skb))</div><div class='add'>+		eohw_txq-&gt;vlan_ins++;</div><div class='add'>+</div><div class='add'>+	txq_advance(&amp;eohw_txq-&gt;q, ndesc);</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+	cxgb4_ring_tx_db(adap, &amp;eohw_txq-&gt;q, ndesc);</div><div class='add'>+	eosw_txq_advance_index(&amp;eosw_txq-&gt;last_pidx, 1, eosw_txq-&gt;ndesc);</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock(&amp;eohw_txq-&gt;lock);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ethofld_xmit(struct net_device *dev, struct sge_eosw_txq *eosw_txq)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int pktcount, ret;</div><div class='add'>+</div><div class='add'>+	switch (eosw_txq-&gt;state) {</div><div class='add'>+	case CXGB4_EO_STATE_ACTIVE:</div><div class='add'>+	case CXGB4_EO_STATE_FLOWC_OPEN_SEND:</div><div class='add'>+	case CXGB4_EO_STATE_FLOWC_CLOSE_SEND:</div><div class='add'>+		pktcount = eosw_txq-&gt;pidx - eosw_txq-&gt;last_pidx;</div><div class='add'>+		if (pktcount &lt; 0)</div><div class='add'>+			pktcount += eosw_txq-&gt;ndesc;</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_EO_STATE_FLOWC_OPEN_REPLY:</div><div class='add'>+	case CXGB4_EO_STATE_FLOWC_CLOSE_REPLY:</div><div class='add'>+	case CXGB4_EO_STATE_CLOSED:</div><div class='add'>+	default:</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (pktcount--) {</div><div class='add'>+		skb = eosw_txq_peek(eosw_txq);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			eosw_txq_advance_index(&amp;eosw_txq-&gt;last_pidx, 1,</div><div class='add'>+					       eosw_txq-&gt;ndesc);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = ethofld_hard_xmit(dev, eosw_txq);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t cxgb4_ethofld_xmit(struct sk_buff *skb,</div><div class='add'>+				      struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_tc_port_mqprio *tc_port_mqprio;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct sge_eosw_txq *eosw_txq;</div><div class='add'>+	u32 qid;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_validate_skb(skb, dev, ETH_HLEN);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free;</div><div class='add'>+</div><div class='add'>+	tc_port_mqprio = &amp;adap-&gt;tc_mqprio-&gt;port_mqprio[pi-&gt;port_id];</div><div class='add'>+	qid = skb_get_queue_mapping(skb) - pi-&gt;nqsets;</div><div class='add'>+	eosw_txq = &amp;tc_port_mqprio-&gt;eosw_txq[qid];</div><div class='add'>+	spin_lock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	if (eosw_txq-&gt;state != CXGB4_EO_STATE_ACTIVE)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	ret = eosw_txq_enqueue(eosw_txq, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	/* SKB is queued for processing until credits are available.</div><div class='add'>+	 * So, call the destructor now and we'll free the skb later</div><div class='add'>+	 * after it has been successfully transmitted.</div><div class='add'>+	 */</div><div class='add'>+	skb_orphan(skb);</div><div class='add'>+</div><div class='add'>+	eosw_txq_advance(eosw_txq, 1);</div><div class='add'>+	ethofld_xmit(dev, eosw_txq);</div><div class='add'>+	spin_unlock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+out_unlock:</div><div class='add'>+	spin_unlock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+out_free:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> netdev_tx_t t4_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	u16 qid = skb_get_queue_mapping(skb);</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(pi-&gt;eth_flags &amp; PRIV_FLAG_PORT_TX_VM))</div><div class='ctx'> 		return cxgb4_vf_eth_xmit(skb, dev);</div><div class='ctx'> </div><div class='add'>+	if (unlikely(qid &gt;= pi-&gt;nqsets))</div><div class='add'>+		return cxgb4_ethofld_xmit(skb, dev);</div><div class='add'>+</div><div class='add'>+	if (is_ptp_enabled(skb, dev)) {</div><div class='add'>+		struct adapter *adap = netdev2adap(dev);</div><div class='add'>+		netdev_tx_t ret;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;adap-&gt;ptp_lock);</div><div class='add'>+		ret = cxgb4_eth_xmit(skb, dev);</div><div class='add'>+		spin_unlock(&amp;adap-&gt;ptp_lock);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return cxgb4_eth_xmit(skb, dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void eosw_txq_flush_pending_skbs(struct sge_eosw_txq *eosw_txq)</div><div class='add'>+{</div><div class='add'>+	int pktcount = eosw_txq-&gt;pidx - eosw_txq-&gt;last_pidx;</div><div class='add'>+	int pidx = eosw_txq-&gt;pidx;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	if (!pktcount)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (pktcount &lt; 0)</div><div class='add'>+		pktcount += eosw_txq-&gt;ndesc;</div><div class='add'>+</div><div class='add'>+	while (pktcount--) {</div><div class='add'>+		pidx--;</div><div class='add'>+		if (pidx &lt; 0)</div><div class='add'>+			pidx += eosw_txq-&gt;ndesc;</div><div class='add'>+</div><div class='add'>+		skb = eosw_txq-&gt;desc[pidx].skb;</div><div class='add'>+		if (skb) {</div><div class='add'>+			dev_consume_skb_any(skb);</div><div class='add'>+			eosw_txq-&gt;desc[pidx].skb = NULL;</div><div class='add'>+			eosw_txq-&gt;inuse--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eosw_txq-&gt;pidx = eosw_txq-&gt;last_pidx + 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- *	reclaim_completed_tx_imm - reclaim completed control-queue Tx descs</div><div class='del'>- *	@q: the SGE control Tx queue</div><div class='add'>+ * cxgb4_ethofld_send_flowc - Send ETHOFLD flowc request to bind eotid to tc.</div><div class='add'>+ * @dev: netdevice</div><div class='add'>+ * @eotid: ETHOFLD tid to bind/unbind</div><div class='add'>+ * @tc: traffic class. If set to FW_SCHED_CLS_NONE, then unbinds the @eotid</div><div class='ctx'>  *</div><div class='del'>- *	This is a variant of cxgb4_reclaim_completed_tx() that is used</div><div class='del'>- *	for Tx queues that send only immediate data (presently just</div><div class='del'>- *	the control queues) and	thus do not have any sk_buffs to release.</div><div class='add'>+ * Send a FLOWC work request to bind an ETHOFLD TID to a traffic class.</div><div class='add'>+ * If @tc is set to FW_SCHED_CLS_NONE, then the @eotid is unbound from</div><div class='add'>+ * a traffic class.</div><div class='ctx'>  */</div><div class='del'>-static inline void reclaim_completed_tx_imm(struct sge_txq *q)</div><div class='add'>+int cxgb4_ethofld_send_flowc(struct net_device *dev, u32 eotid, u32 tc)</div><div class='ctx'> {</div><div class='del'>-	int hw_cidx = ntohs(READ_ONCE(q-&gt;stat-&gt;cidx));</div><div class='del'>-	int reclaim = hw_cidx - q-&gt;cidx;</div><div class='add'>+	struct port_info *pi = netdev2pinfo(dev);</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	enum sge_eosw_state next_state;</div><div class='add'>+	struct sge_eosw_txq *eosw_txq;</div><div class='add'>+	u32 len, len16, nparams = 6;</div><div class='add'>+	struct fw_flowc_wr *flowc;</div><div class='add'>+	struct eotid_entry *entry;</div><div class='add'>+	struct sge_ofld_rxq *rxq;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret = 0;</div><div class='ctx'> </div><div class='del'>-	if (reclaim &lt; 0)</div><div class='del'>-		reclaim += q-&gt;size;</div><div class='add'>+	len = struct_size(flowc, mnemval, nparams);</div><div class='add'>+	len16 = DIV_ROUND_UP(len, 16);</div><div class='ctx'> </div><div class='del'>-	q-&gt;in_use -= reclaim;</div><div class='del'>-	q-&gt;cidx = hw_cidx;</div><div class='add'>+	entry = cxgb4_lookup_eotid(&amp;adap-&gt;tids, eotid);</div><div class='add'>+	if (!entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	eosw_txq = (struct sge_eosw_txq *)entry-&gt;data;</div><div class='add'>+	if (!eosw_txq)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_FW_OK)) {</div><div class='add'>+		/* Don't stall caller when access to FW is lost */</div><div class='add'>+		complete(&amp;eosw_txq-&gt;completion);</div><div class='add'>+		return -EIO;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(len, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	if (tc != FW_SCHED_CLS_NONE) {</div><div class='add'>+		if (eosw_txq-&gt;state != CXGB4_EO_STATE_CLOSED)</div><div class='add'>+			goto out_free_skb;</div><div class='add'>+</div><div class='add'>+		next_state = CXGB4_EO_STATE_FLOWC_OPEN_SEND;</div><div class='add'>+	} else {</div><div class='add'>+		if (eosw_txq-&gt;state != CXGB4_EO_STATE_ACTIVE)</div><div class='add'>+			goto out_free_skb;</div><div class='add'>+</div><div class='add'>+		next_state = CXGB4_EO_STATE_FLOWC_CLOSE_SEND;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flowc = __skb_put(skb, len);</div><div class='add'>+	memset(flowc, 0, len);</div><div class='add'>+</div><div class='add'>+	rxq = &amp;adap-&gt;sge.eohw_rxq[eosw_txq-&gt;hwqid];</div><div class='add'>+	flowc-&gt;flowid_len16 = cpu_to_be32(FW_WR_LEN16_V(len16) |</div><div class='add'>+					  FW_WR_FLOWID_V(eosw_txq-&gt;hwtid));</div><div class='add'>+	flowc-&gt;op_to_nparams = cpu_to_be32(FW_WR_OP_V(FW_FLOWC_WR) |</div><div class='add'>+					   FW_FLOWC_WR_NPARAMS_V(nparams) |</div><div class='add'>+					   FW_WR_COMPL_V(1));</div><div class='add'>+	flowc-&gt;mnemval[0].mnemonic = FW_FLOWC_MNEM_PFNVFN;</div><div class='add'>+	flowc-&gt;mnemval[0].val = cpu_to_be32(FW_PFVF_CMD_PFN_V(adap-&gt;pf));</div><div class='add'>+	flowc-&gt;mnemval[1].mnemonic = FW_FLOWC_MNEM_CH;</div><div class='add'>+	flowc-&gt;mnemval[1].val = cpu_to_be32(pi-&gt;tx_chan);</div><div class='add'>+	flowc-&gt;mnemval[2].mnemonic = FW_FLOWC_MNEM_PORT;</div><div class='add'>+	flowc-&gt;mnemval[2].val = cpu_to_be32(pi-&gt;tx_chan);</div><div class='add'>+	flowc-&gt;mnemval[3].mnemonic = FW_FLOWC_MNEM_IQID;</div><div class='add'>+	flowc-&gt;mnemval[3].val = cpu_to_be32(rxq-&gt;rspq.abs_id);</div><div class='add'>+	flowc-&gt;mnemval[4].mnemonic = FW_FLOWC_MNEM_SCHEDCLASS;</div><div class='add'>+	flowc-&gt;mnemval[4].val = cpu_to_be32(tc);</div><div class='add'>+	flowc-&gt;mnemval[5].mnemonic = FW_FLOWC_MNEM_EOSTATE;</div><div class='add'>+	flowc-&gt;mnemval[5].val = cpu_to_be32(tc == FW_SCHED_CLS_NONE ?</div><div class='add'>+					    FW_FLOWC_MNEM_EOSTATE_CLOSING :</div><div class='add'>+					    FW_FLOWC_MNEM_EOSTATE_ESTABLISHED);</div><div class='add'>+</div><div class='add'>+	/* Free up any pending skbs to ensure there's room for</div><div class='add'>+	 * termination FLOWC.</div><div class='add'>+	 */</div><div class='add'>+	if (tc == FW_SCHED_CLS_NONE)</div><div class='add'>+		eosw_txq_flush_pending_skbs(eosw_txq);</div><div class='add'>+</div><div class='add'>+	ret = eosw_txq_enqueue(eosw_txq, skb);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_free_skb;</div><div class='add'>+</div><div class='add'>+	eosw_txq-&gt;state = next_state;</div><div class='add'>+	eosw_txq-&gt;flowc_idx = eosw_txq-&gt;pidx;</div><div class='add'>+	eosw_txq_advance(eosw_txq, 1);</div><div class='add'>+	ethofld_xmit(dev, eosw_txq);</div><div class='add'>+</div><div class='add'>+	spin_unlock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_free_skb:</div><div class='add'>+	dev_consume_skb_any(skb);</div><div class='add'>+	spin_unlock_bh(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2052,6 +2647,84 @@ static void ctrlq_check_stop(struct sge_ctrl_txq *q, struct fw_wr_hdr *wr)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define CXGB4_SELFTEST_LB_STR "CHELSIO_SELFTEST"</div><div class='add'>+</div><div class='add'>+int cxgb4_selftest_lb_pkt(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev_priv(netdev);</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+	struct cxgb4_ethtool_lb_test *lb;</div><div class='add'>+	int ret, i = 0, pkt_len, credits;</div><div class='add'>+	struct fw_eth_tx_pkt_wr *wr;</div><div class='add'>+	struct cpl_tx_pkt_core *cpl;</div><div class='add'>+	u32 ctrl0, ndesc, flits;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='add'>+	u8 *sgl;</div><div class='add'>+</div><div class='add'>+	pkt_len = ETH_HLEN + sizeof(CXGB4_SELFTEST_LB_STR);</div><div class='add'>+</div><div class='add'>+	flits = DIV_ROUND_UP(pkt_len + sizeof(*cpl) + sizeof(*wr),</div><div class='add'>+			     sizeof(__be64));</div><div class='add'>+	ndesc = flits_to_desc(flits);</div><div class='add'>+</div><div class='add'>+	lb = &amp;pi-&gt;ethtool_lb;</div><div class='add'>+	lb-&gt;loopback = 1;</div><div class='add'>+</div><div class='add'>+	q = &amp;adap-&gt;sge.ethtxq[pi-&gt;first_qset];</div><div class='add'>+	__netif_tx_lock_bh(q-&gt;txq);</div><div class='add'>+</div><div class='add'>+	reclaim_completed_tx(adap, &amp;q-&gt;q, -1, true);</div><div class='add'>+	credits = txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		__netif_tx_unlock_bh(q-&gt;txq);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	wr = (void *)&amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	memset(wr, 0, sizeof(struct tx_desc));</div><div class='add'>+</div><div class='add'>+	wr-&gt;op_immdlen = htonl(FW_WR_OP_V(FW_ETH_TX_PKT_WR) |</div><div class='add'>+			       FW_WR_IMMDLEN_V(pkt_len +</div><div class='add'>+			       sizeof(*cpl)));</div><div class='add'>+	wr-&gt;equiq_to_len16 = htonl(FW_WR_LEN16_V(DIV_ROUND_UP(flits, 2)));</div><div class='add'>+	wr-&gt;r3 = cpu_to_be64(0);</div><div class='add'>+</div><div class='add'>+	cpl = (void *)(wr + 1);</div><div class='add'>+	sgl = (u8 *)(cpl + 1);</div><div class='add'>+</div><div class='add'>+	ctrl0 = TXPKT_OPCODE_V(CPL_TX_PKT_XT) | TXPKT_PF_V(adap-&gt;pf) |</div><div class='add'>+		TXPKT_INTF_V(pi-&gt;tx_chan + 4);</div><div class='add'>+</div><div class='add'>+	cpl-&gt;ctrl0 = htonl(ctrl0);</div><div class='add'>+	cpl-&gt;pack = htons(0);</div><div class='add'>+	cpl-&gt;len = htons(pkt_len);</div><div class='add'>+	cpl-&gt;ctrl1 = cpu_to_be64(TXPKT_L4CSUM_DIS_F | TXPKT_IPCSUM_DIS_F);</div><div class='add'>+</div><div class='add'>+	eth_broadcast_addr(sgl);</div><div class='add'>+	i += ETH_ALEN;</div><div class='add'>+	ether_addr_copy(&amp;sgl[i], netdev-&gt;dev_addr);</div><div class='add'>+	i += ETH_ALEN;</div><div class='add'>+</div><div class='add'>+	snprintf(&amp;sgl[i], sizeof(CXGB4_SELFTEST_LB_STR), "%s",</div><div class='add'>+		 CXGB4_SELFTEST_LB_STR);</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;lb-&gt;completion);</div><div class='add'>+	txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+	cxgb4_ring_tx_db(adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	__netif_tx_unlock_bh(q-&gt;txq);</div><div class='add'>+</div><div class='add'>+	/* wait for the pkt to return */</div><div class='add'>+	ret = wait_for_completion_timeout(&amp;lb-&gt;completion, 10 * HZ);</div><div class='add'>+	if (!ret)</div><div class='add'>+		ret = -ETIMEDOUT;</div><div class='add'>+	else</div><div class='add'>+		ret = lb-&gt;result;</div><div class='add'>+</div><div class='add'>+	lb-&gt;loopback = 0;</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	ctrl_xmit - send a packet through an SGE control Tx queue</div><div class='ctx'>  *	@q: the control queue</div><div class='hunk'>@@ -2097,15 +2770,15 @@ static int ctrl_xmit(struct sge_ctrl_txq *q, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	restart_ctrlq - restart a suspended control queue</div><div class='del'>- *	@data: the control queue to restart</div><div class='add'>+ *	@t: pointer to the tasklet associated with this handler</div><div class='ctx'>  *</div><div class='ctx'>  *	Resumes transmission on a suspended Tx control queue.</div><div class='ctx'>  */</div><div class='del'>-static void restart_ctrlq(unsigned long data)</div><div class='add'>+static void restart_ctrlq(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	unsigned int written = 0;</div><div class='del'>-	struct sge_ctrl_txq *q = (struct sge_ctrl_txq *)data;</div><div class='add'>+	struct sge_ctrl_txq *q = from_tasklet(q, t, qresume_tsk);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;q-&gt;sendq.lock);</div><div class='ctx'> 	reclaim_completed_tx_imm(&amp;q-&gt;q);</div><div class='hunk'>@@ -2170,17 +2843,22 @@ int t4_mgmt_tx(struct adapter *adap, struct sk_buff *skb)</div><div class='ctx'>  *	@skb: the packet</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns true if a packet can be sent as an offload WR with immediate</div><div class='del'>- *	data.  We currently use the same limit as for Ethernet packets.</div><div class='add'>+ *	data.</div><div class='add'>+ *	FW_OFLD_TX_DATA_WR limits the payload to 255 bytes due to 8-bit field.</div><div class='add'>+ *      However, FW_ULPTX_WR commands have a 256 byte immediate only</div><div class='add'>+ *      payload limit.</div><div class='ctx'>  */</div><div class='ctx'> static inline int is_ofld_imm(const struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	struct work_request_hdr *req = (struct work_request_hdr *)skb-&gt;data;</div><div class='ctx'> 	unsigned long opcode = FW_WR_OP_G(ntohl(req-&gt;wr_hi));</div><div class='ctx'> </div><div class='del'>-	if (opcode == FW_CRYPTO_LOOKASIDE_WR)</div><div class='add'>+	if (unlikely(opcode == FW_ULPTX_WR))</div><div class='add'>+		return skb-&gt;len &lt;= MAX_IMM_ULPTX_WR_LEN;</div><div class='add'>+	else if (opcode == FW_CRYPTO_LOOKASIDE_WR)</div><div class='ctx'> 		return skb-&gt;len &lt;= SGE_MAX_WR_LEN;</div><div class='ctx'> 	else</div><div class='del'>-		return skb-&gt;len &lt;= MAX_IMM_TX_PKT_LEN;</div><div class='add'>+		return skb-&gt;len &lt;= MAX_IMM_OFLD_TX_DATA_WR_LEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -2207,7 +2885,6 @@ static inline unsigned int calc_tx_flits_ofld(const struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	txq_stop_maperr - stop a Tx queue due to I/O MMU exhaustion</div><div class='del'>- *	@adap: the adapter</div><div class='ctx'>  *	@q: the queue to stop</div><div class='ctx'>  *</div><div class='ctx'>  *	Mark a Tx queue stopped due to I/O MMU exhaustion and resulting</div><div class='hunk'>@@ -2256,6 +2933,7 @@ static void ofldtxq_stop(struct sge_uld_txq *q, struct fw_wr_hdr *wr)</div><div class='ctx'>  *	is ever running at a time ...</div><div class='ctx'>  */</div><div class='ctx'> static void service_ofldq(struct sge_uld_txq *q)</div><div class='add'>+	__must_hold(&amp;q-&gt;sendq.lock)</div><div class='ctx'> {</div><div class='ctx'> 	u64 *pos, *before, *end;</div><div class='ctx'> 	int credits;</div><div class='hunk'>@@ -2398,13 +3076,13 @@ static int ofld_xmit(struct sge_uld_txq *q, struct sk_buff *skb)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	restart_ofldq - restart a suspended offload queue</div><div class='del'>- *	@data: the offload queue to restart</div><div class='add'>+ *	@t: pointer to the tasklet associated with this handler</div><div class='ctx'>  *</div><div class='ctx'>  *	Resumes transmission on a suspended Tx offload queue.</div><div class='ctx'>  */</div><div class='del'>-static void restart_ofldq(unsigned long data)</div><div class='add'>+static void restart_ofldq(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct sge_uld_txq *q = (struct sge_uld_txq *)data;</div><div class='add'>+	struct sge_uld_txq *q = from_tasklet(q, t, qresume_tsk);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;q-&gt;sendq.lock);</div><div class='ctx'> 	q-&gt;full = 0;            /* the queue actually is completely empty now */</div><div class='hunk'>@@ -2453,6 +3131,7 @@ static inline int uld_send(struct adapter *adap, struct sk_buff *skb,</div><div class='ctx'> 	txq_info = adap-&gt;sge.uld_txq_info[tx_uld_type];</div><div class='ctx'> 	if (unlikely(!txq_info)) {</div><div class='ctx'> 		WARN_ON(true);</div><div class='add'>+		kfree_skb(skb);</div><div class='ctx'> 		return NET_XMIT_DROP;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2801,7 +3480,7 @@ enum {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *     t4_systim_to_hwstamp - read hardware time stamp</div><div class='del'>- *     @adap: the adapter</div><div class='add'>+ *     @adapter: the adapter</div><div class='ctx'>  *     @skb: the packet</div><div class='ctx'>  *</div><div class='ctx'>  *     Read Time Stamp from MPS packet and insert in skb which</div><div class='hunk'>@@ -2828,15 +3507,16 @@ static noinline int t4_systim_to_hwstamp(struct adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	hwtstamps = skb_hwtstamps(skb);</div><div class='ctx'> 	memset(hwtstamps, 0, sizeof(*hwtstamps));</div><div class='del'>-	hwtstamps-&gt;hwtstamp = ns_to_ktime(be64_to_cpu(*((u64 *)data)));</div><div class='add'>+	hwtstamps-&gt;hwtstamp = ns_to_ktime(get_unaligned_be64(data));</div><div class='ctx'> </div><div class='ctx'> 	return RX_PTP_PKT_SUC;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *     t4_rx_hststamp - Recv PTP Event Message</div><div class='del'>- *     @adap: the adapter</div><div class='add'>+ *     @adapter: the adapter</div><div class='ctx'>  *     @rsp: the response queue descriptor holding the RX_PKT message</div><div class='add'>+ *     @rxq: the response queue holding the RX_PKT message</div><div class='ctx'>  *     @skb: the packet</div><div class='ctx'>  *</div><div class='ctx'>  *     PTP enabled and MPS packet, read HW timestamp</div><div class='hunk'>@@ -2860,7 +3540,7 @@ static int t4_rx_hststamp(struct adapter *adapter, const __be64 *rsp,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *      t4_tx_hststamp - Loopback PTP Transmit Event Message</div><div class='del'>- *      @adap: the adapter</div><div class='add'>+ *      @adapter: the adapter</div><div class='ctx'>  *      @skb: the packet</div><div class='ctx'>  *      @dev: the ingress net device</div><div class='ctx'>  *</div><div class='hunk'>@@ -2926,9 +3606,8 @@ static void t4_tx_completion_handler(struct sge_rspq *rspq,</div><div class='ctx'> 	txq = &amp;s-&gt;ethtxq[pi-&gt;first_qset + rspq-&gt;idx];</div><div class='ctx'> </div><div class='ctx'> 	/* We've got the Hardware Consumer Index Update in the Egress Update</div><div class='del'>-	 * message.  If we're using the SGE Doorbell Queue Timer mechanism,</div><div class='del'>-	 * these Egress Update messages will be our sole CIDX Updates we get</div><div class='del'>-	 * since we don't want to chew up PCIe bandwidth for both Ingress</div><div class='add'>+	 * message. These Egress Update messages will be our sole CIDX Updates</div><div class='add'>+	 * we get since we don't want to chew up PCIe bandwidth for both Ingress</div><div class='ctx'> 	 * Messages and Status Page writes.  However, The code which manages</div><div class='ctx'> 	 * reclaiming successfully DMA'ed TX Work Requests uses the CIDX value</div><div class='ctx'> 	 * stored in the Status Page at the end of the TX Queue.  It's easiest</div><div class='hunk'>@@ -2937,7 +3616,7 @@ static void t4_tx_completion_handler(struct sge_rspq *rspq,</div><div class='ctx'> 	 * considered here since both are Big Endian and we're just copying</div><div class='ctx'> 	 * bytes consistently ...</div><div class='ctx'> 	 */</div><div class='del'>-	if (txq-&gt;dbqt) {</div><div class='add'>+	if (CHELSIO_CHIP_VERSION(adapter-&gt;params.chip) &lt;= CHELSIO_T5) {</div><div class='ctx'> 		struct cpl_sge_egr_update *egr;</div><div class='ctx'> </div><div class='ctx'> 		egr = (struct cpl_sge_egr_update *)rsp;</div><div class='hunk'>@@ -2947,6 +3626,31 @@ static void t4_tx_completion_handler(struct sge_rspq *rspq,</div><div class='ctx'> 	t4_sge_eth_txq_egress_update(adapter, txq, -1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int cxgb4_validate_lb_pkt(struct port_info *pi, const struct pkt_gl *si)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+	struct cxgb4_ethtool_lb_test *lb;</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	u8 *data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	netdev = adap-&gt;port[pi-&gt;port_id];</div><div class='add'>+	lb = &amp;pi-&gt;ethtool_lb;</div><div class='add'>+	data = si-&gt;va + s-&gt;pktshift;</div><div class='add'>+</div><div class='add'>+	i = ETH_ALEN;</div><div class='add'>+	if (!ether_addr_equal(data + i, netdev-&gt;dev_addr))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	i += ETH_ALEN;</div><div class='add'>+	if (strcmp(&amp;data[i], CXGB4_SELFTEST_LB_STR))</div><div class='add'>+		lb-&gt;result = -EIO;</div><div class='add'>+</div><div class='add'>+	complete(&amp;lb-&gt;completion);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	t4_ethrx_handler - process an ingress ethernet packet</div><div class='ctx'>  *	@q: the response queue that received the packet</div><div class='hunk'>@@ -2970,6 +3674,7 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='ctx'> 	struct port_info *pi;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='add'>+	pi = netdev_priv(q-&gt;netdev);</div><div class='ctx'> 	/* If we're looking at TX Queue CIDX Update, handle that separately</div><div class='ctx'> 	 * and return.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2997,6 +3702,12 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='ctx'> 	if (err_vec)</div><div class='ctx'> 		rxq-&gt;stats.bad_rx_pkts++;</div><div class='ctx'> </div><div class='add'>+	if (unlikely(pi-&gt;ethtool_lb.loopback &amp;&amp; pkt-&gt;iff &gt;= NCHAN)) {</div><div class='add'>+		ret = cxgb4_validate_lb_pkt(pi, si);</div><div class='add'>+		if (!ret)</div><div class='add'>+			return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (((pkt-&gt;l2info &amp; htonl(RXF_TCP_F)) ||</div><div class='ctx'> 	     tnl_hdr_len) &amp;&amp;</div><div class='ctx'> 	    (q-&gt;netdev-&gt;features &amp; NETIF_F_GRO) &amp;&amp; csum_ok &amp;&amp; !pkt-&gt;ip_frag) {</div><div class='hunk'>@@ -3010,7 +3721,6 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='ctx'> 		rxq-&gt;stats.rx_drops++;</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='del'>-	pi = netdev_priv(q-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	/* Handle PTP Event Rx packet */</div><div class='ctx'> 	if (unlikely(pi-&gt;ptp_enable)) {</div><div class='hunk'>@@ -3311,6 +4021,113 @@ static int napi_rx_handler(struct napi_struct *napi, int budget)</div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+void cxgb4_ethofld_restart(struct tasklet_struct *t)</div><div class='add'>+{</div><div class='add'>+	struct sge_eosw_txq *eosw_txq = from_tasklet(eosw_txq, t,</div><div class='add'>+						     qresume_tsk);</div><div class='add'>+	int pktcount;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;eosw_txq-&gt;lock);</div><div class='add'>+	pktcount = eosw_txq-&gt;cidx - eosw_txq-&gt;last_cidx;</div><div class='add'>+	if (pktcount &lt; 0)</div><div class='add'>+		pktcount += eosw_txq-&gt;ndesc;</div><div class='add'>+</div><div class='add'>+	if (pktcount) {</div><div class='add'>+		cxgb4_eosw_txq_free_desc(netdev2adap(eosw_txq-&gt;netdev),</div><div class='add'>+					 eosw_txq, pktcount);</div><div class='add'>+		eosw_txq-&gt;inuse -= pktcount;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* There may be some packets waiting for completions. So,</div><div class='add'>+	 * attempt to send these packets now.</div><div class='add'>+	 */</div><div class='add'>+	ethofld_xmit(eosw_txq-&gt;netdev, eosw_txq);</div><div class='add'>+	spin_unlock(&amp;eosw_txq-&gt;lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* cxgb4_ethofld_rx_handler - Process ETHOFLD Tx completions</div><div class='add'>+ * @q: the response queue that received the packet</div><div class='add'>+ * @rsp: the response queue descriptor holding the CPL message</div><div class='add'>+ * @si: the gather list of packet fragments</div><div class='add'>+ *</div><div class='add'>+ * Process a ETHOFLD Tx completion. Increment the cidx here, but</div><div class='add'>+ * free up the descriptors in a tasklet later.</div><div class='add'>+ */</div><div class='add'>+int cxgb4_ethofld_rx_handler(struct sge_rspq *q, const __be64 *rsp,</div><div class='add'>+			     const struct pkt_gl *si)</div><div class='add'>+{</div><div class='add'>+	u8 opcode = ((const struct rss_header *)rsp)-&gt;opcode;</div><div class='add'>+</div><div class='add'>+	/* skip RSS header */</div><div class='add'>+	rsp++;</div><div class='add'>+</div><div class='add'>+	if (opcode == CPL_FW4_ACK) {</div><div class='add'>+		const struct cpl_fw4_ack *cpl;</div><div class='add'>+		struct sge_eosw_txq *eosw_txq;</div><div class='add'>+		struct eotid_entry *entry;</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u32 hdr_len, eotid;</div><div class='add'>+		u8 flits, wrlen16;</div><div class='add'>+		int credits;</div><div class='add'>+</div><div class='add'>+		cpl = (const struct cpl_fw4_ack *)rsp;</div><div class='add'>+		eotid = CPL_FW4_ACK_FLOWID_G(ntohl(OPCODE_TID(cpl))) -</div><div class='add'>+			q-&gt;adap-&gt;tids.eotid_base;</div><div class='add'>+		entry = cxgb4_lookup_eotid(&amp;q-&gt;adap-&gt;tids, eotid);</div><div class='add'>+		if (!entry)</div><div class='add'>+			goto out_done;</div><div class='add'>+</div><div class='add'>+		eosw_txq = (struct sge_eosw_txq *)entry-&gt;data;</div><div class='add'>+		if (!eosw_txq)</div><div class='add'>+			goto out_done;</div><div class='add'>+</div><div class='add'>+		spin_lock(&amp;eosw_txq-&gt;lock);</div><div class='add'>+		credits = cpl-&gt;credits;</div><div class='add'>+		while (credits &gt; 0) {</div><div class='add'>+			skb = eosw_txq-&gt;desc[eosw_txq-&gt;cidx].skb;</div><div class='add'>+			if (!skb)</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (unlikely((eosw_txq-&gt;state ==</div><div class='add'>+				      CXGB4_EO_STATE_FLOWC_OPEN_REPLY ||</div><div class='add'>+				      eosw_txq-&gt;state ==</div><div class='add'>+				      CXGB4_EO_STATE_FLOWC_CLOSE_REPLY) &amp;&amp;</div><div class='add'>+				     eosw_txq-&gt;cidx == eosw_txq-&gt;flowc_idx)) {</div><div class='add'>+				flits = DIV_ROUND_UP(skb-&gt;len, 8);</div><div class='add'>+				if (eosw_txq-&gt;state ==</div><div class='add'>+				    CXGB4_EO_STATE_FLOWC_OPEN_REPLY)</div><div class='add'>+					eosw_txq-&gt;state = CXGB4_EO_STATE_ACTIVE;</div><div class='add'>+				else</div><div class='add'>+					eosw_txq-&gt;state = CXGB4_EO_STATE_CLOSED;</div><div class='add'>+				complete(&amp;eosw_txq-&gt;completion);</div><div class='add'>+			} else {</div><div class='add'>+				hdr_len = eth_get_headlen(eosw_txq-&gt;netdev,</div><div class='add'>+							  skb-&gt;data,</div><div class='add'>+							  skb_headlen(skb));</div><div class='add'>+				flits = ethofld_calc_tx_flits(q-&gt;adap, skb,</div><div class='add'>+							      hdr_len);</div><div class='add'>+			}</div><div class='add'>+			eosw_txq_advance_index(&amp;eosw_txq-&gt;cidx, 1,</div><div class='add'>+					       eosw_txq-&gt;ndesc);</div><div class='add'>+			wrlen16 = DIV_ROUND_UP(flits * 8, 16);</div><div class='add'>+			credits -= wrlen16;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		eosw_txq-&gt;cred += cpl-&gt;credits;</div><div class='add'>+		eosw_txq-&gt;ncompl--;</div><div class='add'>+</div><div class='add'>+		spin_unlock(&amp;eosw_txq-&gt;lock);</div><div class='add'>+</div><div class='add'>+		/* Schedule a tasklet to reclaim SKBs and restart ETHOFLD Tx,</div><div class='add'>+		 * if there were packets waiting for completion.</div><div class='add'>+		 */</div><div class='add'>+		tasklet_schedule(&amp;eosw_txq-&gt;qresume_tsk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out_done:</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * The MSI-X interrupt handler for an SGE response queue.</div><div class='ctx'>  */</div><div class='hunk'>@@ -3417,7 +4234,7 @@ static void sge_rx_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long m;</div><div class='ctx'> 	unsigned int i;</div><div class='del'>-	struct adapter *adap = from_timer(adap, t, sge.rx_timer);</div><div class='add'>+	struct adapter *adap = timer_container_of(adap, t, sge.rx_timer);</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; BITS_TO_LONGS(s-&gt;egr_sz); i++)</div><div class='hunk'>@@ -3431,7 +4248,7 @@ static void sge_rx_timer_cb(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> 			if (fl_starving(adap, fl)) {</div><div class='ctx'> 				rxq = container_of(fl, struct sge_eth_rxq, fl);</div><div class='del'>-				if (napi_reschedule(&amp;rxq-&gt;rspq.napi))</div><div class='add'>+				if (napi_schedule(&amp;rxq-&gt;rspq.napi))</div><div class='ctx'> 					fl-&gt;starving++;</div><div class='ctx'> 				else</div><div class='ctx'> 					set_bit(id, s-&gt;starving_fl);</div><div class='hunk'>@@ -3452,7 +4269,7 @@ done:</div><div class='ctx'> </div><div class='ctx'> static void sge_tx_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adap = from_timer(adap, t, sge.tx_timer);</div><div class='add'>+	struct adapter *adap = timer_container_of(adap, t, sge.tx_timer);</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 	unsigned long m, period;</div><div class='ctx'> 	unsigned int i, budget;</div><div class='hunk'>@@ -3637,7 +4454,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;iq-&gt;napi, napi_rx_handler, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;iq-&gt;napi, napi_rx_handler);</div><div class='ctx'> 	iq-&gt;cur_desc = iq-&gt;desc;</div><div class='ctx'> 	iq-&gt;cidx = 0;</div><div class='ctx'> 	iq-&gt;gen = 1;</div><div class='hunk'>@@ -3791,15 +4608,15 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,</div><div class='ctx'> 	 * write the CIDX Updates into the Status Page at the end of the</div><div class='ctx'> 	 * TX Queue.</div><div class='ctx'> 	 */</div><div class='del'>-	c.autoequiqe_to_viid = htonl((dbqt</div><div class='del'>-				      ? FW_EQ_ETH_CMD_AUTOEQUIQE_F</div><div class='del'>-				      : FW_EQ_ETH_CMD_AUTOEQUEQE_F) |</div><div class='add'>+	c.autoequiqe_to_viid = htonl(((chip_ver &lt;= CHELSIO_T5) ?</div><div class='add'>+				      FW_EQ_ETH_CMD_AUTOEQUIQE_F :</div><div class='add'>+				      FW_EQ_ETH_CMD_AUTOEQUEQE_F) |</div><div class='ctx'> 				     FW_EQ_ETH_CMD_VIID_V(pi-&gt;viid));</div><div class='ctx'> </div><div class='ctx'> 	c.fetchszm_to_iqid =</div><div class='del'>-		htonl(FW_EQ_ETH_CMD_HOSTFCMODE_V(dbqt</div><div class='del'>-						 ? HOSTFCMODE_INGRESS_QUEUE_X</div><div class='del'>-						 : HOSTFCMODE_STATUS_PAGE_X) |</div><div class='add'>+		htonl(FW_EQ_ETH_CMD_HOSTFCMODE_V((chip_ver &lt;= CHELSIO_T5) ?</div><div class='add'>+						 HOSTFCMODE_INGRESS_QUEUE_X :</div><div class='add'>+						 HOSTFCMODE_STATUS_PAGE_X) |</div><div class='ctx'> 		      FW_EQ_ETH_CMD_PCIECHN_V(pi-&gt;tx_chan) |</div><div class='ctx'> 		      FW_EQ_ETH_CMD_FETCHRO_F | FW_EQ_ETH_CMD_IQID_V(iqid));</div><div class='ctx'> </div><div class='hunk'>@@ -3810,6 +4627,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,</div><div class='ctx'> 					    : FETCHBURSTMIN_64B_T6_X) |</div><div class='ctx'> 		      FW_EQ_ETH_CMD_FBMAX_V(FETCHBURSTMAX_512B_X) |</div><div class='ctx'> 		      FW_EQ_ETH_CMD_CIDXFTHRESH_V(CIDXFLUSHTHRESH_32_X) |</div><div class='add'>+		      FW_EQ_ETH_CMD_CIDXFTHRESHO_V(chip_ver == CHELSIO_T5) |</div><div class='ctx'> 		      FW_EQ_ETH_CMD_EQSIZE_V(nentries));</div><div class='ctx'> </div><div class='ctx'> 	c.eqaddr = cpu_to_be64(txq-&gt;q.phys_addr);</div><div class='hunk'>@@ -3839,7 +4657,10 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,</div><div class='ctx'> 	txq-&gt;q.q_type = CXGB4_TXQ_ETH;</div><div class='ctx'> 	init_txq(adap, &amp;txq-&gt;q, FW_EQ_ETH_CMD_EQID_G(ntohl(c.eqid_pkd)));</div><div class='ctx'> 	txq-&gt;txq = netdevq;</div><div class='del'>-	txq-&gt;tso = txq-&gt;tx_cso = txq-&gt;vlan_ins = 0;</div><div class='add'>+	txq-&gt;tso = 0;</div><div class='add'>+	txq-&gt;uso = 0;</div><div class='add'>+	txq-&gt;tx_cso = 0;</div><div class='add'>+	txq-&gt;vlan_ins = 0;</div><div class='ctx'> 	txq-&gt;mapping_err = 0;</div><div class='ctx'> 	txq-&gt;dbqt = dbqt;</div><div class='ctx'> </div><div class='hunk'>@@ -3899,7 +4720,7 @@ int t4_sge_alloc_ctrl_txq(struct adapter *adap, struct sge_ctrl_txq *txq,</div><div class='ctx'> 	init_txq(adap, &amp;txq-&gt;q, FW_EQ_CTRL_CMD_EQID_G(ntohl(c.cmpliqid_eqid)));</div><div class='ctx'> 	txq-&gt;adap = adap;</div><div class='ctx'> 	skb_queue_head_init(&amp;txq-&gt;sendq);</div><div class='del'>-	tasklet_init(&amp;txq-&gt;qresume_tsk, restart_ctrlq, (unsigned long)txq);</div><div class='add'>+	tasklet_setup(&amp;txq-&gt;qresume_tsk, restart_ctrlq);</div><div class='ctx'> 	txq-&gt;full = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3916,30 +4737,30 @@ int t4_sge_mod_ctrl_txq(struct adapter *adap, unsigned int eqid,</div><div class='ctx'> 	return t4_set_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1, &amp;param, &amp;val);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int t4_sge_alloc_uld_txq(struct adapter *adap, struct sge_uld_txq *txq,</div><div class='del'>-			 struct net_device *dev, unsigned int iqid,</div><div class='del'>-			 unsigned int uld_type)</div><div class='add'>+static int t4_sge_alloc_ofld_txq(struct adapter *adap, struct sge_txq *q,</div><div class='add'>+				 struct net_device *dev, u32 cmd, u32 iqid)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int chip_ver = CHELSIO_CHIP_VERSION(adap-&gt;params.chip);</div><div class='del'>-	int ret, nentries;</div><div class='del'>-	struct fw_eq_ofld_cmd c;</div><div class='del'>-	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='del'>-	int cmd = FW_EQ_OFLD_CMD;</div><div class='add'>+	struct sge *s = &amp;adap-&gt;sge;</div><div class='add'>+	struct fw_eq_ofld_cmd c;</div><div class='add'>+	u32 fb_min, nentries;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* Add status entries */</div><div class='del'>-	nentries = txq-&gt;q.size + s-&gt;stat_len / sizeof(struct tx_desc);</div><div class='del'>-</div><div class='del'>-	txq-&gt;q.desc = alloc_ring(adap-&gt;pdev_dev, txq-&gt;q.size,</div><div class='del'>-			sizeof(struct tx_desc), sizeof(struct tx_sw_desc),</div><div class='del'>-			&amp;txq-&gt;q.phys_addr, &amp;txq-&gt;q.sdesc, s-&gt;stat_len,</div><div class='del'>-			NUMA_NO_NODE);</div><div class='del'>-	if (!txq-&gt;q.desc)</div><div class='add'>+	nentries = q-&gt;size + s-&gt;stat_len / sizeof(struct tx_desc);</div><div class='add'>+	q-&gt;desc = alloc_ring(adap-&gt;pdev_dev, q-&gt;size, sizeof(struct tx_desc),</div><div class='add'>+			     sizeof(struct tx_sw_desc), &amp;q-&gt;phys_addr,</div><div class='add'>+			     &amp;q-&gt;sdesc, s-&gt;stat_len, NUMA_NO_NODE);</div><div class='add'>+	if (!q-&gt;desc)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	if (chip_ver &lt;= CHELSIO_T5)</div><div class='add'>+		fb_min = FETCHBURSTMIN_64B_X;</div><div class='add'>+	else</div><div class='add'>+		fb_min = FETCHBURSTMIN_64B_T6_X;</div><div class='add'>+</div><div class='ctx'> 	memset(&amp;c, 0, sizeof(c));</div><div class='del'>-	if (unlikely(uld_type == CXGB4_TX_CRYPTO))</div><div class='del'>-		cmd = FW_EQ_CTRL_CMD;</div><div class='ctx'> 	c.op_to_vfn = htonl(FW_CMD_OP_V(cmd) | FW_CMD_REQUEST_F |</div><div class='ctx'> 			    FW_CMD_WRITE_F | FW_CMD_EXEC_F |</div><div class='ctx'> 			    FW_EQ_OFLD_CMD_PFN_V(adap-&gt;pf) |</div><div class='hunk'>@@ -3951,35 +4772,70 @@ int t4_sge_alloc_uld_txq(struct adapter *adap, struct sge_uld_txq *txq,</div><div class='ctx'> 		      FW_EQ_OFLD_CMD_PCIECHN_V(pi-&gt;tx_chan) |</div><div class='ctx'> 		      FW_EQ_OFLD_CMD_FETCHRO_F | FW_EQ_OFLD_CMD_IQID_V(iqid));</div><div class='ctx'> 	c.dcaen_to_eqsize =</div><div class='del'>-		htonl(FW_EQ_OFLD_CMD_FBMIN_V(chip_ver &lt;= CHELSIO_T5</div><div class='del'>-					     ? FETCHBURSTMIN_64B_X</div><div class='del'>-					     : FETCHBURSTMIN_64B_T6_X) |</div><div class='add'>+		htonl(FW_EQ_OFLD_CMD_FBMIN_V(fb_min) |</div><div class='ctx'> 		      FW_EQ_OFLD_CMD_FBMAX_V(FETCHBURSTMAX_512B_X) |</div><div class='ctx'> 		      FW_EQ_OFLD_CMD_CIDXFTHRESH_V(CIDXFLUSHTHRESH_32_X) |</div><div class='ctx'> 		      FW_EQ_OFLD_CMD_EQSIZE_V(nentries));</div><div class='del'>-	c.eqaddr = cpu_to_be64(txq-&gt;q.phys_addr);</div><div class='add'>+	c.eqaddr = cpu_to_be64(q-&gt;phys_addr);</div><div class='ctx'> </div><div class='ctx'> 	ret = t4_wr_mbox(adap, adap-&gt;mbox, &amp;c, sizeof(c), &amp;c);</div><div class='ctx'> 	if (ret) {</div><div class='del'>-		kfree(txq-&gt;q.sdesc);</div><div class='del'>-		txq-&gt;q.sdesc = NULL;</div><div class='add'>+		kfree(q-&gt;sdesc);</div><div class='add'>+		q-&gt;sdesc = NULL;</div><div class='ctx'> 		dma_free_coherent(adap-&gt;pdev_dev,</div><div class='ctx'> 				  nentries * sizeof(struct tx_desc),</div><div class='del'>-				  txq-&gt;q.desc, txq-&gt;q.phys_addr);</div><div class='del'>-		txq-&gt;q.desc = NULL;</div><div class='add'>+				  q-&gt;desc, q-&gt;phys_addr);</div><div class='add'>+		q-&gt;desc = NULL;</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	init_txq(adap, q, FW_EQ_OFLD_CMD_EQID_G(ntohl(c.eqid_pkd)));</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int t4_sge_alloc_uld_txq(struct adapter *adap, struct sge_uld_txq *txq,</div><div class='add'>+			 struct net_device *dev, unsigned int iqid,</div><div class='add'>+			 unsigned int uld_type)</div><div class='add'>+{</div><div class='add'>+	u32 cmd = FW_EQ_OFLD_CMD;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (unlikely(uld_type == CXGB4_TX_CRYPTO))</div><div class='add'>+		cmd = FW_EQ_CTRL_CMD;</div><div class='add'>+</div><div class='add'>+	ret = t4_sge_alloc_ofld_txq(adap, &amp;txq-&gt;q, dev, cmd, iqid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='ctx'> 	txq-&gt;q.q_type = CXGB4_TXQ_ULD;</div><div class='del'>-	init_txq(adap, &amp;txq-&gt;q, FW_EQ_OFLD_CMD_EQID_G(ntohl(c.eqid_pkd)));</div><div class='ctx'> 	txq-&gt;adap = adap;</div><div class='ctx'> 	skb_queue_head_init(&amp;txq-&gt;sendq);</div><div class='del'>-	tasklet_init(&amp;txq-&gt;qresume_tsk, restart_ofldq, (unsigned long)txq);</div><div class='add'>+	tasklet_setup(&amp;txq-&gt;qresume_tsk, restart_ofldq);</div><div class='ctx'> 	txq-&gt;full = 0;</div><div class='ctx'> 	txq-&gt;mapping_err = 0;</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int t4_sge_alloc_ethofld_txq(struct adapter *adap, struct sge_eohw_txq *txq,</div><div class='add'>+			     struct net_device *dev, u32 iqid)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = t4_sge_alloc_ofld_txq(adap, &amp;txq-&gt;q, dev, FW_EQ_OFLD_CMD, iqid);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	txq-&gt;q.q_type = CXGB4_TXQ_ULD;</div><div class='add'>+	spin_lock_init(&amp;txq-&gt;lock);</div><div class='add'>+	txq-&gt;adap = adap;</div><div class='add'>+	txq-&gt;tso = 0;</div><div class='add'>+	txq-&gt;uso = 0;</div><div class='add'>+	txq-&gt;tx_cso = 0;</div><div class='add'>+	txq-&gt;vlan_ins = 0;</div><div class='add'>+	txq-&gt;mapping_err = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> void free_txq(struct adapter *adap, struct sge_txq *q)</div><div class='ctx'> {</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='hunk'>@@ -4019,20 +4875,15 @@ void free_rspq_fl(struct adapter *adap, struct sge_rspq *rq,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- *      t4_free_ofld_rxqs - free a block of consecutive Rx queues</div><div class='del'>- *      @adap: the adapter</div><div class='del'>- *      @n: number of queues</div><div class='del'>- *      @q: pointer to first queue</div><div class='del'>- *</div><div class='del'>- *      Release the resources of a consecutive block of offload Rx queues.</div><div class='del'>- */</div><div class='del'>-void t4_free_ofld_rxqs(struct adapter *adap, int n, struct sge_ofld_rxq *q)</div><div class='add'>+void t4_sge_free_ethofld_txq(struct adapter *adap, struct sge_eohw_txq *txq)</div><div class='ctx'> {</div><div class='del'>-	for ( ; n; n--, q++)</div><div class='del'>-		if (q-&gt;rspq.desc)</div><div class='del'>-			free_rspq_fl(adap, &amp;q-&gt;rspq,</div><div class='del'>-				     q-&gt;fl.size ? &amp;q-&gt;fl : NULL);</div><div class='add'>+	if (txq-&gt;q.desc) {</div><div class='add'>+		t4_ofld_eq_free(adap, adap-&gt;mbox, adap-&gt;pf, 0,</div><div class='add'>+				txq-&gt;q.cntxt_id);</div><div class='add'>+		free_tx_desc(adap, &amp;txq-&gt;q, txq-&gt;q.in_use, false);</div><div class='add'>+		kfree(txq-&gt;q.sdesc);</div><div class='add'>+		free_txq(adap, &amp;txq-&gt;q);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -4064,6 +4915,10 @@ void t4_free_sge_resources(struct adapter *adap)</div><div class='ctx'> 		if (eq-&gt;rspq.desc)</div><div class='ctx'> 			free_rspq_fl(adap, &amp;eq-&gt;rspq,</div><div class='ctx'> 				     eq-&gt;fl.size ? &amp;eq-&gt;fl : NULL);</div><div class='add'>+		if (eq-&gt;msix) {</div><div class='add'>+			cxgb4_free_msix_idx_in_bmap(adap, eq-&gt;msix-&gt;idx);</div><div class='add'>+			eq-&gt;msix = NULL;</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		etq = &amp;adap-&gt;sge.ethtxq[i];</div><div class='ctx'> 		if (etq-&gt;q.desc) {</div><div class='hunk'>@@ -4090,8 +4945,15 @@ void t4_free_sge_resources(struct adapter *adap)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (adap-&gt;sge.fw_evtq.desc)</div><div class='add'>+	if (adap-&gt;sge.fw_evtq.desc) {</div><div class='ctx'> 		free_rspq_fl(adap, &amp;adap-&gt;sge.fw_evtq, NULL);</div><div class='add'>+		if (adap-&gt;sge.fwevtq_msix_idx &gt;= 0)</div><div class='add'>+			cxgb4_free_msix_idx_in_bmap(adap,</div><div class='add'>+						    adap-&gt;sge.fwevtq_msix_idx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (adap-&gt;sge.nd_msix_idx &gt;= 0)</div><div class='add'>+		cxgb4_free_msix_idx_in_bmap(adap, adap-&gt;sge.nd_msix_idx);</div><div class='ctx'> </div><div class='ctx'> 	if (adap-&gt;sge.intrq.desc)</div><div class='ctx'> 		free_rspq_fl(adap, &amp;adap-&gt;sge.intrq, NULL);</div><div class='hunk'>@@ -4134,13 +4996,10 @@ void t4_sge_stop(struct adapter *adap)</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct sge *s = &amp;adap-&gt;sge;</div><div class='ctx'> </div><div class='del'>-	if (in_interrupt())  /* actions below require waiting */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='ctx'> 	if (s-&gt;rx_timer.function)</div><div class='del'>-		del_timer_sync(&amp;s-&gt;rx_timer);</div><div class='add'>+		timer_delete_sync(&amp;s-&gt;rx_timer);</div><div class='ctx'> 	if (s-&gt;tx_timer.function)</div><div class='del'>-		del_timer_sync(&amp;s-&gt;tx_timer);</div><div class='add'>+		timer_delete_sync(&amp;s-&gt;tx_timer);</div><div class='ctx'> </div><div class='ctx'> 	if (is_offload(adap)) {</div><div class='ctx'> 		struct sge_uld_txq_info *txq_info;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/smt.c b/drivers/net/ethernet/chelsio/cxgb4/smt.c<br/>index eaf1fb74689c..e617e4aabbcc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/smt.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/smt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/smt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/smt.c</a></div><div class='hunk'>@@ -55,9 +55,9 @@ struct smt_data *t4_init_smt(void)</div><div class='ctx'> 	for (i = 0; i &lt; s-&gt;smt_size; ++i) {</div><div class='ctx'> 		s-&gt;smtab[i].idx = i;</div><div class='ctx'> 		s-&gt;smtab[i].state = SMT_STATE_UNUSED;</div><div class='del'>-		memset(&amp;s-&gt;smtab[i].src_mac, 0, ETH_ALEN);</div><div class='add'>+		eth_zero_addr(s-&gt;smtab[i].src_mac);</div><div class='ctx'> 		spin_lock_init(&amp;s-&gt;smtab[i].lock);</div><div class='del'>-		atomic_set(&amp;s-&gt;smtab[i].refcnt, 0);</div><div class='add'>+		s-&gt;smtab[i].refcnt = 0;</div><div class='ctx'> 	}</div><div class='ctx'> 	return s;</div><div class='ctx'> }</div><div class='hunk'>@@ -68,7 +68,7 @@ static struct smt_entry *find_or_alloc_smte(struct smt_data *s, u8 *smac)</div><div class='ctx'> 	struct smt_entry *e, *end;</div><div class='ctx'> </div><div class='ctx'> 	for (e = &amp;s-&gt;smtab[0], end = &amp;s-&gt;smtab[s-&gt;smt_size]; e != end; ++e) {</div><div class='del'>-		if (atomic_read(&amp;e-&gt;refcnt) == 0) {</div><div class='add'>+		if (e-&gt;refcnt == 0) {</div><div class='ctx'> 			if (!first_free)</div><div class='ctx'> 				first_free = e;</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -97,22 +97,23 @@ found_reuse:</div><div class='ctx'> </div><div class='ctx'> static void t4_smte_free(struct smt_entry *e)</div><div class='ctx'> {</div><div class='del'>-	spin_lock_bh(&amp;e-&gt;lock);</div><div class='del'>-	if (atomic_read(&amp;e-&gt;refcnt) == 0) {  /* hasn't been recycled */</div><div class='add'>+	if (e-&gt;refcnt == 0) {  /* hasn't been recycled */</div><div class='ctx'> 		e-&gt;state = SMT_STATE_UNUSED;</div><div class='ctx'> 	}</div><div class='del'>-	spin_unlock_bh(&amp;e-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cxgb4_smt_release - Release SMT entry</div><div class='ctx'>  * @e: smt entry to release</div><div class='ctx'>  *</div><div class='ctx'>  * Releases ref count and frees up an smt entry from SMT table</div><div class='ctx'>  */</div><div class='ctx'> void cxgb4_smt_release(struct smt_entry *e)</div><div class='ctx'> {</div><div class='del'>-	if (atomic_dec_and_test(&amp;e-&gt;refcnt))</div><div class='add'>+	spin_lock_bh(&amp;e-&gt;lock);</div><div class='add'>+	if ((--e-&gt;refcnt) == 0)</div><div class='ctx'> 		t4_smte_free(e);</div><div class='add'>+	spin_unlock_bh(&amp;e-&gt;lock);</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxgb4_smt_release);</div><div class='ctx'> </div><div class='hunk'>@@ -215,14 +216,14 @@ static struct smt_entry *t4_smt_alloc_switching(struct adapter *adap, u16 pfvf,</div><div class='ctx'> 	e = find_or_alloc_smte(s, smac);</div><div class='ctx'> 	if (e) {</div><div class='ctx'> 		spin_lock(&amp;e-&gt;lock);</div><div class='del'>-		if (!atomic_read(&amp;e-&gt;refcnt)) {</div><div class='del'>-			atomic_set(&amp;e-&gt;refcnt, 1);</div><div class='add'>+		if (!e-&gt;refcnt) {</div><div class='add'>+			e-&gt;refcnt = 1;</div><div class='ctx'> 			e-&gt;state = SMT_STATE_SWITCHING;</div><div class='ctx'> 			e-&gt;pfvf = pfvf;</div><div class='ctx'> 			memcpy(e-&gt;src_mac, smac, ETH_ALEN);</div><div class='ctx'> 			write_smt_entry(adap, e);</div><div class='ctx'> 		} else {</div><div class='del'>-			atomic_inc(&amp;e-&gt;refcnt);</div><div class='add'>+			++e-&gt;refcnt;</div><div class='ctx'> 		}</div><div class='ctx'> 		spin_unlock(&amp;e-&gt;lock);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -231,6 +232,7 @@ static struct smt_entry *t4_smt_alloc_switching(struct adapter *adap, u16 pfvf,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * cxgb4_smt_alloc_switching - Allocates an SMT entry for switch filters.</div><div class='ctx'>  * @dev: net_device pointer</div><div class='ctx'>  * @smac: MAC address to add to SMT</div><div class='ctx'>  * Returns pointer to the SMT entry created</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/smt.h b/drivers/net/ethernet/chelsio/cxgb4/smt.h<br/>index d6c2cc271398..109c1dff563a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/smt.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/smt.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/smt.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/smt.h</a></div><div class='hunk'>@@ -59,14 +59,14 @@ struct smt_entry {</div><div class='ctx'> 	u16 idx;</div><div class='ctx'> 	u16 pfvf;</div><div class='ctx'> 	u8 src_mac[ETH_ALEN];</div><div class='del'>-	atomic_t refcnt;</div><div class='add'>+	int refcnt;</div><div class='ctx'> 	spinlock_t lock;	/* protect smt entry add,removal */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct smt_data {</div><div class='ctx'> 	unsigned int smt_size;</div><div class='ctx'> 	rwlock_t lock;</div><div class='del'>-	struct smt_entry smtab[0];</div><div class='add'>+	struct smt_entry smtab[] __counted_by(smt_size);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct smt_data *t4_init_smt(void);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/srq.c b/drivers/net/ethernet/chelsio/cxgb4/srq.c<br/>index 9a54302bb046..a77d6ac1ee8c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/srq.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/srq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/srq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/srq.c</a></div><div class='hunk'>@@ -51,64 +51,6 @@ struct srq_data *t4_init_srq(int srq_size)</div><div class='ctx'> 	return s;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* cxgb4_get_srq_entry: read the SRQ table entry</div><div class='del'>- * @dev: Pointer to the net_device</div><div class='del'>- * @idx: Index to the srq</div><div class='del'>- * @entryp: pointer to the srq entry</div><div class='del'>- *</div><div class='del'>- * Sends CPL_SRQ_TABLE_REQ message for the given index.</div><div class='del'>- * Contents will be returned in CPL_SRQ_TABLE_RPL message.</div><div class='del'>- *</div><div class='del'>- * Returns zero if the read is successful, else a error</div><div class='del'>- * number will be returned. Caller should not use the srq</div><div class='del'>- * entry if the return value is non-zero.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-int cxgb4_get_srq_entry(struct net_device *dev,</div><div class='del'>-			int srq_idx, struct srq_entry *entryp)</div><div class='del'>-{</div><div class='del'>-	struct cpl_srq_table_req *req;</div><div class='del'>-	struct adapter *adap;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct srq_data *s;</div><div class='del'>-	int rc = -ENODEV;</div><div class='del'>-</div><div class='del'>-	adap = netdev2adap(dev);</div><div class='del'>-	s = adap-&gt;srq;</div><div class='del'>-</div><div class='del'>-	if (!(adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE) || !s)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	skb = alloc_skb(sizeof(*req), GFP_KERNEL);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	req = (struct cpl_srq_table_req *)</div><div class='del'>-		__skb_put_zero(skb, sizeof(*req));</div><div class='del'>-	INIT_TP_WR(req, 0);</div><div class='del'>-	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_SRQ_TABLE_REQ,</div><div class='del'>-					      TID_TID_V(srq_idx) |</div><div class='del'>-				TID_QID_V(adap-&gt;sge.fw_evtq.abs_id)));</div><div class='del'>-	req-&gt;idx = srq_idx;</div><div class='del'>-</div><div class='del'>-	mutex_lock(&amp;s-&gt;lock);</div><div class='del'>-</div><div class='del'>-	s-&gt;entryp = entryp;</div><div class='del'>-	t4_mgmt_tx(adap, skb);</div><div class='del'>-</div><div class='del'>-	rc = wait_for_completion_timeout(&amp;s-&gt;comp, SRQ_WAIT_TO);</div><div class='del'>-	if (rc)</div><div class='del'>-		rc = 0;</div><div class='del'>-	else /* !rc means we timed out */</div><div class='del'>-		rc = -ETIMEDOUT;</div><div class='del'>-</div><div class='del'>-	WARN_ON_ONCE(entryp-&gt;idx != srq_idx);</div><div class='del'>-	mutex_unlock(&amp;s-&gt;lock);</div><div class='del'>-out:</div><div class='del'>-	return rc;</div><div class='del'>-}</div><div class='del'>-EXPORT_SYMBOL(cxgb4_get_srq_entry);</div><div class='del'>-</div><div class='ctx'> void do_srq_table_rpl(struct adapter *adap,</div><div class='ctx'> 		      const struct cpl_srq_table_rpl *rpl)</div><div class='ctx'> {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/srq.h b/drivers/net/ethernet/chelsio/cxgb4/srq.h<br/>index ec85cf93865a..d9f04bd5ffa3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/srq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/srq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/srq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/srq.h</a></div><div class='hunk'>@@ -58,8 +58,6 @@ struct srq_data {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct srq_data *t4_init_srq(int srq_size);</div><div class='del'>-int cxgb4_get_srq_entry(struct net_device *dev,</div><div class='del'>-			int srq_idx, struct srq_entry *entryp);</div><div class='ctx'> void do_srq_table_rpl(struct adapter *adap,</div><div class='ctx'> 		      const struct cpl_srq_table_rpl *rpl);</div><div class='ctx'> #endif  /* __CXGB4_SRQ_H */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c<br/>index 93feb258067b..171750fad44f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.c</a></div><div class='hunk'>@@ -329,7 +329,7 @@ int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, const void *cmd,</div><div class='ctx'> 	for (i = 0; ; i += ms) {</div><div class='ctx'> 		/* If we've waited too long, return a busy indication.  This</div><div class='ctx'> 		 * really ought to be based on our initial position in the</div><div class='del'>-		 * mailbox access list but this is a start.  We very rearely</div><div class='add'>+		 * mailbox access list but this is a start.  We very rarely</div><div class='ctx'> 		 * contend on access to the mailbox ...</div><div class='ctx'> 		 */</div><div class='ctx'> 		pcie_fw = t4_read_reg(adap, PCIE_FW_A);</div><div class='hunk'>@@ -606,7 +606,7 @@ void t4_memory_rw_residual(struct adapter *adap, u32 off, u32 addr, u8 *buf,</div><div class='ctx'>  *</div><div class='ctx'>  *	Reads/writes an [almost] arbitrary memory region in the firmware: the</div><div class='ctx'>  *	firmware memory address and host buffer must be aligned on 32-bit</div><div class='del'>- *	boudaries; the length may be arbitrary.  The memory is transferred as</div><div class='add'>+ *	boundaries; the length may be arbitrary.  The memory is transferred as</div><div class='ctx'>  *	a raw byte sequence from/to the firmware's memory.  If this memory</div><div class='ctx'>  *	contains data structures which contain multi-byte integers, it's the</div><div class='ctx'>  *	caller's responsibility to perform appropriate byte order conversions.</div><div class='hunk'>@@ -1379,8 +1379,7 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x9608, 0x9638,</div><div class='ctx'> 		0x9640, 0x96f4,</div><div class='ctx'> 		0x9800, 0x9808,</div><div class='del'>-		0x9820, 0x983c,</div><div class='del'>-		0x9850, 0x9864,</div><div class='add'>+		0x9810, 0x9864,</div><div class='ctx'> 		0x9c00, 0x9c6c,</div><div class='ctx'> 		0x9c80, 0x9cec,</div><div class='ctx'> 		0x9d00, 0x9d6c,</div><div class='hunk'>@@ -1389,7 +1388,7 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x9e80, 0x9eec,</div><div class='ctx'> 		0x9f00, 0x9f6c,</div><div class='ctx'> 		0x9f80, 0xa020,</div><div class='del'>-		0xd004, 0xd004,</div><div class='add'>+		0xd000, 0xd004,</div><div class='ctx'> 		0xd010, 0xd03c,</div><div class='ctx'> 		0xdfc0, 0xdfe0,</div><div class='ctx'> 		0xe000, 0x1106c,</div><div class='hunk'>@@ -1430,10 +1429,8 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x1a0b0, 0x1a0e4,</div><div class='ctx'> 		0x1a0ec, 0x1a0f8,</div><div class='ctx'> 		0x1a100, 0x1a108,</div><div class='del'>-		0x1a114, 0x1a120,</div><div class='del'>-		0x1a128, 0x1a130,</div><div class='del'>-		0x1a138, 0x1a138,</div><div class='del'>-		0x1a190, 0x1a1c4,</div><div class='add'>+		0x1a114, 0x1a130,</div><div class='add'>+		0x1a138, 0x1a1c4,</div><div class='ctx'> 		0x1a1fc, 0x1a1fc,</div><div class='ctx'> 		0x1e008, 0x1e00c,</div><div class='ctx'> 		0x1e040, 0x1e044,</div><div class='hunk'>@@ -2093,7 +2090,8 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x1190, 0x1194,</div><div class='ctx'> 		0x11a0, 0x11a4,</div><div class='ctx'> 		0x11b0, 0x11b4,</div><div class='del'>-		0x11fc, 0x1274,</div><div class='add'>+		0x11fc, 0x123c,</div><div class='add'>+		0x1254, 0x1274,</div><div class='ctx'> 		0x1280, 0x133c,</div><div class='ctx'> 		0x1800, 0x18fc,</div><div class='ctx'> 		0x3000, 0x302c,</div><div class='hunk'>@@ -2162,8 +2160,7 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x9640, 0x9704,</div><div class='ctx'> 		0x9710, 0x971c,</div><div class='ctx'> 		0x9800, 0x9808,</div><div class='del'>-		0x9820, 0x983c,</div><div class='del'>-		0x9850, 0x9864,</div><div class='add'>+		0x9810, 0x9864,</div><div class='ctx'> 		0x9c00, 0x9c6c,</div><div class='ctx'> 		0x9c80, 0x9cec,</div><div class='ctx'> 		0x9d00, 0x9d6c,</div><div class='hunk'>@@ -2172,7 +2169,7 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x9e80, 0x9eec,</div><div class='ctx'> 		0x9f00, 0x9f6c,</div><div class='ctx'> 		0x9f80, 0xa020,</div><div class='del'>-		0xd004, 0xd03c,</div><div class='add'>+		0xd000, 0xd03c,</div><div class='ctx'> 		0xd100, 0xd118,</div><div class='ctx'> 		0xd200, 0xd214,</div><div class='ctx'> 		0xd220, 0xd234,</div><div class='hunk'>@@ -2240,10 +2237,8 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> 		0x1a0b0, 0x1a0e4,</div><div class='ctx'> 		0x1a0ec, 0x1a0f8,</div><div class='ctx'> 		0x1a100, 0x1a108,</div><div class='del'>-		0x1a114, 0x1a120,</div><div class='del'>-		0x1a128, 0x1a130,</div><div class='del'>-		0x1a138, 0x1a138,</div><div class='del'>-		0x1a190, 0x1a1c4,</div><div class='add'>+		0x1a114, 0x1a130,</div><div class='add'>+		0x1a138, 0x1a1c4,</div><div class='ctx'> 		0x1a1fc, 0x1a1fc,</div><div class='ctx'> 		0x1e008, 0x1e00c,</div><div class='ctx'> 		0x1e040, 0x1e044,</div><div class='hunk'>@@ -2695,7 +2690,6 @@ void t4_get_regs(struct adapter *adap, void *buf, size_t buf_size)</div><div class='ctx'> #define VPD_BASE           0x400</div><div class='ctx'> #define VPD_BASE_OLD       0</div><div class='ctx'> #define VPD_LEN            1024</div><div class='del'>-#define CHELSIO_VPD_UNIQUE_ID 0x82</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * t4_eeprom_ptov - translate a physical EEPROM address to virtual</div><div class='hunk'>@@ -2749,10 +2743,9 @@ int t4_seeprom_wp(struct adapter *adapter, bool enable)</div><div class='ctx'>  */</div><div class='ctx'> int t4_get_raw_vpd_params(struct adapter *adapter, struct vpd_params *p)</div><div class='ctx'> {</div><div class='del'>-	int i, ret = 0, addr;</div><div class='del'>-	int ec, sn, pn, na;</div><div class='del'>-	u8 *vpd, csum;</div><div class='del'>-	unsigned int vpdr_len, kw_offset, id_len;</div><div class='add'>+	unsigned int id_len, pn_len, sn_len, na_len;</div><div class='add'>+	int id, sn, pn, na, addr, ret = 0;</div><div class='add'>+	u8 *vpd, base_val = 0;</div><div class='ctx'> </div><div class='ctx'> 	vpd = vmalloc(VPD_LEN);</div><div class='ctx'> 	if (!vpd)</div><div class='hunk'>@@ -2761,90 +2754,62 @@ int t4_get_raw_vpd_params(struct adapter *adapter, struct vpd_params *p)</div><div class='ctx'> 	/* Card information normally starts at VPD_BASE but early cards had</div><div class='ctx'> 	 * it at 0.</div><div class='ctx'> 	 */</div><div class='del'>-	ret = pci_read_vpd(adapter-&gt;pdev, VPD_BASE, sizeof(u32), vpd);</div><div class='add'>+	ret = pci_read_vpd(adapter-&gt;pdev, VPD_BASE, 1, &amp;base_val);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	/* The VPD shall have a unique identifier specified by the PCI SIG.</div><div class='del'>-	 * For chelsio adapters, the identifier is 0x82. The first byte of a VPD</div><div class='del'>-	 * shall be CHELSIO_VPD_UNIQUE_ID (0x82). The VPD programming software</div><div class='del'>-	 * is expected to automatically put this entry at the</div><div class='del'>-	 * beginning of the VPD.</div><div class='del'>-	 */</div><div class='del'>-	addr = *vpd == CHELSIO_VPD_UNIQUE_ID ? VPD_BASE : VPD_BASE_OLD;</div><div class='add'>+	addr = base_val == PCI_VPD_LRDT_ID_STRING ? VPD_BASE : VPD_BASE_OLD;</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_read_vpd(adapter-&gt;pdev, addr, VPD_LEN, vpd);</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	if (vpd[0] != PCI_VPD_LRDT_ID_STRING) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev, "missing VPD ID string\n");</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	ret = pci_vpd_find_id_string(vpd, VPD_LEN, &amp;id_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id_len = pci_vpd_lrdt_size(vpd);</div><div class='del'>-	if (id_len &gt; ID_LEN)</div><div class='del'>-		id_len = ID_LEN;</div><div class='add'>+	id = ret;</div><div class='ctx'> </div><div class='del'>-	i = pci_vpd_find_tag(vpd, 0, VPD_LEN, PCI_VPD_LRDT_RO_DATA);</div><div class='del'>-	if (i &lt; 0) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev, "missing VPD-R section\n");</div><div class='add'>+	ret = pci_vpd_check_csum(vpd, VPD_LEN);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev, "VPD checksum incorrect or missing\n");</div><div class='ctx'> 		ret = -EINVAL;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	vpdr_len = pci_vpd_lrdt_size(&amp;vpd[i]);</div><div class='del'>-	kw_offset = i + PCI_VPD_LRDT_TAG_SIZE;</div><div class='del'>-	if (vpdr_len + kw_offset &gt; VPD_LEN) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev, "bad VPD-R length %u\n", vpdr_len);</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	ret = pci_vpd_find_ro_info_keyword(vpd, VPD_LEN,</div><div class='add'>+					   PCI_VPD_RO_KEYWORD_SERIALNO, &amp;sn_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define FIND_VPD_KW(var, name) do { \</div><div class='del'>-	var = pci_vpd_find_info_keyword(vpd, kw_offset, vpdr_len, name); \</div><div class='del'>-	if (var &lt; 0) { \</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev, "missing VPD keyword " name "\n"); \</div><div class='del'>-		ret = -EINVAL; \</div><div class='del'>-		goto out; \</div><div class='del'>-	} \</div><div class='del'>-	var += PCI_VPD_INFO_FLD_HDR_SIZE; \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-	FIND_VPD_KW(i, "RV");</div><div class='del'>-	for (csum = 0; i &gt;= 0; i--)</div><div class='del'>-		csum += vpd[i];</div><div class='add'>+	sn = ret;</div><div class='ctx'> </div><div class='del'>-	if (csum) {</div><div class='del'>-		dev_err(adapter-&gt;pdev_dev,</div><div class='del'>-			"corrupted VPD EEPROM, actual csum %u\n", csum);</div><div class='del'>-		ret = -EINVAL;</div><div class='add'>+	ret = pci_vpd_find_ro_info_keyword(vpd, VPD_LEN,</div><div class='add'>+					   PCI_VPD_RO_KEYWORD_PARTNO, &amp;pn_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto out;</div><div class='del'>-	}</div><div class='add'>+	pn = ret;</div><div class='ctx'> </div><div class='del'>-	FIND_VPD_KW(ec, "EC");</div><div class='del'>-	FIND_VPD_KW(sn, "SN");</div><div class='del'>-	FIND_VPD_KW(pn, "PN");</div><div class='del'>-	FIND_VPD_KW(na, "NA");</div><div class='del'>-#undef FIND_VPD_KW</div><div class='add'>+	ret = pci_vpd_find_ro_info_keyword(vpd, VPD_LEN, "NA", &amp;na_len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+	na = ret;</div><div class='ctx'> </div><div class='del'>-	memcpy(p-&gt;id, vpd + PCI_VPD_LRDT_TAG_SIZE, id_len);</div><div class='add'>+	memcpy(p-&gt;id, vpd + id, min_t(unsigned int, id_len, ID_LEN));</div><div class='ctx'> 	strim(p-&gt;id);</div><div class='del'>-	memcpy(p-&gt;ec, vpd + ec, EC_LEN);</div><div class='del'>-	strim(p-&gt;ec);</div><div class='del'>-	i = pci_vpd_info_field_size(vpd + sn - PCI_VPD_INFO_FLD_HDR_SIZE);</div><div class='del'>-	memcpy(p-&gt;sn, vpd + sn, min(i, SERNUM_LEN));</div><div class='add'>+	memcpy(p-&gt;sn, vpd + sn, min_t(unsigned int, sn_len, SERNUM_LEN));</div><div class='ctx'> 	strim(p-&gt;sn);</div><div class='del'>-	i = pci_vpd_info_field_size(vpd + pn - PCI_VPD_INFO_FLD_HDR_SIZE);</div><div class='del'>-	memcpy(p-&gt;pn, vpd + pn, min(i, PN_LEN));</div><div class='add'>+	memcpy(p-&gt;pn, vpd + pn, min_t(unsigned int, pn_len, PN_LEN));</div><div class='ctx'> 	strim(p-&gt;pn);</div><div class='del'>-	memcpy(p-&gt;na, vpd + na, min(i, MACADDR_LEN));</div><div class='del'>-	strim((char *)p-&gt;na);</div><div class='add'>+	memcpy(p-&gt;na, vpd + na, min_t(unsigned int, na_len, MACADDR_LEN));</div><div class='add'>+	strim(p-&gt;na);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	vfree(vpd);</div><div class='del'>-	return ret &lt; 0 ? ret : 0;</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		dev_err(adapter-&gt;pdev_dev, "error reading VPD\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -3072,16 +3037,19 @@ int t4_read_flash(struct adapter *adapter, unsigned int addr,</div><div class='ctx'>  *	@addr: the start address to write</div><div class='ctx'>  *	@n: length of data to write in bytes</div><div class='ctx'>  *	@data: the data to write</div><div class='add'>+ *	@byte_oriented: whether to store data as bytes or as words</div><div class='ctx'>  *</div><div class='ctx'>  *	Writes up to a page of data (256 bytes) to the serial flash starting</div><div class='ctx'>  *	at the given address.  All the data must be written to the same page.</div><div class='add'>+ *	If @byte_oriented is set the write data is stored as byte stream</div><div class='add'>+ *	(i.e. matches what on disk), otherwise in big-endian.</div><div class='ctx'>  */</div><div class='ctx'> static int t4_write_flash(struct adapter *adapter, unsigned int addr,</div><div class='del'>-			  unsigned int n, const u8 *data)</div><div class='add'>+			  unsigned int n, const u8 *data, bool byte_oriented)</div><div class='ctx'> {</div><div class='del'>-	int ret;</div><div class='del'>-	u32 buf[64];</div><div class='ctx'> 	unsigned int i, c, left, val, offset = addr &amp; 0xff;</div><div class='add'>+	u32 buf[64];</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (addr &gt;= adapter-&gt;params.sf_size || offset + n &gt; SF_PAGE_SIZE)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -3092,10 +3060,14 @@ static int t4_write_flash(struct adapter *adapter, unsigned int addr,</div><div class='ctx'> 	    (ret = sf1_write(adapter, 4, 1, 1, val)) != 0)</div><div class='ctx'> 		goto unlock;</div><div class='ctx'> </div><div class='del'>-	for (left = n; left; left -= c) {</div><div class='add'>+	for (left = n; left; left -= c, data += c) {</div><div class='ctx'> 		c = min(left, 4U);</div><div class='del'>-		for (val = 0, i = 0; i &lt; c; ++i)</div><div class='del'>-			val = (val &lt;&lt; 8) + *data++;</div><div class='add'>+		for (val = 0, i = 0; i &lt; c; ++i) {</div><div class='add'>+			if (byte_oriented)</div><div class='add'>+				val = (val &lt;&lt; 8) + data[i];</div><div class='add'>+			else</div><div class='add'>+				val = (val &lt;&lt; 8) + data[c - i - 1];</div><div class='add'>+		}</div><div class='ctx'> </div><div class='ctx'> 		ret = sf1_write(adapter, c, c != left, 1, val);</div><div class='ctx'> 		if (ret)</div><div class='hunk'>@@ -3108,7 +3080,8 @@ static int t4_write_flash(struct adapter *adapter, unsigned int addr,</div><div class='ctx'> 	t4_write_reg(adapter, SF_OP_A, 0);    /* unlock SF */</div><div class='ctx'> </div><div class='ctx'> 	/* Read the page to verify the write succeeded */</div><div class='del'>-	ret = t4_read_flash(adapter, addr &amp; ~0xff, ARRAY_SIZE(buf), buf, 1);</div><div class='add'>+	ret = t4_read_flash(adapter, addr &amp; ~0xff, ARRAY_SIZE(buf), buf,</div><div class='add'>+			    byte_oriented);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3169,7 +3142,7 @@ int t4_get_tp_version(struct adapter *adapter, u32 *vers)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	t4_get_exprom_version - return the Expansion ROM version (if any)</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@vers: where to place the version</div><div class='ctx'>  *</div><div class='ctx'>  *	Reads the Expansion ROM header from FLASH and returns the version</div><div class='hunk'>@@ -3499,7 +3472,7 @@ int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,</div><div class='ctx'> 	drv_fw = &amp;fw_info-&gt;fw_hdr;</div><div class='ctx'> </div><div class='ctx'> 	/* Read the header of the firmware on the card */</div><div class='del'>-	ret = -t4_read_flash(adap, FLASH_FW_START,</div><div class='add'>+	ret = t4_read_flash(adap, FLASH_FW_START,</div><div class='ctx'> 			    sizeof(*card_fw) / sizeof(uint32_t),</div><div class='ctx'> 			    (uint32_t *)card_fw, 1);</div><div class='ctx'> 	if (ret == 0) {</div><div class='hunk'>@@ -3528,8 +3501,8 @@ int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,</div><div class='ctx'> 		   should_install_fs_fw(adap, card_fw_usable,</div><div class='ctx'> 					be32_to_cpu(fs_fw-&gt;fw_ver),</div><div class='ctx'> 					be32_to_cpu(card_fw-&gt;fw_ver))) {</div><div class='del'>-		ret = -t4_fw_upgrade(adap, adap-&gt;mbox, fw_data,</div><div class='del'>-				     fw_size, 0);</div><div class='add'>+		ret = t4_fw_upgrade(adap, adap-&gt;mbox, fw_data,</div><div class='add'>+				    fw_size, 0);</div><div class='ctx'> 		if (ret != 0) {</div><div class='ctx'> 			dev_err(adap-&gt;pdev_dev,</div><div class='ctx'> 				"failed to install firmware: %d\n", ret);</div><div class='hunk'>@@ -3560,7 +3533,7 @@ int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,</div><div class='ctx'> 			FW_HDR_FW_VER_MICRO_G(c), FW_HDR_FW_VER_BUILD_G(c),</div><div class='ctx'> 			FW_HDR_FW_VER_MAJOR_G(k), FW_HDR_FW_VER_MINOR_G(k),</div><div class='ctx'> 			FW_HDR_FW_VER_MICRO_G(k), FW_HDR_FW_VER_BUILD_G(k));</div><div class='del'>-		ret = EINVAL;</div><div class='add'>+		ret = -EINVAL;</div><div class='ctx'> 		goto bye;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3704,7 +3677,7 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)</div><div class='ctx'> 	 */</div><div class='ctx'> 	memcpy(first_page, fw_data, SF_PAGE_SIZE);</div><div class='ctx'> 	((struct fw_hdr *)first_page)-&gt;fw_ver = cpu_to_be32(0xffffffff);</div><div class='del'>-	ret = t4_write_flash(adap, fw_start, SF_PAGE_SIZE, first_page);</div><div class='add'>+	ret = t4_write_flash(adap, fw_start, SF_PAGE_SIZE, first_page, true);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -3712,14 +3685,14 @@ int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)</div><div class='ctx'> 	for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {</div><div class='ctx'> 		addr += SF_PAGE_SIZE;</div><div class='ctx'> 		fw_data += SF_PAGE_SIZE;</div><div class='del'>-		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, fw_data);</div><div class='add'>+		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, fw_data, true);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ret = t4_write_flash(adap,</div><div class='del'>-			     fw_start + offsetof(struct fw_hdr, fw_ver),</div><div class='del'>-			     sizeof(hdr-&gt;fw_ver), (const u8 *)&amp;hdr-&gt;fw_ver);</div><div class='add'>+	ret = t4_write_flash(adap, fw_start + offsetof(struct fw_hdr, fw_ver),</div><div class='add'>+			     sizeof(hdr-&gt;fw_ver), (const u8 *)&amp;hdr-&gt;fw_ver,</div><div class='add'>+			     true);</div><div class='ctx'> out:</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		dev_err(adap-&gt;pdev_dev, "firmware download failed, error %d\n",</div><div class='hunk'>@@ -3748,7 +3721,7 @@ int t4_phy_fw_ver(struct adapter *adap, int *phy_fw_ver)</div><div class='ctx'> 		 FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_PHYFW_VERSION));</div><div class='ctx'> 	ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1,</div><div class='ctx'> 			      &amp;param, &amp;val);</div><div class='del'>-	if (ret &lt; 0)</div><div class='add'>+	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> 	*phy_fw_ver = val;</div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3758,7 +3731,6 @@ int t4_phy_fw_ver(struct adapter *adap, int *phy_fw_ver)</div><div class='ctx'>  *	t4_load_phy_fw - download port PHY firmware</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *	@win: the PCI-E Memory Window index to use for t4_memory_rw()</div><div class='del'>- *	@win_lock: the lock to use to guard the memory copy</div><div class='ctx'>  *	@phy_fw_version: function to check PHY firmware versions</div><div class='ctx'>  *	@phy_fw_data: the PHY firmware image to write</div><div class='ctx'>  *	@phy_fw_size: image size</div><div class='hunk'>@@ -3767,28 +3739,25 @@ int t4_phy_fw_ver(struct adapter *adap, int *phy_fw_ver)</div><div class='ctx'>  *	@phy_fw_version is supplied, then it will be used to determine if</div><div class='ctx'>  *	it's necessary to perform the transfer by comparing the version</div><div class='ctx'>  *	of any existing adapter PHY firmware with that of the passed in</div><div class='del'>- *	PHY firmware image.  If @win_lock is non-NULL then it will be used</div><div class='del'>- *	around the call to t4_memory_rw() which transfers the PHY firmware</div><div class='del'>- *	to the adapter.</div><div class='add'>+ *	PHY firmware image.</div><div class='ctx'>  *</div><div class='ctx'>  *	A negative error number will be returned if an error occurs.  If</div><div class='ctx'>  *	version number support is available and there's no need to upgrade</div><div class='ctx'>  *	the firmware, 0 will be returned.  If firmware is successfully</div><div class='del'>- *	transferred to the adapter, 1 will be retured.</div><div class='add'>+ *	transferred to the adapter, 1 will be returned.</div><div class='ctx'>  *</div><div class='ctx'>  *	NOTE: some adapters only have local RAM to store the PHY firmware.  As</div><div class='ctx'>  *	a result, a RESET of the adapter would cause that RAM to lose its</div><div class='ctx'>  *	contents.  Thus, loading PHY firmware on such adapters must happen</div><div class='ctx'>  *	after any FW_RESET_CMDs ...</div><div class='ctx'>  */</div><div class='del'>-int t4_load_phy_fw(struct adapter *adap,</div><div class='del'>-		   int win, spinlock_t *win_lock,</div><div class='add'>+int t4_load_phy_fw(struct adapter *adap, int win,</div><div class='ctx'> 		   int (*phy_fw_version)(const u8 *, size_t),</div><div class='ctx'> 		   const u8 *phy_fw_data, size_t phy_fw_size)</div><div class='ctx'> {</div><div class='add'>+	int cur_phy_fw_ver = 0, new_phy_fw_vers = 0;</div><div class='ctx'> 	unsigned long mtype = 0, maddr = 0;</div><div class='ctx'> 	u32 param, val;</div><div class='del'>-	int cur_phy_fw_ver = 0, new_phy_fw_vers = 0;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* If we have version number support, then check to see if the adapter</div><div class='hunk'>@@ -3808,7 +3777,7 @@ int t4_load_phy_fw(struct adapter *adap,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Ask the firmware where it wants us to copy the PHY firmware image.</div><div class='del'>-	 * The size of the file requires a special version of the READ coommand</div><div class='add'>+	 * The size of the file requires a special version of the READ command</div><div class='ctx'> 	 * which will pass the file size via the values field in PARAMS_CMD and</div><div class='ctx'> 	 * retrieve the return value from firmware and place it in the same</div><div class='ctx'> 	 * buffer values</div><div class='hunk'>@@ -3828,13 +3797,11 @@ int t4_load_phy_fw(struct adapter *adap,</div><div class='ctx'> 	/* Copy the supplied PHY Firmware image to the adapter memory location</div><div class='ctx'> 	 * allocated by the adapter firmware.</div><div class='ctx'> 	 */</div><div class='del'>-	if (win_lock)</div><div class='del'>-		spin_lock_bh(win_lock);</div><div class='add'>+	spin_lock_bh(&amp;adap-&gt;win0_lock);</div><div class='ctx'> 	ret = t4_memory_rw(adap, win, mtype, maddr,</div><div class='ctx'> 			   phy_fw_size, (__be32 *)phy_fw_data,</div><div class='ctx'> 			   T4_MEMORY_WRITE);</div><div class='del'>-	if (win_lock)</div><div class='del'>-		spin_unlock_bh(win_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adap-&gt;win0_lock);</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='hunk'>@@ -3849,6 +3816,8 @@ int t4_load_phy_fw(struct adapter *adap,</div><div class='ctx'> 		 FW_PARAMS_PARAM_Z_V(FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD));</div><div class='ctx'> 	ret = t4_set_params_timeout(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1,</div><div class='ctx'> 				    &amp;param, &amp;val, 30000);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='ctx'> </div><div class='ctx'> 	/* If we have version number support, then check to see that the new</div><div class='ctx'> 	 * firmware got loaded properly.</div><div class='hunk'>@@ -4082,14 +4051,15 @@ static inline fw_port_cap32_t cc_to_fwcap_pause(enum cc_pause cc_pause)</div><div class='ctx'> 		fw_pause |= FW_PORT_CAP32_FORCE_PAUSE;</div><div class='ctx'> </div><div class='ctx'> 	/* Translate orthogonal Pause controls into IEEE 802.3 Pause,</div><div class='del'>-	 * Asymetrical Pause for use in reporting to upper layer OS code, etc.</div><div class='add'>+	 * Asymmetrical Pause for use in reporting to upper layer OS code, etc.</div><div class='ctx'> 	 * Note that these bits are ignored in L1 Configure commands.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (cc_pause &amp; PAUSE_RX) {</div><div class='ctx'> 		if (cc_pause &amp; PAUSE_TX)</div><div class='ctx'> 			fw_pause |= FW_PORT_CAP32_802_3_PAUSE;</div><div class='ctx'> 		else</div><div class='del'>-			fw_pause |= FW_PORT_CAP32_802_3_ASM_DIR;</div><div class='add'>+			fw_pause |= FW_PORT_CAP32_802_3_ASM_DIR |</div><div class='add'>+				    FW_PORT_CAP32_802_3_PAUSE;</div><div class='ctx'> 	} else if (cc_pause &amp; PAUSE_TX) {</div><div class='ctx'> 		fw_pause |= FW_PORT_CAP32_802_3_ASM_DIR;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -4151,7 +4121,7 @@ fw_port_cap32_t t4_link_acaps(struct adapter *adapter, unsigned int port,</div><div class='ctx'> 	/* Convert Common Code Forward Error Control settings into the</div><div class='ctx'> 	 * Firmware's API.  If the current Requested FEC has "Automatic"</div><div class='ctx'> 	 * (IEEE 802.3) specified, then we use whatever the Firmware</div><div class='del'>-	 * sent us as part of it's IEEE 802.3-based interpratation of</div><div class='add'>+	 * sent us as part of its IEEE 802.3-based interpretation of</div><div class='ctx'> 	 * the Transceiver Module EPROM FEC parameters.  Otherwise we</div><div class='ctx'> 	 * use whatever is in the current Requested FEC settings.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -4248,7 +4218,7 @@ int t4_link_l1cfg_core(struct adapter *adapter, unsigned int mbox,</div><div class='ctx'> </div><div class='ctx'> 	/* Unfortunately, even if the Requested Port Capabilities "fit" within</div><div class='ctx'> 	 * the Physical Port Capabilities, some combinations of features may</div><div class='del'>-	 * still not be leagal.  For example, 40Gb/s and Reed-Solomon Forward</div><div class='add'>+	 * still not be legal.  For example, 40Gb/s and Reed-Solomon Forward</div><div class='ctx'> 	 * Error Correction.  So if the Firmware rejects the L1 Configure</div><div class='ctx'> 	 * request, flag that here.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -4479,7 +4449,7 @@ static void tp_intr_handler(struct adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static void sge_intr_handler(struct adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-	u64 v;</div><div class='add'>+	u32 v = 0, perr;</div><div class='ctx'> 	u32 err;</div><div class='ctx'> </div><div class='ctx'> 	static const struct intr_info sge_intr_info[] = {</div><div class='hunk'>@@ -4514,13 +4484,29 @@ static void sge_intr_handler(struct adapter *adapter)</div><div class='ctx'> 		{ 0 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	v = (u64)t4_read_reg(adapter, SGE_INT_CAUSE1_A) |</div><div class='del'>-		((u64)t4_read_reg(adapter, SGE_INT_CAUSE2_A) &lt;&lt; 32);</div><div class='del'>-	if (v) {</div><div class='del'>-		dev_alert(adapter-&gt;pdev_dev, "SGE parity error (%#llx)\n",</div><div class='del'>-				(unsigned long long)v);</div><div class='del'>-		t4_write_reg(adapter, SGE_INT_CAUSE1_A, v);</div><div class='del'>-		t4_write_reg(adapter, SGE_INT_CAUSE2_A, v &gt;&gt; 32);</div><div class='add'>+	perr = t4_read_reg(adapter, SGE_INT_CAUSE1_A);</div><div class='add'>+	if (perr) {</div><div class='add'>+		v |= perr;</div><div class='add'>+		dev_alert(adapter-&gt;pdev_dev, "SGE Cause1 Parity Error %#x\n",</div><div class='add'>+			  perr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	perr = t4_read_reg(adapter, SGE_INT_CAUSE2_A);</div><div class='add'>+	if (perr) {</div><div class='add'>+		v |= perr;</div><div class='add'>+		dev_alert(adapter-&gt;pdev_dev, "SGE Cause2 Parity Error %#x\n",</div><div class='add'>+			  perr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (CHELSIO_CHIP_VERSION(adapter-&gt;params.chip) &gt;= CHELSIO_T5) {</div><div class='add'>+		perr = t4_read_reg(adapter, SGE_INT_CAUSE5_A);</div><div class='add'>+		/* Parity error (CRC) for err_T_RxCRC is trivial, ignore it */</div><div class='add'>+		perr &amp;= ~ERR_T_RXCRC_F;</div><div class='add'>+		if (perr) {</div><div class='add'>+			v |= perr;</div><div class='add'>+			dev_alert(adapter-&gt;pdev_dev,</div><div class='add'>+				  "SGE Cause5 Parity Error %#x\n", perr);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	v |= t4_handle_intr_status(adapter, SGE_INT_CAUSE3_A, sge_intr_info);</div><div class='hunk'>@@ -4742,9 +4728,11 @@ static void le_intr_handler(struct adapter *adap)</div><div class='ctx'> 	static struct intr_info t6_le_intr_info[] = {</div><div class='ctx'> 		{ T6_LIPMISS_F, "LE LIP miss", -1, 0 },</div><div class='ctx'> 		{ T6_LIP0_F, "LE 0 LIP error", -1, 0 },</div><div class='add'>+		{ CMDTIDERR_F, "LE cmd tid error", -1, 1 },</div><div class='ctx'> 		{ TCAMINTPERR_F, "LE parity error", -1, 1 },</div><div class='ctx'> 		{ T6_UNKNOWNCMD_F, "LE unknown command", -1, 1 },</div><div class='ctx'> 		{ SSRAMINTPERR_F, "LE request queue parity error", -1, 1 },</div><div class='add'>+		{ HASHTBLMEMCRCERR_F, "LE hash table mem crc error", -1, 0 },</div><div class='ctx'> 		{ 0 }</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='hunk'>@@ -5299,7 +5287,7 @@ static unsigned int t4_use_ldst(struct adapter *adap)</div><div class='ctx'>  * @cmd: TP fw ldst address space type</div><div class='ctx'>  * @vals: where the indirect register values are stored/written</div><div class='ctx'>  * @nregs: how many indirect registers to read/write</div><div class='del'>- * @start_idx: index of first indirect register to read/write</div><div class='add'>+ * @start_index: index of first indirect register to read/write</div><div class='ctx'>  * @rw: Read (1) or Write (0)</div><div class='ctx'>  * @sleep_ok: if true we may sleep while awaiting command completion</div><div class='ctx'>  *</div><div class='hunk'>@@ -6104,7 +6092,7 @@ void t4_pmrx_get_stats(struct adapter *adap, u32 cnt[], u64 cycles[])</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	compute_mps_bg_map - compute the MPS Buffer Group Map for a Port</div><div class='del'>- *	@adap: the adapter</div><div class='add'>+ *	@adapter: the adapter</div><div class='ctx'>  *	@pidx: the port index</div><div class='ctx'>  *</div><div class='ctx'>  *	Computes and returns a bitmap indicating which MPS buffer groups are</div><div class='hunk'>@@ -6209,8 +6197,39 @@ unsigned int t4_get_mps_bg_map(struct adapter *adapter, int pidx)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ *      t4_get_tp_e2c_map - return the E2C channel map associated with a port</div><div class='add'>+ *      @adapter: the adapter</div><div class='add'>+ *      @pidx: the port index</div><div class='add'>+ */</div><div class='add'>+static unsigned int t4_get_tp_e2c_map(struct adapter *adapter, int pidx)</div><div class='add'>+{</div><div class='add'>+	unsigned int nports;</div><div class='add'>+	u32 param, val = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	nports = 1 &lt;&lt; NUMPORTS_G(t4_read_reg(adapter, MPS_CMN_CTL_A));</div><div class='add'>+	if (pidx &gt;= nports) {</div><div class='add'>+		CH_WARN(adapter, "TP E2C Channel Port Index %d &gt;= Nports %d\n",</div><div class='add'>+			pidx, nports);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* FW version &gt;= 1.16.44.0 can determine E2C channel map using</div><div class='add'>+	 * FW_PARAMS_PARAM_DEV_TPCHMAP API.</div><div class='add'>+	 */</div><div class='add'>+	param = (FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) |</div><div class='add'>+		 FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_TPCHMAP));</div><div class='add'>+	ret = t4_query_params_ns(adapter, adapter-&gt;mbox, adapter-&gt;pf,</div><div class='add'>+				 0, 1, &amp;param, &amp;val);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return (val &gt;&gt; (8 * pidx)) &amp; 0xff;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  *	t4_get_tp_ch_map - return TP ingress channels associated with a port</div><div class='del'>- *	@adapter: the adapter</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@pidx: the port index</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns a bitmap indicating which TP Ingress Channels are associated</div><div class='hunk'>@@ -6547,7 +6566,7 @@ int t4_mdio_rd(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,</div><div class='ctx'>  *	@phy_addr: the PHY address</div><div class='ctx'>  *	@mmd: the PHY MMD to access (0 for clause 22 PHYs)</div><div class='ctx'>  *	@reg: the register to write</div><div class='del'>- *	@valp: value to write</div><div class='add'>+ *	@val: value to write</div><div class='ctx'>  *</div><div class='ctx'>  *	Issues a FW command through the given mailbox to write a PHY register.</div><div class='ctx'>  */</div><div class='hunk'>@@ -6573,7 +6592,7 @@ int t4_mdio_wr(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	t4_sge_decode_idma_state - decode the idma state</div><div class='del'>- *	@adap: the adapter</div><div class='add'>+ *	@adapter: the adapter</div><div class='ctx'>  *	@state: the state idma is stuck in</div><div class='ctx'>  */</div><div class='ctx'> void t4_sge_decode_idma_state(struct adapter *adapter, int state)</div><div class='hunk'>@@ -6740,7 +6759,7 @@ void t4_sge_decode_idma_state(struct adapter *adapter, int state)</div><div class='ctx'>  *      t4_sge_ctxt_flush - flush the SGE context cache</div><div class='ctx'>  *      @adap: the adapter</div><div class='ctx'>  *      @mbox: mailbox to use for the FW command</div><div class='del'>- *      @ctx_type: Egress or Ingress</div><div class='add'>+ *      @ctxt_type: Egress or Ingress</div><div class='ctx'>  *</div><div class='ctx'>  *      Issues a FW command through the given mailbox to flush the</div><div class='ctx'>  *      SGE context cache.</div><div class='hunk'>@@ -6766,8 +6785,8 @@ int t4_sge_ctxt_flush(struct adapter *adap, unsigned int mbox, int ctxt_type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	t4_read_sge_dbqtimers - reag SGE Doorbell Queue Timer values</div><div class='del'>- *	@adap - the adapter</div><div class='add'>+ *	t4_read_sge_dbqtimers - read SGE Doorbell Queue Timer values</div><div class='add'>+ *	@adap: the adapter</div><div class='ctx'>  *	@ndbqtimers: size of the provided SGE Doorbell Queue Timer table</div><div class='ctx'>  *	@dbqtimers: SGE Doorbell Queue Timer table</div><div class='ctx'>  *</div><div class='hunk'>@@ -6894,8 +6913,8 @@ retry:</div><div class='ctx'> 			waiting -= 50;</div><div class='ctx'> </div><div class='ctx'> 			/*</div><div class='del'>-			 * If neither Error nor Initialialized are indicated</div><div class='del'>-			 * by the firmware keep waiting till we exaust our</div><div class='add'>+			 * If neither Error nor Initialized are indicated</div><div class='add'>+			 * by the firmware keep waiting till we exhaust our</div><div class='ctx'> 			 * timeout ... and then retry if we haven't exhausted</div><div class='ctx'> 			 * our retries ...</div><div class='ctx'> 			 */</div><div class='hunk'>@@ -6953,7 +6972,7 @@ int t4_fw_bye(struct adapter *adap, unsigned int mbox)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	t4_init_cmd - ask FW to initialize the device</div><div class='add'>+ *	t4_early_init - ask FW to initialize the device</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *	@mbox: mailbox to use for the FW command</div><div class='ctx'>  *</div><div class='hunk'>@@ -7050,6 +7069,7 @@ static int t4_fw_halt(struct adapter *adap, unsigned int mbox, int force)</div><div class='ctx'> /**</div><div class='ctx'>  *	t4_fw_restart - restart the firmware by taking the uP out of RESET</div><div class='ctx'>  *	@adap: the adapter</div><div class='add'>+ *	@mbox: mailbox to use for the FW command</div><div class='ctx'>  *	@reset: if we want to do a RESET to restart things</div><div class='ctx'>  *</div><div class='ctx'>  *	Restart firmware previously halted by t4_fw_halt().  On successful</div><div class='hunk'>@@ -7207,7 +7227,7 @@ int t4_fl_pkt_align(struct adapter *adap)</div><div class='ctx'> 	 * separately.  The actual Ingress Packet Data alignment boundary</div><div class='ctx'> 	 * within Packed Buffer Mode is the maximum of these two</div><div class='ctx'> 	 * specifications.  (Note that it makes no real practical sense to</div><div class='del'>-	 * have the Pading Boudary be larger than the Packing Boundary but you</div><div class='add'>+	 * have the Padding Boundary be larger than the Packing Boundary but you</div><div class='ctx'> 	 * could set the chip up that way and, in fact, legacy T4 code would</div><div class='ctx'> 	 * end doing this because it would initialize the Padding Boundary and</div><div class='ctx'> 	 * leave the Packing Boundary initialized to 0 (16 bytes).)</div><div class='hunk'>@@ -7278,7 +7298,6 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size,</div><div class='ctx'> 	} else {</div><div class='ctx'> 		unsigned int pack_align;</div><div class='ctx'> 		unsigned int ingpad, ingpack;</div><div class='del'>-		unsigned int pcie_cap;</div><div class='ctx'> </div><div class='ctx'> 		/* T5 introduced the separation of the Free List Padding and</div><div class='ctx'> 		 * Packing Boundaries.  Thus, we can select a smaller Padding</div><div class='hunk'>@@ -7303,8 +7322,7 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size,</div><div class='ctx'> 		 * multiple of the Maximum Payload Size.</div><div class='ctx'> 		 */</div><div class='ctx'> 		pack_align = fl_align;</div><div class='del'>-		pcie_cap = pci_find_capability(adap-&gt;pdev, PCI_CAP_ID_EXP);</div><div class='del'>-		if (pcie_cap) {</div><div class='add'>+		if (pci_is_pcie(adap-&gt;pdev)) {</div><div class='ctx'> 			unsigned int mps, mps_log;</div><div class='ctx'> 			u16 devctl;</div><div class='ctx'> </div><div class='hunk'>@@ -7312,9 +7330,8 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size,</div><div class='ctx'> 			 * [bits 7:5] encodes sizes as powers of 2 starting at</div><div class='ctx'> 			 * 128 bytes.</div><div class='ctx'> 			 */</div><div class='del'>-			pci_read_config_word(adap-&gt;pdev,</div><div class='del'>-					     pcie_cap + PCI_EXP_DEVCTL,</div><div class='del'>-					     &amp;devctl);</div><div class='add'>+			pcie_capability_read_word(adap-&gt;pdev, PCI_EXP_DEVCTL,</div><div class='add'>+						  &amp;devctl);</div><div class='ctx'> 			mps_log = ((devctl &amp; PCI_EXP_DEVCTL_PAYLOAD) &gt;&gt; 5) + 7;</div><div class='ctx'> 			mps = 1 &lt;&lt; mps_log;</div><div class='ctx'> 			if (mps &gt; pack_align)</div><div class='hunk'>@@ -7591,6 +7608,8 @@ int t4_cfg_pfvf(struct adapter *adap, unsigned int mbox, unsigned int pf,</div><div class='ctx'>  *	@nmac: number of MAC addresses needed (1 to 5)</div><div class='ctx'>  *	@mac: the MAC addresses of the VI</div><div class='ctx'>  *	@rss_size: size of RSS table slice associated with this VI</div><div class='add'>+ *	@vivld: the destination to store the VI Valid value.</div><div class='add'>+ *	@vin: the destination to store the VIN value.</div><div class='ctx'>  *</div><div class='ctx'>  *	Allocates a virtual interface for the given physical port.  If @mac is</div><div class='ctx'>  *	not %NULL it contains the MAC addresses of the VI as assigned by FW.</div><div class='hunk'>@@ -7622,13 +7641,13 @@ int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port,</div><div class='ctx'> 		switch (nmac) {</div><div class='ctx'> 		case 5:</div><div class='ctx'> 			memcpy(mac + 24, c.nmac3, sizeof(c.nmac3));</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 4:</div><div class='ctx'> 			memcpy(mac + 18, c.nmac2, sizeof(c.nmac2));</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 3:</div><div class='ctx'> 			memcpy(mac + 12, c.nmac1, sizeof(c.nmac1));</div><div class='del'>-			/* Fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case 2:</div><div class='ctx'> 			memcpy(mac + 6,  c.nmac0, sizeof(c.nmac0));</div><div class='ctx'> 		}</div><div class='hunk'>@@ -7677,6 +7696,7 @@ int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf,</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *	@mbox: mailbox to use for the FW command</div><div class='ctx'>  *	@viid: the VI id</div><div class='add'>+ *	@viid_mirror: the mirror VI id</div><div class='ctx'>  *	@mtu: the new MTU or -1</div><div class='ctx'>  *	@promisc: 1 to enable promiscuous mode, 0 to disable it, -1 no change</div><div class='ctx'>  *	@all_multi: 1 to enable all-multi mode, 0 to disable it, -1 no change</div><div class='hunk'>@@ -7687,10 +7707,11 @@ int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf,</div><div class='ctx'>  *	Sets Rx properties of a virtual interface.</div><div class='ctx'>  */</div><div class='ctx'> int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,</div><div class='del'>-		  int mtu, int promisc, int all_multi, int bcast, int vlanex,</div><div class='del'>-		  bool sleep_ok)</div><div class='add'>+		  unsigned int viid_mirror, int mtu, int promisc, int all_multi,</div><div class='add'>+		  int bcast, int vlanex, bool sleep_ok)</div><div class='ctx'> {</div><div class='del'>-	struct fw_vi_rxmode_cmd c;</div><div class='add'>+	struct fw_vi_rxmode_cmd c, c_mirror;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	/* convert to FW values */</div><div class='ctx'> 	if (mtu &lt; 0)</div><div class='hunk'>@@ -7715,7 +7736,24 @@ int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,</div><div class='ctx'> 			    FW_VI_RXMODE_CMD_ALLMULTIEN_V(all_multi) |</div><div class='ctx'> 			    FW_VI_RXMODE_CMD_BROADCASTEN_V(bcast) |</div><div class='ctx'> 			    FW_VI_RXMODE_CMD_VLANEXEN_V(vlanex));</div><div class='del'>-	return t4_wr_mbox_meat(adap, mbox, &amp;c, sizeof(c), NULL, sleep_ok);</div><div class='add'>+</div><div class='add'>+	if (viid_mirror) {</div><div class='add'>+		memcpy(&amp;c_mirror, &amp;c, sizeof(c_mirror));</div><div class='add'>+		c_mirror.op_to_viid =</div><div class='add'>+			cpu_to_be32(FW_CMD_OP_V(FW_VI_RXMODE_CMD) |</div><div class='add'>+				    FW_CMD_REQUEST_F | FW_CMD_WRITE_F |</div><div class='add'>+				    FW_VI_RXMODE_CMD_VIID_V(viid_mirror));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t4_wr_mbox_meat(adap, mbox, &amp;c, sizeof(c), NULL, sleep_ok);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (viid_mirror)</div><div class='add'>+		ret = t4_wr_mbox_meat(adap, mbox, &amp;c_mirror, sizeof(c_mirror),</div><div class='add'>+				      NULL, sleep_ok);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -7733,7 +7771,6 @@ int t4_free_encap_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='ctx'> 			   int idx, bool sleep_ok)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_vi_mac_exact *p;</div><div class='del'>-	u8 addr[] = {0, 0, 0, 0, 0, 0};</div><div class='ctx'> 	struct fw_vi_mac_cmd c;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> 	u32 exact;</div><div class='hunk'>@@ -7750,7 +7787,7 @@ int t4_free_encap_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='ctx'> 	p = c.u.exact;</div><div class='ctx'> 	p-&gt;valid_to_idx = cpu_to_be16(FW_VI_MAC_CMD_VALID_F |</div><div class='ctx'> 				      FW_VI_MAC_CMD_IDX_V(idx));</div><div class='del'>-	memcpy(p-&gt;macaddr, addr, sizeof(p-&gt;macaddr));</div><div class='add'>+	eth_zero_addr(p-&gt;macaddr);</div><div class='ctx'> 	ret = t4_wr_mbox_meat(adap, adap-&gt;mbox, &amp;c, sizeof(c), &amp;c, sleep_ok);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -7809,7 +7846,7 @@ int t4_free_raw_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='ctx'>  *      t4_alloc_encap_mac_filt - Adds a mac entry in mps tcam with VNI support</div><div class='ctx'>  *      @adap: the adapter</div><div class='ctx'>  *      @viid: the VI id</div><div class='del'>- *      @mac: the MAC address</div><div class='add'>+ *      @addr: the MAC address</div><div class='ctx'>  *      @mask: the mask</div><div class='ctx'>  *      @vni: the VNI id for the tunnel protocol</div><div class='ctx'>  *      @vni_mask: mask for the VNI id</div><div class='hunk'>@@ -7858,11 +7895,11 @@ int t4_alloc_encap_mac_filt(struct adapter *adap, unsigned int viid,</div><div class='ctx'>  *	t4_alloc_raw_mac_filt - Adds a mac entry in mps tcam</div><div class='ctx'>  *	@adap: the adapter</div><div class='ctx'>  *	@viid: the VI id</div><div class='del'>- *	@mac: the MAC address</div><div class='add'>+ *	@addr: the MAC address</div><div class='ctx'>  *	@mask: the mask</div><div class='ctx'>  *	@idx: index at which to add this entry</div><div class='del'>- *	@port_id: the port index</div><div class='ctx'>  *	@lookup_type: MAC address for inner (1) or outer (0) header</div><div class='add'>+ *	@port_id: the port index</div><div class='ctx'>  *	@sleep_ok: call is allowed to sleep</div><div class='ctx'>  *</div><div class='ctx'>  *	Adds the mac entry at the specified index using raw mac interface.</div><div class='hunk'>@@ -8087,7 +8124,7 @@ int t4_free_mac_filt(struct adapter *adap, unsigned int mbox,</div><div class='ctx'>  *	@idx: index of existing filter for old value of MAC address, or -1</div><div class='ctx'>  *	@addr: the new MAC address value</div><div class='ctx'>  *	@persist: whether a new MAC allocation should be persistent</div><div class='del'>- *	@add_smt: if true also add the address to the HW SMT</div><div class='add'>+ *	@smt_idx: the destination to store the new SMT index.</div><div class='ctx'>  *</div><div class='ctx'>  *	Modifies an exact-match filter and sets it to the new MAC address.</div><div class='ctx'>  *	Note that in general it is not possible to modify the value of a given</div><div class='hunk'>@@ -8409,7 +8446,6 @@ int t4_ofld_eq_free(struct adapter *adap, unsigned int mbox, unsigned int pf,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	t4_link_down_rc_str - return a string for a Link Down Reason Code</div><div class='del'>- *	@adap: the adapter</div><div class='ctx'>  *	@link_down_rc: Link Down Reason Code</div><div class='ctx'>  *</div><div class='ctx'>  *	Returns a string representation of the Link Down Reason Code.</div><div class='hunk'>@@ -8433,9 +8469,7 @@ static const char *t4_link_down_rc_str(unsigned char link_down_rc)</div><div class='ctx'> 	return reason[link_down_rc];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Return the highest speed set in the port capabilities, in Mb/s.</div><div class='del'>- */</div><div class='add'>+/* Return the highest speed set in the port capabilities, in Mb/s. */</div><div class='ctx'> static unsigned int fwcap_to_speed(fw_port_cap32_t caps)</div><div class='ctx'> {</div><div class='ctx'> 	#define TEST_SPEED_RETURN(__caps_speed, __speed) \</div><div class='hunk'>@@ -8535,17 +8569,17 @@ static fw_port_cap32_t lstatus_to_fwcap(u32 lstatus)</div><div class='ctx'> void t4_handle_get_port_info(struct port_info *pi, const __be64 *rpl)</div><div class='ctx'> {</div><div class='ctx'> 	const struct fw_port_cmd *cmd = (const void *)rpl;</div><div class='del'>-	int action = FW_PORT_CMD_ACTION_G(be32_to_cpu(cmd-&gt;action_to_len16));</div><div class='del'>-	struct adapter *adapter = pi-&gt;adapter;</div><div class='add'>+	fw_port_cap32_t pcaps, acaps, lpacaps, linkattr;</div><div class='ctx'> 	struct link_config *lc = &amp;pi-&gt;link_cfg;</div><div class='del'>-	int link_ok, linkdnrc;</div><div class='del'>-	enum fw_port_type port_type;</div><div class='add'>+	struct adapter *adapter = pi-&gt;adapter;</div><div class='add'>+	unsigned int speed, fc, fec, adv_fc;</div><div class='ctx'> 	enum fw_port_module_type mod_type;</div><div class='del'>-	unsigned int speed, fc, fec;</div><div class='del'>-	fw_port_cap32_t pcaps, acaps, lpacaps, linkattr;</div><div class='add'>+	int action, link_ok, linkdnrc;</div><div class='add'>+	enum fw_port_type port_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Extract the various fields from the Port Information message.</div><div class='ctx'> 	 */</div><div class='add'>+	action = FW_PORT_CMD_ACTION_G(be32_to_cpu(cmd-&gt;action_to_len16));</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case FW_PORT_ACTION_GET_PORT_INFO: {</div><div class='ctx'> 		u32 lstatus = be32_to_cpu(cmd-&gt;u.info.lstatus_to_modtype);</div><div class='hunk'>@@ -8583,6 +8617,7 @@ void t4_handle_get_port_info(struct port_info *pi, const __be64 *rpl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fec = fwcap_to_cc_fec(acaps);</div><div class='add'>+	adv_fc = fwcap_to_cc_pause(acaps);</div><div class='ctx'> 	fc = fwcap_to_cc_pause(linkattr);</div><div class='ctx'> 	speed = fwcap_to_speed(linkattr);</div><div class='ctx'> </div><div class='hunk'>@@ -8639,7 +8674,9 @@ void t4_handle_get_port_info(struct port_info *pi, const __be64 *rpl)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (link_ok != lc-&gt;link_ok || speed != lc-&gt;speed ||</div><div class='del'>-	    fc != lc-&gt;fc || fec != lc-&gt;fec) {	/* something changed */</div><div class='add'>+	    fc != lc-&gt;fc || adv_fc != lc-&gt;advertised_fc ||</div><div class='add'>+	    fec != lc-&gt;fec) {</div><div class='add'>+		/* something changed */</div><div class='ctx'> 		if (!link_ok &amp;&amp; lc-&gt;link_ok) {</div><div class='ctx'> 			lc-&gt;link_down_rc = linkdnrc;</div><div class='ctx'> 			dev_warn_ratelimited(adapter-&gt;pdev_dev,</div><div class='hunk'>@@ -8649,6 +8686,7 @@ void t4_handle_get_port_info(struct port_info *pi, const __be64 *rpl)</div><div class='ctx'> 		}</div><div class='ctx'> 		lc-&gt;link_ok = link_ok;</div><div class='ctx'> 		lc-&gt;speed = speed;</div><div class='add'>+		lc-&gt;advertised_fc = adv_fc;</div><div class='ctx'> 		lc-&gt;fc = fc;</div><div class='ctx'> 		lc-&gt;fec = fec;</div><div class='ctx'> </div><div class='hunk'>@@ -8749,8 +8787,8 @@ int t4_get_link_params(struct port_info *pi, unsigned int *link_okp,</div><div class='ctx'> 		       unsigned int *speedp, unsigned int *mtup)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int fw_caps = pi-&gt;adapter-&gt;params.fw_caps_support;</div><div class='del'>-	struct fw_port_cmd port_cmd;</div><div class='ctx'> 	unsigned int action, link_ok, mtu;</div><div class='add'>+	struct fw_port_cmd port_cmd;</div><div class='ctx'> 	fw_port_cap32_t linkattr;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='hunk'>@@ -8785,9 +8823,12 @@ int t4_get_link_params(struct port_info *pi, unsigned int *link_okp,</div><div class='ctx'> 			be32_to_cpu(port_cmd.u.info32.auxlinfo32_mtu32));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	*link_okp = link_ok;</div><div class='del'>-	*speedp = fwcap_to_speed(linkattr);</div><div class='del'>-	*mtup = mtu;</div><div class='add'>+	if (link_okp)</div><div class='add'>+		*link_okp = link_ok;</div><div class='add'>+	if (speedp)</div><div class='add'>+		*speedp = fwcap_to_speed(linkattr);</div><div class='add'>+	if (mtup)</div><div class='add'>+		*mtup = mtu;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -8945,10 +8986,10 @@ static int t4_get_flash_params(struct adapter *adap)</div><div class='ctx'> 			goto found;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-	/* Decode Flash part size.  The code below looks repetative with</div><div class='add'>+	/* Decode Flash part size.  The code below looks repetitive with</div><div class='ctx'> 	 * common encodings, but that's not guaranteed in the JEDEC</div><div class='del'>-	 * specification for the Read JADEC ID command.  The only thing that</div><div class='del'>-	 * we're guaranteed by the JADEC specification is where the</div><div class='add'>+	 * specification for the Read JEDEC ID command.  The only thing that</div><div class='add'>+	 * we're guaranteed by the JEDEC specification is where the</div><div class='ctx'> 	 * Manufacturer ID is in the returned result.  After that each</div><div class='ctx'> 	 * Manufacturer ~could~ encode things completely differently.</div><div class='ctx'> 	 * Note, all Flash parts must have 64KB sectors.</div><div class='hunk'>@@ -9064,7 +9105,6 @@ found:</div><div class='ctx'> /**</div><div class='ctx'>  *	t4_prep_adapter - prepare SW and HW for operation</div><div class='ctx'>  *	@adapter: the adapter</div><div class='del'>- *	@reset: if true perform a HW reset</div><div class='ctx'>  *</div><div class='ctx'>  *	Initialize adapter SW state for the various HW modules, set initial</div><div class='ctx'>  *	values for some adapter tunables, take PHYs out of reset, and</div><div class='hunk'>@@ -9289,7 +9329,7 @@ int t4_init_devlog_params(struct adapter *adap)</div><div class='ctx'> 	struct fw_devlog_cmd devlog_cmd;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	/* If we're dealing with newer firmware, the Device Log Paramerters</div><div class='add'>+	/* If we're dealing with newer firmware, the Device Log Parameters</div><div class='ctx'> 	 * are stored in a designated register which allows us to access the</div><div class='ctx'> 	 * Device Log even if we can't talk to the firmware.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -9308,7 +9348,7 @@ int t4_init_devlog_params(struct adapter *adap)</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Otherwise, ask the firmware for it's Device Log Parameters.</div><div class='add'>+	/* Otherwise, ask the firmware for its Device Log Parameters.</div><div class='ctx'> 	 */</div><div class='ctx'> 	memset(&amp;devlog_cmd, 0, sizeof(devlog_cmd));</div><div class='ctx'> 	devlog_cmd.op_to_write = cpu_to_be32(FW_CMD_OP_V(FW_DEVLOG_CMD) |</div><div class='hunk'>@@ -9368,8 +9408,9 @@ int t4_init_sge_params(struct adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> int t4_init_tp_params(struct adapter *adap, bool sleep_ok)</div><div class='ctx'> {</div><div class='del'>-	int chan;</div><div class='del'>-	u32 v;</div><div class='add'>+	u32 param, val, v;</div><div class='add'>+	int chan, ret;</div><div class='add'>+</div><div class='ctx'> </div><div class='ctx'> 	v = t4_read_reg(adap, TP_TIMER_RESOLUTION_A);</div><div class='ctx'> 	adap-&gt;params.tp.tre = TIMERRESOLUTION_G(v);</div><div class='hunk'>@@ -9379,11 +9420,47 @@ int t4_init_tp_params(struct adapter *adap, bool sleep_ok)</div><div class='ctx'> 	for (chan = 0; chan &lt; NCHAN; chan++)</div><div class='ctx'> 		adap-&gt;params.tp.tx_modq[chan] = chan;</div><div class='ctx'> </div><div class='del'>-	/* Cache the adapter's Compressed Filter Mode and global Incress</div><div class='add'>+	/* Cache the adapter's Compressed Filter Mode/Mask and global Ingress</div><div class='ctx'> 	 * Configuration.</div><div class='ctx'> 	 */</div><div class='del'>-	t4_tp_pio_read(adap, &amp;adap-&gt;params.tp.vlan_pri_map, 1,</div><div class='del'>-		       TP_VLAN_PRI_MAP_A, sleep_ok);</div><div class='add'>+	param = (FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DEV) |</div><div class='add'>+		 FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_DEV_FILTER) |</div><div class='add'>+		 FW_PARAMS_PARAM_Y_V(FW_PARAM_DEV_FILTER_MODE_MASK));</div><div class='add'>+</div><div class='add'>+	/* Read current value */</div><div class='add'>+	ret = t4_query_params(adap, adap-&gt;mbox, adap-&gt;pf, 0, 1,</div><div class='add'>+			      &amp;param, &amp;val);</div><div class='add'>+	if (ret == 0) {</div><div class='add'>+		dev_info(adap-&gt;pdev_dev,</div><div class='add'>+			 "Current filter mode/mask 0x%x:0x%x\n",</div><div class='add'>+			 FW_PARAMS_PARAM_FILTER_MODE_G(val),</div><div class='add'>+			 FW_PARAMS_PARAM_FILTER_MASK_G(val));</div><div class='add'>+		adap-&gt;params.tp.vlan_pri_map =</div><div class='add'>+			FW_PARAMS_PARAM_FILTER_MODE_G(val);</div><div class='add'>+		adap-&gt;params.tp.filter_mask =</div><div class='add'>+			FW_PARAMS_PARAM_FILTER_MASK_G(val);</div><div class='add'>+	} else {</div><div class='add'>+		dev_info(adap-&gt;pdev_dev,</div><div class='add'>+			 "Failed to read filter mode/mask via fw api, using indirect-reg-read\n");</div><div class='add'>+</div><div class='add'>+		/* Incase of older-fw (which doesn't expose the api</div><div class='add'>+		 * FW_PARAM_DEV_FILTER_MODE_MASK) and newer-driver (which uses</div><div class='add'>+		 * the fw api) combination, fall-back to older method of reading</div><div class='add'>+		 * the filter mode from indirect-register</div><div class='add'>+		 */</div><div class='add'>+		t4_tp_pio_read(adap, &amp;adap-&gt;params.tp.vlan_pri_map, 1,</div><div class='add'>+			       TP_VLAN_PRI_MAP_A, sleep_ok);</div><div class='add'>+</div><div class='add'>+		/* With the older-fw and newer-driver combination we might run</div><div class='add'>+		 * into an issue when user wants to use hash filter region but</div><div class='add'>+		 * the filter_mask is zero, in this case filter_mask validation</div><div class='add'>+		 * is tough. To avoid that we set the filter_mask same as filter</div><div class='add'>+		 * mode, which will behave exactly as the older way of ignoring</div><div class='add'>+		 * the filter mask validation.</div><div class='add'>+		 */</div><div class='add'>+		adap-&gt;params.tp.filter_mask = adap-&gt;params.tp.vlan_pri_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	t4_tp_pio_read(adap, &amp;adap-&gt;params.tp.ingress_config, 1,</div><div class='ctx'> 		       TP_INGRESS_CONFIG_A, sleep_ok);</div><div class='ctx'> </div><div class='hunk'>@@ -9594,6 +9671,7 @@ int t4_init_portinfo(struct port_info *pi, int mbox,</div><div class='ctx'> 	pi-&gt;tx_chan = port;</div><div class='ctx'> 	pi-&gt;lport = port;</div><div class='ctx'> 	pi-&gt;rss_size = rss_size;</div><div class='add'>+	pi-&gt;rx_cchan = t4_get_tp_e2c_map(pi-&gt;adapter, port);</div><div class='ctx'> </div><div class='ctx'> 	/* If fw supports returning the VIN as part of FW_VI_CMD,</div><div class='ctx'> 	 * save the returned values.</div><div class='hunk'>@@ -9630,12 +9708,28 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			return ret;</div><div class='ctx'> </div><div class='del'>-		memcpy(adap-&gt;port[i]-&gt;dev_addr, addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(adap-&gt;port[i], addr);</div><div class='ctx'> 		j++;</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+int t4_init_port_mirror(struct port_info *pi, u8 mbox, u8 port, u8 pf, u8 vf,</div><div class='add'>+			u16 *mirror_viid)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = t4_alloc_vi(pi-&gt;adapter, mbox, port, pf, vf, 1, NULL, NULL,</div><div class='add'>+			  NULL, NULL);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (mirror_viid)</div><div class='add'>+		*mirror_viid = ret;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  *	t4_read_cimq_cfg - read CIM queue configuration</div><div class='ctx'>  *	@adap: the adapter</div><div class='hunk'>@@ -10102,7 +10196,7 @@ int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)</div><div class='ctx'> 			n = size - i;</div><div class='ctx'> 		else</div><div class='ctx'> 			n = SF_PAGE_SIZE;</div><div class='del'>-		ret = t4_write_flash(adap, addr, n, cfg_data);</div><div class='add'>+		ret = t4_write_flash(adap, addr, n, cfg_data, true);</div><div class='ctx'> 		if (ret)</div><div class='ctx'> 			goto out;</div><div class='ctx'> </div><div class='hunk'>@@ -10118,14 +10212,15 @@ out:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	t4_set_vf_mac - Set MAC address for the specified VF</div><div class='add'>+ *	t4_set_vf_mac_acl - Set MAC address for the specified VF</div><div class='ctx'>  *	@adapter: The adapter</div><div class='ctx'>  *	@vf: one of the VFs instantiated by the specified PF</div><div class='add'>+ *	@start: The start port id associated with specified VF</div><div class='ctx'>  *	@naddr: the number of MAC addresses</div><div class='ctx'>  *	@addr: the MAC address(es) to be set to the specified VF</div><div class='ctx'>  */</div><div class='ctx'> int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,</div><div class='del'>-		      unsigned int naddr, u8 *addr)</div><div class='add'>+		      u8 start, unsigned int naddr, u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_acl_mac_cmd cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -10140,7 +10235,7 @@ int t4_set_vf_mac_acl(struct adapter *adapter, unsigned int vf,</div><div class='ctx'> 	cmd.en_to_len16 = cpu_to_be32((unsigned int)FW_LEN16(cmd));</div><div class='ctx'> 	cmd.nmac = naddr;</div><div class='ctx'> </div><div class='del'>-	switch (adapter-&gt;pf) {</div><div class='add'>+	switch (start) {</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		memcpy(cmd.macaddr3, addr, sizeof(cmd.macaddr3));</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -10277,9 +10372,10 @@ int t4_sge_ctxt_rd_bd(struct adapter *adap, unsigned int cid,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-int t4_sched_params(struct adapter *adapter, int type, int level, int mode,</div><div class='del'>-		    int rateunit, int ratemode, int channel, int class,</div><div class='del'>-		    int minrate, int maxrate, int weight, int pktsize)</div><div class='add'>+int t4_sched_params(struct adapter *adapter, u8 type, u8 level, u8 mode,</div><div class='add'>+		    u8 rateunit, u8 ratemode, u8 channel, u8 class,</div><div class='add'>+		    u32 minrate, u32 maxrate, u16 weight, u16 pktsize,</div><div class='add'>+		    u16 burstsize)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_sched_cmd cmd;</div><div class='ctx'> </div><div class='hunk'>@@ -10301,6 +10397,7 @@ int t4_sched_params(struct adapter *adapter, int type, int level, int mode,</div><div class='ctx'> 	cmd.u.params.max = cpu_to_be32(maxrate);</div><div class='ctx'> 	cmd.u.params.weight = cpu_to_be16(weight);</div><div class='ctx'> 	cmd.u.params.pktsize = cpu_to_be16(pktsize);</div><div class='add'>+	cmd.u.params.burstsize = cpu_to_be16(burstsize);</div><div class='ctx'> </div><div class='ctx'> 	return t4_wr_mbox_meat(adapter, adapter-&gt;mbox, &amp;cmd, sizeof(cmd),</div><div class='ctx'> 			       NULL, 1);</div><div class='hunk'>@@ -10309,6 +10406,7 @@ int t4_sched_params(struct adapter *adapter, int type, int level, int mode,</div><div class='ctx'> /**</div><div class='ctx'>  *	t4_i2c_rd - read I2C data from adapter</div><div class='ctx'>  *	@adap: the adapter</div><div class='add'>+ *	@mbox: mailbox to use for the FW command</div><div class='ctx'>  *	@port: Port number if per-port device; &lt;0 if not</div><div class='ctx'>  *	@devid: per-port device ID or absolute device ID</div><div class='ctx'>  *	@offset: byte offset into device I2C space</div><div class='hunk'>@@ -10364,7 +10462,7 @@ int t4_i2c_rd(struct adapter *adap, unsigned int mbox, int port,</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *      t4_set_vlan_acl - Set a VLAN id for the specified VF</div><div class='del'>- *      @adapter: the adapter</div><div class='add'>+ *      @adap: the adapter</div><div class='ctx'>  *      @mbox: mailbox to use for the FW command</div><div class='ctx'>  *      @vf: one of the VFs instantiated by the specified PF</div><div class='ctx'>  *      @vlan: The vlanid to be set</div><div class='hunk'>@@ -10395,3 +10493,282 @@ int t4_set_vlan_acl(struct adapter *adap, unsigned int mbox, unsigned int vf,</div><div class='ctx'> </div><div class='ctx'> 	return t4_wr_mbox(adap, adap-&gt;mbox, &amp;vlan_cmd, sizeof(vlan_cmd), NULL);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	modify_device_id - Modifies the device ID of the Boot BIOS image</div><div class='add'>+ *	@device_id: the device ID to write.</div><div class='add'>+ *	@boot_data: the boot image to modify.</div><div class='add'>+ *</div><div class='add'>+ *	Write the supplied device ID to the boot BIOS image.</div><div class='add'>+ */</div><div class='add'>+static void modify_device_id(int device_id, u8 *boot_data)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_pcir_data *pcir_header;</div><div class='add'>+	struct legacy_pci_rom_hdr *header;</div><div class='add'>+	u8 *cur_header = boot_data;</div><div class='add'>+	u16 pcir_offset;</div><div class='add'>+</div><div class='add'>+	 /* Loop through all chained images and change the device ID's */</div><div class='add'>+	do {</div><div class='add'>+		header = (struct legacy_pci_rom_hdr *)cur_header;</div><div class='add'>+		pcir_offset = le16_to_cpu(header-&gt;pcir_offset);</div><div class='add'>+		pcir_header = (struct cxgb4_pcir_data *)(cur_header +</div><div class='add'>+			      pcir_offset);</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * Only modify the Device ID if code type is Legacy or HP.</div><div class='add'>+		 * 0x00: Okay to modify</div><div class='add'>+		 * 0x01: FCODE. Do not modify</div><div class='add'>+		 * 0x03: Okay to modify</div><div class='add'>+		 * 0x04-0xFF: Do not modify</div><div class='add'>+		 */</div><div class='add'>+		if (pcir_header-&gt;code_type == CXGB4_HDR_CODE1) {</div><div class='add'>+			u8 csum = 0;</div><div class='add'>+			int i;</div><div class='add'>+</div><div class='add'>+			/**</div><div class='add'>+			 * Modify Device ID to match current adatper</div><div class='add'>+			 */</div><div class='add'>+			pcir_header-&gt;device_id = cpu_to_le16(device_id);</div><div class='add'>+</div><div class='add'>+			/**</div><div class='add'>+			 * Set checksum temporarily to 0.</div><div class='add'>+			 * We will recalculate it later.</div><div class='add'>+			 */</div><div class='add'>+			header-&gt;cksum = 0x0;</div><div class='add'>+</div><div class='add'>+			/**</div><div class='add'>+			 * Calculate and update checksum</div><div class='add'>+			 */</div><div class='add'>+			for (i = 0; i &lt; (header-&gt;size512 * 512); i++)</div><div class='add'>+				csum += cur_header[i];</div><div class='add'>+</div><div class='add'>+			/**</div><div class='add'>+			 * Invert summed value to create the checksum</div><div class='add'>+			 * Writing new checksum value directly to the boot data</div><div class='add'>+			 */</div><div class='add'>+			cur_header[7] = -csum;</div><div class='add'>+</div><div class='add'>+		} else if (pcir_header-&gt;code_type == CXGB4_HDR_CODE2) {</div><div class='add'>+			/**</div><div class='add'>+			 * Modify Device ID to match current adatper</div><div class='add'>+			 */</div><div class='add'>+			pcir_header-&gt;device_id = cpu_to_le16(device_id);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/**</div><div class='add'>+		 * Move header pointer up to the next image in the ROM.</div><div class='add'>+		 */</div><div class='add'>+		cur_header += header-&gt;size512 * 512;</div><div class='add'>+	} while (!(pcir_header-&gt;indicator &amp; CXGB4_HDR_INDI));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	t4_load_boot - download boot flash</div><div class='add'>+ *	@adap: the adapter</div><div class='add'>+ *	@boot_data: the boot image to write</div><div class='add'>+ *	@boot_addr: offset in flash to write boot_data</div><div class='add'>+ *	@size: image size</div><div class='add'>+ *</div><div class='add'>+ *	Write the supplied boot image to the card's serial flash.</div><div class='add'>+ *	The boot image has the following sections: a 28-byte header and the</div><div class='add'>+ *	boot image.</div><div class='add'>+ */</div><div class='add'>+int t4_load_boot(struct adapter *adap, u8 *boot_data,</div><div class='add'>+		 unsigned int boot_addr, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int sf_sec_size = adap-&gt;params.sf_size / adap-&gt;params.sf_nsec;</div><div class='add'>+	unsigned int boot_sector = (boot_addr * 1024);</div><div class='add'>+	struct cxgb4_pci_exp_rom_header *header;</div><div class='add'>+	struct cxgb4_pcir_data *pcir_header;</div><div class='add'>+	int pcir_offset;</div><div class='add'>+	unsigned int i;</div><div class='add'>+	u16 device_id;</div><div class='add'>+	int ret, addr;</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Make sure the boot image does not encroach on the firmware region</div><div class='add'>+	 */</div><div class='add'>+	if ((boot_sector + size) &gt;&gt; 16 &gt; FLASH_FW_START_SEC) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "boot image encroaching on firmware region\n");</div><div class='add'>+		return -EFBIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Get boot header */</div><div class='add'>+	header = (struct cxgb4_pci_exp_rom_header *)boot_data;</div><div class='add'>+	pcir_offset = le16_to_cpu(header-&gt;pcir_offset);</div><div class='add'>+	/* PCIR Data Structure */</div><div class='add'>+	pcir_header = (struct cxgb4_pcir_data *)&amp;boot_data[pcir_offset];</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Perform some primitive sanity testing to avoid accidentally</div><div class='add'>+	 * writing garbage over the boot sectors.  We ought to check for</div><div class='add'>+	 * more but it's not worth it for now ...</div><div class='add'>+	 */</div><div class='add'>+	if (size &lt; BOOT_MIN_SIZE || size &gt; BOOT_MAX_SIZE) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "boot image too small/large\n");</div><div class='add'>+		return -EFBIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (le16_to_cpu(header-&gt;signature) != BOOT_SIGNATURE) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Boot image missing signature\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check PCI header signature */</div><div class='add'>+	if (le32_to_cpu(pcir_header-&gt;signature) != PCIR_SIGNATURE) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "PCI header missing signature\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check Vendor ID matches Chelsio ID*/</div><div class='add'>+	if (le16_to_cpu(pcir_header-&gt;vendor_id) != PCI_VENDOR_ID_CHELSIO) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Vendor ID missing signature\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * The boot sector is comprised of the Expansion-ROM boot, iSCSI boot,</div><div class='add'>+	 * and Boot configuration data sections. These 3 boot sections span</div><div class='add'>+	 * sectors 0 to 7 in flash and live right before the FW image location.</div><div class='add'>+	 */</div><div class='add'>+	i = DIV_ROUND_UP(size ? size : FLASH_FW_START,  sf_sec_size);</div><div class='add'>+	ret = t4_flash_erase_sectors(adap, boot_sector &gt;&gt; 16,</div><div class='add'>+				     (boot_sector &gt;&gt; 16) + i - 1);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * If size == 0 then we're simply erasing the FLASH sectors associated</div><div class='add'>+	 * with the on-adapter option ROM file</div><div class='add'>+	 */</div><div class='add'>+	if (ret || size == 0)</div><div class='add'>+		goto out;</div><div class='add'>+	/* Retrieve adapter's device ID */</div><div class='add'>+	pci_read_config_word(adap-&gt;pdev, PCI_DEVICE_ID, &amp;device_id);</div><div class='add'>+       /* Want to deal with PF 0 so I strip off PF 4 indicator */</div><div class='add'>+	device_id = device_id &amp; 0xf0ff;</div><div class='add'>+</div><div class='add'>+	 /* Check PCIE Device ID */</div><div class='add'>+	if (le16_to_cpu(pcir_header-&gt;device_id) != device_id) {</div><div class='add'>+		/**</div><div class='add'>+		 * Change the device ID in the Boot BIOS image to match</div><div class='add'>+		 * the Device ID of the current adapter.</div><div class='add'>+		 */</div><div class='add'>+		modify_device_id(device_id, boot_data);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * Skip over the first SF_PAGE_SIZE worth of data and write it after</div><div class='add'>+	 * we finish copying the rest of the boot image. This will ensure</div><div class='add'>+	 * that the BIOS boot header will only be written if the boot image</div><div class='add'>+	 * was written in full.</div><div class='add'>+	 */</div><div class='add'>+	addr = boot_sector;</div><div class='add'>+	for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {</div><div class='add'>+		addr += SF_PAGE_SIZE;</div><div class='add'>+		boot_data += SF_PAGE_SIZE;</div><div class='add'>+		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, boot_data,</div><div class='add'>+				     false);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = t4_write_flash(adap, boot_sector, SF_PAGE_SIZE,</div><div class='add'>+			     (const u8 *)header, false);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "boot image load failed, error %d\n",</div><div class='add'>+			ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *	t4_flash_bootcfg_addr - return the address of the flash</div><div class='add'>+ *	optionrom configuration</div><div class='add'>+ *	@adapter: the adapter</div><div class='add'>+ *</div><div class='add'>+ *	Return the address within the flash where the OptionROM Configuration</div><div class='add'>+ *	is stored, or an error if the device FLASH is too small to contain</div><div class='add'>+ *	a OptionROM Configuration.</div><div class='add'>+ */</div><div class='add'>+static int t4_flash_bootcfg_addr(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	/**</div><div class='add'>+	 * If the device FLASH isn't large enough to hold a Firmware</div><div class='add'>+	 * Configuration File, return an error.</div><div class='add'>+	 */</div><div class='add'>+	if (adapter-&gt;params.sf_size &lt;</div><div class='add'>+	    FLASH_BOOTCFG_START + FLASH_BOOTCFG_MAX_SIZE)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	return FLASH_BOOTCFG_START;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int t4_load_bootcfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	unsigned int sf_sec_size = adap-&gt;params.sf_size / adap-&gt;params.sf_nsec;</div><div class='add'>+	struct cxgb4_bootcfg_data *header;</div><div class='add'>+	unsigned int flash_cfg_start_sec;</div><div class='add'>+	unsigned int addr, npad;</div><div class='add'>+	int ret, i, n, cfg_addr;</div><div class='add'>+</div><div class='add'>+	cfg_addr = t4_flash_bootcfg_addr(adap);</div><div class='add'>+	if (cfg_addr &lt; 0)</div><div class='add'>+		return cfg_addr;</div><div class='add'>+</div><div class='add'>+	addr = cfg_addr;</div><div class='add'>+	flash_cfg_start_sec = addr / SF_SEC_SIZE;</div><div class='add'>+</div><div class='add'>+	if (size &gt; FLASH_BOOTCFG_MAX_SIZE) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "bootcfg file too large, max is %u bytes\n",</div><div class='add'>+			FLASH_BOOTCFG_MAX_SIZE);</div><div class='add'>+		return -EFBIG;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	header = (struct cxgb4_bootcfg_data *)cfg_data;</div><div class='add'>+	if (le16_to_cpu(header-&gt;signature) != BOOT_CFG_SIG) {</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "Wrong bootcfg signature\n");</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	i = DIV_ROUND_UP(FLASH_BOOTCFG_MAX_SIZE,</div><div class='add'>+			 sf_sec_size);</div><div class='add'>+	ret = t4_flash_erase_sectors(adap, flash_cfg_start_sec,</div><div class='add'>+				     flash_cfg_start_sec + i - 1);</div><div class='add'>+</div><div class='add'>+	/**</div><div class='add'>+	 * If size == 0 then we're simply erasing the FLASH sectors associated</div><div class='add'>+	 * with the on-adapter OptionROM Configuration File.</div><div class='add'>+	 */</div><div class='add'>+	if (ret || size == 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	/* this will write to the flash up to SF_PAGE_SIZE at a time */</div><div class='add'>+	for (i = 0; i &lt; size; i += SF_PAGE_SIZE) {</div><div class='add'>+		n = min_t(u32, size - i, SF_PAGE_SIZE);</div><div class='add'>+</div><div class='add'>+		ret = t4_write_flash(adap, addr, n, cfg_data, false);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		addr += SF_PAGE_SIZE;</div><div class='add'>+		cfg_data += SF_PAGE_SIZE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	npad = ((size + 4 - 1) &amp; ~3) - size;</div><div class='add'>+	for (i = 0; i &lt; npad; i++) {</div><div class='add'>+		u8 data = 0;</div><div class='add'>+</div><div class='add'>+		ret = t4_write_flash(adap, cfg_addr + size + i, 1, &amp;data,</div><div class='add'>+				     false);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(adap-&gt;pdev_dev, "boot config data %s failed %d\n",</div><div class='add'>+			(size == 0 ? "clear" : "download"), ret);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h<br/>index 002fc62ea726..63bc956d2037 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4_hw.h</a></div><div class='hunk'>@@ -293,6 +293,8 @@ enum {</div><div class='ctx'> #define I2C_PAGE_SIZE		0x100</div><div class='ctx'> #define SFP_DIAG_TYPE_ADDR	0x5c</div><div class='ctx'> #define SFP_DIAG_TYPE_LEN	0x1</div><div class='add'>+#define SFP_DIAG_ADDRMODE	BIT(2)</div><div class='add'>+#define SFP_DIAG_IMPLEMENTED	BIT(6)</div><div class='ctx'> #define SFF_8472_COMP_ADDR	0x5e</div><div class='ctx'> #define SFF_8472_COMP_LEN	0x1</div><div class='ctx'> #define SFF_REV_ADDR		0x1</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h<br/>index 38dd41eb959e..fed5f93bf620 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_msg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4_msg.h</a></div><div class='hunk'>@@ -47,6 +47,7 @@ enum {</div><div class='ctx'> 	CPL_CLOSE_LISTSRV_REQ = 0x9,</div><div class='ctx'> 	CPL_ABORT_REQ         = 0xA,</div><div class='ctx'> 	CPL_ABORT_RPL         = 0xB,</div><div class='add'>+	CPL_TX_DATA           = 0xC,</div><div class='ctx'> 	CPL_RX_DATA_ACK       = 0xD,</div><div class='ctx'> 	CPL_TX_PKT            = 0xE,</div><div class='ctx'> 	CPL_L2T_WRITE_REQ     = 0x12,</div><div class='hunk'>@@ -705,6 +706,14 @@ struct cpl_set_tcb_field {</div><div class='ctx'> 	__be64 val;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct cpl_set_tcb_field_core {</div><div class='add'>+	union opcode_tid ot;</div><div class='add'>+	__be16 reply_ctrl;</div><div class='add'>+	__be16 word_cookie;</div><div class='add'>+	__be64 mask;</div><div class='add'>+	__be64 val;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* cpl_set_tcb_field.word_cookie fields */</div><div class='ctx'> #define TCB_WORD_S	0</div><div class='ctx'> #define TCB_WORD_V(x)	((x) &lt;&lt; TCB_WORD_S)</div><div class='hunk'>@@ -1421,6 +1430,11 @@ enum {</div><div class='ctx'> 	CPL_FW4_ACK_FLAGS_FLOWC		= 0x4,	/* fw_flowc_wr complete */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define CPL_FW4_ACK_FLOWID_S    0</div><div class='add'>+#define CPL_FW4_ACK_FLOWID_M    0xffffff</div><div class='add'>+#define CPL_FW4_ACK_FLOWID_G(x) \</div><div class='add'>+	(((x) &gt;&gt; CPL_FW4_ACK_FLOWID_S) &amp; CPL_FW4_ACK_FLOWID_M)</div><div class='add'>+</div><div class='ctx'> struct cpl_fw6_msg {</div><div class='ctx'> 	u8 opcode;</div><div class='ctx'> 	u8 type;</div><div class='hunk'>@@ -1457,6 +1471,16 @@ struct cpl_tx_data {</div><div class='ctx'> #define TX_FORCE_S	13</div><div class='ctx'> #define TX_FORCE_V(x)	((x) &lt;&lt; TX_FORCE_S)</div><div class='ctx'> </div><div class='add'>+#define TX_DATA_MSS_S    16</div><div class='add'>+#define TX_DATA_MSS_M    0xFFFF</div><div class='add'>+#define TX_DATA_MSS_V(x) ((x) &lt;&lt; TX_DATA_MSS_S)</div><div class='add'>+#define TX_DATA_MSS_G(x) (((x) &gt;&gt; TX_DATA_MSS_S) &amp; TX_DATA_MSS_M)</div><div class='add'>+</div><div class='add'>+#define TX_LENGTH_S    0</div><div class='add'>+#define TX_LENGTH_M    0xFFFF</div><div class='add'>+#define TX_LENGTH_V(x) ((x) &lt;&lt; TX_LENGTH_S)</div><div class='add'>+#define TX_LENGTH_G(x) (((x) &gt;&gt; TX_LENGTH_S) &amp; TX_LENGTH_M)</div><div class='add'>+</div><div class='ctx'> #define T6_TX_FORCE_S		20</div><div class='ctx'> #define T6_TX_FORCE_V(x)	((x) &lt;&lt; T6_TX_FORCE_S)</div><div class='ctx'> #define T6_TX_FORCE_F		T6_TX_FORCE_V(1U)</div><div class='hunk'>@@ -1466,6 +1490,15 @@ struct cpl_tx_data {</div><div class='ctx'> </div><div class='ctx'> #define TX_SHOVE_S    14</div><div class='ctx'> #define TX_SHOVE_V(x) ((x) &lt;&lt; TX_SHOVE_S)</div><div class='add'>+#define TX_SHOVE_F    TX_SHOVE_V(1U)</div><div class='add'>+</div><div class='add'>+#define TX_BYPASS_S    21</div><div class='add'>+#define TX_BYPASS_V(x) ((x) &lt;&lt; TX_BYPASS_S)</div><div class='add'>+#define TX_BYPASS_F    TX_BYPASS_V(1U)</div><div class='add'>+</div><div class='add'>+#define TX_PUSH_S    22</div><div class='add'>+#define TX_PUSH_V(x) ((x) &lt;&lt; TX_PUSH_S)</div><div class='add'>+#define TX_PUSH_F    TX_PUSH_V(1U)</div><div class='ctx'> </div><div class='ctx'> #define TX_ULP_MODE_S    10</div><div class='ctx'> #define TX_ULP_MODE_M    0x7</div><div class='hunk'>@@ -1506,7 +1539,7 @@ struct ulptx_sgl {</div><div class='ctx'> 	__be32 cmd_nsge;</div><div class='ctx'> 	__be32 len0;</div><div class='ctx'> 	__be64 addr0;</div><div class='del'>-	struct ulptx_sge_pair sge[0];</div><div class='add'>+	struct ulptx_sge_pair sge[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct ulptx_idata {</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h b/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h<br/>index 0c5373462ced..0b1b5f9c67d4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h</a></div><div class='hunk'>@@ -219,6 +219,7 @@ CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN</div><div class='ctx'> 	CH_PCI_ID_TABLE_FENTRY(0x6089), /* Custom T62100-KR */</div><div class='ctx'> 	CH_PCI_ID_TABLE_FENTRY(0x608a), /* Custom T62100-CR */</div><div class='ctx'> 	CH_PCI_ID_TABLE_FENTRY(0x608b), /* Custom T6225-CR */</div><div class='add'>+	CH_PCI_ID_TABLE_FENTRY(0x6092), /* Custom T62100-CR-LOM */</div><div class='ctx'> CH_PCI_DEVICE_ID_TABLE_DEFINE_END;</div><div class='ctx'> </div><div class='ctx'> #endif /* __T4_PCI_ID_TBL_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h b/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h<br/>index eb222d40ddbf..695916ba0405 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_regs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_regs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4_regs.h</a></div><div class='hunk'>@@ -487,6 +487,12 @@</div><div class='ctx'> #define ERROR_QID_M    0x1ffffU</div><div class='ctx'> #define ERROR_QID_G(x) (((x) &gt;&gt; ERROR_QID_S) &amp; ERROR_QID_M)</div><div class='ctx'> </div><div class='add'>+#define SGE_INT_CAUSE5_A        0x110c</div><div class='add'>+</div><div class='add'>+#define ERR_T_RXCRC_S    31</div><div class='add'>+#define ERR_T_RXCRC_V(x) ((x) &lt;&lt; ERR_T_RXCRC_S)</div><div class='add'>+#define ERR_T_RXCRC_F    ERR_T_RXCRC_V(1U)</div><div class='add'>+</div><div class='ctx'> #define HP_INT_THRESH_S    28</div><div class='ctx'> #define HP_INT_THRESH_M    0xfU</div><div class='ctx'> #define HP_INT_THRESH_V(x) ((x) &lt;&lt; HP_INT_THRESH_S)</div><div class='hunk'>@@ -557,6 +563,12 @@</div><div class='ctx'> #define AIVEC_V(x) ((x) &lt;&lt; AIVEC_S)</div><div class='ctx'> </div><div class='ctx'> #define PCIE_PF_CLI_A	0x44</div><div class='add'>+</div><div class='add'>+#define PCIE_PF_EXPROM_OFST_A 0x4c</div><div class='add'>+#define OFFSET_S    10</div><div class='add'>+#define OFFSET_M    0x3fffU</div><div class='add'>+#define OFFSET_G(x) (((x) &gt;&gt; OFFSET_S) &amp; OFFSET_M)</div><div class='add'>+</div><div class='ctx'> #define PCIE_INT_CAUSE_A	0x3004</div><div class='ctx'> </div><div class='ctx'> #define UNXSPLCPLERR_S    29</div><div class='hunk'>@@ -872,6 +884,12 @@</div><div class='ctx'> #define TDUE_V(x) ((x) &lt;&lt; TDUE_S)</div><div class='ctx'> #define TDUE_F    TDUE_V(1U)</div><div class='ctx'> </div><div class='add'>+/* SPARE2 register contains 32-bit value at offset 0x6 in Serial INIT</div><div class='add'>+ * Configuration flashed on EEPROM. This value corresponds to 32-bit</div><div class='add'>+ * Serial Configuration Version information.</div><div class='add'>+ */</div><div class='add'>+#define PCIE_STATIC_SPARE2_A	0x5bfc</div><div class='add'>+</div><div class='ctx'> /* registers for module MC */</div><div class='ctx'> #define MC_INT_CAUSE_A		0x7518</div><div class='ctx'> #define MC_P_INT_CAUSE_A	0x41318</div><div class='hunk'>@@ -1334,6 +1352,10 @@</div><div class='ctx'> #define TP_OUT_CONFIG_A		0x7d04</div><div class='ctx'> #define TP_GLOBAL_CONFIG_A	0x7d08</div><div class='ctx'> </div><div class='add'>+#define ACTIVEFILTERCOUNTS_S    22</div><div class='add'>+#define ACTIVEFILTERCOUNTS_V(x) ((x) &lt;&lt; ACTIVEFILTERCOUNTS_S)</div><div class='add'>+#define ACTIVEFILTERCOUNTS_F    ACTIVEFILTERCOUNTS_V(1U)</div><div class='add'>+</div><div class='ctx'> #define TP_CMM_TCB_BASE_A 0x7d10</div><div class='ctx'> #define TP_CMM_MM_BASE_A 0x7d14</div><div class='ctx'> #define TP_CMM_TIMER_BASE_A 0x7d18</div><div class='hunk'>@@ -1896,6 +1918,9 @@</div><div class='ctx'> </div><div class='ctx'> #define MAC_PORT_CFG2_A 0x818</div><div class='ctx'> </div><div class='add'>+#define MAC_PORT_PTP_SUM_LO_A 0x990</div><div class='add'>+#define MAC_PORT_PTP_SUM_HI_A 0x994</div><div class='add'>+</div><div class='ctx'> #define MPS_CMN_CTL_A	0x9000</div><div class='ctx'> </div><div class='ctx'> #define COUNTPAUSEMCRX_S    5</div><div class='hunk'>@@ -2998,6 +3023,14 @@</div><div class='ctx'> #define REV_V(x) ((x) &lt;&lt; REV_S)</div><div class='ctx'> #define REV_G(x) (((x) &gt;&gt; REV_S) &amp; REV_M)</div><div class='ctx'> </div><div class='add'>+#define HASHTBLMEMCRCERR_S    27</div><div class='add'>+#define HASHTBLMEMCRCERR_V(x) ((x) &lt;&lt; HASHTBLMEMCRCERR_S)</div><div class='add'>+#define HASHTBLMEMCRCERR_F    HASHTBLMEMCRCERR_V(1U)</div><div class='add'>+</div><div class='add'>+#define CMDTIDERR_S    22</div><div class='add'>+#define CMDTIDERR_V(x) ((x) &lt;&lt; CMDTIDERR_S)</div><div class='add'>+#define CMDTIDERR_F    CMDTIDERR_V(1U)</div><div class='add'>+</div><div class='ctx'> #define T6_UNKNOWNCMD_S    3</div><div class='ctx'> #define T6_UNKNOWNCMD_V(x) ((x) &lt;&lt; T6_UNKNOWNCMD_S)</div><div class='ctx'> #define T6_UNKNOWNCMD_F    T6_UNKNOWNCMD_V(1U)</div><div class='hunk'>@@ -3025,6 +3058,10 @@</div><div class='ctx'> #define HASHTIDSIZE_M    0x3fU</div><div class='ctx'> #define HASHTIDSIZE_G(x) (((x) &gt;&gt; HASHTIDSIZE_S) &amp; HASHTIDSIZE_M)</div><div class='ctx'> </div><div class='add'>+#define HASHTBLSIZE_S    3</div><div class='add'>+#define HASHTBLSIZE_M    0x1ffffU</div><div class='add'>+#define HASHTBLSIZE_G(x) (((x) &gt;&gt; HASHTBLSIZE_S) &amp; HASHTBLSIZE_M)</div><div class='add'>+</div><div class='ctx'> #define LE_DB_HASH_TID_BASE_A 0x19c30</div><div class='ctx'> #define LE_DB_HASH_TBL_BASE_ADDR_A 0x19c30</div><div class='ctx'> #define LE_DB_INT_CAUSE_A 0x19c3c</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h b/drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h<br/>index 1b9afb192f7f..22a0220123ad 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4_tcb.h</a></div><div class='hunk'>@@ -35,6 +35,18 @@</div><div class='ctx'> #ifndef __T4_TCB_H</div><div class='ctx'> #define __T4_TCB_H</div><div class='ctx'> </div><div class='add'>+#define TCB_L2T_IX_W		0</div><div class='add'>+#define TCB_L2T_IX_S		12</div><div class='add'>+#define TCB_L2T_IX_M		0xfffULL</div><div class='add'>+#define TCB_L2T_IX_V(x)		((x) &lt;&lt; TCB_L2T_IX_S)</div><div class='add'>+</div><div class='add'>+#define TCB_T_FLAGS_W           1</div><div class='add'>+#define TCB_T_FLAGS_S           0</div><div class='add'>+#define TCB_T_FLAGS_M           0xffffffffffffffffULL</div><div class='add'>+#define TCB_T_FLAGS_V(x)        ((__u64)(x) &lt;&lt; TCB_T_FLAGS_S)</div><div class='add'>+</div><div class='add'>+#define TCB_FIELD_COOKIE_TFLAG	1</div><div class='add'>+</div><div class='ctx'> #define TCB_SMAC_SEL_W		0</div><div class='ctx'> #define TCB_SMAC_SEL_S		24</div><div class='ctx'> #define TCB_SMAC_SEL_M		0xffULL</div><div class='hunk'>@@ -45,10 +57,9 @@</div><div class='ctx'> #define TCB_T_FLAGS_M		0xffffffffffffffffULL</div><div class='ctx'> #define TCB_T_FLAGS_V(x)	((__u64)(x) &lt;&lt; TCB_T_FLAGS_S)</div><div class='ctx'> </div><div class='del'>-#define TCB_RQ_START_W		30</div><div class='del'>-#define TCB_RQ_START_S		0</div><div class='del'>-#define TCB_RQ_START_M		0x3ffffffULL</div><div class='del'>-#define TCB_RQ_START_V(x)	((x) &lt;&lt; TCB_RQ_START_S)</div><div class='add'>+#define TF_DROP_S		22</div><div class='add'>+#define TF_DIRECT_STEER_S	23</div><div class='add'>+#define TF_LPBK_S		59</div><div class='ctx'> </div><div class='ctx'> #define TF_CCTRL_ECE_S		60</div><div class='ctx'> #define TF_CCTRL_CWR_S		61</div><div class='hunk'>@@ -59,6 +70,11 @@</div><div class='ctx'> #define TCB_RSS_INFO_M		0x3ffULL</div><div class='ctx'> #define TCB_RSS_INFO_V(x)	((x) &lt;&lt; TCB_RSS_INFO_S)</div><div class='ctx'> </div><div class='add'>+#define TCB_T_STATE_W		3</div><div class='add'>+#define TCB_T_STATE_S		16</div><div class='add'>+#define TCB_T_STATE_M		0xfULL</div><div class='add'>+#define TCB_T_STATE_V(x)	((x) &lt;&lt; TCB_T_STATE_S)</div><div class='add'>+</div><div class='ctx'> #define TCB_TIMESTAMP_W		5</div><div class='ctx'> #define TCB_TIMESTAMP_S		0</div><div class='ctx'> #define TCB_TIMESTAMP_M		0xffffffffULL</div><div class='hunk'>@@ -69,13 +85,60 @@</div><div class='ctx'> #define TCB_RTT_TS_RECENT_AGE_M		0xffffffffULL</div><div class='ctx'> #define TCB_RTT_TS_RECENT_AGE_V(x)	((x) &lt;&lt; TCB_RTT_TS_RECENT_AGE_S)</div><div class='ctx'> </div><div class='add'>+#define TCB_T_RTSEQ_RECENT_W    7</div><div class='add'>+#define TCB_T_RTSEQ_RECENT_S    0</div><div class='add'>+#define TCB_T_RTSEQ_RECENT_M    0xffffffffULL</div><div class='add'>+#define TCB_T_RTSEQ_RECENT_V(x) ((x) &lt;&lt; TCB_T_RTSEQ_RECENT_S)</div><div class='add'>+</div><div class='add'>+#define TCB_TX_MAX_W		9</div><div class='add'>+#define TCB_TX_MAX_S		0</div><div class='add'>+#define TCB_TX_MAX_M		0xffffffffULL</div><div class='add'>+#define TCB_TX_MAX_V(x)		((x) &lt;&lt; TCB_TX_MAX_S)</div><div class='add'>+</div><div class='ctx'> #define TCB_SND_UNA_RAW_W	10</div><div class='add'>+#define TCB_SND_UNA_RAW_S	0</div><div class='add'>+#define TCB_SND_UNA_RAW_M	0xfffffffULL</div><div class='add'>+#define TCB_SND_UNA_RAW_V(x)	((x) &lt;&lt; TCB_SND_UNA_RAW_S)</div><div class='add'>+</div><div class='add'>+#define TCB_SND_NXT_RAW_W	10</div><div class='add'>+#define TCB_SND_NXT_RAW_S	28</div><div class='add'>+#define TCB_SND_NXT_RAW_M	0xfffffffULL</div><div class='add'>+#define TCB_SND_NXT_RAW_V(x)	((x) &lt;&lt; TCB_SND_NXT_RAW_S)</div><div class='add'>+</div><div class='add'>+#define TCB_SND_MAX_RAW_W	11</div><div class='add'>+#define TCB_SND_MAX_RAW_S	24</div><div class='add'>+#define TCB_SND_MAX_RAW_M	0xfffffffULL</div><div class='add'>+#define TCB_SND_MAX_RAW_V(x)	((x) &lt;&lt; TCB_SND_MAX_RAW_S)</div><div class='add'>+</div><div class='add'>+#define TCB_RCV_NXT_W		16</div><div class='add'>+#define TCB_RCV_NXT_S		10</div><div class='add'>+#define TCB_RCV_NXT_M		0xffffffffULL</div><div class='add'>+#define TCB_RCV_NXT_V(x)	((x) &lt;&lt; TCB_RCV_NXT_S)</div><div class='add'>+</div><div class='add'>+#define TCB_RCV_WND_W		17</div><div class='add'>+#define TCB_RCV_WND_S		10</div><div class='add'>+#define TCB_RCV_WND_M		0xffffffULL</div><div class='add'>+#define TCB_RCV_WND_V(x)	((x) &lt;&lt; TCB_RCV_WND_S)</div><div class='add'>+</div><div class='ctx'> #define TCB_RX_FRAG2_PTR_RAW_W	27</div><div class='ctx'> #define TCB_RX_FRAG3_LEN_RAW_W	29</div><div class='ctx'> #define TCB_RX_FRAG3_START_IDX_OFFSET_RAW_W	30</div><div class='ctx'> #define TCB_PDU_HDR_LEN_W	31</div><div class='ctx'> </div><div class='add'>+#define TCB_RQ_START_W		30</div><div class='add'>+#define TCB_RQ_START_S		0</div><div class='add'>+#define TCB_RQ_START_M		0x3ffffffULL</div><div class='add'>+#define TCB_RQ_START_V(x)	((x) &lt;&lt; TCB_RQ_START_S)</div><div class='add'>+</div><div class='ctx'> #define TF_RX_PDU_OUT_S		49</div><div class='ctx'> #define TF_RX_PDU_OUT_V(x)	((__u64)(x) &lt;&lt; TF_RX_PDU_OUT_S)</div><div class='ctx'> </div><div class='add'>+#define TF_CORE_BYPASS_S	63</div><div class='add'>+#define TF_CORE_BYPASS_V(x)	((__u64)(x) &lt;&lt; TF_CORE_BYPASS_S)</div><div class='add'>+#define TF_CORE_BYPASS_F	TF_CORE_BYPASS_V(1)</div><div class='add'>+</div><div class='add'>+#define TF_NON_OFFLOAD_S	1</div><div class='add'>+#define TF_NON_OFFLOAD_V(x)	((x) &lt;&lt; TF_NON_OFFLOAD_S)</div><div class='add'>+#define TF_NON_OFFLOAD_F	TF_NON_OFFLOAD_V(1)</div><div class='add'>+</div><div class='ctx'> #endif /* __T4_TCB_H */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h<br/>index b2a618e72fcf..2419459a0b85 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h</a></div><div class='hunk'>@@ -87,6 +87,7 @@ enum fw_wr_opcodes {</div><div class='ctx'> 	FW_ULPTX_WR                    = 0x04,</div><div class='ctx'> 	FW_TP_WR                       = 0x05,</div><div class='ctx'> 	FW_ETH_TX_PKT_WR               = 0x08,</div><div class='add'>+	FW_ETH_TX_EO_WR                = 0x1c,</div><div class='ctx'> 	FW_OFLD_CONNECTION_WR          = 0x2f,</div><div class='ctx'> 	FW_FLOWC_WR                    = 0x0a,</div><div class='ctx'> 	FW_OFLD_TX_DATA_WR             = 0x0b,</div><div class='hunk'>@@ -534,6 +535,47 @@ struct fw_eth_tx_pkt_wr {</div><div class='ctx'> 	__be64 r3;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fw_eth_tx_eo_type {</div><div class='add'>+	FW_ETH_TX_EO_TYPE_UDPSEG = 0,</div><div class='add'>+	FW_ETH_TX_EO_TYPE_TCPSEG,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct fw_eth_tx_eo_wr {</div><div class='add'>+	__be32 op_immdlen;</div><div class='add'>+	__be32 equiq_to_len16;</div><div class='add'>+	__be64 r3;</div><div class='add'>+	union fw_eth_tx_eo {</div><div class='add'>+		struct fw_eth_tx_eo_udpseg {</div><div class='add'>+			__u8   type;</div><div class='add'>+			__u8   ethlen;</div><div class='add'>+			__be16 iplen;</div><div class='add'>+			__u8   udplen;</div><div class='add'>+			__u8   rtplen;</div><div class='add'>+			__be16 r4;</div><div class='add'>+			__be16 mss;</div><div class='add'>+			__be16 schedpktsize;</div><div class='add'>+			__be32 plen;</div><div class='add'>+		} udpseg;</div><div class='add'>+		struct fw_eth_tx_eo_tcpseg {</div><div class='add'>+			__u8   type;</div><div class='add'>+			__u8   ethlen;</div><div class='add'>+			__be16 iplen;</div><div class='add'>+			__u8   tcplen;</div><div class='add'>+			__u8   tsclk_tsoff;</div><div class='add'>+			__be16 r4;</div><div class='add'>+			__be16 mss;</div><div class='add'>+			__be16 r5;</div><div class='add'>+			__be32 plen;</div><div class='add'>+		} tcpseg;</div><div class='add'>+	} u;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define FW_ETH_TX_EO_WR_IMMDLEN_S	0</div><div class='add'>+#define FW_ETH_TX_EO_WR_IMMDLEN_M	0x1ff</div><div class='add'>+#define FW_ETH_TX_EO_WR_IMMDLEN_V(x)	((x) &lt;&lt; FW_ETH_TX_EO_WR_IMMDLEN_S)</div><div class='add'>+#define FW_ETH_TX_EO_WR_IMMDLEN_G(x)	\</div><div class='add'>+	(((x) &gt;&gt; FW_ETH_TX_EO_WR_IMMDLEN_S) &amp; FW_ETH_TX_EO_WR_IMMDLEN_M)</div><div class='add'>+</div><div class='ctx'> struct fw_ofld_connection_wr {</div><div class='ctx'> 	__be32 op_compl;</div><div class='ctx'> 	__be32 len16_pkd;</div><div class='hunk'>@@ -660,6 +702,12 @@ enum fw_flowc_mnem_tcpstate {</div><div class='ctx'> 	FW_FLOWC_MNEM_TCPSTATE_TIMEWAIT = 10, /* not expected */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fw_flowc_mnem_eostate {</div><div class='add'>+	FW_FLOWC_MNEM_EOSTATE_ESTABLISHED = 1, /* default */</div><div class='add'>+	/* graceful close, after sending outstanding payload */</div><div class='add'>+	FW_FLOWC_MNEM_EOSTATE_CLOSING = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum fw_flowc_mnem {</div><div class='ctx'> 	FW_FLOWC_MNEM_PFNVFN,		/* PFN [15:8] VFN [7:0] */</div><div class='ctx'> 	FW_FLOWC_MNEM_CH,</div><div class='hunk'>@@ -689,7 +737,7 @@ struct fw_flowc_mnemval {</div><div class='ctx'> struct fw_flowc_wr {</div><div class='ctx'> 	__be32 op_to_nparams;</div><div class='ctx'> 	__be32 flowid_len16;</div><div class='del'>-	struct fw_flowc_mnemval mnemval[0];</div><div class='add'>+	struct fw_flowc_mnemval mnemval[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FW_FLOWC_WR_NPARAMS_S           0</div><div class='hunk'>@@ -746,10 +794,12 @@ struct fw_eth_tx_pkt_vm_wr {</div><div class='ctx'> 	__be32 op_immdlen;</div><div class='ctx'> 	__be32 equiq_to_len16;</div><div class='ctx'> 	__be32 r3[2];</div><div class='del'>-	u8 ethmacdst[6];</div><div class='del'>-	u8 ethmacsrc[6];</div><div class='del'>-	__be16 ethtype;</div><div class='del'>-	__be16 vlantci;</div><div class='add'>+	struct_group(firmware,</div><div class='add'>+		u8 ethmacdst[ETH_ALEN];</div><div class='add'>+		u8 ethmacsrc[ETH_ALEN];</div><div class='add'>+		__be16 ethtype;</div><div class='add'>+		__be16 vlantci;</div><div class='add'>+	);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define FW_CMD_MAX_TIMEOUT 10000</div><div class='hunk'>@@ -1134,6 +1184,7 @@ enum fw_caps_config_nic {</div><div class='ctx'> 	FW_CAPS_CONFIG_NIC		= 0x00000001,</div><div class='ctx'> 	FW_CAPS_CONFIG_NIC_VM		= 0x00000002,</div><div class='ctx'> 	FW_CAPS_CONFIG_NIC_HASHFILTER	= 0x00000020,</div><div class='add'>+	FW_CAPS_CONFIG_NIC_ETHOFLD	= 0x00000040,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum fw_caps_config_ofld {</div><div class='hunk'>@@ -1156,6 +1207,7 @@ enum fw_caps_config_crypto {</div><div class='ctx'> 	FW_CAPS_CONFIG_CRYPTO_LOOKASIDE = 0x00000001,</div><div class='ctx'> 	FW_CAPS_CONFIG_TLS_INLINE = 0x00000002,</div><div class='ctx'> 	FW_CAPS_CONFIG_IPSEC_INLINE = 0x00000004,</div><div class='add'>+	FW_CAPS_CONFIG_TLS_HW = 0x00000008,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum fw_caps_config_fcoe {</div><div class='hunk'>@@ -1221,6 +1273,23 @@ enum fw_params_mnem {</div><div class='ctx'> /*</div><div class='ctx'>  * device parameters</div><div class='ctx'>  */</div><div class='add'>+</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MODE_S 16</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MODE_M 0xffff</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MODE_V(x)          \</div><div class='add'>+	((x) &lt;&lt; FW_PARAMS_PARAM_FILTER_MODE_S)</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MODE_G(x)          \</div><div class='add'>+	(((x) &gt;&gt; FW_PARAMS_PARAM_FILTER_MODE_S) &amp; \</div><div class='add'>+	FW_PARAMS_PARAM_FILTER_MODE_M)</div><div class='add'>+</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MASK_S 0</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MASK_M 0xffff</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MASK_V(x)          \</div><div class='add'>+	((x) &lt;&lt; FW_PARAMS_PARAM_FILTER_MASK_S)</div><div class='add'>+#define FW_PARAMS_PARAM_FILTER_MASK_G(x)          \</div><div class='add'>+	(((x) &gt;&gt; FW_PARAMS_PARAM_FILTER_MASK_S) &amp; \</div><div class='add'>+	FW_PARAMS_PARAM_FILTER_MASK_M)</div><div class='add'>+</div><div class='ctx'> enum fw_params_param_dev {</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_CCLK	= 0x00, /* chip core clock in khz */</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_PORTVEC	= 0x01, /* the port vector */</div><div class='hunk'>@@ -1250,12 +1319,19 @@ enum fw_params_param_dev {</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_RI_FR_NSMR_TPTE_WR	= 0x1C,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_FILTER2_WR  = 0x1D,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_MPSBGMAP	= 0x1E,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_TPCHMAP     = 0x1F,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_HMA_SIZE	= 0x20,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_RDMA_WRITE_WITH_IMM = 0x21,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_PPOD_EDRAM  = 0x23,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_RI_WRITE_CMPL_WR    = 0x24,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_HPFILTER_REGION_SUPPORT = 0x26,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_OPAQUE_VIID_SMT_EXTN = 0x27,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_HASHFILTER_WITH_OFLD = 0x28,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_DBQ_TIMER	= 0x29,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_DBQ_TIMERTICK = 0x2A,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_NUM_TM_CLASS = 0x2B,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_FILTER = 0x2E,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_KTLS_HW = 0x31,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1312,6 +1388,8 @@ enum fw_params_param_pfvf {</div><div class='ctx'> 	FW_PARAMS_PARAM_PFVF_RAWF_END = 0x37,</div><div class='ctx'> 	FW_PARAMS_PARAM_PFVF_NCRYPTO_LOOKASIDE = 0x39,</div><div class='ctx'> 	FW_PARAMS_PARAM_PFVF_PORT_CAPS32 = 0x3A,</div><div class='add'>+	FW_PARAMS_PARAM_PFVF_PPOD_EDRAM_START = 0x3B,</div><div class='add'>+	FW_PARAMS_PARAM_PFVF_PPOD_EDRAM_END = 0x3C,</div><div class='ctx'> 	FW_PARAMS_PARAM_PFVF_LINK_STATE = 0x40,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -1336,6 +1414,12 @@ enum fw_params_param_dmaq {</div><div class='ctx'> 	FW_PARAMS_PARAM_DMAQ_CONM_CTXT = 0x20,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fw_params_param_dev_ktls_hw {</div><div class='add'>+	FW_PARAMS_PARAM_DEV_KTLS_HW_DISABLE      = 0x00,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_KTLS_HW_ENABLE       = 0x01,</div><div class='add'>+	FW_PARAMS_PARAM_DEV_KTLS_HW_USER_ENABLE  = 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum fw_params_param_dev_phyfw {</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD = 0x00,</div><div class='ctx'> 	FW_PARAMS_PARAM_DEV_PHYFW_VERSION = 0x01,</div><div class='hunk'>@@ -1347,6 +1431,11 @@ enum fw_params_param_dev_diag {</div><div class='ctx'> 	FW_PARAM_DEV_DIAG_MAXTMPTHRESH	= 0x02,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+enum fw_params_param_dev_filter {</div><div class='add'>+	FW_PARAM_DEV_FILTER_VNIC_MODE   = 0x00,</div><div class='add'>+	FW_PARAM_DEV_FILTER_MODE_MASK   = 0x01,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> enum fw_params_param_dev_fwcache {</div><div class='ctx'> 	FW_PARAM_DEV_FWCACHE_FLUSH      = 0x00,</div><div class='ctx'> 	FW_PARAM_DEV_FWCACHE_FLUSHINV   = 0x01,</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h b/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h<br/>index 3782e48dada2..03cb1410d6fc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/adapter.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/adapter.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4vf/adapter.h</a></div><div class='hunk'>@@ -40,6 +40,7 @@</div><div class='ctx'> #ifndef __CXGB4VF_ADAPTER_H__</div><div class='ctx'> #define __CXGB4VF_ADAPTER_H__</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -507,7 +508,7 @@ static inline const char *port_name(struct adapter *adapter, int pidx)</div><div class='ctx'> static inline void t4_os_set_hw_addr(struct adapter *adapter, int pidx,</div><div class='ctx'> 				     u8 hw_addr[])</div><div class='ctx'> {</div><div class='del'>-	memcpy(adapter-&gt;port[pidx]-&gt;dev_addr, hw_addr, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(adapter-&gt;port[pidx], hw_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='hunk'>@@ -562,7 +563,7 @@ int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *,</div><div class='ctx'> 			   unsigned int);</div><div class='ctx'> void t4vf_free_sge_resources(struct adapter *);</div><div class='ctx'> </div><div class='del'>-int t4vf_eth_xmit(struct sk_buff *, struct net_device *);</div><div class='add'>+netdev_tx_t t4vf_eth_xmit(struct sk_buff *, struct net_device *);</div><div class='ctx'> int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *,</div><div class='ctx'> 		       const struct pkt_gl *);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c<br/>index 6d4cf3d0b2f0..2fbe0f059a0b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c</a></div><div class='hunk'>@@ -55,7 +55,6 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Generic information about the driver.</div><div class='ctx'>  */</div><div class='del'>-#define DRV_VERSION "2.0.0-ko"</div><div class='ctx'> #define DRV_DESC "Chelsio T4/T5/T6 Virtual Function (VF) Network Driver"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -261,8 +260,7 @@ static int cxgb4vf_set_addr_hash(struct port_info *pi)</div><div class='ctx'>  *	@tcam_idx: TCAM index of existing filter for old value of MAC address,</div><div class='ctx'>  *		   or -1</div><div class='ctx'>  *	@addr: the new MAC address value</div><div class='del'>- *	@persist: whether a new MAC allocation should be persistent</div><div class='del'>- *	@add_smt: if true also add the address to the HW SMT</div><div class='add'>+ *	@persistent: whether a new MAC allocation should be persistent</div><div class='ctx'>  *</div><div class='ctx'>  *	Modifies an MPS filter and sets it to the new MAC address if</div><div class='ctx'>  *	@tcam_idx &gt;= 0, or adds the MAC address to a new filter if</div><div class='hunk'>@@ -519,7 +517,7 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,</div><div class='ctx'> 		}</div><div class='ctx'> 		cpl = (void *)p;</div><div class='ctx'> 	}</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case CPL_SGE_EGR_UPDATE: {</div><div class='ctx'> 		/*</div><div class='hunk'>@@ -860,7 +858,7 @@ static int cxgb4vf_open(struct net_device *dev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = t4vf_update_port_info(pi);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		return err;</div><div class='add'>+		goto err_unwind;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Note that this interface is up and start everything up ...</div><div class='hunk'>@@ -1171,7 +1169,7 @@ static int cxgb4vf_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	ret = t4vf_set_rxmode(pi-&gt;adapter, pi-&gt;viid, new_mtu,</div><div class='ctx'> 			      -1, -1, -1, -1, true);</div><div class='ctx'> 	if (!ret)</div><div class='del'>-		dev-&gt;mtu = new_mtu;</div><div class='add'>+		WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1220,7 +1218,7 @@ static int cxgb4vf_set_mac_addr(struct net_device *dev, void *_addr)</div><div class='ctx'> 	if (ret &lt; 0)</div><div class='ctx'> 		return ret;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1555,9 +1553,8 @@ static void cxgb4vf_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct adapter *adapter = netdev2adap(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(to_pci_dev(dev-&gt;dev.parent)),</div><div class='add'>+	strscpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(to_pci_dev(dev-&gt;dev.parent)),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> 	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='ctx'> 		 "%u.%u.%u.%u, TP %u.%u.%u.%u",</div><div class='hunk'>@@ -1594,7 +1591,9 @@ static void cxgb4vf_set_msglevel(struct net_device *dev, u32 msglevel)</div><div class='ctx'>  * first Queue Set.</div><div class='ctx'>  */</div><div class='ctx'> static void cxgb4vf_get_ringparam(struct net_device *dev,</div><div class='del'>-				  struct ethtool_ringparam *rp)</div><div class='add'>+				  struct ethtool_ringparam *rp,</div><div class='add'>+				  struct kernel_ethtool_ringparam *kernel_rp,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	const struct sge *s = &amp;pi-&gt;adapter-&gt;sge;</div><div class='hunk'>@@ -1617,7 +1616,9 @@ static void cxgb4vf_get_ringparam(struct net_device *dev,</div><div class='ctx'>  * device -- after vetting them of course!</div><div class='ctx'>  */</div><div class='ctx'> static int cxgb4vf_set_ringparam(struct net_device *dev,</div><div class='del'>-				 struct ethtool_ringparam *rp)</div><div class='add'>+				 struct ethtool_ringparam *rp,</div><div class='add'>+				 struct kernel_ethtool_ringparam *kernel_rp,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -1650,7 +1651,9 @@ static int cxgb4vf_set_ringparam(struct net_device *dev,</div><div class='ctx'>  * interrupt holdoff timer to be read on all of the device's Queue Sets.</div><div class='ctx'>  */</div><div class='ctx'> static int cxgb4vf_get_coalesce(struct net_device *dev,</div><div class='del'>-				struct ethtool_coalesce *coalesce)</div><div class='add'>+				struct ethtool_coalesce *coalesce,</div><div class='add'>+				struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	const struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -1670,7 +1673,9 @@ static int cxgb4vf_get_coalesce(struct net_device *dev,</div><div class='ctx'>  * the interrupt holdoff timer on any of the device's Queue Sets.</div><div class='ctx'>  */</div><div class='ctx'> static int cxgb4vf_set_coalesce(struct net_device *dev,</div><div class='del'>-				struct ethtool_coalesce *coalesce)</div><div class='add'>+				struct ethtool_coalesce *coalesce,</div><div class='add'>+				struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> 	struct adapter *adapter = pi-&gt;adapter;</div><div class='hunk'>@@ -1690,8 +1695,8 @@ static void cxgb4vf_get_pauseparam(struct net_device *dev,</div><div class='ctx'> 	struct port_info *pi = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	pauseparam-&gt;autoneg = (pi-&gt;link_cfg.requested_fc &amp; PAUSE_AUTONEG) != 0;</div><div class='del'>-	pauseparam-&gt;rx_pause = (pi-&gt;link_cfg.fc &amp; PAUSE_RX) != 0;</div><div class='del'>-	pauseparam-&gt;tx_pause = (pi-&gt;link_cfg.fc &amp; PAUSE_TX) != 0;</div><div class='add'>+	pauseparam-&gt;rx_pause = (pi-&gt;link_cfg.advertised_fc &amp; PAUSE_RX) != 0;</div><div class='add'>+	pauseparam-&gt;tx_pause = (pi-&gt;link_cfg.advertised_fc &amp; PAUSE_TX) != 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -1921,6 +1926,8 @@ static void cxgb4vf_get_wol(struct net_device *dev,</div><div class='ctx'> 		   NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops cxgb4vf_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_RX_MAX_FRAMES,</div><div class='ctx'> 	.get_link_ksettings	= cxgb4vf_get_link_ksettings,</div><div class='ctx'> 	.get_fecparam		= cxgb4vf_get_fecparam,</div><div class='ctx'> 	.get_drvinfo		= cxgb4vf_get_drvinfo,</div><div class='hunk'>@@ -2018,33 +2025,14 @@ static void mboxlog_stop(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct seq_operations mboxlog_seq_ops = {</div><div class='add'>+static const struct seq_operations mboxlog_sops = {</div><div class='ctx'> 	.start = mboxlog_start,</div><div class='ctx'> 	.next  = mboxlog_next,</div><div class='ctx'> 	.stop  = mboxlog_stop,</div><div class='ctx'> 	.show  = mboxlog_show</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int mboxlog_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int res = seq_open(file, &amp;mboxlog_seq_ops);</div><div class='del'>-</div><div class='del'>-	if (!res) {</div><div class='del'>-		struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-</div><div class='del'>-		seq-&gt;private = inode-&gt;i_private;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations mboxlog_fops = {</div><div class='del'>-	.owner   = THIS_MODULE,</div><div class='del'>-	.open    = mboxlog_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.release = seq_release,</div><div class='del'>-};</div><div class='del'>-</div><div class='add'>+DEFINE_SEQ_ATTRIBUTE(mboxlog);</div><div class='ctx'> /*</div><div class='ctx'>  * Show SGE Queue Set information.  We display QPL Queues Sets per line.</div><div class='ctx'>  */</div><div class='hunk'>@@ -2172,31 +2160,14 @@ static void *sge_queue_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	return *pos &lt; entries ? (void *)((uintptr_t)*pos + 1) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct seq_operations sge_qinfo_seq_ops = {</div><div class='add'>+static const struct seq_operations sge_qinfo_sops = {</div><div class='ctx'> 	.start = sge_queue_start,</div><div class='ctx'> 	.next  = sge_queue_next,</div><div class='ctx'> 	.stop  = sge_queue_stop,</div><div class='ctx'> 	.show  = sge_qinfo_show</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int sge_qinfo_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int res = seq_open(file, &amp;sge_qinfo_seq_ops);</div><div class='del'>-</div><div class='del'>-	if (!res) {</div><div class='del'>-		struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-		seq-&gt;private = inode-&gt;i_private;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations sge_qinfo_debugfs_fops = {</div><div class='del'>-	.owner   = THIS_MODULE,</div><div class='del'>-	.open    = sge_qinfo_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.release = seq_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SEQ_ATTRIBUTE(sge_qinfo);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Show SGE Queue Set statistics.  We display QPL Queues Sets per line.</div><div class='hunk'>@@ -2318,31 +2289,14 @@ static void *sge_qstats_next(struct seq_file *seq, void *v, loff_t *pos)</div><div class='ctx'> 	return *pos &lt; entries ? (void *)((uintptr_t)*pos + 1) : NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct seq_operations sge_qstats_seq_ops = {</div><div class='add'>+static const struct seq_operations sge_qstats_sops = {</div><div class='ctx'> 	.start = sge_qstats_start,</div><div class='ctx'> 	.next  = sge_qstats_next,</div><div class='ctx'> 	.stop  = sge_qstats_stop,</div><div class='ctx'> 	.show  = sge_qstats_show</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int sge_qstats_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int res = seq_open(file, &amp;sge_qstats_seq_ops);</div><div class='del'>-</div><div class='del'>-	if (res == 0) {</div><div class='del'>-		struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-		seq-&gt;private = inode-&gt;i_private;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations sge_qstats_proc_fops = {</div><div class='del'>-	.owner   = THIS_MODULE,</div><div class='del'>-	.open    = sge_qstats_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.release = seq_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SEQ_ATTRIBUTE(sge_qstats);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Show PCI-E SR-IOV Virtual Function Resource Limits.</div><div class='hunk'>@@ -2416,31 +2370,14 @@ static void interfaces_stop(struct seq_file *seq, void *v)</div><div class='ctx'> {</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct seq_operations interfaces_seq_ops = {</div><div class='add'>+static const struct seq_operations interfaces_sops = {</div><div class='ctx'> 	.start = interfaces_start,</div><div class='ctx'> 	.next  = interfaces_next,</div><div class='ctx'> 	.stop  = interfaces_stop,</div><div class='ctx'> 	.show  = interfaces_show</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int interfaces_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int res = seq_open(file, &amp;interfaces_seq_ops);</div><div class='del'>-</div><div class='del'>-	if (res == 0) {</div><div class='del'>-		struct seq_file *seq = file-&gt;private_data;</div><div class='del'>-		seq-&gt;private = inode-&gt;i_private;</div><div class='del'>-	}</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations interfaces_proc_fops = {</div><div class='del'>-	.owner   = THIS_MODULE,</div><div class='del'>-	.open    = interfaces_open,</div><div class='del'>-	.read    = seq_read,</div><div class='del'>-	.llseek  = seq_lseek,</div><div class='del'>-	.release = seq_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SEQ_ATTRIBUTE(interfaces);</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * /sys/kernel/debugfs/cxgb4vf/ files list.</div><div class='hunk'>@@ -2453,10 +2390,10 @@ struct cxgb4vf_debugfs_entry {</div><div class='ctx'> </div><div class='ctx'> static struct cxgb4vf_debugfs_entry debugfs_files[] = {</div><div class='ctx'> 	{ "mboxlog",    0444, &amp;mboxlog_fops },</div><div class='del'>-	{ "sge_qinfo",  0444, &amp;sge_qinfo_debugfs_fops },</div><div class='del'>-	{ "sge_qstats", 0444, &amp;sge_qstats_proc_fops },</div><div class='add'>+	{ "sge_qinfo",  0444, &amp;sge_qinfo_fops },</div><div class='add'>+	{ "sge_qstats", 0444, &amp;sge_qstats_fops },</div><div class='ctx'> 	{ "resources",  0444, &amp;resources_fops },</div><div class='del'>-	{ "interfaces", 0444, &amp;interfaces_proc_fops },</div><div class='add'>+	{ "interfaces", 0444, &amp;interfaces_fops },</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -2478,11 +2415,10 @@ static int setup_debugfs(struct adapter *adapter)</div><div class='ctx'> 	 * Debugfs support is best effort.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(debugfs_files); i++)</div><div class='del'>-		(void)debugfs_create_file(debugfs_files[i].name,</div><div class='del'>-				  debugfs_files[i].mode,</div><div class='del'>-				  adapter-&gt;debugfs_root,</div><div class='del'>-				  (void *)adapter,</div><div class='del'>-				  debugfs_files[i].fops);</div><div class='add'>+		debugfs_create_file(debugfs_files[i].name,</div><div class='add'>+				    debugfs_files[i].mode,</div><div class='add'>+				    adapter-&gt;debugfs_root, adapter,</div><div class='add'>+				    debugfs_files[i].fops);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -2909,7 +2845,7 @@ static const struct net_device_ops cxgb4vf_netdev_ops	= {</div><div class='ctx'> 	.ndo_set_rx_mode	= cxgb4vf_set_rxmode,</div><div class='ctx'> 	.ndo_set_mac_address	= cxgb4vf_set_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= cxgb4vf_do_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= cxgb4vf_do_ioctl,</div><div class='ctx'> 	.ndo_change_mtu		= cxgb4vf_change_mtu,</div><div class='ctx'> 	.ndo_fix_features	= cxgb4vf_fix_features,</div><div class='ctx'> 	.ndo_set_features	= cxgb4vf_set_features,</div><div class='hunk'>@@ -2918,6 +2854,39 @@ static const struct net_device_ops cxgb4vf_netdev_ops	= {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/**</div><div class='add'>+ *	cxgb4vf_get_port_mask - Get port mask for the VF based on mac</div><div class='add'>+ *				address stored on the adapter</div><div class='add'>+ *	@adapter: The adapter</div><div class='add'>+ *</div><div class='add'>+ *	Find the port mask for the VF based on the index of mac</div><div class='add'>+ *	address stored in the adapter. If no mac address is stored on</div><div class='add'>+ *	the adapter for the VF, use the port mask received from the</div><div class='add'>+ *	firmware.</div><div class='add'>+ */</div><div class='add'>+static unsigned int cxgb4vf_get_port_mask(struct adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	unsigned int naddr = 1, pidx = 0;</div><div class='add'>+	unsigned int pmask, rmask = 0;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	pmask = adapter-&gt;params.vfres.pmask;</div><div class='add'>+	while (pmask) {</div><div class='add'>+		if (pmask &amp; 1) {</div><div class='add'>+			err = t4vf_get_vf_mac_acl(adapter, pidx, &amp;naddr, mac);</div><div class='add'>+			if (!err &amp;&amp; !is_zero_ether_addr(mac))</div><div class='add'>+				rmask |= (1 &lt;&lt; pidx);</div><div class='add'>+		}</div><div class='add'>+		pmask &gt;&gt;= 1;</div><div class='add'>+		pidx++;</div><div class='add'>+	}</div><div class='add'>+	if (!rmask)</div><div class='add'>+		rmask = adapter-&gt;params.vfres.pmask;</div><div class='add'>+</div><div class='add'>+	return rmask;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /*</div><div class='ctx'>  * "Probe" a device: initialize a device and construct all kernel and driver</div><div class='ctx'>  * state needed to manage the device.  This routine is called "init_one" in</div><div class='hunk'>@@ -2926,28 +2895,18 @@ static const struct net_device_ops cxgb4vf_netdev_ops	= {</div><div class='ctx'> static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			     const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='del'>-	int pci_using_dac;</div><div class='del'>-	int err, pidx;</div><div class='del'>-	unsigned int pmask;</div><div class='ctx'> 	struct adapter *adapter;</div><div class='del'>-	struct port_info *pi;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='del'>-	unsigned int pf;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Print our driver banner the first time we're called to initialize a</div><div class='del'>-	 * device.</div><div class='del'>-	 */</div><div class='del'>-	pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	unsigned int pmask;</div><div class='add'>+	int err, pidx;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Initialize generic PCI device state.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = pci_enable_device(pdev);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot enable PCI device\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, err, "cannot enable PCI device\n");</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Reserve PCI resources for the device.  If we can't get them some</div><div class='hunk'>@@ -2960,25 +2919,12 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='del'>-	 * Set up our DMA mask: try for 64-bit address masking first and</div><div class='del'>-	 * fall back to 32-bit if we can't get 64 bits ...</div><div class='add'>+	 * Set up our DMA mask</div><div class='ctx'> 	 */</div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='del'>-	if (err == 0) {</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "unable to obtain 64-bit DMA for"</div><div class='del'>-				" coherent allocations\n");</div><div class='del'>-			goto err_release_regions;</div><div class='del'>-		}</div><div class='del'>-		pci_using_dac = 1;</div><div class='del'>-	} else {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (err != 0) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "no usable DMA configuration\n");</div><div class='del'>-			goto err_release_regions;</div><div class='del'>-		}</div><div class='del'>-		pci_using_dac = 0;</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "no usable DMA configuration\n");</div><div class='add'>+		goto err_release_regions;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3081,8 +3027,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	/*</div><div class='ctx'> 	 * Allocate our "adapter ports" and stitch everything together.</div><div class='ctx'> 	 */</div><div class='del'>-	pmask = adapter-&gt;params.vfres.pmask;</div><div class='del'>-	pf = t4vf_get_pf_from_vf(adapter);</div><div class='add'>+	pmask = cxgb4vf_get_port_mask(adapter);</div><div class='ctx'> 	for_each_port(adapter, pidx) {</div><div class='ctx'> 		int port_id, viid;</div><div class='ctx'> 		u8 mac[ETH_ALEN];</div><div class='hunk'>@@ -3125,9 +3070,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		netdev-&gt;hw_features = NETIF_F_SG | TSO_FLAGS | NETIF_F_GRO |</div><div class='ctx'> 			NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |</div><div class='ctx'> 			NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;</div><div class='del'>-		netdev-&gt;features = netdev-&gt;hw_features;</div><div class='del'>-		if (pci_using_dac)</div><div class='del'>-			netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='add'>+		netdev-&gt;features = netdev-&gt;hw_features | NETIF_F_HIGHDMA;</div><div class='ctx'> 		netdev-&gt;vlan_features = netdev-&gt;features &amp; VLAN_FEAT;</div><div class='ctx'> </div><div class='ctx'> 		netdev-&gt;priv_flags |= IFF_UNICAST_FLT;</div><div class='hunk'>@@ -3165,7 +3108,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 			goto err_free_dev;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		err = t4vf_get_vf_mac_acl(adapter, pf, &amp;naddr, mac);</div><div class='add'>+		err = t4vf_get_vf_mac_acl(adapter, port_id, &amp;naddr, mac);</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev,</div><div class='ctx'> 				"unable to determine MAC ACL address, "</div><div class='hunk'>@@ -3247,6 +3190,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	if (adapter-&gt;registered_device_map == 0) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "could not register any net devices\n");</div><div class='add'>+		err = -EINVAL;</div><div class='ctx'> 		goto err_disable_interrupts;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3257,11 +3201,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,</div><div class='ctx'> 		adapter-&gt;debugfs_root =</div><div class='ctx'> 			debugfs_create_dir(pci_name(pdev),</div><div class='ctx'> 					   cxgb4vf_debugfs_root);</div><div class='del'>-		if (IS_ERR_OR_NULL(adapter-&gt;debugfs_root))</div><div class='del'>-			dev_warn(&amp;pdev-&gt;dev, "could not create debugfs"</div><div class='del'>-				 " directory");</div><div class='del'>-		else</div><div class='del'>-			setup_debugfs(adapter);</div><div class='add'>+		setup_debugfs(adapter);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -3318,7 +3258,6 @@ err_free_adapter:</div><div class='ctx'> </div><div class='ctx'> err_release_regions:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='del'>-	pci_clear_master(pdev);</div><div class='ctx'> </div><div class='ctx'> err_disable_device:</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='hunk'>@@ -3398,7 +3337,6 @@ static void cxgb4vf_pci_remove(struct pci_dev *pdev)</div><div class='ctx'> 	 * Disable the device and release its PCI resources.</div><div class='ctx'> 	 */</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='del'>-	pci_clear_master(pdev);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3459,7 +3397,6 @@ static void cxgb4vf_pci_shutdown(struct pci_dev *pdev)</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESC);</div><div class='ctx'> MODULE_AUTHOR("Chelsio Communications");</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, cxgb4vf_pci_tbl);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver cxgb4vf_driver = {</div><div class='hunk'>@@ -3486,13 +3423,11 @@ static int __init cxgb4vf_module_init(void)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Debugfs support is optional, just warn if this fails */</div><div class='add'>+	/* Debugfs support is optional, debugfs will warn if this fails */</div><div class='ctx'> 	cxgb4vf_debugfs_root = debugfs_create_dir(KBUILD_MODNAME, NULL);</div><div class='del'>-	if (IS_ERR_OR_NULL(cxgb4vf_debugfs_root))</div><div class='del'>-		pr_warn("could not create debugfs entry, continuing\n");</div><div class='ctx'> </div><div class='ctx'> 	ret = pci_register_driver(&amp;cxgb4vf_driver);</div><div class='del'>-	if (ret &lt; 0 &amp;&amp; !IS_ERR_OR_NULL(cxgb4vf_debugfs_root))</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		debugfs_remove(cxgb4vf_debugfs_root);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c<br/>index f71c973398ec..31fab2415743 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/sge.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/sge.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4vf/sge.c</a></div><div class='hunk'>@@ -478,7 +478,7 @@ static void free_rx_bufs(struct adapter *adapter, struct sge_fl *fl, int n)</div><div class='ctx'> 		if (is_buf_mapped(sdesc))</div><div class='ctx'> 			dma_unmap_page(adapter-&gt;pdev_dev, get_buf_addr(sdesc),</div><div class='ctx'> 				       get_buf_size(adapter, sdesc),</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 		put_page(sdesc-&gt;page);</div><div class='ctx'> 		sdesc-&gt;page = NULL;</div><div class='ctx'> 		if (++fl-&gt;cidx == fl-&gt;size)</div><div class='hunk'>@@ -507,7 +507,7 @@ static void unmap_rx_buf(struct adapter *adapter, struct sge_fl *fl)</div><div class='ctx'> 	if (is_buf_mapped(sdesc))</div><div class='ctx'> 		dma_unmap_page(adapter-&gt;pdev_dev, get_buf_addr(sdesc),</div><div class='ctx'> 			       get_buf_size(adapter, sdesc),</div><div class='del'>-			       PCI_DMA_FROMDEVICE);</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='ctx'> 	sdesc-&gt;page = NULL;</div><div class='ctx'> 	if (++fl-&gt;cidx == fl-&gt;size)</div><div class='ctx'> 		fl-&gt;cidx = 0;</div><div class='hunk'>@@ -644,7 +644,7 @@ static unsigned int refill_fl(struct adapter *adapter, struct sge_fl *fl,</div><div class='ctx'> </div><div class='ctx'> 		dma_addr = dma_map_page(adapter-&gt;pdev_dev, page, 0,</div><div class='ctx'> 					PAGE_SIZE &lt;&lt; s-&gt;fl_pg_order,</div><div class='del'>-					PCI_DMA_FROMDEVICE);</div><div class='add'>+					DMA_FROM_DEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(adapter-&gt;pdev_dev, dma_addr))) {</div><div class='ctx'> 			/*</div><div class='ctx'> 			 * We've run out of DMA mapping space.  Free up the</div><div class='hunk'>@@ -682,7 +682,7 @@ alloc_small_pages:</div><div class='ctx'> 		poison_buf(page, PAGE_SIZE);</div><div class='ctx'> </div><div class='ctx'> 		dma_addr = dma_map_page(adapter-&gt;pdev_dev, page, 0, PAGE_SIZE,</div><div class='del'>-				       PCI_DMA_FROMDEVICE);</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='ctx'> 		if (unlikely(dma_mapping_error(adapter-&gt;pdev_dev, dma_addr))) {</div><div class='ctx'> 			put_page(page);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -954,7 +954,7 @@ static void write_sgl(const struct sk_buff *skb, struct sge_txq *tq,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- *	check_ring_tx_db - check and potentially ring a TX queue's doorbell</div><div class='add'>+ *	ring_tx_db - check and potentially ring a TX queue's doorbell</div><div class='ctx'>  *	@adapter: the adapter</div><div class='ctx'>  *	@tq: the TX queue</div><div class='ctx'>  *	@n: number of new descriptors to give to HW</div><div class='hunk'>@@ -1154,7 +1154,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n)</div><div class='ctx'>  *</div><div class='ctx'>  *	Add a packet to an SGE Ethernet TX queue.  Runs with softirqs disabled.</div><div class='ctx'>  */</div><div class='del'>-int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+netdev_tx_t t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 wr_mid;</div><div class='ctx'> 	u64 cntrl, *end;</div><div class='hunk'>@@ -1167,10 +1167,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	struct cpl_tx_pkt_core *cpl;</div><div class='ctx'> 	const struct skb_shared_info *ssi;</div><div class='ctx'> 	dma_addr_t addr[MAX_SKB_FRAGS + 1];</div><div class='del'>-	const size_t fw_hdr_copy_len = (sizeof(wr-&gt;ethmacdst) +</div><div class='del'>-					sizeof(wr-&gt;ethmacsrc) +</div><div class='del'>-					sizeof(wr-&gt;ethtype) +</div><div class='del'>-					sizeof(wr-&gt;vlantci));</div><div class='add'>+	const size_t fw_hdr_copy_len = sizeof(wr-&gt;firmware);</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * The chip minimum packet length is 10 octets but the firmware</div><div class='hunk'>@@ -1267,7 +1264,7 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	wr-&gt;equiq_to_len16 = cpu_to_be32(wr_mid);</div><div class='ctx'> 	wr-&gt;r3[0] = cpu_to_be32(0);</div><div class='ctx'> 	wr-&gt;r3[1] = cpu_to_be32(0);</div><div class='del'>-	skb_copy_from_linear_data(skb, (void *)wr-&gt;ethmacdst, fw_hdr_copy_len);</div><div class='add'>+	skb_copy_from_linear_data(skb, &amp;wr-&gt;firmware, fw_hdr_copy_len);</div><div class='ctx'> 	end = (u64 *)wr + flits;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1692,7 +1689,7 @@ static inline bool is_new_response(const struct rsp_ctrl *rc,</div><div class='ctx'>  *	restore_rx_bufs - put back a packet's RX buffers</div><div class='ctx'>  *	@gl: the packet gather list</div><div class='ctx'>  *	@fl: the SGE Free List</div><div class='del'>- *	@nfrags: how many fragments in @si</div><div class='add'>+ *	@frags: how many fragments in @si</div><div class='ctx'>  *</div><div class='ctx'>  *	Called when we find out that the current packet, @si, can't be</div><div class='ctx'>  *	processed right away for some reason.  This is a very rare event and</div><div class='hunk'>@@ -2054,7 +2051,7 @@ irq_handler_t t4vf_intr_handler(struct adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	sge_rx_timer_cb - perform periodic maintenance of SGE RX queues</div><div class='del'>- *	@data: the adapter</div><div class='add'>+ *	@t: Rx timer</div><div class='ctx'>  *</div><div class='ctx'>  *	Runs periodically from a timer to perform maintenance of SGE RX queues.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2065,7 +2062,7 @@ irq_handler_t t4vf_intr_handler(struct adapter *adapter)</div><div class='ctx'>  */</div><div class='ctx'> static void sge_rx_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adapter = from_timer(adapter, t, sge.rx_timer);</div><div class='add'>+	struct adapter *adapter = timer_container_of(adapter, t, sge.rx_timer);</div><div class='ctx'> 	struct sge *s = &amp;adapter-&gt;sge;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='hunk'>@@ -2097,7 +2094,7 @@ static void sge_rx_timer_cb(struct timer_list *t)</div><div class='ctx'> 				struct sge_eth_rxq *rxq;</div><div class='ctx'> </div><div class='ctx'> 				rxq = container_of(fl, struct sge_eth_rxq, fl);</div><div class='del'>-				if (napi_reschedule(&amp;rxq-&gt;rspq.napi))</div><div class='add'>+				if (napi_schedule(&amp;rxq-&gt;rspq.napi))</div><div class='ctx'> 					fl-&gt;starving++;</div><div class='ctx'> 				else</div><div class='ctx'> 					set_bit(id, s-&gt;starving_fl);</div><div class='hunk'>@@ -2113,7 +2110,7 @@ static void sge_rx_timer_cb(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  *	sge_tx_timer_cb - perform periodic maintenance of SGE Tx queues</div><div class='del'>- *	@data: the adapter</div><div class='add'>+ *	@t: Tx timer</div><div class='ctx'>  *</div><div class='ctx'>  *	Runs periodically from a timer to perform maintenance of SGE TX queues.</div><div class='ctx'>  *</div><div class='hunk'>@@ -2124,7 +2121,7 @@ static void sge_rx_timer_cb(struct timer_list *t)</div><div class='ctx'>  */</div><div class='ctx'> static void sge_tx_timer_cb(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct adapter *adapter = from_timer(adapter, t, sge.tx_timer);</div><div class='add'>+	struct adapter *adapter = timer_container_of(adapter, t, sge.tx_timer);</div><div class='ctx'> 	struct sge *s = &amp;adapter-&gt;sge;</div><div class='ctx'> 	unsigned int i, budget;</div><div class='ctx'> </div><div class='hunk'>@@ -2194,7 +2191,7 @@ static void __iomem *bar2_address(struct adapter *adapter,</div><div class='ctx'> /**</div><div class='ctx'>  *	t4vf_sge_alloc_rxq - allocate an SGE RX Queue</div><div class='ctx'>  *	@adapter: the adapter</div><div class='del'>- *	@rspq: pointer to to the new rxq's Response Queue to be filled in</div><div class='add'>+ *	@rspq: pointer to the new rxq's Response Queue to be filled in</div><div class='ctx'>  *	@iqasynch: if 0, a normal rspq; if 1, an asynchronous event queue</div><div class='ctx'>  *	@dev: the network device associated with the new rspq</div><div class='ctx'>  *	@intr_dest: MSI-X vector index (overriden in MSI mode)</div><div class='hunk'>@@ -2339,7 +2336,7 @@ int t4vf_sge_alloc_rxq(struct adapter *adapter, struct sge_rspq *rspq,</div><div class='ctx'> 	if (ret)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(dev, &amp;rspq-&gt;napi, napi_rx_handler, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;rspq-&gt;napi, napi_rx_handler);</div><div class='ctx'> 	rspq-&gt;cur_desc = rspq-&gt;desc;</div><div class='ctx'> 	rspq-&gt;cidx = 0;</div><div class='ctx'> 	rspq-&gt;gen = 1;</div><div class='hunk'>@@ -2405,6 +2402,7 @@ err:</div><div class='ctx'>  *	t4vf_sge_alloc_eth_txq - allocate an SGE Ethernet TX Queue</div><div class='ctx'>  *	@adapter: the adapter</div><div class='ctx'>  *	@txq: pointer to the new txq to be filled in</div><div class='add'>+ *	@dev: the network device</div><div class='ctx'>  *	@devq: the network TX queue associated with the new txq</div><div class='ctx'>  *	@iqid: the relative ingress queue ID to which events relating to</div><div class='ctx'>  *		the new txq should be directed</div><div class='hunk'>@@ -2611,9 +2609,9 @@ void t4vf_sge_stop(struct adapter *adapter)</div><div class='ctx'> 	struct sge *s = &amp;adapter-&gt;sge;</div><div class='ctx'> </div><div class='ctx'> 	if (s-&gt;rx_timer.function)</div><div class='del'>-		del_timer_sync(&amp;s-&gt;rx_timer);</div><div class='add'>+		timer_delete_sync(&amp;s-&gt;rx_timer);</div><div class='ctx'> 	if (s-&gt;tx_timer.function)</div><div class='del'>-		del_timer_sync(&amp;s-&gt;tx_timer);</div><div class='add'>+		timer_delete_sync(&amp;s-&gt;tx_timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h<br/>index ccca67cf4487..03777145efec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h</a></div><div class='hunk'>@@ -135,6 +135,7 @@ struct link_config {</div><div class='ctx'> </div><div class='ctx'> 	enum cc_pause	requested_fc;	/* flow control user has requested */</div><div class='ctx'> 	enum cc_pause	fc;		/* actual link flow control */</div><div class='add'>+	enum cc_pause   advertised_fc;  /* actual advertised flow control */</div><div class='ctx'> </div><div class='ctx'> 	enum cc_fec	auto_fec;	/* Forward Error Correction: */</div><div class='ctx'> 	enum cc_fec	requested_fec;	/*   "automatic" (IEEE 802.3), */</div><div class='hunk'>@@ -414,7 +415,7 @@ int t4vf_eth_eq_free(struct adapter *, unsigned int);</div><div class='ctx'> int t4vf_update_port_info(struct port_info *pi);</div><div class='ctx'> int t4vf_handle_fw_rpl(struct adapter *, const __be64 *);</div><div class='ctx'> int t4vf_prep_adapter(struct adapter *);</div><div class='del'>-int t4vf_get_vf_mac_acl(struct adapter *adapter, unsigned int pf,</div><div class='add'>+int t4vf_get_vf_mac_acl(struct adapter *adapter, unsigned int port,</div><div class='ctx'> 			unsigned int *naddr, u8 *addr);</div><div class='ctx'> int t4vf_get_vf_vlan_acl(struct adapter *adapter);</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c<br/>index 8a389d617a23..56fcc531af2e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c</a></div><div class='hunk'>@@ -33,6 +33,7 @@</div><div class='ctx'>  * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "t4vf_common.h"</div><div class='hunk'>@@ -389,9 +390,7 @@ static inline enum cc_fec fwcap_to_cc_fec(fw_port_cap32_t fw_fec)</div><div class='ctx'> 	return cc_fec;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Return the highest speed set in the port capabilities, in Mb/s.</div><div class='del'>- */</div><div class='add'>+/* Return the highest speed set in the port capabilities, in Mb/s. */</div><div class='ctx'> static unsigned int fwcap_to_speed(fw_port_cap32_t caps)</div><div class='ctx'> {</div><div class='ctx'> 	#define TEST_SPEED_RETURN(__caps_speed, __speed) \</div><div class='hunk'>@@ -707,7 +706,7 @@ int t4vf_fl_pkt_align(struct adapter *adapter)</div><div class='ctx'> 	 * separately.  The actual Ingress Packet Data alignment boundary</div><div class='ctx'> 	 * within Packed Buffer Mode is the maximum of these two</div><div class='ctx'> 	 * specifications.  (Note that it makes no real practical sense to</div><div class='del'>-	 * have the Pading Boudary be larger than the Packing Boundary but you</div><div class='add'>+	 * have the Padding Boundary be larger than the Packing Boundary but you</div><div class='ctx'> 	 * could set the chip up that way and, in fact, legacy T4 code would</div><div class='ctx'> 	 * end doing this because it would initialize the Padding Boundary and</div><div class='ctx'> 	 * leave the Packing Boundary initialized to 0 (16 bytes).)</div><div class='hunk'>@@ -878,7 +877,7 @@ int t4vf_get_sge_params(struct adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	/* T4 uses a single control field to specify both the PCIe Padding and</div><div class='ctx'> 	 * Packing Boundary.  T5 introduced the ability to specify these</div><div class='del'>-	 * separately with the Padding Boundary in SGE_CONTROL and and Packing</div><div class='add'>+	 * separately with the Padding Boundary in SGE_CONTROL and Packing</div><div class='ctx'> 	 * Boundary in SGE_CONTROL2.  So for T5 and later we need to grab</div><div class='ctx'> 	 * SGE_CONTROL in order to determine how ingress packet data will be</div><div class='ctx'> 	 * laid out in Packed Buffer Mode.  Unfortunately, older versions of</div><div class='hunk'>@@ -1467,6 +1466,7 @@ int t4vf_identify_port(struct adapter *adapter, unsigned int viid,</div><div class='ctx'>  *	@bcast: 1 to enable broadcast Rx, 0 to disable it, -1 no change</div><div class='ctx'>  *	@vlanex: 1 to enable hardware VLAN Tag extraction, 0 to disable it,</div><div class='ctx'>  *		-1 no change</div><div class='add'>+ *	@sleep_ok: call is allowed to sleep</div><div class='ctx'>  *</div><div class='ctx'>  *	Sets Rx properties of a virtual interface.</div><div class='ctx'>  */</div><div class='hunk'>@@ -1906,23 +1906,23 @@ static const char *t4vf_link_down_rc_str(unsigned char link_down_rc)</div><div class='ctx'> /**</div><div class='ctx'>  *	t4vf_handle_get_port_info - process a FW reply message</div><div class='ctx'>  *	@pi: the port info</div><div class='del'>- *	@rpl: start of the FW message</div><div class='add'>+ *	@cmd: start of the FW message</div><div class='ctx'>  *</div><div class='ctx'>  *	Processes a GET_PORT_INFO FW reply message.</div><div class='ctx'>  */</div><div class='ctx'> static void t4vf_handle_get_port_info(struct port_info *pi,</div><div class='ctx'> 				      const struct fw_port_cmd *cmd)</div><div class='ctx'> {</div><div class='del'>-	int action = FW_PORT_CMD_ACTION_G(be32_to_cpu(cmd-&gt;action_to_len16));</div><div class='del'>-	struct adapter *adapter = pi-&gt;adapter;</div><div class='add'>+	fw_port_cap32_t pcaps, acaps, lpacaps, linkattr;</div><div class='ctx'> 	struct link_config *lc = &amp;pi-&gt;link_cfg;</div><div class='del'>-	int link_ok, linkdnrc;</div><div class='del'>-	enum fw_port_type port_type;</div><div class='add'>+	struct adapter *adapter = pi-&gt;adapter;</div><div class='add'>+	unsigned int speed, fc, fec, adv_fc;</div><div class='ctx'> 	enum fw_port_module_type mod_type;</div><div class='del'>-	unsigned int speed, fc, fec;</div><div class='del'>-	fw_port_cap32_t pcaps, acaps, lpacaps, linkattr;</div><div class='add'>+	int action, link_ok, linkdnrc;</div><div class='add'>+	enum fw_port_type port_type;</div><div class='ctx'> </div><div class='ctx'> 	/* Extract the various fields from the Port Information message. */</div><div class='add'>+	action = FW_PORT_CMD_ACTION_G(be32_to_cpu(cmd-&gt;action_to_len16));</div><div class='ctx'> 	switch (action) {</div><div class='ctx'> 	case FW_PORT_ACTION_GET_PORT_INFO: {</div><div class='ctx'> 		u32 lstatus = be32_to_cpu(cmd-&gt;u.info.lstatus_to_modtype);</div><div class='hunk'>@@ -1982,6 +1982,7 @@ static void t4vf_handle_get_port_info(struct port_info *pi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fec = fwcap_to_cc_fec(acaps);</div><div class='add'>+	adv_fc = fwcap_to_cc_pause(acaps);</div><div class='ctx'> 	fc = fwcap_to_cc_pause(linkattr);</div><div class='ctx'> 	speed = fwcap_to_speed(linkattr);</div><div class='ctx'> </div><div class='hunk'>@@ -2012,7 +2013,9 @@ static void t4vf_handle_get_port_info(struct port_info *pi,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (link_ok != lc-&gt;link_ok || speed != lc-&gt;speed ||</div><div class='del'>-	    fc != lc-&gt;fc || fec != lc-&gt;fec) {	/* something changed */</div><div class='add'>+	    fc != lc-&gt;fc || adv_fc != lc-&gt;advertised_fc ||</div><div class='add'>+	    fec != lc-&gt;fec) {</div><div class='add'>+		/* something changed */</div><div class='ctx'> 		if (!link_ok &amp;&amp; lc-&gt;link_ok) {</div><div class='ctx'> 			lc-&gt;link_down_rc = linkdnrc;</div><div class='ctx'> 			dev_warn_ratelimited(adapter-&gt;pdev_dev,</div><div class='hunk'>@@ -2022,6 +2025,7 @@ static void t4vf_handle_get_port_info(struct port_info *pi,</div><div class='ctx'> 		}</div><div class='ctx'> 		lc-&gt;link_ok = link_ok;</div><div class='ctx'> 		lc-&gt;speed = speed;</div><div class='add'>+		lc-&gt;advertised_fc = adv_fc;</div><div class='ctx'> 		lc-&gt;fc = fc;</div><div class='ctx'> 		lc-&gt;fec = fec;</div><div class='ctx'> </div><div class='hunk'>@@ -2133,8 +2137,6 @@ int t4vf_handle_fw_rpl(struct adapter *adapter, const __be64 *rpl)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- */</div><div class='ctx'> int t4vf_prep_adapter(struct adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -2186,14 +2188,14 @@ int t4vf_prep_adapter(struct adapter *adapter)</div><div class='ctx'>  *	t4vf_get_vf_mac_acl - Get the MAC address to be set to</div><div class='ctx'>  *			      the VI of this VF.</div><div class='ctx'>  *	@adapter: The adapter</div><div class='del'>- *	@pf: The pf associated with vf</div><div class='add'>+ *	@port: The port associated with vf</div><div class='ctx'>  *	@naddr: the number of ACL MAC addresses returned in addr</div><div class='ctx'>  *	@addr: Placeholder for MAC addresses</div><div class='ctx'>  *</div><div class='ctx'>  *	Find the MAC address to be set to the VF's VI. The requested MAC address</div><div class='ctx'>  *	is from the host OS via callback in the PF driver.</div><div class='ctx'>  */</div><div class='del'>-int t4vf_get_vf_mac_acl(struct adapter *adapter, unsigned int pf,</div><div class='add'>+int t4vf_get_vf_mac_acl(struct adapter *adapter, unsigned int port,</div><div class='ctx'> 			unsigned int *naddr, u8 *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct fw_acl_mac_cmd cmd;</div><div class='hunk'>@@ -2211,7 +2213,7 @@ int t4vf_get_vf_mac_acl(struct adapter *adapter, unsigned int pf,</div><div class='ctx'> 	if (cmd.nmac &lt; *naddr)</div><div class='ctx'> 		*naddr = cmd.nmac;</div><div class='ctx'> </div><div class='del'>-	switch (pf) {</div><div class='add'>+	switch (port) {</div><div class='ctx'> 	case 3:</div><div class='ctx'> 		memcpy(addr, cmd.macaddr3, sizeof(cmd.macaddr3));</div><div class='ctx'> 		break;</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/Kconfig b/drivers/net/ethernet/chelsio/inline_crypto/Kconfig<br/>new file mode 100644<br/>index 000000000000..521955e1f894<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,54 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+#</div><div class='add'>+# Chelsio inline crypto configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config CHELSIO_INLINE_CRYPTO</div><div class='add'>+	bool "Chelsio Inline Crypto support"</div><div class='add'>+	depends on CHELSIO_T4</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  Enable support for inline crypto.</div><div class='add'>+	  Allows enable/disable from list of inline crypto drivers.</div><div class='add'>+</div><div class='add'>+if CHELSIO_INLINE_CRYPTO</div><div class='add'>+</div><div class='add'>+config CRYPTO_DEV_CHELSIO_TLS</div><div class='add'>+	tristate "Chelsio Crypto Inline TLS Driver"</div><div class='add'>+	depends on CHELSIO_T4</div><div class='add'>+	depends on TLS</div><div class='add'>+	depends on TLS_TOE</div><div class='add'>+	help</div><div class='add'>+	  Support Chelsio Inline TLS with Chelsio crypto accelerator.</div><div class='add'>+	  Enable inline TLS support for Tx and Rx.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called chtls.</div><div class='add'>+</div><div class='add'>+config CHELSIO_IPSEC_INLINE</div><div class='add'>+       tristate "Chelsio IPSec XFRM Tx crypto offload"</div><div class='add'>+       depends on CHELSIO_T4</div><div class='add'>+       depends on XFRM_OFFLOAD</div><div class='add'>+       depends on INET_ESP_OFFLOAD || INET6_ESP_OFFLOAD</div><div class='add'>+       help</div><div class='add'>+        Support Chelsio Inline IPsec with Chelsio crypto accelerator.</div><div class='add'>+        Enable inline IPsec support for Tx.</div><div class='add'>+</div><div class='add'>+        To compile this driver as a module, choose M here: the module</div><div class='add'>+        will be called ch_ipsec.</div><div class='add'>+</div><div class='add'>+config CHELSIO_TLS_DEVICE</div><div class='add'>+        tristate "Chelsio Inline KTLS Offload"</div><div class='add'>+        depends on CHELSIO_T4</div><div class='add'>+        depends on TLS</div><div class='add'>+        depends on TLS_DEVICE</div><div class='add'>+	select CRYPTO_LIB_AES</div><div class='add'>+        help</div><div class='add'>+          This flag enables support for kernel tls offload over Chelsio T6</div><div class='add'>+          crypto accelerator. CONFIG_CHELSIO_TLS_DEVICE flag can be enabled</div><div class='add'>+          only if CONFIG_TLS and CONFIG_TLS_DEVICE flags are enabled.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here: the module</div><div class='add'>+	  will be called ch_ktls.</div><div class='add'>+</div><div class='add'>+endif # CHELSIO_INLINE_CRYPTO</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/Makefile b/drivers/net/ethernet/chelsio/inline_crypto/Makefile<br/>new file mode 100644<br/>index 000000000000..27e6d7e2f1eb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/Makefile</a></div><div class='hunk'>@@ -0,0 +1,4 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_CHELSIO_TLS) += chtls/</div><div class='add'>+obj-$(CONFIG_CHELSIO_IPSEC_INLINE) += ch_ipsec/</div><div class='add'>+obj-$(CONFIG_CHELSIO_TLS_DEVICE) += ch_ktls/</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile<br/>new file mode 100644<br/>index 000000000000..efdcaaebc455<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/Makefile</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 \</div><div class='add'>+             -I $(srctree)/drivers/crypto/chelsio</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CHELSIO_IPSEC_INLINE) += ch_ipsec.o</div><div class='add'>+ch_ipsec-objs := chcr_ipsec.o</div><div class='add'>+</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c<br/>new file mode 100644<br/>index 000000000000..49b57bb5fac1<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c</a></div><div class='hunk'>@@ -0,0 +1,822 @@</div><div class='add'>+/*</div><div class='add'>+ * This file is part of the Chelsio T6 Crypto driver for Linux.</div><div class='add'>+ *</div><div class='add'>+ * Copyright (c) 2003-2017 Chelsio Communications, Inc. All rights reserved.</div><div class='add'>+ *</div><div class='add'>+ * This software is available to you under a choice of one of two</div><div class='add'>+ * licenses.  You may choose to be licensed under the terms of the GNU</div><div class='add'>+ * General Public License (GPL) Version 2, available from the file</div><div class='add'>+ * COPYING in the main directory of this source tree, or the</div><div class='add'>+ * OpenIB.org BSD license below:</div><div class='add'>+ *</div><div class='add'>+ *     Redistribution and use in source and binary forms, with or</div><div class='add'>+ *     without modification, are permitted provided that the following</div><div class='add'>+ *     conditions are met:</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions of source code must retain the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer.</div><div class='add'>+ *</div><div class='add'>+ *      - Redistributions in binary form must reproduce the above</div><div class='add'>+ *        copyright notice, this list of conditions and the following</div><div class='add'>+ *        disclaimer in the documentation and/or other materials</div><div class='add'>+ *        provided with the distribution.</div><div class='add'>+ *</div><div class='add'>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='add'>+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='add'>+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='add'>+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='add'>+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='add'>+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='add'>+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='add'>+ * SOFTWARE.</div><div class='add'>+ *</div><div class='add'>+ * Written and Maintained by:</div><div class='add'>+ *	Atul Gupta (atul.gupta@chelsio.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) "ch_ipsec: " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;net/esp.h&gt;</div><div class='add'>+#include &lt;net/xfrm.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/sha1.h&gt;</div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='add'>+#include &lt;crypto/authenc.h&gt;</div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/null.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chcr_ipsec.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Max Tx descriptor space we allow for an Ethernet packet to be inlined</div><div class='add'>+ * into a WR.</div><div class='add'>+ */</div><div class='add'>+#define MAX_IMM_TX_PKT_LEN 256</div><div class='add'>+#define GCM_ESP_IV_SIZE     8</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(uld_ctx_list);</div><div class='add'>+static DEFINE_MUTEX(dev_mutex);</div><div class='add'>+</div><div class='add'>+static int ch_ipsec_uld_state_change(void *handle, enum cxgb4_state new_state);</div><div class='add'>+static int ch_ipsec_xmit(struct sk_buff *skb, struct net_device *dev);</div><div class='add'>+static void *ch_ipsec_uld_add(const struct cxgb4_lld_info *infop);</div><div class='add'>+static void ch_ipsec_advance_esn_state(struct xfrm_state *x);</div><div class='add'>+static void ch_ipsec_xfrm_free_state(struct net_device *dev,</div><div class='add'>+				     struct xfrm_state *x);</div><div class='add'>+static void ch_ipsec_xfrm_del_state(struct net_device *dev,</div><div class='add'>+				    struct xfrm_state *x);</div><div class='add'>+static int ch_ipsec_xfrm_add_state(struct net_device *dev,</div><div class='add'>+				   struct xfrm_state *x,</div><div class='add'>+				   struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+static const struct xfrmdev_ops ch_ipsec_xfrmdev_ops = {</div><div class='add'>+	.xdo_dev_state_add      = ch_ipsec_xfrm_add_state,</div><div class='add'>+	.xdo_dev_state_delete   = ch_ipsec_xfrm_del_state,</div><div class='add'>+	.xdo_dev_state_free     = ch_ipsec_xfrm_free_state,</div><div class='add'>+	.xdo_dev_state_advance_esn = ch_ipsec_advance_esn_state,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct cxgb4_uld_info ch_ipsec_uld_info = {</div><div class='add'>+	.name = CHIPSEC_DRV_MODULE_NAME,</div><div class='add'>+	.add = ch_ipsec_uld_add,</div><div class='add'>+	.state_change = ch_ipsec_uld_state_change,</div><div class='add'>+	.tx_handler = ch_ipsec_xmit,</div><div class='add'>+	.xfrmdev_ops = &amp;ch_ipsec_xfrmdev_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void *ch_ipsec_uld_add(const struct cxgb4_lld_info *infop)</div><div class='add'>+{</div><div class='add'>+	struct ipsec_uld_ctx *u_ctx;</div><div class='add'>+</div><div class='add'>+	pr_info_once("%s - version %s\n", CHIPSEC_DRV_DESC,</div><div class='add'>+		     CHIPSEC_DRV_VERSION);</div><div class='add'>+	u_ctx = kzalloc(sizeof(*u_ctx), GFP_KERNEL);</div><div class='add'>+	if (!u_ctx) {</div><div class='add'>+		u_ctx = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	u_ctx-&gt;lldi = *infop;</div><div class='add'>+out:</div><div class='add'>+	return u_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ch_ipsec_uld_state_change(void *handle, enum cxgb4_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct ipsec_uld_ctx *u_ctx = handle;</div><div class='add'>+</div><div class='add'>+	pr_debug("new_state %u\n", new_state);</div><div class='add'>+	switch (new_state) {</div><div class='add'>+	case CXGB4_STATE_UP:</div><div class='add'>+		pr_info("%s: Up\n", pci_name(u_ctx-&gt;lldi.pdev));</div><div class='add'>+		mutex_lock(&amp;dev_mutex);</div><div class='add'>+		list_add_tail(&amp;u_ctx-&gt;entry, &amp;uld_ctx_list);</div><div class='add'>+		mutex_unlock(&amp;dev_mutex);</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_STATE_START_RECOVERY:</div><div class='add'>+	case CXGB4_STATE_DOWN:</div><div class='add'>+	case CXGB4_STATE_DETACH:</div><div class='add'>+		pr_info("%s: Down\n", pci_name(u_ctx-&gt;lldi.pdev));</div><div class='add'>+		list_del(&amp;u_ctx-&gt;entry);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ch_ipsec_setauthsize(struct xfrm_state *x,</div><div class='add'>+				struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	int hmac_ctrl;</div><div class='add'>+	int authsize = x-&gt;aead-&gt;alg_icv_len / 8;</div><div class='add'>+</div><div class='add'>+	sa_entry-&gt;authsize = authsize;</div><div class='add'>+</div><div class='add'>+	switch (authsize) {</div><div class='add'>+	case ICV_8:</div><div class='add'>+		hmac_ctrl = CHCR_SCMD_HMAC_CTRL_DIV2;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_12:</div><div class='add'>+		hmac_ctrl = CHCR_SCMD_HMAC_CTRL_IPSEC_96BIT;</div><div class='add'>+		break;</div><div class='add'>+	case ICV_16:</div><div class='add'>+		hmac_ctrl = CHCR_SCMD_HMAC_CTRL_NO_TRUNC;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	return hmac_ctrl;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ch_ipsec_setkey(struct xfrm_state *x,</div><div class='add'>+			   struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	int keylen = (x-&gt;aead-&gt;alg_key_len + 7) / 8;</div><div class='add'>+	unsigned char *key = x-&gt;aead-&gt;alg_key;</div><div class='add'>+	int ck_size, key_ctx_size = 0;</div><div class='add'>+	unsigned char ghash_h[AEAD_H_SIZE];</div><div class='add'>+	struct crypto_aes_ctx aes;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	if (keylen &gt; 3) {</div><div class='add'>+		keylen -= 4;  /* nonce/salt is present in the last 4 bytes */</div><div class='add'>+		memcpy(sa_entry-&gt;salt, key + keylen, 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (keylen == AES_KEYSIZE_128) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+	} else if (keylen == AES_KEYSIZE_192) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_192;</div><div class='add'>+	} else if (keylen == AES_KEYSIZE_256) {</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_256;</div><div class='add'>+	} else {</div><div class='add'>+		pr_err("GCM: Invalid key length %d\n", keylen);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(sa_entry-&gt;key, key, keylen);</div><div class='add'>+	sa_entry-&gt;enckey_len = keylen;</div><div class='add'>+	key_ctx_size = sizeof(struct _key_ctx) +</div><div class='add'>+			      ((DIV_ROUND_UP(keylen, 16)) &lt;&lt; 4) +</div><div class='add'>+			      AEAD_H_SIZE;</div><div class='add'>+</div><div class='add'>+	sa_entry-&gt;key_ctx_hdr = FILL_KEY_CTX_HDR(ck_size,</div><div class='add'>+						 CHCR_KEYCTX_MAC_KEY_SIZE_128,</div><div class='add'>+						 0, 0,</div><div class='add'>+						 key_ctx_size &gt;&gt; 4);</div><div class='add'>+</div><div class='add'>+	/* Calculate the H = CIPH(K, 0 repeated 16 times).</div><div class='add'>+	 * It will go in key context</div><div class='add'>+	 */</div><div class='add'>+	ret = aes_expandkey(&amp;aes, key, keylen);</div><div class='add'>+	if (ret) {</div><div class='add'>+		sa_entry-&gt;enckey_len = 0;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	memset(ghash_h, 0, AEAD_H_SIZE);</div><div class='add'>+	aes_encrypt(&amp;aes, ghash_h, ghash_h);</div><div class='add'>+	memzero_explicit(&amp;aes, sizeof(aes));</div><div class='add'>+</div><div class='add'>+	memcpy(sa_entry-&gt;key + (DIV_ROUND_UP(sa_entry-&gt;enckey_len, 16) *</div><div class='add'>+	       16), ghash_h, AEAD_H_SIZE);</div><div class='add'>+	sa_entry-&gt;kctx_len = ((DIV_ROUND_UP(sa_entry-&gt;enckey_len, 16)) &lt;&lt; 4) +</div><div class='add'>+			      AEAD_H_SIZE;</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * ch_ipsec_xfrm_add_state</div><div class='add'>+ * returns 0 on success, negative error if failed to send message to FPGA</div><div class='add'>+ * positive error if FPGA returned a bad response</div><div class='add'>+ */</div><div class='add'>+static int ch_ipsec_xfrm_add_state(struct net_device *dev,</div><div class='add'>+				   struct xfrm_state *x,</div><div class='add'>+				   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ipsec_sa_entry *sa_entry;</div><div class='add'>+	int res = 0;</div><div class='add'>+</div><div class='add'>+	if (x-&gt;props.aalgo != SADB_AALG_NONE) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload authenticated xfrm states");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;props.calgo != SADB_X_CALG_NONE) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload compressed xfrm states");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;props.family != AF_INET &amp;&amp;</div><div class='add'>+	    x-&gt;props.family != AF_INET6) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Only IPv4/6 xfrm state offloaded");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;props.mode != XFRM_MODE_TRANSPORT &amp;&amp;</div><div class='add'>+	    x-&gt;props.mode != XFRM_MODE_TUNNEL) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Only transport and tunnel xfrm offload");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;id.proto != IPPROTO_ESP) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Only ESP xfrm state offloaded");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;encap) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Encapsulated xfrm state not offloaded");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!x-&gt;aead) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload xfrm states without aead");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;aead-&gt;alg_icv_len != 128 &amp;&amp;</div><div class='add'>+	    x-&gt;aead-&gt;alg_icv_len != 96) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload xfrm states with AEAD ICV length other than 96b &amp; 128b");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if ((x-&gt;aead-&gt;alg_key_len != 128 + 32) &amp;&amp;</div><div class='add'>+	    (x-&gt;aead-&gt;alg_key_len != 256 + 32)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "cannot offload xfrm states with AEAD key length other than 128/256 bit");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;tfcpad) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload xfrm states with tfc padding");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (!x-&gt;geniv) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload xfrm states without geniv");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (strcmp(x-&gt;geniv, "seqiv")) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot offload xfrm states with geniv other than seqiv");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	if (x-&gt;xso.type != XFRM_DEV_OFFLOAD_CRYPTO) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Unsupported xfrm offload");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(!try_module_get(THIS_MODULE))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Failed to acquire module reference");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sa_entry = kzalloc(sizeof(*sa_entry), GFP_KERNEL);</div><div class='add'>+	if (!sa_entry) {</div><div class='add'>+		res = -ENOMEM;</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sa_entry-&gt;hmac_ctrl = ch_ipsec_setauthsize(x, sa_entry);</div><div class='add'>+	if (x-&gt;props.flags &amp; XFRM_STATE_ESN)</div><div class='add'>+		sa_entry-&gt;esn = 1;</div><div class='add'>+	ch_ipsec_setkey(x, sa_entry);</div><div class='add'>+	x-&gt;xso.offload_handle = (unsigned long)sa_entry;</div><div class='add'>+out:</div><div class='add'>+	return res;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch_ipsec_xfrm_del_state(struct net_device *dev,</div><div class='add'>+				    struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	/* do nothing */</div><div class='add'>+	if (!x-&gt;xso.offload_handle)</div><div class='add'>+		return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch_ipsec_xfrm_free_state(struct net_device *dev,</div><div class='add'>+				     struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	struct ipsec_sa_entry *sa_entry;</div><div class='add'>+</div><div class='add'>+	if (!x-&gt;xso.offload_handle)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	sa_entry = (struct ipsec_sa_entry *)x-&gt;xso.offload_handle;</div><div class='add'>+	kfree(sa_entry);</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch_ipsec_advance_esn_state(struct xfrm_state *x)</div><div class='add'>+{</div><div class='add'>+	/* do nothing */</div><div class='add'>+	if (!x-&gt;xso.offload_handle)</div><div class='add'>+		return;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int is_eth_imm(const struct sk_buff *skb,</div><div class='add'>+		      struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	unsigned int kctx_len;</div><div class='add'>+	int hdrlen;</div><div class='add'>+</div><div class='add'>+	kctx_len = sa_entry-&gt;kctx_len;</div><div class='add'>+	hdrlen = sizeof(struct fw_ulptx_wr) +</div><div class='add'>+		 sizeof(struct chcr_ipsec_req) + kctx_len;</div><div class='add'>+</div><div class='add'>+	hdrlen += sizeof(struct cpl_tx_pkt);</div><div class='add'>+	if (sa_entry-&gt;esn)</div><div class='add'>+		hdrlen += (DIV_ROUND_UP(sizeof(struct chcr_ipsec_aadiv), 16)</div><div class='add'>+			   &lt;&lt; 4);</div><div class='add'>+	if (skb-&gt;len &lt;= MAX_IMM_TX_PKT_LEN - hdrlen)</div><div class='add'>+		return hdrlen;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int calc_tx_sec_flits(const struct sk_buff *skb,</div><div class='add'>+				      struct ipsec_sa_entry *sa_entry,</div><div class='add'>+				      bool *immediate)</div><div class='add'>+{</div><div class='add'>+	unsigned int kctx_len;</div><div class='add'>+	unsigned int flits;</div><div class='add'>+	int aadivlen;</div><div class='add'>+	int hdrlen;</div><div class='add'>+</div><div class='add'>+	kctx_len = sa_entry-&gt;kctx_len;</div><div class='add'>+	hdrlen = is_eth_imm(skb, sa_entry);</div><div class='add'>+	aadivlen = sa_entry-&gt;esn ? DIV_ROUND_UP(sizeof(struct chcr_ipsec_aadiv),</div><div class='add'>+						16) : 0;</div><div class='add'>+	aadivlen &lt;&lt;= 4;</div><div class='add'>+</div><div class='add'>+	/* If the skb is small enough, we can pump it out as a work request</div><div class='add'>+	 * with only immediate data.  In that case we just have to have the</div><div class='add'>+	 * TX Packet header plus the skb data in the Work Request.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	if (hdrlen) {</div><div class='add'>+		*immediate = true;</div><div class='add'>+		return DIV_ROUND_UP(skb-&gt;len + hdrlen, sizeof(__be64));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flits = sgl_len(skb_shinfo(skb)-&gt;nr_frags + 1);</div><div class='add'>+</div><div class='add'>+	/* Otherwise, we're going to have to construct a Scatter gather list</div><div class='add'>+	 * of the skb body and fragments.  We also include the flits necessary</div><div class='add'>+	 * for the TX Packet Work Request and CPL.  We always have a firmware</div><div class='add'>+	 * Write Header (incorporated as part of the cpl_tx_pkt_lso and</div><div class='add'>+	 * cpl_tx_pkt structures), followed by either a TX Packet Write CPL</div><div class='add'>+	 * message or, if we're doing a Large Send Offload, an LSO CPL message</div><div class='add'>+	 * with an embedded TX Packet Write CPL message.</div><div class='add'>+	 */</div><div class='add'>+	flits += (sizeof(struct fw_ulptx_wr) +</div><div class='add'>+		  sizeof(struct chcr_ipsec_req) +</div><div class='add'>+		  kctx_len +</div><div class='add'>+		  sizeof(struct cpl_tx_pkt_core) +</div><div class='add'>+		  aadivlen) / sizeof(__be64);</div><div class='add'>+	return flits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *copy_esn_pktxt(struct sk_buff *skb,</div><div class='add'>+			    struct net_device *dev,</div><div class='add'>+			    void *pos,</div><div class='add'>+			    struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ipsec_aadiv *aadiv;</div><div class='add'>+	struct ulptx_idata *sc_imm;</div><div class='add'>+	struct ip_esp_hdr *esphdr;</div><div class='add'>+	struct xfrm_offload *xo;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	__be64 seqno;</div><div class='add'>+	u32 qidx;</div><div class='add'>+	u32 seqlo;</div><div class='add'>+	u8 *iv;</div><div class='add'>+	int eoq;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	pi = netdev_priv(dev);</div><div class='add'>+	adap = pi-&gt;adapter;</div><div class='add'>+	qidx = skb-&gt;queue_mapping;</div><div class='add'>+	q = &amp;adap-&gt;sge.ethtxq[qidx + pi-&gt;first_qset];</div><div class='add'>+</div><div class='add'>+	/* end of queue, reset pos to start of queue */</div><div class='add'>+	eoq = (void *)q-&gt;q.stat - pos;</div><div class='add'>+	if (!eoq)</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+</div><div class='add'>+	len = DIV_ROUND_UP(sizeof(struct chcr_ipsec_aadiv), 16) &lt;&lt; 4;</div><div class='add'>+	memset(pos, 0, len);</div><div class='add'>+	aadiv = (struct chcr_ipsec_aadiv *)pos;</div><div class='add'>+	esphdr = (struct ip_esp_hdr *)skb_transport_header(skb);</div><div class='add'>+	iv = skb_transport_header(skb) + sizeof(struct ip_esp_hdr);</div><div class='add'>+	xo = xfrm_offload(skb);</div><div class='add'>+</div><div class='add'>+	aadiv-&gt;spi = (esphdr-&gt;spi);</div><div class='add'>+	seqlo = ntohl(esphdr-&gt;seq_no);</div><div class='add'>+	seqno = cpu_to_be64(seqlo + ((u64)xo-&gt;seq.hi &lt;&lt; 32));</div><div class='add'>+	memcpy(aadiv-&gt;seq_no, &amp;seqno, 8);</div><div class='add'>+	iv = skb_transport_header(skb) + sizeof(struct ip_esp_hdr);</div><div class='add'>+	memcpy(aadiv-&gt;iv, iv, 8);</div><div class='add'>+</div><div class='add'>+	if (is_eth_imm(skb, sa_entry) &amp;&amp; !skb_is_nonlinear(skb)) {</div><div class='add'>+		sc_imm = (struct ulptx_idata *)(pos +</div><div class='add'>+			  (DIV_ROUND_UP(sizeof(struct chcr_ipsec_aadiv),</div><div class='add'>+					sizeof(__be64)) &lt;&lt; 3));</div><div class='add'>+		sc_imm-&gt;cmd_more = FILL_CMD_MORE(0);</div><div class='add'>+		sc_imm-&gt;len = cpu_to_be32(skb-&gt;len);</div><div class='add'>+	}</div><div class='add'>+	pos += len;</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *copy_cpltx_pktxt(struct sk_buff *skb,</div><div class='add'>+			      struct net_device *dev,</div><div class='add'>+			      void *pos,</div><div class='add'>+			      struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	struct cpl_tx_pkt_core *cpl;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	u32 ctrl0, qidx;</div><div class='add'>+	u64 cntrl = 0;</div><div class='add'>+	int left;</div><div class='add'>+</div><div class='add'>+	pi = netdev_priv(dev);</div><div class='add'>+	adap = pi-&gt;adapter;</div><div class='add'>+	qidx = skb-&gt;queue_mapping;</div><div class='add'>+	q = &amp;adap-&gt;sge.ethtxq[qidx + pi-&gt;first_qset];</div><div class='add'>+</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+	if (!left)</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+</div><div class='add'>+	cpl = (struct cpl_tx_pkt_core *)pos;</div><div class='add'>+</div><div class='add'>+	cntrl = TXPKT_L4CSUM_DIS_F | TXPKT_IPCSUM_DIS_F;</div><div class='add'>+	ctrl0 = TXPKT_OPCODE_V(CPL_TX_PKT_XT) | TXPKT_INTF_V(pi-&gt;tx_chan) |</div><div class='add'>+			       TXPKT_PF_V(adap-&gt;pf);</div><div class='add'>+	if (skb_vlan_tag_present(skb)) {</div><div class='add'>+		q-&gt;vlan_ins++;</div><div class='add'>+		cntrl |= TXPKT_VLAN_VLD_F | TXPKT_VLAN_V(skb_vlan_tag_get(skb));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cpl-&gt;ctrl0 = htonl(ctrl0);</div><div class='add'>+	cpl-&gt;pack = htons(0);</div><div class='add'>+	cpl-&gt;len = htons(skb-&gt;len);</div><div class='add'>+	cpl-&gt;ctrl1 = cpu_to_be64(cntrl);</div><div class='add'>+</div><div class='add'>+	pos += sizeof(struct cpl_tx_pkt_core);</div><div class='add'>+	/* Copy ESN info for HW */</div><div class='add'>+	if (sa_entry-&gt;esn)</div><div class='add'>+		pos = copy_esn_pktxt(skb, dev, pos, sa_entry);</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *copy_key_cpltx_pktxt(struct sk_buff *skb,</div><div class='add'>+				  struct net_device *dev,</div><div class='add'>+				  void *pos,</div><div class='add'>+				  struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	struct _key_ctx *key_ctx;</div><div class='add'>+	int left, eoq, key_len;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	unsigned int qidx;</div><div class='add'>+</div><div class='add'>+	pi = netdev_priv(dev);</div><div class='add'>+	adap = pi-&gt;adapter;</div><div class='add'>+	qidx = skb-&gt;queue_mapping;</div><div class='add'>+	q = &amp;adap-&gt;sge.ethtxq[qidx + pi-&gt;first_qset];</div><div class='add'>+	key_len = sa_entry-&gt;kctx_len;</div><div class='add'>+</div><div class='add'>+	/* end of queue, reset pos to start of queue */</div><div class='add'>+	eoq = (void *)q-&gt;q.stat - pos;</div><div class='add'>+	left = eoq;</div><div class='add'>+	if (!eoq) {</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		left = 64 * q-&gt;q.size;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Copy the Key context header */</div><div class='add'>+	key_ctx = (struct _key_ctx *)pos;</div><div class='add'>+	key_ctx-&gt;ctx_hdr = sa_entry-&gt;key_ctx_hdr;</div><div class='add'>+	memcpy(key_ctx-&gt;salt, sa_entry-&gt;salt, MAX_SALT);</div><div class='add'>+	pos += sizeof(struct _key_ctx);</div><div class='add'>+	left -= sizeof(struct _key_ctx);</div><div class='add'>+</div><div class='add'>+	if (likely(key_len &lt;= left)) {</div><div class='add'>+		memcpy(key_ctx-&gt;key, sa_entry-&gt;key, key_len);</div><div class='add'>+		pos += key_len;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(pos, sa_entry-&gt;key, left);</div><div class='add'>+		memcpy(q-&gt;q.desc, sa_entry-&gt;key + left,</div><div class='add'>+		       key_len - left);</div><div class='add'>+		pos = (u8 *)q-&gt;q.desc + (key_len - left);</div><div class='add'>+	}</div><div class='add'>+	/* Copy CPL TX PKT XT */</div><div class='add'>+	pos = copy_cpltx_pktxt(skb, dev, pos, sa_entry);</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *ch_ipsec_crypto_wreq(struct sk_buff *skb,</div><div class='add'>+				  struct net_device *dev,</div><div class='add'>+				  void *pos,</div><div class='add'>+				  int credits,</div><div class='add'>+				  struct ipsec_sa_entry *sa_entry)</div><div class='add'>+{</div><div class='add'>+	struct port_info *pi = netdev_priv(dev);</div><div class='add'>+	struct adapter *adap = pi-&gt;adapter;</div><div class='add'>+	unsigned int ivsize = GCM_ESP_IV_SIZE;</div><div class='add'>+	struct chcr_ipsec_wr *wr;</div><div class='add'>+	bool immediate = false;</div><div class='add'>+	u16 immdatalen = 0;</div><div class='add'>+	unsigned int flits;</div><div class='add'>+	u32 ivinoffset;</div><div class='add'>+	u32 aadstart;</div><div class='add'>+	u32 aadstop;</div><div class='add'>+	u32 ciphstart;</div><div class='add'>+	u16 sc_more = 0;</div><div class='add'>+	u32 ivdrop = 0;</div><div class='add'>+	u32 esnlen = 0;</div><div class='add'>+	u32 wr_mid;</div><div class='add'>+	u16 ndesc;</div><div class='add'>+	int qidx = skb_get_queue_mapping(skb);</div><div class='add'>+	struct sge_eth_txq *q = &amp;adap-&gt;sge.ethtxq[qidx + pi-&gt;first_qset];</div><div class='add'>+	unsigned int kctx_len = sa_entry-&gt;kctx_len;</div><div class='add'>+	int qid = q-&gt;q.cntxt_id;</div><div class='add'>+</div><div class='add'>+	atomic_inc(&amp;adap-&gt;ch_ipsec_stats.ipsec_cnt);</div><div class='add'>+</div><div class='add'>+	flits = calc_tx_sec_flits(skb, sa_entry, &amp;immediate);</div><div class='add'>+	ndesc = DIV_ROUND_UP(flits, 2);</div><div class='add'>+	if (sa_entry-&gt;esn)</div><div class='add'>+		ivdrop = 1;</div><div class='add'>+</div><div class='add'>+	if (immediate)</div><div class='add'>+		immdatalen = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (sa_entry-&gt;esn) {</div><div class='add'>+		esnlen = sizeof(struct chcr_ipsec_aadiv);</div><div class='add'>+		if (!skb_is_nonlinear(skb))</div><div class='add'>+			sc_more  = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* WR Header */</div><div class='add'>+	wr = (struct chcr_ipsec_wr *)pos;</div><div class='add'>+	wr-&gt;wreq.op_to_compl = htonl(FW_WR_OP_V(FW_ULPTX_WR));</div><div class='add'>+	wr_mid = FW_CRYPTO_LOOKASIDE_WR_LEN16_V(ndesc);</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		netif_tx_stop_queue(q-&gt;txq);</div><div class='add'>+		q-&gt;q.stops++;</div><div class='add'>+		if (!q-&gt;dbqt)</div><div class='add'>+			wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+	wr_mid |= FW_ULPTX_WR_DATA_F;</div><div class='add'>+	wr-&gt;wreq.flowid_len16 = htonl(wr_mid);</div><div class='add'>+</div><div class='add'>+	/* ULPTX */</div><div class='add'>+	wr-&gt;req.ulptx.cmd_dest = FILL_ULPTX_CMD_DEST(pi-&gt;port_id, qid);</div><div class='add'>+	wr-&gt;req.ulptx.len = htonl(ndesc - 1);</div><div class='add'>+</div><div class='add'>+	/* Sub-command */</div><div class='add'>+	wr-&gt;req.sc_imm.cmd_more = FILL_CMD_MORE(!immdatalen || sc_more);</div><div class='add'>+	wr-&gt;req.sc_imm.len = cpu_to_be32(sizeof(struct cpl_tx_sec_pdu) +</div><div class='add'>+					 sizeof(wr-&gt;req.key_ctx) +</div><div class='add'>+					 kctx_len +</div><div class='add'>+					 sizeof(struct cpl_tx_pkt_core) +</div><div class='add'>+					 esnlen +</div><div class='add'>+					 (esnlen ? 0 : immdatalen));</div><div class='add'>+</div><div class='add'>+	/* CPL_SEC_PDU */</div><div class='add'>+	ivinoffset = sa_entry-&gt;esn ? (ESN_IV_INSERT_OFFSET + 1) :</div><div class='add'>+				     (skb_transport_offset(skb) +</div><div class='add'>+				      sizeof(struct ip_esp_hdr) + 1);</div><div class='add'>+	wr-&gt;req.sec_cpl.op_ivinsrtofst = htonl(</div><div class='add'>+				CPL_TX_SEC_PDU_OPCODE_V(CPL_TX_SEC_PDU) |</div><div class='add'>+				CPL_TX_SEC_PDU_CPLLEN_V(2) |</div><div class='add'>+				CPL_TX_SEC_PDU_PLACEHOLDER_V(1) |</div><div class='add'>+				CPL_TX_SEC_PDU_IVINSRTOFST_V(</div><div class='add'>+							     ivinoffset));</div><div class='add'>+</div><div class='add'>+	wr-&gt;req.sec_cpl.pldlen = htonl(skb-&gt;len + esnlen);</div><div class='add'>+	aadstart = sa_entry-&gt;esn ? 1 : (skb_transport_offset(skb) + 1);</div><div class='add'>+	aadstop = sa_entry-&gt;esn ? ESN_IV_INSERT_OFFSET :</div><div class='add'>+				  (skb_transport_offset(skb) +</div><div class='add'>+				   sizeof(struct ip_esp_hdr));</div><div class='add'>+	ciphstart = skb_transport_offset(skb) + sizeof(struct ip_esp_hdr) +</div><div class='add'>+		    GCM_ESP_IV_SIZE + 1;</div><div class='add'>+	ciphstart += sa_entry-&gt;esn ?  esnlen : 0;</div><div class='add'>+</div><div class='add'>+	wr-&gt;req.sec_cpl.aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(</div><div class='add'>+							aadstart,</div><div class='add'>+							aadstop,</div><div class='add'>+							ciphstart, 0);</div><div class='add'>+</div><div class='add'>+	wr-&gt;req.sec_cpl.cipherstop_lo_authinsert =</div><div class='add'>+		FILL_SEC_CPL_AUTHINSERT(0, ciphstart,</div><div class='add'>+					sa_entry-&gt;authsize,</div><div class='add'>+					 sa_entry-&gt;authsize);</div><div class='add'>+	wr-&gt;req.sec_cpl.seqno_numivs =</div><div class='add'>+		FILL_SEC_CPL_SCMD0_SEQNO(CHCR_ENCRYPT_OP, 1,</div><div class='add'>+					 CHCR_SCMD_CIPHER_MODE_AES_GCM,</div><div class='add'>+					 CHCR_SCMD_AUTH_MODE_GHASH,</div><div class='add'>+					 sa_entry-&gt;hmac_ctrl,</div><div class='add'>+					 ivsize &gt;&gt; 1);</div><div class='add'>+	wr-&gt;req.sec_cpl.ivgen_hdrlen =  FILL_SEC_CPL_IVGEN_HDRLEN(0, 0, 1,</div><div class='add'>+								  0, ivdrop, 0);</div><div class='add'>+</div><div class='add'>+	pos += sizeof(struct fw_ulptx_wr) +</div><div class='add'>+	       sizeof(struct ulp_txpkt) +</div><div class='add'>+	       sizeof(struct ulptx_idata) +</div><div class='add'>+	       sizeof(struct cpl_tx_sec_pdu);</div><div class='add'>+</div><div class='add'>+	pos = copy_key_cpltx_pktxt(skb, dev, pos, sa_entry);</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ *      flits_to_desc - returns the num of Tx descriptors for the given flits</div><div class='add'>+ *      @n: the number of flits</div><div class='add'>+ *</div><div class='add'>+ *      Returns the number of Tx descriptors needed for the supplied number</div><div class='add'>+ *      of flits.</div><div class='add'>+ */</div><div class='add'>+static unsigned int flits_to_desc(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(n &gt; SGE_MAX_WR_LEN / 8);</div><div class='add'>+	return DIV_ROUND_UP(n, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int txq_avail(const struct sge_txq *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;size - 1 - q-&gt;in_use;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void eth_txq_stop(struct sge_eth_txq *q)</div><div class='add'>+{</div><div class='add'>+	netif_tx_stop_queue(q-&gt;txq);</div><div class='add'>+	q-&gt;q.stops++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void txq_advance(struct sge_txq *q, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	q-&gt;in_use += n;</div><div class='add'>+	q-&gt;pidx += n;</div><div class='add'>+	if (q-&gt;pidx &gt;= q-&gt;size)</div><div class='add'>+		q-&gt;pidx -= q-&gt;size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ *      ch_ipsec_xmit called from ULD Tx handler</div><div class='add'>+ */</div><div class='add'>+int ch_ipsec_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct xfrm_state *x = xfrm_input_state(skb);</div><div class='add'>+	unsigned int last_desc, ndesc, flits = 0;</div><div class='add'>+	struct ipsec_sa_entry *sa_entry;</div><div class='add'>+	u64 *pos, *end, *before, *sgl;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='add'>+	int qidx, left, credits;</div><div class='add'>+	bool immediate = false;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	struct sec_path *sp;</div><div class='add'>+</div><div class='add'>+	if (!x-&gt;xso.offload_handle)</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+</div><div class='add'>+	sa_entry = (struct ipsec_sa_entry *)x-&gt;xso.offload_handle;</div><div class='add'>+</div><div class='add'>+	sp = skb_sec_path(skb);</div><div class='add'>+	if (sp-&gt;len != 1) {</div><div class='add'>+out_free:       dev_kfree_skb_any(skb);</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pi = netdev_priv(dev);</div><div class='add'>+	adap = pi-&gt;adapter;</div><div class='add'>+	qidx = skb-&gt;queue_mapping;</div><div class='add'>+	q = &amp;adap-&gt;sge.ethtxq[qidx + pi-&gt;first_qset];</div><div class='add'>+</div><div class='add'>+	cxgb4_reclaim_completed_tx(adap, &amp;q-&gt;q, true);</div><div class='add'>+</div><div class='add'>+	flits = calc_tx_sec_flits(skb, sa_entry, &amp;immediate);</div><div class='add'>+	ndesc = flits_to_desc(flits);</div><div class='add'>+	credits = txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		eth_txq_stop(q);</div><div class='add'>+		dev_err(adap-&gt;pdev_dev,</div><div class='add'>+			"%s: Tx ring %u full while queue awake! cred:%d %d %d flits:%d\n",</div><div class='add'>+			dev-&gt;name, qidx, credits, ndesc, txq_avail(&amp;q-&gt;q),</div><div class='add'>+			flits);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= q-&gt;q.size)</div><div class='add'>+		last_desc -= q-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;q-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='add'>+	if (!immediate &amp;&amp;</div><div class='add'>+	    unlikely(cxgb4_map_skb(adap-&gt;pdev_dev, skb, sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='add'>+		q-&gt;mapping_err++;</div><div class='add'>+		goto out_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = (u64 *)&amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	before = (u64 *)pos;</div><div class='add'>+	end = (u64 *)pos + flits;</div><div class='add'>+	/* Setup IPSec CPL */</div><div class='add'>+	pos = (void *)ch_ipsec_crypto_wreq(skb, dev, (void *)pos,</div><div class='add'>+					   credits, sa_entry);</div><div class='add'>+	if (before &gt; (u64 *)pos) {</div><div class='add'>+		left = (u8 *)end - (u8 *)q-&gt;q.stat;</div><div class='add'>+		end = (void *)q-&gt;q.desc + left;</div><div class='add'>+	}</div><div class='add'>+	if (pos == (u64 *)q-&gt;q.stat) {</div><div class='add'>+		left = (u8 *)end - (u8 *)q-&gt;q.stat;</div><div class='add'>+		end = (void *)q-&gt;q.desc + left;</div><div class='add'>+		pos = (void *)q-&gt;q.desc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sgl = (void *)pos;</div><div class='add'>+	if (immediate) {</div><div class='add'>+		cxgb4_inline_tx_skb(skb, &amp;q-&gt;q, sgl);</div><div class='add'>+		dev_consume_skb_any(skb);</div><div class='add'>+	} else {</div><div class='add'>+		cxgb4_write_sgl(skb, &amp;q-&gt;q, (void *)sgl, end,</div><div class='add'>+				0, sgl_sdesc-&gt;addr);</div><div class='add'>+		skb_orphan(skb);</div><div class='add'>+		sgl_sdesc-&gt;skb = skb;</div><div class='add'>+	}</div><div class='add'>+	txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+</div><div class='add'>+	cxgb4_ring_tx_db(adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init ch_ipsec_init(void)</div><div class='add'>+{</div><div class='add'>+	cxgb4_register_uld(CXGB4_ULD_IPSEC, &amp;ch_ipsec_uld_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit ch_ipsec_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct ipsec_uld_ctx *u_ctx, *tmp;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev_mutex);</div><div class='add'>+	list_for_each_entry_safe(u_ctx, tmp, &amp;uld_ctx_list, entry) {</div><div class='add'>+		adap = pci_get_drvdata(u_ctx-&gt;lldi.pdev);</div><div class='add'>+		atomic_set(&amp;adap-&gt;ch_ipsec_stats.ipsec_cnt, 0);</div><div class='add'>+		list_del(&amp;u_ctx-&gt;entry);</div><div class='add'>+		kfree(u_ctx);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev_mutex);</div><div class='add'>+	cxgb4_unregister_uld(CXGB4_ULD_IPSEC);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(ch_ipsec_init);</div><div class='add'>+module_exit(ch_ipsec_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Crypto IPSEC for Chelsio Terminator cards.");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Chelsio Communications");</div><div class='add'>+MODULE_VERSION(CHIPSEC_DRV_VERSION);</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h<br/>new file mode 100644<br/>index 000000000000..0d42e7d15714<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h</a></div><div class='hunk'>@@ -0,0 +1,57 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (c) 2018 Chelsio Communications, Inc. */</div><div class='add'>+</div><div class='add'>+#ifndef __CHCR_IPSEC_H__</div><div class='add'>+#define __CHCR_IPSEC_H__</div><div class='add'>+</div><div class='add'>+#include "t4_hw.h"</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+#include "t4_msg.h"</div><div class='add'>+#include "cxgb4_uld.h"</div><div class='add'>+</div><div class='add'>+#include "chcr_core.h"</div><div class='add'>+#include "chcr_algo.h"</div><div class='add'>+#include "chcr_crypto.h"</div><div class='add'>+</div><div class='add'>+#define CHIPSEC_DRV_MODULE_NAME "ch_ipsec"</div><div class='add'>+#define CHIPSEC_DRV_VERSION "1.0.0.0-ko"</div><div class='add'>+#define CHIPSEC_DRV_DESC "Chelsio T6 Crypto Ipsec offload Driver"</div><div class='add'>+</div><div class='add'>+struct ipsec_uld_ctx {</div><div class='add'>+	struct list_head entry;</div><div class='add'>+	struct cxgb4_lld_info lldi;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_ipsec_req {</div><div class='add'>+	struct ulp_txpkt ulptx;</div><div class='add'>+	struct ulptx_idata sc_imm;</div><div class='add'>+	struct cpl_tx_sec_pdu sec_cpl;</div><div class='add'>+	struct _key_ctx key_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_ipsec_wr {</div><div class='add'>+	struct fw_ulptx_wr wreq;</div><div class='add'>+	struct chcr_ipsec_req req;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ESN_IV_INSERT_OFFSET 12</div><div class='add'>+struct chcr_ipsec_aadiv {</div><div class='add'>+	__be32 spi;</div><div class='add'>+	u8 seq_no[8];</div><div class='add'>+	u8 iv[8];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct ipsec_sa_entry {</div><div class='add'>+	int hmac_ctrl;</div><div class='add'>+	u16 esn;</div><div class='add'>+	u16 resv;</div><div class='add'>+	unsigned int enckey_len;</div><div class='add'>+	unsigned int kctx_len;</div><div class='add'>+	unsigned int authsize;</div><div class='add'>+	__be32 key_ctx_hdr;</div><div class='add'>+	char salt[MAX_SALT];</div><div class='add'>+	char key[2 * AES_MAX_KEY_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#endif /* __CHCR_IPSEC_H__ */</div><div class='add'>+</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile<br/>new file mode 100644<br/>index 000000000000..5e7d161c3199<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/Makefile</a></div><div class='hunk'>@@ -0,0 +1,5 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CHELSIO_TLS_DEVICE) += ch_ktls.o</div><div class='add'>+ch_ktls-objs := chcr_ktls.o</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h<br/>new file mode 100644<br/>index 000000000000..38319f4c3121<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_common.h</a></div><div class='hunk'>@@ -0,0 +1,111 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2020 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef __CHCR_COMMON_H__</div><div class='add'>+#define __CHCR_COMMON_H__</div><div class='add'>+</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+</div><div class='add'>+#define CHCR_MAX_SALT                      4</div><div class='add'>+#define CHCR_KEYCTX_MAC_KEY_SIZE_128       0</div><div class='add'>+#define CHCR_KEYCTX_CIPHER_KEY_SIZE_128    0</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_GCM      2</div><div class='add'>+#define CHCR_SCMD_CIPHER_MODE_AES_CTR      3</div><div class='add'>+#define CHCR_CPL_TX_SEC_PDU_LEN_64BIT      2</div><div class='add'>+#define CHCR_SCMD_SEQ_NO_CTRL_64BIT        3</div><div class='add'>+#define CHCR_SCMD_PROTO_VERSION_TLS        0</div><div class='add'>+#define CHCR_SCMD_PROTO_VERSION_GENERIC    4</div><div class='add'>+#define CHCR_SCMD_AUTH_MODE_GHASH          4</div><div class='add'>+#define AES_BLOCK_LEN                      16</div><div class='add'>+</div><div class='add'>+struct ktls_key_ctx {</div><div class='add'>+	__be32 ctx_hdr;</div><div class='add'>+	u8 salt[CHCR_MAX_SALT];</div><div class='add'>+	__be64 iv_to_auth;</div><div class='add'>+	unsigned char key[TLS_CIPHER_AES_GCM_128_KEY_SIZE +</div><div class='add'>+			  TLS_CIPHER_AES_GCM_256_TAG_SIZE];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Crypto key context */</div><div class='add'>+#define KEY_CONTEXT_CTX_LEN_S           24</div><div class='add'>+#define KEY_CONTEXT_CTX_LEN_V(x)        ((x) &lt;&lt; KEY_CONTEXT_CTX_LEN_S)</div><div class='add'>+</div><div class='add'>+#define KEY_CONTEXT_SALT_PRESENT_S      10</div><div class='add'>+#define KEY_CONTEXT_SALT_PRESENT_V(x)   ((x) &lt;&lt; KEY_CONTEXT_SALT_PRESENT_S)</div><div class='add'>+#define KEY_CONTEXT_SALT_PRESENT_F      KEY_CONTEXT_SALT_PRESENT_V(1U)</div><div class='add'>+</div><div class='add'>+#define KEY_CONTEXT_VALID_S     0</div><div class='add'>+#define KEY_CONTEXT_VALID_V(x)  ((x) &lt;&lt; KEY_CONTEXT_VALID_S)</div><div class='add'>+#define KEY_CONTEXT_VALID_F     KEY_CONTEXT_VALID_V(1U)</div><div class='add'>+</div><div class='add'>+#define KEY_CONTEXT_CK_SIZE_S           6</div><div class='add'>+#define KEY_CONTEXT_CK_SIZE_V(x)        ((x) &lt;&lt; KEY_CONTEXT_CK_SIZE_S)</div><div class='add'>+</div><div class='add'>+#define KEY_CONTEXT_MK_SIZE_S           2</div><div class='add'>+#define KEY_CONTEXT_MK_SIZE_V(x)        ((x) &lt;&lt; KEY_CONTEXT_MK_SIZE_S)</div><div class='add'>+</div><div class='add'>+#define KEY_CONTEXT_OPAD_PRESENT_S      11</div><div class='add'>+#define KEY_CONTEXT_OPAD_PRESENT_V(x)   ((x) &lt;&lt; KEY_CONTEXT_OPAD_PRESENT_S)</div><div class='add'>+#define KEY_CONTEXT_OPAD_PRESENT_F      KEY_CONTEXT_OPAD_PRESENT_V(1U)</div><div class='add'>+</div><div class='add'>+#define FILL_KEY_CTX_HDR(ck_size, mk_size, ctx_len) \</div><div class='add'>+		htonl(KEY_CONTEXT_MK_SIZE_V(mk_size) | \</div><div class='add'>+		      KEY_CONTEXT_CK_SIZE_V(ck_size) | \</div><div class='add'>+		      KEY_CONTEXT_VALID_F | \</div><div class='add'>+		      KEY_CONTEXT_SALT_PRESENT_F | \</div><div class='add'>+		      KEY_CONTEXT_CTX_LEN_V((ctx_len)))</div><div class='add'>+</div><div class='add'>+static inline void *chcr_copy_to_txd(const void *src, const struct sge_txq *q,</div><div class='add'>+				     void *pos, int length)</div><div class='add'>+{</div><div class='add'>+	int left = (void *)q-&gt;stat - pos;</div><div class='add'>+	u64 *p;</div><div class='add'>+</div><div class='add'>+	if (likely(length &lt;= left)) {</div><div class='add'>+		memcpy(pos, src, length);</div><div class='add'>+		pos += length;</div><div class='add'>+	} else {</div><div class='add'>+		memcpy(pos, src, left);</div><div class='add'>+		memcpy(q-&gt;desc, src + left, length - left);</div><div class='add'>+		pos = (void *)q-&gt;desc + (length - left);</div><div class='add'>+	}</div><div class='add'>+	/* 0-pad to multiple of 16 */</div><div class='add'>+	p = PTR_ALIGN(pos, 8);</div><div class='add'>+	if ((uintptr_t)p &amp; 8) {</div><div class='add'>+		*p = 0;</div><div class='add'>+		return p + 1;</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int chcr_txq_avail(const struct sge_txq *q)</div><div class='add'>+{</div><div class='add'>+	return q-&gt;size - 1 - q-&gt;in_use;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chcr_txq_advance(struct sge_txq *q, unsigned int n)</div><div class='add'>+{</div><div class='add'>+	q-&gt;in_use += n;</div><div class='add'>+	q-&gt;pidx += n;</div><div class='add'>+	if (q-&gt;pidx &gt;= q-&gt;size)</div><div class='add'>+		q-&gt;pidx -= q-&gt;size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chcr_eth_txq_stop(struct sge_eth_txq *q)</div><div class='add'>+{</div><div class='add'>+	netif_tx_stop_queue(q-&gt;txq);</div><div class='add'>+	q-&gt;q.stops++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int chcr_sgl_len(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	n--;</div><div class='add'>+	return (3 * n) / 2 + (n &amp; 1) + 2;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int chcr_flits_to_desc(unsigned int n)</div><div class='add'>+{</div><div class='add'>+	WARN_ON(n &gt; SGE_MAX_WR_LEN / 8);</div><div class='add'>+	return DIV_ROUND_UP(n, 8);</div><div class='add'>+}</div><div class='add'>+#endif /* __CHCR_COMMON_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c<br/>new file mode 100644<br/>index 000000000000..4e2096e49684<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c</a></div><div class='hunk'>@@ -0,0 +1,2271 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/* Copyright (C) 2020 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/highmem.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;linux/skbuff_ref.h&gt;</div><div class='add'>+#include "chcr_ktls.h"</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(uld_ctx_list);</div><div class='add'>+static DEFINE_MUTEX(dev_mutex);</div><div class='add'>+</div><div class='add'>+/* chcr_get_nfrags_to_send: get the remaining nfrags after start offset</div><div class='add'>+ * @skb: skb</div><div class='add'>+ * @start: start offset.</div><div class='add'>+ * @len: how much data to send after @start</div><div class='add'>+ */</div><div class='add'>+static int chcr_get_nfrags_to_send(struct sk_buff *skb, u32 start, u32 len)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *si = skb_shinfo(skb);</div><div class='add'>+	u32 frag_size, skb_linear_data_len = skb_headlen(skb);</div><div class='add'>+	u8 nfrags = 0, frag_idx = 0;</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+</div><div class='add'>+	/* if its a linear skb then return 1 */</div><div class='add'>+	if (!skb_is_nonlinear(skb))</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	if (unlikely(start &lt; skb_linear_data_len)) {</div><div class='add'>+		frag_size = min(len, skb_linear_data_len - start);</div><div class='add'>+	} else {</div><div class='add'>+		start -= skb_linear_data_len;</div><div class='add'>+</div><div class='add'>+		frag = &amp;si-&gt;frags[frag_idx];</div><div class='add'>+		frag_size = skb_frag_size(frag);</div><div class='add'>+		while (start &gt;= frag_size) {</div><div class='add'>+			start -= frag_size;</div><div class='add'>+			frag_idx++;</div><div class='add'>+			frag = &amp;si-&gt;frags[frag_idx];</div><div class='add'>+			frag_size = skb_frag_size(frag);</div><div class='add'>+		}</div><div class='add'>+		frag_size = min(len, skb_frag_size(frag) - start);</div><div class='add'>+	}</div><div class='add'>+	len -= frag_size;</div><div class='add'>+	nfrags++;</div><div class='add'>+</div><div class='add'>+	while (len) {</div><div class='add'>+		frag_size = min(len, skb_frag_size(&amp;si-&gt;frags[frag_idx]));</div><div class='add'>+		len -= frag_size;</div><div class='add'>+		nfrags++;</div><div class='add'>+		frag_idx++;</div><div class='add'>+	}</div><div class='add'>+	return nfrags;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_init_tcb_fields(struct chcr_ktls_info *tx_info);</div><div class='add'>+static void clear_conn_resources(struct chcr_ktls_info *tx_info);</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_save_keys: calculate and save crypto keys.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @crypto_info - tls crypto information.</div><div class='add'>+ * @direction - TX/RX direction.</div><div class='add'>+ * return - SUCCESS/FAILURE.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_save_keys(struct chcr_ktls_info *tx_info,</div><div class='add'>+			       struct tls_crypto_info *crypto_info,</div><div class='add'>+			       enum tls_offload_ctx_dir direction)</div><div class='add'>+{</div><div class='add'>+	int ck_size, key_ctx_size, mac_key_size, keylen, ghash_size, ret;</div><div class='add'>+	unsigned char ghash_h[TLS_CIPHER_AES_GCM_256_TAG_SIZE];</div><div class='add'>+	struct tls12_crypto_info_aes_gcm_128 *info_128_gcm;</div><div class='add'>+	struct ktls_key_ctx *kctx = &amp;tx_info-&gt;key_ctx;</div><div class='add'>+	struct crypto_aes_ctx aes_ctx;</div><div class='add'>+	unsigned char *key, *salt;</div><div class='add'>+</div><div class='add'>+	switch (crypto_info-&gt;cipher_type) {</div><div class='add'>+	case TLS_CIPHER_AES_GCM_128:</div><div class='add'>+		info_128_gcm =</div><div class='add'>+			(struct tls12_crypto_info_aes_gcm_128 *)crypto_info;</div><div class='add'>+		keylen = TLS_CIPHER_AES_GCM_128_KEY_SIZE;</div><div class='add'>+		ck_size = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+		tx_info-&gt;salt_size = TLS_CIPHER_AES_GCM_128_SALT_SIZE;</div><div class='add'>+		mac_key_size = CHCR_KEYCTX_MAC_KEY_SIZE_128;</div><div class='add'>+		tx_info-&gt;iv_size = TLS_CIPHER_AES_GCM_128_IV_SIZE;</div><div class='add'>+		tx_info-&gt;iv = be64_to_cpu(*(__be64 *)info_128_gcm-&gt;iv);</div><div class='add'>+</div><div class='add'>+		ghash_size = TLS_CIPHER_AES_GCM_128_TAG_SIZE;</div><div class='add'>+		key = info_128_gcm-&gt;key;</div><div class='add'>+		salt = info_128_gcm-&gt;salt;</div><div class='add'>+		tx_info-&gt;record_no = *(u64 *)info_128_gcm-&gt;rec_seq;</div><div class='add'>+</div><div class='add'>+		/* The SCMD fields used when encrypting a full TLS</div><div class='add'>+		 * record. Its a one time calculation till the</div><div class='add'>+		 * connection exists.</div><div class='add'>+		 */</div><div class='add'>+		tx_info-&gt;scmd0_seqno_numivs =</div><div class='add'>+			SCMD_SEQ_NO_CTRL_V(CHCR_SCMD_SEQ_NO_CTRL_64BIT) |</div><div class='add'>+			SCMD_CIPH_AUTH_SEQ_CTRL_F |</div><div class='add'>+			SCMD_PROTO_VERSION_V(CHCR_SCMD_PROTO_VERSION_TLS) |</div><div class='add'>+			SCMD_CIPH_MODE_V(CHCR_SCMD_CIPHER_MODE_AES_GCM) |</div><div class='add'>+			SCMD_AUTH_MODE_V(CHCR_SCMD_AUTH_MODE_GHASH) |</div><div class='add'>+			SCMD_IV_SIZE_V(TLS_CIPHER_AES_GCM_128_IV_SIZE &gt;&gt; 1) |</div><div class='add'>+			SCMD_NUM_IVS_V(1);</div><div class='add'>+</div><div class='add'>+		/* keys will be sent inline. */</div><div class='add'>+		tx_info-&gt;scmd0_ivgen_hdrlen = SCMD_KEY_CTX_INLINE_F;</div><div class='add'>+</div><div class='add'>+		/* The SCMD fields used when encrypting a partial TLS</div><div class='add'>+		 * record (no trailer and possibly a truncated payload).</div><div class='add'>+		 */</div><div class='add'>+		tx_info-&gt;scmd0_short_seqno_numivs =</div><div class='add'>+			SCMD_CIPH_AUTH_SEQ_CTRL_F |</div><div class='add'>+			SCMD_PROTO_VERSION_V(CHCR_SCMD_PROTO_VERSION_GENERIC) |</div><div class='add'>+			SCMD_CIPH_MODE_V(CHCR_SCMD_CIPHER_MODE_AES_CTR) |</div><div class='add'>+			SCMD_IV_SIZE_V(AES_BLOCK_LEN &gt;&gt; 1);</div><div class='add'>+</div><div class='add'>+		tx_info-&gt;scmd0_short_ivgen_hdrlen =</div><div class='add'>+			tx_info-&gt;scmd0_ivgen_hdrlen | SCMD_AADIVDROP_F;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+</div><div class='add'>+	default:</div><div class='add'>+		pr_err("GCM: cipher type 0x%x not supported\n",</div><div class='add'>+		       crypto_info-&gt;cipher_type);</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key_ctx_size = CHCR_KTLS_KEY_CTX_LEN +</div><div class='add'>+		       roundup(keylen, 16) + ghash_size;</div><div class='add'>+	/* Calculate the H = CIPH(K, 0 repeated 16 times).</div><div class='add'>+	 * It will go in key context</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	ret = aes_expandkey(&amp;aes_ctx, key, keylen);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	memset(ghash_h, 0, ghash_size);</div><div class='add'>+	aes_encrypt(&amp;aes_ctx, ghash_h, ghash_h);</div><div class='add'>+	memzero_explicit(&amp;aes_ctx, sizeof(aes_ctx));</div><div class='add'>+</div><div class='add'>+	/* fill the Key context */</div><div class='add'>+	if (direction == TLS_OFFLOAD_CTX_DIR_TX) {</div><div class='add'>+		kctx-&gt;ctx_hdr = FILL_KEY_CTX_HDR(ck_size,</div><div class='add'>+						 mac_key_size,</div><div class='add'>+						 key_ctx_size &gt;&gt; 4);</div><div class='add'>+	} else {</div><div class='add'>+		ret = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(kctx-&gt;salt, salt, tx_info-&gt;salt_size);</div><div class='add'>+	memcpy(kctx-&gt;key, key, keylen);</div><div class='add'>+	memcpy(kctx-&gt;key + keylen, ghash_h, ghash_size);</div><div class='add'>+	tx_info-&gt;key_ctx_len = key_ctx_size;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_act_open_req: creates TCB entry for ipv4 connection.</div><div class='add'>+ * @sk - tcp socket.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @atid - connection active tid.</div><div class='add'>+ * return - send success/failure.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_act_open_req(struct sock *sk,</div><div class='add'>+				  struct chcr_ktls_info *tx_info,</div><div class='add'>+				  int atid)</div><div class='add'>+{</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct cpl_t6_act_open_req *cpl6;</div><div class='add'>+	struct cpl_act_open_req *cpl;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int qid_atid;</div><div class='add'>+	u64 options;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cpl6);</div><div class='add'>+	skb = alloc_skb(len, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* mark it a control pkt */</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_CONTROL, tx_info-&gt;port_id);</div><div class='add'>+</div><div class='add'>+	cpl6 = __skb_put_zero(skb, len);</div><div class='add'>+	cpl = (struct cpl_act_open_req *)cpl6;</div><div class='add'>+	INIT_TP_WR(cpl6, 0);</div><div class='add'>+	qid_atid = TID_QID_V(tx_info-&gt;rx_qid) |</div><div class='add'>+		   TID_TID_V(atid);</div><div class='add'>+	OPCODE_TID(cpl) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, qid_atid));</div><div class='add'>+	cpl-&gt;local_port = inet-&gt;inet_sport;</div><div class='add'>+	cpl-&gt;peer_port = inet-&gt;inet_dport;</div><div class='add'>+	cpl-&gt;local_ip = inet-&gt;inet_rcv_saddr;</div><div class='add'>+	cpl-&gt;peer_ip = inet-&gt;inet_daddr;</div><div class='add'>+</div><div class='add'>+	/* fill first 64 bit option field. */</div><div class='add'>+	options = TCAM_BYPASS_F | ULP_MODE_V(ULP_MODE_NONE) | NON_OFFLOAD_F |</div><div class='add'>+		  SMAC_SEL_V(tx_info-&gt;smt_idx) | TX_CHAN_V(tx_info-&gt;tx_chan);</div><div class='add'>+	cpl-&gt;opt0 = cpu_to_be64(options);</div><div class='add'>+</div><div class='add'>+	/* next 64 bit option field. */</div><div class='add'>+	options =</div><div class='add'>+		TX_QUEUE_V(tx_info-&gt;adap-&gt;params.tp.tx_modq[tx_info-&gt;tx_chan]);</div><div class='add'>+	cpl-&gt;opt2 = htonl(options);</div><div class='add'>+</div><div class='add'>+	return cxgb4_l2t_send(tx_info-&gt;netdev, skb, tx_info-&gt;l2te);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_act_open_req6: creates TCB entry for ipv6 connection.</div><div class='add'>+ * @sk - tcp socket.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @atid - connection active tid.</div><div class='add'>+ * return - send success/failure.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_act_open_req6(struct sock *sk,</div><div class='add'>+				   struct chcr_ktls_info *tx_info,</div><div class='add'>+				   int atid)</div><div class='add'>+{</div><div class='add'>+	struct inet_sock *inet = inet_sk(sk);</div><div class='add'>+	struct cpl_t6_act_open_req6 *cpl6;</div><div class='add'>+	struct cpl_act_open_req6 *cpl;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int qid_atid;</div><div class='add'>+	u64 options;</div><div class='add'>+</div><div class='add'>+	len = sizeof(*cpl6);</div><div class='add'>+	skb = alloc_skb(len, GFP_KERNEL);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	/* mark it a control pkt */</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_CONTROL, tx_info-&gt;port_id);</div><div class='add'>+</div><div class='add'>+	cpl6 = __skb_put_zero(skb, len);</div><div class='add'>+	cpl = (struct cpl_act_open_req6 *)cpl6;</div><div class='add'>+	INIT_TP_WR(cpl6, 0);</div><div class='add'>+	qid_atid = TID_QID_V(tx_info-&gt;rx_qid) | TID_TID_V(atid);</div><div class='add'>+	OPCODE_TID(cpl) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ6, qid_atid));</div><div class='add'>+	cpl-&gt;local_port = inet-&gt;inet_sport;</div><div class='add'>+	cpl-&gt;peer_port = inet-&gt;inet_dport;</div><div class='add'>+	cpl-&gt;local_ip_hi = *(__be64 *)&amp;sk-&gt;sk_v6_rcv_saddr.in6_u.u6_addr8[0];</div><div class='add'>+	cpl-&gt;local_ip_lo = *(__be64 *)&amp;sk-&gt;sk_v6_rcv_saddr.in6_u.u6_addr8[8];</div><div class='add'>+	cpl-&gt;peer_ip_hi = *(__be64 *)&amp;sk-&gt;sk_v6_daddr.in6_u.u6_addr8[0];</div><div class='add'>+	cpl-&gt;peer_ip_lo = *(__be64 *)&amp;sk-&gt;sk_v6_daddr.in6_u.u6_addr8[8];</div><div class='add'>+</div><div class='add'>+	/* first 64 bit option field. */</div><div class='add'>+	options = TCAM_BYPASS_F | ULP_MODE_V(ULP_MODE_NONE) | NON_OFFLOAD_F |</div><div class='add'>+		  SMAC_SEL_V(tx_info-&gt;smt_idx) | TX_CHAN_V(tx_info-&gt;tx_chan);</div><div class='add'>+	cpl-&gt;opt0 = cpu_to_be64(options);</div><div class='add'>+	/* next 64 bit option field. */</div><div class='add'>+	options =</div><div class='add'>+		TX_QUEUE_V(tx_info-&gt;adap-&gt;params.tp.tx_modq[tx_info-&gt;tx_chan]);</div><div class='add'>+	cpl-&gt;opt2 = htonl(options);</div><div class='add'>+</div><div class='add'>+	return cxgb4_l2t_send(tx_info-&gt;netdev, skb, tx_info-&gt;l2te);</div><div class='add'>+}</div><div class='add'>+#endif /* #if IS_ENABLED(CONFIG_IPV6) */</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_setup_connection:  create a TCB entry so that TP will form tcp packets.</div><div class='add'>+ * @sk - tcp socket.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * return: NET_TX_OK/NET_XMIT_DROP</div><div class='add'>+ */</div><div class='add'>+static int chcr_setup_connection(struct sock *sk,</div><div class='add'>+				 struct chcr_ktls_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	struct tid_info *t = &amp;tx_info-&gt;adap-&gt;tids;</div><div class='add'>+	int atid, ret = 0;</div><div class='add'>+</div><div class='add'>+	atid = cxgb4_alloc_atid(t, tx_info);</div><div class='add'>+	if (atid == -1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;atid = atid;</div><div class='add'>+</div><div class='add'>+	if (tx_info-&gt;ip_family == AF_INET) {</div><div class='add'>+		ret = chcr_ktls_act_open_req(sk, tx_info, atid);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		ret = cxgb4_clip_get(tx_info-&gt;netdev, (const u32 *)</div><div class='add'>+				     &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+				     1);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+		ret = chcr_ktls_act_open_req6(sk, tx_info, atid);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if return type is NET_XMIT_CN, msg will be sent but delayed, mark ret</div><div class='add'>+	 * success, if any other return type clear atid and return that failure.</div><div class='add'>+	 */</div><div class='add'>+	if (ret) {</div><div class='add'>+		if (ret == NET_XMIT_CN) {</div><div class='add'>+			ret = 0;</div><div class='add'>+		} else {</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+			/* clear clip entry */</div><div class='add'>+			if (tx_info-&gt;ip_family == AF_INET6)</div><div class='add'>+				cxgb4_clip_release(tx_info-&gt;netdev,</div><div class='add'>+						   (const u32 *)</div><div class='add'>+						   &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+						   1);</div><div class='add'>+#endif</div><div class='add'>+			cxgb4_free_atid(t, atid);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_set_tcb_field: update tcb fields.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @word - TCB word.</div><div class='add'>+ * @mask - TCB word related mask.</div><div class='add'>+ * @val - TCB word related value.</div><div class='add'>+ * @no_reply - set 1 if not looking for TP response.</div><div class='add'>+ */</div><div class='add'>+static int chcr_set_tcb_field(struct chcr_ktls_info *tx_info, u16 word,</div><div class='add'>+			      u64 mask, u64 val, int no_reply)</div><div class='add'>+{</div><div class='add'>+	struct cpl_set_tcb_field *req;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(sizeof(struct cpl_set_tcb_field), GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	req = (struct cpl_set_tcb_field *)__skb_put_zero(skb, sizeof(*req));</div><div class='add'>+	INIT_TP_WR_CPL(req, CPL_SET_TCB_FIELD, tx_info-&gt;tid);</div><div class='add'>+	req-&gt;reply_ctrl = htons(QUEUENO_V(tx_info-&gt;rx_qid) |</div><div class='add'>+				NO_REPLY_V(no_reply));</div><div class='add'>+	req-&gt;word_cookie = htons(TCB_WORD_V(word));</div><div class='add'>+	req-&gt;mask = cpu_to_be64(mask);</div><div class='add'>+	req-&gt;val = cpu_to_be64(val);</div><div class='add'>+</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_CONTROL, tx_info-&gt;port_id);</div><div class='add'>+	return cxgb4_ofld_send(tx_info-&gt;netdev, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_dev_del:  call back for tls_dev_del.</div><div class='add'>+ * Remove the tid and l2t entry and close the connection.</div><div class='add'>+ * it per connection basis.</div><div class='add'>+ * @netdev - net device.</div><div class='add'>+ * @tls_cts - tls context.</div><div class='add'>+ * @direction - TX/RX crypto direction</div><div class='add'>+ */</div><div class='add'>+static void chcr_ktls_dev_del(struct net_device *netdev,</div><div class='add'>+			      struct tls_context *tls_ctx,</div><div class='add'>+			      enum tls_offload_ctx_dir direction)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_info *tx_info = chcr_get_ktls_tx_info(tls_ctx);</div><div class='add'>+	struct ch_ktls_port_stats_debug *port_stats;</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx;</div><div class='add'>+</div><div class='add'>+	if (!tx_info)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	u_ctx = tx_info-&gt;adap-&gt;uld[CXGB4_ULD_KTLS].handle;</div><div class='add'>+	if (u_ctx &amp;&amp; u_ctx-&gt;detach)</div><div class='add'>+		return;</div><div class='add'>+	/* clear l2t entry */</div><div class='add'>+	if (tx_info-&gt;l2te)</div><div class='add'>+		cxgb4_l2t_release(tx_info-&gt;l2te);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	/* clear clip entry */</div><div class='add'>+	if (tx_info-&gt;ip_family == AF_INET6)</div><div class='add'>+		cxgb4_clip_release(netdev, (const u32 *)</div><div class='add'>+				   &amp;tx_info-&gt;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+				   1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* clear tid */</div><div class='add'>+	if (tx_info-&gt;tid != -1) {</div><div class='add'>+		cxgb4_remove_tid(&amp;tx_info-&gt;adap-&gt;tids, tx_info-&gt;tx_chan,</div><div class='add'>+				 tx_info-&gt;tid, tx_info-&gt;ip_family);</div><div class='add'>+</div><div class='add'>+		xa_erase(&amp;u_ctx-&gt;tid_list, tx_info-&gt;tid);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port_stats = &amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_port[tx_info-&gt;port_id];</div><div class='add'>+	atomic64_inc(&amp;port_stats-&gt;ktls_tx_connection_close);</div><div class='add'>+	kvfree(tx_info);</div><div class='add'>+	chcr_set_ktls_tx_info(tls_ctx, NULL);</div><div class='add'>+	/* release module refcount */</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_dev_add:  call back for tls_dev_add.</div><div class='add'>+ * Create a tcb entry for TP. Also add l2t entry for the connection. And</div><div class='add'>+ * generate keys &amp; save those keys locally.</div><div class='add'>+ * @netdev - net device.</div><div class='add'>+ * @tls_cts - tls context.</div><div class='add'>+ * @direction - TX/RX crypto direction</div><div class='add'>+ * return: SUCCESS/FAILURE.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_dev_add(struct net_device *netdev, struct sock *sk,</div><div class='add'>+			     enum tls_offload_ctx_dir direction,</div><div class='add'>+			     struct tls_crypto_info *crypto_info,</div><div class='add'>+			     u32 start_offload_tcp_sn)</div><div class='add'>+{</div><div class='add'>+	struct tls_context *tls_ctx = tls_get_ctx(sk);</div><div class='add'>+	struct ch_ktls_port_stats_debug *port_stats;</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx;</div><div class='add'>+	struct chcr_ktls_info *tx_info;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	struct neighbour *n;</div><div class='add'>+	u8 daaddr[16];</div><div class='add'>+	int ret = -1;</div><div class='add'>+</div><div class='add'>+	pi = netdev_priv(netdev);</div><div class='add'>+	adap = pi-&gt;adapter;</div><div class='add'>+	port_stats = &amp;adap-&gt;ch_ktls_stats.ktls_port[pi-&gt;port_id];</div><div class='add'>+	atomic64_inc(&amp;port_stats-&gt;ktls_tx_connection_open);</div><div class='add'>+	u_ctx = adap-&gt;uld[CXGB4_ULD_KTLS].handle;</div><div class='add'>+</div><div class='add'>+	if (direction == TLS_OFFLOAD_CTX_DIR_RX) {</div><div class='add'>+		pr_err("not expecting for RX direction\n");</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chcr_get_ktls_tx_info(tls_ctx))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (u_ctx &amp;&amp; u_ctx-&gt;detach)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tx_info = kvzalloc(sizeof(*tx_info), GFP_KERNEL);</div><div class='add'>+	if (!tx_info)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;sk = sk;</div><div class='add'>+	spin_lock_init(&amp;tx_info-&gt;lock);</div><div class='add'>+	/* initialize tid and atid to -1, 0 is a also a valid id. */</div><div class='add'>+	tx_info-&gt;tid = -1;</div><div class='add'>+	tx_info-&gt;atid = -1;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;adap = adap;</div><div class='add'>+	tx_info-&gt;netdev = netdev;</div><div class='add'>+	tx_info-&gt;first_qset = pi-&gt;first_qset;</div><div class='add'>+	tx_info-&gt;tx_chan = pi-&gt;tx_chan;</div><div class='add'>+	tx_info-&gt;smt_idx = pi-&gt;smt_idx;</div><div class='add'>+	tx_info-&gt;port_id = pi-&gt;port_id;</div><div class='add'>+	tx_info-&gt;prev_ack = 0;</div><div class='add'>+	tx_info-&gt;prev_win = 0;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;rx_qid = chcr_get_first_rx_qid(adap);</div><div class='add'>+	if (unlikely(tx_info-&gt;rx_qid &lt; 0))</div><div class='add'>+		goto free_tx_info;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;prev_seq = start_offload_tcp_sn;</div><div class='add'>+	tx_info-&gt;tcp_start_seq_number = start_offload_tcp_sn;</div><div class='add'>+</div><div class='add'>+	/* save crypto keys */</div><div class='add'>+	ret = chcr_ktls_save_keys(tx_info, crypto_info, direction);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		goto free_tx_info;</div><div class='add'>+</div><div class='add'>+	/* get peer ip */</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET) {</div><div class='add'>+		memcpy(daaddr, &amp;sk-&gt;sk_daddr, 4);</div><div class='add'>+		tx_info-&gt;ip_family = AF_INET;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		if (!ipv6_only_sock(sk) &amp;&amp;</div><div class='add'>+		    ipv6_addr_type(&amp;sk-&gt;sk_v6_daddr) == IPV6_ADDR_MAPPED) {</div><div class='add'>+			memcpy(daaddr, &amp;sk-&gt;sk_daddr, 4);</div><div class='add'>+			tx_info-&gt;ip_family = AF_INET;</div><div class='add'>+		} else {</div><div class='add'>+			memcpy(daaddr, sk-&gt;sk_v6_daddr.in6_u.u6_addr8, 16);</div><div class='add'>+			tx_info-&gt;ip_family = AF_INET6;</div><div class='add'>+		}</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* get the l2t index */</div><div class='add'>+	dst = sk_dst_get(sk);</div><div class='add'>+	if (!dst) {</div><div class='add'>+		pr_err("DST entry not found\n");</div><div class='add'>+		goto free_tx_info;</div><div class='add'>+	}</div><div class='add'>+	n = dst_neigh_lookup(dst, daaddr);</div><div class='add'>+	if (!n || !n-&gt;dev) {</div><div class='add'>+		pr_err("neighbour not found\n");</div><div class='add'>+		dst_release(dst);</div><div class='add'>+		goto free_tx_info;</div><div class='add'>+	}</div><div class='add'>+	tx_info-&gt;l2te  = cxgb4_l2t_get(adap-&gt;l2t, n, n-&gt;dev, 0);</div><div class='add'>+</div><div class='add'>+	neigh_release(n);</div><div class='add'>+	dst_release(dst);</div><div class='add'>+</div><div class='add'>+	if (!tx_info-&gt;l2te) {</div><div class='add'>+		pr_err("l2t entry not found\n");</div><div class='add'>+		goto free_tx_info;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Driver shouldn't be removed until any single connection exists */</div><div class='add'>+	if (!try_module_get(THIS_MODULE))</div><div class='add'>+		goto free_l2t;</div><div class='add'>+</div><div class='add'>+	init_completion(&amp;tx_info-&gt;completion);</div><div class='add'>+	/* create a filter and call cxgb4_l2t_send to send the packet out, which</div><div class='add'>+	 * will take care of updating l2t entry in hw if not already done.</div><div class='add'>+	 */</div><div class='add'>+	tx_info-&gt;open_state = CH_KTLS_OPEN_PENDING;</div><div class='add'>+</div><div class='add'>+	if (chcr_setup_connection(sk, tx_info))</div><div class='add'>+		goto put_module;</div><div class='add'>+</div><div class='add'>+	/* Wait for reply */</div><div class='add'>+	wait_for_completion_timeout(&amp;tx_info-&gt;completion, 30 * HZ);</div><div class='add'>+	spin_lock_bh(&amp;tx_info-&gt;lock);</div><div class='add'>+	if (tx_info-&gt;open_state) {</div><div class='add'>+		/* need to wait for hw response, can't free tx_info yet. */</div><div class='add'>+		if (tx_info-&gt;open_state == CH_KTLS_OPEN_PENDING)</div><div class='add'>+			tx_info-&gt;pending_close = true;</div><div class='add'>+		else</div><div class='add'>+			spin_unlock_bh(&amp;tx_info-&gt;lock);</div><div class='add'>+		/* if in pending close, free the lock after the cleanup */</div><div class='add'>+		goto put_module;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;tx_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	/* initialize tcb */</div><div class='add'>+	reinit_completion(&amp;tx_info-&gt;completion);</div><div class='add'>+	/* mark it pending for hw response */</div><div class='add'>+	tx_info-&gt;open_state = CH_KTLS_OPEN_PENDING;</div><div class='add'>+</div><div class='add'>+	if (chcr_init_tcb_fields(tx_info))</div><div class='add'>+		goto free_tid;</div><div class='add'>+</div><div class='add'>+	/* Wait for reply */</div><div class='add'>+	wait_for_completion_timeout(&amp;tx_info-&gt;completion, 30 * HZ);</div><div class='add'>+	spin_lock_bh(&amp;tx_info-&gt;lock);</div><div class='add'>+	if (tx_info-&gt;open_state) {</div><div class='add'>+		/* need to wait for hw response, can't free tx_info yet. */</div><div class='add'>+		tx_info-&gt;pending_close = true;</div><div class='add'>+		/* free the lock after cleanup */</div><div class='add'>+		goto free_tid;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;tx_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	if (!cxgb4_check_l2t_valid(tx_info-&gt;l2te))</div><div class='add'>+		goto free_tid;</div><div class='add'>+</div><div class='add'>+	atomic64_inc(&amp;port_stats-&gt;ktls_tx_ctx);</div><div class='add'>+	chcr_set_ktls_tx_info(tls_ctx, tx_info);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_tid:</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	/* clear clip entry */</div><div class='add'>+	if (tx_info-&gt;ip_family == AF_INET6)</div><div class='add'>+		cxgb4_clip_release(netdev, (const u32 *)</div><div class='add'>+				   &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+				   1);</div><div class='add'>+#endif</div><div class='add'>+	cxgb4_remove_tid(&amp;tx_info-&gt;adap-&gt;tids, tx_info-&gt;tx_chan,</div><div class='add'>+			 tx_info-&gt;tid, tx_info-&gt;ip_family);</div><div class='add'>+</div><div class='add'>+	xa_erase(&amp;u_ctx-&gt;tid_list, tx_info-&gt;tid);</div><div class='add'>+</div><div class='add'>+put_module:</div><div class='add'>+	/* release module refcount */</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+free_l2t:</div><div class='add'>+	cxgb4_l2t_release(tx_info-&gt;l2te);</div><div class='add'>+free_tx_info:</div><div class='add'>+	if (tx_info-&gt;pending_close)</div><div class='add'>+		spin_unlock_bh(&amp;tx_info-&gt;lock);</div><div class='add'>+	else</div><div class='add'>+		kvfree(tx_info);</div><div class='add'>+out:</div><div class='add'>+	atomic64_inc(&amp;port_stats-&gt;ktls_tx_connection_fail);</div><div class='add'>+	return -1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_init_tcb_fields:  Initialize tcb fields to handle TCP seq number</div><div class='add'>+ *			  handling.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * return: NET_TX_OK/NET_XMIT_DROP</div><div class='add'>+ */</div><div class='add'>+static int chcr_init_tcb_fields(struct chcr_ktls_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	int  ret = 0;</div><div class='add'>+</div><div class='add'>+	/* set tcb in offload and bypass */</div><div class='add'>+	ret =</div><div class='add'>+	chcr_set_tcb_field(tx_info, TCB_T_FLAGS_W,</div><div class='add'>+			   TCB_T_FLAGS_V(TF_CORE_BYPASS_F | TF_NON_OFFLOAD_F),</div><div class='add'>+			   TCB_T_FLAGS_V(TF_CORE_BYPASS_F), 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	/* reset snd_una and snd_next fields in tcb */</div><div class='add'>+	ret = chcr_set_tcb_field(tx_info, TCB_SND_UNA_RAW_W,</div><div class='add'>+				 TCB_SND_NXT_RAW_V(TCB_SND_NXT_RAW_M) |</div><div class='add'>+				 TCB_SND_UNA_RAW_V(TCB_SND_UNA_RAW_M),</div><div class='add'>+				 0, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* reset send max */</div><div class='add'>+	ret = chcr_set_tcb_field(tx_info, TCB_SND_MAX_RAW_W,</div><div class='add'>+				 TCB_SND_MAX_RAW_V(TCB_SND_MAX_RAW_M),</div><div class='add'>+				 0, 1);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* update l2t index and request for tp reply to confirm tcb is</div><div class='add'>+	 * initialised to handle tx traffic.</div><div class='add'>+	 */</div><div class='add'>+	ret = chcr_set_tcb_field(tx_info, TCB_L2T_IX_W,</div><div class='add'>+				 TCB_L2T_IX_V(TCB_L2T_IX_M),</div><div class='add'>+				 TCB_L2T_IX_V(tx_info-&gt;l2te-&gt;idx), 0);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_cpl_act_open_rpl: connection reply received from TP.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_cpl_act_open_rpl(struct adapter *adap,</div><div class='add'>+				      unsigned char *input)</div><div class='add'>+{</div><div class='add'>+	const struct cpl_act_open_rpl *p = (void *)input;</div><div class='add'>+	struct chcr_ktls_info *tx_info = NULL;</div><div class='add'>+	struct tls_offload_context_tx *tx_ctx;</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx;</div><div class='add'>+	unsigned int atid, tid, status;</div><div class='add'>+	struct tls_context *tls_ctx;</div><div class='add'>+	struct tid_info *t;</div><div class='add'>+	int ret = 0;</div><div class='add'>+</div><div class='add'>+	tid = GET_TID(p);</div><div class='add'>+	status = AOPEN_STATUS_G(ntohl(p-&gt;atid_status));</div><div class='add'>+	atid = TID_TID_G(AOPEN_ATID_G(ntohl(p-&gt;atid_status)));</div><div class='add'>+</div><div class='add'>+	t = &amp;adap-&gt;tids;</div><div class='add'>+	tx_info = lookup_atid(t, atid);</div><div class='add'>+</div><div class='add'>+	if (!tx_info || tx_info-&gt;atid != atid) {</div><div class='add'>+		pr_err("%s: incorrect tx_info or atid\n", __func__);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cxgb4_free_atid(t, atid);</div><div class='add'>+	tx_info-&gt;atid = -1;</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tx_info-&gt;lock);</div><div class='add'>+	/* HW response is very close, finish pending cleanup */</div><div class='add'>+	if (tx_info-&gt;pending_close) {</div><div class='add'>+		spin_unlock(&amp;tx_info-&gt;lock);</div><div class='add'>+		if (!status) {</div><div class='add'>+			cxgb4_remove_tid(&amp;tx_info-&gt;adap-&gt;tids, tx_info-&gt;tx_chan,</div><div class='add'>+					 tid, tx_info-&gt;ip_family);</div><div class='add'>+		}</div><div class='add'>+		kvfree(tx_info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!status) {</div><div class='add'>+		tx_info-&gt;tid = tid;</div><div class='add'>+		cxgb4_insert_tid(t, tx_info, tx_info-&gt;tid, tx_info-&gt;ip_family);</div><div class='add'>+		/* Adding tid */</div><div class='add'>+		tls_ctx = tls_get_ctx(tx_info-&gt;sk);</div><div class='add'>+		tx_ctx = tls_offload_ctx_tx(tls_ctx);</div><div class='add'>+		u_ctx = adap-&gt;uld[CXGB4_ULD_KTLS].handle;</div><div class='add'>+		if (u_ctx) {</div><div class='add'>+			ret = xa_insert_bh(&amp;u_ctx-&gt;tid_list, tid, tx_ctx,</div><div class='add'>+					   GFP_NOWAIT);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				pr_err("%s: Failed to allocate tid XA entry = %d\n",</div><div class='add'>+				       __func__, tx_info-&gt;tid);</div><div class='add'>+				tx_info-&gt;open_state = CH_KTLS_OPEN_FAILURE;</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		tx_info-&gt;open_state = CH_KTLS_OPEN_SUCCESS;</div><div class='add'>+	} else {</div><div class='add'>+		tx_info-&gt;open_state = CH_KTLS_OPEN_FAILURE;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	spin_unlock(&amp;tx_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	complete(&amp;tx_info-&gt;completion);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_cpl_set_tcb_rpl: TCB reply received from TP.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_cpl_set_tcb_rpl(struct adapter *adap, unsigned char *input)</div><div class='add'>+{</div><div class='add'>+	const struct cpl_set_tcb_rpl *p = (void *)input;</div><div class='add'>+	struct chcr_ktls_info *tx_info = NULL;</div><div class='add'>+	struct tid_info *t;</div><div class='add'>+	u32 tid;</div><div class='add'>+</div><div class='add'>+	tid = GET_TID(p);</div><div class='add'>+</div><div class='add'>+	t = &amp;adap-&gt;tids;</div><div class='add'>+	tx_info = lookup_tid(t, tid);</div><div class='add'>+</div><div class='add'>+	if (!tx_info || tx_info-&gt;tid != tid) {</div><div class='add'>+		pr_err("%s: incorrect tx_info or tid\n", __func__);</div><div class='add'>+		return -1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;tx_info-&gt;lock);</div><div class='add'>+	if (tx_info-&gt;pending_close) {</div><div class='add'>+		spin_unlock(&amp;tx_info-&gt;lock);</div><div class='add'>+		kvfree(tx_info);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	tx_info-&gt;open_state = CH_KTLS_OPEN_SUCCESS;</div><div class='add'>+	spin_unlock(&amp;tx_info-&gt;lock);</div><div class='add'>+</div><div class='add'>+	complete(&amp;tx_info-&gt;completion);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *__chcr_write_cpl_set_tcb_ulp(struct chcr_ktls_info *tx_info,</div><div class='add'>+					u32 tid, void *pos, u16 word,</div><div class='add'>+					struct sge_eth_txq *q, u64 mask,</div><div class='add'>+					u64 val, u32 reply)</div><div class='add'>+{</div><div class='add'>+	struct cpl_set_tcb_field_core *cpl;</div><div class='add'>+	struct ulptx_idata *idata;</div><div class='add'>+	struct ulp_txpkt *txpkt;</div><div class='add'>+</div><div class='add'>+	/* ULP_TXPKT */</div><div class='add'>+	txpkt = pos;</div><div class='add'>+	txpkt-&gt;cmd_dest = htonl(ULPTX_CMD_V(ULP_TX_PKT) |</div><div class='add'>+				ULP_TXPKT_CHANNELID_V(tx_info-&gt;port_id) |</div><div class='add'>+				ULP_TXPKT_FID_V(q-&gt;q.cntxt_id) |</div><div class='add'>+				ULP_TXPKT_RO_F);</div><div class='add'>+	txpkt-&gt;len = htonl(DIV_ROUND_UP(CHCR_SET_TCB_FIELD_LEN, 16));</div><div class='add'>+</div><div class='add'>+	/* ULPTX_IDATA sub-command */</div><div class='add'>+	idata = (struct ulptx_idata *)(txpkt + 1);</div><div class='add'>+	idata-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_IMM));</div><div class='add'>+	idata-&gt;len = htonl(sizeof(*cpl));</div><div class='add'>+	pos = idata + 1;</div><div class='add'>+</div><div class='add'>+	cpl = pos;</div><div class='add'>+	/* CPL_SET_TCB_FIELD */</div><div class='add'>+	OPCODE_TID(cpl) = htonl(MK_OPCODE_TID(CPL_SET_TCB_FIELD, tid));</div><div class='add'>+	cpl-&gt;reply_ctrl = htons(QUEUENO_V(tx_info-&gt;rx_qid) |</div><div class='add'>+			NO_REPLY_V(!reply));</div><div class='add'>+	cpl-&gt;word_cookie = htons(TCB_WORD_V(word));</div><div class='add'>+	cpl-&gt;mask = cpu_to_be64(mask);</div><div class='add'>+	cpl-&gt;val = cpu_to_be64(val);</div><div class='add'>+</div><div class='add'>+	/* ULPTX_NOOP */</div><div class='add'>+	idata = (struct ulptx_idata *)(cpl + 1);</div><div class='add'>+	idata-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_NOOP));</div><div class='add'>+	idata-&gt;len = htonl(0);</div><div class='add'>+	pos = idata + 1;</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_write_cpl_set_tcb_ulp: update tcb values.</div><div class='add'>+ * TCB is responsible to create tcp headers, so all the related values</div><div class='add'>+ * should be correctly updated.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @q - tx queue on which packet is going out.</div><div class='add'>+ * @tid - TCB identifier.</div><div class='add'>+ * @pos - current index where should we start writing.</div><div class='add'>+ * @word - TCB word.</div><div class='add'>+ * @mask - TCB word related mask.</div><div class='add'>+ * @val - TCB word related value.</div><div class='add'>+ * @reply - set 1 if looking for TP response.</div><div class='add'>+ * return - next position to write.</div><div class='add'>+ */</div><div class='add'>+static void *chcr_write_cpl_set_tcb_ulp(struct chcr_ktls_info *tx_info,</div><div class='add'>+					struct sge_eth_txq *q, u32 tid,</div><div class='add'>+					void *pos, u16 word, u64 mask,</div><div class='add'>+					u64 val, u32 reply)</div><div class='add'>+{</div><div class='add'>+	int left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+</div><div class='add'>+	if (unlikely(left &lt; CHCR_SET_TCB_FIELD_LEN)) {</div><div class='add'>+		if (!left) {</div><div class='add'>+			pos = q-&gt;q.desc;</div><div class='add'>+		} else {</div><div class='add'>+			u8 buf[48] = {0};</div><div class='add'>+</div><div class='add'>+			__chcr_write_cpl_set_tcb_ulp(tx_info, tid, buf, word, q,</div><div class='add'>+						     mask, val, reply);</div><div class='add'>+</div><div class='add'>+			return chcr_copy_to_txd(buf, &amp;q-&gt;q, pos,</div><div class='add'>+						CHCR_SET_TCB_FIELD_LEN);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = __chcr_write_cpl_set_tcb_ulp(tx_info, tid, pos, word, q,</div><div class='add'>+					   mask, val, reply);</div><div class='add'>+</div><div class='add'>+	/* check again if we are at the end of the queue */</div><div class='add'>+	if (left == CHCR_SET_TCB_FIELD_LEN)</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+</div><div class='add'>+	return pos;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_xmit_tcb_cpls: update tcb entry so that TP will create the header</div><div class='add'>+ * with updated values like tcp seq, ack, window etc.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @tcp_seq</div><div class='add'>+ * @tcp_ack</div><div class='add'>+ * @tcp_win</div><div class='add'>+ * return: NETDEV_TX_BUSY/NET_TX_OK.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_xmit_tcb_cpls(struct chcr_ktls_info *tx_info,</div><div class='add'>+				   struct sge_eth_txq *q, u64 tcp_seq,</div><div class='add'>+				   u64 tcp_ack, u64 tcp_win, bool offset)</div><div class='add'>+{</div><div class='add'>+	bool first_wr = ((tx_info-&gt;prev_ack == 0) &amp;&amp; (tx_info-&gt;prev_win == 0));</div><div class='add'>+	struct ch_ktls_port_stats_debug *port_stats;</div><div class='add'>+	u32 len, cpl = 0, ndesc, wr_len, wr_mid = 0;</div><div class='add'>+	struct fw_ulptx_wr *wr;</div><div class='add'>+	int credits;</div><div class='add'>+	void *pos;</div><div class='add'>+</div><div class='add'>+	wr_len = sizeof(*wr);</div><div class='add'>+	/* there can be max 4 cpls, check if we have enough credits */</div><div class='add'>+	len = wr_len + 4 * roundup(CHCR_SET_TCB_FIELD_LEN, 16);</div><div class='add'>+	ndesc = DIV_ROUND_UP(len, 64);</div><div class='add'>+</div><div class='add'>+	credits = chcr_txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = &amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	/* make space for WR, we'll fill it later when we know all the cpls</div><div class='add'>+	 * being sent out and have complete length.</div><div class='add'>+	 */</div><div class='add'>+	wr = pos;</div><div class='add'>+	pos += wr_len;</div><div class='add'>+	/* update tx_max if its a re-transmit or the first wr */</div><div class='add'>+	if (first_wr || tcp_seq != tx_info-&gt;prev_seq) {</div><div class='add'>+		pos = chcr_write_cpl_set_tcb_ulp(tx_info, q, tx_info-&gt;tid, pos,</div><div class='add'>+						 TCB_TX_MAX_W,</div><div class='add'>+						 TCB_TX_MAX_V(TCB_TX_MAX_M),</div><div class='add'>+						 TCB_TX_MAX_V(tcp_seq), 0);</div><div class='add'>+		cpl++;</div><div class='add'>+	}</div><div class='add'>+	/* reset snd una if it's a re-transmit pkt */</div><div class='add'>+	if (tcp_seq != tx_info-&gt;prev_seq || offset) {</div><div class='add'>+		/* reset snd_una */</div><div class='add'>+		port_stats =</div><div class='add'>+			&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_port[tx_info-&gt;port_id];</div><div class='add'>+		pos = chcr_write_cpl_set_tcb_ulp(tx_info, q, tx_info-&gt;tid, pos,</div><div class='add'>+						 TCB_SND_UNA_RAW_W,</div><div class='add'>+						 TCB_SND_UNA_RAW_V</div><div class='add'>+						 (TCB_SND_UNA_RAW_M),</div><div class='add'>+						 TCB_SND_UNA_RAW_V(0), 0);</div><div class='add'>+		if (tcp_seq != tx_info-&gt;prev_seq)</div><div class='add'>+			atomic64_inc(&amp;port_stats-&gt;ktls_tx_ooo);</div><div class='add'>+		cpl++;</div><div class='add'>+	}</div><div class='add'>+	/* update ack */</div><div class='add'>+	if (first_wr || tx_info-&gt;prev_ack != tcp_ack) {</div><div class='add'>+		pos = chcr_write_cpl_set_tcb_ulp(tx_info, q, tx_info-&gt;tid, pos,</div><div class='add'>+						 TCB_RCV_NXT_W,</div><div class='add'>+						 TCB_RCV_NXT_V(TCB_RCV_NXT_M),</div><div class='add'>+						 TCB_RCV_NXT_V(tcp_ack), 0);</div><div class='add'>+		tx_info-&gt;prev_ack = tcp_ack;</div><div class='add'>+		cpl++;</div><div class='add'>+	}</div><div class='add'>+	/* update receive window */</div><div class='add'>+	if (first_wr || tx_info-&gt;prev_win != tcp_win) {</div><div class='add'>+		chcr_write_cpl_set_tcb_ulp(tx_info, q, tx_info-&gt;tid, pos,</div><div class='add'>+					   TCB_RCV_WND_W,</div><div class='add'>+					   TCB_RCV_WND_V(TCB_RCV_WND_M),</div><div class='add'>+					   TCB_RCV_WND_V(tcp_win), 0);</div><div class='add'>+		tx_info-&gt;prev_win = tcp_win;</div><div class='add'>+		cpl++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (cpl) {</div><div class='add'>+		/* get the actual length */</div><div class='add'>+		len = wr_len + cpl * roundup(CHCR_SET_TCB_FIELD_LEN, 16);</div><div class='add'>+		/* ULPTX wr */</div><div class='add'>+		wr-&gt;op_to_compl = htonl(FW_WR_OP_V(FW_ULPTX_WR));</div><div class='add'>+		wr-&gt;cookie = 0;</div><div class='add'>+		/* fill len in wr field */</div><div class='add'>+		wr-&gt;flowid_len16 = htonl(wr_mid |</div><div class='add'>+					 FW_WR_LEN16_V(DIV_ROUND_UP(len, 16)));</div><div class='add'>+</div><div class='add'>+		ndesc = DIV_ROUND_UP(len, 64);</div><div class='add'>+		chcr_txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+		cxgb4_ring_tx_db(tx_info-&gt;adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_get_tx_flits</div><div class='add'>+ * returns number of flits to be sent out, it includes key context length, WR</div><div class='add'>+ * size and skb fragments.</div><div class='add'>+ */</div><div class='add'>+static unsigned int</div><div class='add'>+chcr_ktls_get_tx_flits(u32 nr_frags, unsigned int key_ctx_len)</div><div class='add'>+{</div><div class='add'>+	return chcr_sgl_len(nr_frags) +</div><div class='add'>+	       DIV_ROUND_UP(key_ctx_len + CHCR_KTLS_WR_SIZE, 8);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_check_tcp_options: To check if there is any TCP option available</div><div class='add'>+ * other than timestamp.</div><div class='add'>+ * @skb - skb contains partial record..</div><div class='add'>+ * return: 1 / 0</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+chcr_ktls_check_tcp_options(struct tcphdr *tcp)</div><div class='add'>+{</div><div class='add'>+	int cnt, opt, optlen;</div><div class='add'>+	u_char *cp;</div><div class='add'>+</div><div class='add'>+	cp = (u_char *)(tcp + 1);</div><div class='add'>+	cnt = (tcp-&gt;doff &lt;&lt; 2) - sizeof(struct tcphdr);</div><div class='add'>+	for (; cnt &gt; 0; cnt -= optlen, cp += optlen) {</div><div class='add'>+		opt = cp[0];</div><div class='add'>+		if (opt == TCPOPT_EOL)</div><div class='add'>+			break;</div><div class='add'>+		if (opt == TCPOPT_NOP) {</div><div class='add'>+			optlen = 1;</div><div class='add'>+		} else {</div><div class='add'>+			if (cnt &lt; 2)</div><div class='add'>+				break;</div><div class='add'>+			optlen = cp[1];</div><div class='add'>+			if (optlen &lt; 2 || optlen &gt; cnt)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+		switch (opt) {</div><div class='add'>+		case TCPOPT_NOP:</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_write_tcp_options : TP can't send out all the options, we need to</div><div class='add'>+ * send out separately.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @skb - skb contains partial record..</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @tx_chan - channel number.</div><div class='add'>+ * return: NETDEV_TX_OK/NETDEV_TX_BUSY.</div><div class='add'>+ */</div><div class='add'>+static int</div><div class='add'>+chcr_ktls_write_tcp_options(struct chcr_ktls_info *tx_info, struct sk_buff *skb,</div><div class='add'>+			    struct sge_eth_txq *q, uint32_t tx_chan)</div><div class='add'>+{</div><div class='add'>+	struct fw_eth_tx_pkt_wr *wr;</div><div class='add'>+	struct cpl_tx_pkt_core *cpl;</div><div class='add'>+	u32 ctrl, iplen, maclen;</div><div class='add'>+	struct ipv6hdr *ip6;</div><div class='add'>+	unsigned int ndesc;</div><div class='add'>+	struct tcphdr *tcp;</div><div class='add'>+	int len16, pktlen;</div><div class='add'>+	struct iphdr *ip;</div><div class='add'>+	u32 wr_mid = 0;</div><div class='add'>+	int credits;</div><div class='add'>+	u8 buf[150];</div><div class='add'>+	u64 cntrl1;</div><div class='add'>+	void *pos;</div><div class='add'>+</div><div class='add'>+	iplen = skb_network_header_len(skb);</div><div class='add'>+	maclen = skb_mac_header_len(skb);</div><div class='add'>+</div><div class='add'>+	/* packet length = eth hdr len + ip hdr len + tcp hdr len</div><div class='add'>+	 * (including options).</div><div class='add'>+	 */</div><div class='add'>+	pktlen = skb_tcp_all_headers(skb);</div><div class='add'>+</div><div class='add'>+	ctrl = sizeof(*cpl) + pktlen;</div><div class='add'>+	len16 = DIV_ROUND_UP(sizeof(*wr) + ctrl, 16);</div><div class='add'>+	/* check how many descriptors needed */</div><div class='add'>+	ndesc = DIV_ROUND_UP(len16, 4);</div><div class='add'>+</div><div class='add'>+	credits = chcr_txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = &amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	wr = pos;</div><div class='add'>+</div><div class='add'>+	/* Firmware work request header */</div><div class='add'>+	wr-&gt;op_immdlen = htonl(FW_WR_OP_V(FW_ETH_TX_PKT_WR) |</div><div class='add'>+			       FW_WR_IMMDLEN_V(ctrl));</div><div class='add'>+</div><div class='add'>+	wr-&gt;equiq_to_len16 = htonl(wr_mid | FW_WR_LEN16_V(len16));</div><div class='add'>+	wr-&gt;r3 = 0;</div><div class='add'>+</div><div class='add'>+	cpl = (void *)(wr + 1);</div><div class='add'>+</div><div class='add'>+	/* CPL header */</div><div class='add'>+	cpl-&gt;ctrl0 = htonl(TXPKT_OPCODE_V(CPL_TX_PKT) | TXPKT_INTF_V(tx_chan) |</div><div class='add'>+			   TXPKT_PF_V(tx_info-&gt;adap-&gt;pf));</div><div class='add'>+	cpl-&gt;pack = 0;</div><div class='add'>+	cpl-&gt;len = htons(pktlen);</div><div class='add'>+</div><div class='add'>+	memcpy(buf, skb-&gt;data, pktlen);</div><div class='add'>+	if (!IS_ENABLED(CONFIG_IPV6) || tx_info-&gt;ip_family == AF_INET) {</div><div class='add'>+		/* we need to correct ip header len */</div><div class='add'>+		ip = (struct iphdr *)(buf + maclen);</div><div class='add'>+		ip-&gt;tot_len = htons(pktlen - maclen);</div><div class='add'>+		cntrl1 = TXPKT_CSUM_TYPE_V(TX_CSUM_TCPIP);</div><div class='add'>+	} else {</div><div class='add'>+		ip6 = (struct ipv6hdr *)(buf + maclen);</div><div class='add'>+		ip6-&gt;payload_len = htons(pktlen - maclen - iplen);</div><div class='add'>+		cntrl1 = TXPKT_CSUM_TYPE_V(TX_CSUM_TCPIP6);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cntrl1 |= T6_TXPKT_ETHHDR_LEN_V(maclen - ETH_HLEN) |</div><div class='add'>+		  TXPKT_IPHDR_LEN_V(iplen);</div><div class='add'>+	/* checksum offload */</div><div class='add'>+	cpl-&gt;ctrl1 = cpu_to_be64(cntrl1);</div><div class='add'>+</div><div class='add'>+	pos = cpl + 1;</div><div class='add'>+</div><div class='add'>+	/* now take care of the tcp header, if fin is not set then clear push</div><div class='add'>+	 * bit as well, and if fin is set, it will be sent at the last so we</div><div class='add'>+	 * need to update the tcp sequence number as per the last packet.</div><div class='add'>+	 */</div><div class='add'>+	tcp = (struct tcphdr *)(buf + maclen + iplen);</div><div class='add'>+</div><div class='add'>+	if (!tcp-&gt;fin)</div><div class='add'>+		tcp-&gt;psh = 0;</div><div class='add'>+	else</div><div class='add'>+		tcp-&gt;seq = htonl(tx_info-&gt;prev_seq);</div><div class='add'>+</div><div class='add'>+	chcr_copy_to_txd(buf, &amp;q-&gt;q, pos, pktlen);</div><div class='add'>+</div><div class='add'>+	chcr_txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+	cxgb4_ring_tx_db(tx_info-&gt;adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_xmit_wr_complete: This sends out the complete record. If an skb</div><div class='add'>+ * received has partial end part of the record, send out the complete record, so</div><div class='add'>+ * that crypto block will be able to generate TAG/HASH.</div><div class='add'>+ * @skb - segment which has complete or partial end part.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @tcp_seq</div><div class='add'>+ * @tcp_push - tcp push bit.</div><div class='add'>+ * @mss - segment size.</div><div class='add'>+ * return: NETDEV_TX_BUSY/NET_TX_OK.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_xmit_wr_complete(struct sk_buff *skb,</div><div class='add'>+				      struct chcr_ktls_info *tx_info,</div><div class='add'>+				      struct sge_eth_txq *q, u32 tcp_seq,</div><div class='add'>+				      bool is_last_wr, u32 data_len,</div><div class='add'>+				      u32 skb_offset, u32 nfrags,</div><div class='add'>+				      bool tcp_push, u32 mss)</div><div class='add'>+{</div><div class='add'>+	u32 len16, wr_mid = 0, flits = 0, ndesc, cipher_start;</div><div class='add'>+	struct adapter *adap = tx_info-&gt;adap;</div><div class='add'>+	int credits, left, last_desc;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='add'>+	struct cpl_tx_data *tx_data;</div><div class='add'>+	struct cpl_tx_sec_pdu *cpl;</div><div class='add'>+	struct ulptx_idata *idata;</div><div class='add'>+	struct ulp_txpkt *ulptx;</div><div class='add'>+	struct fw_ulptx_wr *wr;</div><div class='add'>+	void *pos;</div><div class='add'>+	u64 *end;</div><div class='add'>+</div><div class='add'>+	/* get the number of flits required */</div><div class='add'>+	flits = chcr_ktls_get_tx_flits(nfrags, tx_info-&gt;key_ctx_len);</div><div class='add'>+	/* number of descriptors */</div><div class='add'>+	ndesc = chcr_flits_to_desc(flits);</div><div class='add'>+	/* check if enough credits available */</div><div class='add'>+	credits = chcr_txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		/* Credits are below the threshold values, stop the queue after</div><div class='add'>+		 * injecting the Work Request for this packet.</div><div class='add'>+		 */</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= q-&gt;q.size)</div><div class='add'>+		last_desc -= q-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;q-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='add'>+	if (unlikely(cxgb4_map_skb(adap-&gt;pdev_dev, skb, sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='add'>+		q-&gt;mapping_err++;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!is_last_wr)</div><div class='add'>+		skb_get(skb);</div><div class='add'>+</div><div class='add'>+	pos = &amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	end = (u64 *)pos + flits;</div><div class='add'>+	/* FW_ULPTX_WR */</div><div class='add'>+	wr = pos;</div><div class='add'>+	/* WR will need len16 */</div><div class='add'>+	len16 = DIV_ROUND_UP(flits, 2);</div><div class='add'>+	wr-&gt;op_to_compl = htonl(FW_WR_OP_V(FW_ULPTX_WR));</div><div class='add'>+	wr-&gt;flowid_len16 = htonl(wr_mid | FW_WR_LEN16_V(len16));</div><div class='add'>+	wr-&gt;cookie = 0;</div><div class='add'>+	pos += sizeof(*wr);</div><div class='add'>+	/* ULP_TXPKT */</div><div class='add'>+	ulptx = pos;</div><div class='add'>+	ulptx-&gt;cmd_dest = htonl(ULPTX_CMD_V(ULP_TX_PKT) |</div><div class='add'>+				ULP_TXPKT_CHANNELID_V(tx_info-&gt;port_id) |</div><div class='add'>+				ULP_TXPKT_FID_V(q-&gt;q.cntxt_id) |</div><div class='add'>+				ULP_TXPKT_RO_F);</div><div class='add'>+	ulptx-&gt;len = htonl(len16 - 1);</div><div class='add'>+	/* ULPTX_IDATA sub-command */</div><div class='add'>+	idata = (struct ulptx_idata *)(ulptx + 1);</div><div class='add'>+	idata-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_IMM) | ULP_TX_SC_MORE_F);</div><div class='add'>+	/* idata length will include cpl_tx_sec_pdu + key context size +</div><div class='add'>+	 * cpl_tx_data header.</div><div class='add'>+	 */</div><div class='add'>+	idata-&gt;len = htonl(sizeof(*cpl) + tx_info-&gt;key_ctx_len +</div><div class='add'>+			   sizeof(*tx_data));</div><div class='add'>+	/* SEC CPL */</div><div class='add'>+	cpl = (struct cpl_tx_sec_pdu *)(idata + 1);</div><div class='add'>+	cpl-&gt;op_ivinsrtofst =</div><div class='add'>+		htonl(CPL_TX_SEC_PDU_OPCODE_V(CPL_TX_SEC_PDU) |</div><div class='add'>+		      CPL_TX_SEC_PDU_CPLLEN_V(CHCR_CPL_TX_SEC_PDU_LEN_64BIT) |</div><div class='add'>+		      CPL_TX_SEC_PDU_PLACEHOLDER_V(1) |</div><div class='add'>+		      CPL_TX_SEC_PDU_IVINSRTOFST_V(TLS_HEADER_SIZE + 1));</div><div class='add'>+	cpl-&gt;pldlen = htonl(data_len);</div><div class='add'>+</div><div class='add'>+	/* encryption should start after tls header size + iv size */</div><div class='add'>+	cipher_start = TLS_HEADER_SIZE + tx_info-&gt;iv_size + 1;</div><div class='add'>+</div><div class='add'>+	cpl-&gt;aadstart_cipherstop_hi =</div><div class='add'>+		htonl(CPL_TX_SEC_PDU_AADSTART_V(1) |</div><div class='add'>+		      CPL_TX_SEC_PDU_AADSTOP_V(TLS_HEADER_SIZE) |</div><div class='add'>+		      CPL_TX_SEC_PDU_CIPHERSTART_V(cipher_start));</div><div class='add'>+</div><div class='add'>+	/* authentication will also start after tls header + iv size */</div><div class='add'>+	cpl-&gt;cipherstop_lo_authinsert =</div><div class='add'>+	htonl(CPL_TX_SEC_PDU_AUTHSTART_V(cipher_start) |</div><div class='add'>+	      CPL_TX_SEC_PDU_AUTHSTOP_V(TLS_CIPHER_AES_GCM_128_TAG_SIZE) |</div><div class='add'>+	      CPL_TX_SEC_PDU_AUTHINSERT_V(TLS_CIPHER_AES_GCM_128_TAG_SIZE));</div><div class='add'>+</div><div class='add'>+	/* These two flits are actually a CPL_TLS_TX_SCMD_FMT. */</div><div class='add'>+	cpl-&gt;seqno_numivs = htonl(tx_info-&gt;scmd0_seqno_numivs);</div><div class='add'>+	cpl-&gt;ivgen_hdrlen = htonl(tx_info-&gt;scmd0_ivgen_hdrlen);</div><div class='add'>+	cpl-&gt;scmd1 = cpu_to_be64(tx_info-&gt;record_no);</div><div class='add'>+</div><div class='add'>+	pos = cpl + 1;</div><div class='add'>+	/* check if space left to fill the keys */</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = chcr_copy_to_txd(&amp;tx_info-&gt;key_ctx, &amp;q-&gt;q, pos,</div><div class='add'>+			       tx_info-&gt;key_ctx_len);</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+	/* CPL_TX_DATA */</div><div class='add'>+	tx_data = (void *)pos;</div><div class='add'>+	OPCODE_TID(tx_data) = htonl(MK_OPCODE_TID(CPL_TX_DATA, tx_info-&gt;tid));</div><div class='add'>+	tx_data-&gt;len = htonl(TX_DATA_MSS_V(mss) | TX_LENGTH_V(data_len));</div><div class='add'>+</div><div class='add'>+	tx_data-&gt;rsvd = htonl(tcp_seq);</div><div class='add'>+</div><div class='add'>+	tx_data-&gt;flags = htonl(TX_BYPASS_F);</div><div class='add'>+	if (tcp_push)</div><div class='add'>+		tx_data-&gt;flags |= htonl(TX_PUSH_F | TX_SHOVE_F);</div><div class='add'>+</div><div class='add'>+	/* check left again, it might go beyond queue limit */</div><div class='add'>+	pos = tx_data + 1;</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+</div><div class='add'>+	/* check the position again */</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* send the complete packet except the header */</div><div class='add'>+	cxgb4_write_partial_sgl(skb, &amp;q-&gt;q, pos, end, sgl_sdesc-&gt;addr,</div><div class='add'>+				skb_offset, data_len);</div><div class='add'>+	sgl_sdesc-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	chcr_txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+	cxgb4_ring_tx_db(adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	atomic64_inc(&amp;adap-&gt;ch_ktls_stats.ktls_tx_send_records);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_xmit_wr_short: This is to send out partial records. If its</div><div class='add'>+ * a middle part of a record, fetch the prior data to make it 16 byte aligned</div><div class='add'>+ * and then only send it out.</div><div class='add'>+ *</div><div class='add'>+ * @skb - skb contains partial record..</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @tcp_seq</div><div class='add'>+ * @tcp_push - tcp push bit.</div><div class='add'>+ * @mss - segment size.</div><div class='add'>+ * @tls_rec_offset - offset from start of the tls record.</div><div class='add'>+ * @perior_data - data before the current segment, required to make this record</div><div class='add'>+ *		  16 byte aligned.</div><div class='add'>+ * @prior_data_len - prior_data length (less than 16)</div><div class='add'>+ * return: NETDEV_TX_BUSY/NET_TX_OK.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_xmit_wr_short(struct sk_buff *skb,</div><div class='add'>+				   struct chcr_ktls_info *tx_info,</div><div class='add'>+				   struct sge_eth_txq *q,</div><div class='add'>+				   u32 tcp_seq, bool tcp_push, u32 mss,</div><div class='add'>+				   u32 tls_rec_offset, u8 *prior_data,</div><div class='add'>+				   u32 prior_data_len, u32 data_len,</div><div class='add'>+				   u32 skb_offset)</div><div class='add'>+{</div><div class='add'>+	u32 len16, wr_mid = 0, cipher_start, nfrags;</div><div class='add'>+	struct adapter *adap = tx_info-&gt;adap;</div><div class='add'>+	unsigned int flits = 0, ndesc;</div><div class='add'>+	int credits, left, last_desc;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='add'>+	struct cpl_tx_data *tx_data;</div><div class='add'>+	struct cpl_tx_sec_pdu *cpl;</div><div class='add'>+	struct ulptx_idata *idata;</div><div class='add'>+	struct ulp_txpkt *ulptx;</div><div class='add'>+	struct fw_ulptx_wr *wr;</div><div class='add'>+	__be64 iv_record;</div><div class='add'>+	void *pos;</div><div class='add'>+	u64 *end;</div><div class='add'>+</div><div class='add'>+	nfrags = chcr_get_nfrags_to_send(skb, skb_offset, data_len);</div><div class='add'>+	/* get the number of flits required, it's a partial record so 2 flits</div><div class='add'>+	 * (AES_BLOCK_SIZE) will be added.</div><div class='add'>+	 */</div><div class='add'>+	flits = chcr_ktls_get_tx_flits(nfrags, tx_info-&gt;key_ctx_len) + 2;</div><div class='add'>+	/* get the correct 8 byte IV of this record */</div><div class='add'>+	iv_record = cpu_to_be64(tx_info-&gt;iv + tx_info-&gt;record_no);</div><div class='add'>+	/* If it's a middle record and not 16 byte aligned to run AES CTR, need</div><div class='add'>+	 * to make it 16 byte aligned. So atleadt 2 extra flits of immediate</div><div class='add'>+	 * data will be added.</div><div class='add'>+	 */</div><div class='add'>+	if (prior_data_len)</div><div class='add'>+		flits += 2;</div><div class='add'>+	/* number of descriptors */</div><div class='add'>+	ndesc = chcr_flits_to_desc(flits);</div><div class='add'>+	/* check if enough credits available */</div><div class='add'>+	credits = chcr_txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= q-&gt;q.size)</div><div class='add'>+		last_desc -= q-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;q-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='add'>+	if (unlikely(cxgb4_map_skb(adap-&gt;pdev_dev, skb, sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='add'>+		q-&gt;mapping_err++;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = &amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	end = (u64 *)pos + flits;</div><div class='add'>+	/* FW_ULPTX_WR */</div><div class='add'>+	wr = pos;</div><div class='add'>+	/* WR will need len16 */</div><div class='add'>+	len16 = DIV_ROUND_UP(flits, 2);</div><div class='add'>+	wr-&gt;op_to_compl = htonl(FW_WR_OP_V(FW_ULPTX_WR));</div><div class='add'>+	wr-&gt;flowid_len16 = htonl(wr_mid | FW_WR_LEN16_V(len16));</div><div class='add'>+	wr-&gt;cookie = 0;</div><div class='add'>+	pos += sizeof(*wr);</div><div class='add'>+	/* ULP_TXPKT */</div><div class='add'>+	ulptx = pos;</div><div class='add'>+	ulptx-&gt;cmd_dest = htonl(ULPTX_CMD_V(ULP_TX_PKT) |</div><div class='add'>+				ULP_TXPKT_CHANNELID_V(tx_info-&gt;port_id) |</div><div class='add'>+				ULP_TXPKT_FID_V(q-&gt;q.cntxt_id) |</div><div class='add'>+				ULP_TXPKT_RO_F);</div><div class='add'>+	ulptx-&gt;len = htonl(len16 - 1);</div><div class='add'>+	/* ULPTX_IDATA sub-command */</div><div class='add'>+	idata = (struct ulptx_idata *)(ulptx + 1);</div><div class='add'>+	idata-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_IMM) | ULP_TX_SC_MORE_F);</div><div class='add'>+	/* idata length will include cpl_tx_sec_pdu + key context size +</div><div class='add'>+	 * cpl_tx_data header.</div><div class='add'>+	 */</div><div class='add'>+	idata-&gt;len = htonl(sizeof(*cpl) + tx_info-&gt;key_ctx_len +</div><div class='add'>+			   sizeof(*tx_data) + AES_BLOCK_LEN + prior_data_len);</div><div class='add'>+	/* SEC CPL */</div><div class='add'>+	cpl = (struct cpl_tx_sec_pdu *)(idata + 1);</div><div class='add'>+	/* cipher start will have tls header + iv size extra if its a header</div><div class='add'>+	 * part of tls record. else only 16 byte IV will be added.</div><div class='add'>+	 */</div><div class='add'>+	cipher_start =</div><div class='add'>+		AES_BLOCK_LEN + 1 +</div><div class='add'>+		(!tls_rec_offset ? TLS_HEADER_SIZE + tx_info-&gt;iv_size : 0);</div><div class='add'>+</div><div class='add'>+	cpl-&gt;op_ivinsrtofst =</div><div class='add'>+		htonl(CPL_TX_SEC_PDU_OPCODE_V(CPL_TX_SEC_PDU) |</div><div class='add'>+		      CPL_TX_SEC_PDU_CPLLEN_V(CHCR_CPL_TX_SEC_PDU_LEN_64BIT) |</div><div class='add'>+		      CPL_TX_SEC_PDU_IVINSRTOFST_V(1));</div><div class='add'>+	cpl-&gt;pldlen = htonl(data_len + AES_BLOCK_LEN + prior_data_len);</div><div class='add'>+	cpl-&gt;aadstart_cipherstop_hi =</div><div class='add'>+		htonl(CPL_TX_SEC_PDU_CIPHERSTART_V(cipher_start));</div><div class='add'>+	cpl-&gt;cipherstop_lo_authinsert = 0;</div><div class='add'>+	/* These two flits are actually a CPL_TLS_TX_SCMD_FMT. */</div><div class='add'>+	cpl-&gt;seqno_numivs = htonl(tx_info-&gt;scmd0_short_seqno_numivs);</div><div class='add'>+	cpl-&gt;ivgen_hdrlen = htonl(tx_info-&gt;scmd0_short_ivgen_hdrlen);</div><div class='add'>+	cpl-&gt;scmd1 = 0;</div><div class='add'>+</div><div class='add'>+	pos = cpl + 1;</div><div class='add'>+	/* check if space left to fill the keys */</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = chcr_copy_to_txd(&amp;tx_info-&gt;key_ctx, &amp;q-&gt;q, pos,</div><div class='add'>+			       tx_info-&gt;key_ctx_len);</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+	/* CPL_TX_DATA */</div><div class='add'>+	tx_data = (void *)pos;</div><div class='add'>+	OPCODE_TID(tx_data) = htonl(MK_OPCODE_TID(CPL_TX_DATA, tx_info-&gt;tid));</div><div class='add'>+	tx_data-&gt;len = htonl(TX_DATA_MSS_V(mss) |</div><div class='add'>+			     TX_LENGTH_V(data_len + prior_data_len));</div><div class='add'>+	tx_data-&gt;rsvd = htonl(tcp_seq);</div><div class='add'>+	tx_data-&gt;flags = htonl(TX_BYPASS_F);</div><div class='add'>+	if (tcp_push)</div><div class='add'>+		tx_data-&gt;flags |= htonl(TX_PUSH_F | TX_SHOVE_F);</div><div class='add'>+</div><div class='add'>+	/* check left again, it might go beyond queue limit */</div><div class='add'>+	pos = tx_data + 1;</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+</div><div class='add'>+	/* check the position again */</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+	/* copy the 16 byte IV for AES-CTR, which includes 4 bytes of salt, 8</div><div class='add'>+	 * bytes of actual IV and 4 bytes of 16 byte-sequence.</div><div class='add'>+	 */</div><div class='add'>+	memcpy(pos, tx_info-&gt;key_ctx.salt, tx_info-&gt;salt_size);</div><div class='add'>+	memcpy(pos + tx_info-&gt;salt_size, &amp;iv_record, tx_info-&gt;iv_size);</div><div class='add'>+	*(__be32 *)(pos + tx_info-&gt;salt_size + tx_info-&gt;iv_size) =</div><div class='add'>+		htonl(2 + (tls_rec_offset ? ((tls_rec_offset -</div><div class='add'>+		(TLS_HEADER_SIZE + tx_info-&gt;iv_size)) / AES_BLOCK_LEN) : 0));</div><div class='add'>+</div><div class='add'>+	pos += 16;</div><div class='add'>+	/* Prior_data_len will always be less than 16 bytes, fill the</div><div class='add'>+	 * prio_data_len after AES_CTRL_BLOCK and clear the remaining length</div><div class='add'>+	 * to 0.</div><div class='add'>+	 */</div><div class='add'>+	if (prior_data_len)</div><div class='add'>+		pos = chcr_copy_to_txd(prior_data, &amp;q-&gt;q, pos, 16);</div><div class='add'>+	/* send the complete packet except the header */</div><div class='add'>+	cxgb4_write_partial_sgl(skb, &amp;q-&gt;q, pos, end, sgl_sdesc-&gt;addr,</div><div class='add'>+				skb_offset, data_len);</div><div class='add'>+	sgl_sdesc-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	chcr_txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+	cxgb4_ring_tx_db(adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_tx_plaintxt: This handler will take care of the records which has</div><div class='add'>+ * only plain text (only tls header and iv)</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @skb - skb contains partial record..</div><div class='add'>+ * @tcp_seq</div><div class='add'>+ * @mss - segment size.</div><div class='add'>+ * @tcp_push - tcp push bit.</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @port_id : port number</div><div class='add'>+ * @perior_data - data before the current segment, required to make this record</div><div class='add'>+ *		 16 byte aligned.</div><div class='add'>+ * @prior_data_len - prior_data length (less than 16)</div><div class='add'>+ * return: NETDEV_TX_BUSY/NET_TX_OK.</div><div class='add'>+ */</div><div class='add'>+static int chcr_ktls_tx_plaintxt(struct chcr_ktls_info *tx_info,</div><div class='add'>+				 struct sk_buff *skb, u32 tcp_seq, u32 mss,</div><div class='add'>+				 bool tcp_push, struct sge_eth_txq *q,</div><div class='add'>+				 u32 port_id, u8 *prior_data,</div><div class='add'>+				 u32 data_len, u32 skb_offset,</div><div class='add'>+				 u32 prior_data_len)</div><div class='add'>+{</div><div class='add'>+	int credits, left, len16, last_desc;</div><div class='add'>+	unsigned int flits = 0, ndesc;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='add'>+	struct cpl_tx_data *tx_data;</div><div class='add'>+	struct ulptx_idata *idata;</div><div class='add'>+	struct ulp_txpkt *ulptx;</div><div class='add'>+	struct fw_ulptx_wr *wr;</div><div class='add'>+	u32 wr_mid = 0, nfrags;</div><div class='add'>+	void *pos;</div><div class='add'>+	u64 *end;</div><div class='add'>+</div><div class='add'>+	flits = DIV_ROUND_UP(CHCR_PLAIN_TX_DATA_LEN, 8);</div><div class='add'>+	nfrags = chcr_get_nfrags_to_send(skb, skb_offset, data_len);</div><div class='add'>+	flits += chcr_sgl_len(nfrags);</div><div class='add'>+	if (prior_data_len)</div><div class='add'>+		flits += 2;</div><div class='add'>+</div><div class='add'>+	/* WR will need len16 */</div><div class='add'>+	len16 = DIV_ROUND_UP(flits, 2);</div><div class='add'>+	/* check how many descriptors needed */</div><div class='add'>+	ndesc = DIV_ROUND_UP(flits, 8);</div><div class='add'>+</div><div class='add'>+	credits = chcr_txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= q-&gt;q.size)</div><div class='add'>+		last_desc -= q-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;q-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='add'>+	if (unlikely(cxgb4_map_skb(tx_info-&gt;adap-&gt;pdev_dev, skb,</div><div class='add'>+				   sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='add'>+		q-&gt;mapping_err++;</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pos = &amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	end = (u64 *)pos + flits;</div><div class='add'>+	/* FW_ULPTX_WR */</div><div class='add'>+	wr = pos;</div><div class='add'>+	wr-&gt;op_to_compl = htonl(FW_WR_OP_V(FW_ULPTX_WR));</div><div class='add'>+	wr-&gt;flowid_len16 = htonl(wr_mid | FW_WR_LEN16_V(len16));</div><div class='add'>+	wr-&gt;cookie = 0;</div><div class='add'>+	/* ULP_TXPKT */</div><div class='add'>+	ulptx = (struct ulp_txpkt *)(wr + 1);</div><div class='add'>+	ulptx-&gt;cmd_dest = htonl(ULPTX_CMD_V(ULP_TX_PKT) |</div><div class='add'>+			ULP_TXPKT_DATAMODIFY_V(0) |</div><div class='add'>+			ULP_TXPKT_CHANNELID_V(tx_info-&gt;port_id) |</div><div class='add'>+			ULP_TXPKT_DEST_V(0) |</div><div class='add'>+			ULP_TXPKT_FID_V(q-&gt;q.cntxt_id) | ULP_TXPKT_RO_V(1));</div><div class='add'>+	ulptx-&gt;len = htonl(len16 - 1);</div><div class='add'>+	/* ULPTX_IDATA sub-command */</div><div class='add'>+	idata = (struct ulptx_idata *)(ulptx + 1);</div><div class='add'>+	idata-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_IMM) | ULP_TX_SC_MORE_F);</div><div class='add'>+	idata-&gt;len = htonl(sizeof(*tx_data) + prior_data_len);</div><div class='add'>+	/* CPL_TX_DATA */</div><div class='add'>+	tx_data = (struct cpl_tx_data *)(idata + 1);</div><div class='add'>+	OPCODE_TID(tx_data) = htonl(MK_OPCODE_TID(CPL_TX_DATA, tx_info-&gt;tid));</div><div class='add'>+	tx_data-&gt;len = htonl(TX_DATA_MSS_V(mss) |</div><div class='add'>+			     TX_LENGTH_V(data_len + prior_data_len));</div><div class='add'>+	/* set tcp seq number */</div><div class='add'>+	tx_data-&gt;rsvd = htonl(tcp_seq);</div><div class='add'>+	tx_data-&gt;flags = htonl(TX_BYPASS_F);</div><div class='add'>+	if (tcp_push)</div><div class='add'>+		tx_data-&gt;flags |= htonl(TX_PUSH_F | TX_SHOVE_F);</div><div class='add'>+</div><div class='add'>+	pos = tx_data + 1;</div><div class='add'>+	/* apart from prior_data_len, we should set remaining part of 16 bytes</div><div class='add'>+	 * to be zero.</div><div class='add'>+	 */</div><div class='add'>+	if (prior_data_len)</div><div class='add'>+		pos = chcr_copy_to_txd(prior_data, &amp;q-&gt;q, pos, 16);</div><div class='add'>+</div><div class='add'>+	/* check left again, it might go beyond queue limit */</div><div class='add'>+	left = (void *)q-&gt;q.stat - pos;</div><div class='add'>+</div><div class='add'>+	/* check the position again */</div><div class='add'>+	if (!left) {</div><div class='add'>+		left = (void *)end - (void *)q-&gt;q.stat;</div><div class='add'>+		pos = q-&gt;q.desc;</div><div class='add'>+		end = pos + left;</div><div class='add'>+	}</div><div class='add'>+	/* send the complete packet including the header */</div><div class='add'>+	cxgb4_write_partial_sgl(skb, &amp;q-&gt;q, pos, end, sgl_sdesc-&gt;addr,</div><div class='add'>+				skb_offset, data_len);</div><div class='add'>+	sgl_sdesc-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	chcr_txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+	cxgb4_ring_tx_db(tx_info-&gt;adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_ktls_tunnel_pkt(struct chcr_ktls_info *tx_info,</div><div class='add'>+				struct sk_buff *skb,</div><div class='add'>+				struct sge_eth_txq *q)</div><div class='add'>+{</div><div class='add'>+	u32 ctrl, iplen, maclen, wr_mid = 0, len16;</div><div class='add'>+	struct tx_sw_desc *sgl_sdesc;</div><div class='add'>+	struct fw_eth_tx_pkt_wr *wr;</div><div class='add'>+	struct cpl_tx_pkt_core *cpl;</div><div class='add'>+	unsigned int flits, ndesc;</div><div class='add'>+	int credits, last_desc;</div><div class='add'>+	u64 cntrl1, *end;</div><div class='add'>+	void *pos;</div><div class='add'>+</div><div class='add'>+	ctrl = sizeof(*cpl);</div><div class='add'>+	flits = DIV_ROUND_UP(sizeof(*wr) + ctrl, 8);</div><div class='add'>+</div><div class='add'>+	flits += chcr_sgl_len(skb_shinfo(skb)-&gt;nr_frags + 1);</div><div class='add'>+	len16 = DIV_ROUND_UP(flits, 2);</div><div class='add'>+	/* check how many descriptors needed */</div><div class='add'>+	ndesc = DIV_ROUND_UP(flits, 8);</div><div class='add'>+</div><div class='add'>+	credits = chcr_txq_avail(&amp;q-&gt;q) - ndesc;</div><div class='add'>+	if (unlikely(credits &lt; 0)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (unlikely(credits &lt; ETHTXQ_STOP_THRES)) {</div><div class='add'>+		chcr_eth_txq_stop(q);</div><div class='add'>+		wr_mid |= FW_WR_EQUEQ_F | FW_WR_EQUIQ_F;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	last_desc = q-&gt;q.pidx + ndesc - 1;</div><div class='add'>+	if (last_desc &gt;= q-&gt;q.size)</div><div class='add'>+		last_desc -= q-&gt;q.size;</div><div class='add'>+	sgl_sdesc = &amp;q-&gt;q.sdesc[last_desc];</div><div class='add'>+</div><div class='add'>+	if (unlikely(cxgb4_map_skb(tx_info-&gt;adap-&gt;pdev_dev, skb,</div><div class='add'>+				   sgl_sdesc-&gt;addr) &lt; 0)) {</div><div class='add'>+		memset(sgl_sdesc-&gt;addr, 0, sizeof(sgl_sdesc-&gt;addr));</div><div class='add'>+		q-&gt;mapping_err++;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iplen = skb_network_header_len(skb);</div><div class='add'>+	maclen = skb_mac_header_len(skb);</div><div class='add'>+</div><div class='add'>+	pos = &amp;q-&gt;q.desc[q-&gt;q.pidx];</div><div class='add'>+	end = (u64 *)pos + flits;</div><div class='add'>+	wr = pos;</div><div class='add'>+</div><div class='add'>+	/* Firmware work request header */</div><div class='add'>+	wr-&gt;op_immdlen = htonl(FW_WR_OP_V(FW_ETH_TX_PKT_WR) |</div><div class='add'>+			       FW_WR_IMMDLEN_V(ctrl));</div><div class='add'>+</div><div class='add'>+	wr-&gt;equiq_to_len16 = htonl(wr_mid | FW_WR_LEN16_V(len16));</div><div class='add'>+	wr-&gt;r3 = 0;</div><div class='add'>+</div><div class='add'>+	cpl = (void *)(wr + 1);</div><div class='add'>+</div><div class='add'>+	/* CPL header */</div><div class='add'>+	cpl-&gt;ctrl0 = htonl(TXPKT_OPCODE_V(CPL_TX_PKT) |</div><div class='add'>+			   TXPKT_INTF_V(tx_info-&gt;tx_chan) |</div><div class='add'>+			   TXPKT_PF_V(tx_info-&gt;adap-&gt;pf));</div><div class='add'>+	cpl-&gt;pack = 0;</div><div class='add'>+	cntrl1 = TXPKT_CSUM_TYPE_V(tx_info-&gt;ip_family == AF_INET ?</div><div class='add'>+				   TX_CSUM_TCPIP : TX_CSUM_TCPIP6);</div><div class='add'>+	cntrl1 |= T6_TXPKT_ETHHDR_LEN_V(maclen - ETH_HLEN) |</div><div class='add'>+		  TXPKT_IPHDR_LEN_V(iplen);</div><div class='add'>+	/* checksum offload */</div><div class='add'>+	cpl-&gt;ctrl1 = cpu_to_be64(cntrl1);</div><div class='add'>+	cpl-&gt;len = htons(skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	pos = cpl + 1;</div><div class='add'>+</div><div class='add'>+	cxgb4_write_sgl(skb, &amp;q-&gt;q, pos, end, 0, sgl_sdesc-&gt;addr);</div><div class='add'>+	sgl_sdesc-&gt;skb = skb;</div><div class='add'>+	chcr_txq_advance(&amp;q-&gt;q, ndesc);</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+	cxgb4_ring_tx_db(tx_info-&gt;adap, &amp;q-&gt;q, ndesc);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_ktls_copy_record_in_skb</div><div class='add'>+ * @nskb - new skb where the frags to be added.</div><div class='add'>+ * @skb - old skb, to copy socket and destructor details.</div><div class='add'>+ * @record - specific record which has complete 16k record in frags.</div><div class='add'>+ */</div><div class='add'>+static void chcr_ktls_copy_record_in_skb(struct sk_buff *nskb,</div><div class='add'>+					 struct sk_buff *skb,</div><div class='add'>+					 struct tls_record_info *record)</div><div class='add'>+{</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; record-&gt;num_frags; i++) {</div><div class='add'>+		skb_shinfo(nskb)-&gt;frags[i] = record-&gt;frags[i];</div><div class='add'>+		/* increase the frag ref count */</div><div class='add'>+		__skb_frag_ref(&amp;skb_shinfo(nskb)-&gt;frags[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_shinfo(nskb)-&gt;nr_frags = record-&gt;num_frags;</div><div class='add'>+	nskb-&gt;data_len = record-&gt;len;</div><div class='add'>+	nskb-&gt;len += record-&gt;len;</div><div class='add'>+	nskb-&gt;truesize += record-&gt;len;</div><div class='add'>+	nskb-&gt;sk = skb-&gt;sk;</div><div class='add'>+	nskb-&gt;destructor = skb-&gt;destructor;</div><div class='add'>+	refcount_add(nskb-&gt;truesize, &amp;nskb-&gt;sk-&gt;sk_wmem_alloc);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_end_part_handler: This handler will handle the record which</div><div class='add'>+ * is complete or if record's end part is received. T6 adapter has a issue that</div><div class='add'>+ * it can't send out TAG with partial record so if its an end part then we have</div><div class='add'>+ * to send TAG as well and for which we need to fetch the complete record and</div><div class='add'>+ * send it to crypto module.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @skb - skb contains partial record.</div><div class='add'>+ * @record - complete record of 16K size.</div><div class='add'>+ * @tcp_seq</div><div class='add'>+ * @mss - segment size in which TP needs to chop a packet.</div><div class='add'>+ * @tcp_push_no_fin - tcp push if fin is not set.</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @tls_end_offset - offset from end of the record.</div><div class='add'>+ * @last wr : check if this is the last part of the skb going out.</div><div class='add'>+ * return: NETDEV_TX_OK/NETDEV_TX_BUSY.</div><div class='add'>+ */</div><div class='add'>+static int chcr_end_part_handler(struct chcr_ktls_info *tx_info,</div><div class='add'>+				 struct sk_buff *skb,</div><div class='add'>+				 struct tls_record_info *record,</div><div class='add'>+				 u32 tcp_seq, int mss, bool tcp_push_no_fin,</div><div class='add'>+				 struct sge_eth_txq *q, u32 skb_offset,</div><div class='add'>+				 u32 tls_end_offset, bool last_wr)</div><div class='add'>+{</div><div class='add'>+	bool free_skb_if_tx_fails = false;</div><div class='add'>+	struct sk_buff *nskb = NULL;</div><div class='add'>+</div><div class='add'>+	/* check if it is a complete record */</div><div class='add'>+	if (tls_end_offset == record-&gt;len) {</div><div class='add'>+		nskb = skb;</div><div class='add'>+		atomic64_inc(&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_tx_complete_pkts);</div><div class='add'>+	} else {</div><div class='add'>+		nskb = alloc_skb(0, GFP_ATOMIC);</div><div class='add'>+		if (!nskb) {</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+			return NETDEV_TX_BUSY;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* copy complete record in skb */</div><div class='add'>+		chcr_ktls_copy_record_in_skb(nskb, skb, record);</div><div class='add'>+		/* packet is being sent from the beginning, update the tcp_seq</div><div class='add'>+		 * accordingly.</div><div class='add'>+		 */</div><div class='add'>+		tcp_seq = tls_record_start_seq(record);</div><div class='add'>+		/* reset skb offset */</div><div class='add'>+		skb_offset = 0;</div><div class='add'>+</div><div class='add'>+		if (last_wr)</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+		else</div><div class='add'>+			free_skb_if_tx_fails = true;</div><div class='add'>+</div><div class='add'>+		last_wr = true;</div><div class='add'>+</div><div class='add'>+		atomic64_inc(&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_tx_end_pkts);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chcr_ktls_xmit_wr_complete(nskb, tx_info, q, tcp_seq,</div><div class='add'>+				       last_wr, record-&gt;len, skb_offset,</div><div class='add'>+				       record-&gt;num_frags,</div><div class='add'>+				       (last_wr &amp;&amp; tcp_push_no_fin),</div><div class='add'>+				       mss)) {</div><div class='add'>+		if (free_skb_if_tx_fails)</div><div class='add'>+			dev_kfree_skb_any(skb);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	tx_info-&gt;prev_seq = record-&gt;end_seq;</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb_any(nskb);</div><div class='add'>+	return NETDEV_TX_BUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chcr_short_record_handler: This handler will take care of the records which</div><div class='add'>+ * doesn't have end part (1st part or the middle part(/s) of a record). In such</div><div class='add'>+ * cases, AES CTR will be used in place of AES GCM to send out partial packet.</div><div class='add'>+ * This partial record might be the first part of the record, or the middle</div><div class='add'>+ * part. In case of middle record we should fetch the prior data to make it 16</div><div class='add'>+ * byte aligned. If it has a partial tls header or iv then get to the start of</div><div class='add'>+ * tls header. And if it has partial TAG, then remove the complete TAG and send</div><div class='add'>+ * only the payload.</div><div class='add'>+ * There is one more possibility that it gets a partial header, send that</div><div class='add'>+ * portion as a plaintext.</div><div class='add'>+ * @tx_info - driver specific tls info.</div><div class='add'>+ * @skb - skb contains partial record..</div><div class='add'>+ * @record - complete record of 16K size.</div><div class='add'>+ * @tcp_seq</div><div class='add'>+ * @mss - segment size in which TP needs to chop a packet.</div><div class='add'>+ * @tcp_push_no_fin - tcp push if fin is not set.</div><div class='add'>+ * @q - TX queue.</div><div class='add'>+ * @tls_end_offset - offset from end of the record.</div><div class='add'>+ * return: NETDEV_TX_OK/NETDEV_TX_BUSY.</div><div class='add'>+ */</div><div class='add'>+static int chcr_short_record_handler(struct chcr_ktls_info *tx_info,</div><div class='add'>+				     struct sk_buff *skb,</div><div class='add'>+				     struct tls_record_info *record,</div><div class='add'>+				     u32 tcp_seq, int mss, bool tcp_push_no_fin,</div><div class='add'>+				     u32 data_len, u32 skb_offset,</div><div class='add'>+				     struct sge_eth_txq *q, u32 tls_end_offset)</div><div class='add'>+{</div><div class='add'>+	u32 tls_rec_offset = tcp_seq - tls_record_start_seq(record);</div><div class='add'>+	u8 prior_data[16] = {0};</div><div class='add'>+	u32 prior_data_len = 0;</div><div class='add'>+</div><div class='add'>+	/* check if the skb is ending in middle of tag/HASH, its a big</div><div class='add'>+	 * trouble, send the packet before the HASH.</div><div class='add'>+	 */</div><div class='add'>+	int remaining_record = tls_end_offset - data_len;</div><div class='add'>+</div><div class='add'>+	if (remaining_record &gt; 0 &amp;&amp;</div><div class='add'>+	    remaining_record &lt; TLS_CIPHER_AES_GCM_128_TAG_SIZE) {</div><div class='add'>+		int trimmed_len = 0;</div><div class='add'>+</div><div class='add'>+		if (tls_end_offset &gt; TLS_CIPHER_AES_GCM_128_TAG_SIZE)</div><div class='add'>+			trimmed_len = data_len -</div><div class='add'>+				      (TLS_CIPHER_AES_GCM_128_TAG_SIZE -</div><div class='add'>+				       remaining_record);</div><div class='add'>+		if (!trimmed_len)</div><div class='add'>+			return FALLBACK;</div><div class='add'>+</div><div class='add'>+		WARN_ON(trimmed_len &gt; data_len);</div><div class='add'>+</div><div class='add'>+		data_len = trimmed_len;</div><div class='add'>+		atomic64_inc(&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_tx_trimmed_pkts);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if it is only the header part. */</div><div class='add'>+	if (tls_rec_offset + data_len &lt;= (TLS_HEADER_SIZE + tx_info-&gt;iv_size)) {</div><div class='add'>+		if (chcr_ktls_tx_plaintxt(tx_info, skb, tcp_seq, mss,</div><div class='add'>+					  tcp_push_no_fin, q,</div><div class='add'>+					  tx_info-&gt;port_id, prior_data,</div><div class='add'>+					  data_len, skb_offset, prior_data_len))</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		tx_info-&gt;prev_seq = tcp_seq + data_len;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check if the middle record's start point is 16 byte aligned. CTR</div><div class='add'>+	 * needs 16 byte aligned start point to start encryption.</div><div class='add'>+	 */</div><div class='add'>+	if (tls_rec_offset) {</div><div class='add'>+		/* there is an offset from start, means its a middle record */</div><div class='add'>+		int remaining = 0;</div><div class='add'>+</div><div class='add'>+		if (tls_rec_offset &lt; (TLS_HEADER_SIZE + tx_info-&gt;iv_size)) {</div><div class='add'>+			prior_data_len = tls_rec_offset;</div><div class='add'>+			tls_rec_offset = 0;</div><div class='add'>+			remaining = 0;</div><div class='add'>+		} else {</div><div class='add'>+			prior_data_len =</div><div class='add'>+				(tls_rec_offset -</div><div class='add'>+				(TLS_HEADER_SIZE + tx_info-&gt;iv_size))</div><div class='add'>+				% AES_BLOCK_LEN;</div><div class='add'>+			remaining = tls_rec_offset - prior_data_len;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* if prior_data_len is not zero, means we need to fetch prior</div><div class='add'>+		 * data to make this record 16 byte aligned, or we need to reach</div><div class='add'>+		 * to start offset.</div><div class='add'>+		 */</div><div class='add'>+		if (prior_data_len) {</div><div class='add'>+			int i = 0;</div><div class='add'>+			skb_frag_t *f;</div><div class='add'>+			int frag_size = 0, frag_delta = 0;</div><div class='add'>+</div><div class='add'>+			while (remaining &gt; 0) {</div><div class='add'>+				frag_size = skb_frag_size(&amp;record-&gt;frags[i]);</div><div class='add'>+				if (remaining &lt; frag_size)</div><div class='add'>+					break;</div><div class='add'>+</div><div class='add'>+				remaining -= frag_size;</div><div class='add'>+				i++;</div><div class='add'>+			}</div><div class='add'>+			f = &amp;record-&gt;frags[i];</div><div class='add'>+			frag_delta = skb_frag_size(f) - remaining;</div><div class='add'>+</div><div class='add'>+			if (frag_delta &gt;= prior_data_len) {</div><div class='add'>+				memcpy_from_page(prior_data, skb_frag_page(f),</div><div class='add'>+						 skb_frag_off(f) + remaining,</div><div class='add'>+						 prior_data_len);</div><div class='add'>+			} else {</div><div class='add'>+				memcpy_from_page(prior_data, skb_frag_page(f),</div><div class='add'>+						 skb_frag_off(f) + remaining,</div><div class='add'>+						 frag_delta);</div><div class='add'>+</div><div class='add'>+				/* get the next page */</div><div class='add'>+				f = &amp;record-&gt;frags[i + 1];</div><div class='add'>+</div><div class='add'>+				memcpy_from_page(prior_data + frag_delta,</div><div class='add'>+						 skb_frag_page(f),</div><div class='add'>+						 skb_frag_off(f),</div><div class='add'>+						 prior_data_len - frag_delta);</div><div class='add'>+			}</div><div class='add'>+			/* reset tcp_seq as per the prior_data_required len */</div><div class='add'>+			tcp_seq -= prior_data_len;</div><div class='add'>+		}</div><div class='add'>+		atomic64_inc(&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_tx_middle_pkts);</div><div class='add'>+	} else {</div><div class='add'>+		atomic64_inc(&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_tx_start_pkts);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (chcr_ktls_xmit_wr_short(skb, tx_info, q, tcp_seq, tcp_push_no_fin,</div><div class='add'>+				    mss, tls_rec_offset, prior_data,</div><div class='add'>+				    prior_data_len, data_len, skb_offset)) {</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;prev_seq = tcp_seq + data_len + prior_data_len;</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return NETDEV_TX_BUSY;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_ktls_sw_fallback(struct sk_buff *skb,</div><div class='add'>+				 struct chcr_ktls_info *tx_info,</div><div class='add'>+				 struct sge_eth_txq *q)</div><div class='add'>+{</div><div class='add'>+	u32 data_len, skb_offset;</div><div class='add'>+	struct sk_buff *nskb;</div><div class='add'>+	struct tcphdr *th;</div><div class='add'>+</div><div class='add'>+	nskb = tls_encrypt_skb(skb);</div><div class='add'>+</div><div class='add'>+	if (!nskb)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	th = tcp_hdr(nskb);</div><div class='add'>+	skb_offset = skb_tcp_all_headers(nskb);</div><div class='add'>+	data_len = nskb-&gt;len - skb_offset;</div><div class='add'>+</div><div class='add'>+	if (chcr_ktls_tunnel_pkt(tx_info, nskb, q))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tx_info-&gt;prev_seq = ntohl(th-&gt;seq) + data_len;</div><div class='add'>+	atomic64_inc(&amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_tx_fallback);</div><div class='add'>+	return 0;</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb_any(nskb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+/* nic tls TX handler */</div><div class='add'>+static int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	u32 tls_end_offset, tcp_seq, skb_data_len, skb_offset;</div><div class='add'>+	struct ch_ktls_port_stats_debug *port_stats;</div><div class='add'>+	struct tls_offload_context_tx *tx_ctx;</div><div class='add'>+	struct ch_ktls_stats_debug *stats;</div><div class='add'>+	struct tcphdr *th = tcp_hdr(skb);</div><div class='add'>+	int data_len, qidx, ret = 0, mss;</div><div class='add'>+	struct tls_record_info *record;</div><div class='add'>+	struct chcr_ktls_info *tx_info;</div><div class='add'>+	struct net_device *tls_netdev;</div><div class='add'>+	struct tls_context *tls_ctx;</div><div class='add'>+	struct sge_eth_txq *q;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	tcp_seq = ntohl(th-&gt;seq);</div><div class='add'>+	skb_offset = skb_tcp_all_headers(skb);</div><div class='add'>+	skb_data_len = skb-&gt;len - skb_offset;</div><div class='add'>+	data_len = skb_data_len;</div><div class='add'>+</div><div class='add'>+	mss = skb_is_gso(skb) ? skb_shinfo(skb)-&gt;gso_size : data_len;</div><div class='add'>+</div><div class='add'>+	tls_ctx = tls_get_ctx(skb-&gt;sk);</div><div class='add'>+	tx_ctx = tls_offload_ctx_tx(tls_ctx);</div><div class='add'>+	tls_netdev = rcu_dereference_bh(tls_ctx-&gt;netdev);</div><div class='add'>+	/* Don't quit on NULL: if tls_device_down is running in parallel,</div><div class='add'>+	 * netdev might become NULL, even if tls_is_skb_tx_device_offloaded was</div><div class='add'>+	 * true. Rather continue processing this packet.</div><div class='add'>+	 */</div><div class='add'>+	if (unlikely(tls_netdev &amp;&amp; tls_netdev != dev))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tx_info = chcr_get_ktls_tx_info(tls_ctx);</div><div class='add'>+</div><div class='add'>+	if (unlikely(!tx_info))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	adap = tx_info-&gt;adap;</div><div class='add'>+	stats = &amp;adap-&gt;ch_ktls_stats;</div><div class='add'>+	port_stats = &amp;stats-&gt;ktls_port[tx_info-&gt;port_id];</div><div class='add'>+</div><div class='add'>+	qidx = skb-&gt;queue_mapping;</div><div class='add'>+	q = &amp;adap-&gt;sge.ethtxq[qidx + tx_info-&gt;first_qset];</div><div class='add'>+	cxgb4_reclaim_completed_tx(adap, &amp;q-&gt;q, true);</div><div class='add'>+	/* if tcp options are set but finish is not send the options first */</div><div class='add'>+	if (!th-&gt;fin &amp;&amp; chcr_ktls_check_tcp_options(th)) {</div><div class='add'>+		ret = chcr_ktls_write_tcp_options(tx_info, skb, q,</div><div class='add'>+						  tx_info-&gt;tx_chan);</div><div class='add'>+		if (ret)</div><div class='add'>+			return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TCP segments can be in received either complete or partial.</div><div class='add'>+	 * chcr_end_part_handler will handle cases if complete record or end</div><div class='add'>+	 * part of the record is received. In case of partial end part of record,</div><div class='add'>+	 * we will send the complete record again.</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;tx_ctx-&gt;lock, flags);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+</div><div class='add'>+		cxgb4_reclaim_completed_tx(adap, &amp;q-&gt;q, true);</div><div class='add'>+		/* fetch the tls record */</div><div class='add'>+		record = tls_get_record(tx_ctx, tcp_seq,</div><div class='add'>+					&amp;tx_info-&gt;record_no);</div><div class='add'>+		/* By the time packet reached to us, ACK is received, and record</div><div class='add'>+		 * won't be found in that case, handle it gracefully.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(!record)) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;tx_ctx-&gt;lock, flags);</div><div class='add'>+			atomic64_inc(&amp;port_stats-&gt;ktls_tx_drop_no_sync_data);</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tls_end_offset = record-&gt;end_seq - tcp_seq;</div><div class='add'>+</div><div class='add'>+		pr_debug("seq 0x%x, end_seq 0x%x prev_seq 0x%x, datalen 0x%x\n",</div><div class='add'>+			 tcp_seq, record-&gt;end_seq, tx_info-&gt;prev_seq, data_len);</div><div class='add'>+		/* update tcb for the skb */</div><div class='add'>+		if (skb_data_len == data_len) {</div><div class='add'>+			u32 tx_max = tcp_seq;</div><div class='add'>+</div><div class='add'>+			if (!tls_record_is_start_marker(record) &amp;&amp;</div><div class='add'>+			    tls_end_offset &lt; TLS_CIPHER_AES_GCM_128_TAG_SIZE)</div><div class='add'>+				tx_max = record-&gt;end_seq -</div><div class='add'>+					TLS_CIPHER_AES_GCM_128_TAG_SIZE;</div><div class='add'>+</div><div class='add'>+			ret = chcr_ktls_xmit_tcb_cpls(tx_info, q, tx_max,</div><div class='add'>+						      ntohl(th-&gt;ack_seq),</div><div class='add'>+						      ntohs(th-&gt;window),</div><div class='add'>+						      tls_end_offset !=</div><div class='add'>+						      record-&gt;len);</div><div class='add'>+			if (ret) {</div><div class='add'>+				spin_unlock_irqrestore(&amp;tx_ctx-&gt;lock,</div><div class='add'>+						       flags);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (th-&gt;fin)</div><div class='add'>+				skb_get(skb);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (unlikely(tls_record_is_start_marker(record))) {</div><div class='add'>+			atomic64_inc(&amp;port_stats-&gt;ktls_tx_skip_no_sync_data);</div><div class='add'>+			/* If tls_end_offset &lt; data_len, means there is some</div><div class='add'>+			 * data after start marker, which needs encryption, send</div><div class='add'>+			 * plaintext first and take skb refcount. else send out</div><div class='add'>+			 * complete pkt as plaintext.</div><div class='add'>+			 */</div><div class='add'>+			if (tls_end_offset &lt; data_len)</div><div class='add'>+				skb_get(skb);</div><div class='add'>+			else</div><div class='add'>+				tls_end_offset = data_len;</div><div class='add'>+</div><div class='add'>+			ret = chcr_ktls_tx_plaintxt(tx_info, skb, tcp_seq, mss,</div><div class='add'>+						    (!th-&gt;fin &amp;&amp; th-&gt;psh), q,</div><div class='add'>+						    tx_info-&gt;port_id, NULL,</div><div class='add'>+						    tls_end_offset, skb_offset,</div><div class='add'>+						    0);</div><div class='add'>+</div><div class='add'>+			if (ret) {</div><div class='add'>+				/* free the refcount taken earlier */</div><div class='add'>+				if (tls_end_offset &lt; data_len)</div><div class='add'>+					dev_kfree_skb_any(skb);</div><div class='add'>+				spin_unlock_irqrestore(&amp;tx_ctx-&gt;lock, flags);</div><div class='add'>+				goto out;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			data_len -= tls_end_offset;</div><div class='add'>+			tcp_seq = record-&gt;end_seq;</div><div class='add'>+			skb_offset += tls_end_offset;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* if a tls record is finishing in this SKB */</div><div class='add'>+		if (tls_end_offset &lt;= data_len) {</div><div class='add'>+			ret = chcr_end_part_handler(tx_info, skb, record,</div><div class='add'>+						    tcp_seq, mss,</div><div class='add'>+						    (!th-&gt;fin &amp;&amp; th-&gt;psh), q,</div><div class='add'>+						    skb_offset,</div><div class='add'>+						    tls_end_offset,</div><div class='add'>+						    skb_offset +</div><div class='add'>+						    tls_end_offset == skb-&gt;len);</div><div class='add'>+</div><div class='add'>+			data_len -= tls_end_offset;</div><div class='add'>+			/* tcp_seq increment is required to handle next record.</div><div class='add'>+			 */</div><div class='add'>+			tcp_seq += tls_end_offset;</div><div class='add'>+			skb_offset += tls_end_offset;</div><div class='add'>+		} else {</div><div class='add'>+			ret = chcr_short_record_handler(tx_info, skb,</div><div class='add'>+							record, tcp_seq, mss,</div><div class='add'>+							(!th-&gt;fin &amp;&amp; th-&gt;psh),</div><div class='add'>+							data_len, skb_offset,</div><div class='add'>+							q, tls_end_offset);</div><div class='add'>+			data_len = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* if any failure, come out from the loop. */</div><div class='add'>+		if (ret) {</div><div class='add'>+			spin_unlock_irqrestore(&amp;tx_ctx-&gt;lock, flags);</div><div class='add'>+			if (th-&gt;fin)</div><div class='add'>+				dev_kfree_skb_any(skb);</div><div class='add'>+</div><div class='add'>+			if (ret == FALLBACK)</div><div class='add'>+				return chcr_ktls_sw_fallback(skb, tx_info, q);</div><div class='add'>+</div><div class='add'>+			return NETDEV_TX_OK;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* length should never be less than 0 */</div><div class='add'>+		WARN_ON(data_len &lt; 0);</div><div class='add'>+</div><div class='add'>+	} while (data_len &gt; 0);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;tx_ctx-&gt;lock, flags);</div><div class='add'>+	atomic64_inc(&amp;port_stats-&gt;ktls_tx_encrypted_packets);</div><div class='add'>+	atomic64_add(skb_data_len, &amp;port_stats-&gt;ktls_tx_encrypted_bytes);</div><div class='add'>+</div><div class='add'>+	/* tcp finish is set, send a separate tcp msg including all the options</div><div class='add'>+	 * as well.</div><div class='add'>+	 */</div><div class='add'>+	if (th-&gt;fin) {</div><div class='add'>+		chcr_ktls_write_tcp_options(tx_info, skb, q, tx_info-&gt;tx_chan);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+out:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *chcr_ktls_uld_add(const struct cxgb4_lld_info *lldi)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx;</div><div class='add'>+</div><div class='add'>+	pr_info_once("%s - version %s\n", CHCR_KTLS_DRV_DESC,</div><div class='add'>+		     CHCR_KTLS_DRV_VERSION);</div><div class='add'>+	u_ctx = kzalloc(sizeof(*u_ctx), GFP_KERNEL);</div><div class='add'>+	if (!u_ctx) {</div><div class='add'>+		u_ctx = ERR_PTR(-ENOMEM);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	u_ctx-&gt;lldi = *lldi;</div><div class='add'>+	u_ctx-&gt;detach = false;</div><div class='add'>+	xa_init_flags(&amp;u_ctx-&gt;tid_list, XA_FLAGS_LOCK_BH);</div><div class='add'>+out:</div><div class='add'>+	return u_ctx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct tlsdev_ops chcr_ktls_ops = {</div><div class='add'>+	.tls_dev_add = chcr_ktls_dev_add,</div><div class='add'>+	.tls_dev_del = chcr_ktls_dev_del,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static chcr_handler_func work_handlers[NUM_CPL_CMDS] = {</div><div class='add'>+	[CPL_ACT_OPEN_RPL] = chcr_ktls_cpl_act_open_rpl,</div><div class='add'>+	[CPL_SET_TCB_RPL] = chcr_ktls_cpl_set_tcb_rpl,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int chcr_ktls_uld_rx_handler(void *handle, const __be64 *rsp,</div><div class='add'>+				    const struct pkt_gl *pgl)</div><div class='add'>+{</div><div class='add'>+	const struct cpl_act_open_rpl *rpl = (struct cpl_act_open_rpl *)rsp;</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx = handle;</div><div class='add'>+	u8 opcode = rpl-&gt;ot.opcode;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+</div><div class='add'>+	adap = pci_get_drvdata(u_ctx-&gt;lldi.pdev);</div><div class='add'>+</div><div class='add'>+	if (!work_handlers[opcode]) {</div><div class='add'>+		pr_err("Unsupported opcode %d received\n", opcode);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	work_handlers[opcode](adap, (unsigned char *)&amp;rsp[1]);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void clear_conn_resources(struct chcr_ktls_info *tx_info)</div><div class='add'>+{</div><div class='add'>+	/* clear l2t entry */</div><div class='add'>+	if (tx_info-&gt;l2te)</div><div class='add'>+		cxgb4_l2t_release(tx_info-&gt;l2te);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	/* clear clip entry */</div><div class='add'>+	if (tx_info-&gt;ip_family == AF_INET6)</div><div class='add'>+		cxgb4_clip_release(tx_info-&gt;netdev, (const u32 *)</div><div class='add'>+				   &amp;tx_info-&gt;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+				   1);</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	/* clear tid */</div><div class='add'>+	if (tx_info-&gt;tid != -1)</div><div class='add'>+		cxgb4_remove_tid(&amp;tx_info-&gt;adap-&gt;tids, tx_info-&gt;tx_chan,</div><div class='add'>+				 tx_info-&gt;tid, tx_info-&gt;ip_family);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ch_ktls_reset_all_conn(struct chcr_ktls_uld_ctx *u_ctx)</div><div class='add'>+{</div><div class='add'>+	struct ch_ktls_port_stats_debug *port_stats;</div><div class='add'>+	struct tls_offload_context_tx *tx_ctx;</div><div class='add'>+	struct chcr_ktls_info *tx_info;</div><div class='add'>+	unsigned long index;</div><div class='add'>+</div><div class='add'>+	xa_for_each(&amp;u_ctx-&gt;tid_list, index, tx_ctx) {</div><div class='add'>+		tx_info = __chcr_get_ktls_tx_info(tx_ctx);</div><div class='add'>+		clear_conn_resources(tx_info);</div><div class='add'>+		port_stats = &amp;tx_info-&gt;adap-&gt;ch_ktls_stats.ktls_port[tx_info-&gt;port_id];</div><div class='add'>+		atomic64_inc(&amp;port_stats-&gt;ktls_tx_connection_close);</div><div class='add'>+		kvfree(tx_info);</div><div class='add'>+		memset(tx_ctx-&gt;driver_state, 0, TLS_DRIVER_STATE_SIZE_TX);</div><div class='add'>+		/* release module refcount */</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chcr_ktls_uld_state_change(void *handle, enum cxgb4_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx = handle;</div><div class='add'>+</div><div class='add'>+	switch (new_state) {</div><div class='add'>+	case CXGB4_STATE_UP:</div><div class='add'>+		pr_info("%s: Up\n", pci_name(u_ctx-&gt;lldi.pdev));</div><div class='add'>+		mutex_lock(&amp;dev_mutex);</div><div class='add'>+		list_add_tail(&amp;u_ctx-&gt;entry, &amp;uld_ctx_list);</div><div class='add'>+		mutex_unlock(&amp;dev_mutex);</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_STATE_START_RECOVERY:</div><div class='add'>+	case CXGB4_STATE_DOWN:</div><div class='add'>+	case CXGB4_STATE_DETACH:</div><div class='add'>+		pr_info("%s: Down\n", pci_name(u_ctx-&gt;lldi.pdev));</div><div class='add'>+		mutex_lock(&amp;dev_mutex);</div><div class='add'>+		u_ctx-&gt;detach = true;</div><div class='add'>+		list_del(&amp;u_ctx-&gt;entry);</div><div class='add'>+		ch_ktls_reset_all_conn(u_ctx);</div><div class='add'>+		xa_destroy(&amp;u_ctx-&gt;tid_list);</div><div class='add'>+		mutex_unlock(&amp;dev_mutex);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cxgb4_uld_info chcr_ktls_uld_info = {</div><div class='add'>+	.name = CHCR_KTLS_DRV_MODULE_NAME,</div><div class='add'>+	.nrxq = 1,</div><div class='add'>+	.rxq_size = 1024,</div><div class='add'>+	.add = chcr_ktls_uld_add,</div><div class='add'>+	.tx_handler = chcr_ktls_xmit,</div><div class='add'>+	.rx_handler = chcr_ktls_uld_rx_handler,</div><div class='add'>+	.state_change = chcr_ktls_uld_state_change,</div><div class='add'>+	.tlsdev_ops = &amp;chcr_ktls_ops,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int __init chcr_ktls_init(void)</div><div class='add'>+{</div><div class='add'>+	cxgb4_register_uld(CXGB4_ULD_KTLS, &amp;chcr_ktls_uld_info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit chcr_ktls_exit(void)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx, *tmp;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+</div><div class='add'>+	pr_info("driver unloaded\n");</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;dev_mutex);</div><div class='add'>+	list_for_each_entry_safe(u_ctx, tmp, &amp;uld_ctx_list, entry) {</div><div class='add'>+		adap = pci_get_drvdata(u_ctx-&gt;lldi.pdev);</div><div class='add'>+		memset(&amp;adap-&gt;ch_ktls_stats, 0, sizeof(adap-&gt;ch_ktls_stats));</div><div class='add'>+		list_del(&amp;u_ctx-&gt;entry);</div><div class='add'>+		xa_destroy(&amp;u_ctx-&gt;tid_list);</div><div class='add'>+		kfree(u_ctx);</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;dev_mutex);</div><div class='add'>+	cxgb4_unregister_uld(CXGB4_ULD_KTLS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(chcr_ktls_init);</div><div class='add'>+module_exit(chcr_ktls_exit);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Chelsio NIC TLS ULD driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Chelsio Communications");</div><div class='add'>+MODULE_VERSION(CHCR_KTLS_DRV_VERSION);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h b/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h<br/>new file mode 100644<br/>index 000000000000..dbbba92bf540<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.h</a></div><div class='hunk'>@@ -0,0 +1,121 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright (C) 2020 Chelsio Communications.  All rights reserved. */</div><div class='add'>+</div><div class='add'>+#ifndef __CHCR_KTLS_H__</div><div class='add'>+#define __CHCR_KTLS_H__</div><div class='add'>+</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+#include "t4_msg.h"</div><div class='add'>+#include "t4_tcb.h"</div><div class='add'>+#include "l2t.h"</div><div class='add'>+#include "chcr_common.h"</div><div class='add'>+#include "cxgb4_uld.h"</div><div class='add'>+#include "clip_tbl.h"</div><div class='add'>+</div><div class='add'>+#define CHCR_KTLS_DRV_MODULE_NAME "ch_ktls"</div><div class='add'>+#define CHCR_KTLS_DRV_VERSION "1.0.0.0-ko"</div><div class='add'>+#define CHCR_KTLS_DRV_DESC "Chelsio NIC TLS ULD Driver"</div><div class='add'>+</div><div class='add'>+#define CHCR_TCB_STATE_CLOSED	0</div><div class='add'>+#define CHCR_KTLS_KEY_CTX_LEN	16</div><div class='add'>+#define CHCR_SET_TCB_FIELD_LEN	sizeof(struct cpl_set_tcb_field)</div><div class='add'>+#define CHCR_PLAIN_TX_DATA_LEN	(sizeof(struct fw_ulptx_wr) +\</div><div class='add'>+				 sizeof(struct ulp_txpkt) +\</div><div class='add'>+				 sizeof(struct ulptx_idata) +\</div><div class='add'>+				 sizeof(struct cpl_tx_data))</div><div class='add'>+</div><div class='add'>+#define CHCR_KTLS_WR_SIZE	(CHCR_PLAIN_TX_DATA_LEN +\</div><div class='add'>+				 sizeof(struct cpl_tx_sec_pdu))</div><div class='add'>+#define FALLBACK		35</div><div class='add'>+</div><div class='add'>+enum ch_ktls_open_state {</div><div class='add'>+	CH_KTLS_OPEN_SUCCESS = 0,</div><div class='add'>+	CH_KTLS_OPEN_PENDING = 1,</div><div class='add'>+	CH_KTLS_OPEN_FAILURE = 2,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_ktls_info {</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	spinlock_t lock; /* lock for pending_close */</div><div class='add'>+	struct ktls_key_ctx key_ctx;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct l2t_entry *l2te;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct completion completion;</div><div class='add'>+	u64 iv;</div><div class='add'>+	u64 record_no;</div><div class='add'>+	int tid;</div><div class='add'>+	int atid;</div><div class='add'>+	int rx_qid;</div><div class='add'>+	u32 iv_size;</div><div class='add'>+	u32 prev_seq;</div><div class='add'>+	u32 prev_ack;</div><div class='add'>+	u32 salt_size;</div><div class='add'>+	u32 key_ctx_len;</div><div class='add'>+	u32 scmd0_seqno_numivs;</div><div class='add'>+	u32 scmd0_ivgen_hdrlen;</div><div class='add'>+	u32 tcp_start_seq_number;</div><div class='add'>+	u32 scmd0_short_seqno_numivs;</div><div class='add'>+	u32 scmd0_short_ivgen_hdrlen;</div><div class='add'>+	u16 prev_win;</div><div class='add'>+	u8 tx_chan;</div><div class='add'>+	u8 smt_idx;</div><div class='add'>+	u8 port_id;</div><div class='add'>+	u8 ip_family;</div><div class='add'>+	u8 first_qset;</div><div class='add'>+	enum ch_ktls_open_state open_state;</div><div class='add'>+	bool pending_close;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_ktls_ctx_tx {</div><div class='add'>+	struct chcr_ktls_info *chcr_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chcr_ktls_uld_ctx {</div><div class='add'>+	struct list_head entry;</div><div class='add'>+	struct cxgb4_lld_info lldi;</div><div class='add'>+	struct xarray tid_list;</div><div class='add'>+	bool detach;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline struct chcr_ktls_info *</div><div class='add'>+__chcr_get_ktls_tx_info(struct tls_offload_context_tx *octx)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_ctx_tx *priv_ctx;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct chcr_ktls_ctx_tx) &gt; TLS_DRIVER_STATE_SIZE_TX);</div><div class='add'>+	priv_ctx = (struct chcr_ktls_ctx_tx *)octx-&gt;driver_state;</div><div class='add'>+	return priv_ctx-&gt;chcr_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct chcr_ktls_info *</div><div class='add'>+chcr_get_ktls_tx_info(struct tls_context *tls_ctx)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_ctx_tx *priv_ctx;</div><div class='add'>+</div><div class='add'>+	BUILD_BUG_ON(sizeof(struct chcr_ktls_ctx_tx) &gt; TLS_DRIVER_STATE_SIZE_TX);</div><div class='add'>+	priv_ctx = (struct chcr_ktls_ctx_tx *)__tls_driver_ctx(tls_ctx, TLS_OFFLOAD_CTX_DIR_TX);</div><div class='add'>+	return priv_ctx-&gt;chcr_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void</div><div class='add'>+chcr_set_ktls_tx_info(struct tls_context *tls_ctx, struct chcr_ktls_info *chcr_info)</div><div class='add'>+{</div><div class='add'>+	struct chcr_ktls_ctx_tx *priv_ctx;</div><div class='add'>+</div><div class='add'>+	priv_ctx = __tls_driver_ctx(tls_ctx, TLS_OFFLOAD_CTX_DIR_TX);</div><div class='add'>+	priv_ctx-&gt;chcr_info = chcr_info;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int chcr_get_first_rx_qid(struct adapter *adap)</div><div class='add'>+{</div><div class='add'>+	/* u_ctx is saved in adap, fetch it */</div><div class='add'>+	struct chcr_ktls_uld_ctx *u_ctx = adap-&gt;uld[CXGB4_ULD_KTLS].handle;</div><div class='add'>+</div><div class='add'>+	if (!u_ctx)</div><div class='add'>+		return -1;</div><div class='add'>+	return u_ctx-&gt;lldi.rxq_ids[0];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef int (*chcr_handler_func)(struct adapter *adap, unsigned char *input);</div><div class='add'>+#endif /* __CHCR_KTLS_H__ */</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile b/drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile<br/>new file mode 100644<br/>index 000000000000..bc11495acdb3<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/Makefile</a></div><div class='hunk'>@@ -0,0 +1,6 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ccflags-y := -I $(srctree)/drivers/net/ethernet/chelsio/cxgb4 \</div><div class='add'>+	     -I $(srctree)/drivers/crypto/chelsio</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_CRYPTO_DEV_CHELSIO_TLS) += chtls.o</div><div class='add'>+chtls-objs := chtls_main.o chtls_cm.o chtls_io.o chtls_hw.o</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h<br/>new file mode 100644<br/>index 000000000000..21e0dfeff158<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h</a></div><div class='hunk'>@@ -0,0 +1,584 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Chelsio Communications, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CHTLS_H__</div><div class='add'>+#define __CHTLS_H__</div><div class='add'>+</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+#include &lt;crypto/hash.h&gt;</div><div class='add'>+#include &lt;crypto/sha1.h&gt;</div><div class='add'>+#include &lt;crypto/sha2.h&gt;</div><div class='add'>+#include &lt;crypto/authenc.h&gt;</div><div class='add'>+#include &lt;crypto/ctr.h&gt;</div><div class='add'>+#include &lt;crypto/gf128mul.h&gt;</div><div class='add'>+#include &lt;crypto/internal/aead.h&gt;</div><div class='add'>+#include &lt;crypto/null.h&gt;</div><div class='add'>+#include &lt;crypto/internal/skcipher.h&gt;</div><div class='add'>+#include &lt;crypto/aead.h&gt;</div><div class='add'>+#include &lt;crypto/scatterwalk.h&gt;</div><div class='add'>+#include &lt;crypto/internal/hash.h&gt;</div><div class='add'>+#include &lt;linux/tls.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#include &lt;net/tls_prot.h&gt;</div><div class='add'>+#include &lt;net/tls_toe.h&gt;</div><div class='add'>+</div><div class='add'>+#include "t4fw_api.h"</div><div class='add'>+#include "t4_msg.h"</div><div class='add'>+#include "cxgb4.h"</div><div class='add'>+#include "cxgb4_uld.h"</div><div class='add'>+#include "l2t.h"</div><div class='add'>+#include "chcr_algo.h"</div><div class='add'>+#include "chcr_core.h"</div><div class='add'>+#include "chcr_crypto.h"</div><div class='add'>+</div><div class='add'>+#define CHTLS_DRV_VERSION "1.0.0.0-ko"</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXFLIT_CNT_S 24</div><div class='add'>+#define TLS_KEYCTX_RXFLIT_CNT_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXFLIT_CNT_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXPROT_VER_S 20</div><div class='add'>+#define TLS_KEYCTX_RXPROT_VER_M 0xf</div><div class='add'>+#define TLS_KEYCTX_RXPROT_VER_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXPROT_VER_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXCIPH_MODE_S 16</div><div class='add'>+#define TLS_KEYCTX_RXCIPH_MODE_M 0xf</div><div class='add'>+#define TLS_KEYCTX_RXCIPH_MODE_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXCIPH_MODE_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXAUTH_MODE_S 12</div><div class='add'>+#define TLS_KEYCTX_RXAUTH_MODE_M 0xf</div><div class='add'>+#define TLS_KEYCTX_RXAUTH_MODE_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXAUTH_MODE_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXCIAU_CTRL_S 11</div><div class='add'>+#define TLS_KEYCTX_RXCIAU_CTRL_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXCIAU_CTRL_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RX_SEQCTR_S 9</div><div class='add'>+#define TLS_KEYCTX_RX_SEQCTR_M 0x3</div><div class='add'>+#define TLS_KEYCTX_RX_SEQCTR_V(x) ((x) &lt;&lt; TLS_KEYCTX_RX_SEQCTR_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RX_VALID_S 8</div><div class='add'>+#define TLS_KEYCTX_RX_VALID_V(x) ((x) &lt;&lt; TLS_KEYCTX_RX_VALID_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXCK_SIZE_S 3</div><div class='add'>+#define TLS_KEYCTX_RXCK_SIZE_M 0x7</div><div class='add'>+#define TLS_KEYCTX_RXCK_SIZE_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXCK_SIZE_S)</div><div class='add'>+</div><div class='add'>+#define TLS_KEYCTX_RXMK_SIZE_S 0</div><div class='add'>+#define TLS_KEYCTX_RXMK_SIZE_M 0x7</div><div class='add'>+#define TLS_KEYCTX_RXMK_SIZE_V(x) ((x) &lt;&lt; TLS_KEYCTX_RXMK_SIZE_S)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_IV_S  55</div><div class='add'>+#define KEYCTX_TX_WR_IV_M  0x1ffULL</div><div class='add'>+#define KEYCTX_TX_WR_IV_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_IV_S)</div><div class='add'>+#define KEYCTX_TX_WR_IV_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_IV_S) &amp; KEYCTX_TX_WR_IV_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_AAD_S 47</div><div class='add'>+#define KEYCTX_TX_WR_AAD_M 0xffULL</div><div class='add'>+#define KEYCTX_TX_WR_AAD_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_AAD_S)</div><div class='add'>+#define KEYCTX_TX_WR_AAD_G(x) (((x) &gt;&gt; KEYCTX_TX_WR_AAD_S) &amp; \</div><div class='add'>+				KEYCTX_TX_WR_AAD_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_AADST_S 39</div><div class='add'>+#define KEYCTX_TX_WR_AADST_M 0xffULL</div><div class='add'>+#define KEYCTX_TX_WR_AADST_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_AADST_S)</div><div class='add'>+#define KEYCTX_TX_WR_AADST_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_AADST_S) &amp; KEYCTX_TX_WR_AADST_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_CIPHER_S 30</div><div class='add'>+#define KEYCTX_TX_WR_CIPHER_M 0x1ffULL</div><div class='add'>+#define KEYCTX_TX_WR_CIPHER_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_CIPHER_S)</div><div class='add'>+#define KEYCTX_TX_WR_CIPHER_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_CIPHER_S) &amp; KEYCTX_TX_WR_CIPHER_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_CIPHERST_S 23</div><div class='add'>+#define KEYCTX_TX_WR_CIPHERST_M 0x7f</div><div class='add'>+#define KEYCTX_TX_WR_CIPHERST_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_CIPHERST_S)</div><div class='add'>+#define KEYCTX_TX_WR_CIPHERST_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_CIPHERST_S) &amp; KEYCTX_TX_WR_CIPHERST_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_AUTH_S 14</div><div class='add'>+#define KEYCTX_TX_WR_AUTH_M 0x1ff</div><div class='add'>+#define KEYCTX_TX_WR_AUTH_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_AUTH_S)</div><div class='add'>+#define KEYCTX_TX_WR_AUTH_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_AUTH_S) &amp; KEYCTX_TX_WR_AUTH_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_AUTHST_S 7</div><div class='add'>+#define KEYCTX_TX_WR_AUTHST_M 0x7f</div><div class='add'>+#define KEYCTX_TX_WR_AUTHST_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_AUTHST_S)</div><div class='add'>+#define KEYCTX_TX_WR_AUTHST_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_AUTHST_S) &amp; KEYCTX_TX_WR_AUTHST_M)</div><div class='add'>+</div><div class='add'>+#define KEYCTX_TX_WR_AUTHIN_S 0</div><div class='add'>+#define KEYCTX_TX_WR_AUTHIN_M 0x7f</div><div class='add'>+#define KEYCTX_TX_WR_AUTHIN_V(x) ((x) &lt;&lt; KEYCTX_TX_WR_AUTHIN_S)</div><div class='add'>+#define KEYCTX_TX_WR_AUTHIN_G(x) \</div><div class='add'>+	(((x) &gt;&gt; KEYCTX_TX_WR_AUTHIN_S) &amp; KEYCTX_TX_WR_AUTHIN_M)</div><div class='add'>+</div><div class='add'>+struct sge_opaque_hdr {</div><div class='add'>+	void *dev;</div><div class='add'>+	dma_addr_t addr[MAX_SKB_FRAGS + 1];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define MAX_IVS_PAGE			256</div><div class='add'>+#define TLS_KEY_CONTEXT_SZ		64</div><div class='add'>+#define CIPHER_BLOCK_SIZE		16</div><div class='add'>+#define GCM_TAG_SIZE			16</div><div class='add'>+#define KEY_ON_MEM_SZ			16</div><div class='add'>+#define AEAD_EXPLICIT_DATA_SIZE		8</div><div class='add'>+#define TLS_HEADER_LENGTH		5</div><div class='add'>+#define SCMD_CIPH_MODE_AES_GCM		2</div><div class='add'>+/* Any MFS size should work and come from openssl */</div><div class='add'>+#define TLS_MFS				16384</div><div class='add'>+</div><div class='add'>+#define RSS_HDR sizeof(struct rss_header)</div><div class='add'>+#define TLS_WR_CPL_LEN \</div><div class='add'>+	(sizeof(struct fw_tlstx_data_wr) + sizeof(struct cpl_tx_tls_sfo))</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CHTLS_KEY_CONTEXT_DSGL,</div><div class='add'>+	CHTLS_KEY_CONTEXT_IMM,</div><div class='add'>+	CHTLS_KEY_CONTEXT_DDR,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CHTLS_LISTEN_START,</div><div class='add'>+	CHTLS_LISTEN_STOP,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Flags for return value of CPL message handlers */</div><div class='add'>+enum {</div><div class='add'>+	CPL_RET_BUF_DONE =    1,   /* buffer processing done */</div><div class='add'>+	CPL_RET_BAD_MSG =     2,   /* bad CPL message */</div><div class='add'>+	CPL_RET_UNKNOWN_TID = 4    /* unexpected unknown TID */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define LISTEN_INFO_HASH_SIZE 32</div><div class='add'>+#define RSPQ_HASH_BITS 5</div><div class='add'>+struct listen_info {</div><div class='add'>+	struct listen_info *next;  /* Link to next entry */</div><div class='add'>+	struct sock *sk;           /* The listening socket */</div><div class='add'>+	unsigned int stid;         /* The server TID */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	T4_LISTEN_START_PENDING,</div><div class='add'>+	T4_LISTEN_STARTED</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum csk_flags {</div><div class='add'>+	CSK_CALLBACKS_CHKD,	/* socket callbacks have been sanitized */</div><div class='add'>+	CSK_ABORT_REQ_RCVD,	/* received one ABORT_REQ_RSS message */</div><div class='add'>+	CSK_TX_MORE_DATA,	/* sending ULP data; don't set SHOVE bit */</div><div class='add'>+	CSK_TX_WAIT_IDLE,	/* suspend Tx until in-flight data is ACKed */</div><div class='add'>+	CSK_ABORT_SHUTDOWN,	/* shouldn't send more abort requests */</div><div class='add'>+	CSK_ABORT_RPL_PENDING,	/* expecting an abort reply */</div><div class='add'>+	CSK_CLOSE_CON_REQUESTED,/* we've sent a close_conn_req */</div><div class='add'>+	CSK_TX_DATA_SENT,	/* sent a TX_DATA WR on this connection */</div><div class='add'>+	CSK_TX_FAILOVER,	/* Tx traffic failing over */</div><div class='add'>+	CSK_UPDATE_RCV_WND,	/* Need to update rcv window */</div><div class='add'>+	CSK_RST_ABORTED,	/* outgoing RST was aborted */</div><div class='add'>+	CSK_TLS_HANDSHK,	/* TLS Handshake */</div><div class='add'>+	CSK_CONN_INLINE,	/* Connection on HW */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum chtls_cdev_state {</div><div class='add'>+	CHTLS_CDEV_STATE_UP = 1</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct listen_ctx {</div><div class='add'>+	struct sock *lsk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct sk_buff_head synq;</div><div class='add'>+	u32 state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct key_map {</div><div class='add'>+	unsigned long *addr;</div><div class='add'>+	unsigned int start;</div><div class='add'>+	unsigned int available;</div><div class='add'>+	unsigned int size;</div><div class='add'>+	spinlock_t lock; /* lock for key id request from map */</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct tls_scmd {</div><div class='add'>+	u32 seqno_numivs;</div><div class='add'>+	u32 ivgen_hdrlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chtls_dev {</div><div class='add'>+	struct tls_toe_device tlsdev;</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct cxgb4_lld_info *lldi;</div><div class='add'>+	struct pci_dev *pdev;</div><div class='add'>+	struct listen_info *listen_hash_tab[LISTEN_INFO_HASH_SIZE];</div><div class='add'>+	spinlock_t listen_lock; /* lock for listen list */</div><div class='add'>+	struct net_device **ports;</div><div class='add'>+	struct tid_info *tids;</div><div class='add'>+	unsigned int pfvf;</div><div class='add'>+	const unsigned short *mtus;</div><div class='add'>+</div><div class='add'>+	struct idr hwtid_idr;</div><div class='add'>+	struct idr stid_idr;</div><div class='add'>+</div><div class='add'>+	spinlock_t idr_lock ____cacheline_aligned_in_smp;</div><div class='add'>+</div><div class='add'>+	struct net_device *egr_dev[NCHAN * 2];</div><div class='add'>+	struct sk_buff *rspq_skb_cache[1 &lt;&lt; RSPQ_HASH_BITS];</div><div class='add'>+	struct sk_buff *askb;</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head deferq;</div><div class='add'>+	struct work_struct deferq_task;</div><div class='add'>+</div><div class='add'>+	struct list_head list_node;</div><div class='add'>+	struct list_head rcu_node;</div><div class='add'>+	struct list_head na_node;</div><div class='add'>+	unsigned int send_page_order;</div><div class='add'>+	int max_host_sndbuf;</div><div class='add'>+	u32 round_robin_cnt;</div><div class='add'>+	struct key_map kmap;</div><div class='add'>+	unsigned int cdev_state;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chtls_listen {</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chtls_hws {</div><div class='add'>+	struct sk_buff_head sk_recv_queue;</div><div class='add'>+	u8 txqid;</div><div class='add'>+	u8 ofld;</div><div class='add'>+	u16 type;</div><div class='add'>+	u16 rstate;</div><div class='add'>+	u16 keyrpl;</div><div class='add'>+	u16 pldlen;</div><div class='add'>+	u16 rcvpld;</div><div class='add'>+	u16 compute;</div><div class='add'>+	u16 expansion;</div><div class='add'>+	u16 keylen;</div><div class='add'>+	u16 pdus;</div><div class='add'>+	u16 adjustlen;</div><div class='add'>+	u16 ivsize;</div><div class='add'>+	u16 txleft;</div><div class='add'>+	u32 mfs;</div><div class='add'>+	s32 txkey;</div><div class='add'>+	s32 rxkey;</div><div class='add'>+	u32 fcplenmax;</div><div class='add'>+	u32 copied_seq;</div><div class='add'>+	u64 tx_seq_no;</div><div class='add'>+	struct tls_scmd scmd;</div><div class='add'>+	union {</div><div class='add'>+		struct tls12_crypto_info_aes_gcm_128 aes_gcm_128;</div><div class='add'>+		struct tls12_crypto_info_aes_gcm_256 aes_gcm_256;</div><div class='add'>+	} crypto_info;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct chtls_sock {</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct l2t_entry *l2t_entry;    /* pointer to the L2T entry */</div><div class='add'>+	struct net_device *egress_dev;  /* TX_CHAN for act open retry */</div><div class='add'>+</div><div class='add'>+	struct sk_buff_head txq;</div><div class='add'>+	struct sk_buff *wr_skb_head;</div><div class='add'>+	struct sk_buff *wr_skb_tail;</div><div class='add'>+	struct sk_buff *ctrl_skb_cache;</div><div class='add'>+	struct sk_buff *txdata_skb_cache; /* abort path messages */</div><div class='add'>+	struct kref kref;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+	u32 opt2;</div><div class='add'>+	u32 wr_credits;</div><div class='add'>+	u32 wr_unacked;</div><div class='add'>+	u32 wr_max_credits;</div><div class='add'>+	u32 wr_nondata;</div><div class='add'>+	u32 hwtid;               /* TCP Control Block ID */</div><div class='add'>+	u32 txq_idx;</div><div class='add'>+	u32 rss_qid;</div><div class='add'>+	u32 tid;</div><div class='add'>+	u32 idr;</div><div class='add'>+	u32 mss;</div><div class='add'>+	u32 ulp_mode;</div><div class='add'>+	u32 tx_chan;</div><div class='add'>+	u32 rx_chan;</div><div class='add'>+	u32 sndbuf;</div><div class='add'>+	u32 txplen_max;</div><div class='add'>+	u32 mtu_idx;           /* MTU table index */</div><div class='add'>+	u32 smac_idx;</div><div class='add'>+	u8 port_id;</div><div class='add'>+	u8 tos;</div><div class='add'>+	u16 resv2;</div><div class='add'>+	u32 delack_mode;</div><div class='add'>+	u32 delack_seq;</div><div class='add'>+	u32 snd_win;</div><div class='add'>+	u32 rcv_win;</div><div class='add'>+</div><div class='add'>+	void *passive_reap_next;        /* placeholder for passive */</div><div class='add'>+	struct chtls_hws tlshws;</div><div class='add'>+	struct synq {</div><div class='add'>+		struct sk_buff *next;</div><div class='add'>+		struct sk_buff *prev;</div><div class='add'>+	} synq;</div><div class='add'>+	struct listen_ctx *listen_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tls_hdr {</div><div class='add'>+	u8  type;</div><div class='add'>+	u16 version;</div><div class='add'>+	u16 length;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+struct tlsrx_cmp_hdr {</div><div class='add'>+	u8  type;</div><div class='add'>+	u16 version;</div><div class='add'>+	u16 length;</div><div class='add'>+</div><div class='add'>+	u64 tls_seq;</div><div class='add'>+	u16 reserved1;</div><div class='add'>+	u8  res_to_mac_error;</div><div class='add'>+} __packed;</div><div class='add'>+</div><div class='add'>+/* res_to_mac_error fields */</div><div class='add'>+#define TLSRX_HDR_PKT_INT_ERROR_S   4</div><div class='add'>+#define TLSRX_HDR_PKT_INT_ERROR_M   0x1</div><div class='add'>+#define TLSRX_HDR_PKT_INT_ERROR_V(x) \</div><div class='add'>+	((x) &lt;&lt; TLSRX_HDR_PKT_INT_ERROR_S)</div><div class='add'>+#define TLSRX_HDR_PKT_INT_ERROR_G(x) \</div><div class='add'>+	(((x) &gt;&gt; TLSRX_HDR_PKT_INT_ERROR_S) &amp; TLSRX_HDR_PKT_INT_ERROR_M)</div><div class='add'>+#define TLSRX_HDR_PKT_INT_ERROR_F   TLSRX_HDR_PKT_INT_ERROR_V(1U)</div><div class='add'>+</div><div class='add'>+#define TLSRX_HDR_PKT_SPP_ERROR_S        3</div><div class='add'>+#define TLSRX_HDR_PKT_SPP_ERROR_M        0x1</div><div class='add'>+#define TLSRX_HDR_PKT_SPP_ERROR_V(x)     ((x) &lt;&lt; TLSRX_HDR_PKT_SPP_ERROR)</div><div class='add'>+#define TLSRX_HDR_PKT_SPP_ERROR_G(x)     \</div><div class='add'>+	(((x) &gt;&gt; TLSRX_HDR_PKT_SPP_ERROR_S) &amp; TLSRX_HDR_PKT_SPP_ERROR_M)</div><div class='add'>+#define TLSRX_HDR_PKT_SPP_ERROR_F        TLSRX_HDR_PKT_SPP_ERROR_V(1U)</div><div class='add'>+</div><div class='add'>+#define TLSRX_HDR_PKT_CCDX_ERROR_S       2</div><div class='add'>+#define TLSRX_HDR_PKT_CCDX_ERROR_M       0x1</div><div class='add'>+#define TLSRX_HDR_PKT_CCDX_ERROR_V(x)    ((x) &lt;&lt; TLSRX_HDR_PKT_CCDX_ERROR_S)</div><div class='add'>+#define TLSRX_HDR_PKT_CCDX_ERROR_G(x)    \</div><div class='add'>+	(((x) &gt;&gt; TLSRX_HDR_PKT_CCDX_ERROR_S) &amp; TLSRX_HDR_PKT_CCDX_ERROR_M)</div><div class='add'>+#define TLSRX_HDR_PKT_CCDX_ERROR_F       TLSRX_HDR_PKT_CCDX_ERROR_V(1U)</div><div class='add'>+</div><div class='add'>+#define TLSRX_HDR_PKT_PAD_ERROR_S        1</div><div class='add'>+#define TLSRX_HDR_PKT_PAD_ERROR_M        0x1</div><div class='add'>+#define TLSRX_HDR_PKT_PAD_ERROR_V(x)     ((x) &lt;&lt; TLSRX_HDR_PKT_PAD_ERROR_S)</div><div class='add'>+#define TLSRX_HDR_PKT_PAD_ERROR_G(x)     \</div><div class='add'>+	(((x) &gt;&gt; TLSRX_HDR_PKT_PAD_ERROR_S) &amp; TLSRX_HDR_PKT_PAD_ERROR_M)</div><div class='add'>+#define TLSRX_HDR_PKT_PAD_ERROR_F        TLSRX_HDR_PKT_PAD_ERROR_V(1U)</div><div class='add'>+</div><div class='add'>+#define TLSRX_HDR_PKT_MAC_ERROR_S        0</div><div class='add'>+#define TLSRX_HDR_PKT_MAC_ERROR_M        0x1</div><div class='add'>+#define TLSRX_HDR_PKT_MAC_ERROR_V(x)     ((x) &lt;&lt; TLSRX_HDR_PKT_MAC_ERROR)</div><div class='add'>+#define TLSRX_HDR_PKT_MAC_ERROR_G(x)     \</div><div class='add'>+	(((x) &gt;&gt; S_TLSRX_HDR_PKT_MAC_ERROR_S) &amp; TLSRX_HDR_PKT_MAC_ERROR_M)</div><div class='add'>+#define TLSRX_HDR_PKT_MAC_ERROR_F        TLSRX_HDR_PKT_MAC_ERROR_V(1U)</div><div class='add'>+</div><div class='add'>+#define TLSRX_HDR_PKT_ERROR_M           0x1F</div><div class='add'>+#define CONTENT_TYPE_ERROR		0x7F</div><div class='add'>+</div><div class='add'>+struct ulp_mem_rw {</div><div class='add'>+	__be32 cmd;</div><div class='add'>+	__be32 len16;             /* command length */</div><div class='add'>+	__be32 dlen;              /* data length in 32-byte units */</div><div class='add'>+	__be32 lock_addr;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tls_key_wr {</div><div class='add'>+	__be32 op_to_compl;</div><div class='add'>+	__be32 flowid_len16;</div><div class='add'>+	__be32 ftid;</div><div class='add'>+	u8   reneg_to_write_rx;</div><div class='add'>+	u8   protocol;</div><div class='add'>+	__be16 mfs;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tls_key_req {</div><div class='add'>+	struct tls_key_wr wr;</div><div class='add'>+	struct ulp_mem_rw req;</div><div class='add'>+	struct ulptx_idata sc_imm;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This lives in skb-&gt;cb and is used to chain WRs in a linked list.</div><div class='add'>+ */</div><div class='add'>+struct wr_skb_cb {</div><div class='add'>+	struct l2t_skb_cb l2t;          /* reserve space for l2t CB */</div><div class='add'>+	struct sk_buff *next_wr;        /* next write request */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Per-skb backlog handler.  Run when a socket's backlog is processed. */</div><div class='add'>+struct blog_skb_cb {</div><div class='add'>+	void (*backlog_rcv)(struct sock *sk, struct sk_buff *skb);</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Similar to tcp_skb_cb but with ULP elements added to support TLS,</div><div class='add'>+ * etc.</div><div class='add'>+ */</div><div class='add'>+struct ulp_skb_cb {</div><div class='add'>+	struct wr_skb_cb wr;		/* reserve space for write request */</div><div class='add'>+	u16 flags;			/* TCP-like flags */</div><div class='add'>+	u8 psh;</div><div class='add'>+	u8 ulp_mode;			/* ULP mode/submode of sk_buff */</div><div class='add'>+	u32 seq;			/* TCP sequence number */</div><div class='add'>+	union { /* ULP-specific fields */</div><div class='add'>+		struct {</div><div class='add'>+			u8  type;</div><div class='add'>+			u8  ofld;</div><div class='add'>+			u8  iv;</div><div class='add'>+		} tls;</div><div class='add'>+	} ulp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define ULP_SKB_CB(skb) ((struct ulp_skb_cb *)&amp;((skb)-&gt;cb[0]))</div><div class='add'>+#define BLOG_SKB_CB(skb) ((struct blog_skb_cb *)(skb)-&gt;cb)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Flags for ulp_skb_cb.flags.</div><div class='add'>+ */</div><div class='add'>+enum {</div><div class='add'>+	ULPCB_FLAG_NEED_HDR  = 1 &lt;&lt; 0,	/* packet needs a TX_DATA_WR header */</div><div class='add'>+	ULPCB_FLAG_NO_APPEND = 1 &lt;&lt; 1,	/* don't grow this skb */</div><div class='add'>+	ULPCB_FLAG_BARRIER   = 1 &lt;&lt; 2,	/* set TX_WAIT_IDLE after sending */</div><div class='add'>+	ULPCB_FLAG_HOLD      = 1 &lt;&lt; 3,	/* skb not ready for Tx yet */</div><div class='add'>+	ULPCB_FLAG_COMPL     = 1 &lt;&lt; 4,	/* request WR completion */</div><div class='add'>+	ULPCB_FLAG_URG       = 1 &lt;&lt; 5,	/* urgent data */</div><div class='add'>+	ULPCB_FLAG_TLS_HDR   = 1 &lt;&lt; 6,  /* payload with tls hdr */</div><div class='add'>+	ULPCB_FLAG_NO_HDR    = 1 &lt;&lt; 7,  /* not a ofld wr */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* The ULP mode/submode of an skbuff */</div><div class='add'>+#define skb_ulp_mode(skb)  (ULP_SKB_CB(skb)-&gt;ulp_mode)</div><div class='add'>+#define TCP_PAGE(sk)   (sk-&gt;sk_frag.page)</div><div class='add'>+#define TCP_OFF(sk)    (sk-&gt;sk_frag.offset)</div><div class='add'>+</div><div class='add'>+static inline struct chtls_dev *to_chtls_dev(struct tls_toe_device *tlsdev)</div><div class='add'>+{</div><div class='add'>+	return container_of(tlsdev, struct chtls_dev, tlsdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void csk_set_flag(struct chtls_sock *csk,</div><div class='add'>+				enum csk_flags flag)</div><div class='add'>+{</div><div class='add'>+	__set_bit(flag, &amp;csk-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void csk_reset_flag(struct chtls_sock *csk,</div><div class='add'>+				  enum csk_flags flag)</div><div class='add'>+{</div><div class='add'>+	__clear_bit(flag, &amp;csk-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool csk_conn_inline(const struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	return test_bit(CSK_CONN_INLINE, &amp;csk-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int csk_flag(const struct sock *sk, enum csk_flags flag)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (!csk_conn_inline(csk))</div><div class='add'>+		return 0;</div><div class='add'>+	return test_bit(flag, &amp;csk-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int csk_flag_nochk(const struct chtls_sock *csk,</div><div class='add'>+				 enum csk_flags flag)</div><div class='add'>+{</div><div class='add'>+	return test_bit(flag, &amp;csk-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void *cplhdr(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline int is_neg_adv(unsigned int status)</div><div class='add'>+{</div><div class='add'>+	return status == CPL_ERR_RTX_NEG_ADVICE ||</div><div class='add'>+	       status == CPL_ERR_KEEPALV_NEG_ADVICE ||</div><div class='add'>+	       status == CPL_ERR_PERSIST_NEG_ADVICE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void process_cpl_msg(void (*fn)(struct sock *, struct sk_buff *),</div><div class='add'>+				   struct sock *sk,</div><div class='add'>+				   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+</div><div class='add'>+	bh_lock_sock(sk);</div><div class='add'>+	if (unlikely(sock_owned_by_user(sk))) {</div><div class='add'>+		BLOG_SKB_CB(skb)-&gt;backlog_rcv = fn;</div><div class='add'>+		__sk_add_backlog(sk, skb);</div><div class='add'>+	} else {</div><div class='add'>+		fn(sk, skb);</div><div class='add'>+	}</div><div class='add'>+	bh_unlock_sock(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_sock_free(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = container_of(ref, struct chtls_sock,</div><div class='add'>+					      kref);</div><div class='add'>+	kfree(csk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __chtls_sock_put(const char *fn, struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	kref_put(&amp;csk-&gt;kref, chtls_sock_free);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void __chtls_sock_get(const char *fn,</div><div class='add'>+				    struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	kref_get(&amp;csk-&gt;kref);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void send_or_defer(struct sock *sk, struct tcp_sock *tp,</div><div class='add'>+				 struct sk_buff *skb, int through_l2t)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (through_l2t) {</div><div class='add'>+		/* send through L2T */</div><div class='add'>+		cxgb4_l2t_send(csk-&gt;egress_dev, skb, csk-&gt;l2t_entry);</div><div class='add'>+	} else {</div><div class='add'>+		/* send directly */</div><div class='add'>+		cxgb4_ofld_send(csk-&gt;egress_dev, skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+typedef int (*chtls_handler_func)(struct chtls_dev *, struct sk_buff *);</div><div class='add'>+extern chtls_handler_func chtls_handlers[NUM_CPL_CMDS];</div><div class='add'>+void chtls_install_cpl_ops(struct sock *sk);</div><div class='add'>+int chtls_init_kmap(struct chtls_dev *cdev, struct cxgb4_lld_info *lldi);</div><div class='add'>+void chtls_listen_stop(struct chtls_dev *cdev, struct sock *sk);</div><div class='add'>+int chtls_listen_start(struct chtls_dev *cdev, struct sock *sk);</div><div class='add'>+void chtls_close(struct sock *sk, long timeout);</div><div class='add'>+int chtls_disconnect(struct sock *sk, int flags);</div><div class='add'>+void chtls_shutdown(struct sock *sk, int how);</div><div class='add'>+void chtls_destroy_sock(struct sock *sk);</div><div class='add'>+int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);</div><div class='add'>+int chtls_recvmsg(struct sock *sk, struct msghdr *msg,</div><div class='add'>+		  size_t len, int flags, int *addr_len);</div><div class='add'>+void chtls_splice_eof(struct socket *sock);</div><div class='add'>+int send_tx_flowc_wr(struct sock *sk, int compl,</div><div class='add'>+		     u32 snd_nxt, u32 rcv_nxt);</div><div class='add'>+void chtls_tcp_push(struct sock *sk, int flags);</div><div class='add'>+int chtls_push_frames(struct chtls_sock *csk, int comp);</div><div class='add'>+void chtls_set_tcb_field_rpl_skb(struct sock *sk, u16 word,</div><div class='add'>+				 u64 mask, u64 val, u8 cookie,</div><div class='add'>+				 int through_l2t);</div><div class='add'>+int chtls_setkey(struct chtls_sock *csk, u32 keylen, u32 mode, int cipher_type);</div><div class='add'>+void chtls_set_quiesce_ctrl(struct sock *sk, int val);</div><div class='add'>+void skb_entail(struct sock *sk, struct sk_buff *skb, int flags);</div><div class='add'>+unsigned int keyid_to_addr(int start_addr, int keyid);</div><div class='add'>+void free_tls_keyid(struct sock *sk);</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c<br/>new file mode 100644<br/>index 000000000000..ee0154337a9c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c</a></div><div class='hunk'>@@ -0,0 +1,2336 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Chelsio Communications, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Written by: Atul Gupta (atul.gupta@chelsio.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;linux/kallsyms.h&gt;</div><div class='add'>+#include &lt;linux/kprobes.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/transp_v6.h&gt;</div><div class='add'>+#include &lt;net/ip6_route.h&gt;</div><div class='add'>+#include &lt;net/inet_common.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/dst.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+#include &lt;net/addrconf.h&gt;</div><div class='add'>+#include &lt;net/secure_seq.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chtls.h"</div><div class='add'>+#include "chtls_cm.h"</div><div class='add'>+#include "clip_tbl.h"</div><div class='add'>+#include "t4_tcb.h"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * State transitions and actions for close.  Note that if we are in SYN_SENT</div><div class='add'>+ * we remain in that state as we cannot control a connection while it's in</div><div class='add'>+ * SYN_SENT; such connections are allowed to establish and are then aborted.</div><div class='add'>+ */</div><div class='add'>+static unsigned char new_state[16] = {</div><div class='add'>+	/* current state:     new state:      action: */</div><div class='add'>+	/* (Invalid)       */ TCP_CLOSE,</div><div class='add'>+	/* TCP_ESTABLISHED */ TCP_FIN_WAIT1 | TCP_ACTION_FIN,</div><div class='add'>+	/* TCP_SYN_SENT    */ TCP_SYN_SENT,</div><div class='add'>+	/* TCP_SYN_RECV    */ TCP_FIN_WAIT1 | TCP_ACTION_FIN,</div><div class='add'>+	/* TCP_FIN_WAIT1   */ TCP_FIN_WAIT1,</div><div class='add'>+	/* TCP_FIN_WAIT2   */ TCP_FIN_WAIT2,</div><div class='add'>+	/* TCP_TIME_WAIT   */ TCP_CLOSE,</div><div class='add'>+	/* TCP_CLOSE       */ TCP_CLOSE,</div><div class='add'>+	/* TCP_CLOSE_WAIT  */ TCP_LAST_ACK | TCP_ACTION_FIN,</div><div class='add'>+	/* TCP_LAST_ACK    */ TCP_LAST_ACK,</div><div class='add'>+	/* TCP_LISTEN      */ TCP_CLOSE,</div><div class='add'>+	/* TCP_CLOSING     */ TCP_CLOSING,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct chtls_sock *chtls_sock_create(struct chtls_dev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = kzalloc(sizeof(*csk), GFP_ATOMIC);</div><div class='add'>+</div><div class='add'>+	if (!csk)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	csk-&gt;txdata_skb_cache = alloc_skb(TXDATA_SKB_LEN, GFP_ATOMIC);</div><div class='add'>+	if (!csk-&gt;txdata_skb_cache) {</div><div class='add'>+		kfree(csk);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kref_init(&amp;csk-&gt;kref);</div><div class='add'>+	csk-&gt;cdev = cdev;</div><div class='add'>+	skb_queue_head_init(&amp;csk-&gt;txq);</div><div class='add'>+	csk-&gt;wr_skb_head = NULL;</div><div class='add'>+	csk-&gt;wr_skb_tail = NULL;</div><div class='add'>+	csk-&gt;mss = MAX_MSS;</div><div class='add'>+	csk-&gt;tlshws.ofld = 1;</div><div class='add'>+	csk-&gt;tlshws.txkey = -1;</div><div class='add'>+	csk-&gt;tlshws.rxkey = -1;</div><div class='add'>+	csk-&gt;tlshws.mfs = TLS_MFS;</div><div class='add'>+	skb_queue_head_init(&amp;csk-&gt;tlshws.sk_recv_queue);</div><div class='add'>+	return csk;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_sock_release(struct kref *ref)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk =</div><div class='add'>+		container_of(ref, struct chtls_sock, kref);</div><div class='add'>+</div><div class='add'>+	kfree(csk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct net_device *chtls_find_netdev(struct chtls_dev *cdev,</div><div class='add'>+					    struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = pci_get_drvdata(cdev-&gt;pdev);</div><div class='add'>+	struct net_device *ndev = cdev-&gt;ports[0];</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	struct net_device *temp;</div><div class='add'>+	int addr_type;</div><div class='add'>+#endif</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (sk-&gt;sk_family) {</div><div class='add'>+	case PF_INET:</div><div class='add'>+		if (likely(!inet_sk(sk)-&gt;inet_rcv_saddr))</div><div class='add'>+			return ndev;</div><div class='add'>+		ndev = __ip_dev_find(&amp;init_net, inet_sk(sk)-&gt;inet_rcv_saddr, false);</div><div class='add'>+		break;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	case PF_INET6:</div><div class='add'>+		addr_type = ipv6_addr_type(&amp;sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+		if (likely(addr_type == IPV6_ADDR_ANY))</div><div class='add'>+			return ndev;</div><div class='add'>+</div><div class='add'>+		for_each_netdev_rcu(&amp;init_net, temp) {</div><div class='add'>+			if (ipv6_chk_addr(&amp;init_net, (struct in6_addr *)</div><div class='add'>+					  &amp;sk-&gt;sk_v6_rcv_saddr, temp, 1)) {</div><div class='add'>+				ndev = temp;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	break;</div><div class='add'>+#endif</div><div class='add'>+	default:</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	if (is_vlan_dev(ndev))</div><div class='add'>+		ndev = vlan_dev_real_dev(ndev);</div><div class='add'>+</div><div class='add'>+	for_each_port(adap, i)</div><div class='add'>+		if (cdev-&gt;ports[i] == ndev)</div><div class='add'>+			return ndev;</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void assign_rxopt(struct sock *sk, unsigned int opt)</div><div class='add'>+{</div><div class='add'>+	const struct chtls_dev *cdev;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+	tp-&gt;tcp_header_len           = sizeof(struct tcphdr);</div><div class='add'>+	tp-&gt;rx_opt.mss_clamp         = cdev-&gt;mtus[TCPOPT_MSS_G(opt)] - 40;</div><div class='add'>+	tp-&gt;mss_cache                = tp-&gt;rx_opt.mss_clamp;</div><div class='add'>+	tp-&gt;rx_opt.tstamp_ok         = TCPOPT_TSTAMP_G(opt);</div><div class='add'>+	tp-&gt;rx_opt.snd_wscale        = TCPOPT_SACK_G(opt);</div><div class='add'>+	tp-&gt;rx_opt.wscale_ok         = TCPOPT_WSCALE_OK_G(opt);</div><div class='add'>+	SND_WSCALE(tp)               = TCPOPT_SND_WSCALE_G(opt);</div><div class='add'>+	if (!tp-&gt;rx_opt.wscale_ok)</div><div class='add'>+		tp-&gt;rx_opt.rcv_wscale = 0;</div><div class='add'>+	if (tp-&gt;rx_opt.tstamp_ok) {</div><div class='add'>+		tp-&gt;tcp_header_len += TCPOLEN_TSTAMP_ALIGNED;</div><div class='add'>+		tp-&gt;rx_opt.mss_clamp -= TCPOLEN_TSTAMP_ALIGNED;</div><div class='add'>+	} else if (csk-&gt;opt2 &amp; TSTAMPS_EN_F) {</div><div class='add'>+		csk-&gt;opt2 &amp;= ~TSTAMPS_EN_F;</div><div class='add'>+		csk-&gt;mtu_idx = TCPOPT_MSS_G(opt);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_purge_receive_queue(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;sk-&gt;sk_receive_queue)) != NULL) {</div><div class='add'>+		skb_dstref_steal(skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_purge_write_queue(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;csk-&gt;txq))) {</div><div class='add'>+		sk-&gt;sk_wmem_queued -= skb-&gt;truesize;</div><div class='add'>+		__kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_purge_recv_queue(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct chtls_hws *tlsk = &amp;csk-&gt;tlshws;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;tlsk-&gt;sk_recv_queue)) != NULL) {</div><div class='add'>+		skb_dstref_steal(skb);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void abort_arp_failure(void *handle, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_abort_req *req = cplhdr(skb);</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+</div><div class='add'>+	cdev = (struct chtls_dev *)handle;</div><div class='add'>+	req-&gt;cmd = CPL_ABORT_NO_RST;</div><div class='add'>+	cxgb4_ofld_send(cdev-&gt;lldi-&gt;ports[0], skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *alloc_ctrl_skb(struct sk_buff *skb, int len)</div><div class='add'>+{</div><div class='add'>+	if (likely(skb &amp;&amp; !skb_shared(skb) &amp;&amp; !skb_cloned(skb))) {</div><div class='add'>+		__skb_trim(skb, 0);</div><div class='add'>+		refcount_inc(&amp;skb-&gt;users);</div><div class='add'>+	} else {</div><div class='add'>+		skb = alloc_skb(len, GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_send_abort(struct sock *sk, int mode, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_abort_req *req;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (!skb)</div><div class='add'>+		skb = alloc_ctrl_skb(csk-&gt;txdata_skb_cache, sizeof(*req));</div><div class='add'>+</div><div class='add'>+	req = (struct cpl_abort_req *)skb_put(skb, sizeof(*req));</div><div class='add'>+	INIT_TP_WR_CPL(req, CPL_ABORT_REQ, csk-&gt;tid);</div><div class='add'>+	skb_set_queue_mapping(skb, (csk-&gt;txq_idx &lt;&lt; 1) | CPL_PRIORITY_DATA);</div><div class='add'>+	req-&gt;rsvd0 = htonl(tp-&gt;snd_nxt);</div><div class='add'>+	req-&gt;rsvd1 = !csk_flag_nochk(csk, CSK_TX_DATA_SENT);</div><div class='add'>+	req-&gt;cmd = mode;</div><div class='add'>+	t4_set_arp_err_handler(skb, csk-&gt;cdev, abort_arp_failure);</div><div class='add'>+	send_or_defer(sk, tp, skb, mode == CPL_ABORT_SEND_RST);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_send_reset(struct sock *sk, int mode, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(csk_flag_nochk(csk, CSK_ABORT_SHUTDOWN) ||</div><div class='add'>+		     !csk-&gt;cdev)) {</div><div class='add'>+		if (sk-&gt;sk_state == TCP_SYN_RECV)</div><div class='add'>+			csk_set_flag(csk, CSK_RST_ABORTED);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!csk_flag_nochk(csk, CSK_TX_DATA_SENT)) {</div><div class='add'>+		struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+		if (send_tx_flowc_wr(sk, 0, tp-&gt;snd_nxt, tp-&gt;rcv_nxt) &lt; 0)</div><div class='add'>+			WARN_ONCE(1, "send tx flowc error");</div><div class='add'>+		csk_set_flag(csk, CSK_TX_DATA_SENT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	csk_set_flag(csk, CSK_ABORT_RPL_PENDING);</div><div class='add'>+	chtls_purge_write_queue(sk);</div><div class='add'>+</div><div class='add'>+	csk_set_flag(csk, CSK_ABORT_SHUTDOWN);</div><div class='add'>+	if (sk-&gt;sk_state != TCP_SYN_RECV)</div><div class='add'>+		chtls_send_abort(sk, mode, skb);</div><div class='add'>+	else</div><div class='add'>+		chtls_set_tcb_field_rpl_skb(sk, TCB_T_FLAGS_W,</div><div class='add'>+					    TCB_T_FLAGS_V(TCB_T_FLAGS_M), 0,</div><div class='add'>+					    TCB_FIELD_COOKIE_TFLAG, 1);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void release_tcp_port(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (inet_csk(sk)-&gt;icsk_bind_hash)</div><div class='add'>+		inet_put_port(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tcp_uncork(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;nonagle &amp; TCP_NAGLE_CORK) {</div><div class='add'>+		tp-&gt;nonagle &amp;= ~TCP_NAGLE_CORK;</div><div class='add'>+		chtls_tcp_push(sk, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_close_conn(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct cpl_close_con_req *req;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int tid;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	len = roundup(sizeof(struct cpl_close_con_req), 16);</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tid = csk-&gt;tid;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(len, GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+	req = (struct cpl_close_con_req *)__skb_put(skb, len);</div><div class='add'>+	memset(req, 0, len);</div><div class='add'>+	req-&gt;wr.wr_hi = htonl(FW_WR_OP_V(FW_TP_WR) |</div><div class='add'>+			      FW_WR_IMMDLEN_V(sizeof(*req) -</div><div class='add'>+					      sizeof(req-&gt;wr)));</div><div class='add'>+	req-&gt;wr.wr_mid = htonl(FW_WR_LEN16_V(DIV_ROUND_UP(sizeof(*req), 16)) |</div><div class='add'>+			       FW_WR_FLOWID_V(tid));</div><div class='add'>+</div><div class='add'>+	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_CLOSE_CON_REQ, tid));</div><div class='add'>+</div><div class='add'>+	tcp_uncork(sk);</div><div class='add'>+	skb_entail(sk, skb, ULPCB_FLAG_NO_HDR | ULPCB_FLAG_NO_APPEND);</div><div class='add'>+	if (sk-&gt;sk_state != TCP_SYN_SENT)</div><div class='add'>+		chtls_push_frames(csk, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Perform a state transition during close and return the actions indicated</div><div class='add'>+ * for the transition.  Do not make this function inline, the main reason</div><div class='add'>+ * it exists at all is to avoid multiple inlining of tcp_set_state.</div><div class='add'>+ */</div><div class='add'>+static int make_close_transition(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	int next = (int)new_state[sk-&gt;sk_state];</div><div class='add'>+</div><div class='add'>+	tcp_set_state(sk, next &amp; TCP_STATE_MASK);</div><div class='add'>+	return next &amp; TCP_ACTION_FIN;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_close(struct sock *sk, long timeout)</div><div class='add'>+{</div><div class='add'>+	int data_lost, prev_state;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	sk-&gt;sk_shutdown |= SHUTDOWN_MASK;</div><div class='add'>+</div><div class='add'>+	data_lost = skb_queue_len(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	data_lost |= skb_queue_len(&amp;csk-&gt;tlshws.sk_recv_queue);</div><div class='add'>+	chtls_purge_recv_queue(sk);</div><div class='add'>+	chtls_purge_receive_queue(sk);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='add'>+		goto wait;</div><div class='add'>+	} else if (data_lost || sk-&gt;sk_state == TCP_SYN_SENT) {</div><div class='add'>+		chtls_send_reset(sk, CPL_ABORT_SEND_RST, NULL);</div><div class='add'>+		release_tcp_port(sk);</div><div class='add'>+		goto unlock;</div><div class='add'>+	} else if (sock_flag(sk, SOCK_LINGER) &amp;&amp; !sk-&gt;sk_lingertime) {</div><div class='add'>+		sk-&gt;sk_prot-&gt;disconnect(sk, 0);</div><div class='add'>+	} else if (make_close_transition(sk)) {</div><div class='add'>+		chtls_close_conn(sk);</div><div class='add'>+	}</div><div class='add'>+wait:</div><div class='add'>+	if (timeout)</div><div class='add'>+		sk_stream_wait_close(sk, timeout);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	prev_state = sk-&gt;sk_state;</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	sock_orphan(sk);</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	bh_lock_sock(sk);</div><div class='add'>+</div><div class='add'>+	if (prev_state != TCP_CLOSE &amp;&amp; sk-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_FIN_WAIT2 &amp;&amp; tcp_sk(sk)-&gt;linger2 &lt; 0 &amp;&amp;</div><div class='add'>+	    !csk_flag(sk, CSK_ABORT_SHUTDOWN)) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+		skb = alloc_skb(sizeof(struct cpl_abort_req), GFP_ATOMIC);</div><div class='add'>+		if (skb)</div><div class='add'>+			chtls_send_reset(sk, CPL_ABORT_SEND_RST, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+		inet_csk_destroy_sock(sk);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	bh_unlock_sock(sk);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+	sock_put(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Wait until a socket enters on of the given states.</div><div class='add'>+ */</div><div class='add'>+static int wait_for_states(struct sock *sk, unsigned int states)</div><div class='add'>+{</div><div class='add'>+	DECLARE_WAITQUEUE(wait, current);</div><div class='add'>+	struct socket_wq _sk_wq;</div><div class='add'>+	long current_timeo;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	current_timeo = 200;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * We want this to work even when there's no associated struct socket.</div><div class='add'>+	 * In that case we provide a temporary wait_queue_head_t.</div><div class='add'>+	 */</div><div class='add'>+	if (!sk-&gt;sk_wq) {</div><div class='add'>+		init_waitqueue_head(&amp;_sk_wq.wait);</div><div class='add'>+		_sk_wq.fasync_list = NULL;</div><div class='add'>+		init_rcu_head_on_stack(&amp;_sk_wq.rcu);</div><div class='add'>+		RCU_INIT_POINTER(sk-&gt;sk_wq, &amp;_sk_wq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	while (!sk_in_state(sk, states)) {</div><div class='add'>+		if (!current_timeo) {</div><div class='add'>+			err = -EBUSY;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			err = sock_intr_errno(current_timeo);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		set_current_state(TASK_UNINTERRUPTIBLE);</div><div class='add'>+		release_sock(sk);</div><div class='add'>+		if (!sk_in_state(sk, states))</div><div class='add'>+			current_timeo = schedule_timeout(current_timeo);</div><div class='add'>+		__set_current_state(TASK_RUNNING);</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+	}</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+</div><div class='add'>+	if (rcu_dereference(sk-&gt;sk_wq) == &amp;_sk_wq)</div><div class='add'>+		sk-&gt;sk_wq = NULL;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int chtls_disconnect(struct sock *sk, int flags)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+	chtls_purge_recv_queue(sk);</div><div class='add'>+	chtls_purge_receive_queue(sk);</div><div class='add'>+	chtls_purge_write_queue(sk);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != TCP_CLOSE) {</div><div class='add'>+		sk-&gt;sk_err = ECONNRESET;</div><div class='add'>+		chtls_send_reset(sk, CPL_ABORT_SEND_RST, NULL);</div><div class='add'>+		err = wait_for_states(sk, TCPF_CLOSE);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+	chtls_purge_recv_queue(sk);</div><div class='add'>+	chtls_purge_receive_queue(sk);</div><div class='add'>+	tp-&gt;max_window = 0xFFFF &lt;&lt; (tp-&gt;rx_opt.snd_wscale);</div><div class='add'>+	return tcp_disconnect(sk, flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define SHUTDOWN_ELIGIBLE_STATE (TCPF_ESTABLISHED | \</div><div class='add'>+				 TCPF_SYN_RECV | TCPF_CLOSE_WAIT)</div><div class='add'>+void chtls_shutdown(struct sock *sk, int how)</div><div class='add'>+{</div><div class='add'>+	if ((how &amp; SEND_SHUTDOWN) &amp;&amp;</div><div class='add'>+	    sk_in_state(sk, SHUTDOWN_ELIGIBLE_STATE) &amp;&amp;</div><div class='add'>+	    make_close_transition(sk))</div><div class='add'>+		chtls_close_conn(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_destroy_sock(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	chtls_purge_recv_queue(sk);</div><div class='add'>+	csk-&gt;ulp_mode = ULP_MODE_NONE;</div><div class='add'>+	chtls_purge_write_queue(sk);</div><div class='add'>+	free_tls_keyid(sk);</div><div class='add'>+	kref_put(&amp;csk-&gt;kref, chtls_sock_release);</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET)</div><div class='add'>+		sk-&gt;sk_prot = &amp;tcp_prot;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	else</div><div class='add'>+		sk-&gt;sk_prot = &amp;tcpv6_prot;</div><div class='add'>+#endif</div><div class='add'>+	sk-&gt;sk_prot-&gt;destroy(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void reset_listen_child(struct sock *child)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(child);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_ctrl_skb(csk-&gt;txdata_skb_cache,</div><div class='add'>+			     sizeof(struct cpl_abort_req));</div><div class='add'>+</div><div class='add'>+	chtls_send_reset(child, CPL_ABORT_SEND_RST, skb);</div><div class='add'>+	sock_orphan(child);</div><div class='add'>+	tcp_orphan_count_inc();</div><div class='add'>+	if (child-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+		inet_csk_destroy_sock(child);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_disconnect_acceptq(struct sock *listen_sk)</div><div class='add'>+{</div><div class='add'>+	struct request_sock **pprev;</div><div class='add'>+</div><div class='add'>+	pprev = ACCEPT_QUEUE(listen_sk);</div><div class='add'>+	while (*pprev) {</div><div class='add'>+		struct request_sock *req = *pprev;</div><div class='add'>+</div><div class='add'>+		if (req-&gt;rsk_ops == &amp;chtls_rsk_ops ||</div><div class='add'>+		    req-&gt;rsk_ops == &amp;chtls_rsk_opsv6) {</div><div class='add'>+			struct sock *child = req-&gt;sk;</div><div class='add'>+</div><div class='add'>+			*pprev = req-&gt;dl_next;</div><div class='add'>+			sk_acceptq_removed(listen_sk);</div><div class='add'>+			reqsk_put(req);</div><div class='add'>+			sock_hold(child);</div><div class='add'>+			local_bh_disable();</div><div class='add'>+			bh_lock_sock(child);</div><div class='add'>+			release_tcp_port(child);</div><div class='add'>+			reset_listen_child(child);</div><div class='add'>+			bh_unlock_sock(child);</div><div class='add'>+			local_bh_enable();</div><div class='add'>+			sock_put(child);</div><div class='add'>+		} else {</div><div class='add'>+			pprev = &amp;req-&gt;dl_next;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int listen_hashfn(const struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return ((unsigned long)sk &gt;&gt; 10) &amp; (LISTEN_INFO_HASH_SIZE - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct listen_info *listen_hash_add(struct chtls_dev *cdev,</div><div class='add'>+					   struct sock *sk,</div><div class='add'>+					   unsigned int stid)</div><div class='add'>+{</div><div class='add'>+	struct listen_info *p = kmalloc(sizeof(*p), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (p) {</div><div class='add'>+		int key = listen_hashfn(sk);</div><div class='add'>+</div><div class='add'>+		p-&gt;sk = sk;</div><div class='add'>+		p-&gt;stid = stid;</div><div class='add'>+		spin_lock(&amp;cdev-&gt;listen_lock);</div><div class='add'>+		p-&gt;next = cdev-&gt;listen_hash_tab[key];</div><div class='add'>+		cdev-&gt;listen_hash_tab[key] = p;</div><div class='add'>+		spin_unlock(&amp;cdev-&gt;listen_lock);</div><div class='add'>+	}</div><div class='add'>+	return p;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int listen_hash_find(struct chtls_dev *cdev,</div><div class='add'>+			    struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct listen_info *p;</div><div class='add'>+	int stid = -1;</div><div class='add'>+	int key;</div><div class='add'>+</div><div class='add'>+	key = listen_hashfn(sk);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cdev-&gt;listen_lock);</div><div class='add'>+	for (p = cdev-&gt;listen_hash_tab[key]; p; p = p-&gt;next)</div><div class='add'>+		if (p-&gt;sk == sk) {</div><div class='add'>+			stid = p-&gt;stid;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	spin_unlock(&amp;cdev-&gt;listen_lock);</div><div class='add'>+	return stid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int listen_hash_del(struct chtls_dev *cdev,</div><div class='add'>+			   struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct listen_info *p, **prev;</div><div class='add'>+	int stid = -1;</div><div class='add'>+	int key;</div><div class='add'>+</div><div class='add'>+	key = listen_hashfn(sk);</div><div class='add'>+	prev = &amp;cdev-&gt;listen_hash_tab[key];</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;cdev-&gt;listen_lock);</div><div class='add'>+	for (p = *prev; p; prev = &amp;p-&gt;next, p = p-&gt;next)</div><div class='add'>+		if (p-&gt;sk == sk) {</div><div class='add'>+			stid = p-&gt;stid;</div><div class='add'>+			*prev = p-&gt;next;</div><div class='add'>+			kfree(p);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	spin_unlock(&amp;cdev-&gt;listen_lock);</div><div class='add'>+	return stid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void cleanup_syn_rcv_conn(struct sock *child, struct sock *parent)</div><div class='add'>+{</div><div class='add'>+	struct request_sock *req;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(child);</div><div class='add'>+	req = csk-&gt;passive_reap_next;</div><div class='add'>+</div><div class='add'>+	reqsk_queue_removed(&amp;inet_csk(parent)-&gt;icsk_accept_queue, req);</div><div class='add'>+	__skb_unlink((struct sk_buff *)&amp;csk-&gt;synq, &amp;csk-&gt;listen_ctx-&gt;synq);</div><div class='add'>+	chtls_reqsk_free(req);</div><div class='add'>+	csk-&gt;passive_reap_next = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_reset_synq(struct listen_ctx *listen_ctx)</div><div class='add'>+{</div><div class='add'>+	struct sock *listen_sk = listen_ctx-&gt;lsk;</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;listen_ctx-&gt;synq)) {</div><div class='add'>+		struct chtls_sock *csk =</div><div class='add'>+			container_of((struct synq *)skb_peek</div><div class='add'>+				(&amp;listen_ctx-&gt;synq), struct chtls_sock, synq);</div><div class='add'>+		struct sock *child = csk-&gt;sk;</div><div class='add'>+</div><div class='add'>+		cleanup_syn_rcv_conn(child, listen_sk);</div><div class='add'>+		sock_hold(child);</div><div class='add'>+		local_bh_disable();</div><div class='add'>+		bh_lock_sock(child);</div><div class='add'>+		release_tcp_port(child);</div><div class='add'>+		reset_listen_child(child);</div><div class='add'>+		bh_unlock_sock(child);</div><div class='add'>+		local_bh_enable();</div><div class='add'>+		sock_put(child);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int chtls_listen_start(struct chtls_dev *cdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	bool clip_valid = false;</div><div class='add'>+#endif</div><div class='add'>+	struct listen_ctx *ctx;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	struct port_info *pi;</div><div class='add'>+	int ret = 0;</div><div class='add'>+	int stid;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	ndev = chtls_find_netdev(cdev, sk);</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	pi = netdev_priv(ndev);</div><div class='add'>+	adap = pi-&gt;adapter;</div><div class='add'>+	if (!(adap-&gt;flags &amp; CXGB4_FULL_INIT_DONE))</div><div class='add'>+		return -EBADF;</div><div class='add'>+</div><div class='add'>+	if (listen_hash_find(cdev, sk) &gt;= 0)   /* already have it */</div><div class='add'>+		return -EADDRINUSE;</div><div class='add'>+</div><div class='add'>+	ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	__module_get(THIS_MODULE);</div><div class='add'>+	ctx-&gt;lsk = sk;</div><div class='add'>+	ctx-&gt;cdev = cdev;</div><div class='add'>+	ctx-&gt;state = T4_LISTEN_START_PENDING;</div><div class='add'>+	skb_queue_head_init(&amp;ctx-&gt;synq);</div><div class='add'>+</div><div class='add'>+	stid = cxgb4_alloc_stid(cdev-&gt;tids, sk-&gt;sk_family, ctx);</div><div class='add'>+	if (stid &lt; 0)</div><div class='add'>+		goto free_ctx;</div><div class='add'>+</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	if (!listen_hash_add(cdev, sk, stid))</div><div class='add'>+		goto free_stid;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_family == PF_INET) {</div><div class='add'>+		ret = cxgb4_create_server(ndev, stid,</div><div class='add'>+					  inet_sk(sk)-&gt;inet_rcv_saddr,</div><div class='add'>+					  inet_sk(sk)-&gt;inet_sport, 0,</div><div class='add'>+					  cdev-&gt;lldi-&gt;rxq_ids[0]);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		int addr_type;</div><div class='add'>+</div><div class='add'>+		addr_type = ipv6_addr_type(&amp;sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+		if (addr_type != IPV6_ADDR_ANY) {</div><div class='add'>+			ret = cxgb4_clip_get(ndev, (const u32 *)</div><div class='add'>+					     &amp;sk-&gt;sk_v6_rcv_saddr, 1);</div><div class='add'>+			if (ret)</div><div class='add'>+				goto del_hash;</div><div class='add'>+			clip_valid = true;</div><div class='add'>+		}</div><div class='add'>+		ret = cxgb4_create_server6(ndev, stid,</div><div class='add'>+					   &amp;sk-&gt;sk_v6_rcv_saddr,</div><div class='add'>+					   inet_sk(sk)-&gt;inet_sport,</div><div class='add'>+					   cdev-&gt;lldi-&gt;rxq_ids[0]);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	if (ret &gt; 0)</div><div class='add'>+		ret = net_xmit_errno(ret);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto del_hash;</div><div class='add'>+	return 0;</div><div class='add'>+del_hash:</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (clip_valid)</div><div class='add'>+		cxgb4_clip_release(ndev, (const u32 *)&amp;sk-&gt;sk_v6_rcv_saddr, 1);</div><div class='add'>+#endif</div><div class='add'>+	listen_hash_del(cdev, sk);</div><div class='add'>+free_stid:</div><div class='add'>+	cxgb4_free_stid(cdev-&gt;tids, stid, sk-&gt;sk_family);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+free_ctx:</div><div class='add'>+	kfree(ctx);</div><div class='add'>+	module_put(THIS_MODULE);</div><div class='add'>+	return -EBADF;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_listen_stop(struct chtls_dev *cdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct listen_ctx *listen_ctx;</div><div class='add'>+	int stid;</div><div class='add'>+</div><div class='add'>+	stid = listen_hash_del(cdev, sk);</div><div class='add'>+	if (stid &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	listen_ctx = (struct listen_ctx *)lookup_stid(cdev-&gt;tids, stid);</div><div class='add'>+	chtls_reset_synq(listen_ctx);</div><div class='add'>+</div><div class='add'>+	cxgb4_remove_server(cdev-&gt;lldi-&gt;ports[0], stid,</div><div class='add'>+			    cdev-&gt;lldi-&gt;rxq_ids[0], sk-&gt;sk_family == PF_INET6);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == PF_INET6) {</div><div class='add'>+		struct net_device *ndev = chtls_find_netdev(cdev, sk);</div><div class='add'>+		int addr_type = 0;</div><div class='add'>+</div><div class='add'>+		addr_type = ipv6_addr_type((const struct in6_addr *)</div><div class='add'>+					  &amp;sk-&gt;sk_v6_rcv_saddr);</div><div class='add'>+		if (addr_type != IPV6_ADDR_ANY)</div><div class='add'>+			cxgb4_clip_release(ndev, (const u32 *)</div><div class='add'>+					   &amp;sk-&gt;sk_v6_rcv_saddr, 1);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+	chtls_disconnect_acceptq(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_pass_open_rpl(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_pass_open_rpl *rpl = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	unsigned int stid = GET_TID(rpl);</div><div class='add'>+	struct listen_ctx *listen_ctx;</div><div class='add'>+</div><div class='add'>+	listen_ctx = (struct listen_ctx *)lookup_stid(cdev-&gt;tids, stid);</div><div class='add'>+	if (!listen_ctx)</div><div class='add'>+		return CPL_RET_BUF_DONE;</div><div class='add'>+</div><div class='add'>+	if (listen_ctx-&gt;state == T4_LISTEN_START_PENDING) {</div><div class='add'>+		listen_ctx-&gt;state = T4_LISTEN_STARTED;</div><div class='add'>+		return CPL_RET_BUF_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rpl-&gt;status != CPL_ERR_NONE) {</div><div class='add'>+		pr_info("Unexpected PASS_OPEN_RPL status %u for STID %u\n",</div><div class='add'>+			rpl-&gt;status, stid);</div><div class='add'>+	} else {</div><div class='add'>+		cxgb4_free_stid(cdev-&gt;tids, stid, listen_ctx-&gt;lsk-&gt;sk_family);</div><div class='add'>+		sock_put(listen_ctx-&gt;lsk);</div><div class='add'>+		kfree(listen_ctx);</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+	}</div><div class='add'>+	return CPL_RET_BUF_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_close_listsrv_rpl(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_close_listsvr_rpl *rpl = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct listen_ctx *listen_ctx;</div><div class='add'>+	unsigned int stid;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	stid = GET_TID(rpl);</div><div class='add'>+	data = lookup_stid(cdev-&gt;tids, stid);</div><div class='add'>+	listen_ctx = (struct listen_ctx *)data;</div><div class='add'>+</div><div class='add'>+	if (rpl-&gt;status != CPL_ERR_NONE) {</div><div class='add'>+		pr_info("Unexpected CLOSE_LISTSRV_RPL status %u for STID %u\n",</div><div class='add'>+			rpl-&gt;status, stid);</div><div class='add'>+	} else {</div><div class='add'>+		cxgb4_free_stid(cdev-&gt;tids, stid, listen_ctx-&gt;lsk-&gt;sk_family);</div><div class='add'>+		sock_put(listen_ctx-&gt;lsk);</div><div class='add'>+		kfree(listen_ctx);</div><div class='add'>+		module_put(THIS_MODULE);</div><div class='add'>+	}</div><div class='add'>+	return CPL_RET_BUF_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_purge_wr_queue(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while ((skb = dequeue_wr(sk)) != NULL)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_release_resources(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct chtls_dev *cdev = csk-&gt;cdev;</div><div class='add'>+	unsigned int tid = csk-&gt;tid;</div><div class='add'>+	struct tid_info *tids;</div><div class='add'>+</div><div class='add'>+	if (!cdev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	tids = cdev-&gt;tids;</div><div class='add'>+	kfree_skb(csk-&gt;txdata_skb_cache);</div><div class='add'>+	csk-&gt;txdata_skb_cache = NULL;</div><div class='add'>+</div><div class='add'>+	if (csk-&gt;wr_credits != csk-&gt;wr_max_credits) {</div><div class='add'>+		chtls_purge_wr_queue(sk);</div><div class='add'>+		chtls_reset_wr_list(csk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (csk-&gt;l2t_entry) {</div><div class='add'>+		cxgb4_l2t_release(csk-&gt;l2t_entry);</div><div class='add'>+		csk-&gt;l2t_entry = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != TCP_SYN_SENT) {</div><div class='add'>+		cxgb4_remove_tid(tids, csk-&gt;port_id, tid, sk-&gt;sk_family);</div><div class='add'>+		sock_put(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_conn_done(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sock_flag(sk, SOCK_DEAD))</div><div class='add'>+		chtls_purge_receive_queue(sk);</div><div class='add'>+	sk_wakeup_sleepers(sk, 0);</div><div class='add'>+	tcp_done(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void do_abort_syn_rcv(struct sock *child, struct sock *parent)</div><div class='add'>+{</div><div class='add'>+	/*</div><div class='add'>+	 * If the server is still open we clean up the child connection,</div><div class='add'>+	 * otherwise the server already did the clean up as it was purging</div><div class='add'>+	 * its SYN queue and the skb was just sitting in its backlog.</div><div class='add'>+	 */</div><div class='add'>+	if (likely(parent-&gt;sk_state == TCP_LISTEN)) {</div><div class='add'>+		cleanup_syn_rcv_conn(child, parent);</div><div class='add'>+		/* Without the below call to sock_orphan,</div><div class='add'>+		 * we leak the socket resource with syn_flood test</div><div class='add'>+		 * as inet_csk_destroy_sock will not be called</div><div class='add'>+		 * in tcp_done since SOCK_DEAD flag is not set.</div><div class='add'>+		 * Kernel handles this differently where new socket is</div><div class='add'>+		 * created only after 3 way handshake is done.</div><div class='add'>+		 */</div><div class='add'>+		sock_orphan(child);</div><div class='add'>+		tcp_orphan_count_inc();</div><div class='add'>+		chtls_release_resources(child);</div><div class='add'>+		chtls_conn_done(child);</div><div class='add'>+	} else {</div><div class='add'>+		if (csk_flag(child, CSK_RST_ABORTED)) {</div><div class='add'>+			chtls_release_resources(child);</div><div class='add'>+			chtls_conn_done(child);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void pass_open_abort(struct sock *child, struct sock *parent,</div><div class='add'>+			    struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	do_abort_syn_rcv(child, parent);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bl_pass_open_abort(struct sock *lsk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	pass_open_abort(skb-&gt;sk, lsk, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_pass_open_arp_failure(struct sock *sk,</div><div class='add'>+					struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct request_sock *oreq;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct sock *parent;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the connection is being aborted due to the parent listening</div><div class='add'>+	 * socket going away there's nothing to do, the ABORT_REQ will close</div><div class='add'>+	 * the connection.</div><div class='add'>+	 */</div><div class='add'>+	if (csk_flag(sk, CSK_ABORT_RPL_PENDING)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	oreq = csk-&gt;passive_reap_next;</div><div class='add'>+	data = lookup_stid(cdev-&gt;tids, oreq-&gt;ts_recent);</div><div class='add'>+	parent = ((struct listen_ctx *)data)-&gt;lsk;</div><div class='add'>+</div><div class='add'>+	bh_lock_sock(parent);</div><div class='add'>+	if (!sock_owned_by_user(parent)) {</div><div class='add'>+		pass_open_abort(sk, parent, skb);</div><div class='add'>+	} else {</div><div class='add'>+		BLOG_SKB_CB(skb)-&gt;backlog_rcv = bl_pass_open_abort;</div><div class='add'>+		__sk_add_backlog(parent, skb);</div><div class='add'>+	}</div><div class='add'>+	bh_unlock_sock(parent);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_accept_rpl_arp_failure(void *handle,</div><div class='add'>+					 struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = (struct sock *)handle;</div><div class='add'>+</div><div class='add'>+	sock_hold(sk);</div><div class='add'>+	process_cpl_msg(chtls_pass_open_arp_failure, sk, skb);</div><div class='add'>+	sock_put(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int chtls_select_mss(const struct chtls_sock *csk,</div><div class='add'>+				     unsigned int pmtu,</div><div class='add'>+				     struct cpl_pass_accept_req *req)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	unsigned int tcpoptsz;</div><div class='add'>+	unsigned int iphdrsz;</div><div class='add'>+	unsigned int mtu_idx;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	unsigned int mss;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	u16 user_mss;</div><div class='add'>+</div><div class='add'>+	mss = ntohs(req-&gt;tcpopt.mss);</div><div class='add'>+	sk = csk-&gt;sk;</div><div class='add'>+	dst = __sk_dst_get(sk);</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+	tcpoptsz = 0;</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET6)</div><div class='add'>+		iphdrsz = sizeof(struct ipv6hdr) + sizeof(struct tcphdr);</div><div class='add'>+	else</div><div class='add'>+#endif</div><div class='add'>+		iphdrsz = sizeof(struct iphdr) + sizeof(struct tcphdr);</div><div class='add'>+	if (req-&gt;tcpopt.tstamp)</div><div class='add'>+		tcpoptsz += round_up(TCPOLEN_TIMESTAMP, 4);</div><div class='add'>+</div><div class='add'>+	tp-&gt;advmss = dst_metric_advmss(dst);</div><div class='add'>+	user_mss = USER_MSS(tp);</div><div class='add'>+	if (user_mss &amp;&amp; tp-&gt;advmss &gt; user_mss)</div><div class='add'>+		tp-&gt;advmss = user_mss;</div><div class='add'>+	if (tp-&gt;advmss &gt; pmtu - iphdrsz)</div><div class='add'>+		tp-&gt;advmss = pmtu - iphdrsz;</div><div class='add'>+	if (mss &amp;&amp; tp-&gt;advmss &gt; mss)</div><div class='add'>+		tp-&gt;advmss = mss;</div><div class='add'>+</div><div class='add'>+	tp-&gt;advmss = cxgb4_best_aligned_mtu(cdev-&gt;lldi-&gt;mtus,</div><div class='add'>+					    iphdrsz + tcpoptsz,</div><div class='add'>+					    tp-&gt;advmss - tcpoptsz,</div><div class='add'>+					    8, &amp;mtu_idx);</div><div class='add'>+	tp-&gt;advmss -= iphdrsz;</div><div class='add'>+</div><div class='add'>+	inet_csk(sk)-&gt;icsk_pmtu_cookie = pmtu;</div><div class='add'>+	return mtu_idx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int select_rcv_wscale(int space, int wscale_ok, int win_clamp)</div><div class='add'>+{</div><div class='add'>+	int wscale = 0;</div><div class='add'>+</div><div class='add'>+	if (space &gt; MAX_RCV_WND)</div><div class='add'>+		space = MAX_RCV_WND;</div><div class='add'>+	if (win_clamp &amp;&amp; win_clamp &lt; space)</div><div class='add'>+		space = win_clamp;</div><div class='add'>+</div><div class='add'>+	if (wscale_ok) {</div><div class='add'>+		while (wscale &lt; 14 &amp;&amp; (65535 &lt;&lt; wscale) &lt; space)</div><div class='add'>+			wscale++;</div><div class='add'>+	}</div><div class='add'>+	return wscale;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_pass_accept_rpl(struct sk_buff *skb,</div><div class='add'>+				  struct cpl_pass_accept_req *req,</div><div class='add'>+				  unsigned int tid)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct cpl_t5_pass_accept_rpl *rpl5;</div><div class='add'>+	struct cxgb4_lld_info *lldi;</div><div class='add'>+	const struct tcphdr *tcph;</div><div class='add'>+	const struct tcp_sock *tp;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	u32 opt2, hlen;</div><div class='add'>+	u64 opt0;</div><div class='add'>+</div><div class='add'>+	sk = skb-&gt;sk;</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+	csk = sk-&gt;sk_user_data;</div><div class='add'>+	csk-&gt;tid = tid;</div><div class='add'>+	lldi = csk-&gt;cdev-&gt;lldi;</div><div class='add'>+	len = roundup(sizeof(*rpl5), 16);</div><div class='add'>+</div><div class='add'>+	rpl5 = __skb_put_zero(skb, len);</div><div class='add'>+	INIT_TP_WR(rpl5, tid);</div><div class='add'>+</div><div class='add'>+	OPCODE_TID(rpl5) = cpu_to_be32(MK_OPCODE_TID(CPL_PASS_ACCEPT_RPL,</div><div class='add'>+						     csk-&gt;tid));</div><div class='add'>+	csk-&gt;mtu_idx = chtls_select_mss(csk, dst_mtu(__sk_dst_get(sk)),</div><div class='add'>+					req);</div><div class='add'>+	opt0 = TCAM_BYPASS_F |</div><div class='add'>+	       WND_SCALE_V(RCV_WSCALE(tp)) |</div><div class='add'>+	       MSS_IDX_V(csk-&gt;mtu_idx) |</div><div class='add'>+	       L2T_IDX_V(csk-&gt;l2t_entry-&gt;idx) |</div><div class='add'>+	       NAGLE_V(!(tp-&gt;nonagle &amp; TCP_NAGLE_OFF)) |</div><div class='add'>+	       TX_CHAN_V(csk-&gt;tx_chan) |</div><div class='add'>+	       SMAC_SEL_V(csk-&gt;smac_idx) |</div><div class='add'>+	       DSCP_V(csk-&gt;tos &gt;&gt; 2) |</div><div class='add'>+	       ULP_MODE_V(ULP_MODE_TLS) |</div><div class='add'>+	       RCV_BUFSIZ_V(min(tp-&gt;rcv_wnd &gt;&gt; 10, RCV_BUFSIZ_M));</div><div class='add'>+</div><div class='add'>+	opt2 = RX_CHANNEL_V(0) |</div><div class='add'>+		RSS_QUEUE_VALID_F | RSS_QUEUE_V(csk-&gt;rss_qid);</div><div class='add'>+</div><div class='add'>+	if (!is_t5(lldi-&gt;adapter_type))</div><div class='add'>+		opt2 |= RX_FC_DISABLE_F;</div><div class='add'>+	if (req-&gt;tcpopt.tstamp)</div><div class='add'>+		opt2 |= TSTAMPS_EN_F;</div><div class='add'>+	if (req-&gt;tcpopt.sack)</div><div class='add'>+		opt2 |= SACK_EN_F;</div><div class='add'>+	hlen = ntohl(req-&gt;hdr_len);</div><div class='add'>+</div><div class='add'>+	tcph = (struct tcphdr *)((u8 *)(req + 1) +</div><div class='add'>+			T6_ETH_HDR_LEN_G(hlen) + T6_IP_HDR_LEN_G(hlen));</div><div class='add'>+	if (tcph-&gt;ece &amp;&amp; tcph-&gt;cwr)</div><div class='add'>+		opt2 |= CCTRL_ECN_V(1);</div><div class='add'>+	opt2 |= CONG_CNTRL_V(CONG_ALG_NEWRENO);</div><div class='add'>+	opt2 |= T5_ISS_F;</div><div class='add'>+	opt2 |= T5_OPT_2_VALID_F;</div><div class='add'>+	opt2 |= WND_SCALE_EN_V(WSCALE_OK(tp));</div><div class='add'>+	rpl5-&gt;opt0 = cpu_to_be64(opt0);</div><div class='add'>+	rpl5-&gt;opt2 = cpu_to_be32(opt2);</div><div class='add'>+	rpl5-&gt;iss = cpu_to_be32((get_random_u32() &amp; ~7UL) - 1);</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_SETUP, csk-&gt;port_id);</div><div class='add'>+	t4_set_arp_err_handler(skb, sk, chtls_accept_rpl_arp_failure);</div><div class='add'>+	cxgb4_l2t_send(csk-&gt;egress_dev, skb, csk-&gt;l2t_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void inet_inherit_port(struct sock *lsk, struct sock *newsk)</div><div class='add'>+{</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	__inet_inherit_port(lsk, newsk);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_backlog_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (skb-&gt;protocol) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	BLOG_SKB_CB(skb)-&gt;backlog_rcv(sk, skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_set_tcp_window(struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = csk-&gt;egress_dev;</div><div class='add'>+	struct port_info *pi = netdev_priv(ndev);</div><div class='add'>+	unsigned int linkspeed;</div><div class='add'>+	u8 scale;</div><div class='add'>+</div><div class='add'>+	linkspeed = pi-&gt;link_cfg.speed;</div><div class='add'>+	scale = linkspeed / SPEED_10000;</div><div class='add'>+#define CHTLS_10G_RCVWIN (256 * 1024)</div><div class='add'>+	csk-&gt;rcv_win = CHTLS_10G_RCVWIN;</div><div class='add'>+	if (scale)</div><div class='add'>+		csk-&gt;rcv_win *= scale;</div><div class='add'>+#define CHTLS_10G_SNDWIN (256 * 1024)</div><div class='add'>+	csk-&gt;snd_win = CHTLS_10G_SNDWIN;</div><div class='add'>+	if (scale)</div><div class='add'>+		csk-&gt;snd_win *= scale;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *chtls_recv_sock(struct sock *lsk,</div><div class='add'>+				    struct request_sock *oreq,</div><div class='add'>+				    void *network_hdr,</div><div class='add'>+				    const struct cpl_pass_accept_req *req,</div><div class='add'>+				    struct chtls_dev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct adapter *adap = pci_get_drvdata(cdev-&gt;pdev);</div><div class='add'>+	struct neighbour *n = NULL;</div><div class='add'>+	struct inet_sock *newinet;</div><div class='add'>+	const struct iphdr *iph;</div><div class='add'>+	struct tls_context *ctx;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct dst_entry *dst;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	struct sock *newsk;</div><div class='add'>+	bool found = false;</div><div class='add'>+	u16 port_id;</div><div class='add'>+	int rxq_idx;</div><div class='add'>+	int step, i;</div><div class='add'>+</div><div class='add'>+	iph = (const struct iphdr *)network_hdr;</div><div class='add'>+	newsk = tcp_create_openreq_child(lsk, oreq, cdev-&gt;askb);</div><div class='add'>+	if (!newsk)</div><div class='add'>+		goto free_oreq;</div><div class='add'>+</div><div class='add'>+	if (lsk-&gt;sk_family == AF_INET) {</div><div class='add'>+		dst = inet_csk_route_child_sock(lsk, newsk, oreq);</div><div class='add'>+		if (!dst)</div><div class='add'>+			goto free_sk;</div><div class='add'>+</div><div class='add'>+		n = dst_neigh_lookup(dst, &amp;iph-&gt;saddr);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		const struct ipv6hdr *ip6h;</div><div class='add'>+		struct flowi6 fl6;</div><div class='add'>+</div><div class='add'>+		ip6h = (const struct ipv6hdr *)network_hdr;</div><div class='add'>+		memset(&amp;fl6, 0, sizeof(fl6));</div><div class='add'>+		fl6.flowi6_proto = IPPROTO_TCP;</div><div class='add'>+		fl6.saddr = ip6h-&gt;daddr;</div><div class='add'>+		fl6.daddr = ip6h-&gt;saddr;</div><div class='add'>+		fl6.fl6_dport = inet_rsk(oreq)-&gt;ir_rmt_port;</div><div class='add'>+		fl6.fl6_sport = htons(inet_rsk(oreq)-&gt;ir_num);</div><div class='add'>+		security_req_classify_flow(oreq, flowi6_to_flowi_common(&amp;fl6));</div><div class='add'>+		dst = ip6_dst_lookup_flow(sock_net(lsk), lsk, &amp;fl6, NULL);</div><div class='add'>+		if (IS_ERR(dst))</div><div class='add'>+			goto free_sk;</div><div class='add'>+		n = dst_neigh_lookup(dst, &amp;ip6h-&gt;saddr);</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	if (!n || !n-&gt;dev)</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	ndev = n-&gt;dev;</div><div class='add'>+	if (is_vlan_dev(ndev))</div><div class='add'>+		ndev = vlan_dev_real_dev(ndev);</div><div class='add'>+</div><div class='add'>+	for_each_port(adap, i)</div><div class='add'>+		if (cdev-&gt;ports[i] == ndev)</div><div class='add'>+			found = true;</div><div class='add'>+</div><div class='add'>+	if (!found)</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	port_id = cxgb4_port_idx(ndev);</div><div class='add'>+</div><div class='add'>+	csk = chtls_sock_create(cdev);</div><div class='add'>+	if (!csk)</div><div class='add'>+		goto free_dst;</div><div class='add'>+</div><div class='add'>+	csk-&gt;l2t_entry = cxgb4_l2t_get(cdev-&gt;lldi-&gt;l2t, n, ndev, 0);</div><div class='add'>+	if (!csk-&gt;l2t_entry)</div><div class='add'>+		goto free_csk;</div><div class='add'>+</div><div class='add'>+	newsk-&gt;sk_user_data = csk;</div><div class='add'>+	newsk-&gt;sk_backlog_rcv = chtls_backlog_rcv;</div><div class='add'>+</div><div class='add'>+	tp = tcp_sk(newsk);</div><div class='add'>+	newinet = inet_sk(newsk);</div><div class='add'>+</div><div class='add'>+	if (iph-&gt;version == 0x4) {</div><div class='add'>+		newinet-&gt;inet_daddr = iph-&gt;saddr;</div><div class='add'>+		newinet-&gt;inet_rcv_saddr = iph-&gt;daddr;</div><div class='add'>+		newinet-&gt;inet_saddr = iph-&gt;daddr;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		struct tcp6_sock *newtcp6sk = (struct tcp6_sock *)newsk;</div><div class='add'>+		struct inet_request_sock *treq = inet_rsk(oreq);</div><div class='add'>+		struct ipv6_pinfo *newnp = inet6_sk(newsk);</div><div class='add'>+		struct ipv6_pinfo *np = inet6_sk(lsk);</div><div class='add'>+</div><div class='add'>+		newinet-&gt;pinet6 = &amp;newtcp6sk-&gt;inet6;</div><div class='add'>+		newinet-&gt;ipv6_fl_list = NULL;</div><div class='add'>+		memcpy(newnp, np, sizeof(struct ipv6_pinfo));</div><div class='add'>+		newsk-&gt;sk_v6_daddr = treq-&gt;ir_v6_rmt_addr;</div><div class='add'>+		newsk-&gt;sk_v6_rcv_saddr = treq-&gt;ir_v6_loc_addr;</div><div class='add'>+		inet6_sk(newsk)-&gt;saddr = treq-&gt;ir_v6_loc_addr;</div><div class='add'>+		newnp-&gt;pktoptions = NULL;</div><div class='add'>+		newsk-&gt;sk_bound_dev_if = treq-&gt;ir_iif;</div><div class='add'>+		newinet-&gt;inet_opt = NULL;</div><div class='add'>+		newinet-&gt;inet_daddr = LOOPBACK4_IPV6;</div><div class='add'>+		newinet-&gt;inet_saddr = LOOPBACK4_IPV6;</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	oreq-&gt;ts_recent = PASS_OPEN_TID_G(ntohl(req-&gt;tos_stid));</div><div class='add'>+	sk_setup_caps(newsk, dst);</div><div class='add'>+	ctx = tls_get_ctx(lsk);</div><div class='add'>+	newsk-&gt;sk_destruct = ctx-&gt;sk_destruct;</div><div class='add'>+	newsk-&gt;sk_prot_creator = lsk-&gt;sk_prot_creator;</div><div class='add'>+	csk-&gt;sk = newsk;</div><div class='add'>+	csk-&gt;passive_reap_next = oreq;</div><div class='add'>+	csk-&gt;tx_chan = cxgb4_port_chan(ndev);</div><div class='add'>+	csk-&gt;port_id = port_id;</div><div class='add'>+	csk-&gt;egress_dev = ndev;</div><div class='add'>+	csk-&gt;tos = PASS_OPEN_TOS_G(ntohl(req-&gt;tos_stid));</div><div class='add'>+	chtls_set_tcp_window(csk);</div><div class='add'>+	tp-&gt;rcv_wnd = csk-&gt;rcv_win;</div><div class='add'>+	csk-&gt;sndbuf = csk-&gt;snd_win;</div><div class='add'>+	csk-&gt;ulp_mode = ULP_MODE_TLS;</div><div class='add'>+	step = cdev-&gt;lldi-&gt;nrxq / cdev-&gt;lldi-&gt;nchan;</div><div class='add'>+	rxq_idx = port_id * step;</div><div class='add'>+	rxq_idx += cdev-&gt;round_robin_cnt++ % step;</div><div class='add'>+	csk-&gt;rss_qid = cdev-&gt;lldi-&gt;rxq_ids[rxq_idx];</div><div class='add'>+	csk-&gt;txq_idx = (rxq_idx &lt; cdev-&gt;lldi-&gt;ntxq) ? rxq_idx :</div><div class='add'>+			port_id * step;</div><div class='add'>+	csk-&gt;sndbuf = newsk-&gt;sk_sndbuf;</div><div class='add'>+	csk-&gt;smac_idx = ((struct port_info *)netdev_priv(ndev))-&gt;smt_idx;</div><div class='add'>+	RCV_WSCALE(tp) = select_rcv_wscale(tcp_full_space(newsk),</div><div class='add'>+					   READ_ONCE(sock_net(newsk)-&gt;</div><div class='add'>+						     ipv4.sysctl_tcp_window_scaling),</div><div class='add'>+					   tp-&gt;window_clamp);</div><div class='add'>+	neigh_release(n);</div><div class='add'>+	inet_inherit_port(lsk, newsk);</div><div class='add'>+	csk_set_flag(csk, CSK_CONN_INLINE);</div><div class='add'>+	bh_unlock_sock(newsk); /* tcp_create_openreq_child -&gt;sk_clone_lock */</div><div class='add'>+</div><div class='add'>+	return newsk;</div><div class='add'>+free_csk:</div><div class='add'>+	chtls_sock_release(&amp;csk-&gt;kref);</div><div class='add'>+free_dst:</div><div class='add'>+	if (n)</div><div class='add'>+		neigh_release(n);</div><div class='add'>+	dst_release(dst);</div><div class='add'>+free_sk:</div><div class='add'>+	inet_csk_prepare_forced_close(newsk);</div><div class='add'>+	tcp_done(newsk);</div><div class='add'>+free_oreq:</div><div class='add'>+	chtls_reqsk_free(oreq);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Populate a TID_RELEASE WR.  The skb must be already propely sized.</div><div class='add'>+ */</div><div class='add'>+static  void mk_tid_release(struct sk_buff *skb,</div><div class='add'>+			    unsigned int chan, unsigned int tid)</div><div class='add'>+{</div><div class='add'>+	struct cpl_tid_release *req;</div><div class='add'>+	unsigned int len;</div><div class='add'>+</div><div class='add'>+	len = roundup(sizeof(struct cpl_tid_release), 16);</div><div class='add'>+	req = (struct cpl_tid_release *)__skb_put(skb, len);</div><div class='add'>+	memset(req, 0, len);</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_SETUP, chan);</div><div class='add'>+	INIT_TP_WR_CPL(req, CPL_TID_RELEASE, tid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_get_module(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct inet_connection_sock *icsk = inet_csk(sk);</div><div class='add'>+</div><div class='add'>+	if (!try_module_get(icsk-&gt;icsk_ulp_ops-&gt;owner))</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_pass_accept_request(struct sock *sk,</div><div class='add'>+				      struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_t5_pass_accept_rpl *rpl;</div><div class='add'>+	struct cpl_pass_accept_req *req;</div><div class='add'>+	struct listen_ctx *listen_ctx;</div><div class='add'>+	struct vlan_ethhdr *vlan_eh;</div><div class='add'>+	struct request_sock *oreq;</div><div class='add'>+	struct sk_buff *reply_skb;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct ipv6hdr *ip6h;</div><div class='add'>+	struct tcphdr *tcph;</div><div class='add'>+	struct sock *newsk;</div><div class='add'>+	struct ethhdr *eh;</div><div class='add'>+	struct iphdr *iph;</div><div class='add'>+	void *network_hdr;</div><div class='add'>+	unsigned int stid;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	unsigned int tid;</div><div class='add'>+	bool th_ecn, ect;</div><div class='add'>+	__u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */</div><div class='add'>+	u16 eth_hdr_len;</div><div class='add'>+	bool ecn_ok;</div><div class='add'>+</div><div class='add'>+	req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	tid = GET_TID(req);</div><div class='add'>+	cdev = BLOG_SKB_CB(skb)-&gt;cdev;</div><div class='add'>+	newsk = lookup_tid(cdev-&gt;tids, tid);</div><div class='add'>+	stid = PASS_OPEN_TID_G(ntohl(req-&gt;tos_stid));</div><div class='add'>+	if (newsk) {</div><div class='add'>+		pr_info("tid (%d) already in use\n", tid);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	len = roundup(sizeof(*rpl), 16);</div><div class='add'>+	reply_skb = alloc_skb(len, GFP_ATOMIC);</div><div class='add'>+	if (!reply_skb) {</div><div class='add'>+		cxgb4_remove_tid(cdev-&gt;tids, 0, tid, sk-&gt;sk_family);</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state != TCP_LISTEN)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	if (inet_csk_reqsk_queue_is_full(sk))</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	if (sk_acceptq_is_full(sk))</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+	eth_hdr_len = T6_ETH_HDR_LEN_G(ntohl(req-&gt;hdr_len));</div><div class='add'>+	if (eth_hdr_len == ETH_HLEN) {</div><div class='add'>+		eh = (struct ethhdr *)(req + 1);</div><div class='add'>+		iph = (struct iphdr *)(eh + 1);</div><div class='add'>+		ip6h = (struct ipv6hdr *)(eh + 1);</div><div class='add'>+		network_hdr = (void *)(eh + 1);</div><div class='add'>+	} else {</div><div class='add'>+		vlan_eh = (struct vlan_ethhdr *)(req + 1);</div><div class='add'>+		iph = (struct iphdr *)(vlan_eh + 1);</div><div class='add'>+		ip6h = (struct ipv6hdr *)(vlan_eh + 1);</div><div class='add'>+		network_hdr = (void *)(vlan_eh + 1);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iph-&gt;version == 0x4) {</div><div class='add'>+		tcph = (struct tcphdr *)(iph + 1);</div><div class='add'>+		skb_set_network_header(skb, (void *)iph - (void *)req);</div><div class='add'>+		oreq = inet_reqsk_alloc(&amp;chtls_rsk_ops, sk, true);</div><div class='add'>+	} else {</div><div class='add'>+		tcph = (struct tcphdr *)(ip6h + 1);</div><div class='add'>+		skb_set_network_header(skb, (void *)ip6h - (void *)req);</div><div class='add'>+		oreq = inet_reqsk_alloc(&amp;chtls_rsk_opsv6, sk, false);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!oreq)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	oreq-&gt;rsk_rcv_wnd = 0;</div><div class='add'>+	oreq-&gt;rsk_window_clamp = 0;</div><div class='add'>+	oreq-&gt;syncookie = 0;</div><div class='add'>+	oreq-&gt;mss = 0;</div><div class='add'>+	oreq-&gt;ts_recent = 0;</div><div class='add'>+</div><div class='add'>+	tcp_rsk(oreq)-&gt;tfo_listener = false;</div><div class='add'>+	tcp_rsk(oreq)-&gt;rcv_isn = ntohl(tcph-&gt;seq);</div><div class='add'>+	chtls_set_req_port(oreq, tcph-&gt;source, tcph-&gt;dest);</div><div class='add'>+	if (iph-&gt;version == 0x4) {</div><div class='add'>+		chtls_set_req_addr(oreq, iph-&gt;daddr, iph-&gt;saddr);</div><div class='add'>+		ip_dsfield = ipv4_get_dsfield(iph);</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	} else {</div><div class='add'>+		inet_rsk(oreq)-&gt;ir_v6_rmt_addr = ipv6_hdr(skb)-&gt;saddr;</div><div class='add'>+		inet_rsk(oreq)-&gt;ir_v6_loc_addr = ipv6_hdr(skb)-&gt;daddr;</div><div class='add'>+		ip_dsfield = ipv6_get_dsfield(ipv6_hdr(skb));</div><div class='add'>+#endif</div><div class='add'>+	}</div><div class='add'>+	if (req-&gt;tcpopt.wsf &lt;= 14 &amp;&amp;</div><div class='add'>+	    READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_window_scaling)) {</div><div class='add'>+		inet_rsk(oreq)-&gt;wscale_ok = 1;</div><div class='add'>+		inet_rsk(oreq)-&gt;snd_wscale = req-&gt;tcpopt.wsf;</div><div class='add'>+	}</div><div class='add'>+	inet_rsk(oreq)-&gt;ir_iif = sk-&gt;sk_bound_dev_if;</div><div class='add'>+	th_ecn = tcph-&gt;ece &amp;&amp; tcph-&gt;cwr;</div><div class='add'>+	if (th_ecn) {</div><div class='add'>+		ect = !INET_ECN_is_not_ect(ip_dsfield);</div><div class='add'>+		ecn_ok = READ_ONCE(sock_net(sk)-&gt;ipv4.sysctl_tcp_ecn);</div><div class='add'>+		if ((!ect &amp;&amp; ecn_ok) || tcp_ca_needs_ecn(sk))</div><div class='add'>+			inet_rsk(oreq)-&gt;ecn_ok = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	newsk = chtls_recv_sock(sk, oreq, network_hdr, req, cdev);</div><div class='add'>+	if (!newsk)</div><div class='add'>+		goto reject;</div><div class='add'>+</div><div class='add'>+	if (chtls_get_module(newsk))</div><div class='add'>+		goto reject;</div><div class='add'>+	inet_csk_reqsk_queue_added(sk);</div><div class='add'>+	reply_skb-&gt;sk = newsk;</div><div class='add'>+	chtls_install_cpl_ops(newsk);</div><div class='add'>+	cxgb4_insert_tid(cdev-&gt;tids, newsk, tid, newsk-&gt;sk_family);</div><div class='add'>+	csk = rcu_dereference_sk_user_data(newsk);</div><div class='add'>+	listen_ctx = (struct listen_ctx *)lookup_stid(cdev-&gt;tids, stid);</div><div class='add'>+	csk-&gt;listen_ctx = listen_ctx;</div><div class='add'>+	__skb_queue_tail(&amp;listen_ctx-&gt;synq, (struct sk_buff *)&amp;csk-&gt;synq);</div><div class='add'>+	chtls_pass_accept_rpl(reply_skb, req, tid);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+reject:</div><div class='add'>+	mk_tid_release(reply_skb, 0, tid);</div><div class='add'>+	cxgb4_ofld_send(cdev-&gt;lldi-&gt;ports[0], reply_skb);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle a CPL_PASS_ACCEPT_REQ message.</div><div class='add'>+ */</div><div class='add'>+static int chtls_pass_accept_req(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_pass_accept_req *req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct listen_ctx *ctx;</div><div class='add'>+	unsigned int stid;</div><div class='add'>+	unsigned int tid;</div><div class='add'>+	struct sock *lsk;</div><div class='add'>+	void *data;</div><div class='add'>+</div><div class='add'>+	stid = PASS_OPEN_TID_G(ntohl(req-&gt;tos_stid));</div><div class='add'>+	tid = GET_TID(req);</div><div class='add'>+</div><div class='add'>+	data = lookup_stid(cdev-&gt;tids, stid);</div><div class='add'>+	if (!data)</div><div class='add'>+		return 1;</div><div class='add'>+</div><div class='add'>+	ctx = (struct listen_ctx *)data;</div><div class='add'>+	lsk = ctx-&gt;lsk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(tid_out_of_range(cdev-&gt;tids, tid))) {</div><div class='add'>+		pr_info("passive open TID %u too large\n", tid);</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	BLOG_SKB_CB(skb)-&gt;cdev = cdev;</div><div class='add'>+	process_cpl_msg(chtls_pass_accept_request, lsk, skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Completes some final bits of initialization for just established connections</div><div class='add'>+ * and changes their state to TCP_ESTABLISHED.</div><div class='add'>+ *</div><div class='add'>+ * snd_isn here is the ISN after the SYN, i.e., the true ISN + 1.</div><div class='add'>+ */</div><div class='add'>+static void make_established(struct sock *sk, u32 snd_isn, unsigned int opt)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	tp-&gt;pushed_seq = snd_isn;</div><div class='add'>+	tp-&gt;write_seq = snd_isn;</div><div class='add'>+	tp-&gt;snd_nxt = snd_isn;</div><div class='add'>+	tp-&gt;snd_una = snd_isn;</div><div class='add'>+	atomic_set(&amp;inet_sk(sk)-&gt;inet_id, get_random_u16());</div><div class='add'>+	assign_rxopt(sk, opt);</div><div class='add'>+</div><div class='add'>+	if (tp-&gt;rcv_wnd &gt; (RCV_BUFSIZ_M &lt;&lt; 10))</div><div class='add'>+		tp-&gt;rcv_wup -= tp-&gt;rcv_wnd - (RCV_BUFSIZ_M &lt;&lt; 10);</div><div class='add'>+</div><div class='add'>+	smp_mb();</div><div class='add'>+	tcp_set_state(sk, TCP_ESTABLISHED);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_abort_conn(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *abort_skb;</div><div class='add'>+</div><div class='add'>+	abort_skb = alloc_skb(sizeof(struct cpl_abort_req), GFP_ATOMIC);</div><div class='add'>+	if (abort_skb)</div><div class='add'>+		chtls_send_reset(sk, CPL_ABORT_SEND_RST, abort_skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sock *reap_list;</div><div class='add'>+static DEFINE_SPINLOCK(reap_list_lock);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Process the reap list.</div><div class='add'>+ */</div><div class='add'>+DECLARE_TASK_FUNC(process_reap_list, task_param)</div><div class='add'>+{</div><div class='add'>+	spin_lock_bh(&amp;reap_list_lock);</div><div class='add'>+	while (reap_list) {</div><div class='add'>+		struct sock *sk = reap_list;</div><div class='add'>+		struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+		reap_list = csk-&gt;passive_reap_next;</div><div class='add'>+		csk-&gt;passive_reap_next = NULL;</div><div class='add'>+		spin_unlock(&amp;reap_list_lock);</div><div class='add'>+		sock_hold(sk);</div><div class='add'>+</div><div class='add'>+		bh_lock_sock(sk);</div><div class='add'>+		chtls_abort_conn(sk, NULL);</div><div class='add'>+		sock_orphan(sk);</div><div class='add'>+		if (sk-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+			inet_csk_destroy_sock(sk);</div><div class='add'>+		bh_unlock_sock(sk);</div><div class='add'>+		sock_put(sk);</div><div class='add'>+		spin_lock(&amp;reap_list_lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;reap_list_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static DECLARE_WORK(reap_task, process_reap_list);</div><div class='add'>+</div><div class='add'>+static void add_to_reap_list(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = sk-&gt;sk_user_data;</div><div class='add'>+</div><div class='add'>+	local_bh_disable();</div><div class='add'>+	release_tcp_port(sk); /* release the port immediately */</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;reap_list_lock);</div><div class='add'>+	csk-&gt;passive_reap_next = reap_list;</div><div class='add'>+	reap_list = sk;</div><div class='add'>+	if (!csk-&gt;passive_reap_next)</div><div class='add'>+		schedule_work(&amp;reap_task);</div><div class='add'>+	spin_unlock(&amp;reap_list_lock);</div><div class='add'>+	local_bh_enable();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void add_pass_open_to_parent(struct sock *child, struct sock *lsk,</div><div class='add'>+				    struct chtls_dev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct request_sock *oreq;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+</div><div class='add'>+	if (lsk-&gt;sk_state != TCP_LISTEN)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	csk = child-&gt;sk_user_data;</div><div class='add'>+	oreq = csk-&gt;passive_reap_next;</div><div class='add'>+	csk-&gt;passive_reap_next = NULL;</div><div class='add'>+</div><div class='add'>+	reqsk_queue_removed(&amp;inet_csk(lsk)-&gt;icsk_accept_queue, oreq);</div><div class='add'>+	__skb_unlink((struct sk_buff *)&amp;csk-&gt;synq, &amp;csk-&gt;listen_ctx-&gt;synq);</div><div class='add'>+</div><div class='add'>+	if (sk_acceptq_is_full(lsk)) {</div><div class='add'>+		chtls_reqsk_free(oreq);</div><div class='add'>+		add_to_reap_list(child);</div><div class='add'>+	} else {</div><div class='add'>+		refcount_set(&amp;oreq-&gt;rsk_refcnt, 1);</div><div class='add'>+		inet_csk_reqsk_queue_add(lsk, oreq, child);</div><div class='add'>+		lsk-&gt;sk_data_ready(lsk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void bl_add_pass_open_to_parent(struct sock *lsk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct sock *child = skb-&gt;sk;</div><div class='add'>+</div><div class='add'>+	skb-&gt;sk = NULL;</div><div class='add'>+	add_pass_open_to_parent(child, lsk, BLOG_SKB_CB(skb)-&gt;cdev);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_pass_establish(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_pass_establish *req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct sock *lsk, *sk;</div><div class='add'>+	unsigned int hwtid;</div><div class='add'>+</div><div class='add'>+	hwtid = GET_TID(req);</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+	if (!sk)</div><div class='add'>+		return (CPL_RET_UNKNOWN_TID | CPL_RET_BUF_DONE);</div><div class='add'>+</div><div class='add'>+	bh_lock_sock(sk);</div><div class='add'>+	if (unlikely(sock_owned_by_user(sk))) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	} else {</div><div class='add'>+		unsigned int stid;</div><div class='add'>+		void *data;</div><div class='add'>+</div><div class='add'>+		csk = sk-&gt;sk_user_data;</div><div class='add'>+		csk-&gt;wr_max_credits = 64;</div><div class='add'>+		csk-&gt;wr_credits = 64;</div><div class='add'>+		csk-&gt;wr_unacked = 0;</div><div class='add'>+		make_established(sk, ntohl(req-&gt;snd_isn), ntohs(req-&gt;tcp_opt));</div><div class='add'>+		stid = PASS_OPEN_TID_G(ntohl(req-&gt;tos_stid));</div><div class='add'>+		sk-&gt;sk_state_change(sk);</div><div class='add'>+		if (unlikely(sk-&gt;sk_socket))</div><div class='add'>+			sk_wake_async(sk, 0, POLL_OUT);</div><div class='add'>+</div><div class='add'>+		data = lookup_stid(cdev-&gt;tids, stid);</div><div class='add'>+		if (!data) {</div><div class='add'>+			/* listening server close */</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		lsk = ((struct listen_ctx *)data)-&gt;lsk;</div><div class='add'>+</div><div class='add'>+		bh_lock_sock(lsk);</div><div class='add'>+		if (unlikely(skb_queue_empty(&amp;csk-&gt;listen_ctx-&gt;synq))) {</div><div class='add'>+			/* removed from synq */</div><div class='add'>+			bh_unlock_sock(lsk);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (likely(!sock_owned_by_user(lsk))) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			add_pass_open_to_parent(sk, lsk, cdev);</div><div class='add'>+		} else {</div><div class='add'>+			skb-&gt;sk = sk;</div><div class='add'>+			BLOG_SKB_CB(skb)-&gt;cdev = cdev;</div><div class='add'>+			BLOG_SKB_CB(skb)-&gt;backlog_rcv =</div><div class='add'>+				bl_add_pass_open_to_parent;</div><div class='add'>+			__sk_add_backlog(lsk, skb);</div><div class='add'>+		}</div><div class='add'>+		bh_unlock_sock(lsk);</div><div class='add'>+	}</div><div class='add'>+unlock:</div><div class='add'>+	bh_unlock_sock(sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handle receipt of an urgent pointer.</div><div class='add'>+ */</div><div class='add'>+static void handle_urg_ptr(struct sock *sk, u32 urg_seq)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	urg_seq--;</div><div class='add'>+	if (tp-&gt;urg_data &amp;&amp; !after(urg_seq, tp-&gt;urg_seq))</div><div class='add'>+		return;	/* duplicate pointer */</div><div class='add'>+</div><div class='add'>+	sk_send_sigurg(sk);</div><div class='add'>+	if (tp-&gt;urg_seq == tp-&gt;copied_seq &amp;&amp; tp-&gt;urg_data &amp;&amp;</div><div class='add'>+	    !sock_flag(sk, SOCK_URGINLINE) &amp;&amp;</div><div class='add'>+	    tp-&gt;copied_seq != tp-&gt;rcv_nxt) {</div><div class='add'>+		struct sk_buff *skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+</div><div class='add'>+		tp-&gt;copied_seq++;</div><div class='add'>+		if (skb &amp;&amp; tp-&gt;copied_seq - ULP_SKB_CB(skb)-&gt;seq &gt;= skb-&gt;len)</div><div class='add'>+			chtls_free_skb(sk, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tp-&gt;urg_data = TCP_URG_NOTYET;</div><div class='add'>+	tp-&gt;urg_seq = urg_seq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void check_sk_callbacks(struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = csk-&gt;sk;</div><div class='add'>+</div><div class='add'>+	if (unlikely(sk-&gt;sk_user_data &amp;&amp;</div><div class='add'>+		     !csk_flag_nochk(csk, CSK_CALLBACKS_CHKD)))</div><div class='add'>+		csk_set_flag(csk, CSK_CALLBACKS_CHKD);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Handles Rx data that arrives in a state where the socket isn't accepting</div><div class='add'>+ * new data.</div><div class='add'>+ */</div><div class='add'>+static void handle_excess_rx(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (!csk_flag(sk, CSK_ABORT_SHUTDOWN))</div><div class='add'>+		chtls_abort_conn(sk, skb);</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_recv_data(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_rx_data *hdr = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)) {</div><div class='add'>+		handle_excess_rx(sk, skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;seq = ntohl(hdr-&gt;seq);</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;psh = hdr-&gt;psh;</div><div class='add'>+	skb_ulp_mode(skb) = ULP_MODE_NONE;</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	__skb_pull(skb, sizeof(*hdr) + RSS_HDR);</div><div class='add'>+	if (!skb-&gt;data_len)</div><div class='add'>+		__skb_trim(skb, ntohs(hdr-&gt;len));</div><div class='add'>+</div><div class='add'>+	if (unlikely(hdr-&gt;urg))</div><div class='add'>+		handle_urg_ptr(sk, tp-&gt;rcv_nxt + ntohs(hdr-&gt;urg));</div><div class='add'>+	if (unlikely(tp-&gt;urg_data == TCP_URG_NOTYET &amp;&amp;</div><div class='add'>+		     tp-&gt;urg_seq - tp-&gt;rcv_nxt &lt; skb-&gt;len))</div><div class='add'>+		tp-&gt;urg_data = TCP_URG_VALID |</div><div class='add'>+			       skb-&gt;data[tp-&gt;urg_seq - tp-&gt;rcv_nxt];</div><div class='add'>+</div><div class='add'>+	if (unlikely(hdr-&gt;dack_mode != csk-&gt;delack_mode)) {</div><div class='add'>+		csk-&gt;delack_mode = hdr-&gt;dack_mode;</div><div class='add'>+		csk-&gt;delack_seq = tp-&gt;rcv_nxt;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tcp_hdr(skb)-&gt;fin = 0;</div><div class='add'>+	tp-&gt;rcv_nxt += skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='add'>+		check_sk_callbacks(csk);</div><div class='add'>+		sk-&gt;sk_data_ready(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_rx_data(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_rx_data *req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	unsigned int hwtid = GET_TID(req);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+	if (unlikely(!sk)) {</div><div class='add'>+		pr_err("can't find conn. for hwtid %u.\n", hwtid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	skb_dstref_steal(skb);</div><div class='add'>+	process_cpl_msg(chtls_recv_data, sk, skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_recv_pdu(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_tls_data *hdr = cplhdr(skb);</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_hws *tlsk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tlsk = &amp;csk-&gt;tlshws;</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)) {</div><div class='add'>+		handle_excess_rx(sk, skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;seq = ntohl(hdr-&gt;seq);</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;flags = 0;</div><div class='add'>+	skb_ulp_mode(skb) = ULP_MODE_TLS;</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	__skb_pull(skb, sizeof(*hdr));</div><div class='add'>+	if (!skb-&gt;data_len)</div><div class='add'>+		__skb_trim(skb,</div><div class='add'>+			   CPL_TLS_DATA_LENGTH_G(ntohl(hdr-&gt;length_pkd)));</div><div class='add'>+</div><div class='add'>+	if (unlikely(tp-&gt;urg_data == TCP_URG_NOTYET &amp;&amp; tp-&gt;urg_seq -</div><div class='add'>+		     tp-&gt;rcv_nxt &lt; skb-&gt;len))</div><div class='add'>+		tp-&gt;urg_data = TCP_URG_VALID |</div><div class='add'>+			       skb-&gt;data[tp-&gt;urg_seq - tp-&gt;rcv_nxt];</div><div class='add'>+</div><div class='add'>+	tcp_hdr(skb)-&gt;fin = 0;</div><div class='add'>+	tlsk-&gt;pldlen = CPL_TLS_DATA_LENGTH_G(ntohl(hdr-&gt;length_pkd));</div><div class='add'>+	__skb_queue_tail(&amp;tlsk-&gt;sk_recv_queue, skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_rx_pdu(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_tls_data *req = cplhdr(skb);</div><div class='add'>+	unsigned int hwtid = GET_TID(req);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+	if (unlikely(!sk)) {</div><div class='add'>+		pr_err("can't find conn. for hwtid %u.\n", hwtid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	skb_dstref_steal(skb);</div><div class='add'>+	process_cpl_msg(chtls_recv_pdu, sk, skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_set_hdrlen(struct sk_buff *skb, unsigned int nlen)</div><div class='add'>+{</div><div class='add'>+	struct tlsrx_cmp_hdr *tls_cmp_hdr = cplhdr(skb);</div><div class='add'>+</div><div class='add'>+	skb-&gt;hdr_len = ntohs((__force __be16)tls_cmp_hdr-&gt;length);</div><div class='add'>+	tls_cmp_hdr-&gt;length = ntohs((__force __be16)nlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_rx_hdr(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct tlsrx_cmp_hdr *tls_hdr_pkt;</div><div class='add'>+	struct cpl_rx_tls_cmp *cmp_cpl;</div><div class='add'>+	struct sk_buff *skb_rec;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_hws *tlsk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	cmp_cpl = cplhdr(skb);</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tlsk = &amp;csk-&gt;tlshws;</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;seq = ntohl(cmp_cpl-&gt;seq);</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;flags = 0;</div><div class='add'>+</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	__skb_pull(skb, sizeof(*cmp_cpl));</div><div class='add'>+	tls_hdr_pkt = (struct tlsrx_cmp_hdr *)skb-&gt;data;</div><div class='add'>+	if (tls_hdr_pkt-&gt;res_to_mac_error &amp; TLSRX_HDR_PKT_ERROR_M)</div><div class='add'>+		tls_hdr_pkt-&gt;type = CONTENT_TYPE_ERROR;</div><div class='add'>+	if (!skb-&gt;data_len)</div><div class='add'>+		__skb_trim(skb, TLS_HEADER_LENGTH);</div><div class='add'>+</div><div class='add'>+	tp-&gt;rcv_nxt +=</div><div class='add'>+		CPL_RX_TLS_CMP_PDULENGTH_G(ntohl(cmp_cpl-&gt;pdulength_length));</div><div class='add'>+</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;flags |= ULPCB_FLAG_TLS_HDR;</div><div class='add'>+	skb_rec = __skb_dequeue(&amp;tlsk-&gt;sk_recv_queue);</div><div class='add'>+	if (!skb_rec) {</div><div class='add'>+		__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+	} else {</div><div class='add'>+		chtls_set_hdrlen(skb, tlsk-&gt;pldlen);</div><div class='add'>+		tlsk-&gt;pldlen = 0;</div><div class='add'>+		__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb);</div><div class='add'>+		__skb_queue_tail(&amp;sk-&gt;sk_receive_queue, skb_rec);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='add'>+		check_sk_callbacks(csk);</div><div class='add'>+		sk-&gt;sk_data_ready(sk);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_rx_cmp(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_rx_tls_cmp *req = cplhdr(skb);</div><div class='add'>+	unsigned int hwtid = GET_TID(req);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+	if (unlikely(!sk)) {</div><div class='add'>+		pr_err("can't find conn. for hwtid %u.\n", hwtid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	skb_dstref_steal(skb);</div><div class='add'>+	process_cpl_msg(chtls_rx_hdr, sk, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_timewait(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	tp-&gt;rcv_nxt++;</div><div class='add'>+	tp-&gt;rx_opt.ts_recent_stamp = ktime_get_seconds();</div><div class='add'>+	tp-&gt;srtt_us = 0;</div><div class='add'>+	tcp_time_wait(sk, TCP_TIME_WAIT, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_peer_close(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (csk_flag_nochk(csk, CSK_ABORT_RPL_PENDING))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_shutdown |= RCV_SHUTDOWN;</div><div class='add'>+	sock_set_flag(sk, SOCK_DONE);</div><div class='add'>+</div><div class='add'>+	switch (sk-&gt;sk_state) {</div><div class='add'>+	case TCP_SYN_RECV:</div><div class='add'>+	case TCP_ESTABLISHED:</div><div class='add'>+		tcp_set_state(sk, TCP_CLOSE_WAIT);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_FIN_WAIT1:</div><div class='add'>+		tcp_set_state(sk, TCP_CLOSING);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_FIN_WAIT2:</div><div class='add'>+		chtls_release_resources(sk);</div><div class='add'>+		if (csk_flag_nochk(csk, CSK_ABORT_RPL_PENDING))</div><div class='add'>+			chtls_conn_done(sk);</div><div class='add'>+		else</div><div class='add'>+			chtls_timewait(sk);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_info("cpl_peer_close in bad state %d\n", sk-&gt;sk_state);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!sock_flag(sk, SOCK_DEAD)) {</div><div class='add'>+		sk-&gt;sk_state_change(sk);</div><div class='add'>+		/* Do not send POLL_HUP for half duplex close. */</div><div class='add'>+</div><div class='add'>+		if ((sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN) ||</div><div class='add'>+		    sk-&gt;sk_state == TCP_CLOSE)</div><div class='add'>+			sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);</div><div class='add'>+		else</div><div class='add'>+			sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_close_con_rpl(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_close_con_rpl *rpl = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (csk_flag_nochk(csk, CSK_ABORT_RPL_PENDING))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	tp-&gt;snd_una = ntohl(rpl-&gt;snd_nxt) - 1;  /* exclude FIN */</div><div class='add'>+</div><div class='add'>+	switch (sk-&gt;sk_state) {</div><div class='add'>+	case TCP_CLOSING:</div><div class='add'>+		chtls_release_resources(sk);</div><div class='add'>+		if (csk_flag_nochk(csk, CSK_ABORT_RPL_PENDING))</div><div class='add'>+			chtls_conn_done(sk);</div><div class='add'>+		else</div><div class='add'>+			chtls_timewait(sk);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_LAST_ACK:</div><div class='add'>+		chtls_release_resources(sk);</div><div class='add'>+		chtls_conn_done(sk);</div><div class='add'>+		break;</div><div class='add'>+	case TCP_FIN_WAIT1:</div><div class='add'>+		tcp_set_state(sk, TCP_FIN_WAIT2);</div><div class='add'>+		sk-&gt;sk_shutdown |= SEND_SHUTDOWN;</div><div class='add'>+</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk-&gt;sk_state_change(sk);</div><div class='add'>+		else if (tcp_sk(sk)-&gt;linger2 &lt; 0 &amp;&amp;</div><div class='add'>+			 !csk_flag_nochk(csk, CSK_ABORT_SHUTDOWN))</div><div class='add'>+			chtls_abort_conn(sk, skb);</div><div class='add'>+		else if (csk_flag_nochk(csk, CSK_TX_DATA_SENT))</div><div class='add'>+			chtls_set_quiesce_ctrl(sk, 0);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		pr_info("close_con_rpl in bad state %d\n", sk-&gt;sk_state);</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *get_cpl_skb(struct sk_buff *skb,</div><div class='add'>+				   size_t len, gfp_t gfp)</div><div class='add'>+{</div><div class='add'>+	if (likely(!skb_is_nonlinear(skb) &amp;&amp; !skb_cloned(skb))) {</div><div class='add'>+		WARN_ONCE(skb-&gt;len &lt; len, "skb alloc error");</div><div class='add'>+		__skb_trim(skb, len);</div><div class='add'>+		skb_get(skb);</div><div class='add'>+	} else {</div><div class='add'>+		skb = alloc_skb(len, gfp);</div><div class='add'>+		if (skb)</div><div class='add'>+			__skb_put(skb, len);</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void set_abort_rpl_wr(struct sk_buff *skb, unsigned int tid,</div><div class='add'>+			     int cmd)</div><div class='add'>+{</div><div class='add'>+	struct cpl_abort_rpl *rpl = cplhdr(skb);</div><div class='add'>+</div><div class='add'>+	INIT_TP_WR_CPL(rpl, CPL_ABORT_RPL, tid);</div><div class='add'>+	rpl-&gt;cmd = cmd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void send_defer_abort_rpl(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_abort_req_rss *req = cplhdr(skb);</div><div class='add'>+	struct sk_buff *reply_skb;</div><div class='add'>+</div><div class='add'>+	reply_skb = alloc_skb(sizeof(struct cpl_abort_rpl),</div><div class='add'>+			      GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+	__skb_put(reply_skb, sizeof(struct cpl_abort_rpl));</div><div class='add'>+	set_abort_rpl_wr(reply_skb, GET_TID(req),</div><div class='add'>+			 (req-&gt;status &amp; CPL_ABORT_NO_RST));</div><div class='add'>+	set_wr_txq(reply_skb, CPL_PRIORITY_DATA, req-&gt;status &gt;&gt; 1);</div><div class='add'>+	cxgb4_ofld_send(cdev-&gt;lldi-&gt;ports[0], reply_skb);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Add an skb to the deferred skb queue for processing from process context.</div><div class='add'>+ */</div><div class='add'>+static void t4_defer_reply(struct sk_buff *skb, struct chtls_dev *cdev,</div><div class='add'>+			   defer_handler_t handler)</div><div class='add'>+{</div><div class='add'>+	DEFERRED_SKB_CB(skb)-&gt;handler = handler;</div><div class='add'>+	spin_lock_bh(&amp;cdev-&gt;deferq.lock);</div><div class='add'>+	__skb_queue_tail(&amp;cdev-&gt;deferq, skb);</div><div class='add'>+	if (skb_queue_len(&amp;cdev-&gt;deferq) == 1)</div><div class='add'>+		schedule_work(&amp;cdev-&gt;deferq_task);</div><div class='add'>+	spin_unlock_bh(&amp;cdev-&gt;deferq.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_send_abort_rpl(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+				 struct chtls_dev *cdev,</div><div class='add'>+				 int status, int queue)</div><div class='add'>+{</div><div class='add'>+	struct cpl_abort_req_rss *req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct sk_buff *reply_skb;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	unsigned int tid;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tid = GET_TID(req);</div><div class='add'>+</div><div class='add'>+	reply_skb = get_cpl_skb(skb, sizeof(struct cpl_abort_rpl), gfp_any());</div><div class='add'>+	if (!reply_skb) {</div><div class='add'>+		req-&gt;status = (queue &lt;&lt; 1) | status;</div><div class='add'>+		t4_defer_reply(skb, cdev, send_defer_abort_rpl);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	set_abort_rpl_wr(reply_skb, tid, status);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	set_wr_txq(reply_skb, CPL_PRIORITY_DATA, queue);</div><div class='add'>+	if (csk_conn_inline(csk)) {</div><div class='add'>+		struct l2t_entry *e = csk-&gt;l2t_entry;</div><div class='add'>+</div><div class='add'>+		if (e &amp;&amp; sk-&gt;sk_state != TCP_SYN_RECV) {</div><div class='add'>+			cxgb4_l2t_send(csk-&gt;egress_dev, reply_skb, e);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	cxgb4_ofld_send(cdev-&gt;lldi-&gt;ports[0], reply_skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * This is run from a listener's backlog to abort a child connection in</div><div class='add'>+ * SYN_RCV state (i.e., one on the listener's SYN queue).</div><div class='add'>+ */</div><div class='add'>+static void bl_abort_syn_rcv(struct sock *lsk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct sock *child;</div><div class='add'>+	int queue;</div><div class='add'>+</div><div class='add'>+	child = skb-&gt;sk;</div><div class='add'>+	csk = rcu_dereference_sk_user_data(child);</div><div class='add'>+	queue = csk-&gt;txq_idx;</div><div class='add'>+</div><div class='add'>+	skb-&gt;sk	= NULL;</div><div class='add'>+	chtls_send_abort_rpl(child, skb, BLOG_SKB_CB(skb)-&gt;cdev,</div><div class='add'>+			     CPL_ABORT_NO_RST, queue);</div><div class='add'>+	do_abort_syn_rcv(child, lsk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int abort_syn_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct request_sock *oreq;</div><div class='add'>+	struct listen_ctx *listen_ctx;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct sock *psk;</div><div class='add'>+	void *ctx;</div><div class='add'>+</div><div class='add'>+	csk = sk-&gt;sk_user_data;</div><div class='add'>+	oreq = csk-&gt;passive_reap_next;</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	if (!oreq)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	ctx = lookup_stid(cdev-&gt;tids, oreq-&gt;ts_recent);</div><div class='add'>+	if (!ctx)</div><div class='add'>+		return -1;</div><div class='add'>+</div><div class='add'>+	listen_ctx = (struct listen_ctx *)ctx;</div><div class='add'>+	psk = listen_ctx-&gt;lsk;</div><div class='add'>+</div><div class='add'>+	bh_lock_sock(psk);</div><div class='add'>+	if (!sock_owned_by_user(psk)) {</div><div class='add'>+		int queue = csk-&gt;txq_idx;</div><div class='add'>+</div><div class='add'>+		chtls_send_abort_rpl(sk, skb, cdev, CPL_ABORT_NO_RST, queue);</div><div class='add'>+		do_abort_syn_rcv(sk, psk);</div><div class='add'>+	} else {</div><div class='add'>+		skb-&gt;sk = sk;</div><div class='add'>+		BLOG_SKB_CB(skb)-&gt;backlog_rcv = bl_abort_syn_rcv;</div><div class='add'>+		__sk_add_backlog(psk, skb);</div><div class='add'>+	}</div><div class='add'>+	bh_unlock_sock(psk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_abort_req_rss(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	const struct cpl_abort_req_rss *req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct chtls_sock *csk = sk-&gt;sk_user_data;</div><div class='add'>+	int rst_status = CPL_ABORT_NO_RST;</div><div class='add'>+	int queue = csk-&gt;txq_idx;</div><div class='add'>+</div><div class='add'>+	if (is_neg_adv(req-&gt;status)) {</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	csk_reset_flag(csk, CSK_ABORT_REQ_RCVD);</div><div class='add'>+</div><div class='add'>+	if (!csk_flag_nochk(csk, CSK_ABORT_SHUTDOWN) &amp;&amp;</div><div class='add'>+	    !csk_flag_nochk(csk, CSK_TX_DATA_SENT)) {</div><div class='add'>+		struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+		if (send_tx_flowc_wr(sk, 0, tp-&gt;snd_nxt, tp-&gt;rcv_nxt) &lt; 0)</div><div class='add'>+			WARN_ONCE(1, "send_tx_flowc error");</div><div class='add'>+		csk_set_flag(csk, CSK_TX_DATA_SENT);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	csk_set_flag(csk, CSK_ABORT_SHUTDOWN);</div><div class='add'>+</div><div class='add'>+	if (!csk_flag_nochk(csk, CSK_ABORT_RPL_PENDING)) {</div><div class='add'>+		sk-&gt;sk_err = ETIMEDOUT;</div><div class='add'>+</div><div class='add'>+		if (!sock_flag(sk, SOCK_DEAD))</div><div class='add'>+			sk_error_report(sk);</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_state == TCP_SYN_RECV &amp;&amp; !abort_syn_rcv(sk, skb))</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	chtls_send_abort_rpl(sk, skb, BLOG_SKB_CB(skb)-&gt;cdev,</div><div class='add'>+			     rst_status, queue);</div><div class='add'>+	chtls_release_resources(sk);</div><div class='add'>+	chtls_conn_done(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_abort_rpl_rss(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_abort_rpl_rss *rpl = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	if (csk_flag_nochk(csk, CSK_ABORT_RPL_PENDING)) {</div><div class='add'>+		csk_reset_flag(csk, CSK_ABORT_RPL_PENDING);</div><div class='add'>+		if (!csk_flag_nochk(csk, CSK_ABORT_REQ_RCVD)) {</div><div class='add'>+			if (sk-&gt;sk_state == TCP_SYN_SENT) {</div><div class='add'>+				cxgb4_remove_tid(cdev-&gt;tids,</div><div class='add'>+						 csk-&gt;port_id,</div><div class='add'>+						 GET_TID(rpl),</div><div class='add'>+						 sk-&gt;sk_family);</div><div class='add'>+				sock_put(sk);</div><div class='add'>+			}</div><div class='add'>+			chtls_release_resources(sk);</div><div class='add'>+			chtls_conn_done(sk);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_conn_cpl(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_peer_close *req = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	void (*fn)(struct sock *sk, struct sk_buff *skb);</div><div class='add'>+	unsigned int hwtid = GET_TID(req);</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	u8 opcode;</div><div class='add'>+</div><div class='add'>+	opcode = ((const struct rss_header *)cplhdr(skb))-&gt;opcode;</div><div class='add'>+</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+	if (!sk)</div><div class='add'>+		goto rel_skb;</div><div class='add'>+</div><div class='add'>+	csk = sk-&gt;sk_user_data;</div><div class='add'>+</div><div class='add'>+	switch (opcode) {</div><div class='add'>+	case CPL_PEER_CLOSE:</div><div class='add'>+		fn = chtls_peer_close;</div><div class='add'>+		break;</div><div class='add'>+	case CPL_CLOSE_CON_RPL:</div><div class='add'>+		fn = chtls_close_con_rpl;</div><div class='add'>+		break;</div><div class='add'>+	case CPL_ABORT_REQ_RSS:</div><div class='add'>+		/*</div><div class='add'>+		 * Save the offload device in the skb, we may process this</div><div class='add'>+		 * message after the socket has closed.</div><div class='add'>+		 */</div><div class='add'>+		BLOG_SKB_CB(skb)-&gt;cdev = csk-&gt;cdev;</div><div class='add'>+		fn = chtls_abort_req_rss;</div><div class='add'>+		break;</div><div class='add'>+	case CPL_ABORT_RPL_RSS:</div><div class='add'>+		fn = chtls_abort_rpl_rss;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		goto rel_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	process_cpl_msg(fn, sk, skb);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+rel_skb:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_rx_ack(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_fw4_ack *hdr = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	struct chtls_sock *csk = sk-&gt;sk_user_data;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 credits = hdr-&gt;credits;</div><div class='add'>+	u32 snd_una;</div><div class='add'>+</div><div class='add'>+	snd_una = ntohl(hdr-&gt;snd_una);</div><div class='add'>+	csk-&gt;wr_credits += credits;</div><div class='add'>+</div><div class='add'>+	if (csk-&gt;wr_unacked &gt; csk-&gt;wr_max_credits - csk-&gt;wr_credits)</div><div class='add'>+		csk-&gt;wr_unacked = csk-&gt;wr_max_credits - csk-&gt;wr_credits;</div><div class='add'>+</div><div class='add'>+	while (credits) {</div><div class='add'>+		struct sk_buff *pskb = csk-&gt;wr_skb_head;</div><div class='add'>+		u32 csum;</div><div class='add'>+</div><div class='add'>+		if (unlikely(!pskb)) {</div><div class='add'>+			if (csk-&gt;wr_nondata)</div><div class='add'>+				csk-&gt;wr_nondata -= credits;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		csum = (__force u32)pskb-&gt;csum;</div><div class='add'>+		if (unlikely(credits &lt; csum)) {</div><div class='add'>+			pskb-&gt;csum = (__force __wsum)(csum - credits);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		dequeue_wr(sk);</div><div class='add'>+		credits -= csum;</div><div class='add'>+		kfree_skb(pskb);</div><div class='add'>+	}</div><div class='add'>+	if (hdr-&gt;seq_vld &amp; CPL_FW4_ACK_FLAGS_SEQVAL) {</div><div class='add'>+		if (unlikely(before(snd_una, tp-&gt;snd_una))) {</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (tp-&gt;snd_una != snd_una) {</div><div class='add'>+			tp-&gt;snd_una = snd_una;</div><div class='add'>+			tp-&gt;rcv_tstamp = tcp_jiffies32;</div><div class='add'>+			if (tp-&gt;snd_una == tp-&gt;snd_nxt &amp;&amp;</div><div class='add'>+			    !csk_flag_nochk(csk, CSK_TX_FAILOVER))</div><div class='add'>+				csk_reset_flag(csk, CSK_TX_WAIT_IDLE);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (hdr-&gt;seq_vld &amp; CPL_FW4_ACK_FLAGS_CH) {</div><div class='add'>+		unsigned int fclen16 = roundup(failover_flowc_wr_len, 16);</div><div class='add'>+</div><div class='add'>+		csk-&gt;wr_credits -= fclen16;</div><div class='add'>+		csk_reset_flag(csk, CSK_TX_WAIT_IDLE);</div><div class='add'>+		csk_reset_flag(csk, CSK_TX_FAILOVER);</div><div class='add'>+	}</div><div class='add'>+	if (skb_queue_len(&amp;csk-&gt;txq) &amp;&amp; chtls_push_frames(csk, 0))</div><div class='add'>+		sk-&gt;sk_write_space(sk);</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_wr_ack(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_fw4_ack *rpl = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	unsigned int hwtid = GET_TID(rpl);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+	if (unlikely(!sk)) {</div><div class='add'>+		pr_err("can't find conn. for hwtid %u.\n", hwtid);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+	process_cpl_msg(chtls_rx_ack, sk, skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_set_tcb_rpl(struct chtls_dev *cdev, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct cpl_set_tcb_rpl *rpl = cplhdr(skb) + RSS_HDR;</div><div class='add'>+	unsigned int hwtid = GET_TID(rpl);</div><div class='add'>+	struct sock *sk;</div><div class='add'>+</div><div class='add'>+	sk = lookup_tid(cdev-&gt;tids, hwtid);</div><div class='add'>+</div><div class='add'>+	/* return EINVAL if socket doesn't exist */</div><div class='add'>+	if (!sk)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* Reusing the skb as size of cpl_set_tcb_field structure</div><div class='add'>+	 * is greater than cpl_abort_req</div><div class='add'>+	 */</div><div class='add'>+	if (TCB_COOKIE_G(rpl-&gt;cookie) == TCB_FIELD_COOKIE_TFLAG)</div><div class='add'>+		chtls_send_abort(sk, CPL_ABORT_SEND_RST, NULL);</div><div class='add'>+</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+chtls_handler_func chtls_handlers[NUM_CPL_CMDS] = {</div><div class='add'>+	[CPL_PASS_OPEN_RPL]     = chtls_pass_open_rpl,</div><div class='add'>+	[CPL_CLOSE_LISTSRV_RPL] = chtls_close_listsrv_rpl,</div><div class='add'>+	[CPL_PASS_ACCEPT_REQ]   = chtls_pass_accept_req,</div><div class='add'>+	[CPL_PASS_ESTABLISH]    = chtls_pass_establish,</div><div class='add'>+	[CPL_RX_DATA]           = chtls_rx_data,</div><div class='add'>+	[CPL_TLS_DATA]          = chtls_rx_pdu,</div><div class='add'>+	[CPL_RX_TLS_CMP]        = chtls_rx_cmp,</div><div class='add'>+	[CPL_PEER_CLOSE]        = chtls_conn_cpl,</div><div class='add'>+	[CPL_CLOSE_CON_RPL]     = chtls_conn_cpl,</div><div class='add'>+	[CPL_ABORT_REQ_RSS]     = chtls_conn_cpl,</div><div class='add'>+	[CPL_ABORT_RPL_RSS]     = chtls_conn_cpl,</div><div class='add'>+	[CPL_FW4_ACK]		= chtls_wr_ack,</div><div class='add'>+	[CPL_SET_TCB_RPL]	= chtls_set_tcb_rpl,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h<br/>new file mode 100644<br/>index 000000000000..29ceff5a5fcb<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.h</a></div><div class='hunk'>@@ -0,0 +1,218 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Chelsio Communications, Inc.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __CHTLS_CM_H__</div><div class='add'>+#define __CHTLS_CM_H__</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * TCB settings</div><div class='add'>+ */</div><div class='add'>+/* 3:0 */</div><div class='add'>+#define TCB_ULP_TYPE_W    0</div><div class='add'>+#define TCB_ULP_TYPE_S    0</div><div class='add'>+#define TCB_ULP_TYPE_M    0xfULL</div><div class='add'>+#define TCB_ULP_TYPE_V(x) ((x) &lt;&lt; TCB_ULP_TYPE_S)</div><div class='add'>+</div><div class='add'>+/* 11:4 */</div><div class='add'>+#define TCB_ULP_RAW_W    0</div><div class='add'>+#define TCB_ULP_RAW_S    4</div><div class='add'>+#define TCB_ULP_RAW_M    0xffULL</div><div class='add'>+#define TCB_ULP_RAW_V(x) ((x) &lt;&lt; TCB_ULP_RAW_S)</div><div class='add'>+</div><div class='add'>+#define TF_TLS_KEY_SIZE_S    7</div><div class='add'>+#define TF_TLS_KEY_SIZE_V(x) ((x) &lt;&lt; TF_TLS_KEY_SIZE_S)</div><div class='add'>+</div><div class='add'>+#define TF_TLS_CONTROL_S     2</div><div class='add'>+#define TF_TLS_CONTROL_V(x) ((x) &lt;&lt; TF_TLS_CONTROL_S)</div><div class='add'>+</div><div class='add'>+#define TF_TLS_ACTIVE_S      1</div><div class='add'>+#define TF_TLS_ACTIVE_V(x) ((x) &lt;&lt; TF_TLS_ACTIVE_S)</div><div class='add'>+</div><div class='add'>+#define TF_TLS_ENABLE_S      0</div><div class='add'>+#define TF_TLS_ENABLE_V(x) ((x) &lt;&lt; TF_TLS_ENABLE_S)</div><div class='add'>+</div><div class='add'>+#define TF_RX_QUIESCE_S    15</div><div class='add'>+#define TF_RX_QUIESCE_V(x) ((x) &lt;&lt; TF_RX_QUIESCE_S)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Max receive window supported by HW in bytes.  Only a small part of it can</div><div class='add'>+ * be set through option0, the rest needs to be set through RX_DATA_ACK.</div><div class='add'>+ */</div><div class='add'>+#define MAX_RCV_WND ((1U &lt;&lt; 27) - 1)</div><div class='add'>+#define MAX_MSS     65536</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Min receive window.  We want it to be large enough to accommodate receive</div><div class='add'>+ * coalescing, handle jumbo frames, and not trigger sender SWS avoidance.</div><div class='add'>+ */</div><div class='add'>+#define MIN_RCV_WND (24 * 1024U)</div><div class='add'>+#define LOOPBACK(x)     (((x) &amp; htonl(0xff000000)) == htonl(0x7f000000))</div><div class='add'>+</div><div class='add'>+/* for TX: a skb must have a headroom of at least TX_HEADER_LEN bytes */</div><div class='add'>+#define TX_HEADER_LEN \</div><div class='add'>+	(sizeof(struct fw_ofld_tx_data_wr) + sizeof(struct sge_opaque_hdr))</div><div class='add'>+#define TX_TLSHDR_LEN \</div><div class='add'>+	(sizeof(struct fw_tlstx_data_wr) + sizeof(struct cpl_tx_tls_sfo) + \</div><div class='add'>+	 sizeof(struct sge_opaque_hdr))</div><div class='add'>+#define TXDATA_SKB_LEN 128</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	CPL_TX_TLS_SFO_TYPE_CCS,</div><div class='add'>+	CPL_TX_TLS_SFO_TYPE_ALERT,</div><div class='add'>+	CPL_TX_TLS_SFO_TYPE_HANDSHAKE,</div><div class='add'>+	CPL_TX_TLS_SFO_TYPE_DATA,</div><div class='add'>+	CPL_TX_TLS_SFO_TYPE_HEARTBEAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum {</div><div class='add'>+	TLS_HDR_TYPE_CCS = 20,</div><div class='add'>+	TLS_HDR_TYPE_ALERT,</div><div class='add'>+	TLS_HDR_TYPE_HANDSHAKE,</div><div class='add'>+	TLS_HDR_TYPE_RECORD,</div><div class='add'>+	TLS_HDR_TYPE_HEARTBEAT,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef void (*defer_handler_t)(struct chtls_dev *dev, struct sk_buff *skb);</div><div class='add'>+extern struct request_sock_ops chtls_rsk_ops;</div><div class='add'>+extern struct request_sock_ops chtls_rsk_opsv6;</div><div class='add'>+</div><div class='add'>+struct deferred_skb_cb {</div><div class='add'>+	defer_handler_t handler;</div><div class='add'>+	struct chtls_dev *dev;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DEFERRED_SKB_CB(skb) ((struct deferred_skb_cb *)(skb)-&gt;cb)</div><div class='add'>+#define failover_flowc_wr_len offsetof(struct fw_flowc_wr, mnemval[3])</div><div class='add'>+#define WR_SKB_CB(skb) ((struct wr_skb_cb *)(skb)-&gt;cb)</div><div class='add'>+#define ACCEPT_QUEUE(sk) (&amp;inet_csk(sk)-&gt;icsk_accept_queue.rskq_accept_head)</div><div class='add'>+</div><div class='add'>+#define SND_WSCALE(tp) ((tp)-&gt;rx_opt.snd_wscale)</div><div class='add'>+#define RCV_WSCALE(tp) ((tp)-&gt;rx_opt.rcv_wscale)</div><div class='add'>+#define USER_MSS(tp) (READ_ONCE((tp)-&gt;rx_opt.user_mss))</div><div class='add'>+#define TS_RECENT_STAMP(tp) ((tp)-&gt;rx_opt.ts_recent_stamp)</div><div class='add'>+#define WSCALE_OK(tp) ((tp)-&gt;rx_opt.wscale_ok)</div><div class='add'>+#define TSTAMP_OK(tp) ((tp)-&gt;rx_opt.tstamp_ok)</div><div class='add'>+#define SACK_OK(tp) ((tp)-&gt;rx_opt.sack_ok)</div><div class='add'>+</div><div class='add'>+/* TLS SKB */</div><div class='add'>+#define skb_ulp_tls_inline(skb)      (ULP_SKB_CB(skb)-&gt;ulp.tls.ofld)</div><div class='add'>+#define skb_ulp_tls_iv_imm(skb)      (ULP_SKB_CB(skb)-&gt;ulp.tls.iv)</div><div class='add'>+</div><div class='add'>+void chtls_defer_reply(struct sk_buff *skb, struct chtls_dev *dev,</div><div class='add'>+		       defer_handler_t handler);</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if the socket is in one of the supplied states.</div><div class='add'>+ */</div><div class='add'>+static inline unsigned int sk_in_state(const struct sock *sk,</div><div class='add'>+				       unsigned int states)</div><div class='add'>+{</div><div class='add'>+	return states &amp; (1 &lt;&lt; sk-&gt;sk_state);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_rsk_destructor(struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	/* do nothing */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_init_rsk_ops(struct proto *chtls_tcp_prot,</div><div class='add'>+				      struct request_sock_ops *chtls_tcp_ops,</div><div class='add'>+				      struct proto *tcp_prot, int family)</div><div class='add'>+{</div><div class='add'>+	memset(chtls_tcp_ops, 0, sizeof(*chtls_tcp_ops));</div><div class='add'>+	chtls_tcp_ops-&gt;family = family;</div><div class='add'>+	chtls_tcp_ops-&gt;obj_size = sizeof(struct tcp_request_sock);</div><div class='add'>+	chtls_tcp_ops-&gt;destructor = chtls_rsk_destructor;</div><div class='add'>+	chtls_tcp_ops-&gt;slab = tcp_prot-&gt;rsk_prot-&gt;slab;</div><div class='add'>+	chtls_tcp_prot-&gt;rsk_prot = chtls_tcp_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_reqsk_free(struct request_sock *req)</div><div class='add'>+{</div><div class='add'>+	if (req-&gt;rsk_listener)</div><div class='add'>+		sock_put(req-&gt;rsk_listener);</div><div class='add'>+	kmem_cache_free(req-&gt;rsk_ops-&gt;slab, req);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define DECLARE_TASK_FUNC(task, task_param) \</div><div class='add'>+		static void task(struct work_struct *task_param)</div><div class='add'>+</div><div class='add'>+static inline void sk_wakeup_sleepers(struct sock *sk, bool interruptable)</div><div class='add'>+{</div><div class='add'>+	struct socket_wq *wq;</div><div class='add'>+</div><div class='add'>+	rcu_read_lock();</div><div class='add'>+	wq = rcu_dereference(sk-&gt;sk_wq);</div><div class='add'>+	if (skwq_has_sleeper(wq)) {</div><div class='add'>+		if (interruptable)</div><div class='add'>+			wake_up_interruptible(sk_sleep(sk));</div><div class='add'>+		else</div><div class='add'>+			wake_up_all(sk_sleep(sk));</div><div class='add'>+	}</div><div class='add'>+	rcu_read_unlock();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_set_req_port(struct request_sock *oreq,</div><div class='add'>+				      __be16 source, __be16 dest)</div><div class='add'>+{</div><div class='add'>+	inet_rsk(oreq)-&gt;ir_rmt_port = source;</div><div class='add'>+	inet_rsk(oreq)-&gt;ir_num = ntohs(dest);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_set_req_addr(struct request_sock *oreq,</div><div class='add'>+				      __be32 local_ip, __be32 peer_ip)</div><div class='add'>+{</div><div class='add'>+	inet_rsk(oreq)-&gt;ir_loc_addr = local_ip;</div><div class='add'>+	inet_rsk(oreq)-&gt;ir_rmt_addr = peer_ip;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_free_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb_dstref_steal(skb);</div><div class='add'>+	__skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	__kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_kfree_skb(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	skb_dstref_steal(skb);</div><div class='add'>+	__skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_reset_wr_list(struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	csk-&gt;wr_skb_head = NULL;</div><div class='add'>+	csk-&gt;wr_skb_tail = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void enqueue_wr(struct chtls_sock *csk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	WR_SKB_CB(skb)-&gt;next_wr = NULL;</div><div class='add'>+</div><div class='add'>+	skb_get(skb);</div><div class='add'>+</div><div class='add'>+	if (!csk-&gt;wr_skb_head)</div><div class='add'>+		csk-&gt;wr_skb_head = skb;</div><div class='add'>+	else</div><div class='add'>+		WR_SKB_CB(csk-&gt;wr_skb_tail)-&gt;next_wr = skb;</div><div class='add'>+	csk-&gt;wr_skb_tail = skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline struct sk_buff *dequeue_wr(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+</div><div class='add'>+	skb = csk-&gt;wr_skb_head;</div><div class='add'>+</div><div class='add'>+	if (likely(skb)) {</div><div class='add'>+	 /* Don't bother clearing the tail */</div><div class='add'>+		csk-&gt;wr_skb_head = WR_SKB_CB(skb)-&gt;next_wr;</div><div class='add'>+		WR_SKB_CB(skb)-&gt;next_wr = NULL;</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c<br/>new file mode 100644<br/>index 000000000000..fab6df21f01c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_hw.c</a></div><div class='hunk'>@@ -0,0 +1,462 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Chelsio Communications, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Written by: Atul Gupta (atul.gupta@chelsio.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/tls.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chtls.h"</div><div class='add'>+#include "chtls_cm.h"</div><div class='add'>+</div><div class='add'>+static void __set_tcb_field_direct(struct chtls_sock *csk,</div><div class='add'>+				   struct cpl_set_tcb_field *req, u16 word,</div><div class='add'>+				   u64 mask, u64 val, u8 cookie, int no_reply)</div><div class='add'>+{</div><div class='add'>+	struct ulptx_idata *sc;</div><div class='add'>+</div><div class='add'>+	INIT_TP_WR_CPL(req, CPL_SET_TCB_FIELD, csk-&gt;tid);</div><div class='add'>+	req-&gt;wr.wr_mid |= htonl(FW_WR_FLOWID_V(csk-&gt;tid));</div><div class='add'>+	req-&gt;reply_ctrl = htons(NO_REPLY_V(no_reply) |</div><div class='add'>+				QUEUENO_V(csk-&gt;rss_qid));</div><div class='add'>+	req-&gt;word_cookie = htons(TCB_WORD_V(word) | TCB_COOKIE_V(cookie));</div><div class='add'>+	req-&gt;mask = cpu_to_be64(mask);</div><div class='add'>+	req-&gt;val = cpu_to_be64(val);</div><div class='add'>+	sc = (struct ulptx_idata *)(req + 1);</div><div class='add'>+	sc-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_NOOP));</div><div class='add'>+	sc-&gt;len = htonl(0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __set_tcb_field(struct sock *sk, struct sk_buff *skb, u16 word,</div><div class='add'>+			    u64 mask, u64 val, u8 cookie, int no_reply)</div><div class='add'>+{</div><div class='add'>+	struct cpl_set_tcb_field *req;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct ulptx_idata *sc;</div><div class='add'>+	unsigned int wrlen;</div><div class='add'>+</div><div class='add'>+	wrlen = roundup(sizeof(*req) + sizeof(*sc), 16);</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	req = (struct cpl_set_tcb_field *)__skb_put(skb, wrlen);</div><div class='add'>+	__set_tcb_field_direct(csk, req, word, mask, val, cookie, no_reply);</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_CONTROL, csk-&gt;port_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send control message to HW, message go as immediate data and packet</div><div class='add'>+ * is freed immediately.</div><div class='add'>+ */</div><div class='add'>+static int chtls_set_tcb_field(struct sock *sk, u16 word, u64 mask, u64 val)</div><div class='add'>+{</div><div class='add'>+	struct cpl_set_tcb_field *req;</div><div class='add'>+	unsigned int credits_needed;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct ulptx_idata *sc;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int wrlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wrlen = roundup(sizeof(*req) + sizeof(*sc), 16);</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(wrlen, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	credits_needed = DIV_ROUND_UP(wrlen, 16);</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	__set_tcb_field(sk, skb, word, mask, val, 0, 1);</div><div class='add'>+	skb_set_queue_mapping(skb, (csk-&gt;txq_idx &lt;&lt; 1) | CPL_PRIORITY_DATA);</div><div class='add'>+	csk-&gt;wr_credits -= credits_needed;</div><div class='add'>+	csk-&gt;wr_unacked += credits_needed;</div><div class='add'>+	enqueue_wr(csk, skb);</div><div class='add'>+	ret = cxgb4_ofld_send(csk-&gt;egress_dev, skb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	return ret &lt; 0 ? ret : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_set_tcb_field_rpl_skb(struct sock *sk, u16 word,</div><div class='add'>+				 u64 mask, u64 val, u8 cookie,</div><div class='add'>+				 int through_l2t)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int wrlen;</div><div class='add'>+</div><div class='add'>+	wrlen = sizeof(struct cpl_set_tcb_field) + sizeof(struct ulptx_idata);</div><div class='add'>+	wrlen = roundup(wrlen, 16);</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(wrlen, GFP_KERNEL | __GFP_NOFAIL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	__set_tcb_field(sk, skb, word, mask, val, cookie, 0);</div><div class='add'>+	send_or_defer(sk, tcp_sk(sk), skb, through_l2t);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_set_tcb_keyid(struct sock *sk, int keyid)</div><div class='add'>+{</div><div class='add'>+	return chtls_set_tcb_field(sk, 31, 0xFFFFFFFFULL, keyid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_set_tcb_seqno(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return chtls_set_tcb_field(sk, 28, ~0ULL, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_set_tcb_quiesce(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	return chtls_set_tcb_field(sk, 1, (1ULL &lt;&lt; TF_RX_QUIESCE_S),</div><div class='add'>+				   TF_RX_QUIESCE_V(val));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_set_quiesce_ctrl(struct sock *sk, int val)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int wrlen;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	wrlen = sizeof(struct cpl_set_tcb_field) + sizeof(struct ulptx_idata);</div><div class='add'>+	wrlen = roundup(wrlen, 16);</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(wrlen, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	__set_tcb_field(sk, skb, 1, TF_RX_QUIESCE_V(1), 0, 0, 1);</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_CONTROL, csk-&gt;port_id);</div><div class='add'>+	ret = cxgb4_ofld_send(csk-&gt;egress_dev, skb);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TLS Key bitmap processing */</div><div class='add'>+int chtls_init_kmap(struct chtls_dev *cdev, struct cxgb4_lld_info *lldi)</div><div class='add'>+{</div><div class='add'>+	unsigned int num_key_ctx, bsize;</div><div class='add'>+	int ksize;</div><div class='add'>+</div><div class='add'>+	num_key_ctx = (lldi-&gt;vr-&gt;key.size / TLS_KEY_CONTEXT_SZ);</div><div class='add'>+	bsize = BITS_TO_LONGS(num_key_ctx);</div><div class='add'>+</div><div class='add'>+	cdev-&gt;kmap.size = num_key_ctx;</div><div class='add'>+	cdev-&gt;kmap.available = bsize;</div><div class='add'>+	ksize = sizeof(*cdev-&gt;kmap.addr) * bsize;</div><div class='add'>+	cdev-&gt;kmap.addr = kvzalloc(ksize, GFP_KERNEL);</div><div class='add'>+	if (!cdev-&gt;kmap.addr)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	cdev-&gt;kmap.start = lldi-&gt;vr-&gt;key.start;</div><div class='add'>+	spin_lock_init(&amp;cdev-&gt;kmap.lock);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_new_keyid(struct chtls_sock *csk, u32 optname)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = csk-&gt;egress_dev;</div><div class='add'>+	struct chtls_dev *cdev = csk-&gt;cdev;</div><div class='add'>+	struct chtls_hws *hws;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	int keyid;</div><div class='add'>+</div><div class='add'>+	adap = netdev2adap(dev);</div><div class='add'>+	hws = &amp;csk-&gt;tlshws;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;cdev-&gt;kmap.lock);</div><div class='add'>+	keyid = find_first_zero_bit(cdev-&gt;kmap.addr, cdev-&gt;kmap.size);</div><div class='add'>+	if (keyid &lt; cdev-&gt;kmap.size) {</div><div class='add'>+		__set_bit(keyid, cdev-&gt;kmap.addr);</div><div class='add'>+		if (optname == TLS_RX)</div><div class='add'>+			hws-&gt;rxkey = keyid;</div><div class='add'>+		else</div><div class='add'>+			hws-&gt;txkey = keyid;</div><div class='add'>+		atomic_inc(&amp;adap-&gt;chcr_stats.tls_key);</div><div class='add'>+	} else {</div><div class='add'>+		keyid = -1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;cdev-&gt;kmap.lock);</div><div class='add'>+	return keyid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void free_tls_keyid(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct net_device *dev = csk-&gt;egress_dev;</div><div class='add'>+	struct chtls_dev *cdev = csk-&gt;cdev;</div><div class='add'>+	struct chtls_hws *hws;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+</div><div class='add'>+	if (!cdev-&gt;kmap.addr)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	adap = netdev2adap(dev);</div><div class='add'>+	hws = &amp;csk-&gt;tlshws;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;cdev-&gt;kmap.lock);</div><div class='add'>+	if (hws-&gt;rxkey &gt;= 0) {</div><div class='add'>+		__clear_bit(hws-&gt;rxkey, cdev-&gt;kmap.addr);</div><div class='add'>+		atomic_dec(&amp;adap-&gt;chcr_stats.tls_key);</div><div class='add'>+		hws-&gt;rxkey = -1;</div><div class='add'>+	}</div><div class='add'>+	if (hws-&gt;txkey &gt;= 0) {</div><div class='add'>+		__clear_bit(hws-&gt;txkey, cdev-&gt;kmap.addr);</div><div class='add'>+		atomic_dec(&amp;adap-&gt;chcr_stats.tls_key);</div><div class='add'>+		hws-&gt;txkey = -1;</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;cdev-&gt;kmap.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int keyid_to_addr(int start_addr, int keyid)</div><div class='add'>+{</div><div class='add'>+	return (start_addr + (keyid * TLS_KEY_CONTEXT_SZ)) &gt;&gt; 5;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_rxkey_ivauth(struct _key_ctx *kctx)</div><div class='add'>+{</div><div class='add'>+	kctx-&gt;iv_to_auth = cpu_to_be64(KEYCTX_TX_WR_IV_V(6ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_AAD_V(1ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_AADST_V(5ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_CIPHER_V(14ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_CIPHERST_V(0ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_AUTH_V(14ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_AUTHST_V(16ULL) |</div><div class='add'>+				  KEYCTX_TX_WR_AUTHIN_V(16ULL));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_key_info(struct chtls_sock *csk,</div><div class='add'>+			  struct _key_ctx *kctx,</div><div class='add'>+			  u32 keylen, u32 optname,</div><div class='add'>+			  int cipher_type)</div><div class='add'>+{</div><div class='add'>+	unsigned char key[AES_MAX_KEY_SIZE];</div><div class='add'>+	unsigned char *key_p, *salt;</div><div class='add'>+	unsigned char ghash_h[AEAD_H_SIZE];</div><div class='add'>+	int ck_size, key_ctx_size, kctx_mackey_size, salt_size;</div><div class='add'>+	struct crypto_aes_ctx aes;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	key_ctx_size = sizeof(struct _key_ctx) +</div><div class='add'>+		       roundup(keylen, 16) + AEAD_H_SIZE;</div><div class='add'>+</div><div class='add'>+	/* GCM mode of AES supports 128 and 256 bit encryption, so</div><div class='add'>+	 * prepare key context base on GCM cipher type</div><div class='add'>+	 */</div><div class='add'>+	switch (cipher_type) {</div><div class='add'>+	case TLS_CIPHER_AES_GCM_128: {</div><div class='add'>+		struct tls12_crypto_info_aes_gcm_128 *gcm_ctx_128 =</div><div class='add'>+			(struct tls12_crypto_info_aes_gcm_128 *)</div><div class='add'>+					&amp;csk-&gt;tlshws.crypto_info;</div><div class='add'>+		memcpy(key, gcm_ctx_128-&gt;key, keylen);</div><div class='add'>+</div><div class='add'>+		key_p            = gcm_ctx_128-&gt;key;</div><div class='add'>+		salt             = gcm_ctx_128-&gt;salt;</div><div class='add'>+		ck_size          = CHCR_KEYCTX_CIPHER_KEY_SIZE_128;</div><div class='add'>+		salt_size        = TLS_CIPHER_AES_GCM_128_SALT_SIZE;</div><div class='add'>+		kctx_mackey_size = CHCR_KEYCTX_MAC_KEY_SIZE_128;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case TLS_CIPHER_AES_GCM_256: {</div><div class='add'>+		struct tls12_crypto_info_aes_gcm_256 *gcm_ctx_256 =</div><div class='add'>+			(struct tls12_crypto_info_aes_gcm_256 *)</div><div class='add'>+					&amp;csk-&gt;tlshws.crypto_info;</div><div class='add'>+		memcpy(key, gcm_ctx_256-&gt;key, keylen);</div><div class='add'>+</div><div class='add'>+		key_p            = gcm_ctx_256-&gt;key;</div><div class='add'>+		salt             = gcm_ctx_256-&gt;salt;</div><div class='add'>+		ck_size          = CHCR_KEYCTX_CIPHER_KEY_SIZE_256;</div><div class='add'>+		salt_size        = TLS_CIPHER_AES_GCM_256_SALT_SIZE;</div><div class='add'>+		kctx_mackey_size = CHCR_KEYCTX_MAC_KEY_SIZE_256;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		pr_err("GCM: Invalid key length %d\n", keylen);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Calculate the H = CIPH(K, 0 repeated 16 times).</div><div class='add'>+	 * It will go in key context</div><div class='add'>+	 */</div><div class='add'>+	ret = aes_expandkey(&amp;aes, key, keylen);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	memset(ghash_h, 0, AEAD_H_SIZE);</div><div class='add'>+	aes_encrypt(&amp;aes, ghash_h, ghash_h);</div><div class='add'>+	memzero_explicit(&amp;aes, sizeof(aes));</div><div class='add'>+	csk-&gt;tlshws.keylen = key_ctx_size;</div><div class='add'>+</div><div class='add'>+	/* Copy the Key context */</div><div class='add'>+	if (optname == TLS_RX) {</div><div class='add'>+		int key_ctx;</div><div class='add'>+</div><div class='add'>+		key_ctx = ((key_ctx_size &gt;&gt; 4) &lt;&lt; 3);</div><div class='add'>+		kctx-&gt;ctx_hdr = FILL_KEY_CRX_HDR(ck_size,</div><div class='add'>+						 kctx_mackey_size,</div><div class='add'>+						 0, 0, key_ctx);</div><div class='add'>+		chtls_rxkey_ivauth(kctx);</div><div class='add'>+	} else {</div><div class='add'>+		kctx-&gt;ctx_hdr = FILL_KEY_CTX_HDR(ck_size,</div><div class='add'>+						 kctx_mackey_size,</div><div class='add'>+						 0, 0, key_ctx_size &gt;&gt; 4);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memcpy(kctx-&gt;salt, salt, salt_size);</div><div class='add'>+	memcpy(kctx-&gt;key, key_p, keylen);</div><div class='add'>+	memcpy(kctx-&gt;key + keylen, ghash_h, AEAD_H_SIZE);</div><div class='add'>+	/* erase key info from driver */</div><div class='add'>+	memset(key_p, 0, keylen);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_set_scmd(struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_hws *hws = &amp;csk-&gt;tlshws;</div><div class='add'>+</div><div class='add'>+	hws-&gt;scmd.seqno_numivs =</div><div class='add'>+		SCMD_SEQ_NO_CTRL_V(3) |</div><div class='add'>+		SCMD_PROTO_VERSION_V(0) |</div><div class='add'>+		SCMD_ENC_DEC_CTRL_V(0) |</div><div class='add'>+		SCMD_CIPH_AUTH_SEQ_CTRL_V(1) |</div><div class='add'>+		SCMD_CIPH_MODE_V(2) |</div><div class='add'>+		SCMD_AUTH_MODE_V(4) |</div><div class='add'>+		SCMD_HMAC_CTRL_V(0) |</div><div class='add'>+		SCMD_IV_SIZE_V(4) |</div><div class='add'>+		SCMD_NUM_IVS_V(1);</div><div class='add'>+</div><div class='add'>+	hws-&gt;scmd.ivgen_hdrlen =</div><div class='add'>+		SCMD_IV_GEN_CTRL_V(1) |</div><div class='add'>+		SCMD_KEY_CTX_INLINE_V(0) |</div><div class='add'>+		SCMD_TLS_FRAG_ENABLE_V(1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int chtls_setkey(struct chtls_sock *csk, u32 keylen,</div><div class='add'>+		 u32 optname, int cipher_type)</div><div class='add'>+{</div><div class='add'>+	struct tls_key_req *kwr;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct _key_ctx *kctx;</div><div class='add'>+	int wrlen, klen, len;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int keyid;</div><div class='add'>+	int kaddr;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+	sk = csk-&gt;sk;</div><div class='add'>+</div><div class='add'>+	klen = roundup((keylen + AEAD_H_SIZE) + sizeof(*kctx), 32);</div><div class='add'>+	wrlen = roundup(sizeof(*kwr), 16);</div><div class='add'>+	len = klen + wrlen;</div><div class='add'>+</div><div class='add'>+	/* Flush out-standing data before new key takes effect */</div><div class='add'>+	if (optname == TLS_TX) {</div><div class='add'>+		lock_sock(sk);</div><div class='add'>+		if (skb_queue_len(&amp;csk-&gt;txq))</div><div class='add'>+			chtls_push_frames(csk, 0);</div><div class='add'>+		release_sock(sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(len, GFP_KERNEL);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	keyid = get_new_keyid(csk, optname);</div><div class='add'>+	if (keyid &lt; 0) {</div><div class='add'>+		ret = -ENOSPC;</div><div class='add'>+		goto out_nokey;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kaddr = keyid_to_addr(cdev-&gt;kmap.start, keyid);</div><div class='add'>+	kwr = (struct tls_key_req *)__skb_put_zero(skb, len);</div><div class='add'>+	kwr-&gt;wr.op_to_compl =</div><div class='add'>+		cpu_to_be32(FW_WR_OP_V(FW_ULPTX_WR) | FW_WR_COMPL_F |</div><div class='add'>+		      FW_WR_ATOMIC_V(1U));</div><div class='add'>+	kwr-&gt;wr.flowid_len16 =</div><div class='add'>+		cpu_to_be32(FW_WR_LEN16_V(DIV_ROUND_UP(len, 16) |</div><div class='add'>+			    FW_WR_FLOWID_V(csk-&gt;tid)));</div><div class='add'>+	kwr-&gt;wr.protocol = 0;</div><div class='add'>+	kwr-&gt;wr.mfs = htons(TLS_MFS);</div><div class='add'>+	kwr-&gt;wr.reneg_to_write_rx = optname;</div><div class='add'>+</div><div class='add'>+	/* ulptx command */</div><div class='add'>+	kwr-&gt;req.cmd = cpu_to_be32(ULPTX_CMD_V(ULP_TX_MEM_WRITE) |</div><div class='add'>+			    T5_ULP_MEMIO_ORDER_V(1) |</div><div class='add'>+			    T5_ULP_MEMIO_IMM_V(1));</div><div class='add'>+	kwr-&gt;req.len16 = cpu_to_be32((csk-&gt;tid &lt;&lt; 8) |</div><div class='add'>+			      DIV_ROUND_UP(len - sizeof(kwr-&gt;wr), 16));</div><div class='add'>+	kwr-&gt;req.dlen = cpu_to_be32(ULP_MEMIO_DATA_LEN_V(klen &gt;&gt; 5));</div><div class='add'>+	kwr-&gt;req.lock_addr = cpu_to_be32(ULP_MEMIO_ADDR_V(kaddr));</div><div class='add'>+</div><div class='add'>+	/* sub command */</div><div class='add'>+	kwr-&gt;sc_imm.cmd_more = cpu_to_be32(ULPTX_CMD_V(ULP_TX_SC_IMM));</div><div class='add'>+	kwr-&gt;sc_imm.len = cpu_to_be32(klen);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	/* key info */</div><div class='add'>+	kctx = (struct _key_ctx *)(kwr + 1);</div><div class='add'>+	ret = chtls_key_info(csk, kctx, keylen, optname, cipher_type);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto out_notcb;</div><div class='add'>+</div><div class='add'>+	if (unlikely(csk_flag(sk, CSK_ABORT_SHUTDOWN)))</div><div class='add'>+		goto out_notcb;</div><div class='add'>+</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_DATA, csk-&gt;tlshws.txqid);</div><div class='add'>+	csk-&gt;wr_credits -= DIV_ROUND_UP(len, 16);</div><div class='add'>+	csk-&gt;wr_unacked += DIV_ROUND_UP(len, 16);</div><div class='add'>+	enqueue_wr(csk, skb);</div><div class='add'>+	cxgb4_ofld_send(csk-&gt;egress_dev, skb);</div><div class='add'>+	skb = NULL;</div><div class='add'>+</div><div class='add'>+	chtls_set_scmd(csk);</div><div class='add'>+	/* Clear quiesce for Rx key */</div><div class='add'>+	if (optname == TLS_RX) {</div><div class='add'>+		ret = chtls_set_tcb_keyid(sk, keyid);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_notcb;</div><div class='add'>+		ret = chtls_set_tcb_field(sk, 0,</div><div class='add'>+					  TCB_ULP_RAW_V(TCB_ULP_RAW_M),</div><div class='add'>+					  TCB_ULP_RAW_V((TF_TLS_KEY_SIZE_V(1) |</div><div class='add'>+					  TF_TLS_CONTROL_V(1) |</div><div class='add'>+					  TF_TLS_ACTIVE_V(1) |</div><div class='add'>+					  TF_TLS_ENABLE_V(1))));</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_notcb;</div><div class='add'>+		ret = chtls_set_tcb_seqno(sk);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_notcb;</div><div class='add'>+		ret = chtls_set_tcb_quiesce(sk, 0);</div><div class='add'>+		if (ret)</div><div class='add'>+			goto out_notcb;</div><div class='add'>+		csk-&gt;tlshws.rxkey = keyid;</div><div class='add'>+	} else {</div><div class='add'>+		csk-&gt;tlshws.tx_seq_no = 0;</div><div class='add'>+		csk-&gt;tlshws.txkey = keyid;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return ret;</div><div class='add'>+out_notcb:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	free_tls_keyid(sk);</div><div class='add'>+out_nokey:</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c<br/>new file mode 100644<br/>index 000000000000..ee19933e2cca<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c</a></div><div class='hunk'>@@ -0,0 +1,1836 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Chelsio Communications, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Written by: Atul Gupta (atul.gupta@chelsio.com)</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/list.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/timer.h&gt;</div><div class='add'>+#include &lt;linux/notifier.h&gt;</div><div class='add'>+#include &lt;linux/inetdevice.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;linux/sched/signal.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include &lt;crypto/aes.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chtls.h"</div><div class='add'>+#include "chtls_cm.h"</div><div class='add'>+</div><div class='add'>+static bool is_tls_tx(struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	return csk-&gt;tlshws.txkey &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_tls_rx(struct chtls_sock *csk)</div><div class='add'>+{</div><div class='add'>+	return csk-&gt;tlshws.rxkey &gt;= 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int data_sgl_len(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	unsigned int cnt;</div><div class='add'>+</div><div class='add'>+	cnt = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	return sgl_len(cnt) * 8;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int nos_ivs(struct sock *sk, unsigned int size)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	return DIV_ROUND_UP(size, csk-&gt;tlshws.mfs);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int set_ivs_imm(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int ivs_size = nos_ivs(sk, skb-&gt;len) * CIPHER_BLOCK_SIZE;</div><div class='add'>+	int hlen = TLS_WR_CPL_LEN + data_sgl_len(skb);</div><div class='add'>+</div><div class='add'>+	if ((hlen + KEY_ON_MEM_SZ + ivs_size) &lt;</div><div class='add'>+	    MAX_IMM_OFLD_TX_DATA_WR_LEN) {</div><div class='add'>+		ULP_SKB_CB(skb)-&gt;ulp.tls.iv = 1;</div><div class='add'>+		return 1;</div><div class='add'>+	}</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;ulp.tls.iv = 0;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int max_ivs_size(struct sock *sk, int size)</div><div class='add'>+{</div><div class='add'>+	return nos_ivs(sk, size) * CIPHER_BLOCK_SIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ivs_size(struct sock *sk, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return set_ivs_imm(sk, skb) ? (nos_ivs(sk, skb-&gt;len) *</div><div class='add'>+		 CIPHER_BLOCK_SIZE) : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int flowc_wr_credits(int nparams, int *flowclenp)</div><div class='add'>+{</div><div class='add'>+	int flowclen16, flowclen;</div><div class='add'>+</div><div class='add'>+	flowclen = offsetof(struct fw_flowc_wr, mnemval[nparams]);</div><div class='add'>+	flowclen16 = DIV_ROUND_UP(flowclen, 16);</div><div class='add'>+	flowclen = flowclen16 * 16;</div><div class='add'>+</div><div class='add'>+	if (flowclenp)</div><div class='add'>+		*flowclenp = flowclen;</div><div class='add'>+</div><div class='add'>+	return flowclen16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *create_flowc_wr_skb(struct sock *sk,</div><div class='add'>+					   struct fw_flowc_wr *flowc,</div><div class='add'>+					   int flowclen)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(flowclen, GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	__skb_put_data(skb, flowc, flowclen);</div><div class='add'>+	skb_set_queue_mapping(skb, (csk-&gt;txq_idx &lt;&lt; 1) | CPL_PRIORITY_DATA);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int send_flowc_wr(struct sock *sk, struct fw_flowc_wr *flowc,</div><div class='add'>+			 int flowclen)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int flowclen16;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	flowclen16 = flowclen / 16;</div><div class='add'>+</div><div class='add'>+	if (csk_flag(sk, CSK_TX_DATA_SENT)) {</div><div class='add'>+		skb = create_flowc_wr_skb(sk, flowc, flowclen);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+</div><div class='add'>+		skb_entail(sk, skb,</div><div class='add'>+			   ULPCB_FLAG_NO_HDR | ULPCB_FLAG_NO_APPEND);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ret = cxgb4_immdata_send(csk-&gt;egress_dev,</div><div class='add'>+				 csk-&gt;txq_idx,</div><div class='add'>+				 flowc, flowclen);</div><div class='add'>+	if (!ret)</div><div class='add'>+		return flowclen16;</div><div class='add'>+	skb = create_flowc_wr_skb(sk, flowc, flowclen);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	send_or_defer(sk, tp, skb, 0);</div><div class='add'>+	return flowclen16;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 tcp_state_to_flowc_state(u8 state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case TCP_ESTABLISHED:</div><div class='add'>+		return FW_FLOWC_MNEM_TCPSTATE_ESTABLISHED;</div><div class='add'>+	case TCP_CLOSE_WAIT:</div><div class='add'>+		return FW_FLOWC_MNEM_TCPSTATE_CLOSEWAIT;</div><div class='add'>+	case TCP_FIN_WAIT1:</div><div class='add'>+		return FW_FLOWC_MNEM_TCPSTATE_FINWAIT1;</div><div class='add'>+	case TCP_CLOSING:</div><div class='add'>+		return FW_FLOWC_MNEM_TCPSTATE_CLOSING;</div><div class='add'>+	case TCP_LAST_ACK:</div><div class='add'>+		return FW_FLOWC_MNEM_TCPSTATE_LASTACK;</div><div class='add'>+	case TCP_FIN_WAIT2:</div><div class='add'>+		return FW_FLOWC_MNEM_TCPSTATE_FINWAIT2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return FW_FLOWC_MNEM_TCPSTATE_ESTABLISHED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int send_tx_flowc_wr(struct sock *sk, int compl,</div><div class='add'>+		     u32 snd_nxt, u32 rcv_nxt)</div><div class='add'>+{</div><div class='add'>+	DEFINE_RAW_FLEX(struct fw_flowc_wr, flowc, mnemval, FW_FLOWC_MNEM_MAX);</div><div class='add'>+	int nparams, paramidx, flowclen16, flowclen;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+#define FLOWC_PARAM(__m, __v) \</div><div class='add'>+	do { \</div><div class='add'>+		flowc-&gt;mnemval[paramidx].mnemonic = FW_FLOWC_MNEM_##__m; \</div><div class='add'>+		flowc-&gt;mnemval[paramidx].val = cpu_to_be32(__v); \</div><div class='add'>+		paramidx++; \</div><div class='add'>+	} while (0)</div><div class='add'>+</div><div class='add'>+	paramidx = 0;</div><div class='add'>+</div><div class='add'>+	FLOWC_PARAM(PFNVFN, FW_PFVF_CMD_PFN_V(csk-&gt;cdev-&gt;lldi-&gt;pf));</div><div class='add'>+	FLOWC_PARAM(CH, csk-&gt;tx_chan);</div><div class='add'>+	FLOWC_PARAM(PORT, csk-&gt;tx_chan);</div><div class='add'>+	FLOWC_PARAM(IQID, csk-&gt;rss_qid);</div><div class='add'>+	FLOWC_PARAM(SNDNXT, tp-&gt;snd_nxt);</div><div class='add'>+	FLOWC_PARAM(RCVNXT, tp-&gt;rcv_nxt);</div><div class='add'>+	FLOWC_PARAM(SNDBUF, csk-&gt;sndbuf);</div><div class='add'>+	FLOWC_PARAM(MSS, tp-&gt;mss_cache);</div><div class='add'>+	FLOWC_PARAM(TCPSTATE, tcp_state_to_flowc_state(sk-&gt;sk_state));</div><div class='add'>+</div><div class='add'>+	if (SND_WSCALE(tp))</div><div class='add'>+		FLOWC_PARAM(RCV_SCALE, SND_WSCALE(tp));</div><div class='add'>+</div><div class='add'>+	if (csk-&gt;ulp_mode == ULP_MODE_TLS)</div><div class='add'>+		FLOWC_PARAM(ULD_MODE, ULP_MODE_TLS);</div><div class='add'>+</div><div class='add'>+	if (csk-&gt;tlshws.fcplenmax)</div><div class='add'>+		FLOWC_PARAM(TXDATAPLEN_MAX, csk-&gt;tlshws.fcplenmax);</div><div class='add'>+</div><div class='add'>+	nparams = paramidx;</div><div class='add'>+#undef FLOWC_PARAM</div><div class='add'>+</div><div class='add'>+	flowclen16 = flowc_wr_credits(nparams, &amp;flowclen);</div><div class='add'>+	flowc-&gt;op_to_nparams =</div><div class='add'>+		cpu_to_be32(FW_WR_OP_V(FW_FLOWC_WR) |</div><div class='add'>+			    FW_WR_COMPL_V(compl) |</div><div class='add'>+			    FW_FLOWC_WR_NPARAMS_V(nparams));</div><div class='add'>+	flowc-&gt;flowid_len16 = cpu_to_be32(FW_WR_LEN16_V(flowclen16) |</div><div class='add'>+					  FW_WR_FLOWID_V(csk-&gt;tid));</div><div class='add'>+</div><div class='add'>+	return send_flowc_wr(sk, flowc, flowclen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Copy IVs to WR */</div><div class='add'>+static int tls_copy_ivs(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	unsigned char *iv_loc;</div><div class='add'>+	struct chtls_hws *hws;</div><div class='add'>+	unsigned char *ivs;</div><div class='add'>+	u16 number_of_ivs;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	number_of_ivs = nos_ivs(sk, skb-&gt;len);</div><div class='add'>+</div><div class='add'>+	if (number_of_ivs &gt; MAX_IVS_PAGE) {</div><div class='add'>+		pr_warn("MAX IVs in PAGE exceeded %d\n", number_of_ivs);</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* generate the  IVs */</div><div class='add'>+	ivs = kmalloc_array(CIPHER_BLOCK_SIZE, number_of_ivs, GFP_ATOMIC);</div><div class='add'>+	if (!ivs)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	get_random_bytes(ivs, number_of_ivs * CIPHER_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+	if (skb_ulp_tls_iv_imm(skb)) {</div><div class='add'>+		/* send the IVs as immediate data in the WR */</div><div class='add'>+		iv_loc = (unsigned char *)__skb_push(skb, number_of_ivs *</div><div class='add'>+						CIPHER_BLOCK_SIZE);</div><div class='add'>+		if (iv_loc)</div><div class='add'>+			memcpy(iv_loc, ivs, number_of_ivs * CIPHER_BLOCK_SIZE);</div><div class='add'>+</div><div class='add'>+		hws-&gt;ivsize = number_of_ivs * CIPHER_BLOCK_SIZE;</div><div class='add'>+	} else {</div><div class='add'>+		/* Send the IVs as sgls */</div><div class='add'>+		/* Already accounted IV DSGL for credits */</div><div class='add'>+		skb_shinfo(skb)-&gt;nr_frags--;</div><div class='add'>+		page = alloc_pages(sk-&gt;sk_allocation | __GFP_COMP, 0);</div><div class='add'>+		if (!page) {</div><div class='add'>+			pr_info("%s : Page allocation for IVs failed\n",</div><div class='add'>+				__func__);</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+		memcpy(page_address(page), ivs, number_of_ivs *</div><div class='add'>+		       CIPHER_BLOCK_SIZE);</div><div class='add'>+		skb_fill_page_desc(skb, skb_shinfo(skb)-&gt;nr_frags, page, 0,</div><div class='add'>+				   number_of_ivs * CIPHER_BLOCK_SIZE);</div><div class='add'>+		hws-&gt;ivsize = 0;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	kfree(ivs);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Copy Key to WR */</div><div class='add'>+static void tls_copy_tx_key(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ulptx_sc_memrd *sc_memrd;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct ulptx_idata *sc;</div><div class='add'>+	struct chtls_hws *hws;</div><div class='add'>+	u32 immdlen;</div><div class='add'>+	int kaddr;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	cdev = csk-&gt;cdev;</div><div class='add'>+</div><div class='add'>+	immdlen = sizeof(*sc) + sizeof(*sc_memrd);</div><div class='add'>+	kaddr = keyid_to_addr(cdev-&gt;kmap.start, hws-&gt;txkey);</div><div class='add'>+	sc = (struct ulptx_idata *)__skb_push(skb, immdlen);</div><div class='add'>+	if (sc) {</div><div class='add'>+		sc-&gt;cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_NOOP));</div><div class='add'>+		sc-&gt;len = htonl(0);</div><div class='add'>+		sc_memrd = (struct ulptx_sc_memrd *)(sc + 1);</div><div class='add'>+		sc_memrd-&gt;cmd_to_len =</div><div class='add'>+				htonl(ULPTX_CMD_V(ULP_TX_SC_MEMRD) |</div><div class='add'>+				ULP_TX_SC_MORE_V(1) |</div><div class='add'>+				ULPTX_LEN16_V(hws-&gt;keylen &gt;&gt; 4));</div><div class='add'>+		sc_memrd-&gt;addr = htonl(kaddr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tlstx_incr_seqnum(struct chtls_hws *hws)</div><div class='add'>+{</div><div class='add'>+	return hws-&gt;tx_seq_no++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_sg_request(const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return skb-&gt;peeked ||</div><div class='add'>+		(skb-&gt;len &gt; MAX_IMM_ULPTX_WR_LEN);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if an sk_buff carries urgent data.</div><div class='add'>+ */</div><div class='add'>+static bool skb_urgent(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	return ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_URG;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* TLS content type for CPL SFO */</div><div class='add'>+static unsigned char tls_content_type(unsigned char content_type)</div><div class='add'>+{</div><div class='add'>+	switch (content_type) {</div><div class='add'>+	case TLS_HDR_TYPE_CCS:</div><div class='add'>+		return CPL_TX_TLS_SFO_TYPE_CCS;</div><div class='add'>+	case TLS_HDR_TYPE_ALERT:</div><div class='add'>+		return CPL_TX_TLS_SFO_TYPE_ALERT;</div><div class='add'>+	case TLS_HDR_TYPE_HANDSHAKE:</div><div class='add'>+		return CPL_TX_TLS_SFO_TYPE_HANDSHAKE;</div><div class='add'>+	case TLS_HDR_TYPE_HEARTBEAT:</div><div class='add'>+		return CPL_TX_TLS_SFO_TYPE_HEARTBEAT;</div><div class='add'>+	}</div><div class='add'>+	return CPL_TX_TLS_SFO_TYPE_DATA;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tls_tx_data_wr(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			   int dlen, int tls_immd, u32 credits,</div><div class='add'>+			   int expn, int pdus)</div><div class='add'>+{</div><div class='add'>+	struct fw_tlstx_data_wr *req_wr;</div><div class='add'>+	struct cpl_tx_tls_sfo *req_cpl;</div><div class='add'>+	unsigned int wr_ulp_mode_force;</div><div class='add'>+	struct tls_scmd *updated_scmd;</div><div class='add'>+	unsigned char data_type;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct chtls_hws *hws;</div><div class='add'>+	struct tls_scmd *scmd;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+	unsigned char *req;</div><div class='add'>+	int immd_len;</div><div class='add'>+	int iv_imm;</div><div class='add'>+	int len;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	iv_imm = skb_ulp_tls_iv_imm(skb);</div><div class='add'>+	dev = csk-&gt;egress_dev;</div><div class='add'>+	adap = netdev2adap(dev);</div><div class='add'>+	hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	scmd = &amp;hws-&gt;scmd;</div><div class='add'>+	len = dlen + expn;</div><div class='add'>+</div><div class='add'>+	dlen = (dlen &lt; hws-&gt;mfs) ? dlen : hws-&gt;mfs;</div><div class='add'>+	atomic_inc(&amp;adap-&gt;chcr_stats.tls_pdu_tx);</div><div class='add'>+</div><div class='add'>+	updated_scmd = scmd;</div><div class='add'>+	updated_scmd-&gt;seqno_numivs &amp;= 0xffffff80;</div><div class='add'>+	updated_scmd-&gt;seqno_numivs |= SCMD_NUM_IVS_V(pdus);</div><div class='add'>+	hws-&gt;scmd = *updated_scmd;</div><div class='add'>+</div><div class='add'>+	req = (unsigned char *)__skb_push(skb, sizeof(struct cpl_tx_tls_sfo));</div><div class='add'>+	req_cpl = (struct cpl_tx_tls_sfo *)req;</div><div class='add'>+	req = (unsigned char *)__skb_push(skb, (sizeof(struct</div><div class='add'>+				fw_tlstx_data_wr)));</div><div class='add'>+</div><div class='add'>+	req_wr = (struct fw_tlstx_data_wr *)req;</div><div class='add'>+	immd_len = (tls_immd ? dlen : 0);</div><div class='add'>+	req_wr-&gt;op_to_immdlen =</div><div class='add'>+		htonl(FW_WR_OP_V(FW_TLSTX_DATA_WR) |</div><div class='add'>+		FW_TLSTX_DATA_WR_COMPL_V(1) |</div><div class='add'>+		FW_TLSTX_DATA_WR_IMMDLEN_V(immd_len));</div><div class='add'>+	req_wr-&gt;flowid_len16 = htonl(FW_TLSTX_DATA_WR_FLOWID_V(csk-&gt;tid) |</div><div class='add'>+				     FW_TLSTX_DATA_WR_LEN16_V(credits));</div><div class='add'>+	wr_ulp_mode_force = TX_ULP_MODE_V(ULP_MODE_TLS);</div><div class='add'>+</div><div class='add'>+	if (is_sg_request(skb))</div><div class='add'>+		wr_ulp_mode_force |= FW_OFLD_TX_DATA_WR_ALIGNPLD_F |</div><div class='add'>+			((tcp_sk(sk)-&gt;nonagle &amp; TCP_NAGLE_OFF) ? 0 :</div><div class='add'>+			FW_OFLD_TX_DATA_WR_SHOVE_F);</div><div class='add'>+</div><div class='add'>+	req_wr-&gt;lsodisable_to_flags =</div><div class='add'>+			htonl(TX_ULP_MODE_V(ULP_MODE_TLS) |</div><div class='add'>+			      TX_URG_V(skb_urgent(skb)) |</div><div class='add'>+			      T6_TX_FORCE_F | wr_ulp_mode_force |</div><div class='add'>+			      TX_SHOVE_V((!csk_flag(sk, CSK_TX_MORE_DATA)) &amp;&amp;</div><div class='add'>+					 skb_queue_empty(&amp;csk-&gt;txq)));</div><div class='add'>+</div><div class='add'>+	req_wr-&gt;ctxloc_to_exp =</div><div class='add'>+			htonl(FW_TLSTX_DATA_WR_NUMIVS_V(pdus) |</div><div class='add'>+			      FW_TLSTX_DATA_WR_EXP_V(expn) |</div><div class='add'>+			      FW_TLSTX_DATA_WR_CTXLOC_V(CHTLS_KEY_CONTEXT_DDR) |</div><div class='add'>+			      FW_TLSTX_DATA_WR_IVDSGL_V(!iv_imm) |</div><div class='add'>+			      FW_TLSTX_DATA_WR_KEYSIZE_V(hws-&gt;keylen &gt;&gt; 4));</div><div class='add'>+</div><div class='add'>+	/* Fill in the length */</div><div class='add'>+	req_wr-&gt;plen = htonl(len);</div><div class='add'>+	req_wr-&gt;mfs = htons(hws-&gt;mfs);</div><div class='add'>+	req_wr-&gt;adjustedplen_pkd =</div><div class='add'>+		htons(FW_TLSTX_DATA_WR_ADJUSTEDPLEN_V(hws-&gt;adjustlen));</div><div class='add'>+	req_wr-&gt;expinplenmax_pkd =</div><div class='add'>+		htons(FW_TLSTX_DATA_WR_EXPINPLENMAX_V(hws-&gt;expansion));</div><div class='add'>+	req_wr-&gt;pdusinplenmax_pkd =</div><div class='add'>+		FW_TLSTX_DATA_WR_PDUSINPLENMAX_V(hws-&gt;pdus);</div><div class='add'>+	req_wr-&gt;r10 = 0;</div><div class='add'>+</div><div class='add'>+	data_type = tls_content_type(ULP_SKB_CB(skb)-&gt;ulp.tls.type);</div><div class='add'>+	req_cpl-&gt;op_to_seg_len = htonl(CPL_TX_TLS_SFO_OPCODE_V(CPL_TX_TLS_SFO) |</div><div class='add'>+				       CPL_TX_TLS_SFO_DATA_TYPE_V(data_type) |</div><div class='add'>+				       CPL_TX_TLS_SFO_CPL_LEN_V(2) |</div><div class='add'>+				       CPL_TX_TLS_SFO_SEG_LEN_V(dlen));</div><div class='add'>+	req_cpl-&gt;pld_len = htonl(len - expn);</div><div class='add'>+</div><div class='add'>+	req_cpl-&gt;type_protover = htonl(CPL_TX_TLS_SFO_TYPE_V</div><div class='add'>+		((data_type == CPL_TX_TLS_SFO_TYPE_HEARTBEAT) ?</div><div class='add'>+		TLS_HDR_TYPE_HEARTBEAT : 0) |</div><div class='add'>+		CPL_TX_TLS_SFO_PROTOVER_V(0));</div><div class='add'>+</div><div class='add'>+	/* create the s-command */</div><div class='add'>+	req_cpl-&gt;r1_lo = 0;</div><div class='add'>+	req_cpl-&gt;seqno_numivs  = cpu_to_be32(hws-&gt;scmd.seqno_numivs);</div><div class='add'>+	req_cpl-&gt;ivgen_hdrlen = cpu_to_be32(hws-&gt;scmd.ivgen_hdrlen);</div><div class='add'>+	req_cpl-&gt;scmd1 = cpu_to_be64(tlstx_incr_seqnum(hws));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate the TLS data expansion size</div><div class='add'>+ */</div><div class='add'>+static int chtls_expansion_size(struct sock *sk, int data_len,</div><div class='add'>+				int fullpdu,</div><div class='add'>+				unsigned short *pducnt)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct chtls_hws *hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	struct tls_scmd *scmd = &amp;hws-&gt;scmd;</div><div class='add'>+	int fragsize = hws-&gt;mfs;</div><div class='add'>+	int expnsize = 0;</div><div class='add'>+	int fragleft;</div><div class='add'>+	int fragcnt;</div><div class='add'>+	int expppdu;</div><div class='add'>+</div><div class='add'>+	if (SCMD_CIPH_MODE_G(scmd-&gt;seqno_numivs) ==</div><div class='add'>+	    SCMD_CIPH_MODE_AES_GCM) {</div><div class='add'>+		expppdu = GCM_TAG_SIZE + AEAD_EXPLICIT_DATA_SIZE +</div><div class='add'>+			  TLS_HEADER_LENGTH;</div><div class='add'>+</div><div class='add'>+		if (fullpdu) {</div><div class='add'>+			*pducnt = data_len / (expppdu + fragsize);</div><div class='add'>+			if (*pducnt &gt; 32)</div><div class='add'>+				*pducnt = 32;</div><div class='add'>+			else if (!*pducnt)</div><div class='add'>+				*pducnt = 1;</div><div class='add'>+			expnsize = (*pducnt) * expppdu;</div><div class='add'>+			return expnsize;</div><div class='add'>+		}</div><div class='add'>+		fragcnt = (data_len / fragsize);</div><div class='add'>+		expnsize =  fragcnt * expppdu;</div><div class='add'>+		fragleft = data_len % fragsize;</div><div class='add'>+		if (fragleft &gt; 0)</div><div class='add'>+			expnsize += expppdu;</div><div class='add'>+	}</div><div class='add'>+	return expnsize;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* WR with IV, KEY and CPL SFO added */</div><div class='add'>+static void make_tlstx_data_wr(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			       int tls_tx_imm, int tls_len, u32 credits)</div><div class='add'>+{</div><div class='add'>+	unsigned short pdus_per_ulp = 0;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	struct chtls_hws *hws;</div><div class='add'>+	int expn_sz;</div><div class='add'>+	int pdus;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	pdus = DIV_ROUND_UP(tls_len, hws-&gt;mfs);</div><div class='add'>+	expn_sz = chtls_expansion_size(sk, tls_len, 0, NULL);</div><div class='add'>+	if (!hws-&gt;compute) {</div><div class='add'>+		hws-&gt;expansion = chtls_expansion_size(sk,</div><div class='add'>+						      hws-&gt;fcplenmax,</div><div class='add'>+						      1, &amp;pdus_per_ulp);</div><div class='add'>+		hws-&gt;pdus = pdus_per_ulp;</div><div class='add'>+		hws-&gt;adjustlen = hws-&gt;pdus *</div><div class='add'>+			((hws-&gt;expansion / hws-&gt;pdus) + hws-&gt;mfs);</div><div class='add'>+		hws-&gt;compute = 1;</div><div class='add'>+	}</div><div class='add'>+	if (tls_copy_ivs(sk, skb))</div><div class='add'>+		return;</div><div class='add'>+	tls_copy_tx_key(sk, skb);</div><div class='add'>+	tls_tx_data_wr(sk, skb, tls_len, tls_tx_imm, credits, expn_sz, pdus);</div><div class='add'>+	hws-&gt;tx_seq_no += (pdus - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void make_tx_data_wr(struct sock *sk, struct sk_buff *skb,</div><div class='add'>+			    unsigned int immdlen, int len,</div><div class='add'>+			    u32 credits, u32 compl)</div><div class='add'>+{</div><div class='add'>+	struct fw_ofld_tx_data_wr *req;</div><div class='add'>+	unsigned int wr_ulp_mode_force;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	unsigned int opcode;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	opcode = FW_OFLD_TX_DATA_WR;</div><div class='add'>+</div><div class='add'>+	req = (struct fw_ofld_tx_data_wr *)__skb_push(skb, sizeof(*req));</div><div class='add'>+	req-&gt;op_to_immdlen = htonl(WR_OP_V(opcode) |</div><div class='add'>+				FW_WR_COMPL_V(compl) |</div><div class='add'>+				FW_WR_IMMDLEN_V(immdlen));</div><div class='add'>+	req-&gt;flowid_len16 = htonl(FW_WR_FLOWID_V(csk-&gt;tid) |</div><div class='add'>+				FW_WR_LEN16_V(credits));</div><div class='add'>+</div><div class='add'>+	wr_ulp_mode_force = TX_ULP_MODE_V(csk-&gt;ulp_mode);</div><div class='add'>+	if (is_sg_request(skb))</div><div class='add'>+		wr_ulp_mode_force |= FW_OFLD_TX_DATA_WR_ALIGNPLD_F |</div><div class='add'>+			((tcp_sk(sk)-&gt;nonagle &amp; TCP_NAGLE_OFF) ? 0 :</div><div class='add'>+				FW_OFLD_TX_DATA_WR_SHOVE_F);</div><div class='add'>+</div><div class='add'>+	req-&gt;tunnel_to_proxy = htonl(wr_ulp_mode_force |</div><div class='add'>+			TX_URG_V(skb_urgent(skb)) |</div><div class='add'>+			TX_SHOVE_V((!csk_flag(sk, CSK_TX_MORE_DATA)) &amp;&amp;</div><div class='add'>+				   skb_queue_empty(&amp;csk-&gt;txq)));</div><div class='add'>+	req-&gt;plen = htonl(len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_wr_size(struct chtls_sock *csk, const struct sk_buff *skb,</div><div class='add'>+			 bool size)</div><div class='add'>+{</div><div class='add'>+	int wr_size;</div><div class='add'>+</div><div class='add'>+	wr_size = TLS_WR_CPL_LEN;</div><div class='add'>+	wr_size += KEY_ON_MEM_SZ;</div><div class='add'>+	wr_size += ivs_size(csk-&gt;sk, skb);</div><div class='add'>+</div><div class='add'>+	if (size)</div><div class='add'>+		return wr_size;</div><div class='add'>+</div><div class='add'>+	/* frags counted for IV dsgl */</div><div class='add'>+	if (!skb_ulp_tls_iv_imm(skb))</div><div class='add'>+		skb_shinfo(skb)-&gt;nr_frags++;</div><div class='add'>+</div><div class='add'>+	return wr_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool is_ofld_imm(struct chtls_sock *csk, const struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	int length = skb-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;peeked || skb-&gt;len &gt; MAX_IMM_ULPTX_WR_LEN)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (likely(ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NEED_HDR)) {</div><div class='add'>+		/* Check TLS header len for Immediate */</div><div class='add'>+		if (csk-&gt;ulp_mode == ULP_MODE_TLS &amp;&amp;</div><div class='add'>+		    skb_ulp_tls_inline(skb))</div><div class='add'>+			length += chtls_wr_size(csk, skb, true);</div><div class='add'>+		else</div><div class='add'>+			length += sizeof(struct fw_ofld_tx_data_wr);</div><div class='add'>+</div><div class='add'>+		return length &lt;= MAX_IMM_OFLD_TX_DATA_WR_LEN;</div><div class='add'>+	}</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int calc_tx_flits(const struct sk_buff *skb,</div><div class='add'>+				  unsigned int immdlen)</div><div class='add'>+{</div><div class='add'>+	unsigned int flits, cnt;</div><div class='add'>+</div><div class='add'>+	flits = immdlen / 8;   /* headers */</div><div class='add'>+	cnt = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+	if (skb_tail_pointer(skb) != skb_transport_header(skb))</div><div class='add'>+		cnt++;</div><div class='add'>+	return flits + sgl_len(cnt);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void arp_failure_discard(void *handle, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int chtls_push_frames(struct chtls_sock *csk, int comp)</div><div class='add'>+{</div><div class='add'>+	struct chtls_hws *hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int total_size = 0;</div><div class='add'>+	struct sock *sk;</div><div class='add'>+	int wr_size;</div><div class='add'>+</div><div class='add'>+	wr_size = sizeof(struct fw_ofld_tx_data_wr);</div><div class='add'>+	sk = csk-&gt;sk;</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	if (unlikely(sk_in_state(sk, TCPF_SYN_SENT | TCPF_CLOSE)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(csk_flag(sk, CSK_ABORT_SHUTDOWN)))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	while (csk-&gt;wr_credits &amp;&amp; (skb = skb_peek(&amp;csk-&gt;txq)) &amp;&amp;</div><div class='add'>+	       (!(ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_HOLD) ||</div><div class='add'>+		skb_queue_len(&amp;csk-&gt;txq) &gt; 1)) {</div><div class='add'>+		unsigned int credit_len = skb-&gt;len;</div><div class='add'>+		unsigned int credits_needed;</div><div class='add'>+		unsigned int completion = 0;</div><div class='add'>+		int tls_len = skb-&gt;len;/* TLS data len before IV/key */</div><div class='add'>+		unsigned int immdlen;</div><div class='add'>+		int len = skb-&gt;len;    /* length [ulp bytes] inserted by hw */</div><div class='add'>+		int flowclen16 = 0;</div><div class='add'>+		int tls_tx_imm = 0;</div><div class='add'>+</div><div class='add'>+		immdlen = skb-&gt;len;</div><div class='add'>+		if (!is_ofld_imm(csk, skb)) {</div><div class='add'>+			immdlen = skb_transport_offset(skb);</div><div class='add'>+			if (skb_ulp_tls_inline(skb))</div><div class='add'>+				wr_size = chtls_wr_size(csk, skb, false);</div><div class='add'>+			credit_len = 8 * calc_tx_flits(skb, immdlen);</div><div class='add'>+		} else {</div><div class='add'>+			if (skb_ulp_tls_inline(skb)) {</div><div class='add'>+				wr_size = chtls_wr_size(csk, skb, false);</div><div class='add'>+				tls_tx_imm = 1;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (likely(ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NEED_HDR))</div><div class='add'>+			credit_len += wr_size;</div><div class='add'>+		credits_needed = DIV_ROUND_UP(credit_len, 16);</div><div class='add'>+		if (!csk_flag_nochk(csk, CSK_TX_DATA_SENT)) {</div><div class='add'>+			flowclen16 = send_tx_flowc_wr(sk, 1, tp-&gt;snd_nxt,</div><div class='add'>+						      tp-&gt;rcv_nxt);</div><div class='add'>+			if (flowclen16 &lt;= 0)</div><div class='add'>+				break;</div><div class='add'>+			csk-&gt;wr_credits -= flowclen16;</div><div class='add'>+			csk-&gt;wr_unacked += flowclen16;</div><div class='add'>+			csk-&gt;wr_nondata += flowclen16;</div><div class='add'>+			csk_set_flag(csk, CSK_TX_DATA_SENT);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (csk-&gt;wr_credits &lt; credits_needed) {</div><div class='add'>+			if (skb_ulp_tls_inline(skb) &amp;&amp;</div><div class='add'>+			    !skb_ulp_tls_iv_imm(skb))</div><div class='add'>+				skb_shinfo(skb)-&gt;nr_frags--;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		__skb_unlink(skb, &amp;csk-&gt;txq);</div><div class='add'>+		skb_set_queue_mapping(skb, (csk-&gt;txq_idx &lt;&lt; 1) |</div><div class='add'>+				      CPL_PRIORITY_DATA);</div><div class='add'>+		if (hws-&gt;ofld)</div><div class='add'>+			hws-&gt;txqid = (skb-&gt;queue_mapping &gt;&gt; 1);</div><div class='add'>+		skb-&gt;csum = (__force __wsum)(credits_needed + csk-&gt;wr_nondata);</div><div class='add'>+		csk-&gt;wr_credits -= credits_needed;</div><div class='add'>+		csk-&gt;wr_unacked += credits_needed;</div><div class='add'>+		csk-&gt;wr_nondata = 0;</div><div class='add'>+		enqueue_wr(csk, skb);</div><div class='add'>+</div><div class='add'>+		if (likely(ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NEED_HDR)) {</div><div class='add'>+			if ((comp &amp;&amp; csk-&gt;wr_unacked == credits_needed) ||</div><div class='add'>+			    (ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_COMPL) ||</div><div class='add'>+			    csk-&gt;wr_unacked &gt;= csk-&gt;wr_max_credits / 2) {</div><div class='add'>+				completion = 1;</div><div class='add'>+				csk-&gt;wr_unacked = 0;</div><div class='add'>+			}</div><div class='add'>+			if (skb_ulp_tls_inline(skb))</div><div class='add'>+				make_tlstx_data_wr(sk, skb, tls_tx_imm,</div><div class='add'>+						   tls_len, credits_needed);</div><div class='add'>+			else</div><div class='add'>+				make_tx_data_wr(sk, skb, immdlen, len,</div><div class='add'>+						credits_needed, completion);</div><div class='add'>+			tp-&gt;snd_nxt += len;</div><div class='add'>+			tp-&gt;lsndtime = tcp_jiffies32;</div><div class='add'>+			if (completion)</div><div class='add'>+				ULP_SKB_CB(skb)-&gt;flags &amp;= ~ULPCB_FLAG_NEED_HDR;</div><div class='add'>+		} else {</div><div class='add'>+			struct cpl_close_con_req *req = cplhdr(skb);</div><div class='add'>+			unsigned int cmd  = CPL_OPCODE_G(ntohl</div><div class='add'>+					     (OPCODE_TID(req)));</div><div class='add'>+</div><div class='add'>+			if (cmd == CPL_CLOSE_CON_REQ)</div><div class='add'>+				csk_set_flag(csk,</div><div class='add'>+					     CSK_CLOSE_CON_REQUESTED);</div><div class='add'>+</div><div class='add'>+			if ((ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_COMPL) &amp;&amp;</div><div class='add'>+			    (csk-&gt;wr_unacked &gt;= csk-&gt;wr_max_credits / 2)) {</div><div class='add'>+				req-&gt;wr.wr_hi |= htonl(FW_WR_COMPL_F);</div><div class='add'>+				csk-&gt;wr_unacked = 0;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		total_size += skb-&gt;truesize;</div><div class='add'>+		if (ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_BARRIER)</div><div class='add'>+			csk_set_flag(csk, CSK_TX_WAIT_IDLE);</div><div class='add'>+		t4_set_arp_err_handler(skb, NULL, arp_failure_discard);</div><div class='add'>+		cxgb4_l2t_send(csk-&gt;egress_dev, skb, csk-&gt;l2t_entry);</div><div class='add'>+	}</div><div class='add'>+	sk-&gt;sk_wmem_queued -= total_size;</div><div class='add'>+	return total_size;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void mark_urg(struct tcp_sock *tp, int flags,</div><div class='add'>+		     struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (unlikely(flags &amp; MSG_OOB)) {</div><div class='add'>+		tp-&gt;snd_up = tp-&gt;write_seq;</div><div class='add'>+		ULP_SKB_CB(skb)-&gt;flags = ULPCB_FLAG_URG |</div><div class='add'>+					 ULPCB_FLAG_BARRIER |</div><div class='add'>+					 ULPCB_FLAG_NO_APPEND |</div><div class='add'>+					 ULPCB_FLAG_NEED_HDR;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a connection should send more data to TCP engine</div><div class='add'>+ */</div><div class='add'>+static bool should_push(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct chtls_dev *cdev = csk-&gt;cdev;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we've released our offload resources there's nothing to do ...</div><div class='add'>+	 */</div><div class='add'>+	if (!cdev)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If there aren't any work requests in flight, or there isn't enough</div><div class='add'>+	 * data in flight, or Nagle is off then send the current TX_DATA</div><div class='add'>+	 * otherwise hold it and wait to accumulate more data.</div><div class='add'>+	 */</div><div class='add'>+	return csk-&gt;wr_credits == csk-&gt;wr_max_credits ||</div><div class='add'>+		(tp-&gt;nonagle &amp; TCP_NAGLE_OFF);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a TCP socket is corked.</div><div class='add'>+ */</div><div class='add'>+static bool corked(const struct tcp_sock *tp, int flags)</div><div class='add'>+{</div><div class='add'>+	return (flags &amp; MSG_MORE) || (tp-&gt;nonagle &amp; TCP_NAGLE_CORK);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Returns true if a send should try to push new data.</div><div class='add'>+ */</div><div class='add'>+static bool send_should_push(struct sock *sk, int flags)</div><div class='add'>+{</div><div class='add'>+	return should_push(sk) &amp;&amp; !corked(tcp_sk(sk), flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_tcp_push(struct sock *sk, int flags)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	int qlen = skb_queue_len(&amp;csk-&gt;txq);</div><div class='add'>+</div><div class='add'>+	if (likely(qlen)) {</div><div class='add'>+		struct sk_buff *skb = skb_peek_tail(&amp;csk-&gt;txq);</div><div class='add'>+		struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+		mark_urg(tp, flags, skb);</div><div class='add'>+</div><div class='add'>+		if (!(ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NO_APPEND) &amp;&amp;</div><div class='add'>+		    corked(tp, flags)) {</div><div class='add'>+			ULP_SKB_CB(skb)-&gt;flags |= ULPCB_FLAG_HOLD;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ULP_SKB_CB(skb)-&gt;flags &amp;= ~ULPCB_FLAG_HOLD;</div><div class='add'>+		if (qlen == 1 &amp;&amp;</div><div class='add'>+		    ((ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NO_APPEND) ||</div><div class='add'>+		     should_push(sk)))</div><div class='add'>+			chtls_push_frames(csk, 1);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Calculate the size for a new send sk_buff.  It's maximum size so we can</div><div class='add'>+ * pack lots of data into it, unless we plan to send it immediately, in which</div><div class='add'>+ * case we size it more tightly.</div><div class='add'>+ *</div><div class='add'>+ * Note: we don't bother compensating for MSS &lt; PAGE_SIZE because it doesn't</div><div class='add'>+ * arise in normal cases and when it does we are just wasting memory.</div><div class='add'>+ */</div><div class='add'>+static int select_size(struct sock *sk, int io_len, int flags, int len)</div><div class='add'>+{</div><div class='add'>+	const int pgbreak = SKB_MAX_HEAD(len);</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If the data wouldn't fit in the main body anyway, put only the</div><div class='add'>+	 * header in the main body so it can use immediate data and place all</div><div class='add'>+	 * the payload in page fragments.</div><div class='add'>+	 */</div><div class='add'>+	if (io_len &gt; pgbreak)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * If we will be accumulating payload get a large main body.</div><div class='add'>+	 */</div><div class='add'>+	if (!send_should_push(sk, flags))</div><div class='add'>+		return pgbreak;</div><div class='add'>+</div><div class='add'>+	return io_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void skb_entail(struct sock *sk, struct sk_buff *skb, int flags)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;seq = tp-&gt;write_seq;</div><div class='add'>+	ULP_SKB_CB(skb)-&gt;flags = flags;</div><div class='add'>+	__skb_queue_tail(&amp;csk-&gt;txq, skb);</div><div class='add'>+	sk-&gt;sk_wmem_queued += skb-&gt;truesize;</div><div class='add'>+</div><div class='add'>+	if (TCP_PAGE(sk) &amp;&amp; TCP_OFF(sk)) {</div><div class='add'>+		put_page(TCP_PAGE(sk));</div><div class='add'>+		TCP_PAGE(sk) = NULL;</div><div class='add'>+		TCP_OFF(sk) = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *get_tx_skb(struct sock *sk, int size)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(size + TX_HEADER_LEN, sk-&gt;sk_allocation);</div><div class='add'>+	if (likely(skb)) {</div><div class='add'>+		skb_reserve(skb, TX_HEADER_LEN);</div><div class='add'>+		skb_entail(sk, skb, ULPCB_FLAG_NEED_HDR);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *get_record_skb(struct sock *sk, int size, bool zcopy)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(((zcopy ? 0 : size) + TX_TLSHDR_LEN +</div><div class='add'>+			KEY_ON_MEM_SZ + max_ivs_size(sk, size)),</div><div class='add'>+			sk-&gt;sk_allocation);</div><div class='add'>+	if (likely(skb)) {</div><div class='add'>+		skb_reserve(skb, (TX_TLSHDR_LEN +</div><div class='add'>+			    KEY_ON_MEM_SZ + max_ivs_size(sk, size)));</div><div class='add'>+		skb_entail(sk, skb, ULPCB_FLAG_NEED_HDR);</div><div class='add'>+		skb_reset_transport_header(skb);</div><div class='add'>+		ULP_SKB_CB(skb)-&gt;ulp.tls.ofld = 1;</div><div class='add'>+		ULP_SKB_CB(skb)-&gt;ulp.tls.type = csk-&gt;tlshws.type;</div><div class='add'>+	}</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tx_skb_finalize(struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct ulp_skb_cb *cb = ULP_SKB_CB(skb);</div><div class='add'>+</div><div class='add'>+	if (!(cb-&gt;flags &amp; ULPCB_FLAG_NO_HDR))</div><div class='add'>+		cb-&gt;flags = ULPCB_FLAG_NEED_HDR;</div><div class='add'>+	cb-&gt;flags |= ULPCB_FLAG_NO_APPEND;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void push_frames_if_head(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (skb_queue_len(&amp;csk-&gt;txq) == 1)</div><div class='add'>+		chtls_push_frames(csk, 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_skb_copy_to_page_nocache(struct sock *sk,</div><div class='add'>+					  struct iov_iter *from,</div><div class='add'>+					  struct sk_buff *skb,</div><div class='add'>+					  struct page *page,</div><div class='add'>+					  int off, int copy)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = skb_do_copy_data_nocache(sk, skb, from, page_address(page) +</div><div class='add'>+				       off, copy, skb-&gt;len);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	skb-&gt;len             += copy;</div><div class='add'>+	skb-&gt;data_len        += copy;</div><div class='add'>+	skb-&gt;truesize        += copy;</div><div class='add'>+	sk-&gt;sk_wmem_queued   += copy;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool csk_mem_free(struct chtls_dev *cdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	return (cdev-&gt;max_host_sndbuf - sk-&gt;sk_wmem_queued &gt; 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int csk_wait_memory(struct chtls_dev *cdev,</div><div class='add'>+			   struct sock *sk, long *timeo_p)</div><div class='add'>+{</div><div class='add'>+	DEFINE_WAIT_FUNC(wait, woken_wake_function);</div><div class='add'>+	int ret, err = 0;</div><div class='add'>+	long current_timeo;</div><div class='add'>+	long vm_wait = 0;</div><div class='add'>+	bool noblock;</div><div class='add'>+</div><div class='add'>+	current_timeo = *timeo_p;</div><div class='add'>+	noblock = (*timeo_p ? false : true);</div><div class='add'>+	if (csk_mem_free(cdev, sk)) {</div><div class='add'>+		current_timeo = get_random_u32_below(HZ / 5) + 2;</div><div class='add'>+		vm_wait = get_random_u32_below(HZ / 5) + 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	add_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	while (1) {</div><div class='add'>+		sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='add'>+</div><div class='add'>+		if (sk-&gt;sk_err || (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN))</div><div class='add'>+			goto do_error;</div><div class='add'>+		if (!*timeo_p) {</div><div class='add'>+			if (noblock)</div><div class='add'>+				set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='add'>+			goto do_nonblock;</div><div class='add'>+		}</div><div class='add'>+		if (signal_pending(current))</div><div class='add'>+			goto do_interrupted;</div><div class='add'>+		sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='add'>+		if (csk_mem_free(cdev, sk) &amp;&amp; !vm_wait)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='add'>+		sk-&gt;sk_write_pending++;</div><div class='add'>+		ret = sk_wait_event(sk, &amp;current_timeo, sk-&gt;sk_err ||</div><div class='add'>+				    (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN) ||</div><div class='add'>+				    (csk_mem_free(cdev, sk) &amp;&amp; !vm_wait),</div><div class='add'>+				    &amp;wait);</div><div class='add'>+		sk-&gt;sk_write_pending--;</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			goto do_error;</div><div class='add'>+</div><div class='add'>+		if (vm_wait) {</div><div class='add'>+			vm_wait -= current_timeo;</div><div class='add'>+			current_timeo = *timeo_p;</div><div class='add'>+			if (current_timeo != MAX_SCHEDULE_TIMEOUT) {</div><div class='add'>+				current_timeo -= vm_wait;</div><div class='add'>+				if (current_timeo &lt; 0)</div><div class='add'>+					current_timeo = 0;</div><div class='add'>+			}</div><div class='add'>+			vm_wait = 0;</div><div class='add'>+		}</div><div class='add'>+		*timeo_p = current_timeo;</div><div class='add'>+	}</div><div class='add'>+do_rm_wq:</div><div class='add'>+	remove_wait_queue(sk_sleep(sk), &amp;wait);</div><div class='add'>+	return err;</div><div class='add'>+do_error:</div><div class='add'>+	err = -EPIPE;</div><div class='add'>+	goto do_rm_wq;</div><div class='add'>+do_nonblock:</div><div class='add'>+	err = -EAGAIN;</div><div class='add'>+	goto do_rm_wq;</div><div class='add'>+do_interrupted:</div><div class='add'>+	err = sock_intr_errno(*timeo_p);</div><div class='add'>+	goto do_rm_wq;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_proccess_cmsg(struct sock *sk, struct msghdr *msg,</div><div class='add'>+			       unsigned char *record_type)</div><div class='add'>+{</div><div class='add'>+	struct cmsghdr *cmsg;</div><div class='add'>+	int rc = -EINVAL;</div><div class='add'>+</div><div class='add'>+	for_each_cmsghdr(cmsg, msg) {</div><div class='add'>+		if (!CMSG_OK(msg, cmsg))</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (cmsg-&gt;cmsg_level != SOL_TLS)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		switch (cmsg-&gt;cmsg_type) {</div><div class='add'>+		case TLS_SET_RECORD_TYPE:</div><div class='add'>+			if (cmsg-&gt;cmsg_len &lt; CMSG_LEN(sizeof(*record_type)))</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			if (msg-&gt;msg_flags &amp; MSG_MORE)</div><div class='add'>+				return -EINVAL;</div><div class='add'>+</div><div class='add'>+			*record_type = *(unsigned char *)CMSG_DATA(cmsg);</div><div class='add'>+			rc = 0;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct chtls_dev *cdev = csk-&gt;cdev;</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int mss, flags, err;</div><div class='add'>+	int recordsz = 0;</div><div class='add'>+	int copied = 0;</div><div class='add'>+	long timeo;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	flags = msg-&gt;msg_flags;</div><div class='add'>+	timeo = sock_sndtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+</div><div class='add'>+	if (!sk_in_state(sk, TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) {</div><div class='add'>+		err = sk_stream_wait_connect(sk, &amp;timeo);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out_err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);</div><div class='add'>+	err = -EPIPE;</div><div class='add'>+	if (sk-&gt;sk_err || (sk-&gt;sk_shutdown &amp; SEND_SHUTDOWN))</div><div class='add'>+		goto out_err;</div><div class='add'>+</div><div class='add'>+	mss = csk-&gt;mss;</div><div class='add'>+	csk_set_flag(csk, CSK_TX_MORE_DATA);</div><div class='add'>+</div><div class='add'>+	while (msg_data_left(msg)) {</div><div class='add'>+		int copy = 0;</div><div class='add'>+</div><div class='add'>+		skb = skb_peek_tail(&amp;csk-&gt;txq);</div><div class='add'>+		if (skb) {</div><div class='add'>+			copy = mss - skb-&gt;len;</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+		}</div><div class='add'>+		if (!csk_mem_free(cdev, sk))</div><div class='add'>+			goto wait_for_sndbuf;</div><div class='add'>+</div><div class='add'>+		if (is_tls_tx(csk) &amp;&amp; !csk-&gt;tlshws.txleft) {</div><div class='add'>+			unsigned char record_type = TLS_RECORD_TYPE_DATA;</div><div class='add'>+</div><div class='add'>+			if (unlikely(msg-&gt;msg_controllen)) {</div><div class='add'>+				err = chtls_proccess_cmsg(sk, msg,</div><div class='add'>+							  &amp;record_type);</div><div class='add'>+				if (err)</div><div class='add'>+					goto out_err;</div><div class='add'>+</div><div class='add'>+				/* Avoid appending tls handshake, alert to tls data */</div><div class='add'>+				if (skb)</div><div class='add'>+					tx_skb_finalize(skb);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			recordsz = size;</div><div class='add'>+			csk-&gt;tlshws.txleft = recordsz;</div><div class='add'>+			csk-&gt;tlshws.type = record_type;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (!skb || (ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NO_APPEND) ||</div><div class='add'>+		    copy &lt;= 0) {</div><div class='add'>+new_buf:</div><div class='add'>+			if (skb) {</div><div class='add'>+				tx_skb_finalize(skb);</div><div class='add'>+				push_frames_if_head(sk);</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (is_tls_tx(csk)) {</div><div class='add'>+				skb = get_record_skb(sk,</div><div class='add'>+						     select_size(sk,</div><div class='add'>+								 recordsz,</div><div class='add'>+								 flags,</div><div class='add'>+								 TX_TLSHDR_LEN),</div><div class='add'>+								 false);</div><div class='add'>+			} else {</div><div class='add'>+				skb = get_tx_skb(sk,</div><div class='add'>+						 select_size(sk, size, flags,</div><div class='add'>+							     TX_HEADER_LEN));</div><div class='add'>+			}</div><div class='add'>+			if (unlikely(!skb))</div><div class='add'>+				goto wait_for_memory;</div><div class='add'>+</div><div class='add'>+			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+			copy = mss;</div><div class='add'>+		}</div><div class='add'>+		if (copy &gt; size)</div><div class='add'>+			copy = size;</div><div class='add'>+</div><div class='add'>+		if (msg-&gt;msg_flags &amp; MSG_SPLICE_PAGES) {</div><div class='add'>+			err = skb_splice_from_iter(skb, &amp;msg-&gt;msg_iter, copy);</div><div class='add'>+			if (err &lt; 0) {</div><div class='add'>+				if (err == -EMSGSIZE)</div><div class='add'>+					goto new_buf;</div><div class='add'>+				goto do_fault;</div><div class='add'>+			}</div><div class='add'>+			copy = err;</div><div class='add'>+			sk_wmem_queued_add(sk, copy);</div><div class='add'>+		} else if (skb_tailroom(skb) &gt; 0) {</div><div class='add'>+			copy = min(copy, skb_tailroom(skb));</div><div class='add'>+			if (is_tls_tx(csk))</div><div class='add'>+				copy = min_t(int, copy, csk-&gt;tlshws.txleft);</div><div class='add'>+			err = skb_add_data_nocache(sk, skb,</div><div class='add'>+						   &amp;msg-&gt;msg_iter, copy);</div><div class='add'>+			if (err)</div><div class='add'>+				goto do_fault;</div><div class='add'>+		} else {</div><div class='add'>+			int i = skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+			struct page *page = TCP_PAGE(sk);</div><div class='add'>+			int pg_size = PAGE_SIZE;</div><div class='add'>+			int off = TCP_OFF(sk);</div><div class='add'>+			bool merge;</div><div class='add'>+</div><div class='add'>+			if (page)</div><div class='add'>+				pg_size = page_size(page);</div><div class='add'>+			if (off &lt; pg_size &amp;&amp;</div><div class='add'>+			    skb_can_coalesce(skb, i, page, off)) {</div><div class='add'>+				merge = true;</div><div class='add'>+				goto copy;</div><div class='add'>+			}</div><div class='add'>+			merge = false;</div><div class='add'>+			if (i == (is_tls_tx(csk) ? (MAX_SKB_FRAGS - 1) :</div><div class='add'>+			    MAX_SKB_FRAGS))</div><div class='add'>+				goto new_buf;</div><div class='add'>+</div><div class='add'>+			if (page &amp;&amp; off == pg_size) {</div><div class='add'>+				put_page(page);</div><div class='add'>+				TCP_PAGE(sk) = page = NULL;</div><div class='add'>+				pg_size = PAGE_SIZE;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (!page) {</div><div class='add'>+				gfp_t gfp = sk-&gt;sk_allocation;</div><div class='add'>+				int order = cdev-&gt;send_page_order;</div><div class='add'>+</div><div class='add'>+				if (order) {</div><div class='add'>+					page = alloc_pages(gfp | __GFP_COMP |</div><div class='add'>+							   __GFP_NOWARN |</div><div class='add'>+							   __GFP_NORETRY,</div><div class='add'>+							   order);</div><div class='add'>+					if (page)</div><div class='add'>+						pg_size &lt;&lt;= order;</div><div class='add'>+				}</div><div class='add'>+				if (!page) {</div><div class='add'>+					page = alloc_page(gfp);</div><div class='add'>+					pg_size = PAGE_SIZE;</div><div class='add'>+				}</div><div class='add'>+				if (!page)</div><div class='add'>+					goto wait_for_memory;</div><div class='add'>+				off = 0;</div><div class='add'>+			}</div><div class='add'>+copy:</div><div class='add'>+			if (copy &gt; pg_size - off)</div><div class='add'>+				copy = pg_size - off;</div><div class='add'>+			if (is_tls_tx(csk))</div><div class='add'>+				copy = min_t(int, copy, csk-&gt;tlshws.txleft);</div><div class='add'>+</div><div class='add'>+			err = chtls_skb_copy_to_page_nocache(sk, &amp;msg-&gt;msg_iter,</div><div class='add'>+							     skb, page,</div><div class='add'>+							     off, copy);</div><div class='add'>+			if (unlikely(err)) {</div><div class='add'>+				if (!TCP_PAGE(sk)) {</div><div class='add'>+					TCP_PAGE(sk) = page;</div><div class='add'>+					TCP_OFF(sk) = 0;</div><div class='add'>+				}</div><div class='add'>+				goto do_fault;</div><div class='add'>+			}</div><div class='add'>+			/* Update the skb. */</div><div class='add'>+			if (merge) {</div><div class='add'>+				skb_frag_size_add(</div><div class='add'>+						&amp;skb_shinfo(skb)-&gt;frags[i - 1],</div><div class='add'>+						copy);</div><div class='add'>+			} else {</div><div class='add'>+				skb_fill_page_desc(skb, i, page, off, copy);</div><div class='add'>+				if (off + copy &lt; pg_size) {</div><div class='add'>+					/* space left keep page */</div><div class='add'>+					get_page(page);</div><div class='add'>+					TCP_PAGE(sk) = page;</div><div class='add'>+				} else {</div><div class='add'>+					TCP_PAGE(sk) = NULL;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+			TCP_OFF(sk) = off + copy;</div><div class='add'>+		}</div><div class='add'>+		if (unlikely(skb-&gt;len == mss))</div><div class='add'>+			tx_skb_finalize(skb);</div><div class='add'>+		tp-&gt;write_seq += copy;</div><div class='add'>+		copied += copy;</div><div class='add'>+		size -= copy;</div><div class='add'>+</div><div class='add'>+		if (is_tls_tx(csk))</div><div class='add'>+			csk-&gt;tlshws.txleft -= copy;</div><div class='add'>+</div><div class='add'>+		if (corked(tp, flags) &amp;&amp;</div><div class='add'>+		    (sk_stream_wspace(sk) &lt; sk_stream_min_wspace(sk)))</div><div class='add'>+			ULP_SKB_CB(skb)-&gt;flags |= ULPCB_FLAG_NO_APPEND;</div><div class='add'>+</div><div class='add'>+		if (size == 0)</div><div class='add'>+			goto out;</div><div class='add'>+</div><div class='add'>+		if (ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_NO_APPEND)</div><div class='add'>+			push_frames_if_head(sk);</div><div class='add'>+		continue;</div><div class='add'>+wait_for_sndbuf:</div><div class='add'>+		set_bit(SOCK_NOSPACE, &amp;sk-&gt;sk_socket-&gt;flags);</div><div class='add'>+wait_for_memory:</div><div class='add'>+		err = csk_wait_memory(cdev, sk, &amp;timeo);</div><div class='add'>+		if (err)</div><div class='add'>+			goto do_error;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	csk_reset_flag(csk, CSK_TX_MORE_DATA);</div><div class='add'>+	if (copied)</div><div class='add'>+		chtls_tcp_push(sk, flags);</div><div class='add'>+done:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return copied;</div><div class='add'>+do_fault:</div><div class='add'>+	if (!skb-&gt;len) {</div><div class='add'>+		__skb_unlink(skb, &amp;csk-&gt;txq);</div><div class='add'>+		sk-&gt;sk_wmem_queued -= skb-&gt;truesize;</div><div class='add'>+		__kfree_skb(skb);</div><div class='add'>+	}</div><div class='add'>+do_error:</div><div class='add'>+	if (copied)</div><div class='add'>+		goto out;</div><div class='add'>+out_err:</div><div class='add'>+	if (csk_conn_inline(csk))</div><div class='add'>+		csk_reset_flag(csk, CSK_TX_MORE_DATA);</div><div class='add'>+	copied = sk_stream_error(sk, flags, err);</div><div class='add'>+	goto done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void chtls_splice_eof(struct socket *sock)</div><div class='add'>+{</div><div class='add'>+	struct sock *sk = sock-&gt;sk;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	chtls_tcp_push(sk, 0);</div><div class='add'>+	release_sock(sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_select_window(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	unsigned int wnd = tp-&gt;rcv_wnd;</div><div class='add'>+</div><div class='add'>+	wnd = max_t(unsigned int, wnd, tcp_full_space(sk));</div><div class='add'>+	wnd = max_t(unsigned int, MIN_RCV_WND, wnd);</div><div class='add'>+</div><div class='add'>+	if (wnd &gt; MAX_RCV_WND)</div><div class='add'>+		wnd = MAX_RCV_WND;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Check if we need to grow the receive window in response to an increase in</div><div class='add'>+ * the socket's receive buffer size.  Some applications increase the buffer</div><div class='add'>+ * size dynamically and rely on the window to grow accordingly.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+	if (wnd &gt; tp-&gt;rcv_wnd) {</div><div class='add'>+		tp-&gt;rcv_wup -= wnd - tp-&gt;rcv_wnd;</div><div class='add'>+		tp-&gt;rcv_wnd = wnd;</div><div class='add'>+		/* Mark the receive window as updated */</div><div class='add'>+		csk_reset_flag(csk, CSK_UPDATE_RCV_WND);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Send RX credits through an RX_DATA_ACK CPL message.  We are permitted</div><div class='add'>+ * to return without sending the message in case we cannot allocate</div><div class='add'>+ * an sk_buff.  Returns the number of credits sent.</div><div class='add'>+ */</div><div class='add'>+static u32 send_rx_credits(struct chtls_sock *csk, u32 credits)</div><div class='add'>+{</div><div class='add'>+	struct cpl_rx_data_ack *req;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = alloc_skb(sizeof(*req), GFP_ATOMIC);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return 0;</div><div class='add'>+	__skb_put(skb, sizeof(*req));</div><div class='add'>+	req = (struct cpl_rx_data_ack *)skb-&gt;head;</div><div class='add'>+</div><div class='add'>+	set_wr_txq(skb, CPL_PRIORITY_ACK, csk-&gt;port_id);</div><div class='add'>+	INIT_TP_WR(req, csk-&gt;tid);</div><div class='add'>+	OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_RX_DATA_ACK,</div><div class='add'>+						    csk-&gt;tid));</div><div class='add'>+	req-&gt;credit_dack = cpu_to_be32(RX_CREDITS_V(credits) |</div><div class='add'>+				       RX_FORCE_ACK_F);</div><div class='add'>+	cxgb4_ofld_send(csk-&gt;cdev-&gt;ports[csk-&gt;port_id], skb);</div><div class='add'>+	return credits;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define CREDIT_RETURN_STATE (TCPF_ESTABLISHED | \</div><div class='add'>+			     TCPF_FIN_WAIT1 | \</div><div class='add'>+			     TCPF_FIN_WAIT2)</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Called after some received data has been read.  It returns RX credits</div><div class='add'>+ * to the HW for the amount of data processed.</div><div class='add'>+ */</div><div class='add'>+static void chtls_cleanup_rbuf(struct sock *sk, int copied)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct tcp_sock *tp;</div><div class='add'>+	int must_send;</div><div class='add'>+	u32 credits;</div><div class='add'>+	u32 thres;</div><div class='add'>+</div><div class='add'>+	thres = 15 * 1024;</div><div class='add'>+</div><div class='add'>+	if (!sk_in_state(sk, CREDIT_RETURN_STATE))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	chtls_select_window(sk);</div><div class='add'>+	tp = tcp_sk(sk);</div><div class='add'>+	credits = tp-&gt;copied_seq - tp-&gt;rcv_wup;</div><div class='add'>+	if (unlikely(!credits))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * For coalescing to work effectively ensure the receive window has</div><div class='add'>+ * at least 16KB left.</div><div class='add'>+ */</div><div class='add'>+	must_send = credits + 16384 &gt;= tp-&gt;rcv_wnd;</div><div class='add'>+</div><div class='add'>+	if (must_send || credits &gt;= thres)</div><div class='add'>+		tp-&gt;rcv_wup += send_rx_credits(csk, credits);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_pt_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+			    int flags, int *addr_len)</div><div class='add'>+{</div><div class='add'>+	struct chtls_sock *csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+	struct chtls_hws *hws = &amp;csk-&gt;tlshws;</div><div class='add'>+	struct net_device *dev = csk-&gt;egress_dev;</div><div class='add'>+	struct adapter *adap = netdev2adap(dev);</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	unsigned long avail;</div><div class='add'>+	int buffers_freed;</div><div class='add'>+	int copied = 0;</div><div class='add'>+	int target;</div><div class='add'>+	long timeo;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buffers_freed = 0;</div><div class='add'>+</div><div class='add'>+	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+	target = sock_rcvlowat(sk, flags &amp; MSG_WAITALL, len);</div><div class='add'>+</div><div class='add'>+	if (unlikely(csk_flag(sk, CSK_UPDATE_RCV_WND)))</div><div class='add'>+		chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u32 offset = 0;</div><div class='add'>+</div><div class='add'>+		if (unlikely(tp-&gt;urg_data &amp;&amp;</div><div class='add'>+			     tp-&gt;urg_seq == tp-&gt;copied_seq)) {</div><div class='add'>+			if (copied)</div><div class='add'>+				break;</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				copied = timeo ? sock_intr_errno(timeo) :</div><div class='add'>+					-EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+		if (skb)</div><div class='add'>+			goto found_ok_skb;</div><div class='add'>+		if (csk-&gt;wr_credits &amp;&amp;</div><div class='add'>+		    skb_queue_len(&amp;csk-&gt;txq) &amp;&amp;</div><div class='add'>+		    chtls_push_frames(csk, csk-&gt;wr_credits ==</div><div class='add'>+				      csk-&gt;wr_max_credits))</div><div class='add'>+			sk-&gt;sk_write_space(sk);</div><div class='add'>+</div><div class='add'>+		if (copied &gt;= target &amp;&amp; !READ_ONCE(sk-&gt;sk_backlog.tail))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (copied) {</div><div class='add'>+			if (sk-&gt;sk_err || sk-&gt;sk_state == TCP_CLOSE ||</div><div class='add'>+			    (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) ||</div><div class='add'>+			    signal_pending(current))</div><div class='add'>+				break;</div><div class='add'>+</div><div class='add'>+			if (!timeo)</div><div class='add'>+				break;</div><div class='add'>+		} else {</div><div class='add'>+			if (sock_flag(sk, SOCK_DONE))</div><div class='add'>+				break;</div><div class='add'>+			if (sk-&gt;sk_err) {</div><div class='add'>+				copied = sock_error(sk);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+				break;</div><div class='add'>+			if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='add'>+				copied = -ENOTCONN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!timeo) {</div><div class='add'>+				copied = -EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				copied = sock_intr_errno(timeo);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_backlog.tail)) {</div><div class='add'>+			release_sock(sk);</div><div class='add'>+			lock_sock(sk);</div><div class='add'>+			chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copied &gt;= target)</div><div class='add'>+			break;</div><div class='add'>+		chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+		ret = sk_wait_data(sk, &amp;timeo, NULL);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			copied = copied ? : ret;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		continue;</div><div class='add'>+found_ok_skb:</div><div class='add'>+		if (!skb-&gt;len) {</div><div class='add'>+			skb_dstref_steal(skb);</div><div class='add'>+			__skb_unlink(skb, &amp;sk-&gt;sk_receive_queue);</div><div class='add'>+			kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+			if (!copied &amp;&amp; !timeo) {</div><div class='add'>+				copied = -EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (copied &lt; target) {</div><div class='add'>+				release_sock(sk);</div><div class='add'>+				lock_sock(sk);</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		offset = hws-&gt;copied_seq;</div><div class='add'>+		avail = skb-&gt;len - offset;</div><div class='add'>+		if (len &lt; avail)</div><div class='add'>+			avail = len;</div><div class='add'>+</div><div class='add'>+		if (unlikely(tp-&gt;urg_data)) {</div><div class='add'>+			u32 urg_offset = tp-&gt;urg_seq - tp-&gt;copied_seq;</div><div class='add'>+</div><div class='add'>+			if (urg_offset &lt; avail) {</div><div class='add'>+				if (urg_offset) {</div><div class='add'>+					avail = urg_offset;</div><div class='add'>+				} else if (!sock_flag(sk, SOCK_URGINLINE)) {</div><div class='add'>+					/* First byte is urgent, skip */</div><div class='add'>+					tp-&gt;copied_seq++;</div><div class='add'>+					offset++;</div><div class='add'>+					avail--;</div><div class='add'>+					if (!avail)</div><div class='add'>+						goto skip_copy;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		/* Set record type if not already done. For a non-data record,</div><div class='add'>+		 * do not proceed if record type could not be copied.</div><div class='add'>+		 */</div><div class='add'>+		if (ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_TLS_HDR) {</div><div class='add'>+			struct tls_hdr *thdr = (struct tls_hdr *)skb-&gt;data;</div><div class='add'>+			int cerr = 0;</div><div class='add'>+</div><div class='add'>+			cerr = put_cmsg(msg, SOL_TLS, TLS_GET_RECORD_TYPE,</div><div class='add'>+					sizeof(thdr-&gt;type), &amp;thdr-&gt;type);</div><div class='add'>+</div><div class='add'>+			if (cerr &amp;&amp; thdr-&gt;type != TLS_RECORD_TYPE_DATA) {</div><div class='add'>+				copied = -EIO;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			/*  don't send tls header, skip copy */</div><div class='add'>+			goto skip_copy;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (skb_copy_datagram_msg(skb, offset, msg, avail)) {</div><div class='add'>+			if (!copied) {</div><div class='add'>+				copied = -EFAULT;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		copied += avail;</div><div class='add'>+		len -= avail;</div><div class='add'>+		hws-&gt;copied_seq += avail;</div><div class='add'>+skip_copy:</div><div class='add'>+		if (tp-&gt;urg_data &amp;&amp; after(tp-&gt;copied_seq, tp-&gt;urg_seq))</div><div class='add'>+			tp-&gt;urg_data = 0;</div><div class='add'>+</div><div class='add'>+		if ((avail + offset) &gt;= skb-&gt;len) {</div><div class='add'>+			struct sk_buff *next_skb;</div><div class='add'>+			if (ULP_SKB_CB(skb)-&gt;flags &amp; ULPCB_FLAG_TLS_HDR) {</div><div class='add'>+				tp-&gt;copied_seq += skb-&gt;len;</div><div class='add'>+				hws-&gt;rcvpld = skb-&gt;hdr_len;</div><div class='add'>+			} else {</div><div class='add'>+				atomic_inc(&amp;adap-&gt;chcr_stats.tls_pdu_rx);</div><div class='add'>+				tp-&gt;copied_seq += hws-&gt;rcvpld;</div><div class='add'>+			}</div><div class='add'>+			chtls_free_skb(sk, skb);</div><div class='add'>+			buffers_freed++;</div><div class='add'>+			hws-&gt;copied_seq = 0;</div><div class='add'>+			next_skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+			if (copied &gt;= target &amp;&amp; !next_skb)</div><div class='add'>+				break;</div><div class='add'>+			if (ULP_SKB_CB(next_skb)-&gt;flags &amp; ULPCB_FLAG_TLS_HDR)</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} while (len &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (buffers_freed)</div><div class='add'>+		chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Peek at data in a socket's receive buffer.</div><div class='add'>+ */</div><div class='add'>+static int peekmsg(struct sock *sk, struct msghdr *msg,</div><div class='add'>+		   size_t len, int flags)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	u32 peek_seq, offset;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int copied = 0;</div><div class='add'>+	size_t avail;          /* amount of available data in current skb */</div><div class='add'>+	long timeo;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+	peek_seq = tp-&gt;copied_seq;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (unlikely(tp-&gt;urg_data &amp;&amp; tp-&gt;urg_seq == peek_seq)) {</div><div class='add'>+			if (copied)</div><div class='add'>+				break;</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				copied = timeo ? sock_intr_errno(timeo) :</div><div class='add'>+				-EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb_queue_walk(&amp;sk-&gt;sk_receive_queue, skb) {</div><div class='add'>+			offset = peek_seq - ULP_SKB_CB(skb)-&gt;seq;</div><div class='add'>+			if (offset &lt; skb-&gt;len)</div><div class='add'>+				goto found_ok_skb;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* empty receive queue */</div><div class='add'>+		if (copied)</div><div class='add'>+			break;</div><div class='add'>+		if (sock_flag(sk, SOCK_DONE))</div><div class='add'>+			break;</div><div class='add'>+		if (sk-&gt;sk_err) {</div><div class='add'>+			copied = sock_error(sk);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+			break;</div><div class='add'>+		if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='add'>+			copied = -ENOTCONN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (!timeo) {</div><div class='add'>+			copied = -EAGAIN;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+		if (signal_pending(current)) {</div><div class='add'>+			copied = sock_intr_errno(timeo);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_backlog.tail)) {</div><div class='add'>+			/* Do not sleep, just process backlog. */</div><div class='add'>+			release_sock(sk);</div><div class='add'>+			lock_sock(sk);</div><div class='add'>+		} else {</div><div class='add'>+			ret = sk_wait_data(sk, &amp;timeo, NULL);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				/* here 'copied' is 0 due to previous checks */</div><div class='add'>+				copied = ret;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (unlikely(peek_seq != tp-&gt;copied_seq)) {</div><div class='add'>+			if (net_ratelimit())</div><div class='add'>+				pr_info("TCP(%s:%d), race in MSG_PEEK.\n",</div><div class='add'>+					current-&gt;comm, current-&gt;pid);</div><div class='add'>+			peek_seq = tp-&gt;copied_seq;</div><div class='add'>+		}</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+found_ok_skb:</div><div class='add'>+		avail = skb-&gt;len - offset;</div><div class='add'>+		if (len &lt; avail)</div><div class='add'>+			avail = len;</div><div class='add'>+		/*</div><div class='add'>+		 * Do we have urgent data here?  We need to skip over the</div><div class='add'>+		 * urgent byte.</div><div class='add'>+		 */</div><div class='add'>+		if (unlikely(tp-&gt;urg_data)) {</div><div class='add'>+			u32 urg_offset = tp-&gt;urg_seq - peek_seq;</div><div class='add'>+</div><div class='add'>+			if (urg_offset &lt; avail) {</div><div class='add'>+				/*</div><div class='add'>+				 * The amount of data we are preparing to copy</div><div class='add'>+				 * contains urgent data.</div><div class='add'>+				 */</div><div class='add'>+				if (!urg_offset) { /* First byte is urgent */</div><div class='add'>+					if (!sock_flag(sk, SOCK_URGINLINE)) {</div><div class='add'>+						peek_seq++;</div><div class='add'>+						offset++;</div><div class='add'>+						avail--;</div><div class='add'>+					}</div><div class='add'>+					if (!avail)</div><div class='add'>+						continue;</div><div class='add'>+				} else {</div><div class='add'>+					/* stop short of the urgent data */</div><div class='add'>+					avail = urg_offset;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/*</div><div class='add'>+		 * If MSG_TRUNC is specified the data is discarded.</div><div class='add'>+		 */</div><div class='add'>+		if (likely(!(flags &amp; MSG_TRUNC)))</div><div class='add'>+			if (skb_copy_datagram_msg(skb, offset, msg, len)) {</div><div class='add'>+				if (!copied) {</div><div class='add'>+					copied = -EFAULT;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		peek_seq += avail;</div><div class='add'>+		copied += avail;</div><div class='add'>+		len -= avail;</div><div class='add'>+	} while (len &gt; 0);</div><div class='add'>+</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,</div><div class='add'>+		  int flags, int *addr_len)</div><div class='add'>+{</div><div class='add'>+	struct tcp_sock *tp = tcp_sk(sk);</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	unsigned long avail;    /* amount of available data in current skb */</div><div class='add'>+	int buffers_freed;</div><div class='add'>+	int copied = 0;</div><div class='add'>+	long timeo;</div><div class='add'>+	int target;             /* Read at least this many bytes */</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	buffers_freed = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_OOB))</div><div class='add'>+		return tcp_prot.recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; MSG_PEEK))</div><div class='add'>+		return peekmsg(sk, msg, len, flags);</div><div class='add'>+</div><div class='add'>+	if (sk_can_busy_loop(sk) &amp;&amp;</div><div class='add'>+	    skb_queue_empty_lockless(&amp;sk-&gt;sk_receive_queue) &amp;&amp;</div><div class='add'>+	    sk-&gt;sk_state == TCP_ESTABLISHED)</div><div class='add'>+		sk_busy_loop(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+</div><div class='add'>+	lock_sock(sk);</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (is_tls_rx(csk))</div><div class='add'>+		return chtls_pt_recvmsg(sk, msg, len, flags, addr_len);</div><div class='add'>+</div><div class='add'>+	timeo = sock_rcvtimeo(sk, flags &amp; MSG_DONTWAIT);</div><div class='add'>+	target = sock_rcvlowat(sk, flags &amp; MSG_WAITALL, len);</div><div class='add'>+</div><div class='add'>+	if (unlikely(csk_flag(sk, CSK_UPDATE_RCV_WND)))</div><div class='add'>+		chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		u32 offset;</div><div class='add'>+</div><div class='add'>+		if (unlikely(tp-&gt;urg_data &amp;&amp; tp-&gt;urg_seq == tp-&gt;copied_seq)) {</div><div class='add'>+			if (copied)</div><div class='add'>+				break;</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				copied = timeo ? sock_intr_errno(timeo) :</div><div class='add'>+					-EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb = skb_peek(&amp;sk-&gt;sk_receive_queue);</div><div class='add'>+		if (skb)</div><div class='add'>+			goto found_ok_skb;</div><div class='add'>+</div><div class='add'>+		if (csk-&gt;wr_credits &amp;&amp;</div><div class='add'>+		    skb_queue_len(&amp;csk-&gt;txq) &amp;&amp;</div><div class='add'>+		    chtls_push_frames(csk, csk-&gt;wr_credits ==</div><div class='add'>+				      csk-&gt;wr_max_credits))</div><div class='add'>+			sk-&gt;sk_write_space(sk);</div><div class='add'>+</div><div class='add'>+		if (copied &gt;= target &amp;&amp; !READ_ONCE(sk-&gt;sk_backlog.tail))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		if (copied) {</div><div class='add'>+			if (sk-&gt;sk_err || sk-&gt;sk_state == TCP_CLOSE ||</div><div class='add'>+			    (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN) ||</div><div class='add'>+			    signal_pending(current))</div><div class='add'>+				break;</div><div class='add'>+		} else {</div><div class='add'>+			if (sock_flag(sk, SOCK_DONE))</div><div class='add'>+				break;</div><div class='add'>+			if (sk-&gt;sk_err) {</div><div class='add'>+				copied = sock_error(sk);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (sk-&gt;sk_shutdown &amp; RCV_SHUTDOWN)</div><div class='add'>+				break;</div><div class='add'>+			if (sk-&gt;sk_state == TCP_CLOSE) {</div><div class='add'>+				copied = -ENOTCONN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (!timeo) {</div><div class='add'>+				copied = -EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			if (signal_pending(current)) {</div><div class='add'>+				copied = sock_intr_errno(timeo);</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (READ_ONCE(sk-&gt;sk_backlog.tail)) {</div><div class='add'>+			release_sock(sk);</div><div class='add'>+			lock_sock(sk);</div><div class='add'>+			chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (copied &gt;= target)</div><div class='add'>+			break;</div><div class='add'>+		chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+		ret = sk_wait_data(sk, &amp;timeo, NULL);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			copied = copied ? : ret;</div><div class='add'>+			goto unlock;</div><div class='add'>+		}</div><div class='add'>+		continue;</div><div class='add'>+</div><div class='add'>+found_ok_skb:</div><div class='add'>+		if (!skb-&gt;len) {</div><div class='add'>+			chtls_kfree_skb(sk, skb);</div><div class='add'>+			if (!copied &amp;&amp; !timeo) {</div><div class='add'>+				copied = -EAGAIN;</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (copied &lt; target)</div><div class='add'>+				continue;</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		offset = tp-&gt;copied_seq - ULP_SKB_CB(skb)-&gt;seq;</div><div class='add'>+		avail = skb-&gt;len - offset;</div><div class='add'>+		if (len &lt; avail)</div><div class='add'>+			avail = len;</div><div class='add'>+</div><div class='add'>+		if (unlikely(tp-&gt;urg_data)) {</div><div class='add'>+			u32 urg_offset = tp-&gt;urg_seq - tp-&gt;copied_seq;</div><div class='add'>+</div><div class='add'>+			if (urg_offset &lt; avail) {</div><div class='add'>+				if (urg_offset) {</div><div class='add'>+					avail = urg_offset;</div><div class='add'>+				} else if (!sock_flag(sk, SOCK_URGINLINE)) {</div><div class='add'>+					tp-&gt;copied_seq++;</div><div class='add'>+					offset++;</div><div class='add'>+					avail--;</div><div class='add'>+					if (!avail)</div><div class='add'>+						goto skip_copy;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (likely(!(flags &amp; MSG_TRUNC))) {</div><div class='add'>+			if (skb_copy_datagram_msg(skb, offset,</div><div class='add'>+						  msg, avail)) {</div><div class='add'>+				if (!copied) {</div><div class='add'>+					copied = -EFAULT;</div><div class='add'>+					break;</div><div class='add'>+				}</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tp-&gt;copied_seq += avail;</div><div class='add'>+		copied += avail;</div><div class='add'>+		len -= avail;</div><div class='add'>+</div><div class='add'>+skip_copy:</div><div class='add'>+		if (tp-&gt;urg_data &amp;&amp; after(tp-&gt;copied_seq, tp-&gt;urg_seq))</div><div class='add'>+			tp-&gt;urg_data = 0;</div><div class='add'>+</div><div class='add'>+		if (avail + offset &gt;= skb-&gt;len) {</div><div class='add'>+			chtls_free_skb(sk, skb);</div><div class='add'>+			buffers_freed++;</div><div class='add'>+</div><div class='add'>+			if  (copied &gt;= target &amp;&amp;</div><div class='add'>+			     !skb_peek(&amp;sk-&gt;sk_receive_queue))</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+	} while (len &gt; 0);</div><div class='add'>+</div><div class='add'>+	if (buffers_freed)</div><div class='add'>+		chtls_cleanup_rbuf(sk, copied);</div><div class='add'>+</div><div class='add'>+unlock:</div><div class='add'>+	release_sock(sk);</div><div class='add'>+	return copied;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c<br/>new file mode 100644<br/>index 000000000000..daa1ebaef511<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c</a></div><div class='hunk'>@@ -0,0 +1,642 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2018 Chelsio Communications, Inc.</div><div class='add'>+ *</div><div class='add'>+ * Written by: Atul Gupta (atul.gupta@chelsio.com)</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/kernel.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/socket.h&gt;</div><div class='add'>+#include &lt;linux/hash.h&gt;</div><div class='add'>+#include &lt;linux/in.h&gt;</div><div class='add'>+#include &lt;linux/net.h&gt;</div><div class='add'>+#include &lt;linux/ip.h&gt;</div><div class='add'>+#include &lt;linux/tcp.h&gt;</div><div class='add'>+#include &lt;net/ipv6.h&gt;</div><div class='add'>+#include &lt;net/transp_v6.h&gt;</div><div class='add'>+#include &lt;net/tcp.h&gt;</div><div class='add'>+#include &lt;net/tls.h&gt;</div><div class='add'>+</div><div class='add'>+#include "chtls.h"</div><div class='add'>+#include "chtls_cm.h"</div><div class='add'>+</div><div class='add'>+#define DRV_NAME "chtls"</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * chtls device management</div><div class='add'>+ * maintains a list of the chtls devices</div><div class='add'>+ */</div><div class='add'>+static LIST_HEAD(cdev_list);</div><div class='add'>+static DEFINE_MUTEX(cdev_mutex);</div><div class='add'>+</div><div class='add'>+static DEFINE_MUTEX(notify_mutex);</div><div class='add'>+static RAW_NOTIFIER_HEAD(listen_notify_list);</div><div class='add'>+static struct proto chtls_cpl_prot, chtls_cpl_protv6;</div><div class='add'>+struct request_sock_ops chtls_rsk_ops, chtls_rsk_opsv6;</div><div class='add'>+static uint send_page_order = (14 - PAGE_SHIFT &lt; 0) ? 0 : 14 - PAGE_SHIFT;</div><div class='add'>+</div><div class='add'>+static void register_listen_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;notify_mutex);</div><div class='add'>+	raw_notifier_chain_register(&amp;listen_notify_list, nb);</div><div class='add'>+	mutex_unlock(&amp;notify_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void unregister_listen_notifier(struct notifier_block *nb)</div><div class='add'>+{</div><div class='add'>+	mutex_lock(&amp;notify_mutex);</div><div class='add'>+	raw_notifier_chain_unregister(&amp;listen_notify_list, nb);</div><div class='add'>+	mutex_unlock(&amp;notify_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int listen_notify_handler(struct notifier_block *this,</div><div class='add'>+				 unsigned long event, void *data)</div><div class='add'>+{</div><div class='add'>+	struct chtls_listen *clisten;</div><div class='add'>+	int ret = NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	clisten = (struct chtls_listen *)data;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case CHTLS_LISTEN_START:</div><div class='add'>+		ret = chtls_listen_start(clisten-&gt;cdev, clisten-&gt;sk);</div><div class='add'>+		kfree(clisten);</div><div class='add'>+		break;</div><div class='add'>+	case CHTLS_LISTEN_STOP:</div><div class='add'>+		chtls_listen_stop(clisten-&gt;cdev, clisten-&gt;sk);</div><div class='add'>+		kfree(clisten);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct notifier_block listen_notifier = {</div><div class='add'>+	.notifier_call = listen_notify_handler</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int listen_backlog_rcv(struct sock *sk, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	if (likely(skb_transport_header(skb) != skb_network_header(skb)))</div><div class='add'>+		return tcp_v4_do_rcv(sk, skb);</div><div class='add'>+	BLOG_SKB_CB(skb)-&gt;backlog_rcv(sk, skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_start_listen(struct chtls_dev *cdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_listen *clisten;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='add'>+		return -EPROTONOSUPPORT;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_family == PF_INET &amp;&amp;</div><div class='add'>+	    LOOPBACK(inet_sk(sk)-&gt;inet_rcv_saddr))</div><div class='add'>+		return -EADDRNOTAVAIL;</div><div class='add'>+</div><div class='add'>+	sk-&gt;sk_backlog_rcv = listen_backlog_rcv;</div><div class='add'>+	clisten = kmalloc(sizeof(*clisten), GFP_KERNEL);</div><div class='add'>+	if (!clisten)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	clisten-&gt;cdev = cdev;</div><div class='add'>+	clisten-&gt;sk = sk;</div><div class='add'>+	mutex_lock(&amp;notify_mutex);</div><div class='add'>+	raw_notifier_call_chain(&amp;listen_notify_list,</div><div class='add'>+				      CHTLS_LISTEN_START, clisten);</div><div class='add'>+	mutex_unlock(&amp;notify_mutex);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_stop_listen(struct chtls_dev *cdev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_listen *clisten;</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_protocol != IPPROTO_TCP)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	clisten = kmalloc(sizeof(*clisten), GFP_KERNEL);</div><div class='add'>+	if (!clisten)</div><div class='add'>+		return;</div><div class='add'>+	clisten-&gt;cdev = cdev;</div><div class='add'>+	clisten-&gt;sk = sk;</div><div class='add'>+	mutex_lock(&amp;notify_mutex);</div><div class='add'>+	raw_notifier_call_chain(&amp;listen_notify_list,</div><div class='add'>+				CHTLS_LISTEN_STOP, clisten);</div><div class='add'>+	mutex_unlock(&amp;notify_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_inline_feature(struct tls_toe_device *dev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	cdev = to_chtls_dev(dev);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; cdev-&gt;lldi-&gt;nports; i++) {</div><div class='add'>+		netdev = cdev-&gt;ports[i];</div><div class='add'>+		if (netdev-&gt;features &amp; NETIF_F_HW_TLS_RECORD)</div><div class='add'>+			return 1;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_create_hash(struct tls_toe_device *dev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev = to_chtls_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='add'>+		return chtls_start_listen(cdev, sk);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_destroy_hash(struct tls_toe_device *dev, struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev = to_chtls_dev(dev);</div><div class='add'>+</div><div class='add'>+	if (sk-&gt;sk_state == TCP_LISTEN)</div><div class='add'>+		chtls_stop_listen(cdev, sk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_free_uld(struct chtls_dev *cdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tls_toe_unregister_device(&amp;cdev-&gt;tlsdev);</div><div class='add'>+	kvfree(cdev-&gt;kmap.addr);</div><div class='add'>+	idr_destroy(&amp;cdev-&gt;hwtid_idr);</div><div class='add'>+	for (i = 0; i &lt; (1 &lt;&lt; RSPQ_HASH_BITS); i++)</div><div class='add'>+		kfree_skb(cdev-&gt;rspq_skb_cache[i]);</div><div class='add'>+	kfree(cdev-&gt;lldi);</div><div class='add'>+	kfree_skb(cdev-&gt;askb);</div><div class='add'>+	kfree(cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void chtls_dev_release(struct kref *kref)</div><div class='add'>+{</div><div class='add'>+	struct tls_toe_device *dev;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	struct adapter *adap;</div><div class='add'>+</div><div class='add'>+	dev = container_of(kref, struct tls_toe_device, kref);</div><div class='add'>+	cdev = to_chtls_dev(dev);</div><div class='add'>+</div><div class='add'>+	/* Reset tls rx/tx stats */</div><div class='add'>+	adap = pci_get_drvdata(cdev-&gt;pdev);</div><div class='add'>+	atomic_set(&amp;adap-&gt;chcr_stats.tls_pdu_tx, 0);</div><div class='add'>+	atomic_set(&amp;adap-&gt;chcr_stats.tls_pdu_rx, 0);</div><div class='add'>+</div><div class='add'>+	chtls_free_uld(cdev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_register_dev(struct chtls_dev *cdev)</div><div class='add'>+{</div><div class='add'>+	struct tls_toe_device *tlsdev = &amp;cdev-&gt;tlsdev;</div><div class='add'>+</div><div class='add'>+	strscpy(tlsdev-&gt;name, "chtls", TLS_TOE_DEVICE_NAME_MAX);</div><div class='add'>+	strlcat(tlsdev-&gt;name, cdev-&gt;lldi-&gt;ports[0]-&gt;name,</div><div class='add'>+		TLS_TOE_DEVICE_NAME_MAX);</div><div class='add'>+	tlsdev-&gt;feature = chtls_inline_feature;</div><div class='add'>+	tlsdev-&gt;hash = chtls_create_hash;</div><div class='add'>+	tlsdev-&gt;unhash = chtls_destroy_hash;</div><div class='add'>+	tlsdev-&gt;release = chtls_dev_release;</div><div class='add'>+	kref_init(&amp;tlsdev-&gt;kref);</div><div class='add'>+	tls_toe_register_device(tlsdev);</div><div class='add'>+	cdev-&gt;cdev_state = CHTLS_CDEV_STATE_UP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void process_deferq(struct work_struct *task_param)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev = container_of(task_param,</div><div class='add'>+				struct chtls_dev, deferq_task);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;cdev-&gt;deferq.lock);</div><div class='add'>+	while ((skb = __skb_dequeue(&amp;cdev-&gt;deferq)) != NULL) {</div><div class='add'>+		spin_unlock_bh(&amp;cdev-&gt;deferq.lock);</div><div class='add'>+		DEFERRED_SKB_CB(skb)-&gt;handler(cdev, skb);</div><div class='add'>+		spin_lock_bh(&amp;cdev-&gt;deferq.lock);</div><div class='add'>+	}</div><div class='add'>+	spin_unlock_bh(&amp;cdev-&gt;deferq.lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_get_skb(struct chtls_dev *cdev)</div><div class='add'>+{</div><div class='add'>+	cdev-&gt;askb = alloc_skb(sizeof(struct tcphdr), GFP_KERNEL);</div><div class='add'>+	if (!cdev-&gt;askb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	skb_put(cdev-&gt;askb, sizeof(struct tcphdr));</div><div class='add'>+	skb_reset_transport_header(cdev-&gt;askb);</div><div class='add'>+	memset(cdev-&gt;askb-&gt;data, 0, cdev-&gt;askb-&gt;len);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *chtls_uld_add(const struct cxgb4_lld_info *info)</div><div class='add'>+{</div><div class='add'>+	struct cxgb4_lld_info *lldi;</div><div class='add'>+	struct chtls_dev *cdev;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);</div><div class='add'>+	if (!cdev)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	lldi = kzalloc(sizeof(*lldi), GFP_KERNEL);</div><div class='add'>+	if (!lldi)</div><div class='add'>+		goto out_lldi;</div><div class='add'>+</div><div class='add'>+	if (chtls_get_skb(cdev))</div><div class='add'>+		goto out_skb;</div><div class='add'>+</div><div class='add'>+	*lldi = *info;</div><div class='add'>+	cdev-&gt;lldi = lldi;</div><div class='add'>+	cdev-&gt;pdev = lldi-&gt;pdev;</div><div class='add'>+	cdev-&gt;tids = lldi-&gt;tids;</div><div class='add'>+	cdev-&gt;ports = lldi-&gt;ports;</div><div class='add'>+	cdev-&gt;mtus = lldi-&gt;mtus;</div><div class='add'>+	cdev-&gt;tids = lldi-&gt;tids;</div><div class='add'>+	cdev-&gt;pfvf = FW_VIID_PFN_G(cxgb4_port_viid(lldi-&gt;ports[0]))</div><div class='add'>+			&lt;&lt; FW_VIID_PFN_S;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; (1 &lt;&lt; RSPQ_HASH_BITS); i++) {</div><div class='add'>+		unsigned int size = 64 - sizeof(struct rsp_ctrl) - 8;</div><div class='add'>+</div><div class='add'>+		cdev-&gt;rspq_skb_cache[i] = __alloc_skb(size,</div><div class='add'>+						      gfp_any(), 0,</div><div class='add'>+						      lldi-&gt;nodeid);</div><div class='add'>+		if (unlikely(!cdev-&gt;rspq_skb_cache[i]))</div><div class='add'>+			goto out_rspq_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	idr_init(&amp;cdev-&gt;hwtid_idr);</div><div class='add'>+	INIT_WORK(&amp;cdev-&gt;deferq_task, process_deferq);</div><div class='add'>+	spin_lock_init(&amp;cdev-&gt;listen_lock);</div><div class='add'>+	spin_lock_init(&amp;cdev-&gt;idr_lock);</div><div class='add'>+	cdev-&gt;send_page_order = min_t(uint, get_order(32768),</div><div class='add'>+				      send_page_order);</div><div class='add'>+	cdev-&gt;max_host_sndbuf = 48 * 1024;</div><div class='add'>+</div><div class='add'>+	if (lldi-&gt;vr-&gt;key.size)</div><div class='add'>+		if (chtls_init_kmap(cdev, lldi))</div><div class='add'>+			goto out_rspq_skb;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cdev_mutex);</div><div class='add'>+	list_add_tail(&amp;cdev-&gt;list, &amp;cdev_list);</div><div class='add'>+	mutex_unlock(&amp;cdev_mutex);</div><div class='add'>+</div><div class='add'>+	return cdev;</div><div class='add'>+out_rspq_skb:</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		kfree_skb(cdev-&gt;rspq_skb_cache[j]);</div><div class='add'>+	kfree_skb(cdev-&gt;askb);</div><div class='add'>+out_skb:</div><div class='add'>+	kfree(lldi);</div><div class='add'>+out_lldi:</div><div class='add'>+	kfree(cdev);</div><div class='add'>+out:</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_free_all_uld(void)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev, *tmp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;cdev_mutex);</div><div class='add'>+	list_for_each_entry_safe(cdev, tmp, &amp;cdev_list, list) {</div><div class='add'>+		if (cdev-&gt;cdev_state == CHTLS_CDEV_STATE_UP) {</div><div class='add'>+			list_del(&amp;cdev-&gt;list);</div><div class='add'>+			kref_put(&amp;cdev-&gt;tlsdev.kref, cdev-&gt;tlsdev.release);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	mutex_unlock(&amp;cdev_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_uld_state_change(void *handle, enum cxgb4_state new_state)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev = handle;</div><div class='add'>+</div><div class='add'>+	switch (new_state) {</div><div class='add'>+	case CXGB4_STATE_UP:</div><div class='add'>+		chtls_register_dev(cdev);</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_STATE_DOWN:</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_STATE_START_RECOVERY:</div><div class='add'>+		break;</div><div class='add'>+	case CXGB4_STATE_DETACH:</div><div class='add'>+		mutex_lock(&amp;cdev_mutex);</div><div class='add'>+		list_del(&amp;cdev-&gt;list);</div><div class='add'>+		mutex_unlock(&amp;cdev_mutex);</div><div class='add'>+		kref_put(&amp;cdev-&gt;tlsdev.kref, cdev-&gt;tlsdev.release);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *copy_gl_to_skb_pkt(const struct pkt_gl *gl,</div><div class='add'>+					  const __be64 *rsp,</div><div class='add'>+					  u32 pktshift)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	/* Allocate space for cpl_pass_accept_req which will be synthesized by</div><div class='add'>+	 * driver. Once driver synthesizes cpl_pass_accept_req the skb will go</div><div class='add'>+	 * through the regular cpl_pass_accept_req processing in TOM.</div><div class='add'>+	 */</div><div class='add'>+	skb = alloc_skb(size_add(gl-&gt;tot_len,</div><div class='add'>+				 sizeof(struct cpl_pass_accept_req)) -</div><div class='add'>+			pktshift, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+	__skb_put(skb, gl-&gt;tot_len + sizeof(struct cpl_pass_accept_req)</div><div class='add'>+		   - pktshift);</div><div class='add'>+	/* For now we will copy  cpl_rx_pkt in the skb */</div><div class='add'>+	skb_copy_to_linear_data(skb, rsp, sizeof(struct cpl_rx_pkt));</div><div class='add'>+	skb_copy_to_linear_data_offset(skb, sizeof(struct cpl_pass_accept_req)</div><div class='add'>+				       , gl-&gt;va + pktshift,</div><div class='add'>+				       gl-&gt;tot_len - pktshift);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_recv_packet(struct chtls_dev *cdev,</div><div class='add'>+			     const struct pkt_gl *gl, const __be64 *rsp)</div><div class='add'>+{</div><div class='add'>+	unsigned int opcode = *(u8 *)rsp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	skb = copy_gl_to_skb_pkt(gl, rsp, cdev-&gt;lldi-&gt;sge_pktshift);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ret = chtls_handlers[opcode](cdev, skb);</div><div class='add'>+	if (ret &amp; CPL_RET_BUF_DONE)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_recv_rsp(struct chtls_dev *cdev, const __be64 *rsp)</div><div class='add'>+{</div><div class='add'>+	unsigned long rspq_bin;</div><div class='add'>+	unsigned int opcode;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	len = 64 - sizeof(struct rsp_ctrl) - 8;</div><div class='add'>+	opcode = *(u8 *)rsp;</div><div class='add'>+</div><div class='add'>+	rspq_bin = hash_ptr((void *)rsp, RSPQ_HASH_BITS);</div><div class='add'>+	skb = cdev-&gt;rspq_skb_cache[rspq_bin];</div><div class='add'>+	if (skb &amp;&amp; !skb_is_nonlinear(skb) &amp;&amp;</div><div class='add'>+	    !skb_shared(skb) &amp;&amp; !skb_cloned(skb)) {</div><div class='add'>+		refcount_inc(&amp;skb-&gt;users);</div><div class='add'>+		if (refcount_read(&amp;skb-&gt;users) == 2) {</div><div class='add'>+			__skb_trim(skb, 0);</div><div class='add'>+			if (skb_tailroom(skb) &gt;= len)</div><div class='add'>+				goto copy_out;</div><div class='add'>+		}</div><div class='add'>+		refcount_dec(&amp;skb-&gt;users);</div><div class='add'>+	}</div><div class='add'>+	skb = alloc_skb(len, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+copy_out:</div><div class='add'>+	__skb_put(skb, len);</div><div class='add'>+	skb_copy_to_linear_data(skb, rsp, len);</div><div class='add'>+	skb_reset_network_header(skb);</div><div class='add'>+	skb_reset_transport_header(skb);</div><div class='add'>+	ret = chtls_handlers[opcode](cdev, skb);</div><div class='add'>+</div><div class='add'>+	if (ret &amp; CPL_RET_BUF_DONE)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void chtls_recv(struct chtls_dev *cdev,</div><div class='add'>+		       struct sk_buff **skbs, const __be64 *rsp)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb = *skbs;</div><div class='add'>+	unsigned int opcode;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	opcode = *(u8 *)rsp;</div><div class='add'>+</div><div class='add'>+	__skb_push(skb, sizeof(struct rss_header));</div><div class='add'>+	skb_copy_to_linear_data(skb, rsp, sizeof(struct rss_header));</div><div class='add'>+</div><div class='add'>+	ret = chtls_handlers[opcode](cdev, skb);</div><div class='add'>+	if (ret &amp; CPL_RET_BUF_DONE)</div><div class='add'>+		kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_uld_rx_handler(void *handle, const __be64 *rsp,</div><div class='add'>+				const struct pkt_gl *gl)</div><div class='add'>+{</div><div class='add'>+	struct chtls_dev *cdev = handle;</div><div class='add'>+	unsigned int opcode;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	opcode = *(u8 *)rsp;</div><div class='add'>+</div><div class='add'>+	if (unlikely(opcode == CPL_RX_PKT)) {</div><div class='add'>+		if (chtls_recv_packet(cdev, gl, rsp) &lt; 0)</div><div class='add'>+			goto nomem;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!gl)</div><div class='add'>+		return chtls_recv_rsp(cdev, rsp);</div><div class='add'>+</div><div class='add'>+#define RX_PULL_LEN 128</div><div class='add'>+	skb = cxgb4_pktgl_to_skb(gl, RX_PULL_LEN, RX_PULL_LEN);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		goto nomem;</div><div class='add'>+	chtls_recv(cdev, &amp;skb, rsp);</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nomem:</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_chtls_getsockopt(struct sock *sk, char __user *optval,</div><div class='add'>+			       int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct tls_crypto_info crypto_info = { 0 };</div><div class='add'>+</div><div class='add'>+	crypto_info.version = TLS_1_2_VERSION;</div><div class='add'>+	if (copy_to_user(optval, &amp;crypto_info, sizeof(struct tls_crypto_info)))</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_getsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+			    char __user *optval, int __user *optlen)</div><div class='add'>+{</div><div class='add'>+	struct tls_context *ctx = tls_get_ctx(sk);</div><div class='add'>+</div><div class='add'>+	if (level != SOL_TLS)</div><div class='add'>+		return ctx-&gt;sk_proto-&gt;getsockopt(sk, level,</div><div class='add'>+						 optname, optval, optlen);</div><div class='add'>+</div><div class='add'>+	return do_chtls_getsockopt(sk, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int do_chtls_setsockopt(struct sock *sk, int optname,</div><div class='add'>+			       sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tls_crypto_info *crypto_info, tmp_crypto_info;</div><div class='add'>+	struct chtls_sock *csk;</div><div class='add'>+	int keylen;</div><div class='add'>+	int cipher_type;</div><div class='add'>+	int rc = 0;</div><div class='add'>+</div><div class='add'>+	csk = rcu_dereference_sk_user_data(sk);</div><div class='add'>+</div><div class='add'>+	if (sockptr_is_null(optval) || optlen &lt; sizeof(*crypto_info)) {</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rc = copy_from_sockptr(&amp;tmp_crypto_info, optval, sizeof(*crypto_info));</div><div class='add'>+	if (rc) {</div><div class='add'>+		rc = -EFAULT;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* check version */</div><div class='add'>+	if (tmp_crypto_info.version != TLS_1_2_VERSION) {</div><div class='add'>+		rc = -ENOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	crypto_info = (struct tls_crypto_info *)&amp;csk-&gt;tlshws.crypto_info;</div><div class='add'>+</div><div class='add'>+	/* GCM mode of AES supports 128 and 256 bit encryption, so</div><div class='add'>+	 * copy keys from user based on GCM cipher type.</div><div class='add'>+	 */</div><div class='add'>+	switch (tmp_crypto_info.cipher_type) {</div><div class='add'>+	case TLS_CIPHER_AES_GCM_128: {</div><div class='add'>+		/* Obtain version and type from previous copy */</div><div class='add'>+		crypto_info[0] = tmp_crypto_info;</div><div class='add'>+		/* Now copy the following data */</div><div class='add'>+		rc = copy_from_sockptr_offset((char *)crypto_info +</div><div class='add'>+				sizeof(*crypto_info),</div><div class='add'>+				optval, sizeof(*crypto_info),</div><div class='add'>+				sizeof(struct tls12_crypto_info_aes_gcm_128)</div><div class='add'>+				- sizeof(*crypto_info));</div><div class='add'>+</div><div class='add'>+		if (rc) {</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		keylen = TLS_CIPHER_AES_GCM_128_KEY_SIZE;</div><div class='add'>+		cipher_type = TLS_CIPHER_AES_GCM_128;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case TLS_CIPHER_AES_GCM_256: {</div><div class='add'>+		crypto_info[0] = tmp_crypto_info;</div><div class='add'>+		rc = copy_from_sockptr_offset((char *)crypto_info +</div><div class='add'>+				sizeof(*crypto_info),</div><div class='add'>+				optval, sizeof(*crypto_info),</div><div class='add'>+				sizeof(struct tls12_crypto_info_aes_gcm_256)</div><div class='add'>+				- sizeof(*crypto_info));</div><div class='add'>+</div><div class='add'>+		if (rc) {</div><div class='add'>+			rc = -EFAULT;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		keylen = TLS_CIPHER_AES_GCM_256_KEY_SIZE;</div><div class='add'>+		cipher_type = TLS_CIPHER_AES_GCM_256;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		rc = -EINVAL;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	rc = chtls_setkey(csk, keylen, optname, cipher_type);</div><div class='add'>+out:</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int chtls_setsockopt(struct sock *sk, int level, int optname,</div><div class='add'>+			    sockptr_t optval, unsigned int optlen)</div><div class='add'>+{</div><div class='add'>+	struct tls_context *ctx = tls_get_ctx(sk);</div><div class='add'>+</div><div class='add'>+	if (level != SOL_TLS)</div><div class='add'>+		return ctx-&gt;sk_proto-&gt;setsockopt(sk, level,</div><div class='add'>+						 optname, optval, optlen);</div><div class='add'>+</div><div class='add'>+	return do_chtls_setsockopt(sk, optname, optval, optlen);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct cxgb4_uld_info chtls_uld_info = {</div><div class='add'>+	.name = DRV_NAME,</div><div class='add'>+	.nrxq = MAX_ULD_QSETS,</div><div class='add'>+	.ntxq = MAX_ULD_QSETS,</div><div class='add'>+	.rxq_size = 1024,</div><div class='add'>+	.add = chtls_uld_add,</div><div class='add'>+	.state_change = chtls_uld_state_change,</div><div class='add'>+	.rx_handler = chtls_uld_rx_handler,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+void chtls_install_cpl_ops(struct sock *sk)</div><div class='add'>+{</div><div class='add'>+	if (sk-&gt;sk_family == AF_INET)</div><div class='add'>+		sk-&gt;sk_prot = &amp;chtls_cpl_prot;</div><div class='add'>+	else</div><div class='add'>+		sk-&gt;sk_prot = &amp;chtls_cpl_protv6;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __init chtls_init_ulp_ops(void)</div><div class='add'>+{</div><div class='add'>+	chtls_cpl_prot			= tcp_prot;</div><div class='add'>+	chtls_init_rsk_ops(&amp;chtls_cpl_prot, &amp;chtls_rsk_ops,</div><div class='add'>+			   &amp;tcp_prot, PF_INET);</div><div class='add'>+	chtls_cpl_prot.close		= chtls_close;</div><div class='add'>+	chtls_cpl_prot.disconnect	= chtls_disconnect;</div><div class='add'>+	chtls_cpl_prot.destroy		= chtls_destroy_sock;</div><div class='add'>+	chtls_cpl_prot.shutdown		= chtls_shutdown;</div><div class='add'>+	chtls_cpl_prot.sendmsg		= chtls_sendmsg;</div><div class='add'>+	chtls_cpl_prot.splice_eof	= chtls_splice_eof;</div><div class='add'>+	chtls_cpl_prot.recvmsg		= chtls_recvmsg;</div><div class='add'>+	chtls_cpl_prot.setsockopt	= chtls_setsockopt;</div><div class='add'>+	chtls_cpl_prot.getsockopt	= chtls_getsockopt;</div><div class='add'>+#if IS_ENABLED(CONFIG_IPV6)</div><div class='add'>+	chtls_cpl_protv6		= chtls_cpl_prot;</div><div class='add'>+	chtls_init_rsk_ops(&amp;chtls_cpl_protv6, &amp;chtls_rsk_opsv6,</div><div class='add'>+			   &amp;tcpv6_prot, PF_INET6);</div><div class='add'>+#endif</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init chtls_register(void)</div><div class='add'>+{</div><div class='add'>+	chtls_init_ulp_ops();</div><div class='add'>+	register_listen_notifier(&amp;listen_notifier);</div><div class='add'>+	cxgb4_register_uld(CXGB4_ULD_TLS, &amp;chtls_uld_info);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit chtls_unregister(void)</div><div class='add'>+{</div><div class='add'>+	unregister_listen_notifier(&amp;listen_notifier);</div><div class='add'>+	chtls_free_all_uld();</div><div class='add'>+	cxgb4_unregister_uld(CXGB4_ULD_TLS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(chtls_register);</div><div class='add'>+module_exit(chtls_unregister);</div><div class='add'>+</div><div class='add'>+MODULE_DESCRIPTION("Chelsio TLS Inline driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='add'>+MODULE_AUTHOR("Chelsio Communications");</div><div class='add'>+MODULE_VERSION(CHTLS_DRV_VERSION);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/libcxgb/Makefile b/drivers/net/ethernet/chelsio/libcxgb/Makefile<br/>index aa79264e72ba..fbedc31674b3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/libcxgb/Makefile</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # SPDX-License-Identifier: GPL-2.0-only</div><div class='del'>-ccflags-y := -I $(srctree)/$(src)/../cxgb4</div><div class='add'>+ccflags-y := -I $(src)/../cxgb4</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_CHELSIO_LIB) += libcxgb.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c b/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c<br/>index d04a6c163445..da8d10475a08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.c</a></div><div class='hunk'>@@ -32,6 +32,7 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;net/inet_ecn.h&gt;</div><div class='ctx'> #include &lt;net/route.h&gt;</div><div class='ctx'> #include &lt;net/ip6_route.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -99,7 +100,7 @@ cxgb_find_route(struct cxgb4_lld_info *lldi,</div><div class='ctx'> </div><div class='ctx'> 	rt = ip_route_output_ports(&amp;init_net, &amp;fl4, NULL, peer_ip, local_ip,</div><div class='ctx'> 				   peer_port, local_port, IPPROTO_TCP,</div><div class='del'>-				   tos, 0);</div><div class='add'>+				   tos &amp; ~INET_ECN_MASK, 0);</div><div class='ctx'> 	if (IS_ERR(rt))</div><div class='ctx'> 		return NULL;</div><div class='ctx'> 	n = dst_neigh_lookup(&amp;rt-&gt;dst, &amp;peer_ip);</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c b/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c<br/>index e2919005ead3..2e3973a32d9d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.c</a></div><div class='hunk'>@@ -35,7 +35,6 @@</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME "libcxgb"</div><div class='del'>-#define DRV_VERSION "1.0.0-ko"</div><div class='ctx'> #define pr_fmt(fmt) DRV_NAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -123,6 +122,9 @@ static int ppm_get_cpu_entries(struct cxgbi_ppm *ppm, unsigned int count,</div><div class='ctx'> 	unsigned int cpu;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	if (!ppm-&gt;pool)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='ctx'> 	cpu = get_cpu();</div><div class='ctx'> 	pool = per_cpu_ptr(ppm-&gt;pool, cpu);</div><div class='ctx'> 	spin_lock_bh(&amp;pool-&gt;lock);</div><div class='hunk'>@@ -169,7 +171,9 @@ static int ppm_get_entries(struct cxgbi_ppm *ppm, unsigned int count,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ppm-&gt;next = i + count;</div><div class='del'>-	if (ppm-&gt;next &gt;= ppm-&gt;bmap_index_max)</div><div class='add'>+	if (ppm-&gt;max_index_in_edram &amp;&amp; (ppm-&gt;next &gt;= ppm-&gt;max_index_in_edram))</div><div class='add'>+		ppm-&gt;next = 0;</div><div class='add'>+	else if (ppm-&gt;next &gt;= ppm-&gt;bmap_index_max)</div><div class='ctx'> 		ppm-&gt;next = 0;</div><div class='ctx'> </div><div class='ctx'> 	spin_unlock_bh(&amp;ppm-&gt;map_lock);</div><div class='hunk'>@@ -338,10 +342,10 @@ int cxgbi_ppm_release(struct cxgbi_ppm *ppm)</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(cxgbi_ppm_release);</div><div class='ctx'> </div><div class='del'>-static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total,</div><div class='del'>-						 unsigned int *pcpu_ppmax)</div><div class='add'>+static struct cxgbi_ppm_pool __percpu *</div><div class='add'>+ppm_alloc_cpu_pool(unsigned int *total, unsigned int *pcpu_ppmax)</div><div class='ctx'> {</div><div class='del'>-	struct cxgbi_ppm_pool *pools;</div><div class='add'>+	struct cxgbi_ppm_pool __percpu *pools;</div><div class='ctx'> 	unsigned int ppmax = (*total) / num_possible_cpus();</div><div class='ctx'> 	unsigned int max = (PCPU_MIN_UNIT_SIZE - sizeof(*pools)) &lt;&lt; 3;</div><div class='ctx'> 	unsigned int bmap;</div><div class='hunk'>@@ -382,18 +386,36 @@ static struct cxgbi_ppm_pool *ppm_alloc_cpu_pool(unsigned int *total,</div><div class='ctx'> </div><div class='ctx'> int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev,</div><div class='ctx'> 		   struct pci_dev *pdev, void *lldev,</div><div class='del'>-		   struct cxgbi_tag_format *tformat,</div><div class='del'>-		   unsigned int ppmax,</div><div class='del'>-		   unsigned int llimit,</div><div class='del'>-		   unsigned int start,</div><div class='del'>-		   unsigned int reserve_factor)</div><div class='add'>+		   struct cxgbi_tag_format *tformat, unsigned int iscsi_size,</div><div class='add'>+		   unsigned int llimit, unsigned int start,</div><div class='add'>+		   unsigned int reserve_factor, unsigned int iscsi_edram_start,</div><div class='add'>+		   unsigned int iscsi_edram_size)</div><div class='ctx'> {</div><div class='ctx'> 	struct cxgbi_ppm *ppm = (struct cxgbi_ppm *)(*ppm_pp);</div><div class='del'>-	struct cxgbi_ppm_pool *pool = NULL;</div><div class='del'>-	unsigned int ppmax_pool = 0;</div><div class='add'>+	struct cxgbi_ppm_pool __percpu *pool = NULL;</div><div class='ctx'> 	unsigned int pool_index_max = 0;</div><div class='del'>-	unsigned int alloc_sz;</div><div class='add'>+	unsigned int ppmax_pool = 0;</div><div class='ctx'> 	unsigned int ppod_bmap_size;</div><div class='add'>+	unsigned int alloc_sz;</div><div class='add'>+	unsigned int ppmax;</div><div class='add'>+</div><div class='add'>+	if (!iscsi_edram_start)</div><div class='add'>+		iscsi_edram_size = 0;</div><div class='add'>+</div><div class='add'>+	if (iscsi_edram_size &amp;&amp;</div><div class='add'>+	    ((iscsi_edram_start + iscsi_edram_size) != start)) {</div><div class='add'>+		pr_err("iscsi ppod region not contiguous: EDRAM start 0x%x "</div><div class='add'>+			"size 0x%x DDR start 0x%x\n",</div><div class='add'>+			iscsi_edram_start, iscsi_edram_size, start);</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (iscsi_edram_size) {</div><div class='add'>+		reserve_factor = 0;</div><div class='add'>+		start = iscsi_edram_start;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ppmax = (iscsi_edram_size + iscsi_size) &gt;&gt; PPOD_SIZE_SHIFT;</div><div class='ctx'> </div><div class='ctx'> 	if (ppm) {</div><div class='ctx'> 		pr_info("ippm: %s, ppm 0x%p,0x%p already initialized, %u/%u.\n",</div><div class='hunk'>@@ -434,6 +456,14 @@ int cxgbi_ppm_init(void **ppm_pp, struct net_device *ndev,</div><div class='ctx'> 			__func__, ppmax, ppmax_pool, ppod_bmap_size, start,</div><div class='ctx'> 			end);</div><div class='ctx'> 	}</div><div class='add'>+	if (iscsi_edram_size) {</div><div class='add'>+		unsigned int first_ddr_idx =</div><div class='add'>+				iscsi_edram_size &gt;&gt; PPOD_SIZE_SHIFT;</div><div class='add'>+</div><div class='add'>+		ppm-&gt;max_index_in_edram = first_ddr_idx - 1;</div><div class='add'>+		bitmap_set(ppm-&gt;ppod_bmap, first_ddr_idx, 1);</div><div class='add'>+		pr_debug("reserved %u ppod in bitmap\n", first_ddr_idx);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;ppm-&gt;map_lock);</div><div class='ctx'> 	kref_init(&amp;ppm-&gt;refcnt);</div><div class='hunk'>@@ -499,5 +529,4 @@ EXPORT_SYMBOL(cxgbi_tagmask_set);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Chelsio Communications");</div><div class='ctx'> MODULE_DESCRIPTION("Chelsio common library");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_LICENSE("Dual BSD/GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h b/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h<br/>index a91ad766cef0..1b4156461ba1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/chelsio/libcxgb/libcxgb_ppm.h</a></div><div class='hunk'>@@ -122,7 +122,7 @@ struct cxgbi_ppm_pool {</div><div class='ctx'> 	unsigned int base;		/* base index */</div><div class='ctx'> 	unsigned int next;		/* next possible free index */</div><div class='ctx'> 	spinlock_t lock;		/* ppm pool lock */</div><div class='del'>-	unsigned long bmap[0];</div><div class='add'>+	unsigned long bmap[];</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> struct cxgbi_ppm {</div><div class='hunk'>@@ -143,8 +143,9 @@ struct cxgbi_ppm {</div><div class='ctx'> 	spinlock_t map_lock;		/* ppm map lock */</div><div class='ctx'> 	unsigned int bmap_index_max;</div><div class='ctx'> 	unsigned int next;</div><div class='add'>+	unsigned int max_index_in_edram;</div><div class='ctx'> 	unsigned long *ppod_bmap;</div><div class='del'>-	struct cxgbi_ppod_data ppod_data[0];</div><div class='add'>+	struct cxgbi_ppod_data ppod_data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DDP_THRESHOLD		512</div><div class='hunk'>@@ -324,9 +325,9 @@ int cxgbi_ppm_ppods_reserve(struct cxgbi_ppm *, unsigned short nr_pages,</div><div class='ctx'> 			    unsigned long caller_data);</div><div class='ctx'> int cxgbi_ppm_init(void **ppm_pp, struct net_device *, struct pci_dev *,</div><div class='ctx'> 		   void *lldev, struct cxgbi_tag_format *,</div><div class='del'>-		   unsigned int ppmax, unsigned int llimit,</div><div class='del'>-		   unsigned int start,</div><div class='del'>-		   unsigned int reserve_factor);</div><div class='add'>+		   unsigned int iscsi_size, unsigned int llimit,</div><div class='add'>+		   unsigned int start, unsigned int reserve_factor,</div><div class='add'>+		   unsigned int edram_start, unsigned int edram_size);</div><div class='ctx'> int cxgbi_ppm_release(struct cxgbi_ppm *ppm);</div><div class='ctx'> void cxgbi_tagmask_check(unsigned int tagmask, struct cxgbi_tag_format *);</div><div class='ctx'> unsigned int cxgbi_tagmask_set(unsigned int ppmax);</div><div class='head'>diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig<br/>index 48f3198381bc..5bdf731d9503 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cirrus/Kconfig</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'> config NET_VENDOR_CIRRUS</div><div class='ctx'> 	bool "Cirrus devices"</div><div class='ctx'> 	default y</div><div class='del'>-	depends on ISA || EISA || ARM || MAC</div><div class='del'>-	---help---</div><div class='add'>+	depends on ISA || EISA || ARM || MAC || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -18,27 +18,34 @@ config NET_VENDOR_CIRRUS</div><div class='ctx'> if NET_VENDOR_CIRRUS</div><div class='ctx'> </div><div class='ctx'> config CS89x0</div><div class='del'>-	tristate "CS89x0 support"</div><div class='del'>-	depends on ISA || EISA || ARM</div><div class='add'>+	tristate</div><div class='add'>+</div><div class='add'>+config CS89x0_ISA</div><div class='add'>+	tristate "CS89x0 ISA driver support"</div><div class='add'>+	depends on HAS_IOPORT_MAP</div><div class='add'>+	depends on ISA</div><div class='ctx'> 	depends on !PPC32</div><div class='del'>-	---help---</div><div class='add'>+	depends on CS89x0_PLATFORM=n</div><div class='add'>+	select NETDEV_LEGACY_INIT</div><div class='add'>+	select CS89x0</div><div class='add'>+	help</div><div class='ctx'> 	  Support for CS89x0 chipset based Ethernet cards. If you have a</div><div class='ctx'> 	  network (Ethernet) card of this type, say Y and read the file</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/cirrus/cs89x0.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/networking/device_drivers/ethernet/cirrus/cs89x0.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module</div><div class='ctx'> 	  will be called cs89x0.</div><div class='ctx'> </div><div class='ctx'> config CS89x0_PLATFORM</div><div class='del'>-	bool "CS89x0 platform driver support" if HAS_IOPORT_MAP</div><div class='del'>-	default !HAS_IOPORT_MAP</div><div class='del'>-	depends on CS89x0</div><div class='add'>+	tristate "CS89x0 platform driver support"</div><div class='add'>+	depends on ARM || (COMPILE_TEST &amp;&amp; !PPC)</div><div class='add'>+	select CS89x0</div><div class='ctx'> 	help</div><div class='del'>-	  Say Y to compile the cs89x0 driver as a platform driver. This</div><div class='del'>-	  makes this driver suitable for use on certain evaluation boards</div><div class='del'>-	  such as the iMX21ADS.</div><div class='add'>+	  Say Y to compile the cs89x0 platform driver. This makes this driver</div><div class='add'>+	  suitable for use on certain evaluation boards such as the iMX21ADS.</div><div class='ctx'> </div><div class='del'>-	  If you are unsure, say N.</div><div class='add'>+	  To compile this driver as a module, choose M here. The module</div><div class='add'>+	  will be called cs89x0.</div><div class='ctx'> </div><div class='ctx'> config EP93XX_ETH</div><div class='ctx'> 	tristate "EP93xx Ethernet support"</div><div class='hunk'>@@ -51,7 +58,7 @@ config EP93XX_ETH</div><div class='ctx'> config MAC89x0</div><div class='ctx'> 	tristate "Macintosh CS89x0 based ethernet cards"</div><div class='ctx'> 	depends on MAC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for CS89x0 chipset based Ethernet cards.  If you have a</div><div class='ctx'> 	  Nubus or LC-PDS network (Ethernet) card of this type, say Y here.</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cirrus/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c<br/>index b3e7fafee3df..fa5857923db4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/cs89x0.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/cs89x0.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/cs89x0.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cirrus/cs89x0.c</a></div><div class='hunk'>@@ -54,7 +54,6 @@</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='del'>-#include &lt;linux/of_device.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/types.h&gt;</div><div class='hunk'>@@ -72,6 +71,8 @@</div><div class='ctx'> #include &lt;linux/gfp.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> </div><div class='add'>+#include &lt;net/Space.h&gt;</div><div class='add'>+</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/atomic.h&gt;</div><div class='ctx'> #if ALLOW_DMA</div><div class='hunk'>@@ -104,7 +105,7 @@ static char version[] __initdata =</div><div class='ctx'>  * them to system IRQ numbers. This mapping is card specific and is set to</div><div class='ctx'>  * the configuration of the Cirrus Eval board for this chip.</div><div class='ctx'>  */</div><div class='del'>-#ifndef CONFIG_CS89x0_PLATFORM</div><div class='add'>+#if IS_ENABLED(CONFIG_CS89x0_ISA)</div><div class='ctx'> static unsigned int netcard_portlist[] __used __initdata = {</div><div class='ctx'> 	0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240,</div><div class='ctx'> 	0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0</div><div class='hunk'>@@ -292,7 +293,7 @@ write_irq(struct net_device *dev, int chip_type, int irq)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (chip_type == CS8900) {</div><div class='del'>-#ifndef CONFIG_CS89x0_PLATFORM</div><div class='add'>+#if IS_ENABLED(CONFIG_CS89x0_ISA)</div><div class='ctx'> 		/* Search the mapping table for the corresponding IRQ pin. */</div><div class='ctx'> 		for (i = 0; i != ARRAY_SIZE(cs8900_irq_map); i++)</div><div class='ctx'> 			if (cs8900_irq_map[i] == irq)</div><div class='hunk'>@@ -859,7 +860,7 @@ net_open(struct net_device *dev)</div><div class='ctx'> 			goto bad_out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='del'>-#if !defined(CONFIG_CS89x0_PLATFORM)</div><div class='add'>+#if IS_ENABLED(CONFIG_CS89x0_ISA)</div><div class='ctx'> 		if (((1 &lt;&lt; dev-&gt;irq) &amp; lp-&gt;irq_map) == 0) {</div><div class='ctx'> 			pr_err("%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",</div><div class='ctx'> 			       dev-&gt;name, dev-&gt;irq, lp-&gt;irq_map);</div><div class='hunk'>@@ -985,7 +986,7 @@ release_irq:</div><div class='ctx'> 		if (result == DETECTED_NONE) {</div><div class='ctx'> 			pr_warn("%s: 10Base-5 (AUI) has no cable\n", dev-&gt;name);</div><div class='ctx'> 			if (lp-&gt;auto_neg_cnf &amp; IMM_BIT) /* check "ignore missing media" bit */</div><div class='del'>-				result = DETECTED_AUI; /* Yes! I don't care if I see a carrrier */</div><div class='add'>+				result = DETECTED_AUI; /* Yes! I don't care if I see a carrier */</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	case A_CNF_MEDIA_10B_2:</div><div class='hunk'>@@ -1128,7 +1129,7 @@ net_get_stats(struct net_device *dev)</div><div class='ctx'> 	return &amp;dev-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void net_timeout(struct net_device *dev)</div><div class='add'>+static void net_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	/* If we get here, some higher level has decided we are broken.</div><div class='ctx'> 	   There should really be a "kick me" function call instead. */</div><div class='hunk'>@@ -1227,7 +1228,7 @@ static int set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, dev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> </div><div class='ctx'> 	cs89_dbg(0, debug, "%s: Setting MAC address to %pM\n",</div><div class='ctx'> 		 dev-&gt;name, dev-&gt;dev_addr);</div><div class='hunk'>@@ -1314,6 +1315,7 @@ cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)</div><div class='ctx'> 	int tmp;</div><div class='ctx'> 	unsigned rev_type = 0;</div><div class='ctx'> 	int eeprom_buff[CHKSUM_LEN];</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	int retval;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize the device structure. */</div><div class='hunk'>@@ -1387,9 +1389,10 @@ cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)</div><div class='ctx'> 		for (i = 0; i &lt; ETH_ALEN / 2; i++) {</div><div class='ctx'> 			unsigned int Addr;</div><div class='ctx'> 			Addr = readreg(dev, PP_IA + i * 2);</div><div class='del'>-			dev-&gt;dev_addr[i * 2] = Addr &amp; 0xFF;</div><div class='del'>-			dev-&gt;dev_addr[i * 2 + 1] = Addr &gt;&gt; 8;</div><div class='add'>+			addr[i * 2] = Addr &amp; 0xFF;</div><div class='add'>+			addr[i * 2 + 1] = Addr &gt;&gt; 8;</div><div class='ctx'> 		}</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 		/* Load the Adapter Configuration.</div><div class='ctx'> 		 * Note:  Barring any more specific information from some</div><div class='hunk'>@@ -1464,9 +1467,10 @@ cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)</div><div class='ctx'> 		/* eeprom_buff has 32-bit ints, so we can't just memcpy it */</div><div class='ctx'> 		/* store the initial memory base address */</div><div class='ctx'> 		for (i = 0; i &lt; ETH_ALEN / 2; i++) {</div><div class='del'>-			dev-&gt;dev_addr[i * 2] = eeprom_buff[i];</div><div class='del'>-			dev-&gt;dev_addr[i * 2 + 1] = eeprom_buff[i] &gt;&gt; 8;</div><div class='add'>+			addr[i * 2] = eeprom_buff[i];</div><div class='add'>+			addr[i * 2 + 1] = eeprom_buff[i] &gt;&gt; 8;</div><div class='ctx'> 		}</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 		cs89_dbg(1, debug, "%s: new adapter_cnf: 0x%x\n",</div><div class='ctx'> 			 dev-&gt;name, lp-&gt;adapter_cnf);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1523,7 +1527,7 @@ cs89x0_probe1(struct net_device *dev, void __iomem *ioaddr, int modular)</div><div class='ctx'> 			dev-&gt;irq = i;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		i = lp-&gt;isa_config &amp; INT_NO_MASK;</div><div class='del'>-#ifndef CONFIG_CS89x0_PLATFORM</div><div class='add'>+#if IS_ENABLED(CONFIG_CS89x0_ISA)</div><div class='ctx'> 		if (lp-&gt;chip_type == CS8900) {</div><div class='ctx'> 			/* Translate the IRQ using the IRQ mapping table. */</div><div class='ctx'> 			if (i &gt;= ARRAY_SIZE(cs8900_irq_map))</div><div class='hunk'>@@ -1576,7 +1580,7 @@ out1:</div><div class='ctx'> 	return retval;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifndef CONFIG_CS89x0_PLATFORM</div><div class='add'>+#if IS_ENABLED(CONFIG_CS89x0_ISA)</div><div class='ctx'> /*</div><div class='ctx'>  * This function converts the I/O port address used by the cs89x0_probe() and</div><div class='ctx'>  * init_module() functions to the I/O memory address used by the</div><div class='hunk'>@@ -1682,11 +1686,7 @@ out:</div><div class='ctx'> 	pr_warn("no cs8900 or cs8920 detected.  Be sure to disable PnP with SETUP\n");</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if defined(MODULE) &amp;&amp; !defined(CONFIG_CS89x0_PLATFORM)</div><div class='del'>-</div><div class='add'>+#else</div><div class='ctx'> static struct net_device *dev_cs89x0;</div><div class='ctx'> </div><div class='ctx'> /* Support the 'debug' module parm even if we're compiled for non-debug to</div><div class='hunk'>@@ -1757,9 +1757,9 @@ MODULE_LICENSE("GPL");</div><div class='ctx'>  * (hw or software util)</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-int __init init_module(void)</div><div class='add'>+static int __init cs89x0_isa_init_module(void)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));</div><div class='add'>+	struct net_device *dev;</div><div class='ctx'> 	struct net_local *lp;</div><div class='ctx'> 	int ret = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -1768,6 +1768,7 @@ int __init init_module(void)</div><div class='ctx'> #else</div><div class='ctx'> 	debug = 0;</div><div class='ctx'> #endif</div><div class='add'>+	dev = alloc_etherdev(sizeof(struct net_local));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1826,9 +1827,9 @@ out:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='add'>+module_init(cs89x0_isa_init_module);</div><div class='ctx'> </div><div class='del'>-void __exit</div><div class='del'>-cleanup_module(void)</div><div class='add'>+static void __exit cs89x0_isa_cleanup_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_local *lp = netdev_priv(dev_cs89x0);</div><div class='ctx'> </div><div class='hunk'>@@ -1838,31 +1839,27 @@ cleanup_module(void)</div><div class='ctx'> 	release_region(dev_cs89x0-&gt;base_addr, NETCARD_IO_EXTENT);</div><div class='ctx'> 	free_netdev(dev_cs89x0);</div><div class='ctx'> }</div><div class='del'>-#endif /* MODULE &amp;&amp; !CONFIG_CS89x0_PLATFORM */</div><div class='add'>+module_exit(cs89x0_isa_cleanup_module);</div><div class='add'>+#endif /* MODULE */</div><div class='add'>+#endif /* CONFIG_CS89x0_ISA */</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_CS89x0_PLATFORM</div><div class='add'>+#if IS_ENABLED(CONFIG_CS89x0_PLATFORM)</div><div class='ctx'> static int __init cs89x0_platform_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));</div><div class='del'>-	struct net_local *lp;</div><div class='del'>-	struct resource *mem_res;</div><div class='ctx'> 	void __iomem *virt_addr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	lp = netdev_priv(dev);</div><div class='del'>-</div><div class='ctx'> 	dev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (dev-&gt;irq &lt;= 0) {</div><div class='del'>-		dev_warn(&amp;dev-&gt;dev, "interrupt resource missing\n");</div><div class='del'>-		err = -ENXIO;</div><div class='add'>+	if (dev-&gt;irq &lt; 0) {</div><div class='add'>+		err = dev-&gt;irq;</div><div class='ctx'> 		goto free;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	virt_addr = devm_ioremap_resource(&amp;pdev-&gt;dev, mem_res);</div><div class='add'>+	virt_addr = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(virt_addr)) {</div><div class='ctx'> 		err = PTR_ERR(virt_addr);</div><div class='ctx'> 		goto free;</div><div class='hunk'>@@ -1882,7 +1879,7 @@ free:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int cs89x0_platform_remove(struct platform_device *pdev)</div><div class='add'>+static void cs89x0_platform_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1892,7 +1889,6 @@ static int cs89x0_platform_remove(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id __maybe_unused cs89x0_match[] = {</div><div class='hunk'>@@ -1907,7 +1903,7 @@ static struct platform_driver cs89x0_driver = {</div><div class='ctx'> 		.name		= DRV_NAME,</div><div class='ctx'> 		.of_match_table	= of_match_ptr(cs89x0_match),</div><div class='ctx'> 	},</div><div class='del'>-	.remove	= cs89x0_platform_remove,</div><div class='add'>+	.remove = cs89x0_platform_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver_probe(cs89x0_driver, cs89x0_platform_probe);</div><div class='head'>diff --git a/drivers/net/ethernet/cirrus/cs89x0.h b/drivers/net/ethernet/cirrus/cs89x0.h<br/>index 91423b70bb45..210f9ec9af4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/cs89x0.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/cs89x0.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/cs89x0.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cirrus/cs89x0.h</a></div><div class='hunk'>@@ -459,7 +459,3 @@</div><div class='ctx'> #define PNP_CNF_INT 0x70</div><div class='ctx'> #define PNP_CNF_DMA 0x74</div><div class='ctx'> #define PNP_CNF_MEM 0x48</div><div class='del'>-</div><div class='del'>-#define BIT0 1</div><div class='del'>-#define BIT15 0x8000</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c<br/>index f1a0c4dceda0..a4972457edd9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/ep93xx_eth.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/ep93xx_eth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/ep93xx_eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cirrus/ep93xx_eth.c</a></div><div class='hunk'>@@ -16,15 +16,13 @@</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/moduleparam.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> </div><div class='del'>-#include &lt;linux/platform_data/eth-ep93xx.h&gt;</div><div class='del'>-</div><div class='ctx'> #define DRV_MODULE_NAME		"ep93xx-eth"</div><div class='del'>-#define DRV_MODULE_VERSION	"0.1"</div><div class='ctx'> </div><div class='ctx'> #define RX_QUEUE_ENTRIES	64</div><div class='ctx'> #define TX_QUEUE_ENTRIES	8</div><div class='hunk'>@@ -690,8 +688,7 @@ static int ep93xx_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> </div><div class='ctx'> static void ep93xx_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_MODULE_VERSION, sizeof(info-&gt;version));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_MODULE_NAME, sizeof(info-&gt;driver));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ep93xx_get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -735,38 +732,20 @@ static const struct net_device_ops ep93xx_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ep93xx_open,</div><div class='ctx'> 	.ndo_stop		= ep93xx_close,</div><div class='ctx'> 	.ndo_start_xmit		= ep93xx_xmit,</div><div class='del'>-	.ndo_do_ioctl		= ep93xx_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= ep93xx_ioctl,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-</div><div class='del'>-	dev = alloc_etherdev(sizeof(struct ep93xx_priv));</div><div class='del'>-	if (dev == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	memcpy(dev-&gt;dev_addr, data-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-</div><div class='del'>-	dev-&gt;ethtool_ops = &amp;ep93xx_ethtool_ops;</div><div class='del'>-	dev-&gt;netdev_ops = &amp;ep93xx_netdev_ops;</div><div class='del'>-</div><div class='del'>-	dev-&gt;features |= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='del'>-</div><div class='del'>-	return dev;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int ep93xx_eth_remove(struct platform_device *pdev)</div><div class='add'>+static void ep93xx_eth_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct ep93xx_priv *ep;</div><div class='add'>+	struct resource *mem;</div><div class='ctx'> </div><div class='ctx'> 	dev = platform_get_drvdata(pdev);</div><div class='ctx'> 	if (dev == NULL)</div><div class='del'>-		return 0;</div><div class='add'>+		return;</div><div class='ctx'> </div><div class='ctx'> 	ep = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -778,42 +757,62 @@ static int ep93xx_eth_remove(struct platform_device *pdev)</div><div class='ctx'> 		iounmap(ep-&gt;base_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (ep-&gt;res != NULL) {</div><div class='del'>-		release_resource(ep-&gt;res);</div><div class='del'>-		kfree(ep-&gt;res);</div><div class='add'>+		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='add'>+		release_mem_region(mem-&gt;start, resource_size(mem));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ep93xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct ep93xx_eth_data *data;</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	struct ep93xx_priv *ep;</div><div class='ctx'> 	struct resource *mem;</div><div class='add'>+	void __iomem *base_addr;</div><div class='add'>+	struct device_node *np;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	u32 phy_id;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	if (pdev == NULL)</div><div class='ctx'> 		return -ENODEV;</div><div class='del'>-	data = dev_get_platdata(&amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (!mem || irq &lt; 0)</div><div class='ctx'> 		return -ENXIO;</div><div class='ctx'> </div><div class='del'>-	dev = ep93xx_dev_alloc(data);</div><div class='add'>+	base_addr = ioremap(mem-&gt;start, resource_size(mem));</div><div class='add'>+	if (!base_addr)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, -EIO, "Failed to ioremap ethernet registers\n");</div><div class='add'>+</div><div class='add'>+	np = of_parse_phandle(pdev-&gt;dev.of_node, "phy-handle", 0);</div><div class='add'>+	if (!np)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, -ENODEV, "Please provide \"phy-handle\"\n");</div><div class='add'>+</div><div class='add'>+	err = of_property_read_u32(np, "reg", &amp;phy_id);</div><div class='add'>+	of_node_put(np);</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;pdev-&gt;dev, -ENOENT, "Failed to locate \"phy_id\"\n");</div><div class='add'>+</div><div class='add'>+	dev = alloc_etherdev(sizeof(struct ep93xx_priv));</div><div class='ctx'> 	if (dev == NULL) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	memcpy_fromio(addr, base_addr + 0x50, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='add'>+	dev-&gt;ethtool_ops = &amp;ep93xx_ethtool_ops;</div><div class='add'>+	dev-&gt;netdev_ops = &amp;ep93xx_netdev_ops;</div><div class='add'>+	dev-&gt;features |= NETIF_F_SG | NETIF_F_HW_CSUM;</div><div class='add'>+</div><div class='ctx'> 	ep = netdev_priv(dev);</div><div class='ctx'> 	ep-&gt;dev = dev;</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='del'>-	netif_napi_add(dev, &amp;ep-&gt;napi, ep93xx_poll, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;ep-&gt;napi, ep93xx_poll);</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -825,15 +824,10 @@ static int ep93xx_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 		goto err_out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ep-&gt;base_addr = ioremap(mem-&gt;start, resource_size(mem));</div><div class='del'>-	if (ep-&gt;base_addr == NULL) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "Failed to ioremap ethernet registers\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto err_out;</div><div class='del'>-	}</div><div class='add'>+	ep-&gt;base_addr = base_addr;</div><div class='ctx'> 	ep-&gt;irq = irq;</div><div class='ctx'> </div><div class='del'>-	ep-&gt;mii.phy_id = data-&gt;phy_id;</div><div class='add'>+	ep-&gt;mii.phy_id = phy_id;</div><div class='ctx'> 	ep-&gt;mii.phy_id_mask = 0x1f;</div><div class='ctx'> 	ep-&gt;mii.reg_num_mask = 0x1f;</div><div class='ctx'> 	ep-&gt;mii.dev = dev;</div><div class='hunk'>@@ -860,16 +854,23 @@ err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct of_device_id ep93xx_eth_of_ids[] = {</div><div class='add'>+	{ .compatible = "cirrus,ep9301-eth" },</div><div class='add'>+	{ /* sentinel */ }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, ep93xx_eth_of_ids);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ep93xx_eth_driver = {</div><div class='ctx'> 	.probe		= ep93xx_eth_probe,</div><div class='ctx'> 	.remove		= ep93xx_eth_remove,</div><div class='ctx'> 	.driver		= {</div><div class='ctx'> 		.name	= "ep93xx-eth",</div><div class='add'>+		.of_match_table = ep93xx_eth_of_ids,</div><div class='ctx'> 	},</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(ep93xx_eth_driver);</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Cirrus EP93xx Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_ALIAS("platform:ep93xx-eth");</div><div class='head'>diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c<br/>index 6324e80960c3..6723df9b65d9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/mac89x0.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cirrus/mac89x0.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cirrus/mac89x0.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cirrus/mac89x0.c</a></div><div class='hunk'>@@ -242,12 +242,15 @@ static int mac89x0_device_probe(struct platform_device *pdev)</div><div class='ctx'> 		pr_info("No EEPROM, giving up now.\n");</div><div class='ctx'> 		goto out1;</div><div class='ctx'>         } else {</div><div class='add'>+		u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='ctx'>                 for (i = 0; i &lt; ETH_ALEN; i += 2) {</div><div class='ctx'> 			/* Big-endian (why??!) */</div><div class='ctx'> 			unsigned short s = readreg(dev, PP_IA + i);</div><div class='del'>-                        dev-&gt;dev_addr[i] = s &gt;&gt; 8;</div><div class='del'>-                        dev-&gt;dev_addr[i+1] = s &amp; 0xff;</div><div class='add'>+			addr[i] = s &gt;&gt; 8;</div><div class='add'>+			addr[i+1] = s &amp; 0xff;</div><div class='ctx'>                 }</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'>         }</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;irq = SLOT2IRQ(slot);</div><div class='hunk'>@@ -541,7 +544,7 @@ static int set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 	if (!is_valid_ether_addr(saddr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='ctx'> </div><div class='del'>-	memcpy(dev-&gt;dev_addr, saddr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, saddr-&gt;sa_data);</div><div class='ctx'> 	netdev_info(dev, "Setting MAC address to %pM\n", dev-&gt;dev_addr);</div><div class='ctx'> </div><div class='ctx'> 	/* set the Ethernet address */</div><div class='hunk'>@@ -551,16 +554,16 @@ static int set_mac_address(struct net_device *dev, void *addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Macintosh CS89x0-based Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='del'>-static int mac89x0_device_remove(struct platform_device *pdev)</div><div class='add'>+static void mac89x0_device_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	nubus_writew(0, dev-&gt;base_addr + ADD_PORT);</div><div class='ctx'> 	free_netdev(dev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver mac89x0_platform_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig<br/>index ee5b7b3868c7..18c3a0718d6f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_CISCO</div><div class='ctx'> 	bool "Cisco devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/Kconfig b/drivers/net/ethernet/cisco/enic/Kconfig<br/>index edaae706a102..96709875fe4f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/Kconfig</a></div><div class='hunk'>@@ -6,5 +6,6 @@</div><div class='ctx'> config ENIC</div><div class='ctx'> 	tristate "Cisco VIC Ethernet NIC Support"</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	help</div><div class='ctx'> 	  This enables the support for the Cisco VIC Ethernet card.</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile<br/>index c3b6febfdbe4..a96b8332e6e2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/Makefile</a></div><div class='hunk'>@@ -3,5 +3,5 @@ obj-$(CONFIG_ENIC) := enic.o</div><div class='ctx'> </div><div class='ctx'> enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \</div><div class='ctx'> 	enic_res.o enic_dev.o enic_pp.o vnic_dev.o vnic_rq.o vnic_vic.o \</div><div class='del'>-	enic_ethtool.o enic_api.o enic_clsf.o</div><div class='add'>+	enic_ethtool.o enic_api.o enic_clsf.o enic_rq.o enic_wq.o</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h<br/>index d6dd1b4edf6e..bfb3f14e89f5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/cq_desc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/cq_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/cq_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/cq_desc.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CQ_DESC_H_</div><div class='hunk'>@@ -53,28 +40,7 @@ struct cq_desc {</div><div class='ctx'> #define CQ_DESC_COMP_NDX_BITS    12</div><div class='ctx'> #define CQ_DESC_COMP_NDX_MASK    ((1 &lt;&lt; CQ_DESC_COMP_NDX_BITS) - 1)</div><div class='ctx'> </div><div class='del'>-static inline void cq_desc_dec(const struct cq_desc *desc_arg,</div><div class='del'>-	u8 *type, u8 *color, u16 *q_number, u16 *completed_index)</div><div class='del'>-{</div><div class='del'>-	const struct cq_desc *desc = desc_arg;</div><div class='del'>-	const u8 type_color = desc-&gt;type_color;</div><div class='del'>-</div><div class='del'>-	*color = (type_color &gt;&gt; CQ_DESC_COLOR_SHIFT) &amp; CQ_DESC_COLOR_MASK;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure color bit is read from desc *before* other fields</div><div class='del'>-	 * are read from desc.  Hardware guarantees color bit is last</div><div class='del'>-	 * bit (byte) written.  Adding the rmb() prevents the compiler</div><div class='del'>-	 * and/or CPU from reordering the reads which would potentially</div><div class='del'>-	 * result in reading stale values.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	rmb();</div><div class='del'>-</div><div class='del'>-	*type = type_color &amp; CQ_DESC_TYPE_MASK;</div><div class='del'>-	*q_number = le16_to_cpu(desc-&gt;q_number) &amp; CQ_DESC_Q_NUM_MASK;</div><div class='del'>-	*completed_index = le16_to_cpu(desc-&gt;completed_index) &amp;</div><div class='del'>-		CQ_DESC_COMP_NDX_MASK;</div><div class='del'>-}</div><div class='add'>+#define CQ_DESC_32_FI_MASK (BIT(0) | BIT(1))</div><div class='add'>+#define CQ_DESC_64_FI_MASK (BIT(0) | BIT(1))</div><div class='ctx'> </div><div class='ctx'> #endif /* _CQ_DESC_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/cq_enet_desc.h b/drivers/net/ethernet/cisco/enic/cq_enet_desc.h<br/>index ac37cacc6136..50787cff29db 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/cq_enet_desc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/cq_enet_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/cq_enet_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/cq_enet_desc.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _CQ_ENET_DESC_H_</div><div class='hunk'>@@ -30,12 +17,22 @@ struct cq_enet_wq_desc {</div><div class='ctx'> 	u8 type_color;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc,</div><div class='del'>-	u8 *type, u8 *color, u16 *q_number, u16 *completed_index)</div><div class='del'>-{</div><div class='del'>-	cq_desc_dec((struct cq_desc *)desc, type,</div><div class='del'>-		color, q_number, completed_index);</div><div class='del'>-}</div><div class='add'>+/*</div><div class='add'>+ * Defines and Capabilities for CMD_CQ_ENTRY_SIZE_SET</div><div class='add'>+ */</div><div class='add'>+#define VNIC_RQ_ALL (~0ULL)</div><div class='add'>+</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_16 0</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_32 1</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_64 2</div><div class='add'>+</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_16_CAPABLE BIT(VNIC_RQ_CQ_ENTRY_SIZE_16)</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_32_CAPABLE BIT(VNIC_RQ_CQ_ENTRY_SIZE_32)</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_64_CAPABLE BIT(VNIC_RQ_CQ_ENTRY_SIZE_64)</div><div class='add'>+</div><div class='add'>+#define VNIC_RQ_CQ_ENTRY_SIZE_ALL_BIT  (VNIC_RQ_CQ_ENTRY_SIZE_16_CAPABLE | \</div><div class='add'>+					VNIC_RQ_CQ_ENTRY_SIZE_32_CAPABLE | \</div><div class='add'>+					VNIC_RQ_CQ_ENTRY_SIZE_64_CAPABLE)</div><div class='ctx'> </div><div class='ctx'> /* Completion queue descriptor: Ethernet receive queue, 16B */</div><div class='ctx'> struct cq_enet_rq_desc {</div><div class='hunk'>@@ -49,6 +46,45 @@ struct cq_enet_rq_desc {</div><div class='ctx'> 	u8 type_color;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Completion queue descriptor: Ethernet receive queue, 32B */</div><div class='add'>+struct cq_enet_rq_desc_32 {</div><div class='add'>+	__le16 completed_index_flags;</div><div class='add'>+	__le16 q_number_rss_type_flags;</div><div class='add'>+	__le32 rss_hash;</div><div class='add'>+	__le16 bytes_written_flags;</div><div class='add'>+	__le16 vlan;</div><div class='add'>+	__le16 checksum_fcoe;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 fetch_index_flags;</div><div class='add'>+	__le32 time_stamp;</div><div class='add'>+	__le16 time_stamp2;</div><div class='add'>+	__le16 pie_info;</div><div class='add'>+	__le32 pie_info2;</div><div class='add'>+	__le16 pie_info3;</div><div class='add'>+	u8 pie_info4;</div><div class='add'>+	u8 type_color;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Completion queue descriptor: Ethernet receive queue, 64B */</div><div class='add'>+struct cq_enet_rq_desc_64 {</div><div class='add'>+	__le16 completed_index_flags;</div><div class='add'>+	__le16 q_number_rss_type_flags;</div><div class='add'>+	__le32 rss_hash;</div><div class='add'>+	__le16 bytes_written_flags;</div><div class='add'>+	__le16 vlan;</div><div class='add'>+	__le16 checksum_fcoe;</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 fetch_index_flags;</div><div class='add'>+	__le32 time_stamp;</div><div class='add'>+	__le16 time_stamp2;</div><div class='add'>+	__le16 pie_info;</div><div class='add'>+	__le32 pie_info2;</div><div class='add'>+	__le16 pie_info3;</div><div class='add'>+	u8 pie_info4;</div><div class='add'>+	u8 reserved[32];</div><div class='add'>+	u8 type_color;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #define CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT          (0x1 &lt;&lt; 12)</div><div class='ctx'> #define CQ_ENET_RQ_DESC_FLAGS_FCOE                  (0x1 &lt;&lt; 13)</div><div class='ctx'> #define CQ_ENET_RQ_DESC_FLAGS_EOP                   (0x1 &lt;&lt; 14)</div><div class='hunk'>@@ -101,85 +137,4 @@ struct cq_enet_rq_desc {</div><div class='ctx'> #define CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT         (0x1 &lt;&lt; 6)</div><div class='ctx'> #define CQ_ENET_RQ_DESC_FLAGS_FCS_OK                (0x1 &lt;&lt; 7)</div><div class='ctx'> </div><div class='del'>-static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,</div><div class='del'>-	u8 *type, u8 *color, u16 *q_number, u16 *completed_index,</div><div class='del'>-	u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,</div><div class='del'>-	u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,</div><div class='del'>-	u8 *vlan_stripped, u16 *vlan_tci, u16 *checksum, u8 *fcoe_sof,</div><div class='del'>-	u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,</div><div class='del'>-	u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,</div><div class='del'>-	u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)</div><div class='del'>-{</div><div class='del'>-	u16 completed_index_flags;</div><div class='del'>-	u16 q_number_rss_type_flags;</div><div class='del'>-	u16 bytes_written_flags;</div><div class='del'>-</div><div class='del'>-	cq_desc_dec((struct cq_desc *)desc, type,</div><div class='del'>-		color, q_number, completed_index);</div><div class='del'>-</div><div class='del'>-	completed_index_flags = le16_to_cpu(desc-&gt;completed_index_flags);</div><div class='del'>-	q_number_rss_type_flags =</div><div class='del'>-		le16_to_cpu(desc-&gt;q_number_rss_type_flags);</div><div class='del'>-	bytes_written_flags = le16_to_cpu(desc-&gt;bytes_written_flags);</div><div class='del'>-</div><div class='del'>-	*ingress_port = (completed_index_flags &amp;</div><div class='del'>-		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;</div><div class='del'>-	*fcoe = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_FCOE) ?</div><div class='del'>-		1 : 0;</div><div class='del'>-	*eop = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_EOP) ?</div><div class='del'>-		1 : 0;</div><div class='del'>-	*sop = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_SOP) ?</div><div class='del'>-		1 : 0;</div><div class='del'>-</div><div class='del'>-	*rss_type = (u8)((q_number_rss_type_flags &gt;&gt; CQ_DESC_Q_NUM_BITS) &amp;</div><div class='del'>-		CQ_ENET_RQ_DESC_RSS_TYPE_MASK);</div><div class='del'>-	*csum_not_calc = (q_number_rss_type_flags &amp;</div><div class='del'>-		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	*rss_hash = le32_to_cpu(desc-&gt;rss_hash);</div><div class='del'>-</div><div class='del'>-	*bytes_written = bytes_written_flags &amp;</div><div class='del'>-		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;</div><div class='del'>-	*packet_error = (bytes_written_flags &amp;</div><div class='del'>-		CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;</div><div class='del'>-	*vlan_stripped = (bytes_written_flags &amp;</div><div class='del'>-		CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)</div><div class='del'>-	 */</div><div class='del'>-	*vlan_tci = le16_to_cpu(desc-&gt;vlan);</div><div class='del'>-</div><div class='del'>-	if (*fcoe) {</div><div class='del'>-		*fcoe_sof = (u8)(le16_to_cpu(desc-&gt;checksum_fcoe) &amp;</div><div class='del'>-			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);</div><div class='del'>-		*fcoe_fc_crc_ok = (desc-&gt;flags &amp;</div><div class='del'>-			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;</div><div class='del'>-		*fcoe_enc_error = (desc-&gt;flags &amp;</div><div class='del'>-			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;</div><div class='del'>-		*fcoe_eof = (u8)((le16_to_cpu(desc-&gt;checksum_fcoe) &gt;&gt;</div><div class='del'>-			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &amp;</div><div class='del'>-			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);</div><div class='del'>-		*checksum = 0;</div><div class='del'>-	} else {</div><div class='del'>-		*fcoe_sof = 0;</div><div class='del'>-		*fcoe_fc_crc_ok = 0;</div><div class='del'>-		*fcoe_enc_error = 0;</div><div class='del'>-		*fcoe_eof = 0;</div><div class='del'>-		*checksum = le16_to_cpu(desc-&gt;checksum_fcoe);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*tcp_udp_csum_ok =</div><div class='del'>-		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;</div><div class='del'>-	*udp = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;</div><div class='del'>-	*tcp = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;</div><div class='del'>-	*ipv4_csum_ok =</div><div class='del'>-		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;</div><div class='del'>-	*ipv6 = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;</div><div class='del'>-	*ipv4 = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;</div><div class='del'>-	*ipv4_fragment =</div><div class='del'>-		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;</div><div class='del'>-	*fcs_ok = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> #endif /* _CQ_ENET_DESC_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h<br/>index 0dd64acd2a3f..301b3f3114af 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ENIC_H_</div><div class='hunk'>@@ -30,23 +17,28 @@</div><div class='ctx'> #include "vnic_nic.h"</div><div class='ctx'> #include "vnic_rss.h"</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"enic"</div><div class='ctx'> #define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"</div><div class='del'>-#define DRV_VERSION		"2.3.0.53"</div><div class='del'>-#define DRV_COPYRIGHT		"Copyright 2008-2013 Cisco Systems, Inc"</div><div class='ctx'> </div><div class='ctx'> #define ENIC_BARS_MAX		6</div><div class='ctx'> </div><div class='del'>-#define ENIC_WQ_MAX		8</div><div class='del'>-#define ENIC_RQ_MAX		8</div><div class='del'>-#define ENIC_CQ_MAX		(ENIC_WQ_MAX + ENIC_RQ_MAX)</div><div class='del'>-#define ENIC_INTR_MAX		(ENIC_CQ_MAX + 2)</div><div class='add'>+#define ENIC_WQ_MAX		256</div><div class='add'>+#define ENIC_RQ_MAX		256</div><div class='add'>+#define ENIC_RQ_MIN_DEFAULT	8</div><div class='ctx'> </div><div class='ctx'> #define ENIC_WQ_NAPI_BUDGET	256</div><div class='ctx'> </div><div class='ctx'> #define ENIC_AIC_LARGE_PKT_DIFF	3</div><div class='ctx'> </div><div class='add'>+enum ext_cq {</div><div class='add'>+	ENIC_RQ_CQ_ENTRY_SIZE_16,</div><div class='add'>+	ENIC_RQ_CQ_ENTRY_SIZE_32,</div><div class='add'>+	ENIC_RQ_CQ_ENTRY_SIZE_64,</div><div class='add'>+	ENIC_RQ_CQ_ENTRY_SIZE_MAX,</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct enic_msix_entry {</div><div class='ctx'> 	int requested;</div><div class='ctx'> 	char devname[IFNAMSIZ + 8];</div><div class='hunk'>@@ -92,6 +84,10 @@ struct enic_rx_coal {</div><div class='ctx'> #define ENIC_SET_INSTANCE		(1 &lt;&lt; 3)</div><div class='ctx'> #define ENIC_SET_HOST			(1 &lt;&lt; 4)</div><div class='ctx'> </div><div class='add'>+#define MAX_TSO			BIT(16)</div><div class='add'>+#define WQ_ENET_MAX_DESC_LEN	BIT(WQ_ENET_LEN_BITS)</div><div class='add'>+#define ENIC_DESC_MAX_SPLITS	(MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1)</div><div class='add'>+</div><div class='ctx'> struct enic_port_profile {</div><div class='ctx'> 	u32 set;</div><div class='ctx'> 	u8 request;</div><div class='hunk'>@@ -143,6 +139,53 @@ struct vxlan_offload {</div><div class='ctx'> 	u8 flags;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct enic_wq_stats {</div><div class='add'>+	u64 packets;		/* pkts queued for Tx */</div><div class='add'>+	u64 stopped;		/* Tx ring almost full, queue stopped */</div><div class='add'>+	u64 wake;		/* Tx ring no longer full, queue woken up*/</div><div class='add'>+	u64 tso;		/* non-encap tso pkt */</div><div class='add'>+	u64 encap_tso;		/* encap tso pkt */</div><div class='add'>+	u64 encap_csum;		/* encap HW csum */</div><div class='add'>+	u64 csum_partial;	/* skb-&gt;ip_summed = CHECKSUM_PARTIAL */</div><div class='add'>+	u64 csum_none;		/* HW csum not required */</div><div class='add'>+	u64 bytes;		/* bytes queued for Tx */</div><div class='add'>+	u64 add_vlan;		/* HW adds vlan tag */</div><div class='add'>+	u64 cq_work;		/* Tx completions processed */</div><div class='add'>+	u64 cq_bytes;		/* Tx bytes processed */</div><div class='add'>+	u64 null_pkt;		/* skb length &lt;= 0 */</div><div class='add'>+	u64 skb_linear_fail;	/* linearize failures */</div><div class='add'>+	u64 desc_full_awake;	/* TX ring full while queue awake */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct enic_rq_stats {</div><div class='add'>+	u64 packets;			/* pkts received */</div><div class='add'>+	u64 bytes;			/* bytes received */</div><div class='add'>+	u64 l4_rss_hash;		/* hashed on l4 */</div><div class='add'>+	u64 l3_rss_hash;		/* hashed on l3 */</div><div class='add'>+	u64 csum_unnecessary;		/* HW verified csum */</div><div class='add'>+	u64 csum_unnecessary_encap;	/* HW verified csum on encap packet */</div><div class='add'>+	u64 vlan_stripped;		/* HW stripped vlan */</div><div class='add'>+	u64 napi_complete;		/* napi complete intr reenabled */</div><div class='add'>+	u64 napi_repoll;		/* napi poll again */</div><div class='add'>+	u64 bad_fcs;			/* bad pkts */</div><div class='add'>+	u64 pkt_truncated;		/* truncated pkts */</div><div class='add'>+	u64 no_skb;			/* out of skbs */</div><div class='add'>+	u64 desc_skip;			/* Rx pkt went into later buffer */</div><div class='add'>+	u64 pp_alloc_fail;		/* page pool alloc failure */</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct enic_wq {</div><div class='add'>+	spinlock_t lock;		/* spinlock for wq */</div><div class='add'>+	struct vnic_wq vwq;</div><div class='add'>+	struct enic_wq_stats stats;</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='add'>+struct enic_rq {</div><div class='add'>+	struct vnic_rq vrq;</div><div class='add'>+	struct enic_rq_stats stats;</div><div class='add'>+	struct page_pool *pool;</div><div class='add'>+} ____cacheline_aligned;</div><div class='add'>+</div><div class='ctx'> /* Per-instance private data structure */</div><div class='ctx'> struct enic {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='hunk'>@@ -154,8 +197,8 @@ struct enic {</div><div class='ctx'> 	struct work_struct reset;</div><div class='ctx'> 	struct work_struct tx_hang_reset;</div><div class='ctx'> 	struct work_struct change_mtu_work;</div><div class='del'>-	struct msix_entry msix_entry[ENIC_INTR_MAX];</div><div class='del'>-	struct enic_msix_entry msix[ENIC_INTR_MAX];</div><div class='add'>+	struct msix_entry *msix_entry;</div><div class='add'>+	struct enic_msix_entry *msix;</div><div class='ctx'> 	u32 msg_enable;</div><div class='ctx'> 	spinlock_t devcmd_lock;</div><div class='ctx'> 	u8 mac_addr[ETH_ALEN];</div><div class='hunk'>@@ -171,35 +214,33 @@ struct enic {</div><div class='ctx'> 	u16 num_vfs;</div><div class='ctx'> #endif</div><div class='ctx'> 	spinlock_t enic_api_lock;</div><div class='add'>+	bool enic_api_busy;</div><div class='ctx'> 	struct enic_port_profile *pp;</div><div class='ctx'> </div><div class='del'>-	/* work queue cache line section */</div><div class='del'>-	____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];</div><div class='del'>-	spinlock_t wq_lock[ENIC_WQ_MAX];</div><div class='add'>+	struct enic_wq *wq;</div><div class='add'>+	unsigned int wq_avail;</div><div class='ctx'> 	unsigned int wq_count;</div><div class='ctx'> 	u16 loop_enable;</div><div class='ctx'> 	u16 loop_tag;</div><div class='ctx'> </div><div class='del'>-	/* receive queue cache line section */</div><div class='del'>-	____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];</div><div class='add'>+	struct enic_rq *rq;</div><div class='add'>+	unsigned int rq_avail;</div><div class='ctx'> 	unsigned int rq_count;</div><div class='ctx'> 	struct vxlan_offload vxlan;</div><div class='del'>-	u64 rq_truncated_pkts;</div><div class='del'>-	u64 rq_bad_fcs;</div><div class='del'>-	struct napi_struct napi[ENIC_RQ_MAX + ENIC_WQ_MAX];</div><div class='add'>+	struct napi_struct *napi;</div><div class='ctx'> </div><div class='del'>-	/* interrupt resource cache line section */</div><div class='del'>-	____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX];</div><div class='add'>+	struct vnic_intr *intr;</div><div class='add'>+	unsigned int intr_avail;</div><div class='ctx'> 	unsigned int intr_count;</div><div class='ctx'> 	u32 __iomem *legacy_pba;		/* memory-mapped */</div><div class='ctx'> </div><div class='del'>-	/* completion queue cache line section */</div><div class='del'>-	____cacheline_aligned struct vnic_cq cq[ENIC_CQ_MAX];</div><div class='add'>+	struct vnic_cq *cq;</div><div class='add'>+	unsigned int cq_avail;</div><div class='ctx'> 	unsigned int cq_count;</div><div class='ctx'> 	struct enic_rfs_flw_tbl rfs_h;</div><div class='del'>-	u32 rx_copybreak;</div><div class='ctx'> 	u8 rss_key[ENIC_RSS_LEN];</div><div class='ctx'> 	struct vnic_gen_stats gen_stats;</div><div class='add'>+	enum ext_cq ext_cq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static inline struct net_device *vnic_get_netdev(struct vnic_dev *vdev)</div><div class='hunk'>@@ -240,21 +281,6 @@ static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq)</div><div class='ctx'> 	return enic-&gt;rq_count + wq;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline unsigned int enic_legacy_io_intr(void)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int enic_legacy_err_intr(void)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline unsigned int enic_legacy_notify_intr(void)</div><div class='del'>-{</div><div class='del'>-	return 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static inline unsigned int enic_msix_rq_intr(struct enic *enic,</div><div class='ctx'> 	unsigned int rq)</div><div class='ctx'> {</div><div class='hunk'>@@ -267,21 +293,35 @@ static inline unsigned int enic_msix_wq_intr(struct enic *enic,</div><div class='ctx'> 	return enic-&gt;cq[enic_cq_wq(enic, wq)].interrupt_offset;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* MSIX interrupts are organized as the error interrupt, then the notify</div><div class='add'>+ * interrupt followed by all the I/O interrupts.  The error interrupt needs</div><div class='add'>+ * to fit in 7 bits due to hardware constraints</div><div class='add'>+ */</div><div class='add'>+#define ENIC_MSIX_RESERVED_INTR 2</div><div class='add'>+#define ENIC_MSIX_ERR_INTR	0</div><div class='add'>+#define ENIC_MSIX_NOTIFY_INTR	1</div><div class='add'>+#define ENIC_MSIX_IO_INTR_BASE	ENIC_MSIX_RESERVED_INTR</div><div class='add'>+#define ENIC_MSIX_MIN_INTR	(ENIC_MSIX_RESERVED_INTR + 2)</div><div class='add'>+</div><div class='add'>+#define ENIC_LEGACY_IO_INTR	0</div><div class='add'>+#define ENIC_LEGACY_ERR_INTR	1</div><div class='add'>+#define ENIC_LEGACY_NOTIFY_INTR	2</div><div class='add'>+</div><div class='ctx'> static inline unsigned int enic_msix_err_intr(struct enic *enic)</div><div class='ctx'> {</div><div class='del'>-	return enic-&gt;rq_count + enic-&gt;wq_count;</div><div class='add'>+	return ENIC_MSIX_ERR_INTR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline unsigned int enic_msix_notify_intr(struct enic *enic)</div><div class='ctx'> {</div><div class='del'>-	return enic-&gt;rq_count + enic-&gt;wq_count + 1;</div><div class='add'>+	return ENIC_MSIX_NOTIFY_INTR;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline bool enic_is_err_intr(struct enic *enic, int intr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_INTX:</div><div class='del'>-		return intr == enic_legacy_err_intr();</div><div class='add'>+		return intr == ENIC_LEGACY_ERR_INTR;</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='ctx'> 		return intr == enic_msix_err_intr(enic);</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSI:</div><div class='hunk'>@@ -294,7 +334,7 @@ static inline bool enic_is_notify_intr(struct enic *enic, int intr)</div><div class='ctx'> {</div><div class='ctx'> 	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_INTX:</div><div class='del'>-		return intr == enic_legacy_notify_intr();</div><div class='add'>+		return intr == ENIC_LEGACY_NOTIFY_INTR;</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='ctx'> 		return intr == enic_msix_notify_intr(enic);</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSI:</div><div class='hunk'>@@ -305,7 +345,7 @@ static inline bool enic_is_notify_intr(struct enic *enic, int intr)</div><div class='ctx'> </div><div class='ctx'> static inline int enic_dma_map_check(struct enic *enic, dma_addr_t dma_addr)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(pci_dma_mapping_error(enic-&gt;pdev, dma_addr))) {</div><div class='add'>+	if (unlikely(dma_mapping_error(&amp;enic-&gt;pdev-&gt;dev, dma_addr))) {</div><div class='ctx'> 		net_warn_ratelimited("%s: PCI dma mapping failed!\n",</div><div class='ctx'> 				     enic-&gt;netdev-&gt;name);</div><div class='ctx'> 		enic-&gt;gen_stats.dma_map_error++;</div><div class='hunk'>@@ -322,5 +362,6 @@ int enic_is_valid_vf(struct enic *enic, int vf);</div><div class='ctx'> int enic_is_dynamic(struct enic *enic);</div><div class='ctx'> void enic_set_ethtool_ops(struct net_device *netdev);</div><div class='ctx'> int __enic_set_rsskey(struct enic *enic);</div><div class='add'>+void enic_ext_cq(struct enic *enic);</div><div class='ctx'> </div><div class='ctx'> #endif /* _ENIC_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_api.c b/drivers/net/ethernet/cisco/enic/enic_api.c<br/>index b161f24522b8..e3b700c28bc4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_api.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_api.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_api.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_api.c</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/**</div><div class='del'>- * Copyright 2013 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2013 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/spinlock.h&gt;</div><div class='hunk'>@@ -34,6 +19,12 @@ int enic_api_devcmd_proxy_by_index(struct net_device *netdev, int vf,</div><div class='ctx'> 	struct vnic_dev *vdev = enic-&gt;vdev;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+	while (enic-&gt;enic_api_busy) {</div><div class='add'>+		spin_unlock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+		cpu_relax();</div><div class='add'>+		spin_lock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	spin_lock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='ctx'> </div><div class='ctx'> 	vnic_dev_cmd_proxy_by_index_start(vdev, vf);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_api.h b/drivers/net/ethernet/cisco/enic/enic_api.h<br/>index 6b9f9255af28..e01790fb0415 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_api.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_api.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_api.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_api.h</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/**</div><div class='del'>- * Copyright 2013 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright 2013 Cisco Systems, Inc.  All rights reserved. */</div><div class='ctx'> </div><div class='ctx'> #ifndef __ENIC_API_H__</div><div class='ctx'> #define __ENIC_API_H__</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.c b/drivers/net/ethernet/cisco/enic/enic_clsf.c<br/>index 9900993b6aea..837f954873ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_clsf.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_clsf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_clsf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_clsf.c</a></div><div class='hunk'>@@ -125,7 +125,7 @@ struct enic_rfs_fltr_node *htbl_fltr_search(struct enic *enic, u16 fltr_id)</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> void enic_flow_may_expire(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct enic *enic = from_timer(enic, t, rfs_h.rfs_may_expire);</div><div class='add'>+	struct enic *enic = timer_container_of(enic, t, rfs_h.rfs_may_expire);</div><div class='ctx'> 	bool res;</div><div class='ctx'> 	int j;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h b/drivers/net/ethernet/cisco/enic/enic_clsf.h<br/>index 8c4ce50da6e1..5f5284102fb0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_clsf.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_clsf.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_clsf.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_clsf.h</a></div><div class='hunk'>@@ -26,7 +26,7 @@ static inline void enic_rfs_timer_start(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> static inline void enic_rfs_timer_stop(struct enic *enic)</div><div class='ctx'> {</div><div class='del'>-	del_timer_sync(&amp;enic-&gt;rfs_h.rfs_may_expire);</div><div class='add'>+	timer_delete_sync(&amp;enic-&gt;rfs_h.rfs_may_expire);</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='ctx'> static inline void enic_rfs_timer_start(struct enic *enic) {}</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c<br/>index f8d2a6a34282..2cbae7c6cc3d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_dev.c</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2011 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2011 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h<br/>index f5bb058b3f96..698d0cb02064 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_dev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_dev.h</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2011 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright 2011 Cisco Systems, Inc.  All rights reserved. */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ENIC_DEV_H_</div><div class='ctx'> #define _ENIC_DEV_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_ethtool.c b/drivers/net/ethernet/cisco/enic/enic_ethtool.c<br/>index ebd5c2cf1efe..a50f5dad34d5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_ethtool.c</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/**</div><div class='del'>- * Copyright 2013 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2013 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='hunk'>@@ -47,6 +32,41 @@ struct enic_stat {</div><div class='ctx'> 	.index = offsetof(struct vnic_gen_stats, stat) / sizeof(u64)\</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define ENIC_PER_RQ_STAT(stat) { \</div><div class='add'>+	.name = "rq[%d]_"#stat, \</div><div class='add'>+	.index = offsetof(struct enic_rq_stats, stat) / sizeof(u64) \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define ENIC_PER_WQ_STAT(stat) { \</div><div class='add'>+	.name = "wq[%d]_"#stat, \</div><div class='add'>+	.index = offsetof(struct enic_wq_stats, stat) / sizeof(u64) \</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct enic_stat enic_per_rq_stats[] = {</div><div class='add'>+	ENIC_PER_RQ_STAT(l4_rss_hash),</div><div class='add'>+	ENIC_PER_RQ_STAT(l3_rss_hash),</div><div class='add'>+	ENIC_PER_RQ_STAT(csum_unnecessary_encap),</div><div class='add'>+	ENIC_PER_RQ_STAT(vlan_stripped),</div><div class='add'>+	ENIC_PER_RQ_STAT(napi_complete),</div><div class='add'>+	ENIC_PER_RQ_STAT(napi_repoll),</div><div class='add'>+	ENIC_PER_RQ_STAT(no_skb),</div><div class='add'>+	ENIC_PER_RQ_STAT(desc_skip),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_ENIC_PER_RQ_STATS   ARRAY_SIZE(enic_per_rq_stats)</div><div class='add'>+</div><div class='add'>+static const struct enic_stat enic_per_wq_stats[] = {</div><div class='add'>+	ENIC_PER_WQ_STAT(encap_tso),</div><div class='add'>+	ENIC_PER_WQ_STAT(encap_csum),</div><div class='add'>+	ENIC_PER_WQ_STAT(add_vlan),</div><div class='add'>+	ENIC_PER_WQ_STAT(cq_work),</div><div class='add'>+	ENIC_PER_WQ_STAT(cq_bytes),</div><div class='add'>+	ENIC_PER_WQ_STAT(null_pkt),</div><div class='add'>+	ENIC_PER_WQ_STAT(skb_linear_fail),</div><div class='add'>+	ENIC_PER_WQ_STAT(desc_full_awake),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define NUM_ENIC_PER_WQ_STATS   ARRAY_SIZE(enic_per_wq_stats)</div><div class='ctx'> static const struct enic_stat enic_tx_stats[] = {</div><div class='ctx'> 	ENIC_TX_STAT(tx_frames_ok),</div><div class='ctx'> 	ENIC_TX_STAT(tx_unicast_frames_ok),</div><div class='hunk'>@@ -61,6 +81,8 @@ static const struct enic_stat enic_tx_stats[] = {</div><div class='ctx'> 	ENIC_TX_STAT(tx_tso),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define NUM_ENIC_TX_STATS	ARRAY_SIZE(enic_tx_stats)</div><div class='add'>+</div><div class='ctx'> static const struct enic_stat enic_rx_stats[] = {</div><div class='ctx'> 	ENIC_RX_STAT(rx_frames_ok),</div><div class='ctx'> 	ENIC_RX_STAT(rx_frames_total),</div><div class='hunk'>@@ -85,13 +107,13 @@ static const struct enic_stat enic_rx_stats[] = {</div><div class='ctx'> 	ENIC_RX_STAT(rx_frames_to_max),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define NUM_ENIC_RX_STATS	ARRAY_SIZE(enic_rx_stats)</div><div class='add'>+</div><div class='ctx'> static const struct enic_stat enic_gen_stats[] = {</div><div class='ctx'> 	ENIC_GEN_STAT(dma_map_error),</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static const unsigned int enic_n_tx_stats = ARRAY_SIZE(enic_tx_stats);</div><div class='del'>-static const unsigned int enic_n_rx_stats = ARRAY_SIZE(enic_rx_stats);</div><div class='del'>-static const unsigned int enic_n_gen_stats = ARRAY_SIZE(enic_gen_stats);</div><div class='add'>+#define NUM_ENIC_GEN_STATS	ARRAY_SIZE(enic_gen_stats)</div><div class='ctx'> </div><div class='ctx'> static void enic_intr_coal_set_rx(struct enic *enic, u32 timer)</div><div class='ctx'> {</div><div class='hunk'>@@ -139,58 +161,77 @@ static void enic_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = enic_dev_fw_info(enic, &amp;fw_info);</div><div class='del'>-	/* return only when pci_zalloc_consistent fails in vnic_dev_fw_info</div><div class='add'>+	/* return only when dma_alloc_coherent fails in vnic_dev_fw_info</div><div class='ctx'> 	 * For other failures, like devcmd failure, we return previously</div><div class='ctx'> 	 * recorded info.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (err == -ENOMEM)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, DRV_VERSION, sizeof(drvinfo-&gt;version));</div><div class='del'>-	strlcpy(drvinfo-&gt;fw_version, fw_info-&gt;fw_version,</div><div class='add'>+	strscpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;fw_version, fw_info-&gt;fw_version,</div><div class='ctx'> 		sizeof(drvinfo-&gt;fw_version));</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(enic-&gt;pdev),</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(enic-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enic_get_strings(struct net_device *netdev, u32 stringset,</div><div class='ctx'> 	u8 *data)</div><div class='ctx'> {</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	unsigned int j;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; enic_n_tx_stats; i++) {</div><div class='add'>+		for (i = 0; i &lt; NUM_ENIC_TX_STATS; i++) {</div><div class='ctx'> 			memcpy(data, enic_tx_stats[i].name, ETH_GSTRING_LEN);</div><div class='ctx'> 			data += ETH_GSTRING_LEN;</div><div class='ctx'> 		}</div><div class='del'>-		for (i = 0; i &lt; enic_n_rx_stats; i++) {</div><div class='add'>+		for (i = 0; i &lt; NUM_ENIC_RX_STATS; i++) {</div><div class='ctx'> 			memcpy(data, enic_rx_stats[i].name, ETH_GSTRING_LEN);</div><div class='ctx'> 			data += ETH_GSTRING_LEN;</div><div class='ctx'> 		}</div><div class='del'>-		for (i = 0; i &lt; enic_n_gen_stats; i++) {</div><div class='add'>+		for (i = 0; i &lt; NUM_ENIC_GEN_STATS; i++) {</div><div class='ctx'> 			memcpy(data, enic_gen_stats[i].name, ETH_GSTRING_LEN);</div><div class='ctx'> 			data += ETH_GSTRING_LEN;</div><div class='ctx'> 		}</div><div class='add'>+		for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+			for (j = 0; j &lt; NUM_ENIC_PER_RQ_STATS; j++) {</div><div class='add'>+				snprintf(data, ETH_GSTRING_LEN,</div><div class='add'>+					 enic_per_rq_stats[j].name, i);</div><div class='add'>+				data += ETH_GSTRING_LEN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='add'>+			for (j = 0; j &lt; NUM_ENIC_PER_WQ_STATS; j++) {</div><div class='add'>+				snprintf(data, ETH_GSTRING_LEN,</div><div class='add'>+					 enic_per_wq_stats[j].name, i);</div><div class='add'>+				data += ETH_GSTRING_LEN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void enic_get_ringparam(struct net_device *netdev,</div><div class='del'>-			       struct ethtool_ringparam *ring)</div><div class='add'>+			       struct ethtool_ringparam *ring,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	struct vnic_enet_config *c = &amp;enic-&gt;config;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;rx_max_pending = ENIC_MAX_RQ_DESCS;</div><div class='add'>+	ring-&gt;rx_max_pending = c-&gt;max_rq_ring;</div><div class='ctx'> 	ring-&gt;rx_pending = c-&gt;rq_desc_count;</div><div class='del'>-	ring-&gt;tx_max_pending = ENIC_MAX_WQ_DESCS;</div><div class='add'>+	ring-&gt;tx_max_pending = c-&gt;max_wq_ring;</div><div class='ctx'> 	ring-&gt;tx_pending = c-&gt;wq_desc_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int enic_set_ringparam(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_ringparam *ring)</div><div class='add'>+			      struct ethtool_ringparam *ring,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	struct vnic_enet_config *c = &amp;enic-&gt;config;</div><div class='hunk'>@@ -211,18 +252,18 @@ static int enic_set_ringparam(struct net_device *netdev,</div><div class='ctx'> 	}</div><div class='ctx'> 	rx_pending = c-&gt;rq_desc_count;</div><div class='ctx'> 	tx_pending = c-&gt;wq_desc_count;</div><div class='del'>-	if (ring-&gt;rx_pending &gt; ENIC_MAX_RQ_DESCS ||</div><div class='add'>+	if (ring-&gt;rx_pending &gt; c-&gt;max_rq_ring ||</div><div class='ctx'> 	    ring-&gt;rx_pending &lt; ENIC_MIN_RQ_DESCS) {</div><div class='ctx'> 		netdev_info(netdev, "rx pending (%u) not in range [%u,%u]",</div><div class='ctx'> 			    ring-&gt;rx_pending, ENIC_MIN_RQ_DESCS,</div><div class='del'>-			    ENIC_MAX_RQ_DESCS);</div><div class='add'>+	      c-&gt;max_rq_ring);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='del'>-	if (ring-&gt;tx_pending &gt; ENIC_MAX_WQ_DESCS ||</div><div class='add'>+	if (ring-&gt;tx_pending &gt; c-&gt;max_wq_ring ||</div><div class='ctx'> 	    ring-&gt;tx_pending &lt; ENIC_MIN_WQ_DESCS) {</div><div class='ctx'> 		netdev_info(netdev, "tx pending (%u) not in range [%u,%u]",</div><div class='ctx'> 			    ring-&gt;tx_pending, ENIC_MIN_WQ_DESCS,</div><div class='del'>-			    ENIC_MAX_WQ_DESCS);</div><div class='add'>+			c-&gt;max_wq_ring);</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (running)</div><div class='hunk'>@@ -254,9 +295,19 @@ err_out:</div><div class='ctx'> </div><div class='ctx'> static int enic_get_sset_count(struct net_device *netdev, int sset)</div><div class='ctx'> {</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+	unsigned int n_per_rq_stats;</div><div class='add'>+	unsigned int n_per_wq_stats;</div><div class='add'>+	unsigned int n_stats;</div><div class='add'>+</div><div class='ctx'> 	switch (sset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		return enic_n_tx_stats + enic_n_rx_stats + enic_n_gen_stats;</div><div class='add'>+		n_per_rq_stats = NUM_ENIC_PER_RQ_STATS * enic-&gt;rq_count;</div><div class='add'>+		n_per_wq_stats = NUM_ENIC_PER_WQ_STATS * enic-&gt;wq_count;</div><div class='add'>+		n_stats = NUM_ENIC_TX_STATS + NUM_ENIC_RX_STATS +</div><div class='add'>+			NUM_ENIC_GEN_STATS +</div><div class='add'>+			n_per_rq_stats + n_per_wq_stats;</div><div class='add'>+		return n_stats;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -268,22 +319,41 @@ static void enic_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	struct vnic_stats *vstats;</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	unsigned int j;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = enic_dev_stats_dump(enic, &amp;vstats);</div><div class='del'>-	/* return only when pci_zalloc_consistent fails in vnic_dev_stats_dump</div><div class='add'>+	/* return only when dma_alloc_coherent fails in vnic_dev_stats_dump</div><div class='ctx'> 	 * For other failures, like devcmd failure, we return previously</div><div class='ctx'> 	 * recorded stats.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (err == -ENOMEM)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; enic_n_tx_stats; i++)</div><div class='add'>+	for (i = 0; i &lt; NUM_ENIC_TX_STATS; i++)</div><div class='ctx'> 		*(data++) = ((u64 *)&amp;vstats-&gt;tx)[enic_tx_stats[i].index];</div><div class='del'>-	for (i = 0; i &lt; enic_n_rx_stats; i++)</div><div class='add'>+	for (i = 0; i &lt; NUM_ENIC_RX_STATS; i++)</div><div class='ctx'> 		*(data++) = ((u64 *)&amp;vstats-&gt;rx)[enic_rx_stats[i].index];</div><div class='del'>-	for (i = 0; i &lt; enic_n_gen_stats; i++)</div><div class='add'>+	for (i = 0; i &lt; NUM_ENIC_GEN_STATS; i++)</div><div class='ctx'> 		*(data++) = ((u64 *)&amp;enic-&gt;gen_stats)[enic_gen_stats[i].index];</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		struct enic_rq_stats *rqstats = &amp;enic-&gt;rq[i].stats;</div><div class='add'>+		int index;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; NUM_ENIC_PER_RQ_STATS; j++) {</div><div class='add'>+			index = enic_per_rq_stats[j].index;</div><div class='add'>+			*(data++) = ((u64 *)rqstats)[index];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='add'>+		struct enic_wq_stats *wqstats = &amp;enic-&gt;wq[i].stats;</div><div class='add'>+		int index;</div><div class='add'>+</div><div class='add'>+		for (j = 0; j &lt; NUM_ENIC_PER_WQ_STATS; j++) {</div><div class='add'>+			index = enic_per_wq_stats[j].index;</div><div class='add'>+			*(data++) = ((u64 *)wqstats)[index];</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static u32 enic_get_msglevel(struct net_device *netdev)</div><div class='hunk'>@@ -299,7 +369,9 @@ static void enic_set_msglevel(struct net_device *netdev, u32 value)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int enic_get_coalesce(struct net_device *netdev,</div><div class='del'>-	struct ethtool_coalesce *ecmd)</div><div class='add'>+			     struct ethtool_coalesce *ecmd,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	struct enic_rx_coal *rxcoal = &amp;enic-&gt;rx_coalesce_setting;</div><div class='hunk'>@@ -324,25 +396,6 @@ static int enic_coalesce_valid(struct enic *enic,</div><div class='ctx'> 	u32 rx_coalesce_usecs_low = min_t(u32, coalesce_usecs_max,</div><div class='ctx'> 					  ec-&gt;rx_coalesce_usecs_low);</div><div class='ctx'> </div><div class='del'>-	if (ec-&gt;rx_max_coalesced_frames		||</div><div class='del'>-	    ec-&gt;rx_coalesce_usecs_irq		||</div><div class='del'>-	    ec-&gt;rx_max_coalesced_frames_irq	||</div><div class='del'>-	    ec-&gt;tx_max_coalesced_frames		||</div><div class='del'>-	    ec-&gt;tx_coalesce_usecs_irq		||</div><div class='del'>-	    ec-&gt;tx_max_coalesced_frames_irq	||</div><div class='del'>-	    ec-&gt;stats_block_coalesce_usecs	||</div><div class='del'>-	    ec-&gt;use_adaptive_tx_coalesce	||</div><div class='del'>-	    ec-&gt;pkt_rate_low			||</div><div class='del'>-	    ec-&gt;rx_max_coalesced_frames_low	||</div><div class='del'>-	    ec-&gt;tx_coalesce_usecs_low		||</div><div class='del'>-	    ec-&gt;tx_max_coalesced_frames_low	||</div><div class='del'>-	    ec-&gt;pkt_rate_high			||</div><div class='del'>-	    ec-&gt;rx_max_coalesced_frames_high	||</div><div class='del'>-	    ec-&gt;tx_coalesce_usecs_high		||</div><div class='del'>-	    ec-&gt;tx_max_coalesced_frames_high	||</div><div class='del'>-	    ec-&gt;rate_sample_interval)</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='ctx'> 	if ((vnic_dev_get_intr_mode(enic-&gt;vdev) != VNIC_DEV_INTR_MODE_MSIX) &amp;&amp;</div><div class='ctx'> 	    ec-&gt;tx_coalesce_usecs)</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -363,7 +416,9 @@ static int enic_coalesce_valid(struct enic *enic,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int enic_set_coalesce(struct net_device *netdev,</div><div class='del'>-	struct ethtool_coalesce *ecmd)</div><div class='add'>+			     struct ethtool_coalesce *ecmd,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	u32 tx_coalesce_usecs;</div><div class='hunk'>@@ -454,7 +509,6 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='del'>-		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	fsp-&gt;h_u.tcp_ip4_spec.ip4src = flow_get_u32_src(&amp;n-&gt;keys);</div><div class='hunk'>@@ -474,8 +528,10 @@ static int enic_grxclsrule(struct enic *enic, struct ethtool_rxnfc *cmd)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int enic_get_rx_flow_hash(struct enic *enic, struct ethtool_rxnfc *cmd)</div><div class='add'>+static int enic_get_rx_flow_hash(struct net_device *dev,</div><div class='add'>+				 struct ethtool_rxfh_fields *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct enic *enic = netdev_priv(dev);</div><div class='ctx'> 	u8 rss_hash_type = 0;</div><div class='ctx'> 	cmd-&gt;data = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -543,9 +599,6 @@ static int enic_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 		ret = enic_grxclsrule(enic, cmd);</div><div class='ctx'> 		spin_unlock_bh(&amp;enic-&gt;rfs_h.lock);</div><div class='ctx'> 		break;</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		ret = enic_get_rx_flow_hash(enic, cmd);</div><div class='del'>-		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		ret = -EOPNOTSUPP;</div><div class='ctx'> 		break;</div><div class='hunk'>@@ -554,88 +607,76 @@ static int enic_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int enic_get_tunable(struct net_device *dev,</div><div class='del'>-			    const struct ethtool_tunable *tuna, void *data)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = netdev_priv(dev);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (tuna-&gt;id) {</div><div class='del'>-	case ETHTOOL_RX_COPYBREAK:</div><div class='del'>-		*(u32 *)data = enic-&gt;rx_copybreak;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int enic_set_tunable(struct net_device *dev,</div><div class='del'>-			    const struct ethtool_tunable *tuna,</div><div class='del'>-			    const void *data)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = netdev_priv(dev);</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (tuna-&gt;id) {</div><div class='del'>-	case ETHTOOL_RX_COPYBREAK:</div><div class='del'>-		enic-&gt;rx_copybreak = *(u32 *)data;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		ret = -EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static u32 enic_get_rxfh_key_size(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	return ENIC_RSS_LEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int enic_get_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey,</div><div class='del'>-			 u8 *hfunc)</div><div class='add'>+static int enic_get_rxfh(struct net_device *netdev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (hkey)</div><div class='del'>-		memcpy(hkey, enic-&gt;rss_key, ENIC_RSS_LEN);</div><div class='add'>+	if (rxfh-&gt;key)</div><div class='add'>+		memcpy(rxfh-&gt;key, enic-&gt;rss_key, ENIC_RSS_LEN);</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int enic_set_rxfh(struct net_device *netdev, const u32 *indir,</div><div class='del'>-			 const u8 *hkey, const u8 hfunc)</div><div class='add'>+static int enic_set_rxfh(struct net_device *netdev,</div><div class='add'>+			 struct ethtool_rxfh_param *rxfh,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if ((hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP) ||</div><div class='del'>-	    indir)</div><div class='add'>+	if (rxfh-&gt;indir ||</div><div class='add'>+	    (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	     rxfh-&gt;hfunc != ETH_RSS_HASH_TOP))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (hkey)</div><div class='del'>-		memcpy(enic-&gt;rss_key, hkey, ENIC_RSS_LEN);</div><div class='add'>+	if (rxfh-&gt;key)</div><div class='add'>+		memcpy(enic-&gt;rss_key, rxfh-&gt;key, ENIC_RSS_LEN);</div><div class='ctx'> </div><div class='ctx'> 	return __enic_set_rsskey(enic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int enic_get_ts_info(struct net_device *netdev,</div><div class='del'>-			    struct ethtool_ts_info *info)</div><div class='add'>+			    struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='del'>-	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='del'>-				SOF_TIMESTAMPING_RX_SOFTWARE |</div><div class='del'>-				SOF_TIMESTAMPING_SOFTWARE;</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void enic_get_channels(struct net_device *netdev,</div><div class='add'>+			      struct ethtool_channels *channels)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		channels-&gt;max_rx = min(enic-&gt;rq_avail, ENIC_RQ_MAX);</div><div class='add'>+		channels-&gt;max_tx = min(enic-&gt;wq_avail, ENIC_WQ_MAX);</div><div class='add'>+		channels-&gt;rx_count = enic-&gt;rq_count;</div><div class='add'>+		channels-&gt;tx_count = enic-&gt;wq_count;</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+		channels-&gt;max_combined = 1;</div><div class='add'>+		channels-&gt;combined_count = 1;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct ethtool_ops enic_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX |</div><div class='add'>+				     ETHTOOL_COALESCE_RX_USECS_LOW |</div><div class='add'>+				     ETHTOOL_COALESCE_RX_USECS_HIGH,</div><div class='ctx'> 	.get_drvinfo = enic_get_drvinfo,</div><div class='ctx'> 	.get_msglevel = enic_get_msglevel,</div><div class='ctx'> 	.set_msglevel = enic_set_msglevel,</div><div class='hunk'>@@ -648,13 +689,13 @@ static const struct ethtool_ops enic_ethtool_ops = {</div><div class='ctx'> 	.get_coalesce = enic_get_coalesce,</div><div class='ctx'> 	.set_coalesce = enic_set_coalesce,</div><div class='ctx'> 	.get_rxnfc = enic_get_rxnfc,</div><div class='del'>-	.get_tunable = enic_get_tunable,</div><div class='del'>-	.set_tunable = enic_set_tunable,</div><div class='ctx'> 	.get_rxfh_key_size = enic_get_rxfh_key_size,</div><div class='ctx'> 	.get_rxfh = enic_get_rxfh,</div><div class='ctx'> 	.set_rxfh = enic_set_rxfh,</div><div class='add'>+	.get_rxfh_fields = enic_get_rx_flow_hash,</div><div class='ctx'> 	.get_link_ksettings = enic_get_ksettings,</div><div class='ctx'> 	.get_ts_info = enic_get_ts_info,</div><div class='add'>+	.get_channels = enic_get_channels,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> void enic_set_ethtool_ops(struct net_device *netdev)</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c<br/>index acb2856936d2..6bc8dfdb3d4b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_main.c</a></div><div class='hunk'>@@ -46,6 +46,7 @@</div><div class='ctx'> #include &lt;linux/crash_dump.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include &lt;net/vxlan.h&gt;</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "cq_enet_desc.h"</div><div class='ctx'> #include "vnic_dev.h"</div><div class='hunk'>@@ -57,18 +58,15 @@</div><div class='ctx'> #include "enic_dev.h"</div><div class='ctx'> #include "enic_pp.h"</div><div class='ctx'> #include "enic_clsf.h"</div><div class='add'>+#include "enic_rq.h"</div><div class='add'>+#include "enic_wq.h"</div><div class='ctx'> </div><div class='ctx'> #define ENIC_NOTIFY_TIMER_PERIOD	(2 * HZ)</div><div class='del'>-#define WQ_ENET_MAX_DESC_LEN		(1 &lt;&lt; WQ_ENET_LEN_BITS)</div><div class='del'>-#define MAX_TSO				(1 &lt;&lt; 16)</div><div class='del'>-#define ENIC_DESC_MAX_SPLITS		(MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1)</div><div class='ctx'> </div><div class='ctx'> #define PCI_DEVICE_ID_CISCO_VIC_ENET         0x0043  /* ethernet vnic */</div><div class='ctx'> #define PCI_DEVICE_ID_CISCO_VIC_ENET_DYN     0x0044  /* enet dynamic vnic */</div><div class='ctx'> #define PCI_DEVICE_ID_CISCO_VIC_ENET_VF      0x0071  /* enet SRIOV VF */</div><div class='ctx'> </div><div class='del'>-#define RX_COPYBREAK_DEFAULT		256</div><div class='del'>-</div><div class='ctx'> /* Supported devices */</div><div class='ctx'> static const struct pci_device_id enic_id_table[] = {</div><div class='ctx'> 	{ PCI_VDEVICE(CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET) },</div><div class='hunk'>@@ -80,7 +78,6 @@ static const struct pci_device_id enic_id_table[] = {</div><div class='ctx'> MODULE_DESCRIPTION(DRV_DESCRIPTION);</div><div class='ctx'> MODULE_AUTHOR("Scott Feldman &lt;scofeldm@cisco.com&gt;");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, enic_id_table);</div><div class='ctx'> </div><div class='ctx'> #define ENIC_LARGE_PKT_THRESHOLD		1000</div><div class='hunk'>@@ -109,7 +106,7 @@ static struct enic_intr_mod_table mod_table[ENIC_MAX_COALESCE_TIMERS + 1] = {</div><div class='ctx'> static struct enic_intr_mod_range mod_range[ENIC_MAX_LINK_SPEEDS] = {</div><div class='ctx'> 	{0,  0}, /* 0  - 4  Gbps */</div><div class='ctx'> 	{0,  3}, /* 4  - 10 Gbps */</div><div class='del'>-	{3,  6}, /* 10 - 40 Gbps */</div><div class='add'>+	{3,  6}, /* 10+ Gbps */</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static void enic_init_affinity_hint(struct enic *enic)</div><div class='hunk'>@@ -151,10 +148,10 @@ static void enic_set_affinity_hint(struct enic *enic)</div><div class='ctx'> 		    !cpumask_available(enic-&gt;msix[i].affinity_mask) ||</div><div class='ctx'> 		    cpumask_empty(enic-&gt;msix[i].affinity_mask))</div><div class='ctx'> 			continue;</div><div class='del'>-		err = irq_set_affinity_hint(enic-&gt;msix_entry[i].vector,</div><div class='del'>-					    enic-&gt;msix[i].affinity_mask);</div><div class='add'>+		err = irq_update_affinity_hint(enic-&gt;msix_entry[i].vector,</div><div class='add'>+					       enic-&gt;msix[i].affinity_mask);</div><div class='ctx'> 		if (err)</div><div class='del'>-			netdev_warn(enic-&gt;netdev, "irq_set_affinity_hint failed, err %d\n",</div><div class='add'>+			netdev_warn(enic-&gt;netdev, "irq_update_affinity_hint failed, err %d\n",</div><div class='ctx'> 				    err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -174,53 +171,21 @@ static void enic_unset_affinity_hint(struct enic *enic)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='del'>-		irq_set_affinity_hint(enic-&gt;msix_entry[i].vector, NULL);</div><div class='add'>+		irq_update_affinity_hint(enic-&gt;msix_entry[i].vector, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enic_udp_tunnel_add(struct net_device *netdev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='add'>+static int enic_udp_tunnel_set_port(struct net_device *netdev,</div><div class='add'>+				    unsigned int table, unsigned int entry,</div><div class='add'>+				    struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='del'>-	__be16 port = ti-&gt;port;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='ctx'> </div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN) {</div><div class='del'>-		netdev_info(netdev, "udp_tnl: only vxlan tunnel offload supported");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (ti-&gt;sa_family) {</div><div class='del'>-	case AF_INET6:</div><div class='del'>-		if (!(enic-&gt;vxlan.flags &amp; ENIC_VXLAN_OUTER_IPV6)) {</div><div class='del'>-			netdev_info(netdev, "vxlan: only IPv4 offload supported");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		/* Fall through */</div><div class='del'>-	case AF_INET:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (enic-&gt;vxlan.vxlan_udp_port_number) {</div><div class='del'>-		if (ntohs(port) == enic-&gt;vxlan.vxlan_udp_port_number)</div><div class='del'>-			netdev_warn(netdev, "vxlan: udp port already offloaded");</div><div class='del'>-		else</div><div class='del'>-			netdev_info(netdev, "vxlan: offload supported for only one UDP port");</div><div class='del'>-</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	if ((vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_WQ) != 1) &amp;&amp;</div><div class='del'>-	    !(enic-&gt;vxlan.flags &amp; ENIC_VXLAN_MULTI_WQ)) {</div><div class='del'>-		netdev_info(netdev, "vxlan: vxlan offload with multi wq not supported on this adapter");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = vnic_dev_overlay_offload_cfg(enic-&gt;vdev,</div><div class='ctx'> 					   OVERLAY_CFG_VXLAN_PORT_UPDATE,</div><div class='del'>-					   ntohs(port));</div><div class='add'>+					   ntohs(ti-&gt;port));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='hunk'>@@ -229,52 +194,50 @@ static void enic_udp_tunnel_add(struct net_device *netdev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto error;</div><div class='ctx'> </div><div class='del'>-	enic-&gt;vxlan.vxlan_udp_port_number = ntohs(port);</div><div class='del'>-</div><div class='del'>-	netdev_info(netdev, "vxlan fw-vers-%d: offload enabled for udp port: %d, sa_family: %d ",</div><div class='del'>-		    (int)enic-&gt;vxlan.patch_level, ntohs(port), ti-&gt;sa_family);</div><div class='del'>-</div><div class='del'>-	goto unlock;</div><div class='del'>-</div><div class='add'>+	enic-&gt;vxlan.vxlan_udp_port_number = ntohs(ti-&gt;port);</div><div class='ctx'> error:</div><div class='del'>-	netdev_info(netdev, "failed to offload udp port: %d, sa_family: %d, type: %d",</div><div class='del'>-		    ntohs(port), ti-&gt;sa_family, ti-&gt;type);</div><div class='del'>-unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enic_udp_tunnel_del(struct net_device *netdev,</div><div class='del'>-				struct udp_tunnel_info *ti)</div><div class='add'>+static int enic_udp_tunnel_unset_port(struct net_device *netdev,</div><div class='add'>+				      unsigned int table, unsigned int entry,</div><div class='add'>+				      struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='ctx'> </div><div class='del'>-	if ((ntohs(ti-&gt;port) != enic-&gt;vxlan.vxlan_udp_port_number) ||</div><div class='del'>-	    ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN) {</div><div class='del'>-		netdev_info(netdev, "udp_tnl: port:%d, sa_family: %d, type: %d not offloaded",</div><div class='del'>-			    ntohs(ti-&gt;port), ti-&gt;sa_family, ti-&gt;type);</div><div class='del'>-		goto unlock;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = vnic_dev_overlay_offload_ctrl(enic-&gt;vdev, OVERLAY_FEATURE_VXLAN,</div><div class='ctx'> 					    OVERLAY_OFFLOAD_DISABLE);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_err(netdev, "vxlan: del offload udp port: %d failed",</div><div class='del'>-			   ntohs(ti-&gt;port));</div><div class='add'>+	if (err)</div><div class='ctx'> 		goto unlock;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='ctx'> 	enic-&gt;vxlan.vxlan_udp_port_number = 0;</div><div class='ctx'> </div><div class='del'>-	netdev_info(netdev, "vxlan: del offload udp port %d, family %d\n",</div><div class='del'>-		    ntohs(ti-&gt;port), ti-&gt;sa_family);</div><div class='del'>-</div><div class='ctx'> unlock:</div><div class='ctx'> 	spin_unlock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct udp_tunnel_nic_info enic_udp_tunnels = {</div><div class='add'>+	.set_port	= enic_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= enic_udp_tunnel_unset_port,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },</div><div class='add'>+	},</div><div class='add'>+}, enic_udp_tunnels_v4 = {</div><div class='add'>+	.set_port	= enic_udp_tunnel_set_port,</div><div class='add'>+	.unset_port	= enic_udp_tunnel_unset_port,</div><div class='add'>+	.flags		= UDP_TUNNEL_NIC_INFO_IPV4_ONLY,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static netdev_features_t enic_features_check(struct sk_buff *skb,</div><div class='ctx'> 					     struct net_device *dev,</div><div class='ctx'> 					     netdev_features_t features)</div><div class='hunk'>@@ -307,7 +270,7 @@ static netdev_features_t enic_features_check(struct sk_buff *skb,</div><div class='ctx'> 	case ntohs(ETH_P_IPV6):</div><div class='ctx'> 		if (!(enic-&gt;vxlan.flags &amp; ENIC_VXLAN_INNER_IPV6))</div><div class='ctx'> 			goto out;</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case ntohs(ETH_P_IP):</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -356,48 +319,6 @@ int enic_is_valid_vf(struct enic *enic, int vf)</div><div class='ctx'> #endif</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = vnic_dev_priv(wq-&gt;vdev);</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;sop)</div><div class='del'>-		pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='del'>-			buf-&gt;len, PCI_DMA_TODEVICE);</div><div class='del'>-	else</div><div class='del'>-		pci_unmap_page(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='del'>-			buf-&gt;len, PCI_DMA_TODEVICE);</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;os_buf)</div><div class='del'>-		dev_kfree_skb_any(buf-&gt;os_buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enic_wq_free_buf(struct vnic_wq *wq,</div><div class='del'>-	struct cq_desc *cq_desc, struct vnic_wq_buf *buf, void *opaque)</div><div class='del'>-{</div><div class='del'>-	enic_free_wq_buf(wq, buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='del'>-	u8 type, u16 q_number, u16 completed_index, void *opaque)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = vnic_dev_priv(vdev);</div><div class='del'>-</div><div class='del'>-	spin_lock(&amp;enic-&gt;wq_lock[q_number]);</div><div class='del'>-</div><div class='del'>-	vnic_wq_service(&amp;enic-&gt;wq[q_number], cq_desc,</div><div class='del'>-		completed_index, enic_wq_free_buf,</div><div class='del'>-		opaque);</div><div class='del'>-</div><div class='del'>-	if (netif_tx_queue_stopped(netdev_get_tx_queue(enic-&gt;netdev, q_number)) &amp;&amp;</div><div class='del'>-	    vnic_wq_desc_avail(&amp;enic-&gt;wq[q_number]) &gt;=</div><div class='del'>-	    (MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS))</div><div class='del'>-		netif_wake_subqueue(enic-&gt;netdev, q_number);</div><div class='del'>-</div><div class='del'>-	spin_unlock(&amp;enic-&gt;wq_lock[q_number]);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool enic_log_q_error(struct enic *enic)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='hunk'>@@ -405,7 +326,7 @@ static bool enic_log_q_error(struct enic *enic)</div><div class='ctx'> 	bool err = false;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='del'>-		error_status = vnic_wq_error_status(&amp;enic-&gt;wq[i]);</div><div class='add'>+		error_status = vnic_wq_error_status(&amp;enic-&gt;wq[i].vwq);</div><div class='ctx'> 		err |= error_status;</div><div class='ctx'> 		if (error_status)</div><div class='ctx'> 			netdev_err(enic-&gt;netdev, "WQ[%d] error_status %d\n",</div><div class='hunk'>@@ -413,7 +334,7 @@ static bool enic_log_q_error(struct enic *enic)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='del'>-		error_status = vnic_rq_error_status(&amp;enic-&gt;rq[i]);</div><div class='add'>+		error_status = vnic_rq_error_status(&amp;enic-&gt;rq[i].vrq);</div><div class='ctx'> 		err |= error_status;</div><div class='ctx'> 		if (error_status)</div><div class='ctx'> 			netdev_err(enic-&gt;netdev, "RQ[%d] error_status %d\n",</div><div class='hunk'>@@ -456,6 +377,36 @@ static void enic_mtu_check(struct enic *enic)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void enic_set_rx_coal_setting(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	unsigned int speed;</div><div class='add'>+	int index = -1;</div><div class='add'>+	struct enic_rx_coal *rx_coal = &amp;enic-&gt;rx_coalesce_setting;</div><div class='add'>+</div><div class='add'>+	/* 1. Read the link speed from fw</div><div class='add'>+	 * 2. Pick the default range for the speed</div><div class='add'>+	 * 3. Update it in enic-&gt;rx_coalesce_setting</div><div class='add'>+	 */</div><div class='add'>+	speed = vnic_dev_port_speed(enic-&gt;vdev);</div><div class='add'>+	if (speed &gt; ENIC_LINK_SPEED_10G)</div><div class='add'>+		index = ENIC_LINK_40G_INDEX;</div><div class='add'>+	else if (speed &gt; ENIC_LINK_SPEED_4G)</div><div class='add'>+		index = ENIC_LINK_10G_INDEX;</div><div class='add'>+	else</div><div class='add'>+		index = ENIC_LINK_4G_INDEX;</div><div class='add'>+</div><div class='add'>+	rx_coal-&gt;small_pkt_range_start = mod_range[index].small_pkt_range_start;</div><div class='add'>+	rx_coal-&gt;large_pkt_range_start = mod_range[index].large_pkt_range_start;</div><div class='add'>+	rx_coal-&gt;range_end = ENIC_RX_COALESCE_RANGE_END;</div><div class='add'>+</div><div class='add'>+	/* Start with the value provided by UCSM */</div><div class='add'>+	for (index = 0; index &lt; enic-&gt;rq_count; index++)</div><div class='add'>+		enic-&gt;cq[index].cur_rx_coal_timeval =</div><div class='add'>+				enic-&gt;config.intr_timer_usec;</div><div class='add'>+</div><div class='add'>+	rx_coal-&gt;use_adaptive_rx_coalesce = 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void enic_link_check(struct enic *enic)</div><div class='ctx'> {</div><div class='ctx'> 	int link_status = vnic_dev_link_status(enic-&gt;vdev);</div><div class='hunk'>@@ -464,6 +415,7 @@ static void enic_link_check(struct enic *enic)</div><div class='ctx'> 	if (link_status &amp;&amp; !carrier_ok) {</div><div class='ctx'> 		netdev_info(enic-&gt;netdev, "Link UP\n");</div><div class='ctx'> 		netif_carrier_on(enic-&gt;netdev);</div><div class='add'>+		enic_set_rx_coal_setting(enic);</div><div class='ctx'> 	} else if (!link_status &amp;&amp; carrier_ok) {</div><div class='ctx'> 		netdev_info(enic-&gt;netdev, "Link DOWN\n");</div><div class='ctx'> 		netif_carrier_off(enic-&gt;netdev);</div><div class='hunk'>@@ -483,9 +435,9 @@ static irqreturn_t enic_isr_legacy(int irq, void *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = data;</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='del'>-	unsigned int io_intr = enic_legacy_io_intr();</div><div class='del'>-	unsigned int err_intr = enic_legacy_err_intr();</div><div class='del'>-	unsigned int notify_intr = enic_legacy_notify_intr();</div><div class='add'>+	unsigned int io_intr = ENIC_LEGACY_IO_INTR;</div><div class='add'>+	unsigned int err_intr = ENIC_LEGACY_ERR_INTR;</div><div class='add'>+	unsigned int notify_intr = ENIC_LEGACY_NOTIFY_INTR;</div><div class='ctx'> 	u32 pba;</div><div class='ctx'> </div><div class='ctx'> 	vnic_intr_mask(&amp;enic-&gt;intr[io_intr]);</div><div class='hunk'>@@ -609,8 +561,8 @@ static int enic_queue_wq_skb_vlan(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	dma_addr = pci_map_single(enic-&gt;pdev, skb-&gt;data, head_len,</div><div class='del'>-				  PCI_DMA_TODEVICE);</div><div class='add'>+	dma_addr = dma_map_single(&amp;enic-&gt;pdev-&gt;dev, skb-&gt;data, head_len,</div><div class='add'>+				  DMA_TO_DEVICE);</div><div class='ctx'> 	if (unlikely(enic_dma_map_check(enic, dma_addr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -625,6 +577,11 @@ static int enic_queue_wq_skb_vlan(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	if (!eop)</div><div class='ctx'> 		err = enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);</div><div class='ctx'> </div><div class='add'>+	/* The enic_queue_wq_desc() above does not do HW checksum */</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.csum_none++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.packets++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.bytes += skb-&gt;len;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -640,8 +597,8 @@ static int enic_queue_wq_skb_csum_l4(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	dma_addr = pci_map_single(enic-&gt;pdev, skb-&gt;data, head_len,</div><div class='del'>-				  PCI_DMA_TODEVICE);</div><div class='add'>+	dma_addr = dma_map_single(&amp;enic-&gt;pdev-&gt;dev, skb-&gt;data, head_len,</div><div class='add'>+				  DMA_TO_DEVICE);</div><div class='ctx'> 	if (unlikely(enic_dma_map_check(enic, dma_addr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -657,6 +614,10 @@ static int enic_queue_wq_skb_csum_l4(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	if (!eop)</div><div class='ctx'> 		err = enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);</div><div class='ctx'> </div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.csum_partial++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.packets++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.bytes += skb-&gt;len;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -696,8 +657,7 @@ static void enic_preload_tcp_csum(struct sk_buff *skb)</div><div class='ctx'> 		tcp_hdr(skb)-&gt;check = ~csum_tcpudp_magic(ip_hdr(skb)-&gt;saddr,</div><div class='ctx'> 			ip_hdr(skb)-&gt;daddr, 0, IPPROTO_TCP, 0);</div><div class='ctx'> 	} else if (skb-&gt;protocol == cpu_to_be16(ETH_P_IPV6)) {</div><div class='del'>-		tcp_hdr(skb)-&gt;check = ~csum_ipv6_magic(&amp;ipv6_hdr(skb)-&gt;saddr,</div><div class='del'>-			&amp;ipv6_hdr(skb)-&gt;daddr, 0, IPPROTO_TCP, 0);</div><div class='add'>+		tcp_v6_gso_csum_prep(skb);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -712,16 +672,18 @@ static int enic_queue_wq_skb_tso(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	unsigned int offset = 0;</div><div class='ctx'> 	unsigned int hdr_len;</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='add'>+	unsigned int pkts;</div><div class='ctx'> 	unsigned int len;</div><div class='ctx'> 	skb_frag_t *frag;</div><div class='ctx'> </div><div class='ctx'> 	if (skb-&gt;encapsulation) {</div><div class='del'>-		hdr_len = skb_inner_transport_header(skb) - skb-&gt;data;</div><div class='del'>-		hdr_len += inner_tcp_hdrlen(skb);</div><div class='add'>+		hdr_len = skb_inner_tcp_all_headers(skb);</div><div class='ctx'> 		enic_preload_tcp_csum_encap(skb);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.encap_tso++;</div><div class='ctx'> 	} else {</div><div class='del'>-		hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		hdr_len = skb_tcp_all_headers(skb);</div><div class='ctx'> 		enic_preload_tcp_csum(skb);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.tso++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Queue WQ_ENET_MAX_DESC_LEN length descriptors</div><div class='hunk'>@@ -729,8 +691,9 @@ static int enic_queue_wq_skb_tso(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	 */</div><div class='ctx'> 	while (frag_len_left) {</div><div class='ctx'> 		len = min(frag_len_left, (unsigned int)WQ_ENET_MAX_DESC_LEN);</div><div class='del'>-		dma_addr = pci_map_single(enic-&gt;pdev, skb-&gt;data + offset, len,</div><div class='del'>-					  PCI_DMA_TODEVICE);</div><div class='add'>+		dma_addr = dma_map_single(&amp;enic-&gt;pdev-&gt;dev,</div><div class='add'>+					  skb-&gt;data + offset, len,</div><div class='add'>+					  DMA_TO_DEVICE);</div><div class='ctx'> 		if (unlikely(enic_dma_map_check(enic, dma_addr)))</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		enic_queue_wq_desc_tso(wq, skb, dma_addr, len, mss, hdr_len,</div><div class='hunk'>@@ -741,7 +704,7 @@ static int enic_queue_wq_skb_tso(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (eop)</div><div class='del'>-		return 0;</div><div class='add'>+		goto tso_out_stats;</div><div class='ctx'> </div><div class='ctx'> 	/* Queue WQ_ENET_MAX_DESC_LEN length descriptors</div><div class='ctx'> 	 * for additional data fragments</div><div class='hunk'>@@ -768,6 +731,15 @@ static int enic_queue_wq_skb_tso(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+tso_out_stats:</div><div class='add'>+	/* calculate how many packets tso sent */</div><div class='add'>+	len = skb-&gt;len - hdr_len;</div><div class='add'>+	pkts = len / mss;</div><div class='add'>+	if ((len % mss) &gt; 0)</div><div class='add'>+		pkts++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.packets += pkts;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.bytes += (len + (pkts * hdr_len));</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -788,8 +760,8 @@ static inline int enic_queue_wq_skb_encap(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	dma_addr_t dma_addr;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	dma_addr = pci_map_single(enic-&gt;pdev, skb-&gt;data, head_len,</div><div class='del'>-				  PCI_DMA_TODEVICE);</div><div class='add'>+	dma_addr = dma_map_single(&amp;enic-&gt;pdev-&gt;dev, skb-&gt;data, head_len,</div><div class='add'>+				  DMA_TO_DEVICE);</div><div class='ctx'> 	if (unlikely(enic_dma_map_check(enic, dma_addr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -800,10 +772,14 @@ static inline int enic_queue_wq_skb_encap(struct enic *enic, struct vnic_wq *wq,</div><div class='ctx'> 	if (!eop)</div><div class='ctx'> 		err = enic_queue_wq_skb_cont(enic, wq, skb, len_left, loopback);</div><div class='ctx'> </div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.encap_csum++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.packets++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.bytes += skb-&gt;len;</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline void enic_queue_wq_skb(struct enic *enic,</div><div class='add'>+static inline int enic_queue_wq_skb(struct enic *enic,</div><div class='ctx'> 	struct vnic_wq *wq, struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='hunk'>@@ -816,6 +792,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,</div><div class='ctx'> 		/* VLAN tag from trunking driver */</div><div class='ctx'> 		vlan_tag_insert = 1;</div><div class='ctx'> 		vlan_tag = skb_vlan_tag_get(skb);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.add_vlan++;</div><div class='ctx'> 	} else if (enic-&gt;loop_enable) {</div><div class='ctx'> 		vlan_tag = enic-&gt;loop_tag;</div><div class='ctx'> 		loopback = 1;</div><div class='hunk'>@@ -828,7 +805,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,</div><div class='ctx'> 	else if (skb-&gt;encapsulation)</div><div class='ctx'> 		err = enic_queue_wq_skb_encap(enic, wq, skb, vlan_tag_insert,</div><div class='ctx'> 					      vlan_tag, loopback);</div><div class='del'>-	else if	(skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='add'>+	else if (skb-&gt;ip_summed == CHECKSUM_PARTIAL)</div><div class='ctx'> 		err = enic_queue_wq_skb_csum_l4(enic, wq, skb, vlan_tag_insert,</div><div class='ctx'> 						vlan_tag, loopback);</div><div class='ctx'> 	else</div><div class='hunk'>@@ -849,6 +826,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,</div><div class='ctx'> 		wq-&gt;to_use = buf-&gt;next;</div><div class='ctx'> 		dev_kfree_skb(skb);</div><div class='ctx'> 	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* netif_tx_lock held, process context with BHs disabled, or BH */</div><div class='hunk'>@@ -860,13 +838,15 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	unsigned int txq_map;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> </div><div class='add'>+	txq_map = skb_get_queue_mapping(skb) % enic-&gt;wq_count;</div><div class='add'>+	wq = &amp;enic-&gt;wq[txq_map].vwq;</div><div class='add'>+</div><div class='ctx'> 	if (skb-&gt;len &lt;= 0) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.null_pkt++;</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	txq_map = skb_get_queue_mapping(skb) % enic-&gt;wq_count;</div><div class='del'>-	wq = &amp;enic-&gt;wq[txq_map];</div><div class='ctx'> 	txq = netdev_get_tx_queue(netdev, txq_map);</div><div class='ctx'> </div><div class='ctx'> 	/* Non-TSO sends must fit within ENIC_NON_TSO_MAX_DESC descs,</div><div class='hunk'>@@ -878,43 +858,52 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	    skb_shinfo(skb)-&gt;nr_frags + 1 &gt; ENIC_NON_TSO_MAX_DESC &amp;&amp;</div><div class='ctx'> 	    skb_linearize(skb)) {</div><div class='ctx'> 		dev_kfree_skb_any(skb);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.skb_linear_fail++;</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;enic-&gt;wq_lock[txq_map]);</div><div class='add'>+	spin_lock(&amp;enic-&gt;wq[txq_map].lock);</div><div class='ctx'> </div><div class='ctx'> 	if (vnic_wq_desc_avail(wq) &lt;</div><div class='ctx'> 	    skb_shinfo(skb)-&gt;nr_frags + ENIC_DESC_MAX_SPLITS) {</div><div class='ctx'> 		netif_tx_stop_queue(txq);</div><div class='ctx'> 		/* This is a hard error, log it */</div><div class='ctx'> 		netdev_err(netdev, "BUG! Tx ring full when queue awake!\n");</div><div class='del'>-		spin_unlock(&amp;enic-&gt;wq_lock[txq_map]);</div><div class='add'>+		spin_unlock(&amp;enic-&gt;wq[txq_map].lock);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.desc_full_awake++;</div><div class='ctx'> 		return NETDEV_TX_BUSY;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	enic_queue_wq_skb(enic, wq, skb);</div><div class='add'>+	if (enic_queue_wq_skb(enic, wq, skb))</div><div class='add'>+		goto error;</div><div class='ctx'> </div><div class='del'>-	if (vnic_wq_desc_avail(wq) &lt; MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS)</div><div class='add'>+	if (vnic_wq_desc_avail(wq) &lt; MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS) {</div><div class='ctx'> 		netif_tx_stop_queue(txq);</div><div class='add'>+		enic-&gt;wq[wq-&gt;index].stats.stopped++;</div><div class='add'>+	}</div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='ctx'> 	if (!netdev_xmit_more() || netif_xmit_stopped(txq))</div><div class='ctx'> 		vnic_wq_doorbell(wq);</div><div class='ctx'> </div><div class='del'>-	spin_unlock(&amp;enic-&gt;wq_lock[txq_map]);</div><div class='add'>+error:</div><div class='add'>+	spin_unlock(&amp;enic-&gt;wq[txq_map].lock);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* dev_base_lock rwlock held, nominally process context */</div><div class='add'>+/* rcu_read_lock potentially held, nominally process context */</div><div class='ctx'> static void enic_get_stats(struct net_device *netdev,</div><div class='ctx'> 			   struct rtnl_link_stats64 *net_stats)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	struct vnic_stats *stats;</div><div class='add'>+	u64 pkt_truncated = 0;</div><div class='add'>+	u64 bad_fcs = 0;</div><div class='ctx'> 	int err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	err = enic_dev_stats_dump(enic, &amp;stats);</div><div class='del'>-	/* return only when pci_zalloc_consistent fails in vnic_dev_stats_dump</div><div class='add'>+	/* return only when dma_alloc_coherent fails in vnic_dev_stats_dump</div><div class='ctx'> 	 * For other failures, like devcmd failure, we return previously</div><div class='ctx'> 	 * recorded stats.</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -930,8 +919,17 @@ static void enic_get_stats(struct net_device *netdev,</div><div class='ctx'> 	net_stats-&gt;rx_bytes = stats-&gt;rx.rx_bytes_ok;</div><div class='ctx'> 	net_stats-&gt;rx_errors = stats-&gt;rx.rx_errors;</div><div class='ctx'> 	net_stats-&gt;multicast = stats-&gt;rx.rx_multicast_frames_ok;</div><div class='del'>-	net_stats-&gt;rx_over_errors = enic-&gt;rq_truncated_pkts;</div><div class='del'>-	net_stats-&gt;rx_crc_errors = enic-&gt;rq_bad_fcs;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		struct enic_rq_stats *rqs = &amp;enic-&gt;rq[i].stats;</div><div class='add'>+</div><div class='add'>+		if (!enic-&gt;rq[i].vrq.ctrl)</div><div class='add'>+			break;</div><div class='add'>+		pkt_truncated += rqs-&gt;pkt_truncated;</div><div class='add'>+		bad_fcs += rqs-&gt;bad_fcs;</div><div class='add'>+	}</div><div class='add'>+	net_stats-&gt;rx_over_errors = pkt_truncated;</div><div class='add'>+	net_stats-&gt;rx_crc_errors = bad_fcs;</div><div class='ctx'> 	net_stats-&gt;rx_dropped = stats-&gt;rx.rx_no_bufs + stats-&gt;rx.rx_drop;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1017,7 +1015,7 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr)</div><div class='ctx'> 			return -EADDRNOTAVAIL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, addr, netdev-&gt;addr_len);</div><div class='add'>+	eth_hw_addr_set(netdev, addr);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1095,7 +1093,7 @@ static void enic_set_rx_mode(struct net_device *netdev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* netif_tx_lock held, BHs disabled */</div><div class='del'>-static void enic_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void enic_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	schedule_work(&amp;enic-&gt;tx_hang_reset);</div><div class='hunk'>@@ -1130,6 +1128,7 @@ static int enic_set_vf_mac(struct net_device *netdev, int vf, u8 *mac)</div><div class='ctx'> static int enic_set_vf_port(struct net_device *netdev, int vf,</div><div class='ctx'> 	struct nlattr *port[])</div><div class='ctx'> {</div><div class='add'>+	static const u8 zero_addr[ETH_ALEN] = {};</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	struct enic_port_profile prev_pp;</div><div class='ctx'> 	struct enic_port_profile *pp;</div><div class='hunk'>@@ -1149,18 +1148,30 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,</div><div class='ctx'> 	pp-&gt;request = nla_get_u8(port[IFLA_PORT_REQUEST]);</div><div class='ctx'> </div><div class='ctx'> 	if (port[IFLA_PORT_PROFILE]) {</div><div class='add'>+		if (nla_len(port[IFLA_PORT_PROFILE]) != PORT_PROFILE_MAX) {</div><div class='add'>+			memcpy(pp, &amp;prev_pp, sizeof(*pp));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		pp-&gt;set |= ENIC_SET_NAME;</div><div class='ctx'> 		memcpy(pp-&gt;name, nla_data(port[IFLA_PORT_PROFILE]),</div><div class='ctx'> 			PORT_PROFILE_MAX);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (port[IFLA_PORT_INSTANCE_UUID]) {</div><div class='add'>+		if (nla_len(port[IFLA_PORT_INSTANCE_UUID]) != PORT_UUID_MAX) {</div><div class='add'>+			memcpy(pp, &amp;prev_pp, sizeof(*pp));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		pp-&gt;set |= ENIC_SET_INSTANCE;</div><div class='ctx'> 		memcpy(pp-&gt;instance_uuid,</div><div class='ctx'> 			nla_data(port[IFLA_PORT_INSTANCE_UUID]), PORT_UUID_MAX);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (port[IFLA_PORT_HOST_UUID]) {</div><div class='add'>+		if (nla_len(port[IFLA_PORT_HOST_UUID]) != PORT_UUID_MAX) {</div><div class='add'>+			memcpy(pp, &amp;prev_pp, sizeof(*pp));</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='ctx'> 		pp-&gt;set |= ENIC_SET_HOST;</div><div class='ctx'> 		memcpy(pp-&gt;host_uuid,</div><div class='ctx'> 			nla_data(port[IFLA_PORT_HOST_UUID]), PORT_UUID_MAX);</div><div class='hunk'>@@ -1194,7 +1205,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,</div><div class='ctx'> 		} else {</div><div class='ctx'> 			memset(pp, 0, sizeof(*pp));</div><div class='ctx'> 			if (vf == PORT_SELF_VF)</div><div class='del'>-				eth_zero_addr(netdev-&gt;dev_addr);</div><div class='add'>+				eth_hw_addr_set(netdev, zero_addr);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* Set flag to indicate that the port assoc/disassoc</div><div class='hunk'>@@ -1206,7 +1217,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf,</div><div class='ctx'> 		if (pp-&gt;request == PORT_REQUEST_DISASSOCIATE) {</div><div class='ctx'> 			eth_zero_addr(pp-&gt;mac_addr);</div><div class='ctx'> 			if (vf == PORT_SELF_VF)</div><div class='del'>-				eth_zero_addr(netdev-&gt;dev_addr);</div><div class='add'>+				eth_hw_addr_set(netdev, zero_addr);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1251,230 +1262,6 @@ nla_put_failure:</div><div class='ctx'> 	return -EMSGSIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='del'>-</div><div class='del'>-	if (!buf-&gt;os_buf)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr,</div><div class='del'>-		buf-&gt;len, PCI_DMA_FROMDEVICE);</div><div class='del'>-	dev_kfree_skb_any(buf-&gt;os_buf);</div><div class='del'>-	buf-&gt;os_buf = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int enic_rq_alloc_buf(struct vnic_rq *rq)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='del'>-	struct net_device *netdev = enic-&gt;netdev;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	unsigned int len = netdev-&gt;mtu + VLAN_ETH_HLEN;</div><div class='del'>-	unsigned int os_buf_index = 0;</div><div class='del'>-	dma_addr_t dma_addr;</div><div class='del'>-	struct vnic_rq_buf *buf = rq-&gt;to_use;</div><div class='del'>-</div><div class='del'>-	if (buf-&gt;os_buf) {</div><div class='del'>-		enic_queue_rq_desc(rq, buf-&gt;os_buf, os_buf_index, buf-&gt;dma_addr,</div><div class='del'>-				   buf-&gt;len);</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	skb = netdev_alloc_skb_ip_align(netdev, len);</div><div class='del'>-	if (!skb)</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-</div><div class='del'>-	dma_addr = pci_map_single(enic-&gt;pdev, skb-&gt;data, len,</div><div class='del'>-				  PCI_DMA_FROMDEVICE);</div><div class='del'>-	if (unlikely(enic_dma_map_check(enic, dma_addr))) {</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	enic_queue_rq_desc(rq, skb, os_buf_index,</div><div class='del'>-		dma_addr, len);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enic_intr_update_pkt_size(struct vnic_rx_bytes_counter *pkt_size,</div><div class='del'>-				      u32 pkt_len)</div><div class='del'>-{</div><div class='del'>-	if (ENIC_LARGE_PKT_THRESHOLD &lt;= pkt_len)</div><div class='del'>-		pkt_size-&gt;large_pkt_bytes_cnt += pkt_len;</div><div class='del'>-	else</div><div class='del'>-		pkt_size-&gt;small_pkt_bytes_cnt += pkt_len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static bool enic_rxcopybreak(struct net_device *netdev, struct sk_buff **skb,</div><div class='del'>-			     struct vnic_rq_buf *buf, u16 len)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = netdev_priv(netdev);</div><div class='del'>-	struct sk_buff *new_skb;</div><div class='del'>-</div><div class='del'>-	if (len &gt; enic-&gt;rx_copybreak)</div><div class='del'>-		return false;</div><div class='del'>-	new_skb = netdev_alloc_skb_ip_align(netdev, len);</div><div class='del'>-	if (!new_skb)</div><div class='del'>-		return false;</div><div class='del'>-	pci_dma_sync_single_for_cpu(enic-&gt;pdev, buf-&gt;dma_addr, len,</div><div class='del'>-				    DMA_FROM_DEVICE);</div><div class='del'>-	memcpy(new_skb-&gt;data, (*skb)-&gt;data, len);</div><div class='del'>-	*skb = new_skb;</div><div class='del'>-</div><div class='del'>-	return true;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enic_rq_indicate_buf(struct vnic_rq *rq,</div><div class='del'>-	struct cq_desc *cq_desc, struct vnic_rq_buf *buf,</div><div class='del'>-	int skipped, void *opaque)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='del'>-	struct net_device *netdev = enic-&gt;netdev;</div><div class='del'>-	struct sk_buff *skb;</div><div class='del'>-	struct vnic_cq *cq = &amp;enic-&gt;cq[enic_cq_rq(enic, rq-&gt;index)];</div><div class='del'>-</div><div class='del'>-	u8 type, color, eop, sop, ingress_port, vlan_stripped;</div><div class='del'>-	u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;</div><div class='del'>-	u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;</div><div class='del'>-	u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;</div><div class='del'>-	u8 packet_error;</div><div class='del'>-	u16 q_number, completed_index, bytes_written, vlan_tci, checksum;</div><div class='del'>-	u32 rss_hash;</div><div class='del'>-	bool outer_csum_ok = true, encap = false;</div><div class='del'>-</div><div class='del'>-	if (skipped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	skb = buf-&gt;os_buf;</div><div class='del'>-</div><div class='del'>-	cq_enet_rq_desc_dec((struct cq_enet_rq_desc *)cq_desc,</div><div class='del'>-		&amp;type, &amp;color, &amp;q_number, &amp;completed_index,</div><div class='del'>-		&amp;ingress_port, &amp;fcoe, &amp;eop, &amp;sop, &amp;rss_type,</div><div class='del'>-		&amp;csum_not_calc, &amp;rss_hash, &amp;bytes_written,</div><div class='del'>-		&amp;packet_error, &amp;vlan_stripped, &amp;vlan_tci, &amp;checksum,</div><div class='del'>-		&amp;fcoe_sof, &amp;fcoe_fc_crc_ok, &amp;fcoe_enc_error,</div><div class='del'>-		&amp;fcoe_eof, &amp;tcp_udp_csum_ok, &amp;udp, &amp;tcp,</div><div class='del'>-		&amp;ipv4_csum_ok, &amp;ipv6, &amp;ipv4, &amp;ipv4_fragment,</div><div class='del'>-		&amp;fcs_ok);</div><div class='del'>-</div><div class='del'>-	if (packet_error) {</div><div class='del'>-</div><div class='del'>-		if (!fcs_ok) {</div><div class='del'>-			if (bytes_written &gt; 0)</div><div class='del'>-				enic-&gt;rq_bad_fcs++;</div><div class='del'>-			else if (bytes_written == 0)</div><div class='del'>-				enic-&gt;rq_truncated_pkts++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr, buf-&gt;len,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		buf-&gt;os_buf = NULL;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eop &amp;&amp; bytes_written &gt; 0) {</div><div class='del'>-</div><div class='del'>-		/* Good receive</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (!enic_rxcopybreak(netdev, &amp;skb, buf, bytes_written)) {</div><div class='del'>-			buf-&gt;os_buf = NULL;</div><div class='del'>-			pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr, buf-&gt;len,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='del'>-		}</div><div class='del'>-		prefetch(skb-&gt;data - NET_IP_ALIGN);</div><div class='del'>-</div><div class='del'>-		skb_put(skb, bytes_written);</div><div class='del'>-		skb-&gt;protocol = eth_type_trans(skb, netdev);</div><div class='del'>-		skb_record_rx_queue(skb, q_number);</div><div class='del'>-		if ((netdev-&gt;features &amp; NETIF_F_RXHASH) &amp;&amp; rss_hash &amp;&amp;</div><div class='del'>-		    (type == 3)) {</div><div class='del'>-			switch (rss_type) {</div><div class='del'>-			case CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv4:</div><div class='del'>-			case CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6:</div><div class='del'>-			case CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6_EX:</div><div class='del'>-				skb_set_hash(skb, rss_hash, PKT_HASH_TYPE_L4);</div><div class='del'>-				break;</div><div class='del'>-			case CQ_ENET_RQ_DESC_RSS_TYPE_IPv4:</div><div class='del'>-			case CQ_ENET_RQ_DESC_RSS_TYPE_IPv6:</div><div class='del'>-			case CQ_ENET_RQ_DESC_RSS_TYPE_IPv6_EX:</div><div class='del'>-				skb_set_hash(skb, rss_hash, PKT_HASH_TYPE_L3);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (enic-&gt;vxlan.vxlan_udp_port_number) {</div><div class='del'>-			switch (enic-&gt;vxlan.patch_level) {</div><div class='del'>-			case 0:</div><div class='del'>-				if (fcoe) {</div><div class='del'>-					encap = true;</div><div class='del'>-					outer_csum_ok = fcoe_fc_crc_ok;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				if ((type == 7) &amp;&amp;</div><div class='del'>-				    (rss_hash &amp; BIT(0))) {</div><div class='del'>-					encap = true;</div><div class='del'>-					outer_csum_ok = (rss_hash &amp; BIT(1)) &amp;&amp;</div><div class='del'>-							(rss_hash &amp; BIT(2));</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Hardware does not provide whole packet checksum. It only</div><div class='del'>-		 * provides pseudo checksum. Since hw validates the packet</div><div class='del'>-		 * checksum but not provide us the checksum value. use</div><div class='del'>-		 * CHECSUM_UNNECESSARY.</div><div class='del'>-		 *</div><div class='del'>-		 * In case of encap pkt tcp_udp_csum_ok/tcp_udp_csum_ok is</div><div class='del'>-		 * inner csum_ok. outer_csum_ok is set by hw when outer udp</div><div class='del'>-		 * csum is correct or is zero.</div><div class='del'>-		 */</div><div class='del'>-		if ((netdev-&gt;features &amp; NETIF_F_RXCSUM) &amp;&amp; !csum_not_calc &amp;&amp;</div><div class='del'>-		    tcp_udp_csum_ok &amp;&amp; outer_csum_ok &amp;&amp;</div><div class='del'>-		    (ipv4_csum_ok || ipv6)) {</div><div class='del'>-			skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='del'>-			skb-&gt;csum_level = encap;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (vlan_stripped)</div><div class='del'>-			__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tci);</div><div class='del'>-</div><div class='del'>-		skb_mark_napi_id(skb, &amp;enic-&gt;napi[rq-&gt;index]);</div><div class='del'>-		if (!(netdev-&gt;features &amp; NETIF_F_GRO))</div><div class='del'>-			netif_receive_skb(skb);</div><div class='del'>-		else</div><div class='del'>-			napi_gro_receive(&amp;enic-&gt;napi[q_number], skb);</div><div class='del'>-		if (enic-&gt;rx_coalesce_setting.use_adaptive_rx_coalesce)</div><div class='del'>-			enic_intr_update_pkt_size(&amp;cq-&gt;pkt_size_counter,</div><div class='del'>-						  bytes_written);</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		/* Buffer overflow</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		pci_unmap_single(enic-&gt;pdev, buf-&gt;dma_addr, buf-&gt;len,</div><div class='del'>-				 PCI_DMA_FROMDEVICE);</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		buf-&gt;os_buf = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int enic_rq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='del'>-	u8 type, u16 q_number, u16 completed_index, void *opaque)</div><div class='del'>-{</div><div class='del'>-	struct enic *enic = vnic_dev_priv(vdev);</div><div class='del'>-</div><div class='del'>-	vnic_rq_service(&amp;enic-&gt;rq[q_number], cq_desc,</div><div class='del'>-		completed_index, VNIC_RQ_RETURN_DESC,</div><div class='del'>-		enic_rq_indicate_buf, opaque);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void enic_set_int_moderation(struct enic *enic, struct vnic_rq *rq)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int intr = enic_msix_rq_intr(enic, rq-&gt;index);</div><div class='hunk'>@@ -1539,18 +1326,16 @@ static int enic_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	unsigned int cq_rq = enic_cq_rq(enic, 0);</div><div class='ctx'> 	unsigned int cq_wq = enic_cq_wq(enic, 0);</div><div class='del'>-	unsigned int intr = enic_legacy_io_intr();</div><div class='add'>+	unsigned int intr = ENIC_LEGACY_IO_INTR;</div><div class='ctx'> 	unsigned int rq_work_to_do = budget;</div><div class='ctx'> 	unsigned int wq_work_to_do = ENIC_WQ_NAPI_BUDGET;</div><div class='ctx'> 	unsigned int  work_done, rq_work_done = 0, wq_work_done;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	wq_work_done = vnic_cq_service(&amp;enic-&gt;cq[cq_wq], wq_work_to_do,</div><div class='del'>-				       enic_wq_service, NULL);</div><div class='add'>+	wq_work_done = enic_wq_cq_service(enic, cq_wq, wq_work_to_do);</div><div class='ctx'> </div><div class='ctx'> 	if (budget &gt; 0)</div><div class='del'>-		rq_work_done = vnic_cq_service(&amp;enic-&gt;cq[cq_rq],</div><div class='del'>-			rq_work_to_do, enic_rq_service, NULL);</div><div class='add'>+		rq_work_done = enic_rq_cq_service(enic, cq_rq, rq_work_to_do);</div><div class='ctx'> </div><div class='ctx'> 	/* Accumulate intr event credits for this polling</div><div class='ctx'> 	 * cycle.  An intr event is the completion of a</div><div class='hunk'>@@ -1565,7 +1350,7 @@ static int enic_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 			0 /* don't unmask intr */,</div><div class='ctx'> 			0 /* don't reset intr timer */);</div><div class='ctx'> </div><div class='del'>-	err = vnic_rq_fill(&amp;enic-&gt;rq[0], enic_rq_alloc_buf);</div><div class='add'>+	err = vnic_rq_fill(&amp;enic-&gt;rq[0].vrq, enic_rq_alloc_buf);</div><div class='ctx'> </div><div class='ctx'> 	/* Buffer allocation failed. Stay in polling</div><div class='ctx'> 	 * mode so we can try to fill the ring again.</div><div class='hunk'>@@ -1577,7 +1362,7 @@ static int enic_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		/* Call the function which refreshes the intr coalescing timer</div><div class='ctx'> 		 * value based on the traffic.</div><div class='ctx'> 		 */</div><div class='del'>-		enic_calc_int_moderation(enic, &amp;enic-&gt;rq[0]);</div><div class='add'>+		enic_calc_int_moderation(enic, &amp;enic-&gt;rq[0].vrq);</div><div class='ctx'> </div><div class='ctx'> 	if ((rq_work_done &lt; budget) &amp;&amp; napi_complete_done(napi, rq_work_done)) {</div><div class='ctx'> </div><div class='hunk'>@@ -1586,8 +1371,11 @@ static int enic_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (enic-&gt;rx_coalesce_setting.use_adaptive_rx_coalesce)</div><div class='del'>-			enic_set_int_moderation(enic, &amp;enic-&gt;rq[0]);</div><div class='add'>+			enic_set_int_moderation(enic, &amp;enic-&gt;rq[0].vrq);</div><div class='ctx'> 		vnic_intr_unmask(&amp;enic-&gt;intr[intr]);</div><div class='add'>+		enic-&gt;rq[0].stats.napi_complete++;</div><div class='add'>+	} else {</div><div class='add'>+		enic-&gt;rq[0].stats.napi_repoll++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return rq_work_done;</div><div class='hunk'>@@ -1636,7 +1424,7 @@ static int enic_poll_msix_wq(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct net_device *netdev = napi-&gt;dev;</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	unsigned int wq_index = (napi - &amp;enic-&gt;napi[0]) - enic-&gt;rq_count;</div><div class='del'>-	struct vnic_wq *wq = &amp;enic-&gt;wq[wq_index];</div><div class='add'>+	struct vnic_wq *wq = &amp;enic-&gt;wq[wq_index].vwq;</div><div class='ctx'> 	unsigned int cq;</div><div class='ctx'> 	unsigned int intr;</div><div class='ctx'> 	unsigned int wq_work_to_do = ENIC_WQ_NAPI_BUDGET;</div><div class='hunk'>@@ -1646,8 +1434,8 @@ static int enic_poll_msix_wq(struct napi_struct *napi, int budget)</div><div class='ctx'> 	wq_irq = wq-&gt;index;</div><div class='ctx'> 	cq = enic_cq_wq(enic, wq_irq);</div><div class='ctx'> 	intr = enic_msix_wq_intr(enic, wq_irq);</div><div class='del'>-	wq_work_done = vnic_cq_service(&amp;enic-&gt;cq[cq], wq_work_to_do,</div><div class='del'>-				       enic_wq_service, NULL);</div><div class='add'>+</div><div class='add'>+	wq_work_done = enic_wq_cq_service(enic, cq, wq_work_to_do);</div><div class='ctx'> </div><div class='ctx'> 	vnic_intr_return_credits(&amp;enic-&gt;intr[intr], wq_work_done,</div><div class='ctx'> 				 0 /* don't unmask intr */,</div><div class='hunk'>@@ -1676,8 +1464,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (budget &gt; 0)</div><div class='del'>-		work_done = vnic_cq_service(&amp;enic-&gt;cq[cq],</div><div class='del'>-			work_to_do, enic_rq_service, NULL);</div><div class='add'>+		work_done = enic_rq_cq_service(enic, cq, work_to_do);</div><div class='ctx'> </div><div class='ctx'> 	/* Return intr event credits for this polling</div><div class='ctx'> 	 * cycle.  An intr event is the completion of a</div><div class='hunk'>@@ -1690,7 +1477,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)</div><div class='ctx'> 			0 /* don't unmask intr */,</div><div class='ctx'> 			0 /* don't reset intr timer */);</div><div class='ctx'> </div><div class='del'>-	err = vnic_rq_fill(&amp;enic-&gt;rq[rq], enic_rq_alloc_buf);</div><div class='add'>+	err = vnic_rq_fill(&amp;enic-&gt;rq[rq].vrq, enic_rq_alloc_buf);</div><div class='ctx'> </div><div class='ctx'> 	/* Buffer allocation failed. Stay in polling mode</div><div class='ctx'> 	 * so we can try to fill the ring again.</div><div class='hunk'>@@ -1702,7 +1489,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)</div><div class='ctx'> 		/* Call the function which refreshes the intr coalescing timer</div><div class='ctx'> 		 * value based on the traffic.</div><div class='ctx'> 		 */</div><div class='del'>-		enic_calc_int_moderation(enic, &amp;enic-&gt;rq[rq]);</div><div class='add'>+		enic_calc_int_moderation(enic, &amp;enic-&gt;rq[rq].vrq);</div><div class='ctx'> </div><div class='ctx'> 	if ((work_done &lt; budget) &amp;&amp; napi_complete_done(napi, work_done)) {</div><div class='ctx'> </div><div class='hunk'>@@ -1711,8 +1498,11 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)</div><div class='ctx'> 		 */</div><div class='ctx'> </div><div class='ctx'> 		if (enic-&gt;rx_coalesce_setting.use_adaptive_rx_coalesce)</div><div class='del'>-			enic_set_int_moderation(enic, &amp;enic-&gt;rq[rq]);</div><div class='add'>+			enic_set_int_moderation(enic, &amp;enic-&gt;rq[rq].vrq);</div><div class='ctx'> 		vnic_intr_unmask(&amp;enic-&gt;intr[intr]);</div><div class='add'>+		enic-&gt;rq[rq].stats.napi_complete++;</div><div class='add'>+	} else {</div><div class='add'>+		enic-&gt;rq[rq].stats.napi_repoll++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='hunk'>@@ -1720,7 +1510,7 @@ static int enic_poll_msix_rq(struct napi_struct *napi, int budget)</div><div class='ctx'> </div><div class='ctx'> static void enic_notify_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct enic *enic = from_timer(enic, t, notify_timer);</div><div class='add'>+	struct enic *enic = timer_container_of(enic, t, notify_timer);</div><div class='ctx'> </div><div class='ctx'> 	enic_notify_check(enic);</div><div class='ctx'> </div><div class='hunk'>@@ -1742,7 +1532,7 @@ static void enic_free_intr(struct enic *enic)</div><div class='ctx'> 		free_irq(enic-&gt;pdev-&gt;irq, enic);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(enic-&gt;msix); i++)</div><div class='add'>+		for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='ctx'> 			if (enic-&gt;msix[i].requested)</div><div class='ctx'> 				free_irq(enic-&gt;msix_entry[i].vector,</div><div class='ctx'> 					enic-&gt;msix[i].devid);</div><div class='hunk'>@@ -1809,7 +1599,7 @@ static int enic_request_intr(struct enic *enic)</div><div class='ctx'> 		enic-&gt;msix[intr].isr = enic_isr_msix_notify;</div><div class='ctx'> 		enic-&gt;msix[intr].devid = enic;</div><div class='ctx'> </div><div class='del'>-		for (i = 0; i &lt; ARRAY_SIZE(enic-&gt;msix); i++)</div><div class='add'>+		for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='ctx'> 			enic-&gt;msix[i].requested = 0;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; enic-&gt;intr_count; i++) {</div><div class='hunk'>@@ -1851,36 +1641,6 @@ static void enic_synchronize_irqs(struct enic *enic)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enic_set_rx_coal_setting(struct enic *enic)</div><div class='del'>-{</div><div class='del'>-	unsigned int speed;</div><div class='del'>-	int index = -1;</div><div class='del'>-	struct enic_rx_coal *rx_coal = &amp;enic-&gt;rx_coalesce_setting;</div><div class='del'>-</div><div class='del'>-	/* 1. Read the link speed from fw</div><div class='del'>-	 * 2. Pick the default range for the speed</div><div class='del'>-	 * 3. Update it in enic-&gt;rx_coalesce_setting</div><div class='del'>-	 */</div><div class='del'>-	speed = vnic_dev_port_speed(enic-&gt;vdev);</div><div class='del'>-	if (ENIC_LINK_SPEED_10G &lt; speed)</div><div class='del'>-		index = ENIC_LINK_40G_INDEX;</div><div class='del'>-	else if (ENIC_LINK_SPEED_4G &lt; speed)</div><div class='del'>-		index = ENIC_LINK_10G_INDEX;</div><div class='del'>-	else</div><div class='del'>-		index = ENIC_LINK_4G_INDEX;</div><div class='del'>-</div><div class='del'>-	rx_coal-&gt;small_pkt_range_start = mod_range[index].small_pkt_range_start;</div><div class='del'>-	rx_coal-&gt;large_pkt_range_start = mod_range[index].large_pkt_range_start;</div><div class='del'>-	rx_coal-&gt;range_end = ENIC_RX_COALESCE_RANGE_END;</div><div class='del'>-</div><div class='del'>-	/* Start with the value provided by UCSM */</div><div class='del'>-	for (index = 0; index &lt; enic-&gt;rq_count; index++)</div><div class='del'>-		enic-&gt;cq[index].cur_rx_coal_timeval =</div><div class='del'>-				enic-&gt;config.intr_timer_usec;</div><div class='del'>-</div><div class='del'>-	rx_coal-&gt;use_adaptive_rx_coalesce = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int enic_dev_notify_set(struct enic *enic)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1888,8 +1648,7 @@ static int enic_dev_notify_set(struct enic *enic)</div><div class='ctx'> 	spin_lock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='ctx'> 	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_INTX:</div><div class='del'>-		err = vnic_dev_notify_set(enic-&gt;vdev,</div><div class='del'>-			enic_legacy_notify_intr());</div><div class='add'>+		err = vnic_dev_notify_set(enic-&gt;vdev, ENIC_LEGACY_NOTIFY_INTR);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='ctx'> 		err = vnic_dev_notify_set(enic-&gt;vdev,</div><div class='hunk'>@@ -1922,6 +1681,17 @@ static int enic_open(struct net_device *netdev)</div><div class='ctx'> 	struct enic *enic = netdev_priv(netdev);</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err, ret;</div><div class='add'>+	unsigned int max_pkt_len = netdev-&gt;mtu + VLAN_ETH_HLEN;</div><div class='add'>+	struct page_pool_params pp_params = {</div><div class='add'>+		.order = get_order(max_pkt_len),</div><div class='add'>+		.pool_size = enic-&gt;config.rq_desc_count,</div><div class='add'>+		.nid = dev_to_node(&amp;enic-&gt;pdev-&gt;dev),</div><div class='add'>+		.dev = &amp;enic-&gt;pdev-&gt;dev,</div><div class='add'>+		.dma_dir = DMA_FROM_DEVICE,</div><div class='add'>+		.max_len = (max_pkt_len &gt; PAGE_SIZE) ? max_pkt_len : PAGE_SIZE,</div><div class='add'>+		.netdev = netdev,</div><div class='add'>+		.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV,</div><div class='add'>+	};</div><div class='ctx'> </div><div class='ctx'> 	err = enic_request_intr(enic);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1939,11 +1709,21 @@ static int enic_open(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		/* create a page pool for each RQ */</div><div class='add'>+		pp_params.napi = &amp;enic-&gt;napi[i];</div><div class='add'>+		pp_params.queue_idx = i;</div><div class='add'>+		enic-&gt;rq[i].pool = page_pool_create(&amp;pp_params);</div><div class='add'>+		if (IS_ERR(enic-&gt;rq[i].pool)) {</div><div class='add'>+			err = PTR_ERR(enic-&gt;rq[i].pool);</div><div class='add'>+			enic-&gt;rq[i].pool = NULL;</div><div class='add'>+			goto err_out_free_rq;</div><div class='add'>+		}</div><div class='add'>+</div><div class='ctx'> 		/* enable rq before updating rq desc */</div><div class='del'>-		vnic_rq_enable(&amp;enic-&gt;rq[i]);</div><div class='del'>-		vnic_rq_fill(&amp;enic-&gt;rq[i], enic_rq_alloc_buf);</div><div class='add'>+		vnic_rq_enable(&amp;enic-&gt;rq[i].vrq);</div><div class='add'>+		vnic_rq_fill(&amp;enic-&gt;rq[i].vrq, enic_rq_alloc_buf);</div><div class='ctx'> 		/* Need at least one buffer on ring to get going */</div><div class='del'>-		if (vnic_rq_desc_used(&amp;enic-&gt;rq[i]) == 0) {</div><div class='add'>+		if (vnic_rq_desc_used(&amp;enic-&gt;rq[i].vrq) == 0) {</div><div class='ctx'> 			netdev_err(netdev, "Unable to alloc receive buffers\n");</div><div class='ctx'> 			err = -ENOMEM;</div><div class='ctx'> 			goto err_out_free_rq;</div><div class='hunk'>@@ -1951,7 +1731,7 @@ static int enic_open(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='del'>-		vnic_wq_enable(&amp;enic-&gt;wq[i]);</div><div class='add'>+		vnic_wq_enable(&amp;enic-&gt;wq[i].vwq);</div><div class='ctx'> </div><div class='ctx'> 	if (!enic_is_dynamic(enic) &amp;&amp; !enic_is_sriov_vf(enic))</div><div class='ctx'> 		enic_dev_add_station_addr(enic);</div><div class='hunk'>@@ -1978,9 +1758,12 @@ static int enic_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> err_out_free_rq:</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='del'>-		ret = vnic_rq_disable(&amp;enic-&gt;rq[i]);</div><div class='del'>-		if (!ret)</div><div class='del'>-			vnic_rq_clean(&amp;enic-&gt;rq[i], enic_free_rq_buf);</div><div class='add'>+		ret = vnic_rq_disable(&amp;enic-&gt;rq[i].vrq);</div><div class='add'>+		if (!ret) {</div><div class='add'>+			vnic_rq_clean(&amp;enic-&gt;rq[i].vrq, enic_free_rq_buf);</div><div class='add'>+			page_pool_destroy(enic-&gt;rq[i].pool);</div><div class='add'>+			enic-&gt;rq[i].pool = NULL;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> 	enic_dev_notify_unset(enic);</div><div class='ctx'> err_out_free_intr:</div><div class='hunk'>@@ -2004,7 +1787,7 @@ static int enic_stop(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	enic_synchronize_irqs(enic);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;enic-&gt;notify_timer);</div><div class='add'>+	timer_delete_sync(&amp;enic-&gt;notify_timer);</div><div class='ctx'> 	enic_rfs_flw_tbl_free(enic);</div><div class='ctx'> </div><div class='ctx'> 	enic_dev_disable(enic);</div><div class='hunk'>@@ -2013,21 +1796,21 @@ static int enic_stop(struct net_device *netdev)</div><div class='ctx'> 		napi_disable(&amp;enic-&gt;napi[i]);</div><div class='ctx'> </div><div class='ctx'> 	netif_carrier_off(netdev);</div><div class='del'>-	netif_tx_disable(netdev);</div><div class='ctx'> 	if (vnic_dev_get_intr_mode(enic-&gt;vdev) == VNIC_DEV_INTR_MODE_MSIX)</div><div class='ctx'> 		for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='ctx'> 			napi_disable(&amp;enic-&gt;napi[enic_cq_wq(enic, i)]);</div><div class='add'>+	netif_tx_disable(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!enic_is_dynamic(enic) &amp;&amp; !enic_is_sriov_vf(enic))</div><div class='ctx'> 		enic_dev_del_station_addr(enic);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='del'>-		err = vnic_wq_disable(&amp;enic-&gt;wq[i]);</div><div class='add'>+		err = vnic_wq_disable(&amp;enic-&gt;wq[i].vwq);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='del'>-		err = vnic_rq_disable(&amp;enic-&gt;rq[i]);</div><div class='add'>+		err = vnic_rq_disable(&amp;enic-&gt;rq[i].vrq);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2037,9 +1820,12 @@ static int enic_stop(struct net_device *netdev)</div><div class='ctx'> 	enic_free_intr(enic);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='del'>-		vnic_wq_clean(&amp;enic-&gt;wq[i], enic_free_wq_buf);</div><div class='del'>-	for (i = 0; i &lt; enic-&gt;rq_count; i++)</div><div class='del'>-		vnic_rq_clean(&amp;enic-&gt;rq[i], enic_free_rq_buf);</div><div class='add'>+		vnic_wq_clean(&amp;enic-&gt;wq[i].vwq, enic_free_wq_buf);</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='add'>+		vnic_rq_clean(&amp;enic-&gt;rq[i].vrq, enic_free_rq_buf);</div><div class='add'>+		page_pool_destroy(enic-&gt;rq[i].pool);</div><div class='add'>+		enic-&gt;rq[i].pool = NULL;</div><div class='add'>+	}</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;cq_count; i++)</div><div class='ctx'> 		vnic_cq_clean(&amp;enic-&gt;cq[i]);</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='hunk'>@@ -2060,7 +1846,7 @@ static int _enic_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> </div><div class='ctx'> 	if (running) {</div><div class='ctx'> 		err = enic_open(netdev);</div><div class='hunk'>@@ -2078,10 +1864,10 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	if (enic_is_dynamic(enic) || enic_is_sriov_vf(enic))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (netdev-&gt;mtu &gt; enic-&gt;port_mtu)</div><div class='add'>+	if (new_mtu &gt; enic-&gt;port_mtu)</div><div class='ctx'> 		netdev_warn(netdev,</div><div class='ctx'> 			    "interface MTU (%d) set higher than port MTU (%d)\n",</div><div class='del'>-			    netdev-&gt;mtu, enic-&gt;port_mtu);</div><div class='add'>+			    new_mtu, enic-&gt;port_mtu);</div><div class='ctx'> </div><div class='ctx'> 	return _enic_change_mtu(netdev, new_mtu);</div><div class='ctx'> }</div><div class='hunk'>@@ -2142,8 +1928,6 @@ static int enic_dev_wait(struct vnic_dev *vdev,</div><div class='ctx'> 	int done;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	BUG_ON(in_interrupt());</div><div class='del'>-</div><div class='ctx'> 	err = start(vdev, arg);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2214,9 +1998,9 @@ int __enic_set_rsskey(struct enic *enic)</div><div class='ctx'> 	dma_addr_t rss_key_buf_pa;</div><div class='ctx'> 	int i, kidx, bidx, err;</div><div class='ctx'> </div><div class='del'>-	rss_key_buf_va = pci_zalloc_consistent(enic-&gt;pdev,</div><div class='del'>-					       sizeof(union vnic_rss_key),</div><div class='del'>-					       &amp;rss_key_buf_pa);</div><div class='add'>+	rss_key_buf_va = dma_alloc_coherent(&amp;enic-&gt;pdev-&gt;dev,</div><div class='add'>+					    sizeof(union vnic_rss_key),</div><div class='add'>+					    &amp;rss_key_buf_pa, GFP_ATOMIC);</div><div class='ctx'> 	if (!rss_key_buf_va)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2231,8 +2015,8 @@ int __enic_set_rsskey(struct enic *enic)</div><div class='ctx'> 		sizeof(union vnic_rss_key));</div><div class='ctx'> 	spin_unlock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(enic-&gt;pdev, sizeof(union vnic_rss_key),</div><div class='del'>-		rss_key_buf_va, rss_key_buf_pa);</div><div class='add'>+	dma_free_coherent(&amp;enic-&gt;pdev-&gt;dev, sizeof(union vnic_rss_key),</div><div class='add'>+			  rss_key_buf_va, rss_key_buf_pa);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2251,8 +2035,9 @@ static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	rss_cpu_buf_va = pci_alloc_consistent(enic-&gt;pdev,</div><div class='del'>-		sizeof(union vnic_rss_cpu), &amp;rss_cpu_buf_pa);</div><div class='add'>+	rss_cpu_buf_va = dma_alloc_coherent(&amp;enic-&gt;pdev-&gt;dev,</div><div class='add'>+					    sizeof(union vnic_rss_cpu),</div><div class='add'>+					    &amp;rss_cpu_buf_pa, GFP_ATOMIC);</div><div class='ctx'> 	if (!rss_cpu_buf_va)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -2265,8 +2050,8 @@ static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits)</div><div class='ctx'> 		sizeof(union vnic_rss_cpu));</div><div class='ctx'> 	spin_unlock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(enic-&gt;pdev, sizeof(union vnic_rss_cpu),</div><div class='del'>-		rss_cpu_buf_va, rss_cpu_buf_pa);</div><div class='add'>+	dma_free_coherent(&amp;enic-&gt;pdev-&gt;dev, sizeof(union vnic_rss_cpu),</div><div class='add'>+			  rss_cpu_buf_va, rss_cpu_buf_pa);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2331,6 +2116,13 @@ static int enic_set_rss_nic_cfg(struct enic *enic)</div><div class='ctx'> 		rss_hash_bits, rss_base_cpu, rss_enable);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void enic_set_api_busy(struct enic *enic, bool busy)</div><div class='add'>+{</div><div class='add'>+	spin_lock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+	enic-&gt;enic_api_busy = busy;</div><div class='add'>+	spin_unlock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void enic_reset(struct work_struct *work)</div><div class='ctx'> {</div><div class='ctx'> 	struct enic *enic = container_of(work, struct enic, reset);</div><div class='hunk'>@@ -2340,15 +2132,21 @@ static void enic_reset(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+	/* Stop any activity from infiniband */</div><div class='add'>+	enic_set_api_busy(enic, true);</div><div class='add'>+</div><div class='ctx'> 	enic_stop(enic-&gt;netdev);</div><div class='ctx'> 	enic_dev_soft_reset(enic);</div><div class='ctx'> 	enic_reset_addr_lists(enic);</div><div class='ctx'> 	enic_init_vnic_resources(enic);</div><div class='ctx'> 	enic_set_rss_nic_cfg(enic);</div><div class='ctx'> 	enic_dev_set_ig_vlan_rewrite_mode(enic);</div><div class='add'>+	enic_ext_cq(enic);</div><div class='ctx'> 	enic_open(enic-&gt;netdev);</div><div class='del'>-	spin_unlock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+</div><div class='add'>+	/* Allow infiniband to fiddle with the device again */</div><div class='add'>+	enic_set_api_busy(enic, false);</div><div class='add'>+</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_REBOOT, enic-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -2360,7 +2158,9 @@ static void enic_tx_hang_reset(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> </div><div class='del'>-	spin_lock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+	/* Stop any activity from infiniband */</div><div class='add'>+	enic_set_api_busy(enic, true);</div><div class='add'>+</div><div class='ctx'> 	enic_dev_hang_notify(enic);</div><div class='ctx'> 	enic_stop(enic-&gt;netdev);</div><div class='ctx'> 	enic_dev_hang_reset(enic);</div><div class='hunk'>@@ -2368,8 +2168,12 @@ static void enic_tx_hang_reset(struct work_struct *work)</div><div class='ctx'> 	enic_init_vnic_resources(enic);</div><div class='ctx'> 	enic_set_rss_nic_cfg(enic);</div><div class='ctx'> 	enic_dev_set_ig_vlan_rewrite_mode(enic);</div><div class='add'>+	enic_ext_cq(enic);</div><div class='ctx'> 	enic_open(enic-&gt;netdev);</div><div class='del'>-	spin_unlock(&amp;enic-&gt;enic_api_lock);</div><div class='add'>+</div><div class='add'>+	/* Allow infiniband to fiddle with the device again */</div><div class='add'>+	enic_set_api_busy(enic, false);</div><div class='add'>+</div><div class='ctx'> 	call_netdevice_notifiers(NETDEV_REBOOT, enic-&gt;netdev);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_unlock();</div><div class='hunk'>@@ -2377,112 +2181,56 @@ static void enic_tx_hang_reset(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> static int enic_set_intr_mode(struct enic *enic)</div><div class='ctx'> {</div><div class='del'>-	unsigned int n = min_t(unsigned int, enic-&gt;rq_count, ENIC_RQ_MAX);</div><div class='del'>-	unsigned int m = min_t(unsigned int, enic-&gt;wq_count, ENIC_WQ_MAX);</div><div class='ctx'> 	unsigned int i;</div><div class='add'>+	int num_intr;</div><div class='ctx'> </div><div class='ctx'> 	/* Set interrupt mode (INTx, MSI, MSI-X) depending</div><div class='ctx'> 	 * on system capabilities.</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Try MSI-X first</div><div class='del'>-	 *</div><div class='del'>-	 * We need n RQs, m WQs, n+m CQs, and n+m+2 INTRs</div><div class='del'>-	 * (the second to last INTR is used for WQ/RQ errors)</div><div class='del'>-	 * (the last INTR is used for notifications)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	BUG_ON(ARRAY_SIZE(enic-&gt;msix_entry) &lt; n + m + 2);</div><div class='del'>-	for (i = 0; i &lt; n + m + 2; i++)</div><div class='del'>-		enic-&gt;msix_entry[i].entry = i;</div><div class='del'>-</div><div class='del'>-	/* Use multiple RQs if RSS is enabled</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (ENIC_SETTING(enic, RSS) &amp;&amp;</div><div class='del'>-	    enic-&gt;config.intr_mode &lt; 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;rq_count &gt;= n &amp;&amp;</div><div class='del'>-	    enic-&gt;wq_count &gt;= m &amp;&amp;</div><div class='del'>-	    enic-&gt;cq_count &gt;= n + m &amp;&amp;</div><div class='del'>-	    enic-&gt;intr_count &gt;= n + m + 2) {</div><div class='del'>-</div><div class='del'>-		if (pci_enable_msix_range(enic-&gt;pdev, enic-&gt;msix_entry,</div><div class='del'>-					  n + m + 2, n + m + 2) &gt; 0) {</div><div class='del'>-</div><div class='del'>-			enic-&gt;rq_count = n;</div><div class='del'>-			enic-&gt;wq_count = m;</div><div class='del'>-			enic-&gt;cq_count = n + m;</div><div class='del'>-			enic-&gt;intr_count = n + m + 2;</div><div class='del'>-</div><div class='del'>-			vnic_dev_set_intr_mode(enic-&gt;vdev,</div><div class='del'>-				VNIC_DEV_INTR_MODE_MSIX);</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	if (enic-&gt;config.intr_mode &lt; 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;rq_count &gt;= 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;wq_count &gt;= m &amp;&amp;</div><div class='del'>-	    enic-&gt;cq_count &gt;= 1 + m &amp;&amp;</div><div class='del'>-	    enic-&gt;intr_count &gt;= 1 + m + 2) {</div><div class='del'>-		if (pci_enable_msix_range(enic-&gt;pdev, enic-&gt;msix_entry,</div><div class='del'>-					  1 + m + 2, 1 + m + 2) &gt; 0) {</div><div class='del'>-</div><div class='del'>-			enic-&gt;rq_count = 1;</div><div class='del'>-			enic-&gt;wq_count = m;</div><div class='del'>-			enic-&gt;cq_count = 1 + m;</div><div class='del'>-			enic-&gt;intr_count = 1 + m + 2;</div><div class='del'>-</div><div class='add'>+	    enic-&gt;intr_avail &gt;= ENIC_MSIX_MIN_INTR) {</div><div class='add'>+		for (i = 0; i &lt; enic-&gt;intr_avail; i++)</div><div class='add'>+			enic-&gt;msix_entry[i].entry = i;</div><div class='add'>+</div><div class='add'>+		num_intr = pci_enable_msix_range(enic-&gt;pdev, enic-&gt;msix_entry,</div><div class='add'>+						 ENIC_MSIX_MIN_INTR,</div><div class='add'>+						 enic-&gt;intr_avail);</div><div class='add'>+		if (num_intr &gt; 0) {</div><div class='ctx'> 			vnic_dev_set_intr_mode(enic-&gt;vdev,</div><div class='del'>-				VNIC_DEV_INTR_MODE_MSIX);</div><div class='del'>-</div><div class='add'>+					       VNIC_DEV_INTR_MODE_MSIX);</div><div class='add'>+			enic-&gt;intr_avail = num_intr;</div><div class='ctx'> 			return 0;</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Next try MSI</div><div class='ctx'> 	 *</div><div class='del'>-	 * We need 1 RQ, 1 WQ, 2 CQs, and 1 INTR</div><div class='add'>+	 * We need 1 INTR</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (enic-&gt;config.intr_mode &lt; 2 &amp;&amp;</div><div class='del'>-	    enic-&gt;rq_count &gt;= 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;wq_count &gt;= 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;cq_count &gt;= 2 &amp;&amp;</div><div class='del'>-	    enic-&gt;intr_count &gt;= 1 &amp;&amp;</div><div class='add'>+	    enic-&gt;intr_avail &gt;= 1 &amp;&amp;</div><div class='ctx'> 	    !pci_enable_msi(enic-&gt;pdev)) {</div><div class='del'>-</div><div class='del'>-		enic-&gt;rq_count = 1;</div><div class='del'>-		enic-&gt;wq_count = 1;</div><div class='del'>-		enic-&gt;cq_count = 2;</div><div class='del'>-		enic-&gt;intr_count = 1;</div><div class='del'>-</div><div class='add'>+		enic-&gt;intr_avail = 1;</div><div class='ctx'> 		vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_MSI);</div><div class='del'>-</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Next try INTx</div><div class='ctx'> 	 *</div><div class='del'>-	 * We need 1 RQ, 1 WQ, 2 CQs, and 3 INTRs</div><div class='add'>+	 * We need 3 INTRs</div><div class='ctx'> 	 * (the first INTR is used for WQ/RQ)</div><div class='ctx'> 	 * (the second INTR is used for WQ/RQ errors)</div><div class='ctx'> 	 * (the last INTR is used for notifications)</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	if (enic-&gt;config.intr_mode &lt; 3 &amp;&amp;</div><div class='del'>-	    enic-&gt;rq_count &gt;= 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;wq_count &gt;= 1 &amp;&amp;</div><div class='del'>-	    enic-&gt;cq_count &gt;= 2 &amp;&amp;</div><div class='del'>-	    enic-&gt;intr_count &gt;= 3) {</div><div class='del'>-</div><div class='del'>-		enic-&gt;rq_count = 1;</div><div class='del'>-		enic-&gt;wq_count = 1;</div><div class='del'>-		enic-&gt;cq_count = 2;</div><div class='del'>-		enic-&gt;intr_count = 3;</div><div class='del'>-</div><div class='add'>+	    enic-&gt;intr_avail &gt;= 3) {</div><div class='add'>+		enic-&gt;intr_avail = 3;</div><div class='ctx'> 		vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_INTX);</div><div class='del'>-</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2507,6 +2255,127 @@ static void enic_clear_intr_mode(struct enic *enic)</div><div class='ctx'> 	vnic_dev_set_intr_mode(enic-&gt;vdev, VNIC_DEV_INTR_MODE_UNKNOWN);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int enic_adjust_resources(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	unsigned int max_queues;</div><div class='add'>+	unsigned int rq_default;</div><div class='add'>+	unsigned int rq_avail;</div><div class='add'>+	unsigned int wq_avail;</div><div class='add'>+</div><div class='add'>+	if (enic-&gt;rq_avail &lt; 1 || enic-&gt;wq_avail &lt; 1 || enic-&gt;cq_avail &lt; 2) {</div><div class='add'>+		dev_err(enic_get_dev(enic),</div><div class='add'>+			"Not enough resources available rq: %d wq: %d cq: %d\n",</div><div class='add'>+			enic-&gt;rq_avail, enic-&gt;wq_avail,</div><div class='add'>+			enic-&gt;cq_avail);</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (is_kdump_kernel()) {</div><div class='add'>+		dev_info(enic_get_dev(enic), "Running from within kdump kernel. Using minimal resources\n");</div><div class='add'>+		enic-&gt;rq_avail = 1;</div><div class='add'>+		enic-&gt;wq_avail = 1;</div><div class='add'>+		enic-&gt;config.rq_desc_count = ENIC_MIN_RQ_DESCS;</div><div class='add'>+		enic-&gt;config.wq_desc_count = ENIC_MIN_WQ_DESCS;</div><div class='add'>+		enic-&gt;config.mtu = min_t(u16, 1500, enic-&gt;config.mtu);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if RSS isn't set, then we can only use one RQ */</div><div class='add'>+	if (!ENIC_SETTING(enic, RSS))</div><div class='add'>+		enic-&gt;rq_avail = 1;</div><div class='add'>+</div><div class='add'>+	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='add'>+	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSI:</div><div class='add'>+		enic-&gt;rq_count = 1;</div><div class='add'>+		enic-&gt;wq_count = 1;</div><div class='add'>+		enic-&gt;cq_count = 2;</div><div class='add'>+		enic-&gt;intr_count = enic-&gt;intr_avail;</div><div class='add'>+		break;</div><div class='add'>+	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='add'>+		/* Adjust the number of wqs/rqs/cqs/interrupts that will be</div><div class='add'>+		 * used based on which resource is the most constrained</div><div class='add'>+		 */</div><div class='add'>+		wq_avail = min(enic-&gt;wq_avail, ENIC_WQ_MAX);</div><div class='add'>+		rq_default = max(netif_get_num_default_rss_queues(),</div><div class='add'>+				 ENIC_RQ_MIN_DEFAULT);</div><div class='add'>+		rq_avail = min3(enic-&gt;rq_avail, ENIC_RQ_MAX, rq_default);</div><div class='add'>+		max_queues = min(enic-&gt;cq_avail,</div><div class='add'>+				 enic-&gt;intr_avail - ENIC_MSIX_RESERVED_INTR);</div><div class='add'>+		if (wq_avail + rq_avail &lt;= max_queues) {</div><div class='add'>+			enic-&gt;rq_count = rq_avail;</div><div class='add'>+			enic-&gt;wq_count = wq_avail;</div><div class='add'>+		} else {</div><div class='add'>+			/* recalculate wq/rq count */</div><div class='add'>+			if (rq_avail &lt; wq_avail) {</div><div class='add'>+				enic-&gt;rq_count = min(rq_avail, max_queues / 2);</div><div class='add'>+				enic-&gt;wq_count = max_queues - enic-&gt;rq_count;</div><div class='add'>+			} else {</div><div class='add'>+				enic-&gt;wq_count = min(wq_avail, max_queues / 2);</div><div class='add'>+				enic-&gt;rq_count = max_queues - enic-&gt;wq_count;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		enic-&gt;cq_count = enic-&gt;rq_count + enic-&gt;wq_count;</div><div class='add'>+		enic-&gt;intr_count = enic-&gt;cq_count + ENIC_MSIX_RESERVED_INTR;</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(enic_get_dev(enic), "Unknown interrupt mode\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_get_queue_stats_rx(struct net_device *dev, int idx,</div><div class='add'>+				    struct netdev_queue_stats_rx *rxs)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(dev);</div><div class='add'>+	struct enic_rq_stats *rqstats = &amp;enic-&gt;rq[idx].stats;</div><div class='add'>+</div><div class='add'>+	rxs-&gt;bytes = rqstats-&gt;bytes;</div><div class='add'>+	rxs-&gt;packets = rqstats-&gt;packets;</div><div class='add'>+	rxs-&gt;hw_drops = rqstats-&gt;bad_fcs + rqstats-&gt;pkt_truncated;</div><div class='add'>+	rxs-&gt;hw_drop_overruns = rqstats-&gt;pkt_truncated;</div><div class='add'>+	rxs-&gt;csum_unnecessary = rqstats-&gt;csum_unnecessary +</div><div class='add'>+				rqstats-&gt;csum_unnecessary_encap;</div><div class='add'>+	rxs-&gt;alloc_fail = rqstats-&gt;pp_alloc_fail;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_get_queue_stats_tx(struct net_device *dev, int idx,</div><div class='add'>+				    struct netdev_queue_stats_tx *txs)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = netdev_priv(dev);</div><div class='add'>+	struct enic_wq_stats *wqstats = &amp;enic-&gt;wq[idx].stats;</div><div class='add'>+</div><div class='add'>+	txs-&gt;bytes = wqstats-&gt;bytes;</div><div class='add'>+	txs-&gt;packets = wqstats-&gt;packets;</div><div class='add'>+	txs-&gt;csum_none = wqstats-&gt;csum_none;</div><div class='add'>+	txs-&gt;needs_csum = wqstats-&gt;csum_partial + wqstats-&gt;encap_csum +</div><div class='add'>+			  wqstats-&gt;tso;</div><div class='add'>+	txs-&gt;hw_gso_packets = wqstats-&gt;tso;</div><div class='add'>+	txs-&gt;stop = wqstats-&gt;stopped;</div><div class='add'>+	txs-&gt;wake = wqstats-&gt;wake;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_get_base_stats(struct net_device *dev,</div><div class='add'>+				struct netdev_queue_stats_rx *rxs,</div><div class='add'>+				struct netdev_queue_stats_tx *txs)</div><div class='add'>+{</div><div class='add'>+	rxs-&gt;bytes = 0;</div><div class='add'>+	rxs-&gt;packets = 0;</div><div class='add'>+	rxs-&gt;hw_drops = 0;</div><div class='add'>+	rxs-&gt;hw_drop_overruns = 0;</div><div class='add'>+	rxs-&gt;csum_unnecessary = 0;</div><div class='add'>+	rxs-&gt;alloc_fail = 0;</div><div class='add'>+	txs-&gt;bytes = 0;</div><div class='add'>+	txs-&gt;packets = 0;</div><div class='add'>+	txs-&gt;csum_none = 0;</div><div class='add'>+	txs-&gt;needs_csum = 0;</div><div class='add'>+	txs-&gt;hw_gso_packets = 0;</div><div class='add'>+	txs-&gt;stop = 0;</div><div class='add'>+	txs-&gt;wake = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops enic_netdev_dynamic_ops = {</div><div class='ctx'> 	.ndo_open		= enic_open,</div><div class='ctx'> 	.ndo_stop		= enic_stop,</div><div class='hunk'>@@ -2528,8 +2397,6 @@ static const struct net_device_ops enic_netdev_dynamic_ops = {</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	.ndo_rx_flow_steer	= enic_rx_flow_steer,</div><div class='ctx'> #endif</div><div class='del'>-	.ndo_udp_tunnel_add	= enic_udp_tunnel_add,</div><div class='del'>-	.ndo_udp_tunnel_del	= enic_udp_tunnel_del,</div><div class='ctx'> 	.ndo_features_check	= enic_features_check,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -2554,38 +2421,98 @@ static const struct net_device_ops enic_netdev_ops = {</div><div class='ctx'> #ifdef CONFIG_RFS_ACCEL</div><div class='ctx'> 	.ndo_rx_flow_steer	= enic_rx_flow_steer,</div><div class='ctx'> #endif</div><div class='del'>-	.ndo_udp_tunnel_add	= enic_udp_tunnel_add,</div><div class='del'>-	.ndo_udp_tunnel_del	= enic_udp_tunnel_del,</div><div class='ctx'> 	.ndo_features_check	= enic_features_check,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static const struct netdev_stat_ops enic_netdev_stat_ops = {</div><div class='add'>+	.get_queue_stats_rx	= enic_get_queue_stats_rx,</div><div class='add'>+	.get_queue_stats_tx	= enic_get_queue_stats_tx,</div><div class='add'>+	.get_base_stats		= enic_get_base_stats,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void enic_free_enic_resources(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	kfree(enic-&gt;wq);</div><div class='add'>+	enic-&gt;wq = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(enic-&gt;rq);</div><div class='add'>+	enic-&gt;rq = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(enic-&gt;cq);</div><div class='add'>+	enic-&gt;cq = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(enic-&gt;napi);</div><div class='add'>+	enic-&gt;napi = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(enic-&gt;msix_entry);</div><div class='add'>+	enic-&gt;msix_entry = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(enic-&gt;msix);</div><div class='add'>+	enic-&gt;msix = NULL;</div><div class='add'>+</div><div class='add'>+	kfree(enic-&gt;intr);</div><div class='add'>+	enic-&gt;intr = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int enic_alloc_enic_resources(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	enic-&gt;wq = kcalloc(enic-&gt;wq_avail, sizeof(struct enic_wq), GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;wq)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	enic-&gt;rq = kcalloc(enic-&gt;rq_avail, sizeof(struct enic_rq), GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;rq)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	enic-&gt;cq = kcalloc(enic-&gt;cq_avail, sizeof(struct vnic_cq), GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;cq)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	enic-&gt;napi = kcalloc(enic-&gt;wq_avail + enic-&gt;rq_avail,</div><div class='add'>+			     sizeof(struct napi_struct), GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;napi)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	enic-&gt;msix_entry = kcalloc(enic-&gt;intr_avail, sizeof(struct msix_entry),</div><div class='add'>+				   GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;msix_entry)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	enic-&gt;msix = kcalloc(enic-&gt;intr_avail, sizeof(struct enic_msix_entry),</div><div class='add'>+			     GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;msix)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	enic-&gt;intr = kcalloc(enic-&gt;intr_avail, sizeof(struct vnic_intr),</div><div class='add'>+			     GFP_KERNEL);</div><div class='add'>+	if (!enic-&gt;intr)</div><div class='add'>+		goto free_queues;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_queues:</div><div class='add'>+	enic_free_enic_resources(enic);</div><div class='add'>+	return -ENOMEM;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void enic_dev_deinit(struct enic *enic)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='del'>-		napi_hash_del(&amp;enic-&gt;napi[i]);</div><div class='del'>-		netif_napi_del(&amp;enic-&gt;napi[i]);</div><div class='del'>-	}</div><div class='add'>+	for (i = 0; i &lt; enic-&gt;rq_count; i++)</div><div class='add'>+		__netif_napi_del(&amp;enic-&gt;napi[i]);</div><div class='add'>+</div><div class='ctx'> 	if (vnic_dev_get_intr_mode(enic-&gt;vdev) == VNIC_DEV_INTR_MODE_MSIX)</div><div class='ctx'> 		for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='del'>-			netif_napi_del(&amp;enic-&gt;napi[enic_cq_wq(enic, i)]);</div><div class='add'>+			__netif_napi_del(&amp;enic-&gt;napi[enic_cq_wq(enic, i)]);</div><div class='add'>+</div><div class='add'>+	/* observe RCU grace period after __netif_napi_del() calls */</div><div class='add'>+	synchronize_net();</div><div class='ctx'> </div><div class='ctx'> 	enic_free_vnic_resources(enic);</div><div class='ctx'> 	enic_clear_intr_mode(enic);</div><div class='ctx'> 	enic_free_affinity_hint(enic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void enic_kdump_kernel_config(struct enic *enic)</div><div class='del'>-{</div><div class='del'>-	if (is_kdump_kernel()) {</div><div class='del'>-		dev_info(enic_get_dev(enic), "Running from within kdump kernel. Using minimal resources\n");</div><div class='del'>-		enic-&gt;rq_count = 1;</div><div class='del'>-		enic-&gt;wq_count = 1;</div><div class='del'>-		enic-&gt;config.rq_desc_count = ENIC_MIN_RQ_DESCS;</div><div class='del'>-		enic-&gt;config.wq_desc_count = ENIC_MIN_WQ_DESCS;</div><div class='del'>-		enic-&gt;config.mtu = min_t(u16, 1500, enic-&gt;config.mtu);</div><div class='del'>-	}</div><div class='add'>+	enic_free_enic_resources(enic);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int enic_dev_init(struct enic *enic)</div><div class='hunk'>@@ -2617,19 +2544,28 @@ static int enic_dev_init(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> 	enic_get_res_counts(enic);</div><div class='ctx'> </div><div class='del'>-	/* modify resource count if we are in kdump_kernel</div><div class='del'>-	 */</div><div class='del'>-	enic_kdump_kernel_config(enic);</div><div class='add'>+	enic_ext_cq(enic);</div><div class='ctx'> </div><div class='del'>-	/* Set interrupt mode based on resource counts and system</div><div class='del'>-	 * capabilities</div><div class='del'>-	 */</div><div class='add'>+	err = enic_alloc_enic_resources(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to allocate enic resources\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Set interrupt mode based on system capabilities */</div><div class='ctx'> </div><div class='ctx'> 	err = enic_set_intr_mode(enic);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "Failed to set intr mode based on resource "</div><div class='ctx'> 			"counts and system capabilities, aborting\n");</div><div class='del'>-		return err;</div><div class='add'>+		goto err_out_free_vnic_resources;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Adjust resource counts based on most constrained resources */</div><div class='add'>+	err = enic_adjust_resources(enic);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Failed to adjust resources\n");</div><div class='add'>+		goto err_out_free_vnic_resources;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate and configure vNIC resources</div><div class='hunk'>@@ -2651,16 +2587,17 @@ static int enic_dev_init(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> 	switch (vnic_dev_get_intr_mode(enic-&gt;vdev)) {</div><div class='ctx'> 	default:</div><div class='del'>-		netif_napi_add(netdev, &amp;enic-&gt;napi[0], enic_poll, 64);</div><div class='add'>+		netif_napi_add(netdev, &amp;enic-&gt;napi[0], enic_poll);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='ctx'> 		for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='ctx'> 			netif_napi_add(netdev, &amp;enic-&gt;napi[i],</div><div class='del'>-				enic_poll_msix_rq, NAPI_POLL_WEIGHT);</div><div class='add'>+				       enic_poll_msix_rq);</div><div class='ctx'> 		}</div><div class='ctx'> 		for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='del'>-			netif_napi_add(netdev, &amp;enic-&gt;napi[enic_cq_wq(enic, i)],</div><div class='del'>-				       enic_poll_msix_wq, NAPI_POLL_WEIGHT);</div><div class='add'>+			netif_napi_add(netdev,</div><div class='add'>+				       &amp;enic-&gt;napi[enic_cq_wq(enic, i)],</div><div class='add'>+				       enic_poll_msix_wq);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2670,6 +2607,7 @@ err_out_free_vnic_resources:</div><div class='ctx'> 	enic_free_affinity_hint(enic);</div><div class='ctx'> 	enic_clear_intr_mode(enic);</div><div class='ctx'> 	enic_free_vnic_resources(enic);</div><div class='add'>+	enic_free_enic_resources(enic);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2735,26 +2673,14 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 * fail to 32-bit.</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(47));</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(47));</div><div class='ctx'> 	if (err) {</div><div class='del'>-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='add'>+		err = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 		if (err) {</div><div class='ctx'> 			dev_err(dev, "No usable DMA configuration, aborting\n");</div><div class='ctx'> 			goto err_out_release_regions;</div><div class='ctx'> 		}</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "Unable to obtain %u-bit DMA "</div><div class='del'>-				"for consistent allocations, aborting\n", 32);</div><div class='del'>-			goto err_out_release_regions;</div><div class='del'>-		}</div><div class='ctx'> 	} else {</div><div class='del'>-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(47));</div><div class='del'>-		if (err) {</div><div class='del'>-			dev_err(dev, "Unable to obtain %u-bit DMA "</div><div class='del'>-				"for consistent allocations, aborting\n", 47);</div><div class='del'>-			goto err_out_release_regions;</div><div class='del'>-		}</div><div class='ctx'> 		using_dac = 1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2881,13 +2807,12 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	timer_setup(&amp;enic-&gt;notify_timer, enic_notify_timer, 0);</div><div class='ctx'> </div><div class='ctx'> 	enic_rfs_flw_tbl_init(enic);</div><div class='del'>-	enic_set_rx_coal_setting(enic);</div><div class='ctx'> 	INIT_WORK(&amp;enic-&gt;reset, enic_reset);</div><div class='ctx'> 	INIT_WORK(&amp;enic-&gt;tx_hang_reset, enic_tx_hang_reset);</div><div class='ctx'> 	INIT_WORK(&amp;enic-&gt;change_mtu_work, enic_change_mtu_work);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='del'>-		spin_lock_init(&amp;enic-&gt;wq_lock[i]);</div><div class='add'>+		spin_lock_init(&amp;enic-&gt;wq[i].lock);</div><div class='ctx'> </div><div class='ctx'> 	/* Register net device</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -2910,6 +2835,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		netdev-&gt;netdev_ops = &amp;enic_netdev_dynamic_ops;</div><div class='ctx'> 	else</div><div class='ctx'> 		netdev-&gt;netdev_ops = &amp;enic_netdev_ops;</div><div class='add'>+	netdev-&gt;stat_ops = &amp;enic_netdev_stat_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;watchdog_timeo = 2 * HZ;</div><div class='ctx'> 	enic_set_ethtool_ops(netdev);</div><div class='hunk'>@@ -2965,6 +2891,13 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		patch_level = fls(patch_level);</div><div class='ctx'> 		patch_level = patch_level ? patch_level - 1 : 0;</div><div class='ctx'> 		enic-&gt;vxlan.patch_level = patch_level;</div><div class='add'>+</div><div class='add'>+		if (vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_WQ) == 1 ||</div><div class='add'>+		    enic-&gt;vxlan.flags &amp; ENIC_VXLAN_MULTI_WQ) {</div><div class='add'>+			netdev-&gt;udp_tunnel_nic_info = &amp;enic_udp_tunnels_v4;</div><div class='add'>+			if (enic-&gt;vxlan.flags &amp; ENIC_VXLAN_OUTER_IPV6)</div><div class='add'>+				netdev-&gt;udp_tunnel_nic_info = &amp;enic_udp_tunnels;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features |= netdev-&gt;hw_features;</div><div class='hunk'>@@ -2989,7 +2922,6 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		dev_err(dev, "Cannot register net device, aborting\n");</div><div class='ctx'> 		goto err_out_dev_deinit;</div><div class='ctx'> 	}</div><div class='del'>-	enic-&gt;rx_copybreak = RX_COPYBREAK_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -3054,17 +2986,4 @@ static struct pci_driver enic_driver = {</div><div class='ctx'> 	.remove = enic_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init enic_init_module(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);</div><div class='del'>-</div><div class='del'>-	return pci_register_driver(&amp;enic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit enic_cleanup_module(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;enic_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(enic_init_module);</div><div class='del'>-module_exit(enic_cleanup_module);</div><div class='add'>+module_pci_driver(enic_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c<br/>index e6a83198c3dd..4720a952725d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_pp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_pp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_pp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_pp.c</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2011 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2011 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='hunk'>@@ -73,9 +58,9 @@ static int enic_set_port_profile(struct enic *enic, int vf)</div><div class='ctx'> 	struct vic_provinfo *vp;</div><div class='ctx'> 	const u8 oui[3] = VIC_PROVINFO_CISCO_OUI;</div><div class='ctx'> 	const __be16 os_type = htons(VIC_GENERIC_PROV_OS_TYPE_LINUX);</div><div class='add'>+	const u8 *client_mac;</div><div class='ctx'> 	char uuid_str[38];</div><div class='ctx'> 	char client_mac_str[18];</div><div class='del'>-	u8 *client_mac;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ENIC_PP_BY_INDEX(enic, vf, pp, &amp;err);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_pp.h b/drivers/net/ethernet/cisco/enic/enic_pp.h<br/>index a09ff392c1c6..20a2687713ef 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_pp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_pp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_pp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_pp.h</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2011 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright 2011 Cisco Systems, Inc.  All rights reserved. */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ENIC_PP_H_</div><div class='ctx'> #define _ENIC_PP_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_res.c b/drivers/net/ethernet/cisco/enic/enic_res.c<br/>index 40b20817ddd5..bbd3143ed73e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_res.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_res.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_res.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_res.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -72,31 +59,38 @@ int enic_get_vnic_config(struct enic *enic)</div><div class='ctx'> 	GET_CONFIG(intr_timer_usec);</div><div class='ctx'> 	GET_CONFIG(loop_tag);</div><div class='ctx'> 	GET_CONFIG(num_arfs);</div><div class='add'>+	GET_CONFIG(max_rq_ring);</div><div class='add'>+	GET_CONFIG(max_wq_ring);</div><div class='add'>+	GET_CONFIG(max_cq_ring);</div><div class='add'>+</div><div class='add'>+	if (!c-&gt;max_wq_ring)</div><div class='add'>+		c-&gt;max_wq_ring = ENIC_MAX_WQ_DESCS_DEFAULT;</div><div class='add'>+	if (!c-&gt;max_rq_ring)</div><div class='add'>+		c-&gt;max_rq_ring = ENIC_MAX_RQ_DESCS_DEFAULT;</div><div class='add'>+	if (!c-&gt;max_cq_ring)</div><div class='add'>+		c-&gt;max_cq_ring = ENIC_MAX_CQ_DESCS_DEFAULT;</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;wq_desc_count =</div><div class='del'>-		min_t(u32, ENIC_MAX_WQ_DESCS,</div><div class='del'>-		max_t(u32, ENIC_MIN_WQ_DESCS,</div><div class='del'>-		c-&gt;wq_desc_count));</div><div class='add'>+		min_t(u32, c-&gt;max_wq_ring,</div><div class='add'>+		      max_t(u32, ENIC_MIN_WQ_DESCS, c-&gt;wq_desc_count));</div><div class='ctx'> 	c-&gt;wq_desc_count &amp;= 0xffffffe0; /* must be aligned to groups of 32 */</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;rq_desc_count =</div><div class='del'>-		min_t(u32, ENIC_MAX_RQ_DESCS,</div><div class='del'>-		max_t(u32, ENIC_MIN_RQ_DESCS,</div><div class='del'>-		c-&gt;rq_desc_count));</div><div class='add'>+		min_t(u32, c-&gt;max_rq_ring,</div><div class='add'>+		      max_t(u32, ENIC_MIN_RQ_DESCS, c-&gt;rq_desc_count));</div><div class='ctx'> 	c-&gt;rq_desc_count &amp;= 0xffffffe0; /* must be aligned to groups of 32 */</div><div class='ctx'> </div><div class='ctx'> 	if (c-&gt;mtu == 0)</div><div class='ctx'> 		c-&gt;mtu = 1500;</div><div class='del'>-	c-&gt;mtu = min_t(u16, ENIC_MAX_MTU,</div><div class='del'>-		max_t(u16, ENIC_MIN_MTU,</div><div class='del'>-		c-&gt;mtu));</div><div class='add'>+	c-&gt;mtu = min_t(u16, ENIC_MAX_MTU, max_t(u16, ENIC_MIN_MTU, c-&gt;mtu));</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;intr_timer_usec = min_t(u32, c-&gt;intr_timer_usec,</div><div class='ctx'> 		vnic_dev_get_intr_coal_timer_max(enic-&gt;vdev));</div><div class='ctx'> </div><div class='ctx'> 	dev_info(enic_get_dev(enic),</div><div class='del'>-		"vNIC MAC addr %pM wq/rq %d/%d mtu %d\n",</div><div class='del'>-		enic-&gt;mac_addr, c-&gt;wq_desc_count, c-&gt;rq_desc_count, c-&gt;mtu);</div><div class='add'>+		 "vNIC MAC addr %pM wq/rq %d/%d max wq/rq/cq %d/%d/%d mtu %d\n",</div><div class='add'>+		 enic-&gt;mac_addr, c-&gt;wq_desc_count, c-&gt;rq_desc_count,</div><div class='add'>+		 c-&gt;max_wq_ring, c-&gt;max_rq_ring, c-&gt;max_cq_ring, c-&gt;mtu);</div><div class='ctx'> </div><div class='ctx'> 	dev_info(enic_get_dev(enic), "vNIC csum tx/rx %s/%s "</div><div class='ctx'> 		"tso/lro %s/%s rss %s intr mode %s type %s timer %d usec "</div><div class='hunk'>@@ -189,9 +183,9 @@ void enic_free_vnic_resources(struct enic *enic)</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++)</div><div class='del'>-		vnic_wq_free(&amp;enic-&gt;wq[i]);</div><div class='add'>+		vnic_wq_free(&amp;enic-&gt;wq[i].vwq);</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++)</div><div class='del'>-		vnic_rq_free(&amp;enic-&gt;rq[i]);</div><div class='add'>+		vnic_rq_free(&amp;enic-&gt;rq[i].vrq);</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;cq_count; i++)</div><div class='ctx'> 		vnic_cq_free(&amp;enic-&gt;cq[i]);</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;intr_count; i++)</div><div class='hunk'>@@ -200,16 +194,21 @@ void enic_free_vnic_resources(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> void enic_get_res_counts(struct enic *enic)</div><div class='ctx'> {</div><div class='del'>-	enic-&gt;wq_count = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_WQ);</div><div class='del'>-	enic-&gt;rq_count = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_RQ);</div><div class='del'>-	enic-&gt;cq_count = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_CQ);</div><div class='del'>-	enic-&gt;intr_count = vnic_dev_get_res_count(enic-&gt;vdev,</div><div class='del'>-		RES_TYPE_INTR_CTRL);</div><div class='add'>+	enic-&gt;wq_avail = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_WQ);</div><div class='add'>+	enic-&gt;rq_avail = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_RQ);</div><div class='add'>+	enic-&gt;cq_avail = vnic_dev_get_res_count(enic-&gt;vdev, RES_TYPE_CQ);</div><div class='add'>+	enic-&gt;intr_avail = vnic_dev_get_res_count(enic-&gt;vdev,</div><div class='add'>+						  RES_TYPE_INTR_CTRL);</div><div class='add'>+</div><div class='add'>+	enic-&gt;wq_count = enic-&gt;wq_avail;</div><div class='add'>+	enic-&gt;rq_count = enic-&gt;rq_avail;</div><div class='add'>+	enic-&gt;cq_count = enic-&gt;cq_avail;</div><div class='add'>+	enic-&gt;intr_count = enic-&gt;intr_avail;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(enic_get_dev(enic),</div><div class='ctx'> 		"vNIC resources avail: wq %d rq %d cq %d intr %d\n",</div><div class='del'>-		enic-&gt;wq_count, enic-&gt;rq_count,</div><div class='del'>-		enic-&gt;cq_count, enic-&gt;intr_count);</div><div class='add'>+		enic-&gt;wq_avail, enic-&gt;rq_avail,</div><div class='add'>+		enic-&gt;cq_avail, enic-&gt;intr_avail);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void enic_init_vnic_resources(struct enic *enic)</div><div class='hunk'>@@ -234,9 +233,12 @@ void enic_init_vnic_resources(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> 	switch (intr_mode) {</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_INTX:</div><div class='add'>+		error_interrupt_enable = 1;</div><div class='add'>+		error_interrupt_offset = ENIC_LEGACY_ERR_INTR;</div><div class='add'>+		break;</div><div class='ctx'> 	case VNIC_DEV_INTR_MODE_MSIX:</div><div class='ctx'> 		error_interrupt_enable = 1;</div><div class='del'>-		error_interrupt_offset = enic-&gt;intr_count - 2;</div><div class='add'>+		error_interrupt_offset = enic_msix_err_intr(enic);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		error_interrupt_enable = 0;</div><div class='hunk'>@@ -246,7 +248,7 @@ void enic_init_vnic_resources(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='ctx'> 		cq_index = i;</div><div class='del'>-		vnic_rq_init(&amp;enic-&gt;rq[i],</div><div class='add'>+		vnic_rq_init(&amp;enic-&gt;rq[i].vrq,</div><div class='ctx'> 			cq_index,</div><div class='ctx'> 			error_interrupt_enable,</div><div class='ctx'> 			error_interrupt_offset);</div><div class='hunk'>@@ -254,7 +256,7 @@ void enic_init_vnic_resources(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='ctx'> 		cq_index = enic-&gt;rq_count + i;</div><div class='del'>-		vnic_wq_init(&amp;enic-&gt;wq[i],</div><div class='add'>+		vnic_wq_init(&amp;enic-&gt;wq[i].vwq,</div><div class='ctx'> 			cq_index,</div><div class='ctx'> 			error_interrupt_enable,</div><div class='ctx'> 			error_interrupt_offset);</div><div class='hunk'>@@ -262,15 +264,15 @@ void enic_init_vnic_resources(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> 	/* Init CQ resources</div><div class='ctx'> 	 *</div><div class='del'>-	 * CQ[0 - n+m-1] point to INTR[0] for INTx, MSI</div><div class='del'>-	 * CQ[0 - n+m-1] point to INTR[0 - n+m-1] for MSI-X</div><div class='add'>+	 * All CQs point to INTR[0] for INTx, MSI</div><div class='add'>+	 * CQ[i] point to INTR[ENIC_MSIX_IO_INTR_BASE + i] for MSI-X</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;cq_count; i++) {</div><div class='ctx'> </div><div class='ctx'> 		switch (intr_mode) {</div><div class='ctx'> 		case VNIC_DEV_INTR_MODE_MSIX:</div><div class='del'>-			interrupt_offset = i;</div><div class='add'>+			interrupt_offset = ENIC_MSIX_IO_INTR_BASE + i;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			interrupt_offset = 0;</div><div class='hunk'>@@ -317,6 +319,7 @@ void enic_init_vnic_resources(struct enic *enic)</div><div class='ctx'> int enic_alloc_vnic_resources(struct enic *enic)</div><div class='ctx'> {</div><div class='ctx'> 	enum vnic_dev_intr_mode intr_mode;</div><div class='add'>+	int rq_cq_desc_size;</div><div class='ctx'> 	unsigned int i;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -331,11 +334,29 @@ int enic_alloc_vnic_resources(struct enic *enic)</div><div class='ctx'> 		intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" :</div><div class='ctx'> 		"unknown");</div><div class='ctx'> </div><div class='add'>+	switch (enic-&gt;ext_cq) {</div><div class='add'>+	case ENIC_RQ_CQ_ENTRY_SIZE_16:</div><div class='add'>+		rq_cq_desc_size = 16;</div><div class='add'>+		break;</div><div class='add'>+	case ENIC_RQ_CQ_ENTRY_SIZE_32:</div><div class='add'>+		rq_cq_desc_size = 32;</div><div class='add'>+		break;</div><div class='add'>+	case ENIC_RQ_CQ_ENTRY_SIZE_64:</div><div class='add'>+		rq_cq_desc_size = 64;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		dev_err(enic_get_dev(enic),</div><div class='add'>+			"Unable to determine rq cq desc size: %d",</div><div class='add'>+			enic-&gt;ext_cq);</div><div class='add'>+		err = -ENODEV;</div><div class='add'>+		goto err_out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Allocate queue resources</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;wq_count; i++) {</div><div class='del'>-		err = vnic_wq_alloc(enic-&gt;vdev, &amp;enic-&gt;wq[i], i,</div><div class='add'>+		err = vnic_wq_alloc(enic-&gt;vdev, &amp;enic-&gt;wq[i].vwq, i,</div><div class='ctx'> 			enic-&gt;config.wq_desc_count,</div><div class='ctx'> 			sizeof(struct wq_enet_desc));</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -343,7 +364,7 @@ int enic_alloc_vnic_resources(struct enic *enic)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;rq_count; i++) {</div><div class='del'>-		err = vnic_rq_alloc(enic-&gt;vdev, &amp;enic-&gt;rq[i], i,</div><div class='add'>+		err = vnic_rq_alloc(enic-&gt;vdev, &amp;enic-&gt;rq[i].vrq, i,</div><div class='ctx'> 			enic-&gt;config.rq_desc_count,</div><div class='ctx'> 			sizeof(struct rq_enet_desc));</div><div class='ctx'> 		if (err)</div><div class='hunk'>@@ -353,8 +374,8 @@ int enic_alloc_vnic_resources(struct enic *enic)</div><div class='ctx'> 	for (i = 0; i &lt; enic-&gt;cq_count; i++) {</div><div class='ctx'> 		if (i &lt; enic-&gt;rq_count)</div><div class='ctx'> 			err = vnic_cq_alloc(enic-&gt;vdev, &amp;enic-&gt;cq[i], i,</div><div class='del'>-				enic-&gt;config.rq_desc_count,</div><div class='del'>-				sizeof(struct cq_enet_rq_desc));</div><div class='add'>+					enic-&gt;config.rq_desc_count,</div><div class='add'>+					rq_cq_desc_size);</div><div class='ctx'> 		else</div><div class='ctx'> 			err = vnic_cq_alloc(enic-&gt;vdev, &amp;enic-&gt;cq[i], i,</div><div class='ctx'> 				enic-&gt;config.wq_desc_count,</div><div class='hunk'>@@ -385,6 +406,39 @@ int enic_alloc_vnic_resources(struct enic *enic)</div><div class='ctx'> </div><div class='ctx'> err_out_cleanup:</div><div class='ctx'> 	enic_free_vnic_resources(enic);</div><div class='del'>-</div><div class='add'>+err_out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * CMD_CQ_ENTRY_SIZE_SET can fail on older hw generations that don't support</div><div class='add'>+ * that command</div><div class='add'>+ */</div><div class='add'>+void enic_ext_cq(struct enic *enic)</div><div class='add'>+{</div><div class='add'>+	u64 a0 = CMD_CQ_ENTRY_SIZE_SET, a1 = 0;</div><div class='add'>+	int wait = 1000;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	spin_lock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	ret = vnic_dev_cmd(enic-&gt;vdev, CMD_CAPABILITY, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (ret || a0) {</div><div class='add'>+		dev_info(&amp;enic-&gt;pdev-&gt;dev,</div><div class='add'>+			 "CMD_CQ_ENTRY_SIZE_SET not supported.");</div><div class='add'>+		enic-&gt;ext_cq = ENIC_RQ_CQ_ENTRY_SIZE_16;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+	a1 &amp;= VNIC_RQ_CQ_ENTRY_SIZE_ALL_BIT;</div><div class='add'>+	enic-&gt;ext_cq = fls(a1) - 1;</div><div class='add'>+	a0 = VNIC_RQ_ALL;</div><div class='add'>+	a1 = enic-&gt;ext_cq;</div><div class='add'>+	ret = vnic_dev_cmd(enic-&gt;vdev, CMD_CQ_ENTRY_SIZE_SET, &amp;a0, &amp;a1, wait);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_info(&amp;enic-&gt;pdev-&gt;dev, "CMD_CQ_ENTRY_SIZE_SET failed.");</div><div class='add'>+		enic-&gt;ext_cq = ENIC_RQ_CQ_ENTRY_SIZE_16;</div><div class='add'>+	}</div><div class='add'>+out:</div><div class='add'>+	spin_unlock_bh(&amp;enic-&gt;devcmd_lock);</div><div class='add'>+	dev_info(&amp;enic-&gt;pdev-&gt;dev, "CQ entry size set to %d bytes",</div><div class='add'>+		 16 &lt;&lt; enic-&gt;ext_cq);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_res.h b/drivers/net/ethernet/cisco/enic/enic_res.h<br/>index 81f98a8b60e9..02dca1ae4a22 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_res.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/enic_res.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_res.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_res.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _ENIC_RES_H_</div><div class='hunk'>@@ -25,10 +12,13 @@</div><div class='ctx'> #include "vnic_wq.h"</div><div class='ctx'> #include "vnic_rq.h"</div><div class='ctx'> </div><div class='del'>-#define ENIC_MIN_WQ_DESCS		64</div><div class='del'>-#define ENIC_MAX_WQ_DESCS		4096</div><div class='del'>-#define ENIC_MIN_RQ_DESCS		64</div><div class='del'>-#define ENIC_MAX_RQ_DESCS		4096</div><div class='add'>+#define ENIC_MIN_WQ_DESCS 64</div><div class='add'>+#define ENIC_MAX_WQ_DESCS_DEFAULT 4096</div><div class='add'>+#define ENIC_MAX_WQ_DESCS 16384</div><div class='add'>+#define ENIC_MIN_RQ_DESCS 64</div><div class='add'>+#define ENIC_MAX_RQ_DESCS 16384</div><div class='add'>+#define ENIC_MAX_RQ_DESCS_DEFAULT 4096</div><div class='add'>+#define ENIC_MAX_CQ_DESCS_DEFAULT (64 * 1024)</div><div class='ctx'> </div><div class='ctx'> #define ENIC_MIN_MTU			ETH_MIN_MTU</div><div class='ctx'> #define ENIC_MAX_MTU			9000</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_rq.c b/drivers/net/ethernet/cisco/enic/enic_rq.c<br/>new file mode 100644<br/>index 000000000000..ccbf5c9a21d0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_rq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_rq.c</a></div><div class='hunk'>@@ -0,0 +1,436 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2024 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;net/busy_poll.h&gt;</div><div class='add'>+#include "enic.h"</div><div class='add'>+#include "enic_res.h"</div><div class='add'>+#include "enic_rq.h"</div><div class='add'>+#include "vnic_rq.h"</div><div class='add'>+#include "cq_enet_desc.h"</div><div class='add'>+</div><div class='add'>+#define ENIC_LARGE_PKT_THRESHOLD                1000</div><div class='add'>+</div><div class='add'>+static void enic_intr_update_pkt_size(struct vnic_rx_bytes_counter *pkt_size,</div><div class='add'>+				      u32 pkt_len)</div><div class='add'>+{</div><div class='add'>+	if (pkt_len &gt; ENIC_LARGE_PKT_THRESHOLD)</div><div class='add'>+		pkt_size-&gt;large_pkt_bytes_cnt += pkt_len;</div><div class='add'>+	else</div><div class='add'>+		pkt_size-&gt;small_pkt_bytes_cnt += pkt_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_rq_cq_desc_dec(void *cq_desc, u8 cq_desc_size, u8 *type,</div><div class='add'>+				u8 *color, u16 *q_number, u16 *completed_index)</div><div class='add'>+{</div><div class='add'>+	/* type_color is the last field for all cq structs */</div><div class='add'>+	u8 type_color;</div><div class='add'>+</div><div class='add'>+	switch (cq_desc_size) {</div><div class='add'>+	case VNIC_RQ_CQ_ENTRY_SIZE_16: {</div><div class='add'>+		struct cq_enet_rq_desc *desc =</div><div class='add'>+			(struct cq_enet_rq_desc *)cq_desc;</div><div class='add'>+		type_color = desc-&gt;type_color;</div><div class='add'>+</div><div class='add'>+		/* Make sure color bit is read from desc *before* other fields</div><div class='add'>+		 * are read from desc.  Hardware guarantees color bit is last</div><div class='add'>+		 * bit (byte) written.  Adding the rmb() prevents the compiler</div><div class='add'>+		 * and/or CPU from reordering the reads which would potentially</div><div class='add'>+		 * result in reading stale values.</div><div class='add'>+		 */</div><div class='add'>+		rmb();</div><div class='add'>+</div><div class='add'>+		*q_number = le16_to_cpu(desc-&gt;q_number_rss_type_flags) &amp;</div><div class='add'>+			    CQ_DESC_Q_NUM_MASK;</div><div class='add'>+		*completed_index = le16_to_cpu(desc-&gt;completed_index_flags) &amp;</div><div class='add'>+				   CQ_DESC_COMP_NDX_MASK;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VNIC_RQ_CQ_ENTRY_SIZE_32: {</div><div class='add'>+		struct cq_enet_rq_desc_32 *desc =</div><div class='add'>+			(struct cq_enet_rq_desc_32 *)cq_desc;</div><div class='add'>+		type_color = desc-&gt;type_color;</div><div class='add'>+</div><div class='add'>+		/* Make sure color bit is read from desc *before* other fields</div><div class='add'>+		 * are read from desc.  Hardware guarantees color bit is last</div><div class='add'>+		 * bit (byte) written.  Adding the rmb() prevents the compiler</div><div class='add'>+		 * and/or CPU from reordering the reads which would potentially</div><div class='add'>+		 * result in reading stale values.</div><div class='add'>+		 */</div><div class='add'>+		rmb();</div><div class='add'>+</div><div class='add'>+		*q_number = le16_to_cpu(desc-&gt;q_number_rss_type_flags) &amp;</div><div class='add'>+			    CQ_DESC_Q_NUM_MASK;</div><div class='add'>+		*completed_index = le16_to_cpu(desc-&gt;completed_index_flags) &amp;</div><div class='add'>+				   CQ_DESC_COMP_NDX_MASK;</div><div class='add'>+		*completed_index |= (desc-&gt;fetch_index_flags &amp; CQ_DESC_32_FI_MASK) &lt;&lt;</div><div class='add'>+				CQ_DESC_COMP_NDX_BITS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	case VNIC_RQ_CQ_ENTRY_SIZE_64: {</div><div class='add'>+		struct cq_enet_rq_desc_64 *desc =</div><div class='add'>+			(struct cq_enet_rq_desc_64 *)cq_desc;</div><div class='add'>+		type_color = desc-&gt;type_color;</div><div class='add'>+</div><div class='add'>+		/* Make sure color bit is read from desc *before* other fields</div><div class='add'>+		 * are read from desc.  Hardware guarantees color bit is last</div><div class='add'>+		 * bit (byte) written.  Adding the rmb() prevents the compiler</div><div class='add'>+		 * and/or CPU from reordering the reads which would potentially</div><div class='add'>+		 * result in reading stale values.</div><div class='add'>+		 */</div><div class='add'>+		rmb();</div><div class='add'>+</div><div class='add'>+		*q_number = le16_to_cpu(desc-&gt;q_number_rss_type_flags) &amp;</div><div class='add'>+			    CQ_DESC_Q_NUM_MASK;</div><div class='add'>+		*completed_index = le16_to_cpu(desc-&gt;completed_index_flags) &amp;</div><div class='add'>+				   CQ_DESC_COMP_NDX_MASK;</div><div class='add'>+		*completed_index |= (desc-&gt;fetch_index_flags &amp; CQ_DESC_64_FI_MASK) &lt;&lt;</div><div class='add'>+				CQ_DESC_COMP_NDX_BITS;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*color = (type_color &gt;&gt; CQ_DESC_COLOR_SHIFT) &amp; CQ_DESC_COLOR_MASK;</div><div class='add'>+	*type = type_color &amp; CQ_DESC_TYPE_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_rq_set_skb_flags(struct vnic_rq *vrq, u8 type, u32 rss_hash,</div><div class='add'>+				  u8 rss_type, u8 fcoe, u8 fcoe_fc_crc_ok,</div><div class='add'>+				  u8 vlan_stripped, u8 csum_not_calc,</div><div class='add'>+				  u8 tcp_udp_csum_ok, u8 ipv6, u8 ipv4_csum_ok,</div><div class='add'>+				  u16 vlan_tci, struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(vrq-&gt;vdev);</div><div class='add'>+	struct net_device *netdev = enic-&gt;netdev;</div><div class='add'>+	struct enic_rq_stats *rqstats =  &amp;enic-&gt;rq[vrq-&gt;index].stats;</div><div class='add'>+	bool outer_csum_ok = true, encap = false;</div><div class='add'>+</div><div class='add'>+	if ((netdev-&gt;features &amp; NETIF_F_RXHASH) &amp;&amp; rss_hash &amp;&amp; type == 3) {</div><div class='add'>+		switch (rss_type) {</div><div class='add'>+		case CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv4:</div><div class='add'>+		case CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6:</div><div class='add'>+		case CQ_ENET_RQ_DESC_RSS_TYPE_TCP_IPv6_EX:</div><div class='add'>+			skb_set_hash(skb, rss_hash, PKT_HASH_TYPE_L4);</div><div class='add'>+			rqstats-&gt;l4_rss_hash++;</div><div class='add'>+			break;</div><div class='add'>+		case CQ_ENET_RQ_DESC_RSS_TYPE_IPv4:</div><div class='add'>+		case CQ_ENET_RQ_DESC_RSS_TYPE_IPv6:</div><div class='add'>+		case CQ_ENET_RQ_DESC_RSS_TYPE_IPv6_EX:</div><div class='add'>+			skb_set_hash(skb, rss_hash, PKT_HASH_TYPE_L3);</div><div class='add'>+			rqstats-&gt;l3_rss_hash++;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	if (enic-&gt;vxlan.vxlan_udp_port_number) {</div><div class='add'>+		switch (enic-&gt;vxlan.patch_level) {</div><div class='add'>+		case 0:</div><div class='add'>+			if (fcoe) {</div><div class='add'>+				encap = true;</div><div class='add'>+				outer_csum_ok = fcoe_fc_crc_ok;</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		case 2:</div><div class='add'>+			if (type == 7 &amp;&amp; (rss_hash &amp; BIT(0))) {</div><div class='add'>+				encap = true;</div><div class='add'>+				outer_csum_ok = (rss_hash &amp; BIT(1)) &amp;&amp;</div><div class='add'>+						(rss_hash &amp; BIT(2));</div><div class='add'>+			}</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Hardware does not provide whole packet checksum. It only</div><div class='add'>+	 * provides pseudo checksum. Since hw validates the packet</div><div class='add'>+	 * checksum but not provide us the checksum value. use</div><div class='add'>+	 * CHECSUM_UNNECESSARY.</div><div class='add'>+	 *</div><div class='add'>+	 * In case of encap pkt tcp_udp_csum_ok/tcp_udp_csum_ok is</div><div class='add'>+	 * inner csum_ok. outer_csum_ok is set by hw when outer udp</div><div class='add'>+	 * csum is correct or is zero.</div><div class='add'>+	 */</div><div class='add'>+	if ((netdev-&gt;features &amp; NETIF_F_RXCSUM) &amp;&amp; !csum_not_calc &amp;&amp;</div><div class='add'>+	    tcp_udp_csum_ok &amp;&amp; outer_csum_ok &amp;&amp; (ipv4_csum_ok || ipv6)) {</div><div class='add'>+		skb-&gt;ip_summed = CHECKSUM_UNNECESSARY;</div><div class='add'>+		skb-&gt;csum_level = encap;</div><div class='add'>+		if (encap)</div><div class='add'>+			rqstats-&gt;csum_unnecessary_encap++;</div><div class='add'>+		else</div><div class='add'>+			rqstats-&gt;csum_unnecessary++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (vlan_stripped) {</div><div class='add'>+		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tci);</div><div class='add'>+		rqstats-&gt;vlan_stripped++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * cq_enet_rq_desc accesses section uses only the 1st 15 bytes of the cq which</div><div class='add'>+ * is identical for all type (16,32 and 64 byte) of cqs.</div><div class='add'>+ */</div><div class='add'>+static void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc, u8 *ingress_port,</div><div class='add'>+				u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,</div><div class='add'>+				u8 *csum_not_calc, u32 *rss_hash,</div><div class='add'>+				u16 *bytes_written, u8 *packet_error,</div><div class='add'>+				u8 *vlan_stripped, u16 *vlan_tci,</div><div class='add'>+				u16 *checksum, u8 *fcoe_sof,</div><div class='add'>+				u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error,</div><div class='add'>+				u8 *fcoe_eof, u8 *tcp_udp_csum_ok, u8 *udp,</div><div class='add'>+				u8 *tcp, u8 *ipv4_csum_ok, u8 *ipv6, u8 *ipv4,</div><div class='add'>+				u8 *ipv4_fragment, u8 *fcs_ok)</div><div class='add'>+{</div><div class='add'>+	u16 completed_index_flags;</div><div class='add'>+	u16 q_number_rss_type_flags;</div><div class='add'>+	u16 bytes_written_flags;</div><div class='add'>+</div><div class='add'>+	completed_index_flags = le16_to_cpu(desc-&gt;completed_index_flags);</div><div class='add'>+	q_number_rss_type_flags =</div><div class='add'>+		le16_to_cpu(desc-&gt;q_number_rss_type_flags);</div><div class='add'>+	bytes_written_flags = le16_to_cpu(desc-&gt;bytes_written_flags);</div><div class='add'>+</div><div class='add'>+	*ingress_port = (completed_index_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;</div><div class='add'>+	*fcoe = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_FCOE) ?</div><div class='add'>+		1 : 0;</div><div class='add'>+	*eop = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_EOP) ?</div><div class='add'>+		1 : 0;</div><div class='add'>+	*sop = (completed_index_flags &amp; CQ_ENET_RQ_DESC_FLAGS_SOP) ?</div><div class='add'>+		1 : 0;</div><div class='add'>+</div><div class='add'>+	*rss_type = (u8)((q_number_rss_type_flags &gt;&gt; CQ_DESC_Q_NUM_BITS) &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_RSS_TYPE_MASK);</div><div class='add'>+	*csum_not_calc = (q_number_rss_type_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	*rss_hash = le32_to_cpu(desc-&gt;rss_hash);</div><div class='add'>+</div><div class='add'>+	*bytes_written = bytes_written_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;</div><div class='add'>+	*packet_error = (bytes_written_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;</div><div class='add'>+	*vlan_stripped = (bytes_written_flags &amp;</div><div class='add'>+		CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)</div><div class='add'>+	 */</div><div class='add'>+	*vlan_tci = le16_to_cpu(desc-&gt;vlan);</div><div class='add'>+</div><div class='add'>+	if (*fcoe) {</div><div class='add'>+		*fcoe_sof = (u8)(le16_to_cpu(desc-&gt;checksum_fcoe) &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);</div><div class='add'>+		*fcoe_fc_crc_ok = (desc-&gt;flags &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;</div><div class='add'>+		*fcoe_enc_error = (desc-&gt;flags &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;</div><div class='add'>+		*fcoe_eof = (u8)((le16_to_cpu(desc-&gt;checksum_fcoe) &gt;&gt;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &amp;</div><div class='add'>+			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);</div><div class='add'>+		*checksum = 0;</div><div class='add'>+	} else {</div><div class='add'>+		*fcoe_sof = 0;</div><div class='add'>+		*fcoe_fc_crc_ok = 0;</div><div class='add'>+		*fcoe_enc_error = 0;</div><div class='add'>+		*fcoe_eof = 0;</div><div class='add'>+		*checksum = le16_to_cpu(desc-&gt;checksum_fcoe);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*tcp_udp_csum_ok =</div><div class='add'>+		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;</div><div class='add'>+	*udp = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;</div><div class='add'>+	*tcp = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;</div><div class='add'>+	*ipv4_csum_ok =</div><div class='add'>+		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;</div><div class='add'>+	*ipv6 = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;</div><div class='add'>+	*ipv4 = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;</div><div class='add'>+	*ipv4_fragment =</div><div class='add'>+		(desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;</div><div class='add'>+	*fcs_ok = (desc-&gt;flags &amp; CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool enic_rq_pkt_error(struct vnic_rq *vrq, u8 packet_error, u8 fcs_ok,</div><div class='add'>+			      u16 bytes_written)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(vrq-&gt;vdev);</div><div class='add'>+	struct enic_rq_stats *rqstats = &amp;enic-&gt;rq[vrq-&gt;index].stats;</div><div class='add'>+</div><div class='add'>+	if (packet_error) {</div><div class='add'>+		if (!fcs_ok) {</div><div class='add'>+			if (bytes_written &gt; 0)</div><div class='add'>+				rqstats-&gt;bad_fcs++;</div><div class='add'>+			else if (bytes_written == 0)</div><div class='add'>+				rqstats-&gt;pkt_truncated++;</div><div class='add'>+		}</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int enic_rq_alloc_buf(struct vnic_rq *rq)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='add'>+	struct net_device *netdev = enic-&gt;netdev;</div><div class='add'>+	struct enic_rq *erq = &amp;enic-&gt;rq[rq-&gt;index];</div><div class='add'>+	struct enic_rq_stats *rqstats = &amp;erq-&gt;stats;</div><div class='add'>+	unsigned int offset = 0;</div><div class='add'>+	unsigned int len = netdev-&gt;mtu + VLAN_ETH_HLEN;</div><div class='add'>+	unsigned int os_buf_index = 0;</div><div class='add'>+	dma_addr_t dma_addr;</div><div class='add'>+	struct vnic_rq_buf *buf = rq-&gt;to_use;</div><div class='add'>+	struct page *page;</div><div class='add'>+	unsigned int truesize = len;</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;os_buf) {</div><div class='add'>+		enic_queue_rq_desc(rq, buf-&gt;os_buf, os_buf_index, buf-&gt;dma_addr,</div><div class='add'>+				   buf-&gt;len);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	page = page_pool_dev_alloc(erq-&gt;pool, &amp;offset, &amp;truesize);</div><div class='add'>+	if (unlikely(!page)) {</div><div class='add'>+		rqstats-&gt;pp_alloc_fail++;</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	buf-&gt;offset = offset;</div><div class='add'>+	buf-&gt;truesize = truesize;</div><div class='add'>+	dma_addr = page_pool_get_dma_addr(page) + offset;</div><div class='add'>+	enic_queue_rq_desc(rq, (void *)page, os_buf_index, dma_addr, len);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(rq-&gt;vdev);</div><div class='add'>+	struct enic_rq *erq = &amp;enic-&gt;rq[rq-&gt;index];</div><div class='add'>+</div><div class='add'>+	if (!buf-&gt;os_buf)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	page_pool_put_full_page(erq-&gt;pool, (struct page *)buf-&gt;os_buf, true);</div><div class='add'>+	buf-&gt;os_buf = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_rq_indicate_buf(struct enic *enic, struct vnic_rq *rq,</div><div class='add'>+				 struct vnic_rq_buf *buf, void *cq_desc,</div><div class='add'>+				 u8 type, u16 q_number, u16 completed_index)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct vnic_cq *cq = &amp;enic-&gt;cq[enic_cq_rq(enic, rq-&gt;index)];</div><div class='add'>+	struct enic_rq_stats *rqstats = &amp;enic-&gt;rq[rq-&gt;index].stats;</div><div class='add'>+	struct napi_struct *napi;</div><div class='add'>+</div><div class='add'>+	u8 eop, sop, ingress_port, vlan_stripped;</div><div class='add'>+	u8 fcoe, fcoe_sof, fcoe_fc_crc_ok, fcoe_enc_error, fcoe_eof;</div><div class='add'>+	u8 tcp_udp_csum_ok, udp, tcp, ipv4_csum_ok;</div><div class='add'>+	u8 ipv6, ipv4, ipv4_fragment, fcs_ok, rss_type, csum_not_calc;</div><div class='add'>+	u8 packet_error;</div><div class='add'>+	u16 bytes_written, vlan_tci, checksum;</div><div class='add'>+	u32 rss_hash;</div><div class='add'>+</div><div class='add'>+	rqstats-&gt;packets++;</div><div class='add'>+</div><div class='add'>+	cq_enet_rq_desc_dec((struct cq_enet_rq_desc *)cq_desc, &amp;ingress_port,</div><div class='add'>+			    &amp;fcoe, &amp;eop, &amp;sop, &amp;rss_type, &amp;csum_not_calc,</div><div class='add'>+			    &amp;rss_hash, &amp;bytes_written, &amp;packet_error,</div><div class='add'>+			    &amp;vlan_stripped, &amp;vlan_tci, &amp;checksum, &amp;fcoe_sof,</div><div class='add'>+			    &amp;fcoe_fc_crc_ok, &amp;fcoe_enc_error, &amp;fcoe_eof,</div><div class='add'>+			    &amp;tcp_udp_csum_ok, &amp;udp, &amp;tcp, &amp;ipv4_csum_ok, &amp;ipv6,</div><div class='add'>+			    &amp;ipv4, &amp;ipv4_fragment, &amp;fcs_ok);</div><div class='add'>+</div><div class='add'>+	if (enic_rq_pkt_error(rq, packet_error, fcs_ok, bytes_written))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (eop &amp;&amp; bytes_written &gt; 0) {</div><div class='add'>+		/* Good receive</div><div class='add'>+		 */</div><div class='add'>+		rqstats-&gt;bytes += bytes_written;</div><div class='add'>+		napi = &amp;enic-&gt;napi[rq-&gt;index];</div><div class='add'>+		skb = napi_get_frags(napi);</div><div class='add'>+		if (unlikely(!skb)) {</div><div class='add'>+			net_warn_ratelimited("%s: skb alloc error rq[%d], desc[%d]\n",</div><div class='add'>+					     enic-&gt;netdev-&gt;name, rq-&gt;index,</div><div class='add'>+					     completed_index);</div><div class='add'>+			rqstats-&gt;no_skb++;</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		prefetch(skb-&gt;data - NET_IP_ALIGN);</div><div class='add'>+</div><div class='add'>+		dma_sync_single_for_cpu(&amp;enic-&gt;pdev-&gt;dev, buf-&gt;dma_addr,</div><div class='add'>+					bytes_written, DMA_FROM_DEVICE);</div><div class='add'>+		skb_add_rx_frag(skb, skb_shinfo(skb)-&gt;nr_frags,</div><div class='add'>+				(struct page *)buf-&gt;os_buf, buf-&gt;offset,</div><div class='add'>+				bytes_written, buf-&gt;truesize);</div><div class='add'>+		skb_record_rx_queue(skb, q_number);</div><div class='add'>+		enic_rq_set_skb_flags(rq, type, rss_hash, rss_type, fcoe,</div><div class='add'>+				      fcoe_fc_crc_ok, vlan_stripped,</div><div class='add'>+				      csum_not_calc, tcp_udp_csum_ok, ipv6,</div><div class='add'>+				      ipv4_csum_ok, vlan_tci, skb);</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='add'>+		napi_gro_frags(napi);</div><div class='add'>+		if (enic-&gt;rx_coalesce_setting.use_adaptive_rx_coalesce)</div><div class='add'>+			enic_intr_update_pkt_size(&amp;cq-&gt;pkt_size_counter,</div><div class='add'>+						  bytes_written);</div><div class='add'>+		buf-&gt;os_buf = NULL;</div><div class='add'>+		buf-&gt;dma_addr = 0;</div><div class='add'>+		buf = buf-&gt;next;</div><div class='add'>+	} else {</div><div class='add'>+		/* Buffer overflow</div><div class='add'>+		 */</div><div class='add'>+		rqstats-&gt;pkt_truncated++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_rq_service(struct enic *enic, void *cq_desc, u8 type,</div><div class='add'>+			    u16 q_number, u16 completed_index)</div><div class='add'>+{</div><div class='add'>+	struct enic_rq_stats *rqstats = &amp;enic-&gt;rq[q_number].stats;</div><div class='add'>+	struct vnic_rq *vrq = &amp;enic-&gt;rq[q_number].vrq;</div><div class='add'>+	struct vnic_rq_buf *vrq_buf = vrq-&gt;to_clean;</div><div class='add'>+	int skipped;</div><div class='add'>+</div><div class='add'>+	while (1) {</div><div class='add'>+		skipped = (vrq_buf-&gt;index != completed_index);</div><div class='add'>+		if (!skipped)</div><div class='add'>+			enic_rq_indicate_buf(enic, vrq, vrq_buf, cq_desc, type,</div><div class='add'>+					     q_number, completed_index);</div><div class='add'>+		else</div><div class='add'>+			rqstats-&gt;desc_skip++;</div><div class='add'>+</div><div class='add'>+		vrq-&gt;ring.desc_avail++;</div><div class='add'>+		vrq-&gt;to_clean = vrq_buf-&gt;next;</div><div class='add'>+		vrq_buf = vrq_buf-&gt;next;</div><div class='add'>+		if (!skipped)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int enic_rq_cq_service(struct enic *enic, unsigned int cq_index,</div><div class='add'>+				unsigned int work_to_do)</div><div class='add'>+{</div><div class='add'>+	struct vnic_cq *cq = &amp;enic-&gt;cq[cq_index];</div><div class='add'>+	void *cq_desc = vnic_cq_to_clean(cq);</div><div class='add'>+	u16 q_number, completed_index;</div><div class='add'>+	unsigned int work_done = 0;</div><div class='add'>+	u8 type, color;</div><div class='add'>+</div><div class='add'>+	enic_rq_cq_desc_dec(cq_desc, enic-&gt;ext_cq, &amp;type, &amp;color, &amp;q_number,</div><div class='add'>+			    &amp;completed_index);</div><div class='add'>+</div><div class='add'>+	while (color != cq-&gt;last_color) {</div><div class='add'>+		enic_rq_service(enic, cq_desc, type, q_number, completed_index);</div><div class='add'>+		vnic_cq_inc_to_clean(cq);</div><div class='add'>+</div><div class='add'>+		if (++work_done &gt;= work_to_do)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cq_desc = vnic_cq_to_clean(cq);</div><div class='add'>+		enic_rq_cq_desc_dec(cq_desc, enic-&gt;ext_cq, &amp;type, &amp;color,</div><div class='add'>+				    &amp;q_number, &amp;completed_index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_rq.h b/drivers/net/ethernet/cisco/enic/enic_rq.h<br/>new file mode 100644<br/>index 000000000000..98476a7297af<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_rq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_rq.h</a></div><div class='hunk'>@@ -0,0 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ * Copyright 2024 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+unsigned int enic_rq_cq_service(struct enic *enic, unsigned int cq_index,</div><div class='add'>+				unsigned int work_to_do);</div><div class='add'>+int enic_rq_alloc_buf(struct vnic_rq *rq);</div><div class='add'>+void enic_free_rq_buf(struct vnic_rq *rq, struct vnic_rq_buf *buf);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_wq.c b/drivers/net/ethernet/cisco/enic/enic_wq.c<br/>new file mode 100644<br/>index 000000000000..07936f8b4231<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_wq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_wq.c</a></div><div class='hunk'>@@ -0,0 +1,117 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2025 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+</div><div class='add'>+#include &lt;net/netdev_queues.h&gt;</div><div class='add'>+#include "enic_res.h"</div><div class='add'>+#include "enic.h"</div><div class='add'>+#include "enic_wq.h"</div><div class='add'>+</div><div class='add'>+#define ENET_CQ_DESC_COMP_NDX_BITS 14</div><div class='add'>+#define ENET_CQ_DESC_COMP_NDX_MASK GENMASK(ENET_CQ_DESC_COMP_NDX_BITS - 1, 0)</div><div class='add'>+</div><div class='add'>+static void enic_wq_cq_desc_dec(const struct cq_desc *desc_arg, bool ext_wq,</div><div class='add'>+				u8 *type, u8 *color, u16 *q_number,</div><div class='add'>+				u16 *completed_index)</div><div class='add'>+{</div><div class='add'>+	const struct cq_desc *desc = desc_arg;</div><div class='add'>+	const u8 type_color = desc-&gt;type_color;</div><div class='add'>+</div><div class='add'>+	*color = (type_color &gt;&gt; CQ_DESC_COLOR_SHIFT) &amp; CQ_DESC_COLOR_MASK;</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Make sure color bit is read from desc *before* other fields</div><div class='add'>+	 * are read from desc.  Hardware guarantees color bit is last</div><div class='add'>+	 * bit (byte) written.  Adding the rmb() prevents the compiler</div><div class='add'>+	 * and/or CPU from reordering the reads which would potentially</div><div class='add'>+	 * result in reading stale values.</div><div class='add'>+	 */</div><div class='add'>+	rmb();</div><div class='add'>+</div><div class='add'>+	*type = type_color &amp; CQ_DESC_TYPE_MASK;</div><div class='add'>+	*q_number = le16_to_cpu(desc-&gt;q_number) &amp; CQ_DESC_Q_NUM_MASK;</div><div class='add'>+</div><div class='add'>+	if (ext_wq)</div><div class='add'>+		*completed_index = le16_to_cpu(desc-&gt;completed_index) &amp;</div><div class='add'>+			ENET_CQ_DESC_COMP_NDX_MASK;</div><div class='add'>+	else</div><div class='add'>+		*completed_index = le16_to_cpu(desc-&gt;completed_index) &amp;</div><div class='add'>+			CQ_DESC_COMP_NDX_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(wq-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;sop)</div><div class='add'>+		dma_unmap_single(&amp;enic-&gt;pdev-&gt;dev, buf-&gt;dma_addr, buf-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+	else</div><div class='add'>+		dma_unmap_page(&amp;enic-&gt;pdev-&gt;dev, buf-&gt;dma_addr, buf-&gt;len,</div><div class='add'>+			       DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	if (buf-&gt;os_buf)</div><div class='add'>+		dev_kfree_skb_any(buf-&gt;os_buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_wq_free_buf(struct vnic_wq *wq, struct cq_desc *cq_desc,</div><div class='add'>+			     struct vnic_wq_buf *buf, void *opaque)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(wq-&gt;vdev);</div><div class='add'>+</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.cq_work++;</div><div class='add'>+	enic-&gt;wq[wq-&gt;index].stats.cq_bytes += buf-&gt;len;</div><div class='add'>+	enic_free_wq_buf(wq, buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void enic_wq_service(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='add'>+			    u8 type, u16 q_number, u16 completed_index)</div><div class='add'>+{</div><div class='add'>+	struct enic *enic = vnic_dev_priv(vdev);</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;enic-&gt;wq[q_number].lock);</div><div class='add'>+</div><div class='add'>+	vnic_wq_service(&amp;enic-&gt;wq[q_number].vwq, cq_desc,</div><div class='add'>+			completed_index, enic_wq_free_buf, NULL);</div><div class='add'>+</div><div class='add'>+	if (netif_tx_queue_stopped(netdev_get_tx_queue(enic-&gt;netdev, q_number))</div><div class='add'>+	    &amp;&amp; vnic_wq_desc_avail(&amp;enic-&gt;wq[q_number].vwq) &gt;=</div><div class='add'>+	    (MAX_SKB_FRAGS + ENIC_DESC_MAX_SPLITS)) {</div><div class='add'>+		netif_wake_subqueue(enic-&gt;netdev, q_number);</div><div class='add'>+		enic-&gt;wq[q_number].stats.wake++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	spin_unlock(&amp;enic-&gt;wq[q_number].lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+unsigned int enic_wq_cq_service(struct enic *enic, unsigned int cq_index,</div><div class='add'>+				unsigned int work_to_do)</div><div class='add'>+{</div><div class='add'>+	struct vnic_cq *cq = &amp;enic-&gt;cq[cq_index];</div><div class='add'>+	u16 q_number, completed_index;</div><div class='add'>+	unsigned int work_done = 0;</div><div class='add'>+	struct cq_desc *cq_desc;</div><div class='add'>+	u8 type, color;</div><div class='add'>+	bool ext_wq;</div><div class='add'>+</div><div class='add'>+	ext_wq = cq-&gt;ring.size &gt; ENIC_MAX_WQ_DESCS_DEFAULT;</div><div class='add'>+</div><div class='add'>+	cq_desc = (struct cq_desc *)vnic_cq_to_clean(cq);</div><div class='add'>+	enic_wq_cq_desc_dec(cq_desc, ext_wq, &amp;type, &amp;color,</div><div class='add'>+			    &amp;q_number, &amp;completed_index);</div><div class='add'>+</div><div class='add'>+	while (color != cq-&gt;last_color) {</div><div class='add'>+		enic_wq_service(cq-&gt;vdev, cq_desc, type, q_number,</div><div class='add'>+				completed_index);</div><div class='add'>+</div><div class='add'>+		vnic_cq_inc_to_clean(cq);</div><div class='add'>+</div><div class='add'>+		if (++work_done &gt;= work_to_do)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cq_desc = (struct cq_desc *)vnic_cq_to_clean(cq);</div><div class='add'>+		enic_wq_cq_desc_dec(cq_desc, ext_wq, &amp;type, &amp;color,</div><div class='add'>+				    &amp;q_number, &amp;completed_index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/enic_wq.h b/drivers/net/ethernet/cisco/enic/enic_wq.h<br/>new file mode 100644<br/>index 000000000000..12acb3f2fbc9<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/enic_wq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/enic_wq.h</a></div><div class='hunk'>@@ -0,0 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+ * Copyright 2025 Cisco Systems, Inc.  All rights reserved.</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+void enic_free_wq_buf(struct vnic_wq *wq, struct vnic_wq_buf *buf);</div><div class='add'>+unsigned int enic_wq_cq_service(struct enic *enic, unsigned int cq_index,</div><div class='add'>+				unsigned int work_to_do);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/rq_enet_desc.h b/drivers/net/ethernet/cisco/enic/rq_enet_desc.h<br/>index e6dd30988d6f..0ab5fd6b8d46 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/rq_enet_desc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/rq_enet_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/rq_enet_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/rq_enet_desc.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _RQ_ENET_DESC_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c<br/>index 9c682aff3834..27c885e91552 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_cq.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_cq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_cq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_cq.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -36,8 +23,6 @@ void vnic_cq_free(struct vnic_cq *cq)</div><div class='ctx'> int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,</div><div class='ctx'> 	unsigned int desc_count, unsigned int desc_size)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='ctx'> 	cq-&gt;index = index;</div><div class='ctx'> 	cq-&gt;vdev = vdev;</div><div class='ctx'> </div><div class='hunk'>@@ -47,11 +32,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = vnic_dev_alloc_desc_ring(vdev, &amp;cq-&gt;ring, desc_count, desc_size);</div><div class='del'>-	if (err)</div><div class='del'>-		return err;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	return vnic_dev_alloc_desc_ring(vdev, &amp;cq-&gt;ring, desc_count, desc_size);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vnic_cq_init(struct vnic_cq *cq, unsigned int flow_control_enable,</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_cq.h b/drivers/net/ethernet/cisco/enic/vnic_cq.h<br/>index 4e6aa65857f7..0e37f5d5e527 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_cq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_cq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_cq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_cq.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_CQ_H_</div><div class='hunk'>@@ -69,45 +56,18 @@ struct vnic_cq {</div><div class='ctx'> 	ktime_t prev_ts;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static inline unsigned int vnic_cq_service(struct vnic_cq *cq,</div><div class='del'>-	unsigned int work_to_do,</div><div class='del'>-	int (*q_service)(struct vnic_dev *vdev, struct cq_desc *cq_desc,</div><div class='del'>-	u8 type, u16 q_number, u16 completed_index, void *opaque),</div><div class='del'>-	void *opaque)</div><div class='add'>+static inline void *vnic_cq_to_clean(struct vnic_cq *cq)</div><div class='ctx'> {</div><div class='del'>-	struct cq_desc *cq_desc;</div><div class='del'>-	unsigned int work_done = 0;</div><div class='del'>-	u16 q_number, completed_index;</div><div class='del'>-	u8 type, color;</div><div class='del'>-</div><div class='del'>-	cq_desc = (struct cq_desc *)((u8 *)cq-&gt;ring.descs +</div><div class='del'>-		cq-&gt;ring.desc_size * cq-&gt;to_clean);</div><div class='del'>-	cq_desc_dec(cq_desc, &amp;type, &amp;color,</div><div class='del'>-		&amp;q_number, &amp;completed_index);</div><div class='del'>-</div><div class='del'>-	while (color != cq-&gt;last_color) {</div><div class='del'>-</div><div class='del'>-		if ((*q_service)(cq-&gt;vdev, cq_desc, type,</div><div class='del'>-			q_number, completed_index, opaque))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		cq-&gt;to_clean++;</div><div class='del'>-		if (cq-&gt;to_clean == cq-&gt;ring.desc_count) {</div><div class='del'>-			cq-&gt;to_clean = 0;</div><div class='del'>-			cq-&gt;last_color = cq-&gt;last_color ? 0 : 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cq_desc = (struct cq_desc *)((u8 *)cq-&gt;ring.descs +</div><div class='del'>-			cq-&gt;ring.desc_size * cq-&gt;to_clean);</div><div class='del'>-		cq_desc_dec(cq_desc, &amp;type, &amp;color,</div><div class='del'>-			&amp;q_number, &amp;completed_index);</div><div class='add'>+	return ((u8 *)cq-&gt;ring.descs + cq-&gt;ring.desc_size * cq-&gt;to_clean);</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-		work_done++;</div><div class='del'>-		if (work_done &gt;= work_to_do)</div><div class='del'>-			break;</div><div class='add'>+static inline void vnic_cq_inc_to_clean(struct vnic_cq *cq)</div><div class='add'>+{</div><div class='add'>+	cq-&gt;to_clean++;</div><div class='add'>+	if (cq-&gt;to_clean == cq-&gt;ring.desc_count) {</div><div class='add'>+		cq-&gt;to_clean = 0;</div><div class='add'>+		cq-&gt;last_color = cq-&gt;last_color ? 0 : 1;</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void vnic_cq_free(struct vnic_cq *cq);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c<br/>index 901e44b0b795..9f6089e81608 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_dev.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_dev.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_dev.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_dev.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -159,23 +146,19 @@ EXPORT_SYMBOL(vnic_dev_get_res);</div><div class='ctx'> static unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring,</div><div class='ctx'> 	unsigned int desc_count, unsigned int desc_size)</div><div class='ctx'> {</div><div class='del'>-	/* The base address of the desc rings must be 512 byte aligned.</div><div class='del'>-	 * Descriptor count is aligned to groups of 32 descriptors.  A</div><div class='del'>-	 * count of 0 means the maximum 4096 descriptors.  Descriptor</div><div class='del'>-	 * size is aligned to 16 bytes.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	unsigned int count_align = 32;</div><div class='del'>-	unsigned int desc_align = 16;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;base_align = 512;</div><div class='add'>+	/* Descriptor ring base address alignment in bytes*/</div><div class='add'>+	ring-&gt;base_align = VNIC_DESC_BASE_ALIGN;</div><div class='ctx'> </div><div class='add'>+	/* A count of 0 means the maximum descriptors */</div><div class='ctx'> 	if (desc_count == 0)</div><div class='del'>-		desc_count = 4096;</div><div class='add'>+		desc_count = VNIC_DESC_MAX_COUNT;</div><div class='ctx'> </div><div class='del'>-	ring-&gt;desc_count = ALIGN(desc_count, count_align);</div><div class='add'>+	/* Descriptor count aligned in groups of VNIC_DESC_COUNT_ALIGN descriptors */</div><div class='add'>+	ring-&gt;desc_count = ALIGN(desc_count, VNIC_DESC_COUNT_ALIGN);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;desc_size = ALIGN(desc_size, desc_align);</div><div class='add'>+	/* Descriptor size alignment in bytes */</div><div class='add'>+	ring-&gt;desc_size = ALIGN(desc_size, VNIC_DESC_SIZE_ALIGN);</div><div class='ctx'> </div><div class='ctx'> 	ring-&gt;size = ring-&gt;desc_count * ring-&gt;desc_size;</div><div class='ctx'> 	ring-&gt;size_unaligned = ring-&gt;size + ring-&gt;base_align;</div><div class='hunk'>@@ -193,9 +176,10 @@ int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,</div><div class='ctx'> {</div><div class='ctx'> 	vnic_dev_desc_ring_size(ring, desc_count, desc_size);</div><div class='ctx'> </div><div class='del'>-	ring-&gt;descs_unaligned = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='del'>-		ring-&gt;size_unaligned,</div><div class='del'>-		&amp;ring-&gt;base_addr_unaligned);</div><div class='add'>+	ring-&gt;descs_unaligned = dma_alloc_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+						   ring-&gt;size_unaligned,</div><div class='add'>+						   &amp;ring-&gt;base_addr_unaligned,</div><div class='add'>+						   GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 	if (!ring-&gt;descs_unaligned) {</div><div class='ctx'> 		vdev_err(vdev, "Failed to allocate ring (size=%d), aborting\n",</div><div class='hunk'>@@ -218,10 +202,9 @@ int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,</div><div class='ctx'> void vnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring)</div><div class='ctx'> {</div><div class='ctx'> 	if (ring-&gt;descs) {</div><div class='del'>-		pci_free_consistent(vdev-&gt;pdev,</div><div class='del'>-			ring-&gt;size_unaligned,</div><div class='del'>-			ring-&gt;descs_unaligned,</div><div class='del'>-			ring-&gt;base_addr_unaligned);</div><div class='add'>+		dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev, ring-&gt;size_unaligned,</div><div class='add'>+				  ring-&gt;descs_unaligned,</div><div class='add'>+				  ring-&gt;base_addr_unaligned);</div><div class='ctx'> 		ring-&gt;descs = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -551,9 +534,9 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!vdev-&gt;fw_info) {</div><div class='del'>-		vdev-&gt;fw_info = pci_zalloc_consistent(vdev-&gt;pdev,</div><div class='del'>-						      sizeof(struct vnic_devcmd_fw_info),</div><div class='del'>-						      &amp;vdev-&gt;fw_info_pa);</div><div class='add'>+		vdev-&gt;fw_info = dma_alloc_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+						   sizeof(struct vnic_devcmd_fw_info),</div><div class='add'>+						   &amp;vdev-&gt;fw_info_pa, GFP_ATOMIC);</div><div class='ctx'> 		if (!vdev-&gt;fw_info)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -603,8 +586,9 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats)</div><div class='ctx'> 	int wait = 1000;</div><div class='ctx'> </div><div class='ctx'> 	if (!vdev-&gt;stats) {</div><div class='del'>-		vdev-&gt;stats = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='del'>-			sizeof(struct vnic_stats), &amp;vdev-&gt;stats_pa);</div><div class='add'>+		vdev-&gt;stats = dma_alloc_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+						 sizeof(struct vnic_stats),</div><div class='add'>+						 &amp;vdev-&gt;stats_pa, GFP_ATOMIC);</div><div class='ctx'> 		if (!vdev-&gt;stats)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -852,9 +836,9 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	notify_addr = pci_alloc_consistent(vdev-&gt;pdev,</div><div class='del'>-			sizeof(struct vnic_devcmd_notify),</div><div class='del'>-			&amp;notify_pa);</div><div class='add'>+	notify_addr = dma_alloc_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+					 sizeof(struct vnic_devcmd_notify),</div><div class='add'>+					 &amp;notify_pa, GFP_ATOMIC);</div><div class='ctx'> 	if (!notify_addr)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -882,10 +866,9 @@ static int vnic_dev_notify_unsetcmd(struct vnic_dev *vdev)</div><div class='ctx'> int vnic_dev_notify_unset(struct vnic_dev *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (vdev-&gt;notify) {</div><div class='del'>-		pci_free_consistent(vdev-&gt;pdev,</div><div class='del'>-			sizeof(struct vnic_devcmd_notify),</div><div class='del'>-			vdev-&gt;notify,</div><div class='del'>-			vdev-&gt;notify_pa);</div><div class='add'>+		dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+				  sizeof(struct vnic_devcmd_notify),</div><div class='add'>+				  vdev-&gt;notify, vdev-&gt;notify_pa);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return vnic_dev_notify_unsetcmd(vdev);</div><div class='hunk'>@@ -1046,18 +1029,17 @@ void vnic_dev_unregister(struct vnic_dev *vdev)</div><div class='ctx'> {</div><div class='ctx'> 	if (vdev) {</div><div class='ctx'> 		if (vdev-&gt;notify)</div><div class='del'>-			pci_free_consistent(vdev-&gt;pdev,</div><div class='del'>-				sizeof(struct vnic_devcmd_notify),</div><div class='del'>-				vdev-&gt;notify,</div><div class='del'>-				vdev-&gt;notify_pa);</div><div class='add'>+			dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+					  sizeof(struct vnic_devcmd_notify),</div><div class='add'>+					  vdev-&gt;notify, vdev-&gt;notify_pa);</div><div class='ctx'> 		if (vdev-&gt;stats)</div><div class='del'>-			pci_free_consistent(vdev-&gt;pdev,</div><div class='del'>-				sizeof(struct vnic_stats),</div><div class='del'>-				vdev-&gt;stats, vdev-&gt;stats_pa);</div><div class='add'>+			dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+					  sizeof(struct vnic_stats),</div><div class='add'>+					  vdev-&gt;stats, vdev-&gt;stats_pa);</div><div class='ctx'> 		if (vdev-&gt;fw_info)</div><div class='del'>-			pci_free_consistent(vdev-&gt;pdev,</div><div class='del'>-				sizeof(struct vnic_devcmd_fw_info),</div><div class='del'>-				vdev-&gt;fw_info, vdev-&gt;fw_info_pa);</div><div class='add'>+			dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev,</div><div class='add'>+					  sizeof(struct vnic_devcmd_fw_info),</div><div class='add'>+					  vdev-&gt;fw_info, vdev-&gt;fw_info_pa);</div><div class='ctx'> 		if (vdev-&gt;devcmd2)</div><div class='ctx'> 			vnic_dev_deinit_devcmd2(vdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1127,7 +1109,7 @@ int vnic_dev_init_prov2(struct vnic_dev *vdev, u8 *buf, u32 len)</div><div class='ctx'> 	void *prov_buf;</div><div class='ctx'> 	int ret;</div><div class='ctx'> </div><div class='del'>-	prov_buf = pci_alloc_consistent(vdev-&gt;pdev, len, &amp;prov_pa);</div><div class='add'>+	prov_buf = dma_alloc_coherent(&amp;vdev-&gt;pdev-&gt;dev, len, &amp;prov_pa, GFP_ATOMIC);</div><div class='ctx'> 	if (!prov_buf)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1137,7 +1119,7 @@ int vnic_dev_init_prov2(struct vnic_dev *vdev, u8 *buf, u32 len)</div><div class='ctx'> </div><div class='ctx'> 	ret = vnic_dev_cmd(vdev, CMD_INIT_PROV_INFO2, &amp;a0, &amp;a1, wait);</div><div class='ctx'> </div><div class='del'>-	pci_free_consistent(vdev-&gt;pdev, len, prov_buf, prov_pa);</div><div class='add'>+	dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev, len, prov_buf, prov_pa);</div><div class='ctx'> </div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -1217,7 +1199,8 @@ int vnic_dev_classifier(struct vnic_dev *vdev, u8 cmd, u16 *entry,</div><div class='ctx'> 		tlv_size = sizeof(struct filter) +</div><div class='ctx'> 			   sizeof(struct filter_action) +</div><div class='ctx'> 			   2 * sizeof(struct filter_tlv);</div><div class='del'>-		tlv_va = pci_alloc_consistent(vdev-&gt;pdev, tlv_size, &amp;tlv_pa);</div><div class='add'>+		tlv_va = dma_alloc_coherent(&amp;vdev-&gt;pdev-&gt;dev, tlv_size,</div><div class='add'>+					    &amp;tlv_pa, GFP_ATOMIC);</div><div class='ctx'> 		if (!tlv_va)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		tlv = tlv_va;</div><div class='hunk'>@@ -1240,7 +1223,7 @@ int vnic_dev_classifier(struct vnic_dev *vdev, u8 cmd, u16 *entry,</div><div class='ctx'> </div><div class='ctx'> 		ret = vnic_dev_cmd(vdev, CMD_ADD_FILTER, &amp;a0, &amp;a1, wait);</div><div class='ctx'> 		*entry = (u16)a0;</div><div class='del'>-		pci_free_consistent(vdev-&gt;pdev, tlv_size, tlv_va, tlv_pa);</div><div class='add'>+		dma_free_coherent(&amp;vdev-&gt;pdev-&gt;dev, tlv_size, tlv_va, tlv_pa);</div><div class='ctx'> 	} else if (cmd == CLSF_DEL) {</div><div class='ctx'> 		a0 = *entry;</div><div class='ctx'> 		ret = vnic_dev_cmd(vdev, CMD_DEL_FILTER, &amp;a0, &amp;a1, wait);</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.h b/drivers/net/ethernet/cisco/enic/vnic_dev.h<br/>index 714fc1ed79e3..7fdd8c661c99 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_dev.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_dev.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_dev.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_dev.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_DEV_H_</div><div class='hunk'>@@ -44,6 +31,11 @@ static inline void writeq(u64 val, void __iomem *reg)</div><div class='ctx'> #undef pr_fmt</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='add'>+#define VNIC_DESC_SIZE_ALIGN	16</div><div class='add'>+#define VNIC_DESC_COUNT_ALIGN	32</div><div class='add'>+#define VNIC_DESC_BASE_ALIGN	512</div><div class='add'>+#define VNIC_DESC_MAX_COUNT	4096</div><div class='add'>+</div><div class='ctx'> enum vnic_dev_intr_mode {</div><div class='ctx'> 	VNIC_DEV_INTR_MODE_UNKNOWN,</div><div class='ctx'> 	VNIC_DEV_INTR_MODE_INTX,</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_devcmd.h b/drivers/net/ethernet/cisco/enic/vnic_devcmd.h<br/>index fef5a0a0663d..605ef17f967e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_devcmd.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_devcmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_devcmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_devcmd.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_DEVCMD_H_</div><div class='hunk'>@@ -449,6 +436,25 @@ enum vnic_devcmd_cmd {</div><div class='ctx'> 	 * in: (u16) a2 = unsigned short int port information</div><div class='ctx'> 	 */</div><div class='ctx'> 	CMD_OVERLAY_OFFLOAD_CFG = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 73),</div><div class='add'>+</div><div class='add'>+	/*</div><div class='add'>+	 * Set extended CQ field in MREGS of RQ (or all RQs)</div><div class='add'>+	 * for given vNIC</div><div class='add'>+	 * in: (u64) a0 = RQ selection (VNIC_RQ_ALL for all RQs)</div><div class='add'>+	 *     (u32) a1 = CQ entry size</div><div class='add'>+	 *         VNIC_RQ_CQ_ENTRY_SIZE_16 --&gt; 16 bytes</div><div class='add'>+	 *         VNIC_RQ_CQ_ENTRY_SIZE_32 --&gt; 32 bytes</div><div class='add'>+	 *         VNIC_RQ_CQ_ENTRY_SIZE_64 --&gt; 64 bytes</div><div class='add'>+	 *</div><div class='add'>+	 * Capability query:</div><div class='add'>+	 * out: (u32) a0 = errno, 0:valid cmd</div><div class='add'>+	 *      (u32) a1 = value consisting of supported entries</div><div class='add'>+	 *         bit 0: 16 bytes</div><div class='add'>+	 *         bit 1: 32 bytes</div><div class='add'>+	 *         bit 2: 64 bytes</div><div class='add'>+	 */</div><div class='add'>+	CMD_CQ_ENTRY_SIZE_SET = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 90),</div><div class='add'>+</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* CMD_ENABLE2 flags */</div><div class='hunk'>@@ -541,7 +547,7 @@ struct vnic_devcmd_notify {</div><div class='ctx'> struct vnic_devcmd_provinfo {</div><div class='ctx'> 	u8 oui[3];</div><div class='ctx'> 	u8 type;</div><div class='del'>-	u8 data[0];</div><div class='add'>+	u8 data[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* These are used in flags field of different filters to denote</div><div class='hunk'>@@ -648,9 +654,9 @@ enum {</div><div class='ctx'> #define FILTER_MAX_BUF_SIZE 100</div><div class='ctx'> </div><div class='ctx'> struct filter_tlv {</div><div class='del'>-	u_int32_t type;</div><div class='del'>-	u_int32_t length;</div><div class='del'>-	u_int32_t val[0];</div><div class='add'>+	u32 type;</div><div class='add'>+	u32 length;</div><div class='add'>+	u32 val[];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_enet.h b/drivers/net/ethernet/cisco/enic/vnic_enet.h<br/>index 7d6fbb5635a4..9e8e86262a3f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_enet.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_enet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_enet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_enet.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_ENIC_H_</div><div class='hunk'>@@ -34,6 +21,11 @@ struct vnic_enet_config {</div><div class='ctx'> 	u16 loop_tag;</div><div class='ctx'> 	u16 vf_rq_count;</div><div class='ctx'> 	u16 num_arfs;</div><div class='add'>+	u8 reserved[66];</div><div class='add'>+	u32 max_rq_ring;	// MAX RQ ring size</div><div class='add'>+	u32 max_wq_ring;	// MAX WQ ring size</div><div class='add'>+	u32 max_cq_ring;	// MAX CQ ring size</div><div class='add'>+	u32 rdma_rsvd_lkey;	// Reserved (privileged) LKey</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define VENETF_TSO		0x1	/* TSO enabled */</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_intr.c b/drivers/net/ethernet/cisco/enic/vnic_intr.c<br/>index 23604e3d4455..25319f072a04 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_intr.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_intr.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_intr.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_intr.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_intr.h b/drivers/net/ethernet/cisco/enic/vnic_intr.h<br/>index 2b1636392294..33a72aa10b26 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_intr.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_intr.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_intr.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_intr.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_INTR_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_nic.h b/drivers/net/ethernet/cisco/enic/vnic_nic.h<br/>index 84ff8ca17fcb..04fee45b5d39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_nic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_nic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_nic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_nic.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_NIC_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_resource.h b/drivers/net/ethernet/cisco/enic/vnic_resource.h<br/>index 4e45f88ac1d4..b4776e334d63 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_resource.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_resource.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_resource.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_resource.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_RESOURCE_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c<br/>index a3e7b003ada1..5ae80551f17c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_rq.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_rq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_rq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_rq.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -216,4 +203,3 @@ void vnic_rq_clean(struct vnic_rq *rq,</div><div class='ctx'> </div><div class='ctx'> 	vnic_dev_clear_desc_ring(&amp;rq-&gt;ring);</div><div class='ctx'> }</div><div class='del'>-</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_rq.h b/drivers/net/ethernet/cisco/enic/vnic_rq.h<br/>index 0413103ebe94..a1cdd729caec 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_rq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_rq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_rq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_rq.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_RQ_H_</div><div class='hunk'>@@ -63,7 +50,7 @@ struct vnic_rq_ctrl {</div><div class='ctx'> 	(VNIC_RQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_rq_buf))</div><div class='ctx'> #define VNIC_RQ_BUF_BLKS_NEEDED(entries) \</div><div class='ctx'> 	DIV_ROUND_UP(entries, VNIC_RQ_BUF_BLK_ENTRIES(entries))</div><div class='del'>-#define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(4096)</div><div class='add'>+#define VNIC_RQ_BUF_BLKS_MAX VNIC_RQ_BUF_BLKS_NEEDED(16384)</div><div class='ctx'> </div><div class='ctx'> struct vnic_rq_buf {</div><div class='ctx'> 	struct vnic_rq_buf *next;</div><div class='hunk'>@@ -74,6 +61,8 @@ struct vnic_rq_buf {</div><div class='ctx'> 	unsigned int index;</div><div class='ctx'> 	void *desc;</div><div class='ctx'> 	uint64_t wr_id;</div><div class='add'>+	unsigned int offset;</div><div class='add'>+	unsigned int truesize;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum enic_poll_state {</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_rss.h b/drivers/net/ethernet/cisco/enic/vnic_rss.h<br/>index 881fa18542b3..4dcf0e61cb13 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_rss.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_rss.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_rss.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_rss.h</a></div><div class='hunk'>@@ -1,19 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_RSS_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_stats.h b/drivers/net/ethernet/cisco/enic/vnic_stats.h<br/>index 74c81ed6fdab..2dd04322d760 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_stats.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_stats.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_stats.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_stats.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_STATS_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_vic.c b/drivers/net/ethernet/cisco/enic/vnic_vic.c<br/>index 24ef8cd40545..66b577835338 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_vic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_vic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_vic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_vic.c</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2010 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+// Copyright 2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -64,7 +49,8 @@ int vic_provinfo_add_tlv(struct vic_provinfo *vp, u16 type, u16 length,</div><div class='ctx'> </div><div class='ctx'> 	tlv-&gt;type = htons(type);</div><div class='ctx'> 	tlv-&gt;length = htons(length);</div><div class='del'>-	memcpy(tlv-&gt;value, value, length);</div><div class='add'>+	unsafe_memcpy(tlv-&gt;value, value, length,</div><div class='add'>+		      /* Flexible array of flexible arrays */);</div><div class='ctx'> </div><div class='ctx'> 	vp-&gt;num_tlvs = htonl(ntohl(vp-&gt;num_tlvs) + 1);</div><div class='ctx'> 	vp-&gt;length = htonl(ntohl(vp-&gt;length) +</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_vic.h b/drivers/net/ethernet/cisco/enic/vnic_vic.h<br/>index 9ef81f148351..b51c1c52f8bf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_vic.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_vic.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_vic.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_vic.h</a></div><div class='hunk'>@@ -1,20 +1,5 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2010 Cisco Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='del'>- */</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/* Copyright 2010 Cisco Systems, Inc.  All rights reserved. */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_VIC_H_</div><div class='ctx'> #define _VNIC_VIC_H_</div><div class='hunk'>@@ -59,7 +44,7 @@ struct vic_provinfo {</div><div class='ctx'> 		u16 type;</div><div class='ctx'> 		u16 length;</div><div class='ctx'> 		u8 value[0];</div><div class='del'>-	} tlv[0];</div><div class='add'>+	} tlv[];</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> #define VIC_PROVINFO_ADD_TLV(vp, tlvtype, tlvlen, data) \</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c<br/>index eb75891974df..29c7900349b2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_wq.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_wq.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_wq.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_wq.c</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h<br/>index 01209613d57d..3bb4758100ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_wq.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/vnic_wq.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/vnic_wq.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/vnic_wq.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _VNIC_WQ_H_</div><div class='hunk'>@@ -75,7 +62,7 @@ struct vnic_wq_buf {</div><div class='ctx'> 	(VNIC_WQ_BUF_BLK_ENTRIES(entries) * sizeof(struct vnic_wq_buf))</div><div class='ctx'> #define VNIC_WQ_BUF_BLKS_NEEDED(entries) \</div><div class='ctx'> 	DIV_ROUND_UP(entries, VNIC_WQ_BUF_BLK_ENTRIES(entries))</div><div class='del'>-#define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(4096)</div><div class='add'>+#define VNIC_WQ_BUF_BLKS_MAX VNIC_WQ_BUF_BLKS_NEEDED(16384)</div><div class='ctx'> </div><div class='ctx'> struct vnic_wq {</div><div class='ctx'> 	unsigned int index;</div><div class='head'>diff --git a/drivers/net/ethernet/cisco/enic/wq_enet_desc.h b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h<br/>index c7021e3a631f..425e46a804ee 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/wq_enet_desc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cisco/enic/wq_enet_desc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cisco/enic/wq_enet_desc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cisco/enic/wq_enet_desc.h</a></div><div class='hunk'>@@ -1,20 +1,7 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.</div><div class='ctx'>  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you may redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License as published by</div><div class='del'>- * the Free Software Foundation; version 2 of the License.</div><div class='del'>- *</div><div class='del'>- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,</div><div class='del'>- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF</div><div class='del'>- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND</div><div class='del'>- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS</div><div class='del'>- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN</div><div class='del'>- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN</div><div class='del'>- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE</div><div class='del'>- * SOFTWARE.</div><div class='del'>- *</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef _WQ_ENET_DESC_H_</div><div class='head'>diff --git a/drivers/net/ethernet/cortina/Kconfig b/drivers/net/ethernet/cortina/Kconfig<br/>index 89bc4579724d..aaf9e294b70b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cortina/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cortina/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cortina/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cortina/Kconfig</a></div><div class='hunk'>@@ -4,10 +4,10 @@</div><div class='ctx'> config NET_VENDOR_CORTINA</div><div class='ctx'> 	bool "Cortina Gemini devices"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y</div><div class='ctx'> 	  and read the Ethernet-HOWTO, available from</div><div class='del'>-	  &lt;http://www.tldp.org/docs.html#howto&gt;.</div><div class='add'>+	  &lt;https://www.tldp.org/docs.html#howto&gt;.</div><div class='ctx'> </div><div class='ctx'> if NET_VENDOR_CORTINA</div><div class='ctx'> </div><div class='hunk'>@@ -17,7 +17,7 @@ config GEMINI_ETHERNET</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports StorLink SL351x (Gemini) dual Gigabit Ethernet.</div><div class='ctx'> </div><div class='ctx'> endif # NET_VENDOR_CORTINA</div><div class='head'>diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c<br/>index 9003eb6716cd..6a2004bbe87f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cortina/gemini.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cortina/gemini.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cortina/gemini.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cortina/gemini.c</a></div><div class='hunk'>@@ -40,11 +40,11 @@</div><div class='ctx'> #include &lt;linux/in.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;net/gro.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "gemini.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"gmac-gemini"</div><div class='del'>-#define DRV_VERSION		"1.0"</div><div class='ctx'> </div><div class='ctx'> #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)</div><div class='ctx'> static int debug = -1;</div><div class='hunk'>@@ -69,7 +69,6 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");</div><div class='ctx'> #define DEFAULT_GMAC_RXQ_ORDER		9</div><div class='ctx'> #define DEFAULT_GMAC_TXQ_ORDER		8</div><div class='ctx'> #define DEFAULT_RX_BUF_ORDER		11</div><div class='del'>-#define DEFAULT_NAPI_WEIGHT		64</div><div class='ctx'> #define TX_MAX_FRAGS			16</div><div class='ctx'> #define TX_QUEUE_NUM			1	/* max: 6 */</div><div class='ctx'> #define RX_MAX_ALLOC_ORDER		2</div><div class='hunk'>@@ -81,11 +80,13 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");</div><div class='ctx'> #define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT)</div><div class='ctx'> </div><div class='ctx'> #define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \</div><div class='del'>-		NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \</div><div class='del'>-		NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)</div><div class='add'>+			       NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \</div><div class='add'>+			       NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct gmac_queue_page - page buffer per-page info</div><div class='add'>+ * @page: the page struct</div><div class='add'>+ * @mapping: the dma address handle</div><div class='ctx'>  */</div><div class='ctx'> struct gmac_queue_page {</div><div class='ctx'> 	struct page *page;</div><div class='hunk'>@@ -288,13 +289,13 @@ static void gmac_set_flow_control(struct net_device *netdev, bool tx, bool rx)</div><div class='ctx'> 	spin_unlock_irqrestore(&amp;port-&gt;config_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gmac_speed_set(struct net_device *netdev)</div><div class='add'>+static void gmac_adjust_link(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> 	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='ctx'> 	union gmac_status status, old_status;</div><div class='del'>-	int pause_tx = 0;</div><div class='del'>-	int pause_rx = 0;</div><div class='add'>+	bool pause_tx = false;</div><div class='add'>+	bool pause_rx = false;</div><div class='ctx'> </div><div class='ctx'> 	status.bits32 = readl(port-&gt;gmac_base + GMAC_STATUS);</div><div class='ctx'> 	old_status.bits32 = status.bits32;</div><div class='hunk'>@@ -304,21 +305,21 @@ static void gmac_speed_set(struct net_device *netdev)</div><div class='ctx'> 	switch (phydev-&gt;speed) {</div><div class='ctx'> 	case 1000:</div><div class='ctx'> 		status.bits.speed = GMAC_SPEED_1000;</div><div class='del'>-		if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII)</div><div class='add'>+		if (phy_interface_mode_is_rgmii(phydev-&gt;interface))</div><div class='ctx'> 			status.bits.mii_rmii = GMAC_PHY_RGMII_1000;</div><div class='ctx'> 		netdev_dbg(netdev, "connect %s to RGMII @ 1Gbit\n",</div><div class='ctx'> 			   phydev_name(phydev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 100:</div><div class='ctx'> 		status.bits.speed = GMAC_SPEED_100;</div><div class='del'>-		if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII)</div><div class='add'>+		if (phy_interface_mode_is_rgmii(phydev-&gt;interface))</div><div class='ctx'> 			status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;</div><div class='ctx'> 		netdev_dbg(netdev, "connect %s to RGMII @ 100 Mbit\n",</div><div class='ctx'> 			   phydev_name(phydev));</div><div class='ctx'> 		break;</div><div class='ctx'> 	case 10:</div><div class='ctx'> 		status.bits.speed = GMAC_SPEED_10;</div><div class='del'>-		if (phydev-&gt;interface == PHY_INTERFACE_MODE_RGMII)</div><div class='add'>+		if (phy_interface_mode_is_rgmii(phydev-&gt;interface))</div><div class='ctx'> 			status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;</div><div class='ctx'> 		netdev_dbg(netdev, "connect %s to RGMII @ 10 Mbit\n",</div><div class='ctx'> 			   phydev_name(phydev));</div><div class='hunk'>@@ -329,14 +330,9 @@ static void gmac_speed_set(struct net_device *netdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (phydev-&gt;duplex == DUPLEX_FULL) {</div><div class='del'>-		u16 lcladv = phy_read(phydev, MII_ADVERTISE);</div><div class='del'>-		u16 rmtadv = phy_read(phydev, MII_LPA);</div><div class='del'>-		u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv);</div><div class='del'>-</div><div class='del'>-		if (cap &amp; FLOW_CTRL_RX)</div><div class='del'>-			pause_rx = 1;</div><div class='del'>-		if (cap &amp; FLOW_CTRL_TX)</div><div class='del'>-			pause_tx = 1;</div><div class='add'>+		phy_get_pause(phydev, &amp;pause_tx, &amp;pause_rx);</div><div class='add'>+		netdev_dbg(netdev, "set negotiated pause params pause TX = %s, pause RX = %s\n",</div><div class='add'>+			   pause_tx ? "ON" : "OFF", pause_rx ? "ON" : "OFF");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	gmac_set_flow_control(netdev, pause_tx, pause_rx);</div><div class='hunk'>@@ -367,7 +363,7 @@ static int gmac_setup_phy(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	phy = of_phy_get_and_connect(netdev,</div><div class='ctx'> 				     dev-&gt;of_node,</div><div class='del'>-				     gmac_speed_set);</div><div class='add'>+				     gmac_adjust_link);</div><div class='ctx'> 	if (!phy)</div><div class='ctx'> 		return -ENODEV;</div><div class='ctx'> 	netdev-&gt;phydev = phy;</div><div class='hunk'>@@ -388,6 +384,9 @@ static int gmac_setup_phy(struct net_device *netdev)</div><div class='ctx'> 		status.bits.mii_rmii = GMAC_PHY_GMII;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='ctx'> 		netdev_dbg(netdev,</div><div class='ctx'> 			   "RGMII: set GMAC0 and GMAC1 to MII/RGMII mode\n");</div><div class='ctx'> 		status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;</div><div class='hunk'>@@ -429,8 +428,8 @@ static const struct gmac_max_framelen gmac_maxlens[] = {</div><div class='ctx'> 		.val = CONFIG0_MAXLEN_1536,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='del'>-		.max_l3_len = 1542,</div><div class='del'>-		.val = CONFIG0_MAXLEN_1542,</div><div class='add'>+		.max_l3_len = 1548,</div><div class='add'>+		.val = CONFIG0_MAXLEN_1548,</div><div class='ctx'> 	},</div><div class='ctx'> 	{</div><div class='ctx'> 		.max_l3_len = 9212,</div><div class='hunk'>@@ -510,7 +509,6 @@ static int gmac_init(struct net_device *netdev)</div><div class='ctx'> 		.rel_threshold = 0,</div><div class='ctx'> 	} };</div><div class='ctx'> 	union gmac_config0 tmp;</div><div class='del'>-	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	config0.bits.max_len = gmac_pick_rx_max_len(netdev-&gt;mtu);</div><div class='ctx'> 	tmp.bits32 = readl(port-&gt;gmac_base + GMAC_CONFIG0);</div><div class='hunk'>@@ -520,7 +518,7 @@ static int gmac_init(struct net_device *netdev)</div><div class='ctx'> 	writel(config2.bits32, port-&gt;gmac_base + GMAC_CONFIG2);</div><div class='ctx'> 	writel(config3.bits32, port-&gt;gmac_base + GMAC_CONFIG3);</div><div class='ctx'> </div><div class='del'>-	val = readl(port-&gt;dma_base + GMAC_AHB_WEIGHT_REG);</div><div class='add'>+	readl(port-&gt;dma_base + GMAC_AHB_WEIGHT_REG);</div><div class='ctx'> 	writel(ahb_weight.bits32, port-&gt;dma_base + GMAC_AHB_WEIGHT_REG);</div><div class='ctx'> </div><div class='ctx'> 	writel(hw_weigh.bits32,</div><div class='hunk'>@@ -540,12 +538,6 @@ static int gmac_init(struct net_device *netdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gmac_uninit(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	if (netdev-&gt;phydev)</div><div class='del'>-		phy_disconnect(netdev-&gt;phydev);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int gmac_setup_txqs(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='hunk'>@@ -576,6 +568,8 @@ static int gmac_setup_txqs(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	if (port-&gt;txq_dma_base &amp; ~DMA_Q_BASE_MASK) {</div><div class='ctx'> 		dev_warn(geth-&gt;dev, "TX queue base is not aligned\n");</div><div class='add'>+		dma_free_coherent(geth-&gt;dev, len * sizeof(*desc_ring),</div><div class='add'>+				  desc_ring, port-&gt;txq_dma_base);</div><div class='ctx'> 		kfree(skb_tab);</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1110,10 +1104,13 @@ static void gmac_tx_irq_enable(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> 	struct gemini_ethernet *geth = port-&gt;geth;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	u32 val, mask;</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(netdev, "%s device %d\n", __func__, netdev-&gt;dev_id);</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;geth-&gt;irq_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	mask = GMAC0_IRQ0_TXQ0_INTS &lt;&lt; (6 * netdev-&gt;dev_id + txq);</div><div class='ctx'> </div><div class='ctx'> 	if (en)</div><div class='hunk'>@@ -1122,6 +1119,8 @@ static void gmac_tx_irq_enable(struct net_device *netdev,</div><div class='ctx'> 	val = readl(geth-&gt;base + GLOBAL_INTERRUPT_ENABLE_0_REG);</div><div class='ctx'> 	val = en ? val | mask : val &amp; ~mask;</div><div class='ctx'> 	writel(val, geth-&gt;base + GLOBAL_INTERRUPT_ENABLE_0_REG);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;geth-&gt;irq_lock, flags);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void gmac_tx_irq(struct net_device *netdev, unsigned int txq_num)</div><div class='hunk'>@@ -1145,32 +1144,79 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,</div><div class='ctx'> 	struct gmac_txdesc *txd;</div><div class='ctx'> 	skb_frag_t *skb_frag;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='del'>-	unsigned short mtu;</div><div class='add'>+	bool tcp = false;</div><div class='ctx'> 	void *buffer;</div><div class='del'>-</div><div class='del'>-	mtu  = ETH_HLEN;</div><div class='del'>-	mtu += netdev-&gt;mtu;</div><div class='del'>-	if (skb-&gt;protocol == htons(ETH_P_8021Q))</div><div class='del'>-		mtu += VLAN_HLEN;</div><div class='add'>+	u16 mss;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	word1 = skb-&gt;len;</div><div class='ctx'> 	word3 = SOF_BIT;</div><div class='ctx'> </div><div class='del'>-	if (word1 &gt; mtu) {</div><div class='add'>+	/* Determine if we are doing TCP */</div><div class='add'>+	if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='add'>+		tcp = (ip_hdr(skb)-&gt;protocol == IPPROTO_TCP);</div><div class='add'>+	else</div><div class='add'>+		/* IPv6 */</div><div class='add'>+		tcp = (ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_TCP);</div><div class='add'>+</div><div class='add'>+	mss = skb_shinfo(skb)-&gt;gso_size;</div><div class='add'>+	if (mss) {</div><div class='add'>+		/* This means we are dealing with TCP and skb-&gt;len is the</div><div class='add'>+		 * sum total of all the segments. The TSO will deal with</div><div class='add'>+		 * chopping this up for us.</div><div class='add'>+		 */</div><div class='add'>+		/* The accelerator needs the full frame size here */</div><div class='add'>+		mss += skb_tcp_all_headers(skb);</div><div class='add'>+		netdev_dbg(netdev, "segment offloading mss = %04x len=%04x\n",</div><div class='add'>+			   mss, skb-&gt;len);</div><div class='ctx'> 		word1 |= TSS_MTU_ENABLE_BIT;</div><div class='del'>-		word3 |= mtu;</div><div class='add'>+		word3 |= mss;</div><div class='add'>+	} else if (tcp) {</div><div class='add'>+		/* Even if we are not using TSO, use the hardware offloader</div><div class='add'>+		 * for transferring the TCP frame: this hardware has partial</div><div class='add'>+		 * TCP awareness (called TOE - TCP Offload Engine) and will</div><div class='add'>+		 * according to the datasheet put packets belonging to the</div><div class='add'>+		 * same TCP connection in the same queue for the TOE/TSO</div><div class='add'>+		 * engine to process. The engine will deal with chopping</div><div class='add'>+		 * up frames that exceed ETH_DATA_LEN which the</div><div class='add'>+		 * checksumming engine cannot handle (see below) into</div><div class='add'>+		 * manageable chunks. It flawlessly deals with quite big</div><div class='add'>+		 * frames and frames containing custom DSA EtherTypes.</div><div class='add'>+		 */</div><div class='add'>+		mss = netdev-&gt;mtu + skb_tcp_all_headers(skb);</div><div class='add'>+		mss = min(mss, skb-&gt;len);</div><div class='add'>+		netdev_dbg(netdev, "TOE/TSO len %04x mtu %04x mss %04x\n",</div><div class='add'>+			   skb-&gt;len, netdev-&gt;mtu, mss);</div><div class='add'>+		word1 |= TSS_MTU_ENABLE_BIT;</div><div class='add'>+		word3 |= mss;</div><div class='add'>+	} else if (skb-&gt;len &gt;= ETH_FRAME_LEN) {</div><div class='add'>+		/* Hardware offloaded checksumming isn't working on non-TCP frames</div><div class='add'>+		 * bigger than 1514 bytes. A hypothesis about this is that the</div><div class='add'>+		 * checksum buffer is only 1518 bytes, so when the frames get</div><div class='add'>+		 * bigger they get truncated, or the last few bytes get</div><div class='add'>+		 * overwritten by the FCS.</div><div class='add'>+		 *</div><div class='add'>+		 * Just use software checksumming and bypass on bigger frames.</div><div class='add'>+		 */</div><div class='add'>+		if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+			ret = skb_checksum_help(skb);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+		}</div><div class='add'>+		word1 |= TSS_BYPASS_BIT;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (skb-&gt;ip_summed != CHECKSUM_NONE) {</div><div class='del'>-		int tcp = 0;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;protocol == htons(ETH_P_IP)) {</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL) {</div><div class='add'>+		/* We do not switch off the checksumming on non TCP/UDP</div><div class='add'>+		 * frames: as is shown from tests, the checksumming engine</div><div class='add'>+		 * is smart enough to see that a frame is not actually TCP</div><div class='add'>+		 * or UDP and then just pass it through without any changes</div><div class='add'>+		 * to the frame.</div><div class='add'>+		 */</div><div class='add'>+		if (skb-&gt;protocol == htons(ETH_P_IP))</div><div class='ctx'> 			word1 |= TSS_IP_CHKSUM_BIT;</div><div class='del'>-			tcp = ip_hdr(skb)-&gt;protocol == IPPROTO_TCP;</div><div class='del'>-		} else { /* IPv6 */</div><div class='add'>+		else</div><div class='ctx'> 			word1 |= TSS_IPV6_ENABLE_BIT;</div><div class='del'>-			tcp = ipv6_hdr(skb)-&gt;nexthdr == IPPROTO_TCP;</div><div class='del'>-		}</div><div class='ctx'> </div><div class='ctx'> 		word1 |= tcp ? TSS_TCP_CHKSUM_BIT : TSS_UDP_CHKSUM_BIT;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1182,9 +1228,8 @@ static int gmac_map_tx_bufs(struct net_device *netdev, struct sk_buff *skb,</div><div class='ctx'> 			buflen = skb_headlen(skb);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			skb_frag = skb_si-&gt;frags + frag;</div><div class='del'>-			buffer = page_address(skb_frag_page(skb_frag)) +</div><div class='del'>-				 skb_frag-&gt;page_offset;</div><div class='del'>-			buflen = skb_frag-&gt;size;</div><div class='add'>+			buffer = skb_frag_address(skb_frag);</div><div class='add'>+			buflen = skb_frag_size(skb_frag);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (frag == last_frag) {</div><div class='hunk'>@@ -1224,7 +1269,8 @@ map_error:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='add'>+static netdev_tx_t gmac_start_xmit(struct sk_buff *skb,</div><div class='add'>+				   struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> 	unsigned short m = (1 &lt;&lt; port-&gt;txq_order) - 1;</div><div class='hunk'>@@ -1297,7 +1343,7 @@ out_drop:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void gmac_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void gmac_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	netdev_err(netdev, "Tx timeout\n");</div><div class='ctx'> 	gmac_dump_dma_state(netdev);</div><div class='hunk'>@@ -1406,15 +1452,19 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget)</div><div class='ctx'> 	union gmac_rxdesc_3 word3;</div><div class='ctx'> 	struct page *page = NULL;</div><div class='ctx'> 	unsigned int page_offs;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	unsigned short r, w;</div><div class='ctx'> 	union dma_rwptr rw;</div><div class='ctx'> 	dma_addr_t mapping;</div><div class='ctx'> 	int frag_nr = 0;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;geth-&gt;irq_lock, flags);</div><div class='ctx'> 	rw.bits32 = readl(ptr_reg);</div><div class='ctx'> 	/* Reset interrupt as all packages until here are taken into account */</div><div class='ctx'> 	writel(DEFAULT_Q0_INT_BIT &lt;&lt; netdev-&gt;dev_id,</div><div class='ctx'> 	       geth-&gt;base + GLOBAL_INTERRUPT_STATUS_1_REG);</div><div class='add'>+	spin_unlock_irqrestore(&amp;geth-&gt;irq_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	r = rw.bits.rptr;</div><div class='ctx'> 	w = rw.bits.wptr;</div><div class='ctx'> </div><div class='hunk'>@@ -1717,10 +1767,9 @@ static irqreturn_t gmac_irq(int irq, void *data)</div><div class='ctx'> 		gmac_update_hw_stats(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (val &amp; (GMAC0_RX_OVERRUN_INT_BIT &lt;&lt; (netdev-&gt;dev_id * 8))) {</div><div class='add'>+		spin_lock(&amp;geth-&gt;irq_lock);</div><div class='ctx'> 		writel(GMAC0_RXDERR_INT_BIT &lt;&lt; (netdev-&gt;dev_id * 8),</div><div class='ctx'> 		       geth-&gt;base + GLOBAL_INTERRUPT_STATUS_4_REG);</div><div class='del'>-</div><div class='del'>-		spin_lock(&amp;geth-&gt;irq_lock);</div><div class='ctx'> 		u64_stats_update_begin(&amp;port-&gt;ir_stats_syncp);</div><div class='ctx'> 		++port-&gt;stats.rx_fifo_errors;</div><div class='ctx'> 		u64_stats_update_end(&amp;port-&gt;ir_stats_syncp);</div><div class='hunk'>@@ -1767,15 +1816,6 @@ static int gmac_open(struct net_device *netdev)</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!netdev-&gt;phydev) {</div><div class='del'>-		err = gmac_setup_phy(netdev);</div><div class='del'>-		if (err) {</div><div class='del'>-			netif_err(port, ifup, netdev,</div><div class='del'>-				  "PHY init failed: %d\n", err);</div><div class='del'>-			return err;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = request_irq(netdev-&gt;irq, gmac_irq,</div><div class='ctx'> 			  IRQF_SHARED, netdev-&gt;name, netdev);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1815,9 +1855,8 @@ static int gmac_open(struct net_device *netdev)</div><div class='ctx'> 	gmac_enable_tx_rx(netdev);</div><div class='ctx'> 	netif_tx_start_all_queues(netdev);</div><div class='ctx'> </div><div class='del'>-	hrtimer_init(&amp;port-&gt;rx_coalesce_timer, CLOCK_MONOTONIC,</div><div class='del'>-		     HRTIMER_MODE_REL);</div><div class='del'>-	port-&gt;rx_coalesce_timer.function = &amp;gmac_coalesce_delay_expired;</div><div class='add'>+	hrtimer_setup(&amp;port-&gt;rx_coalesce_timer, &amp;gmac_coalesce_delay_expired, CLOCK_MONOTONIC,</div><div class='add'>+		      HRTIMER_MODE_REL);</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(netdev, "opened\n");</div><div class='ctx'> </div><div class='hunk'>@@ -1902,7 +1941,7 @@ static int gmac_set_mac_address(struct net_device *netdev, void *addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sockaddr *sa = addr;</div><div class='ctx'> </div><div class='del'>-	memcpy(netdev-&gt;dev_addr, sa-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(netdev, sa-&gt;sa_data);</div><div class='ctx'> 	gmac_write_mac_address(netdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1978,7 +2017,7 @@ static int gmac_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> </div><div class='ctx'> 	gmac_disable_tx_rx(netdev);</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, new_mtu);</div><div class='ctx'> 	gmac_update_config0_reg(netdev, max_len &lt;&lt; CONFIG0_MAXLEN_SHIFT,</div><div class='ctx'> 				CONFIG0_MAXLEN_MASK);</div><div class='ctx'> </div><div class='hunk'>@@ -1989,15 +2028,6 @@ static int gmac_change_mtu(struct net_device *netdev, int new_mtu)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static netdev_features_t gmac_fix_features(struct net_device *netdev,</div><div class='del'>-					   netdev_features_t features)</div><div class='del'>-{</div><div class='del'>-	if (netdev-&gt;mtu + ETH_HLEN + VLAN_HLEN &gt; MTU_SIZE_BIT_MASK)</div><div class='del'>-		features &amp;= ~GMAC_OFFLOAD_FEATURES;</div><div class='del'>-</div><div class='del'>-	return features;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int gmac_set_features(struct net_device *netdev,</div><div class='ctx'> 			     netdev_features_t features)</div><div class='ctx'> {</div><div class='hunk'>@@ -2117,13 +2147,27 @@ static void gmac_get_pauseparam(struct net_device *netdev,</div><div class='ctx'> 	pparam-&gt;autoneg = true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int gmac_set_pauseparam(struct net_device *netdev,</div><div class='add'>+			       struct ethtool_pauseparam *pparam)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	if (!pparam-&gt;autoneg)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	phy_set_asym_pause(phydev, pparam-&gt;rx_pause, pparam-&gt;tx_pause);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void gmac_get_ringparam(struct net_device *netdev,</div><div class='del'>-			       struct ethtool_ringparam *rp)</div><div class='add'>+			       struct ethtool_ringparam *rp,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_rp,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='del'>-	union gmac_config0 config0;</div><div class='ctx'> </div><div class='del'>-	config0.bits32 = readl(port-&gt;gmac_base + GMAC_CONFIG0);</div><div class='add'>+	readl(port-&gt;gmac_base + GMAC_CONFIG0);</div><div class='ctx'> </div><div class='ctx'> 	rp-&gt;rx_max_pending = 1 &lt;&lt; 15;</div><div class='ctx'> 	rp-&gt;rx_mini_max_pending = 0;</div><div class='hunk'>@@ -2137,7 +2181,9 @@ static void gmac_get_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gmac_set_ringparam(struct net_device *netdev,</div><div class='del'>-			      struct ethtool_ringparam *rp)</div><div class='add'>+			      struct ethtool_ringparam *rp,</div><div class='add'>+			      struct kernel_ethtool_ringparam *kernel_rp,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> 	int err = 0;</div><div class='hunk'>@@ -2158,7 +2204,9 @@ static int gmac_set_ringparam(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gmac_get_coalesce(struct net_device *netdev,</div><div class='del'>-			     struct ethtool_coalesce *ecmd)</div><div class='add'>+			     struct ethtool_coalesce *ecmd,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2170,7 +2218,9 @@ static int gmac_get_coalesce(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int gmac_set_coalesce(struct net_device *netdev,</div><div class='del'>-			     struct ethtool_coalesce *ecmd)</div><div class='add'>+			     struct ethtool_coalesce *ecmd,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2203,13 +2253,11 @@ static void gmac_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 			     struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	strcpy(info-&gt;driver,  DRV_NAME);</div><div class='del'>-	strcpy(info-&gt;version, DRV_VERSION);</div><div class='ctx'> 	strcpy(info-&gt;bus_info, netdev-&gt;dev_id ? "1" : "0");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops gmac_351x_ops = {</div><div class='ctx'> 	.ndo_init		= gmac_init,</div><div class='del'>-	.ndo_uninit		= gmac_uninit,</div><div class='ctx'> 	.ndo_open		= gmac_open,</div><div class='ctx'> 	.ndo_stop		= gmac_stop,</div><div class='ctx'> 	.ndo_start_xmit		= gmac_start_xmit,</div><div class='hunk'>@@ -2218,11 +2266,12 @@ static const struct net_device_ops gmac_351x_ops = {</div><div class='ctx'> 	.ndo_set_mac_address	= gmac_set_mac_address,</div><div class='ctx'> 	.ndo_get_stats64	= gmac_get_stats64,</div><div class='ctx'> 	.ndo_change_mtu		= gmac_change_mtu,</div><div class='del'>-	.ndo_fix_features	= gmac_fix_features,</div><div class='ctx'> 	.ndo_set_features	= gmac_set_features,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops gmac_351x_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_MAX_FRAMES,</div><div class='ctx'> 	.get_sset_count	= gmac_get_sset_count,</div><div class='ctx'> 	.get_strings	= gmac_get_strings,</div><div class='ctx'> 	.get_ethtool_stats = gmac_get_ethtool_stats,</div><div class='hunk'>@@ -2231,6 +2280,7 @@ static const struct ethtool_ops gmac_351x_ethtool_ops = {</div><div class='ctx'> 	.set_link_ksettings = gmac_set_ksettings,</div><div class='ctx'> 	.nway_reset	= gmac_nway_reset,</div><div class='ctx'> 	.get_pauseparam	= gmac_get_pauseparam,</div><div class='add'>+	.set_pauseparam = gmac_set_pauseparam,</div><div class='ctx'> 	.get_ringparam	= gmac_get_ringparam,</div><div class='ctx'> 	.set_ringparam	= gmac_set_ringparam,</div><div class='ctx'> 	.get_coalesce	= gmac_get_coalesce,</div><div class='hunk'>@@ -2293,8 +2343,10 @@ static irqreturn_t gemini_port_irq(int irq, void *data)</div><div class='ctx'> </div><div class='ctx'> static void gemini_port_remove(struct gemini_ethernet_port *port)</div><div class='ctx'> {</div><div class='del'>-	if (port-&gt;netdev)</div><div class='add'>+	if (port-&gt;netdev) {</div><div class='add'>+		phy_disconnect(port-&gt;netdev-&gt;phydev);</div><div class='ctx'> 		unregister_netdev(port-&gt;netdev);</div><div class='add'>+	}</div><div class='ctx'> 	clk_disable_unprepare(port-&gt;pclk);</div><div class='ctx'> 	geth_cleanup_freeq(port-&gt;geth);</div><div class='ctx'> }</div><div class='hunk'>@@ -2364,13 +2416,13 @@ static void gemini_port_save_mac_addr(struct gemini_ethernet_port *port)</div><div class='ctx'> static int gemini_ethernet_port_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	char *port_names[2] = { "ethernet0", "ethernet1" };</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	struct gemini_ethernet_port *port;</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct gemini_ethernet *geth;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='del'>-	struct resource *gmacres;</div><div class='del'>-	struct resource *dmares;</div><div class='ctx'> 	struct device *parent;</div><div class='add'>+	u8 mac[ETH_ALEN];</div><div class='ctx'> 	unsigned int id;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int ret;</div><div class='hunk'>@@ -2387,7 +2439,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "probe %s ID %d\n", dev_name(dev), id);</div><div class='ctx'> </div><div class='del'>-	netdev = alloc_etherdev_mq(sizeof(*port), TX_QUEUE_NUM);</div><div class='add'>+	netdev = devm_alloc_etherdev_mqs(dev, sizeof(*port), TX_QUEUE_NUM, TX_QUEUE_NUM);</div><div class='ctx'> 	if (!netdev) {</div><div class='ctx'> 		dev_err(dev, "Can't allocate ethernet device #%d\n", id);</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -2402,31 +2454,23 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)</div><div class='ctx'> 	port-&gt;msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA memory */</div><div class='del'>-	dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!dmares) {</div><div class='del'>-		dev_err(dev, "no DMA resource\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	port-&gt;dma_base = devm_ioremap_resource(dev, dmares);</div><div class='del'>-	if (IS_ERR(port-&gt;dma_base))</div><div class='add'>+	port-&gt;dma_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);</div><div class='add'>+	if (IS_ERR(port-&gt;dma_base)) {</div><div class='add'>+		dev_err(dev, "get DMA address failed\n");</div><div class='ctx'> 		return PTR_ERR(port-&gt;dma_base);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* GMAC config memory */</div><div class='del'>-	gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1);</div><div class='del'>-	if (!gmacres) {</div><div class='del'>-		dev_err(dev, "no GMAC resource\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-	port-&gt;gmac_base = devm_ioremap_resource(dev, gmacres);</div><div class='del'>-	if (IS_ERR(port-&gt;gmac_base))</div><div class='add'>+	port-&gt;gmac_base = devm_platform_get_and_ioremap_resource(pdev, 1, NULL);</div><div class='add'>+	if (IS_ERR(port-&gt;gmac_base)) {</div><div class='add'>+		dev_err(dev, "get GMAC address failed\n");</div><div class='ctx'> 		return PTR_ERR(port-&gt;gmac_base);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Interrupt */</div><div class='ctx'> 	irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (irq &lt;= 0) {</div><div class='del'>-		dev_err(dev, "no IRQ\n");</div><div class='del'>-		return irq ? irq : -ENODEV;</div><div class='del'>-	}</div><div class='add'>+	if (irq &lt; 0)</div><div class='add'>+		return irq;</div><div class='ctx'> 	port-&gt;irq = irq;</div><div class='ctx'> </div><div class='ctx'> 	/* Clock the port */</div><div class='hunk'>@@ -2446,7 +2490,8 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)</div><div class='ctx'> 	port-&gt;reset = devm_reset_control_get_exclusive(dev, NULL);</div><div class='ctx'> 	if (IS_ERR(port-&gt;reset)) {</div><div class='ctx'> 		dev_err(dev, "no reset\n");</div><div class='del'>-		return PTR_ERR(port-&gt;reset);</div><div class='add'>+		ret = PTR_ERR(port-&gt;reset);</div><div class='add'>+		goto unprepare;</div><div class='ctx'> 	}</div><div class='ctx'> 	reset_control_reset(port-&gt;reset);</div><div class='ctx'> 	usleep_range(100, 500);</div><div class='hunk'>@@ -2473,24 +2518,30 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;hw_features = GMAC_OFFLOAD_FEATURES;</div><div class='ctx'> 	netdev-&gt;features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO;</div><div class='del'>-	/* We can handle jumbo frames up to 10236 bytes so, let's accept</div><div class='del'>-	 * payloads of 10236 bytes minus VLAN and ethernet header</div><div class='add'>+	/* We can receive jumbo frames up to 10236 bytes but only</div><div class='add'>+	 * transmit 2047 bytes so, let's accept payloads of 2047</div><div class='add'>+	 * bytes minus VLAN and ethernet header</div><div class='ctx'> 	 */</div><div class='ctx'> 	netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='del'>-	netdev-&gt;max_mtu = 10236 - VLAN_ETH_HLEN;</div><div class='add'>+	netdev-&gt;max_mtu = MTU_SIZE_BIT_MASK - VLAN_ETH_HLEN;</div><div class='ctx'> </div><div class='ctx'> 	port-&gt;freeq_refill = 0;</div><div class='del'>-	netif_napi_add(netdev, &amp;port-&gt;napi, gmac_napi_poll,</div><div class='del'>-		       DEFAULT_NAPI_WEIGHT);</div><div class='add'>+	netif_napi_add(netdev, &amp;port-&gt;napi, gmac_napi_poll);</div><div class='add'>+</div><div class='add'>+	ret = of_get_mac_address(np, mac);</div><div class='add'>+	if (!ret) {</div><div class='add'>+		dev_info(dev, "Setting macaddr from DT %pM\n", mac);</div><div class='add'>+		memcpy(port-&gt;mac_addr, mac, ETH_ALEN);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (is_valid_ether_addr((void *)port-&gt;mac_addr)) {</div><div class='del'>-		memcpy(netdev-&gt;dev_addr, port-&gt;mac_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(netdev, (u8 *)port-&gt;mac_addr);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		dev_dbg(dev, "ethernet address 0x%08x%08x%08x invalid\n",</div><div class='ctx'> 			port-&gt;mac_addr[0], port-&gt;mac_addr[1],</div><div class='ctx'> 			port-&gt;mac_addr[2]);</div><div class='ctx'> 		dev_info(dev, "using a random ethernet address\n");</div><div class='del'>-		eth_random_addr(netdev-&gt;dev_addr);</div><div class='add'>+		eth_hw_addr_random(netdev);</div><div class='ctx'> 	}</div><div class='ctx'> 	gmac_write_mac_address(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -2502,32 +2553,31 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)</div><div class='ctx'> 					port_names[port-&gt;id],</div><div class='ctx'> 					port);</div><div class='ctx'> 	if (ret)</div><div class='del'>-		return ret;</div><div class='add'>+		goto unprepare;</div><div class='ctx'> </div><div class='del'>-	ret = register_netdev(netdev);</div><div class='del'>-	if (!ret) {</div><div class='del'>-		netdev_info(netdev,</div><div class='del'>-			    "irq %d, DMA @ 0x%pap, GMAC @ 0x%pap\n",</div><div class='del'>-			    port-&gt;irq, &amp;dmares-&gt;start,</div><div class='del'>-			    &amp;gmacres-&gt;start);</div><div class='del'>-		ret = gmac_setup_phy(netdev);</div><div class='del'>-		if (ret)</div><div class='del'>-			netdev_info(netdev,</div><div class='del'>-				    "PHY init failed, deferring to ifup time\n");</div><div class='del'>-		return 0;</div><div class='add'>+	ret = gmac_setup_phy(netdev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "PHY init failed\n");</div><div class='add'>+		goto unprepare;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	port-&gt;netdev = NULL;</div><div class='del'>-	free_netdev(netdev);</div><div class='add'>+	ret = register_netdev(netdev);</div><div class='add'>+	if (ret)</div><div class='add'>+		goto unprepare;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unprepare:</div><div class='add'>+	clk_disable_unprepare(port-&gt;pclk);</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gemini_ethernet_port_remove(struct platform_device *pdev)</div><div class='add'>+static void gemini_ethernet_port_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet_port *port = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	gemini_port_remove(port);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id gemini_ethernet_port_of_match[] = {</div><div class='hunk'>@@ -2541,7 +2591,7 @@ MODULE_DEVICE_TABLE(of, gemini_ethernet_port_of_match);</div><div class='ctx'> static struct platform_driver gemini_ethernet_port_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = "gemini-ethernet-port",</div><div class='del'>-		.of_match_table = of_match_ptr(gemini_ethernet_port_of_match),</div><div class='add'>+		.of_match_table = gemini_ethernet_port_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = gemini_ethernet_port_probe,</div><div class='ctx'> 	.remove = gemini_ethernet_port_remove,</div><div class='hunk'>@@ -2552,17 +2602,13 @@ static int gemini_ethernet_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct device *dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	struct gemini_ethernet *geth;</div><div class='ctx'> 	unsigned int retry = 5;</div><div class='del'>-	struct resource *res;</div><div class='ctx'> 	u32 val;</div><div class='ctx'> </div><div class='ctx'> 	/* Global registers */</div><div class='ctx'> 	geth = devm_kzalloc(dev, sizeof(*geth), GFP_KERNEL);</div><div class='ctx'> 	if (!geth)</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	if (!res)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	geth-&gt;base = devm_ioremap_resource(dev, res);</div><div class='add'>+	geth-&gt;base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);</div><div class='ctx'> 	if (IS_ERR(geth-&gt;base))</div><div class='ctx'> 		return PTR_ERR(geth-&gt;base);</div><div class='ctx'> 	geth-&gt;dev = dev;</div><div class='hunk'>@@ -2590,14 +2636,12 @@ static int gemini_ethernet_probe(struct platform_device *pdev)</div><div class='ctx'> 	return devm_of_platform_populate(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int gemini_ethernet_remove(struct platform_device *pdev)</div><div class='add'>+static void gemini_ethernet_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct gemini_ethernet *geth = platform_get_drvdata(pdev);</div><div class='ctx'> </div><div class='ctx'> 	geth_cleanup_freeq(geth);</div><div class='ctx'> 	geth-&gt;initialized = false;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id gemini_ethernet_of_match[] = {</div><div class='hunk'>@@ -2611,7 +2655,7 @@ MODULE_DEVICE_TABLE(of, gemini_ethernet_of_match);</div><div class='ctx'> static struct platform_driver gemini_ethernet_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = DRV_NAME,</div><div class='del'>-		.of_match_table = of_match_ptr(gemini_ethernet_of_match),</div><div class='add'>+		.of_match_table = gemini_ethernet_of_match,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = gemini_ethernet_probe,</div><div class='ctx'> 	.remove = gemini_ethernet_remove,</div><div class='head'>diff --git a/drivers/net/ethernet/cortina/gemini.h b/drivers/net/ethernet/cortina/gemini.h<br/>index 0b12f89bf89a..24bb989981f2 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cortina/gemini.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/cortina/gemini.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/cortina/gemini.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/cortina/gemini.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /* Register definitions for Gemini GMAC Ethernet device driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2006 Storlink, Corp.</div><div class='hunk'>@@ -502,7 +502,7 @@ union gmac_txdesc_3 {</div><div class='ctx'> #define SOF_BIT			0x80000000</div><div class='ctx'> #define EOF_BIT			0x40000000</div><div class='ctx'> #define EOFIE_BIT		BIT(29)</div><div class='del'>-#define MTU_SIZE_BIT_MASK	0x1fff</div><div class='add'>+#define MTU_SIZE_BIT_MASK	0x7ff /* Max MTU 2047 bytes */</div><div class='ctx'> </div><div class='ctx'> /* GMAC Tx Descriptor */</div><div class='ctx'> struct gmac_txdesc {</div><div class='hunk'>@@ -787,7 +787,7 @@ union gmac_config0 {</div><div class='ctx'> #define  CONFIG0_MAXLEN_1536	0</div><div class='ctx'> #define  CONFIG0_MAXLEN_1518	1</div><div class='ctx'> #define  CONFIG0_MAXLEN_1522	2</div><div class='del'>-#define  CONFIG0_MAXLEN_1542	3</div><div class='add'>+#define  CONFIG0_MAXLEN_1548	3</div><div class='ctx'> #define  CONFIG0_MAXLEN_9k	4	/* 9212 */</div><div class='ctx'> #define  CONFIG0_MAXLEN_10k	5	/* 10236 */</div><div class='ctx'> #define  CONFIG0_MAXLEN_1518__6	6</div><div class='head'>diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig<br/>index a321a7144fb0..02e0caff98e3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/davicom/Kconfig</a></div><div class='hunk'>@@ -3,12 +3,25 @@</div><div class='ctx'> # Davicom device configuration</div><div class='ctx'> #</div><div class='ctx'> </div><div class='add'>+config NET_VENDOR_DAVICOM</div><div class='add'>+	bool "Davicom devices"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='add'>+</div><div class='add'>+	  Note that the answer to this question doesn't directly affect the</div><div class='add'>+	  kernel: saying N will just cause the configurator to skip all</div><div class='add'>+	  the questions about Davicom devices. If you say Y, you will be asked</div><div class='add'>+	  for your specific card in the following selections.</div><div class='add'>+</div><div class='add'>+if NET_VENDOR_DAVICOM</div><div class='add'>+</div><div class='ctx'> config DM9000</div><div class='ctx'> 	tristate "DM9000 support"</div><div class='del'>-	depends on ARM || MIPS || COLDFIRE || NIOS2</div><div class='add'>+	depends on ARM || MIPS || COLDFIRE || NIOS2 || COMPILE_TEST</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Support for DM9000 chipset.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here.  The module</div><div class='hunk'>@@ -17,8 +30,26 @@ config DM9000</div><div class='ctx'> config DM9000_FORCE_SIMPLE_PHY_POLL</div><div class='ctx'> 	bool "Force simple NSR based PHY polling"</div><div class='ctx'> 	depends on DM9000</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This configuration forces the DM9000 to use the NSR's LinkStatus</div><div class='ctx'> 	  bit to determine if the link is up or down instead of the more</div><div class='ctx'> 	  costly MII PHY reads. Note, this will not work if the chip is</div><div class='ctx'> 	  operating with an external PHY.</div><div class='add'>+</div><div class='add'>+config DM9051</div><div class='add'>+	tristate "DM9051 SPI support"</div><div class='add'>+	depends on SPI</div><div class='add'>+	select CRC32</div><div class='add'>+	select MDIO</div><div class='add'>+	select PHYLIB</div><div class='add'>+	select REGMAP_SPI</div><div class='add'>+	help</div><div class='add'>+	  Support for DM9051 SPI chipset.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here.  The module</div><div class='add'>+	  will be called dm9051.</div><div class='add'>+</div><div class='add'>+	  The SPI mode for the host's SPI master to access DM9051 is mode</div><div class='add'>+	  0 on the SPI bus.</div><div class='add'>+</div><div class='add'>+endif # NET_VENDOR_DAVICOM</div><div class='head'>diff --git a/drivers/net/ethernet/davicom/Makefile b/drivers/net/ethernet/davicom/Makefile<br/>index 173c87d21076..225f85bc1f53 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/davicom/Makefile</a></div><div class='hunk'>@@ -4,3 +4,4 @@</div><div class='ctx'> #</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_DM9000) += dm9000.o</div><div class='add'>+obj-$(CONFIG_DM9051) += dm9051.o</div><div class='head'>diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c<br/>index 386bdc1378d1..b87eaf0c250c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/dm9000.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/davicom/dm9000.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/dm9000.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/davicom/dm9000.c</a></div><div class='hunk'>@@ -28,8 +28,7 @@</div><div class='ctx'> #include &lt;linux/irq.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include &lt;linux/regulator/consumer.h&gt;</div><div class='del'>-#include &lt;linux/gpio.h&gt;</div><div class='del'>-#include &lt;linux/of_gpio.h&gt;</div><div class='add'>+#include &lt;linux/gpio/consumer.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;asm/delay.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='hunk'>@@ -42,7 +41,6 @@</div><div class='ctx'> #define DM9000_PHY		0x40	/* PHY address 0x01 */</div><div class='ctx'> </div><div class='ctx'> #define CARDNAME	"dm9000"</div><div class='del'>-#define DRV_VERSION	"1.31"</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Transmit timeout, default 5 seconds.</div><div class='hunk'>@@ -134,6 +132,8 @@ struct board_info {</div><div class='ctx'> 	u32		wake_state;</div><div class='ctx'> </div><div class='ctx'> 	int		ip_summed;</div><div class='add'>+</div><div class='add'>+	struct regulator *power_supply;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* debug code */</div><div class='hunk'>@@ -233,32 +233,29 @@ static void dm9000_inblk_32bit(void __iomem *reg, void *data, int count)</div><div class='ctx'> static void dm9000_dumpblk_8bit(void __iomem *reg, int count)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int tmp;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++)</div><div class='del'>-		tmp = readb(reg);</div><div class='add'>+		readb(reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dm9000_dumpblk_16bit(void __iomem *reg, int count)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int tmp;</div><div class='ctx'> </div><div class='ctx'> 	count = (count + 1) &gt;&gt; 1;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++)</div><div class='del'>-		tmp = readw(reg);</div><div class='add'>+		readw(reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dm9000_dumpblk_32bit(void __iomem *reg, int count)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='del'>-	int tmp;</div><div class='ctx'> </div><div class='ctx'> 	count = (count + 3) &gt;&gt; 2;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++)</div><div class='del'>-		tmp = readl(reg);</div><div class='add'>+		readl(reg);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -386,7 +383,7 @@ static void dm9000_set_io(struct board_info *db, int byte_width)</div><div class='ctx'> </div><div class='ctx'> 	case 3:</div><div class='ctx'> 		dev_dbg(db-&gt;dev, ": 3 byte IO, falling back to 16bit\n");</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case 2:</div><div class='ctx'> 		db-&gt;dumpblk = dm9000_dumpblk_16bit;</div><div class='ctx'> 		db-&gt;outblk  = dm9000_outblk_16bit;</div><div class='hunk'>@@ -542,9 +539,8 @@ static void dm9000_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct board_info *dm = to_dm9000_board(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, CARDNAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, to_platform_device(dm-&gt;dev)-&gt;name,</div><div class='add'>+	strscpy(info-&gt;driver, CARDNAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, to_platform_device(dm-&gt;dev)-&gt;name,</div><div class='ctx'> 		sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -964,7 +960,7 @@ dm9000_init_dm9000(struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Our watchdog timed out. Called by the networking layer */</div><div class='del'>-static void dm9000_timeout(struct net_device *dev)</div><div class='add'>+static void dm9000_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct board_info *db = netdev_priv(dev);</div><div class='ctx'> 	u8 reg_save;</div><div class='hunk'>@@ -1015,7 +1011,7 @@ static void dm9000_send_packet(struct net_device *dev,</div><div class='ctx'>  *  Hardware start transmission.</div><div class='ctx'>  *  Send a packet to media from the upper layer.</div><div class='ctx'>  */</div><div class='del'>-static int</div><div class='add'>+static netdev_tx_t</div><div class='ctx'> dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	unsigned long flags;</div><div class='hunk'>@@ -1375,7 +1371,7 @@ static const struct net_device_ops dm9000_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= dm9000_start_xmit,</div><div class='ctx'> 	.ndo_tx_timeout		= dm9000_timeout,</div><div class='ctx'> 	.ndo_set_rx_mode	= dm9000_hash_table,</div><div class='del'>-	.ndo_do_ioctl		= dm9000_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= dm9000_ioctl,</div><div class='ctx'> 	.ndo_set_features	= dm9000_set_features,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='hunk'>@@ -1388,7 +1384,7 @@ static struct dm9000_plat_data *dm9000_parse_dt(struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dm9000_plat_data *pdata;</div><div class='ctx'> 	struct device_node *np = dev-&gt;of_node;</div><div class='del'>-	const void *mac_addr;</div><div class='add'>+	int ret;</div><div class='ctx'> </div><div class='ctx'> 	if (!IS_ENABLED(CONFIG_OF) || !np)</div><div class='ctx'> 		return ERR_PTR(-ENXIO);</div><div class='hunk'>@@ -1397,14 +1393,14 @@ static struct dm9000_plat_data *dm9000_parse_dt(struct device *dev)</div><div class='ctx'> 	if (!pdata)</div><div class='ctx'> 		return ERR_PTR(-ENOMEM);</div><div class='ctx'> </div><div class='del'>-	if (of_find_property(np, "davicom,ext-phy", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "davicom,ext-phy"))</div><div class='ctx'> 		pdata-&gt;flags |= DM9000_PLATF_EXT_PHY;</div><div class='del'>-	if (of_find_property(np, "davicom,no-eeprom", NULL))</div><div class='add'>+	if (of_property_read_bool(np, "davicom,no-eeprom"))</div><div class='ctx'> 		pdata-&gt;flags |= DM9000_PLATF_NO_EEPROM;</div><div class='ctx'> </div><div class='del'>-	mac_addr = of_get_mac_address(np);</div><div class='del'>-	if (!IS_ERR(mac_addr))</div><div class='del'>-		ether_addr_copy(pdata-&gt;dev_addr, mac_addr);</div><div class='add'>+	ret = of_get_mac_address(np, pdata-&gt;dev_addr);</div><div class='add'>+	if (ret == -EPROBE_DEFER)</div><div class='add'>+		return ERR_PTR(ret);</div><div class='ctx'> </div><div class='ctx'> 	return pdata;</div><div class='ctx'> }</div><div class='hunk'>@@ -1424,10 +1420,10 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> 	int iosize;</div><div class='ctx'> 	int i;</div><div class='ctx'> 	u32 id_val;</div><div class='del'>-	int reset_gpios;</div><div class='del'>-	enum of_gpio_flags flags;</div><div class='add'>+	struct gpio_desc *reset_gpio;</div><div class='ctx'> 	struct regulator *power;</div><div class='ctx'> 	bool inv_mac_addr = false;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> </div><div class='ctx'> 	power = devm_regulator_get(dev, "vcc");</div><div class='ctx'> 	if (IS_ERR(power)) {</div><div class='hunk'>@@ -1444,34 +1440,42 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> 		dev_dbg(dev, "regulator enabled\n");</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	reset_gpios = of_get_named_gpio_flags(dev-&gt;of_node, "reset-gpios", 0,</div><div class='del'>-					      &amp;flags);</div><div class='del'>-	if (gpio_is_valid(reset_gpios)) {</div><div class='del'>-		ret = devm_gpio_request_one(dev, reset_gpios, flags,</div><div class='del'>-					    "dm9000_reset");</div><div class='add'>+	reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);</div><div class='add'>+	ret = PTR_ERR_OR_ZERO(reset_gpio);</div><div class='add'>+	if (ret) {</div><div class='add'>+		dev_err(dev, "failed to request reset gpio: %d\n", ret);</div><div class='add'>+		goto out_regulator_disable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (reset_gpio) {</div><div class='add'>+		ret = gpiod_set_consumer_name(reset_gpio, "dm9000_reset");</div><div class='ctx'> 		if (ret) {</div><div class='del'>-			dev_err(dev, "failed to request reset gpio %d: %d\n",</div><div class='del'>-				reset_gpios, ret);</div><div class='del'>-			return -ENODEV;</div><div class='add'>+			dev_err(dev, "failed to set reset gpio name: %d\n",</div><div class='add'>+				ret);</div><div class='add'>+			goto out_regulator_disable;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		/* According to manual PWRST# Low Period Min 1ms */</div><div class='ctx'> 		msleep(2);</div><div class='del'>-		gpio_set_value(reset_gpios, 1);</div><div class='add'>+		gpiod_set_value_cansleep(reset_gpio, 0);</div><div class='ctx'> 		/* Needs 3ms to read eeprom when PWRST is deasserted */</div><div class='ctx'> 		msleep(4);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!pdata) {</div><div class='ctx'> 		pdata = dm9000_parse_dt(&amp;pdev-&gt;dev);</div><div class='del'>-		if (IS_ERR(pdata))</div><div class='del'>-			return PTR_ERR(pdata);</div><div class='add'>+		if (IS_ERR(pdata)) {</div><div class='add'>+			ret = PTR_ERR(pdata);</div><div class='add'>+			goto out_regulator_disable;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Init network device */</div><div class='ctx'> 	ndev = alloc_etherdev(sizeof(struct board_info));</div><div class='del'>-	if (!ndev)</div><div class='del'>-		return -ENOMEM;</div><div class='add'>+	if (!ndev) {</div><div class='add'>+		ret = -ENOMEM;</div><div class='add'>+		goto out_regulator_disable;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	SET_NETDEV_DEV(ndev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1482,6 +1486,8 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	db-&gt;dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	db-&gt;ndev = ndev;</div><div class='add'>+	if (!IS_ERR(power))</div><div class='add'>+		db-&gt;power_supply = power;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;db-&gt;lock);</div><div class='ctx'> 	mutex_init(&amp;db-&gt;addr_lock);</div><div class='hunk'>@@ -1500,13 +1506,11 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	ndev-&gt;irq = platform_get_irq(pdev, 0);</div><div class='ctx'> 	if (ndev-&gt;irq &lt; 0) {</div><div class='del'>-		dev_err(db-&gt;dev, "interrupt resource unavailable: %d\n",</div><div class='del'>-			ndev-&gt;irq);</div><div class='ctx'> 		ret = ndev-&gt;irq;</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	db-&gt;irq_wake = platform_get_irq(pdev, 1);</div><div class='add'>+	db-&gt;irq_wake = platform_get_irq_optional(pdev, 1);</div><div class='ctx'> 	if (db-&gt;irq_wake &gt;= 0) {</div><div class='ctx'> 		dev_dbg(db-&gt;dev, "wakeup irq %d\n", db-&gt;irq_wake);</div><div class='ctx'> </div><div class='hunk'>@@ -1521,7 +1525,6 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> 			if (ret) {</div><div class='ctx'> 				dev_err(db-&gt;dev, "irq %d cannot set wakeup (%d)\n",</div><div class='ctx'> 					db-&gt;irq_wake, ret);</div><div class='del'>-				ret = 0;</div><div class='ctx'> 			} else {</div><div class='ctx'> 				irq_set_irq_wake(db-&gt;irq_wake, 0);</div><div class='ctx'> 				db-&gt;wake_supported = 1;</div><div class='hunk'>@@ -1666,11 +1669,12 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* try reading the node address from the attached EEPROM */</div><div class='ctx'> 	for (i = 0; i &lt; 6; i += 2)</div><div class='del'>-		dm9000_read_eeprom(db, i / 2, ndev-&gt;dev_addr+i);</div><div class='add'>+		dm9000_read_eeprom(db, i / 2, addr + i);</div><div class='add'>+	eth_hw_addr_set(ndev, addr);</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr) &amp;&amp; pdata != NULL) {</div><div class='ctx'> 		mac_src = "platform data";</div><div class='del'>-		memcpy(ndev-&gt;dev_addr, pdata-&gt;dev_addr, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(ndev, pdata-&gt;dev_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='hunk'>@@ -1678,7 +1682,8 @@ dm9000_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 		mac_src = "chip";</div><div class='ctx'> 		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			ndev-&gt;dev_addr[i] = ior(db, i+DM9000_PAR);</div><div class='add'>+			addr[i] = ior(db, i + DM9000_PAR);</div><div class='add'>+		eth_hw_addr_set(ndev, pdata-&gt;dev_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(ndev-&gt;dev_addr)) {</div><div class='hunk'>@@ -1708,6 +1713,10 @@ out:</div><div class='ctx'> 	dm9000_release_board(pdev, db);</div><div class='ctx'> 	free_netdev(ndev);</div><div class='ctx'> </div><div class='add'>+out_regulator_disable:</div><div class='add'>+	if (!IS_ERR(power))</div><div class='add'>+		regulator_disable(power);</div><div class='add'>+</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1761,17 +1770,19 @@ static const struct dev_pm_ops dm9000_drv_pm_ops = {</div><div class='ctx'> 	.resume		= dm9000_drv_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int</div><div class='del'>-dm9000_drv_remove(struct platform_device *pdev)</div><div class='add'>+static void dm9000_drv_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='add'>+	struct board_info *dm = to_dm9000_board(ndev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-	dm9000_release_board(pdev, netdev_priv(ndev));</div><div class='add'>+	dm9000_release_board(pdev, dm);</div><div class='add'>+	if (dm-&gt;power_supply)</div><div class='add'>+		regulator_disable(dm-&gt;power_supply);</div><div class='add'>+</div><div class='ctx'> 	free_netdev(ndev);		/* free device structure */</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(&amp;pdev-&gt;dev, "released and freed device\n");</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_OF</div><div class='hunk'>@@ -1789,7 +1800,7 @@ static struct platform_driver dm9000_driver = {</div><div class='ctx'> 		.of_match_table = of_match_ptr(dm9000_of_matches),</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe   = dm9000_probe,</div><div class='del'>-	.remove  = dm9000_drv_remove,</div><div class='add'>+	.remove = dm9000_drv_remove,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_platform_driver(dm9000_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c<br/>new file mode 100644<br/>index 000000000000..59ea48d4c9de<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/dm9051.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/davicom/dm9051.c</a></div><div class='hunk'>@@ -0,0 +1,1258 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Davicom Semiconductor,Inc.</div><div class='add'>+ * Davicom DM9051 SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/irq.h&gt;</div><div class='add'>+#include &lt;linux/mii.h&gt;</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/regmap.h&gt;</div><div class='add'>+#include &lt;linux/skbuff.h&gt;</div><div class='add'>+#include &lt;linux/spinlock.h&gt;</div><div class='add'>+#include &lt;linux/spi/spi.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dm9051.h"</div><div class='add'>+</div><div class='add'>+#define DRVNAME_9051	"dm9051"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct rx_ctl_mach - rx activities record</div><div class='add'>+ * @status_err_counter: rx status error counter</div><div class='add'>+ * @large_err_counter: rx get large packet length error counter</div><div class='add'>+ * @rx_err_counter: receive packet error counter</div><div class='add'>+ * @tx_err_counter: transmit packet error counter</div><div class='add'>+ * @fifo_rst_counter: reset operation counter</div><div class='add'>+ *</div><div class='add'>+ * To keep track for the driver operation statistics</div><div class='add'>+ */</div><div class='add'>+struct rx_ctl_mach {</div><div class='add'>+	u16				status_err_counter;</div><div class='add'>+	u16				large_err_counter;</div><div class='add'>+	u16				rx_err_counter;</div><div class='add'>+	u16				tx_err_counter;</div><div class='add'>+	u16				fifo_rst_counter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dm9051_rxctrl - dm9051 driver rx control</div><div class='add'>+ * @hash_table: Multicast hash-table data</div><div class='add'>+ * @rcr_all: KS_RXCR1 register setting</div><div class='add'>+ *</div><div class='add'>+ * The settings needs to control the receive filtering</div><div class='add'>+ * such as the multicast hash-filter and the receive register settings</div><div class='add'>+ */</div><div class='add'>+struct dm9051_rxctrl {</div><div class='add'>+	u16				hash_table[4];</div><div class='add'>+	u8				rcr_all;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dm9051_rxhdr - rx packet data header</div><div class='add'>+ * @headbyte: lead byte equal to 0x01 notifies a valid packet</div><div class='add'>+ * @status: status bits for the received packet</div><div class='add'>+ * @rxlen: packet length</div><div class='add'>+ *</div><div class='add'>+ * The Rx packed, entered into the FIFO memory, start with these</div><div class='add'>+ * four bytes which is the Rx header, followed by the ethernet</div><div class='add'>+ * packet data and ends with an appended 4-byte CRC data.</div><div class='add'>+ * Both Rx packet and CRC data are for check purpose and finally</div><div class='add'>+ * are dropped by this driver</div><div class='add'>+ */</div><div class='add'>+struct dm9051_rxhdr {</div><div class='add'>+	u8				headbyte;</div><div class='add'>+	u8				status;</div><div class='add'>+	__le16				rxlen;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct board_info - maintain the saved data</div><div class='add'>+ * @spidev: spi device structure</div><div class='add'>+ * @ndev: net device structure</div><div class='add'>+ * @mdiobus: mii bus structure</div><div class='add'>+ * @phydev: phy device structure</div><div class='add'>+ * @txq: tx queue structure</div><div class='add'>+ * @regmap_dm: regmap for register read/write</div><div class='add'>+ * @regmap_dmbulk: extra regmap for bulk read/write</div><div class='add'>+ * @rxctrl_work: Work queue for updating RX mode and multicast lists</div><div class='add'>+ * @tx_work: Work queue for tx packets</div><div class='add'>+ * @pause: ethtool pause parameter structure</div><div class='add'>+ * @spi_lockm: between threads lock structure</div><div class='add'>+ * @reg_mutex: regmap access lock structure</div><div class='add'>+ * @bc: rx control statistics structure</div><div class='add'>+ * @rxhdr: rx header structure</div><div class='add'>+ * @rctl: rx control setting structure</div><div class='add'>+ * @msg_enable: message level value</div><div class='add'>+ * @imr_all: to store operating imr value for register DM9051_IMR</div><div class='add'>+ * @lcr_all: to store operating rcr value for register DM9051_LMCR</div><div class='add'>+ *</div><div class='add'>+ * The saved data variables, keep up to date for retrieval back to use</div><div class='add'>+ */</div><div class='add'>+struct board_info {</div><div class='add'>+	u32				msg_enable;</div><div class='add'>+	struct spi_device		*spidev;</div><div class='add'>+	struct net_device		*ndev;</div><div class='add'>+	struct mii_bus			*mdiobus;</div><div class='add'>+	struct phy_device		*phydev;</div><div class='add'>+	struct sk_buff_head		txq;</div><div class='add'>+	struct regmap			*regmap_dm;</div><div class='add'>+	struct regmap			*regmap_dmbulk;</div><div class='add'>+	struct work_struct		rxctrl_work;</div><div class='add'>+	struct work_struct		tx_work;</div><div class='add'>+	struct ethtool_pauseparam	pause;</div><div class='add'>+	struct mutex			spi_lockm;</div><div class='add'>+	struct mutex			reg_mutex;</div><div class='add'>+	struct rx_ctl_mach		bc;</div><div class='add'>+	struct dm9051_rxhdr		rxhdr;</div><div class='add'>+	struct dm9051_rxctrl		rctl;</div><div class='add'>+	u8				imr_all;</div><div class='add'>+	u8				lcr_all;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dm9051_set_reg(struct board_info *db, unsigned int reg, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, reg, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_err(db, drv, db-&gt;ndev, "%s: error %d set reg %02x\n",</div><div class='add'>+			  __func__, ret, reg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_update_bits(struct board_info *db, unsigned int reg, unsigned int mask,</div><div class='add'>+			      unsigned int val)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_update_bits(db-&gt;regmap_dm, reg, mask, val);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_err(db, drv, db-&gt;ndev, "%s: error %d update bits reg %02x\n",</div><div class='add'>+			  __func__, ret, reg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* skb buffer exhausted, just discard the received data</div><div class='add'>+ */</div><div class='add'>+static int dm9051_dumpblk(struct board_info *db, u8 reg, size_t count)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = db-&gt;ndev;</div><div class='add'>+	unsigned int rb;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* no skb buffer,</div><div class='add'>+	 * both reg and &amp;rb must be noinc,</div><div class='add'>+	 * read once one byte via regmap_read</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		ret = regmap_read(db-&gt;regmap_dm, reg, &amp;rb);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			netif_err(db, drv, ndev, "%s: error %d dumping read reg %02x\n",</div><div class='add'>+				  __func__, ret, reg);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	} while (--count);</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_set_regs(struct board_info *db, unsigned int reg, const void *val,</div><div class='add'>+			   size_t val_count)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_bulk_write(db-&gt;regmap_dmbulk, reg, val, val_count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_err(db, drv, db-&gt;ndev, "%s: error %d bulk writing regs %02x\n",</div><div class='add'>+			  __func__, ret, reg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_get_regs(struct board_info *db, unsigned int reg, void *val,</div><div class='add'>+			   size_t val_count)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_bulk_read(db-&gt;regmap_dmbulk, reg, val, val_count);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_err(db, drv, db-&gt;ndev, "%s: error %d bulk reading regs %02x\n",</div><div class='add'>+			  __func__, ret, reg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_write_mem(struct board_info *db, unsigned int reg, const void *buff,</div><div class='add'>+			    size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_noinc_write(db-&gt;regmap_dm, reg, buff, len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_err(db, drv, db-&gt;ndev, "%s: error %d noinc writing regs %02x\n",</div><div class='add'>+			  __func__, ret, reg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_read_mem(struct board_info *db, unsigned int reg, void *buff,</div><div class='add'>+			   size_t len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_noinc_read(db-&gt;regmap_dm, reg, buff, len);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		netif_err(db, drv, db-&gt;ndev, "%s: error %d noinc reading regs %02x\n",</div><div class='add'>+			  __func__, ret, reg);</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* waiting tx-end rather than tx-req</div><div class='add'>+ * got faster</div><div class='add'>+ */</div><div class='add'>+static int dm9051_nsr_poll(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	unsigned int mval;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(db-&gt;regmap_dm, DM9051_NSR, mval,</div><div class='add'>+				       mval &amp; (NSR_TX2END | NSR_TX1END), 1, 20);</div><div class='add'>+	if (ret == -ETIMEDOUT)</div><div class='add'>+		netdev_err(db-&gt;ndev, "timeout in checking for tx end\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_epcr_poll(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	unsigned int mval;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_read_poll_timeout(db-&gt;regmap_dm, DM9051_EPCR, mval,</div><div class='add'>+				       !(mval &amp; EPCR_ERRE), 100, 10000);</div><div class='add'>+	if (ret == -ETIMEDOUT)</div><div class='add'>+		netdev_err(db-&gt;ndev, "eeprom/phy in processing get timeout\n");</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_irq_flag(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = db-&gt;spidev;</div><div class='add'>+	int irq_type = irq_get_trigger_type(spi-&gt;irq);</div><div class='add'>+</div><div class='add'>+	if (irq_type)</div><div class='add'>+		return irq_type;</div><div class='add'>+</div><div class='add'>+	return IRQF_TRIGGER_LOW;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static unsigned int dm9051_intcr_value(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	return (dm9051_irq_flag(db) == IRQF_TRIGGER_LOW) ?</div><div class='add'>+		INTCR_POL_LOW : INTCR_POL_HIGH;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_set_fcr(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	u8 fcr = 0;</div><div class='add'>+</div><div class='add'>+	if (db-&gt;pause.rx_pause)</div><div class='add'>+		fcr |= FCR_BKPM | FCR_FLCE;</div><div class='add'>+	if (db-&gt;pause.tx_pause)</div><div class='add'>+		fcr |= FCR_TXPEN;</div><div class='add'>+</div><div class='add'>+	return dm9051_set_reg(db, DM9051_FCR, fcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_set_recv(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_set_regs(db, DM9051_MAR, db-&gt;rctl.hash_table, sizeof(db-&gt;rctl.hash_table));</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return dm9051_set_reg(db, DM9051_RCR, db-&gt;rctl.rcr_all); /* enable rx */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_core_reset(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	db-&gt;bc.fifo_rst_counter++;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_NCR, NCR_RST); /* NCR reset */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_MBNDRY, MBNDRY_BYTE); /* MemBound */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_PPCR, PPCR_PAUSE_COUNT); /* Pause Count */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_LMCR, db-&gt;lcr_all); /* LEDMode1 */</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return dm9051_set_reg(db, DM9051_INTCR, dm9051_intcr_value(db));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_update_fcr(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	u8 fcr = 0;</div><div class='add'>+</div><div class='add'>+	if (db-&gt;pause.rx_pause)</div><div class='add'>+		fcr |= FCR_BKPM | FCR_FLCE;</div><div class='add'>+	if (db-&gt;pause.tx_pause)</div><div class='add'>+		fcr |= FCR_TXPEN;</div><div class='add'>+</div><div class='add'>+	return dm9051_update_bits(db, DM9051_FCR, FCR_RXTX_BITS, fcr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_disable_interrupt(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	return dm9051_set_reg(db, DM9051_IMR, IMR_PAR); /* disable int */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_enable_interrupt(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	return dm9051_set_reg(db, DM9051_IMR, db-&gt;imr_all); /* enable int */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_stop_mrcmd(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	return dm9051_set_reg(db, DM9051_ISR, ISR_STOP_MRCMD); /* to stop mrcmd */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_clear_interrupt(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	return dm9051_update_bits(db, DM9051_ISR, ISR_CLR_INT, ISR_CLR_INT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_eeprom_read(struct board_info *db, int offset, u8 *to)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPAR, offset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPCR, EPCR_ERPRR);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_epcr_poll(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPCR, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_bulk_read(db-&gt;regmap_dmbulk, DM9051_EPDRL, to, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_eeprom_write(struct board_info *db, int offset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPAR, offset);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_bulk_write(db-&gt;regmap_dmbulk, DM9051_EPDRL, data, 2);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPCR, EPCR_WEP | EPCR_ERPRW);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_epcr_poll(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_write(db-&gt;regmap_dm, DM9051_EPCR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_phyread(void *context, unsigned int reg, unsigned int *val)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = context;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPAR, DM9051_PHY | reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPCR, EPCR_ERPRR | EPCR_EPOS);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_epcr_poll(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPCR, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* this is a 4 bytes data, clear to zero since following regmap_bulk_read</div><div class='add'>+	 * only fill lower 2 bytes</div><div class='add'>+	 */</div><div class='add'>+	*val = 0;</div><div class='add'>+	return regmap_bulk_read(db-&gt;regmap_dmbulk, DM9051_EPDRL, val, 2);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_phywrite(void *context, unsigned int reg, unsigned int val)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = context;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPAR, DM9051_PHY | reg);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_bulk_write(db-&gt;regmap_dmbulk, DM9051_EPDRL, &amp;val, 2);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = regmap_write(db-&gt;regmap_dm, DM9051_EPCR, EPCR_EPOS | EPCR_ERPRW);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_epcr_poll(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return regmap_write(db-&gt;regmap_dm, DM9051_EPCR, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_mdio_read(struct mii_bus *bus, int addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = bus-&gt;priv;</div><div class='add'>+	unsigned int val = 0xffff;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	if (addr == DM9051_PHY_ADDR) {</div><div class='add'>+		ret = dm9051_phyread(db, regnum, &amp;val);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_mdio_write(struct mii_bus *bus, int addr, int regnum, u16 val)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = bus-&gt;priv;</div><div class='add'>+</div><div class='add'>+	if (addr == DM9051_PHY_ADDR)</div><div class='add'>+		return dm9051_phywrite(db, regnum, val);</div><div class='add'>+</div><div class='add'>+	return -ENODEV;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_reg_lock_mutex(void *dbcontext)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = dbcontext;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;db-&gt;reg_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_reg_unlock_mutex(void *dbcontext)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = dbcontext;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;db-&gt;reg_mutex);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct regmap_config regconfigdm = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.max_register = 0xff,</div><div class='add'>+	.reg_stride = 1,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.read_flag_mask = 0,</div><div class='add'>+	.write_flag_mask = DM_SPI_WR,</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_LITTLE,</div><div class='add'>+	.lock = dm9051_reg_lock_mutex,</div><div class='add'>+	.unlock = dm9051_reg_unlock_mutex,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct regmap_config regconfigdmbulk = {</div><div class='add'>+	.reg_bits = 8,</div><div class='add'>+	.val_bits = 8,</div><div class='add'>+	.max_register = 0xff,</div><div class='add'>+	.reg_stride = 1,</div><div class='add'>+	.cache_type = REGCACHE_NONE,</div><div class='add'>+	.read_flag_mask = 0,</div><div class='add'>+	.write_flag_mask = DM_SPI_WR,</div><div class='add'>+	.val_format_endian = REGMAP_ENDIAN_LITTLE,</div><div class='add'>+	.lock = dm9051_reg_lock_mutex,</div><div class='add'>+	.unlock = dm9051_reg_unlock_mutex,</div><div class='add'>+	.use_single_read = true,</div><div class='add'>+	.use_single_write = true,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dm9051_map_init(struct spi_device *spi, struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	/* create two regmap instances,</div><div class='add'>+	 * split read/write and bulk_read/bulk_write to individual regmap</div><div class='add'>+	 * to resolve regmap execution confliction problem</div><div class='add'>+	 */</div><div class='add'>+	regconfigdm.lock_arg = db;</div><div class='add'>+	db-&gt;regmap_dm = devm_regmap_init_spi(db-&gt;spidev, &amp;regconfigdm);</div><div class='add'>+	if (IS_ERR(db-&gt;regmap_dm))</div><div class='add'>+		return PTR_ERR(db-&gt;regmap_dm);</div><div class='add'>+</div><div class='add'>+	regconfigdmbulk.lock_arg = db;</div><div class='add'>+	db-&gt;regmap_dmbulk = devm_regmap_init_spi(db-&gt;spidev, &amp;regconfigdmbulk);</div><div class='add'>+	return PTR_ERR_OR_ZERO(db-&gt;regmap_dmbulk);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_map_chipid(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;db-&gt;spidev-&gt;dev;</div><div class='add'>+	unsigned short wid;</div><div class='add'>+	u8 buff[6];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_get_regs(db, DM9051_VIDL, buff, sizeof(buff));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	wid = get_unaligned_le16(buff + 2);</div><div class='add'>+	if (wid != DM9051_ID) {</div><div class='add'>+		dev_err(dev, "chipid error as %04x !\n", wid);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dev_info(dev, "chip %04x found\n", wid);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read DM9051_PAR registers which is the mac address loaded from EEPROM while power-on</div><div class='add'>+ */</div><div class='add'>+static int dm9051_map_etherdev_par(struct net_device *ndev, struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_get_regs(db, DM9051_PAR, addr, sizeof(addr));</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	if (!is_valid_ether_addr(addr)) {</div><div class='add'>+		eth_hw_addr_random(ndev);</div><div class='add'>+</div><div class='add'>+		ret = dm9051_set_regs(db, DM9051_PAR, ndev-&gt;dev_addr, sizeof(ndev-&gt;dev_addr));</div><div class='add'>+		if (ret &lt; 0)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		dev_dbg(&amp;db-&gt;spidev-&gt;dev, "Use random MAC address\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	eth_hw_addr_set(ndev, addr);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* ethtool-ops</div><div class='add'>+ */</div><div class='add'>+static void dm9051_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='add'>+{</div><div class='add'>+	strscpy(info-&gt;driver, DRVNAME_9051, sizeof(info-&gt;driver));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_set_msglevel(struct net_device *ndev, u32 value)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	db-&gt;msg_enable = value;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dm9051_get_msglevel(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	return db-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_get_eeprom_len(struct net_device *dev)</div><div class='add'>+{</div><div class='add'>+	return 128;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_get_eeprom(struct net_device *ndev,</div><div class='add'>+			     struct ethtool_eeprom *ee, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+	int offset = ee-&gt;offset;</div><div class='add'>+	int len = ee-&gt;len;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if ((len | offset) &amp; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	ee-&gt;magic = DM_EEPROM_MAGIC;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i += 2) {</div><div class='add'>+		ret = dm9051_eeprom_read(db, (offset + i) / 2, data + i);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_set_eeprom(struct net_device *ndev,</div><div class='add'>+			     struct ethtool_eeprom *ee, u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+	int offset = ee-&gt;offset;</div><div class='add'>+	int len = ee-&gt;len;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	if ((len | offset) &amp; 1)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (ee-&gt;magic != DM_EEPROM_MAGIC)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; len; i += 2) {</div><div class='add'>+		ret = dm9051_eeprom_write(db, (offset + i) / 2, data + i);</div><div class='add'>+		if (ret)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_get_pauseparam(struct net_device *ndev,</div><div class='add'>+				  struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	*pause = db-&gt;pause;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_set_pauseparam(struct net_device *ndev,</div><div class='add'>+				 struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	db-&gt;pause = *pause;</div><div class='add'>+</div><div class='add'>+	if (pause-&gt;autoneg == AUTONEG_DISABLE)</div><div class='add'>+		return dm9051_update_fcr(db);</div><div class='add'>+</div><div class='add'>+	phy_set_sym_pause(db-&gt;phydev, pause-&gt;rx_pause, pause-&gt;tx_pause,</div><div class='add'>+			  pause-&gt;autoneg);</div><div class='add'>+	phy_start_aneg(db-&gt;phydev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct ethtool_ops dm9051_ethtool_ops = {</div><div class='add'>+	.get_drvinfo = dm9051_get_drvinfo,</div><div class='add'>+	.get_link_ksettings = phy_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings = phy_ethtool_set_link_ksettings,</div><div class='add'>+	.get_msglevel = dm9051_get_msglevel,</div><div class='add'>+	.set_msglevel = dm9051_set_msglevel,</div><div class='add'>+	.nway_reset = phy_ethtool_nway_reset,</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='add'>+	.get_eeprom_len = dm9051_get_eeprom_len,</div><div class='add'>+	.get_eeprom = dm9051_get_eeprom,</div><div class='add'>+	.set_eeprom = dm9051_set_eeprom,</div><div class='add'>+	.get_pauseparam = dm9051_get_pauseparam,</div><div class='add'>+	.set_pauseparam = dm9051_set_pauseparam,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dm9051_all_start(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* GPR power on of the internal phy</div><div class='add'>+	 */</div><div class='add'>+	ret = dm9051_set_reg(db, DM9051_GPR, 0);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	/* dm9051 chip registers could not be accessed within 1 ms</div><div class='add'>+	 * after GPR power on, delay 1 ms is essential</div><div class='add'>+	 */</div><div class='add'>+	msleep(1);</div><div class='add'>+</div><div class='add'>+	ret = dm9051_core_reset(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return dm9051_enable_interrupt(db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_all_stop(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	/* GPR power off of the internal phy,</div><div class='add'>+	 * The internal phy still could be accessed after this GPR power off control</div><div class='add'>+	 */</div><div class='add'>+	ret = dm9051_set_reg(db, DM9051_GPR, GPR_PHY_OFF);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return dm9051_set_reg(db, DM9051_RCR, RCR_RX_DISABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* fifo reset while rx error found</div><div class='add'>+ */</div><div class='add'>+static int dm9051_all_restart(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = db-&gt;ndev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_core_reset(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_enable_interrupt(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	netdev_dbg(ndev, " rxstatus_Er &amp; rxlen_Er %d, RST_c %d\n",</div><div class='add'>+		   db-&gt;bc.status_err_counter + db-&gt;bc.large_err_counter,</div><div class='add'>+		   db-&gt;bc.fifo_rst_counter);</div><div class='add'>+</div><div class='add'>+	ret = dm9051_set_recv(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return dm9051_set_fcr(db);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* read packets from the fifo memory</div><div class='add'>+ * return value,</div><div class='add'>+ *  &gt; 0 - read packet number, caller can repeat the rx operation</div><div class='add'>+ *    0 - no error, caller need stop further rx operation</div><div class='add'>+ *  -EBUSY - read data error, caller escape from rx operation</div><div class='add'>+ */</div><div class='add'>+static int dm9051_loop_rx(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = db-&gt;ndev;</div><div class='add'>+	unsigned int rxbyte;</div><div class='add'>+	int ret, rxlen;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u8 *rdptr;</div><div class='add'>+	int scanrr = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = dm9051_read_mem(db, DM_SPI_MRCMDX, &amp;rxbyte, 2);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		if ((rxbyte &amp; GENMASK(7, 0)) != DM9051_PKT_RDY)</div><div class='add'>+			break; /* exhaust-empty */</div><div class='add'>+</div><div class='add'>+		ret = dm9051_read_mem(db, DM_SPI_MRCMD, &amp;db-&gt;rxhdr, DM_RXHDR_SIZE);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		ret = dm9051_stop_mrcmd(db);</div><div class='add'>+		if (ret)</div><div class='add'>+			return ret;</div><div class='add'>+</div><div class='add'>+		rxlen = le16_to_cpu(db-&gt;rxhdr.rxlen);</div><div class='add'>+		if (db-&gt;rxhdr.status &amp; RSR_ERR_BITS || rxlen &gt; DM9051_PKT_MAX) {</div><div class='add'>+			netdev_dbg(ndev, "rxhdr-byte (%02x)\n",</div><div class='add'>+				   db-&gt;rxhdr.headbyte);</div><div class='add'>+</div><div class='add'>+			if (db-&gt;rxhdr.status &amp; RSR_ERR_BITS) {</div><div class='add'>+				db-&gt;bc.status_err_counter++;</div><div class='add'>+				netdev_dbg(ndev, "check rxstatus-error (%02x)\n",</div><div class='add'>+					   db-&gt;rxhdr.status);</div><div class='add'>+			} else {</div><div class='add'>+				db-&gt;bc.large_err_counter++;</div><div class='add'>+				netdev_dbg(ndev, "check rxlen large-error (%d &gt; %d)\n",</div><div class='add'>+					   rxlen, DM9051_PKT_MAX);</div><div class='add'>+			}</div><div class='add'>+			return dm9051_all_restart(db);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb = dev_alloc_skb(rxlen);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			ret = dm9051_dumpblk(db, DM_SPI_MRCMD, rxlen);</div><div class='add'>+			if (ret)</div><div class='add'>+				return ret;</div><div class='add'>+			return scanrr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rdptr = skb_put(skb, rxlen - 4);</div><div class='add'>+		ret = dm9051_read_mem(db, DM_SPI_MRCMD, rdptr, rxlen);</div><div class='add'>+		if (ret) {</div><div class='add'>+			db-&gt;bc.rx_err_counter++;</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ret = dm9051_stop_mrcmd(db);</div><div class='add'>+		if (ret) {</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		skb-&gt;protocol = eth_type_trans(skb, db-&gt;ndev);</div><div class='add'>+		if (db-&gt;ndev-&gt;features &amp; NETIF_F_RXCSUM)</div><div class='add'>+			skb_checksum_none_assert(skb);</div><div class='add'>+		netif_rx(skb);</div><div class='add'>+		db-&gt;ndev-&gt;stats.rx_bytes += rxlen;</div><div class='add'>+		db-&gt;ndev-&gt;stats.rx_packets++;</div><div class='add'>+		scanrr++;</div><div class='add'>+	} while (!ret);</div><div class='add'>+</div><div class='add'>+	return scanrr;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* transmit a packet,</div><div class='add'>+ * return value,</div><div class='add'>+ *   0 - succeed</div><div class='add'>+ *  -ETIMEDOUT - timeout error</div><div class='add'>+ */</div><div class='add'>+static int dm9051_single_tx(struct board_info *db, u8 *buff, unsigned int len)</div><div class='add'>+{</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_nsr_poll(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_write_mem(db, DM_SPI_MWCMD, buff, len);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_set_regs(db, DM9051_TXPLL, &amp;len, 2);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	return dm9051_set_reg(db, DM9051_TCR, TCR_TXREQ);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_loop_tx(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct net_device *ndev = db-&gt;ndev;</div><div class='add'>+	int ntx = 0;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	while (!skb_queue_empty(&amp;db-&gt;txq)) {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		unsigned int len;</div><div class='add'>+</div><div class='add'>+		skb = skb_dequeue(&amp;db-&gt;txq);</div><div class='add'>+		if (skb) {</div><div class='add'>+			ntx++;</div><div class='add'>+			ret = dm9051_single_tx(db, skb-&gt;data, skb-&gt;len);</div><div class='add'>+			len = skb-&gt;len;</div><div class='add'>+			dev_kfree_skb(skb);</div><div class='add'>+			if (ret &lt; 0) {</div><div class='add'>+				db-&gt;bc.tx_err_counter++;</div><div class='add'>+				return 0;</div><div class='add'>+			}</div><div class='add'>+			ndev-&gt;stats.tx_bytes += len;</div><div class='add'>+			ndev-&gt;stats.tx_packets++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (netif_queue_stopped(ndev) &amp;&amp;</div><div class='add'>+		    (skb_queue_len(&amp;db-&gt;txq) &lt; DM9051_TX_QUE_LO_WATER))</div><div class='add'>+			netif_wake_queue(ndev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ntx;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t dm9051_rx_threaded_irq(int irq, void *pw)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = pw;</div><div class='add'>+	int result, result_tx;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;db-&gt;spi_lockm);</div><div class='add'>+</div><div class='add'>+	result = dm9051_disable_interrupt(db);</div><div class='add'>+	if (result)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	result = dm9051_clear_interrupt(db);</div><div class='add'>+	if (result)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		result = dm9051_loop_rx(db); /* threaded irq rx */</div><div class='add'>+		if (result &lt; 0)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+		result_tx = dm9051_loop_tx(db); /* more tx better performance */</div><div class='add'>+		if (result_tx &lt; 0)</div><div class='add'>+			goto out_unlock;</div><div class='add'>+	} while (result &gt; 0);</div><div class='add'>+</div><div class='add'>+	dm9051_enable_interrupt(db);</div><div class='add'>+</div><div class='add'>+	/* To exit and has mutex unlock while rx or tx error</div><div class='add'>+	 */</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;db-&gt;spi_lockm);</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_tx_delay(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = container_of(work, struct board_info, tx_work);</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;db-&gt;spi_lockm);</div><div class='add'>+</div><div class='add'>+	result = dm9051_loop_tx(db);</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		netdev_err(db-&gt;ndev, "transmit packet error\n");</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;db-&gt;spi_lockm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_rxctl_delay(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = container_of(work, struct board_info, rxctrl_work);</div><div class='add'>+	struct net_device *ndev = db-&gt;ndev;</div><div class='add'>+	int result;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;db-&gt;spi_lockm);</div><div class='add'>+</div><div class='add'>+	result = dm9051_set_regs(db, DM9051_PAR, ndev-&gt;dev_addr, sizeof(ndev-&gt;dev_addr));</div><div class='add'>+	if (result &lt; 0)</div><div class='add'>+		goto out_unlock;</div><div class='add'>+</div><div class='add'>+	dm9051_set_recv(db);</div><div class='add'>+</div><div class='add'>+	/* To has mutex unlock and return from this function if regmap function fail</div><div class='add'>+	 */</div><div class='add'>+out_unlock:</div><div class='add'>+	mutex_unlock(&amp;db-&gt;spi_lockm);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Open network device</div><div class='add'>+ * Called when the network device is marked active, such as a user executing</div><div class='add'>+ * 'ifconfig up' on the device</div><div class='add'>+ */</div><div class='add'>+static int dm9051_open(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+	struct spi_device *spi = db-&gt;spidev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	db-&gt;imr_all = IMR_PAR | IMR_PRM;</div><div class='add'>+	db-&gt;lcr_all = LMCR_MODE1;</div><div class='add'>+	db-&gt;rctl.rcr_all = RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN;</div><div class='add'>+	memset(db-&gt;rctl.hash_table, 0, sizeof(db-&gt;rctl.hash_table));</div><div class='add'>+</div><div class='add'>+	ndev-&gt;irq = spi-&gt;irq; /* by dts */</div><div class='add'>+	ret = request_threaded_irq(spi-&gt;irq, NULL, dm9051_rx_threaded_irq,</div><div class='add'>+				   dm9051_irq_flag(db) | IRQF_ONESHOT,</div><div class='add'>+				   ndev-&gt;name, db);</div><div class='add'>+	if (ret &lt; 0) {</div><div class='add'>+		netdev_err(ndev, "failed to get irq\n");</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phy_support_sym_pause(db-&gt;phydev);</div><div class='add'>+	phy_start(db-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	/* flow control parameters init */</div><div class='add'>+	db-&gt;pause.rx_pause = true;</div><div class='add'>+	db-&gt;pause.tx_pause = true;</div><div class='add'>+	db-&gt;pause.autoneg = AUTONEG_DISABLE;</div><div class='add'>+</div><div class='add'>+	if (db-&gt;phydev-&gt;autoneg)</div><div class='add'>+		db-&gt;pause.autoneg = AUTONEG_ENABLE;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_all_start(db);</div><div class='add'>+	if (ret) {</div><div class='add'>+		phy_stop(db-&gt;phydev);</div><div class='add'>+		free_irq(spi-&gt;irq, db);</div><div class='add'>+		return ret;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_wake_queue(ndev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Close network device</div><div class='add'>+ * Called to close down a network device which has been active. Cancel any</div><div class='add'>+ * work, shutdown the RX and TX process and then place the chip into a low</div><div class='add'>+ * power state while it is not being used</div><div class='add'>+ */</div><div class='add'>+static int dm9051_stop(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_all_stop(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	flush_work(&amp;db-&gt;tx_work);</div><div class='add'>+	flush_work(&amp;db-&gt;rxctrl_work);</div><div class='add'>+</div><div class='add'>+	phy_stop(db-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	free_irq(db-&gt;spidev-&gt;irq, db);</div><div class='add'>+</div><div class='add'>+	netif_stop_queue(ndev);</div><div class='add'>+</div><div class='add'>+	skb_queue_purge(&amp;db-&gt;txq);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* event: play a schedule starter in condition</div><div class='add'>+ */</div><div class='add'>+static netdev_tx_t dm9051_start_xmit(struct sk_buff *skb, struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	skb_queue_tail(&amp;db-&gt;txq, skb);</div><div class='add'>+	if (skb_queue_len(&amp;db-&gt;txq) &gt; DM9051_TX_QUE_HI_WATER)</div><div class='add'>+		netif_stop_queue(ndev); /* enforce limit queue size */</div><div class='add'>+</div><div class='add'>+	schedule_work(&amp;db-&gt;tx_work);</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* event: play with a schedule starter</div><div class='add'>+ */</div><div class='add'>+static void dm9051_set_rx_mode(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+	struct dm9051_rxctrl rxctrl;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	u8 rcr = RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN;</div><div class='add'>+	u32 hash_val;</div><div class='add'>+</div><div class='add'>+	memset(&amp;rxctrl, 0, sizeof(rxctrl));</div><div class='add'>+</div><div class='add'>+	/* rx control */</div><div class='add'>+	if (ndev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		rcr |= RCR_PRMSC;</div><div class='add'>+		netdev_dbg(ndev, "set_multicast rcr |= RCR_PRMSC, rcr= %02x\n", rcr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ndev-&gt;flags &amp; IFF_ALLMULTI) {</div><div class='add'>+		rcr |= RCR_ALL;</div><div class='add'>+		netdev_dbg(ndev, "set_multicast rcr |= RCR_ALLMULTI, rcr= %02x\n", rcr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rxctrl.rcr_all = rcr;</div><div class='add'>+</div><div class='add'>+	/* broadcast address */</div><div class='add'>+	rxctrl.hash_table[0] = 0;</div><div class='add'>+	rxctrl.hash_table[1] = 0;</div><div class='add'>+	rxctrl.hash_table[2] = 0;</div><div class='add'>+	rxctrl.hash_table[3] = 0x8000;</div><div class='add'>+</div><div class='add'>+	/* the multicast address in Hash Table : 64 bits */</div><div class='add'>+	netdev_for_each_mc_addr(ha, ndev) {</div><div class='add'>+		hash_val = ether_crc_le(ETH_ALEN, ha-&gt;addr) &amp; GENMASK(5, 0);</div><div class='add'>+		rxctrl.hash_table[hash_val / 16] |= BIT(0) &lt;&lt; (hash_val % 16);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* schedule work to do the actual set of the data if needed */</div><div class='add'>+</div><div class='add'>+	if (memcmp(&amp;db-&gt;rctl, &amp;rxctrl, sizeof(rxctrl))) {</div><div class='add'>+		memcpy(&amp;db-&gt;rctl, &amp;rxctrl, sizeof(rxctrl));</div><div class='add'>+		schedule_work(&amp;db-&gt;rxctrl_work);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* event: write into the mac registers and eeprom directly</div><div class='add'>+ */</div><div class='add'>+static int dm9051_set_mac_address(struct net_device *ndev, void *p)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ret = eth_prepare_mac_addr_change(ndev, p);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	eth_commit_mac_addr_change(ndev, p);</div><div class='add'>+	return dm9051_set_regs(db, DM9051_PAR, ndev-&gt;dev_addr, sizeof(ndev-&gt;dev_addr));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops dm9051_netdev_ops = {</div><div class='add'>+	.ndo_open = dm9051_open,</div><div class='add'>+	.ndo_stop = dm9051_stop,</div><div class='add'>+	.ndo_start_xmit = dm9051_start_xmit,</div><div class='add'>+	.ndo_set_rx_mode = dm9051_set_rx_mode,</div><div class='add'>+	.ndo_validate_addr = eth_validate_addr,</div><div class='add'>+	.ndo_set_mac_address = dm9051_set_mac_address,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dm9051_operation_clear(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	db-&gt;bc.status_err_counter = 0;</div><div class='add'>+	db-&gt;bc.large_err_counter = 0;</div><div class='add'>+	db-&gt;bc.rx_err_counter = 0;</div><div class='add'>+	db-&gt;bc.tx_err_counter = 0;</div><div class='add'>+	db-&gt;bc.fifo_rst_counter = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_mdio_register(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	struct spi_device *spi = db-&gt;spidev;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	db-&gt;mdiobus = devm_mdiobus_alloc(&amp;spi-&gt;dev);</div><div class='add'>+	if (!db-&gt;mdiobus)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	db-&gt;mdiobus-&gt;priv = db;</div><div class='add'>+	db-&gt;mdiobus-&gt;read = dm9051_mdio_read;</div><div class='add'>+	db-&gt;mdiobus-&gt;write = dm9051_mdio_write;</div><div class='add'>+	db-&gt;mdiobus-&gt;name = "dm9051-mdiobus";</div><div class='add'>+	db-&gt;mdiobus-&gt;phy_mask = (u32)~BIT(1);</div><div class='add'>+	db-&gt;mdiobus-&gt;parent = &amp;spi-&gt;dev;</div><div class='add'>+	snprintf(db-&gt;mdiobus-&gt;id, MII_BUS_ID_SIZE,</div><div class='add'>+		 "dm9051-%s.%u", dev_name(&amp;spi-&gt;dev), spi_get_chipselect(spi, 0));</div><div class='add'>+</div><div class='add'>+	ret = devm_mdiobus_register(&amp;spi-&gt;dev, db-&gt;mdiobus);</div><div class='add'>+	if (ret)</div><div class='add'>+		dev_err(&amp;spi-&gt;dev, "Could not register MDIO bus\n");</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_handle_link_change(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	phy_print_status(db-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	/* only write pause settings to mac. since mac and phy are integrated</div><div class='add'>+	 * together, such as link state, speed and duplex are sync already</div><div class='add'>+	 */</div><div class='add'>+	if (db-&gt;phydev-&gt;link) {</div><div class='add'>+		if (db-&gt;phydev-&gt;pause) {</div><div class='add'>+			db-&gt;pause.rx_pause = true;</div><div class='add'>+			db-&gt;pause.tx_pause = true;</div><div class='add'>+		}</div><div class='add'>+		dm9051_update_fcr(db);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* phy connect as poll mode</div><div class='add'>+ */</div><div class='add'>+static int dm9051_phy_connect(struct board_info *db)</div><div class='add'>+{</div><div class='add'>+	char phy_id[MII_BUS_ID_SIZE + 3];</div><div class='add'>+</div><div class='add'>+	snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,</div><div class='add'>+		 db-&gt;mdiobus-&gt;id, DM9051_PHY_ADDR);</div><div class='add'>+</div><div class='add'>+	db-&gt;phydev = phy_connect(db-&gt;ndev, phy_id, dm9051_handle_link_change,</div><div class='add'>+				 PHY_INTERFACE_MODE_MII);</div><div class='add'>+	return PTR_ERR_OR_ZERO(db-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dm9051_probe(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;spi-&gt;dev;</div><div class='add'>+	struct net_device *ndev;</div><div class='add'>+	struct board_info *db;</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	ndev = devm_alloc_etherdev(dev, sizeof(struct board_info));</div><div class='add'>+	if (!ndev)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(ndev, dev);</div><div class='add'>+	dev_set_drvdata(dev, ndev);</div><div class='add'>+</div><div class='add'>+	db = netdev_priv(ndev);</div><div class='add'>+</div><div class='add'>+	db-&gt;msg_enable = 0;</div><div class='add'>+	db-&gt;spidev = spi;</div><div class='add'>+	db-&gt;ndev = ndev;</div><div class='add'>+</div><div class='add'>+	ndev-&gt;netdev_ops = &amp;dm9051_netdev_ops;</div><div class='add'>+	ndev-&gt;ethtool_ops = &amp;dm9051_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;db-&gt;spi_lockm);</div><div class='add'>+	mutex_init(&amp;db-&gt;reg_mutex);</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;db-&gt;rxctrl_work, dm9051_rxctl_delay);</div><div class='add'>+	INIT_WORK(&amp;db-&gt;tx_work, dm9051_tx_delay);</div><div class='add'>+</div><div class='add'>+	ret = dm9051_map_init(spi, db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_map_chipid(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_map_etherdev_par(ndev, db);</div><div class='add'>+	if (ret &lt; 0)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_mdio_register(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	ret = dm9051_phy_connect(db);</div><div class='add'>+	if (ret)</div><div class='add'>+		return ret;</div><div class='add'>+</div><div class='add'>+	dm9051_operation_clear(db);</div><div class='add'>+	skb_queue_head_init(&amp;db-&gt;txq);</div><div class='add'>+</div><div class='add'>+	ret = devm_register_netdev(dev, ndev);</div><div class='add'>+	if (ret) {</div><div class='add'>+		phy_disconnect(db-&gt;phydev);</div><div class='add'>+		return dev_err_probe(dev, ret, "device register failed");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dm9051_drv_remove(struct spi_device *spi)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;spi-&gt;dev;</div><div class='add'>+	struct net_device *ndev = dev_get_drvdata(dev);</div><div class='add'>+	struct board_info *db = to_dm9051_board(ndev);</div><div class='add'>+</div><div class='add'>+	phy_disconnect(db-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id dm9051_match_table[] = {</div><div class='add'>+	{ .compatible = "davicom,dm9051" },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, dm9051_match_table);</div><div class='add'>+</div><div class='add'>+static const struct spi_device_id dm9051_id_table[] = {</div><div class='add'>+	{ "dm9051", 0 },</div><div class='add'>+	{}</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct spi_driver dm9051_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = DRVNAME_9051,</div><div class='add'>+		.of_match_table = dm9051_match_table,</div><div class='add'>+	},</div><div class='add'>+	.probe = dm9051_probe,</div><div class='add'>+	.remove = dm9051_drv_remove,</div><div class='add'>+	.id_table = dm9051_id_table,</div><div class='add'>+};</div><div class='add'>+module_spi_driver(dm9051_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Joseph CHANG &lt;joseph_chang@davicom.com.tw&gt;");</div><div class='add'>+MODULE_DESCRIPTION("Davicom DM9051 network SPI driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/davicom/dm9051.h b/drivers/net/ethernet/davicom/dm9051.h<br/>new file mode 100644<br/>index 000000000000..fef3120edd7c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/davicom/dm9051.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/davicom/dm9051.h</a></div><div class='hunk'>@@ -0,0 +1,162 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='add'>+/*</div><div class='add'>+ * Copyright (c) 2022 Davicom Semiconductor,Inc.</div><div class='add'>+ * Davicom DM9051 SPI Fast Ethernet Linux driver</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef _DM9051_H_</div><div class='add'>+#define _DM9051_H_</div><div class='add'>+</div><div class='add'>+#include &lt;linux/bits.h&gt;</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+#define DM9051_ID		0x9051</div><div class='add'>+</div><div class='add'>+#define DM9051_NCR		0x00</div><div class='add'>+#define DM9051_NSR		0x01</div><div class='add'>+#define DM9051_TCR		0x02</div><div class='add'>+#define DM9051_RCR		0x05</div><div class='add'>+#define DM9051_BPTR		0x08</div><div class='add'>+#define DM9051_FCR		0x0A</div><div class='add'>+#define DM9051_EPCR		0x0B</div><div class='add'>+#define DM9051_EPAR		0x0C</div><div class='add'>+#define DM9051_EPDRL		0x0D</div><div class='add'>+#define DM9051_EPDRH		0x0E</div><div class='add'>+#define DM9051_PAR		0x10</div><div class='add'>+#define DM9051_MAR		0x16</div><div class='add'>+#define DM9051_GPCR		0x1E</div><div class='add'>+#define DM9051_GPR		0x1F</div><div class='add'>+</div><div class='add'>+#define DM9051_VIDL		0x28</div><div class='add'>+#define DM9051_VIDH		0x29</div><div class='add'>+#define DM9051_PIDL		0x2A</div><div class='add'>+#define DM9051_PIDH		0x2B</div><div class='add'>+#define DM9051_SMCR		0x2F</div><div class='add'>+#define	DM9051_ATCR		0x30</div><div class='add'>+#define	DM9051_SPIBCR		0x38</div><div class='add'>+#define DM9051_INTCR		0x39</div><div class='add'>+#define DM9051_PPCR		0x3D</div><div class='add'>+</div><div class='add'>+#define DM9051_MPCR		0x55</div><div class='add'>+#define DM9051_LMCR		0x57</div><div class='add'>+#define DM9051_MBNDRY		0x5E</div><div class='add'>+</div><div class='add'>+#define DM9051_MRRL		0x74</div><div class='add'>+#define DM9051_MRRH		0x75</div><div class='add'>+#define DM9051_MWRL		0x7A</div><div class='add'>+#define DM9051_MWRH		0x7B</div><div class='add'>+#define DM9051_TXPLL		0x7C</div><div class='add'>+#define DM9051_TXPLH		0x7D</div><div class='add'>+#define DM9051_ISR		0x7E</div><div class='add'>+#define DM9051_IMR		0x7F</div><div class='add'>+</div><div class='add'>+#define DM_SPI_MRCMDX		0x70</div><div class='add'>+#define DM_SPI_MRCMD		0x72</div><div class='add'>+#define DM_SPI_MWCMD		0x78</div><div class='add'>+</div><div class='add'>+#define DM_SPI_WR		0x80</div><div class='add'>+</div><div class='add'>+/* dm9051 Ethernet controller registers bits</div><div class='add'>+ */</div><div class='add'>+/* 0x00 */</div><div class='add'>+#define NCR_WAKEEN		BIT(6)</div><div class='add'>+#define NCR_FDX			BIT(3)</div><div class='add'>+#define NCR_RST			BIT(0)</div><div class='add'>+/* 0x01 */</div><div class='add'>+#define NSR_SPEED		BIT(7)</div><div class='add'>+#define NSR_LINKST		BIT(6)</div><div class='add'>+#define NSR_WAKEST		BIT(5)</div><div class='add'>+#define NSR_TX2END		BIT(3)</div><div class='add'>+#define NSR_TX1END		BIT(2)</div><div class='add'>+/* 0x02 */</div><div class='add'>+#define TCR_DIS_JABBER_TIMER	BIT(6) /* for Jabber Packet support */</div><div class='add'>+#define TCR_TXREQ		BIT(0)</div><div class='add'>+/* 0x05 */</div><div class='add'>+#define RCR_DIS_WATCHDOG_TIMER	BIT(6)  /* for Jabber Packet support */</div><div class='add'>+#define RCR_DIS_LONG		BIT(5)</div><div class='add'>+#define RCR_DIS_CRC		BIT(4)</div><div class='add'>+#define RCR_ALL			BIT(3)</div><div class='add'>+#define RCR_PRMSC		BIT(1)</div><div class='add'>+#define RCR_RXEN		BIT(0)</div><div class='add'>+#define RCR_RX_DISABLE		(RCR_DIS_LONG | RCR_DIS_CRC)</div><div class='add'>+/* 0x06 */</div><div class='add'>+#define RSR_RF			BIT(7)</div><div class='add'>+#define RSR_MF			BIT(6)</div><div class='add'>+#define RSR_LCS			BIT(5)</div><div class='add'>+#define RSR_RWTO		BIT(4)</div><div class='add'>+#define RSR_PLE			BIT(3)</div><div class='add'>+#define RSR_AE			BIT(2)</div><div class='add'>+#define RSR_CE			BIT(1)</div><div class='add'>+#define RSR_FOE			BIT(0)</div><div class='add'>+#define	RSR_ERR_BITS		(RSR_RF | RSR_LCS | RSR_RWTO | RSR_PLE | \</div><div class='add'>+				 RSR_AE | RSR_CE | RSR_FOE)</div><div class='add'>+/* 0x0A */</div><div class='add'>+#define FCR_TXPEN		BIT(5)</div><div class='add'>+#define FCR_BKPM		BIT(3)</div><div class='add'>+#define FCR_FLCE		BIT(0)</div><div class='add'>+#define FCR_RXTX_BITS		(FCR_TXPEN | FCR_BKPM | FCR_FLCE)</div><div class='add'>+/* 0x0B */</div><div class='add'>+#define EPCR_WEP		BIT(4)</div><div class='add'>+#define EPCR_EPOS		BIT(3)</div><div class='add'>+#define EPCR_ERPRR		BIT(2)</div><div class='add'>+#define EPCR_ERPRW		BIT(1)</div><div class='add'>+#define EPCR_ERRE		BIT(0)</div><div class='add'>+/* 0x1E */</div><div class='add'>+#define GPCR_GEP_CNTL		BIT(0)</div><div class='add'>+/* 0x1F */</div><div class='add'>+#define GPR_PHY_OFF		BIT(0)</div><div class='add'>+/* 0x30 */</div><div class='add'>+#define	ATCR_AUTO_TX		BIT(7)</div><div class='add'>+/* 0x39 */</div><div class='add'>+#define INTCR_POL_LOW		(1 &lt;&lt; 0)</div><div class='add'>+#define INTCR_POL_HIGH		(0 &lt;&lt; 0)</div><div class='add'>+/* 0x3D */</div><div class='add'>+/* Pause Packet Control Register - default = 1 */</div><div class='add'>+#define PPCR_PAUSE_COUNT	0x08</div><div class='add'>+/* 0x55 */</div><div class='add'>+#define MPCR_RSTTX		BIT(1)</div><div class='add'>+#define MPCR_RSTRX		BIT(0)</div><div class='add'>+/* 0x57 */</div><div class='add'>+/* LEDMode Control Register - LEDMode1 */</div><div class='add'>+/* Value 0x81 : bit[7] = 1, bit[2] = 0, bit[1:0] = 01b */</div><div class='add'>+#define LMCR_NEWMOD		BIT(7)</div><div class='add'>+#define LMCR_TYPED1		BIT(1)</div><div class='add'>+#define LMCR_TYPED0		BIT(0)</div><div class='add'>+#define LMCR_MODE1		(LMCR_NEWMOD | LMCR_TYPED0)</div><div class='add'>+/* 0x5E */</div><div class='add'>+#define MBNDRY_BYTE		BIT(7)</div><div class='add'>+/* 0xFE */</div><div class='add'>+#define ISR_MBS			BIT(7)</div><div class='add'>+#define ISR_LNKCHG		BIT(5)</div><div class='add'>+#define ISR_ROOS		BIT(3)</div><div class='add'>+#define ISR_ROS			BIT(2)</div><div class='add'>+#define ISR_PTS			BIT(1)</div><div class='add'>+#define ISR_PRS			BIT(0)</div><div class='add'>+#define ISR_CLR_INT		(ISR_LNKCHG | ISR_ROOS | ISR_ROS | \</div><div class='add'>+				 ISR_PTS | ISR_PRS)</div><div class='add'>+#define ISR_STOP_MRCMD		(ISR_MBS)</div><div class='add'>+/* 0xFF */</div><div class='add'>+#define IMR_PAR			BIT(7)</div><div class='add'>+#define IMR_LNKCHGI		BIT(5)</div><div class='add'>+#define IMR_PTM			BIT(1)</div><div class='add'>+#define IMR_PRM			BIT(0)</div><div class='add'>+</div><div class='add'>+/* Const</div><div class='add'>+ */</div><div class='add'>+#define DM9051_PHY_ADDR			1	/* PHY id */</div><div class='add'>+#define DM9051_PHY			0x40	/* PHY address 0x01 */</div><div class='add'>+#define DM9051_PKT_RDY			0x01	/* Packet ready to receive */</div><div class='add'>+#define DM9051_PKT_MAX			1536	/* Received packet max size */</div><div class='add'>+#define DM9051_TX_QUE_HI_WATER		50</div><div class='add'>+#define DM9051_TX_QUE_LO_WATER		25</div><div class='add'>+#define DM_EEPROM_MAGIC			0x9051</div><div class='add'>+</div><div class='add'>+#define	DM_RXHDR_SIZE			sizeof(struct dm9051_rxhdr)</div><div class='add'>+</div><div class='add'>+static inline struct board_info *to_dm9051_board(struct net_device *ndev)</div><div class='add'>+{</div><div class='add'>+	return netdev_priv(ndev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#endif /* _DM9051_H_ */</div><div class='head'>diff --git a/drivers/net/ethernet/dec/Kconfig b/drivers/net/ethernet/dec/Kconfig<br/>index df1eeb04d5ea..9e5e5f10bd19 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_DEC</div><div class='ctx'> 	bool "Digital Equipment devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI || EISA || CARDBUS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/21142.c b/drivers/net/ethernet/dec/tulip/21142.c<br/>index 369858272650..76767dec216d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/21142.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/21142.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/21142.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/21142.c</a></div><div class='hunk'>@@ -216,7 +216,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5)</div><div class='ctx'> 		    (csr12 &amp; 2) == 2) ||</div><div class='ctx'> 		   (tp-&gt;nway &amp;&amp; (csr5 &amp; (TPLnkFail)))) {</div><div class='ctx'> 		/* Link blew? Maybe restart NWay. */</div><div class='del'>-		del_timer_sync(&amp;tp-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> 		t21142_start_nway(dev);</div><div class='ctx'> 		tp-&gt;timer.expires = RUN_AT(3*HZ);</div><div class='ctx'> 		add_timer(&amp;tp-&gt;timer);</div><div class='hunk'>@@ -226,7 +226,7 @@ void t21142_lnk_change(struct net_device *dev, int csr5)</div><div class='ctx'> 				 medianame[dev-&gt;if_port],</div><div class='ctx'> 				 (csr12 &amp; 2) ? "failed" : "good");</div><div class='ctx'> 		if ((csr12 &amp; 2)  &amp;&amp;  ! tp-&gt;medialock) {</div><div class='del'>-			del_timer_sync(&amp;tp-&gt;timer);</div><div class='add'>+			timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> 			t21142_start_nway(dev);</div><div class='ctx'> 			tp-&gt;timer.expires = RUN_AT(3*HZ);</div><div class='ctx'> 			add_timer(&amp;tp-&gt;timer);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/Kconfig b/drivers/net/ethernet/dec/tulip/Kconfig<br/>index 8ce6888ea722..078a12f07e96 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config NET_TULIP</div><div class='ctx'> 	bool "DEC - Tulip devices"</div><div class='ctx'> 	depends on (PCI || EISA || CARDBUS)</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This selects the "Tulip" family of EISA/PCI network cards.</div><div class='ctx'> </div><div class='ctx'> if NET_TULIP</div><div class='hunk'>@@ -15,7 +15,7 @@ config DE2104X</div><div class='ctx'> 	tristate "Early DECchip Tulip (dc2104x) PCI support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is developed for the SMC EtherPower series Ethernet</div><div class='ctx'> 	  cards and also works with cards based on the DECchip</div><div class='ctx'> 	  21040 (Tulip series) chips.  Some LinkSys PCI cards are</div><div class='hunk'>@@ -32,7 +32,7 @@ config DE2104X_DSL</div><div class='ctx'> 	depends on DE2104X</div><div class='ctx'> 	range 0 31</div><div class='ctx'> 	default 0</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Setting this value allows to align ring buffer descriptors into their</div><div class='ctx'> 	  own cache lines. Value of 4 corresponds to the typical 32 byte line</div><div class='ctx'> 	  (the descriptor is 16 bytes). This is necessary on systems that lack</div><div class='hunk'>@@ -43,7 +43,7 @@ config TULIP</div><div class='ctx'> 	tristate "DECchip Tulip (dc2114x) PCI support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is developed for the SMC EtherPower series Ethernet</div><div class='ctx'> 	  cards and also works with cards based on the DECchip </div><div class='ctx'> 	  21140 (Tulip series) chips.  Some LinkSys PCI cards are</div><div class='hunk'>@@ -58,7 +58,7 @@ config TULIP</div><div class='ctx'> config TULIP_MWI</div><div class='ctx'> 	bool "New bus configuration"</div><div class='ctx'> 	depends on TULIP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This configures your Tulip card specifically for the card and</div><div class='ctx'> 	  system cache line size type you are using.</div><div class='ctx'> </div><div class='hunk'>@@ -69,7 +69,7 @@ config TULIP_MWI</div><div class='ctx'> config TULIP_MMIO</div><div class='ctx'> 	bool "Use PCI shared mem for NIC registers"</div><div class='ctx'> 	depends on TULIP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Use PCI shared memory for the NIC registers, rather than going through</div><div class='ctx'> 	  the Tulip's PIO (programmed I/O ports).  Faster, but could produce</div><div class='ctx'> 	  obscure bugs if your mainboard has memory controller timing issues.</div><div class='hunk'>@@ -78,7 +78,7 @@ config TULIP_MMIO</div><div class='ctx'> config TULIP_NAPI</div><div class='ctx'> 	bool "Use RX polling (NAPI)"</div><div class='ctx'> 	depends on TULIP</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  NAPI is a new driver API designed to reduce CPU and interrupt load</div><div class='ctx'> 	  when the driver is receiving lots of packets from the card. It is</div><div class='ctx'> 	  still somewhat experimental and thus not yet enabled by default.</div><div class='hunk'>@@ -92,7 +92,7 @@ config TULIP_NAPI</div><div class='ctx'> config TULIP_NAPI_HW_MITIGATION</div><div class='ctx'> 	bool "Use Interrupt Mitigation"</div><div class='ctx'> 	depends on TULIP_NAPI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Use HW to reduce RX interrupts. Not strictly necessary since NAPI</div><div class='ctx'> 	  reduces RX interrupts by itself. Interrupt mitigation reduces RX</div><div class='ctx'> 	  interrupts even at low levels of traffic at the cost of a small</div><div class='hunk'>@@ -104,27 +104,12 @@ config TULIP_DM910X</div><div class='ctx'> 	def_bool y</div><div class='ctx'> 	depends on TULIP &amp;&amp; SPARC</div><div class='ctx'> </div><div class='del'>-config DE4X5</div><div class='del'>-	tristate "Generic DECchip &amp; DIGITAL EtherWORKS PCI/EISA"</div><div class='del'>-	depends on (PCI || EISA)</div><div class='del'>-	depends on VIRT_TO_BUS || ALPHA || PPC || SPARC</div><div class='del'>-	select CRC32</div><div class='del'>-	---help---</div><div class='del'>-	  This is support for the DIGITAL series of PCI/EISA Ethernet cards.</div><div class='del'>-	  These include the DE425, DE434, DE435, DE450 and DE500 models.  If</div><div class='del'>-	  you have a network card of this type, say Y.  More specific</div><div class='del'>-	  information is contained in</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/dec/de4x5.txt&gt;.</div><div class='del'>-</div><div class='del'>-	  To compile this driver as a module, choose M here. The module will</div><div class='del'>-	  be called de4x5.</div><div class='del'>-</div><div class='ctx'> config WINBOND_840</div><div class='ctx'> 	tristate "Winbond W89c840 Ethernet support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the Winbond W89c840 chip.  It also works with </div><div class='ctx'> 	  the TX9882 chip on the Compex RL100-ATX board.</div><div class='ctx'> 	  More specific information and updates are available from</div><div class='hunk'>@@ -134,11 +119,11 @@ config DM9102</div><div class='ctx'> 	tristate "Davicom DM910x/DM980x support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from</div><div class='ctx'> 	  Davicom (&lt;http://www.davicom.com.tw/&gt;).  If you have such a network</div><div class='ctx'> 	  (Ethernet) card, say Y.  Some information is contained in the file</div><div class='del'>-	  &lt;file:Documentation/networking/device_drivers/dec/dmfe.txt&gt;.</div><div class='add'>+	  &lt;file:Documentation/networking/device_drivers/ethernet/dec/dmfe.rst&gt;.</div><div class='ctx'> </div><div class='ctx'> 	  To compile this driver as a module, choose M here. The module will</div><div class='ctx'> 	  be called dmfe.</div><div class='hunk'>@@ -147,7 +132,7 @@ config ULI526X</div><div class='ctx'> 	tristate "ULi M526x controller support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for ULi M5261/M5263 10/100M Ethernet Controller</div><div class='ctx'> 	  (&lt;http://www.nvidia.com/page/uli_drivers.html&gt;).</div><div class='ctx'> </div><div class='hunk'>@@ -157,7 +142,7 @@ config ULI526X</div><div class='ctx'> config PCMCIA_XIRCOM</div><div class='ctx'> 	tristate "Xircom CardBus support"</div><div class='ctx'> 	depends on CARDBUS</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the Digital "Tulip" Ethernet CardBus adapters.</div><div class='ctx'> 	  It should work with most DEC 21*4*-based chips/ethercards, as well</div><div class='ctx'> 	  as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/Makefile b/drivers/net/ethernet/dec/tulip/Makefile<br/>index 8aab37564d5d..d4f1d21d29a0 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/Makefile</a></div><div class='hunk'>@@ -10,7 +10,6 @@ obj-$(CONFIG_DM9102)		+= dmfe.o</div><div class='ctx'> obj-$(CONFIG_WINBOND_840)	+= winbond-840.o</div><div class='ctx'> obj-$(CONFIG_DE2104X)		+= de2104x.o</div><div class='ctx'> obj-$(CONFIG_TULIP)		+= tulip.o</div><div class='del'>-obj-$(CONFIG_DE4X5)		+= de4x5.o</div><div class='ctx'> obj-$(CONFIG_ULI526X)		+= uli526x.o</div><div class='ctx'> </div><div class='ctx'> # Declare multi-part drivers.</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c<br/>index f1a2da15dd0a..f9504f340c4a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/de2104x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/de2104x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/de2104x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/de2104x.c</a></div><div class='hunk'>@@ -30,7 +30,6 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"de2104x"</div><div class='del'>-#define DRV_VERSION		"0.7"</div><div class='ctx'> #define DRV_RELDATE		"Mar 17, 2004"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -50,16 +49,11 @@</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-</div><div class='del'>-/* These identify the driver base version and may not be removed. */</div><div class='del'>-static char version[] =</div><div class='del'>-"PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")";</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Jeff Garzik &lt;jgarzik@pobox.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Intel/Digital 21040/1 series PCI Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> static int debug = -1;</div><div class='ctx'> module_param (debug, int, 0);</div><div class='hunk'>@@ -91,7 +85,7 @@ MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copi</div><div class='ctx'> #define DSL			CONFIG_DE2104X_DSL</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#define DE_RX_RING_SIZE		64</div><div class='add'>+#define DE_RX_RING_SIZE		128</div><div class='ctx'> #define DE_TX_RING_SIZE		64</div><div class='ctx'> #define DE_RING_BYTES		\</div><div class='ctx'> 		((sizeof(struct de_desc) * DE_RX_RING_SIZE) +	\</div><div class='hunk'>@@ -417,7 +411,10 @@ static void de_rx (struct de_private *de)</div><div class='ctx'> 		if (status &amp; DescOwn)</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='del'>-		len = ((status &gt;&gt; 16) &amp; 0x7ff) - 4;</div><div class='add'>+		/* the length is actually a 15 bit value here according</div><div class='add'>+		 * to Table 4-1 in the DE2104x spec so mask is 0x7fff</div><div class='add'>+		 */</div><div class='add'>+		len = ((status &gt;&gt; 16) &amp; 0x7fff) - 4;</div><div class='ctx'> 		mapping = de-&gt;rx_skb[rx_tail].mapping;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(drop)) {</div><div class='hunk'>@@ -446,21 +443,23 @@ static void de_rx (struct de_private *de)</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (!copying_skb) {</div><div class='del'>-			pci_unmap_single(de-&gt;pdev, mapping,</div><div class='del'>-					 buflen, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;de-&gt;pdev-&gt;dev, mapping, buflen,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_put(skb, len);</div><div class='ctx'> </div><div class='ctx'> 			mapping =</div><div class='ctx'> 			de-&gt;rx_skb[rx_tail].mapping =</div><div class='del'>-				pci_map_single(de-&gt;pdev, copy_skb-&gt;data,</div><div class='del'>-					       buflen, PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_map_single(&amp;de-&gt;pdev-&gt;dev, copy_skb-&gt;data,</div><div class='add'>+					       buflen, DMA_FROM_DEVICE);</div><div class='ctx'> 			de-&gt;rx_skb[rx_tail].skb = copy_skb;</div><div class='ctx'> 		} else {</div><div class='del'>-			pci_dma_sync_single_for_cpu(de-&gt;pdev, mapping, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_cpu(&amp;de-&gt;pdev-&gt;dev, mapping, len,</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='ctx'> 			skb_reserve(copy_skb, RX_OFFSET);</div><div class='ctx'> 			skb_copy_from_linear_data(skb, skb_put(copy_skb, len),</div><div class='ctx'> 						  len);</div><div class='del'>-			pci_dma_sync_single_for_device(de-&gt;pdev, mapping, len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_sync_single_for_device(&amp;de-&gt;pdev-&gt;dev, mapping,</div><div class='add'>+						   len, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 			/* We'll reuse the original ring buffer. */</div><div class='ctx'> 			skb = copy_skb;</div><div class='hunk'>@@ -557,13 +556,15 @@ static void de_tx (struct de_private *de)</div><div class='ctx'> 			goto next;</div><div class='ctx'> </div><div class='ctx'> 		if (unlikely(skb == DE_SETUP_SKB)) {</div><div class='del'>-			pci_unmap_single(de-&gt;pdev, de-&gt;tx_skb[tx_tail].mapping,</div><div class='del'>-					 sizeof(de-&gt;setup_frame), PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;de-&gt;pdev-&gt;dev,</div><div class='add'>+					 de-&gt;tx_skb[tx_tail].mapping,</div><div class='add'>+					 sizeof(de-&gt;setup_frame),</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			goto next;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(de-&gt;pdev, de-&gt;tx_skb[tx_tail].mapping,</div><div class='del'>-				 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;de-&gt;pdev-&gt;dev, de-&gt;tx_skb[tx_tail].mapping,</div><div class='add'>+				 skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		if (status &amp; LastFrag) {</div><div class='ctx'> 			if (status &amp; TxError) {</div><div class='hunk'>@@ -623,7 +624,8 @@ static netdev_tx_t de_start_xmit (struct sk_buff *skb,</div><div class='ctx'> 	txd = &amp;de-&gt;tx_ring[entry];</div><div class='ctx'> </div><div class='ctx'> 	len = skb-&gt;len;</div><div class='del'>-	mapping = pci_map_single(de-&gt;pdev, skb-&gt;data, len, PCI_DMA_TODEVICE);</div><div class='add'>+	mapping = dma_map_single(&amp;de-&gt;pdev-&gt;dev, skb-&gt;data, len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> 	if (entry == (DE_TX_RING_SIZE - 1))</div><div class='ctx'> 		flags |= RingEnd;</div><div class='ctx'> 	if (!tx_free || (tx_free == (DE_TX_RING_SIZE / 2)))</div><div class='hunk'>@@ -664,8 +666,8 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='ctx'> 	u16 hash_table[32];</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='add'>+	const u16 *eaddrs;</div><div class='ctx'> 	int i;</div><div class='del'>-	u16 *eaddrs;</div><div class='ctx'> </div><div class='ctx'> 	memset(hash_table, 0, sizeof(hash_table));</div><div class='ctx'> 	__set_bit_le(255, hash_table);			/* Broadcast entry */</div><div class='hunk'>@@ -683,7 +685,7 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> 	setup_frm = &amp;de-&gt;setup_frame[13*6];</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the final entry with our physical address. */</div><div class='del'>-	eaddrs = (u16 *)dev-&gt;dev_addr;</div><div class='add'>+	eaddrs = (const u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];</div><div class='ctx'> 	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];</div><div class='ctx'> 	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];</div><div class='hunk'>@@ -693,7 +695,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='del'>-	u16 *eaddrs;</div><div class='add'>+	const u16 *eaddrs;</div><div class='ctx'> </div><div class='ctx'> 	/* We have &lt;= 14 addresses so we can use the wonderful</div><div class='ctx'> 	   16 address perfect filtering of the Tulip. */</div><div class='hunk'>@@ -708,7 +710,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> 	setup_frm = &amp;de-&gt;setup_frame[15*6];</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the final entry with our physical address. */</div><div class='del'>-	eaddrs = (u16 *)dev-&gt;dev_addr;</div><div class='add'>+	eaddrs = (const u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];</div><div class='ctx'> 	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];</div><div class='ctx'> 	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];</div><div class='hunk'>@@ -766,8 +768,8 @@ static void __de_set_rx_mode (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	de-&gt;tx_skb[entry].skb = DE_SETUP_SKB;</div><div class='ctx'> 	de-&gt;tx_skb[entry].mapping = mapping =</div><div class='del'>-	    pci_map_single (de-&gt;pdev, de-&gt;setup_frame,</div><div class='del'>-			    sizeof (de-&gt;setup_frame), PCI_DMA_TODEVICE);</div><div class='add'>+	    dma_map_single(&amp;de-&gt;pdev-&gt;dev, de-&gt;setup_frame,</div><div class='add'>+			   sizeof(de-&gt;setup_frame), DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* Put the setup frame on the Tx list. */</div><div class='ctx'> 	txd = &amp;de-&gt;tx_ring[entry];</div><div class='hunk'>@@ -830,8 +832,8 @@ static struct net_device_stats *de_get_stats(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	/* The chip only need report frame silently dropped. */</div><div class='ctx'> 	spin_lock_irq(&amp;de-&gt;lock);</div><div class='del'>- 	if (netif_running(dev) &amp;&amp; netif_device_present(dev))</div><div class='del'>- 		__de_get_stats(de);</div><div class='add'>+	if (netif_running(dev) &amp;&amp; netif_device_present(dev))</div><div class='add'>+		__de_get_stats(de);</div><div class='ctx'> 	spin_unlock_irq(&amp;de-&gt;lock);</div><div class='ctx'> </div><div class='ctx'> 	return &amp;dev-&gt;stats;</div><div class='hunk'>@@ -961,7 +963,7 @@ static void de_next_media (struct de_private *de, const u32 *media,</div><div class='ctx'> </div><div class='ctx'> static void de21040_media_timer (struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct de_private *de = from_timer(de, t, media_timer);</div><div class='add'>+	struct de_private *de = timer_container_of(de, t, media_timer);</div><div class='ctx'> 	struct net_device *dev = de-&gt;dev;</div><div class='ctx'> 	u32 status = dr32(SIAStatus);</div><div class='ctx'> 	unsigned int carrier;</div><div class='hunk'>@@ -1042,7 +1044,7 @@ static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)</div><div class='ctx'> </div><div class='ctx'> static void de21041_media_timer (struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct de_private *de = from_timer(de, t, media_timer);</div><div class='add'>+	struct de_private *de = timer_container_of(de, t, media_timer);</div><div class='ctx'> 	struct net_device *dev = de-&gt;dev;</div><div class='ctx'> 	u32 status = dr32(SIAStatus);</div><div class='ctx'> 	unsigned int carrier;</div><div class='hunk'>@@ -1282,8 +1284,10 @@ static int de_refill_rx (struct de_private *de)</div><div class='ctx'> 		if (!skb)</div><div class='ctx'> 			goto err_out;</div><div class='ctx'> </div><div class='del'>-		de-&gt;rx_skb[i].mapping = pci_map_single(de-&gt;pdev,</div><div class='del'>-			skb-&gt;data, de-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+		de-&gt;rx_skb[i].mapping = dma_map_single(&amp;de-&gt;pdev-&gt;dev,</div><div class='add'>+						       skb-&gt;data,</div><div class='add'>+						       de-&gt;rx_buf_sz,</div><div class='add'>+						       DMA_FROM_DEVICE);</div><div class='ctx'> 		de-&gt;rx_skb[i].skb = skb;</div><div class='ctx'> </div><div class='ctx'> 		de-&gt;rx_ring[i].opts1 = cpu_to_le32(DescOwn);</div><div class='hunk'>@@ -1316,7 +1320,8 @@ static int de_init_rings (struct de_private *de)</div><div class='ctx'> </div><div class='ctx'> static int de_alloc_rings (struct de_private *de)</div><div class='ctx'> {</div><div class='del'>-	de-&gt;rx_ring = pci_alloc_consistent(de-&gt;pdev, DE_RING_BYTES, &amp;de-&gt;ring_dma);</div><div class='add'>+	de-&gt;rx_ring = dma_alloc_coherent(&amp;de-&gt;pdev-&gt;dev, DE_RING_BYTES,</div><div class='add'>+					 &amp;de-&gt;ring_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!de-&gt;rx_ring)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	de-&gt;tx_ring = &amp;de-&gt;rx_ring[DE_RX_RING_SIZE];</div><div class='hunk'>@@ -1336,8 +1341,9 @@ static void de_clean_rings (struct de_private *de)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; DE_RX_RING_SIZE; i++) {</div><div class='ctx'> 		if (de-&gt;rx_skb[i].skb) {</div><div class='del'>-			pci_unmap_single(de-&gt;pdev, de-&gt;rx_skb[i].mapping,</div><div class='del'>-					 de-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;de-&gt;pdev-&gt;dev,</div><div class='add'>+					 de-&gt;rx_skb[i].mapping, de-&gt;rx_buf_sz,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(de-&gt;rx_skb[i].skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1347,15 +1353,15 @@ static void de_clean_rings (struct de_private *de)</div><div class='ctx'> 		if ((skb) &amp;&amp; (skb != DE_DUMMY_SKB)) {</div><div class='ctx'> 			if (skb != DE_SETUP_SKB) {</div><div class='ctx'> 				de-&gt;dev-&gt;stats.tx_dropped++;</div><div class='del'>-				pci_unmap_single(de-&gt;pdev,</div><div class='del'>-					de-&gt;tx_skb[i].mapping,</div><div class='del'>-					skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(&amp;de-&gt;pdev-&gt;dev,</div><div class='add'>+						 de-&gt;tx_skb[i].mapping,</div><div class='add'>+						 skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 				dev_kfree_skb(skb);</div><div class='ctx'> 			} else {</div><div class='del'>-				pci_unmap_single(de-&gt;pdev,</div><div class='del'>-					de-&gt;tx_skb[i].mapping,</div><div class='del'>-					sizeof(de-&gt;setup_frame),</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(&amp;de-&gt;pdev-&gt;dev,</div><div class='add'>+						 de-&gt;tx_skb[i].mapping,</div><div class='add'>+						 sizeof(de-&gt;setup_frame),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1367,7 +1373,8 @@ static void de_clean_rings (struct de_private *de)</div><div class='ctx'> static void de_free_rings (struct de_private *de)</div><div class='ctx'> {</div><div class='ctx'> 	de_clean_rings(de);</div><div class='del'>-	pci_free_consistent(de-&gt;pdev, DE_RING_BYTES, de-&gt;rx_ring, de-&gt;ring_dma);</div><div class='add'>+	dma_free_coherent(&amp;de-&gt;pdev-&gt;dev, DE_RING_BYTES, de-&gt;rx_ring,</div><div class='add'>+			  de-&gt;ring_dma);</div><div class='ctx'> 	de-&gt;rx_ring = NULL;</div><div class='ctx'> 	de-&gt;tx_ring = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1421,7 +1428,7 @@ static int de_close (struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_dbg(de, ifdown, dev, "disabling interface\n");</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;de-&gt;media_timer);</div><div class='add'>+	timer_delete_sync(&amp;de-&gt;media_timer);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irqsave(&amp;de-&gt;lock, flags);</div><div class='ctx'> 	de_stop_hw(de);</div><div class='hunk'>@@ -1436,7 +1443,7 @@ static int de_close (struct net_device *dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void de_tx_timeout (struct net_device *dev)</div><div class='add'>+static void de_tx_timeout (struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='ctx'> 	const int irq = de-&gt;pdev-&gt;irq;</div><div class='hunk'>@@ -1445,7 +1452,7 @@ static void de_tx_timeout (struct net_device *dev)</div><div class='ctx'> 		   dr32(MacStatus), dr32(MacMode), dr32(SIAStatus),</div><div class='ctx'> 		   de-&gt;rx_tail, de-&gt;tx_head, de-&gt;tx_tail);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;de-&gt;media_timer);</div><div class='add'>+	timer_delete_sync(&amp;de-&gt;media_timer);</div><div class='ctx'> </div><div class='ctx'> 	disable_irq(irq);</div><div class='ctx'> 	spin_lock_irq(&amp;de-&gt;lock);</div><div class='hunk'>@@ -1599,9 +1606,8 @@ static void de_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(de-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(de-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int de_get_regs_len(struct net_device *dev)</div><div class='hunk'>@@ -1707,6 +1713,7 @@ static const struct ethtool_ops de_ethtool_ops = {</div><div class='ctx'> </div><div class='ctx'> static void de21040_get_mac_address(struct de_private *de)</div><div class='ctx'> {</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	unsigned i;</div><div class='ctx'> </div><div class='ctx'> 	dw32 (ROMCmd, 0);	/* Reset the pointer with a dummy write. */</div><div class='hunk'>@@ -1718,12 +1725,13 @@ static void de21040_get_mac_address(struct de_private *de)</div><div class='ctx'> 			value = dr32(ROMCmd);</div><div class='ctx'> 			rmb();</div><div class='ctx'> 		} while (value &lt; 0 &amp;&amp; --boguscnt &gt; 0);</div><div class='del'>-		de-&gt;dev-&gt;dev_addr[i] = value;</div><div class='add'>+		addr[i] = value;</div><div class='ctx'> 		udelay(1);</div><div class='ctx'> 		if (boguscnt &lt;= 0)</div><div class='ctx'> 			pr_warn("timeout reading 21040 MAC address byte %u\n",</div><div class='ctx'> 				i);</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(de-&gt;dev, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void de21040_get_media_info(struct de_private *de)</div><div class='hunk'>@@ -1815,8 +1823,7 @@ static void de21041_get_srom_info(struct de_private *de)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 	/* store MAC address */</div><div class='del'>-	for (i = 0; i &lt; 6; i ++)</div><div class='del'>-		de-&gt;dev-&gt;dev_addr[i] = ee_data[i + sa_offset];</div><div class='add'>+	eth_hw_addr_set(de-&gt;dev, &amp;ee_data[sa_offset]);</div><div class='ctx'> </div><div class='ctx'> 	/* get offset of controller 0 info leaf.  ignore 2nd byte. */</div><div class='ctx'> 	ofs = ee_data[SROMC0InfoLeaf];</div><div class='hunk'>@@ -1977,11 +1984,6 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	board_idx++;</div><div class='ctx'> </div><div class='del'>-#ifndef MODULE</div><div class='del'>-	if (board_idx == 0)</div><div class='del'>-		pr_info("%s\n", version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	/* allocate a new ethernet device structure, and fill in defaults */</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(struct de_private));</div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -2039,7 +2041,7 @@ static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* remap CSR registers */</div><div class='del'>-	regs = ioremap_nocache(pciaddr, DE_REGS_SIZE);</div><div class='add'>+	regs = ioremap(pciaddr, DE_REGS_SIZE);</div><div class='ctx'> 	if (!regs) {</div><div class='ctx'> 		rc = -EIO;</div><div class='ctx'> 		pr_err("Cannot map PCI MMIO (%llx@%lx) on pci dev %s\n",</div><div class='hunk'>@@ -2114,18 +2116,17 @@ static void de_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static int de_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused de_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	if (netif_running (dev)) {</div><div class='ctx'> 		const int irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-		del_timer_sync(&amp;de-&gt;media_timer);</div><div class='add'>+		timer_delete_sync(&amp;de-&gt;media_timer);</div><div class='ctx'> </div><div class='ctx'> 		disable_irq(irq);</div><div class='ctx'> 		spin_lock_irq(&amp;de-&gt;lock);</div><div class='hunk'>@@ -2145,7 +2146,6 @@ static int de_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 		de_clean_rings(de);</div><div class='ctx'> </div><div class='ctx'> 		de_adapter_sleep(de);</div><div class='del'>-		pci_disable_device(pdev);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2153,21 +2153,17 @@ static int de_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int de_resume (struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused de_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='ctx'> 	struct de_private *de = netdev_priv(dev);</div><div class='del'>-	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	if (netif_device_present(dev))</div><div class='ctx'> 		goto out;</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		goto out_attach;</div><div class='del'>-	if ((retval = pci_enable_device(pdev))) {</div><div class='del'>-		netdev_err(dev, "pci_enable_device failed in resume\n");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> 	de_init_rings(de);</div><div class='ctx'> 	de_init_hw(de);</div><div class='hunk'>@@ -2178,31 +2174,24 @@ out:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+static SIMPLE_DEV_PM_OPS(de_pm_ops, de_suspend, de_resume);</div><div class='add'>+</div><div class='add'>+static void de_shutdown(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	dev_close(dev);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+}</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver de_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.id_table	= de_pci_tbl,</div><div class='ctx'> 	.probe		= de_init_one,</div><div class='ctx'> 	.remove		= de_remove_one,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= de_suspend,</div><div class='del'>-	.resume		= de_resume,</div><div class='del'>-#endif</div><div class='add'>+	.shutdown	= de_shutdown,</div><div class='add'>+	.driver.pm	= &amp;de_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init de_init (void)</div><div class='del'>-{</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	pr_info("%s\n", version);</div><div class='del'>-#endif</div><div class='del'>-	return pci_register_driver(&amp;de_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit de_exit (void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver (&amp;de_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(de_init);</div><div class='del'>-module_exit(de_exit);</div><div class='add'>+module_pci_driver(de_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c<br/>deleted file mode 100644<br/>index f16853c3c851..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/de4x5.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/de4x5.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5581 +0,0 @@</div><div class='del'>-/*  de4x5.c: A DIGITAL DC21x4x DECchip and DE425/DE434/DE435/DE450/DE500</div><div class='del'>-             ethernet driver for Linux.</div><div class='del'>-</div><div class='del'>-    Copyright 1994, 1995 Digital Equipment Corporation.</div><div class='del'>-</div><div class='del'>-    Testing resources for this driver have been made available</div><div class='del'>-    in part by NASA Ames Research Center (mjacob@nas.nasa.gov).</div><div class='del'>-</div><div class='del'>-    The author may be reached at davies@maniac.ultranet.com.</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute  it and/or modify it</div><div class='del'>-    under  the terms of  the GNU General  Public License as published by the</div><div class='del'>-    Free Software Foundation;  either version 2 of the  License, or (at your</div><div class='del'>-    option) any later version.</div><div class='del'>-</div><div class='del'>-    THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR   IMPLIED</div><div class='del'>-    WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF</div><div class='del'>-    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN</div><div class='del'>-    NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT,  INDIRECT,</div><div class='del'>-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT</div><div class='del'>-    NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF</div><div class='del'>-    USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON</div><div class='del'>-    ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF</div><div class='del'>-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the  GNU General Public License along</div><div class='del'>-    with this program; if not, write  to the Free Software Foundation, Inc.,</div><div class='del'>-    675 Mass Ave, Cambridge, MA 02139, USA.</div><div class='del'>-</div><div class='del'>-    Originally,   this  driver  was    written  for the  Digital   Equipment</div><div class='del'>-    Corporation series of EtherWORKS ethernet cards:</div><div class='del'>-</div><div class='del'>-        DE425 TP/COAX EISA</div><div class='del'>-	DE434 TP PCI</div><div class='del'>-	DE435 TP/COAX/AUI PCI</div><div class='del'>-	DE450 TP/COAX/AUI PCI</div><div class='del'>-	DE500 10/100 PCI Fasternet</div><div class='del'>-</div><div class='del'>-    but it  will  now attempt  to  support all  cards which   conform to the</div><div class='del'>-    Digital Semiconductor   SROM   Specification.    The  driver   currently</div><div class='del'>-    recognises the following chips:</div><div class='del'>-</div><div class='del'>-        DC21040  (no SROM)</div><div class='del'>-	DC21041[A]</div><div class='del'>-	DC21140[A]</div><div class='del'>-	DC21142</div><div class='del'>-	DC21143</div><div class='del'>-</div><div class='del'>-    So far the driver is known to work with the following cards:</div><div class='del'>-</div><div class='del'>-        KINGSTON</div><div class='del'>-	Linksys</div><div class='del'>-	ZNYX342</div><div class='del'>-	SMC8432</div><div class='del'>-	SMC9332 (w/new SROM)</div><div class='del'>-	ZNYX31[45]</div><div class='del'>-	ZNYX346 10/100 4 port (can act as a 10/100 bridge!)</div><div class='del'>-</div><div class='del'>-    The driver has been tested on a relatively busy network using the DE425,</div><div class='del'>-    DE434, DE435 and DE500 cards and benchmarked with 'ttcp': it transferred</div><div class='del'>-    16M of data to a DECstation 5000/200 as follows:</div><div class='del'>-</div><div class='del'>-                TCP           UDP</div><div class='del'>-             TX     RX     TX     RX</div><div class='del'>-    DE425   1030k  997k   1170k  1128k</div><div class='del'>-    DE434   1063k  995k   1170k  1125k</div><div class='del'>-    DE435   1063k  995k   1170k  1125k</div><div class='del'>-    DE500   1063k  998k   1170k  1125k  in 10Mb/s mode</div><div class='del'>-</div><div class='del'>-    All  values are typical (in   kBytes/sec) from a  sample  of 4 for  each</div><div class='del'>-    measurement. Their error is +/-20k on a quiet (private) network and also</div><div class='del'>-    depend on what load the CPU has.</div><div class='del'>-</div><div class='del'>-    =========================================================================</div><div class='del'>-    This driver  has been written substantially  from  scratch, although its</div><div class='del'>-    inheritance of style and stack interface from 'ewrk3.c' and in turn from</div><div class='del'>-    Donald Becker's 'lance.c' should be obvious. With the module autoload of</div><div class='del'>-    every  usable DECchip board,  I  pinched Donald's 'next_module' field to</div><div class='del'>-    link my modules together.</div><div class='del'>-</div><div class='del'>-    Up to 15 EISA cards can be supported under this driver, limited primarily</div><div class='del'>-    by the available IRQ lines.  I have  checked different configurations of</div><div class='del'>-    multiple depca, EtherWORKS 3 cards and de4x5 cards and  have not found a</div><div class='del'>-    problem yet (provided you have at least depca.c v0.38) ...</div><div class='del'>-</div><div class='del'>-    PCI support has been added  to allow the driver  to work with the DE434,</div><div class='del'>-    DE435, DE450 and DE500 cards. The I/O accesses are a bit of a kludge due</div><div class='del'>-    to the differences in the EISA and PCI CSR address offsets from the base</div><div class='del'>-    address.</div><div class='del'>-</div><div class='del'>-    The ability to load this  driver as a loadable  module has been included</div><div class='del'>-    and used extensively  during the driver development  (to save those long</div><div class='del'>-    reboot sequences).  Loadable module support  under PCI and EISA has been</div><div class='del'>-    achieved by letting the driver autoprobe as if it were compiled into the</div><div class='del'>-    kernel. Do make sure  you're not sharing  interrupts with anything  that</div><div class='del'>-    cannot accommodate  interrupt  sharing!</div><div class='del'>-</div><div class='del'>-    To utilise this ability, you have to do 8 things:</div><div class='del'>-</div><div class='del'>-    0) have a copy of the loadable modules code installed on your system.</div><div class='del'>-    1) copy de4x5.c from the  /linux/drivers/net directory to your favourite</div><div class='del'>-    temporary directory.</div><div class='del'>-    2) for fixed  autoprobes (not  recommended),  edit the source code  near</div><div class='del'>-    line 5594 to reflect the I/O address  you're using, or assign these when</div><div class='del'>-    loading by:</div><div class='del'>-</div><div class='del'>-                   insmod de4x5 io=0xghh           where g = bus number</div><div class='del'>-		                                        hh = device number</div><div class='del'>-</div><div class='del'>-       NB: autoprobing for modules is now supported by default. You may just</div><div class='del'>-           use:</div><div class='del'>-</div><div class='del'>-                   insmod de4x5</div><div class='del'>-</div><div class='del'>-           to load all available boards. For a specific board, still use</div><div class='del'>-	   the 'io=?' above.</div><div class='del'>-    3) compile  de4x5.c, but include -DMODULE in  the command line to ensure</div><div class='del'>-    that the correct bits are compiled (see end of source code).</div><div class='del'>-    4) if you are wanting to add a new  card, goto 5. Otherwise, recompile a</div><div class='del'>-    kernel with the de4x5 configuration turned off and reboot.</div><div class='del'>-    5) insmod de4x5 [io=0xghh]</div><div class='del'>-    6) run the net startup bits for your new eth?? interface(s) manually</div><div class='del'>-    (usually /etc/rc.inet[12] at boot time).</div><div class='del'>-    7) enjoy!</div><div class='del'>-</div><div class='del'>-    To unload a module, turn off the associated interface(s)</div><div class='del'>-    'ifconfig eth?? down' then 'rmmod de4x5'.</div><div class='del'>-</div><div class='del'>-    Automedia detection is included so that in  principal you can disconnect</div><div class='del'>-    from, e.g.  TP, reconnect  to BNC  and  things will still work  (after a</div><div class='del'>-    pause whilst the   driver figures out   where its media went).  My tests</div><div class='del'>-    using ping showed that it appears to work....</div><div class='del'>-</div><div class='del'>-    By  default,  the driver will  now   autodetect any  DECchip based card.</div><div class='del'>-    Should you have a need to restrict the driver to DIGITAL only cards, you</div><div class='del'>-    can compile with a  DEC_ONLY define, or if  loading as a module, use the</div><div class='del'>-    'dec_only=1'  parameter.</div><div class='del'>-</div><div class='del'>-    I've changed the timing routines to  use the kernel timer and scheduling</div><div class='del'>-    functions  so that the  hangs  and other assorted problems that occurred</div><div class='del'>-    while autosensing the  media  should be gone.  A  bonus  for the DC21040</div><div class='del'>-    auto  media sense algorithm is  that it can now  use one that is more in</div><div class='del'>-    line with the  rest (the DC21040  chip doesn't  have a hardware  timer).</div><div class='del'>-    The downside is the 1 'jiffies' (10ms) resolution.</div><div class='del'>-</div><div class='del'>-    IEEE 802.3u MII interface code has  been added in anticipation that some</div><div class='del'>-    products may use it in the future.</div><div class='del'>-</div><div class='del'>-    The SMC9332 card  has a non-compliant SROM  which needs fixing -  I have</div><div class='del'>-    patched this  driver to detect it  because the SROM format used complies</div><div class='del'>-    to a previous DEC-STD format.</div><div class='del'>-</div><div class='del'>-    I have removed the buffer copies needed for receive on Intels.  I cannot</div><div class='del'>-    remove them for   Alphas since  the  Tulip hardware   only does longword</div><div class='del'>-    aligned  DMA transfers  and  the  Alphas get   alignment traps with  non</div><div class='del'>-    longword aligned data copies (which makes them really slow). No comment.</div><div class='del'>-</div><div class='del'>-    I  have added SROM decoding  routines to make this  driver work with any</div><div class='del'>-    card that  supports the Digital  Semiconductor SROM spec. This will help</div><div class='del'>-    all  cards running the dc2114x  series chips in particular.  Cards using</div><div class='del'>-    the dc2104x  chips should run correctly with  the basic  driver.  I'm in</div><div class='del'>-    debt to &lt;mjacob@feral.com&gt; for the  testing and feedback that helped get</div><div class='del'>-    this feature working.  So far we have  tested KINGSTON, SMC8432, SMC9332</div><div class='del'>-    (with the latest SROM complying  with the SROM spec  V3: their first was</div><div class='del'>-    broken), ZNYX342  and  LinkSys. ZYNX314 (dual  21041  MAC) and  ZNYX 315</div><div class='del'>-    (quad 21041 MAC)  cards also  appear  to work despite their  incorrectly</div><div class='del'>-    wired IRQs.</div><div class='del'>-</div><div class='del'>-    I have added a temporary fix for interrupt problems when some SCSI cards</div><div class='del'>-    share the same interrupt as the DECchip based  cards. The problem occurs</div><div class='del'>-    because  the SCSI card wants to  grab the interrupt  as a fast interrupt</div><div class='del'>-    (runs the   service routine with interrupts turned   off) vs.  this card</div><div class='del'>-    which really needs to run the service routine with interrupts turned on.</div><div class='del'>-    This driver will  now   add the interrupt service   routine  as  a  fast</div><div class='del'>-    interrupt if it   is bounced from the   slow interrupt.  THIS IS NOT   A</div><div class='del'>-    RECOMMENDED WAY TO RUN THE DRIVER  and has been done  for a limited time</div><div class='del'>-    until  people   sort  out their  compatibility    issues and the  kernel</div><div class='del'>-    interrupt  service code  is  fixed.   YOU  SHOULD SEPARATE OUT  THE FAST</div><div class='del'>-    INTERRUPT CARDS FROM THE SLOW INTERRUPT CARDS to ensure that they do not</div><div class='del'>-    run on the same interrupt. PCMCIA/CardBus is another can of worms...</div><div class='del'>-</div><div class='del'>-    Finally, I think  I have really  fixed  the module  loading problem with</div><div class='del'>-    more than one DECchip based  card.  As a  side effect, I don't mess with</div><div class='del'>-    the  device structure any  more which means that  if more than 1 card in</div><div class='del'>-    2.0.x is    installed (4  in   2.1.x),  the  user   will have   to  edit</div><div class='del'>-    linux/drivers/net/Space.c  to make room for  them. Hence, module loading</div><div class='del'>-    is  the preferred way to use   this driver, since  it  doesn't have this</div><div class='del'>-    limitation.</div><div class='del'>-</div><div class='del'>-    Where SROM media  detection is used and  full duplex is specified in the</div><div class='del'>-    SROM,  the feature is  ignored unless  lp-&gt;params.fdx  is set at compile</div><div class='del'>-    time  OR during  a   module load  (insmod  de4x5   args='eth??:fdx' [see</div><div class='del'>-    below]).  This is because there  is no way  to automatically detect full</div><div class='del'>-    duplex   links  except through   autonegotiation.    When I  include the</div><div class='del'>-    autonegotiation feature in  the SROM autoconf  code, this detection will</div><div class='del'>-    occur automatically for that case.</div><div class='del'>-</div><div class='del'>-    Command  line arguments are  now  allowed, similar  to passing arguments</div><div class='del'>-    through LILO. This will allow a per adapter board  set up of full duplex</div><div class='del'>-    and media. The only lexical constraints  are: the board name (dev-&gt;name)</div><div class='del'>-    appears in the list before its  parameters.  The list of parameters ends</div><div class='del'>-    either at the end of the parameter list or with another board name.  The</div><div class='del'>-    following parameters are allowed:</div><div class='del'>-</div><div class='del'>-            fdx        for full duplex</div><div class='del'>-	    autosense  to set the media/speed; with the following</div><div class='del'>-	               sub-parameters:</div><div class='del'>-		       TP, TP_NW, BNC, AUI, BNC_AUI, 100Mb, 10Mb, AUTO</div><div class='del'>-</div><div class='del'>-    Case sensitivity is important  for  the sub-parameters. They *must*   be</div><div class='del'>-    upper case. Examples:</div><div class='del'>-</div><div class='del'>-        insmod de4x5 args='eth1:fdx autosense=BNC eth0:autosense=100Mb'.</div><div class='del'>-</div><div class='del'>-    For a compiled in driver, at or above line 548, place e.g.</div><div class='del'>-	#define DE4X5_PARM "eth0:fdx autosense=AUI eth2:autosense=TP"</div><div class='del'>-</div><div class='del'>-    Yes,  I know full duplex isn't  permissible on BNC  or AUI; they're just</div><div class='del'>-    examples. By default, full duplex is turned off and  AUTO is the default</div><div class='del'>-    autosense setting.  In reality, I expect only  the full duplex option to</div><div class='del'>-    be used. Note the use of single quotes in the two examples above and the</div><div class='del'>-    lack of commas to separate items. ALSO, you must get the requested media</div><div class='del'>-    correct in relation to what the adapter SROM says it has. There's no way</div><div class='del'>-    to  determine this in  advance other than by  trial and error and common</div><div class='del'>-    sense, e.g. call a BNC connectored port 'BNC', not '10Mb'.</div><div class='del'>-</div><div class='del'>-    Changed the bus probing.  EISA used to be  done first,  followed by PCI.</div><div class='del'>-    Most people probably don't even know  what a de425 is today and the EISA</div><div class='del'>-    probe has messed  up some SCSI cards  in the past,  so now PCI is always</div><div class='del'>-    probed  first  followed by  EISA if  a) the architecture allows EISA and</div><div class='del'>-    either  b) there have been no PCI cards detected or  c) an EISA probe is</div><div class='del'>-    forced by  the user.  To force  a probe  include  "force_eisa"  in  your</div><div class='del'>-    insmod "args" line;  for built-in kernels either change the driver to do</div><div class='del'>-    this  automatically  or include  #define DE4X5_FORCE_EISA  on or  before</div><div class='del'>-    line 1040 in the driver.</div><div class='del'>-</div><div class='del'>-    TO DO:</div><div class='del'>-    ------</div><div class='del'>-</div><div class='del'>-    Revision History</div><div class='del'>-    ----------------</div><div class='del'>-</div><div class='del'>-    Version   Date        Description</div><div class='del'>-</div><div class='del'>-      0.1     17-Nov-94   Initial writing. ALPHA code release.</div><div class='del'>-      0.2     13-Jan-95   Added PCI support for DE435's.</div><div class='del'>-      0.21    19-Jan-95   Added auto media detection.</div><div class='del'>-      0.22    10-Feb-95   Fix interrupt handler call &lt;chris@cosy.sbg.ac.at&gt;.</div><div class='del'>-                          Fix recognition bug reported by &lt;bkm@star.rl.ac.uk&gt;.</div><div class='del'>-			  Add request/release_region code.</div><div class='del'>-			  Add loadable modules support for PCI.</div><div class='del'>-			  Clean up loadable modules support.</div><div class='del'>-      0.23    28-Feb-95   Added DC21041 and DC21140 support.</div><div class='del'>-                          Fix missed frame counter value and initialisation.</div><div class='del'>-			  Fixed EISA probe.</div><div class='del'>-      0.24    11-Apr-95   Change delay routine to use &lt;linux/udelay&gt;.</div><div class='del'>-                          Change TX_BUFFS_AVAIL macro.</div><div class='del'>-			  Change media autodetection to allow manual setting.</div><div class='del'>-			  Completed DE500 (DC21140) support.</div><div class='del'>-      0.241   18-Apr-95   Interim release without DE500 Autosense Algorithm.</div><div class='del'>-      0.242   10-May-95   Minor changes.</div><div class='del'>-      0.30    12-Jun-95   Timer fix for DC21140.</div><div class='del'>-                          Portability changes.</div><div class='del'>-			  Add ALPHA changes from &lt;jestabro@ant.tay1.dec.com&gt;.</div><div class='del'>-			  Add DE500 semi automatic autosense.</div><div class='del'>-			  Add Link Fail interrupt TP failure detection.</div><div class='del'>-			  Add timer based link change detection.</div><div class='del'>-			  Plugged a memory leak in de4x5_queue_pkt().</div><div class='del'>-      0.31    13-Jun-95   Fixed PCI stuff for 1.3.1.</div><div class='del'>-      0.32    26-Jun-95   Added verify_area() calls in de4x5_ioctl() from a</div><div class='del'>-                          suggestion by &lt;heiko@colossus.escape.de&gt;.</div><div class='del'>-      0.33     8-Aug-95   Add shared interrupt support (not released yet).</div><div class='del'>-      0.331   21-Aug-95   Fix de4x5_open() with fast CPUs.</div><div class='del'>-                          Fix de4x5_interrupt().</div><div class='del'>-                          Fix dc21140_autoconf() mess.</div><div class='del'>-			  No shared interrupt support.</div><div class='del'>-      0.332   11-Sep-95   Added MII management interface routines.</div><div class='del'>-      0.40     5-Mar-96   Fix setup frame timeout &lt;maartenb@hpkuipc.cern.ch&gt;.</div><div class='del'>-                          Add kernel timer code (h/w is too flaky).</div><div class='del'>-			  Add MII based PHY autosense.</div><div class='del'>-			  Add new multicasting code.</div><div class='del'>-			  Add new autosense algorithms for media/mode</div><div class='del'>-			  selection using kernel scheduling/timing.</div><div class='del'>-			  Re-formatted.</div><div class='del'>-			  Made changes suggested by &lt;jeff@router.patch.net&gt;:</div><div class='del'>-			    Change driver to detect all DECchip based cards</div><div class='del'>-			    with DEC_ONLY restriction a special case.</div><div class='del'>-			    Changed driver to autoprobe as a module. No irq</div><div class='del'>-			    checking is done now - assume BIOS is good!</div><div class='del'>-			  Added SMC9332 detection &lt;manabe@Roy.dsl.tutics.ac.jp&gt;</div><div class='del'>-      0.41    21-Mar-96   Don't check for get_hw_addr checksum unless DEC card</div><div class='del'>-                          only &lt;niles@axp745gsfc.nasa.gov&gt;</div><div class='del'>-			  Fix for multiple PCI cards reported by &lt;jos@xos.nl&gt;</div><div class='del'>-			  Duh, put the IRQF_SHARED flag into request_interrupt().</div><div class='del'>-			  Fix SMC ethernet address in enet_det[].</div><div class='del'>-			  Print chip name instead of "UNKNOWN" during boot.</div><div class='del'>-      0.42    26-Apr-96   Fix MII write TA bit error.</div><div class='del'>-                          Fix bug in dc21040 and dc21041 autosense code.</div><div class='del'>-			  Remove buffer copies on receive for Intels.</div><div class='del'>-			  Change sk_buff handling during media disconnects to</div><div class='del'>-			   eliminate DUP packets.</div><div class='del'>-			  Add dynamic TX thresholding.</div><div class='del'>-			  Change all chips to use perfect multicast filtering.</div><div class='del'>-			  Fix alloc_device() bug &lt;jari@markkus2.fimr.fi&gt;</div><div class='del'>-      0.43   21-Jun-96    Fix unconnected media TX retry bug.</div><div class='del'>-                          Add Accton to the list of broken cards.</div><div class='del'>-			  Fix TX under-run bug for non DC21140 chips.</div><div class='del'>-			  Fix boot command probe bug in alloc_device() as</div><div class='del'>-			   reported by &lt;koen.gadeyne@barco.com&gt; and</div><div class='del'>-			   &lt;orava@nether.tky.hut.fi&gt;.</div><div class='del'>-			  Add cache locks to prevent a race condition as</div><div class='del'>-			   reported by &lt;csd@microplex.com&gt; and</div><div class='del'>-			   &lt;baba@beckman.uiuc.edu&gt;.</div><div class='del'>-			  Upgraded alloc_device() code.</div><div class='del'>-      0.431  28-Jun-96    Fix potential bug in queue_pkt() from discussion</div><div class='del'>-                          with &lt;csd@microplex.com&gt;</div><div class='del'>-      0.44   13-Aug-96    Fix RX overflow bug in 2114[023] chips.</div><div class='del'>-                          Fix EISA probe bugs reported by &lt;os2@kpi.kharkov.ua&gt;</div><div class='del'>-			  and &lt;michael@compurex.com&gt;.</div><div class='del'>-      0.441   9-Sep-96    Change dc21041_autoconf() to probe quiet BNC media</div><div class='del'>-                           with a loopback packet.</div><div class='del'>-      0.442   9-Sep-96    Include AUI in dc21041 media printout. Bug reported</div><div class='del'>-                           by &lt;bhat@mundook.cs.mu.OZ.AU&gt;</div><div class='del'>-      0.45    8-Dec-96    Include endian functions for PPC use, from work</div><div class='del'>-                           by &lt;cort@cs.nmt.edu&gt; and &lt;g.thomas@opengroup.org&gt;.</div><div class='del'>-      0.451  28-Dec-96    Added fix to allow autoprobe for modules after</div><div class='del'>-                           suggestion from &lt;mjacob@feral.com&gt;.</div><div class='del'>-      0.5    30-Jan-97    Added SROM decoding functions.</div><div class='del'>-                          Updated debug flags.</div><div class='del'>-			  Fix sleep/wakeup calls for PCI cards, bug reported</div><div class='del'>-			   by &lt;cross@gweep.lkg.dec.com&gt;.</div><div class='del'>-			  Added multi-MAC, one SROM feature from discussion</div><div class='del'>-			   with &lt;mjacob@feral.com&gt;.</div><div class='del'>-			  Added full module autoprobe capability.</div><div class='del'>-			  Added attempt to use an SMC9332 with broken SROM.</div><div class='del'>-			  Added fix for ZYNX multi-mac cards that didn't</div><div class='del'>-			   get their IRQs wired correctly.</div><div class='del'>-      0.51   13-Feb-97    Added endian fixes for the SROM accesses from</div><div class='del'>-			   &lt;paubert@iram.es&gt;</div><div class='del'>-			  Fix init_connection() to remove extra device reset.</div><div class='del'>-			  Fix MAC/PHY reset ordering in dc21140m_autoconf().</div><div class='del'>-			  Fix initialisation problem with lp-&gt;timeout in</div><div class='del'>-			   typeX_infoblock() from &lt;paubert@iram.es&gt;.</div><div class='del'>-			  Fix MII PHY reset problem from work done by</div><div class='del'>-			   &lt;paubert@iram.es&gt;.</div><div class='del'>-      0.52   26-Apr-97    Some changes may not credit the right people -</div><div class='del'>-                           a disk crash meant I lost some mail.</div><div class='del'>-			  Change RX interrupt routine to drop rather than</div><div class='del'>-			   defer packets to avoid hang reported by</div><div class='del'>-			   &lt;g.thomas@opengroup.org&gt;.</div><div class='del'>-			  Fix srom_exec() to return for COMPACT and type 1</div><div class='del'>-			   infoblocks.</div><div class='del'>-			  Added DC21142 and DC21143 functions.</div><div class='del'>-			  Added byte counters from &lt;phil@tazenda.demon.co.uk&gt;</div><div class='del'>-			  Added IRQF_DISABLED temporary fix from</div><div class='del'>-			   &lt;mjacob@feral.com&gt;.</div><div class='del'>-      0.53   12-Nov-97    Fix the *_probe() to include 'eth??' name during</div><div class='del'>-                           module load: bug reported by</div><div class='del'>-			   &lt;Piete.Brooks@cl.cam.ac.uk&gt;</div><div class='del'>-			  Fix multi-MAC, one SROM, to work with 2114x chips:</div><div class='del'>-			   bug reported by &lt;cmetz@inner.net&gt;.</div><div class='del'>-			  Make above search independent of BIOS device scan</div><div class='del'>-			   direction.</div><div class='del'>-			  Completed DC2114[23] autosense functions.</div><div class='del'>-      0.531  21-Dec-97    Fix DE500-XA 100Mb/s bug reported by</div><div class='del'>-                           &lt;robin@intercore.com</div><div class='del'>-			  Fix type1_infoblock() bug introduced in 0.53, from</div><div class='del'>-			   problem reports by</div><div class='del'>-			   &lt;parmee@postecss.ncrfran.france.ncr.com&gt; and</div><div class='del'>-			   &lt;jo@ice.dillingen.baynet.de&gt;.</div><div class='del'>-			  Added argument list to set up each board from either</div><div class='del'>-			   a module's command line or a compiled in #define.</div><div class='del'>-			  Added generic MII PHY functionality to deal with</div><div class='del'>-			   newer PHY chips.</div><div class='del'>-			  Fix the mess in 2.1.67.</div><div class='del'>-      0.532   5-Jan-98    Fix bug in mii_get_phy() reported by</div><div class='del'>-                           &lt;redhat@cococo.net&gt;.</div><div class='del'>-                          Fix bug in pci_probe() for 64 bit systems reported</div><div class='del'>-			   by &lt;belliott@accessone.com&gt;.</div><div class='del'>-      0.533   9-Jan-98    Fix more 64 bit bugs reported by &lt;jal@cs.brown.edu&gt;.</div><div class='del'>-      0.534  24-Jan-98    Fix last (?) endian bug from &lt;geert@linux-m68k.org&gt;</div><div class='del'>-      0.535  21-Feb-98    Fix Ethernet Address PROM reset bug for DC21040.</div><div class='del'>-      0.536  21-Mar-98    Change pci_probe() to use the pci_dev structure.</div><div class='del'>-			  **Incompatible with 2.0.x from here.**</div><div class='del'>-      0.540   5-Jul-98    Atomicize assertion of dev-&gt;interrupt for SMP</div><div class='del'>-                           from &lt;lma@varesearch.com&gt;</div><div class='del'>-			  Add TP, AUI and BNC cases to 21140m_autoconf() for</div><div class='del'>-			   case where a 21140 under SROM control uses, e.g. AUI</div><div class='del'>-			   from problem report by &lt;delchini@lpnp09.in2p3.fr&gt;</div><div class='del'>-			  Add MII parallel detection to 2114x_autoconf() for</div><div class='del'>-			   case where no autonegotiation partner exists from</div><div class='del'>-			   problem report by &lt;mlapsley@ndirect.co.uk&gt;.</div><div class='del'>-			  Add ability to force connection type directly even</div><div class='del'>-			   when using SROM control from problem report by</div><div class='del'>-			   &lt;earl@exis.net&gt;.</div><div class='del'>-			  Updated the PCI interface to conform with the latest</div><div class='del'>-			   version. I hope nothing is broken...</div><div class='del'>-          		  Add TX done interrupt modification from suggestion</div><div class='del'>-			   by &lt;Austin.Donnelly@cl.cam.ac.uk&gt;.</div><div class='del'>-			  Fix is_anc_capable() bug reported by</div><div class='del'>-			   &lt;Austin.Donnelly@cl.cam.ac.uk&gt;.</div><div class='del'>-			  Fix type[13]_infoblock() bug: during MII search, PHY</div><div class='del'>-			   lp-&gt;rst not run because lp-&gt;ibn not initialised -</div><div class='del'>-			   from report &amp; fix by &lt;paubert@iram.es&gt;.</div><div class='del'>-			  Fix probe bug with EISA &amp; PCI cards present from</div><div class='del'>-                           report by &lt;eirik@netcom.com&gt;.</div><div class='del'>-      0.541  24-Aug-98    Fix compiler problems associated with i386-string</div><div class='del'>-                           ops from multiple bug reports and temporary fix</div><div class='del'>-			   from &lt;paubert@iram.es&gt;.</div><div class='del'>-			  Fix pci_probe() to correctly emulate the old</div><div class='del'>-			   pcibios_find_class() function.</div><div class='del'>-			  Add an_exception() for old ZYNX346 and fix compile</div><div class='del'>-			   warning on PPC &amp; SPARC, from &lt;ecd@skynet.be&gt;.</div><div class='del'>-			  Fix lastPCI to correctly work with compiled in</div><div class='del'>-			   kernels and modules from bug report by</div><div class='del'>-			   &lt;Zlatko.Calusic@CARNet.hr&gt; et al.</div><div class='del'>-      0.542  15-Sep-98    Fix dc2114x_autoconf() to stop multiple messages</div><div class='del'>-                           when media is unconnected.</div><div class='del'>-			  Change dev-&gt;interrupt to lp-&gt;interrupt to ensure</div><div class='del'>-			   alignment for Alpha's and avoid their unaligned</div><div class='del'>-			   access traps. This flag is merely for log messages:</div><div class='del'>-			   should do something more definitive though...</div><div class='del'>-      0.543  30-Dec-98    Add SMP spin locking.</div><div class='del'>-      0.544   8-May-99    Fix for buggy SROM in Motorola embedded boards using</div><div class='del'>-                           a 21143 by &lt;mmporter@home.com&gt;.</div><div class='del'>-			  Change PCI/EISA bus probing order.</div><div class='del'>-      0.545  28-Nov-99    Further Moto SROM bug fix from</div><div class='del'>-                           &lt;mporter@eng.mcd.mot.com&gt;</div><div class='del'>-                          Remove double checking for DEBUG_RX in de4x5_dbg_rx()</div><div class='del'>-			   from report by &lt;geert@linux-m68k.org&gt;</div><div class='del'>-      0.546  22-Feb-01    Fixes Alpha XP1000 oops.  The srom_search function</div><div class='del'>-                           was causing a page fault when initializing the</div><div class='del'>-                           variable 'pb', on a non de4x5 PCI device, in this</div><div class='del'>-                           case a PCI bridge (DEC chip 21152). The value of</div><div class='del'>-                           'pb' is now only initialized if a de4x5 chip is</div><div class='del'>-                           present.</div><div class='del'>-                           &lt;france@handhelds.org&gt;</div><div class='del'>-      0.547  08-Nov-01    Use library crc32 functions by &lt;Matt_Domsch@dell.com&gt;</div><div class='del'>-      0.548  30-Aug-03    Big 2.6 cleanup. Ported to PCI/EISA probing and</div><div class='del'>-                           generic DMA APIs. Fixed DE425 support on Alpha.</div><div class='del'>-			   &lt;maz@wild-wind.fr.eu.org&gt;</div><div class='del'>-    =========================================================================</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/kernel.h&gt;</div><div class='del'>-#include &lt;linux/string.h&gt;</div><div class='del'>-#include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/ptrace.h&gt;</div><div class='del'>-#include &lt;linux/errno.h&gt;</div><div class='del'>-#include &lt;linux/ioport.h&gt;</div><div class='del'>-#include &lt;linux/pci.h&gt;</div><div class='del'>-#include &lt;linux/eisa.h&gt;</div><div class='del'>-#include &lt;linux/delay.h&gt;</div><div class='del'>-#include &lt;linux/init.h&gt;</div><div class='del'>-#include &lt;linux/spinlock.h&gt;</div><div class='del'>-#include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include &lt;linux/etherdevice.h&gt;</div><div class='del'>-#include &lt;linux/skbuff.h&gt;</div><div class='del'>-#include &lt;linux/time.h&gt;</div><div class='del'>-#include &lt;linux/types.h&gt;</div><div class='del'>-#include &lt;linux/unistd.h&gt;</div><div class='del'>-#include &lt;linux/ctype.h&gt;</div><div class='del'>-#include &lt;linux/dma-mapping.h&gt;</div><div class='del'>-#include &lt;linux/moduleparam.h&gt;</div><div class='del'>-#include &lt;linux/bitops.h&gt;</div><div class='del'>-#include &lt;linux/gfp.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;asm/io.h&gt;</div><div class='del'>-#include &lt;asm/dma.h&gt;</div><div class='del'>-#include &lt;asm/byteorder.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='del'>-#include &lt;linux/uaccess.h&gt;</div><div class='del'>-#ifdef CONFIG_PPC_PMAC</div><div class='del'>-#include &lt;asm/machdep.h&gt;</div><div class='del'>-#endif /* CONFIG_PPC_PMAC */</div><div class='del'>-</div><div class='del'>-#include "de4x5.h"</div><div class='del'>-</div><div class='del'>-static const char version[] =</div><div class='del'>-	KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";</div><div class='del'>-</div><div class='del'>-#define c_char const char</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MII Information</div><div class='del'>-*/</div><div class='del'>-struct phy_table {</div><div class='del'>-    int reset;              /* Hard reset required?                         */</div><div class='del'>-    int id;                 /* IEEE OUI                                     */</div><div class='del'>-    int ta;                 /* One cycle TA time - 802.3u is confusing here */</div><div class='del'>-    struct {                /* Non autonegotiation (parallel) speed det.    */</div><div class='del'>-	int reg;</div><div class='del'>-	int mask;</div><div class='del'>-	int value;</div><div class='del'>-    } spd;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct mii_phy {</div><div class='del'>-    int reset;              /* Hard reset required?                      */</div><div class='del'>-    int id;                 /* IEEE OUI                                  */</div><div class='del'>-    int ta;                 /* One cycle TA time                         */</div><div class='del'>-    struct {                /* Non autonegotiation (parallel) speed det. */</div><div class='del'>-	int reg;</div><div class='del'>-	int mask;</div><div class='del'>-	int value;</div><div class='del'>-    } spd;</div><div class='del'>-    int addr;               /* MII address for the PHY                   */</div><div class='del'>-    u_char  *gep;           /* Start of GEP sequence block in SROM       */</div><div class='del'>-    u_char  *rst;           /* Start of reset sequence in SROM           */</div><div class='del'>-    u_int mc;               /* Media Capabilities                        */</div><div class='del'>-    u_int ana;              /* NWay Advertisement                        */</div><div class='del'>-    u_int fdx;              /* Full DupleX capabilities for each media   */</div><div class='del'>-    u_int ttm;              /* Transmit Threshold Mode for each media    */</div><div class='del'>-    u_int mci;              /* 21142 MII Connector Interrupt info        */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DE4X5_MAX_PHY 8     /* Allow up to 8 attached PHY devices per board */</div><div class='del'>-</div><div class='del'>-struct sia_phy {</div><div class='del'>-    u_char mc;              /* Media Code                                */</div><div class='del'>-    u_char ext;             /* csr13-15 valid when set                   */</div><div class='del'>-    int csr13;              /* SIA Connectivity Register                 */</div><div class='del'>-    int csr14;              /* SIA TX/RX Register                        */</div><div class='del'>-    int csr15;              /* SIA General Register                      */</div><div class='del'>-    int gepc;               /* SIA GEP Control Information               */</div><div class='del'>-    int gep;                /* SIA GEP Data                              */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Define the know universe of PHY devices that can be</div><div class='del'>-** recognised by this driver.</div><div class='del'>-*/</div><div class='del'>-static struct phy_table phy_info[] = {</div><div class='del'>-    {0, NATIONAL_TX, 1, {0x19, 0x40, 0x00}},       /* National TX      */</div><div class='del'>-    {1, BROADCOM_T4, 1, {0x10, 0x02, 0x02}},       /* Broadcom T4      */</div><div class='del'>-    {0, SEEQ_T4    , 1, {0x12, 0x10, 0x10}},       /* SEEQ T4          */</div><div class='del'>-    {0, CYPRESS_T4 , 1, {0x05, 0x20, 0x20}},       /* Cypress T4       */</div><div class='del'>-    {0, 0x7810     , 1, {0x14, 0x0800, 0x0800}}    /* Level One LTX970 */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** These GENERIC values assumes that the PHY devices follow 802.3u and</div><div class='del'>-** allow parallel detection to set the link partner ability register.</div><div class='del'>-** Detection of 100Base-TX [H/F Duplex] and 100Base-T4 is supported.</div><div class='del'>-*/</div><div class='del'>-#define GENERIC_REG   0x05      /* Autoneg. Link Partner Advertisement Reg. */</div><div class='del'>-#define GENERIC_MASK  MII_ANLPA_100M /* All 100Mb/s Technologies            */</div><div class='del'>-#define GENERIC_VALUE MII_ANLPA_100M /* 100B-TX, 100B-TX FDX, 100B-T4       */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Define special SROM detection cases</div><div class='del'>-*/</div><div class='del'>-static c_char enet_det[][ETH_ALEN] = {</div><div class='del'>-    {0x00, 0x00, 0xc0, 0x00, 0x00, 0x00},</div><div class='del'>-    {0x00, 0x00, 0xe8, 0x00, 0x00, 0x00}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SMC    1</div><div class='del'>-#define ACCTON 2</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Repair definitions. If a broken SROM is detected a card may</div><div class='del'>-** use this information to help figure out what to do. This is a</div><div class='del'>-** "stab in the dark" and so far for SMC9332's only.</div><div class='del'>-*/</div><div class='del'>-static c_char srom_repair_info[][100] = {</div><div class='del'>-    {0x00,0x1e,0x00,0x00,0x00,0x08,             /* SMC9332 */</div><div class='del'>-     0x1f,0x01,0x8f,0x01,0x00,0x01,0x00,0x02,</div><div class='del'>-     0x01,0x00,0x00,0x78,0xe0,0x01,0x00,0x50,</div><div class='del'>-     0x00,0x18,}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef DE4X5_DEBUG</div><div class='del'>-static int de4x5_debug = DE4X5_DEBUG;</div><div class='del'>-#else</div><div class='del'>-/*static int de4x5_debug = (DEBUG_MII | DEBUG_SROM | DEBUG_PCICFG | DEBUG_MEDIA | DEBUG_VERSION);*/</div><div class='del'>-static int de4x5_debug = (DEBUG_MEDIA | DEBUG_VERSION);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Allow per adapter set up. For modules this is simply a command line</div><div class='del'>-** parameter, e.g.:</div><div class='del'>-** insmod de4x5 args='eth1:fdx autosense=BNC eth0:autosense=100Mb'.</div><div class='del'>-**</div><div class='del'>-** For a compiled in driver, place e.g.</div><div class='del'>-**     #define DE4X5_PARM "eth0:fdx autosense=AUI eth2:autosense=TP"</div><div class='del'>-** here</div><div class='del'>-*/</div><div class='del'>-#ifdef DE4X5_PARM</div><div class='del'>-static char *args = DE4X5_PARM;</div><div class='del'>-#else</div><div class='del'>-static char *args;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct parameters {</div><div class='del'>-    bool fdx;</div><div class='del'>-    int autosense;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DE4X5_AUTOSENSE_MS 250      /* msec autosense tick (DE500) */</div><div class='del'>-</div><div class='del'>-#define DE4X5_NDA 0xffe0            /* No Device (I/O) Address */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Ethernet PROM defines</div><div class='del'>-*/</div><div class='del'>-#define PROBE_LENGTH    32</div><div class='del'>-#define ETH_PROM_SIG    0xAA5500FFUL</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Ethernet Info</div><div class='del'>-*/</div><div class='del'>-#define PKT_BUF_SZ	1536            /* Buffer size for each Tx/Rx buffer */</div><div class='del'>-#define IEEE802_3_SZ    1518            /* Packet + CRC */</div><div class='del'>-#define MAX_PKT_SZ   	1514            /* Maximum ethernet packet length */</div><div class='del'>-#define MAX_DAT_SZ   	1500            /* Maximum ethernet data length */</div><div class='del'>-#define MIN_DAT_SZ   	1               /* Minimum ethernet data length */</div><div class='del'>-#define PKT_HDR_LEN     14              /* Addresses and data length info */</div><div class='del'>-#define FAKE_FRAME_LEN  (MAX_PKT_SZ + 1)</div><div class='del'>-#define QUEUE_PKT_TIMEOUT (3*HZ)        /* 3 second timeout */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** EISA bus defines</div><div class='del'>-*/</div><div class='del'>-#define DE4X5_EISA_IO_PORTS   0x0c00    /* I/O port base address, slot 0 */</div><div class='del'>-#define DE4X5_EISA_TOTAL_SIZE 0x100     /* I/O address extent */</div><div class='del'>-</div><div class='del'>-#define EISA_ALLOWED_IRQ_LIST  {5, 9, 10, 11}</div><div class='del'>-</div><div class='del'>-#define DE4X5_SIGNATURE {"DE425","DE434","DE435","DE450","DE500"}</div><div class='del'>-#define DE4X5_NAME_LENGTH 8</div><div class='del'>-</div><div class='del'>-static c_char *de4x5_signatures[] = DE4X5_SIGNATURE;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Ethernet PROM defines for DC21040</div><div class='del'>-*/</div><div class='del'>-#define PROBE_LENGTH    32</div><div class='del'>-#define ETH_PROM_SIG    0xAA5500FFUL</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Bus defines</div><div class='del'>-*/</div><div class='del'>-#define PCI_MAX_BUS_NUM      8</div><div class='del'>-#define DE4X5_PCI_TOTAL_SIZE 0x80       /* I/O address extent */</div><div class='del'>-#define DE4X5_CLASS_CODE     0x00020000 /* Network controller, Ethernet */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Memory Alignment. Each descriptor is 4 longwords long. To force a</div><div class='del'>-** particular alignment on the TX descriptor, adjust DESC_SKIP_LEN and</div><div class='del'>-** DESC_ALIGN. ALIGN aligns the start address of the private memory area</div><div class='del'>-** and hence the RX descriptor ring's first entry.</div><div class='del'>-*/</div><div class='del'>-#define DE4X5_ALIGN4      ((u_long)4 - 1)     /* 1 longword align */</div><div class='del'>-#define DE4X5_ALIGN8      ((u_long)8 - 1)     /* 2 longword align */</div><div class='del'>-#define DE4X5_ALIGN16     ((u_long)16 - 1)    /* 4 longword align */</div><div class='del'>-#define DE4X5_ALIGN32     ((u_long)32 - 1)    /* 8 longword align */</div><div class='del'>-#define DE4X5_ALIGN64     ((u_long)64 - 1)    /* 16 longword align */</div><div class='del'>-#define DE4X5_ALIGN128    ((u_long)128 - 1)   /* 32 longword align */</div><div class='del'>-</div><div class='del'>-#define DE4X5_ALIGN         DE4X5_ALIGN32           /* Keep the DC21040 happy... */</div><div class='del'>-#define DE4X5_CACHE_ALIGN   CAL_16LONG</div><div class='del'>-#define DESC_SKIP_LEN DSL_0             /* Must agree with DESC_ALIGN */</div><div class='del'>-/*#define DESC_ALIGN    u32 dummy[4];  / * Must agree with DESC_SKIP_LEN */</div><div class='del'>-#define DESC_ALIGN</div><div class='del'>-</div><div class='del'>-#ifndef DEC_ONLY                        /* See README.de4x5 for using this */</div><div class='del'>-static int dec_only;</div><div class='del'>-#else</div><div class='del'>-static int dec_only = 1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DE4X5 IRQ ENABLE/DISABLE</div><div class='del'>-*/</div><div class='del'>-#define ENABLE_IRQs { \</div><div class='del'>-    imr |= lp-&gt;irq_en;\</div><div class='del'>-    outl(imr, DE4X5_IMR);               /* Enable the IRQs */\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define DISABLE_IRQs {\</div><div class='del'>-    imr = inl(DE4X5_IMR);\</div><div class='del'>-    imr &amp;= ~lp-&gt;irq_en;\</div><div class='del'>-    outl(imr, DE4X5_IMR);               /* Disable the IRQs */\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define UNMASK_IRQs {\</div><div class='del'>-    imr |= lp-&gt;irq_mask;\</div><div class='del'>-    outl(imr, DE4X5_IMR);               /* Unmask the IRQs */\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MASK_IRQs {\</div><div class='del'>-    imr = inl(DE4X5_IMR);\</div><div class='del'>-    imr &amp;= ~lp-&gt;irq_mask;\</div><div class='del'>-    outl(imr, DE4X5_IMR);               /* Mask the IRQs */\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DE4X5 START/STOP</div><div class='del'>-*/</div><div class='del'>-#define START_DE4X5 {\</div><div class='del'>-    omr = inl(DE4X5_OMR);\</div><div class='del'>-    omr |= OMR_ST | OMR_SR;\</div><div class='del'>-    outl(omr, DE4X5_OMR);               /* Enable the TX and/or RX */\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define STOP_DE4X5 {\</div><div class='del'>-    omr = inl(DE4X5_OMR);\</div><div class='del'>-    omr &amp;= ~(OMR_ST|OMR_SR);\</div><div class='del'>-    outl(omr, DE4X5_OMR);               /* Disable the TX and/or RX */ \</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DE4X5 SIA RESET</div><div class='del'>-*/</div><div class='del'>-#define RESET_SIA outl(0, DE4X5_SICR);  /* Reset SIA connectivity regs */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DE500 AUTOSENSE TIMER INTERVAL (MILLISECS)</div><div class='del'>-*/</div><div class='del'>-#define DE4X5_AUTOSENSE_MS  250</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Structure</div><div class='del'>-*/</div><div class='del'>-struct de4x5_srom {</div><div class='del'>-    char sub_vendor_id[2];</div><div class='del'>-    char sub_system_id[2];</div><div class='del'>-    char reserved[12];</div><div class='del'>-    char id_block_crc;</div><div class='del'>-    char reserved2;</div><div class='del'>-    char version;</div><div class='del'>-    char num_controllers;</div><div class='del'>-    char ieee_addr[6];</div><div class='del'>-    char info[100];</div><div class='del'>-    short chksum;</div><div class='del'>-};</div><div class='del'>-#define SUB_VENDOR_ID 0x500a</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DE4X5 Descriptors. Make sure that all the RX buffers are contiguous</div><div class='del'>-** and have sizes of both a power of 2 and a multiple of 4.</div><div class='del'>-** A size of 256 bytes for each buffer could be chosen because over 90% of</div><div class='del'>-** all packets in our network are &lt;256 bytes long and 64 longword alignment</div><div class='del'>-** is possible. 1536 showed better 'ttcp' performance. Take your pick. 32 TX</div><div class='del'>-** descriptors are needed for machines with an ALPHA CPU.</div><div class='del'>-*/</div><div class='del'>-#define NUM_RX_DESC 8                   /* Number of RX descriptors   */</div><div class='del'>-#define NUM_TX_DESC 32                  /* Number of TX descriptors   */</div><div class='del'>-#define RX_BUFF_SZ  1536                /* Power of 2 for kmalloc and */</div><div class='del'>-                                        /* Multiple of 4 for DC21040  */</div><div class='del'>-                                        /* Allows 512 byte alignment  */</div><div class='del'>-struct de4x5_desc {</div><div class='del'>-    volatile __le32 status;</div><div class='del'>-    __le32 des1;</div><div class='del'>-    __le32 buf;</div><div class='del'>-    __le32 next;</div><div class='del'>-    DESC_ALIGN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** The DE4X5 private structure</div><div class='del'>-*/</div><div class='del'>-#define DE4X5_PKT_STAT_SZ 16</div><div class='del'>-#define DE4X5_PKT_BIN_SZ  128            /* Should be &gt;=100 unless you</div><div class='del'>-                                            increase DE4X5_PKT_STAT_SZ */</div><div class='del'>-</div><div class='del'>-struct pkt_stats {</div><div class='del'>-	u_int bins[DE4X5_PKT_STAT_SZ];      /* Private stats counters       */</div><div class='del'>-	u_int unicast;</div><div class='del'>-	u_int multicast;</div><div class='del'>-	u_int broadcast;</div><div class='del'>-	u_int excessive_collisions;</div><div class='del'>-	u_int tx_underruns;</div><div class='del'>-	u_int excessive_underruns;</div><div class='del'>-	u_int rx_runt_frames;</div><div class='del'>-	u_int rx_collision;</div><div class='del'>-	u_int rx_dribble;</div><div class='del'>-	u_int rx_overflow;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct de4x5_private {</div><div class='del'>-    char adapter_name[80];                  /* Adapter name                 */</div><div class='del'>-    u_long interrupt;                       /* Aligned ISR flag             */</div><div class='del'>-    struct de4x5_desc *rx_ring;		    /* RX descriptor ring           */</div><div class='del'>-    struct de4x5_desc *tx_ring;		    /* TX descriptor ring           */</div><div class='del'>-    struct sk_buff *tx_skb[NUM_TX_DESC];    /* TX skb for freeing when sent */</div><div class='del'>-    struct sk_buff *rx_skb[NUM_RX_DESC];    /* RX skb's                     */</div><div class='del'>-    int rx_new, rx_old;                     /* RX descriptor ring pointers  */</div><div class='del'>-    int tx_new, tx_old;                     /* TX descriptor ring pointers  */</div><div class='del'>-    char setup_frame[SETUP_FRAME_LEN];      /* Holds MCA and PA info.       */</div><div class='del'>-    char frame[64];                         /* Min sized packet for loopback*/</div><div class='del'>-    spinlock_t lock;                        /* Adapter specific spinlock    */</div><div class='del'>-    struct net_device_stats stats;          /* Public stats                 */</div><div class='del'>-    struct pkt_stats pktStats;	            /* Private stats counters	    */</div><div class='del'>-    char rxRingSize;</div><div class='del'>-    char txRingSize;</div><div class='del'>-    int  bus;                               /* EISA or PCI                  */</div><div class='del'>-    int  bus_num;                           /* PCI Bus number               */</div><div class='del'>-    int  device;                            /* Device number on PCI bus     */</div><div class='del'>-    int  state;                             /* Adapter OPENED or CLOSED     */</div><div class='del'>-    int  chipset;                           /* DC21040, DC21041 or DC21140  */</div><div class='del'>-    s32  irq_mask;                          /* Interrupt Mask (Enable) bits */</div><div class='del'>-    s32  irq_en;                            /* Summary interrupt bits       */</div><div class='del'>-    int  media;                             /* Media (eg TP), mode (eg 100B)*/</div><div class='del'>-    int  c_media;                           /* Remember the last media conn */</div><div class='del'>-    bool fdx;                               /* media full duplex flag       */</div><div class='del'>-    int  linkOK;                            /* Link is OK                   */</div><div class='del'>-    int  autosense;                         /* Allow/disallow autosensing   */</div><div class='del'>-    bool tx_enable;                         /* Enable descriptor polling    */</div><div class='del'>-    int  setup_f;                           /* Setup frame filtering type   */</div><div class='del'>-    int  local_state;                       /* State within a 'media' state */</div><div class='del'>-    struct mii_phy phy[DE4X5_MAX_PHY];      /* List of attached PHY devices */</div><div class='del'>-    struct sia_phy sia;                     /* SIA PHY Information          */</div><div class='del'>-    int  active;                            /* Index to active PHY device   */</div><div class='del'>-    int  mii_cnt;                           /* Number of attached PHY's     */</div><div class='del'>-    int  timeout;                           /* Scheduling counter           */</div><div class='del'>-    struct timer_list timer;                /* Timer info for kernel        */</div><div class='del'>-    int tmp;                                /* Temporary global per card    */</div><div class='del'>-    struct {</div><div class='del'>-	u_long lock;                        /* Lock the cache accesses      */</div><div class='del'>-	s32 csr0;                           /* Saved Bus Mode Register      */</div><div class='del'>-	s32 csr6;                           /* Saved Operating Mode Reg.    */</div><div class='del'>-	s32 csr7;                           /* Saved IRQ Mask Register      */</div><div class='del'>-	s32 gep;                            /* Saved General Purpose Reg.   */</div><div class='del'>-	s32 gepc;                           /* Control info for GEP         */</div><div class='del'>-	s32 csr13;                          /* Saved SIA Connectivity Reg.  */</div><div class='del'>-	s32 csr14;                          /* Saved SIA TX/RX Register     */</div><div class='del'>-	s32 csr15;                          /* Saved SIA General Register   */</div><div class='del'>-	int save_cnt;                       /* Flag if state already saved  */</div><div class='del'>-	struct sk_buff_head queue;          /* Save the (re-ordered) skb's  */</div><div class='del'>-    } cache;</div><div class='del'>-    struct de4x5_srom srom;                 /* A copy of the SROM           */</div><div class='del'>-    int cfrv;				    /* Card CFRV copy */</div><div class='del'>-    int rx_ovf;                             /* Check for 'RX overflow' tag  */</div><div class='del'>-    bool useSROM;                           /* For non-DEC card use SROM    */</div><div class='del'>-    bool useMII;                            /* Infoblock using the MII      */</div><div class='del'>-    int asBitValid;                         /* Autosense bits in GEP?       */</div><div class='del'>-    int asPolarity;                         /* 0 =&gt; asserted high           */</div><div class='del'>-    int asBit;                              /* Autosense bit number in GEP  */</div><div class='del'>-    int defMedium;                          /* SROM default medium          */</div><div class='del'>-    int tcount;                             /* Last infoblock number        */</div><div class='del'>-    int infoblock_init;                     /* Initialised this infoblock?  */</div><div class='del'>-    int infoleaf_offset;                    /* SROM infoleaf for controller */</div><div class='del'>-    s32 infoblock_csr6;                     /* csr6 value in SROM infoblock */</div><div class='del'>-    int infoblock_media;                    /* infoblock media              */</div><div class='del'>-    int (*infoleaf_fn)(struct net_device *);    /* Pointer to infoleaf function */</div><div class='del'>-    u_char *rst;                            /* Pointer to Type 5 reset info */</div><div class='del'>-    u_char  ibn;                            /* Infoblock number             */</div><div class='del'>-    struct parameters params;               /* Command line/ #defined params */</div><div class='del'>-    struct device *gendev;	            /* Generic device */</div><div class='del'>-    dma_addr_t dma_rings;		    /* DMA handle for rings	    */</div><div class='del'>-    int dma_size;			    /* Size of the DMA area	    */</div><div class='del'>-    char *rx_bufs;			    /* rx bufs on alpha, sparc, ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** To get around certain poxy cards that don't provide an SROM</div><div class='del'>-** for the second and more DECchip, I have to key off the first</div><div class='del'>-** chip's address. I'll assume there's not a bad SROM iff:</div><div class='del'>-**</div><div class='del'>-**      o the chipset is the same</div><div class='del'>-**      o the bus number is the same and &gt; 0</div><div class='del'>-**      o the sum of all the returned hw address bytes is 0 or 0x5fa</div><div class='del'>-**</div><div class='del'>-** Also have to save the irq for those cards whose hardware designers</div><div class='del'>-** can't follow the PCI to PCI Bridge Architecture spec.</div><div class='del'>-*/</div><div class='del'>-static struct {</div><div class='del'>-    int chipset;</div><div class='del'>-    int bus;</div><div class='del'>-    int irq;</div><div class='del'>-    u_char addr[ETH_ALEN];</div><div class='del'>-} last = {0,};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** The transmit ring full condition is described by the tx_old and tx_new</div><div class='del'>-** pointers by:</div><div class='del'>-**    tx_old            = tx_new    Empty ring</div><div class='del'>-**    tx_old            = tx_new+1  Full ring</div><div class='del'>-**    tx_old+txRingSize = tx_new+1  Full ring  (wrapped condition)</div><div class='del'>-*/</div><div class='del'>-#define TX_BUFFS_AVAIL ((lp-&gt;tx_old&lt;=lp-&gt;tx_new)?\</div><div class='del'>-			lp-&gt;tx_old+lp-&gt;txRingSize-lp-&gt;tx_new-1:\</div><div class='del'>-			lp-&gt;tx_old               -lp-&gt;tx_new-1)</div><div class='del'>-</div><div class='del'>-#define TX_PKT_PENDING (lp-&gt;tx_old != lp-&gt;tx_new)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Public Functions</div><div class='del'>-*/</div><div class='del'>-static int     de4x5_open(struct net_device *dev);</div><div class='del'>-static netdev_tx_t de4x5_queue_pkt(struct sk_buff *skb,</div><div class='del'>-					 struct net_device *dev);</div><div class='del'>-static irqreturn_t de4x5_interrupt(int irq, void *dev_id);</div><div class='del'>-static int     de4x5_close(struct net_device *dev);</div><div class='del'>-static struct  net_device_stats *de4x5_get_stats(struct net_device *dev);</div><div class='del'>-static void    de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len);</div><div class='del'>-static void    set_multicast_list(struct net_device *dev);</div><div class='del'>-static int     de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Private functions</div><div class='del'>-*/</div><div class='del'>-static int     de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev);</div><div class='del'>-static int     de4x5_init(struct net_device *dev);</div><div class='del'>-static int     de4x5_sw_reset(struct net_device *dev);</div><div class='del'>-static int     de4x5_rx(struct net_device *dev);</div><div class='del'>-static int     de4x5_tx(struct net_device *dev);</div><div class='del'>-static void    de4x5_ast(struct timer_list *t);</div><div class='del'>-static int     de4x5_txur(struct net_device *dev);</div><div class='del'>-static int     de4x5_rx_ovfc(struct net_device *dev);</div><div class='del'>-</div><div class='del'>-static int     autoconf_media(struct net_device *dev);</div><div class='del'>-static void    create_packet(struct net_device *dev, char *frame, int len);</div><div class='del'>-static void    load_packet(struct net_device *dev, char *buf, u32 flags, struct sk_buff *skb);</div><div class='del'>-static int     dc21040_autoconf(struct net_device *dev);</div><div class='del'>-static int     dc21041_autoconf(struct net_device *dev);</div><div class='del'>-static int     dc21140m_autoconf(struct net_device *dev);</div><div class='del'>-static int     dc2114x_autoconf(struct net_device *dev);</div><div class='del'>-static int     srom_autoconf(struct net_device *dev);</div><div class='del'>-static int     de4x5_suspect_state(struct net_device *dev, int timeout, int prev_state, int (*fn)(struct net_device *, int), int (*asfn)(struct net_device *));</div><div class='del'>-static int     dc21040_state(struct net_device *dev, int csr13, int csr14, int csr15, int timeout, int next_state, int suspect_state, int (*fn)(struct net_device *, int));</div><div class='del'>-static int     test_media(struct net_device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec);</div><div class='del'>-static int     test_for_100Mb(struct net_device *dev, int msec);</div><div class='del'>-static int     wait_for_link(struct net_device *dev);</div><div class='del'>-static int     test_mii_reg(struct net_device *dev, int reg, int mask, bool pol, long msec);</div><div class='del'>-static int     is_spd_100(struct net_device *dev);</div><div class='del'>-static int     is_100_up(struct net_device *dev);</div><div class='del'>-static int     is_10_up(struct net_device *dev);</div><div class='del'>-static int     is_anc_capable(struct net_device *dev);</div><div class='del'>-static int     ping_media(struct net_device *dev, int msec);</div><div class='del'>-static struct sk_buff *de4x5_alloc_rx_buff(struct net_device *dev, int index, int len);</div><div class='del'>-static void    de4x5_free_rx_buffs(struct net_device *dev);</div><div class='del'>-static void    de4x5_free_tx_buffs(struct net_device *dev);</div><div class='del'>-static void    de4x5_save_skbs(struct net_device *dev);</div><div class='del'>-static void    de4x5_rst_desc_ring(struct net_device *dev);</div><div class='del'>-static void    de4x5_cache_state(struct net_device *dev, int flag);</div><div class='del'>-static void    de4x5_put_cache(struct net_device *dev, struct sk_buff *skb);</div><div class='del'>-static void    de4x5_putb_cache(struct net_device *dev, struct sk_buff *skb);</div><div class='del'>-static struct  sk_buff *de4x5_get_cache(struct net_device *dev);</div><div class='del'>-static void    de4x5_setup_intr(struct net_device *dev);</div><div class='del'>-static void    de4x5_init_connection(struct net_device *dev);</div><div class='del'>-static int     de4x5_reset_phy(struct net_device *dev);</div><div class='del'>-static void    reset_init_sia(struct net_device *dev, s32 sicr, s32 strr, s32 sigr);</div><div class='del'>-static int     test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec);</div><div class='del'>-static int     test_tp(struct net_device *dev, s32 msec);</div><div class='del'>-static int     EISA_signature(char *name, struct device *device);</div><div class='del'>-static int     PCI_signature(char *name, struct de4x5_private *lp);</div><div class='del'>-static void    DevicePresent(struct net_device *dev, u_long iobase);</div><div class='del'>-static void    enet_addr_rst(u_long aprom_addr);</div><div class='del'>-static int     de4x5_bad_srom(struct de4x5_private *lp);</div><div class='del'>-static short   srom_rd(u_long address, u_char offset);</div><div class='del'>-static void    srom_latch(u_int command, u_long address);</div><div class='del'>-static void    srom_command(u_int command, u_long address);</div><div class='del'>-static void    srom_address(u_int command, u_long address, u_char offset);</div><div class='del'>-static short   srom_data(u_int command, u_long address);</div><div class='del'>-/*static void    srom_busy(u_int command, u_long address);*/</div><div class='del'>-static void    sendto_srom(u_int command, u_long addr);</div><div class='del'>-static int     getfrom_srom(u_long addr);</div><div class='del'>-static int     srom_map_media(struct net_device *dev);</div><div class='del'>-static int     srom_infoleaf_info(struct net_device *dev);</div><div class='del'>-static void    srom_init(struct net_device *dev);</div><div class='del'>-static void    srom_exec(struct net_device *dev, u_char *p);</div><div class='del'>-static int     mii_rd(u_char phyreg, u_char phyaddr, u_long ioaddr);</div><div class='del'>-static void    mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr);</div><div class='del'>-static int     mii_rdata(u_long ioaddr);</div><div class='del'>-static void    mii_wdata(int data, int len, u_long ioaddr);</div><div class='del'>-static void    mii_ta(u_long rw, u_long ioaddr);</div><div class='del'>-static int     mii_swap(int data, int len);</div><div class='del'>-static void    mii_address(u_char addr, u_long ioaddr);</div><div class='del'>-static void    sendto_mii(u32 command, int data, u_long ioaddr);</div><div class='del'>-static int     getfrom_mii(u32 command, u_long ioaddr);</div><div class='del'>-static int     mii_get_oui(u_char phyaddr, u_long ioaddr);</div><div class='del'>-static int     mii_get_phy(struct net_device *dev);</div><div class='del'>-static void    SetMulticastFilter(struct net_device *dev);</div><div class='del'>-static int     get_hw_addr(struct net_device *dev);</div><div class='del'>-static void    srom_repair(struct net_device *dev, int card);</div><div class='del'>-static int     test_bad_enet(struct net_device *dev, int status);</div><div class='del'>-static int     an_exception(struct de4x5_private *lp);</div><div class='del'>-static char    *build_setup_frame(struct net_device *dev, int mode);</div><div class='del'>-static void    disable_ast(struct net_device *dev);</div><div class='del'>-static long    de4x5_switch_mac_port(struct net_device *dev);</div><div class='del'>-static int     gep_rd(struct net_device *dev);</div><div class='del'>-static void    gep_wr(s32 data, struct net_device *dev);</div><div class='del'>-static void    yawn(struct net_device *dev, int state);</div><div class='del'>-static void    de4x5_parse_params(struct net_device *dev);</div><div class='del'>-static void    de4x5_dbg_open(struct net_device *dev);</div><div class='del'>-static void    de4x5_dbg_mii(struct net_device *dev, int k);</div><div class='del'>-static void    de4x5_dbg_media(struct net_device *dev);</div><div class='del'>-static void    de4x5_dbg_srom(struct de4x5_srom *p);</div><div class='del'>-static void    de4x5_dbg_rx(struct sk_buff *skb, int len);</div><div class='del'>-static int     dc21041_infoleaf(struct net_device *dev);</div><div class='del'>-static int     dc21140_infoleaf(struct net_device *dev);</div><div class='del'>-static int     dc21142_infoleaf(struct net_device *dev);</div><div class='del'>-static int     dc21143_infoleaf(struct net_device *dev);</div><div class='del'>-static int     type0_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-static int     type1_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-static int     type2_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-static int     type3_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-static int     type4_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-static int     type5_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-static int     compact_infoblock(struct net_device *dev, u_char count, u_char *p);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Note now that module autoprobing is allowed under EISA and PCI. The</div><div class='del'>-** IRQ lines will not be auto-detected; instead I'll rely on the BIOSes</div><div class='del'>-** to "do the right thing".</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static int io=0x0;/* EDIT THIS LINE FOR YOUR CONFIGURATION IF NEEDED        */</div><div class='del'>-</div><div class='del'>-module_param_hw(io, int, ioport, 0);</div><div class='del'>-module_param(de4x5_debug, int, 0);</div><div class='del'>-module_param(dec_only, int, 0);</div><div class='del'>-module_param(args, charp, 0);</div><div class='del'>-</div><div class='del'>-MODULE_PARM_DESC(io, "de4x5 I/O base address");</div><div class='del'>-MODULE_PARM_DESC(de4x5_debug, "de4x5 debug mask");</div><div class='del'>-MODULE_PARM_DESC(dec_only, "de4x5 probe only for Digital boards (0-1)");</div><div class='del'>-MODULE_PARM_DESC(args, "de4x5 full duplex and media type settings; see de4x5.c for details");</div><div class='del'>-MODULE_LICENSE("GPL");</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** List the SROM infoleaf functions and chipsets</div><div class='del'>-*/</div><div class='del'>-struct InfoLeaf {</div><div class='del'>-    int chipset;</div><div class='del'>-    int (*fn)(struct net_device *);</div><div class='del'>-};</div><div class='del'>-static struct InfoLeaf infoleaf_array[] = {</div><div class='del'>-    {DC21041, dc21041_infoleaf},</div><div class='del'>-    {DC21140, dc21140_infoleaf},</div><div class='del'>-    {DC21142, dc21142_infoleaf},</div><div class='del'>-    {DC21143, dc21143_infoleaf}</div><div class='del'>-};</div><div class='del'>-#define INFOLEAF_SIZE ARRAY_SIZE(infoleaf_array)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** List the SROM info block functions</div><div class='del'>-*/</div><div class='del'>-static int (*dc_infoblock[])(struct net_device *dev, u_char, u_char *) = {</div><div class='del'>-    type0_infoblock,</div><div class='del'>-    type1_infoblock,</div><div class='del'>-    type2_infoblock,</div><div class='del'>-    type3_infoblock,</div><div class='del'>-    type4_infoblock,</div><div class='del'>-    type5_infoblock,</div><div class='del'>-    compact_infoblock</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define COMPACT (ARRAY_SIZE(dc_infoblock) - 1)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Miscellaneous defines...</div><div class='del'>-*/</div><div class='del'>-#define RESET_DE4X5 {\</div><div class='del'>-    int i;\</div><div class='del'>-    i=inl(DE4X5_BMR);\</div><div class='del'>-    mdelay(1);\</div><div class='del'>-    outl(i | BMR_SWR, DE4X5_BMR);\</div><div class='del'>-    mdelay(1);\</div><div class='del'>-    outl(i, DE4X5_BMR);\</div><div class='del'>-    mdelay(1);\</div><div class='del'>-    for (i=0;i&lt;5;i++) {inl(DE4X5_BMR); mdelay(1);}\</div><div class='del'>-    mdelay(1);\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PHY_HARD_RESET {\</div><div class='del'>-    outl(GEP_HRST, DE4X5_GEP);           /* Hard RESET the PHY dev. */\</div><div class='del'>-    mdelay(1);                           /* Assert for 1ms */\</div><div class='del'>-    outl(0x00, DE4X5_GEP);\</div><div class='del'>-    mdelay(2);                           /* Wait for 2ms */\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct net_device_ops de4x5_netdev_ops = {</div><div class='del'>-    .ndo_open		= de4x5_open,</div><div class='del'>-    .ndo_stop		= de4x5_close,</div><div class='del'>-    .ndo_start_xmit	= de4x5_queue_pkt,</div><div class='del'>-    .ndo_get_stats	= de4x5_get_stats,</div><div class='del'>-    .ndo_set_rx_mode	= set_multicast_list,</div><div class='del'>-    .ndo_do_ioctl	= de4x5_ioctl,</div><div class='del'>-    .ndo_set_mac_address= eth_mac_addr,</div><div class='del'>-    .ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)</div><div class='del'>-{</div><div class='del'>-    char name[DE4X5_NAME_LENGTH + 1];</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct pci_dev *pdev = NULL;</div><div class='del'>-    int i, status=0;</div><div class='del'>-</div><div class='del'>-    dev_set_drvdata(gendev, dev);</div><div class='del'>-</div><div class='del'>-    /* Ensure we're not sleeping */</div><div class='del'>-    if (lp-&gt;bus == EISA) {</div><div class='del'>-	outb(WAKEUP, PCI_CFPM);</div><div class='del'>-    } else {</div><div class='del'>-	pdev = to_pci_dev (gendev);</div><div class='del'>-	pci_write_config_byte(pdev, PCI_CFDA_PSM, WAKEUP);</div><div class='del'>-    }</div><div class='del'>-    mdelay(10);</div><div class='del'>-</div><div class='del'>-    RESET_DE4X5;</div><div class='del'>-</div><div class='del'>-    if ((inl(DE4X5_STS) &amp; (STS_TS | STS_RS)) != 0) {</div><div class='del'>-	return -ENXIO;                       /* Hardware could not reset */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-    ** Now find out what kind of DC21040/DC21041/DC21140 board we have.</div><div class='del'>-    */</div><div class='del'>-    lp-&gt;useSROM = false;</div><div class='del'>-    if (lp-&gt;bus == PCI) {</div><div class='del'>-	PCI_signature(name, lp);</div><div class='del'>-    } else {</div><div class='del'>-	EISA_signature(name, gendev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (*name == '\0') {                     /* Not found a board signature */</div><div class='del'>-	return -ENXIO;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    dev-&gt;base_addr = iobase;</div><div class='del'>-    printk ("%s: %s at 0x%04lx", dev_name(gendev), name, iobase);</div><div class='del'>-</div><div class='del'>-    status = get_hw_addr(dev);</div><div class='del'>-    printk(", h/w address %pM\n", dev-&gt;dev_addr);</div><div class='del'>-</div><div class='del'>-    if (status != 0) {</div><div class='del'>-	printk("      which has an Ethernet PROM CRC error.\n");</div><div class='del'>-	return -ENXIO;</div><div class='del'>-    } else {</div><div class='del'>-	skb_queue_head_init(&amp;lp-&gt;cache.queue);</div><div class='del'>-	lp-&gt;cache.gepc = GEP_INIT;</div><div class='del'>-	lp-&gt;asBit = GEP_SLNK;</div><div class='del'>-	lp-&gt;asPolarity = GEP_SLNK;</div><div class='del'>-	lp-&gt;asBitValid = ~0;</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-	lp-&gt;gendev = gendev;</div><div class='del'>-	spin_lock_init(&amp;lp-&gt;lock);</div><div class='del'>-	timer_setup(&amp;lp-&gt;timer, de4x5_ast, 0);</div><div class='del'>-	de4x5_parse_params(dev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	** Choose correct autosensing in case someone messed up</div><div class='del'>-	*/</div><div class='del'>-        lp-&gt;autosense = lp-&gt;params.autosense;</div><div class='del'>-        if (lp-&gt;chipset != DC21140) {</div><div class='del'>-            if ((lp-&gt;chipset==DC21040) &amp;&amp; (lp-&gt;params.autosense&amp;TP_NW)) {</div><div class='del'>-                lp-&gt;params.autosense = TP;</div><div class='del'>-            }</div><div class='del'>-            if ((lp-&gt;chipset==DC21041) &amp;&amp; (lp-&gt;params.autosense&amp;BNC_AUI)) {</div><div class='del'>-                lp-&gt;params.autosense = BNC;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-	lp-&gt;fdx = lp-&gt;params.fdx;</div><div class='del'>-	sprintf(lp-&gt;adapter_name,"%s (%s)", name, dev_name(gendev));</div><div class='del'>-</div><div class='del'>-	lp-&gt;dma_size = (NUM_RX_DESC + NUM_TX_DESC) * sizeof(struct de4x5_desc);</div><div class='del'>-#if defined(__alpha__) || defined(__powerpc__) || defined(CONFIG_SPARC) || defined(DE4X5_DO_MEMCPY)</div><div class='del'>-	lp-&gt;dma_size += RX_BUFF_SZ * NUM_RX_DESC + DE4X5_ALIGN;</div><div class='del'>-#endif</div><div class='del'>-	lp-&gt;rx_ring = dma_alloc_coherent(gendev, lp-&gt;dma_size,</div><div class='del'>-					 &amp;lp-&gt;dma_rings, GFP_ATOMIC);</div><div class='del'>-	if (lp-&gt;rx_ring == NULL) {</div><div class='del'>-	    return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lp-&gt;tx_ring = lp-&gt;rx_ring + NUM_RX_DESC;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	** Set up the RX descriptor ring (Intels)</div><div class='del'>-	** Allocate contiguous receive buffers, long word aligned (Alphas)</div><div class='del'>-	*/</div><div class='del'>-#if !defined(__alpha__) &amp;&amp; !defined(__powerpc__) &amp;&amp; !defined(CONFIG_SPARC) &amp;&amp; !defined(DE4X5_DO_MEMCPY)</div><div class='del'>-	for (i=0; i&lt;NUM_RX_DESC; i++) {</div><div class='del'>-	    lp-&gt;rx_ring[i].status = 0;</div><div class='del'>-	    lp-&gt;rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ);</div><div class='del'>-	    lp-&gt;rx_ring[i].buf = 0;</div><div class='del'>-	    lp-&gt;rx_ring[i].next = 0;</div><div class='del'>-	    lp-&gt;rx_skb[i] = (struct sk_buff *) 1;     /* Dummy entry */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-	{</div><div class='del'>-		dma_addr_t dma_rx_bufs;</div><div class='del'>-</div><div class='del'>-		dma_rx_bufs = lp-&gt;dma_rings + (NUM_RX_DESC + NUM_TX_DESC)</div><div class='del'>-		      	* sizeof(struct de4x5_desc);</div><div class='del'>-		dma_rx_bufs = (dma_rx_bufs + DE4X5_ALIGN) &amp; ~DE4X5_ALIGN;</div><div class='del'>-		lp-&gt;rx_bufs = (char *)(((long)(lp-&gt;rx_ring + NUM_RX_DESC</div><div class='del'>-		      	+ NUM_TX_DESC) + DE4X5_ALIGN) &amp; ~DE4X5_ALIGN);</div><div class='del'>-		for (i=0; i&lt;NUM_RX_DESC; i++) {</div><div class='del'>-	    		lp-&gt;rx_ring[i].status = 0;</div><div class='del'>-	    		lp-&gt;rx_ring[i].des1 = cpu_to_le32(RX_BUFF_SZ);</div><div class='del'>-	    		lp-&gt;rx_ring[i].buf =</div><div class='del'>-				cpu_to_le32(dma_rx_bufs+i*RX_BUFF_SZ);</div><div class='del'>-	    		lp-&gt;rx_ring[i].next = 0;</div><div class='del'>-	    		lp-&gt;rx_skb[i] = (struct sk_buff *) 1; /* Dummy entry */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	barrier();</div><div class='del'>-</div><div class='del'>-	lp-&gt;rxRingSize = NUM_RX_DESC;</div><div class='del'>-	lp-&gt;txRingSize = NUM_TX_DESC;</div><div class='del'>-</div><div class='del'>-	/* Write the end of list marker to the descriptor lists */</div><div class='del'>-	lp-&gt;rx_ring[lp-&gt;rxRingSize - 1].des1 |= cpu_to_le32(RD_RER);</div><div class='del'>-	lp-&gt;tx_ring[lp-&gt;txRingSize - 1].des1 |= cpu_to_le32(TD_TER);</div><div class='del'>-</div><div class='del'>-	/* Tell the adapter where the TX/RX rings are located. */</div><div class='del'>-	outl(lp-&gt;dma_rings, DE4X5_RRBA);</div><div class='del'>-	outl(lp-&gt;dma_rings + NUM_RX_DESC * sizeof(struct de4x5_desc),</div><div class='del'>-	     DE4X5_TRBA);</div><div class='del'>-</div><div class='del'>-	/* Initialise the IRQ mask and Enable/Disable */</div><div class='del'>-	lp-&gt;irq_mask = IMR_RIM | IMR_TIM | IMR_TUM | IMR_UNM;</div><div class='del'>-	lp-&gt;irq_en   = IMR_NIM | IMR_AIM;</div><div class='del'>-</div><div class='del'>-	/* Create a loopback packet frame for later media probing */</div><div class='del'>-	create_packet(dev, lp-&gt;frame, sizeof(lp-&gt;frame));</div><div class='del'>-</div><div class='del'>-	/* Check if the RX overflow bug needs testing for */</div><div class='del'>-	i = lp-&gt;cfrv &amp; 0x000000fe;</div><div class='del'>-	if ((lp-&gt;chipset == DC21140) &amp;&amp; (i == 0x20)) {</div><div class='del'>-	    lp-&gt;rx_ovf = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Initialise the SROM pointers if possible */</div><div class='del'>-	if (lp-&gt;useSROM) {</div><div class='del'>-	    lp-&gt;state = INITIALISED;</div><div class='del'>-	    if (srom_infoleaf_info(dev)) {</div><div class='del'>-	        dma_free_coherent (gendev, lp-&gt;dma_size,</div><div class='del'>-			       lp-&gt;rx_ring, lp-&gt;dma_rings);</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	    }</div><div class='del'>-	    srom_init(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lp-&gt;state = CLOSED;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	** Check for an MII interface</div><div class='del'>-	*/</div><div class='del'>-	if ((lp-&gt;chipset != DC21040) &amp;&amp; (lp-&gt;chipset != DC21041)) {</div><div class='del'>-	    mii_get_phy(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printk("      and requires IRQ%d (provided by %s).\n", dev-&gt;irq,</div><div class='del'>-	       ((lp-&gt;bus == PCI) ? "PCI BIOS" : "EISA CNFG"));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_VERSION) {</div><div class='del'>-	printk(version);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* The DE4X5-specific entries in the device structure. */</div><div class='del'>-    SET_NETDEV_DEV(dev, gendev);</div><div class='del'>-    dev-&gt;netdev_ops = &amp;de4x5_netdev_ops;</div><div class='del'>-    dev-&gt;mem_start = 0;</div><div class='del'>-</div><div class='del'>-    /* Fill in the generic fields of the device structure. */</div><div class='del'>-    if ((status = register_netdev (dev))) {</div><div class='del'>-	    dma_free_coherent (gendev, lp-&gt;dma_size,</div><div class='del'>-			       lp-&gt;rx_ring, lp-&gt;dma_rings);</div><div class='del'>-	    return status;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Let the adapter sleep to save power */</div><div class='del'>-    yawn(dev, SLEEP);</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int i, status = 0;</div><div class='del'>-    s32 omr;</div><div class='del'>-</div><div class='del'>-    /* Allocate the RX buffers */</div><div class='del'>-    for (i=0; i&lt;lp-&gt;rxRingSize; i++) {</div><div class='del'>-	if (de4x5_alloc_rx_buff(dev, i, 0) == NULL) {</div><div class='del'>-	    de4x5_free_rx_buffs(dev);</div><div class='del'>-	    return -EAGAIN;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-    ** Wake up the adapter</div><div class='del'>-    */</div><div class='del'>-    yawn(dev, WAKEUP);</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-    ** Re-initialize the DE4X5...</div><div class='del'>-    */</div><div class='del'>-    status = de4x5_init(dev);</div><div class='del'>-    spin_lock_init(&amp;lp-&gt;lock);</div><div class='del'>-    lp-&gt;state = OPEN;</div><div class='del'>-    de4x5_dbg_open(dev);</div><div class='del'>-</div><div class='del'>-    if (request_irq(dev-&gt;irq, de4x5_interrupt, IRQF_SHARED,</div><div class='del'>-		                                     lp-&gt;adapter_name, dev)) {</div><div class='del'>-	printk("de4x5_open(): Requested IRQ%d is busy - attempting FAST/SHARE...", dev-&gt;irq);</div><div class='del'>-	if (request_irq(dev-&gt;irq, de4x5_interrupt, IRQF_SHARED,</div><div class='del'>-			                             lp-&gt;adapter_name, dev)) {</div><div class='del'>-	    printk("\n              Cannot get IRQ- reconfigure your hardware.\n");</div><div class='del'>-	    disable_ast(dev);</div><div class='del'>-	    de4x5_free_rx_buffs(dev);</div><div class='del'>-	    de4x5_free_tx_buffs(dev);</div><div class='del'>-	    yawn(dev, SLEEP);</div><div class='del'>-	    lp-&gt;state = CLOSED;</div><div class='del'>-	    return -EAGAIN;</div><div class='del'>-	} else {</div><div class='del'>-	    printk("\n              Succeeded, but you should reconfigure your hardware to avoid this.\n");</div><div class='del'>-	    printk("WARNING: there may be IRQ related problems in heavily loaded systems.\n");</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    lp-&gt;interrupt = UNMASK_INTERRUPTS;</div><div class='del'>-    netif_trans_update(dev); /* prevent tx timeout */</div><div class='del'>-</div><div class='del'>-    START_DE4X5;</div><div class='del'>-</div><div class='del'>-    de4x5_setup_intr(dev);</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_OPEN) {</div><div class='del'>-	printk("\tsts:  0x%08x\n", inl(DE4X5_STS));</div><div class='del'>-	printk("\tbmr:  0x%08x\n", inl(DE4X5_BMR));</div><div class='del'>-	printk("\timr:  0x%08x\n", inl(DE4X5_IMR));</div><div class='del'>-	printk("\tomr:  0x%08x\n", inl(DE4X5_OMR));</div><div class='del'>-	printk("\tsisr: 0x%08x\n", inl(DE4X5_SISR));</div><div class='del'>-	printk("\tsicr: 0x%08x\n", inl(DE4X5_SICR));</div><div class='del'>-	printk("\tstrr: 0x%08x\n", inl(DE4X5_STRR));</div><div class='del'>-	printk("\tsigr: 0x%08x\n", inl(DE4X5_SIGR));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Initialize the DE4X5 operating conditions. NB: a chip problem with the</div><div class='del'>-** DC21140 requires using perfect filtering mode for that chip. Since I can't</div><div class='del'>-** see why I'd want &gt; 14 multicast addresses, I have changed all chips to use</div><div class='del'>-** the perfect filtering mode. Keep the DMA burst length at 8: there seems</div><div class='del'>-** to be data corruption problems if it is larger (UDP errors seen from a</div><div class='del'>-** ttcp source).</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-de4x5_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    /* Lock out other processes whilst setting up the hardware */</div><div class='del'>-    netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-    de4x5_sw_reset(dev);</div><div class='del'>-</div><div class='del'>-    /* Autoconfigure the connected port */</div><div class='del'>-    autoconf_media(dev);</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_sw_reset(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int i, j, status = 0;</div><div class='del'>-    s32 bmr, omr;</div><div class='del'>-</div><div class='del'>-    /* Select the MII or SRL port now and RESET the MAC */</div><div class='del'>-    if (!lp-&gt;useSROM) {</div><div class='del'>-	if (lp-&gt;phy[lp-&gt;active].id != 0) {</div><div class='del'>-	    lp-&gt;infoblock_csr6 = OMR_SDP | OMR_PS | OMR_HBD;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;infoblock_csr6 = OMR_SDP | OMR_TTM;</div><div class='del'>-	}</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-    ** Set the programmable burst length to 8 longwords for all the DC21140</div><div class='del'>-    ** Fasternet chips and 4 longwords for all others: DMA errors result</div><div class='del'>-    ** without these values. Cache align 16 long.</div><div class='del'>-    */</div><div class='del'>-    bmr = (lp-&gt;chipset==DC21140 ? PBL_8 : PBL_4) | DESC_SKIP_LEN | DE4X5_CACHE_ALIGN;</div><div class='del'>-    bmr |= ((lp-&gt;chipset &amp; ~0x00ff)==DC2114x ? BMR_RML : 0);</div><div class='del'>-    outl(bmr, DE4X5_BMR);</div><div class='del'>-</div><div class='del'>-    omr = inl(DE4X5_OMR) &amp; ~OMR_PR;             /* Turn off promiscuous mode */</div><div class='del'>-    if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	omr |= (OMR_SDP | OMR_SB);</div><div class='del'>-    }</div><div class='del'>-    lp-&gt;setup_f = PERFECT;</div><div class='del'>-    outl(lp-&gt;dma_rings, DE4X5_RRBA);</div><div class='del'>-    outl(lp-&gt;dma_rings + NUM_RX_DESC * sizeof(struct de4x5_desc),</div><div class='del'>-	 DE4X5_TRBA);</div><div class='del'>-</div><div class='del'>-    lp-&gt;rx_new = lp-&gt;rx_old = 0;</div><div class='del'>-    lp-&gt;tx_new = lp-&gt;tx_old = 0;</div><div class='del'>-</div><div class='del'>-    for (i = 0; i &lt; lp-&gt;rxRingSize; i++) {</div><div class='del'>-	lp-&gt;rx_ring[i].status = cpu_to_le32(R_OWN);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    for (i = 0; i &lt; lp-&gt;txRingSize; i++) {</div><div class='del'>-	lp-&gt;tx_ring[i].status = cpu_to_le32(0);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    barrier();</div><div class='del'>-</div><div class='del'>-    /* Build the setup frame depending on filtering mode */</div><div class='del'>-    SetMulticastFilter(dev);</div><div class='del'>-</div><div class='del'>-    load_packet(dev, lp-&gt;setup_frame, PERFECT_F|TD_SET|SETUP_FRAME_LEN, (struct sk_buff *)1);</div><div class='del'>-    outl(omr|OMR_ST, DE4X5_OMR);</div><div class='del'>-</div><div class='del'>-    /* Poll for setup frame completion (adapter interrupts are disabled now) */</div><div class='del'>-</div><div class='del'>-    for (j=0, i=0;(i&lt;500) &amp;&amp; (j==0);i++) {       /* Up to 500ms delay */</div><div class='del'>-	mdelay(1);</div><div class='del'>-	if ((s32)le32_to_cpu(lp-&gt;tx_ring[lp-&gt;tx_new].status) &gt;= 0) j=1;</div><div class='del'>-    }</div><div class='del'>-    outl(omr, DE4X5_OMR);                        /* Stop everything! */</div><div class='del'>-</div><div class='del'>-    if (j == 0) {</div><div class='del'>-	printk("%s: Setup frame timed out, status %08x\n", dev-&gt;name,</div><div class='del'>-	       inl(DE4X5_STS));</div><div class='del'>-	status = -EIO;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    lp-&gt;tx_new = (lp-&gt;tx_new + 1) % lp-&gt;txRingSize;</div><div class='del'>-    lp-&gt;tx_old = lp-&gt;tx_new;</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Writes a socket buffer address to the next available transmit descriptor.</div><div class='del'>-*/</div><div class='del'>-static netdev_tx_t</div><div class='del'>-de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    u_long flags = 0;</div><div class='del'>-</div><div class='del'>-    netif_stop_queue(dev);</div><div class='del'>-    if (!lp-&gt;tx_enable)                   /* Cannot send for now */</div><div class='del'>-		goto tx_err;</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-    ** Clean out the TX ring asynchronously to interrupts - sometimes the</div><div class='del'>-    ** interrupts are lost by delayed descriptor status updates relative to</div><div class='del'>-    ** the irq assertion, especially with a busy PCI bus.</div><div class='del'>-    */</div><div class='del'>-    spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-    de4x5_tx(dev);</div><div class='del'>-    spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-</div><div class='del'>-    /* Test if cache is already locked - requeue skb if so */</div><div class='del'>-    if (test_and_set_bit(0, (void *)&amp;lp-&gt;cache.lock) &amp;&amp; !lp-&gt;interrupt)</div><div class='del'>-		goto tx_err;</div><div class='del'>-</div><div class='del'>-    /* Transmit descriptor ring full or stale skb */</div><div class='del'>-    if (netif_queue_stopped(dev) || (u_long) lp-&gt;tx_skb[lp-&gt;tx_new] &gt; 1) {</div><div class='del'>-	if (lp-&gt;interrupt) {</div><div class='del'>-	    de4x5_putb_cache(dev, skb);          /* Requeue the buffer */</div><div class='del'>-	} else {</div><div class='del'>-	    de4x5_put_cache(dev, skb);</div><div class='del'>-	}</div><div class='del'>-	if (de4x5_debug &amp; DEBUG_TX) {</div><div class='del'>-	    printk("%s: transmit busy, lost media or stale skb found:\n  STS:%08x\n  tbusy:%d\n  IMR:%08x\n  OMR:%08x\n Stale skb: %s\n",dev-&gt;name, inl(DE4X5_STS), netif_queue_stopped(dev), inl(DE4X5_IMR), inl(DE4X5_OMR), ((u_long) lp-&gt;tx_skb[lp-&gt;tx_new] &gt; 1) ? "YES" : "NO");</div><div class='del'>-	}</div><div class='del'>-    } else if (skb-&gt;len &gt; 0) {</div><div class='del'>-	/* If we already have stuff queued locally, use that first */</div><div class='del'>-	if (!skb_queue_empty(&amp;lp-&gt;cache.queue) &amp;&amp; !lp-&gt;interrupt) {</div><div class='del'>-	    de4x5_put_cache(dev, skb);</div><div class='del'>-	    skb = de4x5_get_cache(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (skb &amp;&amp; !netif_queue_stopped(dev) &amp;&amp;</div><div class='del'>-	       (u_long) lp-&gt;tx_skb[lp-&gt;tx_new] &lt;= 1) {</div><div class='del'>-	    spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-	    netif_stop_queue(dev);</div><div class='del'>-	    load_packet(dev, skb-&gt;data, TD_IC | TD_LS | TD_FS | skb-&gt;len, skb);</div><div class='del'>- 	    lp-&gt;stats.tx_bytes += skb-&gt;len;</div><div class='del'>-	    outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */</div><div class='del'>-</div><div class='del'>-	    lp-&gt;tx_new = (lp-&gt;tx_new + 1) % lp-&gt;txRingSize;</div><div class='del'>-</div><div class='del'>-	    if (TX_BUFFS_AVAIL) {</div><div class='del'>-		netif_start_queue(dev);         /* Another pkt may be queued */</div><div class='del'>-	    }</div><div class='del'>-	    skb = de4x5_get_cache(dev);</div><div class='del'>-	    spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-	}</div><div class='del'>-	if (skb) de4x5_putb_cache(dev, skb);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    lp-&gt;cache.lock = 0;</div><div class='del'>-</div><div class='del'>-    return NETDEV_TX_OK;</div><div class='del'>-tx_err:</div><div class='del'>-	dev_kfree_skb_any(skb);</div><div class='del'>-	return NETDEV_TX_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** The DE4X5 interrupt handler.</div><div class='del'>-**</div><div class='del'>-** I/O Read/Writes through intermediate PCI bridges are never 'posted',</div><div class='del'>-** so that the asserted interrupt always has some real data to work with -</div><div class='del'>-** if these I/O accesses are ever changed to memory accesses, ensure the</div><div class='del'>-** STS write is read immediately to complete the transaction if the adapter</div><div class='del'>-** is not on bus 0. Lost interrupts can still occur when the PCI bus load</div><div class='del'>-** is high and descriptor status bits cannot be set before the associated</div><div class='del'>-** interrupt is asserted and this routine entered.</div><div class='del'>-*/</div><div class='del'>-static irqreturn_t</div><div class='del'>-de4x5_interrupt(int irq, void *dev_id)</div><div class='del'>-{</div><div class='del'>-    struct net_device *dev = dev_id;</div><div class='del'>-    struct de4x5_private *lp;</div><div class='del'>-    s32 imr, omr, sts, limit;</div><div class='del'>-    u_long iobase;</div><div class='del'>-    unsigned int handled = 0;</div><div class='del'>-</div><div class='del'>-    lp = netdev_priv(dev);</div><div class='del'>-    spin_lock(&amp;lp-&gt;lock);</div><div class='del'>-    iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    DISABLE_IRQs;                        /* Ensure non re-entrancy */</div><div class='del'>-</div><div class='del'>-    if (test_and_set_bit(MASK_INTERRUPTS, (void*) &amp;lp-&gt;interrupt))</div><div class='del'>-	printk("%s: Re-entering the interrupt handler.\n", dev-&gt;name);</div><div class='del'>-</div><div class='del'>-    synchronize_irq(dev-&gt;irq);</div><div class='del'>-</div><div class='del'>-    for (limit=0; limit&lt;8; limit++) {</div><div class='del'>-	sts = inl(DE4X5_STS);            /* Read IRQ status */</div><div class='del'>-	outl(sts, DE4X5_STS);            /* Reset the board interrupts */</div><div class='del'>-</div><div class='del'>-	if (!(sts &amp; lp-&gt;irq_mask)) break;/* All done */</div><div class='del'>-	handled = 1;</div><div class='del'>-</div><div class='del'>-	if (sts &amp; (STS_RI | STS_RU))     /* Rx interrupt (packet[s] arrived) */</div><div class='del'>-	  de4x5_rx(dev);</div><div class='del'>-</div><div class='del'>-	if (sts &amp; (STS_TI | STS_TU))     /* Tx interrupt (packet sent) */</div><div class='del'>-	  de4x5_tx(dev);</div><div class='del'>-</div><div class='del'>-	if (sts &amp; STS_LNF) {             /* TP Link has failed */</div><div class='del'>-	    lp-&gt;irq_mask &amp;= ~IMR_LFM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sts &amp; STS_UNF) {             /* Transmit underrun */</div><div class='del'>-	    de4x5_txur(dev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sts &amp; STS_SE) {              /* Bus Error */</div><div class='del'>-	    STOP_DE4X5;</div><div class='del'>-	    printk("%s: Fatal bus error occurred, sts=%#8x, device stopped.\n",</div><div class='del'>-		   dev-&gt;name, sts);</div><div class='del'>-	    spin_unlock(&amp;lp-&gt;lock);</div><div class='del'>-	    return IRQ_HANDLED;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Load the TX ring with any locally stored packets */</div><div class='del'>-    if (!test_and_set_bit(0, (void *)&amp;lp-&gt;cache.lock)) {</div><div class='del'>-	while (!skb_queue_empty(&amp;lp-&gt;cache.queue) &amp;&amp; !netif_queue_stopped(dev) &amp;&amp; lp-&gt;tx_enable) {</div><div class='del'>-	    de4x5_queue_pkt(de4x5_get_cache(dev), dev);</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;cache.lock = 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    lp-&gt;interrupt = UNMASK_INTERRUPTS;</div><div class='del'>-    ENABLE_IRQs;</div><div class='del'>-    spin_unlock(&amp;lp-&gt;lock);</div><div class='del'>-</div><div class='del'>-    return IRQ_RETVAL(handled);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_rx(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int entry;</div><div class='del'>-    s32 status;</div><div class='del'>-</div><div class='del'>-    for (entry=lp-&gt;rx_new; (s32)le32_to_cpu(lp-&gt;rx_ring[entry].status)&gt;=0;</div><div class='del'>-	                                                    entry=lp-&gt;rx_new) {</div><div class='del'>-	status = (s32)le32_to_cpu(lp-&gt;rx_ring[entry].status);</div><div class='del'>-</div><div class='del'>-	if (lp-&gt;rx_ovf) {</div><div class='del'>-	    if (inl(DE4X5_MFC) &amp; MFC_FOCM) {</div><div class='del'>-		de4x5_rx_ovfc(dev);</div><div class='del'>-		break;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status &amp; RD_FS) {                 /* Remember the start of frame */</div><div class='del'>-	    lp-&gt;rx_old = entry;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status &amp; RD_LS) {                 /* Valid frame status */</div><div class='del'>-	    if (lp-&gt;tx_enable) lp-&gt;linkOK++;</div><div class='del'>-	    if (status &amp; RD_ES) {	      /* There was an error. */</div><div class='del'>-		lp-&gt;stats.rx_errors++;        /* Update the error stats. */</div><div class='del'>-		if (status &amp; (RD_RF | RD_TL)) lp-&gt;stats.rx_frame_errors++;</div><div class='del'>-		if (status &amp; RD_CE)           lp-&gt;stats.rx_crc_errors++;</div><div class='del'>-		if (status &amp; RD_OF)           lp-&gt;stats.rx_fifo_errors++;</div><div class='del'>-		if (status &amp; RD_TL)           lp-&gt;stats.rx_length_errors++;</div><div class='del'>-		if (status &amp; RD_RF)           lp-&gt;pktStats.rx_runt_frames++;</div><div class='del'>-		if (status &amp; RD_CS)           lp-&gt;pktStats.rx_collision++;</div><div class='del'>-		if (status &amp; RD_DB)           lp-&gt;pktStats.rx_dribble++;</div><div class='del'>-		if (status &amp; RD_OF)           lp-&gt;pktStats.rx_overflow++;</div><div class='del'>-	    } else {                          /* A valid frame received */</div><div class='del'>-		struct sk_buff *skb;</div><div class='del'>-		short pkt_len = (short)(le32_to_cpu(lp-&gt;rx_ring[entry].status)</div><div class='del'>-					                            &gt;&gt; 16) - 4;</div><div class='del'>-</div><div class='del'>-		if ((skb = de4x5_alloc_rx_buff(dev, entry, pkt_len)) == NULL) {</div><div class='del'>-		    printk("%s: Insufficient memory; nuking packet.\n",</div><div class='del'>-			                                            dev-&gt;name);</div><div class='del'>-		    lp-&gt;stats.rx_dropped++;</div><div class='del'>-		} else {</div><div class='del'>-		    de4x5_dbg_rx(skb, pkt_len);</div><div class='del'>-</div><div class='del'>-		    /* Push up the protocol stack */</div><div class='del'>-		    skb-&gt;protocol=eth_type_trans(skb,dev);</div><div class='del'>-		    de4x5_local_stats(dev, skb-&gt;data, pkt_len);</div><div class='del'>-		    netif_rx(skb);</div><div class='del'>-</div><div class='del'>-		    /* Update stats */</div><div class='del'>-		    lp-&gt;stats.rx_packets++;</div><div class='del'>- 		    lp-&gt;stats.rx_bytes += pkt_len;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    /* Change buffer ownership for this frame, back to the adapter */</div><div class='del'>-	    for (;lp-&gt;rx_old!=entry;lp-&gt;rx_old=(lp-&gt;rx_old + 1)%lp-&gt;rxRingSize) {</div><div class='del'>-		lp-&gt;rx_ring[lp-&gt;rx_old].status = cpu_to_le32(R_OWN);</div><div class='del'>-		barrier();</div><div class='del'>-	    }</div><div class='del'>-	    lp-&gt;rx_ring[entry].status = cpu_to_le32(R_OWN);</div><div class='del'>-	    barrier();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	** Update entry information</div><div class='del'>-	*/</div><div class='del'>-	lp-&gt;rx_new = (lp-&gt;rx_new + 1) % lp-&gt;rxRingSize;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-de4x5_free_tx_buff(struct de4x5_private *lp, int entry)</div><div class='del'>-{</div><div class='del'>-    dma_unmap_single(lp-&gt;gendev, le32_to_cpu(lp-&gt;tx_ring[entry].buf),</div><div class='del'>-		     le32_to_cpu(lp-&gt;tx_ring[entry].des1) &amp; TD_TBS1,</div><div class='del'>-		     DMA_TO_DEVICE);</div><div class='del'>-    if ((u_long) lp-&gt;tx_skb[entry] &gt; 1)</div><div class='del'>-	dev_kfree_skb_irq(lp-&gt;tx_skb[entry]);</div><div class='del'>-    lp-&gt;tx_skb[entry] = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Buffer sent - check for TX buffer errors.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-de4x5_tx(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int entry;</div><div class='del'>-    s32 status;</div><div class='del'>-</div><div class='del'>-    for (entry = lp-&gt;tx_old; entry != lp-&gt;tx_new; entry = lp-&gt;tx_old) {</div><div class='del'>-	status = (s32)le32_to_cpu(lp-&gt;tx_ring[entry].status);</div><div class='del'>-	if (status &lt; 0) {                     /* Buffer not sent yet */</div><div class='del'>-	    break;</div><div class='del'>-	} else if (status != 0x7fffffff) {    /* Not setup frame */</div><div class='del'>-	    if (status &amp; TD_ES) {             /* An error happened */</div><div class='del'>-		lp-&gt;stats.tx_errors++;</div><div class='del'>-		if (status &amp; TD_NC) lp-&gt;stats.tx_carrier_errors++;</div><div class='del'>-		if (status &amp; TD_LC) lp-&gt;stats.tx_window_errors++;</div><div class='del'>-		if (status &amp; TD_UF) lp-&gt;stats.tx_fifo_errors++;</div><div class='del'>-		if (status &amp; TD_EC) lp-&gt;pktStats.excessive_collisions++;</div><div class='del'>-		if (status &amp; TD_DE) lp-&gt;stats.tx_aborted_errors++;</div><div class='del'>-</div><div class='del'>-		if (TX_PKT_PENDING) {</div><div class='del'>-		    outl(POLL_DEMAND, DE4X5_TPD);/* Restart a stalled TX */</div><div class='del'>-		}</div><div class='del'>-	    } else {                      /* Packet sent */</div><div class='del'>-		lp-&gt;stats.tx_packets++;</div><div class='del'>-		if (lp-&gt;tx_enable) lp-&gt;linkOK++;</div><div class='del'>-	    }</div><div class='del'>-	    /* Update the collision counter */</div><div class='del'>-	    lp-&gt;stats.collisions += ((status &amp; TD_EC) ? 16 :</div><div class='del'>-				                      ((status &amp; TD_CC) &gt;&gt; 3));</div><div class='del'>-</div><div class='del'>-	    /* Free the buffer. */</div><div class='del'>-	    if (lp-&gt;tx_skb[entry] != NULL)</div><div class='del'>-	    	de4x5_free_tx_buff(lp, entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update all the pointers */</div><div class='del'>-	lp-&gt;tx_old = (lp-&gt;tx_old + 1) % lp-&gt;txRingSize;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Any resources available? */</div><div class='del'>-    if (TX_BUFFS_AVAIL &amp;&amp; netif_queue_stopped(dev)) {</div><div class='del'>-	if (lp-&gt;interrupt)</div><div class='del'>-	    netif_wake_queue(dev);</div><div class='del'>-	else</div><div class='del'>-	    netif_start_queue(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_ast(struct timer_list *t)</div><div class='del'>-{</div><div class='del'>-	struct de4x5_private *lp = from_timer(lp, t, timer);</div><div class='del'>-	struct net_device *dev = dev_get_drvdata(lp-&gt;gendev);</div><div class='del'>-	int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-	int dt;</div><div class='del'>-</div><div class='del'>-	if (lp-&gt;useSROM)</div><div class='del'>-		next_tick = srom_autoconf(dev);</div><div class='del'>-	else if (lp-&gt;chipset == DC21140)</div><div class='del'>-		next_tick = dc21140m_autoconf(dev);</div><div class='del'>-	else if (lp-&gt;chipset == DC21041)</div><div class='del'>-		next_tick = dc21041_autoconf(dev);</div><div class='del'>-	else if (lp-&gt;chipset == DC21040)</div><div class='del'>-		next_tick = dc21040_autoconf(dev);</div><div class='del'>-	lp-&gt;linkOK = 0;</div><div class='del'>-</div><div class='del'>-	dt = (next_tick * HZ) / 1000;</div><div class='del'>-</div><div class='del'>-	if (!dt)</div><div class='del'>-		dt = 1;</div><div class='del'>-</div><div class='del'>-	mod_timer(&amp;lp-&gt;timer, jiffies + dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_txur(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int omr;</div><div class='del'>-</div><div class='del'>-    omr = inl(DE4X5_OMR);</div><div class='del'>-    if (!(omr &amp; OMR_SF) || (lp-&gt;chipset==DC21041) || (lp-&gt;chipset==DC21040)) {</div><div class='del'>-	omr &amp;= ~(OMR_ST|OMR_SR);</div><div class='del'>-	outl(omr, DE4X5_OMR);</div><div class='del'>-	while (inl(DE4X5_STS) &amp; STS_TS);</div><div class='del'>-	if ((omr &amp; OMR_TR) &lt; OMR_TR) {</div><div class='del'>-	    omr += 0x4000;</div><div class='del'>-	} else {</div><div class='del'>-	    omr |= OMR_SF;</div><div class='del'>-	}</div><div class='del'>-	outl(omr | OMR_ST | OMR_SR, DE4X5_OMR);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_rx_ovfc(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int omr;</div><div class='del'>-</div><div class='del'>-    omr = inl(DE4X5_OMR);</div><div class='del'>-    outl(omr &amp; ~OMR_SR, DE4X5_OMR);</div><div class='del'>-    while (inl(DE4X5_STS) &amp; STS_RS);</div><div class='del'>-</div><div class='del'>-    for (; (s32)le32_to_cpu(lp-&gt;rx_ring[lp-&gt;rx_new].status)&gt;=0;) {</div><div class='del'>-	lp-&gt;rx_ring[lp-&gt;rx_new].status = cpu_to_le32(R_OWN);</div><div class='del'>-	lp-&gt;rx_new = (lp-&gt;rx_new + 1) % lp-&gt;rxRingSize;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    outl(omr, DE4X5_OMR);</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_close(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 imr, omr;</div><div class='del'>-</div><div class='del'>-    disable_ast(dev);</div><div class='del'>-</div><div class='del'>-    netif_stop_queue(dev);</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_CLOSE) {</div><div class='del'>-	printk("%s: Shutting down ethercard, status was %8.8x.\n",</div><div class='del'>-	       dev-&gt;name, inl(DE4X5_STS));</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /*</div><div class='del'>-    ** We stop the DE4X5 here... mask interrupts and stop TX &amp; RX</div><div class='del'>-    */</div><div class='del'>-    DISABLE_IRQs;</div><div class='del'>-    STOP_DE4X5;</div><div class='del'>-</div><div class='del'>-    /* Free the associated irq */</div><div class='del'>-    free_irq(dev-&gt;irq, dev);</div><div class='del'>-    lp-&gt;state = CLOSED;</div><div class='del'>-</div><div class='del'>-    /* Free any socket buffers */</div><div class='del'>-    de4x5_free_rx_buffs(dev);</div><div class='del'>-    de4x5_free_tx_buffs(dev);</div><div class='del'>-</div><div class='del'>-    /* Put the adapter to sleep to save power */</div><div class='del'>-    yawn(dev, SLEEP);</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct net_device_stats *</div><div class='del'>-de4x5_get_stats(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    lp-&gt;stats.rx_missed_errors = (int)(inl(DE4X5_MFC) &amp; (MFC_OVFL | MFC_CNTR));</div><div class='del'>-</div><div class='del'>-    return &amp;lp-&gt;stats;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_local_stats(struct net_device *dev, char *buf, int pkt_len)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    for (i=1; i&lt;DE4X5_PKT_STAT_SZ-1; i++) {</div><div class='del'>-        if (pkt_len &lt; (i*DE4X5_PKT_BIN_SZ)) {</div><div class='del'>-	    lp-&gt;pktStats.bins[i]++;</div><div class='del'>-	    i = DE4X5_PKT_STAT_SZ;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    if (is_multicast_ether_addr(buf)) {</div><div class='del'>-        if (is_broadcast_ether_addr(buf)) {</div><div class='del'>-	    lp-&gt;pktStats.broadcast++;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;pktStats.multicast++;</div><div class='del'>-	}</div><div class='del'>-    } else if (ether_addr_equal(buf, dev-&gt;dev_addr)) {</div><div class='del'>-        lp-&gt;pktStats.unicast++;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    lp-&gt;pktStats.bins[0]++;       /* Duplicates stats.rx_packets */</div><div class='del'>-    if (lp-&gt;pktStats.bins[0] == 0) { /* Reset counters */</div><div class='del'>-        memset((char *)&amp;lp-&gt;pktStats, 0, sizeof(lp-&gt;pktStats));</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Removes the TD_IC flag from previous descriptor to improve TX performance.</div><div class='del'>-** If the flag is changed on a descriptor that is being read by the hardware,</div><div class='del'>-** I assume PCI transaction ordering will mean you are either successful or</div><div class='del'>-** just miss asserting the change to the hardware. Anyway you're messing with</div><div class='del'>-** a descriptor you don't own, but this shouldn't kill the chip provided</div><div class='del'>-** the descriptor register is read only to the hardware.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-load_packet(struct net_device *dev, char *buf, u32 flags, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int entry = (lp-&gt;tx_new ? lp-&gt;tx_new-1 : lp-&gt;txRingSize-1);</div><div class='del'>-    dma_addr_t buf_dma = dma_map_single(lp-&gt;gendev, buf, flags &amp; TD_TBS1, DMA_TO_DEVICE);</div><div class='del'>-</div><div class='del'>-    lp-&gt;tx_ring[lp-&gt;tx_new].buf = cpu_to_le32(buf_dma);</div><div class='del'>-    lp-&gt;tx_ring[lp-&gt;tx_new].des1 &amp;= cpu_to_le32(TD_TER);</div><div class='del'>-    lp-&gt;tx_ring[lp-&gt;tx_new].des1 |= cpu_to_le32(flags);</div><div class='del'>-    lp-&gt;tx_skb[lp-&gt;tx_new] = skb;</div><div class='del'>-    lp-&gt;tx_ring[entry].des1 &amp;= cpu_to_le32(~TD_IC);</div><div class='del'>-    barrier();</div><div class='del'>-</div><div class='del'>-    lp-&gt;tx_ring[lp-&gt;tx_new].status = cpu_to_le32(T_OWN);</div><div class='del'>-    barrier();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Set or clear the multicast filter for this adaptor.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-set_multicast_list(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    /* First, double check that the adapter is open */</div><div class='del'>-    if (lp-&gt;state == OPEN) {</div><div class='del'>-	if (dev-&gt;flags &amp; IFF_PROMISC) {         /* set promiscuous mode */</div><div class='del'>-	    u32 omr;</div><div class='del'>-	    omr = inl(DE4X5_OMR);</div><div class='del'>-	    omr |= OMR_PR;</div><div class='del'>-	    outl(omr, DE4X5_OMR);</div><div class='del'>-	} else {</div><div class='del'>-	    SetMulticastFilter(dev);</div><div class='del'>-	    load_packet(dev, lp-&gt;setup_frame, TD_IC | PERFECT_F | TD_SET |</div><div class='del'>-			                                SETUP_FRAME_LEN, (struct sk_buff *)1);</div><div class='del'>-</div><div class='del'>-	    lp-&gt;tx_new = (lp-&gt;tx_new + 1) % lp-&gt;txRingSize;</div><div class='del'>-	    outl(POLL_DEMAND, DE4X5_TPD);       /* Start the TX */</div><div class='del'>-	    netif_trans_update(dev); /* prevent tx timeout */</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Calculate the hash code and update the logical address filter</div><div class='del'>-** from a list of ethernet multicast addresses.</div><div class='del'>-** Little endian crc one liner from Matt Thomas, DEC.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-SetMulticastFilter(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct netdev_hw_addr *ha;</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int i, bit, byte;</div><div class='del'>-    u16 hashcode;</div><div class='del'>-    u32 omr, crc;</div><div class='del'>-    char *pa;</div><div class='del'>-    unsigned char *addrs;</div><div class='del'>-</div><div class='del'>-    omr = inl(DE4X5_OMR);</div><div class='del'>-    omr &amp;= ~(OMR_PR | OMR_PM);</div><div class='del'>-    pa = build_setup_frame(dev, ALL);        /* Build the basic frame */</div><div class='del'>-</div><div class='del'>-    if ((dev-&gt;flags &amp; IFF_ALLMULTI) || (netdev_mc_count(dev) &gt; 14)) {</div><div class='del'>-	omr |= OMR_PM;                       /* Pass all multicasts */</div><div class='del'>-    } else if (lp-&gt;setup_f == HASH_PERF) {   /* Hash Filtering */</div><div class='del'>-	netdev_for_each_mc_addr(ha, dev) {</div><div class='del'>-		crc = ether_crc_le(ETH_ALEN, ha-&gt;addr);</div><div class='del'>-		hashcode = crc &amp; DE4X5_HASH_BITS;  /* hashcode is 9 LSb of CRC */</div><div class='del'>-</div><div class='del'>-		byte = hashcode &gt;&gt; 3;        /* bit[3-8] -&gt; byte in filter */</div><div class='del'>-		bit = 1 &lt;&lt; (hashcode &amp; 0x07);/* bit[0-2] -&gt; bit in byte */</div><div class='del'>-</div><div class='del'>-		byte &lt;&lt;= 1;                  /* calc offset into setup frame */</div><div class='del'>-		if (byte &amp; 0x02) {</div><div class='del'>-		    byte -= 1;</div><div class='del'>-		}</div><div class='del'>-		lp-&gt;setup_frame[byte] |= bit;</div><div class='del'>-	}</div><div class='del'>-    } else {                                 /* Perfect filtering */</div><div class='del'>-	netdev_for_each_mc_addr(ha, dev) {</div><div class='del'>-	    addrs = ha-&gt;addr;</div><div class='del'>-	    for (i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-		*(pa + (i&amp;1)) = *addrs++;</div><div class='del'>-		if (i &amp; 0x01) pa += 4;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    outl(omr, DE4X5_OMR);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_EISA</div><div class='del'>-</div><div class='del'>-static u_char de4x5_irq[] = EISA_ALLOWED_IRQ_LIST;</div><div class='del'>-</div><div class='del'>-static int de4x5_eisa_probe(struct device *gendev)</div><div class='del'>-{</div><div class='del'>-	struct eisa_device *edev;</div><div class='del'>-	u_long iobase;</div><div class='del'>-	u_char irq, regval;</div><div class='del'>-	u_short vendor;</div><div class='del'>-	u32 cfid;</div><div class='del'>-	int status, device;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct de4x5_private *lp;</div><div class='del'>-</div><div class='del'>-	edev = to_eisa_device (gendev);</div><div class='del'>-	iobase = edev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	if (!request_region (iobase, DE4X5_EISA_TOTAL_SIZE, "de4x5"))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-</div><div class='del'>-	if (!request_region (iobase + DE4X5_EISA_IO_PORTS,</div><div class='del'>-			     DE4X5_EISA_TOTAL_SIZE, "de4x5")) {</div><div class='del'>-		status = -EBUSY;</div><div class='del'>-		goto release_reg_1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(dev = alloc_etherdev (sizeof (struct de4x5_private)))) {</div><div class='del'>-		status = -ENOMEM;</div><div class='del'>-		goto release_reg_2;</div><div class='del'>-	}</div><div class='del'>-	lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-	cfid = (u32) inl(PCI_CFID);</div><div class='del'>-	lp-&gt;cfrv = (u_short) inl(PCI_CFRV);</div><div class='del'>-	device = (cfid &gt;&gt; 8) &amp; 0x00ffff00;</div><div class='del'>-	vendor = (u_short) cfid;</div><div class='del'>-</div><div class='del'>-	/* Read the EISA Configuration Registers */</div><div class='del'>-	regval = inb(EISA_REG0) &amp; (ER0_INTL | ER0_INTT);</div><div class='del'>-#ifdef CONFIG_ALPHA</div><div class='del'>-	/* Looks like the Jensen firmware (rev 2.2) doesn't really</div><div class='del'>-	 * care about the EISA configuration, and thus doesn't</div><div class='del'>-	 * configure the PLX bridge properly. Oh well... Simply mimic</div><div class='del'>-	 * the EISA config file to sort it out. */</div><div class='del'>-</div><div class='del'>-	/* EISA REG1: Assert DecChip 21040 HW Reset */</div><div class='del'>-	outb (ER1_IAM | 1, EISA_REG1);</div><div class='del'>-	mdelay (1);</div><div class='del'>-</div><div class='del'>-        /* EISA REG1: Deassert DecChip 21040 HW Reset */</div><div class='del'>-	outb (ER1_IAM, EISA_REG1);</div><div class='del'>-	mdelay (1);</div><div class='del'>-</div><div class='del'>-	/* EISA REG3: R/W Burst Transfer Enable */</div><div class='del'>-	outb (ER3_BWE | ER3_BRE, EISA_REG3);</div><div class='del'>-</div><div class='del'>-	/* 32_bit slave/master, Preempt Time=23 bclks, Unlatched Interrupt */</div><div class='del'>-	outb (ER0_BSW | ER0_BMW | ER0_EPT | regval, EISA_REG0);</div><div class='del'>-#endif</div><div class='del'>-	irq = de4x5_irq[(regval &gt;&gt; 1) &amp; 0x03];</div><div class='del'>-</div><div class='del'>-	if (is_DC2114x) {</div><div class='del'>-	    device = ((lp-&gt;cfrv &amp; CFRV_RN) &lt; DC2114x_BRK ? DC21142 : DC21143);</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;chipset = device;</div><div class='del'>-	lp-&gt;bus = EISA;</div><div class='del'>-</div><div class='del'>-	/* Write the PCI Configuration Registers */</div><div class='del'>-	outl(PCI_COMMAND_IO | PCI_COMMAND_MASTER, PCI_CFCS);</div><div class='del'>-	outl(0x00006000, PCI_CFLT);</div><div class='del'>-	outl(iobase, PCI_CBIO);</div><div class='del'>-</div><div class='del'>-	DevicePresent(dev, EISA_APROM);</div><div class='del'>-</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-</div><div class='del'>-	if (!(status = de4x5_hw_init (dev, iobase, gendev))) {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_netdev (dev);</div><div class='del'>- release_reg_2:</div><div class='del'>-	release_region (iobase + DE4X5_EISA_IO_PORTS, DE4X5_EISA_TOTAL_SIZE);</div><div class='del'>- release_reg_1:</div><div class='del'>-	release_region (iobase, DE4X5_EISA_TOTAL_SIZE);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int de4x5_eisa_remove(struct device *device)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	u_long iobase;</div><div class='del'>-</div><div class='del'>-	dev = dev_get_drvdata(device);</div><div class='del'>-	iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	unregister_netdev (dev);</div><div class='del'>-	free_netdev (dev);</div><div class='del'>-	release_region (iobase + DE4X5_EISA_IO_PORTS, DE4X5_EISA_TOTAL_SIZE);</div><div class='del'>-	release_region (iobase, DE4X5_EISA_TOTAL_SIZE);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct eisa_device_id de4x5_eisa_ids[] = {</div><div class='del'>-        { "DEC4250", 0 },	/* 0 is the board name index... */</div><div class='del'>-        { "" }</div><div class='del'>-};</div><div class='del'>-MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);</div><div class='del'>-</div><div class='del'>-static struct eisa_driver de4x5_eisa_driver = {</div><div class='del'>-        .id_table = de4x5_eisa_ids,</div><div class='del'>-        .driver   = {</div><div class='del'>-                .name    = "de4x5",</div><div class='del'>-                .probe   = de4x5_eisa_probe,</div><div class='del'>-		.remove  = de4x5_eisa_remove,</div><div class='del'>-        }</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This function searches the current bus (which is &gt;0) for a DECchip with an</div><div class='del'>-** SROM, so that in multiport cards that have one SROM shared between multiple</div><div class='del'>-** DECchips, we can find the base SROM irrespective of the BIOS scan direction.</div><div class='del'>-** For single port cards this is a time waster...</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-srom_search(struct net_device *dev, struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-    u_char pb;</div><div class='del'>-    u_short vendor, status;</div><div class='del'>-    u_int irq = 0, device;</div><div class='del'>-    u_long iobase = 0;                     /* Clear upper 32 bits in Alphas */</div><div class='del'>-    int i, j;</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct pci_dev *this_dev;</div><div class='del'>-</div><div class='del'>-    list_for_each_entry(this_dev, &amp;pdev-&gt;bus-&gt;devices, bus_list) {</div><div class='del'>-	vendor = this_dev-&gt;vendor;</div><div class='del'>-	device = this_dev-&gt;device &lt;&lt; 8;</div><div class='del'>-	if (!(is_DC21040 || is_DC21041 || is_DC21140 || is_DC2114x)) continue;</div><div class='del'>-</div><div class='del'>-	/* Get the chip configuration revision register */</div><div class='del'>-	pb = this_dev-&gt;bus-&gt;number;</div><div class='del'>-</div><div class='del'>-	/* Set the device number information */</div><div class='del'>-	lp-&gt;device = PCI_SLOT(this_dev-&gt;devfn);</div><div class='del'>-	lp-&gt;bus_num = pb;</div><div class='del'>-</div><div class='del'>-	/* Set the chipset information */</div><div class='del'>-	if (is_DC2114x) {</div><div class='del'>-	    device = ((this_dev-&gt;revision &amp; CFRV_RN) &lt; DC2114x_BRK</div><div class='del'>-		      ? DC21142 : DC21143);</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;chipset = device;</div><div class='del'>-</div><div class='del'>-	/* Get the board I/O address (64 bits on sparc64) */</div><div class='del'>-	iobase = pci_resource_start(this_dev, 0);</div><div class='del'>-</div><div class='del'>-	/* Fetch the IRQ to be used */</div><div class='del'>-	irq = this_dev-&gt;irq;</div><div class='del'>-	if ((irq == 0) || (irq == 0xff) || ((int)irq == -1)) continue;</div><div class='del'>-</div><div class='del'>-	/* Check if I/O accesses are enabled */</div><div class='del'>-	pci_read_config_word(this_dev, PCI_COMMAND, &amp;status);</div><div class='del'>-	if (!(status &amp; PCI_COMMAND_IO)) continue;</div><div class='del'>-</div><div class='del'>-	/* Search for a valid SROM attached to this DECchip */</div><div class='del'>-	DevicePresent(dev, DE4X5_APROM);</div><div class='del'>-	for (j=0, i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-	    j += (u_char) *((u_char *)&amp;lp-&gt;srom + SROM_HWADD + i);</div><div class='del'>-	}</div><div class='del'>-	if (j != 0 &amp;&amp; j != 6 * 0xff) {</div><div class='del'>-	    last.chipset = device;</div><div class='del'>-	    last.bus = pb;</div><div class='del'>-	    last.irq = irq;</div><div class='del'>-	    for (i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-		last.addr[i] = (u_char)*((u_char *)&amp;lp-&gt;srom + SROM_HWADD + i);</div><div class='del'>-	    }</div><div class='del'>-	    return;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI bus I/O device probe</div><div class='del'>-** NB: PCI I/O accesses and Bus Mastering are enabled by the PCI BIOS, not</div><div class='del'>-** the driver. Some PCI BIOS's, pre V2.1, need the slot + features to be</div><div class='del'>-** enabled by the user first in the set up utility. Hence we just check for</div><div class='del'>-** enabled features and silently ignore the card if they're not.</div><div class='del'>-**</div><div class='del'>-** STOP PRESS: Some BIOS's __require__ the driver to enable the bus mastering</div><div class='del'>-** bit. Here, check for I/O accesses and then set BM. If you put the card in</div><div class='del'>-** a non BM slot, you're on your own (and complain to the PC vendor that your</div><div class='del'>-** PC doesn't conform to the PCI standard)!</div><div class='del'>-**</div><div class='del'>-** This function is only compatible with the *latest* 2.1.x kernels. For 2.0.x</div><div class='del'>-** kernels use the V0.535[n] drivers.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static int de4x5_pci_probe(struct pci_dev *pdev,</div><div class='del'>-			   const struct pci_device_id *ent)</div><div class='del'>-{</div><div class='del'>-	u_char pb, pbus = 0, dev_num, dnum = 0, timer;</div><div class='del'>-	u_short vendor, status;</div><div class='del'>-	u_int irq = 0, device;</div><div class='del'>-	u_long iobase = 0;	/* Clear upper 32 bits in Alphas */</div><div class='del'>-	int error;</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	struct de4x5_private *lp;</div><div class='del'>-</div><div class='del'>-	dev_num = PCI_SLOT(pdev-&gt;devfn);</div><div class='del'>-	pb = pdev-&gt;bus-&gt;number;</div><div class='del'>-</div><div class='del'>-	if (io) { /* probe a single PCI device */</div><div class='del'>-		pbus = (u_short)(io &gt;&gt; 8);</div><div class='del'>-		dnum = (u_short)(io &amp; 0xff);</div><div class='del'>-		if ((pbus != pb) || (dnum != dev_num))</div><div class='del'>-			return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vendor = pdev-&gt;vendor;</div><div class='del'>-	device = pdev-&gt;device &lt;&lt; 8;</div><div class='del'>-	if (!(is_DC21040 || is_DC21041 || is_DC21140 || is_DC2114x))</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	/* Ok, the device seems to be for us. */</div><div class='del'>-	if ((error = pci_enable_device (pdev)))</div><div class='del'>-		return error;</div><div class='del'>-</div><div class='del'>-	if (!(dev = alloc_etherdev (sizeof (struct de4x5_private)))) {</div><div class='del'>-		error = -ENOMEM;</div><div class='del'>-		goto disable_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lp = netdev_priv(dev);</div><div class='del'>-	lp-&gt;bus = PCI;</div><div class='del'>-	lp-&gt;bus_num = 0;</div><div class='del'>-</div><div class='del'>-	/* Search for an SROM on this bus */</div><div class='del'>-	if (lp-&gt;bus_num != pb) {</div><div class='del'>-	    lp-&gt;bus_num = pb;</div><div class='del'>-	    srom_search(dev, pdev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the chip configuration revision register */</div><div class='del'>-	lp-&gt;cfrv = pdev-&gt;revision;</div><div class='del'>-</div><div class='del'>-	/* Set the device number information */</div><div class='del'>-	lp-&gt;device = dev_num;</div><div class='del'>-	lp-&gt;bus_num = pb;</div><div class='del'>-</div><div class='del'>-	/* Set the chipset information */</div><div class='del'>-	if (is_DC2114x) {</div><div class='del'>-	    device = ((lp-&gt;cfrv &amp; CFRV_RN) &lt; DC2114x_BRK ? DC21142 : DC21143);</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;chipset = device;</div><div class='del'>-</div><div class='del'>-	/* Get the board I/O address (64 bits on sparc64) */</div><div class='del'>-	iobase = pci_resource_start(pdev, 0);</div><div class='del'>-</div><div class='del'>-	/* Fetch the IRQ to be used */</div><div class='del'>-	irq = pdev-&gt;irq;</div><div class='del'>-	if ((irq == 0) || (irq == 0xff) || ((int)irq == -1)) {</div><div class='del'>-		error = -ENODEV;</div><div class='del'>-		goto free_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if I/O accesses and Bus Mastering are enabled */</div><div class='del'>-	pci_read_config_word(pdev, PCI_COMMAND, &amp;status);</div><div class='del'>-#ifdef __powerpc__</div><div class='del'>-	if (!(status &amp; PCI_COMMAND_IO)) {</div><div class='del'>-	    status |= PCI_COMMAND_IO;</div><div class='del'>-	    pci_write_config_word(pdev, PCI_COMMAND, status);</div><div class='del'>-	    pci_read_config_word(pdev, PCI_COMMAND, &amp;status);</div><div class='del'>-	}</div><div class='del'>-#endif /* __powerpc__ */</div><div class='del'>-	if (!(status &amp; PCI_COMMAND_IO)) {</div><div class='del'>-		error = -ENODEV;</div><div class='del'>-		goto free_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(status &amp; PCI_COMMAND_MASTER)) {</div><div class='del'>-	    status |= PCI_COMMAND_MASTER;</div><div class='del'>-	    pci_write_config_word(pdev, PCI_COMMAND, status);</div><div class='del'>-	    pci_read_config_word(pdev, PCI_COMMAND, &amp;status);</div><div class='del'>-	}</div><div class='del'>-	if (!(status &amp; PCI_COMMAND_MASTER)) {</div><div class='del'>-		error = -ENODEV;</div><div class='del'>-		goto free_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check the latency timer for values &gt;= 0x60 */</div><div class='del'>-	pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &amp;timer);</div><div class='del'>-	if (timer &lt; 0x60) {</div><div class='del'>-	    pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x60);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	DevicePresent(dev, DE4X5_APROM);</div><div class='del'>-</div><div class='del'>-	if (!request_region (iobase, DE4X5_PCI_TOTAL_SIZE, "de4x5")) {</div><div class='del'>-		error = -EBUSY;</div><div class='del'>-		goto free_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dev-&gt;irq = irq;</div><div class='del'>-</div><div class='del'>-	if ((error = de4x5_hw_init(dev, iobase, &amp;pdev-&gt;dev))) {</div><div class='del'>-		goto release;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>- release:</div><div class='del'>-	release_region (iobase, DE4X5_PCI_TOTAL_SIZE);</div><div class='del'>- free_dev:</div><div class='del'>-	free_netdev (dev);</div><div class='del'>- disable_dev:</div><div class='del'>-	pci_disable_device (pdev);</div><div class='del'>-	return error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void de4x5_pci_remove(struct pci_dev *pdev)</div><div class='del'>-{</div><div class='del'>-	struct net_device *dev;</div><div class='del'>-	u_long iobase;</div><div class='del'>-</div><div class='del'>-	dev = pci_get_drvdata(pdev);</div><div class='del'>-	iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	unregister_netdev (dev);</div><div class='del'>-	free_netdev (dev);</div><div class='del'>-	release_region (iobase, DE4X5_PCI_TOTAL_SIZE);</div><div class='del'>-	pci_disable_device (pdev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct pci_device_id de4x5_pci_tbl[] = {</div><div class='del'>-        { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP,</div><div class='del'>-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },</div><div class='del'>-        { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS,</div><div class='del'>-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },</div><div class='del'>-        { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,</div><div class='del'>-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },</div><div class='del'>-        { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142,</div><div class='del'>-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },</div><div class='del'>-        { },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct pci_driver de4x5_pci_driver = {</div><div class='del'>-        .name           = "de4x5",</div><div class='del'>-        .id_table       = de4x5_pci_tbl,</div><div class='del'>-        .probe          = de4x5_pci_probe,</div><div class='del'>-	.remove         = de4x5_pci_remove,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Auto configure the media here rather than setting the port at compile</div><div class='del'>-** time. This routine is called by de4x5_init() and when a loss of media is</div><div class='del'>-** detected (excessive collisions, loss of carrier, no carrier or link fail</div><div class='del'>-** [TP] or no recent receive activity) to check whether the user has been</div><div class='del'>-** sneaky and changed the port on us.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-autoconf_media(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-	u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-	disable_ast(dev);</div><div class='del'>-</div><div class='del'>-	lp-&gt;c_media = AUTO;                     /* Bogus last media */</div><div class='del'>-	inl(DE4X5_MFC);                         /* Zero the lost frames counter */</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tcount = 0;</div><div class='del'>-</div><div class='del'>-	de4x5_ast(&amp;lp-&gt;timer);</div><div class='del'>-</div><div class='del'>-	return lp-&gt;media;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Autoconfigure the media when using the DC21040. AUI cannot be distinguished</div><div class='del'>-** from BNC as the port has a jumper to set thick or thin wire. When set for</div><div class='del'>-** BNC, the BNC port will indicate activity if it's not terminated correctly.</div><div class='del'>-** The only way to test for that is to place a loopback packet onto the</div><div class='del'>-** network and watch for errors. Since we're messing with the interrupt mask</div><div class='del'>-** register, disable the board interrupts and do not allow any more packets to</div><div class='del'>-** be queued to the hardware. Re-enable everything only when the media is</div><div class='del'>-** found.</div><div class='del'>-** I may have to "age out" locally queued packets so that the higher layer</div><div class='del'>-** timeouts don't effectively duplicate packets on the network.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-dc21040_autoconf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-    s32 imr;</div><div class='del'>-</div><div class='del'>-    switch (lp-&gt;media) {</div><div class='del'>-    case INIT:</div><div class='del'>-	DISABLE_IRQs;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-	de4x5_save_skbs(dev);</div><div class='del'>-	if ((lp-&gt;autosense == AUTO) || (lp-&gt;autosense == TP)) {</div><div class='del'>-	    lp-&gt;media = TP;</div><div class='del'>-	} else if ((lp-&gt;autosense == BNC) || (lp-&gt;autosense == AUI) || (lp-&gt;autosense == BNC_AUI)) {</div><div class='del'>-	    lp-&gt;media = BNC_AUI;</div><div class='del'>-	} else if (lp-&gt;autosense == EXT_SIA) {</div><div class='del'>-	    lp-&gt;media = EXT_SIA;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;media = NC;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;local_state = 0;</div><div class='del'>-	next_tick = dc21040_autoconf(dev);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case TP:</div><div class='del'>-	next_tick = dc21040_state(dev, 0x8f01, 0xffff, 0x0000, 3000, BNC_AUI,</div><div class='del'>-		                                         TP_SUSPECT, test_tp);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case TP_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, TP, test_tp, dc21040_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC:</div><div class='del'>-    case AUI:</div><div class='del'>-    case BNC_AUI:</div><div class='del'>-	next_tick = dc21040_state(dev, 0x8f09, 0x0705, 0x0006, 3000, EXT_SIA,</div><div class='del'>-		                                  BNC_AUI_SUSPECT, ping_media);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC_AUI_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, BNC_AUI, ping_media, dc21040_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case EXT_SIA:</div><div class='del'>-	next_tick = dc21040_state(dev, 0x3041, 0x0000, 0x0006, 3000,</div><div class='del'>-		                              NC, EXT_SIA_SUSPECT, ping_media);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case EXT_SIA_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, EXT_SIA, ping_media, dc21040_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case NC:</div><div class='del'>-	/* default to TP for all */</div><div class='del'>-	reset_init_sia(dev, 0x8f01, 0xffff, 0x0000);</div><div class='del'>-	if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	    de4x5_dbg_media(dev);</div><div class='del'>-	    lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dc21040_state(struct net_device *dev, int csr13, int csr14, int csr15, int timeout,</div><div class='del'>-	      int next_state, int suspect_state,</div><div class='del'>-	      int (*fn)(struct net_device *, int))</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-    int linkBad;</div><div class='del'>-</div><div class='del'>-    switch (lp-&gt;local_state) {</div><div class='del'>-    case 0:</div><div class='del'>-	reset_init_sia(dev, csr13, csr14, csr15);</div><div class='del'>-	lp-&gt;local_state++;</div><div class='del'>-	next_tick = 500;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case 1:</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    linkBad = fn(dev, timeout);</div><div class='del'>-	    if (linkBad &lt; 0) {</div><div class='del'>-		next_tick = linkBad &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (linkBad &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		    lp-&gt;local_state = 0;</div><div class='del'>-		    lp-&gt;media = next_state;</div><div class='del'>-		} else {</div><div class='del'>-		    de4x5_init_connection(dev);</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	} else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-	    lp-&gt;media = suspect_state;</div><div class='del'>-	    next_tick = 3000;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-de4x5_suspect_state(struct net_device *dev, int timeout, int prev_state,</div><div class='del'>-		      int (*fn)(struct net_device *, int),</div><div class='del'>-		      int (*asfn)(struct net_device *))</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-    int linkBad;</div><div class='del'>-</div><div class='del'>-    switch (lp-&gt;local_state) {</div><div class='del'>-    case 1:</div><div class='del'>-	if (lp-&gt;linkOK) {</div><div class='del'>-	    lp-&gt;media = prev_state;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;local_state++;</div><div class='del'>-	    next_tick = asfn(dev);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case 2:</div><div class='del'>-	linkBad = fn(dev, timeout);</div><div class='del'>-	if (linkBad &lt; 0) {</div><div class='del'>-	    next_tick = linkBad &amp; ~TIMER_CB;</div><div class='del'>-	} else if (!linkBad) {</div><div class='del'>-	    lp-&gt;local_state--;</div><div class='del'>-	    lp-&gt;media = prev_state;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;media = INIT;</div><div class='del'>-	    lp-&gt;tcount++;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Autoconfigure the media when using the DC21041. AUI needs to be tested</div><div class='del'>-** before BNC, because the BNC port will indicate activity if it's not</div><div class='del'>-** terminated correctly. The only way to test for that is to place a loopback</div><div class='del'>-** packet onto the network and watch for errors. Since we're messing with</div><div class='del'>-** the interrupt mask register, disable the board interrupts and do not allow</div><div class='del'>-** any more packets to be queued to the hardware. Re-enable everything only</div><div class='del'>-** when the media is found.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-dc21041_autoconf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 sts, irqs, irq_mask, imr, omr;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-</div><div class='del'>-    switch (lp-&gt;media) {</div><div class='del'>-    case INIT:</div><div class='del'>-	DISABLE_IRQs;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-	de4x5_save_skbs(dev);          /* Save non transmitted skb's */</div><div class='del'>-	if ((lp-&gt;autosense == AUTO) || (lp-&gt;autosense == TP_NW)) {</div><div class='del'>-	    lp-&gt;media = TP;            /* On chip auto negotiation is broken */</div><div class='del'>-	} else if (lp-&gt;autosense == TP) {</div><div class='del'>-	    lp-&gt;media = TP;</div><div class='del'>-	} else if (lp-&gt;autosense == BNC) {</div><div class='del'>-	    lp-&gt;media = BNC;</div><div class='del'>-	} else if (lp-&gt;autosense == AUI) {</div><div class='del'>-	    lp-&gt;media = AUI;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;media = NC;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;local_state = 0;</div><div class='del'>-	next_tick = dc21041_autoconf(dev);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case TP_NW:</div><div class='del'>-	if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	    omr = inl(DE4X5_OMR);/* Set up full duplex for the autonegotiate */</div><div class='del'>-	    outl(omr | OMR_FDX, DE4X5_OMR);</div><div class='del'>-	}</div><div class='del'>-	irqs = STS_LNF | STS_LNP;</div><div class='del'>-	irq_mask = IMR_LFM | IMR_LPM;</div><div class='del'>-	sts = test_media(dev, irqs, irq_mask, 0xef01, 0xffff, 0x0008, 2400);</div><div class='del'>-	if (sts &lt; 0) {</div><div class='del'>-	    next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	} else {</div><div class='del'>-	    if (sts &amp; STS_LNP) {</div><div class='del'>-		lp-&gt;media = ANS;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;media = AUI;</div><div class='del'>-	    }</div><div class='del'>-	    next_tick = dc21041_autoconf(dev);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case ANS:</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    irqs = STS_LNP;</div><div class='del'>-	    irq_mask = IMR_LPM;</div><div class='del'>-	    sts = test_ans(dev, irqs, irq_mask, 3000);</div><div class='del'>-	    if (sts &lt; 0) {</div><div class='del'>-		next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (!(sts &amp; STS_LNP) &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		    lp-&gt;media = TP;</div><div class='del'>-		    next_tick = dc21041_autoconf(dev);</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;local_state = 1;</div><div class='del'>-		    de4x5_init_connection(dev);</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	} else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-	    lp-&gt;media = ANS_SUSPECT;</div><div class='del'>-	    next_tick = 3000;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case ANS_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, ANS, test_tp, dc21041_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case TP:</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		omr = inl(DE4X5_OMR);          /* Set up half duplex for TP */</div><div class='del'>-		outl(omr &amp; ~OMR_FDX, DE4X5_OMR);</div><div class='del'>-	    }</div><div class='del'>-	    irqs = STS_LNF | STS_LNP;</div><div class='del'>-	    irq_mask = IMR_LFM | IMR_LPM;</div><div class='del'>-	    sts = test_media(dev,irqs, irq_mask, 0xef01, 0xff3f, 0x0008, 2400);</div><div class='del'>-	    if (sts &lt; 0) {</div><div class='del'>-		next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (!(sts &amp; STS_LNP) &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		    if (inl(DE4X5_SISR) &amp; SISR_NRA) {</div><div class='del'>-			lp-&gt;media = AUI;       /* Non selected port activity */</div><div class='del'>-		    } else {</div><div class='del'>-			lp-&gt;media = BNC;</div><div class='del'>-		    }</div><div class='del'>-		    next_tick = dc21041_autoconf(dev);</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;local_state = 1;</div><div class='del'>-		    de4x5_init_connection(dev);</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	} else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-	    lp-&gt;media = TP_SUSPECT;</div><div class='del'>-	    next_tick = 3000;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case TP_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, TP, test_tp, dc21041_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case AUI:</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		omr = inl(DE4X5_OMR);          /* Set up half duplex for AUI */</div><div class='del'>-		outl(omr &amp; ~OMR_FDX, DE4X5_OMR);</div><div class='del'>-	    }</div><div class='del'>-	    irqs = 0;</div><div class='del'>-	    irq_mask = 0;</div><div class='del'>-	    sts = test_media(dev,irqs, irq_mask, 0xef09, 0xf73d, 0x000e, 1000);</div><div class='del'>-	    if (sts &lt; 0) {</div><div class='del'>-		next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (!(inl(DE4X5_SISR) &amp; SISR_SRA) &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		    lp-&gt;media = BNC;</div><div class='del'>-		    next_tick = dc21041_autoconf(dev);</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;local_state = 1;</div><div class='del'>-		    de4x5_init_connection(dev);</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	} else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-	    lp-&gt;media = AUI_SUSPECT;</div><div class='del'>-	    next_tick = 3000;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case AUI_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, AUI, ping_media, dc21041_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC:</div><div class='del'>-	switch (lp-&gt;local_state) {</div><div class='del'>-	case 0:</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		omr = inl(DE4X5_OMR);          /* Set up half duplex for BNC */</div><div class='del'>-		outl(omr &amp; ~OMR_FDX, DE4X5_OMR);</div><div class='del'>-	    }</div><div class='del'>-	    irqs = 0;</div><div class='del'>-	    irq_mask = 0;</div><div class='del'>-	    sts = test_media(dev,irqs, irq_mask, 0xef09, 0xf73d, 0x0006, 1000);</div><div class='del'>-	    if (sts &lt; 0) {</div><div class='del'>-		next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;local_state++;             /* Ensure media connected */</div><div class='del'>-		next_tick = dc21041_autoconf(dev);</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-	    if (!lp-&gt;tx_enable) {</div><div class='del'>-		if ((sts = ping_media(dev, 3000)) &lt; 0) {</div><div class='del'>-		    next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-		} else {</div><div class='del'>-		    if (sts) {</div><div class='del'>-			lp-&gt;local_state = 0;</div><div class='del'>-			lp-&gt;media = NC;</div><div class='del'>-		    } else {</div><div class='del'>-			de4x5_init_connection(dev);</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-	    } else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		lp-&gt;media = BNC_SUSPECT;</div><div class='del'>-		next_tick = 3000;</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, BNC, ping_media, dc21041_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case NC:</div><div class='del'>-	omr = inl(DE4X5_OMR);    /* Set up full duplex for the autonegotiate */</div><div class='del'>-	outl(omr | OMR_FDX, DE4X5_OMR);</div><div class='del'>-	reset_init_sia(dev, 0xef01, 0xffff, 0x0008);/* Initialise the SIA */</div><div class='del'>-	if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	    de4x5_dbg_media(dev);</div><div class='del'>-	    lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Some autonegotiation chips are broken in that they do not return the</div><div class='del'>-** acknowledge bit (anlpa &amp; MII_ANLPA_ACK) in the link partner advertisement</div><div class='del'>-** register, except at the first power up negotiation.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-dc21140m_autoconf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int ana, anlpa, cap, cr, slnk, sr;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-    u_long imr, omr, iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    switch(lp-&gt;media) {</div><div class='del'>-    case INIT:</div><div class='del'>-        if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	    DISABLE_IRQs;</div><div class='del'>-	    lp-&gt;tx_enable = false;</div><div class='del'>-	    lp-&gt;linkOK = 0;</div><div class='del'>-	    de4x5_save_skbs(dev);          /* Save non transmitted skb's */</div><div class='del'>-	}</div><div class='del'>-	if ((next_tick = de4x5_reset_phy(dev)) &lt; 0) {</div><div class='del'>-	    next_tick &amp;= ~TIMER_CB;</div><div class='del'>-	} else {</div><div class='del'>-	    if (lp-&gt;useSROM) {</div><div class='del'>-		if (srom_map_media(dev) &lt; 0) {</div><div class='del'>-		    lp-&gt;tcount++;</div><div class='del'>-		    return next_tick;</div><div class='del'>-		}</div><div class='del'>-		srom_exec(dev, lp-&gt;phy[lp-&gt;active].gep);</div><div class='del'>-		if (lp-&gt;infoblock_media == ANS) {</div><div class='del'>-		    ana = lp-&gt;phy[lp-&gt;active].ana | MII_ANA_CSMA;</div><div class='del'>-		    mii_wr(ana, MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		}</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;tmp = MII_SR_ASSC;     /* Fake out the MII speed set */</div><div class='del'>-		SET_10Mb;</div><div class='del'>-		if (lp-&gt;autosense == _100Mb) {</div><div class='del'>-		    lp-&gt;media = _100Mb;</div><div class='del'>-		} else if (lp-&gt;autosense == _10Mb) {</div><div class='del'>-		    lp-&gt;media = _10Mb;</div><div class='del'>-		} else if ((lp-&gt;autosense == AUTO) &amp;&amp;</div><div class='del'>-			            ((sr=is_anc_capable(dev)) &amp; MII_SR_ANC)) {</div><div class='del'>-		    ana = (((sr &gt;&gt; 6) &amp; MII_ANA_TAF) | MII_ANA_CSMA);</div><div class='del'>-		    ana &amp;= (lp-&gt;fdx ? ~0 : ~MII_ANA_FDAM);</div><div class='del'>-		    mii_wr(ana, MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    lp-&gt;media = ANS;</div><div class='del'>-		} else if (lp-&gt;autosense == AUTO) {</div><div class='del'>-		    lp-&gt;media = SPD_DET;</div><div class='del'>-		} else if (is_spd_100(dev) &amp;&amp; is_100_up(dev)) {</div><div class='del'>-		    lp-&gt;media = _100Mb;</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;media = NC;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	    lp-&gt;local_state = 0;</div><div class='del'>-	    next_tick = dc21140m_autoconf(dev);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case ANS:</div><div class='del'>-	switch (lp-&gt;local_state) {</div><div class='del'>-	case 0:</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		mii_wr(MII_CR_ASSE | MII_CR_RAN, MII_CR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-	    }</div><div class='del'>-	    cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, false, 500);</div><div class='del'>-	    if (cr &lt; 0) {</div><div class='del'>-		next_tick = cr &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (cr) {</div><div class='del'>-		    lp-&gt;local_state = 0;</div><div class='del'>-		    lp-&gt;media = SPD_DET;</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;local_state++;</div><div class='del'>-		}</div><div class='del'>-		next_tick = dc21140m_autoconf(dev);</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-	    if ((sr=test_mii_reg(dev, MII_SR, MII_SR_ASSC, true, 2000)) &lt; 0) {</div><div class='del'>-		next_tick = sr &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;media = SPD_DET;</div><div class='del'>-		lp-&gt;local_state = 0;</div><div class='del'>-		if (sr) {                         /* Success! */</div><div class='del'>-		    lp-&gt;tmp = MII_SR_ASSC;</div><div class='del'>-		    anlpa = mii_rd(MII_ANLPA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    ana = mii_rd(MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    if (!(anlpa &amp; MII_ANLPA_RF) &amp;&amp;</div><div class='del'>-			 (cap = anlpa &amp; MII_ANLPA_TAF &amp; ana)) {</div><div class='del'>-			if (cap &amp; MII_ANA_100M) {</div><div class='del'>-			    lp-&gt;fdx = (ana &amp; anlpa &amp; MII_ANA_FDAM &amp; MII_ANA_100M) != 0;</div><div class='del'>-			    lp-&gt;media = _100Mb;</div><div class='del'>-			} else if (cap &amp; MII_ANA_10M) {</div><div class='del'>-			    lp-&gt;fdx = (ana &amp; anlpa &amp; MII_ANA_FDAM &amp; MII_ANA_10M) != 0;</div><div class='del'>-</div><div class='del'>-			    lp-&gt;media = _10Mb;</div><div class='del'>-			}</div><div class='del'>-		    }</div><div class='del'>-		}                       /* Auto Negotiation failed to finish */</div><div class='del'>-		next_tick = dc21140m_autoconf(dev);</div><div class='del'>-	    }                           /* Auto Negotiation failed to start */</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case SPD_DET:                              /* Choose 10Mb/s or 100Mb/s */</div><div class='del'>-        if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	    lp-&gt;tmp = (lp-&gt;phy[lp-&gt;active].id ? MII_SR_LKS :</div><div class='del'>-		                                  (~gep_rd(dev) &amp; GEP_LNP));</div><div class='del'>-	    SET_100Mb_PDET;</div><div class='del'>-	}</div><div class='del'>-        if ((slnk = test_for_100Mb(dev, 6500)) &lt; 0) {</div><div class='del'>-	    next_tick = slnk &amp; ~TIMER_CB;</div><div class='del'>-	} else {</div><div class='del'>-	    if (is_spd_100(dev) &amp;&amp; is_100_up(dev)) {</div><div class='del'>-		lp-&gt;media = _100Mb;</div><div class='del'>-	    } else if ((!is_spd_100(dev) &amp;&amp; (is_10_up(dev) &amp; lp-&gt;tmp))) {</div><div class='del'>-		lp-&gt;media = _10Mb;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;media = NC;</div><div class='del'>-	    }</div><div class='del'>-	    next_tick = dc21140m_autoconf(dev);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case _100Mb:                               /* Set 100Mb/s */</div><div class='del'>-        next_tick = 3000;</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    SET_100Mb;</div><div class='del'>-	    de4x5_init_connection(dev);</div><div class='del'>-	} else {</div><div class='del'>-	    if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		if (!is_100_up(dev) || (!lp-&gt;useSROM &amp;&amp; !is_spd_100(dev))) {</div><div class='del'>-		    lp-&gt;media = INIT;</div><div class='del'>-		    lp-&gt;tcount++;</div><div class='del'>-		    next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC:</div><div class='del'>-    case AUI:</div><div class='del'>-    case _10Mb:                                /* Set 10Mb/s */</div><div class='del'>-        next_tick = 3000;</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    SET_10Mb;</div><div class='del'>-	    de4x5_init_connection(dev);</div><div class='del'>-	} else {</div><div class='del'>-	    if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		if (!is_10_up(dev) || (!lp-&gt;useSROM &amp;&amp; is_spd_100(dev))) {</div><div class='del'>-		    lp-&gt;media = INIT;</div><div class='del'>-		    lp-&gt;tcount++;</div><div class='del'>-		    next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case NC:</div><div class='del'>-        if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	    de4x5_dbg_media(dev);</div><div class='del'>-	    lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This routine may be merged into dc21140m_autoconf() sometime as I'm</div><div class='del'>-** changing how I figure out the media - but trying to keep it backwards</div><div class='del'>-** compatible with the de500-xa and de500-aa.</div><div class='del'>-** Whether it's BNC, AUI, SYM or MII is sorted out in the infoblock</div><div class='del'>-** functions and set during de4x5_mac_port() and/or de4x5_reset_phy().</div><div class='del'>-** This routine just has to figure out whether 10Mb/s or 100Mb/s is</div><div class='del'>-** active.</div><div class='del'>-** When autonegotiation is working, the ANS part searches the SROM for</div><div class='del'>-** the highest common speed (TP) link that both can run and if that can</div><div class='del'>-** be full duplex. That infoblock is executed and then the link speed set.</div><div class='del'>-**</div><div class='del'>-** Only _10Mb and _100Mb are tested here.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-dc2114x_autoconf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 cr, anlpa, ana, cap, irqs, irq_mask, imr, omr, slnk, sr, sts;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-</div><div class='del'>-    switch (lp-&gt;media) {</div><div class='del'>-    case INIT:</div><div class='del'>-        if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	    DISABLE_IRQs;</div><div class='del'>-	    lp-&gt;tx_enable = false;</div><div class='del'>-	    lp-&gt;linkOK = 0;</div><div class='del'>-            lp-&gt;timeout = -1;</div><div class='del'>-	    de4x5_save_skbs(dev);            /* Save non transmitted skb's */</div><div class='del'>-	    if (lp-&gt;params.autosense &amp; ~AUTO) {</div><div class='del'>-		srom_map_media(dev);         /* Fixed media requested      */</div><div class='del'>-		if (lp-&gt;media != lp-&gt;params.autosense) {</div><div class='del'>-		    lp-&gt;tcount++;</div><div class='del'>-		    lp-&gt;media = INIT;</div><div class='del'>-		    return next_tick;</div><div class='del'>-		}</div><div class='del'>-		lp-&gt;media = INIT;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	if ((next_tick = de4x5_reset_phy(dev)) &lt; 0) {</div><div class='del'>-	    next_tick &amp;= ~TIMER_CB;</div><div class='del'>-	} else {</div><div class='del'>-	    if (lp-&gt;autosense == _100Mb) {</div><div class='del'>-		lp-&gt;media = _100Mb;</div><div class='del'>-	    } else if (lp-&gt;autosense == _10Mb) {</div><div class='del'>-		lp-&gt;media = _10Mb;</div><div class='del'>-	    } else if (lp-&gt;autosense == TP) {</div><div class='del'>-		lp-&gt;media = TP;</div><div class='del'>-	    } else if (lp-&gt;autosense == BNC) {</div><div class='del'>-		lp-&gt;media = BNC;</div><div class='del'>-	    } else if (lp-&gt;autosense == AUI) {</div><div class='del'>-		lp-&gt;media = AUI;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;media = SPD_DET;</div><div class='del'>-		if ((lp-&gt;infoblock_media == ANS) &amp;&amp;</div><div class='del'>-		                    ((sr=is_anc_capable(dev)) &amp; MII_SR_ANC)) {</div><div class='del'>-		    ana = (((sr &gt;&gt; 6) &amp; MII_ANA_TAF) | MII_ANA_CSMA);</div><div class='del'>-		    ana &amp;= (lp-&gt;fdx ? ~0 : ~MII_ANA_FDAM);</div><div class='del'>-		    mii_wr(ana, MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    lp-&gt;media = ANS;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	    lp-&gt;local_state = 0;</div><div class='del'>-	    next_tick = dc2114x_autoconf(dev);</div><div class='del'>-        }</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case ANS:</div><div class='del'>-	switch (lp-&gt;local_state) {</div><div class='del'>-	case 0:</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		mii_wr(MII_CR_ASSE | MII_CR_RAN, MII_CR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-	    }</div><div class='del'>-	    cr = test_mii_reg(dev, MII_CR, MII_CR_RAN, false, 500);</div><div class='del'>-	    if (cr &lt; 0) {</div><div class='del'>-		next_tick = cr &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (cr) {</div><div class='del'>-		    lp-&gt;local_state = 0;</div><div class='del'>-		    lp-&gt;media = SPD_DET;</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;local_state++;</div><div class='del'>-		}</div><div class='del'>-		next_tick = dc2114x_autoconf(dev);</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-	    sr = test_mii_reg(dev, MII_SR, MII_SR_ASSC, true, 2000);</div><div class='del'>-	    if (sr &lt; 0) {</div><div class='del'>-		next_tick = sr &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;media = SPD_DET;</div><div class='del'>-		lp-&gt;local_state = 0;</div><div class='del'>-		if (sr) {                         /* Success! */</div><div class='del'>-		    lp-&gt;tmp = MII_SR_ASSC;</div><div class='del'>-		    anlpa = mii_rd(MII_ANLPA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    ana = mii_rd(MII_ANA, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-		    if (!(anlpa &amp; MII_ANLPA_RF) &amp;&amp;</div><div class='del'>-			 (cap = anlpa &amp; MII_ANLPA_TAF &amp; ana)) {</div><div class='del'>-			if (cap &amp; MII_ANA_100M) {</div><div class='del'>-			    lp-&gt;fdx = (ana &amp; anlpa &amp; MII_ANA_FDAM &amp; MII_ANA_100M) != 0;</div><div class='del'>-			    lp-&gt;media = _100Mb;</div><div class='del'>-			} else if (cap &amp; MII_ANA_10M) {</div><div class='del'>-			    lp-&gt;fdx = (ana &amp; anlpa &amp; MII_ANA_FDAM &amp; MII_ANA_10M) != 0;</div><div class='del'>-			    lp-&gt;media = _10Mb;</div><div class='del'>-			}</div><div class='del'>-		    }</div><div class='del'>-		}                       /* Auto Negotiation failed to finish */</div><div class='del'>-		next_tick = dc2114x_autoconf(dev);</div><div class='del'>-	    }                           /* Auto Negotiation failed to start  */</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case AUI:</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		omr = inl(DE4X5_OMR);   /* Set up half duplex for AUI        */</div><div class='del'>-		outl(omr &amp; ~OMR_FDX, DE4X5_OMR);</div><div class='del'>-	    }</div><div class='del'>-	    irqs = 0;</div><div class='del'>-	    irq_mask = 0;</div><div class='del'>-	    sts = test_media(dev,irqs, irq_mask, 0, 0, 0, 1000);</div><div class='del'>-	    if (sts &lt; 0) {</div><div class='del'>-		next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		if (!(inl(DE4X5_SISR) &amp; SISR_SRA) &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		    lp-&gt;media = BNC;</div><div class='del'>-		    next_tick = dc2114x_autoconf(dev);</div><div class='del'>-		} else {</div><div class='del'>-		    lp-&gt;local_state = 1;</div><div class='del'>-		    de4x5_init_connection(dev);</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	} else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-	    lp-&gt;media = AUI_SUSPECT;</div><div class='del'>-	    next_tick = 3000;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case AUI_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, AUI, ping_media, dc2114x_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC:</div><div class='del'>-	switch (lp-&gt;local_state) {</div><div class='del'>-	case 0:</div><div class='del'>-	    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-		omr = inl(DE4X5_OMR);          /* Set up half duplex for BNC */</div><div class='del'>-		outl(omr &amp; ~OMR_FDX, DE4X5_OMR);</div><div class='del'>-	    }</div><div class='del'>-	    irqs = 0;</div><div class='del'>-	    irq_mask = 0;</div><div class='del'>-	    sts = test_media(dev,irqs, irq_mask, 0, 0, 0, 1000);</div><div class='del'>-	    if (sts &lt; 0) {</div><div class='del'>-		next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-	    } else {</div><div class='del'>-		lp-&gt;local_state++;             /* Ensure media connected */</div><div class='del'>-		next_tick = dc2114x_autoconf(dev);</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-	    if (!lp-&gt;tx_enable) {</div><div class='del'>-		if ((sts = ping_media(dev, 3000)) &lt; 0) {</div><div class='del'>-		    next_tick = sts &amp; ~TIMER_CB;</div><div class='del'>-		} else {</div><div class='del'>-		    if (sts) {</div><div class='del'>-			lp-&gt;local_state = 0;</div><div class='del'>-			lp-&gt;tcount++;</div><div class='del'>-			lp-&gt;media = INIT;</div><div class='del'>-		    } else {</div><div class='del'>-			de4x5_init_connection(dev);</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-	    } else if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		lp-&gt;media = BNC_SUSPECT;</div><div class='del'>-		next_tick = 3000;</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case BNC_SUSPECT:</div><div class='del'>-	next_tick = de4x5_suspect_state(dev, 1000, BNC, ping_media, dc2114x_autoconf);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case SPD_DET:                              /* Choose 10Mb/s or 100Mb/s */</div><div class='del'>-	  if (srom_map_media(dev) &lt; 0) {</div><div class='del'>-	      lp-&gt;tcount++;</div><div class='del'>-	      lp-&gt;media = INIT;</div><div class='del'>-	      return next_tick;</div><div class='del'>-	  }</div><div class='del'>-	  if (lp-&gt;media == _100Mb) {</div><div class='del'>-	      if ((slnk = test_for_100Mb(dev, 6500)) &lt; 0) {</div><div class='del'>-		  lp-&gt;media = SPD_DET;</div><div class='del'>-		  return slnk &amp; ~TIMER_CB;</div><div class='del'>-	      }</div><div class='del'>-	  } else {</div><div class='del'>-	      if (wait_for_link(dev) &lt; 0) {</div><div class='del'>-		  lp-&gt;media = SPD_DET;</div><div class='del'>-		  return PDET_LINK_WAIT;</div><div class='del'>-	      }</div><div class='del'>-	  }</div><div class='del'>-	  if (lp-&gt;media == ANS) {           /* Do MII parallel detection */</div><div class='del'>-	      if (is_spd_100(dev)) {</div><div class='del'>-		  lp-&gt;media = _100Mb;</div><div class='del'>-	      } else {</div><div class='del'>-		  lp-&gt;media = _10Mb;</div><div class='del'>-	      }</div><div class='del'>-	      next_tick = dc2114x_autoconf(dev);</div><div class='del'>-	  } else if (((lp-&gt;media == _100Mb) &amp;&amp; is_100_up(dev)) ||</div><div class='del'>-		     (((lp-&gt;media == _10Mb) || (lp-&gt;media == TP) ||</div><div class='del'>-		       (lp-&gt;media == BNC)   || (lp-&gt;media == AUI)) &amp;&amp;</div><div class='del'>-		      is_10_up(dev))) {</div><div class='del'>-	      next_tick = dc2114x_autoconf(dev);</div><div class='del'>-	  } else {</div><div class='del'>-	      lp-&gt;tcount++;</div><div class='del'>-	      lp-&gt;media = INIT;</div><div class='del'>-	  }</div><div class='del'>-	  break;</div><div class='del'>-</div><div class='del'>-    case _10Mb:</div><div class='del'>-        next_tick = 3000;</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    SET_10Mb;</div><div class='del'>-	    de4x5_init_connection(dev);</div><div class='del'>-	} else {</div><div class='del'>-	    if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		if (!is_10_up(dev) || (!lp-&gt;useSROM &amp;&amp; is_spd_100(dev))) {</div><div class='del'>-		    lp-&gt;media = INIT;</div><div class='del'>-		    lp-&gt;tcount++;</div><div class='del'>-		    next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case _100Mb:</div><div class='del'>-        next_tick = 3000;</div><div class='del'>-	if (!lp-&gt;tx_enable) {</div><div class='del'>-	    SET_100Mb;</div><div class='del'>-	    de4x5_init_connection(dev);</div><div class='del'>-	} else {</div><div class='del'>-	    if (!lp-&gt;linkOK &amp;&amp; (lp-&gt;autosense == AUTO)) {</div><div class='del'>-		if (!is_100_up(dev) || (!lp-&gt;useSROM &amp;&amp; !is_spd_100(dev))) {</div><div class='del'>-		    lp-&gt;media = INIT;</div><div class='del'>-		    lp-&gt;tcount++;</div><div class='del'>-		    next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    default:</div><div class='del'>-	lp-&gt;tcount++;</div><div class='del'>-printk("Huh?: media:%02x\n", lp-&gt;media);</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-srom_autoconf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    return lp-&gt;infoleaf_fn(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This mapping keeps the original media codes and FDX flag unchanged.</div><div class='del'>-** While it isn't strictly necessary, it helps me for the moment...</div><div class='del'>-** The early return avoids a media state / SROM media space clash.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-srom_map_media(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    lp-&gt;fdx = false;</div><div class='del'>-    if (lp-&gt;infoblock_media == lp-&gt;media)</div><div class='del'>-      return 0;</div><div class='del'>-</div><div class='del'>-    switch(lp-&gt;infoblock_media) {</div><div class='del'>-      case SROM_10BASETF:</div><div class='del'>-	if (!lp-&gt;params.fdx) return -1;</div><div class='del'>-	lp-&gt;fdx = true;</div><div class='del'>-	/* fall through */</div><div class='del'>-</div><div class='del'>-      case SROM_10BASET:</div><div class='del'>-	if (lp-&gt;params.fdx &amp;&amp; !lp-&gt;fdx) return -1;</div><div class='del'>-	if ((lp-&gt;chipset == DC21140) || ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x)) {</div><div class='del'>-	    lp-&gt;media = _10Mb;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;media = TP;</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case SROM_10BASE2:</div><div class='del'>-	lp-&gt;media = BNC;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case SROM_10BASE5:</div><div class='del'>-	lp-&gt;media = AUI;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case SROM_100BASETF:</div><div class='del'>-        if (!lp-&gt;params.fdx) return -1;</div><div class='del'>-	lp-&gt;fdx = true;</div><div class='del'>-	/* fall through */</div><div class='del'>-</div><div class='del'>-      case SROM_100BASET:</div><div class='del'>-	if (lp-&gt;params.fdx &amp;&amp; !lp-&gt;fdx) return -1;</div><div class='del'>-	lp-&gt;media = _100Mb;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case SROM_100BASET4:</div><div class='del'>-	lp-&gt;media = _100Mb;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case SROM_100BASEFF:</div><div class='del'>-	if (!lp-&gt;params.fdx) return -1;</div><div class='del'>-	lp-&gt;fdx = true;</div><div class='del'>-	/* fall through */</div><div class='del'>-</div><div class='del'>-      case SROM_100BASEF:</div><div class='del'>-	if (lp-&gt;params.fdx &amp;&amp; !lp-&gt;fdx) return -1;</div><div class='del'>-	lp-&gt;media = _100Mb;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case ANS:</div><div class='del'>-	lp-&gt;media = ANS;</div><div class='del'>-	lp-&gt;fdx = lp-&gt;params.fdx;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      default:</div><div class='del'>-	printk("%s: Bad media code [%d] detected in SROM!\n", dev-&gt;name,</div><div class='del'>-	                                                  lp-&gt;infoblock_media);</div><div class='del'>-	return -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_init_connection(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    u_long flags = 0;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-        de4x5_dbg_media(dev);</div><div class='del'>-	lp-&gt;c_media = lp-&gt;media;          /* Stop scrolling media messages */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-    de4x5_rst_desc_ring(dev);</div><div class='del'>-    de4x5_setup_intr(dev);</div><div class='del'>-    lp-&gt;tx_enable = true;</div><div class='del'>-    spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-    outl(POLL_DEMAND, DE4X5_TPD);</div><div class='del'>-</div><div class='del'>-    netif_wake_queue(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** General PHY reset function. Some MII devices don't reset correctly</div><div class='del'>-** since their MII address pins can float at voltages that are dependent</div><div class='del'>-** on the signal pin use. Do a double reset to ensure a reset.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-de4x5_reset_phy(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int next_tick = 0;</div><div class='del'>-</div><div class='del'>-    if ((lp-&gt;useSROM) || (lp-&gt;phy[lp-&gt;active].id)) {</div><div class='del'>-	if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	    if (lp-&gt;useSROM) {</div><div class='del'>-		if (lp-&gt;phy[lp-&gt;active].rst) {</div><div class='del'>-		    srom_exec(dev, lp-&gt;phy[lp-&gt;active].rst);</div><div class='del'>-		    srom_exec(dev, lp-&gt;phy[lp-&gt;active].rst);</div><div class='del'>-		} else if (lp-&gt;rst) {          /* Type 5 infoblock reset */</div><div class='del'>-		    srom_exec(dev, lp-&gt;rst);</div><div class='del'>-		    srom_exec(dev, lp-&gt;rst);</div><div class='del'>-		}</div><div class='del'>-	    } else {</div><div class='del'>-		PHY_HARD_RESET;</div><div class='del'>-	    }</div><div class='del'>-	    if (lp-&gt;useMII) {</div><div class='del'>-	        mii_wr(MII_CR_RST, MII_CR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-	if (lp-&gt;useMII) {</div><div class='del'>-	    next_tick = test_mii_reg(dev, MII_CR, MII_CR_RST, false, 500);</div><div class='del'>-	}</div><div class='del'>-    } else if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	PHY_HARD_RESET;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-test_media(struct net_device *dev, s32 irqs, s32 irq_mask, s32 csr13, s32 csr14, s32 csr15, s32 msec)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 sts, csr12;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	lp-&gt;timeout = msec/100;</div><div class='del'>-	if (!lp-&gt;useSROM) {      /* Already done if by SROM, else dc2104[01] */</div><div class='del'>-	    reset_init_sia(dev, csr13, csr14, csr15);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* set up the interrupt mask */</div><div class='del'>-	outl(irq_mask, DE4X5_IMR);</div><div class='del'>-</div><div class='del'>-	/* clear all pending interrupts */</div><div class='del'>-	sts = inl(DE4X5_STS);</div><div class='del'>-	outl(sts, DE4X5_STS);</div><div class='del'>-</div><div class='del'>-	/* clear csr12 NRA and SRA bits */</div><div class='del'>-	if ((lp-&gt;chipset == DC21041) || lp-&gt;useSROM) {</div><div class='del'>-	    csr12 = inl(DE4X5_SISR);</div><div class='del'>-	    outl(csr12, DE4X5_SISR);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    sts = inl(DE4X5_STS) &amp; ~TIMER_CB;</div><div class='del'>-</div><div class='del'>-    if (!(sts &amp; irqs) &amp;&amp; --lp-&gt;timeout) {</div><div class='del'>-	sts = 100 | TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return sts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-test_tp(struct net_device *dev, s32 msec)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int sisr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	lp-&gt;timeout = msec/100;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    sisr = (inl(DE4X5_SISR) &amp; ~TIMER_CB) &amp; (SISR_LKF | SISR_NCR);</div><div class='del'>-</div><div class='del'>-    if (sisr &amp;&amp; --lp-&gt;timeout) {</div><div class='del'>-	sisr = 100 | TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return sisr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Samples the 100Mb Link State Signal. The sample interval is important</div><div class='del'>-** because too fast a rate can give erroneous results and confuse the</div><div class='del'>-** speed sense algorithm.</div><div class='del'>-*/</div><div class='del'>-#define SAMPLE_INTERVAL 500  /* ms */</div><div class='del'>-#define SAMPLE_DELAY    2000 /* ms */</div><div class='del'>-static int</div><div class='del'>-test_for_100Mb(struct net_device *dev, int msec)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int gep = 0, ret = ((lp-&gt;chipset &amp; ~0x00ff)==DC2114x? -1 :GEP_SLNK);</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	if ((msec/SAMPLE_INTERVAL) &lt;= 0) return 0;</div><div class='del'>-	if (msec &gt; SAMPLE_DELAY) {</div><div class='del'>-	    lp-&gt;timeout = (msec - SAMPLE_DELAY)/SAMPLE_INTERVAL;</div><div class='del'>-	    gep = SAMPLE_DELAY | TIMER_CB;</div><div class='del'>-	    return gep;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;timeout = msec/SAMPLE_INTERVAL;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;phy[lp-&gt;active].id || lp-&gt;useSROM) {</div><div class='del'>-	gep = is_100_up(dev) | is_spd_100(dev);</div><div class='del'>-    } else {</div><div class='del'>-	gep = (~gep_rd(dev) &amp; (GEP_SLNK | GEP_LNP));</div><div class='del'>-    }</div><div class='del'>-    if (!(gep &amp; ret) &amp;&amp; --lp-&gt;timeout) {</div><div class='del'>-	gep = SAMPLE_INTERVAL | TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return gep;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-wait_for_link(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	lp-&gt;timeout = 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout--) {</div><div class='del'>-	return TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**</div><div class='del'>-**</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-test_mii_reg(struct net_device *dev, int reg, int mask, bool pol, long msec)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int test;</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	lp-&gt;timeout = msec/100;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    reg = mii_rd((u_char)reg, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII) &amp; mask;</div><div class='del'>-    test = (reg ^ (pol ? ~0 : 0)) &amp; mask;</div><div class='del'>-</div><div class='del'>-    if (test &amp;&amp; --lp-&gt;timeout) {</div><div class='del'>-	reg = 100 | TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return reg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-is_spd_100(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int spd;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;useMII) {</div><div class='del'>-	spd = mii_rd(lp-&gt;phy[lp-&gt;active].spd.reg, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-	spd = ~(spd ^ lp-&gt;phy[lp-&gt;active].spd.value);</div><div class='del'>-	spd &amp;= lp-&gt;phy[lp-&gt;active].spd.mask;</div><div class='del'>-    } else if (!lp-&gt;useSROM) {                      /* de500-xa */</div><div class='del'>-	spd = ((~gep_rd(dev)) &amp; GEP_SLNK);</div><div class='del'>-    } else {</div><div class='del'>-	if ((lp-&gt;ibn == 2) || !lp-&gt;asBitValid)</div><div class='del'>-	    return (lp-&gt;chipset == DC21143) ? (~inl(DE4X5_SISR)&amp;SISR_LS100) : 0;</div><div class='del'>-</div><div class='del'>-	spd = (lp-&gt;asBitValid &amp; (lp-&gt;asPolarity ^ (gep_rd(dev) &amp; lp-&gt;asBit))) |</div><div class='del'>-	          (lp-&gt;linkOK &amp; ~lp-&gt;asBitValid);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return spd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-is_100_up(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;useMII) {</div><div class='del'>-	/* Double read for sticky bits &amp; temporary drops */</div><div class='del'>-	mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-	return mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII) &amp; MII_SR_LKS;</div><div class='del'>-    } else if (!lp-&gt;useSROM) {                       /* de500-xa */</div><div class='del'>-	return (~gep_rd(dev)) &amp; GEP_SLNK;</div><div class='del'>-    } else {</div><div class='del'>-	if ((lp-&gt;ibn == 2) || !lp-&gt;asBitValid)</div><div class='del'>-	    return (lp-&gt;chipset == DC21143) ? (~inl(DE4X5_SISR)&amp;SISR_LS100) : 0;</div><div class='del'>-</div><div class='del'>-        return (lp-&gt;asBitValid&amp;(lp-&gt;asPolarity^(gep_rd(dev)&amp;lp-&gt;asBit))) |</div><div class='del'>-		(lp-&gt;linkOK &amp; ~lp-&gt;asBitValid);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-is_10_up(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;useMII) {</div><div class='del'>-	/* Double read for sticky bits &amp; temporary drops */</div><div class='del'>-	mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-	return mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII) &amp; MII_SR_LKS;</div><div class='del'>-    } else if (!lp-&gt;useSROM) {                       /* de500-xa */</div><div class='del'>-	return (~gep_rd(dev)) &amp; GEP_LNP;</div><div class='del'>-    } else {</div><div class='del'>-	if ((lp-&gt;ibn == 2) || !lp-&gt;asBitValid)</div><div class='del'>-	    return ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) ?</div><div class='del'>-		    (~inl(DE4X5_SISR)&amp;SISR_LS10):</div><div class='del'>-		    0;</div><div class='del'>-</div><div class='del'>-	return	(lp-&gt;asBitValid&amp;(lp-&gt;asPolarity^(gep_rd(dev)&amp;lp-&gt;asBit))) |</div><div class='del'>-		(lp-&gt;linkOK &amp; ~lp-&gt;asBitValid);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-is_anc_capable(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;phy[lp-&gt;active].id &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {</div><div class='del'>-	return mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);</div><div class='del'>-    } else if ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) {</div><div class='del'>-	return (inl(DE4X5_SISR) &amp; SISR_LPN) &gt;&gt; 12;</div><div class='del'>-    } else {</div><div class='del'>-	return 0;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Send a packet onto the media and watch for send errors that indicate the</div><div class='del'>-** media is bad or unconnected.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-ping_media(struct net_device *dev, int msec)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int sisr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	lp-&gt;timeout = msec/100;</div><div class='del'>-</div><div class='del'>-	lp-&gt;tmp = lp-&gt;tx_new;                /* Remember the ring position */</div><div class='del'>-	load_packet(dev, lp-&gt;frame, TD_LS | TD_FS | sizeof(lp-&gt;frame), (struct sk_buff *)1);</div><div class='del'>-	lp-&gt;tx_new = (lp-&gt;tx_new + 1) % lp-&gt;txRingSize;</div><div class='del'>-	outl(POLL_DEMAND, DE4X5_TPD);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    sisr = inl(DE4X5_SISR);</div><div class='del'>-</div><div class='del'>-    if ((!(sisr &amp; SISR_NCR)) &amp;&amp;</div><div class='del'>-	((s32)le32_to_cpu(lp-&gt;tx_ring[lp-&gt;tmp].status) &lt; 0) &amp;&amp;</div><div class='del'>-	 (--lp-&gt;timeout)) {</div><div class='del'>-	sisr = 100 | TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	if ((!(sisr &amp; SISR_NCR)) &amp;&amp;</div><div class='del'>-	    !(le32_to_cpu(lp-&gt;tx_ring[lp-&gt;tmp].status) &amp; (T_OWN | TD_ES)) &amp;&amp;</div><div class='del'>-	    lp-&gt;timeout) {</div><div class='del'>-	    sisr = 0;</div><div class='del'>-	} else {</div><div class='del'>-	    sisr = 1;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return sisr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This function does 2 things: on Intels it kmalloc's another buffer to</div><div class='del'>-** replace the one about to be passed up. On Alpha's it kmallocs a buffer</div><div class='del'>-** into which the packet is copied.</div><div class='del'>-*/</div><div class='del'>-static struct sk_buff *</div><div class='del'>-de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct sk_buff *p;</div><div class='del'>-</div><div class='del'>-#if !defined(__alpha__) &amp;&amp; !defined(__powerpc__) &amp;&amp; !defined(CONFIG_SPARC) &amp;&amp; !defined(DE4X5_DO_MEMCPY)</div><div class='del'>-    struct sk_buff *ret;</div><div class='del'>-    u_long i=0, tmp;</div><div class='del'>-</div><div class='del'>-    p = netdev_alloc_skb(dev, IEEE802_3_SZ + DE4X5_ALIGN + 2);</div><div class='del'>-    if (!p) return NULL;</div><div class='del'>-</div><div class='del'>-    tmp = virt_to_bus(p-&gt;data);</div><div class='del'>-    i = ((tmp + DE4X5_ALIGN) &amp; ~DE4X5_ALIGN) - tmp;</div><div class='del'>-    skb_reserve(p, i);</div><div class='del'>-    lp-&gt;rx_ring[index].buf = cpu_to_le32(tmp + i);</div><div class='del'>-</div><div class='del'>-    ret = lp-&gt;rx_skb[index];</div><div class='del'>-    lp-&gt;rx_skb[index] = p;</div><div class='del'>-</div><div class='del'>-    if ((u_long) ret &gt; 1) {</div><div class='del'>-	skb_put(ret, len);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return ret;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-    if (lp-&gt;state != OPEN) return (struct sk_buff *)1; /* Fake out the open */</div><div class='del'>-</div><div class='del'>-    p = netdev_alloc_skb(dev, len + 2);</div><div class='del'>-    if (!p) return NULL;</div><div class='del'>-</div><div class='del'>-    skb_reserve(p, 2);	                               /* Align */</div><div class='del'>-    if (index &lt; lp-&gt;rx_old) {                          /* Wrapped buffer */</div><div class='del'>-	short tlen = (lp-&gt;rxRingSize - lp-&gt;rx_old) * RX_BUFF_SZ;</div><div class='del'>-	skb_put_data(p, lp-&gt;rx_bufs + lp-&gt;rx_old * RX_BUFF_SZ, tlen);</div><div class='del'>-	skb_put_data(p, lp-&gt;rx_bufs, len - tlen);</div><div class='del'>-    } else {                                           /* Linear buffer */</div><div class='del'>-	skb_put_data(p, lp-&gt;rx_bufs + lp-&gt;rx_old * RX_BUFF_SZ, len);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return p;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_free_rx_buffs(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;lp-&gt;rxRingSize; i++) {</div><div class='del'>-	if ((u_long) lp-&gt;rx_skb[i] &gt; 1) {</div><div class='del'>-	    dev_kfree_skb(lp-&gt;rx_skb[i]);</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;rx_ring[i].status = 0;</div><div class='del'>-	lp-&gt;rx_skb[i] = (struct sk_buff *)1;    /* Dummy entry */</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_free_tx_buffs(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;lp-&gt;txRingSize; i++) {</div><div class='del'>-	if (lp-&gt;tx_skb[i])</div><div class='del'>-	    de4x5_free_tx_buff(lp, i);</div><div class='del'>-	lp-&gt;tx_ring[i].status = 0;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Unload the locally queued packets */</div><div class='del'>-    __skb_queue_purge(&amp;lp-&gt;cache.queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** When a user pulls a connection, the DECchip can end up in a</div><div class='del'>-** 'running - waiting for end of transmission' state. This means that we</div><div class='del'>-** have to perform a chip soft reset to ensure that we can synchronize</div><div class='del'>-** the hardware and software and make any media probes using a loopback</div><div class='del'>-** packet meaningful.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-de4x5_save_skbs(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 omr;</div><div class='del'>-</div><div class='del'>-    if (!lp-&gt;cache.save_cnt) {</div><div class='del'>-	STOP_DE4X5;</div><div class='del'>-	de4x5_tx(dev);                          /* Flush any sent skb's */</div><div class='del'>-	de4x5_free_tx_buffs(dev);</div><div class='del'>-	de4x5_cache_state(dev, DE4X5_SAVE_STATE);</div><div class='del'>-	de4x5_sw_reset(dev);</div><div class='del'>-	de4x5_cache_state(dev, DE4X5_RESTORE_STATE);</div><div class='del'>-	lp-&gt;cache.save_cnt++;</div><div class='del'>-	START_DE4X5;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_rst_desc_ring(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int i;</div><div class='del'>-    s32 omr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;cache.save_cnt) {</div><div class='del'>-	STOP_DE4X5;</div><div class='del'>-	outl(lp-&gt;dma_rings, DE4X5_RRBA);</div><div class='del'>-	outl(lp-&gt;dma_rings + NUM_RX_DESC * sizeof(struct de4x5_desc),</div><div class='del'>-	     DE4X5_TRBA);</div><div class='del'>-</div><div class='del'>-	lp-&gt;rx_new = lp-&gt;rx_old = 0;</div><div class='del'>-	lp-&gt;tx_new = lp-&gt;tx_old = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; lp-&gt;rxRingSize; i++) {</div><div class='del'>-	    lp-&gt;rx_ring[i].status = cpu_to_le32(R_OWN);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; lp-&gt;txRingSize; i++) {</div><div class='del'>-	    lp-&gt;tx_ring[i].status = cpu_to_le32(0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	barrier();</div><div class='del'>-	lp-&gt;cache.save_cnt--;</div><div class='del'>-	START_DE4X5;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_cache_state(struct net_device *dev, int flag)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    switch(flag) {</div><div class='del'>-      case DE4X5_SAVE_STATE:</div><div class='del'>-	lp-&gt;cache.csr0 = inl(DE4X5_BMR);</div><div class='del'>-	lp-&gt;cache.csr6 = (inl(DE4X5_OMR) &amp; ~(OMR_ST | OMR_SR));</div><div class='del'>-	lp-&gt;cache.csr7 = inl(DE4X5_IMR);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-      case DE4X5_RESTORE_STATE:</div><div class='del'>-	outl(lp-&gt;cache.csr0, DE4X5_BMR);</div><div class='del'>-	outl(lp-&gt;cache.csr6, DE4X5_OMR);</div><div class='del'>-	outl(lp-&gt;cache.csr7, DE4X5_IMR);</div><div class='del'>-	if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	    gep_wr(lp-&gt;cache.gepc, dev);</div><div class='del'>-	    gep_wr(lp-&gt;cache.gep, dev);</div><div class='del'>-	} else {</div><div class='del'>-	    reset_init_sia(dev, lp-&gt;cache.csr13, lp-&gt;cache.csr14,</div><div class='del'>-			                                      lp-&gt;cache.csr15);</div><div class='del'>-	}</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_put_cache(struct net_device *dev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    __skb_queue_tail(&amp;lp-&gt;cache.queue, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_putb_cache(struct net_device *dev, struct sk_buff *skb)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    __skb_queue_head(&amp;lp-&gt;cache.queue, skb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct sk_buff *</div><div class='del'>-de4x5_get_cache(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    return __skb_dequeue(&amp;lp-&gt;cache.queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Check the Auto Negotiation State. Return OK when a link pass interrupt</div><div class='del'>-** is received and the auto-negotiation status is NWAY OK.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-test_ans(struct net_device *dev, s32 irqs, s32 irq_mask, s32 msec)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 sts, ans;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;timeout &lt; 0) {</div><div class='del'>-	lp-&gt;timeout = msec/100;</div><div class='del'>-	outl(irq_mask, DE4X5_IMR);</div><div class='del'>-</div><div class='del'>-	/* clear all pending interrupts */</div><div class='del'>-	sts = inl(DE4X5_STS);</div><div class='del'>-	outl(sts, DE4X5_STS);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    ans = inl(DE4X5_SISR) &amp; SISR_ANS;</div><div class='del'>-    sts = inl(DE4X5_STS) &amp; ~TIMER_CB;</div><div class='del'>-</div><div class='del'>-    if (!(sts &amp; irqs) &amp;&amp; (ans ^ ANS_NWOK) &amp;&amp; --lp-&gt;timeout) {</div><div class='del'>-	sts = 100 | TIMER_CB;</div><div class='del'>-    } else {</div><div class='del'>-	lp-&gt;timeout = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return sts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_setup_intr(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 imr, sts;</div><div class='del'>-</div><div class='del'>-    if (inl(DE4X5_OMR) &amp; OMR_SR) {   /* Only unmask if TX/RX is enabled */</div><div class='del'>-	imr = 0;</div><div class='del'>-	UNMASK_IRQs;</div><div class='del'>-	sts = inl(DE4X5_STS);        /* Reset any pending (stale) interrupts */</div><div class='del'>-	outl(sts, DE4X5_STS);</div><div class='del'>-	ENABLE_IRQs;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-**</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-reset_init_sia(struct net_device *dev, s32 csr13, s32 csr14, s32 csr15)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    RESET_SIA;</div><div class='del'>-    if (lp-&gt;useSROM) {</div><div class='del'>-	if (lp-&gt;ibn == 3) {</div><div class='del'>-	    srom_exec(dev, lp-&gt;phy[lp-&gt;active].rst);</div><div class='del'>-	    srom_exec(dev, lp-&gt;phy[lp-&gt;active].gep);</div><div class='del'>-	    outl(1, DE4X5_SICR);</div><div class='del'>-	    return;</div><div class='del'>-	} else {</div><div class='del'>-	    csr15 = lp-&gt;cache.csr15;</div><div class='del'>-	    csr14 = lp-&gt;cache.csr14;</div><div class='del'>-	    csr13 = lp-&gt;cache.csr13;</div><div class='del'>-	    outl(csr15 | lp-&gt;cache.gepc, DE4X5_SIGR);</div><div class='del'>-	    outl(csr15 | lp-&gt;cache.gep, DE4X5_SIGR);</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	outl(csr15, DE4X5_SIGR);</div><div class='del'>-    }</div><div class='del'>-    outl(csr14, DE4X5_STRR);</div><div class='del'>-    outl(csr13, DE4X5_SICR);</div><div class='del'>-</div><div class='del'>-    mdelay(10);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Create a loopback ethernet packet</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-create_packet(struct net_device *dev, char *frame, int len)</div><div class='del'>-{</div><div class='del'>-    int i;</div><div class='del'>-    char *buf = frame;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;ETH_ALEN; i++) {             /* Use this source address */</div><div class='del'>-	*buf++ = dev-&gt;dev_addr[i];</div><div class='del'>-    }</div><div class='del'>-    for (i=0; i&lt;ETH_ALEN; i++) {             /* Use this destination address */</div><div class='del'>-	*buf++ = dev-&gt;dev_addr[i];</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    *buf++ = 0;                              /* Packet length (2 bytes) */</div><div class='del'>-    *buf++ = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Look for a particular board name in the EISA configuration space</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-EISA_signature(char *name, struct device *device)</div><div class='del'>-{</div><div class='del'>-    int i, status = 0, siglen = ARRAY_SIZE(de4x5_signatures);</div><div class='del'>-    struct eisa_device *edev;</div><div class='del'>-</div><div class='del'>-    *name = '\0';</div><div class='del'>-    edev = to_eisa_device (device);</div><div class='del'>-    i = edev-&gt;id.driver_data;</div><div class='del'>-</div><div class='del'>-    if (i &gt;= 0 &amp;&amp; i &lt; siglen) {</div><div class='del'>-	    strcpy (name, de4x5_signatures[i]);</div><div class='del'>-	    status = 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return status;                         /* return the device name string */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Look for a particular board name in the PCI configuration space</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-PCI_signature(char *name, struct de4x5_private *lp)</div><div class='del'>-{</div><div class='del'>-    int i, status = 0, siglen = ARRAY_SIZE(de4x5_signatures);</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;chipset == DC21040) {</div><div class='del'>-	strcpy(name, "DE434/5");</div><div class='del'>-	return status;</div><div class='del'>-    } else {                           /* Search for a DEC name in the SROM */</div><div class='del'>-	int tmp = *((char *)&amp;lp-&gt;srom + 19) * 3;</div><div class='del'>-	strncpy(name, (char *)&amp;lp-&gt;srom + 26 + tmp, 8);</div><div class='del'>-    }</div><div class='del'>-    name[8] = '\0';</div><div class='del'>-    for (i=0; i&lt;siglen; i++) {</div><div class='del'>-	if (strstr(name,de4x5_signatures[i])!=NULL) break;</div><div class='del'>-    }</div><div class='del'>-    if (i == siglen) {</div><div class='del'>-	if (dec_only) {</div><div class='del'>-	    *name = '\0';</div><div class='del'>-	} else {                        /* Use chip name to avoid confusion */</div><div class='del'>-	    strcpy(name, (((lp-&gt;chipset == DC21040) ? "DC21040" :</div><div class='del'>-			   ((lp-&gt;chipset == DC21041) ? "DC21041" :</div><div class='del'>-			    ((lp-&gt;chipset == DC21140) ? "DC21140" :</div><div class='del'>-			     ((lp-&gt;chipset == DC21142) ? "DC21142" :</div><div class='del'>-			      ((lp-&gt;chipset == DC21143) ? "DC21143" : "UNKNOWN"</div><div class='del'>-			     )))))));</div><div class='del'>-	}</div><div class='del'>-	if (lp-&gt;chipset != DC21041) {</div><div class='del'>-	    lp-&gt;useSROM = true;             /* card is not recognisably DEC */</div><div class='del'>-	}</div><div class='del'>-    } else if ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) {</div><div class='del'>-	lp-&gt;useSROM = true;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Set up the Ethernet PROM counter to the start of the Ethernet address on</div><div class='del'>-** the DC21040, else  read the SROM for the other chips.</div><div class='del'>-** The SROM may not be present in a multi-MAC card, so first read the</div><div class='del'>-** MAC address and check for a bad address. If there is a bad one then exit</div><div class='del'>-** immediately with the prior srom contents intact (the h/w address will</div><div class='del'>-** be fixed up later).</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-DevicePresent(struct net_device *dev, u_long aprom_addr)</div><div class='del'>-{</div><div class='del'>-    int i, j=0;</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;chipset == DC21040) {</div><div class='del'>-	if (lp-&gt;bus == EISA) {</div><div class='del'>-	    enet_addr_rst(aprom_addr); /* Reset Ethernet Address ROM Pointer */</div><div class='del'>-	} else {</div><div class='del'>-	    outl(0, aprom_addr);       /* Reset Ethernet Address ROM Pointer */</div><div class='del'>-	}</div><div class='del'>-    } else {                           /* Read new srom */</div><div class='del'>-	u_short tmp;</div><div class='del'>-	__le16 *p = (__le16 *)((char *)&amp;lp-&gt;srom + SROM_HWADD);</div><div class='del'>-	for (i=0; i&lt;(ETH_ALEN&gt;&gt;1); i++) {</div><div class='del'>-	    tmp = srom_rd(aprom_addr, (SROM_HWADD&gt;&gt;1) + i);</div><div class='del'>-	    j += tmp;	/* for check for 0:0:0:0:0:0 or ff:ff:ff:ff:ff:ff */</div><div class='del'>-	    *p = cpu_to_le16(tmp);</div><div class='del'>-	}</div><div class='del'>-	if (j == 0 || j == 3 * 0xffff) {</div><div class='del'>-		/* could get 0 only from all-0 and 3 * 0xffff only from all-1 */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p = (__le16 *)&amp;lp-&gt;srom;</div><div class='del'>-	for (i=0; i&lt;(sizeof(struct de4x5_srom)&gt;&gt;1); i++) {</div><div class='del'>-	    tmp = srom_rd(aprom_addr, i);</div><div class='del'>-	    *p++ = cpu_to_le16(tmp);</div><div class='del'>-	}</div><div class='del'>-	de4x5_dbg_srom(&amp;lp-&gt;srom);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Since the write on the Enet PROM register doesn't seem to reset the PROM</div><div class='del'>-** pointer correctly (at least on my DE425 EISA card), this routine should do</div><div class='del'>-** it...from depca.c.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-enet_addr_rst(u_long aprom_addr)</div><div class='del'>-{</div><div class='del'>-    union {</div><div class='del'>-	struct {</div><div class='del'>-	    u32 a;</div><div class='del'>-	    u32 b;</div><div class='del'>-	} llsig;</div><div class='del'>-	char Sig[sizeof(u32) &lt;&lt; 1];</div><div class='del'>-    } dev;</div><div class='del'>-    short sigLength=0;</div><div class='del'>-    s8 data;</div><div class='del'>-    int i, j;</div><div class='del'>-</div><div class='del'>-    dev.llsig.a = ETH_PROM_SIG;</div><div class='del'>-    dev.llsig.b = ETH_PROM_SIG;</div><div class='del'>-    sigLength = sizeof(u32) &lt;&lt; 1;</div><div class='del'>-</div><div class='del'>-    for (i=0,j=0;j&lt;sigLength &amp;&amp; i&lt;PROBE_LENGTH+sigLength-1;i++) {</div><div class='del'>-	data = inb(aprom_addr);</div><div class='del'>-	if (dev.Sig[j] == data) {    /* track signature */</div><div class='del'>-	    j++;</div><div class='del'>-	} else {                     /* lost signature; begin search again */</div><div class='del'>-	    if (data == dev.Sig[0]) {  /* rare case.... */</div><div class='del'>-		j=1;</div><div class='del'>-	    } else {</div><div class='del'>-		j=0;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** For the bad status case and no SROM, then add one to the previous</div><div class='del'>-** address. However, need to add one backwards in case we have 0xff</div><div class='del'>-** as one or more of the bytes. Only the last 3 bytes should be checked</div><div class='del'>-** as the first three are invariant - assigned to an organisation.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-get_hw_addr(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int broken, i, k, tmp, status = 0;</div><div class='del'>-    u_short j,chksum;</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    broken = de4x5_bad_srom(lp);</div><div class='del'>-</div><div class='del'>-    for (i=0,k=0,j=0;j&lt;3;j++) {</div><div class='del'>-	k &lt;&lt;= 1;</div><div class='del'>-	if (k &gt; 0xffff) k-=0xffff;</div><div class='del'>-</div><div class='del'>-	if (lp-&gt;bus == PCI) {</div><div class='del'>-	    if (lp-&gt;chipset == DC21040) {</div><div class='del'>-		while ((tmp = inl(DE4X5_APROM)) &lt; 0);</div><div class='del'>-		k += (u_char) tmp;</div><div class='del'>-		dev-&gt;dev_addr[i++] = (u_char) tmp;</div><div class='del'>-		while ((tmp = inl(DE4X5_APROM)) &lt; 0);</div><div class='del'>-		k += (u_short) (tmp &lt;&lt; 8);</div><div class='del'>-		dev-&gt;dev_addr[i++] = (u_char) tmp;</div><div class='del'>-	    } else if (!broken) {</div><div class='del'>-		dev-&gt;dev_addr[i] = (u_char) lp-&gt;srom.ieee_addr[i]; i++;</div><div class='del'>-		dev-&gt;dev_addr[i] = (u_char) lp-&gt;srom.ieee_addr[i]; i++;</div><div class='del'>-	    } else if ((broken == SMC) || (broken == ACCTON)) {</div><div class='del'>-		dev-&gt;dev_addr[i] = *((u_char *)&amp;lp-&gt;srom + i); i++;</div><div class='del'>-		dev-&gt;dev_addr[i] = *((u_char *)&amp;lp-&gt;srom + i); i++;</div><div class='del'>-	    }</div><div class='del'>-	} else {</div><div class='del'>-	    k += (u_char) (tmp = inb(EISA_APROM));</div><div class='del'>-	    dev-&gt;dev_addr[i++] = (u_char) tmp;</div><div class='del'>-	    k += (u_short) ((tmp = inb(EISA_APROM)) &lt;&lt; 8);</div><div class='del'>-	    dev-&gt;dev_addr[i++] = (u_char) tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (k &gt; 0xffff) k-=0xffff;</div><div class='del'>-    }</div><div class='del'>-    if (k == 0xffff) k=0;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;bus == PCI) {</div><div class='del'>-	if (lp-&gt;chipset == DC21040) {</div><div class='del'>-	    while ((tmp = inl(DE4X5_APROM)) &lt; 0);</div><div class='del'>-	    chksum = (u_char) tmp;</div><div class='del'>-	    while ((tmp = inl(DE4X5_APROM)) &lt; 0);</div><div class='del'>-	    chksum |= (u_short) (tmp &lt;&lt; 8);</div><div class='del'>-	    if ((k != chksum) &amp;&amp; (dec_only)) status = -1;</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	chksum = (u_char) inb(EISA_APROM);</div><div class='del'>-	chksum |= (u_short) (inb(EISA_APROM) &lt;&lt; 8);</div><div class='del'>-	if ((k != chksum) &amp;&amp; (dec_only)) status = -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* If possible, try to fix a broken card - SMC only so far */</div><div class='del'>-    srom_repair(dev, broken);</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PPC_PMAC</div><div class='del'>-    /*</div><div class='del'>-    ** If the address starts with 00 a0, we have to bit-reverse</div><div class='del'>-    ** each byte of the address.</div><div class='del'>-    */</div><div class='del'>-    if ( machine_is(powermac) &amp;&amp;</div><div class='del'>-	 (dev-&gt;dev_addr[0] == 0) &amp;&amp;</div><div class='del'>-	 (dev-&gt;dev_addr[1] == 0xa0) )</div><div class='del'>-    {</div><div class='del'>-	    for (i = 0; i &lt; ETH_ALEN; ++i)</div><div class='del'>-	    {</div><div class='del'>-		    int x = dev-&gt;dev_addr[i];</div><div class='del'>-		    x = ((x &amp; 0xf) &lt;&lt; 4) + ((x &amp; 0xf0) &gt;&gt; 4);</div><div class='del'>-		    x = ((x &amp; 0x33) &lt;&lt; 2) + ((x &amp; 0xcc) &gt;&gt; 2);</div><div class='del'>-		    dev-&gt;dev_addr[i] = ((x &amp; 0x55) &lt;&lt; 1) + ((x &amp; 0xaa) &gt;&gt; 1);</div><div class='del'>-	    }</div><div class='del'>-    }</div><div class='del'>-#endif /* CONFIG_PPC_PMAC */</div><div class='del'>-</div><div class='del'>-    /* Test for a bad enet address */</div><div class='del'>-    status = test_bad_enet(dev, status);</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Test for enet addresses in the first 32 bytes.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-de4x5_bad_srom(struct de4x5_private *lp)</div><div class='del'>-{</div><div class='del'>-    int i, status = 0;</div><div class='del'>-</div><div class='del'>-    for (i = 0; i &lt; ARRAY_SIZE(enet_det); i++) {</div><div class='del'>-	if (!memcmp(&amp;lp-&gt;srom, &amp;enet_det[i], 3) &amp;&amp;</div><div class='del'>-	    !memcmp((char *)&amp;lp-&gt;srom+0x10, &amp;enet_det[i], 3)) {</div><div class='del'>-	    if (i == 0) {</div><div class='del'>-		status = SMC;</div><div class='del'>-	    } else if (i == 1) {</div><div class='del'>-		status = ACCTON;</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-srom_repair(struct net_device *dev, int card)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    switch(card) {</div><div class='del'>-      case SMC:</div><div class='del'>-	memset((char *)&amp;lp-&gt;srom, 0, sizeof(struct de4x5_srom));</div><div class='del'>-	memcpy(lp-&gt;srom.ieee_addr, (char *)dev-&gt;dev_addr, ETH_ALEN);</div><div class='del'>-	memcpy(lp-&gt;srom.info, (char *)&amp;srom_repair_info[SMC-1], 100);</div><div class='del'>-	lp-&gt;useSROM = true;</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Assume that the irq's do not follow the PCI spec - this is seems</div><div class='del'>-** to be true so far (2 for 2).</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-test_bad_enet(struct net_device *dev, int status)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i, tmp;</div><div class='del'>-</div><div class='del'>-    for (tmp=0,i=0; i&lt;ETH_ALEN; i++) tmp += (u_char)dev-&gt;dev_addr[i];</div><div class='del'>-    if ((tmp == 0) || (tmp == 0x5fa)) {</div><div class='del'>-	if ((lp-&gt;chipset == last.chipset) &amp;&amp;</div><div class='del'>-	    (lp-&gt;bus_num == last.bus) &amp;&amp; (lp-&gt;bus_num &gt; 0)) {</div><div class='del'>-	    for (i=0; i&lt;ETH_ALEN; i++) dev-&gt;dev_addr[i] = last.addr[i];</div><div class='del'>-	    for (i=ETH_ALEN-1; i&gt;2; --i) {</div><div class='del'>-		dev-&gt;dev_addr[i] += 1;</div><div class='del'>-		if (dev-&gt;dev_addr[i] != 0) break;</div><div class='del'>-	    }</div><div class='del'>-	    for (i=0; i&lt;ETH_ALEN; i++) last.addr[i] = dev-&gt;dev_addr[i];</div><div class='del'>-	    if (!an_exception(lp)) {</div><div class='del'>-		dev-&gt;irq = last.irq;</div><div class='del'>-	    }</div><div class='del'>-</div><div class='del'>-	    status = 0;</div><div class='del'>-	}</div><div class='del'>-    } else if (!status) {</div><div class='del'>-	last.chipset = lp-&gt;chipset;</div><div class='del'>-	last.bus = lp-&gt;bus_num;</div><div class='del'>-	last.irq = dev-&gt;irq;</div><div class='del'>-	for (i=0; i&lt;ETH_ALEN; i++) last.addr[i] = dev-&gt;dev_addr[i];</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** List of board exceptions with correctly wired IRQs</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-an_exception(struct de4x5_private *lp)</div><div class='del'>-{</div><div class='del'>-    if ((*(u_short *)lp-&gt;srom.sub_vendor_id == 0x00c0) &amp;&amp;</div><div class='del'>-	(*(u_short *)lp-&gt;srom.sub_system_id == 0x95e0)) {</div><div class='del'>-	return -1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Read</div><div class='del'>-*/</div><div class='del'>-static short</div><div class='del'>-srom_rd(u_long addr, u_char offset)</div><div class='del'>-{</div><div class='del'>-    sendto_srom(SROM_RD | SROM_SR, addr);</div><div class='del'>-</div><div class='del'>-    srom_latch(SROM_RD | SROM_SR | DT_CS, addr);</div><div class='del'>-    srom_command(SROM_RD | SROM_SR | DT_IN | DT_CS, addr);</div><div class='del'>-    srom_address(SROM_RD | SROM_SR | DT_CS, addr, offset);</div><div class='del'>-</div><div class='del'>-    return srom_data(SROM_RD | SROM_SR | DT_CS, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-srom_latch(u_int command, u_long addr)</div><div class='del'>-{</div><div class='del'>-    sendto_srom(command, addr);</div><div class='del'>-    sendto_srom(command | DT_CLK, addr);</div><div class='del'>-    sendto_srom(command, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-srom_command(u_int command, u_long addr)</div><div class='del'>-{</div><div class='del'>-    srom_latch(command, addr);</div><div class='del'>-    srom_latch(command, addr);</div><div class='del'>-    srom_latch((command &amp; 0x0000ff00) | DT_CS, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-srom_address(u_int command, u_long addr, u_char offset)</div><div class='del'>-{</div><div class='del'>-    int i, a;</div><div class='del'>-</div><div class='del'>-    a = offset &lt;&lt; 2;</div><div class='del'>-    for (i=0; i&lt;6; i++, a &lt;&lt;= 1) {</div><div class='del'>-	srom_latch(command | ((a &amp; 0x80) ? DT_IN : 0), addr);</div><div class='del'>-    }</div><div class='del'>-    udelay(1);</div><div class='del'>-</div><div class='del'>-    i = (getfrom_srom(addr) &gt;&gt; 3) &amp; 0x01;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short</div><div class='del'>-srom_data(u_int command, u_long addr)</div><div class='del'>-{</div><div class='del'>-    int i;</div><div class='del'>-    short word = 0;</div><div class='del'>-    s32 tmp;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;16; i++) {</div><div class='del'>-	sendto_srom(command  | DT_CLK, addr);</div><div class='del'>-	tmp = getfrom_srom(addr);</div><div class='del'>-	sendto_srom(command, addr);</div><div class='del'>-</div><div class='del'>-	word = (word &lt;&lt; 1) | ((tmp &gt;&gt; 3) &amp; 0x01);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    sendto_srom(command &amp; 0x0000ff00, addr);</div><div class='del'>-</div><div class='del'>-    return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-static void</div><div class='del'>-srom_busy(u_int command, u_long addr)</div><div class='del'>-{</div><div class='del'>-   sendto_srom((command &amp; 0x0000ff00) | DT_CS, addr);</div><div class='del'>-</div><div class='del'>-   while (!((getfrom_srom(addr) &gt;&gt; 3) &amp; 0x01)) {</div><div class='del'>-       mdelay(1);</div><div class='del'>-   }</div><div class='del'>-</div><div class='del'>-   sendto_srom(command &amp; 0x0000ff00, addr);</div><div class='del'>-}</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sendto_srom(u_int command, u_long addr)</div><div class='del'>-{</div><div class='del'>-    outl(command, addr);</div><div class='del'>-    udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-getfrom_srom(u_long addr)</div><div class='del'>-{</div><div class='del'>-    s32 tmp;</div><div class='del'>-</div><div class='del'>-    tmp = inl(addr);</div><div class='del'>-    udelay(1);</div><div class='del'>-</div><div class='del'>-    return tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-srom_infoleaf_info(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i, count;</div><div class='del'>-    u_char *p;</div><div class='del'>-</div><div class='del'>-    /* Find the infoleaf decoder function that matches this chipset */</div><div class='del'>-    for (i=0; i&lt;INFOLEAF_SIZE; i++) {</div><div class='del'>-	if (lp-&gt;chipset == infoleaf_array[i].chipset) break;</div><div class='del'>-    }</div><div class='del'>-    if (i == INFOLEAF_SIZE) {</div><div class='del'>-	lp-&gt;useSROM = false;</div><div class='del'>-	printk("%s: Cannot find correct chipset for SROM decoding!\n",</div><div class='del'>-	                                                          dev-&gt;name);</div><div class='del'>-	return -ENXIO;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    lp-&gt;infoleaf_fn = infoleaf_array[i].fn;</div><div class='del'>-</div><div class='del'>-    /* Find the information offset that this function should use */</div><div class='del'>-    count = *((u_char *)&amp;lp-&gt;srom + 19);</div><div class='del'>-    p  = (u_char *)&amp;lp-&gt;srom + 26;</div><div class='del'>-</div><div class='del'>-    if (count &gt; 1) {</div><div class='del'>-	for (i=count; i; --i, p+=3) {</div><div class='del'>-	    if (lp-&gt;device == *p) break;</div><div class='del'>-	}</div><div class='del'>-	if (i == 0) {</div><div class='del'>-	    lp-&gt;useSROM = false;</div><div class='del'>-	    printk("%s: Cannot find correct PCI device [%d] for SROM decoding!\n",</div><div class='del'>-	                                               dev-&gt;name, lp-&gt;device);</div><div class='del'>-	    return -ENXIO;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-	lp-&gt;infoleaf_offset = get_unaligned_le16(p + 1);</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This routine loads any type 1 or 3 MII info into the mii device</div><div class='del'>-** struct and executes any type 5 code to reset PHY devices for this</div><div class='del'>-** controller.</div><div class='del'>-** The info for the MII devices will be valid since the index used</div><div class='del'>-** will follow the discovery process from MII address 1-31 then 0.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-srom_init(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char *p = (u_char *)&amp;lp-&gt;srom + lp-&gt;infoleaf_offset;</div><div class='del'>-    u_char count;</div><div class='del'>-</div><div class='del'>-    p+=2;</div><div class='del'>-    if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	lp-&gt;cache.gepc = (*p++ | GEP_CTRL);</div><div class='del'>-	gep_wr(lp-&gt;cache.gepc, dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Block count */</div><div class='del'>-    count = *p++;</div><div class='del'>-</div><div class='del'>-    /* Jump the infoblocks to find types */</div><div class='del'>-    for (;count; --count) {</div><div class='del'>-	if (*p &lt; 128) {</div><div class='del'>-	    p += COMPACT_LEN;</div><div class='del'>-	} else if (*(p+1) == 5) {</div><div class='del'>-	    type5_infoblock(dev, 1, p);</div><div class='del'>-	    p += ((*p &amp; BLOCK_LEN) + 1);</div><div class='del'>-	} else if (*(p+1) == 4) {</div><div class='del'>-	    p += ((*p &amp; BLOCK_LEN) + 1);</div><div class='del'>-	} else if (*(p+1) == 3) {</div><div class='del'>-	    type3_infoblock(dev, 1, p);</div><div class='del'>-	    p += ((*p &amp; BLOCK_LEN) + 1);</div><div class='del'>-	} else if (*(p+1) == 2) {</div><div class='del'>-	    p += ((*p &amp; BLOCK_LEN) + 1);</div><div class='del'>-	} else if (*(p+1) == 1) {</div><div class='del'>-	    type1_infoblock(dev, 1, p);</div><div class='del'>-	    p += ((*p &amp; BLOCK_LEN) + 1);</div><div class='del'>-	} else {</div><div class='del'>-	    p += ((*p &amp; BLOCK_LEN) + 1);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** A generic routine that writes GEP control, data and reset information</div><div class='del'>-** to the GEP register (21140) or csr15 GEP portion (2114[23]).</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-srom_exec(struct net_device *dev, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    u_char count = (p ? *p++ : 0);</div><div class='del'>-    u_short *w = (u_short *)p;</div><div class='del'>-</div><div class='del'>-    if (((lp-&gt;ibn != 1) &amp;&amp; (lp-&gt;ibn != 3) &amp;&amp; (lp-&gt;ibn != 5)) || !count) return;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;chipset != DC21140) RESET_SIA;</div><div class='del'>-</div><div class='del'>-    while (count--) {</div><div class='del'>-	gep_wr(((lp-&gt;chipset==DC21140) &amp;&amp; (lp-&gt;ibn!=5) ?</div><div class='del'>-		                                   *p++ : get_unaligned_le16(w++)), dev);</div><div class='del'>-	mdelay(2);                          /* 2ms per action */</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;chipset != DC21140) {</div><div class='del'>-	outl(lp-&gt;cache.csr14, DE4X5_STRR);</div><div class='del'>-	outl(lp-&gt;cache.csr13, DE4X5_SICR);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Basically this function is a NOP since it will never be called,</div><div class='del'>-** unless I implement the DC21041 SROM functions. There's no need</div><div class='del'>-** since the existing code will be satisfactory for all boards.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-dc21041_infoleaf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    return DE4X5_AUTOSENSE_MS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dc21140_infoleaf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char count = 0;</div><div class='del'>-    u_char *p = (u_char *)&amp;lp-&gt;srom + lp-&gt;infoleaf_offset;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-</div><div class='del'>-    /* Read the connection type */</div><div class='del'>-    p+=2;</div><div class='del'>-</div><div class='del'>-    /* GEP control */</div><div class='del'>-    lp-&gt;cache.gepc = (*p++ | GEP_CTRL);</div><div class='del'>-</div><div class='del'>-    /* Block count */</div><div class='del'>-    count = *p++;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (*p &lt; 128) {</div><div class='del'>-	next_tick = dc_infoblock[COMPACT](dev, count, p);</div><div class='del'>-    } else {</div><div class='del'>-	next_tick = dc_infoblock[*(p+1)](dev, count, p);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;tcount == count) {</div><div class='del'>-	lp-&gt;media = NC;</div><div class='del'>-        if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	    de4x5_dbg_media(dev);</div><div class='del'>-	    lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tcount = 0;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick &amp; ~TIMER_CB;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dc21142_infoleaf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char count = 0;</div><div class='del'>-    u_char *p = (u_char *)&amp;lp-&gt;srom + lp-&gt;infoleaf_offset;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-</div><div class='del'>-    /* Read the connection type */</div><div class='del'>-    p+=2;</div><div class='del'>-</div><div class='del'>-    /* Block count */</div><div class='del'>-    count = *p++;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (*p &lt; 128) {</div><div class='del'>-	next_tick = dc_infoblock[COMPACT](dev, count, p);</div><div class='del'>-    } else {</div><div class='del'>-	next_tick = dc_infoblock[*(p+1)](dev, count, p);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;tcount == count) {</div><div class='del'>-	lp-&gt;media = NC;</div><div class='del'>-        if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	    de4x5_dbg_media(dev);</div><div class='del'>-	    lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tcount = 0;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick &amp; ~TIMER_CB;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dc21143_infoleaf(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char count = 0;</div><div class='del'>-    u_char *p = (u_char *)&amp;lp-&gt;srom + lp-&gt;infoleaf_offset;</div><div class='del'>-    int next_tick = DE4X5_AUTOSENSE_MS;</div><div class='del'>-</div><div class='del'>-    /* Read the connection type */</div><div class='del'>-    p+=2;</div><div class='del'>-</div><div class='del'>-    /* Block count */</div><div class='del'>-    count = *p++;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (*p &lt; 128) {</div><div class='del'>-	next_tick = dc_infoblock[COMPACT](dev, count, p);</div><div class='del'>-    } else {</div><div class='del'>-	next_tick = dc_infoblock[*(p+1)](dev, count, p);</div><div class='del'>-    }</div><div class='del'>-    if (lp-&gt;tcount == count) {</div><div class='del'>-	lp-&gt;media = NC;</div><div class='del'>-        if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	    de4x5_dbg_media(dev);</div><div class='del'>-	    lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;media = INIT;</div><div class='del'>-	lp-&gt;tcount = 0;</div><div class='del'>-	lp-&gt;tx_enable = false;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return next_tick &amp; ~TIMER_CB;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** The compact infoblock is only designed for DC21140[A] chips, so</div><div class='del'>-** we'll reuse the dc21140m_autoconf function. Non MII media only.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-compact_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char flags, csr6;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+COMPACT_LEN) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+COMPACT_LEN);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+COMPACT_LEN+1)](dev, count, p+COMPACT_LEN);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ((lp-&gt;media == INIT) &amp;&amp; (lp-&gt;timeout &lt; 0)) {</div><div class='del'>-        lp-&gt;ibn = COMPACT;</div><div class='del'>-        lp-&gt;active = 0;</div><div class='del'>-	gep_wr(lp-&gt;cache.gepc, dev);</div><div class='del'>-	lp-&gt;infoblock_media = (*p++) &amp; COMPACT_MC;</div><div class='del'>-	lp-&gt;cache.gep = *p++;</div><div class='del'>-	csr6 = *p++;</div><div class='del'>-	flags = *p++;</div><div class='del'>-</div><div class='del'>-	lp-&gt;asBitValid = (flags &amp; 0x80) ? 0 : -1;</div><div class='del'>-	lp-&gt;defMedium = (flags &amp; 0x40) ? -1 : 0;</div><div class='del'>-	lp-&gt;asBit = 1 &lt;&lt; ((csr6 &gt;&gt; 1) &amp; 0x07);</div><div class='del'>-	lp-&gt;asPolarity = ((csr6 &amp; 0x80) ? -1 : 0) &amp; lp-&gt;asBit;</div><div class='del'>-	lp-&gt;infoblock_csr6 = OMR_DEF | ((csr6 &amp; 0x71) &lt;&lt; 18);</div><div class='del'>-	lp-&gt;useMII = false;</div><div class='del'>-</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return dc21140m_autoconf(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This block describes non MII media for the DC21140[A] only.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-type0_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char flags, csr6, len = (*p &amp; BLOCK_LEN)+1;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+len) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+len);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+len+1)](dev, count, p+len);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ((lp-&gt;media == INIT) &amp;&amp; (lp-&gt;timeout &lt; 0)) {</div><div class='del'>-        lp-&gt;ibn = 0;</div><div class='del'>-        lp-&gt;active = 0;</div><div class='del'>-        gep_wr(lp-&gt;cache.gepc, dev);</div><div class='del'>-	p+=2;</div><div class='del'>-	lp-&gt;infoblock_media = (*p++) &amp; BLOCK0_MC;</div><div class='del'>-	lp-&gt;cache.gep = *p++;</div><div class='del'>-	csr6 = *p++;</div><div class='del'>-	flags = *p++;</div><div class='del'>-</div><div class='del'>-	lp-&gt;asBitValid = (flags &amp; 0x80) ? 0 : -1;</div><div class='del'>-	lp-&gt;defMedium = (flags &amp; 0x40) ? -1 : 0;</div><div class='del'>-	lp-&gt;asBit = 1 &lt;&lt; ((csr6 &gt;&gt; 1) &amp; 0x07);</div><div class='del'>-	lp-&gt;asPolarity = ((csr6 &amp; 0x80) ? -1 : 0) &amp; lp-&gt;asBit;</div><div class='del'>-	lp-&gt;infoblock_csr6 = OMR_DEF | ((csr6 &amp; 0x71) &lt;&lt; 18);</div><div class='del'>-	lp-&gt;useMII = false;</div><div class='del'>-</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return dc21140m_autoconf(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These functions are under construction! */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-type1_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char len = (*p &amp; BLOCK_LEN)+1;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+len) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+len);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+len+1)](dev, count, p+len);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    p += 2;</div><div class='del'>-    if (lp-&gt;state == INITIALISED) {</div><div class='del'>-        lp-&gt;ibn = 1;</div><div class='del'>-	lp-&gt;active = *p++;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].gep = (*p ? p : NULL); p += (*p + 1);</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].rst = (*p ? p : NULL); p += (*p + 1);</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].mc  = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].ana = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].fdx = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].ttm = get_unaligned_le16(p);</div><div class='del'>-	return 0;</div><div class='del'>-    } else if ((lp-&gt;media == INIT) &amp;&amp; (lp-&gt;timeout &lt; 0)) {</div><div class='del'>-        lp-&gt;ibn = 1;</div><div class='del'>-        lp-&gt;active = *p;</div><div class='del'>-	lp-&gt;infoblock_csr6 = OMR_MII_100;</div><div class='del'>-	lp-&gt;useMII = true;</div><div class='del'>-	lp-&gt;infoblock_media = ANS;</div><div class='del'>-</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return dc21140m_autoconf(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-type2_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char len = (*p &amp; BLOCK_LEN)+1;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+len) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+len);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+len+1)](dev, count, p+len);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ((lp-&gt;media == INIT) &amp;&amp; (lp-&gt;timeout &lt; 0)) {</div><div class='del'>-        lp-&gt;ibn = 2;</div><div class='del'>-        lp-&gt;active = 0;</div><div class='del'>-	p += 2;</div><div class='del'>-	lp-&gt;infoblock_media = (*p) &amp; MEDIA_CODE;</div><div class='del'>-</div><div class='del'>-        if ((*p++) &amp; EXT_FIELD) {</div><div class='del'>-	    lp-&gt;cache.csr13 = get_unaligned_le16(p); p += 2;</div><div class='del'>-	    lp-&gt;cache.csr14 = get_unaligned_le16(p); p += 2;</div><div class='del'>-	    lp-&gt;cache.csr15 = get_unaligned_le16(p); p += 2;</div><div class='del'>-	} else {</div><div class='del'>-	    lp-&gt;cache.csr13 = CSR13;</div><div class='del'>-	    lp-&gt;cache.csr14 = CSR14;</div><div class='del'>-	    lp-&gt;cache.csr15 = CSR15;</div><div class='del'>-	}</div><div class='del'>-        lp-&gt;cache.gepc = ((s32)(get_unaligned_le16(p)) &lt;&lt; 16); p += 2;</div><div class='del'>-        lp-&gt;cache.gep  = ((s32)(get_unaligned_le16(p)) &lt;&lt; 16);</div><div class='del'>-	lp-&gt;infoblock_csr6 = OMR_SIA;</div><div class='del'>-	lp-&gt;useMII = false;</div><div class='del'>-</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return dc2114x_autoconf(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-type3_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char len = (*p &amp; BLOCK_LEN)+1;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+len) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+len);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+len+1)](dev, count, p+len);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    p += 2;</div><div class='del'>-    if (lp-&gt;state == INITIALISED) {</div><div class='del'>-        lp-&gt;ibn = 3;</div><div class='del'>-        lp-&gt;active = *p++;</div><div class='del'>-	if (MOTO_SROM_BUG) lp-&gt;active = 0;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].gep = (*p ? p : NULL); p += (2 * (*p) + 1);</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].rst = (*p ? p : NULL); p += (2 * (*p) + 1);</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].mc  = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].ana = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].fdx = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].ttm = get_unaligned_le16(p); p += 2;</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].mci = *p;</div><div class='del'>-	return 0;</div><div class='del'>-    } else if ((lp-&gt;media == INIT) &amp;&amp; (lp-&gt;timeout &lt; 0)) {</div><div class='del'>-        lp-&gt;ibn = 3;</div><div class='del'>-	lp-&gt;active = *p;</div><div class='del'>-	if (MOTO_SROM_BUG) lp-&gt;active = 0;</div><div class='del'>-	lp-&gt;infoblock_csr6 = OMR_MII_100;</div><div class='del'>-	lp-&gt;useMII = true;</div><div class='del'>-	lp-&gt;infoblock_media = ANS;</div><div class='del'>-</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return dc2114x_autoconf(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-type4_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char flags, csr6, len = (*p &amp; BLOCK_LEN)+1;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+len) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+len);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+len+1)](dev, count, p+len);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if ((lp-&gt;media == INIT) &amp;&amp; (lp-&gt;timeout &lt; 0)) {</div><div class='del'>-        lp-&gt;ibn = 4;</div><div class='del'>-        lp-&gt;active = 0;</div><div class='del'>-	p+=2;</div><div class='del'>-	lp-&gt;infoblock_media = (*p++) &amp; MEDIA_CODE;</div><div class='del'>-        lp-&gt;cache.csr13 = CSR13;              /* Hard coded defaults */</div><div class='del'>-	lp-&gt;cache.csr14 = CSR14;</div><div class='del'>-	lp-&gt;cache.csr15 = CSR15;</div><div class='del'>-        lp-&gt;cache.gepc = ((s32)(get_unaligned_le16(p)) &lt;&lt; 16); p += 2;</div><div class='del'>-        lp-&gt;cache.gep  = ((s32)(get_unaligned_le16(p)) &lt;&lt; 16); p += 2;</div><div class='del'>-	csr6 = *p++;</div><div class='del'>-	flags = *p++;</div><div class='del'>-</div><div class='del'>-	lp-&gt;asBitValid = (flags &amp; 0x80) ? 0 : -1;</div><div class='del'>-	lp-&gt;defMedium = (flags &amp; 0x40) ? -1 : 0;</div><div class='del'>-	lp-&gt;asBit = 1 &lt;&lt; ((csr6 &gt;&gt; 1) &amp; 0x07);</div><div class='del'>-	lp-&gt;asPolarity = ((csr6 &amp; 0x80) ? -1 : 0) &amp; lp-&gt;asBit;</div><div class='del'>-	lp-&gt;infoblock_csr6 = OMR_DEF | ((csr6 &amp; 0x71) &lt;&lt; 18);</div><div class='del'>-	lp-&gt;useMII = false;</div><div class='del'>-</div><div class='del'>-	de4x5_switch_mac_port(dev);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return dc2114x_autoconf(dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** This block type provides information for resetting external devices</div><div class='del'>-** (chips) through the General Purpose Register.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-type5_infoblock(struct net_device *dev, u_char count, u_char *p)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_char len = (*p &amp; BLOCK_LEN)+1;</div><div class='del'>-</div><div class='del'>-    /* Recursively figure out the info blocks */</div><div class='del'>-    if (--count &gt; lp-&gt;tcount) {</div><div class='del'>-	if (*(p+len) &lt; 128) {</div><div class='del'>-	    return dc_infoblock[COMPACT](dev, count, p+len);</div><div class='del'>-	} else {</div><div class='del'>-	    return dc_infoblock[*(p+len+1)](dev, count, p+len);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Must be initializing to run this code */</div><div class='del'>-    if ((lp-&gt;state == INITIALISED) || (lp-&gt;media == INIT)) {</div><div class='del'>-	p+=2;</div><div class='del'>-        lp-&gt;rst = p;</div><div class='del'>-        srom_exec(dev, lp-&gt;rst);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return DE4X5_AUTOSENSE_MS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MII Read/Write</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mii_rd(u_char phyreg, u_char phyaddr, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    mii_wdata(MII_PREAMBLE,  2, ioaddr);   /* Start of 34 bit preamble...    */</div><div class='del'>-    mii_wdata(MII_PREAMBLE, 32, ioaddr);   /* ...continued                   */</div><div class='del'>-    mii_wdata(MII_STRD, 4, ioaddr);        /* SFD and Read operation         */</div><div class='del'>-    mii_address(phyaddr, ioaddr);          /* PHY address to be accessed     */</div><div class='del'>-    mii_address(phyreg, ioaddr);           /* PHY Register to read           */</div><div class='del'>-    mii_ta(MII_STRD, ioaddr);              /* Turn around time - 2 MDC       */</div><div class='del'>-</div><div class='del'>-    return mii_rdata(ioaddr);              /* Read data                      */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mii_wr(int data, u_char phyreg, u_char phyaddr, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    mii_wdata(MII_PREAMBLE,  2, ioaddr);   /* Start of 34 bit preamble...    */</div><div class='del'>-    mii_wdata(MII_PREAMBLE, 32, ioaddr);   /* ...continued                   */</div><div class='del'>-    mii_wdata(MII_STWR, 4, ioaddr);        /* SFD and Write operation        */</div><div class='del'>-    mii_address(phyaddr, ioaddr);          /* PHY address to be accessed     */</div><div class='del'>-    mii_address(phyreg, ioaddr);           /* PHY Register to write          */</div><div class='del'>-    mii_ta(MII_STWR, ioaddr);              /* Turn around time - 2 MDC       */</div><div class='del'>-    data = mii_swap(data, 16);             /* Swap data bit ordering         */</div><div class='del'>-    mii_wdata(data, 16, ioaddr);           /* Write data                     */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mii_rdata(u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    int i;</div><div class='del'>-    s32 tmp = 0;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;16; i++) {</div><div class='del'>-	tmp &lt;&lt;= 1;</div><div class='del'>-	tmp |= getfrom_mii(MII_MRD | MII_RD, ioaddr);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mii_wdata(int data, int len, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;len; i++) {</div><div class='del'>-	sendto_mii(MII_MWR | MII_WR, data, ioaddr);</div><div class='del'>-	data &gt;&gt;= 1;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mii_address(u_char addr, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    addr = mii_swap(addr, 5);</div><div class='del'>-    for (i=0; i&lt;5; i++) {</div><div class='del'>-	sendto_mii(MII_MWR | MII_WR, addr, ioaddr);</div><div class='del'>-	addr &gt;&gt;= 1;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mii_ta(u_long rw, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    if (rw == MII_STWR) {</div><div class='del'>-	sendto_mii(MII_MWR | MII_WR, 1, ioaddr);</div><div class='del'>-	sendto_mii(MII_MWR | MII_WR, 0, ioaddr);</div><div class='del'>-    } else {</div><div class='del'>-	getfrom_mii(MII_MRD | MII_RD, ioaddr);        /* Tri-state MDIO */</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mii_swap(int data, int len)</div><div class='del'>-{</div><div class='del'>-    int i, tmp = 0;</div><div class='del'>-</div><div class='del'>-    for (i=0; i&lt;len; i++) {</div><div class='del'>-	tmp &lt;&lt;= 1;</div><div class='del'>-	tmp |= (data &amp; 1);</div><div class='del'>-	data &gt;&gt;= 1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return tmp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sendto_mii(u32 command, int data, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    u32 j;</div><div class='del'>-</div><div class='del'>-    j = (data &amp; 1) &lt;&lt; 17;</div><div class='del'>-    outl(command | j, ioaddr);</div><div class='del'>-    udelay(1);</div><div class='del'>-    outl(command | MII_MDC | j, ioaddr);</div><div class='del'>-    udelay(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-getfrom_mii(u32 command, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-    outl(command, ioaddr);</div><div class='del'>-    udelay(1);</div><div class='del'>-    outl(command | MII_MDC, ioaddr);</div><div class='del'>-    udelay(1);</div><div class='del'>-</div><div class='del'>-    return (inl(ioaddr) &gt;&gt; 19) &amp; 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Here's 3 ways to calculate the OUI from the ID registers.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-mii_get_oui(u_char phyaddr, u_long ioaddr)</div><div class='del'>-{</div><div class='del'>-/*</div><div class='del'>-    union {</div><div class='del'>-	u_short reg;</div><div class='del'>-	u_char breg[2];</div><div class='del'>-    } a;</div><div class='del'>-    int i, r2, r3, ret=0;*/</div><div class='del'>-    int r2, r3;</div><div class='del'>-</div><div class='del'>-    /* Read r2 and r3 */</div><div class='del'>-    r2 = mii_rd(MII_ID0, phyaddr, ioaddr);</div><div class='del'>-    r3 = mii_rd(MII_ID1, phyaddr, ioaddr);</div><div class='del'>-                                                /* SEEQ and Cypress way * /</div><div class='del'>-    / * Shuffle r2 and r3 * /</div><div class='del'>-    a.reg=0;</div><div class='del'>-    r3 = ((r3&gt;&gt;10)|(r2&lt;&lt;6))&amp;0x0ff;</div><div class='del'>-    r2 = ((r2&gt;&gt;2)&amp;0x3fff);</div><div class='del'>-</div><div class='del'>-    / * Bit reverse r3 * /</div><div class='del'>-    for (i=0;i&lt;8;i++) {</div><div class='del'>-	ret&lt;&lt;=1;</div><div class='del'>-	ret |= (r3&amp;1);</div><div class='del'>-	r3&gt;&gt;=1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    / * Bit reverse r2 * /</div><div class='del'>-    for (i=0;i&lt;16;i++) {</div><div class='del'>-	a.reg&lt;&lt;=1;</div><div class='del'>-	a.reg |= (r2&amp;1);</div><div class='del'>-	r2&gt;&gt;=1;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    / * Swap r2 bytes * /</div><div class='del'>-    i=a.breg[0];</div><div class='del'>-    a.breg[0]=a.breg[1];</div><div class='del'>-    a.breg[1]=i;</div><div class='del'>-</div><div class='del'>-    return (a.reg&lt;&lt;8)|ret; */                 /* SEEQ and Cypress way */</div><div class='del'>-/*    return (r2&lt;&lt;6)|(u_int)(r3&gt;&gt;10); */      /* NATIONAL and BROADCOM way */</div><div class='del'>-    return r2;                                  /* (I did it) My way */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** The SROM spec forces us to search addresses [1-31 0]. Bummer.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-mii_get_phy(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int i, j, k, n, limit=ARRAY_SIZE(phy_info);</div><div class='del'>-    int id;</div><div class='del'>-</div><div class='del'>-    lp-&gt;active = 0;</div><div class='del'>-    lp-&gt;useMII = true;</div><div class='del'>-</div><div class='del'>-    /* Search the MII address space for possible PHY devices */</div><div class='del'>-    for (n=0, lp-&gt;mii_cnt=0, i=1; !((i==1) &amp;&amp; (n==1)); i=(i+1)%DE4X5_MAX_MII) {</div><div class='del'>-	lp-&gt;phy[lp-&gt;active].addr = i;</div><div class='del'>-	if (i==0) n++;                             /* Count cycles */</div><div class='del'>-	while (de4x5_reset_phy(dev)&lt;0) udelay(100);/* Wait for reset */</div><div class='del'>-	id = mii_get_oui(i, DE4X5_MII);</div><div class='del'>-	if ((id == 0) || (id == 65535)) continue;  /* Valid ID? */</div><div class='del'>-	for (j=0; j&lt;limit; j++) {                  /* Search PHY table */</div><div class='del'>-	    if (id != phy_info[j].id) continue;    /* ID match? */</div><div class='del'>-	    for (k=0; k &lt; DE4X5_MAX_PHY &amp;&amp; lp-&gt;phy[k].id; k++);</div><div class='del'>-	    if (k &lt; DE4X5_MAX_PHY) {</div><div class='del'>-		memcpy((char *)&amp;lp-&gt;phy[k],</div><div class='del'>-		       (char *)&amp;phy_info[j], sizeof(struct phy_table));</div><div class='del'>-		lp-&gt;phy[k].addr = i;</div><div class='del'>-		lp-&gt;mii_cnt++;</div><div class='del'>-		lp-&gt;active++;</div><div class='del'>-	    } else {</div><div class='del'>-		goto purgatory;                    /* Stop the search */</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-	if ((j == limit) &amp;&amp; (i &lt; DE4X5_MAX_MII)) {</div><div class='del'>-	    for (k=0; k &lt; DE4X5_MAX_PHY &amp;&amp; lp-&gt;phy[k].id; k++);</div><div class='del'>-	    lp-&gt;phy[k].addr = i;</div><div class='del'>-	    lp-&gt;phy[k].id = id;</div><div class='del'>-	    lp-&gt;phy[k].spd.reg = GENERIC_REG;      /* ANLPA register         */</div><div class='del'>-	    lp-&gt;phy[k].spd.mask = GENERIC_MASK;    /* 100Mb/s technologies   */</div><div class='del'>-	    lp-&gt;phy[k].spd.value = GENERIC_VALUE;  /* TX &amp; T4, H/F Duplex    */</div><div class='del'>-	    lp-&gt;mii_cnt++;</div><div class='del'>-	    lp-&gt;active++;</div><div class='del'>-	    printk("%s: Using generic MII device control. If the board doesn't operate,\nplease mail the following dump to the author:\n", dev-&gt;name);</div><div class='del'>-	    j = de4x5_debug;</div><div class='del'>-	    de4x5_debug |= DEBUG_MII;</div><div class='del'>-	    de4x5_dbg_mii(dev, k);</div><div class='del'>-	    de4x5_debug = j;</div><div class='del'>-	    printk("\n");</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-  purgatory:</div><div class='del'>-    lp-&gt;active = 0;</div><div class='del'>-    if (lp-&gt;phy[0].id) {                           /* Reset the PHY devices */</div><div class='del'>-	for (k=0; k &lt; DE4X5_MAX_PHY &amp;&amp; lp-&gt;phy[k].id; k++) { /*For each PHY*/</div><div class='del'>-	    mii_wr(MII_CR_RST, MII_CR, lp-&gt;phy[k].addr, DE4X5_MII);</div><div class='del'>-	    while (mii_rd(MII_CR, lp-&gt;phy[k].addr, DE4X5_MII) &amp; MII_CR_RST);</div><div class='del'>-</div><div class='del'>-	    de4x5_dbg_mii(dev, k);</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    if (!lp-&gt;mii_cnt) lp-&gt;useMII = false;</div><div class='del'>-</div><div class='del'>-    return lp-&gt;mii_cnt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-build_setup_frame(struct net_device *dev, int mode)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i;</div><div class='del'>-    char *pa = lp-&gt;setup_frame;</div><div class='del'>-</div><div class='del'>-    /* Initialise the setup frame */</div><div class='del'>-    if (mode == ALL) {</div><div class='del'>-	memset(lp-&gt;setup_frame, 0, SETUP_FRAME_LEN);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;setup_f == HASH_PERF) {</div><div class='del'>-	for (pa=lp-&gt;setup_frame+IMPERF_PA_OFFSET, i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-	    *(pa + i) = dev-&gt;dev_addr[i];                 /* Host address */</div><div class='del'>-	    if (i &amp; 0x01) pa += 2;</div><div class='del'>-	}</div><div class='del'>-	*(lp-&gt;setup_frame + (DE4X5_HASH_TABLE_LEN &gt;&gt; 3) - 3) = 0x80;</div><div class='del'>-    } else {</div><div class='del'>-	for (i=0; i&lt;ETH_ALEN; i++) { /* Host address */</div><div class='del'>-	    *(pa + (i&amp;1)) = dev-&gt;dev_addr[i];</div><div class='del'>-	    if (i &amp; 0x01) pa += 4;</div><div class='del'>-	}</div><div class='del'>-	for (i=0; i&lt;ETH_ALEN; i++) { /* Broadcast address */</div><div class='del'>-	    *(pa + (i&amp;1)) = (char) 0xff;</div><div class='del'>-	    if (i &amp; 0x01) pa += 4;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return pa;                     /* Points to the next entry */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disable_ast(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-	struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-	del_timer_sync(&amp;lp-&gt;timer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-de4x5_switch_mac_port(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    s32 omr;</div><div class='del'>-</div><div class='del'>-    STOP_DE4X5;</div><div class='del'>-</div><div class='del'>-    /* Assert the OMR_PS bit in CSR6 */</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR |</div><div class='del'>-			                                             OMR_FDX));</div><div class='del'>-    omr |= lp-&gt;infoblock_csr6;</div><div class='del'>-    if (omr &amp; OMR_PS) omr |= OMR_HBD;</div><div class='del'>-    outl(omr, DE4X5_OMR);</div><div class='del'>-</div><div class='del'>-    /* Soft Reset */</div><div class='del'>-    RESET_DE4X5;</div><div class='del'>-</div><div class='del'>-    /* Restore the GEP - especially for COMPACT and Type 0 Infoblocks */</div><div class='del'>-    if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	gep_wr(lp-&gt;cache.gepc, dev);</div><div class='del'>-	gep_wr(lp-&gt;cache.gep, dev);</div><div class='del'>-    } else if ((lp-&gt;chipset &amp; ~0x0ff) == DC2114x) {</div><div class='del'>-	reset_init_sia(dev, lp-&gt;cache.csr13, lp-&gt;cache.csr14, lp-&gt;cache.csr15);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* Restore CSR6 */</div><div class='del'>-    outl(omr, DE4X5_OMR);</div><div class='del'>-</div><div class='del'>-    /* Reset CSR8 */</div><div class='del'>-    inl(DE4X5_MFC);</div><div class='del'>-</div><div class='del'>-    return omr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gep_wr(s32 data, struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	outl(data, DE4X5_GEP);</div><div class='del'>-    } else if ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) {</div><div class='del'>-	outl((data&lt;&lt;16) | lp-&gt;cache.csr15, DE4X5_SIGR);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-gep_rd(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	return inl(DE4X5_GEP);</div><div class='del'>-    } else if ((lp-&gt;chipset &amp; ~0x00ff) == DC2114x) {</div><div class='del'>-	return inl(DE4X5_SIGR) &amp; 0x000fffff;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-yawn(struct net_device *dev, int state)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if ((lp-&gt;chipset == DC21040) || (lp-&gt;chipset == DC21140)) return;</div><div class='del'>-</div><div class='del'>-    if(lp-&gt;bus == EISA) {</div><div class='del'>-	switch(state) {</div><div class='del'>-	  case WAKEUP:</div><div class='del'>-	    outb(WAKEUP, PCI_CFPM);</div><div class='del'>-	    mdelay(10);</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	  case SNOOZE:</div><div class='del'>-	    outb(SNOOZE, PCI_CFPM);</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	  case SLEEP:</div><div class='del'>-	    outl(0, DE4X5_SICR);</div><div class='del'>-	    outb(SLEEP, PCI_CFPM);</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-    } else {</div><div class='del'>-	struct pci_dev *pdev = to_pci_dev (lp-&gt;gendev);</div><div class='del'>-	switch(state) {</div><div class='del'>-	  case WAKEUP:</div><div class='del'>-	    pci_write_config_byte(pdev, PCI_CFDA_PSM, WAKEUP);</div><div class='del'>-	    mdelay(10);</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	  case SNOOZE:</div><div class='del'>-	    pci_write_config_byte(pdev, PCI_CFDA_PSM, SNOOZE);</div><div class='del'>-	    break;</div><div class='del'>-</div><div class='del'>-	  case SLEEP:</div><div class='del'>-	    outl(0, DE4X5_SICR);</div><div class='del'>-	    pci_write_config_byte(pdev, PCI_CFDA_PSM, SLEEP);</div><div class='del'>-	    break;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_parse_params(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    char *p, *q, t;</div><div class='del'>-</div><div class='del'>-    lp-&gt;params.fdx = false;</div><div class='del'>-    lp-&gt;params.autosense = AUTO;</div><div class='del'>-</div><div class='del'>-    if (args == NULL) return;</div><div class='del'>-</div><div class='del'>-    if ((p = strstr(args, dev-&gt;name))) {</div><div class='del'>-	if (!(q = strstr(p+strlen(dev-&gt;name), "eth"))) q = p + strlen(p);</div><div class='del'>-	t = *q;</div><div class='del'>-	*q = '\0';</div><div class='del'>-</div><div class='del'>-	if (strstr(p, "fdx") || strstr(p, "FDX")) lp-&gt;params.fdx = true;</div><div class='del'>-</div><div class='del'>-	if (strstr(p, "autosense") || strstr(p, "AUTOSENSE")) {</div><div class='del'>-	    if (strstr(p, "TP_NW")) {</div><div class='del'>-		lp-&gt;params.autosense = TP_NW;</div><div class='del'>-	    } else if (strstr(p, "TP")) {</div><div class='del'>-		lp-&gt;params.autosense = TP;</div><div class='del'>-	    } else if (strstr(p, "BNC_AUI")) {</div><div class='del'>-		lp-&gt;params.autosense = BNC;</div><div class='del'>-	    } else if (strstr(p, "BNC")) {</div><div class='del'>-		lp-&gt;params.autosense = BNC;</div><div class='del'>-	    } else if (strstr(p, "AUI")) {</div><div class='del'>-		lp-&gt;params.autosense = AUI;</div><div class='del'>-	    } else if (strstr(p, "10Mb")) {</div><div class='del'>-		lp-&gt;params.autosense = _10Mb;</div><div class='del'>-	    } else if (strstr(p, "100Mb")) {</div><div class='del'>-		lp-&gt;params.autosense = _100Mb;</div><div class='del'>-	    } else if (strstr(p, "AUTO")) {</div><div class='del'>-		lp-&gt;params.autosense = AUTO;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	*q = t;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_dbg_open(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_OPEN) {</div><div class='del'>-	printk("%s: de4x5 opening with irq %d\n",dev-&gt;name,dev-&gt;irq);</div><div class='del'>-	printk("\tphysical address: %pM\n", dev-&gt;dev_addr);</div><div class='del'>-	printk("Descriptor head addresses:\n");</div><div class='del'>-	printk("\t0x%8.8lx  0x%8.8lx\n",(u_long)lp-&gt;rx_ring,(u_long)lp-&gt;tx_ring);</div><div class='del'>-	printk("Descriptor addresses:\nRX: ");</div><div class='del'>-	for (i=0;i&lt;lp-&gt;rxRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		printk("0x%8.8lx  ",(u_long)&amp;lp-&gt;rx_ring[i].status);</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	printk("...0x%8.8lx\n",(u_long)&amp;lp-&gt;rx_ring[i].status);</div><div class='del'>-	printk("TX: ");</div><div class='del'>-	for (i=0;i&lt;lp-&gt;txRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		printk("0x%8.8lx  ", (u_long)&amp;lp-&gt;tx_ring[i].status);</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	printk("...0x%8.8lx\n", (u_long)&amp;lp-&gt;tx_ring[i].status);</div><div class='del'>-	printk("Descriptor buffers:\nRX: ");</div><div class='del'>-	for (i=0;i&lt;lp-&gt;rxRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		printk("0x%8.8x  ",le32_to_cpu(lp-&gt;rx_ring[i].buf));</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	printk("...0x%8.8x\n",le32_to_cpu(lp-&gt;rx_ring[i].buf));</div><div class='del'>-	printk("TX: ");</div><div class='del'>-	for (i=0;i&lt;lp-&gt;txRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		printk("0x%8.8x  ", le32_to_cpu(lp-&gt;tx_ring[i].buf));</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	printk("...0x%8.8x\n", le32_to_cpu(lp-&gt;tx_ring[i].buf));</div><div class='del'>-	printk("Ring size:\nRX: %d\nTX: %d\n",</div><div class='del'>-	       (short)lp-&gt;rxRingSize,</div><div class='del'>-	       (short)lp-&gt;txRingSize);</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_dbg_mii(struct net_device *dev, int k)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_MII) {</div><div class='del'>-	printk("\nMII device address: %d\n", lp-&gt;phy[k].addr);</div><div class='del'>-	printk("MII CR:  %x\n",mii_rd(MII_CR,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	printk("MII SR:  %x\n",mii_rd(MII_SR,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	printk("MII ID0: %x\n",mii_rd(MII_ID0,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	printk("MII ID1: %x\n",mii_rd(MII_ID1,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	if (lp-&gt;phy[k].id != BROADCOM_T4) {</div><div class='del'>-	    printk("MII ANA: %x\n",mii_rd(0x04,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	    printk("MII ANC: %x\n",mii_rd(0x05,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	}</div><div class='del'>-	printk("MII 16:  %x\n",mii_rd(0x10,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	if (lp-&gt;phy[k].id != BROADCOM_T4) {</div><div class='del'>-	    printk("MII 17:  %x\n",mii_rd(0x11,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	    printk("MII 18:  %x\n",mii_rd(0x12,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	} else {</div><div class='del'>-	    printk("MII 20:  %x\n",mii_rd(0x14,lp-&gt;phy[k].addr,DE4X5_MII));</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_dbg_media(struct net_device *dev)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-</div><div class='del'>-    if (lp-&gt;media != lp-&gt;c_media) {</div><div class='del'>-	if (de4x5_debug &amp; DEBUG_MEDIA) {</div><div class='del'>-	    printk("%s: media is %s%s\n", dev-&gt;name,</div><div class='del'>-		   (lp-&gt;media == NC  ? "unconnected, link down or incompatible connection" :</div><div class='del'>-		    (lp-&gt;media == TP  ? "TP" :</div><div class='del'>-		     (lp-&gt;media == ANS ? "TP/Nway" :</div><div class='del'>-		      (lp-&gt;media == BNC ? "BNC" :</div><div class='del'>-		       (lp-&gt;media == AUI ? "AUI" :</div><div class='del'>-			(lp-&gt;media == BNC_AUI ? "BNC/AUI" :</div><div class='del'>-			 (lp-&gt;media == EXT_SIA ? "EXT SIA" :</div><div class='del'>-			  (lp-&gt;media == _100Mb  ? "100Mb/s" :</div><div class='del'>-			   (lp-&gt;media == _10Mb   ? "10Mb/s" :</div><div class='del'>-			    "???"</div><div class='del'>-			    ))))))))), (lp-&gt;fdx?" full duplex.":"."));</div><div class='del'>-	}</div><div class='del'>-	lp-&gt;c_media = lp-&gt;media;</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_dbg_srom(struct de4x5_srom *p)</div><div class='del'>-{</div><div class='del'>-    int i;</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_SROM) {</div><div class='del'>-	printk("Sub-system Vendor ID: %04x\n", *((u_short *)p-&gt;sub_vendor_id));</div><div class='del'>-	printk("Sub-system ID:        %04x\n", *((u_short *)p-&gt;sub_system_id));</div><div class='del'>-	printk("ID Block CRC:         %02x\n", (u_char)(p-&gt;id_block_crc));</div><div class='del'>-	printk("SROM version:         %02x\n", (u_char)(p-&gt;version));</div><div class='del'>-	printk("# controllers:        %02x\n", (u_char)(p-&gt;num_controllers));</div><div class='del'>-</div><div class='del'>-	printk("Hardware Address:     %pM\n", p-&gt;ieee_addr);</div><div class='del'>-	printk("CRC checksum:         %04x\n", (u_short)(p-&gt;chksum));</div><div class='del'>-	for (i=0; i&lt;64; i++) {</div><div class='del'>-	    printk("%3d %04x\n", i&lt;&lt;1, (u_short)*((u_short *)p+i));</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-de4x5_dbg_rx(struct sk_buff *skb, int len)</div><div class='del'>-{</div><div class='del'>-    int i, j;</div><div class='del'>-</div><div class='del'>-    if (de4x5_debug &amp; DEBUG_RX) {</div><div class='del'>-	printk("R: %pM &lt;- %pM len/SAP:%02x%02x [%d]\n",</div><div class='del'>-	       skb-&gt;data, &amp;skb-&gt;data[6],</div><div class='del'>-	       (u_char)skb-&gt;data[12],</div><div class='del'>-	       (u_char)skb-&gt;data[13],</div><div class='del'>-	       len);</div><div class='del'>-	for (j=0; len&gt;0;j+=16, len-=16) {</div><div class='del'>-	  printk("    %03x: ",j);</div><div class='del'>-	  for (i=0; i&lt;16 &amp;&amp; i&lt;len; i++) {</div><div class='del'>-	    printk("%02x ",(u_char)skb-&gt;data[i+j]);</div><div class='del'>-	  }</div><div class='del'>-	  printk("\n");</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Perform IOCTL call functions here. Some are privileged operations and the</div><div class='del'>-** effective uid is checked in those cases. In the normal course of events</div><div class='del'>-** this function is only used for my testing.</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-    struct de4x5_private *lp = netdev_priv(dev);</div><div class='del'>-    struct de4x5_ioctl *ioc = (struct de4x5_ioctl *) &amp;rq-&gt;ifr_ifru;</div><div class='del'>-    u_long iobase = dev-&gt;base_addr;</div><div class='del'>-    int i, j, status = 0;</div><div class='del'>-    s32 omr;</div><div class='del'>-    union {</div><div class='del'>-	u8  addr[144];</div><div class='del'>-	u16 sval[72];</div><div class='del'>-	u32 lval[36];</div><div class='del'>-    } tmp;</div><div class='del'>-    u_long flags = 0;</div><div class='del'>-</div><div class='del'>-    switch(ioc-&gt;cmd) {</div><div class='del'>-    case DE4X5_GET_HWADDR:           /* Get the hardware address */</div><div class='del'>-	ioc-&gt;len = ETH_ALEN;</div><div class='del'>-	for (i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-	    tmp.addr[i] = dev-&gt;dev_addr[i];</div><div class='del'>-	}</div><div class='del'>-	if (copy_to_user(ioc-&gt;data, tmp.addr, ioc-&gt;len)) return -EFAULT;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_SET_HWADDR:           /* Set the hardware address */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN)) return -EPERM;</div><div class='del'>-	if (copy_from_user(tmp.addr, ioc-&gt;data, ETH_ALEN)) return -EFAULT;</div><div class='del'>-	if (netif_queue_stopped(dev))</div><div class='del'>-		return -EBUSY;</div><div class='del'>-	netif_stop_queue(dev);</div><div class='del'>-	for (i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-	    dev-&gt;dev_addr[i] = tmp.addr[i];</div><div class='del'>-	}</div><div class='del'>-	build_setup_frame(dev, PHYS_ADDR_ONLY);</div><div class='del'>-	/* Set up the descriptor and give ownership to the card */</div><div class='del'>-	load_packet(dev, lp-&gt;setup_frame, TD_IC | PERFECT_F | TD_SET |</div><div class='del'>-		                                       SETUP_FRAME_LEN, (struct sk_buff *)1);</div><div class='del'>-	lp-&gt;tx_new = (lp-&gt;tx_new + 1) % lp-&gt;txRingSize;</div><div class='del'>-	outl(POLL_DEMAND, DE4X5_TPD);                /* Start the TX */</div><div class='del'>-	netif_wake_queue(dev);                      /* Unlock the TX ring */</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_SAY_BOO:              /* Say "Boo!" to the kernel log file */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN)) return -EPERM;</div><div class='del'>-	printk("%s: Boo!\n", dev-&gt;name);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_MCA_EN:               /* Enable pass all multicast addressing */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN)) return -EPERM;</div><div class='del'>-	omr = inl(DE4X5_OMR);</div><div class='del'>-	omr |= OMR_PM;</div><div class='del'>-	outl(omr, DE4X5_OMR);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_GET_STATS:            /* Get the driver statistics */</div><div class='del'>-    {</div><div class='del'>-        struct pkt_stats statbuf;</div><div class='del'>-	ioc-&gt;len = sizeof(statbuf);</div><div class='del'>-	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-	memcpy(&amp;statbuf, &amp;lp-&gt;pktStats, ioc-&gt;len);</div><div class='del'>-	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-	if (copy_to_user(ioc-&gt;data, &amp;statbuf, ioc-&gt;len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	break;</div><div class='del'>-    }</div><div class='del'>-    case DE4X5_CLR_STATS:            /* Zero out the driver statistics */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN)) return -EPERM;</div><div class='del'>-	spin_lock_irqsave(&amp;lp-&gt;lock, flags);</div><div class='del'>-	memset(&amp;lp-&gt;pktStats, 0, sizeof(lp-&gt;pktStats));</div><div class='del'>-	spin_unlock_irqrestore(&amp;lp-&gt;lock, flags);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_GET_OMR:              /* Get the OMR Register contents */</div><div class='del'>-	tmp.addr[0] = inl(DE4X5_OMR);</div><div class='del'>-	if (copy_to_user(ioc-&gt;data, tmp.addr, 1)) return -EFAULT;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_SET_OMR:              /* Set the OMR Register contents */</div><div class='del'>-	if (!capable(CAP_NET_ADMIN)) return -EPERM;</div><div class='del'>-	if (copy_from_user(tmp.addr, ioc-&gt;data, 1)) return -EFAULT;</div><div class='del'>-	outl(tmp.addr[0], DE4X5_OMR);</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-    case DE4X5_GET_REG:              /* Get the DE4X5 Registers */</div><div class='del'>-	j = 0;</div><div class='del'>-	tmp.lval[0] = inl(DE4X5_STS); j+=4;</div><div class='del'>-	tmp.lval[1] = inl(DE4X5_BMR); j+=4;</div><div class='del'>-	tmp.lval[2] = inl(DE4X5_IMR); j+=4;</div><div class='del'>-	tmp.lval[3] = inl(DE4X5_OMR); j+=4;</div><div class='del'>-	tmp.lval[4] = inl(DE4X5_SISR); j+=4;</div><div class='del'>-	tmp.lval[5] = inl(DE4X5_SICR); j+=4;</div><div class='del'>-	tmp.lval[6] = inl(DE4X5_STRR); j+=4;</div><div class='del'>-	tmp.lval[7] = inl(DE4X5_SIGR); j+=4;</div><div class='del'>-	ioc-&gt;len = j;</div><div class='del'>-	if (copy_to_user(ioc-&gt;data, tmp.lval, ioc-&gt;len))</div><div class='del'>-		return -EFAULT;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-#define DE4X5_DUMP              0x0f /* Dump the DE4X5 Status */</div><div class='del'>-/*</div><div class='del'>-      case DE4X5_DUMP:</div><div class='del'>-	j = 0;</div><div class='del'>-	tmp.addr[j++] = dev-&gt;irq;</div><div class='del'>-	for (i=0; i&lt;ETH_ALEN; i++) {</div><div class='del'>-	    tmp.addr[j++] = dev-&gt;dev_addr[i];</div><div class='del'>-	}</div><div class='del'>-	tmp.addr[j++] = lp-&gt;rxRingSize;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = (long)lp-&gt;rx_ring; j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = (long)lp-&gt;tx_ring; j+=4;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;lp-&gt;rxRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		tmp.lval[j&gt;&gt;2] = (long)&amp;lp-&gt;rx_ring[i].status; j+=4;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = (long)&amp;lp-&gt;rx_ring[i].status; j+=4;</div><div class='del'>-	for (i=0;i&lt;lp-&gt;txRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		tmp.lval[j&gt;&gt;2] = (long)&amp;lp-&gt;tx_ring[i].status; j+=4;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = (long)&amp;lp-&gt;tx_ring[i].status; j+=4;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;lp-&gt;rxRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		tmp.lval[j&gt;&gt;2] = (s32)le32_to_cpu(lp-&gt;rx_ring[i].buf); j+=4;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = (s32)le32_to_cpu(lp-&gt;rx_ring[i].buf); j+=4;</div><div class='del'>-	for (i=0;i&lt;lp-&gt;txRingSize-1;i++){</div><div class='del'>-	    if (i &lt; 3) {</div><div class='del'>-		tmp.lval[j&gt;&gt;2] = (s32)le32_to_cpu(lp-&gt;tx_ring[i].buf); j+=4;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = (s32)le32_to_cpu(lp-&gt;tx_ring[i].buf); j+=4;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;lp-&gt;rxRingSize;i++){</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = le32_to_cpu(lp-&gt;rx_ring[i].status); j+=4;</div><div class='del'>-	}</div><div class='del'>-	for (i=0;i&lt;lp-&gt;txRingSize;i++){</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = le32_to_cpu(lp-&gt;tx_ring[i].status); j+=4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_BMR);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_TPD);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_RPD);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_RRBA); j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_TRBA); j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_STS);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_OMR);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = inl(DE4X5_IMR);  j+=4;</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = lp-&gt;chipset; j+=4;</div><div class='del'>-	if (lp-&gt;chipset == DC21140) {</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = gep_rd(dev);  j+=4;</div><div class='del'>-	} else {</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SISR); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SICR); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_STRR); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = inl(DE4X5_SIGR); j+=4;</div><div class='del'>-	}</div><div class='del'>-	tmp.lval[j&gt;&gt;2] = lp-&gt;phy[lp-&gt;active].id; j+=4;</div><div class='del'>-	if (lp-&gt;phy[lp-&gt;active].id &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {</div><div class='del'>-	    tmp.lval[j&gt;&gt;2] = lp-&gt;active; j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_CR,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_SR,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_ID0,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    tmp.lval[j&gt;&gt;2]=mii_rd(MII_ID1,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    if (lp-&gt;phy[lp-&gt;active].id != BROADCOM_T4) {</div><div class='del'>-		tmp.lval[j&gt;&gt;2]=mii_rd(MII_ANA,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-		tmp.lval[j&gt;&gt;2]=mii_rd(MII_ANLPA,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    }</div><div class='del'>-	    tmp.lval[j&gt;&gt;2]=mii_rd(0x10,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    if (lp-&gt;phy[lp-&gt;active].id != BROADCOM_T4) {</div><div class='del'>-		tmp.lval[j&gt;&gt;2]=mii_rd(0x11,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-		tmp.lval[j&gt;&gt;2]=mii_rd(0x12,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    } else {</div><div class='del'>-		tmp.lval[j&gt;&gt;2]=mii_rd(0x14,lp-&gt;phy[lp-&gt;active].addr,DE4X5_MII); j+=4;</div><div class='del'>-	    }</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp.addr[j++] = lp-&gt;txRingSize;</div><div class='del'>-	tmp.addr[j++] = netif_queue_stopped(dev);</div><div class='del'>-</div><div class='del'>-	ioc-&gt;len = j;</div><div class='del'>-	if (copy_to_user(ioc-&gt;data, tmp.addr, ioc-&gt;len)) return -EFAULT;</div><div class='del'>-	break;</div><div class='del'>-</div><div class='del'>-*/</div><div class='del'>-    default:</div><div class='del'>-	return -EOPNOTSUPP;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int __init de4x5_module_init (void)</div><div class='del'>-{</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	err = pci_register_driver(&amp;de4x5_pci_driver);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_EISA</div><div class='del'>-	err |= eisa_driver_register (&amp;de4x5_eisa_driver);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit de4x5_module_exit (void)</div><div class='del'>-{</div><div class='del'>-#ifdef CONFIG_PCI</div><div class='del'>-	pci_unregister_driver (&amp;de4x5_pci_driver);</div><div class='del'>-#endif</div><div class='del'>-#ifdef CONFIG_EISA</div><div class='del'>-	eisa_driver_unregister (&amp;de4x5_eisa_driver);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init (de4x5_module_init);</div><div class='del'>-module_exit (de4x5_module_exit);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/de4x5.h b/drivers/net/ethernet/dec/tulip/de4x5.h<br/>deleted file mode 100644<br/>index 1bfdc9b117f6..000000000000<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/de4x5.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/de4x5.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1017 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-    Copyright 1994 Digital Equipment Corporation.</div><div class='del'>-</div><div class='del'>-    This software may be used and distributed according to  the terms of the</div><div class='del'>-    GNU General Public License, incorporated herein by reference.</div><div class='del'>-</div><div class='del'>-    The author may    be  reached as davies@wanton.lkg.dec.com  or   Digital</div><div class='del'>-    Equipment Corporation, 550 King Street, Littleton MA 01460.</div><div class='del'>-</div><div class='del'>-    =========================================================================</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 CSR&lt;1..15&gt; Register Address Map</div><div class='del'>-*/</div><div class='del'>-#define DE4X5_BMR    iobase+(0x000 &lt;&lt; lp-&gt;bus)  /* Bus Mode Register */</div><div class='del'>-#define DE4X5_TPD    iobase+(0x008 &lt;&lt; lp-&gt;bus)  /* Transmit Poll Demand Reg */</div><div class='del'>-#define DE4X5_RPD    iobase+(0x010 &lt;&lt; lp-&gt;bus)  /* Receive Poll Demand Reg */</div><div class='del'>-#define DE4X5_RRBA   iobase+(0x018 &lt;&lt; lp-&gt;bus)  /* RX Ring Base Address Reg */</div><div class='del'>-#define DE4X5_TRBA   iobase+(0x020 &lt;&lt; lp-&gt;bus)  /* TX Ring Base Address Reg */</div><div class='del'>-#define DE4X5_STS    iobase+(0x028 &lt;&lt; lp-&gt;bus)  /* Status Register */</div><div class='del'>-#define DE4X5_OMR    iobase+(0x030 &lt;&lt; lp-&gt;bus)  /* Operation Mode Register */</div><div class='del'>-#define DE4X5_IMR    iobase+(0x038 &lt;&lt; lp-&gt;bus)  /* Interrupt Mask Register */</div><div class='del'>-#define DE4X5_MFC    iobase+(0x040 &lt;&lt; lp-&gt;bus)  /* Missed Frame Counter */</div><div class='del'>-#define DE4X5_APROM  iobase+(0x048 &lt;&lt; lp-&gt;bus)  /* Ethernet Address PROM */</div><div class='del'>-#define DE4X5_BROM   iobase+(0x048 &lt;&lt; lp-&gt;bus)  /* Boot ROM Register */</div><div class='del'>-#define DE4X5_SROM   iobase+(0x048 &lt;&lt; lp-&gt;bus)  /* Serial ROM Register */</div><div class='del'>-#define DE4X5_MII    iobase+(0x048 &lt;&lt; lp-&gt;bus)  /* MII Interface Register */</div><div class='del'>-#define DE4X5_DDR    iobase+(0x050 &lt;&lt; lp-&gt;bus)  /* Data Diagnostic Register */</div><div class='del'>-#define DE4X5_FDR    iobase+(0x058 &lt;&lt; lp-&gt;bus)  /* Full Duplex Register */</div><div class='del'>-#define DE4X5_GPT    iobase+(0x058 &lt;&lt; lp-&gt;bus)  /* General Purpose Timer Reg.*/</div><div class='del'>-#define DE4X5_GEP    iobase+(0x060 &lt;&lt; lp-&gt;bus)  /* General Purpose Register */</div><div class='del'>-#define DE4X5_SISR   iobase+(0x060 &lt;&lt; lp-&gt;bus)  /* SIA Status Register */</div><div class='del'>-#define DE4X5_SICR   iobase+(0x068 &lt;&lt; lp-&gt;bus)  /* SIA Connectivity Register */</div><div class='del'>-#define DE4X5_STRR   iobase+(0x070 &lt;&lt; lp-&gt;bus)  /* SIA TX/RX Register */</div><div class='del'>-#define DE4X5_SIGR   iobase+(0x078 &lt;&lt; lp-&gt;bus)  /* SIA General Register */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** EISA Register Address Map</div><div class='del'>-*/</div><div class='del'>-#define EISA_ID      iobase+0x0c80   /* EISA ID Registers */</div><div class='del'>-#define EISA_ID0     iobase+0x0c80   /* EISA ID Register 0 */</div><div class='del'>-#define EISA_ID1     iobase+0x0c81   /* EISA ID Register 1 */</div><div class='del'>-#define EISA_ID2     iobase+0x0c82   /* EISA ID Register 2 */</div><div class='del'>-#define EISA_ID3     iobase+0x0c83   /* EISA ID Register 3 */</div><div class='del'>-#define EISA_CR      iobase+0x0c84   /* EISA Control Register */</div><div class='del'>-#define EISA_REG0    iobase+0x0c88   /* EISA Configuration Register 0 */</div><div class='del'>-#define EISA_REG1    iobase+0x0c89   /* EISA Configuration Register 1 */</div><div class='del'>-#define EISA_REG2    iobase+0x0c8a   /* EISA Configuration Register 2 */</div><div class='del'>-#define EISA_REG3    iobase+0x0c8f   /* EISA Configuration Register 3 */</div><div class='del'>-#define EISA_APROM   iobase+0x0c90   /* Ethernet Address PROM */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI/EISA Configuration Registers Address Map</div><div class='del'>-*/</div><div class='del'>-#define PCI_CFID     iobase+0x0008   /* PCI Configuration ID Register */</div><div class='del'>-#define PCI_CFCS     iobase+0x000c   /* PCI Command/Status Register */</div><div class='del'>-#define PCI_CFRV     iobase+0x0018   /* PCI Revision Register */</div><div class='del'>-#define PCI_CFLT     iobase+0x001c   /* PCI Latency Timer Register */</div><div class='del'>-#define PCI_CBIO     iobase+0x0028   /* PCI Base I/O Register */</div><div class='del'>-#define PCI_CBMA     iobase+0x002c   /* PCI Base Memory Address Register */</div><div class='del'>-#define PCI_CBER     iobase+0x0030   /* PCI Expansion ROM Base Address Reg. */</div><div class='del'>-#define PCI_CFIT     iobase+0x003c   /* PCI Configuration Interrupt Register */</div><div class='del'>-#define PCI_CFDA     iobase+0x0040   /* PCI Driver Area Register */</div><div class='del'>-#define PCI_CFDD     iobase+0x0041   /* PCI Driver Dependent Area Register */</div><div class='del'>-#define PCI_CFPM     iobase+0x0043   /* PCI Power Management Area Register */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** EISA Configuration Register 0 bit definitions</div><div class='del'>-*/</div><div class='del'>-#define ER0_BSW       0x80           /* EISA Bus Slave Width, 1: 32 bits */</div><div class='del'>-#define ER0_BMW       0x40           /* EISA Bus Master Width, 1: 32 bits */</div><div class='del'>-#define ER0_EPT       0x20           /* EISA PREEMPT Time, 0: 23 BCLKs */</div><div class='del'>-#define ER0_ISTS      0x10           /* Interrupt Status (X) */</div><div class='del'>-#define ER0_LI        0x08           /* Latch Interrupts */</div><div class='del'>-#define ER0_INTL      0x06           /* INTerrupt Level */</div><div class='del'>-#define ER0_INTT      0x01           /* INTerrupt Type, 0: Level, 1: Edge */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** EISA Configuration Register 1 bit definitions</div><div class='del'>-*/</div><div class='del'>-#define ER1_IAM       0xe0           /* ISA Address Mode */</div><div class='del'>-#define ER1_IAE       0x10           /* ISA Addressing Enable */</div><div class='del'>-#define ER1_UPIN      0x0f           /* User Pins */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** EISA Configuration Register 2 bit definitions</div><div class='del'>-*/</div><div class='del'>-#define ER2_BRS       0xc0           /* Boot ROM Size */</div><div class='del'>-#define ER2_BRA       0x3c           /* Boot ROM Address &lt;16:13&gt; */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** EISA Configuration Register 3 bit definitions</div><div class='del'>-*/</div><div class='del'>-#define ER3_BWE       0x40           /* Burst Write Enable */</div><div class='del'>-#define ER3_BRE       0x04           /* Burst Read Enable */</div><div class='del'>-#define ER3_LSR       0x02           /* Local Software Reset */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration ID Register (PCI_CFID). The Device IDs are left</div><div class='del'>-** shifted 8 bits to allow detection of DC21142 and DC21143 variants with</div><div class='del'>-** the configuration revision register step number.</div><div class='del'>-*/</div><div class='del'>-#define CFID_DID    0xff00           /* Device ID */</div><div class='del'>-#define CFID_VID    0x00ff           /* Vendor ID */</div><div class='del'>-#define DC21040_DID 0x0200           /* Unique Device ID # */</div><div class='del'>-#define DC21040_VID 0x1011           /* DC21040 Manufacturer */</div><div class='del'>-#define DC21041_DID 0x1400           /* Unique Device ID # */</div><div class='del'>-#define DC21041_VID 0x1011           /* DC21041 Manufacturer */</div><div class='del'>-#define DC21140_DID 0x0900           /* Unique Device ID # */</div><div class='del'>-#define DC21140_VID 0x1011           /* DC21140 Manufacturer */</div><div class='del'>-#define DC2114x_DID 0x1900           /* Unique Device ID # */</div><div class='del'>-#define DC2114x_VID 0x1011           /* DC2114[23] Manufacturer */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Chipset defines</div><div class='del'>-*/</div><div class='del'>-#define DC21040     DC21040_DID</div><div class='del'>-#define DC21041     DC21041_DID</div><div class='del'>-#define DC21140     DC21140_DID</div><div class='del'>-#define DC2114x     DC2114x_DID</div><div class='del'>-#define DC21142     (DC2114x_DID | 0x0010)</div><div class='del'>-#define DC21143     (DC2114x_DID | 0x0030)</div><div class='del'>-#define DC2114x_BRK 0x0020           /* CFRV break between DC21142 &amp; DC21143 */</div><div class='del'>-</div><div class='del'>-#define is_DC21040 ((vendor == DC21040_VID) &amp;&amp; (device == DC21040_DID))</div><div class='del'>-#define is_DC21041 ((vendor == DC21041_VID) &amp;&amp; (device == DC21041_DID))</div><div class='del'>-#define is_DC21140 ((vendor == DC21140_VID) &amp;&amp; (device == DC21140_DID))</div><div class='del'>-#define is_DC2114x ((vendor == DC2114x_VID) &amp;&amp; (device == DC2114x_DID))</div><div class='del'>-#define is_DC21142 ((vendor == DC2114x_VID) &amp;&amp; (device == DC21142))</div><div class='del'>-#define is_DC21143 ((vendor == DC2114x_VID) &amp;&amp; (device == DC21143))</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Command/Status Register (PCI_CFCS)</div><div class='del'>-*/</div><div class='del'>-#define CFCS_DPE    0x80000000       /* Detected Parity Error (S) */</div><div class='del'>-#define CFCS_SSE    0x40000000       /* Signal System Error   (S) */</div><div class='del'>-#define CFCS_RMA    0x20000000       /* Receive Master Abort  (S) */</div><div class='del'>-#define CFCS_RTA    0x10000000       /* Receive Target Abort  (S) */</div><div class='del'>-#define CFCS_DST    0x06000000       /* DEVSEL Timing         (S) */</div><div class='del'>-#define CFCS_DPR    0x01000000       /* Data Parity Report    (S) */</div><div class='del'>-#define CFCS_FBB    0x00800000       /* Fast Back-To-Back     (S) */</div><div class='del'>-#define CFCS_SEE    0x00000100       /* System Error Enable   (C) */</div><div class='del'>-#define CFCS_PER    0x00000040       /* Parity Error Response (C) */</div><div class='del'>-#define CFCS_MO     0x00000004       /* Master Operation      (C) */</div><div class='del'>-#define CFCS_MSA    0x00000002       /* Memory Space Access   (C) */</div><div class='del'>-#define CFCS_IOSA   0x00000001       /* I/O Space Access      (C) */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Revision Register (PCI_CFRV)</div><div class='del'>-*/</div><div class='del'>-#define CFRV_BC     0xff000000       /* Base Class */</div><div class='del'>-#define CFRV_SC     0x00ff0000       /* Subclass */</div><div class='del'>-#define CFRV_RN     0x000000f0       /* Revision Number */</div><div class='del'>-#define CFRV_SN     0x0000000f       /* Step Number */</div><div class='del'>-#define BASE_CLASS  0x02000000       /* Indicates Network Controller */</div><div class='del'>-#define SUB_CLASS   0x00000000       /* Indicates Ethernet Controller */</div><div class='del'>-#define STEP_NUMBER 0x00000020       /* Increments for future chips */</div><div class='del'>-#define REV_NUMBER  0x00000003       /* 0x00, 0x01, 0x02, 0x03: Rev in Step */</div><div class='del'>-#define CFRV_MASK   0xffff0000       /* Register mask */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Latency Timer Register (PCI_CFLT)</div><div class='del'>-*/</div><div class='del'>-#define CFLT_BC     0x0000ff00       /* Latency Timer bits */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Base I/O Address Register (PCI_CBIO)</div><div class='del'>-*/</div><div class='del'>-#define CBIO_MASK   -128             /* Base I/O Address Mask */</div><div class='del'>-#define CBIO_IOSI   0x00000001       /* I/O Space Indicator (RO, value is 1) */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Card Information Structure Register (PCI_CCIS)</div><div class='del'>-*/</div><div class='del'>-#define CCIS_ROMI   0xf0000000       /* ROM Image */</div><div class='del'>-#define CCIS_ASO    0x0ffffff8       /* Address Space Offset */</div><div class='del'>-#define CCIS_ASI    0x00000007       /* Address Space Indicator */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Subsystem ID Register (PCI_SSID)</div><div class='del'>-*/</div><div class='del'>-#define SSID_SSID   0xffff0000       /* Subsystem ID */</div><div class='del'>-#define SSID_SVID   0x0000ffff       /* Subsystem Vendor ID */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Expansion ROM Base Address Register (PCI_CBER)</div><div class='del'>-*/</div><div class='del'>-#define CBER_MASK   0xfffffc00       /* Expansion ROM Base Address Mask */</div><div class='del'>-#define CBER_ROME   0x00000001       /* ROM Enable */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Interrupt Register (PCI_CFIT)</div><div class='del'>-*/</div><div class='del'>-#define CFIT_MXLT   0xff000000       /* MAX_LAT Value (0.25us periods) */</div><div class='del'>-#define CFIT_MNGT   0x00ff0000       /* MIN_GNT Value (0.25us periods) */</div><div class='del'>-#define CFIT_IRQP   0x0000ff00       /* Interrupt Pin */</div><div class='del'>-#define CFIT_IRQL   0x000000ff       /* Interrupt Line */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** PCI Configuration Power Management Area Register (PCI_CFPM)</div><div class='del'>-*/</div><div class='del'>-#define SLEEP       0x80             /* Power Saving Sleep Mode */</div><div class='del'>-#define SNOOZE      0x40             /* Power Saving Snooze Mode */</div><div class='del'>-#define WAKEUP      0x00             /* Power Saving Wakeup */</div><div class='del'>-</div><div class='del'>-#define PCI_CFDA_DSU 0x41            /* 8 bit Configuration Space Address */</div><div class='del'>-#define PCI_CFDA_PSM 0x43            /* 8 bit Configuration Space Address */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Bus Mode Register (DE4X5_BMR)</div><div class='del'>-*/</div><div class='del'>-#define BMR_RML    0x00200000       /* [Memory] Read Multiple */</div><div class='del'>-#define BMR_DBO    0x00100000       /* Descriptor Byte Ordering (Endian) */</div><div class='del'>-#define BMR_TAP    0x000e0000       /* Transmit Automatic Polling */</div><div class='del'>-#define BMR_DAS    0x00010000       /* Diagnostic Address Space */</div><div class='del'>-#define BMR_CAL    0x0000c000       /* Cache Alignment */</div><div class='del'>-#define BMR_PBL    0x00003f00       /* Programmable Burst Length */</div><div class='del'>-#define BMR_BLE    0x00000080       /* Big/Little Endian */</div><div class='del'>-#define BMR_DSL    0x0000007c       /* Descriptor Skip Length */</div><div class='del'>-#define BMR_BAR    0x00000002       /* Bus ARbitration */</div><div class='del'>-#define BMR_SWR    0x00000001       /* Software Reset */</div><div class='del'>-</div><div class='del'>-                                    /* Timings here are for 10BASE-T/AUI only*/</div><div class='del'>-#define TAP_NOPOLL 0x00000000       /* No automatic polling */</div><div class='del'>-#define TAP_200US  0x00020000       /* TX automatic polling every 200us */</div><div class='del'>-#define TAP_800US  0x00040000       /* TX automatic polling every 800us */</div><div class='del'>-#define TAP_1_6MS  0x00060000       /* TX automatic polling every 1.6ms */</div><div class='del'>-#define TAP_12_8US 0x00080000       /* TX automatic polling every 12.8us */</div><div class='del'>-#define TAP_25_6US 0x000a0000       /* TX automatic polling every 25.6us */</div><div class='del'>-#define TAP_51_2US 0x000c0000       /* TX automatic polling every 51.2us */</div><div class='del'>-#define TAP_102_4US 0x000e0000      /* TX automatic polling every 102.4us */</div><div class='del'>-</div><div class='del'>-#define CAL_NOUSE  0x00000000       /* Not used */</div><div class='del'>-#define CAL_8LONG  0x00004000       /* 8-longword alignment */</div><div class='del'>-#define CAL_16LONG 0x00008000       /* 16-longword alignment */</div><div class='del'>-#define CAL_32LONG 0x0000c000       /* 32-longword alignment */</div><div class='del'>-</div><div class='del'>-#define PBL_0      0x00000000       /*  DMA burst length = amount in RX FIFO */</div><div class='del'>-#define PBL_1      0x00000100       /*  1 longword  DMA burst length */</div><div class='del'>-#define PBL_2      0x00000200       /*  2 longwords DMA burst length */</div><div class='del'>-#define PBL_4      0x00000400       /*  4 longwords DMA burst length */</div><div class='del'>-#define PBL_8      0x00000800       /*  8 longwords DMA burst length */</div><div class='del'>-#define PBL_16     0x00001000       /* 16 longwords DMA burst length */</div><div class='del'>-#define PBL_32     0x00002000       /* 32 longwords DMA burst length */</div><div class='del'>-</div><div class='del'>-#define DSL_0      0x00000000       /*  0 longword  / descriptor */</div><div class='del'>-#define DSL_1      0x00000004       /*  1 longword  / descriptor */</div><div class='del'>-#define DSL_2      0x00000008       /*  2 longwords / descriptor */</div><div class='del'>-#define DSL_4      0x00000010       /*  4 longwords / descriptor */</div><div class='del'>-#define DSL_8      0x00000020       /*  8 longwords / descriptor */</div><div class='del'>-#define DSL_16     0x00000040       /* 16 longwords / descriptor */</div><div class='del'>-#define DSL_32     0x00000080       /* 32 longwords / descriptor */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Transmit Poll Demand Register (DE4X5_TPD)</div><div class='del'>-*/</div><div class='del'>-#define TPD        0x00000001       /* Transmit Poll Demand */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Receive Poll Demand Register (DE4X5_RPD)</div><div class='del'>-*/</div><div class='del'>-#define RPD        0x00000001       /* Receive Poll Demand */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Receive Ring Base Address Register (DE4X5_RRBA)</div><div class='del'>-*/</div><div class='del'>-#define RRBA       0xfffffffc       /* RX Descriptor List Start Address */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Transmit Ring Base Address Register (DE4X5_TRBA)</div><div class='del'>-*/</div><div class='del'>-#define TRBA       0xfffffffc       /* TX Descriptor List Start Address */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Status Register (DE4X5_STS)</div><div class='del'>-*/</div><div class='del'>-#define STS_GPI    0x04000000       /* General Purpose Port Interrupt */</div><div class='del'>-#define STS_BE     0x03800000       /* Bus Error Bits */</div><div class='del'>-#define STS_TS     0x00700000       /* Transmit Process State */</div><div class='del'>-#define STS_RS     0x000e0000       /* Receive Process State */</div><div class='del'>-#define STS_NIS    0x00010000       /* Normal Interrupt Summary */</div><div class='del'>-#define STS_AIS    0x00008000       /* Abnormal Interrupt Summary */</div><div class='del'>-#define STS_ER     0x00004000       /* Early Receive */</div><div class='del'>-#define STS_FBE    0x00002000       /* Fatal Bus Error */</div><div class='del'>-#define STS_SE     0x00002000       /* System Error */</div><div class='del'>-#define STS_LNF    0x00001000       /* Link Fail */</div><div class='del'>-#define STS_FD     0x00000800       /* Full-Duplex Short Frame Received */</div><div class='del'>-#define STS_TM     0x00000800       /* Timer Expired (DC21041) */</div><div class='del'>-#define STS_ETI    0x00000400       /* Early Transmit Interrupt */</div><div class='del'>-#define STS_AT     0x00000400       /* AUI/TP Pin */</div><div class='del'>-#define STS_RWT    0x00000200       /* Receive Watchdog Time-Out */</div><div class='del'>-#define STS_RPS    0x00000100       /* Receive Process Stopped */</div><div class='del'>-#define STS_RU     0x00000080       /* Receive Buffer Unavailable */</div><div class='del'>-#define STS_RI     0x00000040       /* Receive Interrupt */</div><div class='del'>-#define STS_UNF    0x00000020       /* Transmit Underflow */</div><div class='del'>-#define STS_LNP    0x00000010       /* Link Pass */</div><div class='del'>-#define STS_ANC    0x00000010       /* Autonegotiation Complete */</div><div class='del'>-#define STS_TJT    0x00000008       /* Transmit Jabber Time-Out */</div><div class='del'>-#define STS_TU     0x00000004       /* Transmit Buffer Unavailable */</div><div class='del'>-#define STS_TPS    0x00000002       /* Transmit Process Stopped */</div><div class='del'>-#define STS_TI     0x00000001       /* Transmit Interrupt */</div><div class='del'>-</div><div class='del'>-#define EB_PAR     0x00000000       /* Parity Error */</div><div class='del'>-#define EB_MA      0x00800000       /* Master Abort */</div><div class='del'>-#define EB_TA      0x01000000       /* Target Abort */</div><div class='del'>-#define EB_RES0    0x01800000       /* Reserved */</div><div class='del'>-#define EB_RES1    0x02000000       /* Reserved */</div><div class='del'>-</div><div class='del'>-#define TS_STOP    0x00000000       /* Stopped */</div><div class='del'>-#define TS_FTD     0x00100000       /* Fetch Transmit Descriptor */</div><div class='del'>-#define TS_WEOT    0x00200000       /* Wait for End Of Transmission */</div><div class='del'>-#define TS_QDAT    0x00300000       /* Queue skb data into TX FIFO */</div><div class='del'>-#define TS_RES     0x00400000       /* Reserved */</div><div class='del'>-#define TS_SPKT    0x00500000       /* Setup Packet */</div><div class='del'>-#define TS_SUSP    0x00600000       /* Suspended */</div><div class='del'>-#define TS_CLTD    0x00700000       /* Close Transmit Descriptor */</div><div class='del'>-</div><div class='del'>-#define RS_STOP    0x00000000       /* Stopped */</div><div class='del'>-#define RS_FRD     0x00020000       /* Fetch Receive Descriptor */</div><div class='del'>-#define RS_CEOR    0x00040000       /* Check for End of Receive Packet */</div><div class='del'>-#define RS_WFRP    0x00060000       /* Wait for Receive Packet */</div><div class='del'>-#define RS_SUSP    0x00080000       /* Suspended */</div><div class='del'>-#define RS_CLRD    0x000a0000       /* Close Receive Descriptor */</div><div class='del'>-#define RS_FLUSH   0x000c0000       /* Flush RX FIFO */</div><div class='del'>-#define RS_QRFS    0x000e0000       /* Queue RX FIFO into RX Skb */</div><div class='del'>-</div><div class='del'>-#define INT_CANCEL 0x0001ffff       /* For zeroing all interrupt sources */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Operation Mode Register (DE4X5_OMR)</div><div class='del'>-*/</div><div class='del'>-#define OMR_SC     0x80000000       /* Special Capture Effect Enable */</div><div class='del'>-#define OMR_RA     0x40000000       /* Receive All */</div><div class='del'>-#define OMR_SDP    0x02000000       /* SD Polarity - MUST BE ASSERTED */</div><div class='del'>-#define OMR_SCR    0x01000000       /* Scrambler Mode */</div><div class='del'>-#define OMR_PCS    0x00800000       /* PCS Function */</div><div class='del'>-#define OMR_TTM    0x00400000       /* Transmit Threshold Mode */</div><div class='del'>-#define OMR_SF     0x00200000       /* Store and Forward */</div><div class='del'>-#define OMR_HBD    0x00080000       /* HeartBeat Disable */</div><div class='del'>-#define OMR_PS     0x00040000       /* Port Select */</div><div class='del'>-#define OMR_CA     0x00020000       /* Capture Effect Enable */</div><div class='del'>-#define OMR_BP     0x00010000       /* Back Pressure */</div><div class='del'>-#define OMR_TR     0x0000c000       /* Threshold Control Bits */</div><div class='del'>-#define OMR_ST     0x00002000       /* Start/Stop Transmission Command */</div><div class='del'>-#define OMR_FC     0x00001000       /* Force Collision Mode */</div><div class='del'>-#define OMR_OM     0x00000c00       /* Operating Mode */</div><div class='del'>-#define OMR_FDX    0x00000200       /* Full Duplex Mode */</div><div class='del'>-#define OMR_FKD    0x00000100       /* Flaky Oscillator Disable */</div><div class='del'>-#define OMR_PM     0x00000080       /* Pass All Multicast */</div><div class='del'>-#define OMR_PR     0x00000040       /* Promiscuous Mode */</div><div class='del'>-#define OMR_SB     0x00000020       /* Start/Stop Backoff Counter */</div><div class='del'>-#define OMR_IF     0x00000010       /* Inverse Filtering */</div><div class='del'>-#define OMR_PB     0x00000008       /* Pass Bad Frames */</div><div class='del'>-#define OMR_HO     0x00000004       /* Hash Only Filtering Mode */</div><div class='del'>-#define OMR_SR     0x00000002       /* Start/Stop Receive */</div><div class='del'>-#define OMR_HP     0x00000001       /* Hash/Perfect Receive Filtering Mode */</div><div class='del'>-</div><div class='del'>-#define TR_72      0x00000000       /* Threshold set to 72 (128) bytes */</div><div class='del'>-#define TR_96      0x00004000       /* Threshold set to 96 (256) bytes */</div><div class='del'>-#define TR_128     0x00008000       /* Threshold set to 128 (512) bytes */</div><div class='del'>-#define TR_160     0x0000c000       /* Threshold set to 160 (1024) bytes */</div><div class='del'>-</div><div class='del'>-#define OMR_DEF     (OMR_SDP)</div><div class='del'>-#define OMR_SIA     (OMR_SDP | OMR_TTM)</div><div class='del'>-#define OMR_SYM     (OMR_SDP | OMR_SCR | OMR_PCS | OMR_HBD | OMR_PS)</div><div class='del'>-#define OMR_MII_10  (OMR_SDP | OMR_TTM | OMR_PS)</div><div class='del'>-#define OMR_MII_100 (OMR_SDP | OMR_HBD | OMR_PS)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Interrupt Mask Register (DE4X5_IMR)</div><div class='del'>-*/</div><div class='del'>-#define IMR_GPM    0x04000000       /* General Purpose Port Mask */</div><div class='del'>-#define IMR_NIM    0x00010000       /* Normal Interrupt Summary Mask */</div><div class='del'>-#define IMR_AIM    0x00008000       /* Abnormal Interrupt Summary Mask */</div><div class='del'>-#define IMR_ERM    0x00004000       /* Early Receive Mask */</div><div class='del'>-#define IMR_FBM    0x00002000       /* Fatal Bus Error Mask */</div><div class='del'>-#define IMR_SEM    0x00002000       /* System Error Mask */</div><div class='del'>-#define IMR_LFM    0x00001000       /* Link Fail Mask */</div><div class='del'>-#define IMR_FDM    0x00000800       /* Full-Duplex (Short Frame) Mask */</div><div class='del'>-#define IMR_TMM    0x00000800       /* Timer Expired Mask (DC21041) */</div><div class='del'>-#define IMR_ETM    0x00000400       /* Early Transmit Interrupt Mask */</div><div class='del'>-#define IMR_ATM    0x00000400       /* AUI/TP Switch Mask */</div><div class='del'>-#define IMR_RWM    0x00000200       /* Receive Watchdog Time-Out Mask */</div><div class='del'>-#define IMR_RSM    0x00000100       /* Receive Stopped Mask */</div><div class='del'>-#define IMR_RUM    0x00000080       /* Receive Buffer Unavailable Mask */</div><div class='del'>-#define IMR_RIM    0x00000040       /* Receive Interrupt Mask */</div><div class='del'>-#define IMR_UNM    0x00000020       /* Underflow Interrupt Mask */</div><div class='del'>-#define IMR_ANM    0x00000010       /* Autonegotiation Complete Mask */</div><div class='del'>-#define IMR_LPM    0x00000010       /* Link Pass */</div><div class='del'>-#define IMR_TJM    0x00000008       /* Transmit Time-Out Jabber Mask */</div><div class='del'>-#define IMR_TUM    0x00000004       /* Transmit Buffer Unavailable Mask */</div><div class='del'>-#define IMR_TSM    0x00000002       /* Transmission Stopped Mask */</div><div class='del'>-#define IMR_TIM    0x00000001       /* Transmit Interrupt Mask */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Missed Frames and FIFO Overflow Counters (DE4X5_MFC)</div><div class='del'>-*/</div><div class='del'>-#define MFC_FOCO   0x10000000       /* FIFO Overflow Counter Overflow Bit */</div><div class='del'>-#define MFC_FOC    0x0ffe0000       /* FIFO Overflow Counter Bits */</div><div class='del'>-#define MFC_OVFL   0x00010000       /* Missed Frames Counter Overflow Bit */</div><div class='del'>-#define MFC_CNTR   0x0000ffff       /* Missed Frames Counter Bits */</div><div class='del'>-#define MFC_FOCM   0x1ffe0000       /* FIFO Overflow Counter Mask */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Ethernet Address PROM (DE4X5_APROM)</div><div class='del'>-*/</div><div class='del'>-#define APROM_DN   0x80000000       /* Data Not Valid */</div><div class='del'>-#define APROM_DT   0x000000ff       /* Address Byte */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21041 Boot/Ethernet Address ROM (DE4X5_BROM)</div><div class='del'>-*/</div><div class='del'>-#define BROM_MODE 0x00008000       /* MODE_1: 0,  MODE_0: 1  (read only) */</div><div class='del'>-#define BROM_RD   0x00004000       /* Read from Boot ROM */</div><div class='del'>-#define BROM_WR   0x00002000       /* Write to Boot ROM */</div><div class='del'>-#define BROM_BR   0x00001000       /* Select Boot ROM when set */</div><div class='del'>-#define BROM_SR   0x00000800       /* Select Serial ROM when set */</div><div class='del'>-#define BROM_REG  0x00000400       /* External Register Select */</div><div class='del'>-#define BROM_DT   0x000000ff       /* Data Byte */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21041 Serial/Ethernet Address ROM (DE4X5_SROM, DE4X5_MII)</div><div class='del'>-*/</div><div class='del'>-#define MII_MDI   0x00080000       /* MII Management Data In */</div><div class='del'>-#define MII_MDO   0x00060000       /* MII Management Mode/Data Out */</div><div class='del'>-#define MII_MRD   0x00040000       /* MII Management Define Read Mode */</div><div class='del'>-#define MII_MWR   0x00000000       /* MII Management Define Write Mode */</div><div class='del'>-#define MII_MDT   0x00020000       /* MII Management Data Out */</div><div class='del'>-#define MII_MDC   0x00010000       /* MII Management Clock */</div><div class='del'>-#define MII_RD    0x00004000       /* Read from MII */</div><div class='del'>-#define MII_WR    0x00002000       /* Write to MII */</div><div class='del'>-#define MII_SEL   0x00000800       /* Select MII when RESET */</div><div class='del'>-</div><div class='del'>-#define SROM_MODE 0x00008000       /* MODE_1: 0,  MODE_0: 1  (read only) */</div><div class='del'>-#define SROM_RD   0x00004000       /* Read from Boot ROM */</div><div class='del'>-#define SROM_WR   0x00002000       /* Write to Boot ROM */</div><div class='del'>-#define SROM_BR   0x00001000       /* Select Boot ROM when set */</div><div class='del'>-#define SROM_SR   0x00000800       /* Select Serial ROM when set */</div><div class='del'>-#define SROM_REG  0x00000400       /* External Register Select */</div><div class='del'>-#define SROM_DT   0x000000ff       /* Data Byte */</div><div class='del'>-</div><div class='del'>-#define DT_OUT    0x00000008       /* Serial Data Out */</div><div class='del'>-#define DT_IN     0x00000004       /* Serial Data In */</div><div class='del'>-#define DT_CLK    0x00000002       /* Serial ROM Clock */</div><div class='del'>-#define DT_CS     0x00000001       /* Serial ROM Chip Select */</div><div class='del'>-</div><div class='del'>-#define MII_PREAMBLE 0xffffffff    /* MII Management Preamble */</div><div class='del'>-#define MII_TEST     0xaaaaaaaa    /* MII Test Signal */</div><div class='del'>-#define MII_STRD     0x06          /* Start of Frame+Op Code: use low nibble */</div><div class='del'>-#define MII_STWR     0x0a          /* Start of Frame+Op Code: use low nibble */</div><div class='del'>-</div><div class='del'>-#define MII_CR       0x00          /* MII Management Control Register */</div><div class='del'>-#define MII_SR       0x01          /* MII Management Status Register */</div><div class='del'>-#define MII_ID0      0x02          /* PHY Identifier Register 0 */</div><div class='del'>-#define MII_ID1      0x03          /* PHY Identifier Register 1 */</div><div class='del'>-#define MII_ANA      0x04          /* Auto Negotiation Advertisement */</div><div class='del'>-#define MII_ANLPA    0x05          /* Auto Negotiation Link Partner Ability */</div><div class='del'>-#define MII_ANE      0x06          /* Auto Negotiation Expansion */</div><div class='del'>-#define MII_ANP      0x07          /* Auto Negotiation Next Page TX */</div><div class='del'>-</div><div class='del'>-#define DE4X5_MAX_MII 32           /* Maximum address of MII PHY devices */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MII Management Control Register</div><div class='del'>-*/</div><div class='del'>-#define MII_CR_RST  0x8000         /* RESET the PHY chip */</div><div class='del'>-#define MII_CR_LPBK 0x4000         /* Loopback enable */</div><div class='del'>-#define MII_CR_SPD  0x2000         /* 0: 10Mb/s; 1: 100Mb/s */</div><div class='del'>-#define MII_CR_10   0x0000         /* Set 10Mb/s */</div><div class='del'>-#define MII_CR_100  0x2000         /* Set 100Mb/s */</div><div class='del'>-#define MII_CR_ASSE 0x1000         /* Auto Speed Select Enable */</div><div class='del'>-#define MII_CR_PD   0x0800         /* Power Down */</div><div class='del'>-#define MII_CR_ISOL 0x0400         /* Isolate Mode */</div><div class='del'>-#define MII_CR_RAN  0x0200         /* Restart Auto Negotiation */</div><div class='del'>-#define MII_CR_FDM  0x0100         /* Full Duplex Mode */</div><div class='del'>-#define MII_CR_CTE  0x0080         /* Collision Test Enable */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MII Management Status Register</div><div class='del'>-*/</div><div class='del'>-#define MII_SR_T4C  0x8000         /* 100BASE-T4 capable */</div><div class='del'>-#define MII_SR_TXFD 0x4000         /* 100BASE-TX Full Duplex capable */</div><div class='del'>-#define MII_SR_TXHD 0x2000         /* 100BASE-TX Half Duplex capable */</div><div class='del'>-#define MII_SR_TFD  0x1000         /* 10BASE-T Full Duplex capable */</div><div class='del'>-#define MII_SR_THD  0x0800         /* 10BASE-T Half Duplex capable */</div><div class='del'>-#define MII_SR_ASSC 0x0020         /* Auto Speed Selection Complete*/</div><div class='del'>-#define MII_SR_RFD  0x0010         /* Remote Fault Detected */</div><div class='del'>-#define MII_SR_ANC  0x0008         /* Auto Negotiation capable */</div><div class='del'>-#define MII_SR_LKS  0x0004         /* Link Status */</div><div class='del'>-#define MII_SR_JABD 0x0002         /* Jabber Detect */</div><div class='del'>-#define MII_SR_XC   0x0001         /* Extended Capabilities */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MII Management Auto Negotiation Advertisement Register</div><div class='del'>-*/</div><div class='del'>-#define MII_ANA_TAF  0x03e0        /* Technology Ability Field */</div><div class='del'>-#define MII_ANA_T4AM 0x0200        /* T4 Technology Ability Mask */</div><div class='del'>-#define MII_ANA_TXAM 0x0180        /* TX Technology Ability Mask */</div><div class='del'>-#define MII_ANA_FDAM 0x0140        /* Full Duplex Technology Ability Mask */</div><div class='del'>-#define MII_ANA_HDAM 0x02a0        /* Half Duplex Technology Ability Mask */</div><div class='del'>-#define MII_ANA_100M 0x0380        /* 100Mb Technology Ability Mask */</div><div class='del'>-#define MII_ANA_10M  0x0060        /* 10Mb Technology Ability Mask */</div><div class='del'>-#define MII_ANA_CSMA 0x0001        /* CSMA-CD Capable */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MII Management Auto Negotiation Remote End Register</div><div class='del'>-*/</div><div class='del'>-#define MII_ANLPA_NP   0x8000      /* Next Page (Enable) */</div><div class='del'>-#define MII_ANLPA_ACK  0x4000      /* Remote Acknowledge */</div><div class='del'>-#define MII_ANLPA_RF   0x2000      /* Remote Fault */</div><div class='del'>-#define MII_ANLPA_TAF  0x03e0      /* Technology Ability Field */</div><div class='del'>-#define MII_ANLPA_T4AM 0x0200      /* T4 Technology Ability Mask */</div><div class='del'>-#define MII_ANLPA_TXAM 0x0180      /* TX Technology Ability Mask */</div><div class='del'>-#define MII_ANLPA_FDAM 0x0140      /* Full Duplex Technology Ability Mask */</div><div class='del'>-#define MII_ANLPA_HDAM 0x02a0      /* Half Duplex Technology Ability Mask */</div><div class='del'>-#define MII_ANLPA_100M 0x0380      /* 100Mb Technology Ability Mask */</div><div class='del'>-#define MII_ANLPA_10M  0x0060      /* 10Mb Technology Ability Mask */</div><div class='del'>-#define MII_ANLPA_CSMA 0x0001      /* CSMA-CD Capable */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Media Definitions (ABG SROM Section)</div><div class='del'>-*/</div><div class='del'>-#define MEDIA_NWAY     0x0080      /* Nway (Auto Negotiation) on PHY */</div><div class='del'>-#define MEDIA_MII      0x0040      /* MII Present on the adapter */</div><div class='del'>-#define MEDIA_FIBRE    0x0008      /* Fibre Media present */</div><div class='del'>-#define MEDIA_AUI      0x0004      /* AUI Media present */</div><div class='del'>-#define MEDIA_TP       0x0002      /* TP Media present */</div><div class='del'>-#define MEDIA_BNC      0x0001      /* BNC Media present */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Definitions (Digital Semiconductor Format)</div><div class='del'>-*/</div><div class='del'>-#define SROM_SSVID     0x0000      /* Sub-system Vendor ID offset */</div><div class='del'>-#define SROM_SSID      0x0002      /* Sub-system ID offset */</div><div class='del'>-#define SROM_CISPL     0x0004      /* CardBus CIS Pointer low offset */</div><div class='del'>-#define SROM_CISPH     0x0006      /* CardBus CIS Pointer high offset */</div><div class='del'>-#define SROM_IDCRC     0x0010      /* ID Block CRC offset*/</div><div class='del'>-#define SROM_RSVD2     0x0011      /* ID Reserved 2 offset */</div><div class='del'>-#define SROM_SFV       0x0012      /* SROM Format Version offset */</div><div class='del'>-#define SROM_CCNT      0x0013      /* Controller Count offset */</div><div class='del'>-#define SROM_HWADD     0x0014      /* Hardware Address offset */</div><div class='del'>-#define SROM_MRSVD     0x007c      /* Manufacturer Reserved offset*/</div><div class='del'>-#define SROM_CRC       0x007e      /* SROM CRC offset */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Media Connection Definitions</div><div class='del'>-*/</div><div class='del'>-#define SROM_10BT      0x0000      /*  10BASE-T half duplex */</div><div class='del'>-#define SROM_10BTN     0x0100      /*  10BASE-T with Nway */</div><div class='del'>-#define SROM_10BTF     0x0204      /*  10BASE-T full duplex */</div><div class='del'>-#define SROM_10BTNLP   0x0400      /*  10BASE-T without Link Pass test */</div><div class='del'>-#define SROM_10B2      0x0001      /*  10BASE-2 (BNC) */</div><div class='del'>-#define SROM_10B5      0x0002      /*  10BASE-5 (AUI) */</div><div class='del'>-#define SROM_100BTH    0x0003      /*  100BASE-T half duplex */</div><div class='del'>-#define SROM_100BTF    0x0205      /*  100BASE-T full duplex */</div><div class='del'>-#define SROM_100BT4    0x0006      /*  100BASE-T4 */</div><div class='del'>-#define SROM_100BFX    0x0007      /*  100BASE-FX half duplex (Fiber) */</div><div class='del'>-#define SROM_M10BT     0x0009      /*  MII 10BASE-T half duplex */</div><div class='del'>-#define SROM_M10BTF    0x020a      /*  MII 10BASE-T full duplex */</div><div class='del'>-#define SROM_M100BT    0x000d      /*  MII 100BASE-T half duplex */</div><div class='del'>-#define SROM_M100BTF   0x020e      /*  MII 100BASE-T full duplex */</div><div class='del'>-#define SROM_M100BT4   0x000f      /*  MII 100BASE-T4 */</div><div class='del'>-#define SROM_M100BF    0x0010      /*  MII 100BASE-FX half duplex */</div><div class='del'>-#define SROM_M100BFF   0x0211      /*  MII 100BASE-FX full duplex */</div><div class='del'>-#define SROM_PDA       0x0800      /*  Powerup &amp; Dynamic Autosense */</div><div class='del'>-#define SROM_PAO       0x8800      /*  Powerup Autosense Only */</div><div class='del'>-#define SROM_NSMI      0xffff      /*  No Selected Media Information */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Media Definitions</div><div class='del'>-*/</div><div class='del'>-#define SROM_10BASET   0x0000      /*  10BASE-T half duplex */</div><div class='del'>-#define SROM_10BASE2   0x0001      /*  10BASE-2 (BNC) */</div><div class='del'>-#define SROM_10BASE5   0x0002      /*  10BASE-5 (AUI) */</div><div class='del'>-#define SROM_100BASET  0x0003      /*  100BASE-T half duplex */</div><div class='del'>-#define SROM_10BASETF  0x0004      /*  10BASE-T full duplex */</div><div class='del'>-#define SROM_100BASETF 0x0005      /*  100BASE-T full duplex */</div><div class='del'>-#define SROM_100BASET4 0x0006      /*  100BASE-T4 */</div><div class='del'>-#define SROM_100BASEF  0x0007      /*  100BASE-FX half duplex */</div><div class='del'>-#define SROM_100BASEFF 0x0008      /*  100BASE-FX full duplex */</div><div class='del'>-</div><div class='del'>-#define BLOCK_LEN      0x7f        /* Extended blocks length mask */</div><div class='del'>-#define EXT_FIELD      0x40        /* Extended blocks extension field bit */</div><div class='del'>-#define MEDIA_CODE     0x3f        /* Extended blocks media code mask */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Compact Format Block Masks</div><div class='del'>-*/</div><div class='del'>-#define COMPACT_FI      0x80       /* Format Indicator */</div><div class='del'>-#define COMPACT_LEN     0x04       /* Length */</div><div class='del'>-#define COMPACT_MC      0x3f       /* Media Code */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SROM Extended Format Block Type 0 Masks</div><div class='del'>-*/</div><div class='del'>-#define BLOCK0_FI      0x80        /* Format Indicator */</div><div class='del'>-#define BLOCK0_MCS     0x80        /* Media Code byte Sign */</div><div class='del'>-#define BLOCK0_MC      0x3f        /* Media Code */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21040 Full Duplex Register (DE4X5_FDR)</div><div class='del'>-*/</div><div class='del'>-#define FDR_FDACV  0x0000ffff      /* Full Duplex Auto Configuration Value */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21041 General Purpose Timer Register (DE4X5_GPT)</div><div class='del'>-*/</div><div class='del'>-#define GPT_CON  0x00010000        /* One shot: 0,  Continuous: 1 */</div><div class='del'>-#define GPT_VAL  0x0000ffff        /* Timer Value */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DC21140 General Purpose Register (DE4X5_GEP) (hardware dependent bits)</div><div class='del'>-*/</div><div class='del'>-/* Valid ONLY for DE500 hardware */</div><div class='del'>-#define GEP_LNP  0x00000080        /* Link Pass               (input)        */</div><div class='del'>-#define GEP_SLNK 0x00000040        /* SYM LINK                (input)        */</div><div class='del'>-#define GEP_SDET 0x00000020        /* Signal Detect           (input)        */</div><div class='del'>-#define GEP_HRST 0x00000010        /* Hard RESET (to PHY)     (output)       */</div><div class='del'>-#define GEP_FDXD 0x00000008        /* Full Duplex Disable     (output)       */</div><div class='del'>-#define GEP_PHYL 0x00000004        /* PHY Loopback            (output)       */</div><div class='del'>-#define GEP_FLED 0x00000002        /* Force Activity LED on   (output)       */</div><div class='del'>-#define GEP_MODE 0x00000001        /* 0: 10Mb/s,  1: 100Mb/s                 */</div><div class='del'>-#define GEP_INIT 0x0000011f        /* Setup inputs (0) and outputs (1)       */</div><div class='del'>-#define GEP_CTRL 0x00000100        /* GEP control bit                        */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SIA Register Defaults</div><div class='del'>-*/</div><div class='del'>-#define CSR13 0x00000001</div><div class='del'>-#define CSR14 0x0003ff7f           /* Autonegotiation disabled               */</div><div class='del'>-#define CSR15 0x00000008</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SIA Status Register (DE4X5_SISR)</div><div class='del'>-*/</div><div class='del'>-#define SISR_LPC   0xffff0000      /* Link Partner's Code Word               */</div><div class='del'>-#define SISR_LPN   0x00008000      /* Link Partner Negotiable                */</div><div class='del'>-#define SISR_ANS   0x00007000      /* Auto Negotiation Arbitration State     */</div><div class='del'>-#define SISR_NSN   0x00000800      /* Non Stable NLPs Detected (DC21041)     */</div><div class='del'>-#define SISR_TRF   0x00000800      /* Transmit Remote Fault                  */</div><div class='del'>-#define SISR_NSND  0x00000400      /* Non Stable NLPs Detected (DC21142)     */</div><div class='del'>-#define SISR_ANR_FDS 0x00000400    /* Auto Negotiate Restart/Full Duplex Sel.*/</div><div class='del'>-#define SISR_TRA   0x00000200      /* 10BASE-T Receive Port Activity         */</div><div class='del'>-#define SISR_NRA   0x00000200      /* Non Selected Port Receive Activity     */</div><div class='del'>-#define SISR_ARA   0x00000100      /* AUI Receive Port Activity              */</div><div class='del'>-#define SISR_SRA   0x00000100      /* Selected Port Receive Activity         */</div><div class='del'>-#define SISR_DAO   0x00000080      /* PLL All One                            */</div><div class='del'>-#define SISR_DAZ   0x00000040      /* PLL All Zero                           */</div><div class='del'>-#define SISR_DSP   0x00000020      /* PLL Self-Test Pass                     */</div><div class='del'>-#define SISR_DSD   0x00000010      /* PLL Self-Test Done                     */</div><div class='del'>-#define SISR_APS   0x00000008      /* Auto Polarity State                    */</div><div class='del'>-#define SISR_LKF   0x00000004      /* Link Fail Status                       */</div><div class='del'>-#define SISR_LS10  0x00000004      /* 10Mb/s Link Fail Status                */</div><div class='del'>-#define SISR_NCR   0x00000002      /* Network Connection Error               */</div><div class='del'>-#define SISR_LS100 0x00000002      /* 100Mb/s Link Fail Status               */</div><div class='del'>-#define SISR_PAUI  0x00000001      /* AUI_TP Indication                      */</div><div class='del'>-#define SISR_MRA   0x00000001      /* MII Receive Port Activity              */</div><div class='del'>-</div><div class='del'>-#define ANS_NDIS   0x00000000      /* Nway disable                           */</div><div class='del'>-#define ANS_TDIS   0x00001000      /* Transmit Disable                       */</div><div class='del'>-#define ANS_ADET   0x00002000      /* Ability Detect                         */</div><div class='del'>-#define ANS_ACK    0x00003000      /* Acknowledge                            */</div><div class='del'>-#define ANS_CACK   0x00004000      /* Complete Acknowledge                   */</div><div class='del'>-#define ANS_NWOK   0x00005000      /* Nway OK - FLP Link Good                */</div><div class='del'>-#define ANS_LCHK   0x00006000      /* Link Check                             */</div><div class='del'>-</div><div class='del'>-#define SISR_RST   0x00000301      /* CSR12 reset                            */</div><div class='del'>-#define SISR_ANR   0x00001301      /* Autonegotiation restart                */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SIA Connectivity Register (DE4X5_SICR)</div><div class='del'>-*/</div><div class='del'>-#define SICR_SDM   0xffff0000       /* SIA Diagnostics Mode */</div><div class='del'>-#define SICR_OE57  0x00008000       /* Output Enable 5 6 7 */</div><div class='del'>-#define SICR_OE24  0x00004000       /* Output Enable 2 4 */</div><div class='del'>-#define SICR_OE13  0x00002000       /* Output Enable 1 3 */</div><div class='del'>-#define SICR_IE    0x00001000       /* Input Enable */</div><div class='del'>-#define SICR_EXT   0x00000000       /* SIA MUX Select External SIA Mode */</div><div class='del'>-#define SICR_D_SIA 0x00000400       /* SIA MUX Select Diagnostics - SIA Sigs */</div><div class='del'>-#define SICR_DPLL  0x00000800       /* SIA MUX Select Diagnostics - DPLL Sigs*/</div><div class='del'>-#define SICR_APLL  0x00000a00       /* SIA MUX Select Diagnostics - DPLL Sigs*/</div><div class='del'>-#define SICR_D_RxM 0x00000c00       /* SIA MUX Select Diagnostics - RxM Sigs */</div><div class='del'>-#define SICR_M_RxM 0x00000d00       /* SIA MUX Select Diagnostics - RxM Sigs */</div><div class='del'>-#define SICR_LNKT  0x00000e00       /* SIA MUX Select Diagnostics - Link Test*/</div><div class='del'>-#define SICR_SEL   0x00000f00       /* SIA MUX Select AUI or TP with LEDs */</div><div class='del'>-#define SICR_ASE   0x00000080       /* APLL Start Enable*/</div><div class='del'>-#define SICR_SIM   0x00000040       /* Serial Interface Input Multiplexer */</div><div class='del'>-#define SICR_ENI   0x00000020       /* Encoder Input Multiplexer */</div><div class='del'>-#define SICR_EDP   0x00000010       /* SIA PLL External Input Enable */</div><div class='del'>-#define SICR_AUI   0x00000008       /* 10Base-T (0) or AUI (1) */</div><div class='del'>-#define SICR_CAC   0x00000004       /* CSR Auto Configuration */</div><div class='del'>-#define SICR_PS    0x00000002       /* Pin AUI/TP Selection */</div><div class='del'>-#define SICR_SRL   0x00000001       /* SIA Reset */</div><div class='del'>-#define SIA_RESET  0x00000000       /* SIA Reset Value */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SIA Transmit and Receive Register (DE4X5_STRR)</div><div class='del'>-*/</div><div class='del'>-#define STRR_TAS   0x00008000       /* 10Base-T/AUI Autosensing Enable */</div><div class='del'>-#define STRR_SPP   0x00004000       /* Set Polarity Plus */</div><div class='del'>-#define STRR_APE   0x00002000       /* Auto Polarity Enable */</div><div class='del'>-#define STRR_LTE   0x00001000       /* Link Test Enable */</div><div class='del'>-#define STRR_SQE   0x00000800       /* Signal Quality Enable */</div><div class='del'>-#define STRR_CLD   0x00000400       /* Collision Detect Enable */</div><div class='del'>-#define STRR_CSQ   0x00000200       /* Collision Squelch Enable */</div><div class='del'>-#define STRR_RSQ   0x00000100       /* Receive Squelch Enable */</div><div class='del'>-#define STRR_ANE   0x00000080       /* Auto Negotiate Enable */</div><div class='del'>-#define STRR_HDE   0x00000040       /* Half Duplex Enable */</div><div class='del'>-#define STRR_CPEN  0x00000030       /* Compensation Enable */</div><div class='del'>-#define STRR_LSE   0x00000008       /* Link Pulse Send Enable */</div><div class='del'>-#define STRR_DREN  0x00000004       /* Driver Enable */</div><div class='del'>-#define STRR_LBK   0x00000002       /* Loopback Enable */</div><div class='del'>-#define STRR_ECEN  0x00000001       /* Encoder Enable */</div><div class='del'>-#define STRR_RESET 0xffffffff       /* Reset value for STRR */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** SIA General Register (DE4X5_SIGR)</div><div class='del'>-*/</div><div class='del'>-#define SIGR_RMI   0x40000000       /* Receive Match Interrupt */</div><div class='del'>-#define SIGR_GI1   0x20000000       /* General Port Interrupt 1 */</div><div class='del'>-#define SIGR_GI0   0x10000000       /* General Port Interrupt 0 */</div><div class='del'>-#define SIGR_CWE   0x08000000       /* Control Write Enable */</div><div class='del'>-#define SIGR_RME   0x04000000       /* Receive Match Enable */</div><div class='del'>-#define SIGR_GEI1  0x02000000       /* GEP Interrupt Enable on Port 1 */</div><div class='del'>-#define SIGR_GEI0  0x01000000       /* GEP Interrupt Enable on Port 0 */</div><div class='del'>-#define SIGR_LGS3  0x00800000       /* LED/GEP3 Select */</div><div class='del'>-#define SIGR_LGS2  0x00400000       /* LED/GEP2 Select */</div><div class='del'>-#define SIGR_LGS1  0x00200000       /* LED/GEP1 Select */</div><div class='del'>-#define SIGR_LGS0  0x00100000       /* LED/GEP0 Select */</div><div class='del'>-#define SIGR_MD    0x000f0000       /* General Purpose Mode and Data */</div><div class='del'>-#define SIGR_LV2   0x00008000       /* General Purpose LED2 value */</div><div class='del'>-#define SIGR_LE2   0x00004000       /* General Purpose LED2 enable */</div><div class='del'>-#define SIGR_FRL   0x00002000       /* Force Receiver Low */</div><div class='del'>-#define SIGR_DPST  0x00001000       /* PLL Self Test Start */</div><div class='del'>-#define SIGR_LSD   0x00000800       /* LED Stretch Disable */</div><div class='del'>-#define SIGR_FLF   0x00000400       /* Force Link Fail */</div><div class='del'>-#define SIGR_FUSQ  0x00000200       /* Force Unsquelch */</div><div class='del'>-#define SIGR_TSCK  0x00000100       /* Test Clock */</div><div class='del'>-#define SIGR_LV1   0x00000080       /* General Purpose LED1 value */</div><div class='del'>-#define SIGR_LE1   0x00000040       /* General Purpose LED1 enable */</div><div class='del'>-#define SIGR_RWR   0x00000020       /* Receive Watchdog Release */</div><div class='del'>-#define SIGR_RWD   0x00000010       /* Receive Watchdog Disable */</div><div class='del'>-#define SIGR_ABM   0x00000008       /* BNC: 0,  AUI:1 */</div><div class='del'>-#define SIGR_JCK   0x00000004       /* Jabber Clock */</div><div class='del'>-#define SIGR_HUJ   0x00000002       /* Host Unjab */</div><div class='del'>-#define SIGR_JBD   0x00000001       /* Jabber Disable */</div><div class='del'>-#define SIGR_RESET 0xffff0000       /* Reset value for SIGR */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Receive Descriptor Bit Summary</div><div class='del'>-*/</div><div class='del'>-#define R_OWN      0x80000000       /* Own Bit */</div><div class='del'>-#define RD_FF      0x40000000       /* Filtering Fail */</div><div class='del'>-#define RD_FL      0x3fff0000       /* Frame Length */</div><div class='del'>-#define RD_ES      0x00008000       /* Error Summary */</div><div class='del'>-#define RD_LE      0x00004000       /* Length Error */</div><div class='del'>-#define RD_DT      0x00003000       /* Data Type */</div><div class='del'>-#define RD_RF      0x00000800       /* Runt Frame */</div><div class='del'>-#define RD_MF      0x00000400       /* Multicast Frame */</div><div class='del'>-#define RD_FS      0x00000200       /* First Descriptor */</div><div class='del'>-#define RD_LS      0x00000100       /* Last Descriptor */</div><div class='del'>-#define RD_TL      0x00000080       /* Frame Too Long */</div><div class='del'>-#define RD_CS      0x00000040       /* Collision Seen */</div><div class='del'>-#define RD_FT      0x00000020       /* Frame Type */</div><div class='del'>-#define RD_RJ      0x00000010       /* Receive Watchdog */</div><div class='del'>-#define RD_RE      0x00000008       /* Report on MII Error */</div><div class='del'>-#define RD_DB      0x00000004       /* Dribbling Bit */</div><div class='del'>-#define RD_CE      0x00000002       /* CRC Error */</div><div class='del'>-#define RD_OF      0x00000001       /* Overflow */</div><div class='del'>-</div><div class='del'>-#define RD_RER     0x02000000       /* Receive End Of Ring */</div><div class='del'>-#define RD_RCH     0x01000000       /* Second Address Chained */</div><div class='del'>-#define RD_RBS2    0x003ff800       /* Buffer 2 Size */</div><div class='del'>-#define RD_RBS1    0x000007ff       /* Buffer 1 Size */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Transmit Descriptor Bit Summary</div><div class='del'>-*/</div><div class='del'>-#define T_OWN      0x80000000       /* Own Bit */</div><div class='del'>-#define TD_ES      0x00008000       /* Error Summary */</div><div class='del'>-#define TD_TO      0x00004000       /* Transmit Jabber Time-Out */</div><div class='del'>-#define TD_LO      0x00000800       /* Loss Of Carrier */</div><div class='del'>-#define TD_NC      0x00000400       /* No Carrier */</div><div class='del'>-#define TD_LC      0x00000200       /* Late Collision */</div><div class='del'>-#define TD_EC      0x00000100       /* Excessive Collisions */</div><div class='del'>-#define TD_HF      0x00000080       /* Heartbeat Fail */</div><div class='del'>-#define TD_CC      0x00000078       /* Collision Counter */</div><div class='del'>-#define TD_LF      0x00000004       /* Link Fail */</div><div class='del'>-#define TD_UF      0x00000002       /* Underflow Error */</div><div class='del'>-#define TD_DE      0x00000001       /* Deferred */</div><div class='del'>-</div><div class='del'>-#define TD_IC      0x80000000       /* Interrupt On Completion */</div><div class='del'>-#define TD_LS      0x40000000       /* Last Segment */</div><div class='del'>-#define TD_FS      0x20000000       /* First Segment */</div><div class='del'>-#define TD_FT1     0x10000000       /* Filtering Type */</div><div class='del'>-#define TD_SET     0x08000000       /* Setup Packet */</div><div class='del'>-#define TD_AC      0x04000000       /* Add CRC Disable */</div><div class='del'>-#define TD_TER     0x02000000       /* Transmit End Of Ring */</div><div class='del'>-#define TD_TCH     0x01000000       /* Second Address Chained */</div><div class='del'>-#define TD_DPD     0x00800000       /* Disabled Padding */</div><div class='del'>-#define TD_FT0     0x00400000       /* Filtering Type */</div><div class='del'>-#define TD_TBS2    0x003ff800       /* Buffer 2 Size */</div><div class='del'>-#define TD_TBS1    0x000007ff       /* Buffer 1 Size */</div><div class='del'>-</div><div class='del'>-#define PERFECT_F  0x00000000</div><div class='del'>-#define HASH_F     TD_FT0</div><div class='del'>-#define INVERSE_F  TD_FT1</div><div class='del'>-#define HASH_O_F   (TD_FT1 | TD_F0)</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Media / mode state machine definitions</div><div class='del'>-** User selectable:</div><div class='del'>-*/</div><div class='del'>-#define TP              0x0040     /* 10Base-T (now equiv to _10Mb)        */</div><div class='del'>-#define TP_NW           0x0002     /* 10Base-T with Nway                   */</div><div class='del'>-#define BNC             0x0004     /* Thinwire                             */</div><div class='del'>-#define AUI             0x0008     /* Thickwire                            */</div><div class='del'>-#define BNC_AUI         0x0010     /* BNC/AUI on DC21040 indistinguishable */</div><div class='del'>-#define _10Mb           0x0040     /* 10Mb/s Ethernet                      */</div><div class='del'>-#define _100Mb          0x0080     /* 100Mb/s Ethernet                     */</div><div class='del'>-#define AUTO            0x4000     /* Auto sense the media or speed        */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Internal states</div><div class='del'>-*/</div><div class='del'>-#define NC              0x0000     /* No Connection                        */</div><div class='del'>-#define ANS             0x0020     /* Intermediate AutoNegotiation State   */</div><div class='del'>-#define SPD_DET         0x0100     /* Parallel speed detection             */</div><div class='del'>-#define INIT            0x0200     /* Initial state                        */</div><div class='del'>-#define EXT_SIA         0x0400     /* External SIA for motherboard chip    */</div><div class='del'>-#define ANS_SUSPECT     0x0802     /* Suspect the ANS (TP) port is down    */</div><div class='del'>-#define TP_SUSPECT      0x0803     /* Suspect the TP port is down          */</div><div class='del'>-#define BNC_AUI_SUSPECT 0x0804     /* Suspect the BNC or AUI port is down  */</div><div class='del'>-#define EXT_SIA_SUSPECT 0x0805     /* Suspect the EXT SIA port is down     */</div><div class='del'>-#define BNC_SUSPECT     0x0806     /* Suspect the BNC port is down         */</div><div class='del'>-#define AUI_SUSPECT     0x0807     /* Suspect the AUI port is down         */</div><div class='del'>-#define MII             0x1000     /* MII on the 21143                     */</div><div class='del'>-</div><div class='del'>-#define TIMER_CB        0x80000000 /* Timer callback detection             */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** DE4X5 DEBUG Options</div><div class='del'>-*/</div><div class='del'>-#define DEBUG_NONE      0x0000     /* No DEBUG messages */</div><div class='del'>-#define DEBUG_VERSION   0x0001     /* Print version message */</div><div class='del'>-#define DEBUG_MEDIA     0x0002     /* Print media messages */</div><div class='del'>-#define DEBUG_TX        0x0004     /* Print TX (queue_pkt) messages */</div><div class='del'>-#define DEBUG_RX        0x0008     /* Print RX (de4x5_rx) messages */</div><div class='del'>-#define DEBUG_SROM      0x0010     /* Print SROM messages */</div><div class='del'>-#define DEBUG_MII       0x0020     /* Print MII messages */</div><div class='del'>-#define DEBUG_OPEN      0x0040     /* Print de4x5_open() messages */</div><div class='del'>-#define DEBUG_CLOSE     0x0080     /* Print de4x5_close() messages */</div><div class='del'>-#define DEBUG_PCICFG    0x0100</div><div class='del'>-#define DEBUG_ALL       0x01ff</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Miscellaneous</div><div class='del'>-*/</div><div class='del'>-#define PCI  0</div><div class='del'>-#define EISA 1</div><div class='del'>-</div><div class='del'>-#define DE4X5_HASH_TABLE_LEN   512       /* Bits */</div><div class='del'>-#define DE4X5_HASH_BITS        0x01ff    /* 9 LS bits */</div><div class='del'>-</div><div class='del'>-#define SETUP_FRAME_LEN  192       /* Bytes */</div><div class='del'>-#define IMPERF_PA_OFFSET 156       /* Bytes */</div><div class='del'>-</div><div class='del'>-#define POLL_DEMAND          1</div><div class='del'>-</div><div class='del'>-#define LOST_MEDIA_THRESHOLD 3</div><div class='del'>-</div><div class='del'>-#define MASK_INTERRUPTS      1</div><div class='del'>-#define UNMASK_INTERRUPTS    0</div><div class='del'>-</div><div class='del'>-#define DE4X5_STRLEN         8</div><div class='del'>-</div><div class='del'>-#define DE4X5_INIT           0     /* Initialisation time */</div><div class='del'>-#define DE4X5_RUN            1     /* Run time */</div><div class='del'>-</div><div class='del'>-#define DE4X5_SAVE_STATE     0</div><div class='del'>-#define DE4X5_RESTORE_STATE  1</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Address Filtering Modes</div><div class='del'>-*/</div><div class='del'>-#define PERFECT              0     /* 16 perfect physical addresses */</div><div class='del'>-#define HASH_PERF            1     /* 1 perfect, 512 multicast addresses */</div><div class='del'>-#define PERFECT_REJ          2     /* Reject 16 perfect physical addresses */</div><div class='del'>-#define ALL_HASH             3     /* Hashes all physical &amp; multicast addrs */</div><div class='del'>-</div><div class='del'>-#define ALL                  0     /* Clear out all the setup frame */</div><div class='del'>-#define PHYS_ADDR_ONLY       1     /* Update the physical address only */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Adapter state</div><div class='del'>-*/</div><div class='del'>-#define INITIALISED          0     /* After h/w initialised and mem alloc'd */</div><div class='del'>-#define CLOSED               1     /* Ready for opening */</div><div class='del'>-#define OPEN                 2     /* Running */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Various wait times</div><div class='del'>-*/</div><div class='del'>-#define PDET_LINK_WAIT    1200    /* msecs to wait for link detect bits     */</div><div class='del'>-#define ANS_FINISH_WAIT   1000    /* msecs to wait for link detect bits     */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** IEEE OUIs for various PHY vendor/chip combos - Reg 2 values only. Since</div><div class='del'>-** the vendors seem split 50-50 on how to calculate the OUI register values</div><div class='del'>-** anyway, just reading Reg2 seems reasonable for now [see de4x5_get_oui()].</div><div class='del'>-*/</div><div class='del'>-#define NATIONAL_TX 0x2000</div><div class='del'>-#define BROADCOM_T4 0x03e0</div><div class='del'>-#define SEEQ_T4     0x0016</div><div class='del'>-#define CYPRESS_T4  0x0014</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Speed Selection stuff</div><div class='del'>-*/</div><div class='del'>-#define SET_10Mb {\</div><div class='del'>-  if ((lp-&gt;phy[lp-&gt;active].id) &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {\</div><div class='del'>-    omr = inl(DE4X5_OMR) &amp; ~(OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX);\</div><div class='del'>-    if ((lp-&gt;tmp != MII_SR_ASSC) || (lp-&gt;autosense != AUTO)) {\</div><div class='del'>-      mii_wr(MII_CR_10|(lp-&gt;fdx?MII_CR_FDM:0), MII_CR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);\</div><div class='del'>-    }\</div><div class='del'>-    omr |= ((lp-&gt;fdx ? OMR_FDX : 0) | OMR_TTM);\</div><div class='del'>-    outl(omr, DE4X5_OMR);\</div><div class='del'>-    if (!lp-&gt;useSROM) lp-&gt;cache.gep = 0;\</div><div class='del'>-  } else if (lp-&gt;useSROM &amp;&amp; !lp-&gt;useMII) {\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    omr |= (lp-&gt;fdx ? OMR_FDX : 0);\</div><div class='del'>-    outl(omr | (lp-&gt;infoblock_csr6 &amp; ~(OMR_SCR | OMR_HBD)), DE4X5_OMR);\</div><div class='del'>-  } else {\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    omr |= (lp-&gt;fdx ? OMR_FDX : 0);\</div><div class='del'>-    outl(omr | OMR_SDP | OMR_TTM, DE4X5_OMR);\</div><div class='del'>-    lp-&gt;cache.gep = (lp-&gt;fdx ? 0 : GEP_FDXD);\</div><div class='del'>-    gep_wr(lp-&gt;cache.gep, dev);\</div><div class='del'>-  }\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SET_100Mb {\</div><div class='del'>-  if ((lp-&gt;phy[lp-&gt;active].id) &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {\</div><div class='del'>-    int fdx=0;\</div><div class='del'>-    if (lp-&gt;phy[lp-&gt;active].id == NATIONAL_TX) {\</div><div class='del'>-        mii_wr(mii_rd(0x18, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII) &amp; ~0x2000,\</div><div class='del'>-                      0x18, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);\</div><div class='del'>-    }\</div><div class='del'>-    omr = inl(DE4X5_OMR) &amp; ~(OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX);\</div><div class='del'>-    sr = mii_rd(MII_SR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);\</div><div class='del'>-    if (!(sr &amp; MII_ANA_T4AM) &amp;&amp; lp-&gt;fdx) fdx=1;\</div><div class='del'>-    if ((lp-&gt;tmp != MII_SR_ASSC) || (lp-&gt;autosense != AUTO)) {\</div><div class='del'>-      mii_wr(MII_CR_100|(fdx?MII_CR_FDM:0), MII_CR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);\</div><div class='del'>-    }\</div><div class='del'>-    if (fdx) omr |= OMR_FDX;\</div><div class='del'>-    outl(omr, DE4X5_OMR);\</div><div class='del'>-    if (!lp-&gt;useSROM) lp-&gt;cache.gep = 0;\</div><div class='del'>-  } else if (lp-&gt;useSROM &amp;&amp; !lp-&gt;useMII) {\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    omr |= (lp-&gt;fdx ? OMR_FDX : 0);\</div><div class='del'>-    outl(omr | lp-&gt;infoblock_csr6, DE4X5_OMR);\</div><div class='del'>-  } else {\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    omr |= (lp-&gt;fdx ? OMR_FDX : 0);\</div><div class='del'>-    outl(omr | OMR_SDP | OMR_PS | OMR_HBD | OMR_PCS | OMR_SCR, DE4X5_OMR);\</div><div class='del'>-    lp-&gt;cache.gep = (lp-&gt;fdx ? 0 : GEP_FDXD) | GEP_MODE;\</div><div class='del'>-    gep_wr(lp-&gt;cache.gep, dev);\</div><div class='del'>-  }\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIX ME so I don't jam 10Mb networks */</div><div class='del'>-#define SET_100Mb_PDET {\</div><div class='del'>-  if ((lp-&gt;phy[lp-&gt;active].id) &amp;&amp; (!lp-&gt;useSROM || lp-&gt;useMII)) {\</div><div class='del'>-    mii_wr(MII_CR_100|MII_CR_ASSE, MII_CR, lp-&gt;phy[lp-&gt;active].addr, DE4X5_MII);\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    outl(omr, DE4X5_OMR);\</div><div class='del'>-  } else if (lp-&gt;useSROM &amp;&amp; !lp-&gt;useMII) {\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    outl(omr, DE4X5_OMR);\</div><div class='del'>-  } else {\</div><div class='del'>-    omr = (inl(DE4X5_OMR) &amp; ~(OMR_PS | OMR_HBD | OMR_TTM | OMR_PCS | OMR_SCR | OMR_FDX));\</div><div class='del'>-    outl(omr | OMR_SDP | OMR_PS | OMR_HBD | OMR_PCS, DE4X5_OMR);\</div><div class='del'>-    lp-&gt;cache.gep = (GEP_FDXD | GEP_MODE);\</div><div class='del'>-    gep_wr(lp-&gt;cache.gep, dev);\</div><div class='del'>-  }\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Include the IOCTL stuff</div><div class='del'>-*/</div><div class='del'>-#include &lt;linux/sockios.h&gt;</div><div class='del'>-</div><div class='del'>-struct de4x5_ioctl {</div><div class='del'>-	unsigned short cmd;                /* Command to run */</div><div class='del'>-	unsigned short len;                /* Length of the data buffer */</div><div class='del'>-	unsigned char  __user *data;       /* Pointer to the data buffer */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** Recognised commands for the driver</div><div class='del'>-*/</div><div class='del'>-#define DE4X5_GET_HWADDR	0x01 /* Get the hardware address */</div><div class='del'>-#define DE4X5_SET_HWADDR	0x02 /* Set the hardware address */</div><div class='del'>-/* 0x03 and 0x04 were used before and are obsoleted now. Don't use them. */</div><div class='del'>-#define DE4X5_SAY_BOO	        0x05 /* Say "Boo!" to the kernel log file */</div><div class='del'>-#define DE4X5_GET_MCA   	0x06 /* Get a multicast address */</div><div class='del'>-#define DE4X5_SET_MCA   	0x07 /* Set a multicast address */</div><div class='del'>-#define DE4X5_CLR_MCA    	0x08 /* Clear a multicast address */</div><div class='del'>-#define DE4X5_MCA_EN    	0x09 /* Enable a multicast address group */</div><div class='del'>-#define DE4X5_GET_STATS  	0x0a /* Get the driver statistics */</div><div class='del'>-#define DE4X5_CLR_STATS 	0x0b /* Zero out the driver statistics */</div><div class='del'>-#define DE4X5_GET_OMR           0x0c /* Get the OMR Register contents */</div><div class='del'>-#define DE4X5_SET_OMR           0x0d /* Set the OMR Register contents */</div><div class='del'>-#define DE4X5_GET_REG           0x0e /* Get the DE4X5 Registers */</div><div class='del'>-</div><div class='del'>-#define MOTO_SROM_BUG    (lp-&gt;active == 8 &amp;&amp; (get_unaligned_le32(dev-&gt;dev_addr) &amp; 0x00ffffff) == 0x3e0008)</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c<br/>index 0efdbd1a4a6f..2d3bd343b6e6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/dmfe.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/dmfe.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/dmfe.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/dmfe.c</a></div><div class='hunk'>@@ -56,8 +56,6 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"dmfe"</div><div class='del'>-#define DRV_VERSION	"1.36.4"</div><div class='del'>-#define DRV_RELDATE	"2002-01-17"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='hunk'>@@ -280,10 +278,6 @@ enum dmfe_CR6_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Global variable declaration ----------------------------- */</div><div class='del'>-static int printed_version;</div><div class='del'>-static const char version[] =</div><div class='del'>-	"Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")";</div><div class='del'>-</div><div class='ctx'> static int dmfe_debug;</div><div class='ctx'> static unsigned char dmfe_media_mode = DMFE_AUTO;</div><div class='ctx'> static u32 dmfe_cr6_user_set;</div><div class='hunk'>@@ -364,9 +358,6 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	DMFE_DBUG(0, "dmfe_init_one()", 0);</div><div class='ctx'> </div><div class='del'>-	if (!printed_version++)</div><div class='del'>-		pr_info("%s\n", version);</div><div class='del'>-</div><div class='ctx'> 	/*</div><div class='ctx'> 	 *	SPARC on-board DM910x chips should be handled by the main</div><div class='ctx'> 	 *	tulip driver, except for early DM9100s.</div><div class='hunk'>@@ -389,7 +380,7 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='ctx'> 		pr_warn("32-bit PCI DMA not available\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out_free;</div><div class='hunk'>@@ -431,15 +422,17 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	db = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate Tx/Rx descriptor memory */</div><div class='del'>-	db-&gt;desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *</div><div class='del'>-			DESC_ALL_CNT + 0x20, &amp;db-&gt;desc_pool_dma_ptr);</div><div class='add'>+	db-&gt;desc_pool_ptr = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					       sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='add'>+					       &amp;db-&gt;desc_pool_dma_ptr, GFP_KERNEL);</div><div class='ctx'> 	if (!db-&gt;desc_pool_ptr) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	db-&gt;buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *</div><div class='del'>-			TX_DESC_CNT + 4, &amp;db-&gt;buf_pool_dma_ptr);</div><div class='add'>+	db-&gt;buf_pool_ptr = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					      TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='add'>+					      &amp;db-&gt;buf_pool_dma_ptr, GFP_KERNEL);</div><div class='ctx'> 	if (!db-&gt;buf_pool_ptr) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_free_desc;</div><div class='hunk'>@@ -483,8 +476,7 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set Node address */</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = db-&gt;srom[20 + i];</div><div class='add'>+	eth_hw_addr_set(dev, &amp;db-&gt;srom[20]);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev (dev);</div><div class='ctx'> 	if (err)</div><div class='hunk'>@@ -501,11 +493,12 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> err_out_unmap:</div><div class='ctx'> 	pci_iounmap(pdev, db-&gt;ioaddr);</div><div class='ctx'> err_out_free_buf:</div><div class='del'>-	pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='del'>-			    db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='add'>+			  db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='ctx'> err_out_free_desc:</div><div class='del'>-	pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='del'>-			    db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+			  sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='add'>+			  db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='ctx'> err_out_res:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> err_out_disable:</div><div class='hunk'>@@ -524,15 +517,16 @@ static void dmfe_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	DMFE_DBUG(0, "dmfe_remove_one()", 0);</div><div class='ctx'> </div><div class='del'>- 	if (dev) {</div><div class='add'>+	if (dev) {</div><div class='ctx'> </div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> 		pci_iounmap(db-&gt;pdev, db-&gt;ioaddr);</div><div class='del'>-		pci_free_consistent(db-&gt;pdev, sizeof(struct tx_desc) *</div><div class='del'>-					DESC_ALL_CNT + 0x20, db-&gt;desc_pool_ptr,</div><div class='del'>- 					db-&gt;desc_pool_dma_ptr);</div><div class='del'>-		pci_free_consistent(db-&gt;pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='del'>-					db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='add'>+		dma_free_coherent(&amp;db-&gt;pdev-&gt;dev,</div><div class='add'>+				  sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='add'>+				  db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='add'>+		dma_free_coherent(&amp;db-&gt;pdev-&gt;dev,</div><div class='add'>+				  TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='add'>+				  db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='ctx'> 		pci_release_regions(pdev);</div><div class='ctx'> 		free_netdev(dev);	/* free board information */</div><div class='ctx'> 	}</div><div class='hunk'>@@ -572,10 +566,10 @@ static int dmfe_open(struct net_device *dev)</div><div class='ctx'> 	/* CR6 operation mode decision */</div><div class='ctx'> 	if ( !chkmode || (db-&gt;chip_id == PCI_DM9132_ID) ||</div><div class='ctx'> 		(db-&gt;chip_revision &gt;= 0x30) ) {</div><div class='del'>-    		db-&gt;cr6_data |= DMFE_TXTH_256;</div><div class='add'>+		db-&gt;cr6_data |= DMFE_TXTH_256;</div><div class='ctx'> 		db-&gt;cr0_data = CR0_DEFAULT;</div><div class='ctx'> 		db-&gt;dm910x_chk_mode=4;		/* Enter the normal mode */</div><div class='del'>- 	} else {</div><div class='add'>+	} else {</div><div class='ctx'> 		db-&gt;cr6_data |= CR6_SFT;	/* Store &amp; Forward mode */</div><div class='ctx'> 		db-&gt;cr0_data = 0;</div><div class='ctx'> 		db-&gt;dm910x_chk_mode = 1;	/* Enter the check mode */</div><div class='hunk'>@@ -751,7 +745,7 @@ static int dmfe_stop(struct net_device *dev)</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* deleted timer */</div><div class='del'>-	del_timer_sync(&amp;db-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;db-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset &amp; stop DM910X board */</div><div class='ctx'> 	dw32(DCR0, DM910X_RESET);</div><div class='hunk'>@@ -908,7 +902,7 @@ static void dmfe_free_tx_pkt(struct net_device *dev, struct dmfe_board_info *db)</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-    		txptr = txptr-&gt;next_tx_desc;</div><div class='add'>+		txptr = txptr-&gt;next_tx_desc;</div><div class='ctx'> 	}/* End of while */</div><div class='ctx'> </div><div class='ctx'> 	/* Update TX remove pointer to next */</div><div class='hunk'>@@ -964,8 +958,8 @@ static void dmfe_rx_packet(struct net_device *dev, struct dmfe_board_info *db)</div><div class='ctx'> 		db-&gt;rx_avail_cnt--;</div><div class='ctx'> 		db-&gt;interval_rx_cnt++;</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(db-&gt;pdev, le32_to_cpu(rxptr-&gt;rdes2),</div><div class='del'>-				 RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_single(&amp;db-&gt;pdev-&gt;dev, le32_to_cpu(rxptr-&gt;rdes2),</div><div class='add'>+				 RX_ALLOC_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		if ( (rdes0 &amp; 0x300) != 0x300) {</div><div class='ctx'> 			/* A packet without First/Last flag */</div><div class='hunk'>@@ -1080,9 +1074,8 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct dmfe_board_info *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dmfe_ethtool_set_wol(struct net_device *dev,</div><div class='hunk'>@@ -1122,12 +1115,12 @@ static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='ctx'> </div><div class='ctx'> static void dmfe_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct dmfe_board_info *db = from_timer(db, t, timer);</div><div class='add'>+	struct dmfe_board_info *db = timer_container_of(db, t, timer);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(db-&gt;pdev);</div><div class='ctx'> 	void __iomem *ioaddr = db-&gt;ioaddr;</div><div class='ctx'> 	u32 tmp_cr8;</div><div class='ctx'> 	unsigned char tmp_cr12;</div><div class='del'>- 	unsigned long flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='ctx'> 	int link_ok, link_ok_phy;</div><div class='ctx'> </div><div class='hunk'>@@ -1223,7 +1216,7 @@ static void dmfe_timer(struct timer_list *t)</div><div class='ctx'> 	if (link_ok_phy != link_ok) {</div><div class='ctx'> 		DMFE_DBUG (0, "PHY and chip report different link status", 0);</div><div class='ctx'> 		link_ok = link_ok | link_ok_phy;</div><div class='del'>- 	}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if ( !link_ok &amp;&amp; netif_carrier_ok(dev)) {</div><div class='ctx'> 		/* Link Failed */</div><div class='hunk'>@@ -1339,8 +1332,8 @@ static void dmfe_reuse_skb(struct dmfe_board_info *db, struct sk_buff * skb)</div><div class='ctx'> </div><div class='ctx'> 	if (!(rxptr-&gt;rdes0 &amp; cpu_to_le32(0x80000000))) {</div><div class='ctx'> 		rxptr-&gt;rx_skb_ptr = skb;</div><div class='del'>-		rxptr-&gt;rdes2 = cpu_to_le32( pci_map_single(db-&gt;pdev,</div><div class='del'>-			    skb-&gt;data, RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE) );</div><div class='add'>+		rxptr-&gt;rdes2 = cpu_to_le32(dma_map_single(&amp;db-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+							  RX_ALLOC_SIZE, DMA_FROM_DEVICE));</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		rxptr-&gt;rdes0 = cpu_to_le32(0x80000000);</div><div class='ctx'> 		db-&gt;rx_avail_cnt++;</div><div class='hunk'>@@ -1442,9 +1435,9 @@ static void update_cr6(u32 cr6_data, void __iomem *ioaddr)</div><div class='ctx'> </div><div class='ctx'> static void dm9132_id_table(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	const u16 *addrptr = (const u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	struct dmfe_board_info *db = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = db-&gt;ioaddr + 0xc0;</div><div class='del'>-	u16 *addrptr = (u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	u16 i, hash_table[4];</div><div class='ctx'> </div><div class='hunk'>@@ -1483,7 +1476,7 @@ static void send_filter_frame(struct net_device *dev)</div><div class='ctx'> 	struct dmfe_board_info *db = netdev_priv(dev);</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	struct tx_desc *txptr;</div><div class='del'>-	u16 * addrptr;</div><div class='add'>+	const u16 * addrptr;</div><div class='ctx'> 	u32 * suptr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1493,7 +1486,7 @@ static void send_filter_frame(struct net_device *dev)</div><div class='ctx'> 	suptr = (u32 *) txptr-&gt;tx_buf_ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* Node address */</div><div class='del'>-	addrptr = (u16 *) dev-&gt;dev_addr;</div><div class='add'>+	addrptr = (const u16 *) dev-&gt;dev_addr;</div><div class='ctx'> 	*suptr++ = addrptr[0];</div><div class='ctx'> 	*suptr++ = addrptr[1];</div><div class='ctx'> 	*suptr++ = addrptr[2];</div><div class='hunk'>@@ -1554,8 +1547,8 @@ static void allocate_rx_buffer(struct net_device *dev)</div><div class='ctx'> 		if ( ( skb = netdev_alloc_skb(dev, RX_ALLOC_SIZE) ) == NULL )</div><div class='ctx'> 			break;</div><div class='ctx'> 		rxptr-&gt;rx_skb_ptr = skb; /* FIXME (?) */</div><div class='del'>-		rxptr-&gt;rdes2 = cpu_to_le32( pci_map_single(db-&gt;pdev, skb-&gt;data,</div><div class='del'>-				    RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE) );</div><div class='add'>+		rxptr-&gt;rdes2 = cpu_to_le32(dma_map_single(&amp;db-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+							  RX_ALLOC_SIZE, DMA_FROM_DEVICE));</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		rxptr-&gt;rdes0 = cpu_to_le32(0x80000000);</div><div class='ctx'> 		rxptr = rxptr-&gt;next_rx_desc;</div><div class='hunk'>@@ -1705,14 +1698,14 @@ static void dmfe_set_phyxcer(struct dmfe_board_info *db)</div><div class='ctx'> 		if (db-&gt;chip_id == PCI_DM9009_ID) phy_reg &amp;= 0x61;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-  	/* Write new capability to Phyxcer Reg4 */</div><div class='add'>+	/* Write new capability to Phyxcer Reg4 */</div><div class='ctx'> 	if ( !(phy_reg &amp; 0x01e0)) {</div><div class='ctx'> 		phy_reg|=db-&gt;PHY_reg4;</div><div class='ctx'> 		db-&gt;media_mode|=DMFE_AUTO;</div><div class='ctx'> 	}</div><div class='ctx'> 	dmfe_phy_write(db-&gt;ioaddr, db-&gt;phy_addr, 4, phy_reg, db-&gt;chip_id);</div><div class='ctx'> </div><div class='del'>- 	/* Restart Auto-Negotiation */</div><div class='add'>+	/* Restart Auto-Negotiation */</div><div class='ctx'> 	if ( db-&gt;chip_type &amp;&amp; (db-&gt;chip_id == PCI_DM9102_ID) )</div><div class='ctx'> 		dmfe_phy_write(db-&gt;ioaddr, db-&gt;phy_addr, 0, 0x1800, db-&gt;chip_id);</div><div class='ctx'> 	if ( !db-&gt;chip_type )</div><div class='hunk'>@@ -1760,7 +1753,7 @@ static void dmfe_process_mode(struct dmfe_board_info *db)</div><div class='ctx'> 			}</div><div class='ctx'> 			dmfe_phy_write(db-&gt;ioaddr,</div><div class='ctx'> 				       db-&gt;phy_addr, 0, phy_reg, db-&gt;chip_id);</div><div class='del'>-       			if ( db-&gt;chip_type &amp;&amp; (db-&gt;chip_id == PCI_DM9102_ID) )</div><div class='add'>+			if ( db-&gt;chip_type &amp;&amp; (db-&gt;chip_id == PCI_DM9102_ID) )</div><div class='ctx'> 				mdelay(20);</div><div class='ctx'> 			dmfe_phy_write(db-&gt;ioaddr,</div><div class='ctx'> 				       db-&gt;phy_addr, 0, phy_reg, db-&gt;chip_id);</div><div class='hunk'>@@ -2091,14 +2084,11 @@ static const struct pci_device_id dmfe_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, dmfe_pci_tbl);</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)</div><div class='add'>+static int __maybe_unused dmfe_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct dmfe_board_info *db = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = db-&gt;ioaddr;</div><div class='del'>-	u32 tmp;</div><div class='ctx'> </div><div class='ctx'> 	/* Disable upper layer interface */</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='hunk'>@@ -2115,69 +2105,40 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)</div><div class='ctx'> 	dmfe_free_rxbuffer(db);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable WOL */</div><div class='del'>-	pci_read_config_dword(pci_dev, 0x40, &amp;tmp);</div><div class='del'>-	tmp &amp;= ~(DMFE_WOL_LINKCHANGE|DMFE_WOL_MAGICPACKET);</div><div class='del'>-</div><div class='del'>-	if (db-&gt;wol_mode &amp; WAKE_PHY)</div><div class='del'>-		tmp |= DMFE_WOL_LINKCHANGE;</div><div class='del'>-	if (db-&gt;wol_mode &amp; WAKE_MAGIC)</div><div class='del'>-		tmp |= DMFE_WOL_MAGICPACKET;</div><div class='del'>-</div><div class='del'>-	pci_write_config_dword(pci_dev, 0x40, tmp);</div><div class='del'>-</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D3hot, 1);</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D3cold, 1);</div><div class='del'>-</div><div class='del'>-	/* Power down device*/</div><div class='del'>-	pci_save_state(pci_dev);</div><div class='del'>-	pci_set_power_state(pci_dev, pci_choose_state (pci_dev, state));</div><div class='add'>+	device_wakeup_enable(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dmfe_resume(struct pci_dev *pci_dev)</div><div class='add'>+static int __maybe_unused dmfe_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='del'>-	u32 tmp;</div><div class='del'>-</div><div class='del'>-	pci_set_power_state(pci_dev, PCI_D0);</div><div class='del'>-	pci_restore_state(pci_dev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	/* Re-initialize DM910X board */</div><div class='ctx'> 	dmfe_init_dm910x(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* Disable WOL */</div><div class='del'>-	pci_read_config_dword(pci_dev, 0x40, &amp;tmp);</div><div class='del'>-</div><div class='del'>-	tmp &amp;= ~(DMFE_WOL_LINKCHANGE | DMFE_WOL_MAGICPACKET);</div><div class='del'>-	pci_write_config_dword(pci_dev, 0x40, tmp);</div><div class='del'>-</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D3hot, 0);</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D3cold, 0);</div><div class='add'>+	device_wakeup_disable(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	/* Restart upper layer interface */</div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='del'>-#else</div><div class='del'>-#define dmfe_suspend NULL</div><div class='del'>-#define dmfe_resume NULL</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(dmfe_pm_ops, dmfe_suspend, dmfe_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver dmfe_driver = {</div><div class='ctx'> 	.name		= "dmfe",</div><div class='ctx'> 	.id_table	= dmfe_pci_tbl,</div><div class='ctx'> 	.probe		= dmfe_init_one,</div><div class='ctx'> 	.remove		= dmfe_remove_one,</div><div class='del'>-	.suspend        = dmfe_suspend,</div><div class='del'>-	.resume         = dmfe_resume</div><div class='add'>+	.driver.pm	= &amp;dmfe_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Sten Wang, sten_wang@davicom.com.tw");</div><div class='ctx'> MODULE_DESCRIPTION("Davicom DM910X fast ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> module_param(debug, int, 0);</div><div class='ctx'> module_param(mode, byte, 0);</div><div class='hunk'>@@ -2204,9 +2165,6 @@ static int __init dmfe_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> 	int rc;</div><div class='ctx'> </div><div class='del'>-	pr_info("%s\n", version);</div><div class='del'>-	printed_version = 1;</div><div class='del'>-</div><div class='ctx'> 	DMFE_DBUG(0, "init_module() ", debug);</div><div class='ctx'> </div><div class='ctx'> 	if (debug)</div><div class='hunk'>@@ -2214,15 +2172,16 @@ static int __init dmfe_init_module(void)</div><div class='ctx'> 	if (cr6set)</div><div class='ctx'> 		dmfe_cr6_user_set = cr6set;</div><div class='ctx'> </div><div class='del'>- 	switch(mode) {</div><div class='del'>-   	case DMFE_10MHF:</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case DMFE_10MHF:</div><div class='ctx'> 	case DMFE_100MHF:</div><div class='ctx'> 	case DMFE_10MFD:</div><div class='ctx'> 	case DMFE_100MFD:</div><div class='ctx'> 	case DMFE_1M_HPNA:</div><div class='ctx'> 		dmfe_media_mode = mode;</div><div class='ctx'> 		break;</div><div class='del'>-	default:dmfe_media_mode = DMFE_AUTO;</div><div class='add'>+	default:</div><div class='add'>+		dmfe_media_mode = DMFE_AUTO;</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c<br/>index ba0a69b363f8..71ff9e6db209 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/eeprom.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/eeprom.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/eeprom.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/eeprom.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;linux/slab.h&gt;</div><div class='ctx'> #include "tulip.h"</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -117,8 +117,8 @@ static void tulip_build_fake_mediatable(struct tulip_private *tp)</div><div class='ctx'> 			  0x00, 0x06  /* ttm bit map */</div><div class='ctx'> 			};</div><div class='ctx'> </div><div class='del'>-		tp-&gt;mtable = kmalloc(sizeof(struct mediatable) +</div><div class='del'>-				     sizeof(struct medialeaf), GFP_KERNEL);</div><div class='add'>+		tp-&gt;mtable = devm_kmalloc(&amp;tp-&gt;pdev-&gt;dev, sizeof(struct mediatable) +</div><div class='add'>+					  sizeof(struct medialeaf), GFP_KERNEL);</div><div class='ctx'> </div><div class='ctx'> 		if (tp-&gt;mtable == NULL)</div><div class='ctx'> 			return; /* Horrible, impossible failure. */</div><div class='hunk'>@@ -224,7 +224,8 @@ subsequent_board:</div><div class='ctx'> 		        return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		mtable = kmalloc(struct_size(mtable, mleaf, count), GFP_KERNEL);</div><div class='add'>+		mtable = devm_kmalloc(&amp;tp-&gt;pdev-&gt;dev, struct_size(mtable, mleaf, count),</div><div class='add'>+				      GFP_KERNEL);</div><div class='ctx'> 		if (mtable == NULL)</div><div class='ctx'> 			return;				/* Horrible, impossible failure. */</div><div class='ctx'> 		last_mediatable = tp-&gt;mtable = mtable;</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/interrupt.c b/drivers/net/ethernet/dec/tulip/interrupt.c<br/>index c1ca0765d56d..0a12cb9b3ba7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/interrupt.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/interrupt.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/interrupt.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/interrupt.c</a></div><div class='hunk'>@@ -74,8 +74,8 @@ int tulip_refill_rx(struct net_device *dev)</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;</div><div class='ctx'> </div><div class='del'>-			mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data, PKT_BUF_SZ,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='add'>+			mapping = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+						 PKT_BUF_SZ, DMA_FROM_DEVICE);</div><div class='ctx'> 			if (dma_mapping_error(&amp;tp-&gt;pdev-&gt;dev, mapping)) {</div><div class='ctx'> 				dev_kfree_skb(skb);</div><div class='ctx'> 				tp-&gt;rx_buffers[entry].skb = NULL;</div><div class='hunk'>@@ -104,7 +104,7 @@ int tulip_refill_rx(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> void oom_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tulip_private *tp = from_timer(tp, t, oom_timer);</div><div class='add'>+	struct tulip_private *tp = timer_container_of(tp, t, oom_timer);</div><div class='ctx'> </div><div class='ctx'> 	napi_schedule(&amp;tp-&gt;napi);</div><div class='ctx'> }</div><div class='hunk'>@@ -210,9 +210,10 @@ int tulip_poll(struct napi_struct *napi, int budget)</div><div class='ctx'>                                if (pkt_len &lt; tulip_rx_copybreak &amp;&amp;</div><div class='ctx'>                                    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {</div><div class='ctx'>                                        skb_reserve(skb, 2);    /* 16 byte align the IP header */</div><div class='del'>-                                       pci_dma_sync_single_for_cpu(tp-&gt;pdev,</div><div class='del'>-								   tp-&gt;rx_buffers[entry].mapping,</div><div class='del'>-								   pkt_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+					dma_sync_single_for_cpu(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+								tp-&gt;rx_buffers[entry].mapping,</div><div class='add'>+								pkt_len,</div><div class='add'>+								DMA_FROM_DEVICE);</div><div class='ctx'> #if ! defined(__alpha__)</div><div class='ctx'>                                        skb_copy_to_linear_data(skb, tp-&gt;rx_buffers[entry].skb-&gt;data,</div><div class='ctx'>                                                         pkt_len);</div><div class='hunk'>@@ -222,9 +223,10 @@ int tulip_poll(struct napi_struct *napi, int budget)</div><div class='ctx'>                                                     tp-&gt;rx_buffers[entry].skb-&gt;data,</div><div class='ctx'>                                                     pkt_len);</div><div class='ctx'> #endif</div><div class='del'>-                                       pci_dma_sync_single_for_device(tp-&gt;pdev,</div><div class='del'>-								      tp-&gt;rx_buffers[entry].mapping,</div><div class='del'>-								      pkt_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+					dma_sync_single_for_device(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+								   tp-&gt;rx_buffers[entry].mapping,</div><div class='add'>+								   pkt_len,</div><div class='add'>+								   DMA_FROM_DEVICE);</div><div class='ctx'>                                } else {        /* Pass up the skb already on the Rx ring. */</div><div class='ctx'>                                        char *temp = skb_put(skb = tp-&gt;rx_buffers[entry].skb,</div><div class='ctx'>                                                             pkt_len);</div><div class='hunk'>@@ -240,8 +242,10 @@ int tulip_poll(struct napi_struct *napi, int budget)</div><div class='ctx'>                                        }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-                                       pci_unmap_single(tp-&gt;pdev, tp-&gt;rx_buffers[entry].mapping,</div><div class='del'>-                                                        PKT_BUF_SZ, PCI_DMA_FROMDEVICE);</div><div class='add'>+					dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+							 tp-&gt;rx_buffers[entry].mapping,</div><div class='add'>+							 PKT_BUF_SZ,</div><div class='add'>+							 DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'>                                        tp-&gt;rx_buffers[entry].skb = NULL;</div><div class='ctx'>                                        tp-&gt;rx_buffers[entry].mapping = 0;</div><div class='hunk'>@@ -436,9 +440,10 @@ static int tulip_rx(struct net_device *dev)</div><div class='ctx'> 			if (pkt_len &lt; tulip_rx_copybreak &amp;&amp;</div><div class='ctx'> 			    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {</div><div class='ctx'> 				skb_reserve(skb, 2);	/* 16 byte align the IP header */</div><div class='del'>-				pci_dma_sync_single_for_cpu(tp-&gt;pdev,</div><div class='del'>-							    tp-&gt;rx_buffers[entry].mapping,</div><div class='del'>-							    pkt_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_cpu(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+							tp-&gt;rx_buffers[entry].mapping,</div><div class='add'>+							pkt_len,</div><div class='add'>+							DMA_FROM_DEVICE);</div><div class='ctx'> #if ! defined(__alpha__)</div><div class='ctx'> 				skb_copy_to_linear_data(skb, tp-&gt;rx_buffers[entry].skb-&gt;data,</div><div class='ctx'> 						 pkt_len);</div><div class='hunk'>@@ -448,9 +453,10 @@ static int tulip_rx(struct net_device *dev)</div><div class='ctx'> 					     tp-&gt;rx_buffers[entry].skb-&gt;data,</div><div class='ctx'> 					     pkt_len);</div><div class='ctx'> #endif</div><div class='del'>-				pci_dma_sync_single_for_device(tp-&gt;pdev,</div><div class='del'>-							       tp-&gt;rx_buffers[entry].mapping,</div><div class='del'>-							       pkt_len, PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_device(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+							   tp-&gt;rx_buffers[entry].mapping,</div><div class='add'>+							   pkt_len,</div><div class='add'>+							   DMA_FROM_DEVICE);</div><div class='ctx'> 			} else { 	/* Pass up the skb already on the Rx ring. */</div><div class='ctx'> 				char *temp = skb_put(skb = tp-&gt;rx_buffers[entry].skb,</div><div class='ctx'> 						     pkt_len);</div><div class='hunk'>@@ -466,8 +472,9 @@ static int tulip_rx(struct net_device *dev)</div><div class='ctx'> 				}</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-				pci_unmap_single(tp-&gt;pdev, tp-&gt;rx_buffers[entry].mapping,</div><div class='del'>-						 PKT_BUF_SZ, PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+						 tp-&gt;rx_buffers[entry].mapping,</div><div class='add'>+						 PKT_BUF_SZ, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 				tp-&gt;rx_buffers[entry].skb = NULL;</div><div class='ctx'> 				tp-&gt;rx_buffers[entry].mapping = 0;</div><div class='hunk'>@@ -597,10 +604,10 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 				if (tp-&gt;tx_buffers[entry].skb == NULL) {</div><div class='ctx'> 					/* test because dummy frames not mapped */</div><div class='ctx'> 					if (tp-&gt;tx_buffers[entry].mapping)</div><div class='del'>-						pci_unmap_single(tp-&gt;pdev,</div><div class='del'>-							 tp-&gt;tx_buffers[entry].mapping,</div><div class='del'>-							 sizeof(tp-&gt;setup_frame),</div><div class='del'>-							 PCI_DMA_TODEVICE);</div><div class='add'>+						dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+								 tp-&gt;tx_buffers[entry].mapping,</div><div class='add'>+								 sizeof(tp-&gt;setup_frame),</div><div class='add'>+								 DMA_TO_DEVICE);</div><div class='ctx'> 					continue;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='hunk'>@@ -629,9 +636,10 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 					dev-&gt;stats.tx_packets++;</div><div class='ctx'> 				}</div><div class='ctx'> </div><div class='del'>-				pci_unmap_single(tp-&gt;pdev, tp-&gt;tx_buffers[entry].mapping,</div><div class='add'>+				dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+						 tp-&gt;tx_buffers[entry].mapping,</div><div class='ctx'> 						 tp-&gt;tx_buffers[entry].skb-&gt;len,</div><div class='del'>-						 PCI_DMA_TODEVICE);</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 				/* Free the original skb. */</div><div class='ctx'> 				dev_kfree_skb_irq(tp-&gt;tx_buffers[entry].skb);</div><div class='hunk'>@@ -691,8 +699,8 @@ irqreturn_t tulip_interrupt(int irq, void *dev_instance)</div><div class='ctx'> 				tulip_start_rxtx(tp);</div><div class='ctx'> 			}</div><div class='ctx'> 			/*</div><div class='del'>-			 * NB: t21142_lnk_change() does a del_timer_sync(), so be careful if this</div><div class='del'>-			 * call is ever done under the spinlock</div><div class='add'>+			 * NB: t21142_lnk_change() does a timer_delete_sync(), so be careful</div><div class='add'>+			 * if this call is ever done under the spinlock</div><div class='ctx'> 			 */</div><div class='ctx'> 			if (csr5 &amp; (TPLnkPass | TPLnkFail | 0x08000000)) {</div><div class='ctx'> 				if (tp-&gt;link_change)</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/media.c b/drivers/net/ethernet/dec/tulip/media.c<br/>index dcf21a36a9cf..55d6fc99f40b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/media.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/media.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/media.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/media.c</a></div><div class='hunk'>@@ -319,13 +319,8 @@ void tulip_select_media(struct net_device *dev, int startup)</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='ctx'> 		case 5: case 6: {</div><div class='del'>-			u16 setup[5];</div><div class='del'>-</div><div class='ctx'> 			new_csr6 = 0; /* FIXME */</div><div class='ctx'> </div><div class='del'>-			for (i = 0; i &lt; 5; i++)</div><div class='del'>-				setup[i] = get_u16(&amp;p[i*2 + 1]);</div><div class='del'>-</div><div class='ctx'> 			if (startup &amp;&amp; mtable-&gt;has_reset) {</div><div class='ctx'> 				struct medialeaf *rleaf = &amp;mtable-&gt;mleaf[mtable-&gt;has_reset];</div><div class='ctx'> 				unsigned char *rst = rleaf-&gt;leafdata;</div><div class='hunk'>@@ -367,7 +362,7 @@ void tulip_select_media(struct net_device *dev, int startup)</div><div class='ctx'> 			iowrite32(0x33, ioaddr + CSR12);</div><div class='ctx'> 			new_csr6 = 0x01860000;</div><div class='ctx'> 			/* Trigger autonegotiation. */</div><div class='del'>-			iowrite32(startup ? 0x0201F868 : 0x0001F868, ioaddr + 0xB8);</div><div class='add'>+			iowrite32(0x0001F868, ioaddr + 0xB8);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			iowrite32(0x32, ioaddr + CSR12);</div><div class='ctx'> 			new_csr6 = 0x00420000;</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/pnic.c b/drivers/net/ethernet/dec/tulip/pnic.c<br/>index 3fb39e32e1b4..1de5ed967070 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/pnic.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/pnic.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/pnic.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/pnic.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ void pnic_do_nway(struct net_device *dev)</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='ctx'> 	u32 phy_reg = ioread32(ioaddr + 0xB8);</div><div class='del'>-	u32 new_csr6 = tp-&gt;csr6 &amp; ~0x40C40200;</div><div class='add'>+	u32 new_csr6;</div><div class='ctx'> </div><div class='ctx'> 	if (phy_reg &amp; 0x78000000) { /* Ignore baseT4 */</div><div class='ctx'> 		if (phy_reg &amp; 0x20000000)		dev-&gt;if_port = 5;</div><div class='hunk'>@@ -86,7 +86,7 @@ void pnic_lnk_change(struct net_device *dev, int csr5)</div><div class='ctx'> </div><div class='ctx'> void pnic_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tulip_private *tp = from_timer(tp, t, timer);</div><div class='add'>+	struct tulip_private *tp = timer_container_of(tp, t, timer);</div><div class='ctx'> 	struct net_device *dev = tp-&gt;dev;</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='ctx'> 	int next_tick = 60*HZ;</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/pnic2.c b/drivers/net/ethernet/dec/tulip/pnic2.c<br/>index 412adaa7fdf8..39c410bf224e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/pnic2.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/pnic2.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/pnic2.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/pnic2.c</a></div><div class='hunk'>@@ -78,7 +78,7 @@</div><div class='ctx'> </div><div class='ctx'> void pnic2_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tulip_private *tp = from_timer(tp, t, timer);</div><div class='add'>+	struct tulip_private *tp = timer_container_of(tp, t, timer);</div><div class='ctx'> 	struct net_device *dev = tp-&gt;dev;</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='ctx'> 	int next_tick = 60*HZ;</div><div class='hunk'>@@ -323,7 +323,7 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)</div><div class='ctx'> 		if (tulip_debug &gt; 2)</div><div class='ctx'> 			netdev_dbg(dev, "Ugh! Link blew?\n");</div><div class='ctx'> </div><div class='del'>-		del_timer_sync(&amp;tp-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> 		pnic2_start_nway(dev);</div><div class='ctx'> 		tp-&gt;timer.expires = RUN_AT(3*HZ);</div><div class='ctx'> 		add_timer(&amp;tp-&gt;timer);</div><div class='hunk'>@@ -348,10 +348,10 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)</div><div class='ctx'> </div><div class='ctx'>                 /* if failed then try doing an nway to get in sync */</div><div class='ctx'> 		if ((csr12 &amp; 2)  &amp;&amp;  ! tp-&gt;medialock) {</div><div class='del'>-			del_timer_sync(&amp;tp-&gt;timer);</div><div class='add'>+			timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> 			pnic2_start_nway(dev);</div><div class='ctx'> 			tp-&gt;timer.expires = RUN_AT(3*HZ);</div><div class='del'>-       			add_timer(&amp;tp-&gt;timer);</div><div class='add'>+			add_timer(&amp;tp-&gt;timer);</div><div class='ctx'>                 }</div><div class='ctx'> </div><div class='ctx'>                 return;</div><div class='hunk'>@@ -372,10 +372,10 @@ void pnic2_lnk_change(struct net_device *dev, int csr5)</div><div class='ctx'> </div><div class='ctx'>                 /* if failed, try doing an nway to get in sync */</div><div class='ctx'> 		if ((csr12 &amp; 4)  &amp;&amp;  ! tp-&gt;medialock) {</div><div class='del'>-			del_timer_sync(&amp;tp-&gt;timer);</div><div class='add'>+			timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> 			pnic2_start_nway(dev);</div><div class='ctx'> 			tp-&gt;timer.expires = RUN_AT(3*HZ);</div><div class='del'>-       			add_timer(&amp;tp-&gt;timer);</div><div class='add'>+			add_timer(&amp;tp-&gt;timer);</div><div class='ctx'>                 }</div><div class='ctx'> </div><div class='ctx'>                 return;</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/timer.c b/drivers/net/ethernet/dec/tulip/timer.c<br/>index 642e9dfc5451..ca0c509b601c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/timer.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/timer.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/timer.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/timer.c</a></div><div class='hunk'>@@ -139,7 +139,7 @@ void tulip_media_task(struct work_struct *work)</div><div class='ctx'> </div><div class='ctx'> void mxic_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tulip_private *tp = from_timer(tp, t, timer);</div><div class='add'>+	struct tulip_private *tp = timer_container_of(tp, t, timer);</div><div class='ctx'> 	struct net_device *dev = tp-&gt;dev;</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='ctx'> 	int next_tick = 60*HZ;</div><div class='hunk'>@@ -156,7 +156,7 @@ void mxic_timer(struct timer_list *t)</div><div class='ctx'> </div><div class='ctx'> void comet_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tulip_private *tp = from_timer(tp, t, timer);</div><div class='add'>+	struct tulip_private *tp = timer_container_of(tp, t, timer);</div><div class='ctx'> 	struct net_device *dev = tp-&gt;dev;</div><div class='ctx'> 	int next_tick = 2*HZ;</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/tulip.h b/drivers/net/ethernet/dec/tulip/tulip.h<br/>index b458140aeaef..5e010e1fa6f7 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/tulip.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/tulip.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/tulip.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/tulip.h</a></div><div class='hunk'>@@ -23,7 +23,7 @@</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='ctx'> #include &lt;asm/io.h&gt;</div><div class='ctx'> #include &lt;asm/irq.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -381,7 +381,7 @@ struct mediatable {</div><div class='ctx'> 	unsigned has_reset:6;</div><div class='ctx'> 	u32 csr15dir;</div><div class='ctx'> 	u32 csr15val;		/* 21143 NWay setting. */</div><div class='del'>-	struct medialeaf mleaf[0];</div><div class='add'>+	struct medialeaf mleaf[] __counted_by(leafcount);</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -478,7 +478,6 @@ void t21142_lnk_change(struct net_device *dev, int csr5);</div><div class='ctx'> void pnic2_lnk_change(struct net_device *dev, int csr5);</div><div class='ctx'> void pnic2_timer(struct timer_list *t);</div><div class='ctx'> void pnic2_start_nway(struct net_device *dev);</div><div class='del'>-void pnic2_lnk_change(struct net_device *dev, int csr5);</div><div class='ctx'> </div><div class='ctx'> /* eeprom.c */</div><div class='ctx'> void tulip_parse_eeprom(struct net_device *dev);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c<br/>index 3e3e08698876..b608585f1954 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/tulip_core.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/tulip_core.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/tulip_core.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/tulip_core.c</a></div><div class='hunk'>@@ -12,13 +12,6 @@</div><div class='ctx'> #define pr_fmt(fmt) "tulip: " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"tulip"</div><div class='del'>-#ifdef CONFIG_TULIP_NAPI</div><div class='del'>-#define DRV_VERSION    "1.1.15-NAPI" /* Keep at least for test */</div><div class='del'>-#else</div><div class='del'>-#define DRV_VERSION	"1.1.15"</div><div class='del'>-#endif</div><div class='del'>-#define DRV_RELDATE	"Feb 27, 2007"</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/pci.h&gt;</div><div class='hunk'>@@ -30,16 +23,13 @@</div><div class='ctx'> #include &lt;linux/delay.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='del'>-#include &lt;asm/unaligned.h&gt;</div><div class='add'>+#include &lt;linux/unaligned.h&gt;</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_SPARC</div><div class='ctx'> #include &lt;asm/prom.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-static char version[] =</div><div class='del'>-	"Linux Tulip driver version " DRV_VERSION " (" DRV_RELDATE ")\n";</div><div class='del'>-</div><div class='ctx'> /* A few user-configurable values. */</div><div class='ctx'> </div><div class='ctx'> /* Maximum events (Rx packets, etc.) to handle at each interrupt. */</div><div class='hunk'>@@ -109,7 +99,6 @@ static int csr0;</div><div class='ctx'> MODULE_AUTHOR("The Linux Kernel Team");</div><div class='ctx'> MODULE_DESCRIPTION("Digital 21*4* Tulip ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> module_param(tulip_debug, int, 0);</div><div class='ctx'> module_param(max_interrupt_work, int, 0);</div><div class='ctx'> module_param(rx_copybreak, int, 0);</div><div class='hunk'>@@ -125,7 +114,7 @@ int tulip_debug = 1;</div><div class='ctx'> </div><div class='ctx'> static void tulip_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct tulip_private *tp = from_timer(tp, t, timer);</div><div class='add'>+	struct tulip_private *tp = timer_container_of(tp, t, timer);</div><div class='ctx'> 	struct net_device *dev = tp-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	if (netif_running(dev))</div><div class='hunk'>@@ -255,7 +244,7 @@ MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);</div><div class='ctx'> const char tulip_media_cap[32] =</div><div class='ctx'> {0,0,0,16,  3,19,16,24,  27,4,7,5, 0,20,23,20,  28,31,0,0, };</div><div class='ctx'> </div><div class='del'>-static void tulip_tx_timeout(struct net_device *dev);</div><div class='add'>+static void tulip_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void tulip_init_ring(struct net_device *dev);</div><div class='ctx'> static void tulip_free_ring(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t tulip_start_xmit(struct sk_buff *skb,</div><div class='hunk'>@@ -350,7 +339,7 @@ static void tulip_up(struct net_device *dev)</div><div class='ctx'> 		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		/* This is set_rx_mode(), but without starting the transmitter. */</div><div class='del'>-		u16 *eaddrs = (u16 *)dev-&gt;dev_addr;</div><div class='add'>+		const u16 *eaddrs = (const u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 		u16 *setup_frm = &amp;tp-&gt;setup_frame[15*6];</div><div class='ctx'> 		dma_addr_t mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -361,9 +350,9 @@ static void tulip_up(struct net_device *dev)</div><div class='ctx'> 		*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];</div><div class='ctx'> 		*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];</div><div class='ctx'> </div><div class='del'>-		mapping = pci_map_single(tp-&gt;pdev, tp-&gt;setup_frame,</div><div class='add'>+		mapping = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, tp-&gt;setup_frame,</div><div class='ctx'> 					 sizeof(tp-&gt;setup_frame),</div><div class='del'>-					 PCI_DMA_TODEVICE);</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 		tp-&gt;tx_buffers[tp-&gt;cur_tx].skb = NULL;</div><div class='ctx'> 		tp-&gt;tx_buffers[tp-&gt;cur_tx].mapping = mapping;</div><div class='ctx'> </div><div class='hunk'>@@ -534,7 +523,7 @@ free_ring:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void tulip_tx_timeout(struct net_device *dev)</div><div class='add'>+static void tulip_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='hunk'>@@ -641,8 +630,8 @@ static void tulip_init_ring(struct net_device *dev)</div><div class='ctx'> 		tp-&gt;rx_buffers[i].skb = skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='del'>-		mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data,</div><div class='del'>-					 PKT_BUF_SZ, PCI_DMA_FROMDEVICE);</div><div class='add'>+		mapping = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+					 PKT_BUF_SZ, DMA_FROM_DEVICE);</div><div class='ctx'> 		tp-&gt;rx_buffers[i].mapping = mapping;</div><div class='ctx'> 		tp-&gt;rx_ring[i].status = cpu_to_le32(DescOwned);	/* Owned by Tulip chip */</div><div class='ctx'> 		tp-&gt;rx_ring[i].buffer1 = cpu_to_le32(mapping);</div><div class='hunk'>@@ -675,8 +664,8 @@ tulip_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	entry = tp-&gt;cur_tx % TX_RING_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	tp-&gt;tx_buffers[entry].skb = skb;</div><div class='del'>-	mapping = pci_map_single(tp-&gt;pdev, skb-&gt;data,</div><div class='del'>-				 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	mapping = dma_map_single(&amp;tp-&gt;pdev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> 	tp-&gt;tx_buffers[entry].mapping = mapping;</div><div class='ctx'> 	tp-&gt;tx_ring[entry].buffer1 = cpu_to_le32(mapping);</div><div class='ctx'> </div><div class='hunk'>@@ -727,16 +716,17 @@ static void tulip_clean_tx_ring(struct tulip_private *tp)</div><div class='ctx'> 		if (tp-&gt;tx_buffers[entry].skb == NULL) {</div><div class='ctx'> 			/* test because dummy frames not mapped */</div><div class='ctx'> 			if (tp-&gt;tx_buffers[entry].mapping)</div><div class='del'>-				pci_unmap_single(tp-&gt;pdev,</div><div class='del'>-					tp-&gt;tx_buffers[entry].mapping,</div><div class='del'>-					sizeof(tp-&gt;setup_frame),</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='add'>+				dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+						 tp-&gt;tx_buffers[entry].mapping,</div><div class='add'>+						 sizeof(tp-&gt;setup_frame),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(tp-&gt;pdev, tp-&gt;tx_buffers[entry].mapping,</div><div class='del'>-				tp-&gt;tx_buffers[entry].skb-&gt;len,</div><div class='del'>-				PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+				 tp-&gt;tx_buffers[entry].mapping,</div><div class='add'>+				 tp-&gt;tx_buffers[entry].skb-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		/* Free the original skb. */</div><div class='ctx'> 		dev_kfree_skb_irq(tp-&gt;tx_buffers[entry].skb);</div><div class='hunk'>@@ -757,9 +747,9 @@ static void tulip_down (struct net_device *dev)</div><div class='ctx'> 	napi_disable(&amp;tp-&gt;napi);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-	del_timer_sync (&amp;tp-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;tp-&gt;timer);</div><div class='ctx'> #ifdef CONFIG_TULIP_NAPI</div><div class='del'>-	del_timer_sync (&amp;tp-&gt;oom_timer);</div><div class='add'>+	timer_delete_sync(&amp;tp-&gt;oom_timer);</div><div class='ctx'> #endif</div><div class='ctx'> 	spin_lock_irqsave (&amp;tp-&gt;lock, flags);</div><div class='ctx'> </div><div class='hunk'>@@ -806,8 +796,8 @@ static void tulip_free_ring (struct net_device *dev)</div><div class='ctx'> 		/* An invalid address. */</div><div class='ctx'> 		tp-&gt;rx_ring[i].buffer1 = cpu_to_le32(0xBADF00D0);</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			pci_unmap_single(tp-&gt;pdev, mapping, PKT_BUF_SZ,</div><div class='del'>-					 PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev, mapping, PKT_BUF_SZ,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb (skb);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='hunk'>@@ -816,8 +806,9 @@ static void tulip_free_ring (struct net_device *dev)</div><div class='ctx'> 		struct sk_buff *skb = tp-&gt;tx_buffers[i].skb;</div><div class='ctx'> </div><div class='ctx'> 		if (skb != NULL) {</div><div class='del'>-			pci_unmap_single(tp-&gt;pdev, tp-&gt;tx_buffers[i].mapping,</div><div class='del'>-					 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+					 tp-&gt;tx_buffers[i].mapping, skb-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb (skb);</div><div class='ctx'> 		}</div><div class='ctx'> 		tp-&gt;tx_buffers[i].skb = NULL;</div><div class='hunk'>@@ -867,9 +858,8 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev)</div><div class='ctx'> static void tulip_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct tulip_private *np = netdev_priv(dev);</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -923,7 +913,7 @@ static int private_ioctl (struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 			data-&gt;phy_id = 1;</div><div class='ctx'> 		else</div><div class='ctx'> 			return -ENODEV;</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCGMIIREG:		/* Read MII PHY register. */</div><div class='ctx'> 		if (data-&gt;phy_id == 32 &amp;&amp; (tp-&gt;flags &amp; HAS_NWAY)) {</div><div class='hunk'>@@ -1011,8 +1001,8 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='ctx'> 	u16 hash_table[32];</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='add'>+	const u16 *eaddrs;</div><div class='ctx'> 	int i;</div><div class='del'>-	u16 *eaddrs;</div><div class='ctx'> </div><div class='ctx'> 	memset(hash_table, 0, sizeof(hash_table));</div><div class='ctx'> 	__set_bit_le(255, hash_table);			/* Broadcast entry */</div><div class='hunk'>@@ -1029,7 +1019,7 @@ static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> 	setup_frm = &amp;tp-&gt;setup_frame[13*6];</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the final entry with our physical address. */</div><div class='del'>-	eaddrs = (u16 *)dev-&gt;dev_addr;</div><div class='add'>+	eaddrs = (const u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];</div><div class='ctx'> 	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];</div><div class='ctx'> 	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];</div><div class='hunk'>@@ -1039,7 +1029,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='del'>-	u16 *eaddrs;</div><div class='add'>+	const u16 *eaddrs;</div><div class='ctx'> </div><div class='ctx'> 	/* We have &lt;= 14 addresses so we can use the wonderful</div><div class='ctx'> 	   16 address perfect filtering of the Tulip. */</div><div class='hunk'>@@ -1054,7 +1044,7 @@ static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)</div><div class='ctx'> 	setup_frm = &amp;tp-&gt;setup_frame[15*6];</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the final entry with our physical address. */</div><div class='del'>-	eaddrs = (u16 *)dev-&gt;dev_addr;</div><div class='add'>+	eaddrs = (const u16 *)dev-&gt;dev_addr;</div><div class='ctx'> 	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];</div><div class='ctx'> 	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];</div><div class='ctx'> 	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];</div><div class='hunk'>@@ -1161,9 +1151,10 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 			tp-&gt;tx_buffers[entry].skb = NULL;</div><div class='ctx'> 			tp-&gt;tx_buffers[entry].mapping =</div><div class='del'>-				pci_map_single(tp-&gt;pdev, tp-&gt;setup_frame,</div><div class='add'>+				dma_map_single(&amp;tp-&gt;pdev-&gt;dev,</div><div class='add'>+					       tp-&gt;setup_frame,</div><div class='ctx'> 					       sizeof(tp-&gt;setup_frame),</div><div class='del'>-					       PCI_DMA_TODEVICE);</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='ctx'> 			/* Put the setup frame on the Tx list. */</div><div class='ctx'> 			if (entry == TX_RING_SIZE-1)</div><div class='ctx'> 				tx_flags |= DESC_RING_WRAP;		/* Wrap ring. */</div><div class='hunk'>@@ -1186,7 +1177,6 @@ static void set_rx_mode(struct net_device *dev)</div><div class='ctx'> 	iowrite32(csr6, ioaddr + CSR6);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TULIP_MWI</div><div class='ctx'> static void tulip_mwi_config(struct pci_dev *pdev, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='hunk'>@@ -1260,7 +1250,6 @@ out:</div><div class='ctx'> 		netdev_dbg(dev, "MWI config cacheline=%d, csr0=%08x\n",</div><div class='ctx'> 			   cache, csr0);</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Chips that have the MRM/reserved bit quirk and the burst quirk. That</div><div class='hunk'>@@ -1280,7 +1269,7 @@ static const struct net_device_ops tulip_netdev_ops = {</div><div class='ctx'> 	.ndo_tx_timeout		= tulip_tx_timeout,</div><div class='ctx'> 	.ndo_stop		= tulip_close,</div><div class='ctx'> 	.ndo_get_stats		= tulip_get_stats,</div><div class='del'>-	.ndo_do_ioctl 		= private_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= private_ioctl,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='hunk'>@@ -1289,7 +1278,7 @@ static const struct net_device_ops tulip_netdev_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-const struct pci_device_id early_486_chipsets[] = {</div><div class='add'>+static const struct pci_device_id early_486_chipsets[] = {</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },</div><div class='ctx'> 	{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },</div><div class='ctx'> 	{ },</div><div class='hunk'>@@ -1302,7 +1291,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	static unsigned char last_phys_addr[ETH_ALEN] = {</div><div class='ctx'> 		0x00, 'L', 'i', 'n', 'u', 'x'</div><div class='ctx'> 	};</div><div class='add'>+#if defined(__i386__) || defined(__x86_64__)	/* Patch up x86 BIOS bug. */</div><div class='ctx'> 	static int last_irq;</div><div class='add'>+#endif</div><div class='ctx'> 	int i, irq;</div><div class='ctx'> 	unsigned short sum;</div><div class='ctx'> 	unsigned char *ee_data;</div><div class='hunk'>@@ -1312,13 +1303,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int chip_idx = ent-&gt;driver_data;</div><div class='ctx'> 	const char *chip_name = tulip_tbl[chip_idx].chip_name;</div><div class='ctx'> 	unsigned int eeprom_missing = 0;</div><div class='add'>+	u8 addr[ETH_ALEN] __aligned(2);</div><div class='ctx'> 	unsigned int force_csr0 = 0;</div><div class='ctx'> </div><div class='del'>-#ifndef MODULE</div><div class='del'>-	if (tulip_debug &gt; 0)</div><div class='del'>-		printk_once(KERN_INFO "%s", version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	board_idx++;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='hunk'>@@ -1400,7 +1387,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	 *	And back to business</div><div class='ctx'> 	 */</div><div class='ctx'> </div><div class='del'>-	i = pci_enable_device(pdev);</div><div class='add'>+	i = pcim_enable_device(pdev);</div><div class='ctx'> 	if (i) {</div><div class='ctx'> 		pr_err("Cannot enable tulip board #%d, aborting\n", board_idx);</div><div class='ctx'> 		return i;</div><div class='hunk'>@@ -1409,7 +1396,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='ctx'> 	/* alloc_etherdev ensures aligned and zeroed private structures */</div><div class='del'>-	dev = alloc_etherdev (sizeof (*tp));</div><div class='add'>+	dev = devm_alloc_etherdev(&amp;pdev-&gt;dev, sizeof(*tp));</div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='hunk'>@@ -1419,18 +1406,18 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		       pci_name(pdev),</div><div class='ctx'> 		       (unsigned long long)pci_resource_len (pdev, 0),</div><div class='ctx'> 		       (unsigned long long)pci_resource_start (pdev, 0));</div><div class='del'>-		goto err_out_free_netdev;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* grab all resources from both PIO and MMIO regions, as we</div><div class='ctx'> 	 * don't want anyone else messing around with our hardware */</div><div class='del'>-	if (pci_request_regions (pdev, DRV_NAME))</div><div class='del'>-		goto err_out_free_netdev;</div><div class='add'>+	if (pcim_request_all_regions(pdev, DRV_NAME))</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='del'>-	ioaddr =  pci_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);</div><div class='add'>+	ioaddr = pcim_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);</div><div class='ctx'> </div><div class='ctx'> 	if (!ioaddr)</div><div class='del'>-		goto err_out_free_res;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> </div><div class='ctx'> 	/*</div><div class='ctx'> 	 * initialize private data structure 'tp'</div><div class='hunk'>@@ -1439,12 +1426,12 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	tp = netdev_priv(dev);</div><div class='ctx'> 	tp-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	tp-&gt;rx_ring = pci_alloc_consistent(pdev,</div><div class='del'>-					   sizeof(struct tulip_rx_desc) * RX_RING_SIZE +</div><div class='del'>-					   sizeof(struct tulip_tx_desc) * TX_RING_SIZE,</div><div class='del'>-					   &amp;tp-&gt;rx_ring_dma);</div><div class='add'>+	tp-&gt;rx_ring = dmam_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					  sizeof(struct tulip_rx_desc) * RX_RING_SIZE +</div><div class='add'>+					  sizeof(struct tulip_tx_desc) * TX_RING_SIZE,</div><div class='add'>+					  &amp;tp-&gt;rx_ring_dma, GFP_KERNEL);</div><div class='ctx'> 	if (!tp-&gt;rx_ring)</div><div class='del'>-		goto err_out_mtable;</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	tp-&gt;tx_ring = (struct tulip_tx_desc *)(tp-&gt;rx_ring + RX_RING_SIZE);</div><div class='ctx'> 	tp-&gt;tx_ring_dma = tp-&gt;rx_ring_dma + sizeof(struct tulip_rx_desc) * RX_RING_SIZE;</div><div class='ctx'> </div><div class='hunk'>@@ -1474,10 +1461,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	INIT_WORK(&amp;tp-&gt;media_work, tulip_tbl[tp-&gt;chip_id].media_task);</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_TULIP_MWI</div><div class='del'>-	if (!force_csr0 &amp;&amp; (tp-&gt;flags &amp; HAS_PCI_MWI))</div><div class='add'>+	if (IS_ENABLED(CONFIG_TULIP_MWI) &amp;&amp; !force_csr0 &amp;&amp;</div><div class='add'>+	    (tp-&gt;flags &amp; HAS_PCI_MWI))</div><div class='ctx'> 		tulip_mwi_config (pdev, dev);</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* Stop the chip's Tx and Rx processes. */</div><div class='ctx'> 	tulip_stop_rxtx(tp);</div><div class='hunk'>@@ -1518,13 +1504,15 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 			do {</div><div class='ctx'> 				value = ioread32(ioaddr + CSR9);</div><div class='ctx'> 			} while (value &lt; 0  &amp;&amp; --boguscnt &gt; 0);</div><div class='del'>-			put_unaligned_le16(value, ((__le16 *)dev-&gt;dev_addr) + i);</div><div class='add'>+			put_unaligned_le16(value, ((__le16 *)addr) + i);</div><div class='ctx'> 			sum += value &amp; 0xffff;</div><div class='ctx'> 		}</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	} else if (chip_idx == COMET) {</div><div class='ctx'> 		/* No need to read the EEPROM. */</div><div class='del'>-		put_unaligned_le32(ioread32(ioaddr + 0xA4), dev-&gt;dev_addr);</div><div class='del'>-		put_unaligned_le16(ioread32(ioaddr + 0xA8), dev-&gt;dev_addr + 4);</div><div class='add'>+		put_unaligned_le32(ioread32(ioaddr + 0xA4), addr);</div><div class='add'>+		put_unaligned_le16(ioread32(ioaddr + 0xA8), addr + 4);</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 		for (i = 0; i &lt; 6; i ++)</div><div class='ctx'> 			sum += dev-&gt;dev_addr[i];</div><div class='ctx'> 	} else {</div><div class='hunk'>@@ -1562,7 +1550,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'>                     (PCI_SLOT(pdev-&gt;devfn) == 12))) {</div><div class='ctx'>                        /* Cobalt MAC address in first EEPROM locations. */</div><div class='ctx'>                        sa_offset = 0;</div><div class='del'>-		       /* Ensure our media table fixup get's applied */</div><div class='add'>+		       /* Ensure our media table fixup gets applied */</div><div class='ctx'> 		       memcpy(ee_data + 16, ee_data, 8);</div><div class='ctx'>                }</div><div class='ctx'> #endif</div><div class='hunk'>@@ -1587,20 +1575,23 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; 6; i ++) {</div><div class='del'>-			dev-&gt;dev_addr[i] = ee_data[i + sa_offset];</div><div class='add'>+			addr[i] = ee_data[i + sa_offset];</div><div class='ctx'> 			sum += ee_data[i + sa_offset];</div><div class='ctx'> 		}</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> 	}</div><div class='ctx'> 	/* Lite-On boards have the address byte-swapped. */</div><div class='ctx'> 	if ((dev-&gt;dev_addr[0] == 0xA0 ||</div><div class='ctx'> 	     dev-&gt;dev_addr[0] == 0xC0 ||</div><div class='ctx'> 	     dev-&gt;dev_addr[0] == 0x02) &amp;&amp;</div><div class='del'>-	    dev-&gt;dev_addr[1] == 0x00)</div><div class='add'>+	    dev-&gt;dev_addr[1] == 0x00) {</div><div class='ctx'> 		for (i = 0; i &lt; 6; i+=2) {</div><div class='del'>-			char tmp = dev-&gt;dev_addr[i];</div><div class='del'>-			dev-&gt;dev_addr[i] = dev-&gt;dev_addr[i+1];</div><div class='del'>-			dev-&gt;dev_addr[i+1] = tmp;</div><div class='add'>+			addr[i] = dev-&gt;dev_addr[i+1];</div><div class='add'>+			addr[i+1] = dev-&gt;dev_addr[i];</div><div class='ctx'> 		}</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* On the Zynx 315 Etherarray and other multiport boards only the</div><div class='ctx'> 	   first Tulip has an EEPROM.</div><div class='ctx'> 	   On Sparc systems the mac address is held in the OBP property</div><div class='hunk'>@@ -1611,17 +1602,18 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	if (sum == 0  || sum == 6*0xff) {</div><div class='ctx'> #if defined(CONFIG_SPARC)</div><div class='ctx'> 		struct device_node *dp = pci_device_to_OF_node(pdev);</div><div class='del'>-		const unsigned char *addr;</div><div class='add'>+		const unsigned char *addr2;</div><div class='ctx'> 		int len;</div><div class='ctx'> #endif</div><div class='ctx'> 		eeprom_missing = 1;</div><div class='ctx'> 		for (i = 0; i &lt; 5; i++)</div><div class='del'>-			dev-&gt;dev_addr[i] = last_phys_addr[i];</div><div class='del'>-		dev-&gt;dev_addr[i] = last_phys_addr[i] + 1;</div><div class='add'>+			addr[i] = last_phys_addr[i];</div><div class='add'>+		addr[i] = last_phys_addr[i] + 1;</div><div class='add'>+		eth_hw_addr_set(dev, addr);</div><div class='ctx'> #if defined(CONFIG_SPARC)</div><div class='del'>-		addr = of_get_property(dp, "local-mac-address", &amp;len);</div><div class='del'>-		if (addr &amp;&amp; len == ETH_ALEN)</div><div class='del'>-			memcpy(dev-&gt;dev_addr, addr, ETH_ALEN);</div><div class='add'>+		addr2 = of_get_property(dp, "local-mac-address", &amp;len);</div><div class='add'>+		if (addr2 &amp;&amp; len == ETH_ALEN)</div><div class='add'>+			eth_hw_addr_set(dev, addr2);</div><div class='ctx'> #endif</div><div class='ctx'> #if defined(__i386__) || defined(__x86_64__)	/* Patch up x86 BIOS bug. */</div><div class='ctx'> 		if (last_irq)</div><div class='hunk'>@@ -1631,7 +1623,9 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 6; i++)</div><div class='ctx'> 		last_phys_addr[i] = dev-&gt;dev_addr[i];</div><div class='add'>+#if defined(__i386__) || defined(__x86_64__)	/* Patch up x86 BIOS bug. */</div><div class='ctx'> 	last_irq = irq;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> 	/* The lower four bits are the media type. */</div><div class='ctx'> 	if (board_idx &gt;= 0  &amp;&amp;  board_idx &lt; MAX_UNITS) {</div><div class='hunk'>@@ -1692,12 +1686,13 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;tulip_netdev_ops;</div><div class='ctx'> 	dev-&gt;watchdog_timeo = TX_TIMEOUT;</div><div class='ctx'> #ifdef CONFIG_TULIP_NAPI</div><div class='del'>-	netif_napi_add(dev, &amp;tp-&gt;napi, tulip_poll, 16);</div><div class='add'>+	netif_napi_add_weight(dev, &amp;tp-&gt;napi, tulip_poll, 16);</div><div class='ctx'> #endif</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;ops;</div><div class='ctx'> </div><div class='del'>-	if (register_netdev(dev))</div><div class='del'>-		goto err_out_free_ring;</div><div class='add'>+	i = register_netdev(dev);</div><div class='add'>+	if (i)</div><div class='add'>+		return i;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata(pdev, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1772,23 +1767,6 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	tulip_set_power_state (tp, 0, 1);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='del'>-</div><div class='del'>-err_out_free_ring:</div><div class='del'>-	pci_free_consistent (pdev,</div><div class='del'>-			     sizeof (struct tulip_rx_desc) * RX_RING_SIZE +</div><div class='del'>-			     sizeof (struct tulip_tx_desc) * TX_RING_SIZE,</div><div class='del'>-			     tp-&gt;rx_ring, tp-&gt;rx_ring_dma);</div><div class='del'>-</div><div class='del'>-err_out_mtable:</div><div class='del'>-	kfree (tp-&gt;mtable);</div><div class='del'>-	pci_iounmap(pdev, ioaddr);</div><div class='del'>-</div><div class='del'>-err_out_free_res:</div><div class='del'>-	pci_release_regions (pdev);</div><div class='del'>-</div><div class='del'>-err_out_free_netdev:</div><div class='del'>-	free_netdev (dev);</div><div class='del'>-	return -ENODEV;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -1800,14 +1778,13 @@ static void tulip_set_wolopts (struct pci_dev *pdev, u32 wolopts)</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;flags &amp; COMET_PM) {</div><div class='del'>-	  </div><div class='ctx'> 		unsigned int tmp;</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		tmp = ioread32(ioaddr + CSR18);</div><div class='ctx'> 		tmp &amp;= ~(comet_csr18_pmes_sticky | comet_csr18_apm_mode | comet_csr18_d3a);</div><div class='ctx'> 		tmp |= comet_csr18_pm_mode;</div><div class='ctx'> 		iowrite32(tmp, ioaddr + CSR18);</div><div class='del'>-			</div><div class='add'>+</div><div class='ctx'> 		/* Set the Wake-up Control/Status Register to the given WOL options*/</div><div class='ctx'> 		tmp = ioread32(ioaddr + CSR13);</div><div class='ctx'> 		tmp &amp;= ~(comet_csr13_linkoffe | comet_csr13_linkone | comet_csr13_wfre | comet_csr13_lsce | comet_csr13_mpre);</div><div class='hunk'>@@ -1821,13 +1798,9 @@ static void tulip_set_wolopts (struct pci_dev *pdev, u32 wolopts)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused tulip_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	pci_power_t pstate;</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='hunk'>@@ -1843,45 +1816,27 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	free_irq(tp-&gt;pdev-&gt;irq, dev);</div><div class='ctx'> </div><div class='ctx'> save_state:</div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pstate = pci_choose_state(pdev, state);</div><div class='del'>-	if (state.event == PM_EVENT_SUSPEND &amp;&amp; pstate != PCI_D0) {</div><div class='del'>-		int rc;</div><div class='del'>-</div><div class='del'>-		tulip_set_wolopts(pdev, tp-&gt;wolinfo.wolopts);</div><div class='del'>-		rc = pci_enable_wake(pdev, pstate, tp-&gt;wolinfo.wolopts);</div><div class='del'>-		if (rc)</div><div class='del'>-			pr_err("pci_enable_wake failed (%d)\n", rc);</div><div class='del'>-	}</div><div class='del'>-	pci_set_power_state(pdev, pstate);</div><div class='add'>+	tulip_set_wolopts(to_pci_dev(dev_d), tp-&gt;wolinfo.wolopts);</div><div class='add'>+	device_set_wakeup_enable(dev_d, !!tp-&gt;wolinfo.wolopts);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-static int tulip_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused tulip_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='add'>+	struct pci_dev *pdev = to_pci_dev(dev_d);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct tulip_private *tp = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = tp-&gt;base_addr;</div><div class='del'>-	int retval;</div><div class='ctx'> 	unsigned int tmp;</div><div class='add'>+	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	if ((retval = pci_enable_device(pdev))) {</div><div class='del'>-		pr_err("pci_enable_device failed in resume\n");</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	retval = request_irq(pdev-&gt;irq, tulip_interrupt, IRQF_SHARED,</div><div class='ctx'> 			     dev-&gt;name, dev);</div><div class='ctx'> 	if (retval) {</div><div class='hunk'>@@ -1890,8 +1845,7 @@ static int tulip_resume(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (tp-&gt;flags &amp; COMET_PM) {</div><div class='del'>-		pci_enable_wake(pdev, PCI_D3hot, 0);</div><div class='del'>-		pci_enable_wake(pdev, PCI_D3cold, 0);</div><div class='add'>+		device_set_wakeup_enable(dev_d, 0);</div><div class='ctx'> </div><div class='ctx'> 		/* Clear the PMES flag */</div><div class='ctx'> 		tmp = ioread32(ioaddr + CSR20);</div><div class='hunk'>@@ -1909,30 +1863,14 @@ static int tulip_resume(struct pci_dev *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PM */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> static void tulip_remove_one(struct pci_dev *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='del'>-	struct tulip_private *tp;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	tp = netdev_priv(dev);</div><div class='ctx'> 	unregister_netdev(dev);</div><div class='del'>-	pci_free_consistent (pdev,</div><div class='del'>-			     sizeof (struct tulip_rx_desc) * RX_RING_SIZE +</div><div class='del'>-			     sizeof (struct tulip_tx_desc) * TX_RING_SIZE,</div><div class='del'>-			     tp-&gt;rx_ring, tp-&gt;rx_ring_dma);</div><div class='del'>-	kfree (tp-&gt;mtable);</div><div class='del'>-	pci_iounmap(pdev, tp-&gt;base_addr);</div><div class='del'>-	free_netdev (dev);</div><div class='del'>-	pci_release_regions (pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-</div><div class='del'>-	/* pci_power_off (pdev, -1); */</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_NET_POLL_CONTROLLER</div><div class='hunk'>@@ -1955,24 +1893,19 @@ static void poll_tulip (struct net_device *dev)</div><div class='ctx'> }</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(tulip_pm_ops, tulip_suspend, tulip_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver tulip_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.id_table	= tulip_pci_tbl,</div><div class='ctx'> 	.probe		= tulip_init_one,</div><div class='ctx'> 	.remove		= tulip_remove_one,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= tulip_suspend,</div><div class='del'>-	.resume		= tulip_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+	.driver.pm	= &amp;tulip_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> static int __init tulip_init (void)</div><div class='ctx'> {</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	pr_info("%s", version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	if (!csr0) {</div><div class='ctx'> 		pr_warn("tulip: unknown CPU architecture, using default csr0\n");</div><div class='ctx'> 		/* default to 8 longword cache line alignment */</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c<br/>index b1f30b194300..6e4d8d31aba9 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/uli526x.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/uli526x.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/uli526x.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/uli526x.c</a></div><div class='hunk'>@@ -7,8 +7,6 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"uli526x"</div><div class='del'>-#define DRV_VERSION	"0.9.3"</div><div class='del'>-#define DRV_RELDATE	"2005-7-29"</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -196,10 +194,6 @@ enum uli526x_CR6_bits {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Global variable declaration ----------------------------- */</div><div class='del'>-static int printed_version;</div><div class='del'>-static const char version[] =</div><div class='del'>-	"ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")";</div><div class='del'>-</div><div class='ctx'> static int uli526x_debug;</div><div class='ctx'> static unsigned char uli526x_media_mode = ULI526X_AUTO;</div><div class='ctx'> static u32 uli526x_cr6_user_set;</div><div class='hunk'>@@ -278,20 +272,18 @@ static int uli526x_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	struct uli526x_board_info *db;	/* board information structure */</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	ULI526X_DBUG(0, "uli526x_init_one()", 0);</div><div class='ctx'> </div><div class='del'>-	if (!printed_version++)</div><div class='del'>-		pr_info("%s\n", version);</div><div class='del'>-</div><div class='ctx'> 	/* Init network device */</div><div class='ctx'> 	dev = alloc_etherdev(sizeof(*db));</div><div class='ctx'> 	if (dev == NULL)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='ctx'> 		pr_warn("32-bit PCI DMA not available\n");</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto err_out_free;</div><div class='hunk'>@@ -326,11 +318,15 @@ static int uli526x_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	/* Allocate Tx/Rx descriptor memory */</div><div class='ctx'> 	err = -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	db-&gt;desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, &amp;db-&gt;desc_pool_dma_ptr);</div><div class='add'>+	db-&gt;desc_pool_ptr = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					       sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='add'>+					       &amp;db-&gt;desc_pool_dma_ptr, GFP_KERNEL);</div><div class='ctx'> 	if (!db-&gt;desc_pool_ptr)</div><div class='ctx'> 		goto err_out_release;</div><div class='ctx'> </div><div class='del'>-	db-&gt;buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, &amp;db-&gt;buf_pool_dma_ptr);</div><div class='add'>+	db-&gt;buf_pool_ptr = dma_alloc_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+					      TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='add'>+					      &amp;db-&gt;buf_pool_dma_ptr, GFP_KERNEL);</div><div class='ctx'> 	if (!db-&gt;buf_pool_ptr)</div><div class='ctx'> 		goto err_out_free_tx_desc;</div><div class='ctx'> </div><div class='hunk'>@@ -384,7 +380,7 @@ static int uli526x_init_one(struct pci_dev *pdev,</div><div class='ctx'> 		uw32(DCR13, 0x1b0);	//Select ID Table access port</div><div class='ctx'> 		//Read MAC address from CR14</div><div class='ctx'> 		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			dev-&gt;dev_addr[i] = ur32(DCR14);</div><div class='add'>+			addr[i] = ur32(DCR14);</div><div class='ctx'> 		//Read end</div><div class='ctx'> 		uw32(DCR13, 0);		//Clear CR13</div><div class='ctx'> 		uw32(DCR0, 0);		//Clear CR0</div><div class='hunk'>@@ -393,8 +389,10 @@ static int uli526x_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	else		/*Exist SROM*/</div><div class='ctx'> 	{</div><div class='ctx'> 		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			dev-&gt;dev_addr[i] = db-&gt;srom[20 + i];</div><div class='add'>+			addr[i] = db-&gt;srom[20 + i];</div><div class='ctx'> 	}</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='add'>+</div><div class='ctx'> 	err = register_netdev (dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_out_unmap;</div><div class='hunk'>@@ -410,11 +408,12 @@ static int uli526x_init_one(struct pci_dev *pdev,</div><div class='ctx'> err_out_unmap:</div><div class='ctx'> 	pci_iounmap(pdev, db-&gt;ioaddr);</div><div class='ctx'> err_out_free_tx_buf:</div><div class='del'>-	pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='del'>-			    db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='add'>+			  db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='ctx'> err_out_free_tx_desc:</div><div class='del'>-	pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='del'>-			    db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev,</div><div class='add'>+			  sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='add'>+			  db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='ctx'> err_out_release:</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> err_out_disable:</div><div class='hunk'>@@ -433,11 +432,11 @@ static void uli526x_remove_one(struct pci_dev *pdev)</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(dev);</div><div class='ctx'> 	pci_iounmap(pdev, db-&gt;ioaddr);</div><div class='del'>-	pci_free_consistent(db-&gt;pdev, sizeof(struct tx_desc) *</div><div class='del'>-				DESC_ALL_CNT + 0x20, db-&gt;desc_pool_ptr,</div><div class='del'>- 				db-&gt;desc_pool_dma_ptr);</div><div class='del'>-	pci_free_consistent(db-&gt;pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='del'>-				db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='add'>+	dma_free_coherent(&amp;db-&gt;pdev-&gt;dev,</div><div class='add'>+			  sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,</div><div class='add'>+			  db-&gt;desc_pool_ptr, db-&gt;desc_pool_dma_ptr);</div><div class='add'>+	dma_free_coherent(&amp;db-&gt;pdev-&gt;dev, TX_BUF_ALLOC * TX_DESC_CNT + 4,</div><div class='add'>+			  db-&gt;buf_pool_ptr, db-&gt;buf_pool_dma_ptr);</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> 	free_netdev(dev);</div><div class='hunk'>@@ -657,7 +656,7 @@ static int uli526x_stop(struct net_device *dev)</div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* deleted timer */</div><div class='del'>-	del_timer_sync(&amp;db-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;db-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset &amp; stop ULI526X board */</div><div class='ctx'> 	uw32(DCR0, ULI526X_RESET);</div><div class='hunk'>@@ -784,7 +783,7 @@ static void uli526x_free_tx_pkt(struct net_device *dev,</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-    		txptr = txptr-&gt;next_tx_desc;</div><div class='add'>+		txptr = txptr-&gt;next_tx_desc;</div><div class='ctx'> 	}/* End of while */</div><div class='ctx'> </div><div class='ctx'> 	/* Update TX remove pointer to next */</div><div class='hunk'>@@ -819,7 +818,8 @@ static void uli526x_rx_packet(struct net_device *dev, struct uli526x_board_info</div><div class='ctx'> 		db-&gt;rx_avail_cnt--;</div><div class='ctx'> 		db-&gt;interval_rx_cnt++;</div><div class='ctx'> </div><div class='del'>-		pci_unmap_single(db-&gt;pdev, le32_to_cpu(rxptr-&gt;rdes2), RX_ALLOC_SIZE, PCI_DMA_FROMDEVICE);</div><div class='add'>+		dma_unmap_single(&amp;db-&gt;pdev-&gt;dev, le32_to_cpu(rxptr-&gt;rdes2),</div><div class='add'>+				 RX_ALLOC_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> 		if ( (rdes0 &amp; 0x300) != 0x300) {</div><div class='ctx'> 			/* A packet without First/Last flag */</div><div class='ctx'> 			/* reuse this SKB */</div><div class='hunk'>@@ -971,9 +971,8 @@ static void netdev_get_drvinfo(struct net_device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct uli526x_board_info *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1015,11 +1014,11 @@ static const struct ethtool_ops netdev_ethtool_ops = {</div><div class='ctx'> </div><div class='ctx'> static void uli526x_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct uli526x_board_info *db = from_timer(db, t, timer);</div><div class='add'>+	struct uli526x_board_info *db = timer_container_of(db, t, timer);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(db-&gt;pdev);</div><div class='ctx'> 	struct uli_phy_ops *phy = &amp;db-&gt;phy;</div><div class='ctx'> 	void __iomem *ioaddr = db-&gt;ioaddr;</div><div class='del'>- 	unsigned long flags;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> 	u8 tmp_cr12 = 0;</div><div class='ctx'> 	u32 tmp_cr8;</div><div class='ctx'> </div><div class='hunk'>@@ -1173,65 +1172,41 @@ static void uli526x_dynamic_reset(struct net_device *dev)</div><div class='ctx'> 	netif_wake_queue(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	Suspend the interface.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int uli526x_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused uli526x_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	pci_power_t power_state;</div><div class='del'>-	int err;</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	ULI526X_DBUG(0, "uli526x_suspend", 0);</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-</div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> 	uli526x_reset_prepare(dev);</div><div class='ctx'> </div><div class='del'>-	power_state = pci_choose_state(pdev, state);</div><div class='del'>-	pci_enable_wake(pdev, power_state, 0);</div><div class='del'>-	err = pci_set_power_state(pdev, power_state);</div><div class='del'>-	if (err) {</div><div class='del'>-		netif_device_attach(dev);</div><div class='del'>-		/* Re-initialize ULI526X board */</div><div class='del'>-		uli526x_init(dev);</div><div class='del'>-		/* Restart upper layer interface */</div><div class='del'>-		netif_wake_queue(dev);</div><div class='del'>-	}</div><div class='add'>+	device_set_wakeup_enable(dev_d, 0);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Resume the interface.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-static int uli526x_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused uli526x_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pdev);</div><div class='del'>-	int err;</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	ULI526X_DBUG(0, "uli526x_resume", 0);</div><div class='ctx'> </div><div class='del'>-	pci_restore_state(pdev);</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	err = pci_set_power_state(pdev, PCI_D0);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_warn(dev, "Could not put device into D0\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	netif_device_attach(dev);</div><div class='ctx'> 	/* Re-initialize ULI526X board */</div><div class='ctx'> 	uli526x_init(dev);</div><div class='hunk'>@@ -1241,14 +1216,6 @@ static int uli526x_resume(struct pci_dev *pdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#else /* !CONFIG_PM */</div><div class='del'>-</div><div class='del'>-#define uli526x_suspend	NULL</div><div class='del'>-#define uli526x_resume	NULL</div><div class='del'>-</div><div class='del'>-#endif /* !CONFIG_PM */</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  *	free all allocated rx buffer</div><div class='ctx'>  */</div><div class='hunk'>@@ -1276,10 +1243,8 @@ static void uli526x_reuse_skb(struct uli526x_board_info *db, struct sk_buff * sk</div><div class='ctx'> </div><div class='ctx'> 	if (!(rxptr-&gt;rdes0 &amp; cpu_to_le32(0x80000000))) {</div><div class='ctx'> 		rxptr-&gt;rx_skb_ptr = skb;</div><div class='del'>-		rxptr-&gt;rdes2 = cpu_to_le32(pci_map_single(db-&gt;pdev,</div><div class='del'>-							  skb_tail_pointer(skb),</div><div class='del'>-							  RX_ALLOC_SIZE,</div><div class='del'>-							  PCI_DMA_FROMDEVICE));</div><div class='add'>+		rxptr-&gt;rdes2 = cpu_to_le32(dma_map_single(&amp;db-&gt;pdev-&gt;dev, skb_tail_pointer(skb),</div><div class='add'>+							  RX_ALLOC_SIZE, DMA_FROM_DEVICE));</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		rxptr-&gt;rdes0 = cpu_to_le32(0x80000000);</div><div class='ctx'> 		db-&gt;rx_avail_cnt++;</div><div class='hunk'>@@ -1381,7 +1346,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)</div><div class='ctx'> 	void __iomem *ioaddr = db-&gt;ioaddr;</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	struct tx_desc *txptr;</div><div class='del'>-	u16 * addrptr;</div><div class='add'>+	const u16 * addrptr;</div><div class='ctx'> 	u32 * suptr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -1391,7 +1356,7 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt)</div><div class='ctx'> 	suptr = (u32 *) txptr-&gt;tx_buf_ptr;</div><div class='ctx'> </div><div class='ctx'> 	/* Node address */</div><div class='del'>-	addrptr = (u16 *) dev-&gt;dev_addr;</div><div class='add'>+	addrptr = (const u16 *) dev-&gt;dev_addr;</div><div class='ctx'> 	*suptr++ = addrptr[0] &lt;&lt; FLT_SHIFT;</div><div class='ctx'> 	*suptr++ = addrptr[1] &lt;&lt; FLT_SHIFT;</div><div class='ctx'> 	*suptr++ = addrptr[2] &lt;&lt; FLT_SHIFT;</div><div class='hunk'>@@ -1451,10 +1416,8 @@ static void allocate_rx_buffer(struct net_device *dev)</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 		rxptr-&gt;rx_skb_ptr = skb; /* FIXME (?) */</div><div class='del'>-		rxptr-&gt;rdes2 = cpu_to_le32(pci_map_single(db-&gt;pdev,</div><div class='del'>-							  skb_tail_pointer(skb),</div><div class='del'>-							  RX_ALLOC_SIZE,</div><div class='del'>-							  PCI_DMA_FROMDEVICE));</div><div class='add'>+		rxptr-&gt;rdes2 = cpu_to_le32(dma_map_single(&amp;db-&gt;pdev-&gt;dev, skb_tail_pointer(skb),</div><div class='add'>+							  RX_ALLOC_SIZE, DMA_FROM_DEVICE));</div><div class='ctx'> 		wmb();</div><div class='ctx'> 		rxptr-&gt;rdes0 = cpu_to_le32(0x80000000);</div><div class='ctx'> 		rxptr = rxptr-&gt;next_rx_desc;</div><div class='hunk'>@@ -1575,14 +1538,14 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)</div><div class='ctx'> </div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-  	/* Write new capability to Phyxcer Reg4 */</div><div class='add'>+	/* Write new capability to Phyxcer Reg4 */</div><div class='ctx'> 	if ( !(phy_reg &amp; 0x01e0)) {</div><div class='ctx'> 		phy_reg|=db-&gt;PHY_reg4;</div><div class='ctx'> 		db-&gt;media_mode|=ULI526X_AUTO;</div><div class='ctx'> 	}</div><div class='ctx'> 	phy-&gt;write(db, db-&gt;phy_addr, 4, phy_reg);</div><div class='ctx'> </div><div class='del'>- 	/* Restart Auto-Negotiation */</div><div class='add'>+	/* Restart Auto-Negotiation */</div><div class='ctx'> 	phy-&gt;write(db, db-&gt;phy_addr, 0, 0x1200);</div><div class='ctx'> 	udelay(50);</div><div class='ctx'> }</div><div class='hunk'>@@ -1590,7 +1553,7 @@ static void uli526x_set_phyxcer(struct uli526x_board_info *db)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  *	Process op-mode</div><div class='del'>- 	AUTO mode : PHY controller in Auto-negotiation Mode</div><div class='add'>+	AUTO mode : PHY controller in Auto-negotiation Mode</div><div class='ctx'>  *	Force mode: PHY controller in force mode with HUB</div><div class='ctx'>  *			N-way force capability with SWITCH</div><div class='ctx'>  */</div><div class='hunk'>@@ -1771,14 +1734,14 @@ static const struct pci_device_id uli526x_pci_tbl[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, uli526x_pci_tbl);</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(uli526x_pm_ops, uli526x_suspend, uli526x_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver uli526x_driver = {</div><div class='ctx'> 	.name		= "uli526x",</div><div class='ctx'> 	.id_table	= uli526x_pci_tbl,</div><div class='ctx'> 	.probe		= uli526x_init_one,</div><div class='ctx'> 	.remove		= uli526x_remove_one,</div><div class='del'>-	.suspend	= uli526x_suspend,</div><div class='del'>-	.resume		= uli526x_resume,</div><div class='add'>+	.driver.pm	= &amp;uli526x_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Peer Chen, peer.chen@uli.com.tw");</div><div class='hunk'>@@ -1799,9 +1762,6 @@ MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8</div><div class='ctx'> static int __init uli526x_init_module(void)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='del'>-	pr_info("%s\n", version);</div><div class='del'>-	printed_version = 1;</div><div class='del'>-</div><div class='ctx'> 	ULI526X_DBUG(0, "init_module() ", debug);</div><div class='ctx'> </div><div class='ctx'> 	if (debug)</div><div class='hunk'>@@ -1809,8 +1769,8 @@ static int __init uli526x_init_module(void)</div><div class='ctx'> 	if (cr6set)</div><div class='ctx'> 		uli526x_cr6_user_set = cr6set;</div><div class='ctx'> </div><div class='del'>- 	switch (mode) {</div><div class='del'>-   	case ULI526X_10MHF:</div><div class='add'>+	switch (mode) {</div><div class='add'>+	case ULI526X_10MHF:</div><div class='ctx'> 	case ULI526X_100MHF:</div><div class='ctx'> 	case ULI526X_10MFD:</div><div class='ctx'> 	case ULI526X_100MFD:</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c<br/>index 70cb2d689c2c..a24a25a5f73d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/winbond-840.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/winbond-840.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/winbond-840.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/winbond-840.c</a></div><div class='hunk'>@@ -36,7 +36,7 @@</div><div class='ctx'> 		power management.</div><div class='ctx'> 		support for big endian descriptors</div><div class='ctx'> 			Copyright (C) 2001 Manfred Spraul</div><div class='del'>-  	* ethtool support (jgarzik)</div><div class='add'>+	* ethtool support (jgarzik)</div><div class='ctx'> 	* Replace some MII-related magic numbers with constants (jgarzik)</div><div class='ctx'> </div><div class='ctx'> 	TODO:</div><div class='hunk'>@@ -47,9 +47,6 @@</div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"winbond-840"</div><div class='del'>-#define DRV_VERSION	"1.01-e"</div><div class='del'>-#define DRV_RELDATE	"Sep-11-2006"</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* Automatically extracted configuration info:</div><div class='ctx'> probe-func: winbond840_probe</div><div class='hunk'>@@ -139,16 +136,9 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};</div><div class='ctx'> #undef PKT_BUF_SZ			/* tulip.h also defines this */</div><div class='ctx'> #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer.*/</div><div class='ctx'> </div><div class='del'>-/* These identify the driver base version and may not be removed. */</div><div class='del'>-static const char version[] __initconst =</div><div class='del'>-	"v" DRV_VERSION " (2.4 port) "</div><div class='del'>-	DRV_RELDATE "  Donald Becker &lt;becker@scyld.com&gt;\n"</div><div class='del'>-	"  http://www.scyld.com/network/drivers.html\n";</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Donald Becker &lt;becker@scyld.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='del'>-MODULE_VERSION(DRV_VERSION);</div><div class='ctx'> </div><div class='ctx'> module_param(max_interrupt_work, int, 0);</div><div class='ctx'> module_param(debug, int, 0);</div><div class='hunk'>@@ -331,7 +321,7 @@ static void netdev_timer(struct timer_list *t);</div><div class='ctx'> static void init_rxtx_rings(struct net_device *dev);</div><div class='ctx'> static void free_rxtx_rings(struct netdev_private *np);</div><div class='ctx'> static void init_registers(struct net_device *dev);</div><div class='del'>-static void tx_timeout(struct net_device *dev);</div><div class='add'>+static void tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static int alloc_ringdesc(struct net_device *dev);</div><div class='ctx'> static void free_ringdesc(struct netdev_private *np);</div><div class='ctx'> static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev);</div><div class='hunk'>@@ -351,7 +341,7 @@ static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= start_tx,</div><div class='ctx'> 	.ndo_get_stats		= get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= netdev_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= netdev_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= tx_timeout,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='hunk'>@@ -365,16 +355,17 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int chip_idx = ent-&gt;driver_data;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	int i, option = find_cnt &lt; MAX_UNITS ? options[find_cnt] : 0;</div><div class='add'>+	__le16 addr[ETH_ALEN / 2];</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='ctx'> </div><div class='del'>-	i = pci_enable_device(pdev);</div><div class='add'>+	i = pcim_enable_device(pdev);</div><div class='ctx'> 	if (i) return i;</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(pdev);</div><div class='ctx'> </div><div class='ctx'> 	irq = pdev-&gt;irq;</div><div class='ctx'> </div><div class='del'>-	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {</div><div class='add'>+	if (dma_set_mask(&amp;pdev-&gt;dev, DMA_BIT_MASK(32))) {</div><div class='ctx'> 		pr_warn("Device %s disabled due to DMA limitations\n",</div><div class='ctx'> 			pci_name(pdev));</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -384,15 +375,16 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	SET_NETDEV_DEV(dev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	if (pci_request_regions(pdev, DRV_NAME))</div><div class='add'>+	if (pcim_request_all_regions(pdev, DRV_NAME))</div><div class='ctx'> 		goto err_out_netdev;</div><div class='ctx'> </div><div class='ctx'> 	ioaddr = pci_iomap(pdev, TULIP_BAR, netdev_res_size);</div><div class='ctx'> 	if (!ioaddr)</div><div class='del'>-		goto err_out_free_res;</div><div class='add'>+		goto err_out_netdev;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		((__le16 *)dev-&gt;dev_addr)[i] = cpu_to_le16(eeprom_read(ioaddr, i));</div><div class='add'>+		addr[i] = cpu_to_le16(eeprom_read(ioaddr, i));</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the chip to erase previous misconfiguration.</div><div class='ctx'> 	   No hold time required! */</div><div class='hunk'>@@ -468,8 +460,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> err_out_cleardev:</div><div class='ctx'> 	pci_iounmap(pdev, ioaddr);</div><div class='del'>-err_out_free_res:</div><div class='del'>-	pci_release_regions(pdev);</div><div class='ctx'> err_out_netdev:</div><div class='ctx'> 	free_netdev (dev);</div><div class='ctx'> 	return -ENODEV;</div><div class='hunk'>@@ -484,8 +474,6 @@ err_out_netdev:</div><div class='ctx'>    No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need</div><div class='ctx'>    a delay.  Note that pre-2.0.34 kernels had a cache-alignment bug that</div><div class='ctx'>    made udelay() unreliable.</div><div class='del'>-   The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is</div><div class='del'>-   deprecated.</div><div class='ctx'> */</div><div class='ctx'> #define eeprom_delay(ee_addr)	ioread32(ee_addr)</div><div class='ctx'> </div><div class='hunk'>@@ -640,9 +628,10 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	if (debug &gt; 1)</div><div class='del'>-		netdev_dbg(dev, "w89c840_open() irq %d\n", irq);</div><div class='add'>+		netdev_dbg(dev, "%s() irq %d\n", __func__, irq);</div><div class='ctx'> </div><div class='del'>-	if((i=alloc_ringdesc(dev)))</div><div class='add'>+	i = alloc_ringdesc(dev);</div><div class='add'>+	if (i)</div><div class='ctx'> 		goto out_err;</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_irq(&amp;np-&gt;lock);</div><div class='hunk'>@@ -652,7 +641,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(dev);</div><div class='ctx'> 	if (debug &gt; 2)</div><div class='del'>-		netdev_dbg(dev, "Done netdev_open()\n");</div><div class='add'>+		netdev_dbg(dev, "Done %s()\n", __func__);</div><div class='ctx'> </div><div class='ctx'> 	/* Set the timer to check for link beat. */</div><div class='ctx'> 	timer_setup(&amp;np-&gt;timer, netdev_timer, 0);</div><div class='hunk'>@@ -774,7 +763,7 @@ static inline void update_csr6(struct net_device *dev, int new)</div><div class='ctx'> </div><div class='ctx'> static void netdev_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_private *np = from_timer(np, t, timer);</div><div class='add'>+	struct netdev_private *np = timer_container_of(np, t, timer);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(np-&gt;pci_dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -812,8 +801,9 @@ static void init_rxtx_rings(struct net_device *dev)</div><div class='ctx'> 		np-&gt;rx_skbuff[i] = skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='del'>-		np-&gt;rx_addr[i] = pci_map_single(np-&gt;pci_dev,skb-&gt;data,</div><div class='del'>-					np-&gt;rx_buf_sz,PCI_DMA_FROMDEVICE);</div><div class='add'>+		np-&gt;rx_addr[i] = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+						np-&gt;rx_buf_sz,</div><div class='add'>+						DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;rx_ring[i].buffer1 = np-&gt;rx_addr[i];</div><div class='ctx'> 		np-&gt;rx_ring[i].status = DescOwned;</div><div class='hunk'>@@ -843,20 +833,17 @@ static void free_rxtx_rings(struct netdev_private* np)</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='ctx'> 		np-&gt;rx_ring[i].status = 0;</div><div class='ctx'> 		if (np-&gt;rx_skbuff[i]) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev,</div><div class='del'>-						np-&gt;rx_addr[i],</div><div class='del'>-						np-&gt;rx_skbuff[i]-&gt;len,</div><div class='del'>-						PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;rx_addr[i],</div><div class='add'>+					 np-&gt;rx_skbuff[i]-&gt;len,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(np-&gt;rx_skbuff[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 		np-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; TX_RING_SIZE; i++) {</div><div class='ctx'> 		if (np-&gt;tx_skbuff[i]) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev,</div><div class='del'>-						np-&gt;tx_addr[i],</div><div class='del'>-						np-&gt;tx_skbuff[i]-&gt;len,</div><div class='del'>-						PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;tx_addr[i],</div><div class='add'>+					 np-&gt;tx_skbuff[i]-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(np-&gt;tx_skbuff[i]);</div><div class='ctx'> 		}</div><div class='ctx'> 		np-&gt;tx_skbuff[i] = NULL;</div><div class='hunk'>@@ -890,7 +877,7 @@ static void init_registers(struct net_device *dev)</div><div class='ctx'> 		8000	16 longwords		0200 2 longwords	2000 32 longwords</div><div class='ctx'> 		C000	32  longwords		0400 4 longwords */</div><div class='ctx'> </div><div class='del'>-#if defined (__i386__) &amp;&amp; !defined(MODULE)</div><div class='add'>+#if defined (__i386__) &amp;&amp; !defined(MODULE) &amp;&amp; !defined(CONFIG_UML)</div><div class='ctx'> 	/* When not a module we can work around broken '486 PCI boards. */</div><div class='ctx'> 	if (boot_cpu_data.x86 &lt;= 4) {</div><div class='ctx'> 		i |= 0x4800;</div><div class='hunk'>@@ -921,7 +908,7 @@ static void init_registers(struct net_device *dev)</div><div class='ctx'> 	iowrite32(0, ioaddr + RxStartDemand);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tx_timeout(struct net_device *dev)</div><div class='add'>+static void tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base_addr;</div><div class='hunk'>@@ -974,10 +961,10 @@ static int alloc_ringdesc(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	np-&gt;rx_buf_sz = (dev-&gt;mtu &lt;= 1500 ? PKT_BUF_SZ : dev-&gt;mtu + 32);</div><div class='ctx'> </div><div class='del'>-	np-&gt;rx_ring = pci_alloc_consistent(np-&gt;pci_dev,</div><div class='del'>-			sizeof(struct w840_rx_desc)*RX_RING_SIZE +</div><div class='del'>-			sizeof(struct w840_tx_desc)*TX_RING_SIZE,</div><div class='del'>-			&amp;np-&gt;ring_dma_addr);</div><div class='add'>+	np-&gt;rx_ring = dma_alloc_coherent(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 sizeof(struct w840_rx_desc) * RX_RING_SIZE +</div><div class='add'>+					 sizeof(struct w840_tx_desc) * TX_RING_SIZE,</div><div class='add'>+					 &amp;np-&gt;ring_dma_addr, GFP_KERNEL);</div><div class='ctx'> 	if(!np-&gt;rx_ring)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	init_rxtx_rings(dev);</div><div class='hunk'>@@ -986,10 +973,10 @@ static int alloc_ringdesc(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void free_ringdesc(struct netdev_private *np)</div><div class='ctx'> {</div><div class='del'>-	pci_free_consistent(np-&gt;pci_dev,</div><div class='del'>-			sizeof(struct w840_rx_desc)*RX_RING_SIZE +</div><div class='del'>-			sizeof(struct w840_tx_desc)*TX_RING_SIZE,</div><div class='del'>-			np-&gt;rx_ring, np-&gt;ring_dma_addr);</div><div class='add'>+	dma_free_coherent(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+			  sizeof(struct w840_rx_desc) * RX_RING_SIZE +</div><div class='add'>+			  sizeof(struct w840_tx_desc) * TX_RING_SIZE,</div><div class='add'>+			  np-&gt;rx_ring, np-&gt;ring_dma_addr);</div><div class='ctx'> </div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1004,8 +991,8 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	/* Calculate the next Tx descriptor entry. */</div><div class='ctx'> 	entry = np-&gt;cur_tx % TX_RING_SIZE;</div><div class='ctx'> </div><div class='del'>-	np-&gt;tx_addr[entry] = pci_map_single(np-&gt;pci_dev,</div><div class='del'>-				skb-&gt;data,skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	np-&gt;tx_addr[entry] = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+					    skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 	np-&gt;tx_skbuff[entry] = skb;</div><div class='ctx'> </div><div class='ctx'> 	np-&gt;tx_ring[entry].buffer1 = np-&gt;tx_addr[entry];</div><div class='hunk'>@@ -1088,9 +1075,8 @@ static void netdev_tx_done(struct net_device *dev)</div><div class='ctx'> 			np-&gt;stats.tx_packets++;</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Free the original skb. */</div><div class='del'>-		pci_unmap_single(np-&gt;pci_dev,np-&gt;tx_addr[entry],</div><div class='del'>-					np-&gt;tx_skbuff[entry]-&gt;len,</div><div class='del'>-					PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev, np-&gt;tx_addr[entry],</div><div class='add'>+				 np-&gt;tx_skbuff[entry]-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 		np-&gt;tx_q_bytes -= np-&gt;tx_skbuff[entry]-&gt;len;</div><div class='ctx'> 		dev_kfree_skb_irq(np-&gt;tx_skbuff[entry]);</div><div class='ctx'> 		np-&gt;tx_skbuff[entry] = NULL;</div><div class='hunk'>@@ -1227,18 +1213,21 @@ static int netdev_rx(struct net_device *dev)</div><div class='ctx'> 			if (pkt_len &lt; rx_copybreak &amp;&amp;</div><div class='ctx'> 			    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {</div><div class='ctx'> 				skb_reserve(skb, 2);	/* 16 byte align the IP header */</div><div class='del'>-				pci_dma_sync_single_for_cpu(np-&gt;pci_dev,np-&gt;rx_addr[entry],</div><div class='del'>-							    np-&gt;rx_skbuff[entry]-&gt;len,</div><div class='del'>-							    PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_cpu(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							np-&gt;rx_addr[entry],</div><div class='add'>+							np-&gt;rx_skbuff[entry]-&gt;len,</div><div class='add'>+							DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_copy_to_linear_data(skb, np-&gt;rx_skbuff[entry]-&gt;data, pkt_len);</div><div class='ctx'> 				skb_put(skb, pkt_len);</div><div class='del'>-				pci_dma_sync_single_for_device(np-&gt;pci_dev,np-&gt;rx_addr[entry],</div><div class='del'>-							       np-&gt;rx_skbuff[entry]-&gt;len,</div><div class='del'>-							       PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_device(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							   np-&gt;rx_addr[entry],</div><div class='add'>+							   np-&gt;rx_skbuff[entry]-&gt;len,</div><div class='add'>+							   DMA_FROM_DEVICE);</div><div class='ctx'> 			} else {</div><div class='del'>-				pci_unmap_single(np-&gt;pci_dev,np-&gt;rx_addr[entry],</div><div class='del'>-							np-&gt;rx_skbuff[entry]-&gt;len,</div><div class='del'>-							PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+						 np-&gt;rx_addr[entry],</div><div class='add'>+						 np-&gt;rx_skbuff[entry]-&gt;len,</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_put(skb = np-&gt;rx_skbuff[entry], pkt_len);</div><div class='ctx'> 				np-&gt;rx_skbuff[entry] = NULL;</div><div class='ctx'> 			}</div><div class='hunk'>@@ -1268,9 +1257,10 @@ static int netdev_rx(struct net_device *dev)</div><div class='ctx'> 			np-&gt;rx_skbuff[entry] = skb;</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;			/* Better luck next round. */</div><div class='del'>-			np-&gt;rx_addr[entry] = pci_map_single(np-&gt;pci_dev,</div><div class='del'>-							skb-&gt;data,</div><div class='del'>-							np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+			np-&gt;rx_addr[entry] = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							    skb-&gt;data,</div><div class='add'>+							    np-&gt;rx_buf_sz,</div><div class='add'>+							    DMA_FROM_DEVICE);</div><div class='ctx'> 			np-&gt;rx_ring[entry].buffer1 = np-&gt;rx_addr[entry];</div><div class='ctx'> 		}</div><div class='ctx'> 		wmb();</div><div class='hunk'>@@ -1384,9 +1374,8 @@ static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1454,7 +1443,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 	switch(cmd) {</div><div class='ctx'> 	case SIOCGMIIPHY:		/* Get address of MII PHY in use. */</div><div class='ctx'> 		data-&gt;phy_id = ((struct netdev_private *)netdev_priv(dev))-&gt;phys[0] &amp; 0x1f;</div><div class='del'>-		/* Fall Through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> </div><div class='ctx'> 	case SIOCGMIIREG:		/* Read MII PHY register. */</div><div class='ctx'> 		spin_lock_irq(&amp;np-&gt;lock);</div><div class='hunk'>@@ -1488,7 +1477,7 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 			   np-&gt;cur_rx, np-&gt;dirty_rx);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>- 	/* Stop the chip's Tx and Rx processes. */</div><div class='add'>+	/* Stop the chip's Tx and Rx processes. */</div><div class='ctx'> 	spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> 	update_csr6(dev, 0);</div><div class='hunk'>@@ -1520,7 +1509,7 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* __i386__ debugging only */</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;np-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;np-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	free_rxtx_rings(np);</div><div class='ctx'> 	free_ringdesc(np);</div><div class='hunk'>@@ -1535,14 +1524,11 @@ static void w840_remove1(struct pci_dev *pdev)</div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='del'>-		pci_release_regions(pdev);</div><div class='ctx'> 		pci_iounmap(pdev, np-&gt;base_addr);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='ctx'> /*</div><div class='ctx'>  * suspend/resume synchronization:</div><div class='ctx'>  * - open, close, do_ioctl:</div><div class='hunk'>@@ -1566,15 +1552,15 @@ static void w840_remove1(struct pci_dev *pdev)</div><div class='ctx'>  * Detach must occur under spin_unlock_irq(), interrupts from a detached</div><div class='ctx'>  * device would cause an irq storm.</div><div class='ctx'>  */</div><div class='del'>-static int w840_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused w840_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base_addr;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	if (netif_running (dev)) {</div><div class='del'>-		del_timer_sync(&amp;np-&gt;timer);</div><div class='add'>+		timer_delete_sync(&amp;np-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 		spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 		netif_device_detach(dev);</div><div class='hunk'>@@ -1601,21 +1587,15 @@ static int w840_suspend (struct pci_dev *pdev, pm_message_t state)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int w840_resume (struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused w840_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata (pdev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='del'>-	int retval = 0;</div><div class='ctx'> </div><div class='ctx'> 	rtnl_lock();</div><div class='ctx'> 	if (netif_device_present(dev))</div><div class='ctx'> 		goto out; /* device not suspended */</div><div class='ctx'> 	if (netif_running(dev)) {</div><div class='del'>-		if ((retval = pci_enable_device(pdev))) {</div><div class='del'>-			dev_err(&amp;dev-&gt;dev,</div><div class='del'>-				"pci_enable_device failed in resume\n");</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='ctx'> 		spin_lock_irq(&amp;np-&gt;lock);</div><div class='ctx'> 		iowrite32(1, np-&gt;base_addr+PCIBusCfg);</div><div class='ctx'> 		ioread32(np-&gt;base_addr+PCIBusCfg);</div><div class='hunk'>@@ -1633,31 +1613,17 @@ static int w840_resume (struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> out:</div><div class='ctx'> 	rtnl_unlock();</div><div class='del'>-	return retval;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='del'>-#endif</div><div class='add'>+</div><div class='add'>+static SIMPLE_DEV_PM_OPS(w840_pm_ops, w840_suspend, w840_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver w840_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.id_table	= w840_pci_tbl,</div><div class='ctx'> 	.probe		= w840_probe1,</div><div class='ctx'> 	.remove		= w840_remove1,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= w840_suspend,</div><div class='del'>-	.resume		= w840_resume,</div><div class='del'>-#endif</div><div class='add'>+	.driver.pm	= &amp;w840_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init w840_init(void)</div><div class='del'>-{</div><div class='del'>-	printk(version);</div><div class='del'>-	return pci_register_driver(&amp;w840_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit w840_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;w840_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(w840_init);</div><div class='del'>-module_exit(w840_exit);</div><div class='add'>+module_pci_driver(w840_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c<br/>index a8de79355578..e5d2ede13845 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/xircom_cb.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dec/tulip/xircom_cb.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dec/tulip/xircom_cb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dec/tulip/xircom_cb.c</a></div><div class='hunk'>@@ -143,7 +143,7 @@ static const struct pci_device_id xircom_pci_table[] = {</div><div class='ctx'> };</div><div class='ctx'> MODULE_DEVICE_TABLE(pci, xircom_pci_table);</div><div class='ctx'> </div><div class='del'>-static struct pci_driver xircom_ops = {</div><div class='add'>+static struct pci_driver xircom_driver = {</div><div class='ctx'> 	.name		= "xircom_cb",</div><div class='ctx'> 	.id_table	= xircom_pci_table,</div><div class='ctx'> 	.probe		= xircom_probe,</div><div class='hunk'>@@ -1015,12 +1015,14 @@ static void read_mac_address(struct xircom_private *card)</div><div class='ctx'> 		xw32(CSR10, i + 3);</div><div class='ctx'> 		data_count = xr32(CSR9);</div><div class='ctx'> 		if ((tuple == 0x22) &amp;&amp; (data_id == 0x04) &amp;&amp; (data_count == 0x06)) {</div><div class='add'>+			u8 addr[ETH_ALEN];</div><div class='ctx'> 			int j;</div><div class='ctx'> </div><div class='ctx'> 			for (j = 0; j &lt; 6; j++) {</div><div class='ctx'> 				xw32(CSR10, i + j + 4);</div><div class='del'>-				card-&gt;dev-&gt;dev_addr[j] = xr32(CSR9) &amp; 0xff;</div><div class='add'>+				addr[j] = xr32(CSR9) &amp; 0xff;</div><div class='ctx'> 			}</div><div class='add'>+			eth_hw_addr_set(card-&gt;dev, addr);</div><div class='ctx'> 			break;</div><div class='ctx'> 		} else if (link == 0) {</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1167,4 +1169,4 @@ investigate_write_descriptor(struct net_device *dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-module_pci_driver(xircom_ops);</div><div class='add'>+module_pci_driver(xircom_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig<br/>index 1362658a3030..0d77f84c8e7b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dlink/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_DLINK</div><div class='ctx'> 	bool "D-Link devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -21,7 +21,7 @@ config DL2K</div><div class='ctx'> 	tristate "DL2000/TC902x/IP1000A-based Gigabit Ethernet support"</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports DL2000/TC902x/IP1000A-based Gigabit ethernet cards,</div><div class='ctx'> 	  which includes</div><div class='ctx'> 	  D-Link DGE-550T Gigabit Ethernet Adapter.</div><div class='hunk'>@@ -37,7 +37,7 @@ config SUNDANCE</div><div class='ctx'> 	depends on PCI</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver is for the Sundance "Alta" chip.</div><div class='ctx'> 	  More specific information and updates are available from</div><div class='ctx'> 	  &lt;http://www.scyld.com/network/sundance.html&gt;.</div><div class='hunk'>@@ -45,7 +45,7 @@ config SUNDANCE</div><div class='ctx'> config SUNDANCE_MMIO</div><div class='ctx'> 	bool "Use MMIO instead of PIO"</div><div class='ctx'> 	depends on SUNDANCE</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Enable memory-mapped I/O for interaction with Sundance NIC registers.</div><div class='ctx'> 	  Do NOT enable this by default, PIO (enabled when MMIO is disabled)</div><div class='ctx'> 	  is known to solve bugs on certain chips.</div><div class='head'>diff --git a/drivers/net/ethernet/dlink/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c<br/>index 55e720d2ea0c..846d58c769ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/dl2k.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/dl2k.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/dl2k.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dlink/dl2k.c</a></div><div class='hunk'>@@ -7,9 +7,6 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#define DRV_NAME	"DL2000/TC902x-based linux driver"</div><div class='del'>-#define DRV_VERSION	"v1.19"</div><div class='del'>-#define DRV_RELDATE	"2007/08/12"</div><div class='ctx'> #include "dl2k.h"</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -20,8 +17,6 @@</div><div class='ctx'> #define dr16(reg)	ioread16(ioaddr + (reg))</div><div class='ctx'> #define dr8(reg)	ioread8(ioaddr + (reg))</div><div class='ctx'> </div><div class='del'>-static char version[] =</div><div class='del'>-      KERN_INFO DRV_NAME " " DRV_VERSION " " DRV_RELDATE "\n";</div><div class='ctx'> #define MAX_UNITS 8</div><div class='ctx'> static int mtu[MAX_UNITS];</div><div class='ctx'> static int vlan[MAX_UNITS];</div><div class='hunk'>@@ -46,7 +41,7 @@ module_param(tx_flow, int, 0);</div><div class='ctx'> module_param(rx_flow, int, 0);</div><div class='ctx'> module_param(copy_thresh, int, 0);</div><div class='ctx'> module_param(rx_coalesce, int, 0);	/* Rx frame count each interrupt */</div><div class='del'>-module_param(rx_timeout, int, 0);	/* Rx DMA wait time in 64ns increments */</div><div class='add'>+module_param(rx_timeout, int, 0);  /* Rx DMA wait time in 640ns increments */</div><div class='ctx'> module_param(tx_coalesce, int, 0); /* HW xmit count each TxDMAComplete */</div><div class='ctx'> </div><div class='ctx'> </div><div class='hunk'>@@ -66,7 +61,7 @@ static const int multicast_filter_limit = 0x40;</div><div class='ctx'> </div><div class='ctx'> static int rio_open (struct net_device *dev);</div><div class='ctx'> static void rio_timer (struct timer_list *t);</div><div class='del'>-static void rio_tx_timeout (struct net_device *dev);</div><div class='add'>+static void rio_tx_timeout (struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static netdev_tx_t start_xmit (struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static irqreturn_t rio_interrupt (int irq, void *dev_instance);</div><div class='ctx'> static void rio_free_tx (struct net_device *dev, int irq);</div><div class='hunk'>@@ -100,10 +95,17 @@ static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_multicast,</div><div class='del'>-	.ndo_do_ioctl		= rio_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= rio_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= rio_tx_timeout,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static bool is_support_rmon_mmio(struct pci_dev *pdev)</div><div class='add'>+{</div><div class='add'>+	return pdev-&gt;vendor == PCI_VENDOR_ID_DLINK &amp;&amp;</div><div class='add'>+	       pdev-&gt;device == 0x4000 &amp;&amp;</div><div class='add'>+	       pdev-&gt;revision == 0x0c;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> {</div><div class='hunk'>@@ -113,13 +115,9 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	int chip_idx = ent-&gt;driver_data;</div><div class='ctx'> 	int err, irq;</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='del'>-	static int version_printed;</div><div class='ctx'> 	void *ring_space;</div><div class='ctx'> 	dma_addr_t ring_dma;</div><div class='ctx'> </div><div class='del'>-	if (!version_printed++)</div><div class='del'>-		printk ("%s", version);</div><div class='del'>-</div><div class='ctx'> 	err = pci_enable_device (pdev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -140,21 +138,27 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	np = netdev_priv(dev);</div><div class='ctx'> </div><div class='add'>+	if (is_support_rmon_mmio(pdev))</div><div class='add'>+		np-&gt;rmon_enable = true;</div><div class='add'>+</div><div class='ctx'> 	/* IO registers range. */</div><div class='ctx'> 	ioaddr = pci_iomap(pdev, 0, 0);</div><div class='ctx'> 	if (!ioaddr)</div><div class='ctx'> 		goto err_out_dev;</div><div class='ctx'> 	np-&gt;eeprom_addr = ioaddr;</div><div class='ctx'> </div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-	/* MM registers range. */</div><div class='del'>-	ioaddr = pci_iomap(pdev, 1, 0);</div><div class='del'>-	if (!ioaddr)</div><div class='del'>-		goto err_out_iounmap;</div><div class='del'>-#endif</div><div class='add'>+	if (np-&gt;rmon_enable) {</div><div class='add'>+		/* MM registers range. */</div><div class='add'>+		ioaddr = pci_iomap(pdev, 1, 0);</div><div class='add'>+		if (!ioaddr)</div><div class='add'>+			goto err_out_iounmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	np-&gt;ioaddr = ioaddr;</div><div class='ctx'> 	np-&gt;chip_id = chip_idx;</div><div class='ctx'> 	np-&gt;pdev = pdev;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;np-&gt;stats_lock);</div><div class='ctx'> 	spin_lock_init (&amp;np-&gt;tx_lock);</div><div class='ctx'> 	spin_lock_init (&amp;np-&gt;rx_lock);</div><div class='ctx'> </div><div class='hunk'>@@ -231,13 +235,15 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_drvdata (pdev, dev);</div><div class='ctx'> </div><div class='del'>-	ring_space = pci_alloc_consistent (pdev, TX_TOTAL_SIZE, &amp;ring_dma);</div><div class='add'>+	ring_space = dma_alloc_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE, &amp;ring_dma,</div><div class='add'>+					GFP_KERNEL);</div><div class='ctx'> 	if (!ring_space)</div><div class='ctx'> 		goto err_out_iounmap;</div><div class='ctx'> 	np-&gt;tx_ring = ring_space;</div><div class='ctx'> 	np-&gt;tx_ring_dma = ring_dma;</div><div class='ctx'> </div><div class='del'>-	ring_space = pci_alloc_consistent (pdev, RX_TOTAL_SIZE, &amp;ring_dma);</div><div class='add'>+	ring_space = dma_alloc_coherent(&amp;pdev-&gt;dev, RX_TOTAL_SIZE, &amp;ring_dma,</div><div class='add'>+					GFP_KERNEL);</div><div class='ctx'> 	if (!ring_space)</div><div class='ctx'> 		goto err_out_unmap_tx;</div><div class='ctx'> 	np-&gt;rx_ring = ring_space;</div><div class='hunk'>@@ -256,7 +262,7 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	np-&gt;link_status = 0;</div><div class='ctx'> 	/* Set media and reset PHY */</div><div class='ctx'> 	if (np-&gt;phy_media) {</div><div class='del'>-		/* default Auto-Negotiation for fiber deivices */</div><div class='add'>+		/* default Auto-Negotiation for fiber devices */</div><div class='ctx'> 	 	if (np-&gt;an_enable == 2) {</div><div class='ctx'> 			np-&gt;an_enable = 1;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -288,13 +294,14 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_unmap_rx:</div><div class='del'>-	pci_free_consistent (pdev, RX_TOTAL_SIZE, np-&gt;rx_ring, np-&gt;rx_ring_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, RX_TOTAL_SIZE, np-&gt;rx_ring,</div><div class='add'>+			  np-&gt;rx_ring_dma);</div><div class='ctx'> err_out_unmap_tx:</div><div class='del'>-	pci_free_consistent (pdev, TX_TOTAL_SIZE, np-&gt;tx_ring, np-&gt;tx_ring_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE, np-&gt;tx_ring,</div><div class='add'>+			  np-&gt;tx_ring_dma);</div><div class='ctx'> err_out_iounmap:</div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-	pci_iounmap(pdev, np-&gt;ioaddr);</div><div class='del'>-#endif</div><div class='add'>+	if (np-&gt;rmon_enable)</div><div class='add'>+		pci_iounmap(pdev, np-&gt;ioaddr);</div><div class='ctx'> 	pci_iounmap(pdev, np-&gt;eeprom_addr);</div><div class='ctx'> err_out_dev:</div><div class='ctx'> 	free_netdev (dev);</div><div class='hunk'>@@ -354,11 +361,10 @@ parse_eeprom (struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Set MAC address */</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		dev-&gt;dev_addr[i] = psrom-&gt;mac_addr[i];</div><div class='add'>+	eth_hw_addr_set(dev, psrom-&gt;mac_addr);</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;chip_id == CHIP_IP1000A) {</div><div class='del'>-		np-&gt;led_mode = psrom-&gt;led_mode;</div><div class='add'>+		np-&gt;led_mode = le16_to_cpu(psrom-&gt;led_mode);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -444,8 +450,9 @@ static void free_list(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='ctx'> 		skb = np-&gt;rx_skbuff[i];</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			pci_unmap_single(np-&gt;pdev, desc_to_dma(&amp;np-&gt;rx_ring[i]),</div><div class='del'>-					 skb-&gt;len, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pdev-&gt;dev,</div><div class='add'>+					 desc_to_dma(&amp;np-&gt;rx_ring[i]),</div><div class='add'>+					 skb-&gt;len, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -455,8 +462,9 @@ static void free_list(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; TX_RING_SIZE; i++) {</div><div class='ctx'> 		skb = np-&gt;tx_skbuff[i];</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			pci_unmap_single(np-&gt;pdev, desc_to_dma(&amp;np-&gt;tx_ring[i]),</div><div class='del'>-					 skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pdev-&gt;dev,</div><div class='add'>+					 desc_to_dma(&amp;np-&gt;tx_ring[i]),</div><div class='add'>+					 skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;tx_skbuff[i] = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -500,26 +508,34 @@ static int alloc_list(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='ctx'> 		/* Allocated fixed size of skbuff */</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='add'>+		dma_addr_t addr;</div><div class='ctx'> </div><div class='ctx'> 		skb = netdev_alloc_skb_ip_align(dev, np-&gt;rx_buf_sz);</div><div class='ctx'> 		np-&gt;rx_skbuff[i] = skb;</div><div class='del'>-		if (!skb) {</div><div class='del'>-			free_list(dev);</div><div class='del'>-			return -ENOMEM;</div><div class='del'>-		}</div><div class='add'>+		if (!skb)</div><div class='add'>+			goto err_free_list;</div><div class='add'>+</div><div class='add'>+		addr = dma_map_single(&amp;np-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+				      np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;np-&gt;pdev-&gt;dev, addr))</div><div class='add'>+			goto err_kfree_skb;</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;rx_ring[i].next_desc = cpu_to_le64(np-&gt;rx_ring_dma +</div><div class='ctx'> 						((i + 1) % RX_RING_SIZE) *</div><div class='ctx'> 						sizeof(struct netdev_desc));</div><div class='ctx'> 		/* Rubicon now supports 40 bits of addressing space. */</div><div class='del'>-		np-&gt;rx_ring[i].fraginfo =</div><div class='del'>-		    cpu_to_le64(pci_map_single(</div><div class='del'>-				  np-&gt;pdev, skb-&gt;data, np-&gt;rx_buf_sz,</div><div class='del'>-				  PCI_DMA_FROMDEVICE));</div><div class='add'>+		np-&gt;rx_ring[i].fraginfo = cpu_to_le64(addr);</div><div class='ctx'> 		np-&gt;rx_ring[i].fraginfo |= cpu_to_le64((u64)np-&gt;rx_buf_sz &lt;&lt; 48);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+err_kfree_skb:</div><div class='add'>+	dev_kfree_skb(np-&gt;rx_skbuff[i]);</div><div class='add'>+	np-&gt;rx_skbuff[i] = NULL;</div><div class='add'>+err_free_list:</div><div class='add'>+	free_list(dev);</div><div class='add'>+	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void rio_hw_init(struct net_device *dev)</div><div class='hunk'>@@ -570,8 +586,7 @@ static void rio_hw_init(struct net_device *dev)</div><div class='ctx'> 	 * too. However, it doesn't work on IP1000A so we use 16-bit access.</div><div class='ctx'> 	 */</div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		dw16(StationAddr0 + 2 * i,</div><div class='del'>-		     cpu_to_le16(((u16 *)dev-&gt;dev_addr)[i]));</div><div class='add'>+		dw16(StationAddr0 + 2 * i, get_unaligned_le16(&amp;dev-&gt;dev_addr[2 * i]));</div><div class='ctx'> </div><div class='ctx'> 	set_multicast (dev);</div><div class='ctx'> 	if (np-&gt;coalesce) {</div><div class='hunk'>@@ -582,7 +597,8 @@ static void rio_hw_init(struct net_device *dev)</div><div class='ctx'> 	dw8(TxDMAPollPeriod, 0xff);</div><div class='ctx'> 	dw8(RxDMABurstThresh, 0x30);</div><div class='ctx'> 	dw8(RxDMAUrgentThresh, 0x30);</div><div class='del'>-	dw32(RmonStatMask, 0x0007ffff);</div><div class='add'>+	if (!np-&gt;rmon_enable)</div><div class='add'>+		dw32(RmonStatMask, 0x0007ffff);</div><div class='ctx'> 	/* clear statistics */</div><div class='ctx'> 	clear_stats (dev);</div><div class='ctx'> </div><div class='hunk'>@@ -654,7 +670,7 @@ static int rio_open(struct net_device *dev)</div><div class='ctx'> static void</div><div class='ctx'> rio_timer (struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_private *np = from_timer(np, t, timer);</div><div class='add'>+	struct netdev_private *np = timer_container_of(np, t, timer);</div><div class='ctx'> 	struct net_device *dev = pci_get_drvdata(np-&gt;pdev);</div><div class='ctx'> 	unsigned int entry;</div><div class='ctx'> 	int next_tick = 1*HZ;</div><div class='hunk'>@@ -681,9 +697,8 @@ rio_timer (struct timer_list *t)</div><div class='ctx'> 				}</div><div class='ctx'> 				np-&gt;rx_skbuff[entry] = skb;</div><div class='ctx'> 				np-&gt;rx_ring[entry].fraginfo =</div><div class='del'>-				    cpu_to_le64 (pci_map_single</div><div class='del'>-					 (np-&gt;pdev, skb-&gt;data, np-&gt;rx_buf_sz,</div><div class='del'>-					  PCI_DMA_FROMDEVICE));</div><div class='add'>+				    cpu_to_le64 (dma_map_single(&amp;np-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+								np-&gt;rx_buf_sz, DMA_FROM_DEVICE));</div><div class='ctx'> 			}</div><div class='ctx'> 			np-&gt;rx_ring[entry].fraginfo |=</div><div class='ctx'> 			    cpu_to_le64((u64)np-&gt;rx_buf_sz &lt;&lt; 48);</div><div class='hunk'>@@ -696,7 +711,7 @@ rio_timer (struct timer_list *t)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void</div><div class='del'>-rio_tx_timeout (struct net_device *dev)</div><div class='add'>+rio_tx_timeout (struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;ioaddr;</div><div class='hunk'>@@ -718,7 +733,7 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	u64 tfc_vlan_tag = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (np-&gt;link_status == 0) {	/* Link Down */</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='add'>+		dev_kfree_skb_any(skb);</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> 	}</div><div class='ctx'> 	entry = np-&gt;cur_tx % TX_RING_SIZE;</div><div class='hunk'>@@ -737,9 +752,8 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		    ((u64)np-&gt;vlan &lt;&lt; 32) |</div><div class='ctx'> 		    ((u64)skb-&gt;priority &lt;&lt; 45);</div><div class='ctx'> 	}</div><div class='del'>-	txdesc-&gt;fraginfo = cpu_to_le64 (pci_map_single (np-&gt;pdev, skb-&gt;data,</div><div class='del'>-							skb-&gt;len,</div><div class='del'>-							PCI_DMA_TODEVICE));</div><div class='add'>+	txdesc-&gt;fraginfo = cpu_to_le64 (dma_map_single(&amp;np-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+						       skb-&gt;len, DMA_TO_DEVICE));</div><div class='ctx'> 	txdesc-&gt;fraginfo |= cpu_to_le64((u64)skb-&gt;len &lt;&lt; 48);</div><div class='ctx'> </div><div class='ctx'> 	/* DL2K bug: DMA fails to get next descriptor ptr in 10Mbps mode</div><div class='hunk'>@@ -821,7 +835,6 @@ rio_free_tx (struct net_device *dev, int irq)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	int entry = np-&gt;old_tx % TX_RING_SIZE;</div><div class='del'>-	int tx_use = 0;</div><div class='ctx'> 	unsigned long flag = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (irq)</div><div class='hunk'>@@ -836,9 +849,9 @@ rio_free_tx (struct net_device *dev, int irq)</div><div class='ctx'> 		if (!(np-&gt;tx_ring[entry].status &amp; cpu_to_le64(TFDDone)))</div><div class='ctx'> 			break;</div><div class='ctx'> 		skb = np-&gt;tx_skbuff[entry];</div><div class='del'>-		pci_unmap_single (np-&gt;pdev,</div><div class='del'>-				  desc_to_dma(&amp;np-&gt;tx_ring[entry]),</div><div class='del'>-				  skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+		dma_unmap_single(&amp;np-&gt;pdev-&gt;dev,</div><div class='add'>+				 desc_to_dma(&amp;np-&gt;tx_ring[entry]), skb-&gt;len,</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='ctx'> 		if (irq)</div><div class='ctx'> 			dev_consume_skb_irq(skb);</div><div class='ctx'> 		else</div><div class='hunk'>@@ -846,7 +859,6 @@ rio_free_tx (struct net_device *dev, int irq)</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;tx_skbuff[entry] = NULL;</div><div class='ctx'> 		entry = (entry + 1) % TX_RING_SIZE;</div><div class='del'>-		tx_use++;</div><div class='ctx'> 	}</div><div class='ctx'> 	if (irq)</div><div class='ctx'> 		spin_unlock(&amp;np-&gt;tx_lock);</div><div class='hunk'>@@ -875,8 +887,7 @@ tx_error (struct net_device *dev, int tx_status)</div><div class='ctx'> 	frame_id = (tx_status &amp; 0xffff0000);</div><div class='ctx'> 	printk (KERN_ERR "%s: Transmit error, TxStatus %4.4x, FrameId %d.\n",</div><div class='ctx'> 		dev-&gt;name, tx_status, frame_id);</div><div class='del'>-	dev-&gt;stats.tx_errors++;</div><div class='del'>-	/* Ttransmit Underrun */</div><div class='add'>+	/* Transmit Underrun */</div><div class='ctx'> 	if (tx_status &amp; 0x10) {</div><div class='ctx'> 		dev-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 		dw16(TxStartThresh, dr16(TxStartThresh) + 0x10);</div><div class='hunk'>@@ -912,9 +923,15 @@ tx_error (struct net_device *dev, int tx_status)</div><div class='ctx'> 		rio_set_led_mode(dev);</div><div class='ctx'> 		/* Let TxStartThresh stay default value */</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	spin_lock(&amp;np-&gt;stats_lock);</div><div class='ctx'> 	/* Maximum Collisions */</div><div class='ctx'> 	if (tx_status &amp; 0x08)</div><div class='ctx'> 		dev-&gt;stats.collisions++;</div><div class='add'>+</div><div class='add'>+	dev-&gt;stats.tx_errors++;</div><div class='add'>+	spin_unlock(&amp;np-&gt;stats_lock);</div><div class='add'>+</div><div class='ctx'> 	/* Restart the Tx */</div><div class='ctx'> 	dw32(MACCtrl, dr16(MACCtrl) | TxEnable);</div><div class='ctx'> }</div><div class='hunk'>@@ -956,27 +973,30 @@ receive_packet (struct net_device *dev)</div><div class='ctx'> 		} else {</div><div class='ctx'> 			struct sk_buff *skb;</div><div class='ctx'> </div><div class='add'>+			skb = NULL;</div><div class='ctx'> 			/* Small skbuffs for short packets */</div><div class='del'>-			if (pkt_len &gt; copy_thresh) {</div><div class='del'>-				pci_unmap_single (np-&gt;pdev,</div><div class='del'>-						  desc_to_dma(desc),</div><div class='del'>-						  np-&gt;rx_buf_sz,</div><div class='del'>-						  PCI_DMA_FROMDEVICE);</div><div class='add'>+			if (pkt_len &lt;= copy_thresh)</div><div class='add'>+				skb = netdev_alloc_skb_ip_align(dev, pkt_len);</div><div class='add'>+			if (!skb) {</div><div class='add'>+				dma_unmap_single(&amp;np-&gt;pdev-&gt;dev,</div><div class='add'>+						 desc_to_dma(desc),</div><div class='add'>+						 np-&gt;rx_buf_sz,</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_put (skb = np-&gt;rx_skbuff[entry], pkt_len);</div><div class='ctx'> 				np-&gt;rx_skbuff[entry] = NULL;</div><div class='del'>-			} else if ((skb = netdev_alloc_skb_ip_align(dev, pkt_len))) {</div><div class='del'>-				pci_dma_sync_single_for_cpu(np-&gt;pdev,</div><div class='del'>-							    desc_to_dma(desc),</div><div class='del'>-							    np-&gt;rx_buf_sz,</div><div class='del'>-							    PCI_DMA_FROMDEVICE);</div><div class='add'>+			} else {</div><div class='add'>+				dma_sync_single_for_cpu(&amp;np-&gt;pdev-&gt;dev,</div><div class='add'>+							desc_to_dma(desc),</div><div class='add'>+							np-&gt;rx_buf_sz,</div><div class='add'>+							DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_copy_to_linear_data (skb,</div><div class='ctx'> 						  np-&gt;rx_skbuff[entry]-&gt;data,</div><div class='ctx'> 						  pkt_len);</div><div class='ctx'> 				skb_put (skb, pkt_len);</div><div class='del'>-				pci_dma_sync_single_for_device(np-&gt;pdev,</div><div class='del'>-							       desc_to_dma(desc),</div><div class='del'>-							       np-&gt;rx_buf_sz,</div><div class='del'>-							       PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_device(&amp;np-&gt;pdev-&gt;dev,</div><div class='add'>+							   desc_to_dma(desc),</div><div class='add'>+							   np-&gt;rx_buf_sz,</div><div class='add'>+							   DMA_FROM_DEVICE);</div><div class='ctx'> 			}</div><div class='ctx'> 			skb-&gt;protocol = eth_type_trans (skb, dev);</div><div class='ctx'> #if 0</div><div class='hunk'>@@ -1009,9 +1029,8 @@ receive_packet (struct net_device *dev)</div><div class='ctx'> 			}</div><div class='ctx'> 			np-&gt;rx_skbuff[entry] = skb;</div><div class='ctx'> 			np-&gt;rx_ring[entry].fraginfo =</div><div class='del'>-			    cpu_to_le64 (pci_map_single</div><div class='del'>-					 (np-&gt;pdev, skb-&gt;data, np-&gt;rx_buf_sz,</div><div class='del'>-					  PCI_DMA_FROMDEVICE));</div><div class='add'>+			    cpu_to_le64(dma_map_single(&amp;np-&gt;pdev-&gt;dev, skb-&gt;data,</div><div class='add'>+						       np-&gt;rx_buf_sz, DMA_FROM_DEVICE));</div><div class='ctx'> 		}</div><div class='ctx'> 		np-&gt;rx_ring[entry].fraginfo |=</div><div class='ctx'> 		    cpu_to_le64((u64)np-&gt;rx_buf_sz &lt;&lt; 48);</div><div class='hunk'>@@ -1064,7 +1083,7 @@ rio_error (struct net_device *dev, int int_status)</div><div class='ctx'> 		get_stats (dev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* PCI Error, a catastronphic error related to the bus interface</div><div class='add'>+	/* PCI Error, a catastrophic error related to the bus interface</div><div class='ctx'> 	   occurs, set GlobalReset and HostReset to reset. */</div><div class='ctx'> 	if (int_status &amp; HostError) {</div><div class='ctx'> 		printk (KERN_ERR "%s: HostError! IntStatus %4.4x.\n",</div><div class='hunk'>@@ -1080,11 +1099,10 @@ get_stats (struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;ioaddr;</div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-	int i;</div><div class='del'>-#endif</div><div class='ctx'> 	unsigned int stat_reg;</div><div class='add'>+	unsigned long flags;</div><div class='ctx'> </div><div class='add'>+	spin_lock_irqsave(&amp;np-&gt;stats_lock, flags);</div><div class='ctx'> 	/* All statistics registers need to be acknowledged,</div><div class='ctx'> 	   else statistic overflow could cause problems */</div><div class='ctx'> </div><div class='hunk'>@@ -1093,7 +1111,7 @@ get_stats (struct net_device *dev)</div><div class='ctx'> 	dev-&gt;stats.rx_bytes += dr32(OctetRcvOk);</div><div class='ctx'> 	dev-&gt;stats.tx_bytes += dr32(OctetXmtOk);</div><div class='ctx'> </div><div class='del'>-	dev-&gt;stats.multicast = dr32(McstFramesRcvdOk);</div><div class='add'>+	dev-&gt;stats.multicast += dr32(McstFramesRcvdOk);</div><div class='ctx'> 	dev-&gt;stats.collisions += dr32(SingleColFrames)</div><div class='ctx'> 			     +  dr32(MultiColFrames);</div><div class='ctx'> </div><div class='hunk'>@@ -1125,15 +1143,18 @@ get_stats (struct net_device *dev)</div><div class='ctx'> 	dr16(MacControlFramesXmtd);</div><div class='ctx'> 	dr16(FramesWEXDeferal);</div><div class='ctx'> </div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-	for (i = 0x100; i &lt;= 0x150; i += 4)</div><div class='del'>-		dr32(i);</div><div class='del'>-#endif</div><div class='add'>+	if (np-&gt;rmon_enable)</div><div class='add'>+		for (int i = 0x100; i &lt;= 0x150; i += 4)</div><div class='add'>+			dr32(i);</div><div class='add'>+</div><div class='ctx'> 	dr16(TxJumboFrames);</div><div class='ctx'> 	dr16(RxJumboFrames);</div><div class='ctx'> 	dr16(TCPCheckSumErrors);</div><div class='ctx'> 	dr16(UDPCheckSumErrors);</div><div class='ctx'> 	dr16(IPCheckSumErrors);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;np-&gt;stats_lock, flags);</div><div class='add'>+</div><div class='ctx'> 	return &amp;dev-&gt;stats;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1142,9 +1163,6 @@ clear_stats (struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;ioaddr;</div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-	int i;</div><div class='del'>-#endif</div><div class='ctx'> </div><div class='ctx'> 	/* All statistics registers need to be acknowledged,</div><div class='ctx'> 	   else statistic overflow could cause problems */</div><div class='hunk'>@@ -1180,10 +1198,9 @@ clear_stats (struct net_device *dev)</div><div class='ctx'> 	dr16(BcstFramesXmtdOk);</div><div class='ctx'> 	dr16(MacControlFramesXmtd);</div><div class='ctx'> 	dr16(FramesWEXDeferal);</div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-	for (i = 0x100; i &lt;= 0x150; i += 4)</div><div class='del'>-		dr32(i);</div><div class='del'>-#endif</div><div class='add'>+	if (np-&gt;rmon_enable)</div><div class='add'>+		for (int i = 0x100; i &lt;= 0x150; i += 4)</div><div class='add'>+			dr32(i);</div><div class='ctx'> 	dr16(TxJumboFrames);</div><div class='ctx'> 	dr16(RxJumboFrames);</div><div class='ctx'> 	dr16(TCPCheckSumErrors);</div><div class='hunk'>@@ -1243,9 +1260,8 @@ static void rio_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, "dl2k", sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, "dl2k", sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pdev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int rio_get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1790,7 +1806,7 @@ rio_close (struct net_device *dev)</div><div class='ctx'> 	rio_hw_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(pdev-&gt;irq, dev);</div><div class='del'>-	del_timer_sync (&amp;np-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;np-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	free_list(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1806,13 +1822,12 @@ rio_remove1 (struct pci_dev *pdev)</div><div class='ctx'> 		struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='ctx'> 		unregister_netdev (dev);</div><div class='del'>-		pci_free_consistent (pdev, RX_TOTAL_SIZE, np-&gt;rx_ring,</div><div class='del'>-				     np-&gt;rx_ring_dma);</div><div class='del'>-		pci_free_consistent (pdev, TX_TOTAL_SIZE, np-&gt;tx_ring,</div><div class='del'>-				     np-&gt;tx_ring_dma);</div><div class='del'>-#ifdef MEM_MAPPING</div><div class='del'>-		pci_iounmap(pdev, np-&gt;ioaddr);</div><div class='del'>-#endif</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, RX_TOTAL_SIZE, np-&gt;rx_ring,</div><div class='add'>+				  np-&gt;rx_ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE, np-&gt;tx_ring,</div><div class='add'>+				  np-&gt;tx_ring_dma);</div><div class='add'>+		if (np-&gt;rmon_enable)</div><div class='add'>+			pci_iounmap(pdev, np-&gt;ioaddr);</div><div class='ctx'> 		pci_iounmap(pdev, np-&gt;eeprom_addr);</div><div class='ctx'> 		free_netdev (dev);</div><div class='ctx'> 		pci_release_regions (pdev);</div><div class='hunk'>@@ -1830,7 +1845,7 @@ static int rio_suspend(struct device *device)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	netif_device_detach(dev);</div><div class='del'>-	del_timer_sync(&amp;np-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;np-&gt;timer);</div><div class='ctx'> 	rio_hw_stop(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1854,7 +1869,7 @@ static int rio_resume(struct device *device)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static SIMPLE_DEV_PM_OPS(rio_pm_ops, rio_suspend, rio_resume);</div><div class='add'>+static DEFINE_SIMPLE_DEV_PM_OPS(rio_pm_ops, rio_suspend, rio_resume);</div><div class='ctx'> #define RIO_PM_OPS    (&amp;rio_pm_ops)</div><div class='ctx'> </div><div class='ctx'> #else</div><div class='hunk'>@@ -1872,13 +1887,5 @@ static struct pci_driver rio_driver = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> module_pci_driver(rio_driver);</div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>-Compile command:</div><div class='del'>-</div><div class='del'>-gcc -D__KERNEL__ -DMODULE -I/usr/src/linux/include -Wall -Wstrict-prototypes -O2 -c dl2k.c</div><div class='del'>-</div><div class='del'>-Read Documentation/networking/device_drivers/dlink/dl2k.txt for details.</div><div class='del'>-</div><div class='del'>-*/</div><div class='ctx'> </div><div class='add'>+/* Read Documentation/networking/device_drivers/ethernet/dlink/dl2k.rst. */</div><div class='head'>diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h<br/>index 195dc6cfd895..9ebf7a6db93e 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/dl2k.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/dl2k.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/dl2k.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dlink/dl2k.h</a></div><div class='hunk'>@@ -270,7 +270,7 @@ enum _pcs_reg {</div><div class='ctx'> 	PCS_ESR = 15,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/* IEEE Extened Status Register */</div><div class='add'>+/* IEEE Extended Status Register */</div><div class='ctx'> enum _mii_esr {</div><div class='ctx'> 	MII_ESR_1000BX_FD = 0x8000,</div><div class='ctx'> 	MII_ESR_1000BX_HD = 0x4000,</div><div class='hunk'>@@ -329,18 +329,18 @@ enum _pcs_anlpar {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> typedef struct t_SROM {</div><div class='del'>-	u16 config_param;	/* 0x00 */</div><div class='del'>-	u16 asic_ctrl;		/* 0x02 */</div><div class='del'>-	u16 sub_vendor_id;	/* 0x04 */</div><div class='del'>-	u16 sub_system_id;	/* 0x06 */</div><div class='del'>-	u16 pci_base_1;		/* 0x08 (IP1000A only) */</div><div class='del'>-	u16 pci_base_2;		/* 0x0a (IP1000A only) */</div><div class='del'>-	u16 led_mode;		/* 0x0c (IP1000A only) */</div><div class='del'>-	u16 reserved1[9];	/* 0x0e-0x1f */</div><div class='add'>+	__le16 config_param;	/* 0x00 */</div><div class='add'>+	__le16 asic_ctrl;	/* 0x02 */</div><div class='add'>+	__le16 sub_vendor_id;	/* 0x04 */</div><div class='add'>+	__le16 sub_system_id;	/* 0x06 */</div><div class='add'>+	__le16 pci_base_1;	/* 0x08 (IP1000A only) */</div><div class='add'>+	__le16 pci_base_2;	/* 0x0a (IP1000A only) */</div><div class='add'>+	__le16 led_mode;	/* 0x0c (IP1000A only) */</div><div class='add'>+	__le16 reserved1[9];	/* 0x0e-0x1f */</div><div class='ctx'> 	u8 mac_addr[6];		/* 0x20-0x25 */</div><div class='ctx'> 	u8 reserved2[10];	/* 0x26-0x2f */</div><div class='ctx'> 	u8 sib[204];		/* 0x30-0xfb */</div><div class='del'>-	u32 crc;		/* 0xfc-0xff */</div><div class='add'>+	__le32 crc;		/* 0xfc-0xff */</div><div class='ctx'> } SROM_t, *PSROM_t;</div><div class='ctx'> </div><div class='ctx'> /* Ioctl custom data */</div><div class='hunk'>@@ -372,6 +372,8 @@ struct netdev_private {</div><div class='ctx'> 	struct pci_dev *pdev;</div><div class='ctx'> 	void __iomem *ioaddr;</div><div class='ctx'> 	void __iomem *eeprom_addr;</div><div class='add'>+	// To ensure synchronization when stats are updated.</div><div class='add'>+	spinlock_t stats_lock;</div><div class='ctx'> 	spinlock_t tx_lock;</div><div class='ctx'> 	spinlock_t rx_lock;</div><div class='ctx'> 	unsigned int rx_buf_sz;		/* Based on MTU+slack. */</div><div class='hunk'>@@ -401,6 +403,8 @@ struct netdev_private {</div><div class='ctx'> 	u16 negotiate;		/* Negotiated media */</div><div class='ctx'> 	int phy_addr;		/* PHY addresses. */</div><div class='ctx'> 	u16 led_mode;		/* LED mode read from EEPROM (IP1000A only) */</div><div class='add'>+</div><div class='add'>+	bool rmon_enable;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* The station address location in the EEPROM. */</div><div class='head'>diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c<br/>index 4a37a69764ce..277c50ef773f 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/sundance.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dlink/sundance.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dlink/sundance.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dlink/sundance.c</a></div><div class='hunk'>@@ -18,14 +18,11 @@</div><div class='ctx'> 	http://www.scyld.com/network/sundance.html</div><div class='ctx'> 	[link no longer provides useful info -jgarzik]</div><div class='ctx'> 	Archives of the mailing list are still available at</div><div class='del'>-	http://www.beowulf.org/pipermail/netdrivers/</div><div class='add'>+	https://www.beowulf.org/pipermail/netdrivers/</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"sundance"</div><div class='del'>-#define DRV_VERSION	"1.2"</div><div class='del'>-#define DRV_RELDATE	"11-Sep-2006"</div><div class='del'>-</div><div class='ctx'> </div><div class='ctx'> /* The user-configurable values.</div><div class='ctx'>    These may be modified when a driver module is loaded.*/</div><div class='hunk'>@@ -101,11 +98,6 @@ static char *media[MAX_UNITS];</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='ctx'> #include &lt;linux/mii.h&gt;</div><div class='ctx'> </div><div class='del'>-/* These identify the driver base version and may not be removed. */</div><div class='del'>-static const char version[] =</div><div class='del'>-	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE</div><div class='del'>-	" Written by Donald Becker\n";</div><div class='del'>-</div><div class='ctx'> MODULE_AUTHOR("Donald Becker &lt;becker@scyld.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("Sundance Alta Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='hunk'>@@ -348,7 +340,7 @@ enum wake_event_bits {</div><div class='ctx'> struct netdev_desc {</div><div class='ctx'> 	__le32 next_desc;</div><div class='ctx'> 	__le32 status;</div><div class='del'>-	struct desc_frag { __le32 addr, length; } frag[1];</div><div class='add'>+	struct desc_frag { __le32 addr, length; } frag;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Bits in netdev_desc.status */</div><div class='hunk'>@@ -375,6 +367,7 @@ struct netdev_private {</div><div class='ctx'>         dma_addr_t tx_ring_dma;</div><div class='ctx'>         dma_addr_t rx_ring_dma;</div><div class='ctx'> 	struct timer_list timer;		/* Media monitoring timer. */</div><div class='add'>+	struct net_device *ndev;		/* backpointer */</div><div class='ctx'> 	/* ethtool extra stats */</div><div class='ctx'> 	struct {</div><div class='ctx'> 		u64 tx_multiple_collisions;</div><div class='hunk'>@@ -432,13 +425,13 @@ static int  mdio_wait_link(struct net_device *dev, int wait);</div><div class='ctx'> static int  netdev_open(struct net_device *dev);</div><div class='ctx'> static void check_duplex(struct net_device *dev);</div><div class='ctx'> static void netdev_timer(struct timer_list *t);</div><div class='del'>-static void tx_timeout(struct net_device *dev);</div><div class='add'>+static void tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void init_ring(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static int reset_tx (struct net_device *dev);</div><div class='ctx'> static irqreturn_t intr_handler(int irq, void *dev_instance);</div><div class='del'>-static void rx_poll(unsigned long data);</div><div class='del'>-static void tx_poll(unsigned long data);</div><div class='add'>+static void rx_poll(struct tasklet_struct *t);</div><div class='add'>+static void tx_poll(struct tasklet_struct *t);</div><div class='ctx'> static void refill_rx (struct net_device *dev);</div><div class='ctx'> static void netdev_error(struct net_device *dev, int intr_status);</div><div class='ctx'> static void netdev_error(struct net_device *dev, int intr_status);</div><div class='hunk'>@@ -486,7 +479,7 @@ static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= start_tx,</div><div class='ctx'> 	.ndo_get_stats 		= get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl 		= netdev_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= netdev_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= tx_timeout,</div><div class='ctx'> 	.ndo_change_mtu		= change_mtu,</div><div class='ctx'> 	.ndo_set_mac_address 	= sundance_set_mac_addr,</div><div class='hunk'>@@ -515,13 +508,7 @@ static int sundance_probe1(struct pci_dev *pdev,</div><div class='ctx'> 	int bar = 1;</div><div class='ctx'> #endif</div><div class='ctx'> 	int phy, phy_end, phy_idx = 0;</div><div class='del'>-</div><div class='del'>-/* when built into the kernel, we only print version if device is found */</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	static int printed_version;</div><div class='del'>-	if (!printed_version++)</div><div class='del'>-		printk(version);</div><div class='del'>-#endif</div><div class='add'>+	__le16 addr[ETH_ALEN / 2];</div><div class='ctx'> </div><div class='ctx'> 	if (pci_enable_device(pdev))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -542,18 +529,20 @@ static int sundance_probe1(struct pci_dev *pdev,</div><div class='ctx'> 		goto err_out_res;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		((__le16 *)dev-&gt;dev_addr)[i] =</div><div class='add'>+		addr[i] =</div><div class='ctx'> 			cpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));</div><div class='add'>+	eth_hw_addr_set(dev, (u8 *)addr);</div><div class='ctx'> </div><div class='ctx'> 	np = netdev_priv(dev);</div><div class='add'>+	np-&gt;ndev = dev;</div><div class='ctx'> 	np-&gt;base = ioaddr;</div><div class='ctx'> 	np-&gt;pci_dev = pdev;</div><div class='ctx'> 	np-&gt;chip_id = chip_idx;</div><div class='ctx'> 	np-&gt;msg_enable = (1 &lt;&lt; debug) - 1;</div><div class='ctx'> 	spin_lock_init(&amp;np-&gt;lock);</div><div class='ctx'> 	spin_lock_init(&amp;np-&gt;statlock);</div><div class='del'>-	tasklet_init(&amp;np-&gt;rx_tasklet, rx_poll, (unsigned long)dev);</div><div class='del'>-	tasklet_init(&amp;np-&gt;tx_tasklet, tx_poll, (unsigned long)dev);</div><div class='add'>+	tasklet_setup(&amp;np-&gt;rx_tasklet, rx_poll);</div><div class='add'>+	tasklet_setup(&amp;np-&gt;tx_tasklet, tx_poll);</div><div class='ctx'> </div><div class='ctx'> 	ring_space = dma_alloc_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE,</div><div class='ctx'> 			&amp;ring_dma, GFP_KERNEL);</div><div class='hunk'>@@ -719,7 +708,7 @@ static int change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> {</div><div class='ctx'> 	if (netif_running(dev))</div><div class='ctx'> 		return -EBUSY;</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -953,7 +942,7 @@ static void check_duplex(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void netdev_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_private *np = from_timer(np, t, timer);</div><div class='add'>+	struct netdev_private *np = timer_container_of(np, t, timer);</div><div class='ctx'> 	struct net_device *dev = np-&gt;mii_if.dev;</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base;</div><div class='ctx'> 	int next_tick = 10*HZ;</div><div class='hunk'>@@ -969,14 +958,14 @@ static void netdev_timer(struct timer_list *t)</div><div class='ctx'> 	add_timer(&amp;np-&gt;timer);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tx_timeout(struct net_device *dev)</div><div class='add'>+static void tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base;</div><div class='ctx'> 	unsigned long flag;</div><div class='ctx'> </div><div class='ctx'> 	netif_stop_queue(dev);</div><div class='del'>-	tasklet_disable(&amp;np-&gt;tx_tasklet);</div><div class='add'>+	tasklet_disable_in_atomic(&amp;np-&gt;tx_tasklet);</div><div class='ctx'> 	iowrite16(0, ioaddr + IntrEnable);</div><div class='ctx'> 	printk(KERN_WARNING "%s: Transmit timed out, TxStatus %2.2x "</div><div class='ctx'> 		   "TxFrameId %2.2x,"</div><div class='hunk'>@@ -991,8 +980,8 @@ static void tx_timeout(struct net_device *dev)</div><div class='ctx'> 				le32_to_cpu(np-&gt;tx_ring[i].next_desc),</div><div class='ctx'> 				le32_to_cpu(np-&gt;tx_ring[i].status),</div><div class='ctx'> 				(le32_to_cpu(np-&gt;tx_ring[i].status) &gt;&gt; 2) &amp; 0xff,</div><div class='del'>-				le32_to_cpu(np-&gt;tx_ring[i].frag[0].addr),</div><div class='del'>-				le32_to_cpu(np-&gt;tx_ring[i].frag[0].length));</div><div class='add'>+				le32_to_cpu(np-&gt;tx_ring[i].frag.addr),</div><div class='add'>+				le32_to_cpu(np-&gt;tx_ring[i].frag.length));</div><div class='ctx'> 		}</div><div class='ctx'> 		printk(KERN_DEBUG "TxListPtr=%08x netif_queue_stopped=%d\n",</div><div class='ctx'> 			ioread32(np-&gt;base + TxListPtr),</div><div class='hunk'>@@ -1038,28 +1027,29 @@ static void init_ring(struct net_device *dev)</div><div class='ctx'> 		np-&gt;rx_ring[i].next_desc = cpu_to_le32(np-&gt;rx_ring_dma +</div><div class='ctx'> 			((i+1)%RX_RING_SIZE)*sizeof(*np-&gt;rx_ring));</div><div class='ctx'> 		np-&gt;rx_ring[i].status = 0;</div><div class='del'>-		np-&gt;rx_ring[i].frag[0].length = 0;</div><div class='add'>+		np-&gt;rx_ring[i].frag.length = 0;</div><div class='ctx'> 		np-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the Rx buffers.  Handle allocation failure gracefully. */</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='add'>+		dma_addr_t addr;</div><div class='add'>+</div><div class='ctx'> 		struct sk_buff *skb =</div><div class='ctx'> 			netdev_alloc_skb(dev, np-&gt;rx_buf_sz + 2);</div><div class='ctx'> 		np-&gt;rx_skbuff[i] = skb;</div><div class='ctx'> 		if (skb == NULL)</div><div class='ctx'> 			break;</div><div class='ctx'> 		skb_reserve(skb, 2);	/* 16 byte align the IP header. */</div><div class='del'>-		np-&gt;rx_ring[i].frag[0].addr = cpu_to_le32(</div><div class='del'>-			dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='del'>-				np-&gt;rx_buf_sz, DMA_FROM_DEVICE));</div><div class='del'>-		if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-					np-&gt;rx_ring[i].frag[0].addr)) {</div><div class='add'>+		addr = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+				      np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev, addr)) {</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 			break;</div><div class='ctx'> 		}</div><div class='del'>-		np-&gt;rx_ring[i].frag[0].length = cpu_to_le32(np-&gt;rx_buf_sz | LastFrag);</div><div class='add'>+		np-&gt;rx_ring[i].frag.addr = cpu_to_le32(addr);</div><div class='add'>+		np-&gt;rx_ring[i].frag.length = cpu_to_le32(np-&gt;rx_buf_sz | LastFrag);</div><div class='ctx'> 	}</div><div class='ctx'> 	np-&gt;dirty_rx = (unsigned int)(i - RX_RING_SIZE);</div><div class='ctx'> </div><div class='hunk'>@@ -1069,10 +1059,9 @@ static void init_ring(struct net_device *dev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void tx_poll (unsigned long data)</div><div class='add'>+static void tx_poll(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *)data;</div><div class='del'>-	struct netdev_private *np = netdev_priv(dev);</div><div class='add'>+	struct netdev_private *np = from_tasklet(np, t, tx_tasklet);</div><div class='ctx'> 	unsigned head = np-&gt;cur_task % TX_RING_SIZE;</div><div class='ctx'> 	struct netdev_desc *txdesc =</div><div class='ctx'> 		&amp;np-&gt;tx_ring[(np-&gt;cur_tx - 1) % TX_RING_SIZE];</div><div class='hunk'>@@ -1100,6 +1089,7 @@ start_tx (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	struct netdev_desc *txdesc;</div><div class='add'>+	dma_addr_t addr;</div><div class='ctx'> 	unsigned entry;</div><div class='ctx'> </div><div class='ctx'> 	/* Calculate the next Tx descriptor entry. */</div><div class='hunk'>@@ -1107,14 +1097,15 @@ start_tx (struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 	np-&gt;tx_skbuff[entry] = skb;</div><div class='ctx'> 	txdesc = &amp;np-&gt;tx_ring[entry];</div><div class='ctx'> </div><div class='add'>+	addr = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data, skb-&gt;len,</div><div class='add'>+			      DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev, addr))</div><div class='add'>+		goto drop_frame;</div><div class='add'>+</div><div class='ctx'> 	txdesc-&gt;next_desc = 0;</div><div class='ctx'> 	txdesc-&gt;status = cpu_to_le32 ((entry &lt;&lt; 2) | DisableAlign);</div><div class='del'>-	txdesc-&gt;frag[0].addr = cpu_to_le32(dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-				skb-&gt;data, skb-&gt;len, DMA_TO_DEVICE));</div><div class='del'>-	if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-				txdesc-&gt;frag[0].addr))</div><div class='del'>-			goto drop_frame;</div><div class='del'>-	txdesc-&gt;frag[0].length = cpu_to_le32 (skb-&gt;len | LastFrag);</div><div class='add'>+	txdesc-&gt;frag.addr = cpu_to_le32(addr);</div><div class='add'>+	txdesc-&gt;frag.length = cpu_to_le32 (skb-&gt;len | LastFrag);</div><div class='ctx'> </div><div class='ctx'> 	/* Increment cur_tx before tasklet_schedule() */</div><div class='ctx'> 	np-&gt;cur_tx++;</div><div class='hunk'>@@ -1163,7 +1154,7 @@ reset_tx (struct net_device *dev)</div><div class='ctx'> 		skb = np-&gt;tx_skbuff[i];</div><div class='ctx'> 		if (skb) {</div><div class='ctx'> 			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-				le32_to_cpu(np-&gt;tx_ring[i].frag[0].addr),</div><div class='add'>+				le32_to_cpu(np-&gt;tx_ring[i].frag.addr),</div><div class='ctx'> 				skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(skb);</div><div class='ctx'> 			np-&gt;tx_skbuff[i] = NULL;</div><div class='hunk'>@@ -1283,12 +1274,12 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)</div><div class='ctx'> 				skb = np-&gt;tx_skbuff[entry];</div><div class='ctx'> 				/* Free the original skb. */</div><div class='ctx'> 				dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-					le32_to_cpu(np-&gt;tx_ring[entry].frag[0].addr),</div><div class='add'>+					le32_to_cpu(np-&gt;tx_ring[entry].frag.addr),</div><div class='ctx'> 					skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 				dev_consume_skb_irq(np-&gt;tx_skbuff[entry]);</div><div class='ctx'> 				np-&gt;tx_skbuff[entry] = NULL;</div><div class='del'>-				np-&gt;tx_ring[entry].frag[0].addr = 0;</div><div class='del'>-				np-&gt;tx_ring[entry].frag[0].length = 0;</div><div class='add'>+				np-&gt;tx_ring[entry].frag.addr = 0;</div><div class='add'>+				np-&gt;tx_ring[entry].frag.length = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock(&amp;np-&gt;lock);</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1302,12 +1293,12 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)</div><div class='ctx'> 				skb = np-&gt;tx_skbuff[entry];</div><div class='ctx'> 				/* Free the original skb. */</div><div class='ctx'> 				dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-					le32_to_cpu(np-&gt;tx_ring[entry].frag[0].addr),</div><div class='add'>+					le32_to_cpu(np-&gt;tx_ring[entry].frag.addr),</div><div class='ctx'> 					skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 				dev_consume_skb_irq(np-&gt;tx_skbuff[entry]);</div><div class='ctx'> 				np-&gt;tx_skbuff[entry] = NULL;</div><div class='del'>-				np-&gt;tx_ring[entry].frag[0].addr = 0;</div><div class='del'>-				np-&gt;tx_ring[entry].frag[0].length = 0;</div><div class='add'>+				np-&gt;tx_ring[entry].frag.addr = 0;</div><div class='add'>+				np-&gt;tx_ring[entry].frag.length = 0;</div><div class='ctx'> 			}</div><div class='ctx'> 			spin_unlock(&amp;np-&gt;lock);</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1327,10 +1318,10 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)</div><div class='ctx'> 	return IRQ_RETVAL(handled);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void rx_poll(unsigned long data)</div><div class='add'>+static void rx_poll(struct tasklet_struct *t)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = (struct net_device *)data;</div><div class='del'>-	struct netdev_private *np = netdev_priv(dev);</div><div class='add'>+	struct netdev_private *np = from_tasklet(np, t, rx_tasklet);</div><div class='add'>+	struct net_device *dev = np-&gt;ndev;</div><div class='ctx'> 	int entry = np-&gt;cur_rx % RX_RING_SIZE;</div><div class='ctx'> 	int boguscnt = np-&gt;budget;</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base;</div><div class='hunk'>@@ -1384,16 +1375,16 @@ static void rx_poll(unsigned long data)</div><div class='ctx'> 			    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {</div><div class='ctx'> 				skb_reserve(skb, 2);	/* 16 byte align the IP header */</div><div class='ctx'> 				dma_sync_single_for_cpu(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-						le32_to_cpu(desc-&gt;frag[0].addr),</div><div class='add'>+						le32_to_cpu(desc-&gt;frag.addr),</div><div class='ctx'> 						np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_copy_to_linear_data(skb, np-&gt;rx_skbuff[entry]-&gt;data, pkt_len);</div><div class='ctx'> 				dma_sync_single_for_device(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-						le32_to_cpu(desc-&gt;frag[0].addr),</div><div class='add'>+						le32_to_cpu(desc-&gt;frag.addr),</div><div class='ctx'> 						np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_put(skb, pkt_len);</div><div class='ctx'> 			} else {</div><div class='ctx'> 				dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-					le32_to_cpu(desc-&gt;frag[0].addr),</div><div class='add'>+					le32_to_cpu(desc-&gt;frag.addr),</div><div class='ctx'> 					np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_put(skb = np-&gt;rx_skbuff[entry], pkt_len);</div><div class='ctx'> 				np-&gt;rx_skbuff[entry] = NULL;</div><div class='hunk'>@@ -1426,12 +1417,13 @@ static void refill_rx (struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	int entry;</div><div class='del'>-	int cnt = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Refill the Rx ring buffers. */</div><div class='ctx'> 	for (;(np-&gt;cur_rx - np-&gt;dirty_rx + RX_RING_SIZE) % RX_RING_SIZE &gt; 0;</div><div class='ctx'> 		np-&gt;dirty_rx = (np-&gt;dirty_rx + 1) % RX_RING_SIZE) {</div><div class='ctx'> 		struct sk_buff *skb;</div><div class='add'>+		dma_addr_t addr;</div><div class='add'>+</div><div class='ctx'> 		entry = np-&gt;dirty_rx % RX_RING_SIZE;</div><div class='ctx'> 		if (np-&gt;rx_skbuff[entry] == NULL) {</div><div class='ctx'> 			skb = netdev_alloc_skb(dev, np-&gt;rx_buf_sz + 2);</div><div class='hunk'>@@ -1439,21 +1431,20 @@ static void refill_rx (struct net_device *dev)</div><div class='ctx'> 			if (skb == NULL)</div><div class='ctx'> 				break;		/* Better luck next round. */</div><div class='ctx'> 			skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */</div><div class='del'>-			np-&gt;rx_ring[entry].frag[0].addr = cpu_to_le32(</div><div class='del'>-				dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='del'>-					np-&gt;rx_buf_sz, DMA_FROM_DEVICE));</div><div class='del'>-			if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-				    np-&gt;rx_ring[entry].frag[0].addr)) {</div><div class='add'>+			addr = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+					      np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='add'>+			if (dma_mapping_error(&amp;np-&gt;pci_dev-&gt;dev, addr)) {</div><div class='ctx'> 			    dev_kfree_skb_irq(skb);</div><div class='ctx'> 			    np-&gt;rx_skbuff[entry] = NULL;</div><div class='ctx'> 			    break;</div><div class='ctx'> 			}</div><div class='add'>+</div><div class='add'>+			np-&gt;rx_ring[entry].frag.addr = cpu_to_le32(addr);</div><div class='ctx'> 		}</div><div class='ctx'> 		/* Perhaps we need not reset this field. */</div><div class='del'>-		np-&gt;rx_ring[entry].frag[0].length =</div><div class='add'>+		np-&gt;rx_ring[entry].frag.length =</div><div class='ctx'> 			cpu_to_le32(np-&gt;rx_buf_sz | LastFrag);</div><div class='ctx'> 		np-&gt;rx_ring[entry].status = 0;</div><div class='del'>-		cnt++;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> static void netdev_error(struct net_device *dev, int intr_status)</div><div class='hunk'>@@ -1625,7 +1616,7 @@ static int sundance_set_mac_addr(struct net_device *dev, void *data)</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	__set_mac_addr(dev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -1656,9 +1647,8 @@ static int check_if_running(struct net_device *dev)</div><div class='ctx'> static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1862,20 +1852,20 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 	/* Stop the chip's Tx and Rx processes. */</div><div class='ctx'> 	iowrite16(TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl1);</div><div class='ctx'> </div><div class='del'>-    	for (i = 2000; i &gt; 0; i--) {</div><div class='del'>- 		if ((ioread32(ioaddr + DMACtrl) &amp; 0xc000) == 0)</div><div class='add'>+	for (i = 2000; i &gt; 0; i--) {</div><div class='add'>+		if ((ioread32(ioaddr + DMACtrl) &amp; 0xc000) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		mdelay(1);</div><div class='del'>-    	}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-    	iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,</div><div class='add'>+	iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,</div><div class='ctx'> 			ioaddr + ASIC_HI_WORD(ASICCtrl));</div><div class='ctx'> </div><div class='del'>-    	for (i = 2000; i &gt; 0; i--) {</div><div class='add'>+	for (i = 2000; i &gt; 0; i--) {</div><div class='ctx'> 		if ((ioread16(ioaddr + ASIC_HI_WORD(ASICCtrl)) &amp; ResetBusy) == 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		mdelay(1);</div><div class='del'>-    	}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> #ifdef __i386__</div><div class='ctx'> 	if (netif_msg_hw(np)) {</div><div class='hunk'>@@ -1883,21 +1873,21 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 			   (int)(np-&gt;tx_ring_dma));</div><div class='ctx'> 		for (i = 0; i &lt; TX_RING_SIZE; i++)</div><div class='ctx'> 			printk(KERN_DEBUG " #%d desc. %4.4x %8.8x %8.8x.\n",</div><div class='del'>-				   i, np-&gt;tx_ring[i].status, np-&gt;tx_ring[i].frag[0].addr,</div><div class='del'>-				   np-&gt;tx_ring[i].frag[0].length);</div><div class='add'>+				   i, np-&gt;tx_ring[i].status, np-&gt;tx_ring[i].frag.addr,</div><div class='add'>+				   np-&gt;tx_ring[i].frag.length);</div><div class='ctx'> 		printk(KERN_DEBUG "  Rx ring %8.8x:\n",</div><div class='ctx'> 			   (int)(np-&gt;rx_ring_dma));</div><div class='ctx'> 		for (i = 0; i &lt; /*RX_RING_SIZE*/4 ; i++) {</div><div class='ctx'> 			printk(KERN_DEBUG " #%d desc. %4.4x %4.4x %8.8x\n",</div><div class='del'>-				   i, np-&gt;rx_ring[i].status, np-&gt;rx_ring[i].frag[0].addr,</div><div class='del'>-				   np-&gt;rx_ring[i].frag[0].length);</div><div class='add'>+				   i, np-&gt;rx_ring[i].status, np-&gt;rx_ring[i].frag.addr,</div><div class='add'>+				   np-&gt;rx_ring[i].frag.length);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> #endif /* __i386__ debugging only */</div><div class='ctx'> </div><div class='ctx'> 	free_irq(np-&gt;pci_dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;np-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;np-&gt;timer);</div><div class='ctx'> </div><div class='ctx'> 	/* Free all the skbuffs in the Rx queue. */</div><div class='ctx'> 	for (i = 0; i &lt; RX_RING_SIZE; i++) {</div><div class='hunk'>@@ -1905,19 +1895,19 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 		skb = np-&gt;rx_skbuff[i];</div><div class='ctx'> 		if (skb) {</div><div class='ctx'> 			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-				le32_to_cpu(np-&gt;rx_ring[i].frag[0].addr),</div><div class='add'>+				le32_to_cpu(np-&gt;rx_ring[i].frag.addr),</div><div class='ctx'> 				np-&gt;rx_buf_sz, DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;rx_skbuff[i] = NULL;</div><div class='ctx'> 		}</div><div class='del'>-		np-&gt;rx_ring[i].frag[0].addr = cpu_to_le32(0xBADF00D0); /* poison */</div><div class='add'>+		np-&gt;rx_ring[i].frag.addr = cpu_to_le32(0xBADF00D0); /* poison */</div><div class='ctx'> 	}</div><div class='ctx'> 	for (i = 0; i &lt; TX_RING_SIZE; i++) {</div><div class='ctx'> 		np-&gt;tx_ring[i].next_desc = 0;</div><div class='ctx'> 		skb = np-&gt;tx_skbuff[i];</div><div class='ctx'> 		if (skb) {</div><div class='ctx'> 			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='del'>-				le32_to_cpu(np-&gt;tx_ring[i].frag[0].addr),</div><div class='add'>+				le32_to_cpu(np-&gt;tx_ring[i].frag.addr),</div><div class='ctx'> 				skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;tx_skbuff[i] = NULL;</div><div class='hunk'>@@ -1944,11 +1934,9 @@ static void sundance_remove1(struct pci_dev *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-</div><div class='del'>-static int sundance_suspend(struct pci_dev *pci_dev, pm_message_t state)</div><div class='add'>+static int __maybe_unused sundance_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;base;</div><div class='ctx'> </div><div class='hunk'>@@ -1958,30 +1946,24 @@ static int sundance_suspend(struct pci_dev *pci_dev, pm_message_t state)</div><div class='ctx'> 	netdev_close(dev);</div><div class='ctx'> 	netif_device_detach(dev);</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pci_dev);</div><div class='ctx'> 	if (np-&gt;wol_enabled) {</div><div class='ctx'> 		iowrite8(AcceptBroadcast | AcceptMyPhys, ioaddr + RxMode);</div><div class='ctx'> 		iowrite16(RxEnable, ioaddr + MACCtrl1);</div><div class='ctx'> 	}</div><div class='del'>-	pci_enable_wake(pci_dev, pci_choose_state(pci_dev, state),</div><div class='del'>-			np-&gt;wol_enabled);</div><div class='del'>-	pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state));</div><div class='add'>+</div><div class='add'>+	device_set_wakeup_enable(dev_d, np-&gt;wol_enabled);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int sundance_resume(struct pci_dev *pci_dev)</div><div class='add'>+static int __maybe_unused sundance_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *dev = pci_get_drvdata(pci_dev);</div><div class='add'>+	struct net_device *dev = dev_get_drvdata(dev_d);</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (!netif_running(dev))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	pci_set_power_state(pci_dev, PCI_D0);</div><div class='del'>-	pci_restore_state(pci_dev);</div><div class='del'>-	pci_enable_wake(pci_dev, PCI_D0, 0);</div><div class='del'>-</div><div class='ctx'> 	err = netdev_open(dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		printk(KERN_ERR "%s: Can't resume interface!\n",</div><div class='hunk'>@@ -1995,34 +1977,14 @@ out:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+static SIMPLE_DEV_PM_OPS(sundance_pm_ops, sundance_suspend, sundance_resume);</div><div class='ctx'> </div><div class='ctx'> static struct pci_driver sundance_driver = {</div><div class='ctx'> 	.name		= DRV_NAME,</div><div class='ctx'> 	.id_table	= sundance_pci_tbl,</div><div class='ctx'> 	.probe		= sundance_probe1,</div><div class='ctx'> 	.remove		= sundance_remove1,</div><div class='del'>-#ifdef CONFIG_PM</div><div class='del'>-	.suspend	= sundance_suspend,</div><div class='del'>-	.resume		= sundance_resume,</div><div class='del'>-#endif /* CONFIG_PM */</div><div class='add'>+	.driver.pm	= &amp;sundance_pm_ops,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init sundance_init(void)</div><div class='del'>-{</div><div class='del'>-/* when a module, this is printed whether or not devices are found in probe */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	printk(version);</div><div class='del'>-#endif</div><div class='del'>-	return pci_register_driver(&amp;sundance_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit sundance_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;sundance_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(sundance_init);</div><div class='del'>-module_exit(sundance_exit);</div><div class='del'>-</div><div class='del'>-</div><div class='add'>+module_pci_driver(sundance_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c<br/>index 79521e27f0d1..0de3cd660ec8 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dnet.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dnet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dnet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dnet.c</a></div><div class='hunk'>@@ -1,12 +1,9 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Dave DNET Ethernet Controller driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Dave S.r.l. &lt;www.dave.eu&gt;</div><div class='ctx'>  * Copyright (C) 2009 Ilya Yanok, Emcraft Systems Ltd, &lt;yanok@emcraft.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -63,11 +60,11 @@ static void __dnet_set_hwaddr(struct dnet *bp)</div><div class='ctx'> {</div><div class='ctx'> 	u16 tmp;</div><div class='ctx'> </div><div class='del'>-	tmp = be16_to_cpup((__be16 *)bp-&gt;dev-&gt;dev_addr);</div><div class='add'>+	tmp = be16_to_cpup((const __be16 *)bp-&gt;dev-&gt;dev_addr);</div><div class='ctx'> 	dnet_writew_mac(bp, DNET_INTERNAL_MAC_ADDR_0_REG, tmp);</div><div class='del'>-	tmp = be16_to_cpup((__be16 *)(bp-&gt;dev-&gt;dev_addr + 2));</div><div class='add'>+	tmp = be16_to_cpup((const __be16 *)(bp-&gt;dev-&gt;dev_addr + 2));</div><div class='ctx'> 	dnet_writew_mac(bp, DNET_INTERNAL_MAC_ADDR_1_REG, tmp);</div><div class='del'>-	tmp = be16_to_cpup((__be16 *)(bp-&gt;dev-&gt;dev_addr + 4));</div><div class='add'>+	tmp = be16_to_cpup((const __be16 *)(bp-&gt;dev-&gt;dev_addr + 4));</div><div class='ctx'> 	dnet_writew_mac(bp, DNET_INTERNAL_MAC_ADDR_2_REG, tmp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -96,7 +93,7 @@ static void dnet_get_hwaddr(struct dnet *bp)</div><div class='ctx'> 	*((__be16 *)(addr + 4)) = cpu_to_be16(tmp);</div><div class='ctx'> </div><div class='ctx'> 	if (is_valid_ether_addr(addr))</div><div class='del'>-		memcpy(bp-&gt;dev-&gt;dev_addr, addr, sizeof(addr));</div><div class='add'>+		eth_hw_addr_set(bp-&gt;dev, addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dnet_mdio_read(struct mii_bus *bus, int mii_id, int regnum)</div><div class='hunk'>@@ -510,23 +507,20 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct dnet *bp = netdev_priv(dev);</div><div class='del'>-	u32 tx_status, irq_enable;</div><div class='del'>-	unsigned int len, i, tx_cmd, wrsz;</div><div class='add'>+	unsigned int i, tx_cmd, wrsz;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> 	unsigned int *bufp;</div><div class='add'>+	u32 irq_enable;</div><div class='ctx'> </div><div class='del'>-	tx_status = dnet_readl(bp, TX_STATUS);</div><div class='add'>+	dnet_readl(bp, TX_STATUS);</div><div class='ctx'> </div><div class='ctx'> 	pr_debug("start_xmit: len %u head %p data %p\n",</div><div class='ctx'> 	       skb-&gt;len, skb-&gt;head, skb-&gt;data);</div><div class='ctx'> 	dnet_print_skb(skb);</div><div class='ctx'> </div><div class='del'>-	/* frame size (words) */</div><div class='del'>-	len = (skb-&gt;len + 3) &gt;&gt; 2;</div><div class='del'>-</div><div class='ctx'> 	spin_lock_irqsave(&amp;bp-&gt;lock, flags);</div><div class='ctx'> </div><div class='del'>-	tx_status = dnet_readl(bp, TX_STATUS);</div><div class='add'>+	dnet_readl(bp, TX_STATUS);</div><div class='ctx'> </div><div class='ctx'> 	bufp = (unsigned int *)(((unsigned long) skb-&gt;data) &amp; ~0x3UL);</div><div class='ctx'> 	wrsz = (u32) skb-&gt;len + 3;</div><div class='hunk'>@@ -548,7 +542,7 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	if (dnet_readl(bp, TX_FIFO_WCNT) &gt; DNET_FIFO_TX_DATA_AF_TH) {</div><div class='ctx'> 		netif_stop_queue(dev);</div><div class='del'>-		tx_status = dnet_readl(bp, INTR_SRC);</div><div class='add'>+		dnet_readl(bp, INTR_SRC);</div><div class='ctx'> 		irq_enable = dnet_readl(bp, INTR_ENB);</div><div class='ctx'> 		irq_enable |= DNET_INTR_ENB_TX_FIFOAE;</div><div class='ctx'> 		dnet_writel(bp, irq_enable, INTR_ENB);</div><div class='hunk'>@@ -556,11 +550,11 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 	skb_tx_timestamp(skb);</div><div class='ctx'> </div><div class='add'>+	spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='add'>+</div><div class='ctx'> 	/* free the buffer */</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='del'>-	spin_unlock_irqrestore(&amp;bp-&gt;lock, flags);</div><div class='del'>-</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -728,25 +722,11 @@ static struct net_device_stats *dnet_get_stats(struct net_device *dev)</div><div class='ctx'> 	return nstat;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='del'>-{</div><div class='del'>-	struct phy_device *phydev = dev-&gt;phydev;</div><div class='del'>-</div><div class='del'>-	if (!netif_running(dev))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (!phydev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='del'>-	return phy_mii_ioctl(phydev, rq, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void dnet_get_drvinfo(struct net_device *dev,</div><div class='ctx'> 			     struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, "0", sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, "0", sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct ethtool_ops dnet_ethtool_ops = {</div><div class='hunk'>@@ -762,7 +742,7 @@ static const struct net_device_ops dnet_netdev_ops = {</div><div class='ctx'> 	.ndo_stop		= dnet_close,</div><div class='ctx'> 	.ndo_get_stats		= dnet_get_stats,</div><div class='ctx'> 	.ndo_start_xmit		= dnet_start_xmit,</div><div class='del'>-	.ndo_do_ioctl		= dnet_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl_running,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='ctx'> };</div><div class='hunk'>@@ -793,8 +773,7 @@ static int dnet_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;bp-&gt;lock);</div><div class='ctx'> </div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	bp-&gt;regs = devm_ioremap_resource(&amp;pdev-&gt;dev, res);</div><div class='add'>+	bp-&gt;regs = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;res);</div><div class='ctx'> 	if (IS_ERR(bp-&gt;regs)) {</div><div class='ctx'> 		err = PTR_ERR(bp-&gt;regs);</div><div class='ctx'> 		goto err_out_free_dev;</div><div class='hunk'>@@ -809,7 +788,7 @@ static int dnet_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;netdev_ops = &amp;dnet_netdev_ops;</div><div class='del'>-	netif_napi_add(dev, &amp;bp-&gt;napi, dnet_poll, 64);</div><div class='add'>+	netif_napi_add(dev, &amp;bp-&gt;napi, dnet_poll);</div><div class='ctx'> 	dev-&gt;ethtool_ops = &amp;dnet_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	dev-&gt;base_addr = (unsigned long)bp-&gt;regs;</div><div class='hunk'>@@ -862,7 +841,7 @@ err_out_free_dev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dnet_remove(struct platform_device *pdev)</div><div class='add'>+static void dnet_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> </div><div class='ctx'> 	struct net_device *dev;</div><div class='hunk'>@@ -880,8 +859,6 @@ static int dnet_remove(struct platform_device *pdev)</div><div class='ctx'> 		free_irq(dev-&gt;irq, dev);</div><div class='ctx'> 		free_netdev(dev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver dnet_driver = {</div><div class='head'>diff --git a/drivers/net/ethernet/dnet.h b/drivers/net/ethernet/dnet.h<br/>index d985080bbd5d..030724484b49 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dnet.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/dnet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/dnet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/dnet.h</a></div><div class='hunk'>@@ -1,17 +1,13 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Dave DNET Ethernet Controller driver</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2008 Dave S.r.l. &lt;www.dave.eu&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _DNET_H</div><div class='ctx'> #define _DNET_H</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME		"dnet"</div><div class='del'>-#define DRV_VERSION		"0.9.1"</div><div class='ctx'> #define PFX				DRV_NAME ": "</div><div class='ctx'> </div><div class='ctx'> /* Register access macros */</div><div class='head'>diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c<br/>index 46b0dbab8aad..67275aa4f65b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ec_bhf.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ec_bhf.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ec_bhf.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/ec_bhf.c</a></div><div class='hunk'>@@ -416,8 +416,7 @@ static int ec_bhf_open(struct net_device *net_dev)</div><div class='ctx'> </div><div class='ctx'> 	netif_start_queue(net_dev);</div><div class='ctx'> </div><div class='del'>-	hrtimer_init(&amp;priv-&gt;hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='del'>-	priv-&gt;hrtimer.function = ec_bhf_timer_fun;</div><div class='add'>+	hrtimer_setup(&amp;priv-&gt;hrtimer, ec_bhf_timer_fun, CLOCK_MONOTONIC, HRTIMER_MODE_REL);</div><div class='ctx'> 	hrtimer_start(&amp;priv-&gt;hrtimer, polling_frequency, HRTIMER_MODE_REL);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -479,6 +478,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> 	struct ec_bhf_priv *priv;</div><div class='ctx'> 	void __iomem *dma_io;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> 	void __iomem *io;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -488,15 +488,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='ctx'> </div><div class='ctx'> 	pci_set_master(dev);</div><div class='ctx'> </div><div class='del'>-	err = pci_set_dma_mask(dev, DMA_BIT_MASK(32));</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev,</div><div class='del'>-			"Required dma mask not supported, failed to initialize device\n");</div><div class='del'>-		err = -EIO;</div><div class='del'>-		goto err_disable_dev;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(32));</div><div class='add'>+	err = dma_set_mask_and_coherent(&amp;dev-&gt;dev, DMA_BIT_MASK(32));</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(&amp;dev-&gt;dev,</div><div class='ctx'> 			"Required dma mask not supported, failed to initialize device\n");</div><div class='hunk'>@@ -547,7 +539,8 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)</div><div class='ctx'> 	if (err &lt; 0)</div><div class='ctx'> 		goto err_free_net_dev;</div><div class='ctx'> </div><div class='del'>-	memcpy_fromio(net_dev-&gt;dev_addr, priv-&gt;mii_io + MII_MAC_ADDR, 6);</div><div class='add'>+	memcpy_fromio(addr, priv-&gt;mii_io + MII_MAC_ADDR, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(net_dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(net_dev);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='hunk'>@@ -564,7 +557,6 @@ err_unmap:</div><div class='ctx'> err_release_regions:</div><div class='ctx'> 	pci_release_regions(dev);</div><div class='ctx'> err_disable_dev:</div><div class='del'>-	pci_clear_master(dev);</div><div class='ctx'> 	pci_disable_device(dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -576,12 +568,13 @@ static void ec_bhf_remove(struct pci_dev *dev)</div><div class='ctx'> 	struct ec_bhf_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='del'>-	free_netdev(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	pci_iounmap(dev, priv-&gt;dma_io);</div><div class='ctx'> 	pci_iounmap(dev, priv-&gt;io);</div><div class='add'>+</div><div class='add'>+	free_netdev(net_dev);</div><div class='add'>+</div><div class='ctx'> 	pci_release_regions(dev);</div><div class='del'>-	pci_clear_master(dev);</div><div class='ctx'> 	pci_disable_device(dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -596,5 +589,6 @@ module_pci_driver(pci_driver);</div><div class='ctx'> module_param(polling_frequency, long, 0444);</div><div class='ctx'> MODULE_PARM_DESC(polling_frequency, "Polling timer frequency in ns");</div><div class='ctx'> </div><div class='add'>+MODULE_DESCRIPTION("Beckhoff CX5020 EtherCAT Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> MODULE_AUTHOR("Dariusz Marcinkiewicz &lt;reksio@newterm.pl&gt;");</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig<br/>index 22c143f2d787..5797a76dc731 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/Kconfig</a></div><div class='hunk'>@@ -7,7 +7,7 @@ config NET_VENDOR_EMULEX</div><div class='ctx'> 	bool "Emulex devices"</div><div class='ctx'> 	default y</div><div class='ctx'> 	depends on PCI</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/Kconfig b/drivers/net/ethernet/emulex/benet/Kconfig<br/>index e8c7eb842dbe..f51dca1526c6 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/Kconfig</a></div><div class='hunk'>@@ -48,5 +48,5 @@ config BE2NET_SKYHAWK</div><div class='ctx'> 	  chipsets. (e.g. OneConnect OCe14xxx)</div><div class='ctx'> </div><div class='ctx'> comment "WARNING: be2net is useless without any enabled chip"</div><div class='del'>-        depends on BE2NET_BE2=n &amp;&amp; BE2NET_BE3=n &amp;&amp; BE2NET_LANCER=n &amp;&amp; \</div><div class='del'>-	BE2NET_SKYHAWK=n &amp;&amp; BE2NET</div><div class='add'>+	depends on BE2NET_BE2=n &amp;&amp; BE2NET_BE3=n &amp;&amp; BE2NET_LANCER=n &amp;&amp; \</div><div class='add'>+		BE2NET_SKYHAWK=n &amp;&amp; BE2NET</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h<br/>index ce041c90adb0..270ff9aab335 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.  The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -37,7 +33,6 @@</div><div class='ctx'> #include "be_hw.h"</div><div class='ctx'> #include "be_roce.h"</div><div class='ctx'> </div><div class='del'>-#define DRV_VER			"12.0.0.0"</div><div class='ctx'> #define DRV_NAME		"be2net"</div><div class='ctx'> #define BE_NAME			"Emulex BladeEngine2"</div><div class='ctx'> #define BE3_NAME		"Emulex BladeEngine3"</div><div class='hunk'>@@ -106,8 +101,7 @@</div><div class='ctx'> #define MAX_ROCE_EQS		5</div><div class='ctx'> #define MAX_MSIX_VECTORS	32</div><div class='ctx'> #define MIN_MSIX_VECTORS	1</div><div class='del'>-#define BE_NAPI_WEIGHT		64</div><div class='del'>-#define MAX_RX_POST		BE_NAPI_WEIGHT /* Frags posted at a time */</div><div class='add'>+#define MAX_RX_POST		NAPI_POLL_WEIGHT /* Frags posted at a time */</div><div class='ctx'> #define RX_FRAGS_REFILL_WM	(RX_Q_LEN - MAX_RX_POST)</div><div class='ctx'> #define MAX_NUM_POST_ERX_DB	255u</div><div class='ctx'> </div><div class='hunk'>@@ -196,7 +190,6 @@ struct be_eq_obj {</div><div class='ctx'> } ____cacheline_aligned_in_smp;</div><div class='ctx'> </div><div class='ctx'> struct be_aic_obj {		/* Adaptive interrupt coalescing (AIC) info */</div><div class='del'>-	bool enable;</div><div class='ctx'> 	u32 min_eqd;		/* in usecs */</div><div class='ctx'> 	u32 max_eqd;		/* in usecs */</div><div class='ctx'> 	u32 prev_eqd;		/* in usecs */</div><div class='hunk'>@@ -569,7 +562,7 @@ struct be_adapter {</div><div class='ctx'> 	struct be_dma_mem mbox_mem_alloced;</div><div class='ctx'> </div><div class='ctx'> 	struct be_mcc_obj mcc_obj;</div><div class='del'>-	struct mutex mcc_lock;	/* For serializing mcc cmds to BE card */</div><div class='add'>+	spinlock_t mcc_lock;	/* For serializing mcc cmds to BE card */</div><div class='ctx'> 	spinlock_t mcc_cq_lock;</div><div class='ctx'> </div><div class='ctx'> 	u16 cfg_num_rx_irqs;		/* configured via set-channels */</div><div class='hunk'>@@ -593,6 +586,7 @@ struct be_adapter {</div><div class='ctx'> </div><div class='ctx'> 	struct be_drv_stats drv_stats;</div><div class='ctx'> 	struct be_aic_obj aic_obj[MAX_EVT_QS];</div><div class='add'>+	bool aic_enabled;</div><div class='ctx'> 	u8 vlan_prio_bmap;	/* Available Priority BitMap */</div><div class='ctx'> 	u16 recommended_prio_bits;/* Recommended Priority bits in vlan tag */</div><div class='ctx'> 	struct be_dma_mem rx_filter; /* Cmd DMA mem for rx-filter */</div><div class='hunk'>@@ -659,8 +653,6 @@ struct be_adapter {</div><div class='ctx'> 	u8 hba_port_num;</div><div class='ctx'> 	u16 pvid;</div><div class='ctx'> 	__be16 vxlan_port;		/* offloaded vxlan port num */</div><div class='del'>-	int vxlan_port_count;		/* active vxlan port count */</div><div class='del'>-	struct list_head vxlan_port_list;	/* vxlan port list */</div><div class='ctx'> 	struct phy_info phy;</div><div class='ctx'> 	u8 wol_cap;</div><div class='ctx'> 	bool wol_en;</div><div class='hunk'>@@ -684,9 +676,6 @@ struct be_adapter {</div><div class='ctx'> struct be_cmd_work {</div><div class='ctx'> 	struct work_struct work;</div><div class='ctx'> 	struct be_adapter *adapter;</div><div class='del'>-	union {</div><div class='del'>-		__be16 vxlan_port;</div><div class='del'>-	} info;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define be_physfn(adapter)		(!adapter-&gt;virtfn)</div><div class='hunk'>@@ -977,9 +966,7 @@ void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm,</div><div class='ctx'> void be_link_status_update(struct be_adapter *adapter, u8 link_status);</div><div class='ctx'> void be_parse_stats(struct be_adapter *adapter);</div><div class='ctx'> int be_load_fw(struct be_adapter *adapter, u8 *func);</div><div class='del'>-bool be_is_wol_supported(struct be_adapter *adapter);</div><div class='ctx'> bool be_pause_supported(struct be_adapter *adapter);</div><div class='del'>-u32 be_get_fw_log_level(struct be_adapter *adapter);</div><div class='ctx'> int be_update_queues(struct be_adapter *adapter);</div><div class='ctx'> int be_poll(struct napi_struct *napi, int budget);</div><div class='ctx'> void be_eqd_update(struct be_adapter *adapter, bool force_update);</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c<br/>index 59a7f0b99069..bb5d2fa15736 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_cmds.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_cmds.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.  The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -139,7 +135,8 @@ static int be_mcc_notify(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> /* To check if valid bit is set, check the entire word as we don't know</div><div class='ctx'>  * the endianness of the data (old entry is host endian while a new entry is</div><div class='del'>- * little endian) */</div><div class='add'>+ * little endian)</div><div class='add'>+ */</div><div class='ctx'> static inline bool be_mcc_compl_is_new(struct be_mcc_compl *compl)</div><div class='ctx'> {</div><div class='ctx'> 	u32 flags;</div><div class='hunk'>@@ -252,7 +249,8 @@ static int be_mcc_compl_process(struct be_adapter *adapter,</div><div class='ctx'> 	u8 opcode = 0, subsystem = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* Just swap the status to host endian; mcc tag is opaquely copied</div><div class='del'>-	 * from mcc_wrb */</div><div class='add'>+	 * from mcc_wrb</div><div class='add'>+	 */</div><div class='ctx'> 	be_dws_le_to_cpu(compl, 4);</div><div class='ctx'> </div><div class='ctx'> 	base_status = base_status(compl-&gt;status);</div><div class='hunk'>@@ -577,7 +575,7 @@ int be_process_mcc(struct be_adapter *adapter)</div><div class='ctx'> /* Wait till no more pending mcc requests are present */</div><div class='ctx'> static int be_mcc_wait_compl(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='del'>-#define mcc_timeout		12000 /* 12s timeout */</div><div class='add'>+#define mcc_timeout		120000 /* 12s timeout */</div><div class='ctx'> 	int i, status = 0;</div><div class='ctx'> 	struct be_mcc_obj *mcc_obj = &amp;adapter-&gt;mcc_obj;</div><div class='ctx'> </div><div class='hunk'>@@ -591,7 +589,7 @@ static int be_mcc_wait_compl(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 		if (atomic_read(&amp;mcc_obj-&gt;q.used) == 0)</div><div class='ctx'> 			break;</div><div class='del'>-		usleep_range(500, 1000);</div><div class='add'>+		udelay(100);</div><div class='ctx'> 	}</div><div class='ctx'> 	if (i == mcc_timeout) {</div><div class='ctx'> 		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "FW not responding\n");</div><div class='hunk'>@@ -661,8 +659,7 @@ static int be_mbox_db_ready_wait(struct be_adapter *adapter, void __iomem *db)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/*</div><div class='del'>- * Insert the mailbox address into the doorbell in two steps</div><div class='add'>+/* Insert the mailbox address into the doorbell in two steps</div><div class='ctx'>  * Polls on the mbox doorbell till a command completion (or a timeout) occurs</div><div class='ctx'>  */</div><div class='ctx'> static int be_mbox_notify_wait(struct be_adapter *adapter)</div><div class='hunk'>@@ -806,7 +803,7 @@ static void be_wrb_cmd_hdr_prepare(struct be_cmd_req_hdr *req_hdr,</div><div class='ctx'> 	req_hdr-&gt;subsystem = subsystem;</div><div class='ctx'> 	req_hdr-&gt;request_length = cpu_to_le32(cmd_len - sizeof(*req_hdr));</div><div class='ctx'> 	req_hdr-&gt;version = 0;</div><div class='del'>-	fill_wrb_tags(wrb, (ulong) req_hdr);</div><div class='add'>+	fill_wrb_tags(wrb, (ulong)req_hdr);</div><div class='ctx'> 	wrb-&gt;payload_length = cmd_len;</div><div class='ctx'> 	if (mem) {</div><div class='ctx'> 		wrb-&gt;embedded |= (1 &amp; MCC_WRB_SGE_CNT_MASK) &lt;&lt;</div><div class='hunk'>@@ -836,8 +833,8 @@ static void be_cmd_page_addrs_prepare(struct phys_addr *pages, u32 max_pages,</div><div class='ctx'> static inline struct be_mcc_wrb *wrb_from_mbox(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_dma_mem *mbox_mem = &amp;adapter-&gt;mbox_mem;</div><div class='del'>-	struct be_mcc_wrb *wrb</div><div class='del'>-		= &amp;((struct be_mcc_mailbox *)(mbox_mem-&gt;va))-&gt;wrb;</div><div class='add'>+	struct be_mcc_wrb *wrb = &amp;((struct be_mcc_mailbox *)(mbox_mem-&gt;va))-&gt;wrb;</div><div class='add'>+</div><div class='ctx'> 	memset(wrb, 0, sizeof(*wrb));</div><div class='ctx'> 	return wrb;</div><div class='ctx'> }</div><div class='hunk'>@@ -869,7 +866,7 @@ static bool use_mcc(struct be_adapter *adapter)</div><div class='ctx'> static int be_cmd_lock(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if (use_mcc(adapter)) {</div><div class='del'>-		mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+		spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		return mutex_lock_interruptible(&amp;adapter-&gt;mbox_lock);</div><div class='hunk'>@@ -880,7 +877,7 @@ static int be_cmd_lock(struct be_adapter *adapter)</div><div class='ctx'> static void be_cmd_unlock(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	if (use_mcc(adapter))</div><div class='del'>-		return mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+		return spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	else</div><div class='ctx'> 		return mutex_unlock(&amp;adapter-&gt;mbox_lock);</div><div class='ctx'> }</div><div class='hunk'>@@ -900,7 +897,7 @@ static struct be_mcc_wrb *be_cmd_copy(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	memcpy(dest_wrb, wrb, sizeof(*wrb));</div><div class='ctx'> 	if (wrb-&gt;embedded &amp; cpu_to_le32(MCC_WRB_EMBEDDED_MASK))</div><div class='del'>-		fill_wrb_tags(dest_wrb, (ulong) embedded_payload(wrb));</div><div class='add'>+		fill_wrb_tags(dest_wrb, (ulong)embedded_payload(wrb));</div><div class='ctx'> </div><div class='ctx'> 	return dest_wrb;</div><div class='ctx'> }</div><div class='hunk'>@@ -1050,7 +1047,7 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,</div><div class='ctx'> 	struct be_cmd_req_mac_query *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1079,19 +1076,19 @@ int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Uses synchronous MCCQ */</div><div class='del'>-int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,</div><div class='add'>+int be_cmd_pmac_add(struct be_adapter *adapter, const u8 *mac_addr,</div><div class='ctx'> 		    u32 if_id, u32 *pmac_id, u32 domain)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	struct be_cmd_req_pmac_add *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1116,9 +1113,9 @@ int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='del'>-	 if (base_status(status) == MCC_STATUS_UNAUTHORIZED_REQUEST)</div><div class='add'>+	if (base_status(status) == MCC_STATUS_UNAUTHORIZED_REQUEST)</div><div class='ctx'> 		status = -EPERM;</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -1134,7 +1131,7 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, int pmac_id, u32 dom)</div><div class='ctx'> 	if (pmac_id == -1)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1154,7 +1151,7 @@ int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, int pmac_id, u32 dom)</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1417,7 +1414,7 @@ int be_cmd_rxq_create(struct be_adapter *adapter,</div><div class='ctx'> 	struct be_dma_mem *q_mem = &amp;rxq-&gt;dma_mem;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1447,7 +1444,7 @@ int be_cmd_rxq_create(struct be_adapter *adapter,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1511,7 +1508,7 @@ int be_cmd_rxq_destroy(struct be_adapter *adapter, struct be_queue_info *q)</div><div class='ctx'> 	struct be_cmd_req_q_destroy *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1528,7 +1525,7 @@ int be_cmd_rxq_destroy(struct be_adapter *adapter, struct be_queue_info *q)</div><div class='ctx'> 	q-&gt;created = false;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1596,7 +1593,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)</div><div class='ctx'> 	struct be_cmd_req_hdr *hdr;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1612,7 +1609,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)</div><div class='ctx'> 	/* version 1 of the cmd is not supported only by BE2 */</div><div class='ctx'> 	if (BE2_chip(adapter))</div><div class='ctx'> 		hdr-&gt;version = 0;</div><div class='del'>-	if (BE3_chip(adapter) || lancer_chip(adapter))</div><div class='add'>+	else if (BE3_chip(adapter) || lancer_chip(adapter))</div><div class='ctx'> 		hdr-&gt;version = 1;</div><div class='ctx'> 	else</div><div class='ctx'> 		hdr-&gt;version = 2;</div><div class='hunk'>@@ -1624,7 +1621,7 @@ int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd)</div><div class='ctx'> 	adapter-&gt;stats_cmd_sent = true;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1640,7 +1637,7 @@ int lancer_cmd_get_pport_stats(struct be_adapter *adapter,</div><div class='ctx'> 			    CMD_SUBSYSTEM_ETH))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1663,7 +1660,7 @@ int lancer_cmd_get_pport_stats(struct be_adapter *adapter,</div><div class='ctx'> 	adapter-&gt;stats_cmd_sent = true;</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1700,7 +1697,7 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u16 *link_speed,</div><div class='ctx'> 	struct be_cmd_req_link_status *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (link_status)</div><div class='ctx'> 		*link_status = LINK_DOWN;</div><div class='hunk'>@@ -1739,7 +1736,7 @@ int be_cmd_link_status_query(struct be_adapter *adapter, u16 *link_speed,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1750,7 +1747,7 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)</div><div class='ctx'> 	struct be_cmd_req_get_cntl_addnl_attribs *req;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1765,7 +1762,7 @@ int be_cmd_get_die_temperature(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1807,17 +1804,17 @@ int be_cmd_get_fat_dump(struct be_adapter *adapter, u32 buf_len, void *buf)</div><div class='ctx'> </div><div class='ctx'> 	total_size = buf_len;</div><div class='ctx'> </div><div class='del'>-	get_fat_cmd.size = sizeof(struct be_cmd_req_get_fat) + 60*1024;</div><div class='add'>+	get_fat_cmd.size = sizeof(struct be_cmd_req_get_fat) + 60 * 1024;</div><div class='ctx'> 	get_fat_cmd.va = dma_alloc_coherent(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 					    get_fat_cmd.size,</div><div class='ctx'> 					    &amp;get_fat_cmd.dma, GFP_ATOMIC);</div><div class='ctx'> 	if (!get_fat_cmd.va)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	while (total_size) {</div><div class='del'>-		buf_size = min(total_size, (u32)60*1024);</div><div class='add'>+		buf_size = min(total_size, (u32)60 * 1024);</div><div class='ctx'> 		total_size -= buf_size;</div><div class='ctx'> </div><div class='ctx'> 		wrb = wrb_from_mccq(adapter);</div><div class='hunk'>@@ -1852,9 +1849,9 @@ int be_cmd_get_fat_dump(struct be_adapter *adapter, u32 buf_len, void *buf)</div><div class='ctx'> 		log_offset += buf_size;</div><div class='ctx'> 	}</div><div class='ctx'> err:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	dma_free_coherent(&amp;adapter-&gt;pdev-&gt;dev, get_fat_cmd.size,</div><div class='ctx'> 			  get_fat_cmd.va, get_fat_cmd.dma);</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1865,7 +1862,7 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter)</div><div class='ctx'> 	struct be_cmd_req_get_fw_version *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1882,13 +1879,13 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter)</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb);</div><div class='ctx'> </div><div class='del'>-		strlcpy(adapter-&gt;fw_ver, resp-&gt;firmware_version_string,</div><div class='add'>+		strscpy(adapter-&gt;fw_ver, resp-&gt;firmware_version_string,</div><div class='ctx'> 			sizeof(adapter-&gt;fw_ver));</div><div class='del'>-		strlcpy(adapter-&gt;fw_on_flash, resp-&gt;fw_on_flash_version_string,</div><div class='add'>+		strscpy(adapter-&gt;fw_on_flash, resp-&gt;fw_on_flash_version_string,</div><div class='ctx'> 			sizeof(adapter-&gt;fw_on_flash));</div><div class='ctx'> 	}</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1902,7 +1899,7 @@ static int __be_cmd_modify_eqd(struct be_adapter *adapter,</div><div class='ctx'> 	struct be_cmd_req_modify_eq_delay *req;</div><div class='ctx'> 	int status = 0, i;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1925,7 +1922,7 @@ static int __be_cmd_modify_eqd(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1952,7 +1949,7 @@ int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array,</div><div class='ctx'> 	struct be_cmd_req_vlan_config *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -1974,7 +1971,7 @@ int be_cmd_vlan_config(struct be_adapter *adapter, u32 if_id, u16 *vtag_array,</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1985,7 +1982,7 @@ static int __be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)</div><div class='ctx'> 	struct be_cmd_req_rx_filter *req = mem-&gt;va;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2018,7 +2015,7 @@ static int __be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2049,7 +2046,7 @@ int be_cmd_set_flow_control(struct be_adapter *adapter, u32 tx_fc, u32 rx_fc)</div><div class='ctx'> 			    CMD_SUBSYSTEM_COMMON))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2069,7 +2066,7 @@ int be_cmd_set_flow_control(struct be_adapter *adapter, u32 tx_fc, u32 rx_fc)</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (base_status(status) == MCC_STATUS_FEATURE_NOT_SUPPORTED)</div><div class='ctx'> 		return  -EOPNOTSUPP;</div><div class='hunk'>@@ -2088,7 +2085,7 @@ int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc)</div><div class='ctx'> 			    CMD_SUBSYSTEM_COMMON))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2111,7 +2108,7 @@ int be_cmd_get_flow_control(struct be_adapter *adapter, u32 *tx_fc, u32 *rx_fc)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2192,7 +2189,7 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,</div><div class='ctx'> 	if (!(be_if_cap_flags(adapter) &amp; BE_IF_FLAGS_RSS))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2217,7 +2214,7 @@ int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2229,7 +2226,7 @@ int be_cmd_set_beacon_state(struct be_adapter *adapter, u8 port_num,</div><div class='ctx'> 	struct be_cmd_req_enable_disable_beacon *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2250,7 +2247,7 @@ int be_cmd_set_beacon_state(struct be_adapter *adapter, u8 port_num,</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2261,7 +2258,7 @@ int be_cmd_get_beacon_state(struct be_adapter *adapter, u8 port_num, u32 *state)</div><div class='ctx'> 	struct be_cmd_req_get_beacon_state *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2285,13 +2282,13 @@ int be_cmd_get_beacon_state(struct be_adapter *adapter, u8 port_num, u32 *state)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Uses sync mcc */</div><div class='ctx'> int be_cmd_read_port_transceiver_data(struct be_adapter *adapter,</div><div class='del'>-				      u8 page_num, u8 *data)</div><div class='add'>+				      u8 page_num, u32 off, u32 len, u8 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_dma_mem cmd;</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='hunk'>@@ -2309,7 +2306,7 @@ int be_cmd_read_port_transceiver_data(struct be_adapter *adapter,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2325,13 +2322,13 @@ int be_cmd_read_port_transceiver_data(struct be_adapter *adapter,</div><div class='ctx'> 	req-&gt;port = cpu_to_le32(adapter-&gt;hba_port_num);</div><div class='ctx'> 	req-&gt;page_num = cpu_to_le32(page_num);</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='del'>-	if (!status) {</div><div class='add'>+	if (!status &amp;&amp; len &gt; 0) {</div><div class='ctx'> 		struct be_cmd_resp_port_type *resp = cmd.va;</div><div class='ctx'> </div><div class='del'>-		memcpy(data, resp-&gt;page_data, PAGE_DATA_LEN);</div><div class='add'>+		memcpy(data, resp-&gt;page_data + off, len);</div><div class='ctx'> 	}</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	dma_free_coherent(&amp;adapter-&gt;pdev-&gt;dev, cmd.size, cmd.va, cmd.dma);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='hunk'>@@ -2348,7 +2345,7 @@ static int lancer_cmd_write_object(struct be_adapter *adapter,</div><div class='ctx'> 	void *ctxt = NULL;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	adapter-&gt;flash_status = 0;</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='hunk'>@@ -2377,7 +2374,7 @@ static int lancer_cmd_write_object(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	be_dws_cpu_to_le(ctxt, sizeof(req-&gt;context));</div><div class='ctx'> 	req-&gt;write_offset = cpu_to_le32(data_offset);</div><div class='del'>-	strlcpy(req-&gt;object_name, obj_name, sizeof(req-&gt;object_name));</div><div class='add'>+	strscpy(req-&gt;object_name, obj_name, sizeof(req-&gt;object_name));</div><div class='ctx'> 	req-&gt;descriptor_count = cpu_to_le32(1);</div><div class='ctx'> 	req-&gt;buf_len = cpu_to_le32(data_size);</div><div class='ctx'> 	req-&gt;addr_low = cpu_to_le32((cmd-&gt;dma +</div><div class='hunk'>@@ -2390,7 +2387,7 @@ static int lancer_cmd_write_object(struct be_adapter *adapter,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_for_completion_timeout(&amp;adapter-&gt;et_cmd_compl,</div><div class='ctx'> 					 msecs_to_jiffies(60000)))</div><div class='hunk'>@@ -2409,7 +2406,7 @@ static int lancer_cmd_write_object(struct be_adapter *adapter,</div><div class='ctx'> 	return status;</div><div class='ctx'> </div><div class='ctx'> err_unlock:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2419,7 +2416,7 @@ int be_cmd_query_cable_type(struct be_adapter *adapter)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	status = be_cmd_read_port_transceiver_data(adapter, TR_PAGE_A0,</div><div class='del'>-						   page_data);</div><div class='add'>+						   0, PAGE_DATA_LEN, page_data);</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		switch (adapter-&gt;phy.interface_type) {</div><div class='ctx'> 		case PHY_TYPE_QSFP:</div><div class='hunk'>@@ -2444,11 +2441,11 @@ int be_cmd_query_sfp_info(struct be_adapter *adapter)</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='ctx'> 	status = be_cmd_read_port_transceiver_data(adapter, TR_PAGE_A0,</div><div class='del'>-						   page_data);</div><div class='add'>+						   0, PAGE_DATA_LEN, page_data);</div><div class='ctx'> 	if (!status) {</div><div class='del'>-		strlcpy(adapter-&gt;phy.vendor_name, page_data +</div><div class='add'>+		strscpy(adapter-&gt;phy.vendor_name, page_data +</div><div class='ctx'> 			SFP_VENDOR_NAME_OFFSET, SFP_VENDOR_NAME_LEN - 1);</div><div class='del'>-		strlcpy(adapter-&gt;phy.vendor_pn,</div><div class='add'>+		strscpy(adapter-&gt;phy.vendor_pn,</div><div class='ctx'> 			page_data + SFP_VENDOR_PN_OFFSET,</div><div class='ctx'> 			SFP_VENDOR_NAME_LEN - 1);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2463,7 +2460,7 @@ static int lancer_cmd_delete_object(struct be_adapter *adapter,</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2477,11 +2474,11 @@ static int lancer_cmd_delete_object(struct be_adapter *adapter,</div><div class='ctx'> 			       OPCODE_COMMON_DELETE_OBJECT,</div><div class='ctx'> 			       sizeof(*req), wrb, NULL);</div><div class='ctx'> </div><div class='del'>-	strlcpy(req-&gt;object_name, obj_name, sizeof(req-&gt;object_name));</div><div class='add'>+	strscpy(req-&gt;object_name, obj_name, sizeof(req-&gt;object_name));</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2494,7 +2491,7 @@ int lancer_cmd_read_object(struct be_adapter *adapter, struct be_dma_mem *cmd,</div><div class='ctx'> 	struct lancer_cmd_resp_read_object *resp;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2528,7 +2525,7 @@ int lancer_cmd_read_object(struct be_adapter *adapter, struct be_dma_mem *cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err_unlock:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2540,7 +2537,7 @@ static int be_cmd_write_flashrom(struct be_adapter *adapter,</div><div class='ctx'> 	struct be_cmd_write_flashrom *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	adapter-&gt;flash_status = 0;</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='hunk'>@@ -2565,7 +2562,7 @@ static int be_cmd_write_flashrom(struct be_adapter *adapter,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_for_completion_timeout(&amp;adapter-&gt;et_cmd_compl,</div><div class='ctx'> 					 msecs_to_jiffies(40000)))</div><div class='hunk'>@@ -2576,7 +2573,7 @@ static int be_cmd_write_flashrom(struct be_adapter *adapter,</div><div class='ctx'> 	return status;</div><div class='ctx'> </div><div class='ctx'> err_unlock:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2587,7 +2584,7 @@ static int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -2614,11 +2611,15 @@ static int be_cmd_get_flash_crc(struct be_adapter *adapter, u8 *flashed_crc,</div><div class='ctx'> 		memcpy(flashed_crc, req-&gt;crc, 4);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static char flash_cookie[2][16] = {"*** SE FLAS", "H DIRECTORY *** "};</div><div class='add'>+/*</div><div class='add'>+ * Since the cookie is text, add a parsing-skipped space to keep it from</div><div class='add'>+ * ever being matched on storage holding this source file.</div><div class='add'>+ */</div><div class='add'>+static const char flash_cookie[32] __nonstring = "*** SE FLAS" "H DIRECTORY *** ";</div><div class='ctx'> </div><div class='ctx'> static bool phy_flashing_required(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='hunk'>@@ -2762,7 +2763,7 @@ static int be_flash_BEx(struct be_adapter *adapter,</div><div class='ctx'> 	bool crc_match;</div><div class='ctx'> 	const u8 *p;</div><div class='ctx'> </div><div class='del'>-	struct flash_comp gen3_flash_types[] = {</div><div class='add'>+	static const struct flash_comp gen3_flash_types[] = {</div><div class='ctx'> 		{ BE3_ISCSI_PRIMARY_IMAGE_START, OPTYPE_ISCSI_ACTIVE,</div><div class='ctx'> 			BE3_COMP_MAX_SIZE, IMAGE_FIRMWARE_ISCSI},</div><div class='ctx'> 		{ BE3_REDBOOT_START, OPTYPE_REDBOOT,</div><div class='hunk'>@@ -2785,7 +2786,7 @@ static int be_flash_BEx(struct be_adapter *adapter,</div><div class='ctx'> 			BE3_PHY_FW_COMP_MAX_SIZE, IMAGE_FIRMWARE_PHY}</div><div class='ctx'> 	};</div><div class='ctx'> </div><div class='del'>-	struct flash_comp gen2_flash_types[] = {</div><div class='add'>+	static const struct flash_comp gen2_flash_types[] = {</div><div class='ctx'> 		{ BE2_ISCSI_PRIMARY_IMAGE_START, OPTYPE_ISCSI_ACTIVE,</div><div class='ctx'> 			BE2_COMP_MAX_SIZE, IMAGE_FIRMWARE_ISCSI},</div><div class='ctx'> 		{ BE2_REDBOOT_START, OPTYPE_REDBOOT,</div><div class='hunk'>@@ -3220,7 +3221,7 @@ int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,</div><div class='ctx'> 	struct be_cmd_req_acpi_wol_magic_config *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3237,7 +3238,7 @@ int be_cmd_enable_magic_wol(struct be_adapter *adapter, u8 *mac,</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3252,7 +3253,7 @@ int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,</div><div class='ctx'> 			    CMD_SUBSYSTEM_LOWLEVEL))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3275,7 +3276,7 @@ int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto err_unlock;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	if (!wait_for_completion_timeout(&amp;adapter-&gt;et_cmd_compl,</div><div class='ctx'> 					 msecs_to_jiffies(SET_LB_MODE_TIMEOUT)))</div><div class='hunk'>@@ -3284,7 +3285,7 @@ int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,</div><div class='ctx'> 	return status;</div><div class='ctx'> </div><div class='ctx'> err_unlock:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3301,7 +3302,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,</div><div class='ctx'> 			    CMD_SUBSYSTEM_LOWLEVEL))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3327,7 +3328,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto err;</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wait_for_completion(&amp;adapter-&gt;et_cmd_compl);</div><div class='ctx'> 	resp = embedded_payload(wrb);</div><div class='hunk'>@@ -3335,7 +3336,7 @@ int be_cmd_loopback_test(struct be_adapter *adapter, u32 port_num,</div><div class='ctx'> </div><div class='ctx'> 	return status;</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3351,7 +3352,7 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,</div><div class='ctx'> 			    CMD_SUBSYSTEM_LOWLEVEL))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3366,7 +3367,7 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,</div><div class='ctx'> 	req-&gt;pattern = cpu_to_le64(pattern);</div><div class='ctx'> 	req-&gt;byte_count = cpu_to_le32(byte_cnt);</div><div class='ctx'> 	for (i = 0; i &lt; byte_cnt; i++) {</div><div class='del'>-		req-&gt;snd_buff[i] = (u8)(pattern &gt;&gt; (j*8));</div><div class='add'>+		req-&gt;snd_buff[i] = (u8)(pattern &gt;&gt; (j * 8));</div><div class='ctx'> 		j++;</div><div class='ctx'> 		if (j &gt; 7)</div><div class='ctx'> 			j = 0;</div><div class='hunk'>@@ -3385,7 +3386,7 @@ int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3396,7 +3397,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,</div><div class='ctx'> 	struct be_cmd_req_seeprom_read *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3412,7 +3413,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter,</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3427,7 +3428,7 @@ int be_cmd_get_phy_info(struct be_adapter *adapter)</div><div class='ctx'> 			    CMD_SUBSYSTEM_COMMON))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3472,7 +3473,7 @@ int be_cmd_get_phy_info(struct be_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> 	dma_free_coherent(&amp;adapter-&gt;pdev-&gt;dev, cmd.size, cmd.va, cmd.dma);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3482,7 +3483,7 @@ static int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain)</div><div class='ctx'> 	struct be_cmd_req_set_qos *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3502,7 +3503,7 @@ static int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain)</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3614,7 +3615,7 @@ int be_cmd_get_fn_privileges(struct be_adapter *adapter, u32 *privilege,</div><div class='ctx'> 	struct be_cmd_req_get_fn_privileges *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3646,7 +3647,7 @@ int be_cmd_get_fn_privileges(struct be_adapter *adapter, u32 *privilege,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3658,7 +3659,7 @@ int be_cmd_set_fn_privileges(struct be_adapter *adapter, u32 privileges,</div><div class='ctx'> 	struct be_cmd_req_set_fn_privileges *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3678,7 +3679,7 @@ int be_cmd_set_fn_privileges(struct be_adapter *adapter, u32 privileges,</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3710,7 +3711,7 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3774,7 +3775,7 @@ int be_cmd_get_mac_from_list(struct be_adapter *adapter, u8 *mac,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	dma_free_coherent(&amp;adapter-&gt;pdev-&gt;dev, get_mac_list_cmd.size,</div><div class='ctx'> 			  get_mac_list_cmd.va, get_mac_list_cmd.dma);</div><div class='ctx'> 	return status;</div><div class='hunk'>@@ -3834,7 +3835,7 @@ int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,</div><div class='ctx'> 	if (!cmd.va)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3850,13 +3851,13 @@ int be_cmd_set_mac_list(struct be_adapter *adapter, u8 *mac_array,</div><div class='ctx'> 	req-&gt;hdr.domain = domain;</div><div class='ctx'> 	req-&gt;mac_count = mac_count;</div><div class='ctx'> 	if (mac_count)</div><div class='del'>-		memcpy(req-&gt;mac, mac_array, ETH_ALEN*mac_count);</div><div class='add'>+		memcpy(req-&gt;mac, mac_array, ETH_ALEN * mac_count);</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	dma_free_coherent(&amp;adapter-&gt;pdev-&gt;dev, cmd.size, cmd.va, cmd.dma);</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3892,7 +3893,7 @@ int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,</div><div class='ctx'> 			    CMD_SUBSYSTEM_COMMON))</div><div class='ctx'> 		return -EPERM;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3933,7 +3934,7 @@ int be_cmd_set_hsw_config(struct be_adapter *adapter, u16 pvid,</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -3947,7 +3948,7 @@ int be_cmd_get_hsw_config(struct be_adapter *adapter, u16 *pvid,</div><div class='ctx'> 	int status;</div><div class='ctx'> 	u16 vid;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -3994,7 +3995,7 @@ int be_cmd_get_hsw_config(struct be_adapter *adapter, u16 *pvid,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4193,7 +4194,7 @@ int be_cmd_set_ext_fat_capabilites(struct be_adapter *adapter,</div><div class='ctx'> 	struct be_cmd_req_set_ext_fat_caps *req;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -4209,7 +4210,7 @@ int be_cmd_set_ext_fat_capabilites(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4687,7 +4688,7 @@ int be_cmd_manage_iface(struct be_adapter *adapter, u32 iface, u8 op)</div><div class='ctx'> 	if (iface == 0xFFFFFFFF)</div><div class='ctx'> 		return -1;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -4704,7 +4705,7 @@ int be_cmd_manage_iface(struct be_adapter *adapter, u32 iface, u8 op)</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4738,7 +4739,7 @@ int be_cmd_get_if_id(struct be_adapter *adapter, struct be_vf_cfg *vf_cfg,</div><div class='ctx'> 	struct be_cmd_resp_get_iface_list *resp;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -4759,7 +4760,7 @@ int be_cmd_get_if_id(struct be_adapter *adapter, struct be_vf_cfg *vf_cfg,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4853,7 +4854,7 @@ int be_cmd_enable_vf(struct be_adapter *adapter, u8 domain)</div><div class='ctx'> 	if (BEx_chip(adapter))</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -4871,7 +4872,7 @@ int be_cmd_enable_vf(struct be_adapter *adapter, u8 domain)</div><div class='ctx'> 	req-&gt;enable = 1;</div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -4944,7 +4945,7 @@ __be_cmd_set_logical_link_config(struct be_adapter *adapter,</div><div class='ctx'> 	u32 link_config = 0;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -4972,7 +4973,7 @@ __be_cmd_set_logical_link_config(struct be_adapter *adapter,</div><div class='ctx'> </div><div class='ctx'> 	status = be_mcc_notify_wait(adapter);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5003,8 +5004,7 @@ int be_cmd_set_features(struct be_adapter *adapter)</div><div class='ctx'> 	struct be_mcc_wrb *wrb;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (mutex_lock_interruptible(&amp;adapter-&gt;mcc_lock))</div><div class='del'>-		return -1;</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -5042,7 +5042,7 @@ err:</div><div class='ctx'> 		dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='ctx'> 			 "Adapter does not support HW error recovery\n");</div><div class='ctx'> </div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -5056,7 +5056,7 @@ int be_roce_mcc_cmd(void *netdev_handle, void *wrb_payload,</div><div class='ctx'> 	struct be_cmd_resp_hdr *resp;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	mutex_lock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_lock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> </div><div class='ctx'> 	wrb = wrb_from_mccq(adapter);</div><div class='ctx'> 	if (!wrb) {</div><div class='hunk'>@@ -5079,7 +5079,7 @@ int be_roce_mcc_cmd(void *netdev_handle, void *wrb_payload,</div><div class='ctx'> 	memcpy(wrb_payload, resp, sizeof(*resp) + resp-&gt;response_length);</div><div class='ctx'> 	be_dws_le_to_cpu(wrb_payload, sizeof(*resp) + resp-&gt;response_length);</div><div class='ctx'> err:</div><div class='del'>-	mutex_unlock(&amp;adapter-&gt;mcc_lock);</div><div class='add'>+	spin_unlock_bh(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> EXPORT_SYMBOL(be_roce_mcc_cmd);</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h<br/>index e8b43cf44b6f..5e2d3ddb5d43 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_cmds.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_cmds.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_cmds.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.  The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -1419,7 +1415,7 @@ struct flash_section_entry {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> struct flash_section_info {</div><div class='del'>-	u8 cookie[32];</div><div class='add'>+	u8 cookie[32] __nonstring;</div><div class='ctx'> 	struct flash_section_hdr fsec_hdr;</div><div class='ctx'> 	struct flash_section_entry fsec_entry[32];</div><div class='ctx'> } __packed;</div><div class='hunk'>@@ -2385,11 +2381,10 @@ struct be_cmd_req_manage_iface_filters {</div><div class='ctx'> } __packed;</div><div class='ctx'> </div><div class='ctx'> u16 be_POST_stage_get(struct be_adapter *adapter);</div><div class='del'>-int be_pci_fnum_get(struct be_adapter *adapter);</div><div class='ctx'> int be_fw_wait_ready(struct be_adapter *adapter);</div><div class='ctx'> int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,</div><div class='ctx'> 			  bool permanent, u32 if_handle, u32 pmac_id);</div><div class='del'>-int be_cmd_pmac_add(struct be_adapter *adapter, u8 *mac_addr, u32 if_id,</div><div class='add'>+int be_cmd_pmac_add(struct be_adapter *adapter, const u8 *mac_addr, u32 if_id,</div><div class='ctx'> 		    u32 *pmac_id, u32 domain);</div><div class='ctx'> int be_cmd_pmac_del(struct be_adapter *adapter, u32 if_id, int pmac_id,</div><div class='ctx'> 		    u32 domain);</div><div class='hunk'>@@ -2410,7 +2405,6 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,</div><div class='ctx'> int be_cmd_rxq_destroy(struct be_adapter *adapter, struct be_queue_info *q);</div><div class='ctx'> int be_cmd_link_status_query(struct be_adapter *adapter, u16 *link_speed,</div><div class='ctx'> 			     u8 *link_status, u32 dom);</div><div class='del'>-int be_cmd_reset(struct be_adapter *adapter);</div><div class='ctx'> int be_cmd_get_stats(struct be_adapter *adapter, struct be_dma_mem *nonemb_cmd);</div><div class='ctx'> int lancer_cmd_get_pport_stats(struct be_adapter *adapter,</div><div class='ctx'> 			       struct be_dma_mem *nonemb_cmd);</div><div class='hunk'>@@ -2431,7 +2425,7 @@ int be_cmd_set_beacon_state(struct be_adapter *adapter, u8 port_num, u8 beacon,</div><div class='ctx'> int be_cmd_get_beacon_state(struct be_adapter *adapter, u8 port_num,</div><div class='ctx'> 			    u32 *state);</div><div class='ctx'> int be_cmd_read_port_transceiver_data(struct be_adapter *adapter,</div><div class='del'>-				      u8 page_num, u8 *data);</div><div class='add'>+				      u8 page_num, u32 off, u32 len, u8 *data);</div><div class='ctx'> int be_cmd_query_cable_type(struct be_adapter *adapter);</div><div class='ctx'> int be_cmd_query_sfp_info(struct be_adapter *adapter);</div><div class='ctx'> int lancer_cmd_read_object(struct be_adapter *adapter, struct be_dma_mem *cmd,</div><div class='hunk'>@@ -2492,7 +2486,6 @@ int lancer_physdev_ctrl(struct be_adapter *adapter, u32 mask);</div><div class='ctx'> int lancer_initiate_dump(struct be_adapter *adapter);</div><div class='ctx'> int lancer_delete_dump(struct be_adapter *adapter);</div><div class='ctx'> bool dump_present(struct be_adapter *adapter);</div><div class='del'>-int lancer_test_and_set_rdy_state(struct be_adapter *adapter);</div><div class='ctx'> int be_cmd_query_port_name(struct be_adapter *adapter);</div><div class='ctx'> int be_cmd_get_func_config(struct be_adapter *adapter,</div><div class='ctx'> 			   struct be_resources *res);</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c<br/>index 4c218341c51b..f9216326bdfe 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_ethtool.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.  The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -27,7 +23,7 @@ struct be_ethtool_stat {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> enum {DRVSTAT_TX, DRVSTAT_RX, DRVSTAT};</div><div class='del'>-#define FIELDINFO(_struct, field) FIELD_SIZEOF(_struct, field), \</div><div class='add'>+#define FIELDINFO(_struct, field) sizeof_field(_struct, field), \</div><div class='ctx'> 					offsetof(_struct, field)</div><div class='ctx'> #define DRVSTAT_TX_INFO(field)	#field, DRVSTAT_TX,\</div><div class='ctx'> 					FIELDINFO(struct be_tx_stats, field)</div><div class='hunk'>@@ -224,16 +220,15 @@ static void be_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='del'>-	strlcpy(drvinfo-&gt;version, DRV_VER, sizeof(drvinfo-&gt;version));</div><div class='add'>+	strscpy(drvinfo-&gt;driver, DRV_NAME, sizeof(drvinfo-&gt;driver));</div><div class='ctx'> 	if (!memcmp(adapter-&gt;fw_ver, adapter-&gt;fw_on_flash, FW_VER_LEN))</div><div class='del'>-		strlcpy(drvinfo-&gt;fw_version, adapter-&gt;fw_ver,</div><div class='add'>+		strscpy(drvinfo-&gt;fw_version, adapter-&gt;fw_ver,</div><div class='ctx'> 			sizeof(drvinfo-&gt;fw_version));</div><div class='ctx'> 	else</div><div class='ctx'> 		snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='ctx'> 			 "%s [%s]", adapter-&gt;fw_ver, adapter-&gt;fw_on_flash);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, pci_name(adapter-&gt;pdev),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -320,7 +315,9 @@ static int be_read_dump_data(struct be_adapter *adapter, u32 dump_len,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int be_get_coalesce(struct net_device *netdev,</div><div class='del'>-			   struct ethtool_coalesce *et)</div><div class='add'>+			   struct ethtool_coalesce *et,</div><div class='add'>+			   struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct be_aic_obj *aic = &amp;adapter-&gt;aic_obj[0];</div><div class='hunk'>@@ -333,8 +330,8 @@ static int be_get_coalesce(struct net_device *netdev,</div><div class='ctx'> 	et-&gt;tx_coalesce_usecs_high = aic-&gt;max_eqd;</div><div class='ctx'> 	et-&gt;tx_coalesce_usecs_low = aic-&gt;min_eqd;</div><div class='ctx'> </div><div class='del'>-	et-&gt;use_adaptive_rx_coalesce = aic-&gt;enable;</div><div class='del'>-	et-&gt;use_adaptive_tx_coalesce = aic-&gt;enable;</div><div class='add'>+	et-&gt;use_adaptive_rx_coalesce = adapter-&gt;aic_enabled;</div><div class='add'>+	et-&gt;use_adaptive_tx_coalesce = adapter-&gt;aic_enabled;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -343,15 +340,18 @@ static int be_get_coalesce(struct net_device *netdev,</div><div class='ctx'>  * eqd cmd is issued in the worker thread.</div><div class='ctx'>  */</div><div class='ctx'> static int be_set_coalesce(struct net_device *netdev,</div><div class='del'>-			   struct ethtool_coalesce *et)</div><div class='add'>+			   struct ethtool_coalesce *et,</div><div class='add'>+			   struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct be_aic_obj *aic = &amp;adapter-&gt;aic_obj[0];</div><div class='ctx'> 	struct be_eq_obj *eqo;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;aic_enabled = et-&gt;use_adaptive_rx_coalesce;</div><div class='add'>+</div><div class='ctx'> 	for_all_evt_queues(adapter, eqo, i) {</div><div class='del'>-		aic-&gt;enable = et-&gt;use_adaptive_rx_coalesce;</div><div class='ctx'> 		aic-&gt;max_eqd = min(et-&gt;rx_coalesce_usecs_high, BE_MAX_EQD);</div><div class='ctx'> 		aic-&gt;min_eqd = min(et-&gt;rx_coalesce_usecs_low, aic-&gt;max_eqd);</div><div class='ctx'> 		aic-&gt;et_eqd = min(et-&gt;rx_coalesce_usecs, aic-&gt;max_eqd);</div><div class='hunk'>@@ -389,10 +389,10 @@ static void be_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 		struct be_rx_stats *stats = rx_stats(rxo);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;stats-&gt;sync);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;stats-&gt;sync);</div><div class='ctx'> 			data[base] = stats-&gt;rx_bytes;</div><div class='ctx'> 			data[base + 1] = stats-&gt;rx_pkts;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;stats-&gt;sync, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;stats-&gt;sync, start));</div><div class='ctx'> </div><div class='ctx'> 		for (i = 2; i &lt; ETHTOOL_RXSTATS_NUM; i++) {</div><div class='ctx'> 			p = (u8 *)stats + et_rx_stats[i].offset;</div><div class='hunk'>@@ -405,19 +405,19 @@ static void be_get_ethtool_stats(struct net_device *netdev,</div><div class='ctx'> 		struct be_tx_stats *stats = tx_stats(txo);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;stats-&gt;sync_compl);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;stats-&gt;sync_compl);</div><div class='ctx'> 			data[base] = stats-&gt;tx_compl;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;stats-&gt;sync_compl, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;stats-&gt;sync_compl, start));</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;stats-&gt;sync);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;stats-&gt;sync);</div><div class='ctx'> 			for (i = 1; i &lt; ETHTOOL_TXSTATS_NUM; i++) {</div><div class='ctx'> 				p = (u8 *)stats + et_tx_stats[i].offset;</div><div class='ctx'> 				data[base + i] =</div><div class='ctx'> 					(et_tx_stats[i].size == sizeof(u64)) ?</div><div class='ctx'> 						*(u64 *)p : *(u32 *)p;</div><div class='ctx'> 			}</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;stats-&gt;sync, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;stats-&gt;sync, start));</div><div class='ctx'> 		base += ETHTOOL_TXSTATS_NUM;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -575,7 +575,7 @@ static u32 convert_to_et_setting(struct be_adapter *adapter, u32 if_speeds)</div><div class='ctx'> 				break;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case PHY_TYPE_SFP_PLUS_10GB:</div><div class='ctx'> 	case PHY_TYPE_XFP_10GB:</div><div class='ctx'> 	case PHY_TYPE_SFP_1GB:</div><div class='hunk'>@@ -683,7 +683,9 @@ static int be_get_link_ksettings(struct net_device *netdev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void be_get_ringparam(struct net_device *netdev,</div><div class='del'>-			     struct ethtool_ringparam *ring)</div><div class='add'>+			     struct ethtool_ringparam *ring,</div><div class='add'>+			     struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -895,7 +897,7 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,</div><div class='ctx'> 			 u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	int status;</div><div class='add'>+	int status, cnt;</div><div class='ctx'> 	u8 link_status = 0;</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;function_caps &amp; BE_FUNCTION_CAPS_SUPER_NIC) {</div><div class='hunk'>@@ -906,6 +908,9 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,</div><div class='ctx'> </div><div class='ctx'> 	memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM);</div><div class='ctx'> </div><div class='add'>+	/* check link status before offline tests */</div><div class='add'>+	link_status = netif_carrier_ok(netdev);</div><div class='add'>+</div><div class='ctx'> 	if (test-&gt;flags &amp; ETH_TEST_FL_OFFLINE) {</div><div class='ctx'> 		if (be_loopback_test(adapter, BE_MAC_LOOPBACK, &amp;data[0]) != 0)</div><div class='ctx'> 			test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='hunk'>@@ -926,13 +931,26 @@ static void be_self_test(struct net_device *netdev, struct ethtool_test *test,</div><div class='ctx'> 		test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = be_cmd_link_status_query(adapter, NULL, &amp;link_status, 0);</div><div class='del'>-	if (status) {</div><div class='del'>-		test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='del'>-		data[4] = -1;</div><div class='del'>-	} else if (!link_status) {</div><div class='add'>+	/* link status was down prior to test */</div><div class='add'>+	if (!link_status) {</div><div class='ctx'> 		test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='ctx'> 		data[4] = 1;</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (cnt = 10; cnt; cnt--) {</div><div class='add'>+		status = be_cmd_link_status_query(adapter, NULL, &amp;link_status,</div><div class='add'>+						  0);</div><div class='add'>+		if (status) {</div><div class='add'>+			test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+			data[4] = -1;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (link_status)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		msleep_interruptible(500);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1055,10 +1073,19 @@ static void be_set_msg_level(struct net_device *netdev, u32 level)</div><div class='ctx'> 	adapter-&gt;msg_enable = level;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type)</div><div class='add'>+static int be_get_rxfh_fields(struct net_device *netdev,</div><div class='add'>+			      struct ethtool_rxfh_fields *cmd)</div><div class='ctx'> {</div><div class='add'>+	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u64 flow_type = cmd-&gt;flow_type;</div><div class='ctx'> 	u64 data = 0;</div><div class='ctx'> </div><div class='add'>+	if (!be_multi_rxq(adapter)) {</div><div class='add'>+		dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			 "ethtool::get_rxfh: RX flow hashing is disabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (flow_type) {</div><div class='ctx'> 	case TCP_V4_FLOW:</div><div class='ctx'> 		if (adapter-&gt;rss_info.rss_flags &amp; RSS_ENABLE_IPV4)</div><div class='hunk'>@@ -1086,7 +1113,8 @@ static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type)</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return data;</div><div class='add'>+	cmd-&gt;data = data;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,</div><div class='hunk'>@@ -1101,11 +1129,8 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	switch (cmd-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		cmd-&gt;data = be_get_rss_hash_opts(adapter, cmd-&gt;flow_type);</div><div class='del'>-		break;</div><div class='ctx'> 	case ETHTOOL_GRXRINGS:</div><div class='del'>-		cmd-&gt;data = adapter-&gt;num_rx_qs - 1;</div><div class='add'>+		cmd-&gt;data = adapter-&gt;num_rx_qs;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1114,11 +1139,19 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_set_rss_hash_opts(struct be_adapter *adapter,</div><div class='del'>-				struct ethtool_rxnfc *cmd)</div><div class='add'>+static int be_set_rxfh_fields(struct net_device *netdev,</div><div class='add'>+			      const struct ethtool_rxfh_fields *cmd,</div><div class='add'>+			      struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='del'>-	int status;</div><div class='add'>+	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	u32 rss_flags = adapter-&gt;rss_info.rss_flags;</div><div class='add'>+	int status;</div><div class='add'>+</div><div class='add'>+	if (!be_multi_rxq(adapter)) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"ethtool::set_rxfh: RX flow hashing is disabled\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cmd-&gt;data != L3_RSS_FLAGS &amp;&amp;</div><div class='ctx'> 	    cmd-&gt;data != (L3_RSS_FLAGS | L4_RSS_FLAGS))</div><div class='hunk'>@@ -1177,28 +1210,6 @@ static int be_set_rss_hash_opts(struct be_adapter *adapter,</div><div class='ctx'> 	return be_cmd_status(status);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)</div><div class='del'>-{</div><div class='del'>-	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	int status = 0;</div><div class='del'>-</div><div class='del'>-	if (!be_multi_rxq(adapter)) {</div><div class='del'>-		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-			"ethtool::set_rxnfc: RX flow hashing is disabled\n");</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (cmd-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		status = be_set_rss_hash_opts(adapter, cmd);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return -EINVAL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void be_get_channels(struct net_device *netdev,</div><div class='ctx'> 			    struct ethtool_channels *ch)</div><div class='ctx'> {</div><div class='hunk'>@@ -1253,43 +1264,45 @@ static u32 be_get_rxfh_key_size(struct net_device *netdev)</div><div class='ctx'> 	return RSS_HASH_KEY_LEN;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_get_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey,</div><div class='del'>-		       u8 *hfunc)</div><div class='add'>+static int be_get_rxfh(struct net_device *netdev,</div><div class='add'>+		       struct ethtool_rxfh_param *rxfh)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct rss_info *rss = &amp;adapter-&gt;rss_info;</div><div class='ctx'> </div><div class='del'>-	if (indir) {</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='ctx'> 		for (i = 0; i &lt; RSS_INDIR_TABLE_LEN; i++)</div><div class='del'>-			indir[i] = rss-&gt;rss_queue[i];</div><div class='add'>+			rxfh-&gt;indir[i] = rss-&gt;rss_queue[i];</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (hkey)</div><div class='del'>-		memcpy(hkey, rss-&gt;rss_hkey, RSS_HASH_KEY_LEN);</div><div class='add'>+	if (rxfh-&gt;key)</div><div class='add'>+		memcpy(rxfh-&gt;key, rss-&gt;rss_hkey, RSS_HASH_KEY_LEN);</div><div class='ctx'> </div><div class='del'>-	if (hfunc)</div><div class='del'>-		*hfunc = ETH_RSS_HASH_TOP;</div><div class='add'>+	rxfh-&gt;hfunc = ETH_RSS_HASH_TOP;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_set_rxfh(struct net_device *netdev, const u32 *indir,</div><div class='del'>-		       const u8 *hkey, const u8 hfunc)</div><div class='add'>+static int be_set_rxfh(struct net_device *netdev,</div><div class='add'>+		       struct ethtool_rxfh_param *rxfh,</div><div class='add'>+		       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int rc = 0, i, j;</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u8 *hkey = rxfh-&gt;key;</div><div class='ctx'> 	u8 rsstable[RSS_INDIR_TABLE_LEN];</div><div class='ctx'> </div><div class='ctx'> 	/* We do not allow change in unsupported parameters */</div><div class='del'>-	if (hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp; hfunc != ETH_RSS_HASH_TOP)</div><div class='add'>+	if (rxfh-&gt;hfunc != ETH_RSS_HASH_NO_CHANGE &amp;&amp;</div><div class='add'>+	    rxfh-&gt;hfunc != ETH_RSS_HASH_TOP)</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	if (indir) {</div><div class='add'>+	if (rxfh-&gt;indir) {</div><div class='ctx'> 		struct be_rx_obj *rxo;</div><div class='ctx'> </div><div class='ctx'> 		for (i = 0; i &lt; RSS_INDIR_TABLE_LEN; i++) {</div><div class='del'>-			j = indir[i];</div><div class='add'>+			j = rxfh-&gt;indir[i];</div><div class='ctx'> 			rxo = &amp;adapter-&gt;rx_obj[j];</div><div class='ctx'> 			rsstable[i] = rxo-&gt;rss_id;</div><div class='ctx'> 			adapter-&gt;rss_info.rss_queue[i] = j;</div><div class='hunk'>@@ -1326,7 +1339,7 @@ static int be_get_module_info(struct net_device *netdev,</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='ctx'> 	status = be_cmd_read_port_transceiver_data(adapter, TR_PAGE_A0,</div><div class='del'>-						   page_data);</div><div class='add'>+						   0, PAGE_DATA_LEN, page_data);</div><div class='ctx'> 	if (!status) {</div><div class='ctx'> 		if (!page_data[SFP_PLUS_SFF_8472_COMP]) {</div><div class='ctx'> 			modinfo-&gt;type = ETH_MODULE_SFF_8079;</div><div class='hunk'>@@ -1344,25 +1357,32 @@ static int be_get_module_eeprom(struct net_device *netdev,</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	int status;</div><div class='add'>+	u32 begin, end;</div><div class='ctx'> </div><div class='ctx'> 	if (!check_privilege(adapter, MAX_PRIVILEGES))</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	status = be_cmd_read_port_transceiver_data(adapter, TR_PAGE_A0,</div><div class='del'>-						   data);</div><div class='del'>-	if (status)</div><div class='del'>-		goto err;</div><div class='add'>+	begin = eeprom-&gt;offset;</div><div class='add'>+	end = eeprom-&gt;offset + eeprom-&gt;len;</div><div class='add'>+</div><div class='add'>+	if (begin &lt; PAGE_DATA_LEN) {</div><div class='add'>+		status = be_cmd_read_port_transceiver_data(adapter, TR_PAGE_A0, begin,</div><div class='add'>+							   min_t(u32, end, PAGE_DATA_LEN) - begin,</div><div class='add'>+							   data);</div><div class='add'>+		if (status)</div><div class='add'>+			goto err;</div><div class='add'>+</div><div class='add'>+		data += PAGE_DATA_LEN - begin;</div><div class='add'>+		begin = PAGE_DATA_LEN;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (eeprom-&gt;offset + eeprom-&gt;len &gt; PAGE_DATA_LEN) {</div><div class='del'>-		status = be_cmd_read_port_transceiver_data(adapter,</div><div class='del'>-							   TR_PAGE_A2,</div><div class='del'>-							   data +</div><div class='del'>-							   PAGE_DATA_LEN);</div><div class='add'>+	if (end &gt; PAGE_DATA_LEN) {</div><div class='add'>+		status = be_cmd_read_port_transceiver_data(adapter, TR_PAGE_A2,</div><div class='add'>+							   begin - PAGE_DATA_LEN,</div><div class='add'>+							   end - begin, data);</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto err;</div><div class='ctx'> 	}</div><div class='del'>-	if (eeprom-&gt;offset)</div><div class='del'>-		memcpy(data, data + eeprom-&gt;offset, eeprom-&gt;len);</div><div class='ctx'> err:</div><div class='ctx'> 	return be_cmd_status(status);</div><div class='ctx'> }</div><div class='hunk'>@@ -1396,6 +1416,9 @@ static int be_set_priv_flags(struct net_device *netdev, u32 flags)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> const struct ethtool_ops be_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE |</div><div class='add'>+				     ETHTOOL_COALESCE_USECS_LOW_HIGH,</div><div class='ctx'> 	.get_drvinfo = be_get_drvinfo,</div><div class='ctx'> 	.get_wol = be_get_wol,</div><div class='ctx'> 	.set_wol = be_set_wol,</div><div class='hunk'>@@ -1419,7 +1442,8 @@ const struct ethtool_ops be_ethtool_ops = {</div><div class='ctx'> 	.flash_device = be_do_flash,</div><div class='ctx'> 	.self_test = be_self_test,</div><div class='ctx'> 	.get_rxnfc = be_get_rxnfc,</div><div class='del'>-	.set_rxnfc = be_set_rxnfc,</div><div class='add'>+	.get_rxfh_fields = be_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields = be_set_rxfh_fields,</div><div class='ctx'> 	.get_rxfh_indir_size = be_get_rxfh_indir_size,</div><div class='ctx'> 	.get_rxfh_key_size = be_get_rxfh_key_size,</div><div class='ctx'> 	.get_rxfh = be_get_rxfh,</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h<br/>index db5f92fb87e0..3476194f0855 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_hw.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_hw.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_hw.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005-2016 Broadcom.</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.  The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c<br/>index e2f9fbced174..5bb31c8fab39 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_main.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_main.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_main.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation.  The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='hunk'>@@ -20,13 +16,11 @@</div><div class='ctx'> #include "be.h"</div><div class='ctx'> #include "be_cmds.h"</div><div class='ctx'> #include &lt;asm/div64.h&gt;</div><div class='del'>-#include &lt;linux/aer.h&gt;</div><div class='ctx'> #include &lt;linux/if_bridge.h&gt;</div><div class='ctx'> #include &lt;net/busy_poll.h&gt;</div><div class='ctx'> #include &lt;net/vxlan.h&gt;</div><div class='ctx'> </div><div class='del'>-MODULE_VERSION(DRV_VER);</div><div class='del'>-MODULE_DESCRIPTION(DRV_DESC " " DRV_VER);</div><div class='add'>+MODULE_DESCRIPTION(DRV_DESC);</div><div class='ctx'> MODULE_AUTHOR("Emulex Corporation");</div><div class='ctx'> MODULE_LICENSE("GPL");</div><div class='ctx'> </div><div class='hunk'>@@ -277,7 +271,7 @@ void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm, u16 num_popped)</div><div class='ctx'> 	iowrite32(val, adapter-&gt;db + DB_CQ_OFFSET);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_dev_mac_add(struct be_adapter *adapter, u8 *mac)</div><div class='add'>+static int be_dev_mac_add(struct be_adapter *adapter, const u8 *mac)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -374,7 +368,7 @@ static int be_mac_addr_set(struct net_device *netdev, void *p)</div><div class='ctx'> 	/* Remember currently programmed MAC */</div><div class='ctx'> 	ether_addr_copy(adapter-&gt;dev_mac, addr-&gt;sa_data);</div><div class='ctx'> done:</div><div class='del'>-	ether_addr_copy(netdev-&gt;dev_addr, addr-&gt;sa_data);</div><div class='add'>+	eth_hw_addr_set(netdev, addr-&gt;sa_data);</div><div class='ctx'> 	dev_info(dev, "MAC address changed to %pM\n", addr-&gt;sa_data);</div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='hunk'>@@ -670,10 +664,10 @@ static void be_get_stats64(struct net_device *netdev,</div><div class='ctx'> 		const struct be_rx_stats *rx_stats = rx_stats(rxo);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;rx_stats-&gt;sync);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;rx_stats-&gt;sync);</div><div class='ctx'> 			pkts = rx_stats(rxo)-&gt;rx_pkts;</div><div class='ctx'> 			bytes = rx_stats(rxo)-&gt;rx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;rx_stats-&gt;sync, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;rx_stats-&gt;sync, start));</div><div class='ctx'> 		stats-&gt;rx_packets += pkts;</div><div class='ctx'> 		stats-&gt;rx_bytes += bytes;</div><div class='ctx'> 		stats-&gt;multicast += rx_stats(rxo)-&gt;rx_mcast_pkts;</div><div class='hunk'>@@ -685,10 +679,10 @@ static void be_get_stats64(struct net_device *netdev,</div><div class='ctx'> 		const struct be_tx_stats *tx_stats = tx_stats(txo);</div><div class='ctx'> </div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;tx_stats-&gt;sync);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;tx_stats-&gt;sync);</div><div class='ctx'> 			pkts = tx_stats(txo)-&gt;tx_pkts;</div><div class='ctx'> 			bytes = tx_stats(txo)-&gt;tx_bytes;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;tx_stats-&gt;sync, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;tx_stats-&gt;sync, start));</div><div class='ctx'> 		stats-&gt;tx_packets += pkts;</div><div class='ctx'> 		stats-&gt;tx_bytes += bytes;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -742,9 +736,9 @@ void be_link_status_update(struct be_adapter *adapter, u8 link_status)</div><div class='ctx'> static int be_gso_hdr_len(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	if (skb-&gt;encapsulation)</div><div class='del'>-		return skb_inner_transport_offset(skb) +</div><div class='del'>-		       inner_tcp_hdrlen(skb);</div><div class='del'>-	return skb_transport_offset(skb) + tcp_hdrlen(skb);</div><div class='add'>+		return skb_inner_tcp_all_headers(skb);</div><div class='add'>+</div><div class='add'>+	return skb_tcp_all_headers(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void be_tx_stats_update(struct be_tx_obj *txo, struct sk_buff *skb)</div><div class='hunk'>@@ -1018,7 +1012,7 @@ static u32 be_xmit_enqueue(struct be_adapter *adapter, struct be_tx_obj *txo,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='del'>-		const struct skb_frag_struct *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+		const skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> 		len = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		busaddr = skb_frag_dma_map(dev, frag, 0, len, DMA_TO_DEVICE);</div><div class='hunk'>@@ -1130,7 +1124,7 @@ static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter,</div><div class='ctx'> 						  struct be_wrb_params</div><div class='ctx'> 						  *wrb_params)</div><div class='ctx'> {</div><div class='del'>-	struct vlan_ethhdr *veh = (struct vlan_ethhdr *)skb-&gt;data;</div><div class='add'>+	struct vlan_ethhdr *veh = skb_vlan_eth_hdr(skb);</div><div class='ctx'> 	unsigned int eth_hdr_len;</div><div class='ctx'> 	struct iphdr *ip;</div><div class='ctx'> </div><div class='hunk'>@@ -1141,10 +1135,11 @@ static struct sk_buff *be_lancer_xmit_workarounds(struct be_adapter *adapter,</div><div class='ctx'> 	eth_hdr_len = ntohs(skb-&gt;protocol) == ETH_P_8021Q ?</div><div class='ctx'> 						VLAN_ETH_HLEN : ETH_HLEN;</div><div class='ctx'> 	if (skb-&gt;len &lt;= 60 &amp;&amp;</div><div class='del'>-	    (lancer_chip(adapter) || skb_vlan_tag_present(skb)) &amp;&amp;</div><div class='del'>-	    is_ipv4_pkt(skb)) {</div><div class='add'>+	    (lancer_chip(adapter) || BE3_chip(adapter) ||</div><div class='add'>+	     skb_vlan_tag_present(skb)) &amp;&amp; is_ipv4_pkt(skb)) {</div><div class='ctx'> 		ip = (struct iphdr *)ip_hdr(skb);</div><div class='del'>-		pskb_trim(skb, eth_hdr_len + ntohs(ip-&gt;tot_len));</div><div class='add'>+		if (unlikely(pskb_trim(skb, eth_hdr_len + ntohs(ip-&gt;tot_len))))</div><div class='add'>+			goto tx_drop;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* If vlan tag is already inlined in the packet, skip HW VLAN</div><div class='hunk'>@@ -1301,7 +1296,8 @@ static void be_xmit_flush(struct be_adapter *adapter, struct be_tx_obj *txo)</div><div class='ctx'> 		(adapter-&gt;bmc_filt_mask &amp; BMC_FILT_MULTICAST)</div><div class='ctx'> </div><div class='ctx'> static bool be_send_pkt_to_bmc(struct be_adapter *adapter,</div><div class='del'>-			       struct sk_buff **skb)</div><div class='add'>+			       struct sk_buff **skb,</div><div class='add'>+			       struct be_wrb_params *wrb_params)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethhdr *eh = (struct ethhdr *)(*skb)-&gt;data;</div><div class='ctx'> 	bool os2bmc = false;</div><div class='hunk'>@@ -1365,7 +1361,7 @@ done:</div><div class='ctx'> 	 * to BMC, asic expects the vlan to be inline in the packet.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (os2bmc)</div><div class='del'>-		*skb = be_insert_vlan_in_pkt(adapter, *skb, NULL);</div><div class='add'>+		*skb = be_insert_vlan_in_pkt(adapter, *skb, wrb_params);</div><div class='ctx'> </div><div class='ctx'> 	return os2bmc;</div><div class='ctx'> }</div><div class='hunk'>@@ -1386,19 +1382,17 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 	be_get_wrb_params_from_skb(adapter, skb, &amp;wrb_params);</div><div class='ctx'> </div><div class='ctx'> 	wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &amp;wrb_params);</div><div class='del'>-	if (unlikely(!wrb_cnt)) {</div><div class='del'>-		dev_kfree_skb_any(skb);</div><div class='del'>-		goto drop;</div><div class='del'>-	}</div><div class='add'>+	if (unlikely(!wrb_cnt))</div><div class='add'>+		goto drop_skb;</div><div class='ctx'> </div><div class='ctx'> 	/* if os2bmc is enabled and if the pkt is destined to bmc,</div><div class='ctx'> 	 * enqueue the pkt a 2nd time with mgmt bit set.</div><div class='ctx'> 	 */</div><div class='del'>-	if (be_send_pkt_to_bmc(adapter, &amp;skb)) {</div><div class='add'>+	if (be_send_pkt_to_bmc(adapter, &amp;skb, &amp;wrb_params)) {</div><div class='ctx'> 		BE_WRB_F_SET(wrb_params.features, OS2BMC, 1);</div><div class='ctx'> 		wrb_cnt = be_xmit_enqueue(adapter, txo, skb, &amp;wrb_params);</div><div class='ctx'> 		if (unlikely(!wrb_cnt))</div><div class='del'>-			goto drop;</div><div class='add'>+			goto drop_skb;</div><div class='ctx'> 		else</div><div class='ctx'> 			skb_get(skb);</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1412,6 +1406,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)</div><div class='ctx'> 		be_xmit_flush(adapter, txo);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='add'>+drop_skb:</div><div class='add'>+	dev_kfree_skb_any(skb);</div><div class='ctx'> drop:</div><div class='ctx'> 	tx_stats(txo)-&gt;tx_drv_drops++;</div><div class='ctx'> 	/* Flush the already enqueued tx requests */</div><div class='hunk'>@@ -1421,7 +1417,7 @@ drop:</div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void be_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void be_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct device *dev = &amp;adapter-&gt;pdev-&gt;dev;</div><div class='hunk'>@@ -1470,10 +1466,10 @@ static void be_tx_timeout(struct net_device *netdev)</div><div class='ctx'> 						 ntohs(tcphdr-&gt;source));</div><div class='ctx'> 					dev_info(dev, "TCP dest port %d\n",</div><div class='ctx'> 						 ntohs(tcphdr-&gt;dest));</div><div class='del'>-					dev_info(dev, "TCP sequence num %d\n",</div><div class='del'>-						 ntohs(tcphdr-&gt;seq));</div><div class='del'>-					dev_info(dev, "TCP ack_seq %d\n",</div><div class='del'>-						 ntohs(tcphdr-&gt;ack_seq));</div><div class='add'>+					dev_info(dev, "TCP sequence num %u\n",</div><div class='add'>+						 ntohl(tcphdr-&gt;seq));</div><div class='add'>+					dev_info(dev, "TCP ack_seq %u\n",</div><div class='add'>+						 ntohl(tcphdr-&gt;ack_seq));</div><div class='ctx'> 				} else if (ip_hdr(skb)-&gt;protocol ==</div><div class='ctx'> 					   IPPROTO_UDP) {</div><div class='ctx'> 					udphdr = udp_hdr(skb);</div><div class='hunk'>@@ -2151,7 +2147,7 @@ static int be_get_new_eqd(struct be_eq_obj *eqo)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	aic = &amp;adapter-&gt;aic_obj[eqo-&gt;idx];</div><div class='del'>-	if (!aic-&gt;enable) {</div><div class='add'>+	if (!adapter-&gt;aic_enabled) {</div><div class='ctx'> 		if (aic-&gt;jiffies)</div><div class='ctx'> 			aic-&gt;jiffies = 0;</div><div class='ctx'> 		eqd = aic-&gt;et_eqd;</div><div class='hunk'>@@ -2160,16 +2156,16 @@ static int be_get_new_eqd(struct be_eq_obj *eqo)</div><div class='ctx'> </div><div class='ctx'> 	for_all_rx_queues_on_eq(adapter, eqo, rxo, i) {</div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;rxo-&gt;stats.sync);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;rxo-&gt;stats.sync);</div><div class='ctx'> 			rx_pkts += rxo-&gt;stats.rx_pkts;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;rxo-&gt;stats.sync, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;rxo-&gt;stats.sync, start));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	for_all_tx_queues_on_eq(adapter, eqo, txo, i) {</div><div class='ctx'> 		do {</div><div class='del'>-			start = u64_stats_fetch_begin_irq(&amp;txo-&gt;stats.sync);</div><div class='add'>+			start = u64_stats_fetch_begin(&amp;txo-&gt;stats.sync);</div><div class='ctx'> 			tx_pkts += txo-&gt;stats.tx_reqs;</div><div class='del'>-		} while (u64_stats_fetch_retry_irq(&amp;txo-&gt;stats.sync, start));</div><div class='add'>+		} while (u64_stats_fetch_retry(&amp;txo-&gt;stats.sync, start));</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Skip, if wrapped around or first calculation */</div><div class='hunk'>@@ -2208,7 +2204,7 @@ static u32 be_get_eq_delay_mult_enc(struct be_eq_obj *eqo)</div><div class='ctx'> 	int eqd;</div><div class='ctx'> 	u32 mult_enc;</div><div class='ctx'> </div><div class='del'>-	if (!aic-&gt;enable)</div><div class='add'>+	if (!adapter-&gt;aic_enabled)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	if (jiffies_to_msecs(now - aic-&gt;jiffies) &lt; 1)</div><div class='hunk'>@@ -2349,11 +2345,10 @@ static void skb_fill_rx_data(struct be_rx_obj *rxo, struct sk_buff *skb,</div><div class='ctx'> 		hdr_len = ETH_HLEN;</div><div class='ctx'> 		memcpy(skb-&gt;data, start, hdr_len);</div><div class='ctx'> 		skb_shinfo(skb)-&gt;nr_frags = 1;</div><div class='del'>-		skb_frag_set_page(skb, 0, page_info-&gt;page);</div><div class='del'>-		skb_shinfo(skb)-&gt;frags[0].page_offset =</div><div class='del'>-					page_info-&gt;page_offset + hdr_len;</div><div class='del'>-		skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[0],</div><div class='del'>-				  curr_frag_len - hdr_len);</div><div class='add'>+		skb_frag_fill_page_desc(&amp;skb_shinfo(skb)-&gt;frags[0],</div><div class='add'>+					page_info-&gt;page,</div><div class='add'>+					page_info-&gt;page_offset + hdr_len,</div><div class='add'>+					curr_frag_len - hdr_len);</div><div class='ctx'> 		skb-&gt;data_len = curr_frag_len - hdr_len;</div><div class='ctx'> 		skb-&gt;truesize += rx_frag_size;</div><div class='ctx'> 		skb-&gt;tail += hdr_len;</div><div class='hunk'>@@ -2375,16 +2370,17 @@ static void skb_fill_rx_data(struct be_rx_obj *rxo, struct sk_buff *skb,</div><div class='ctx'> 		if (page_info-&gt;page_offset == 0) {</div><div class='ctx'> 			/* Fresh page */</div><div class='ctx'> 			j++;</div><div class='del'>-			skb_frag_set_page(skb, j, page_info-&gt;page);</div><div class='del'>-			skb_shinfo(skb)-&gt;frags[j].page_offset =</div><div class='del'>-							page_info-&gt;page_offset;</div><div class='del'>-			skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[j], 0);</div><div class='add'>+			skb_frag_fill_page_desc(&amp;skb_shinfo(skb)-&gt;frags[j],</div><div class='add'>+						page_info-&gt;page,</div><div class='add'>+						page_info-&gt;page_offset,</div><div class='add'>+						curr_frag_len);</div><div class='ctx'> 			skb_shinfo(skb)-&gt;nr_frags++;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			put_page(page_info-&gt;page);</div><div class='add'>+			skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[j],</div><div class='add'>+					  curr_frag_len);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[j], curr_frag_len);</div><div class='ctx'> 		skb-&gt;len += curr_frag_len;</div><div class='ctx'> 		skb-&gt;data_len += curr_frag_len;</div><div class='ctx'> 		skb-&gt;truesize += rx_frag_size;</div><div class='hunk'>@@ -2457,14 +2453,16 @@ static void be_rx_compl_process_gro(struct be_rx_obj *rxo,</div><div class='ctx'> 		if (i == 0 || page_info-&gt;page_offset == 0) {</div><div class='ctx'> 			/* First frag or Fresh page */</div><div class='ctx'> 			j++;</div><div class='del'>-			skb_frag_set_page(skb, j, page_info-&gt;page);</div><div class='del'>-			skb_shinfo(skb)-&gt;frags[j].page_offset =</div><div class='del'>-							page_info-&gt;page_offset;</div><div class='del'>-			skb_frag_size_set(&amp;skb_shinfo(skb)-&gt;frags[j], 0);</div><div class='add'>+			skb_frag_fill_page_desc(&amp;skb_shinfo(skb)-&gt;frags[j],</div><div class='add'>+						page_info-&gt;page,</div><div class='add'>+						page_info-&gt;page_offset,</div><div class='add'>+						curr_frag_len);</div><div class='ctx'> 		} else {</div><div class='ctx'> 			put_page(page_info-&gt;page);</div><div class='add'>+			skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[j],</div><div class='add'>+					  curr_frag_len);</div><div class='ctx'> 		}</div><div class='del'>-		skb_frag_size_add(&amp;skb_shinfo(skb)-&gt;frags[j], curr_frag_len);</div><div class='add'>+</div><div class='ctx'> 		skb-&gt;truesize += rx_frag_size;</div><div class='ctx'> 		remaining -= curr_frag_len;</div><div class='ctx'> 		memset(page_info, 0, sizeof(*page_info));</div><div class='hunk'>@@ -2963,6 +2961,8 @@ static int be_evt_queues_create(struct be_adapter *adapter)</div><div class='ctx'> 				    max(adapter-&gt;cfg_num_rx_irqs,</div><div class='ctx'> 					adapter-&gt;cfg_num_tx_irqs));</div><div class='ctx'> </div><div class='add'>+	adapter-&gt;aic_enabled = true;</div><div class='add'>+</div><div class='ctx'> 	for_all_evt_queues(adapter, eqo, i) {</div><div class='ctx'> 		int numa_node = dev_to_node(&amp;adapter-&gt;pdev-&gt;dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2970,7 +2970,6 @@ static int be_evt_queues_create(struct be_adapter *adapter)</div><div class='ctx'> 		eqo-&gt;adapter = adapter;</div><div class='ctx'> 		eqo-&gt;idx = i;</div><div class='ctx'> 		aic-&gt;max_eqd = BE_MAX_EQD;</div><div class='del'>-		aic-&gt;enable = true;</div><div class='ctx'> </div><div class='ctx'> 		eq = &amp;eqo-&gt;q;</div><div class='ctx'> 		rc = be_queue_alloc(adapter, eq, EVNT_Q_LEN,</div><div class='hunk'>@@ -2986,8 +2985,7 @@ static int be_evt_queues_create(struct be_adapter *adapter)</div><div class='ctx'> 			return -ENOMEM;</div><div class='ctx'> 		cpumask_set_cpu(cpumask_local_spread(i, numa_node),</div><div class='ctx'> 				eqo-&gt;affinity_mask);</div><div class='del'>-		netif_napi_add(adapter-&gt;netdev, &amp;eqo-&gt;napi, be_poll,</div><div class='del'>-			       BE_NAPI_WEIGHT);</div><div class='add'>+		netif_napi_add(adapter-&gt;netdev, &amp;eqo-&gt;napi, be_poll);</div><div class='ctx'> 	}</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -3182,7 +3180,7 @@ static irqreturn_t be_intx(int irq, void *dev)</div><div class='ctx'> 	}</div><div class='ctx'> 	be_eq_notify(adapter, eqo-&gt;q.id, false, true, num_evts, 0);</div><div class='ctx'> </div><div class='del'>-	/* Return IRQ_HANDLED only for the the first spurious intr</div><div class='add'>+	/* Return IRQ_HANDLED only for the first spurious intr</div><div class='ctx'> 	 * after a valid intr to stop the kernel from branding</div><div class='ctx'> 	 * this irq as a bad one!</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -3495,7 +3493,7 @@ static int be_msix_register(struct be_adapter *adapter)</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			goto err_msix;</div><div class='ctx'> </div><div class='del'>-		irq_set_affinity_hint(vec, eqo-&gt;affinity_mask);</div><div class='add'>+		irq_update_affinity_hint(vec, eqo-&gt;affinity_mask);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -3556,7 +3554,7 @@ static void be_irq_unregister(struct be_adapter *adapter)</div><div class='ctx'> 	/* MSIx */</div><div class='ctx'> 	for_all_evt_queues(adapter, eqo, i) {</div><div class='ctx'> 		vec = be_msix_vec_get(adapter, eqo);</div><div class='del'>-		irq_set_affinity_hint(vec, NULL);</div><div class='add'>+		irq_update_affinity_hint(vec, NULL);</div><div class='ctx'> 		free_irq(vec, eqo);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -3833,8 +3831,8 @@ static int be_open(struct net_device *netdev)</div><div class='ctx'> 		be_link_status_update(adapter, link_status);</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(netdev);</div><div class='del'>-	if (skyhawk_chip(adapter))</div><div class='del'>-		udp_tunnel_get_rx_info(netdev);</div><div class='add'>+</div><div class='add'>+	udp_tunnel_nic_reset_ntf(netdev);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> err:</div><div class='hunk'>@@ -3971,18 +3969,23 @@ static void be_cancel_err_detection(struct be_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_enable_vxlan_offloads(struct be_adapter *adapter)</div><div class='add'>+/* VxLAN offload Notes:</div><div class='add'>+ *</div><div class='add'>+ * The stack defines tunnel offload flags (hw_enc_features) for IP and doesn't</div><div class='add'>+ * distinguish various types of transports (VxLAN, GRE, NVGRE ..). So, offload</div><div class='add'>+ * is expected to work across all types of IP tunnels once exported. Skyhawk</div><div class='add'>+ * supports offloads for either VxLAN or NVGRE, exclusively. So we export VxLAN</div><div class='add'>+ * offloads in hw_enc_features only when a VxLAN port is added. If other (non</div><div class='add'>+ * VxLAN) tunnels are configured while VxLAN offloads are enabled, offloads for</div><div class='add'>+ * those other tunnels are unexported on the fly through ndo_features_check().</div><div class='add'>+ */</div><div class='add'>+static int be_vxlan_set_port(struct net_device *netdev, unsigned int table,</div><div class='add'>+			     unsigned int entry, struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> 	struct device *dev = &amp;adapter-&gt;pdev-&gt;dev;</div><div class='del'>-	struct be_vxlan_port *vxlan_port;</div><div class='del'>-	__be16 port;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	vxlan_port = list_first_entry(&amp;adapter-&gt;vxlan_port_list,</div><div class='del'>-				      struct be_vxlan_port, list);</div><div class='del'>-	port = vxlan_port-&gt;port;</div><div class='del'>-</div><div class='ctx'> 	status = be_cmd_manage_iface(adapter, adapter-&gt;if_handle,</div><div class='ctx'> 				     OP_CONVERT_NORMAL_TO_TUNNEL);</div><div class='ctx'> 	if (status) {</div><div class='hunk'>@@ -3991,25 +3994,26 @@ static int be_enable_vxlan_offloads(struct be_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> 	adapter-&gt;flags |= BE_FLAGS_VXLAN_OFFLOADS;</div><div class='ctx'> </div><div class='del'>-	status = be_cmd_set_vxlan_port(adapter, port);</div><div class='add'>+	status = be_cmd_set_vxlan_port(adapter, ti-&gt;port);</div><div class='ctx'> 	if (status) {</div><div class='ctx'> 		dev_warn(dev, "Failed to add VxLAN port\n");</div><div class='ctx'> 		return status;</div><div class='ctx'> 	}</div><div class='del'>-	adapter-&gt;vxlan_port = port;</div><div class='add'>+	adapter-&gt;vxlan_port = ti-&gt;port;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='ctx'> 				   NETIF_F_TSO | NETIF_F_TSO6 |</div><div class='ctx'> 				   NETIF_F_GSO_UDP_TUNNEL;</div><div class='ctx'> </div><div class='ctx'> 	dev_info(dev, "Enabled VxLAN offloads for UDP port %d\n",</div><div class='del'>-		 be16_to_cpu(port));</div><div class='add'>+		 be16_to_cpu(ti-&gt;port));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void be_disable_vxlan_offloads(struct be_adapter *adapter)</div><div class='add'>+static int be_vxlan_unset_port(struct net_device *netdev, unsigned int table,</div><div class='add'>+			       unsigned int entry, struct udp_tunnel_info *ti)</div><div class='ctx'> {</div><div class='del'>-	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='ctx'> </div><div class='ctx'> 	if (adapter-&gt;flags &amp; BE_FLAGS_VXLAN_OFFLOADS)</div><div class='ctx'> 		be_cmd_manage_iface(adapter, adapter-&gt;if_handle,</div><div class='hunk'>@@ -4022,8 +4026,18 @@ static void be_disable_vxlan_offloads(struct be_adapter *adapter)</div><div class='ctx'> 	adapter-&gt;vxlan_port = 0;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;hw_enc_features = 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static const struct udp_tunnel_nic_info be_udp_tunnels = {</div><div class='add'>+	.set_port	= be_vxlan_set_port,</div><div class='add'>+	.unset_port	= be_vxlan_unset_port,</div><div class='add'>+	.flags		= UDP_TUNNEL_NIC_INFO_OPEN_ONLY,</div><div class='add'>+	.tables		= {</div><div class='add'>+		{ .n_entries = 1, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },</div><div class='add'>+	},</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> static void be_calculate_vf_res(struct be_adapter *adapter, u16 num_vfs,</div><div class='ctx'> 				struct be_resources *vft_res)</div><div class='ctx'> {</div><div class='hunk'>@@ -4139,7 +4153,7 @@ static int be_clear(struct be_adapter *adapter)</div><div class='ctx'> 					&amp;vft_res);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	be_disable_vxlan_offloads(adapter);</div><div class='add'>+	be_vxlan_unset_port(adapter-&gt;netdev, 0, 0, NULL);</div><div class='ctx'> </div><div class='ctx'> 	be_if_destroy(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -4586,7 +4600,7 @@ static int be_mac_setup(struct be_adapter *adapter)</div><div class='ctx'> 		if (status)</div><div class='ctx'> 			return status;</div><div class='ctx'> </div><div class='del'>-		memcpy(adapter-&gt;netdev-&gt;dev_addr, mac, ETH_ALEN);</div><div class='add'>+		eth_hw_addr_set(adapter-&gt;netdev, mac);</div><div class='ctx'> 		memcpy(adapter-&gt;netdev-&gt;perm_addr, mac, ETH_ALEN);</div><div class='ctx'> </div><div class='ctx'> 		/* Initial MAC for BE3 VFs is already programmed by PF */</div><div class='hunk'>@@ -4608,7 +4622,6 @@ static void be_destroy_err_recovery_workq(void)</div><div class='ctx'> 	if (!be_err_recovery_workq)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	flush_workqueue(be_err_recovery_workq);</div><div class='ctx'> 	destroy_workqueue(be_err_recovery_workq);</div><div class='ctx'> 	be_err_recovery_workq = NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -4664,7 +4677,6 @@ static int be_if_create(struct be_adapter *adapter)</div><div class='ctx'> {</div><div class='ctx'> 	u32 en_flags = BE_IF_FLAGS_RSS | BE_IF_FLAGS_DEFQ_RSS;</div><div class='ctx'> 	u32 cap_flags = be_if_cap_flags(adapter);</div><div class='del'>-	int status;</div><div class='ctx'> </div><div class='ctx'> 	/* alloc required memory for other filtering fields */</div><div class='ctx'> 	adapter-&gt;pmac_id = kcalloc(be_max_uc(adapter),</div><div class='hunk'>@@ -4687,13 +4699,8 @@ static int be_if_create(struct be_adapter *adapter)</div><div class='ctx'> </div><div class='ctx'> 	en_flags &amp;= cap_flags;</div><div class='ctx'> 	/* will enable all the needed filter flags in be_open() */</div><div class='del'>-	status = be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,</div><div class='add'>+	return be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,</div><div class='ctx'> 				  &amp;adapter-&gt;if_handle, 0);</div><div class='del'>-</div><div class='del'>-	if (status)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> int be_update_queues(struct be_adapter *adapter)</div><div class='hunk'>@@ -4701,8 +4708,17 @@ int be_update_queues(struct be_adapter *adapter)</div><div class='ctx'> 	struct net_device *netdev = adapter-&gt;netdev;</div><div class='ctx'> 	int status;</div><div class='ctx'> </div><div class='del'>-	if (netif_running(netdev))</div><div class='add'>+	if (netif_running(netdev)) {</div><div class='add'>+		/* be_tx_timeout() must not run concurrently with this</div><div class='add'>+		 * function, synchronize with an already-running dev_watchdog</div><div class='add'>+		 */</div><div class='add'>+		netif_tx_lock_bh(netdev);</div><div class='add'>+		/* device cannot transmit now, avoid dev_watchdog timeouts */</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+		netif_tx_unlock_bh(netdev);</div><div class='add'>+</div><div class='ctx'> 		be_close(netdev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	be_cancel_worker(adapter);</div><div class='ctx'> </div><div class='hunk'>@@ -4966,13 +4982,7 @@ static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,</div><div class='ctx'> 	if (!br_spec)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	nla_for_each_nested(attr, br_spec, rem) {</div><div class='del'>-		if (nla_type(attr) != IFLA_BRIDGE_MODE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (nla_len(attr) &lt; sizeof(mode))</div><div class='del'>-			return -EINVAL;</div><div class='del'>-</div><div class='add'>+	nla_for_each_nested_type(attr, IFLA_BRIDGE_MODE, br_spec, rem) {</div><div class='ctx'> 		mode = nla_get_u16(attr);</div><div class='ctx'> 		if (BE3_chip(adapter) &amp;&amp; mode == BRIDGE_MODE_VEPA)</div><div class='ctx'> 			return -EOPNOTSUPP;</div><div class='hunk'>@@ -5048,147 +5058,6 @@ static struct be_cmd_work *be_alloc_work(struct be_adapter *adapter,</div><div class='ctx'> 	return work;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* VxLAN offload Notes:</div><div class='del'>- *</div><div class='del'>- * The stack defines tunnel offload flags (hw_enc_features) for IP and doesn't</div><div class='del'>- * distinguish various types of transports (VxLAN, GRE, NVGRE ..). So, offload</div><div class='del'>- * is expected to work across all types of IP tunnels once exported. Skyhawk</div><div class='del'>- * supports offloads for either VxLAN or NVGRE, exclusively. So we export VxLAN</div><div class='del'>- * offloads in hw_enc_features only when a VxLAN port is added. If other (non</div><div class='del'>- * VxLAN) tunnels are configured while VxLAN offloads are enabled, offloads for</div><div class='del'>- * those other tunnels are unexported on the fly through ndo_features_check().</div><div class='del'>- *</div><div class='del'>- * Skyhawk supports VxLAN offloads only for one UDP dport. So, if the stack</div><div class='del'>- * adds more than one port, disable offloads and re-enable them again when</div><div class='del'>- * there's only one port left. We maintain a list of ports for this purpose.</div><div class='del'>- */</div><div class='del'>-static void be_work_add_vxlan_port(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct be_cmd_work *cmd_work =</div><div class='del'>-				container_of(work, struct be_cmd_work, work);</div><div class='del'>-	struct be_adapter *adapter = cmd_work-&gt;adapter;</div><div class='del'>-	struct device *dev = &amp;adapter-&gt;pdev-&gt;dev;</div><div class='del'>-	__be16 port = cmd_work-&gt;info.vxlan_port;</div><div class='del'>-	struct be_vxlan_port *vxlan_port;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	/* Bump up the alias count if it is an existing port */</div><div class='del'>-	list_for_each_entry(vxlan_port, &amp;adapter-&gt;vxlan_port_list, list) {</div><div class='del'>-		if (vxlan_port-&gt;port == port) {</div><div class='del'>-			vxlan_port-&gt;port_aliases++;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add a new port to our list. We don't need a lock here since port</div><div class='del'>-	 * add/delete are done only in the context of a single-threaded work</div><div class='del'>-	 * queue (be_wq).</div><div class='del'>-	 */</div><div class='del'>-	vxlan_port = kzalloc(sizeof(*vxlan_port), GFP_KERNEL);</div><div class='del'>-	if (!vxlan_port)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	vxlan_port-&gt;port = port;</div><div class='del'>-	INIT_LIST_HEAD(&amp;vxlan_port-&gt;list);</div><div class='del'>-	list_add_tail(&amp;vxlan_port-&gt;list, &amp;adapter-&gt;vxlan_port_list);</div><div class='del'>-	adapter-&gt;vxlan_port_count++;</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;flags &amp; BE_FLAGS_VXLAN_OFFLOADS) {</div><div class='del'>-		dev_info(dev,</div><div class='del'>-			 "Only one UDP port supported for VxLAN offloads\n");</div><div class='del'>-		dev_info(dev, "Disabling VxLAN offloads\n");</div><div class='del'>-		goto err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (adapter-&gt;vxlan_port_count &gt; 1)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	status = be_enable_vxlan_offloads(adapter);</div><div class='del'>-	if (!status)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-err:</div><div class='del'>-	be_disable_vxlan_offloads(adapter);</div><div class='del'>-done:</div><div class='del'>-	kfree(cmd_work);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void be_work_del_vxlan_port(struct work_struct *work)</div><div class='del'>-{</div><div class='del'>-	struct be_cmd_work *cmd_work =</div><div class='del'>-				container_of(work, struct be_cmd_work, work);</div><div class='del'>-	struct be_adapter *adapter = cmd_work-&gt;adapter;</div><div class='del'>-	__be16 port = cmd_work-&gt;info.vxlan_port;</div><div class='del'>-	struct be_vxlan_port *vxlan_port;</div><div class='del'>-</div><div class='del'>-	/* Nothing to be done if a port alias is being deleted */</div><div class='del'>-	list_for_each_entry(vxlan_port, &amp;adapter-&gt;vxlan_port_list, list) {</div><div class='del'>-		if (vxlan_port-&gt;port == port) {</div><div class='del'>-			if (vxlan_port-&gt;port_aliases) {</div><div class='del'>-				vxlan_port-&gt;port_aliases--;</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No port aliases left; delete the port from the list */</div><div class='del'>-	list_del(&amp;vxlan_port-&gt;list);</div><div class='del'>-	adapter-&gt;vxlan_port_count--;</div><div class='del'>-</div><div class='del'>-	/* Disable VxLAN offload if this is the offloaded port */</div><div class='del'>-	if (adapter-&gt;vxlan_port == vxlan_port-&gt;port) {</div><div class='del'>-		WARN_ON(adapter-&gt;vxlan_port_count);</div><div class='del'>-		be_disable_vxlan_offloads(adapter);</div><div class='del'>-		dev_info(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='del'>-			 "Disabled VxLAN offloads for UDP port %d\n",</div><div class='del'>-			 be16_to_cpu(port));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If only 1 port is left, re-enable VxLAN offload */</div><div class='del'>-	if (adapter-&gt;vxlan_port_count == 1)</div><div class='del'>-		be_enable_vxlan_offloads(adapter);</div><div class='del'>-</div><div class='del'>-out:</div><div class='del'>-	kfree(vxlan_port);</div><div class='del'>-done:</div><div class='del'>-	kfree(cmd_work);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void be_cfg_vxlan_port(struct net_device *netdev,</div><div class='del'>-			      struct udp_tunnel_info *ti,</div><div class='del'>-			      void (*func)(struct work_struct *))</div><div class='del'>-{</div><div class='del'>-	struct be_adapter *adapter = netdev_priv(netdev);</div><div class='del'>-	struct be_cmd_work *cmd_work;</div><div class='del'>-</div><div class='del'>-	if (ti-&gt;type != UDP_TUNNEL_TYPE_VXLAN)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (lancer_chip(adapter) || BEx_chip(adapter) || be_is_mc(adapter))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cmd_work = be_alloc_work(adapter, func);</div><div class='del'>-	if (cmd_work) {</div><div class='del'>-		cmd_work-&gt;info.vxlan_port = ti-&gt;port;</div><div class='del'>-		queue_work(be_wq, &amp;cmd_work-&gt;work);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void be_del_vxlan_port(struct net_device *netdev,</div><div class='del'>-			      struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	be_cfg_vxlan_port(netdev, ti, be_work_del_vxlan_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void be_add_vxlan_port(struct net_device *netdev,</div><div class='del'>-			      struct udp_tunnel_info *ti)</div><div class='del'>-{</div><div class='del'>-	be_cfg_vxlan_port(netdev, ti, be_work_add_vxlan_port);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static netdev_features_t be_features_check(struct sk_buff *skb,</div><div class='ctx'> 					   struct net_device *dev,</div><div class='ctx'> 					   netdev_features_t features)</div><div class='hunk'>@@ -5304,8 +5173,6 @@ static const struct net_device_ops be_netdev_ops = {</div><div class='ctx'> #endif</div><div class='ctx'> 	.ndo_bridge_setlink	= be_ndo_bridge_setlink,</div><div class='ctx'> 	.ndo_bridge_getlink	= be_ndo_bridge_getlink,</div><div class='del'>-	.ndo_udp_tunnel_add	= be_add_vxlan_port,</div><div class='del'>-	.ndo_udp_tunnel_del	= be_del_vxlan_port,</div><div class='ctx'> 	.ndo_features_check	= be_features_check,</div><div class='ctx'> 	.ndo_get_phys_port_id   = be_get_phys_port_id,</div><div class='ctx'> };</div><div class='hunk'>@@ -5322,7 +5189,8 @@ static void be_netdev_init(struct net_device *netdev)</div><div class='ctx'> 		netdev-&gt;hw_features |= NETIF_F_RXHASH;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;features |= netdev-&gt;hw_features |</div><div class='del'>-		NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='add'>+		NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_FILTER |</div><div class='add'>+		NETIF_F_HIGHDMA;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |</div><div class='ctx'> 		NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;</div><div class='hunk'>@@ -5331,12 +5199,15 @@ static void be_netdev_init(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;flags |= IFF_MULTICAST;</div><div class='ctx'> </div><div class='del'>-	netif_set_gso_max_size(netdev, BE_MAX_GSO_SIZE - ETH_HLEN);</div><div class='add'>+	netif_set_tso_max_size(netdev, BE_MAX_GSO_SIZE - ETH_HLEN);</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;be_netdev_ops;</div><div class='ctx'> </div><div class='ctx'> 	netdev-&gt;ethtool_ops = &amp;be_ethtool_ops;</div><div class='ctx'> </div><div class='add'>+	if (!lancer_chip(adapter) &amp;&amp; !BEx_chip(adapter) &amp;&amp; !be_is_mc(adapter))</div><div class='add'>+		netdev-&gt;udp_tunnel_nic_info = &amp;be_udp_tunnels;</div><div class='add'>+</div><div class='ctx'> 	/* MTU range: 256 - 9000 */</div><div class='ctx'> 	netdev-&gt;min_mtu = BE_MIN_MTU;</div><div class='ctx'> 	netdev-&gt;max_mtu = BE_MAX_MTU;</div><div class='hunk'>@@ -5796,8 +5667,8 @@ static int be_drv_init(struct be_adapter *adapter)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	mutex_init(&amp;adapter-&gt;mbox_lock);</div><div class='del'>-	mutex_init(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	mutex_init(&amp;adapter-&gt;rx_filter_lock);</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;mcc_lock);</div><div class='ctx'> 	spin_lock_init(&amp;adapter-&gt;mcc_cq_lock);</div><div class='ctx'> 	init_completion(&amp;adapter-&gt;et_cmd_compl);</div><div class='ctx'> </div><div class='hunk'>@@ -5816,7 +5687,6 @@ static int be_drv_init(struct be_adapter *adapter)</div><div class='ctx'> 	/* Must be a power of 2 or else MODULO will BUG_ON */</div><div class='ctx'> 	adapter-&gt;be_get_temp_freq = 64;</div><div class='ctx'> </div><div class='del'>-	INIT_LIST_HEAD(&amp;adapter-&gt;vxlan_port_list);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_rx_filter:</div><div class='hunk'>@@ -5852,8 +5722,6 @@ static void be_remove(struct pci_dev *pdev)</div><div class='ctx'> 	be_unmap_pci_bars(adapter);</div><div class='ctx'> 	be_drv_cleanup(adapter);</div><div class='ctx'> </div><div class='del'>-	pci_disable_pcie_error_reporting(pdev);</div><div class='del'>-</div><div class='ctx'> 	pci_release_regions(pdev);</div><div class='ctx'> 	pci_disable_device(pdev);</div><div class='ctx'> </div><div class='hunk'>@@ -5945,8 +5813,6 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	dev_info(&amp;pdev-&gt;dev, "%s version is %s\n", DRV_NAME, DRV_VER);</div><div class='del'>-</div><div class='ctx'> 	status = pci_enable_device(pdev);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto do_none;</div><div class='hunk'>@@ -5968,20 +5834,11 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='ctx'> 	status = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(64));</div><div class='del'>-	if (!status) {</div><div class='del'>-		netdev-&gt;features |= NETIF_F_HIGHDMA;</div><div class='del'>-	} else {</div><div class='del'>-		status = dma_set_mask_and_coherent(&amp;pdev-&gt;dev, DMA_BIT_MASK(32));</div><div class='del'>-		if (status) {</div><div class='del'>-			dev_err(&amp;pdev-&gt;dev, "Could not set PCI DMA Mask\n");</div><div class='del'>-			goto free_netdev;</div><div class='del'>-		}</div><div class='add'>+	if (status) {</div><div class='add'>+		dev_err(&amp;pdev-&gt;dev, "Could not set PCI DMA Mask\n");</div><div class='add'>+		goto free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	status = pci_enable_pcie_error_reporting(pdev);</div><div class='del'>-	if (!status)</div><div class='del'>-		dev_info(&amp;pdev-&gt;dev, "PCIe error reporting enabled\n");</div><div class='del'>-</div><div class='ctx'> 	status = be_map_pci_bars(adapter);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		goto free_netdev;</div><div class='hunk'>@@ -6036,32 +5893,23 @@ do_none:</div><div class='ctx'> 	return status;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_suspend(struct pci_dev *pdev, pm_message_t state)</div><div class='add'>+static int __maybe_unused be_suspend(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct be_adapter *adapter = pci_get_drvdata(pdev);</div><div class='add'>+	struct be_adapter *adapter = dev_get_drvdata(dev_d);</div><div class='ctx'> </div><div class='ctx'> 	be_intr_set(adapter, false);</div><div class='ctx'> 	be_cancel_err_detection(adapter);</div><div class='ctx'> </div><div class='ctx'> 	be_cleanup(adapter);</div><div class='ctx'> </div><div class='del'>-	pci_save_state(pdev);</div><div class='del'>-	pci_disable_device(pdev);</div><div class='del'>-	pci_set_power_state(pdev, pci_choose_state(pdev, state));</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int be_pci_resume(struct pci_dev *pdev)</div><div class='add'>+static int __maybe_unused be_pci_resume(struct device *dev_d)</div><div class='ctx'> {</div><div class='del'>-	struct be_adapter *adapter = pci_get_drvdata(pdev);</div><div class='add'>+	struct be_adapter *adapter = dev_get_drvdata(dev_d);</div><div class='ctx'> 	int status = 0;</div><div class='ctx'> </div><div class='del'>-	status = pci_enable_device(pdev);</div><div class='del'>-	if (status)</div><div class='del'>-		return status;</div><div class='del'>-</div><div class='del'>-	pci_restore_state(pdev);</div><div class='del'>-</div><div class='ctx'> 	status = be_resume(adapter);</div><div class='ctx'> 	if (status)</div><div class='ctx'> 		return status;</div><div class='hunk'>@@ -6233,13 +6081,14 @@ static const struct pci_error_handlers be_eeh_handlers = {</div><div class='ctx'> 	.resume = be_eeh_resume,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static SIMPLE_DEV_PM_OPS(be_pci_pm_ops, be_suspend, be_pci_resume);</div><div class='add'>+</div><div class='ctx'> static struct pci_driver be_driver = {</div><div class='ctx'> 	.name = DRV_NAME,</div><div class='ctx'> 	.id_table = be_dev_ids,</div><div class='ctx'> 	.probe = be_probe,</div><div class='ctx'> 	.remove = be_remove,</div><div class='del'>-	.suspend = be_suspend,</div><div class='del'>-	.resume = be_pci_resume,</div><div class='add'>+	.driver.pm = &amp;be_pci_pm_ops,</div><div class='ctx'> 	.shutdown = be_shutdown,</div><div class='ctx'> 	.sriov_configure = be_pci_sriov_configure,</div><div class='ctx'> 	.err_handler = &amp;be_eeh_handlers</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_roce.c b/drivers/net/ethernet/emulex/benet/be_roce.c<br/>index 05989aafaf32..521c4c2b4887 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_roce.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_roce.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_roce.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_roce.c</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation. The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/ethernet/emulex/benet/be_roce.h b/drivers/net/ethernet/emulex/benet/be_roce.h<br/>index e51719a7307f..801e10522129 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_roce.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/emulex/benet/be_roce.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/emulex/benet/be_roce.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/emulex/benet/be_roce.h</a></div><div class='hunk'>@@ -1,12 +1,8 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0-only */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright (C) 2005 - 2016 Broadcom</div><div class='ctx'>  * All rights reserved.</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License version 2</div><div class='del'>- * as published by the Free Software Foundation. The full GNU General</div><div class='del'>- * Public License is included in this distribution in the file called COPYING.</div><div class='del'>- *</div><div class='ctx'>  * Contact Information:</div><div class='ctx'>  * linux-drivers@emulex.com</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/Kconfig b/drivers/net/ethernet/engleder/Kconfig<br/>new file mode 100644<br/>index 000000000000..3df6bf476ae7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/Kconfig</a></div><div class='hunk'>@@ -0,0 +1,40 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Engleder network device configuration</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+config NET_VENDOR_ENGLEDER</div><div class='add'>+	bool "Engleder devices"</div><div class='add'>+	default y</div><div class='add'>+	help</div><div class='add'>+	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='add'>+</div><div class='add'>+	  Note that the answer to this question doesn't directly affect the</div><div class='add'>+	  kernel: saying N will just cause the configurator to skip all</div><div class='add'>+	  the questions about Engleder devices. If you say Y, you will be asked</div><div class='add'>+	  for your specific card in the following questions.</div><div class='add'>+</div><div class='add'>+if NET_VENDOR_ENGLEDER</div><div class='add'>+</div><div class='add'>+config TSNEP</div><div class='add'>+	tristate "TSN endpoint support"</div><div class='add'>+	depends on HAS_IOMEM &amp;&amp; HAS_DMA</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select PHYLIB</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	help</div><div class='add'>+	  Support for the Engleder TSN endpoint Ethernet MAC IP Core.</div><div class='add'>+</div><div class='add'>+	  To compile this driver as a module, choose M here. The module will be</div><div class='add'>+	  called tsnep.</div><div class='add'>+</div><div class='add'>+config TSNEP_SELFTESTS</div><div class='add'>+	bool "TSN endpoint self test support"</div><div class='add'>+	default n</div><div class='add'>+	depends on TSNEP</div><div class='add'>+	help</div><div class='add'>+	  This enables self test support within the TSN endpoint driver.</div><div class='add'>+</div><div class='add'>+	  If unsure, say N.</div><div class='add'>+</div><div class='add'>+endif # NET_VENDOR_ENGLEDER</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/Makefile b/drivers/net/ethernet/engleder/Makefile<br/>new file mode 100644<br/>index 000000000000..b98135f65eb7<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/Makefile</a></div><div class='hunk'>@@ -0,0 +1,10 @@</div><div class='add'>+# SPDX-License-Identifier: GPL-2.0</div><div class='add'>+#</div><div class='add'>+# Makefile for the Engleder Ethernet drivers</div><div class='add'>+#</div><div class='add'>+</div><div class='add'>+obj-$(CONFIG_TSNEP) += tsnep.o</div><div class='add'>+</div><div class='add'>+tsnep-objs := tsnep_main.o tsnep_ethtool.o tsnep_ptp.o tsnep_tc.o \</div><div class='add'>+	      tsnep_rxnfc.o tsnep_xdp.o</div><div class='add'>+tsnep-$(CONFIG_TSNEP_SELFTESTS) += tsnep_selftests.o</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep.h b/drivers/net/ethernet/engleder/tsnep.h<br/>new file mode 100644<br/>index 000000000000..03e19aea9ea4<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep.h</a></div><div class='hunk'>@@ -0,0 +1,264 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#ifndef _TSNEP_H</div><div class='add'>+#define _TSNEP_H</div><div class='add'>+</div><div class='add'>+#include "tsnep_hw.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='add'>+#include &lt;linux/dma-mapping.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/miscdevice.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+</div><div class='add'>+#define TSNEP "tsnep"</div><div class='add'>+</div><div class='add'>+#define TSNEP_RING_SIZE 256</div><div class='add'>+#define TSNEP_RING_MASK (TSNEP_RING_SIZE - 1)</div><div class='add'>+#define TSNEP_RING_RX_REFILL 16</div><div class='add'>+#define TSNEP_RING_RX_REUSE (TSNEP_RING_SIZE - TSNEP_RING_SIZE / 4)</div><div class='add'>+#define TSNEP_RING_ENTRIES_PER_PAGE (PAGE_SIZE / TSNEP_DESC_SIZE)</div><div class='add'>+#define TSNEP_RING_PAGE_COUNT (TSNEP_RING_SIZE / TSNEP_RING_ENTRIES_PER_PAGE)</div><div class='add'>+</div><div class='add'>+struct tsnep_gcl {</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	u64 base_time;</div><div class='add'>+	u64 cycle_time;</div><div class='add'>+	u64 cycle_time_extension;</div><div class='add'>+</div><div class='add'>+	struct tsnep_gcl_operation operation[TSNEP_GCL_COUNT];</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	u64 change_limit;</div><div class='add'>+</div><div class='add'>+	u64 start_time;</div><div class='add'>+	bool change;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+enum tsnep_rxnfc_filter_type {</div><div class='add'>+	TSNEP_RXNFC_ETHER_TYPE,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_rxnfc_filter {</div><div class='add'>+	enum tsnep_rxnfc_filter_type type;</div><div class='add'>+	union {</div><div class='add'>+		u16 ether_type;</div><div class='add'>+	};</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_rxnfc_rule {</div><div class='add'>+	struct list_head list;</div><div class='add'>+	struct tsnep_rxnfc_filter filter;</div><div class='add'>+	int queue_index;</div><div class='add'>+	int location;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_tx_entry {</div><div class='add'>+	struct tsnep_tx_desc *desc;</div><div class='add'>+	struct tsnep_tx_desc_wb *desc_wb;</div><div class='add'>+	dma_addr_t desc_dma;</div><div class='add'>+	bool owner_user_flag;</div><div class='add'>+</div><div class='add'>+	u32 properties;</div><div class='add'>+</div><div class='add'>+	u32 type;</div><div class='add'>+	union {</div><div class='add'>+		struct sk_buff *skb;</div><div class='add'>+		struct xdp_frame *xdpf;</div><div class='add'>+		bool zc;</div><div class='add'>+	};</div><div class='add'>+	size_t len;</div><div class='add'>+	DEFINE_DMA_UNMAP_ADDR(dma);</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_tx {</div><div class='add'>+	struct tsnep_adapter *adapter;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	int queue_index;</div><div class='add'>+</div><div class='add'>+	void *page[TSNEP_RING_PAGE_COUNT];</div><div class='add'>+	dma_addr_t page_dma[TSNEP_RING_PAGE_COUNT];</div><div class='add'>+</div><div class='add'>+	struct tsnep_tx_entry entry[TSNEP_RING_SIZE];</div><div class='add'>+	int write;</div><div class='add'>+	int read;</div><div class='add'>+	u32 owner_counter;</div><div class='add'>+	int increment_owner_counter;</div><div class='add'>+	struct xsk_buff_pool *xsk_pool;</div><div class='add'>+</div><div class='add'>+	u32 packets;</div><div class='add'>+	u32 bytes;</div><div class='add'>+	u32 dropped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_rx_entry {</div><div class='add'>+	struct tsnep_rx_desc *desc;</div><div class='add'>+	struct tsnep_rx_desc_wb *desc_wb;</div><div class='add'>+	dma_addr_t desc_dma;</div><div class='add'>+</div><div class='add'>+	u32 properties;</div><div class='add'>+</div><div class='add'>+	union {</div><div class='add'>+		struct page *page;</div><div class='add'>+		struct xdp_buff *xdp;</div><div class='add'>+	};</div><div class='add'>+	size_t len;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_rx {</div><div class='add'>+	struct tsnep_adapter *adapter;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+	int queue_index;</div><div class='add'>+	int tx_queue_index;</div><div class='add'>+</div><div class='add'>+	void *page[TSNEP_RING_PAGE_COUNT];</div><div class='add'>+	dma_addr_t page_dma[TSNEP_RING_PAGE_COUNT];</div><div class='add'>+</div><div class='add'>+	struct tsnep_rx_entry entry[TSNEP_RING_SIZE];</div><div class='add'>+	int write;</div><div class='add'>+	int read;</div><div class='add'>+	u32 owner_counter;</div><div class='add'>+	int increment_owner_counter;</div><div class='add'>+	struct page_pool *page_pool;</div><div class='add'>+	struct page **page_buffer;</div><div class='add'>+	struct xsk_buff_pool *xsk_pool;</div><div class='add'>+	struct xdp_buff **xdp_batch;</div><div class='add'>+</div><div class='add'>+	u32 packets;</div><div class='add'>+	u32 bytes;</div><div class='add'>+	u32 dropped;</div><div class='add'>+	u32 multicast;</div><div class='add'>+	u32 alloc_failed;</div><div class='add'>+</div><div class='add'>+	struct xdp_rxq_info xdp_rxq;</div><div class='add'>+	struct xdp_rxq_info xdp_rxq_zc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_queue {</div><div class='add'>+	struct tsnep_adapter *adapter;</div><div class='add'>+	char name[IFNAMSIZ + 16];</div><div class='add'>+</div><div class='add'>+	struct tsnep_tx *tx;</div><div class='add'>+	struct tsnep_rx *rx;</div><div class='add'>+</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+</div><div class='add'>+	int irq;</div><div class='add'>+	u32 irq_mask;</div><div class='add'>+	void __iomem *irq_delay_addr;</div><div class='add'>+	u8 irq_delay;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_adapter {</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	u8 mac_address[ETH_ALEN];</div><div class='add'>+	struct mii_bus *mdiobus;</div><div class='add'>+	bool suppress_preamble;</div><div class='add'>+	phy_interface_t phy_mode;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	int msg_enable;</div><div class='add'>+</div><div class='add'>+	struct platform_device *pdev;</div><div class='add'>+	struct device *dmadev;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	bool gate_control;</div><div class='add'>+	/* gate control lock */</div><div class='add'>+	struct mutex gate_control_lock;</div><div class='add'>+	bool gate_control_active;</div><div class='add'>+	struct tsnep_gcl gcl[2];</div><div class='add'>+	int next_gcl;</div><div class='add'>+</div><div class='add'>+	struct kernel_hwtstamp_config hwtstamp_config;</div><div class='add'>+	struct ptp_clock *ptp_clock;</div><div class='add'>+	struct ptp_clock_info ptp_clock_info;</div><div class='add'>+	/* ptp clock lock */</div><div class='add'>+	spinlock_t ptp_lock;</div><div class='add'>+</div><div class='add'>+	/* RX flow classification rules lock */</div><div class='add'>+	struct mutex rxnfc_lock;</div><div class='add'>+	struct list_head rxnfc_rules;</div><div class='add'>+	int rxnfc_count;</div><div class='add'>+	int rxnfc_max;</div><div class='add'>+</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='add'>+</div><div class='add'>+	int num_tx_queues;</div><div class='add'>+	struct tsnep_tx tx[TSNEP_MAX_QUEUES];</div><div class='add'>+	int num_rx_queues;</div><div class='add'>+	struct tsnep_rx rx[TSNEP_MAX_QUEUES];</div><div class='add'>+</div><div class='add'>+	int num_queues;</div><div class='add'>+	struct tsnep_queue queue[TSNEP_MAX_QUEUES];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_ops tsnep_ethtool_ops;</div><div class='add'>+</div><div class='add'>+int tsnep_ptp_init(struct tsnep_adapter *adapter);</div><div class='add'>+void tsnep_ptp_cleanup(struct tsnep_adapter *adapter);</div><div class='add'>+int tsnep_ptp_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+			   struct kernel_hwtstamp_config *config);</div><div class='add'>+int tsnep_ptp_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+			   struct kernel_hwtstamp_config *config,</div><div class='add'>+			   struct netlink_ext_ack *extack);</div><div class='add'>+</div><div class='add'>+int tsnep_tc_init(struct tsnep_adapter *adapter);</div><div class='add'>+void tsnep_tc_cleanup(struct tsnep_adapter *adapter);</div><div class='add'>+int tsnep_tc_setup(struct net_device *netdev, enum tc_setup_type type,</div><div class='add'>+		   void *type_data);</div><div class='add'>+</div><div class='add'>+int tsnep_rxnfc_init(struct tsnep_adapter *adapter);</div><div class='add'>+void tsnep_rxnfc_cleanup(struct tsnep_adapter *adapter);</div><div class='add'>+int tsnep_rxnfc_get_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct ethtool_rxnfc *cmd);</div><div class='add'>+int tsnep_rxnfc_get_all(struct tsnep_adapter *adapter,</div><div class='add'>+			struct ethtool_rxnfc *cmd,</div><div class='add'>+			u32 *rule_locs);</div><div class='add'>+int tsnep_rxnfc_add_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct ethtool_rxnfc *cmd);</div><div class='add'>+int tsnep_rxnfc_del_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct ethtool_rxnfc *cmd);</div><div class='add'>+</div><div class='add'>+int tsnep_xdp_setup_prog(struct tsnep_adapter *adapter, struct bpf_prog *prog,</div><div class='add'>+			 struct netlink_ext_ack *extack);</div><div class='add'>+int tsnep_xdp_setup_pool(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct xsk_buff_pool *pool, u16 queue_id);</div><div class='add'>+</div><div class='add'>+#if IS_ENABLED(CONFIG_TSNEP_SELFTESTS)</div><div class='add'>+int tsnep_ethtool_get_test_count(void);</div><div class='add'>+void tsnep_ethtool_get_test_strings(u8 *data);</div><div class='add'>+void tsnep_ethtool_self_test(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_test *eth_test, u64 *data);</div><div class='add'>+#else</div><div class='add'>+static inline int tsnep_ethtool_get_test_count(void)</div><div class='add'>+{</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tsnep_ethtool_get_test_strings(u8 *data)</div><div class='add'>+{</div><div class='add'>+	/* not enabled */</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline void tsnep_ethtool_self_test(struct net_device *dev,</div><div class='add'>+					   struct ethtool_test *eth_test,</div><div class='add'>+					   u64 *data)</div><div class='add'>+{</div><div class='add'>+	/* not enabled */</div><div class='add'>+}</div><div class='add'>+#endif /* CONFIG_TSNEP_SELFTESTS */</div><div class='add'>+</div><div class='add'>+void tsnep_get_system_time(struct tsnep_adapter *adapter, u64 *time);</div><div class='add'>+int tsnep_set_irq_coalesce(struct tsnep_queue *queue, u32 usecs);</div><div class='add'>+u32 tsnep_get_irq_coalesce(struct tsnep_queue *queue);</div><div class='add'>+int tsnep_enable_xsk(struct tsnep_queue *queue, struct xsk_buff_pool *pool);</div><div class='add'>+void tsnep_disable_xsk(struct tsnep_queue *queue);</div><div class='add'>+</div><div class='add'>+#endif /* _TSNEP_H */</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_ethtool.c b/drivers/net/ethernet/engleder/tsnep_ethtool.c<br/>new file mode 100644<br/>index 000000000000..228a638eae16<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,480 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+</div><div class='add'>+static const char tsnep_stats_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"rx_packets",</div><div class='add'>+	"rx_bytes",</div><div class='add'>+	"rx_dropped",</div><div class='add'>+	"rx_multicast",</div><div class='add'>+	"rx_alloc_failed",</div><div class='add'>+	"rx_phy_errors",</div><div class='add'>+	"rx_forwarded_phy_errors",</div><div class='add'>+	"rx_invalid_frame_errors",</div><div class='add'>+	"tx_packets",</div><div class='add'>+	"tx_bytes",</div><div class='add'>+	"tx_dropped",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_stats {</div><div class='add'>+	u64 rx_packets;</div><div class='add'>+	u64 rx_bytes;</div><div class='add'>+	u64 rx_dropped;</div><div class='add'>+	u64 rx_multicast;</div><div class='add'>+	u64 rx_alloc_failed;</div><div class='add'>+	u64 rx_phy_errors;</div><div class='add'>+	u64 rx_forwarded_phy_errors;</div><div class='add'>+	u64 rx_invalid_frame_errors;</div><div class='add'>+	u64 tx_packets;</div><div class='add'>+	u64 tx_bytes;</div><div class='add'>+	u64 tx_dropped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_STATS_COUNT (sizeof(struct tsnep_stats) / sizeof(u64))</div><div class='add'>+</div><div class='add'>+static const char tsnep_rx_queue_stats_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"rx_%d_packets",</div><div class='add'>+	"rx_%d_bytes",</div><div class='add'>+	"rx_%d_dropped",</div><div class='add'>+	"rx_%d_multicast",</div><div class='add'>+	"rx_%d_alloc_failed",</div><div class='add'>+	"rx_%d_no_descriptor_errors",</div><div class='add'>+	"rx_%d_buffer_too_small_errors",</div><div class='add'>+	"rx_%d_fifo_overflow_errors",</div><div class='add'>+	"rx_%d_invalid_frame_errors",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_rx_queue_stats {</div><div class='add'>+	u64 rx_packets;</div><div class='add'>+	u64 rx_bytes;</div><div class='add'>+	u64 rx_dropped;</div><div class='add'>+	u64 rx_multicast;</div><div class='add'>+	u64 rx_alloc_failed;</div><div class='add'>+	u64 rx_no_descriptor_errors;</div><div class='add'>+	u64 rx_buffer_too_small_errors;</div><div class='add'>+	u64 rx_fifo_overflow_errors;</div><div class='add'>+	u64 rx_invalid_frame_errors;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_RX_QUEUE_STATS_COUNT (sizeof(struct tsnep_rx_queue_stats) / \</div><div class='add'>+				    sizeof(u64))</div><div class='add'>+</div><div class='add'>+static const char tsnep_tx_queue_stats_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"tx_%d_packets",</div><div class='add'>+	"tx_%d_bytes",</div><div class='add'>+	"tx_%d_dropped",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct tsnep_tx_queue_stats {</div><div class='add'>+	u64 tx_packets;</div><div class='add'>+	u64 tx_bytes;</div><div class='add'>+	u64 tx_dropped;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_TX_QUEUE_STATS_COUNT (sizeof(struct tsnep_tx_queue_stats) / \</div><div class='add'>+				    sizeof(u64))</div><div class='add'>+</div><div class='add'>+static void tsnep_ethtool_get_drvinfo(struct net_device *netdev,</div><div class='add'>+				      struct ethtool_drvinfo *drvinfo)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	strscpy(drvinfo-&gt;driver, TSNEP, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, dev_name(&amp;adapter-&gt;pdev-&gt;dev),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_get_regs_len(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int len;</div><div class='add'>+	int num_additional_queues;</div><div class='add'>+</div><div class='add'>+	len = TSNEP_MAC_SIZE;</div><div class='add'>+</div><div class='add'>+	/* first queue pair is within TSNEP_MAC_SIZE, only queues additional to</div><div class='add'>+	 * the first queue pair extend the register length by TSNEP_QUEUE_SIZE</div><div class='add'>+	 */</div><div class='add'>+	num_additional_queues =</div><div class='add'>+		max(adapter-&gt;num_tx_queues, adapter-&gt;num_rx_queues) - 1;</div><div class='add'>+	len += TSNEP_QUEUE_SIZE * num_additional_queues;</div><div class='add'>+</div><div class='add'>+	return len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_ethtool_get_regs(struct net_device *netdev,</div><div class='add'>+				   struct ethtool_regs *regs,</div><div class='add'>+				   void *p)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	regs-&gt;version = 1;</div><div class='add'>+</div><div class='add'>+	memcpy_fromio(p, adapter-&gt;addr, regs-&gt;len);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 tsnep_ethtool_get_msglevel(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	return adapter-&gt;msg_enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_ethtool_set_msglevel(struct net_device *netdev, u32 data)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;msg_enable = data;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_ethtool_get_strings(struct net_device *netdev, u32 stringset,</div><div class='add'>+				      u8 *data)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int rx_count = adapter-&gt;num_rx_queues;</div><div class='add'>+	int tx_count = adapter-&gt;num_tx_queues;</div><div class='add'>+	int i, j;</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		memcpy(data, tsnep_stats_strings, sizeof(tsnep_stats_strings));</div><div class='add'>+		data += sizeof(tsnep_stats_strings);</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; rx_count; i++) {</div><div class='add'>+			for (j = 0; j &lt; TSNEP_RX_QUEUE_STATS_COUNT; j++) {</div><div class='add'>+				snprintf(data, ETH_GSTRING_LEN,</div><div class='add'>+					 tsnep_rx_queue_stats_strings[j], i);</div><div class='add'>+				data += ETH_GSTRING_LEN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; tx_count; i++) {</div><div class='add'>+			for (j = 0; j &lt; TSNEP_TX_QUEUE_STATS_COUNT; j++) {</div><div class='add'>+				snprintf(data, ETH_GSTRING_LEN,</div><div class='add'>+					 tsnep_tx_queue_stats_strings[j], i);</div><div class='add'>+				data += ETH_GSTRING_LEN;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		tsnep_ethtool_get_test_strings(data);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_ethtool_get_ethtool_stats(struct net_device *netdev,</div><div class='add'>+					    struct ethtool_stats *stats,</div><div class='add'>+					    u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int rx_count = adapter-&gt;num_rx_queues;</div><div class='add'>+	int tx_count = adapter-&gt;num_tx_queues;</div><div class='add'>+	struct tsnep_stats tsnep_stats;</div><div class='add'>+	struct tsnep_rx_queue_stats tsnep_rx_queue_stats;</div><div class='add'>+	struct tsnep_tx_queue_stats tsnep_tx_queue_stats;</div><div class='add'>+	u32 reg;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(&amp;tsnep_stats, 0, sizeof(tsnep_stats));</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+		tsnep_stats.rx_packets += adapter-&gt;rx[i].packets;</div><div class='add'>+		tsnep_stats.rx_bytes += adapter-&gt;rx[i].bytes;</div><div class='add'>+		tsnep_stats.rx_dropped += adapter-&gt;rx[i].dropped;</div><div class='add'>+		tsnep_stats.rx_multicast += adapter-&gt;rx[i].multicast;</div><div class='add'>+		tsnep_stats.rx_alloc_failed += adapter-&gt;rx[i].alloc_failed;</div><div class='add'>+	}</div><div class='add'>+	reg = ioread32(adapter-&gt;addr + ECM_STAT);</div><div class='add'>+	tsnep_stats.rx_phy_errors =</div><div class='add'>+		(reg &amp; ECM_STAT_RX_ERR_MASK) &gt;&gt; ECM_STAT_RX_ERR_SHIFT;</div><div class='add'>+	tsnep_stats.rx_forwarded_phy_errors =</div><div class='add'>+		(reg &amp; ECM_STAT_FWD_RX_ERR_MASK) &gt;&gt; ECM_STAT_FWD_RX_ERR_SHIFT;</div><div class='add'>+	tsnep_stats.rx_invalid_frame_errors =</div><div class='add'>+		(reg &amp; ECM_STAT_INV_FRM_MASK) &gt;&gt; ECM_STAT_INV_FRM_SHIFT;</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='add'>+		tsnep_stats.tx_packets += adapter-&gt;tx[i].packets;</div><div class='add'>+		tsnep_stats.tx_bytes += adapter-&gt;tx[i].bytes;</div><div class='add'>+		tsnep_stats.tx_dropped += adapter-&gt;tx[i].dropped;</div><div class='add'>+	}</div><div class='add'>+	memcpy(data, &amp;tsnep_stats, sizeof(tsnep_stats));</div><div class='add'>+	data += TSNEP_STATS_COUNT;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; rx_count; i++) {</div><div class='add'>+		memset(&amp;tsnep_rx_queue_stats, 0, sizeof(tsnep_rx_queue_stats));</div><div class='add'>+		tsnep_rx_queue_stats.rx_packets = adapter-&gt;rx[i].packets;</div><div class='add'>+		tsnep_rx_queue_stats.rx_bytes = adapter-&gt;rx[i].bytes;</div><div class='add'>+		tsnep_rx_queue_stats.rx_dropped = adapter-&gt;rx[i].dropped;</div><div class='add'>+		tsnep_rx_queue_stats.rx_multicast = adapter-&gt;rx[i].multicast;</div><div class='add'>+		tsnep_rx_queue_stats.rx_alloc_failed =</div><div class='add'>+			adapter-&gt;rx[i].alloc_failed;</div><div class='add'>+		reg = ioread32(adapter-&gt;addr + TSNEP_QUEUE(i) +</div><div class='add'>+			       TSNEP_RX_STATISTIC);</div><div class='add'>+		tsnep_rx_queue_stats.rx_no_descriptor_errors =</div><div class='add'>+			(reg &amp; TSNEP_RX_STATISTIC_NO_DESC_MASK) &gt;&gt;</div><div class='add'>+			TSNEP_RX_STATISTIC_NO_DESC_SHIFT;</div><div class='add'>+		tsnep_rx_queue_stats.rx_buffer_too_small_errors =</div><div class='add'>+			(reg &amp; TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL_MASK) &gt;&gt;</div><div class='add'>+			TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL_SHIFT;</div><div class='add'>+		tsnep_rx_queue_stats.rx_fifo_overflow_errors =</div><div class='add'>+			(reg &amp; TSNEP_RX_STATISTIC_FIFO_OVERFLOW_MASK) &gt;&gt;</div><div class='add'>+			TSNEP_RX_STATISTIC_FIFO_OVERFLOW_SHIFT;</div><div class='add'>+		tsnep_rx_queue_stats.rx_invalid_frame_errors =</div><div class='add'>+			(reg &amp; TSNEP_RX_STATISTIC_INVALID_FRAME_MASK) &gt;&gt;</div><div class='add'>+			TSNEP_RX_STATISTIC_INVALID_FRAME_SHIFT;</div><div class='add'>+		memcpy(data, &amp;tsnep_rx_queue_stats,</div><div class='add'>+		       sizeof(tsnep_rx_queue_stats));</div><div class='add'>+		data += TSNEP_RX_QUEUE_STATS_COUNT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; tx_count; i++) {</div><div class='add'>+		memset(&amp;tsnep_tx_queue_stats, 0, sizeof(tsnep_tx_queue_stats));</div><div class='add'>+		tsnep_tx_queue_stats.tx_packets += adapter-&gt;tx[i].packets;</div><div class='add'>+		tsnep_tx_queue_stats.tx_bytes += adapter-&gt;tx[i].bytes;</div><div class='add'>+		tsnep_tx_queue_stats.tx_dropped += adapter-&gt;tx[i].dropped;</div><div class='add'>+		memcpy(data, &amp;tsnep_tx_queue_stats,</div><div class='add'>+		       sizeof(tsnep_tx_queue_stats));</div><div class='add'>+		data += TSNEP_TX_QUEUE_STATS_COUNT;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int rx_count;</div><div class='add'>+	int tx_count;</div><div class='add'>+</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		rx_count = adapter-&gt;num_rx_queues;</div><div class='add'>+		tx_count = adapter-&gt;num_tx_queues;</div><div class='add'>+		return TSNEP_STATS_COUNT +</div><div class='add'>+		       TSNEP_RX_QUEUE_STATS_COUNT * rx_count +</div><div class='add'>+		       TSNEP_TX_QUEUE_STATS_COUNT * tx_count;</div><div class='add'>+	case ETH_SS_TEST:</div><div class='add'>+		return tsnep_ethtool_get_test_count();</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_get_rxnfc(struct net_device *netdev,</div><div class='add'>+				   struct ethtool_rxnfc *cmd, u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_GRXRINGS:</div><div class='add'>+		cmd-&gt;data = adapter-&gt;num_rx_queues;</div><div class='add'>+		return 0;</div><div class='add'>+	case ETHTOOL_GRXCLSRLCNT:</div><div class='add'>+		cmd-&gt;rule_cnt = adapter-&gt;rxnfc_count;</div><div class='add'>+		cmd-&gt;data = adapter-&gt;rxnfc_max;</div><div class='add'>+		cmd-&gt;data |= RX_CLS_LOC_SPECIAL;</div><div class='add'>+		return 0;</div><div class='add'>+	case ETHTOOL_GRXCLSRULE:</div><div class='add'>+		return tsnep_rxnfc_get_rule(adapter, cmd);</div><div class='add'>+	case ETHTOOL_GRXCLSRLALL:</div><div class='add'>+		return tsnep_rxnfc_get_all(adapter, cmd, rule_locs);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_set_rxnfc(struct net_device *netdev,</div><div class='add'>+				   struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (cmd-&gt;cmd) {</div><div class='add'>+	case ETHTOOL_SRXCLSRLINS:</div><div class='add'>+		return tsnep_rxnfc_add_rule(adapter, cmd);</div><div class='add'>+	case ETHTOOL_SRXCLSRLDEL:</div><div class='add'>+		return tsnep_rxnfc_del_rule(adapter, cmd);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_ethtool_get_channels(struct net_device *netdev,</div><div class='add'>+				       struct ethtool_channels *ch)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	ch-&gt;max_combined = adapter-&gt;num_queues;</div><div class='add'>+	ch-&gt;combined_count = adapter-&gt;num_queues;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_get_ts_info(struct net_device *netdev,</div><div class='add'>+				     struct kernel_ethtool_ts_info *info)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |</div><div class='add'>+				SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='add'>+				SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='add'>+				SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;ptp_clock)</div><div class='add'>+		info-&gt;phc_index = ptp_clock_index(adapter-&gt;ptp_clock);</div><div class='add'>+</div><div class='add'>+	info-&gt;tx_types = BIT(HWTSTAMP_TX_OFF) |</div><div class='add'>+			 BIT(HWTSTAMP_TX_ON);</div><div class='add'>+	info-&gt;rx_filters = BIT(HWTSTAMP_FILTER_NONE) |</div><div class='add'>+			   BIT(HWTSTAMP_FILTER_ALL);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tsnep_queue *tsnep_get_queue_with_tx(struct tsnep_adapter *adapter,</div><div class='add'>+						   int index)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+		if (adapter-&gt;queue[i].tx) {</div><div class='add'>+			if (index == 0)</div><div class='add'>+				return &amp;adapter-&gt;queue[i];</div><div class='add'>+</div><div class='add'>+			index--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tsnep_queue *tsnep_get_queue_with_rx(struct tsnep_adapter *adapter,</div><div class='add'>+						   int index)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+		if (adapter-&gt;queue[i].rx) {</div><div class='add'>+			if (index == 0)</div><div class='add'>+				return &amp;adapter-&gt;queue[i];</div><div class='add'>+</div><div class='add'>+			index--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_get_coalesce(struct net_device *netdev,</div><div class='add'>+				      struct ethtool_coalesce *ec,</div><div class='add'>+				      struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct tsnep_queue *queue;</div><div class='add'>+</div><div class='add'>+	queue = tsnep_get_queue_with_rx(adapter, 0);</div><div class='add'>+	if (queue)</div><div class='add'>+		ec-&gt;rx_coalesce_usecs = tsnep_get_irq_coalesce(queue);</div><div class='add'>+</div><div class='add'>+	queue = tsnep_get_queue_with_tx(adapter, 0);</div><div class='add'>+	if (queue)</div><div class='add'>+		ec-&gt;tx_coalesce_usecs = tsnep_get_irq_coalesce(queue);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_set_coalesce(struct net_device *netdev,</div><div class='add'>+				      struct ethtool_coalesce *ec,</div><div class='add'>+				      struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int i;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+		/* RX coalesce has priority for queues with TX and RX */</div><div class='add'>+		if (adapter-&gt;queue[i].rx)</div><div class='add'>+			retval = tsnep_set_irq_coalesce(&amp;adapter-&gt;queue[i],</div><div class='add'>+							ec-&gt;rx_coalesce_usecs);</div><div class='add'>+		else</div><div class='add'>+			retval = tsnep_set_irq_coalesce(&amp;adapter-&gt;queue[i],</div><div class='add'>+							ec-&gt;tx_coalesce_usecs);</div><div class='add'>+		if (retval != 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_get_per_queue_coalesce(struct net_device *netdev,</div><div class='add'>+						u32 queue,</div><div class='add'>+						struct ethtool_coalesce *ec)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct tsnep_queue *queue_with_rx;</div><div class='add'>+	struct tsnep_queue *queue_with_tx;</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= max(adapter-&gt;num_tx_queues, adapter-&gt;num_rx_queues))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue_with_rx = tsnep_get_queue_with_rx(adapter, queue);</div><div class='add'>+	if (queue_with_rx)</div><div class='add'>+		ec-&gt;rx_coalesce_usecs = tsnep_get_irq_coalesce(queue_with_rx);</div><div class='add'>+</div><div class='add'>+	queue_with_tx = tsnep_get_queue_with_tx(adapter, queue);</div><div class='add'>+	if (queue_with_tx)</div><div class='add'>+		ec-&gt;tx_coalesce_usecs = tsnep_get_irq_coalesce(queue_with_tx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ethtool_set_per_queue_coalesce(struct net_device *netdev,</div><div class='add'>+						u32 queue,</div><div class='add'>+						struct ethtool_coalesce *ec)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct tsnep_queue *queue_with_rx;</div><div class='add'>+	struct tsnep_queue *queue_with_tx;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (queue &gt;= max(adapter-&gt;num_tx_queues, adapter-&gt;num_rx_queues))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue_with_rx = tsnep_get_queue_with_rx(adapter, queue);</div><div class='add'>+	if (queue_with_rx) {</div><div class='add'>+		retval = tsnep_set_irq_coalesce(queue_with_rx, ec-&gt;rx_coalesce_usecs);</div><div class='add'>+		if (retval != 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* RX coalesce has priority for queues with TX and RX */</div><div class='add'>+	queue_with_tx = tsnep_get_queue_with_tx(adapter, queue);</div><div class='add'>+	if (queue_with_tx &amp;&amp; !queue_with_tx-&gt;rx) {</div><div class='add'>+		retval = tsnep_set_irq_coalesce(queue_with_tx, ec-&gt;tx_coalesce_usecs);</div><div class='add'>+		if (retval != 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops tsnep_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_USECS,</div><div class='add'>+	.get_drvinfo = tsnep_ethtool_get_drvinfo,</div><div class='add'>+	.get_regs_len = tsnep_ethtool_get_regs_len,</div><div class='add'>+	.get_regs = tsnep_ethtool_get_regs,</div><div class='add'>+	.get_msglevel = tsnep_ethtool_get_msglevel,</div><div class='add'>+	.set_msglevel = tsnep_ethtool_set_msglevel,</div><div class='add'>+	.nway_reset = phy_ethtool_nway_reset,</div><div class='add'>+	.get_link = ethtool_op_get_link,</div><div class='add'>+	.self_test = tsnep_ethtool_self_test,</div><div class='add'>+	.get_strings = tsnep_ethtool_get_strings,</div><div class='add'>+	.get_ethtool_stats = tsnep_ethtool_get_ethtool_stats,</div><div class='add'>+	.get_sset_count = tsnep_ethtool_get_sset_count,</div><div class='add'>+	.get_rxnfc = tsnep_ethtool_get_rxnfc,</div><div class='add'>+	.set_rxnfc = tsnep_ethtool_set_rxnfc,</div><div class='add'>+	.get_channels = tsnep_ethtool_get_channels,</div><div class='add'>+	.get_ts_info = tsnep_ethtool_get_ts_info,</div><div class='add'>+	.get_coalesce = tsnep_ethtool_get_coalesce,</div><div class='add'>+	.set_coalesce = tsnep_ethtool_set_coalesce,</div><div class='add'>+	.get_per_queue_coalesce = tsnep_ethtool_get_per_queue_coalesce,</div><div class='add'>+	.set_per_queue_coalesce = tsnep_ethtool_set_per_queue_coalesce,</div><div class='add'>+	.get_link_ksettings = phy_ethtool_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings = phy_ethtool_set_link_ksettings,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_hw.h b/drivers/net/ethernet/engleder/tsnep_hw.h<br/>new file mode 100644<br/>index 000000000000..64c97eb66f67<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_hw.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_hw.h</a></div><div class='hunk'>@@ -0,0 +1,248 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+/* Hardware definition of TSNEP and EtherCAT MAC device */</div><div class='add'>+</div><div class='add'>+#ifndef _TSNEP_HW_H</div><div class='add'>+#define _TSNEP_HW_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/types.h&gt;</div><div class='add'>+</div><div class='add'>+/* type */</div><div class='add'>+#define ECM_TYPE 0x0000</div><div class='add'>+#define ECM_REVISION_MASK 0x000000FF</div><div class='add'>+#define ECM_REVISION_SHIFT 0</div><div class='add'>+#define ECM_VERSION_MASK 0x0000FF00</div><div class='add'>+#define ECM_VERSION_SHIFT 8</div><div class='add'>+#define ECM_QUEUE_COUNT_MASK 0x00070000</div><div class='add'>+#define ECM_QUEUE_COUNT_SHIFT 16</div><div class='add'>+#define ECM_GATE_CONTROL 0x02000000</div><div class='add'>+</div><div class='add'>+/* system time */</div><div class='add'>+#define ECM_SYSTEM_TIME_LOW 0x0008</div><div class='add'>+#define ECM_SYSTEM_TIME_HIGH 0x000C</div><div class='add'>+</div><div class='add'>+/* clock */</div><div class='add'>+#define ECM_CLOCK_RATE 0x0010</div><div class='add'>+#define ECM_CLOCK_RATE_OFFSET_MASK 0x7FFFFFFF</div><div class='add'>+#define ECM_CLOCK_RATE_OFFSET_SIGN 0x80000000</div><div class='add'>+</div><div class='add'>+/* interrupt */</div><div class='add'>+#define ECM_INT_ENABLE 0x0018</div><div class='add'>+#define ECM_INT_ACTIVE 0x001C</div><div class='add'>+#define ECM_INT_ACKNOWLEDGE 0x001C</div><div class='add'>+#define ECM_INT_LINK 0x00000020</div><div class='add'>+#define ECM_INT_TX_0 0x00000100</div><div class='add'>+#define ECM_INT_RX_0 0x00000200</div><div class='add'>+#define ECM_INT_TXRX_SHIFT 2</div><div class='add'>+#define ECM_INT_ALL 0x7FFFFFFF</div><div class='add'>+#define ECM_INT_DISABLE 0x80000000</div><div class='add'>+</div><div class='add'>+/* reset */</div><div class='add'>+#define ECM_RESET 0x0020</div><div class='add'>+#define ECM_RESET_COMMON 0x00000001</div><div class='add'>+#define ECM_RESET_CHANNEL 0x00000100</div><div class='add'>+#define ECM_RESET_TXRX 0x00010000</div><div class='add'>+</div><div class='add'>+/* counter */</div><div class='add'>+#define ECM_COUNTER_LOW 0x0028</div><div class='add'>+#define ECM_COUNTER_HIGH 0x002C</div><div class='add'>+</div><div class='add'>+/* interrupt delay */</div><div class='add'>+#define ECM_INT_DELAY 0x0030</div><div class='add'>+#define ECM_INT_DELAY_MASK 0xF0</div><div class='add'>+#define ECM_INT_DELAY_SHIFT 4</div><div class='add'>+#define ECM_INT_DELAY_BASE_US 16</div><div class='add'>+#define ECM_INT_DELAY_OFFSET 1</div><div class='add'>+</div><div class='add'>+/* control and status */</div><div class='add'>+#define ECM_STATUS 0x0080</div><div class='add'>+#define ECM_LINK_MODE_OFF 0x01000000</div><div class='add'>+#define ECM_LINK_MODE_100 0x02000000</div><div class='add'>+#define ECM_LINK_MODE_1000 0x04000000</div><div class='add'>+#define ECM_NO_LINK 0x01000000</div><div class='add'>+#define ECM_LINK_MODE_MASK 0x06000000</div><div class='add'>+</div><div class='add'>+/* management data */</div><div class='add'>+#define ECM_MD_CONTROL 0x0084</div><div class='add'>+#define ECM_MD_STATUS 0x0084</div><div class='add'>+#define ECM_MD_PREAMBLE 0x00000001</div><div class='add'>+#define ECM_MD_READ 0x00000004</div><div class='add'>+#define ECM_MD_WRITE 0x00000002</div><div class='add'>+#define ECM_MD_ADDR_MASK 0x000000F8</div><div class='add'>+#define ECM_MD_ADDR_SHIFT 3</div><div class='add'>+#define ECM_MD_PHY_ADDR_MASK 0x00001F00</div><div class='add'>+#define ECM_MD_PHY_ADDR_SHIFT 8</div><div class='add'>+#define ECM_MD_BUSY 0x00000001</div><div class='add'>+#define ECM_MD_DATA_MASK 0xFFFF0000</div><div class='add'>+#define ECM_MD_DATA_SHIFT 16</div><div class='add'>+</div><div class='add'>+/* statistic */</div><div class='add'>+#define ECM_STAT 0x00B0</div><div class='add'>+#define ECM_STAT_RX_ERR_MASK 0x000000FF</div><div class='add'>+#define ECM_STAT_RX_ERR_SHIFT 0</div><div class='add'>+#define ECM_STAT_INV_FRM_MASK 0x0000FF00</div><div class='add'>+#define ECM_STAT_INV_FRM_SHIFT 8</div><div class='add'>+#define ECM_STAT_FWD_RX_ERR_MASK 0x00FF0000</div><div class='add'>+#define ECM_STAT_FWD_RX_ERR_SHIFT 16</div><div class='add'>+</div><div class='add'>+/* tsnep */</div><div class='add'>+#define TSNEP_MAC_SIZE 0x4000</div><div class='add'>+#define TSNEP_QUEUE_SIZE 0x1000</div><div class='add'>+#define TSNEP_QUEUE(n) ({ typeof(n) __n = (n); \</div><div class='add'>+			  (__n) == 0 ? \</div><div class='add'>+			  0 : \</div><div class='add'>+			  TSNEP_MAC_SIZE + TSNEP_QUEUE_SIZE * ((__n) - 1); })</div><div class='add'>+#define TSNEP_MAX_QUEUES 8</div><div class='add'>+#define TSNEP_MAX_FRAME_SIZE (2 * 1024) /* hardware supports actually 16k */</div><div class='add'>+#define TSNEP_DESC_SIZE 256</div><div class='add'>+#define TSNEP_DESC_OFFSET 128</div><div class='add'>+</div><div class='add'>+/* tsnep register */</div><div class='add'>+#define TSNEP_INFO 0x0100</div><div class='add'>+#define TSNEP_INFO_TX_TIME 0x00010000</div><div class='add'>+#define TSNEP_CONTROL 0x0108</div><div class='add'>+#define TSNEP_CONTROL_TX_RESET 0x00000001</div><div class='add'>+#define TSNEP_CONTROL_TX_ENABLE 0x00000002</div><div class='add'>+#define TSNEP_CONTROL_TX_DMA_ERROR 0x00000010</div><div class='add'>+#define TSNEP_CONTROL_TX_DESC_ERROR 0x00000020</div><div class='add'>+#define TSNEP_CONTROL_RX_RESET 0x00000100</div><div class='add'>+#define TSNEP_CONTROL_RX_ENABLE 0x00000200</div><div class='add'>+#define TSNEP_CONTROL_RX_DISABLE 0x00000400</div><div class='add'>+#define TSNEP_CONTROL_RX_DMA_ERROR 0x00001000</div><div class='add'>+#define TSNEP_CONTROL_RX_DESC_ERROR 0x00002000</div><div class='add'>+#define TSNEP_TX_DESC_ADDR_LOW 0x0140</div><div class='add'>+#define TSNEP_TX_DESC_ADDR_HIGH 0x0144</div><div class='add'>+#define TSNEP_RX_DESC_ADDR_LOW 0x0180</div><div class='add'>+#define TSNEP_RX_DESC_ADDR_HIGH 0x0184</div><div class='add'>+#define TSNEP_RESET_OWNER_COUNTER 0x01</div><div class='add'>+#define TSNEP_RX_STATISTIC 0x0190</div><div class='add'>+#define TSNEP_RX_STATISTIC_NO_DESC_MASK 0x000000FF</div><div class='add'>+#define TSNEP_RX_STATISTIC_NO_DESC_SHIFT 0</div><div class='add'>+#define TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL_MASK 0x0000FF00</div><div class='add'>+#define TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL_SHIFT 8</div><div class='add'>+#define TSNEP_RX_STATISTIC_FIFO_OVERFLOW_MASK 0x00FF0000</div><div class='add'>+#define TSNEP_RX_STATISTIC_FIFO_OVERFLOW_SHIFT 16</div><div class='add'>+#define TSNEP_RX_STATISTIC_INVALID_FRAME_MASK 0xFF000000</div><div class='add'>+#define TSNEP_RX_STATISTIC_INVALID_FRAME_SHIFT 24</div><div class='add'>+#define TSNEP_RX_STATISTIC_NO_DESC 0x0190</div><div class='add'>+#define TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL 0x0191</div><div class='add'>+#define TSNEP_RX_STATISTIC_FIFO_OVERFLOW 0x0192</div><div class='add'>+#define TSNEP_RX_STATISTIC_INVALID_FRAME 0x0193</div><div class='add'>+#define TSNEP_MAC_ADDRESS_LOW 0x0800</div><div class='add'>+#define TSNEP_MAC_ADDRESS_HIGH 0x0804</div><div class='add'>+#define TSNEP_RX_FILTER 0x0806</div><div class='add'>+#define TSNEP_RX_FILTER_ACCEPT_ALL_MULTICASTS 0x0001</div><div class='add'>+#define TSNEP_RX_FILTER_ACCEPT_ALL_UNICASTS 0x0002</div><div class='add'>+#define TSNEP_GC 0x0808</div><div class='add'>+#define TSNEP_GC_ENABLE_A 0x00000002</div><div class='add'>+#define TSNEP_GC_ENABLE_B 0x00000004</div><div class='add'>+#define TSNEP_GC_DISABLE 0x00000008</div><div class='add'>+#define TSNEP_GC_ENABLE_TIMEOUT 0x00000010</div><div class='add'>+#define TSNEP_GC_ACTIVE_A 0x00000002</div><div class='add'>+#define TSNEP_GC_ACTIVE_B 0x00000004</div><div class='add'>+#define TSNEP_GC_CHANGE_AB 0x00000008</div><div class='add'>+#define TSNEP_GC_TIMEOUT_ACTIVE 0x00000010</div><div class='add'>+#define TSNEP_GC_TIMEOUT_SIGNAL 0x00000020</div><div class='add'>+#define TSNEP_GC_LIST_ERROR 0x00000080</div><div class='add'>+#define TSNEP_GC_OPEN 0x00FF0000</div><div class='add'>+#define TSNEP_GC_OPEN_SHIFT 16</div><div class='add'>+#define TSNEP_GC_NEXT_OPEN 0xFF000000</div><div class='add'>+#define TSNEP_GC_NEXT_OPEN_SHIFT 24</div><div class='add'>+#define TSNEP_GC_TIMEOUT 131072</div><div class='add'>+#define TSNEP_GC_TIME 0x080C</div><div class='add'>+#define TSNEP_GC_CHANGE 0x0810</div><div class='add'>+#define TSNEP_GCL_A 0x2000</div><div class='add'>+#define TSNEP_GCL_B 0x2800</div><div class='add'>+#define TSNEP_GCL_SIZE SZ_2K</div><div class='add'>+#define TSNEP_RX_ASSIGN 0x0840</div><div class='add'>+#define TSNEP_RX_ASSIGN_ACTIVE 0x00000001</div><div class='add'>+#define TSNEP_RX_ASSIGN_QUEUE_MASK 0x00000006</div><div class='add'>+#define TSNEP_RX_ASSIGN_QUEUE_SHIFT 1</div><div class='add'>+#define TSNEP_RX_ASSIGN_OFFSET 1</div><div class='add'>+#define TSNEP_RX_ASSIGN_ETHER_TYPE 0x0880</div><div class='add'>+#define TSNEP_RX_ASSIGN_ETHER_TYPE_OFFSET 2</div><div class='add'>+#define TSNEP_RX_ASSIGN_ETHER_TYPE_COUNT 2</div><div class='add'>+</div><div class='add'>+/* tsnep gate control list operation */</div><div class='add'>+struct tsnep_gcl_operation {</div><div class='add'>+	u32 properties;</div><div class='add'>+	u32 interval;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_GCL_COUNT (TSNEP_GCL_SIZE / sizeof(struct tsnep_gcl_operation))</div><div class='add'>+#define TSNEP_GCL_MASK 0x000000FF</div><div class='add'>+#define TSNEP_GCL_INSERT 0x20000000</div><div class='add'>+#define TSNEP_GCL_CHANGE 0x40000000</div><div class='add'>+#define TSNEP_GCL_LAST 0x80000000</div><div class='add'>+#define TSNEP_GCL_MIN_INTERVAL 32</div><div class='add'>+</div><div class='add'>+/* tsnep TX/RX descriptor */</div><div class='add'>+#define TSNEP_DESC_SIZE 256</div><div class='add'>+#define TSNEP_DESC_SIZE_DATA_AFTER 2048</div><div class='add'>+#define TSNEP_DESC_OFFSET 128</div><div class='add'>+#define TSNEP_DESC_SIZE_DATA_AFTER_INLINE (64 - sizeof(struct tsnep_tx_desc) + \</div><div class='add'>+					   sizeof_field(struct tsnep_tx_desc, tx))</div><div class='add'>+#define TSNEP_DESC_OWNER_COUNTER_MASK 0xC0000000</div><div class='add'>+#define TSNEP_DESC_OWNER_COUNTER_SHIFT 30</div><div class='add'>+#define TSNEP_DESC_LENGTH_MASK 0x00003FFF</div><div class='add'>+#define TSNEP_DESC_INTERRUPT_FLAG 0x00040000</div><div class='add'>+#define TSNEP_DESC_EXTENDED_WRITEBACK_FLAG 0x00080000</div><div class='add'>+#define TSNEP_DESC_NO_LINK_FLAG 0x01000000</div><div class='add'>+</div><div class='add'>+/* tsnep TX descriptor */</div><div class='add'>+struct tsnep_tx_desc {</div><div class='add'>+	__le32 properties;</div><div class='add'>+	__le32 more_properties;</div><div class='add'>+	__le32 reserved[2];</div><div class='add'>+	__le64 next;</div><div class='add'>+	__le64 tx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_TX_DESC_OWNER_MASK 0xE0000000</div><div class='add'>+#define TSNEP_TX_DESC_OWNER_USER_FLAG 0x20000000</div><div class='add'>+#define TSNEP_TX_DESC_LAST_FRAGMENT_FLAG 0x00010000</div><div class='add'>+#define TSNEP_TX_DESC_DATA_AFTER_DESC_FLAG 0x00020000</div><div class='add'>+</div><div class='add'>+/* tsnep TX descriptor writeback */</div><div class='add'>+struct tsnep_tx_desc_wb {</div><div class='add'>+	__le32 properties;</div><div class='add'>+	__le32 reserved1;</div><div class='add'>+	__le64 counter;</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+	__le32 dma_delay;</div><div class='add'>+	__le32 reserved2;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_TX_DESC_UNDERRUN_ERROR_FLAG 0x00010000</div><div class='add'>+#define TSNEP_TX_DESC_DMA_DELAY_FIRST_DATA_MASK 0x0000FFFC</div><div class='add'>+#define TSNEP_TX_DESC_DMA_DELAY_FIRST_DATA_SHIFT 2</div><div class='add'>+#define TSNEP_TX_DESC_DMA_DELAY_LAST_DATA_MASK 0xFFFC0000</div><div class='add'>+#define TSNEP_TX_DESC_DMA_DELAY_LAST_DATA_SHIFT 18</div><div class='add'>+#define TSNEP_TX_DESC_DMA_DELAY_NS 64</div><div class='add'>+</div><div class='add'>+/* tsnep RX descriptor */</div><div class='add'>+struct tsnep_rx_desc {</div><div class='add'>+	__le32 properties;</div><div class='add'>+	__le32 reserved[3];</div><div class='add'>+	__le64 next;</div><div class='add'>+	__le64 rx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_RX_DESC_BUFFER_SIZE_MASK 0x00003FFC</div><div class='add'>+</div><div class='add'>+/* tsnep RX descriptor writeback */</div><div class='add'>+struct tsnep_rx_desc_wb {</div><div class='add'>+	__le32 properties;</div><div class='add'>+	__le32 reserved[7];</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* tsnep RX inline meta */</div><div class='add'>+struct tsnep_rx_inline {</div><div class='add'>+	__le64 counter;</div><div class='add'>+	__le64 timestamp;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_RX_INLINE_METADATA_SIZE (sizeof(struct tsnep_rx_inline))</div><div class='add'>+</div><div class='add'>+#endif /* _TSNEP_HW_H */</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c<br/>new file mode 100644<br/>index 000000000000..b118407c30e8<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_main.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_main.c</a></div><div class='hunk'>@@ -0,0 +1,2715 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+/* TSN endpoint Ethernet MAC driver</div><div class='add'>+ *</div><div class='add'>+ * The TSN endpoint Ethernet MAC is a FPGA based network device for real-time</div><div class='add'>+ * communication. It is designed for endpoints within TSN (Time Sensitive</div><div class='add'>+ * Networking) networks; e.g., for PLCs in the industrial automation case.</div><div class='add'>+ *</div><div class='add'>+ * It supports multiple TX/RX queue pairs. The first TX/RX queue pair is used</div><div class='add'>+ * by the driver.</div><div class='add'>+ *</div><div class='add'>+ * More information can be found here:</div><div class='add'>+ * - www.embedded-experts.at/tsn</div><div class='add'>+ * - www.engleder-embedded.com</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+#include "tsnep_hw.h"</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/phy.h&gt;</div><div class='add'>+#include &lt;linux/iopoll.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/bpf_trace.h&gt;</div><div class='add'>+#include &lt;net/page_pool/helpers.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='add'>+</div><div class='add'>+#define TSNEP_RX_OFFSET (max(NET_SKB_PAD, XDP_PACKET_HEADROOM) + NET_IP_ALIGN)</div><div class='add'>+#define TSNEP_HEADROOM ALIGN(TSNEP_RX_OFFSET, 4)</div><div class='add'>+#define TSNEP_MAX_RX_BUF_SIZE (PAGE_SIZE - TSNEP_HEADROOM - \</div><div class='add'>+			       SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='add'>+/* XSK buffer shall store at least Q-in-Q frame */</div><div class='add'>+#define TSNEP_XSK_RX_BUF_SIZE (ALIGN(TSNEP_RX_INLINE_METADATA_SIZE + \</div><div class='add'>+				     ETH_FRAME_LEN + ETH_FCS_LEN + \</div><div class='add'>+				     VLAN_HLEN * 2, 4))</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT</div><div class='add'>+#define DMA_ADDR_HIGH(dma_addr) ((u32)(((dma_addr) &gt;&gt; 32) &amp; 0xFFFFFFFF))</div><div class='add'>+#else</div><div class='add'>+#define DMA_ADDR_HIGH(dma_addr) ((u32)(0))</div><div class='add'>+#endif</div><div class='add'>+#define DMA_ADDR_LOW(dma_addr) ((u32)((dma_addr) &amp; 0xFFFFFFFF))</div><div class='add'>+</div><div class='add'>+#define TSNEP_COALESCE_USECS_DEFAULT 64</div><div class='add'>+#define TSNEP_COALESCE_USECS_MAX     ((ECM_INT_DELAY_MASK &gt;&gt; ECM_INT_DELAY_SHIFT) * \</div><div class='add'>+				      ECM_INT_DELAY_BASE_US + ECM_INT_DELAY_BASE_US - 1)</div><div class='add'>+</div><div class='add'>+/* mapping type */</div><div class='add'>+#define TSNEP_TX_TYPE_MAP		BIT(0)</div><div class='add'>+#define TSNEP_TX_TYPE_MAP_PAGE		BIT(1)</div><div class='add'>+#define TSNEP_TX_TYPE_INLINE		BIT(2)</div><div class='add'>+/* buffer type */</div><div class='add'>+#define TSNEP_TX_TYPE_SKB		BIT(8)</div><div class='add'>+#define TSNEP_TX_TYPE_SKB_MAP		(TSNEP_TX_TYPE_SKB | TSNEP_TX_TYPE_MAP)</div><div class='add'>+#define TSNEP_TX_TYPE_SKB_INLINE	(TSNEP_TX_TYPE_SKB | TSNEP_TX_TYPE_INLINE)</div><div class='add'>+#define TSNEP_TX_TYPE_SKB_FRAG		BIT(9)</div><div class='add'>+#define TSNEP_TX_TYPE_SKB_FRAG_MAP_PAGE	(TSNEP_TX_TYPE_SKB_FRAG | TSNEP_TX_TYPE_MAP_PAGE)</div><div class='add'>+#define TSNEP_TX_TYPE_SKB_FRAG_INLINE	(TSNEP_TX_TYPE_SKB_FRAG | TSNEP_TX_TYPE_INLINE)</div><div class='add'>+#define TSNEP_TX_TYPE_XDP_TX		BIT(10)</div><div class='add'>+#define TSNEP_TX_TYPE_XDP_NDO		BIT(11)</div><div class='add'>+#define TSNEP_TX_TYPE_XDP_NDO_MAP_PAGE	(TSNEP_TX_TYPE_XDP_NDO | TSNEP_TX_TYPE_MAP_PAGE)</div><div class='add'>+#define TSNEP_TX_TYPE_XDP		(TSNEP_TX_TYPE_XDP_TX | TSNEP_TX_TYPE_XDP_NDO)</div><div class='add'>+#define TSNEP_TX_TYPE_XSK		BIT(12)</div><div class='add'>+#define TSNEP_TX_TYPE_TSTAMP		BIT(13)</div><div class='add'>+#define TSNEP_TX_TYPE_SKB_TSTAMP	(TSNEP_TX_TYPE_SKB | TSNEP_TX_TYPE_TSTAMP)</div><div class='add'>+</div><div class='add'>+#define TSNEP_XDP_TX		BIT(0)</div><div class='add'>+#define TSNEP_XDP_REDIRECT	BIT(1)</div><div class='add'>+</div><div class='add'>+static void tsnep_enable_irq(struct tsnep_adapter *adapter, u32 mask)</div><div class='add'>+{</div><div class='add'>+	iowrite32(mask, adapter-&gt;addr + ECM_INT_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_disable_irq(struct tsnep_adapter *adapter, u32 mask)</div><div class='add'>+{</div><div class='add'>+	mask |= ECM_INT_DISABLE;</div><div class='add'>+	iowrite32(mask, adapter-&gt;addr + ECM_INT_ENABLE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t tsnep_irq(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = arg;</div><div class='add'>+	u32 active = ioread32(adapter-&gt;addr + ECM_INT_ACTIVE);</div><div class='add'>+</div><div class='add'>+	/* acknowledge interrupt */</div><div class='add'>+	if (active != 0)</div><div class='add'>+		iowrite32(active, adapter-&gt;addr + ECM_INT_ACKNOWLEDGE);</div><div class='add'>+</div><div class='add'>+	/* handle link interrupt */</div><div class='add'>+	if ((active &amp; ECM_INT_LINK) != 0)</div><div class='add'>+		phy_mac_interrupt(adapter-&gt;netdev-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	/* handle TX/RX queue 0 interrupt */</div><div class='add'>+	if ((active &amp; adapter-&gt;queue[0].irq_mask) != 0) {</div><div class='add'>+		if (napi_schedule_prep(&amp;adapter-&gt;queue[0].napi)) {</div><div class='add'>+			tsnep_disable_irq(adapter, adapter-&gt;queue[0].irq_mask);</div><div class='add'>+			/* schedule after masking to avoid races */</div><div class='add'>+			__napi_schedule(&amp;adapter-&gt;queue[0].napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t tsnep_irq_txrx(int irq, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_queue *queue = arg;</div><div class='add'>+</div><div class='add'>+	/* handle TX/RX queue interrupt */</div><div class='add'>+	if (napi_schedule_prep(&amp;queue-&gt;napi)) {</div><div class='add'>+		tsnep_disable_irq(queue-&gt;adapter, queue-&gt;irq_mask);</div><div class='add'>+		/* schedule after masking to avoid races */</div><div class='add'>+		__napi_schedule(&amp;queue-&gt;napi);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_set_irq_coalesce(struct tsnep_queue *queue, u32 usecs)</div><div class='add'>+{</div><div class='add'>+	if (usecs &gt; TSNEP_COALESCE_USECS_MAX)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+</div><div class='add'>+	usecs /= ECM_INT_DELAY_BASE_US;</div><div class='add'>+	usecs &lt;&lt;= ECM_INT_DELAY_SHIFT;</div><div class='add'>+	usecs &amp;= ECM_INT_DELAY_MASK;</div><div class='add'>+</div><div class='add'>+	queue-&gt;irq_delay &amp;= ~ECM_INT_DELAY_MASK;</div><div class='add'>+	queue-&gt;irq_delay |= usecs;</div><div class='add'>+	iowrite8(queue-&gt;irq_delay, queue-&gt;irq_delay_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+u32 tsnep_get_irq_coalesce(struct tsnep_queue *queue)</div><div class='add'>+{</div><div class='add'>+	u32 usecs;</div><div class='add'>+</div><div class='add'>+	usecs = (queue-&gt;irq_delay &amp; ECM_INT_DELAY_MASK);</div><div class='add'>+	usecs &gt;&gt;= ECM_INT_DELAY_SHIFT;</div><div class='add'>+	usecs *= ECM_INT_DELAY_BASE_US;</div><div class='add'>+</div><div class='add'>+	return usecs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_mdiobus_read(struct mii_bus *bus, int addr, int regnum)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = bus-&gt;priv;</div><div class='add'>+	u32 md;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	md = ECM_MD_READ;</div><div class='add'>+	if (!adapter-&gt;suppress_preamble)</div><div class='add'>+		md |= ECM_MD_PREAMBLE;</div><div class='add'>+	md |= (regnum &lt;&lt; ECM_MD_ADDR_SHIFT) &amp; ECM_MD_ADDR_MASK;</div><div class='add'>+	md |= (addr &lt;&lt; ECM_MD_PHY_ADDR_SHIFT) &amp; ECM_MD_PHY_ADDR_MASK;</div><div class='add'>+	iowrite32(md, adapter-&gt;addr + ECM_MD_CONTROL);</div><div class='add'>+	retval = readl_poll_timeout_atomic(adapter-&gt;addr + ECM_MD_STATUS, md,</div><div class='add'>+					   !(md &amp; ECM_MD_BUSY), 16, 1000);</div><div class='add'>+	if (retval != 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	return (md &amp; ECM_MD_DATA_MASK) &gt;&gt; ECM_MD_DATA_SHIFT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_mdiobus_write(struct mii_bus *bus, int addr, int regnum,</div><div class='add'>+			       u16 val)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = bus-&gt;priv;</div><div class='add'>+	u32 md;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	md = ECM_MD_WRITE;</div><div class='add'>+	if (!adapter-&gt;suppress_preamble)</div><div class='add'>+		md |= ECM_MD_PREAMBLE;</div><div class='add'>+	md |= (regnum &lt;&lt; ECM_MD_ADDR_SHIFT) &amp; ECM_MD_ADDR_MASK;</div><div class='add'>+	md |= (addr &lt;&lt; ECM_MD_PHY_ADDR_SHIFT) &amp; ECM_MD_PHY_ADDR_MASK;</div><div class='add'>+	md |= ((u32)val &lt;&lt; ECM_MD_DATA_SHIFT) &amp; ECM_MD_DATA_MASK;</div><div class='add'>+	iowrite32(md, adapter-&gt;addr + ECM_MD_CONTROL);</div><div class='add'>+	retval = readl_poll_timeout_atomic(adapter-&gt;addr + ECM_MD_STATUS, md,</div><div class='add'>+					   !(md &amp; ECM_MD_BUSY), 16, 1000);</div><div class='add'>+	if (retval != 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_set_link_mode(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 mode;</div><div class='add'>+</div><div class='add'>+	switch (adapter-&gt;phydev-&gt;speed) {</div><div class='add'>+	case SPEED_100:</div><div class='add'>+		mode = ECM_LINK_MODE_100;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+		mode = ECM_LINK_MODE_1000;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		mode = ECM_LINK_MODE_OFF;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	iowrite32(mode, adapter-&gt;addr + ECM_STATUS);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_phy_link_status_change(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	if (phydev-&gt;link)</div><div class='add'>+		tsnep_set_link_mode(adapter);</div><div class='add'>+</div><div class='add'>+	phy_print_status(netdev-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_phy_loopback(struct tsnep_adapter *adapter, bool enable)</div><div class='add'>+{</div><div class='add'>+	int speed;</div><div class='add'>+</div><div class='add'>+	if (enable) {</div><div class='add'>+		if (adapter-&gt;phydev-&gt;autoneg == AUTONEG_DISABLE &amp;&amp;</div><div class='add'>+		    adapter-&gt;phydev-&gt;speed == SPEED_100)</div><div class='add'>+			speed = SPEED_100;</div><div class='add'>+		else</div><div class='add'>+			speed = SPEED_1000;</div><div class='add'>+	} else {</div><div class='add'>+		speed = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return phy_loopback(adapter-&gt;phydev, enable, speed);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_phy_open(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	struct ethtool_keee ethtool_keee;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = phy_connect_direct(adapter-&gt;netdev, adapter-&gt;phydev,</div><div class='add'>+				    tsnep_phy_link_status_change,</div><div class='add'>+				    adapter-&gt;phy_mode);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+	phydev = adapter-&gt;netdev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	/* MAC supports only 100Mbps|1000Mbps full duplex</div><div class='add'>+	 * SPE (Single Pair Ethernet) is also an option but not implemented yet</div><div class='add'>+	 */</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Full_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);</div><div class='add'>+	phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);</div><div class='add'>+</div><div class='add'>+	/* disable EEE autoneg, EEE not supported by TSNEP */</div><div class='add'>+	memset(&amp;ethtool_keee, 0, sizeof(ethtool_keee));</div><div class='add'>+	phy_ethtool_set_eee(adapter-&gt;phydev, &amp;ethtool_keee);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;phydev-&gt;irq = PHY_MAC_INTERRUPT;</div><div class='add'>+	phy_start(adapter-&gt;phydev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_phy_close(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	phy_stop(adapter-&gt;netdev-&gt;phydev);</div><div class='add'>+	phy_disconnect(adapter-&gt;netdev-&gt;phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_tx_ring_cleanup(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = tx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	memset(tx-&gt;entry, 0, sizeof(tx-&gt;entry));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_PAGE_COUNT; i++) {</div><div class='add'>+		if (tx-&gt;page[i]) {</div><div class='add'>+			dma_free_coherent(dmadev, PAGE_SIZE, tx-&gt;page[i],</div><div class='add'>+					  tx-&gt;page_dma[i]);</div><div class='add'>+			tx-&gt;page[i] = NULL;</div><div class='add'>+			tx-&gt;page_dma[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tx_ring_create(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = tx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	struct tsnep_tx_entry *next_entry;</div><div class='add'>+	int i, j;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_PAGE_COUNT; i++) {</div><div class='add'>+		tx-&gt;page[i] =</div><div class='add'>+			dma_alloc_coherent(dmadev, PAGE_SIZE, &amp;tx-&gt;page_dma[i],</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!tx-&gt;page[i]) {</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+			goto alloc_failed;</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; TSNEP_RING_ENTRIES_PER_PAGE; j++) {</div><div class='add'>+			entry = &amp;tx-&gt;entry[TSNEP_RING_ENTRIES_PER_PAGE * i + j];</div><div class='add'>+			entry-&gt;desc_wb = (struct tsnep_tx_desc_wb *)</div><div class='add'>+				(((u8 *)tx-&gt;page[i]) + TSNEP_DESC_SIZE * j);</div><div class='add'>+			entry-&gt;desc = (struct tsnep_tx_desc *)</div><div class='add'>+				(((u8 *)entry-&gt;desc_wb) + TSNEP_DESC_OFFSET);</div><div class='add'>+			entry-&gt;desc_dma = tx-&gt;page_dma[i] + TSNEP_DESC_SIZE * j;</div><div class='add'>+			entry-&gt;owner_user_flag = false;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE; i++) {</div><div class='add'>+		entry = &amp;tx-&gt;entry[i];</div><div class='add'>+		next_entry = &amp;tx-&gt;entry[(i + 1) &amp; TSNEP_RING_MASK];</div><div class='add'>+		entry-&gt;desc-&gt;next = __cpu_to_le64(next_entry-&gt;desc_dma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+alloc_failed:</div><div class='add'>+	tsnep_tx_ring_cleanup(tx);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_tx_init(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	dma = tx-&gt;entry[0].desc_dma | TSNEP_RESET_OWNER_COUNTER;</div><div class='add'>+	iowrite32(DMA_ADDR_LOW(dma), tx-&gt;addr + TSNEP_TX_DESC_ADDR_LOW);</div><div class='add'>+	iowrite32(DMA_ADDR_HIGH(dma), tx-&gt;addr + TSNEP_TX_DESC_ADDR_HIGH);</div><div class='add'>+	tx-&gt;write = 0;</div><div class='add'>+	tx-&gt;read = 0;</div><div class='add'>+	tx-&gt;owner_counter = 1;</div><div class='add'>+	tx-&gt;increment_owner_counter = TSNEP_RING_SIZE - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_tx_enable(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+</div><div class='add'>+	nq = netdev_get_tx_queue(tx-&gt;adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+</div><div class='add'>+	__netif_tx_lock_bh(nq);</div><div class='add'>+	netif_tx_wake_queue(nq);</div><div class='add'>+	__netif_tx_unlock_bh(nq);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_tx_disable(struct tsnep_tx *tx, struct napi_struct *napi)</div><div class='add'>+{</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	nq = netdev_get_tx_queue(tx-&gt;adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+</div><div class='add'>+	__netif_tx_lock_bh(nq);</div><div class='add'>+	netif_tx_stop_queue(nq);</div><div class='add'>+	__netif_tx_unlock_bh(nq);</div><div class='add'>+</div><div class='add'>+	/* wait until TX is done in hardware */</div><div class='add'>+	readx_poll_timeout(ioread32, tx-&gt;addr + TSNEP_CONTROL, val,</div><div class='add'>+			   ((val &amp; TSNEP_CONTROL_TX_ENABLE) == 0), 10000,</div><div class='add'>+			   1000000);</div><div class='add'>+</div><div class='add'>+	/* wait until TX is also done in software */</div><div class='add'>+	while (READ_ONCE(tx-&gt;read) != tx-&gt;write) {</div><div class='add'>+		napi_schedule(napi);</div><div class='add'>+		napi_synchronize(napi);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_tx_activate(struct tsnep_tx *tx, int index, int length,</div><div class='add'>+			      bool last)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_tx_entry *entry = &amp;tx-&gt;entry[index];</div><div class='add'>+</div><div class='add'>+	entry-&gt;properties = 0;</div><div class='add'>+	/* xdpf and zc are union with skb */</div><div class='add'>+	if (entry-&gt;skb) {</div><div class='add'>+		entry-&gt;properties = length &amp; TSNEP_DESC_LENGTH_MASK;</div><div class='add'>+		entry-&gt;properties |= TSNEP_DESC_INTERRUPT_FLAG;</div><div class='add'>+		if ((entry-&gt;type &amp; TSNEP_TX_TYPE_SKB_TSTAMP) == TSNEP_TX_TYPE_SKB_TSTAMP)</div><div class='add'>+			entry-&gt;properties |= TSNEP_DESC_EXTENDED_WRITEBACK_FLAG;</div><div class='add'>+</div><div class='add'>+		/* toggle user flag to prevent false acknowledge</div><div class='add'>+		 *</div><div class='add'>+		 * Only the first fragment is acknowledged. For all other</div><div class='add'>+		 * fragments no acknowledge is done and the last written owner</div><div class='add'>+		 * counter stays in the writeback descriptor. Therefore, it is</div><div class='add'>+		 * possible that the last written owner counter is identical to</div><div class='add'>+		 * the new incremented owner counter and a false acknowledge is</div><div class='add'>+		 * detected before the real acknowledge has been done by</div><div class='add'>+		 * hardware.</div><div class='add'>+		 *</div><div class='add'>+		 * The user flag is used to prevent this situation. The user</div><div class='add'>+		 * flag is copied to the writeback descriptor by the hardware</div><div class='add'>+		 * and is used as additional acknowledge data. By toggeling the</div><div class='add'>+		 * user flag only for the first fragment (which is</div><div class='add'>+		 * acknowledged), it is guaranteed that the last acknowledge</div><div class='add'>+		 * done for this descriptor has used a different user flag and</div><div class='add'>+		 * cannot be detected as false acknowledge.</div><div class='add'>+		 */</div><div class='add'>+		entry-&gt;owner_user_flag = !entry-&gt;owner_user_flag;</div><div class='add'>+	}</div><div class='add'>+	if (last)</div><div class='add'>+		entry-&gt;properties |= TSNEP_TX_DESC_LAST_FRAGMENT_FLAG;</div><div class='add'>+	if (index == tx-&gt;increment_owner_counter) {</div><div class='add'>+		tx-&gt;owner_counter++;</div><div class='add'>+		if (tx-&gt;owner_counter == 4)</div><div class='add'>+			tx-&gt;owner_counter = 1;</div><div class='add'>+		tx-&gt;increment_owner_counter--;</div><div class='add'>+		if (tx-&gt;increment_owner_counter &lt; 0)</div><div class='add'>+			tx-&gt;increment_owner_counter = TSNEP_RING_SIZE - 1;</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;properties |=</div><div class='add'>+		(tx-&gt;owner_counter &lt;&lt; TSNEP_DESC_OWNER_COUNTER_SHIFT) &amp;</div><div class='add'>+		TSNEP_DESC_OWNER_COUNTER_MASK;</div><div class='add'>+	if (entry-&gt;owner_user_flag)</div><div class='add'>+		entry-&gt;properties |= TSNEP_TX_DESC_OWNER_USER_FLAG;</div><div class='add'>+	entry-&gt;desc-&gt;more_properties =</div><div class='add'>+		__cpu_to_le32(entry-&gt;len &amp; TSNEP_DESC_LENGTH_MASK);</div><div class='add'>+	if (entry-&gt;type &amp; TSNEP_TX_TYPE_INLINE)</div><div class='add'>+		entry-&gt;properties |= TSNEP_TX_DESC_DATA_AFTER_DESC_FLAG;</div><div class='add'>+</div><div class='add'>+	/* descriptor properties shall be written last, because valid data is</div><div class='add'>+	 * signaled there</div><div class='add'>+	 */</div><div class='add'>+	dma_wmb();</div><div class='add'>+</div><div class='add'>+	entry-&gt;desc-&gt;properties = __cpu_to_le32(entry-&gt;properties);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tx_desc_available(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	if (tx-&gt;read &lt;= tx-&gt;write)</div><div class='add'>+		return TSNEP_RING_SIZE - tx-&gt;write + tx-&gt;read - 1;</div><div class='add'>+	else</div><div class='add'>+		return tx-&gt;read - tx-&gt;write - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tx_map_frag(skb_frag_t *frag, struct tsnep_tx_entry *entry,</div><div class='add'>+			     struct device *dmadev, dma_addr_t *dma)</div><div class='add'>+{</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int mapped;</div><div class='add'>+</div><div class='add'>+	len = skb_frag_size(frag);</div><div class='add'>+	if (likely(len &gt; TSNEP_DESC_SIZE_DATA_AFTER_INLINE)) {</div><div class='add'>+		*dma = skb_frag_dma_map(dmadev, frag, 0, len, DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(dmadev, *dma))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		entry-&gt;type = TSNEP_TX_TYPE_SKB_FRAG_MAP_PAGE;</div><div class='add'>+		mapped = 1;</div><div class='add'>+	} else {</div><div class='add'>+		void *fragdata = skb_frag_address_safe(frag);</div><div class='add'>+</div><div class='add'>+		if (likely(fragdata)) {</div><div class='add'>+			memcpy(&amp;entry-&gt;desc-&gt;tx, fragdata, len);</div><div class='add'>+		} else {</div><div class='add'>+			struct page *page = skb_frag_page(frag);</div><div class='add'>+</div><div class='add'>+			fragdata = kmap_local_page(page);</div><div class='add'>+			memcpy(&amp;entry-&gt;desc-&gt;tx, fragdata + skb_frag_off(frag),</div><div class='add'>+			       len);</div><div class='add'>+			kunmap_local(fragdata);</div><div class='add'>+		}</div><div class='add'>+		entry-&gt;type = TSNEP_TX_TYPE_SKB_FRAG_INLINE;</div><div class='add'>+		mapped = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return mapped;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tx_map(struct sk_buff *skb, struct tsnep_tx *tx, int count,</div><div class='add'>+			bool do_tstamp)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = tx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int map_len = 0;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	int i, mapped;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		entry = &amp;tx-&gt;entry[(tx-&gt;write + i) &amp; TSNEP_RING_MASK];</div><div class='add'>+</div><div class='add'>+		if (!i) {</div><div class='add'>+			len = skb_headlen(skb);</div><div class='add'>+			if (likely(len &gt; TSNEP_DESC_SIZE_DATA_AFTER_INLINE)) {</div><div class='add'>+				dma = dma_map_single(dmadev, skb-&gt;data, len,</div><div class='add'>+						     DMA_TO_DEVICE);</div><div class='add'>+				if (dma_mapping_error(dmadev, dma))</div><div class='add'>+					return -ENOMEM;</div><div class='add'>+				entry-&gt;type = TSNEP_TX_TYPE_SKB_MAP;</div><div class='add'>+				mapped = 1;</div><div class='add'>+			} else {</div><div class='add'>+				memcpy(&amp;entry-&gt;desc-&gt;tx, skb-&gt;data, len);</div><div class='add'>+				entry-&gt;type = TSNEP_TX_TYPE_SKB_INLINE;</div><div class='add'>+				mapped = 0;</div><div class='add'>+			}</div><div class='add'>+</div><div class='add'>+			if (do_tstamp)</div><div class='add'>+				entry-&gt;type |= TSNEP_TX_TYPE_TSTAMP;</div><div class='add'>+		} else {</div><div class='add'>+			skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i - 1];</div><div class='add'>+</div><div class='add'>+			len = skb_frag_size(frag);</div><div class='add'>+			mapped = tsnep_tx_map_frag(frag, entry, dmadev, &amp;dma);</div><div class='add'>+			if (mapped &lt; 0)</div><div class='add'>+				return mapped;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		entry-&gt;len = len;</div><div class='add'>+		if (likely(mapped)) {</div><div class='add'>+			dma_unmap_addr_set(entry, dma, dma);</div><div class='add'>+			entry-&gt;desc-&gt;tx = __cpu_to_le64(dma);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		map_len += len;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return map_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tx_unmap(struct tsnep_tx *tx, int index, int count)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = tx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	int map_len = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		entry = &amp;tx-&gt;entry[(index + i) &amp; TSNEP_RING_MASK];</div><div class='add'>+</div><div class='add'>+		if (entry-&gt;len) {</div><div class='add'>+			if (entry-&gt;type &amp; TSNEP_TX_TYPE_MAP)</div><div class='add'>+				dma_unmap_single(dmadev,</div><div class='add'>+						 dma_unmap_addr(entry, dma),</div><div class='add'>+						 dma_unmap_len(entry, len),</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='add'>+			else if (entry-&gt;type &amp; TSNEP_TX_TYPE_MAP_PAGE)</div><div class='add'>+				dma_unmap_page(dmadev,</div><div class='add'>+					       dma_unmap_addr(entry, dma),</div><div class='add'>+					       dma_unmap_len(entry, len),</div><div class='add'>+					       DMA_TO_DEVICE);</div><div class='add'>+			map_len += entry-&gt;len;</div><div class='add'>+			entry-&gt;len = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return map_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t tsnep_xmit_frame_ring(struct sk_buff *skb,</div><div class='add'>+					 struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	bool do_tstamp = false;</div><div class='add'>+	int count = 1;</div><div class='add'>+	int length;</div><div class='add'>+	int retval;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	if (skb_shinfo(skb)-&gt;nr_frags &gt; 0)</div><div class='add'>+		count += skb_shinfo(skb)-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	if (tsnep_tx_desc_available(tx) &lt; count) {</div><div class='add'>+		/* ring full, shall not happen because queue is stopped if full</div><div class='add'>+		 * below</div><div class='add'>+		 */</div><div class='add'>+		netif_stop_subqueue(tx-&gt;adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+</div><div class='add'>+		return NETDEV_TX_BUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	entry = &amp;tx-&gt;entry[tx-&gt;write];</div><div class='add'>+	entry-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) &amp;&amp;</div><div class='add'>+	    tx-&gt;adapter-&gt;hwtstamp_config.tx_type == HWTSTAMP_TX_ON) {</div><div class='add'>+		skb_shinfo(skb)-&gt;tx_flags |= SKBTX_IN_PROGRESS;</div><div class='add'>+		do_tstamp = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tsnep_tx_map(skb, tx, count, do_tstamp);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		tsnep_tx_unmap(tx, tx-&gt;write, count);</div><div class='add'>+		dev_kfree_skb_any(entry-&gt;skb);</div><div class='add'>+		entry-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+		tx-&gt;dropped++;</div><div class='add'>+</div><div class='add'>+		return NETDEV_TX_OK;</div><div class='add'>+	}</div><div class='add'>+	length = retval;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		tsnep_tx_activate(tx, (tx-&gt;write + i) &amp; TSNEP_RING_MASK, length,</div><div class='add'>+				  i == count - 1);</div><div class='add'>+	tx-&gt;write = (tx-&gt;write + count) &amp; TSNEP_RING_MASK;</div><div class='add'>+</div><div class='add'>+	skb_tx_timestamp(skb);</div><div class='add'>+</div><div class='add'>+	/* descriptor properties shall be valid before hardware is notified */</div><div class='add'>+	dma_wmb();</div><div class='add'>+</div><div class='add'>+	iowrite32(TSNEP_CONTROL_TX_ENABLE, tx-&gt;addr + TSNEP_CONTROL);</div><div class='add'>+</div><div class='add'>+	if (tsnep_tx_desc_available(tx) &lt; (MAX_SKB_FRAGS + 1)) {</div><div class='add'>+		/* ring can get full with next frame */</div><div class='add'>+		netif_stop_subqueue(tx-&gt;adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_xdp_tx_map(struct xdp_frame *xdpf, struct tsnep_tx *tx,</div><div class='add'>+			    struct skb_shared_info *shinfo, int count, u32 type)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = tx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	struct page *page;</div><div class='add'>+	skb_frag_t *frag;</div><div class='add'>+	unsigned int len;</div><div class='add'>+	int map_len = 0;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+	void *data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	frag = NULL;</div><div class='add'>+	len = xdpf-&gt;len;</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		entry = &amp;tx-&gt;entry[(tx-&gt;write + i) &amp; TSNEP_RING_MASK];</div><div class='add'>+		if (type &amp; TSNEP_TX_TYPE_XDP_NDO) {</div><div class='add'>+			data = unlikely(frag) ? skb_frag_address(frag) :</div><div class='add'>+						xdpf-&gt;data;</div><div class='add'>+			dma = dma_map_single(dmadev, data, len, DMA_TO_DEVICE);</div><div class='add'>+			if (dma_mapping_error(dmadev, dma))</div><div class='add'>+				return -ENOMEM;</div><div class='add'>+</div><div class='add'>+			entry-&gt;type = TSNEP_TX_TYPE_XDP_NDO_MAP_PAGE;</div><div class='add'>+		} else {</div><div class='add'>+			page = unlikely(frag) ? skb_frag_page(frag) :</div><div class='add'>+						virt_to_page(xdpf-&gt;data);</div><div class='add'>+			dma = page_pool_get_dma_addr(page);</div><div class='add'>+			if (unlikely(frag))</div><div class='add'>+				dma += skb_frag_off(frag);</div><div class='add'>+			else</div><div class='add'>+				dma += sizeof(*xdpf) + xdpf-&gt;headroom;</div><div class='add'>+			dma_sync_single_for_device(dmadev, dma, len,</div><div class='add'>+						   DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+			entry-&gt;type = TSNEP_TX_TYPE_XDP_TX;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		entry-&gt;len = len;</div><div class='add'>+		dma_unmap_addr_set(entry, dma, dma);</div><div class='add'>+</div><div class='add'>+		entry-&gt;desc-&gt;tx = __cpu_to_le64(dma);</div><div class='add'>+</div><div class='add'>+		map_len += len;</div><div class='add'>+</div><div class='add'>+		if (i + 1 &lt; count) {</div><div class='add'>+			frag = &amp;shinfo-&gt;frags[i];</div><div class='add'>+			len = skb_frag_size(frag);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return map_len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* This function requires __netif_tx_lock is held by the caller. */</div><div class='add'>+static bool tsnep_xdp_xmit_frame_ring(struct xdp_frame *xdpf,</div><div class='add'>+				      struct tsnep_tx *tx, u32 type)</div><div class='add'>+{</div><div class='add'>+	struct skb_shared_info *shinfo = xdp_get_shared_info_from_frame(xdpf);</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	int count, length, retval, i;</div><div class='add'>+</div><div class='add'>+	count = 1;</div><div class='add'>+	if (unlikely(xdp_frame_has_frags(xdpf)))</div><div class='add'>+		count += shinfo-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+	/* ensure that TX ring is not filled up by XDP, always MAX_SKB_FRAGS</div><div class='add'>+	 * will be available for normal TX path and queue is stopped there if</div><div class='add'>+	 * necessary</div><div class='add'>+	 */</div><div class='add'>+	if (tsnep_tx_desc_available(tx) &lt; (MAX_SKB_FRAGS + 1 + count))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	entry = &amp;tx-&gt;entry[tx-&gt;write];</div><div class='add'>+	entry-&gt;xdpf = xdpf;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_xdp_tx_map(xdpf, tx, shinfo, count, type);</div><div class='add'>+	if (retval &lt; 0) {</div><div class='add'>+		tsnep_tx_unmap(tx, tx-&gt;write, count);</div><div class='add'>+		entry-&gt;xdpf = NULL;</div><div class='add'>+</div><div class='add'>+		tx-&gt;dropped++;</div><div class='add'>+</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	length = retval;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++)</div><div class='add'>+		tsnep_tx_activate(tx, (tx-&gt;write + i) &amp; TSNEP_RING_MASK, length,</div><div class='add'>+				  i == count - 1);</div><div class='add'>+	tx-&gt;write = (tx-&gt;write + count) &amp; TSNEP_RING_MASK;</div><div class='add'>+</div><div class='add'>+	/* descriptor properties shall be valid before hardware is notified */</div><div class='add'>+	dma_wmb();</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_xdp_xmit_flush(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	iowrite32(TSNEP_CONTROL_TX_ENABLE, tx-&gt;addr + TSNEP_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_xdp_xmit_back(struct tsnep_adapter *adapter,</div><div class='add'>+				struct xdp_buff *xdp,</div><div class='add'>+				struct netdev_queue *tx_nq, struct tsnep_tx *tx,</div><div class='add'>+				bool zc)</div><div class='add'>+{</div><div class='add'>+	struct xdp_frame *xdpf = xdp_convert_buff_to_frame(xdp);</div><div class='add'>+	bool xmit;</div><div class='add'>+	u32 type;</div><div class='add'>+</div><div class='add'>+	if (unlikely(!xdpf))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* no page pool for zero copy */</div><div class='add'>+	if (zc)</div><div class='add'>+		type = TSNEP_TX_TYPE_XDP_NDO;</div><div class='add'>+	else</div><div class='add'>+		type = TSNEP_TX_TYPE_XDP_TX;</div><div class='add'>+</div><div class='add'>+	__netif_tx_lock(tx_nq, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	xmit = tsnep_xdp_xmit_frame_ring(xdpf, tx, type);</div><div class='add'>+</div><div class='add'>+	/* Avoid transmit queue timeout since we share it with the slow path */</div><div class='add'>+	if (xmit)</div><div class='add'>+		txq_trans_cond_update(tx_nq);</div><div class='add'>+</div><div class='add'>+	__netif_tx_unlock(tx_nq);</div><div class='add'>+</div><div class='add'>+	return xmit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_xdp_tx_map_zc(struct xdp_desc *xdpd, struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	entry = &amp;tx-&gt;entry[tx-&gt;write];</div><div class='add'>+	entry-&gt;zc = true;</div><div class='add'>+</div><div class='add'>+	dma = xsk_buff_raw_get_dma(tx-&gt;xsk_pool, xdpd-&gt;addr);</div><div class='add'>+	xsk_buff_raw_dma_sync_for_device(tx-&gt;xsk_pool, dma, xdpd-&gt;len);</div><div class='add'>+</div><div class='add'>+	entry-&gt;type = TSNEP_TX_TYPE_XSK;</div><div class='add'>+	entry-&gt;len = xdpd-&gt;len;</div><div class='add'>+</div><div class='add'>+	entry-&gt;desc-&gt;tx = __cpu_to_le64(dma);</div><div class='add'>+</div><div class='add'>+	return xdpd-&gt;len;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_xdp_xmit_frame_ring_zc(struct xdp_desc *xdpd,</div><div class='add'>+					 struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	int length;</div><div class='add'>+</div><div class='add'>+	length = tsnep_xdp_tx_map_zc(xdpd, tx);</div><div class='add'>+</div><div class='add'>+	tsnep_tx_activate(tx, tx-&gt;write, length, true);</div><div class='add'>+	tx-&gt;write = (tx-&gt;write + 1) &amp; TSNEP_RING_MASK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_xdp_xmit_zc(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	int desc_available = tsnep_tx_desc_available(tx);</div><div class='add'>+	struct xdp_desc *descs = tx-&gt;xsk_pool-&gt;tx_descs;</div><div class='add'>+	int batch, i;</div><div class='add'>+</div><div class='add'>+	/* ensure that TX ring is not filled up by XDP, always MAX_SKB_FRAGS</div><div class='add'>+	 * will be available for normal TX path and queue is stopped there if</div><div class='add'>+	 * necessary</div><div class='add'>+	 */</div><div class='add'>+	if (desc_available &lt;= (MAX_SKB_FRAGS + 1))</div><div class='add'>+		return;</div><div class='add'>+	desc_available -= MAX_SKB_FRAGS + 1;</div><div class='add'>+</div><div class='add'>+	batch = xsk_tx_peek_release_desc_batch(tx-&gt;xsk_pool, desc_available);</div><div class='add'>+	for (i = 0; i &lt; batch; i++)</div><div class='add'>+		tsnep_xdp_xmit_frame_ring_zc(&amp;descs[i], tx);</div><div class='add'>+</div><div class='add'>+	if (batch) {</div><div class='add'>+		/* descriptor properties shall be valid before hardware is</div><div class='add'>+		 * notified</div><div class='add'>+		 */</div><div class='add'>+		dma_wmb();</div><div class='add'>+</div><div class='add'>+		tsnep_xdp_xmit_flush(tx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_tx_poll(struct tsnep_tx *tx, int napi_budget)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+	int xsk_frames = 0;</div><div class='add'>+	int budget = 128;</div><div class='add'>+	int length;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	nq = netdev_get_tx_queue(tx-&gt;adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+	__netif_tx_lock(nq, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (tx-&gt;read == tx-&gt;write)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		entry = &amp;tx-&gt;entry[tx-&gt;read];</div><div class='add'>+		if ((__le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+		     TSNEP_TX_DESC_OWNER_MASK) !=</div><div class='add'>+		    (entry-&gt;properties &amp; TSNEP_TX_DESC_OWNER_MASK))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* descriptor properties shall be read first, because valid data</div><div class='add'>+		 * is signaled there</div><div class='add'>+		 */</div><div class='add'>+		dma_rmb();</div><div class='add'>+</div><div class='add'>+		count = 1;</div><div class='add'>+		if ((entry-&gt;type &amp; TSNEP_TX_TYPE_SKB) &amp;&amp;</div><div class='add'>+		    skb_shinfo(entry-&gt;skb)-&gt;nr_frags &gt; 0)</div><div class='add'>+			count += skb_shinfo(entry-&gt;skb)-&gt;nr_frags;</div><div class='add'>+		else if ((entry-&gt;type &amp; TSNEP_TX_TYPE_XDP) &amp;&amp;</div><div class='add'>+			 xdp_frame_has_frags(entry-&gt;xdpf))</div><div class='add'>+			count += xdp_get_shared_info_from_frame(entry-&gt;xdpf)-&gt;nr_frags;</div><div class='add'>+</div><div class='add'>+		length = tsnep_tx_unmap(tx, tx-&gt;read, count);</div><div class='add'>+</div><div class='add'>+		if (((entry-&gt;type &amp; TSNEP_TX_TYPE_SKB_TSTAMP) == TSNEP_TX_TYPE_SKB_TSTAMP) &amp;&amp;</div><div class='add'>+		    (__le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+		     TSNEP_DESC_EXTENDED_WRITEBACK_FLAG)) {</div><div class='add'>+			struct skb_shared_hwtstamps hwtstamps;</div><div class='add'>+			u64 timestamp;</div><div class='add'>+</div><div class='add'>+			if (entry-&gt;skb-&gt;sk &amp;&amp;</div><div class='add'>+			    READ_ONCE(entry-&gt;skb-&gt;sk-&gt;sk_tsflags) &amp; SOF_TIMESTAMPING_BIND_PHC)</div><div class='add'>+				timestamp =</div><div class='add'>+					__le64_to_cpu(entry-&gt;desc_wb-&gt;counter);</div><div class='add'>+			else</div><div class='add'>+				timestamp =</div><div class='add'>+					__le64_to_cpu(entry-&gt;desc_wb-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+			memset(&amp;hwtstamps, 0, sizeof(hwtstamps));</div><div class='add'>+			hwtstamps.hwtstamp = ns_to_ktime(timestamp);</div><div class='add'>+</div><div class='add'>+			skb_tstamp_tx(entry-&gt;skb, &amp;hwtstamps);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (entry-&gt;type &amp; TSNEP_TX_TYPE_SKB)</div><div class='add'>+			napi_consume_skb(entry-&gt;skb, napi_budget);</div><div class='add'>+		else if (entry-&gt;type &amp; TSNEP_TX_TYPE_XDP)</div><div class='add'>+			xdp_return_frame_rx_napi(entry-&gt;xdpf);</div><div class='add'>+		else</div><div class='add'>+			xsk_frames++;</div><div class='add'>+		/* xdpf and zc are union with skb */</div><div class='add'>+		entry-&gt;skb = NULL;</div><div class='add'>+</div><div class='add'>+		tx-&gt;read = (tx-&gt;read + count) &amp; TSNEP_RING_MASK;</div><div class='add'>+</div><div class='add'>+		tx-&gt;packets++;</div><div class='add'>+		tx-&gt;bytes += length + ETH_FCS_LEN;</div><div class='add'>+</div><div class='add'>+		budget--;</div><div class='add'>+	} while (likely(budget));</div><div class='add'>+</div><div class='add'>+	if (tx-&gt;xsk_pool) {</div><div class='add'>+		if (xsk_frames)</div><div class='add'>+			xsk_tx_completed(tx-&gt;xsk_pool, xsk_frames);</div><div class='add'>+		if (xsk_uses_need_wakeup(tx-&gt;xsk_pool))</div><div class='add'>+			xsk_set_tx_need_wakeup(tx-&gt;xsk_pool);</div><div class='add'>+		tsnep_xdp_xmit_zc(tx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((tsnep_tx_desc_available(tx) &gt;= ((MAX_SKB_FRAGS + 1) * 2)) &amp;&amp;</div><div class='add'>+	    netif_tx_queue_stopped(nq)) {</div><div class='add'>+		netif_tx_wake_queue(nq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__netif_tx_unlock(nq);</div><div class='add'>+</div><div class='add'>+	return budget != 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_tx_pending(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_tx_entry *entry;</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+	bool pending = false;</div><div class='add'>+</div><div class='add'>+	nq = netdev_get_tx_queue(tx-&gt;adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+	__netif_tx_lock(nq, smp_processor_id());</div><div class='add'>+</div><div class='add'>+	if (tx-&gt;read != tx-&gt;write) {</div><div class='add'>+		entry = &amp;tx-&gt;entry[tx-&gt;read];</div><div class='add'>+		if ((__le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+		     TSNEP_TX_DESC_OWNER_MASK) ==</div><div class='add'>+		    (entry-&gt;properties &amp; TSNEP_TX_DESC_OWNER_MASK))</div><div class='add'>+			pending = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	__netif_tx_unlock(nq);</div><div class='add'>+</div><div class='add'>+	return pending;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tx_open(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_tx_ring_create(tx);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	tsnep_tx_init(tx);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_tx_close(struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	tsnep_tx_ring_cleanup(tx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_ring_cleanup(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = rx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	struct tsnep_rx_entry *entry;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE; i++) {</div><div class='add'>+		entry = &amp;rx-&gt;entry[i];</div><div class='add'>+		if (!rx-&gt;xsk_pool &amp;&amp; entry-&gt;page)</div><div class='add'>+			page_pool_put_full_page(rx-&gt;page_pool, entry-&gt;page,</div><div class='add'>+						false);</div><div class='add'>+		if (rx-&gt;xsk_pool &amp;&amp; entry-&gt;xdp)</div><div class='add'>+			xsk_buff_free(entry-&gt;xdp);</div><div class='add'>+		/* xdp is union with page */</div><div class='add'>+		entry-&gt;page = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (rx-&gt;page_pool)</div><div class='add'>+		page_pool_destroy(rx-&gt;page_pool);</div><div class='add'>+</div><div class='add'>+	memset(rx-&gt;entry, 0, sizeof(rx-&gt;entry));</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_PAGE_COUNT; i++) {</div><div class='add'>+		if (rx-&gt;page[i]) {</div><div class='add'>+			dma_free_coherent(dmadev, PAGE_SIZE, rx-&gt;page[i],</div><div class='add'>+					  rx-&gt;page_dma[i]);</div><div class='add'>+			rx-&gt;page[i] = NULL;</div><div class='add'>+			rx-&gt;page_dma[i] = 0;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_ring_create(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = rx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	struct tsnep_rx_entry *entry;</div><div class='add'>+	struct page_pool_params pp_params = { 0 };</div><div class='add'>+	struct tsnep_rx_entry *next_entry;</div><div class='add'>+	int i, j;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_PAGE_COUNT; i++) {</div><div class='add'>+		rx-&gt;page[i] =</div><div class='add'>+			dma_alloc_coherent(dmadev, PAGE_SIZE, &amp;rx-&gt;page_dma[i],</div><div class='add'>+					   GFP_KERNEL);</div><div class='add'>+		if (!rx-&gt;page[i]) {</div><div class='add'>+			retval = -ENOMEM;</div><div class='add'>+			goto failed;</div><div class='add'>+		}</div><div class='add'>+		for (j = 0; j &lt; TSNEP_RING_ENTRIES_PER_PAGE; j++) {</div><div class='add'>+			entry = &amp;rx-&gt;entry[TSNEP_RING_ENTRIES_PER_PAGE * i + j];</div><div class='add'>+			entry-&gt;desc_wb = (struct tsnep_rx_desc_wb *)</div><div class='add'>+				(((u8 *)rx-&gt;page[i]) + TSNEP_DESC_SIZE * j);</div><div class='add'>+			entry-&gt;desc = (struct tsnep_rx_desc *)</div><div class='add'>+				(((u8 *)entry-&gt;desc_wb) + TSNEP_DESC_OFFSET);</div><div class='add'>+			entry-&gt;desc_dma = rx-&gt;page_dma[i] + TSNEP_DESC_SIZE * j;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pp_params.flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV;</div><div class='add'>+	pp_params.order = 0;</div><div class='add'>+	pp_params.pool_size = TSNEP_RING_SIZE;</div><div class='add'>+	pp_params.nid = dev_to_node(dmadev);</div><div class='add'>+	pp_params.dev = dmadev;</div><div class='add'>+	pp_params.dma_dir = DMA_BIDIRECTIONAL;</div><div class='add'>+	pp_params.max_len = TSNEP_MAX_RX_BUF_SIZE;</div><div class='add'>+	pp_params.offset = TSNEP_RX_OFFSET;</div><div class='add'>+	rx-&gt;page_pool = page_pool_create(&amp;pp_params);</div><div class='add'>+	if (IS_ERR(rx-&gt;page_pool)) {</div><div class='add'>+		retval = PTR_ERR(rx-&gt;page_pool);</div><div class='add'>+		rx-&gt;page_pool = NULL;</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE; i++) {</div><div class='add'>+		entry = &amp;rx-&gt;entry[i];</div><div class='add'>+		next_entry = &amp;rx-&gt;entry[(i + 1) &amp; TSNEP_RING_MASK];</div><div class='add'>+		entry-&gt;desc-&gt;next = __cpu_to_le64(next_entry-&gt;desc_dma);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	tsnep_rx_ring_cleanup(rx);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_init(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t dma;</div><div class='add'>+</div><div class='add'>+	dma = rx-&gt;entry[0].desc_dma | TSNEP_RESET_OWNER_COUNTER;</div><div class='add'>+	iowrite32(DMA_ADDR_LOW(dma), rx-&gt;addr + TSNEP_RX_DESC_ADDR_LOW);</div><div class='add'>+	iowrite32(DMA_ADDR_HIGH(dma), rx-&gt;addr + TSNEP_RX_DESC_ADDR_HIGH);</div><div class='add'>+	rx-&gt;write = 0;</div><div class='add'>+	rx-&gt;read = 0;</div><div class='add'>+	rx-&gt;owner_counter = 1;</div><div class='add'>+	rx-&gt;increment_owner_counter = TSNEP_RING_SIZE - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_enable(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	/* descriptor properties shall be valid before hardware is notified */</div><div class='add'>+	dma_wmb();</div><div class='add'>+</div><div class='add'>+	iowrite32(TSNEP_CONTROL_RX_ENABLE, rx-&gt;addr + TSNEP_CONTROL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_disable(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	u32 val;</div><div class='add'>+</div><div class='add'>+	iowrite32(TSNEP_CONTROL_RX_DISABLE, rx-&gt;addr + TSNEP_CONTROL);</div><div class='add'>+	readx_poll_timeout(ioread32, rx-&gt;addr + TSNEP_CONTROL, val,</div><div class='add'>+			   ((val &amp; TSNEP_CONTROL_RX_ENABLE) == 0), 10000,</div><div class='add'>+			   1000000);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_desc_available(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	if (rx-&gt;read &lt;= rx-&gt;write)</div><div class='add'>+		return TSNEP_RING_SIZE - rx-&gt;write + rx-&gt;read - 1;</div><div class='add'>+	else</div><div class='add'>+		return rx-&gt;read - rx-&gt;write - 1;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_free_page_buffer(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	struct page **page;</div><div class='add'>+</div><div class='add'>+	/* last entry of page_buffer is always zero, because ring cannot be</div><div class='add'>+	 * filled completely</div><div class='add'>+	 */</div><div class='add'>+	page = rx-&gt;page_buffer;</div><div class='add'>+	while (*page) {</div><div class='add'>+		page_pool_put_full_page(rx-&gt;page_pool, *page, false);</div><div class='add'>+		*page = NULL;</div><div class='add'>+		page++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_alloc_page_buffer(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* alloc for all ring entries except the last one, because ring cannot</div><div class='add'>+	 * be filled completely</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE - 1; i++) {</div><div class='add'>+		rx-&gt;page_buffer[i] = page_pool_dev_alloc_pages(rx-&gt;page_pool);</div><div class='add'>+		if (!rx-&gt;page_buffer[i]) {</div><div class='add'>+			tsnep_rx_free_page_buffer(rx);</div><div class='add'>+</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_set_page(struct tsnep_rx *rx, struct tsnep_rx_entry *entry,</div><div class='add'>+			      struct page *page)</div><div class='add'>+{</div><div class='add'>+	entry-&gt;page = page;</div><div class='add'>+	entry-&gt;len = TSNEP_MAX_RX_BUF_SIZE;</div><div class='add'>+	entry-&gt;dma = page_pool_get_dma_addr(entry-&gt;page);</div><div class='add'>+	entry-&gt;desc-&gt;rx = __cpu_to_le64(entry-&gt;dma + TSNEP_RX_OFFSET);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_alloc_buffer(struct tsnep_rx *rx, int index)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[index];</div><div class='add'>+	struct page *page;</div><div class='add'>+</div><div class='add'>+	page = page_pool_dev_alloc_pages(rx-&gt;page_pool);</div><div class='add'>+	if (unlikely(!page))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	tsnep_rx_set_page(rx, entry, page);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_reuse_buffer(struct tsnep_rx *rx, int index)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[index];</div><div class='add'>+	struct tsnep_rx_entry *read = &amp;rx-&gt;entry[rx-&gt;read];</div><div class='add'>+</div><div class='add'>+	tsnep_rx_set_page(rx, entry, read-&gt;page);</div><div class='add'>+	read-&gt;page = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_activate(struct tsnep_rx *rx, int index)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[index];</div><div class='add'>+</div><div class='add'>+	/* TSNEP_MAX_RX_BUF_SIZE and TSNEP_XSK_RX_BUF_SIZE are multiple of 4 */</div><div class='add'>+	entry-&gt;properties = entry-&gt;len &amp; TSNEP_DESC_LENGTH_MASK;</div><div class='add'>+	entry-&gt;properties |= TSNEP_DESC_INTERRUPT_FLAG;</div><div class='add'>+	if (index == rx-&gt;increment_owner_counter) {</div><div class='add'>+		rx-&gt;owner_counter++;</div><div class='add'>+		if (rx-&gt;owner_counter == 4)</div><div class='add'>+			rx-&gt;owner_counter = 1;</div><div class='add'>+		rx-&gt;increment_owner_counter--;</div><div class='add'>+		if (rx-&gt;increment_owner_counter &lt; 0)</div><div class='add'>+			rx-&gt;increment_owner_counter = TSNEP_RING_SIZE - 1;</div><div class='add'>+	}</div><div class='add'>+	entry-&gt;properties |=</div><div class='add'>+		(rx-&gt;owner_counter &lt;&lt; TSNEP_DESC_OWNER_COUNTER_SHIFT) &amp;</div><div class='add'>+		TSNEP_DESC_OWNER_COUNTER_MASK;</div><div class='add'>+</div><div class='add'>+	/* descriptor properties shall be written last, because valid data is</div><div class='add'>+	 * signaled there</div><div class='add'>+	 */</div><div class='add'>+	dma_wmb();</div><div class='add'>+</div><div class='add'>+	entry-&gt;desc-&gt;properties = __cpu_to_le32(entry-&gt;properties);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_alloc(struct tsnep_rx *rx, int count, bool reuse)</div><div class='add'>+{</div><div class='add'>+	bool alloc_failed = false;</div><div class='add'>+	int i, index;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count &amp;&amp; !alloc_failed; i++) {</div><div class='add'>+		index = (rx-&gt;write + i) &amp; TSNEP_RING_MASK;</div><div class='add'>+</div><div class='add'>+		if (unlikely(tsnep_rx_alloc_buffer(rx, index))) {</div><div class='add'>+			rx-&gt;alloc_failed++;</div><div class='add'>+			alloc_failed = true;</div><div class='add'>+</div><div class='add'>+			/* reuse only if no other allocation was successful */</div><div class='add'>+			if (i == 0 &amp;&amp; reuse)</div><div class='add'>+				tsnep_rx_reuse_buffer(rx, index);</div><div class='add'>+			else</div><div class='add'>+				break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tsnep_rx_activate(rx, index);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i)</div><div class='add'>+		rx-&gt;write = (rx-&gt;write + i) &amp; TSNEP_RING_MASK;</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_refill(struct tsnep_rx *rx, int count, bool reuse)</div><div class='add'>+{</div><div class='add'>+	int desc_refilled;</div><div class='add'>+</div><div class='add'>+	desc_refilled = tsnep_rx_alloc(rx, count, reuse);</div><div class='add'>+	if (desc_refilled)</div><div class='add'>+		tsnep_rx_enable(rx);</div><div class='add'>+</div><div class='add'>+	return desc_refilled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_set_xdp(struct tsnep_rx *rx, struct tsnep_rx_entry *entry,</div><div class='add'>+			     struct xdp_buff *xdp)</div><div class='add'>+{</div><div class='add'>+	entry-&gt;xdp = xdp;</div><div class='add'>+	entry-&gt;len = TSNEP_XSK_RX_BUF_SIZE;</div><div class='add'>+	entry-&gt;dma = xsk_buff_xdp_get_dma(entry-&gt;xdp);</div><div class='add'>+	entry-&gt;desc-&gt;rx = __cpu_to_le64(entry-&gt;dma);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_reuse_buffer_zc(struct tsnep_rx *rx, int index)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[index];</div><div class='add'>+	struct tsnep_rx_entry *read = &amp;rx-&gt;entry[rx-&gt;read];</div><div class='add'>+</div><div class='add'>+	tsnep_rx_set_xdp(rx, entry, read-&gt;xdp);</div><div class='add'>+	read-&gt;xdp = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_alloc_zc(struct tsnep_rx *rx, int count, bool reuse)</div><div class='add'>+{</div><div class='add'>+	u32 allocated;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	allocated = xsk_buff_alloc_batch(rx-&gt;xsk_pool, rx-&gt;xdp_batch, count);</div><div class='add'>+	for (i = 0; i &lt; allocated; i++) {</div><div class='add'>+		int index = (rx-&gt;write + i) &amp; TSNEP_RING_MASK;</div><div class='add'>+		struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[index];</div><div class='add'>+</div><div class='add'>+		tsnep_rx_set_xdp(rx, entry, rx-&gt;xdp_batch[i]);</div><div class='add'>+		tsnep_rx_activate(rx, index);</div><div class='add'>+	}</div><div class='add'>+	if (i == 0) {</div><div class='add'>+		rx-&gt;alloc_failed++;</div><div class='add'>+</div><div class='add'>+		if (reuse) {</div><div class='add'>+			tsnep_rx_reuse_buffer_zc(rx, rx-&gt;write);</div><div class='add'>+			tsnep_rx_activate(rx, rx-&gt;write);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (i)</div><div class='add'>+		rx-&gt;write = (rx-&gt;write + i) &amp; TSNEP_RING_MASK;</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_free_zc(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE; i++) {</div><div class='add'>+		struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[i];</div><div class='add'>+</div><div class='add'>+		if (entry-&gt;xdp)</div><div class='add'>+			xsk_buff_free(entry-&gt;xdp);</div><div class='add'>+		entry-&gt;xdp = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_refill_zc(struct tsnep_rx *rx, int count, bool reuse)</div><div class='add'>+{</div><div class='add'>+	int desc_refilled;</div><div class='add'>+</div><div class='add'>+	desc_refilled = tsnep_rx_alloc_zc(rx, count, reuse);</div><div class='add'>+	if (desc_refilled)</div><div class='add'>+		tsnep_rx_enable(rx);</div><div class='add'>+</div><div class='add'>+	return desc_refilled;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_xsk_rx_need_wakeup(struct tsnep_rx *rx, int desc_available)</div><div class='add'>+{</div><div class='add'>+	if (desc_available)</div><div class='add'>+		xsk_set_rx_need_wakeup(rx-&gt;xsk_pool);</div><div class='add'>+	else</div><div class='add'>+		xsk_clear_rx_need_wakeup(rx-&gt;xsk_pool);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_xdp_run_prog(struct tsnep_rx *rx, struct bpf_prog *prog,</div><div class='add'>+			       struct xdp_buff *xdp, int *status,</div><div class='add'>+			       struct netdev_queue *tx_nq, struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	unsigned int length;</div><div class='add'>+	unsigned int sync;</div><div class='add'>+	u32 act;</div><div class='add'>+</div><div class='add'>+	length = xdp-&gt;data_end - xdp-&gt;data_hard_start - XDP_PACKET_HEADROOM;</div><div class='add'>+</div><div class='add'>+	act = bpf_prog_run_xdp(prog, xdp);</div><div class='add'>+	switch (act) {</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+		return false;</div><div class='add'>+	case XDP_TX:</div><div class='add'>+		if (!tsnep_xdp_xmit_back(rx-&gt;adapter, xdp, tx_nq, tx, false))</div><div class='add'>+			goto out_failure;</div><div class='add'>+		*status |= TSNEP_XDP_TX;</div><div class='add'>+		return true;</div><div class='add'>+	case XDP_REDIRECT:</div><div class='add'>+		if (xdp_do_redirect(rx-&gt;adapter-&gt;netdev, xdp, prog) &lt; 0)</div><div class='add'>+			goto out_failure;</div><div class='add'>+		*status |= TSNEP_XDP_REDIRECT;</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		bpf_warn_invalid_xdp_action(rx-&gt;adapter-&gt;netdev, prog, act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_ABORTED:</div><div class='add'>+out_failure:</div><div class='add'>+		trace_xdp_exception(rx-&gt;adapter-&gt;netdev, prog, act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_DROP:</div><div class='add'>+		/* Due xdp_adjust_tail: DMA sync for_device cover max len CPU</div><div class='add'>+		 * touch</div><div class='add'>+		 */</div><div class='add'>+		sync = xdp-&gt;data_end - xdp-&gt;data_hard_start -</div><div class='add'>+		       XDP_PACKET_HEADROOM;</div><div class='add'>+		sync = max(sync, length);</div><div class='add'>+		page_pool_put_page(rx-&gt;page_pool, virt_to_head_page(xdp-&gt;data),</div><div class='add'>+				   sync, true);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_xdp_run_prog_zc(struct tsnep_rx *rx, struct bpf_prog *prog,</div><div class='add'>+				  struct xdp_buff *xdp, int *status,</div><div class='add'>+				  struct netdev_queue *tx_nq,</div><div class='add'>+				  struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	u32 act;</div><div class='add'>+</div><div class='add'>+	act = bpf_prog_run_xdp(prog, xdp);</div><div class='add'>+</div><div class='add'>+	/* XDP_REDIRECT is the main action for zero-copy */</div><div class='add'>+	if (likely(act == XDP_REDIRECT)) {</div><div class='add'>+		if (xdp_do_redirect(rx-&gt;adapter-&gt;netdev, xdp, prog) &lt; 0)</div><div class='add'>+			goto out_failure;</div><div class='add'>+		*status |= TSNEP_XDP_REDIRECT;</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (act) {</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+		return false;</div><div class='add'>+	case XDP_TX:</div><div class='add'>+		if (!tsnep_xdp_xmit_back(rx-&gt;adapter, xdp, tx_nq, tx, true))</div><div class='add'>+			goto out_failure;</div><div class='add'>+		*status |= TSNEP_XDP_TX;</div><div class='add'>+		return true;</div><div class='add'>+	default:</div><div class='add'>+		bpf_warn_invalid_xdp_action(rx-&gt;adapter-&gt;netdev, prog, act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_ABORTED:</div><div class='add'>+out_failure:</div><div class='add'>+		trace_xdp_exception(rx-&gt;adapter-&gt;netdev, prog, act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_DROP:</div><div class='add'>+		xsk_buff_free(xdp);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_finalize_xdp(struct tsnep_adapter *adapter, int status,</div><div class='add'>+			       struct netdev_queue *tx_nq, struct tsnep_tx *tx)</div><div class='add'>+{</div><div class='add'>+	if (status &amp; TSNEP_XDP_TX) {</div><div class='add'>+		__netif_tx_lock(tx_nq, smp_processor_id());</div><div class='add'>+		tsnep_xdp_xmit_flush(tx);</div><div class='add'>+		__netif_tx_unlock(tx_nq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; TSNEP_XDP_REDIRECT)</div><div class='add'>+		xdp_do_flush();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *tsnep_build_skb(struct tsnep_rx *rx, struct page *page,</div><div class='add'>+				       int length)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = napi_build_skb(page_address(page), PAGE_SIZE);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	/* update pointers within the skb to store the data */</div><div class='add'>+	skb_reserve(skb, TSNEP_RX_OFFSET + TSNEP_RX_INLINE_METADATA_SIZE);</div><div class='add'>+	__skb_put(skb, length - ETH_FCS_LEN);</div><div class='add'>+</div><div class='add'>+	if (rx-&gt;adapter-&gt;hwtstamp_config.rx_filter == HWTSTAMP_FILTER_ALL) {</div><div class='add'>+		struct skb_shared_hwtstamps *hwtstamps = skb_hwtstamps(skb);</div><div class='add'>+		struct tsnep_rx_inline *rx_inline =</div><div class='add'>+			(struct tsnep_rx_inline *)(page_address(page) +</div><div class='add'>+						   TSNEP_RX_OFFSET);</div><div class='add'>+</div><div class='add'>+		skb_shinfo(skb)-&gt;tx_flags |=</div><div class='add'>+			SKBTX_HW_TSTAMP_NETDEV;</div><div class='add'>+		memset(hwtstamps, 0, sizeof(*hwtstamps));</div><div class='add'>+		hwtstamps-&gt;netdev_data = rx_inline;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_record_rx_queue(skb, rx-&gt;queue_index);</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, rx-&gt;adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_page(struct tsnep_rx *rx, struct napi_struct *napi,</div><div class='add'>+			  struct page *page, int length)</div><div class='add'>+{</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	skb = tsnep_build_skb(rx, page, length);</div><div class='add'>+	if (skb) {</div><div class='add'>+		skb_mark_for_recycle(skb);</div><div class='add'>+</div><div class='add'>+		rx-&gt;packets++;</div><div class='add'>+		rx-&gt;bytes += length;</div><div class='add'>+		if (skb-&gt;pkt_type == PACKET_MULTICAST)</div><div class='add'>+			rx-&gt;multicast++;</div><div class='add'>+</div><div class='add'>+		napi_gro_receive(napi, skb);</div><div class='add'>+	} else {</div><div class='add'>+		page_pool_recycle_direct(rx-&gt;page_pool, page);</div><div class='add'>+</div><div class='add'>+		rx-&gt;dropped++;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_poll(struct tsnep_rx *rx, struct napi_struct *napi,</div><div class='add'>+			 int budget)</div><div class='add'>+{</div><div class='add'>+	struct device *dmadev = rx-&gt;adapter-&gt;dmadev;</div><div class='add'>+	enum dma_data_direction dma_dir;</div><div class='add'>+	struct tsnep_rx_entry *entry;</div><div class='add'>+	struct netdev_queue *tx_nq;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	struct xdp_buff xdp;</div><div class='add'>+	struct tsnep_tx *tx;</div><div class='add'>+	int desc_available;</div><div class='add'>+	int xdp_status = 0;</div><div class='add'>+	int done = 0;</div><div class='add'>+	int length;</div><div class='add'>+</div><div class='add'>+	desc_available = tsnep_rx_desc_available(rx);</div><div class='add'>+	dma_dir = page_pool_get_dma_dir(rx-&gt;page_pool);</div><div class='add'>+	prog = READ_ONCE(rx-&gt;adapter-&gt;xdp_prog);</div><div class='add'>+	if (prog) {</div><div class='add'>+		tx_nq = netdev_get_tx_queue(rx-&gt;adapter-&gt;netdev,</div><div class='add'>+					    rx-&gt;tx_queue_index);</div><div class='add'>+		tx = &amp;rx-&gt;adapter-&gt;tx[rx-&gt;tx_queue_index];</div><div class='add'>+</div><div class='add'>+		xdp_init_buff(&amp;xdp, PAGE_SIZE, &amp;rx-&gt;xdp_rxq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (likely(done &lt; budget) &amp;&amp; (rx-&gt;read != rx-&gt;write)) {</div><div class='add'>+		entry = &amp;rx-&gt;entry[rx-&gt;read];</div><div class='add'>+		if ((__le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+		     TSNEP_DESC_OWNER_COUNTER_MASK) !=</div><div class='add'>+		    (entry-&gt;properties &amp; TSNEP_DESC_OWNER_COUNTER_MASK))</div><div class='add'>+			break;</div><div class='add'>+		done++;</div><div class='add'>+</div><div class='add'>+		if (desc_available &gt;= TSNEP_RING_RX_REFILL) {</div><div class='add'>+			bool reuse = desc_available &gt;= TSNEP_RING_RX_REUSE;</div><div class='add'>+</div><div class='add'>+			desc_available -= tsnep_rx_refill(rx, desc_available,</div><div class='add'>+							  reuse);</div><div class='add'>+			if (!entry-&gt;page) {</div><div class='add'>+				/* buffer has been reused for refill to prevent</div><div class='add'>+				 * empty RX ring, thus buffer cannot be used for</div><div class='add'>+				 * RX processing</div><div class='add'>+				 */</div><div class='add'>+				rx-&gt;read = (rx-&gt;read + 1) &amp; TSNEP_RING_MASK;</div><div class='add'>+				desc_available++;</div><div class='add'>+</div><div class='add'>+				rx-&gt;dropped++;</div><div class='add'>+</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* descriptor properties shall be read first, because valid data</div><div class='add'>+		 * is signaled there</div><div class='add'>+		 */</div><div class='add'>+		dma_rmb();</div><div class='add'>+</div><div class='add'>+		prefetch(page_address(entry-&gt;page) + TSNEP_RX_OFFSET);</div><div class='add'>+		length = __le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+			 TSNEP_DESC_LENGTH_MASK;</div><div class='add'>+		dma_sync_single_range_for_cpu(dmadev, entry-&gt;dma,</div><div class='add'>+					      TSNEP_RX_OFFSET, length, dma_dir);</div><div class='add'>+</div><div class='add'>+		/* RX metadata with timestamps is in front of actual data,</div><div class='add'>+		 * subtract metadata size to get length of actual data and</div><div class='add'>+		 * consider metadata size as offset of actual data during RX</div><div class='add'>+		 * processing</div><div class='add'>+		 */</div><div class='add'>+		length -= TSNEP_RX_INLINE_METADATA_SIZE;</div><div class='add'>+</div><div class='add'>+		rx-&gt;read = (rx-&gt;read + 1) &amp; TSNEP_RING_MASK;</div><div class='add'>+		desc_available++;</div><div class='add'>+</div><div class='add'>+		if (prog) {</div><div class='add'>+			bool consume;</div><div class='add'>+</div><div class='add'>+			xdp_prepare_buff(&amp;xdp, page_address(entry-&gt;page),</div><div class='add'>+					 XDP_PACKET_HEADROOM + TSNEP_RX_INLINE_METADATA_SIZE,</div><div class='add'>+					 length - ETH_FCS_LEN, false);</div><div class='add'>+</div><div class='add'>+			consume = tsnep_xdp_run_prog(rx, prog, &amp;xdp,</div><div class='add'>+						     &amp;xdp_status, tx_nq, tx);</div><div class='add'>+			if (consume) {</div><div class='add'>+				rx-&gt;packets++;</div><div class='add'>+				rx-&gt;bytes += length;</div><div class='add'>+</div><div class='add'>+				entry-&gt;page = NULL;</div><div class='add'>+</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tsnep_rx_page(rx, napi, entry-&gt;page, length);</div><div class='add'>+		entry-&gt;page = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xdp_status)</div><div class='add'>+		tsnep_finalize_xdp(rx-&gt;adapter, xdp_status, tx_nq, tx);</div><div class='add'>+</div><div class='add'>+	if (desc_available)</div><div class='add'>+		tsnep_rx_refill(rx, desc_available, false);</div><div class='add'>+</div><div class='add'>+	return done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_poll_zc(struct tsnep_rx *rx, struct napi_struct *napi,</div><div class='add'>+			    int budget)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_entry *entry;</div><div class='add'>+	struct netdev_queue *tx_nq;</div><div class='add'>+	struct bpf_prog *prog;</div><div class='add'>+	struct tsnep_tx *tx;</div><div class='add'>+	int desc_available;</div><div class='add'>+	int xdp_status = 0;</div><div class='add'>+	struct page *page;</div><div class='add'>+	int done = 0;</div><div class='add'>+	int length;</div><div class='add'>+</div><div class='add'>+	desc_available = tsnep_rx_desc_available(rx);</div><div class='add'>+	prog = READ_ONCE(rx-&gt;adapter-&gt;xdp_prog);</div><div class='add'>+	if (prog) {</div><div class='add'>+		tx_nq = netdev_get_tx_queue(rx-&gt;adapter-&gt;netdev,</div><div class='add'>+					    rx-&gt;tx_queue_index);</div><div class='add'>+		tx = &amp;rx-&gt;adapter-&gt;tx[rx-&gt;tx_queue_index];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	while (likely(done &lt; budget) &amp;&amp; (rx-&gt;read != rx-&gt;write)) {</div><div class='add'>+		entry = &amp;rx-&gt;entry[rx-&gt;read];</div><div class='add'>+		if ((__le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+		     TSNEP_DESC_OWNER_COUNTER_MASK) !=</div><div class='add'>+		    (entry-&gt;properties &amp; TSNEP_DESC_OWNER_COUNTER_MASK))</div><div class='add'>+			break;</div><div class='add'>+		done++;</div><div class='add'>+</div><div class='add'>+		if (desc_available &gt;= TSNEP_RING_RX_REFILL) {</div><div class='add'>+			bool reuse = desc_available &gt;= TSNEP_RING_RX_REUSE;</div><div class='add'>+</div><div class='add'>+			desc_available -= tsnep_rx_refill_zc(rx, desc_available,</div><div class='add'>+							     reuse);</div><div class='add'>+			if (!entry-&gt;xdp) {</div><div class='add'>+				/* buffer has been reused for refill to prevent</div><div class='add'>+				 * empty RX ring, thus buffer cannot be used for</div><div class='add'>+				 * RX processing</div><div class='add'>+				 */</div><div class='add'>+				rx-&gt;read = (rx-&gt;read + 1) &amp; TSNEP_RING_MASK;</div><div class='add'>+				desc_available++;</div><div class='add'>+</div><div class='add'>+				rx-&gt;dropped++;</div><div class='add'>+</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* descriptor properties shall be read first, because valid data</div><div class='add'>+		 * is signaled there</div><div class='add'>+		 */</div><div class='add'>+		dma_rmb();</div><div class='add'>+</div><div class='add'>+		prefetch(entry-&gt;xdp-&gt;data);</div><div class='add'>+		length = __le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+			 TSNEP_DESC_LENGTH_MASK;</div><div class='add'>+		xsk_buff_set_size(entry-&gt;xdp, length - ETH_FCS_LEN);</div><div class='add'>+		xsk_buff_dma_sync_for_cpu(entry-&gt;xdp);</div><div class='add'>+</div><div class='add'>+		/* RX metadata with timestamps is in front of actual data,</div><div class='add'>+		 * subtract metadata size to get length of actual data and</div><div class='add'>+		 * consider metadata size as offset of actual data during RX</div><div class='add'>+		 * processing</div><div class='add'>+		 */</div><div class='add'>+		length -= TSNEP_RX_INLINE_METADATA_SIZE;</div><div class='add'>+</div><div class='add'>+		rx-&gt;read = (rx-&gt;read + 1) &amp; TSNEP_RING_MASK;</div><div class='add'>+		desc_available++;</div><div class='add'>+</div><div class='add'>+		if (prog) {</div><div class='add'>+			bool consume;</div><div class='add'>+</div><div class='add'>+			entry-&gt;xdp-&gt;data += TSNEP_RX_INLINE_METADATA_SIZE;</div><div class='add'>+			entry-&gt;xdp-&gt;data_meta += TSNEP_RX_INLINE_METADATA_SIZE;</div><div class='add'>+</div><div class='add'>+			consume = tsnep_xdp_run_prog_zc(rx, prog, entry-&gt;xdp,</div><div class='add'>+							&amp;xdp_status, tx_nq, tx);</div><div class='add'>+			if (consume) {</div><div class='add'>+				rx-&gt;packets++;</div><div class='add'>+				rx-&gt;bytes += length;</div><div class='add'>+</div><div class='add'>+				entry-&gt;xdp = NULL;</div><div class='add'>+</div><div class='add'>+				continue;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		page = page_pool_dev_alloc_pages(rx-&gt;page_pool);</div><div class='add'>+		if (page) {</div><div class='add'>+			memcpy(page_address(page) + TSNEP_RX_OFFSET,</div><div class='add'>+			       entry-&gt;xdp-&gt;data - TSNEP_RX_INLINE_METADATA_SIZE,</div><div class='add'>+			       length + TSNEP_RX_INLINE_METADATA_SIZE);</div><div class='add'>+			tsnep_rx_page(rx, napi, page, length);</div><div class='add'>+		} else {</div><div class='add'>+			rx-&gt;dropped++;</div><div class='add'>+		}</div><div class='add'>+		xsk_buff_free(entry-&gt;xdp);</div><div class='add'>+		entry-&gt;xdp = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (xdp_status)</div><div class='add'>+		tsnep_finalize_xdp(rx-&gt;adapter, xdp_status, tx_nq, tx);</div><div class='add'>+</div><div class='add'>+	if (desc_available)</div><div class='add'>+		desc_available -= tsnep_rx_refill_zc(rx, desc_available, false);</div><div class='add'>+</div><div class='add'>+	if (xsk_uses_need_wakeup(rx-&gt;xsk_pool)) {</div><div class='add'>+		tsnep_xsk_rx_need_wakeup(rx, desc_available);</div><div class='add'>+</div><div class='add'>+		return done;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return desc_available ? budget : done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_rx_pending(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_entry *entry;</div><div class='add'>+</div><div class='add'>+	if (rx-&gt;read != rx-&gt;write) {</div><div class='add'>+		entry = &amp;rx-&gt;entry[rx-&gt;read];</div><div class='add'>+		if ((__le32_to_cpu(entry-&gt;desc_wb-&gt;properties) &amp;</div><div class='add'>+		     TSNEP_DESC_OWNER_COUNTER_MASK) ==</div><div class='add'>+		    (entry-&gt;properties &amp; TSNEP_DESC_OWNER_COUNTER_MASK))</div><div class='add'>+			return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rx_open(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	int desc_available;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_rx_ring_create(rx);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	tsnep_rx_init(rx);</div><div class='add'>+</div><div class='add'>+	desc_available = tsnep_rx_desc_available(rx);</div><div class='add'>+	if (rx-&gt;xsk_pool)</div><div class='add'>+		retval = tsnep_rx_alloc_zc(rx, desc_available, false);</div><div class='add'>+	else</div><div class='add'>+		retval = tsnep_rx_alloc(rx, desc_available, false);</div><div class='add'>+	if (retval != desc_available) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		goto alloc_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* prealloc pages to prevent allocation failures when XSK pool is</div><div class='add'>+	 * disabled at runtime</div><div class='add'>+	 */</div><div class='add'>+	if (rx-&gt;xsk_pool) {</div><div class='add'>+		retval = tsnep_rx_alloc_page_buffer(rx);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto alloc_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+alloc_failed:</div><div class='add'>+	tsnep_rx_ring_cleanup(rx);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_close(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	if (rx-&gt;xsk_pool)</div><div class='add'>+		tsnep_rx_free_page_buffer(rx);</div><div class='add'>+</div><div class='add'>+	tsnep_rx_ring_cleanup(rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_reopen(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	struct page **page = rx-&gt;page_buffer;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tsnep_rx_init(rx);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE; i++) {</div><div class='add'>+		struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[i];</div><div class='add'>+</div><div class='add'>+		/* defined initial values for properties are required for</div><div class='add'>+		 * correct owner counter checking</div><div class='add'>+		 */</div><div class='add'>+		entry-&gt;desc-&gt;properties = 0;</div><div class='add'>+		entry-&gt;desc_wb-&gt;properties = 0;</div><div class='add'>+</div><div class='add'>+		/* prevent allocation failures by reusing kept pages */</div><div class='add'>+		if (*page) {</div><div class='add'>+			tsnep_rx_set_page(rx, entry, *page);</div><div class='add'>+			tsnep_rx_activate(rx, rx-&gt;write);</div><div class='add'>+			rx-&gt;write++;</div><div class='add'>+</div><div class='add'>+			*page = NULL;</div><div class='add'>+			page++;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rx_reopen_xsk(struct tsnep_rx *rx)</div><div class='add'>+{</div><div class='add'>+	struct page **page = rx-&gt;page_buffer;</div><div class='add'>+	u32 allocated;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tsnep_rx_init(rx);</div><div class='add'>+</div><div class='add'>+	/* alloc all ring entries except the last one, because ring cannot be</div><div class='add'>+	 * filled completely, as many buffers as possible is enough as wakeup is</div><div class='add'>+	 * done if new buffers are available</div><div class='add'>+	 */</div><div class='add'>+	allocated = xsk_buff_alloc_batch(rx-&gt;xsk_pool, rx-&gt;xdp_batch,</div><div class='add'>+					 TSNEP_RING_SIZE - 1);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; TSNEP_RING_SIZE; i++) {</div><div class='add'>+		struct tsnep_rx_entry *entry = &amp;rx-&gt;entry[i];</div><div class='add'>+</div><div class='add'>+		/* keep pages to prevent allocation failures when xsk is</div><div class='add'>+		 * disabled</div><div class='add'>+		 */</div><div class='add'>+		if (entry-&gt;page) {</div><div class='add'>+			*page = entry-&gt;page;</div><div class='add'>+			entry-&gt;page = NULL;</div><div class='add'>+</div><div class='add'>+			page++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* defined initial values for properties are required for</div><div class='add'>+		 * correct owner counter checking</div><div class='add'>+		 */</div><div class='add'>+		entry-&gt;desc-&gt;properties = 0;</div><div class='add'>+		entry-&gt;desc_wb-&gt;properties = 0;</div><div class='add'>+</div><div class='add'>+		if (allocated) {</div><div class='add'>+			tsnep_rx_set_xdp(rx, entry,</div><div class='add'>+					 rx-&gt;xdp_batch[allocated - 1]);</div><div class='add'>+			tsnep_rx_activate(rx, rx-&gt;write);</div><div class='add'>+			rx-&gt;write++;</div><div class='add'>+</div><div class='add'>+			allocated--;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set need wakeup flag immediately if ring is not filled completely,</div><div class='add'>+	 * first polling would be too late as need wakeup signalisation would</div><div class='add'>+	 * be delayed for an indefinite time</div><div class='add'>+	 */</div><div class='add'>+	if (xsk_uses_need_wakeup(rx-&gt;xsk_pool))</div><div class='add'>+		tsnep_xsk_rx_need_wakeup(rx, tsnep_rx_desc_available(rx));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_pending(struct tsnep_queue *queue)</div><div class='add'>+{</div><div class='add'>+	if (queue-&gt;tx &amp;&amp; tsnep_tx_pending(queue-&gt;tx))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;rx &amp;&amp; tsnep_rx_pending(queue-&gt;rx))</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_queue *queue = container_of(napi, struct tsnep_queue,</div><div class='add'>+						 napi);</div><div class='add'>+	bool complete = true;</div><div class='add'>+	int done = 0;</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;tx)</div><div class='add'>+		complete = tsnep_tx_poll(queue-&gt;tx, budget);</div><div class='add'>+</div><div class='add'>+	/* handle case where we are called by netpoll with a budget of 0 */</div><div class='add'>+	if (unlikely(budget &lt;= 0))</div><div class='add'>+		return budget;</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;rx) {</div><div class='add'>+		done = queue-&gt;rx-&gt;xsk_pool ?</div><div class='add'>+		       tsnep_rx_poll_zc(queue-&gt;rx, napi, budget) :</div><div class='add'>+		       tsnep_rx_poll(queue-&gt;rx, napi, budget);</div><div class='add'>+		if (done &gt;= budget)</div><div class='add'>+			complete = false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* if all work not completed, return budget and keep polling */</div><div class='add'>+	if (!complete)</div><div class='add'>+		return budget;</div><div class='add'>+</div><div class='add'>+	if (likely(napi_complete_done(napi, done))) {</div><div class='add'>+		tsnep_enable_irq(queue-&gt;adapter, queue-&gt;irq_mask);</div><div class='add'>+</div><div class='add'>+		/* reschedule if work is already pending, prevent rotten packets</div><div class='add'>+		 * which are transmitted or received after polling but before</div><div class='add'>+		 * interrupt enable</div><div class='add'>+		 */</div><div class='add'>+		if (tsnep_pending(queue)) {</div><div class='add'>+			tsnep_disable_irq(queue-&gt;adapter, queue-&gt;irq_mask);</div><div class='add'>+			napi_schedule(napi);</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return min(done, budget - 1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_request_irq(struct tsnep_queue *queue, bool first)</div><div class='add'>+{</div><div class='add'>+	const char *name = netdev_name(queue-&gt;adapter-&gt;netdev);</div><div class='add'>+	irq_handler_t handler;</div><div class='add'>+	void *dev;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (first) {</div><div class='add'>+		sprintf(queue-&gt;name, "%s-mac", name);</div><div class='add'>+		handler = tsnep_irq;</div><div class='add'>+		dev = queue-&gt;adapter;</div><div class='add'>+	} else {</div><div class='add'>+		if (queue-&gt;tx &amp;&amp; queue-&gt;rx)</div><div class='add'>+			snprintf(queue-&gt;name, sizeof(queue-&gt;name), "%s-txrx-%d",</div><div class='add'>+				 name, queue-&gt;rx-&gt;queue_index);</div><div class='add'>+		else if (queue-&gt;tx)</div><div class='add'>+			snprintf(queue-&gt;name, sizeof(queue-&gt;name), "%s-tx-%d",</div><div class='add'>+				 name, queue-&gt;tx-&gt;queue_index);</div><div class='add'>+		else</div><div class='add'>+			snprintf(queue-&gt;name, sizeof(queue-&gt;name), "%s-rx-%d",</div><div class='add'>+				 name, queue-&gt;rx-&gt;queue_index);</div><div class='add'>+		handler = tsnep_irq_txrx;</div><div class='add'>+		dev = queue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = request_irq(queue-&gt;irq, handler, 0, queue-&gt;name, dev);</div><div class='add'>+	if (retval) {</div><div class='add'>+		/* if name is empty, then interrupt won't be freed */</div><div class='add'>+		memset(queue-&gt;name, 0, sizeof(queue-&gt;name));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_free_irq(struct tsnep_queue *queue, bool first)</div><div class='add'>+{</div><div class='add'>+	void *dev;</div><div class='add'>+</div><div class='add'>+	if (!strlen(queue-&gt;name))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (first)</div><div class='add'>+		dev = queue-&gt;adapter;</div><div class='add'>+	else</div><div class='add'>+		dev = queue;</div><div class='add'>+</div><div class='add'>+	free_irq(queue-&gt;irq, dev);</div><div class='add'>+	memset(queue-&gt;name, 0, sizeof(queue-&gt;name));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_queue_close(struct tsnep_queue *queue, bool first)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx *rx = queue-&gt;rx;</div><div class='add'>+</div><div class='add'>+	tsnep_free_irq(queue, first);</div><div class='add'>+</div><div class='add'>+	if (rx) {</div><div class='add'>+		if (xdp_rxq_info_is_reg(&amp;rx-&gt;xdp_rxq))</div><div class='add'>+			xdp_rxq_info_unreg(&amp;rx-&gt;xdp_rxq);</div><div class='add'>+		if (xdp_rxq_info_is_reg(&amp;rx-&gt;xdp_rxq_zc))</div><div class='add'>+			xdp_rxq_info_unreg(&amp;rx-&gt;xdp_rxq_zc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netif_napi_del(&amp;queue-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_queue_open(struct tsnep_adapter *adapter,</div><div class='add'>+			    struct tsnep_queue *queue, bool first)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx *rx = queue-&gt;rx;</div><div class='add'>+	struct tsnep_tx *tx = queue-&gt;tx;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	netif_napi_add(adapter-&gt;netdev, &amp;queue-&gt;napi, tsnep_poll);</div><div class='add'>+</div><div class='add'>+	if (rx) {</div><div class='add'>+		/* choose TX queue for XDP_TX */</div><div class='add'>+		if (tx)</div><div class='add'>+			rx-&gt;tx_queue_index = tx-&gt;queue_index;</div><div class='add'>+		else if (rx-&gt;queue_index &lt; adapter-&gt;num_tx_queues)</div><div class='add'>+			rx-&gt;tx_queue_index = rx-&gt;queue_index;</div><div class='add'>+		else</div><div class='add'>+			rx-&gt;tx_queue_index = 0;</div><div class='add'>+</div><div class='add'>+		/* prepare both memory models to eliminate possible registration</div><div class='add'>+		 * errors when memory model is switched between page pool and</div><div class='add'>+		 * XSK pool during runtime</div><div class='add'>+		 */</div><div class='add'>+		retval = xdp_rxq_info_reg(&amp;rx-&gt;xdp_rxq, adapter-&gt;netdev,</div><div class='add'>+					  rx-&gt;queue_index, queue-&gt;napi.napi_id);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto failed;</div><div class='add'>+		retval = xdp_rxq_info_reg_mem_model(&amp;rx-&gt;xdp_rxq,</div><div class='add'>+						    MEM_TYPE_PAGE_POOL,</div><div class='add'>+						    rx-&gt;page_pool);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto failed;</div><div class='add'>+		retval = xdp_rxq_info_reg(&amp;rx-&gt;xdp_rxq_zc, adapter-&gt;netdev,</div><div class='add'>+					  rx-&gt;queue_index, queue-&gt;napi.napi_id);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto failed;</div><div class='add'>+		retval = xdp_rxq_info_reg_mem_model(&amp;rx-&gt;xdp_rxq_zc,</div><div class='add'>+						    MEM_TYPE_XSK_BUFF_POOL,</div><div class='add'>+						    NULL);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto failed;</div><div class='add'>+		if (rx-&gt;xsk_pool)</div><div class='add'>+			xsk_pool_set_rxq_info(rx-&gt;xsk_pool, &amp;rx-&gt;xdp_rxq_zc);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tsnep_request_irq(queue, first);</div><div class='add'>+	if (retval) {</div><div class='add'>+		netif_err(adapter, drv, adapter-&gt;netdev,</div><div class='add'>+			  "can't get assigned irq %d.\n", queue-&gt;irq);</div><div class='add'>+		goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	tsnep_queue_close(queue, first);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_queue_enable(struct tsnep_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = queue-&gt;adapter;</div><div class='add'>+</div><div class='add'>+	netif_napi_set_irq(&amp;queue-&gt;napi, queue-&gt;irq);</div><div class='add'>+	napi_enable(&amp;queue-&gt;napi);</div><div class='add'>+	tsnep_enable_irq(adapter, queue-&gt;irq_mask);</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;tx) {</div><div class='add'>+		netif_queue_set_napi(adapter-&gt;netdev, queue-&gt;tx-&gt;queue_index,</div><div class='add'>+				     NETDEV_QUEUE_TYPE_TX, &amp;queue-&gt;napi);</div><div class='add'>+		tsnep_tx_enable(queue-&gt;tx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;rx) {</div><div class='add'>+		netif_queue_set_napi(adapter-&gt;netdev, queue-&gt;rx-&gt;queue_index,</div><div class='add'>+				     NETDEV_QUEUE_TYPE_RX, &amp;queue-&gt;napi);</div><div class='add'>+		tsnep_rx_enable(queue-&gt;rx);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_queue_disable(struct tsnep_queue *queue)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = queue-&gt;adapter;</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;rx)</div><div class='add'>+		netif_queue_set_napi(adapter-&gt;netdev, queue-&gt;rx-&gt;queue_index,</div><div class='add'>+				     NETDEV_QUEUE_TYPE_RX, NULL);</div><div class='add'>+</div><div class='add'>+	if (queue-&gt;tx) {</div><div class='add'>+		tsnep_tx_disable(queue-&gt;tx, &amp;queue-&gt;napi);</div><div class='add'>+		netif_queue_set_napi(adapter-&gt;netdev, queue-&gt;tx-&gt;queue_index,</div><div class='add'>+				     NETDEV_QUEUE_TYPE_TX, NULL);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	napi_disable(&amp;queue-&gt;napi);</div><div class='add'>+	tsnep_disable_irq(adapter, queue-&gt;irq_mask);</div><div class='add'>+</div><div class='add'>+	/* disable RX after NAPI polling has been disabled, because RX can be</div><div class='add'>+	 * enabled during NAPI polling</div><div class='add'>+	 */</div><div class='add'>+	if (queue-&gt;rx)</div><div class='add'>+		tsnep_rx_disable(queue-&gt;rx);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int i, retval;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+		if (adapter-&gt;queue[i].tx) {</div><div class='add'>+			retval = tsnep_tx_open(adapter-&gt;queue[i].tx);</div><div class='add'>+			if (retval)</div><div class='add'>+				goto failed;</div><div class='add'>+		}</div><div class='add'>+		if (adapter-&gt;queue[i].rx) {</div><div class='add'>+			retval = tsnep_rx_open(adapter-&gt;queue[i].rx);</div><div class='add'>+			if (retval)</div><div class='add'>+				goto failed;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		retval = tsnep_queue_open(adapter, &amp;adapter-&gt;queue[i], i == 0);</div><div class='add'>+		if (retval)</div><div class='add'>+			goto failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = netif_set_real_num_tx_queues(adapter-&gt;netdev,</div><div class='add'>+					      adapter-&gt;num_tx_queues);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto failed;</div><div class='add'>+	retval = netif_set_real_num_rx_queues(adapter-&gt;netdev,</div><div class='add'>+					      adapter-&gt;num_rx_queues);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	tsnep_enable_irq(adapter, ECM_INT_LINK);</div><div class='add'>+	retval = tsnep_phy_open(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto phy_failed;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++)</div><div class='add'>+		tsnep_queue_enable(&amp;adapter-&gt;queue[i]);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+phy_failed:</div><div class='add'>+	tsnep_disable_irq(adapter, ECM_INT_LINK);</div><div class='add'>+failed:</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+		tsnep_queue_close(&amp;adapter-&gt;queue[i], i == 0);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;queue[i].rx)</div><div class='add'>+			tsnep_rx_close(adapter-&gt;queue[i].rx);</div><div class='add'>+		if (adapter-&gt;queue[i].tx)</div><div class='add'>+			tsnep_tx_close(adapter-&gt;queue[i].tx);</div><div class='add'>+	}</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_close(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	tsnep_disable_irq(adapter, ECM_INT_LINK);</div><div class='add'>+	tsnep_phy_close(adapter);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_queues; i++) {</div><div class='add'>+		tsnep_queue_disable(&amp;adapter-&gt;queue[i]);</div><div class='add'>+</div><div class='add'>+		tsnep_queue_close(&amp;adapter-&gt;queue[i], i == 0);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;queue[i].rx)</div><div class='add'>+			tsnep_rx_close(adapter-&gt;queue[i].rx);</div><div class='add'>+		if (adapter-&gt;queue[i].tx)</div><div class='add'>+			tsnep_tx_close(adapter-&gt;queue[i].tx);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_enable_xsk(struct tsnep_queue *queue, struct xsk_buff_pool *pool)</div><div class='add'>+{</div><div class='add'>+	bool running = netif_running(queue-&gt;adapter-&gt;netdev);</div><div class='add'>+	u32 frame_size;</div><div class='add'>+</div><div class='add'>+	frame_size = xsk_pool_get_rx_frame_size(pool);</div><div class='add'>+	if (frame_size &lt; TSNEP_XSK_RX_BUF_SIZE)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	queue-&gt;rx-&gt;page_buffer = kcalloc(TSNEP_RING_SIZE,</div><div class='add'>+					 sizeof(*queue-&gt;rx-&gt;page_buffer),</div><div class='add'>+					 GFP_KERNEL);</div><div class='add'>+	if (!queue-&gt;rx-&gt;page_buffer)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	queue-&gt;rx-&gt;xdp_batch = kcalloc(TSNEP_RING_SIZE,</div><div class='add'>+				       sizeof(*queue-&gt;rx-&gt;xdp_batch),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!queue-&gt;rx-&gt;xdp_batch) {</div><div class='add'>+		kfree(queue-&gt;rx-&gt;page_buffer);</div><div class='add'>+		queue-&gt;rx-&gt;page_buffer = NULL;</div><div class='add'>+</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xsk_pool_set_rxq_info(pool, &amp;queue-&gt;rx-&gt;xdp_rxq_zc);</div><div class='add'>+</div><div class='add'>+	if (running)</div><div class='add'>+		tsnep_queue_disable(queue);</div><div class='add'>+</div><div class='add'>+	queue-&gt;tx-&gt;xsk_pool = pool;</div><div class='add'>+	queue-&gt;rx-&gt;xsk_pool = pool;</div><div class='add'>+</div><div class='add'>+	if (running) {</div><div class='add'>+		tsnep_rx_reopen_xsk(queue-&gt;rx);</div><div class='add'>+		tsnep_queue_enable(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsnep_disable_xsk(struct tsnep_queue *queue)</div><div class='add'>+{</div><div class='add'>+	bool running = netif_running(queue-&gt;adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	if (running)</div><div class='add'>+		tsnep_queue_disable(queue);</div><div class='add'>+</div><div class='add'>+	tsnep_rx_free_zc(queue-&gt;rx);</div><div class='add'>+</div><div class='add'>+	queue-&gt;rx-&gt;xsk_pool = NULL;</div><div class='add'>+	queue-&gt;tx-&gt;xsk_pool = NULL;</div><div class='add'>+</div><div class='add'>+	if (running) {</div><div class='add'>+		tsnep_rx_reopen(queue-&gt;rx);</div><div class='add'>+		tsnep_queue_enable(queue);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(queue-&gt;rx-&gt;xdp_batch);</div><div class='add'>+	queue-&gt;rx-&gt;xdp_batch = NULL;</div><div class='add'>+	kfree(queue-&gt;rx-&gt;page_buffer);</div><div class='add'>+	queue-&gt;rx-&gt;page_buffer = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t tsnep_netdev_xmit_frame(struct sk_buff *skb,</div><div class='add'>+					   struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u16 queue_mapping = skb_get_queue_mapping(skb);</div><div class='add'>+</div><div class='add'>+	if (queue_mapping &gt;= adapter-&gt;num_tx_queues)</div><div class='add'>+		queue_mapping = 0;</div><div class='add'>+</div><div class='add'>+	return tsnep_xmit_frame_ring(skb, &amp;adapter-&gt;tx[queue_mapping]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_netdev_set_multicast(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	u16 rx_filter = 0;</div><div class='add'>+</div><div class='add'>+	/* configured MAC address and broadcasts are never filtered */</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC) {</div><div class='add'>+		rx_filter |= TSNEP_RX_FILTER_ACCEPT_ALL_MULTICASTS;</div><div class='add'>+		rx_filter |= TSNEP_RX_FILTER_ACCEPT_ALL_UNICASTS;</div><div class='add'>+	} else if (!netdev_mc_empty(netdev) || (netdev-&gt;flags &amp; IFF_ALLMULTI)) {</div><div class='add'>+		rx_filter |= TSNEP_RX_FILTER_ACCEPT_ALL_MULTICASTS;</div><div class='add'>+	}</div><div class='add'>+	iowrite16(rx_filter, adapter-&gt;addr + TSNEP_RX_FILTER);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_netdev_get_stats64(struct net_device *netdev,</div><div class='add'>+				     struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	u32 reg;</div><div class='add'>+	u32 val;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_tx_queues; i++) {</div><div class='add'>+		stats-&gt;tx_packets += adapter-&gt;tx[i].packets;</div><div class='add'>+		stats-&gt;tx_bytes += adapter-&gt;tx[i].bytes;</div><div class='add'>+		stats-&gt;tx_dropped += adapter-&gt;tx[i].dropped;</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;num_rx_queues; i++) {</div><div class='add'>+		stats-&gt;rx_packets += adapter-&gt;rx[i].packets;</div><div class='add'>+		stats-&gt;rx_bytes += adapter-&gt;rx[i].bytes;</div><div class='add'>+		stats-&gt;rx_dropped += adapter-&gt;rx[i].dropped;</div><div class='add'>+		stats-&gt;multicast += adapter-&gt;rx[i].multicast;</div><div class='add'>+</div><div class='add'>+		reg = ioread32(adapter-&gt;addr + TSNEP_QUEUE(i) +</div><div class='add'>+			       TSNEP_RX_STATISTIC);</div><div class='add'>+		val = (reg &amp; TSNEP_RX_STATISTIC_NO_DESC_MASK) &gt;&gt;</div><div class='add'>+		      TSNEP_RX_STATISTIC_NO_DESC_SHIFT;</div><div class='add'>+		stats-&gt;rx_dropped += val;</div><div class='add'>+		val = (reg &amp; TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL_MASK) &gt;&gt;</div><div class='add'>+		      TSNEP_RX_STATISTIC_BUFFER_TOO_SMALL_SHIFT;</div><div class='add'>+		stats-&gt;rx_dropped += val;</div><div class='add'>+		val = (reg &amp; TSNEP_RX_STATISTIC_FIFO_OVERFLOW_MASK) &gt;&gt;</div><div class='add'>+		      TSNEP_RX_STATISTIC_FIFO_OVERFLOW_SHIFT;</div><div class='add'>+		stats-&gt;rx_errors += val;</div><div class='add'>+		stats-&gt;rx_fifo_errors += val;</div><div class='add'>+		val = (reg &amp; TSNEP_RX_STATISTIC_INVALID_FRAME_MASK) &gt;&gt;</div><div class='add'>+		      TSNEP_RX_STATISTIC_INVALID_FRAME_SHIFT;</div><div class='add'>+		stats-&gt;rx_errors += val;</div><div class='add'>+		stats-&gt;rx_frame_errors += val;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	reg = ioread32(adapter-&gt;addr + ECM_STAT);</div><div class='add'>+	val = (reg &amp; ECM_STAT_RX_ERR_MASK) &gt;&gt; ECM_STAT_RX_ERR_SHIFT;</div><div class='add'>+	stats-&gt;rx_errors += val;</div><div class='add'>+	val = (reg &amp; ECM_STAT_INV_FRM_MASK) &gt;&gt; ECM_STAT_INV_FRM_SHIFT;</div><div class='add'>+	stats-&gt;rx_errors += val;</div><div class='add'>+	stats-&gt;rx_crc_errors += val;</div><div class='add'>+	val = (reg &amp; ECM_STAT_FWD_RX_ERR_MASK) &gt;&gt; ECM_STAT_FWD_RX_ERR_SHIFT;</div><div class='add'>+	stats-&gt;rx_errors += val;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_mac_set_address(struct tsnep_adapter *adapter, u8 *addr)</div><div class='add'>+{</div><div class='add'>+	iowrite32(*(u32 *)addr, adapter-&gt;addr + TSNEP_MAC_ADDRESS_LOW);</div><div class='add'>+	iowrite16(*(u16 *)(addr + sizeof(u32)),</div><div class='add'>+		  adapter-&gt;addr + TSNEP_MAC_ADDRESS_HIGH);</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(adapter-&gt;mac_address, addr);</div><div class='add'>+	netif_info(adapter, drv, adapter-&gt;netdev, "MAC address set to %pM\n",</div><div class='add'>+		   addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_set_mac_address(struct net_device *netdev, void *addr)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	struct sockaddr *sock_addr = addr;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = eth_prepare_mac_addr_change(netdev, sock_addr);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+	eth_hw_addr_set(netdev, sock_addr-&gt;sa_data);</div><div class='add'>+	tsnep_mac_set_address(adapter, sock_addr-&gt;sa_data);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_set_features(struct net_device *netdev,</div><div class='add'>+				     netdev_features_t features)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+	netdev_features_t changed = netdev-&gt;features ^ features;</div><div class='add'>+	bool enable;</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	if (changed &amp; NETIF_F_LOOPBACK) {</div><div class='add'>+		enable = !!(features &amp; NETIF_F_LOOPBACK);</div><div class='add'>+		retval = tsnep_phy_loopback(adapter, enable);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static ktime_t tsnep_netdev_get_tstamp(struct net_device *netdev,</div><div class='add'>+				       const struct skb_shared_hwtstamps *hwtstamps,</div><div class='add'>+				       bool cycles)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rx_inline *rx_inline = hwtstamps-&gt;netdev_data;</div><div class='add'>+	u64 timestamp;</div><div class='add'>+</div><div class='add'>+	if (cycles)</div><div class='add'>+		timestamp = __le64_to_cpu(rx_inline-&gt;counter);</div><div class='add'>+	else</div><div class='add'>+		timestamp = __le64_to_cpu(rx_inline-&gt;timestamp);</div><div class='add'>+</div><div class='add'>+	return ns_to_ktime(timestamp);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_bpf(struct net_device *dev, struct netdev_bpf *bpf)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	switch (bpf-&gt;command) {</div><div class='add'>+	case XDP_SETUP_PROG:</div><div class='add'>+		return tsnep_xdp_setup_prog(adapter, bpf-&gt;prog, bpf-&gt;extack);</div><div class='add'>+	case XDP_SETUP_XSK_POOL:</div><div class='add'>+		return tsnep_xdp_setup_pool(adapter, bpf-&gt;xsk.pool,</div><div class='add'>+					    bpf-&gt;xsk.queue_id);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tsnep_tx *tsnep_xdp_get_tx(struct tsnep_adapter *adapter, u32 cpu)</div><div class='add'>+{</div><div class='add'>+	if (cpu &gt;= TSNEP_MAX_QUEUES)</div><div class='add'>+		cpu &amp;= TSNEP_MAX_QUEUES - 1;</div><div class='add'>+</div><div class='add'>+	while (cpu &gt;= adapter-&gt;num_tx_queues)</div><div class='add'>+		cpu -= adapter-&gt;num_tx_queues;</div><div class='add'>+</div><div class='add'>+	return &amp;adapter-&gt;tx[cpu];</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_xdp_xmit(struct net_device *dev, int n,</div><div class='add'>+				 struct xdp_frame **xdp, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(dev);</div><div class='add'>+	u32 cpu = smp_processor_id();</div><div class='add'>+	struct netdev_queue *nq;</div><div class='add'>+	struct tsnep_tx *tx;</div><div class='add'>+	int nxmit;</div><div class='add'>+	bool xmit;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~XDP_XMIT_FLAGS_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	tx = tsnep_xdp_get_tx(adapter, cpu);</div><div class='add'>+	nq = netdev_get_tx_queue(adapter-&gt;netdev, tx-&gt;queue_index);</div><div class='add'>+</div><div class='add'>+	__netif_tx_lock(nq, cpu);</div><div class='add'>+</div><div class='add'>+	for (nxmit = 0; nxmit &lt; n; nxmit++) {</div><div class='add'>+		xmit = tsnep_xdp_xmit_frame_ring(xdp[nxmit], tx,</div><div class='add'>+						 TSNEP_TX_TYPE_XDP_NDO);</div><div class='add'>+		if (!xmit)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* avoid transmit queue timeout since we share it with the slow</div><div class='add'>+		 * path</div><div class='add'>+		 */</div><div class='add'>+		txq_trans_cond_update(nq);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; XDP_XMIT_FLUSH)</div><div class='add'>+		tsnep_xdp_xmit_flush(tx);</div><div class='add'>+</div><div class='add'>+	__netif_tx_unlock(nq);</div><div class='add'>+</div><div class='add'>+	return nxmit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_netdev_xsk_wakeup(struct net_device *dev, u32 queue_id,</div><div class='add'>+				   u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(dev);</div><div class='add'>+	struct tsnep_queue *queue;</div><div class='add'>+</div><div class='add'>+	if (queue_id &gt;= adapter-&gt;num_rx_queues ||</div><div class='add'>+	    queue_id &gt;= adapter-&gt;num_tx_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue = &amp;adapter-&gt;queue[queue_id];</div><div class='add'>+</div><div class='add'>+	if (!napi_if_scheduled_mark_missed(&amp;queue-&gt;napi))</div><div class='add'>+		napi_schedule(&amp;queue-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops tsnep_netdev_ops = {</div><div class='add'>+	.ndo_open = tsnep_netdev_open,</div><div class='add'>+	.ndo_stop = tsnep_netdev_close,</div><div class='add'>+	.ndo_start_xmit = tsnep_netdev_xmit_frame,</div><div class='add'>+	.ndo_eth_ioctl = phy_do_ioctl_running,</div><div class='add'>+	.ndo_set_rx_mode = tsnep_netdev_set_multicast,</div><div class='add'>+	.ndo_get_stats64 = tsnep_netdev_get_stats64,</div><div class='add'>+	.ndo_set_mac_address = tsnep_netdev_set_mac_address,</div><div class='add'>+	.ndo_set_features = tsnep_netdev_set_features,</div><div class='add'>+	.ndo_get_tstamp = tsnep_netdev_get_tstamp,</div><div class='add'>+	.ndo_setup_tc = tsnep_tc_setup,</div><div class='add'>+	.ndo_bpf = tsnep_netdev_bpf,</div><div class='add'>+	.ndo_xdp_xmit = tsnep_netdev_xdp_xmit,</div><div class='add'>+	.ndo_xsk_wakeup = tsnep_netdev_xsk_wakeup,</div><div class='add'>+	.ndo_hwtstamp_get = tsnep_ptp_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = tsnep_ptp_hwtstamp_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int tsnep_mac_init(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	/* initialize RX filtering, at least configured MAC address and</div><div class='add'>+	 * broadcast are not filtered</div><div class='add'>+	 */</div><div class='add'>+	iowrite16(0, adapter-&gt;addr + TSNEP_RX_FILTER);</div><div class='add'>+</div><div class='add'>+	/* try to get MAC address in the following order:</div><div class='add'>+	 * - device tree</div><div class='add'>+	 * - valid MAC address already set</div><div class='add'>+	 * - MAC address register if valid</div><div class='add'>+	 * - random MAC address</div><div class='add'>+	 */</div><div class='add'>+	retval = of_get_mac_address(adapter-&gt;pdev-&gt;dev.of_node,</div><div class='add'>+				    adapter-&gt;mac_address);</div><div class='add'>+	if (retval == -EPROBE_DEFER)</div><div class='add'>+		return retval;</div><div class='add'>+	if (retval &amp;&amp; !is_valid_ether_addr(adapter-&gt;mac_address)) {</div><div class='add'>+		*(u32 *)adapter-&gt;mac_address =</div><div class='add'>+			ioread32(adapter-&gt;addr + TSNEP_MAC_ADDRESS_LOW);</div><div class='add'>+		*(u16 *)(adapter-&gt;mac_address + sizeof(u32)) =</div><div class='add'>+			ioread16(adapter-&gt;addr + TSNEP_MAC_ADDRESS_HIGH);</div><div class='add'>+		if (!is_valid_ether_addr(adapter-&gt;mac_address))</div><div class='add'>+			eth_random_addr(adapter-&gt;mac_address);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tsnep_mac_set_address(adapter, adapter-&gt;mac_address);</div><div class='add'>+	eth_hw_addr_set(adapter-&gt;netdev, adapter-&gt;mac_address);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_mdio_init(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct device_node *np = adapter-&gt;pdev-&gt;dev.of_node;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (np) {</div><div class='add'>+		np = of_get_child_by_name(np, "mdio");</div><div class='add'>+		if (!np)</div><div class='add'>+			return 0;</div><div class='add'>+</div><div class='add'>+		adapter-&gt;suppress_preamble =</div><div class='add'>+			of_property_read_bool(np, "suppress-preamble");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;mdiobus = devm_mdiobus_alloc(&amp;adapter-&gt;pdev-&gt;dev);</div><div class='add'>+	if (!adapter-&gt;mdiobus) {</div><div class='add'>+		retval = -ENOMEM;</div><div class='add'>+</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;mdiobus-&gt;priv = (void *)adapter;</div><div class='add'>+	adapter-&gt;mdiobus-&gt;parent = &amp;adapter-&gt;pdev-&gt;dev;</div><div class='add'>+	adapter-&gt;mdiobus-&gt;read = tsnep_mdiobus_read;</div><div class='add'>+	adapter-&gt;mdiobus-&gt;write = tsnep_mdiobus_write;</div><div class='add'>+	adapter-&gt;mdiobus-&gt;name = TSNEP "-mdiobus";</div><div class='add'>+	snprintf(adapter-&gt;mdiobus-&gt;id, MII_BUS_ID_SIZE, "%s",</div><div class='add'>+		 adapter-&gt;pdev-&gt;name);</div><div class='add'>+</div><div class='add'>+	/* do not scan broadcast address */</div><div class='add'>+	adapter-&gt;mdiobus-&gt;phy_mask = 0x0000001;</div><div class='add'>+</div><div class='add'>+	retval = of_mdiobus_register(adapter-&gt;mdiobus, np);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	of_node_put(np);</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_phy_init(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct device_node *phy_node;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = of_get_phy_mode(adapter-&gt;pdev-&gt;dev.of_node,</div><div class='add'>+				 &amp;adapter-&gt;phy_mode);</div><div class='add'>+	if (retval)</div><div class='add'>+		adapter-&gt;phy_mode = PHY_INTERFACE_MODE_GMII;</div><div class='add'>+</div><div class='add'>+	phy_node = of_parse_phandle(adapter-&gt;pdev-&gt;dev.of_node, "phy-handle",</div><div class='add'>+				    0);</div><div class='add'>+	adapter-&gt;phydev = of_phy_find_device(phy_node);</div><div class='add'>+	of_node_put(phy_node);</div><div class='add'>+	if (!adapter-&gt;phydev &amp;&amp; adapter-&gt;mdiobus)</div><div class='add'>+		adapter-&gt;phydev = phy_find_first(adapter-&gt;mdiobus);</div><div class='add'>+	if (!adapter-&gt;phydev)</div><div class='add'>+		return -EIO;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_queue_init(struct tsnep_adapter *adapter, int queue_count)</div><div class='add'>+{</div><div class='add'>+	u32 irq_mask = ECM_INT_TX_0 | ECM_INT_RX_0;</div><div class='add'>+	char name[8];</div><div class='add'>+	int i;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	/* one TX/RX queue pair for netdev is mandatory */</div><div class='add'>+	if (platform_irq_count(adapter-&gt;pdev) == 1)</div><div class='add'>+		retval = platform_get_irq(adapter-&gt;pdev, 0);</div><div class='add'>+	else</div><div class='add'>+		retval = platform_get_irq_byname(adapter-&gt;pdev, "mac");</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+	adapter-&gt;num_tx_queues = 1;</div><div class='add'>+	adapter-&gt;num_rx_queues = 1;</div><div class='add'>+	adapter-&gt;num_queues = 1;</div><div class='add'>+	adapter-&gt;queue[0].adapter = adapter;</div><div class='add'>+	adapter-&gt;queue[0].irq = retval;</div><div class='add'>+	adapter-&gt;queue[0].tx = &amp;adapter-&gt;tx[0];</div><div class='add'>+	adapter-&gt;queue[0].tx-&gt;adapter = adapter;</div><div class='add'>+	adapter-&gt;queue[0].tx-&gt;addr = adapter-&gt;addr + TSNEP_QUEUE(0);</div><div class='add'>+	adapter-&gt;queue[0].tx-&gt;queue_index = 0;</div><div class='add'>+	adapter-&gt;queue[0].rx = &amp;adapter-&gt;rx[0];</div><div class='add'>+	adapter-&gt;queue[0].rx-&gt;adapter = adapter;</div><div class='add'>+	adapter-&gt;queue[0].rx-&gt;addr = adapter-&gt;addr + TSNEP_QUEUE(0);</div><div class='add'>+	adapter-&gt;queue[0].rx-&gt;queue_index = 0;</div><div class='add'>+	adapter-&gt;queue[0].irq_mask = irq_mask;</div><div class='add'>+	adapter-&gt;queue[0].irq_delay_addr = adapter-&gt;addr + ECM_INT_DELAY;</div><div class='add'>+	retval = tsnep_set_irq_coalesce(&amp;adapter-&gt;queue[0],</div><div class='add'>+					TSNEP_COALESCE_USECS_DEFAULT);</div><div class='add'>+	if (retval &lt; 0)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;netdev-&gt;irq = adapter-&gt;queue[0].irq;</div><div class='add'>+</div><div class='add'>+	/* add additional TX/RX queue pairs only if dedicated interrupt is</div><div class='add'>+	 * available</div><div class='add'>+	 */</div><div class='add'>+	for (i = 1; i &lt; queue_count; i++) {</div><div class='add'>+		sprintf(name, "txrx-%d", i);</div><div class='add'>+		retval = platform_get_irq_byname_optional(adapter-&gt;pdev, name);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		adapter-&gt;num_tx_queues++;</div><div class='add'>+		adapter-&gt;num_rx_queues++;</div><div class='add'>+		adapter-&gt;num_queues++;</div><div class='add'>+		adapter-&gt;queue[i].adapter = adapter;</div><div class='add'>+		adapter-&gt;queue[i].irq = retval;</div><div class='add'>+		adapter-&gt;queue[i].tx = &amp;adapter-&gt;tx[i];</div><div class='add'>+		adapter-&gt;queue[i].tx-&gt;adapter = adapter;</div><div class='add'>+		adapter-&gt;queue[i].tx-&gt;addr = adapter-&gt;addr + TSNEP_QUEUE(i);</div><div class='add'>+		adapter-&gt;queue[i].tx-&gt;queue_index = i;</div><div class='add'>+		adapter-&gt;queue[i].rx = &amp;adapter-&gt;rx[i];</div><div class='add'>+		adapter-&gt;queue[i].rx-&gt;adapter = adapter;</div><div class='add'>+		adapter-&gt;queue[i].rx-&gt;addr = adapter-&gt;addr + TSNEP_QUEUE(i);</div><div class='add'>+		adapter-&gt;queue[i].rx-&gt;queue_index = i;</div><div class='add'>+		adapter-&gt;queue[i].irq_mask =</div><div class='add'>+			irq_mask &lt;&lt; (ECM_INT_TXRX_SHIFT * i);</div><div class='add'>+		adapter-&gt;queue[i].irq_delay_addr =</div><div class='add'>+			adapter-&gt;addr + ECM_INT_DELAY + ECM_INT_DELAY_OFFSET * i;</div><div class='add'>+		retval = tsnep_set_irq_coalesce(&amp;adapter-&gt;queue[i],</div><div class='add'>+						TSNEP_COALESCE_USECS_DEFAULT);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_probe(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct resource *io;</div><div class='add'>+	u32 type;</div><div class='add'>+	int revision;</div><div class='add'>+	int version;</div><div class='add'>+	int queue_count;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	netdev = devm_alloc_etherdev_mqs(&amp;pdev-&gt;dev,</div><div class='add'>+					 sizeof(struct tsnep_adapter),</div><div class='add'>+					 TSNEP_MAX_QUEUES, TSNEP_MAX_QUEUES);</div><div class='add'>+	if (!netdev)</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='add'>+	adapter = netdev_priv(netdev);</div><div class='add'>+	platform_set_drvdata(pdev, adapter);</div><div class='add'>+	adapter-&gt;pdev = pdev;</div><div class='add'>+	adapter-&gt;dmadev = &amp;pdev-&gt;dev;</div><div class='add'>+	adapter-&gt;netdev = netdev;</div><div class='add'>+	adapter-&gt;msg_enable = NETIF_MSG_DRV | NETIF_MSG_PROBE |</div><div class='add'>+			      NETIF_MSG_LINK | NETIF_MSG_IFUP |</div><div class='add'>+			      NETIF_MSG_IFDOWN | NETIF_MSG_TX_QUEUED;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='add'>+	netdev-&gt;max_mtu = TSNEP_MAX_FRAME_SIZE;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;adapter-&gt;gate_control_lock);</div><div class='add'>+	mutex_init(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+	INIT_LIST_HEAD(&amp;adapter-&gt;rxnfc_rules);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;addr = devm_platform_get_and_ioremap_resource(pdev, 0, &amp;io);</div><div class='add'>+	if (IS_ERR(adapter-&gt;addr))</div><div class='add'>+		return PTR_ERR(adapter-&gt;addr);</div><div class='add'>+	netdev-&gt;mem_start = io-&gt;start;</div><div class='add'>+	netdev-&gt;mem_end = io-&gt;end;</div><div class='add'>+</div><div class='add'>+	type = ioread32(adapter-&gt;addr + ECM_TYPE);</div><div class='add'>+	revision = (type &amp; ECM_REVISION_MASK) &gt;&gt; ECM_REVISION_SHIFT;</div><div class='add'>+	version = (type &amp; ECM_VERSION_MASK) &gt;&gt; ECM_VERSION_SHIFT;</div><div class='add'>+	queue_count = (type &amp; ECM_QUEUE_COUNT_MASK) &gt;&gt; ECM_QUEUE_COUNT_SHIFT;</div><div class='add'>+	adapter-&gt;gate_control = type &amp; ECM_GATE_CONTROL;</div><div class='add'>+	adapter-&gt;rxnfc_max = TSNEP_RX_ASSIGN_ETHER_TYPE_COUNT;</div><div class='add'>+</div><div class='add'>+	tsnep_disable_irq(adapter, ECM_INT_ALL);</div><div class='add'>+</div><div class='add'>+	retval = tsnep_queue_init(adapter, queue_count);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	retval = dma_set_mask_and_coherent(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+					   DMA_BIT_MASK(64));</div><div class='add'>+	if (retval) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "no usable DMA configuration.\n");</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tsnep_mac_init(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_mdio_init(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto mdio_init_failed;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_phy_init(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto phy_init_failed;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_ptp_init(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto ptp_init_failed;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_tc_init(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto tc_init_failed;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_rxnfc_init(adapter);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto rxnfc_init_failed;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;netdev_ops = &amp;tsnep_netdev_ops;</div><div class='add'>+	netdev-&gt;ethtool_ops = &amp;tsnep_ethtool_ops;</div><div class='add'>+	netdev-&gt;features = NETIF_F_SG;</div><div class='add'>+	netdev-&gt;hw_features = netdev-&gt;features | NETIF_F_LOOPBACK;</div><div class='add'>+</div><div class='add'>+	netdev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT |</div><div class='add'>+			       NETDEV_XDP_ACT_NDO_XMIT |</div><div class='add'>+			       NETDEV_XDP_ACT_NDO_XMIT_SG |</div><div class='add'>+			       NETDEV_XDP_ACT_XSK_ZEROCOPY;</div><div class='add'>+</div><div class='add'>+	/* carrier off reporting is important to ethtool even BEFORE open */</div><div class='add'>+	netif_carrier_off(netdev);</div><div class='add'>+</div><div class='add'>+	retval = register_netdev(netdev);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto register_failed;</div><div class='add'>+</div><div class='add'>+	dev_info(&amp;adapter-&gt;pdev-&gt;dev, "device version %d.%02d\n", version,</div><div class='add'>+		 revision);</div><div class='add'>+	if (adapter-&gt;gate_control)</div><div class='add'>+		dev_info(&amp;adapter-&gt;pdev-&gt;dev, "gate control detected\n");</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+register_failed:</div><div class='add'>+	tsnep_rxnfc_cleanup(adapter);</div><div class='add'>+rxnfc_init_failed:</div><div class='add'>+	tsnep_tc_cleanup(adapter);</div><div class='add'>+tc_init_failed:</div><div class='add'>+	tsnep_ptp_cleanup(adapter);</div><div class='add'>+ptp_init_failed:</div><div class='add'>+phy_init_failed:</div><div class='add'>+	if (adapter-&gt;mdiobus)</div><div class='add'>+		mdiobus_unregister(adapter-&gt;mdiobus);</div><div class='add'>+mdio_init_failed:</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_remove(struct platform_device *pdev)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = platform_get_drvdata(pdev);</div><div class='add'>+</div><div class='add'>+	unregister_netdev(adapter-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	tsnep_rxnfc_cleanup(adapter);</div><div class='add'>+</div><div class='add'>+	tsnep_tc_cleanup(adapter);</div><div class='add'>+</div><div class='add'>+	tsnep_ptp_cleanup(adapter);</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;mdiobus)</div><div class='add'>+		mdiobus_unregister(adapter-&gt;mdiobus);</div><div class='add'>+</div><div class='add'>+	tsnep_disable_irq(adapter, ECM_INT_ALL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct of_device_id tsnep_of_match[] = {</div><div class='add'>+	{ .compatible = "engleder,tsnep", },</div><div class='add'>+{ },</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(of, tsnep_of_match);</div><div class='add'>+</div><div class='add'>+static struct platform_driver tsnep_driver = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = TSNEP,</div><div class='add'>+		.of_match_table = tsnep_of_match,</div><div class='add'>+	},</div><div class='add'>+	.probe = tsnep_probe,</div><div class='add'>+	.remove = tsnep_remove,</div><div class='add'>+};</div><div class='add'>+module_platform_driver(tsnep_driver);</div><div class='add'>+</div><div class='add'>+MODULE_AUTHOR("Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt;");</div><div class='add'>+MODULE_DESCRIPTION("TSN endpoint Ethernet MAC driver");</div><div class='add'>+MODULE_LICENSE("GPL");</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_ptp.c b/drivers/net/ethernet/engleder/tsnep_ptp.c<br/>new file mode 100644<br/>index 000000000000..ae1308eb813d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_ptp.c</a></div><div class='hunk'>@@ -0,0 +1,242 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+</div><div class='add'>+void tsnep_get_system_time(struct tsnep_adapter *adapter, u64 *time)</div><div class='add'>+{</div><div class='add'>+	u32 high_before;</div><div class='add'>+	u32 low;</div><div class='add'>+	u32 high;</div><div class='add'>+</div><div class='add'>+	/* read high dword twice to detect overrun */</div><div class='add'>+	high = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	do {</div><div class='add'>+		low = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_LOW);</div><div class='add'>+		high_before = high;</div><div class='add'>+		high = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	} while (high != high_before);</div><div class='add'>+	*time = (((u64)high) &lt;&lt; 32) | ((u64)low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_ptp_hwtstamp_get(struct net_device *netdev,</div><div class='add'>+			   struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	*config = adapter-&gt;hwtstamp_config;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_ptp_hwtstamp_set(struct net_device *netdev,</div><div class='add'>+			   struct kernel_hwtstamp_config *config,</div><div class='add'>+			   struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='add'>+	case HWTSTAMP_TX_OFF:</div><div class='add'>+	case HWTSTAMP_TX_ON:</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;rx_filter) {</div><div class='add'>+	case HWTSTAMP_FILTER_NONE:</div><div class='add'>+		break;</div><div class='add'>+	case HWTSTAMP_FILTER_ALL:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_EVENT:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_SYNC:</div><div class='add'>+	case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:</div><div class='add'>+	case HWTSTAMP_FILTER_NTP_ALL:</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;hwtstamp_config = *config;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ptp_adjfine(struct ptp_clock_info *ptp, long scaled_ppm)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = container_of(ptp, struct tsnep_adapter,</div><div class='add'>+						     ptp_clock_info);</div><div class='add'>+	bool negative = false;</div><div class='add'>+	u64 rate_offset;</div><div class='add'>+</div><div class='add'>+	if (scaled_ppm &lt; 0) {</div><div class='add'>+		scaled_ppm = -scaled_ppm;</div><div class='add'>+		negative = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* convert from 16 bit to 32 bit binary fractional, divide by 1000000 to</div><div class='add'>+	 * eliminate ppm, multiply with 8 to compensate 8ns clock cycle time,</div><div class='add'>+	 * simplify calculation because 15625 * 8 = 1000000 / 8</div><div class='add'>+	 */</div><div class='add'>+	rate_offset = scaled_ppm;</div><div class='add'>+	rate_offset &lt;&lt;= 16 - 3;</div><div class='add'>+	rate_offset = div_u64(rate_offset, 15625);</div><div class='add'>+</div><div class='add'>+	rate_offset &amp;= ECM_CLOCK_RATE_OFFSET_MASK;</div><div class='add'>+	if (negative)</div><div class='add'>+		rate_offset |= ECM_CLOCK_RATE_OFFSET_SIGN;</div><div class='add'>+	iowrite32(rate_offset &amp; 0xFFFFFFFF, adapter-&gt;addr + ECM_CLOCK_RATE);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = container_of(ptp, struct tsnep_adapter,</div><div class='add'>+						     ptp_clock_info);</div><div class='add'>+	u64 system_time;</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	tsnep_get_system_time(adapter, &amp;system_time);</div><div class='add'>+</div><div class='add'>+	system_time += delta;</div><div class='add'>+</div><div class='add'>+	/* high dword is buffered in hardware and synchronously written to</div><div class='add'>+	 * system time when low dword is written</div><div class='add'>+	 */</div><div class='add'>+	iowrite32(system_time &gt;&gt; 32, adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	iowrite32(system_time &amp; 0xFFFFFFFF,</div><div class='add'>+		  adapter-&gt;addr + ECM_SYSTEM_TIME_LOW);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ptp_gettimex64(struct ptp_clock_info *ptp,</div><div class='add'>+				struct timespec64 *ts,</div><div class='add'>+				struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = container_of(ptp, struct tsnep_adapter,</div><div class='add'>+						     ptp_clock_info);</div><div class='add'>+	u32 high_before;</div><div class='add'>+	u32 low;</div><div class='add'>+	u32 high;</div><div class='add'>+	u64 system_time;</div><div class='add'>+</div><div class='add'>+	/* read high dword twice to detect overrun */</div><div class='add'>+	high = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	do {</div><div class='add'>+		ptp_read_system_prets(sts);</div><div class='add'>+		low = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_LOW);</div><div class='add'>+		ptp_read_system_postts(sts);</div><div class='add'>+		high_before = high;</div><div class='add'>+		high = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	} while (high != high_before);</div><div class='add'>+	system_time = (((u64)high) &lt;&lt; 32) | ((u64)low);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(system_time);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ptp_settime64(struct ptp_clock_info *ptp,</div><div class='add'>+			       const struct timespec64 *ts)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = container_of(ptp, struct tsnep_adapter,</div><div class='add'>+						     ptp_clock_info);</div><div class='add'>+	u64 system_time = timespec64_to_ns(ts);</div><div class='add'>+	unsigned long flags;</div><div class='add'>+</div><div class='add'>+	spin_lock_irqsave(&amp;adapter-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	/* high dword is buffered in hardware and synchronously written to</div><div class='add'>+	 * system time when low dword is written</div><div class='add'>+	 */</div><div class='add'>+	iowrite32(system_time &gt;&gt; 32, adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	iowrite32(system_time &amp; 0xFFFFFFFF,</div><div class='add'>+		  adapter-&gt;addr + ECM_SYSTEM_TIME_LOW);</div><div class='add'>+</div><div class='add'>+	spin_unlock_irqrestore(&amp;adapter-&gt;ptp_lock, flags);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_ptp_getcyclesx64(struct ptp_clock_info *ptp,</div><div class='add'>+				  struct timespec64 *ts,</div><div class='add'>+				  struct ptp_system_timestamp *sts)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = container_of(ptp, struct tsnep_adapter,</div><div class='add'>+						     ptp_clock_info);</div><div class='add'>+	u32 high_before;</div><div class='add'>+	u32 low;</div><div class='add'>+	u32 high;</div><div class='add'>+	u64 counter;</div><div class='add'>+</div><div class='add'>+	/* read high dword twice to detect overrun */</div><div class='add'>+	high = ioread32(adapter-&gt;addr + ECM_COUNTER_HIGH);</div><div class='add'>+	do {</div><div class='add'>+		ptp_read_system_prets(sts);</div><div class='add'>+		low = ioread32(adapter-&gt;addr + ECM_COUNTER_LOW);</div><div class='add'>+		ptp_read_system_postts(sts);</div><div class='add'>+		high_before = high;</div><div class='add'>+		high = ioread32(adapter-&gt;addr + ECM_COUNTER_HIGH);</div><div class='add'>+	} while (high != high_before);</div><div class='add'>+	counter = (((u64)high) &lt;&lt; 32) | ((u64)low);</div><div class='add'>+</div><div class='add'>+	*ts = ns_to_timespec64(counter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_ptp_init(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int retval = 0;</div><div class='add'>+</div><div class='add'>+	adapter-&gt;hwtstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;</div><div class='add'>+	adapter-&gt;hwtstamp_config.tx_type = HWTSTAMP_TX_OFF;</div><div class='add'>+</div><div class='add'>+	snprintf(adapter-&gt;ptp_clock_info.name, 16, "%s", TSNEP);</div><div class='add'>+	adapter-&gt;ptp_clock_info.owner = THIS_MODULE;</div><div class='add'>+	/* at most 2^-1ns adjustment every clock cycle for 8ns clock cycle time,</div><div class='add'>+	 * stay slightly below because only bits below 2^-1ns are supported</div><div class='add'>+	 */</div><div class='add'>+	adapter-&gt;ptp_clock_info.max_adj = (500000000 / 8 - 1);</div><div class='add'>+	adapter-&gt;ptp_clock_info.adjfine = tsnep_ptp_adjfine;</div><div class='add'>+	adapter-&gt;ptp_clock_info.adjtime = tsnep_ptp_adjtime;</div><div class='add'>+	adapter-&gt;ptp_clock_info.gettimex64 = tsnep_ptp_gettimex64;</div><div class='add'>+	adapter-&gt;ptp_clock_info.settime64 = tsnep_ptp_settime64;</div><div class='add'>+	adapter-&gt;ptp_clock_info.getcyclesx64 = tsnep_ptp_getcyclesx64;</div><div class='add'>+</div><div class='add'>+	spin_lock_init(&amp;adapter-&gt;ptp_lock);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;ptp_clock = ptp_clock_register(&amp;adapter-&gt;ptp_clock_info,</div><div class='add'>+						&amp;adapter-&gt;pdev-&gt;dev);</div><div class='add'>+	if (IS_ERR(adapter-&gt;ptp_clock)) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "ptp_clock_register failed\n");</div><div class='add'>+</div><div class='add'>+		retval = PTR_ERR(adapter-&gt;ptp_clock);</div><div class='add'>+		adapter-&gt;ptp_clock = NULL;</div><div class='add'>+	} else if (adapter-&gt;ptp_clock) {</div><div class='add'>+		netdev_info(adapter-&gt;netdev, "PHC added\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsnep_ptp_cleanup(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (adapter-&gt;ptp_clock) {</div><div class='add'>+		ptp_clock_unregister(adapter-&gt;ptp_clock);</div><div class='add'>+		netdev_info(adapter-&gt;netdev, "PHC removed\n");</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_rxnfc.c b/drivers/net/ethernet/engleder/tsnep_rxnfc.c<br/>new file mode 100644<br/>index 000000000000..9ac2a0cf3833<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_rxnfc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_rxnfc.c</a></div><div class='hunk'>@@ -0,0 +1,307 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2022 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+</div><div class='add'>+#define ETHER_TYPE_FULL_MASK ((__force __be16)~0)</div><div class='add'>+</div><div class='add'>+static void tsnep_enable_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			      struct tsnep_rxnfc_rule *rule)</div><div class='add'>+{</div><div class='add'>+	u8 rx_assign;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	rx_assign = TSNEP_RX_ASSIGN_ACTIVE;</div><div class='add'>+	rx_assign |= (rule-&gt;queue_index &lt;&lt; TSNEP_RX_ASSIGN_QUEUE_SHIFT) &amp;</div><div class='add'>+		     TSNEP_RX_ASSIGN_QUEUE_MASK;</div><div class='add'>+</div><div class='add'>+	addr = adapter-&gt;addr + TSNEP_RX_ASSIGN_ETHER_TYPE +</div><div class='add'>+	       TSNEP_RX_ASSIGN_ETHER_TYPE_OFFSET * rule-&gt;location;</div><div class='add'>+	iowrite16(rule-&gt;filter.ether_type, addr);</div><div class='add'>+</div><div class='add'>+	/* enable rule after all settings are done */</div><div class='add'>+	addr = adapter-&gt;addr + TSNEP_RX_ASSIGN +</div><div class='add'>+	       TSNEP_RX_ASSIGN_OFFSET * rule-&gt;location;</div><div class='add'>+	iowrite8(rx_assign, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_disable_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			       struct tsnep_rxnfc_rule *rule)</div><div class='add'>+{</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	addr = adapter-&gt;addr + TSNEP_RX_ASSIGN +</div><div class='add'>+	       TSNEP_RX_ASSIGN_OFFSET * rule-&gt;location;</div><div class='add'>+	iowrite8(0, addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct tsnep_rxnfc_rule *tsnep_get_rule(struct tsnep_adapter *adapter,</div><div class='add'>+					       int location)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rxnfc_rule *rule;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;adapter-&gt;rxnfc_rules, list) {</div><div class='add'>+		if (rule-&gt;location == location)</div><div class='add'>+			return rule;</div><div class='add'>+		if (rule-&gt;location &gt; location)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_add_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			   struct tsnep_rxnfc_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rxnfc_rule *pred, *cur;</div><div class='add'>+</div><div class='add'>+	tsnep_enable_rule(adapter, rule);</div><div class='add'>+</div><div class='add'>+	pred = NULL;</div><div class='add'>+	list_for_each_entry(cur, &amp;adapter-&gt;rxnfc_rules, list) {</div><div class='add'>+		if (cur-&gt;location &gt;= rule-&gt;location)</div><div class='add'>+			break;</div><div class='add'>+		pred = cur;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;rule-&gt;list, pred ? &amp;pred-&gt;list : &amp;adapter-&gt;rxnfc_rules);</div><div class='add'>+	adapter-&gt;rxnfc_count++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_delete_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			      struct tsnep_rxnfc_rule *rule)</div><div class='add'>+{</div><div class='add'>+	tsnep_disable_rule(adapter, rule);</div><div class='add'>+</div><div class='add'>+	list_del(&amp;rule-&gt;list);</div><div class='add'>+	adapter-&gt;rxnfc_count--;</div><div class='add'>+</div><div class='add'>+	kfree(rule);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_flush_rules(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rxnfc_rule *rule, *tmp;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(rule, tmp, &amp;adapter-&gt;rxnfc_rules, list)</div><div class='add'>+		tsnep_delete_rule(adapter, rule);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_rxnfc_get_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fsp = &amp;cmd-&gt;fs;</div><div class='add'>+	struct tsnep_rxnfc_rule *rule = NULL;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data = adapter-&gt;rxnfc_max;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	rule = tsnep_get_rule(adapter, fsp-&gt;location);</div><div class='add'>+	if (!rule) {</div><div class='add'>+		mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fsp-&gt;flow_type = ETHER_FLOW;</div><div class='add'>+	fsp-&gt;ring_cookie = rule-&gt;queue_index;</div><div class='add'>+</div><div class='add'>+	if (rule-&gt;filter.type == TSNEP_RXNFC_ETHER_TYPE) {</div><div class='add'>+		fsp-&gt;h_u.ether_spec.h_proto = htons(rule-&gt;filter.ether_type);</div><div class='add'>+		fsp-&gt;m_u.ether_spec.h_proto = ETHER_TYPE_FULL_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_rxnfc_get_all(struct tsnep_adapter *adapter,</div><div class='add'>+			struct ethtool_rxnfc *cmd,</div><div class='add'>+			u32 *rule_locs)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rxnfc_rule *rule;</div><div class='add'>+	int count = 0;</div><div class='add'>+</div><div class='add'>+	cmd-&gt;data = adapter-&gt;rxnfc_max;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(rule, &amp;adapter-&gt;rxnfc_rules, list) {</div><div class='add'>+		if (count == cmd-&gt;rule_cnt) {</div><div class='add'>+			mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+			return -EMSGSIZE;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		rule_locs[count] = rule-&gt;location;</div><div class='add'>+		count++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	cmd-&gt;rule_cnt = count;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rxnfc_find_location(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_rxnfc_rule *tmp;</div><div class='add'>+	int location = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;adapter-&gt;rxnfc_rules, list) {</div><div class='add'>+		if (tmp-&gt;location == location)</div><div class='add'>+			location++;</div><div class='add'>+		else</div><div class='add'>+			return location;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (location &gt;= adapter-&gt;rxnfc_max)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	return location;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_rxnfc_init_rule(struct tsnep_rxnfc_rule *rule,</div><div class='add'>+				  const struct ethtool_rx_flow_spec *fsp)</div><div class='add'>+{</div><div class='add'>+	INIT_LIST_HEAD(&amp;rule-&gt;list);</div><div class='add'>+</div><div class='add'>+	rule-&gt;queue_index = fsp-&gt;ring_cookie;</div><div class='add'>+	rule-&gt;location = fsp-&gt;location;</div><div class='add'>+</div><div class='add'>+	rule-&gt;filter.type = TSNEP_RXNFC_ETHER_TYPE;</div><div class='add'>+	rule-&gt;filter.ether_type = ntohs(fsp-&gt;h_u.ether_spec.h_proto);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_rxnfc_check_rule(struct tsnep_adapter *adapter,</div><div class='add'>+				  struct tsnep_rxnfc_rule *rule)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = adapter-&gt;netdev;</div><div class='add'>+	struct tsnep_rxnfc_rule *tmp;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;adapter-&gt;rxnfc_rules, list) {</div><div class='add'>+		if (!memcmp(&amp;rule-&gt;filter, &amp;tmp-&gt;filter, sizeof(rule-&gt;filter)) &amp;&amp;</div><div class='add'>+		    tmp-&gt;location != rule-&gt;location) {</div><div class='add'>+			netdev_dbg(dev, "rule already exists\n");</div><div class='add'>+</div><div class='add'>+			return -EEXIST;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_rxnfc_add_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = adapter-&gt;netdev;</div><div class='add'>+	struct ethtool_rx_flow_spec *fsp =</div><div class='add'>+		(struct ethtool_rx_flow_spec *)&amp;cmd-&gt;fs;</div><div class='add'>+	struct tsnep_rxnfc_rule *rule, *old_rule;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	/* only EtherType is supported */</div><div class='add'>+	if (fsp-&gt;flow_type != ETHER_FLOW ||</div><div class='add'>+	    !is_zero_ether_addr(fsp-&gt;m_u.ether_spec.h_dest) ||</div><div class='add'>+	    !is_zero_ether_addr(fsp-&gt;m_u.ether_spec.h_source) ||</div><div class='add'>+	    fsp-&gt;m_u.ether_spec.h_proto != ETHER_TYPE_FULL_MASK) {</div><div class='add'>+		netdev_dbg(netdev, "only ethernet protocol is supported\n");</div><div class='add'>+</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fsp-&gt;ring_cookie &gt;</div><div class='add'>+	    (TSNEP_RX_ASSIGN_QUEUE_MASK &gt;&gt; TSNEP_RX_ASSIGN_QUEUE_SHIFT)) {</div><div class='add'>+		netdev_dbg(netdev, "invalid action\n");</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (fsp-&gt;location != RX_CLS_LOC_ANY &amp;&amp;</div><div class='add'>+	    fsp-&gt;location &gt;= adapter-&gt;rxnfc_max) {</div><div class='add'>+		netdev_dbg(netdev, "invalid location\n");</div><div class='add'>+</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rule = kzalloc(sizeof(*rule), GFP_KERNEL);</div><div class='add'>+	if (!rule)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	if (fsp-&gt;location == RX_CLS_LOC_ANY) {</div><div class='add'>+		retval = tsnep_rxnfc_find_location(adapter);</div><div class='add'>+		if (retval &lt; 0)</div><div class='add'>+			goto failed;</div><div class='add'>+		fsp-&gt;location = retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tsnep_rxnfc_init_rule(rule, fsp);</div><div class='add'>+</div><div class='add'>+	retval = tsnep_rxnfc_check_rule(adapter, rule);</div><div class='add'>+	if (retval)</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	old_rule = tsnep_get_rule(adapter, fsp-&gt;location);</div><div class='add'>+	if (old_rule)</div><div class='add'>+		tsnep_delete_rule(adapter, old_rule);</div><div class='add'>+</div><div class='add'>+	tsnep_add_rule(adapter, rule);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+	kfree(rule);</div><div class='add'>+	return retval;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_rxnfc_del_rule(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct ethtool_rxnfc *cmd)</div><div class='add'>+{</div><div class='add'>+	struct ethtool_rx_flow_spec *fsp =</div><div class='add'>+		(struct ethtool_rx_flow_spec *)&amp;cmd-&gt;fs;</div><div class='add'>+	struct tsnep_rxnfc_rule *rule;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	rule = tsnep_get_rule(adapter, fsp-&gt;location);</div><div class='add'>+	if (!rule) {</div><div class='add'>+		mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+		return -ENOENT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tsnep_delete_rule(adapter, rule);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;rxnfc_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_rxnfc_init(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* disable all rules */</div><div class='add'>+	for (i = 0; i &lt; adapter-&gt;rxnfc_max;</div><div class='add'>+	     i += sizeof(u32) / TSNEP_RX_ASSIGN_OFFSET)</div><div class='add'>+		iowrite32(0, adapter-&gt;addr + TSNEP_RX_ASSIGN + i);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsnep_rxnfc_cleanup(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	tsnep_flush_rules(adapter);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_selftests.c b/drivers/net/ethernet/engleder/tsnep_selftests.c<br/>new file mode 100644<br/>index 000000000000..8a9145f93147<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_selftests.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_selftests.c</a></div><div class='hunk'>@@ -0,0 +1,811 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+</div><div class='add'>+enum tsnep_test {</div><div class='add'>+	TSNEP_TEST_ENABLE = 0,</div><div class='add'>+	TSNEP_TEST_TAPRIO,</div><div class='add'>+	TSNEP_TEST_TAPRIO_CHANGE,</div><div class='add'>+	TSNEP_TEST_TAPRIO_EXTENSION,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const char tsnep_test_strings[][ETH_GSTRING_LEN] = {</div><div class='add'>+	"Enable timeout        (offline)",</div><div class='add'>+	"TAPRIO                (offline)",</div><div class='add'>+	"TAPRIO change         (offline)",</div><div class='add'>+	"TAPRIO extension      (offline)",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define TSNEP_TEST_COUNT (sizeof(tsnep_test_strings) / ETH_GSTRING_LEN)</div><div class='add'>+</div><div class='add'>+static bool enable_gc_timeout(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	iowrite8(TSNEP_GC_ENABLE_TIMEOUT, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+	if (!(ioread32(adapter-&gt;addr + TSNEP_GC) &amp; TSNEP_GC_TIMEOUT_ACTIVE))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool gc_timeout_signaled(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (ioread32(adapter-&gt;addr + TSNEP_GC) &amp; TSNEP_GC_TIMEOUT_SIGNAL)</div><div class='add'>+		return true;</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ack_gc_timeout(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	iowrite8(TSNEP_GC_ENABLE_TIMEOUT, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+	if (ioread32(adapter-&gt;addr + TSNEP_GC) &amp;</div><div class='add'>+	    (TSNEP_GC_TIMEOUT_ACTIVE | TSNEP_GC_TIMEOUT_SIGNAL))</div><div class='add'>+		return false;</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool enable_gc(struct tsnep_adapter *adapter, bool a)</div><div class='add'>+{</div><div class='add'>+	u8 enable;</div><div class='add'>+	u8 active;</div><div class='add'>+</div><div class='add'>+	if (a) {</div><div class='add'>+		enable = TSNEP_GC_ENABLE_A;</div><div class='add'>+		active = TSNEP_GC_ACTIVE_A;</div><div class='add'>+	} else {</div><div class='add'>+		enable = TSNEP_GC_ENABLE_B;</div><div class='add'>+		active = TSNEP_GC_ACTIVE_B;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite8(enable, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+	if (!(ioread32(adapter-&gt;addr + TSNEP_GC) &amp; active))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool disable_gc(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	iowrite8(TSNEP_GC_DISABLE, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+	if (ioread32(adapter-&gt;addr + TSNEP_GC) &amp;</div><div class='add'>+	    (TSNEP_GC_ACTIVE_A | TSNEP_GC_ACTIVE_B))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool gc_delayed_enable(struct tsnep_adapter *adapter, bool a, int delay)</div><div class='add'>+{</div><div class='add'>+	u64 before, after;</div><div class='add'>+	u32 time;</div><div class='add'>+	bool enabled;</div><div class='add'>+</div><div class='add'>+	if (!disable_gc(adapter))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	before = ktime_get_ns();</div><div class='add'>+</div><div class='add'>+	if (!enable_gc_timeout(adapter))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* for start time after timeout, the timeout can guarantee, that enable</div><div class='add'>+	 * is blocked if too late</div><div class='add'>+	 */</div><div class='add'>+	time = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_LOW);</div><div class='add'>+	time += TSNEP_GC_TIMEOUT;</div><div class='add'>+	iowrite32(time, adapter-&gt;addr + TSNEP_GC_TIME);</div><div class='add'>+</div><div class='add'>+	ndelay(delay);</div><div class='add'>+</div><div class='add'>+	enabled = enable_gc(adapter, a);</div><div class='add'>+	after = ktime_get_ns();</div><div class='add'>+</div><div class='add'>+	if (delay &gt; TSNEP_GC_TIMEOUT) {</div><div class='add'>+		/* timeout must have blocked enable */</div><div class='add'>+		if (enabled)</div><div class='add'>+			return false;</div><div class='add'>+	} else if ((after - before) &lt; TSNEP_GC_TIMEOUT * 14 / 16) {</div><div class='add'>+		/* timeout must not have blocked enable */</div><div class='add'>+		if (!enabled)</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (enabled) {</div><div class='add'>+		if (gc_timeout_signaled(adapter))</div><div class='add'>+			return false;</div><div class='add'>+	} else {</div><div class='add'>+		if (!gc_timeout_signaled(adapter))</div><div class='add'>+			return false;</div><div class='add'>+		if (!ack_gc_timeout(adapter))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!disable_gc(adapter))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_test_gc_enable(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	iowrite32(0x80000001, adapter-&gt;addr + TSNEP_GCL_A + 0);</div><div class='add'>+	iowrite32(100000, adapter-&gt;addr + TSNEP_GCL_A + 4);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 200000; i += 100) {</div><div class='add'>+		if (!gc_delayed_enable(adapter, true, i))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite32(0x80000001, adapter-&gt;addr + TSNEP_GCL_B + 0);</div><div class='add'>+	iowrite32(100000, adapter-&gt;addr + TSNEP_GCL_B + 4);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; 200000; i += 100) {</div><div class='add'>+		if (!gc_delayed_enable(adapter, false, i))</div><div class='add'>+			return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void delay_base_time(struct tsnep_adapter *adapter,</div><div class='add'>+			    struct tc_taprio_qopt_offload *qopt, s64 ms)</div><div class='add'>+{</div><div class='add'>+	u64 system_time;</div><div class='add'>+	u64 base_time = ktime_to_ns(qopt-&gt;base_time);</div><div class='add'>+	u64 n;</div><div class='add'>+</div><div class='add'>+	tsnep_get_system_time(adapter, &amp;system_time);</div><div class='add'>+	system_time += ms * 1000000;</div><div class='add'>+	n = div64_u64(system_time - base_time, qopt-&gt;cycle_time);</div><div class='add'>+</div><div class='add'>+	qopt-&gt;base_time = ktime_add_ns(qopt-&gt;base_time,</div><div class='add'>+				       (n + 1) * qopt-&gt;cycle_time);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void get_gate_state(struct tsnep_adapter *adapter, u32 *gc, u32 *gc_time,</div><div class='add'>+			   u64 *system_time)</div><div class='add'>+{</div><div class='add'>+	u32 time_high_before;</div><div class='add'>+	u32 time_low;</div><div class='add'>+	u32 time_high;</div><div class='add'>+	u32 gc_time_before;</div><div class='add'>+</div><div class='add'>+	time_high = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	*gc_time = ioread32(adapter-&gt;addr + TSNEP_GC_TIME);</div><div class='add'>+	do {</div><div class='add'>+		time_low = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_LOW);</div><div class='add'>+		*gc = ioread32(adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+</div><div class='add'>+		gc_time_before = *gc_time;</div><div class='add'>+		*gc_time = ioread32(adapter-&gt;addr + TSNEP_GC_TIME);</div><div class='add'>+		time_high_before = time_high;</div><div class='add'>+		time_high = ioread32(adapter-&gt;addr + ECM_SYSTEM_TIME_HIGH);</div><div class='add'>+	} while ((time_high != time_high_before) ||</div><div class='add'>+		 (*gc_time != gc_time_before));</div><div class='add'>+</div><div class='add'>+	*system_time = (((u64)time_high) &lt;&lt; 32) | ((u64)time_low);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int get_operation(struct tsnep_gcl *gcl, u64 system_time, u64 *next)</div><div class='add'>+{</div><div class='add'>+	u64 n = div64_u64(system_time - gcl-&gt;base_time, gcl-&gt;cycle_time);</div><div class='add'>+	u64 cycle_start = gcl-&gt;base_time + gcl-&gt;cycle_time * n;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	*next = cycle_start;</div><div class='add'>+	for (i = 0; i &lt; gcl-&gt;count; i++) {</div><div class='add'>+		*next += gcl-&gt;operation[i].interval;</div><div class='add'>+		if (*next &gt; system_time)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_gate(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	u32 gc_time;</div><div class='add'>+	u32 gc;</div><div class='add'>+	u64 system_time;</div><div class='add'>+	struct tsnep_gcl *curr;</div><div class='add'>+	struct tsnep_gcl *prev;</div><div class='add'>+	u64 next_time;</div><div class='add'>+	u8 gate_open;</div><div class='add'>+	u8 next_gate_open;</div><div class='add'>+</div><div class='add'>+	get_gate_state(adapter, &amp;gc, &amp;gc_time, &amp;system_time);</div><div class='add'>+</div><div class='add'>+	if (gc &amp; TSNEP_GC_ACTIVE_A) {</div><div class='add'>+		curr = &amp;adapter-&gt;gcl[0];</div><div class='add'>+		prev = &amp;adapter-&gt;gcl[1];</div><div class='add'>+	} else if (gc &amp; TSNEP_GC_ACTIVE_B) {</div><div class='add'>+		curr = &amp;adapter-&gt;gcl[1];</div><div class='add'>+		prev = &amp;adapter-&gt;gcl[0];</div><div class='add'>+	} else {</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (curr-&gt;start_time &lt;= system_time) {</div><div class='add'>+		/* GCL is already active */</div><div class='add'>+		int index;</div><div class='add'>+</div><div class='add'>+		index = get_operation(curr, system_time, &amp;next_time);</div><div class='add'>+		gate_open = curr-&gt;operation[index].properties &amp; TSNEP_GCL_MASK;</div><div class='add'>+		if (index == curr-&gt;count - 1)</div><div class='add'>+			index = 0;</div><div class='add'>+		else</div><div class='add'>+			index++;</div><div class='add'>+		next_gate_open =</div><div class='add'>+			curr-&gt;operation[index].properties &amp; TSNEP_GCL_MASK;</div><div class='add'>+	} else if (curr-&gt;change) {</div><div class='add'>+		/* operation of previous GCL is active */</div><div class='add'>+		int index;</div><div class='add'>+		u64 start_before;</div><div class='add'>+		u64 n;</div><div class='add'>+</div><div class='add'>+		index = get_operation(prev, system_time, &amp;next_time);</div><div class='add'>+		next_time = curr-&gt;start_time;</div><div class='add'>+		start_before = prev-&gt;base_time;</div><div class='add'>+		n = div64_u64(curr-&gt;start_time - start_before,</div><div class='add'>+			      prev-&gt;cycle_time);</div><div class='add'>+		start_before += n * prev-&gt;cycle_time;</div><div class='add'>+		if (curr-&gt;start_time == start_before)</div><div class='add'>+			start_before -= prev-&gt;cycle_time;</div><div class='add'>+		if (((start_before + prev-&gt;cycle_time_extension) &gt;=</div><div class='add'>+		     curr-&gt;start_time) &amp;&amp;</div><div class='add'>+		    (curr-&gt;start_time - prev-&gt;cycle_time_extension &lt;=</div><div class='add'>+		     system_time)) {</div><div class='add'>+			/* extend */</div><div class='add'>+			index = prev-&gt;count - 1;</div><div class='add'>+		}</div><div class='add'>+		gate_open = prev-&gt;operation[index].properties &amp; TSNEP_GCL_MASK;</div><div class='add'>+		next_gate_open =</div><div class='add'>+			curr-&gt;operation[0].properties &amp; TSNEP_GCL_MASK;</div><div class='add'>+	} else {</div><div class='add'>+		/* GCL is waiting for start */</div><div class='add'>+		next_time = curr-&gt;start_time;</div><div class='add'>+		gate_open = 0xFF;</div><div class='add'>+		next_gate_open = curr-&gt;operation[0].properties &amp; TSNEP_GCL_MASK;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (gc_time != (next_time &amp; 0xFFFFFFFF)) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev, "gate control time 0x%x!=0x%llx\n",</div><div class='add'>+			gc_time, next_time);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (((gc &amp; TSNEP_GC_OPEN) &gt;&gt; TSNEP_GC_OPEN_SHIFT) != gate_open) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"gate control open 0x%02x!=0x%02x\n",</div><div class='add'>+			((gc &amp; TSNEP_GC_OPEN) &gt;&gt; TSNEP_GC_OPEN_SHIFT),</div><div class='add'>+			gate_open);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+	if (((gc &amp; TSNEP_GC_NEXT_OPEN) &gt;&gt; TSNEP_GC_NEXT_OPEN_SHIFT) !=</div><div class='add'>+	    next_gate_open) {</div><div class='add'>+		dev_err(&amp;adapter-&gt;pdev-&gt;dev,</div><div class='add'>+			"gate control next open 0x%02x!=0x%02x\n",</div><div class='add'>+			((gc &amp; TSNEP_GC_NEXT_OPEN) &gt;&gt; TSNEP_GC_NEXT_OPEN_SHIFT),</div><div class='add'>+			next_gate_open);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool check_gate_duration(struct tsnep_adapter *adapter, s64 ms)</div><div class='add'>+{</div><div class='add'>+	ktime_t start = ktime_get();</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		if (!check_gate(adapter))</div><div class='add'>+			return false;</div><div class='add'>+	} while (ktime_ms_delta(ktime_get(), start) &lt; ms);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool enable_check_taprio(struct tsnep_adapter *adapter,</div><div class='add'>+				struct tc_taprio_qopt_offload *qopt, s64 ms)</div><div class='add'>+{</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	retval = tsnep_tc_setup(adapter-&gt;netdev, TC_SETUP_QDISC_TAPRIO, qopt);</div><div class='add'>+	if (retval)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!check_gate_duration(adapter, ms))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool disable_taprio(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct tc_taprio_qopt_offload qopt;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	memset(&amp;qopt, 0, sizeof(qopt));</div><div class='add'>+	qopt.cmd = TAPRIO_CMD_DESTROY;</div><div class='add'>+	retval = tsnep_tc_setup(adapter-&gt;netdev, TC_SETUP_QDISC_TAPRIO, &amp;qopt);</div><div class='add'>+	if (retval)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool run_taprio(struct tsnep_adapter *adapter,</div><div class='add'>+		       struct tc_taprio_qopt_offload *qopt, s64 ms)</div><div class='add'>+{</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, ms))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	if (!disable_taprio(adapter))</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_test_taprio(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct tc_taprio_qopt_offload *qopt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	qopt = kzalloc(struct_size(qopt, entries, 255), GFP_KERNEL);</div><div class='add'>+	if (!qopt)</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; 255; i++)</div><div class='add'>+		qopt-&gt;entries[i].command = TC_TAPRIO_CMD_SET_GATES;</div><div class='add'>+</div><div class='add'>+	qopt-&gt;cmd = TAPRIO_CMD_REPLACE;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 1500000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 0;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x02;</div><div class='add'>+	qopt-&gt;entries[0].interval = 200000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x03;</div><div class='add'>+	qopt-&gt;entries[1].interval = 800000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x07;</div><div class='add'>+	qopt-&gt;entries[2].interval = 240000;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0x01;</div><div class='add'>+	qopt-&gt;entries[3].interval = 80000;</div><div class='add'>+	qopt-&gt;entries[4].gate_mask = 0x04;</div><div class='add'>+	qopt-&gt;entries[4].interval = 70000;</div><div class='add'>+	qopt-&gt;entries[5].gate_mask = 0x06;</div><div class='add'>+	qopt-&gt;entries[5].interval = 60000;</div><div class='add'>+	qopt-&gt;entries[6].gate_mask = 0x0F;</div><div class='add'>+	qopt-&gt;entries[6].interval = 50000;</div><div class='add'>+	qopt-&gt;num_entries = 7;</div><div class='add'>+	if (!run_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	qopt-&gt;cmd = TAPRIO_CMD_REPLACE;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 411854;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 0;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x17;</div><div class='add'>+	qopt-&gt;entries[0].interval = 23842;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x16;</div><div class='add'>+	qopt-&gt;entries[1].interval = 13482;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x15;</div><div class='add'>+	qopt-&gt;entries[2].interval = 49428;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0x14;</div><div class='add'>+	qopt-&gt;entries[3].interval = 38189;</div><div class='add'>+	qopt-&gt;entries[4].gate_mask = 0x13;</div><div class='add'>+	qopt-&gt;entries[4].interval = 92321;</div><div class='add'>+	qopt-&gt;entries[5].gate_mask = 0x12;</div><div class='add'>+	qopt-&gt;entries[5].interval = 71239;</div><div class='add'>+	qopt-&gt;entries[6].gate_mask = 0x11;</div><div class='add'>+	qopt-&gt;entries[6].interval = 69932;</div><div class='add'>+	qopt-&gt;entries[7].gate_mask = 0x10;</div><div class='add'>+	qopt-&gt;entries[7].interval = 53421;</div><div class='add'>+	qopt-&gt;num_entries = 8;</div><div class='add'>+	if (!run_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	qopt-&gt;cmd = TAPRIO_CMD_REPLACE;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	delay_base_time(adapter, qopt, 12);</div><div class='add'>+	qopt-&gt;cycle_time = 125000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 0;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x27;</div><div class='add'>+	qopt-&gt;entries[0].interval = 15000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x26;</div><div class='add'>+	qopt-&gt;entries[1].interval = 15000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x25;</div><div class='add'>+	qopt-&gt;entries[2].interval = 12500;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0x24;</div><div class='add'>+	qopt-&gt;entries[3].interval = 17500;</div><div class='add'>+	qopt-&gt;entries[4].gate_mask = 0x23;</div><div class='add'>+	qopt-&gt;entries[4].interval = 10000;</div><div class='add'>+	qopt-&gt;entries[5].gate_mask = 0x22;</div><div class='add'>+	qopt-&gt;entries[5].interval = 11000;</div><div class='add'>+	qopt-&gt;entries[6].gate_mask = 0x21;</div><div class='add'>+	qopt-&gt;entries[6].interval = 9000;</div><div class='add'>+	qopt-&gt;entries[7].gate_mask = 0x20;</div><div class='add'>+	qopt-&gt;entries[7].interval = 10000;</div><div class='add'>+	qopt-&gt;entries[8].gate_mask = 0x20;</div><div class='add'>+	qopt-&gt;entries[8].interval = 12500;</div><div class='add'>+	qopt-&gt;entries[9].gate_mask = 0x20;</div><div class='add'>+	qopt-&gt;entries[9].interval = 12500;</div><div class='add'>+	qopt-&gt;num_entries = 10;</div><div class='add'>+	if (!run_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	kfree(qopt);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	disable_taprio(adapter);</div><div class='add'>+	kfree(qopt);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_test_taprio_change(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct tc_taprio_qopt_offload *qopt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	qopt = kzalloc(struct_size(qopt, entries, 255), GFP_KERNEL);</div><div class='add'>+	if (!qopt)</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; 255; i++)</div><div class='add'>+		qopt-&gt;entries[i].command = TC_TAPRIO_CMD_SET_GATES;</div><div class='add'>+</div><div class='add'>+	qopt-&gt;cmd = TAPRIO_CMD_REPLACE;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 100000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 0;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x30;</div><div class='add'>+	qopt-&gt;entries[0].interval = 20000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x31;</div><div class='add'>+	qopt-&gt;entries[1].interval = 80000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to identical */</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	delay_base_time(adapter, qopt, 17);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to same cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x42;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x43;</div><div class='add'>+	delay_base_time(adapter, qopt, 2);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x54;</div><div class='add'>+	qopt-&gt;entries[0].interval = 33333;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x55;</div><div class='add'>+	qopt-&gt;entries[1].interval = 66667;</div><div class='add'>+	delay_base_time(adapter, qopt, 23);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x66;</div><div class='add'>+	qopt-&gt;entries[0].interval = 50000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x67;</div><div class='add'>+	qopt-&gt;entries[1].interval = 25000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x68;</div><div class='add'>+	qopt-&gt;entries[2].interval = 25000;</div><div class='add'>+	qopt-&gt;num_entries = 3;</div><div class='add'>+	delay_base_time(adapter, qopt, 11);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to multiple of cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 200000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x79;</div><div class='add'>+	qopt-&gt;entries[0].interval = 50000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x7A;</div><div class='add'>+	qopt-&gt;entries[1].interval = 150000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 11);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 1000000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x7B;</div><div class='add'>+	qopt-&gt;entries[0].interval = 125000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x7C;</div><div class='add'>+	qopt-&gt;entries[1].interval = 250000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x7D;</div><div class='add'>+	qopt-&gt;entries[2].interval = 375000;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0x7E;</div><div class='add'>+	qopt-&gt;entries[3].interval = 250000;</div><div class='add'>+	qopt-&gt;num_entries = 4;</div><div class='add'>+	delay_base_time(adapter, qopt, 3);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to shorter cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 333333;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x8F;</div><div class='add'>+	qopt-&gt;entries[0].interval = 166666;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x80;</div><div class='add'>+	qopt-&gt;entries[1].interval = 166667;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 11);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 62500;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x81;</div><div class='add'>+	qopt-&gt;entries[0].interval = 31250;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x82;</div><div class='add'>+	qopt-&gt;entries[1].interval = 15625;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x83;</div><div class='add'>+	qopt-&gt;entries[2].interval = 15625;</div><div class='add'>+	qopt-&gt;num_entries = 3;</div><div class='add'>+	delay_base_time(adapter, qopt, 1);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to longer cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 400000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x84;</div><div class='add'>+	qopt-&gt;entries[0].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x85;</div><div class='add'>+	qopt-&gt;entries[1].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x86;</div><div class='add'>+	qopt-&gt;entries[2].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0x87;</div><div class='add'>+	qopt-&gt;entries[3].interval = 100000;</div><div class='add'>+	qopt-&gt;num_entries = 4;</div><div class='add'>+	delay_base_time(adapter, qopt, 7);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 1700000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x88;</div><div class='add'>+	qopt-&gt;entries[0].interval = 200000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x89;</div><div class='add'>+	qopt-&gt;entries[1].interval = 300000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x8A;</div><div class='add'>+	qopt-&gt;entries[2].interval = 600000;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0x8B;</div><div class='add'>+	qopt-&gt;entries[3].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[4].gate_mask = 0x8C;</div><div class='add'>+	qopt-&gt;entries[4].interval = 500000;</div><div class='add'>+	qopt-&gt;num_entries = 5;</div><div class='add'>+	delay_base_time(adapter, qopt, 6);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	if (!disable_taprio(adapter))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	kfree(qopt);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	disable_taprio(adapter);</div><div class='add'>+	kfree(qopt);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool tsnep_test_taprio_extension(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	struct tc_taprio_qopt_offload *qopt;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	qopt = kzalloc(struct_size(qopt, entries, 255), GFP_KERNEL);</div><div class='add'>+	if (!qopt)</div><div class='add'>+		return false;</div><div class='add'>+	for (i = 0; i &lt; 255; i++)</div><div class='add'>+		qopt-&gt;entries[i].command = TC_TAPRIO_CMD_SET_GATES;</div><div class='add'>+</div><div class='add'>+	qopt-&gt;cmd = TAPRIO_CMD_REPLACE;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 100000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 50000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x90;</div><div class='add'>+	qopt-&gt;entries[0].interval = 20000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x91;</div><div class='add'>+	qopt-&gt;entries[1].interval = 80000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to different phase */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 50000);</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x92;</div><div class='add'>+	qopt-&gt;entries[0].interval = 33000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x93;</div><div class='add'>+	qopt-&gt;entries[1].interval = 67000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 2);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to different phase and longer cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 1000000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 700000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x94;</div><div class='add'>+	qopt-&gt;entries[0].interval = 400000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x95;</div><div class='add'>+	qopt-&gt;entries[1].interval = 600000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 7);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 700000);</div><div class='add'>+	qopt-&gt;cycle_time = 2000000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 1900000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x96;</div><div class='add'>+	qopt-&gt;entries[0].interval = 400000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x97;</div><div class='add'>+	qopt-&gt;entries[1].interval = 1600000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 9);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to different phase and shorter cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 1500000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 700000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x98;</div><div class='add'>+	qopt-&gt;entries[0].interval = 400000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x99;</div><div class='add'>+	qopt-&gt;entries[1].interval = 600000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0x9A;</div><div class='add'>+	qopt-&gt;entries[2].interval = 500000;</div><div class='add'>+	qopt-&gt;num_entries = 3;</div><div class='add'>+	delay_base_time(adapter, qopt, 3);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 100000);</div><div class='add'>+	qopt-&gt;cycle_time = 500000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 300000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0x9B;</div><div class='add'>+	qopt-&gt;entries[0].interval = 150000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0x9C;</div><div class='add'>+	qopt-&gt;entries[1].interval = 350000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 9);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	/* change to different cycle time */</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 1000000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 700000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0xAD;</div><div class='add'>+	qopt-&gt;entries[0].interval = 400000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0xAE;</div><div class='add'>+	qopt-&gt;entries[1].interval = 300000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0xAF;</div><div class='add'>+	qopt-&gt;entries[2].interval = 300000;</div><div class='add'>+	qopt-&gt;num_entries = 3;</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 400000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 100000;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0xA0;</div><div class='add'>+	qopt-&gt;entries[0].interval = 200000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0xA1;</div><div class='add'>+	qopt-&gt;entries[1].interval = 200000;</div><div class='add'>+	qopt-&gt;num_entries = 2;</div><div class='add'>+	delay_base_time(adapter, qopt, 19);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 500000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 499999;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0xB2;</div><div class='add'>+	qopt-&gt;entries[0].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0xB3;</div><div class='add'>+	qopt-&gt;entries[1].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0xB4;</div><div class='add'>+	qopt-&gt;entries[2].interval = 100000;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0xB5;</div><div class='add'>+	qopt-&gt;entries[3].interval = 200000;</div><div class='add'>+	qopt-&gt;num_entries = 4;</div><div class='add'>+	delay_base_time(adapter, qopt, 19);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+	qopt-&gt;base_time = ktime_set(0, 0);</div><div class='add'>+	qopt-&gt;cycle_time = 6000000;</div><div class='add'>+	qopt-&gt;cycle_time_extension = 5999999;</div><div class='add'>+	qopt-&gt;entries[0].gate_mask = 0xC6;</div><div class='add'>+	qopt-&gt;entries[0].interval = 1000000;</div><div class='add'>+	qopt-&gt;entries[1].gate_mask = 0xC7;</div><div class='add'>+	qopt-&gt;entries[1].interval = 1000000;</div><div class='add'>+	qopt-&gt;entries[2].gate_mask = 0xC8;</div><div class='add'>+	qopt-&gt;entries[2].interval = 1000000;</div><div class='add'>+	qopt-&gt;entries[3].gate_mask = 0xC9;</div><div class='add'>+	qopt-&gt;entries[3].interval = 1500000;</div><div class='add'>+	qopt-&gt;entries[4].gate_mask = 0xCA;</div><div class='add'>+	qopt-&gt;entries[4].interval = 1500000;</div><div class='add'>+	qopt-&gt;num_entries = 5;</div><div class='add'>+	delay_base_time(adapter, qopt, 1);</div><div class='add'>+	if (!enable_check_taprio(adapter, qopt, 100))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	if (!disable_taprio(adapter))</div><div class='add'>+		goto failed;</div><div class='add'>+</div><div class='add'>+	kfree(qopt);</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+</div><div class='add'>+failed:</div><div class='add'>+	disable_taprio(adapter);</div><div class='add'>+	kfree(qopt);</div><div class='add'>+</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_ethtool_get_test_count(void)</div><div class='add'>+{</div><div class='add'>+	return TSNEP_TEST_COUNT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsnep_ethtool_get_test_strings(u8 *data)</div><div class='add'>+{</div><div class='add'>+	memcpy(data, tsnep_test_strings, sizeof(tsnep_test_strings));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsnep_ethtool_self_test(struct net_device *netdev,</div><div class='add'>+			     struct ethtool_test *eth_test, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	eth_test-&gt;len = TSNEP_TEST_COUNT;</div><div class='add'>+</div><div class='add'>+	if (eth_test-&gt;flags != ETH_TEST_FL_OFFLINE) {</div><div class='add'>+		/* no tests are done online */</div><div class='add'>+		data[TSNEP_TEST_ENABLE] = 0;</div><div class='add'>+		data[TSNEP_TEST_TAPRIO] = 0;</div><div class='add'>+		data[TSNEP_TEST_TAPRIO_CHANGE] = 0;</div><div class='add'>+		data[TSNEP_TEST_TAPRIO_EXTENSION] = 0;</div><div class='add'>+</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tsnep_test_gc_enable(adapter)) {</div><div class='add'>+		data[TSNEP_TEST_ENABLE] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		data[TSNEP_TEST_ENABLE] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tsnep_test_taprio(adapter)) {</div><div class='add'>+		data[TSNEP_TEST_TAPRIO] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		data[TSNEP_TEST_TAPRIO] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tsnep_test_taprio_change(adapter)) {</div><div class='add'>+		data[TSNEP_TEST_TAPRIO_CHANGE] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		data[TSNEP_TEST_TAPRIO_CHANGE] = 1;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (tsnep_test_taprio_extension(adapter)) {</div><div class='add'>+		data[TSNEP_TEST_TAPRIO_EXTENSION] = 0;</div><div class='add'>+	} else {</div><div class='add'>+		eth_test-&gt;flags |= ETH_TEST_FL_FAILED;</div><div class='add'>+		data[TSNEP_TEST_TAPRIO_EXTENSION] = 1;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_tc.c b/drivers/net/ethernet/engleder/tsnep_tc.c<br/>new file mode 100644<br/>index 000000000000..745b191a5540<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_tc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_tc.c</a></div><div class='hunk'>@@ -0,0 +1,466 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2021 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+</div><div class='add'>+#include &lt;net/pkt_sched.h&gt;</div><div class='add'>+</div><div class='add'>+/* save one operation at the end for additional operation at list change */</div><div class='add'>+#define TSNEP_MAX_GCL_NUM (TSNEP_GCL_COUNT - 1)</div><div class='add'>+</div><div class='add'>+static int tsnep_validate_gcl(struct tc_taprio_qopt_offload *qopt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u64 cycle_time;</div><div class='add'>+</div><div class='add'>+	if (!qopt-&gt;cycle_time)</div><div class='add'>+		return -ERANGE;</div><div class='add'>+	if (qopt-&gt;num_entries &gt; TSNEP_MAX_GCL_NUM)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	cycle_time = 0;</div><div class='add'>+	for (i = 0; i &lt; qopt-&gt;num_entries; i++) {</div><div class='add'>+		if (qopt-&gt;entries[i].command != TC_TAPRIO_CMD_SET_GATES)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (qopt-&gt;entries[i].gate_mask &amp; ~TSNEP_GCL_MASK)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		if (qopt-&gt;entries[i].interval &lt; TSNEP_GCL_MIN_INTERVAL)</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		cycle_time += qopt-&gt;entries[i].interval;</div><div class='add'>+	}</div><div class='add'>+	if (qopt-&gt;cycle_time != cycle_time)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	if (qopt-&gt;cycle_time_extension &gt;= qopt-&gt;cycle_time)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_write_gcl_operation(struct tsnep_gcl *gcl, int index,</div><div class='add'>+				      u32 properties, u32 interval, bool flush)</div><div class='add'>+{</div><div class='add'>+	void __iomem *addr = gcl-&gt;addr +</div><div class='add'>+			     sizeof(struct tsnep_gcl_operation) * index;</div><div class='add'>+</div><div class='add'>+	gcl-&gt;operation[index].properties = properties;</div><div class='add'>+	gcl-&gt;operation[index].interval = interval;</div><div class='add'>+</div><div class='add'>+	iowrite32(properties, addr);</div><div class='add'>+	iowrite32(interval, addr + sizeof(u32));</div><div class='add'>+</div><div class='add'>+	if (flush) {</div><div class='add'>+		/* flush write with read access */</div><div class='add'>+		ioread32(addr);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_change_duration(struct tsnep_gcl *gcl, int index)</div><div class='add'>+{</div><div class='add'>+	u64 duration;</div><div class='add'>+	int count;</div><div class='add'>+</div><div class='add'>+	/* change needs to be triggered one or two operations before start of</div><div class='add'>+	 * new gate control list</div><div class='add'>+	 * - change is triggered at start of operation (minimum one operation)</div><div class='add'>+	 * - operation with adjusted interval is inserted on demand to exactly</div><div class='add'>+	 *   meet the start of the new gate control list (optional)</div><div class='add'>+	 *</div><div class='add'>+	 * additionally properties are read directly after start of previous</div><div class='add'>+	 * operation</div><div class='add'>+	 *</div><div class='add'>+	 * therefore, three operations needs to be considered for the limit</div><div class='add'>+	 */</div><div class='add'>+	duration = 0;</div><div class='add'>+	count = 3;</div><div class='add'>+	while (count) {</div><div class='add'>+		duration += gcl-&gt;operation[index].interval;</div><div class='add'>+</div><div class='add'>+		index--;</div><div class='add'>+		if (index &lt; 0)</div><div class='add'>+			index = gcl-&gt;count - 1;</div><div class='add'>+</div><div class='add'>+		count--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return duration;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_write_gcl(struct tsnep_gcl *gcl,</div><div class='add'>+			    struct tc_taprio_qopt_offload *qopt)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 properties;</div><div class='add'>+	u64 extend;</div><div class='add'>+	u64 cut;</div><div class='add'>+</div><div class='add'>+	gcl-&gt;base_time = ktime_to_ns(qopt-&gt;base_time);</div><div class='add'>+	gcl-&gt;cycle_time = qopt-&gt;cycle_time;</div><div class='add'>+	gcl-&gt;cycle_time_extension = qopt-&gt;cycle_time_extension;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; qopt-&gt;num_entries; i++) {</div><div class='add'>+		properties = qopt-&gt;entries[i].gate_mask;</div><div class='add'>+		if (i == (qopt-&gt;num_entries - 1))</div><div class='add'>+			properties |= TSNEP_GCL_LAST;</div><div class='add'>+</div><div class='add'>+		tsnep_write_gcl_operation(gcl, i, properties,</div><div class='add'>+					  qopt-&gt;entries[i].interval, true);</div><div class='add'>+	}</div><div class='add'>+	gcl-&gt;count = qopt-&gt;num_entries;</div><div class='add'>+</div><div class='add'>+	/* calculate change limit; i.e., the time needed between enable and</div><div class='add'>+	 * start of new gate control list</div><div class='add'>+	 */</div><div class='add'>+</div><div class='add'>+	/* case 1: extend cycle time for change</div><div class='add'>+	 * - change duration of last operation</div><div class='add'>+	 * - cycle time extension</div><div class='add'>+	 */</div><div class='add'>+	extend = tsnep_change_duration(gcl, gcl-&gt;count - 1);</div><div class='add'>+	extend += gcl-&gt;cycle_time_extension;</div><div class='add'>+</div><div class='add'>+	/* case 2: cut cycle time for change</div><div class='add'>+	 * - maximum change duration</div><div class='add'>+	 */</div><div class='add'>+	cut = 0;</div><div class='add'>+	for (i = 0; i &lt; gcl-&gt;count; i++)</div><div class='add'>+		cut = max(cut, tsnep_change_duration(gcl, i));</div><div class='add'>+</div><div class='add'>+	/* use maximum, because the actual case (extend or cut) can be</div><div class='add'>+	 * determined only after limit is known (chicken-and-egg problem)</div><div class='add'>+	 */</div><div class='add'>+	gcl-&gt;change_limit = max(extend, cut);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_gcl_start_after(struct tsnep_gcl *gcl, u64 limit)</div><div class='add'>+{</div><div class='add'>+	u64 start = gcl-&gt;base_time;</div><div class='add'>+	u64 n;</div><div class='add'>+</div><div class='add'>+	if (start &lt;= limit) {</div><div class='add'>+		n = div64_u64(limit - start, gcl-&gt;cycle_time);</div><div class='add'>+		start += (n + 1) * gcl-&gt;cycle_time;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_gcl_start_before(struct tsnep_gcl *gcl, u64 limit)</div><div class='add'>+{</div><div class='add'>+	u64 start = gcl-&gt;base_time;</div><div class='add'>+	u64 n;</div><div class='add'>+</div><div class='add'>+	n = div64_u64(limit - start, gcl-&gt;cycle_time);</div><div class='add'>+	start += n * gcl-&gt;cycle_time;</div><div class='add'>+	if (start == limit)</div><div class='add'>+		start -= gcl-&gt;cycle_time;</div><div class='add'>+</div><div class='add'>+	return start;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_set_gcl_change(struct tsnep_gcl *gcl, int index, u64 change,</div><div class='add'>+				bool insert)</div><div class='add'>+{</div><div class='add'>+	/* previous operation triggers change and properties are evaluated at</div><div class='add'>+	 * start of operation</div><div class='add'>+	 */</div><div class='add'>+	if (index == 0)</div><div class='add'>+		index = gcl-&gt;count - 1;</div><div class='add'>+	else</div><div class='add'>+		index = index - 1;</div><div class='add'>+	change -= gcl-&gt;operation[index].interval;</div><div class='add'>+</div><div class='add'>+	/* optionally change to new list with additional operation in between */</div><div class='add'>+	if (insert) {</div><div class='add'>+		void __iomem *addr = gcl-&gt;addr +</div><div class='add'>+				     sizeof(struct tsnep_gcl_operation) * index;</div><div class='add'>+</div><div class='add'>+		gcl-&gt;operation[index].properties |= TSNEP_GCL_INSERT;</div><div class='add'>+		iowrite32(gcl-&gt;operation[index].properties, addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return change;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void tsnep_clean_gcl(struct tsnep_gcl *gcl)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+	u32 mask = TSNEP_GCL_LAST | TSNEP_GCL_MASK;</div><div class='add'>+	void __iomem *addr;</div><div class='add'>+</div><div class='add'>+	/* search for insert operation and reset properties */</div><div class='add'>+	for (i = 0; i &lt; gcl-&gt;count; i++) {</div><div class='add'>+		if (gcl-&gt;operation[i].properties &amp; ~mask) {</div><div class='add'>+			addr = gcl-&gt;addr +</div><div class='add'>+			       sizeof(struct tsnep_gcl_operation) * i;</div><div class='add'>+</div><div class='add'>+			gcl-&gt;operation[i].properties &amp;= mask;</div><div class='add'>+			iowrite32(gcl-&gt;operation[i].properties, addr);</div><div class='add'>+</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_insert_gcl_operation(struct tsnep_gcl *gcl, int ref,</div><div class='add'>+				      u64 change, u32 interval)</div><div class='add'>+{</div><div class='add'>+	u32 properties;</div><div class='add'>+</div><div class='add'>+	properties = gcl-&gt;operation[ref].properties &amp; TSNEP_GCL_MASK;</div><div class='add'>+	/* change to new list directly after inserted operation */</div><div class='add'>+	properties |= TSNEP_GCL_CHANGE;</div><div class='add'>+</div><div class='add'>+	/* last operation of list is reserved to insert operation */</div><div class='add'>+	tsnep_write_gcl_operation(gcl, TSNEP_GCL_COUNT - 1, properties,</div><div class='add'>+				  interval, false);</div><div class='add'>+</div><div class='add'>+	return tsnep_set_gcl_change(gcl, ref, change, true);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_extend_gcl(struct tsnep_gcl *gcl, u64 start, u32 extension)</div><div class='add'>+{</div><div class='add'>+	int ref = gcl-&gt;count - 1;</div><div class='add'>+	u32 interval = gcl-&gt;operation[ref].interval + extension;</div><div class='add'>+</div><div class='add'>+	start -= gcl-&gt;operation[ref].interval;</div><div class='add'>+</div><div class='add'>+	return tsnep_insert_gcl_operation(gcl, ref, start, interval);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u64 tsnep_cut_gcl(struct tsnep_gcl *gcl, u64 start, u64 cycle_time)</div><div class='add'>+{</div><div class='add'>+	u64 sum = 0;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* find operation which shall be cutted */</div><div class='add'>+	for (i = 0; i &lt; gcl-&gt;count; i++) {</div><div class='add'>+		u64 sum_tmp = sum + gcl-&gt;operation[i].interval;</div><div class='add'>+		u64 interval;</div><div class='add'>+</div><div class='add'>+		/* sum up operations as long as cycle time is not exceeded */</div><div class='add'>+		if (sum_tmp &gt; cycle_time)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* remaining interval must be big enough for hardware */</div><div class='add'>+		interval = cycle_time - sum_tmp;</div><div class='add'>+		if (interval &gt; 0 &amp;&amp; interval &lt; TSNEP_GCL_MIN_INTERVAL)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		sum = sum_tmp;</div><div class='add'>+	}</div><div class='add'>+	if (sum == cycle_time) {</div><div class='add'>+		/* no need to cut operation itself or whole cycle</div><div class='add'>+		 * =&gt; change exactly at operation</div><div class='add'>+		 */</div><div class='add'>+		return tsnep_set_gcl_change(gcl, i, start + sum, false);</div><div class='add'>+	}</div><div class='add'>+	return tsnep_insert_gcl_operation(gcl, i, start + sum,</div><div class='add'>+					  cycle_time - sum);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_enable_gcl(struct tsnep_adapter *adapter,</div><div class='add'>+			    struct tsnep_gcl *gcl, struct tsnep_gcl *curr)</div><div class='add'>+{</div><div class='add'>+	u64 system_time;</div><div class='add'>+	u64 timeout;</div><div class='add'>+	u64 limit;</div><div class='add'>+</div><div class='add'>+	/* estimate timeout limit after timeout enable, actually timeout limit</div><div class='add'>+	 * in hardware will be earlier than estimate so we are on the safe side</div><div class='add'>+	 */</div><div class='add'>+	tsnep_get_system_time(adapter, &amp;system_time);</div><div class='add'>+	timeout = system_time + TSNEP_GC_TIMEOUT;</div><div class='add'>+</div><div class='add'>+	if (curr)</div><div class='add'>+		limit = timeout + curr-&gt;change_limit;</div><div class='add'>+	else</div><div class='add'>+		limit = timeout;</div><div class='add'>+</div><div class='add'>+	gcl-&gt;start_time = tsnep_gcl_start_after(gcl, limit);</div><div class='add'>+</div><div class='add'>+	/* gate control time register is only 32bit =&gt; time shall be in the near</div><div class='add'>+	 * future (no driver support for far future implemented)</div><div class='add'>+	 */</div><div class='add'>+	if ((gcl-&gt;start_time - system_time) &gt;= U32_MAX)</div><div class='add'>+		return -EAGAIN;</div><div class='add'>+</div><div class='add'>+	if (curr) {</div><div class='add'>+		/* change gate control list */</div><div class='add'>+		u64 last;</div><div class='add'>+		u64 change;</div><div class='add'>+</div><div class='add'>+		last = tsnep_gcl_start_before(curr, gcl-&gt;start_time);</div><div class='add'>+		if ((last + curr-&gt;cycle_time) == gcl-&gt;start_time)</div><div class='add'>+			change = tsnep_cut_gcl(curr, last,</div><div class='add'>+					       gcl-&gt;start_time - last);</div><div class='add'>+		else if (((gcl-&gt;start_time - last) &lt;=</div><div class='add'>+			  curr-&gt;cycle_time_extension) ||</div><div class='add'>+			 ((gcl-&gt;start_time - last) &lt;= TSNEP_GCL_MIN_INTERVAL))</div><div class='add'>+			change = tsnep_extend_gcl(curr, last,</div><div class='add'>+						  gcl-&gt;start_time - last);</div><div class='add'>+		else</div><div class='add'>+			change = tsnep_cut_gcl(curr, last,</div><div class='add'>+					       gcl-&gt;start_time - last);</div><div class='add'>+</div><div class='add'>+		WARN_ON(change &lt;= timeout);</div><div class='add'>+		gcl-&gt;change = true;</div><div class='add'>+		iowrite32(change &amp; 0xFFFFFFFF, adapter-&gt;addr + TSNEP_GC_CHANGE);</div><div class='add'>+	} else {</div><div class='add'>+		/* start gate control list */</div><div class='add'>+		WARN_ON(gcl-&gt;start_time &lt;= timeout);</div><div class='add'>+		gcl-&gt;change = false;</div><div class='add'>+		iowrite32(gcl-&gt;start_time &amp; 0xFFFFFFFF,</div><div class='add'>+			  adapter-&gt;addr + TSNEP_GC_TIME);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_taprio(struct tsnep_adapter *adapter,</div><div class='add'>+			struct tc_taprio_qopt_offload *qopt)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_gcl *gcl;</div><div class='add'>+	struct tsnep_gcl *curr;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (!adapter-&gt;gate_control)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (qopt-&gt;cmd == TAPRIO_CMD_DESTROY) {</div><div class='add'>+		/* disable gate control if active */</div><div class='add'>+		mutex_lock(&amp;adapter-&gt;gate_control_lock);</div><div class='add'>+</div><div class='add'>+		if (adapter-&gt;gate_control_active) {</div><div class='add'>+			iowrite8(TSNEP_GC_DISABLE, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+			adapter-&gt;gate_control_active = false;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		mutex_unlock(&amp;adapter-&gt;gate_control_lock);</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	} else if (qopt-&gt;cmd != TAPRIO_CMD_REPLACE) {</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tsnep_validate_gcl(qopt);</div><div class='add'>+	if (retval)</div><div class='add'>+		return retval;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;adapter-&gt;gate_control_lock);</div><div class='add'>+</div><div class='add'>+	gcl = &amp;adapter-&gt;gcl[adapter-&gt;next_gcl];</div><div class='add'>+	tsnep_write_gcl(gcl, qopt);</div><div class='add'>+</div><div class='add'>+	/* select current gate control list if active */</div><div class='add'>+	if (adapter-&gt;gate_control_active) {</div><div class='add'>+		if (adapter-&gt;next_gcl == 0)</div><div class='add'>+			curr = &amp;adapter-&gt;gcl[1];</div><div class='add'>+		else</div><div class='add'>+			curr = &amp;adapter-&gt;gcl[0];</div><div class='add'>+	} else {</div><div class='add'>+		curr = NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (;;) {</div><div class='add'>+		/* start timeout which discards late enable, this helps ensuring</div><div class='add'>+		 * that start/change time are in the future at enable</div><div class='add'>+		 */</div><div class='add'>+		iowrite8(TSNEP_GC_ENABLE_TIMEOUT, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+</div><div class='add'>+		retval = tsnep_enable_gcl(adapter, gcl, curr);</div><div class='add'>+		if (retval) {</div><div class='add'>+			mutex_unlock(&amp;adapter-&gt;gate_control_lock);</div><div class='add'>+</div><div class='add'>+			return retval;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* enable gate control list */</div><div class='add'>+		if (adapter-&gt;next_gcl == 0)</div><div class='add'>+			iowrite8(TSNEP_GC_ENABLE_A, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+		else</div><div class='add'>+			iowrite8(TSNEP_GC_ENABLE_B, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+</div><div class='add'>+		/* done if timeout did not happen */</div><div class='add'>+		if (!(ioread32(adapter-&gt;addr + TSNEP_GC) &amp;</div><div class='add'>+		      TSNEP_GC_TIMEOUT_SIGNAL))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* timeout is acknowledged with any enable */</div><div class='add'>+		iowrite8(TSNEP_GC_ENABLE_A, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+</div><div class='add'>+		if (curr)</div><div class='add'>+			tsnep_clean_gcl(curr);</div><div class='add'>+</div><div class='add'>+		/* retry because of timeout */</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	adapter-&gt;gate_control_active = true;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;next_gcl == 0)</div><div class='add'>+		adapter-&gt;next_gcl = 1;</div><div class='add'>+	else</div><div class='add'>+		adapter-&gt;next_gcl = 0;</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;adapter-&gt;gate_control_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_tc_query_caps(struct tsnep_adapter *adapter,</div><div class='add'>+			       struct tc_query_caps_base *base)</div><div class='add'>+{</div><div class='add'>+	switch (base-&gt;type) {</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO: {</div><div class='add'>+		struct tc_taprio_caps *caps = base-&gt;caps;</div><div class='add'>+</div><div class='add'>+		if (!adapter-&gt;gate_control)</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+		caps-&gt;gate_mask_per_txq = true;</div><div class='add'>+</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_tc_setup(struct net_device *netdev, enum tc_setup_type type,</div><div class='add'>+		   void *type_data)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_adapter *adapter = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_QUERY_CAPS:</div><div class='add'>+		return tsnep_tc_query_caps(adapter, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_TAPRIO:</div><div class='add'>+		return tsnep_taprio(adapter, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_tc_init(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (!adapter-&gt;gate_control)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* open all gates */</div><div class='add'>+	iowrite8(TSNEP_GC_DISABLE, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+	iowrite32(TSNEP_GC_OPEN | TSNEP_GC_NEXT_OPEN, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+</div><div class='add'>+	adapter-&gt;gcl[0].addr = adapter-&gt;addr + TSNEP_GCL_A;</div><div class='add'>+	adapter-&gt;gcl[1].addr = adapter-&gt;addr + TSNEP_GCL_B;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void tsnep_tc_cleanup(struct tsnep_adapter *adapter)</div><div class='add'>+{</div><div class='add'>+	if (!adapter-&gt;gate_control)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (adapter-&gt;gate_control_active) {</div><div class='add'>+		iowrite8(TSNEP_GC_DISABLE, adapter-&gt;addr + TSNEP_GC);</div><div class='add'>+		adapter-&gt;gate_control_active = false;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/engleder/tsnep_xdp.c b/drivers/net/ethernet/engleder/tsnep_xdp.c<br/>new file mode 100644<br/>index 000000000000..c0513848c547<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/engleder/tsnep_xdp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/engleder/tsnep_xdp.c</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* Copyright (C) 2022 Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt; */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='add'>+</div><div class='add'>+#include "tsnep.h"</div><div class='add'>+</div><div class='add'>+int tsnep_xdp_setup_prog(struct tsnep_adapter *adapter, struct bpf_prog *prog,</div><div class='add'>+			 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct bpf_prog *old_prog;</div><div class='add'>+</div><div class='add'>+	old_prog = xchg(&amp;adapter-&gt;xdp_prog, prog);</div><div class='add'>+	if (old_prog)</div><div class='add'>+		bpf_prog_put(old_prog);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_xdp_enable_pool(struct tsnep_adapter *adapter,</div><div class='add'>+				 struct xsk_buff_pool *pool, u16 queue_id)</div><div class='add'>+{</div><div class='add'>+	struct tsnep_queue *queue;</div><div class='add'>+	int retval;</div><div class='add'>+</div><div class='add'>+	if (queue_id &gt;= adapter-&gt;num_rx_queues ||</div><div class='add'>+	    queue_id &gt;= adapter-&gt;num_tx_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue = &amp;adapter-&gt;queue[queue_id];</div><div class='add'>+	if (queue-&gt;rx-&gt;queue_index != queue_id ||</div><div class='add'>+	    queue-&gt;tx-&gt;queue_index != queue_id) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev,</div><div class='add'>+			   "XSK support only for TX/RX queue pairs\n");</div><div class='add'>+</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = xsk_pool_dma_map(pool, adapter-&gt;dmadev,</div><div class='add'>+				  DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+	if (retval) {</div><div class='add'>+		netdev_err(adapter-&gt;netdev, "failed to map XSK pool\n");</div><div class='add'>+</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	retval = tsnep_enable_xsk(queue, pool);</div><div class='add'>+	if (retval) {</div><div class='add'>+		xsk_pool_dma_unmap(pool, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+</div><div class='add'>+		return retval;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int tsnep_xdp_disable_pool(struct tsnep_adapter *adapter, u16 queue_id)</div><div class='add'>+{</div><div class='add'>+	struct xsk_buff_pool *pool;</div><div class='add'>+	struct tsnep_queue *queue;</div><div class='add'>+</div><div class='add'>+	if (queue_id &gt;= adapter-&gt;num_rx_queues ||</div><div class='add'>+	    queue_id &gt;= adapter-&gt;num_tx_queues)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	pool = xsk_get_pool_from_qid(adapter-&gt;netdev, queue_id);</div><div class='add'>+	if (!pool)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	queue = &amp;adapter-&gt;queue[queue_id];</div><div class='add'>+</div><div class='add'>+	tsnep_disable_xsk(queue);</div><div class='add'>+</div><div class='add'>+	xsk_pool_dma_unmap(pool, DMA_ATTR_SKIP_CPU_SYNC);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int tsnep_xdp_setup_pool(struct tsnep_adapter *adapter,</div><div class='add'>+			 struct xsk_buff_pool *pool, u16 queue_id)</div><div class='add'>+{</div><div class='add'>+	return pool ? tsnep_xdp_enable_pool(adapter, pool, queue_id) :</div><div class='add'>+		      tsnep_xdp_disable_pool(adapter, queue_id);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c<br/>index 71da0490521b..0c418557264c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ethoc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ethoc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ethoc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/ethoc.c</a></div><div class='hunk'>@@ -1,13 +1,10 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0-only</div><div class='ctx'> /*</div><div class='ctx'>  * linux/drivers/net/ethernet/ethoc.c</div><div class='ctx'>  *</div><div class='ctx'>  * Copyright (C) 2007-2008 Avionic Design Development GmbH</div><div class='ctx'>  * Copyright (C) 2008-2009 Avionic Design GmbH</div><div class='ctx'>  *</div><div class='del'>- * This program is free software; you can redistribute it and/or modify</div><div class='del'>- * it under the terms of the GNU General Public License version 2 as</div><div class='del'>- * published by the Free Software Foundation.</div><div class='del'>- *</div><div class='ctx'>  * Written by Thierry Reding &lt;thierry.reding@avionic-design.de&gt;</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -180,6 +177,7 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");</div><div class='ctx'>  * struct ethoc - driver-private device structure</div><div class='ctx'>  * @iobase:	pointer to I/O memory region</div><div class='ctx'>  * @membase:	pointer to buffer memory region</div><div class='add'>+ * @big_endian: just big or little (endian)</div><div class='ctx'>  * @num_bd:	number of buffer descriptors</div><div class='ctx'>  * @num_tx:	number of send buffers</div><div class='ctx'>  * @cur_tx:	last send buffer written</div><div class='hunk'>@@ -192,7 +190,10 @@ MODULE_PARM_DESC(buffer_size, "DMA buffer allocation size");</div><div class='ctx'>  * @msg_enable:	device state flags</div><div class='ctx'>  * @lock:	device lock</div><div class='ctx'>  * @mdio:	MDIO bus for PHY access</div><div class='add'>+ * @clk:	clock</div><div class='ctx'>  * @phy_id:	address of attached PHY</div><div class='add'>+ * @old_link:	previous link info</div><div class='add'>+ * @old_duplex: previous duplex info</div><div class='ctx'>  */</div><div class='ctx'> struct ethoc {</div><div class='ctx'> 	void __iomem *iobase;</div><div class='hunk'>@@ -706,20 +707,16 @@ static int ethoc_mdio_probe(struct net_device *dev)</div><div class='ctx'> 	else</div><div class='ctx'> 		phy = phy_find_first(priv-&gt;mdio);</div><div class='ctx'> </div><div class='del'>-	if (!phy) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "no PHY found\n");</div><div class='del'>-		return -ENXIO;</div><div class='del'>-	}</div><div class='add'>+	if (!phy)</div><div class='add'>+		return dev_err_probe(&amp;dev-&gt;dev, -ENXIO, "no PHY found\n");</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;old_duplex = -1;</div><div class='ctx'> 	priv-&gt;old_link = -1;</div><div class='ctx'> </div><div class='ctx'> 	err = phy_connect_direct(dev, phy, ethoc_mdio_poll,</div><div class='ctx'> 				 PHY_INTERFACE_MODE_GMII);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(&amp;dev-&gt;dev, "could not attach to PHY\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='add'>+	if (err)</div><div class='add'>+		return dev_err_probe(&amp;dev-&gt;dev, err, "could not attach to PHY\n");</div><div class='ctx'> </div><div class='ctx'> 	phy_set_max_speed(phy, SPEED_100);</div><div class='ctx'> </div><div class='hunk'>@@ -805,8 +802,8 @@ static int ethoc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)</div><div class='ctx'> </div><div class='ctx'> static void ethoc_do_set_mac_address(struct net_device *dev)</div><div class='ctx'> {</div><div class='add'>+	const unsigned char *mac = dev-&gt;dev_addr;</div><div class='ctx'> 	struct ethoc *priv = netdev_priv(dev);</div><div class='del'>-	unsigned char *mac = dev-&gt;dev_addr;</div><div class='ctx'> </div><div class='ctx'> 	ethoc_write(priv, MAC_ADDR0, (mac[2] &lt;&lt; 24) | (mac[3] &lt;&lt; 16) |</div><div class='ctx'> 				     (mac[4] &lt;&lt;  8) | (mac[5] &lt;&lt;  0));</div><div class='hunk'>@@ -819,7 +816,7 @@ static int ethoc_set_mac_address(struct net_device *dev, void *p)</div><div class='ctx'> </div><div class='ctx'> 	if (!is_valid_ether_addr(addr-&gt;sa_data))</div><div class='ctx'> 		return -EADDRNOTAVAIL;</div><div class='del'>-	memcpy(dev-&gt;dev_addr, addr-&gt;sa_data, ETH_ALEN);</div><div class='add'>+	eth_hw_addr_set(dev, addr-&gt;sa_data);</div><div class='ctx'> 	ethoc_do_set_mac_address(dev);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -872,7 +869,7 @@ static int ethoc_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	return -ENOSYS;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ethoc_tx_timeout(struct net_device *dev)</div><div class='add'>+static void ethoc_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethoc *priv = netdev_priv(dev);</div><div class='ctx'> 	u32 pending = ethoc_read(priv, INT_SOURCE);</div><div class='hunk'>@@ -948,7 +945,9 @@ static void ethoc_get_regs(struct net_device *dev, struct ethtool_regs *regs,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void ethoc_get_ringparam(struct net_device *dev,</div><div class='del'>-				struct ethtool_ringparam *ring)</div><div class='add'>+				struct ethtool_ringparam *ring,</div><div class='add'>+				struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethoc *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -964,7 +963,9 @@ static void ethoc_get_ringparam(struct net_device *dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ethoc_set_ringparam(struct net_device *dev,</div><div class='del'>-			       struct ethtool_ringparam *ring)</div><div class='add'>+			       struct ethtool_ringparam *ring,</div><div class='add'>+			       struct kernel_ethtool_ringparam *kernel_ring,</div><div class='add'>+			       struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ethoc *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1008,7 +1009,7 @@ static const struct ethtool_ops ethoc_ethtool_ops = {</div><div class='ctx'> static const struct net_device_ops ethoc_netdev_ops = {</div><div class='ctx'> 	.ndo_open = ethoc_open,</div><div class='ctx'> 	.ndo_stop = ethoc_stop,</div><div class='del'>-	.ndo_do_ioctl = ethoc_ioctl,</div><div class='add'>+	.ndo_eth_ioctl = ethoc_ioctl,</div><div class='ctx'> 	.ndo_set_mac_address = ethoc_set_mac_address,</div><div class='ctx'> 	.ndo_set_rx_mode = ethoc_set_multicast_list,</div><div class='ctx'> 	.ndo_change_mtu = ethoc_change_mtu,</div><div class='hunk'>@@ -1018,7 +1019,7 @@ static const struct net_device_ops ethoc_netdev_ops = {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * ethoc_probe - initialize OpenCores ethernet MAC</div><div class='del'>- * pdev:	platform device</div><div class='add'>+ * @pdev:	platform device</div><div class='ctx'>  */</div><div class='ctx'> static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='hunk'>@@ -1077,20 +1078,17 @@ static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> 	/* obtain device IRQ number */</div><div class='del'>-	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);</div><div class='del'>-	if (!res) {</div><div class='del'>-		dev_err(&amp;pdev-&gt;dev, "cannot obtain IRQ\n");</div><div class='del'>-		ret = -ENXIO;</div><div class='add'>+	ret = platform_get_irq(pdev, 0);</div><div class='add'>+	if (ret &lt; 0)</div><div class='ctx'> 		goto free;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	netdev-&gt;irq = res-&gt;start;</div><div class='add'>+	netdev-&gt;irq = ret;</div><div class='ctx'> </div><div class='ctx'> 	/* setup driver-private data */</div><div class='ctx'> 	priv = netdev_priv(netdev);</div><div class='ctx'> 	priv-&gt;netdev = netdev;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;iobase = devm_ioremap_nocache(&amp;pdev-&gt;dev, netdev-&gt;base_addr,</div><div class='add'>+	priv-&gt;iobase = devm_ioremap(&amp;pdev-&gt;dev, netdev-&gt;base_addr,</div><div class='ctx'> 			resource_size(mmio));</div><div class='ctx'> 	if (!priv-&gt;iobase) {</div><div class='ctx'> 		dev_err(&amp;pdev-&gt;dev, "cannot remap I/O memory space\n");</div><div class='hunk'>@@ -1099,7 +1097,7 @@ static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (netdev-&gt;mem_end) {</div><div class='del'>-		priv-&gt;membase = devm_ioremap_nocache(&amp;pdev-&gt;dev,</div><div class='add'>+		priv-&gt;membase = devm_ioremap(&amp;pdev-&gt;dev,</div><div class='ctx'> 			netdev-&gt;mem_start, resource_size(mem));</div><div class='ctx'> 		if (!priv-&gt;membase) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "cannot remap memory space\n");</div><div class='hunk'>@@ -1147,22 +1145,22 @@ static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	/* Allow the platform setup code to pass in a MAC address. */</div><div class='ctx'> 	if (pdata) {</div><div class='del'>-		ether_addr_copy(netdev-&gt;dev_addr, pdata-&gt;hwaddr);</div><div class='add'>+		eth_hw_addr_set(netdev, pdata-&gt;hwaddr);</div><div class='ctx'> 		priv-&gt;phy_id = pdata-&gt;phy_id;</div><div class='ctx'> 	} else {</div><div class='del'>-		const void *mac;</div><div class='del'>-</div><div class='del'>-		mac = of_get_mac_address(pdev-&gt;dev.of_node);</div><div class='del'>-		if (!IS_ERR(mac))</div><div class='del'>-			ether_addr_copy(netdev-&gt;dev_addr, mac);</div><div class='add'>+		of_get_ethdev_address(pdev-&gt;dev.of_node, netdev);</div><div class='ctx'> 		priv-&gt;phy_id = -1;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check that the given MAC address is valid. If it isn't, read the</div><div class='ctx'> 	 * current MAC from the controller.</div><div class='ctx'> 	 */</div><div class='del'>-	if (!is_valid_ether_addr(netdev-&gt;dev_addr))</div><div class='del'>-		ethoc_get_mac_address(netdev, netdev-&gt;dev_addr);</div><div class='add'>+	if (!is_valid_ether_addr(netdev-&gt;dev_addr)) {</div><div class='add'>+		u8 addr[ETH_ALEN];</div><div class='add'>+</div><div class='add'>+		ethoc_get_mac_address(netdev, addr);</div><div class='add'>+		eth_hw_addr_set(netdev, addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Check the MAC again for validity, if it still isn't choose and</div><div class='ctx'> 	 * program a random one.</div><div class='hunk'>@@ -1210,7 +1208,7 @@ static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> 	ret = mdiobus_register(priv-&gt;mdio);</div><div class='ctx'> 	if (ret) {</div><div class='ctx'> 		dev_err(&amp;netdev-&gt;dev, "failed to register MDIO bus\n");</div><div class='del'>-		goto free2;</div><div class='add'>+		goto free3;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ret = ethoc_mdio_probe(netdev);</div><div class='hunk'>@@ -1226,7 +1224,7 @@ static int ethoc_probe(struct platform_device *pdev)</div><div class='ctx'> 	netdev-&gt;ethtool_ops = &amp;ethoc_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	/* setup NAPI */</div><div class='del'>-	netif_napi_add(netdev, &amp;priv-&gt;napi, ethoc_poll, 64);</div><div class='add'>+	netif_napi_add(netdev, &amp;priv-&gt;napi, ethoc_poll);</div><div class='ctx'> </div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;lock);</div><div class='ctx'> </div><div class='hunk'>@@ -1242,6 +1240,7 @@ error2:</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> error:</div><div class='ctx'> 	mdiobus_unregister(priv-&gt;mdio);</div><div class='add'>+free3:</div><div class='ctx'> 	mdiobus_free(priv-&gt;mdio);</div><div class='ctx'> free2:</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='hunk'>@@ -1255,7 +1254,7 @@ out:</div><div class='ctx'>  * ethoc_remove - shutdown OpenCores ethernet MAC</div><div class='ctx'>  * @pdev:	platform device</div><div class='ctx'>  */</div><div class='del'>-static int ethoc_remove(struct platform_device *pdev)</div><div class='add'>+static void ethoc_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct ethoc *priv = netdev_priv(netdev);</div><div class='hunk'>@@ -1272,8 +1271,6 @@ static int ethoc_remove(struct platform_device *pdev)</div><div class='ctx'> 		unregister_netdev(netdev);</div><div class='ctx'> 		free_netdev(netdev);</div><div class='ctx'> 	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_PM</div><div class='hunk'>@@ -1299,7 +1296,7 @@ MODULE_DEVICE_TABLE(of, ethoc_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ethoc_driver = {</div><div class='ctx'> 	.probe   = ethoc_probe,</div><div class='del'>-	.remove  = ethoc_remove,</div><div class='add'>+	.remove = ethoc_remove,</div><div class='ctx'> 	.suspend = ethoc_suspend,</div><div class='ctx'> 	.resume  = ethoc_resume,</div><div class='ctx'> 	.driver  = {</div><div class='head'>diff --git a/drivers/net/ethernet/ezchip/Kconfig b/drivers/net/ethernet/ezchip/Kconfig<br/>index 6db75fd2f9af..9241b9b1c7a3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ezchip/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ezchip/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ezchip/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/ezchip/Kconfig</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> config NET_VENDOR_EZCHIP</div><div class='ctx'> 	bool "EZchip devices"</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) device belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -18,9 +18,9 @@ if NET_VENDOR_EZCHIP</div><div class='ctx'> </div><div class='ctx'> config EZCHIP_NPS_MANAGEMENT_ENET</div><div class='ctx'> 	tristate "EZchip NPS management enet support"</div><div class='del'>-	depends on OF_IRQ &amp;&amp; OF_NET</div><div class='add'>+	depends on OF_IRQ</div><div class='ctx'> 	depends on HAS_IOMEM</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  Simple LAN device for debug or management purposes.</div><div class='ctx'> 	  Device supports interrupts for RX and TX(completion).</div><div class='ctx'> 	  Device does not have DMA ability.</div><div class='head'>diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c<br/>index 027225e1ade2..5cb478e98697 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ezchip/nps_enet.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ezchip/nps_enet.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ezchip/nps_enet.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/ezchip/nps_enet.c</a></div><div class='hunk'>@@ -6,10 +6,9 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/of_address.h&gt;</div><div class='del'>-#include &lt;linux/of_irq.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include "nps_enet.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME			"nps_mgt_enet"</div><div class='hunk'>@@ -199,7 +198,7 @@ static int nps_enet_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		 */</div><div class='ctx'> 		if (nps_enet_is_tx_pending(priv)) {</div><div class='ctx'> 			nps_enet_reg_set(priv, NPS_ENET_REG_BUF_INT_ENABLE, 0);</div><div class='del'>-			napi_reschedule(napi);</div><div class='add'>+			napi_schedule(napi);</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -421,7 +420,7 @@ static s32 nps_enet_set_mac_address(struct net_device *ndev, void *p)</div><div class='ctx'> </div><div class='ctx'> 	res = eth_mac_addr(ndev, p);</div><div class='ctx'> 	if (!res) {</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, addr-&gt;sa_data);</div><div class='add'>+		eth_hw_addr_set(ndev, addr-&gt;sa_data);</div><div class='ctx'> 		nps_enet_set_hw_mac_address(ndev);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -575,8 +574,6 @@ static s32 nps_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct net_device *ndev;</div><div class='ctx'> 	struct nps_enet_priv *priv;</div><div class='ctx'> 	s32 err = 0;</div><div class='del'>-	const char *mac_addr;</div><div class='del'>-	struct resource *res_regs;</div><div class='ctx'> </div><div class='ctx'> 	if (!dev-&gt;of_node)</div><div class='ctx'> 		return -ENODEV;</div><div class='hunk'>@@ -595,8 +592,7 @@ static s32 nps_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* FIXME :: no multicast support yet */</div><div class='ctx'> 	ndev-&gt;flags &amp;= ~IFF_MULTICAST;</div><div class='ctx'> </div><div class='del'>-	res_regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='del'>-	priv-&gt;regs_base = devm_ioremap_resource(dev, res_regs);</div><div class='add'>+	priv-&gt;regs_base = devm_platform_ioremap_resource(pdev, 0);</div><div class='ctx'> 	if (IS_ERR(priv-&gt;regs_base)) {</div><div class='ctx'> 		err = PTR_ERR(priv-&gt;regs_base);</div><div class='ctx'> 		goto out_netdev;</div><div class='hunk'>@@ -604,22 +600,19 @@ static s32 nps_enet_probe(struct platform_device *pdev)</div><div class='ctx'> 	dev_dbg(dev, "Registers base address is 0x%p\n", priv-&gt;regs_base);</div><div class='ctx'> </div><div class='ctx'> 	/* set kernel MAC address to dev */</div><div class='del'>-	mac_addr = of_get_mac_address(dev-&gt;of_node);</div><div class='del'>-	if (!IS_ERR(mac_addr))</div><div class='del'>-		ether_addr_copy(ndev-&gt;dev_addr, mac_addr);</div><div class='del'>-	else</div><div class='add'>+	err = of_get_ethdev_address(dev-&gt;of_node, ndev);</div><div class='add'>+	if (err)</div><div class='ctx'> 		eth_hw_addr_random(ndev);</div><div class='ctx'> </div><div class='ctx'> 	/* Get IRQ number */</div><div class='ctx'> 	priv-&gt;irq = platform_get_irq(pdev, 0);</div><div class='del'>-	if (!priv-&gt;irq) {</div><div class='del'>-		dev_err(dev, "failed to retrieve &lt;irq Rx-Tx&gt; value from device tree\n");</div><div class='add'>+	if (priv-&gt;irq &lt; 0) {</div><div class='ctx'> 		err = -ENODEV;</div><div class='ctx'> 		goto out_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	netif_napi_add(ndev, &amp;priv-&gt;napi, nps_enet_poll,</div><div class='del'>-		       NPS_ENET_NAPI_POLL_WEIGHT);</div><div class='add'>+	netif_napi_add_weight(ndev, &amp;priv-&gt;napi, nps_enet_poll,</div><div class='add'>+			      NPS_ENET_NAPI_POLL_WEIGHT);</div><div class='ctx'> </div><div class='ctx'> 	/* Register the driver. Should be the last thing in probe */</div><div class='ctx'> 	err = register_netdev(ndev);</div><div class='hunk'>@@ -635,22 +628,19 @@ static s32 nps_enet_probe(struct platform_device *pdev)</div><div class='ctx'> out_netif_api:</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> out_netdev:</div><div class='del'>-	if (err)</div><div class='del'>-		free_netdev(ndev);</div><div class='add'>+	free_netdev(ndev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static s32 nps_enet_remove(struct platform_device *pdev)</div><div class='add'>+static void nps_enet_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *ndev = platform_get_drvdata(pdev);</div><div class='ctx'> 	struct nps_enet_priv *priv = netdev_priv(ndev);</div><div class='ctx'> </div><div class='ctx'> 	unregister_netdev(ndev);</div><div class='del'>-	free_netdev(ndev);</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='add'>+	free_netdev(ndev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id nps_enet_dt_ids[] = {</div><div class='hunk'>@@ -671,4 +661,5 @@ static struct platform_driver nps_enet_driver = {</div><div class='ctx'> module_platform_driver(nps_enet_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("EZchip Semiconductor");</div><div class='add'>+MODULE_DESCRIPTION("EZchip NPS Ethernet driver");</div><div class='ctx'> MODULE_LICENSE("GPL v2");</div><div class='head'>diff --git a/drivers/net/ethernet/ezchip/nps_enet.h b/drivers/net/ethernet/ezchip/nps_enet.h<br/>index 133acca0bf31..092da2d90026 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ezchip/nps_enet.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/ezchip/nps_enet.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/ezchip/nps_enet.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/ezchip/nps_enet.h</a></div><div class='hunk'>@@ -167,7 +167,7 @@ struct nps_enet_priv {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nps_reg_set - Sets ENET register with provided value.</div><div class='add'>+ * nps_enet_reg_set - Sets ENET register with provided value.</div><div class='ctx'>  * @priv:       Pointer to EZchip ENET private data structure.</div><div class='ctx'>  * @reg:        Register offset from base address.</div><div class='ctx'>  * @value:      Value to set in register.</div><div class='hunk'>@@ -179,7 +179,7 @@ static inline void nps_enet_reg_set(struct nps_enet_priv *priv,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * nps_reg_get - Gets value of specified ENET register.</div><div class='add'>+ * nps_enet_reg_get - Gets value of specified ENET register.</div><div class='ctx'>  * @priv:       Pointer to EZchip ENET private data structure.</div><div class='ctx'>  * @reg:        Register offset from base address.</div><div class='ctx'>  *</div><div class='head'>diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig<br/>index a9b105803fb7..474073c7f94d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/faraday/Kconfig</a></div><div class='hunk'>@@ -6,8 +6,8 @@</div><div class='ctx'> config NET_VENDOR_FARADAY</div><div class='ctx'> 	bool "Faraday devices"</div><div class='ctx'> 	default y</div><div class='del'>-	depends on ARM || NDS32 || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+	depends on ARM || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -19,22 +19,23 @@ if NET_VENDOR_FARADAY</div><div class='ctx'> </div><div class='ctx'> config FTMAC100</div><div class='ctx'> 	tristate "Faraday FTMAC100 10/100 Ethernet support"</div><div class='del'>-	depends on ARM || NDS32 || COMPILE_TEST</div><div class='add'>+	depends on ARM || COMPILE_TEST</div><div class='ctx'> 	depends on !64BIT || BROKEN</div><div class='ctx'> 	select MII</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the FTMAC100 10/100 Ethernet controller</div><div class='del'>-	  from Faraday. It is used on Faraday A320, Andes AG101 and some</div><div class='del'>-	  other ARM/NDS32 SoC's.</div><div class='add'>+	  from Faraday. It is used on Faraday A320 and some other ARM SoC's.</div><div class='ctx'> </div><div class='ctx'> config FTGMAC100</div><div class='ctx'> 	tristate "Faraday FTGMAC100 Gigabit Ethernet support"</div><div class='del'>-	depends on ARM || NDS32 || COMPILE_TEST</div><div class='add'>+	depends on ARM || COMPILE_TEST</div><div class='ctx'> 	depends on !64BIT || BROKEN</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	select FIXED_PHY</div><div class='add'>+	select MDIO_ASPEED if MACH_ASPEED_G6</div><div class='add'>+	select CRC32</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the FTGMAC100 Gigabit Ethernet controller</div><div class='del'>-	  from Faraday. It is used on Faraday A369, Andes AG102 and some</div><div class='del'>-	  other ARM/NDS32 SoC's.</div><div class='add'>+	  from Faraday. It is used on Faraday A369 and some other ARM SoC's.</div><div class='ctx'> </div><div class='ctx'> endif # NET_VENDOR_FARADAY</div><div class='head'>diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c<br/>index 055f77c70fa3..a863f7841210 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftgmac100.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftgmac100.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftgmac100.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/faraday/ftgmac100.c</a></div><div class='hunk'>@@ -9,6 +9,7 @@</div><div class='ctx'> #define pr_fmt(fmt)	KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/clk.h&gt;</div><div class='add'>+#include &lt;linux/reset.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='hunk'>@@ -17,19 +18,20 @@</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/phy.h&gt;</div><div class='ctx'> #include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/property.h&gt;</div><div class='ctx'> #include &lt;linux/crc32.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/phy_fixed.h&gt;</div><div class='ctx'> #include &lt;net/ip.h&gt;</div><div class='ctx'> #include &lt;net/ncsi.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "ftgmac100.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ftgmac100"</div><div class='del'>-#define DRV_VERSION	"0.7"</div><div class='ctx'> </div><div class='ctx'> /* Arbitrary values, I am not sure the HW has limits */</div><div class='ctx'> #define MAX_RX_QUEUE_ENTRIES	1024</div><div class='hunk'>@@ -50,6 +52,15 @@</div><div class='ctx'> #define FTGMAC_100MHZ		100000000</div><div class='ctx'> #define FTGMAC_25MHZ		25000000</div><div class='ctx'> </div><div class='add'>+/* For NC-SI to register a fixed-link phy device */</div><div class='add'>+static struct fixed_phy_status ncsi_phy_status = {</div><div class='add'>+	.link = 1,</div><div class='add'>+	.speed = SPEED_100,</div><div class='add'>+	.duplex = DUPLEX_FULL,</div><div class='add'>+	.pause = 0,</div><div class='add'>+	.asym_pause = 0</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct ftgmac100 {</div><div class='ctx'> 	/* Registers */</div><div class='ctx'> 	struct resource *res;</div><div class='hunk'>@@ -89,6 +100,11 @@ struct ftgmac100 {</div><div class='ctx'> 	struct mii_bus *mii_bus;</div><div class='ctx'> 	struct clk *clk;</div><div class='ctx'> </div><div class='add'>+	/* AST2500/AST2600 RMII ref clock gate */</div><div class='add'>+	struct clk *rclk;</div><div class='add'>+	/* Aspeed reset control */</div><div class='add'>+	struct reset_control *rst;</div><div class='add'>+</div><div class='ctx'> 	/* Link management */</div><div class='ctx'> 	int cur_speed;</div><div class='ctx'> 	int cur_duplex;</div><div class='hunk'>@@ -135,6 +151,23 @@ static int ftgmac100_reset_and_config_mac(struct ftgmac100 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u32 maccr = 0;</div><div class='ctx'> </div><div class='add'>+	/* Aspeed RMII needs SCU reset to clear status */</div><div class='add'>+	if (priv-&gt;is_aspeed &amp;&amp; priv-&gt;netdev-&gt;phydev-&gt;interface == PHY_INTERFACE_MODE_RMII) {</div><div class='add'>+		int err;</div><div class='add'>+</div><div class='add'>+		err = reset_control_assert(priv-&gt;rst);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "Failed to reset mac (%d)\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		usleep_range(10000, 20000);</div><div class='add'>+		err = reset_control_deassert(priv-&gt;rst);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "Failed to deassert mac reset (%d)\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	switch (priv-&gt;cur_speed) {</div><div class='ctx'> 	case SPEED_10:</div><div class='ctx'> 	case 0: /* no link */</div><div class='hunk'>@@ -174,19 +207,20 @@ static void ftgmac100_write_mac_addr(struct ftgmac100 *priv, const u8 *mac)</div><div class='ctx'> 	iowrite32(laddr, priv-&gt;base + FTGMAC100_OFFSET_MAC_LADR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ftgmac100_initial_mac(struct ftgmac100 *priv)</div><div class='add'>+static int ftgmac100_initial_mac(struct ftgmac100 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	u8 mac[ETH_ALEN];</div><div class='ctx'> 	unsigned int m;</div><div class='ctx'> 	unsigned int l;</div><div class='del'>-	void *addr;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	addr = device_get_mac_address(priv-&gt;dev, mac, ETH_ALEN);</div><div class='del'>-	if (addr) {</div><div class='del'>-		ether_addr_copy(priv-&gt;netdev-&gt;dev_addr, mac);</div><div class='add'>+	err = of_get_ethdev_address(priv-&gt;dev-&gt;of_node, priv-&gt;netdev);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='add'>+		return err;</div><div class='add'>+	if (!err) {</div><div class='ctx'> 		dev_info(priv-&gt;dev, "Read MAC address %pM from device tree\n",</div><div class='del'>-			 mac);</div><div class='del'>-		return;</div><div class='add'>+			 priv-&gt;netdev-&gt;dev_addr);</div><div class='add'>+		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	m = ioread32(priv-&gt;base + FTGMAC100_OFFSET_MAC_MADR);</div><div class='hunk'>@@ -200,13 +234,15 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)</div><div class='ctx'> 	mac[5] = l &amp; 0xff;</div><div class='ctx'> </div><div class='ctx'> 	if (is_valid_ether_addr(mac)) {</div><div class='del'>-		ether_addr_copy(priv-&gt;netdev-&gt;dev_addr, mac);</div><div class='add'>+		eth_hw_addr_set(priv-&gt;netdev, mac);</div><div class='ctx'> 		dev_info(priv-&gt;dev, "Read MAC address %pM from chip\n", mac);</div><div class='ctx'> 	} else {</div><div class='ctx'> 		eth_hw_addr_random(priv-&gt;netdev);</div><div class='ctx'> 		dev_info(priv-&gt;dev, "Generated random MAC address %pM\n",</div><div class='ctx'> 			 priv-&gt;netdev-&gt;dev_addr);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ftgmac100_set_mac_addr(struct net_device *dev, void *p)</div><div class='hunk'>@@ -566,7 +602,7 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed)</div><div class='ctx'> 	(*processed)++;</div><div class='ctx'> 	return true;</div><div class='ctx'> </div><div class='del'>- drop:</div><div class='add'>+drop:</div><div class='ctx'> 	/* Clean rxdes0 (which resets own bit) */</div><div class='ctx'> 	rxdes-&gt;rxdes0 = cpu_to_le32(status &amp; priv-&gt;rxdes0_edorr_mask);</div><div class='ctx'> 	priv-&gt;rx_pointer = ftgmac100_next_rx_pointer(priv, pointer);</div><div class='hunk'>@@ -650,6 +686,11 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv)</div><div class='ctx'> 	ftgmac100_free_tx_packet(priv, pointer, skb, txdes, ctl_stat);</div><div class='ctx'> 	txdes-&gt;txdes0 = cpu_to_le32(ctl_stat &amp; priv-&gt;txdes0_edotr_mask);</div><div class='ctx'> </div><div class='add'>+	/* Ensure the descriptor config is visible before setting the tx</div><div class='add'>+	 * pointer.</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='ctx'> 	priv-&gt;tx_clean_pointer = ftgmac100_next_tx_pointer(priv, pointer);</div><div class='ctx'> </div><div class='ctx'> 	return true;</div><div class='hunk'>@@ -726,6 +767,18 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	 */</div><div class='ctx'> 	nfrags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> </div><div class='add'>+	/* Setup HW checksumming */</div><div class='add'>+	csum_vlan = 0;</div><div class='add'>+	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='add'>+	    !ftgmac100_prep_tx_csum(skb, &amp;csum_vlan))</div><div class='add'>+		goto drop;</div><div class='add'>+</div><div class='add'>+	/* Add VLAN tag */</div><div class='add'>+	if (skb_vlan_tag_present(skb)) {</div><div class='add'>+		csum_vlan |= FTGMAC100_TXDES1_INS_VLANTAG;</div><div class='add'>+		csum_vlan |= skb_vlan_tag_get(skb) &amp; 0xffff;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* Get header len */</div><div class='ctx'> 	len = skb_headlen(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -752,19 +805,6 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	if (nfrags == 0)</div><div class='ctx'> 		f_ctl_stat |= FTGMAC100_TXDES0_LTS;</div><div class='ctx'> 	txdes-&gt;txdes3 = cpu_to_le32(map);</div><div class='del'>-</div><div class='del'>-	/* Setup HW checksumming */</div><div class='del'>-	csum_vlan = 0;</div><div class='del'>-	if (skb-&gt;ip_summed == CHECKSUM_PARTIAL &amp;&amp;</div><div class='del'>-	    !ftgmac100_prep_tx_csum(skb, &amp;csum_vlan))</div><div class='del'>-		goto drop;</div><div class='del'>-</div><div class='del'>-	/* Add VLAN tag */</div><div class='del'>-	if (skb_vlan_tag_present(skb)) {</div><div class='del'>-		csum_vlan |= FTGMAC100_TXDES1_INS_VLANTAG;</div><div class='del'>-		csum_vlan |= skb_vlan_tag_get(skb) &amp; 0xffff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	txdes-&gt;txdes1 = cpu_to_le32(csum_vlan);</div><div class='ctx'> </div><div class='ctx'> 	/* Next descriptor */</div><div class='hunk'>@@ -774,7 +814,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	for (i = 0; i &lt; nfrags; i++) {</div><div class='ctx'> 		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='ctx'> </div><div class='del'>-		len = frag-&gt;size;</div><div class='add'>+		len = skb_frag_size(frag);</div><div class='ctx'> </div><div class='ctx'> 		/* Map it */</div><div class='ctx'> 		map = skb_frag_dma_map(priv-&gt;dev, frag, 0, len,</div><div class='hunk'>@@ -804,6 +844,11 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	dma_wmb();</div><div class='ctx'> 	first-&gt;txdes0 = cpu_to_le32(f_ctl_stat);</div><div class='ctx'> </div><div class='add'>+	/* Ensure the descriptor config is visible before setting the tx</div><div class='add'>+	 * pointer.</div><div class='add'>+	 */</div><div class='add'>+	smp_wmb();</div><div class='add'>+</div><div class='ctx'> 	/* Update next TX pointer */</div><div class='ctx'> 	priv-&gt;tx_pointer = pointer;</div><div class='ctx'> </div><div class='hunk'>@@ -824,7 +869,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>- dma_err:</div><div class='add'>+dma_err:</div><div class='ctx'> 	if (net_ratelimit())</div><div class='ctx'> 		netdev_err(netdev, "map tx fragment failed\n");</div><div class='ctx'> </div><div class='hunk'>@@ -846,7 +891,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,</div><div class='ctx'> 	 * last fragment, so we know ftgmac100_free_tx_packet()</div><div class='ctx'> 	 * hasn't freed the skb yet.</div><div class='ctx'> 	 */</div><div class='del'>- drop:</div><div class='add'>+drop:</div><div class='ctx'> 	/* Drop the packet */</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> 	netdev-&gt;stats.tx_dropped++;</div><div class='hunk'>@@ -990,88 +1035,6 @@ static int ftgmac100_alloc_rx_buffers(struct ftgmac100 *priv)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ftgmac100_adjust_link(struct net_device *netdev)</div><div class='del'>-{</div><div class='del'>-	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='del'>-	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='del'>-	bool tx_pause, rx_pause;</div><div class='del'>-	int new_speed;</div><div class='del'>-</div><div class='del'>-	/* We store "no link" as speed 0 */</div><div class='del'>-	if (!phydev-&gt;link)</div><div class='del'>-		new_speed = 0;</div><div class='del'>-	else</div><div class='del'>-		new_speed = phydev-&gt;speed;</div><div class='del'>-</div><div class='del'>-	/* Grab pause settings from PHY if configured to do so */</div><div class='del'>-	if (priv-&gt;aneg_pause) {</div><div class='del'>-		rx_pause = tx_pause = phydev-&gt;pause;</div><div class='del'>-		if (phydev-&gt;asym_pause)</div><div class='del'>-			tx_pause = !rx_pause;</div><div class='del'>-	} else {</div><div class='del'>-		rx_pause = priv-&gt;rx_pause;</div><div class='del'>-		tx_pause = priv-&gt;tx_pause;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Link hasn't changed, do nothing */</div><div class='del'>-	if (phydev-&gt;speed == priv-&gt;cur_speed &amp;&amp;</div><div class='del'>-	    phydev-&gt;duplex == priv-&gt;cur_duplex &amp;&amp;</div><div class='del'>-	    rx_pause == priv-&gt;rx_pause &amp;&amp;</div><div class='del'>-	    tx_pause == priv-&gt;tx_pause)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Print status if we have a link or we had one and just lost it,</div><div class='del'>-	 * don't print otherwise.</div><div class='del'>-	 */</div><div class='del'>-	if (new_speed || priv-&gt;cur_speed)</div><div class='del'>-		phy_print_status(phydev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cur_speed = new_speed;</div><div class='del'>-	priv-&gt;cur_duplex = phydev-&gt;duplex;</div><div class='del'>-	priv-&gt;rx_pause = rx_pause;</div><div class='del'>-	priv-&gt;tx_pause = tx_pause;</div><div class='del'>-</div><div class='del'>-	/* Link is down, do nothing else */</div><div class='del'>-	if (!new_speed)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Disable all interrupts */</div><div class='del'>-	iowrite32(0, priv-&gt;base + FTGMAC100_OFFSET_IER);</div><div class='del'>-</div><div class='del'>-	/* Reset the adapter asynchronously */</div><div class='del'>-	schedule_work(&amp;priv-&gt;reset_task);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ftgmac100_mii_probe(struct ftgmac100 *priv, phy_interface_t intf)</div><div class='del'>-{</div><div class='del'>-	struct net_device *netdev = priv-&gt;netdev;</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-</div><div class='del'>-	phydev = phy_find_first(priv-&gt;mii_bus);</div><div class='del'>-	if (!phydev) {</div><div class='del'>-		netdev_info(netdev, "%s: no PHY found\n", netdev-&gt;name);</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	phydev = phy_connect(netdev, phydev_name(phydev),</div><div class='del'>-			     &amp;ftgmac100_adjust_link, intf);</div><div class='del'>-</div><div class='del'>-	if (IS_ERR(phydev)) {</div><div class='del'>-		netdev_err(netdev, "%s: Could not attach to PHY\n", netdev-&gt;name);</div><div class='del'>-		return PTR_ERR(phydev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Indicate that we support PAUSE frames (see comment in</div><div class='del'>-	 * Documentation/networking/phy.txt)</div><div class='del'>-	 */</div><div class='del'>-	phy_support_asym_pause(phydev);</div><div class='del'>-</div><div class='del'>-	/* Display what we found */</div><div class='del'>-	phy_attached_info(phydev);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int ftgmac100_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = bus-&gt;priv;</div><div class='hunk'>@@ -1146,13 +1109,15 @@ static int ftgmac100_mdiobus_write(struct mii_bus *bus, int phy_addr,</div><div class='ctx'> static void ftgmac100_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 				  struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, dev_name(&amp;netdev-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(&amp;netdev-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ftgmac100_get_ringparam(struct net_device *netdev,</div><div class='del'>-				    struct ethtool_ringparam *ering)</div><div class='add'>+static void</div><div class='add'>+ftgmac100_get_ringparam(struct net_device *netdev,</div><div class='add'>+			struct ethtool_ringparam *ering,</div><div class='add'>+			struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1163,8 +1128,11 @@ static void ftgmac100_get_ringparam(struct net_device *netdev,</div><div class='ctx'> 	ering-&gt;tx_pending = priv-&gt;tx_q_entries;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ftgmac100_set_ringparam(struct net_device *netdev,</div><div class='del'>-				   struct ethtool_ringparam *ering)</div><div class='add'>+static int</div><div class='add'>+ftgmac100_set_ringparam(struct net_device *netdev,</div><div class='add'>+			struct ethtool_ringparam *ering,</div><div class='add'>+			struct kernel_ethtool_ringparam *kernel_ering,</div><div class='add'>+			struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1307,6 +1275,7 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (unlikely(priv-&gt;need_mac_restart)) {</div><div class='ctx'> 		ftgmac100_start_hw(priv);</div><div class='add'>+		priv-&gt;need_mac_restart = false;</div><div class='ctx'> </div><div class='ctx'> 		/* Re-enable "bad" interrupts */</div><div class='ctx'> 		iowrite32(FTGMAC100_INT_BAD,</div><div class='hunk'>@@ -1376,10 +1345,8 @@ static int ftgmac100_init_all(struct ftgmac100 *priv, bool ignore_alloc_err)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ftgmac100_reset_task(struct work_struct *work)</div><div class='add'>+static void ftgmac100_reset(struct ftgmac100 *priv)</div><div class='ctx'> {</div><div class='del'>-	struct ftgmac100 *priv = container_of(work, struct ftgmac100,</div><div class='del'>-					      reset_task);</div><div class='ctx'> 	struct net_device *netdev = priv-&gt;netdev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1417,7 +1384,7 @@ static void ftgmac100_reset_task(struct work_struct *work)</div><div class='ctx'> 	ftgmac100_init_all(priv, true);</div><div class='ctx'> </div><div class='ctx'> 	netdev_dbg(netdev, "Reset done !\n");</div><div class='del'>- bail:</div><div class='add'>+bail:</div><div class='ctx'> 	if (priv-&gt;mii_bus)</div><div class='ctx'> 		mutex_unlock(&amp;priv-&gt;mii_bus-&gt;mdio_lock);</div><div class='ctx'> 	if (netdev-&gt;phydev)</div><div class='hunk'>@@ -1425,6 +1392,134 @@ static void ftgmac100_reset_task(struct work_struct *work)</div><div class='ctx'> 	rtnl_unlock();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ftgmac100_reset_task(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ftgmac100 *priv = container_of(work, struct ftgmac100,</div><div class='add'>+					      reset_task);</div><div class='add'>+</div><div class='add'>+	ftgmac100_reset(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftgmac100_adjust_link(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='add'>+	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='add'>+	bool tx_pause, rx_pause;</div><div class='add'>+	int new_speed;</div><div class='add'>+</div><div class='add'>+	/* We store "no link" as speed 0 */</div><div class='add'>+	if (!phydev-&gt;link)</div><div class='add'>+		new_speed = 0;</div><div class='add'>+	else</div><div class='add'>+		new_speed = phydev-&gt;speed;</div><div class='add'>+</div><div class='add'>+	/* Grab pause settings from PHY if configured to do so */</div><div class='add'>+	if (priv-&gt;aneg_pause) {</div><div class='add'>+		rx_pause = tx_pause = phydev-&gt;pause;</div><div class='add'>+		if (phydev-&gt;asym_pause)</div><div class='add'>+			tx_pause = !rx_pause;</div><div class='add'>+	} else {</div><div class='add'>+		rx_pause = priv-&gt;rx_pause;</div><div class='add'>+		tx_pause = priv-&gt;tx_pause;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Link hasn't changed, do nothing */</div><div class='add'>+	if (phydev-&gt;speed == priv-&gt;cur_speed &amp;&amp;</div><div class='add'>+	    phydev-&gt;duplex == priv-&gt;cur_duplex &amp;&amp;</div><div class='add'>+	    rx_pause == priv-&gt;rx_pause &amp;&amp;</div><div class='add'>+	    tx_pause == priv-&gt;tx_pause)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Print status if we have a link or we had one and just lost it,</div><div class='add'>+	 * don't print otherwise.</div><div class='add'>+	 */</div><div class='add'>+	if (new_speed || priv-&gt;cur_speed)</div><div class='add'>+		phy_print_status(phydev);</div><div class='add'>+</div><div class='add'>+	priv-&gt;cur_speed = new_speed;</div><div class='add'>+	priv-&gt;cur_duplex = phydev-&gt;duplex;</div><div class='add'>+	priv-&gt;rx_pause = rx_pause;</div><div class='add'>+	priv-&gt;tx_pause = tx_pause;</div><div class='add'>+</div><div class='add'>+	/* Link is down, do nothing else */</div><div class='add'>+	if (!new_speed)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* Disable all interrupts */</div><div class='add'>+	iowrite32(0, priv-&gt;base + FTGMAC100_OFFSET_IER);</div><div class='add'>+</div><div class='add'>+	/* Release phy lock to allow ftgmac100_reset to acquire it, keeping lock</div><div class='add'>+	 * order consistent to prevent dead lock.</div><div class='add'>+	 */</div><div class='add'>+	if (netdev-&gt;phydev)</div><div class='add'>+		mutex_unlock(&amp;netdev-&gt;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+	ftgmac100_reset(priv);</div><div class='add'>+</div><div class='add'>+	if (netdev-&gt;phydev)</div><div class='add'>+		mutex_lock(&amp;netdev-&gt;phydev-&gt;lock);</div><div class='add'>+</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int ftgmac100_mii_probe(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='add'>+	struct platform_device *pdev = to_platform_device(priv-&gt;dev);</div><div class='add'>+	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct phy_device *phydev;</div><div class='add'>+	phy_interface_t phy_intf;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Default to RGMII. It's a gigabit part after all */</div><div class='add'>+	err = of_get_phy_mode(np, &amp;phy_intf);</div><div class='add'>+	if (err)</div><div class='add'>+		phy_intf = PHY_INTERFACE_MODE_RGMII;</div><div class='add'>+</div><div class='add'>+	/* Aspeed only supports these. I don't know about other IP</div><div class='add'>+	 * block vendors so I'm going to just let them through for</div><div class='add'>+	 * now. Note that this is only a warning if for some obscure</div><div class='add'>+	 * reason the DT really means to lie about it or it's a newer</div><div class='add'>+	 * part we don't know about.</div><div class='add'>+	 *</div><div class='add'>+	 * On the Aspeed SoC there are additionally straps and SCU</div><div class='add'>+	 * control bits that could tell us what the interface is</div><div class='add'>+	 * (or allow us to configure it while the IP block is held</div><div class='add'>+	 * in reset). For now I chose to keep this driver away from</div><div class='add'>+	 * those SoC specific bits and assume the device-tree is</div><div class='add'>+	 * right and the SCU has been configured properly by pinmux</div><div class='add'>+	 * or the firmware.</div><div class='add'>+	 */</div><div class='add'>+	if (priv-&gt;is_aspeed &amp;&amp; !(phy_interface_mode_is_rgmii(phy_intf))) {</div><div class='add'>+		netdev_warn(netdev,</div><div class='add'>+			    "Unsupported PHY mode %s !\n",</div><div class='add'>+			    phy_modes(phy_intf));</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phydev = phy_find_first(priv-&gt;mii_bus);</div><div class='add'>+	if (!phydev) {</div><div class='add'>+		netdev_info(netdev, "%s: no PHY found\n", netdev-&gt;name);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	phydev = phy_connect(netdev, phydev_name(phydev),</div><div class='add'>+			     &amp;ftgmac100_adjust_link, phy_intf);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(phydev)) {</div><div class='add'>+		netdev_err(netdev, "%s: Could not attach to PHY\n", netdev-&gt;name);</div><div class='add'>+		return PTR_ERR(phydev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Indicate that we support PAUSE frames (see comment in</div><div class='add'>+	 * Documentation/networking/phy.rst)</div><div class='add'>+	 */</div><div class='add'>+	phy_support_asym_pause(phydev);</div><div class='add'>+</div><div class='add'>+	/* Display what we found */</div><div class='add'>+	phy_attached_info(phydev);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int ftgmac100_open(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='hunk'>@@ -1457,7 +1552,7 @@ static int ftgmac100_open(struct net_device *netdev)</div><div class='ctx'> 		goto err_hw;</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize NAPI */</div><div class='del'>-	netif_napi_add(netdev, &amp;priv-&gt;napi, ftgmac100_poll, 64);</div><div class='add'>+	netif_napi_add(netdev, &amp;priv-&gt;napi, ftgmac100_poll);</div><div class='ctx'> </div><div class='ctx'> 	/* Grab our interrupt */</div><div class='ctx'> 	err = request_irq(netdev-&gt;irq, ftgmac100_interrupt, 0, netdev-&gt;name, netdev);</div><div class='hunk'>@@ -1476,7 +1571,8 @@ static int ftgmac100_open(struct net_device *netdev)</div><div class='ctx'> 	if (netdev-&gt;phydev) {</div><div class='ctx'> 		/* If we have a PHY, start polling */</div><div class='ctx'> 		phy_start(netdev-&gt;phydev);</div><div class='del'>-	} else if (priv-&gt;use_ncsi) {</div><div class='add'>+	}</div><div class='add'>+	if (priv-&gt;use_ncsi) {</div><div class='ctx'> 		/* If using NC-SI, set our carrier on and start the stack */</div><div class='ctx'> 		netif_carrier_on(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1488,15 +1584,16 @@ static int ftgmac100_open(struct net_device *netdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>- err_ncsi:</div><div class='add'>+err_ncsi:</div><div class='add'>+	phy_stop(netdev-&gt;phydev);</div><div class='ctx'> 	napi_disable(&amp;priv-&gt;napi);</div><div class='ctx'> 	netif_stop_queue(netdev);</div><div class='del'>- err_alloc:</div><div class='add'>+err_alloc:</div><div class='ctx'> 	ftgmac100_free_buffers(priv);</div><div class='ctx'> 	free_irq(netdev-&gt;irq, netdev);</div><div class='del'>- err_irq:</div><div class='add'>+err_irq:</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='del'>- err_hw:</div><div class='add'>+err_hw:</div><div class='ctx'> 	iowrite32(0, priv-&gt;base + FTGMAC100_OFFSET_IER);</div><div class='ctx'> 	ftgmac100_free_rings(priv);</div><div class='ctx'> 	return err;</div><div class='hunk'>@@ -1522,7 +1619,7 @@ static int ftgmac100_stop(struct net_device *netdev)</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> 	if (netdev-&gt;phydev)</div><div class='ctx'> 		phy_stop(netdev-&gt;phydev);</div><div class='del'>-	else if (priv-&gt;use_ncsi)</div><div class='add'>+	if (priv-&gt;use_ncsi)</div><div class='ctx'> 		ncsi_stop_dev(priv-&gt;ndev);</div><div class='ctx'> </div><div class='ctx'> 	ftgmac100_stop_hw(priv);</div><div class='hunk'>@@ -1533,16 +1630,7 @@ static int ftgmac100_stop(struct net_device *netdev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* optional */</div><div class='del'>-static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)</div><div class='del'>-{</div><div class='del'>-	if (!netdev-&gt;phydev)</div><div class='del'>-		return -ENXIO;</div><div class='del'>-</div><div class='del'>-	return phy_mii_ioctl(netdev-&gt;phydev, ifr, cmd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void ftgmac100_tx_timeout(struct net_device *netdev)</div><div class='add'>+static void ftgmac100_tx_timeout(struct net_device *netdev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1594,7 +1682,7 @@ static const struct net_device_ops ftgmac100_netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= ftgmac100_hard_start_xmit,</div><div class='ctx'> 	.ndo_set_mac_address	= ftgmac100_set_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= ftgmac100_do_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= phy_do_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= ftgmac100_tx_timeout,</div><div class='ctx'> 	.ndo_set_rx_mode	= ftgmac100_set_rx_mode,</div><div class='ctx'> 	.ndo_set_features	= ftgmac100_set_features,</div><div class='hunk'>@@ -1609,8 +1697,8 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='ctx'> 	struct platform_device *pdev = to_platform_device(priv-&gt;dev);</div><div class='del'>-	int phy_intf = PHY_INTERFACE_MODE_RGMII;</div><div class='ctx'> 	struct device_node *np = pdev-&gt;dev.of_node;</div><div class='add'>+	struct device_node *mdio_np;</div><div class='ctx'> 	int i, err = 0;</div><div class='ctx'> 	u32 reg;</div><div class='ctx'> </div><div class='hunk'>@@ -1619,46 +1707,18 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)</div><div class='ctx'> 	if (!priv-&gt;mii_bus)</div><div class='ctx'> 		return -EIO;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;is_aspeed) {</div><div class='del'>-		/* This driver supports the old MDIO interface */</div><div class='add'>+	if (of_device_is_compatible(np, "aspeed,ast2400-mac") ||</div><div class='add'>+	    of_device_is_compatible(np, "aspeed,ast2500-mac")) {</div><div class='add'>+		/* The AST2600 has a separate MDIO controller */</div><div class='add'>+</div><div class='add'>+		/* For the AST2400 and AST2500 this driver only supports the</div><div class='add'>+		 * old MDIO interface</div><div class='add'>+		 */</div><div class='ctx'> 		reg = ioread32(priv-&gt;base + FTGMAC100_OFFSET_REVR);</div><div class='ctx'> 		reg &amp;= ~FTGMAC100_REVR_NEW_MDIO_INTERFACE;</div><div class='ctx'> 		iowrite32(reg, priv-&gt;base + FTGMAC100_OFFSET_REVR);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* Get PHY mode from device-tree */</div><div class='del'>-	if (np) {</div><div class='del'>-		/* Default to RGMII. It's a gigabit part after all */</div><div class='del'>-		phy_intf = of_get_phy_mode(np);</div><div class='del'>-		if (phy_intf &lt; 0)</div><div class='del'>-			phy_intf = PHY_INTERFACE_MODE_RGMII;</div><div class='del'>-</div><div class='del'>-		/* Aspeed only supports these. I don't know about other IP</div><div class='del'>-		 * block vendors so I'm going to just let them through for</div><div class='del'>-		 * now. Note that this is only a warning if for some obscure</div><div class='del'>-		 * reason the DT really means to lie about it or it's a newer</div><div class='del'>-		 * part we don't know about.</div><div class='del'>-		 *</div><div class='del'>-		 * On the Aspeed SoC there are additionally straps and SCU</div><div class='del'>-		 * control bits that could tell us what the interface is</div><div class='del'>-		 * (or allow us to configure it while the IP block is held</div><div class='del'>-		 * in reset). For now I chose to keep this driver away from</div><div class='del'>-		 * those SoC specific bits and assume the device-tree is</div><div class='del'>-		 * right and the SCU has been configured properly by pinmux</div><div class='del'>-		 * or the firmware.</div><div class='del'>-		 */</div><div class='del'>-		if (priv-&gt;is_aspeed &amp;&amp;</div><div class='del'>-		    phy_intf != PHY_INTERFACE_MODE_RMII &amp;&amp;</div><div class='del'>-		    phy_intf != PHY_INTERFACE_MODE_RGMII &amp;&amp;</div><div class='del'>-		    phy_intf != PHY_INTERFACE_MODE_RGMII_ID &amp;&amp;</div><div class='del'>-		    phy_intf != PHY_INTERFACE_MODE_RGMII_RXID &amp;&amp;</div><div class='del'>-		    phy_intf != PHY_INTERFACE_MODE_RGMII_TXID) {</div><div class='del'>-			netdev_warn(netdev,</div><div class='del'>-				   "Unsupported PHY mode %s !\n",</div><div class='del'>-				   phy_modes(phy_intf));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	priv-&gt;mii_bus-&gt;name = "ftgmac100_mdio";</div><div class='ctx'> 	snprintf(priv-&gt;mii_bus-&gt;id, MII_BUS_ID_SIZE, "%s-%d",</div><div class='ctx'> 		 pdev-&gt;name, pdev-&gt;id);</div><div class='hunk'>@@ -1670,35 +1730,46 @@ static int ftgmac100_setup_mdio(struct net_device *netdev)</div><div class='ctx'> 	for (i = 0; i &lt; PHY_MAX_ADDR; i++)</div><div class='ctx'> 		priv-&gt;mii_bus-&gt;irq[i] = PHY_POLL;</div><div class='ctx'> </div><div class='del'>-	err = mdiobus_register(priv-&gt;mii_bus);</div><div class='add'>+	mdio_np = of_get_child_by_name(np, "mdio");</div><div class='add'>+</div><div class='add'>+	err = of_mdiobus_register(priv-&gt;mii_bus, mdio_np);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(priv-&gt;dev, "Cannot register MDIO bus!\n");</div><div class='ctx'> 		goto err_register_mdiobus;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = ftgmac100_mii_probe(priv, phy_intf);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(priv-&gt;dev, "MII Probe failed!\n");</div><div class='del'>-		goto err_mii_probe;</div><div class='del'>-	}</div><div class='add'>+	of_node_put(mdio_np);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_mii_probe:</div><div class='del'>-	mdiobus_unregister(priv-&gt;mii_bus);</div><div class='ctx'> err_register_mdiobus:</div><div class='ctx'> 	mdiobus_free(priv-&gt;mii_bus);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ftgmac100_phy_disconnect(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='add'>+	struct phy_device *phydev = netdev-&gt;phydev;</div><div class='add'>+</div><div class='add'>+	if (!phydev)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	phy_disconnect(phydev);</div><div class='add'>+	if (of_phy_is_fixed_link(priv-&gt;dev-&gt;of_node))</div><div class='add'>+		of_phy_deregister_fixed_link(priv-&gt;dev-&gt;of_node);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;use_ncsi)</div><div class='add'>+		fixed_phy_unregister(phydev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void ftgmac100_destroy_mdio(struct net_device *netdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct ftgmac100 *priv = netdev_priv(netdev);</div><div class='ctx'> </div><div class='del'>-	if (!netdev-&gt;phydev)</div><div class='add'>+	if (!priv-&gt;mii_bus)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	phy_disconnect(netdev-&gt;phydev);</div><div class='ctx'> 	mdiobus_unregister(priv-&gt;mii_bus);</div><div class='ctx'> 	mdiobus_free(priv-&gt;mii_bus);</div><div class='ctx'> }</div><div class='hunk'>@@ -1712,20 +1783,54 @@ static void ftgmac100_ncsi_handler(struct ncsi_dev *nd)</div><div class='ctx'> 		   nd-&gt;link_up ? "up" : "down");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void ftgmac100_setup_clk(struct ftgmac100 *priv)</div><div class='add'>+static int ftgmac100_setup_clk(struct ftgmac100 *priv)</div><div class='ctx'> {</div><div class='del'>-	priv-&gt;clk = devm_clk_get(priv-&gt;dev, NULL);</div><div class='del'>-	if (IS_ERR(priv-&gt;clk))</div><div class='del'>-		return;</div><div class='add'>+	struct clk *clk;</div><div class='add'>+	int rc;</div><div class='ctx'> </div><div class='del'>-	clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	clk = devm_clk_get(priv-&gt;dev, NULL /* MACCLK */);</div><div class='add'>+	if (IS_ERR(clk))</div><div class='add'>+		return PTR_ERR(clk);</div><div class='add'>+	priv-&gt;clk = clk;</div><div class='add'>+	rc = clk_prepare_enable(priv-&gt;clk);</div><div class='add'>+	if (rc)</div><div class='add'>+		return rc;</div><div class='ctx'> </div><div class='ctx'> 	/* Aspeed specifies a 100MHz clock is required for up to</div><div class='ctx'> 	 * 1000Mbit link speeds. As NCSI is limited to 100Mbit, 25MHz</div><div class='ctx'> 	 * is sufficient</div><div class='ctx'> 	 */</div><div class='del'>-	clk_set_rate(priv-&gt;clk, priv-&gt;use_ncsi ? FTGMAC_25MHZ :</div><div class='del'>-			FTGMAC_100MHZ);</div><div class='add'>+	rc = clk_set_rate(priv-&gt;clk, priv-&gt;use_ncsi ? FTGMAC_25MHZ :</div><div class='add'>+			  FTGMAC_100MHZ);</div><div class='add'>+	if (rc)</div><div class='add'>+		goto cleanup_clk;</div><div class='add'>+</div><div class='add'>+	/* RCLK is for RMII, typically used for NCSI. Optional because it's not</div><div class='add'>+	 * necessary if it's the AST2400 MAC, or the MAC is configured for</div><div class='add'>+	 * RGMII, or the controller is not an ASPEED-based controller.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;rclk = devm_clk_get_optional(priv-&gt;dev, "RCLK");</div><div class='add'>+	rc = clk_prepare_enable(priv-&gt;rclk);</div><div class='add'>+	if (!rc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+cleanup_clk:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+</div><div class='add'>+	return rc;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool ftgmac100_has_child_node(struct device_node *np, const char *name)</div><div class='add'>+{</div><div class='add'>+	struct device_node *child_np = of_get_child_by_name(np, name);</div><div class='add'>+	bool ret = false;</div><div class='add'>+</div><div class='add'>+	if (child_np) {</div><div class='add'>+		ret = true;</div><div class='add'>+		of_node_put(child_np);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ftgmac100_probe(struct platform_device *pdev)</div><div class='hunk'>@@ -1733,13 +1838,11 @@ static int ftgmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct resource *res;</div><div class='ctx'> 	int irq;</div><div class='ctx'> 	struct net_device *netdev;</div><div class='add'>+	struct phy_device *phydev;</div><div class='ctx'> 	struct ftgmac100 *priv;</div><div class='ctx'> 	struct device_node *np;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='del'>-	if (!pdev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -1793,11 +1896,14 @@ static int ftgmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;aneg_pause = true;</div><div class='ctx'> </div><div class='ctx'> 	/* MAC address from chip or random one */</div><div class='del'>-	ftgmac100_initial_mac(priv);</div><div class='add'>+	err = ftgmac100_initial_mac(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_phy_connect;</div><div class='ctx'> </div><div class='ctx'> 	np = pdev-&gt;dev.of_node;</div><div class='ctx'> 	if (np &amp;&amp; (of_device_is_compatible(np, "aspeed,ast2400-mac") ||</div><div class='del'>-		   of_device_is_compatible(np, "aspeed,ast2500-mac"))) {</div><div class='add'>+		   of_device_is_compatible(np, "aspeed,ast2500-mac") ||</div><div class='add'>+		   of_device_is_compatible(np, "aspeed,ast2600-mac"))) {</div><div class='ctx'> 		priv-&gt;rxdes0_edorr_mask = BIT(30);</div><div class='ctx'> 		priv-&gt;txdes0_edotr_mask = BIT(30);</div><div class='ctx'> 		priv-&gt;is_aspeed = true;</div><div class='hunk'>@@ -1809,23 +1915,96 @@ static int ftgmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	if (np &amp;&amp; of_get_property(np, "use-ncsi", NULL)) {</div><div class='ctx'> 		if (!IS_ENABLED(CONFIG_NET_NCSI)) {</div><div class='ctx'> 			dev_err(&amp;pdev-&gt;dev, "NCSI stack not enabled\n");</div><div class='del'>-			goto err_ncsi_dev;</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_phy_connect;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		dev_info(&amp;pdev-&gt;dev, "Using NCSI interface\n");</div><div class='ctx'> 		priv-&gt;use_ncsi = true;</div><div class='ctx'> 		priv-&gt;ndev = ncsi_register_dev(netdev, ftgmac100_ncsi_handler);</div><div class='del'>-		if (!priv-&gt;ndev)</div><div class='del'>-			goto err_ncsi_dev;</div><div class='del'>-	} else {</div><div class='add'>+		if (!priv-&gt;ndev) {</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_phy_connect;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phydev = fixed_phy_register(&amp;ncsi_phy_status, np);</div><div class='add'>+		if (IS_ERR(phydev)) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "failed to register fixed PHY device\n");</div><div class='add'>+			err = PTR_ERR(phydev);</div><div class='add'>+			goto err_phy_connect;</div><div class='add'>+		}</div><div class='add'>+		err = phy_connect_direct(netdev, phydev, ftgmac100_adjust_link,</div><div class='add'>+					 PHY_INTERFACE_MODE_RMII);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Connecting PHY failed\n");</div><div class='add'>+			goto err_phy_connect;</div><div class='add'>+		}</div><div class='add'>+	} else if (np &amp;&amp; (of_phy_is_fixed_link(np) ||</div><div class='add'>+			  of_get_property(np, "phy-handle", NULL))) {</div><div class='add'>+		struct phy_device *phy;</div><div class='add'>+</div><div class='add'>+		/* Support "mdio"/"phy" child nodes for ast2400/2500 with</div><div class='add'>+		 * an embedded MDIO controller. Automatically scan the DTS for</div><div class='add'>+		 * available PHYs and register them.</div><div class='add'>+		 */</div><div class='add'>+		if (of_get_property(np, "phy-handle", NULL) &amp;&amp;</div><div class='add'>+		    (of_device_is_compatible(np, "aspeed,ast2400-mac") ||</div><div class='add'>+		     of_device_is_compatible(np, "aspeed,ast2500-mac"))) {</div><div class='add'>+			err = ftgmac100_setup_mdio(netdev);</div><div class='add'>+			if (err)</div><div class='add'>+				goto err_setup_mdio;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		phy = of_phy_get_and_connect(priv-&gt;netdev, np,</div><div class='add'>+					     &amp;ftgmac100_adjust_link);</div><div class='add'>+		if (!phy) {</div><div class='add'>+			dev_err(&amp;pdev-&gt;dev, "Failed to connect to phy\n");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_phy_connect;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Indicate that we support PAUSE frames (see comment in</div><div class='add'>+		 * Documentation/networking/phy.rst)</div><div class='add'>+		 */</div><div class='add'>+		phy_support_asym_pause(phy);</div><div class='add'>+</div><div class='add'>+		/* Display what we found */</div><div class='add'>+		phy_attached_info(phy);</div><div class='add'>+	} else if (np &amp;&amp; !ftgmac100_has_child_node(np, "mdio")) {</div><div class='add'>+		/* Support legacy ASPEED devicetree descriptions that decribe a</div><div class='add'>+		 * MAC with an embedded MDIO controller but have no "mdio"</div><div class='add'>+		 * child node. Automatically scan the MDIO bus for available</div><div class='add'>+		 * PHYs.</div><div class='add'>+		 */</div><div class='ctx'> 		priv-&gt;use_ncsi = false;</div><div class='ctx'> 		err = ftgmac100_setup_mdio(netdev);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto err_setup_mdio;</div><div class='add'>+</div><div class='add'>+		err = ftgmac100_mii_probe(netdev);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(priv-&gt;dev, "MII probe failed!\n");</div><div class='add'>+			goto err_ncsi_dev;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rst = devm_reset_control_get_optional_exclusive(priv-&gt;dev, NULL);</div><div class='add'>+	if (IS_ERR(priv-&gt;rst)) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;rst);</div><div class='add'>+		goto err_phy_connect;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;is_aspeed)</div><div class='del'>-		ftgmac100_setup_clk(priv);</div><div class='add'>+	if (priv-&gt;is_aspeed) {</div><div class='add'>+		err = ftgmac100_setup_clk(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_phy_connect;</div><div class='add'>+</div><div class='add'>+		/* Disable ast2600 problematic HW arbitration */</div><div class='add'>+		if (of_device_is_compatible(np, "aspeed,ast2600-mac"))</div><div class='add'>+			iowrite32(FTGMAC100_TM_DEFAULT,</div><div class='add'>+				  priv-&gt;base + FTGMAC100_OFFSET_TM);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* Default ring sizes */</div><div class='ctx'> 	priv-&gt;rx_q_entries = priv-&gt;new_rx_q_entries = DEF_RX_QUEUE_ENTRIES;</div><div class='hunk'>@@ -1842,6 +2021,11 @@ static int ftgmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* AST2400  doesn't have working HW checksum generation */</div><div class='ctx'> 	if (np &amp;&amp; (of_device_is_compatible(np, "aspeed,ast2400-mac")))</div><div class='ctx'> 		netdev-&gt;hw_features &amp;= ~NETIF_F_HW_CSUM;</div><div class='add'>+</div><div class='add'>+	/* AST2600 tx checksum with NCSI is broken */</div><div class='add'>+	if (priv-&gt;use_ncsi &amp;&amp; of_device_is_compatible(np, "aspeed,ast2600-mac"))</div><div class='add'>+		netdev-&gt;hw_features &amp;= ~NETIF_F_HW_CSUM;</div><div class='add'>+</div><div class='ctx'> 	if (np &amp;&amp; of_get_property(np, "no-hw-checksum", NULL))</div><div class='ctx'> 		netdev-&gt;hw_features &amp;= ~(NETIF_F_HW_CSUM | NETIF_F_RXCSUM);</div><div class='ctx'> 	netdev-&gt;features |= netdev-&gt;hw_features;</div><div class='hunk'>@@ -1857,8 +2041,14 @@ static int ftgmac100_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-err_ncsi_dev:</div><div class='ctx'> err_register_netdev:</div><div class='add'>+	clk_disable_unprepare(priv-&gt;rclk);</div><div class='add'>+	clk_disable_unprepare(priv-&gt;clk);</div><div class='add'>+err_phy_connect:</div><div class='add'>+	ftgmac100_phy_disconnect(netdev);</div><div class='add'>+err_ncsi_dev:</div><div class='add'>+	if (priv-&gt;ndev)</div><div class='add'>+		ncsi_unregister_dev(priv-&gt;ndev);</div><div class='ctx'> 	ftgmac100_destroy_mdio(netdev);</div><div class='ctx'> err_setup_mdio:</div><div class='ctx'> 	iounmap(priv-&gt;base);</div><div class='hunk'>@@ -1870,7 +2060,7 @@ err_alloc_etherdev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ftgmac100_remove(struct platform_device *pdev)</div><div class='add'>+static void ftgmac100_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct ftgmac100 *priv;</div><div class='hunk'>@@ -1878,8 +2068,11 @@ static int ftgmac100_remove(struct platform_device *pdev)</div><div class='ctx'> 	netdev = platform_get_drvdata(pdev);</div><div class='ctx'> 	priv = netdev_priv(netdev);</div><div class='ctx'> </div><div class='add'>+	if (priv-&gt;ndev)</div><div class='add'>+		ncsi_unregister_dev(priv-&gt;ndev);</div><div class='ctx'> 	unregister_netdev(netdev);</div><div class='ctx'> </div><div class='add'>+	clk_disable_unprepare(priv-&gt;rclk);</div><div class='ctx'> 	clk_disable_unprepare(priv-&gt;clk);</div><div class='ctx'> </div><div class='ctx'> 	/* There's a small chance the reset task will have been re-queued,</div><div class='hunk'>@@ -1887,6 +2080,7 @@ static int ftgmac100_remove(struct platform_device *pdev)</div><div class='ctx'> 	 */</div><div class='ctx'> 	cancel_work_sync(&amp;priv-&gt;reset_task);</div><div class='ctx'> </div><div class='add'>+	ftgmac100_phy_disconnect(netdev);</div><div class='ctx'> 	ftgmac100_destroy_mdio(netdev);</div><div class='ctx'> </div><div class='ctx'> 	iounmap(priv-&gt;base);</div><div class='hunk'>@@ -1894,7 +2088,6 @@ static int ftgmac100_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> 	free_netdev(netdev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ftgmac100_of_match[] = {</div><div class='hunk'>@@ -1905,7 +2098,7 @@ MODULE_DEVICE_TABLE(of, ftgmac100_of_match);</div><div class='ctx'> </div><div class='ctx'> static struct platform_driver ftgmac100_driver = {</div><div class='ctx'> 	.probe	= ftgmac100_probe,</div><div class='del'>-	.remove	= ftgmac100_remove,</div><div class='add'>+	.remove = ftgmac100_remove,</div><div class='ctx'> 	.driver	= {</div><div class='ctx'> 		.name		= DRV_NAME,</div><div class='ctx'> 		.of_match_table	= ftgmac100_of_match,</div><div class='head'>diff --git a/drivers/net/ethernet/faraday/ftgmac100.h b/drivers/net/ethernet/faraday/ftgmac100.h<br/>index e5876a3fda91..4968f6f0bdbc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftgmac100.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftgmac100.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftgmac100.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/faraday/ftgmac100.h</a></div><div class='hunk'>@@ -84,7 +84,7 @@</div><div class='ctx'> 			    FTGMAC100_INT_RPKT_BUF)</div><div class='ctx'> </div><div class='ctx'> /* All the interrupts we care about */</div><div class='del'>-#define FTGMAC100_INT_ALL (FTGMAC100_INT_RPKT_BUF  |  \</div><div class='add'>+#define FTGMAC100_INT_ALL (FTGMAC100_INT_RXTX  |  \</div><div class='ctx'> 			   FTGMAC100_INT_BAD)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='hunk'>@@ -170,6 +170,14 @@</div><div class='ctx'> #define FTGMAC100_MACCR_SW_RST		(1 &lt;&lt; 31)</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='add'>+ * test mode control register</div><div class='add'>+ */</div><div class='add'>+#define FTGMAC100_TM_RQ_TX_VALID_DIS (1 &lt;&lt; 28)</div><div class='add'>+#define FTGMAC100_TM_RQ_RR_IDLE_PREV (1 &lt;&lt; 27)</div><div class='add'>+#define FTGMAC100_TM_DEFAULT                                                   \</div><div class='add'>+	(FTGMAC100_TM_RQ_TX_VALID_DIS | FTGMAC100_TM_RQ_RR_IDLE_PREV)</div><div class='add'>+</div><div class='add'>+/*</div><div class='ctx'>  * PHY control register</div><div class='ctx'>  */</div><div class='ctx'> #define FTGMAC100_PHYCR_MDC_CYCTHR_MASK	0x3f</div><div class='head'>diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c<br/>index 6c247cbbd23e..5803a382f0ba 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftmac100.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftmac100.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftmac100.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/faraday/ftmac100.c</a></div><div class='hunk'>@@ -11,6 +11,8 @@</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/ethtool.h&gt;</div><div class='add'>+#include &lt;linux/if_ether.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -23,13 +25,12 @@</div><div class='ctx'> #include "ftmac100.h"</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"ftmac100"</div><div class='del'>-#define DRV_VERSION	"0.2"</div><div class='ctx'> </div><div class='ctx'> #define RX_QUEUE_ENTRIES	128	/* must be power of 2 */</div><div class='ctx'> #define TX_QUEUE_ENTRIES	16	/* must be power of 2 */</div><div class='ctx'> </div><div class='del'>-#define MAX_PKT_SIZE		1518</div><div class='ctx'> #define RX_BUF_SIZE		2044	/* must be smaller than 0x7ff */</div><div class='add'>+#define MAX_PKT_SIZE		RX_BUF_SIZE /* multi-segment not supported */</div><div class='ctx'> </div><div class='ctx'> #if MAX_PKT_SIZE &gt; 0x7ff</div><div class='ctx'> #error invalid MAX_PKT_SIZE</div><div class='hunk'>@@ -148,6 +149,40 @@ static void ftmac100_set_mac(struct ftmac100 *priv, const unsigned char *mac)</div><div class='ctx'> 	iowrite32(laddr, priv-&gt;base + FTMAC100_OFFSET_MAC_LADR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void ftmac100_setup_mc_ht(struct ftmac100 *priv)</div><div class='add'>+{</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+	u64 maht = 0; /* Multicast Address Hash Table */</div><div class='add'>+</div><div class='add'>+	netdev_for_each_mc_addr(ha, priv-&gt;netdev) {</div><div class='add'>+		u32 hash = ether_crc(ETH_ALEN, ha-&gt;addr) &gt;&gt; 26;</div><div class='add'>+</div><div class='add'>+		maht |= BIT_ULL(hash);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	iowrite32(lower_32_bits(maht), priv-&gt;base + FTMAC100_OFFSET_MAHT0);</div><div class='add'>+	iowrite32(upper_32_bits(maht), priv-&gt;base + FTMAC100_OFFSET_MAHT1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftmac100_set_rx_bits(struct ftmac100 *priv, unsigned int *maccr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	/* Clear all */</div><div class='add'>+	*maccr &amp;= ~(FTMAC100_MACCR_RCV_ALL | FTMAC100_MACCR_RX_MULTIPKT |</div><div class='add'>+		   FTMAC100_MACCR_HT_MULTI_EN);</div><div class='add'>+</div><div class='add'>+	/* Set the requested bits */</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_PROMISC)</div><div class='add'>+		*maccr |= FTMAC100_MACCR_RCV_ALL;</div><div class='add'>+	if (netdev-&gt;flags &amp; IFF_ALLMULTI)</div><div class='add'>+		*maccr |= FTMAC100_MACCR_RX_MULTIPKT;</div><div class='add'>+	else if (netdev_mc_count(netdev)) {</div><div class='add'>+		*maccr |= FTMAC100_MACCR_HT_MULTI_EN;</div><div class='add'>+		ftmac100_setup_mc_ht(priv);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #define MACCR_ENABLE_ALL	(FTMAC100_MACCR_XMT_EN	| \</div><div class='ctx'> 				 FTMAC100_MACCR_RCV_EN	| \</div><div class='ctx'> 				 FTMAC100_MACCR_XDMA_EN	| \</div><div class='hunk'>@@ -160,6 +195,7 @@ static void ftmac100_set_mac(struct ftmac100 *priv, const unsigned char *mac)</div><div class='ctx'> static int ftmac100_start_hw(struct ftmac100 *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev = priv-&gt;netdev;</div><div class='add'>+	unsigned int maccr = MACCR_ENABLE_ALL;</div><div class='ctx'> </div><div class='ctx'> 	if (ftmac100_reset(priv))</div><div class='ctx'> 		return -EIO;</div><div class='hunk'>@@ -176,7 +212,13 @@ static int ftmac100_start_hw(struct ftmac100 *priv)</div><div class='ctx'> </div><div class='ctx'> 	ftmac100_set_mac(priv, netdev-&gt;dev_addr);</div><div class='ctx'> </div><div class='del'>-	iowrite32(MACCR_ENABLE_ALL, priv-&gt;base + FTMAC100_OFFSET_MACCR);</div><div class='add'>+	 /* See ftmac100_change_mtu() */</div><div class='add'>+	if (netdev-&gt;mtu &gt; ETH_DATA_LEN)</div><div class='add'>+		maccr |= FTMAC100_MACCR_RX_FTL;</div><div class='add'>+</div><div class='add'>+	ftmac100_set_rx_bits(priv, &amp;maccr);</div><div class='add'>+</div><div class='add'>+	iowrite32(maccr, priv-&gt;base + FTMAC100_OFFSET_MACCR);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -219,11 +261,6 @@ static bool ftmac100_rxdes_crc_error(struct ftmac100_rxdes *rxdes)</div><div class='ctx'> 	return rxdes-&gt;rxdes0 &amp; cpu_to_le32(FTMAC100_RXDES0_CRC_ERR);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static bool ftmac100_rxdes_frame_too_long(struct ftmac100_rxdes *rxdes)</div><div class='del'>-{</div><div class='del'>-	return rxdes-&gt;rxdes0 &amp; cpu_to_le32(FTMAC100_RXDES0_FTL);</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static bool ftmac100_rxdes_runt(struct ftmac100_rxdes *rxdes)</div><div class='ctx'> {</div><div class='ctx'> 	return rxdes-&gt;rxdes0 &amp; cpu_to_le32(FTMAC100_RXDES0_RUNT);</div><div class='hunk'>@@ -338,13 +375,7 @@ static bool ftmac100_rx_packet_error(struct ftmac100 *priv,</div><div class='ctx'> 		error = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (unlikely(ftmac100_rxdes_frame_too_long(rxdes))) {</div><div class='del'>-		if (net_ratelimit())</div><div class='del'>-			netdev_info(netdev, "rx frame too long\n");</div><div class='del'>-</div><div class='del'>-		netdev-&gt;stats.rx_length_errors++;</div><div class='del'>-		error = true;</div><div class='del'>-	} else if (unlikely(ftmac100_rxdes_runt(rxdes))) {</div><div class='add'>+	if (unlikely(ftmac100_rxdes_runt(rxdes))) {</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			netdev_info(netdev, "rx runt\n");</div><div class='ctx'> </div><div class='hunk'>@@ -357,6 +388,11 @@ static bool ftmac100_rx_packet_error(struct ftmac100 *priv,</div><div class='ctx'> 		netdev-&gt;stats.rx_length_errors++;</div><div class='ctx'> 		error = true;</div><div class='ctx'> 	}</div><div class='add'>+	/*</div><div class='add'>+	 * FTMAC100_RXDES0_FTL is not an error, it just indicates that the</div><div class='add'>+	 * frame is longer than 1518 octets. Receiving these is possible when</div><div class='add'>+	 * we told the hardware not to drop them, via FTMAC100_MACCR_RX_FTL.</div><div class='add'>+	 */</div><div class='ctx'> </div><div class='ctx'> 	return error;</div><div class='ctx'> }</div><div class='hunk'>@@ -401,12 +437,13 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/*</div><div class='del'>-	 * It is impossible to get multi-segment packets</div><div class='del'>-	 * because we always provide big enough receive buffers.</div><div class='del'>-	 */</div><div class='add'>+	/* We don't support multi-segment packets for now, so drop them. */</div><div class='ctx'> 	ret = ftmac100_rxdes_last_segment(rxdes);</div><div class='del'>-	BUG_ON(!ret);</div><div class='add'>+	if (unlikely(!ret)) {</div><div class='add'>+		netdev-&gt;stats.rx_length_errors++;</div><div class='add'>+		ftmac100_rx_drop_packet(priv);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* start processing */</div><div class='ctx'> 	skb = netdev_alloc_skb_ip_align(netdev, 128);</div><div class='hunk'>@@ -808,9 +845,8 @@ static void ftmac100_mdio_write(struct net_device *netdev, int phy_id, int reg,</div><div class='ctx'> static void ftmac100_get_drvinfo(struct net_device *netdev,</div><div class='ctx'> 				 struct ethtool_drvinfo *info)</div><div class='ctx'> {</div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, dev_name(&amp;netdev-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, dev_name(&amp;netdev-&gt;dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int ftmac100_get_link_ksettings(struct net_device *netdev,</div><div class='hunk'>@@ -1039,13 +1075,46 @@ static int ftmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int c</div><div class='ctx'> 	return generic_mii_ioctl(&amp;priv-&gt;mii, data, cmd, NULL);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int ftmac100_change_mtu(struct net_device *netdev, int mtu)</div><div class='add'>+{</div><div class='add'>+	struct ftmac100 *priv = netdev_priv(netdev);</div><div class='add'>+	unsigned int maccr;</div><div class='add'>+</div><div class='add'>+	maccr = ioread32(priv-&gt;base + FTMAC100_OFFSET_MACCR);</div><div class='add'>+	if (mtu &gt; ETH_DATA_LEN) {</div><div class='add'>+		/* process long packets in the driver */</div><div class='add'>+		maccr |= FTMAC100_MACCR_RX_FTL;</div><div class='add'>+	} else {</div><div class='add'>+		/* Let the controller drop incoming packets greater</div><div class='add'>+		 * than 1518 (that is 1500 + 14 Ethernet + 4 FCS).</div><div class='add'>+		 */</div><div class='add'>+		maccr &amp;= ~FTMAC100_MACCR_RX_FTL;</div><div class='add'>+	}</div><div class='add'>+	iowrite32(maccr, priv-&gt;base + FTMAC100_OFFSET_MACCR);</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, mtu);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void ftmac100_set_rx_mode(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ftmac100 *priv = netdev_priv(netdev);</div><div class='add'>+	unsigned int maccr = ioread32(priv-&gt;base + FTMAC100_OFFSET_MACCR);</div><div class='add'>+</div><div class='add'>+	ftmac100_set_rx_bits(priv, &amp;maccr);</div><div class='add'>+	iowrite32(maccr, priv-&gt;base + FTMAC100_OFFSET_MACCR);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static const struct net_device_ops ftmac100_netdev_ops = {</div><div class='ctx'> 	.ndo_open		= ftmac100_open,</div><div class='ctx'> 	.ndo_stop		= ftmac100_stop,</div><div class='ctx'> 	.ndo_start_xmit		= ftmac100_hard_start_xmit,</div><div class='ctx'> 	.ndo_set_mac_address	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='del'>-	.ndo_do_ioctl		= ftmac100_do_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= ftmac100_do_ioctl,</div><div class='add'>+	.ndo_change_mtu		= ftmac100_change_mtu,</div><div class='add'>+	.ndo_set_rx_mode	= ftmac100_set_rx_mode,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /******************************************************************************</div><div class='hunk'>@@ -1059,9 +1128,6 @@ static int ftmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	struct ftmac100 *priv;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	if (!pdev)</div><div class='del'>-		return -ENODEV;</div><div class='del'>-</div><div class='ctx'> 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);</div><div class='ctx'> 	if (!res)</div><div class='ctx'> 		return -ENXIO;</div><div class='hunk'>@@ -1080,6 +1146,11 @@ static int ftmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	SET_NETDEV_DEV(netdev, &amp;pdev-&gt;dev);</div><div class='ctx'> 	netdev-&gt;ethtool_ops = &amp;ftmac100_ethtool_ops;</div><div class='ctx'> 	netdev-&gt;netdev_ops = &amp;ftmac100_netdev_ops;</div><div class='add'>+	netdev-&gt;max_mtu = MAX_PKT_SIZE - VLAN_ETH_HLEN;</div><div class='add'>+</div><div class='add'>+	err = platform_get_ethdev_address(&amp;pdev-&gt;dev, netdev);</div><div class='add'>+	if (err == -EPROBE_DEFER)</div><div class='add'>+		goto defer_get_mac;</div><div class='ctx'> </div><div class='ctx'> 	platform_set_drvdata(pdev, netdev);</div><div class='ctx'> </div><div class='hunk'>@@ -1091,7 +1162,7 @@ static int ftmac100_probe(struct platform_device *pdev)</div><div class='ctx'> 	spin_lock_init(&amp;priv-&gt;tx_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* initialize NAPI */</div><div class='del'>-	netif_napi_add(netdev, &amp;priv-&gt;napi, ftmac100_poll, 64);</div><div class='add'>+	netif_napi_add(netdev, &amp;priv-&gt;napi, ftmac100_poll);</div><div class='ctx'> </div><div class='ctx'> 	/* map io memory */</div><div class='ctx'> 	priv-&gt;res = request_mem_region(res-&gt;start, resource_size(res),</div><div class='hunk'>@@ -1142,12 +1213,13 @@ err_ioremap:</div><div class='ctx'> 	release_resource(priv-&gt;res);</div><div class='ctx'> err_req_mem:</div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='add'>+defer_get_mac:</div><div class='ctx'> 	free_netdev(netdev);</div><div class='ctx'> err_alloc_etherdev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int ftmac100_remove(struct platform_device *pdev)</div><div class='add'>+static void ftmac100_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *netdev;</div><div class='ctx'> 	struct ftmac100 *priv;</div><div class='hunk'>@@ -1162,7 +1234,6 @@ static int ftmac100_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	netif_napi_del(&amp;priv-&gt;napi);</div><div class='ctx'> 	free_netdev(netdev);</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct of_device_id ftmac100_of_ids[] = {</div><div class='hunk'>@@ -1182,19 +1253,7 @@ static struct platform_driver ftmac100_driver = {</div><div class='ctx'> /******************************************************************************</div><div class='ctx'>  * initialization / finalization</div><div class='ctx'>  *****************************************************************************/</div><div class='del'>-static int __init ftmac100_init(void)</div><div class='del'>-{</div><div class='del'>-	pr_info("Loading version " DRV_VERSION " ...\n");</div><div class='del'>-	return platform_driver_register(&amp;ftmac100_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit ftmac100_exit(void)</div><div class='del'>-{</div><div class='del'>-	platform_driver_unregister(&amp;ftmac100_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(ftmac100_init);</div><div class='del'>-module_exit(ftmac100_exit);</div><div class='add'>+module_platform_driver(ftmac100_driver);</div><div class='ctx'> </div><div class='ctx'> MODULE_AUTHOR("Po-Yu Chuang &lt;ratbert@faraday-tech.com&gt;");</div><div class='ctx'> MODULE_DESCRIPTION("FTMAC100 driver");</div><div class='head'>diff --git a/drivers/net/ethernet/faraday/ftmac100.h b/drivers/net/ethernet/faraday/ftmac100.h<br/>index fe986f1673fc..8af32f9070f4 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftmac100.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/faraday/ftmac100.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/faraday/ftmac100.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/faraday/ftmac100.h</a></div><div class='hunk'>@@ -122,9 +122,9 @@</div><div class='ctx'>  * Transmit descriptor, aligned to 16 bytes</div><div class='ctx'>  */</div><div class='ctx'> struct ftmac100_txdes {</div><div class='del'>-	unsigned int	txdes0;</div><div class='del'>-	unsigned int	txdes1;</div><div class='del'>-	unsigned int	txdes2;	/* TXBUF_BADR */</div><div class='add'>+	__le32		txdes0;</div><div class='add'>+	__le32		txdes1;</div><div class='add'>+	__le32		txdes2;	/* TXBUF_BADR */</div><div class='ctx'> 	unsigned int	txdes3;	/* not used by HW */</div><div class='ctx'> } __attribute__ ((aligned(16)));</div><div class='ctx'> </div><div class='hunk'>@@ -143,9 +143,9 @@ struct ftmac100_txdes {</div><div class='ctx'>  * Receive descriptor, aligned to 16 bytes</div><div class='ctx'>  */</div><div class='ctx'> struct ftmac100_rxdes {</div><div class='del'>-	unsigned int	rxdes0;</div><div class='del'>-	unsigned int	rxdes1;</div><div class='del'>-	unsigned int	rxdes2;	/* RXBUF_BADR */</div><div class='add'>+	__le32		rxdes0;</div><div class='add'>+	__le32		rxdes1;</div><div class='add'>+	__le32		rxdes2;	/* RXBUF_BADR */</div><div class='ctx'> 	unsigned int	rxdes3;	/* not used by HW */</div><div class='ctx'> } __attribute__ ((aligned(16)));</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c<br/>index c24fd56a2c71..3c9961806f75 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/fealnx.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/fealnx.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/fealnx.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/fealnx.c</a></div><div class='hunk'>@@ -25,8 +25,6 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> #define DRV_NAME	"fealnx"</div><div class='del'>-#define DRV_VERSION	"2.52"</div><div class='del'>-#define DRV_RELDATE	"Sep-11-2006"</div><div class='ctx'> </div><div class='ctx'> static int debug;		/* 1-&gt; print debug message */</div><div class='ctx'> static int max_interrupt_work = 20;</div><div class='hunk'>@@ -91,11 +89,6 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 };</div><div class='ctx'> #include &lt;linux/uaccess.h&gt;</div><div class='ctx'> #include &lt;asm/byteorder.h&gt;</div><div class='ctx'> </div><div class='del'>-/* These identify the driver base version and may not be removed. */</div><div class='del'>-static const char version[] =</div><div class='del'>-	KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE "\n";</div><div class='del'>-</div><div class='del'>-</div><div class='ctx'> /* This driver was written to use PCI memory space, however some x86 systems</div><div class='ctx'>    work only with I/O space accesses. */</div><div class='ctx'> #ifndef __alpha__</div><div class='hunk'>@@ -151,7 +144,7 @@ struct chip_info {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static const struct chip_info skel_netdrv_tbl[] = {</div><div class='del'>- 	{ "100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },</div><div class='add'>+	{ "100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },</div><div class='ctx'> 	{ "100/10M Ethernet PCI Adapter",	HAS_CHIP_XCVR },</div><div class='ctx'> 	{ "1000/100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },</div><div class='ctx'> };</div><div class='hunk'>@@ -203,7 +196,7 @@ enum intr_status_bits {</div><div class='ctx'> 	ERI = 0x00000080,	/* receive early int */</div><div class='ctx'> 	CNTOVF = 0x00000040,	/* counter overflow */</div><div class='ctx'> 	RBU = 0x00000020,	/* receive buffer unavailable */</div><div class='del'>-	TBU = 0x00000010,	/* transmit buffer unavilable */</div><div class='add'>+	TBU = 0x00000010,	/* transmit buffer unavailable */</div><div class='ctx'> 	TI = 0x00000008,	/* transmit interrupt */</div><div class='ctx'> 	RI = 0x00000004,	/* receive interrupt */</div><div class='ctx'> 	RxErr = 0x00000002,	/* receive error */</div><div class='hunk'>@@ -222,7 +215,7 @@ enum rx_mode_bits {</div><div class='ctx'> 	CR_W_RXMODEMASK	= 0x000000e0,</div><div class='ctx'> 	CR_W_PROM	= 0x00000080,	/* promiscuous mode */</div><div class='ctx'> 	CR_W_AB		= 0x00000040,	/* accept broadcast */</div><div class='del'>-	CR_W_AM		= 0x00000020,	/* accept mutlicast */</div><div class='add'>+	CR_W_AM		= 0x00000020,	/* accept multicast */</div><div class='ctx'> 	CR_W_ARP	= 0x00000008,	/* receive runt pkt */</div><div class='ctx'> 	CR_W_ALP	= 0x00000004,	/* receive long pkt */</div><div class='ctx'> 	CR_W_SEP	= 0x00000002,	/* receive error pkt */</div><div class='hunk'>@@ -428,7 +421,7 @@ static void getlinktype(struct net_device *dev);</div><div class='ctx'> static void getlinkstatus(struct net_device *dev);</div><div class='ctx'> static void netdev_timer(struct timer_list *t);</div><div class='ctx'> static void reset_timer(struct timer_list *t);</div><div class='del'>-static void fealnx_tx_timeout(struct net_device *dev);</div><div class='add'>+static void fealnx_tx_timeout(struct net_device *dev, unsigned int txqueue);</div><div class='ctx'> static void init_ring(struct net_device *dev);</div><div class='ctx'> static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev);</div><div class='ctx'> static irqreturn_t intr_handler(int irq, void *dev_instance);</div><div class='hunk'>@@ -470,7 +463,7 @@ static const struct net_device_ops netdev_ops = {</div><div class='ctx'> 	.ndo_start_xmit		= start_tx,</div><div class='ctx'> 	.ndo_get_stats 		= get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode	= set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl		= mii_ioctl,</div><div class='add'>+	.ndo_eth_ioctl		= mii_ioctl,</div><div class='ctx'> 	.ndo_tx_timeout		= fealnx_tx_timeout,</div><div class='ctx'> 	.ndo_set_mac_address 	= eth_mac_addr,</div><div class='ctx'> 	.ndo_validate_addr	= eth_validate_addr,</div><div class='hunk'>@@ -489,19 +482,13 @@ static int fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	struct net_device *dev;</div><div class='ctx'> 	void *ring_space;</div><div class='ctx'> 	dma_addr_t ring_dma;</div><div class='add'>+	u8 addr[ETH_ALEN];</div><div class='ctx'> #ifdef USE_IO_OPS</div><div class='ctx'> 	int bar = 0;</div><div class='ctx'> #else</div><div class='ctx'> 	int bar = 1;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-/* when built into the kernel, we only print version if device is found */</div><div class='del'>-#ifndef MODULE</div><div class='del'>-	static int printed_version;</div><div class='del'>-	if (!printed_version++)</div><div class='del'>-		printk(version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='ctx'> 	card_idx++;</div><div class='ctx'> 	sprintf(boardname, "fealnx%d", card_idx);</div><div class='ctx'> </div><div class='hunk'>@@ -539,7 +526,8 @@ static int fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> </div><div class='ctx'> 	/* read ethernet id */</div><div class='ctx'> 	for (i = 0; i &lt; 6; ++i)</div><div class='del'>-		dev-&gt;dev_addr[i] = ioread8(ioaddr + PAR0 + i);</div><div class='add'>+		addr[i] = ioread8(ioaddr + PAR0 + i);</div><div class='add'>+	eth_hw_addr_set(dev, addr);</div><div class='ctx'> </div><div class='ctx'> 	/* Reset the chip to erase previous misconfiguration. */</div><div class='ctx'> 	iowrite32(0x00000001, ioaddr + BCR);</div><div class='hunk'>@@ -557,7 +545,8 @@ static int fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	np-&gt;mii.phy_id_mask = 0x1f;</div><div class='ctx'> 	np-&gt;mii.reg_num_mask = 0x1f;</div><div class='ctx'> </div><div class='del'>-	ring_space = pci_alloc_consistent(pdev, RX_TOTAL_SIZE, &amp;ring_dma);</div><div class='add'>+	ring_space = dma_alloc_coherent(&amp;pdev-&gt;dev, RX_TOTAL_SIZE, &amp;ring_dma,</div><div class='add'>+					GFP_KERNEL);</div><div class='ctx'> 	if (!ring_space) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_free_dev;</div><div class='hunk'>@@ -565,7 +554,8 @@ static int fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	np-&gt;rx_ring = ring_space;</div><div class='ctx'> 	np-&gt;rx_ring_dma = ring_dma;</div><div class='ctx'> </div><div class='del'>-	ring_space = pci_alloc_consistent(pdev, TX_TOTAL_SIZE, &amp;ring_dma);</div><div class='add'>+	ring_space = dma_alloc_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE, &amp;ring_dma,</div><div class='add'>+					GFP_KERNEL);</div><div class='ctx'> 	if (!ring_space) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto err_out_free_rx;</div><div class='hunk'>@@ -670,9 +660,11 @@ static int fealnx_init_one(struct pci_dev *pdev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_out_free_tx:</div><div class='del'>-	pci_free_consistent(pdev, TX_TOTAL_SIZE, np-&gt;tx_ring, np-&gt;tx_ring_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE, np-&gt;tx_ring,</div><div class='add'>+			  np-&gt;tx_ring_dma);</div><div class='ctx'> err_out_free_rx:</div><div class='del'>-	pci_free_consistent(pdev, RX_TOTAL_SIZE, np-&gt;rx_ring, np-&gt;rx_ring_dma);</div><div class='add'>+	dma_free_coherent(&amp;pdev-&gt;dev, RX_TOTAL_SIZE, np-&gt;rx_ring,</div><div class='add'>+			  np-&gt;rx_ring_dma);</div><div class='ctx'> err_out_free_dev:</div><div class='ctx'> 	free_netdev(dev);</div><div class='ctx'> err_out_unmap:</div><div class='hunk'>@@ -690,10 +682,10 @@ static void fealnx_remove_one(struct pci_dev *pdev)</div><div class='ctx'> 	if (dev) {</div><div class='ctx'> 		struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-		pci_free_consistent(pdev, TX_TOTAL_SIZE, np-&gt;tx_ring,</div><div class='del'>-			np-&gt;tx_ring_dma);</div><div class='del'>-		pci_free_consistent(pdev, RX_TOTAL_SIZE, np-&gt;rx_ring,</div><div class='del'>-			np-&gt;rx_ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, TX_TOTAL_SIZE, np-&gt;tx_ring,</div><div class='add'>+				  np-&gt;tx_ring_dma);</div><div class='add'>+		dma_free_coherent(&amp;pdev-&gt;dev, RX_TOTAL_SIZE, np-&gt;rx_ring,</div><div class='add'>+				  np-&gt;rx_ring_dma);</div><div class='ctx'> 		unregister_netdev(dev);</div><div class='ctx'> 		pci_iounmap(pdev, np-&gt;mem);</div><div class='ctx'> 		free_netdev(dev);</div><div class='hunk'>@@ -837,7 +829,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 		return -EAGAIN;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 3; i++)</div><div class='del'>-		iowrite16(((unsigned short*)dev-&gt;dev_addr)[i],</div><div class='add'>+		iowrite16(((const unsigned short *)dev-&gt;dev_addr)[i],</div><div class='ctx'> 				ioaddr + PAR0 + i*2);</div><div class='ctx'> </div><div class='ctx'> 	init_ring(dev);</div><div class='hunk'>@@ -867,7 +859,7 @@ static int netdev_open(struct net_device *dev)</div><div class='ctx'> 	np-&gt;bcrvalue |= 0x04;	/* big-endian */</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='del'>-#if defined(__i386__) &amp;&amp; !defined(MODULE)</div><div class='add'>+#if defined(__i386__) &amp;&amp; !defined(MODULE) &amp;&amp; !defined(CONFIG_UML)</div><div class='ctx'> 	if (boot_cpu_data.x86 &lt;= 4)</div><div class='ctx'> 		np-&gt;crvalue = 0xa00;</div><div class='ctx'> 	else</div><div class='hunk'>@@ -1070,8 +1062,10 @@ static void allocate_rx_buffers(struct net_device *dev)</div><div class='ctx'> 			np-&gt;lack_rxbuf = np-&gt;lack_rxbuf-&gt;next_desc_logical;</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;lack_rxbuf-&gt;skbuff = skb;</div><div class='del'>-		np-&gt;lack_rxbuf-&gt;buffer = pci_map_single(np-&gt;pci_dev, skb-&gt;data,</div><div class='del'>-			np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+		np-&gt;lack_rxbuf-&gt;buffer = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							skb-&gt;data,</div><div class='add'>+							np-&gt;rx_buf_sz,</div><div class='add'>+							DMA_FROM_DEVICE);</div><div class='ctx'> 		np-&gt;lack_rxbuf-&gt;status = RXOWN;</div><div class='ctx'> 		++np-&gt;really_rx_count;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1080,7 +1074,7 @@ static void allocate_rx_buffers(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void netdev_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_private *np = from_timer(np, t, timer);</div><div class='add'>+	struct netdev_private *np = timer_container_of(np, t, timer);</div><div class='ctx'> 	struct net_device *dev = np-&gt;mii.dev;</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;mem;</div><div class='ctx'> 	int old_crvalue = np-&gt;crvalue;</div><div class='hunk'>@@ -1169,7 +1163,7 @@ static void enable_rxtx(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> static void reset_timer(struct timer_list *t)</div><div class='ctx'> {</div><div class='del'>-	struct netdev_private *np = from_timer(np, t, reset_timer);</div><div class='add'>+	struct netdev_private *np = timer_container_of(np, t, reset_timer);</div><div class='ctx'> 	struct net_device *dev = np-&gt;mii.dev;</div><div class='ctx'> 	unsigned long flags;</div><div class='ctx'> </div><div class='hunk'>@@ -1191,7 +1185,7 @@ static void reset_timer(struct timer_list *t)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-static void fealnx_tx_timeout(struct net_device *dev)</div><div class='add'>+static void fealnx_tx_timeout(struct net_device *dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> 	void __iomem *ioaddr = np-&gt;mem;</div><div class='hunk'>@@ -1265,8 +1259,10 @@ static void init_ring(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		++np-&gt;really_rx_count;</div><div class='ctx'> 		np-&gt;rx_ring[i].skbuff = skb;</div><div class='del'>-		np-&gt;rx_ring[i].buffer = pci_map_single(np-&gt;pci_dev, skb-&gt;data,</div><div class='del'>-			np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+		np-&gt;rx_ring[i].buffer = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+						       skb-&gt;data,</div><div class='add'>+						       np-&gt;rx_buf_sz,</div><div class='add'>+						       DMA_FROM_DEVICE);</div><div class='ctx'> 		np-&gt;rx_ring[i].status = RXOWN;</div><div class='ctx'> 		np-&gt;rx_ring[i].control |= RXIC;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1304,8 +1300,8 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> #define one_buffer</div><div class='ctx'> #define BPT 1022</div><div class='ctx'> #if defined(one_buffer)</div><div class='del'>-	np-&gt;cur_tx_copy-&gt;buffer = pci_map_single(np-&gt;pci_dev, skb-&gt;data,</div><div class='del'>-		skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+	np-&gt;cur_tx_copy-&gt;buffer = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev, skb-&gt;data,</div><div class='add'>+						 skb-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 	np-&gt;cur_tx_copy-&gt;control = TXIC | TXLD | TXFD | CRCEnable | PADEnable;</div><div class='ctx'> 	np-&gt;cur_tx_copy-&gt;control |= (skb-&gt;len &lt;&lt; PKTSShift);	/* pkt size */</div><div class='ctx'> 	np-&gt;cur_tx_copy-&gt;control |= (skb-&gt;len &lt;&lt; TBSShift);	/* buffer size */</div><div class='hunk'>@@ -1320,8 +1316,9 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		struct fealnx_desc *next;</div><div class='ctx'> </div><div class='ctx'> 		/* for the first descriptor */</div><div class='del'>-		np-&gt;cur_tx_copy-&gt;buffer = pci_map_single(np-&gt;pci_dev, skb-&gt;data,</div><div class='del'>-			BPT, PCI_DMA_TODEVICE);</div><div class='add'>+		np-&gt;cur_tx_copy-&gt;buffer = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							 skb-&gt;data, BPT,</div><div class='add'>+							 DMA_TO_DEVICE);</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;control = TXIC | TXFD | CRCEnable | PADEnable;</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;control |= (skb-&gt;len &lt;&lt; PKTSShift);	/* pkt size */</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;control |= (BPT &lt;&lt; TBSShift);	/* buffer size */</div><div class='hunk'>@@ -1335,8 +1332,9 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> // 89/12/29 add,</div><div class='ctx'> 		if (np-&gt;pci_dev-&gt;device == 0x891)</div><div class='ctx'> 			np-&gt;cur_tx_copy-&gt;control |= ETIControl | RetryTxLC;</div><div class='del'>-		next-&gt;buffer = pci_map_single(ep-&gt;pci_dev, skb-&gt;data + BPT,</div><div class='del'>-                                skb-&gt;len - BPT, PCI_DMA_TODEVICE);</div><div class='add'>+		next-&gt;buffer = dma_map_single(&amp;ep-&gt;pci_dev-&gt;dev,</div><div class='add'>+					      skb-&gt;data + BPT, skb-&gt;len - BPT,</div><div class='add'>+					      DMA_TO_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		next-&gt;status = TXOWN;</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;status = TXOWN;</div><div class='hunk'>@@ -1344,8 +1342,9 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)</div><div class='ctx'> 		np-&gt;cur_tx_copy = next-&gt;next_desc_logical;</div><div class='ctx'> 		np-&gt;free_tx_count -= 2;</div><div class='ctx'> 	} else {</div><div class='del'>-		np-&gt;cur_tx_copy-&gt;buffer = pci_map_single(np-&gt;pci_dev, skb-&gt;data,</div><div class='del'>-			skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+		np-&gt;cur_tx_copy-&gt;buffer = dma_map_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							 skb-&gt;data, skb-&gt;len,</div><div class='add'>+							 DMA_TO_DEVICE);</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;control = TXIC | TXLD | TXFD | CRCEnable | PADEnable;</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;control |= (skb-&gt;len &lt;&lt; PKTSShift);	/* pkt size */</div><div class='ctx'> 		np-&gt;cur_tx_copy-&gt;control |= (skb-&gt;len &lt;&lt; TBSShift);	/* buffer size */</div><div class='hunk'>@@ -1385,8 +1384,8 @@ static void reset_tx_descriptors(struct net_device *dev)</div><div class='ctx'> 	for (i = 0; i &lt; TX_RING_SIZE; i++) {</div><div class='ctx'> 		cur = &amp;np-&gt;tx_ring[i];</div><div class='ctx'> 		if (cur-&gt;skbuff) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev, cur-&gt;buffer,</div><div class='del'>-				cur-&gt;skbuff-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev, cur-&gt;buffer,</div><div class='add'>+					 cur-&gt;skbuff-&gt;len, DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb_any(cur-&gt;skbuff);</div><div class='ctx'> 			cur-&gt;skbuff = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1529,8 +1528,10 @@ static irqreturn_t intr_handler(int irq, void *dev_instance)</div><div class='ctx'> 			}</div><div class='ctx'> </div><div class='ctx'> 			/* Free the original skb. */</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev, np-&gt;cur_tx-&gt;buffer,</div><div class='del'>-				np-&gt;cur_tx-&gt;skbuff-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 np-&gt;cur_tx-&gt;buffer,</div><div class='add'>+					 np-&gt;cur_tx-&gt;skbuff-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_consume_skb_irq(np-&gt;cur_tx-&gt;skbuff);</div><div class='ctx'> 			np-&gt;cur_tx-&gt;skbuff = NULL;</div><div class='ctx'> 			--np-&gt;really_tx_count;</div><div class='hunk'>@@ -1696,10 +1697,10 @@ static int netdev_rx(struct net_device *dev)</div><div class='ctx'> 			if (pkt_len &lt; rx_copybreak &amp;&amp;</div><div class='ctx'> 			    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {</div><div class='ctx'> 				skb_reserve(skb, 2);	/* 16 byte align the IP header */</div><div class='del'>-				pci_dma_sync_single_for_cpu(np-&gt;pci_dev,</div><div class='del'>-							    np-&gt;cur_rx-&gt;buffer,</div><div class='del'>-							    np-&gt;rx_buf_sz,</div><div class='del'>-							    PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_cpu(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							np-&gt;cur_rx-&gt;buffer,</div><div class='add'>+							np-&gt;rx_buf_sz,</div><div class='add'>+							DMA_FROM_DEVICE);</div><div class='ctx'> 				/* Call copy + cksum if available. */</div><div class='ctx'> </div><div class='ctx'> #if ! defined(__alpha__)</div><div class='hunk'>@@ -1710,15 +1711,15 @@ static int netdev_rx(struct net_device *dev)</div><div class='ctx'> 				skb_put_data(skb, np-&gt;cur_rx-&gt;skbuff-&gt;data,</div><div class='ctx'> 					     pkt_len);</div><div class='ctx'> #endif</div><div class='del'>-				pci_dma_sync_single_for_device(np-&gt;pci_dev,</div><div class='del'>-							       np-&gt;cur_rx-&gt;buffer,</div><div class='del'>-							       np-&gt;rx_buf_sz,</div><div class='del'>-							       PCI_DMA_FROMDEVICE);</div><div class='add'>+				dma_sync_single_for_device(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+							   np-&gt;cur_rx-&gt;buffer,</div><div class='add'>+							   np-&gt;rx_buf_sz,</div><div class='add'>+							   DMA_FROM_DEVICE);</div><div class='ctx'> 			} else {</div><div class='del'>-				pci_unmap_single(np-&gt;pci_dev,</div><div class='add'>+				dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='ctx'> 						 np-&gt;cur_rx-&gt;buffer,</div><div class='ctx'> 						 np-&gt;rx_buf_sz,</div><div class='del'>-						 PCI_DMA_FROMDEVICE);</div><div class='add'>+						 DMA_FROM_DEVICE);</div><div class='ctx'> 				skb_put(skb = np-&gt;cur_rx-&gt;skbuff, pkt_len);</div><div class='ctx'> 				np-&gt;cur_rx-&gt;skbuff = NULL;</div><div class='ctx'> 				--np-&gt;really_rx_count;</div><div class='hunk'>@@ -1808,9 +1809,8 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_private *np = netdev_priv(dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='del'>-	strlcpy(info-&gt;version, DRV_VERSION, sizeof(info-&gt;version));</div><div class='del'>-	strlcpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='add'>+	strscpy(info-&gt;driver, DRV_NAME, sizeof(info-&gt;driver));</div><div class='add'>+	strscpy(info-&gt;bus_info, pci_name(np-&gt;pci_dev), sizeof(info-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int netdev_get_link_ksettings(struct net_device *dev,</div><div class='hunk'>@@ -1900,8 +1900,8 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 	/* Stop the chip's Tx and Rx processes. */</div><div class='ctx'> 	stop_nic_rxtx(ioaddr, 0);</div><div class='ctx'> </div><div class='del'>-	del_timer_sync(&amp;np-&gt;timer);</div><div class='del'>-	del_timer_sync(&amp;np-&gt;reset_timer);</div><div class='add'>+	timer_delete_sync(&amp;np-&gt;timer);</div><div class='add'>+	timer_delete_sync(&amp;np-&gt;reset_timer);</div><div class='ctx'> </div><div class='ctx'> 	free_irq(np-&gt;pci_dev-&gt;irq, dev);</div><div class='ctx'> </div><div class='hunk'>@@ -1911,8 +1911,9 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> </div><div class='ctx'> 		np-&gt;rx_ring[i].status = 0;</div><div class='ctx'> 		if (skb) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev, np-&gt;rx_ring[i].buffer,</div><div class='del'>-				np-&gt;rx_buf_sz, PCI_DMA_FROMDEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 np-&gt;rx_ring[i].buffer, np-&gt;rx_buf_sz,</div><div class='add'>+					 DMA_FROM_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;rx_ring[i].skbuff = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1922,8 +1923,9 @@ static int netdev_close(struct net_device *dev)</div><div class='ctx'> 		struct sk_buff *skb = np-&gt;tx_ring[i].skbuff;</div><div class='ctx'> </div><div class='ctx'> 		if (skb) {</div><div class='del'>-			pci_unmap_single(np-&gt;pci_dev, np-&gt;tx_ring[i].buffer,</div><div class='del'>-				skb-&gt;len, PCI_DMA_TODEVICE);</div><div class='add'>+			dma_unmap_single(&amp;np-&gt;pci_dev-&gt;dev,</div><div class='add'>+					 np-&gt;tx_ring[i].buffer, skb-&gt;len,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='ctx'> 			dev_kfree_skb(skb);</div><div class='ctx'> 			np-&gt;tx_ring[i].skbuff = NULL;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1948,20 +1950,4 @@ static struct pci_driver fealnx_driver = {</div><div class='ctx'> 	.remove		= fealnx_remove_one,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static int __init fealnx_init(void)</div><div class='del'>-{</div><div class='del'>-/* when a module, this is printed whether or not devices are found in probe */</div><div class='del'>-#ifdef MODULE</div><div class='del'>-	printk(version);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return pci_register_driver(&amp;fealnx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void __exit fealnx_exit(void)</div><div class='del'>-{</div><div class='del'>-	pci_unregister_driver(&amp;fealnx_driver);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-module_init(fealnx_init);</div><div class='del'>-module_exit(fealnx_exit);</div><div class='add'>+module_pci_driver(fealnx_driver);</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig<br/>index 6a7e8993119f..e2a591cf9601 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/Kconfig</a></div><div class='hunk'>@@ -9,8 +9,8 @@ config NET_VENDOR_FREESCALE</div><div class='ctx'> 	depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \</div><div class='ctx'> 		   M523x || M527x || M5272 || M528x || M520x || M532x || \</div><div class='ctx'> 		   ARCH_MXC || ARCH_MXS || (PPC_MPC52xx &amp;&amp; PPC_BESTCOMM) || \</div><div class='del'>-		   ARCH_LAYERSCAPE || COMPILE_TEST</div><div class='del'>-	---help---</div><div class='add'>+		   ARCH_LAYERSCAPE || ARCH_S32 || COMPILE_TEST</div><div class='add'>+	help</div><div class='ctx'> 	  If you have a network (Ethernet) card belonging to this class, say Y.</div><div class='ctx'> </div><div class='ctx'> 	  Note that the answer to this question doesn't directly affect the</div><div class='hunk'>@@ -23,13 +23,18 @@ if NET_VENDOR_FREESCALE</div><div class='ctx'> config FEC</div><div class='ctx'> 	tristate "FEC ethernet controller (of ColdFire and some i.MX CPUs)"</div><div class='ctx'> 	depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \</div><div class='del'>-		   ARCH_MXC || SOC_IMX28 || COMPILE_TEST)</div><div class='add'>+		   ARCH_MXC || ARCH_S32 || SOC_IMX28 || COMPILE_TEST)</div><div class='ctx'> 	default ARCH_MXC || SOC_IMX28 if ARM</div><div class='add'>+	depends on PTP_1588_CLOCK_OPTIONAL</div><div class='add'>+	select CRC32</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='del'>-	---help---</div><div class='add'>+	select FIXED_PHY if M5272</div><div class='add'>+	select PAGE_POOL</div><div class='add'>+	imply PAGE_POOL_STATS</div><div class='add'>+	imply NET_SELFTESTS</div><div class='add'>+	help</div><div class='ctx'> 	  Say Y here if you want to use the built-in 10/100 Fast ethernet</div><div class='del'>-	  controller on some Motorola ColdFire and Freescale i.MX processors.</div><div class='add'>+	  controller on some Motorola ColdFire and Freescale i.MX/S32 processors.</div><div class='ctx'> </div><div class='ctx'> config FEC_MPC52xx</div><div class='ctx'> 	tristate "FEC MPC52xx driver"</div><div class='hunk'>@@ -37,7 +42,7 @@ config FEC_MPC52xx</div><div class='ctx'> 	select CRC32</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	select PPC_BESTCOMM_FEC</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This option enables support for the MPC5200's on-chip</div><div class='ctx'> 	  Fast Ethernet Controller</div><div class='ctx'> 	  If compiled as module, it will be called fec_mpc52xx.</div><div class='hunk'>@@ -46,7 +51,7 @@ config FEC_MPC52xx_MDIO</div><div class='ctx'> 	bool "FEC MPC52xx MDIO bus driver"</div><div class='ctx'> 	depends on FEC_MPC52xx</div><div class='ctx'> 	default y</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  The MPC5200's FEC can connect to the Ethernet either with</div><div class='ctx'> 	  an external MII PHY chip or 10 Mbps 7-wire interface</div><div class='ctx'> 	  (Motorola? industry standard).</div><div class='hunk'>@@ -60,7 +65,7 @@ source "drivers/net/ethernet/freescale/fman/Kconfig"</div><div class='ctx'> config FSL_PQ_MDIO</div><div class='ctx'> 	tristate "Freescale PQ MDIO"</div><div class='ctx'> 	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the MDIO bus used by the gianfar and UCC drivers.</div><div class='ctx'> </div><div class='ctx'> config FSL_XGMAC_MDIO</div><div class='hunk'>@@ -68,16 +73,16 @@ config FSL_XGMAC_MDIO</div><div class='ctx'> 	select PHYLIB</div><div class='ctx'> 	depends on OF</div><div class='ctx'> 	select OF_MDIO</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the MDIO bus on the Fman 10G Ethernet MACs, and</div><div class='ctx'> 	  on the FMan mEMAC (which supports both Clauses 22 and 45)</div><div class='ctx'> </div><div class='ctx'> config UCC_GETH</div><div class='ctx'> 	tristate "Freescale QE Gigabit Ethernet"</div><div class='del'>-	depends on QUICC_ENGINE</div><div class='add'>+	depends on QUICC_ENGINE &amp;&amp; PPC32</div><div class='ctx'> 	select FSL_PQ_MDIO</div><div class='del'>-	select PHYLIB</div><div class='del'>-	---help---</div><div class='add'>+	select PHYLINK</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Gigabit Ethernet mode of the QUICC Engine,</div><div class='ctx'> 	  which is available on some Freescale SOCs.</div><div class='ctx'> </div><div class='hunk'>@@ -90,8 +95,9 @@ config GIANFAR</div><div class='ctx'> 	depends on HAS_DMA</div><div class='ctx'> 	select FSL_PQ_MDIO</div><div class='ctx'> 	select PHYLIB</div><div class='add'>+	select FIXED_PHY</div><div class='ctx'> 	select CRC32</div><div class='del'>-	---help---</div><div class='add'>+	help</div><div class='ctx'> 	  This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,</div><div class='ctx'> 	  and MPC86xx family of chips, the eTSEC on LS1021A and the FEC</div><div class='ctx'> 	  on the 8540.</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile<br/>index 6a93293d31e0..de7b31842233 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/Makefile</a></div><div class='hunk'>@@ -24,5 +24,4 @@ obj-$(CONFIG_FSL_DPAA_ETH) += dpaa/</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FSL_DPAA2_ETH) += dpaa2/</div><div class='ctx'> </div><div class='del'>-obj-$(CONFIG_FSL_ENETC) += enetc/</div><div class='del'>-obj-$(CONFIG_FSL_ENETC_VF) += enetc/</div><div class='add'>+obj-y += enetc/</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa/Kconfig b/drivers/net/ethernet/freescale/dpaa/Kconfig<br/>index 3b325733a4f8..2b560661c82a 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa/Kconfig</a></div><div class='hunk'>@@ -2,9 +2,9 @@</div><div class='ctx'> menuconfig FSL_DPAA_ETH</div><div class='ctx'> 	tristate "DPAA Ethernet"</div><div class='ctx'> 	depends on FSL_DPAA &amp;&amp; FSL_FMAN</div><div class='del'>-	select PHYLIB</div><div class='del'>-	select FSL_FMAN_MAC</div><div class='del'>-	---help---</div><div class='add'>+	select PHYLINK</div><div class='add'>+	select PCS_LYNX</div><div class='add'>+	help</div><div class='ctx'> 	  Data Path Acceleration Architecture Ethernet driver,</div><div class='ctx'> 	  supporting the Freescale QorIQ chips.</div><div class='ctx'> 	  Depends on Freescale Buffer Manager and Queue Manager</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c<br/>index f38c3fa7d705..3edc8d142dd5 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.c</a></div><div class='hunk'>@@ -1,38 +1,14 @@</div><div class='del'>-/* Copyright 2008 - 2016 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *	 documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *	 names of its contributors may be used to endorse or promote products</div><div class='del'>- *	 derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 - 2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2020 NXP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='add'>+#include &lt;linux/mod_devicetable.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/of_platform.h&gt;</div><div class='ctx'> #include &lt;linux/of_mdio.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/io.h&gt;</div><div class='hunk'>@@ -41,6 +17,7 @@</div><div class='ctx'> #include &lt;linux/icmp.h&gt;</div><div class='ctx'> #include &lt;linux/ip.h&gt;</div><div class='ctx'> #include &lt;linux/ipv6.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/udp.h&gt;</div><div class='ctx'> #include &lt;linux/tcp.h&gt;</div><div class='ctx'> #include &lt;linux/net.h&gt;</div><div class='hunk'>@@ -51,7 +28,8 @@</div><div class='ctx'> #include &lt;linux/percpu.h&gt;</div><div class='ctx'> #include &lt;linux/dma-mapping.h&gt;</div><div class='ctx'> #include &lt;linux/sort.h&gt;</div><div class='del'>-#include &lt;linux/phy_fixed.h&gt;</div><div class='add'>+#include &lt;linux/bpf.h&gt;</div><div class='add'>+#include &lt;linux/bpf_trace.h&gt;</div><div class='ctx'> #include &lt;soc/fsl/bman.h&gt;</div><div class='ctx'> #include &lt;soc/fsl/qman.h&gt;</div><div class='ctx'> #include "fman.h"</div><div class='hunk'>@@ -86,7 +64,7 @@ MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms");</div><div class='ctx'> </div><div class='ctx'> #define DPAA_MSG_DEFAULT (NETIF_MSG_DRV | NETIF_MSG_PROBE | \</div><div class='ctx'> 			  NETIF_MSG_LINK | NETIF_MSG_IFUP | \</div><div class='del'>-			  NETIF_MSG_IFDOWN)</div><div class='add'>+			  NETIF_MSG_IFDOWN | NETIF_MSG_HW)</div><div class='ctx'> </div><div class='ctx'> #define DPAA_INGRESS_CS_THRESHOLD 0x10000000</div><div class='ctx'> /* Ingress congestion threshold on FMan ports</div><div class='hunk'>@@ -123,7 +101,22 @@ MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms");</div><div class='ctx'> #define FSL_QMAN_MAX_OAL	127</div><div class='ctx'> </div><div class='ctx'> /* Default alignment for start of data in an Rx FD */</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+/* aligning data start to 64 avoids DMA transaction splits, unless the buffer</div><div class='add'>+ * is crossing a 4k page boundary</div><div class='add'>+ */</div><div class='add'>+#define DPAA_FD_DATA_ALIGNMENT  (fman_has_errata_a050385() ? 64 : 16)</div><div class='add'>+/* aligning to 256 avoids DMA transaction splits caused by 4k page boundary</div><div class='add'>+ * crossings; also, all SG fragments except the last must have a size multiple</div><div class='add'>+ * of 256 to avoid DMA transaction splits</div><div class='add'>+ */</div><div class='add'>+#define DPAA_A050385_ALIGN 256</div><div class='add'>+#define DPAA_FD_RX_DATA_ALIGNMENT (fman_has_errata_a050385() ? \</div><div class='add'>+				   DPAA_A050385_ALIGN : 16)</div><div class='add'>+#else</div><div class='ctx'> #define DPAA_FD_DATA_ALIGNMENT  16</div><div class='add'>+#define DPAA_FD_RX_DATA_ALIGNMENT DPAA_FD_DATA_ALIGNMENT</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> /* The DPAA requires 256 bytes reserved and mapped for the SGT */</div><div class='ctx'> #define DPAA_SGT_SIZE 256</div><div class='hunk'>@@ -158,8 +151,18 @@ MODULE_PARM_DESC(tx_timeout, "The Tx timeout in ms");</div><div class='ctx'> #define DPAA_PARSE_RESULTS_SIZE sizeof(struct fman_prs_result)</div><div class='ctx'> #define DPAA_TIME_STAMP_SIZE 8</div><div class='ctx'> #define DPAA_HASH_RESULTS_SIZE 8</div><div class='del'>-#define DPAA_RX_PRIV_DATA_SIZE	(u16)(DPAA_TX_PRIV_DATA_SIZE + \</div><div class='del'>-					dpaa_rx_extra_headroom)</div><div class='add'>+#define DPAA_HWA_SIZE (DPAA_PARSE_RESULTS_SIZE + DPAA_TIME_STAMP_SIZE \</div><div class='add'>+		       + DPAA_HASH_RESULTS_SIZE)</div><div class='add'>+#define DPAA_RX_PRIV_DATA_DEFAULT_SIZE (DPAA_TX_PRIV_DATA_SIZE + \</div><div class='add'>+					XDP_PACKET_HEADROOM - DPAA_HWA_SIZE)</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+#define DPAA_RX_PRIV_DATA_A050385_SIZE (DPAA_A050385_ALIGN - DPAA_HWA_SIZE)</div><div class='add'>+#define DPAA_RX_PRIV_DATA_SIZE (fman_has_errata_a050385() ? \</div><div class='add'>+				DPAA_RX_PRIV_DATA_A050385_SIZE : \</div><div class='add'>+				DPAA_RX_PRIV_DATA_DEFAULT_SIZE)</div><div class='add'>+#else</div><div class='add'>+#define DPAA_RX_PRIV_DATA_SIZE DPAA_RX_PRIV_DATA_DEFAULT_SIZE</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> #define DPAA_ETH_PCD_RXQ_NUM	128</div><div class='ctx'> </div><div class='hunk'>@@ -178,31 +181,14 @@ struct fm_port_fqs {</div><div class='ctx'> /* All the dpa bps in use at any moment */</div><div class='ctx'> static struct dpaa_bp *dpaa_bp_array[BM_MAX_NUM_OF_POOLS];</div><div class='ctx'> </div><div class='del'>-/* The raw buffer size must be cacheline aligned */</div><div class='ctx'> #define DPAA_BP_RAW_SIZE 4096</div><div class='del'>-/* When using more than one buffer pool, the raw sizes are as follows:</div><div class='del'>- * 1 bp: 4KB</div><div class='del'>- * 2 bp: 2KB, 4KB</div><div class='del'>- * 3 bp: 1KB, 2KB, 4KB</div><div class='del'>- * 4 bp: 1KB, 2KB, 4KB, 8KB</div><div class='del'>- */</div><div class='del'>-static inline size_t bpool_buffer_raw_size(u8 index, u8 cnt)</div><div class='del'>-{</div><div class='del'>-	size_t res = DPAA_BP_RAW_SIZE / 4;</div><div class='del'>-	u8 i;</div><div class='del'>-</div><div class='del'>-	for (i = (cnt &lt; 3) ? cnt : 3; i &lt; 3 + index; i++)</div><div class='del'>-		res *= 2;</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='ctx'> </div><div class='del'>-/* FMan-DMA requires 16-byte alignment for Rx buffers, but SKB_DATA_ALIGN is</div><div class='del'>- * even stronger (SMP_CACHE_BYTES-aligned), so we just get away with that,</div><div class='del'>- * via SKB_WITH_OVERHEAD(). We can't rely on netdev_alloc_frag() giving us</div><div class='del'>- * half-page-aligned buffers, so we reserve some more space for start-of-buffer</div><div class='del'>- * alignment.</div><div class='del'>- */</div><div class='del'>-#define dpaa_bp_size(raw_size) SKB_WITH_OVERHEAD((raw_size) - SMP_CACHE_BYTES)</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+#define dpaa_bp_size(raw_size) (SKB_WITH_OVERHEAD(raw_size) &amp; \</div><div class='add'>+				~(DPAA_A050385_ALIGN - 1))</div><div class='add'>+#else</div><div class='add'>+#define dpaa_bp_size(raw_size) SKB_WITH_OVERHEAD(raw_size)</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='ctx'> static int dpaa_max_frm;</div><div class='ctx'> </div><div class='hunk'>@@ -211,12 +197,15 @@ static int dpaa_rx_extra_headroom;</div><div class='ctx'> #define dpaa_get_max_mtu()	\</div><div class='ctx'> 	(dpaa_max_frm - (VLAN_ETH_HLEN + ETH_FCS_LEN))</div><div class='ctx'> </div><div class='add'>+static void dpaa_eth_cgr_set_speed(struct mac_device *mac_dev, int speed);</div><div class='add'>+</div><div class='ctx'> static int dpaa_netdev_init(struct net_device *net_dev,</div><div class='ctx'> 			    const struct net_device_ops *dpaa_ops,</div><div class='ctx'> 			    u16 tx_timeout)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	const u8 *mac_addr;</div><div class='ctx'> 	int i, err;</div><div class='hunk'>@@ -230,16 +219,16 @@ static int dpaa_netdev_init(struct net_device *net_dev,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;netdev_ops = dpaa_ops;</div><div class='del'>-	mac_addr = priv-&gt;mac_dev-&gt;addr;</div><div class='add'>+	mac_addr = mac_dev-&gt;addr;</div><div class='ctx'> </div><div class='del'>-	net_dev-&gt;mem_start = priv-&gt;mac_dev-&gt;res-&gt;start;</div><div class='del'>-	net_dev-&gt;mem_end = priv-&gt;mac_dev-&gt;res-&gt;end;</div><div class='add'>+	net_dev-&gt;mem_start = (unsigned long)priv-&gt;mac_dev-&gt;res-&gt;start;</div><div class='add'>+	net_dev-&gt;mem_end = (unsigned long)priv-&gt;mac_dev-&gt;res-&gt;end;</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='ctx'> 	net_dev-&gt;max_mtu = dpaa_get_max_mtu();</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;hw_features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='del'>-				 NETIF_F_LLTX | NETIF_F_RXHASH);</div><div class='add'>+				 NETIF_F_RXHASH);</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;hw_features |= NETIF_F_SG | NETIF_F_HIGHDMA;</div><div class='ctx'> 	/* The kernels enables GSO automatically, if we declare NETIF_F_SG.</div><div class='hunk'>@@ -249,26 +238,58 @@ static int dpaa_netdev_init(struct net_device *net_dev,</div><div class='ctx'> 	net_dev-&gt;features |= NETIF_F_RXCSUM;</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='add'>+	net_dev-&gt;lltx = true;</div><div class='ctx'> 	/* we do not want shared skbs on TX */</div><div class='ctx'> 	net_dev-&gt;priv_flags &amp;= ~IFF_TX_SKB_SHARING;</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;features |= net_dev-&gt;hw_features;</div><div class='ctx'> 	net_dev-&gt;vlan_features = net_dev-&gt;features;</div><div class='ctx'> </div><div class='del'>-	memcpy(net_dev-&gt;perm_addr, mac_addr, net_dev-&gt;addr_len);</div><div class='del'>-	memcpy(net_dev-&gt;dev_addr, mac_addr, net_dev-&gt;addr_len);</div><div class='add'>+	net_dev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC |</div><div class='add'>+				NETDEV_XDP_ACT_REDIRECT |</div><div class='add'>+				NETDEV_XDP_ACT_NDO_XMIT;</div><div class='add'>+</div><div class='add'>+	if (is_valid_ether_addr(mac_addr)) {</div><div class='add'>+		memcpy(net_dev-&gt;perm_addr, mac_addr, net_dev-&gt;addr_len);</div><div class='add'>+		eth_hw_addr_set(net_dev, mac_addr);</div><div class='add'>+	} else {</div><div class='add'>+		eth_hw_addr_random(net_dev);</div><div class='add'>+		err = mac_dev-&gt;change_addr(mac_dev-&gt;fman_mac,</div><div class='add'>+			(const enet_addr_t *)net_dev-&gt;dev_addr);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "Failed to set random MAC address\n");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		dev_info(dev, "Using random MAC address: %pM\n",</div><div class='add'>+			 net_dev-&gt;dev_addr);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;ethtool_ops = &amp;dpaa_ethtool_ops;</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;needed_headroom = priv-&gt;tx_headroom;</div><div class='ctx'> 	net_dev-&gt;watchdog_timeo = msecs_to_jiffies(tx_timeout);</div><div class='ctx'> </div><div class='add'>+	/* The rest of the config is filled in by the mac device already */</div><div class='add'>+	mac_dev-&gt;phylink_config.dev = &amp;net_dev-&gt;dev;</div><div class='add'>+	mac_dev-&gt;phylink_config.type = PHYLINK_NETDEV;</div><div class='add'>+	mac_dev-&gt;update_speed = dpaa_eth_cgr_set_speed;</div><div class='add'>+	mac_dev-&gt;phylink = phylink_create(&amp;mac_dev-&gt;phylink_config,</div><div class='add'>+					  dev_fwnode(mac_dev-&gt;dev),</div><div class='add'>+					  mac_dev-&gt;phy_if,</div><div class='add'>+					  mac_dev-&gt;phylink_ops);</div><div class='add'>+	if (IS_ERR(mac_dev-&gt;phylink)) {</div><div class='add'>+		err = PTR_ERR(mac_dev-&gt;phylink);</div><div class='add'>+		dev_err_probe(dev, err, "Could not create phylink\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* start without the RUNNING flag, phylib controls it later */</div><div class='ctx'> 	netif_carrier_off(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	err = register_netdev(net_dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "register_netdev() = %d\n", err);</div><div class='add'>+		phylink_destroy(mac_dev-&gt;phylink);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -279,7 +300,8 @@ static int dpaa_stop(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_device *mac_dev;</div><div class='ctx'> 	struct dpaa_priv *priv;</div><div class='del'>-	int i, err, error;</div><div class='add'>+	int i, error;</div><div class='add'>+	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(net_dev);</div><div class='ctx'> 	mac_dev = priv-&gt;mac_dev;</div><div class='hunk'>@@ -288,12 +310,10 @@ static int dpaa_stop(struct net_device *net_dev)</div><div class='ctx'> 	/* Allow the Fman (Tx) port to process in-flight frames before we</div><div class='ctx'> 	 * try switching it off.</div><div class='ctx'> 	 */</div><div class='del'>-	usleep_range(5000, 10000);</div><div class='add'>+	msleep(200);</div><div class='ctx'> </div><div class='del'>-	err = mac_dev-&gt;stop(mac_dev);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		netif_err(priv, ifdown, net_dev, "mac_dev-&gt;stop() = %d\n",</div><div class='del'>-			  err);</div><div class='add'>+	phylink_stop(mac_dev-&gt;phylink);</div><div class='add'>+	mac_dev-&gt;disable(mac_dev-&gt;fman_mac);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mac_dev-&gt;port); i++) {</div><div class='ctx'> 		error = fman_port_disable(mac_dev-&gt;port[i]);</div><div class='hunk'>@@ -301,14 +321,15 @@ static int dpaa_stop(struct net_device *net_dev)</div><div class='ctx'> 			err = error;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (net_dev-&gt;phydev)</div><div class='del'>-		phy_disconnect(net_dev-&gt;phydev);</div><div class='add'>+	phylink_disconnect_phy(mac_dev-&gt;phylink);</div><div class='ctx'> 	net_dev-&gt;phydev = NULL;</div><div class='ctx'> </div><div class='add'>+	msleep(200);</div><div class='add'>+</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dpaa_tx_timeout(struct net_device *net_dev)</div><div class='add'>+static void dpaa_tx_timeout(struct net_device *net_dev, unsigned int txqueue)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	const struct dpaa_priv	*priv;</div><div class='hunk'>@@ -350,6 +371,7 @@ static int dpaa_setup_tc(struct net_device *net_dev, enum tc_setup_type type,</div><div class='ctx'> 			 void *type_data)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int num_txqs_per_tc = dpaa_num_txqs_per_tc();</div><div class='ctx'> 	struct tc_mqprio_qopt *mqprio = type_data;</div><div class='ctx'> 	u8 num_tc;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -377,12 +399,12 @@ static int dpaa_setup_tc(struct net_device *net_dev, enum tc_setup_type type,</div><div class='ctx'> 	netdev_set_num_tc(net_dev, num_tc);</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; num_tc; i++)</div><div class='del'>-		netdev_set_tc_queue(net_dev, i, DPAA_TC_TXQ_NUM,</div><div class='del'>-				    i * DPAA_TC_TXQ_NUM);</div><div class='add'>+		netdev_set_tc_queue(net_dev, i, num_txqs_per_tc,</div><div class='add'>+				    i * num_txqs_per_tc);</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='ctx'> 	priv-&gt;num_tc = num_tc ? : 1;</div><div class='del'>-	netif_set_real_num_tx_queues(net_dev, priv-&gt;num_tc * DPAA_TC_TXQ_NUM);</div><div class='add'>+	netif_set_real_num_tx_queues(net_dev, priv-&gt;num_tc * num_txqs_per_tc);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -427,7 +449,7 @@ static int dpaa_set_mac_address(struct net_device *net_dev, void *addr)</div><div class='ctx'> 	mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> </div><div class='ctx'> 	err = mac_dev-&gt;change_addr(mac_dev-&gt;fman_mac,</div><div class='del'>-				   (enet_addr_t *)net_dev-&gt;dev_addr);</div><div class='add'>+				   (const enet_addr_t *)net_dev-&gt;dev_addr);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		netif_err(priv, drv, net_dev, "mac_dev-&gt;change_addr() = %d\n",</div><div class='ctx'> 			  err);</div><div class='hunk'>@@ -440,6 +462,22 @@ static int dpaa_set_mac_address(struct net_device *net_dev, void *addr)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa_addr_sync(struct net_device *net_dev, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	const struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;mac_dev-&gt;add_hash_mac_addr(priv-&gt;mac_dev-&gt;fman_mac,</div><div class='add'>+						(enet_addr_t *)addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_addr_unsync(struct net_device *net_dev, const u8 *addr)</div><div class='add'>+{</div><div class='add'>+	const struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;mac_dev-&gt;remove_hash_mac_addr(priv-&gt;mac_dev-&gt;fman_mac,</div><div class='add'>+						   (enet_addr_t *)addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void dpaa_set_rx_mode(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	const struct dpaa_priv	*priv;</div><div class='hunk'>@@ -467,9 +505,9 @@ static void dpaa_set_rx_mode(struct net_device *net_dev)</div><div class='ctx'> 				  err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = priv-&gt;mac_dev-&gt;set_multi(net_dev, priv-&gt;mac_dev);</div><div class='add'>+	err = __dev_mc_sync(net_dev, dpaa_addr_sync, dpaa_addr_unsync);</div><div class='ctx'> 	if (err &lt; 0)</div><div class='del'>-		netif_err(priv, drv, net_dev, "mac_dev-&gt;set_multi() = %d\n",</div><div class='add'>+		netif_err(priv, drv, net_dev, "dpaa_addr_sync() = %d\n",</div><div class='ctx'> 			  err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -485,7 +523,7 @@ static struct dpaa_bp *dpaa_bpid2pool(int bpid)</div><div class='ctx'> static bool dpaa_bpid2pool_use(int bpid)</div><div class='ctx'> {</div><div class='ctx'> 	if (dpaa_bpid2pool(bpid)) {</div><div class='del'>-		atomic_inc(&amp;dpaa_bp_array[bpid]-&gt;refs);</div><div class='add'>+		refcount_inc(&amp;dpaa_bp_array[bpid]-&gt;refs);</div><div class='ctx'> 		return true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -496,7 +534,7 @@ static bool dpaa_bpid2pool_use(int bpid)</div><div class='ctx'> static void dpaa_bpid2pool_map(int bpid, struct dpaa_bp *dpaa_bp)</div><div class='ctx'> {</div><div class='ctx'> 	dpaa_bp_array[bpid] = dpaa_bp;</div><div class='del'>-	atomic_set(&amp;dpaa_bp-&gt;refs, 1);</div><div class='add'>+	refcount_set(&amp;dpaa_bp-&gt;refs, 1);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_bp_alloc_pool(struct dpaa_bp *dpaa_bp)</div><div class='hunk'>@@ -584,7 +622,7 @@ static void dpaa_bp_free(struct dpaa_bp *dpaa_bp)</div><div class='ctx'> 	if (!bp)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	if (!atomic_dec_and_test(&amp;bp-&gt;refs))</div><div class='add'>+	if (!refcount_dec_and_test(&amp;bp-&gt;refs))</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='ctx'> 	if (bp-&gt;free_buf_cb)</div><div class='hunk'>@@ -596,10 +634,7 @@ static void dpaa_bp_free(struct dpaa_bp *dpaa_bp)</div><div class='ctx'> </div><div class='ctx'> static void dpaa_bps_free(struct dpaa_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; DPAA_BPS_NUM; i++)</div><div class='del'>-		dpaa_bp_free(priv-&gt;dpaa_bps[i]);</div><div class='add'>+	dpaa_bp_free(priv-&gt;dpaa_bp);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Use multiple WQs for FQ assignment:</div><div class='hunk'>@@ -631,7 +666,7 @@ static inline void dpaa_assign_wq(struct dpaa_fq *fq, int idx)</div><div class='ctx'> 		fq-&gt;wq = 6;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case FQ_TYPE_TX:</div><div class='del'>-		switch (idx / DPAA_TC_TXQ_NUM) {</div><div class='add'>+		switch (idx / dpaa_num_txqs_per_tc()) {</div><div class='ctx'> 		case 0:</div><div class='ctx'> 			/* Low priority (best effort) */</div><div class='ctx'> 			fq-&gt;wq = 6;</div><div class='hunk'>@@ -649,8 +684,8 @@ static inline void dpaa_assign_wq(struct dpaa_fq *fq, int idx)</div><div class='ctx'> 			fq-&gt;wq = 0;</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='del'>-			WARN(1, "Too many TX FQs: more than %d!\n",</div><div class='del'>-			     DPAA_ETH_TXQ_NUM);</div><div class='add'>+			WARN(1, "Too many TX FQs: more than %zu!\n",</div><div class='add'>+			     dpaa_max_num_txqs());</div><div class='ctx'> 		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='hunk'>@@ -722,7 +757,8 @@ static int dpaa_alloc_all_fqs(struct device *dev, struct list_head *list,</div><div class='ctx'> </div><div class='ctx'> 	port_fqs-&gt;rx_pcdq = &amp;dpaa_fq[0];</div><div class='ctx'> </div><div class='del'>-	if (!dpaa_fq_alloc(dev, 0, DPAA_ETH_TXQ_NUM, list, FQ_TYPE_TX_CONF_MQ))</div><div class='add'>+	if (!dpaa_fq_alloc(dev, 0, dpaa_max_num_txqs(), list,</div><div class='add'>+			   FQ_TYPE_TX_CONF_MQ))</div><div class='ctx'> 		goto fq_alloc_failed;</div><div class='ctx'> </div><div class='ctx'> 	dpaa_fq = dpaa_fq_alloc(dev, 0, 1, list, FQ_TYPE_TX_ERROR);</div><div class='hunk'>@@ -737,7 +773,7 @@ static int dpaa_alloc_all_fqs(struct device *dev, struct list_head *list,</div><div class='ctx'> </div><div class='ctx'> 	port_fqs-&gt;tx_defq = &amp;dpaa_fq[0];</div><div class='ctx'> </div><div class='del'>-	if (!dpaa_fq_alloc(dev, 0, DPAA_ETH_TXQ_NUM, list, FQ_TYPE_TX))</div><div class='add'>+	if (!dpaa_fq_alloc(dev, 0, dpaa_max_num_txqs(), list, FQ_TYPE_TX))</div><div class='ctx'> 		goto fq_alloc_failed;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -773,7 +809,7 @@ static void dpaa_release_channel(void)</div><div class='ctx'> 	qman_release_pool(rx_pool_channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dpaa_eth_add_channel(u16 channel)</div><div class='add'>+static void dpaa_eth_add_channel(u16 channel, struct device *dev)</div><div class='ctx'> {</div><div class='ctx'> 	u32 pool = QM_SDQCR_CHANNELS_POOL_CONV(channel);</div><div class='ctx'> 	const cpumask_t *cpus = qman_affine_cpus();</div><div class='hunk'>@@ -783,6 +819,7 @@ static void dpaa_eth_add_channel(u16 channel)</div><div class='ctx'> 	for_each_cpu_and(cpu, cpus, cpu_online_mask) {</div><div class='ctx'> 		portal = qman_get_affine_portal(cpu);</div><div class='ctx'> 		qman_p_static_dequeue_add(portal, pool);</div><div class='add'>+		qman_start_using_portal(portal, dev);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -828,12 +865,12 @@ static int dpaa_eth_cgr_init(struct dpaa_priv *priv)</div><div class='ctx'> 	initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CSCN_EN | QM_CGR_WE_CS_THRES);</div><div class='ctx'> 	initcgr.cgr.cscn_en = QM_CGR_EN;</div><div class='ctx'> </div><div class='del'>-	/* Set different thresholds based on the MAC speed.</div><div class='del'>-	 * This may turn suboptimal if the MAC is reconfigured at a speed</div><div class='del'>-	 * lower than its max, e.g. if a dTSEC later negotiates a 100Mbps link.</div><div class='del'>-	 * In such cases, we ought to reconfigure the threshold, too.</div><div class='add'>+	/* Set different thresholds based on the configured MAC speed.</div><div class='add'>+	 * This may turn suboptimal if the MAC is reconfigured at another</div><div class='add'>+	 * speed, so MACs must call dpaa_eth_cgr_set_speed in their link_up</div><div class='add'>+	 * callback.</div><div class='ctx'> 	 */</div><div class='del'>-	if (priv-&gt;mac_dev-&gt;if_support &amp; SUPPORTED_10000baseT_Full)</div><div class='add'>+	if (priv-&gt;mac_dev-&gt;phylink_config.mac_capabilities &amp; MAC_10000FD)</div><div class='ctx'> 		cs_th = DPAA_CS_THRESHOLD_10G;</div><div class='ctx'> 	else</div><div class='ctx'> 		cs_th = DPAA_CS_THRESHOLD_1G;</div><div class='hunk'>@@ -860,6 +897,31 @@ out_error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dpaa_eth_cgr_set_speed(struct mac_device *mac_dev, int speed)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net_dev = to_net_dev(mac_dev-&gt;phylink_config.dev);</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct qm_mcc_initcgr opts = { };</div><div class='add'>+	u32 cs_th;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	opts.we_mask = cpu_to_be16(QM_CGR_WE_CS_THRES);</div><div class='add'>+	switch (speed) {</div><div class='add'>+	case SPEED_10000:</div><div class='add'>+		cs_th = DPAA_CS_THRESHOLD_10G;</div><div class='add'>+		break;</div><div class='add'>+	case SPEED_1000:</div><div class='add'>+	default:</div><div class='add'>+		cs_th = DPAA_CS_THRESHOLD_1G;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	qm_cgr_cs_thres_set64(&amp;opts.cgr.cs_thres, cs_th, 1);</div><div class='add'>+</div><div class='add'>+	err = qman_update_cgr_safe(&amp;priv-&gt;cgr_data.cgr, &amp;opts);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(net_dev, "could not update speed: %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline void dpaa_setup_ingress(const struct dpaa_priv *priv,</div><div class='ctx'> 				      struct dpaa_fq *fq,</div><div class='ctx'> 				      const struct qman_fq *template)</div><div class='hunk'>@@ -887,21 +949,25 @@ static inline void dpaa_setup_egress(const struct dpaa_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dpaa_fq_setup(struct dpaa_priv *priv,</div><div class='del'>-			  const struct dpaa_fq_cbs *fq_cbs,</div><div class='del'>-			  struct fman_port *tx_port)</div><div class='add'>+static int dpaa_fq_setup(struct dpaa_priv *priv,</div><div class='add'>+			 const struct dpaa_fq_cbs *fq_cbs,</div><div class='add'>+			 struct fman_port *tx_port)</div><div class='ctx'> {</div><div class='ctx'> 	int egress_cnt = 0, conf_cnt = 0, num_portals = 0, portal_cnt = 0, cpu;</div><div class='ctx'> 	const cpumask_t *affine_cpus = qman_affine_cpus();</div><div class='del'>-	u16 channels[NR_CPUS];</div><div class='ctx'> 	struct dpaa_fq *fq;</div><div class='add'>+	u16 *channels;</div><div class='add'>+</div><div class='add'>+	channels = kcalloc(num_possible_cpus(), sizeof(u16), GFP_KERNEL);</div><div class='add'>+	if (!channels)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	for_each_cpu_and(cpu, affine_cpus, cpu_online_mask)</div><div class='ctx'> 		channels[num_portals++] = qman_affine_channel(cpu);</div><div class='ctx'> </div><div class='ctx'> 	if (num_portals == 0)</div><div class='ctx'> 		dev_err(priv-&gt;net_dev-&gt;dev.parent,</div><div class='del'>-			"No Qman software (affine) channels found");</div><div class='add'>+			"No Qman software (affine) channels found\n");</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize each FQ in the list */</div><div class='ctx'> 	list_for_each_entry(fq, &amp;priv-&gt;dpaa_fq_list, list) {</div><div class='hunk'>@@ -921,15 +987,11 @@ static void dpaa_fq_setup(struct dpaa_priv *priv,</div><div class='ctx'> 		case FQ_TYPE_TX:</div><div class='ctx'> 			dpaa_setup_egress(priv, fq, tx_port,</div><div class='ctx'> 					  &amp;fq_cbs-&gt;egress_ern);</div><div class='del'>-			/* If we have more Tx queues than the number of cores,</div><div class='del'>-			 * just ignore the extra ones.</div><div class='del'>-			 */</div><div class='del'>-			if (egress_cnt &lt; DPAA_ETH_TXQ_NUM)</div><div class='del'>-				priv-&gt;egress_fqs[egress_cnt++] = &amp;fq-&gt;fq_base;</div><div class='add'>+			priv-&gt;egress_fqs[egress_cnt++] = &amp;fq-&gt;fq_base;</div><div class='ctx'> 			break;</div><div class='ctx'> 		case FQ_TYPE_TX_CONF_MQ:</div><div class='ctx'> 			priv-&gt;conf_fqs[conf_cnt++] = &amp;fq-&gt;fq_base;</div><div class='del'>-			/* fall through */</div><div class='add'>+			fallthrough;</div><div class='ctx'> 		case FQ_TYPE_TX_CONFIRM:</div><div class='ctx'> 			dpaa_setup_ingress(priv, fq, &amp;fq_cbs-&gt;tx_defq);</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -943,16 +1005,9 @@ static void dpaa_fq_setup(struct dpaa_priv *priv,</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	 /* Make sure all CPUs receive a corresponding Tx queue. */</div><div class='del'>-	while (egress_cnt &lt; DPAA_ETH_TXQ_NUM) {</div><div class='del'>-		list_for_each_entry(fq, &amp;priv-&gt;dpaa_fq_list, list) {</div><div class='del'>-			if (fq-&gt;fq_type != FQ_TYPE_TX)</div><div class='del'>-				continue;</div><div class='del'>-			priv-&gt;egress_fqs[egress_cnt++] = &amp;fq-&gt;fq_base;</div><div class='del'>-			if (egress_cnt == DPAA_ETH_TXQ_NUM)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	kfree(channels);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int dpaa_tx_fq_to_id(const struct dpaa_priv *priv,</div><div class='hunk'>@@ -960,7 +1015,7 @@ static inline int dpaa_tx_fq_to_id(const struct dpaa_priv *priv,</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DPAA_ETH_TXQ_NUM; i++)</div><div class='add'>+	for (i = 0; i &lt; dpaa_max_num_txqs(); i++)</div><div class='ctx'> 		if (priv-&gt;egress_fqs[i] == tx_fq)</div><div class='ctx'> 			return i;</div><div class='ctx'> </div><div class='hunk'>@@ -1107,6 +1162,25 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq, bool td_enable)</div><div class='ctx'> </div><div class='ctx'> 	dpaa_fq-&gt;fqid = qman_fq_fqid(fq);</div><div class='ctx'> </div><div class='add'>+	if (dpaa_fq-&gt;fq_type == FQ_TYPE_RX_DEFAULT ||</div><div class='add'>+	    dpaa_fq-&gt;fq_type == FQ_TYPE_RX_PCD) {</div><div class='add'>+		err = xdp_rxq_info_reg(&amp;dpaa_fq-&gt;xdp_rxq, dpaa_fq-&gt;net_dev,</div><div class='add'>+				       dpaa_fq-&gt;fqid, 0);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = xdp_rxq_info_reg_mem_model(&amp;dpaa_fq-&gt;xdp_rxq,</div><div class='add'>+						 MEM_TYPE_PAGE_ORDER0, NULL);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "xdp_rxq_info_reg_mem_model() = %d\n",</div><div class='add'>+				err);</div><div class='add'>+			xdp_rxq_info_unreg(&amp;dpaa_fq-&gt;xdp_rxq);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1136,6 +1210,11 @@ static int dpaa_fq_free_entry(struct device *dev, struct qman_fq *fq)</div><div class='ctx'> 		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if ((dpaa_fq-&gt;fq_type == FQ_TYPE_RX_DEFAULT ||</div><div class='add'>+	     dpaa_fq-&gt;fq_type == FQ_TYPE_RX_PCD) &amp;&amp;</div><div class='add'>+	    xdp_rxq_info_is_reg(&amp;dpaa_fq-&gt;xdp_rxq))</div><div class='add'>+		xdp_rxq_info_unreg(&amp;dpaa_fq-&gt;xdp_rxq);</div><div class='add'>+</div><div class='ctx'> 	qman_destroy_fq(fq);</div><div class='ctx'> 	list_del(&amp;dpaa_fq-&gt;list);</div><div class='ctx'> </div><div class='hunk'>@@ -1197,15 +1276,15 @@ static int dpaa_eth_init_tx_port(struct fman_port *port, struct dpaa_fq *errq,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps,</div><div class='del'>-				 size_t count, struct dpaa_fq *errq,</div><div class='add'>+static int dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp *bp,</div><div class='add'>+				 struct dpaa_fq *errq,</div><div class='ctx'> 				 struct dpaa_fq *defq, struct dpaa_fq *pcdq,</div><div class='ctx'> 				 struct dpaa_buffer_layout *buf_layout)</div><div class='ctx'> {</div><div class='ctx'> 	struct fman_buffer_prefix_content buf_prefix_content;</div><div class='ctx'> 	struct fman_port_rx_params *rx_p;</div><div class='ctx'> 	struct fman_port_params params;</div><div class='del'>-	int i, err;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;params, 0, sizeof(params));</div><div class='ctx'> 	memset(&amp;buf_prefix_content, 0, sizeof(buf_prefix_content));</div><div class='hunk'>@@ -1214,7 +1293,7 @@ static int dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps,</div><div class='ctx'> 	buf_prefix_content.pass_prs_result = true;</div><div class='ctx'> 	buf_prefix_content.pass_hash_result = true;</div><div class='ctx'> 	buf_prefix_content.pass_time_stamp = true;</div><div class='del'>-	buf_prefix_content.data_align = DPAA_FD_DATA_ALIGNMENT;</div><div class='add'>+	buf_prefix_content.data_align = DPAA_FD_RX_DATA_ALIGNMENT;</div><div class='ctx'> </div><div class='ctx'> 	rx_p = &amp;params.specific_params.rx_params;</div><div class='ctx'> 	rx_p-&gt;err_fqid = errq-&gt;fqid;</div><div class='hunk'>@@ -1224,12 +1303,9 @@ static int dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps,</div><div class='ctx'> 		rx_p-&gt;pcd_fqs_count = DPAA_ETH_PCD_RXQ_NUM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	count = min(ARRAY_SIZE(rx_p-&gt;ext_buf_pools.ext_buf_pool), count);</div><div class='del'>-	rx_p-&gt;ext_buf_pools.num_of_pools_used = (u8)count;</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		rx_p-&gt;ext_buf_pools.ext_buf_pool[i].id =  bps[i]-&gt;bpid;</div><div class='del'>-		rx_p-&gt;ext_buf_pools.ext_buf_pool[i].size = (u16)bps[i]-&gt;size;</div><div class='del'>-	}</div><div class='add'>+	rx_p-&gt;ext_buf_pools.num_of_pools_used = 1;</div><div class='add'>+	rx_p-&gt;ext_buf_pools.ext_buf_pool[0].id =  bp-&gt;bpid;</div><div class='add'>+	rx_p-&gt;ext_buf_pools.ext_buf_pool[0].size = (u16)bp-&gt;size;</div><div class='ctx'> </div><div class='ctx'> 	err = fman_port_config(port, &amp;params);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -1252,7 +1328,7 @@ static int dpaa_eth_init_rx_port(struct fman_port *port, struct dpaa_bp **bps,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_eth_init_ports(struct mac_device *mac_dev,</div><div class='del'>-			       struct dpaa_bp **bps, size_t count,</div><div class='add'>+			       struct dpaa_bp *bp,</div><div class='ctx'> 			       struct fm_port_fqs *port_fqs,</div><div class='ctx'> 			       struct dpaa_buffer_layout *buf_layout,</div><div class='ctx'> 			       struct device *dev)</div><div class='hunk'>@@ -1266,7 +1342,7 @@ static int dpaa_eth_init_ports(struct mac_device *mac_dev,</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = dpaa_eth_init_rx_port(rxport, bps, count, port_fqs-&gt;rx_errq,</div><div class='add'>+	err = dpaa_eth_init_rx_port(rxport, bp, port_fqs-&gt;rx_errq,</div><div class='ctx'> 				    port_fqs-&gt;rx_defq, port_fqs-&gt;rx_pcdq,</div><div class='ctx'> 				    &amp;buf_layout[RX]);</div><div class='ctx'> </div><div class='hunk'>@@ -1335,15 +1411,16 @@ static void dpaa_fd_release(const struct net_device *net_dev,</div><div class='ctx'> 		vaddr = phys_to_virt(qm_fd_addr(fd));</div><div class='ctx'> 		sgt = vaddr + qm_fd_get_offset(fd);</div><div class='ctx'> </div><div class='del'>-		dma_unmap_single(dpaa_bp-&gt;dev, qm_fd_addr(fd), dpaa_bp-&gt;size,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='add'>+		dma_unmap_page(dpaa_bp-&gt;priv-&gt;rx_dma_dev, qm_fd_addr(fd),</div><div class='add'>+			       DPAA_BP_RAW_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		dpaa_release_sgt_members(sgt);</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_single(dpaa_bp-&gt;dev, vaddr, dpaa_bp-&gt;size,</div><div class='del'>-				      DMA_FROM_DEVICE);</div><div class='del'>-		if (dma_mapping_error(dpaa_bp-&gt;dev, addr)) {</div><div class='del'>-			dev_err(dpaa_bp-&gt;dev, "DMA mapping failed");</div><div class='add'>+		addr = dma_map_page(dpaa_bp-&gt;priv-&gt;rx_dma_dev,</div><div class='add'>+				    virt_to_page(vaddr), 0, DPAA_BP_RAW_SIZE,</div><div class='add'>+				    DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(dpaa_bp-&gt;priv-&gt;rx_dma_dev, addr)) {</div><div class='add'>+			netdev_err(net_dev, "DMA mapping failed\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> 		bm_buffer_set64(&amp;bmb, addr);</div><div class='hunk'>@@ -1396,7 +1473,7 @@ static void count_ern(struct dpaa_percpu_priv *percpu_priv,</div><div class='ctx'> static int dpaa_enable_tx_csum(struct dpaa_priv *priv,</div><div class='ctx'> 			       struct sk_buff *skb,</div><div class='ctx'> 			       struct qm_fd *fd,</div><div class='del'>-			       char *parse_results)</div><div class='add'>+			       void *parse_results)</div><div class='ctx'> {</div><div class='ctx'> 	struct fman_prs_result *parse_result;</div><div class='ctx'> 	u16 ethertype = ntohs(skb-&gt;protocol);</div><div class='hunk'>@@ -1418,13 +1495,8 @@ static int dpaa_enable_tx_csum(struct dpaa_priv *priv,</div><div class='ctx'> 	parse_result = (struct fman_prs_result *)parse_results;</div><div class='ctx'> </div><div class='ctx'> 	/* If we're dealing with VLAN, get the real Ethernet type */</div><div class='del'>-	if (ethertype == ETH_P_8021Q) {</div><div class='del'>-		/* We can't always assume the MAC header is set correctly</div><div class='del'>-		 * by the stack, so reset to beginning of skb-&gt;data</div><div class='del'>-		 */</div><div class='del'>-		skb_reset_mac_header(skb);</div><div class='del'>-		ethertype = ntohs(vlan_eth_hdr(skb)-&gt;h_vlan_encapsulated_proto);</div><div class='del'>-	}</div><div class='add'>+	if (ethertype == ETH_P_8021Q)</div><div class='add'>+		ethertype = ntohs(skb_vlan_eth_hdr(skb)-&gt;h_vlan_encapsulated_proto);</div><div class='ctx'> </div><div class='ctx'> 	/* Fill in the relevant L3 parse result fields</div><div class='ctx'> 	 * and read the L4 protocol type</div><div class='hunk'>@@ -1488,25 +1560,24 @@ return_error:</div><div class='ctx'> </div><div class='ctx'> static int dpaa_bp_add_8_bufs(const struct dpaa_bp *dpaa_bp)</div><div class='ctx'> {</div><div class='del'>-	struct device *dev = dpaa_bp-&gt;dev;</div><div class='add'>+	struct net_device *net_dev = dpaa_bp-&gt;priv-&gt;net_dev;</div><div class='ctx'> 	struct bm_buffer bmb[8];</div><div class='ctx'> 	dma_addr_t addr;</div><div class='del'>-	void *new_buf;</div><div class='add'>+	struct page *p;</div><div class='ctx'> 	u8 i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		new_buf = netdev_alloc_frag(dpaa_bp-&gt;raw_size);</div><div class='del'>-		if (unlikely(!new_buf)) {</div><div class='del'>-			dev_err(dev, "netdev_alloc_frag() failed, size %zu\n",</div><div class='del'>-				dpaa_bp-&gt;raw_size);</div><div class='add'>+		p = dev_alloc_pages(0);</div><div class='add'>+		if (unlikely(!p)) {</div><div class='add'>+			netdev_err(net_dev, "dev_alloc_pages() failed\n");</div><div class='ctx'> 			goto release_previous_buffs;</div><div class='ctx'> 		}</div><div class='del'>-		new_buf = PTR_ALIGN(new_buf, SMP_CACHE_BYTES);</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_single(dev, new_buf,</div><div class='del'>-				      dpaa_bp-&gt;size, DMA_FROM_DEVICE);</div><div class='del'>-		if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='del'>-			dev_err(dpaa_bp-&gt;dev, "DMA map failed");</div><div class='add'>+		addr = dma_map_page(dpaa_bp-&gt;priv-&gt;rx_dma_dev, p, 0,</div><div class='add'>+				    DPAA_BP_RAW_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+		if (unlikely(dma_mapping_error(dpaa_bp-&gt;priv-&gt;rx_dma_dev,</div><div class='add'>+					       addr))) {</div><div class='add'>+			netdev_err(net_dev, "DMA map failed\n");</div><div class='ctx'> 			goto release_previous_buffs;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -1581,18 +1652,13 @@ static int dpaa_eth_refill_bpools(struct dpaa_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_bp *dpaa_bp;</div><div class='ctx'> 	int *countptr;</div><div class='del'>-	int res, i;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DPAA_BPS_NUM; i++) {</div><div class='del'>-		dpaa_bp = priv-&gt;dpaa_bps[i];</div><div class='del'>-		if (!dpaa_bp)</div><div class='del'>-			return -EINVAL;</div><div class='del'>-		countptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='del'>-		res  = dpaa_eth_refill_bpool(dpaa_bp, countptr);</div><div class='del'>-		if (res)</div><div class='del'>-			return res;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='add'>+	dpaa_bp = priv-&gt;dpaa_bp;</div><div class='add'>+	if (!dpaa_bp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	countptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='add'>+</div><div class='add'>+	return dpaa_eth_refill_bpool(dpaa_bp, countptr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Cleanup function for outgoing frame descriptors that were built on Tx path,</div><div class='hunk'>@@ -1600,68 +1666,87 @@ static int dpaa_eth_refill_bpools(struct dpaa_priv *priv)</div><div class='ctx'>  * Skb freeing is not handled here.</div><div class='ctx'>  *</div><div class='ctx'>  * This function may be called on error paths in the Tx function, so guard</div><div class='del'>- * against cases when not all fd relevant fields were filled in.</div><div class='add'>+ * against cases when not all fd relevant fields were filled in. To avoid</div><div class='add'>+ * reading the invalid transmission timestamp for the error paths set ts to</div><div class='add'>+ * false.</div><div class='ctx'>  *</div><div class='ctx'>  * Return the skb backpointer, since for S/G frames the buffer containing it</div><div class='ctx'>  * gets freed here.</div><div class='add'>+ *</div><div class='add'>+ * No skb backpointer is set when transmitting XDP frames. Cleanup the buffer</div><div class='add'>+ * and return NULL in this case.</div><div class='ctx'>  */</div><div class='ctx'> static struct sk_buff *dpaa_cleanup_tx_fd(const struct dpaa_priv *priv,</div><div class='del'>-					  const struct qm_fd *fd)</div><div class='add'>+					  const struct qm_fd *fd, bool ts)</div><div class='ctx'> {</div><div class='ctx'> 	const enum dma_data_direction dma_dir = DMA_TO_DEVICE;</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct skb_shared_hwtstamps shhwtstamps;</div><div class='ctx'> 	dma_addr_t addr = qm_fd_addr(fd);</div><div class='add'>+	void *vaddr = phys_to_virt(addr);</div><div class='ctx'> 	const struct qm_sg_entry *sgt;</div><div class='del'>-	struct sk_buff **skbh, *skb;</div><div class='del'>-	int nr_frags, i;</div><div class='add'>+	struct dpaa_eth_swbp *swbp;</div><div class='add'>+	struct sk_buff *skb;</div><div class='ctx'> 	u64 ns;</div><div class='del'>-</div><div class='del'>-	skbh = (struct sk_buff **)phys_to_virt(addr);</div><div class='del'>-	skb = *skbh;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;tx_tstamp &amp;&amp; skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) {</div><div class='del'>-		memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='del'>-</div><div class='del'>-		if (!fman_port_get_tstamp(priv-&gt;mac_dev-&gt;port[TX], (void *)skbh,</div><div class='del'>-					  &amp;ns)) {</div><div class='del'>-			shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='del'>-			skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='del'>-		} else {</div><div class='del'>-			dev_warn(dev, "fman_port_get_tstamp failed!\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(qm_fd_get_format(fd) == qm_fd_sg)) {</div><div class='del'>-		nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='del'>-		dma_unmap_single(dev, addr,</div><div class='del'>-				 qm_fd_get_offset(fd) + DPAA_SGT_SIZE,</div><div class='del'>-				 dma_dir);</div><div class='add'>+		dma_unmap_page(priv-&gt;tx_dma_dev, addr,</div><div class='add'>+			       qm_fd_get_offset(fd) + DPAA_SGT_SIZE,</div><div class='add'>+			       dma_dir);</div><div class='ctx'> </div><div class='ctx'> 		/* The sgt buffer has been allocated with netdev_alloc_frag(),</div><div class='ctx'> 		 * it's from lowmem.</div><div class='ctx'> 		 */</div><div class='del'>-		sgt = phys_to_virt(addr + qm_fd_get_offset(fd));</div><div class='add'>+		sgt = vaddr + qm_fd_get_offset(fd);</div><div class='ctx'> </div><div class='ctx'> 		/* sgt[0] is from lowmem, was dma_map_single()-ed */</div><div class='del'>-		dma_unmap_single(dev, qm_sg_addr(&amp;sgt[0]),</div><div class='add'>+		dma_unmap_single(priv-&gt;tx_dma_dev, qm_sg_addr(&amp;sgt[0]),</div><div class='ctx'> 				 qm_sg_entry_get_len(&amp;sgt[0]), dma_dir);</div><div class='ctx'> </div><div class='ctx'> 		/* remaining pages were mapped with skb_frag_dma_map() */</div><div class='del'>-		for (i = 1; i &lt;= nr_frags; i++) {</div><div class='add'>+		for (i = 1; (i &lt; DPAA_SGT_MAX_ENTRIES) &amp;&amp;</div><div class='add'>+		     !qm_sg_entry_is_final(&amp;sgt[i - 1]); i++) {</div><div class='ctx'> 			WARN_ON(qm_sg_entry_is_ext(&amp;sgt[i]));</div><div class='ctx'> </div><div class='del'>-			dma_unmap_page(dev, qm_sg_addr(&amp;sgt[i]),</div><div class='add'>+			dma_unmap_page(priv-&gt;tx_dma_dev, qm_sg_addr(&amp;sgt[i]),</div><div class='ctx'> 				       qm_sg_entry_get_len(&amp;sgt[i]), dma_dir);</div><div class='ctx'> 		}</div><div class='del'>-</div><div class='del'>-		/* Free the page frag that we allocated on Tx */</div><div class='del'>-		skb_free_frag(phys_to_virt(addr));</div><div class='ctx'> 	} else {</div><div class='del'>-		dma_unmap_single(dev, addr,</div><div class='del'>-				 skb_tail_pointer(skb) - (u8 *)skbh, dma_dir);</div><div class='add'>+		dma_unmap_single(priv-&gt;tx_dma_dev, addr,</div><div class='add'>+				 qm_fd_get_offset(fd) + qm_fd_get_length(fd),</div><div class='add'>+				 dma_dir);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	swbp = (struct dpaa_eth_swbp *)vaddr;</div><div class='add'>+	skb = swbp-&gt;skb;</div><div class='add'>+</div><div class='add'>+	/* No skb backpointer is set when running XDP. An xdp_frame</div><div class='add'>+	 * backpointer is saved instead.</div><div class='add'>+	 */</div><div class='add'>+	if (!skb) {</div><div class='add'>+		xdp_return_frame(swbp-&gt;xdpf);</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* DMA unmapping is required before accessing the HW provided info */</div><div class='add'>+	if (ts &amp;&amp; priv-&gt;tx_tstamp &amp;&amp;</div><div class='add'>+	    skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) {</div><div class='add'>+		memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='add'>+</div><div class='add'>+		if (!fman_port_get_tstamp(priv-&gt;mac_dev-&gt;port[TX], vaddr,</div><div class='add'>+					  &amp;ns)) {</div><div class='add'>+			shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='add'>+			skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='add'>+		} else {</div><div class='add'>+			dev_warn(dev, "fman_port_get_tstamp failed!\n");</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (qm_fd_get_format(fd) == qm_fd_sg)</div><div class='add'>+		/* Free the page that we allocated on Tx for the SGT */</div><div class='add'>+		free_pages((unsigned long)vaddr, 0);</div><div class='add'>+</div><div class='ctx'> 	return skb;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1682,6 +1767,8 @@ static u8 rx_csum_offload(const struct dpaa_priv *priv, const struct qm_fd *fd)</div><div class='ctx'> 	return CHECKSUM_NONE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define PTR_IS_ALIGNED(x, a) (IS_ALIGNED((unsigned long)(x), (a)))</div><div class='add'>+</div><div class='ctx'> /* Build a linear skb around the received buffer.</div><div class='ctx'>  * We are guaranteed there is enough room at the end of the data buffer to</div><div class='ctx'>  * accommodate the shared info area of the skb.</div><div class='hunk'>@@ -1706,7 +1793,6 @@ static struct sk_buff *contig_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> 			SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));</div><div class='ctx'> 	if (WARN_ONCE(!skb, "Build skb failure on Rx\n"))</div><div class='ctx'> 		goto free_buffer;</div><div class='del'>-	WARN_ON(fd_off != priv-&gt;rx_headroom);</div><div class='ctx'> 	skb_reserve(skb, fd_off);</div><div class='ctx'> 	skb_put(skb, qm_fd_get_length(fd));</div><div class='ctx'> </div><div class='hunk'>@@ -1715,7 +1801,7 @@ static struct sk_buff *contig_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> 	return skb;</div><div class='ctx'> </div><div class='ctx'> free_buffer:</div><div class='del'>-	skb_free_frag(vaddr);</div><div class='add'>+	free_pages((unsigned long)vaddr, 0);</div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1733,13 +1819,12 @@ static struct sk_buff *sg_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> 	struct page *page, *head_page;</div><div class='ctx'> 	struct dpaa_bp *dpaa_bp;</div><div class='ctx'> 	void *vaddr, *sg_vaddr;</div><div class='del'>-	int frag_off, frag_len;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	dma_addr_t sg_addr;</div><div class='ctx'> 	int page_offset;</div><div class='ctx'> 	unsigned int sz;</div><div class='ctx'> 	int *count_ptr;</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	vaddr = phys_to_virt(addr);</div><div class='ctx'> 	WARN_ON(!IS_ALIGNED((unsigned long)vaddr, SMP_CACHE_BYTES));</div><div class='hunk'>@@ -1753,17 +1838,16 @@ static struct sk_buff *sg_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> </div><div class='ctx'> 		sg_addr = qm_sg_addr(&amp;sgt[i]);</div><div class='ctx'> 		sg_vaddr = phys_to_virt(sg_addr);</div><div class='del'>-		WARN_ON(!IS_ALIGNED((unsigned long)sg_vaddr,</div><div class='del'>-				    SMP_CACHE_BYTES));</div><div class='add'>+		WARN_ON(!PTR_IS_ALIGNED(sg_vaddr, SMP_CACHE_BYTES));</div><div class='add'>+</div><div class='add'>+		dma_unmap_page(priv-&gt;rx_dma_dev, sg_addr,</div><div class='add'>+			       DPAA_BP_RAW_SIZE, DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 		/* We may use multiple Rx pools */</div><div class='ctx'> 		dpaa_bp = dpaa_bpid2pool(sgt[i].bpid);</div><div class='ctx'> 		if (!dpaa_bp)</div><div class='ctx'> 			goto free_buffers;</div><div class='ctx'> </div><div class='del'>-		count_ptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='del'>-		dma_unmap_single(dpaa_bp-&gt;dev, sg_addr, dpaa_bp-&gt;size,</div><div class='del'>-				 DMA_FROM_DEVICE);</div><div class='ctx'> 		if (!skb) {</div><div class='ctx'> 			sz = dpaa_bp-&gt;size +</div><div class='ctx'> 				SKB_DATA_ALIGN(sizeof(struct skb_shared_info));</div><div class='hunk'>@@ -1777,6 +1861,11 @@ static struct sk_buff *sg_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> 			 * on Tx, if extra headers are added.</div><div class='ctx'> 			 */</div><div class='ctx'> 			WARN_ON(fd_off != priv-&gt;rx_headroom);</div><div class='add'>+			/* The offset to data start within the buffer holding</div><div class='add'>+			 * the SGT should always be equal to the offset to data</div><div class='add'>+			 * start within the first buffer holding the frame.</div><div class='add'>+			 */</div><div class='add'>+			WARN_ON_ONCE(fd_off != qm_sg_entry_get_off(&amp;sgt[i]));</div><div class='ctx'> 			skb_reserve(skb, fd_off);</div><div class='ctx'> 			skb_put(skb, qm_sg_entry_get_len(&amp;sgt[i]));</div><div class='ctx'> 		} else {</div><div class='hunk'>@@ -1790,23 +1879,27 @@ static struct sk_buff *sg_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> 			page = virt_to_page(sg_vaddr);</div><div class='ctx'> 			head_page = virt_to_head_page(sg_vaddr);</div><div class='ctx'> </div><div class='del'>-			/* Compute offset in (possibly tail) page */</div><div class='add'>+			/* Compute offset of sg_vaddr in (possibly tail) page */</div><div class='ctx'> 			page_offset = ((unsigned long)sg_vaddr &amp;</div><div class='ctx'> 					(PAGE_SIZE - 1)) +</div><div class='ctx'> 				(page_address(page) - page_address(head_page));</div><div class='del'>-			/* page_offset only refers to the beginning of sgt[i];</div><div class='del'>-			 * but the buffer itself may have an internal offset.</div><div class='add'>+</div><div class='add'>+			/* Non-initial SGT entries should not have a buffer</div><div class='add'>+			 * offset.</div><div class='ctx'> 			 */</div><div class='del'>-			frag_off = qm_sg_entry_get_off(&amp;sgt[i]) + page_offset;</div><div class='del'>-			frag_len = qm_sg_entry_get_len(&amp;sgt[i]);</div><div class='add'>+			WARN_ON_ONCE(qm_sg_entry_get_off(&amp;sgt[i]));</div><div class='add'>+</div><div class='ctx'> 			/* skb_add_rx_frag() does no checking on the page; if</div><div class='ctx'> 			 * we pass it a tail page, we'll end up with</div><div class='del'>-			 * bad page accounting and eventually with segafults.</div><div class='add'>+			 * bad page accounting and eventually with segfaults.</div><div class='ctx'> 			 */</div><div class='del'>-			skb_add_rx_frag(skb, i - 1, head_page, frag_off,</div><div class='del'>-					frag_len, dpaa_bp-&gt;size);</div><div class='add'>+			skb_add_rx_frag(skb, i - 1, head_page, page_offset,</div><div class='add'>+					qm_sg_entry_get_len(&amp;sgt[i]),</div><div class='add'>+					dpaa_bp-&gt;size);</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='ctx'> 		/* Update the pool count for the current {cpu x bpool} */</div><div class='add'>+		count_ptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='ctx'> 		(*count_ptr)--;</div><div class='ctx'> </div><div class='ctx'> 		if (qm_sg_entry_is_final(&amp;sgt[i]))</div><div class='hunk'>@@ -1815,35 +1908,34 @@ static struct sk_buff *sg_fd_to_skb(const struct dpaa_priv *priv,</div><div class='ctx'> 	WARN_ONCE(i == DPAA_SGT_MAX_ENTRIES, "No final bit on SGT\n");</div><div class='ctx'> </div><div class='ctx'> 	/* free the SG table buffer */</div><div class='del'>-	skb_free_frag(vaddr);</div><div class='add'>+	free_pages((unsigned long)vaddr, 0);</div><div class='ctx'> </div><div class='ctx'> 	return skb;</div><div class='ctx'> </div><div class='ctx'> free_buffers:</div><div class='del'>-	/* compensate sw bpool counter changes */</div><div class='del'>-	for (i--; i &gt;= 0; i--) {</div><div class='del'>-		dpaa_bp = dpaa_bpid2pool(sgt[i].bpid);</div><div class='del'>-		if (dpaa_bp) {</div><div class='del'>-			count_ptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='del'>-			(*count_ptr)++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='ctx'> 	/* free all the SG entries */</div><div class='del'>-	for (i = 0; i &lt; DPAA_SGT_MAX_ENTRIES ; i++) {</div><div class='del'>-		sg_addr = qm_sg_addr(&amp;sgt[i]);</div><div class='add'>+	for (j = 0; j &lt; DPAA_SGT_MAX_ENTRIES ; j++) {</div><div class='add'>+		sg_addr = qm_sg_addr(&amp;sgt[j]);</div><div class='ctx'> 		sg_vaddr = phys_to_virt(sg_addr);</div><div class='del'>-		skb_free_frag(sg_vaddr);</div><div class='del'>-		dpaa_bp = dpaa_bpid2pool(sgt[i].bpid);</div><div class='del'>-		if (dpaa_bp) {</div><div class='del'>-			count_ptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='del'>-			(*count_ptr)--;</div><div class='add'>+		/* all pages 0..i were unmaped */</div><div class='add'>+		if (j &gt; i)</div><div class='add'>+			dma_unmap_page(priv-&gt;rx_dma_dev, qm_sg_addr(&amp;sgt[j]),</div><div class='add'>+				       DPAA_BP_RAW_SIZE, DMA_FROM_DEVICE);</div><div class='add'>+		free_pages((unsigned long)sg_vaddr, 0);</div><div class='add'>+		/* counters 0..i-1 were decremented */</div><div class='add'>+		if (j &gt;= i) {</div><div class='add'>+			dpaa_bp = dpaa_bpid2pool(sgt[j].bpid);</div><div class='add'>+			if (dpaa_bp) {</div><div class='add'>+				count_ptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='add'>+				(*count_ptr)--;</div><div class='add'>+			}</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		if (qm_sg_entry_is_final(&amp;sgt[i]))</div><div class='add'>+		if (qm_sg_entry_is_final(&amp;sgt[j]))</div><div class='ctx'> 			break;</div><div class='ctx'> 	}</div><div class='ctx'> 	/* free the SGT fragment */</div><div class='del'>-	skb_free_frag(vaddr);</div><div class='add'>+	free_pages((unsigned long)vaddr, 0);</div><div class='ctx'> </div><div class='ctx'> 	return NULL;</div><div class='ctx'> }</div><div class='hunk'>@@ -1853,10 +1945,9 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,</div><div class='ctx'> 			    int *offset)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='del'>-	struct device *dev = net_dev-&gt;dev.parent;</div><div class='ctx'> 	enum dma_data_direction dma_dir;</div><div class='del'>-	unsigned char *buffer_start;</div><div class='del'>-	struct sk_buff **skbh;</div><div class='add'>+	struct dpaa_eth_swbp *swbp;</div><div class='add'>+	unsigned char *buff_start;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -1864,11 +1955,11 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	 * available, so just use that for offset.</div><div class='ctx'> 	 */</div><div class='ctx'> 	fd-&gt;bpid = FSL_DPAA_BPID_INV;</div><div class='del'>-	buffer_start = skb-&gt;data - priv-&gt;tx_headroom;</div><div class='add'>+	buff_start = skb-&gt;data - priv-&gt;tx_headroom;</div><div class='ctx'> 	dma_dir = DMA_TO_DEVICE;</div><div class='ctx'> </div><div class='del'>-	skbh = (struct sk_buff **)buffer_start;</div><div class='del'>-	*skbh = skb;</div><div class='add'>+	swbp = (struct dpaa_eth_swbp *)buff_start;</div><div class='add'>+	swbp-&gt;skb = skb;</div><div class='ctx'> </div><div class='ctx'> 	/* Enable L3/L4 hardware checksum computation.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1876,7 +1967,7 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	 * need to write into the skb.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = dpaa_enable_tx_csum(priv, skb, fd,</div><div class='del'>-				  ((char *)skbh) + DPAA_TX_PRIV_DATA_SIZE);</div><div class='add'>+				  buff_start + DPAA_TX_PRIV_DATA_SIZE);</div><div class='ctx'> 	if (unlikely(err &lt; 0)) {</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			netif_err(priv, tx_err, net_dev, "HW csum error: %d\n",</div><div class='hunk'>@@ -1889,9 +1980,9 @@ static int skb_to_contig_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	fd-&gt;cmd |= cpu_to_be32(FM_FD_CMD_FCO);</div><div class='ctx'> </div><div class='ctx'> 	/* Map the entire buffer size that may be seen by FMan, but no more */</div><div class='del'>-	addr = dma_map_single(dev, skbh,</div><div class='del'>-			      skb_tail_pointer(skb) - buffer_start, dma_dir);</div><div class='del'>-	if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='add'>+	addr = dma_map_single(priv-&gt;tx_dma_dev, buff_start,</div><div class='add'>+			      priv-&gt;tx_headroom + skb-&gt;len, dma_dir);</div><div class='add'>+	if (unlikely(dma_mapping_error(priv-&gt;tx_dma_dev, addr))) {</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			netif_err(priv, tx_err, net_dev, "dma_map_single() failed\n");</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1907,24 +1998,22 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	const enum dma_data_direction dma_dir = DMA_TO_DEVICE;</div><div class='ctx'> 	const int nr_frags = skb_shinfo(skb)-&gt;nr_frags;</div><div class='ctx'> 	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='del'>-	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpaa_eth_swbp *swbp;</div><div class='ctx'> 	struct qm_sg_entry *sgt;</div><div class='del'>-	struct sk_buff **skbh;</div><div class='del'>-	int i, j, err, sz;</div><div class='del'>-	void *buffer_start;</div><div class='add'>+	void *buff_start;</div><div class='ctx'> 	skb_frag_t *frag;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> 	size_t frag_len;</div><div class='del'>-	void *sgt_buf;</div><div class='del'>-</div><div class='del'>-	/* get a page frag to store the SGTable */</div><div class='del'>-	sz = SKB_DATA_ALIGN(priv-&gt;tx_headroom + DPAA_SGT_SIZE);</div><div class='del'>-	sgt_buf = netdev_alloc_frag(sz);</div><div class='del'>-	if (unlikely(!sgt_buf)) {</div><div class='del'>-		netdev_err(net_dev, "netdev_alloc_frag() failed for size %d\n",</div><div class='del'>-			   sz);</div><div class='add'>+	struct page *p;</div><div class='add'>+	int i, j, err;</div><div class='add'>+</div><div class='add'>+	/* get a page to store the SGTable */</div><div class='add'>+	p = dev_alloc_pages(0);</div><div class='add'>+	if (unlikely(!p)) {</div><div class='add'>+		netdev_err(net_dev, "dev_alloc_pages() failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='add'>+	buff_start = page_address(p);</div><div class='ctx'> </div><div class='ctx'> 	/* Enable L3/L4 hardware checksum computation.</div><div class='ctx'> 	 *</div><div class='hunk'>@@ -1932,7 +2021,7 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	 * need to write into the skb.</div><div class='ctx'> 	 */</div><div class='ctx'> 	err = dpaa_enable_tx_csum(priv, skb, fd,</div><div class='del'>-				  sgt_buf + DPAA_TX_PRIV_DATA_SIZE);</div><div class='add'>+				  buff_start + DPAA_TX_PRIV_DATA_SIZE);</div><div class='ctx'> 	if (unlikely(err &lt; 0)) {</div><div class='ctx'> 		if (net_ratelimit())</div><div class='ctx'> 			netif_err(priv, tx_err, net_dev, "HW csum error: %d\n",</div><div class='hunk'>@@ -1941,15 +2030,15 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* SGT[0] is used by the linear part */</div><div class='del'>-	sgt = (struct qm_sg_entry *)(sgt_buf + priv-&gt;tx_headroom);</div><div class='add'>+	sgt = (struct qm_sg_entry *)(buff_start + priv-&gt;tx_headroom);</div><div class='ctx'> 	frag_len = skb_headlen(skb);</div><div class='ctx'> 	qm_sg_entry_set_len(&amp;sgt[0], frag_len);</div><div class='ctx'> 	sgt[0].bpid = FSL_DPAA_BPID_INV;</div><div class='ctx'> 	sgt[0].offset = 0;</div><div class='del'>-	addr = dma_map_single(dev, skb-&gt;data,</div><div class='add'>+	addr = dma_map_single(priv-&gt;tx_dma_dev, skb-&gt;data,</div><div class='ctx'> 			      skb_headlen(skb), dma_dir);</div><div class='del'>-	if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='del'>-		dev_err(dev, "DMA mapping failed");</div><div class='add'>+	if (unlikely(dma_mapping_error(priv-&gt;tx_dma_dev, addr))) {</div><div class='add'>+		netdev_err(priv-&gt;net_dev, "DMA mapping failed\n");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto sg0_map_failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1958,12 +2047,12 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	/* populate the rest of SGT entries */</div><div class='ctx'> 	for (i = 0; i &lt; nr_frags; i++) {</div><div class='ctx'> 		frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='del'>-		frag_len = frag-&gt;size;</div><div class='add'>+		frag_len = skb_frag_size(frag);</div><div class='ctx'> 		WARN_ON(!skb_frag_page(frag));</div><div class='del'>-		addr = skb_frag_dma_map(dev, frag, 0,</div><div class='add'>+		addr = skb_frag_dma_map(priv-&gt;tx_dma_dev, frag, 0,</div><div class='ctx'> 					frag_len, dma_dir);</div><div class='del'>-		if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='del'>-			dev_err(dev, "DMA mapping failed");</div><div class='add'>+		if (unlikely(dma_mapping_error(priv-&gt;tx_dma_dev, addr))) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev, "DMA mapping failed\n");</div><div class='ctx'> 			err = -EINVAL;</div><div class='ctx'> 			goto sg_map_failed;</div><div class='ctx'> 		}</div><div class='hunk'>@@ -1979,17 +2068,17 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,</div><div class='ctx'> 	/* Set the final bit in the last used entry of the SGT */</div><div class='ctx'> 	qm_sg_entry_set_f(&amp;sgt[nr_frags], frag_len);</div><div class='ctx'> </div><div class='add'>+	/* set fd offset to priv-&gt;tx_headroom */</div><div class='ctx'> 	qm_fd_set_sg(fd, priv-&gt;tx_headroom, skb-&gt;len);</div><div class='ctx'> </div><div class='ctx'> 	/* DMA map the SGT page */</div><div class='del'>-	buffer_start = (void *)sgt - priv-&gt;tx_headroom;</div><div class='del'>-	skbh = (struct sk_buff **)buffer_start;</div><div class='del'>-	*skbh = skb;</div><div class='del'>-</div><div class='del'>-	addr = dma_map_single(dev, buffer_start,</div><div class='del'>-			      priv-&gt;tx_headroom + DPAA_SGT_SIZE, dma_dir);</div><div class='del'>-	if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='del'>-		dev_err(dev, "DMA mapping failed");</div><div class='add'>+	swbp = (struct dpaa_eth_swbp *)buff_start;</div><div class='add'>+	swbp-&gt;skb = skb;</div><div class='add'>+</div><div class='add'>+	addr = dma_map_page(priv-&gt;tx_dma_dev, p, 0,</div><div class='add'>+			    priv-&gt;tx_headroom + DPAA_SGT_SIZE, dma_dir);</div><div class='add'>+	if (unlikely(dma_mapping_error(priv-&gt;tx_dma_dev, addr))) {</div><div class='add'>+		netdev_err(priv-&gt;net_dev, "DMA mapping failed\n");</div><div class='ctx'> 		err = -EINVAL;</div><div class='ctx'> 		goto sgt_map_failed;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -2003,11 +2092,11 @@ static int skb_to_sg_fd(struct dpaa_priv *priv,</div><div class='ctx'> sgt_map_failed:</div><div class='ctx'> sg_map_failed:</div><div class='ctx'> 	for (j = 0; j &lt; i; j++)</div><div class='del'>-		dma_unmap_page(dev, qm_sg_addr(&amp;sgt[j]),</div><div class='add'>+		dma_unmap_page(priv-&gt;tx_dma_dev, qm_sg_addr(&amp;sgt[j]),</div><div class='ctx'> 			       qm_sg_entry_get_len(&amp;sgt[j]), dma_dir);</div><div class='ctx'> sg0_map_failed:</div><div class='ctx'> csum_failed:</div><div class='del'>-	skb_free_frag(sgt_buf);</div><div class='add'>+	free_pages((unsigned long)buff_start, 0);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2044,16 +2133,173 @@ static inline int dpaa_xmit(struct dpaa_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+static int dpaa_a050385_wa_skb(struct net_device *net_dev, struct sk_buff **s)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct sk_buff *new_skb, *skb = *s;</div><div class='add'>+	unsigned char *start, i;</div><div class='add'>+</div><div class='add'>+	/* check linear buffer alignment */</div><div class='add'>+	if (!PTR_IS_ALIGNED(skb-&gt;data, DPAA_A050385_ALIGN))</div><div class='add'>+		goto workaround;</div><div class='add'>+</div><div class='add'>+	/* linear buffers just need to have an aligned start */</div><div class='add'>+	if (!skb_is_nonlinear(skb))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* linear data size for nonlinear skbs needs to be aligned */</div><div class='add'>+	if (!IS_ALIGNED(skb_headlen(skb), DPAA_A050385_ALIGN))</div><div class='add'>+		goto workaround;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; skb_shinfo(skb)-&gt;nr_frags; i++) {</div><div class='add'>+		skb_frag_t *frag = &amp;skb_shinfo(skb)-&gt;frags[i];</div><div class='add'>+</div><div class='add'>+		/* all fragments need to have aligned start addresses */</div><div class='add'>+		if (!IS_ALIGNED(skb_frag_off(frag), DPAA_A050385_ALIGN))</div><div class='add'>+			goto workaround;</div><div class='add'>+</div><div class='add'>+		/* all but last fragment need to have aligned sizes */</div><div class='add'>+		if (!IS_ALIGNED(skb_frag_size(frag), DPAA_A050385_ALIGN) &amp;&amp;</div><div class='add'>+		    (i &lt; skb_shinfo(skb)-&gt;nr_frags - 1))</div><div class='add'>+			goto workaround;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+workaround:</div><div class='add'>+	/* copy all the skb content into a new linear buffer */</div><div class='add'>+	new_skb = netdev_alloc_skb(net_dev, skb-&gt;len + DPAA_A050385_ALIGN - 1 +</div><div class='add'>+						priv-&gt;tx_headroom);</div><div class='add'>+	if (!new_skb)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* NET_SKB_PAD bytes already reserved, adding up to tx_headroom */</div><div class='add'>+	skb_reserve(new_skb, priv-&gt;tx_headroom - NET_SKB_PAD);</div><div class='add'>+</div><div class='add'>+	/* Workaround for DPAA_A050385 requires data start to be aligned */</div><div class='add'>+	start = PTR_ALIGN(new_skb-&gt;data, DPAA_A050385_ALIGN);</div><div class='add'>+	if (start - new_skb-&gt;data)</div><div class='add'>+		skb_reserve(new_skb, start - new_skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	skb_put(new_skb, skb-&gt;len);</div><div class='add'>+	skb_copy_bits(skb, 0, new_skb-&gt;data, skb-&gt;len);</div><div class='add'>+	skb_copy_header(new_skb, skb);</div><div class='add'>+	new_skb-&gt;dev = skb-&gt;dev;</div><div class='add'>+</div><div class='add'>+	/* Copy relevant timestamp info from the old skb to the new */</div><div class='add'>+	if (priv-&gt;tx_tstamp) {</div><div class='add'>+		skb_shinfo(new_skb)-&gt;tx_flags = skb_shinfo(skb)-&gt;tx_flags;</div><div class='add'>+		skb_shinfo(new_skb)-&gt;hwtstamps = skb_shinfo(skb)-&gt;hwtstamps;</div><div class='add'>+		skb_shinfo(new_skb)-&gt;tskey = skb_shinfo(skb)-&gt;tskey;</div><div class='add'>+		if (skb-&gt;sk)</div><div class='add'>+			skb_set_owner_w(new_skb, skb-&gt;sk);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We move the headroom when we align it so we have to reset the</div><div class='add'>+	 * network and transport header offsets relative to the new data</div><div class='add'>+	 * pointer. The checksum offload relies on these offsets.</div><div class='add'>+	 */</div><div class='add'>+	skb_set_network_header(new_skb, skb_network_offset(skb));</div><div class='add'>+	skb_set_transport_header(new_skb, skb_transport_offset(skb));</div><div class='add'>+</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+	*s = new_skb;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_a050385_wa_xdpf(struct dpaa_priv *priv,</div><div class='add'>+				struct xdp_frame **init_xdpf)</div><div class='add'>+{</div><div class='add'>+	struct xdp_frame *new_xdpf, *xdpf = *init_xdpf;</div><div class='add'>+	void *new_buff, *aligned_data;</div><div class='add'>+	struct page *p;</div><div class='add'>+	u32 data_shift;</div><div class='add'>+	int headroom;</div><div class='add'>+</div><div class='add'>+	/* Check the data alignment and make sure the headroom is large</div><div class='add'>+	 * enough to store the xdpf backpointer. Use an aligned headroom</div><div class='add'>+	 * value.</div><div class='add'>+	 *</div><div class='add'>+	 * Due to alignment constraints, we give XDP access to the full 256</div><div class='add'>+	 * byte frame headroom. If the XDP program uses all of it, copy the</div><div class='add'>+	 * data to a new buffer and make room for storing the backpointer.</div><div class='add'>+	 */</div><div class='add'>+	if (PTR_IS_ALIGNED(xdpf-&gt;data, DPAA_FD_DATA_ALIGNMENT) &amp;&amp;</div><div class='add'>+	    xdpf-&gt;headroom &gt;= priv-&gt;tx_headroom) {</div><div class='add'>+		xdpf-&gt;headroom = priv-&gt;tx_headroom;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Try to move the data inside the buffer just enough to align it and</div><div class='add'>+	 * store the xdpf backpointer. If the available headroom isn't large</div><div class='add'>+	 * enough, resort to allocating a new buffer and copying the data.</div><div class='add'>+	 */</div><div class='add'>+	aligned_data = PTR_ALIGN_DOWN(xdpf-&gt;data, DPAA_FD_DATA_ALIGNMENT);</div><div class='add'>+	data_shift = xdpf-&gt;data - aligned_data;</div><div class='add'>+</div><div class='add'>+	/* The XDP frame's headroom needs to be large enough to accommodate</div><div class='add'>+	 * shifting the data as well as storing the xdpf backpointer.</div><div class='add'>+	 */</div><div class='add'>+	if (xdpf-&gt;headroom  &gt;= data_shift + priv-&gt;tx_headroom) {</div><div class='add'>+		memmove(aligned_data, xdpf-&gt;data, xdpf-&gt;len);</div><div class='add'>+		xdpf-&gt;data = aligned_data;</div><div class='add'>+		xdpf-&gt;headroom = priv-&gt;tx_headroom;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The new xdp_frame is stored in the new buffer. Reserve enough space</div><div class='add'>+	 * in the headroom for storing it along with the driver's private</div><div class='add'>+	 * info. The headroom needs to be aligned to DPAA_FD_DATA_ALIGNMENT to</div><div class='add'>+	 * guarantee the data's alignment in the buffer.</div><div class='add'>+	 */</div><div class='add'>+	headroom = ALIGN(sizeof(*new_xdpf) + priv-&gt;tx_headroom,</div><div class='add'>+			 DPAA_FD_DATA_ALIGNMENT);</div><div class='add'>+</div><div class='add'>+	/* Assure the extended headroom and data don't overflow the buffer,</div><div class='add'>+	 * while maintaining the mandatory tailroom.</div><div class='add'>+	 */</div><div class='add'>+	if (headroom + xdpf-&gt;len &gt; DPAA_BP_RAW_SIZE -</div><div class='add'>+			SKB_DATA_ALIGN(sizeof(struct skb_shared_info)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	p = dev_alloc_pages(0);</div><div class='add'>+	if (unlikely(!p))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Copy the data to the new buffer at a properly aligned offset */</div><div class='add'>+	new_buff = page_address(p);</div><div class='add'>+	memcpy(new_buff + headroom, xdpf-&gt;data, xdpf-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Create an XDP frame around the new buffer in a similar fashion</div><div class='add'>+	 * to xdp_convert_buff_to_frame.</div><div class='add'>+	 */</div><div class='add'>+	new_xdpf = new_buff;</div><div class='add'>+	new_xdpf-&gt;data = new_buff + headroom;</div><div class='add'>+	new_xdpf-&gt;len = xdpf-&gt;len;</div><div class='add'>+	new_xdpf-&gt;headroom = priv-&gt;tx_headroom;</div><div class='add'>+	new_xdpf-&gt;frame_sz = DPAA_BP_RAW_SIZE;</div><div class='add'>+	new_xdpf-&gt;mem_type = MEM_TYPE_PAGE_ORDER0;</div><div class='add'>+</div><div class='add'>+	/* Release the initial buffer */</div><div class='add'>+	xdp_return_frame_rx_napi(xdpf);</div><div class='add'>+</div><div class='add'>+	*init_xdpf = new_xdpf;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> static netdev_tx_t</div><div class='ctx'> dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	const int queue_mapping = skb_get_queue_mapping(skb);</div><div class='del'>-	bool nonlinear = skb_is_nonlinear(skb);</div><div class='ctx'> 	struct rtnl_link_stats64 *percpu_stats;</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	struct netdev_queue *txq;</div><div class='ctx'> 	struct dpaa_priv *priv;</div><div class='ctx'> 	struct qm_fd fd;</div><div class='add'>+	bool nonlinear;</div><div class='ctx'> 	int offset = 0;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2063,6 +2309,13 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> </div><div class='ctx'> 	qm_fd_clear_fd(&amp;fd);</div><div class='ctx'> </div><div class='add'>+	/* Packet data is always read as 32-bit words, so zero out any part of</div><div class='add'>+	 * the skb which might be sent if we have to pad the packet</div><div class='add'>+	 */</div><div class='add'>+	if (__skb_put_padto(skb, ETH_ZLEN, false))</div><div class='add'>+		goto enomem;</div><div class='add'>+</div><div class='add'>+	nonlinear = skb_is_nonlinear(skb);</div><div class='ctx'> 	if (!nonlinear) {</div><div class='ctx'> 		/* We're going to store the skb backpointer at the beginning</div><div class='ctx'> 		 * of the data buffer, so we need a privately owned skb</div><div class='hunk'>@@ -2090,6 +2343,14 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 		nonlinear = skb_is_nonlinear(skb);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+	if (unlikely(fman_has_errata_a050385())) {</div><div class='add'>+		if (dpaa_a050385_wa_skb(net_dev, &amp;skb))</div><div class='add'>+			goto enomem;</div><div class='add'>+		nonlinear = skb_is_nonlinear(skb);</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> 	if (nonlinear) {</div><div class='ctx'> 		/* Just create a S/G fd based on the skb */</div><div class='ctx'> 		err = skb_to_sg_fd(priv, skb, &amp;fd);</div><div class='hunk'>@@ -2104,7 +2365,7 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 	txq = netdev_get_tx_queue(net_dev, queue_mapping);</div><div class='ctx'> </div><div class='ctx'> 	/* LLTX requires to do our own update of trans_start */</div><div class='del'>-	txq-&gt;trans_start = jiffies;</div><div class='add'>+	txq_trans_cond_update(txq);</div><div class='ctx'> </div><div class='ctx'> 	if (priv-&gt;tx_tstamp &amp;&amp; skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) {</div><div class='ctx'> 		fd.cmd |= cpu_to_be32(FM_FD_CMD_UPD);</div><div class='hunk'>@@ -2114,7 +2375,7 @@ dpaa_start_xmit(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 	if (likely(dpaa_xmit(priv, percpu_stats, queue_mapping, &amp;fd) == 0))</div><div class='ctx'> 		return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='del'>-	dpaa_cleanup_tx_fd(priv, &amp;fd);</div><div class='add'>+	dpaa_cleanup_tx_fd(priv, &amp;fd, false);</div><div class='ctx'> skb_to_fd_failed:</div><div class='ctx'> enomem:</div><div class='ctx'> 	percpu_stats-&gt;tx_errors++;</div><div class='hunk'>@@ -2160,7 +2421,7 @@ static void dpaa_tx_error(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	percpu_priv-&gt;stats.tx_errors++;</div><div class='ctx'> </div><div class='del'>-	skb = dpaa_cleanup_tx_fd(priv, fd);</div><div class='add'>+	skb = dpaa_cleanup_tx_fd(priv, fd, false);</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2168,8 +2429,14 @@ static int dpaa_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_napi_portal *np =</div><div class='ctx'> 			container_of(napi, struct dpaa_napi_portal, napi);</div><div class='add'>+	int cleaned;</div><div class='add'>+</div><div class='add'>+	np-&gt;xdp_act = 0;</div><div class='add'>+</div><div class='add'>+	cleaned = qman_p_poll_dqrr(np-&gt;p, budget);</div><div class='ctx'> </div><div class='del'>-	int cleaned = qman_p_poll_dqrr(np-&gt;p, budget);</div><div class='add'>+	if (np-&gt;xdp_act &amp; XDP_REDIRECT)</div><div class='add'>+		xdp_do_flush();</div><div class='ctx'> </div><div class='ctx'> 	if (cleaned &lt; budget) {</div><div class='ctx'> 		napi_complete_done(napi, cleaned);</div><div class='hunk'>@@ -2200,15 +2467,15 @@ static void dpaa_tx_conf(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	percpu_priv-&gt;tx_confirm++;</div><div class='ctx'> </div><div class='del'>-	skb = dpaa_cleanup_tx_fd(priv, fd);</div><div class='add'>+	skb = dpaa_cleanup_tx_fd(priv, fd, true);</div><div class='ctx'> </div><div class='ctx'> 	consume_skb(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline int dpaa_eth_napi_schedule(struct dpaa_percpu_priv *percpu_priv,</div><div class='del'>-					 struct qman_portal *portal)</div><div class='add'>+					 struct qman_portal *portal, bool sched_napi)</div><div class='ctx'> {</div><div class='del'>-	if (unlikely(in_irq() || !in_serving_softirq())) {</div><div class='add'>+	if (sched_napi) {</div><div class='ctx'> 		/* Disable QMan IRQ and invoke NAPI */</div><div class='ctx'> 		qman_p_irqsource_remove(portal, QM_PIRQ_DQRI);</div><div class='ctx'> </div><div class='hunk'>@@ -2222,7 +2489,8 @@ static inline int dpaa_eth_napi_schedule(struct dpaa_percpu_priv *percpu_priv,</div><div class='ctx'> </div><div class='ctx'> static enum qman_cb_dqrr_result rx_error_dqrr(struct qman_portal *portal,</div><div class='ctx'> 					      struct qman_fq *fq,</div><div class='del'>-					      const struct qm_dqrr_entry *dq)</div><div class='add'>+					      const struct qm_dqrr_entry *dq,</div><div class='add'>+					      bool sched_napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_fq *dpaa_fq = container_of(fq, struct dpaa_fq, fq_base);</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='hunk'>@@ -2238,7 +2506,7 @@ static enum qman_cb_dqrr_result rx_error_dqrr(struct qman_portal *portal,</div><div class='ctx'> </div><div class='ctx'> 	percpu_priv = this_cpu_ptr(priv-&gt;percpu_priv);</div><div class='ctx'> </div><div class='del'>-	if (dpaa_eth_napi_schedule(percpu_priv, portal))</div><div class='add'>+	if (dpaa_eth_napi_schedule(percpu_priv, portal, sched_napi))</div><div class='ctx'> 		return qman_cb_dqrr_stop;</div><div class='ctx'> </div><div class='ctx'> 	dpaa_eth_refill_bpools(priv);</div><div class='hunk'>@@ -2247,29 +2515,199 @@ static enum qman_cb_dqrr_result rx_error_dqrr(struct qman_portal *portal,</div><div class='ctx'> 	return qman_cb_dqrr_consume;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa_xdp_xmit_frame(struct net_device *net_dev,</div><div class='add'>+			       struct xdp_frame *xdpf)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	struct dpaa_percpu_priv *percpu_priv;</div><div class='add'>+	struct dpaa_eth_swbp *swbp;</div><div class='add'>+	struct netdev_queue *txq;</div><div class='add'>+	void *buff_start;</div><div class='add'>+	struct qm_fd fd;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	percpu_priv = this_cpu_ptr(priv-&gt;percpu_priv);</div><div class='add'>+	percpu_stats = &amp;percpu_priv-&gt;stats;</div><div class='add'>+</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+	if (unlikely(fman_has_errata_a050385())) {</div><div class='add'>+		if (dpaa_a050385_wa_xdpf(priv, &amp;xdpf)) {</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto out_error;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	if (xdpf-&gt;headroom &lt; DPAA_TX_PRIV_DATA_SIZE) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	buff_start = xdpf-&gt;data - xdpf-&gt;headroom;</div><div class='add'>+</div><div class='add'>+	/* Leave empty the skb backpointer at the start of the buffer.</div><div class='add'>+	 * Save the XDP frame for easy cleanup on confirmation.</div><div class='add'>+	 */</div><div class='add'>+	swbp = (struct dpaa_eth_swbp *)buff_start;</div><div class='add'>+	swbp-&gt;skb = NULL;</div><div class='add'>+	swbp-&gt;xdpf = xdpf;</div><div class='add'>+</div><div class='add'>+	qm_fd_clear_fd(&amp;fd);</div><div class='add'>+	fd.bpid = FSL_DPAA_BPID_INV;</div><div class='add'>+	fd.cmd |= cpu_to_be32(FM_FD_CMD_FCO);</div><div class='add'>+	qm_fd_set_contig(&amp;fd, xdpf-&gt;headroom, xdpf-&gt;len);</div><div class='add'>+</div><div class='add'>+	addr = dma_map_single(priv-&gt;tx_dma_dev, buff_start,</div><div class='add'>+			      xdpf-&gt;headroom + xdpf-&gt;len,</div><div class='add'>+			      DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(priv-&gt;tx_dma_dev, addr))) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	qm_fd_addr_set64(&amp;fd, addr);</div><div class='add'>+</div><div class='add'>+	/* Bump the trans_start */</div><div class='add'>+	txq = netdev_get_tx_queue(net_dev, smp_processor_id());</div><div class='add'>+	txq_trans_cond_update(txq);</div><div class='add'>+</div><div class='add'>+	err = dpaa_xmit(priv, percpu_stats, smp_processor_id(), &amp;fd);</div><div class='add'>+	if (err) {</div><div class='add'>+		dma_unmap_single(priv-&gt;tx_dma_dev, addr,</div><div class='add'>+				 qm_fd_get_offset(&amp;fd) + qm_fd_get_length(&amp;fd),</div><div class='add'>+				 DMA_TO_DEVICE);</div><div class='add'>+		goto out_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+out_error:</div><div class='add'>+	percpu_stats-&gt;tx_errors++;</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dpaa_run_xdp(struct dpaa_priv *priv, struct qm_fd *fd, void *vaddr,</div><div class='add'>+			struct dpaa_fq *dpaa_fq, unsigned int *xdp_meta_len)</div><div class='add'>+{</div><div class='add'>+	ssize_t fd_off = qm_fd_get_offset(fd);</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+	struct xdp_buff xdp;</div><div class='add'>+	u32 xdp_act;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xdp_prog = READ_ONCE(priv-&gt;xdp_prog);</div><div class='add'>+	if (!xdp_prog)</div><div class='add'>+		return XDP_PASS;</div><div class='add'>+</div><div class='add'>+	xdp_init_buff(&amp;xdp, DPAA_BP_RAW_SIZE - DPAA_TX_PRIV_DATA_SIZE,</div><div class='add'>+		      &amp;dpaa_fq-&gt;xdp_rxq);</div><div class='add'>+	xdp_prepare_buff(&amp;xdp, vaddr + fd_off - XDP_PACKET_HEADROOM,</div><div class='add'>+			 XDP_PACKET_HEADROOM, qm_fd_get_length(fd), true);</div><div class='add'>+</div><div class='add'>+	/* We reserve a fixed headroom of 256 bytes under the erratum and we</div><div class='add'>+	 * offer it all to XDP programs to use. If no room is left for the</div><div class='add'>+	 * xdpf backpointer on TX, we will need to copy the data.</div><div class='add'>+	 * Disable metadata support since data realignments might be required</div><div class='add'>+	 * and the information can be lost.</div><div class='add'>+	 */</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+	if (unlikely(fman_has_errata_a050385())) {</div><div class='add'>+		xdp_set_data_meta_invalid(&amp;xdp);</div><div class='add'>+		xdp.data_hard_start = vaddr;</div><div class='add'>+		xdp.frame_sz = DPAA_BP_RAW_SIZE;</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	xdp_act = bpf_prog_run_xdp(xdp_prog, &amp;xdp);</div><div class='add'>+</div><div class='add'>+	/* Update the length and the offset of the FD */</div><div class='add'>+	qm_fd_set_contig(fd, xdp.data - vaddr, xdp.data_end - xdp.data);</div><div class='add'>+</div><div class='add'>+	switch (xdp_act) {</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+		*xdp_meta_len = xdp_data_meta_unsupported(&amp;xdp) ? 0 :</div><div class='add'>+				xdp.data - xdp.data_meta;</div><div class='add'>+#else</div><div class='add'>+		*xdp_meta_len = xdp.data - xdp.data_meta;</div><div class='add'>+#endif</div><div class='add'>+		break;</div><div class='add'>+	case XDP_TX:</div><div class='add'>+		/* We can access the full headroom when sending the frame</div><div class='add'>+		 * back out</div><div class='add'>+		 */</div><div class='add'>+		xdp.data_hard_start = vaddr;</div><div class='add'>+		xdp.frame_sz = DPAA_BP_RAW_SIZE;</div><div class='add'>+		xdpf = xdp_convert_buff_to_frame(&amp;xdp);</div><div class='add'>+		if (unlikely(!xdpf)) {</div><div class='add'>+			free_pages((unsigned long)vaddr, 0);</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (dpaa_xdp_xmit_frame(priv-&gt;net_dev, xdpf))</div><div class='add'>+			xdp_return_frame_rx_napi(xdpf);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case XDP_REDIRECT:</div><div class='add'>+		/* Allow redirect to use the full headroom */</div><div class='add'>+		xdp.data_hard_start = vaddr;</div><div class='add'>+		xdp.frame_sz = DPAA_BP_RAW_SIZE;</div><div class='add'>+</div><div class='add'>+		err = xdp_do_redirect(priv-&gt;net_dev, &amp;xdp, xdp_prog);</div><div class='add'>+		if (err) {</div><div class='add'>+			trace_xdp_exception(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='add'>+			free_pages((unsigned long)vaddr, 0);</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bpf_warn_invalid_xdp_action(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_ABORTED:</div><div class='add'>+		trace_xdp_exception(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_DROP:</div><div class='add'>+		/* Free the buffer */</div><div class='add'>+		free_pages((unsigned long)vaddr, 0);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return xdp_act;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal,</div><div class='ctx'> 						struct qman_fq *fq,</div><div class='del'>-						const struct qm_dqrr_entry *dq)</div><div class='add'>+						const struct qm_dqrr_entry *dq,</div><div class='add'>+						bool sched_napi)</div><div class='ctx'> {</div><div class='add'>+	bool ts_valid = false, hash_valid = false;</div><div class='ctx'> 	struct skb_shared_hwtstamps *shhwtstamps;</div><div class='add'>+	unsigned int skb_len, xdp_meta_len = 0;</div><div class='ctx'> 	struct rtnl_link_stats64 *percpu_stats;</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	const struct qm_fd *fd = &amp;dq-&gt;fd;</div><div class='ctx'> 	dma_addr_t addr = qm_fd_addr(fd);</div><div class='add'>+	struct dpaa_napi_portal *np;</div><div class='ctx'> 	enum qm_fd_format fd_format;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> 	u32 fd_status, hash_offset;</div><div class='add'>+	struct qm_sg_entry *sgt;</div><div class='ctx'> 	struct dpaa_bp *dpaa_bp;</div><div class='add'>+	struct dpaa_fq *dpaa_fq;</div><div class='ctx'> 	struct dpaa_priv *priv;</div><div class='del'>-	unsigned int skb_len;</div><div class='ctx'> 	struct sk_buff *skb;</div><div class='ctx'> 	int *count_ptr;</div><div class='add'>+	u32 xdp_act;</div><div class='ctx'> 	void *vaddr;</div><div class='add'>+	u32 hash;</div><div class='ctx'> 	u64 ns;</div><div class='ctx'> </div><div class='add'>+	dpaa_fq = container_of(fq, struct dpaa_fq, fq_base);</div><div class='ctx'> 	fd_status = be32_to_cpu(fd-&gt;status);</div><div class='ctx'> 	fd_format = qm_fd_get_format(fd);</div><div class='del'>-	net_dev = ((struct dpaa_fq *)fq)-&gt;net_dev;</div><div class='add'>+	net_dev = dpaa_fq-&gt;net_dev;</div><div class='ctx'> 	priv = netdev_priv(net_dev);</div><div class='ctx'> 	dpaa_bp = dpaa_bpid2pool(dq-&gt;fd.bpid);</div><div class='ctx'> 	if (!dpaa_bp)</div><div class='hunk'>@@ -2280,8 +2718,9 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal,</div><div class='ctx'> </div><div class='ctx'> 	percpu_priv = this_cpu_ptr(priv-&gt;percpu_priv);</div><div class='ctx'> 	percpu_stats = &amp;percpu_priv-&gt;stats;</div><div class='add'>+	np = &amp;percpu_priv-&gt;np;</div><div class='ctx'> </div><div class='del'>-	if (unlikely(dpaa_eth_napi_schedule(percpu_priv, portal)))</div><div class='add'>+	if (unlikely(dpaa_eth_napi_schedule(percpu_priv, portal, sched_napi)))</div><div class='ctx'> 		return qman_cb_dqrr_stop;</div><div class='ctx'> </div><div class='ctx'> 	/* Make sure we didn't run out of buffers */</div><div class='hunk'>@@ -2304,11 +2743,8 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal,</div><div class='ctx'> 		return qman_cb_dqrr_consume;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dpaa_bp = dpaa_bpid2pool(fd-&gt;bpid);</div><div class='del'>-	if (!dpaa_bp)</div><div class='del'>-		return qman_cb_dqrr_consume;</div><div class='del'>-</div><div class='del'>-	dma_unmap_single(dpaa_bp-&gt;dev, addr, dpaa_bp-&gt;size, DMA_FROM_DEVICE);</div><div class='add'>+	dma_unmap_page(dpaa_bp-&gt;priv-&gt;rx_dma_dev, addr, DPAA_BP_RAW_SIZE,</div><div class='add'>+		       DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	/* prefetch the first 64 bytes of the frame or the SGT start */</div><div class='ctx'> 	vaddr = phys_to_virt(addr);</div><div class='hunk'>@@ -2323,35 +2759,68 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal,</div><div class='ctx'> 	count_ptr = this_cpu_ptr(dpaa_bp-&gt;percpu_count);</div><div class='ctx'> 	(*count_ptr)--;</div><div class='ctx'> </div><div class='del'>-	if (likely(fd_format == qm_fd_contig))</div><div class='add'>+	/* Extract the timestamp stored in the headroom before running XDP */</div><div class='add'>+	if (priv-&gt;rx_tstamp) {</div><div class='add'>+		if (!fman_port_get_tstamp(priv-&gt;mac_dev-&gt;port[RX], vaddr, &amp;ns))</div><div class='add'>+			ts_valid = true;</div><div class='add'>+		else</div><div class='add'>+			WARN_ONCE(1, "fman_port_get_tstamp failed!\n");</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Extract the hash stored in the headroom before running XDP */</div><div class='add'>+	if (net_dev-&gt;features &amp; NETIF_F_RXHASH &amp;&amp; priv-&gt;keygen_in_use &amp;&amp;</div><div class='add'>+	    !fman_port_get_hash_result_offset(priv-&gt;mac_dev-&gt;port[RX],</div><div class='add'>+					      &amp;hash_offset)) {</div><div class='add'>+		hash = be32_to_cpu(*(__be32 *)(vaddr + hash_offset));</div><div class='add'>+		hash_valid = true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (likely(fd_format == qm_fd_contig)) {</div><div class='add'>+		xdp_act = dpaa_run_xdp(priv, (struct qm_fd *)fd, vaddr,</div><div class='add'>+				       dpaa_fq, &amp;xdp_meta_len);</div><div class='add'>+		np-&gt;xdp_act |= xdp_act;</div><div class='add'>+		if (xdp_act != XDP_PASS) {</div><div class='add'>+			percpu_stats-&gt;rx_packets++;</div><div class='add'>+			percpu_stats-&gt;rx_bytes += qm_fd_get_length(fd);</div><div class='add'>+			return qman_cb_dqrr_consume;</div><div class='add'>+		}</div><div class='ctx'> 		skb = contig_fd_to_skb(priv, fd);</div><div class='del'>-	else</div><div class='add'>+	} else {</div><div class='add'>+		/* XDP doesn't support S/G frames. Return the fragments to the</div><div class='add'>+		 * buffer pool and release the SGT.</div><div class='add'>+		 */</div><div class='add'>+		if (READ_ONCE(priv-&gt;xdp_prog)) {</div><div class='add'>+			WARN_ONCE(1, "S/G frames not supported under XDP\n");</div><div class='add'>+			sgt = vaddr + qm_fd_get_offset(fd);</div><div class='add'>+			dpaa_release_sgt_members(sgt);</div><div class='add'>+			free_pages((unsigned long)vaddr, 0);</div><div class='add'>+			return qman_cb_dqrr_consume;</div><div class='add'>+		}</div><div class='ctx'> 		skb = sg_fd_to_skb(priv, fd);</div><div class='add'>+	}</div><div class='ctx'> 	if (!skb)</div><div class='ctx'> 		return qman_cb_dqrr_consume;</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;rx_tstamp) {</div><div class='add'>+	if (xdp_meta_len)</div><div class='add'>+		skb_metadata_set(skb, xdp_meta_len);</div><div class='add'>+</div><div class='add'>+	/* Set the previously extracted timestamp */</div><div class='add'>+	if (ts_valid) {</div><div class='ctx'> 		shhwtstamps = skb_hwtstamps(skb);</div><div class='ctx'> 		memset(shhwtstamps, 0, sizeof(*shhwtstamps));</div><div class='del'>-</div><div class='del'>-		if (!fman_port_get_tstamp(priv-&gt;mac_dev-&gt;port[RX], vaddr, &amp;ns))</div><div class='del'>-			shhwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='del'>-		else</div><div class='del'>-			dev_warn(net_dev-&gt;dev.parent, "fman_port_get_tstamp failed!\n");</div><div class='add'>+		shhwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb-&gt;protocol = eth_type_trans(skb, net_dev);</div><div class='ctx'> </div><div class='del'>-	if (net_dev-&gt;features &amp; NETIF_F_RXHASH &amp;&amp; priv-&gt;keygen_in_use &amp;&amp;</div><div class='del'>-	    !fman_port_get_hash_result_offset(priv-&gt;mac_dev-&gt;port[RX],</div><div class='del'>-					      &amp;hash_offset)) {</div><div class='add'>+	/* Set the previously extracted hash */</div><div class='add'>+	if (hash_valid) {</div><div class='ctx'> 		enum pkt_hash_types type;</div><div class='ctx'> </div><div class='ctx'> 		/* if L4 exists, it was used in the hash generation */</div><div class='ctx'> 		type = be32_to_cpu(fd-&gt;status) &amp; FM_FD_STAT_L4CV ?</div><div class='ctx'> 			PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3;</div><div class='del'>-		skb_set_hash(skb, be32_to_cpu(*(u32 *)(vaddr + hash_offset)),</div><div class='del'>-			     type);</div><div class='add'>+		skb_set_hash(skb, hash, type);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	skb_len = skb-&gt;len;</div><div class='hunk'>@@ -2369,7 +2838,8 @@ static enum qman_cb_dqrr_result rx_default_dqrr(struct qman_portal *portal,</div><div class='ctx'> </div><div class='ctx'> static enum qman_cb_dqrr_result conf_error_dqrr(struct qman_portal *portal,</div><div class='ctx'> 						struct qman_fq *fq,</div><div class='del'>-						const struct qm_dqrr_entry *dq)</div><div class='add'>+						const struct qm_dqrr_entry *dq,</div><div class='add'>+						bool sched_napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='hunk'>@@ -2380,7 +2850,7 @@ static enum qman_cb_dqrr_result conf_error_dqrr(struct qman_portal *portal,</div><div class='ctx'> </div><div class='ctx'> 	percpu_priv = this_cpu_ptr(priv-&gt;percpu_priv);</div><div class='ctx'> </div><div class='del'>-	if (dpaa_eth_napi_schedule(percpu_priv, portal))</div><div class='add'>+	if (dpaa_eth_napi_schedule(percpu_priv, portal, sched_napi))</div><div class='ctx'> 		return qman_cb_dqrr_stop;</div><div class='ctx'> </div><div class='ctx'> 	dpaa_tx_error(net_dev, priv, percpu_priv, &amp;dq-&gt;fd, fq-&gt;fqid);</div><div class='hunk'>@@ -2390,7 +2860,8 @@ static enum qman_cb_dqrr_result conf_error_dqrr(struct qman_portal *portal,</div><div class='ctx'> </div><div class='ctx'> static enum qman_cb_dqrr_result conf_dflt_dqrr(struct qman_portal *portal,</div><div class='ctx'> 					       struct qman_fq *fq,</div><div class='del'>-					       const struct qm_dqrr_entry *dq)</div><div class='add'>+					       const struct qm_dqrr_entry *dq,</div><div class='add'>+					       bool sched_napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='hunk'>@@ -2404,7 +2875,7 @@ static enum qman_cb_dqrr_result conf_dflt_dqrr(struct qman_portal *portal,</div><div class='ctx'> </div><div class='ctx'> 	percpu_priv = this_cpu_ptr(priv-&gt;percpu_priv);</div><div class='ctx'> </div><div class='del'>-	if (dpaa_eth_napi_schedule(percpu_priv, portal))</div><div class='add'>+	if (dpaa_eth_napi_schedule(percpu_priv, portal, sched_napi))</div><div class='ctx'> 		return qman_cb_dqrr_stop;</div><div class='ctx'> </div><div class='ctx'> 	dpaa_tx_conf(net_dev, priv, percpu_priv, &amp;dq-&gt;fd, fq-&gt;fqid);</div><div class='hunk'>@@ -2430,7 +2901,7 @@ static void egress_ern(struct qman_portal *portal,</div><div class='ctx'> 	percpu_priv-&gt;stats.tx_fifo_errors++;</div><div class='ctx'> 	count_ern(percpu_priv, msg);</div><div class='ctx'> </div><div class='del'>-	skb = dpaa_cleanup_tx_fd(priv, fd);</div><div class='add'>+	skb = dpaa_cleanup_tx_fd(priv, fd, false);</div><div class='ctx'> 	dev_kfree_skb_any(skb);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -2450,7 +2921,7 @@ static void dpaa_eth_napi_enable(struct dpaa_priv *priv)</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		percpu_priv = per_cpu_ptr(priv-&gt;percpu_priv, i);</div><div class='ctx'> </div><div class='del'>-		percpu_priv-&gt;np.down = 0;</div><div class='add'>+		percpu_priv-&gt;np.down = false;</div><div class='ctx'> 		napi_enable(&amp;percpu_priv-&gt;np.napi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -2463,51 +2934,11 @@ static void dpaa_eth_napi_disable(struct dpaa_priv *priv)</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		percpu_priv = per_cpu_ptr(priv-&gt;percpu_priv, i);</div><div class='ctx'> </div><div class='del'>-		percpu_priv-&gt;np.down = 1;</div><div class='add'>+		percpu_priv-&gt;np.down = true;</div><div class='ctx'> 		napi_disable(&amp;percpu_priv-&gt;np.napi);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void dpaa_adjust_link(struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-	struct mac_device *mac_dev;</div><div class='del'>-	struct dpaa_priv *priv;</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(net_dev);</div><div class='del'>-	mac_dev = priv-&gt;mac_dev;</div><div class='del'>-	mac_dev-&gt;adjust_link(mac_dev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int dpaa_phy_init(struct net_device *net_dev)</div><div class='del'>-{</div><div class='del'>-	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };</div><div class='del'>-	struct mac_device *mac_dev;</div><div class='del'>-	struct phy_device *phy_dev;</div><div class='del'>-	struct dpaa_priv *priv;</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(net_dev);</div><div class='del'>-	mac_dev = priv-&gt;mac_dev;</div><div class='del'>-</div><div class='del'>-	phy_dev = of_phy_connect(net_dev, mac_dev-&gt;phy_node,</div><div class='del'>-				 &amp;dpaa_adjust_link, 0,</div><div class='del'>-				 mac_dev-&gt;phy_if);</div><div class='del'>-	if (!phy_dev) {</div><div class='del'>-		netif_err(priv, ifup, net_dev, "init_phy() failed\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove any features not supported by the controller */</div><div class='del'>-	ethtool_convert_legacy_u32_to_link_mode(mask, mac_dev-&gt;if_support);</div><div class='del'>-	linkmode_and(phy_dev-&gt;supported, phy_dev-&gt;supported, mask);</div><div class='del'>-</div><div class='del'>-	phy_support_asym_pause(phy_dev);</div><div class='del'>-</div><div class='del'>-	mac_dev-&gt;phy_dev = phy_dev;</div><div class='del'>-	net_dev-&gt;phydev = phy_dev;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dpaa_open(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_device *mac_dev;</div><div class='hunk'>@@ -2518,7 +2949,8 @@ static int dpaa_open(struct net_device *net_dev)</div><div class='ctx'> 	mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> 	dpaa_eth_napi_enable(priv);</div><div class='ctx'> </div><div class='del'>-	err = dpaa_phy_init(net_dev);</div><div class='add'>+	err = phylink_of_phy_connect(mac_dev-&gt;phylink,</div><div class='add'>+				     mac_dev-&gt;dev-&gt;of_node, 0);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto phy_init_failed;</div><div class='ctx'> </div><div class='hunk'>@@ -2528,11 +2960,12 @@ static int dpaa_open(struct net_device *net_dev)</div><div class='ctx'> 			goto mac_start_failed;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = priv-&gt;mac_dev-&gt;start(mac_dev);</div><div class='add'>+	err = priv-&gt;mac_dev-&gt;enable(mac_dev-&gt;fman_mac);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='del'>-		netif_err(priv, ifup, net_dev, "mac_dev-&gt;start() = %d\n", err);</div><div class='add'>+		netif_err(priv, ifup, net_dev, "mac_dev-&gt;enable() = %d\n", err);</div><div class='ctx'> 		goto mac_start_failed;</div><div class='ctx'> 	}</div><div class='add'>+	phylink_start(mac_dev-&gt;phylink);</div><div class='ctx'> </div><div class='ctx'> 	netif_tx_start_all_queues(net_dev);</div><div class='ctx'> </div><div class='hunk'>@@ -2541,6 +2974,7 @@ static int dpaa_open(struct net_device *net_dev)</div><div class='ctx'> mac_start_failed:</div><div class='ctx'> 	for (i = 0; i &lt; ARRAY_SIZE(mac_dev-&gt;port); i++)</div><div class='ctx'> 		fman_port_disable(mac_dev-&gt;port[i]);</div><div class='add'>+	phylink_disconnect_phy(mac_dev-&gt;phylink);</div><div class='ctx'> </div><div class='ctx'> phy_init_failed:</div><div class='ctx'> 	dpaa_eth_napi_disable(priv);</div><div class='hunk'>@@ -2561,15 +2995,118 @@ static int dpaa_eth_stop(struct net_device *net_dev)</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+static bool xdp_validate_mtu(struct dpaa_priv *priv, int mtu)</div><div class='add'>+{</div><div class='add'>+	int max_contig_data = priv-&gt;dpaa_bp-&gt;size - priv-&gt;rx_headroom;</div><div class='add'>+</div><div class='add'>+	/* We do not support S/G fragments when XDP is enabled.</div><div class='add'>+	 * Limit the MTU in relation to the buffer size.</div><div class='add'>+	 */</div><div class='add'>+	if (mtu + VLAN_ETH_HLEN + ETH_FCS_LEN &gt; max_contig_data) {</div><div class='add'>+		dev_warn(priv-&gt;net_dev-&gt;dev.parent,</div><div class='add'>+			 "The maximum MTU for XDP is %d\n",</div><div class='add'>+			 max_contig_data - VLAN_ETH_HLEN - ETH_FCS_LEN);</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_change_mtu(struct net_device *net_dev, int new_mtu)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;xdp_prog &amp;&amp; !xdp_validate_mtu(priv, new_mtu))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(net_dev-&gt;mtu, new_mtu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_setup_xdp(struct net_device *net_dev, struct netdev_bpf *bpf)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct bpf_prog *old_prog;</div><div class='add'>+	int err;</div><div class='add'>+	bool up;</div><div class='add'>+</div><div class='add'>+	/* S/G fragments are not supported in XDP-mode */</div><div class='add'>+	if (bpf-&gt;prog &amp;&amp; !xdp_validate_mtu(priv, net_dev-&gt;mtu)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(bpf-&gt;extack, "MTU too large for XDP");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up = netif_running(net_dev);</div><div class='add'>+</div><div class='add'>+	if (up)</div><div class='add'>+		dpaa_eth_stop(net_dev);</div><div class='add'>+</div><div class='add'>+	old_prog = xchg(&amp;priv-&gt;xdp_prog, bpf-&gt;prog);</div><div class='add'>+	if (old_prog)</div><div class='add'>+		bpf_prog_put(old_prog);</div><div class='add'>+</div><div class='add'>+	if (up) {</div><div class='add'>+		err = dpaa_open(net_dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(bpf-&gt;extack, "dpaa_open() failed");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_xdp(struct net_device *net_dev, struct netdev_bpf *xdp)</div><div class='add'>+{</div><div class='add'>+	switch (xdp-&gt;command) {</div><div class='add'>+	case XDP_SETUP_PROG:</div><div class='add'>+		return dpaa_setup_xdp(net_dev, xdp);</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_xdp_xmit(struct net_device *net_dev, int n,</div><div class='add'>+			 struct xdp_frame **frames, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+	int i, nxmit = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(flags &amp; ~XDP_XMIT_FLAGS_MASK))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(net_dev))</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; n; i++) {</div><div class='add'>+		xdpf = frames[i];</div><div class='add'>+		if (dpaa_xdp_xmit_frame(net_dev, xdpf))</div><div class='add'>+			break;</div><div class='add'>+		nxmit++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return nxmit;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_hwtstamp_get(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *config)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct hwtstamp_config config;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;config, rq-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	config-&gt;tx_type = priv-&gt;tx_tstamp ? HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;</div><div class='add'>+	config-&gt;rx_filter = priv-&gt;rx_tstamp ? HWTSTAMP_FILTER_ALL :</div><div class='add'>+			    HWTSTAMP_FILTER_NONE;</div><div class='ctx'> </div><div class='del'>-	switch (config.tx_type) {</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa_hwtstamp_set(struct net_device *dev,</div><div class='add'>+			     struct kernel_hwtstamp_config *config,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='ctx'> 		/* Couldn't disable rx/tx timestamping separately.</div><div class='ctx'> 		 * Do nothing here.</div><div class='hunk'>@@ -2584,7 +3121,7 @@ static int dpaa_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (config.rx_filter == HWTSTAMP_FILTER_NONE) {</div><div class='add'>+	if (config-&gt;rx_filter == HWTSTAMP_FILTER_NONE) {</div><div class='ctx'> 		/* Couldn't disable rx/tx timestamping separately.</div><div class='ctx'> 		 * Do nothing here.</div><div class='ctx'> 		 */</div><div class='hunk'>@@ -2593,26 +3130,17 @@ static int dpaa_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> 		priv-&gt;mac_dev-&gt;set_tstamp(priv-&gt;mac_dev-&gt;fman_mac, true);</div><div class='ctx'> 		priv-&gt;rx_tstamp = true;</div><div class='ctx'> 		/* TS is set for all frame types, not only those requested */</div><div class='del'>-		config.rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(rq-&gt;ifr_data, &amp;config, sizeof(config)) ?</div><div class='del'>-			-EFAULT : 0;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_ioctl(struct net_device *net_dev, struct ifreq *rq, int cmd)</div><div class='ctx'> {</div><div class='del'>-	int ret = -EINVAL;</div><div class='del'>-</div><div class='del'>-	if (cmd == SIOCGMIIREG) {</div><div class='del'>-		if (net_dev-&gt;phydev)</div><div class='del'>-			return phy_mii_ioctl(net_dev-&gt;phydev, rq, cmd);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cmd == SIOCSHWTSTAMP)</div><div class='del'>-		return dpaa_ts_ioctl(net_dev, rq, cmd);</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='del'>-	return ret;</div><div class='add'>+	return phylink_mii_ioctl(priv-&gt;mac_dev-&gt;phylink, rq, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops dpaa_ops = {</div><div class='hunk'>@@ -2621,12 +3149,16 @@ static const struct net_device_ops dpaa_ops = {</div><div class='ctx'> 	.ndo_stop = dpaa_eth_stop,</div><div class='ctx'> 	.ndo_tx_timeout = dpaa_tx_timeout,</div><div class='ctx'> 	.ndo_get_stats64 = dpaa_get_stats64,</div><div class='del'>-	.ndo_change_carrier = fixed_phy_change_carrier,</div><div class='ctx'> 	.ndo_set_mac_address = dpaa_set_mac_address,</div><div class='ctx'> 	.ndo_validate_addr = eth_validate_addr,</div><div class='ctx'> 	.ndo_set_rx_mode = dpaa_set_rx_mode,</div><div class='del'>-	.ndo_do_ioctl = dpaa_ioctl,</div><div class='add'>+	.ndo_eth_ioctl = dpaa_ioctl,</div><div class='ctx'> 	.ndo_setup_tc = dpaa_setup_tc,</div><div class='add'>+	.ndo_change_mtu = dpaa_change_mtu,</div><div class='add'>+	.ndo_bpf = dpaa_xdp,</div><div class='add'>+	.ndo_xdp_xmit = dpaa_xdp_xmit,</div><div class='add'>+	.ndo_hwtstamp_get = dpaa_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = dpaa_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static int dpaa_napi_add(struct net_device *net_dev)</div><div class='hunk'>@@ -2638,8 +3170,7 @@ static int dpaa_napi_add(struct net_device *net_dev)</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		percpu_priv = per_cpu_ptr(priv-&gt;percpu_priv, cpu);</div><div class='ctx'> </div><div class='del'>-		netif_napi_add(net_dev, &amp;percpu_priv-&gt;np.napi,</div><div class='del'>-			       dpaa_eth_poll, NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(net_dev, &amp;percpu_priv-&gt;np.napi, dpaa_eth_poll);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='hunk'>@@ -2654,8 +3185,9 @@ static void dpaa_napi_del(struct net_device *net_dev)</div><div class='ctx'> 	for_each_possible_cpu(cpu) {</div><div class='ctx'> 		percpu_priv = per_cpu_ptr(priv-&gt;percpu_priv, cpu);</div><div class='ctx'> </div><div class='del'>-		netif_napi_del(&amp;percpu_priv-&gt;np.napi);</div><div class='add'>+		__netif_napi_del(&amp;percpu_priv-&gt;np.napi);</div><div class='ctx'> 	}</div><div class='add'>+	synchronize_net();</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static inline void dpaa_bp_free_pf(const struct dpaa_bp *bp,</div><div class='hunk'>@@ -2663,7 +3195,8 @@ static inline void dpaa_bp_free_pf(const struct dpaa_bp *bp,</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t addr = bm_buf_addr(bmb);</div><div class='ctx'> </div><div class='del'>-	dma_unmap_single(bp-&gt;dev, addr, bp-&gt;size, DMA_FROM_DEVICE);</div><div class='add'>+	dma_unmap_page(bp-&gt;priv-&gt;rx_dma_dev, addr, DPAA_BP_RAW_SIZE,</div><div class='add'>+		       DMA_FROM_DEVICE);</div><div class='ctx'> </div><div class='ctx'> 	skb_free_frag(phys_to_virt(addr));</div><div class='ctx'> }</div><div class='hunk'>@@ -2740,7 +3273,8 @@ out_error:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl)</div><div class='add'>+static u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl,</div><div class='add'>+			     enum port_type port)</div><div class='ctx'> {</div><div class='ctx'> 	u16 headroom;</div><div class='ctx'> </div><div class='hunk'>@@ -2754,44 +3288,75 @@ static inline u16 dpaa_get_headroom(struct dpaa_buffer_layout *bl)</div><div class='ctx'> 	 *</div><div class='ctx'> 	 * Also make sure the headroom is a multiple of data_align bytes</div><div class='ctx'> 	 */</div><div class='del'>-	headroom = (u16)(bl-&gt;priv_data_size + DPAA_PARSE_RESULTS_SIZE +</div><div class='del'>-		DPAA_TIME_STAMP_SIZE + DPAA_HASH_RESULTS_SIZE);</div><div class='add'>+	headroom = (u16)(bl[port].priv_data_size + DPAA_HWA_SIZE);</div><div class='add'>+</div><div class='add'>+	if (port == RX) {</div><div class='add'>+#ifdef CONFIG_DPAA_ERRATUM_A050385</div><div class='add'>+		if (unlikely(fman_has_errata_a050385()))</div><div class='add'>+			headroom = XDP_PACKET_HEADROOM;</div><div class='add'>+#endif</div><div class='ctx'> </div><div class='del'>-	return DPAA_FD_DATA_ALIGNMENT ? ALIGN(headroom,</div><div class='del'>-					      DPAA_FD_DATA_ALIGNMENT) :</div><div class='del'>-					headroom;</div><div class='add'>+		return ALIGN(headroom, DPAA_FD_RX_DATA_ALIGNMENT);</div><div class='add'>+	} else {</div><div class='add'>+		return ALIGN(headroom, DPAA_FD_DATA_ALIGNMENT);</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_eth_probe(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='del'>-	struct dpaa_bp *dpaa_bps[DPAA_BPS_NUM] = {NULL};</div><div class='ctx'> 	struct net_device *net_dev = NULL;</div><div class='add'>+	struct dpaa_bp *dpaa_bp = NULL;</div><div class='ctx'> 	struct dpaa_fq *dpaa_fq, *tmp;</div><div class='ctx'> 	struct dpaa_priv *priv = NULL;</div><div class='ctx'> 	struct fm_port_fqs port_fqs;</div><div class='ctx'> 	struct mac_device *mac_dev;</div><div class='del'>-	int err = 0, i, channel;</div><div class='add'>+	int err = 0, channel;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> </div><div class='del'>-	/* device used for DMA mapping */</div><div class='del'>-	dev = pdev-&gt;dev.parent;</div><div class='del'>-	err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dma_coerce_mask_and_coherent() failed\n");</div><div class='del'>-		return err;</div><div class='add'>+	dev = &amp;pdev-&gt;dev;</div><div class='add'>+</div><div class='add'>+	err = bman_is_probed();</div><div class='add'>+	if (!err)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "failing probe due to bman probe error\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	err = qman_is_probed();</div><div class='add'>+	if (!err)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "failing probe due to qman probe error\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	err = bman_portals_probed();</div><div class='add'>+	if (!err)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"failing probe due to bman portals probe error\n");</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+	err = qman_portals_probed();</div><div class='add'>+	if (!err)</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev,</div><div class='add'>+			"failing probe due to qman portals probe error\n");</div><div class='add'>+		return -ENODEV;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Allocate this early, so we can store relevant information in</div><div class='ctx'> 	 * the private area</div><div class='ctx'> 	 */</div><div class='del'>-	net_dev = alloc_etherdev_mq(sizeof(*priv), DPAA_ETH_TXQ_NUM);</div><div class='add'>+	net_dev = alloc_etherdev_mq(sizeof(*priv), dpaa_max_num_txqs());</div><div class='ctx'> 	if (!net_dev) {</div><div class='ctx'> 		dev_err(dev, "alloc_etherdev_mq() failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Do this here, so we can be verbose early */</div><div class='del'>-	SET_NETDEV_DEV(net_dev, dev);</div><div class='add'>+	SET_NETDEV_DEV(net_dev, dev-&gt;parent);</div><div class='ctx'> 	dev_set_drvdata(dev, net_dev);</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(net_dev);</div><div class='hunk'>@@ -2799,13 +3364,41 @@ static int dpaa_eth_probe(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;msg_enable = netif_msg_init(debug, DPAA_MSG_DEFAULT);</div><div class='ctx'> </div><div class='add'>+	priv-&gt;egress_fqs = devm_kcalloc(dev, dpaa_max_num_txqs(),</div><div class='add'>+					sizeof(*priv-&gt;egress_fqs),</div><div class='add'>+					GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;egress_fqs) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;conf_fqs = devm_kcalloc(dev, dpaa_max_num_txqs(),</div><div class='add'>+				      sizeof(*priv-&gt;conf_fqs),</div><div class='add'>+				      GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;conf_fqs) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	mac_dev = dpaa_mac_dev_get(pdev);</div><div class='ctx'> 	if (IS_ERR(mac_dev)) {</div><div class='del'>-		dev_err(dev, "dpaa_mac_dev_get() failed\n");</div><div class='add'>+		netdev_err(net_dev, "dpaa_mac_dev_get() failed\n");</div><div class='ctx'> 		err = PTR_ERR(mac_dev);</div><div class='ctx'> 		goto free_netdev;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* Devices used for DMA mapping */</div><div class='add'>+	priv-&gt;rx_dma_dev = fman_port_get_device(mac_dev-&gt;port[RX]);</div><div class='add'>+	priv-&gt;tx_dma_dev = fman_port_get_device(mac_dev-&gt;port[TX]);</div><div class='add'>+	err = dma_coerce_mask_and_coherent(priv-&gt;rx_dma_dev, DMA_BIT_MASK(40));</div><div class='add'>+	if (!err)</div><div class='add'>+		err = dma_coerce_mask_and_coherent(priv-&gt;tx_dma_dev,</div><div class='add'>+						   DMA_BIT_MASK(40));</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dma_coerce_mask_and_coherent() failed\n");</div><div class='add'>+		goto free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	/* If fsl_fm_max_frm is set to a higher value than the all-common 1500,</div><div class='ctx'> 	 * we choose conservatively and let the user explicitly set a higher</div><div class='ctx'> 	 * MTU via ifconfig. Otherwise, the user may end up with different MTUs</div><div class='hunk'>@@ -2822,23 +3415,21 @@ static int dpaa_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	priv-&gt;buf_layout[TX].priv_data_size = DPAA_TX_PRIV_DATA_SIZE; /* Tx */</div><div class='ctx'> </div><div class='ctx'> 	/* bp init */</div><div class='del'>-	for (i = 0; i &lt; DPAA_BPS_NUM; i++) {</div><div class='del'>-		dpaa_bps[i] = dpaa_bp_alloc(dev);</div><div class='del'>-		if (IS_ERR(dpaa_bps[i])) {</div><div class='del'>-			err = PTR_ERR(dpaa_bps[i]);</div><div class='del'>-			goto free_dpaa_bps;</div><div class='del'>-		}</div><div class='del'>-		/* the raw size of the buffers used for reception */</div><div class='del'>-		dpaa_bps[i]-&gt;raw_size = bpool_buffer_raw_size(i, DPAA_BPS_NUM);</div><div class='del'>-		/* avoid runtime computations by keeping the usable size here */</div><div class='del'>-		dpaa_bps[i]-&gt;size = dpaa_bp_size(dpaa_bps[i]-&gt;raw_size);</div><div class='del'>-		dpaa_bps[i]-&gt;dev = dev;</div><div class='del'>-</div><div class='del'>-		err = dpaa_bp_alloc_pool(dpaa_bps[i]);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			goto free_dpaa_bps;</div><div class='del'>-		priv-&gt;dpaa_bps[i] = dpaa_bps[i];</div><div class='add'>+	dpaa_bp = dpaa_bp_alloc(dev);</div><div class='add'>+	if (IS_ERR(dpaa_bp)) {</div><div class='add'>+		err = PTR_ERR(dpaa_bp);</div><div class='add'>+		goto free_dpaa_bps;</div><div class='ctx'> 	}</div><div class='add'>+	/* the raw size of the buffers used for reception */</div><div class='add'>+	dpaa_bp-&gt;raw_size = DPAA_BP_RAW_SIZE;</div><div class='add'>+	/* avoid runtime computations by keeping the usable size here */</div><div class='add'>+	dpaa_bp-&gt;size = dpaa_bp_size(dpaa_bp-&gt;raw_size);</div><div class='add'>+	dpaa_bp-&gt;priv = priv;</div><div class='add'>+</div><div class='add'>+	err = dpaa_bp_alloc_pool(dpaa_bp);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		goto free_dpaa_bps;</div><div class='add'>+	priv-&gt;dpaa_bp = dpaa_bp;</div><div class='ctx'> </div><div class='ctx'> 	INIT_LIST_HEAD(&amp;priv-&gt;dpaa_fq_list);</div><div class='ctx'> </div><div class='hunk'>@@ -2864,9 +3455,11 @@ static int dpaa_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	/* Walk the CPUs with affine portals</div><div class='ctx'> 	 * and add this pool channel to each's dequeue mask.</div><div class='ctx'> 	 */</div><div class='del'>-	dpaa_eth_add_channel(priv-&gt;channel);</div><div class='add'>+	dpaa_eth_add_channel(priv-&gt;channel, &amp;pdev-&gt;dev);</div><div class='ctx'> </div><div class='del'>-	dpaa_fq_setup(priv, &amp;dpaa_fq_cbs, priv-&gt;mac_dev-&gt;port[TX]);</div><div class='add'>+	err = dpaa_fq_setup(priv, &amp;dpaa_fq_cbs, priv-&gt;mac_dev-&gt;port[TX]);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_dpaa_bps;</div><div class='ctx'> </div><div class='ctx'> 	/* Create a congestion group for this netdev, with</div><div class='ctx'> 	 * dynamically-allocated CGR ID.</div><div class='hunk'>@@ -2892,11 +3485,11 @@ static int dpaa_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 			goto free_dpaa_fqs;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;tx_headroom = dpaa_get_headroom(&amp;priv-&gt;buf_layout[TX]);</div><div class='del'>-	priv-&gt;rx_headroom = dpaa_get_headroom(&amp;priv-&gt;buf_layout[RX]);</div><div class='add'>+	priv-&gt;tx_headroom = dpaa_get_headroom(priv-&gt;buf_layout, TX);</div><div class='add'>+	priv-&gt;rx_headroom = dpaa_get_headroom(priv-&gt;buf_layout, RX);</div><div class='ctx'> </div><div class='ctx'> 	/* All real interfaces need their ports initialized */</div><div class='del'>-	err = dpaa_eth_init_ports(mac_dev, dpaa_bps, DPAA_BPS_NUM, &amp;port_fqs,</div><div class='add'>+	err = dpaa_eth_init_ports(mac_dev, dpaa_bp, &amp;port_fqs,</div><div class='ctx'> 				  &amp;priv-&gt;buf_layout[0], dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_dpaa_fqs;</div><div class='hunk'>@@ -2912,7 +3505,8 @@ static int dpaa_eth_probe(struct platform_device *pdev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;num_tc = 1;</div><div class='del'>-	netif_set_real_num_tx_queues(net_dev, priv-&gt;num_tc * DPAA_TC_TXQ_NUM);</div><div class='add'>+	netif_set_real_num_tx_queues(net_dev,</div><div class='add'>+				     priv-&gt;num_tc * dpaa_num_txqs_per_tc());</div><div class='ctx'> </div><div class='ctx'> 	/* Initialize NAPI */</div><div class='ctx'> 	err = dpaa_napi_add(net_dev);</div><div class='hunk'>@@ -2948,14 +3542,14 @@ free_netdev:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_remove(struct platform_device *pdev)</div><div class='add'>+static void dpaa_remove(struct platform_device *pdev)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> 	struct dpaa_priv *priv;</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	dev = pdev-&gt;dev.parent;</div><div class='add'>+	dev = &amp;pdev-&gt;dev;</div><div class='ctx'> 	net_dev = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(net_dev);</div><div class='hunk'>@@ -2964,8 +3558,12 @@ static int dpaa_remove(struct platform_device *pdev)</div><div class='ctx'> </div><div class='ctx'> 	dev_set_drvdata(dev, NULL);</div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='add'>+	phylink_destroy(priv-&gt;mac_dev-&gt;phylink);</div><div class='ctx'> </div><div class='ctx'> 	err = dpaa_fq_free(dev, &amp;priv-&gt;dpaa_fq_list);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(dev, "Failed to free FQs on remove (%pE)\n",</div><div class='add'>+			ERR_PTR(err));</div><div class='ctx'> </div><div class='ctx'> 	qman_delete_cgr_safe(&amp;priv-&gt;ingress_cgr);</div><div class='ctx'> 	qman_release_cgrid(priv-&gt;ingress_cgr.cgrid);</div><div class='hunk'>@@ -2977,8 +3575,6 @@ static int dpaa_remove(struct platform_device *pdev)</div><div class='ctx'> 	dpaa_bps_free(priv);</div><div class='ctx'> </div><div class='ctx'> 	free_netdev(net_dev);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct platform_device_id dpaa_devtype[] = {</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h<br/>index af320f83c742..7ed659eb08de 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa/dpaa_eth.h</a></div><div class='hunk'>@@ -1,37 +1,14 @@</div><div class='del'>-/* Copyright 2008 - 2016 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *	 documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *	 names of its contributors may be used to endorse or promote products</div><div class='del'>- *	 derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 - 2016 Freescale Semiconductor Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __DPAA_H</div><div class='ctx'> #define __DPAA_H</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/refcount.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='ctx'> #include &lt;soc/fsl/qman.h&gt;</div><div class='ctx'> #include &lt;soc/fsl/bman.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -41,12 +18,6 @@</div><div class='ctx'> </div><div class='ctx'> /* Number of prioritised traffic classes */</div><div class='ctx'> #define DPAA_TC_NUM		4</div><div class='del'>-/* Number of Tx queues per traffic class */</div><div class='del'>-#define DPAA_TC_TXQ_NUM		NR_CPUS</div><div class='del'>-/* Total number of Tx queues */</div><div class='del'>-#define DPAA_ETH_TXQ_NUM	(DPAA_TC_NUM * DPAA_TC_TXQ_NUM)</div><div class='del'>-</div><div class='del'>-#define DPAA_BPS_NUM 3 /* number of bpools per interface */</div><div class='ctx'> </div><div class='ctx'> /* More detailed FQ types - used for fine-grained WQ assignments */</div><div class='ctx'> enum dpaa_fq_type {</div><div class='hunk'>@@ -69,6 +40,7 @@ struct dpaa_fq {</div><div class='ctx'> 	u16 channel;</div><div class='ctx'> 	u8 wq;</div><div class='ctx'> 	enum dpaa_fq_type fq_type;</div><div class='add'>+	struct xdp_rxq_info xdp_rxq;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa_fq_cbs {</div><div class='hunk'>@@ -79,9 +51,11 @@ struct dpaa_fq_cbs {</div><div class='ctx'> 	struct qman_fq egress_ern;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dpaa_priv;</div><div class='add'>+</div><div class='ctx'> struct dpaa_bp {</div><div class='del'>-	/* device used in the DMA mapping operations */</div><div class='del'>-	struct device *dev;</div><div class='add'>+	/* used in the DMA mapping operations */</div><div class='add'>+	struct dpaa_priv *priv;</div><div class='ctx'> 	/* current number of buffers in the buffer pool alloted to each CPU */</div><div class='ctx'> 	int __percpu *percpu_count;</div><div class='ctx'> 	/* all buffers allocated for this pool have this raw size */</div><div class='hunk'>@@ -99,7 +73,7 @@ struct dpaa_bp {</div><div class='ctx'> 	int (*seed_cb)(struct dpaa_bp *);</div><div class='ctx'> 	/* bpool can be emptied before freeing by this cb */</div><div class='ctx'> 	void (*free_buf_cb)(const struct dpaa_bp *, struct bm_buffer *);</div><div class='del'>-	atomic_t refs;</div><div class='add'>+	refcount_t refs;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa_rx_errors {</div><div class='hunk'>@@ -125,6 +99,7 @@ struct dpaa_napi_portal {</div><div class='ctx'> 	struct napi_struct napi;</div><div class='ctx'> 	struct qman_portal *p;</div><div class='ctx'> 	bool down;</div><div class='add'>+	int xdp_act;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa_percpu_priv {</div><div class='hunk'>@@ -143,17 +118,28 @@ struct dpaa_buffer_layout {</div><div class='ctx'> 	u16 priv_data_size;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+/* Information to be used on the Tx confirmation path. Stored just</div><div class='add'>+ * before the start of the transmit buffer. Maximum size allowed</div><div class='add'>+ * is DPAA_TX_PRIV_DATA_SIZE bytes.</div><div class='add'>+ */</div><div class='add'>+struct dpaa_eth_swbp {</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct xdp_frame *xdpf;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dpaa_priv {</div><div class='ctx'> 	struct dpaa_percpu_priv __percpu *percpu_priv;</div><div class='del'>-	struct dpaa_bp *dpaa_bps[DPAA_BPS_NUM];</div><div class='add'>+	struct dpaa_bp *dpaa_bp;</div><div class='ctx'> 	/* Store here the needed Tx headroom for convenience and speed</div><div class='ctx'> 	 * (even though it can be computed based on the fields of buf_layout)</div><div class='ctx'> 	 */</div><div class='ctx'> 	u16 tx_headroom;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='ctx'> 	struct mac_device *mac_dev;</div><div class='del'>-	struct qman_fq *egress_fqs[DPAA_ETH_TXQ_NUM];</div><div class='del'>-	struct qman_fq *conf_fqs[DPAA_ETH_TXQ_NUM];</div><div class='add'>+	struct device *rx_dma_dev;</div><div class='add'>+	struct device *tx_dma_dev;</div><div class='add'>+	struct qman_fq **egress_fqs;</div><div class='add'>+	struct qman_fq **conf_fqs;</div><div class='ctx'> </div><div class='ctx'> 	u16 channel;</div><div class='ctx'> 	struct list_head dpaa_fq_list;</div><div class='hunk'>@@ -185,6 +171,8 @@ struct dpaa_priv {</div><div class='ctx'> </div><div class='ctx'> 	bool tx_tstamp; /* Tx timestamping enabled */</div><div class='ctx'> 	bool rx_tstamp; /* Rx timestamping enabled */</div><div class='add'>+</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* from dpaa_ethtool.c */</div><div class='hunk'>@@ -193,4 +181,16 @@ extern const struct ethtool_ops dpaa_ethtool_ops;</div><div class='ctx'> /* from dpaa_eth_sysfs.c */</div><div class='ctx'> void dpaa_eth_sysfs_remove(struct device *dev);</div><div class='ctx'> void dpaa_eth_sysfs_init(struct device *dev);</div><div class='add'>+</div><div class='add'>+static inline size_t dpaa_num_txqs_per_tc(void)</div><div class='add'>+{</div><div class='add'>+	return num_possible_cpus();</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Total number of Tx queues */</div><div class='add'>+static inline size_t dpaa_max_num_txqs(void)</div><div class='add'>+{</div><div class='add'>+	return DPAA_TC_NUM * dpaa_num_txqs_per_tc();</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> #endif	/* __DPAA_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c<br/>index 0d9b185e317f..aad470e9caea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_sysfs.c</a></div><div class='hunk'>@@ -1,32 +1,6 @@</div><div class='del'>-/* Copyright 2008-2016 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *	 documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *	 names of its contributors may be used to endorse or promote products</div><div class='del'>- *	 derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 - 2016 Freescale Semiconductor Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='hunk'>@@ -61,7 +35,6 @@ static ssize_t dpaa_eth_show_fqids(struct device *dev,</div><div class='ctx'> 	u32 last_fqid = 0;</div><div class='ctx'> 	ssize_t bytes = 0;</div><div class='ctx'> 	char *str;</div><div class='del'>-	int i = 0;</div><div class='ctx'> </div><div class='ctx'> 	list_for_each_entry_safe(fq, tmp, &amp;priv-&gt;dpaa_fq_list, list) {</div><div class='ctx'> 		switch (fq-&gt;fq_type) {</div><div class='hunk'>@@ -111,7 +84,6 @@ static ssize_t dpaa_eth_show_fqids(struct device *dev,</div><div class='ctx'> </div><div class='ctx'> 		prev = fq;</div><div class='ctx'> 		prevstr = str;</div><div class='del'>-		i++;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (prev) {</div><div class='hunk'>@@ -131,11 +103,9 @@ static ssize_t dpaa_eth_show_bpids(struct device *dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_priv *priv = netdev_priv(to_net_dev(dev));</div><div class='ctx'> 	ssize_t bytes = 0;</div><div class='del'>-	int i = 0;</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; DPAA_BPS_NUM; i++)</div><div class='del'>-		bytes += snprintf(buf + bytes, PAGE_SIZE - bytes, "%u\n",</div><div class='del'>-				  priv-&gt;dpaa_bps[i]-&gt;bpid);</div><div class='add'>+	bytes += snprintf(buf + bytes, PAGE_SIZE - bytes, "%u\n",</div><div class='add'>+				  priv-&gt;dpaa_bp-&gt;bpid);</div><div class='ctx'> </div><div class='ctx'> 	return bytes;</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h b/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h<br/>index 409c1dc39430..9e1d44ae92cc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa/dpaa_eth_trace.h</a></div><div class='hunk'>@@ -1,32 +1,6 @@</div><div class='del'>-/* Copyright 2013-2015 Freescale Semiconductor Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *	 documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *	 names of its contributors may be used to endorse or promote products</div><div class='del'>- *	 derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2013-2015 Freescale Semiconductor Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #undef TRACE_SYSTEM</div><div class='hunk'>@@ -82,8 +56,8 @@ DECLARE_EVENT_CLASS(dpaa_eth_fd,</div><div class='ctx'> 		__entry-&gt;fd_format = qm_fd_get_format(fd);</div><div class='ctx'> 		__entry-&gt;fd_offset = qm_fd_get_offset(fd);</div><div class='ctx'> 		__entry-&gt;fd_length = qm_fd_get_length(fd);</div><div class='del'>-		__entry-&gt;fd_status = fd-&gt;status;</div><div class='del'>-		__assign_str(name, netdev-&gt;name);</div><div class='add'>+		__entry-&gt;fd_status = __be32_to_cpu(fd-&gt;status);</div><div class='add'>+		__assign_str(name);</div><div class='ctx'> 	),</div><div class='ctx'> </div><div class='ctx'> 	/* This is what gets printed when the trace event is triggered */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c<br/>index 7ce2e99b594d..ed3fa80af8c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c</a></div><div class='hunk'>@@ -1,38 +1,14 @@</div><div class='del'>-/* Copyright 2008-2016 Freescale Semiconductor, Inc.</div><div class='del'>- *</div><div class='del'>- * Redistribution and use in source and binary forms, with or without</div><div class='del'>- * modification, are permitted provided that the following conditions are met:</div><div class='del'>- *     * Redistributions of source code must retain the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer.</div><div class='del'>- *     * Redistributions in binary form must reproduce the above copyright</div><div class='del'>- *	 notice, this list of conditions and the following disclaimer in the</div><div class='del'>- *	 documentation and/or other materials provided with the distribution.</div><div class='del'>- *     * Neither the name of Freescale Semiconductor nor the</div><div class='del'>- *	 names of its contributors may be used to endorse or promote products</div><div class='del'>- *	 derived from this software without specific prior written permission.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * ALTERNATIVELY, this software may be distributed under the terms of the</div><div class='del'>- * GNU General Public License ("GPL") as published by the Free Software</div><div class='del'>- * Foundation, either version 2 of that License or (at your option) any</div><div class='del'>- * later version.</div><div class='del'>- *</div><div class='del'>- * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY</div><div class='del'>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED</div><div class='del'>- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE</div><div class='del'>- * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY</div><div class='del'>- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES</div><div class='del'>- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;</div><div class='del'>- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND</div><div class='del'>- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT</div><div class='del'>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</div><div class='del'>- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</div><div class='add'>+// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2008 - 2016 Freescale Semiconductor Inc.</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/string.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='ctx'> #include &lt;linux/of_platform.h&gt;</div><div class='add'>+#include &lt;linux/platform_device.h&gt;</div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> #include &lt;linux/fsl/ptp_qoriq.h&gt;</div><div class='ctx'> </div><div class='hunk'>@@ -47,6 +23,8 @@ static const char dpaa_stats_percpu[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"tx S/G",</div><div class='ctx'> 	"tx error",</div><div class='ctx'> 	"rx error",</div><div class='add'>+	"rx dropped",</div><div class='add'>+	"tx dropped",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> static char dpaa_stats_global[][ETH_GSTRING_LEN] = {</div><div class='hunk'>@@ -78,50 +56,27 @@ static char dpaa_stats_global[][ETH_GSTRING_LEN] = {</div><div class='ctx'> static int dpaa_get_link_ksettings(struct net_device *net_dev,</div><div class='ctx'> 				   struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='del'>-	if (!net_dev-&gt;phydev) {</div><div class='del'>-		netdev_dbg(net_dev, "phy device not initialized\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	phy_ethtool_ksettings_get(net_dev-&gt;phydev, cmd);</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	return phylink_ethtool_ksettings_get(mac_dev-&gt;phylink, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_set_link_ksettings(struct net_device *net_dev,</div><div class='ctx'> 				   const struct ethtool_link_ksettings *cmd)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!net_dev-&gt;phydev) {</div><div class='del'>-		netdev_err(net_dev, "phy device not initialized\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = phy_ethtool_ksettings_set(net_dev-&gt;phydev, cmd);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		netdev_err(net_dev, "phy_ethtool_ksettings_set() = %d\n", err);</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return phylink_ethtool_ksettings_set(mac_dev-&gt;phylink, cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dpaa_get_drvinfo(struct net_device *net_dev,</div><div class='ctx'> 			     struct ethtool_drvinfo *drvinfo)</div><div class='ctx'> {</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	strlcpy(drvinfo-&gt;driver, KBUILD_MODNAME,</div><div class='add'>+	strscpy(drvinfo-&gt;driver, KBUILD_MODNAME,</div><div class='ctx'> 		sizeof(drvinfo-&gt;driver));</div><div class='del'>-	len = snprintf(drvinfo-&gt;version, sizeof(drvinfo-&gt;version),</div><div class='del'>-		       "%X", 0);</div><div class='del'>-	len = snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='del'>-		       "%X", 0);</div><div class='del'>-</div><div class='del'>-	if (len &gt;= sizeof(drvinfo-&gt;fw_version)) {</div><div class='del'>-		/* Truncated output */</div><div class='del'>-		netdev_notice(net_dev, "snprintf() = %d\n", len);</div><div class='del'>-	}</div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, dev_name(net_dev-&gt;dev.parent-&gt;parent),</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, dev_name(net_dev-&gt;dev.parent-&gt;parent),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -138,84 +93,28 @@ static void dpaa_set_msglevel(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> static int dpaa_nway_reset(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	if (!net_dev-&gt;phydev) {</div><div class='del'>-		netdev_err(net_dev, "phy device not initialized\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	err = 0;</div><div class='del'>-	if (net_dev-&gt;phydev-&gt;autoneg) {</div><div class='del'>-		err = phy_start_aneg(net_dev-&gt;phydev);</div><div class='del'>-		if (err &lt; 0)</div><div class='del'>-			netdev_err(net_dev, "phy_start_aneg() = %d\n",</div><div class='del'>-				   err);</div><div class='del'>-	}</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return phylink_ethtool_nway_reset(mac_dev-&gt;phylink);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dpaa_get_pauseparam(struct net_device *net_dev,</div><div class='ctx'> 				struct ethtool_pauseparam *epause)</div><div class='ctx'> {</div><div class='del'>-	struct mac_device *mac_dev;</div><div class='del'>-	struct dpaa_priv *priv;</div><div class='del'>-</div><div class='del'>-	priv = netdev_priv(net_dev);</div><div class='del'>-	mac_dev = priv-&gt;mac_dev;</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> </div><div class='del'>-	if (!net_dev-&gt;phydev) {</div><div class='del'>-		netdev_err(net_dev, "phy device not initialized\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	epause-&gt;autoneg = mac_dev-&gt;autoneg_pause;</div><div class='del'>-	epause-&gt;rx_pause = mac_dev-&gt;rx_pause_active;</div><div class='del'>-	epause-&gt;tx_pause = mac_dev-&gt;tx_pause_active;</div><div class='add'>+	phylink_ethtool_get_pauseparam(mac_dev-&gt;phylink, epause);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_set_pauseparam(struct net_device *net_dev,</div><div class='ctx'> 			       struct ethtool_pauseparam *epause)</div><div class='ctx'> {</div><div class='del'>-	struct mac_device *mac_dev;</div><div class='del'>-	struct phy_device *phydev;</div><div class='del'>-	bool rx_pause, tx_pause;</div><div class='del'>-	struct dpaa_priv *priv;</div><div class='del'>-	int err;</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='ctx'> </div><div class='del'>-	priv = netdev_priv(net_dev);</div><div class='del'>-	mac_dev = priv-&gt;mac_dev;</div><div class='del'>-</div><div class='del'>-	phydev = net_dev-&gt;phydev;</div><div class='del'>-	if (!phydev) {</div><div class='del'>-		netdev_err(net_dev, "phy device not initialized\n");</div><div class='del'>-		return -ENODEV;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!phy_validate_pause(phydev, epause))</div><div class='del'>-		return -EINVAL;</div><div class='del'>-</div><div class='del'>-	/* The MAC should know how to handle PAUSE frame autonegotiation before</div><div class='del'>-	 * adjust_link is triggered by a forced renegotiation of sym/asym PAUSE</div><div class='del'>-	 * settings.</div><div class='del'>-	 */</div><div class='del'>-	mac_dev-&gt;autoneg_pause = !!epause-&gt;autoneg;</div><div class='del'>-	mac_dev-&gt;rx_pause_req = !!epause-&gt;rx_pause;</div><div class='del'>-	mac_dev-&gt;tx_pause_req = !!epause-&gt;tx_pause;</div><div class='del'>-</div><div class='del'>-	/* Determine the sym/asym advertised PAUSE capabilities from the desired</div><div class='del'>-	 * rx/tx pause settings.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	phy_set_asym_pause(phydev, epause-&gt;rx_pause, epause-&gt;tx_pause);</div><div class='del'>-</div><div class='del'>-	fman_get_pause_cfg(mac_dev, &amp;rx_pause, &amp;tx_pause);</div><div class='del'>-	err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		netdev_err(net_dev, "set_mac_active_pause() = %d\n", err);</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='add'>+	return phylink_ethtool_set_pauseparam(mac_dev-&gt;phylink, epause);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_get_sset_count(struct net_device *net_dev, int type)</div><div class='hunk'>@@ -223,7 +122,7 @@ static int dpaa_get_sset_count(struct net_device *net_dev, int type)</div><div class='ctx'> 	unsigned int total_stats, num_stats;</div><div class='ctx'> </div><div class='ctx'> 	num_stats   = num_online_cpus() + 1;</div><div class='del'>-	total_stats = num_stats * (DPAA_STATS_PERCPU_LEN + DPAA_BPS_NUM) +</div><div class='add'>+	total_stats = num_stats * (DPAA_STATS_PERCPU_LEN + 1) +</div><div class='ctx'> 			DPAA_STATS_GLOBAL_LEN;</div><div class='ctx'> </div><div class='ctx'> 	switch (type) {</div><div class='hunk'>@@ -235,10 +134,10 @@ static int dpaa_get_sset_count(struct net_device *net_dev, int type)</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void copy_stats(struct dpaa_percpu_priv *percpu_priv, int num_cpus,</div><div class='del'>-		       int crr_cpu, u64 *bp_count, u64 *data)</div><div class='add'>+		       int crr_cpu, u64 bp_count, u64 *data)</div><div class='ctx'> {</div><div class='ctx'> 	int num_values = num_cpus + 1;</div><div class='del'>-	int crr = 0, j;</div><div class='add'>+	int crr = 0;</div><div class='ctx'> </div><div class='ctx'> 	/* update current CPU's stats and also add them to the total values */</div><div class='ctx'> 	data[crr * num_values + crr_cpu] = percpu_priv-&gt;in_interrupt;</div><div class='hunk'>@@ -262,23 +161,27 @@ static void copy_stats(struct dpaa_percpu_priv *percpu_priv, int num_cpus,</div><div class='ctx'> 	data[crr * num_values + crr_cpu] = percpu_priv-&gt;stats.rx_errors;</div><div class='ctx'> 	data[crr++ * num_values + num_cpus] += percpu_priv-&gt;stats.rx_errors;</div><div class='ctx'> </div><div class='del'>-	for (j = 0; j &lt; DPAA_BPS_NUM; j++) {</div><div class='del'>-		data[crr * num_values + crr_cpu] = bp_count[j];</div><div class='del'>-		data[crr++ * num_values + num_cpus] += bp_count[j];</div><div class='del'>-	}</div><div class='add'>+	data[crr * num_values + crr_cpu] = percpu_priv-&gt;stats.rx_dropped;</div><div class='add'>+	data[crr++ * num_values + num_cpus] += percpu_priv-&gt;stats.rx_dropped;</div><div class='add'>+</div><div class='add'>+	data[crr * num_values + crr_cpu] = percpu_priv-&gt;stats.tx_dropped;</div><div class='add'>+	data[crr++ * num_values + num_cpus] += percpu_priv-&gt;stats.tx_dropped;</div><div class='add'>+</div><div class='add'>+	data[crr * num_values + crr_cpu] = bp_count;</div><div class='add'>+	data[crr++ * num_values + num_cpus] += bp_count;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dpaa_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> 				   struct ethtool_stats *stats, u64 *data)</div><div class='ctx'> {</div><div class='del'>-	u64 bp_count[DPAA_BPS_NUM], cg_time, cg_num;</div><div class='ctx'> 	struct dpaa_percpu_priv *percpu_priv;</div><div class='ctx'> 	struct dpaa_rx_errors rx_errors;</div><div class='ctx'> 	unsigned int num_cpus, offset;</div><div class='add'>+	u64 bp_count, cg_time, cg_num;</div><div class='ctx'> 	struct dpaa_ern_cnt ern_cnt;</div><div class='ctx'> 	struct dpaa_bp *dpaa_bp;</div><div class='ctx'> 	struct dpaa_priv *priv;</div><div class='del'>-	int total_stats, i, j;</div><div class='add'>+	int total_stats, i;</div><div class='ctx'> 	bool cg_status;</div><div class='ctx'> </div><div class='ctx'> 	total_stats = dpaa_get_sset_count(net_dev, ETH_SS_STATS);</div><div class='hunk'>@@ -292,12 +195,10 @@ static void dpaa_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		percpu_priv = per_cpu_ptr(priv-&gt;percpu_priv, i);</div><div class='del'>-		for (j = 0; j &lt; DPAA_BPS_NUM; j++) {</div><div class='del'>-			dpaa_bp = priv-&gt;dpaa_bps[j];</div><div class='del'>-			if (!dpaa_bp-&gt;percpu_count)</div><div class='del'>-				continue;</div><div class='del'>-			bp_count[j] = *(per_cpu_ptr(dpaa_bp-&gt;percpu_count, i));</div><div class='del'>-		}</div><div class='add'>+		dpaa_bp = priv-&gt;dpaa_bp;</div><div class='add'>+		if (!dpaa_bp-&gt;percpu_count)</div><div class='add'>+			continue;</div><div class='add'>+		bp_count = *(per_cpu_ptr(dpaa_bp-&gt;percpu_count, i));</div><div class='ctx'> 		rx_errors.dme += percpu_priv-&gt;rx_errors.dme;</div><div class='ctx'> 		rx_errors.fpe += percpu_priv-&gt;rx_errors.fpe;</div><div class='ctx'> 		rx_errors.fse += percpu_priv-&gt;rx_errors.fse;</div><div class='hunk'>@@ -315,7 +216,7 @@ static void dpaa_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> 		copy_stats(percpu_priv, num_cpus, i, bp_count, data);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	offset = (num_cpus + 1) * (DPAA_STATS_PERCPU_LEN + DPAA_BPS_NUM);</div><div class='add'>+	offset = (num_cpus + 1) * (DPAA_STATS_PERCPU_LEN + 1);</div><div class='ctx'> 	memcpy(data + offset, &amp;rx_errors, sizeof(struct dpaa_rx_errors));</div><div class='ctx'> </div><div class='ctx'> 	offset += sizeof(struct dpaa_rx_errors) / sizeof(u64);</div><div class='hunk'>@@ -342,44 +243,28 @@ static void dpaa_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> static void dpaa_get_strings(struct net_device *net_dev, u32 stringset,</div><div class='ctx'> 			     u8 *data)</div><div class='ctx'> {</div><div class='del'>-	unsigned int i, j, num_cpus, size;</div><div class='del'>-	char string_cpu[ETH_GSTRING_LEN];</div><div class='del'>-	u8 *strings;</div><div class='add'>+	unsigned int i, j, num_cpus;</div><div class='ctx'> </div><div class='del'>-	memset(string_cpu, 0, sizeof(string_cpu));</div><div class='del'>-	strings   = data;</div><div class='del'>-	num_cpus  = num_online_cpus();</div><div class='del'>-	size      = DPAA_STATS_GLOBAL_LEN * ETH_GSTRING_LEN;</div><div class='add'>+	num_cpus = num_online_cpus();</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; DPAA_STATS_PERCPU_LEN; i++) {</div><div class='del'>-		for (j = 0; j &lt; num_cpus; j++) {</div><div class='del'>-			snprintf(string_cpu, ETH_GSTRING_LEN, "%s [CPU %d]",</div><div class='del'>-				 dpaa_stats_percpu[i], j);</div><div class='del'>-			memcpy(strings, string_cpu, ETH_GSTRING_LEN);</div><div class='del'>-			strings += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		snprintf(string_cpu, ETH_GSTRING_LEN, "%s [TOTAL]",</div><div class='del'>-			 dpaa_stats_percpu[i]);</div><div class='del'>-		memcpy(strings, string_cpu, ETH_GSTRING_LEN);</div><div class='del'>-		strings += ETH_GSTRING_LEN;</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; DPAA_BPS_NUM; i++) {</div><div class='del'>-		for (j = 0; j &lt; num_cpus; j++) {</div><div class='del'>-			snprintf(string_cpu, ETH_GSTRING_LEN,</div><div class='del'>-				 "bpool %c [CPU %d]", 'a' + i, j);</div><div class='del'>-			memcpy(strings, string_cpu, ETH_GSTRING_LEN);</div><div class='del'>-			strings += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		snprintf(string_cpu, ETH_GSTRING_LEN, "bpool %c [TOTAL]",</div><div class='del'>-			 'a' + i);</div><div class='del'>-		memcpy(strings, string_cpu, ETH_GSTRING_LEN);</div><div class='del'>-		strings += ETH_GSTRING_LEN;</div><div class='add'>+		for (j = 0; j &lt; num_cpus; j++)</div><div class='add'>+			ethtool_sprintf(&amp;data, "%s [CPU %d]",</div><div class='add'>+					dpaa_stats_percpu[i], j);</div><div class='add'>+</div><div class='add'>+		ethtool_sprintf(&amp;data, "%s [TOTAL]", dpaa_stats_percpu[i]);</div><div class='ctx'> 	}</div><div class='del'>-	memcpy(strings, dpaa_stats_global, size);</div><div class='add'>+	for (i = 0; i &lt; num_cpus; i++)</div><div class='add'>+		ethtool_sprintf(&amp;data, "bpool [CPU %d]", i);</div><div class='add'>+</div><div class='add'>+	ethtool_puts(&amp;data, "bpool [TOTAL]");</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA_STATS_GLOBAL_LEN; i++)</div><div class='add'>+		ethtool_puts(&amp;data, dpaa_stats_global[i]);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_get_hash_opts(struct net_device *dev,</div><div class='del'>-			      struct ethtool_rxnfc *cmd)</div><div class='add'>+static int dpaa_get_rxfh_fields(struct net_device *dev,</div><div class='add'>+				struct ethtool_rxfh_fields *cmd)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa_priv *priv = netdev_priv(dev);</div><div class='ctx'> </div><div class='hunk'>@@ -392,7 +277,7 @@ static int dpaa_get_hash_opts(struct net_device *dev,</div><div class='ctx'> 	case UDP_V6_FLOW:</div><div class='ctx'> 		if (priv-&gt;keygen_in_use)</div><div class='ctx'> 			cmd-&gt;data |= RXH_L4_B_0_1 | RXH_L4_B_2_3;</div><div class='del'>-		/* Fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case IPV4_FLOW:</div><div class='ctx'> 	case IPV6_FLOW:</div><div class='ctx'> 	case SCTP_V4_FLOW:</div><div class='hunk'>@@ -414,22 +299,6 @@ static int dpaa_get_hash_opts(struct net_device *dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd,</div><div class='del'>-			  u32 *unused)</div><div class='del'>-{</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (cmd-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		ret = dpaa_get_hash_opts(dev, cmd);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static void dpaa_set_hash(struct net_device *net_dev, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	struct mac_device *mac_dev;</div><div class='hunk'>@@ -444,8 +313,9 @@ static void dpaa_set_hash(struct net_device *net_dev, bool enable)</div><div class='ctx'> 	priv-&gt;keygen_in_use = enable;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_set_hash_opts(struct net_device *dev,</div><div class='del'>-			      struct ethtool_rxnfc *nfc)</div><div class='add'>+static int dpaa_set_rxfh_fields(struct net_device *dev,</div><div class='add'>+				const struct ethtool_rxfh_fields *nfc,</div><div class='add'>+				struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	int ret = -EINVAL;</div><div class='ctx'> </div><div class='hunk'>@@ -479,23 +349,8 @@ static int dpaa_set_hash_opts(struct net_device *dev,</div><div class='ctx'> 	return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd)</div><div class='del'>-{</div><div class='del'>-	int ret = -EOPNOTSUPP;</div><div class='del'>-</div><div class='del'>-	switch (cmd-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		ret = dpaa_set_hash_opts(dev, cmd);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='ctx'> static int dpaa_get_ts_info(struct net_device *net_dev,</div><div class='del'>-			    struct ethtool_ts_info *info)</div><div class='add'>+			    struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct device_node *mac_node = dev-&gt;of_node;</div><div class='hunk'>@@ -506,14 +361,20 @@ static int dpaa_get_ts_info(struct net_device *net_dev,</div><div class='ctx'> 	info-&gt;phc_index = -1;</div><div class='ctx'> </div><div class='ctx'> 	fman_node = of_get_parent(mac_node);</div><div class='del'>-	if (fman_node)</div><div class='add'>+	if (fman_node) {</div><div class='ctx'> 		ptp_node = of_parse_phandle(fman_node, "ptimer-handle", 0);</div><div class='add'>+		of_node_put(fman_node);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ptp_node)</div><div class='add'>+	if (ptp_node) {</div><div class='ctx'> 		ptp_dev = of_find_device_by_node(ptp_node);</div><div class='add'>+		of_node_put(ptp_node);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	if (ptp_dev)</div><div class='add'>+	if (ptp_dev) {</div><div class='ctx'> 		ptp = platform_get_drvdata(ptp_dev);</div><div class='add'>+		put_device(&amp;ptp_dev-&gt;dev);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (ptp)</div><div class='ctx'> 		info-&gt;phc_index = ptp-&gt;phc_index;</div><div class='hunk'>@@ -530,7 +391,9 @@ static int dpaa_get_ts_info(struct net_device *net_dev,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_get_coalesce(struct net_device *dev,</div><div class='del'>-			     struct ethtool_coalesce *c)</div><div class='add'>+			     struct ethtool_coalesce *c,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct qman_portal *portal;</div><div class='ctx'> 	u32 period;</div><div class='hunk'>@@ -542,23 +405,25 @@ static int dpaa_get_coalesce(struct net_device *dev,</div><div class='ctx'> </div><div class='ctx'> 	c-&gt;rx_coalesce_usecs = period;</div><div class='ctx'> 	c-&gt;rx_max_coalesced_frames = thresh;</div><div class='del'>-	c-&gt;use_adaptive_rx_coalesce = false;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa_set_coalesce(struct net_device *dev,</div><div class='del'>-			     struct ethtool_coalesce *c)</div><div class='add'>+			     struct ethtool_coalesce *c,</div><div class='add'>+			     struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+			     struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	const cpumask_t *cpus = qman_affine_cpus();</div><div class='del'>-	bool needs_revert[NR_CPUS] = {false};</div><div class='ctx'> 	struct qman_portal *portal;</div><div class='ctx'> 	u32 period, prev_period;</div><div class='ctx'> 	u8 thresh, prev_thresh;</div><div class='add'>+	bool *needs_revert;</div><div class='ctx'> 	int cpu, res;</div><div class='ctx'> </div><div class='del'>-	if (c-&gt;use_adaptive_rx_coalesce)</div><div class='del'>-		return -EINVAL;</div><div class='add'>+	needs_revert = kcalloc(num_possible_cpus(), sizeof(bool), GFP_KERNEL);</div><div class='add'>+	if (!needs_revert)</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	period = c-&gt;rx_coalesce_usecs;</div><div class='ctx'> 	thresh = c-&gt;rx_max_coalesced_frames;</div><div class='hunk'>@@ -582,6 +447,8 @@ static int dpaa_set_coalesce(struct net_device *dev,</div><div class='ctx'> 		needs_revert[cpu] = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(needs_revert);</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> revert_values:</div><div class='hunk'>@@ -595,10 +462,55 @@ revert_values:</div><div class='ctx'> 		qman_dqrr_set_ithresh(portal, prev_thresh);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	kfree(needs_revert);</div><div class='add'>+</div><div class='ctx'> 	return res;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dpaa_get_pause_stats(struct net_device *net_dev,</div><div class='add'>+				 struct ethtool_pause_stats *s)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='add'>+</div><div class='add'>+	if (mac_dev-&gt;get_pause_stats)</div><div class='add'>+		mac_dev-&gt;get_pause_stats(mac_dev-&gt;fman_mac, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa_get_rmon_stats(struct net_device *net_dev,</div><div class='add'>+				struct ethtool_rmon_stats *s,</div><div class='add'>+				const struct ethtool_rmon_hist_range **ranges)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='add'>+</div><div class='add'>+	if (mac_dev-&gt;get_rmon_stats)</div><div class='add'>+		mac_dev-&gt;get_rmon_stats(mac_dev-&gt;fman_mac, s, ranges);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa_get_eth_ctrl_stats(struct net_device *net_dev,</div><div class='add'>+				    struct ethtool_eth_ctrl_stats *s)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='add'>+</div><div class='add'>+	if (mac_dev-&gt;get_eth_ctrl_stats)</div><div class='add'>+		mac_dev-&gt;get_eth_ctrl_stats(mac_dev-&gt;fman_mac, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa_get_eth_mac_stats(struct net_device *net_dev,</div><div class='add'>+				   struct ethtool_eth_mac_stats *s)</div><div class='add'>+{</div><div class='add'>+	struct dpaa_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct mac_device *mac_dev = priv-&gt;mac_dev;</div><div class='add'>+</div><div class='add'>+	if (mac_dev-&gt;get_eth_mac_stats)</div><div class='add'>+		mac_dev-&gt;get_eth_mac_stats(mac_dev-&gt;fman_mac, s);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ethtool_ops dpaa_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_RX_MAX_FRAMES,</div><div class='ctx'> 	.get_drvinfo = dpaa_get_drvinfo,</div><div class='ctx'> 	.get_msglevel = dpaa_get_msglevel,</div><div class='ctx'> 	.set_msglevel = dpaa_set_msglevel,</div><div class='hunk'>@@ -611,9 +523,13 @@ const struct ethtool_ops dpaa_ethtool_ops = {</div><div class='ctx'> 	.get_strings = dpaa_get_strings,</div><div class='ctx'> 	.get_link_ksettings = dpaa_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings = dpaa_set_link_ksettings,</div><div class='del'>-	.get_rxnfc = dpaa_get_rxnfc,</div><div class='del'>-	.set_rxnfc = dpaa_set_rxnfc,</div><div class='add'>+	.get_rxfh_fields = dpaa_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields = dpaa_set_rxfh_fields,</div><div class='ctx'> 	.get_ts_info = dpaa_get_ts_info,</div><div class='ctx'> 	.get_coalesce = dpaa_get_coalesce,</div><div class='ctx'> 	.set_coalesce = dpaa_set_coalesce,</div><div class='add'>+	.get_pause_stats = dpaa_get_pause_stats,</div><div class='add'>+	.get_rmon_stats = dpaa_get_rmon_stats,</div><div class='add'>+	.get_eth_ctrl_stats = dpaa_get_eth_ctrl_stats,</div><div class='add'>+	.get_eth_mac_stats = dpaa_get_eth_mac_stats,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/Kconfig b/drivers/net/ethernet/freescale/dpaa2/Kconfig<br/>index 8bd384720f80..d029b69c3f18 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/Kconfig?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/Kconfig</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/Kconfig?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/Kconfig</a></div><div class='hunk'>@@ -2,17 +2,38 @@</div><div class='ctx'> config FSL_DPAA2_ETH</div><div class='ctx'> 	tristate "Freescale DPAA2 Ethernet"</div><div class='ctx'> 	depends on FSL_MC_BUS &amp;&amp; FSL_MC_DPIO</div><div class='add'>+	select PHYLINK</div><div class='add'>+	select PCS_LYNX</div><div class='add'>+	select FSL_XGMAC_MDIO</div><div class='add'>+	select NET_DEVLINK</div><div class='ctx'> 	help</div><div class='ctx'> 	  This is the DPAA2 Ethernet driver supporting Freescale SoCs</div><div class='ctx'> 	  with DPAA2 (DataPath Acceleration Architecture v2).</div><div class='ctx'> 	  The driver manages network objects discovered on the Freescale</div><div class='ctx'> 	  MC bus.</div><div class='ctx'> </div><div class='add'>+if FSL_DPAA2_ETH</div><div class='add'>+config FSL_DPAA2_ETH_DCB</div><div class='add'>+	bool "Data Center Bridging (DCB) Support"</div><div class='add'>+	default n</div><div class='add'>+	depends on DCB</div><div class='add'>+	help</div><div class='add'>+	  Enable Priority-Based Flow Control (PFC) support for DPAA2 Ethernet</div><div class='add'>+	  devices.</div><div class='add'>+endif</div><div class='add'>+</div><div class='ctx'> config FSL_DPAA2_PTP_CLOCK</div><div class='ctx'> 	tristate "Freescale DPAA2 PTP Clock"</div><div class='del'>-	depends on FSL_DPAA2_ETH</div><div class='del'>-	imply PTP_1588_CLOCK</div><div class='add'>+	depends on FSL_DPAA2_ETH &amp;&amp; PTP_1588_CLOCK_QORIQ</div><div class='ctx'> 	default y</div><div class='ctx'> 	help</div><div class='ctx'> 	  This driver adds support for using the DPAA2 1588 timer module</div><div class='ctx'> 	  as a PTP clock.</div><div class='add'>+</div><div class='add'>+config FSL_DPAA2_SWITCH</div><div class='add'>+	tristate "Freescale DPAA2 Ethernet Switch"</div><div class='add'>+	depends on BRIDGE || BRIDGE=n</div><div class='add'>+	depends on NET_SWITCHDEV</div><div class='add'>+	help</div><div class='add'>+	  Driver for Freescale DPAA2 Ethernet Switch. This driver manages</div><div class='add'>+	  switch objects discovered on the Freeescale MC bus.</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/Makefile b/drivers/net/ethernet/freescale/dpaa2/Makefile<br/>index d1e78cdd512f..1b05ba8d1cbf 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/Makefile?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/Makefile</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/Makefile?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/Makefile</a></div><div class='hunk'>@@ -5,10 +5,13 @@</div><div class='ctx'> </div><div class='ctx'> obj-$(CONFIG_FSL_DPAA2_ETH)		+= fsl-dpaa2-eth.o</div><div class='ctx'> obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK)	+= fsl-dpaa2-ptp.o</div><div class='add'>+obj-$(CONFIG_FSL_DPAA2_SWITCH)		+= fsl-dpaa2-switch.o</div><div class='ctx'> </div><div class='del'>-fsl-dpaa2-eth-objs	:= dpaa2-eth.o dpaa2-ethtool.o dpni.o</div><div class='add'>+fsl-dpaa2-eth-objs	:= dpaa2-eth.o dpaa2-ethtool.o dpni.o dpaa2-mac.o dpmac.o dpaa2-eth-devlink.o dpaa2-xsk.o</div><div class='add'>+fsl-dpaa2-eth-${CONFIG_FSL_DPAA2_ETH_DCB} += dpaa2-eth-dcb.o</div><div class='ctx'> fsl-dpaa2-eth-${CONFIG_DEBUG_FS} += dpaa2-eth-debugfs.o</div><div class='ctx'> fsl-dpaa2-ptp-objs	:= dpaa2-ptp.o dprtc.o</div><div class='add'>+fsl-dpaa2-switch-objs	:= dpaa2-switch.o dpaa2-switch-ethtool.o dpsw.o dpaa2-switch-flower.o dpaa2-mac.o dpmac.o</div><div class='ctx'> </div><div class='ctx'> # Needed by the tracing framework</div><div class='ctx'> CFLAGS_dpaa2-eth.o := -I$(src)</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c<br/>new file mode 100644<br/>index 000000000000..84de0644168d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-dcb.c</a></div><div class='hunk'>@@ -0,0 +1,150 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='add'>+/* Copyright 2020 NXP */</div><div class='add'>+</div><div class='add'>+#include "dpaa2-eth.h"</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_dcbnl_ieee_getpfc(struct net_device *net_dev,</div><div class='add'>+				       struct ieee_pfc *pfc)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;link_state.options &amp; DPNI_LINK_OPT_PFC_PAUSE))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	memcpy(pfc, &amp;priv-&gt;pfc, sizeof(priv-&gt;pfc));</div><div class='add'>+	pfc-&gt;pfc_cap = dpaa2_eth_tc_count(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_eth_is_prio_enabled(u8 pfc_en, u8 tc)</div><div class='add'>+{</div><div class='add'>+	return !!(pfc_en &amp; (1 &lt;&lt; tc));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_pfc_cn(struct dpaa2_eth_priv *priv, u8 pfc_en)</div><div class='add'>+{</div><div class='add'>+	struct dpni_congestion_notification_cfg cfg = {0};</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	cfg.notification_mode = DPNI_CONG_OPT_FLOW_CONTROL;</div><div class='add'>+	cfg.units = DPNI_CONGESTION_UNIT_FRAMES;</div><div class='add'>+	cfg.message_iova = 0ULL;</div><div class='add'>+	cfg.message_ctx = 0ULL;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		if (dpaa2_eth_is_prio_enabled(pfc_en, i)) {</div><div class='add'>+			cfg.threshold_entry = DPAA2_ETH_CN_THRESH_ENTRY(priv);</div><div class='add'>+			cfg.threshold_exit = DPAA2_ETH_CN_THRESH_EXIT(priv);</div><div class='add'>+		} else {</div><div class='add'>+			/* For priorities not set in the pfc_en mask, we leave</div><div class='add'>+			 * the congestion thresholds at zero, which effectively</div><div class='add'>+			 * disables generation of PFC frames for them</div><div class='add'>+			 */</div><div class='add'>+			cfg.threshold_entry = 0;</div><div class='add'>+			cfg.threshold_exit = 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dpni_set_congestion_notification(priv-&gt;mc_io, 0,</div><div class='add'>+						       priv-&gt;mc_token,</div><div class='add'>+						       DPNI_QUEUE_RX, i, &amp;cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev,</div><div class='add'>+				   "dpni_set_congestion_notification failed\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_dcbnl_ieee_setpfc(struct net_device *net_dev,</div><div class='add'>+				       struct ieee_pfc *pfc)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct dpni_link_cfg link_cfg = {0};</div><div class='add'>+	bool tx_pause;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (pfc-&gt;mbc || pfc-&gt;delay)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* If same PFC enabled mask, nothing to do */</div><div class='add'>+	if (priv-&gt;pfc.pfc_en == pfc-&gt;pfc_en)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* We allow PFC configuration even if it won't have any effect until</div><div class='add'>+	 * general pause frames are enabled</div><div class='add'>+	 */</div><div class='add'>+	tx_pause = dpaa2_eth_tx_pause_enabled(priv-&gt;link_state.options);</div><div class='add'>+	if (!dpaa2_eth_rx_pause_enabled(priv-&gt;link_state.options) || !tx_pause)</div><div class='add'>+		netdev_warn(net_dev, "Pause support must be enabled in order for PFC to work!\n");</div><div class='add'>+</div><div class='add'>+	link_cfg.rate = priv-&gt;link_state.rate;</div><div class='add'>+	link_cfg.options = priv-&gt;link_state.options;</div><div class='add'>+	if (pfc-&gt;pfc_en)</div><div class='add'>+		link_cfg.options |= DPNI_LINK_OPT_PFC_PAUSE;</div><div class='add'>+	else</div><div class='add'>+		link_cfg.options &amp;= ~DPNI_LINK_OPT_PFC_PAUSE;</div><div class='add'>+	err = dpni_set_link_cfg(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;link_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dpni_set_link_cfg failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Configure congestion notifications for the enabled priorities */</div><div class='add'>+	err = dpaa2_eth_set_pfc_cn(priv, pfc-&gt;pfc_en);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	memcpy(&amp;priv-&gt;pfc, pfc, sizeof(priv-&gt;pfc));</div><div class='add'>+	priv-&gt;pfc_enabled = !!pfc-&gt;pfc_en;</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_set_rx_taildrop(priv, tx_pause, priv-&gt;pfc_enabled);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 dpaa2_eth_dcbnl_getdcbx(struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;dcbx_mode;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 dpaa2_eth_dcbnl_setdcbx(struct net_device *net_dev, u8 mode)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	return (mode != (priv-&gt;dcbx_mode)) ? 1 : 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u8 dpaa2_eth_dcbnl_getcap(struct net_device *net_dev, int capid, u8 *cap)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	switch (capid) {</div><div class='add'>+	case DCB_CAP_ATTR_PFC:</div><div class='add'>+		*cap = true;</div><div class='add'>+		break;</div><div class='add'>+	case DCB_CAP_ATTR_PFC_TCS:</div><div class='add'>+		*cap = 1 &lt;&lt; (dpaa2_eth_tc_count(priv) - 1);</div><div class='add'>+		break;</div><div class='add'>+	case DCB_CAP_ATTR_DCBX:</div><div class='add'>+		*cap = priv-&gt;dcbx_mode;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		*cap = false;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct dcbnl_rtnl_ops dpaa2_eth_dcbnl_ops = {</div><div class='add'>+	.ieee_getpfc	= dpaa2_eth_dcbnl_ieee_getpfc,</div><div class='add'>+	.ieee_setpfc	= dpaa2_eth_dcbnl_ieee_setpfc,</div><div class='add'>+	.getdcbx	= dpaa2_eth_dcbnl_getdcbx,</div><div class='add'>+	.setdcbx	= dpaa2_eth_dcbnl_setdcbx,</div><div class='add'>+	.getcap		= dpaa2_eth_dcbnl_getcap,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c<br/>index a027f4a9d0cc..1af254caeb0d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c</a></div><div class='hunk'>@@ -21,7 +21,7 @@ static int dpaa2_dbg_cpu_show(struct seq_file *file, void *offset)</div><div class='ctx'> 	seq_printf(file, "Per-CPU stats for %s\n", priv-&gt;net_dev-&gt;name);</div><div class='ctx'> 	seq_printf(file, "%s%16s%16s%16s%16s%16s%16s%16s%16s%16s\n",</div><div class='ctx'> 		   "CPU", "Rx", "Rx Err", "Rx SG", "Tx", "Tx Err", "Tx conf",</div><div class='del'>-		   "Tx SG", "Tx realloc", "Enq busy");</div><div class='add'>+		   "Tx SG", "Tx converted to SG", "Enq busy");</div><div class='ctx'> </div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		stats = per_cpu_ptr(priv-&gt;percpu_stats, i);</div><div class='hunk'>@@ -35,31 +35,14 @@ static int dpaa2_dbg_cpu_show(struct seq_file *file, void *offset)</div><div class='ctx'> 			   stats-&gt;tx_errors,</div><div class='ctx'> 			   extras-&gt;tx_conf_frames,</div><div class='ctx'> 			   extras-&gt;tx_sg_frames,</div><div class='del'>-			   extras-&gt;tx_reallocs,</div><div class='add'>+			   extras-&gt;tx_converted_sg_frames,</div><div class='ctx'> 			   extras-&gt;tx_portal_busy);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_dbg_cpu_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct dpaa2_eth_priv *priv = (struct dpaa2_eth_priv *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	err = single_open(file, dpaa2_dbg_cpu_show, priv);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "single_open() failed\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations dpaa2_dbg_cpu_ops = {</div><div class='del'>-	.open = dpaa2_dbg_cpu_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.llseek = seq_lseek,</div><div class='del'>-	.release = single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(dpaa2_dbg_cpu);</div><div class='ctx'> </div><div class='ctx'> static char *fq_type_to_str(struct dpaa2_eth_fq *fq)</div><div class='ctx'> {</div><div class='hunk'>@@ -81,8 +64,8 @@ static int dpaa2_dbg_fqs_show(struct seq_file *file, void *offset)</div><div class='ctx'> 	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(file, "FQ stats for %s:\n", priv-&gt;net_dev-&gt;name);</div><div class='del'>-	seq_printf(file, "%s%16s%16s%16s%16s\n",</div><div class='del'>-		   "VFQID", "CPU", "Type", "Frames", "Pending frames");</div><div class='add'>+	seq_printf(file, "%s%16s%16s%16s%16s%16s\n",</div><div class='add'>+		   "VFQID", "CPU", "TC", "Type", "Frames", "Pending frames");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt;  priv-&gt;num_fqs; i++) {</div><div class='ctx'> 		fq = &amp;priv-&gt;fq[i];</div><div class='hunk'>@@ -90,9 +73,14 @@ static int dpaa2_dbg_fqs_show(struct seq_file *file, void *offset)</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			fcnt = 0;</div><div class='ctx'> </div><div class='del'>-		seq_printf(file, "%5d%16d%16s%16llu%16u\n",</div><div class='add'>+		/* Skip FQs with no traffic */</div><div class='add'>+		if (!fq-&gt;stats.frames &amp;&amp; !fcnt)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		seq_printf(file, "%5d%16d%16d%16s%16llu%16u\n",</div><div class='ctx'> 			   fq-&gt;fqid,</div><div class='ctx'> 			   fq-&gt;target_cpu,</div><div class='add'>+			   fq-&gt;tc,</div><div class='ctx'> 			   fq_type_to_str(fq),</div><div class='ctx'> 			   fq-&gt;stats.frames,</div><div class='ctx'> 			   fcnt);</div><div class='hunk'>@@ -101,24 +89,7 @@ static int dpaa2_dbg_fqs_show(struct seq_file *file, void *offset)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_dbg_fqs_open(struct inode *inode, struct file *file)</div><div class='del'>-{</div><div class='del'>-	int err;</div><div class='del'>-	struct dpaa2_eth_priv *priv = (struct dpaa2_eth_priv *)inode-&gt;i_private;</div><div class='del'>-</div><div class='del'>-	err = single_open(file, dpaa2_dbg_fqs_show, priv);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "single_open() failed\n");</div><div class='del'>-</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const struct file_operations dpaa2_dbg_fq_ops = {</div><div class='del'>-	.open = dpaa2_dbg_fqs_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.llseek = seq_lseek,</div><div class='del'>-	.release = single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(dpaa2_dbg_fqs);</div><div class='ctx'> </div><div class='ctx'> static int dpaa2_dbg_ch_show(struct seq_file *file, void *offset)</div><div class='ctx'> {</div><div class='hunk'>@@ -127,107 +98,106 @@ static int dpaa2_dbg_ch_show(struct seq_file *file, void *offset)</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	seq_printf(file, "Channel stats for %s:\n", priv-&gt;net_dev-&gt;name);</div><div class='del'>-	seq_printf(file, "%s%16s%16s%16s%16s\n",</div><div class='del'>-		   "CHID", "CPU", "Deq busy", "CDANs", "Buf count");</div><div class='add'>+	seq_printf(file, "%s  %5s%16s%16s%16s%16s%16s%16s\n",</div><div class='add'>+		   "IDX", "CHID", "CPU", "Deq busy", "Frames", "CDANs",</div><div class='add'>+		   "Avg Frm/CDAN", "Buf count");</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='ctx'> 		ch = priv-&gt;channel[i];</div><div class='del'>-		seq_printf(file, "%4d%16d%16llu%16llu%16d\n",</div><div class='del'>-			   ch-&gt;ch_id,</div><div class='add'>+		seq_printf(file, "%3s%d%6d%16d%16llu%16llu%16llu%16llu%16d\n",</div><div class='add'>+			   "CH#", i, ch-&gt;ch_id,</div><div class='ctx'> 			   ch-&gt;nctx.desired_cpu,</div><div class='ctx'> 			   ch-&gt;stats.dequeue_portal_busy,</div><div class='add'>+			   ch-&gt;stats.frames,</div><div class='ctx'> 			   ch-&gt;stats.cdan,</div><div class='add'>+			   div64_u64(ch-&gt;stats.frames, ch-&gt;stats.cdan),</div><div class='ctx'> 			   ch-&gt;buf_count);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_dbg_ch_open(struct inode *inode, struct file *file)</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(dpaa2_dbg_ch);</div><div class='add'>+</div><div class='add'>+static int dpaa2_dbg_bp_show(struct seq_file *file, void *offset)</div><div class='ctx'> {</div><div class='add'>+	struct dpaa2_eth_priv *priv = (struct dpaa2_eth_priv *)file-&gt;private;</div><div class='add'>+	int i, j, num_queues, buf_cnt;</div><div class='add'>+	struct dpaa2_eth_bp *bp;</div><div class='add'>+	char ch_name[10];</div><div class='ctx'> 	int err;</div><div class='del'>-	struct dpaa2_eth_priv *priv = (struct dpaa2_eth_priv *)inode-&gt;i_private;</div><div class='ctx'> </div><div class='del'>-	err = single_open(file, dpaa2_dbg_ch_show, priv);</div><div class='del'>-	if (err &lt; 0)</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "single_open() failed\n");</div><div class='add'>+	/* Print out the header */</div><div class='add'>+	seq_printf(file, "Buffer pool info for %s:\n", priv-&gt;net_dev-&gt;name);</div><div class='add'>+	seq_printf(file, "%s  %10s%15s", "IDX", "BPID", "Buf count");</div><div class='add'>+	num_queues = dpaa2_eth_queue_count(priv);</div><div class='add'>+	for (i = 0; i &lt; num_queues; i++) {</div><div class='add'>+		snprintf(ch_name, sizeof(ch_name), "CH#%d", i);</div><div class='add'>+		seq_printf(file, "%10s", ch_name);</div><div class='add'>+	}</div><div class='add'>+	seq_printf(file, "\n");</div><div class='add'>+</div><div class='add'>+	/* For each buffer pool, print out its BPID, the number of buffers in</div><div class='add'>+	 * that buffer pool and the channels which are using it.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_bps; i++) {</div><div class='add'>+		bp = priv-&gt;bp[i];</div><div class='add'>+</div><div class='add'>+		err = dpaa2_io_query_bp_count(NULL, bp-&gt;bpid, &amp;buf_cnt);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_warn(priv-&gt;net_dev, "Buffer count query error %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		seq_printf(file, "%3s%d%10d%15d", "BP#", i, bp-&gt;bpid, buf_cnt);</div><div class='add'>+		for (j = 0; j &lt; num_queues; j++) {</div><div class='add'>+			if (priv-&gt;channel[j]-&gt;bp == bp)</div><div class='add'>+				seq_printf(file, "%10s", "x");</div><div class='add'>+			else</div><div class='add'>+				seq_printf(file, "%10s", "");</div><div class='add'>+		}</div><div class='add'>+		seq_printf(file, "\n");</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct file_operations dpaa2_dbg_ch_ops = {</div><div class='del'>-	.open = dpaa2_dbg_ch_open,</div><div class='del'>-	.read = seq_read,</div><div class='del'>-	.llseek = seq_lseek,</div><div class='del'>-	.release = single_release,</div><div class='del'>-};</div><div class='add'>+DEFINE_SHOW_ATTRIBUTE(dpaa2_dbg_bp);</div><div class='ctx'> </div><div class='ctx'> void dpaa2_dbg_add(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	if (!dpaa2_dbg_root)</div><div class='del'>-		return;</div><div class='add'>+	struct fsl_mc_device *dpni_dev;</div><div class='add'>+	struct dentry *dir;</div><div class='add'>+	char name[10];</div><div class='ctx'> </div><div class='ctx'> 	/* Create a directory for the interface */</div><div class='del'>-	priv-&gt;dbg.dir = debugfs_create_dir(priv-&gt;net_dev-&gt;name,</div><div class='del'>-					   dpaa2_dbg_root);</div><div class='del'>-	if (!priv-&gt;dbg.dir) {</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "debugfs_create_dir() failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='add'>+	dpni_dev = to_fsl_mc_device(priv-&gt;net_dev-&gt;dev.parent);</div><div class='add'>+	snprintf(name, 10, "dpni.%d", dpni_dev-&gt;obj_desc.id);</div><div class='add'>+	dir = debugfs_create_dir(name, dpaa2_dbg_root);</div><div class='add'>+	priv-&gt;dbg.dir = dir;</div><div class='ctx'> </div><div class='ctx'> 	/* per-cpu stats file */</div><div class='del'>-	priv-&gt;dbg.cpu_stats = debugfs_create_file("cpu_stats", 0444,</div><div class='del'>-						  priv-&gt;dbg.dir, priv,</div><div class='del'>-						  &amp;dpaa2_dbg_cpu_ops);</div><div class='del'>-	if (!priv-&gt;dbg.cpu_stats) {</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "debugfs_create_file() failed\n");</div><div class='del'>-		goto err_cpu_stats;</div><div class='del'>-	}</div><div class='add'>+	debugfs_create_file("cpu_stats", 0444, dir, priv, &amp;dpaa2_dbg_cpu_fops);</div><div class='ctx'> </div><div class='ctx'> 	/* per-fq stats file */</div><div class='del'>-	priv-&gt;dbg.fq_stats = debugfs_create_file("fq_stats", 0444,</div><div class='del'>-						 priv-&gt;dbg.dir, priv,</div><div class='del'>-						 &amp;dpaa2_dbg_fq_ops);</div><div class='del'>-	if (!priv-&gt;dbg.fq_stats) {</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "debugfs_create_file() failed\n");</div><div class='del'>-		goto err_fq_stats;</div><div class='del'>-	}</div><div class='add'>+	debugfs_create_file("fq_stats", 0444, dir, priv, &amp;dpaa2_dbg_fqs_fops);</div><div class='ctx'> </div><div class='ctx'> 	/* per-fq stats file */</div><div class='del'>-	priv-&gt;dbg.ch_stats = debugfs_create_file("ch_stats", 0444,</div><div class='del'>-						 priv-&gt;dbg.dir, priv,</div><div class='del'>-						 &amp;dpaa2_dbg_ch_ops);</div><div class='del'>-	if (!priv-&gt;dbg.fq_stats) {</div><div class='del'>-		netdev_err(priv-&gt;net_dev, "debugfs_create_file() failed\n");</div><div class='del'>-		goto err_ch_stats;</div><div class='del'>-	}</div><div class='add'>+	debugfs_create_file("ch_stats", 0444, dir, priv, &amp;dpaa2_dbg_ch_fops);</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	/* per buffer pool stats file */</div><div class='add'>+	debugfs_create_file("bp_stats", 0444, dir, priv, &amp;dpaa2_dbg_bp_fops);</div><div class='ctx'> </div><div class='del'>-err_ch_stats:</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.fq_stats);</div><div class='del'>-err_fq_stats:</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.cpu_stats);</div><div class='del'>-err_cpu_stats:</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dpaa2_dbg_remove(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.fq_stats);</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.ch_stats);</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.cpu_stats);</div><div class='del'>-	debugfs_remove(priv-&gt;dbg.dir);</div><div class='add'>+	debugfs_remove_recursive(priv-&gt;dbg.dir);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> void dpaa2_eth_dbg_init(void)</div><div class='ctx'> {</div><div class='ctx'> 	dpaa2_dbg_root = debugfs_create_dir(DPAA2_ETH_DBG_ROOT, NULL);</div><div class='del'>-	if (!dpaa2_dbg_root) {</div><div class='del'>-		pr_err("DPAA2-ETH: debugfs create failed\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	pr_debug("DPAA2-ETH: debugfs created\n");</div><div class='ctx'> }</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h<br/>index 4f63de997a26..15598b28f03b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.h</a></div><div class='hunk'>@@ -11,9 +11,6 @@ struct dpaa2_eth_priv;</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_debugfs {</div><div class='ctx'> 	struct dentry *dir;</div><div class='del'>-	struct dentry *fq_stats;</div><div class='del'>-	struct dentry *ch_stats;</div><div class='del'>-	struct dentry *cpu_stats;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c<br/>new file mode 100644<br/>index 000000000000..76f808d38066<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c</a></div><div class='hunk'>@@ -0,0 +1,289 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='add'>+#include "dpaa2-eth.h"</div><div class='add'>+/* Copyright 2020 NXP</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#define DPAA2_ETH_TRAP_DROP(_id, _group_id)					\</div><div class='add'>+	DEVLINK_TRAP_GENERIC(DROP, DROP, _id,					\</div><div class='add'>+			     DEVLINK_TRAP_GROUP_GENERIC_ID_##_group_id, 0)</div><div class='add'>+</div><div class='add'>+static const struct devlink_trap_group dpaa2_eth_trap_groups_arr[] = {</div><div class='add'>+	DEVLINK_TRAP_GROUP_GENERIC(PARSER_ERROR_DROPS, 0),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static const struct devlink_trap dpaa2_eth_traps_arr[] = {</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(VXLAN_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(LLC_SNAP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(VLAN_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(PPPOE_PPP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(MPLS_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(ARP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(IP_1_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(IP_N_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(GRE_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(UDP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(TCP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(IPSEC_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(SCTP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(DCCP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(GTP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+	DPAA2_ETH_TRAP_DROP(ESP_PARSING, PARSER_ERROR_DROPS),</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_dl_info_get(struct devlink *devlink,</div><div class='add'>+				 struct devlink_info_req *req,</div><div class='add'>+				 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_devlink_priv *dl_priv = devlink_priv(devlink);</div><div class='add'>+	struct dpaa2_eth_priv *priv = dl_priv-&gt;dpaa2_priv;</div><div class='add'>+	char buf[10];</div><div class='add'>+</div><div class='add'>+	scnprintf(buf, 10, "%d.%d", priv-&gt;dpni_ver_major, priv-&gt;dpni_ver_minor);</div><div class='add'>+	return devlink_info_version_running_put(req, "dpni", buf);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dpaa2_eth_trap_item *</div><div class='add'>+dpaa2_eth_dl_trap_item_lookup(struct dpaa2_eth_priv *priv, u16 trap_id)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_trap_data *dpaa2_eth_trap_data = priv-&gt;trap_data;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(dpaa2_eth_traps_arr); i++) {</div><div class='add'>+		if (dpaa2_eth_traps_arr[i].id == trap_id)</div><div class='add'>+			return &amp;dpaa2_eth_trap_data-&gt;trap_items_arr[i];</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_trap_item *dpaa2_eth_dl_get_trap(struct dpaa2_eth_priv *priv,</div><div class='add'>+						  struct dpaa2_fapr *fapr)</div><div class='add'>+{</div><div class='add'>+	static const struct dpaa2_faf_error_bit {</div><div class='add'>+		int position;</div><div class='add'>+		enum devlink_trap_generic_id trap_id;</div><div class='add'>+	} faf_bits[] = {</div><div class='add'>+		{ .position = 5,  .trap_id = DEVLINK_TRAP_GENERIC_ID_VXLAN_PARSING },</div><div class='add'>+		{ .position = 20, .trap_id = DEVLINK_TRAP_GENERIC_ID_LLC_SNAP_PARSING },</div><div class='add'>+		{ .position = 24, .trap_id = DEVLINK_TRAP_GENERIC_ID_VLAN_PARSING },</div><div class='add'>+		{ .position = 26, .trap_id = DEVLINK_TRAP_GENERIC_ID_PPPOE_PPP_PARSING },</div><div class='add'>+		{ .position = 29, .trap_id = DEVLINK_TRAP_GENERIC_ID_MPLS_PARSING },</div><div class='add'>+		{ .position = 31, .trap_id = DEVLINK_TRAP_GENERIC_ID_ARP_PARSING },</div><div class='add'>+		{ .position = 52, .trap_id = DEVLINK_TRAP_GENERIC_ID_IP_1_PARSING },</div><div class='add'>+		{ .position = 61, .trap_id = DEVLINK_TRAP_GENERIC_ID_IP_N_PARSING },</div><div class='add'>+		{ .position = 67, .trap_id = DEVLINK_TRAP_GENERIC_ID_GRE_PARSING },</div><div class='add'>+		{ .position = 71, .trap_id = DEVLINK_TRAP_GENERIC_ID_UDP_PARSING },</div><div class='add'>+		{ .position = 76, .trap_id = DEVLINK_TRAP_GENERIC_ID_TCP_PARSING },</div><div class='add'>+		{ .position = 80, .trap_id = DEVLINK_TRAP_GENERIC_ID_IPSEC_PARSING },</div><div class='add'>+		{ .position = 82, .trap_id = DEVLINK_TRAP_GENERIC_ID_SCTP_PARSING },</div><div class='add'>+		{ .position = 84, .trap_id = DEVLINK_TRAP_GENERIC_ID_DCCP_PARSING },</div><div class='add'>+		{ .position = 88, .trap_id = DEVLINK_TRAP_GENERIC_ID_GTP_PARSING },</div><div class='add'>+		{ .position = 90, .trap_id = DEVLINK_TRAP_GENERIC_ID_ESP_PARSING },</div><div class='add'>+	};</div><div class='add'>+	u64 faf_word;</div><div class='add'>+	u64 mask;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ARRAY_SIZE(faf_bits); i++) {</div><div class='add'>+		if (faf_bits[i].position &lt; 32) {</div><div class='add'>+			/* Low part of FAF.</div><div class='add'>+			 * position ranges from 31 to 0, mask from 0 to 31.</div><div class='add'>+			 */</div><div class='add'>+			mask = 1ull &lt;&lt; (31 - faf_bits[i].position);</div><div class='add'>+			faf_word = __le32_to_cpu(fapr-&gt;faf_lo);</div><div class='add'>+		} else {</div><div class='add'>+			/* High part of FAF.</div><div class='add'>+			 * position ranges from 95 to 32, mask from 0 to 63.</div><div class='add'>+			 */</div><div class='add'>+			mask = 1ull &lt;&lt; (63 - (faf_bits[i].position - 32));</div><div class='add'>+			faf_word = __le64_to_cpu(fapr-&gt;faf_hi);</div><div class='add'>+		}</div><div class='add'>+		if (faf_word &amp; mask)</div><div class='add'>+			return dpaa2_eth_dl_trap_item_lookup(priv, faf_bits[i].trap_id);</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_dl_trap_init(struct devlink *devlink,</div><div class='add'>+				  const struct devlink_trap *trap,</div><div class='add'>+				  void *trap_ctx)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_devlink_priv *dl_priv = devlink_priv(devlink);</div><div class='add'>+	struct dpaa2_eth_priv *priv = dl_priv-&gt;dpaa2_priv;</div><div class='add'>+	struct dpaa2_eth_trap_item *dpaa2_eth_trap_item;</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_trap_item = dpaa2_eth_dl_trap_item_lookup(priv, trap-&gt;id);</div><div class='add'>+	if (WARN_ON(!dpaa2_eth_trap_item))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_trap_item-&gt;trap_ctx = trap_ctx;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_dl_trap_action_set(struct devlink *devlink,</div><div class='add'>+					const struct devlink_trap *trap,</div><div class='add'>+					enum devlink_trap_action action,</div><div class='add'>+					struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	/* No support for changing the action of an independent packet trap,</div><div class='add'>+	 * only per trap group - parser error drops</div><div class='add'>+	 */</div><div class='add'>+	NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+			   "Cannot change trap action independently of group");</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_dl_trap_group_action_set(struct devlink *devlink,</div><div class='add'>+					      const struct devlink_trap_group *group,</div><div class='add'>+					      enum devlink_trap_action action,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_devlink_priv *dl_priv = devlink_priv(devlink);</div><div class='add'>+	struct dpaa2_eth_priv *priv = dl_priv-&gt;dpaa2_priv;</div><div class='add'>+	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='add'>+	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpni_error_cfg err_cfg = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (group-&gt;id != DEVLINK_TRAP_GROUP_GENERIC_ID_PARSER_ERROR_DROPS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Configure handling of frames marked as errors from the parser */</div><div class='add'>+	err_cfg.errors = DPAA2_FAS_RX_ERR_MASK;</div><div class='add'>+	err_cfg.set_frame_annotation = 1;</div><div class='add'>+</div><div class='add'>+	switch (action) {</div><div class='add'>+	case DEVLINK_TRAP_ACTION_DROP:</div><div class='add'>+		err_cfg.error_action = DPNI_ERROR_ACTION_DISCARD;</div><div class='add'>+		break;</div><div class='add'>+	case DEVLINK_TRAP_ACTION_TRAP:</div><div class='add'>+		err_cfg.error_action = DPNI_ERROR_ACTION_SEND_TO_ERROR_QUEUE;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpni_set_errors_behavior(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;err_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_set_errors_behavior failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct devlink_ops dpaa2_eth_devlink_ops = {</div><div class='add'>+	.info_get = dpaa2_eth_dl_info_get,</div><div class='add'>+	.trap_init = dpaa2_eth_dl_trap_init,</div><div class='add'>+	.trap_action_set = dpaa2_eth_dl_trap_action_set,</div><div class='add'>+	.trap_group_action_set = dpaa2_eth_dl_trap_group_action_set,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpaa2_eth_dl_alloc(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='add'>+	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpaa2_eth_devlink_priv *dl_priv;</div><div class='add'>+</div><div class='add'>+	priv-&gt;devlink =</div><div class='add'>+		devlink_alloc(&amp;dpaa2_eth_devlink_ops, sizeof(*dl_priv), dev);</div><div class='add'>+	if (!priv-&gt;devlink) {</div><div class='add'>+		dev_err(dev, "devlink_alloc failed\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+	dl_priv = devlink_priv(priv-&gt;devlink);</div><div class='add'>+	dl_priv-&gt;dpaa2_priv = priv;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_dl_free(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	devlink_free(priv-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_dl_register(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	devlink_register(priv-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_dl_unregister(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	devlink_unregister(priv-&gt;devlink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_eth_dl_port_add(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = &amp;priv-&gt;devlink_port;</div><div class='add'>+	struct devlink_port_attrs attrs = {};</div><div class='add'>+</div><div class='add'>+	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;</div><div class='add'>+	devlink_port_attrs_set(devlink_port, &amp;attrs);</div><div class='add'>+	return devlink_port_register(priv-&gt;devlink, devlink_port, 0);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_dl_port_del(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct devlink_port *devlink_port = &amp;priv-&gt;devlink_port;</div><div class='add'>+</div><div class='add'>+	devlink_port_unregister(devlink_port);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_eth_dl_traps_register(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_trap_data *dpaa2_eth_trap_data;</div><div class='add'>+	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='add'>+	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_trap_data = kzalloc(sizeof(*dpaa2_eth_trap_data), GFP_KERNEL);</div><div class='add'>+	if (!dpaa2_eth_trap_data)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	priv-&gt;trap_data = dpaa2_eth_trap_data;</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_trap_data-&gt;trap_items_arr = kcalloc(ARRAY_SIZE(dpaa2_eth_traps_arr),</div><div class='add'>+						      sizeof(struct dpaa2_eth_trap_item),</div><div class='add'>+						      GFP_KERNEL);</div><div class='add'>+	if (!dpaa2_eth_trap_data-&gt;trap_items_arr) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto trap_data_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_trap_groups_register(priv-&gt;devlink, dpaa2_eth_trap_groups_arr,</div><div class='add'>+					   ARRAY_SIZE(dpaa2_eth_trap_groups_arr));</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "devlink_trap_groups_register() = %d\n", err);</div><div class='add'>+		goto trap_items_arr_free;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = devlink_traps_register(priv-&gt;devlink, dpaa2_eth_traps_arr,</div><div class='add'>+				     ARRAY_SIZE(dpaa2_eth_traps_arr), priv);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "devlink_traps_register() = %d\n", err);</div><div class='add'>+		goto trap_groups_unregiser;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+trap_groups_unregiser:</div><div class='add'>+	devlink_trap_groups_unregister(priv-&gt;devlink, dpaa2_eth_trap_groups_arr,</div><div class='add'>+				       ARRAY_SIZE(dpaa2_eth_trap_groups_arr));</div><div class='add'>+trap_items_arr_free:</div><div class='add'>+	kfree(dpaa2_eth_trap_data-&gt;trap_items_arr);</div><div class='add'>+trap_data_free:</div><div class='add'>+	kfree(dpaa2_eth_trap_data);</div><div class='add'>+	priv-&gt;trap_data = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_dl_traps_unregister(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	devlink_traps_unregister(priv-&gt;devlink, dpaa2_eth_traps_arr,</div><div class='add'>+				 ARRAY_SIZE(dpaa2_eth_traps_arr));</div><div class='add'>+	devlink_trap_groups_unregister(priv-&gt;devlink, dpaa2_eth_trap_groups_arr,</div><div class='add'>+				       ARRAY_SIZE(dpaa2_eth_trap_groups_arr));</div><div class='add'>+	kfree(priv-&gt;trap_data-&gt;trap_items_arr);</div><div class='add'>+	kfree(priv-&gt;trap_data);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h<br/>index 9801528db2a5..956767e0869c 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-trace.h</a></div><div class='hunk'>@@ -10,7 +10,6 @@</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/skbuff.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='del'>-#include "dpaa2-eth.h"</div><div class='ctx'> #include &lt;linux/tracepoint.h&gt;</div><div class='ctx'> </div><div class='ctx'> #define TR_FMT "[%s] fd: addr=0x%llx, len=%u, off=%u"</div><div class='hunk'>@@ -49,7 +48,7 @@ DECLARE_EVENT_CLASS(dpaa2_eth_fd,</div><div class='ctx'> 				   __entry-&gt;fd_addr = dpaa2_fd_get_addr(fd);</div><div class='ctx'> 				   __entry-&gt;fd_len = dpaa2_fd_get_len(fd);</div><div class='ctx'> 				   __entry-&gt;fd_offset = dpaa2_fd_get_offset(fd);</div><div class='del'>-				   __assign_str(name, netdev-&gt;name);</div><div class='add'>+				   __assign_str(name);</div><div class='ctx'> 		    ),</div><div class='ctx'> </div><div class='ctx'> 		    /* This is what gets printed when the trace event is</div><div class='hunk'>@@ -74,6 +73,14 @@ DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_fd,</div><div class='ctx'> 	     TP_ARGS(netdev, fd)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+/* Tx (egress) XSK fd */</div><div class='add'>+DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_xsk_fd,</div><div class='add'>+	     TP_PROTO(struct net_device *netdev,</div><div class='add'>+		      const struct dpaa2_fd *fd),</div><div class='add'>+</div><div class='add'>+	     TP_ARGS(netdev, fd)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> /* Rx fd */</div><div class='ctx'> DEFINE_EVENT(dpaa2_eth_fd, dpaa2_rx_fd,</div><div class='ctx'> 	     TP_PROTO(struct net_device *netdev,</div><div class='hunk'>@@ -82,6 +89,14 @@ DEFINE_EVENT(dpaa2_eth_fd, dpaa2_rx_fd,</div><div class='ctx'> 	     TP_ARGS(netdev, fd)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='add'>+/* Rx XSK fd */</div><div class='add'>+DEFINE_EVENT(dpaa2_eth_fd, dpaa2_rx_xsk_fd,</div><div class='add'>+	     TP_PROTO(struct net_device *netdev,</div><div class='add'>+		      const struct dpaa2_fd *fd),</div><div class='add'>+</div><div class='add'>+	     TP_ARGS(netdev, fd)</div><div class='add'>+);</div><div class='add'>+</div><div class='ctx'> /* Tx confirmation fd */</div><div class='ctx'> DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_conf_fd,</div><div class='ctx'> 	     TP_PROTO(struct net_device *netdev,</div><div class='hunk'>@@ -91,57 +106,81 @@ DEFINE_EVENT(dpaa2_eth_fd, dpaa2_tx_conf_fd,</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> /* Log data about raw buffers. Useful for tracing DPBP content. */</div><div class='del'>-TRACE_EVENT(dpaa2_eth_buf_seed,</div><div class='del'>-	    /* Trace function prototype */</div><div class='del'>-	    TP_PROTO(struct net_device *netdev,</div><div class='del'>-		     /* virtual address and size */</div><div class='del'>-		     void *vaddr,</div><div class='del'>-		     size_t size,</div><div class='del'>-		     /* dma map address and size */</div><div class='del'>-		     dma_addr_t dma_addr,</div><div class='del'>-		     size_t map_size,</div><div class='del'>-		     /* buffer pool id, if relevant */</div><div class='del'>-		     u16 bpid),</div><div class='del'>-</div><div class='del'>-	    /* Repeat argument list here */</div><div class='del'>-	    TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid),</div><div class='del'>-</div><div class='del'>-	    /* A structure containing the relevant information we want</div><div class='del'>-	     * to record. Declare name and type for each normal element,</div><div class='del'>-	     * name, type and size for arrays. Use __string for variable</div><div class='del'>-	     * length strings.</div><div class='del'>-	     */</div><div class='del'>-	    TP_STRUCT__entry(</div><div class='del'>-			     __field(void *, vaddr)</div><div class='del'>-			     __field(size_t, size)</div><div class='del'>-			     __field(dma_addr_t, dma_addr)</div><div class='del'>-			     __field(size_t, map_size)</div><div class='del'>-			     __field(u16, bpid)</div><div class='del'>-			     __string(name, netdev-&gt;name)</div><div class='del'>-	    ),</div><div class='del'>-</div><div class='del'>-	    /* The function that assigns values to the above declared</div><div class='del'>-	     * fields</div><div class='del'>-	     */</div><div class='del'>-	    TP_fast_assign(</div><div class='del'>-			   __entry-&gt;vaddr = vaddr;</div><div class='del'>-			   __entry-&gt;size = size;</div><div class='del'>-			   __entry-&gt;dma_addr = dma_addr;</div><div class='del'>-			   __entry-&gt;map_size = map_size;</div><div class='del'>-			   __entry-&gt;bpid = bpid;</div><div class='del'>-			   __assign_str(name, netdev-&gt;name);</div><div class='del'>-	    ),</div><div class='del'>-</div><div class='del'>-	    /* This is what gets printed when the trace event is</div><div class='del'>-	     * triggered.</div><div class='del'>-	     */</div><div class='del'>-	    TP_printk(TR_BUF_FMT,</div><div class='del'>-		      __get_str(name),</div><div class='del'>-		      __entry-&gt;vaddr,</div><div class='del'>-		      __entry-&gt;size,</div><div class='del'>-		      &amp;__entry-&gt;dma_addr,</div><div class='del'>-		      __entry-&gt;map_size,</div><div class='del'>-		      __entry-&gt;bpid)</div><div class='add'>+DECLARE_EVENT_CLASS(dpaa2_eth_buf,</div><div class='add'>+		    /* Trace function prototype */</div><div class='add'>+		    TP_PROTO(struct net_device *netdev,</div><div class='add'>+			     /* virtual address and size */</div><div class='add'>+			    void *vaddr,</div><div class='add'>+			    size_t size,</div><div class='add'>+			    /* dma map address and size */</div><div class='add'>+			    dma_addr_t dma_addr,</div><div class='add'>+			    size_t map_size,</div><div class='add'>+			    /* buffer pool id, if relevant */</div><div class='add'>+			    u16 bpid),</div><div class='add'>+</div><div class='add'>+		    /* Repeat argument list here */</div><div class='add'>+		    TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid),</div><div class='add'>+</div><div class='add'>+		    /* A structure containing the relevant information we want</div><div class='add'>+		     * to record. Declare name and type for each normal element,</div><div class='add'>+		     * name, type and size for arrays. Use __string for variable</div><div class='add'>+		     * length strings.</div><div class='add'>+		     */</div><div class='add'>+		    TP_STRUCT__entry(</div><div class='add'>+				      __field(void *, vaddr)</div><div class='add'>+				      __field(size_t, size)</div><div class='add'>+				      __field(dma_addr_t, dma_addr)</div><div class='add'>+				      __field(size_t, map_size)</div><div class='add'>+				      __field(u16, bpid)</div><div class='add'>+				      __string(name, netdev-&gt;name)</div><div class='add'>+		    ),</div><div class='add'>+</div><div class='add'>+		    /* The function that assigns values to the above declared</div><div class='add'>+		     * fields</div><div class='add'>+		     */</div><div class='add'>+		    TP_fast_assign(</div><div class='add'>+				   __entry-&gt;vaddr = vaddr;</div><div class='add'>+				   __entry-&gt;size = size;</div><div class='add'>+				   __entry-&gt;dma_addr = dma_addr;</div><div class='add'>+				   __entry-&gt;map_size = map_size;</div><div class='add'>+				   __entry-&gt;bpid = bpid;</div><div class='add'>+				   __assign_str(name);</div><div class='add'>+		    ),</div><div class='add'>+</div><div class='add'>+		    /* This is what gets printed when the trace event is</div><div class='add'>+		     * triggered.</div><div class='add'>+		     */</div><div class='add'>+		    TP_printk(TR_BUF_FMT,</div><div class='add'>+			      __get_str(name),</div><div class='add'>+			      __entry-&gt;vaddr,</div><div class='add'>+			      __entry-&gt;size,</div><div class='add'>+			      &amp;__entry-&gt;dma_addr,</div><div class='add'>+			      __entry-&gt;map_size,</div><div class='add'>+			      __entry-&gt;bpid)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/* Main memory buff seeding */</div><div class='add'>+DEFINE_EVENT(dpaa2_eth_buf, dpaa2_eth_buf_seed,</div><div class='add'>+	     TP_PROTO(struct net_device *netdev,</div><div class='add'>+		      void *vaddr,</div><div class='add'>+		      size_t size,</div><div class='add'>+		      dma_addr_t dma_addr,</div><div class='add'>+		      size_t map_size,</div><div class='add'>+		      u16 bpid),</div><div class='add'>+</div><div class='add'>+	     TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid)</div><div class='add'>+);</div><div class='add'>+</div><div class='add'>+/* UMEM buff seeding on AF_XDP fast path */</div><div class='add'>+DEFINE_EVENT(dpaa2_eth_buf, dpaa2_xsk_buf_seed,</div><div class='add'>+	     TP_PROTO(struct net_device *netdev,</div><div class='add'>+		      void *vaddr,</div><div class='add'>+		      size_t size,</div><div class='add'>+		      dma_addr_t dma_addr,</div><div class='add'>+		      size_t map_size,</div><div class='add'>+		      u16 bpid),</div><div class='add'>+</div><div class='add'>+	     TP_ARGS(netdev, vaddr, size, dma_addr, map_size, bpid)</div><div class='ctx'> );</div><div class='ctx'> </div><div class='ctx'> /* If only one event of a certain type needs to be declared, use TRACE_EVENT().</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c<br/>index 7d2390e3df77..18d86badd6ea 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='ctx'> /* Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='del'>- * Copyright 2016-2017 NXP</div><div class='add'>+ * Copyright 2016-2022 NXP</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/init.h&gt;</div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='hunk'>@@ -8,14 +8,17 @@</div><div class='ctx'> #include &lt;linux/etherdevice.h&gt;</div><div class='ctx'> #include &lt;linux/of_net.h&gt;</div><div class='ctx'> #include &lt;linux/interrupt.h&gt;</div><div class='del'>-#include &lt;linux/msi.h&gt;</div><div class='ctx'> #include &lt;linux/kthread.h&gt;</div><div class='ctx'> #include &lt;linux/iommu.h&gt;</div><div class='del'>-#include &lt;linux/net_tstamp.h&gt;</div><div class='ctx'> #include &lt;linux/fsl/mc.h&gt;</div><div class='ctx'> #include &lt;linux/bpf.h&gt;</div><div class='ctx'> #include &lt;linux/bpf_trace.h&gt;</div><div class='add'>+#include &lt;linux/fsl/ptp_qoriq.h&gt;</div><div class='add'>+#include &lt;linux/ptp_classify.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='ctx'> #include &lt;net/sock.h&gt;</div><div class='add'>+#include &lt;net/tso.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "dpaa2-eth.h"</div><div class='ctx'> </div><div class='hunk'>@@ -29,8 +32,80 @@ MODULE_LICENSE("Dual BSD/GPL");</div><div class='ctx'> MODULE_AUTHOR("Freescale Semiconductor, Inc");</div><div class='ctx'> MODULE_DESCRIPTION("Freescale DPAA2 Ethernet Driver");</div><div class='ctx'> </div><div class='del'>-static void *dpaa2_iova_to_virt(struct iommu_domain *domain,</div><div class='del'>-				dma_addr_t iova_addr)</div><div class='add'>+struct ptp_qoriq *dpaa2_ptp;</div><div class='add'>+EXPORT_SYMBOL(dpaa2_ptp);</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_detect_features(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	priv-&gt;features = 0;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_PTP_ONESTEP_VER_MAJOR,</div><div class='add'>+				   DPNI_PTP_ONESTEP_VER_MINOR) &gt;= 0)</div><div class='add'>+		priv-&gt;features |= DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_update_ptp_onestep_indirect(struct dpaa2_eth_priv *priv,</div><div class='add'>+					      u32 offset, u8 udp)</div><div class='add'>+{</div><div class='add'>+	struct dpni_single_step_cfg cfg;</div><div class='add'>+</div><div class='add'>+	cfg.en = 1;</div><div class='add'>+	cfg.ch_update = udp;</div><div class='add'>+	cfg.offset = offset;</div><div class='add'>+	cfg.peer_delay = 0;</div><div class='add'>+</div><div class='add'>+	if (dpni_set_single_step_cfg(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;cfg))</div><div class='add'>+		WARN_ONCE(1, "Failed to set single step register");</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_update_ptp_onestep_direct(struct dpaa2_eth_priv *priv,</div><div class='add'>+					    u32 offset, u8 udp)</div><div class='add'>+{</div><div class='add'>+	u32 val = 0;</div><div class='add'>+</div><div class='add'>+	val = DPAA2_PTP_SINGLE_STEP_ENABLE |</div><div class='add'>+	       DPAA2_PTP_SINGLE_CORRECTION_OFF(offset);</div><div class='add'>+</div><div class='add'>+	if (udp)</div><div class='add'>+		val |= DPAA2_PTP_SINGLE_STEP_CH;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;onestep_reg_base)</div><div class='add'>+		writel(val, priv-&gt;onestep_reg_base);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_ptp_onestep_reg_update_method(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpni_single_step_cfg ptp_cfg;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dpaa2_set_onestep_params_cb = dpaa2_update_ptp_onestep_indirect;</div><div class='add'>+</div><div class='add'>+	if (!(priv-&gt;features &amp; DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT))</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dpni_get_single_step_cfg(priv-&gt;mc_io, 0,</div><div class='add'>+				     priv-&gt;mc_token, &amp;ptp_cfg)) {</div><div class='add'>+		dev_err(dev, "dpni_get_single_step_cfg cannot retrieve onestep reg, falling back to indirect update\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!ptp_cfg.ptp_onestep_reg_base) {</div><div class='add'>+		dev_err(dev, "1588 onestep reg not available, falling back to indirect update\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;onestep_reg_base = ioremap(ptp_cfg.ptp_onestep_reg_base,</div><div class='add'>+					 sizeof(u32));</div><div class='add'>+	if (!priv-&gt;onestep_reg_base) {</div><div class='add'>+		dev_err(dev, "1588 onestep reg cannot be mapped, falling back to indirect update\n");</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;dpaa2_set_onestep_params_cb = dpaa2_update_ptp_onestep_direct;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *dpaa2_iova_to_virt(struct iommu_domain *domain,</div><div class='add'>+			 dma_addr_t iova_addr)</div><div class='ctx'> {</div><div class='ctx'> 	phys_addr_t phys_addr;</div><div class='ctx'> </div><div class='hunk'>@@ -39,9 +114,9 @@ static void *dpaa2_iova_to_virt(struct iommu_domain *domain,</div><div class='ctx'> 	return phys_to_virt(phys_addr);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void validate_rx_csum(struct dpaa2_eth_priv *priv,</div><div class='del'>-			     u32 fd_status,</div><div class='del'>-			     struct sk_buff *skb)</div><div class='add'>+static void dpaa2_eth_validate_rx_csum(struct dpaa2_eth_priv *priv,</div><div class='add'>+				       u32 fd_status,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='ctx'> 	skb_checksum_none_assert(skb);</div><div class='ctx'> </div><div class='hunk'>@@ -61,9 +136,9 @@ static void validate_rx_csum(struct dpaa2_eth_priv *priv,</div><div class='ctx'> /* Free a received FD.</div><div class='ctx'>  * Not to be used for Tx conf FDs or on any other paths.</div><div class='ctx'>  */</div><div class='del'>-static void free_rx_fd(struct dpaa2_eth_priv *priv,</div><div class='del'>-		       const struct dpaa2_fd *fd,</div><div class='del'>-		       void *vaddr)</div><div class='add'>+static void dpaa2_eth_free_rx_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+				 const struct dpaa2_fd *fd,</div><div class='add'>+				 void *vaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='hunk'>@@ -86,7 +161,7 @@ static void free_rx_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	for (i = 1; i &lt; DPAA2_ETH_MAX_SG_ENTRIES; i++) {</div><div class='ctx'> 		addr = dpaa2_sg_get_addr(&amp;sgt[i]);</div><div class='ctx'> 		sg_vaddr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, addr);</div><div class='del'>-		dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE,</div><div class='add'>+		dma_unmap_page(dev, addr, priv-&gt;rx_buf_size,</div><div class='ctx'> 			       DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 		free_pages((unsigned long)sg_vaddr, 0);</div><div class='hunk'>@@ -99,9 +174,9 @@ free_buf:</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Build a linear skb based on a single-buffer frame descriptor */</div><div class='del'>-static struct sk_buff *build_linear_skb(struct dpaa2_eth_channel *ch,</div><div class='del'>-					const struct dpaa2_fd *fd,</div><div class='del'>-					void *fd_vaddr)</div><div class='add'>+static struct sk_buff *dpaa2_eth_build_linear_skb(struct dpaa2_eth_channel *ch,</div><div class='add'>+						  const struct dpaa2_fd *fd,</div><div class='add'>+						  void *fd_vaddr)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	u16 fd_offset = dpaa2_fd_get_offset(fd);</div><div class='hunk'>@@ -120,9 +195,9 @@ static struct sk_buff *build_linear_skb(struct dpaa2_eth_channel *ch,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Build a non linear (fragmented) skb based on a S/G table */</div><div class='del'>-static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv,</div><div class='del'>-				      struct dpaa2_eth_channel *ch,</div><div class='del'>-				      struct dpaa2_sg_entry *sgt)</div><div class='add'>+static struct sk_buff *dpaa2_eth_build_frag_skb(struct dpaa2_eth_priv *priv,</div><div class='add'>+						struct dpaa2_eth_channel *ch,</div><div class='add'>+						struct dpaa2_sg_entry *sgt)</div><div class='ctx'> {</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='hunk'>@@ -144,7 +219,7 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 		/* Get the address and length from the S/G entry */</div><div class='ctx'> 		sg_addr = dpaa2_sg_get_addr(sge);</div><div class='ctx'> 		sg_vaddr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, sg_addr);</div><div class='del'>-		dma_unmap_page(dev, sg_addr, DPAA2_ETH_RX_BUF_SIZE,</div><div class='add'>+		dma_unmap_page(dev, sg_addr, priv-&gt;rx_buf_size,</div><div class='ctx'> 			       DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='ctx'> 		sg_length = dpaa2_sg_get_len(sge);</div><div class='hunk'>@@ -185,7 +260,7 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 				(page_address(page) - page_address(head_page));</div><div class='ctx'> </div><div class='ctx'> 			skb_add_rx_frag(skb, i - 1, head_page, page_offset,</div><div class='del'>-					sg_length, DPAA2_ETH_RX_BUF_SIZE);</div><div class='add'>+					sg_length, priv-&gt;rx_buf_size);</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='ctx'> 		if (dpaa2_sg_is_final(sge))</div><div class='hunk'>@@ -203,50 +278,125 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv,</div><div class='ctx'> /* Free buffers acquired from the buffer pool or which were meant to</div><div class='ctx'>  * be released in the pool</div><div class='ctx'>  */</div><div class='del'>-static void free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array, int count)</div><div class='add'>+static void dpaa2_eth_free_bufs(struct dpaa2_eth_priv *priv, u64 *buf_array,</div><div class='add'>+				int count, bool xsk_zc)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpaa2_eth_swa *swa;</div><div class='add'>+	struct xdp_buff *xdp_buff;</div><div class='ctx'> 	void *vaddr;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	for (i = 0; i &lt; count; i++) {</div><div class='ctx'> 		vaddr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, buf_array[i]);</div><div class='del'>-		dma_unmap_page(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE,</div><div class='del'>-			       DMA_BIDIRECTIONAL);</div><div class='del'>-		free_pages((unsigned long)vaddr, 0);</div><div class='add'>+</div><div class='add'>+		if (!xsk_zc) {</div><div class='add'>+			dma_unmap_page(dev, buf_array[i], priv-&gt;rx_buf_size,</div><div class='add'>+				       DMA_BIDIRECTIONAL);</div><div class='add'>+			free_pages((unsigned long)vaddr, 0);</div><div class='add'>+		} else {</div><div class='add'>+			swa = (struct dpaa2_eth_swa *)</div><div class='add'>+				(vaddr + DPAA2_ETH_RX_HWA_SIZE);</div><div class='add'>+			xdp_buff = swa-&gt;xsk.xdp_buff;</div><div class='add'>+			xsk_buff_free(xdp_buff);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void xdp_release_buf(struct dpaa2_eth_priv *priv,</div><div class='del'>-			    struct dpaa2_eth_channel *ch,</div><div class='del'>-			    dma_addr_t addr)</div><div class='add'>+void dpaa2_eth_recycle_buf(struct dpaa2_eth_priv *priv,</div><div class='add'>+			   struct dpaa2_eth_channel *ch,</div><div class='add'>+			   dma_addr_t addr)</div><div class='ctx'> {</div><div class='add'>+	int retries = 0;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ch-&gt;xdp.drop_bufs[ch-&gt;xdp.drop_cnt++] = addr;</div><div class='del'>-	if (ch-&gt;xdp.drop_cnt &lt; DPAA2_ETH_BUFS_PER_CMD)</div><div class='add'>+	ch-&gt;recycled_bufs[ch-&gt;recycled_bufs_cnt++] = addr;</div><div class='add'>+	if (ch-&gt;recycled_bufs_cnt &lt; DPAA2_ETH_BUFS_PER_CMD)</div><div class='ctx'> 		return;</div><div class='ctx'> </div><div class='del'>-	while ((err = dpaa2_io_service_release(ch-&gt;dpio, priv-&gt;bpid,</div><div class='del'>-					       ch-&gt;xdp.drop_bufs,</div><div class='del'>-					       ch-&gt;xdp.drop_cnt)) == -EBUSY)</div><div class='add'>+	while ((err = dpaa2_io_service_release(ch-&gt;dpio, ch-&gt;bp-&gt;bpid,</div><div class='add'>+					       ch-&gt;recycled_bufs,</div><div class='add'>+					       ch-&gt;recycled_bufs_cnt)) == -EBUSY) {</div><div class='add'>+		if (retries++ &gt;= DPAA2_ETH_SWP_BUSY_RETRIES)</div><div class='add'>+			break;</div><div class='ctx'> 		cpu_relax();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (err) {</div><div class='del'>-		free_bufs(priv, ch-&gt;xdp.drop_bufs, ch-&gt;xdp.drop_cnt);</div><div class='del'>-		ch-&gt;buf_count -= ch-&gt;xdp.drop_cnt;</div><div class='add'>+		dpaa2_eth_free_bufs(priv, ch-&gt;recycled_bufs,</div><div class='add'>+				    ch-&gt;recycled_bufs_cnt, ch-&gt;xsk_zc);</div><div class='add'>+		ch-&gt;buf_count -= ch-&gt;recycled_bufs_cnt;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ch-&gt;xdp.drop_cnt = 0;</div><div class='add'>+	ch-&gt;recycled_bufs_cnt = 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int xdp_enqueue(struct dpaa2_eth_priv *priv, struct dpaa2_fd *fd,</div><div class='del'>-		       void *buf_start, u16 queue_id)</div><div class='add'>+static int dpaa2_eth_xdp_flush(struct dpaa2_eth_priv *priv,</div><div class='add'>+			       struct dpaa2_eth_fq *fq,</div><div class='add'>+			       struct dpaa2_eth_xdp_fds *xdp_fds)</div><div class='add'>+{</div><div class='add'>+	int total_enqueued = 0, retries = 0, enqueued;</div><div class='add'>+	struct dpaa2_eth_drv_stats *percpu_extras;</div><div class='add'>+	int num_fds, err, max_retries;</div><div class='add'>+	struct dpaa2_fd *fds;</div><div class='add'>+</div><div class='add'>+	percpu_extras = this_cpu_ptr(priv-&gt;percpu_extras);</div><div class='add'>+</div><div class='add'>+	/* try to enqueue all the FDs until the max number of retries is hit */</div><div class='add'>+	fds = xdp_fds-&gt;fds;</div><div class='add'>+	num_fds = xdp_fds-&gt;num;</div><div class='add'>+	max_retries = num_fds * DPAA2_ETH_ENQUEUE_RETRIES;</div><div class='add'>+	while (total_enqueued &lt; num_fds &amp;&amp; retries &lt; max_retries) {</div><div class='add'>+		err = priv-&gt;enqueue(priv, fq, &amp;fds[total_enqueued],</div><div class='add'>+				    0, num_fds - total_enqueued, &amp;enqueued);</div><div class='add'>+		if (err == -EBUSY) {</div><div class='add'>+			percpu_extras-&gt;tx_portal_busy += ++retries;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		total_enqueued += enqueued;</div><div class='add'>+	}</div><div class='add'>+	xdp_fds-&gt;num = 0;</div><div class='add'>+</div><div class='add'>+	return total_enqueued;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_xdp_tx_flush(struct dpaa2_eth_priv *priv,</div><div class='add'>+				   struct dpaa2_eth_channel *ch,</div><div class='add'>+				   struct dpaa2_eth_fq *fq)</div><div class='add'>+{</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	struct dpaa2_fd *fds;</div><div class='add'>+	int enqueued, i;</div><div class='add'>+</div><div class='add'>+	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='add'>+</div><div class='add'>+	// enqueue the array of XDP_TX frames</div><div class='add'>+	enqueued = dpaa2_eth_xdp_flush(priv, fq, &amp;fq-&gt;xdp_tx_fds);</div><div class='add'>+</div><div class='add'>+	/* update statistics */</div><div class='add'>+	percpu_stats-&gt;tx_packets += enqueued;</div><div class='add'>+	fds = fq-&gt;xdp_tx_fds.fds;</div><div class='add'>+	for (i = 0; i &lt; enqueued; i++) {</div><div class='add'>+		percpu_stats-&gt;tx_bytes += dpaa2_fd_get_len(&amp;fds[i]);</div><div class='add'>+		ch-&gt;stats.xdp_tx++;</div><div class='add'>+	}</div><div class='add'>+	for (i = enqueued; i &lt; fq-&gt;xdp_tx_fds.num; i++) {</div><div class='add'>+		dpaa2_eth_recycle_buf(priv, ch, dpaa2_fd_get_addr(&amp;fds[i]));</div><div class='add'>+		percpu_stats-&gt;tx_errors++;</div><div class='add'>+		ch-&gt;stats.xdp_tx_err++;</div><div class='add'>+	}</div><div class='add'>+	fq-&gt;xdp_tx_fds.num = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_xdp_enqueue(struct dpaa2_eth_priv *priv,</div><div class='add'>+			   struct dpaa2_eth_channel *ch,</div><div class='add'>+			   struct dpaa2_fd *fd,</div><div class='add'>+			   void *buf_start, u16 queue_id)</div><div class='ctx'> {</div><div class='del'>-	struct dpaa2_eth_fq *fq;</div><div class='ctx'> 	struct dpaa2_faead *faead;</div><div class='add'>+	struct dpaa2_fd *dest_fd;</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='ctx'> 	u32 ctrl, frc;</div><div class='del'>-	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the egress frame hardware annotation area as valid */</div><div class='ctx'> 	frc = dpaa2_fd_get_frc(fd);</div><div class='hunk'>@@ -263,40 +413,34 @@ static int xdp_enqueue(struct dpaa2_eth_priv *priv, struct dpaa2_fd *fd,</div><div class='ctx'> 	faead-&gt;conf_fqid = 0;</div><div class='ctx'> </div><div class='ctx'> 	fq = &amp;priv-&gt;fq[queue_id];</div><div class='del'>-	for (i = 0; i &lt; DPAA2_ETH_ENQUEUE_RETRIES; i++) {</div><div class='del'>-		err = priv-&gt;enqueue(priv, fq, fd, 0);</div><div class='del'>-		if (err != -EBUSY)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='add'>+	dest_fd = &amp;fq-&gt;xdp_tx_fds.fds[fq-&gt;xdp_tx_fds.num++];</div><div class='add'>+	memcpy(dest_fd, fd, sizeof(*dest_fd));</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	if (fq-&gt;xdp_tx_fds.num &lt; DEV_MAP_BULK_SIZE)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_xdp_tx_flush(priv, ch, fq);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static u32 run_xdp(struct dpaa2_eth_priv *priv,</div><div class='del'>-		   struct dpaa2_eth_channel *ch,</div><div class='del'>-		   struct dpaa2_eth_fq *rx_fq,</div><div class='del'>-		   struct dpaa2_fd *fd, void *vaddr)</div><div class='add'>+static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv,</div><div class='add'>+			     struct dpaa2_eth_channel *ch,</div><div class='add'>+			     struct dpaa2_eth_fq *rx_fq,</div><div class='add'>+			     struct dpaa2_fd *fd, void *vaddr)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='del'>-	struct rtnl_link_stats64 *percpu_stats;</div><div class='ctx'> 	struct bpf_prog *xdp_prog;</div><div class='ctx'> 	struct xdp_buff xdp;</div><div class='ctx'> 	u32 xdp_act = XDP_PASS;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='del'>-</div><div class='del'>-	rcu_read_lock();</div><div class='add'>+	int err, offset;</div><div class='ctx'> </div><div class='ctx'> 	xdp_prog = READ_ONCE(ch-&gt;xdp.prog);</div><div class='ctx'> 	if (!xdp_prog)</div><div class='ctx'> 		goto out;</div><div class='ctx'> </div><div class='del'>-	xdp.data = vaddr + dpaa2_fd_get_offset(fd);</div><div class='del'>-	xdp.data_end = xdp.data + dpaa2_fd_get_len(fd);</div><div class='del'>-	xdp.data_hard_start = xdp.data - XDP_PACKET_HEADROOM;</div><div class='del'>-	xdp_set_data_meta_invalid(&amp;xdp);</div><div class='del'>-	xdp.rxq = &amp;ch-&gt;xdp_rxq;</div><div class='add'>+	offset = dpaa2_fd_get_offset(fd) - XDP_PACKET_HEADROOM;</div><div class='add'>+	xdp_init_buff(&amp;xdp, DPAA2_ETH_RX_BUF_RAW_SIZE - offset, &amp;ch-&gt;xdp_rxq);</div><div class='add'>+	xdp_prepare_buff(&amp;xdp, vaddr + offset, XDP_PACKET_HEADROOM,</div><div class='add'>+			 dpaa2_fd_get_len(fd), false);</div><div class='ctx'> </div><div class='ctx'> 	xdp_act = bpf_prog_run_xdp(xdp_prog, &amp;xdp);</div><div class='ctx'> </div><div class='hunk'>@@ -308,51 +452,133 @@ static u32 run_xdp(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	case XDP_PASS:</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XDP_TX:</div><div class='del'>-		err = xdp_enqueue(priv, fd, vaddr, rx_fq-&gt;flowid);</div><div class='del'>-		if (err) {</div><div class='del'>-			xdp_release_buf(priv, ch, addr);</div><div class='del'>-			percpu_stats-&gt;tx_errors++;</div><div class='del'>-			ch-&gt;stats.xdp_tx_err++;</div><div class='del'>-		} else {</div><div class='del'>-			percpu_stats-&gt;tx_packets++;</div><div class='del'>-			percpu_stats-&gt;tx_bytes += dpaa2_fd_get_len(fd);</div><div class='del'>-			ch-&gt;stats.xdp_tx++;</div><div class='del'>-		}</div><div class='add'>+		dpaa2_eth_xdp_enqueue(priv, ch, fd, vaddr, rx_fq-&gt;flowid);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='del'>-		bpf_warn_invalid_xdp_action(xdp_act);</div><div class='del'>-		/* fall through */</div><div class='add'>+		bpf_warn_invalid_xdp_action(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_ABORTED:</div><div class='ctx'> 		trace_xdp_exception(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='del'>-		/* fall through */</div><div class='add'>+		fallthrough;</div><div class='ctx'> 	case XDP_DROP:</div><div class='del'>-		xdp_release_buf(priv, ch, addr);</div><div class='add'>+		dpaa2_eth_recycle_buf(priv, ch, addr);</div><div class='ctx'> 		ch-&gt;stats.xdp_drop++;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case XDP_REDIRECT:</div><div class='ctx'> 		dma_unmap_page(priv-&gt;net_dev-&gt;dev.parent, addr,</div><div class='del'>-			       DPAA2_ETH_RX_BUF_SIZE, DMA_BIDIRECTIONAL);</div><div class='add'>+			       priv-&gt;rx_buf_size, DMA_BIDIRECTIONAL);</div><div class='ctx'> 		ch-&gt;buf_count--;</div><div class='add'>+</div><div class='add'>+		/* Allow redirect use of full headroom */</div><div class='ctx'> 		xdp.data_hard_start = vaddr;</div><div class='add'>+		xdp.frame_sz = DPAA2_ETH_RX_BUF_RAW_SIZE;</div><div class='add'>+</div><div class='ctx'> 		err = xdp_do_redirect(priv-&gt;net_dev, &amp;xdp, xdp_prog);</div><div class='del'>-		if (unlikely(err))</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			addr = dma_map_page(priv-&gt;net_dev-&gt;dev.parent,</div><div class='add'>+					    virt_to_page(vaddr), 0,</div><div class='add'>+					    priv-&gt;rx_buf_size, DMA_BIDIRECTIONAL);</div><div class='add'>+			if (unlikely(dma_mapping_error(priv-&gt;net_dev-&gt;dev.parent, addr))) {</div><div class='add'>+				free_pages((unsigned long)vaddr, 0);</div><div class='add'>+			} else {</div><div class='add'>+				ch-&gt;buf_count++;</div><div class='add'>+				dpaa2_eth_recycle_buf(priv, ch, addr);</div><div class='add'>+			}</div><div class='ctx'> 			ch-&gt;stats.xdp_drop++;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			ch-&gt;stats.xdp_redirect++;</div><div class='add'>+		}</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	ch-&gt;xdp.res |= xdp_act;</div><div class='ctx'> out:</div><div class='del'>-	rcu_read_unlock();</div><div class='ctx'> 	return xdp_act;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+struct sk_buff *dpaa2_eth_alloc_skb(struct dpaa2_eth_priv *priv,</div><div class='add'>+				    struct dpaa2_eth_channel *ch,</div><div class='add'>+				    const struct dpaa2_fd *fd, u32 fd_length,</div><div class='add'>+				    void *fd_vaddr)</div><div class='add'>+{</div><div class='add'>+	u16 fd_offset = dpaa2_fd_get_offset(fd);</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	unsigned int skb_len;</div><div class='add'>+</div><div class='add'>+	skb_len = fd_length + dpaa2_eth_needed_headroom(NULL);</div><div class='add'>+</div><div class='add'>+	skb = napi_alloc_skb(&amp;ch-&gt;napi, skb_len);</div><div class='add'>+	if (!skb)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, dpaa2_eth_needed_headroom(NULL));</div><div class='add'>+	skb_put(skb, fd_length);</div><div class='add'>+</div><div class='add'>+	memcpy(skb-&gt;data, fd_vaddr + fd_offset, fd_length);</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct sk_buff *dpaa2_eth_copybreak(struct dpaa2_eth_channel *ch,</div><div class='add'>+					   const struct dpaa2_fd *fd,</div><div class='add'>+					   void *fd_vaddr)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = ch-&gt;priv;</div><div class='add'>+	u32 fd_length = dpaa2_fd_get_len(fd);</div><div class='add'>+</div><div class='add'>+	if (fd_length &gt; priv-&gt;rx_copybreak)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	return dpaa2_eth_alloc_skb(priv, ch, fd, fd_length, fd_vaddr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_receive_skb(struct dpaa2_eth_priv *priv,</div><div class='add'>+			   struct dpaa2_eth_channel *ch,</div><div class='add'>+			   const struct dpaa2_fd *fd, void *vaddr,</div><div class='add'>+			   struct dpaa2_eth_fq *fq,</div><div class='add'>+			   struct rtnl_link_stats64 *percpu_stats,</div><div class='add'>+			   struct sk_buff *skb)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_fas *fas;</div><div class='add'>+	u32 status = 0;</div><div class='add'>+</div><div class='add'>+	fas = dpaa2_get_fas(vaddr, false);</div><div class='add'>+	prefetch(fas);</div><div class='add'>+	prefetch(skb-&gt;data);</div><div class='add'>+</div><div class='add'>+	/* Get the timestamp value */</div><div class='add'>+	if (priv-&gt;rx_tstamp) {</div><div class='add'>+		struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);</div><div class='add'>+		__le64 *ts = dpaa2_get_ts(vaddr, false);</div><div class='add'>+		u64 ns;</div><div class='add'>+</div><div class='add'>+		memset(shhwtstamps, 0, sizeof(*shhwtstamps));</div><div class='add'>+</div><div class='add'>+		ns = DPAA2_PTP_CLK_PERIOD_NS * le64_to_cpup(ts);</div><div class='add'>+		shhwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if we need to validate the L4 csum */</div><div class='add'>+	if (likely(dpaa2_fd_get_frc(fd) &amp; DPAA2_FD_FRC_FASV)) {</div><div class='add'>+		status = le32_to_cpu(fas-&gt;status);</div><div class='add'>+		dpaa2_eth_validate_rx_csum(priv, status, skb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, priv-&gt;net_dev);</div><div class='add'>+	skb_record_rx_queue(skb, fq-&gt;flowid);</div><div class='add'>+</div><div class='add'>+	percpu_stats-&gt;rx_packets++;</div><div class='add'>+	percpu_stats-&gt;rx_bytes += dpaa2_fd_get_len(fd);</div><div class='add'>+	ch-&gt;stats.bytes_per_cdan += dpaa2_fd_get_len(fd);</div><div class='add'>+</div><div class='add'>+	list_add_tail(&amp;skb-&gt;list, ch-&gt;rx_list);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Main Rx frame processing routine */</div><div class='del'>-static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</div><div class='del'>-			 struct dpaa2_eth_channel *ch,</div><div class='del'>-			 const struct dpaa2_fd *fd,</div><div class='del'>-			 struct dpaa2_eth_fq *fq)</div><div class='add'>+void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</div><div class='add'>+		  struct dpaa2_eth_channel *ch,</div><div class='add'>+		  const struct dpaa2_fd *fd,</div><div class='add'>+		  struct dpaa2_eth_fq *fq)</div><div class='ctx'> {</div><div class='ctx'> 	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='ctx'> 	u8 fd_format = dpaa2_fd_get_format(fd);</div><div class='hunk'>@@ -361,20 +587,17 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	struct rtnl_link_stats64 *percpu_stats;</div><div class='ctx'> 	struct dpaa2_eth_drv_stats *percpu_extras;</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='del'>-	struct dpaa2_fas *fas;</div><div class='add'>+	bool recycle_rx_buf = false;</div><div class='ctx'> 	void *buf_data;</div><div class='del'>-	u32 status = 0;</div><div class='ctx'> 	u32 xdp_act;</div><div class='ctx'> </div><div class='ctx'> 	/* Tracing point */</div><div class='ctx'> 	trace_dpaa2_rx_fd(priv-&gt;net_dev, fd);</div><div class='ctx'> </div><div class='ctx'> 	vaddr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, addr);</div><div class='del'>-	dma_sync_single_for_cpu(dev, addr, DPAA2_ETH_RX_BUF_SIZE,</div><div class='add'>+	dma_sync_single_for_cpu(dev, addr, priv-&gt;rx_buf_size,</div><div class='ctx'> 				DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='del'>-	fas = dpaa2_get_fas(vaddr, false);</div><div class='del'>-	prefetch(fas);</div><div class='ctx'> 	buf_data = vaddr + dpaa2_fd_get_offset(fd);</div><div class='ctx'> 	prefetch(buf_data);</div><div class='ctx'> </div><div class='hunk'>@@ -382,22 +605,27 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	percpu_extras = this_cpu_ptr(priv-&gt;percpu_extras);</div><div class='ctx'> </div><div class='ctx'> 	if (fd_format == dpaa2_fd_single) {</div><div class='del'>-		xdp_act = run_xdp(priv, ch, fq, (struct dpaa2_fd *)fd, vaddr);</div><div class='add'>+		xdp_act = dpaa2_eth_run_xdp(priv, ch, fq, (struct dpaa2_fd *)fd, vaddr);</div><div class='ctx'> 		if (xdp_act != XDP_PASS) {</div><div class='ctx'> 			percpu_stats-&gt;rx_packets++;</div><div class='ctx'> 			percpu_stats-&gt;rx_bytes += dpaa2_fd_get_len(fd);</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE,</div><div class='del'>-			       DMA_BIDIRECTIONAL);</div><div class='del'>-		skb = build_linear_skb(ch, fd, vaddr);</div><div class='add'>+		skb = dpaa2_eth_copybreak(ch, fd, vaddr);</div><div class='add'>+		if (!skb) {</div><div class='add'>+			dma_unmap_page(dev, addr, priv-&gt;rx_buf_size,</div><div class='add'>+				       DMA_BIDIRECTIONAL);</div><div class='add'>+			skb = dpaa2_eth_build_linear_skb(ch, fd, vaddr);</div><div class='add'>+		} else {</div><div class='add'>+			recycle_rx_buf = true;</div><div class='add'>+		}</div><div class='ctx'> 	} else if (fd_format == dpaa2_fd_sg) {</div><div class='ctx'> 		WARN_ON(priv-&gt;xdp_prog);</div><div class='ctx'> </div><div class='del'>-		dma_unmap_page(dev, addr, DPAA2_ETH_RX_BUF_SIZE,</div><div class='add'>+		dma_unmap_page(dev, addr, priv-&gt;rx_buf_size,</div><div class='ctx'> 			       DMA_BIDIRECTIONAL);</div><div class='del'>-		skb = build_frag_skb(priv, ch, buf_data);</div><div class='add'>+		skb = dpaa2_eth_build_frag_skb(priv, ch, buf_data);</div><div class='ctx'> 		free_pages((unsigned long)vaddr, 0);</div><div class='ctx'> 		percpu_extras-&gt;rx_sg_frames++;</div><div class='ctx'> 		percpu_extras-&gt;rx_sg_bytes += dpaa2_fd_get_len(fd);</div><div class='hunk'>@@ -409,40 +637,68 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	if (unlikely(!skb))</div><div class='ctx'> 		goto err_build_skb;</div><div class='ctx'> </div><div class='del'>-	prefetch(skb-&gt;data);</div><div class='add'>+	dpaa2_eth_receive_skb(priv, ch, fd, vaddr, fq, percpu_stats, skb);</div><div class='ctx'> </div><div class='del'>-	/* Get the timestamp value */</div><div class='del'>-	if (priv-&gt;rx_tstamp) {</div><div class='del'>-		struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);</div><div class='del'>-		__le64 *ts = dpaa2_get_ts(vaddr, false);</div><div class='del'>-		u64 ns;</div><div class='del'>-</div><div class='del'>-		memset(shhwtstamps, 0, sizeof(*shhwtstamps));</div><div class='add'>+	if (recycle_rx_buf)</div><div class='add'>+		dpaa2_eth_recycle_buf(priv, ch, dpaa2_fd_get_addr(fd));</div><div class='add'>+	return;</div><div class='ctx'> </div><div class='del'>-		ns = DPAA2_PTP_CLK_PERIOD_NS * le64_to_cpup(ts);</div><div class='del'>-		shhwtstamps-&gt;hwtstamp = ns_to_ktime(ns);</div><div class='del'>-	}</div><div class='add'>+err_build_skb:</div><div class='add'>+	dpaa2_eth_free_rx_fd(priv, fd, vaddr);</div><div class='add'>+err_frame_format:</div><div class='add'>+	percpu_stats-&gt;rx_dropped++;</div><div class='add'>+}</div><div class='ctx'> </div><div class='del'>-	/* Check if we need to validate the L4 csum */</div><div class='del'>-	if (likely(dpaa2_fd_get_frc(fd) &amp; DPAA2_FD_FRC_FASV)) {</div><div class='del'>-		status = le32_to_cpu(fas-&gt;status);</div><div class='del'>-		validate_rx_csum(priv, status, skb);</div><div class='del'>-	}</div><div class='add'>+/* Processing of Rx frames received on the error FQ</div><div class='add'>+ * We check and print the error bits and then free the frame</div><div class='add'>+ */</div><div class='add'>+static void dpaa2_eth_rx_err(struct dpaa2_eth_priv *priv,</div><div class='add'>+			     struct dpaa2_eth_channel *ch,</div><div class='add'>+			     const struct dpaa2_fd *fd,</div><div class='add'>+			     struct dpaa2_eth_fq *fq __always_unused)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='add'>+	u8 fd_format = dpaa2_fd_get_format(fd);</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	struct dpaa2_eth_trap_item *trap_item;</div><div class='add'>+	struct dpaa2_fapr *fapr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *buf_data;</div><div class='add'>+	void *vaddr;</div><div class='ctx'> </div><div class='del'>-	skb-&gt;protocol = eth_type_trans(skb, priv-&gt;net_dev);</div><div class='del'>-	skb_record_rx_queue(skb, fq-&gt;flowid);</div><div class='add'>+	vaddr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, addr);</div><div class='add'>+	dma_sync_single_for_cpu(dev, addr, priv-&gt;rx_buf_size,</div><div class='add'>+				DMA_BIDIRECTIONAL);</div><div class='ctx'> </div><div class='del'>-	percpu_stats-&gt;rx_packets++;</div><div class='del'>-	percpu_stats-&gt;rx_bytes += dpaa2_fd_get_len(fd);</div><div class='add'>+	buf_data = vaddr + dpaa2_fd_get_offset(fd);</div><div class='ctx'> </div><div class='del'>-	list_add_tail(&amp;skb-&gt;list, ch-&gt;rx_list);</div><div class='add'>+	if (fd_format == dpaa2_fd_single) {</div><div class='add'>+		dma_unmap_page(dev, addr, priv-&gt;rx_buf_size,</div><div class='add'>+			       DMA_BIDIRECTIONAL);</div><div class='add'>+		skb = dpaa2_eth_build_linear_skb(ch, fd, vaddr);</div><div class='add'>+	} else if (fd_format == dpaa2_fd_sg) {</div><div class='add'>+		dma_unmap_page(dev, addr, priv-&gt;rx_buf_size,</div><div class='add'>+			       DMA_BIDIRECTIONAL);</div><div class='add'>+		skb = dpaa2_eth_build_frag_skb(priv, ch, buf_data);</div><div class='add'>+		free_pages((unsigned long)vaddr, 0);</div><div class='add'>+	} else {</div><div class='add'>+		/* We don't support any other format */</div><div class='add'>+		dpaa2_eth_free_rx_fd(priv, fd, vaddr);</div><div class='add'>+		goto err_frame_format;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return;</div><div class='add'>+	fapr = dpaa2_get_fapr(vaddr, false);</div><div class='add'>+	trap_item = dpaa2_eth_dl_get_trap(priv, fapr);</div><div class='add'>+	if (trap_item)</div><div class='add'>+		devlink_trap_report(priv-&gt;devlink, skb, trap_item-&gt;trap_ctx,</div><div class='add'>+				    &amp;priv-&gt;devlink_port, NULL);</div><div class='add'>+	consume_skb(skb);</div><div class='ctx'> </div><div class='del'>-err_build_skb:</div><div class='del'>-	free_rx_fd(priv, fd, vaddr);</div><div class='ctx'> err_frame_format:</div><div class='del'>-	percpu_stats-&gt;rx_dropped++;</div><div class='add'>+	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='add'>+	percpu_stats-&gt;rx_errors++;</div><div class='add'>+	ch-&gt;buf_count--;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Consume all frames pull-dequeued into the store. This is the simplest way to</div><div class='hunk'>@@ -451,14 +707,14 @@ err_frame_format:</div><div class='ctx'>  *</div><div class='ctx'>  * Observance of NAPI budget is not our concern, leaving that to the caller.</div><div class='ctx'>  */</div><div class='del'>-static int consume_frames(struct dpaa2_eth_channel *ch,</div><div class='del'>-			  struct dpaa2_eth_fq **src)</div><div class='add'>+static int dpaa2_eth_consume_frames(struct dpaa2_eth_channel *ch,</div><div class='add'>+				    struct dpaa2_eth_fq **src)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = ch-&gt;priv;</div><div class='ctx'> 	struct dpaa2_eth_fq *fq = NULL;</div><div class='ctx'> 	struct dpaa2_dq *dq;</div><div class='ctx'> 	const struct dpaa2_fd *fd;</div><div class='del'>-	int cleaned = 0;</div><div class='add'>+	int cleaned = 0, retries = 0;</div><div class='ctx'> 	int is_last;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='hunk'>@@ -469,6 +725,11 @@ static int consume_frames(struct dpaa2_eth_channel *ch,</div><div class='ctx'> 			 * the store until we get some sort of valid response</div><div class='ctx'> 			 * token (either a valid frame or an "empty dequeue")</div><div class='ctx'> 			 */</div><div class='add'>+			if (retries++ &gt;= DPAA2_ETH_SWP_BUSY_RETRIES) {</div><div class='add'>+				netdev_err_once(priv-&gt;net_dev,</div><div class='add'>+						"Unable to read a valid dequeue response\n");</div><div class='add'>+				return -ETIMEDOUT;</div><div class='add'>+			}</div><div class='ctx'> 			continue;</div><div class='ctx'> 		}</div><div class='ctx'> </div><div class='hunk'>@@ -477,12 +738,15 @@ static int consume_frames(struct dpaa2_eth_channel *ch,</div><div class='ctx'> </div><div class='ctx'> 		fq-&gt;consume(priv, ch, fd, fq);</div><div class='ctx'> 		cleaned++;</div><div class='add'>+		retries = 0;</div><div class='ctx'> 	} while (!is_last);</div><div class='ctx'> </div><div class='ctx'> 	if (!cleaned)</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	fq-&gt;stats.frames += cleaned;</div><div class='add'>+	ch-&gt;stats.frames += cleaned;</div><div class='add'>+	ch-&gt;stats.frames_per_cdan += cleaned;</div><div class='ctx'> </div><div class='ctx'> 	/* A dequeue operation only pulls frames from a single queue</div><div class='ctx'> 	 * into the store. Return the frame queue as an out param.</div><div class='hunk'>@@ -493,11 +757,56 @@ static int consume_frames(struct dpaa2_eth_channel *ch,</div><div class='ctx'> 	return cleaned;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa2_eth_ptp_parse(struct sk_buff *skb,</div><div class='add'>+			       u8 *msgtype, u8 *twostep, u8 *udp,</div><div class='add'>+			       u16 *correction_offset,</div><div class='add'>+			       u16 *origintimestamp_offset)</div><div class='add'>+{</div><div class='add'>+	unsigned int ptp_class;</div><div class='add'>+	struct ptp_header *hdr;</div><div class='add'>+	unsigned int type;</div><div class='add'>+	u8 *base;</div><div class='add'>+</div><div class='add'>+	ptp_class = ptp_classify_raw(skb);</div><div class='add'>+	if (ptp_class == PTP_CLASS_NONE)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	hdr = ptp_parse_header(skb, ptp_class);</div><div class='add'>+	if (!hdr)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	*msgtype = ptp_get_msgtype(hdr, ptp_class);</div><div class='add'>+	*twostep = hdr-&gt;flag_field[0] &amp; 0x2;</div><div class='add'>+</div><div class='add'>+	type = ptp_class &amp; PTP_CLASS_PMASK;</div><div class='add'>+	if (type == PTP_CLASS_IPV4 ||</div><div class='add'>+	    type == PTP_CLASS_IPV6)</div><div class='add'>+		*udp = 1;</div><div class='add'>+	else</div><div class='add'>+		*udp = 0;</div><div class='add'>+</div><div class='add'>+	base = skb_mac_header(skb);</div><div class='add'>+	*correction_offset = (u8 *)&amp;hdr-&gt;correction - base;</div><div class='add'>+	*origintimestamp_offset = (u8 *)hdr + sizeof(struct ptp_header) - base;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Configure the egress frame annotation for timestamp update */</div><div class='del'>-static void enable_tx_tstamp(struct dpaa2_fd *fd, void *buf_start)</div><div class='add'>+static void dpaa2_eth_enable_tx_tstamp(struct dpaa2_eth_priv *priv,</div><div class='add'>+				       struct dpaa2_fd *fd,</div><div class='add'>+				       void *buf_start,</div><div class='add'>+				       struct sk_buff *skb)</div><div class='ctx'> {</div><div class='add'>+	struct ptp_tstamp origin_timestamp;</div><div class='add'>+	u8 msgtype, twostep, udp;</div><div class='ctx'> 	struct dpaa2_faead *faead;</div><div class='add'>+	struct dpaa2_fas *fas;</div><div class='add'>+	struct timespec64 ts;</div><div class='add'>+	u16 offset1, offset2;</div><div class='ctx'> 	u32 ctrl, frc;</div><div class='add'>+	__le64 *ns;</div><div class='add'>+	u8 *data;</div><div class='ctx'> </div><div class='ctx'> 	/* Mark the egress frame annotation area as valid */</div><div class='ctx'> 	frc = dpaa2_fd_get_frc(fd);</div><div class='hunk'>@@ -513,12 +822,83 @@ static void enable_tx_tstamp(struct dpaa2_fd *fd, void *buf_start)</div><div class='ctx'> 	ctrl = DPAA2_FAEAD_A2V | DPAA2_FAEAD_UPDV | DPAA2_FAEAD_UPD;</div><div class='ctx'> 	faead = dpaa2_get_faead(buf_start, true);</div><div class='ctx'> 	faead-&gt;ctrl = cpu_to_le32(ctrl);</div><div class='add'>+</div><div class='add'>+	if (skb-&gt;cb[0] == TX_TSTAMP_ONESTEP_SYNC) {</div><div class='add'>+		if (dpaa2_eth_ptp_parse(skb, &amp;msgtype, &amp;twostep, &amp;udp,</div><div class='add'>+					&amp;offset1, &amp;offset2) ||</div><div class='add'>+		    msgtype != PTP_MSGTYPE_SYNC || twostep) {</div><div class='add'>+			WARN_ONCE(1, "Bad packet for one-step timestamping\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Mark the frame annotation status as valid */</div><div class='add'>+		frc = dpaa2_fd_get_frc(fd);</div><div class='add'>+		dpaa2_fd_set_frc(fd, frc | DPAA2_FD_FRC_FASV);</div><div class='add'>+</div><div class='add'>+		/* Mark the PTP flag for one step timestamping */</div><div class='add'>+		fas = dpaa2_get_fas(buf_start, true);</div><div class='add'>+		fas-&gt;status = cpu_to_le32(DPAA2_FAS_PTP);</div><div class='add'>+</div><div class='add'>+		dpaa2_ptp-&gt;caps.gettime64(&amp;dpaa2_ptp-&gt;caps, &amp;ts);</div><div class='add'>+		ns = dpaa2_get_ts(buf_start, true);</div><div class='add'>+		*ns = cpu_to_le64(timespec64_to_ns(&amp;ts) /</div><div class='add'>+				  DPAA2_PTP_CLK_PERIOD_NS);</div><div class='add'>+</div><div class='add'>+		/* Update current time to PTP message originTimestamp field */</div><div class='add'>+		ns_to_ptp_tstamp(&amp;origin_timestamp, le64_to_cpup(ns));</div><div class='add'>+		data = skb_mac_header(skb);</div><div class='add'>+		*(__be16 *)(data + offset2) = htons(origin_timestamp.sec_msb);</div><div class='add'>+		*(__be32 *)(data + offset2 + 2) =</div><div class='add'>+			htonl(origin_timestamp.sec_lsb);</div><div class='add'>+		*(__be32 *)(data + offset2 + 6) = htonl(origin_timestamp.nsec);</div><div class='add'>+</div><div class='add'>+		if (priv-&gt;ptp_correction_off == offset1)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		priv-&gt;dpaa2_set_onestep_params_cb(priv, offset1, udp);</div><div class='add'>+		priv-&gt;ptp_correction_off = offset1;</div><div class='add'>+</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void *dpaa2_eth_sgt_get(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_sgt_cache *sgt_cache;</div><div class='add'>+	void *sgt_buf = NULL;</div><div class='add'>+	int sgt_buf_size;</div><div class='add'>+</div><div class='add'>+	sgt_cache = this_cpu_ptr(priv-&gt;sgt_cache);</div><div class='add'>+	sgt_buf_size = priv-&gt;tx_data_offset +</div><div class='add'>+		DPAA2_ETH_SG_ENTRIES_MAX * sizeof(struct dpaa2_sg_entry);</div><div class='add'>+</div><div class='add'>+	if (sgt_cache-&gt;count == 0)</div><div class='add'>+		sgt_buf = napi_alloc_frag_align(sgt_buf_size, DPAA2_ETH_TX_BUF_ALIGN);</div><div class='add'>+	else</div><div class='add'>+		sgt_buf = sgt_cache-&gt;buf[--sgt_cache-&gt;count];</div><div class='add'>+	if (!sgt_buf)</div><div class='add'>+		return NULL;</div><div class='add'>+</div><div class='add'>+	memset(sgt_buf, 0, sgt_buf_size);</div><div class='add'>+</div><div class='add'>+	return sgt_buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_sgt_recycle(struct dpaa2_eth_priv *priv, void *sgt_buf)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_sgt_cache *sgt_cache;</div><div class='add'>+</div><div class='add'>+	sgt_cache = this_cpu_ptr(priv-&gt;sgt_cache);</div><div class='add'>+	if (sgt_cache-&gt;count &gt;= DPAA2_ETH_SGT_CACHE_SIZE)</div><div class='add'>+		skb_free_frag(sgt_buf);</div><div class='add'>+	else</div><div class='add'>+		sgt_cache-&gt;buf[sgt_cache-&gt;count++] = sgt_buf;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Create a frame descriptor based on a fragmented skb */</div><div class='del'>-static int build_sg_fd(struct dpaa2_eth_priv *priv,</div><div class='del'>-		       struct sk_buff *skb,</div><div class='del'>-		       struct dpaa2_fd *fd)</div><div class='add'>+static int dpaa2_eth_build_sg_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+				 struct sk_buff *skb,</div><div class='add'>+				 struct dpaa2_fd *fd,</div><div class='add'>+				 void **swa_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	void *sgt_buf = NULL;</div><div class='hunk'>@@ -540,12 +920,16 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	if (unlikely(PAGE_SIZE / sizeof(struct scatterlist) &lt; nr_frags + 1))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	scl = kcalloc(nr_frags + 1, sizeof(struct scatterlist), GFP_ATOMIC);</div><div class='add'>+	scl = kmalloc_array(nr_frags + 1, sizeof(struct scatterlist), GFP_ATOMIC);</div><div class='ctx'> 	if (unlikely(!scl))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	sg_init_table(scl, nr_frags + 1);</div><div class='ctx'> 	num_sg = skb_to_sgvec(skb, scl, 0, skb-&gt;len);</div><div class='add'>+	if (unlikely(num_sg &lt; 0)) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto dma_map_sg_failed;</div><div class='add'>+	}</div><div class='ctx'> 	num_dma_bufs = dma_map_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);</div><div class='ctx'> 	if (unlikely(!num_dma_bufs)) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='hunk'>@@ -555,13 +939,11 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	/* Prepare the HW SGT structure */</div><div class='ctx'> 	sgt_buf_size = priv-&gt;tx_data_offset +</div><div class='ctx'> 		       sizeof(struct dpaa2_sg_entry) *  num_dma_bufs;</div><div class='del'>-	sgt_buf = netdev_alloc_frag(sgt_buf_size + DPAA2_ETH_TX_BUF_ALIGN);</div><div class='add'>+	sgt_buf = dpaa2_eth_sgt_get(priv);</div><div class='ctx'> 	if (unlikely(!sgt_buf)) {</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto sgt_buf_alloc_failed;</div><div class='ctx'> 	}</div><div class='del'>-	sgt_buf = PTR_ALIGN(sgt_buf, DPAA2_ETH_TX_BUF_ALIGN);</div><div class='del'>-	memset(sgt_buf, 0, sgt_buf_size);</div><div class='ctx'> </div><div class='ctx'> 	sgt = (struct dpaa2_sg_entry *)(sgt_buf + priv-&gt;tx_data_offset);</div><div class='ctx'> </div><div class='hunk'>@@ -583,6 +965,7 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	 * skb backpointer in the software annotation area. We'll need</div><div class='ctx'> 	 * all of them on Tx Conf.</div><div class='ctx'> 	 */</div><div class='add'>+	*swa_addr = (void *)sgt_buf;</div><div class='ctx'> 	swa = (struct dpaa2_eth_swa *)sgt_buf;</div><div class='ctx'> 	swa-&gt;type = DPAA2_ETH_SWA_SG;</div><div class='ctx'> 	swa-&gt;sg.skb = skb;</div><div class='hunk'>@@ -596,19 +979,17 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 		err = -ENOMEM;</div><div class='ctx'> 		goto dma_map_single_failed;</div><div class='ctx'> 	}</div><div class='add'>+	memset(fd, 0, sizeof(struct dpaa2_fd));</div><div class='ctx'> 	dpaa2_fd_set_offset(fd, priv-&gt;tx_data_offset);</div><div class='ctx'> 	dpaa2_fd_set_format(fd, dpaa2_fd_sg);</div><div class='ctx'> 	dpaa2_fd_set_addr(fd, addr);</div><div class='ctx'> 	dpaa2_fd_set_len(fd, skb-&gt;len);</div><div class='ctx'> 	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;tx_tstamp &amp;&amp; skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)</div><div class='del'>-		enable_tx_tstamp(fd, sgt_buf);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> dma_map_single_failed:</div><div class='del'>-	skb_free_frag(sgt_buf);</div><div class='add'>+	dpaa2_eth_sgt_recycle(priv, sgt_buf);</div><div class='ctx'> sgt_buf_alloc_failed:</div><div class='ctx'> 	dma_unmap_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);</div><div class='ctx'> dma_map_sg_failed:</div><div class='hunk'>@@ -616,30 +997,97 @@ dma_map_sg_failed:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+/* Create a SG frame descriptor based on a linear skb.</div><div class='add'>+ *</div><div class='add'>+ * This function is used on the Tx path when the skb headroom is not large</div><div class='add'>+ * enough for the HW requirements, thus instead of realloc-ing the skb we</div><div class='add'>+ * create a SG frame descriptor with only one entry.</div><div class='add'>+ */</div><div class='add'>+static int dpaa2_eth_build_sg_fd_single_buf(struct dpaa2_eth_priv *priv,</div><div class='add'>+					    struct sk_buff *skb,</div><div class='add'>+					    struct dpaa2_fd *fd,</div><div class='add'>+					    void **swa_addr)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpaa2_sg_entry *sgt;</div><div class='add'>+	struct dpaa2_eth_swa *swa;</div><div class='add'>+	dma_addr_t addr, sgt_addr;</div><div class='add'>+	void *sgt_buf = NULL;</div><div class='add'>+	int sgt_buf_size;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Prepare the HW SGT structure */</div><div class='add'>+	sgt_buf_size = priv-&gt;tx_data_offset + sizeof(struct dpaa2_sg_entry);</div><div class='add'>+	sgt_buf = dpaa2_eth_sgt_get(priv);</div><div class='add'>+	if (unlikely(!sgt_buf))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	sgt = (struct dpaa2_sg_entry *)(sgt_buf + priv-&gt;tx_data_offset);</div><div class='add'>+</div><div class='add'>+	addr = dma_map_single(dev, skb-&gt;data, skb-&gt;len, DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto data_map_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Fill in the HW SGT structure */</div><div class='add'>+	dpaa2_sg_set_addr(sgt, addr);</div><div class='add'>+	dpaa2_sg_set_len(sgt, skb-&gt;len);</div><div class='add'>+	dpaa2_sg_set_final(sgt, true);</div><div class='add'>+</div><div class='add'>+	/* Store the skb backpointer in the SGT buffer */</div><div class='add'>+	*swa_addr = (void *)sgt_buf;</div><div class='add'>+	swa = (struct dpaa2_eth_swa *)sgt_buf;</div><div class='add'>+	swa-&gt;type = DPAA2_ETH_SWA_SINGLE;</div><div class='add'>+	swa-&gt;single.skb = skb;</div><div class='add'>+	swa-&gt;single.sgt_size = sgt_buf_size;</div><div class='add'>+</div><div class='add'>+	/* Separately map the SGT buffer */</div><div class='add'>+	sgt_addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, sgt_addr))) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto sgt_map_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(fd, 0, sizeof(struct dpaa2_fd));</div><div class='add'>+	dpaa2_fd_set_offset(fd, priv-&gt;tx_data_offset);</div><div class='add'>+	dpaa2_fd_set_format(fd, dpaa2_fd_sg);</div><div class='add'>+	dpaa2_fd_set_addr(fd, sgt_addr);</div><div class='add'>+	dpaa2_fd_set_len(fd, skb-&gt;len);</div><div class='add'>+	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+sgt_map_failed:</div><div class='add'>+	dma_unmap_single(dev, addr, skb-&gt;len, DMA_BIDIRECTIONAL);</div><div class='add'>+data_map_failed:</div><div class='add'>+	dpaa2_eth_sgt_recycle(priv, sgt_buf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Create a frame descriptor based on a linear skb */</div><div class='del'>-static int build_single_fd(struct dpaa2_eth_priv *priv,</div><div class='del'>-			   struct sk_buff *skb,</div><div class='del'>-			   struct dpaa2_fd *fd)</div><div class='add'>+static int dpaa2_eth_build_single_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+				     struct sk_buff *skb,</div><div class='add'>+				     struct dpaa2_fd *fd,</div><div class='add'>+				     void **swa_addr)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	u8 *buffer_start, *aligned_start;</div><div class='ctx'> 	struct dpaa2_eth_swa *swa;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='ctx'> </div><div class='del'>-	buffer_start = skb-&gt;data - dpaa2_eth_needed_headroom(priv, skb);</div><div class='del'>-</div><div class='del'>-	/* If there's enough room to align the FD address, do it.</div><div class='del'>-	 * It will help hardware optimize accesses.</div><div class='del'>-	 */</div><div class='del'>-	aligned_start = PTR_ALIGN(buffer_start - DPAA2_ETH_TX_BUF_ALIGN,</div><div class='del'>-				  DPAA2_ETH_TX_BUF_ALIGN);</div><div class='add'>+	buffer_start = skb-&gt;data - dpaa2_eth_needed_headroom(skb);</div><div class='add'>+	aligned_start = PTR_ALIGN(buffer_start, DPAA2_ETH_TX_BUF_ALIGN);</div><div class='ctx'> 	if (aligned_start &gt;= skb-&gt;head)</div><div class='ctx'> 		buffer_start = aligned_start;</div><div class='add'>+	else</div><div class='add'>+		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Store a backpointer to the skb at the beginning of the buffer</div><div class='ctx'> 	 * (in the private data area) such that we can release it</div><div class='ctx'> 	 * on Tx confirm</div><div class='ctx'> 	 */</div><div class='add'>+	*swa_addr = (void *)buffer_start;</div><div class='ctx'> 	swa = (struct dpaa2_eth_swa *)buffer_start;</div><div class='ctx'> 	swa-&gt;type = DPAA2_ETH_SWA_SINGLE;</div><div class='ctx'> 	swa-&gt;single.skb = skb;</div><div class='hunk'>@@ -650,15 +1098,13 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	if (unlikely(dma_mapping_error(dev, addr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='add'>+	memset(fd, 0, sizeof(struct dpaa2_fd));</div><div class='ctx'> 	dpaa2_fd_set_addr(fd, addr);</div><div class='ctx'> 	dpaa2_fd_set_offset(fd, (u16)(skb-&gt;data - buffer_start));</div><div class='ctx'> 	dpaa2_fd_set_len(fd, skb-&gt;len);</div><div class='ctx'> 	dpaa2_fd_set_format(fd, dpaa2_fd_single);</div><div class='ctx'> 	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA);</div><div class='ctx'> </div><div class='del'>-	if (priv-&gt;tx_tstamp &amp;&amp; skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)</div><div class='del'>-		enable_tx_tstamp(fd, buffer_start);</div><div class='del'>-</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -669,17 +1115,22 @@ static int build_single_fd(struct dpaa2_eth_priv *priv,</div><div class='ctx'>  * This can be called either from dpaa2_eth_tx_conf() or on the error path of</div><div class='ctx'>  * dpaa2_eth_tx().</div><div class='ctx'>  */</div><div class='del'>-static void free_tx_fd(const struct dpaa2_eth_priv *priv,</div><div class='del'>-		       struct dpaa2_eth_fq *fq,</div><div class='del'>-		       const struct dpaa2_fd *fd, bool in_napi)</div><div class='add'>+void dpaa2_eth_free_tx_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+			  struct dpaa2_eth_channel *ch,</div><div class='add'>+			  struct dpaa2_eth_fq *fq,</div><div class='add'>+			  const struct dpaa2_fd *fd, bool in_napi)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='del'>-	dma_addr_t fd_addr;</div><div class='add'>+	dma_addr_t fd_addr, sg_addr;</div><div class='ctx'> 	struct sk_buff *skb = NULL;</div><div class='ctx'> 	unsigned char *buffer_start;</div><div class='ctx'> 	struct dpaa2_eth_swa *swa;</div><div class='ctx'> 	u8 fd_format = dpaa2_fd_get_format(fd);</div><div class='ctx'> 	u32 fd_len = dpaa2_fd_get_len(fd);</div><div class='add'>+	struct dpaa2_sg_entry *sgt;</div><div class='add'>+	int should_free_skb = 1;</div><div class='add'>+	void *tso_hdr;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	fd_addr = dpaa2_fd_get_addr(fd);</div><div class='ctx'> 	buffer_start = dpaa2_iova_to_virt(priv-&gt;iommu_domain, fd_addr);</div><div class='hunk'>@@ -700,21 +1151,67 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv,</div><div class='ctx'> 					 DMA_BIDIRECTIONAL);</div><div class='ctx'> 		}</div><div class='ctx'> 	} else if (fd_format == dpaa2_fd_sg) {</div><div class='del'>-		skb = swa-&gt;sg.skb;</div><div class='add'>+		if (swa-&gt;type == DPAA2_ETH_SWA_SG) {</div><div class='add'>+			skb = swa-&gt;sg.skb;</div><div class='ctx'> </div><div class='del'>-		/* Unmap the scatterlist */</div><div class='del'>-		dma_unmap_sg(dev, swa-&gt;sg.scl, swa-&gt;sg.num_sg,</div><div class='del'>-			     DMA_BIDIRECTIONAL);</div><div class='del'>-		kfree(swa-&gt;sg.scl);</div><div class='add'>+			/* Unmap the scatterlist */</div><div class='add'>+			dma_unmap_sg(dev, swa-&gt;sg.scl, swa-&gt;sg.num_sg,</div><div class='add'>+				     DMA_BIDIRECTIONAL);</div><div class='add'>+			kfree(swa-&gt;sg.scl);</div><div class='ctx'> </div><div class='del'>-		/* Unmap the SGT buffer */</div><div class='del'>-		dma_unmap_single(dev, fd_addr, swa-&gt;sg.sgt_size,</div><div class='del'>-				 DMA_BIDIRECTIONAL);</div><div class='add'>+			/* Unmap the SGT buffer */</div><div class='add'>+			dma_unmap_single(dev, fd_addr, swa-&gt;sg.sgt_size,</div><div class='add'>+					 DMA_BIDIRECTIONAL);</div><div class='add'>+		} else if (swa-&gt;type == DPAA2_ETH_SWA_SW_TSO) {</div><div class='add'>+			skb = swa-&gt;tso.skb;</div><div class='add'>+</div><div class='add'>+			sgt = (struct dpaa2_sg_entry *)(buffer_start +</div><div class='add'>+							priv-&gt;tx_data_offset);</div><div class='add'>+</div><div class='add'>+			/* Unmap the SGT buffer */</div><div class='add'>+			dma_unmap_single(dev, fd_addr, swa-&gt;tso.sgt_size,</div><div class='add'>+					 DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+			/* Unmap and free the header */</div><div class='add'>+			tso_hdr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, dpaa2_sg_get_addr(sgt));</div><div class='add'>+			dma_unmap_single(dev, dpaa2_sg_get_addr(sgt), TSO_HEADER_SIZE,</div><div class='add'>+					 DMA_TO_DEVICE);</div><div class='add'>+			kfree(tso_hdr);</div><div class='add'>+</div><div class='add'>+			/* Unmap the other SG entries for the data */</div><div class='add'>+			for (i = 1; i &lt; swa-&gt;tso.num_sg; i++)</div><div class='add'>+				dma_unmap_single(dev, dpaa2_sg_get_addr(&amp;sgt[i]),</div><div class='add'>+						 dpaa2_sg_get_len(&amp;sgt[i]), DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+			if (!swa-&gt;tso.is_last_fd)</div><div class='add'>+				should_free_skb = 0;</div><div class='add'>+		} else if (swa-&gt;type == DPAA2_ETH_SWA_XSK) {</div><div class='add'>+			/* Unmap the SGT Buffer */</div><div class='add'>+			dma_unmap_single(dev, fd_addr, swa-&gt;xsk.sgt_size,</div><div class='add'>+					 DMA_BIDIRECTIONAL);</div><div class='add'>+		} else {</div><div class='add'>+			skb = swa-&gt;single.skb;</div><div class='add'>+</div><div class='add'>+			/* Unmap the SGT Buffer */</div><div class='add'>+			dma_unmap_single(dev, fd_addr, swa-&gt;single.sgt_size,</div><div class='add'>+					 DMA_BIDIRECTIONAL);</div><div class='add'>+</div><div class='add'>+			sgt = (struct dpaa2_sg_entry *)(buffer_start +</div><div class='add'>+							priv-&gt;tx_data_offset);</div><div class='add'>+			sg_addr = dpaa2_sg_get_addr(sgt);</div><div class='add'>+			dma_unmap_single(dev, sg_addr, skb-&gt;len, DMA_BIDIRECTIONAL);</div><div class='add'>+		}</div><div class='ctx'> 	} else {</div><div class='ctx'> 		netdev_dbg(priv-&gt;net_dev, "Invalid FD format\n");</div><div class='ctx'> 		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (swa-&gt;type == DPAA2_ETH_SWA_XSK) {</div><div class='add'>+		ch-&gt;xsk_tx_pkts_sent++;</div><div class='add'>+		dpaa2_eth_sgt_recycle(priv, buffer_start);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (swa-&gt;type != DPAA2_ETH_SWA_XDP &amp;&amp; in_napi) {</div><div class='ctx'> 		fq-&gt;dq_frames++;</div><div class='ctx'> 		fq-&gt;dq_bytes += fd_len;</div><div class='hunk'>@@ -726,59 +1223,197 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Get the timestamp value */</div><div class='del'>-	if (priv-&gt;tx_tstamp &amp;&amp; skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) {</div><div class='del'>-		struct skb_shared_hwtstamps shhwtstamps;</div><div class='del'>-		__le64 *ts = dpaa2_get_ts(buffer_start, true);</div><div class='del'>-		u64 ns;</div><div class='del'>-</div><div class='del'>-		memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='del'>-</div><div class='del'>-		ns = DPAA2_PTP_CLK_PERIOD_NS * le64_to_cpup(ts);</div><div class='del'>-		shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='del'>-		skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='add'>+	if (swa-&gt;type != DPAA2_ETH_SWA_SW_TSO) {</div><div class='add'>+		if (skb-&gt;cb[0] == TX_TSTAMP) {</div><div class='add'>+			struct skb_shared_hwtstamps shhwtstamps;</div><div class='add'>+			__le64 *ts = dpaa2_get_ts(buffer_start, true);</div><div class='add'>+			u64 ns;</div><div class='add'>+</div><div class='add'>+			memset(&amp;shhwtstamps, 0, sizeof(shhwtstamps));</div><div class='add'>+</div><div class='add'>+			ns = DPAA2_PTP_CLK_PERIOD_NS * le64_to_cpup(ts);</div><div class='add'>+			shhwtstamps.hwtstamp = ns_to_ktime(ns);</div><div class='add'>+			skb_tstamp_tx(skb, &amp;shhwtstamps);</div><div class='add'>+		} else if (skb-&gt;cb[0] == TX_TSTAMP_ONESTEP_SYNC) {</div><div class='add'>+			mutex_unlock(&amp;priv-&gt;onestep_tstamp_lock);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Free SGT buffer allocated on tx */</div><div class='ctx'> 	if (fd_format != dpaa2_fd_single)</div><div class='del'>-		skb_free_frag(buffer_start);</div><div class='add'>+		dpaa2_eth_sgt_recycle(priv, buffer_start);</div><div class='ctx'> </div><div class='del'>-	/* Move on with skb release */</div><div class='del'>-	napi_consume_skb(skb, in_napi);</div><div class='add'>+	/* Move on with skb release. If we are just confirming multiple FDs</div><div class='add'>+	 * from the same TSO skb then only the last one will need to free the</div><div class='add'>+	 * skb.</div><div class='add'>+	 */</div><div class='add'>+	if (should_free_skb)</div><div class='add'>+		napi_consume_skb(skb, in_napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)</div><div class='add'>+static int dpaa2_eth_build_gso_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+				  struct sk_buff *skb, struct dpaa2_fd *fd,</div><div class='add'>+				  int *num_fds, u32 *total_fds_len)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	int hdr_len, total_len, data_left, fd_len;</div><div class='add'>+	int num_sge, err, i, sgt_buf_size;</div><div class='add'>+	struct dpaa2_fd *fd_start = fd;</div><div class='add'>+	struct dpaa2_sg_entry *sgt;</div><div class='add'>+	struct dpaa2_eth_swa *swa;</div><div class='add'>+	dma_addr_t sgt_addr, addr;</div><div class='add'>+	dma_addr_t tso_hdr_dma;</div><div class='add'>+	unsigned int index = 0;</div><div class='add'>+	struct tso_t tso;</div><div class='add'>+	char *tso_hdr;</div><div class='add'>+	void *sgt_buf;</div><div class='add'>+</div><div class='add'>+	/* Initialize the TSO handler, and prepare the first payload */</div><div class='add'>+	hdr_len = tso_start(skb, &amp;tso);</div><div class='add'>+	*total_fds_len = 0;</div><div class='add'>+</div><div class='add'>+	total_len = skb-&gt;len - hdr_len;</div><div class='add'>+	while (total_len &gt; 0) {</div><div class='add'>+		/* Prepare the HW SGT structure for this frame */</div><div class='add'>+		sgt_buf = dpaa2_eth_sgt_get(priv);</div><div class='add'>+		if (unlikely(!sgt_buf)) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev, "dpaa2_eth_sgt_get() failed\n");</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_sgt_get;</div><div class='add'>+		}</div><div class='add'>+		sgt = (struct dpaa2_sg_entry *)(sgt_buf + priv-&gt;tx_data_offset);</div><div class='add'>+</div><div class='add'>+		/* Determine the data length of this frame */</div><div class='add'>+		data_left = min_t(int, skb_shinfo(skb)-&gt;gso_size, total_len);</div><div class='add'>+		total_len -= data_left;</div><div class='add'>+		fd_len = data_left + hdr_len;</div><div class='add'>+</div><div class='add'>+		/* Prepare packet headers: MAC + IP + TCP */</div><div class='add'>+		tso_hdr = kmalloc(TSO_HEADER_SIZE, GFP_ATOMIC);</div><div class='add'>+		if (!tso_hdr) {</div><div class='add'>+			err =  -ENOMEM;</div><div class='add'>+			goto err_alloc_tso_hdr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tso_build_hdr(skb, tso_hdr, &amp;tso, data_left, total_len == 0);</div><div class='add'>+		tso_hdr_dma = dma_map_single(dev, tso_hdr, TSO_HEADER_SIZE, DMA_TO_DEVICE);</div><div class='add'>+		if (dma_mapping_error(dev, tso_hdr_dma)) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev, "dma_map_single(tso_hdr) failed\n");</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_map_tso_hdr;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Setup the SG entry for the header */</div><div class='add'>+		dpaa2_sg_set_addr(sgt, tso_hdr_dma);</div><div class='add'>+		dpaa2_sg_set_len(sgt, hdr_len);</div><div class='add'>+		dpaa2_sg_set_final(sgt, data_left &lt;= 0);</div><div class='add'>+</div><div class='add'>+		/* Compose the SG entries for each fragment of data */</div><div class='add'>+		num_sge = 1;</div><div class='add'>+		while (data_left &gt; 0) {</div><div class='add'>+			int size;</div><div class='add'>+</div><div class='add'>+			/* Move to the next SG entry */</div><div class='add'>+			sgt++;</div><div class='add'>+			size = min_t(int, tso.size, data_left);</div><div class='add'>+</div><div class='add'>+			addr = dma_map_single(dev, tso.data, size, DMA_TO_DEVICE);</div><div class='add'>+			if (dma_mapping_error(dev, addr)) {</div><div class='add'>+				netdev_err(priv-&gt;net_dev, "dma_map_single(tso.data) failed\n");</div><div class='add'>+				err = -ENOMEM;</div><div class='add'>+				goto err_map_data;</div><div class='add'>+			}</div><div class='add'>+			dpaa2_sg_set_addr(sgt, addr);</div><div class='add'>+			dpaa2_sg_set_len(sgt, size);</div><div class='add'>+			dpaa2_sg_set_final(sgt, size == data_left);</div><div class='add'>+</div><div class='add'>+			num_sge++;</div><div class='add'>+</div><div class='add'>+			/* Build the data for the __next__ fragment */</div><div class='add'>+			data_left -= size;</div><div class='add'>+			tso_build_data(skb, &amp;tso, size);</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Store the skb backpointer in the SGT buffer */</div><div class='add'>+		sgt_buf_size = priv-&gt;tx_data_offset + num_sge * sizeof(struct dpaa2_sg_entry);</div><div class='add'>+		swa = (struct dpaa2_eth_swa *)sgt_buf;</div><div class='add'>+		swa-&gt;type = DPAA2_ETH_SWA_SW_TSO;</div><div class='add'>+		swa-&gt;tso.skb = skb;</div><div class='add'>+		swa-&gt;tso.num_sg = num_sge;</div><div class='add'>+		swa-&gt;tso.sgt_size = sgt_buf_size;</div><div class='add'>+		swa-&gt;tso.is_last_fd = total_len == 0 ? 1 : 0;</div><div class='add'>+</div><div class='add'>+		/* Separately map the SGT buffer */</div><div class='add'>+		sgt_addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL);</div><div class='add'>+		if (unlikely(dma_mapping_error(dev, sgt_addr))) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev, "dma_map_single(sgt_buf) failed\n");</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+			goto err_map_sgt;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Setup the frame descriptor */</div><div class='add'>+		memset(fd, 0, sizeof(struct dpaa2_fd));</div><div class='add'>+		dpaa2_fd_set_offset(fd, priv-&gt;tx_data_offset);</div><div class='add'>+		dpaa2_fd_set_format(fd, dpaa2_fd_sg);</div><div class='add'>+		dpaa2_fd_set_addr(fd, sgt_addr);</div><div class='add'>+		dpaa2_fd_set_len(fd, fd_len);</div><div class='add'>+		dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA);</div><div class='add'>+</div><div class='add'>+		*total_fds_len += fd_len;</div><div class='add'>+		/* Advance to the next frame descriptor */</div><div class='add'>+		fd++;</div><div class='add'>+		index++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	*num_fds = index;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_map_sgt:</div><div class='add'>+err_map_data:</div><div class='add'>+	/* Unmap all the data S/G entries for the current FD */</div><div class='add'>+	sgt = (struct dpaa2_sg_entry *)(sgt_buf + priv-&gt;tx_data_offset);</div><div class='add'>+	for (i = 1; i &lt; num_sge; i++)</div><div class='add'>+		dma_unmap_single(dev, dpaa2_sg_get_addr(&amp;sgt[i]),</div><div class='add'>+				 dpaa2_sg_get_len(&amp;sgt[i]), DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	/* Unmap the header entry */</div><div class='add'>+	dma_unmap_single(dev, tso_hdr_dma, TSO_HEADER_SIZE, DMA_TO_DEVICE);</div><div class='add'>+err_map_tso_hdr:</div><div class='add'>+	kfree(tso_hdr);</div><div class='add'>+err_alloc_tso_hdr:</div><div class='add'>+	dpaa2_eth_sgt_recycle(priv, sgt_buf);</div><div class='add'>+err_sgt_get:</div><div class='add'>+	/* Free all the other FDs that were already fully created */</div><div class='add'>+	for (i = 0; i &lt; index; i++)</div><div class='add'>+		dpaa2_eth_free_tx_fd(priv, NULL, NULL, &amp;fd_start[i], false);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t __dpaa2_eth_tx(struct sk_buff *skb,</div><div class='add'>+				  struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='del'>-	struct dpaa2_fd fd;</div><div class='del'>-	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	int total_enqueued = 0, retries = 0, enqueued;</div><div class='ctx'> 	struct dpaa2_eth_drv_stats *percpu_extras;</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	unsigned int needed_headroom;</div><div class='add'>+	int num_fds = 1, max_retries;</div><div class='ctx'> 	struct dpaa2_eth_fq *fq;</div><div class='ctx'> 	struct netdev_queue *nq;</div><div class='add'>+	struct dpaa2_fd *fd;</div><div class='ctx'> 	u16 queue_mapping;</div><div class='del'>-	unsigned int needed_headroom;</div><div class='del'>-	u32 fd_len;</div><div class='add'>+	void *swa = NULL;</div><div class='add'>+	u8 prio = 0;</div><div class='ctx'> 	int err, i;</div><div class='add'>+	u32 fd_len;</div><div class='ctx'> </div><div class='ctx'> 	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='ctx'> 	percpu_extras = this_cpu_ptr(priv-&gt;percpu_extras);</div><div class='add'>+	fd = (this_cpu_ptr(priv-&gt;fd))-&gt;array;</div><div class='ctx'> </div><div class='del'>-	needed_headroom = dpaa2_eth_needed_headroom(priv, skb);</div><div class='del'>-	if (skb_headroom(skb) &lt; needed_headroom) {</div><div class='del'>-		struct sk_buff *ns;</div><div class='del'>-</div><div class='del'>-		ns = skb_realloc_headroom(skb, needed_headroom);</div><div class='del'>-		if (unlikely(!ns)) {</div><div class='del'>-			percpu_stats-&gt;tx_dropped++;</div><div class='del'>-			goto err_alloc_headroom;</div><div class='del'>-		}</div><div class='del'>-		percpu_extras-&gt;tx_reallocs++;</div><div class='del'>-</div><div class='del'>-		if (skb-&gt;sk)</div><div class='del'>-			skb_set_owner_w(ns, skb-&gt;sk);</div><div class='del'>-</div><div class='del'>-		dev_kfree_skb(skb);</div><div class='del'>-		skb = ns;</div><div class='del'>-	}</div><div class='add'>+	needed_headroom = dpaa2_eth_needed_headroom(skb);</div><div class='ctx'> </div><div class='ctx'> 	/* We'll be holding a back-reference to the skb until Tx Confirmation;</div><div class='ctx'> 	 * we don't want that overwritten by a concurrent Tx with a cloned skb.</div><div class='hunk'>@@ -791,14 +1426,28 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* Setup the FD fields */</div><div class='del'>-	memset(&amp;fd, 0, sizeof(fd));</div><div class='ctx'> </div><div class='del'>-	if (skb_is_nonlinear(skb)) {</div><div class='del'>-		err = build_sg_fd(priv, skb, &amp;fd);</div><div class='add'>+	if (skb_is_gso(skb)) {</div><div class='add'>+		err = dpaa2_eth_build_gso_fd(priv, skb, fd, &amp;num_fds, &amp;fd_len);</div><div class='add'>+		percpu_extras-&gt;tx_sg_frames += num_fds;</div><div class='add'>+		percpu_extras-&gt;tx_sg_bytes += fd_len;</div><div class='add'>+		percpu_extras-&gt;tx_tso_frames += num_fds;</div><div class='add'>+		percpu_extras-&gt;tx_tso_bytes += fd_len;</div><div class='add'>+	} else if (skb_is_nonlinear(skb)) {</div><div class='add'>+		err = dpaa2_eth_build_sg_fd(priv, skb, fd, &amp;swa);</div><div class='add'>+		percpu_extras-&gt;tx_sg_frames++;</div><div class='add'>+		percpu_extras-&gt;tx_sg_bytes += skb-&gt;len;</div><div class='add'>+		fd_len = dpaa2_fd_get_len(fd);</div><div class='add'>+	} else if (skb_headroom(skb) &lt; needed_headroom) {</div><div class='add'>+		err = dpaa2_eth_build_sg_fd_single_buf(priv, skb, fd, &amp;swa);</div><div class='ctx'> 		percpu_extras-&gt;tx_sg_frames++;</div><div class='ctx'> 		percpu_extras-&gt;tx_sg_bytes += skb-&gt;len;</div><div class='add'>+		percpu_extras-&gt;tx_converted_sg_frames++;</div><div class='add'>+		percpu_extras-&gt;tx_converted_sg_bytes += skb-&gt;len;</div><div class='add'>+		fd_len = dpaa2_fd_get_len(fd);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = build_single_fd(priv, skb, &amp;fd);</div><div class='add'>+		err = dpaa2_eth_build_single_fd(priv, skb, fd, &amp;swa);</div><div class='add'>+		fd_len = dpaa2_fd_get_len(fd);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(err)) {</div><div class='hunk'>@@ -806,51 +1455,128 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)</div><div class='ctx'> 		goto err_build_fd;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	if (swa &amp;&amp; skb-&gt;cb[0])</div><div class='add'>+		dpaa2_eth_enable_tx_tstamp(priv, fd, swa, skb);</div><div class='add'>+</div><div class='ctx'> 	/* Tracing point */</div><div class='del'>-	trace_dpaa2_tx_fd(net_dev, &amp;fd);</div><div class='add'>+	for (i = 0; i &lt; num_fds; i++)</div><div class='add'>+		trace_dpaa2_tx_fd(net_dev, &amp;fd[i]);</div><div class='ctx'> </div><div class='ctx'> 	/* TxConf FQ selection relies on queue id from the stack.</div><div class='ctx'> 	 * In case of a forwarded frame from another DPNI interface, we choose</div><div class='ctx'> 	 * a queue affined to the same core that processed the Rx frame</div><div class='ctx'> 	 */</div><div class='ctx'> 	queue_mapping = skb_get_queue_mapping(skb);</div><div class='del'>-	fq = &amp;priv-&gt;fq[queue_mapping];</div><div class='ctx'> </div><div class='del'>-	fd_len = dpaa2_fd_get_len(&amp;fd);</div><div class='add'>+	if (net_dev-&gt;num_tc) {</div><div class='add'>+		prio = netdev_txq_to_tc(net_dev, queue_mapping);</div><div class='add'>+		/* Hardware interprets priority level 0 as being the highest,</div><div class='add'>+		 * so we need to do a reverse mapping to the netdev tc index</div><div class='add'>+		 */</div><div class='add'>+		prio = net_dev-&gt;num_tc - prio - 1;</div><div class='add'>+		/* We have only one FQ array entry for all Tx hardware queues</div><div class='add'>+		 * with the same flow id (but different priority levels)</div><div class='add'>+		 */</div><div class='add'>+		queue_mapping %= dpaa2_eth_queue_count(priv);</div><div class='add'>+	}</div><div class='add'>+	fq = &amp;priv-&gt;fq[queue_mapping];</div><div class='ctx'> 	nq = netdev_get_tx_queue(net_dev, queue_mapping);</div><div class='ctx'> 	netdev_tx_sent_queue(nq, fd_len);</div><div class='ctx'> </div><div class='ctx'> 	/* Everything that happens after this enqueues might race with</div><div class='ctx'> 	 * the Tx confirmation callback for this frame</div><div class='ctx'> 	 */</div><div class='del'>-	for (i = 0; i &lt; DPAA2_ETH_ENQUEUE_RETRIES; i++) {</div><div class='del'>-		err = priv-&gt;enqueue(priv, fq, &amp;fd, 0);</div><div class='del'>-		if (err != -EBUSY)</div><div class='del'>-			break;</div><div class='add'>+	max_retries = num_fds * DPAA2_ETH_ENQUEUE_RETRIES;</div><div class='add'>+	while (total_enqueued &lt; num_fds &amp;&amp; retries &lt; max_retries) {</div><div class='add'>+		err = priv-&gt;enqueue(priv, fq, &amp;fd[total_enqueued],</div><div class='add'>+				    prio, num_fds - total_enqueued, &amp;enqueued);</div><div class='add'>+		if (err == -EBUSY) {</div><div class='add'>+			retries++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		total_enqueued += enqueued;</div><div class='ctx'> 	}</div><div class='del'>-	percpu_extras-&gt;tx_portal_busy += i;</div><div class='add'>+	percpu_extras-&gt;tx_portal_busy += retries;</div><div class='add'>+</div><div class='ctx'> 	if (unlikely(err &lt; 0)) {</div><div class='ctx'> 		percpu_stats-&gt;tx_errors++;</div><div class='ctx'> 		/* Clean up everything, including freeing the skb */</div><div class='del'>-		free_tx_fd(priv, fq, &amp;fd, false);</div><div class='add'>+		dpaa2_eth_free_tx_fd(priv, NULL, fq, fd, false);</div><div class='ctx'> 		netdev_tx_completed_queue(nq, 1, fd_len);</div><div class='ctx'> 	} else {</div><div class='del'>-		percpu_stats-&gt;tx_packets++;</div><div class='add'>+		percpu_stats-&gt;tx_packets += total_enqueued;</div><div class='ctx'> 		percpu_stats-&gt;tx_bytes += fd_len;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> </div><div class='ctx'> err_build_fd:</div><div class='del'>-err_alloc_headroom:</div><div class='ctx'> 	dev_kfree_skb(skb);</div><div class='ctx'> </div><div class='ctx'> 	return NETDEV_TX_OK;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dpaa2_eth_tx_onestep_tstamp(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = container_of(work, struct dpaa2_eth_priv,</div><div class='add'>+						   tx_onestep_tstamp);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+</div><div class='add'>+	while (true) {</div><div class='add'>+		skb = skb_dequeue(&amp;priv-&gt;tx_skbs);</div><div class='add'>+		if (!skb)</div><div class='add'>+			return;</div><div class='add'>+</div><div class='add'>+		/* Lock just before TX one-step timestamping packet,</div><div class='add'>+		 * and release the lock in dpaa2_eth_free_tx_fd when</div><div class='add'>+		 * confirm the packet has been sent on hardware, or</div><div class='add'>+		 * when clean up during transmit failure.</div><div class='add'>+		 */</div><div class='add'>+		mutex_lock(&amp;priv-&gt;onestep_tstamp_lock);</div><div class='add'>+		__dpaa2_eth_tx(skb, priv-&gt;net_dev);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	u8 msgtype, twostep, udp;</div><div class='add'>+	u16 offset1, offset2;</div><div class='add'>+</div><div class='add'>+	/* Utilize skb-&gt;cb[0] for timestamping request per skb */</div><div class='add'>+	skb-&gt;cb[0] = 0;</div><div class='add'>+</div><div class='add'>+	if ((skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP) &amp;&amp; dpaa2_ptp) {</div><div class='add'>+		if (priv-&gt;tx_tstamp_type == HWTSTAMP_TX_ON)</div><div class='add'>+			skb-&gt;cb[0] = TX_TSTAMP;</div><div class='add'>+		else if (priv-&gt;tx_tstamp_type == HWTSTAMP_TX_ONESTEP_SYNC)</div><div class='add'>+			skb-&gt;cb[0] = TX_TSTAMP_ONESTEP_SYNC;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TX for one-step timestamping PTP Sync packet */</div><div class='add'>+	if (skb-&gt;cb[0] == TX_TSTAMP_ONESTEP_SYNC) {</div><div class='add'>+		if (!dpaa2_eth_ptp_parse(skb, &amp;msgtype, &amp;twostep, &amp;udp,</div><div class='add'>+					 &amp;offset1, &amp;offset2))</div><div class='add'>+			if (msgtype == PTP_MSGTYPE_SYNC &amp;&amp; twostep == 0) {</div><div class='add'>+				skb_queue_tail(&amp;priv-&gt;tx_skbs, skb);</div><div class='add'>+				queue_work(priv-&gt;dpaa2_ptp_wq,</div><div class='add'>+					   &amp;priv-&gt;tx_onestep_tstamp);</div><div class='add'>+				return NETDEV_TX_OK;</div><div class='add'>+			}</div><div class='add'>+		/* Use two-step timestamping if not one-step timestamping</div><div class='add'>+		 * PTP Sync packet</div><div class='add'>+		 */</div><div class='add'>+		skb-&gt;cb[0] = TX_TSTAMP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* TX for other packets */</div><div class='add'>+	return __dpaa2_eth_tx(skb, net_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Tx confirmation frame processing routine */</div><div class='ctx'> static void dpaa2_eth_tx_conf(struct dpaa2_eth_priv *priv,</div><div class='del'>-			      struct dpaa2_eth_channel *ch __always_unused,</div><div class='add'>+			      struct dpaa2_eth_channel *ch,</div><div class='ctx'> 			      const struct dpaa2_fd *fd,</div><div class='ctx'> 			      struct dpaa2_eth_fq *fq)</div><div class='ctx'> {</div><div class='hunk'>@@ -865,10 +1591,11 @@ static void dpaa2_eth_tx_conf(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	percpu_extras = this_cpu_ptr(priv-&gt;percpu_extras);</div><div class='ctx'> 	percpu_extras-&gt;tx_conf_frames++;</div><div class='ctx'> 	percpu_extras-&gt;tx_conf_bytes += fd_len;</div><div class='add'>+	ch-&gt;stats.bytes_per_cdan += fd_len;</div><div class='ctx'> </div><div class='ctx'> 	/* Check frame errors in the FD field */</div><div class='ctx'> 	fd_errors = dpaa2_fd_get_ctrl(fd) &amp; DPAA2_FD_TX_ERR_MASK;</div><div class='del'>-	free_tx_fd(priv, fq, fd, true);</div><div class='add'>+	dpaa2_eth_free_tx_fd(priv, ch, fq, fd, true);</div><div class='ctx'> </div><div class='ctx'> 	if (likely(!fd_errors))</div><div class='ctx'> 		return;</div><div class='hunk'>@@ -882,7 +1609,23 @@ static void dpaa2_eth_tx_conf(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	percpu_stats-&gt;tx_errors++;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_rx_csum(struct dpaa2_eth_priv *priv, bool enable)</div><div class='add'>+static int dpaa2_eth_set_rx_vlan_filtering(struct dpaa2_eth_priv *priv,</div><div class='add'>+					   bool enable)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpni_enable_vlan_filter(priv-&gt;mc_io, 0, priv-&gt;mc_token, enable);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(priv-&gt;net_dev,</div><div class='add'>+			   "dpni_enable_vlan_filter failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_rx_csum(struct dpaa2_eth_priv *priv, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -905,7 +1648,7 @@ static int set_rx_csum(struct dpaa2_eth_priv *priv, bool enable)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_tx_csum(struct dpaa2_eth_priv *priv, bool enable)</div><div class='add'>+static int dpaa2_eth_set_tx_csum(struct dpaa2_eth_priv *priv, bool enable)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -929,59 +1672,100 @@ static int set_tx_csum(struct dpaa2_eth_priv *priv, bool enable)</div><div class='ctx'> /* Perform a single release command to add buffers</div><div class='ctx'>  * to the specified buffer pool</div><div class='ctx'>  */</div><div class='del'>-static int add_bufs(struct dpaa2_eth_priv *priv,</div><div class='del'>-		    struct dpaa2_eth_channel *ch, u16 bpid)</div><div class='add'>+static int dpaa2_eth_add_bufs(struct dpaa2_eth_priv *priv,</div><div class='add'>+			      struct dpaa2_eth_channel *ch)</div><div class='ctx'> {</div><div class='add'>+	struct xdp_buff *xdp_buffs[DPAA2_ETH_BUFS_PER_CMD];</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	u64 buf_array[DPAA2_ETH_BUFS_PER_CMD];</div><div class='add'>+	struct dpaa2_eth_swa *swa;</div><div class='ctx'> 	struct page *page;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='del'>-	int i, err;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; DPAA2_ETH_BUFS_PER_CMD; i++) {</div><div class='del'>-		/* Allocate buffer visible to WRIOP + skb shared info +</div><div class='del'>-		 * alignment padding</div><div class='del'>-		 */</div><div class='del'>-		/* allocate one page for each Rx buffer. WRIOP sees</div><div class='del'>-		 * the entire page except for a tailroom reserved for</div><div class='del'>-		 * skb shared info</div><div class='add'>+	int retries = 0;</div><div class='add'>+	int i = 0, err;</div><div class='add'>+	u32 batch;</div><div class='add'>+</div><div class='add'>+	/* Allocate buffers visible to WRIOP */</div><div class='add'>+	if (!ch-&gt;xsk_zc) {</div><div class='add'>+		for (i = 0; i &lt; DPAA2_ETH_BUFS_PER_CMD; i++) {</div><div class='add'>+			/* Also allocate skb shared info and alignment padding.</div><div class='add'>+			 * There is one page for each Rx buffer. WRIOP sees</div><div class='add'>+			 * the entire page except for a tailroom reserved for</div><div class='add'>+			 * skb shared info</div><div class='add'>+			 */</div><div class='add'>+			page = dev_alloc_pages(0);</div><div class='add'>+			if (!page)</div><div class='add'>+				goto err_alloc;</div><div class='add'>+</div><div class='add'>+			addr = dma_map_page(dev, page, 0, priv-&gt;rx_buf_size,</div><div class='add'>+					    DMA_BIDIRECTIONAL);</div><div class='add'>+			if (unlikely(dma_mapping_error(dev, addr)))</div><div class='add'>+				goto err_map;</div><div class='add'>+</div><div class='add'>+			buf_array[i] = addr;</div><div class='add'>+</div><div class='add'>+			/* tracing point */</div><div class='add'>+			trace_dpaa2_eth_buf_seed(priv-&gt;net_dev,</div><div class='add'>+						 page_address(page),</div><div class='add'>+						 DPAA2_ETH_RX_BUF_RAW_SIZE,</div><div class='add'>+						 addr, priv-&gt;rx_buf_size,</div><div class='add'>+						 ch-&gt;bp-&gt;bpid);</div><div class='add'>+		}</div><div class='add'>+	} else if (xsk_buff_can_alloc(ch-&gt;xsk_pool, DPAA2_ETH_BUFS_PER_CMD)) {</div><div class='add'>+		/* Allocate XSK buffers for AF_XDP fast path in batches</div><div class='add'>+		 * of DPAA2_ETH_BUFS_PER_CMD. Bail out if the UMEM cannot</div><div class='add'>+		 * provide enough buffers at the moment</div><div class='ctx'> 		 */</div><div class='del'>-		page = dev_alloc_pages(0);</div><div class='del'>-		if (!page)</div><div class='add'>+		batch = xsk_buff_alloc_batch(ch-&gt;xsk_pool, xdp_buffs,</div><div class='add'>+					     DPAA2_ETH_BUFS_PER_CMD);</div><div class='add'>+		if (!batch)</div><div class='ctx'> 			goto err_alloc;</div><div class='ctx'> </div><div class='del'>-		addr = dma_map_page(dev, page, 0, DPAA2_ETH_RX_BUF_SIZE,</div><div class='del'>-				    DMA_BIDIRECTIONAL);</div><div class='del'>-		if (unlikely(dma_mapping_error(dev, addr)))</div><div class='del'>-			goto err_map;</div><div class='add'>+		for (i = 0; i &lt; batch; i++) {</div><div class='add'>+			swa = (struct dpaa2_eth_swa *)(xdp_buffs[i]-&gt;data_hard_start +</div><div class='add'>+						       DPAA2_ETH_RX_HWA_SIZE);</div><div class='add'>+			swa-&gt;xsk.xdp_buff = xdp_buffs[i];</div><div class='add'>+</div><div class='add'>+			addr = xsk_buff_xdp_get_frame_dma(xdp_buffs[i]);</div><div class='add'>+			if (unlikely(dma_mapping_error(dev, addr)))</div><div class='add'>+				goto err_map;</div><div class='ctx'> </div><div class='del'>-		buf_array[i] = addr;</div><div class='add'>+			buf_array[i] = addr;</div><div class='ctx'> </div><div class='del'>-		/* tracing point */</div><div class='del'>-		trace_dpaa2_eth_buf_seed(priv-&gt;net_dev,</div><div class='del'>-					 page, DPAA2_ETH_RX_BUF_RAW_SIZE,</div><div class='del'>-					 addr, DPAA2_ETH_RX_BUF_SIZE,</div><div class='del'>-					 bpid);</div><div class='add'>+			trace_dpaa2_xsk_buf_seed(priv-&gt;net_dev,</div><div class='add'>+						 xdp_buffs[i]-&gt;data_hard_start,</div><div class='add'>+						 DPAA2_ETH_RX_BUF_RAW_SIZE,</div><div class='add'>+						 addr, priv-&gt;rx_buf_size,</div><div class='add'>+						 ch-&gt;bp-&gt;bpid);</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> release_bufs:</div><div class='ctx'> 	/* In case the portal is busy, retry until successful */</div><div class='del'>-	while ((err = dpaa2_io_service_release(ch-&gt;dpio, bpid,</div><div class='del'>-					       buf_array, i)) == -EBUSY)</div><div class='add'>+	while ((err = dpaa2_io_service_release(ch-&gt;dpio, ch-&gt;bp-&gt;bpid,</div><div class='add'>+					       buf_array, i)) == -EBUSY) {</div><div class='add'>+		if (retries++ &gt;= DPAA2_ETH_SWP_BUSY_RETRIES)</div><div class='add'>+			break;</div><div class='ctx'> 		cpu_relax();</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	/* If release command failed, clean up and bail out;</div><div class='ctx'> 	 * not much else we can do about it</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (err) {</div><div class='del'>-		free_bufs(priv, buf_array, i);</div><div class='add'>+		dpaa2_eth_free_bufs(priv, buf_array, i, ch-&gt;xsk_zc);</div><div class='ctx'> 		return 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return i;</div><div class='ctx'> </div><div class='ctx'> err_map:</div><div class='del'>-	__free_pages(page, 0);</div><div class='add'>+	if (!ch-&gt;xsk_zc) {</div><div class='add'>+		__free_pages(page, 0);</div><div class='add'>+	} else {</div><div class='add'>+		for (; i &lt; batch; i++)</div><div class='add'>+			xsk_buff_free(xdp_buffs[i]);</div><div class='add'>+	}</div><div class='ctx'> err_alloc:</div><div class='ctx'> 	/* If we managed to allocate at least some buffers,</div><div class='ctx'> 	 * release them to hardware</div><div class='hunk'>@@ -992,72 +1776,105 @@ err_alloc:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int seed_pool(struct dpaa2_eth_priv *priv, u16 bpid)</div><div class='add'>+static int dpaa2_eth_seed_pool(struct dpaa2_eth_priv *priv,</div><div class='add'>+			       struct dpaa2_eth_channel *ch)</div><div class='ctx'> {</div><div class='del'>-	int i, j;</div><div class='add'>+	int i;</div><div class='ctx'> 	int new_count;</div><div class='ctx'> </div><div class='del'>-	/* This is the lazy seeding of Rx buffer pools.</div><div class='del'>-	 * dpaa2_add_bufs() is also used on the Rx hotpath and calls</div><div class='del'>-	 * napi_alloc_frag(). The trouble with that is that it in turn ends up</div><div class='del'>-	 * calling this_cpu_ptr(), which mandates execution in atomic context.</div><div class='del'>-	 * Rather than splitting up the code, do a one-off preempt disable.</div><div class='del'>-	 */</div><div class='del'>-	preempt_disable();</div><div class='del'>-	for (j = 0; j &lt; priv-&gt;num_channels; j++) {</div><div class='del'>-		for (i = 0; i &lt; DPAA2_ETH_NUM_BUFS;</div><div class='del'>-		     i += DPAA2_ETH_BUFS_PER_CMD) {</div><div class='del'>-			new_count = add_bufs(priv, priv-&gt;channel[j], bpid);</div><div class='del'>-			priv-&gt;channel[j]-&gt;buf_count += new_count;</div><div class='del'>-</div><div class='del'>-			if (new_count &lt; DPAA2_ETH_BUFS_PER_CMD) {</div><div class='del'>-				preempt_enable();</div><div class='del'>-				return -ENOMEM;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='add'>+	for (i = 0; i &lt; DPAA2_ETH_NUM_BUFS; i += DPAA2_ETH_BUFS_PER_CMD) {</div><div class='add'>+		new_count = dpaa2_eth_add_bufs(priv, ch);</div><div class='add'>+		ch-&gt;buf_count += new_count;</div><div class='add'>+</div><div class='add'>+		if (new_count &lt; DPAA2_ETH_BUFS_PER_CMD)</div><div class='add'>+			return -ENOMEM;</div><div class='ctx'> 	}</div><div class='del'>-	preempt_enable();</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Drain the specified number of buffers from the DPNI's private buffer pool.</div><div class='add'>+static void dpaa2_eth_seed_pools(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='add'>+	struct dpaa2_eth_channel *channel;</div><div class='add'>+	int i, err = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='add'>+		channel = priv-&gt;channel[i];</div><div class='add'>+</div><div class='add'>+		err = dpaa2_eth_seed_pool(priv, channel);</div><div class='add'>+</div><div class='add'>+		/* Not much to do; the buffer pool, though not filled up,</div><div class='add'>+		 * may still contain some buffers which would enable us</div><div class='add'>+		 * to limp on.</div><div class='add'>+		 */</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_err(net_dev, "Buffer seeding failed for DPBP %d (bpid=%d)\n",</div><div class='add'>+				   channel-&gt;bp-&gt;dev-&gt;obj_desc.id,</div><div class='add'>+				   channel-&gt;bp-&gt;bpid);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/*</div><div class='add'>+ * Drain the specified number of buffers from one of the DPNI's private buffer</div><div class='add'>+ * pools.</div><div class='ctx'>  * @count must not exceeed DPAA2_ETH_BUFS_PER_CMD</div><div class='ctx'>  */</div><div class='del'>-static void drain_bufs(struct dpaa2_eth_priv *priv, int count)</div><div class='add'>+static void dpaa2_eth_drain_bufs(struct dpaa2_eth_priv *priv, int bpid,</div><div class='add'>+				 int count)</div><div class='ctx'> {</div><div class='ctx'> 	u64 buf_array[DPAA2_ETH_BUFS_PER_CMD];</div><div class='del'>-	int ret;</div><div class='add'>+	bool xsk_zc = false;</div><div class='add'>+	int retries = 0;</div><div class='add'>+	int i, ret;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_channels; i++)</div><div class='add'>+		if (priv-&gt;channel[i]-&gt;bp-&gt;bpid == bpid)</div><div class='add'>+			xsk_zc = priv-&gt;channel[i]-&gt;xsk_zc;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		ret = dpaa2_io_service_acquire(NULL, priv-&gt;bpid,</div><div class='del'>-					       buf_array, count);</div><div class='add'>+		ret = dpaa2_io_service_acquire(NULL, bpid, buf_array, count);</div><div class='ctx'> 		if (ret &lt; 0) {</div><div class='add'>+			if (ret == -EBUSY &amp;&amp;</div><div class='add'>+			    retries++ &lt; DPAA2_ETH_SWP_BUSY_RETRIES)</div><div class='add'>+				continue;</div><div class='ctx'> 			netdev_err(priv-&gt;net_dev, "dpaa2_io_service_acquire() failed\n");</div><div class='ctx'> 			return;</div><div class='ctx'> 		}</div><div class='del'>-		free_bufs(priv, buf_array, ret);</div><div class='add'>+		dpaa2_eth_free_bufs(priv, buf_array, ret, xsk_zc);</div><div class='add'>+		retries = 0;</div><div class='ctx'> 	} while (ret);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void drain_pool(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_drain_pool(struct dpaa2_eth_priv *priv, int bpid)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='del'>-	drain_bufs(priv, DPAA2_ETH_BUFS_PER_CMD);</div><div class='del'>-	drain_bufs(priv, 1);</div><div class='add'>+	/* Drain the buffer pool */</div><div class='add'>+	dpaa2_eth_drain_bufs(priv, bpid, DPAA2_ETH_BUFS_PER_CMD);</div><div class='add'>+	dpaa2_eth_drain_bufs(priv, bpid, 1);</div><div class='ctx'> </div><div class='add'>+	/* Setup to zero the buffer count of all channels which were</div><div class='add'>+	 * using this buffer pool.</div><div class='add'>+	 */</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_channels; i++)</div><div class='del'>-		priv-&gt;channel[i]-&gt;buf_count = 0;</div><div class='add'>+		if (priv-&gt;channel[i]-&gt;bp-&gt;bpid == bpid)</div><div class='add'>+			priv-&gt;channel[i]-&gt;buf_count = 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_drain_pools(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_bps; i++)</div><div class='add'>+		dpaa2_eth_drain_pool(priv, priv-&gt;bp[i]-&gt;bpid);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Function is called from softirq context only, so we don't need to guard</div><div class='ctx'>  * the access to percpu count</div><div class='ctx'>  */</div><div class='del'>-static int refill_pool(struct dpaa2_eth_priv *priv,</div><div class='del'>-		       struct dpaa2_eth_channel *ch,</div><div class='del'>-		       u16 bpid)</div><div class='add'>+static int dpaa2_eth_refill_pool(struct dpaa2_eth_priv *priv,</div><div class='add'>+				 struct dpaa2_eth_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	int new_count;</div><div class='ctx'> </div><div class='hunk'>@@ -1065,7 +1882,7 @@ static int refill_pool(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		new_count = add_bufs(priv, ch, bpid);</div><div class='add'>+		new_count = dpaa2_eth_add_bufs(priv, ch);</div><div class='ctx'> 		if (unlikely(!new_count)) {</div><div class='ctx'> 			/* Out of memory; abort for now, we'll try later on */</div><div class='ctx'> 			break;</div><div class='hunk'>@@ -1079,7 +1896,23 @@ static int refill_pool(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int pull_channel(struct dpaa2_eth_channel *ch)</div><div class='add'>+static void dpaa2_eth_sgt_cache_drain(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_sgt_cache *sgt_cache;</div><div class='add'>+	u16 count;</div><div class='add'>+	int k, i;</div><div class='add'>+</div><div class='add'>+	for_each_possible_cpu(k) {</div><div class='add'>+		sgt_cache = per_cpu_ptr(priv-&gt;sgt_cache, k);</div><div class='add'>+		count = sgt_cache-&gt;count;</div><div class='add'>+</div><div class='add'>+		for (i = 0; i &lt; count; i++)</div><div class='add'>+			skb_free_frag(sgt_cache-&gt;buf[i]);</div><div class='add'>+		sgt_cache-&gt;count = 0;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_pull_channel(struct dpaa2_eth_channel *ch)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> 	int dequeues = -1;</div><div class='hunk'>@@ -1090,7 +1923,7 @@ static int pull_channel(struct dpaa2_eth_channel *ch)</div><div class='ctx'> 						    ch-&gt;store);</div><div class='ctx'> 		dequeues++;</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	} while (err == -EBUSY);</div><div class='add'>+	} while (err == -EBUSY &amp;&amp; dequeues &lt; DPAA2_ETH_SWP_BUSY_RETRIES);</div><div class='ctx'> </div><div class='ctx'> 	ch-&gt;stats.dequeue_portal_busy += dequeues;</div><div class='ctx'> 	if (unlikely(err))</div><div class='hunk'>@@ -1113,7 +1946,10 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	struct dpaa2_eth_fq *fq, *txc_fq = NULL;</div><div class='ctx'> 	struct netdev_queue *nq;</div><div class='ctx'> 	int store_cleaned, work_done;</div><div class='add'>+	bool work_done_zc = false;</div><div class='ctx'> 	struct list_head rx_list;</div><div class='add'>+	int retries = 0;</div><div class='add'>+	u16 flowid;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	ch = container_of(napi, struct dpaa2_eth_channel, napi);</div><div class='hunk'>@@ -1123,19 +1959,29 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	INIT_LIST_HEAD(&amp;rx_list);</div><div class='ctx'> 	ch-&gt;rx_list = &amp;rx_list;</div><div class='ctx'> </div><div class='add'>+	if (ch-&gt;xsk_zc) {</div><div class='add'>+		work_done_zc = dpaa2_xsk_tx(priv, ch);</div><div class='add'>+		/* If we reached the XSK Tx per NAPI threshold, we're done */</div><div class='add'>+		if (work_done_zc) {</div><div class='add'>+			work_done = budget;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	do {</div><div class='del'>-		err = pull_channel(ch);</div><div class='add'>+		err = dpaa2_eth_pull_channel(ch);</div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			break;</div><div class='ctx'> </div><div class='ctx'> 		/* Refill pool if appropriate */</div><div class='del'>-		refill_pool(priv, ch, priv-&gt;bpid);</div><div class='add'>+		dpaa2_eth_refill_pool(priv, ch);</div><div class='ctx'> </div><div class='del'>-		store_cleaned = consume_frames(ch, &amp;fq);</div><div class='del'>-		if (!store_cleaned)</div><div class='add'>+		store_cleaned = dpaa2_eth_consume_frames(ch, &amp;fq);</div><div class='add'>+		if (store_cleaned &lt;= 0)</div><div class='ctx'> 			break;</div><div class='ctx'> 		if (fq-&gt;type == DPAA2_RX_FQ) {</div><div class='ctx'> 			rx_cleaned += store_cleaned;</div><div class='add'>+			flowid = fq-&gt;flowid;</div><div class='ctx'> 		} else {</div><div class='ctx'> 			txconf_cleaned += store_cleaned;</div><div class='ctx'> 			/* We have a single Tx conf FQ on this channel */</div><div class='hunk'>@@ -1148,10 +1994,21 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 		if (rx_cleaned &gt;= budget ||</div><div class='ctx'> 		    txconf_cleaned &gt;= DPAA2_ETH_TXCONF_PER_NAPI) {</div><div class='ctx'> 			work_done = budget;</div><div class='add'>+			if (ch-&gt;xdp.res &amp; XDP_REDIRECT)</div><div class='add'>+				xdp_do_flush();</div><div class='ctx'> 			goto out;</div><div class='ctx'> 		}</div><div class='ctx'> 	} while (store_cleaned);</div><div class='ctx'> </div><div class='add'>+	if (ch-&gt;xdp.res &amp; XDP_REDIRECT)</div><div class='add'>+		xdp_do_flush();</div><div class='add'>+</div><div class='add'>+	/* Update NET DIM with the values for this CDAN */</div><div class='add'>+	dpaa2_io_update_net_dim(ch-&gt;dpio, ch-&gt;stats.frames_per_cdan,</div><div class='add'>+				ch-&gt;stats.bytes_per_cdan);</div><div class='add'>+	ch-&gt;stats.frames_per_cdan = 0;</div><div class='add'>+	ch-&gt;stats.bytes_per_cdan = 0;</div><div class='add'>+</div><div class='ctx'> 	/* We didn't consume the entire budget, so finish napi and</div><div class='ctx'> 	 * re-enable data availability notifications</div><div class='ctx'> 	 */</div><div class='hunk'>@@ -1159,7 +2016,7 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> 	do {</div><div class='ctx'> 		err = dpaa2_io_service_rearm(ch-&gt;dpio, &amp;ch-&gt;nctx);</div><div class='ctx'> 		cpu_relax();</div><div class='del'>-	} while (err == -EBUSY);</div><div class='add'>+	} while (err == -EBUSY &amp;&amp; retries++ &lt; DPAA2_ETH_SWP_BUSY_RETRIES);</div><div class='ctx'> 	WARN_ONCE(err, "CDAN notifications rearm failed on core %d",</div><div class='ctx'> 		  ch-&gt;nctx.desired_cpu);</div><div class='ctx'> </div><div class='hunk'>@@ -1168,6 +2025,11 @@ static int dpaa2_eth_poll(struct napi_struct *napi, int budget)</div><div class='ctx'> out:</div><div class='ctx'> 	netif_receive_skb_list(ch-&gt;rx_list);</div><div class='ctx'> </div><div class='add'>+	if (ch-&gt;xsk_tx_pkts_sent) {</div><div class='add'>+		xsk_tx_completed(ch-&gt;xsk_pool, ch-&gt;xsk_tx_pkts_sent);</div><div class='add'>+		ch-&gt;xsk_tx_pkts_sent = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (txc_fq &amp;&amp; txc_fq-&gt;dq_frames) {</div><div class='ctx'> 		nq = netdev_get_tx_queue(priv-&gt;net_dev, txc_fq-&gt;flowid);</div><div class='ctx'> 		netdev_tx_completed_queue(nq, txc_fq-&gt;dq_frames,</div><div class='hunk'>@@ -1176,13 +2038,13 @@ out:</div><div class='ctx'> 		txc_fq-&gt;dq_bytes = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (ch-&gt;xdp.res &amp; XDP_REDIRECT)</div><div class='del'>-		xdp_do_flush_map();</div><div class='add'>+	if (rx_cleaned &amp;&amp; ch-&gt;xdp.res &amp; XDP_TX)</div><div class='add'>+		dpaa2_eth_xdp_tx_flush(priv, ch, &amp;priv-&gt;fq[flowid]);</div><div class='ctx'> </div><div class='ctx'> 	return work_done;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void enable_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_enable_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1193,7 +2055,7 @@ static void enable_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void disable_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_disable_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -1204,9 +2066,73 @@ static void disable_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int link_state_update(struct dpaa2_eth_priv *priv)</div><div class='add'>+void dpaa2_eth_set_rx_taildrop(struct dpaa2_eth_priv *priv,</div><div class='add'>+			       bool tx_pause, bool pfc)</div><div class='add'>+{</div><div class='add'>+	struct dpni_taildrop td = {0};</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/* FQ taildrop: threshold is in bytes, per frame queue. Enabled if</div><div class='add'>+	 * flow control is disabled (as it might interfere with either the</div><div class='add'>+	 * buffer pool depletion trigger for pause frames or with the group</div><div class='add'>+	 * congestion trigger for PFC frames)</div><div class='add'>+	 */</div><div class='add'>+	td.enable = !tx_pause;</div><div class='add'>+	if (priv-&gt;rx_fqtd_enabled == td.enable)</div><div class='add'>+		goto set_cgtd;</div><div class='add'>+</div><div class='add'>+	td.threshold = DPAA2_ETH_FQ_TAILDROP_THRESH;</div><div class='add'>+	td.units = DPNI_CONGESTION_UNIT_BYTES;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_fqs; i++) {</div><div class='add'>+		fq = &amp;priv-&gt;fq[i];</div><div class='add'>+		if (fq-&gt;type != DPAA2_RX_FQ)</div><div class='add'>+			continue;</div><div class='add'>+		err = dpni_set_taildrop(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					DPNI_CP_QUEUE, DPNI_QUEUE_RX,</div><div class='add'>+					fq-&gt;tc, fq-&gt;flowid, &amp;td);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev,</div><div class='add'>+				   "dpni_set_taildrop(FQ) failed\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_fqtd_enabled = td.enable;</div><div class='add'>+</div><div class='add'>+set_cgtd:</div><div class='add'>+	/* Congestion group taildrop: threshold is in frames, per group</div><div class='add'>+	 * of FQs belonging to the same traffic class</div><div class='add'>+	 * Enabled if general Tx pause disabled or if PFCs are enabled</div><div class='add'>+	 * (congestion group threhsold for PFC generation is lower than the</div><div class='add'>+	 * CG taildrop threshold, so it won't interfere with it; we also</div><div class='add'>+	 * want frames in non-PFC enabled traffic classes to be kept in check)</div><div class='add'>+	 */</div><div class='add'>+	td.enable = !tx_pause || pfc;</div><div class='add'>+	if (priv-&gt;rx_cgtd_enabled == td.enable)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	td.threshold = DPAA2_ETH_CG_TAILDROP_THRESH(priv);</div><div class='add'>+	td.units = DPNI_CONGESTION_UNIT_FRAMES;</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		err = dpni_set_taildrop(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					DPNI_CP_GROUP, DPNI_QUEUE_RX,</div><div class='add'>+					i, 0, &amp;td);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(priv-&gt;net_dev,</div><div class='add'>+				   "dpni_set_taildrop(CG) failed\n");</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_cgtd_enabled = td.enable;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_link_state_update(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpni_link_state state = {0};</div><div class='add'>+	bool tx_pause;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_get_link_state(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;state);</div><div class='hunk'>@@ -1216,11 +2142,26 @@ static int link_state_update(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* If Tx pause frame settings have changed, we need to update</div><div class='add'>+	 * Rx FQ taildrop configuration as well. We configure taildrop</div><div class='add'>+	 * only when pause frame generation is disabled.</div><div class='add'>+	 */</div><div class='add'>+	tx_pause = dpaa2_eth_tx_pause_enabled(state.options);</div><div class='add'>+	dpaa2_eth_set_rx_taildrop(priv, tx_pause, priv-&gt;pfc_enabled);</div><div class='add'>+</div><div class='add'>+	/* When we manage the MAC/PHY using phylink there is no need</div><div class='add'>+	 * to manually update the netif_carrier.</div><div class='add'>+	 * We can avoid locking because we are called from the "link changed"</div><div class='add'>+	 * IRQ handler, which is the same as the "endpoint changed" IRQ handler</div><div class='add'>+	 * (the writer to priv-&gt;mac), so we cannot race with it.</div><div class='add'>+	 */</div><div class='add'>+	if (dpaa2_mac_is_type_phy(priv-&gt;mac))</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='ctx'> 	/* Chech link state; speed / duplex changes are not treated yet */</div><div class='ctx'> 	if (priv-&gt;link_state.up == state.up)</div><div class='del'>-		return 0;</div><div class='add'>+		goto out;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;link_state = state;</div><div class='ctx'> 	if (state.up) {</div><div class='ctx'> 		netif_carrier_on(priv-&gt;net_dev);</div><div class='ctx'> 		netif_tx_start_all_queues(priv-&gt;net_dev);</div><div class='hunk'>@@ -1232,6 +2173,9 @@ static int link_state_update(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	netdev_info(priv-&gt;net_dev, "Link Event: state %s\n",</div><div class='ctx'> 		    state.up ? "up" : "down");</div><div class='ctx'> </div><div class='add'>+out:</div><div class='add'>+	priv-&gt;link_state = state;</div><div class='add'>+</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -1240,54 +2184,48 @@ static int dpaa2_eth_open(struct net_device *net_dev)</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	err = seed_pool(priv, priv-&gt;bpid);</div><div class='del'>-	if (err) {</div><div class='del'>-		/* Not much to do; the buffer pool, though not filled up,</div><div class='del'>-		 * may still contain some buffers which would enable us</div><div class='del'>-		 * to limp on.</div><div class='add'>+	dpaa2_eth_seed_pools(priv);</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_eth_is_type_phy(priv)) {</div><div class='add'>+		/* We'll only start the txqs when the link is actually ready;</div><div class='add'>+		 * make sure we don't race against the link up notification,</div><div class='add'>+		 * which may come immediately after dpni_enable();</div><div class='ctx'> 		 */</div><div class='del'>-		netdev_err(net_dev, "Buffer seeding failed for DPBP %d (bpid=%d)\n",</div><div class='del'>-			   priv-&gt;dpbp_dev-&gt;obj_desc.id, priv-&gt;bpid);</div><div class='del'>-	}</div><div class='add'>+		netif_tx_stop_all_queues(net_dev);</div><div class='ctx'> </div><div class='del'>-	/* We'll only start the txqs when the link is actually ready; make sure</div><div class='del'>-	 * we don't race against the link up notification, which may come</div><div class='del'>-	 * immediately after dpni_enable();</div><div class='del'>-	 */</div><div class='del'>-	netif_tx_stop_all_queues(net_dev);</div><div class='del'>-	enable_ch_napi(priv);</div><div class='del'>-	/* Also, explicitly set carrier off, otherwise netif_carrier_ok() will</div><div class='del'>-	 * return true and cause 'ip link show' to report the LOWER_UP flag,</div><div class='del'>-	 * even though the link notification wasn't even received.</div><div class='del'>-	 */</div><div class='del'>-	netif_carrier_off(net_dev);</div><div class='add'>+		/* Also, explicitly set carrier off, otherwise</div><div class='add'>+		 * netif_carrier_ok() will return true and cause 'ip link show'</div><div class='add'>+		 * to report the LOWER_UP flag, even though the link</div><div class='add'>+		 * notification wasn't even received.</div><div class='add'>+		 */</div><div class='add'>+		netif_carrier_off(net_dev);</div><div class='add'>+	}</div><div class='add'>+	dpaa2_eth_enable_ch_napi(priv);</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_enable(priv-&gt;mc_io, 0, priv-&gt;mc_token);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='ctx'> 		netdev_err(net_dev, "dpni_enable() failed\n");</div><div class='ctx'> 		goto enable_err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* If the DPMAC object has already processed the link up interrupt,</div><div class='del'>-	 * we have to learn the link state ourselves.</div><div class='del'>-	 */</div><div class='del'>-	err = link_state_update(priv);</div><div class='del'>-	if (err &lt; 0) {</div><div class='del'>-		netdev_err(net_dev, "Can't update link state\n");</div><div class='del'>-		goto link_state_err;</div><div class='del'>-	}</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv))</div><div class='add'>+		dpaa2_mac_start(priv-&gt;mac);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='del'>-link_state_err:</div><div class='ctx'> enable_err:</div><div class='del'>-	disable_ch_napi(priv);</div><div class='del'>-	drain_pool(priv);</div><div class='add'>+	dpaa2_eth_disable_ch_napi(priv);</div><div class='add'>+	dpaa2_eth_drain_pools(priv);</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Total number of in-flight frames on ingress queues */</div><div class='del'>-static u32 ingress_fq_count(struct dpaa2_eth_priv *priv)</div><div class='add'>+static u32 dpaa2_eth_ingress_fq_count(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_fq *fq;</div><div class='ctx'> 	u32 fcnt = 0, bcnt = 0, total = 0;</div><div class='hunk'>@@ -1306,26 +2244,59 @@ static u32 ingress_fq_count(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	return total;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void wait_for_fq_empty(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_wait_for_ingress_fq_empty(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int retries = 10;</div><div class='ctx'> 	u32 pending;</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='del'>-		pending = ingress_fq_count(priv);</div><div class='add'>+		pending = dpaa2_eth_ingress_fq_count(priv);</div><div class='ctx'> 		if (pending)</div><div class='ctx'> 			msleep(100);</div><div class='ctx'> 	} while (pending &amp;&amp; --retries);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+#define DPNI_TX_PENDING_VER_MAJOR	7</div><div class='add'>+#define DPNI_TX_PENDING_VER_MINOR	13</div><div class='add'>+static void dpaa2_eth_wait_for_egress_fq_empty(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	union dpni_statistics stats;</div><div class='add'>+	int retries = 10;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_TX_PENDING_VER_MAJOR,</div><div class='add'>+				   DPNI_TX_PENDING_VER_MINOR) &lt; 0)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = dpni_get_statistics(priv-&gt;mc_io, 0, priv-&gt;mc_token, 6,</div><div class='add'>+					  &amp;stats);</div><div class='add'>+		if (err)</div><div class='add'>+			goto out;</div><div class='add'>+		if (stats.page_6.tx_pending_frames == 0)</div><div class='add'>+			return;</div><div class='add'>+	} while (--retries);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	msleep(500);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dpaa2_eth_stop(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	int dpni_enabled = 0;</div><div class='ctx'> 	int retries = 10;</div><div class='ctx'> </div><div class='del'>-	netif_tx_stop_all_queues(net_dev);</div><div class='del'>-	netif_carrier_off(net_dev);</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv)) {</div><div class='add'>+		dpaa2_mac_stop(priv-&gt;mac);</div><div class='add'>+	} else {</div><div class='add'>+		netif_tx_stop_all_queues(net_dev);</div><div class='add'>+		netif_carrier_off(net_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='ctx'> </div><div class='ctx'> 	/* On dpni_disable(), the MC firmware will:</div><div class='ctx'> 	 * - stop MAC Rx and wait for all Rx frames to be enqueued to software</div><div class='hunk'>@@ -1337,7 +2308,7 @@ static int dpaa2_eth_stop(struct net_device *net_dev)</div><div class='ctx'> 	 * on WRIOP. After it finishes, wait until all remaining frames on Rx</div><div class='ctx'> 	 * and Tx conf queues are consumed on NAPI poll.</div><div class='ctx'> 	 */</div><div class='del'>-	msleep(500);</div><div class='add'>+	dpaa2_eth_wait_for_egress_fq_empty(priv);</div><div class='ctx'> </div><div class='ctx'> 	do {</div><div class='ctx'> 		dpni_disable(priv-&gt;mc_io, 0, priv-&gt;mc_token);</div><div class='hunk'>@@ -1353,11 +2324,14 @@ static int dpaa2_eth_stop(struct net_device *net_dev)</div><div class='ctx'> 		 */</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	wait_for_fq_empty(priv);</div><div class='del'>-	disable_ch_napi(priv);</div><div class='add'>+	dpaa2_eth_wait_for_ingress_fq_empty(priv);</div><div class='add'>+	dpaa2_eth_disable_ch_napi(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Empty the buffer pool */</div><div class='del'>-	drain_pool(priv);</div><div class='add'>+	dpaa2_eth_drain_pools(priv);</div><div class='add'>+</div><div class='add'>+	/* Empty the Scatter-Gather Buffer cache */</div><div class='add'>+	dpaa2_eth_sgt_cache_drain(priv);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1408,8 +2382,8 @@ static void dpaa2_eth_get_stats(struct net_device *net_dev,</div><div class='ctx'> /* Copy mac unicast addresses from @net_dev to @priv.</div><div class='ctx'>  * Its sole purpose is to make dpaa2_eth_set_rx_mode() more readable.</div><div class='ctx'>  */</div><div class='del'>-static void add_uc_hw_addr(const struct net_device *net_dev,</div><div class='del'>-			   struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_add_uc_hw_addr(const struct net_device *net_dev,</div><div class='add'>+				     struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1427,8 +2401,8 @@ static void add_uc_hw_addr(const struct net_device *net_dev,</div><div class='ctx'> /* Copy mac multicast addresses from @net_dev to @priv</div><div class='ctx'>  * Its sole purpose is to make dpaa2_eth_set_rx_mode() more readable.</div><div class='ctx'>  */</div><div class='del'>-static void add_mc_hw_addr(const struct net_device *net_dev,</div><div class='del'>-			   struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_add_mc_hw_addr(const struct net_device *net_dev,</div><div class='add'>+				     struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct netdev_hw_addr *ha;</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1443,6 +2417,43 @@ static void add_mc_hw_addr(const struct net_device *net_dev,</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa2_eth_rx_add_vid(struct net_device *net_dev,</div><div class='add'>+				__be16 vlan_proto, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpni_add_vlan_id(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+			       vid, 0, 0, 0);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_warn(priv-&gt;net_dev,</div><div class='add'>+			    "Could not add the vlan id %u\n",</div><div class='add'>+			    vid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_rx_kill_vid(struct net_device *net_dev,</div><div class='add'>+				 __be16 vlan_proto, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpni_remove_vlan_id(priv-&gt;mc_io, 0, priv-&gt;mc_token, vid);</div><div class='add'>+</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_warn(priv-&gt;net_dev,</div><div class='add'>+			    "Could not remove the vlan id %u\n",</div><div class='add'>+			    vid);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static void dpaa2_eth_set_rx_mode(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='hunk'>@@ -1493,7 +2504,7 @@ static void dpaa2_eth_set_rx_mode(struct net_device *net_dev)</div><div class='ctx'> 		err = dpni_clear_mac_filters(mc_io, 0, mc_token, 1, 0);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			netdev_warn(net_dev, "Can't clear uc filters\n");</div><div class='del'>-		add_uc_hw_addr(net_dev, priv);</div><div class='add'>+		dpaa2_eth_add_uc_hw_addr(net_dev, priv);</div><div class='ctx'> </div><div class='ctx'> 		/* Finally, clear uc promisc and set mc promisc as requested. */</div><div class='ctx'> 		err = dpni_set_unicast_promisc(mc_io, 0, mc_token, 0);</div><div class='hunk'>@@ -1516,8 +2527,8 @@ static void dpaa2_eth_set_rx_mode(struct net_device *net_dev)</div><div class='ctx'> 	err = dpni_clear_mac_filters(mc_io, 0, mc_token, 1, 1);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		netdev_warn(net_dev, "Can't clear mac filters\n");</div><div class='del'>-	add_mc_hw_addr(net_dev, priv);</div><div class='del'>-	add_uc_hw_addr(net_dev, priv);</div><div class='add'>+	dpaa2_eth_add_mc_hw_addr(net_dev, priv);</div><div class='add'>+	dpaa2_eth_add_uc_hw_addr(net_dev, priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Now we can clear both ucast and mcast promisc, without risking</div><div class='ctx'> 	 * to drop legitimate frames anymore.</div><div class='hunk'>@@ -1549,16 +2560,23 @@ static int dpaa2_eth_set_features(struct net_device *net_dev,</div><div class='ctx'> 	bool enable;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='add'>+	if (changed &amp; NETIF_F_HW_VLAN_CTAG_FILTER) {</div><div class='add'>+		enable = !!(features &amp; NETIF_F_HW_VLAN_CTAG_FILTER);</div><div class='add'>+		err = dpaa2_eth_set_rx_vlan_filtering(priv, enable);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='ctx'> 	if (changed &amp; NETIF_F_RXCSUM) {</div><div class='ctx'> 		enable = !!(features &amp; NETIF_F_RXCSUM);</div><div class='del'>-		err = set_rx_csum(priv, enable);</div><div class='add'>+		err = dpaa2_eth_set_rx_csum(priv, enable);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (changed &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)) {</div><div class='ctx'> 		enable = !!(features &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM));</div><div class='del'>-		err = set_tx_csum(priv, enable);</div><div class='add'>+		err = dpaa2_eth_set_tx_csum(priv, enable);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1566,43 +2584,70 @@ static int dpaa2_eth_set_features(struct net_device *net_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_eth_ts_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='add'>+static int dpaa2_eth_hwtstamp_set(struct net_device *dev,</div><div class='add'>+				  struct kernel_hwtstamp_config *config,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='del'>-	struct hwtstamp_config config;</div><div class='ctx'> </div><div class='del'>-	if (copy_from_user(&amp;config, rq-&gt;ifr_data, sizeof(config)))</div><div class='del'>-		return -EFAULT;</div><div class='add'>+	if (!dpaa2_ptp)</div><div class='add'>+		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	switch (config.tx_type) {</div><div class='add'>+	switch (config-&gt;tx_type) {</div><div class='ctx'> 	case HWTSTAMP_TX_OFF:</div><div class='del'>-		priv-&gt;tx_tstamp = false;</div><div class='del'>-		break;</div><div class='ctx'> 	case HWTSTAMP_TX_ON:</div><div class='del'>-		priv-&gt;tx_tstamp = true;</div><div class='add'>+	case HWTSTAMP_TX_ONESTEP_SYNC:</div><div class='add'>+		priv-&gt;tx_tstamp_type = config-&gt;tx_type;</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -ERANGE;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	if (config.rx_filter == HWTSTAMP_FILTER_NONE) {</div><div class='add'>+	if (config-&gt;rx_filter == HWTSTAMP_FILTER_NONE) {</div><div class='ctx'> 		priv-&gt;rx_tstamp = false;</div><div class='ctx'> 	} else {</div><div class='ctx'> 		priv-&gt;rx_tstamp = true;</div><div class='ctx'> 		/* TS is set for all frame types, not only those requested */</div><div class='del'>-		config.rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='add'>+		config-&gt;rx_filter = HWTSTAMP_FILTER_ALL;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return copy_to_user(rq-&gt;ifr_data, &amp;config, sizeof(config)) ?</div><div class='del'>-			-EFAULT : 0;</div><div class='add'>+	if (priv-&gt;tx_tstamp_type == HWTSTAMP_TX_ONESTEP_SYNC)</div><div class='add'>+		dpaa2_ptp_onestep_reg_update_method(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_hwtstamp_get(struct net_device *dev,</div><div class='add'>+				  struct kernel_hwtstamp_config *config)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_ptp)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	config-&gt;tx_type = priv-&gt;tx_tstamp_type;</div><div class='add'>+	config-&gt;rx_filter = priv-&gt;rx_tstamp ? HWTSTAMP_FILTER_ALL :</div><div class='add'>+			    HWTSTAMP_FILTER_NONE;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa2_eth_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)</div><div class='ctx'> {</div><div class='del'>-	if (cmd == SIOCSHWTSTAMP)</div><div class='del'>-		return dpaa2_eth_ts_ioctl(dev, rq, cmd);</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='ctx'> </div><div class='del'>-	return -EINVAL;</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv)) {</div><div class='add'>+		err = phylink_mii_ioctl(priv-&gt;mac-&gt;phylink, rq, cmd);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return -EOPNOTSUPP;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static bool xdp_mtu_valid(struct dpaa2_eth_priv *priv, int mtu)</div><div class='hunk'>@@ -1610,7 +2655,7 @@ static bool xdp_mtu_valid(struct dpaa2_eth_priv *priv, int mtu)</div><div class='ctx'> 	int mfl, linear_mfl;</div><div class='ctx'> </div><div class='ctx'> 	mfl = DPAA2_ETH_L2_MAX_FRM(mtu);</div><div class='del'>-	linear_mfl = DPAA2_ETH_RX_BUF_SIZE - DPAA2_ETH_RX_HWA_SIZE -</div><div class='add'>+	linear_mfl = priv-&gt;rx_buf_size - DPAA2_ETH_RX_HWA_SIZE -</div><div class='ctx'> 		     dpaa2_eth_rx_head_room(priv) - XDP_PACKET_HEADROOM;</div><div class='ctx'> </div><div class='ctx'> 	if (mfl &gt; linear_mfl) {</div><div class='hunk'>@@ -1622,7 +2667,7 @@ static bool xdp_mtu_valid(struct dpaa2_eth_priv *priv, int mtu)</div><div class='ctx'> 	return true;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_rx_mfl(struct dpaa2_eth_priv *priv, int mtu, bool has_xdp)</div><div class='add'>+static int dpaa2_eth_set_rx_mfl(struct dpaa2_eth_priv *priv, int mtu, bool has_xdp)</div><div class='ctx'> {</div><div class='ctx'> 	int mfl, err;</div><div class='ctx'> </div><div class='hunk'>@@ -1656,16 +2701,16 @@ static int dpaa2_eth_change_mtu(struct net_device *dev, int new_mtu)</div><div class='ctx'> 	if (!xdp_mtu_valid(priv, new_mtu))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	err = set_rx_mfl(priv, new_mtu, true);</div><div class='add'>+	err = dpaa2_eth_set_rx_mfl(priv, new_mtu, true);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> out:</div><div class='del'>-	dev-&gt;mtu = new_mtu;</div><div class='add'>+	WRITE_ONCE(dev-&gt;mtu, new_mtu);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int update_rx_buffer_headroom(struct dpaa2_eth_priv *priv, bool has_xdp)</div><div class='add'>+static int dpaa2_eth_update_rx_buffer_headroom(struct dpaa2_eth_priv *priv, bool has_xdp)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpni_buffer_layout buf_layout = {0};</div><div class='ctx'> 	int err;</div><div class='hunk'>@@ -1691,7 +2736,7 @@ static int update_rx_buffer_headroom(struct dpaa2_eth_priv *priv, bool has_xdp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_xdp(struct net_device *dev, struct bpf_prog *prog)</div><div class='add'>+static int dpaa2_eth_setup_xdp(struct net_device *dev, struct bpf_prog *prog)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='hunk'>@@ -1702,17 +2747,14 @@ static int setup_xdp(struct net_device *dev, struct bpf_prog *prog)</div><div class='ctx'> 	if (prog &amp;&amp; !xdp_mtu_valid(priv, dev-&gt;mtu))</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	if (prog) {</div><div class='del'>-		prog = bpf_prog_add(prog, priv-&gt;num_channels);</div><div class='del'>-		if (IS_ERR(prog))</div><div class='del'>-			return PTR_ERR(prog);</div><div class='del'>-	}</div><div class='add'>+	if (prog)</div><div class='add'>+		bpf_prog_add(prog, priv-&gt;num_channels);</div><div class='ctx'> </div><div class='ctx'> 	up = netif_running(dev);</div><div class='ctx'> 	need_update = (!!priv-&gt;xdp_prog != !!prog);</div><div class='ctx'> </div><div class='ctx'> 	if (up)</div><div class='del'>-		dpaa2_eth_stop(dev);</div><div class='add'>+		dev_close(dev);</div><div class='ctx'> </div><div class='ctx'> 	/* While in xdp mode, enforce a maximum Rx frame size based on MTU.</div><div class='ctx'> 	 * Also, when switching between xdp/non-xdp modes we need to reconfigure</div><div class='hunk'>@@ -1720,10 +2762,10 @@ static int setup_xdp(struct net_device *dev, struct bpf_prog *prog)</div><div class='ctx'> 	 * so we are sure no old format buffers will be used from now on.</div><div class='ctx'> 	 */</div><div class='ctx'> 	if (need_update) {</div><div class='del'>-		err = set_rx_mfl(priv, dev-&gt;mtu, !!prog);</div><div class='add'>+		err = dpaa2_eth_set_rx_mfl(priv, dev-&gt;mtu, !!prog);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_err;</div><div class='del'>-		err = update_rx_buffer_headroom(priv, !!prog);</div><div class='add'>+		err = dpaa2_eth_update_rx_buffer_headroom(priv, !!prog);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			goto out_err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1740,7 +2782,7 @@ static int setup_xdp(struct net_device *dev, struct bpf_prog *prog)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (up) {</div><div class='del'>-		err = dpaa2_eth_open(dev);</div><div class='add'>+		err = dev_open(dev, NULL);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1751,21 +2793,18 @@ out_err:</div><div class='ctx'> 	if (prog)</div><div class='ctx'> 		bpf_prog_sub(prog, priv-&gt;num_channels);</div><div class='ctx'> 	if (up)</div><div class='del'>-		dpaa2_eth_open(dev);</div><div class='add'>+		dev_open(dev, NULL);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static int dpaa2_eth_xdp(struct net_device *dev, struct netdev_bpf *xdp)</div><div class='ctx'> {</div><div class='del'>-	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='del'>-</div><div class='ctx'> 	switch (xdp-&gt;command) {</div><div class='ctx'> 	case XDP_SETUP_PROG:</div><div class='del'>-		return setup_xdp(dev, xdp-&gt;prog);</div><div class='del'>-	case XDP_QUERY_PROG:</div><div class='del'>-		xdp-&gt;prog_id = priv-&gt;xdp_prog ? priv-&gt;xdp_prog-&gt;aux-&gt;id : 0;</div><div class='del'>-		break;</div><div class='add'>+		return dpaa2_eth_setup_xdp(dev, xdp-&gt;prog);</div><div class='add'>+	case XDP_SETUP_XSK_POOL:</div><div class='add'>+		return dpaa2_xsk_setup_pool(dev, xdp-&gt;xsk.pool, xdp-&gt;xsk.queue_id);</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -1773,33 +2812,25 @@ static int dpaa2_eth_xdp(struct net_device *dev, struct netdev_bpf *xdp)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_eth_xdp_xmit_frame(struct net_device *net_dev,</div><div class='del'>-				    struct xdp_frame *xdpf)</div><div class='add'>+static int dpaa2_eth_xdp_create_fd(struct net_device *net_dev,</div><div class='add'>+				   struct xdp_frame *xdpf,</div><div class='add'>+				   struct dpaa2_fd *fd)</div><div class='ctx'> {</div><div class='del'>-	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='del'>-	struct rtnl_link_stats64 *percpu_stats;</div><div class='del'>-	struct dpaa2_eth_drv_stats *percpu_extras;</div><div class='ctx'> 	unsigned int needed_headroom;</div><div class='ctx'> 	struct dpaa2_eth_swa *swa;</div><div class='del'>-	struct dpaa2_eth_fq *fq;</div><div class='del'>-	struct dpaa2_fd fd;</div><div class='ctx'> 	void *buffer_start, *aligned_start;</div><div class='ctx'> 	dma_addr_t addr;</div><div class='del'>-	int err, i;</div><div class='ctx'> </div><div class='ctx'> 	/* We require a minimum headroom to be able to transmit the frame.</div><div class='ctx'> 	 * Otherwise return an error and let the original net_device handle it</div><div class='ctx'> 	 */</div><div class='del'>-	needed_headroom = dpaa2_eth_needed_headroom(priv, NULL);</div><div class='add'>+	needed_headroom = dpaa2_eth_needed_headroom(NULL);</div><div class='ctx'> 	if (xdpf-&gt;headroom &lt; needed_headroom)</div><div class='ctx'> 		return -EINVAL;</div><div class='ctx'> </div><div class='del'>-	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='del'>-	percpu_extras = this_cpu_ptr(priv-&gt;percpu_extras);</div><div class='del'>-</div><div class='ctx'> 	/* Setup the FD fields */</div><div class='del'>-	memset(&amp;fd, 0, sizeof(fd));</div><div class='add'>+	memset(fd, 0, sizeof(*fd));</div><div class='ctx'> </div><div class='ctx'> 	/* Align FD address, if possible */</div><div class='ctx'> 	buffer_start = xdpf-&gt;data - needed_headroom;</div><div class='hunk'>@@ -1817,32 +2848,14 @@ static int dpaa2_eth_xdp_xmit_frame(struct net_device *net_dev,</div><div class='ctx'> 	addr = dma_map_single(dev, buffer_start,</div><div class='ctx'> 			      swa-&gt;xdp.dma_size,</div><div class='ctx'> 			      DMA_BIDIRECTIONAL);</div><div class='del'>-	if (unlikely(dma_mapping_error(dev, addr))) {</div><div class='del'>-		percpu_stats-&gt;tx_dropped++;</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, addr)))</div><div class='ctx'> 		return -ENOMEM;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dpaa2_fd_set_addr(&amp;fd, addr);</div><div class='del'>-	dpaa2_fd_set_offset(&amp;fd, xdpf-&gt;data - buffer_start);</div><div class='del'>-	dpaa2_fd_set_len(&amp;fd, xdpf-&gt;len);</div><div class='del'>-	dpaa2_fd_set_format(&amp;fd, dpaa2_fd_single);</div><div class='del'>-	dpaa2_fd_set_ctrl(&amp;fd, FD_CTRL_PTA);</div><div class='del'>-</div><div class='del'>-	fq = &amp;priv-&gt;fq[smp_processor_id() % dpaa2_eth_queue_count(priv)];</div><div class='del'>-	for (i = 0; i &lt; DPAA2_ETH_ENQUEUE_RETRIES; i++) {</div><div class='del'>-		err = priv-&gt;enqueue(priv, fq, &amp;fd, 0);</div><div class='del'>-		if (err != -EBUSY)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	percpu_extras-&gt;tx_portal_busy += i;</div><div class='del'>-	if (unlikely(err &lt; 0)) {</div><div class='del'>-		percpu_stats-&gt;tx_errors++;</div><div class='del'>-		/* let the Rx device handle the cleanup */</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='ctx'> </div><div class='del'>-	percpu_stats-&gt;tx_packets++;</div><div class='del'>-	percpu_stats-&gt;tx_bytes += dpaa2_fd_get_len(&amp;fd);</div><div class='add'>+	dpaa2_fd_set_addr(fd, addr);</div><div class='add'>+	dpaa2_fd_set_offset(fd, xdpf-&gt;data - buffer_start);</div><div class='add'>+	dpaa2_fd_set_len(fd, xdpf-&gt;len);</div><div class='add'>+	dpaa2_fd_set_format(fd, dpaa2_fd_single);</div><div class='add'>+	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='hunk'>@@ -1850,8 +2863,12 @@ static int dpaa2_eth_xdp_xmit_frame(struct net_device *net_dev,</div><div class='ctx'> static int dpaa2_eth_xdp_xmit(struct net_device *net_dev, int n,</div><div class='ctx'> 			      struct xdp_frame **frames, u32 flags)</div><div class='ctx'> {</div><div class='del'>-	int drops = 0;</div><div class='del'>-	int i, err;</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct dpaa2_eth_xdp_fds *xdp_redirect_fds;</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='add'>+	struct dpaa2_fd *fds;</div><div class='add'>+	int enqueued, i, err;</div><div class='ctx'> </div><div class='ctx'> 	if (unlikely(flags &amp; ~XDP_XMIT_FLAGS_MASK))</div><div class='ctx'> 		return -EINVAL;</div><div class='hunk'>@@ -1859,17 +2876,155 @@ static int dpaa2_eth_xdp_xmit(struct net_device *net_dev, int n,</div><div class='ctx'> 	if (!netif_running(net_dev))</div><div class='ctx'> 		return -ENETDOWN;</div><div class='ctx'> </div><div class='add'>+	fq = &amp;priv-&gt;fq[smp_processor_id()];</div><div class='add'>+	xdp_redirect_fds = &amp;fq-&gt;xdp_redirect_fds;</div><div class='add'>+	fds = xdp_redirect_fds-&gt;fds;</div><div class='add'>+</div><div class='add'>+	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='add'>+</div><div class='add'>+	/* create a FD for each xdp_frame in the list received */</div><div class='ctx'> 	for (i = 0; i &lt; n; i++) {</div><div class='del'>-		struct xdp_frame *xdpf = frames[i];</div><div class='add'>+		err = dpaa2_eth_xdp_create_fd(net_dev, frames[i], &amp;fds[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='add'>+	xdp_redirect_fds-&gt;num = i;</div><div class='add'>+</div><div class='add'>+	/* enqueue all the frame descriptors */</div><div class='add'>+	enqueued = dpaa2_eth_xdp_flush(priv, fq, xdp_redirect_fds);</div><div class='ctx'> </div><div class='del'>-		err = dpaa2_eth_xdp_xmit_frame(net_dev, xdpf);</div><div class='add'>+	/* update statistics */</div><div class='add'>+	percpu_stats-&gt;tx_packets += enqueued;</div><div class='add'>+	for (i = 0; i &lt; enqueued; i++)</div><div class='add'>+		percpu_stats-&gt;tx_bytes += dpaa2_fd_get_len(&amp;fds[i]);</div><div class='add'>+</div><div class='add'>+	return enqueued;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int update_xps(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='add'>+	int i, num_queues, netdev_queues;</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='add'>+	cpumask_var_t xps_mask;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (!alloc_cpumask_var(&amp;xps_mask, GFP_KERNEL))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	num_queues = dpaa2_eth_queue_count(priv);</div><div class='add'>+	netdev_queues = (net_dev-&gt;num_tc ? : 1) * num_queues;</div><div class='add'>+</div><div class='add'>+	/* The first &lt;num_queues&gt; entries in priv-&gt;fq array are Tx/Tx conf</div><div class='add'>+	 * queues, so only process those</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; netdev_queues; i++) {</div><div class='add'>+		fq = &amp;priv-&gt;fq[i % num_queues];</div><div class='add'>+</div><div class='add'>+		cpumask_clear(xps_mask);</div><div class='add'>+		cpumask_set_cpu(fq-&gt;target_cpu, xps_mask);</div><div class='add'>+</div><div class='add'>+		err = netif_set_xps_queue(net_dev, xps_mask, i);</div><div class='ctx'> 		if (err) {</div><div class='del'>-			xdp_return_frame_rx_napi(xdpf);</div><div class='del'>-			drops++;</div><div class='add'>+			netdev_warn_once(net_dev, "Error setting XPS queue\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	free_cpumask_var(xps_mask);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_setup_mqprio(struct net_device *net_dev,</div><div class='add'>+				  struct tc_mqprio_qopt *mqprio)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	u8 num_tc, num_queues;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	mqprio-&gt;hw = TC_MQPRIO_HW_OFFLOAD_TCS;</div><div class='add'>+	num_queues = dpaa2_eth_queue_count(priv);</div><div class='add'>+	num_tc = mqprio-&gt;num_tc;</div><div class='add'>+</div><div class='add'>+	if (num_tc == net_dev-&gt;num_tc)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (num_tc  &gt; dpaa2_eth_tc_count(priv)) {</div><div class='add'>+		netdev_err(net_dev, "Max %d traffic classes supported\n",</div><div class='add'>+			   dpaa2_eth_tc_count(priv));</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!num_tc) {</div><div class='add'>+		netdev_reset_tc(net_dev);</div><div class='add'>+		netif_set_real_num_tx_queues(net_dev, num_queues);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_set_num_tc(net_dev, num_tc);</div><div class='add'>+	netif_set_real_num_tx_queues(net_dev, num_tc * num_queues);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; num_tc; i++)</div><div class='add'>+		netdev_set_tc_queue(net_dev, i, num_queues, i * num_queues);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	update_xps(priv);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+#define bps_to_mbits(rate) (div_u64((rate), 1000000) * 8)</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_setup_tbf(struct net_device *net_dev, struct tc_tbf_qopt_offload *p)</div><div class='add'>+{</div><div class='add'>+	struct tc_tbf_qopt_offload_replace_params *cfg = &amp;p-&gt;replace_params;</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct dpni_tx_shaping_cfg tx_cr_shaper = { 0 };</div><div class='add'>+	struct dpni_tx_shaping_cfg tx_er_shaper = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;command == TC_TBF_STATS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	/* Only per port Tx shaping */</div><div class='add'>+	if (p-&gt;parent != TC_H_ROOT)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (p-&gt;command == TC_TBF_REPLACE) {</div><div class='add'>+		if (cfg-&gt;max_size &gt; DPAA2_ETH_MAX_BURST_SIZE) {</div><div class='add'>+			netdev_err(net_dev, "burst size cannot be greater than %d\n",</div><div class='add'>+				   DPAA2_ETH_MAX_BURST_SIZE);</div><div class='add'>+			return -EINVAL;</div><div class='ctx'> 		}</div><div class='add'>+</div><div class='add'>+		tx_cr_shaper.max_burst_size = cfg-&gt;max_size;</div><div class='add'>+		/* The TBF interface is in bytes/s, whereas DPAA2 expects the</div><div class='add'>+		 * rate in Mbits/s</div><div class='add'>+		 */</div><div class='add'>+		tx_cr_shaper.rate_limit = bps_to_mbits(cfg-&gt;rate.rate_bytes_ps);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpni_set_tx_shaping(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;tx_cr_shaper,</div><div class='add'>+				  &amp;tx_er_shaper, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dpni_set_tx_shaping() = %d\n", err);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	return n - drops;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_setup_tc(struct net_device *net_dev,</div><div class='add'>+			      enum tc_setup_type type, void *type_data)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_QDISC_MQPRIO:</div><div class='add'>+		return dpaa2_eth_setup_mqprio(net_dev, type_data);</div><div class='add'>+	case TC_SETUP_QDISC_TBF:</div><div class='add'>+		return dpaa2_eth_setup_tbf(net_dev, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct net_device_ops dpaa2_eth_ops = {</div><div class='hunk'>@@ -1880,13 +3035,19 @@ static const struct net_device_ops dpaa2_eth_ops = {</div><div class='ctx'> 	.ndo_get_stats64 = dpaa2_eth_get_stats,</div><div class='ctx'> 	.ndo_set_rx_mode = dpaa2_eth_set_rx_mode,</div><div class='ctx'> 	.ndo_set_features = dpaa2_eth_set_features,</div><div class='del'>-	.ndo_do_ioctl = dpaa2_eth_ioctl,</div><div class='add'>+	.ndo_eth_ioctl = dpaa2_eth_ioctl,</div><div class='ctx'> 	.ndo_change_mtu = dpaa2_eth_change_mtu,</div><div class='ctx'> 	.ndo_bpf = dpaa2_eth_xdp,</div><div class='ctx'> 	.ndo_xdp_xmit = dpaa2_eth_xdp_xmit,</div><div class='add'>+	.ndo_xsk_wakeup = dpaa2_xsk_wakeup,</div><div class='add'>+	.ndo_setup_tc = dpaa2_eth_setup_tc,</div><div class='add'>+	.ndo_vlan_rx_add_vid = dpaa2_eth_rx_add_vid,</div><div class='add'>+	.ndo_vlan_rx_kill_vid = dpaa2_eth_rx_kill_vid,</div><div class='add'>+	.ndo_hwtstamp_get = dpaa2_eth_hwtstamp_get,</div><div class='add'>+	.ndo_hwtstamp_set = dpaa2_eth_hwtstamp_set,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-static void cdan_cb(struct dpaa2_io_notification_ctx *ctx)</div><div class='add'>+static void dpaa2_eth_cdan_cb(struct dpaa2_io_notification_ctx *ctx)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='ctx'> </div><div class='hunk'>@@ -1895,24 +3056,29 @@ static void cdan_cb(struct dpaa2_io_notification_ctx *ctx)</div><div class='ctx'> 	/* Update NAPI statistics */</div><div class='ctx'> 	ch-&gt;stats.cdan++;</div><div class='ctx'> </div><div class='del'>-	napi_schedule_irqoff(&amp;ch-&gt;napi);</div><div class='add'>+	/* NAPI can also be scheduled from the AF_XDP Tx path. Mark a missed</div><div class='add'>+	 * so that it can be rescheduled again.</div><div class='add'>+	 */</div><div class='add'>+	if (!napi_if_scheduled_mark_missed(&amp;ch-&gt;napi))</div><div class='add'>+		napi_schedule(&amp;ch-&gt;napi);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate and configure a DPCON object */</div><div class='del'>-static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv)</div><div class='add'>+static struct fsl_mc_device *dpaa2_eth_setup_dpcon(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_mc_device *dpcon;</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='del'>-	struct dpcon_attr attrs;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = fsl_mc_object_allocate(to_fsl_mc_device(dev),</div><div class='ctx'> 				     FSL_MC_POOL_DPCON, &amp;dpcon);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (err == -ENXIO)</div><div class='add'>+		if (err == -ENXIO) {</div><div class='add'>+			dev_dbg(dev, "Waiting for DPCON\n");</div><div class='ctx'> 			err = -EPROBE_DEFER;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			dev_info(dev, "Not enough DPCONs, will go on as-is\n");</div><div class='add'>+		}</div><div class='ctx'> 		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1928,12 +3094,6 @@ static struct fsl_mc_device *setup_dpcon(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = dpcon_get_attributes(priv-&gt;mc_io, 0, dpcon-&gt;mc_handle, &amp;attrs);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dpcon_get_attributes() failed\n");</div><div class='del'>-		goto close;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	err = dpcon_enable(priv-&gt;mc_io, 0, dpcon-&gt;mc_handle);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "dpcon_enable() failed\n");</div><div class='hunk'>@@ -1947,19 +3107,18 @@ close:</div><div class='ctx'> free:</div><div class='ctx'> 	fsl_mc_object_free(dpcon);</div><div class='ctx'> </div><div class='del'>-	return NULL;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_dpcon(struct dpaa2_eth_priv *priv,</div><div class='del'>-		       struct fsl_mc_device *dpcon)</div><div class='add'>+static void dpaa2_eth_free_dpcon(struct dpaa2_eth_priv *priv,</div><div class='add'>+				 struct fsl_mc_device *dpcon)</div><div class='ctx'> {</div><div class='ctx'> 	dpcon_disable(priv-&gt;mc_io, 0, dpcon-&gt;mc_handle);</div><div class='ctx'> 	dpcon_close(priv-&gt;mc_io, 0, dpcon-&gt;mc_handle);</div><div class='ctx'> 	fsl_mc_object_free(dpcon);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dpaa2_eth_channel *</div><div class='del'>-alloc_channel(struct dpaa2_eth_priv *priv)</div><div class='add'>+static struct dpaa2_eth_channel *dpaa2_eth_alloc_channel(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_channel *channel;</div><div class='ctx'> 	struct dpcon_attr attr;</div><div class='hunk'>@@ -1970,9 +3129,9 @@ alloc_channel(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	if (!channel)</div><div class='ctx'> 		return NULL;</div><div class='ctx'> </div><div class='del'>-	channel-&gt;dpcon = setup_dpcon(priv);</div><div class='del'>-	if (IS_ERR_OR_NULL(channel-&gt;dpcon)) {</div><div class='del'>-		err = PTR_ERR_OR_ZERO(channel-&gt;dpcon);</div><div class='add'>+	channel-&gt;dpcon = dpaa2_eth_setup_dpcon(priv);</div><div class='add'>+	if (IS_ERR(channel-&gt;dpcon)) {</div><div class='add'>+		err = PTR_ERR(channel-&gt;dpcon);</div><div class='ctx'> 		goto err_setup;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -1990,23 +3149,23 @@ alloc_channel(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	return channel;</div><div class='ctx'> </div><div class='ctx'> err_get_attr:</div><div class='del'>-	free_dpcon(priv, channel-&gt;dpcon);</div><div class='add'>+	dpaa2_eth_free_dpcon(priv, channel-&gt;dpcon);</div><div class='ctx'> err_setup:</div><div class='ctx'> 	kfree(channel);</div><div class='ctx'> 	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_channel(struct dpaa2_eth_priv *priv,</div><div class='del'>-			 struct dpaa2_eth_channel *channel)</div><div class='add'>+static void dpaa2_eth_free_channel(struct dpaa2_eth_priv *priv,</div><div class='add'>+				   struct dpaa2_eth_channel *channel)</div><div class='ctx'> {</div><div class='del'>-	free_dpcon(priv, channel-&gt;dpcon);</div><div class='add'>+	dpaa2_eth_free_dpcon(priv, channel-&gt;dpcon);</div><div class='ctx'> 	kfree(channel);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* DPIO setup: allocate and configure QBMan channels, setup core affinity</div><div class='ctx'>  * and register data availability notifications</div><div class='ctx'>  */</div><div class='del'>-static int setup_dpio(struct dpaa2_eth_priv *priv)</div><div class='add'>+static int dpaa2_eth_setup_dpio(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_io_notification_ctx *nctx;</div><div class='ctx'> 	struct dpaa2_eth_channel *channel;</div><div class='hunk'>@@ -2026,10 +3185,12 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	cpumask_clear(&amp;priv-&gt;dpio_cpumask);</div><div class='ctx'> 	for_each_online_cpu(i) {</div><div class='ctx'> 		/* Try to allocate a channel */</div><div class='del'>-		channel = alloc_channel(priv);</div><div class='add'>+		channel = dpaa2_eth_alloc_channel(priv);</div><div class='ctx'> 		if (IS_ERR_OR_NULL(channel)) {</div><div class='ctx'> 			err = PTR_ERR_OR_ZERO(channel);</div><div class='del'>-			if (err != -EPROBE_DEFER)</div><div class='add'>+			if (err == -EPROBE_DEFER)</div><div class='add'>+				dev_dbg(dev, "waiting for affine channel\n");</div><div class='add'>+			else</div><div class='ctx'> 				dev_info(dev,</div><div class='ctx'> 					 "No affine channel for cpu %d and above\n", i);</div><div class='ctx'> 			goto err_alloc_ch;</div><div class='hunk'>@@ -2039,7 +3200,7 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)</div><div class='ctx'> </div><div class='ctx'> 		nctx = &amp;channel-&gt;nctx;</div><div class='ctx'> 		nctx-&gt;is_cdan = 1;</div><div class='del'>-		nctx-&gt;cb = cdan_cb;</div><div class='add'>+		nctx-&gt;cb = dpaa2_eth_cdan_cb;</div><div class='ctx'> 		nctx-&gt;id = channel-&gt;ch_id;</div><div class='ctx'> 		nctx-&gt;desired_cpu = i;</div><div class='ctx'> </div><div class='hunk'>@@ -2087,10 +3248,18 @@ static int setup_dpio(struct dpaa2_eth_priv *priv)</div><div class='ctx'> err_set_cdan:</div><div class='ctx'> 	dpaa2_io_service_deregister(channel-&gt;dpio, nctx, dev);</div><div class='ctx'> err_service_reg:</div><div class='del'>-	free_channel(priv, channel);</div><div class='add'>+	dpaa2_eth_free_channel(priv, channel);</div><div class='ctx'> err_alloc_ch:</div><div class='del'>-	if (err == -EPROBE_DEFER)</div><div class='add'>+	if (err == -EPROBE_DEFER) {</div><div class='add'>+		for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='add'>+			channel = priv-&gt;channel[i];</div><div class='add'>+			nctx = &amp;channel-&gt;nctx;</div><div class='add'>+			dpaa2_io_service_deregister(channel-&gt;dpio, nctx, dev);</div><div class='add'>+			dpaa2_eth_free_channel(priv, channel);</div><div class='add'>+		}</div><div class='add'>+		priv-&gt;num_channels = 0;</div><div class='ctx'> 		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	if (cpumask_empty(&amp;priv-&gt;dpio_cpumask)) {</div><div class='ctx'> 		dev_err(dev, "No cpu with an affine DPIO/DPCON\n");</div><div class='hunk'>@@ -2103,7 +3272,7 @@ err_alloc_ch:</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_dpio(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_free_dpio(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='hunk'>@@ -2113,12 +3282,12 @@ static void free_dpio(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='ctx'> 		ch = priv-&gt;channel[i];</div><div class='ctx'> 		dpaa2_io_service_deregister(ch-&gt;dpio, &amp;ch-&gt;nctx, dev);</div><div class='del'>-		free_channel(priv, ch);</div><div class='add'>+		dpaa2_eth_free_channel(priv, ch);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static struct dpaa2_eth_channel *get_affine_channel(struct dpaa2_eth_priv *priv,</div><div class='del'>-						    int cpu)</div><div class='add'>+static struct dpaa2_eth_channel *dpaa2_eth_get_affine_channel(struct dpaa2_eth_priv *priv,</div><div class='add'>+							      int cpu)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	int i;</div><div class='hunk'>@@ -2135,13 +3304,12 @@ static struct dpaa2_eth_channel *get_affine_channel(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	return priv-&gt;channel[0];</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_fq_affinity(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_set_fq_affinity(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='del'>-	struct cpumask xps_mask;</div><div class='ctx'> 	struct dpaa2_eth_fq *fq;</div><div class='ctx'> 	int rx_cpu, txc_cpu;</div><div class='del'>-	int i, err;</div><div class='add'>+	int i;</div><div class='ctx'> </div><div class='ctx'> 	/* For each FQ, pick one channel/CPU to deliver frames to.</div><div class='ctx'> 	 * This may well change at runtime, either through irqbalance or</div><div class='hunk'>@@ -2153,6 +3321,7 @@ static void set_fq_affinity(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		fq = &amp;priv-&gt;fq[i];</div><div class='ctx'> 		switch (fq-&gt;type) {</div><div class='ctx'> 		case DPAA2_RX_FQ:</div><div class='add'>+		case DPAA2_RX_ERR_FQ:</div><div class='ctx'> 			fq-&gt;target_cpu = rx_cpu;</div><div class='ctx'> 			rx_cpu = cpumask_next(rx_cpu, &amp;priv-&gt;dpio_cpumask);</div><div class='ctx'> 			if (rx_cpu &gt;= nr_cpu_ids)</div><div class='hunk'>@@ -2160,17 +3329,6 @@ static void set_fq_affinity(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DPAA2_TX_CONF_FQ:</div><div class='ctx'> 			fq-&gt;target_cpu = txc_cpu;</div><div class='del'>-</div><div class='del'>-			/* Tell the stack to affine to txc_cpu the Tx queue</div><div class='del'>-			 * associated with the confirmation one</div><div class='del'>-			 */</div><div class='del'>-			cpumask_clear(&amp;xps_mask);</div><div class='del'>-			cpumask_set_cpu(txc_cpu, &amp;xps_mask);</div><div class='del'>-			err = netif_set_xps_queue(priv-&gt;net_dev, &amp;xps_mask,</div><div class='del'>-						  fq-&gt;flowid);</div><div class='del'>-			if (err)</div><div class='del'>-				dev_err(dev, "Error setting XPS queue\n");</div><div class='del'>-</div><div class='ctx'> 			txc_cpu = cpumask_next(txc_cpu, &amp;priv-&gt;dpio_cpumask);</div><div class='ctx'> 			if (txc_cpu &gt;= nr_cpu_ids)</div><div class='ctx'> 				txc_cpu = cpumask_first(&amp;priv-&gt;dpio_cpumask);</div><div class='hunk'>@@ -2178,13 +3336,15 @@ static void set_fq_affinity(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_err(dev, "Unknown FQ type: %d\n", fq-&gt;type);</div><div class='ctx'> 		}</div><div class='del'>-		fq-&gt;channel = get_affine_channel(priv, fq-&gt;target_cpu);</div><div class='add'>+		fq-&gt;channel = dpaa2_eth_get_affine_channel(priv, fq-&gt;target_cpu);</div><div class='ctx'> 	}</div><div class='add'>+</div><div class='add'>+	update_xps(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void setup_fqs(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_setup_fqs(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	int i;</div><div class='add'>+	int i, j;</div><div class='ctx'> </div><div class='ctx'> 	/* We have one TxConf FQ per Tx flow.</div><div class='ctx'> 	 * The number of Tx and Rx queues is the same.</div><div class='hunk'>@@ -2196,23 +3356,31 @@ static void setup_fqs(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		priv-&gt;fq[priv-&gt;num_fqs++].flowid = (u16)i;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	for (i = 0; i &lt; dpaa2_eth_queue_count(priv); i++) {</div><div class='del'>-		priv-&gt;fq[priv-&gt;num_fqs].type = DPAA2_RX_FQ;</div><div class='del'>-		priv-&gt;fq[priv-&gt;num_fqs].consume = dpaa2_eth_rx;</div><div class='del'>-		priv-&gt;fq[priv-&gt;num_fqs++].flowid = (u16)i;</div><div class='add'>+	for (j = 0; j &lt; dpaa2_eth_tc_count(priv); j++) {</div><div class='add'>+		for (i = 0; i &lt; dpaa2_eth_queue_count(priv); i++) {</div><div class='add'>+			priv-&gt;fq[priv-&gt;num_fqs].type = DPAA2_RX_FQ;</div><div class='add'>+			priv-&gt;fq[priv-&gt;num_fqs].consume = dpaa2_eth_rx;</div><div class='add'>+			priv-&gt;fq[priv-&gt;num_fqs].tc = (u8)j;</div><div class='add'>+			priv-&gt;fq[priv-&gt;num_fqs++].flowid = (u16)i;</div><div class='add'>+		}</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* We have exactly one Rx error queue per DPNI */</div><div class='add'>+	priv-&gt;fq[priv-&gt;num_fqs].type = DPAA2_RX_ERR_FQ;</div><div class='add'>+	priv-&gt;fq[priv-&gt;num_fqs++].consume = dpaa2_eth_rx_err;</div><div class='add'>+</div><div class='ctx'> 	/* For each FQ, decide on which core to process incoming frames */</div><div class='del'>-	set_fq_affinity(priv);</div><div class='add'>+	dpaa2_eth_set_fq_affinity(priv);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-/* Allocate and configure one buffer pool for each interface */</div><div class='del'>-static int setup_dpbp(struct dpaa2_eth_priv *priv)</div><div class='add'>+/* Allocate and configure a buffer pool */</div><div class='add'>+struct dpaa2_eth_bp *dpaa2_eth_allocate_dpbp(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	int err;</div><div class='del'>-	struct fsl_mc_device *dpbp_dev;</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct fsl_mc_device *dpbp_dev;</div><div class='ctx'> 	struct dpbp_attr dpbp_attrs;</div><div class='add'>+	struct dpaa2_eth_bp *bp;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = fsl_mc_object_allocate(to_fsl_mc_device(dev), FSL_MC_POOL_DPBP,</div><div class='ctx'> 				     &amp;dpbp_dev);</div><div class='hunk'>@@ -2221,12 +3389,16 @@ static int setup_dpbp(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 			err = -EPROBE_DEFER;</div><div class='ctx'> 		else</div><div class='ctx'> 			dev_err(dev, "DPBP device allocation failed\n");</div><div class='del'>-		return err;</div><div class='add'>+		return ERR_PTR(err);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	priv-&gt;dpbp_dev = dpbp_dev;</div><div class='add'>+	bp = kzalloc(sizeof(*bp), GFP_KERNEL);</div><div class='add'>+	if (!bp) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_alloc;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = dpbp_open(priv-&gt;mc_io, 0, priv-&gt;dpbp_dev-&gt;obj_desc.id,</div><div class='add'>+	err = dpbp_open(priv-&gt;mc_io, 0, dpbp_dev-&gt;obj_desc.id,</div><div class='ctx'> 			&amp;dpbp_dev-&gt;mc_handle);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "dpbp_open() failed\n");</div><div class='hunk'>@@ -2251,9 +3423,11 @@ static int setup_dpbp(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		dev_err(dev, "dpbp_get_attributes() failed\n");</div><div class='ctx'> 		goto err_get_attr;</div><div class='ctx'> 	}</div><div class='del'>-	priv-&gt;bpid = dpbp_attrs.bpid;</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	bp-&gt;dev = dpbp_dev;</div><div class='add'>+	bp-&gt;bpid = dpbp_attrs.bpid;</div><div class='add'>+</div><div class='add'>+	return bp;</div><div class='ctx'> </div><div class='ctx'> err_get_attr:</div><div class='ctx'> 	dpbp_disable(priv-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle);</div><div class='hunk'>@@ -2261,20 +3435,61 @@ err_enable:</div><div class='ctx'> err_reset:</div><div class='ctx'> 	dpbp_close(priv-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle);</div><div class='ctx'> err_open:</div><div class='add'>+	kfree(bp);</div><div class='add'>+err_alloc:</div><div class='ctx'> 	fsl_mc_object_free(dpbp_dev);</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	return ERR_PTR(err);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_dpbp(struct dpaa2_eth_priv *priv)</div><div class='add'>+static int dpaa2_eth_setup_default_dpbp(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='del'>-	drain_pool(priv);</div><div class='del'>-	dpbp_disable(priv-&gt;mc_io, 0, priv-&gt;dpbp_dev-&gt;mc_handle);</div><div class='del'>-	dpbp_close(priv-&gt;mc_io, 0, priv-&gt;dpbp_dev-&gt;mc_handle);</div><div class='del'>-	fsl_mc_object_free(priv-&gt;dpbp_dev);</div><div class='add'>+	struct dpaa2_eth_bp *bp;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	bp = dpaa2_eth_allocate_dpbp(priv);</div><div class='add'>+	if (IS_ERR(bp))</div><div class='add'>+		return PTR_ERR(bp);</div><div class='add'>+</div><div class='add'>+	priv-&gt;bp[DPAA2_ETH_DEFAULT_BP_IDX] = bp;</div><div class='add'>+	priv-&gt;num_bps++;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_channels; i++)</div><div class='add'>+		priv-&gt;channel[i]-&gt;bp = bp;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_buffer_layout(struct dpaa2_eth_priv *priv)</div><div class='add'>+void dpaa2_eth_free_dpbp(struct dpaa2_eth_priv *priv, struct dpaa2_eth_bp *bp)</div><div class='add'>+{</div><div class='add'>+	int idx_bp;</div><div class='add'>+</div><div class='add'>+	/* Find the index at which this BP is stored */</div><div class='add'>+	for (idx_bp = 0; idx_bp &lt; priv-&gt;num_bps; idx_bp++)</div><div class='add'>+		if (priv-&gt;bp[idx_bp] == bp)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+	/* Drain the pool and disable the associated MC object */</div><div class='add'>+	dpaa2_eth_drain_pool(priv, bp-&gt;bpid);</div><div class='add'>+	dpbp_disable(priv-&gt;mc_io, 0, bp-&gt;dev-&gt;mc_handle);</div><div class='add'>+	dpbp_close(priv-&gt;mc_io, 0, bp-&gt;dev-&gt;mc_handle);</div><div class='add'>+	fsl_mc_object_free(bp-&gt;dev);</div><div class='add'>+	kfree(bp);</div><div class='add'>+</div><div class='add'>+	/* Move the last in use DPBP over in this position */</div><div class='add'>+	priv-&gt;bp[idx_bp] = priv-&gt;bp[priv-&gt;num_bps - 1];</div><div class='add'>+	priv-&gt;num_bps--;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_free_dpbps(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_bps; i++)</div><div class='add'>+		dpaa2_eth_free_dpbp(priv, priv-&gt;bp[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_buffer_layout(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpni_buffer_layout buf_layout = {0};</div><div class='hunk'>@@ -2291,11 +3506,18 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	else</div><div class='ctx'> 		rx_buf_align = DPAA2_ETH_RX_BUF_ALIGN;</div><div class='ctx'> </div><div class='add'>+	/* We need to ensure that the buffer size seen by WRIOP is a multiple</div><div class='add'>+	 * of 64 or 256 bytes depending on the WRIOP version.</div><div class='add'>+	 */</div><div class='add'>+	priv-&gt;rx_buf_size = ALIGN_DOWN(DPAA2_ETH_RX_BUF_SIZE, rx_buf_align);</div><div class='add'>+</div><div class='ctx'> 	/* tx buffer */</div><div class='ctx'> 	buf_layout.private_data_size = DPAA2_ETH_SWA_SIZE;</div><div class='ctx'> 	buf_layout.pass_timestamp = true;</div><div class='add'>+	buf_layout.pass_frame_status = true;</div><div class='ctx'> 	buf_layout.options = DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE |</div><div class='del'>-			     DPNI_BUF_LAYOUT_OPT_TIMESTAMP;</div><div class='add'>+			     DPNI_BUF_LAYOUT_OPT_TIMESTAMP |</div><div class='add'>+			     DPNI_BUF_LAYOUT_OPT_FRAME_STATUS;</div><div class='ctx'> 	err = dpni_set_buffer_layout(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='ctx'> 				     DPNI_QUEUE_TX, &amp;buf_layout);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -2304,7 +3526,8 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* tx-confirm buffer */</div><div class='del'>-	buf_layout.options = DPNI_BUF_LAYOUT_OPT_TIMESTAMP;</div><div class='add'>+	buf_layout.options = DPNI_BUF_LAYOUT_OPT_TIMESTAMP |</div><div class='add'>+			     DPNI_BUF_LAYOUT_OPT_FRAME_STATUS;</div><div class='ctx'> 	err = dpni_set_buffer_layout(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='ctx'> 				     DPNI_QUEUE_TX_CONFIRM, &amp;buf_layout);</div><div class='ctx'> 	if (err) {</div><div class='hunk'>@@ -2352,33 +3575,231 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv)</div><div class='ctx'> </div><div class='ctx'> static inline int dpaa2_eth_enqueue_qd(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 				       struct dpaa2_eth_fq *fq,</div><div class='del'>-				       struct dpaa2_fd *fd, u8 prio)</div><div class='add'>+				       struct dpaa2_fd *fd, u8 prio,</div><div class='add'>+				       u32 num_frames __always_unused,</div><div class='add'>+				       int *frames_enqueued)</div><div class='ctx'> {</div><div class='del'>-	return dpaa2_io_service_enqueue_qd(fq-&gt;channel-&gt;dpio,</div><div class='del'>-					   priv-&gt;tx_qdid, prio,</div><div class='del'>-					   fq-&gt;tx_qdbin, fd);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_io_service_enqueue_qd(fq-&gt;channel-&gt;dpio,</div><div class='add'>+					  priv-&gt;tx_qdid, prio,</div><div class='add'>+					  fq-&gt;tx_qdbin, fd);</div><div class='add'>+	if (!err &amp;&amp; frames_enqueued)</div><div class='add'>+		*frames_enqueued = 1;</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static inline int dpaa2_eth_enqueue_fq(struct dpaa2_eth_priv *priv,</div><div class='del'>-				       struct dpaa2_eth_fq *fq,</div><div class='del'>-				       struct dpaa2_fd *fd,</div><div class='del'>-				       u8 prio __always_unused)</div><div class='add'>+static inline int dpaa2_eth_enqueue_fq_multiple(struct dpaa2_eth_priv *priv,</div><div class='add'>+						struct dpaa2_eth_fq *fq,</div><div class='add'>+						struct dpaa2_fd *fd,</div><div class='add'>+						u8 prio, u32 num_frames,</div><div class='add'>+						int *frames_enqueued)</div><div class='ctx'> {</div><div class='del'>-	return dpaa2_io_service_enqueue_fq(fq-&gt;channel-&gt;dpio,</div><div class='del'>-					   fq-&gt;tx_fqid, fd);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_io_service_enqueue_multiple_fq(fq-&gt;channel-&gt;dpio,</div><div class='add'>+						   fq-&gt;tx_fqid[prio],</div><div class='add'>+						   fd, num_frames);</div><div class='add'>+</div><div class='add'>+	if (err == 0)</div><div class='add'>+		return -EBUSY;</div><div class='add'>+</div><div class='add'>+	if (frames_enqueued)</div><div class='add'>+		*frames_enqueued = err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void set_enqueue_mode(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_set_enqueue_mode(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_ENQUEUE_FQID_VER_MAJOR,</div><div class='ctx'> 				   DPNI_ENQUEUE_FQID_VER_MINOR) &lt; 0)</div><div class='ctx'> 		priv-&gt;enqueue = dpaa2_eth_enqueue_qd;</div><div class='ctx'> 	else</div><div class='del'>-		priv-&gt;enqueue = dpaa2_eth_enqueue_fq;</div><div class='add'>+		priv-&gt;enqueue = dpaa2_eth_enqueue_fq_multiple;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_pause(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpni_link_cfg link_cfg = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Get the default link options so we don't override other flags */</div><div class='add'>+	err = dpni_get_link_cfg(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;link_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_get_link_cfg() failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* By default, enable both Rx and Tx pause frames */</div><div class='add'>+	link_cfg.options |= DPNI_LINK_OPT_PAUSE;</div><div class='add'>+	link_cfg.options &amp;= ~DPNI_LINK_OPT_ASYM_PAUSE;</div><div class='add'>+	err = dpni_set_link_cfg(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;link_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_set_link_cfg() failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;link_state.options = link_cfg.options;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_update_tx_fqids(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dpni_queue_id qid = {0};</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='add'>+	struct dpni_queue queue;</div><div class='add'>+	int i, j, err;</div><div class='add'>+</div><div class='add'>+	/* We only use Tx FQIDs for FQID-based enqueue, so check</div><div class='add'>+	 * if DPNI version supports it before updating FQIDs</div><div class='add'>+	 */</div><div class='add'>+	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_ENQUEUE_FQID_VER_MAJOR,</div><div class='add'>+				   DPNI_ENQUEUE_FQID_VER_MINOR) &lt; 0)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_fqs; i++) {</div><div class='add'>+		fq = &amp;priv-&gt;fq[i];</div><div class='add'>+		if (fq-&gt;type != DPAA2_TX_CONF_FQ)</div><div class='add'>+			continue;</div><div class='add'>+		for (j = 0; j &lt; dpaa2_eth_tc_count(priv); j++) {</div><div class='add'>+			err = dpni_get_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					     DPNI_QUEUE_TX, j, fq-&gt;flowid,</div><div class='add'>+					     &amp;queue, &amp;qid);</div><div class='add'>+			if (err)</div><div class='add'>+				goto out_err;</div><div class='add'>+</div><div class='add'>+			fq-&gt;tx_fqid[j] = qid.fqid;</div><div class='add'>+			if (fq-&gt;tx_fqid[j] == 0)</div><div class='add'>+				goto out_err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;enqueue = dpaa2_eth_enqueue_fq_multiple;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+out_err:</div><div class='add'>+	netdev_info(priv-&gt;net_dev,</div><div class='add'>+		    "Error reading Tx FQID, fallback to QDID-based enqueue\n");</div><div class='add'>+	priv-&gt;enqueue = dpaa2_eth_enqueue_qd;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Configure ingress classification based on VLAN PCP */</div><div class='add'>+static int dpaa2_eth_set_vlan_qos(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpkg_profile_cfg kg_cfg = {0};</div><div class='add'>+	struct dpni_qos_tbl_cfg qos_cfg = {0};</div><div class='add'>+	struct dpni_rule_cfg key_params;</div><div class='add'>+	void *dma_mem, *key, *mask;</div><div class='add'>+	u8 key_size = 2;	/* VLAN TCI field */</div><div class='add'>+	int i, pcp, err;</div><div class='add'>+</div><div class='add'>+	/* VLAN-based classification only makes sense if we have multiple</div><div class='add'>+	 * traffic classes.</div><div class='add'>+	 * Also, we need to extract just the 3-bit PCP field from the VLAN</div><div class='add'>+	 * header and we can only do that by using a mask</div><div class='add'>+	 */</div><div class='add'>+	if (dpaa2_eth_tc_count(priv) == 1 || !dpaa2_eth_fs_mask_enabled(priv)) {</div><div class='add'>+		dev_dbg(dev, "VLAN-based QoS classification not supported\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_mem = kzalloc(DPAA2_CLASSIFIER_DMA_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!dma_mem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	kg_cfg.num_extracts = 1;</div><div class='add'>+	kg_cfg.extracts[0].type = DPKG_EXTRACT_FROM_HDR;</div><div class='add'>+	kg_cfg.extracts[0].extract.from_hdr.prot = NET_PROT_VLAN;</div><div class='add'>+	kg_cfg.extracts[0].extract.from_hdr.type = DPKG_FULL_FIELD;</div><div class='add'>+	kg_cfg.extracts[0].extract.from_hdr.field = NH_FLD_VLAN_TCI;</div><div class='add'>+</div><div class='add'>+	err = dpni_prepare_key_cfg(&amp;kg_cfg, dma_mem);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_prepare_key_cfg failed\n");</div><div class='add'>+		goto out_free_tbl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* set QoS table */</div><div class='add'>+	qos_cfg.default_tc = 0;</div><div class='add'>+	qos_cfg.discard_on_miss = 0;</div><div class='add'>+	qos_cfg.key_cfg_iova = dma_map_single(dev, dma_mem,</div><div class='add'>+					      DPAA2_CLASSIFIER_DMA_SIZE,</div><div class='add'>+					      DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(dev, qos_cfg.key_cfg_iova)) {</div><div class='add'>+		dev_err(dev, "QoS table DMA mapping failed\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_free_tbl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpni_set_qos_table(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;qos_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_set_qos_table failed\n");</div><div class='add'>+		goto out_unmap_tbl;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add QoS table entries */</div><div class='add'>+	key = kzalloc(key_size * 2, GFP_KERNEL);</div><div class='add'>+	if (!key) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_unmap_tbl;</div><div class='add'>+	}</div><div class='add'>+	mask = key + key_size;</div><div class='add'>+	*(__be16 *)mask = cpu_to_be16(VLAN_PRIO_MASK);</div><div class='add'>+</div><div class='add'>+	key_params.key_iova = dma_map_single(dev, key, key_size * 2,</div><div class='add'>+					     DMA_TO_DEVICE);</div><div class='add'>+	if (dma_mapping_error(dev, key_params.key_iova)) {</div><div class='add'>+		dev_err(dev, "Qos table entry DMA mapping failed\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_free_key;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	key_params.mask_iova = key_params.key_iova + key_size;</div><div class='add'>+	key_params.key_size = key_size;</div><div class='add'>+</div><div class='add'>+	/* We add rules for PCP-based distribution starting with highest</div><div class='add'>+	 * priority (VLAN PCP = 7). If this DPNI doesn't have enough traffic</div><div class='add'>+	 * classes to accommodate all priority levels, the lowest ones end up</div><div class='add'>+	 * on TC 0 which was configured as default</div><div class='add'>+	 */</div><div class='add'>+	for (i = dpaa2_eth_tc_count(priv) - 1, pcp = 7; i &gt;= 0; i--, pcp--) {</div><div class='add'>+		*(__be16 *)key = cpu_to_be16(pcp &lt;&lt; VLAN_PRIO_SHIFT);</div><div class='add'>+		dma_sync_single_for_device(dev, key_params.key_iova,</div><div class='add'>+					   key_size * 2, DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+		err = dpni_add_qos_entry(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					 &amp;key_params, i, i);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpni_add_qos_entry failed\n");</div><div class='add'>+			dpni_clear_qos_table(priv-&gt;mc_io, 0, priv-&gt;mc_token);</div><div class='add'>+			goto out_unmap_key;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;vlan_cls_enabled = true;</div><div class='add'>+</div><div class='add'>+	/* Table and key memory is not persistent, clean everything up after</div><div class='add'>+	 * configuration is finished</div><div class='add'>+	 */</div><div class='add'>+out_unmap_key:</div><div class='add'>+	dma_unmap_single(dev, key_params.key_iova, key_size * 2, DMA_TO_DEVICE);</div><div class='add'>+out_free_key:</div><div class='add'>+	kfree(key);</div><div class='add'>+out_unmap_tbl:</div><div class='add'>+	dma_unmap_single(dev, qos_cfg.key_cfg_iova, DPAA2_CLASSIFIER_DMA_SIZE,</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+out_free_tbl:</div><div class='add'>+	kfree(dma_mem);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configure the DPNI object this interface is associated with */</div><div class='del'>-static int setup_dpni(struct fsl_mc_device *ls_dev)</div><div class='add'>+static int dpaa2_eth_setup_dpni(struct fsl_mc_device *ls_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;ls_dev-&gt;dev;</div><div class='ctx'> 	struct dpaa2_eth_priv *priv;</div><div class='hunk'>@@ -2406,7 +3827,7 @@ static int setup_dpni(struct fsl_mc_device *ls_dev)</div><div class='ctx'> 		dev_err(dev, "DPNI version %u.%u not supported, need &gt;= %u.%u\n",</div><div class='ctx'> 			priv-&gt;dpni_ver_major, priv-&gt;dpni_ver_minor,</div><div class='ctx'> 			DPNI_VER_MAJOR, DPNI_VER_MINOR);</div><div class='del'>-		err = -ENOTSUPP;</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -2426,16 +3847,30 @@ static int setup_dpni(struct fsl_mc_device *ls_dev)</div><div class='ctx'> 		goto close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = set_buffer_layout(priv);</div><div class='add'>+	err = dpaa2_eth_set_buffer_layout(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto close;</div><div class='ctx'> </div><div class='del'>-	set_enqueue_mode(priv);</div><div class='add'>+	dpaa2_eth_set_enqueue_mode(priv);</div><div class='add'>+</div><div class='add'>+	/* Enable pause frame support */</div><div class='add'>+	if (dpaa2_eth_has_pause_support(priv)) {</div><div class='add'>+		err = dpaa2_eth_set_pause(priv);</div><div class='add'>+		if (err)</div><div class='add'>+			goto close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_set_vlan_qos(priv);</div><div class='add'>+	if (err &amp;&amp; err != -EOPNOTSUPP)</div><div class='add'>+		goto close;</div><div class='ctx'> </div><div class='del'>-	priv-&gt;cls_rules = devm_kzalloc(dev, sizeof(struct dpaa2_eth_cls_rule) *</div><div class='del'>-				       dpaa2_eth_fs_count(priv), GFP_KERNEL);</div><div class='del'>-	if (!priv-&gt;cls_rules)</div><div class='add'>+	priv-&gt;cls_rules = devm_kcalloc(dev, dpaa2_eth_fs_count(priv),</div><div class='add'>+				       sizeof(struct dpaa2_eth_cls_rule),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!priv-&gt;cls_rules) {</div><div class='add'>+		err = -ENOMEM;</div><div class='ctx'> 		goto close;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='hunk'>@@ -2445,7 +3880,7 @@ close:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_dpni(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_free_dpni(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='hunk'>@@ -2457,17 +3892,16 @@ static void free_dpni(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	dpni_close(priv-&gt;mc_io, 0, priv-&gt;mc_token);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_rx_flow(struct dpaa2_eth_priv *priv,</div><div class='del'>-			 struct dpaa2_eth_fq *fq)</div><div class='add'>+static int dpaa2_eth_setup_rx_flow(struct dpaa2_eth_priv *priv,</div><div class='add'>+				   struct dpaa2_eth_fq *fq)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpni_queue queue;</div><div class='ctx'> 	struct dpni_queue_id qid;</div><div class='del'>-	struct dpni_taildrop td;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_get_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='del'>-			     DPNI_QUEUE_RX, 0, fq-&gt;flowid, &amp;queue, &amp;qid);</div><div class='add'>+			     DPNI_QUEUE_RX, fq-&gt;tc, fq-&gt;flowid, &amp;queue, &amp;qid);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "dpni_get_queue(RX) failed\n");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2479,32 +3913,22 @@ static int setup_rx_flow(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	queue.destination.type = DPNI_DEST_DPCON;</div><div class='ctx'> 	queue.destination.priority = 1;</div><div class='ctx'> 	queue.user_context = (u64)(uintptr_t)fq;</div><div class='del'>-	queue.flc.stash_control = 1;</div><div class='del'>-	queue.flc.value &amp;= 0xFFFFFFFFFFFFFFC0;</div><div class='del'>-	/* 01 01 00 - data, annotation, flow context */</div><div class='del'>-	queue.flc.value |= 0x14;</div><div class='ctx'> 	err = dpni_set_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='del'>-			     DPNI_QUEUE_RX, 0, fq-&gt;flowid,</div><div class='del'>-			     DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST |</div><div class='del'>-			     DPNI_QUEUE_OPT_FLC,</div><div class='add'>+			     DPNI_QUEUE_RX, fq-&gt;tc, fq-&gt;flowid,</div><div class='add'>+			     DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST,</div><div class='ctx'> 			     &amp;queue);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "dpni_set_queue(RX) failed\n");</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	td.enable = 1;</div><div class='del'>-	td.threshold = DPAA2_ETH_TAILDROP_THRESH;</div><div class='del'>-	err = dpni_set_taildrop(priv-&gt;mc_io, 0, priv-&gt;mc_token, DPNI_CP_QUEUE,</div><div class='del'>-				DPNI_QUEUE_RX, 0, fq-&gt;flowid, &amp;td);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dpni_set_threshold() failed\n");</div><div class='del'>-		return err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='ctx'> 	/* xdp_rxq setup */</div><div class='add'>+	/* only once for each channel */</div><div class='add'>+	if (fq-&gt;tc &gt; 0)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='ctx'> 	err = xdp_rxq_info_reg(&amp;fq-&gt;channel-&gt;xdp_rxq, priv-&gt;net_dev,</div><div class='del'>-			       fq-&gt;flowid);</div><div class='add'>+			       fq-&gt;flowid, 0);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "xdp_rxq_info_reg failed\n");</div><div class='ctx'> 		return err;</div><div class='hunk'>@@ -2514,29 +3938,34 @@ static int setup_rx_flow(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 					 MEM_TYPE_PAGE_ORDER0, NULL);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "xdp_rxq_info_reg_mem_model failed\n");</div><div class='add'>+		xdp_rxq_info_unreg(&amp;fq-&gt;channel-&gt;xdp_rxq);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_tx_flow(struct dpaa2_eth_priv *priv,</div><div class='del'>-			 struct dpaa2_eth_fq *fq)</div><div class='add'>+static int dpaa2_eth_setup_tx_flow(struct dpaa2_eth_priv *priv,</div><div class='add'>+				   struct dpaa2_eth_fq *fq)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpni_queue queue;</div><div class='ctx'> 	struct dpni_queue_id qid;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='del'>-	err = dpni_get_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='del'>-			     DPNI_QUEUE_TX, 0, fq-&gt;flowid, &amp;queue, &amp;qid);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dpni_get_queue(TX) failed\n");</div><div class='del'>-		return err;</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		err = dpni_get_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+				     DPNI_QUEUE_TX, i, fq-&gt;flowid,</div><div class='add'>+				     &amp;queue, &amp;qid);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpni_get_queue(TX) failed\n");</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		fq-&gt;tx_fqid[i] = qid.fqid;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	/* All Tx queues belonging to the same flowid have the same qdbin */</div><div class='ctx'> 	fq-&gt;tx_qdbin = qid.qdbin;</div><div class='del'>-	fq-&gt;tx_fqid = qid.fqid;</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_get_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='ctx'> 			     DPNI_QUEUE_TX_CONFIRM, 0, fq-&gt;flowid,</div><div class='hunk'>@@ -2564,6 +3993,38 @@ static int setup_tx_flow(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int setup_rx_err_flow(struct dpaa2_eth_priv *priv,</div><div class='add'>+			     struct dpaa2_eth_fq *fq)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpni_queue q = { { 0 } };</div><div class='add'>+	struct dpni_queue_id qid;</div><div class='add'>+	u8 q_opt = DPNI_QUEUE_OPT_USER_CTX | DPNI_QUEUE_OPT_DEST;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpni_get_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+			     DPNI_QUEUE_RX_ERR, 0, 0, &amp;q, &amp;qid);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_get_queue() failed (%d)\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fq-&gt;fqid = qid.fqid;</div><div class='add'>+</div><div class='add'>+	q.destination.id = fq-&gt;channel-&gt;dpcon_id;</div><div class='add'>+	q.destination.type = DPNI_DEST_DPCON;</div><div class='add'>+	q.destination.priority = 1;</div><div class='add'>+	q.user_context = (u64)(uintptr_t)fq;</div><div class='add'>+	err = dpni_set_queue(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+			     DPNI_QUEUE_RX_ERR, 0, 0, q_opt, &amp;q);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpni_set_queue() failed (%d)\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Supported header fields for Rx hash distribution key */</div><div class='ctx'> static const struct dpaa2_eth_dist_fields dist_fields[] = {</div><div class='ctx'> 	{</div><div class='hunk'>@@ -2632,11 +4093,11 @@ static const struct dpaa2_eth_dist_fields dist_fields[] = {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Configure the Rx hash key using the legacy API */</div><div class='del'>-static int config_legacy_hash_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='add'>+static int dpaa2_eth_config_legacy_hash_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpni_rx_tc_dist_cfg dist_cfg;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;dist_cfg, 0, sizeof(dist_cfg));</div><div class='ctx'> </div><div class='hunk'>@@ -2644,19 +4105,24 @@ static int config_legacy_hash_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> 	dist_cfg.dist_size = dpaa2_eth_queue_count(priv);</div><div class='ctx'> 	dist_cfg.dist_mode = DPNI_DIST_MODE_HASH;</div><div class='ctx'> </div><div class='del'>-	err = dpni_set_rx_tc_dist(priv-&gt;mc_io, 0, priv-&gt;mc_token, 0, &amp;dist_cfg);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(dev, "dpni_set_rx_tc_dist failed\n");</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		err = dpni_set_rx_tc_dist(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					  i, &amp;dist_cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpni_set_rx_tc_dist failed\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configure the Rx hash key using the new API */</div><div class='del'>-static int config_hash_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='add'>+static int dpaa2_eth_config_hash_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpni_rx_dist_cfg dist_cfg;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;dist_cfg, 0, sizeof(dist_cfg));</div><div class='ctx'> </div><div class='hunk'>@@ -2664,19 +4130,31 @@ static int config_hash_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> 	dist_cfg.dist_size = dpaa2_eth_queue_count(priv);</div><div class='ctx'> 	dist_cfg.enable = 1;</div><div class='ctx'> </div><div class='del'>-	err = dpni_set_rx_hash_dist(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;dist_cfg);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(dev, "dpni_set_rx_hash_dist failed\n");</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		dist_cfg.tc = i;</div><div class='add'>+		err = dpni_set_rx_hash_dist(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					    &amp;dist_cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpni_set_rx_hash_dist failed\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If the flow steering / hashing key is shared between all</div><div class='add'>+		 * traffic classes, install it just once</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;dpni_attrs.options &amp; DPNI_OPT_SHARED_FS)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Configure the Rx flow classification key */</div><div class='del'>-static int config_cls_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='add'>+static int dpaa2_eth_config_cls_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpni_rx_dist_cfg dist_cfg;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err = 0;</div><div class='ctx'> </div><div class='ctx'> 	memset(&amp;dist_cfg, 0, sizeof(dist_cfg));</div><div class='ctx'> </div><div class='hunk'>@@ -2684,9 +4162,21 @@ static int config_cls_key(struct dpaa2_eth_priv *priv, dma_addr_t key)</div><div class='ctx'> 	dist_cfg.dist_size = dpaa2_eth_queue_count(priv);</div><div class='ctx'> 	dist_cfg.enable = 1;</div><div class='ctx'> </div><div class='del'>-	err = dpni_set_rx_fs_dist(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;dist_cfg);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(dev, "dpni_set_rx_fs_dist failed\n");</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		dist_cfg.tc = i;</div><div class='add'>+		err = dpni_set_rx_fs_dist(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+					  &amp;dist_cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpni_set_rx_fs_dist failed\n");</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* If the flow steering / hashing key is shared between all</div><div class='add'>+		 * traffic classes, install it just once</div><div class='add'>+		 */</div><div class='add'>+		if (priv-&gt;dpni_attrs.options &amp; DPNI_OPT_SHARED_FS)</div><div class='add'>+			break;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='hunk'>@@ -2801,11 +4291,11 @@ static int dpaa2_eth_set_dist_key(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	if (type == DPAA2_ETH_RX_DIST_HASH) {</div><div class='ctx'> 		if (dpaa2_eth_has_legacy_dist(priv))</div><div class='del'>-			err = config_legacy_hash_key(priv, key_iova);</div><div class='add'>+			err = dpaa2_eth_config_legacy_hash_key(priv, key_iova);</div><div class='ctx'> 		else</div><div class='del'>-			err = config_hash_key(priv, key_iova);</div><div class='add'>+			err = dpaa2_eth_config_hash_key(priv, key_iova);</div><div class='ctx'> 	} else {</div><div class='del'>-		err = config_cls_key(priv, key_iova);</div><div class='add'>+		err = dpaa2_eth_config_cls_key(priv, key_iova);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(dev, key_iova, DPAA2_CLASSIFIER_DMA_SIZE,</div><div class='hunk'>@@ -2880,19 +4370,20 @@ out:</div><div class='ctx'> /* Bind the DPNI to its needed objects and resources: buffer pool, DPIOs,</div><div class='ctx'>  * frame queues and channels</div><div class='ctx'>  */</div><div class='del'>-static int bind_dpni(struct dpaa2_eth_priv *priv)</div><div class='add'>+static int dpaa2_eth_bind_dpni(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='add'>+	struct dpaa2_eth_bp *bp = priv-&gt;bp[DPAA2_ETH_DEFAULT_BP_IDX];</div><div class='ctx'> 	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='add'>+	struct dpni_pools_cfg pools_params = { 0 };</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='del'>-	struct dpni_pools_cfg pools_params;</div><div class='ctx'> 	struct dpni_error_cfg err_cfg;</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	pools_params.num_dpbp = 1;</div><div class='del'>-	pools_params.pools[0].dpbp_id = priv-&gt;dpbp_dev-&gt;obj_desc.id;</div><div class='add'>+	pools_params.pools[0].dpbp_id = bp-&gt;dev-&gt;obj_desc.id;</div><div class='ctx'> 	pools_params.pools[0].backup_pool = 0;</div><div class='del'>-	pools_params.pools[0].buffer_size = DPAA2_ETH_RX_BUF_SIZE;</div><div class='add'>+	pools_params.pools[0].buffer_size = priv-&gt;rx_buf_size;</div><div class='ctx'> 	err = dpni_set_pools(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;pools_params);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "dpni_set_pools() failed\n");</div><div class='hunk'>@@ -2928,31 +4419,42 @@ static int bind_dpni(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_fqs; i++) {</div><div class='ctx'> 		switch (priv-&gt;fq[i].type) {</div><div class='ctx'> 		case DPAA2_RX_FQ:</div><div class='del'>-			err = setup_rx_flow(priv, &amp;priv-&gt;fq[i]);</div><div class='add'>+			err = dpaa2_eth_setup_rx_flow(priv, &amp;priv-&gt;fq[i]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		case DPAA2_TX_CONF_FQ:</div><div class='del'>-			err = setup_tx_flow(priv, &amp;priv-&gt;fq[i]);</div><div class='add'>+			err = dpaa2_eth_setup_tx_flow(priv, &amp;priv-&gt;fq[i]);</div><div class='add'>+			break;</div><div class='add'>+		case DPAA2_RX_ERR_FQ:</div><div class='add'>+			err = setup_rx_err_flow(priv, &amp;priv-&gt;fq[i]);</div><div class='ctx'> 			break;</div><div class='ctx'> 		default:</div><div class='ctx'> 			dev_err(dev, "Invalid FQ type %d\n", priv-&gt;fq[i].type);</div><div class='ctx'> 			return -EINVAL;</div><div class='ctx'> 		}</div><div class='ctx'> 		if (err)</div><div class='del'>-			return err;</div><div class='add'>+			goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_get_qdid(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='ctx'> 			    DPNI_QUEUE_TX, &amp;priv-&gt;tx_qdid);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		dev_err(dev, "dpni_get_qdid() failed\n");</div><div class='del'>-		return err;</div><div class='add'>+		goto out;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	while (i--) {</div><div class='add'>+		if (priv-&gt;fq[i].type == DPAA2_RX_FQ &amp;&amp;</div><div class='add'>+		    xdp_rxq_info_is_reg(&amp;priv-&gt;fq[i].channel-&gt;xdp_rxq))</div><div class='add'>+			xdp_rxq_info_unreg(&amp;priv-&gt;fq[i].channel-&gt;xdp_rxq);</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /* Allocate rings for storing incoming frame descriptors */</div><div class='del'>-static int alloc_rings(struct dpaa2_eth_priv *priv)</div><div class='add'>+static int dpaa2_eth_alloc_rings(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='hunk'>@@ -2979,7 +4481,7 @@ err_ring:</div><div class='ctx'> 	return -ENOMEM;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void free_rings(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_free_rings(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='hunk'>@@ -2987,7 +4489,7 @@ static void free_rings(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		dpaa2_io_store_destroy(priv-&gt;channel[i]-&gt;store);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int set_mac_addr(struct dpaa2_eth_priv *priv)</div><div class='add'>+static int dpaa2_eth_set_mac_addr(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	struct net_device *net_dev = priv-&gt;net_dev;</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='hunk'>@@ -3021,7 +4523,7 @@ static int set_mac_addr(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 				return err;</div><div class='ctx'> 			}</div><div class='ctx'> 		}</div><div class='del'>-		memcpy(net_dev-&gt;dev_addr, mac_addr, net_dev-&gt;addr_len);</div><div class='add'>+		eth_hw_addr_set(net_dev, mac_addr);</div><div class='ctx'> 	} else if (is_zero_ether_addr(dpni_mac_addr)) {</div><div class='ctx'> 		/* No MAC address configured, fill in net_dev-&gt;dev_addr</div><div class='ctx'> 		 * with a random one</div><div class='hunk'>@@ -3046,13 +4548,13 @@ static int set_mac_addr(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 		/* NET_ADDR_PERM is default, all we have to do is</div><div class='ctx'> 		 * fill in the device addr.</div><div class='ctx'> 		 */</div><div class='del'>-		memcpy(net_dev-&gt;dev_addr, dpni_mac_addr, net_dev-&gt;addr_len);</div><div class='add'>+		eth_hw_addr_set(net_dev, dpni_mac_addr);</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int netdev_init(struct net_device *net_dev)</div><div class='add'>+static int dpaa2_eth_netdev_init(struct net_device *net_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='hunk'>@@ -3065,7 +4567,7 @@ static int netdev_init(struct net_device *net_dev)</div><div class='ctx'> 	net_dev-&gt;netdev_ops = &amp;dpaa2_eth_ops;</div><div class='ctx'> 	net_dev-&gt;ethtool_ops = &amp;dpaa2_ethtool_ops;</div><div class='ctx'> </div><div class='del'>-	err = set_mac_addr(priv);</div><div class='add'>+	err = dpaa2_eth_set_mac_addr(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3099,6 +4601,8 @@ static int netdev_init(struct net_device *net_dev)</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	dpaa2_eth_detect_features(priv);</div><div class='add'>+</div><div class='ctx'> 	/* Capabilities listing */</div><div class='ctx'> 	supported |= IFF_LIVE_ADDR_CHANGE;</div><div class='ctx'> </div><div class='hunk'>@@ -3109,24 +4613,35 @@ static int netdev_init(struct net_device *net_dev)</div><div class='ctx'> </div><div class='ctx'> 	net_dev-&gt;priv_flags |= supported;</div><div class='ctx'> 	net_dev-&gt;priv_flags &amp;= ~not_supported;</div><div class='add'>+	net_dev-&gt;lltx = true;</div><div class='ctx'> </div><div class='ctx'> 	/* Features */</div><div class='ctx'> 	net_dev-&gt;features = NETIF_F_RXCSUM |</div><div class='ctx'> 			    NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |</div><div class='ctx'> 			    NETIF_F_SG | NETIF_F_HIGHDMA |</div><div class='del'>-			    NETIF_F_LLTX;</div><div class='add'>+			    NETIF_F_HW_TC | NETIF_F_TSO;</div><div class='add'>+	net_dev-&gt;gso_max_segs = DPAA2_ETH_ENQUEUE_MAX_FDS;</div><div class='ctx'> 	net_dev-&gt;hw_features = net_dev-&gt;features;</div><div class='add'>+	net_dev-&gt;xdp_features = NETDEV_XDP_ACT_BASIC |</div><div class='add'>+				NETDEV_XDP_ACT_REDIRECT |</div><div class='add'>+				NETDEV_XDP_ACT_NDO_XMIT;</div><div class='add'>+	if (priv-&gt;dpni_attrs.wriop_version &gt;= DPAA2_WRIOP_VERSION(3, 0, 0) &amp;&amp;</div><div class='add'>+	    priv-&gt;dpni_attrs.num_queues &lt;= 8)</div><div class='add'>+		net_dev-&gt;xdp_features |= NETDEV_XDP_ACT_XSK_ZEROCOPY;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;dpni_attrs.vlan_filter_entries)</div><div class='add'>+		net_dev-&gt;hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER;</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int poll_link_state(void *arg)</div><div class='add'>+static int dpaa2_eth_poll_link_state(void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = (struct dpaa2_eth_priv *)arg;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	while (!kthread_should_stop()) {</div><div class='del'>-		err = link_state_update(priv);</div><div class='add'>+		err = dpaa2_eth_link_state_update(priv);</div><div class='ctx'> 		if (unlikely(err))</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='hunk'>@@ -3136,12 +4651,98 @@ static int poll_link_state(void *arg)</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa2_eth_connect_mac(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_device *dpni_dev, *dpmac_dev;</div><div class='add'>+	struct dpaa2_mac *mac;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dpni_dev = to_fsl_mc_device(priv-&gt;net_dev-&gt;dev.parent);</div><div class='add'>+	dpmac_dev = fsl_mc_get_endpoint(dpni_dev, 0);</div><div class='add'>+</div><div class='add'>+	if (PTR_ERR(dpmac_dev) == -EPROBE_DEFER) {</div><div class='add'>+		netdev_dbg(priv-&gt;net_dev, "waiting for mac\n");</div><div class='add'>+		return PTR_ERR(dpmac_dev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(dpmac_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dpmac_dev-&gt;dev.type != &amp;fsl_mc_bus_dpmac_type) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out_put_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac = kzalloc(sizeof(struct dpaa2_mac), GFP_KERNEL);</div><div class='add'>+	if (!mac) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_put_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac-&gt;mc_dev = dpmac_dev;</div><div class='add'>+	mac-&gt;mc_io = priv-&gt;mc_io;</div><div class='add'>+	mac-&gt;net_dev = priv-&gt;net_dev;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_mac_open(mac);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_mac;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_mac_is_type_phy(mac)) {</div><div class='add'>+		err = dpaa2_mac_connect(mac);</div><div class='add'>+		if (err) {</div><div class='add'>+			if (err == -EPROBE_DEFER)</div><div class='add'>+				netdev_dbg(priv-&gt;net_dev,</div><div class='add'>+					   "could not connect to MAC\n");</div><div class='add'>+			else</div><div class='add'>+				netdev_err(priv-&gt;net_dev,</div><div class='add'>+					   "Error connecting to the MAC endpoint: %pe",</div><div class='add'>+					   ERR_PTR(err));</div><div class='add'>+			goto err_close_mac;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+	priv-&gt;mac = mac;</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_close_mac:</div><div class='add'>+	dpaa2_mac_close(mac);</div><div class='add'>+err_free_mac:</div><div class='add'>+	kfree(mac);</div><div class='add'>+out_put_device:</div><div class='add'>+	put_device(&amp;dpmac_dev-&gt;dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_disconnect_mac(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_mac *mac;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+	mac = priv-&gt;mac;</div><div class='add'>+	priv-&gt;mac = NULL;</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (!mac)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_mac_is_type_phy(mac))</div><div class='add'>+		dpaa2_mac_disconnect(mac);</div><div class='add'>+</div><div class='add'>+	dpaa2_mac_close(mac);</div><div class='add'>+	kfree(mac);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)</div><div class='ctx'> {</div><div class='ctx'> 	u32 status = ~0;</div><div class='ctx'> 	struct device *dev = (struct device *)arg;</div><div class='ctx'> 	struct fsl_mc_device *dpni_dev = to_fsl_mc_device(dev);</div><div class='ctx'> 	struct net_device *net_dev = dev_get_drvdata(dev);</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	bool had_mac;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_get_irq_status(dpni_dev-&gt;mc_io, 0, dpni_dev-&gt;mc_handle,</div><div class='hunk'>@@ -3152,12 +4753,27 @@ static irqreturn_t dpni_irq0_handler_thread(int irq_num, void *arg)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (status &amp; DPNI_IRQ_EVENT_LINK_CHANGED)</div><div class='del'>-		link_state_update(netdev_priv(net_dev));</div><div class='add'>+		dpaa2_eth_link_state_update(netdev_priv(net_dev));</div><div class='add'>+</div><div class='add'>+	if (status &amp; DPNI_IRQ_EVENT_ENDPOINT_CHANGED) {</div><div class='add'>+		dpaa2_eth_set_mac_addr(netdev_priv(net_dev));</div><div class='add'>+		dpaa2_eth_update_tx_fqids(priv);</div><div class='add'>+</div><div class='add'>+		/* We can avoid locking because the "endpoint changed" IRQ</div><div class='add'>+		 * handler is the only one who changes priv-&gt;mac at runtime,</div><div class='add'>+		 * so we are not racing with anyone.</div><div class='add'>+		 */</div><div class='add'>+		had_mac = !!priv-&gt;mac;</div><div class='add'>+		if (had_mac)</div><div class='add'>+			dpaa2_eth_disconnect_mac(priv);</div><div class='add'>+		else</div><div class='add'>+			dpaa2_eth_connect_mac(priv);</div><div class='add'>+	}</div><div class='ctx'> </div><div class='ctx'> 	return IRQ_HANDLED;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int setup_irqs(struct fsl_mc_device *ls_dev)</div><div class='add'>+static int dpaa2_eth_setup_irqs(struct fsl_mc_device *ls_dev)</div><div class='ctx'> {</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> 	struct fsl_mc_device_irq *irq;</div><div class='hunk'>@@ -3169,7 +4785,7 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	irq = ls_dev-&gt;irqs[0];</div><div class='del'>-	err = devm_request_threaded_irq(&amp;ls_dev-&gt;dev, irq-&gt;msi_desc-&gt;irq,</div><div class='add'>+	err = devm_request_threaded_irq(&amp;ls_dev-&gt;dev, irq-&gt;virq,</div><div class='ctx'> 					NULL, dpni_irq0_handler_thread,</div><div class='ctx'> 					IRQF_NO_SUSPEND | IRQF_ONESHOT,</div><div class='ctx'> 					dev_name(&amp;ls_dev-&gt;dev), &amp;ls_dev-&gt;dev);</div><div class='hunk'>@@ -3179,7 +4795,8 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_set_irq_mask(ls_dev-&gt;mc_io, 0, ls_dev-&gt;mc_handle,</div><div class='del'>-				DPNI_IRQ_INDEX, DPNI_IRQ_EVENT_LINK_CHANGED);</div><div class='add'>+				DPNI_IRQ_INDEX, DPNI_IRQ_EVENT_LINK_CHANGED |</div><div class='add'>+				DPNI_IRQ_EVENT_ENDPOINT_CHANGED);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(&amp;ls_dev-&gt;dev, "dpni_set_irq_mask(): %d\n", err);</div><div class='ctx'> 		goto free_irq;</div><div class='hunk'>@@ -3195,14 +4812,14 @@ static int setup_irqs(struct fsl_mc_device *ls_dev)</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> free_irq:</div><div class='del'>-	devm_free_irq(&amp;ls_dev-&gt;dev, irq-&gt;msi_desc-&gt;irq, &amp;ls_dev-&gt;dev);</div><div class='add'>+	devm_free_irq(&amp;ls_dev-&gt;dev, irq-&gt;virq, &amp;ls_dev-&gt;dev);</div><div class='ctx'> free_mc_irq:</div><div class='ctx'> 	fsl_mc_free_irqs(ls_dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void add_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_add_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='hunk'>@@ -3210,12 +4827,11 @@ static void add_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='ctx'> 		ch = priv-&gt;channel[i];</div><div class='ctx'> 		/* NAPI weight *MUST* be a multiple of DPAA2_ETH_STORE_SIZE */</div><div class='del'>-		netif_napi_add(priv-&gt;net_dev, &amp;ch-&gt;napi, dpaa2_eth_poll,</div><div class='del'>-			       NAPI_POLL_WEIGHT);</div><div class='add'>+		netif_napi_add(priv-&gt;net_dev, &amp;ch-&gt;napi, dpaa2_eth_poll);</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static void del_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='add'>+static void dpaa2_eth_del_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i;</div><div class='ctx'> 	struct dpaa2_eth_channel *ch;</div><div class='hunk'>@@ -3226,6 +4842,17 @@ static void del_ch_napi(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static void dpaa2_eth_free_rx_xdp_rxq(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_fqs; i++) {</div><div class='add'>+		if (priv-&gt;fq[i].type == DPAA2_RX_FQ &amp;&amp;</div><div class='add'>+		    xdp_rxq_info_is_reg(&amp;priv-&gt;fq[i].channel-&gt;xdp_rxq))</div><div class='add'>+			xdp_rxq_info_unreg(&amp;priv-&gt;fq[i].channel-&gt;xdp_rxq);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='hunk'>@@ -3236,7 +4863,7 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)</div><div class='ctx'> 	dev = &amp;dpni_dev-&gt;dev;</div><div class='ctx'> </div><div class='ctx'> 	/* Net device */</div><div class='del'>-	net_dev = alloc_etherdev_mq(sizeof(*priv), DPAA2_ETH_MAX_TX_QUEUES);</div><div class='add'>+	net_dev = alloc_etherdev_mq(sizeof(*priv), DPAA2_ETH_MAX_NETDEV_QUEUES);</div><div class='ctx'> 	if (!net_dev) {</div><div class='ctx'> 		dev_err(dev, "alloc_etherdev_mq() failed\n");</div><div class='ctx'> 		return -ENOMEM;</div><div class='hunk'>@@ -3247,41 +4874,61 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)</div><div class='ctx'> </div><div class='ctx'> 	priv = netdev_priv(net_dev);</div><div class='ctx'> 	priv-&gt;net_dev = net_dev;</div><div class='add'>+	SET_NETDEV_DEVLINK_PORT(net_dev, &amp;priv-&gt;devlink_port);</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;priv-&gt;mac_lock);</div><div class='ctx'> </div><div class='ctx'> 	priv-&gt;iommu_domain = iommu_get_domain_for_dev(dev);</div><div class='ctx'> </div><div class='add'>+	priv-&gt;tx_tstamp_type = HWTSTAMP_TX_OFF;</div><div class='add'>+	priv-&gt;rx_tstamp = false;</div><div class='add'>+</div><div class='add'>+	priv-&gt;dpaa2_ptp_wq = alloc_workqueue("dpaa2_ptp_wq", WQ_PERCPU, 0);</div><div class='add'>+	if (!priv-&gt;dpaa2_ptp_wq) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_wq_alloc;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;priv-&gt;tx_onestep_tstamp, dpaa2_eth_tx_onestep_tstamp);</div><div class='add'>+	mutex_init(&amp;priv-&gt;onestep_tstamp_lock);</div><div class='add'>+	skb_queue_head_init(&amp;priv-&gt;tx_skbs);</div><div class='add'>+</div><div class='add'>+	priv-&gt;rx_copybreak = DPAA2_ETH_DEFAULT_COPYBREAK;</div><div class='add'>+</div><div class='ctx'> 	/* Obtain a MC portal */</div><div class='ctx'> 	err = fsl_mc_portal_allocate(dpni_dev, FSL_MC_IO_ATOMIC_CONTEXT_PORTAL,</div><div class='ctx'> 				     &amp;priv-&gt;mc_io);</div><div class='ctx'> 	if (err) {</div><div class='del'>-		if (err == -ENXIO)</div><div class='add'>+		if (err == -ENXIO) {</div><div class='add'>+			dev_dbg(dev, "waiting for MC portal\n");</div><div class='ctx'> 			err = -EPROBE_DEFER;</div><div class='del'>-		else</div><div class='add'>+		} else {</div><div class='ctx'> 			dev_err(dev, "MC portal allocation failed\n");</div><div class='add'>+		}</div><div class='ctx'> 		goto err_portal_alloc;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	/* MC objects initialization and configuration */</div><div class='del'>-	err = setup_dpni(dpni_dev);</div><div class='add'>+	err = dpaa2_eth_setup_dpni(dpni_dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_dpni_setup;</div><div class='ctx'> </div><div class='del'>-	err = setup_dpio(priv);</div><div class='add'>+	err = dpaa2_eth_setup_dpio(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_dpio_setup;</div><div class='ctx'> </div><div class='del'>-	setup_fqs(priv);</div><div class='add'>+	dpaa2_eth_setup_fqs(priv);</div><div class='ctx'> </div><div class='del'>-	err = setup_dpbp(priv);</div><div class='add'>+	err = dpaa2_eth_setup_default_dpbp(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_dpbp_setup;</div><div class='ctx'> </div><div class='del'>-	err = bind_dpni(priv);</div><div class='add'>+	err = dpaa2_eth_bind_dpni(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_bind;</div><div class='ctx'> </div><div class='ctx'> 	/* Add a NAPI context for each channel */</div><div class='del'>-	add_ch_napi(priv);</div><div class='add'>+	dpaa2_eth_add_ch_napi(priv);</div><div class='ctx'> </div><div class='ctx'> 	/* Percpu statistics */</div><div class='ctx'> 	priv-&gt;percpu_stats = alloc_percpu(*priv-&gt;percpu_stats);</div><div class='hunk'>@@ -3297,28 +4944,55 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)</div><div class='ctx'> 		goto err_alloc_percpu_extras;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	err = netdev_init(net_dev);</div><div class='add'>+	priv-&gt;sgt_cache = alloc_percpu(*priv-&gt;sgt_cache);</div><div class='add'>+	if (!priv-&gt;sgt_cache) {</div><div class='add'>+		dev_err(dev, "alloc_percpu(sgt_cache) failed\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_alloc_sgt_cache;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	priv-&gt;fd = alloc_percpu(*priv-&gt;fd);</div><div class='add'>+	if (!priv-&gt;fd) {</div><div class='add'>+		dev_err(dev, "alloc_percpu(fds) failed\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_alloc_fds;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_netdev_init(net_dev);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_netdev_init;</div><div class='ctx'> </div><div class='ctx'> 	/* Configure checksum offload based on current interface flags */</div><div class='del'>-	err = set_rx_csum(priv, !!(net_dev-&gt;features &amp; NETIF_F_RXCSUM));</div><div class='add'>+	err = dpaa2_eth_set_rx_csum(priv, !!(net_dev-&gt;features &amp; NETIF_F_RXCSUM));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_csum;</div><div class='ctx'> </div><div class='del'>-	err = set_tx_csum(priv, !!(net_dev-&gt;features &amp;</div><div class='del'>-				   (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)));</div><div class='add'>+	err = dpaa2_eth_set_tx_csum(priv,</div><div class='add'>+				    !!(net_dev-&gt;features &amp; (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)));</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_csum;</div><div class='ctx'> </div><div class='del'>-	err = alloc_rings(priv);</div><div class='add'>+	err = dpaa2_eth_alloc_rings(priv);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto err_alloc_rings;</div><div class='ctx'> </div><div class='del'>-	err = setup_irqs(dpni_dev);</div><div class='add'>+#ifdef CONFIG_FSL_DPAA2_ETH_DCB</div><div class='add'>+	if (dpaa2_eth_has_pause_support(priv) &amp;&amp; priv-&gt;vlan_cls_enabled) {</div><div class='add'>+		priv-&gt;dcbx_mode = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;</div><div class='add'>+		net_dev-&gt;dcbnl_ops = &amp;dpaa2_eth_dcbnl_ops;</div><div class='add'>+	} else {</div><div class='add'>+		dev_dbg(dev, "PFC not supported\n");</div><div class='add'>+	}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_connect_mac(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_connect_mac;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_setup_irqs(dpni_dev);</div><div class='ctx'> 	if (err) {</div><div class='ctx'> 		netdev_warn(net_dev, "Failed to set link interrupt, fall back to polling\n");</div><div class='del'>-		priv-&gt;poll_thread = kthread_run(poll_link_state, priv,</div><div class='add'>+		priv-&gt;poll_thread = kthread_run(dpaa2_eth_poll_link_state, priv,</div><div class='ctx'> 						"%s_poll_link", net_dev-&gt;name);</div><div class='ctx'> 		if (IS_ERR(priv-&gt;poll_thread)) {</div><div class='ctx'> 			dev_err(dev, "Error starting polling thread\n");</div><div class='hunk'>@@ -3327,6 +5001,20 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)</div><div class='ctx'> 		priv-&gt;do_link_poll = true;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='add'>+	err = dpaa2_eth_dl_alloc(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_dl_register;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_dl_traps_register(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_dl_trap_register;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_eth_dl_port_add(priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_dl_port_add;</div><div class='add'>+</div><div class='add'>+	net_dev-&gt;needed_headroom = DPAA2_ETH_SWA_SIZE + DPAA2_ETH_TX_BUF_ALIGN;</div><div class='add'>+</div><div class='ctx'> 	err = register_netdev(net_dev);</div><div class='ctx'> 	if (err &lt; 0) {</div><div class='ctx'> 		dev_err(dev, "register_netdev() failed\n");</div><div class='hunk'>@@ -3337,40 +5025,56 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev)</div><div class='ctx'> 	dpaa2_dbg_add(priv);</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+	dpaa2_eth_dl_register(priv);</div><div class='ctx'> 	dev_info(dev, "Probed interface %s\n", net_dev-&gt;name);</div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='ctx'> err_netdev_reg:</div><div class='add'>+	dpaa2_eth_dl_port_del(priv);</div><div class='add'>+err_dl_port_add:</div><div class='add'>+	dpaa2_eth_dl_traps_unregister(priv);</div><div class='add'>+err_dl_trap_register:</div><div class='add'>+	dpaa2_eth_dl_free(priv);</div><div class='add'>+err_dl_register:</div><div class='ctx'> 	if (priv-&gt;do_link_poll)</div><div class='ctx'> 		kthread_stop(priv-&gt;poll_thread);</div><div class='ctx'> 	else</div><div class='ctx'> 		fsl_mc_free_irqs(dpni_dev);</div><div class='ctx'> err_poll_thread:</div><div class='del'>-	free_rings(priv);</div><div class='add'>+	dpaa2_eth_disconnect_mac(priv);</div><div class='add'>+err_connect_mac:</div><div class='add'>+	dpaa2_eth_free_rings(priv);</div><div class='ctx'> err_alloc_rings:</div><div class='ctx'> err_csum:</div><div class='ctx'> err_netdev_init:</div><div class='add'>+	free_percpu(priv-&gt;fd);</div><div class='add'>+err_alloc_fds:</div><div class='add'>+	free_percpu(priv-&gt;sgt_cache);</div><div class='add'>+err_alloc_sgt_cache:</div><div class='ctx'> 	free_percpu(priv-&gt;percpu_extras);</div><div class='ctx'> err_alloc_percpu_extras:</div><div class='ctx'> 	free_percpu(priv-&gt;percpu_stats);</div><div class='ctx'> err_alloc_percpu_stats:</div><div class='del'>-	del_ch_napi(priv);</div><div class='add'>+	dpaa2_eth_del_ch_napi(priv);</div><div class='add'>+	dpaa2_eth_free_rx_xdp_rxq(priv);</div><div class='ctx'> err_bind:</div><div class='del'>-	free_dpbp(priv);</div><div class='add'>+	dpaa2_eth_free_dpbps(priv);</div><div class='ctx'> err_dpbp_setup:</div><div class='del'>-	free_dpio(priv);</div><div class='add'>+	dpaa2_eth_free_dpio(priv);</div><div class='ctx'> err_dpio_setup:</div><div class='del'>-	free_dpni(priv);</div><div class='add'>+	dpaa2_eth_free_dpni(priv);</div><div class='ctx'> err_dpni_setup:</div><div class='ctx'> 	fsl_mc_portal_free(priv-&gt;mc_io);</div><div class='ctx'> err_portal_alloc:</div><div class='add'>+	destroy_workqueue(priv-&gt;dpaa2_ptp_wq);</div><div class='add'>+err_wq_alloc:</div><div class='ctx'> 	dev_set_drvdata(dev, NULL);</div><div class='ctx'> 	free_netdev(net_dev);</div><div class='ctx'> </div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)</div><div class='add'>+static void dpaa2_eth_remove(struct fsl_mc_device *ls_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev;</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='hunk'>@@ -3380,32 +5084,45 @@ static int dpaa2_eth_remove(struct fsl_mc_device *ls_dev)</div><div class='ctx'> 	net_dev = dev_get_drvdata(dev);</div><div class='ctx'> 	priv = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='add'>+	dpaa2_eth_dl_unregister(priv);</div><div class='add'>+</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	dpaa2_dbg_remove(priv);</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='ctx'> 	unregister_netdev(net_dev);</div><div class='ctx'> </div><div class='add'>+	dpaa2_eth_dl_port_del(priv);</div><div class='add'>+	dpaa2_eth_dl_traps_unregister(priv);</div><div class='add'>+	dpaa2_eth_dl_free(priv);</div><div class='add'>+</div><div class='ctx'> 	if (priv-&gt;do_link_poll)</div><div class='ctx'> 		kthread_stop(priv-&gt;poll_thread);</div><div class='ctx'> 	else</div><div class='ctx'> 		fsl_mc_free_irqs(ls_dev);</div><div class='ctx'> </div><div class='del'>-	free_rings(priv);</div><div class='add'>+	dpaa2_eth_disconnect_mac(priv);</div><div class='add'>+	dpaa2_eth_free_rings(priv);</div><div class='add'>+	free_percpu(priv-&gt;fd);</div><div class='add'>+	free_percpu(priv-&gt;sgt_cache);</div><div class='ctx'> 	free_percpu(priv-&gt;percpu_stats);</div><div class='ctx'> 	free_percpu(priv-&gt;percpu_extras);</div><div class='ctx'> </div><div class='del'>-	del_ch_napi(priv);</div><div class='del'>-	free_dpbp(priv);</div><div class='del'>-	free_dpio(priv);</div><div class='del'>-	free_dpni(priv);</div><div class='add'>+	dpaa2_eth_del_ch_napi(priv);</div><div class='add'>+	dpaa2_eth_free_rx_xdp_rxq(priv);</div><div class='add'>+	dpaa2_eth_free_dpbps(priv);</div><div class='add'>+	dpaa2_eth_free_dpio(priv);</div><div class='add'>+	dpaa2_eth_free_dpni(priv);</div><div class='add'>+	if (priv-&gt;onestep_reg_base)</div><div class='add'>+		iounmap(priv-&gt;onestep_reg_base);</div><div class='ctx'> </div><div class='ctx'> 	fsl_mc_portal_free(priv-&gt;mc_io);</div><div class='ctx'> </div><div class='del'>-	free_netdev(net_dev);</div><div class='add'>+	destroy_workqueue(priv-&gt;dpaa2_ptp_wq);</div><div class='ctx'> </div><div class='ctx'> 	dev_dbg(net_dev-&gt;dev.parent, "Removed interface %s\n", net_dev-&gt;name);</div><div class='ctx'> </div><div class='del'>-	return 0;</div><div class='add'>+	free_netdev(net_dev);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fsl_mc_device_id dpaa2_eth_match_id_table[] = {</div><div class='hunk'>@@ -3420,7 +5137,6 @@ MODULE_DEVICE_TABLE(fslmc, dpaa2_eth_match_id_table);</div><div class='ctx'> static struct fsl_mc_driver dpaa2_eth_driver = {</div><div class='ctx'> 	.driver = {</div><div class='ctx'> 		.name = KBUILD_MODNAME,</div><div class='del'>-		.owner = THIS_MODULE,</div><div class='ctx'> 	},</div><div class='ctx'> 	.probe = dpaa2_eth_probe,</div><div class='ctx'> 	.remove = dpaa2_eth_remove,</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h<br/>index e180d5a68c98..834cba8c3a41 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h</a></div><div class='hunk'>@@ -1,14 +1,18 @@</div><div class='ctx'> /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='ctx'> /* Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='del'>- * Copyright 2016 NXP</div><div class='add'>+ * Copyright 2016-2022 NXP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __DPAA2_ETH_H</div><div class='ctx'> #define __DPAA2_ETH_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/dcbnl.h&gt;</div><div class='ctx'> #include &lt;linux/netdevice.h&gt;</div><div class='ctx'> #include &lt;linux/if_vlan.h&gt;</div><div class='ctx'> #include &lt;linux/fsl/mc.h&gt;</div><div class='add'>+#include &lt;linux/net_tstamp.h&gt;</div><div class='add'>+#include &lt;net/devlink.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include &lt;soc/fsl/dpaa2-io.h&gt;</div><div class='ctx'> #include &lt;soc/fsl/dpaa2-fd.h&gt;</div><div class='hunk'>@@ -17,6 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> #include "dpaa2-eth-trace.h"</div><div class='ctx'> #include "dpaa2-eth-debugfs.h"</div><div class='add'>+#include "dpaa2-mac.h"</div><div class='ctx'> </div><div class='ctx'> #define DPAA2_WRIOP_VERSION(x, y, z) ((x) &lt;&lt; 10 | (y) &lt;&lt; 5 | (z) &lt;&lt; 0)</div><div class='ctx'> </div><div class='hunk'>@@ -35,27 +40,55 @@</div><div class='ctx'> /* Convert L3 MTU to L2 MFL */</div><div class='ctx'> #define DPAA2_ETH_L2_MAX_FRM(mtu)	((mtu) + VLAN_ETH_HLEN)</div><div class='ctx'> </div><div class='del'>-/* Set the taildrop threshold (in bytes) to allow the enqueue of several jumbo</div><div class='del'>- * frames in the Rx queues (length of the current frame is not</div><div class='del'>- * taken into account when making the taildrop decision)</div><div class='add'>+/* Set the taildrop threshold (in bytes) to allow the enqueue of a large</div><div class='add'>+ * enough number of jumbo frames in the Rx queues (length of the current</div><div class='add'>+ * frame is not taken into account when making the taildrop decision)</div><div class='ctx'>  */</div><div class='del'>-#define DPAA2_ETH_TAILDROP_THRESH	(64 * 1024)</div><div class='add'>+#define DPAA2_ETH_FQ_TAILDROP_THRESH	(1024 * 1024)</div><div class='add'>+</div><div class='add'>+/* Maximum burst size value for Tx shaping */</div><div class='add'>+#define DPAA2_ETH_MAX_BURST_SIZE	0xF7FF</div><div class='ctx'> </div><div class='ctx'> /* Maximum number of Tx confirmation frames to be processed</div><div class='ctx'>  * in a single NAPI call</div><div class='ctx'>  */</div><div class='ctx'> #define DPAA2_ETH_TXCONF_PER_NAPI	256</div><div class='ctx'> </div><div class='del'>-/* Buffer quota per queue. Must be large enough such that for minimum sized</div><div class='del'>- * frames taildrop kicks in before the bpool gets depleted, so we compute</div><div class='del'>- * how many 64B frames fit inside the taildrop threshold and add a margin</div><div class='del'>- * to accommodate the buffer refill delay.</div><div class='add'>+/* Maximum number of Tx frames to be processed in a single NAPI</div><div class='add'>+ * call when AF_XDP is running. Bind it to DPAA2_ETH_TXCONF_PER_NAPI</div><div class='add'>+ * to maximize the throughput.</div><div class='add'>+ */</div><div class='add'>+#define DPAA2_ETH_TX_ZC_PER_NAPI	DPAA2_ETH_TXCONF_PER_NAPI</div><div class='add'>+</div><div class='add'>+/* Buffer qouta per channel. We want to keep in check number of ingress frames</div><div class='add'>+ * in flight: for small sized frames, congestion group taildrop may kick in</div><div class='add'>+ * first; for large sizes, Rx FQ taildrop threshold will ensure only a</div><div class='add'>+ * reasonable number of frames will be pending at any given time.</div><div class='add'>+ * Ingress frame drop due to buffer pool depletion should be a corner case only</div><div class='ctx'>  */</div><div class='del'>-#define DPAA2_ETH_MAX_FRAMES_PER_QUEUE	(DPAA2_ETH_TAILDROP_THRESH / 64)</div><div class='del'>-#define DPAA2_ETH_NUM_BUFS		(DPAA2_ETH_MAX_FRAMES_PER_QUEUE + 256)</div><div class='add'>+#define DPAA2_ETH_NUM_BUFS		1280</div><div class='ctx'> #define DPAA2_ETH_REFILL_THRESH \</div><div class='ctx'> 	(DPAA2_ETH_NUM_BUFS - DPAA2_ETH_BUFS_PER_CMD)</div><div class='ctx'> </div><div class='add'>+/* Congestion group taildrop threshold: number of frames allowed to accumulate</div><div class='add'>+ * at any moment in a group of Rx queues belonging to the same traffic class.</div><div class='add'>+ * Choose value such that we don't risk depleting the buffer pool before the</div><div class='add'>+ * taildrop kicks in</div><div class='add'>+ */</div><div class='add'>+#define DPAA2_ETH_CG_TAILDROP_THRESH(priv)				\</div><div class='add'>+	(1024 * dpaa2_eth_queue_count(priv) / dpaa2_eth_tc_count(priv))</div><div class='add'>+</div><div class='add'>+/* Congestion group notification threshold: when this many frames accumulate</div><div class='add'>+ * on the Rx queues belonging to the same TC, the MAC is instructed to send</div><div class='add'>+ * PFC frames for that TC.</div><div class='add'>+ * When number of pending frames drops below exit threshold transmission of</div><div class='add'>+ * PFC frames is stopped.</div><div class='add'>+ */</div><div class='add'>+#define DPAA2_ETH_CN_THRESH_ENTRY(priv) \</div><div class='add'>+	(DPAA2_ETH_CG_TAILDROP_THRESH(priv) / 2)</div><div class='add'>+#define DPAA2_ETH_CN_THRESH_EXIT(priv) \</div><div class='add'>+	(DPAA2_ETH_CN_THRESH_ENTRY(priv) * 3 / 4)</div><div class='add'>+</div><div class='ctx'> /* Maximum number of buffers that can be acquired/released through a single</div><div class='ctx'>  * QBMan command</div><div class='ctx'>  */</div><div class='hunk'>@@ -83,6 +116,14 @@</div><div class='ctx'> #define DPAA2_ETH_RX_BUF_ALIGN_REV1	256</div><div class='ctx'> #define DPAA2_ETH_RX_BUF_ALIGN		64</div><div class='ctx'> </div><div class='add'>+/* The firmware allows assigning multiple buffer pools to a single DPNI -</div><div class='add'>+ * maximum 8 DPBP objects. By default, only the first DPBP (idx 0) is used for</div><div class='add'>+ * all queues. Thus, when enabling AF_XDP we must accommodate up to 9 DPBPs</div><div class='add'>+ * object: the default and 8 other distinct buffer pools, one for each queue.</div><div class='add'>+ */</div><div class='add'>+#define DPAA2_ETH_DEFAULT_BP_IDX	0</div><div class='add'>+#define DPAA2_ETH_MAX_BPS		9</div><div class='add'>+</div><div class='ctx'> /* We are accommodating a skb backpointer and some S/G info</div><div class='ctx'>  * in the frame's software annotation. The hardware</div><div class='ctx'>  * options are either 0 or 64, so we choose the latter.</div><div class='hunk'>@@ -96,6 +137,8 @@ enum dpaa2_eth_swa_type {</div><div class='ctx'> 	DPAA2_ETH_SWA_SINGLE,</div><div class='ctx'> 	DPAA2_ETH_SWA_SG,</div><div class='ctx'> 	DPAA2_ETH_SWA_XDP,</div><div class='add'>+	DPAA2_ETH_SWA_XSK,</div><div class='add'>+	DPAA2_ETH_SWA_SW_TSO,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /* Must keep this struct smaller than DPAA2_ETH_SWA_SIZE */</div><div class='hunk'>@@ -104,6 +147,7 @@ struct dpaa2_eth_swa {</div><div class='ctx'> 	union {</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct sk_buff *skb;</div><div class='add'>+			int sgt_size;</div><div class='ctx'> 		} single;</div><div class='ctx'> 		struct {</div><div class='ctx'> 			struct sk_buff *skb;</div><div class='hunk'>@@ -115,6 +159,16 @@ struct dpaa2_eth_swa {</div><div class='ctx'> 			int dma_size;</div><div class='ctx'> 			struct xdp_frame *xdpf;</div><div class='ctx'> 		} xdp;</div><div class='add'>+		struct {</div><div class='add'>+			struct xdp_buff *xdp_buff;</div><div class='add'>+			int sgt_size;</div><div class='add'>+		} xsk;</div><div class='add'>+		struct {</div><div class='add'>+			struct sk_buff *skb;</div><div class='add'>+			int num_sg;</div><div class='add'>+			int sgt_size;</div><div class='add'>+			int is_last_fd;</div><div class='add'>+		} tso;</div><div class='ctx'> 	};</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -155,6 +209,49 @@ struct dpaa2_fas {</div><div class='ctx'>  */</div><div class='ctx'> #define DPAA2_TS_OFFSET			0x8</div><div class='ctx'> </div><div class='add'>+/* Frame annotation parse results */</div><div class='add'>+struct dpaa2_fapr {</div><div class='add'>+	/* 64-bit word 1 */</div><div class='add'>+	__le32 faf_lo;</div><div class='add'>+	__le16 faf_ext;</div><div class='add'>+	__le16 nxt_hdr;</div><div class='add'>+	/* 64-bit word 2 */</div><div class='add'>+	__le64 faf_hi;</div><div class='add'>+	/* 64-bit word 3 */</div><div class='add'>+	u8 last_ethertype_offset;</div><div class='add'>+	u8 vlan_tci_offset_n;</div><div class='add'>+	u8 vlan_tci_offset_1;</div><div class='add'>+	u8 llc_snap_offset;</div><div class='add'>+	u8 eth_offset;</div><div class='add'>+	u8 ip1_pid_offset;</div><div class='add'>+	u8 shim_offset_2;</div><div class='add'>+	u8 shim_offset_1;</div><div class='add'>+	/* 64-bit word 4 */</div><div class='add'>+	u8 l5_offset;</div><div class='add'>+	u8 l4_offset;</div><div class='add'>+	u8 gre_offset;</div><div class='add'>+	u8 l3_offset_n;</div><div class='add'>+	u8 l3_offset_1;</div><div class='add'>+	u8 mpls_offset_n;</div><div class='add'>+	u8 mpls_offset_1;</div><div class='add'>+	u8 pppoe_offset;</div><div class='add'>+	/* 64-bit word 5 */</div><div class='add'>+	__le16 running_sum;</div><div class='add'>+	__le16 gross_running_sum;</div><div class='add'>+	u8 ipv6_frag_offset;</div><div class='add'>+	u8 nxt_hdr_offset;</div><div class='add'>+	u8 routing_hdr_offset_2;</div><div class='add'>+	u8 routing_hdr_offset_1;</div><div class='add'>+	/* 64-bit word 6 */</div><div class='add'>+	u8 reserved[5]; /* Soft-parsing context */</div><div class='add'>+	u8 ip_proto_offset_n;</div><div class='add'>+	u8 nxt_hdr_frag_offset;</div><div class='add'>+	u8 parse_error_code;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPAA2_FAPR_OFFSET		0x10</div><div class='add'>+#define DPAA2_FAPR_SIZE			sizeof((struct dpaa2_fapr))</div><div class='add'>+</div><div class='ctx'> /* Frame annotation egress action descriptor */</div><div class='ctx'> #define DPAA2_FAEAD_OFFSET		0x58</div><div class='ctx'> </div><div class='hunk'>@@ -169,6 +266,24 @@ struct dpaa2_faead {</div><div class='ctx'> #define DPAA2_FAEAD_EBDDV		0x00002000</div><div class='ctx'> #define DPAA2_FAEAD_UPD			0x00000010</div><div class='ctx'> </div><div class='add'>+struct ptp_tstamp {</div><div class='add'>+	u16 sec_msb;</div><div class='add'>+	u32 sec_lsb;</div><div class='add'>+	u32 nsec;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline void ns_to_ptp_tstamp(struct ptp_tstamp *tstamp, u64 ns)</div><div class='add'>+{</div><div class='add'>+	u64 sec, nsec;</div><div class='add'>+</div><div class='add'>+	sec = ns;</div><div class='add'>+	nsec = do_div(sec, 1000000000);</div><div class='add'>+</div><div class='add'>+	tstamp-&gt;sec_lsb = sec &amp; 0xFFFFFFFF;</div><div class='add'>+	tstamp-&gt;sec_msb = (sec &gt;&gt; 32) &amp; 0xFFFF;</div><div class='add'>+	tstamp-&gt;nsec = nsec;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> /* Accessors for the hardware annotation fields that we use */</div><div class='ctx'> static inline void *dpaa2_get_hwa(void *buf_addr, bool swa)</div><div class='ctx'> {</div><div class='hunk'>@@ -185,6 +300,11 @@ static inline __le64 *dpaa2_get_ts(void *buf_addr, bool swa)</div><div class='ctx'> 	return dpaa2_get_hwa(buf_addr, swa) + DPAA2_TS_OFFSET;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline struct dpaa2_fapr *dpaa2_get_fapr(void *buf_addr, bool swa)</div><div class='add'>+{</div><div class='add'>+	return dpaa2_get_hwa(buf_addr, swa) + DPAA2_FAPR_OFFSET;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static inline struct dpaa2_faead *dpaa2_get_faead(void *buf_addr, bool swa)</div><div class='ctx'> {</div><div class='ctx'> 	return dpaa2_get_hwa(buf_addr, swa) + DPAA2_FAEAD_OFFSET;</div><div class='hunk'>@@ -245,6 +365,14 @@ static inline struct dpaa2_faead *dpaa2_get_faead(void *buf_addr, bool swa)</div><div class='ctx'>  */</div><div class='ctx'> #define DPAA2_ETH_ENQUEUE_RETRIES	10</div><div class='ctx'> </div><div class='add'>+/* Number of times to retry DPIO portal operations while waiting</div><div class='add'>+ * for portal to finish executing current command and become</div><div class='add'>+ * available. We want to avoid being stuck in a while loop in case</div><div class='add'>+ * hardware becomes unresponsive, but not give up too easily if</div><div class='add'>+ * the portal really is busy for valid reasons</div><div class='add'>+ */</div><div class='add'>+#define DPAA2_ETH_SWP_BUSY_RETRIES	1000</div><div class='add'>+</div><div class='ctx'> /* Driver statistics, other than those in struct rtnl_link_stats64.</div><div class='ctx'>  * These are usually collected per-CPU and aggregated by ethtool.</div><div class='ctx'>  */</div><div class='hunk'>@@ -253,9 +381,13 @@ struct dpaa2_eth_drv_stats {</div><div class='ctx'> 	__u64	tx_conf_bytes;</div><div class='ctx'> 	__u64	tx_sg_frames;</div><div class='ctx'> 	__u64	tx_sg_bytes;</div><div class='del'>-	__u64	tx_reallocs;</div><div class='add'>+	__u64	tx_tso_frames;</div><div class='add'>+	__u64	tx_tso_bytes;</div><div class='ctx'> 	__u64	rx_sg_frames;</div><div class='ctx'> 	__u64	rx_sg_bytes;</div><div class='add'>+	/* Linear skbs sent as a S/G FD due to insufficient headroom */</div><div class='add'>+	__u64	tx_converted_sg_frames;</div><div class='add'>+	__u64	tx_converted_sg_bytes;</div><div class='ctx'> 	/* Enqueues retried due to portal busy */</div><div class='ctx'> 	__u64	tx_portal_busy;</div><div class='ctx'> };</div><div class='hunk'>@@ -279,48 +411,78 @@ struct dpaa2_eth_ch_stats {</div><div class='ctx'> 	__u64 xdp_tx;</div><div class='ctx'> 	__u64 xdp_tx_err;</div><div class='ctx'> 	__u64 xdp_redirect;</div><div class='add'>+	/* Must be last, does not show up in ethtool stats */</div><div class='add'>+	__u64 frames;</div><div class='add'>+	__u64 frames_per_cdan;</div><div class='add'>+	__u64 bytes_per_cdan;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DPAA2_ETH_CH_STATS	7</div><div class='add'>+</div><div class='ctx'> /* Maximum number of queues associated with a DPNI */</div><div class='del'>-#define DPAA2_ETH_MAX_RX_QUEUES		16</div><div class='add'>+#define DPAA2_ETH_MAX_TCS		8</div><div class='add'>+#define DPAA2_ETH_MAX_RX_QUEUES_PER_TC	16</div><div class='add'>+#define DPAA2_ETH_MAX_RX_QUEUES		\</div><div class='add'>+	(DPAA2_ETH_MAX_RX_QUEUES_PER_TC * DPAA2_ETH_MAX_TCS)</div><div class='ctx'> #define DPAA2_ETH_MAX_TX_QUEUES		16</div><div class='add'>+#define DPAA2_ETH_MAX_RX_ERR_QUEUES	1</div><div class='ctx'> #define DPAA2_ETH_MAX_QUEUES		(DPAA2_ETH_MAX_RX_QUEUES + \</div><div class='del'>-					DPAA2_ETH_MAX_TX_QUEUES)</div><div class='add'>+					DPAA2_ETH_MAX_TX_QUEUES + \</div><div class='add'>+					DPAA2_ETH_MAX_RX_ERR_QUEUES)</div><div class='add'>+#define DPAA2_ETH_MAX_NETDEV_QUEUES	\</div><div class='add'>+	(DPAA2_ETH_MAX_TX_QUEUES * DPAA2_ETH_MAX_TCS)</div><div class='ctx'> </div><div class='ctx'> #define DPAA2_ETH_MAX_DPCONS		16</div><div class='ctx'> </div><div class='ctx'> enum dpaa2_eth_fq_type {</div><div class='ctx'> 	DPAA2_RX_FQ = 0,</div><div class='ctx'> 	DPAA2_TX_CONF_FQ,</div><div class='add'>+	DPAA2_RX_ERR_FQ</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_eth_priv;</div><div class='add'>+struct dpaa2_eth_channel;</div><div class='add'>+struct dpaa2_eth_fq;</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_xdp_fds {</div><div class='add'>+	struct dpaa2_fd fds[DEV_MAP_BULK_SIZE];</div><div class='add'>+	ssize_t num;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+typedef void dpaa2_eth_consume_cb_t(struct dpaa2_eth_priv *priv,</div><div class='add'>+				    struct dpaa2_eth_channel *ch,</div><div class='add'>+				    const struct dpaa2_fd *fd,</div><div class='add'>+				    struct dpaa2_eth_fq *fq);</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_eth_fq {</div><div class='ctx'> 	u32 fqid;</div><div class='ctx'> 	u32 tx_qdbin;</div><div class='del'>-	u32 tx_fqid;</div><div class='add'>+	u32 tx_fqid[DPAA2_ETH_MAX_TCS];</div><div class='ctx'> 	u16 flowid;</div><div class='add'>+	u8 tc;</div><div class='ctx'> 	int target_cpu;</div><div class='ctx'> 	u32 dq_frames;</div><div class='ctx'> 	u32 dq_bytes;</div><div class='ctx'> 	struct dpaa2_eth_channel *channel;</div><div class='ctx'> 	enum dpaa2_eth_fq_type type;</div><div class='ctx'> </div><div class='del'>-	void (*consume)(struct dpaa2_eth_priv *priv,</div><div class='del'>-			struct dpaa2_eth_channel *ch,</div><div class='del'>-			const struct dpaa2_fd *fd,</div><div class='del'>-			struct dpaa2_eth_fq *fq);</div><div class='add'>+	dpaa2_eth_consume_cb_t *consume;</div><div class='ctx'> 	struct dpaa2_eth_fq_stats stats;</div><div class='add'>+</div><div class='add'>+	struct dpaa2_eth_xdp_fds xdp_redirect_fds;</div><div class='add'>+	struct dpaa2_eth_xdp_fds xdp_tx_fds;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_eth_ch_xdp {</div><div class='ctx'> 	struct bpf_prog *prog;</div><div class='del'>-	u64 drop_bufs[DPAA2_ETH_BUFS_PER_CMD];</div><div class='del'>-	int drop_cnt;</div><div class='ctx'> 	unsigned int res;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+struct dpaa2_eth_bp {</div><div class='add'>+	struct fsl_mc_device *dev;</div><div class='add'>+	int bpid;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dpaa2_eth_channel {</div><div class='ctx'> 	struct dpaa2_io_notification_ctx nctx;</div><div class='ctx'> 	struct fsl_mc_device *dpcon;</div><div class='hunk'>@@ -335,6 +497,15 @@ struct dpaa2_eth_channel {</div><div class='ctx'> 	struct dpaa2_eth_ch_xdp xdp;</div><div class='ctx'> 	struct xdp_rxq_info xdp_rxq;</div><div class='ctx'> 	struct list_head *rx_list;</div><div class='add'>+</div><div class='add'>+	/* Buffers to be recycled back in the buffer pool */</div><div class='add'>+	u64 recycled_bufs[DPAA2_ETH_BUFS_PER_CMD];</div><div class='add'>+	int recycled_bufs_cnt;</div><div class='add'>+</div><div class='add'>+	bool xsk_zc;</div><div class='add'>+	int xsk_tx_pkts_sent;</div><div class='add'>+	struct xsk_buff_pool *xsk_pool;</div><div class='add'>+	struct dpaa2_eth_bp *bp;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> struct dpaa2_eth_dist_fields {</div><div class='hunk'>@@ -350,6 +521,30 @@ struct dpaa2_eth_cls_rule {</div><div class='ctx'> 	u8 in_use;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DPAA2_ETH_SGT_CACHE_SIZE	256</div><div class='add'>+struct dpaa2_eth_sgt_cache {</div><div class='add'>+	void *buf[DPAA2_ETH_SGT_CACHE_SIZE];</div><div class='add'>+	u16 count;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_trap_item {</div><div class='add'>+	void *trap_ctx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_trap_data {</div><div class='add'>+	struct dpaa2_eth_trap_item *trap_items_arr;</div><div class='add'>+	struct dpaa2_eth_priv *priv;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPAA2_ETH_SG_ENTRIES_MAX	(PAGE_SIZE / sizeof(struct scatterlist))</div><div class='add'>+</div><div class='add'>+#define DPAA2_ETH_DEFAULT_COPYBREAK	512</div><div class='add'>+</div><div class='add'>+#define DPAA2_ETH_ENQUEUE_MAX_FDS	256</div><div class='add'>+struct dpaa2_eth_fds {</div><div class='add'>+	struct dpaa2_fd array[DPAA2_ETH_ENQUEUE_MAX_FDS];</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> /* Driver private data */</div><div class='ctx'> struct dpaa2_eth_priv {</div><div class='ctx'> 	struct net_device *net_dev;</div><div class='hunk'>@@ -358,22 +553,31 @@ struct dpaa2_eth_priv {</div><div class='ctx'> 	struct dpaa2_eth_fq fq[DPAA2_ETH_MAX_QUEUES];</div><div class='ctx'> 	int (*enqueue)(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 		       struct dpaa2_eth_fq *fq,</div><div class='del'>-		       struct dpaa2_fd *fd, u8 prio);</div><div class='add'>+		       struct dpaa2_fd *fd, u8 prio,</div><div class='add'>+		       u32 num_frames,</div><div class='add'>+		       int *frames_enqueued);</div><div class='ctx'> </div><div class='ctx'> 	u8 num_channels;</div><div class='ctx'> 	struct dpaa2_eth_channel *channel[DPAA2_ETH_MAX_DPCONS];</div><div class='del'>-</div><div class='add'>+	struct dpaa2_eth_sgt_cache __percpu *sgt_cache;</div><div class='add'>+	unsigned long features;</div><div class='ctx'> 	struct dpni_attr dpni_attrs;</div><div class='ctx'> 	u16 dpni_ver_major;</div><div class='ctx'> 	u16 dpni_ver_minor;</div><div class='ctx'> 	u16 tx_data_offset;</div><div class='del'>-</div><div class='del'>-	struct fsl_mc_device *dpbp_dev;</div><div class='del'>-	u16 bpid;</div><div class='add'>+	void __iomem *onestep_reg_base;</div><div class='add'>+	u8 ptp_correction_off;</div><div class='add'>+	void (*dpaa2_set_onestep_params_cb)(struct dpaa2_eth_priv *priv,</div><div class='add'>+					    u32 offset, u8 udp);</div><div class='add'>+	u16 rx_buf_size;</div><div class='ctx'> 	struct iommu_domain *iommu_domain;</div><div class='ctx'> </div><div class='del'>-	bool tx_tstamp; /* Tx timestamping enabled */</div><div class='del'>-	bool rx_tstamp; /* Rx timestamping enabled */</div><div class='add'>+	enum hwtstamp_tx_types tx_tstamp_type;	/* Tx timestamping type */</div><div class='add'>+	bool rx_tstamp;				/* Rx timestamping enabled */</div><div class='add'>+</div><div class='add'>+	/* Buffer pool management */</div><div class='add'>+	struct dpaa2_eth_bp *bp[DPAA2_ETH_MAX_BPS];</div><div class='add'>+	int num_bps;</div><div class='ctx'> </div><div class='ctx'> 	u16 tx_qdid;</div><div class='ctx'> 	struct fsl_mc_io *mc_io;</div><div class='hunk'>@@ -388,6 +592,8 @@ struct dpaa2_eth_priv {</div><div class='ctx'> 	struct dpaa2_eth_drv_stats __percpu *percpu_extras;</div><div class='ctx'> </div><div class='ctx'> 	u16 mc_token;</div><div class='add'>+	u8 rx_fqtd_enabled;</div><div class='add'>+	u8 rx_cgtd_enabled;</div><div class='ctx'> </div><div class='ctx'> 	struct dpni_link_state link_state;</div><div class='ctx'> 	bool do_link_poll;</div><div class='hunk'>@@ -398,12 +604,47 @@ struct dpaa2_eth_priv {</div><div class='ctx'> 	u64 rx_cls_fields;</div><div class='ctx'> 	struct dpaa2_eth_cls_rule *cls_rules;</div><div class='ctx'> 	u8 rx_cls_enabled;</div><div class='add'>+	u8 vlan_cls_enabled;</div><div class='add'>+	u8 pfc_enabled;</div><div class='add'>+#ifdef CONFIG_FSL_DPAA2_ETH_DCB</div><div class='add'>+	u8 dcbx_mode;</div><div class='add'>+	struct ieee_pfc pfc;</div><div class='add'>+#endif</div><div class='ctx'> 	struct bpf_prog *xdp_prog;</div><div class='ctx'> #ifdef CONFIG_DEBUG_FS</div><div class='ctx'> 	struct dpaa2_debugfs dbg;</div><div class='ctx'> #endif</div><div class='add'>+</div><div class='add'>+	struct dpaa2_mac *mac;</div><div class='add'>+	/* Serializes changes to priv-&gt;mac */</div><div class='add'>+	struct mutex		mac_lock;</div><div class='add'>+	struct workqueue_struct	*dpaa2_ptp_wq;</div><div class='add'>+	struct work_struct	tx_onestep_tstamp;</div><div class='add'>+	struct sk_buff_head	tx_skbs;</div><div class='add'>+	/* The one-step timestamping configuration on hardware</div><div class='add'>+	 * registers could only be done when no one-step</div><div class='add'>+	 * timestamping frames are in flight. So we use a mutex</div><div class='add'>+	 * lock here to make sure the lock is released by last</div><div class='add'>+	 * one-step timestamping packet through TX confirmation</div><div class='add'>+	 * queue before transmit current packet.</div><div class='add'>+	 */</div><div class='add'>+	struct mutex		onestep_tstamp_lock;</div><div class='add'>+	struct devlink *devlink;</div><div class='add'>+	struct dpaa2_eth_trap_data *trap_data;</div><div class='add'>+	struct devlink_port devlink_port;</div><div class='add'>+</div><div class='add'>+	u32 rx_copybreak;</div><div class='add'>+</div><div class='add'>+	struct dpaa2_eth_fds __percpu *fd;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_devlink_priv {</div><div class='add'>+	struct dpaa2_eth_priv *dpaa2_priv;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define TX_TSTAMP		0x1</div><div class='add'>+#define TX_TSTAMP_ONESTEP_SYNC	0x2</div><div class='add'>+</div><div class='ctx'> #define DPAA2_RXH_SUPPORTED	(RXH_L2DA | RXH_VLAN | RXH_L3_PROTO \</div><div class='ctx'> 				| RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 \</div><div class='ctx'> 				| RXH_L4_B_2_3)</div><div class='hunk'>@@ -420,6 +661,7 @@ struct dpaa2_eth_priv {</div><div class='ctx'> </div><div class='ctx'> extern const struct ethtool_ops dpaa2_ethtool_ops;</div><div class='ctx'> extern int dpaa2_phc_index;</div><div class='add'>+extern struct ptp_qoriq *dpaa2_ptp;</div><div class='ctx'> </div><div class='ctx'> static inline int dpaa2_eth_cmp_dpni_ver(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 					 u16 ver_major, u16 ver_minor)</div><div class='hunk'>@@ -448,6 +690,9 @@ static inline int dpaa2_eth_cmp_dpni_ver(struct dpaa2_eth_priv *priv,</div><div class='ctx'> #define dpaa2_eth_fs_count(priv)        \</div><div class='ctx'> 	((priv)-&gt;dpni_attrs.fs_entries)</div><div class='ctx'> </div><div class='add'>+#define dpaa2_eth_tc_count(priv)	\</div><div class='add'>+	((priv)-&gt;dpni_attrs.num_tcs)</div><div class='add'>+</div><div class='ctx'> /* We have exactly one {Rx, Tx conf} queue per channel */</div><div class='ctx'> #define dpaa2_eth_queue_count(priv)     \</div><div class='ctx'> 	((priv)-&gt;num_channels)</div><div class='hunk'>@@ -469,11 +714,33 @@ enum dpaa2_eth_rx_dist {</div><div class='ctx'> #define DPAA2_ETH_DIST_L4DST		BIT(8)</div><div class='ctx'> #define DPAA2_ETH_DIST_ALL		(~0ULL)</div><div class='ctx'> </div><div class='del'>-static inline</div><div class='del'>-unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv,</div><div class='del'>-				       struct sk_buff *skb)</div><div class='add'>+#define DPNI_PTP_ONESTEP_VER_MAJOR 8</div><div class='add'>+#define DPNI_PTP_ONESTEP_VER_MINOR 2</div><div class='add'>+#define DPAA2_ETH_FEATURE_ONESTEP_CFG_DIRECT BIT(0)</div><div class='add'>+#define DPAA2_PTP_SINGLE_STEP_ENABLE	BIT(31)</div><div class='add'>+#define DPAA2_PTP_SINGLE_STEP_CH	BIT(7)</div><div class='add'>+#define DPAA2_PTP_SINGLE_CORRECTION_OFF(v) ((v) &lt;&lt; 8)</div><div class='add'>+</div><div class='add'>+#define DPNI_PAUSE_VER_MAJOR		7</div><div class='add'>+#define DPNI_PAUSE_VER_MINOR		13</div><div class='add'>+#define dpaa2_eth_has_pause_support(priv)			\</div><div class='add'>+	(dpaa2_eth_cmp_dpni_ver((priv), DPNI_PAUSE_VER_MAJOR,	\</div><div class='add'>+				DPNI_PAUSE_VER_MINOR) &gt;= 0)</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_eth_tx_pause_enabled(u64 link_options)</div><div class='add'>+{</div><div class='add'>+	return !!(link_options &amp; DPNI_LINK_OPT_PAUSE) ^</div><div class='add'>+	       !!(link_options &amp; DPNI_LINK_OPT_ASYM_PAUSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_eth_rx_pause_enabled(u64 link_options)</div><div class='add'>+{</div><div class='add'>+	return !!(link_options &amp; DPNI_LINK_OPT_PAUSE);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline unsigned int dpaa2_eth_needed_headroom(struct sk_buff *skb)</div><div class='ctx'> {</div><div class='del'>-	unsigned int headroom = DPAA2_ETH_SWA_SIZE;</div><div class='add'>+	unsigned int headroom = DPAA2_ETH_SWA_SIZE + DPAA2_ETH_TX_BUF_ALIGN;</div><div class='ctx'> </div><div class='ctx'> 	/* If we don't have an skb (e.g. XDP buffer), we only need space for</div><div class='ctx'> 	 * the software annotation area</div><div class='hunk'>@@ -488,7 +755,7 @@ unsigned int dpaa2_eth_needed_headroom(struct dpaa2_eth_priv *priv,</div><div class='ctx'> 		return 0;</div><div class='ctx'> </div><div class='ctx'> 	/* If we have Tx timestamping, need 128B hardware annotation */</div><div class='del'>-	if (priv-&gt;tx_tstamp &amp;&amp; skb_shinfo(skb)-&gt;tx_flags &amp; SKBTX_HW_TSTAMP)</div><div class='add'>+	if (skb-&gt;cb[0])</div><div class='ctx'> 		headroom += DPAA2_ETH_TX_HWA_SIZE;</div><div class='ctx'> </div><div class='ctx'> 	return headroom;</div><div class='hunk'>@@ -502,10 +769,93 @@ static inline unsigned int dpaa2_eth_rx_head_room(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	return priv-&gt;tx_data_offset - DPAA2_ETH_RX_HWA_SIZE;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static inline bool dpaa2_eth_is_type_phy(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return dpaa2_mac_is_type_phy(priv-&gt;mac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_eth_has_mac(struct dpaa2_eth_priv *priv)</div><div class='add'>+{</div><div class='add'>+	lockdep_assert_held(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return priv-&gt;mac ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int dpaa2_eth_set_hash(struct net_device *net_dev, u64 flags);</div><div class='ctx'> int dpaa2_eth_set_cls(struct net_device *net_dev, u64 key);</div><div class='ctx'> int dpaa2_eth_cls_key_size(u64 key);</div><div class='ctx'> int dpaa2_eth_cls_fld_off(int prot, int field);</div><div class='ctx'> void dpaa2_eth_cls_trim_rule(void *key_mem, u64 fields);</div><div class='ctx'> </div><div class='add'>+void dpaa2_eth_set_rx_taildrop(struct dpaa2_eth_priv *priv,</div><div class='add'>+			       bool tx_pause, bool pfc);</div><div class='add'>+</div><div class='add'>+extern const struct dcbnl_rtnl_ops dpaa2_eth_dcbnl_ops;</div><div class='add'>+</div><div class='add'>+int dpaa2_eth_dl_alloc(struct dpaa2_eth_priv *priv);</div><div class='add'>+void dpaa2_eth_dl_free(struct dpaa2_eth_priv *priv);</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_dl_register(struct dpaa2_eth_priv *priv);</div><div class='add'>+void dpaa2_eth_dl_unregister(struct dpaa2_eth_priv *priv);</div><div class='add'>+</div><div class='add'>+int dpaa2_eth_dl_port_add(struct dpaa2_eth_priv *priv);</div><div class='add'>+void dpaa2_eth_dl_port_del(struct dpaa2_eth_priv *priv);</div><div class='add'>+</div><div class='add'>+int dpaa2_eth_dl_traps_register(struct dpaa2_eth_priv *priv);</div><div class='add'>+void dpaa2_eth_dl_traps_unregister(struct dpaa2_eth_priv *priv);</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_trap_item *dpaa2_eth_dl_get_trap(struct dpaa2_eth_priv *priv,</div><div class='add'>+						  struct dpaa2_fapr *fapr);</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_bp *dpaa2_eth_allocate_dpbp(struct dpaa2_eth_priv *priv);</div><div class='add'>+void dpaa2_eth_free_dpbp(struct dpaa2_eth_priv *priv, struct dpaa2_eth_bp *bp);</div><div class='add'>+</div><div class='add'>+struct sk_buff *dpaa2_eth_alloc_skb(struct dpaa2_eth_priv *priv,</div><div class='add'>+				    struct dpaa2_eth_channel *ch,</div><div class='add'>+				    const struct dpaa2_fd *fd, u32 fd_length,</div><div class='add'>+				    void *fd_vaddr);</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_receive_skb(struct dpaa2_eth_priv *priv,</div><div class='add'>+			   struct dpaa2_eth_channel *ch,</div><div class='add'>+			   const struct dpaa2_fd *fd, void *vaddr,</div><div class='add'>+			   struct dpaa2_eth_fq *fq,</div><div class='add'>+			   struct rtnl_link_stats64 *percpu_stats,</div><div class='add'>+			   struct sk_buff *skb);</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_rx(struct dpaa2_eth_priv *priv,</div><div class='add'>+		  struct dpaa2_eth_channel *ch,</div><div class='add'>+		  const struct dpaa2_fd *fd,</div><div class='add'>+		  struct dpaa2_eth_fq *fq);</div><div class='add'>+</div><div class='add'>+struct dpaa2_eth_bp *dpaa2_eth_allocate_dpbp(struct dpaa2_eth_priv *priv);</div><div class='add'>+void dpaa2_eth_free_dpbp(struct dpaa2_eth_priv *priv,</div><div class='add'>+			 struct dpaa2_eth_bp *bp);</div><div class='add'>+</div><div class='add'>+void *dpaa2_iova_to_virt(struct iommu_domain *domain, dma_addr_t iova_addr);</div><div class='add'>+void dpaa2_eth_recycle_buf(struct dpaa2_eth_priv *priv,</div><div class='add'>+			   struct dpaa2_eth_channel *ch,</div><div class='add'>+			   dma_addr_t addr);</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_xdp_enqueue(struct dpaa2_eth_priv *priv,</div><div class='add'>+			   struct dpaa2_eth_channel *ch,</div><div class='add'>+			   struct dpaa2_fd *fd,</div><div class='add'>+			   void *buf_start, u16 queue_id);</div><div class='add'>+</div><div class='add'>+int dpaa2_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags);</div><div class='add'>+int dpaa2_xsk_setup_pool(struct net_device *dev, struct xsk_buff_pool *pool, u16 qid);</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_free_tx_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+			  struct dpaa2_eth_channel *ch,</div><div class='add'>+			  struct dpaa2_eth_fq *fq,</div><div class='add'>+			  const struct dpaa2_fd *fd, bool in_napi);</div><div class='add'>+bool dpaa2_xsk_tx(struct dpaa2_eth_priv *priv,</div><div class='add'>+		  struct dpaa2_eth_channel *ch);</div><div class='add'>+</div><div class='add'>+/* SGT (Scatter-Gather Table) cache management */</div><div class='add'>+void *dpaa2_eth_sgt_get(struct dpaa2_eth_priv *priv);</div><div class='add'>+</div><div class='add'>+void dpaa2_eth_sgt_recycle(struct dpaa2_eth_priv *priv, void *sgt_buf);</div><div class='add'>+</div><div class='ctx'> #endif	/* __DPAA2_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c<br/>index 7b182f4b263c..baab4f1c908d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='ctx'> /* Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='del'>- * Copyright 2016 NXP</div><div class='add'>+ * Copyright 2016-2022 NXP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/net_tstamp.h&gt;</div><div class='hunk'>@@ -28,6 +28,11 @@ static char dpaa2_ethtool_stats[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"[hw] rx nobuffer discards",</div><div class='ctx'> 	"[hw] tx discarded frames",</div><div class='ctx'> 	"[hw] tx confirmed frames",</div><div class='add'>+	"[hw] tx dequeued bytes",</div><div class='add'>+	"[hw] tx dequeued frames",</div><div class='add'>+	"[hw] tx rejected bytes",</div><div class='add'>+	"[hw] tx rejected frames",</div><div class='add'>+	"[hw] tx pending frames",</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DPAA2_ETH_NUM_STATS	ARRAY_SIZE(dpaa2_ethtool_stats)</div><div class='hunk'>@@ -38,9 +43,12 @@ static char dpaa2_ethtool_extras[][ETH_GSTRING_LEN] = {</div><div class='ctx'> 	"[drv] tx conf bytes",</div><div class='ctx'> 	"[drv] tx sg frames",</div><div class='ctx'> 	"[drv] tx sg bytes",</div><div class='del'>-	"[drv] tx realloc frames",</div><div class='add'>+	"[drv] tx tso frames",</div><div class='add'>+	"[drv] tx tso bytes",</div><div class='ctx'> 	"[drv] rx sg frames",</div><div class='ctx'> 	"[drv] rx sg bytes",</div><div class='add'>+	"[drv] tx converted sg frames",</div><div class='add'>+	"[drv] tx converted sg bytes",</div><div class='ctx'> 	"[drv] enqueue portal busy",</div><div class='ctx'> 	/* Channel stats */</div><div class='ctx'> 	"[drv] dequeue portal busy",</div><div class='hunk'>@@ -65,102 +73,159 @@ static void dpaa2_eth_get_drvinfo(struct net_device *net_dev,</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+	strscpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='ctx'> </div><div class='ctx'> 	snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='ctx'> 		 "%u.%u", priv-&gt;dpni_ver_major, priv-&gt;dpni_ver_minor);</div><div class='ctx'> </div><div class='del'>-	strlcpy(drvinfo-&gt;bus_info, dev_name(net_dev-&gt;dev.parent-&gt;parent),</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, dev_name(net_dev-&gt;dev.parent-&gt;parent),</div><div class='ctx'> 		sizeof(drvinfo-&gt;bus_info));</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa2_eth_nway_reset(struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv))</div><div class='add'>+		err = phylink_ethtool_nway_reset(priv-&gt;mac-&gt;phylink);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int</div><div class='ctx'> dpaa2_eth_get_link_ksettings(struct net_device *net_dev,</div><div class='ctx'> 			     struct ethtool_link_ksettings *link_settings)</div><div class='ctx'> {</div><div class='del'>-	struct dpni_link_state state = {0};</div><div class='del'>-	int err = 0;</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-	err = dpni_get_link_state(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;state);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_err(net_dev, "ERROR %d getting link state\n", err);</div><div class='del'>-		goto out;</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv)) {</div><div class='add'>+		err = phylink_ethtool_ksettings_get(priv-&gt;mac-&gt;phylink,</div><div class='add'>+						    link_settings);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	/* At the moment, we have no way of interrogating the DPMAC</div><div class='del'>-	 * from the DPNI side - and for that matter there may exist</div><div class='del'>-	 * no DPMAC at all. So for now we just don't report anything</div><div class='del'>-	 * beyond the DPNI attributes.</div><div class='del'>-	 */</div><div class='del'>-	if (state.options &amp; DPNI_LINK_OPT_AUTONEG)</div><div class='del'>-		link_settings-&gt;base.autoneg = AUTONEG_ENABLE;</div><div class='del'>-	if (!(state.options &amp; DPNI_LINK_OPT_HALF_DUPLEX))</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	link_settings-&gt;base.autoneg = AUTONEG_DISABLE;</div><div class='add'>+	if (!(priv-&gt;link_state.options &amp; DPNI_LINK_OPT_HALF_DUPLEX))</div><div class='ctx'> 		link_settings-&gt;base.duplex = DUPLEX_FULL;</div><div class='del'>-	link_settings-&gt;base.speed = state.rate;</div><div class='add'>+	link_settings-&gt;base.speed = priv-&gt;link_state.rate;</div><div class='ctx'> </div><div class='del'>-out:</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-#define DPNI_DYNAMIC_LINK_SET_VER_MAJOR		7</div><div class='del'>-#define DPNI_DYNAMIC_LINK_SET_VER_MINOR		1</div><div class='ctx'> static int</div><div class='ctx'> dpaa2_eth_set_link_ksettings(struct net_device *net_dev,</div><div class='ctx'> 			     const struct ethtool_link_ksettings *link_settings)</div><div class='ctx'> {</div><div class='del'>-	struct dpni_link_cfg cfg = {0};</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='del'>-	int err = 0;</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='ctx'> </div><div class='del'>-	/* If using an older MC version, the DPNI must be down</div><div class='del'>-	 * in order to be able to change link settings. Taking steps to let</div><div class='del'>-	 * the user know that.</div><div class='del'>-	 */</div><div class='del'>-	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_DYNAMIC_LINK_SET_VER_MAJOR,</div><div class='del'>-				   DPNI_DYNAMIC_LINK_SET_VER_MINOR) &lt; 0) {</div><div class='del'>-		if (netif_running(net_dev)) {</div><div class='del'>-			netdev_info(net_dev, "Interface must be brought down first.\n");</div><div class='del'>-			return -EACCES;</div><div class='del'>-		}</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv))</div><div class='add'>+		err = phylink_ethtool_ksettings_set(priv-&gt;mac-&gt;phylink,</div><div class='add'>+						    link_settings);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_get_pauseparam(struct net_device *net_dev,</div><div class='add'>+				     struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	u64 link_options = priv-&gt;link_state.options;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv)) {</div><div class='add'>+		phylink_ethtool_get_pauseparam(priv-&gt;mac-&gt;phylink, pause);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+		return;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	cfg.rate = link_settings-&gt;base.speed;</div><div class='del'>-	if (link_settings-&gt;base.autoneg == AUTONEG_ENABLE)</div><div class='del'>-		cfg.options |= DPNI_LINK_OPT_AUTONEG;</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	pause-&gt;rx_pause = dpaa2_eth_rx_pause_enabled(link_options);</div><div class='add'>+	pause-&gt;tx_pause = dpaa2_eth_tx_pause_enabled(link_options);</div><div class='add'>+	pause-&gt;autoneg = AUTONEG_DISABLE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_pauseparam(struct net_device *net_dev,</div><div class='add'>+				    struct ethtool_pauseparam *pause)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	struct dpni_link_cfg cfg = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_eth_has_pause_support(priv)) {</div><div class='add'>+		netdev_info(net_dev, "No pause frame support for DPNI version &lt; %d.%d\n",</div><div class='add'>+			    DPNI_PAUSE_VER_MAJOR, DPNI_PAUSE_VER_MINOR);</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_is_type_phy(priv)) {</div><div class='add'>+		err = phylink_ethtool_set_pauseparam(priv-&gt;mac-&gt;phylink,</div><div class='add'>+						     pause);</div><div class='add'>+		mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (pause-&gt;autoneg)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	cfg.rate = priv-&gt;link_state.rate;</div><div class='add'>+	cfg.options = priv-&gt;link_state.options;</div><div class='add'>+	if (pause-&gt;rx_pause)</div><div class='add'>+		cfg.options |= DPNI_LINK_OPT_PAUSE;</div><div class='ctx'> 	else</div><div class='del'>-		cfg.options &amp;= ~DPNI_LINK_OPT_AUTONEG;</div><div class='del'>-	if (link_settings-&gt;base.duplex  == DUPLEX_HALF)</div><div class='del'>-		cfg.options |= DPNI_LINK_OPT_HALF_DUPLEX;</div><div class='add'>+		cfg.options &amp;= ~DPNI_LINK_OPT_PAUSE;</div><div class='add'>+	if (!!pause-&gt;rx_pause ^ !!pause-&gt;tx_pause)</div><div class='add'>+		cfg.options |= DPNI_LINK_OPT_ASYM_PAUSE;</div><div class='ctx'> 	else</div><div class='del'>-		cfg.options &amp;= ~DPNI_LINK_OPT_HALF_DUPLEX;</div><div class='add'>+		cfg.options &amp;= ~DPNI_LINK_OPT_ASYM_PAUSE;</div><div class='add'>+</div><div class='add'>+	if (cfg.options == priv-&gt;link_state.options)</div><div class='add'>+		return 0;</div><div class='ctx'> </div><div class='ctx'> 	err = dpni_set_link_cfg(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;cfg);</div><div class='del'>-	if (err)</div><div class='del'>-		/* ethtool will be loud enough if we return an error; no point</div><div class='del'>-		 * in putting our own error message on the console by default</div><div class='del'>-		 */</div><div class='del'>-		netdev_dbg(net_dev, "ERROR %d setting link cfg\n", err);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dpni_set_link_state failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	return err;</div><div class='add'>+	priv-&gt;link_state.options = cfg.options;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static void dpaa2_eth_get_strings(struct net_device *netdev, u32 stringset,</div><div class='ctx'> 				  u8 *data)</div><div class='ctx'> {</div><div class='del'>-	u8 *p = data;</div><div class='ctx'> 	int i;</div><div class='ctx'> </div><div class='ctx'> 	switch (stringset) {</div><div class='ctx'> 	case ETH_SS_STATS:</div><div class='del'>-		for (i = 0; i &lt; DPAA2_ETH_NUM_STATS; i++) {</div><div class='del'>-			strlcpy(p, dpaa2_ethtool_stats[i], ETH_GSTRING_LEN);</div><div class='del'>-			p += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; i &lt; DPAA2_ETH_NUM_EXTRA_STATS; i++) {</div><div class='del'>-			strlcpy(p, dpaa2_ethtool_extras[i], ETH_GSTRING_LEN);</div><div class='del'>-			p += ETH_GSTRING_LEN;</div><div class='del'>-		}</div><div class='add'>+		for (i = 0; i &lt; DPAA2_ETH_NUM_STATS; i++)</div><div class='add'>+			ethtool_puts(&amp;data, dpaa2_ethtool_stats[i]);</div><div class='add'>+		for (i = 0; i &lt; DPAA2_ETH_NUM_EXTRA_STATS; i++)</div><div class='add'>+			ethtool_puts(&amp;data, dpaa2_ethtool_extras[i]);</div><div class='add'>+		dpaa2_mac_get_strings(&amp;data);</div><div class='ctx'> 		break;</div><div class='ctx'> 	}</div><div class='ctx'> }</div><div class='hunk'>@@ -169,7 +234,8 @@ static int dpaa2_eth_get_sset_count(struct net_device *net_dev, int sset)</div><div class='ctx'> {</div><div class='ctx'> 	switch (sset) {</div><div class='ctx'> 	case ETH_SS_STATS: /* ethtool_get_stats(), ethtool_get_drvinfo() */</div><div class='del'>-		return DPAA2_ETH_NUM_STATS + DPAA2_ETH_NUM_EXTRA_STATS;</div><div class='add'>+		return DPAA2_ETH_NUM_STATS + DPAA2_ETH_NUM_EXTRA_STATS +</div><div class='add'>+		       dpaa2_mac_get_sset_count();</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -181,38 +247,42 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> 					struct ethtool_stats *stats,</div><div class='ctx'> 					u64 *data)</div><div class='ctx'> {</div><div class='del'>-	int i = 0;</div><div class='del'>-	int j, k, err;</div><div class='del'>-	int num_cnt;</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	union dpni_statistics dpni_stats;</div><div class='del'>-	u32 fcnt, bcnt;</div><div class='add'>+	int dpni_stats_page_size[DPNI_STATISTICS_CNT] = {</div><div class='add'>+		sizeof(dpni_stats.page_0),</div><div class='add'>+		sizeof(dpni_stats.page_1),</div><div class='add'>+		sizeof(dpni_stats.page_2),</div><div class='add'>+		sizeof(dpni_stats.page_3),</div><div class='add'>+		sizeof(dpni_stats.page_4),</div><div class='add'>+		sizeof(dpni_stats.page_5),</div><div class='add'>+		sizeof(dpni_stats.page_6),</div><div class='add'>+	};</div><div class='ctx'> 	u32 fcnt_rx_total = 0, fcnt_tx_total = 0;</div><div class='ctx'> 	u32 bcnt_rx_total = 0, bcnt_tx_total = 0;</div><div class='del'>-	u32 buf_cnt;</div><div class='del'>-	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='del'>-	struct dpaa2_eth_drv_stats *extras;</div><div class='ctx'> 	struct dpaa2_eth_ch_stats *ch_stats;</div><div class='add'>+	struct dpaa2_eth_drv_stats *extras;</div><div class='add'>+	u32 buf_cnt, buf_cnt_total = 0;</div><div class='add'>+	int j, k, err, num_cnt, i = 0;</div><div class='add'>+	u32 fcnt, bcnt;</div><div class='ctx'> </div><div class='ctx'> 	memset(data, 0,</div><div class='ctx'> 	       sizeof(u64) * (DPAA2_ETH_NUM_STATS + DPAA2_ETH_NUM_EXTRA_STATS));</div><div class='ctx'> </div><div class='ctx'> 	/* Print standard counters, from DPNI statistics */</div><div class='del'>-	for (j = 0; j &lt;= 2; j++) {</div><div class='add'>+	for (j = 0; j &lt;= 6; j++) {</div><div class='add'>+		/* We're not interested in pages 4 &amp; 5 for now */</div><div class='add'>+		if (j == 4 || j == 5)</div><div class='add'>+			continue;</div><div class='ctx'> 		err = dpni_get_statistics(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='ctx'> 					  j, &amp;dpni_stats);</div><div class='del'>-		if (err != 0)</div><div class='add'>+		if (err == -EINVAL)</div><div class='add'>+			/* Older firmware versions don't support all pages */</div><div class='add'>+			memset(&amp;dpni_stats, 0, sizeof(dpni_stats));</div><div class='add'>+		else if (err)</div><div class='ctx'> 			netdev_warn(net_dev, "dpni_get_stats(%d) failed\n", j);</div><div class='del'>-		switch (j) {</div><div class='del'>-		case 0:</div><div class='del'>-			num_cnt = sizeof(dpni_stats.page_0) / sizeof(u64);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			num_cnt = sizeof(dpni_stats.page_1) / sizeof(u64);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			num_cnt = sizeof(dpni_stats.page_2) / sizeof(u64);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='add'>+</div><div class='add'>+		num_cnt = dpni_stats_page_size[j] / sizeof(u64);</div><div class='ctx'> 		for (k = 0; k &lt; num_cnt; k++)</div><div class='ctx'> 			*(data + i++) = dpni_stats.raw.counter[k];</div><div class='ctx'> 	}</div><div class='hunk'>@@ -228,7 +298,7 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> 	/* Per-channel stats */</div><div class='ctx'> 	for (k = 0; k &lt; priv-&gt;num_channels; k++) {</div><div class='ctx'> 		ch_stats = &amp;priv-&gt;channel[k]-&gt;stats;</div><div class='del'>-		for (j = 0; j &lt; sizeof(*ch_stats) / sizeof(__u64); j++)</div><div class='add'>+		for (j = 0; j &lt; DPAA2_ETH_CH_STATS; j++)</div><div class='ctx'> 			*((__u64 *)data + i + j) += *((__u64 *)ch_stats + j);</div><div class='ctx'> 	}</div><div class='ctx'> 	i += j;</div><div class='hunk'>@@ -256,16 +326,26 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,</div><div class='ctx'> 	*(data + i++) = fcnt_tx_total;</div><div class='ctx'> 	*(data + i++) = bcnt_tx_total;</div><div class='ctx'> </div><div class='del'>-	err = dpaa2_io_query_bp_count(NULL, priv-&gt;bpid, &amp;buf_cnt);</div><div class='del'>-	if (err) {</div><div class='del'>-		netdev_warn(net_dev, "Buffer count query error %d\n", err);</div><div class='del'>-		return;</div><div class='add'>+	for (j = 0; j &lt; priv-&gt;num_bps; j++) {</div><div class='add'>+		err = dpaa2_io_query_bp_count(NULL, priv-&gt;bp[j]-&gt;bpid, &amp;buf_cnt);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_warn(net_dev, "Buffer count query error %d\n", err);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		buf_cnt_total += buf_cnt;</div><div class='ctx'> 	}</div><div class='del'>-	*(data + i++) = buf_cnt;</div><div class='add'>+	*(data + i++) = buf_cnt_total;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_eth_has_mac(priv))</div><div class='add'>+		dpaa2_mac_get_ethtool_stats(priv-&gt;mac, data + i);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;priv-&gt;mac_lock);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,</div><div class='del'>-			 void *key, void *mask, u64 *fields)</div><div class='add'>+static int dpaa2_eth_prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,</div><div class='add'>+				   void *key, void *mask, u64 *fields)</div><div class='ctx'> {</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='hunk'>@@ -293,9 +373,9 @@ static int prep_eth_rule(struct ethhdr *eth_value, struct ethhdr *eth_mask,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prep_uip_rule(struct ethtool_usrip4_spec *uip_value,</div><div class='del'>-			 struct ethtool_usrip4_spec *uip_mask,</div><div class='del'>-			 void *key, void *mask, u64 *fields)</div><div class='add'>+static int dpaa2_eth_prep_uip_rule(struct ethtool_usrip4_spec *uip_value,</div><div class='add'>+				   struct ethtool_usrip4_spec *uip_mask,</div><div class='add'>+				   void *key, void *mask, u64 *fields)</div><div class='ctx'> {</div><div class='ctx'> 	int off;</div><div class='ctx'> 	u32 tmp_value, tmp_mask;</div><div class='hunk'>@@ -348,9 +428,9 @@ static int prep_uip_rule(struct ethtool_usrip4_spec *uip_value,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prep_l4_rule(struct ethtool_tcpip4_spec *l4_value,</div><div class='del'>-			struct ethtool_tcpip4_spec *l4_mask,</div><div class='del'>-			void *key, void *mask, u8 l4_proto, u64 *fields)</div><div class='add'>+static int dpaa2_eth_prep_l4_rule(struct ethtool_tcpip4_spec *l4_value,</div><div class='add'>+				  struct ethtool_tcpip4_spec *l4_mask,</div><div class='add'>+				  void *key, void *mask, u8 l4_proto, u64 *fields)</div><div class='ctx'> {</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='hunk'>@@ -399,9 +479,9 @@ static int prep_l4_rule(struct ethtool_tcpip4_spec *l4_value,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prep_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='del'>-			 struct ethtool_flow_ext *ext_mask,</div><div class='del'>-			 void *key, void *mask, u64 *fields)</div><div class='add'>+static int dpaa2_eth_prep_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='add'>+				   struct ethtool_flow_ext *ext_mask,</div><div class='add'>+				   void *key, void *mask, u64 *fields)</div><div class='ctx'> {</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='hunk'>@@ -418,9 +498,9 @@ static int prep_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prep_mac_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='del'>-			     struct ethtool_flow_ext *ext_mask,</div><div class='del'>-			     void *key, void *mask, u64 *fields)</div><div class='add'>+static int dpaa2_eth_prep_mac_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='add'>+				       struct ethtool_flow_ext *ext_mask,</div><div class='add'>+				       void *key, void *mask, u64 *fields)</div><div class='ctx'> {</div><div class='ctx'> 	int off;</div><div class='ctx'> </div><div class='hunk'>@@ -434,32 +514,32 @@ static int prep_mac_ext_rule(struct ethtool_flow_ext *ext_value,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int prep_cls_rule(struct ethtool_rx_flow_spec *fs, void *key, void *mask,</div><div class='del'>-			 u64 *fields)</div><div class='add'>+static int dpaa2_eth_prep_cls_rule(struct ethtool_rx_flow_spec *fs, void *key,</div><div class='add'>+				   void *mask, u64 *fields)</div><div class='ctx'> {</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='ctx'> 	switch (fs-&gt;flow_type &amp; 0xFF) {</div><div class='ctx'> 	case ETHER_FLOW:</div><div class='del'>-		err = prep_eth_rule(&amp;fs-&gt;h_u.ether_spec, &amp;fs-&gt;m_u.ether_spec,</div><div class='del'>-				    key, mask, fields);</div><div class='add'>+		err = dpaa2_eth_prep_eth_rule(&amp;fs-&gt;h_u.ether_spec, &amp;fs-&gt;m_u.ether_spec,</div><div class='add'>+					      key, mask, fields);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case IP_USER_FLOW:</div><div class='del'>-		err = prep_uip_rule(&amp;fs-&gt;h_u.usr_ip4_spec,</div><div class='del'>-				    &amp;fs-&gt;m_u.usr_ip4_spec, key, mask, fields);</div><div class='add'>+		err = dpaa2_eth_prep_uip_rule(&amp;fs-&gt;h_u.usr_ip4_spec,</div><div class='add'>+					      &amp;fs-&gt;m_u.usr_ip4_spec, key, mask, fields);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case TCP_V4_FLOW:</div><div class='del'>-		err = prep_l4_rule(&amp;fs-&gt;h_u.tcp_ip4_spec, &amp;fs-&gt;m_u.tcp_ip4_spec,</div><div class='del'>-				   key, mask, IPPROTO_TCP, fields);</div><div class='add'>+		err = dpaa2_eth_prep_l4_rule(&amp;fs-&gt;h_u.tcp_ip4_spec, &amp;fs-&gt;m_u.tcp_ip4_spec,</div><div class='add'>+					     key, mask, IPPROTO_TCP, fields);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case UDP_V4_FLOW:</div><div class='del'>-		err = prep_l4_rule(&amp;fs-&gt;h_u.udp_ip4_spec, &amp;fs-&gt;m_u.udp_ip4_spec,</div><div class='del'>-				   key, mask, IPPROTO_UDP, fields);</div><div class='add'>+		err = dpaa2_eth_prep_l4_rule(&amp;fs-&gt;h_u.udp_ip4_spec, &amp;fs-&gt;m_u.udp_ip4_spec,</div><div class='add'>+					     key, mask, IPPROTO_UDP, fields);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case SCTP_V4_FLOW:</div><div class='del'>-		err = prep_l4_rule(&amp;fs-&gt;h_u.sctp_ip4_spec,</div><div class='del'>-				   &amp;fs-&gt;m_u.sctp_ip4_spec, key, mask,</div><div class='del'>-				   IPPROTO_SCTP, fields);</div><div class='add'>+		err = dpaa2_eth_prep_l4_rule(&amp;fs-&gt;h_u.sctp_ip4_spec,</div><div class='add'>+					     &amp;fs-&gt;m_u.sctp_ip4_spec, key, mask,</div><div class='add'>+					     IPPROTO_SCTP, fields);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		return -EOPNOTSUPP;</div><div class='hunk'>@@ -469,14 +549,14 @@ static int prep_cls_rule(struct ethtool_rx_flow_spec *fs, void *key, void *mask,</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='ctx'> 	if (fs-&gt;flow_type &amp; FLOW_EXT) {</div><div class='del'>-		err = prep_ext_rule(&amp;fs-&gt;h_ext, &amp;fs-&gt;m_ext, key, mask, fields);</div><div class='add'>+		err = dpaa2_eth_prep_ext_rule(&amp;fs-&gt;h_ext, &amp;fs-&gt;m_ext, key, mask, fields);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	if (fs-&gt;flow_type &amp; FLOW_MAC_EXT) {</div><div class='del'>-		err = prep_mac_ext_rule(&amp;fs-&gt;h_ext, &amp;fs-&gt;m_ext, key, mask,</div><div class='del'>-					fields);</div><div class='add'>+		err = dpaa2_eth_prep_mac_ext_rule(&amp;fs-&gt;h_ext, &amp;fs-&gt;m_ext, key,</div><div class='add'>+						  mask, fields);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> 	}</div><div class='hunk'>@@ -484,9 +564,9 @@ static int prep_cls_rule(struct ethtool_rx_flow_spec *fs, void *key, void *mask,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int do_cls_rule(struct net_device *net_dev,</div><div class='del'>-		       struct ethtool_rx_flow_spec *fs,</div><div class='del'>-		       bool add)</div><div class='add'>+static int dpaa2_eth_do_cls_rule(struct net_device *net_dev,</div><div class='add'>+				 struct ethtool_rx_flow_spec *fs,</div><div class='add'>+				 bool add)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	struct device *dev = net_dev-&gt;dev.parent;</div><div class='hunk'>@@ -495,7 +575,7 @@ static int do_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 	dma_addr_t key_iova;</div><div class='ctx'> 	u64 fields = 0;</div><div class='ctx'> 	void *key_buf;</div><div class='del'>-	int err;</div><div class='add'>+	int i, err;</div><div class='ctx'> </div><div class='ctx'> 	if (fs-&gt;ring_cookie != RX_CLS_FLOW_DISC &amp;&amp;</div><div class='ctx'> 	    fs-&gt;ring_cookie &gt;= dpaa2_eth_queue_count(priv))</div><div class='hunk'>@@ -509,7 +589,7 @@ static int do_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	/* Fill the key and mask memory areas */</div><div class='del'>-	err = prep_cls_rule(fs, key_buf, key_buf + rule_cfg.key_size, &amp;fields);</div><div class='add'>+	err = dpaa2_eth_prep_cls_rule(fs, key_buf, key_buf + rule_cfg.key_size, &amp;fields);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		goto free_mem;</div><div class='ctx'> </div><div class='hunk'>@@ -555,11 +635,18 @@ static int do_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 			fs_act.options |= DPNI_FS_OPT_DISCARD;</div><div class='ctx'> 		else</div><div class='ctx'> 			fs_act.flow_id = fs-&gt;ring_cookie;</div><div class='del'>-		err = dpni_add_fs_entry(priv-&gt;mc_io, 0, priv-&gt;mc_token, 0,</div><div class='del'>-					fs-&gt;location, &amp;rule_cfg, &amp;fs_act);</div><div class='del'>-	} else {</div><div class='del'>-		err = dpni_remove_fs_entry(priv-&gt;mc_io, 0, priv-&gt;mc_token, 0,</div><div class='del'>-					   &amp;rule_cfg);</div><div class='add'>+	}</div><div class='add'>+	for (i = 0; i &lt; dpaa2_eth_tc_count(priv); i++) {</div><div class='add'>+		if (add)</div><div class='add'>+			err = dpni_add_fs_entry(priv-&gt;mc_io, 0, priv-&gt;mc_token,</div><div class='add'>+						i, fs-&gt;location, &amp;rule_cfg,</div><div class='add'>+						&amp;fs_act);</div><div class='add'>+		else</div><div class='add'>+			err = dpni_remove_fs_entry(priv-&gt;mc_io, 0,</div><div class='add'>+						   priv-&gt;mc_token, i,</div><div class='add'>+						   &amp;rule_cfg);</div><div class='add'>+		if (err || priv-&gt;dpni_attrs.options &amp; DPNI_OPT_SHARED_FS)</div><div class='add'>+			break;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='ctx'> 	dma_unmap_single(dev, key_iova, rule_cfg.key_size * 2, DMA_TO_DEVICE);</div><div class='hunk'>@@ -570,7 +657,7 @@ free_mem:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int num_rules(struct dpaa2_eth_priv *priv)</div><div class='add'>+static int dpaa2_eth_num_cls_rules(struct dpaa2_eth_priv *priv)</div><div class='ctx'> {</div><div class='ctx'> 	int i, rules = 0;</div><div class='ctx'> </div><div class='hunk'>@@ -581,9 +668,9 @@ static int num_rules(struct dpaa2_eth_priv *priv)</div><div class='ctx'> 	return rules;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int update_cls_rule(struct net_device *net_dev,</div><div class='del'>-			   struct ethtool_rx_flow_spec *new_fs,</div><div class='del'>-			   int location)</div><div class='add'>+static int dpaa2_eth_update_cls_rule(struct net_device *net_dev,</div><div class='add'>+				     struct ethtool_rx_flow_spec *new_fs,</div><div class='add'>+				     unsigned int location)</div><div class='ctx'> {</div><div class='ctx'> 	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='ctx'> 	struct dpaa2_eth_cls_rule *rule;</div><div class='hunk'>@@ -599,13 +686,14 @@ static int update_cls_rule(struct net_device *net_dev,</div><div class='ctx'> </div><div class='ctx'> 	/* If a rule is present at the specified location, delete it. */</div><div class='ctx'> 	if (rule-&gt;in_use) {</div><div class='del'>-		err = do_cls_rule(net_dev, &amp;rule-&gt;fs, false);</div><div class='add'>+		err = dpaa2_eth_do_cls_rule(net_dev, &amp;rule-&gt;fs, false);</div><div class='ctx'> 		if (err)</div><div class='ctx'> 			return err;</div><div class='ctx'> </div><div class='ctx'> 		rule-&gt;in_use = 0;</div><div class='ctx'> </div><div class='del'>-		if (!dpaa2_eth_fs_mask_enabled(priv) &amp;&amp; !num_rules(priv))</div><div class='add'>+		if (!dpaa2_eth_fs_mask_enabled(priv) &amp;&amp;</div><div class='add'>+		    !dpaa2_eth_num_cls_rules(priv))</div><div class='ctx'> 			priv-&gt;rx_cls_fields = 0;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='hunk'>@@ -613,7 +701,7 @@ static int update_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 	if (!new_fs)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	err = do_cls_rule(net_dev, new_fs, true);</div><div class='add'>+	err = dpaa2_eth_do_cls_rule(net_dev, new_fs, true);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='hunk'>@@ -623,6 +711,13 @@ static int update_cls_rule(struct net_device *net_dev,</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static u32 dpaa2_eth_get_rx_ring_count(struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	return dpaa2_eth_queue_count(priv);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,</div><div class='ctx'> 			       struct ethtool_rxnfc *rxnfc, u32 *rule_locs)</div><div class='ctx'> {</div><div class='hunk'>@@ -631,19 +726,9 @@ static int dpaa2_eth_get_rxnfc(struct net_device *net_dev,</div><div class='ctx'> 	int i, j = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (rxnfc-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_GRXFH:</div><div class='del'>-		/* we purposely ignore cmd-&gt;flow_type for now, because the</div><div class='del'>-		 * classifier only supports a single set of fields for all</div><div class='del'>-		 * protocols</div><div class='del'>-		 */</div><div class='del'>-		rxnfc-&gt;data = priv-&gt;rx_hash_fields;</div><div class='del'>-		break;</div><div class='del'>-	case ETHTOOL_GRXRINGS:</div><div class='del'>-		rxnfc-&gt;data = dpaa2_eth_queue_count(priv);</div><div class='del'>-		break;</div><div class='ctx'> 	case ETHTOOL_GRXCLSRLCNT:</div><div class='ctx'> 		rxnfc-&gt;rule_cnt = 0;</div><div class='del'>-		rxnfc-&gt;rule_cnt = num_rules(priv);</div><div class='add'>+		rxnfc-&gt;rule_cnt = dpaa2_eth_num_cls_rules(priv);</div><div class='ctx'> 		rxnfc-&gt;data = max_rules;</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_GRXCLSRULE:</div><div class='hunk'>@@ -679,16 +764,11 @@ static int dpaa2_eth_set_rxnfc(struct net_device *net_dev,</div><div class='ctx'> 	int err = 0;</div><div class='ctx'> </div><div class='ctx'> 	switch (rxnfc-&gt;cmd) {</div><div class='del'>-	case ETHTOOL_SRXFH:</div><div class='del'>-		if ((rxnfc-&gt;data &amp; DPAA2_RXH_SUPPORTED) != rxnfc-&gt;data)</div><div class='del'>-			return -EOPNOTSUPP;</div><div class='del'>-		err = dpaa2_eth_set_hash(net_dev, rxnfc-&gt;data);</div><div class='del'>-		break;</div><div class='ctx'> 	case ETHTOOL_SRXCLSRLINS:</div><div class='del'>-		err = update_cls_rule(net_dev, &amp;rxnfc-&gt;fs, rxnfc-&gt;fs.location);</div><div class='add'>+		err = dpaa2_eth_update_cls_rule(net_dev, &amp;rxnfc-&gt;fs, rxnfc-&gt;fs.location);</div><div class='ctx'> 		break;</div><div class='ctx'> 	case ETHTOOL_SRXCLSRLDEL:</div><div class='del'>-		err = update_cls_rule(net_dev, NULL, rxnfc-&gt;fs.location);</div><div class='add'>+		err = dpaa2_eth_update_cls_rule(net_dev, NULL, rxnfc-&gt;fs.location);</div><div class='ctx'> 		break;</div><div class='ctx'> 	default:</div><div class='ctx'> 		err = -EOPNOTSUPP;</div><div class='hunk'>@@ -697,12 +777,37 @@ static int dpaa2_eth_set_rxnfc(struct net_device *net_dev,</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa2_eth_get_rxfh_fields(struct net_device *net_dev,</div><div class='add'>+				     struct ethtool_rxfh_fields *rxnfc)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+</div><div class='add'>+	/* we purposely ignore cmd-&gt;flow_type for now, because the</div><div class='add'>+	 * classifier only supports a single set of fields for all</div><div class='add'>+	 * protocols</div><div class='add'>+	 */</div><div class='add'>+	rxnfc-&gt;data = priv-&gt;rx_hash_fields;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_rxfh_fields(struct net_device *net_dev,</div><div class='add'>+				     const struct ethtool_rxfh_fields *rxnfc,</div><div class='add'>+				     struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if ((rxnfc-&gt;data &amp; DPAA2_RXH_SUPPORTED) != rxnfc-&gt;data)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	return dpaa2_eth_set_hash(net_dev, rxnfc-&gt;data);</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> int dpaa2_phc_index = -1;</div><div class='ctx'> EXPORT_SYMBOL(dpaa2_phc_index);</div><div class='ctx'> </div><div class='ctx'> static int dpaa2_eth_get_ts_info(struct net_device *dev,</div><div class='del'>-				 struct ethtool_ts_info *info)</div><div class='add'>+				 struct kernel_ethtool_ts_info *info)</div><div class='ctx'> {</div><div class='add'>+	if (!dpaa2_ptp)</div><div class='add'>+		return ethtool_op_get_ts_info(dev, info);</div><div class='add'>+</div><div class='ctx'> 	info-&gt;so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |</div><div class='ctx'> 				SOF_TIMESTAMPING_RX_HARDWARE |</div><div class='ctx'> 				SOF_TIMESTAMPING_RAW_HARDWARE;</div><div class='hunk'>@@ -710,22 +815,151 @@ static int dpaa2_eth_get_ts_info(struct net_device *dev,</div><div class='ctx'> 	info-&gt;phc_index = dpaa2_phc_index;</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;tx_types = (1 &lt;&lt; HWTSTAMP_TX_OFF) |</div><div class='del'>-			 (1 &lt;&lt; HWTSTAMP_TX_ON);</div><div class='add'>+			 (1 &lt;&lt; HWTSTAMP_TX_ON) |</div><div class='add'>+			 (1 &lt;&lt; HWTSTAMP_TX_ONESTEP_SYNC);</div><div class='ctx'> </div><div class='ctx'> 	info-&gt;rx_filters = (1 &lt;&lt; HWTSTAMP_FILTER_NONE) |</div><div class='ctx'> 			   (1 &lt;&lt; HWTSTAMP_FILTER_ALL);</div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='add'>+static int dpaa2_eth_get_tunable(struct net_device *net_dev,</div><div class='add'>+				 const struct ethtool_tunable *tuna,</div><div class='add'>+				 void *data)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_RX_COPYBREAK:</div><div class='add'>+		*(u32 *)data = priv-&gt;rx_copybreak;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_tunable(struct net_device *net_dev,</div><div class='add'>+				 const struct ethtool_tunable *tuna,</div><div class='add'>+				 const void *data)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (tuna-&gt;id) {</div><div class='add'>+	case ETHTOOL_RX_COPYBREAK:</div><div class='add'>+		priv-&gt;rx_copybreak = *(u32 *)data;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_get_coalesce(struct net_device *dev,</div><div class='add'>+				  struct ethtool_coalesce *ic,</div><div class='add'>+				  struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct dpaa2_io *dpio = priv-&gt;channel[0]-&gt;dpio;</div><div class='add'>+</div><div class='add'>+	dpaa2_io_get_irq_coalescing(dpio, &amp;ic-&gt;rx_coalesce_usecs);</div><div class='add'>+	ic-&gt;use_adaptive_rx_coalesce = dpaa2_io_get_adaptive_coalescing(dpio);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_eth_set_coalesce(struct net_device *dev,</div><div class='add'>+				  struct ethtool_coalesce *ic,</div><div class='add'>+				  struct kernel_ethtool_coalesce *kernel_coal,</div><div class='add'>+				  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct dpaa2_io *dpio;</div><div class='add'>+	int prev_adaptive;</div><div class='add'>+	u32 prev_rx_usecs;</div><div class='add'>+	int i, j, err;</div><div class='add'>+</div><div class='add'>+	/* Keep track of the previous value, just in case we fail */</div><div class='add'>+	dpio = priv-&gt;channel[0]-&gt;dpio;</div><div class='add'>+	dpaa2_io_get_irq_coalescing(dpio, &amp;prev_rx_usecs);</div><div class='add'>+	prev_adaptive = dpaa2_io_get_adaptive_coalescing(dpio);</div><div class='add'>+</div><div class='add'>+	/* Setup new value for rx coalescing */</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_channels; i++) {</div><div class='add'>+		dpio = priv-&gt;channel[i]-&gt;dpio;</div><div class='add'>+</div><div class='add'>+		dpaa2_io_set_adaptive_coalescing(dpio,</div><div class='add'>+						 ic-&gt;use_adaptive_rx_coalesce);</div><div class='add'>+		err = dpaa2_io_set_irq_coalescing(dpio, ic-&gt;rx_coalesce_usecs);</div><div class='add'>+		if (err)</div><div class='add'>+			goto restore_rx_usecs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+restore_rx_usecs:</div><div class='add'>+	for (j = 0; j &lt; i; j++) {</div><div class='add'>+		dpio = priv-&gt;channel[j]-&gt;dpio;</div><div class='add'>+</div><div class='add'>+		dpaa2_io_set_irq_coalescing(dpio, prev_rx_usecs);</div><div class='add'>+		dpaa2_io_set_adaptive_coalescing(dpio, prev_adaptive);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_get_channels(struct net_device *net_dev,</div><div class='add'>+				   struct ethtool_channels *channels)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(net_dev);</div><div class='add'>+	int queue_count = dpaa2_eth_queue_count(priv);</div><div class='add'>+</div><div class='add'>+	channels-&gt;max_rx = queue_count;</div><div class='add'>+	channels-&gt;max_tx = queue_count;</div><div class='add'>+	channels-&gt;rx_count = queue_count;</div><div class='add'>+	channels-&gt;tx_count = queue_count;</div><div class='add'>+</div><div class='add'>+	/* Tx confirmation and Rx error */</div><div class='add'>+	channels-&gt;max_other = queue_count + 1;</div><div class='add'>+	channels-&gt;max_combined = channels-&gt;max_rx +</div><div class='add'>+				 channels-&gt;max_tx +</div><div class='add'>+				 channels-&gt;max_other;</div><div class='add'>+	/* Tx conf and Rx err */</div><div class='add'>+	channels-&gt;other_count = queue_count + 1;</div><div class='add'>+	channels-&gt;combined_count = channels-&gt;rx_count +</div><div class='add'>+				   channels-&gt;tx_count +</div><div class='add'>+				   channels-&gt;other_count;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> const struct ethtool_ops dpaa2_ethtool_ops = {</div><div class='add'>+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |</div><div class='add'>+				     ETHTOOL_COALESCE_USE_ADAPTIVE_RX,</div><div class='ctx'> 	.get_drvinfo = dpaa2_eth_get_drvinfo,</div><div class='add'>+	.nway_reset = dpaa2_eth_nway_reset,</div><div class='ctx'> 	.get_link = ethtool_op_get_link,</div><div class='ctx'> 	.get_link_ksettings = dpaa2_eth_get_link_ksettings,</div><div class='ctx'> 	.set_link_ksettings = dpaa2_eth_set_link_ksettings,</div><div class='add'>+	.get_pauseparam = dpaa2_eth_get_pauseparam,</div><div class='add'>+	.set_pauseparam = dpaa2_eth_set_pauseparam,</div><div class='ctx'> 	.get_sset_count = dpaa2_eth_get_sset_count,</div><div class='ctx'> 	.get_ethtool_stats = dpaa2_eth_get_ethtool_stats,</div><div class='ctx'> 	.get_strings = dpaa2_eth_get_strings,</div><div class='ctx'> 	.get_rxnfc = dpaa2_eth_get_rxnfc,</div><div class='ctx'> 	.set_rxnfc = dpaa2_eth_set_rxnfc,</div><div class='add'>+	.get_rx_ring_count = dpaa2_eth_get_rx_ring_count,</div><div class='add'>+	.get_rxfh_fields = dpaa2_eth_get_rxfh_fields,</div><div class='add'>+	.set_rxfh_fields = dpaa2_eth_set_rxfh_fields,</div><div class='ctx'> 	.get_ts_info = dpaa2_eth_get_ts_info,</div><div class='add'>+	.get_tunable = dpaa2_eth_get_tunable,</div><div class='add'>+	.set_tunable = dpaa2_eth_set_tunable,</div><div class='add'>+	.get_coalesce = dpaa2_eth_get_coalesce,</div><div class='add'>+	.set_coalesce = dpaa2_eth_set_coalesce,</div><div class='add'>+	.get_channels = dpaa2_eth_get_channels,</div><div class='ctx'> };</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c<br/>new file mode 100644<br/>index 000000000000..422ce13a7c94<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c</a></div><div class='hunk'>@@ -0,0 +1,586 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='add'>+/* Copyright 2019 NXP */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/acpi.h&gt;</div><div class='add'>+#include &lt;linux/pcs-lynx.h&gt;</div><div class='add'>+#include &lt;linux/phy/phy.h&gt;</div><div class='add'>+#include &lt;linux/property.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dpaa2-eth.h"</div><div class='add'>+#include "dpaa2-mac.h"</div><div class='add'>+</div><div class='add'>+#define phylink_to_dpaa2_mac(config) \</div><div class='add'>+	container_of((config), struct dpaa2_mac, phylink_config)</div><div class='add'>+</div><div class='add'>+#define DPMAC_PROTOCOL_CHANGE_VER_MAJOR		4</div><div class='add'>+#define DPMAC_PROTOCOL_CHANGE_VER_MINOR		8</div><div class='add'>+</div><div class='add'>+#define DPAA2_MAC_FEATURE_PROTOCOL_CHANGE	BIT(0)</div><div class='add'>+</div><div class='add'>+static int dpaa2_mac_cmp_ver(struct dpaa2_mac *mac,</div><div class='add'>+			     u16 ver_major, u16 ver_minor)</div><div class='add'>+{</div><div class='add'>+	if (mac-&gt;ver_major == ver_major)</div><div class='add'>+		return mac-&gt;ver_minor - ver_minor;</div><div class='add'>+	return mac-&gt;ver_major - ver_major;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_mac_detect_features(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	mac-&gt;features = 0;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_mac_cmp_ver(mac, DPMAC_PROTOCOL_CHANGE_VER_MAJOR,</div><div class='add'>+			      DPMAC_PROTOCOL_CHANGE_VER_MINOR) &gt;= 0)</div><div class='add'>+		mac-&gt;features |= DPAA2_MAC_FEATURE_PROTOCOL_CHANGE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int phy_mode(enum dpmac_eth_if eth_if, phy_interface_t *if_mode)</div><div class='add'>+{</div><div class='add'>+	*if_mode = PHY_INTERFACE_MODE_NA;</div><div class='add'>+</div><div class='add'>+	switch (eth_if) {</div><div class='add'>+	case DPMAC_ETH_IF_RGMII:</div><div class='add'>+		*if_mode = PHY_INTERFACE_MODE_RGMII;</div><div class='add'>+		break;</div><div class='add'>+	case DPMAC_ETH_IF_USXGMII:</div><div class='add'>+		*if_mode = PHY_INTERFACE_MODE_USXGMII;</div><div class='add'>+		break;</div><div class='add'>+	case DPMAC_ETH_IF_QSGMII:</div><div class='add'>+		*if_mode = PHY_INTERFACE_MODE_QSGMII;</div><div class='add'>+		break;</div><div class='add'>+	case DPMAC_ETH_IF_SGMII:</div><div class='add'>+		*if_mode = PHY_INTERFACE_MODE_SGMII;</div><div class='add'>+		break;</div><div class='add'>+	case DPMAC_ETH_IF_XFI:</div><div class='add'>+		*if_mode = PHY_INTERFACE_MODE_10GBASER;</div><div class='add'>+		break;</div><div class='add'>+	case DPMAC_ETH_IF_CAUI:</div><div class='add'>+		*if_mode = PHY_INTERFACE_MODE_25GBASER;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dpmac_eth_if dpmac_eth_if_mode(phy_interface_t if_mode)</div><div class='add'>+{</div><div class='add'>+	switch (if_mode) {</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_ID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_RXID:</div><div class='add'>+	case PHY_INTERFACE_MODE_RGMII_TXID:</div><div class='add'>+		return DPMAC_ETH_IF_RGMII;</div><div class='add'>+	case PHY_INTERFACE_MODE_USXGMII:</div><div class='add'>+		return DPMAC_ETH_IF_USXGMII;</div><div class='add'>+	case PHY_INTERFACE_MODE_QSGMII:</div><div class='add'>+		return DPMAC_ETH_IF_QSGMII;</div><div class='add'>+	case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+		return DPMAC_ETH_IF_SGMII;</div><div class='add'>+	case PHY_INTERFACE_MODE_10GBASER:</div><div class='add'>+		return DPMAC_ETH_IF_XFI;</div><div class='add'>+	case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+		return DPMAC_ETH_IF_1000BASEX;</div><div class='add'>+	case PHY_INTERFACE_MODE_25GBASER:</div><div class='add'>+		return DPMAC_ETH_IF_CAUI;</div><div class='add'>+	default:</div><div class='add'>+		return DPMAC_ETH_IF_MII;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct fwnode_handle *dpaa2_mac_get_node(struct device *dev,</div><div class='add'>+						u16 dpmac_id)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *fwnode, *parent = NULL, *child  = NULL;</div><div class='add'>+	struct device_node *dpmacs = NULL;</div><div class='add'>+	int err;</div><div class='add'>+	u32 id;</div><div class='add'>+</div><div class='add'>+	fwnode = dev_fwnode(dev-&gt;parent);</div><div class='add'>+	if (is_of_node(fwnode)) {</div><div class='add'>+		dpmacs = of_find_node_by_name(NULL, "dpmacs");</div><div class='add'>+		if (!dpmacs)</div><div class='add'>+			return NULL;</div><div class='add'>+		parent = of_fwnode_handle(dpmacs);</div><div class='add'>+	} else if (is_acpi_node(fwnode)) {</div><div class='add'>+		parent = fwnode;</div><div class='add'>+	} else {</div><div class='add'>+		/* The root dprc device didn't yet get to finalize it's probe,</div><div class='add'>+		 * thus the fwnode field is not yet set. Defer probe if we are</div><div class='add'>+		 * facing this situation.</div><div class='add'>+		 */</div><div class='add'>+		dev_dbg(dev, "dprc not finished probing\n");</div><div class='add'>+		return ERR_PTR(-EPROBE_DEFER);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fwnode_for_each_child_node(parent, child) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		if (is_acpi_device_node(child))</div><div class='add'>+			err = acpi_get_local_address(ACPI_HANDLE_FWNODE(child), &amp;id);</div><div class='add'>+		else if (is_of_node(child))</div><div class='add'>+			err = of_property_read_u32(to_of_node(child), "reg", &amp;id);</div><div class='add'>+		if (err)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (id == dpmac_id) {</div><div class='add'>+			of_node_put(dpmacs);</div><div class='add'>+			return child;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	of_node_put(dpmacs);</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_mac_get_if_mode(struct fwnode_handle *dpmac_node,</div><div class='add'>+				 struct dpmac_attr attr)</div><div class='add'>+{</div><div class='add'>+	phy_interface_t if_mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fwnode_get_phy_mode(dpmac_node);</div><div class='add'>+	if (err &gt; 0)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = phy_mode(attr.eth_if, &amp;if_mode);</div><div class='add'>+	if (!err)</div><div class='add'>+		return if_mode;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct phylink_pcs *dpaa2_mac_select_pcs(struct phylink_config *config,</div><div class='add'>+						phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_mac *mac = phylink_to_dpaa2_mac(config);</div><div class='add'>+</div><div class='add'>+	return mac-&gt;pcs;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_mac_config(struct phylink_config *config, unsigned int mode,</div><div class='add'>+			     const struct phylink_link_state *state)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_mac *mac = phylink_to_dpaa2_mac(config);</div><div class='add'>+	struct dpmac_link_state *dpmac_state = &amp;mac-&gt;state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,</div><div class='add'>+			      state-&gt;advertising))</div><div class='add'>+		dpmac_state-&gt;options |= DPMAC_LINK_OPT_AUTONEG;</div><div class='add'>+	else</div><div class='add'>+		dpmac_state-&gt;options &amp;= ~DPMAC_LINK_OPT_AUTONEG;</div><div class='add'>+</div><div class='add'>+	err = dpmac_set_link_state(mac-&gt;mc_io, 0,</div><div class='add'>+				   mac-&gt;mc_dev-&gt;mc_handle, dpmac_state);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(mac-&gt;net_dev, "%s: dpmac_set_link_state() = %d\n",</div><div class='add'>+			   __func__, err);</div><div class='add'>+</div><div class='add'>+	if (!mac-&gt;serdes_phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* This happens only if we support changing of protocol at runtime */</div><div class='add'>+	err = dpmac_set_protocol(mac-&gt;mc_io, 0, mac-&gt;mc_dev-&gt;mc_handle,</div><div class='add'>+				 dpmac_eth_if_mode(state-&gt;interface));</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(mac-&gt;net_dev,  "dpmac_set_protocol() = %d\n", err);</div><div class='add'>+</div><div class='add'>+	err = phy_set_mode_ext(mac-&gt;serdes_phy, PHY_MODE_ETHERNET, state-&gt;interface);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(mac-&gt;net_dev, "phy_set_mode_ext() = %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_mac_link_up(struct phylink_config *config,</div><div class='add'>+			      struct phy_device *phy,</div><div class='add'>+			      unsigned int mode, phy_interface_t interface,</div><div class='add'>+			      int speed, int duplex,</div><div class='add'>+			      bool tx_pause, bool rx_pause)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_mac *mac = phylink_to_dpaa2_mac(config);</div><div class='add'>+	struct dpmac_link_state *dpmac_state = &amp;mac-&gt;state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dpmac_state-&gt;up = 1;</div><div class='add'>+</div><div class='add'>+	dpmac_state-&gt;rate = speed;</div><div class='add'>+</div><div class='add'>+	if (duplex == DUPLEX_HALF)</div><div class='add'>+		dpmac_state-&gt;options |= DPMAC_LINK_OPT_HALF_DUPLEX;</div><div class='add'>+	else if (duplex == DUPLEX_FULL)</div><div class='add'>+		dpmac_state-&gt;options &amp;= ~DPMAC_LINK_OPT_HALF_DUPLEX;</div><div class='add'>+</div><div class='add'>+	if (rx_pause)</div><div class='add'>+		dpmac_state-&gt;options |= DPMAC_LINK_OPT_PAUSE;</div><div class='add'>+	else</div><div class='add'>+		dpmac_state-&gt;options &amp;= ~DPMAC_LINK_OPT_PAUSE;</div><div class='add'>+</div><div class='add'>+	if (rx_pause ^ tx_pause)</div><div class='add'>+		dpmac_state-&gt;options |= DPMAC_LINK_OPT_ASYM_PAUSE;</div><div class='add'>+	else</div><div class='add'>+		dpmac_state-&gt;options &amp;= ~DPMAC_LINK_OPT_ASYM_PAUSE;</div><div class='add'>+</div><div class='add'>+	err = dpmac_set_link_state(mac-&gt;mc_io, 0,</div><div class='add'>+				   mac-&gt;mc_dev-&gt;mc_handle, dpmac_state);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(mac-&gt;net_dev, "%s: dpmac_set_link_state() = %d\n",</div><div class='add'>+			   __func__, err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_mac_link_down(struct phylink_config *config,</div><div class='add'>+				unsigned int mode,</div><div class='add'>+				phy_interface_t interface)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_mac *mac = phylink_to_dpaa2_mac(config);</div><div class='add'>+	struct dpmac_link_state *dpmac_state = &amp;mac-&gt;state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dpmac_state-&gt;up = 0;</div><div class='add'>+	err = dpmac_set_link_state(mac-&gt;mc_io, 0,</div><div class='add'>+				   mac-&gt;mc_dev-&gt;mc_handle, dpmac_state);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(mac-&gt;net_dev, "dpmac_set_link_state() = %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct phylink_mac_ops dpaa2_mac_phylink_ops = {</div><div class='add'>+	.mac_select_pcs = dpaa2_mac_select_pcs,</div><div class='add'>+	.mac_config = dpaa2_mac_config,</div><div class='add'>+	.mac_link_up = dpaa2_mac_link_up,</div><div class='add'>+	.mac_link_down = dpaa2_mac_link_down,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dpaa2_pcs_create(struct dpaa2_mac *mac,</div><div class='add'>+			    struct fwnode_handle *dpmac_node,</div><div class='add'>+			    int id)</div><div class='add'>+{</div><div class='add'>+	struct fwnode_handle *node;</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='add'>+</div><div class='add'>+	node = fwnode_find_reference(dpmac_node, "pcs-handle", 0);</div><div class='add'>+	if (IS_ERR(node)) {</div><div class='add'>+		/* do not error out on old DTS files */</div><div class='add'>+		netdev_warn(mac-&gt;net_dev, "pcs-handle node not found\n");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	pcs = lynx_pcs_create_fwnode(node);</div><div class='add'>+	fwnode_handle_put(node);</div><div class='add'>+</div><div class='add'>+	if (pcs == ERR_PTR(-EPROBE_DEFER)) {</div><div class='add'>+		netdev_dbg(mac-&gt;net_dev, "missing PCS device\n");</div><div class='add'>+		return -EPROBE_DEFER;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (pcs == ERR_PTR(-ENODEV)) {</div><div class='add'>+		netdev_err(mac-&gt;net_dev, "pcs-handle node not available\n");</div><div class='add'>+		return PTR_ERR(pcs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(pcs)) {</div><div class='add'>+		netdev_err(mac-&gt;net_dev,</div><div class='add'>+			   "lynx_pcs_create_fwnode() failed: %pe\n", pcs);</div><div class='add'>+		return PTR_ERR(pcs);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac-&gt;pcs = pcs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_pcs_destroy(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	struct phylink_pcs *phylink_pcs = mac-&gt;pcs;</div><div class='add'>+</div><div class='add'>+	if (phylink_pcs) {</div><div class='add'>+		lynx_pcs_destroy(phylink_pcs);</div><div class='add'>+		mac-&gt;pcs = NULL;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_mac_set_supported_interfaces(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	int intf, err;</div><div class='add'>+</div><div class='add'>+	/* We support the current interface mode, and if we have a PCS</div><div class='add'>+	 * similar interface modes that do not require the SerDes lane to be</div><div class='add'>+	 * reconfigured.</div><div class='add'>+	 */</div><div class='add'>+	__set_bit(mac-&gt;if_mode, mac-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	if (mac-&gt;pcs) {</div><div class='add'>+		switch (mac-&gt;if_mode) {</div><div class='add'>+		case PHY_INTERFACE_MODE_1000BASEX:</div><div class='add'>+		case PHY_INTERFACE_MODE_SGMII:</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_1000BASEX,</div><div class='add'>+				  mac-&gt;phylink_config.supported_interfaces);</div><div class='add'>+			__set_bit(PHY_INTERFACE_MODE_SGMII,</div><div class='add'>+				  mac-&gt;phylink_config.supported_interfaces);</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		default:</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mac-&gt;serdes_phy)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	/* In case we have access to the SerDes phy/lane, then ask the SerDes</div><div class='add'>+	 * driver what interfaces are supported based on the current PLL</div><div class='add'>+	 * configuration.</div><div class='add'>+	 */</div><div class='add'>+	for (intf = 0; intf &lt; PHY_INTERFACE_MODE_MAX; intf++) {</div><div class='add'>+		if (intf == PHY_INTERFACE_MODE_NA)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		err = phy_validate(mac-&gt;serdes_phy, PHY_MODE_ETHERNET, intf, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		__set_bit(intf, mac-&gt;phylink_config.supported_interfaces);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_start(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	if (mac-&gt;serdes_phy)</div><div class='add'>+		phy_power_on(mac-&gt;serdes_phy);</div><div class='add'>+</div><div class='add'>+	phylink_start(mac-&gt;phylink);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_stop(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	phylink_stop(mac-&gt;phylink);</div><div class='add'>+</div><div class='add'>+	if (mac-&gt;serdes_phy)</div><div class='add'>+		phy_power_off(mac-&gt;serdes_phy);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_mac_connect(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net_dev = mac-&gt;net_dev;</div><div class='add'>+	struct fwnode_handle *dpmac_node;</div><div class='add'>+	struct phy *serdes_phy = NULL;</div><div class='add'>+	struct phylink *phylink;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mac-&gt;if_link_type = mac-&gt;attr.link_type;</div><div class='add'>+</div><div class='add'>+	dpmac_node = mac-&gt;fw_node;</div><div class='add'>+	if (!dpmac_node) {</div><div class='add'>+		netdev_err(net_dev, "No dpmac@%d node found.\n", mac-&gt;attr.id);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpaa2_mac_get_if_mode(dpmac_node, mac-&gt;attr);</div><div class='add'>+	if (err &lt; 0)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	mac-&gt;if_mode = err;</div><div class='add'>+</div><div class='add'>+	if (mac-&gt;features &amp; DPAA2_MAC_FEATURE_PROTOCOL_CHANGE &amp;&amp;</div><div class='add'>+	    !phy_interface_mode_is_rgmii(mac-&gt;if_mode) &amp;&amp;</div><div class='add'>+	    is_of_node(dpmac_node)) {</div><div class='add'>+		serdes_phy = of_phy_get(to_of_node(dpmac_node), NULL);</div><div class='add'>+</div><div class='add'>+		if (serdes_phy == ERR_PTR(-ENODEV))</div><div class='add'>+			serdes_phy = NULL;</div><div class='add'>+		else if (IS_ERR(serdes_phy))</div><div class='add'>+			return PTR_ERR(serdes_phy);</div><div class='add'>+		else</div><div class='add'>+			phy_init(serdes_phy);</div><div class='add'>+	}</div><div class='add'>+	mac-&gt;serdes_phy = serdes_phy;</div><div class='add'>+</div><div class='add'>+	/* The MAC does not have the capability to add RGMII delays so</div><div class='add'>+	 * error out if the interface mode requests them and there is no PHY</div><div class='add'>+	 * to act upon them</div><div class='add'>+	 */</div><div class='add'>+	if (of_phy_is_fixed_link(to_of_node(dpmac_node)) &amp;&amp;</div><div class='add'>+	    (mac-&gt;if_mode == PHY_INTERFACE_MODE_RGMII_ID ||</div><div class='add'>+	     mac-&gt;if_mode == PHY_INTERFACE_MODE_RGMII_RXID ||</div><div class='add'>+	     mac-&gt;if_mode == PHY_INTERFACE_MODE_RGMII_TXID)) {</div><div class='add'>+		netdev_err(net_dev, "RGMII delay not supported\n");</div><div class='add'>+		return -EINVAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if ((mac-&gt;attr.link_type == DPMAC_LINK_TYPE_PHY &amp;&amp;</div><div class='add'>+	     mac-&gt;attr.eth_if != DPMAC_ETH_IF_RGMII) ||</div><div class='add'>+	    mac-&gt;attr.link_type == DPMAC_LINK_TYPE_BACKPLANE) {</div><div class='add'>+		err = dpaa2_pcs_create(mac, dpmac_node, mac-&gt;attr.id);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	memset(&amp;mac-&gt;phylink_config, 0, sizeof(mac-&gt;phylink_config));</div><div class='add'>+	mac-&gt;phylink_config.dev = &amp;net_dev-&gt;dev;</div><div class='add'>+	mac-&gt;phylink_config.type = PHYLINK_NETDEV;</div><div class='add'>+</div><div class='add'>+	mac-&gt;phylink_config.mac_capabilities = MAC_SYM_PAUSE | MAC_ASYM_PAUSE |</div><div class='add'>+		MAC_10FD | MAC_100FD | MAC_1000FD | MAC_2500FD | MAC_5000FD |</div><div class='add'>+		MAC_10000FD | MAC_25000FD;</div><div class='add'>+</div><div class='add'>+	dpaa2_mac_set_supported_interfaces(mac);</div><div class='add'>+</div><div class='add'>+	phylink = phylink_create(&amp;mac-&gt;phylink_config,</div><div class='add'>+				 dpmac_node, mac-&gt;if_mode,</div><div class='add'>+				 &amp;dpaa2_mac_phylink_ops);</div><div class='add'>+	if (IS_ERR(phylink)) {</div><div class='add'>+		err = PTR_ERR(phylink);</div><div class='add'>+		goto err_pcs_destroy;</div><div class='add'>+	}</div><div class='add'>+	mac-&gt;phylink = phylink;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	err = phylink_fwnode_phy_connect(mac-&gt;phylink, dpmac_node, 0);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "phylink_fwnode_phy_connect() = %d\n", err);</div><div class='add'>+		goto err_phylink_destroy;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_phylink_destroy:</div><div class='add'>+	phylink_destroy(mac-&gt;phylink);</div><div class='add'>+err_pcs_destroy:</div><div class='add'>+	dpaa2_pcs_destroy(mac);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_disconnect(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	phylink_disconnect_phy(mac-&gt;phylink);</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+</div><div class='add'>+	phylink_destroy(mac-&gt;phylink);</div><div class='add'>+	dpaa2_pcs_destroy(mac);</div><div class='add'>+	of_phy_put(mac-&gt;serdes_phy);</div><div class='add'>+	mac-&gt;serdes_phy = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_mac_open(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_device *dpmac_dev = mac-&gt;mc_dev;</div><div class='add'>+	struct net_device *net_dev = mac-&gt;net_dev;</div><div class='add'>+	struct fwnode_handle *fw_node;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpmac_open(mac-&gt;mc_io, 0, dpmac_dev-&gt;obj_desc.id,</div><div class='add'>+			 &amp;dpmac_dev-&gt;mc_handle);</div><div class='add'>+	if (err || !dpmac_dev-&gt;mc_handle) {</div><div class='add'>+		netdev_err(net_dev, "dpmac_open() = %d\n", err);</div><div class='add'>+		return -ENODEV;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpmac_get_attributes(mac-&gt;mc_io, 0, dpmac_dev-&gt;mc_handle,</div><div class='add'>+				   &amp;mac-&gt;attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dpmac_get_attributes() = %d\n", err);</div><div class='add'>+		goto err_close_dpmac;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpmac_get_api_version(mac-&gt;mc_io, 0, &amp;mac-&gt;ver_major, &amp;mac-&gt;ver_minor);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dpmac_get_api_version() = %d\n", err);</div><div class='add'>+		goto err_close_dpmac;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpaa2_mac_detect_features(mac);</div><div class='add'>+</div><div class='add'>+	/* Find the device node representing the MAC device and link the device</div><div class='add'>+	 * behind the associated netdev to it.</div><div class='add'>+	 */</div><div class='add'>+	fw_node = dpaa2_mac_get_node(&amp;mac-&gt;mc_dev-&gt;dev, mac-&gt;attr.id);</div><div class='add'>+	if (IS_ERR(fw_node)) {</div><div class='add'>+		err = PTR_ERR(fw_node);</div><div class='add'>+		goto err_close_dpmac;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac-&gt;fw_node = fw_node;</div><div class='add'>+	net_dev-&gt;dev.of_node = to_of_node(mac-&gt;fw_node);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_close_dpmac:</div><div class='add'>+	dpmac_close(mac-&gt;mc_io, 0, dpmac_dev-&gt;mc_handle);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_close(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_device *dpmac_dev = mac-&gt;mc_dev;</div><div class='add'>+</div><div class='add'>+	dpmac_close(mac-&gt;mc_io, 0, dpmac_dev-&gt;mc_handle);</div><div class='add'>+	if (mac-&gt;fw_node)</div><div class='add'>+		fwnode_handle_put(mac-&gt;fw_node);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static char dpaa2_mac_ethtool_stats[][ETH_GSTRING_LEN] = {</div><div class='add'>+	[DPMAC_CNT_ING_ALL_FRAME]		= "[mac] rx all frames",</div><div class='add'>+	[DPMAC_CNT_ING_GOOD_FRAME]		= "[mac] rx frames ok",</div><div class='add'>+	[DPMAC_CNT_ING_ERR_FRAME]		= "[mac] rx frame errors",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_DISCARD]		= "[mac] rx frame discards",</div><div class='add'>+	[DPMAC_CNT_ING_UCAST_FRAME]		= "[mac] rx u-cast",</div><div class='add'>+	[DPMAC_CNT_ING_BCAST_FRAME]		= "[mac] rx b-cast",</div><div class='add'>+	[DPMAC_CNT_ING_MCAST_FRAME]		= "[mac] rx m-cast",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_64]		= "[mac] rx 64 bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_127]		= "[mac] rx 65-127 bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_255]		= "[mac] rx 128-255 bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_511]		= "[mac] rx 256-511 bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_1023]		= "[mac] rx 512-1023 bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_1518]		= "[mac] rx 1024-1518 bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAME_1519_MAX]		= "[mac] rx 1519-max bytes",</div><div class='add'>+	[DPMAC_CNT_ING_FRAG]			= "[mac] rx frags",</div><div class='add'>+	[DPMAC_CNT_ING_JABBER]			= "[mac] rx jabber",</div><div class='add'>+	[DPMAC_CNT_ING_ALIGN_ERR]		= "[mac] rx align errors",</div><div class='add'>+	[DPMAC_CNT_ING_OVERSIZED]		= "[mac] rx oversized",</div><div class='add'>+	[DPMAC_CNT_ING_VALID_PAUSE_FRAME]	= "[mac] rx pause",</div><div class='add'>+	[DPMAC_CNT_ING_BYTE]			= "[mac] rx bytes",</div><div class='add'>+	[DPMAC_CNT_EGR_GOOD_FRAME]		= "[mac] tx frames ok",</div><div class='add'>+	[DPMAC_CNT_EGR_UCAST_FRAME]		= "[mac] tx u-cast",</div><div class='add'>+	[DPMAC_CNT_EGR_MCAST_FRAME]		= "[mac] tx m-cast",</div><div class='add'>+	[DPMAC_CNT_EGR_BCAST_FRAME]		= "[mac] tx b-cast",</div><div class='add'>+	[DPMAC_CNT_EGR_ERR_FRAME]		= "[mac] tx frame errors",</div><div class='add'>+	[DPMAC_CNT_EGR_UNDERSIZED]		= "[mac] tx undersized",</div><div class='add'>+	[DPMAC_CNT_EGR_VALID_PAUSE_FRAME]	= "[mac] tx b-pause",</div><div class='add'>+	[DPMAC_CNT_EGR_BYTE]			= "[mac] tx bytes",</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPAA2_MAC_NUM_STATS	ARRAY_SIZE(dpaa2_mac_ethtool_stats)</div><div class='add'>+</div><div class='add'>+int dpaa2_mac_get_sset_count(void)</div><div class='add'>+{</div><div class='add'>+	return DPAA2_MAC_NUM_STATS;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_get_strings(u8 **data)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_MAC_NUM_STATS; i++)</div><div class='add'>+		ethtool_puts(data, dpaa2_mac_ethtool_stats[i]);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_device *dpmac_dev = mac-&gt;mc_dev;</div><div class='add'>+	int i, err;</div><div class='add'>+	u64 value;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_MAC_NUM_STATS; i++) {</div><div class='add'>+		err = dpmac_get_counter(mac-&gt;mc_io, 0, dpmac_dev-&gt;mc_handle,</div><div class='add'>+					i, &amp;value);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err_once(mac-&gt;net_dev,</div><div class='add'>+					"dpmac_get_counter error %d\n", err);</div><div class='add'>+			*(data + i) = U64_MAX;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+		*(data + i) = value;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h<br/>new file mode 100644<br/>index 000000000000..53f8d106d11e<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h</a></div><div class='hunk'>@@ -0,0 +1,60 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='add'>+/* Copyright 2019 NXP */</div><div class='add'>+#ifndef DPAA2_MAC_H</div><div class='add'>+#define DPAA2_MAC_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_mdio.h&gt;</div><div class='add'>+#include &lt;linux/of_net.h&gt;</div><div class='add'>+#include &lt;linux/phylink.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dpmac.h"</div><div class='add'>+#include "dpmac-cmd.h"</div><div class='add'>+</div><div class='add'>+struct dpaa2_mac {</div><div class='add'>+	struct fsl_mc_device *mc_dev;</div><div class='add'>+	struct dpmac_link_state state;</div><div class='add'>+	struct net_device *net_dev;</div><div class='add'>+	struct fsl_mc_io *mc_io;</div><div class='add'>+	struct dpmac_attr attr;</div><div class='add'>+	u16 ver_major, ver_minor;</div><div class='add'>+	unsigned long features;</div><div class='add'>+</div><div class='add'>+	struct phylink_config phylink_config;</div><div class='add'>+	struct phylink *phylink;</div><div class='add'>+	phy_interface_t if_mode;</div><div class='add'>+	enum dpmac_link_type if_link_type;</div><div class='add'>+	struct phylink_pcs *pcs;</div><div class='add'>+	struct fwnode_handle *fw_node;</div><div class='add'>+</div><div class='add'>+	struct phy *serdes_phy;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_mac_is_type_phy(struct dpaa2_mac *mac)</div><div class='add'>+{</div><div class='add'>+	if (!mac)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	return mac-&gt;attr.link_type == DPMAC_LINK_TYPE_PHY ||</div><div class='add'>+	       mac-&gt;attr.link_type == DPMAC_LINK_TYPE_BACKPLANE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_mac_open(struct dpaa2_mac *mac);</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_close(struct dpaa2_mac *mac);</div><div class='add'>+</div><div class='add'>+int dpaa2_mac_connect(struct dpaa2_mac *mac);</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_disconnect(struct dpaa2_mac *mac);</div><div class='add'>+</div><div class='add'>+int dpaa2_mac_get_sset_count(void);</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_get_strings(u8 **data);</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_get_ethtool_stats(struct dpaa2_mac *mac, u64 *data);</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_start(struct dpaa2_mac *mac);</div><div class='add'>+</div><div class='add'>+void dpaa2_mac_stop(struct dpaa2_mac *mac);</div><div class='add'>+</div><div class='add'>+#endif /* DPAA2_MAC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c<br/>index 9b150db3b510..4497e3c0456d 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c</a></div><div class='hunk'>@@ -2,117 +2,74 @@</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='ctx'>  * Copyright 2016-2018 NXP</div><div class='add'>+ * Copyright 2020 NXP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;linux/module.h&gt;</div><div class='del'>-#include &lt;linux/slab.h&gt;</div><div class='del'>-#include &lt;linux/ptp_clock_kernel.h&gt;</div><div class='add'>+#include &lt;linux/of.h&gt;</div><div class='add'>+#include &lt;linux/of_address.h&gt;</div><div class='ctx'> #include &lt;linux/fsl/mc.h&gt;</div><div class='ctx'> </div><div class='ctx'> #include "dpaa2-ptp.h"</div><div class='ctx'> </div><div class='del'>-struct ptp_dpaa2_priv {</div><div class='del'>-	struct fsl_mc_device *ptp_mc_dev;</div><div class='del'>-	struct ptp_clock *clock;</div><div class='del'>-	struct ptp_clock_info caps;</div><div class='del'>-	u32 freq_comp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* PTP clock operations */</div><div class='del'>-static int ptp_dpaa2_adjfreq(struct ptp_clock_info *ptp, s32 ppb)</div><div class='add'>+static int dpaa2_ptp_enable(struct ptp_clock_info *ptp,</div><div class='add'>+			    struct ptp_clock_request *rq, int on)</div><div class='ctx'> {</div><div class='del'>-	struct ptp_dpaa2_priv *ptp_dpaa2 =</div><div class='del'>-		container_of(ptp, struct ptp_dpaa2_priv, caps);</div><div class='del'>-	struct fsl_mc_device *mc_dev = ptp_dpaa2-&gt;ptp_mc_dev;</div><div class='del'>-	struct device *dev = &amp;mc_dev-&gt;dev;</div><div class='del'>-	u64 adj;</div><div class='del'>-	u32 diff, tmr_add;</div><div class='del'>-	int neg_adj = 0;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	if (ppb &lt; 0) {</div><div class='del'>-		neg_adj = 1;</div><div class='del'>-		ppb = -ppb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmr_add = ptp_dpaa2-&gt;freq_comp;</div><div class='del'>-	adj = tmr_add;</div><div class='del'>-	adj *= ppb;</div><div class='del'>-	diff = div_u64(adj, 1000000000ULL);</div><div class='del'>-</div><div class='del'>-	tmr_add = neg_adj ? tmr_add - diff : tmr_add + diff;</div><div class='del'>-</div><div class='del'>-	err = dprtc_set_freq_compensation(mc_dev-&gt;mc_io, 0,</div><div class='del'>-					  mc_dev-&gt;mc_handle, tmr_add);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(dev, "dprtc_set_freq_compensation err %d\n", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='add'>+	struct ptp_qoriq *ptp_qoriq = container_of(ptp, struct ptp_qoriq, caps);</div><div class='add'>+	struct fsl_mc_device *mc_dev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	u32 mask = 0;</div><div class='add'>+	u32 bit;</div><div class='add'>+	int err;</div><div class='ctx'> </div><div class='del'>-static int ptp_dpaa2_adjtime(struct ptp_clock_info *ptp, s64 delta)</div><div class='del'>-{</div><div class='del'>-	struct ptp_dpaa2_priv *ptp_dpaa2 =</div><div class='del'>-		container_of(ptp, struct ptp_dpaa2_priv, caps);</div><div class='del'>-	struct fsl_mc_device *mc_dev = ptp_dpaa2-&gt;ptp_mc_dev;</div><div class='del'>-	struct device *dev = &amp;mc_dev-&gt;dev;</div><div class='del'>-	s64 now;</div><div class='del'>-	int err = 0;</div><div class='add'>+	dev = ptp_qoriq-&gt;dev;</div><div class='add'>+	mc_dev = to_fsl_mc_device(dev);</div><div class='add'>+</div><div class='add'>+	switch (rq-&gt;type) {</div><div class='add'>+	case PTP_CLK_REQ_EXTTS:</div><div class='add'>+		switch (rq-&gt;extts.index) {</div><div class='add'>+		case 0:</div><div class='add'>+			bit = DPRTC_EVENT_ETS1;</div><div class='add'>+			break;</div><div class='add'>+		case 1:</div><div class='add'>+			bit = DPRTC_EVENT_ETS2;</div><div class='add'>+			break;</div><div class='add'>+		default:</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+		if (on)</div><div class='add'>+			extts_clean_up(ptp_qoriq, rq-&gt;extts.index, false);</div><div class='add'>+		break;</div><div class='add'>+	case PTP_CLK_REQ_PPS:</div><div class='add'>+		bit = DPRTC_EVENT_PPS;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='ctx'> </div><div class='del'>-	err = dprtc_get_time(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle, &amp;now);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dprtc_get_time err %d\n", err);</div><div class='add'>+	err = dprtc_get_irq_mask(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle,</div><div class='add'>+				 DPRTC_IRQ_INDEX, &amp;mask);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "dprtc_get_irq_mask(): %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	now += delta;</div><div class='add'>+	if (on)</div><div class='add'>+		mask |= bit;</div><div class='add'>+	else</div><div class='add'>+		mask &amp;= ~bit;</div><div class='ctx'> </div><div class='del'>-	err = dprtc_set_time(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle, now);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(dev, "dprtc_set_time err %d\n", err);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ptp_dpaa2_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)</div><div class='del'>-{</div><div class='del'>-	struct ptp_dpaa2_priv *ptp_dpaa2 =</div><div class='del'>-		container_of(ptp, struct ptp_dpaa2_priv, caps);</div><div class='del'>-	struct fsl_mc_device *mc_dev = ptp_dpaa2-&gt;ptp_mc_dev;</div><div class='del'>-	struct device *dev = &amp;mc_dev-&gt;dev;</div><div class='del'>-	u64 ns;</div><div class='del'>-	u32 remainder;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	err = dprtc_get_time(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle, &amp;ns);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dprtc_get_time err %d\n", err);</div><div class='add'>+	err = dprtc_set_irq_mask(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle,</div><div class='add'>+				 DPRTC_IRQ_INDEX, mask);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "dprtc_set_irq_mask(): %d\n", err);</div><div class='ctx'> 		return err;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ts-&gt;tv_sec = div_u64_rem(ns, 1000000000, &amp;remainder);</div><div class='del'>-	ts-&gt;tv_nsec = remainder;</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int ptp_dpaa2_settime(struct ptp_clock_info *ptp,</div><div class='del'>-			     const struct timespec64 *ts)</div><div class='del'>-{</div><div class='del'>-	struct ptp_dpaa2_priv *ptp_dpaa2 =</div><div class='del'>-		container_of(ptp, struct ptp_dpaa2_priv, caps);</div><div class='del'>-	struct fsl_mc_device *mc_dev = ptp_dpaa2-&gt;ptp_mc_dev;</div><div class='del'>-	struct device *dev = &amp;mc_dev-&gt;dev;</div><div class='del'>-	u64 ns;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	ns = ts-&gt;tv_sec * 1000000000ULL;</div><div class='del'>-	ns += ts-&gt;tv_nsec;</div><div class='del'>-</div><div class='del'>-	err = dprtc_set_time(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle, ns);</div><div class='del'>-	if (err)</div><div class='del'>-		dev_err(dev, "dprtc_set_time err %d\n", err);</div><div class='del'>-	return err;</div><div class='add'>+	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static const struct ptp_clock_info ptp_dpaa2_caps = {</div><div class='add'>+static const struct ptp_clock_info dpaa2_ptp_caps = {</div><div class='ctx'> 	.owner		= THIS_MODULE,</div><div class='ctx'> 	.name		= "DPAA2 PTP Clock",</div><div class='ctx'> 	.max_adj	= 512000,</div><div class='hunk'>@@ -121,21 +78,63 @@ static const struct ptp_clock_info ptp_dpaa2_caps = {</div><div class='ctx'> 	.n_per_out	= 3,</div><div class='ctx'> 	.n_pins		= 0,</div><div class='ctx'> 	.pps		= 1,</div><div class='del'>-	.adjfreq	= ptp_dpaa2_adjfreq,</div><div class='del'>-	.adjtime	= ptp_dpaa2_adjtime,</div><div class='del'>-	.gettime64	= ptp_dpaa2_gettime,</div><div class='del'>-	.settime64	= ptp_dpaa2_settime,</div><div class='add'>+	.adjfine	= ptp_qoriq_adjfine,</div><div class='add'>+	.adjtime	= ptp_qoriq_adjtime,</div><div class='add'>+	.gettime64	= ptp_qoriq_gettime,</div><div class='add'>+	.settime64	= ptp_qoriq_settime,</div><div class='add'>+	.enable		= dpaa2_ptp_enable,</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+static irqreturn_t dpaa2_ptp_irq_handler_thread(int irq, void *priv)</div><div class='add'>+{</div><div class='add'>+	struct ptp_qoriq *ptp_qoriq = priv;</div><div class='add'>+	struct ptp_clock_event event;</div><div class='add'>+	struct fsl_mc_device *mc_dev;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	u32 status = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dev = ptp_qoriq-&gt;dev;</div><div class='add'>+	mc_dev = to_fsl_mc_device(dev);</div><div class='add'>+</div><div class='add'>+	err = dprtc_get_irq_status(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle,</div><div class='add'>+				   DPRTC_IRQ_INDEX, &amp;status);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		dev_err(dev, "dprtc_get_irq_status err %d\n", err);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; DPRTC_EVENT_PPS) {</div><div class='add'>+		event.type = PTP_CLOCK_PPS;</div><div class='add'>+		ptp_clock_event(ptp_qoriq-&gt;clock, &amp;event);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (status &amp; DPRTC_EVENT_ETS1)</div><div class='add'>+		extts_clean_up(ptp_qoriq, 0, true);</div><div class='add'>+</div><div class='add'>+	if (status &amp; DPRTC_EVENT_ETS2)</div><div class='add'>+		extts_clean_up(ptp_qoriq, 1, true);</div><div class='add'>+</div><div class='add'>+	err = dprtc_clear_irq_status(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle,</div><div class='add'>+				     DPRTC_IRQ_INDEX, status);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		dev_err(dev, "dprtc_clear_irq_status err %d\n", err);</div><div class='add'>+		return IRQ_NONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='ctx'> static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev)</div><div class='ctx'> {</div><div class='ctx'> 	struct device *dev = &amp;mc_dev-&gt;dev;</div><div class='del'>-	struct ptp_dpaa2_priv *ptp_dpaa2;</div><div class='del'>-	u32 tmr_add = 0;</div><div class='add'>+	struct ptp_qoriq *ptp_qoriq;</div><div class='add'>+	struct device_node *node;</div><div class='add'>+	void __iomem *base;</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	ptp_dpaa2 = devm_kzalloc(dev, sizeof(*ptp_dpaa2), GFP_KERNEL);</div><div class='del'>-	if (!ptp_dpaa2)</div><div class='add'>+	ptp_qoriq = devm_kzalloc(dev, sizeof(*ptp_qoriq), GFP_KERNEL);</div><div class='add'>+	if (!ptp_qoriq)</div><div class='ctx'> 		return -ENOMEM;</div><div class='ctx'> </div><div class='ctx'> 	err = fsl_mc_portal_allocate(mc_dev, 0, &amp;mc_dev-&gt;mc_io);</div><div class='hunk'>@@ -154,30 +153,64 @@ static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev)</div><div class='ctx'> 		goto err_free_mcp;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ptp_dpaa2-&gt;ptp_mc_dev = mc_dev;</div><div class='add'>+	ptp_qoriq-&gt;dev = dev;</div><div class='ctx'> </div><div class='del'>-	err = dprtc_get_freq_compensation(mc_dev-&gt;mc_io, 0,</div><div class='del'>-					  mc_dev-&gt;mc_handle, &amp;tmr_add);</div><div class='del'>-	if (err) {</div><div class='del'>-		dev_err(dev, "dprtc_get_freq_compensation err %d\n", err);</div><div class='add'>+	node = of_find_compatible_node(NULL, NULL, "fsl,dpaa2-ptp");</div><div class='add'>+	if (!node) {</div><div class='add'>+		err = -ENODEV;</div><div class='ctx'> 		goto err_close;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	ptp_dpaa2-&gt;freq_comp = tmr_add;</div><div class='del'>-	ptp_dpaa2-&gt;caps = ptp_dpaa2_caps;</div><div class='add'>+	dev-&gt;of_node = node;</div><div class='ctx'> </div><div class='del'>-	ptp_dpaa2-&gt;clock = ptp_clock_register(&amp;ptp_dpaa2-&gt;caps, dev);</div><div class='del'>-	if (IS_ERR(ptp_dpaa2-&gt;clock)) {</div><div class='del'>-		err = PTR_ERR(ptp_dpaa2-&gt;clock);</div><div class='del'>-		goto err_close;</div><div class='add'>+	base = of_iomap(node, 0);</div><div class='add'>+	if (!base) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_put;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = fsl_mc_allocate_irqs(mc_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "MC irqs allocation failed\n");</div><div class='add'>+		goto err_unmap;</div><div class='ctx'> 	}</div><div class='ctx'> </div><div class='del'>-	dpaa2_phc_index = ptp_clock_index(ptp_dpaa2-&gt;clock);</div><div class='add'>+	ptp_qoriq-&gt;irq = mc_dev-&gt;irqs[0]-&gt;virq;</div><div class='ctx'> </div><div class='del'>-	dev_set_drvdata(dev, ptp_dpaa2);</div><div class='add'>+	err = request_threaded_irq(ptp_qoriq-&gt;irq, NULL,</div><div class='add'>+				   dpaa2_ptp_irq_handler_thread,</div><div class='add'>+				   IRQF_NO_SUSPEND | IRQF_ONESHOT,</div><div class='add'>+				   dev_name(dev), ptp_qoriq);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "devm_request_threaded_irq(): %d\n", err);</div><div class='add'>+		goto err_free_mc_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dprtc_set_irq_enable(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle,</div><div class='add'>+				   DPRTC_IRQ_INDEX, 1);</div><div class='add'>+	if (err &lt; 0) {</div><div class='add'>+		dev_err(dev, "dprtc_set_irq_enable(): %d\n", err);</div><div class='add'>+		goto err_free_threaded_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = ptp_qoriq_init(ptp_qoriq, base, &amp;dpaa2_ptp_caps);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_threaded_irq;</div><div class='add'>+</div><div class='add'>+	dpaa2_phc_index = ptp_qoriq-&gt;phc_index;</div><div class='add'>+	dpaa2_ptp = ptp_qoriq;</div><div class='add'>+	dev_set_drvdata(dev, ptp_qoriq);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> </div><div class='add'>+err_free_threaded_irq:</div><div class='add'>+	free_irq(ptp_qoriq-&gt;irq, ptp_qoriq);</div><div class='add'>+err_free_mc_irq:</div><div class='add'>+	fsl_mc_free_irqs(mc_dev);</div><div class='add'>+err_unmap:</div><div class='add'>+	iounmap(base);</div><div class='add'>+err_put:</div><div class='add'>+	of_node_put(node);</div><div class='ctx'> err_close:</div><div class='ctx'> 	dprtc_close(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle);</div><div class='ctx'> err_free_mcp:</div><div class='hunk'>@@ -186,18 +219,19 @@ err_exit:</div><div class='ctx'> 	return err;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='del'>-static int dpaa2_ptp_remove(struct fsl_mc_device *mc_dev)</div><div class='add'>+static void dpaa2_ptp_remove(struct fsl_mc_device *mc_dev)</div><div class='ctx'> {</div><div class='del'>-	struct ptp_dpaa2_priv *ptp_dpaa2;</div><div class='ctx'> 	struct device *dev = &amp;mc_dev-&gt;dev;</div><div class='add'>+	struct ptp_qoriq *ptp_qoriq;</div><div class='ctx'> </div><div class='del'>-	ptp_dpaa2 = dev_get_drvdata(dev);</div><div class='del'>-	ptp_clock_unregister(ptp_dpaa2-&gt;clock);</div><div class='add'>+	ptp_qoriq = dev_get_drvdata(dev);</div><div class='ctx'> </div><div class='add'>+	dpaa2_phc_index = -1;</div><div class='add'>+	ptp_qoriq_free(ptp_qoriq);</div><div class='add'>+</div><div class='add'>+	fsl_mc_free_irqs(mc_dev);</div><div class='ctx'> 	dprtc_close(mc_dev-&gt;mc_io, 0, mc_dev-&gt;mc_handle);</div><div class='ctx'> 	fsl_mc_portal_free(mc_dev-&gt;mc_io);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> static const struct fsl_mc_device_id dpaa2_ptp_match_id_table[] = {</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h<br/>index ff2e177395d4..e1023538b4c3 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h</a></div><div class='hunk'>@@ -1,14 +1,18 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2018 NXP</div><div class='add'>+ * Copyright 2020 NXP</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #ifndef __RTC_H</div><div class='ctx'> #define __RTC_H</div><div class='ctx'> </div><div class='add'>+#include &lt;linux/fsl/ptp_qoriq.h&gt;</div><div class='add'>+</div><div class='ctx'> #include "dprtc.h"</div><div class='ctx'> #include "dprtc-cmd.h"</div><div class='ctx'> </div><div class='ctx'> extern int dpaa2_phc_index;</div><div class='add'>+extern struct ptp_qoriq *dpaa2_ptp;</div><div class='ctx'> </div><div class='ctx'> #endif</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c<br/>new file mode 100644<br/>index 000000000000..a888f6e6e9b0<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c</a></div><div class='hunk'>@@ -0,0 +1,221 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * DPAA2 Ethernet Switch ethtool support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2017-2018 NXP</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/ethtool.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dpaa2-switch.h"</div><div class='add'>+</div><div class='add'>+static struct {</div><div class='add'>+	enum dpsw_counter id;</div><div class='add'>+	char name[ETH_GSTRING_LEN];</div><div class='add'>+} dpaa2_switch_ethtool_counters[] =  {</div><div class='add'>+	{DPSW_CNT_ING_FRAME,		"[hw] rx frames"},</div><div class='add'>+	{DPSW_CNT_ING_BYTE,		"[hw] rx bytes"},</div><div class='add'>+	{DPSW_CNT_ING_FLTR_FRAME,	"[hw] rx filtered frames"},</div><div class='add'>+	{DPSW_CNT_ING_FRAME_DISCARD,	"[hw] rx discarded frames"},</div><div class='add'>+	{DPSW_CNT_ING_BCAST_FRAME,	"[hw] rx bcast frames"},</div><div class='add'>+	{DPSW_CNT_ING_BCAST_BYTES,	"[hw] rx bcast bytes"},</div><div class='add'>+	{DPSW_CNT_ING_MCAST_FRAME,	"[hw] rx mcast frames"},</div><div class='add'>+	{DPSW_CNT_ING_MCAST_BYTE,	"[hw] rx mcast bytes"},</div><div class='add'>+	{DPSW_CNT_EGR_FRAME,		"[hw] tx frames"},</div><div class='add'>+	{DPSW_CNT_EGR_BYTE,		"[hw] tx bytes"},</div><div class='add'>+	{DPSW_CNT_EGR_FRAME_DISCARD,	"[hw] tx discarded frames"},</div><div class='add'>+	{DPSW_CNT_ING_NO_BUFF_DISCARD,	"[hw] rx nobuffer discards"},</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPAA2_SWITCH_NUM_COUNTERS	ARRAY_SIZE(dpaa2_switch_ethtool_counters)</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_get_drvinfo(struct net_device *netdev,</div><div class='add'>+				     struct ethtool_drvinfo *drvinfo)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	u16 version_major, version_minor;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	strscpy(drvinfo-&gt;driver, KBUILD_MODNAME, sizeof(drvinfo-&gt;driver));</div><div class='add'>+</div><div class='add'>+	err = dpsw_get_api_version(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				   &amp;version_major,</div><div class='add'>+				   &amp;version_minor);</div><div class='add'>+	if (err)</div><div class='add'>+		strscpy(drvinfo-&gt;fw_version, "N/A",</div><div class='add'>+			sizeof(drvinfo-&gt;fw_version));</div><div class='add'>+	else</div><div class='add'>+		snprintf(drvinfo-&gt;fw_version, sizeof(drvinfo-&gt;fw_version),</div><div class='add'>+			 "%u.%u", version_major, version_minor);</div><div class='add'>+</div><div class='add'>+	strscpy(drvinfo-&gt;bus_info, dev_name(netdev-&gt;dev.parent-&gt;parent),</div><div class='add'>+		sizeof(drvinfo-&gt;bus_info));</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_get_link_ksettings(struct net_device *netdev,</div><div class='add'>+				struct ethtool_link_ksettings *link_ksettings)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct dpsw_link_state state = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_port_is_type_phy(port_priv)) {</div><div class='add'>+		err = phylink_ethtool_ksettings_get(port_priv-&gt;mac-&gt;phylink,</div><div class='add'>+						    link_ksettings);</div><div class='add'>+		mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_link_state(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				     port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				     port_priv-&gt;idx,</div><div class='add'>+				     &amp;state);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "ERROR %d getting link state\n", err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* At the moment, we have no way of interrogating the DPMAC</div><div class='add'>+	 * from the DPSW side or there may not exist a DPMAC at all.</div><div class='add'>+	 * Report only autoneg state, duplexity and speed.</div><div class='add'>+	 */</div><div class='add'>+	if (state.options &amp; DPSW_LINK_OPT_AUTONEG)</div><div class='add'>+		link_ksettings-&gt;base.autoneg = AUTONEG_ENABLE;</div><div class='add'>+	if (!(state.options &amp; DPSW_LINK_OPT_HALF_DUPLEX))</div><div class='add'>+		link_ksettings-&gt;base.duplex = DUPLEX_FULL;</div><div class='add'>+	link_ksettings-&gt;base.speed = state.rate;</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_set_link_ksettings(struct net_device *netdev,</div><div class='add'>+				const struct ethtool_link_ksettings *link_ksettings)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpsw_link_cfg cfg = {0};</div><div class='add'>+	bool if_running;</div><div class='add'>+	int err = 0, ret;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_port_is_type_phy(port_priv)) {</div><div class='add'>+		err = phylink_ethtool_ksettings_set(port_priv-&gt;mac-&gt;phylink,</div><div class='add'>+						    link_ksettings);</div><div class='add'>+		mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	/* Interface needs to be down to change link settings */</div><div class='add'>+	if_running = netif_running(netdev);</div><div class='add'>+	if (if_running) {</div><div class='add'>+		err = dpsw_if_disable(ethsw-&gt;mc_io, 0,</div><div class='add'>+				      ethsw-&gt;dpsw_handle,</div><div class='add'>+				      port_priv-&gt;idx);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(netdev, "dpsw_if_disable err %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	cfg.rate = link_ksettings-&gt;base.speed;</div><div class='add'>+	if (link_ksettings-&gt;base.autoneg == AUTONEG_ENABLE)</div><div class='add'>+		cfg.options |= DPSW_LINK_OPT_AUTONEG;</div><div class='add'>+	else</div><div class='add'>+		cfg.options &amp;= ~DPSW_LINK_OPT_AUTONEG;</div><div class='add'>+	if (link_ksettings-&gt;base.duplex  == DUPLEX_HALF)</div><div class='add'>+		cfg.options |= DPSW_LINK_OPT_HALF_DUPLEX;</div><div class='add'>+	else</div><div class='add'>+		cfg.options &amp;= ~DPSW_LINK_OPT_HALF_DUPLEX;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_set_link_cfg(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				   port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				   port_priv-&gt;idx,</div><div class='add'>+				   &amp;cfg);</div><div class='add'>+</div><div class='add'>+	if (if_running) {</div><div class='add'>+		ret = dpsw_if_enable(ethsw-&gt;mc_io, 0,</div><div class='add'>+				     ethsw-&gt;dpsw_handle,</div><div class='add'>+				     port_priv-&gt;idx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(netdev, "dpsw_if_enable err %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_ethtool_get_sset_count(struct net_device *netdev, int sset)</div><div class='add'>+{</div><div class='add'>+	switch (sset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		return DPAA2_SWITCH_NUM_COUNTERS + dpaa2_mac_get_sset_count();</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_ethtool_get_strings(struct net_device *netdev,</div><div class='add'>+					     u32 stringset, u8 *data)</div><div class='add'>+{</div><div class='add'>+	const char *str;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	switch (stringset) {</div><div class='add'>+	case ETH_SS_STATS:</div><div class='add'>+		for (i = 0; i &lt; DPAA2_SWITCH_NUM_COUNTERS; i++) {</div><div class='add'>+			str = dpaa2_switch_ethtool_counters[i].name;</div><div class='add'>+			ethtool_puts(&amp;data, str);</div><div class='add'>+		}</div><div class='add'>+		dpaa2_mac_get_strings(&amp;data);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_ethtool_get_stats(struct net_device *netdev,</div><div class='add'>+					   struct ethtool_stats *stats,</div><div class='add'>+					   u64 *data)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_NUM_COUNTERS; i++) {</div><div class='add'>+		err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+					  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+					  port_priv-&gt;idx,</div><div class='add'>+					  dpaa2_switch_ethtool_counters[i].id,</div><div class='add'>+					  &amp;data[i]);</div><div class='add'>+		if (err)</div><div class='add'>+			netdev_err(netdev, "dpsw_if_get_counter[%s] err %d\n",</div><div class='add'>+				   dpaa2_switch_ethtool_counters[i].name, err);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_port_has_mac(port_priv))</div><div class='add'>+		dpaa2_mac_get_ethtool_stats(port_priv-&gt;mac, data + i);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+const struct ethtool_ops dpaa2_switch_port_ethtool_ops = {</div><div class='add'>+	.get_drvinfo		= dpaa2_switch_get_drvinfo,</div><div class='add'>+	.get_link		= ethtool_op_get_link,</div><div class='add'>+	.get_link_ksettings	= dpaa2_switch_get_link_ksettings,</div><div class='add'>+	.set_link_ksettings	= dpaa2_switch_set_link_ksettings,</div><div class='add'>+	.get_strings		= dpaa2_switch_ethtool_get_strings,</div><div class='add'>+	.get_ethtool_stats	= dpaa2_switch_ethtool_get_stats,</div><div class='add'>+	.get_sset_count		= dpaa2_switch_ethtool_get_sset_count,</div><div class='add'>+};</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c<br/>new file mode 100644<br/>index 000000000000..701a87370737<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-flower.c</a></div><div class='hunk'>@@ -0,0 +1,891 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * DPAA2 Ethernet Switch flower support</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2021 NXP</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include "dpaa2-switch.h"</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_flower_parse_key(struct flow_cls_offload *cls,</div><div class='add'>+					 struct dpsw_acl_key *acl_key)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct dpsw_acl_fields *acl_h, *acl_m;</div><div class='add'>+</div><div class='add'>+	if (dissector-&gt;used_keys &amp;</div><div class='add'>+	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_ETH_ADDRS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_PORTS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_IP) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_IPV4_ADDRS))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Unsupported keys used");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acl_h = &amp;acl_key-&gt;match;</div><div class='add'>+	acl_m = &amp;acl_key-&gt;mask;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_has_control_flags(rule, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {</div><div class='add'>+		struct flow_match_basic match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_basic(rule, &amp;match);</div><div class='add'>+		acl_h-&gt;l3_protocol = match.key-&gt;ip_proto;</div><div class='add'>+		acl_h-&gt;l2_ether_type = be16_to_cpu(match.key-&gt;n_proto);</div><div class='add'>+		acl_m-&gt;l3_protocol = match.mask-&gt;ip_proto;</div><div class='add'>+		acl_m-&gt;l2_ether_type = be16_to_cpu(match.mask-&gt;n_proto);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ETH_ADDRS)) {</div><div class='add'>+		struct flow_match_eth_addrs match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_eth_addrs(rule, &amp;match);</div><div class='add'>+		ether_addr_copy(acl_h-&gt;l2_dest_mac, &amp;match.key-&gt;dst[0]);</div><div class='add'>+		ether_addr_copy(acl_h-&gt;l2_source_mac, &amp;match.key-&gt;src[0]);</div><div class='add'>+		ether_addr_copy(acl_m-&gt;l2_dest_mac, &amp;match.mask-&gt;dst[0]);</div><div class='add'>+		ether_addr_copy(acl_m-&gt;l2_source_mac, &amp;match.mask-&gt;src[0]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {</div><div class='add'>+		struct flow_match_vlan match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_vlan(rule, &amp;match);</div><div class='add'>+		acl_h-&gt;l2_vlan_id = match.key-&gt;vlan_id;</div><div class='add'>+		acl_h-&gt;l2_tpid = be16_to_cpu(match.key-&gt;vlan_tpid);</div><div class='add'>+		acl_h-&gt;l2_pcp_dei = match.key-&gt;vlan_priority &lt;&lt; 1 |</div><div class='add'>+				    match.key-&gt;vlan_dei;</div><div class='add'>+</div><div class='add'>+		acl_m-&gt;l2_vlan_id = match.mask-&gt;vlan_id;</div><div class='add'>+		acl_m-&gt;l2_tpid = be16_to_cpu(match.mask-&gt;vlan_tpid);</div><div class='add'>+		acl_m-&gt;l2_pcp_dei = match.mask-&gt;vlan_priority &lt;&lt; 1 |</div><div class='add'>+				    match.mask-&gt;vlan_dei;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IPV4_ADDRS)) {</div><div class='add'>+		struct flow_match_ipv4_addrs match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_ipv4_addrs(rule, &amp;match);</div><div class='add'>+		acl_h-&gt;l3_source_ip = be32_to_cpu(match.key-&gt;src);</div><div class='add'>+		acl_h-&gt;l3_dest_ip = be32_to_cpu(match.key-&gt;dst);</div><div class='add'>+		acl_m-&gt;l3_source_ip = be32_to_cpu(match.mask-&gt;src);</div><div class='add'>+		acl_m-&gt;l3_dest_ip = be32_to_cpu(match.mask-&gt;dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) {</div><div class='add'>+		struct flow_match_ports match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_ports(rule, &amp;match);</div><div class='add'>+		acl_h-&gt;l4_source_port = be16_to_cpu(match.key-&gt;src);</div><div class='add'>+		acl_h-&gt;l4_dest_port = be16_to_cpu(match.key-&gt;dst);</div><div class='add'>+		acl_m-&gt;l4_source_port = be16_to_cpu(match.mask-&gt;src);</div><div class='add'>+		acl_m-&gt;l4_dest_port = be16_to_cpu(match.mask-&gt;dst);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_IP)) {</div><div class='add'>+		struct flow_match_ip match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_ip(rule, &amp;match);</div><div class='add'>+		if (match.mask-&gt;ttl != 0) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Matching on TTL not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if ((match.mask-&gt;tos &amp; 0x3) != 0) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Matching on ECN not supported, only DSCP");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		acl_h-&gt;l3_dscp = match.key-&gt;tos &gt;&gt; 2;</div><div class='add'>+		acl_m-&gt;l3_dscp = match.mask-&gt;tos &gt;&gt; 2;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *filter_block,</div><div class='add'>+			       struct dpaa2_switch_acl_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_acl_entry_cfg *acl_entry_cfg = &amp;entry-&gt;cfg;</div><div class='add'>+	struct ethsw_core *ethsw = filter_block-&gt;ethsw;</div><div class='add'>+	struct dpsw_acl_key *acl_key = &amp;entry-&gt;key;</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	u8 *cmd_buff;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd_buff = kzalloc(DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!cmd_buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dpsw_acl_prepare_entry_cfg(acl_key, cmd_buff);</div><div class='add'>+</div><div class='add'>+	acl_entry_cfg-&gt;key_iova = dma_map_single(dev, cmd_buff,</div><div class='add'>+						 DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, acl_entry_cfg-&gt;key_iova))) {</div><div class='add'>+		dev_err(dev, "DMA mapping failed\n");</div><div class='add'>+		kfree(cmd_buff);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_acl_add_entry(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				 filter_block-&gt;acl_id, acl_entry_cfg);</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(dev, acl_entry_cfg-&gt;key_iova,</div><div class='add'>+			 DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE,</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_acl_add_entry() failed %d\n", err);</div><div class='add'>+		kfree(cmd_buff);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(cmd_buff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_acl_entry_remove(struct dpaa2_switch_filter_block *block,</div><div class='add'>+			      struct dpaa2_switch_acl_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_acl_entry_cfg *acl_entry_cfg = &amp;entry-&gt;cfg;</div><div class='add'>+	struct dpsw_acl_key *acl_key = &amp;entry-&gt;key;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	u8 *cmd_buff;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd_buff = kzalloc(DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE, GFP_KERNEL);</div><div class='add'>+	if (!cmd_buff)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	dpsw_acl_prepare_entry_cfg(acl_key, cmd_buff);</div><div class='add'>+</div><div class='add'>+	acl_entry_cfg-&gt;key_iova = dma_map_single(dev, cmd_buff,</div><div class='add'>+						 DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE,</div><div class='add'>+						 DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, acl_entry_cfg-&gt;key_iova))) {</div><div class='add'>+		dev_err(dev, "DMA mapping failed\n");</div><div class='add'>+		kfree(cmd_buff);</div><div class='add'>+		return -EFAULT;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_acl_remove_entry(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				    block-&gt;acl_id, acl_entry_cfg);</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(dev, acl_entry_cfg-&gt;key_iova,</div><div class='add'>+			 DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE, DMA_TO_DEVICE);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_acl_remove_entry() failed %d\n", err);</div><div class='add'>+		kfree(cmd_buff);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(cmd_buff);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_acl_entry_add_to_list(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				   struct dpaa2_switch_acl_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry *tmp;</div><div class='add'>+	struct list_head *pos, *n;</div><div class='add'>+	int index = 0;</div><div class='add'>+</div><div class='add'>+	if (list_empty(&amp;block-&gt;acl_entries)) {</div><div class='add'>+		list_add(&amp;entry-&gt;list, &amp;block-&gt;acl_entries);</div><div class='add'>+		return index;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_for_each_safe(pos, n, &amp;block-&gt;acl_entries) {</div><div class='add'>+		tmp = list_entry(pos, struct dpaa2_switch_acl_entry, list);</div><div class='add'>+		if (entry-&gt;prio &lt; tmp-&gt;prio)</div><div class='add'>+			break;</div><div class='add'>+		index++;</div><div class='add'>+	}</div><div class='add'>+	list_add(&amp;entry-&gt;list, pos-&gt;prev);</div><div class='add'>+	return index;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dpaa2_switch_acl_entry*</div><div class='add'>+dpaa2_switch_acl_entry_get_by_index(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				    int index)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry *tmp;</div><div class='add'>+	int i = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;block-&gt;acl_entries, list) {</div><div class='add'>+		if (i == index)</div><div class='add'>+			return tmp;</div><div class='add'>+		++i;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_acl_entry_set_precedence(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct dpaa2_switch_acl_entry *entry,</div><div class='add'>+				      int precedence)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_acl_entry_remove(block, entry);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	entry-&gt;cfg.precedence = precedence;</div><div class='add'>+	return dpaa2_switch_acl_entry_add(block, entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_acl_tbl_add_entry(struct dpaa2_switch_filter_block *block,</div><div class='add'>+			       struct dpaa2_switch_acl_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry *tmp;</div><div class='add'>+	int index, i, precedence, err;</div><div class='add'>+</div><div class='add'>+	/* Add the new ACL entry to the linked list and get its index */</div><div class='add'>+	index = dpaa2_switch_acl_entry_add_to_list(block, entry);</div><div class='add'>+</div><div class='add'>+	/* Move up in priority the ACL entries to make space</div><div class='add'>+	 * for the new filter.</div><div class='add'>+	 */</div><div class='add'>+	precedence = DPAA2_ETHSW_PORT_MAX_ACL_ENTRIES - block-&gt;num_acl_rules - 1;</div><div class='add'>+	for (i = 0; i &lt; index; i++) {</div><div class='add'>+		tmp = dpaa2_switch_acl_entry_get_by_index(block, i);</div><div class='add'>+</div><div class='add'>+		err = dpaa2_switch_acl_entry_set_precedence(block, tmp,</div><div class='add'>+							    precedence);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		precedence++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add the new entry to hardware */</div><div class='add'>+	entry-&gt;cfg.precedence = precedence;</div><div class='add'>+	err = dpaa2_switch_acl_entry_add(block, entry);</div><div class='add'>+	block-&gt;num_acl_rules++;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dpaa2_switch_acl_entry *</div><div class='add'>+dpaa2_switch_acl_tbl_find_entry_by_cookie(struct dpaa2_switch_filter_block *block,</div><div class='add'>+					  unsigned long cookie)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry *tmp, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(tmp, n, &amp;block-&gt;acl_entries, list) {</div><div class='add'>+		if (tmp-&gt;cookie == cookie)</div><div class='add'>+			return tmp;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_acl_entry_get_index(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				 struct dpaa2_switch_acl_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry *tmp, *n;</div><div class='add'>+	int index = 0;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(tmp, n, &amp;block-&gt;acl_entries, list) {</div><div class='add'>+		if (tmp-&gt;cookie == entry-&gt;cookie)</div><div class='add'>+			return index;</div><div class='add'>+		index++;</div><div class='add'>+	}</div><div class='add'>+	return -ENOENT;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dpaa2_switch_mirror_entry *</div><div class='add'>+dpaa2_switch_mirror_find_entry_by_cookie(struct dpaa2_switch_filter_block *block,</div><div class='add'>+					 unsigned long cookie)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_mirror_entry *tmp, *n;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry_safe(tmp, n, &amp;block-&gt;mirror_entries, list) {</div><div class='add'>+		if (tmp-&gt;cookie == cookie)</div><div class='add'>+			return tmp;</div><div class='add'>+	}</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_acl_tbl_remove_entry(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				  struct dpaa2_switch_acl_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry *tmp;</div><div class='add'>+	int index, i, precedence, err;</div><div class='add'>+</div><div class='add'>+	index = dpaa2_switch_acl_entry_get_index(block, entry);</div><div class='add'>+</div><div class='add'>+	/* Remove from hardware the ACL entry */</div><div class='add'>+	err = dpaa2_switch_acl_entry_remove(block, entry);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	block-&gt;num_acl_rules--;</div><div class='add'>+</div><div class='add'>+	/* Remove it from the list also */</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+</div><div class='add'>+	/* Move down in priority the entries over the deleted one */</div><div class='add'>+	precedence = entry-&gt;cfg.precedence;</div><div class='add'>+	for (i = index - 1; i &gt;= 0; i--) {</div><div class='add'>+		tmp = dpaa2_switch_acl_entry_get_by_index(block, i);</div><div class='add'>+		err = dpaa2_switch_acl_entry_set_precedence(block, tmp,</div><div class='add'>+							    precedence);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		precedence--;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(entry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_tc_parse_action_acl(struct ethsw_core *ethsw,</div><div class='add'>+					    struct flow_action_entry *cls_act,</div><div class='add'>+					    struct dpsw_acl_result *dpsw_act,</div><div class='add'>+					    struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (cls_act-&gt;id) {</div><div class='add'>+	case FLOW_ACTION_TRAP:</div><div class='add'>+		dpsw_act-&gt;action = DPSW_ACL_ACTION_REDIRECT_TO_CTRL_IF;</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_ACTION_REDIRECT:</div><div class='add'>+		if (!dpaa2_switch_port_dev_check(cls_act-&gt;dev)) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Destination not a DPAA2 switch port");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		dpsw_act-&gt;if_id = dpaa2_switch_get_index(ethsw, cls_act-&gt;dev);</div><div class='add'>+		dpsw_act-&gt;action = DPSW_ACL_ACTION_REDIRECT;</div><div class='add'>+		break;</div><div class='add'>+	case FLOW_ACTION_DROP:</div><div class='add'>+		dpsw_act-&gt;action = DPSW_ACL_ACTION_DROP;</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Action not supported");</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_block_add_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+			      struct dpaa2_switch_mirror_entry *entry,</div><div class='add'>+			      u16 to, struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	unsigned long block_ports = block-&gt;ports;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	struct ethsw_port_priv *port_priv;</div><div class='add'>+	unsigned long ports_added = 0;</div><div class='add'>+	u16 vlan = entry-&gt;cfg.vlan_id;</div><div class='add'>+	bool mirror_port_enabled;</div><div class='add'>+	int err, port;</div><div class='add'>+</div><div class='add'>+	/* Setup the mirroring port */</div><div class='add'>+	mirror_port_enabled = (ethsw-&gt;mirror_port != ethsw-&gt;sw_attr.num_ifs);</div><div class='add'>+	if (!mirror_port_enabled) {</div><div class='add'>+		err = dpsw_set_reflection_if(ethsw-&gt;mc_io, 0,</div><div class='add'>+					     ethsw-&gt;dpsw_handle, to);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		ethsw-&gt;mirror_port = to;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup the same egress mirroring configuration on all the switch</div><div class='add'>+	 * ports that share the same filter block.</div><div class='add'>+	 */</div><div class='add'>+	for_each_set_bit(port, &amp;block_ports, ethsw-&gt;sw_attr.num_ifs) {</div><div class='add'>+		port_priv = ethsw-&gt;ports[port];</div><div class='add'>+</div><div class='add'>+		/* We cannot add a per VLAN mirroring rule if the VLAN in</div><div class='add'>+		 * question is not installed on the switch port.</div><div class='add'>+		 */</div><div class='add'>+		if (entry-&gt;cfg.filter == DPSW_REFLECTION_FILTER_INGRESS_VLAN &amp;&amp;</div><div class='add'>+		    !(port_priv-&gt;vlans[vlan] &amp; ETHSW_VLAN_MEMBER)) {</div><div class='add'>+			NL_SET_ERR_MSG(extack,</div><div class='add'>+				       "VLAN must be installed on the switch port");</div><div class='add'>+			err = -EINVAL;</div><div class='add'>+			goto err_remove_filters;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dpsw_if_add_reflection(ethsw-&gt;mc_io, 0,</div><div class='add'>+					     ethsw-&gt;dpsw_handle,</div><div class='add'>+					     port, &amp;entry-&gt;cfg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_remove_filters;</div><div class='add'>+</div><div class='add'>+		ports_added |= BIT(port);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	list_add(&amp;entry-&gt;list, &amp;block-&gt;mirror_entries);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_remove_filters:</div><div class='add'>+	for_each_set_bit(port, &amp;ports_added, ethsw-&gt;sw_attr.num_ifs) {</div><div class='add'>+		dpsw_if_remove_reflection(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					  port, &amp;entry-&gt;cfg);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!mirror_port_enabled)</div><div class='add'>+		ethsw-&gt;mirror_port = ethsw-&gt;sw_attr.num_ifs;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_block_remove_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				 struct dpaa2_switch_mirror_entry *entry)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_reflection_cfg *cfg = &amp;entry-&gt;cfg;</div><div class='add'>+	unsigned long block_ports = block-&gt;ports;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	int port;</div><div class='add'>+</div><div class='add'>+	/* Remove this mirroring configuration from all the ports belonging to</div><div class='add'>+	 * the filter block.</div><div class='add'>+	 */</div><div class='add'>+	for_each_set_bit(port, &amp;block_ports, ethsw-&gt;sw_attr.num_ifs)</div><div class='add'>+		dpsw_if_remove_reflection(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					  port, cfg);</div><div class='add'>+</div><div class='add'>+	/* Also remove it from the list of mirror filters */</div><div class='add'>+	list_del(&amp;entry-&gt;list);</div><div class='add'>+	kfree(entry);</div><div class='add'>+</div><div class='add'>+	/* If this was the last mirror filter, then unset the mirror port */</div><div class='add'>+	if (list_empty(&amp;block-&gt;mirror_entries))</div><div class='add'>+		ethsw-&gt;mirror_port =  ethsw-&gt;sw_attr.num_ifs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_cls_flower_replace_acl(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				    struct flow_cls_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct dpaa2_switch_acl_entry *acl_entry;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_acl_tbl_is_full(block)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Maximum filter capacity reached");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acl_entry = kzalloc(sizeof(*acl_entry), GFP_KERNEL);</div><div class='add'>+	if (!acl_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_flower_parse_key(cls, &amp;acl_entry-&gt;key);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_acl_entry;</div><div class='add'>+</div><div class='add'>+	act = &amp;rule-&gt;action.entries[0];</div><div class='add'>+	err = dpaa2_switch_tc_parse_action_acl(ethsw, act,</div><div class='add'>+					       &amp;acl_entry-&gt;cfg.result, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_acl_entry;</div><div class='add'>+</div><div class='add'>+	acl_entry-&gt;prio = cls-&gt;common.prio;</div><div class='add'>+	acl_entry-&gt;cookie = cls-&gt;cookie;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_acl_tbl_add_entry(block, acl_entry);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_acl_entry;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_acl_entry:</div><div class='add'>+	kfree(acl_entry);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_flower_parse_mirror_key(struct flow_cls_offload *cls,</div><div class='add'>+						u16 *vlan)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct flow_dissector *dissector = rule-&gt;match.dissector;</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	int ret = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (dissector-&gt;used_keys &amp;</div><div class='add'>+	    ~(BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_CONTROL) |</div><div class='add'>+	      BIT_ULL(FLOW_DISSECTOR_KEY_VLAN))) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Mirroring is supported only per VLAN");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_has_control_flags(rule, extack))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_VLAN)) {</div><div class='add'>+		struct flow_match_vlan match;</div><div class='add'>+</div><div class='add'>+		flow_rule_match_vlan(rule, &amp;match);</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;vlan_priority != 0 ||</div><div class='add'>+		    match.mask-&gt;vlan_dei != 0) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Only matching on VLAN ID supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (match.mask-&gt;vlan_id != 0xFFF) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Masked matching not supported");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		*vlan = (u16)match.key-&gt;vlan_id;</div><div class='add'>+		ret = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return ret;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_cls_flower_replace_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				       struct flow_cls_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct dpaa2_switch_mirror_entry *mirror_entry;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	struct dpaa2_switch_mirror_entry *tmp;</div><div class='add'>+	struct flow_action_entry *cls_act;</div><div class='add'>+	struct list_head *pos, *n;</div><div class='add'>+	bool mirror_port_enabled;</div><div class='add'>+	u16 if_id, vlan;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mirror_port_enabled = (ethsw-&gt;mirror_port != ethsw-&gt;sw_attr.num_ifs);</div><div class='add'>+	cls_act = &amp;cls-&gt;rule-&gt;action.entries[0];</div><div class='add'>+</div><div class='add'>+	/* Offload rules only when the destination is a DPAA2 switch port */</div><div class='add'>+	if (!dpaa2_switch_port_dev_check(cls_act-&gt;dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Destination not a DPAA2 switch port");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if_id = dpaa2_switch_get_index(ethsw, cls_act-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* We have a single mirror port but can configure egress mirroring on</div><div class='add'>+	 * all the other switch ports. We need to allow mirroring rules only</div><div class='add'>+	 * when the destination port is the same.</div><div class='add'>+	 */</div><div class='add'>+	if (mirror_port_enabled &amp;&amp; ethsw-&gt;mirror_port != if_id) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Multiple mirror ports not supported");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Parse the key */</div><div class='add'>+	err = dpaa2_switch_flower_parse_mirror_key(cls, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Make sure that we don't already have a mirror rule with the same</div><div class='add'>+	 * configuration.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_safe(pos, n, &amp;block-&gt;mirror_entries) {</div><div class='add'>+		tmp = list_entry(pos, struct dpaa2_switch_mirror_entry, list);</div><div class='add'>+</div><div class='add'>+		if (tmp-&gt;cfg.filter == DPSW_REFLECTION_FILTER_INGRESS_VLAN &amp;&amp;</div><div class='add'>+		    tmp-&gt;cfg.vlan_id == vlan) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "VLAN mirror filter already installed");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mirror_entry = kzalloc(sizeof(*mirror_entry), GFP_KERNEL);</div><div class='add'>+	if (!mirror_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mirror_entry-&gt;cfg.filter = DPSW_REFLECTION_FILTER_INGRESS_VLAN;</div><div class='add'>+	mirror_entry-&gt;cfg.vlan_id = vlan;</div><div class='add'>+	mirror_entry-&gt;cookie = cls-&gt;cookie;</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_block_add_mirror(block, mirror_entry, if_id,</div><div class='add'>+					     extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_flower_replace(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				    struct flow_cls_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+</div><div class='add'>+	if (!flow_offload_has_one_action(&amp;rule-&gt;action)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Only singular actions are supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	act = &amp;rule-&gt;action.entries[0];</div><div class='add'>+	switch (act-&gt;id) {</div><div class='add'>+	case FLOW_ACTION_REDIRECT:</div><div class='add'>+	case FLOW_ACTION_TRAP:</div><div class='add'>+	case FLOW_ACTION_DROP:</div><div class='add'>+		return dpaa2_switch_cls_flower_replace_acl(block, cls);</div><div class='add'>+	case FLOW_ACTION_MIRRED:</div><div class='add'>+		return dpaa2_switch_cls_flower_replace_mirror(block, cls);</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Action not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_flower_destroy(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				    struct flow_cls_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_mirror_entry *mirror_entry;</div><div class='add'>+	struct dpaa2_switch_acl_entry *acl_entry;</div><div class='add'>+</div><div class='add'>+	/* If this filter is a an ACL one, remove it */</div><div class='add'>+	acl_entry = dpaa2_switch_acl_tbl_find_entry_by_cookie(block,</div><div class='add'>+							      cls-&gt;cookie);</div><div class='add'>+	if (acl_entry)</div><div class='add'>+		return dpaa2_switch_acl_tbl_remove_entry(block, acl_entry);</div><div class='add'>+</div><div class='add'>+	/* If not, then it has to be a mirror */</div><div class='add'>+	mirror_entry = dpaa2_switch_mirror_find_entry_by_cookie(block,</div><div class='add'>+								cls-&gt;cookie);</div><div class='add'>+	if (mirror_entry)</div><div class='add'>+		return dpaa2_switch_block_remove_mirror(block,</div><div class='add'>+							mirror_entry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_cls_matchall_replace_acl(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	struct dpaa2_switch_acl_entry *acl_entry;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_acl_tbl_is_full(block)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Maximum filter capacity reached");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	acl_entry = kzalloc(sizeof(*acl_entry), GFP_KERNEL);</div><div class='add'>+	if (!acl_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	act = &amp;cls-&gt;rule-&gt;action.entries[0];</div><div class='add'>+	err = dpaa2_switch_tc_parse_action_acl(ethsw, act,</div><div class='add'>+					       &amp;acl_entry-&gt;cfg.result, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_acl_entry;</div><div class='add'>+</div><div class='add'>+	acl_entry-&gt;prio = cls-&gt;common.prio;</div><div class='add'>+	acl_entry-&gt;cookie = cls-&gt;cookie;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_acl_tbl_add_entry(block, acl_entry);</div><div class='add'>+	if (err)</div><div class='add'>+		goto free_acl_entry;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_acl_entry:</div><div class='add'>+	kfree(acl_entry);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_cls_matchall_replace_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+					 struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct dpaa2_switch_mirror_entry *mirror_entry;</div><div class='add'>+	struct ethsw_core *ethsw = block-&gt;ethsw;</div><div class='add'>+	struct dpaa2_switch_mirror_entry *tmp;</div><div class='add'>+	struct flow_action_entry *cls_act;</div><div class='add'>+	struct list_head *pos, *n;</div><div class='add'>+	bool mirror_port_enabled;</div><div class='add'>+	u16 if_id;</div><div class='add'>+</div><div class='add'>+	mirror_port_enabled = (ethsw-&gt;mirror_port != ethsw-&gt;sw_attr.num_ifs);</div><div class='add'>+	cls_act = &amp;cls-&gt;rule-&gt;action.entries[0];</div><div class='add'>+</div><div class='add'>+	/* Offload rules only when the destination is a DPAA2 switch port */</div><div class='add'>+	if (!dpaa2_switch_port_dev_check(cls_act-&gt;dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Destination not a DPAA2 switch port");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+	if_id = dpaa2_switch_get_index(ethsw, cls_act-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* We have a single mirror port but can configure egress mirroring on</div><div class='add'>+	 * all the other switch ports. We need to allow mirroring rules only</div><div class='add'>+	 * when the destination port is the same.</div><div class='add'>+	 */</div><div class='add'>+	if (mirror_port_enabled &amp;&amp; ethsw-&gt;mirror_port != if_id) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Multiple mirror ports not supported");</div><div class='add'>+		return -EBUSY;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Make sure that we don't already have a mirror rule with the same</div><div class='add'>+	 * configuration. One matchall rule per block is the maximum.</div><div class='add'>+	 */</div><div class='add'>+	list_for_each_safe(pos, n, &amp;block-&gt;mirror_entries) {</div><div class='add'>+		tmp = list_entry(pos, struct dpaa2_switch_mirror_entry, list);</div><div class='add'>+</div><div class='add'>+		if (tmp-&gt;cfg.filter == DPSW_REFLECTION_FILTER_INGRESS_ALL) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Matchall mirror filter already installed");</div><div class='add'>+			return -EBUSY;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mirror_entry = kzalloc(sizeof(*mirror_entry), GFP_KERNEL);</div><div class='add'>+	if (!mirror_entry)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	mirror_entry-&gt;cfg.filter = DPSW_REFLECTION_FILTER_INGRESS_ALL;</div><div class='add'>+	mirror_entry-&gt;cookie = cls-&gt;cookie;</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_block_add_mirror(block, mirror_entry, if_id,</div><div class='add'>+					     extack);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_matchall_replace(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack = cls-&gt;common.extack;</div><div class='add'>+	struct flow_action_entry *act;</div><div class='add'>+</div><div class='add'>+	if (!flow_offload_has_one_action(&amp;cls-&gt;rule-&gt;action)) {</div><div class='add'>+		NL_SET_ERR_MSG(extack, "Only singular actions are supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	act = &amp;cls-&gt;rule-&gt;action.entries[0];</div><div class='add'>+	switch (act-&gt;id) {</div><div class='add'>+	case FLOW_ACTION_REDIRECT:</div><div class='add'>+	case FLOW_ACTION_TRAP:</div><div class='add'>+	case FLOW_ACTION_DROP:</div><div class='add'>+		return dpaa2_switch_cls_matchall_replace_acl(block, cls);</div><div class='add'>+	case FLOW_ACTION_MIRRED:</div><div class='add'>+		return dpaa2_switch_cls_matchall_replace_mirror(block, cls);</div><div class='add'>+	default:</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Action not supported");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_block_offload_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpaa2_switch_mirror_entry *tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;block-&gt;mirror_entries, list) {</div><div class='add'>+		err = dpsw_if_add_reflection(ethsw-&gt;mc_io, 0,</div><div class='add'>+					     ethsw-&gt;dpsw_handle,</div><div class='add'>+					     port_priv-&gt;idx, &amp;tmp-&gt;cfg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unwind_add;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unwind_add:</div><div class='add'>+	list_for_each_entry(tmp, &amp;block-&gt;mirror_entries, list)</div><div class='add'>+		dpsw_if_remove_reflection(ethsw-&gt;mc_io, 0,</div><div class='add'>+					  ethsw-&gt;dpsw_handle,</div><div class='add'>+					  port_priv-&gt;idx, &amp;tmp-&gt;cfg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_block_unoffload_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+					struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpaa2_switch_mirror_entry *tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	list_for_each_entry(tmp, &amp;block-&gt;mirror_entries, list) {</div><div class='add'>+		err = dpsw_if_remove_reflection(ethsw-&gt;mc_io, 0,</div><div class='add'>+						ethsw-&gt;dpsw_handle,</div><div class='add'>+						port_priv-&gt;idx, &amp;tmp-&gt;cfg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto unwind_remove;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+unwind_remove:</div><div class='add'>+	list_for_each_entry(tmp, &amp;block-&gt;mirror_entries, list)</div><div class='add'>+		dpsw_if_add_reflection(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				       port_priv-&gt;idx, &amp;tmp-&gt;cfg);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_matchall_destroy(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct tc_cls_matchall_offload *cls)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_mirror_entry *mirror_entry;</div><div class='add'>+	struct dpaa2_switch_acl_entry *acl_entry;</div><div class='add'>+</div><div class='add'>+	/* If this filter is a an ACL one, remove it */</div><div class='add'>+	acl_entry = dpaa2_switch_acl_tbl_find_entry_by_cookie(block,</div><div class='add'>+							      cls-&gt;cookie);</div><div class='add'>+	if (acl_entry)</div><div class='add'>+		return dpaa2_switch_acl_tbl_remove_entry(block,</div><div class='add'>+							 acl_entry);</div><div class='add'>+</div><div class='add'>+	/* If not, then it has to be a mirror */</div><div class='add'>+	mirror_entry = dpaa2_switch_mirror_find_entry_by_cookie(block,</div><div class='add'>+								cls-&gt;cookie);</div><div class='add'>+	if (mirror_entry)</div><div class='add'>+		return dpaa2_switch_block_remove_mirror(block,</div><div class='add'>+							mirror_entry);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c<br/>new file mode 100644<br/>index 000000000000..b1e1ad9e4b48<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c</a></div><div class='hunk'>@@ -0,0 +1,3595 @@</div><div class='add'>+// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/*</div><div class='add'>+ * DPAA2 Ethernet Switch driver</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2017-2021 NXP</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#include &lt;linux/module.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/interrupt.h&gt;</div><div class='add'>+#include &lt;linux/kthread.h&gt;</div><div class='add'>+#include &lt;linux/workqueue.h&gt;</div><div class='add'>+#include &lt;linux/iommu.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+</div><div class='add'>+#include &lt;linux/fsl/mc.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dpaa2-switch.h"</div><div class='add'>+</div><div class='add'>+/* Minimal supported DPSW version */</div><div class='add'>+#define DPSW_MIN_VER_MAJOR		8</div><div class='add'>+#define DPSW_MIN_VER_MINOR		9</div><div class='add'>+</div><div class='add'>+#define DEFAULT_VLAN_ID			1</div><div class='add'>+</div><div class='add'>+static u16 dpaa2_switch_port_get_fdb_id(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	return port_priv-&gt;fdb-&gt;fdb_id;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dpaa2_switch_fdb *dpaa2_switch_fdb_get_unused(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++)</div><div class='add'>+		if (!ethsw-&gt;fdbs[i].in_use)</div><div class='add'>+			return &amp;ethsw-&gt;fdbs[i];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static struct dpaa2_switch_filter_block *</div><div class='add'>+dpaa2_switch_filter_block_get_unused(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++)</div><div class='add'>+		if (!ethsw-&gt;filter_blocks[i].in_use)</div><div class='add'>+			return &amp;ethsw-&gt;filter_blocks[i];</div><div class='add'>+	return NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u16 dpaa2_switch_port_set_fdb(struct ethsw_port_priv *port_priv,</div><div class='add'>+				     struct net_device *bridge_dev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *other_port_priv = NULL;</div><div class='add'>+	struct dpaa2_switch_fdb *fdb;</div><div class='add'>+	struct net_device *other_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	/* If we leave a bridge (bridge_dev is NULL), find an unused</div><div class='add'>+	 * FDB and use that.</div><div class='add'>+	 */</div><div class='add'>+	if (!bridge_dev) {</div><div class='add'>+		fdb = dpaa2_switch_fdb_get_unused(port_priv-&gt;ethsw_data);</div><div class='add'>+</div><div class='add'>+		/* If there is no unused FDB, we must be the last port that</div><div class='add'>+		 * leaves the last bridge, all the others are standalone. We</div><div class='add'>+		 * can just keep the FDB that we already have.</div><div class='add'>+		 */</div><div class='add'>+</div><div class='add'>+		if (!fdb) {</div><div class='add'>+			port_priv-&gt;fdb-&gt;bridge_dev = NULL;</div><div class='add'>+			return 0;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		port_priv-&gt;fdb = fdb;</div><div class='add'>+		port_priv-&gt;fdb-&gt;in_use = true;</div><div class='add'>+		port_priv-&gt;fdb-&gt;bridge_dev = NULL;</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The below call to netdev_for_each_lower_dev() demands the RTNL lock</div><div class='add'>+	 * being held. Assert on it so that it's easier to catch new code</div><div class='add'>+	 * paths that reach this point without the RTNL lock.</div><div class='add'>+	 */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* If part of a bridge, use the FDB of the first dpaa2 switch interface</div><div class='add'>+	 * to be present in that bridge</div><div class='add'>+	 */</div><div class='add'>+	netdev_for_each_lower_dev(bridge_dev, other_dev, iter) {</div><div class='add'>+		if (!dpaa2_switch_port_dev_check(other_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (other_dev == port_priv-&gt;netdev)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		other_port_priv = netdev_priv(other_dev);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* The current port is about to change its FDB to the one used by the</div><div class='add'>+	 * first port that joined the bridge.</div><div class='add'>+	 */</div><div class='add'>+	if (other_port_priv) {</div><div class='add'>+		/* The previous FDB is about to become unused, since the</div><div class='add'>+		 * interface is no longer standalone.</div><div class='add'>+		 */</div><div class='add'>+		port_priv-&gt;fdb-&gt;in_use = false;</div><div class='add'>+		port_priv-&gt;fdb-&gt;bridge_dev = NULL;</div><div class='add'>+</div><div class='add'>+		/* Get a reference to the new FDB */</div><div class='add'>+		port_priv-&gt;fdb = other_port_priv-&gt;fdb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Keep track of the new upper bridge device */</div><div class='add'>+	port_priv-&gt;fdb-&gt;bridge_dev = bridge_dev;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_fdb_get_flood_cfg(struct ethsw_core *ethsw, u16 fdb_id,</div><div class='add'>+					   enum dpsw_flood_type type,</div><div class='add'>+					   struct dpsw_egress_flood_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	int i = 0, j;</div><div class='add'>+</div><div class='add'>+	memset(cfg, 0, sizeof(*cfg));</div><div class='add'>+</div><div class='add'>+	/* Add all the DPAA2 switch ports found in the same bridging domain to</div><div class='add'>+	 * the egress flooding domain</div><div class='add'>+	 */</div><div class='add'>+	for (j = 0; j &lt; ethsw-&gt;sw_attr.num_ifs; j++) {</div><div class='add'>+		if (!ethsw-&gt;ports[j])</div><div class='add'>+			continue;</div><div class='add'>+		if (ethsw-&gt;ports[j]-&gt;fdb-&gt;fdb_id != fdb_id)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		if (type == DPSW_BROADCAST &amp;&amp; ethsw-&gt;ports[j]-&gt;bcast_flood)</div><div class='add'>+			cfg-&gt;if_id[i++] = ethsw-&gt;ports[j]-&gt;idx;</div><div class='add'>+		else if (type == DPSW_FLOODING &amp;&amp; ethsw-&gt;ports[j]-&gt;ucast_flood)</div><div class='add'>+			cfg-&gt;if_id[i++] = ethsw-&gt;ports[j]-&gt;idx;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add the CTRL interface to the egress flooding domain */</div><div class='add'>+	cfg-&gt;if_id[i++] = ethsw-&gt;sw_attr.num_ifs;</div><div class='add'>+</div><div class='add'>+	cfg-&gt;fdb_id = fdb_id;</div><div class='add'>+	cfg-&gt;flood_type = type;</div><div class='add'>+	cfg-&gt;num_ifs = i;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_fdb_set_egress_flood(struct ethsw_core *ethsw, u16 fdb_id)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_egress_flood_cfg flood_cfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Setup broadcast flooding domain */</div><div class='add'>+	dpaa2_switch_fdb_get_flood_cfg(ethsw, fdb_id, DPSW_BROADCAST, &amp;flood_cfg);</div><div class='add'>+	err = dpsw_set_egress_flood(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				    &amp;flood_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "dpsw_set_egress_flood() = %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Setup unknown flooding domain */</div><div class='add'>+	dpaa2_switch_fdb_get_flood_cfg(ethsw, fdb_id, DPSW_FLOODING, &amp;flood_cfg);</div><div class='add'>+	err = dpsw_set_egress_flood(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				    &amp;flood_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "dpsw_set_egress_flood() = %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void *dpaa2_iova_to_virt(struct iommu_domain *domain,</div><div class='add'>+				dma_addr_t iova_addr)</div><div class='add'>+{</div><div class='add'>+	phys_addr_t phys_addr;</div><div class='add'>+</div><div class='add'>+	phys_addr = domain ? iommu_iova_to_phys(domain, iova_addr) : iova_addr;</div><div class='add'>+</div><div class='add'>+	return phys_to_virt(phys_addr);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_add_vlan(struct ethsw_port_priv *port_priv, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpsw_vlan_cfg vcfg = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	vcfg.fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	err = dpsw_vlan_add(ethsw-&gt;mc_io, 0,</div><div class='add'>+			    ethsw-&gt;dpsw_handle, vid, &amp;vcfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "dpsw_vlan_add err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	ethsw-&gt;vlans[vid] = ETHSW_VLAN_MEMBER;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dpaa2_switch_port_is_up(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct dpsw_link_state state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_link_state(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				     port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				     port_priv-&gt;idx, &amp;state);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_if_get_link_state() err %d\n", err);</div><div class='add'>+		return true;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(state.up &gt; 1, "Garbage read into link_state");</div><div class='add'>+</div><div class='add'>+	return state.up ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_set_pvid(struct ethsw_port_priv *port_priv, u16 pvid)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct dpsw_tci_cfg tci_cfg = { 0 };</div><div class='add'>+	bool up;</div><div class='add'>+	int err, ret;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_tci(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+			      port_priv-&gt;idx, &amp;tci_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_if_get_tci err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	tci_cfg.vlan_id = pvid;</div><div class='add'>+</div><div class='add'>+	/* Interface needs to be down to change PVID */</div><div class='add'>+	up = dpaa2_switch_port_is_up(port_priv);</div><div class='add'>+	if (up) {</div><div class='add'>+		err = dpsw_if_disable(ethsw-&gt;mc_io, 0,</div><div class='add'>+				      ethsw-&gt;dpsw_handle,</div><div class='add'>+				      port_priv-&gt;idx);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(netdev, "dpsw_if_disable err %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_set_tci(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+			      port_priv-&gt;idx, &amp;tci_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_if_set_tci err %d\n", err);</div><div class='add'>+		goto set_tci_error;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Delete previous PVID info and mark the new one */</div><div class='add'>+	port_priv-&gt;vlans[port_priv-&gt;pvid] &amp;= ~ETHSW_VLAN_PVID;</div><div class='add'>+	port_priv-&gt;vlans[pvid] |= ETHSW_VLAN_PVID;</div><div class='add'>+	port_priv-&gt;pvid = pvid;</div><div class='add'>+</div><div class='add'>+set_tci_error:</div><div class='add'>+	if (up) {</div><div class='add'>+		ret = dpsw_if_enable(ethsw-&gt;mc_io, 0,</div><div class='add'>+				     ethsw-&gt;dpsw_handle,</div><div class='add'>+				     port_priv-&gt;idx);</div><div class='add'>+		if (ret) {</div><div class='add'>+			netdev_err(netdev, "dpsw_if_enable err %d\n", ret);</div><div class='add'>+			return ret;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_add_vlan(struct ethsw_port_priv *port_priv,</div><div class='add'>+				      u16 vid, u16 flags)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct dpsw_vlan_if_cfg vcfg = {0};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port_priv-&gt;vlans[vid]) {</div><div class='add'>+		netdev_err(netdev, "VLAN %d already configured\n", vid);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If hit, this VLAN rule will lead the packet into the FDB table</div><div class='add'>+	 * specified in the vlan configuration below</div><div class='add'>+	 */</div><div class='add'>+	vcfg.num_ifs = 1;</div><div class='add'>+	vcfg.if_id[0] = port_priv-&gt;idx;</div><div class='add'>+	vcfg.fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	vcfg.options |= DPSW_VLAN_ADD_IF_OPT_FDB_ID;</div><div class='add'>+	err = dpsw_vlan_add_if(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, vid, &amp;vcfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_vlan_add_if err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;vlans[vid] = ETHSW_VLAN_MEMBER;</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BRIDGE_VLAN_INFO_UNTAGGED) {</div><div class='add'>+		err = dpsw_vlan_add_if_untagged(ethsw-&gt;mc_io, 0,</div><div class='add'>+						ethsw-&gt;dpsw_handle,</div><div class='add'>+						vid, &amp;vcfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "dpsw_vlan_add_if_untagged err %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		port_priv-&gt;vlans[vid] |= ETHSW_VLAN_UNTAGGED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags &amp; BRIDGE_VLAN_INFO_PVID) {</div><div class='add'>+		err = dpaa2_switch_port_set_pvid(port_priv, vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static enum dpsw_stp_state br_stp_state_to_dpsw(u8 state)</div><div class='add'>+{</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+		return DPSW_STP_STATE_DISABLED;</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		return DPSW_STP_STATE_LISTENING;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+		return DPSW_STP_STATE_LEARNING;</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		return DPSW_STP_STATE_FORWARDING;</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+		return DPSW_STP_STATE_BLOCKING;</div><div class='add'>+	default:</div><div class='add'>+		return DPSW_STP_STATE_DISABLED;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_set_stp_state(struct ethsw_port_priv *port_priv, u8 state)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_stp_cfg stp_cfg = {0};</div><div class='add'>+	int err;</div><div class='add'>+	u16 vid;</div><div class='add'>+</div><div class='add'>+	if (!netif_running(port_priv-&gt;netdev) || state == port_priv-&gt;stp_state)</div><div class='add'>+		return 0;	/* Nothing to do */</div><div class='add'>+</div><div class='add'>+	stp_cfg.state = br_stp_state_to_dpsw(state);</div><div class='add'>+	for (vid = 0; vid &lt;= VLAN_VID_MASK; vid++) {</div><div class='add'>+		if (port_priv-&gt;vlans[vid] &amp; ETHSW_VLAN_MEMBER) {</div><div class='add'>+			stp_cfg.vlan_id = vid;</div><div class='add'>+			err = dpsw_if_set_stp(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+					      port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+					      port_priv-&gt;idx, &amp;stp_cfg);</div><div class='add'>+			if (err) {</div><div class='add'>+				netdev_err(port_priv-&gt;netdev,</div><div class='add'>+					   "dpsw_if_set_stp err %d\n", err);</div><div class='add'>+				return err;</div><div class='add'>+			}</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;stp_state = state;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_dellink(struct ethsw_core *ethsw, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *ppriv_local = NULL;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!ethsw-&gt;vlans[vid])</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = dpsw_vlan_remove(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, vid);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "dpsw_vlan_remove err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	ethsw-&gt;vlans[vid] = 0;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++) {</div><div class='add'>+		ppriv_local = ethsw-&gt;ports[i];</div><div class='add'>+		if (ppriv_local)</div><div class='add'>+			ppriv_local-&gt;vlans[vid] = 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_fdb_add_uc(struct ethsw_port_priv *port_priv,</div><div class='add'>+					const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_fdb_unicast_cfg entry = {0};</div><div class='add'>+	u16 fdb_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	entry.if_egress = port_priv-&gt;idx;</div><div class='add'>+	entry.type = DPSW_FDB_ENTRY_STATIC;</div><div class='add'>+	ether_addr_copy(entry.mac_addr, addr);</div><div class='add'>+</div><div class='add'>+	fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	err = dpsw_fdb_add_unicast(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				   port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				   fdb_id, &amp;entry);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(port_priv-&gt;netdev,</div><div class='add'>+			   "dpsw_fdb_add_unicast err %d\n", err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_fdb_del_uc(struct ethsw_port_priv *port_priv,</div><div class='add'>+					const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_fdb_unicast_cfg entry = {0};</div><div class='add'>+	u16 fdb_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	entry.if_egress = port_priv-&gt;idx;</div><div class='add'>+	entry.type = DPSW_FDB_ENTRY_STATIC;</div><div class='add'>+	ether_addr_copy(entry.mac_addr, addr);</div><div class='add'>+</div><div class='add'>+	fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	err = dpsw_fdb_remove_unicast(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				      port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				      fdb_id, &amp;entry);</div><div class='add'>+	/* Silently discard error for calling multiple times the del command */</div><div class='add'>+	if (err &amp;&amp; err != -ENXIO)</div><div class='add'>+		netdev_err(port_priv-&gt;netdev,</div><div class='add'>+			   "dpsw_fdb_remove_unicast err %d\n", err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_fdb_add_mc(struct ethsw_port_priv *port_priv,</div><div class='add'>+					const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_fdb_multicast_cfg entry = {0};</div><div class='add'>+	u16 fdb_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(entry.mac_addr, addr);</div><div class='add'>+	entry.type = DPSW_FDB_ENTRY_STATIC;</div><div class='add'>+	entry.num_ifs = 1;</div><div class='add'>+	entry.if_id[0] = port_priv-&gt;idx;</div><div class='add'>+</div><div class='add'>+	fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	err = dpsw_fdb_add_multicast(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				     port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				     fdb_id, &amp;entry);</div><div class='add'>+	/* Silently discard error for calling multiple times the add command */</div><div class='add'>+	if (err &amp;&amp; err != -ENXIO)</div><div class='add'>+		netdev_err(port_priv-&gt;netdev, "dpsw_fdb_add_multicast err %d\n",</div><div class='add'>+			   err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_fdb_del_mc(struct ethsw_port_priv *port_priv,</div><div class='add'>+					const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_fdb_multicast_cfg entry = {0};</div><div class='add'>+	u16 fdb_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	ether_addr_copy(entry.mac_addr, addr);</div><div class='add'>+	entry.type = DPSW_FDB_ENTRY_STATIC;</div><div class='add'>+	entry.num_ifs = 1;</div><div class='add'>+	entry.if_id[0] = port_priv-&gt;idx;</div><div class='add'>+</div><div class='add'>+	fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	err = dpsw_fdb_remove_multicast(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+					port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+					fdb_id, &amp;entry);</div><div class='add'>+	/* Silently discard error for calling multiple times the del command */</div><div class='add'>+	if (err &amp;&amp; err != -ENAVAIL)</div><div class='add'>+		netdev_err(port_priv-&gt;netdev,</div><div class='add'>+			   "dpsw_fdb_remove_multicast err %d\n", err);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_port_get_stats(struct net_device *netdev,</div><div class='add'>+					struct rtnl_link_stats64 *stats)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	u64 tmp;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_ING_FRAME, &amp;stats-&gt;rx_packets);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_EGR_FRAME, &amp;stats-&gt;tx_packets);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_ING_BYTE, &amp;stats-&gt;rx_bytes);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_EGR_BYTE, &amp;stats-&gt;tx_bytes);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_ING_FRAME_DISCARD,</div><div class='add'>+				  &amp;stats-&gt;rx_dropped);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_ING_FLTR_FRAME,</div><div class='add'>+				  &amp;tmp);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+	stats-&gt;rx_dropped += tmp;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_counter(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				  port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				  port_priv-&gt;idx,</div><div class='add'>+				  DPSW_CNT_EGR_FRAME_DISCARD,</div><div class='add'>+				  &amp;stats-&gt;tx_dropped);</div><div class='add'>+	if (err)</div><div class='add'>+		goto error;</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+error:</div><div class='add'>+	netdev_err(netdev, "dpsw_if_get_counter err %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static bool dpaa2_switch_port_has_offload_stats(const struct net_device *netdev,</div><div class='add'>+						int attr_id)</div><div class='add'>+{</div><div class='add'>+	return (attr_id == IFLA_OFFLOAD_XSTATS_CPU_HIT);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_get_offload_stats(int attr_id,</div><div class='add'>+					       const struct net_device *netdev,</div><div class='add'>+					       void *sp)</div><div class='add'>+{</div><div class='add'>+	switch (attr_id) {</div><div class='add'>+	case IFLA_OFFLOAD_XSTATS_CPU_HIT:</div><div class='add'>+		dpaa2_switch_port_get_stats((struct net_device *)netdev, sp);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_change_mtu(struct net_device *netdev, int mtu)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_set_max_frame_length(port_priv-&gt;ethsw_data-&gt;mc_io,</div><div class='add'>+					   0,</div><div class='add'>+					   port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+					   port_priv-&gt;idx,</div><div class='add'>+					   (u16)ETHSW_L2_MAX_FRM(mtu));</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev,</div><div class='add'>+			   "dpsw_if_set_max_frame_length() err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WRITE_ONCE(netdev-&gt;mtu, mtu);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_link_state_update(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct dpsw_link_state state;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* When we manage the MAC/PHY using phylink there is no need</div><div class='add'>+	 * to manually update the netif_carrier.</div><div class='add'>+	 * We can avoid locking because we are called from the "link changed"</div><div class='add'>+	 * IRQ handler, which is the same as the "endpoint changed" IRQ handler</div><div class='add'>+	 * (the writer to port_priv-&gt;mac), so we cannot race with it.</div><div class='add'>+	 */</div><div class='add'>+	if (dpaa2_mac_is_type_phy(port_priv-&gt;mac))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Interrupts are received even though no one issued an 'ifconfig up'</div><div class='add'>+	 * on the switch interface. Ignore these link state update interrupts</div><div class='add'>+	 */</div><div class='add'>+	if (!netif_running(netdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_get_link_state(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+				     port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+				     port_priv-&gt;idx, &amp;state);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_if_get_link_state() err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	WARN_ONCE(state.up &gt; 1, "Garbage read into link_state");</div><div class='add'>+</div><div class='add'>+	if (state.up != port_priv-&gt;link_state) {</div><div class='add'>+		if (state.up) {</div><div class='add'>+			netif_carrier_on(netdev);</div><div class='add'>+			netif_tx_start_all_queues(netdev);</div><div class='add'>+		} else {</div><div class='add'>+			netif_carrier_off(netdev);</div><div class='add'>+			netif_tx_stop_all_queues(netdev);</div><div class='add'>+		}</div><div class='add'>+		port_priv-&gt;link_state = state.up;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Manage all NAPI instances for the control interface.</div><div class='add'>+ *</div><div class='add'>+ * We only have one RX queue and one Tx Conf queue for all</div><div class='add'>+ * switch ports. Therefore, we only need to enable the NAPI instance once, the</div><div class='add'>+ * first time one of the switch ports runs .dev_open().</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_enable_ctrl_if_napi(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Access to the ethsw-&gt;napi_users relies on the RTNL lock */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* a new interface is using the NAPI instance */</div><div class='add'>+	ethsw-&gt;napi_users++;</div><div class='add'>+</div><div class='add'>+	/* if there is already a user of the instance, return */</div><div class='add'>+	if (ethsw-&gt;napi_users &gt; 1)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++)</div><div class='add'>+		napi_enable(&amp;ethsw-&gt;fq[i].napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_disable_ctrl_if_napi(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	/* Access to the ethsw-&gt;napi_users relies on the RTNL lock */</div><div class='add'>+	ASSERT_RTNL();</div><div class='add'>+</div><div class='add'>+	/* If we are not the last interface using the NAPI, return */</div><div class='add'>+	ethsw-&gt;napi_users--;</div><div class='add'>+	if (ethsw-&gt;napi_users)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++)</div><div class='add'>+		napi_disable(&amp;ethsw-&gt;fq[i].napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_open(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_port_is_type_phy(port_priv)) {</div><div class='add'>+		/* Explicitly set carrier off, otherwise</div><div class='add'>+		 * netif_carrier_ok() will return true and cause 'ip link show'</div><div class='add'>+		 * to report the LOWER_UP flag, even though the link</div><div class='add'>+		 * notification wasn't even received.</div><div class='add'>+		 */</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_enable(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+			     port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+			     port_priv-&gt;idx);</div><div class='add'>+	if (err) {</div><div class='add'>+		mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+		netdev_err(netdev, "dpsw_if_enable err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_enable_ctrl_if_napi(ethsw);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_port_is_type_phy(port_priv))</div><div class='add'>+		dpaa2_mac_start(port_priv-&gt;mac);</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_stop(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (dpaa2_switch_port_is_type_phy(port_priv)) {</div><div class='add'>+		dpaa2_mac_stop(port_priv-&gt;mac);</div><div class='add'>+	} else {</div><div class='add'>+		netif_tx_stop_all_queues(netdev);</div><div class='add'>+		netif_carrier_off(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_disable(port_priv-&gt;ethsw_data-&gt;mc_io, 0,</div><div class='add'>+			      port_priv-&gt;ethsw_data-&gt;dpsw_handle,</div><div class='add'>+			      port_priv-&gt;idx);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_if_disable err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_disable_ctrl_if_napi(ethsw);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_parent_id(struct net_device *dev,</div><div class='add'>+				       struct netdev_phys_item_id *ppid)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+</div><div class='add'>+	ppid-&gt;id_len = 1;</div><div class='add'>+	ppid-&gt;id[0] = port_priv-&gt;ethsw_data-&gt;dev_id;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_get_phys_name(struct net_device *netdev, char *name,</div><div class='add'>+					   size_t len)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = snprintf(name, len, "p%d", port_priv-&gt;idx);</div><div class='add'>+	if (err &gt;= len)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethsw_dump_ctx {</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	struct netlink_callback *cb;</div><div class='add'>+	int idx;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_fdb_dump_nl(struct fdb_dump_entry *entry,</div><div class='add'>+				    struct ethsw_dump_ctx *dump)</div><div class='add'>+{</div><div class='add'>+	struct ndo_fdb_dump_context *ctx = (void *)dump-&gt;cb-&gt;ctx;</div><div class='add'>+	int is_dynamic = entry-&gt;type &amp; DPSW_FDB_ENTRY_DINAMIC;</div><div class='add'>+	u32 portid = NETLINK_CB(dump-&gt;cb-&gt;skb).portid;</div><div class='add'>+	u32 seq = dump-&gt;cb-&gt;nlh-&gt;nlmsg_seq;</div><div class='add'>+	struct nlmsghdr *nlh;</div><div class='add'>+	struct ndmsg *ndm;</div><div class='add'>+</div><div class='add'>+	if (dump-&gt;idx &lt; ctx-&gt;fdb_idx)</div><div class='add'>+		goto skip;</div><div class='add'>+</div><div class='add'>+	nlh = nlmsg_put(dump-&gt;skb, portid, seq, RTM_NEWNEIGH,</div><div class='add'>+			sizeof(*ndm), NLM_F_MULTI);</div><div class='add'>+	if (!nlh)</div><div class='add'>+		return -EMSGSIZE;</div><div class='add'>+</div><div class='add'>+	ndm = nlmsg_data(nlh);</div><div class='add'>+	ndm-&gt;ndm_family  = AF_BRIDGE;</div><div class='add'>+	ndm-&gt;ndm_pad1    = 0;</div><div class='add'>+	ndm-&gt;ndm_pad2    = 0;</div><div class='add'>+	ndm-&gt;ndm_flags   = NTF_SELF;</div><div class='add'>+	ndm-&gt;ndm_type    = 0;</div><div class='add'>+	ndm-&gt;ndm_ifindex = dump-&gt;dev-&gt;ifindex;</div><div class='add'>+	ndm-&gt;ndm_state   = is_dynamic ? NUD_REACHABLE : NUD_NOARP;</div><div class='add'>+</div><div class='add'>+	if (nla_put(dump-&gt;skb, NDA_LLADDR, ETH_ALEN, entry-&gt;mac_addr))</div><div class='add'>+		goto nla_put_failure;</div><div class='add'>+</div><div class='add'>+	nlmsg_end(dump-&gt;skb, nlh);</div><div class='add'>+</div><div class='add'>+skip:</div><div class='add'>+	dump-&gt;idx++;</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+nla_put_failure:</div><div class='add'>+	nlmsg_cancel(dump-&gt;skb, nlh);</div><div class='add'>+	return -EMSGSIZE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_fdb_valid_entry(struct fdb_dump_entry *entry,</div><div class='add'>+					     struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	int idx = port_priv-&gt;idx;</div><div class='add'>+	int valid;</div><div class='add'>+</div><div class='add'>+	if (entry-&gt;type &amp; DPSW_FDB_ENTRY_TYPE_UNICAST)</div><div class='add'>+		valid = entry-&gt;if_info == port_priv-&gt;idx;</div><div class='add'>+	else</div><div class='add'>+		valid = entry-&gt;if_mask[idx / 8] &amp; BIT(idx % 8);</div><div class='add'>+</div><div class='add'>+	return valid;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_fdb_iterate(struct ethsw_port_priv *port_priv,</div><div class='add'>+				    dpaa2_switch_fdb_cb_t cb, void *data)</div><div class='add'>+{</div><div class='add'>+	struct net_device *net_dev = port_priv-&gt;netdev;</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	struct fdb_dump_entry *fdb_entries;</div><div class='add'>+	struct fdb_dump_entry fdb_entry;</div><div class='add'>+	dma_addr_t fdb_dump_iova;</div><div class='add'>+	u16 num_fdb_entries;</div><div class='add'>+	u32 fdb_dump_size;</div><div class='add'>+	int err = 0, i;</div><div class='add'>+	u8 *dma_mem;</div><div class='add'>+	u16 fdb_id;</div><div class='add'>+</div><div class='add'>+	fdb_dump_size = ethsw-&gt;sw_attr.max_fdb_entries * sizeof(fdb_entry);</div><div class='add'>+	dma_mem = kzalloc(fdb_dump_size, GFP_KERNEL);</div><div class='add'>+	if (!dma_mem)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	fdb_dump_iova = dma_map_single(dev, dma_mem, fdb_dump_size,</div><div class='add'>+				       DMA_FROM_DEVICE);</div><div class='add'>+	if (dma_mapping_error(dev, fdb_dump_iova)) {</div><div class='add'>+		netdev_err(net_dev, "dma_map_single() failed\n");</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_map;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	fdb_id = dpaa2_switch_port_get_fdb_id(port_priv);</div><div class='add'>+	err = dpsw_fdb_dump(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, fdb_id,</div><div class='add'>+			    fdb_dump_iova, fdb_dump_size, &amp;num_fdb_entries);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(net_dev, "dpsw_fdb_dump() = %d\n", err);</div><div class='add'>+		goto err_dump;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(dev, fdb_dump_iova, fdb_dump_size, DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	fdb_entries = (struct fdb_dump_entry *)dma_mem;</div><div class='add'>+	for (i = 0; i &lt; num_fdb_entries; i++) {</div><div class='add'>+		fdb_entry = fdb_entries[i];</div><div class='add'>+</div><div class='add'>+		err = cb(port_priv, &amp;fdb_entry, data);</div><div class='add'>+		if (err)</div><div class='add'>+			goto end;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+end:</div><div class='add'>+	kfree(dma_mem);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_dump:</div><div class='add'>+	dma_unmap_single(dev, fdb_dump_iova, fdb_dump_size, DMA_TO_DEVICE);</div><div class='add'>+err_map:</div><div class='add'>+	kfree(dma_mem);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_fdb_entry_dump(struct ethsw_port_priv *port_priv,</div><div class='add'>+				       struct fdb_dump_entry *fdb_entry,</div><div class='add'>+				       void *data)</div><div class='add'>+{</div><div class='add'>+	if (!dpaa2_switch_port_fdb_valid_entry(fdb_entry, port_priv))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_fdb_dump_nl(fdb_entry, data);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,</div><div class='add'>+				      struct net_device *net_dev,</div><div class='add'>+				      struct net_device *filter_dev, int *idx)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(net_dev);</div><div class='add'>+	struct ethsw_dump_ctx dump = {</div><div class='add'>+		.dev = net_dev,</div><div class='add'>+		.skb = skb,</div><div class='add'>+		.cb = cb,</div><div class='add'>+		.idx = *idx,</div><div class='add'>+	};</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_fdb_iterate(port_priv, dpaa2_switch_fdb_entry_dump, &amp;dump);</div><div class='add'>+	*idx = dump.idx;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_fdb_entry_fast_age(struct ethsw_port_priv *port_priv,</div><div class='add'>+					   struct fdb_dump_entry *fdb_entry,</div><div class='add'>+					   void *data __always_unused)</div><div class='add'>+{</div><div class='add'>+	if (!dpaa2_switch_port_fdb_valid_entry(fdb_entry, port_priv))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (!(fdb_entry-&gt;type &amp; DPSW_FDB_ENTRY_TYPE_DYNAMIC))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (fdb_entry-&gt;type &amp; DPSW_FDB_ENTRY_TYPE_UNICAST)</div><div class='add'>+		dpaa2_switch_port_fdb_del_uc(port_priv, fdb_entry-&gt;mac_addr);</div><div class='add'>+	else</div><div class='add'>+		dpaa2_switch_port_fdb_del_mc(port_priv, fdb_entry-&gt;mac_addr);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_port_fast_age(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	dpaa2_switch_fdb_iterate(port_priv,</div><div class='add'>+				 dpaa2_switch_fdb_entry_fast_age, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_vlan_add(struct net_device *netdev, __be16 proto,</div><div class='add'>+				      u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_port_vlan vlan = {</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.obj.orig_dev = netdev,</div><div class='add'>+		/* This API only allows programming tagged, non-PVID VIDs */</div><div class='add'>+		.flags = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_vlans_add(netdev, &amp;vlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_vlan_kill(struct net_device *netdev, __be16 proto,</div><div class='add'>+				       u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct switchdev_obj_port_vlan vlan = {</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='add'>+		.vid = vid,</div><div class='add'>+		.obj.orig_dev = netdev,</div><div class='add'>+		/* This API only allows programming tagged, non-PVID VIDs */</div><div class='add'>+		.flags = 0,</div><div class='add'>+	};</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_vlans_del(netdev, &amp;vlan);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_set_mac_addr(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct net_device *net_dev = port_priv-&gt;netdev;</div><div class='add'>+	struct device *dev = net_dev-&gt;dev.parent;</div><div class='add'>+	u8 mac_addr[ETH_ALEN];</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!(ethsw-&gt;features &amp; ETHSW_FEATURE_MAC_ADDR))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	/* Get firmware address, if any */</div><div class='add'>+	err = dpsw_if_get_port_mac_addr(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					port_priv-&gt;idx, mac_addr);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_if_get_port_mac_addr() failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* First check if firmware has any address configured by bootloader */</div><div class='add'>+	if (!is_zero_ether_addr(mac_addr)) {</div><div class='add'>+		eth_hw_addr_set(net_dev, mac_addr);</div><div class='add'>+	} else {</div><div class='add'>+		/* No MAC address configured, fill in net_dev-&gt;dev_addr</div><div class='add'>+		 * with a random one</div><div class='add'>+		 */</div><div class='add'>+		eth_hw_addr_random(net_dev);</div><div class='add'>+		dev_dbg_once(dev, "device(s) have all-zero hwaddr, replaced with random\n");</div><div class='add'>+</div><div class='add'>+		/* Override NET_ADDR_RANDOM set by eth_hw_addr_random(); for all</div><div class='add'>+		 * practical purposes, this will be our "permanent" mac address,</div><div class='add'>+		 * at least until the next reboot. This move will also permit</div><div class='add'>+		 * register_netdevice() to properly fill up net_dev-&gt;perm_addr.</div><div class='add'>+		 */</div><div class='add'>+		net_dev-&gt;addr_assign_type = NET_ADDR_PERM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_free_fd(const struct ethsw_core *ethsw,</div><div class='add'>+				 const struct dpaa2_fd *fd)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	unsigned char *buffer_start;</div><div class='add'>+	struct sk_buff **skbh, *skb;</div><div class='add'>+	dma_addr_t fd_addr;</div><div class='add'>+</div><div class='add'>+	fd_addr = dpaa2_fd_get_addr(fd);</div><div class='add'>+	skbh = dpaa2_iova_to_virt(ethsw-&gt;iommu_domain, fd_addr);</div><div class='add'>+</div><div class='add'>+	skb = *skbh;</div><div class='add'>+	buffer_start = (unsigned char *)skbh;</div><div class='add'>+</div><div class='add'>+	dma_unmap_single(dev, fd_addr,</div><div class='add'>+			 skb_tail_pointer(skb) - buffer_start,</div><div class='add'>+			 DMA_TO_DEVICE);</div><div class='add'>+</div><div class='add'>+	/* Move on with skb release */</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_build_single_fd(struct ethsw_core *ethsw,</div><div class='add'>+					struct sk_buff *skb,</div><div class='add'>+					struct dpaa2_fd *fd)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	struct sk_buff **skbh;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	u8 *buff_start;</div><div class='add'>+	void *hwa;</div><div class='add'>+</div><div class='add'>+	buff_start = PTR_ALIGN(skb-&gt;data - DPAA2_SWITCH_TX_DATA_OFFSET -</div><div class='add'>+			       DPAA2_SWITCH_TX_BUF_ALIGN,</div><div class='add'>+			       DPAA2_SWITCH_TX_BUF_ALIGN);</div><div class='add'>+</div><div class='add'>+	/* Clear FAS to have consistent values for TX confirmation. It is</div><div class='add'>+	 * located in the first 8 bytes of the buffer's hardware annotation</div><div class='add'>+	 * area</div><div class='add'>+	 */</div><div class='add'>+	hwa = buff_start + DPAA2_SWITCH_SWA_SIZE;</div><div class='add'>+	memset(hwa, 0, 8);</div><div class='add'>+</div><div class='add'>+	/* Store a backpointer to the skb at the beginning of the buffer</div><div class='add'>+	 * (in the private data area) such that we can release it</div><div class='add'>+	 * on Tx confirm</div><div class='add'>+	 */</div><div class='add'>+	skbh = (struct sk_buff **)buff_start;</div><div class='add'>+	*skbh = skb;</div><div class='add'>+</div><div class='add'>+	addr = dma_map_single(dev, buff_start,</div><div class='add'>+			      skb_tail_pointer(skb) - buff_start,</div><div class='add'>+			      DMA_TO_DEVICE);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, addr)))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	/* Setup the FD fields */</div><div class='add'>+	memset(fd, 0, sizeof(*fd));</div><div class='add'>+</div><div class='add'>+	dpaa2_fd_set_addr(fd, addr);</div><div class='add'>+	dpaa2_fd_set_offset(fd, (u16)(skb-&gt;data - buff_start));</div><div class='add'>+	dpaa2_fd_set_len(fd, skb-&gt;len);</div><div class='add'>+	dpaa2_fd_set_format(fd, dpaa2_fd_single);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static netdev_tx_t dpaa2_switch_port_tx(struct sk_buff *skb,</div><div class='add'>+					struct net_device *net_dev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(net_dev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	int retries = DPAA2_SWITCH_SWP_BUSY_RETRIES;</div><div class='add'>+	struct dpaa2_fd fd;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (unlikely(skb_headroom(skb) &lt; DPAA2_SWITCH_NEEDED_HEADROOM)) {</div><div class='add'>+		struct sk_buff *ns;</div><div class='add'>+</div><div class='add'>+		ns = skb_realloc_headroom(skb, DPAA2_SWITCH_NEEDED_HEADROOM);</div><div class='add'>+		if (unlikely(!ns)) {</div><div class='add'>+			net_err_ratelimited("%s: Error reallocating skb headroom\n", net_dev-&gt;name);</div><div class='add'>+			goto err_free_skb;</div><div class='add'>+		}</div><div class='add'>+		dev_consume_skb_any(skb);</div><div class='add'>+		skb = ns;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* We'll be holding a back-reference to the skb until Tx confirmation */</div><div class='add'>+	skb = skb_unshare(skb, GFP_ATOMIC);</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		/* skb_unshare() has already freed the skb */</div><div class='add'>+		net_err_ratelimited("%s: Error copying the socket buffer\n", net_dev-&gt;name);</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* At this stage, we do not support non-linear skbs so just try to</div><div class='add'>+	 * linearize the skb and if that's not working, just drop the packet.</div><div class='add'>+	 */</div><div class='add'>+	err = skb_linearize(skb);</div><div class='add'>+	if (err) {</div><div class='add'>+		net_err_ratelimited("%s: skb_linearize error (%d)!\n", net_dev-&gt;name, err);</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_build_single_fd(ethsw, skb, &amp;fd);</div><div class='add'>+	if (unlikely(err)) {</div><div class='add'>+		net_err_ratelimited("%s: ethsw_build_*_fd() %d\n", net_dev-&gt;name, err);</div><div class='add'>+		goto err_free_skb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = dpaa2_io_service_enqueue_qd(NULL,</div><div class='add'>+						  port_priv-&gt;tx_qdid,</div><div class='add'>+						  8, 0, &amp;fd);</div><div class='add'>+		retries--;</div><div class='add'>+	} while (err == -EBUSY &amp;&amp; retries);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err &lt; 0)) {</div><div class='add'>+		dpaa2_switch_free_fd(ethsw, &amp;fd);</div><div class='add'>+		goto err_exit;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+</div><div class='add'>+err_free_skb:</div><div class='add'>+	dev_kfree_skb(skb);</div><div class='add'>+err_exit:</div><div class='add'>+	return NETDEV_TX_OK;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_setup_tc_cls_flower(struct dpaa2_switch_filter_block *filter_block,</div><div class='add'>+				 struct flow_cls_offload *f)</div><div class='add'>+{</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_CLS_REPLACE:</div><div class='add'>+		return dpaa2_switch_cls_flower_replace(filter_block, f);</div><div class='add'>+	case FLOW_CLS_DESTROY:</div><div class='add'>+		return dpaa2_switch_cls_flower_destroy(filter_block, f);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_setup_tc_cls_matchall(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				   struct tc_cls_matchall_offload *f)</div><div class='add'>+{</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case TC_CLSMATCHALL_REPLACE:</div><div class='add'>+		return dpaa2_switch_cls_matchall_replace(block, f);</div><div class='add'>+	case TC_CLSMATCHALL_DESTROY:</div><div class='add'>+		return dpaa2_switch_cls_matchall_destroy(block, f);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_setup_tc_block_cb_ig(enum tc_setup_type type,</div><div class='add'>+						  void *type_data,</div><div class='add'>+						  void *cb_priv)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_CLSFLOWER:</div><div class='add'>+		return dpaa2_switch_setup_tc_cls_flower(cb_priv, type_data);</div><div class='add'>+	case TC_SETUP_CLSMATCHALL:</div><div class='add'>+		return dpaa2_switch_setup_tc_cls_matchall(cb_priv, type_data);</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static LIST_HEAD(dpaa2_switch_block_cb_list);</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_port_acl_tbl_bind(struct ethsw_port_priv *port_priv,</div><div class='add'>+			       struct dpaa2_switch_filter_block *block)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct dpsw_acl_if_cfg acl_if_cfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port_priv-&gt;filter_block)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	acl_if_cfg.if_id[0] = port_priv-&gt;idx;</div><div class='add'>+	acl_if_cfg.num_ifs = 1;</div><div class='add'>+	err = dpsw_acl_add_if(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+			      block-&gt;acl_id, &amp;acl_if_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_acl_add_if err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	block-&gt;ports |= BIT(port_priv-&gt;idx);</div><div class='add'>+	port_priv-&gt;filter_block = block;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_port_acl_tbl_unbind(struct ethsw_port_priv *port_priv,</div><div class='add'>+				 struct dpaa2_switch_filter_block *block)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct dpsw_acl_if_cfg acl_if_cfg;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (port_priv-&gt;filter_block != block)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	acl_if_cfg.if_id[0] = port_priv-&gt;idx;</div><div class='add'>+	acl_if_cfg.num_ifs = 1;</div><div class='add'>+	err = dpsw_acl_remove_if(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				 block-&gt;acl_id, &amp;acl_if_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_acl_add_if err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	block-&gt;ports &amp;= ~BIT(port_priv-&gt;idx);</div><div class='add'>+	port_priv-&gt;filter_block = NULL;</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_block_bind(struct ethsw_port_priv *port_priv,</div><div class='add'>+					struct dpaa2_switch_filter_block *block)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_filter_block *old_block = port_priv-&gt;filter_block;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Offload all the mirror entries found in the block on this new port</div><div class='add'>+	 * joining it.</div><div class='add'>+	 */</div><div class='add'>+	err = dpaa2_switch_block_offload_mirror(block, port_priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* If the port is already bound to this ACL table then do nothing. This</div><div class='add'>+	 * can happen when this port is the first one to join a tc block</div><div class='add'>+	 */</div><div class='add'>+	if (port_priv-&gt;filter_block == block)</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_acl_tbl_unbind(port_priv, old_block);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Mark the previous ACL table as being unused if this was the last</div><div class='add'>+	 * port that was using it.</div><div class='add'>+	 */</div><div class='add'>+	if (old_block-&gt;ports == 0)</div><div class='add'>+		old_block-&gt;in_use = false;</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_acl_tbl_bind(port_priv, block);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_port_block_unbind(struct ethsw_port_priv *port_priv,</div><div class='add'>+			       struct dpaa2_switch_filter_block *block)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpaa2_switch_filter_block *new_block;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Unoffload all the mirror entries found in the block from the</div><div class='add'>+	 * port leaving it.</div><div class='add'>+	 */</div><div class='add'>+	err = dpaa2_switch_block_unoffload_mirror(block, port_priv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* We are the last port that leaves a block (an ACL table).</div><div class='add'>+	 * We'll continue to use this table.</div><div class='add'>+	 */</div><div class='add'>+	if (block-&gt;ports == BIT(port_priv-&gt;idx))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_acl_tbl_unbind(port_priv, block);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	if (block-&gt;ports == 0)</div><div class='add'>+		block-&gt;in_use = false;</div><div class='add'>+</div><div class='add'>+	new_block = dpaa2_switch_filter_block_get_unused(ethsw);</div><div class='add'>+	new_block-&gt;in_use = true;</div><div class='add'>+	return dpaa2_switch_port_acl_tbl_bind(port_priv, new_block);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_setup_tc_block_bind(struct net_device *netdev,</div><div class='add'>+					    struct flow_block_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpaa2_switch_filter_block *filter_block;</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+	bool register_block = false;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	block_cb = flow_block_cb_lookup(f-&gt;block,</div><div class='add'>+					dpaa2_switch_port_setup_tc_block_cb_ig,</div><div class='add'>+					ethsw);</div><div class='add'>+</div><div class='add'>+	if (!block_cb) {</div><div class='add'>+		/* If the filter block is not already known, then this port</div><div class='add'>+		 * must be the first to join it. In this case, we can just</div><div class='add'>+		 * continue to use our private table</div><div class='add'>+		 */</div><div class='add'>+		filter_block = port_priv-&gt;filter_block;</div><div class='add'>+</div><div class='add'>+		block_cb = flow_block_cb_alloc(dpaa2_switch_port_setup_tc_block_cb_ig,</div><div class='add'>+					       ethsw, filter_block, NULL);</div><div class='add'>+		if (IS_ERR(block_cb))</div><div class='add'>+			return PTR_ERR(block_cb);</div><div class='add'>+</div><div class='add'>+		register_block = true;</div><div class='add'>+	} else {</div><div class='add'>+		filter_block = flow_block_cb_priv(block_cb);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	flow_block_cb_incref(block_cb);</div><div class='add'>+	err = dpaa2_switch_port_block_bind(port_priv, filter_block);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_block_bind;</div><div class='add'>+</div><div class='add'>+	if (register_block) {</div><div class='add'>+		flow_block_cb_add(block_cb, f);</div><div class='add'>+		list_add_tail(&amp;block_cb-&gt;driver_list,</div><div class='add'>+			      &amp;dpaa2_switch_block_cb_list);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_block_bind:</div><div class='add'>+	if (!flow_block_cb_decref(block_cb))</div><div class='add'>+		flow_block_cb_free(block_cb);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_setup_tc_block_unbind(struct net_device *netdev,</div><div class='add'>+					       struct flow_block_offload *f)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpaa2_switch_filter_block *filter_block;</div><div class='add'>+	struct flow_block_cb *block_cb;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	block_cb = flow_block_cb_lookup(f-&gt;block,</div><div class='add'>+					dpaa2_switch_port_setup_tc_block_cb_ig,</div><div class='add'>+					ethsw);</div><div class='add'>+	if (!block_cb)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	filter_block = flow_block_cb_priv(block_cb);</div><div class='add'>+	err = dpaa2_switch_port_block_unbind(port_priv, filter_block);</div><div class='add'>+	if (!err &amp;&amp; !flow_block_cb_decref(block_cb)) {</div><div class='add'>+		flow_block_cb_remove(block_cb, f);</div><div class='add'>+		list_del(&amp;block_cb-&gt;driver_list);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_setup_tc_block(struct net_device *netdev,</div><div class='add'>+				       struct flow_block_offload *f)</div><div class='add'>+{</div><div class='add'>+	if (f-&gt;binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	f-&gt;driver_block_list = &amp;dpaa2_switch_block_cb_list;</div><div class='add'>+</div><div class='add'>+	switch (f-&gt;command) {</div><div class='add'>+	case FLOW_BLOCK_BIND:</div><div class='add'>+		return dpaa2_switch_setup_tc_block_bind(netdev, f);</div><div class='add'>+	case FLOW_BLOCK_UNBIND:</div><div class='add'>+		dpaa2_switch_setup_tc_block_unbind(netdev, f);</div><div class='add'>+		return 0;</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_setup_tc(struct net_device *netdev,</div><div class='add'>+				      enum tc_setup_type type,</div><div class='add'>+				      void *type_data)</div><div class='add'>+{</div><div class='add'>+	switch (type) {</div><div class='add'>+	case TC_SETUP_BLOCK: {</div><div class='add'>+		return dpaa2_switch_setup_tc_block(netdev, type_data);</div><div class='add'>+	}</div><div class='add'>+	default:</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct net_device_ops dpaa2_switch_port_ops = {</div><div class='add'>+	.ndo_open		= dpaa2_switch_port_open,</div><div class='add'>+	.ndo_stop		= dpaa2_switch_port_stop,</div><div class='add'>+</div><div class='add'>+	.ndo_set_mac_address	= eth_mac_addr,</div><div class='add'>+	.ndo_get_stats64	= dpaa2_switch_port_get_stats,</div><div class='add'>+	.ndo_change_mtu		= dpaa2_switch_port_change_mtu,</div><div class='add'>+	.ndo_has_offload_stats	= dpaa2_switch_port_has_offload_stats,</div><div class='add'>+	.ndo_get_offload_stats	= dpaa2_switch_port_get_offload_stats,</div><div class='add'>+	.ndo_fdb_dump		= dpaa2_switch_port_fdb_dump,</div><div class='add'>+	.ndo_vlan_rx_add_vid	= dpaa2_switch_port_vlan_add,</div><div class='add'>+	.ndo_vlan_rx_kill_vid	= dpaa2_switch_port_vlan_kill,</div><div class='add'>+</div><div class='add'>+	.ndo_start_xmit		= dpaa2_switch_port_tx,</div><div class='add'>+	.ndo_get_port_parent_id	= dpaa2_switch_port_parent_id,</div><div class='add'>+	.ndo_get_phys_port_name = dpaa2_switch_port_get_phys_name,</div><div class='add'>+	.ndo_setup_tc		= dpaa2_switch_port_setup_tc,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+bool dpaa2_switch_port_dev_check(const struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	return netdev-&gt;netdev_ops == &amp;dpaa2_switch_port_ops;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_connect_mac(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_device *dpsw_port_dev, *dpmac_dev;</div><div class='add'>+	struct dpaa2_mac *mac;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dpsw_port_dev = to_fsl_mc_device(port_priv-&gt;netdev-&gt;dev.parent);</div><div class='add'>+	dpmac_dev = fsl_mc_get_endpoint(dpsw_port_dev, port_priv-&gt;idx);</div><div class='add'>+</div><div class='add'>+	if (PTR_ERR(dpmac_dev) == -EPROBE_DEFER)</div><div class='add'>+		return PTR_ERR(dpmac_dev);</div><div class='add'>+</div><div class='add'>+	if (IS_ERR(dpmac_dev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	if (dpmac_dev-&gt;dev.type != &amp;fsl_mc_bus_dpmac_type) {</div><div class='add'>+		err = 0;</div><div class='add'>+		goto out_put_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac = kzalloc(sizeof(*mac), GFP_KERNEL);</div><div class='add'>+	if (!mac) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto out_put_device;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mac-&gt;mc_dev = dpmac_dev;</div><div class='add'>+	mac-&gt;mc_io = port_priv-&gt;ethsw_data-&gt;mc_io;</div><div class='add'>+	mac-&gt;net_dev = port_priv-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_mac_open(mac);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_mac;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_mac_is_type_phy(mac)) {</div><div class='add'>+		err = dpaa2_mac_connect(mac);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(port_priv-&gt;netdev,</div><div class='add'>+				   "Error connecting to the MAC endpoint %pe\n",</div><div class='add'>+				   ERR_PTR(err));</div><div class='add'>+			goto err_close_mac;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+	port_priv-&gt;mac = mac;</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_close_mac:</div><div class='add'>+	dpaa2_mac_close(mac);</div><div class='add'>+err_free_mac:</div><div class='add'>+	kfree(mac);</div><div class='add'>+out_put_device:</div><div class='add'>+	put_device(&amp;dpmac_dev-&gt;dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_port_disconnect_mac(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_mac *mac;</div><div class='add'>+</div><div class='add'>+	mutex_lock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+	mac = port_priv-&gt;mac;</div><div class='add'>+	port_priv-&gt;mac = NULL;</div><div class='add'>+	mutex_unlock(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	if (!mac)</div><div class='add'>+		return;</div><div class='add'>+</div><div class='add'>+	if (dpaa2_mac_is_type_phy(mac))</div><div class='add'>+		dpaa2_mac_disconnect(mac);</div><div class='add'>+</div><div class='add'>+	dpaa2_mac_close(mac);</div><div class='add'>+	kfree(mac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static irqreturn_t dpaa2_switch_irq0_handler_thread(int irq_num, void *arg)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = (struct device *)arg;</div><div class='add'>+	struct ethsw_core *ethsw = dev_get_drvdata(dev);</div><div class='add'>+	struct ethsw_port_priv *port_priv;</div><div class='add'>+	int err, if_id;</div><div class='add'>+	bool had_mac;</div><div class='add'>+	u32 status;</div><div class='add'>+</div><div class='add'>+	err = dpsw_get_irq_status(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  DPSW_IRQ_INDEX_IF, &amp;status);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "Can't get irq status (err %d)\n", err);</div><div class='add'>+		goto out;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if_id = (status &amp; 0xFFFF0000) &gt;&gt; 16;</div><div class='add'>+	port_priv = ethsw-&gt;ports[if_id];</div><div class='add'>+</div><div class='add'>+	if (status &amp; DPSW_IRQ_EVENT_LINK_CHANGED)</div><div class='add'>+		dpaa2_switch_port_link_state_update(port_priv-&gt;netdev);</div><div class='add'>+</div><div class='add'>+	if (status &amp; DPSW_IRQ_EVENT_ENDPOINT_CHANGED) {</div><div class='add'>+		dpaa2_switch_port_set_mac_addr(port_priv);</div><div class='add'>+		/* We can avoid locking because the "endpoint changed" IRQ</div><div class='add'>+		 * handler is the only one who changes priv-&gt;mac at runtime,</div><div class='add'>+		 * so we are not racing with anyone.</div><div class='add'>+		 */</div><div class='add'>+		had_mac = !!port_priv-&gt;mac;</div><div class='add'>+		if (had_mac)</div><div class='add'>+			dpaa2_switch_port_disconnect_mac(port_priv);</div><div class='add'>+		else</div><div class='add'>+			dpaa2_switch_port_connect_mac(port_priv);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_clear_irq_status(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				    DPSW_IRQ_INDEX_IF, status);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(dev, "Can't clear irq status (err %d)\n", err);</div><div class='add'>+</div><div class='add'>+out:</div><div class='add'>+	return IRQ_HANDLED;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_setup_irqs(struct fsl_mc_device *sw_dev)</div><div class='add'>+{</div><div class='add'>+	u32 mask = DPSW_IRQ_EVENT_LINK_CHANGED | DPSW_IRQ_EVENT_ENDPOINT_CHANGED;</div><div class='add'>+	struct device *dev = &amp;sw_dev-&gt;dev;</div><div class='add'>+	struct ethsw_core *ethsw = dev_get_drvdata(dev);</div><div class='add'>+	struct fsl_mc_device_irq *irq;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fsl_mc_allocate_irqs(sw_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "MC irqs allocation failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (WARN_ON(sw_dev-&gt;obj_desc.irq_count != DPSW_IRQ_NUM)) {</div><div class='add'>+		err = -EINVAL;</div><div class='add'>+		goto free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_set_irq_enable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  DPSW_IRQ_INDEX_IF, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_set_irq_enable err %d\n", err);</div><div class='add'>+		goto free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	irq = sw_dev-&gt;irqs[DPSW_IRQ_INDEX_IF];</div><div class='add'>+</div><div class='add'>+	err = devm_request_threaded_irq(dev, irq-&gt;virq, NULL,</div><div class='add'>+					dpaa2_switch_irq0_handler_thread,</div><div class='add'>+					IRQF_NO_SUSPEND | IRQF_ONESHOT,</div><div class='add'>+					dev_name(dev), dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "devm_request_threaded_irq(): %d\n", err);</div><div class='add'>+		goto free_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_set_irq_mask(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				DPSW_IRQ_INDEX_IF, mask);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_set_irq_mask(): %d\n", err);</div><div class='add'>+		goto free_devm_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_set_irq_enable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  DPSW_IRQ_INDEX_IF, 1);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_set_irq_enable(): %d\n", err);</div><div class='add'>+		goto free_devm_irq;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+free_devm_irq:</div><div class='add'>+	devm_free_irq(dev, irq-&gt;virq, dev);</div><div class='add'>+free_irq:</div><div class='add'>+	fsl_mc_free_irqs(sw_dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_teardown_irqs(struct fsl_mc_device *sw_dev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;sw_dev-&gt;dev;</div><div class='add'>+	struct ethsw_core *ethsw = dev_get_drvdata(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpsw_set_irq_enable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  DPSW_IRQ_INDEX_IF, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_err(dev, "dpsw_set_irq_enable err %d\n", err);</div><div class='add'>+</div><div class='add'>+	fsl_mc_free_irqs(sw_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_set_learning(struct ethsw_port_priv *port_priv, bool enable)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	enum dpsw_learning_mode learn_mode;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (enable)</div><div class='add'>+		learn_mode = DPSW_LEARNING_MODE_HW;</div><div class='add'>+	else</div><div class='add'>+		learn_mode = DPSW_LEARNING_MODE_DIS;</div><div class='add'>+</div><div class='add'>+	err = dpsw_if_set_learning_mode(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					port_priv-&gt;idx, learn_mode);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(port_priv-&gt;netdev, "dpsw_if_set_learning_mode err %d\n", err);</div><div class='add'>+</div><div class='add'>+	if (!enable)</div><div class='add'>+		dpaa2_switch_port_fast_age(port_priv);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_attr_stp_state_set(struct net_device *netdev,</div><div class='add'>+						u8 state)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_set_stp_state(port_priv, state);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	switch (state) {</div><div class='add'>+	case BR_STATE_DISABLED:</div><div class='add'>+	case BR_STATE_BLOCKING:</div><div class='add'>+	case BR_STATE_LISTENING:</div><div class='add'>+		err = dpaa2_switch_port_set_learning(port_priv, false);</div><div class='add'>+		break;</div><div class='add'>+	case BR_STATE_LEARNING:</div><div class='add'>+	case BR_STATE_FORWARDING:</div><div class='add'>+		err = dpaa2_switch_port_set_learning(port_priv,</div><div class='add'>+						     port_priv-&gt;learn_ena);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_flood(struct ethsw_port_priv *port_priv,</div><div class='add'>+				   struct switchdev_brport_flags flags)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_BCAST_FLOOD)</div><div class='add'>+		port_priv-&gt;bcast_flood = !!(flags.val &amp; BR_BCAST_FLOOD);</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_FLOOD)</div><div class='add'>+		port_priv-&gt;ucast_flood = !!(flags.val &amp; BR_FLOOD);</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_fdb_set_egress_flood(ethsw, port_priv-&gt;fdb-&gt;fdb_id);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_pre_bridge_flags(struct net_device *netdev,</div><div class='add'>+					      struct switchdev_brport_flags flags,</div><div class='add'>+					      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	if (flags.mask &amp; ~(BR_LEARNING | BR_BCAST_FLOOD | BR_FLOOD |</div><div class='add'>+			   BR_MCAST_FLOOD))</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; (BR_FLOOD | BR_MCAST_FLOOD)) {</div><div class='add'>+		bool multicast = !!(flags.val &amp; BR_MCAST_FLOOD);</div><div class='add'>+		bool unicast = !!(flags.val &amp; BR_FLOOD);</div><div class='add'>+</div><div class='add'>+		if (unicast != multicast) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Cannot configure multicast flooding independently of unicast");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_bridge_flags(struct net_device *netdev,</div><div class='add'>+					  struct switchdev_brport_flags flags,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; BR_LEARNING) {</div><div class='add'>+		bool learn_ena = !!(flags.val &amp; BR_LEARNING);</div><div class='add'>+</div><div class='add'>+		err = dpaa2_switch_port_set_learning(port_priv, learn_ena);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+		port_priv-&gt;learn_ena = learn_ena;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (flags.mask &amp; (BR_BCAST_FLOOD | BR_FLOOD | BR_MCAST_FLOOD)) {</div><div class='add'>+		err = dpaa2_switch_port_flood(port_priv, flags);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_attr_set(struct net_device *netdev, const void *ctx,</div><div class='add'>+				      const struct switchdev_attr *attr,</div><div class='add'>+				      struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (attr-&gt;id) {</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_STP_STATE:</div><div class='add'>+		err = dpaa2_switch_port_attr_stp_state_set(netdev,</div><div class='add'>+							   attr-&gt;u.stp_state);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING:</div><div class='add'>+		if (!attr-&gt;u.vlan_filtering) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "The DPAA2 switch does not support VLAN-unaware operation");</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+		}</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS:</div><div class='add'>+		err = dpaa2_switch_port_pre_bridge_flags(netdev, attr-&gt;u.brport_flags, extack);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS:</div><div class='add'>+		err = dpaa2_switch_port_bridge_flags(netdev, attr-&gt;u.brport_flags, extack);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_port_vlans_add(struct net_device *netdev,</div><div class='add'>+				const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpsw_attr *attr = &amp;ethsw-&gt;sw_attr;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Make sure that the VLAN is not already configured</div><div class='add'>+	 * on the switch port</div><div class='add'>+	 */</div><div class='add'>+	if (port_priv-&gt;vlans[vlan-&gt;vid] &amp; ETHSW_VLAN_MEMBER) {</div><div class='add'>+		netdev_err(netdev, "VLAN %d already configured\n", vlan-&gt;vid);</div><div class='add'>+		return -EEXIST;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Check if there is space for a new VLAN */</div><div class='add'>+	err = dpsw_get_attributes(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  &amp;ethsw-&gt;sw_attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_get_attributes err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (attr-&gt;max_vlans - attr-&gt;num_vlans &lt; 1)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	/* Check if there is space for a new VLAN */</div><div class='add'>+	err = dpsw_get_attributes(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  &amp;ethsw-&gt;sw_attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_get_attributes err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	if (attr-&gt;max_vlans - attr-&gt;num_vlans &lt; 1)</div><div class='add'>+		return -ENOSPC;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;ethsw_data-&gt;vlans[vlan-&gt;vid]) {</div><div class='add'>+		/* this is a new VLAN */</div><div class='add'>+		err = dpaa2_switch_add_vlan(port_priv, vlan-&gt;vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		port_priv-&gt;ethsw_data-&gt;vlans[vlan-&gt;vid] |= ETHSW_VLAN_GLOBAL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_add_vlan(port_priv, vlan-&gt;vid, vlan-&gt;flags);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_lookup_address(struct net_device *netdev, int is_uc,</div><div class='add'>+					    const unsigned char *addr)</div><div class='add'>+{</div><div class='add'>+	struct netdev_hw_addr_list *list = (is_uc) ? &amp;netdev-&gt;uc : &amp;netdev-&gt;mc;</div><div class='add'>+	struct netdev_hw_addr *ha;</div><div class='add'>+</div><div class='add'>+	netif_addr_lock_bh(netdev);</div><div class='add'>+	list_for_each_entry(ha, &amp;list-&gt;list, list) {</div><div class='add'>+		if (ether_addr_equal(ha-&gt;addr, addr)) {</div><div class='add'>+			netif_addr_unlock_bh(netdev);</div><div class='add'>+			return 1;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+	netif_addr_unlock_bh(netdev);</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_mdb_add(struct net_device *netdev,</div><div class='add'>+				     const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Check if address is already set on this port */</div><div class='add'>+	if (dpaa2_switch_port_lookup_address(netdev, 0, mdb-&gt;addr))</div><div class='add'>+		return -EEXIST;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_fdb_add_mc(port_priv, mdb-&gt;addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dev_mc_add(netdev, mdb-&gt;addr);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dev_mc_add err %d\n", err);</div><div class='add'>+		dpaa2_switch_port_fdb_del_mc(port_priv, mdb-&gt;addr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_obj_add(struct net_device *netdev,</div><div class='add'>+				     const struct switchdev_obj *obj)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (obj-&gt;id) {</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_VLAN:</div><div class='add'>+		err = dpaa2_switch_port_vlans_add(netdev,</div><div class='add'>+						  SWITCHDEV_OBJ_PORT_VLAN(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_MDB:</div><div class='add'>+		err = dpaa2_switch_port_mdb_add(netdev,</div><div class='add'>+						SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_del_vlan(struct ethsw_port_priv *port_priv, u16 vid)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct dpsw_vlan_if_cfg vcfg;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	if (!port_priv-&gt;vlans[vid])</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	if (port_priv-&gt;vlans[vid] &amp; ETHSW_VLAN_PVID) {</div><div class='add'>+		/* If we are deleting the PVID of a port, use VLAN 4095 instead</div><div class='add'>+		 * as we are sure that neither the bridge nor the 8021q module</div><div class='add'>+		 * will use it</div><div class='add'>+		 */</div><div class='add'>+		err = dpaa2_switch_port_set_pvid(port_priv, 4095);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	vcfg.num_ifs = 1;</div><div class='add'>+	vcfg.if_id[0] = port_priv-&gt;idx;</div><div class='add'>+	if (port_priv-&gt;vlans[vid] &amp; ETHSW_VLAN_UNTAGGED) {</div><div class='add'>+		err = dpsw_vlan_remove_if_untagged(ethsw-&gt;mc_io, 0,</div><div class='add'>+						   ethsw-&gt;dpsw_handle,</div><div class='add'>+						   vid, &amp;vcfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "dpsw_vlan_remove_if_untagged err %d\n",</div><div class='add'>+				   err);</div><div class='add'>+		}</div><div class='add'>+		port_priv-&gt;vlans[vid] &amp;= ~ETHSW_VLAN_UNTAGGED;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (port_priv-&gt;vlans[vid] &amp; ETHSW_VLAN_MEMBER) {</div><div class='add'>+		err = dpsw_vlan_remove_if(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					  vid, &amp;vcfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			netdev_err(netdev,</div><div class='add'>+				   "dpsw_vlan_remove_if err %d\n", err);</div><div class='add'>+			return err;</div><div class='add'>+		}</div><div class='add'>+		port_priv-&gt;vlans[vid] &amp;= ~ETHSW_VLAN_MEMBER;</div><div class='add'>+</div><div class='add'>+		/* Delete VLAN from switch if it is no longer configured on</div><div class='add'>+		 * any port</div><div class='add'>+		 */</div><div class='add'>+		for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++) {</div><div class='add'>+			if (ethsw-&gt;ports[i] &amp;&amp;</div><div class='add'>+			    ethsw-&gt;ports[i]-&gt;vlans[vid] &amp; ETHSW_VLAN_MEMBER)</div><div class='add'>+				return 0; /* Found a port member in VID */</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		ethsw-&gt;vlans[vid] &amp;= ~ETHSW_VLAN_GLOBAL;</div><div class='add'>+</div><div class='add'>+		err = dpaa2_switch_dellink(ethsw, vid);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_port_vlans_del(struct net_device *netdev,</div><div class='add'>+				const struct switchdev_obj_port_vlan *vlan)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+</div><div class='add'>+	if (netif_is_bridge_master(vlan-&gt;obj.orig_dev))</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_del_vlan(port_priv, vlan-&gt;vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_mdb_del(struct net_device *netdev,</div><div class='add'>+				     const struct switchdev_obj_port_mdb *mdb)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_port_lookup_address(netdev, 0, mdb-&gt;addr))</div><div class='add'>+		return -ENOENT;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_fdb_del_mc(port_priv, mdb-&gt;addr);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dev_mc_del(netdev, mdb-&gt;addr);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dev_mc_del err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_obj_del(struct net_device *netdev,</div><div class='add'>+				     const struct switchdev_obj *obj)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	switch (obj-&gt;id) {</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_VLAN:</div><div class='add'>+		err = dpaa2_switch_port_vlans_del(netdev, SWITCHDEV_OBJ_PORT_VLAN(obj));</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_OBJ_ID_PORT_MDB:</div><div class='add'>+		err = dpaa2_switch_port_mdb_del(netdev, SWITCHDEV_OBJ_PORT_MDB(obj));</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_attr_set_event(struct net_device *netdev,</div><div class='add'>+					    struct switchdev_notifier_port_attr_info *ptr)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = switchdev_handle_port_attr_set(netdev, ptr,</div><div class='add'>+					     dpaa2_switch_port_dev_check,</div><div class='add'>+					     dpaa2_switch_port_attr_set);</div><div class='add'>+	return notifier_from_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_bridge_join(struct net_device *netdev,</div><div class='add'>+					 struct net_device *upper_dev,</div><div class='add'>+					 struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct dpaa2_switch_fdb *old_fdb = port_priv-&gt;fdb;</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	bool learn_ena;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Delete the previously manually installed VLAN 1 */</div><div class='add'>+	err = dpaa2_switch_port_del_vlan(port_priv, 1);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_port_set_fdb(port_priv, upper_dev);</div><div class='add'>+</div><div class='add'>+	/* Inherit the initial bridge port learning state */</div><div class='add'>+	learn_ena = br_port_flag_is_set(netdev, BR_LEARNING);</div><div class='add'>+	err = dpaa2_switch_port_set_learning(port_priv, learn_ena);</div><div class='add'>+	port_priv-&gt;learn_ena = learn_ena;</div><div class='add'>+</div><div class='add'>+	/* Setup the egress flood policy (broadcast, unknown unicast) */</div><div class='add'>+	err = dpaa2_switch_fdb_set_egress_flood(ethsw, port_priv-&gt;fdb-&gt;fdb_id);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_egress_flood;</div><div class='add'>+</div><div class='add'>+	/* Recreate the egress flood domain of the FDB that we just left. */</div><div class='add'>+	err = dpaa2_switch_fdb_set_egress_flood(ethsw, old_fdb-&gt;fdb_id);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_egress_flood;</div><div class='add'>+</div><div class='add'>+	err = switchdev_bridge_port_offload(netdev, netdev, NULL,</div><div class='add'>+					    NULL, NULL, false, extack);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_switchdev_offload;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_switchdev_offload:</div><div class='add'>+err_egress_flood:</div><div class='add'>+	dpaa2_switch_port_set_fdb(port_priv, NULL);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_clear_rxvlan(struct net_device *vdev, int vid, void *arg)</div><div class='add'>+{</div><div class='add'>+	__be16 vlan_proto = htons(ETH_P_8021Q);</div><div class='add'>+</div><div class='add'>+	if (vdev)</div><div class='add'>+		vlan_proto = vlan_dev_vlan_proto(vdev);</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_vlan_kill(arg, vlan_proto, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_restore_rxvlan(struct net_device *vdev, int vid, void *arg)</div><div class='add'>+{</div><div class='add'>+	__be16 vlan_proto = htons(ETH_P_8021Q);</div><div class='add'>+</div><div class='add'>+	if (vdev)</div><div class='add'>+		vlan_proto = vlan_dev_vlan_proto(vdev);</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_port_vlan_add(arg, vlan_proto, vid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_port_pre_bridge_leave(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	switchdev_bridge_port_unoffload(netdev, NULL, NULL, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_bridge_leave(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct dpaa2_switch_fdb *old_fdb = port_priv-&gt;fdb;</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* First of all, fast age any learn FDB addresses on this switch port */</div><div class='add'>+	dpaa2_switch_port_fast_age(port_priv);</div><div class='add'>+</div><div class='add'>+	/* Clear all RX VLANs installed through vlan_vid_add() either as VLAN</div><div class='add'>+	 * upper devices or otherwise from the FDB table that we are about to</div><div class='add'>+	 * leave</div><div class='add'>+	 */</div><div class='add'>+	err = vlan_for_each(netdev, dpaa2_switch_port_clear_rxvlan, netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(netdev, "Unable to clear RX VLANs from old FDB table, err (%d)\n", err);</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_port_set_fdb(port_priv, NULL);</div><div class='add'>+</div><div class='add'>+	/* Restore all RX VLANs into the new FDB table that we just joined */</div><div class='add'>+	err = vlan_for_each(netdev, dpaa2_switch_port_restore_rxvlan, netdev);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(netdev, "Unable to restore RX VLANs to the new FDB, err (%d)\n", err);</div><div class='add'>+</div><div class='add'>+	/* Reset the flooding state to denote that this port can send any</div><div class='add'>+	 * packet in standalone mode. With this, we are also ensuring that any</div><div class='add'>+	 * later bridge join will have the flooding flag on.</div><div class='add'>+	 */</div><div class='add'>+	port_priv-&gt;bcast_flood = true;</div><div class='add'>+	port_priv-&gt;ucast_flood = true;</div><div class='add'>+</div><div class='add'>+	/* Setup the egress flood policy (broadcast, unknown unicast).</div><div class='add'>+	 * When the port is not under a bridge, only the CTRL interface is part</div><div class='add'>+	 * of the flooding domain besides the actual port</div><div class='add'>+	 */</div><div class='add'>+	err = dpaa2_switch_fdb_set_egress_flood(ethsw, port_priv-&gt;fdb-&gt;fdb_id);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Recreate the egress flood domain of the FDB that we just left */</div><div class='add'>+	err = dpaa2_switch_fdb_set_egress_flood(ethsw, old_fdb-&gt;fdb_id);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* No HW learning when not under a bridge */</div><div class='add'>+	err = dpaa2_switch_port_set_learning(port_priv, false);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+	port_priv-&gt;learn_ena = false;</div><div class='add'>+</div><div class='add'>+	/* Add the VLAN 1 as PVID when not under a bridge. We need this since</div><div class='add'>+	 * the dpaa2 switch interfaces are not capable to be VLAN unaware</div><div class='add'>+	 */</div><div class='add'>+	return dpaa2_switch_port_add_vlan(port_priv, DEFAULT_VLAN_ID,</div><div class='add'>+					  BRIDGE_VLAN_INFO_UNTAGGED | BRIDGE_VLAN_INFO_PVID);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_prevent_bridging_with_8021q_upper(struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+</div><div class='add'>+	/* RCU read lock not necessary because we have write-side protection</div><div class='add'>+	 * (rtnl_mutex), however a non-rcu iterator does not exist.</div><div class='add'>+	 */</div><div class='add'>+	netdev_for_each_upper_dev_rcu(netdev, upper_dev, iter)</div><div class='add'>+		if (is_vlan_dev(upper_dev))</div><div class='add'>+			return -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int</div><div class='add'>+dpaa2_switch_prechangeupper_sanity_checks(struct net_device *netdev,</div><div class='add'>+					  struct net_device *upper_dev,</div><div class='add'>+					  struct netlink_ext_ack *extack)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(netdev);</div><div class='add'>+	struct ethsw_port_priv *other_port_priv;</div><div class='add'>+	struct net_device *other_dev;</div><div class='add'>+	struct list_head *iter;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!br_vlan_enabled(upper_dev)) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack, "Cannot join a VLAN-unaware bridge");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_prevent_bridging_with_8021q_upper(netdev);</div><div class='add'>+	if (err) {</div><div class='add'>+		NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+				   "Cannot join a bridge while VLAN uppers are present");</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	netdev_for_each_lower_dev(upper_dev, other_dev, iter) {</div><div class='add'>+		if (!dpaa2_switch_port_dev_check(other_dev))</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		other_port_priv = netdev_priv(other_dev);</div><div class='add'>+		if (other_port_priv-&gt;ethsw_data != port_priv-&gt;ethsw_data) {</div><div class='add'>+			NL_SET_ERR_MSG_MOD(extack,</div><div class='add'>+					   "Interface from a different DPSW is in the bridge already");</div><div class='add'>+			return -EINVAL;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_prechangeupper(struct net_device *netdev,</div><div class='add'>+					    struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_port_dev_check(netdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+	upper_dev = info-&gt;upper_dev;</div><div class='add'>+	if (netif_is_bridge_master(upper_dev)) {</div><div class='add'>+		err = dpaa2_switch_prechangeupper_sanity_checks(netdev,</div><div class='add'>+								upper_dev,</div><div class='add'>+								extack);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+</div><div class='add'>+		if (!info-&gt;linking)</div><div class='add'>+			dpaa2_switch_port_pre_bridge_leave(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_changeupper(struct net_device *netdev,</div><div class='add'>+					 struct netdev_notifier_changeupper_info *info)</div><div class='add'>+{</div><div class='add'>+	struct netlink_ext_ack *extack;</div><div class='add'>+	struct net_device *upper_dev;</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_port_dev_check(netdev))</div><div class='add'>+		return 0;</div><div class='add'>+</div><div class='add'>+	extack = netdev_notifier_info_to_extack(&amp;info-&gt;info);</div><div class='add'>+</div><div class='add'>+	upper_dev = info-&gt;upper_dev;</div><div class='add'>+	if (netif_is_bridge_master(upper_dev)) {</div><div class='add'>+		if (info-&gt;linking)</div><div class='add'>+			return dpaa2_switch_port_bridge_join(netdev,</div><div class='add'>+							     upper_dev,</div><div class='add'>+							     extack);</div><div class='add'>+		else</div><div class='add'>+			return dpaa2_switch_port_bridge_leave(netdev);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_netdevice_event(struct notifier_block *nb,</div><div class='add'>+					     unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *netdev = netdev_notifier_info_to_dev(ptr);</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case NETDEV_PRECHANGEUPPER:</div><div class='add'>+		err = dpaa2_switch_port_prechangeupper(netdev, ptr);</div><div class='add'>+		if (err)</div><div class='add'>+			return notifier_from_errno(err);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	case NETDEV_CHANGEUPPER:</div><div class='add'>+		err = dpaa2_switch_port_changeupper(netdev, ptr);</div><div class='add'>+		if (err)</div><div class='add'>+			return notifier_from_errno(err);</div><div class='add'>+</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+struct ethsw_switchdev_event_work {</div><div class='add'>+	struct work_struct work;</div><div class='add'>+	struct switchdev_notifier_fdb_info fdb_info;</div><div class='add'>+	struct net_device *dev;</div><div class='add'>+	unsigned long event;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_event_work(struct work_struct *work)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_switchdev_event_work *switchdev_work =</div><div class='add'>+		container_of(work, struct ethsw_switchdev_event_work, work);</div><div class='add'>+	struct net_device *dev = switchdev_work-&gt;dev;</div><div class='add'>+	struct switchdev_notifier_fdb_info *fdb_info;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	rtnl_lock();</div><div class='add'>+	fdb_info = &amp;switchdev_work-&gt;fdb_info;</div><div class='add'>+</div><div class='add'>+	switch (switchdev_work-&gt;event) {</div><div class='add'>+	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='add'>+		if (!fdb_info-&gt;added_by_user || fdb_info-&gt;is_local)</div><div class='add'>+			break;</div><div class='add'>+		if (is_unicast_ether_addr(fdb_info-&gt;addr))</div><div class='add'>+			err = dpaa2_switch_port_fdb_add_uc(netdev_priv(dev),</div><div class='add'>+							   fdb_info-&gt;addr);</div><div class='add'>+		else</div><div class='add'>+			err = dpaa2_switch_port_fdb_add_mc(netdev_priv(dev),</div><div class='add'>+							   fdb_info-&gt;addr);</div><div class='add'>+		if (err)</div><div class='add'>+			break;</div><div class='add'>+		fdb_info-&gt;offloaded = true;</div><div class='add'>+		call_switchdev_notifiers(SWITCHDEV_FDB_OFFLOADED, dev,</div><div class='add'>+					 &amp;fdb_info-&gt;info, NULL);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='add'>+		if (!fdb_info-&gt;added_by_user || fdb_info-&gt;is_local)</div><div class='add'>+			break;</div><div class='add'>+		if (is_unicast_ether_addr(fdb_info-&gt;addr))</div><div class='add'>+			dpaa2_switch_port_fdb_del_uc(netdev_priv(dev), fdb_info-&gt;addr);</div><div class='add'>+		else</div><div class='add'>+			dpaa2_switch_port_fdb_del_mc(netdev_priv(dev), fdb_info-&gt;addr);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	rtnl_unlock();</div><div class='add'>+	kfree(switchdev_work-&gt;fdb_info.addr);</div><div class='add'>+	kfree(switchdev_work);</div><div class='add'>+	dev_put(dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Called under rcu_read_lock() */</div><div class='add'>+static int dpaa2_switch_port_event(struct notifier_block *nb,</div><div class='add'>+				   unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+	struct ethsw_port_priv *port_priv = netdev_priv(dev);</div><div class='add'>+	struct ethsw_switchdev_event_work *switchdev_work;</div><div class='add'>+	struct switchdev_notifier_fdb_info *fdb_info = ptr;</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+</div><div class='add'>+	if (event == SWITCHDEV_PORT_ATTR_SET)</div><div class='add'>+		return dpaa2_switch_port_attr_set_event(dev, ptr);</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_port_dev_check(dev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);</div><div class='add'>+	if (!switchdev_work)</div><div class='add'>+		return NOTIFY_BAD;</div><div class='add'>+</div><div class='add'>+	INIT_WORK(&amp;switchdev_work-&gt;work, dpaa2_switch_event_work);</div><div class='add'>+	switchdev_work-&gt;dev = dev;</div><div class='add'>+	switchdev_work-&gt;event = event;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_FDB_ADD_TO_DEVICE:</div><div class='add'>+	case SWITCHDEV_FDB_DEL_TO_DEVICE:</div><div class='add'>+		memcpy(&amp;switchdev_work-&gt;fdb_info, ptr,</div><div class='add'>+		       sizeof(switchdev_work-&gt;fdb_info));</div><div class='add'>+		switchdev_work-&gt;fdb_info.addr = kzalloc(ETH_ALEN, GFP_ATOMIC);</div><div class='add'>+		if (!switchdev_work-&gt;fdb_info.addr)</div><div class='add'>+			goto err_addr_alloc;</div><div class='add'>+</div><div class='add'>+		ether_addr_copy((u8 *)switchdev_work-&gt;fdb_info.addr,</div><div class='add'>+				fdb_info-&gt;addr);</div><div class='add'>+</div><div class='add'>+		/* Take a reference on the device to avoid being freed. */</div><div class='add'>+		dev_hold(dev);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		kfree(switchdev_work);</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	queue_work(ethsw-&gt;workqueue, &amp;switchdev_work-&gt;work);</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+err_addr_alloc:</div><div class='add'>+	kfree(switchdev_work);</div><div class='add'>+	return NOTIFY_BAD;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_obj_event(unsigned long event,</div><div class='add'>+				       struct net_device *netdev,</div><div class='add'>+				       struct switchdev_notifier_port_obj_info *port_obj_info)</div><div class='add'>+{</div><div class='add'>+	int err = -EOPNOTSUPP;</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_port_dev_check(netdev))</div><div class='add'>+		return NOTIFY_DONE;</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_PORT_OBJ_ADD:</div><div class='add'>+		err = dpaa2_switch_port_obj_add(netdev, port_obj_info-&gt;obj);</div><div class='add'>+		break;</div><div class='add'>+	case SWITCHDEV_PORT_OBJ_DEL:</div><div class='add'>+		err = dpaa2_switch_port_obj_del(netdev, port_obj_info-&gt;obj);</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port_obj_info-&gt;handled = true;</div><div class='add'>+	return notifier_from_errno(err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_blocking_event(struct notifier_block *nb,</div><div class='add'>+					    unsigned long event, void *ptr)</div><div class='add'>+{</div><div class='add'>+	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);</div><div class='add'>+</div><div class='add'>+	switch (event) {</div><div class='add'>+	case SWITCHDEV_PORT_OBJ_ADD:</div><div class='add'>+	case SWITCHDEV_PORT_OBJ_DEL:</div><div class='add'>+		return dpaa2_switch_port_obj_event(event, dev, ptr);</div><div class='add'>+	case SWITCHDEV_PORT_ATTR_SET:</div><div class='add'>+		return dpaa2_switch_port_attr_set_event(dev, ptr);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return NOTIFY_DONE;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Build a linear skb based on a single-buffer frame descriptor */</div><div class='add'>+static struct sk_buff *dpaa2_switch_build_linear_skb(struct ethsw_core *ethsw,</div><div class='add'>+						     const struct dpaa2_fd *fd)</div><div class='add'>+{</div><div class='add'>+	u16 fd_offset = dpaa2_fd_get_offset(fd);</div><div class='add'>+	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='add'>+	u32 fd_length = dpaa2_fd_get_len(fd);</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	struct sk_buff *skb = NULL;</div><div class='add'>+	void *fd_vaddr;</div><div class='add'>+</div><div class='add'>+	fd_vaddr = dpaa2_iova_to_virt(ethsw-&gt;iommu_domain, addr);</div><div class='add'>+	dma_unmap_page(dev, addr, DPAA2_SWITCH_RX_BUF_SIZE,</div><div class='add'>+		       DMA_FROM_DEVICE);</div><div class='add'>+</div><div class='add'>+	skb = build_skb(fd_vaddr, DPAA2_SWITCH_RX_BUF_SIZE +</div><div class='add'>+			SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));</div><div class='add'>+	if (unlikely(!skb)) {</div><div class='add'>+		dev_err(dev, "build_skb() failed\n");</div><div class='add'>+		return NULL;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb_reserve(skb, fd_offset);</div><div class='add'>+	skb_put(skb, fd_length);</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;buf_count--;</div><div class='add'>+</div><div class='add'>+	return skb;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_tx_conf(struct dpaa2_switch_fq *fq,</div><div class='add'>+				 const struct dpaa2_fd *fd)</div><div class='add'>+{</div><div class='add'>+	dpaa2_switch_free_fd(fq-&gt;ethsw, fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_rx(struct dpaa2_switch_fq *fq,</div><div class='add'>+			    const struct dpaa2_fd *fd)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = fq-&gt;ethsw;</div><div class='add'>+	struct ethsw_port_priv *port_priv;</div><div class='add'>+	struct net_device *netdev;</div><div class='add'>+	struct vlan_ethhdr *hdr;</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	u16 vlan_tci, vid;</div><div class='add'>+	int if_id, err;</div><div class='add'>+</div><div class='add'>+	/* get switch ingress interface ID */</div><div class='add'>+	if_id = upper_32_bits(dpaa2_fd_get_flc(fd)) &amp; 0x0000FFFF;</div><div class='add'>+</div><div class='add'>+	if (if_id &gt;= ethsw-&gt;sw_attr.num_ifs) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "Frame received from unknown interface!\n");</div><div class='add'>+		goto err_free_fd;</div><div class='add'>+	}</div><div class='add'>+	port_priv = ethsw-&gt;ports[if_id];</div><div class='add'>+	netdev = port_priv-&gt;netdev;</div><div class='add'>+</div><div class='add'>+	/* build the SKB based on the FD received */</div><div class='add'>+	if (dpaa2_fd_get_format(fd) != dpaa2_fd_single) {</div><div class='add'>+		if (net_ratelimit()) {</div><div class='add'>+			netdev_err(netdev, "Received invalid frame format\n");</div><div class='add'>+			goto err_free_fd;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb = dpaa2_switch_build_linear_skb(ethsw, fd);</div><div class='add'>+	if (unlikely(!skb))</div><div class='add'>+		goto err_free_fd;</div><div class='add'>+</div><div class='add'>+	skb_reset_mac_header(skb);</div><div class='add'>+</div><div class='add'>+	/* Remove the VLAN header if the packet that we just received has a vid</div><div class='add'>+	 * equal to the port PVIDs. Since the dpaa2-switch can operate only in</div><div class='add'>+	 * VLAN-aware mode and no alterations are made on the packet when it's</div><div class='add'>+	 * redirected/mirrored to the control interface, we are sure that there</div><div class='add'>+	 * will always be a VLAN header present.</div><div class='add'>+	 */</div><div class='add'>+	hdr = vlan_eth_hdr(skb);</div><div class='add'>+	vid = ntohs(hdr-&gt;h_vlan_TCI) &amp; VLAN_VID_MASK;</div><div class='add'>+	if (vid == port_priv-&gt;pvid) {</div><div class='add'>+		err = __skb_vlan_pop(skb, &amp;vlan_tci);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_info(ethsw-&gt;dev, "__skb_vlan_pop() returned %d", err);</div><div class='add'>+			goto err_free_fd;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	skb-&gt;dev = netdev;</div><div class='add'>+	skb-&gt;protocol = eth_type_trans(skb, skb-&gt;dev);</div><div class='add'>+</div><div class='add'>+	/* Setup the offload_fwd_mark only if the port is under a bridge */</div><div class='add'>+	skb-&gt;offload_fwd_mark = !!(port_priv-&gt;fdb-&gt;bridge_dev);</div><div class='add'>+</div><div class='add'>+	netif_receive_skb(skb);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_free_fd:</div><div class='add'>+	dpaa2_switch_free_fd(ethsw, fd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_detect_features(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	ethsw-&gt;features = 0;</div><div class='add'>+</div><div class='add'>+	if (ethsw-&gt;major &gt; 8 || (ethsw-&gt;major == 8 &amp;&amp; ethsw-&gt;minor &gt;= 6))</div><div class='add'>+		ethsw-&gt;features |= ETHSW_FEATURE_MAC_ADDR;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_setup_fqs(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_ctrl_if_attr ctrl_if_attr;</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	int i = 0;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = dpsw_ctrl_if_get_attributes(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					  &amp;ctrl_if_attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_ctrl_if_get_attributes() = %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;fq[i].fqid = ctrl_if_attr.rx_fqid;</div><div class='add'>+	ethsw-&gt;fq[i].ethsw = ethsw;</div><div class='add'>+	ethsw-&gt;fq[i++].type = DPSW_QUEUE_RX;</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;fq[i].fqid = ctrl_if_attr.tx_err_conf_fqid;</div><div class='add'>+	ethsw-&gt;fq[i].ethsw = ethsw;</div><div class='add'>+	ethsw-&gt;fq[i++].type = DPSW_QUEUE_TX_ERR_CONF;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Free buffers acquired from the buffer pool or which were meant to</div><div class='add'>+ * be released in the pool</div><div class='add'>+ */</div><div class='add'>+static void dpaa2_switch_free_bufs(struct ethsw_core *ethsw, u64 *buf_array, int count)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	void *vaddr;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; count; i++) {</div><div class='add'>+		vaddr = dpaa2_iova_to_virt(ethsw-&gt;iommu_domain, buf_array[i]);</div><div class='add'>+		dma_unmap_page(dev, buf_array[i], DPAA2_SWITCH_RX_BUF_SIZE,</div><div class='add'>+			       DMA_FROM_DEVICE);</div><div class='add'>+		free_pages((unsigned long)vaddr, 0);</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Perform a single release command to add buffers</div><div class='add'>+ * to the specified buffer pool</div><div class='add'>+ */</div><div class='add'>+static int dpaa2_switch_add_bufs(struct ethsw_core *ethsw, u16 bpid)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	u64 buf_array[BUFS_PER_CMD];</div><div class='add'>+	struct page *page;</div><div class='add'>+	int retries = 0;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	int err;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; BUFS_PER_CMD; i++) {</div><div class='add'>+		/* Allocate one page for each Rx buffer. WRIOP sees</div><div class='add'>+		 * the entire page except for a tailroom reserved for</div><div class='add'>+		 * skb shared info</div><div class='add'>+		 */</div><div class='add'>+		page = dev_alloc_pages(0);</div><div class='add'>+		if (!page) {</div><div class='add'>+			dev_err(dev, "buffer allocation failed\n");</div><div class='add'>+			goto err_alloc;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		addr = dma_map_page(dev, page, 0, DPAA2_SWITCH_RX_BUF_SIZE,</div><div class='add'>+				    DMA_FROM_DEVICE);</div><div class='add'>+		if (dma_mapping_error(dev, addr)) {</div><div class='add'>+			dev_err(dev, "dma_map_single() failed\n");</div><div class='add'>+			goto err_map;</div><div class='add'>+		}</div><div class='add'>+		buf_array[i] = addr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+release_bufs:</div><div class='add'>+	/* In case the portal is busy, retry until successful or</div><div class='add'>+	 * max retries hit.</div><div class='add'>+	 */</div><div class='add'>+	while ((err = dpaa2_io_service_release(NULL, bpid,</div><div class='add'>+					       buf_array, i)) == -EBUSY) {</div><div class='add'>+		if (retries++ &gt;= DPAA2_SWITCH_SWP_BUSY_RETRIES)</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		cpu_relax();</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* If release command failed, clean up and bail out. */</div><div class='add'>+	if (err) {</div><div class='add'>+		dpaa2_switch_free_bufs(ethsw, buf_array, i);</div><div class='add'>+		return 0;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return i;</div><div class='add'>+</div><div class='add'>+err_map:</div><div class='add'>+	__free_pages(page, 0);</div><div class='add'>+err_alloc:</div><div class='add'>+	/* If we managed to allocate at least some buffers,</div><div class='add'>+	 * release them to hardware</div><div class='add'>+	 */</div><div class='add'>+	if (i)</div><div class='add'>+		goto release_bufs;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_refill_bp(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int *count = &amp;ethsw-&gt;buf_count;</div><div class='add'>+	int new_count;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	if (unlikely(*count &lt; DPAA2_ETHSW_REFILL_THRESH)) {</div><div class='add'>+		do {</div><div class='add'>+			new_count = dpaa2_switch_add_bufs(ethsw, ethsw-&gt;bpid);</div><div class='add'>+			if (unlikely(!new_count)) {</div><div class='add'>+				/* Out of memory; abort for now, we'll</div><div class='add'>+				 * try later on</div><div class='add'>+				 */</div><div class='add'>+				break;</div><div class='add'>+			}</div><div class='add'>+			*count += new_count;</div><div class='add'>+		} while (*count &lt; DPAA2_ETHSW_NUM_BUFS);</div><div class='add'>+</div><div class='add'>+		if (unlikely(*count &lt; DPAA2_ETHSW_NUM_BUFS))</div><div class='add'>+			err = -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_seed_bp(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int *count, ret, i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_ETHSW_NUM_BUFS; i += BUFS_PER_CMD) {</div><div class='add'>+		ret = dpaa2_switch_add_bufs(ethsw, ethsw-&gt;bpid);</div><div class='add'>+		count = &amp;ethsw-&gt;buf_count;</div><div class='add'>+		*count += ret;</div><div class='add'>+</div><div class='add'>+		if (unlikely(ret &lt; BUFS_PER_CMD))</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_drain_bp(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	u64 buf_array[BUFS_PER_CMD];</div><div class='add'>+	int ret;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		ret = dpaa2_io_service_acquire(NULL, ethsw-&gt;bpid,</div><div class='add'>+					       buf_array, BUFS_PER_CMD);</div><div class='add'>+		if (ret &lt; 0) {</div><div class='add'>+			dev_err(ethsw-&gt;dev,</div><div class='add'>+				"dpaa2_io_service_acquire() = %d\n", ret);</div><div class='add'>+			return;</div><div class='add'>+		}</div><div class='add'>+		dpaa2_switch_free_bufs(ethsw, buf_array, ret);</div><div class='add'>+</div><div class='add'>+	} while (ret);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_setup_dpbp(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_ctrl_if_pools_cfg dpsw_ctrl_if_pools_cfg = { 0 };</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	struct fsl_mc_device *dpbp_dev;</div><div class='add'>+	struct dpbp_attr dpbp_attrs;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fsl_mc_object_allocate(to_fsl_mc_device(dev), FSL_MC_POOL_DPBP,</div><div class='add'>+				     &amp;dpbp_dev);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -ENXIO)</div><div class='add'>+			err = -EPROBE_DEFER;</div><div class='add'>+		else</div><div class='add'>+			dev_err(dev, "DPBP device allocation failed\n");</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	ethsw-&gt;dpbp_dev = dpbp_dev;</div><div class='add'>+</div><div class='add'>+	err = dpbp_open(ethsw-&gt;mc_io, 0, dpbp_dev-&gt;obj_desc.id,</div><div class='add'>+			&amp;dpbp_dev-&gt;mc_handle);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpbp_open() failed\n");</div><div class='add'>+		goto err_open;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpbp_reset(ethsw-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpbp_reset() failed\n");</div><div class='add'>+		goto err_reset;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpbp_enable(ethsw-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpbp_enable() failed\n");</div><div class='add'>+		goto err_enable;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpbp_get_attributes(ethsw-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle,</div><div class='add'>+				  &amp;dpbp_attrs);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpbp_get_attributes() failed\n");</div><div class='add'>+		goto err_get_attr;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpsw_ctrl_if_pools_cfg.num_dpbp = 1;</div><div class='add'>+	dpsw_ctrl_if_pools_cfg.pools[0].dpbp_id = dpbp_attrs.id;</div><div class='add'>+	dpsw_ctrl_if_pools_cfg.pools[0].buffer_size = DPAA2_SWITCH_RX_BUF_SIZE;</div><div class='add'>+	dpsw_ctrl_if_pools_cfg.pools[0].backup_pool = 0;</div><div class='add'>+</div><div class='add'>+	err = dpsw_ctrl_if_set_pools(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				     &amp;dpsw_ctrl_if_pools_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_ctrl_if_set_pools() failed\n");</div><div class='add'>+		goto err_get_attr;</div><div class='add'>+	}</div><div class='add'>+	ethsw-&gt;bpid = dpbp_attrs.bpid;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_get_attr:</div><div class='add'>+	dpbp_disable(ethsw-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle);</div><div class='add'>+err_enable:</div><div class='add'>+err_reset:</div><div class='add'>+	dpbp_close(ethsw-&gt;mc_io, 0, dpbp_dev-&gt;mc_handle);</div><div class='add'>+err_open:</div><div class='add'>+	fsl_mc_object_free(dpbp_dev);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_free_dpbp(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	dpbp_disable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpbp_dev-&gt;mc_handle);</div><div class='add'>+	dpbp_close(ethsw-&gt;mc_io, 0, ethsw-&gt;dpbp_dev-&gt;mc_handle);</div><div class='add'>+	fsl_mc_object_free(ethsw-&gt;dpbp_dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_alloc_rings(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++) {</div><div class='add'>+		ethsw-&gt;fq[i].store =</div><div class='add'>+			dpaa2_io_store_create(DPAA2_SWITCH_STORE_SIZE,</div><div class='add'>+					      ethsw-&gt;dev);</div><div class='add'>+		if (!ethsw-&gt;fq[i].store) {</div><div class='add'>+			dev_err(ethsw-&gt;dev, "dpaa2_io_store_create failed\n");</div><div class='add'>+			while (--i &gt;= 0)</div><div class='add'>+				dpaa2_io_store_destroy(ethsw-&gt;fq[i].store);</div><div class='add'>+			return -ENOMEM;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_destroy_rings(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++)</div><div class='add'>+		dpaa2_io_store_destroy(ethsw-&gt;fq[i].store);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_pull_fq(struct dpaa2_switch_fq *fq)</div><div class='add'>+{</div><div class='add'>+	int err, retries = 0;</div><div class='add'>+</div><div class='add'>+	/* Try to pull from the FQ while the portal is busy and we didn't hit</div><div class='add'>+	 * the maximum number fo retries</div><div class='add'>+	 */</div><div class='add'>+	do {</div><div class='add'>+		err = dpaa2_io_service_pull_fq(NULL, fq-&gt;fqid, fq-&gt;store);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (err == -EBUSY &amp;&amp; retries++ &lt; DPAA2_SWITCH_SWP_BUSY_RETRIES);</div><div class='add'>+</div><div class='add'>+	if (unlikely(err))</div><div class='add'>+		dev_err(fq-&gt;ethsw-&gt;dev, "dpaa2_io_service_pull err %d", err);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Consume all frames pull-dequeued into the store */</div><div class='add'>+static int dpaa2_switch_store_consume(struct dpaa2_switch_fq *fq)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_core *ethsw = fq-&gt;ethsw;</div><div class='add'>+	int cleaned = 0, is_last;</div><div class='add'>+	struct dpaa2_dq *dq;</div><div class='add'>+	int retries = 0;</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		/* Get the next available FD from the store */</div><div class='add'>+		dq = dpaa2_io_store_next(fq-&gt;store, &amp;is_last);</div><div class='add'>+		if (unlikely(!dq)) {</div><div class='add'>+			if (retries++ &gt;= DPAA2_SWITCH_SWP_BUSY_RETRIES) {</div><div class='add'>+				dev_err_once(ethsw-&gt;dev,</div><div class='add'>+					     "No valid dequeue response\n");</div><div class='add'>+				return -ETIMEDOUT;</div><div class='add'>+			}</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		if (fq-&gt;type == DPSW_QUEUE_RX)</div><div class='add'>+			dpaa2_switch_rx(fq, dpaa2_dq_fd(dq));</div><div class='add'>+		else</div><div class='add'>+			dpaa2_switch_tx_conf(fq, dpaa2_dq_fd(dq));</div><div class='add'>+		cleaned++;</div><div class='add'>+</div><div class='add'>+	} while (!is_last);</div><div class='add'>+</div><div class='add'>+	return cleaned;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* NAPI poll routine */</div><div class='add'>+static int dpaa2_switch_poll(struct napi_struct *napi, int budget)</div><div class='add'>+{</div><div class='add'>+	int err, cleaned = 0, store_cleaned, work_done;</div><div class='add'>+	struct dpaa2_switch_fq *fq;</div><div class='add'>+	int retries = 0;</div><div class='add'>+</div><div class='add'>+	fq = container_of(napi, struct dpaa2_switch_fq, napi);</div><div class='add'>+</div><div class='add'>+	do {</div><div class='add'>+		err = dpaa2_switch_pull_fq(fq);</div><div class='add'>+		if (unlikely(err))</div><div class='add'>+			break;</div><div class='add'>+</div><div class='add'>+		/* Refill pool if appropriate */</div><div class='add'>+		dpaa2_switch_refill_bp(fq-&gt;ethsw);</div><div class='add'>+</div><div class='add'>+		store_cleaned = dpaa2_switch_store_consume(fq);</div><div class='add'>+		cleaned += store_cleaned;</div><div class='add'>+</div><div class='add'>+		if (cleaned &gt;= budget) {</div><div class='add'>+			work_done = budget;</div><div class='add'>+			goto out;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+	} while (store_cleaned);</div><div class='add'>+</div><div class='add'>+	/* We didn't consume the entire budget, so finish napi and re-enable</div><div class='add'>+	 * data availability notifications</div><div class='add'>+	 */</div><div class='add'>+	napi_complete_done(napi, cleaned);</div><div class='add'>+	do {</div><div class='add'>+		err = dpaa2_io_service_rearm(NULL, &amp;fq-&gt;nctx);</div><div class='add'>+		cpu_relax();</div><div class='add'>+	} while (err == -EBUSY &amp;&amp; retries++ &lt; DPAA2_SWITCH_SWP_BUSY_RETRIES);</div><div class='add'>+</div><div class='add'>+	work_done = max(cleaned, 1);</div><div class='add'>+out:</div><div class='add'>+</div><div class='add'>+	return work_done;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_fqdan_cb(struct dpaa2_io_notification_ctx *nctx)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_fq *fq;</div><div class='add'>+</div><div class='add'>+	fq = container_of(nctx, struct dpaa2_switch_fq, nctx);</div><div class='add'>+</div><div class='add'>+	napi_schedule(&amp;fq-&gt;napi);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_setup_dpio(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	struct dpsw_ctrl_if_queue_cfg queue_cfg;</div><div class='add'>+	struct dpaa2_io_notification_ctx *nctx;</div><div class='add'>+	int err, i, j;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++) {</div><div class='add'>+		nctx = &amp;ethsw-&gt;fq[i].nctx;</div><div class='add'>+</div><div class='add'>+		/* Register a new software context for the FQID.</div><div class='add'>+		 * By using NULL as the first parameter, we specify that we do</div><div class='add'>+		 * not care on which cpu are interrupts received for this queue</div><div class='add'>+		 */</div><div class='add'>+		nctx-&gt;is_cdan = 0;</div><div class='add'>+		nctx-&gt;id = ethsw-&gt;fq[i].fqid;</div><div class='add'>+		nctx-&gt;desired_cpu = DPAA2_IO_ANY_CPU;</div><div class='add'>+		nctx-&gt;cb = dpaa2_switch_fqdan_cb;</div><div class='add'>+		err = dpaa2_io_service_register(NULL, nctx, ethsw-&gt;dev);</div><div class='add'>+		if (err) {</div><div class='add'>+			err = -EPROBE_DEFER;</div><div class='add'>+			goto err_register;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		queue_cfg.options = DPSW_CTRL_IF_QUEUE_OPT_DEST |</div><div class='add'>+				    DPSW_CTRL_IF_QUEUE_OPT_USER_CTX;</div><div class='add'>+		queue_cfg.dest_cfg.dest_type = DPSW_CTRL_IF_DEST_DPIO;</div><div class='add'>+		queue_cfg.dest_cfg.dest_id = nctx-&gt;dpio_id;</div><div class='add'>+		queue_cfg.dest_cfg.priority = 0;</div><div class='add'>+		queue_cfg.user_ctx = nctx-&gt;qman64;</div><div class='add'>+</div><div class='add'>+		err = dpsw_ctrl_if_set_queue(ethsw-&gt;mc_io, 0,</div><div class='add'>+					     ethsw-&gt;dpsw_handle,</div><div class='add'>+					     ethsw-&gt;fq[i].type,</div><div class='add'>+					     &amp;queue_cfg);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_set_queue;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_set_queue:</div><div class='add'>+	dpaa2_io_service_deregister(NULL, nctx, ethsw-&gt;dev);</div><div class='add'>+err_register:</div><div class='add'>+	for (j = 0; j &lt; i; j++)</div><div class='add'>+		dpaa2_io_service_deregister(NULL, &amp;ethsw-&gt;fq[j].nctx,</div><div class='add'>+					    ethsw-&gt;dev);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_free_dpio(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++)</div><div class='add'>+		dpaa2_io_service_deregister(NULL, &amp;ethsw-&gt;fq[i].nctx,</div><div class='add'>+					    ethsw-&gt;dev);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_ctrl_if_setup(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* setup FQs for Rx and Tx Conf */</div><div class='add'>+	err = dpaa2_switch_setup_fqs(ethsw);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* setup the buffer pool needed on the Rx path */</div><div class='add'>+	err = dpaa2_switch_setup_dpbp(ethsw);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_alloc_rings(ethsw);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_dpbp;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_setup_dpio(ethsw);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_destroy_rings;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_seed_bp(ethsw);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_deregister_dpio;</div><div class='add'>+</div><div class='add'>+	err = dpsw_ctrl_if_enable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "dpsw_ctrl_if_enable err %d\n", err);</div><div class='add'>+		goto err_drain_dpbp;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_drain_dpbp:</div><div class='add'>+	dpaa2_switch_drain_bp(ethsw);</div><div class='add'>+err_deregister_dpio:</div><div class='add'>+	dpaa2_switch_free_dpio(ethsw);</div><div class='add'>+err_destroy_rings:</div><div class='add'>+	dpaa2_switch_destroy_rings(ethsw);</div><div class='add'>+err_free_dpbp:</div><div class='add'>+	dpaa2_switch_free_dpbp(ethsw);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_remove_port(struct ethsw_core *ethsw,</div><div class='add'>+				     u16 port_idx)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv = ethsw-&gt;ports[port_idx];</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_port_disconnect_mac(port_priv);</div><div class='add'>+	free_netdev(port_priv-&gt;netdev);</div><div class='add'>+	ethsw-&gt;ports[port_idx] = NULL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_init(struct fsl_mc_device *sw_dev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;sw_dev-&gt;dev;</div><div class='add'>+	struct ethsw_core *ethsw = dev_get_drvdata(dev);</div><div class='add'>+	struct dpsw_vlan_if_cfg vcfg = {0};</div><div class='add'>+	struct dpsw_tci_cfg tci_cfg = {0};</div><div class='add'>+	struct dpsw_stp_cfg stp_cfg;</div><div class='add'>+	int err;</div><div class='add'>+	u16 i;</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;dev_id = sw_dev-&gt;obj_desc.id;</div><div class='add'>+</div><div class='add'>+	err = dpsw_open(ethsw-&gt;mc_io, 0, ethsw-&gt;dev_id, &amp;ethsw-&gt;dpsw_handle);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_open err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_get_attributes(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				  &amp;ethsw-&gt;sw_attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_get_attributes err %d\n", err);</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_get_api_version(ethsw-&gt;mc_io, 0,</div><div class='add'>+				   &amp;ethsw-&gt;major,</div><div class='add'>+				   &amp;ethsw-&gt;minor);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_get_api_version err %d\n", err);</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Minimum supported DPSW version check */</div><div class='add'>+	if (ethsw-&gt;major &lt; DPSW_MIN_VER_MAJOR ||</div><div class='add'>+	    (ethsw-&gt;major == DPSW_MIN_VER_MAJOR &amp;&amp;</div><div class='add'>+	     ethsw-&gt;minor &lt; DPSW_MIN_VER_MINOR)) {</div><div class='add'>+		dev_err(dev, "DPSW version %d:%d not supported. Use firmware 10.28.0 or greater.\n",</div><div class='add'>+			ethsw-&gt;major, ethsw-&gt;minor);</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (!dpaa2_switch_supports_cpu_traffic(ethsw)) {</div><div class='add'>+		err = -EOPNOTSUPP;</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_detect_features(ethsw);</div><div class='add'>+</div><div class='add'>+	err = dpsw_reset(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_reset err %d\n", err);</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	stp_cfg.vlan_id = DEFAULT_VLAN_ID;</div><div class='add'>+	stp_cfg.state = DPSW_STP_STATE_FORWARDING;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++) {</div><div class='add'>+		err = dpsw_if_disable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, i);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpsw_if_disable err %d\n", err);</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dpsw_if_set_stp(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, i,</div><div class='add'>+				      &amp;stp_cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpsw_if_set_stp err %d for port %d\n",</div><div class='add'>+				err, i);</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		/* Switch starts with all ports configured to VLAN 1. Need to</div><div class='add'>+		 * remove this setting to allow configuration at bridge join</div><div class='add'>+		 */</div><div class='add'>+		vcfg.num_ifs = 1;</div><div class='add'>+		vcfg.if_id[0] = i;</div><div class='add'>+		err = dpsw_vlan_remove_if_untagged(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+						   DEFAULT_VLAN_ID, &amp;vcfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpsw_vlan_remove_if_untagged err %d\n",</div><div class='add'>+				err);</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		tci_cfg.vlan_id = 4095;</div><div class='add'>+		err = dpsw_if_set_tci(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, i, &amp;tci_cfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpsw_if_set_tci err %d\n", err);</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		err = dpsw_vlan_remove_if(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+					  DEFAULT_VLAN_ID, &amp;vcfg);</div><div class='add'>+		if (err) {</div><div class='add'>+			dev_err(dev, "dpsw_vlan_remove_if err %d\n", err);</div><div class='add'>+			goto err_close;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_vlan_remove(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, DEFAULT_VLAN_ID);</div><div class='add'>+	if (err) {</div><div class='add'>+		dev_err(dev, "dpsw_vlan_remove err %d\n", err);</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;workqueue = alloc_ordered_workqueue("%s_%d_ordered",</div><div class='add'>+						   WQ_MEM_RECLAIM, "ethsw",</div><div class='add'>+						   ethsw-&gt;sw_attr.id);</div><div class='add'>+	if (!ethsw-&gt;workqueue) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_close;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpsw_fdb_remove(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle, 0);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_destroy_ordered_workqueue;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_ctrl_if_setup(ethsw);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_destroy_ordered_workqueue;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_destroy_ordered_workqueue:</div><div class='add'>+	destroy_workqueue(ethsw-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+err_close:</div><div class='add'>+	dpsw_close(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Add an ACL to redirect frames with specific destination MAC address to</div><div class='add'>+ * control interface</div><div class='add'>+ */</div><div class='add'>+static int dpaa2_switch_port_trap_mac_addr(struct ethsw_port_priv *port_priv,</div><div class='add'>+					   const char *mac)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_switch_acl_entry acl_entry = {0};</div><div class='add'>+</div><div class='add'>+	/* Match on the destination MAC address */</div><div class='add'>+	ether_addr_copy(acl_entry.key.match.l2_dest_mac, mac);</div><div class='add'>+	eth_broadcast_addr(acl_entry.key.mask.l2_dest_mac);</div><div class='add'>+</div><div class='add'>+	/* Trap to CPU */</div><div class='add'>+	acl_entry.cfg.precedence = 0;</div><div class='add'>+	acl_entry.cfg.result.action = DPSW_ACL_ACTION_REDIRECT_TO_CTRL_IF;</div><div class='add'>+</div><div class='add'>+	return dpaa2_switch_acl_entry_add(port_priv-&gt;filter_block, &amp;acl_entry);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_port_init(struct ethsw_port_priv *port_priv, u16 port)</div><div class='add'>+{</div><div class='add'>+	const char stpa[ETH_ALEN] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};</div><div class='add'>+	struct switchdev_obj_port_vlan vlan = {</div><div class='add'>+		.obj.id = SWITCHDEV_OBJ_ID_PORT_VLAN,</div><div class='add'>+		.vid = DEFAULT_VLAN_ID,</div><div class='add'>+		.flags = BRIDGE_VLAN_INFO_UNTAGGED | BRIDGE_VLAN_INFO_PVID,</div><div class='add'>+	};</div><div class='add'>+	struct net_device *netdev = port_priv-&gt;netdev;</div><div class='add'>+	struct ethsw_core *ethsw = port_priv-&gt;ethsw_data;</div><div class='add'>+	struct dpaa2_switch_filter_block *filter_block;</div><div class='add'>+	struct dpsw_fdb_cfg fdb_cfg = {0};</div><div class='add'>+	struct dpsw_if_attr dpsw_if_attr;</div><div class='add'>+	struct dpaa2_switch_fdb *fdb;</div><div class='add'>+	struct dpsw_acl_cfg acl_cfg;</div><div class='add'>+	u16 fdb_id, acl_tbl_id;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* Get the Tx queue for this specific port */</div><div class='add'>+	err = dpsw_if_get_attributes(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+				     port_priv-&gt;idx, &amp;dpsw_if_attr);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_if_get_attributes err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+	port_priv-&gt;tx_qdid = dpsw_if_attr.qdid;</div><div class='add'>+</div><div class='add'>+	/* Create a FDB table for this particular switch port */</div><div class='add'>+	fdb_cfg.num_fdb_entries = ethsw-&gt;sw_attr.max_fdb_entries / ethsw-&gt;sw_attr.num_ifs;</div><div class='add'>+	err = dpsw_fdb_add(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+			   &amp;fdb_id, &amp;fdb_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_fdb_add err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Find an unused dpaa2_switch_fdb structure and use it */</div><div class='add'>+	fdb = dpaa2_switch_fdb_get_unused(ethsw);</div><div class='add'>+	fdb-&gt;fdb_id = fdb_id;</div><div class='add'>+	fdb-&gt;in_use = true;</div><div class='add'>+	fdb-&gt;bridge_dev = NULL;</div><div class='add'>+	port_priv-&gt;fdb = fdb;</div><div class='add'>+</div><div class='add'>+	/* We need to add VLAN 1 as the PVID on this port until it is under a</div><div class='add'>+	 * bridge since the DPAA2 switch is not able to handle the traffic in a</div><div class='add'>+	 * VLAN unaware fashion</div><div class='add'>+	 */</div><div class='add'>+	err = dpaa2_switch_port_vlans_add(netdev, &amp;vlan);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Setup the egress flooding domains (broadcast, unknown unicast */</div><div class='add'>+	err = dpaa2_switch_fdb_set_egress_flood(ethsw, port_priv-&gt;fdb-&gt;fdb_id);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* Create an ACL table to be used by this switch port */</div><div class='add'>+	acl_cfg.max_entries = DPAA2_ETHSW_PORT_MAX_ACL_ENTRIES;</div><div class='add'>+	err = dpsw_acl_add(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle,</div><div class='add'>+			   &amp;acl_tbl_id, &amp;acl_cfg);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(netdev, "dpsw_acl_add err %d\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	filter_block = dpaa2_switch_filter_block_get_unused(ethsw);</div><div class='add'>+	filter_block-&gt;ethsw = ethsw;</div><div class='add'>+	filter_block-&gt;acl_id = acl_tbl_id;</div><div class='add'>+	filter_block-&gt;in_use = true;</div><div class='add'>+	filter_block-&gt;num_acl_rules = 0;</div><div class='add'>+	INIT_LIST_HEAD(&amp;filter_block-&gt;acl_entries);</div><div class='add'>+	INIT_LIST_HEAD(&amp;filter_block-&gt;mirror_entries);</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_acl_tbl_bind(port_priv, filter_block);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_trap_mac_addr(port_priv, stpa);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_ctrl_if_teardown(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	dpsw_ctrl_if_disable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+	dpaa2_switch_free_dpio(ethsw);</div><div class='add'>+	dpaa2_switch_destroy_rings(ethsw);</div><div class='add'>+	dpaa2_switch_drain_bp(ethsw);</div><div class='add'>+	dpaa2_switch_free_dpbp(ethsw);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_teardown(struct fsl_mc_device *sw_dev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;sw_dev-&gt;dev;</div><div class='add'>+	struct ethsw_core *ethsw = dev_get_drvdata(dev);</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_ctrl_if_teardown(ethsw);</div><div class='add'>+</div><div class='add'>+	destroy_workqueue(ethsw-&gt;workqueue);</div><div class='add'>+</div><div class='add'>+	err = dpsw_close(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+	if (err)</div><div class='add'>+		dev_warn(dev, "dpsw_close err %d\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_remove(struct fsl_mc_device *sw_dev)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv;</div><div class='add'>+	struct ethsw_core *ethsw;</div><div class='add'>+	struct device *dev;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	dev = &amp;sw_dev-&gt;dev;</div><div class='add'>+	ethsw = dev_get_drvdata(dev);</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_teardown_irqs(sw_dev);</div><div class='add'>+</div><div class='add'>+	dpsw_disable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++) {</div><div class='add'>+		port_priv = ethsw-&gt;ports[i];</div><div class='add'>+		unregister_netdev(port_priv-&gt;netdev);</div><div class='add'>+		dpaa2_switch_remove_port(ethsw, i);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	kfree(ethsw-&gt;fdbs);</div><div class='add'>+	kfree(ethsw-&gt;filter_blocks);</div><div class='add'>+	kfree(ethsw-&gt;ports);</div><div class='add'>+</div><div class='add'>+	dpaa2_switch_teardown(sw_dev);</div><div class='add'>+</div><div class='add'>+	fsl_mc_portal_free(ethsw-&gt;mc_io);</div><div class='add'>+</div><div class='add'>+	kfree(ethsw);</div><div class='add'>+</div><div class='add'>+	dev_set_drvdata(dev, NULL);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_probe_port(struct ethsw_core *ethsw,</div><div class='add'>+				   u16 port_idx)</div><div class='add'>+{</div><div class='add'>+	struct ethsw_port_priv *port_priv;</div><div class='add'>+	struct device *dev = ethsw-&gt;dev;</div><div class='add'>+	struct net_device *port_netdev;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	port_netdev = alloc_etherdev(sizeof(struct ethsw_port_priv));</div><div class='add'>+	if (!port_netdev) {</div><div class='add'>+		dev_err(dev, "alloc_etherdev error\n");</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	port_priv = netdev_priv(port_netdev);</div><div class='add'>+	port_priv-&gt;netdev = port_netdev;</div><div class='add'>+	port_priv-&gt;ethsw_data = ethsw;</div><div class='add'>+</div><div class='add'>+	mutex_init(&amp;port_priv-&gt;mac_lock);</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;idx = port_idx;</div><div class='add'>+	port_priv-&gt;stp_state = BR_STATE_FORWARDING;</div><div class='add'>+</div><div class='add'>+	SET_NETDEV_DEV(port_netdev, dev);</div><div class='add'>+	port_netdev-&gt;netdev_ops = &amp;dpaa2_switch_port_ops;</div><div class='add'>+	port_netdev-&gt;ethtool_ops = &amp;dpaa2_switch_port_ethtool_ops;</div><div class='add'>+</div><div class='add'>+	port_netdev-&gt;needed_headroom = DPAA2_SWITCH_NEEDED_HEADROOM;</div><div class='add'>+</div><div class='add'>+	port_priv-&gt;bcast_flood = true;</div><div class='add'>+	port_priv-&gt;ucast_flood = true;</div><div class='add'>+</div><div class='add'>+	/* Set MTU limits */</div><div class='add'>+	port_netdev-&gt;min_mtu = ETH_MIN_MTU;</div><div class='add'>+	port_netdev-&gt;max_mtu = ETHSW_MAX_FRAME_LENGTH;</div><div class='add'>+</div><div class='add'>+	/* Populate the private port structure so that later calls to</div><div class='add'>+	 * dpaa2_switch_port_init() can use it.</div><div class='add'>+	 */</div><div class='add'>+	ethsw-&gt;ports[port_idx] = port_priv;</div><div class='add'>+</div><div class='add'>+	/* The DPAA2 switch's ingress path depends on the VLAN table,</div><div class='add'>+	 * thus we are not able to disable VLAN filtering.</div><div class='add'>+	 */</div><div class='add'>+	port_netdev-&gt;features = NETIF_F_HW_VLAN_CTAG_FILTER |</div><div class='add'>+				NETIF_F_HW_VLAN_STAG_FILTER |</div><div class='add'>+				NETIF_F_HW_TC;</div><div class='add'>+	port_netdev-&gt;priv_flags |= IFF_LIVE_ADDR_CHANGE;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_init(port_priv, port_idx);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_port_probe;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_set_mac_addr(port_priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_port_probe;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_set_learning(port_priv, false);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_port_probe;</div><div class='add'>+	port_priv-&gt;learn_ena = false;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_port_connect_mac(port_priv);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_port_probe;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_port_probe:</div><div class='add'>+	free_netdev(port_netdev);</div><div class='add'>+	ethsw-&gt;ports[port_idx] = NULL;</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_probe(struct fsl_mc_device *sw_dev)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = &amp;sw_dev-&gt;dev;</div><div class='add'>+	struct ethsw_core *ethsw;</div><div class='add'>+	int i, err;</div><div class='add'>+</div><div class='add'>+	/* Allocate switch core*/</div><div class='add'>+	ethsw = kzalloc(sizeof(*ethsw), GFP_KERNEL);</div><div class='add'>+</div><div class='add'>+	if (!ethsw)</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;dev = dev;</div><div class='add'>+	ethsw-&gt;iommu_domain = iommu_get_domain_for_dev(dev);</div><div class='add'>+	dev_set_drvdata(dev, ethsw);</div><div class='add'>+</div><div class='add'>+	err = fsl_mc_portal_allocate(sw_dev, FSL_MC_IO_ATOMIC_CONTEXT_PORTAL,</div><div class='add'>+				     &amp;ethsw-&gt;mc_io);</div><div class='add'>+	if (err) {</div><div class='add'>+		if (err == -ENXIO)</div><div class='add'>+			err = -EPROBE_DEFER;</div><div class='add'>+		else</div><div class='add'>+			dev_err(dev, "fsl_mc_portal_allocate err %d\n", err);</div><div class='add'>+		goto err_free_drvdata;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_init(sw_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_free_cmdport;</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;ports = kcalloc(ethsw-&gt;sw_attr.num_ifs, sizeof(*ethsw-&gt;ports),</div><div class='add'>+			       GFP_KERNEL);</div><div class='add'>+	if (!(ethsw-&gt;ports)) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_teardown;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;fdbs = kcalloc(ethsw-&gt;sw_attr.num_ifs, sizeof(*ethsw-&gt;fdbs),</div><div class='add'>+			      GFP_KERNEL);</div><div class='add'>+	if (!ethsw-&gt;fdbs) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_ports;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ethsw-&gt;filter_blocks = kcalloc(ethsw-&gt;sw_attr.num_ifs,</div><div class='add'>+				       sizeof(*ethsw-&gt;filter_blocks),</div><div class='add'>+				       GFP_KERNEL);</div><div class='add'>+	if (!ethsw-&gt;filter_blocks) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto err_free_fdbs;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++) {</div><div class='add'>+		err = dpaa2_switch_probe_port(ethsw, i);</div><div class='add'>+		if (err)</div><div class='add'>+			goto err_free_netdev;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Add a NAPI instance for each of the Rx queues. The first port's</div><div class='add'>+	 * net_device will be associated with the instances since we do not have</div><div class='add'>+	 * different queues for each switch ports.</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; DPAA2_SWITCH_RX_NUM_FQS; i++)</div><div class='add'>+		netif_napi_add(ethsw-&gt;ports[0]-&gt;netdev, &amp;ethsw-&gt;fq[i].napi,</div><div class='add'>+			       dpaa2_switch_poll);</div><div class='add'>+</div><div class='add'>+	/* Setup IRQs */</div><div class='add'>+	err = dpaa2_switch_setup_irqs(sw_dev);</div><div class='add'>+	if (err)</div><div class='add'>+		goto err_stop;</div><div class='add'>+</div><div class='add'>+	/* By convention, if the mirror port is equal to the number of switch</div><div class='add'>+	 * interfaces, then mirroring of any kind is disabled.</div><div class='add'>+	 */</div><div class='add'>+	ethsw-&gt;mirror_port =  ethsw-&gt;sw_attr.num_ifs;</div><div class='add'>+</div><div class='add'>+	/* Register the netdev only when the entire setup is done and the</div><div class='add'>+	 * switch port interfaces are ready to receive traffic</div><div class='add'>+	 */</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++) {</div><div class='add'>+		err = register_netdev(ethsw-&gt;ports[i]-&gt;netdev);</div><div class='add'>+		if (err &lt; 0) {</div><div class='add'>+			dev_err(dev, "register_netdev error %d\n", err);</div><div class='add'>+			goto err_unregister_ports;</div><div class='add'>+		}</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_unregister_ports:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		unregister_netdev(ethsw-&gt;ports[i]-&gt;netdev);</div><div class='add'>+	dpaa2_switch_teardown_irqs(sw_dev);</div><div class='add'>+err_stop:</div><div class='add'>+	dpsw_disable(ethsw-&gt;mc_io, 0, ethsw-&gt;dpsw_handle);</div><div class='add'>+err_free_netdev:</div><div class='add'>+	for (i--; i &gt;= 0; i--)</div><div class='add'>+		dpaa2_switch_remove_port(ethsw, i);</div><div class='add'>+	kfree(ethsw-&gt;filter_blocks);</div><div class='add'>+err_free_fdbs:</div><div class='add'>+	kfree(ethsw-&gt;fdbs);</div><div class='add'>+err_free_ports:</div><div class='add'>+	kfree(ethsw-&gt;ports);</div><div class='add'>+</div><div class='add'>+err_teardown:</div><div class='add'>+	dpaa2_switch_teardown(sw_dev);</div><div class='add'>+</div><div class='add'>+err_free_cmdport:</div><div class='add'>+	fsl_mc_portal_free(ethsw-&gt;mc_io);</div><div class='add'>+</div><div class='add'>+err_free_drvdata:</div><div class='add'>+	kfree(ethsw);</div><div class='add'>+	dev_set_drvdata(dev, NULL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static const struct fsl_mc_device_id dpaa2_switch_match_id_table[] = {</div><div class='add'>+	{</div><div class='add'>+		.vendor = FSL_MC_VENDOR_FREESCALE,</div><div class='add'>+		.obj_type = "dpsw",</div><div class='add'>+	},</div><div class='add'>+	{ .vendor = 0x0 }</div><div class='add'>+};</div><div class='add'>+MODULE_DEVICE_TABLE(fslmc, dpaa2_switch_match_id_table);</div><div class='add'>+</div><div class='add'>+static struct fsl_mc_driver dpaa2_switch_drv = {</div><div class='add'>+	.driver = {</div><div class='add'>+		.name = KBUILD_MODNAME,</div><div class='add'>+	},</div><div class='add'>+	.probe = dpaa2_switch_probe,</div><div class='add'>+	.remove = dpaa2_switch_remove,</div><div class='add'>+	.match_id_table = dpaa2_switch_match_id_table</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block dpaa2_switch_port_nb __read_mostly = {</div><div class='add'>+	.notifier_call = dpaa2_switch_port_netdevice_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block dpaa2_switch_port_switchdev_nb = {</div><div class='add'>+	.notifier_call = dpaa2_switch_port_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static struct notifier_block dpaa2_switch_port_switchdev_blocking_nb = {</div><div class='add'>+	.notifier_call = dpaa2_switch_port_blocking_event,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static int dpaa2_switch_register_notifiers(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = register_netdevice_notifier(&amp;dpaa2_switch_port_nb);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("dpaa2-switch: failed to register net_device notifier (%d)\n", err);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_switchdev_notifier(&amp;dpaa2_switch_port_switchdev_nb);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("dpaa2-switch: failed to register switchdev notifier (%d)\n", err);</div><div class='add'>+		goto err_switchdev_nb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	err = register_switchdev_blocking_notifier(&amp;dpaa2_switch_port_switchdev_blocking_nb);</div><div class='add'>+	if (err) {</div><div class='add'>+		pr_err("dpaa2-switch: failed to register switchdev blocking notifier (%d)\n", err);</div><div class='add'>+		goto err_switchdev_blocking_nb;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_switchdev_blocking_nb:</div><div class='add'>+	unregister_switchdev_notifier(&amp;dpaa2_switch_port_switchdev_nb);</div><div class='add'>+err_switchdev_nb:</div><div class='add'>+	unregister_netdevice_notifier(&amp;dpaa2_switch_port_nb);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_switch_unregister_notifiers(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = unregister_switchdev_blocking_notifier(&amp;dpaa2_switch_port_switchdev_blocking_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("dpaa2-switch: failed to unregister switchdev blocking notifier (%d)\n",</div><div class='add'>+		       err);</div><div class='add'>+</div><div class='add'>+	err = unregister_switchdev_notifier(&amp;dpaa2_switch_port_switchdev_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("dpaa2-switch: failed to unregister switchdev notifier (%d)\n", err);</div><div class='add'>+</div><div class='add'>+	err = unregister_netdevice_notifier(&amp;dpaa2_switch_port_nb);</div><div class='add'>+	if (err)</div><div class='add'>+		pr_err("dpaa2-switch: failed to unregister net_device notifier (%d)\n", err);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int __init dpaa2_switch_driver_init(void)</div><div class='add'>+{</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	err = fsl_mc_driver_register(&amp;dpaa2_switch_drv);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	err = dpaa2_switch_register_notifiers();</div><div class='add'>+	if (err) {</div><div class='add'>+		fsl_mc_driver_unregister(&amp;dpaa2_switch_drv);</div><div class='add'>+		return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void __exit dpaa2_switch_driver_exit(void)</div><div class='add'>+{</div><div class='add'>+	dpaa2_switch_unregister_notifiers();</div><div class='add'>+	fsl_mc_driver_unregister(&amp;dpaa2_switch_drv);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+module_init(dpaa2_switch_driver_init);</div><div class='add'>+module_exit(dpaa2_switch_driver_exit);</div><div class='add'>+</div><div class='add'>+MODULE_LICENSE("GPL v2");</div><div class='add'>+MODULE_DESCRIPTION("DPAA2 Ethernet Switch Driver");</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h<br/>new file mode 100644<br/>index 000000000000..42b3ca73f55d<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.h</a></div><div class='hunk'>@@ -0,0 +1,277 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * DPAA2 Ethernet Switch declarations</div><div class='add'>+ *</div><div class='add'>+ * Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2017-2021 NXP</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __ETHSW_H</div><div class='add'>+#define __ETHSW_H</div><div class='add'>+</div><div class='add'>+#include &lt;linux/netdevice.h&gt;</div><div class='add'>+#include &lt;linux/etherdevice.h&gt;</div><div class='add'>+#include &lt;linux/rtnetlink.h&gt;</div><div class='add'>+#include &lt;linux/if_vlan.h&gt;</div><div class='add'>+#include &lt;uapi/linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;net/switchdev.h&gt;</div><div class='add'>+#include &lt;linux/if_bridge.h&gt;</div><div class='add'>+#include &lt;linux/fsl/mc.h&gt;</div><div class='add'>+#include &lt;net/pkt_cls.h&gt;</div><div class='add'>+#include &lt;soc/fsl/dpaa2-io.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dpaa2-mac.h"</div><div class='add'>+#include "dpsw.h"</div><div class='add'>+</div><div class='add'>+/* Number of IRQs supported */</div><div class='add'>+#define DPSW_IRQ_NUM	2</div><div class='add'>+</div><div class='add'>+/* Port is member of VLAN */</div><div class='add'>+#define ETHSW_VLAN_MEMBER	1</div><div class='add'>+/* VLAN to be treated as untagged on egress */</div><div class='add'>+#define ETHSW_VLAN_UNTAGGED	2</div><div class='add'>+/* Untagged frames will be assigned to this VLAN */</div><div class='add'>+#define ETHSW_VLAN_PVID		4</div><div class='add'>+/* VLAN configured on the switch */</div><div class='add'>+#define ETHSW_VLAN_GLOBAL	8</div><div class='add'>+</div><div class='add'>+/* Maximum Frame Length supported by HW (currently 10k) */</div><div class='add'>+#define DPAA2_MFL		(10 * 1024)</div><div class='add'>+#define ETHSW_MAX_FRAME_LENGTH	(DPAA2_MFL - VLAN_ETH_HLEN - ETH_FCS_LEN)</div><div class='add'>+#define ETHSW_L2_MAX_FRM(mtu)	((mtu) + VLAN_ETH_HLEN + ETH_FCS_LEN)</div><div class='add'>+</div><div class='add'>+#define ETHSW_FEATURE_MAC_ADDR	BIT(0)</div><div class='add'>+</div><div class='add'>+/* Number of receive queues (one RX and one TX_CONF) */</div><div class='add'>+#define DPAA2_SWITCH_RX_NUM_FQS	2</div><div class='add'>+</div><div class='add'>+/* Hardware requires alignment for ingress/egress buffer addresses */</div><div class='add'>+#define DPAA2_SWITCH_RX_BUF_RAW_SIZE	PAGE_SIZE</div><div class='add'>+#define DPAA2_SWITCH_RX_BUF_TAILROOM \</div><div class='add'>+	SKB_DATA_ALIGN(sizeof(struct skb_shared_info))</div><div class='add'>+#define DPAA2_SWITCH_RX_BUF_SIZE \</div><div class='add'>+	(DPAA2_SWITCH_RX_BUF_RAW_SIZE - DPAA2_SWITCH_RX_BUF_TAILROOM)</div><div class='add'>+</div><div class='add'>+#define DPAA2_SWITCH_STORE_SIZE 16</div><div class='add'>+</div><div class='add'>+/* Buffer management */</div><div class='add'>+#define BUFS_PER_CMD			7</div><div class='add'>+#define DPAA2_ETHSW_NUM_BUFS		(1024 * BUFS_PER_CMD)</div><div class='add'>+#define DPAA2_ETHSW_REFILL_THRESH	(DPAA2_ETHSW_NUM_BUFS * 5 / 6)</div><div class='add'>+</div><div class='add'>+/* Number of times to retry DPIO portal operations while waiting</div><div class='add'>+ * for portal to finish executing current command and become</div><div class='add'>+ * available. We want to avoid being stuck in a while loop in case</div><div class='add'>+ * hardware becomes unresponsive, but not give up too easily if</div><div class='add'>+ * the portal really is busy for valid reasons</div><div class='add'>+ */</div><div class='add'>+#define DPAA2_SWITCH_SWP_BUSY_RETRIES		1000</div><div class='add'>+</div><div class='add'>+/* Hardware annotation buffer size */</div><div class='add'>+#define DPAA2_SWITCH_HWA_SIZE			64</div><div class='add'>+/* Software annotation buffer size */</div><div class='add'>+#define DPAA2_SWITCH_SWA_SIZE			64</div><div class='add'>+</div><div class='add'>+#define DPAA2_SWITCH_TX_BUF_ALIGN		64</div><div class='add'>+</div><div class='add'>+#define DPAA2_SWITCH_TX_DATA_OFFSET \</div><div class='add'>+	(DPAA2_SWITCH_HWA_SIZE + DPAA2_SWITCH_SWA_SIZE)</div><div class='add'>+</div><div class='add'>+#define DPAA2_SWITCH_NEEDED_HEADROOM \</div><div class='add'>+	(DPAA2_SWITCH_TX_DATA_OFFSET + DPAA2_SWITCH_TX_BUF_ALIGN)</div><div class='add'>+</div><div class='add'>+#define DPAA2_ETHSW_PORT_MAX_ACL_ENTRIES	16</div><div class='add'>+#define DPAA2_ETHSW_PORT_DEFAULT_TRAPS		1</div><div class='add'>+</div><div class='add'>+#define DPAA2_ETHSW_PORT_ACL_CMD_BUF_SIZE	256</div><div class='add'>+</div><div class='add'>+extern const struct ethtool_ops dpaa2_switch_port_ethtool_ops;</div><div class='add'>+</div><div class='add'>+struct ethsw_core;</div><div class='add'>+</div><div class='add'>+struct dpaa2_switch_fq {</div><div class='add'>+	struct ethsw_core *ethsw;</div><div class='add'>+	enum dpsw_queue_type type;</div><div class='add'>+	struct dpaa2_io_store *store;</div><div class='add'>+	struct dpaa2_io_notification_ctx nctx;</div><div class='add'>+	struct napi_struct napi;</div><div class='add'>+	u32 fqid;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_switch_fdb {</div><div class='add'>+	struct net_device	*bridge_dev;</div><div class='add'>+	u16			fdb_id;</div><div class='add'>+	bool			in_use;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_switch_acl_entry {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	u16			prio;</div><div class='add'>+	unsigned long		cookie;</div><div class='add'>+</div><div class='add'>+	struct dpsw_acl_entry_cfg cfg;</div><div class='add'>+	struct dpsw_acl_key	key;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_switch_mirror_entry {</div><div class='add'>+	struct list_head	list;</div><div class='add'>+	struct dpsw_reflection_cfg cfg;</div><div class='add'>+	unsigned long		cookie;</div><div class='add'>+	u16 if_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpaa2_switch_filter_block {</div><div class='add'>+	struct ethsw_core	*ethsw;</div><div class='add'>+	u64			ports;</div><div class='add'>+	bool			in_use;</div><div class='add'>+</div><div class='add'>+	struct list_head	acl_entries;</div><div class='add'>+	u16			acl_id;</div><div class='add'>+	u8			num_acl_rules;</div><div class='add'>+</div><div class='add'>+	struct list_head	mirror_entries;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+dpaa2_switch_acl_tbl_is_full(struct dpaa2_switch_filter_block *filter_block)</div><div class='add'>+{</div><div class='add'>+	if ((filter_block-&gt;num_acl_rules + DPAA2_ETHSW_PORT_DEFAULT_TRAPS) &gt;=</div><div class='add'>+	    DPAA2_ETHSW_PORT_MAX_ACL_ENTRIES)</div><div class='add'>+		return true;</div><div class='add'>+	return false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Per port private data */</div><div class='add'>+struct ethsw_port_priv {</div><div class='add'>+	struct net_device	*netdev;</div><div class='add'>+	u16			idx;</div><div class='add'>+	struct ethsw_core	*ethsw_data;</div><div class='add'>+	u8			link_state;</div><div class='add'>+	u8			stp_state;</div><div class='add'>+</div><div class='add'>+	u8			vlans[VLAN_VID_MASK + 1];</div><div class='add'>+	u16			pvid;</div><div class='add'>+	u16			tx_qdid;</div><div class='add'>+</div><div class='add'>+	struct dpaa2_switch_fdb	*fdb;</div><div class='add'>+	bool			bcast_flood;</div><div class='add'>+	bool			ucast_flood;</div><div class='add'>+	bool			learn_ena;</div><div class='add'>+</div><div class='add'>+	struct dpaa2_switch_filter_block *filter_block;</div><div class='add'>+	struct dpaa2_mac	*mac;</div><div class='add'>+	/* Protects against changes to port_priv-&gt;mac */</div><div class='add'>+	struct mutex		mac_lock;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* Switch data */</div><div class='add'>+struct ethsw_core {</div><div class='add'>+	struct device			*dev;</div><div class='add'>+	struct fsl_mc_io		*mc_io;</div><div class='add'>+	u16				dpsw_handle;</div><div class='add'>+	struct dpsw_attr		sw_attr;</div><div class='add'>+	u16				major, minor;</div><div class='add'>+	unsigned long			features;</div><div class='add'>+	int				dev_id;</div><div class='add'>+	struct ethsw_port_priv		**ports;</div><div class='add'>+	struct iommu_domain		*iommu_domain;</div><div class='add'>+</div><div class='add'>+	u8				vlans[VLAN_VID_MASK + 1];</div><div class='add'>+</div><div class='add'>+	struct workqueue_struct		*workqueue;</div><div class='add'>+</div><div class='add'>+	struct dpaa2_switch_fq		fq[DPAA2_SWITCH_RX_NUM_FQS];</div><div class='add'>+	struct fsl_mc_device		*dpbp_dev;</div><div class='add'>+	int				buf_count;</div><div class='add'>+	u16				bpid;</div><div class='add'>+	int				napi_users;</div><div class='add'>+</div><div class='add'>+	struct dpaa2_switch_fdb		*fdbs;</div><div class='add'>+	struct dpaa2_switch_filter_block *filter_blocks;</div><div class='add'>+	u16				mirror_port;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+static inline int dpaa2_switch_get_index(struct ethsw_core *ethsw,</div><div class='add'>+					 struct net_device *netdev)</div><div class='add'>+{</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; ethsw-&gt;sw_attr.num_ifs; i++)</div><div class='add'>+		if (ethsw-&gt;ports[i]-&gt;netdev == netdev)</div><div class='add'>+			return ethsw-&gt;ports[i]-&gt;idx;</div><div class='add'>+</div><div class='add'>+	return -EINVAL;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_switch_supports_cpu_traffic(struct ethsw_core *ethsw)</div><div class='add'>+{</div><div class='add'>+	if (ethsw-&gt;sw_attr.options &amp; DPSW_OPT_CTRL_IF_DIS) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "Control Interface is disabled, cannot probe\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ethsw-&gt;sw_attr.flooding_cfg != DPSW_FLOODING_PER_FDB) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "Flooding domain is not per FDB, cannot probe\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ethsw-&gt;sw_attr.broadcast_cfg != DPSW_BROADCAST_PER_FDB) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "Broadcast domain is not per FDB, cannot probe\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (ethsw-&gt;sw_attr.max_fdbs &lt; ethsw-&gt;sw_attr.num_ifs) {</div><div class='add'>+		dev_err(ethsw-&gt;dev, "The number of FDBs is lower than the number of ports, cannot probe\n");</div><div class='add'>+		return false;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return true;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool</div><div class='add'>+dpaa2_switch_port_is_type_phy(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	return dpaa2_mac_is_type_phy(port_priv-&gt;mac);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static inline bool dpaa2_switch_port_has_mac(struct ethsw_port_priv *port_priv)</div><div class='add'>+{</div><div class='add'>+	return port_priv-&gt;mac ? true : false;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool dpaa2_switch_port_dev_check(const struct net_device *netdev);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_port_vlans_add(struct net_device *netdev,</div><div class='add'>+				const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_port_vlans_del(struct net_device *netdev,</div><div class='add'>+				const struct switchdev_obj_port_vlan *vlan);</div><div class='add'>+</div><div class='add'>+typedef int dpaa2_switch_fdb_cb_t(struct ethsw_port_priv *port_priv,</div><div class='add'>+				  struct fdb_dump_entry *fdb_entry,</div><div class='add'>+				  void *data);</div><div class='add'>+</div><div class='add'>+/* TC offload */</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_flower_replace(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				    struct flow_cls_offload *cls);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_flower_destroy(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				    struct flow_cls_offload *cls);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_matchall_replace(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct tc_cls_matchall_offload *cls);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_cls_matchall_destroy(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct tc_cls_matchall_offload *cls);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_acl_entry_add(struct dpaa2_switch_filter_block *block,</div><div class='add'>+			       struct dpaa2_switch_acl_entry *entry);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_block_offload_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+				      struct ethsw_port_priv *port_priv);</div><div class='add'>+</div><div class='add'>+int dpaa2_switch_block_unoffload_mirror(struct dpaa2_switch_filter_block *block,</div><div class='add'>+					struct ethsw_port_priv *port_priv);</div><div class='add'>+#endif	/* __ETHSW_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c<br/>new file mode 100644<br/>index 000000000000..4b0ae7d9af92<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c</a></div><div class='hunk'>@@ -0,0 +1,452 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='add'>+/* Copyright 2022 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/filter.h&gt;</div><div class='add'>+#include &lt;linux/compiler.h&gt;</div><div class='add'>+#include &lt;linux/bpf_trace.h&gt;</div><div class='add'>+#include &lt;net/xdp.h&gt;</div><div class='add'>+#include &lt;net/xdp_sock_drv.h&gt;</div><div class='add'>+</div><div class='add'>+#include "dpaa2-eth.h"</div><div class='add'>+</div><div class='add'>+static void dpaa2_eth_setup_consume_func(struct dpaa2_eth_priv *priv,</div><div class='add'>+					 struct dpaa2_eth_channel *ch,</div><div class='add'>+					 enum dpaa2_eth_fq_type type,</div><div class='add'>+					 dpaa2_eth_consume_cb_t *consume)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='add'>+	int i;</div><div class='add'>+</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_fqs; i++) {</div><div class='add'>+		fq = &amp;priv-&gt;fq[i];</div><div class='add'>+</div><div class='add'>+		if (fq-&gt;type != type)</div><div class='add'>+			continue;</div><div class='add'>+		if (fq-&gt;channel != ch)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		fq-&gt;consume = consume;</div><div class='add'>+	}</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static u32 dpaa2_xsk_run_xdp(struct dpaa2_eth_priv *priv,</div><div class='add'>+			     struct dpaa2_eth_channel *ch,</div><div class='add'>+			     struct dpaa2_eth_fq *rx_fq,</div><div class='add'>+			     struct dpaa2_fd *fd, void *vaddr)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='add'>+	struct bpf_prog *xdp_prog;</div><div class='add'>+	struct xdp_buff *xdp_buff;</div><div class='add'>+	struct dpaa2_eth_swa *swa;</div><div class='add'>+	u32 xdp_act = XDP_PASS;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	xdp_prog = READ_ONCE(ch-&gt;xdp.prog);</div><div class='add'>+	if (!xdp_prog)</div><div class='add'>+		goto out;</div><div class='add'>+</div><div class='add'>+	swa = (struct dpaa2_eth_swa *)(vaddr + DPAA2_ETH_RX_HWA_SIZE +</div><div class='add'>+				       ch-&gt;xsk_pool-&gt;umem-&gt;headroom);</div><div class='add'>+	xdp_buff = swa-&gt;xsk.xdp_buff;</div><div class='add'>+</div><div class='add'>+	xdp_buff-&gt;data_hard_start = vaddr;</div><div class='add'>+	xdp_buff-&gt;data = vaddr + dpaa2_fd_get_offset(fd);</div><div class='add'>+	xdp_buff-&gt;data_end = xdp_buff-&gt;data + dpaa2_fd_get_len(fd);</div><div class='add'>+	xdp_set_data_meta_invalid(xdp_buff);</div><div class='add'>+	xdp_buff-&gt;rxq = &amp;ch-&gt;xdp_rxq;</div><div class='add'>+</div><div class='add'>+	xsk_buff_dma_sync_for_cpu(xdp_buff);</div><div class='add'>+	xdp_act = bpf_prog_run_xdp(xdp_prog, xdp_buff);</div><div class='add'>+</div><div class='add'>+	/* xdp.data pointer may have changed */</div><div class='add'>+	dpaa2_fd_set_offset(fd, xdp_buff-&gt;data - vaddr);</div><div class='add'>+	dpaa2_fd_set_len(fd, xdp_buff-&gt;data_end - xdp_buff-&gt;data);</div><div class='add'>+</div><div class='add'>+	if (likely(xdp_act == XDP_REDIRECT)) {</div><div class='add'>+		err = xdp_do_redirect(priv-&gt;net_dev, xdp_buff, xdp_prog);</div><div class='add'>+		if (unlikely(err)) {</div><div class='add'>+			ch-&gt;stats.xdp_drop++;</div><div class='add'>+			dpaa2_eth_recycle_buf(priv, ch, addr);</div><div class='add'>+		} else {</div><div class='add'>+			ch-&gt;buf_count--;</div><div class='add'>+			ch-&gt;stats.xdp_redirect++;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		goto xdp_redir;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	switch (xdp_act) {</div><div class='add'>+	case XDP_PASS:</div><div class='add'>+		break;</div><div class='add'>+	case XDP_TX:</div><div class='add'>+		dpaa2_eth_xdp_enqueue(priv, ch, fd, vaddr, rx_fq-&gt;flowid);</div><div class='add'>+		break;</div><div class='add'>+	default:</div><div class='add'>+		bpf_warn_invalid_xdp_action(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_ABORTED:</div><div class='add'>+		trace_xdp_exception(priv-&gt;net_dev, xdp_prog, xdp_act);</div><div class='add'>+		fallthrough;</div><div class='add'>+	case XDP_DROP:</div><div class='add'>+		dpaa2_eth_recycle_buf(priv, ch, addr);</div><div class='add'>+		ch-&gt;stats.xdp_drop++;</div><div class='add'>+		break;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+xdp_redir:</div><div class='add'>+	ch-&gt;xdp.res |= xdp_act;</div><div class='add'>+out:</div><div class='add'>+	return xdp_act;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Rx frame processing routine for the AF_XDP fast path */</div><div class='add'>+static void dpaa2_xsk_rx(struct dpaa2_eth_priv *priv,</div><div class='add'>+			 struct dpaa2_eth_channel *ch,</div><div class='add'>+			 const struct dpaa2_fd *fd,</div><div class='add'>+			 struct dpaa2_eth_fq *fq)</div><div class='add'>+{</div><div class='add'>+	dma_addr_t addr = dpaa2_fd_get_addr(fd);</div><div class='add'>+	u8 fd_format = dpaa2_fd_get_format(fd);</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	u32 fd_length = dpaa2_fd_get_len(fd);</div><div class='add'>+	struct sk_buff *skb;</div><div class='add'>+	void *vaddr;</div><div class='add'>+	u32 xdp_act;</div><div class='add'>+</div><div class='add'>+	trace_dpaa2_rx_xsk_fd(priv-&gt;net_dev, fd);</div><div class='add'>+</div><div class='add'>+	vaddr = dpaa2_iova_to_virt(priv-&gt;iommu_domain, addr);</div><div class='add'>+	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='add'>+</div><div class='add'>+	if (fd_format != dpaa2_fd_single) {</div><div class='add'>+		WARN_ON(priv-&gt;xdp_prog);</div><div class='add'>+		/* AF_XDP doesn't support any other formats */</div><div class='add'>+		goto err_frame_format;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	xdp_act = dpaa2_xsk_run_xdp(priv, ch, fq, (struct dpaa2_fd *)fd, vaddr);</div><div class='add'>+	if (xdp_act != XDP_PASS) {</div><div class='add'>+		percpu_stats-&gt;rx_packets++;</div><div class='add'>+		percpu_stats-&gt;rx_bytes += dpaa2_fd_get_len(fd);</div><div class='add'>+		return;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Build skb */</div><div class='add'>+	skb = dpaa2_eth_alloc_skb(priv, ch, fd, fd_length, vaddr);</div><div class='add'>+	if (!skb)</div><div class='add'>+		/* Nothing else we can do, recycle the buffer and</div><div class='add'>+		 * drop the frame.</div><div class='add'>+		 */</div><div class='add'>+		goto err_alloc_skb;</div><div class='add'>+</div><div class='add'>+	/* Send the skb to the Linux networking stack */</div><div class='add'>+	dpaa2_eth_receive_skb(priv, ch, fd, vaddr, fq, percpu_stats, skb);</div><div class='add'>+</div><div class='add'>+	return;</div><div class='add'>+</div><div class='add'>+err_alloc_skb:</div><div class='add'>+	dpaa2_eth_recycle_buf(priv, ch, addr);</div><div class='add'>+err_frame_format:</div><div class='add'>+	percpu_stats-&gt;rx_dropped++;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static void dpaa2_xsk_set_bp_per_qdbin(struct dpaa2_eth_priv *priv,</div><div class='add'>+				       struct dpni_pools_cfg *pools_params)</div><div class='add'>+{</div><div class='add'>+	int curr_bp = 0, i, j;</div><div class='add'>+</div><div class='add'>+	pools_params-&gt;pool_options = DPNI_POOL_ASSOC_QDBIN;</div><div class='add'>+	for (i = 0; i &lt; priv-&gt;num_bps; i++) {</div><div class='add'>+		for (j = 0; j &lt; priv-&gt;num_channels; j++)</div><div class='add'>+			if (priv-&gt;bp[i] == priv-&gt;channel[j]-&gt;bp)</div><div class='add'>+				pools_params-&gt;pools[curr_bp].priority_mask |= (1 &lt;&lt; j);</div><div class='add'>+		if (!pools_params-&gt;pools[curr_bp].priority_mask)</div><div class='add'>+			continue;</div><div class='add'>+</div><div class='add'>+		pools_params-&gt;pools[curr_bp].dpbp_id = priv-&gt;bp[i]-&gt;bpid;</div><div class='add'>+		pools_params-&gt;pools[curr_bp].buffer_size = priv-&gt;rx_buf_size;</div><div class='add'>+		pools_params-&gt;pools[curr_bp++].backup_pool = 0;</div><div class='add'>+	}</div><div class='add'>+	pools_params-&gt;num_dpbp = curr_bp;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_xsk_disable_pool(struct net_device *dev, u16 qid)</div><div class='add'>+{</div><div class='add'>+	struct xsk_buff_pool *pool = xsk_get_pool_from_qid(dev, qid);</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct dpni_pools_cfg pools_params = { 0 };</div><div class='add'>+	struct dpaa2_eth_channel *ch;</div><div class='add'>+	int err;</div><div class='add'>+	bool up;</div><div class='add'>+</div><div class='add'>+	ch = priv-&gt;channel[qid];</div><div class='add'>+	if (!ch-&gt;xsk_pool)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	up = netif_running(dev);</div><div class='add'>+	if (up)</div><div class='add'>+		dev_close(dev);</div><div class='add'>+</div><div class='add'>+	xsk_pool_dma_unmap(pool, 0);</div><div class='add'>+	err = xdp_rxq_info_reg_mem_model(&amp;ch-&gt;xdp_rxq,</div><div class='add'>+					 MEM_TYPE_PAGE_ORDER0, NULL);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(dev, "xsk_rxq_info_reg_mem_model() failed (err = %d)\n",</div><div class='add'>+			   err);</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_free_dpbp(priv, ch-&gt;bp);</div><div class='add'>+</div><div class='add'>+	ch-&gt;xsk_zc = false;</div><div class='add'>+	ch-&gt;xsk_pool = NULL;</div><div class='add'>+	ch-&gt;xsk_tx_pkts_sent = 0;</div><div class='add'>+	ch-&gt;bp = priv-&gt;bp[DPAA2_ETH_DEFAULT_BP_IDX];</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_setup_consume_func(priv, ch, DPAA2_RX_FQ, dpaa2_eth_rx);</div><div class='add'>+</div><div class='add'>+	dpaa2_xsk_set_bp_per_qdbin(priv, &amp;pools_params);</div><div class='add'>+	err = dpni_set_pools(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;pools_params);</div><div class='add'>+	if (err)</div><div class='add'>+		netdev_err(dev, "dpni_set_pools() failed\n");</div><div class='add'>+</div><div class='add'>+	if (up) {</div><div class='add'>+		err = dev_open(dev, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_xsk_enable_pool(struct net_device *dev,</div><div class='add'>+				 struct xsk_buff_pool *pool,</div><div class='add'>+				 u16 qid)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct dpni_pools_cfg pools_params = { 0 };</div><div class='add'>+	struct dpaa2_eth_channel *ch;</div><div class='add'>+	int err, err2;</div><div class='add'>+	bool up;</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;dpni_attrs.wriop_version &lt; DPAA2_WRIOP_VERSION(3, 0, 0)) {</div><div class='add'>+		netdev_err(dev, "AF_XDP zero-copy not supported on devices &lt;= WRIOP(3, 0, 0)\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (priv-&gt;dpni_attrs.num_queues &gt; 8) {</div><div class='add'>+		netdev_err(dev, "AF_XDP zero-copy not supported on DPNI with more then 8 queues\n");</div><div class='add'>+		return -EOPNOTSUPP;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	up = netif_running(dev);</div><div class='add'>+	if (up)</div><div class='add'>+		dev_close(dev);</div><div class='add'>+</div><div class='add'>+	err = xsk_pool_dma_map(pool, priv-&gt;net_dev-&gt;dev.parent, 0);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "xsk_pool_dma_map() failed (err = %d)\n",</div><div class='add'>+			   err);</div><div class='add'>+		goto err_dma_unmap;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	ch = priv-&gt;channel[qid];</div><div class='add'>+	err = xdp_rxq_info_reg_mem_model(&amp;ch-&gt;xdp_rxq, MEM_TYPE_XSK_BUFF_POOL, NULL);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "xdp_rxq_info_reg_mem_model() failed (err = %d)\n", err);</div><div class='add'>+		goto err_mem_model;</div><div class='add'>+	}</div><div class='add'>+	xsk_pool_set_rxq_info(pool, &amp;ch-&gt;xdp_rxq);</div><div class='add'>+</div><div class='add'>+	priv-&gt;bp[priv-&gt;num_bps] = dpaa2_eth_allocate_dpbp(priv);</div><div class='add'>+	if (IS_ERR(priv-&gt;bp[priv-&gt;num_bps])) {</div><div class='add'>+		err = PTR_ERR(priv-&gt;bp[priv-&gt;num_bps]);</div><div class='add'>+		goto err_bp_alloc;</div><div class='add'>+	}</div><div class='add'>+	ch-&gt;xsk_zc = true;</div><div class='add'>+	ch-&gt;xsk_pool = pool;</div><div class='add'>+	ch-&gt;bp = priv-&gt;bp[priv-&gt;num_bps++];</div><div class='add'>+</div><div class='add'>+	dpaa2_eth_setup_consume_func(priv, ch, DPAA2_RX_FQ, dpaa2_xsk_rx);</div><div class='add'>+</div><div class='add'>+	dpaa2_xsk_set_bp_per_qdbin(priv, &amp;pools_params);</div><div class='add'>+	err = dpni_set_pools(priv-&gt;mc_io, 0, priv-&gt;mc_token, &amp;pools_params);</div><div class='add'>+	if (err) {</div><div class='add'>+		netdev_err(dev, "dpni_set_pools() failed\n");</div><div class='add'>+		goto err_set_pools;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	if (up) {</div><div class='add'>+		err = dev_open(dev, NULL);</div><div class='add'>+		if (err)</div><div class='add'>+			return err;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+err_set_pools:</div><div class='add'>+	err2 = dpaa2_xsk_disable_pool(dev, qid);</div><div class='add'>+	if (err2)</div><div class='add'>+		netdev_err(dev, "dpaa2_xsk_disable_pool() failed %d\n", err2);</div><div class='add'>+err_bp_alloc:</div><div class='add'>+	err2 = xdp_rxq_info_reg_mem_model(&amp;priv-&gt;channel[qid]-&gt;xdp_rxq,</div><div class='add'>+					  MEM_TYPE_PAGE_ORDER0, NULL);</div><div class='add'>+	if (err2)</div><div class='add'>+		netdev_err(dev, "xsk_rxq_info_reg_mem_model() failed with %d)\n", err2);</div><div class='add'>+err_mem_model:</div><div class='add'>+	xsk_pool_dma_unmap(pool, 0);</div><div class='add'>+err_dma_unmap:</div><div class='add'>+	if (up)</div><div class='add'>+		dev_open(dev, NULL);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_xsk_setup_pool(struct net_device *dev, struct xsk_buff_pool *pool, u16 qid)</div><div class='add'>+{</div><div class='add'>+	return pool ? dpaa2_xsk_enable_pool(dev, pool, qid) :</div><div class='add'>+		      dpaa2_xsk_disable_pool(dev, qid);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int dpaa2_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags)</div><div class='add'>+{</div><div class='add'>+	struct dpaa2_eth_priv *priv = netdev_priv(dev);</div><div class='add'>+	struct dpaa2_eth_channel *ch = priv-&gt;channel[qid];</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;link_state.up)</div><div class='add'>+		return -ENETDOWN;</div><div class='add'>+</div><div class='add'>+	if (!priv-&gt;xdp_prog)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	if (!ch-&gt;xsk_zc)</div><div class='add'>+		return -EINVAL;</div><div class='add'>+</div><div class='add'>+	/* We do not have access to a per channel SW interrupt, so instead we</div><div class='add'>+	 * schedule a NAPI instance.</div><div class='add'>+	 */</div><div class='add'>+	if (!napi_if_scheduled_mark_missed(&amp;ch-&gt;napi))</div><div class='add'>+		napi_schedule(&amp;ch-&gt;napi);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+static int dpaa2_xsk_tx_build_fd(struct dpaa2_eth_priv *priv,</div><div class='add'>+				 struct dpaa2_eth_channel *ch,</div><div class='add'>+				 struct dpaa2_fd *fd,</div><div class='add'>+				 struct xdp_desc *xdp_desc)</div><div class='add'>+{</div><div class='add'>+	struct device *dev = priv-&gt;net_dev-&gt;dev.parent;</div><div class='add'>+	struct dpaa2_sg_entry *sgt;</div><div class='add'>+	struct dpaa2_eth_swa *swa;</div><div class='add'>+	void *sgt_buf = NULL;</div><div class='add'>+	dma_addr_t sgt_addr;</div><div class='add'>+	int sgt_buf_size;</div><div class='add'>+	dma_addr_t addr;</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	/* Prepare the HW SGT structure */</div><div class='add'>+	sgt_buf_size = priv-&gt;tx_data_offset + sizeof(struct dpaa2_sg_entry);</div><div class='add'>+	sgt_buf = dpaa2_eth_sgt_get(priv);</div><div class='add'>+	if (unlikely(!sgt_buf))</div><div class='add'>+		return -ENOMEM;</div><div class='add'>+	sgt = (struct dpaa2_sg_entry *)(sgt_buf + priv-&gt;tx_data_offset);</div><div class='add'>+</div><div class='add'>+	/* Get the address of the XSK Tx buffer */</div><div class='add'>+	addr = xsk_buff_raw_get_dma(ch-&gt;xsk_pool, xdp_desc-&gt;addr);</div><div class='add'>+	xsk_buff_raw_dma_sync_for_device(ch-&gt;xsk_pool, addr, xdp_desc-&gt;len);</div><div class='add'>+</div><div class='add'>+	/* Fill in the HW SGT structure */</div><div class='add'>+	dpaa2_sg_set_addr(sgt, addr);</div><div class='add'>+	dpaa2_sg_set_len(sgt, xdp_desc-&gt;len);</div><div class='add'>+	dpaa2_sg_set_final(sgt, true);</div><div class='add'>+</div><div class='add'>+	/* Store the necessary info in the SGT buffer */</div><div class='add'>+	swa = (struct dpaa2_eth_swa *)sgt_buf;</div><div class='add'>+	swa-&gt;type = DPAA2_ETH_SWA_XSK;</div><div class='add'>+	swa-&gt;xsk.sgt_size = sgt_buf_size;</div><div class='add'>+</div><div class='add'>+	/* Separately map the SGT buffer */</div><div class='add'>+	sgt_addr = dma_map_single(dev, sgt_buf, sgt_buf_size, DMA_BIDIRECTIONAL);</div><div class='add'>+	if (unlikely(dma_mapping_error(dev, sgt_addr))) {</div><div class='add'>+		err = -ENOMEM;</div><div class='add'>+		goto sgt_map_failed;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Initialize FD fields */</div><div class='add'>+	memset(fd, 0, sizeof(struct dpaa2_fd));</div><div class='add'>+	dpaa2_fd_set_offset(fd, priv-&gt;tx_data_offset);</div><div class='add'>+	dpaa2_fd_set_format(fd, dpaa2_fd_sg);</div><div class='add'>+	dpaa2_fd_set_addr(fd, sgt_addr);</div><div class='add'>+	dpaa2_fd_set_len(fd, xdp_desc-&gt;len);</div><div class='add'>+	dpaa2_fd_set_ctrl(fd, FD_CTRL_PTA);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+</div><div class='add'>+sgt_map_failed:</div><div class='add'>+	dpaa2_eth_sgt_recycle(priv, sgt_buf);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+bool dpaa2_xsk_tx(struct dpaa2_eth_priv *priv,</div><div class='add'>+		  struct dpaa2_eth_channel *ch)</div><div class='add'>+{</div><div class='add'>+	struct xdp_desc *xdp_descs = ch-&gt;xsk_pool-&gt;tx_descs;</div><div class='add'>+	struct dpaa2_eth_drv_stats *percpu_extras;</div><div class='add'>+	struct rtnl_link_stats64 *percpu_stats;</div><div class='add'>+	int budget = DPAA2_ETH_TX_ZC_PER_NAPI;</div><div class='add'>+	int total_enqueued, enqueued;</div><div class='add'>+	int retries, max_retries;</div><div class='add'>+	struct dpaa2_eth_fq *fq;</div><div class='add'>+	struct dpaa2_fd *fds;</div><div class='add'>+	int batch, i, err;</div><div class='add'>+</div><div class='add'>+	percpu_stats = this_cpu_ptr(priv-&gt;percpu_stats);</div><div class='add'>+	percpu_extras = this_cpu_ptr(priv-&gt;percpu_extras);</div><div class='add'>+	fds = (this_cpu_ptr(priv-&gt;fd))-&gt;array;</div><div class='add'>+</div><div class='add'>+	/* Use the FQ with the same idx as the affine CPU */</div><div class='add'>+	fq = &amp;priv-&gt;fq[ch-&gt;nctx.desired_cpu];</div><div class='add'>+</div><div class='add'>+	batch = xsk_tx_peek_release_desc_batch(ch-&gt;xsk_pool, budget);</div><div class='add'>+	if (!batch)</div><div class='add'>+		return false;</div><div class='add'>+</div><div class='add'>+	/* Create a FD for each XSK frame to be sent */</div><div class='add'>+	for (i = 0; i &lt; batch; i++) {</div><div class='add'>+		err = dpaa2_xsk_tx_build_fd(priv, ch, &amp;fds[i], &amp;xdp_descs[i]);</div><div class='add'>+		if (err) {</div><div class='add'>+			batch = i;</div><div class='add'>+			break;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		trace_dpaa2_tx_xsk_fd(priv-&gt;net_dev, &amp;fds[i]);</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	/* Enqueue all the created FDs */</div><div class='add'>+	max_retries = batch * DPAA2_ETH_ENQUEUE_RETRIES;</div><div class='add'>+	total_enqueued = 0;</div><div class='add'>+	enqueued = 0;</div><div class='add'>+	retries = 0;</div><div class='add'>+	while (total_enqueued &lt; batch &amp;&amp; retries &lt; max_retries) {</div><div class='add'>+		err = priv-&gt;enqueue(priv, fq, &amp;fds[total_enqueued], 0,</div><div class='add'>+				    batch - total_enqueued, &amp;enqueued);</div><div class='add'>+		if (err == -EBUSY) {</div><div class='add'>+			retries++;</div><div class='add'>+			continue;</div><div class='add'>+		}</div><div class='add'>+</div><div class='add'>+		total_enqueued += enqueued;</div><div class='add'>+	}</div><div class='add'>+	percpu_extras-&gt;tx_portal_busy += retries;</div><div class='add'>+</div><div class='add'>+	/* Update statistics */</div><div class='add'>+	percpu_stats-&gt;tx_packets += total_enqueued;</div><div class='add'>+	for (i = 0; i &lt; total_enqueued; i++)</div><div class='add'>+		percpu_stats-&gt;tx_bytes += dpaa2_fd_get_len(&amp;fds[i]);</div><div class='add'>+	for (i = total_enqueued; i &lt; batch; i++) {</div><div class='add'>+		dpaa2_eth_free_tx_fd(priv, ch, fq, &amp;fds[i], false);</div><div class='add'>+		percpu_stats-&gt;tx_errors++;</div><div class='add'>+	}</div><div class='add'>+</div><div class='add'>+	return total_enqueued == budget;</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpkg.h b/drivers/net/ethernet/freescale/dpaa2/dpkg.h<br/>index 6de613b13e4d..6f596a5fbeeb 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpkg.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpkg.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpkg.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpkg.h</a></div><div class='hunk'>@@ -13,11 +13,12 @@</div><div class='ctx'> /** Key Generator properties */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Number of masks per key extraction</div><div class='add'>+ * DPKG_NUM_OF_MASKS - Number of masks per key extraction</div><div class='ctx'>  */</div><div class='ctx'> #define DPKG_NUM_OF_MASKS		4</div><div class='add'>+</div><div class='ctx'> /**</div><div class='del'>- * Number of extractions per key profile</div><div class='add'>+ * DPKG_MAX_NUM_OF_EXTRACTS - Number of extractions per key profile</div><div class='ctx'>  */</div><div class='ctx'> #define DPKG_MAX_NUM_OF_EXTRACTS	10</div><div class='ctx'> </div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h<br/>new file mode 100644<br/>index 000000000000..e9ac2ecef3be<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h</a></div><div class='hunk'>@@ -0,0 +1,85 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='add'>+/* Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2019 NXP</div><div class='add'>+ */</div><div class='add'>+#ifndef _FSL_DPMAC_CMD_H</div><div class='add'>+#define _FSL_DPMAC_CMD_H</div><div class='add'>+</div><div class='add'>+/* DPMAC Version */</div><div class='add'>+#define DPMAC_VER_MAJOR				4</div><div class='add'>+#define DPMAC_VER_MINOR				4</div><div class='add'>+#define DPMAC_CMD_BASE_VERSION			1</div><div class='add'>+#define DPMAC_CMD_2ND_VERSION			2</div><div class='add'>+#define DPMAC_CMD_ID_OFFSET			4</div><div class='add'>+</div><div class='add'>+#define DPMAC_CMD(id)	(((id) &lt;&lt; DPMAC_CMD_ID_OFFSET) | DPMAC_CMD_BASE_VERSION)</div><div class='add'>+#define DPMAC_CMD_V2(id) (((id) &lt;&lt; DPMAC_CMD_ID_OFFSET) | DPMAC_CMD_2ND_VERSION)</div><div class='add'>+</div><div class='add'>+/* Command IDs */</div><div class='add'>+#define DPMAC_CMDID_CLOSE		DPMAC_CMD(0x800)</div><div class='add'>+#define DPMAC_CMDID_OPEN		DPMAC_CMD(0x80c)</div><div class='add'>+</div><div class='add'>+#define DPMAC_CMDID_GET_API_VERSION	DPMAC_CMD(0xa0c)</div><div class='add'>+</div><div class='add'>+#define DPMAC_CMDID_GET_ATTR		DPMAC_CMD(0x004)</div><div class='add'>+#define DPMAC_CMDID_SET_LINK_STATE	DPMAC_CMD_V2(0x0c3)</div><div class='add'>+</div><div class='add'>+#define DPMAC_CMDID_GET_COUNTER		DPMAC_CMD(0x0c4)</div><div class='add'>+</div><div class='add'>+#define DPMAC_CMDID_SET_PROTOCOL	DPMAC_CMD(0x0c7)</div><div class='add'>+</div><div class='add'>+/* Macros for accessing command fields smaller than 1byte */</div><div class='add'>+#define DPMAC_MASK(field)        \</div><div class='add'>+	GENMASK(DPMAC_##field##_SHIFT + DPMAC_##field##_SIZE - 1, \</div><div class='add'>+		DPMAC_##field##_SHIFT)</div><div class='add'>+</div><div class='add'>+#define dpmac_set_field(var, field, val) \</div><div class='add'>+	((var) |= (((val) &lt;&lt; DPMAC_##field##_SHIFT) &amp; DPMAC_MASK(field)))</div><div class='add'>+#define dpmac_get_field(var, field)      \</div><div class='add'>+	(((var) &amp; DPMAC_MASK(field)) &gt;&gt; DPMAC_##field##_SHIFT)</div><div class='add'>+</div><div class='add'>+struct dpmac_cmd_open {</div><div class='add'>+	__le32 dpmac_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpmac_rsp_get_attributes {</div><div class='add'>+	u8 eth_if;</div><div class='add'>+	u8 link_type;</div><div class='add'>+	__le16 id;</div><div class='add'>+	__le32 max_rate;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPMAC_STATE_SIZE	1</div><div class='add'>+#define DPMAC_STATE_SHIFT	0</div><div class='add'>+#define DPMAC_STATE_VALID_SIZE	1</div><div class='add'>+#define DPMAC_STATE_VALID_SHIFT	1</div><div class='add'>+</div><div class='add'>+struct dpmac_cmd_set_link_state {</div><div class='add'>+	__le64 options;</div><div class='add'>+	__le32 rate;</div><div class='add'>+	__le32 pad0;</div><div class='add'>+	/* from lsb: up:1, state_valid:1 */</div><div class='add'>+	u8 state;</div><div class='add'>+	u8 pad1[7];</div><div class='add'>+	__le64 supported;</div><div class='add'>+	__le64 advertising;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpmac_cmd_get_counter {</div><div class='add'>+	u8 id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpmac_rsp_get_counter {</div><div class='add'>+	__le64 pad;</div><div class='add'>+	__le64 counter;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpmac_rsp_get_api_version {</div><div class='add'>+	__le16 major;</div><div class='add'>+	__le16 minor;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpmac_cmd_set_protocol {</div><div class='add'>+	u8 eth_if;</div><div class='add'>+};</div><div class='add'>+#endif /* _FSL_DPMAC_CMD_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac.c b/drivers/net/ethernet/freescale/dpaa2/dpmac.c<br/>new file mode 100644<br/>index 000000000000..f440a4c3b70c<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpmac.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpmac.c</a></div><div class='hunk'>@@ -0,0 +1,237 @@</div><div class='add'>+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='add'>+/* Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2019 NXP</div><div class='add'>+ */</div><div class='add'>+#include &lt;linux/fsl/mc.h&gt;</div><div class='add'>+#include "dpmac.h"</div><div class='add'>+#include "dpmac-cmd.h"</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_open() - Open a control session for the specified object.</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @dpmac_id:	DPMAC unique ID</div><div class='add'>+ * @token:	Returned token; use in subsequent API calls</div><div class='add'>+ *</div><div class='add'>+ * This function can be used to open a control session for an</div><div class='add'>+ * already created object; an object may have been declared in</div><div class='add'>+ * the DPL or by calling the dpmac_create function.</div><div class='add'>+ * This function returns a unique authentication token,</div><div class='add'>+ * associated with the specific object ID and the specific MC</div><div class='add'>+ * portal; this token must be used in all subsequent commands for</div><div class='add'>+ * this specific object</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_open(struct fsl_mc_io *mc_io,</div><div class='add'>+	       u32 cmd_flags,</div><div class='add'>+	       int dpmac_id,</div><div class='add'>+	       u16 *token)</div><div class='add'>+{</div><div class='add'>+	struct dpmac_cmd_open *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_OPEN,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  0);</div><div class='add'>+	cmd_params = (struct dpmac_cmd_open *)cmd.params;</div><div class='add'>+	cmd_params-&gt;dpmac_id = cpu_to_le32(dpmac_id);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	err = mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* retrieve response parameters */</div><div class='add'>+	*token = mc_cmd_hdr_read_token(&amp;cmd);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_close() - Close the control session of the object</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPMAC object</div><div class='add'>+ *</div><div class='add'>+ * After this function is called, no further operations are</div><div class='add'>+ * allowed on the object without opening a new control session.</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_close(struct fsl_mc_io *mc_io,</div><div class='add'>+		u32 cmd_flags,</div><div class='add'>+		u16 token)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_CLOSE, cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_get_attributes - Retrieve DPMAC attributes.</div><div class='add'>+ *</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPMAC object</div><div class='add'>+ * @attr:	Returned object's attributes</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_get_attributes(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 struct dpmac_attr *attr)</div><div class='add'>+{</div><div class='add'>+	struct dpmac_rsp_get_attributes *rsp_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_GET_ATTR,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	err = mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* retrieve response parameters */</div><div class='add'>+	rsp_params = (struct dpmac_rsp_get_attributes *)cmd.params;</div><div class='add'>+	attr-&gt;eth_if = rsp_params-&gt;eth_if;</div><div class='add'>+	attr-&gt;link_type = rsp_params-&gt;link_type;</div><div class='add'>+	attr-&gt;id = le16_to_cpu(rsp_params-&gt;id);</div><div class='add'>+	attr-&gt;max_rate = le32_to_cpu(rsp_params-&gt;max_rate);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_set_link_state() - Set the Ethernet link status</div><div class='add'>+ * @mc_io:      Pointer to opaque I/O object</div><div class='add'>+ * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:      Token of DPMAC object</div><div class='add'>+ * @link_state: Link state configuration</div><div class='add'>+ *</div><div class='add'>+ * Return:      '0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_set_link_state(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 struct dpmac_link_state *link_state)</div><div class='add'>+{</div><div class='add'>+	struct dpmac_cmd_set_link_state *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_SET_LINK_STATE,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpmac_cmd_set_link_state *)cmd.params;</div><div class='add'>+	cmd_params-&gt;options = cpu_to_le64(link_state-&gt;options);</div><div class='add'>+	cmd_params-&gt;rate = cpu_to_le32(link_state-&gt;rate);</div><div class='add'>+	dpmac_set_field(cmd_params-&gt;state, STATE, link_state-&gt;up);</div><div class='add'>+	dpmac_set_field(cmd_params-&gt;state, STATE_VALID,</div><div class='add'>+			link_state-&gt;state_valid);</div><div class='add'>+	cmd_params-&gt;supported = cpu_to_le64(link_state-&gt;supported);</div><div class='add'>+	cmd_params-&gt;advertising = cpu_to_le64(link_state-&gt;advertising);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_get_counter() - Read a specific DPMAC counter</div><div class='add'>+ * @mc_io:	Pointer to opaque I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPMAC object</div><div class='add'>+ * @id:		The requested counter ID</div><div class='add'>+ * @value:	Returned counter value</div><div class='add'>+ *</div><div class='add'>+ * Return:	The requested counter; '0' otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_get_counter(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+		      enum dpmac_counter_id id, u64 *value)</div><div class='add'>+{</div><div class='add'>+	struct dpmac_cmd_get_counter *dpmac_cmd;</div><div class='add'>+	struct dpmac_rsp_get_counter *dpmac_rsp;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	int err = 0;</div><div class='add'>+</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_GET_COUNTER,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	dpmac_cmd = (struct dpmac_cmd_get_counter *)cmd.params;</div><div class='add'>+	dpmac_cmd-&gt;id = id;</div><div class='add'>+</div><div class='add'>+	err = mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	dpmac_rsp = (struct dpmac_rsp_get_counter *)cmd.params;</div><div class='add'>+	*value = le64_to_cpu(dpmac_rsp-&gt;counter);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_get_api_version() - Get Data Path MAC version</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @major_ver:	Major version of data path mac API</div><div class='add'>+ * @minor_ver:	Minor version of data path mac API</div><div class='add'>+ *</div><div class='add'>+ * Return:  '0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_get_api_version(struct fsl_mc_io *mc_io, u32 cmd_flags,</div><div class='add'>+			  u16 *major_ver, u16 *minor_ver)</div><div class='add'>+{</div><div class='add'>+	struct dpmac_rsp_get_api_version *rsp_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_GET_API_VERSION,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  0);</div><div class='add'>+</div><div class='add'>+	err = mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rsp_params = (struct dpmac_rsp_get_api_version *)cmd.params;</div><div class='add'>+	*major_ver = le16_to_cpu(rsp_params-&gt;major);</div><div class='add'>+	*minor_ver = le16_to_cpu(rsp_params-&gt;minor);</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpmac_set_protocol() - Reconfigure the DPMAC protocol</div><div class='add'>+ * @mc_io:      Pointer to opaque I/O object</div><div class='add'>+ * @cmd_flags:  Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:      Token of DPMAC object</div><div class='add'>+ * @protocol:   New protocol for the DPMAC to be reconfigured in.</div><div class='add'>+ *</div><div class='add'>+ * Return:      '0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpmac_set_protocol(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+		       enum dpmac_eth_if protocol)</div><div class='add'>+{</div><div class='add'>+	struct dpmac_cmd_set_protocol *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPMAC_CMDID_SET_PROTOCOL,</div><div class='add'>+					  cmd_flags, token);</div><div class='add'>+	cmd_params = (struct dpmac_cmd_set_protocol *)cmd.params;</div><div class='add'>+	cmd_params-&gt;eth_if = protocol;</div><div class='add'>+</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpmac.h b/drivers/net/ethernet/freescale/dpaa2/dpmac.h<br/>new file mode 100644<br/>index 000000000000..17488819ef68<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpmac.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpmac.h</a></div><div class='hunk'>@@ -0,0 +1,213 @@</div><div class='add'>+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='add'>+/* Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2019 NXP</div><div class='add'>+ */</div><div class='add'>+#ifndef __FSL_DPMAC_H</div><div class='add'>+#define __FSL_DPMAC_H</div><div class='add'>+</div><div class='add'>+/* Data Path MAC API</div><div class='add'>+ * Contains initialization APIs and runtime control APIs for DPMAC</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct fsl_mc_io;</div><div class='add'>+</div><div class='add'>+int dpmac_open(struct fsl_mc_io *mc_io,</div><div class='add'>+	       u32 cmd_flags,</div><div class='add'>+	       int dpmac_id,</div><div class='add'>+	       u16 *token);</div><div class='add'>+</div><div class='add'>+int dpmac_close(struct fsl_mc_io *mc_io,</div><div class='add'>+		u32 cmd_flags,</div><div class='add'>+		u16 token);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum dpmac_link_type -  DPMAC link type</div><div class='add'>+ * @DPMAC_LINK_TYPE_NONE: No link</div><div class='add'>+ * @DPMAC_LINK_TYPE_FIXED: Link is fixed type</div><div class='add'>+ * @DPMAC_LINK_TYPE_PHY: Link by PHY ID</div><div class='add'>+ * @DPMAC_LINK_TYPE_BACKPLANE: Backplane link type</div><div class='add'>+ */</div><div class='add'>+enum dpmac_link_type {</div><div class='add'>+	DPMAC_LINK_TYPE_NONE,</div><div class='add'>+	DPMAC_LINK_TYPE_FIXED,</div><div class='add'>+	DPMAC_LINK_TYPE_PHY,</div><div class='add'>+	DPMAC_LINK_TYPE_BACKPLANE</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum dpmac_eth_if - DPMAC Ethrnet interface</div><div class='add'>+ * @DPMAC_ETH_IF_MII: MII interface</div><div class='add'>+ * @DPMAC_ETH_IF_RMII: RMII interface</div><div class='add'>+ * @DPMAC_ETH_IF_SMII: SMII interface</div><div class='add'>+ * @DPMAC_ETH_IF_GMII: GMII interface</div><div class='add'>+ * @DPMAC_ETH_IF_RGMII: RGMII interface</div><div class='add'>+ * @DPMAC_ETH_IF_SGMII: SGMII interface</div><div class='add'>+ * @DPMAC_ETH_IF_QSGMII: QSGMII interface</div><div class='add'>+ * @DPMAC_ETH_IF_XAUI: XAUI interface</div><div class='add'>+ * @DPMAC_ETH_IF_XFI: XFI interface</div><div class='add'>+ * @DPMAC_ETH_IF_CAUI: CAUI interface</div><div class='add'>+ * @DPMAC_ETH_IF_1000BASEX: 1000BASEX interface</div><div class='add'>+ * @DPMAC_ETH_IF_USXGMII: USXGMII interface</div><div class='add'>+ */</div><div class='add'>+enum dpmac_eth_if {</div><div class='add'>+	DPMAC_ETH_IF_MII,</div><div class='add'>+	DPMAC_ETH_IF_RMII,</div><div class='add'>+	DPMAC_ETH_IF_SMII,</div><div class='add'>+	DPMAC_ETH_IF_GMII,</div><div class='add'>+	DPMAC_ETH_IF_RGMII,</div><div class='add'>+	DPMAC_ETH_IF_SGMII,</div><div class='add'>+	DPMAC_ETH_IF_QSGMII,</div><div class='add'>+	DPMAC_ETH_IF_XAUI,</div><div class='add'>+	DPMAC_ETH_IF_XFI,</div><div class='add'>+	DPMAC_ETH_IF_CAUI,</div><div class='add'>+	DPMAC_ETH_IF_1000BASEX,</div><div class='add'>+	DPMAC_ETH_IF_USXGMII,</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dpmac_attr - Structure representing DPMAC attributes</div><div class='add'>+ * @id:		DPMAC object ID</div><div class='add'>+ * @max_rate:	Maximum supported rate - in Mbps</div><div class='add'>+ * @eth_if:	Ethernet interface</div><div class='add'>+ * @link_type:	link type</div><div class='add'>+ */</div><div class='add'>+struct dpmac_attr {</div><div class='add'>+	u16 id;</div><div class='add'>+	u32 max_rate;</div><div class='add'>+	enum dpmac_eth_if eth_if;</div><div class='add'>+	enum dpmac_link_type link_type;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpmac_get_attributes(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 struct dpmac_attr *attr);</div><div class='add'>+</div><div class='add'>+/* DPMAC link configuration/state options */</div><div class='add'>+</div><div class='add'>+#define DPMAC_LINK_OPT_AUTONEG			BIT_ULL(0)</div><div class='add'>+#define DPMAC_LINK_OPT_HALF_DUPLEX		BIT_ULL(1)</div><div class='add'>+#define DPMAC_LINK_OPT_PAUSE			BIT_ULL(2)</div><div class='add'>+#define DPMAC_LINK_OPT_ASYM_PAUSE		BIT_ULL(3)</div><div class='add'>+</div><div class='add'>+/* Advertised link speeds */</div><div class='add'>+#define DPMAC_ADVERTISED_10BASET_FULL		BIT_ULL(0)</div><div class='add'>+#define DPMAC_ADVERTISED_100BASET_FULL		BIT_ULL(1)</div><div class='add'>+#define DPMAC_ADVERTISED_1000BASET_FULL		BIT_ULL(2)</div><div class='add'>+#define DPMAC_ADVERTISED_10000BASET_FULL	BIT_ULL(4)</div><div class='add'>+#define DPMAC_ADVERTISED_2500BASEX_FULL		BIT_ULL(5)</div><div class='add'>+</div><div class='add'>+/* Advertise auto-negotiation enable */</div><div class='add'>+#define DPMAC_ADVERTISED_AUTONEG		BIT_ULL(3)</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dpmac_link_state - DPMAC link configuration request</div><div class='add'>+ * @rate: Rate in Mbps</div><div class='add'>+ * @options: Enable/Disable DPMAC link cfg features (bitmap)</div><div class='add'>+ * @up: Link state</div><div class='add'>+ * @state_valid: Ignore/Update the state of the link</div><div class='add'>+ * @supported: Speeds capability of the phy (bitmap)</div><div class='add'>+ * @advertising: Speeds that are advertised for autoneg (bitmap)</div><div class='add'>+ */</div><div class='add'>+struct dpmac_link_state {</div><div class='add'>+	u32 rate;</div><div class='add'>+	u64 options;</div><div class='add'>+	int up;</div><div class='add'>+	int state_valid;</div><div class='add'>+	u64 supported;</div><div class='add'>+	u64 advertising;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpmac_set_link_state(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 struct dpmac_link_state *link_state);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * enum dpmac_counter_id - DPMAC counter types</div><div class='add'>+ *</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_64: counts 64-bytes frames, good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_127: counts 65- to 127-bytes frames, good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_255: counts 128- to 255-bytes frames, good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_511: counts 256- to 511-bytes frames, good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_1023: counts 512- to 1023-bytes frames, good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_1518: counts 1024- to 1518-bytes frames, good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_1519_MAX: counts 1519-bytes frames and larger</div><div class='add'>+ *				  (up to max frame length specified),</div><div class='add'>+ *				  good or bad.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAG: counts frames which are shorter than 64 bytes received</div><div class='add'>+ *			with a wrong CRC</div><div class='add'>+ * @DPMAC_CNT_ING_JABBER: counts frames longer than the maximum frame length</div><div class='add'>+ *			  specified, with a bad frame check sequence.</div><div class='add'>+ * @DPMAC_CNT_ING_FRAME_DISCARD: counts dropped frames due to internal errors.</div><div class='add'>+ *				 Occurs when a receive FIFO overflows.</div><div class='add'>+ *				 Includes also frames truncated as a result of</div><div class='add'>+ *				 the receive FIFO overflow.</div><div class='add'>+ * @DPMAC_CNT_ING_ALIGN_ERR: counts frames with an alignment error</div><div class='add'>+ *			     (optional used for wrong SFD).</div><div class='add'>+ * @DPMAC_CNT_EGR_UNDERSIZED: counts frames transmitted that was less than 64</div><div class='add'>+ *			      bytes long with a good CRC.</div><div class='add'>+ * @DPMAC_CNT_ING_OVERSIZED: counts frames longer than the maximum frame length</div><div class='add'>+ *			     specified, with a good frame check sequence.</div><div class='add'>+ * @DPMAC_CNT_ING_VALID_PAUSE_FRAME: counts valid pause frames (regular and PFC)</div><div class='add'>+ * @DPMAC_CNT_EGR_VALID_PAUSE_FRAME: counts valid pause frames transmitted</div><div class='add'>+ *				     (regular and PFC).</div><div class='add'>+ * @DPMAC_CNT_ING_BYTE: counts bytes received except preamble for all valid</div><div class='add'>+ *			frames and valid pause frames.</div><div class='add'>+ * @DPMAC_CNT_ING_MCAST_FRAME: counts received multicast frames.</div><div class='add'>+ * @DPMAC_CNT_ING_BCAST_FRAME: counts received broadcast frames.</div><div class='add'>+ * @DPMAC_CNT_ING_ALL_FRAME: counts each good or bad frames received.</div><div class='add'>+ * @DPMAC_CNT_ING_UCAST_FRAME: counts received unicast frames.</div><div class='add'>+ * @DPMAC_CNT_ING_ERR_FRAME: counts frames received with an error</div><div class='add'>+ *			     (except for undersized/fragment frame).</div><div class='add'>+ * @DPMAC_CNT_EGR_BYTE: counts bytes transmitted except preamble for all valid</div><div class='add'>+ *			frames and valid pause frames transmitted.</div><div class='add'>+ * @DPMAC_CNT_EGR_MCAST_FRAME: counts transmitted multicast frames.</div><div class='add'>+ * @DPMAC_CNT_EGR_BCAST_FRAME: counts transmitted broadcast frames.</div><div class='add'>+ * @DPMAC_CNT_EGR_UCAST_FRAME: counts transmitted unicast frames.</div><div class='add'>+ * @DPMAC_CNT_EGR_ERR_FRAME: counts frames transmitted with an error.</div><div class='add'>+ * @DPMAC_CNT_ING_GOOD_FRAME: counts frames received without error, including</div><div class='add'>+ *			      pause frames.</div><div class='add'>+ * @DPMAC_CNT_EGR_GOOD_FRAME: counts frames transmitted without error, including</div><div class='add'>+ *			      pause frames.</div><div class='add'>+ */</div><div class='add'>+enum dpmac_counter_id {</div><div class='add'>+	DPMAC_CNT_ING_FRAME_64,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_127,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_255,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_511,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_1023,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_1518,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_1519_MAX,</div><div class='add'>+	DPMAC_CNT_ING_FRAG,</div><div class='add'>+	DPMAC_CNT_ING_JABBER,</div><div class='add'>+	DPMAC_CNT_ING_FRAME_DISCARD,</div><div class='add'>+	DPMAC_CNT_ING_ALIGN_ERR,</div><div class='add'>+	DPMAC_CNT_EGR_UNDERSIZED,</div><div class='add'>+	DPMAC_CNT_ING_OVERSIZED,</div><div class='add'>+	DPMAC_CNT_ING_VALID_PAUSE_FRAME,</div><div class='add'>+	DPMAC_CNT_EGR_VALID_PAUSE_FRAME,</div><div class='add'>+	DPMAC_CNT_ING_BYTE,</div><div class='add'>+	DPMAC_CNT_ING_MCAST_FRAME,</div><div class='add'>+	DPMAC_CNT_ING_BCAST_FRAME,</div><div class='add'>+	DPMAC_CNT_ING_ALL_FRAME,</div><div class='add'>+	DPMAC_CNT_ING_UCAST_FRAME,</div><div class='add'>+	DPMAC_CNT_ING_ERR_FRAME,</div><div class='add'>+	DPMAC_CNT_EGR_BYTE,</div><div class='add'>+	DPMAC_CNT_EGR_MCAST_FRAME,</div><div class='add'>+	DPMAC_CNT_EGR_BCAST_FRAME,</div><div class='add'>+	DPMAC_CNT_EGR_UCAST_FRAME,</div><div class='add'>+	DPMAC_CNT_EGR_ERR_FRAME,</div><div class='add'>+	DPMAC_CNT_ING_GOOD_FRAME,</div><div class='add'>+	DPMAC_CNT_EGR_GOOD_FRAME</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpmac_get_counter(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+		      enum dpmac_counter_id id, u64 *value);</div><div class='add'>+</div><div class='add'>+int dpmac_get_api_version(struct fsl_mc_io *mc_io, u32 cmd_flags,</div><div class='add'>+			  u16 *major_ver, u16 *minor_ver);</div><div class='add'>+</div><div class='add'>+int dpmac_set_protocol(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+		       enum dpmac_eth_if protocol);</div><div class='add'>+#endif /* __FSL_DPMAC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h<br/>index 7b44d7d9b19a..be9492b8d5dc 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpni-cmd.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='ctx'> /* Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='ctx'>  * Copyright 2016 NXP</div><div class='add'>+ * Copyright 2020 NXP</div><div class='ctx'>  */</div><div class='ctx'> #ifndef _FSL_DPNI_CMD_H</div><div class='ctx'> #define _FSL_DPNI_CMD_H</div><div class='hunk'>@@ -11,9 +12,13 @@</div><div class='ctx'> #define DPNI_VER_MAJOR				7</div><div class='ctx'> #define DPNI_VER_MINOR				0</div><div class='ctx'> #define DPNI_CMD_BASE_VERSION			1</div><div class='add'>+#define DPNI_CMD_2ND_VERSION			2</div><div class='add'>+#define DPNI_CMD_3RD_VERSION			3</div><div class='ctx'> #define DPNI_CMD_ID_OFFSET			4</div><div class='ctx'> </div><div class='ctx'> #define DPNI_CMD(id)	(((id) &lt;&lt; DPNI_CMD_ID_OFFSET) | DPNI_CMD_BASE_VERSION)</div><div class='add'>+#define DPNI_CMD_V2(id)	(((id) &lt;&lt; DPNI_CMD_ID_OFFSET) | DPNI_CMD_2ND_VERSION)</div><div class='add'>+#define DPNI_CMD_V3(id)	(((id) &lt;&lt; DPNI_CMD_ID_OFFSET) | DPNI_CMD_3RD_VERSION)</div><div class='ctx'> </div><div class='ctx'> #define DPNI_CMDID_OPEN					DPNI_CMD(0x801)</div><div class='ctx'> #define DPNI_CMDID_CLOSE				DPNI_CMD(0x800)</div><div class='hunk'>@@ -36,7 +41,7 @@</div><div class='ctx'> #define DPNI_CMDID_GET_IRQ_STATUS			DPNI_CMD(0x016)</div><div class='ctx'> #define DPNI_CMDID_CLEAR_IRQ_STATUS			DPNI_CMD(0x017)</div><div class='ctx'> </div><div class='del'>-#define DPNI_CMDID_SET_POOLS				DPNI_CMD(0x200)</div><div class='add'>+#define DPNI_CMDID_SET_POOLS				DPNI_CMD_V3(0x200)</div><div class='ctx'> #define DPNI_CMDID_SET_ERRORS_BEHAVIOR			DPNI_CMD(0x20B)</div><div class='ctx'> </div><div class='ctx'> #define DPNI_CMDID_GET_QDID				DPNI_CMD(0x210)</div><div class='hunk'>@@ -45,7 +50,7 @@</div><div class='ctx'> #define DPNI_CMDID_SET_MAX_FRAME_LENGTH			DPNI_CMD(0x216)</div><div class='ctx'> #define DPNI_CMDID_GET_MAX_FRAME_LENGTH			DPNI_CMD(0x217)</div><div class='ctx'> #define DPNI_CMDID_SET_LINK_CFG				DPNI_CMD(0x21A)</div><div class='del'>-#define DPNI_CMDID_SET_TX_SHAPING			DPNI_CMD(0x21B)</div><div class='add'>+#define DPNI_CMDID_SET_TX_SHAPING			DPNI_CMD_V2(0x21B)</div><div class='ctx'> </div><div class='ctx'> #define DPNI_CMDID_SET_MCAST_PROMISC			DPNI_CMD(0x220)</div><div class='ctx'> #define DPNI_CMDID_GET_MCAST_PROMISC			DPNI_CMD(0x221)</div><div class='hunk'>@@ -59,6 +64,14 @@</div><div class='ctx'> </div><div class='ctx'> #define DPNI_CMDID_SET_RX_TC_DIST			DPNI_CMD(0x235)</div><div class='ctx'> </div><div class='add'>+#define DPNI_CMDID_ENABLE_VLAN_FILTER			DPNI_CMD(0x230)</div><div class='add'>+#define DPNI_CMDID_ADD_VLAN_ID				DPNI_CMD_V2(0x231)</div><div class='add'>+#define DPNI_CMDID_REMOVE_VLAN_ID			DPNI_CMD(0x232)</div><div class='add'>+</div><div class='add'>+#define DPNI_CMDID_SET_QOS_TBL				DPNI_CMD(0x240)</div><div class='add'>+#define DPNI_CMDID_ADD_QOS_ENT				DPNI_CMD(0x241)</div><div class='add'>+#define DPNI_CMDID_REMOVE_QOS_ENT			DPNI_CMD(0x242)</div><div class='add'>+#define DPNI_CMDID_CLR_QOS_TBL				DPNI_CMD(0x243)</div><div class='ctx'> #define DPNI_CMDID_ADD_FS_ENT				DPNI_CMD(0x244)</div><div class='ctx'> #define DPNI_CMDID_REMOVE_FS_ENT			DPNI_CMD(0x245)</div><div class='ctx'> #define DPNI_CMDID_CLR_FS_ENT				DPNI_CMD(0x246)</div><div class='hunk'>@@ -84,6 +97,10 @@</div><div class='ctx'> </div><div class='ctx'> #define DPNI_CMDID_SET_RX_FS_DIST			DPNI_CMD(0x273)</div><div class='ctx'> #define DPNI_CMDID_SET_RX_HASH_DIST			DPNI_CMD(0x274)</div><div class='add'>+#define DPNI_CMDID_GET_LINK_CFG				DPNI_CMD(0x278)</div><div class='add'>+</div><div class='add'>+#define DPNI_CMDID_SET_SINGLE_STEP_CFG			DPNI_CMD(0x279)</div><div class='add'>+#define DPNI_CMDID_GET_SINGLE_STEP_CFG			DPNI_CMD_V2(0x27a)</div><div class='ctx'> </div><div class='ctx'> /* Macros for accessing command fields smaller than 1byte */</div><div class='ctx'> #define DPNI_MASK(field)	\</div><div class='hunk'>@@ -100,14 +117,19 @@ struct dpni_cmd_open {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #define DPNI_BACKUP_POOL(val, order)	(((val) &amp; 0x1) &lt;&lt; (order))</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_pool {</div><div class='add'>+	__le16 dpbp_id;</div><div class='add'>+	u8 priority_mask;</div><div class='add'>+	u8 pad;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> struct dpni_cmd_set_pools {</div><div class='del'>-	/* cmd word 0 */</div><div class='ctx'> 	u8 num_dpbp;</div><div class='ctx'> 	u8 backup_pool_mask;</div><div class='del'>-	__le16 pad;</div><div class='del'>-	/* cmd word 0..4 */</div><div class='del'>-	__le32 dpbp_id[DPNI_MAX_DPBP];</div><div class='del'>-	/* cmd word 4..6 */</div><div class='add'>+	u8 pad;</div><div class='add'>+	u8 pool_options;</div><div class='add'>+	struct dpni_cmd_pool pool[DPNI_MAX_DPBP];</div><div class='ctx'> 	__le16 buffer_size[DPNI_MAX_DPBP];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='hunk'>@@ -284,7 +306,7 @@ struct dpni_rsp_get_statistics {</div><div class='ctx'> 	__le64 counter[DPNI_STATISTICS_CNT];</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dpni_cmd_set_link_cfg {</div><div class='add'>+struct dpni_cmd_link_cfg {</div><div class='ctx'> 	/* cmd word 0 */</div><div class='ctx'> 	__le64 pad0;</div><div class='ctx'> 	/* cmd word 1 */</div><div class='hunk'>@@ -566,4 +588,106 @@ struct dpni_cmd_remove_fs_entry {</div><div class='ctx'> 	__le64 mask_iova;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='add'>+#define DPNI_DISCARD_ON_MISS_SHIFT	0</div><div class='add'>+#define DPNI_DISCARD_ON_MISS_SIZE	1</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_set_qos_table {</div><div class='add'>+	__le32 pad;</div><div class='add'>+	u8 default_tc;</div><div class='add'>+	/* only the LSB */</div><div class='add'>+	u8 discard_on_miss;</div><div class='add'>+	__le16 pad1[21];</div><div class='add'>+	__le64 key_cfg_iova;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_add_qos_entry {</div><div class='add'>+	__le16 pad;</div><div class='add'>+	u8 tc_id;</div><div class='add'>+	u8 key_size;</div><div class='add'>+	__le16 index;</div><div class='add'>+	__le16 pad1;</div><div class='add'>+	__le64 key_iova;</div><div class='add'>+	__le64 mask_iova;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_remove_qos_entry {</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u8 key_size;</div><div class='add'>+	__le32 pad1;</div><div class='add'>+	__le64 key_iova;</div><div class='add'>+	__le64 mask_iova;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPNI_DEST_TYPE_SHIFT		0</div><div class='add'>+#define DPNI_DEST_TYPE_SIZE		4</div><div class='add'>+#define DPNI_CONG_UNITS_SHIFT		4</div><div class='add'>+#define DPNI_CONG_UNITS_SIZE		2</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_set_congestion_notification {</div><div class='add'>+	/* cmd word 0 */</div><div class='add'>+	u8 qtype;</div><div class='add'>+	u8 tc;</div><div class='add'>+	u8 pad[6];</div><div class='add'>+	/* cmd word 1 */</div><div class='add'>+	__le32 dest_id;</div><div class='add'>+	__le16 notification_mode;</div><div class='add'>+	u8 dest_priority;</div><div class='add'>+	/* from LSB: dest_type: 4 units:2 */</div><div class='add'>+	u8 type_units;</div><div class='add'>+	/* cmd word 2 */</div><div class='add'>+	__le64 message_iova;</div><div class='add'>+	/* cmd word 3 */</div><div class='add'>+	__le64 message_ctx;</div><div class='add'>+	/* cmd word 4 */</div><div class='add'>+	__le32 threshold_entry;</div><div class='add'>+	__le32 threshold_exit;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPNI_COUPLED_SHIFT	0</div><div class='add'>+#define DPNI_COUPLED_SIZE	1</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_set_tx_shaping {</div><div class='add'>+	__le16 tx_cr_max_burst_size;</div><div class='add'>+	__le16 tx_er_max_burst_size;</div><div class='add'>+	__le32 pad;</div><div class='add'>+	__le32 tx_cr_rate_limit;</div><div class='add'>+	__le32 tx_er_rate_limit;</div><div class='add'>+	/* from LSB: coupled:1 */</div><div class='add'>+	u8 coupled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPNI_PTP_ENABLE_SHIFT			0</div><div class='add'>+#define DPNI_PTP_ENABLE_SIZE			1</div><div class='add'>+#define DPNI_PTP_CH_UPDATE_SHIFT		1</div><div class='add'>+#define DPNI_PTP_CH_UPDATE_SIZE			1</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_single_step_cfg {</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 offset;</div><div class='add'>+	__le32 peer_delay;</div><div class='add'>+	__le32 ptp_onestep_reg_base;</div><div class='add'>+	__le32 pad0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpni_rsp_single_step_cfg {</div><div class='add'>+	__le16 flags;</div><div class='add'>+	__le16 offset;</div><div class='add'>+	__le32 peer_delay;</div><div class='add'>+	__le32 ptp_onestep_reg_base;</div><div class='add'>+	__le32 pad0;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_enable_vlan_filter {</div><div class='add'>+	/* only the LSB */</div><div class='add'>+	u8 en;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpni_cmd_vlan_id {</div><div class='add'>+	u8 flags;</div><div class='add'>+	u8 tc_id;</div><div class='add'>+	u8 flow_id;</div><div class='add'>+	u8 pad;</div><div class='add'>+	__le16 vlan_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='ctx'> #endif /* _FSL_DPNI_CMD_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.c b/drivers/net/ethernet/freescale/dpaa2/dpni.c<br/>index 220dfc806a24..02601a283b59 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpni.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpni.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpni.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpni.c</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)</div><div class='ctx'> /* Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='ctx'>  * Copyright 2016 NXP</div><div class='add'>+ * Copyright 2020 NXP</div><div class='ctx'>  */</div><div class='ctx'> #include &lt;linux/kernel.h&gt;</div><div class='ctx'> #include &lt;linux/errno.h&gt;</div><div class='hunk'>@@ -16,6 +17,8 @@</div><div class='ctx'>  * This function has to be called before the following functions:</div><div class='ctx'>  *	- dpni_set_rx_tc_dist()</div><div class='ctx'>  *	- dpni_set_qos_table()</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> int dpni_prepare_key_cfg(const struct dpkg_profile_cfg *cfg, u8 *key_cfg_buf)</div><div class='ctx'> {</div><div class='hunk'>@@ -170,8 +173,12 @@ int dpni_set_pools(struct fsl_mc_io *mc_io,</div><div class='ctx'> 					  token);</div><div class='ctx'> 	cmd_params = (struct dpni_cmd_set_pools *)cmd.params;</div><div class='ctx'> 	cmd_params-&gt;num_dpbp = cfg-&gt;num_dpbp;</div><div class='add'>+	cmd_params-&gt;pool_options = cfg-&gt;pool_options;</div><div class='ctx'> 	for (i = 0; i &lt; DPNI_MAX_DPBP; i++) {</div><div class='del'>-		cmd_params-&gt;dpbp_id[i] = cpu_to_le32(cfg-&gt;pools[i].dpbp_id);</div><div class='add'>+		cmd_params-&gt;pool[i].dpbp_id =</div><div class='add'>+			cpu_to_le16(cfg-&gt;pools[i].dpbp_id);</div><div class='add'>+		cmd_params-&gt;pool[i].priority_mask =</div><div class='add'>+			cfg-&gt;pools[i].priority_mask;</div><div class='ctx'> 		cmd_params-&gt;buffer_size[i] =</div><div class='ctx'> 			cpu_to_le16(cfg-&gt;pools[i].buffer_size);</div><div class='ctx'> 		cmd_params-&gt;backup_pool_mask |=</div><div class='hunk'>@@ -838,13 +845,13 @@ int dpni_set_link_cfg(struct fsl_mc_io *mc_io,</div><div class='ctx'> 		      const struct dpni_link_cfg *cfg)</div><div class='ctx'> {</div><div class='ctx'> 	struct fsl_mc_command cmd = { 0 };</div><div class='del'>-	struct dpni_cmd_set_link_cfg *cmd_params;</div><div class='add'>+	struct dpni_cmd_link_cfg *cmd_params;</div><div class='ctx'> </div><div class='ctx'> 	/* prepare command */</div><div class='ctx'> 	cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_LINK_CFG,</div><div class='ctx'> 					  cmd_flags,</div><div class='ctx'> 					  token);</div><div class='del'>-	cmd_params = (struct dpni_cmd_set_link_cfg *)cmd.params;</div><div class='add'>+	cmd_params = (struct dpni_cmd_link_cfg *)cmd.params;</div><div class='ctx'> 	cmd_params-&gt;rate = cpu_to_le32(cfg-&gt;rate);</div><div class='ctx'> 	cmd_params-&gt;options = cpu_to_le64(cfg-&gt;options);</div><div class='ctx'> </div><div class='hunk'>@@ -853,6 +860,42 @@ int dpni_set_link_cfg(struct fsl_mc_io *mc_io,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * dpni_get_link_cfg() - return the link configuration</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @cfg:	Link configuration from dpni object</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_get_link_cfg(struct fsl_mc_io *mc_io,</div><div class='add'>+		      u32 cmd_flags,</div><div class='add'>+		      u16 token,</div><div class='add'>+		      struct dpni_link_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	struct dpni_cmd_link_cfg *rsp_params;</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_LINK_CFG,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	err = mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* retrieve response parameters */</div><div class='add'>+	rsp_params = (struct dpni_cmd_link_cfg *)cmd.params;</div><div class='add'>+	cfg-&gt;rate = le32_to_cpu(rsp_params-&gt;rate);</div><div class='add'>+	cfg-&gt;options = le64_to_cpu(rsp_params-&gt;options);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * dpni_get_link_state() - Return the link state (either up or down)</div><div class='ctx'>  * @mc_io:	Pointer to MC portal's I/O object</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='hunk'>@@ -1188,6 +1231,99 @@ int dpni_get_port_mac_addr(struct fsl_mc_io *mc_io,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * dpni_enable_vlan_filter() - Enable/disable VLAN filtering mode</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @en:		Set to '1' to enable; '0' to disable</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_enable_vlan_filter(struct fsl_mc_io *mc_io,</div><div class='add'>+			    u32 cmd_flags,</div><div class='add'>+			    u16 token,</div><div class='add'>+			    u32 en)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_enable_vlan_filter *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_ENABLE_VLAN_FILTER,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_enable_vlan_filter *)cmd.params;</div><div class='add'>+	dpni_set_field(cmd_params-&gt;en, ENABLE, en);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_add_vlan_id() - Add VLAN ID filter</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @vlan_id:	VLAN ID to add</div><div class='add'>+ * @flags:   0 - tc_id and flow_id will be ignored.</div><div class='add'>+ * Pkt with this vlan_id will be passed to the next</div><div class='add'>+ * classification stages</div><div class='add'>+ * DPNI_VLAN_SET_QUEUE_ACTION</div><div class='add'>+ * Pkt with this vlan_id will be forward directly to</div><div class='add'>+ * queue defined by the tc_id and flow_id</div><div class='add'>+ *</div><div class='add'>+ * @tc_id: Traffic class selection (0-7)</div><div class='add'>+ * @flow_id: Selects the specific queue out of the set allocated for the</div><div class='add'>+ *           same as tc_id. Value must be in range 0 to NUM_QUEUES - 1</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_add_vlan_id(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+		     u16 vlan_id, u8 flags, u8 tc_id, u8 flow_id)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_vlan_id *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_ADD_VLAN_ID,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_vlan_id *)cmd.params;</div><div class='add'>+	cmd_params-&gt;flags = flags;</div><div class='add'>+	cmd_params-&gt;tc_id = tc_id;</div><div class='add'>+	cmd_params-&gt;flow_id =  flow_id;</div><div class='add'>+	cmd_params-&gt;vlan_id = cpu_to_le16(vlan_id);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_remove_vlan_id() - Remove VLAN ID filter</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @vlan_id:	VLAN ID to remove</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_remove_vlan_id(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+			u16 vlan_id)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_vlan_id *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_REMOVE_VLAN_ID,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_vlan_id *)cmd.params;</div><div class='add'>+	cmd_params-&gt;vlan_id = cpu_to_le16(vlan_id);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * dpni_add_mac_addr() - Add MAC address filter</div><div class='ctx'>  * @mc_io:	Pointer to MC portal's I/O object</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='hunk'>@@ -1319,6 +1455,52 @@ int dpni_set_rx_tc_dist(struct fsl_mc_io *mc_io,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * dpni_set_congestion_notification() - Set traffic class congestion</div><div class='add'>+ *					notification configuration</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @qtype:	Type of queue - Rx, Tx and Tx confirm types are supported</div><div class='add'>+ * @tc_id:	Traffic class selection (0-7)</div><div class='add'>+ * @cfg:	Congestion notification configuration</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_set_congestion_notification(</div><div class='add'>+			struct fsl_mc_io *mc_io,</div><div class='add'>+			u32 cmd_flags,</div><div class='add'>+			u16 token,</div><div class='add'>+			enum dpni_queue_type qtype,</div><div class='add'>+			u8 tc_id,</div><div class='add'>+			const struct dpni_congestion_notification_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_set_congestion_notification *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header =</div><div class='add'>+		mc_encode_cmd_header(DPNI_CMDID_SET_CONGESTION_NOTIFICATION,</div><div class='add'>+				     cmd_flags,</div><div class='add'>+				     token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_set_congestion_notification *)cmd.params;</div><div class='add'>+	cmd_params-&gt;qtype = qtype;</div><div class='add'>+	cmd_params-&gt;tc = tc_id;</div><div class='add'>+	cmd_params-&gt;dest_id = cpu_to_le32(cfg-&gt;dest_cfg.dest_id);</div><div class='add'>+	cmd_params-&gt;notification_mode = cpu_to_le16(cfg-&gt;notification_mode);</div><div class='add'>+	cmd_params-&gt;dest_priority = cfg-&gt;dest_cfg.priority;</div><div class='add'>+	dpni_set_field(cmd_params-&gt;type_units, DEST_TYPE,</div><div class='add'>+		       cfg-&gt;dest_cfg.dest_type);</div><div class='add'>+	dpni_set_field(cmd_params-&gt;type_units, CONG_UNITS, cfg-&gt;units);</div><div class='add'>+	cmd_params-&gt;message_iova = cpu_to_le64(cfg-&gt;message_iova);</div><div class='add'>+	cmd_params-&gt;message_ctx = cpu_to_le64(cfg-&gt;message_ctx);</div><div class='add'>+	cmd_params-&gt;threshold_entry = cpu_to_le32(cfg-&gt;threshold_entry);</div><div class='add'>+	cmd_params-&gt;threshold_exit = cpu_to_le32(cfg-&gt;threshold_exit);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * dpni_set_queue() - Set queue parameters</div><div class='ctx'>  * @mc_io:	Pointer to MC portal's I/O object</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='hunk'>@@ -1434,7 +1616,7 @@ int dpni_get_queue(struct fsl_mc_io *mc_io,</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='ctx'>  * @token:	Token of DPNI object</div><div class='ctx'>  * @page:	Selects the statistics page to retrieve, see</div><div class='del'>- *		DPNI_GET_STATISTICS output. Pages are numbered 0 to 2.</div><div class='add'>+ *		DPNI_GET_STATISTICS output. Pages are numbered 0 to 6.</div><div class='ctx'>  * @stat:	Structure containing the statistics</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	'0' on Success; Error code otherwise.</div><div class='hunk'>@@ -1476,10 +1658,10 @@ int dpni_get_statistics(struct fsl_mc_io *mc_io,</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='ctx'>  * @token:	Token of DPNI object</div><div class='ctx'>  * @cg_point:	Congestion point</div><div class='del'>- * @q_type:	Queue type on which the taildrop is configured.</div><div class='add'>+ * @qtype:	Queue type on which the taildrop is configured.</div><div class='ctx'>  *		Only Rx queues are supported for now</div><div class='ctx'>  * @tc:		Traffic class to apply this taildrop to</div><div class='del'>- * @q_index:	Index of the queue if the DPNI supports multiple queues for</div><div class='add'>+ * @index:	Index of the queue if the DPNI supports multiple queues for</div><div class='ctx'>  *		traffic distribution. Ignored if CONGESTION_POINT is not 0.</div><div class='ctx'>  * @taildrop:	Taildrop structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -1520,10 +1702,10 @@ int dpni_set_taildrop(struct fsl_mc_io *mc_io,</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='ctx'>  * @token:	Token of DPNI object</div><div class='ctx'>  * @cg_point:	Congestion point</div><div class='del'>- * @q_type:	Queue type on which the taildrop is configured.</div><div class='add'>+ * @qtype:	Queue type on which the taildrop is configured.</div><div class='ctx'>  *		Only Rx queues are supported for now</div><div class='ctx'>  * @tc:		Traffic class to apply this taildrop to</div><div class='del'>- * @q_index:	Index of the queue if the DPNI supports multiple queues for</div><div class='add'>+ * @index:	Index of the queue if the DPNI supports multiple queues for</div><div class='ctx'>  *		traffic distribution. Ignored if CONGESTION_POINT is not 0.</div><div class='ctx'>  * @taildrop:	Taildrop structure</div><div class='ctx'>  *</div><div class='hunk'>@@ -1617,6 +1799,8 @@ int dpni_get_api_version(struct fsl_mc_io *mc_io,</div><div class='ctx'>  * If cfg.enable is set to 0 the command will clear flow steering table.</div><div class='ctx'>  * The packets will be classified according to settings made in</div><div class='ctx'>  * dpni_set_rx_hash_dist()</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> int dpni_set_rx_fs_dist(struct fsl_mc_io *mc_io,</div><div class='ctx'> 			u32 cmd_flags,</div><div class='hunk'>@@ -1650,6 +1834,8 @@ int dpni_set_rx_fs_dist(struct fsl_mc_io *mc_io,</div><div class='ctx'>  * If cfg.enable is set to 1 the packets will be classified using a hash</div><div class='ctx'>  * function based on the key received in cfg.key_cfg_iova parameter.</div><div class='ctx'>  * If cfg.enable is set to 0 the packets will be sent to the default queue</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='ctx'> int dpni_set_rx_hash_dist(struct fsl_mc_io *mc_io,</div><div class='ctx'> 			  u32 cmd_flags,</div><div class='hunk'>@@ -1750,3 +1936,250 @@ int dpni_remove_fs_entry(struct fsl_mc_io *mc_io,</div><div class='ctx'> 	/* send command to mc*/</div><div class='ctx'> 	return mc_send_command(mc_io, &amp;cmd);</div><div class='ctx'> }</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_set_qos_table() - Set QoS mapping table</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @cfg:	QoS table configuration</div><div class='add'>+ *</div><div class='add'>+ * This function and all QoS-related functions require that</div><div class='add'>+ *'max_tcs &gt; 1' was set at DPNI creation.</div><div class='add'>+ *</div><div class='add'>+ * warning: Before calling this function, call dpkg_prepare_key_cfg() to</div><div class='add'>+ *			prepare the key_cfg_iova parameter</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_set_qos_table(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       const struct dpni_qos_tbl_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_set_qos_table *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_QOS_TBL,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_set_qos_table *)cmd.params;</div><div class='add'>+	cmd_params-&gt;default_tc = cfg-&gt;default_tc;</div><div class='add'>+	cmd_params-&gt;key_cfg_iova = cpu_to_le64(cfg-&gt;key_cfg_iova);</div><div class='add'>+	dpni_set_field(cmd_params-&gt;discard_on_miss, DISCARD_ON_MISS,</div><div class='add'>+		       cfg-&gt;discard_on_miss);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_add_qos_entry() - Add QoS mapping entry (to select a traffic class)</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @cfg:	QoS rule to add</div><div class='add'>+ * @tc_id:	Traffic class selection (0-7)</div><div class='add'>+ * @index:	Location in the QoS table where to insert the entry.</div><div class='add'>+ *		Only relevant if MASKING is enabled for QoS classification on</div><div class='add'>+ *		this DPNI, it is ignored for exact match.</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_add_qos_entry(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       const struct dpni_rule_cfg *cfg,</div><div class='add'>+		       u8 tc_id,</div><div class='add'>+		       u16 index)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_add_qos_entry *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_ADD_QOS_ENT,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_add_qos_entry *)cmd.params;</div><div class='add'>+	cmd_params-&gt;tc_id = tc_id;</div><div class='add'>+	cmd_params-&gt;key_size = cfg-&gt;key_size;</div><div class='add'>+	cmd_params-&gt;index = cpu_to_le16(index);</div><div class='add'>+	cmd_params-&gt;key_iova = cpu_to_le64(cfg-&gt;key_iova);</div><div class='add'>+	cmd_params-&gt;mask_iova = cpu_to_le64(cfg-&gt;mask_iova);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_remove_qos_entry() - Remove QoS mapping entry</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @cfg:	QoS rule to remove</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_remove_qos_entry(struct fsl_mc_io *mc_io,</div><div class='add'>+			  u32 cmd_flags,</div><div class='add'>+			  u16 token,</div><div class='add'>+			  const struct dpni_rule_cfg *cfg)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_remove_qos_entry *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_REMOVE_QOS_ENT,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_remove_qos_entry *)cmd.params;</div><div class='add'>+	cmd_params-&gt;key_size = cfg-&gt;key_size;</div><div class='add'>+	cmd_params-&gt;key_iova = cpu_to_le64(cfg-&gt;key_iova);</div><div class='add'>+	cmd_params-&gt;mask_iova = cpu_to_le64(cfg-&gt;mask_iova);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_clear_qos_table() - Clear all QoS mapping entries</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ *</div><div class='add'>+ * Following this function call, all frames are directed to</div><div class='add'>+ * the default traffic class (0)</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_clear_qos_table(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token)</div><div class='add'>+{</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_CLR_QOS_TBL,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_set_tx_shaping() - Set the transmit shaping</div><div class='add'>+ * @mc_io:		Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:		Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:		Token of DPNI object</div><div class='add'>+ * @tx_cr_shaper:	TX committed rate shaping configuration</div><div class='add'>+ * @tx_er_shaper:	TX excess rate shaping configuration</div><div class='add'>+ * @coupled:		Committed and excess rate shapers are coupled</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dpni_set_tx_shaping(struct fsl_mc_io *mc_io,</div><div class='add'>+			u32 cmd_flags,</div><div class='add'>+			u16 token,</div><div class='add'>+			const struct dpni_tx_shaping_cfg *tx_cr_shaper,</div><div class='add'>+			const struct dpni_tx_shaping_cfg *tx_er_shaper,</div><div class='add'>+			int coupled)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_set_tx_shaping *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_TX_SHAPING,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_set_tx_shaping *)cmd.params;</div><div class='add'>+	cmd_params-&gt;tx_cr_max_burst_size = cpu_to_le16(tx_cr_shaper-&gt;max_burst_size);</div><div class='add'>+	cmd_params-&gt;tx_er_max_burst_size = cpu_to_le16(tx_er_shaper-&gt;max_burst_size);</div><div class='add'>+	cmd_params-&gt;tx_cr_rate_limit = cpu_to_le32(tx_cr_shaper-&gt;rate_limit);</div><div class='add'>+	cmd_params-&gt;tx_er_rate_limit = cpu_to_le32(tx_er_shaper-&gt;rate_limit);</div><div class='add'>+	dpni_set_field(cmd_params-&gt;coupled, COUPLED, coupled);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_get_single_step_cfg() - return current configuration for</div><div class='add'>+ *                              single step PTP</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @ptp_cfg:	ptp single step configuration</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+int dpni_get_single_step_cfg(struct fsl_mc_io *mc_io,</div><div class='add'>+			     u32 cmd_flags,</div><div class='add'>+			     u16 token,</div><div class='add'>+			     struct dpni_single_step_cfg *ptp_cfg)</div><div class='add'>+{</div><div class='add'>+	struct dpni_rsp_single_step_cfg *rsp_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_GET_SINGLE_STEP_CFG,</div><div class='add'>+					  cmd_flags, token);</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	err =  mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	/* read command response */</div><div class='add'>+	rsp_params = (struct dpni_rsp_single_step_cfg *)cmd.params;</div><div class='add'>+	ptp_cfg-&gt;offset = le16_to_cpu(rsp_params-&gt;offset);</div><div class='add'>+	ptp_cfg-&gt;en = dpni_get_field(le16_to_cpu(rsp_params-&gt;flags),</div><div class='add'>+				     PTP_ENABLE) ? 1 : 0;</div><div class='add'>+	ptp_cfg-&gt;ch_update = dpni_get_field(le16_to_cpu(rsp_params-&gt;flags),</div><div class='add'>+					    PTP_CH_UPDATE) ? 1 : 0;</div><div class='add'>+	ptp_cfg-&gt;peer_delay = le32_to_cpu(rsp_params-&gt;peer_delay);</div><div class='add'>+	ptp_cfg-&gt;ptp_onestep_reg_base =</div><div class='add'>+				  le32_to_cpu(rsp_params-&gt;ptp_onestep_reg_base);</div><div class='add'>+</div><div class='add'>+	return err;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dpni_set_single_step_cfg() - enable/disable and configure single step PTP</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPNI object</div><div class='add'>+ * @ptp_cfg:	ptp single step configuration</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ *</div><div class='add'>+ * The function has effect only when dpni object is connected to a dpmac</div><div class='add'>+ * object. If the dpni is not connected to a dpmac the configuration will</div><div class='add'>+ * be stored inside and applied when connection is made.</div><div class='add'>+ */</div><div class='add'>+int dpni_set_single_step_cfg(struct fsl_mc_io *mc_io,</div><div class='add'>+			     u32 cmd_flags,</div><div class='add'>+			     u16 token,</div><div class='add'>+			     struct dpni_single_step_cfg *ptp_cfg)</div><div class='add'>+{</div><div class='add'>+	struct dpni_cmd_single_step_cfg *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	u16 flags;</div><div class='add'>+</div><div class='add'>+	/* prepare command */</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPNI_CMDID_SET_SINGLE_STEP_CFG,</div><div class='add'>+					  cmd_flags, token);</div><div class='add'>+	cmd_params = (struct dpni_cmd_single_step_cfg *)cmd.params;</div><div class='add'>+	cmd_params-&gt;offset = cpu_to_le16(ptp_cfg-&gt;offset);</div><div class='add'>+	cmd_params-&gt;peer_delay = cpu_to_le32(ptp_cfg-&gt;peer_delay);</div><div class='add'>+</div><div class='add'>+	flags = le16_to_cpu(cmd_params-&gt;flags);</div><div class='add'>+	dpni_set_field(flags, PTP_ENABLE, !!ptp_cfg-&gt;en);</div><div class='add'>+	dpni_set_field(flags, PTP_CH_UPDATE, !!ptp_cfg-&gt;ch_update);</div><div class='add'>+	cmd_params-&gt;flags = cpu_to_le16(flags);</div><div class='add'>+</div><div class='add'>+	/* send command to mc*/</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpni.h b/drivers/net/ethernet/freescale/dpaa2/dpni.h<br/>index a521242e2353..5c0a1d5ac934 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpni.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dpni.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpni.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpni.h</a></div><div class='hunk'>@@ -1,6 +1,7 @@</div><div class='ctx'> /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */</div><div class='ctx'> /* Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='ctx'>  * Copyright 2016 NXP</div><div class='add'>+ * Copyright 2020 NXP</div><div class='ctx'>  */</div><div class='ctx'> #ifndef __FSL_DPNI_H</div><div class='ctx'> #define __FSL_DPNI_H</div><div class='hunk'>@@ -9,71 +10,78 @@</div><div class='ctx'> </div><div class='ctx'> struct fsl_mc_io;</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Data Path Network Interface API</div><div class='add'>+/* Data Path Network Interface API</div><div class='ctx'>  * Contains initialization APIs and runtime control APIs for DPNI</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> /** General DPNI macros */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Maximum number of traffic classes</div><div class='add'>+ * DPNI_MAX_TC - Maximum number of traffic classes</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_MAX_TC				8</div><div class='ctx'> /**</div><div class='del'>- * Maximum number of buffer pools per DPNI</div><div class='add'>+ * DPNI_MAX_DPBP - Maximum number of buffer pools per DPNI</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_MAX_DPBP				8</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * All traffic classes considered; see dpni_set_queue()</div><div class='add'>+ * DPNI_ALL_TCS - All traffic classes considered; see dpni_set_queue()</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ALL_TCS				(u8)(-1)</div><div class='ctx'> /**</div><div class='del'>- * All flows within traffic class considered; see dpni_set_queue()</div><div class='add'>+ * DPNI_ALL_TC_FLOWS - All flows within traffic class considered; see</div><div class='add'>+ * dpni_set_queue()</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ALL_TC_FLOWS			(u16)(-1)</div><div class='ctx'> /**</div><div class='del'>- * Generate new flow ID; see dpni_set_queue()</div><div class='add'>+ * DPNI_NEW_FLOW_ID - Generate new flow ID; see dpni_set_queue()</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_NEW_FLOW_ID			(u16)(-1)</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Tx traffic is always released to a buffer pool on transmit, there are no</div><div class='del'>- * resources allocated to have the frames confirmed back to the source after</div><div class='del'>- * transmission.</div><div class='add'>+ * DPNI_OPT_TX_FRM_RELEASE - Tx traffic is always released to a buffer pool on</div><div class='add'>+ * transmit, there are no resources allocated to have the frames confirmed back</div><div class='add'>+ * to the source after transmission.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_OPT_TX_FRM_RELEASE			0x000001</div><div class='ctx'> /**</div><div class='del'>- * Disables support for MAC address filtering for addresses other than primary</div><div class='del'>- * MAC address. This affects both unicast and multicast. Promiscuous mode can</div><div class='del'>- * still be enabled/disabled for both unicast and multicast. If promiscuous mode</div><div class='del'>- * is disabled, only traffic matching the primary MAC address will be accepted.</div><div class='add'>+ * DPNI_OPT_NO_MAC_FILTER - Disables support for MAC address filtering for</div><div class='add'>+ * addresses other than primary MAC address. This affects both unicast and</div><div class='add'>+ * multicast. Promiscuous mode can still be enabled/disabled for both unicast</div><div class='add'>+ * and multicast. If promiscuous mode is disabled, only traffic matching the</div><div class='add'>+ * primary MAC address will be accepted.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_OPT_NO_MAC_FILTER			0x000002</div><div class='ctx'> /**</div><div class='del'>- * Allocate policers for this DPNI. They can be used to rate-limit traffic per</div><div class='del'>- * traffic class (TC) basis.</div><div class='add'>+ * DPNI_OPT_HAS_POLICING - Allocate policers for this DPNI. They can be used to</div><div class='add'>+ * rate-limit traffic per traffic class (TC) basis.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_OPT_HAS_POLICING			0x000004</div><div class='ctx'> /**</div><div class='del'>- * Congestion can be managed in several ways, allowing the buffer pool to</div><div class='del'>- * deplete on ingress, taildrop on each queue or use congestion groups for sets</div><div class='del'>- * of queues. If set, it configures a single congestion groups across all TCs.</div><div class='del'>- * If reset, a congestion group is allocated for each TC. Only relevant if the</div><div class='del'>- * DPNI has multiple traffic classes.</div><div class='add'>+ * DPNI_OPT_SHARED_CONGESTION - Congestion can be managed in several ways,</div><div class='add'>+ * allowing the buffer pool to deplete on ingress, taildrop on each queue or</div><div class='add'>+ * use congestion groups for sets of queues. If set, it configures a single</div><div class='add'>+ * congestion groups across all TCs.  If reset, a congestion group is allocated</div><div class='add'>+ * for each TC. Only relevant if the DPNI has multiple traffic classes.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_OPT_SHARED_CONGESTION		0x000008</div><div class='ctx'> /**</div><div class='del'>- * Enables TCAM for Flow Steering and QoS look-ups. If not specified, all</div><div class='del'>- * look-ups are exact match. Note that TCAM is not available on LS1088 and its</div><div class='del'>- * variants. Setting this bit on these SoCs will trigger an error.</div><div class='add'>+ * DPNI_OPT_HAS_KEY_MASKING - Enables TCAM for Flow Steering and QoS look-ups.</div><div class='add'>+ * If not specified, all look-ups are exact match. Note that TCAM is not</div><div class='add'>+ * available on LS1088 and its variants. Setting this bit on these SoCs will</div><div class='add'>+ * trigger an error.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_OPT_HAS_KEY_MASKING		0x000010</div><div class='ctx'> /**</div><div class='del'>- * Disables the flow steering table.</div><div class='add'>+ * DPNI_OPT_NO_FS - Disables the flow steering table.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_OPT_NO_FS				0x000020</div><div class='add'>+/**</div><div class='add'>+ * DPNI_OPT_SHARED_FS - Flow steering table is shared between all traffic</div><div class='add'>+ * classes</div><div class='add'>+ */</div><div class='add'>+#define DPNI_OPT_SHARED_FS			0x001000</div><div class='ctx'> </div><div class='ctx'> int dpni_open(struct fsl_mc_io	*mc_io,</div><div class='ctx'> 	      u32		cmd_flags,</div><div class='hunk'>@@ -84,19 +92,28 @@ int dpni_close(struct fsl_mc_io	*mc_io,</div><div class='ctx'> 	       u32		cmd_flags,</div><div class='ctx'> 	       u16		token);</div><div class='ctx'> </div><div class='add'>+#define DPNI_POOL_ASSOC_QPRI	0</div><div class='add'>+#define DPNI_POOL_ASSOC_QDBIN	1</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct dpni_pools_cfg - Structure representing buffer pools configuration</div><div class='ctx'>  * @num_dpbp: Number of DPBPs</div><div class='add'>+ * @pool_options: Buffer assignment options.</div><div class='add'>+ *	This field is a combination of DPNI_POOL_ASSOC_flags</div><div class='ctx'>  * @pools: Array of buffer pools parameters; The number of valid entries</div><div class='ctx'>  *	must match 'num_dpbp' value</div><div class='ctx'>  * @pools.dpbp_id: DPBP object ID</div><div class='add'>+ * @pools.priority: Priority mask that indicates TC's used with this buffer.</div><div class='add'>+ *	If set to 0x00 MC will assume value 0xff.</div><div class='ctx'>  * @pools.buffer_size: Buffer size</div><div class='ctx'>  * @pools.backup_pool: Backup pool</div><div class='ctx'>  */</div><div class='ctx'> struct dpni_pools_cfg {</div><div class='ctx'> 	u8		num_dpbp;</div><div class='add'>+	u8		pool_options;</div><div class='ctx'> 	struct {</div><div class='ctx'> 		int	dpbp_id;</div><div class='add'>+		u8	priority_mask;</div><div class='ctx'> 		u16	buffer_size;</div><div class='ctx'> 		int	backup_pool;</div><div class='ctx'> 	} pools[DPNI_MAX_DPBP];</div><div class='hunk'>@@ -124,19 +141,16 @@ int dpni_reset(struct fsl_mc_io	*mc_io,</div><div class='ctx'> 	       u32		cmd_flags,</div><div class='ctx'> 	       u16		token);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * DPNI IRQ Index and Events</div><div class='del'>- */</div><div class='add'>+/* DPNI IRQ Index and Events */</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * IRQ index</div><div class='del'>- */</div><div class='ctx'> #define DPNI_IRQ_INDEX				0</div><div class='del'>-/**</div><div class='del'>- * IRQ event - indicates a change in link state</div><div class='del'>- */</div><div class='add'>+</div><div class='add'>+/* DPNI_IRQ_EVENT_LINK_CHANGED - indicates a change in link state */</div><div class='ctx'> #define DPNI_IRQ_EVENT_LINK_CHANGED		0x00000001</div><div class='ctx'> </div><div class='add'>+/* DPNI_IRQ_EVENT_ENDPOINT_CHANGED - indicates a change in endpoint */</div><div class='add'>+#define DPNI_IRQ_EVENT_ENDPOINT_CHANGED		0x00000002</div><div class='add'>+</div><div class='ctx'> int dpni_set_irq_enable(struct fsl_mc_io	*mc_io,</div><div class='ctx'> 			u32			cmd_flags,</div><div class='ctx'> 			u16			token,</div><div class='hunk'>@@ -214,32 +228,30 @@ int dpni_get_attributes(struct fsl_mc_io	*mc_io,</div><div class='ctx'> 			u16			token,</div><div class='ctx'> 			struct dpni_attr	*attr);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * DPNI errors</div><div class='del'>- */</div><div class='add'>+/* DPNI errors */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Extract out of frame header error</div><div class='add'>+ * DPNI_ERROR_EOFHE - Extract out of frame header error</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ERROR_EOFHE	0x00020000</div><div class='ctx'> /**</div><div class='del'>- * Frame length error</div><div class='add'>+ * DPNI_ERROR_FLE - Frame length error</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ERROR_FLE		0x00002000</div><div class='ctx'> /**</div><div class='del'>- * Frame physical error</div><div class='add'>+ * DPNI_ERROR_FPE - Frame physical error</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ERROR_FPE		0x00001000</div><div class='ctx'> /**</div><div class='del'>- * Parsing header error</div><div class='add'>+ * DPNI_ERROR_PHE - Parsing header error</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ERROR_PHE		0x00000020</div><div class='ctx'> /**</div><div class='del'>- * Parser L3 checksum error</div><div class='add'>+ * DPNI_ERROR_L3CE - Parser L3 checksum error</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ERROR_L3CE		0x00000004</div><div class='ctx'> /**</div><div class='del'>- * Parser L3 checksum error</div><div class='add'>+ * DPNI_ERROR_L4CE - Parser L3 checksum error</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_ERROR_L4CE		0x00000001</div><div class='ctx'> </div><div class='hunk'>@@ -273,36 +285,35 @@ int dpni_set_errors_behavior(struct fsl_mc_io		*mc_io,</div><div class='ctx'> 			     u16			token,</div><div class='ctx'> 			     struct dpni_error_cfg	*cfg);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * DPNI buffer layout modification options</div><div class='del'>- */</div><div class='add'>+/* DPNI buffer layout modification options */</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Select to modify the time-stamp setting</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_TIMESTAMP - Select to modify the time-stamp setting</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_TIMESTAMP		0x00000001</div><div class='ctx'> /**</div><div class='del'>- * Select to modify the parser-result setting; not applicable for Tx</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_PARSER_RESULT - Select to modify the parser-result</div><div class='add'>+ * setting; not applicable for Tx</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_PARSER_RESULT	0x00000002</div><div class='ctx'> /**</div><div class='del'>- * Select to modify the frame-status setting</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_FRAME_STATUS - Select to modify the frame-status setting</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_FRAME_STATUS	0x00000004</div><div class='ctx'> /**</div><div class='del'>- * Select to modify the private-data-size setting</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE - Select to modify the private-data-size setting</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_PRIVATE_DATA_SIZE	0x00000008</div><div class='ctx'> /**</div><div class='del'>- * Select to modify the data-alignment setting</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_DATA_ALIGN - Select to modify the data-alignment setting</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_DATA_ALIGN		0x00000010</div><div class='ctx'> /**</div><div class='del'>- * Select to modify the data-head-room setting</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_DATA_HEAD_ROOM - Select to modify the data-head-room setting</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_DATA_HEAD_ROOM	0x00000020</div><div class='ctx'> /**</div><div class='del'>- * Select to modify the data-tail-room setting</div><div class='add'>+ * DPNI_BUF_LAYOUT_OPT_DATA_TAIL_ROOM - Select to modify the data-tail-room setting</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_BUF_LAYOUT_OPT_DATA_TAIL_ROOM	0x00000040</div><div class='ctx'> </div><div class='hunk'>@@ -335,7 +346,8 @@ struct dpni_buffer_layout {</div><div class='ctx'>  * @DPNI_QUEUE_TX: Tx queue</div><div class='ctx'>  * @DPNI_QUEUE_TX_CONFIRM: Tx confirmation queue</div><div class='ctx'>  * @DPNI_QUEUE_RX_ERR: Rx error queue</div><div class='del'>- */enum dpni_queue_type {</div><div class='add'>+ */</div><div class='add'>+enum dpni_queue_type {</div><div class='ctx'> 	DPNI_QUEUE_RX,</div><div class='ctx'> 	DPNI_QUEUE_TX,</div><div class='ctx'> 	DPNI_QUEUE_TX_CONFIRM,</div><div class='hunk'>@@ -416,6 +428,26 @@ int dpni_get_tx_data_offset(struct fsl_mc_io	*mc_io,</div><div class='ctx'>  *	lack of buffers</div><div class='ctx'>  * @page_2.egress_discarded_frames: Egress discarded frame count</div><div class='ctx'>  * @page_2.egress_confirmed_frames: Egress confirmed frame count</div><div class='add'>+ * @page_3: Page_3 statistics structure</div><div class='add'>+ * @page_3.egress_dequeue_bytes: Cumulative count of the number of bytes</div><div class='add'>+ *	dequeued from egress FQs</div><div class='add'>+ * @page_3.egress_dequeue_frames: Cumulative count of the number of frames</div><div class='add'>+ *	dequeued from egress FQs</div><div class='add'>+ * @page_3.egress_reject_bytes: Cumulative count of the number of bytes in</div><div class='add'>+ *	egress frames whose enqueue was rejected</div><div class='add'>+ * @page_3.egress_reject_frames: Cumulative count of the number of egress</div><div class='add'>+ *	frames whose enqueue was rejected</div><div class='add'>+ * @page_4: Page_4 statistics structure: congestion points</div><div class='add'>+ * @page_4.cgr_reject_frames: number of rejected frames due to congestion point</div><div class='add'>+ * @page_4.cgr_reject_bytes: number of rejected bytes due to congestion point</div><div class='add'>+ * @page_5: Page_5 statistics structure: policer</div><div class='add'>+ * @page_5.policer_cnt_red: NUmber of red colored frames</div><div class='add'>+ * @page_5.policer_cnt_yellow: number of yellow colored frames</div><div class='add'>+ * @page_5.policer_cnt_green: number of green colored frames</div><div class='add'>+ * @page_5.policer_cnt_re_red: number of recolored red frames</div><div class='add'>+ * @page_5.policer_cnt_re_yellow: number of recolored yellow frames</div><div class='add'>+ * @page_6: Page_6 statistics structure</div><div class='add'>+ * @page_6.tx_pending_frames: total number of frames pending in egress FQs</div><div class='ctx'>  * @raw: raw statistics structure, used to index counters</div><div class='ctx'>  */</div><div class='ctx'> union dpni_statistics {</div><div class='hunk'>@@ -443,6 +475,26 @@ union dpni_statistics {</div><div class='ctx'> 		u64 egress_confirmed_frames;</div><div class='ctx'> 	} page_2;</div><div class='ctx'> 	struct {</div><div class='add'>+		u64 egress_dequeue_bytes;</div><div class='add'>+		u64 egress_dequeue_frames;</div><div class='add'>+		u64 egress_reject_bytes;</div><div class='add'>+		u64 egress_reject_frames;</div><div class='add'>+	} page_3;</div><div class='add'>+	struct {</div><div class='add'>+		u64 cgr_reject_frames;</div><div class='add'>+		u64 cgr_reject_bytes;</div><div class='add'>+	} page_4;</div><div class='add'>+	struct {</div><div class='add'>+		u64 policer_cnt_red;</div><div class='add'>+		u64 policer_cnt_yellow;</div><div class='add'>+		u64 policer_cnt_green;</div><div class='add'>+		u64 policer_cnt_re_red;</div><div class='add'>+		u64 policer_cnt_re_yellow;</div><div class='add'>+	} page_5;</div><div class='add'>+	struct {</div><div class='add'>+		u64 tx_pending_frames;</div><div class='add'>+	} page_6;</div><div class='add'>+	struct {</div><div class='ctx'> 		u64 counter[DPNI_STATISTICS_CNT];</div><div class='ctx'> 	} raw;</div><div class='ctx'> };</div><div class='hunk'>@@ -453,25 +505,14 @@ int dpni_get_statistics(struct fsl_mc_io	*mc_io,</div><div class='ctx'> 			u8			page,</div><div class='ctx'> 			union dpni_statistics	*stat);</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Enable auto-negotiation</div><div class='del'>- */</div><div class='ctx'> #define DPNI_LINK_OPT_AUTONEG		0x0000000000000001ULL</div><div class='del'>-/**</div><div class='del'>- * Enable half-duplex mode</div><div class='del'>- */</div><div class='ctx'> #define DPNI_LINK_OPT_HALF_DUPLEX	0x0000000000000002ULL</div><div class='del'>-/**</div><div class='del'>- * Enable pause frames</div><div class='del'>- */</div><div class='ctx'> #define DPNI_LINK_OPT_PAUSE		0x0000000000000004ULL</div><div class='del'>-/**</div><div class='del'>- * Enable a-symmetric pause frames</div><div class='del'>- */</div><div class='ctx'> #define DPNI_LINK_OPT_ASYM_PAUSE	0x0000000000000008ULL</div><div class='add'>+#define DPNI_LINK_OPT_PFC_PAUSE		0x0000000000000010ULL</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * struct - Structure representing DPNI link configuration</div><div class='add'>+ * struct dpni_link_cfg - Structure representing DPNI link configuration</div><div class='ctx'>  * @rate: Rate</div><div class='ctx'>  * @options: Mask of available options; use 'DPNI_LINK_OPT_&lt;X&gt;' values</div><div class='ctx'>  */</div><div class='hunk'>@@ -485,6 +526,11 @@ int dpni_set_link_cfg(struct fsl_mc_io			*mc_io,</div><div class='ctx'> 		      u16				token,</div><div class='ctx'> 		      const struct dpni_link_cfg	*cfg);</div><div class='ctx'> </div><div class='add'>+int dpni_get_link_cfg(struct fsl_mc_io			*mc_io,</div><div class='add'>+		      u32				cmd_flags,</div><div class='add'>+		      u16				token,</div><div class='add'>+		      struct dpni_link_cfg		*cfg);</div><div class='add'>+</div><div class='ctx'> /**</div><div class='ctx'>  * struct dpni_link_state - Structure representing DPNI link state</div><div class='ctx'>  * @rate: Rate</div><div class='hunk'>@@ -629,8 +675,8 @@ int dpni_set_rx_tc_dist(struct fsl_mc_io			*mc_io,</div><div class='ctx'> 			const struct dpni_rx_tc_dist_cfg	*cfg);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * When used for fs_miss_flow_id in function dpni_set_rx_dist,</div><div class='del'>- * will signal to dpni to drop all unclassified frames</div><div class='add'>+ * DPNI_FS_MISS_DROP - When used for fs_miss_flow_id in function</div><div class='add'>+ * dpni_set_rx_dist, will signal to dpni to drop all unclassified frames</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_FS_MISS_DROP		((uint16_t)-1)</div><div class='ctx'> </div><div class='hunk'>@@ -668,6 +714,26 @@ int dpni_set_rx_hash_dist(struct fsl_mc_io *mc_io,</div><div class='ctx'> 			  const struct dpni_rx_dist_cfg *cfg);</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct dpni_qos_tbl_cfg - Structure representing QOS table configuration</div><div class='add'>+ * @key_cfg_iova: I/O virtual address of 256 bytes DMA-able memory filled with</div><div class='add'>+ *		key extractions to be used as the QoS criteria by calling</div><div class='add'>+ *		dpkg_prepare_key_cfg()</div><div class='add'>+ * @discard_on_miss: Set to '1' to discard frames in case of no match (miss);</div><div class='add'>+ *		'0' to use the 'default_tc' in such cases</div><div class='add'>+ * @default_tc: Used in case of no-match and 'discard_on_miss'= 0</div><div class='add'>+ */</div><div class='add'>+struct dpni_qos_tbl_cfg {</div><div class='add'>+	u64 key_cfg_iova;</div><div class='add'>+	int discard_on_miss;</div><div class='add'>+	u8 default_tc;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpni_set_qos_table(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       const struct dpni_qos_tbl_cfg *cfg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * enum dpni_dest - DPNI destination types</div><div class='ctx'>  * @DPNI_DEST_NONE: Unassigned destination; The queue is set in parked mode and</div><div class='ctx'>  *		does not generate FQDAN notifications; user is expected to</div><div class='hunk'>@@ -688,7 +754,7 @@ enum dpni_dest {</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='ctx'>  * struct dpni_queue - Queue structure</div><div class='del'>- * @destination - Destination structure</div><div class='add'>+ * @destination: - Destination structure</div><div class='ctx'>  * @destination.id: ID of the destination, only relevant if DEST_TYPE is &gt; 0.</div><div class='ctx'>  *	Identifies either a DPIO or a DPCON object.</div><div class='ctx'>  *	Not relevant for Tx queues.</div><div class='hunk'>@@ -759,9 +825,7 @@ struct dpni_queue_id {</div><div class='ctx'> 	u16 qdbin;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-/**</div><div class='del'>- * Set User Context</div><div class='del'>- */</div><div class='add'>+/* Set User Context */</div><div class='ctx'> #define DPNI_QUEUE_OPT_USER_CTX		0x00000001</div><div class='ctx'> #define DPNI_QUEUE_OPT_DEST		0x00000002</div><div class='ctx'> #define DPNI_QUEUE_OPT_FLC		0x00000004</div><div class='hunk'>@@ -810,6 +874,62 @@ enum dpni_congestion_point {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='add'>+ * struct dpni_dest_cfg - Structure representing DPNI destination parameters</div><div class='add'>+ * @dest_type:	Destination type</div><div class='add'>+ * @dest_id:	Either DPIO ID or DPCON ID, depending on the destination type</div><div class='add'>+ * @priority:	Priority selection within the DPIO or DPCON channel; valid</div><div class='add'>+ *		values are 0-1 or 0-7, depending on the number of priorities</div><div class='add'>+ *		in that channel; not relevant for 'DPNI_DEST_NONE' option</div><div class='add'>+ */</div><div class='add'>+struct dpni_dest_cfg {</div><div class='add'>+	enum dpni_dest dest_type;</div><div class='add'>+	int dest_id;</div><div class='add'>+	u8 priority;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+/* DPNI congestion options */</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * DPNI_CONG_OPT_FLOW_CONTROL - This congestion will trigger flow control or</div><div class='add'>+ * priority flow control.  This will have effect only if flow control is</div><div class='add'>+ * enabled with dpni_set_link_cfg().</div><div class='add'>+ */</div><div class='add'>+#define DPNI_CONG_OPT_FLOW_CONTROL		0x00000040</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dpni_congestion_notification_cfg - congestion notification</div><div class='add'>+ *					configuration</div><div class='add'>+ * @units: Units type</div><div class='add'>+ * @threshold_entry: Above this threshold we enter a congestion state.</div><div class='add'>+ *		set it to '0' to disable it</div><div class='add'>+ * @threshold_exit: Below this threshold we exit the congestion state.</div><div class='add'>+ * @message_ctx: The context that will be part of the CSCN message</div><div class='add'>+ * @message_iova: I/O virtual address (must be in DMA-able memory),</div><div class='add'>+ *		must be 16B aligned; valid only if 'DPNI_CONG_OPT_WRITE_MEM_&lt;X&gt;'</div><div class='add'>+ *		is contained in 'options'</div><div class='add'>+ * @dest_cfg: CSCN can be send to either DPIO or DPCON WQ channel</div><div class='add'>+ * @notification_mode: Mask of available options; use 'DPNI_CONG_OPT_&lt;X&gt;' values</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+struct dpni_congestion_notification_cfg {</div><div class='add'>+	enum dpni_congestion_unit units;</div><div class='add'>+	u32 threshold_entry;</div><div class='add'>+	u32 threshold_exit;</div><div class='add'>+	u64 message_ctx;</div><div class='add'>+	u64 message_iova;</div><div class='add'>+	struct dpni_dest_cfg dest_cfg;</div><div class='add'>+	u16 notification_mode;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpni_set_congestion_notification(</div><div class='add'>+			struct fsl_mc_io *mc_io,</div><div class='add'>+			u32 cmd_flags,</div><div class='add'>+			u16 token,</div><div class='add'>+			enum dpni_queue_type qtype,</div><div class='add'>+			u8 tc_id,</div><div class='add'>+			const struct dpni_congestion_notification_cfg *cfg);</div><div class='add'>+</div><div class='add'>+/**</div><div class='ctx'>  * struct dpni_taildrop - Structure representing the taildrop</div><div class='ctx'>  * @enable:	Indicates whether the taildrop is active or not.</div><div class='ctx'>  * @units:	Indicates the unit of THRESHOLD. Queue taildrop only supports</div><div class='hunk'>@@ -856,23 +976,24 @@ struct dpni_rule_cfg {</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Discard matching traffic. If set, this takes precedence over any other</div><div class='del'>- * configuration and matching traffic is always discarded.</div><div class='add'>+ * DPNI_FS_OPT_DISCARD - Discard matching traffic. If set, this takes</div><div class='add'>+ * precedence over any other configuration and matching traffic is always</div><div class='add'>+ * discarded.</div><div class='ctx'>  */</div><div class='ctx'>  #define DPNI_FS_OPT_DISCARD            0x1</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Set FLC value. If set, flc member of struct dpni_fs_action_cfg is used to</div><div class='del'>- * override the FLC value set per queue.</div><div class='add'>+ * DPNI_FS_OPT_SET_FLC - Set FLC value. If set, flc member of struct</div><div class='add'>+ * dpni_fs_action_cfg is used to override the FLC value set per queue.</div><div class='ctx'>  * For more details check the Frame Descriptor section in the hardware</div><div class='ctx'>  * documentation.</div><div class='ctx'>  */</div><div class='ctx'> #define DPNI_FS_OPT_SET_FLC            0x2</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * Indicates whether the 6 lowest significant bits of FLC are used for stash</div><div class='del'>- * control. If set, the 6 least significant bits in value are interpreted as</div><div class='del'>- * follows:</div><div class='add'>+ * DPNI_FS_OPT_SET_STASH_CONTROL - Indicates whether the 6 lowest significant</div><div class='add'>+ * bits of FLC are used for stash control. If set, the 6 least significant bits</div><div class='add'>+ * in value are interpreted as follows:</div><div class='ctx'>  *     - bits 0-1: indicates the number of 64 byte units of context that are</div><div class='ctx'>  *     stashed. FLC value is interpreted as a memory address in this case,</div><div class='ctx'>  *     excluding the 6 LS bits.</div><div class='hunk'>@@ -913,9 +1034,86 @@ int dpni_remove_fs_entry(struct fsl_mc_io *mc_io,</div><div class='ctx'> 			 u8 tc_id,</div><div class='ctx'> 			 const struct dpni_rule_cfg *cfg);</div><div class='ctx'> </div><div class='add'>+int dpni_add_qos_entry(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       const struct dpni_rule_cfg *cfg,</div><div class='add'>+		       u8 tc_id,</div><div class='add'>+		       u16 index);</div><div class='add'>+</div><div class='add'>+int dpni_remove_qos_entry(struct fsl_mc_io *mc_io,</div><div class='add'>+			  u32 cmd_flags,</div><div class='add'>+			  u16 token,</div><div class='add'>+			  const struct dpni_rule_cfg *cfg);</div><div class='add'>+</div><div class='add'>+int dpni_clear_qos_table(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token);</div><div class='add'>+</div><div class='ctx'> int dpni_get_api_version(struct fsl_mc_io *mc_io,</div><div class='ctx'> 			 u32 cmd_flags,</div><div class='ctx'> 			 u16 *major_ver,</div><div class='ctx'> 			 u16 *minor_ver);</div><div class='add'>+/**</div><div class='add'>+ * struct dpni_tx_shaping_cfg - Structure representing DPNI tx shaping configuration</div><div class='add'>+ * @rate_limit:		Rate in Mbps</div><div class='add'>+ * @max_burst_size:	Burst size in bytes (up to 64KB)</div><div class='add'>+ */</div><div class='add'>+struct dpni_tx_shaping_cfg {</div><div class='add'>+	u32 rate_limit;</div><div class='add'>+	u16 max_burst_size;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpni_set_tx_shaping(struct fsl_mc_io *mc_io,</div><div class='add'>+			u32 cmd_flags,</div><div class='add'>+			u16 token,</div><div class='add'>+			const struct dpni_tx_shaping_cfg *tx_cr_shaper,</div><div class='add'>+			const struct dpni_tx_shaping_cfg *tx_er_shaper,</div><div class='add'>+			int coupled);</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * struct dpni_single_step_cfg - configure single step PTP (IEEE 1588)</div><div class='add'>+ * @en:		enable single step PTP. When enabled the PTPv1 functionality</div><div class='add'>+ *		will not work. If the field is zero, offset and ch_update</div><div class='add'>+ *		parameters will be ignored</div><div class='add'>+ * @offset:	start offset from the beginning of the frame where</div><div class='add'>+ *		timestamp field is found. The offset must respect all MAC</div><div class='add'>+ *		headers, VLAN tags and other protocol headers</div><div class='add'>+ * @ch_update:	when set UDP checksum will be updated inside packet</div><div class='add'>+ * @peer_delay:	For peer-to-peer transparent clocks add this value to the</div><div class='add'>+ *		correction field in addition to the transient time update.</div><div class='add'>+ *		The value expresses nanoseconds.</div><div class='add'>+ * @ptp_onestep_reg_base: 1588 SINGLE_STEP register base address. This address</div><div class='add'>+ *			  is used to update directly the register contents.</div><div class='add'>+ *			  User has to create an address mapping for it.</div><div class='add'>+ *</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+struct dpni_single_step_cfg {</div><div class='add'>+	u8	en;</div><div class='add'>+	u8	ch_update;</div><div class='add'>+	u16	offset;</div><div class='add'>+	u32	peer_delay;</div><div class='add'>+	u32	ptp_onestep_reg_base;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+int dpni_set_single_step_cfg(struct fsl_mc_io *mc_io,</div><div class='add'>+			     u32 cmd_flags,</div><div class='add'>+			     u16 token,</div><div class='add'>+			     struct dpni_single_step_cfg *ptp_cfg);</div><div class='add'>+</div><div class='add'>+int dpni_get_single_step_cfg(struct fsl_mc_io *mc_io,</div><div class='add'>+			     u32 cmd_flags,</div><div class='add'>+			     u16 token,</div><div class='add'>+			     struct dpni_single_step_cfg *ptp_cfg);</div><div class='add'>+</div><div class='add'>+int dpni_enable_vlan_filter(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+			    u32 en);</div><div class='add'>+</div><div class='add'>+int dpni_add_vlan_id(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+		     u16 vlan_id, u8 flags, u8 tc_id, u8 flow_id);</div><div class='add'>+</div><div class='add'>+int dpni_remove_vlan_id(struct fsl_mc_io *mc_io, u32 cmd_flags, u16 token,</div><div class='add'>+			u16 vlan_id);</div><div class='ctx'> </div><div class='ctx'> #endif /* __FSL_DPNI_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h<br/>index 9af4ac71f347..96ffeb948f08 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='ctx'>  * Copyright 2016-2018 NXP</div><div class='hunk'>@@ -9,30 +9,64 @@</div><div class='ctx'> </div><div class='ctx'> /* Command versioning */</div><div class='ctx'> #define DPRTC_CMD_BASE_VERSION		1</div><div class='add'>+#define DPRTC_CMD_VERSION_2		2</div><div class='ctx'> #define DPRTC_CMD_ID_OFFSET		4</div><div class='ctx'> </div><div class='ctx'> #define DPRTC_CMD(id)	(((id) &lt;&lt; DPRTC_CMD_ID_OFFSET) | DPRTC_CMD_BASE_VERSION)</div><div class='add'>+#define DPRTC_CMD_V2(id) (((id) &lt;&lt; DPRTC_CMD_ID_OFFSET) | DPRTC_CMD_VERSION_2)</div><div class='ctx'> </div><div class='ctx'> /* Command IDs */</div><div class='ctx'> #define DPRTC_CMDID_CLOSE			DPRTC_CMD(0x800)</div><div class='ctx'> #define DPRTC_CMDID_OPEN			DPRTC_CMD(0x810)</div><div class='ctx'> </div><div class='del'>-#define DPRTC_CMDID_SET_FREQ_COMPENSATION	DPRTC_CMD(0x1d1)</div><div class='del'>-#define DPRTC_CMDID_GET_FREQ_COMPENSATION	DPRTC_CMD(0x1d2)</div><div class='del'>-#define DPRTC_CMDID_GET_TIME			DPRTC_CMD(0x1d3)</div><div class='del'>-#define DPRTC_CMDID_SET_TIME			DPRTC_CMD(0x1d4)</div><div class='add'>+#define DPRTC_CMDID_SET_IRQ_ENABLE		DPRTC_CMD(0x012)</div><div class='add'>+#define DPRTC_CMDID_GET_IRQ_ENABLE		DPRTC_CMD(0x013)</div><div class='add'>+#define DPRTC_CMDID_SET_IRQ_MASK		DPRTC_CMD_V2(0x014)</div><div class='add'>+#define DPRTC_CMDID_GET_IRQ_MASK		DPRTC_CMD(0x015)</div><div class='add'>+#define DPRTC_CMDID_GET_IRQ_STATUS		DPRTC_CMD(0x016)</div><div class='add'>+#define DPRTC_CMDID_CLEAR_IRQ_STATUS		DPRTC_CMD(0x017)</div><div class='ctx'> </div><div class='ctx'> #pragma pack(push, 1)</div><div class='ctx'> struct dprtc_cmd_open {</div><div class='ctx'> 	__le32 dprtc_id;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dprtc_get_freq_compensation {</div><div class='del'>-	__le32 freq_compensation;</div><div class='add'>+struct dprtc_cmd_get_irq {</div><div class='add'>+	__le32 pad;</div><div class='add'>+	u8 irq_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='del'>-struct dprtc_time {</div><div class='del'>-	__le64 time;</div><div class='add'>+struct dprtc_cmd_set_irq_enable {</div><div class='add'>+	u8 en;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u8 irq_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dprtc_rsp_get_irq_enable {</div><div class='add'>+	u8 en;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dprtc_cmd_set_irq_mask {</div><div class='add'>+	__le32 mask;</div><div class='add'>+	u8 irq_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dprtc_rsp_get_irq_mask {</div><div class='add'>+	__le32 mask;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dprtc_cmd_get_irq_status {</div><div class='add'>+	__le32 status;</div><div class='add'>+	u8 irq_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dprtc_rsp_get_irq_status {</div><div class='add'>+	__le32 status;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dprtc_cmd_clear_irq_status {</div><div class='add'>+	__le32 status;</div><div class='add'>+	u8 irq_index;</div><div class='ctx'> };</div><div class='ctx'> </div><div class='ctx'> #pragma pack(pop)</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dprtc.c b/drivers/net/ethernet/freescale/dpaa2/dprtc.c<br/>index c13e09bc7b9d..ed52a34fa6a1 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dprtc.c?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dprtc.c</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dprtc.c?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dprtc.c</a></div><div class='hunk'>@@ -74,121 +74,220 @@ int dprtc_close(struct fsl_mc_io *mc_io,</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dprtc_set_freq_compensation() - Sets a new frequency compensation value.</div><div class='add'>+ * dprtc_set_irq_enable() - Set overall interrupt state.</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPRTC object</div><div class='add'>+ * @irq_index:	The interrupt index to configure</div><div class='add'>+ * @en:		Interrupt state - enable = 1, disable = 0</div><div class='ctx'>  *</div><div class='del'>- * @mc_io:		Pointer to MC portal's I/O object</div><div class='del'>- * @cmd_flags:		Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='del'>- * @token:		Token of DPRTC object</div><div class='del'>- * @freq_compensation:	The new frequency compensation value to set.</div><div class='add'>+ * Allows GPP software to control when interrupts are generated.</div><div class='add'>+ * Each interrupt can have up to 32 causes.  The enable/disable control's the</div><div class='add'>+ * overall interrupt state. if the interrupt is disabled no causes will cause</div><div class='add'>+ * an interrupt.</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-int dprtc_set_freq_compensation(struct fsl_mc_io *mc_io,</div><div class='del'>-				u32 cmd_flags,</div><div class='del'>-				u16 token,</div><div class='del'>-				u32 freq_compensation)</div><div class='add'>+int dprtc_set_irq_enable(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 u8 irq_index,</div><div class='add'>+			 u8 en)</div><div class='ctx'> {</div><div class='del'>-	struct dprtc_get_freq_compensation *cmd_params;</div><div class='add'>+	struct dprtc_cmd_set_irq_enable *cmd_params;</div><div class='ctx'> 	struct fsl_mc_command cmd = { 0 };</div><div class='ctx'> </div><div class='del'>-	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_SET_FREQ_COMPENSATION,</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_SET_IRQ_ENABLE,</div><div class='ctx'> 					  cmd_flags,</div><div class='ctx'> 					  token);</div><div class='del'>-	cmd_params = (struct dprtc_get_freq_compensation *)cmd.params;</div><div class='del'>-	cmd_params-&gt;freq_compensation = cpu_to_le32(freq_compensation);</div><div class='add'>+	cmd_params = (struct dprtc_cmd_set_irq_enable *)cmd.params;</div><div class='add'>+	cmd_params-&gt;irq_index = irq_index;</div><div class='add'>+	cmd_params-&gt;en = en;</div><div class='ctx'> </div><div class='ctx'> 	return mc_send_command(mc_io, &amp;cmd);</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dprtc_get_freq_compensation() - Retrieves the frequency compensation value</div><div class='add'>+ * dprtc_get_irq_enable() - Get overall interrupt state</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPRTC object</div><div class='add'>+ * @irq_index:	The interrupt index to configure</div><div class='add'>+ * @en:		Returned interrupt state - enable = 1, disable = 0</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dprtc_get_irq_enable(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 u8 irq_index,</div><div class='add'>+			 u8 *en)</div><div class='add'>+{</div><div class='add'>+	struct dprtc_rsp_get_irq_enable *rsp_params;</div><div class='add'>+	struct dprtc_cmd_get_irq *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+	int err;</div><div class='add'>+</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_GET_IRQ_ENABLE,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dprtc_cmd_get_irq *)cmd.params;</div><div class='add'>+	cmd_params-&gt;irq_index = irq_index;</div><div class='add'>+</div><div class='add'>+	err = mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+	if (err)</div><div class='add'>+		return err;</div><div class='add'>+</div><div class='add'>+	rsp_params = (struct dprtc_rsp_get_irq_enable *)cmd.params;</div><div class='add'>+	*en = rsp_params-&gt;en;</div><div class='add'>+</div><div class='add'>+	return 0;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dprtc_set_irq_mask() - Set interrupt mask.</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPRTC object</div><div class='add'>+ * @irq_index:	The interrupt index to configure</div><div class='add'>+ * @mask:	Event mask to trigger interrupt;</div><div class='add'>+ *		each bit:</div><div class='add'>+ *			0 = ignore event</div><div class='add'>+ *			1 = consider event for asserting IRQ</div><div class='add'>+ *</div><div class='add'>+ * Every interrupt can have up to 32 causes and the interrupt model supports</div><div class='add'>+ * masking/unmasking each cause independently</div><div class='add'>+ *</div><div class='add'>+ * Return:	'0' on Success; Error code otherwise.</div><div class='add'>+ */</div><div class='add'>+int dprtc_set_irq_mask(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       u8 irq_index,</div><div class='add'>+		       u32 mask)</div><div class='add'>+{</div><div class='add'>+	struct dprtc_cmd_set_irq_mask *cmd_params;</div><div class='add'>+	struct fsl_mc_command cmd = { 0 };</div><div class='add'>+</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_SET_IRQ_MASK,</div><div class='add'>+					  cmd_flags,</div><div class='add'>+					  token);</div><div class='add'>+	cmd_params = (struct dprtc_cmd_set_irq_mask *)cmd.params;</div><div class='add'>+	cmd_params-&gt;mask = cpu_to_le32(mask);</div><div class='add'>+	cmd_params-&gt;irq_index = irq_index;</div><div class='add'>+</div><div class='add'>+	return mc_send_command(mc_io, &amp;cmd);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/**</div><div class='add'>+ * dprtc_get_irq_mask() - Get interrupt mask.</div><div class='add'>+ * @mc_io:	Pointer to MC portal's I/O object</div><div class='add'>+ * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='add'>+ * @token:	Token of DPRTC object</div><div class='add'>+ * @irq_index:	The interrupt index to configure</div><div class='add'>+ * @mask:	Returned event mask to trigger interrupt</div><div class='ctx'>  *</div><div class='del'>- * @mc_io:		Pointer to MC portal's I/O object</div><div class='del'>- * @cmd_flags:		Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='del'>- * @token:		Token of DPRTC object</div><div class='del'>- * @freq_compensation:	Frequency compensation value</div><div class='add'>+ * Every interrupt can have up to 32 causes and the interrupt model supports</div><div class='add'>+ * masking/unmasking each cause independently</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-int dprtc_get_freq_compensation(struct fsl_mc_io *mc_io,</div><div class='del'>-				u32 cmd_flags,</div><div class='del'>-				u16 token,</div><div class='del'>-				u32 *freq_compensation)</div><div class='add'>+int dprtc_get_irq_mask(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       u8 irq_index,</div><div class='add'>+		       u32 *mask)</div><div class='ctx'> {</div><div class='del'>-	struct dprtc_get_freq_compensation *rsp_params;</div><div class='add'>+	struct dprtc_rsp_get_irq_mask *rsp_params;</div><div class='add'>+	struct dprtc_cmd_get_irq *cmd_params;</div><div class='ctx'> 	struct fsl_mc_command cmd = { 0 };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_GET_FREQ_COMPENSATION,</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_GET_IRQ_MASK,</div><div class='ctx'> 					  cmd_flags,</div><div class='ctx'> 					  token);</div><div class='add'>+	cmd_params = (struct dprtc_cmd_get_irq *)cmd.params;</div><div class='add'>+	cmd_params-&gt;irq_index = irq_index;</div><div class='ctx'> </div><div class='ctx'> 	err = mc_send_command(mc_io, &amp;cmd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	rsp_params = (struct dprtc_get_freq_compensation *)cmd.params;</div><div class='del'>-	*freq_compensation = le32_to_cpu(rsp_params-&gt;freq_compensation);</div><div class='add'>+	rsp_params = (struct dprtc_rsp_get_irq_mask *)cmd.params;</div><div class='add'>+	*mask = le32_to_cpu(rsp_params-&gt;mask);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dprtc_get_time() - Returns the current RTC time.</div><div class='add'>+ * dprtc_get_irq_status() - Get the current status of any pending interrupts.</div><div class='ctx'>  *</div><div class='ctx'>  * @mc_io:	Pointer to MC portal's I/O object</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='ctx'>  * @token:	Token of DPRTC object</div><div class='del'>- * @time:	Current RTC time.</div><div class='add'>+ * @irq_index:	The interrupt index to configure</div><div class='add'>+ * @status:	Returned interrupts status - one bit per cause:</div><div class='add'>+ *			0 = no interrupt pending</div><div class='add'>+ *			1 = interrupt pending</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-int dprtc_get_time(struct fsl_mc_io *mc_io,</div><div class='del'>-		   u32 cmd_flags,</div><div class='del'>-		   u16 token,</div><div class='del'>-		   uint64_t *time)</div><div class='add'>+int dprtc_get_irq_status(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 u8 irq_index,</div><div class='add'>+			 u32 *status)</div><div class='ctx'> {</div><div class='del'>-	struct dprtc_time *rsp_params;</div><div class='add'>+	struct dprtc_cmd_get_irq_status *cmd_params;</div><div class='add'>+	struct dprtc_rsp_get_irq_status *rsp_params;</div><div class='ctx'> 	struct fsl_mc_command cmd = { 0 };</div><div class='ctx'> 	int err;</div><div class='ctx'> </div><div class='del'>-	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_GET_TIME,</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_GET_IRQ_STATUS,</div><div class='ctx'> 					  cmd_flags,</div><div class='ctx'> 					  token);</div><div class='add'>+	cmd_params = (struct dprtc_cmd_get_irq_status *)cmd.params;</div><div class='add'>+	cmd_params-&gt;status = cpu_to_le32(*status);</div><div class='add'>+	cmd_params-&gt;irq_index = irq_index;</div><div class='ctx'> </div><div class='ctx'> 	err = mc_send_command(mc_io, &amp;cmd);</div><div class='ctx'> 	if (err)</div><div class='ctx'> 		return err;</div><div class='ctx'> </div><div class='del'>-	rsp_params = (struct dprtc_time *)cmd.params;</div><div class='del'>-	*time = le64_to_cpu(rsp_params-&gt;time);</div><div class='add'>+	rsp_params = (struct dprtc_rsp_get_irq_status *)cmd.params;</div><div class='add'>+	*status = le32_to_cpu(rsp_params-&gt;status);</div><div class='ctx'> </div><div class='ctx'> 	return 0;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='ctx'> /**</div><div class='del'>- * dprtc_set_time() - Updates current RTC time.</div><div class='add'>+ * dprtc_clear_irq_status() - Clear a pending interrupt's status</div><div class='ctx'>  *</div><div class='ctx'>  * @mc_io:	Pointer to MC portal's I/O object</div><div class='ctx'>  * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'</div><div class='ctx'>  * @token:	Token of DPRTC object</div><div class='del'>- * @time:	New RTC time.</div><div class='add'>+ * @irq_index:	The interrupt index to configure</div><div class='add'>+ * @status:	Bits to clear (W1C) - one bit per cause:</div><div class='add'>+ *			0 = don't change</div><div class='add'>+ *			1 = clear status bit</div><div class='ctx'>  *</div><div class='ctx'>  * Return:	'0' on Success; Error code otherwise.</div><div class='ctx'>  */</div><div class='del'>-int dprtc_set_time(struct fsl_mc_io *mc_io,</div><div class='del'>-		   u32 cmd_flags,</div><div class='del'>-		   u16 token,</div><div class='del'>-		   uint64_t time)</div><div class='add'>+int dprtc_clear_irq_status(struct fsl_mc_io *mc_io,</div><div class='add'>+			   u32 cmd_flags,</div><div class='add'>+			   u16 token,</div><div class='add'>+			   u8 irq_index,</div><div class='add'>+			   u32 status)</div><div class='ctx'> {</div><div class='del'>-	struct dprtc_time *cmd_params;</div><div class='add'>+	struct dprtc_cmd_clear_irq_status *cmd_params;</div><div class='ctx'> 	struct fsl_mc_command cmd = { 0 };</div><div class='ctx'> </div><div class='del'>-	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_SET_TIME,</div><div class='add'>+	cmd.header = mc_encode_cmd_header(DPRTC_CMDID_CLEAR_IRQ_STATUS,</div><div class='ctx'> 					  cmd_flags,</div><div class='ctx'> 					  token);</div><div class='del'>-	cmd_params = (struct dprtc_time *)cmd.params;</div><div class='del'>-	cmd_params-&gt;time = cpu_to_le64(time);</div><div class='add'>+	cmd_params = (struct dprtc_cmd_clear_irq_status *)cmd.params;</div><div class='add'>+	cmd_params-&gt;irq_index = irq_index;</div><div class='add'>+	cmd_params-&gt;status = cpu_to_le32(status);</div><div class='ctx'> </div><div class='ctx'> 	return mc_send_command(mc_io, &amp;cmd);</div><div class='ctx'> }</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dprtc.h b/drivers/net/ethernet/freescale/dpaa2/dprtc.h<br/>index fe19618d6cdf..01d77c685a5b 100644<br/>--- a/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dprtc.h?id=52fa7bf9eadac744eff74d71234c785aade6032f'>drivers/net/ethernet/freescale/dpaa2/dprtc.h</a><br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dprtc.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dprtc.h</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-// SPDX-License-Identifier: GPL-2.0</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='ctx'> /*</div><div class='ctx'>  * Copyright 2013-2016 Freescale Semiconductor Inc.</div><div class='ctx'>  * Copyright 2016-2018 NXP</div><div class='hunk'>@@ -13,6 +13,13 @@</div><div class='ctx'> </div><div class='ctx'> struct fsl_mc_io;</div><div class='ctx'> </div><div class='add'>+#define DPRTC_MAX_IRQ_NUM	1</div><div class='add'>+#define DPRTC_IRQ_INDEX		0</div><div class='add'>+</div><div class='add'>+#define DPRTC_EVENT_PPS		0x08000000</div><div class='add'>+#define DPRTC_EVENT_ETS1	0x00800000</div><div class='add'>+#define DPRTC_EVENT_ETS2	0x00400000</div><div class='add'>+</div><div class='ctx'> int dprtc_open(struct fsl_mc_io *mc_io,</div><div class='ctx'> 	       u32 cmd_flags,</div><div class='ctx'> 	       int dprtc_id,</div><div class='hunk'>@@ -22,24 +29,40 @@ int dprtc_close(struct fsl_mc_io *mc_io,</div><div class='ctx'> 		u32 cmd_flags,</div><div class='ctx'> 		u16 token);</div><div class='ctx'> </div><div class='del'>-int dprtc_set_freq_compensation(struct fsl_mc_io *mc_io,</div><div class='del'>-				u32 cmd_flags,</div><div class='del'>-				u16 token,</div><div class='del'>-				u32 freq_compensation);</div><div class='del'>-</div><div class='del'>-int dprtc_get_freq_compensation(struct fsl_mc_io *mc_io,</div><div class='del'>-				u32 cmd_flags,</div><div class='del'>-				u16 token,</div><div class='del'>-				u32 *freq_compensation);</div><div class='del'>-</div><div class='del'>-int dprtc_get_time(struct fsl_mc_io *mc_io,</div><div class='del'>-		   u32 cmd_flags,</div><div class='del'>-		   u16 token,</div><div class='del'>-		   uint64_t *time);</div><div class='del'>-</div><div class='del'>-int dprtc_set_time(struct fsl_mc_io *mc_io,</div><div class='del'>-		   u32 cmd_flags,</div><div class='del'>-		   u16 token,</div><div class='del'>-		   uint64_t time);</div><div class='add'>+int dprtc_set_irq_enable(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 u8 irq_index,</div><div class='add'>+			 u8 en);</div><div class='add'>+</div><div class='add'>+int dprtc_get_irq_enable(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 u8 irq_index,</div><div class='add'>+			 u8 *en);</div><div class='add'>+</div><div class='add'>+int dprtc_set_irq_mask(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       u8 irq_index,</div><div class='add'>+		       u32 mask);</div><div class='add'>+</div><div class='add'>+int dprtc_get_irq_mask(struct fsl_mc_io *mc_io,</div><div class='add'>+		       u32 cmd_flags,</div><div class='add'>+		       u16 token,</div><div class='add'>+		       u8 irq_index,</div><div class='add'>+		       u32 *mask);</div><div class='add'>+</div><div class='add'>+int dprtc_get_irq_status(struct fsl_mc_io *mc_io,</div><div class='add'>+			 u32 cmd_flags,</div><div class='add'>+			 u16 token,</div><div class='add'>+			 u8 irq_index,</div><div class='add'>+			 u32 *status);</div><div class='add'>+</div><div class='add'>+int dprtc_clear_irq_status(struct fsl_mc_io *mc_io,</div><div class='add'>+			   u32 cmd_flags,</div><div class='add'>+			   u16 token,</div><div class='add'>+			   u8 irq_index,</div><div class='add'>+			   u32 status);</div><div class='ctx'> </div><div class='ctx'> #endif /* __FSL_DPRTC_H */</div><div class='head'>diff --git a/drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h b/drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h<br/>new file mode 100644<br/>index 000000000000..397d55f2bd99<br/>--- /dev/null<br/>+++ b/<a href='/cgit/linux-arm.git/tree/drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h?id=c9b47175e9131118e6f221cc8fb81397d62e7c91'>drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h</a></div><div class='hunk'>@@ -0,0 +1,556 @@</div><div class='add'>+/* SPDX-License-Identifier: GPL-2.0 */</div><div class='add'>+/*</div><div class='add'>+ * Copyright 2014-2016 Freescale Semiconductor Inc.</div><div class='add'>+ * Copyright 2017-2021 NXP</div><div class='add'>+ *</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+#ifndef __FSL_DPSW_CMD_H</div><div class='add'>+#define __FSL_DPSW_CMD_H</div><div class='add'>+</div><div class='add'>+#include "dpsw.h"</div><div class='add'>+</div><div class='add'>+/* DPSW Version */</div><div class='add'>+#define DPSW_VER_MAJOR		8</div><div class='add'>+#define DPSW_VER_MINOR		9</div><div class='add'>+</div><div class='add'>+#define DPSW_CMD_BASE_VERSION	1</div><div class='add'>+#define DPSW_CMD_VERSION_2	2</div><div class='add'>+#define DPSW_CMD_ID_OFFSET	4</div><div class='add'>+</div><div class='add'>+#define DPSW_CMD_ID(id)	(((id) &lt;&lt; DPSW_CMD_ID_OFFSET) | DPSW_CMD_BASE_VERSION)</div><div class='add'>+#define DPSW_CMD_V2(id) (((id) &lt;&lt; DPSW_CMD_ID_OFFSET) | DPSW_CMD_VERSION_2)</div><div class='add'>+</div><div class='add'>+/* Command IDs */</div><div class='add'>+#define DPSW_CMDID_CLOSE                    DPSW_CMD_ID(0x800)</div><div class='add'>+#define DPSW_CMDID_OPEN                     DPSW_CMD_ID(0x802)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_GET_API_VERSION          DPSW_CMD_ID(0xa02)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_ENABLE                   DPSW_CMD_ID(0x002)</div><div class='add'>+#define DPSW_CMDID_DISABLE                  DPSW_CMD_ID(0x003)</div><div class='add'>+#define DPSW_CMDID_GET_ATTR                 DPSW_CMD_V2(0x004)</div><div class='add'>+#define DPSW_CMDID_RESET                    DPSW_CMD_ID(0x005)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_SET_IRQ_ENABLE           DPSW_CMD_ID(0x012)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_SET_IRQ_MASK             DPSW_CMD_ID(0x014)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_GET_IRQ_STATUS           DPSW_CMD_ID(0x016)</div><div class='add'>+#define DPSW_CMDID_CLEAR_IRQ_STATUS         DPSW_CMD_ID(0x017)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_SET_REFLECTION_IF        DPSW_CMD_ID(0x022)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_SET_TCI               DPSW_CMD_ID(0x030)</div><div class='add'>+#define DPSW_CMDID_IF_SET_STP               DPSW_CMD_ID(0x031)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_GET_COUNTER           DPSW_CMD_V2(0x034)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_ADD_REFLECTION        DPSW_CMD_ID(0x037)</div><div class='add'>+#define DPSW_CMDID_IF_REMOVE_REFLECTION     DPSW_CMD_ID(0x038)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_ENABLE                DPSW_CMD_ID(0x03D)</div><div class='add'>+#define DPSW_CMDID_IF_DISABLE               DPSW_CMD_ID(0x03E)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_GET_ATTR              DPSW_CMD_ID(0x042)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_SET_MAX_FRAME_LENGTH  DPSW_CMD_ID(0x044)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_GET_LINK_STATE        DPSW_CMD_ID(0x046)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_GET_TCI               DPSW_CMD_ID(0x04A)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_SET_LINK_CFG          DPSW_CMD_ID(0x04C)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_VLAN_ADD                 DPSW_CMD_ID(0x060)</div><div class='add'>+#define DPSW_CMDID_VLAN_ADD_IF              DPSW_CMD_V2(0x061)</div><div class='add'>+#define DPSW_CMDID_VLAN_ADD_IF_UNTAGGED     DPSW_CMD_ID(0x062)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_VLAN_REMOVE_IF           DPSW_CMD_ID(0x064)</div><div class='add'>+#define DPSW_CMDID_VLAN_REMOVE_IF_UNTAGGED  DPSW_CMD_ID(0x065)</div><div class='add'>+#define DPSW_CMDID_VLAN_REMOVE_IF_FLOODING  DPSW_CMD_ID(0x066)</div><div class='add'>+#define DPSW_CMDID_VLAN_REMOVE              DPSW_CMD_ID(0x067)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_FDB_ADD                  DPSW_CMD_ID(0x082)</div><div class='add'>+#define DPSW_CMDID_FDB_REMOVE               DPSW_CMD_ID(0x083)</div><div class='add'>+#define DPSW_CMDID_FDB_ADD_UNICAST          DPSW_CMD_ID(0x084)</div><div class='add'>+#define DPSW_CMDID_FDB_REMOVE_UNICAST       DPSW_CMD_ID(0x085)</div><div class='add'>+#define DPSW_CMDID_FDB_ADD_MULTICAST        DPSW_CMD_ID(0x086)</div><div class='add'>+#define DPSW_CMDID_FDB_REMOVE_MULTICAST     DPSW_CMD_ID(0x087)</div><div class='add'>+#define DPSW_CMDID_FDB_DUMP                 DPSW_CMD_ID(0x08A)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_ACL_ADD                  DPSW_CMD_ID(0x090)</div><div class='add'>+#define DPSW_CMDID_ACL_REMOVE               DPSW_CMD_ID(0x091)</div><div class='add'>+#define DPSW_CMDID_ACL_ADD_ENTRY            DPSW_CMD_ID(0x092)</div><div class='add'>+#define DPSW_CMDID_ACL_REMOVE_ENTRY         DPSW_CMD_ID(0x093)</div><div class='add'>+#define DPSW_CMDID_ACL_ADD_IF               DPSW_CMD_ID(0x094)</div><div class='add'>+#define DPSW_CMDID_ACL_REMOVE_IF            DPSW_CMD_ID(0x095)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_IF_GET_PORT_MAC_ADDR     DPSW_CMD_ID(0x0A7)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_CTRL_IF_GET_ATTR         DPSW_CMD_ID(0x0A0)</div><div class='add'>+#define DPSW_CMDID_CTRL_IF_SET_POOLS        DPSW_CMD_ID(0x0A1)</div><div class='add'>+#define DPSW_CMDID_CTRL_IF_ENABLE           DPSW_CMD_ID(0x0A2)</div><div class='add'>+#define DPSW_CMDID_CTRL_IF_DISABLE          DPSW_CMD_ID(0x0A3)</div><div class='add'>+#define DPSW_CMDID_CTRL_IF_SET_QUEUE        DPSW_CMD_ID(0x0A6)</div><div class='add'>+</div><div class='add'>+#define DPSW_CMDID_SET_EGRESS_FLOOD         DPSW_CMD_ID(0x0AC)</div><div class='add'>+#define DPSW_CMDID_IF_SET_LEARNING_MODE     DPSW_CMD_ID(0x0AD)</div><div class='add'>+</div><div class='add'>+/* Macros for accessing command fields smaller than 1byte */</div><div class='add'>+#define DPSW_MASK(field)        \</div><div class='add'>+	GENMASK(DPSW_##field##_SHIFT + DPSW_##field##_SIZE - 1, \</div><div class='add'>+		DPSW_##field##_SHIFT)</div><div class='add'>+#define dpsw_set_field(var, field, val) \</div><div class='add'>+	((var) |= (((val) &lt;&lt; DPSW_##field##_SHIFT) &amp; DPSW_MASK(field)))</div><div class='add'>+#define dpsw_get_field(var, field)      \</div><div class='add'>+	(((var) &amp; DPSW_MASK(field)) &gt;&gt; DPSW_##field##_SHIFT)</div><div class='add'>+#define dpsw_get_bit(var, bit) \</div><div class='add'>+	(((var)  &gt;&gt; (bit)) &amp; GENMASK(0, 0))</div><div class='add'>+</div><div class='add'>+#pragma pack(push, 1)</div><div class='add'>+struct dpsw_cmd_open {</div><div class='add'>+	__le32 dpsw_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPSW_COMPONENT_TYPE_SHIFT	0</div><div class='add'>+#define DPSW_COMPONENT_TYPE_SIZE	4</div><div class='add'>+</div><div class='add'>+struct dpsw_cmd_create {</div><div class='add'>+	/* cmd word 0 */</div><div class='add'>+	__le16 num_ifs;</div><div class='add'>+	u8 max_fdbs;</div><div class='add'>+	u8 max_meters_per_if;</div><div class='add'>+	/* from LSB: only the first 4 bits */</div><div class='add'>+	u8 component_type;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	/* cmd word 1 */</div><div class='add'>+	__le16 max_vlans;</div><div class='add'>+	__le16 max_fdb_entries;</div><div class='add'>+	__le16 fdb_aging_time;</div><div class='add'>+	__le16 max_fdb_mc_groups;</div><div class='add'>+	/* cmd word 2 */</div><div class='add'>+	__le64 options;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpsw_cmd_destroy {</div><div class='add'>+	__le32 dpsw_id;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+#define DPSW_ENABLE_SHIFT 0</div><div class='add'>+#define DPSW_ENABLE_SIZE  1</div><div class='add'>+</div><div class='add'>+struct dpsw_rsp_is_enabled {</div><div class='add'>+	/* from LSB: enable:1 */</div><div class='add'>+	u8 enabled;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpsw_cmd_set_irq_enable {</div><div class='add'>+	u8 enable_state;</div><div class='add'>+	u8 pad[3];</div><div class='add'>+	u8 irq_index;</div><div class='add'>+};</div><div class='add'>+</div><div class='add'>+struct dpsw_cmd_get_irq_enable {</div><div class='add'>+	__le32 pad;</div><div class='add'>+	u8 irq_index;</div><div class='add'>+};</div><div class='add'>